From ab841afa5cb39058d9ab2cebb67cfe6369443f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 20:55:59 +0200 Subject: New upstream version 0.28.3 --- src/.unitize/_CameraInternals.c | 27 +- src/.unitize/_ConfigInternals.c | 25 +- src/.unitize/_CoreInternals.c | 25 +- src/.unitize/_DataImportsInternals.c | 25 +- src/.unitize/_DbInternals.c | 25 +- src/.unitize/_DirectInternals.c | 35 +- src/.unitize/_Direct_unitize_entry.c | 15 +- src/.unitize/_EditingToolsInternals.c | 25 +- src/.unitize/_EventsInternals.c | 27 +- src/.unitize/_FoldersInternals.c | 29 +- src/.unitize/_LibraryInternals.c | 55 +- src/.unitize/_Library_unitize_entry.c | 15 +- src/.unitize/_PhotosInternals.c | 25 +- src/.unitize/_PluginsInternals.c | 27 +- src/.unitize/_PublishingInternals.c | 27 +- src/.unitize/_SearchesInternals.c | 25 +- src/.unitize/_SidebarInternals.c | 25 +- src/.unitize/_SlideshowInternals.c | 27 +- src/.unitize/_TagsInternals.c | 27 +- src/.unitize/_ThreadsInternals.c | 25 +- src/.unitize/_UnitInternals.c | 23 +- src/.unitize/_UtilInternals.c | 25 +- src/AppDirs.c | 1651 +- src/AppWindow.c | 3729 ++-- src/Application.c | 714 +- src/BatchImport.c | 12154 +++++----- src/Box.c | 1937 +- src/CheckerboardLayout.c | 15538 +++++++------ src/CheckerboardLayout.vala | 24 +- src/CollectionPage.c | 4216 ++-- src/ColorTransformation.c | 9980 ++++----- src/CommandManager.c | 710 +- src/Commands.c | 16019 +++++++------- src/Debug.c | 740 +- src/DesktopIntegration.c | 2154 +- src/Dialogs.c | 8061 ++++--- src/Dimensions.c | 3326 ++- src/DirectoryMonitor.c | 7502 ++++--- src/Event.c | 5598 ++--- src/Exporter.c | 1996 +- src/International.c | 140 +- src/LibraryFiles.c | 1158 +- src/LibraryMonitor.c | 6311 +++--- src/MediaDataRepresentation.c | 5875 ++--- src/MediaInterfaces.c | 767 +- src/MediaMetadata.c | 942 +- src/MediaMonitor.c | 2393 +- src/MediaPage.c | 5833 ++--- src/MediaViewTracker.c | 605 +- src/MetadataWriter.c | 4005 ++-- src/NaturalCollate.c | 836 +- src/Orientation.c | 1315 +- src/Page.c | 12193 ++++++----- src/Photo.c | 30451 +++++++++++++------------- src/PhotoMonitor.c | 6983 +++--- src/PhotoPage.c | 14896 +++++++------ src/PixbufCache.c | 2020 +- src/Printing.c | 6271 +++--- src/Properties.c | 4897 ++--- src/Resources.c | 2136 +- src/Screensaver.c | 209 +- src/SearchFilter.c | 8339 +++---- src/SearchFilter.vala | 4 +- src/SlideshowPage.c | 1731 +- src/SortedList.c | 2225 +- src/Tag.c | 7861 ++++--- src/Thumbnail.c | 1972 +- src/ThumbnailCache.c | 3271 +-- src/TimedQueue.c | 1600 +- src/Tombstone.c | 2141 +- src/UnityProgressBar.c | 3 +- src/Upgrades.c | 600 +- src/VideoMetadata.c | 3498 +-- src/VideoMonitor.c | 1596 +- src/VideoSupport.c | 6741 +++--- src/camera/Camera.c | 15 +- src/camera/CameraBranch.c | 618 +- src/camera/CameraTable.c | 2931 +-- src/camera/GPhoto.c | 2027 +- src/camera/ImportPage.c | 9933 ++++----- src/config/Config.c | 325 +- src/config/ConfigurationInterfaces.c | 6494 +++--- src/config/GSettingsEngine.c | 2752 ++- src/core/Alteration.c | 2447 +-- src/core/ContainerSourceCollection.c | 1678 +- src/core/Core.c | 15 +- src/core/DataCollection.c | 3118 +-- src/core/DataObject.c | 446 +- src/core/DataSet.c | 750 +- src/core/DataSource.c | 3291 +-- src/core/DataSourceTypes.c | 547 +- src/core/DataView.c | 329 +- src/core/DataViewTypes.c | 240 +- src/core/DatabaseSourceCollection.c | 633 +- src/core/SourceCollection.c | 1300 +- src/core/SourceHoldingTank.c | 1324 +- src/core/SourceInterfaces.c | 240 +- src/core/Tracker.c | 1569 +- src/core/ViewCollection.c | 7443 ++++--- src/core/util.c | 1048 +- src/data_imports/DataImportJob.c | 1205 +- src/data_imports/DataImportSource.c | 785 +- src/data_imports/DataImports.c | 59 +- src/data_imports/DataImportsPluginHost.c | 2347 +- src/data_imports/DataImportsUI.c | 1753 +- src/db/DatabaseTable.c | 1978 +- src/db/Db.c | 497 +- src/db/EventTable.c | 1274 +- src/db/PhotoTable.c | 7674 +++---- src/db/SavedSearchDBTable.c | 3731 ++-- src/db/TagTable.c | 1497 +- src/db/TombstoneTable.c | 871 +- src/db/VersionTable.c | 373 +- src/db/VideoTable.c | 2513 +-- src/dialogs/AdjustDateTimeDialog.c | 2077 +- src/dialogs/EntryMultiCompletion.c | 1087 +- src/dialogs/ExportDialog.c | 1743 +- src/dialogs/MultiTextEntryDialog.c | 173 +- src/dialogs/Preferences.c | 2261 +- src/dialogs/ProgressDialog.c | 529 +- src/dialogs/SetBackground.c | 125 +- src/dialogs/SetBackgroundSlideshow.c | 269 +- src/dialogs/TextEntry.c | 258 +- src/dialogs/WelcomeDialog.c | 1007 +- src/direct/Direct.c | 34 +- src/direct/DirectPhoto.c | 1469 +- src/direct/DirectPhotoPage.c | 2829 +-- src/direct/DirectView.c | 303 +- src/direct/DirectWindow.c | 459 +- src/editing_tools/EditingTools.c | 13156 +++++------ src/editing_tools/RGBHistogramManipulator.c | 1174 +- src/editing_tools/StraightenTool.c | 2287 +- src/events/EventDirectoryItem.c | 1375 +- src/events/EventPage.c | 901 +- src/events/Events.c | 15 +- src/events/EventsBranch.c | 2818 +-- src/events/EventsDirectoryPage.c | 1919 +- src/folders/Folders.c | 15 +- src/folders/FoldersBranch.c | 1377 +- src/folders/FoldersPage.c | 407 +- src/graphics-processor.c | 809 +- src/library/FlaggedPage.c | 394 +- src/library/FlaggedSidebarEntry.c | 296 +- src/library/ImportQueuePage.c | 912 +- src/library/ImportQueueSidebarEntry.c | 165 +- src/library/LastImportPage.c | 448 +- src/library/LastImportSidebarEntry.c | 188 +- src/library/Library.c | 15 +- src/library/LibraryBranch.c | 926 +- src/library/LibraryWindow.c | 6586 +++--- src/library/OfflinePage.c | 797 +- src/library/OfflineSidebarEntry.c | 253 +- src/library/TrashPage.c | 729 +- src/library/TrashSidebarEntry.c | 294 +- src/main.c | 2107 +- src/photos/BmpSupport.c | 827 +- src/photos/GRaw.c | 1346 +- src/photos/GdkSupport.c | 632 +- src/photos/JfifSupport.c | 1050 +- src/photos/PhotoFileAdapter.c | 649 +- src/photos/PhotoFileFormat.c | 1764 +- src/photos/PhotoFileSniffer.c | 634 +- src/photos/PhotoMetadata.c | 6772 +++--- src/photos/Photos.c | 25 +- src/photos/PngSupport.c | 844 +- src/photos/RawSupport.c | 1289 +- src/photos/TiffSupport.c | 795 +- src/plugins/DataImportsInterfaces.c | 726 +- src/plugins/ManifestWidget.c | 1303 +- src/plugins/Plugins.c | 3217 +-- src/plugins/PublishingInterfaces.c | 794 +- src/plugins/SpitInterfaces.c | 602 +- src/plugins/StandardHostInterface.c | 446 +- src/plugins/TransitionsInterfaces.c | 1010 +- src/publishing/APIGlue.c | 636 +- src/publishing/Publishing.c | 107 +- src/publishing/PublishingPluginHost.c | 933 +- src/publishing/PublishingUI.c | 2310 +- src/searches/SavedSearchDialog.c | 3883 ++-- src/searches/SavedSearchPage.c | 628 +- src/searches/SearchBoolean.c | 3997 ++-- src/searches/Searches.c | 19 +- src/searches/SearchesBranch.c | 658 +- src/shotwell-graphics-processor.h | 286 +- src/shotwell-graphics-processor.vapi | 2 +- src/sidebar/Branch.c | 2221 +- src/sidebar/Entry.c | 249 +- src/sidebar/Sidebar.c | 11 +- src/sidebar/Tree.c | 6066 +++-- src/sidebar/common.c | 513 +- src/slideshow/Slideshow.c | 205 +- src/slideshow/TransitionEffects.c | 1587 +- src/tags/HierarchicalTagIndex.c | 695 +- src/tags/HierarchicalTagUtilities.c | 2363 +- src/tags/TagPage.c | 651 +- src/tags/Tags.c | 15 +- src/tags/TagsBranch.c | 1988 +- src/threads/BackgroundJob.c | 1071 +- src/threads/Semaphore.c | 492 +- src/threads/Threads.c | 11 +- src/threads/Workers.c | 620 +- src/unit/Unit.c | 11 +- src/util/KeyValueMap.c | 907 +- src/util/Util.c | 11 +- src/util/file.c | 1666 +- src/util/image.c | 2464 +-- src/util/misc.c | 2047 +- src/util/string.c | 2168 +- src/util/system.c | 113 +- src/util/ui.c | 151 +- 210 files changed, 230291 insertions(+), 217696 deletions(-) (limited to 'src') diff --git a/src/.unitize/_CameraInternals.c b/src/.unitize/_CameraInternals.c index b1bd5f0..e3fa04d 100644 --- a/src/.unitize/_CameraInternals.c +++ b/src/.unitize/_CameraInternals.c @@ -1,4 +1,4 @@ -/* _CameraInternals.c generated by valac 0.36.6, the Vala compiler +/* _CameraInternals.c generated by valac 0.40.4, the Vala compiler * generated from _CameraInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -27,7 +28,9 @@ void unit_terminate_entry (void); void sidebar_terminate_entry (void); -void camera_init_entry (GError** error) { +void +camera_init_entry (GError** error) +{ gint _tmp0_; GError * _inner_error_ = NULL; #line 14 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala" @@ -38,7 +41,7 @@ void camera_init_entry (GError** error) { if (_tmp0_ != 0) { #line 15 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala" return; -#line 42 "_CameraInternals.c" +#line 45 "_CameraInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala" unit_init_entry (&_inner_error_); @@ -48,7 +51,7 @@ void camera_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala" return; -#line 52 "_CameraInternals.c" +#line 55 "_CameraInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala" sidebar_init_entry (&_inner_error_); @@ -58,7 +61,7 @@ void camera_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala" return; -#line 62 "_CameraInternals.c" +#line 65 "_CameraInternals.c" } #line 19 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala" camera_init (&_inner_error_); @@ -68,12 +71,14 @@ void camera_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 19 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala" return; -#line 72 "_CameraInternals.c" +#line 75 "_CameraInternals.c" } } -void camera_terminate_entry (void) { +void +camera_terminate_entry (void) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala" @@ -82,7 +87,7 @@ void camera_terminate_entry (void) { if (_tmp1_ == 0) { #line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala" _tmp0_ = TRUE; -#line 86 "_CameraInternals.c" +#line 91 "_CameraInternals.c" } else { gint _tmp2_; gint _tmp3_; @@ -94,13 +99,13 @@ void camera_terminate_entry (void) { _tmp3_ = camera__unit_init_count; #line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala" _tmp0_ = _tmp3_ != 0; -#line 98 "_CameraInternals.c" +#line 103 "_CameraInternals.c" } #line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala" if (_tmp0_) { #line 24 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala" return; -#line 104 "_CameraInternals.c" +#line 109 "_CameraInternals.c" } #line 26 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala" camera_terminate (); @@ -108,7 +113,7 @@ void camera_terminate_entry (void) { unit_terminate_entry (); #line 28 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala" sidebar_terminate_entry (); -#line 112 "_CameraInternals.c" +#line 117 "_CameraInternals.c" } diff --git a/src/.unitize/_ConfigInternals.c b/src/.unitize/_ConfigInternals.c index 0048c54..a9c0493 100644 --- a/src/.unitize/_ConfigInternals.c +++ b/src/.unitize/_ConfigInternals.c @@ -1,4 +1,4 @@ -/* _ConfigInternals.c generated by valac 0.36.6, the Vala compiler +/* _ConfigInternals.c generated by valac 0.40.4, the Vala compiler * generated from _ConfigInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -25,7 +26,9 @@ void config_terminate (void); void unit_terminate_entry (void); -void config_init_entry (GError** error) { +void +config_init_entry (GError** error) +{ gint _tmp0_; GError * _inner_error_ = NULL; #line 14 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala" @@ -36,7 +39,7 @@ void config_init_entry (GError** error) { if (_tmp0_ != 0) { #line 15 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala" return; -#line 40 "_ConfigInternals.c" +#line 43 "_ConfigInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala" unit_init_entry (&_inner_error_); @@ -46,7 +49,7 @@ void config_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala" return; -#line 50 "_ConfigInternals.c" +#line 53 "_ConfigInternals.c" } #line 19 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala" config_init (&_inner_error_); @@ -56,12 +59,14 @@ void config_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 19 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala" return; -#line 60 "_ConfigInternals.c" +#line 63 "_ConfigInternals.c" } } -void config_terminate_entry (void) { +void +config_terminate_entry (void) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala" @@ -70,7 +75,7 @@ void config_terminate_entry (void) { if (_tmp1_ == 0) { #line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala" _tmp0_ = TRUE; -#line 74 "_ConfigInternals.c" +#line 79 "_ConfigInternals.c" } else { gint _tmp2_; gint _tmp3_; @@ -82,19 +87,19 @@ void config_terminate_entry (void) { _tmp3_ = config__unit_init_count; #line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala" _tmp0_ = _tmp3_ != 0; -#line 86 "_ConfigInternals.c" +#line 91 "_ConfigInternals.c" } #line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala" if (_tmp0_) { #line 24 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala" return; -#line 92 "_ConfigInternals.c" +#line 97 "_ConfigInternals.c" } #line 26 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala" config_terminate (); #line 28 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala" unit_terminate_entry (); -#line 98 "_ConfigInternals.c" +#line 103 "_ConfigInternals.c" } diff --git a/src/.unitize/_CoreInternals.c b/src/.unitize/_CoreInternals.c index 785036d..c53d97d 100644 --- a/src/.unitize/_CoreInternals.c +++ b/src/.unitize/_CoreInternals.c @@ -1,4 +1,4 @@ -/* _CoreInternals.c generated by valac 0.36.6, the Vala compiler +/* _CoreInternals.c generated by valac 0.40.4, the Vala compiler * generated from _CoreInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -25,7 +26,9 @@ void core_terminate (void); void unit_terminate_entry (void); -void core_init_entry (GError** error) { +void +core_init_entry (GError** error) +{ gint _tmp0_; GError * _inner_error_ = NULL; #line 14 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala" @@ -36,7 +39,7 @@ void core_init_entry (GError** error) { if (_tmp0_ != 0) { #line 15 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala" return; -#line 40 "_CoreInternals.c" +#line 43 "_CoreInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala" unit_init_entry (&_inner_error_); @@ -46,7 +49,7 @@ void core_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala" return; -#line 50 "_CoreInternals.c" +#line 53 "_CoreInternals.c" } #line 19 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala" core_init (&_inner_error_); @@ -56,12 +59,14 @@ void core_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 19 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala" return; -#line 60 "_CoreInternals.c" +#line 63 "_CoreInternals.c" } } -void core_terminate_entry (void) { +void +core_terminate_entry (void) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala" @@ -70,7 +75,7 @@ void core_terminate_entry (void) { if (_tmp1_ == 0) { #line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala" _tmp0_ = TRUE; -#line 74 "_CoreInternals.c" +#line 79 "_CoreInternals.c" } else { gint _tmp2_; gint _tmp3_; @@ -82,19 +87,19 @@ void core_terminate_entry (void) { _tmp3_ = core__unit_init_count; #line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala" _tmp0_ = _tmp3_ != 0; -#line 86 "_CoreInternals.c" +#line 91 "_CoreInternals.c" } #line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala" if (_tmp0_) { #line 24 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala" return; -#line 92 "_CoreInternals.c" +#line 97 "_CoreInternals.c" } #line 26 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala" core_terminate (); #line 28 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala" unit_terminate_entry (); -#line 98 "_CoreInternals.c" +#line 103 "_CoreInternals.c" } diff --git a/src/.unitize/_DataImportsInternals.c b/src/.unitize/_DataImportsInternals.c index 6f25bbf..e99bde1 100644 --- a/src/.unitize/_DataImportsInternals.c +++ b/src/.unitize/_DataImportsInternals.c @@ -1,4 +1,4 @@ -/* _DataImportsInternals.c generated by valac 0.36.6, the Vala compiler +/* _DataImportsInternals.c generated by valac 0.40.4, the Vala compiler * generated from _DataImportsInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -25,7 +26,9 @@ void data_imports_terminate (void); void unit_terminate_entry (void); -void data_imports_init_entry (GError** error) { +void +data_imports_init_entry (GError** error) +{ gint _tmp0_; GError * _inner_error_ = NULL; #line 14 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala" @@ -36,7 +39,7 @@ void data_imports_init_entry (GError** error) { if (_tmp0_ != 0) { #line 15 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala" return; -#line 40 "_DataImportsInternals.c" +#line 43 "_DataImportsInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala" unit_init_entry (&_inner_error_); @@ -46,7 +49,7 @@ void data_imports_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala" return; -#line 50 "_DataImportsInternals.c" +#line 53 "_DataImportsInternals.c" } #line 19 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala" data_imports_init (&_inner_error_); @@ -56,12 +59,14 @@ void data_imports_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 19 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala" return; -#line 60 "_DataImportsInternals.c" +#line 63 "_DataImportsInternals.c" } } -void data_imports_terminate_entry (void) { +void +data_imports_terminate_entry (void) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala" @@ -70,7 +75,7 @@ void data_imports_terminate_entry (void) { if (_tmp1_ == 0) { #line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala" _tmp0_ = TRUE; -#line 74 "_DataImportsInternals.c" +#line 79 "_DataImportsInternals.c" } else { gint _tmp2_; gint _tmp3_; @@ -82,19 +87,19 @@ void data_imports_terminate_entry (void) { _tmp3_ = data_imports__unit_init_count; #line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala" _tmp0_ = _tmp3_ != 0; -#line 86 "_DataImportsInternals.c" +#line 91 "_DataImportsInternals.c" } #line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala" if (_tmp0_) { #line 24 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala" return; -#line 92 "_DataImportsInternals.c" +#line 97 "_DataImportsInternals.c" } #line 26 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala" data_imports_terminate (); #line 28 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala" unit_terminate_entry (); -#line 98 "_DataImportsInternals.c" +#line 103 "_DataImportsInternals.c" } diff --git a/src/.unitize/_DbInternals.c b/src/.unitize/_DbInternals.c index 842d484..c024dc5 100644 --- a/src/.unitize/_DbInternals.c +++ b/src/.unitize/_DbInternals.c @@ -1,4 +1,4 @@ -/* _DbInternals.c generated by valac 0.36.6, the Vala compiler +/* _DbInternals.c generated by valac 0.40.4, the Vala compiler * generated from _DbInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -25,7 +26,9 @@ void db_terminate (void); void unit_terminate_entry (void); -void db_init_entry (GError** error) { +void +db_init_entry (GError** error) +{ gint _tmp0_; GError * _inner_error_ = NULL; #line 14 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala" @@ -36,7 +39,7 @@ void db_init_entry (GError** error) { if (_tmp0_ != 0) { #line 15 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala" return; -#line 40 "_DbInternals.c" +#line 43 "_DbInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala" unit_init_entry (&_inner_error_); @@ -46,7 +49,7 @@ void db_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala" return; -#line 50 "_DbInternals.c" +#line 53 "_DbInternals.c" } #line 19 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala" db_init (&_inner_error_); @@ -56,12 +59,14 @@ void db_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 19 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala" return; -#line 60 "_DbInternals.c" +#line 63 "_DbInternals.c" } } -void db_terminate_entry (void) { +void +db_terminate_entry (void) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala" @@ -70,7 +75,7 @@ void db_terminate_entry (void) { if (_tmp1_ == 0) { #line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala" _tmp0_ = TRUE; -#line 74 "_DbInternals.c" +#line 79 "_DbInternals.c" } else { gint _tmp2_; gint _tmp3_; @@ -82,19 +87,19 @@ void db_terminate_entry (void) { _tmp3_ = db__unit_init_count; #line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala" _tmp0_ = _tmp3_ != 0; -#line 86 "_DbInternals.c" +#line 91 "_DbInternals.c" } #line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala" if (_tmp0_) { #line 24 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala" return; -#line 92 "_DbInternals.c" +#line 97 "_DbInternals.c" } #line 26 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala" db_terminate (); #line 28 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala" unit_terminate_entry (); -#line 98 "_DbInternals.c" +#line 103 "_DbInternals.c" } diff --git a/src/.unitize/_DirectInternals.c b/src/.unitize/_DirectInternals.c index 1031b9a..e9b9492 100644 --- a/src/.unitize/_DirectInternals.c +++ b/src/.unitize/_DirectInternals.c @@ -1,4 +1,4 @@ -/* _DirectInternals.c generated by valac 0.36.6, the Vala compiler +/* _DirectInternals.c generated by valac 0.40.4, the Vala compiler * generated from _DirectInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -35,7 +36,9 @@ void slideshow_terminate_entry (void); void core_terminate_entry (void); -void direct_init_entry (GError** error) { +void +direct_init_entry (GError** error) +{ gint _tmp0_; GError * _inner_error_ = NULL; #line 14 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" @@ -46,7 +49,7 @@ void direct_init_entry (GError** error) { if (_tmp0_ != 0) { #line 15 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" return; -#line 50 "_DirectInternals.c" +#line 53 "_DirectInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" unit_init_entry (&_inner_error_); @@ -56,7 +59,7 @@ void direct_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" return; -#line 60 "_DirectInternals.c" +#line 63 "_DirectInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" db_init_entry (&_inner_error_); @@ -66,7 +69,7 @@ void direct_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" return; -#line 70 "_DirectInternals.c" +#line 73 "_DirectInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" util_init_entry (&_inner_error_); @@ -76,7 +79,7 @@ void direct_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" return; -#line 80 "_DirectInternals.c" +#line 83 "_DirectInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" photos_init_entry (&_inner_error_); @@ -86,7 +89,7 @@ void direct_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" return; -#line 90 "_DirectInternals.c" +#line 93 "_DirectInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" slideshow_init_entry (&_inner_error_); @@ -96,7 +99,7 @@ void direct_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" return; -#line 100 "_DirectInternals.c" +#line 103 "_DirectInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" core_init_entry (&_inner_error_); @@ -106,7 +109,7 @@ void direct_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" return; -#line 110 "_DirectInternals.c" +#line 113 "_DirectInternals.c" } #line 19 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" direct_init (&_inner_error_); @@ -116,12 +119,14 @@ void direct_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 19 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" return; -#line 120 "_DirectInternals.c" +#line 123 "_DirectInternals.c" } } -void direct_terminate_entry (void) { +void +direct_terminate_entry (void) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" @@ -130,7 +135,7 @@ void direct_terminate_entry (void) { if (_tmp1_ == 0) { #line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" _tmp0_ = TRUE; -#line 134 "_DirectInternals.c" +#line 139 "_DirectInternals.c" } else { gint _tmp2_; gint _tmp3_; @@ -142,13 +147,13 @@ void direct_terminate_entry (void) { _tmp3_ = direct__unit_init_count; #line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" _tmp0_ = _tmp3_ != 0; -#line 146 "_DirectInternals.c" +#line 151 "_DirectInternals.c" } #line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" if (_tmp0_) { #line 24 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" return; -#line 152 "_DirectInternals.c" +#line 157 "_DirectInternals.c" } #line 26 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" direct_terminate (); @@ -164,7 +169,7 @@ void direct_terminate_entry (void) { slideshow_terminate_entry (); #line 28 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala" core_terminate_entry (); -#line 168 "_DirectInternals.c" +#line 173 "_DirectInternals.c" } diff --git a/src/.unitize/_Direct_unitize_entry.c b/src/.unitize/_Direct_unitize_entry.c index fcfc55a..1e4c50c 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.36.6, the Vala compiler +/* _Direct_unitize_entry.c generated by valac 0.40.4, the Vala compiler * generated from _Direct_unitize_entry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -21,7 +22,9 @@ void direct_app_terminate (void); void direct_terminate_entry (void); -void direct_app_init (GError** error) { +void +direct_app_init (GError** error) +{ GError * _inner_error_ = NULL; #line 12 "/home/jens/Source/shotwell/src/.unitize/_Direct_unitize_entry.vala" direct_init_entry (&_inner_error_); @@ -31,15 +34,17 @@ void direct_app_init (GError** error) { g_propagate_error (error, _inner_error_); #line 12 "/home/jens/Source/shotwell/src/.unitize/_Direct_unitize_entry.vala" return; -#line 35 "_Direct_unitize_entry.c" +#line 38 "_Direct_unitize_entry.c" } } -void direct_app_terminate (void) { +void +direct_app_terminate (void) +{ #line 16 "/home/jens/Source/shotwell/src/.unitize/_Direct_unitize_entry.vala" direct_terminate_entry (); -#line 43 "_Direct_unitize_entry.c" +#line 48 "_Direct_unitize_entry.c" } diff --git a/src/.unitize/_EditingToolsInternals.c b/src/.unitize/_EditingToolsInternals.c index 29ec24b..0bce746 100644 --- a/src/.unitize/_EditingToolsInternals.c +++ b/src/.unitize/_EditingToolsInternals.c @@ -1,4 +1,4 @@ -/* _EditingToolsInternals.c generated by valac 0.36.6, the Vala compiler +/* _EditingToolsInternals.c generated by valac 0.40.4, the Vala compiler * generated from _EditingToolsInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -25,7 +26,9 @@ void editing_tools_terminate (void); void unit_terminate_entry (void); -void editing_tools_init_entry (GError** error) { +void +editing_tools_init_entry (GError** error) +{ gint _tmp0_; GError * _inner_error_ = NULL; #line 14 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala" @@ -36,7 +39,7 @@ void editing_tools_init_entry (GError** error) { if (_tmp0_ != 0) { #line 15 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala" return; -#line 40 "_EditingToolsInternals.c" +#line 43 "_EditingToolsInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala" unit_init_entry (&_inner_error_); @@ -46,7 +49,7 @@ void editing_tools_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala" return; -#line 50 "_EditingToolsInternals.c" +#line 53 "_EditingToolsInternals.c" } #line 19 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala" editing_tools_init (&_inner_error_); @@ -56,12 +59,14 @@ void editing_tools_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 19 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala" return; -#line 60 "_EditingToolsInternals.c" +#line 63 "_EditingToolsInternals.c" } } -void editing_tools_terminate_entry (void) { +void +editing_tools_terminate_entry (void) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala" @@ -70,7 +75,7 @@ void editing_tools_terminate_entry (void) { if (_tmp1_ == 0) { #line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala" _tmp0_ = TRUE; -#line 74 "_EditingToolsInternals.c" +#line 79 "_EditingToolsInternals.c" } else { gint _tmp2_; gint _tmp3_; @@ -82,19 +87,19 @@ void editing_tools_terminate_entry (void) { _tmp3_ = editing_tools__unit_init_count; #line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala" _tmp0_ = _tmp3_ != 0; -#line 86 "_EditingToolsInternals.c" +#line 91 "_EditingToolsInternals.c" } #line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala" if (_tmp0_) { #line 24 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala" return; -#line 92 "_EditingToolsInternals.c" +#line 97 "_EditingToolsInternals.c" } #line 26 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala" editing_tools_terminate (); #line 28 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala" unit_terminate_entry (); -#line 98 "_EditingToolsInternals.c" +#line 103 "_EditingToolsInternals.c" } diff --git a/src/.unitize/_EventsInternals.c b/src/.unitize/_EventsInternals.c index 8ee5b0b..4474675 100644 --- a/src/.unitize/_EventsInternals.c +++ b/src/.unitize/_EventsInternals.c @@ -1,4 +1,4 @@ -/* _EventsInternals.c generated by valac 0.36.6, the Vala compiler +/* _EventsInternals.c generated by valac 0.40.4, the Vala compiler * generated from _EventsInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -27,7 +28,9 @@ void unit_terminate_entry (void); void sidebar_terminate_entry (void); -void events_init_entry (GError** error) { +void +events_init_entry (GError** error) +{ gint _tmp0_; GError * _inner_error_ = NULL; #line 14 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala" @@ -38,7 +41,7 @@ void events_init_entry (GError** error) { if (_tmp0_ != 0) { #line 15 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala" return; -#line 42 "_EventsInternals.c" +#line 45 "_EventsInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala" unit_init_entry (&_inner_error_); @@ -48,7 +51,7 @@ void events_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala" return; -#line 52 "_EventsInternals.c" +#line 55 "_EventsInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala" sidebar_init_entry (&_inner_error_); @@ -58,7 +61,7 @@ void events_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala" return; -#line 62 "_EventsInternals.c" +#line 65 "_EventsInternals.c" } #line 19 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala" events_init (&_inner_error_); @@ -68,12 +71,14 @@ void events_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 19 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala" return; -#line 72 "_EventsInternals.c" +#line 75 "_EventsInternals.c" } } -void events_terminate_entry (void) { +void +events_terminate_entry (void) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala" @@ -82,7 +87,7 @@ void events_terminate_entry (void) { if (_tmp1_ == 0) { #line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala" _tmp0_ = TRUE; -#line 86 "_EventsInternals.c" +#line 91 "_EventsInternals.c" } else { gint _tmp2_; gint _tmp3_; @@ -94,13 +99,13 @@ void events_terminate_entry (void) { _tmp3_ = events__unit_init_count; #line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala" _tmp0_ = _tmp3_ != 0; -#line 98 "_EventsInternals.c" +#line 103 "_EventsInternals.c" } #line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala" if (_tmp0_) { #line 24 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala" return; -#line 104 "_EventsInternals.c" +#line 109 "_EventsInternals.c" } #line 26 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala" events_terminate (); @@ -108,7 +113,7 @@ void events_terminate_entry (void) { unit_terminate_entry (); #line 28 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala" sidebar_terminate_entry (); -#line 112 "_EventsInternals.c" +#line 117 "_EventsInternals.c" } diff --git a/src/.unitize/_FoldersInternals.c b/src/.unitize/_FoldersInternals.c index 3e32a79..74a8652 100644 --- a/src/.unitize/_FoldersInternals.c +++ b/src/.unitize/_FoldersInternals.c @@ -1,4 +1,4 @@ -/* _FoldersInternals.c generated by valac 0.36.6, the Vala compiler +/* _FoldersInternals.c generated by valac 0.40.4, the Vala compiler * generated from _FoldersInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -29,7 +30,9 @@ void sidebar_terminate_entry (void); void photos_terminate_entry (void); -void folders_init_entry (GError** error) { +void +folders_init_entry (GError** error) +{ gint _tmp0_; GError * _inner_error_ = NULL; #line 14 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala" @@ -40,7 +43,7 @@ void folders_init_entry (GError** error) { if (_tmp0_ != 0) { #line 15 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala" return; -#line 44 "_FoldersInternals.c" +#line 47 "_FoldersInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala" unit_init_entry (&_inner_error_); @@ -50,7 +53,7 @@ void folders_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala" return; -#line 54 "_FoldersInternals.c" +#line 57 "_FoldersInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala" sidebar_init_entry (&_inner_error_); @@ -60,7 +63,7 @@ void folders_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala" return; -#line 64 "_FoldersInternals.c" +#line 67 "_FoldersInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala" photos_init_entry (&_inner_error_); @@ -70,7 +73,7 @@ void folders_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala" return; -#line 74 "_FoldersInternals.c" +#line 77 "_FoldersInternals.c" } #line 19 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala" folders_init (&_inner_error_); @@ -80,12 +83,14 @@ void folders_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 19 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala" return; -#line 84 "_FoldersInternals.c" +#line 87 "_FoldersInternals.c" } } -void folders_terminate_entry (void) { +void +folders_terminate_entry (void) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala" @@ -94,7 +99,7 @@ void folders_terminate_entry (void) { if (_tmp1_ == 0) { #line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala" _tmp0_ = TRUE; -#line 98 "_FoldersInternals.c" +#line 103 "_FoldersInternals.c" } else { gint _tmp2_; gint _tmp3_; @@ -106,13 +111,13 @@ void folders_terminate_entry (void) { _tmp3_ = folders__unit_init_count; #line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala" _tmp0_ = _tmp3_ != 0; -#line 110 "_FoldersInternals.c" +#line 115 "_FoldersInternals.c" } #line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala" if (_tmp0_) { #line 24 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala" return; -#line 116 "_FoldersInternals.c" +#line 121 "_FoldersInternals.c" } #line 26 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala" folders_terminate (); @@ -122,7 +127,7 @@ void folders_terminate_entry (void) { sidebar_terminate_entry (); #line 28 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala" photos_terminate_entry (); -#line 126 "_FoldersInternals.c" +#line 131 "_FoldersInternals.c" } diff --git a/src/.unitize/_LibraryInternals.c b/src/.unitize/_LibraryInternals.c index fd91e7b..84c32c0 100644 --- a/src/.unitize/_LibraryInternals.c +++ b/src/.unitize/_LibraryInternals.c @@ -1,4 +1,4 @@ -/* _LibraryInternals.c generated by valac 0.36.6, the Vala compiler +/* _LibraryInternals.c generated by valac 0.40.4, the Vala compiler * generated from _LibraryInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -55,7 +56,9 @@ void data_imports_terminate_entry (void); void folders_terminate_entry (void); -void library_init_entry (GError** error) { +void +library_init_entry (GError** error) +{ gint _tmp0_; GError * _inner_error_ = NULL; #line 14 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" @@ -66,7 +69,7 @@ void library_init_entry (GError** error) { if (_tmp0_ != 0) { #line 15 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" return; -#line 70 "_LibraryInternals.c" +#line 73 "_LibraryInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" unit_init_entry (&_inner_error_); @@ -76,7 +79,7 @@ void library_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" return; -#line 80 "_LibraryInternals.c" +#line 83 "_LibraryInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" util_init_entry (&_inner_error_); @@ -86,7 +89,7 @@ void library_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" return; -#line 90 "_LibraryInternals.c" +#line 93 "_LibraryInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" threads_init_entry (&_inner_error_); @@ -96,7 +99,7 @@ void library_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" return; -#line 100 "_LibraryInternals.c" +#line 103 "_LibraryInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" db_init_entry (&_inner_error_); @@ -106,7 +109,7 @@ void library_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" return; -#line 110 "_LibraryInternals.c" +#line 113 "_LibraryInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" plugins_init_entry (&_inner_error_); @@ -116,7 +119,7 @@ void library_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" return; -#line 120 "_LibraryInternals.c" +#line 123 "_LibraryInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" slideshow_init_entry (&_inner_error_); @@ -126,7 +129,7 @@ void library_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" return; -#line 130 "_LibraryInternals.c" +#line 133 "_LibraryInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" photos_init_entry (&_inner_error_); @@ -136,7 +139,7 @@ void library_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" return; -#line 140 "_LibraryInternals.c" +#line 143 "_LibraryInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" publishing_init_entry (&_inner_error_); @@ -146,7 +149,7 @@ void library_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" return; -#line 150 "_LibraryInternals.c" +#line 153 "_LibraryInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" core_init_entry (&_inner_error_); @@ -156,7 +159,7 @@ void library_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" return; -#line 160 "_LibraryInternals.c" +#line 163 "_LibraryInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" sidebar_init_entry (&_inner_error_); @@ -166,7 +169,7 @@ void library_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" return; -#line 170 "_LibraryInternals.c" +#line 173 "_LibraryInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" events_init_entry (&_inner_error_); @@ -176,7 +179,7 @@ void library_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" return; -#line 180 "_LibraryInternals.c" +#line 183 "_LibraryInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" tags_init_entry (&_inner_error_); @@ -186,7 +189,7 @@ void library_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" return; -#line 190 "_LibraryInternals.c" +#line 193 "_LibraryInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" camera_init_entry (&_inner_error_); @@ -196,7 +199,7 @@ void library_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" return; -#line 200 "_LibraryInternals.c" +#line 203 "_LibraryInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" searches_init_entry (&_inner_error_); @@ -206,7 +209,7 @@ void library_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" return; -#line 210 "_LibraryInternals.c" +#line 213 "_LibraryInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" data_imports_init_entry (&_inner_error_); @@ -216,7 +219,7 @@ void library_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" return; -#line 220 "_LibraryInternals.c" +#line 223 "_LibraryInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" folders_init_entry (&_inner_error_); @@ -226,7 +229,7 @@ void library_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" return; -#line 230 "_LibraryInternals.c" +#line 233 "_LibraryInternals.c" } #line 19 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" library_init (&_inner_error_); @@ -236,12 +239,14 @@ void library_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 19 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" return; -#line 240 "_LibraryInternals.c" +#line 243 "_LibraryInternals.c" } } -void library_terminate_entry (void) { +void +library_terminate_entry (void) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" @@ -250,7 +255,7 @@ void library_terminate_entry (void) { if (_tmp1_ == 0) { #line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" _tmp0_ = TRUE; -#line 254 "_LibraryInternals.c" +#line 259 "_LibraryInternals.c" } else { gint _tmp2_; gint _tmp3_; @@ -262,13 +267,13 @@ void library_terminate_entry (void) { _tmp3_ = library__unit_init_count; #line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" _tmp0_ = _tmp3_ != 0; -#line 266 "_LibraryInternals.c" +#line 271 "_LibraryInternals.c" } #line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" if (_tmp0_) { #line 24 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" return; -#line 272 "_LibraryInternals.c" +#line 277 "_LibraryInternals.c" } #line 26 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" library_terminate (); @@ -304,7 +309,7 @@ void library_terminate_entry (void) { data_imports_terminate_entry (); #line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala" folders_terminate_entry (); -#line 308 "_LibraryInternals.c" +#line 313 "_LibraryInternals.c" } diff --git a/src/.unitize/_Library_unitize_entry.c b/src/.unitize/_Library_unitize_entry.c index 21c9b1c..a0172d9 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.36.6, the Vala compiler +/* _Library_unitize_entry.c generated by valac 0.40.4, the Vala compiler * generated from _Library_unitize_entry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -21,7 +22,9 @@ void library_app_terminate (void); void library_terminate_entry (void); -void library_app_init (GError** error) { +void +library_app_init (GError** error) +{ GError * _inner_error_ = NULL; #line 12 "/home/jens/Source/shotwell/src/.unitize/_Library_unitize_entry.vala" library_init_entry (&_inner_error_); @@ -31,15 +34,17 @@ void library_app_init (GError** error) { g_propagate_error (error, _inner_error_); #line 12 "/home/jens/Source/shotwell/src/.unitize/_Library_unitize_entry.vala" return; -#line 35 "_Library_unitize_entry.c" +#line 38 "_Library_unitize_entry.c" } } -void library_app_terminate (void) { +void +library_app_terminate (void) +{ #line 16 "/home/jens/Source/shotwell/src/.unitize/_Library_unitize_entry.vala" library_terminate_entry (); -#line 43 "_Library_unitize_entry.c" +#line 48 "_Library_unitize_entry.c" } diff --git a/src/.unitize/_PhotosInternals.c b/src/.unitize/_PhotosInternals.c index 0b0b1a0..8a32cae 100644 --- a/src/.unitize/_PhotosInternals.c +++ b/src/.unitize/_PhotosInternals.c @@ -1,4 +1,4 @@ -/* _PhotosInternals.c generated by valac 0.36.6, the Vala compiler +/* _PhotosInternals.c generated by valac 0.40.4, the Vala compiler * generated from _PhotosInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -25,7 +26,9 @@ void photos_terminate (void); void unit_terminate_entry (void); -void photos_init_entry (GError** error) { +void +photos_init_entry (GError** error) +{ gint _tmp0_; GError * _inner_error_ = NULL; #line 14 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala" @@ -36,7 +39,7 @@ void photos_init_entry (GError** error) { if (_tmp0_ != 0) { #line 15 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala" return; -#line 40 "_PhotosInternals.c" +#line 43 "_PhotosInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala" unit_init_entry (&_inner_error_); @@ -46,7 +49,7 @@ void photos_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala" return; -#line 50 "_PhotosInternals.c" +#line 53 "_PhotosInternals.c" } #line 19 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala" photos_init (&_inner_error_); @@ -56,12 +59,14 @@ void photos_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 19 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala" return; -#line 60 "_PhotosInternals.c" +#line 63 "_PhotosInternals.c" } } -void photos_terminate_entry (void) { +void +photos_terminate_entry (void) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala" @@ -70,7 +75,7 @@ void photos_terminate_entry (void) { if (_tmp1_ == 0) { #line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala" _tmp0_ = TRUE; -#line 74 "_PhotosInternals.c" +#line 79 "_PhotosInternals.c" } else { gint _tmp2_; gint _tmp3_; @@ -82,19 +87,19 @@ void photos_terminate_entry (void) { _tmp3_ = photos__unit_init_count; #line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala" _tmp0_ = _tmp3_ != 0; -#line 86 "_PhotosInternals.c" +#line 91 "_PhotosInternals.c" } #line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala" if (_tmp0_) { #line 24 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala" return; -#line 92 "_PhotosInternals.c" +#line 97 "_PhotosInternals.c" } #line 26 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala" photos_terminate (); #line 28 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala" unit_terminate_entry (); -#line 98 "_PhotosInternals.c" +#line 103 "_PhotosInternals.c" } diff --git a/src/.unitize/_PluginsInternals.c b/src/.unitize/_PluginsInternals.c index f5f81a8..350ca1d 100644 --- a/src/.unitize/_PluginsInternals.c +++ b/src/.unitize/_PluginsInternals.c @@ -1,4 +1,4 @@ -/* _PluginsInternals.c generated by valac 0.36.6, the Vala compiler +/* _PluginsInternals.c generated by valac 0.40.4, the Vala compiler * generated from _PluginsInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -27,7 +28,9 @@ void unit_terminate_entry (void); void util_terminate_entry (void); -void plugins_init_entry (GError** error) { +void +plugins_init_entry (GError** error) +{ gint _tmp0_; GError * _inner_error_ = NULL; #line 14 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala" @@ -38,7 +41,7 @@ void plugins_init_entry (GError** error) { if (_tmp0_ != 0) { #line 15 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala" return; -#line 42 "_PluginsInternals.c" +#line 45 "_PluginsInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala" unit_init_entry (&_inner_error_); @@ -48,7 +51,7 @@ void plugins_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala" return; -#line 52 "_PluginsInternals.c" +#line 55 "_PluginsInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala" util_init_entry (&_inner_error_); @@ -58,7 +61,7 @@ void plugins_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala" return; -#line 62 "_PluginsInternals.c" +#line 65 "_PluginsInternals.c" } #line 19 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala" plugins_init (&_inner_error_); @@ -68,12 +71,14 @@ void plugins_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 19 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala" return; -#line 72 "_PluginsInternals.c" +#line 75 "_PluginsInternals.c" } } -void plugins_terminate_entry (void) { +void +plugins_terminate_entry (void) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala" @@ -82,7 +87,7 @@ void plugins_terminate_entry (void) { if (_tmp1_ == 0) { #line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala" _tmp0_ = TRUE; -#line 86 "_PluginsInternals.c" +#line 91 "_PluginsInternals.c" } else { gint _tmp2_; gint _tmp3_; @@ -94,13 +99,13 @@ void plugins_terminate_entry (void) { _tmp3_ = plugins__unit_init_count; #line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala" _tmp0_ = _tmp3_ != 0; -#line 98 "_PluginsInternals.c" +#line 103 "_PluginsInternals.c" } #line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala" if (_tmp0_) { #line 24 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala" return; -#line 104 "_PluginsInternals.c" +#line 109 "_PluginsInternals.c" } #line 26 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala" plugins_terminate (); @@ -108,7 +113,7 @@ void plugins_terminate_entry (void) { unit_terminate_entry (); #line 28 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala" util_terminate_entry (); -#line 112 "_PluginsInternals.c" +#line 117 "_PluginsInternals.c" } diff --git a/src/.unitize/_PublishingInternals.c b/src/.unitize/_PublishingInternals.c index 3a969ab..df50c67 100644 --- a/src/.unitize/_PublishingInternals.c +++ b/src/.unitize/_PublishingInternals.c @@ -1,4 +1,4 @@ -/* _PublishingInternals.c generated by valac 0.36.6, the Vala compiler +/* _PublishingInternals.c generated by valac 0.40.4, the Vala compiler * generated from _PublishingInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -27,7 +28,9 @@ void unit_terminate_entry (void); void plugins_terminate_entry (void); -void publishing_init_entry (GError** error) { +void +publishing_init_entry (GError** error) +{ gint _tmp0_; GError * _inner_error_ = NULL; #line 14 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala" @@ -38,7 +41,7 @@ void publishing_init_entry (GError** error) { if (_tmp0_ != 0) { #line 15 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala" return; -#line 42 "_PublishingInternals.c" +#line 45 "_PublishingInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala" unit_init_entry (&_inner_error_); @@ -48,7 +51,7 @@ void publishing_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala" return; -#line 52 "_PublishingInternals.c" +#line 55 "_PublishingInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala" plugins_init_entry (&_inner_error_); @@ -58,7 +61,7 @@ void publishing_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala" return; -#line 62 "_PublishingInternals.c" +#line 65 "_PublishingInternals.c" } #line 19 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala" publishing_init (&_inner_error_); @@ -68,12 +71,14 @@ void publishing_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 19 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala" return; -#line 72 "_PublishingInternals.c" +#line 75 "_PublishingInternals.c" } } -void publishing_terminate_entry (void) { +void +publishing_terminate_entry (void) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala" @@ -82,7 +87,7 @@ void publishing_terminate_entry (void) { if (_tmp1_ == 0) { #line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala" _tmp0_ = TRUE; -#line 86 "_PublishingInternals.c" +#line 91 "_PublishingInternals.c" } else { gint _tmp2_; gint _tmp3_; @@ -94,13 +99,13 @@ void publishing_terminate_entry (void) { _tmp3_ = publishing__unit_init_count; #line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala" _tmp0_ = _tmp3_ != 0; -#line 98 "_PublishingInternals.c" +#line 103 "_PublishingInternals.c" } #line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala" if (_tmp0_) { #line 24 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala" return; -#line 104 "_PublishingInternals.c" +#line 109 "_PublishingInternals.c" } #line 26 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala" publishing_terminate (); @@ -108,7 +113,7 @@ void publishing_terminate_entry (void) { unit_terminate_entry (); #line 28 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala" plugins_terminate_entry (); -#line 112 "_PublishingInternals.c" +#line 117 "_PublishingInternals.c" } diff --git a/src/.unitize/_SearchesInternals.c b/src/.unitize/_SearchesInternals.c index 9b323db..c630aff 100644 --- a/src/.unitize/_SearchesInternals.c +++ b/src/.unitize/_SearchesInternals.c @@ -1,4 +1,4 @@ -/* _SearchesInternals.c generated by valac 0.36.6, the Vala compiler +/* _SearchesInternals.c generated by valac 0.40.4, the Vala compiler * generated from _SearchesInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -25,7 +26,9 @@ void searches_terminate (void); void unit_terminate_entry (void); -void searches_init_entry (GError** error) { +void +searches_init_entry (GError** error) +{ gint _tmp0_; GError * _inner_error_ = NULL; #line 14 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala" @@ -36,7 +39,7 @@ void searches_init_entry (GError** error) { if (_tmp0_ != 0) { #line 15 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala" return; -#line 40 "_SearchesInternals.c" +#line 43 "_SearchesInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala" unit_init_entry (&_inner_error_); @@ -46,7 +49,7 @@ void searches_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala" return; -#line 50 "_SearchesInternals.c" +#line 53 "_SearchesInternals.c" } #line 19 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala" searches_init (&_inner_error_); @@ -56,12 +59,14 @@ void searches_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 19 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala" return; -#line 60 "_SearchesInternals.c" +#line 63 "_SearchesInternals.c" } } -void searches_terminate_entry (void) { +void +searches_terminate_entry (void) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala" @@ -70,7 +75,7 @@ void searches_terminate_entry (void) { if (_tmp1_ == 0) { #line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala" _tmp0_ = TRUE; -#line 74 "_SearchesInternals.c" +#line 79 "_SearchesInternals.c" } else { gint _tmp2_; gint _tmp3_; @@ -82,19 +87,19 @@ void searches_terminate_entry (void) { _tmp3_ = searches__unit_init_count; #line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala" _tmp0_ = _tmp3_ != 0; -#line 86 "_SearchesInternals.c" +#line 91 "_SearchesInternals.c" } #line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala" if (_tmp0_) { #line 24 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala" return; -#line 92 "_SearchesInternals.c" +#line 97 "_SearchesInternals.c" } #line 26 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala" searches_terminate (); #line 28 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala" unit_terminate_entry (); -#line 98 "_SearchesInternals.c" +#line 103 "_SearchesInternals.c" } diff --git a/src/.unitize/_SidebarInternals.c b/src/.unitize/_SidebarInternals.c index 19c5e4d..6ea5d4e 100644 --- a/src/.unitize/_SidebarInternals.c +++ b/src/.unitize/_SidebarInternals.c @@ -1,4 +1,4 @@ -/* _SidebarInternals.c generated by valac 0.36.6, the Vala compiler +/* _SidebarInternals.c generated by valac 0.40.4, the Vala compiler * generated from _SidebarInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -25,7 +26,9 @@ void sidebar_terminate (void); void unit_terminate_entry (void); -void sidebar_init_entry (GError** error) { +void +sidebar_init_entry (GError** error) +{ gint _tmp0_; GError * _inner_error_ = NULL; #line 14 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala" @@ -36,7 +39,7 @@ void sidebar_init_entry (GError** error) { if (_tmp0_ != 0) { #line 15 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala" return; -#line 40 "_SidebarInternals.c" +#line 43 "_SidebarInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala" unit_init_entry (&_inner_error_); @@ -46,7 +49,7 @@ void sidebar_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala" return; -#line 50 "_SidebarInternals.c" +#line 53 "_SidebarInternals.c" } #line 19 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala" sidebar_init (&_inner_error_); @@ -56,12 +59,14 @@ void sidebar_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 19 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala" return; -#line 60 "_SidebarInternals.c" +#line 63 "_SidebarInternals.c" } } -void sidebar_terminate_entry (void) { +void +sidebar_terminate_entry (void) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala" @@ -70,7 +75,7 @@ void sidebar_terminate_entry (void) { if (_tmp1_ == 0) { #line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala" _tmp0_ = TRUE; -#line 74 "_SidebarInternals.c" +#line 79 "_SidebarInternals.c" } else { gint _tmp2_; gint _tmp3_; @@ -82,19 +87,19 @@ void sidebar_terminate_entry (void) { _tmp3_ = sidebar__unit_init_count; #line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala" _tmp0_ = _tmp3_ != 0; -#line 86 "_SidebarInternals.c" +#line 91 "_SidebarInternals.c" } #line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala" if (_tmp0_) { #line 24 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala" return; -#line 92 "_SidebarInternals.c" +#line 97 "_SidebarInternals.c" } #line 26 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala" sidebar_terminate (); #line 28 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala" unit_terminate_entry (); -#line 98 "_SidebarInternals.c" +#line 103 "_SidebarInternals.c" } diff --git a/src/.unitize/_SlideshowInternals.c b/src/.unitize/_SlideshowInternals.c index 3b924bb..1fc0686 100644 --- a/src/.unitize/_SlideshowInternals.c +++ b/src/.unitize/_SlideshowInternals.c @@ -1,4 +1,4 @@ -/* _SlideshowInternals.c generated by valac 0.36.6, the Vala compiler +/* _SlideshowInternals.c generated by valac 0.40.4, the Vala compiler * generated from _SlideshowInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -27,7 +28,9 @@ void unit_terminate_entry (void); void plugins_terminate_entry (void); -void slideshow_init_entry (GError** error) { +void +slideshow_init_entry (GError** error) +{ gint _tmp0_; GError * _inner_error_ = NULL; #line 14 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala" @@ -38,7 +41,7 @@ void slideshow_init_entry (GError** error) { if (_tmp0_ != 0) { #line 15 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala" return; -#line 42 "_SlideshowInternals.c" +#line 45 "_SlideshowInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala" unit_init_entry (&_inner_error_); @@ -48,7 +51,7 @@ void slideshow_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala" return; -#line 52 "_SlideshowInternals.c" +#line 55 "_SlideshowInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala" plugins_init_entry (&_inner_error_); @@ -58,7 +61,7 @@ void slideshow_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala" return; -#line 62 "_SlideshowInternals.c" +#line 65 "_SlideshowInternals.c" } #line 19 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala" slideshow_init (&_inner_error_); @@ -68,12 +71,14 @@ void slideshow_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 19 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala" return; -#line 72 "_SlideshowInternals.c" +#line 75 "_SlideshowInternals.c" } } -void slideshow_terminate_entry (void) { +void +slideshow_terminate_entry (void) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala" @@ -82,7 +87,7 @@ void slideshow_terminate_entry (void) { if (_tmp1_ == 0) { #line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala" _tmp0_ = TRUE; -#line 86 "_SlideshowInternals.c" +#line 91 "_SlideshowInternals.c" } else { gint _tmp2_; gint _tmp3_; @@ -94,13 +99,13 @@ void slideshow_terminate_entry (void) { _tmp3_ = slideshow__unit_init_count; #line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala" _tmp0_ = _tmp3_ != 0; -#line 98 "_SlideshowInternals.c" +#line 103 "_SlideshowInternals.c" } #line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala" if (_tmp0_) { #line 24 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala" return; -#line 104 "_SlideshowInternals.c" +#line 109 "_SlideshowInternals.c" } #line 26 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala" slideshow_terminate (); @@ -108,7 +113,7 @@ void slideshow_terminate_entry (void) { unit_terminate_entry (); #line 28 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala" plugins_terminate_entry (); -#line 112 "_SlideshowInternals.c" +#line 117 "_SlideshowInternals.c" } diff --git a/src/.unitize/_TagsInternals.c b/src/.unitize/_TagsInternals.c index a538593..0383b23 100644 --- a/src/.unitize/_TagsInternals.c +++ b/src/.unitize/_TagsInternals.c @@ -1,4 +1,4 @@ -/* _TagsInternals.c generated by valac 0.36.6, the Vala compiler +/* _TagsInternals.c generated by valac 0.40.4, the Vala compiler * generated from _TagsInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -27,7 +28,9 @@ void unit_terminate_entry (void); void sidebar_terminate_entry (void); -void tags_init_entry (GError** error) { +void +tags_init_entry (GError** error) +{ gint _tmp0_; GError * _inner_error_ = NULL; #line 14 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala" @@ -38,7 +41,7 @@ void tags_init_entry (GError** error) { if (_tmp0_ != 0) { #line 15 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala" return; -#line 42 "_TagsInternals.c" +#line 45 "_TagsInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala" unit_init_entry (&_inner_error_); @@ -48,7 +51,7 @@ void tags_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala" return; -#line 52 "_TagsInternals.c" +#line 55 "_TagsInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala" sidebar_init_entry (&_inner_error_); @@ -58,7 +61,7 @@ void tags_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala" return; -#line 62 "_TagsInternals.c" +#line 65 "_TagsInternals.c" } #line 19 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala" tags_init (&_inner_error_); @@ -68,12 +71,14 @@ void tags_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 19 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala" return; -#line 72 "_TagsInternals.c" +#line 75 "_TagsInternals.c" } } -void tags_terminate_entry (void) { +void +tags_terminate_entry (void) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala" @@ -82,7 +87,7 @@ void tags_terminate_entry (void) { if (_tmp1_ == 0) { #line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala" _tmp0_ = TRUE; -#line 86 "_TagsInternals.c" +#line 91 "_TagsInternals.c" } else { gint _tmp2_; gint _tmp3_; @@ -94,13 +99,13 @@ void tags_terminate_entry (void) { _tmp3_ = tags__unit_init_count; #line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala" _tmp0_ = _tmp3_ != 0; -#line 98 "_TagsInternals.c" +#line 103 "_TagsInternals.c" } #line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala" if (_tmp0_) { #line 24 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala" return; -#line 104 "_TagsInternals.c" +#line 109 "_TagsInternals.c" } #line 26 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala" tags_terminate (); @@ -108,7 +113,7 @@ void tags_terminate_entry (void) { unit_terminate_entry (); #line 28 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala" sidebar_terminate_entry (); -#line 112 "_TagsInternals.c" +#line 117 "_TagsInternals.c" } diff --git a/src/.unitize/_ThreadsInternals.c b/src/.unitize/_ThreadsInternals.c index f4bba14..db67d9d 100644 --- a/src/.unitize/_ThreadsInternals.c +++ b/src/.unitize/_ThreadsInternals.c @@ -1,4 +1,4 @@ -/* _ThreadsInternals.c generated by valac 0.36.6, the Vala compiler +/* _ThreadsInternals.c generated by valac 0.40.4, the Vala compiler * generated from _ThreadsInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -25,7 +26,9 @@ void threads_terminate (void); void unit_terminate_entry (void); -void threads_init_entry (GError** error) { +void +threads_init_entry (GError** error) +{ gint _tmp0_; GError * _inner_error_ = NULL; #line 14 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala" @@ -36,7 +39,7 @@ void threads_init_entry (GError** error) { if (_tmp0_ != 0) { #line 15 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala" return; -#line 40 "_ThreadsInternals.c" +#line 43 "_ThreadsInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala" unit_init_entry (&_inner_error_); @@ -46,7 +49,7 @@ void threads_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala" return; -#line 50 "_ThreadsInternals.c" +#line 53 "_ThreadsInternals.c" } #line 19 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala" threads_init (&_inner_error_); @@ -56,12 +59,14 @@ void threads_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 19 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala" return; -#line 60 "_ThreadsInternals.c" +#line 63 "_ThreadsInternals.c" } } -void threads_terminate_entry (void) { +void +threads_terminate_entry (void) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala" @@ -70,7 +75,7 @@ void threads_terminate_entry (void) { if (_tmp1_ == 0) { #line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala" _tmp0_ = TRUE; -#line 74 "_ThreadsInternals.c" +#line 79 "_ThreadsInternals.c" } else { gint _tmp2_; gint _tmp3_; @@ -82,19 +87,19 @@ void threads_terminate_entry (void) { _tmp3_ = threads__unit_init_count; #line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala" _tmp0_ = _tmp3_ != 0; -#line 86 "_ThreadsInternals.c" +#line 91 "_ThreadsInternals.c" } #line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala" if (_tmp0_) { #line 24 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala" return; -#line 92 "_ThreadsInternals.c" +#line 97 "_ThreadsInternals.c" } #line 26 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala" threads_terminate (); #line 28 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala" unit_terminate_entry (); -#line 98 "_ThreadsInternals.c" +#line 103 "_ThreadsInternals.c" } diff --git a/src/.unitize/_UnitInternals.c b/src/.unitize/_UnitInternals.c index ee8e879..998da34 100644 --- a/src/.unitize/_UnitInternals.c +++ b/src/.unitize/_UnitInternals.c @@ -1,4 +1,4 @@ -/* _UnitInternals.c generated by valac 0.36.6, the Vala compiler +/* _UnitInternals.c generated by valac 0.40.4, the Vala compiler * generated from _UnitInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -23,7 +24,9 @@ void unit_terminate_entry (void); void unit_terminate (void); -void unit_init_entry (GError** error) { +void +unit_init_entry (GError** error) +{ gint _tmp0_; GError * _inner_error_ = NULL; #line 14 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala" @@ -34,7 +37,7 @@ void unit_init_entry (GError** error) { if (_tmp0_ != 0) { #line 15 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala" return; -#line 38 "_UnitInternals.c" +#line 41 "_UnitInternals.c" } #line 19 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala" unit_init (&_inner_error_); @@ -44,12 +47,14 @@ void unit_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 19 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala" return; -#line 48 "_UnitInternals.c" +#line 51 "_UnitInternals.c" } } -void unit_terminate_entry (void) { +void +unit_terminate_entry (void) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala" @@ -58,7 +63,7 @@ void unit_terminate_entry (void) { if (_tmp1_ == 0) { #line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala" _tmp0_ = TRUE; -#line 62 "_UnitInternals.c" +#line 67 "_UnitInternals.c" } else { gint _tmp2_; gint _tmp3_; @@ -70,17 +75,17 @@ void unit_terminate_entry (void) { _tmp3_ = unit__unit_init_count; #line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala" _tmp0_ = _tmp3_ != 0; -#line 74 "_UnitInternals.c" +#line 79 "_UnitInternals.c" } #line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala" if (_tmp0_) { #line 24 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala" return; -#line 80 "_UnitInternals.c" +#line 85 "_UnitInternals.c" } #line 26 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala" unit_terminate (); -#line 84 "_UnitInternals.c" +#line 89 "_UnitInternals.c" } diff --git a/src/.unitize/_UtilInternals.c b/src/.unitize/_UtilInternals.c index 628306b..c52fbcd 100644 --- a/src/.unitize/_UtilInternals.c +++ b/src/.unitize/_UtilInternals.c @@ -1,4 +1,4 @@ -/* _UtilInternals.c generated by valac 0.36.6, the Vala compiler +/* _UtilInternals.c generated by valac 0.40.4, the Vala compiler * generated from _UtilInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ * Auto-generated file. Do not modify! */ + #include #include @@ -25,7 +26,9 @@ void util_terminate (void); void unit_terminate_entry (void); -void util_init_entry (GError** error) { +void +util_init_entry (GError** error) +{ gint _tmp0_; GError * _inner_error_ = NULL; #line 14 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala" @@ -36,7 +39,7 @@ void util_init_entry (GError** error) { if (_tmp0_ != 0) { #line 15 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala" return; -#line 40 "_UtilInternals.c" +#line 43 "_UtilInternals.c" } #line 17 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala" unit_init_entry (&_inner_error_); @@ -46,7 +49,7 @@ void util_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 17 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala" return; -#line 50 "_UtilInternals.c" +#line 53 "_UtilInternals.c" } #line 19 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala" util_init (&_inner_error_); @@ -56,12 +59,14 @@ void util_init_entry (GError** error) { g_propagate_error (error, _inner_error_); #line 19 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala" return; -#line 60 "_UtilInternals.c" +#line 63 "_UtilInternals.c" } } -void util_terminate_entry (void) { +void +util_terminate_entry (void) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala" @@ -70,7 +75,7 @@ void util_terminate_entry (void) { if (_tmp1_ == 0) { #line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala" _tmp0_ = TRUE; -#line 74 "_UtilInternals.c" +#line 79 "_UtilInternals.c" } else { gint _tmp2_; gint _tmp3_; @@ -82,19 +87,19 @@ void util_terminate_entry (void) { _tmp3_ = util__unit_init_count; #line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala" _tmp0_ = _tmp3_ != 0; -#line 86 "_UtilInternals.c" +#line 91 "_UtilInternals.c" } #line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala" if (_tmp0_) { #line 24 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala" return; -#line 92 "_UtilInternals.c" +#line 97 "_UtilInternals.c" } #line 26 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala" util_terminate (); #line 28 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala" unit_terminate_entry (); -#line 98 "_UtilInternals.c" +#line 103 "_UtilInternals.c" } diff --git a/src/AppDirs.c b/src/AppDirs.c index 97986d0..ed0c0ca 100644 --- a/src/AppDirs.c +++ b/src/AppDirs.c @@ -1,4 +1,4 @@ -/* AppDirs.c generated by valac 0.36.6, the Vala compiler +/* AppDirs.c generated by valac 0.40.4, the Vala compiler * generated from AppDirs.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -88,14 +89,17 @@ static GFile* app_dirs_libexec_dir = NULL; gpointer app_dirs_ref (gpointer instance); void app_dirs_unref (gpointer instance); -GParamSpec* param_spec_app_dirs (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_app_dirs (GValue* value, gpointer v_object); -void value_take_app_dirs (GValue* value, gpointer v_object); +GParamSpec* param_spec_app_dirs (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_app_dirs (GValue* value, + gpointer v_object); +void value_take_app_dirs (GValue* value, + gpointer v_object); gpointer value_get_app_dirs (const GValue* value); GType app_dirs_get_type (void) G_GNUC_CONST; -enum { - APP_DIRS_DUMMY_PROPERTY -}; #define APP_DIRS_DEFAULT_DATA_DIR "shotwell" void app_dirs_init (const gchar* arg0); void app_dirs_terminate (void); @@ -125,11 +129,14 @@ gchar* configuration_facade_get_directory_pattern (ConfigurationFacade* self); gchar* configuration_facade_get_directory_pattern_custom (ConfigurationFacade* self); gboolean app_dirs_is_in_import_dir (GFile* file); void app_dirs_set_import_dir (const gchar* path); -void configuration_facade_set_import_dir (ConfigurationFacade* self, const gchar* import_dir); +void configuration_facade_set_import_dir (ConfigurationFacade* self, + const gchar* import_dir); GFile* app_dirs_get_temp_dir (void); -GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname); +GFile* app_dirs_get_data_subdir (const gchar* name, + const gchar* subname); void app_dirs_ensure_writable (GFile* dir); -GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname); +GFile* app_dirs_get_cache_subdir (const gchar* name, + const gchar* subname); GFile* app_dirs_get_lib_dir (void); #define RESOURCES_LIB _LIB GFile* app_dirs_get_system_plugins_dir (void); @@ -141,55 +148,58 @@ AppDirs* app_dirs_construct (GType object_type); static void app_dirs_finalize (AppDirs * obj); -void app_dirs_init (const gchar* arg0) { +void +app_dirs_init (const gchar* arg0) +{ GFile* exec_file = NULL; - const gchar* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; + GFile* _tmp4_; GFile* _tmp5_; GFile* _tmp6_; - GFile* _tmp7_; #line 16 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_if_fail (arg0 != NULL); #line 17 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp0_ = arg0; + _tmp0_ = g_find_program_in_path (arg0); #line 17 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp1_ = g_find_program_in_path (_tmp0_); -#line 17 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 17 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp3_ = realpath (_tmp2_, NULL); + _tmp2_ = realpath (_tmp1_, NULL); #line 17 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 17 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = g_file_new_for_path (_tmp4_); + _tmp4_ = g_file_new_for_path (_tmp3_); #line 17 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 17 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 17 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 17 "/home/jens/Source/shotwell/src/AppDirs.vala" - exec_file = _tmp6_; + exec_file = _tmp5_; #line 18 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = g_file_get_parent (exec_file); + _tmp6_ = g_file_get_parent (exec_file); #line 18 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (app_dirs_exec_dir); #line 18 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_dirs_exec_dir = _tmp7_; + app_dirs_exec_dir = _tmp6_; #line 16 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (exec_file); -#line 185 "AppDirs.c" +#line 191 "AppDirs.c" } -void app_dirs_terminate (void) { +void +app_dirs_terminate (void) +{ } -GFile* app_dirs_get_home_dir (void) { +GFile* +app_dirs_get_home_dir (void) +{ GFile* result = NULL; const gchar* _tmp0_; GFile* _tmp1_; @@ -201,18 +211,22 @@ GFile* app_dirs_get_home_dir (void) { result = _tmp1_; #line 27 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 205 "AppDirs.c" +#line 215 "AppDirs.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 33 "/home/jens/Source/shotwell/src/AppDirs.vala" return self ? g_object_ref (self) : NULL; -#line 212 "AppDirs.c" +#line 224 "AppDirs.c" } -GFile* app_dirs_get_cache_dir (void) { +GFile* +app_dirs_get_cache_dir (void) +{ GFile* result = NULL; GFile* _tmp0_ = NULL; GFile* _tmp1_; @@ -220,7 +234,7 @@ GFile* app_dirs_get_cache_dir (void) { _tmp1_ = app_dirs_data_dir; #line 31 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp1_ == NULL) { -#line 224 "AppDirs.c" +#line 238 "AppDirs.c" const gchar* _tmp2_; GFile* _tmp3_; GFile* _tmp4_; @@ -239,7 +253,7 @@ GFile* app_dirs_get_cache_dir (void) { _tmp0_ = _tmp5_; #line 32 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp4_); -#line 243 "AppDirs.c" +#line 257 "AppDirs.c" } else { GFile* _tmp6_; GFile* _tmp7_; @@ -251,17 +265,19 @@ GFile* app_dirs_get_cache_dir (void) { _g_object_unref0 (_tmp0_); #line 33 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = _tmp7_; -#line 255 "AppDirs.c" +#line 269 "AppDirs.c" } #line 31 "/home/jens/Source/shotwell/src/AppDirs.vala" result = _tmp0_; #line 31 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 261 "AppDirs.c" +#line 275 "AppDirs.c" } -void app_dirs_try_migrate_data (void) { +void +app_dirs_try_migrate_data (void) +{ GFile* user_plugin_dir = NULL; GFile* _tmp0_; GFile* old_dir = NULL; @@ -275,46 +291,41 @@ void app_dirs_try_migrate_data (void) { GFile* _tmp8_; gboolean _tmp9_ = FALSE; GFile* _tmp10_; - gboolean _tmp11_; GFile* new_dir = NULL; + GFile* _tmp19_; + GFile* _tmp20_; GFile* _tmp21_; GFile* _tmp22_; - GFile* _tmp23_; + gboolean _tmp23_ = FALSE; GFile* _tmp24_; - gboolean _tmp25_ = FALSE; - GFile* _tmp26_; - gboolean _tmp27_; GFile* cache_dir = NULL; - GFile* _tmp30_; + GFile* _tmp26_; mode_t mask = {0}; - mode_t _tmp31_; - GFile* _tmp32_; - gboolean _tmp33_; + GFile* _tmp27_; + GFile* _tmp36_; + GFile* _tmp37_; + GFile* _tmp38_; + gchar* _tmp39_; + gchar* _tmp40_; + GFile* _tmp41_; GFile* _tmp42_; GFile* _tmp43_; - GFile* _tmp44_; + gchar* _tmp44_; gchar* _tmp45_; - gchar* _tmp46_; + GFile* _tmp46_; GFile* _tmp47_; GFile* _tmp48_; - GFile* _tmp49_; - gchar* _tmp50_; - gchar* _tmp51_; - GFile* _tmp52_; - GFile* _tmp53_; - GFile* _tmp54_; - gboolean _tmp55_; - gboolean _tmp56_; - GFile* _tmp69_; + gboolean _tmp49_; + GFile* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; + GFile* _tmp65_; + gchar* _tmp66_; + gchar* _tmp67_; + GFile* _tmp68_; + gchar* _tmp69_; gchar* _tmp70_; - gchar* _tmp71_; - GFile* _tmp72_; - gchar* _tmp73_; - gchar* _tmp74_; - GFile* _tmp75_; - gchar* _tmp76_; - gchar* _tmp77_; - mode_t _tmp78_; + mode_t _tmp71_; GError * _inner_error_ = NULL; #line 38 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_get_user_plugins_dir (); @@ -347,52 +358,47 @@ void app_dirs_try_migrate_data (void) { #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp10_ = old_dir; #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = g_file_query_exists (_tmp10_, NULL); -#line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp11_) { -#line 354 "AppDirs.c" + if (g_file_query_exists (_tmp10_, NULL)) { +#line 363 "AppDirs.c" + GFile* _tmp11_; GFile* _tmp12_; GFile* _tmp13_; - GFile* _tmp14_; - gboolean _tmp15_; #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = user_plugin_dir; + _tmp11_ = user_plugin_dir; #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = g_file_get_parent (_tmp12_); -#line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = _tmp13_; + _tmp12_ = g_file_get_parent (_tmp11_); #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = g_file_query_exists (_tmp14_, NULL); + _tmp13_ = _tmp12_; #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = !_tmp15_; + _tmp9_ = !g_file_query_exists (_tmp13_, NULL); #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp14_); -#line 371 "AppDirs.c" + _g_object_unref0 (_tmp13_); +#line 377 "AppDirs.c" } else { #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp9_ = FALSE; -#line 375 "AppDirs.c" +#line 381 "AppDirs.c" } #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp9_) { -#line 379 "AppDirs.c" +#line 385 "AppDirs.c" { + GFile* _tmp14_; + GFile* _tmp15_; GFile* _tmp16_; - GFile* _tmp17_; - GFile* _tmp18_; #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp16_ = user_plugin_dir; + _tmp14_ = user_plugin_dir; #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp17_ = g_file_get_parent (_tmp16_); + _tmp15_ = g_file_get_parent (_tmp14_); #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp18_ = _tmp17_; + _tmp16_ = _tmp15_; #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_file_make_directory_with_parents (_tmp18_, NULL, &_inner_error_); + g_file_make_directory_with_parents (_tmp16_, NULL, &_inner_error_); #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp16_); #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 396 "AppDirs.c" +#line 402 "AppDirs.c" goto __catch452_g_error; } } @@ -406,7 +412,7 @@ void app_dirs_try_migrate_data (void) { _inner_error_ = NULL; #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 410 "AppDirs.c" +#line 416 "AppDirs.c" } __finally452: #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -421,21 +427,21 @@ void app_dirs_try_migrate_data (void) { g_clear_error (&_inner_error_); #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 425 "AppDirs.c" +#line 431 "AppDirs.c" } } { - GFile* _tmp19_; - GFile* _tmp20_; + GFile* _tmp17_; + GFile* _tmp18_; #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp19_ = old_dir; + _tmp17_ = old_dir; #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp20_ = user_plugin_dir; + _tmp18_ = user_plugin_dir; #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_file_move (_tmp19_, _tmp20_, G_FILE_COPY_NONE, NULL, NULL, NULL, &_inner_error_); + g_file_move (_tmp17_, _tmp18_, G_FILE_COPY_NONE, NULL, NULL, NULL, &_inner_error_); #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 439 "AppDirs.c" +#line 445 "AppDirs.c" goto __catch453_g_error; } } @@ -449,7 +455,7 @@ void app_dirs_try_migrate_data (void) { _inner_error_ = NULL; #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 453 "AppDirs.c" +#line 459 "AppDirs.c" } __finally453: #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -464,46 +470,41 @@ void app_dirs_try_migrate_data (void) { g_clear_error (&_inner_error_); #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 468 "AppDirs.c" +#line 474 "AppDirs.c" } #line 53 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp21_ = app_dirs_get_data_dir (); + _tmp19_ = app_dirs_get_data_dir (); #line 53 "/home/jens/Source/shotwell/src/AppDirs.vala" - new_dir = _tmp21_; + new_dir = _tmp19_; #line 54 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp22_ = app_dirs_get_home_dir (); + _tmp20_ = app_dirs_get_home_dir (); #line 54 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp23_ = _tmp22_; + _tmp21_ = _tmp20_; #line 54 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp24_ = g_file_get_child (_tmp23_, ".shotwell"); + _tmp22_ = g_file_get_child (_tmp21_, ".shotwell"); #line 54 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (old_dir); #line 54 "/home/jens/Source/shotwell/src/AppDirs.vala" - old_dir = _tmp24_; + old_dir = _tmp22_; #line 54 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp21_); #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp26_ = new_dir; + _tmp24_ = new_dir; #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp27_ = g_file_query_exists (_tmp26_, NULL); + if (g_file_query_exists (_tmp24_, NULL)) { #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp27_) { -#line 55 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp25_ = TRUE; -#line 494 "AppDirs.c" + _tmp23_ = TRUE; +#line 498 "AppDirs.c" } else { - GFile* _tmp28_; - gboolean _tmp29_; -#line 55 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp28_ = old_dir; + GFile* _tmp25_; #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp29_ = g_file_query_exists (_tmp28_, NULL); + _tmp25_ = old_dir; #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp25_ = !_tmp29_; -#line 504 "AppDirs.c" + _tmp23_ = !g_file_query_exists (_tmp25_, NULL); +#line 505 "AppDirs.c" } #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp25_) { + if (_tmp23_) { #line 56 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (new_dir); #line 56 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -512,32 +513,28 @@ void app_dirs_try_migrate_data (void) { _g_object_unref0 (user_plugin_dir); #line 56 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 516 "AppDirs.c" +#line 517 "AppDirs.c" } #line 58 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp30_ = app_dirs_get_cache_dir (); + _tmp26_ = app_dirs_get_cache_dir (); #line 58 "/home/jens/Source/shotwell/src/AppDirs.vala" - cache_dir = _tmp30_; + cache_dir = _tmp26_; #line 59 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp31_ = umask ((mode_t) 0077); -#line 59 "/home/jens/Source/shotwell/src/AppDirs.vala" - mask = _tmp31_; -#line 60 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp32_ = cache_dir; + mask = umask ((mode_t) 0077); #line 60 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp33_ = g_file_query_exists (_tmp32_, NULL); + _tmp27_ = cache_dir; #line 60 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp33_) { -#line 532 "AppDirs.c" + if (!g_file_query_exists (_tmp27_, NULL)) { +#line 529 "AppDirs.c" { - GFile* _tmp34_; + GFile* _tmp28_; #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp34_ = cache_dir; + _tmp28_ = cache_dir; #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_file_make_directory_with_parents (_tmp34_, NULL, &_inner_error_); + g_file_make_directory_with_parents (_tmp28_, NULL, &_inner_error_); #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 541 "AppDirs.c" +#line 538 "AppDirs.c" goto __catch454_g_error; } } @@ -545,40 +542,40 @@ void app_dirs_try_migrate_data (void) { __catch454_g_error: { GError* err = NULL; - GFile* _tmp35_; - gchar* _tmp36_; - gchar* _tmp37_; - GError* _tmp38_; - const gchar* _tmp39_; - gchar* _tmp40_; - gchar* _tmp41_; + GFile* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + GError* _tmp32_; + const gchar* _tmp33_; + gchar* _tmp34_; + gchar* _tmp35_; #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala" err = _inner_error_; #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala" _inner_error_ = NULL; #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp35_ = cache_dir; + _tmp29_ = cache_dir; #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp36_ = g_file_get_path (_tmp35_); + _tmp30_ = g_file_get_path (_tmp29_); #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp37_ = _tmp36_; + _tmp31_ = _tmp30_; #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp38_ = err; + _tmp32_ = err; #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp39_ = _tmp38_->message; + _tmp33_ = _tmp32_->message; #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp40_ = g_strdup_printf (_ ("Unable to create cache directory %s: %s"), _tmp37_, _tmp39_); + _tmp34_ = g_strdup_printf (_ ("Unable to create cache directory %s: %s"), _tmp31_, _tmp33_); #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp41_ = _tmp40_; + _tmp35_ = _tmp34_; #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp41_); + app_window_panic (_tmp35_); #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp41_); + _g_free0 (_tmp35_); #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp37_); + _g_free0 (_tmp31_); #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 582 "AppDirs.c" +#line 579 "AppDirs.c" } __finally454: #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -597,71 +594,69 @@ void app_dirs_try_migrate_data (void) { g_clear_error (&_inner_error_); #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 601 "AppDirs.c" +#line 598 "AppDirs.c" } } #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp42_ = old_dir; + _tmp36_ = old_dir; #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp43_ = g_file_get_child (_tmp42_, "thumbs"); + _tmp37_ = g_file_get_child (_tmp36_, "thumbs"); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp44_ = _tmp43_; + _tmp38_ = _tmp37_; #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp45_ = g_file_get_path (_tmp44_); + _tmp39_ = g_file_get_path (_tmp38_); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp46_ = _tmp45_; + _tmp40_ = _tmp39_; #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp47_ = cache_dir; + _tmp41_ = cache_dir; #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp48_ = g_file_get_child (_tmp47_, "thumbs"); + _tmp42_ = g_file_get_child (_tmp41_, "thumbs"); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp49_ = _tmp48_; + _tmp43_ = _tmp42_; #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp50_ = g_file_get_path (_tmp49_); + _tmp44_ = g_file_get_path (_tmp43_); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp51_ = _tmp50_; + _tmp45_ = _tmp44_; #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_rename (_tmp46_, _tmp51_); + g_rename (_tmp40_, _tmp45_); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp51_); + _g_free0 (_tmp45_); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp49_); + _g_object_unref0 (_tmp43_); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp46_); + _g_free0 (_tmp40_); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp44_); + _g_object_unref0 (_tmp38_); #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp52_ = new_dir; + _tmp46_ = new_dir; #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp53_ = g_file_get_parent (_tmp52_); + _tmp47_ = g_file_get_parent (_tmp46_); #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp54_ = _tmp53_; + _tmp48_ = _tmp47_; #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp55_ = g_file_query_exists (_tmp54_, NULL); + _tmp49_ = !g_file_query_exists (_tmp48_, NULL); #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp56_ = !_tmp55_; + _g_object_unref0 (_tmp48_); #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp54_); -#line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp56_) { -#line 648 "AppDirs.c" + if (_tmp49_) { +#line 643 "AppDirs.c" { - GFile* _tmp57_; - GFile* _tmp58_; - GFile* _tmp59_; + GFile* _tmp50_; + GFile* _tmp51_; + GFile* _tmp52_; #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp57_ = new_dir; + _tmp50_ = new_dir; #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp58_ = g_file_get_parent (_tmp57_); + _tmp51_ = g_file_get_parent (_tmp50_); #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp59_ = _tmp58_; + _tmp52_ = _tmp51_; #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_file_make_directory_with_parents (_tmp59_, NULL, &_inner_error_); + g_file_make_directory_with_parents (_tmp52_, NULL, &_inner_error_); #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp59_); + _g_object_unref0 (_tmp52_); #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 665 "AppDirs.c" +#line 660 "AppDirs.c" goto __catch455_g_error; } } @@ -669,48 +664,48 @@ void app_dirs_try_migrate_data (void) { __catch455_g_error: { GError* err = NULL; - GFile* _tmp60_; - GFile* _tmp61_; - GFile* _tmp62_; - gchar* _tmp63_; - gchar* _tmp64_; - GError* _tmp65_; - const gchar* _tmp66_; - gchar* _tmp67_; - gchar* _tmp68_; + GFile* _tmp53_; + GFile* _tmp54_; + GFile* _tmp55_; + gchar* _tmp56_; + gchar* _tmp57_; + GError* _tmp58_; + const gchar* _tmp59_; + gchar* _tmp60_; + gchar* _tmp61_; #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala" err = _inner_error_; #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala" _inner_error_ = NULL; #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp60_ = new_dir; + _tmp53_ = new_dir; #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp61_ = g_file_get_parent (_tmp60_); + _tmp54_ = g_file_get_parent (_tmp53_); #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp62_ = _tmp61_; + _tmp55_ = _tmp54_; #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp63_ = g_file_get_path (_tmp62_); + _tmp56_ = g_file_get_path (_tmp55_); #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp64_ = _tmp63_; + _tmp57_ = _tmp56_; #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp65_ = err; + _tmp58_ = err; #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp66_ = _tmp65_->message; + _tmp59_ = _tmp58_->message; #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp67_ = g_strdup_printf (_ ("Unable to create data directory %s: %s"), _tmp64_, _tmp66_); + _tmp60_ = g_strdup_printf (_ ("Unable to create data directory %s: %s"), _tmp57_, _tmp59_); #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp68_ = _tmp67_; + _tmp61_ = _tmp60_; #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp68_); + app_window_panic (_tmp61_); #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp68_); + _g_free0 (_tmp61_); #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp64_); + _g_free0 (_tmp57_); #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp62_); + _g_object_unref0 (_tmp55_); #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 714 "AppDirs.c" +#line 709 "AppDirs.c" } __finally455: #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -729,41 +724,41 @@ void app_dirs_try_migrate_data (void) { g_clear_error (&_inner_error_); #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 733 "AppDirs.c" +#line 728 "AppDirs.c" } } #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp69_ = old_dir; + _tmp62_ = old_dir; #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp70_ = g_file_get_path (_tmp69_); + _tmp63_ = g_file_get_path (_tmp62_); #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp71_ = _tmp70_; + _tmp64_ = _tmp63_; #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp72_ = new_dir; + _tmp65_ = new_dir; #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp73_ = g_file_get_path (_tmp72_); + _tmp66_ = g_file_get_path (_tmp65_); #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp74_ = _tmp73_; + _tmp67_ = _tmp66_; #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_rename (_tmp71_, _tmp74_); + g_rename (_tmp64_, _tmp67_); #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp74_); + _g_free0 (_tmp67_); #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp71_); + _g_free0 (_tmp64_); #line 79 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp75_ = new_dir; + _tmp68_ = new_dir; #line 79 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp76_ = g_file_get_path (_tmp75_); + _tmp69_ = g_file_get_path (_tmp68_); #line 79 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp77_ = _tmp76_; + _tmp70_ = _tmp69_; #line 79 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_chmod (_tmp77_, 0700); + g_chmod (_tmp70_, 0700); #line 79 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp77_); + _g_free0 (_tmp70_); #line 81 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp78_ = mask; + _tmp71_ = mask; #line 81 "/home/jens/Source/shotwell/src/AppDirs.vala" - umask (_tmp78_); + umask (_tmp71_); #line 36 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (cache_dir); #line 36 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -772,96 +767,88 @@ void app_dirs_try_migrate_data (void) { _g_object_unref0 (old_dir); #line 36 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (user_plugin_dir); -#line 776 "AppDirs.c" +#line 771 "AppDirs.c" } -void app_dirs_set_data_dir (const gchar* user_data_dir) { - const gchar* _tmp0_; - gboolean _tmp1_; - GFile* _tmp2_; +void +app_dirs_set_data_dir (const gchar* user_data_dir) +{ + GFile* _tmp0_; gchar* path = NULL; - const gchar* _tmp3_; - gchar* _tmp4_; - const gchar* _tmp5_; - gboolean _tmp6_; - GFile* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; + gchar* _tmp1_; + const gchar* _tmp2_; + GFile* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; #line 85 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_if_fail (user_data_dir != NULL); #line 85 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp0_ = user_data_dir; -#line 85 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp1_ = is_string_empty (_tmp0_); -#line 85 "/home/jens/Source/shotwell/src/AppDirs.vala" - _vala_return_if_fail (!_tmp1_, "!is_string_empty(user_data_dir)"); + _vala_return_if_fail (!is_string_empty (user_data_dir), "!is_string_empty(user_data_dir)"); #line 86 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp2_ = app_dirs_data_dir; + _tmp0_ = app_dirs_data_dir; #line 86 "/home/jens/Source/shotwell/src/AppDirs.vala" - _vala_assert (_tmp2_ == NULL, "data_dir == null"); + _vala_assert (_tmp0_ == NULL, "data_dir == null"); #line 89 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp3_ = user_data_dir; + _tmp1_ = strip_pretty_path (user_data_dir); #line 89 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp4_ = strip_pretty_path (_tmp3_); -#line 89 "/home/jens/Source/shotwell/src/AppDirs.vala" - path = _tmp4_; -#line 90 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = path; + path = _tmp1_; #line 90 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = g_path_is_absolute (_tmp5_); + _tmp2_ = path; #line 90 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp6_) { -#line 816 "AppDirs.c" - GFile* _tmp7_; - GFile* _tmp8_; - const gchar* _tmp9_; - GFile* _tmp10_; + if (!g_path_is_absolute (_tmp2_)) { +#line 801 "AppDirs.c" + GFile* _tmp3_; + GFile* _tmp4_; + const gchar* _tmp5_; + GFile* _tmp6_; #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = app_dirs_get_home_dir (); + _tmp3_ = app_dirs_get_home_dir (); #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = _tmp7_; + _tmp4_ = _tmp3_; #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = path; + _tmp5_ = path; #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = g_file_get_child (_tmp8_, _tmp9_); + _tmp6_ = g_file_get_child (_tmp4_, _tmp5_); #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (app_dirs_data_dir); #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_dirs_data_dir = _tmp10_; + app_dirs_data_dir = _tmp6_; #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp8_); -#line 835 "AppDirs.c" + _g_object_unref0 (_tmp4_); +#line 820 "AppDirs.c" } else { - const gchar* _tmp11_; - GFile* _tmp12_; + const gchar* _tmp7_; + GFile* _tmp8_; #line 93 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = path; + _tmp7_ = path; #line 93 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = g_file_new_for_path (_tmp11_); + _tmp8_ = g_file_new_for_path (_tmp7_); #line 93 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (app_dirs_data_dir); #line 93 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_dirs_data_dir = _tmp12_; -#line 847 "AppDirs.c" + app_dirs_data_dir = _tmp8_; +#line 832 "AppDirs.c" } #line 95 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = app_dirs_data_dir; + _tmp9_ = app_dirs_data_dir; #line 95 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = g_file_get_path (_tmp13_); + _tmp10_ = g_file_get_path (_tmp9_); #line 95 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = _tmp14_; + _tmp11_ = _tmp10_; #line 95 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_message ("AppDirs.vala:95: Setting private data directory to %s", _tmp15_); + g_message ("AppDirs.vala:95: Setting private data directory to %s", _tmp11_); #line 95 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp11_); #line 85 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (path); -#line 861 "AppDirs.c" +#line 846 "AppDirs.c" } -void app_dirs_verify_data_dir (void) { +void +app_dirs_verify_data_dir (void) +{ GFile* data_dir = NULL; GFile* _tmp0_; GError * _inner_error_ = NULL; @@ -869,25 +856,22 @@ void app_dirs_verify_data_dir (void) { _tmp0_ = app_dirs_get_data_dir (); #line 99 "/home/jens/Source/shotwell/src/AppDirs.vala" data_dir = _tmp0_; -#line 873 "AppDirs.c" +#line 860 "AppDirs.c" { GFile* _tmp1_; - gboolean _tmp2_; #line 101 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = data_dir; #line 101 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp2_ = g_file_query_exists (_tmp1_, NULL); -#line 101 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp2_) { -#line 883 "AppDirs.c" - GFile* _tmp3_; + if (!g_file_query_exists (_tmp1_, NULL)) { +#line 867 "AppDirs.c" + GFile* _tmp2_; #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp3_ = data_dir; + _tmp2_ = data_dir; #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_file_make_directory_with_parents (_tmp3_, NULL, &_inner_error_); + g_file_make_directory_with_parents (_tmp2_, NULL, &_inner_error_); #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 891 "AppDirs.c" +#line 875 "AppDirs.c" goto __catch456_g_error; } } @@ -896,40 +880,40 @@ void app_dirs_verify_data_dir (void) { __catch456_g_error: { GError* err = NULL; - GFile* _tmp4_; + GFile* _tmp3_; + gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; - GError* _tmp7_; - const gchar* _tmp8_; + GError* _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala" err = _inner_error_; #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala" _inner_error_ = NULL; #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp4_ = data_dir; + _tmp3_ = data_dir; #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = g_file_get_path (_tmp4_); + _tmp4_ = g_file_get_path (_tmp3_); #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = err; + _tmp6_ = err; #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = _tmp7_->message; + _tmp7_ = _tmp6_->message; #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = g_strdup_printf (_ ("Unable to create data directory %s: %s"), _tmp6_, _tmp8_); + _tmp8_ = g_strdup_printf (_ ("Unable to create data directory %s: %s"), _tmp5_, _tmp7_); #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp10_); + app_window_panic (_tmp9_); #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp9_); #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 933 "AppDirs.c" +#line 917 "AppDirs.c" } __finally456: #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -942,15 +926,17 @@ void app_dirs_verify_data_dir (void) { g_clear_error (&_inner_error_); #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 946 "AppDirs.c" +#line 930 "AppDirs.c" } #line 98 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (data_dir); -#line 950 "AppDirs.c" +#line 934 "AppDirs.c" } -void app_dirs_verify_cache_dir (void) { +void +app_dirs_verify_cache_dir (void) +{ GFile* cache_dir = NULL; GFile* _tmp0_; GError * _inner_error_ = NULL; @@ -958,25 +944,22 @@ void app_dirs_verify_cache_dir (void) { _tmp0_ = app_dirs_get_cache_dir (); #line 110 "/home/jens/Source/shotwell/src/AppDirs.vala" cache_dir = _tmp0_; -#line 962 "AppDirs.c" +#line 948 "AppDirs.c" { GFile* _tmp1_; - gboolean _tmp2_; #line 112 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = cache_dir; #line 112 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp2_ = g_file_query_exists (_tmp1_, NULL); -#line 112 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp2_) { -#line 972 "AppDirs.c" - GFile* _tmp3_; + if (!g_file_query_exists (_tmp1_, NULL)) { +#line 955 "AppDirs.c" + GFile* _tmp2_; #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp3_ = cache_dir; + _tmp2_ = cache_dir; #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_file_make_directory_with_parents (_tmp3_, NULL, &_inner_error_); + g_file_make_directory_with_parents (_tmp2_, NULL, &_inner_error_); #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 980 "AppDirs.c" +#line 963 "AppDirs.c" goto __catch457_g_error; } } @@ -985,40 +968,40 @@ void app_dirs_verify_cache_dir (void) { __catch457_g_error: { GError* err = NULL; - GFile* _tmp4_; + GFile* _tmp3_; + gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; - GError* _tmp7_; - const gchar* _tmp8_; + GError* _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala" err = _inner_error_; #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala" _inner_error_ = NULL; #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp4_ = cache_dir; + _tmp3_ = cache_dir; #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = g_file_get_path (_tmp4_); + _tmp4_ = g_file_get_path (_tmp3_); #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = err; + _tmp6_ = err; #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = _tmp7_->message; + _tmp7_ = _tmp6_->message; #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = g_strdup_printf (_ ("Unable to create cache directory %s: %s"), _tmp6_, _tmp8_); + _tmp8_ = g_strdup_printf (_ ("Unable to create cache directory %s: %s"), _tmp5_, _tmp7_); #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp10_); + app_window_panic (_tmp9_); #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp9_); #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 1022 "AppDirs.c" +#line 1005 "AppDirs.c" } __finally457: #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1031,11 +1014,11 @@ void app_dirs_verify_cache_dir (void) { g_clear_error (&_inner_error_); #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 1035 "AppDirs.c" +#line 1018 "AppDirs.c" } #line 109 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (cache_dir); -#line 1039 "AppDirs.c" +#line 1022 "AppDirs.c" } @@ -1043,7 +1026,9 @@ void app_dirs_verify_cache_dir (void) { * @brief Returns the build directory if not installed yet, or a path * to where any helper applets we need will live if installed. */ -GFile* app_dirs_get_libexec_dir (void) { +GFile* +app_dirs_get_libexec_dir (void) +{ GFile* result = NULL; GFile* _tmp0_; GFile* _tmp6_; @@ -1052,7 +1037,7 @@ GFile* app_dirs_get_libexec_dir (void) { _tmp0_ = app_dirs_libexec_dir; #line 125 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp0_ == NULL) { -#line 1056 "AppDirs.c" +#line 1041 "AppDirs.c" GFile* _tmp1_; GFile* _tmp2_; gboolean _tmp3_; @@ -1066,7 +1051,7 @@ GFile* app_dirs_get_libexec_dir (void) { _g_object_unref0 (_tmp2_); #line 126 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp3_) { -#line 1070 "AppDirs.c" +#line 1055 "AppDirs.c" GFile* _tmp4_; #line 128 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp4_ = app_dirs_get_exec_dir (); @@ -1074,7 +1059,7 @@ GFile* app_dirs_get_libexec_dir (void) { _g_object_unref0 (app_dirs_libexec_dir); #line 128 "/home/jens/Source/shotwell/src/AppDirs.vala" app_dirs_libexec_dir = _tmp4_; -#line 1078 "AppDirs.c" +#line 1063 "AppDirs.c" } else { GFile* _tmp5_; #line 130 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1083,7 +1068,7 @@ GFile* app_dirs_get_libexec_dir (void) { _g_object_unref0 (app_dirs_libexec_dir); #line 130 "/home/jens/Source/shotwell/src/AppDirs.vala" app_dirs_libexec_dir = _tmp5_; -#line 1087 "AppDirs.c" +#line 1072 "AppDirs.c" } } #line 134 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1094,11 +1079,13 @@ GFile* app_dirs_get_libexec_dir (void) { result = _tmp7_; #line 134 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1098 "AppDirs.c" +#line 1083 "AppDirs.c" } -GFile* app_dirs_get_install_dir (void) { +GFile* +app_dirs_get_install_dir (void) +{ GFile* result = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -1110,11 +1097,13 @@ GFile* app_dirs_get_install_dir (void) { result = _tmp1_; #line 139 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1114 "AppDirs.c" +#line 1101 "AppDirs.c" } -GFile* app_dirs_get_data_dir (void) { +GFile* +app_dirs_get_data_dir (void) +{ GFile* result = NULL; GFile* _tmp0_ = NULL; GFile* _tmp1_; @@ -1122,7 +1111,7 @@ GFile* app_dirs_get_data_dir (void) { _tmp1_ = app_dirs_data_dir; #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp1_ == NULL) { -#line 1126 "AppDirs.c" +#line 1115 "AppDirs.c" const gchar* _tmp2_; GFile* _tmp3_; GFile* _tmp4_; @@ -1141,7 +1130,7 @@ GFile* app_dirs_get_data_dir (void) { _tmp0_ = _tmp5_; #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp4_); -#line 1145 "AppDirs.c" +#line 1134 "AppDirs.c" } else { GFile* _tmp6_; GFile* _tmp7_; @@ -1153,17 +1142,19 @@ GFile* app_dirs_get_data_dir (void) { _g_object_unref0 (_tmp0_); #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = _tmp7_; -#line 1157 "AppDirs.c" +#line 1146 "AppDirs.c" } #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala" result = _tmp0_; #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1163 "AppDirs.c" +#line 1152 "AppDirs.c" } -GFile* app_dirs_get_import_dir (void) { +GFile* +app_dirs_get_import_dir (void) +{ GFile* result = NULL; gchar* path = NULL; ConfigFacade* _tmp0_; @@ -1171,15 +1162,13 @@ GFile* app_dirs_get_import_dir (void) { gchar* _tmp2_; gchar* _tmp3_; const gchar* _tmp4_; - gboolean _tmp5_; + const gchar* _tmp15_; + gchar* _tmp16_; const gchar* _tmp17_; - gchar* _tmp18_; - const gchar* _tmp19_; - gboolean _tmp20_; + GFile* _tmp20_; + GFile* _tmp21_; + GFile* _tmp22_; GFile* _tmp23_; - GFile* _tmp24_; - GFile* _tmp25_; - GFile* _tmp26_; #line 149 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = config_facade_get_instance (); #line 149 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1195,118 +1184,113 @@ GFile* app_dirs_get_import_dir (void) { #line 150 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp4_ = path; #line 150 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = is_string_empty (_tmp4_); -#line 150 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp5_) { -#line 1202 "AppDirs.c" - const gchar* _tmp6_; - gchar* _tmp7_; - const gchar* _tmp8_; - gboolean _tmp9_; - const gchar* _tmp15_; - GFile* _tmp16_; + if (!is_string_empty (_tmp4_)) { +#line 1189 "AppDirs.c" + const gchar* _tmp5_; + gchar* _tmp6_; + const gchar* _tmp7_; + const gchar* _tmp13_; + GFile* _tmp14_; #line 152 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = path; + _tmp5_ = path; #line 152 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = strip_pretty_path (_tmp6_); + _tmp6_ = strip_pretty_path (_tmp5_); #line 152 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (path); #line 152 "/home/jens/Source/shotwell/src/AppDirs.vala" - path = _tmp7_; -#line 155 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = path; + path = _tmp6_; #line 155 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = g_path_is_absolute (_tmp8_); + _tmp7_ = path; #line 155 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp9_) { -#line 1223 "AppDirs.c" - GFile* _tmp10_; + if (!g_path_is_absolute (_tmp7_)) { +#line 1207 "AppDirs.c" + GFile* _tmp8_; + GFile* _tmp9_; + const gchar* _tmp10_; GFile* _tmp11_; - const gchar* _tmp12_; - GFile* _tmp13_; - GFile* _tmp14_; + GFile* _tmp12_; #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = app_dirs_get_home_dir (); + _tmp8_ = app_dirs_get_home_dir (); #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = path; + _tmp10_ = path; #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = g_file_get_child (_tmp11_, _tmp12_); + _tmp11_ = g_file_get_child (_tmp9_, _tmp10_); #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp9_); #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp14_; + result = _tmp12_; #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (path); #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1247 "AppDirs.c" +#line 1231 "AppDirs.c" } #line 159 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = path; + _tmp13_ = path; #line 159 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp16_ = g_file_new_for_path (_tmp15_); + _tmp14_ = g_file_new_for_path (_tmp13_); #line 159 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp16_; + result = _tmp14_; #line 159 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (path); #line 159 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1259 "AppDirs.c" +#line 1243 "AppDirs.c" } #line 163 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp17_ = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES); + _tmp15_ = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES); #line 163 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp18_ = g_strdup (_tmp17_); + _tmp16_ = g_strdup (_tmp15_); #line 163 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (path); #line 163 "/home/jens/Source/shotwell/src/AppDirs.vala" - path = _tmp18_; + path = _tmp16_; #line 164 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp19_ = path; + _tmp17_ = path; #line 164 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp20_ = is_string_empty (_tmp19_); -#line 164 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp20_) { -#line 1275 "AppDirs.c" - const gchar* _tmp21_; - GFile* _tmp22_; + if (!is_string_empty (_tmp17_)) { +#line 1257 "AppDirs.c" + const gchar* _tmp18_; + GFile* _tmp19_; #line 165 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp21_ = path; + _tmp18_ = path; #line 165 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp22_ = g_file_new_for_path (_tmp21_); + _tmp19_ = g_file_new_for_path (_tmp18_); #line 165 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp22_; + result = _tmp19_; #line 165 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (path); #line 165 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1288 "AppDirs.c" +#line 1270 "AppDirs.c" } #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp23_ = app_dirs_get_home_dir (); + _tmp20_ = app_dirs_get_home_dir (); #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp24_ = _tmp23_; + _tmp21_ = _tmp20_; #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp25_ = g_file_get_child (_tmp24_, _ ("Pictures")); + _tmp22_ = g_file_get_child (_tmp21_, _ ("Pictures")); #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp26_ = _tmp25_; + _tmp23_ = _tmp22_; #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp21_); #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp26_; + result = _tmp23_; #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (path); #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1306 "AppDirs.c" +#line 1288 "AppDirs.c" } -GFile* app_dirs_get_baked_import_dir (time_t tm) { +GFile* +app_dirs_get_baked_import_dir (time_t tm) +{ GFile* result = NULL; gchar* pattern = NULL; ConfigFacade* _tmp0_; @@ -1314,25 +1298,22 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) { gchar* _tmp2_; gchar* _tmp3_; const gchar* _tmp4_; - gboolean _tmp5_; - const gchar* _tmp9_; - gboolean _tmp10_; + const gchar* _tmp8_; GDateTime* date = NULL; - time_t _tmp12_; - GDateTime* _tmp13_; - GFile* _tmp14_; - GFile* _tmp15_; + GDateTime* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; gchar* _tmp16_; - gchar* _tmp17_; + const gchar* _tmp17_; gchar* _tmp18_; gchar* _tmp19_; - const gchar* _tmp20_; + gchar* _tmp20_; gchar* _tmp21_; - gchar* _tmp22_; - gchar* _tmp23_; - gchar* _tmp24_; - GFile* _tmp25_; - GFile* _tmp26_; + GFile* _tmp22_; + GFile* _tmp23_; #line 173 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = config_facade_get_instance (); #line 173 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1348,105 +1329,99 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) { #line 174 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp4_ = pattern; #line 174 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = is_string_empty (_tmp4_); -#line 174 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp5_) { -#line 1355 "AppDirs.c" + if (is_string_empty (_tmp4_)) { +#line 1334 "AppDirs.c" + ConfigFacade* _tmp5_; ConfigFacade* _tmp6_; - ConfigFacade* _tmp7_; - gchar* _tmp8_; + gchar* _tmp7_; #line 175 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = config_facade_get_instance (); + _tmp5_ = config_facade_get_instance (); #line 175 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 175 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp7_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 175 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (pattern); #line 175 "/home/jens/Source/shotwell/src/AppDirs.vala" - pattern = _tmp8_; + pattern = _tmp7_; #line 175 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp7_); -#line 1371 "AppDirs.c" + _g_object_unref0 (_tmp6_); +#line 1350 "AppDirs.c" } #line 176 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = pattern; -#line 176 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = is_string_empty (_tmp9_); + _tmp8_ = pattern; #line 176 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp10_) { -#line 1379 "AppDirs.c" - gchar* _tmp11_; + if (is_string_empty (_tmp8_)) { +#line 1356 "AppDirs.c" + gchar* _tmp9_; #line 177 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = g_strdup ("%Y" G_DIR_SEPARATOR_S "%m" G_DIR_SEPARATOR_S "%d"); + _tmp9_ = g_strdup ("%Y" G_DIR_SEPARATOR_S "%m" G_DIR_SEPARATOR_S "%d"); #line 177 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (pattern); #line 177 "/home/jens/Source/shotwell/src/AppDirs.vala" - pattern = _tmp11_; -#line 1387 "AppDirs.c" + pattern = _tmp9_; +#line 1364 "AppDirs.c" } #line 179 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = tm; + _tmp10_ = g_date_time_new_from_unix_local ((gint64) tm); #line 179 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = g_date_time_new_from_unix_local ((gint64) _tmp12_); -#line 179 "/home/jens/Source/shotwell/src/AppDirs.vala" - date = _tmp13_; -#line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = app_dirs_get_import_dir (); + date = _tmp10_; #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = _tmp14_; + _tmp11_ = app_dirs_get_import_dir (); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp16_ = g_file_get_path (_tmp15_); + _tmp12_ = _tmp11_; #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp17_ = _tmp16_; + _tmp13_ = g_file_get_path (_tmp12_); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp18_ = g_strconcat (_tmp17_, G_DIR_SEPARATOR_S, NULL); + _tmp14_ = _tmp13_; #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp19_ = _tmp18_; + _tmp15_ = g_strconcat (_tmp14_, G_DIR_SEPARATOR_S, NULL); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp20_ = pattern; + _tmp16_ = _tmp15_; #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp21_ = g_date_time_format (date, _tmp20_); + _tmp17_ = pattern; #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp22_ = _tmp21_; + _tmp18_ = g_date_time_format (date, _tmp17_); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp23_ = g_strconcat (_tmp19_, _tmp22_, NULL); + _tmp19_ = _tmp18_; #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp24_ = _tmp23_; + _tmp20_ = g_strconcat (_tmp16_, _tmp19_, NULL); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp25_ = g_file_new_for_path (_tmp24_); + _tmp21_ = _tmp20_; #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp26_ = _tmp25_; + _tmp22_ = g_file_new_for_path (_tmp21_); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp24_); + _tmp23_ = _tmp22_; #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp21_); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (_tmp19_); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp16_); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp15_); + _g_free0 (_tmp14_); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp26_; + _g_object_unref0 (_tmp12_); +#line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" + result = _tmp23_; #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_date_time_unref0 (date); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (pattern); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1439 "AppDirs.c" +#line 1414 "AppDirs.c" } -gboolean app_dirs_is_in_import_dir (GFile* file) { +gboolean +app_dirs_is_in_import_dir (GFile* file) +{ gboolean result = FALSE; GFile* import_dir = NULL; GFile* _tmp0_; gboolean _tmp1_ = FALSE; GFile* _tmp2_; - GFile* _tmp3_; - gboolean _tmp4_; #line 184 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 185 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1454,29 +1429,19 @@ gboolean app_dirs_is_in_import_dir (GFile* file) { #line 185 "/home/jens/Source/shotwell/src/AppDirs.vala" import_dir = _tmp0_; #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp2_ = file; + _tmp2_ = import_dir; #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp3_ = import_dir; -#line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp4_ = g_file_has_prefix (_tmp2_, _tmp3_); -#line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp4_) { + if (g_file_has_prefix (file, _tmp2_)) { #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = TRUE; -#line 1467 "AppDirs.c" +#line 1438 "AppDirs.c" } else { - GFile* _tmp5_; - GFile* _tmp6_; - gboolean _tmp7_; -#line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = file; -#line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = import_dir; + GFile* _tmp3_; #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = g_file_equal (_tmp5_, _tmp6_); + _tmp3_ = import_dir; #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp1_ = _tmp7_; -#line 1480 "AppDirs.c" + _tmp1_ = g_file_equal (file, _tmp3_); +#line 1445 "AppDirs.c" } #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" result = _tmp1_; @@ -1484,14 +1449,15 @@ gboolean app_dirs_is_in_import_dir (GFile* file) { _g_object_unref0 (import_dir); #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1488 "AppDirs.c" +#line 1453 "AppDirs.c" } -void app_dirs_set_import_dir (const gchar* path) { +void +app_dirs_set_import_dir (const gchar* path) +{ ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - const gchar* _tmp2_; #line 190 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_if_fail (path != NULL); #line 191 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1499,16 +1465,16 @@ void app_dirs_set_import_dir (const gchar* path) { #line 191 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = _tmp0_; #line 191 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp2_ = path; -#line 191 "/home/jens/Source/shotwell/src/AppDirs.vala" - configuration_facade_set_import_dir (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_); + configuration_facade_set_import_dir (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), path); #line 191 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp1_); -#line 1508 "AppDirs.c" +#line 1472 "AppDirs.c" } -GFile* app_dirs_get_exec_dir (void) { +GFile* +app_dirs_get_exec_dir (void) +{ GFile* result = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -1520,21 +1486,23 @@ GFile* app_dirs_get_exec_dir (void) { result = _tmp1_; #line 195 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1524 "AppDirs.c" +#line 1490 "AppDirs.c" } -GFile* app_dirs_get_temp_dir (void) { +GFile* +app_dirs_get_temp_dir (void) +{ GFile* result = NULL; GFile* _tmp0_; + GFile* _tmp15_; GFile* _tmp16_; - GFile* _tmp17_; GError * _inner_error_ = NULL; #line 199 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_tmp_dir; #line 199 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp0_ == NULL) { -#line 1538 "AppDirs.c" +#line 1506 "AppDirs.c" const gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; @@ -1556,25 +1524,22 @@ GFile* app_dirs_get_temp_dir (void) { app_dirs_tmp_dir = _tmp5_; #line 200 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (_tmp4_); -#line 1560 "AppDirs.c" +#line 1528 "AppDirs.c" { GFile* _tmp6_; - gboolean _tmp7_; #line 203 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp6_ = app_dirs_tmp_dir; #line 203 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = g_file_query_exists (_tmp6_, NULL); -#line 203 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp7_) { -#line 1570 "AppDirs.c" - GFile* _tmp8_; + if (!g_file_query_exists (_tmp6_, NULL)) { +#line 1535 "AppDirs.c" + GFile* _tmp7_; #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = app_dirs_tmp_dir; + _tmp7_ = app_dirs_tmp_dir; #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_file_make_directory_with_parents (_tmp8_, NULL, &_inner_error_); + g_file_make_directory_with_parents (_tmp7_, NULL, &_inner_error_); #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1578 "AppDirs.c" +#line 1543 "AppDirs.c" goto __catch458_g_error; } } @@ -1583,40 +1548,40 @@ GFile* app_dirs_get_temp_dir (void) { __catch458_g_error: { GError* err = NULL; - GFile* _tmp9_; + GFile* _tmp8_; + gchar* _tmp9_; gchar* _tmp10_; - gchar* _tmp11_; - GError* _tmp12_; - const gchar* _tmp13_; + GError* _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; gchar* _tmp14_; - gchar* _tmp15_; #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala" err = _inner_error_; #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala" _inner_error_ = NULL; #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = app_dirs_tmp_dir; + _tmp8_ = app_dirs_tmp_dir; #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = g_file_get_path (_tmp9_); + _tmp9_ = g_file_get_path (_tmp8_); #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = err; + _tmp11_ = err; #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = _tmp12_->message; + _tmp12_ = _tmp11_->message; #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = g_strdup_printf (_ ("Unable to create temporary directory %s: %s"), _tmp11_, _tmp13_); + _tmp13_ = g_strdup_printf (_ ("Unable to create temporary directory %s: %s"), _tmp10_, _tmp12_); #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp15_); + app_window_panic (_tmp14_); #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp14_); #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp10_); #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 1620 "AppDirs.c" +#line 1585 "AppDirs.c" } __finally458: #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1627,30 +1592,31 @@ GFile* app_dirs_get_temp_dir (void) { g_clear_error (&_inner_error_); #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala" return NULL; -#line 1631 "AppDirs.c" +#line 1596 "AppDirs.c" } } #line 211 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp16_ = app_dirs_tmp_dir; + _tmp15_ = app_dirs_tmp_dir; #line 211 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp17_ = _g_object_ref0 (_tmp16_); + _tmp16_ = _g_object_ref0 (_tmp15_); #line 211 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp17_; + result = _tmp16_; #line 211 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1642 "AppDirs.c" +#line 1607 "AppDirs.c" } -GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) { +GFile* +app_dirs_get_data_subdir (const gchar* name, + const gchar* subname) +{ GFile* result = NULL; GFile* subdir = NULL; GFile* _tmp0_; GFile* _tmp1_; - const gchar* _tmp2_; + GFile* _tmp2_; GFile* _tmp3_; - GFile* _tmp4_; - const gchar* _tmp5_; GError * _inner_error_ = NULL; #line 214 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_val_if_fail (name != NULL, NULL); @@ -1659,53 +1625,43 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) { #line 215 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = _tmp0_; #line 215 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp2_ = name; -#line 215 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp3_ = g_file_get_child (_tmp1_, _tmp2_); + _tmp2_ = g_file_get_child (_tmp1_, name); #line 215 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 215 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp1_); #line 215 "/home/jens/Source/shotwell/src/AppDirs.vala" - subdir = _tmp4_; + subdir = _tmp3_; #line 216 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = subname; -#line 216 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp5_ != NULL) { -#line 1676 "AppDirs.c" - GFile* _tmp6_; - const gchar* _tmp7_; - GFile* _tmp8_; -#line 217 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = subdir; + if (subname != NULL) { +#line 1638 "AppDirs.c" + GFile* _tmp4_; + GFile* _tmp5_; #line 217 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = subname; + _tmp4_ = subdir; #line 217 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = g_file_get_child (_tmp6_, _tmp7_); + _tmp5_ = g_file_get_child (_tmp4_, subname); #line 217 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (subdir); #line 217 "/home/jens/Source/shotwell/src/AppDirs.vala" - subdir = _tmp8_; -#line 1690 "AppDirs.c" + subdir = _tmp5_; +#line 1649 "AppDirs.c" } { - GFile* _tmp9_; - gboolean _tmp10_; -#line 220 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = subdir; + GFile* _tmp6_; #line 220 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = g_file_query_exists (_tmp9_, NULL); + _tmp6_ = subdir; #line 220 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp10_) { -#line 1701 "AppDirs.c" - GFile* _tmp11_; + if (!g_file_query_exists (_tmp6_, NULL)) { +#line 1657 "AppDirs.c" + GFile* _tmp7_; #line 221 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = subdir; + _tmp7_ = subdir; #line 221 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_file_make_directory_with_parents (_tmp11_, NULL, &_inner_error_); + g_file_make_directory_with_parents (_tmp7_, NULL, &_inner_error_); #line 221 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1709 "AppDirs.c" +#line 1665 "AppDirs.c" goto __catch459_g_error; } } @@ -1714,40 +1670,40 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) { __catch459_g_error: { GError* err = NULL; - GFile* _tmp12_; + GFile* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + GError* _tmp11_; + const gchar* _tmp12_; gchar* _tmp13_; gchar* _tmp14_; - GError* _tmp15_; - const gchar* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala" err = _inner_error_; #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala" _inner_error_ = NULL; #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = subdir; + _tmp8_ = subdir; #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = g_file_get_path (_tmp12_); + _tmp9_ = g_file_get_path (_tmp8_); #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = _tmp13_; -#line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = err; + _tmp10_ = _tmp9_; #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp16_ = _tmp15_->message; + _tmp11_ = err; #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp17_ = g_strdup_printf (_ ("Unable to create data subdirectory %s: %s"), _tmp14_, _tmp16_); + _tmp12_ = _tmp11_->message; #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp18_ = _tmp17_; + _tmp13_ = g_strdup_printf (_ ("Unable to create data subdirectory %s: %s"), _tmp10_, _tmp12_); #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp18_); + _tmp14_ = _tmp13_; #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp18_); + app_window_panic (_tmp14_); #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (_tmp14_); +#line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" + _g_free0 (_tmp10_); #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 1751 "AppDirs.c" +#line 1707 "AppDirs.c" } __finally459: #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1760,140 +1716,118 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) { g_clear_error (&_inner_error_); #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala" return NULL; -#line 1764 "AppDirs.c" +#line 1720 "AppDirs.c" } #line 227 "/home/jens/Source/shotwell/src/AppDirs.vala" result = subdir; #line 227 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1770 "AppDirs.c" +#line 1726 "AppDirs.c" } -void app_dirs_ensure_writable (GFile* dir) { - GFile* _tmp0_; - gboolean _tmp1_; +void +app_dirs_ensure_writable (GFile* dir) +{ GError * _inner_error_ = NULL; #line 230 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_if_fail (G_IS_FILE (dir)); #line 231 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp0_ = dir; -#line 231 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp1_ = g_file_query_exists (_tmp0_, NULL); -#line 231 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp1_) { -#line 1786 "AppDirs.c" + if (g_file_query_exists (dir, NULL)) { +#line 1738 "AppDirs.c" { GFileInfo* info = NULL; - GFile* _tmp2_; - GFileInfo* _tmp3_; + GFileInfo* _tmp0_; guint32 mode = 0U; - GFileInfo* _tmp4_; - guint32 _tmp5_; - gboolean _tmp6_ = FALSE; - GFile* _tmp7_; - guint32 _tmp8_; - gboolean _tmp9_; -#line 233 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp2_ = dir; + GFileInfo* _tmp1_; + gboolean _tmp2_ = FALSE; + guint32 _tmp3_; #line 233 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp3_ = g_file_query_info (_tmp2_, G_FILE_ATTRIBUTE_UNIX_MODE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); + _tmp0_ = g_file_query_info (dir, G_FILE_ATTRIBUTE_UNIX_MODE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); #line 233 "/home/jens/Source/shotwell/src/AppDirs.vala" - info = _tmp3_; + info = _tmp0_; #line 233 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1806 "AppDirs.c" +#line 1752 "AppDirs.c" goto __catch460_g_error; } #line 234 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp4_ = info; + _tmp1_ = info; #line 234 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = g_file_info_get_attribute_uint32 (_tmp4_, G_FILE_ATTRIBUTE_UNIX_MODE); -#line 234 "/home/jens/Source/shotwell/src/AppDirs.vala" - mode = _tmp5_ | 0700; -#line 235 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = dir; + mode = g_file_info_get_attribute_uint32 (_tmp1_, G_FILE_ATTRIBUTE_UNIX_MODE) | 0700; #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = mode; + _tmp3_ = mode; #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = g_file_set_attribute_uint32 (_tmp7_, G_FILE_ATTRIBUTE_UNIX_MODE, _tmp8_, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); -#line 235 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = _tmp9_; + _tmp2_ = g_file_set_attribute_uint32 (dir, G_FILE_ATTRIBUTE_UNIX_MODE, _tmp3_, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (info); -#line 1827 "AppDirs.c" +#line 1767 "AppDirs.c" goto __catch460_g_error; } #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp6_) { -#line 1832 "AppDirs.c" - GFile* _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; -#line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = dir; + if (!_tmp2_) { +#line 1772 "AppDirs.c" + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = g_file_get_path (_tmp10_); + _tmp4_ = g_file_get_path (dir); #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = _tmp11_; + _tmp5_ = _tmp4_; #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = g_strdup_printf (_ ("Could not make directory %s writable"), _tmp12_); + _tmp6_ = g_strdup_printf (_ ("Could not make directory %s writable"), _tmp5_); #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = _tmp13_; + _tmp7_ = _tmp6_; #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp14_); + app_window_panic (_tmp7_); #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp14_); + _g_free0 (_tmp7_); #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp12_); -#line 1854 "AppDirs.c" + _g_free0 (_tmp5_); +#line 1791 "AppDirs.c" } #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (info); -#line 1858 "AppDirs.c" +#line 1795 "AppDirs.c" } goto __finally460; __catch460_g_error: { GError* err = NULL; - GFile* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; - GError* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; - gchar* _tmp21_; + gchar* _tmp8_; + gchar* _tmp9_; + GError* _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala" err = _inner_error_; #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala" _inner_error_ = NULL; #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = dir; -#line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp16_ = g_file_get_path (_tmp15_); + _tmp8_ = g_file_get_path (dir); #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp17_ = _tmp16_; + _tmp9_ = _tmp8_; #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp18_ = err; + _tmp10_ = err; #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp19_ = _tmp18_->message; + _tmp11_ = _tmp10_->message; #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp20_ = g_strdup_printf (_ ("Could not make directory %s writable: %s"), _tmp17_, _tmp19_); + _tmp12_ = g_strdup_printf (_ ("Could not make directory %s writable: %s"), _tmp9_, _tmp11_); #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp21_ = _tmp20_; + _tmp13_ = _tmp12_; #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp21_); + app_window_panic (_tmp13_); #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp21_); + _g_free0 (_tmp13_); #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp9_); #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 1897 "AppDirs.c" +#line 1831 "AppDirs.c" } __finally460: #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1904,23 +1838,24 @@ void app_dirs_ensure_writable (GFile* dir) { g_clear_error (&_inner_error_); #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 1908 "AppDirs.c" +#line 1842 "AppDirs.c" } } } -GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) { +GFile* +app_dirs_get_cache_subdir (const gchar* name, + const gchar* subname) +{ GFile* result = NULL; GFile* subdir = NULL; GFile* _tmp0_; GFile* _tmp1_; - const gchar* _tmp2_; + GFile* _tmp2_; GFile* _tmp3_; GFile* _tmp4_; - GFile* _tmp5_; - const gchar* _tmp6_; - GFile* _tmp20_; + GFile* _tmp16_; GError * _inner_error_ = NULL; #line 244 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_val_if_fail (name != NULL, NULL); @@ -1929,57 +1864,47 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) { #line 245 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = _tmp0_; #line 245 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp2_ = name; -#line 245 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp3_ = g_file_get_child (_tmp1_, _tmp2_); + _tmp2_ = g_file_get_child (_tmp1_, name); #line 245 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 245 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp1_); #line 245 "/home/jens/Source/shotwell/src/AppDirs.vala" - subdir = _tmp4_; + subdir = _tmp3_; #line 246 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = subdir; + _tmp4_ = subdir; #line 246 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_dirs_ensure_writable (_tmp5_); -#line 247 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = subname; + app_dirs_ensure_writable (_tmp4_); #line 247 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp6_ != NULL) { -#line 1950 "AppDirs.c" - GFile* _tmp7_; - const gchar* _tmp8_; - GFile* _tmp9_; -#line 248 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = subdir; + if (subname != NULL) { +#line 1881 "AppDirs.c" + GFile* _tmp5_; + GFile* _tmp6_; #line 248 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = subname; + _tmp5_ = subdir; #line 248 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = g_file_get_child (_tmp7_, _tmp8_); + _tmp6_ = g_file_get_child (_tmp5_, subname); #line 248 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (subdir); #line 248 "/home/jens/Source/shotwell/src/AppDirs.vala" - subdir = _tmp9_; -#line 1964 "AppDirs.c" + subdir = _tmp6_; +#line 1892 "AppDirs.c" } { - GFile* _tmp10_; - gboolean _tmp11_; -#line 251 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = subdir; + GFile* _tmp7_; #line 251 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = g_file_query_exists (_tmp10_, NULL); + _tmp7_ = subdir; #line 251 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp11_) { -#line 1975 "AppDirs.c" - GFile* _tmp12_; + if (!g_file_query_exists (_tmp7_, NULL)) { +#line 1900 "AppDirs.c" + GFile* _tmp8_; #line 252 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = subdir; + _tmp8_ = subdir; #line 252 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_file_make_directory_with_parents (_tmp12_, NULL, &_inner_error_); + g_file_make_directory_with_parents (_tmp8_, NULL, &_inner_error_); #line 252 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1983 "AppDirs.c" +#line 1908 "AppDirs.c" goto __catch461_g_error; } } @@ -1988,40 +1913,40 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) { __catch461_g_error: { GError* err = NULL; - GFile* _tmp13_; + GFile* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + GError* _tmp12_; + const gchar* _tmp13_; gchar* _tmp14_; gchar* _tmp15_; - GError* _tmp16_; - const gchar* _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala" err = _inner_error_; #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala" _inner_error_ = NULL; #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = subdir; -#line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = g_file_get_path (_tmp13_); + _tmp9_ = subdir; #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = _tmp14_; + _tmp10_ = g_file_get_path (_tmp9_); #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp16_ = err; + _tmp11_ = _tmp10_; #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp17_ = _tmp16_->message; + _tmp12_ = err; #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp18_ = g_strdup_printf (_ ("Unable to create data subdirectory %s: %s"), _tmp15_, _tmp17_); + _tmp13_ = _tmp12_->message; #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp19_ = _tmp18_; + _tmp14_ = g_strdup_printf (_ ("Unable to create data subdirectory %s: %s"), _tmp11_, _tmp13_); #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp19_); + _tmp15_ = _tmp14_; #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp19_); + app_window_panic (_tmp15_); #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (_tmp15_); +#line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" + _g_free0 (_tmp11_); #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 2025 "AppDirs.c" +#line 1950 "AppDirs.c" } __finally461: #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2034,30 +1959,32 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) { g_clear_error (&_inner_error_); #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala" return NULL; -#line 2038 "AppDirs.c" +#line 1963 "AppDirs.c" } #line 257 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp20_ = subdir; + _tmp16_ = subdir; #line 257 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_dirs_ensure_writable (_tmp20_); + app_dirs_ensure_writable (_tmp16_); #line 258 "/home/jens/Source/shotwell/src/AppDirs.vala" result = subdir; #line 258 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2048 "AppDirs.c" +#line 1973 "AppDirs.c" } -GFile* app_dirs_get_lib_dir (void) { +GFile* +app_dirs_get_lib_dir (void) +{ GFile* result = NULL; GFile* install_dir = NULL; GFile* _tmp0_; GFile* _tmp1_; + GFile* _tmp12_; GFile* _tmp13_; GFile* _tmp14_; GFile* _tmp15_; GFile* _tmp16_; - GFile* _tmp17_; #line 262 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_get_install_dir (); #line 262 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2066,14 +1993,13 @@ GFile* app_dirs_get_lib_dir (void) { _tmp1_ = install_dir; #line 265 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp1_ == NULL) { -#line 2070 "AppDirs.c" +#line 1997 "AppDirs.c" GFile* _tmp2_; GFile* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; gboolean _tmp6_; - gboolean _tmp7_; - GFile* _tmp12_; + GFile* _tmp11_; #line 267 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp2_ = app_dirs_get_exec_dir (); #line 267 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2084,70 +2010,70 @@ GFile* app_dirs_get_lib_dir (void) { _tmp5_ = _tmp4_; #line 267 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp6_ = g_str_has_suffix (_tmp5_, "src"); -#line 267 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = _tmp6_; #line 267 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (_tmp5_); #line 267 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp3_); #line 267 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp7_) { -#line 2096 "AppDirs.c" + if (_tmp6_) { +#line 2020 "AppDirs.c" + GFile* _tmp7_; GFile* _tmp8_; GFile* _tmp9_; GFile* _tmp10_; - GFile* _tmp11_; #line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = app_dirs_get_exec_dir (); + _tmp7_ = app_dirs_get_exec_dir (); #line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = g_file_get_parent (_tmp9_); + _tmp9_ = g_file_get_parent (_tmp8_); #line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp11_; + result = _tmp10_; #line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (install_dir); #line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2117 "AppDirs.c" +#line 2041 "AppDirs.c" } #line 271 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = app_dirs_get_exec_dir (); + _tmp11_ = app_dirs_get_exec_dir (); #line 271 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp12_; + result = _tmp11_; #line 271 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (install_dir); #line 271 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2127 "AppDirs.c" +#line 2051 "AppDirs.c" } #line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = install_dir; + _tmp12_ = install_dir; #line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = g_file_get_child (_tmp13_, RESOURCES_LIB); + _tmp13_ = g_file_get_child (_tmp12_, RESOURCES_LIB); #line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp16_ = g_file_get_child (_tmp15_, "shotwell"); + _tmp15_ = g_file_get_child (_tmp14_, "shotwell"); #line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp14_); #line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp17_; + result = _tmp16_; #line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (install_dir); #line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2147 "AppDirs.c" +#line 2071 "AppDirs.c" } -GFile* app_dirs_get_system_plugins_dir (void) { +GFile* +app_dirs_get_system_plugins_dir (void) +{ GFile* result = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -2167,11 +2093,13 @@ GFile* app_dirs_get_system_plugins_dir (void) { result = _tmp3_; #line 278 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2171 "AppDirs.c" +#line 2097 "AppDirs.c" } -GFile* app_dirs_get_user_plugins_dir (void) { +GFile* +app_dirs_get_user_plugins_dir (void) +{ GFile* result = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -2191,18 +2119,20 @@ GFile* app_dirs_get_user_plugins_dir (void) { result = _tmp3_; #line 282 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2195 "AppDirs.c" +#line 2123 "AppDirs.c" } -GFile* app_dirs_get_log_file (void) { +GFile* +app_dirs_get_log_file (void) +{ GFile* result = NULL; const gchar* _tmp0_; #line 286 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = g_getenv ("SHOTWELL_LOG_FILE"); #line 286 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp0_ != NULL) { -#line 2206 "AppDirs.c" +#line 2136 "AppDirs.c" const gchar* _tmp1_; #line 287 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = g_getenv ("SHOTWELL_LOG_FILE"); @@ -2212,7 +2142,7 @@ GFile* app_dirs_get_log_file (void) { result = NULL; #line 288 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2216 "AppDirs.c" +#line 2146 "AppDirs.c" } else { const gchar* _tmp2_; GFile* _tmp3_; @@ -2224,7 +2154,7 @@ GFile* app_dirs_get_log_file (void) { result = _tmp3_; #line 290 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2228 "AppDirs.c" +#line 2158 "AppDirs.c" } } else { const gchar* _tmp4_; @@ -2256,16 +2186,18 @@ GFile* app_dirs_get_log_file (void) { result = _tmp10_; #line 293 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2260 "AppDirs.c" +#line 2190 "AppDirs.c" } } -GFile* app_dirs_get_thumbnailer_bin (void) { +GFile* +app_dirs_get_thumbnailer_bin (void) +{ GFile* result = NULL; #line 299 "/home/jens/Source/shotwell/src/AppDirs.vala" static const char filename[] = "shotwell-video-thumbnailer"; -#line 2269 "AppDirs.c" +#line 2201 "AppDirs.c" GFile* f = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -2274,7 +2206,6 @@ GFile* app_dirs_get_thumbnailer_bin (void) { GFile* _tmp4_; GFile* _tmp5_; GFile* _tmp6_; - gboolean _tmp7_; #line 300 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_get_libexec_dir (); #line 300 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2296,48 +2227,48 @@ GFile* app_dirs_get_thumbnailer_bin (void) { #line 301 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp6_ = f; #line 301 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = g_file_query_exists (_tmp6_, NULL); -#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp7_) { -#line 2303 "AppDirs.c" + if (!g_file_query_exists (_tmp6_, NULL)) { +#line 2232 "AppDirs.c" + GFile* _tmp7_; GFile* _tmp8_; GFile* _tmp9_; GFile* _tmp10_; GFile* _tmp11_; - GFile* _tmp12_; #line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = app_dirs_get_libexec_dir (); + _tmp7_ = app_dirs_get_libexec_dir (); #line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = g_file_get_child (_tmp9_, "shotwell"); + _tmp9_ = g_file_get_child (_tmp8_, "shotwell"); #line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = g_file_get_child (_tmp11_, filename); + _tmp11_ = g_file_get_child (_tmp10_, filename); #line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (f); #line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" - f = _tmp12_; + f = _tmp11_; #line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp10_); #line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp9_); -#line 2327 "AppDirs.c" + _g_object_unref0 (_tmp8_); +#line 2256 "AppDirs.c" } #line 305 "/home/jens/Source/shotwell/src/AppDirs.vala" result = f; #line 305 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2333 "AppDirs.c" +#line 2262 "AppDirs.c" } -GFile* app_dirs_get_settings_migrator_bin (void) { +GFile* +app_dirs_get_settings_migrator_bin (void) +{ GFile* result = NULL; #line 309 "/home/jens/Source/shotwell/src/AppDirs.vala" static const char filename[] = "shotwell-settings-migrator"; -#line 2341 "AppDirs.c" +#line 2272 "AppDirs.c" GFile* f = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -2346,7 +2277,6 @@ GFile* app_dirs_get_settings_migrator_bin (void) { GFile* _tmp4_; GFile* _tmp5_; GFile* _tmp6_; - gboolean _tmp7_; #line 310 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_get_libexec_dir (); #line 310 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2368,158 +2298,185 @@ GFile* app_dirs_get_settings_migrator_bin (void) { #line 311 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp6_ = f; #line 311 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = g_file_query_exists (_tmp6_, NULL); -#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp7_) { -#line 2375 "AppDirs.c" + if (!g_file_query_exists (_tmp6_, NULL)) { +#line 2303 "AppDirs.c" + GFile* _tmp7_; GFile* _tmp8_; GFile* _tmp9_; GFile* _tmp10_; GFile* _tmp11_; - GFile* _tmp12_; #line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = app_dirs_get_libexec_dir (); + _tmp7_ = app_dirs_get_libexec_dir (); #line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = g_file_get_child (_tmp9_, "shotwell"); + _tmp9_ = g_file_get_child (_tmp8_, "shotwell"); #line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = g_file_get_child (_tmp11_, filename); + _tmp11_ = g_file_get_child (_tmp10_, filename); #line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (f); #line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" - f = _tmp12_; + f = _tmp11_; #line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp10_); #line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp9_); -#line 2399 "AppDirs.c" + _g_object_unref0 (_tmp8_); +#line 2327 "AppDirs.c" } #line 315 "/home/jens/Source/shotwell/src/AppDirs.vala" result = f; #line 315 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2405 "AppDirs.c" +#line 2333 "AppDirs.c" } -AppDirs* app_dirs_construct (GType object_type) { +AppDirs* +app_dirs_construct (GType object_type) +{ AppDirs* self = NULL; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" self = (AppDirs*) g_type_create_instance (object_type); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return self; -#line 2415 "AppDirs.c" +#line 2345 "AppDirs.c" } -AppDirs* app_dirs_new (void) { +AppDirs* +app_dirs_new (void) +{ #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return app_dirs_construct (TYPE_APP_DIRS); -#line 2422 "AppDirs.c" +#line 2354 "AppDirs.c" } -static void value_app_dirs_init (GValue* value) { +static void +value_app_dirs_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = NULL; -#line 2429 "AppDirs.c" +#line 2363 "AppDirs.c" } -static void value_app_dirs_free_value (GValue* value) { +static void +value_app_dirs_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" app_dirs_unref (value->data[0].v_pointer); -#line 2438 "AppDirs.c" +#line 2374 "AppDirs.c" } } -static void value_app_dirs_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_app_dirs_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" dest_value->data[0].v_pointer = app_dirs_ref (src_value->data[0].v_pointer); -#line 2448 "AppDirs.c" +#line 2387 "AppDirs.c" } else { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" dest_value->data[0].v_pointer = NULL; -#line 2452 "AppDirs.c" +#line 2391 "AppDirs.c" } } -static gpointer value_app_dirs_peek_pointer (const GValue* value) { +static gpointer +value_app_dirs_peek_pointer (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return value->data[0].v_pointer; -#line 2460 "AppDirs.c" +#line 2401 "AppDirs.c" } -static gchar* value_app_dirs_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_app_dirs_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" if (collect_values[0].v_pointer) { -#line 2467 "AppDirs.c" +#line 2413 "AppDirs.c" AppDirs * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2474 "AppDirs.c" +#line 2420 "AppDirs.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2478 "AppDirs.c" +#line 2424 "AppDirs.c" } #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = app_dirs_ref (object); -#line 2482 "AppDirs.c" +#line 2428 "AppDirs.c" } else { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = NULL; -#line 2486 "AppDirs.c" +#line 2432 "AppDirs.c" } #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return NULL; -#line 2490 "AppDirs.c" +#line 2436 "AppDirs.c" } -static gchar* value_app_dirs_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_app_dirs_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ AppDirs ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2501 "AppDirs.c" +#line 2452 "AppDirs.c" } #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" *object_p = NULL; -#line 2507 "AppDirs.c" +#line 2458 "AppDirs.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" *object_p = value->data[0].v_pointer; -#line 2511 "AppDirs.c" +#line 2462 "AppDirs.c" } else { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" *object_p = app_dirs_ref (value->data[0].v_pointer); -#line 2515 "AppDirs.c" +#line 2466 "AppDirs.c" } #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return NULL; -#line 2519 "AppDirs.c" +#line 2470 "AppDirs.c" } -GParamSpec* param_spec_app_dirs (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_app_dirs (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecAppDirs* spec; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_APP_DIRS), NULL); @@ -2529,20 +2486,25 @@ GParamSpec* param_spec_app_dirs (const gchar* name, const gchar* nick, const gch G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return G_PARAM_SPEC (spec); -#line 2533 "AppDirs.c" +#line 2490 "AppDirs.c" } -gpointer value_get_app_dirs (const GValue* value) { +gpointer +value_get_app_dirs (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APP_DIRS), NULL); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return value->data[0].v_pointer; -#line 2542 "AppDirs.c" +#line 2501 "AppDirs.c" } -void value_set_app_dirs (GValue* value, gpointer v_object) { +void +value_set_app_dirs (GValue* value, + gpointer v_object) +{ AppDirs * old; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APP_DIRS)); @@ -2558,22 +2520,25 @@ void value_set_app_dirs (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" app_dirs_ref (value->data[0].v_pointer); -#line 2562 "AppDirs.c" +#line 2524 "AppDirs.c" } else { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = NULL; -#line 2566 "AppDirs.c" +#line 2528 "AppDirs.c" } #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" app_dirs_unref (old); -#line 2572 "AppDirs.c" +#line 2534 "AppDirs.c" } } -void value_take_app_dirs (GValue* value, gpointer v_object) { +void +value_take_app_dirs (GValue* value, + gpointer v_object) +{ AppDirs * old; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APP_DIRS)); @@ -2587,48 +2552,56 @@ void value_take_app_dirs (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = v_object; -#line 2591 "AppDirs.c" +#line 2556 "AppDirs.c" } else { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = NULL; -#line 2595 "AppDirs.c" +#line 2560 "AppDirs.c" } #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" app_dirs_unref (old); -#line 2601 "AppDirs.c" +#line 2566 "AppDirs.c" } } -static void app_dirs_class_init (AppDirsClass * klass) { +static void +app_dirs_class_init (AppDirsClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" app_dirs_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" ((AppDirsClass *) klass)->finalize = app_dirs_finalize; -#line 2611 "AppDirs.c" +#line 2578 "AppDirs.c" } -static void app_dirs_instance_init (AppDirs * self) { +static void +app_dirs_instance_init (AppDirs * self) +{ #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" self->ref_count = 1; -#line 2618 "AppDirs.c" +#line 2587 "AppDirs.c" } -static void app_dirs_finalize (AppDirs * obj) { +static void +app_dirs_finalize (AppDirs * obj) +{ AppDirs * self; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_APP_DIRS, AppDirs); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" g_signal_handlers_destroy (self); -#line 2628 "AppDirs.c" +#line 2599 "AppDirs.c" } -GType app_dirs_get_type (void) { +GType +app_dirs_get_type (void) +{ static volatile gsize app_dirs_type_id__volatile = 0; if (g_once_init_enter (&app_dirs_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_app_dirs_init, value_app_dirs_free_value, value_app_dirs_copy_value, value_app_dirs_peek_pointer, "p", value_app_dirs_collect_value, "p", value_app_dirs_lcopy_value }; @@ -2642,18 +2615,22 @@ GType app_dirs_get_type (void) { } -gpointer app_dirs_ref (gpointer instance) { +gpointer +app_dirs_ref (gpointer instance) +{ AppDirs * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return instance; -#line 2653 "AppDirs.c" +#line 2628 "AppDirs.c" } -void app_dirs_unref (gpointer instance) { +void +app_dirs_unref (gpointer instance) +{ AppDirs * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2662,7 +2639,7 @@ void app_dirs_unref (gpointer instance) { APP_DIRS_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2666 "AppDirs.c" +#line 2643 "AppDirs.c" } } diff --git a/src/AppWindow.c b/src/AppWindow.c index c4ae66f..d7a3963 100644 --- a/src/AppWindow.c +++ b/src/AppWindow.c @@ -1,4 +1,4 @@ -/* AppWindow.c generated by valac 0.36.6, the Vala compiler +/* AppWindow.c generated by valac 0.40.4, the Vala compiler * generated from AppWindow.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -54,6 +55,11 @@ typedef struct _PageClass PageClass; typedef struct _FullscreenWindow FullscreenWindow; typedef struct _FullscreenWindowClass FullscreenWindowClass; typedef struct _FullscreenWindowPrivate FullscreenWindowPrivate; +enum { + FULLSCREEN_WINDOW_0_PROPERTY, + FULLSCREEN_WINDOW_NUM_PROPERTIES +}; +static GParamSpec* fullscreen_window_properties[FULLSCREEN_WINDOW_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define TYPE_APP_WINDOW (app_window_get_type ()) @@ -105,6 +111,11 @@ typedef struct _SinglePhotoPageClass SinglePhotoPageClass; typedef struct _SlideshowPage SlideshowPage; typedef struct _SlideshowPageClass SlideshowPageClass; +enum { + PAGE_WINDOW_0_PROPERTY, + PAGE_WINDOW_NUM_PROPERTIES +}; +static GParamSpec* page_window_properties[PAGE_WINDOW_NUM_PROPERTIES]; #define TYPE_APPLICATION (application_get_type ()) #define APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APPLICATION, Application)) @@ -120,6 +131,11 @@ typedef struct _AppWindowPrivate AppWindowPrivate; #define TYPE_DIMENSIONS (dimensions_get_type ()) typedef struct _Dimensions Dimensions; +enum { + APP_WINDOW_0_PROPERTY, + APP_WINDOW_NUM_PROPERTIES +}; +static GParamSpec* app_window_properties[APP_WINDOW_NUM_PROPERTIES]; #define TYPE_COMMAND_MANAGER (command_manager_get_type ()) #define COMMAND_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMMAND_MANAGER, CommandManager)) @@ -341,52 +357,64 @@ GType page_window_get_type (void) G_GNUC_CONST; GType page_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; #define FULLSCREEN_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_FULLSCREEN_WINDOW, FullscreenWindowPrivate)) -enum { - FULLSCREEN_WINDOW_DUMMY_PROPERTY -}; #define FULLSCREEN_WINDOW_TOOLBAR_INVOCATION_MSEC 250 #define FULLSCREEN_WINDOW_TOOLBAR_DISMISSAL_SEC 2 #define FULLSCREEN_WINDOW_TOOLBAR_CHECK_DISMISSAL_MSEC 500 static void fullscreen_window_on_close (FullscreenWindow* self); -static void _fullscreen_window_on_close_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _fullscreen_window_on_close_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); FullscreenWindow* fullscreen_window_new (Page* page); -FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page); +FullscreenWindow* fullscreen_window_construct (GType object_type, + Page* page); PageWindow* page_window_construct (GType object_type); -void page_window_set_current_page (PageWindow* self, Page* page); -void application_set_accels_for_action (const gchar* action, gchar** accel, int accel_length1); +void page_window_set_current_page (PageWindow* self, + Page* page); +void application_set_accels_for_action (const gchar* action, + gchar** accel, + int accel_length1); GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); -static void fullscreen_window_get_monitor_geometry (FullscreenWindow* self, GdkRectangle* result); +static void fullscreen_window_get_monitor_geometry (FullscreenWindow* self, + GdkRectangle* result); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); gboolean configuration_facade_get_pin_toolbar_state (ConfigurationFacade* self); void fullscreen_window_update_toolbar_dismissal (FullscreenWindow* self); -static void _fullscreen_window_update_toolbar_dismissal_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); +static void _fullscreen_window_update_toolbar_dismissal_gtk_tool_button_clicked (GtkToolButton* _sender, + gpointer self); GtkToolbar* page_get_toolbar (Page* self); #define RESOURCES_TRANSIENT_WINDOW_OPACITY 0.90 GType single_photo_page_get_type (void) G_GNUC_CONST; GType slideshow_page_get_type (void) G_GNUC_CONST; static void fullscreen_window_hide_toolbar (FullscreenWindow* self); -static void _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar (SlideshowPage* _sender, gpointer self); -void page_set_cursor_hide_time (Page* self, gint hide_time); +static void _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar (SlideshowPage* _sender, + gpointer self); +void page_set_cursor_hide_time (Page* self, + gint hide_time); void page_start_cursor_hiding (Page* self); gboolean configuration_facade_get_display_toolbar (ConfigurationFacade* self); static void fullscreen_window_invoke_toolbar (FullscreenWindow* self); void fullscreen_window_disable_toolbar_dismissal (FullscreenWindow* self); -static gboolean fullscreen_window_real_configure_event (GtkWidget* base, GdkEventConfigure* event); +static gboolean fullscreen_window_real_configure_event (GtkWidget* base, + GdkEventConfigure* event); Page* page_window_get_current_page (PageWindow* self); void page_switched_to (Page* self); -static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEventKey* event); -void configuration_facade_set_pin_toolbar_state (ConfigurationFacade* self, gboolean state); +static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, + GdkEventKey* event); +void configuration_facade_set_pin_toolbar_state (ConfigurationFacade* self, + gboolean state); void app_window_end_fullscreen (AppWindow* self); void fullscreen_window_close (FullscreenWindow* self); static void fullscreen_window_real_destroy (GtkWidget* base); void page_window_clear_current_page (PageWindow* self); void page_stop_cursor_hiding (Page* self); void page_switching_from (Page* self); -static gboolean fullscreen_window_real_delete_event (GtkWidget* base, GdkEventAny* event); -static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, GdkEventMotion* event); +static gboolean fullscreen_window_real_delete_event (GtkWidget* base, + GdkEventAny* event); +static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, + GdkEventMotion* event); static gboolean fullscreen_window_is_pointer_in_toolbar (FullscreenWindow* self); static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow* self); static gboolean _fullscreen_window_on_check_toolbar_invocation_gsource_func (gpointer self); @@ -394,34 +422,53 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow* static gboolean _fullscreen_window_on_check_toolbar_dismissal_gsource_func (gpointer self); static void fullscreen_window_finalize (GObject * obj); #define PAGE_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PAGE_WINDOW, PageWindowPrivate)) -enum { - PAGE_WINDOW_DUMMY_PROPERTY -}; -void page_window_switched_pages (PageWindow* self, Page* old_page, Page* new_page); -static void page_window_real_switched_pages (PageWindow* self, Page* old_page, Page* new_page); +void page_window_switched_pages (PageWindow* self, + Page* old_page, + Page* new_page); +static void page_window_real_switched_pages (PageWindow* self, + Page* old_page, + Page* new_page); gpointer application_ref (gpointer instance); void application_unref (gpointer instance); -GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_application (GValue* value, gpointer v_object); -void value_take_application (GValue* value, gpointer v_object); +GParamSpec* param_spec_application (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_application (GValue* value, + gpointer v_object); +void value_take_application (GValue* value, + gpointer v_object); gpointer value_get_application (const GValue* value); GType application_get_type (void) G_GNUC_CONST; Application* application_get_instance (void); GtkApplication* application_get_system_app (Application* self); -static void page_window_real_set_current_page (PageWindow* self, Page* page); +static void page_window_real_set_current_page (PageWindow* self, + Page* page); void page_clear_container (Page* self); -void page_set_container (Page* self, GtkWindow* container); +void page_set_container (Page* self, + GtkWindow* container); static void page_window_real_clear_current_page (PageWindow* self); -static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey* event); -gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event); -static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey* event); -gboolean page_notify_app_key_released (Page* self, GdkEventKey* event); -static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus* event); -gboolean page_notify_app_focus_in (Page* self, GdkEventFocus* event); -static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus* event); -gboolean page_notify_app_focus_out (Page* self, GdkEventFocus* event); -static gboolean page_window_real_configure_event (GtkWidget* base, GdkEventConfigure* event); -gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event); +static gboolean page_window_real_key_press_event (GtkWidget* base, + GdkEventKey* event); +gboolean page_notify_app_key_pressed (Page* self, + GdkEventKey* event); +static gboolean page_window_real_key_release_event (GtkWidget* base, + GdkEventKey* event); +gboolean page_notify_app_key_released (Page* self, + GdkEventKey* event); +static gboolean page_window_real_focus_in_event (GtkWidget* base, + GdkEventFocus* event); +gboolean page_notify_app_focus_in (Page* self, + GdkEventFocus* event); +static gboolean page_window_real_focus_out_event (GtkWidget* base, + GdkEventFocus* event); +gboolean page_notify_app_focus_out (Page* self, + GdkEventFocus* event); +static gboolean page_window_real_configure_event (GtkWidget* base, + GdkEventConfigure* event); +gboolean page_notify_configure_event (Page* self, + GdkEventConfigure* event); void page_window_set_busy_cursor (PageWindow* self); void spin_event_loop (void); void page_window_set_normal_cursor (PageWindow* self); @@ -429,50 +476,83 @@ static void page_window_finalize (GObject * obj); GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); -enum { - APP_WINDOW_DUMMY_PROPERTY -}; gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; #define APP_WINDOW_DND_ICON_SCALE 128 void app_window_on_about (AppWindow* self); -static void _app_window_on_about_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _app_window_on_about_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void app_window_on_quit (AppWindow* self); -static void _app_window_on_quit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _app_window_on_quit_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void app_window_on_fullscreen (AppWindow* self); -static void _app_window_on_fullscreen_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _app_window_on_fullscreen_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void app_window_on_help_contents (AppWindow* self); -static void _app_window_on_help_contents_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _app_window_on_help_contents_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void app_window_on_help_faq (AppWindow* self); -static void _app_window_on_help_faq_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _app_window_on_help_faq_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void app_window_on_help_report_problem (AppWindow* self); -static void _app_window_on_help_report_problem_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _app_window_on_help_report_problem_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void app_window_on_undo (AppWindow* self); -static void _app_window_on_undo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _app_window_on_undo_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void app_window_on_redo (AppWindow* self); -static void _app_window_on_redo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _app_window_on_redo_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void app_window_on_jump_to_file (AppWindow* self); -static void _app_window_on_jump_to_file_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _app_window_on_jump_to_file_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void app_window_on_select_all (AppWindow* self); -static void _app_window_on_select_all_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _app_window_on_select_all_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void app_window_on_select_none (AppWindow* self); -static void _app_window_on_select_none_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _app_window_on_select_none_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); AppWindow* app_window_construct (GType object_type); #define RESOURCES_APP_TITLE "Shotwell" GType library_window_get_type (void) G_GNUC_CONST; -void configuration_facade_get_library_window_state (ConfigurationFacade* self, gboolean* maximize, Dimensions* dimensions); +void configuration_facade_get_library_window_state (ConfigurationFacade* self, + gboolean* maximize, + Dimensions* dimensions); GType direct_window_get_type (void) G_GNUC_CONST; -void configuration_facade_get_direct_window_state (ConfigurationFacade* self, gboolean* maximize, Dimensions* dimensions); +void configuration_facade_get_direct_window_state (ConfigurationFacade* self, + gboolean* maximize, + Dimensions* dimensions); #define COMMAND_MANAGER_DEFAULT_DEPTH 20 CommandManager* command_manager_new (gint depth); -CommandManager* command_manager_construct (GType object_type, gint depth); +CommandManager* command_manager_construct (GType object_type, + gint depth); 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); +static void _app_window_on_command_manager_altered_command_manager_altered (CommandManager* _sender, + gboolean can_undo, + gboolean can_redo, + gpointer self); void app_window_add_actions (AppWindow* self); #define RESOURCES_CUSTOM_CSS "LibraryWindow .pane-separator {\n" \ " background-color: @borders;\n" \ @@ -485,15 +565,38 @@ void app_window_add_actions (AppWindow* self); static void app_window_real_on_fullscreen (AppWindow* self); gboolean app_window_has_instance (void); FullscreenWindow* app_window_get_fullscreen (void); -GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user); +GtkBuilder* app_window_create_builder (const gchar* glade_filename, + void* user); gchar* resources_get_ui (const gchar* filename); -void app_window_error_message (const gchar* message, GtkWindow* parent); -void app_window_error_message_with_title (const gchar* title, const gchar* message, GtkWindow* parent, gboolean should_escape); -gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_text, gboolean should_escape); -gboolean app_window_negate_affirm_question (const gchar* message, const gchar* negative, const gchar* affirmative, const gchar* title, GtkWindow* parent); -GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message, const gchar* negative, const gchar* affirmative, const gchar* title, GtkWindow* parent); -GtkResponseType app_window_affirm_cancel_question (const gchar* message, const gchar* affirmative, const gchar* title, GtkWindow* parent); -GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* message, const gchar* negative, const gchar* affirmative, const gchar* affirmative_all, const gchar* title, GtkWindow* parent); +void app_window_error_message (const gchar* message, + GtkWindow* parent); +void app_window_error_message_with_title (const gchar* title, + const gchar* message, + GtkWindow* parent, + gboolean should_escape); +gchar* build_alert_body_text (const gchar* primary_text, + const gchar* secondary_text, + gboolean should_escape); +gboolean app_window_negate_affirm_question (const gchar* message, + const gchar* negative, + const gchar* affirmative, + const gchar* title, + GtkWindow* parent); +GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message, + const gchar* negative, + const gchar* affirmative, + const gchar* title, + GtkWindow* parent); +GtkResponseType app_window_affirm_cancel_question (const gchar* message, + const gchar* affirmative, + const gchar* title, + GtkWindow* parent); +GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* message, + const gchar* negative, + const gchar* affirmative, + const gchar* affirmative_all, + const gchar* title, + GtkWindow* parent); GQuark database_error_quark (void); void app_window_database_error (GError* err); void app_window_panic (const gchar* msg); @@ -525,19 +628,30 @@ static gchar* app_window_real_get_app_role (AppWindow* self); "along with Shotwell; if not, write to the Free Software Foundation, In" \ "c., \n" \ "51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n" -GdkPixbuf* resources_get_icon (const gchar* name, gint scale); +GdkPixbuf* resources_get_icon (const gchar* name, + gint scale); #define RESOURCES_ICON_ABOUT_LOGO "about-braunschweig.jpg" -void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** error); -void app_window_show_uri (AppWindow* self, const gchar* url, GError** error); +void resources_launch_help (GdkScreen* screen, + const gchar* anchor, + GError** error); +void app_window_show_uri (AppWindow* self, + const gchar* url, + GError** error); #define RESOURCES_BUG_DB_URL "https://wiki.gnome.org/Apps/Shotwell/ReportingABug" #define RESOURCES_FAQ_URL "https://wiki.gnome.org/Apps/Shotwell/FAQ" static void app_window_real_on_quit (AppWindow* self); void application_exit (Application* self); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; @@ -548,41 +662,81 @@ GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; GType data_view_get_type (void) G_GNUC_CONST; -DataView* view_collection_get_selected_at (ViewCollection* self, gint index); +DataView* view_collection_get_selected_at (ViewCollection* self, + gint index); DataSource* data_view_get_source (DataView* self); -void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error); +void app_window_show_file_uri (AppWindow* self, + GFile* file, + GError** error); GFile* media_source_get_master_file (MediaSource* self); gchar* resources_jump_to_file_failed (GError* err); static void app_window_real_destroy (GtkWidget* base); gchar* get_nautilus_install_location (void); -void show_file_in_nautilus (const gchar* filename, GError** error); -void sys_show_uri (GdkScreen* screen, const gchar* uri, GError** error); +void show_file_in_nautilus (const gchar* filename, + GError** error); +void sys_show_uri (GdkScreen* screen, + const gchar* uri, + GError** error); static void app_window_real_add_actions (AppWindow* self); -void app_window_go_fullscreen (AppWindow* self, Page* page); -void page_switching_to_fullscreen (Page* self, FullscreenWindow* fsw); -void page_returning_from_fullscreen (Page* self, FullscreenWindow* fsw); -GAction* app_window_get_common_action (AppWindow* self, const gchar* name); -void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name, gboolean sensitive); -void app_window_set_common_action_important (AppWindow* self, const gchar* name, gboolean important); -void app_window_set_common_action_visible (AppWindow* self, const gchar* name, gboolean visible); -static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Page* new_page); -void app_window_update_common_action_availability (AppWindow* self, Page* old_page, Page* new_page); +void app_window_go_fullscreen (AppWindow* self, + Page* page); +void page_switching_to_fullscreen (Page* self, + FullscreenWindow* fsw); +void page_returning_from_fullscreen (Page* self, + FullscreenWindow* fsw); +GAction* app_window_get_common_action (AppWindow* self, + const gchar* name); +void app_window_set_common_action_sensitive (AppWindow* self, + const gchar* name, + gboolean sensitive); +void app_window_set_common_action_important (AppWindow* self, + const gchar* name, + gboolean important); +void app_window_set_common_action_visible (AppWindow* self, + const gchar* name, + gboolean visible); +static void app_window_real_switched_pages (PageWindow* base, + Page* old_page, + Page* new_page); +void app_window_update_common_action_availability (AppWindow* self, + Page* old_page, + Page* new_page); static void app_window_on_update_common_actions (AppWindow* self); -static void _app_window_on_update_common_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self); -static void _app_window_on_update_common_actions_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self); -static void _app_window_on_update_common_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self); -void app_window_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count); +static void _app_window_on_update_common_actions_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self); +static void _app_window_on_update_common_actions_view_collection_selection_group_altered (ViewCollection* _sender, + gpointer self); +static void _app_window_on_update_common_actions_view_collection_items_state_changed (ViewCollection* _sender, + GeeIterable* changed, + gpointer self); +void app_window_update_common_actions (AppWindow* self, + Page* page, + gint selected_count, + gint count); gint data_collection_get_count (DataCollection* self); -static void app_window_real_update_common_action_availability (AppWindow* self, Page* old_page, Page* new_page); +static void app_window_real_update_common_action_availability (AppWindow* self, + Page* old_page, + Page* new_page); GType checkerboard_page_get_type (void) G_GNUC_CONST; -static void app_window_real_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count); +static void app_window_real_update_common_actions (AppWindow* self, + Page* page, + gint selected_count, + gint count); void app_window_decorate_undo_action (AppWindow* self); void app_window_decorate_redo_action (AppWindow* self); -void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const gchar* new_label); +void app_window_update_menu_item_label (AppWindow* self, + const gchar* id, + const gchar* new_label); GMenuModel* page_get_menubar (Page* self); CommandManager* app_window_get_command_manager (void); GType command_description_get_type (void) G_GNUC_CONST; -static void app_window_decorate_command_manager_action (AppWindow* self, const gchar* name, const gchar* prefix, const gchar* default_explanation, CommandDescription* desc); +static void app_window_decorate_command_manager_action (AppWindow* self, + const gchar* name, + const gchar* prefix, + const gchar* default_explanation, + CommandDescription* desc); gchar* command_description_get_name (CommandDescription* self); #define RESOURCES_UNDO_MENU _ ("_Undo") CommandDescription* command_manager_get_undo_description (CommandManager* self); @@ -592,260 +746,247 @@ gboolean command_manager_undo (CommandManager* self); gboolean command_manager_redo (CommandManager* self); void view_collection_select_all (ViewCollection* self); void view_collection_unselect_all (ViewCollection* self); -static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfigure* event); +static gboolean app_window_real_configure_event (GtkWidget* base, + GdkEventConfigure* event); static void app_window_finalize (GObject * obj); static const GActionEntry FULLSCREEN_WINDOW_entries[1] = {{"LeaveFullscreen", _fullscreen_window_on_close_gsimple_action_activate_callback}}; static const GActionEntry APP_WINDOW_common_actions[11] = {{"CommonAbout", _app_window_on_about_gsimple_action_activate_callback}, {"CommonQuit", _app_window_on_quit_gsimple_action_activate_callback}, {"CommonFullscreen", _app_window_on_fullscreen_gsimple_action_activate_callback}, {"CommonHelpContents", _app_window_on_help_contents_gsimple_action_activate_callback}, {"CommonHelpFAQ", _app_window_on_help_faq_gsimple_action_activate_callback}, {"CommonHelpReportProblem", _app_window_on_help_report_problem_gsimple_action_activate_callback}, {"CommonUndo", _app_window_on_undo_gsimple_action_activate_callback}, {"CommonRedo", _app_window_on_redo_gsimple_action_activate_callback}, {"CommonJumpToFile", _app_window_on_jump_to_file_gsimple_action_activate_callback}, {"CommonSelectAll", _app_window_on_select_all_gsimple_action_activate_callback}, {"CommonSelectNone", _app_window_on_select_none_gsimple_action_activate_callback}}; extern const gchar* RESOURCES_AUTHORS[6]; -static void _fullscreen_window_on_close_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_fullscreen_window_on_close_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 22 "/home/jens/Source/shotwell/src/AppWindow.vala" fullscreen_window_on_close ((FullscreenWindow*) self); -#line 578 "AppWindow.c" +#line 737 "AppWindow.c" } -static void _fullscreen_window_update_toolbar_dismissal_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { +static void +_fullscreen_window_update_toolbar_dismissal_gtk_tool_button_clicked (GtkToolButton* _sender, + gpointer self) +{ #line 50 "/home/jens/Source/shotwell/src/AppWindow.vala" fullscreen_window_update_toolbar_dismissal ((FullscreenWindow*) self); -#line 585 "AppWindow.c" +#line 747 "AppWindow.c" } -static void _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar (SlideshowPage* _sender, gpointer self) { +static void +_fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar (SlideshowPage* _sender, + gpointer self) +{ #line 65 "/home/jens/Source/shotwell/src/AppWindow.vala" fullscreen_window_hide_toolbar ((FullscreenWindow*) self); -#line 592 "AppWindow.c" +#line 757 "AppWindow.c" } -FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) { +FullscreenWindow* +fullscreen_window_construct (GType object_type, + Page* page) +{ FullscreenWindow * self = NULL; - Page* _tmp0_; #line 32 "/home/jens/Source/shotwell/src/AppWindow.vala" - static const gchar* accels[] = {"F11", NULL}; -#line 601 "AppWindow.c" + static const gchar* accels[2] = {"F11", NULL}; +#line 768 "AppWindow.c" + AppWindow* _tmp0_; AppWindow* _tmp1_; - AppWindow* _tmp2_; - GdkScreen* _tmp3_; + GdkScreen* _tmp2_; GdkRectangle monitor = {0}; - GdkRectangle _tmp4_ = {0}; - GdkRectangle _tmp5_; - gint _tmp6_; - GdkRectangle _tmp7_; - gint _tmp8_; + GdkRectangle _tmp3_ = {0}; + GdkRectangle _tmp4_; + gint _tmp5_; + GdkRectangle _tmp6_; + gint _tmp7_; + ConfigFacade* _tmp8_; ConfigFacade* _tmp9_; - ConfigFacade* _tmp10_; - gboolean _tmp11_; + GtkToggleToolButton* _tmp10_; + GtkToggleToolButton* _tmp11_; GtkToggleToolButton* _tmp12_; GtkToggleToolButton* _tmp13_; - GtkToggleToolButton* _tmp14_; + gboolean _tmp14_; GtkToggleToolButton* _tmp15_; - gboolean _tmp16_; - GtkToggleToolButton* _tmp17_; + GtkToolButton* _tmp16_; + GtkToolButton* _tmp17_; GtkToolButton* _tmp18_; - GtkToolButton* _tmp19_; - GtkToolButton* _tmp20_; - Page* _tmp21_; + GtkToolbar* _tmp19_; + GtkToolbar* _tmp20_; + GtkToolbar* _tmp21_; GtkToolbar* _tmp22_; GtkToolbar* _tmp23_; GtkToolbar* _tmp24_; - GtkToolbar* _tmp25_; - GtkToolbar* _tmp26_; GtkToolbar* _tmp27_; - Page* _tmp28_; - Page* _tmp32_; - Page* _tmp33_; - GtkToolbar* _tmp34_; - GtkToolButton* _tmp35_; - GtkOverlay* _tmp36_; - GtkOverlay* _tmp37_; - Page* _tmp38_; - GtkOverlay* _tmp39_; - GtkToolbar* _tmp40_; - GdkRectangle _tmp41_; - gint _tmp42_; - GdkRectangle _tmp43_; - gint _tmp44_; - gboolean _tmp45_ = FALSE; - ConfigFacade* _tmp46_; - ConfigFacade* _tmp47_; - gboolean _tmp48_; - gboolean _tmp49_; - Page* _tmp51_; + GtkToolButton* _tmp28_; + GtkOverlay* _tmp29_; + GtkOverlay* _tmp30_; + GtkOverlay* _tmp31_; + GtkToolbar* _tmp32_; + GdkRectangle _tmp33_; + gint _tmp34_; + GdkRectangle _tmp35_; + gint _tmp36_; + gboolean _tmp37_ = FALSE; + ConfigFacade* _tmp38_; + ConfigFacade* _tmp39_; + gboolean _tmp40_; #line 26 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_val_if_fail (IS_PAGE (page), NULL); #line 27 "/home/jens/Source/shotwell/src/AppWindow.vala" self = (FullscreenWindow*) page_window_construct (object_type); #line 29 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = page; -#line 29 "/home/jens/Source/shotwell/src/AppWindow.vala" - page_window_set_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), _tmp0_); + page_window_set_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), page); #line 31 "/home/jens/Source/shotwell/src/AppWindow.vala" g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), FULLSCREEN_WINDOW_entries, G_N_ELEMENTS (FULLSCREEN_WINDOW_entries), self); #line 33 "/home/jens/Source/shotwell/src/AppWindow.vala" application_set_accels_for_action ("win.LeaveFullscreen", accels, G_N_ELEMENTS (accels)); #line 35 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = app_window_get_instance (); + _tmp0_ = app_window_get_instance (); #line 35 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 35 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow)); + _tmp2_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow)); #line 35 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_window_set_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp3_); + gtk_window_set_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp2_); #line 35 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 38 "/home/jens/Source/shotwell/src/AppWindow.vala" - fullscreen_window_get_monitor_geometry (self, &_tmp4_); + fullscreen_window_get_monitor_geometry (self, &_tmp3_); #line 38 "/home/jens/Source/shotwell/src/AppWindow.vala" - monitor = _tmp4_; + monitor = _tmp3_; #line 39 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = monitor; + _tmp4_ = monitor; #line 39 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = _tmp5_.x; + _tmp5_ = _tmp4_.x; #line 39 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = monitor; + _tmp6_ = monitor; #line 39 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp8_ = _tmp7_.y; + _tmp7_ = _tmp6_.y; #line 39 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp6_, _tmp8_); + gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp5_, _tmp7_); #line 41 "/home/jens/Source/shotwell/src/AppWindow.vala" gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), (guint) 0); #line 44 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp9_ = config_facade_get_instance (); + _tmp8_ = config_facade_get_instance (); #line 44 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp10_ = _tmp9_; -#line 44 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp11_ = configuration_facade_get_pin_toolbar_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp9_ = _tmp8_; #line 44 "/home/jens/Source/shotwell/src/AppWindow.vala" - self->priv->is_toolbar_dismissal_enabled = _tmp11_; + self->priv->is_toolbar_dismissal_enabled = configuration_facade_get_pin_toolbar_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 44 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp9_); #line 46 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp12_ = self->priv->pin_button; + _tmp10_ = self->priv->pin_button; #line 46 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_tool_button_get_type (), GtkToolButton), "pin-toolbar"); + gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_tool_button_get_type (), GtkToolButton), "pin-toolbar"); #line 47 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp13_ = self->priv->pin_button; + _tmp11_ = self->priv->pin_button; #line 47 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_tool_button_get_type (), GtkToolButton), _ ("Pin Toolbar")); + gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_tool_button_get_type (), GtkToolButton), _ ("Pin Toolbar")); #line 48 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp14_ = self->priv->pin_button; + _tmp12_ = self->priv->pin_button; #line 48 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_tool_item_get_type (), GtkToolItem), _ ("Pin the toolbar open")); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_tool_item_get_type (), GtkToolItem), _ ("Pin the toolbar open")); #line 49 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp15_ = self->priv->pin_button; + _tmp13_ = self->priv->pin_button; #line 49 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp16_ = self->priv->is_toolbar_dismissal_enabled; + _tmp14_ = self->priv->is_toolbar_dismissal_enabled; #line 49 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_toggle_tool_button_set_active (_tmp15_, !_tmp16_); + gtk_toggle_tool_button_set_active (_tmp13_, !_tmp14_); #line 50 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp17_ = self->priv->pin_button; + _tmp15_ = self->priv->pin_button; #line 50 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_tool_button_get_type (), GtkToolButton), "clicked", (GCallback) _fullscreen_window_update_toolbar_dismissal_gtk_tool_button_clicked, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_tool_button_get_type (), GtkToolButton), "clicked", (GCallback) _fullscreen_window_update_toolbar_dismissal_gtk_tool_button_clicked, self, 0); #line 52 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp18_ = self->priv->close_button; + _tmp16_ = self->priv->close_button; #line 52 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_tool_button_set_icon_name (_tmp18_, "view-restore"); + gtk_tool_button_set_icon_name (_tmp16_, "view-restore"); #line 53 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp19_ = self->priv->close_button; + _tmp17_ = self->priv->close_button; #line 53 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_tool_item_get_type (), GtkToolItem), _ ("Leave fullscreen")); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_tool_item_get_type (), GtkToolItem), _ ("Leave fullscreen")); #line 54 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp20_ = self->priv->close_button; + _tmp18_ = self->priv->close_button; #line 54 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.LeaveFullscreen"); + gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_actionable_get_type (), GtkActionable), "win.LeaveFullscreen"); #line 56 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp21_ = page; -#line 56 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp22_ = page_get_toolbar (_tmp21_); + _tmp19_ = page_get_toolbar (page); #line 56 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (self->priv->toolbar); #line 56 "/home/jens/Source/shotwell/src/AppWindow.vala" - self->priv->toolbar = _tmp22_; + self->priv->toolbar = _tmp19_; #line 57 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp23_ = self->priv->toolbar; + _tmp20_ = self->priv->toolbar; #line 57 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_toolbar_set_show_arrow (_tmp23_, FALSE); + gtk_toolbar_set_show_arrow (_tmp20_, FALSE); #line 58 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp24_ = self->priv->toolbar; + _tmp21_ = self->priv->toolbar; #line 58 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END); + gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END); #line 59 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp25_ = self->priv->toolbar; + _tmp22_ = self->priv->toolbar; #line 59 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); #line 60 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp26_ = self->priv->toolbar; + _tmp23_ = self->priv->toolbar; #line 60 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), "expand", FALSE, NULL); + g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), "expand", FALSE, NULL); #line 61 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp27_ = self->priv->toolbar; + _tmp24_ = self->priv->toolbar; #line 61 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), RESOURCES_TRANSIENT_WINDOW_OPACITY); + gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), RESOURCES_TRANSIENT_WINDOW_OPACITY); #line 63 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp28_ = page; -#line 63 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, TYPE_SLIDESHOW_PAGE)) { -#line 764 "AppWindow.c" - Page* _tmp29_; -#line 65 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp29_ = page; + if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_SLIDESHOW_PAGE)) { #line 65 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_SLIDESHOW_PAGE, SlideshowPage), "hide-toolbar", (GCallback) _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar, self, 0); -#line 770 "AppWindow.c" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_SLIDESHOW_PAGE, SlideshowPage), "hide-toolbar", (GCallback) _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar, self, 0); +#line 917 "AppWindow.c" } else { - GtkToolbar* _tmp30_; - GtkToggleToolButton* _tmp31_; + GtkToolbar* _tmp25_; + GtkToggleToolButton* _tmp26_; #line 68 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp30_ = self->priv->toolbar; + _tmp25_ = self->priv->toolbar; #line 68 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp31_ = self->priv->pin_button; + _tmp26_ = self->priv->pin_button; #line 68 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_toolbar_insert (_tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 780 "AppWindow.c" + gtk_toolbar_insert (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_tool_item_get_type (), GtkToolItem), -1); +#line 927 "AppWindow.c" } #line 71 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp32_ = page; -#line 71 "/home/jens/Source/shotwell/src/AppWindow.vala" - page_set_cursor_hide_time (_tmp32_, FULLSCREEN_WINDOW_TOOLBAR_DISMISSAL_SEC * 1000); -#line 72 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp33_ = page; + page_set_cursor_hide_time (page, FULLSCREEN_WINDOW_TOOLBAR_DISMISSAL_SEC * 1000); #line 72 "/home/jens/Source/shotwell/src/AppWindow.vala" - page_start_cursor_hiding (_tmp33_); + page_start_cursor_hiding (page); #line 74 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp34_ = self->priv->toolbar; + _tmp27_ = self->priv->toolbar; #line 74 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp35_ = self->priv->close_button; + _tmp28_ = self->priv->close_button; #line 74 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_toolbar_insert (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_item_get_type (), GtkToolItem), -1); + gtk_toolbar_insert (_tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 76 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp36_ = self->priv->overlay; + _tmp29_ = self->priv->overlay; #line 76 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget)); -#line 77 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp37_ = self->priv->overlay; + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget)); #line 77 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp38_ = page; + _tmp30_ = self->priv->overlay; #line 77 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget)); #line 78 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp39_ = self->priv->overlay; + _tmp31_ = self->priv->overlay; #line 78 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp40_ = self->priv->toolbar; + _tmp32_ = self->priv->toolbar; #line 78 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_overlay_add_overlay (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget)); + gtk_overlay_add_overlay (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget)); #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp41_ = monitor; + _tmp33_ = monitor; #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp42_ = _tmp41_.width; + _tmp34_ = _tmp33_.width; #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp43_ = monitor; + _tmp35_ = monitor; #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp44_ = _tmp43_.height; + _tmp36_ = _tmp35_.height; #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp42_, _tmp44_); + gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp34_, _tmp36_); #line 86 "/home/jens/Source/shotwell/src/AppWindow.vala" gtk_window_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow)); #line 87 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -853,90 +994,91 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) { #line 90 "/home/jens/Source/shotwell/src/AppWindow.vala" gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) GDK_POINTER_MOTION_MASK); #line 95 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp46_ = config_facade_get_instance (); + _tmp38_ = config_facade_get_instance (); #line 95 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp47_ = _tmp46_; + _tmp39_ = _tmp38_; #line 95 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp48_ = configuration_facade_get_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp40_ = configuration_facade_get_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 95 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp49_ = _tmp48_; + _g_object_unref0 (_tmp39_); #line 95 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp47_); + if (_tmp40_) { #line 95 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp49_) { -#line 95 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp45_ = TRUE; -#line 842 "AppWindow.c" + _tmp37_ = TRUE; +#line 981 "AppWindow.c" } else { - gboolean _tmp50_; + gboolean _tmp41_; #line 96 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp50_ = self->priv->is_toolbar_dismissal_enabled; + _tmp41_ = self->priv->is_toolbar_dismissal_enabled; #line 96 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp45_ = !_tmp50_; -#line 849 "AppWindow.c" + _tmp37_ = !_tmp41_; +#line 988 "AppWindow.c" } #line 95 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp45_) { + if (_tmp37_) { #line 97 "/home/jens/Source/shotwell/src/AppWindow.vala" fullscreen_window_invoke_toolbar (self); -#line 855 "AppWindow.c" +#line 994 "AppWindow.c" } else { #line 99 "/home/jens/Source/shotwell/src/AppWindow.vala" fullscreen_window_hide_toolbar (self); -#line 859 "AppWindow.c" +#line 998 "AppWindow.c" } #line 103 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp51_ = page; -#line 103 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget)); #line 106 "/home/jens/Source/shotwell/src/AppWindow.vala" gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), FALSE); #line 26 "/home/jens/Source/shotwell/src/AppWindow.vala" return self; -#line 869 "AppWindow.c" +#line 1006 "AppWindow.c" } -FullscreenWindow* fullscreen_window_new (Page* page) { +FullscreenWindow* +fullscreen_window_new (Page* page) +{ #line 26 "/home/jens/Source/shotwell/src/AppWindow.vala" return fullscreen_window_construct (TYPE_FULLSCREEN_WINDOW, page); -#line 876 "AppWindow.c" +#line 1015 "AppWindow.c" } -void fullscreen_window_disable_toolbar_dismissal (FullscreenWindow* self) { +void +fullscreen_window_disable_toolbar_dismissal (FullscreenWindow* self) +{ #line 109 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_FULLSCREEN_WINDOW (self)); #line 110 "/home/jens/Source/shotwell/src/AppWindow.vala" self->priv->is_toolbar_dismissal_enabled = FALSE; -#line 885 "AppWindow.c" +#line 1026 "AppWindow.c" } -void fullscreen_window_update_toolbar_dismissal (FullscreenWindow* self) { +void +fullscreen_window_update_toolbar_dismissal (FullscreenWindow* self) +{ GtkToggleToolButton* _tmp0_; - gboolean _tmp1_; #line 113 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_FULLSCREEN_WINDOW (self)); #line 114 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = self->priv->pin_button; #line 114 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = gtk_toggle_tool_button_get_active (_tmp0_); -#line 114 "/home/jens/Source/shotwell/src/AppWindow.vala" - self->priv->is_toolbar_dismissal_enabled = !_tmp1_; -#line 900 "AppWindow.c" + self->priv->is_toolbar_dismissal_enabled = !gtk_toggle_tool_button_get_active (_tmp0_); +#line 1040 "AppWindow.c" } -static void fullscreen_window_get_monitor_geometry (FullscreenWindow* self, GdkRectangle* result) { +static void +fullscreen_window_get_monitor_geometry (FullscreenWindow* self, + GdkRectangle* result) +{ GdkRectangle monitor = {0}; GdkScreen* _tmp0_; GdkScreen* _tmp1_; AppWindow* _tmp2_; AppWindow* _tmp3_; GdkWindow* _tmp4_; - gint _tmp5_; - GdkRectangle _tmp6_ = {0}; + GdkRectangle _tmp5_ = {0}; #line 117 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_FULLSCREEN_WINDOW (self)); #line 120 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -950,143 +1092,130 @@ static void fullscreen_window_get_monitor_geometry (FullscreenWindow* self, GdkR #line 120 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp4_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); #line 120 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = gdk_screen_get_monitor_at_window (_tmp1_, _tmp4_); + gdk_screen_get_monitor_geometry (_tmp0_, gdk_screen_get_monitor_at_window (_tmp1_, _tmp4_), &_tmp5_); #line 120 "/home/jens/Source/shotwell/src/AppWindow.vala" - gdk_screen_get_monitor_geometry (_tmp0_, _tmp5_, &_tmp6_); -#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala" - monitor = _tmp6_; + monitor = _tmp5_; #line 120 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp3_); #line 123 "/home/jens/Source/shotwell/src/AppWindow.vala" *result = monitor; #line 123 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 937 "AppWindow.c" +#line 1077 "AppWindow.c" } -static gboolean fullscreen_window_real_configure_event (GtkWidget* base, GdkEventConfigure* event) { +static gboolean +fullscreen_window_real_configure_event (GtkWidget* base, + GdkEventConfigure* event) +{ FullscreenWindow * self; gboolean result = FALSE; gboolean _result_ = FALSE; - GdkEventConfigure* _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_; + gboolean _tmp0_; #line 126 "/home/jens/Source/shotwell/src/AppWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow); #line 126 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_val_if_fail (event != NULL, FALSE); #line 127 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = event; -#line 127 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = GTK_WIDGET_CLASS (fullscreen_window_parent_class)->configure_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp0_); -#line 127 "/home/jens/Source/shotwell/src/AppWindow.vala" - _result_ = _tmp1_; + _result_ = 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), event); #line 129 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = self->priv->switched_to; + _tmp0_ = self->priv->switched_to; #line 129 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (!_tmp2_) { -#line 962 "AppWindow.c" - Page* _tmp3_; - Page* _tmp4_; + if (!_tmp0_) { +#line 1099 "AppWindow.c" + Page* _tmp1_; + Page* _tmp2_; #line 130 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); + _tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); #line 130 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 130 "/home/jens/Source/shotwell/src/AppWindow.vala" - page_switched_to (_tmp4_); + page_switched_to (_tmp2_); #line 130 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp2_); #line 131 "/home/jens/Source/shotwell/src/AppWindow.vala" self->priv->switched_to = TRUE; -#line 975 "AppWindow.c" +#line 1112 "AppWindow.c" } #line 134 "/home/jens/Source/shotwell/src/AppWindow.vala" result = _result_; #line 134 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 981 "AppWindow.c" +#line 1118 "AppWindow.c" } -static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEventKey* event) { +static gboolean +fullscreen_window_real_key_press_event (GtkWidget* base, + GdkEventKey* event) +{ FullscreenWindow * self; gboolean result = FALSE; - GdkEventKey* _tmp0_; - guint _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_ = FALSE; - AppWindow* _tmp6_; - AppWindow* _tmp7_; - GdkEventKey* _tmp8_; - gboolean _tmp9_ = FALSE; - gboolean _tmp10_; + guint _tmp0_; + const gchar* _tmp1_; + gboolean _tmp2_ = FALSE; + AppWindow* _tmp3_; + AppWindow* _tmp4_; + gboolean _tmp5_ = FALSE; + gboolean _tmp6_; #line 137 "/home/jens/Source/shotwell/src/AppWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow); #line 137 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_val_if_fail (event != NULL, FALSE); #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = event; + _tmp0_ = event->keyval; #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = _tmp0_->keyval; + _tmp1_ = gdk_keyval_name (_tmp0_); #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = gdk_keyval_name (_tmp1_); -#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (g_strcmp0 (_tmp2_, "Escape") == 0) { + if (g_strcmp0 (_tmp1_, "Escape") == 0) { #line 140 "/home/jens/Source/shotwell/src/AppWindow.vala" fullscreen_window_on_close (self); #line 142 "/home/jens/Source/shotwell/src/AppWindow.vala" result = TRUE; #line 142 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1015 "AppWindow.c" +#line 1151 "AppWindow.c" } #line 146 "/home/jens/Source/shotwell/src/AppWindow.vala" if (GTK_WIDGET_CLASS (fullscreen_window_parent_class)->key_press_event != NULL) { -#line 1019 "AppWindow.c" - GdkEventKey* _tmp4_; - gboolean _tmp5_; -#line 146 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = event; #line 146 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = GTK_WIDGET_CLASS (fullscreen_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp4_); -#line 146 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = _tmp5_; -#line 1028 "AppWindow.c" + _tmp2_ = 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), event); +#line 1157 "AppWindow.c" } else { #line 146 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = FALSE; -#line 1032 "AppWindow.c" + _tmp2_ = FALSE; +#line 1161 "AppWindow.c" } #line 146 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp3_) { + if (_tmp2_) { #line 147 "/home/jens/Source/shotwell/src/AppWindow.vala" result = TRUE; #line 147 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1040 "AppWindow.c" +#line 1169 "AppWindow.c" } #line 150 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = app_window_get_instance (); -#line 150 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = _tmp6_; + _tmp3_ = app_window_get_instance (); #line 150 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp8_ = event; + _tmp4_ = _tmp3_; #line 150 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp8_, &_tmp9_); + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), "key-press-event", event, &_tmp5_); #line 150 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp10_ = _tmp9_; + _tmp6_ = _tmp5_; #line 150 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp4_); #line 150 "/home/jens/Source/shotwell/src/AppWindow.vala" - result = _tmp10_; + result = _tmp6_; #line 150 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1058 "AppWindow.c" +#line 1185 "AppWindow.c" } -static void fullscreen_window_on_close (FullscreenWindow* self) { +static void +fullscreen_window_on_close (FullscreenWindow* self) +{ ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; gboolean _tmp2_; @@ -1114,20 +1243,24 @@ static void fullscreen_window_on_close (FullscreenWindow* self) { app_window_end_fullscreen (_tmp4_); #line 157 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp4_); -#line 1090 "AppWindow.c" +#line 1219 "AppWindow.c" } -void fullscreen_window_close (FullscreenWindow* self) { +void +fullscreen_window_close (FullscreenWindow* self) +{ #line 160 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_FULLSCREEN_WINDOW (self)); #line 161 "/home/jens/Source/shotwell/src/AppWindow.vala" fullscreen_window_on_close (self); -#line 1099 "AppWindow.c" +#line 1230 "AppWindow.c" } -static void fullscreen_window_real_destroy (GtkWidget* base) { +static void +fullscreen_window_real_destroy (GtkWidget* base) +{ FullscreenWindow * self; Page* page = NULL; Page* _tmp0_; @@ -1144,7 +1277,7 @@ static void fullscreen_window_real_destroy (GtkWidget* base) { _tmp1_ = page; #line 168 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp1_ != NULL) { -#line 1120 "AppWindow.c" +#line 1253 "AppWindow.c" Page* _tmp2_; Page* _tmp3_; #line 169 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -1155,17 +1288,20 @@ static void fullscreen_window_real_destroy (GtkWidget* base) { _tmp3_ = page; #line 170 "/home/jens/Source/shotwell/src/AppWindow.vala" page_switching_from (_tmp3_); -#line 1131 "AppWindow.c" +#line 1264 "AppWindow.c" } #line 173 "/home/jens/Source/shotwell/src/AppWindow.vala" GTK_WIDGET_CLASS (fullscreen_window_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget)); #line 164 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (page); -#line 1137 "AppWindow.c" +#line 1270 "AppWindow.c" } -static gboolean fullscreen_window_real_delete_event (GtkWidget* base, GdkEventAny* event) { +static gboolean +fullscreen_window_real_delete_event (GtkWidget* base, + GdkEventAny* event) +{ FullscreenWindow * self; gboolean result = FALSE; AppWindow* _tmp0_; @@ -1188,24 +1324,29 @@ static gboolean fullscreen_window_real_delete_event (GtkWidget* base, GdkEventAn result = TRUE; #line 180 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1164 "AppWindow.c" +#line 1300 "AppWindow.c" } -static gboolean _fullscreen_window_on_check_toolbar_invocation_gsource_func (gpointer self) { +static gboolean +_fullscreen_window_on_check_toolbar_invocation_gsource_func (gpointer self) +{ gboolean result; result = fullscreen_window_on_check_toolbar_invocation ((FullscreenWindow*) self); #line 189 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1173 "AppWindow.c" +#line 1311 "AppWindow.c" } -static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, GdkEventMotion* event) { +static gboolean +fullscreen_window_real_motion_notify_event (GtkWidget* base, + GdkEventMotion* event) +{ FullscreenWindow * self; gboolean result = FALSE; gboolean _tmp0_; - gboolean _tmp4_ = FALSE; + gboolean _tmp3_ = FALSE; #line 183 "/home/jens/Source/shotwell/src/AppWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow); #line 183 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -1214,24 +1355,20 @@ static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, Gdk _tmp0_ = self->priv->is_toolbar_shown; #line 184 "/home/jens/Source/shotwell/src/AppWindow.vala" if (!_tmp0_) { -#line 1190 "AppWindow.c" +#line 1331 "AppWindow.c" gboolean _tmp1_ = FALSE; gboolean _tmp2_; #line 188 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp2_ = self->priv->waiting_for_invoke; #line 188 "/home/jens/Source/shotwell/src/AppWindow.vala" if (!_tmp2_) { -#line 1197 "AppWindow.c" - gboolean _tmp3_; -#line 188 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = fullscreen_window_is_pointer_in_toolbar (self); #line 188 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = _tmp3_; -#line 1203 "AppWindow.c" + _tmp1_ = fullscreen_window_is_pointer_in_toolbar (self); +#line 1340 "AppWindow.c" } else { #line 188 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp1_ = FALSE; -#line 1207 "AppWindow.c" +#line 1344 "AppWindow.c" } #line 188 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp1_) { @@ -1239,42 +1376,39 @@ static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, Gdk g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) FULLSCREEN_WINDOW_TOOLBAR_INVOCATION_MSEC, _fullscreen_window_on_check_toolbar_invocation_gsource_func, g_object_ref (self), g_object_unref); #line 190 "/home/jens/Source/shotwell/src/AppWindow.vala" self->priv->waiting_for_invoke = TRUE; -#line 1215 "AppWindow.c" +#line 1352 "AppWindow.c" } } #line 194 "/home/jens/Source/shotwell/src/AppWindow.vala" if (GTK_WIDGET_CLASS (fullscreen_window_parent_class)->motion_notify_event != NULL) { -#line 1220 "AppWindow.c" - GdkEventMotion* _tmp5_; - gboolean _tmp6_; -#line 194 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = event; -#line 194 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = GTK_WIDGET_CLASS (fullscreen_window_parent_class)->motion_notify_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp5_); #line 194 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = _tmp6_; -#line 1229 "AppWindow.c" + _tmp3_ = 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), event); +#line 1359 "AppWindow.c" } else { #line 194 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = FALSE; -#line 1233 "AppWindow.c" + _tmp3_ = FALSE; +#line 1363 "AppWindow.c" } #line 194 "/home/jens/Source/shotwell/src/AppWindow.vala" - result = _tmp4_; + result = _tmp3_; #line 194 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1239 "AppWindow.c" +#line 1369 "AppWindow.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 198 "/home/jens/Source/shotwell/src/AppWindow.vala" return self ? g_object_ref (self) : NULL; -#line 1246 "AppWindow.c" +#line 1378 "AppWindow.c" } -static gboolean fullscreen_window_is_pointer_in_toolbar (FullscreenWindow* self) { +static gboolean +fullscreen_window_is_pointer_in_toolbar (FullscreenWindow* self) +{ gboolean result = FALSE; GdkDeviceManager* devmgr = NULL; GdkDisplay* _tmp0_; @@ -1313,7 +1447,7 @@ static gboolean fullscreen_window_is_pointer_in_toolbar (FullscreenWindow* self) _g_object_unref0 (devmgr); #line 202 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1289 "AppWindow.c" +#line 1423 "AppWindow.c" } #line 206 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp4_ = devmgr; @@ -1341,14 +1475,15 @@ static gboolean fullscreen_window_is_pointer_in_toolbar (FullscreenWindow* self) _g_object_unref0 (devmgr); #line 211 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1317 "AppWindow.c" +#line 1451 "AppWindow.c" } -static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow* self) { +static gboolean +fullscreen_window_on_check_toolbar_invocation (FullscreenWindow* self) +{ gboolean result = FALSE; gboolean _tmp0_; - gboolean _tmp1_; #line 214 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_val_if_fail (IS_FULLSCREEN_WINDOW (self), FALSE); #line 215 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -1361,17 +1496,15 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow* result = FALSE; #line 218 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1337 "AppWindow.c" +#line 1472 "AppWindow.c" } #line 220 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = fullscreen_window_is_pointer_in_toolbar (self); -#line 220 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (!_tmp1_) { + if (!fullscreen_window_is_pointer_in_toolbar (self)) { #line 221 "/home/jens/Source/shotwell/src/AppWindow.vala" result = FALSE; #line 221 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1347 "AppWindow.c" +#line 1480 "AppWindow.c" } #line 223 "/home/jens/Source/shotwell/src/AppWindow.vala" fullscreen_window_invoke_toolbar (self); @@ -1379,20 +1512,24 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow* result = FALSE; #line 225 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1355 "AppWindow.c" +#line 1488 "AppWindow.c" } -static gboolean _fullscreen_window_on_check_toolbar_dismissal_gsource_func (gpointer self) { +static gboolean +_fullscreen_window_on_check_toolbar_dismissal_gsource_func (gpointer self) +{ gboolean result; result = fullscreen_window_on_check_toolbar_dismissal ((FullscreenWindow*) self); #line 233 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1364 "AppWindow.c" +#line 1499 "AppWindow.c" } -static void fullscreen_window_invoke_toolbar (FullscreenWindow* self) { +static void +fullscreen_window_invoke_toolbar (FullscreenWindow* self) +{ GtkToolbar* _tmp0_; #line 228 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_FULLSCREEN_WINDOW (self)); @@ -1404,22 +1541,23 @@ static void fullscreen_window_invoke_toolbar (FullscreenWindow* self) { self->priv->is_toolbar_shown = TRUE; #line 233 "/home/jens/Source/shotwell/src/AppWindow.vala" g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) FULLSCREEN_WINDOW_TOOLBAR_CHECK_DISMISSAL_MSEC, _fullscreen_window_on_check_toolbar_dismissal_gsource_func, g_object_ref (self), g_object_unref); -#line 1380 "AppWindow.c" +#line 1517 "AppWindow.c" } -static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow* self) { +static gboolean +fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow* self) +{ gboolean result = FALSE; gboolean _tmp0_; gboolean _tmp1_; - gboolean _tmp2_; - time_t _tmp3_; + time_t _tmp2_; time_t now = 0; + time_t _tmp4_; time_t _tmp5_; time_t _tmp6_; time_t _tmp7_; time_t _tmp8_; - time_t _tmp9_; #line 236 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_val_if_fail (IS_FULLSCREEN_WINDOW (self), FALSE); #line 237 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -1430,7 +1568,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow* result = FALSE; #line 238 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1406 "AppWindow.c" +#line 1544 "AppWindow.c" } #line 241 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp1_ = self->priv->is_toolbar_dismissal_enabled; @@ -1440,57 +1578,55 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow* result = TRUE; #line 242 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1416 "AppWindow.c" +#line 1554 "AppWindow.c" } #line 245 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = fullscreen_window_is_pointer_in_toolbar (self); -#line 245 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp2_) { + if (fullscreen_window_is_pointer_in_toolbar (self)) { #line 246 "/home/jens/Source/shotwell/src/AppWindow.vala" self->priv->left_toolbar_time = (time_t) 0; #line 248 "/home/jens/Source/shotwell/src/AppWindow.vala" result = TRUE; #line 248 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1428 "AppWindow.c" +#line 1564 "AppWindow.c" } #line 252 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = self->priv->left_toolbar_time; + _tmp2_ = self->priv->left_toolbar_time; #line 252 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp3_ == ((time_t) 0)) { -#line 1434 "AppWindow.c" - time_t _tmp4_; + if (_tmp2_ == ((time_t) 0)) { +#line 1570 "AppWindow.c" + time_t _tmp3_; #line 253 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = time (NULL); + _tmp3_ = time (NULL); #line 253 "/home/jens/Source/shotwell/src/AppWindow.vala" - self->priv->left_toolbar_time = _tmp4_; + self->priv->left_toolbar_time = _tmp3_; #line 255 "/home/jens/Source/shotwell/src/AppWindow.vala" result = TRUE; #line 255 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1444 "AppWindow.c" +#line 1580 "AppWindow.c" } #line 259 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = time (NULL); + _tmp4_ = time (NULL); #line 259 "/home/jens/Source/shotwell/src/AppWindow.vala" - now = _tmp5_; + now = _tmp4_; #line 260 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = now; + _tmp5_ = now; #line 260 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = self->priv->left_toolbar_time; + _tmp6_ = self->priv->left_toolbar_time; #line 260 "/home/jens/Source/shotwell/src/AppWindow.vala" - _vala_assert (_tmp6_ >= _tmp7_, "now >= left_toolbar_time"); + _vala_assert (_tmp5_ >= _tmp6_, "now >= left_toolbar_time"); #line 262 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp8_ = now; + _tmp7_ = now; #line 262 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp9_ = self->priv->left_toolbar_time; + _tmp8_ = self->priv->left_toolbar_time; #line 262 "/home/jens/Source/shotwell/src/AppWindow.vala" - if ((_tmp8_ - _tmp9_) < ((time_t) FULLSCREEN_WINDOW_TOOLBAR_DISMISSAL_SEC)) { + if ((_tmp7_ - _tmp8_) < ((time_t) FULLSCREEN_WINDOW_TOOLBAR_DISMISSAL_SEC)) { #line 263 "/home/jens/Source/shotwell/src/AppWindow.vala" result = TRUE; #line 263 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1466 "AppWindow.c" +#line 1602 "AppWindow.c" } #line 265 "/home/jens/Source/shotwell/src/AppWindow.vala" fullscreen_window_hide_toolbar (self); @@ -1498,11 +1634,13 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow* result = FALSE; #line 267 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1474 "AppWindow.c" +#line 1610 "AppWindow.c" } -static void fullscreen_window_hide_toolbar (FullscreenWindow* self) { +static void +fullscreen_window_hide_toolbar (FullscreenWindow* self) +{ GtkToolbar* _tmp0_; #line 270 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_FULLSCREEN_WINDOW (self)); @@ -1512,11 +1650,13 @@ static void fullscreen_window_hide_toolbar (FullscreenWindow* self) { gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); #line 272 "/home/jens/Source/shotwell/src/AppWindow.vala" self->priv->is_toolbar_shown = FALSE; -#line 1488 "AppWindow.c" +#line 1626 "AppWindow.c" } -static void fullscreen_window_class_init (FullscreenWindowClass * klass) { +static void +fullscreen_window_class_init (FullscreenWindowClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala" fullscreen_window_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -1533,11 +1673,13 @@ static void fullscreen_window_class_init (FullscreenWindowClass * klass) { ((GtkWidgetClass *) klass)->motion_notify_event = (gboolean (*) (GtkWidget *, GdkEventMotion*)) fullscreen_window_real_motion_notify_event; #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala" G_OBJECT_CLASS (klass)->finalize = fullscreen_window_finalize; -#line 1509 "AppWindow.c" +#line 1649 "AppWindow.c" } -static void fullscreen_window_instance_init (FullscreenWindow * self) { +static void +fullscreen_window_instance_init (FullscreenWindow * self) +{ GtkOverlay* _tmp0_; GtkToolButton* _tmp1_; GtkToggleToolButton* _tmp2_; @@ -1571,11 +1713,13 @@ 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 1547 "AppWindow.c" +#line 1689 "AppWindow.c" } -static void fullscreen_window_finalize (GObject * obj) { +static void +fullscreen_window_finalize (GObject * obj) +{ FullscreenWindow * self; #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FULLSCREEN_WINDOW, FullscreenWindow); @@ -1589,11 +1733,13 @@ 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 1565 "AppWindow.c" +#line 1709 "AppWindow.c" } -GType fullscreen_window_get_type (void) { +GType +fullscreen_window_get_type (void) +{ static volatile gsize fullscreen_window_type_id__volatile = 0; if (g_once_init_enter (&fullscreen_window_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (FullscreenWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) fullscreen_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FullscreenWindow), 0, (GInstanceInitFunc) fullscreen_window_instance_init, NULL }; @@ -1605,25 +1751,35 @@ GType fullscreen_window_get_type (void) { } -static void page_window_real_switched_pages (PageWindow* self, Page* old_page, Page* new_page) { +static void +page_window_real_switched_pages (PageWindow* self, + Page* old_page, + Page* new_page) +{ #line 287 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page)); #line 287 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page)); -#line 1586 "AppWindow.c" +#line 1736 "AppWindow.c" } -void page_window_switched_pages (PageWindow* self, Page* old_page, Page* new_page) { +void +page_window_switched_pages (PageWindow* self, + Page* old_page, + Page* new_page) +{ #line 287 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_PAGE_WINDOW (self)); #line 287 "/home/jens/Source/shotwell/src/AppWindow.vala" PAGE_WINDOW_GET_CLASS (self)->switched_pages (self, old_page, new_page); -#line 1595 "AppWindow.c" +#line 1749 "AppWindow.c" } -PageWindow* page_window_construct (GType object_type) { +PageWindow* +page_window_construct (GType object_type) +{ PageWindow * self = NULL; Application* _tmp0_; Application* _tmp1_; @@ -1649,11 +1805,13 @@ PageWindow* page_window_construct (GType object_type) { gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), TRUE); #line 290 "/home/jens/Source/shotwell/src/AppWindow.vala" return self; -#line 1625 "AppWindow.c" +#line 1781 "AppWindow.c" } -Page* page_window_get_current_page (PageWindow* self) { +Page* +page_window_get_current_page (PageWindow* self) +{ Page* result = NULL; Page* _tmp0_; Page* _tmp1_; @@ -1667,32 +1825,33 @@ Page* page_window_get_current_page (PageWindow* self) { result = _tmp1_; #line 300 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1643 "AppWindow.c" +#line 1801 "AppWindow.c" } -static void page_window_real_set_current_page (PageWindow* self, Page* page) { +static void +page_window_real_set_current_page (PageWindow* self, + Page* page) +{ Page* _tmp0_; Page* old_page = NULL; Page* _tmp2_; Page* _tmp3_; Page* _tmp4_; Page* _tmp5_; - Page* _tmp6_; - Page* _tmp7_; #line 303 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_PAGE (page)); #line 304 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = self->priv->current_page; #line 304 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp0_ != NULL) { -#line 1662 "AppWindow.c" +#line 1821 "AppWindow.c" Page* _tmp1_; #line 305 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp1_ = self->priv->current_page; #line 305 "/home/jens/Source/shotwell/src/AppWindow.vala" page_clear_container (_tmp1_); -#line 1668 "AppWindow.c" +#line 1827 "AppWindow.c" } #line 307 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp2_ = self->priv->current_page; @@ -1701,37 +1860,38 @@ static void page_window_real_set_current_page (PageWindow* self, Page* page) { #line 307 "/home/jens/Source/shotwell/src/AppWindow.vala" old_page = _tmp3_; #line 308 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = page; -#line 308 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp4_ = _g_object_ref0 (page); #line 308 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (self->priv->current_page); #line 308 "/home/jens/Source/shotwell/src/AppWindow.vala" - self->priv->current_page = _tmp5_; + self->priv->current_page = _tmp4_; #line 309 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = self->priv->current_page; + _tmp5_ = self->priv->current_page; #line 309 "/home/jens/Source/shotwell/src/AppWindow.vala" - page_set_container (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow)); + page_set_container (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow)); #line 311 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = page; -#line 311 "/home/jens/Source/shotwell/src/AppWindow.vala" - page_window_switched_pages (self, old_page, _tmp7_); + page_window_switched_pages (self, old_page, page); #line 303 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (old_page); -#line 1694 "AppWindow.c" +#line 1849 "AppWindow.c" } -void page_window_set_current_page (PageWindow* self, Page* page) { +void +page_window_set_current_page (PageWindow* self, + Page* page) +{ #line 303 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_PAGE_WINDOW (self)); #line 303 "/home/jens/Source/shotwell/src/AppWindow.vala" PAGE_WINDOW_GET_CLASS (self)->set_current_page (self, page); -#line 1703 "AppWindow.c" +#line 1861 "AppWindow.c" } -static void page_window_real_clear_current_page (PageWindow* self) { +static void +page_window_real_clear_current_page (PageWindow* self) +{ Page* _tmp0_; Page* old_page = NULL; Page* _tmp2_; @@ -1740,13 +1900,13 @@ static void page_window_real_clear_current_page (PageWindow* self) { _tmp0_ = self->priv->current_page; #line 315 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp0_ != NULL) { -#line 1716 "AppWindow.c" +#line 1876 "AppWindow.c" Page* _tmp1_; #line 316 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp1_ = self->priv->current_page; #line 316 "/home/jens/Source/shotwell/src/AppWindow.vala" page_clear_container (_tmp1_); -#line 1722 "AppWindow.c" +#line 1882 "AppWindow.c" } #line 318 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp2_ = self->priv->current_page; @@ -1762,27 +1922,32 @@ static void page_window_real_clear_current_page (PageWindow* self) { page_window_switched_pages (self, old_page, NULL); #line 314 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (old_page); -#line 1738 "AppWindow.c" +#line 1898 "AppWindow.c" } -void page_window_clear_current_page (PageWindow* self) { +void +page_window_clear_current_page (PageWindow* self) +{ #line 314 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_PAGE_WINDOW (self)); #line 314 "/home/jens/Source/shotwell/src/AppWindow.vala" PAGE_WINDOW_GET_CLASS (self)->clear_current_page (self); -#line 1747 "AppWindow.c" +#line 1909 "AppWindow.c" } -static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey* event) { +static gboolean +page_window_real_key_press_event (GtkWidget* base, + GdkEventKey* event) +{ PageWindow * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; GtkWidget* _tmp1_; - gboolean _tmp5_ = FALSE; - Page* _tmp6_; - gboolean _tmp10_ = FALSE; + gboolean _tmp4_ = FALSE; + Page* _tmp5_; + gboolean _tmp7_ = FALSE; #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow); #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -1791,23 +1956,20 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey* _tmp1_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow)); #line 325 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_entry_get_type ())) { -#line 1767 "AppWindow.c" +#line 1932 "AppWindow.c" GtkWidget* _tmp2_; - GdkEventKey* _tmp3_; - gboolean _tmp4_ = FALSE; + gboolean _tmp3_ = FALSE; #line 325 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp2_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow)); #line 325 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = event; -#line 325 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_signal_emit_by_name (_tmp2_, "key-press-event", _tmp3_, &_tmp4_); + g_signal_emit_by_name (_tmp2_, "key-press-event", event, &_tmp3_); #line 325 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = _tmp4_; -#line 1779 "AppWindow.c" + _tmp0_ = _tmp3_; +#line 1941 "AppWindow.c" } else { #line 325 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = FALSE; -#line 1783 "AppWindow.c" +#line 1945 "AppWindow.c" } #line 325 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp0_) { @@ -1815,71 +1977,61 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey* result = TRUE; #line 326 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1791 "AppWindow.c" +#line 1953 "AppWindow.c" } #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = self->priv->current_page; + _tmp5_ = self->priv->current_page; #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp6_ != NULL) { -#line 1797 "AppWindow.c" - Page* _tmp7_; - GdkEventKey* _tmp8_; - gboolean _tmp9_; -#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = self->priv->current_page; -#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp8_ = event; + if (_tmp5_ != NULL) { +#line 1959 "AppWindow.c" + Page* _tmp6_; #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp9_ = page_notify_app_key_pressed (_tmp7_, _tmp8_); + _tmp6_ = self->priv->current_page; #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = _tmp9_; -#line 1809 "AppWindow.c" + _tmp4_ = page_notify_app_key_pressed (_tmp6_, event); +#line 1965 "AppWindow.c" } else { #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = FALSE; -#line 1813 "AppWindow.c" + _tmp4_ = FALSE; +#line 1969 "AppWindow.c" } #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp5_) { + if (_tmp4_) { #line 329 "/home/jens/Source/shotwell/src/AppWindow.vala" result = TRUE; #line 329 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1821 "AppWindow.c" +#line 1977 "AppWindow.c" } #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala" if (GTK_WIDGET_CLASS (page_window_parent_class)->key_press_event != NULL) { -#line 1825 "AppWindow.c" - GdkEventKey* _tmp11_; - gboolean _tmp12_; #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp11_ = event; -#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp12_ = GTK_WIDGET_CLASS (page_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp11_); -#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp10_ = _tmp12_; -#line 1834 "AppWindow.c" + _tmp7_ = GTK_WIDGET_CLASS (page_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), event); +#line 1983 "AppWindow.c" } else { #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp10_ = FALSE; -#line 1838 "AppWindow.c" + _tmp7_ = FALSE; +#line 1987 "AppWindow.c" } #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala" - result = _tmp10_; + result = _tmp7_; #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1844 "AppWindow.c" +#line 1993 "AppWindow.c" } -static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey* event) { +static gboolean +page_window_real_key_release_event (GtkWidget* base, + GdkEventKey* event) +{ PageWindow * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; GtkWidget* _tmp1_; - gboolean _tmp5_ = FALSE; - Page* _tmp6_; - gboolean _tmp10_ = FALSE; + gboolean _tmp4_ = FALSE; + Page* _tmp5_; + gboolean _tmp7_ = FALSE; #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow); #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -1888,23 +2040,20 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey _tmp1_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow)); #line 335 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_entry_get_type ())) { -#line 1864 "AppWindow.c" +#line 2016 "AppWindow.c" GtkWidget* _tmp2_; - GdkEventKey* _tmp3_; - gboolean _tmp4_ = FALSE; + gboolean _tmp3_ = FALSE; #line 335 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp2_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow)); #line 335 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = event; -#line 335 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_signal_emit_by_name (_tmp2_, "key-release-event", _tmp3_, &_tmp4_); + g_signal_emit_by_name (_tmp2_, "key-release-event", event, &_tmp3_); #line 335 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = _tmp4_; -#line 1876 "AppWindow.c" + _tmp0_ = _tmp3_; +#line 2025 "AppWindow.c" } else { #line 335 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = FALSE; -#line 1880 "AppWindow.c" +#line 2029 "AppWindow.c" } #line 335 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp0_) { @@ -1912,69 +2061,59 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey result = TRUE; #line 336 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1888 "AppWindow.c" +#line 2037 "AppWindow.c" } #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = self->priv->current_page; + _tmp5_ = self->priv->current_page; #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp6_ != NULL) { -#line 1894 "AppWindow.c" - Page* _tmp7_; - GdkEventKey* _tmp8_; - gboolean _tmp9_; -#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = self->priv->current_page; -#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp8_ = event; + if (_tmp5_ != NULL) { +#line 2043 "AppWindow.c" + Page* _tmp6_; #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp9_ = page_notify_app_key_released (_tmp7_, _tmp8_); + _tmp6_ = self->priv->current_page; #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = _tmp9_; -#line 1906 "AppWindow.c" + _tmp4_ = page_notify_app_key_released (_tmp6_, event); +#line 2049 "AppWindow.c" } else { #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = FALSE; -#line 1910 "AppWindow.c" + _tmp4_ = FALSE; +#line 2053 "AppWindow.c" } #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp5_) { + if (_tmp4_) { #line 339 "/home/jens/Source/shotwell/src/AppWindow.vala" result = TRUE; #line 339 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1918 "AppWindow.c" +#line 2061 "AppWindow.c" } #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala" if (GTK_WIDGET_CLASS (page_window_parent_class)->key_release_event != NULL) { -#line 1922 "AppWindow.c" - GdkEventKey* _tmp11_; - gboolean _tmp12_; -#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp11_ = event; #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp12_ = GTK_WIDGET_CLASS (page_window_parent_class)->key_release_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp11_); -#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp10_ = _tmp12_; -#line 1931 "AppWindow.c" + _tmp7_ = GTK_WIDGET_CLASS (page_window_parent_class)->key_release_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), event); +#line 2067 "AppWindow.c" } else { #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp10_ = FALSE; -#line 1935 "AppWindow.c" + _tmp7_ = FALSE; +#line 2071 "AppWindow.c" } #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala" - result = _tmp10_; + result = _tmp7_; #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1941 "AppWindow.c" +#line 2077 "AppWindow.c" } -static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus* event) { +static gboolean +page_window_real_focus_in_event (GtkWidget* base, + GdkEventFocus* event) +{ PageWindow * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; Page* _tmp1_; - gboolean _tmp5_ = FALSE; + gboolean _tmp3_ = FALSE; #line 344 "/home/jens/Source/shotwell/src/AppWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow); #line 344 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -1983,23 +2122,17 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus* _tmp1_ = self->priv->current_page; #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp1_ != NULL) { -#line 1959 "AppWindow.c" +#line 2098 "AppWindow.c" Page* _tmp2_; - GdkEventFocus* _tmp3_; - gboolean _tmp4_; #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp2_ = self->priv->current_page; #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = event; -#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = page_notify_app_focus_in (_tmp2_, _tmp3_); -#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = _tmp4_; -#line 1971 "AppWindow.c" + _tmp0_ = page_notify_app_focus_in (_tmp2_, event); +#line 2104 "AppWindow.c" } else { #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = FALSE; -#line 1975 "AppWindow.c" +#line 2108 "AppWindow.c" } #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp0_) { @@ -2007,39 +2140,35 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus* result = TRUE; #line 346 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1983 "AppWindow.c" +#line 2116 "AppWindow.c" } #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala" if (GTK_WIDGET_CLASS (page_window_parent_class)->focus_in_event != NULL) { -#line 1987 "AppWindow.c" - GdkEventFocus* _tmp6_; - gboolean _tmp7_; #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = event; -#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = GTK_WIDGET_CLASS (page_window_parent_class)->focus_in_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp6_); -#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = _tmp7_; -#line 1996 "AppWindow.c" + _tmp3_ = GTK_WIDGET_CLASS (page_window_parent_class)->focus_in_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), event); +#line 2122 "AppWindow.c" } else { #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = FALSE; -#line 2000 "AppWindow.c" + _tmp3_ = FALSE; +#line 2126 "AppWindow.c" } #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala" - result = _tmp5_; + result = _tmp3_; #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 2006 "AppWindow.c" +#line 2132 "AppWindow.c" } -static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus* event) { +static gboolean +page_window_real_focus_out_event (GtkWidget* base, + GdkEventFocus* event) +{ PageWindow * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; Page* _tmp1_; - gboolean _tmp5_ = FALSE; + gboolean _tmp3_ = FALSE; #line 351 "/home/jens/Source/shotwell/src/AppWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow); #line 351 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2048,23 +2177,17 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus _tmp1_ = self->priv->current_page; #line 352 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp1_ != NULL) { -#line 2024 "AppWindow.c" +#line 2153 "AppWindow.c" Page* _tmp2_; - GdkEventFocus* _tmp3_; - gboolean _tmp4_; #line 352 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp2_ = self->priv->current_page; #line 352 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = event; -#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = page_notify_app_focus_out (_tmp2_, _tmp3_); -#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = _tmp4_; -#line 2036 "AppWindow.c" + _tmp0_ = page_notify_app_focus_out (_tmp2_, event); +#line 2159 "AppWindow.c" } else { #line 352 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = FALSE; -#line 2040 "AppWindow.c" +#line 2163 "AppWindow.c" } #line 352 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp0_) { @@ -2072,38 +2195,34 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus result = TRUE; #line 353 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 2048 "AppWindow.c" +#line 2171 "AppWindow.c" } #line 355 "/home/jens/Source/shotwell/src/AppWindow.vala" if (GTK_WIDGET_CLASS (page_window_parent_class)->focus_out_event != NULL) { -#line 2052 "AppWindow.c" - GdkEventFocus* _tmp6_; - gboolean _tmp7_; -#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = event; -#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = GTK_WIDGET_CLASS (page_window_parent_class)->focus_out_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp6_); #line 355 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = _tmp7_; -#line 2061 "AppWindow.c" + _tmp3_ = GTK_WIDGET_CLASS (page_window_parent_class)->focus_out_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), event); +#line 2177 "AppWindow.c" } else { #line 355 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = FALSE; -#line 2065 "AppWindow.c" + _tmp3_ = FALSE; +#line 2181 "AppWindow.c" } #line 355 "/home/jens/Source/shotwell/src/AppWindow.vala" - result = _tmp5_; + result = _tmp3_; #line 355 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 2071 "AppWindow.c" +#line 2187 "AppWindow.c" } -static gboolean page_window_real_configure_event (GtkWidget* base, GdkEventConfigure* event) { +static gboolean +page_window_real_configure_event (GtkWidget* base, + GdkEventConfigure* event) +{ PageWindow * self; gboolean result = FALSE; Page* _tmp0_; - gboolean _tmp4_ = FALSE; + gboolean _tmp2_ = FALSE; #line 358 "/home/jens/Source/shotwell/src/AppWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow); #line 358 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2112,51 +2231,40 @@ static gboolean page_window_real_configure_event (GtkWidget* base, GdkEventConfi _tmp0_ = self->priv->current_page; #line 359 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp0_ != NULL) { -#line 2088 "AppWindow.c" +#line 2207 "AppWindow.c" Page* _tmp1_; - GdkEventConfigure* _tmp2_; - gboolean _tmp3_; #line 360 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp1_ = self->priv->current_page; #line 360 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = event; -#line 360 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = page_notify_configure_event (_tmp1_, _tmp2_); -#line 360 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp3_) { + if (page_notify_configure_event (_tmp1_, event)) { #line 361 "/home/jens/Source/shotwell/src/AppWindow.vala" result = TRUE; #line 361 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 2104 "AppWindow.c" +#line 2217 "AppWindow.c" } } #line 364 "/home/jens/Source/shotwell/src/AppWindow.vala" if (GTK_WIDGET_CLASS (page_window_parent_class)->configure_event != NULL) { -#line 2109 "AppWindow.c" - GdkEventConfigure* _tmp5_; - gboolean _tmp6_; #line 364 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = event; -#line 364 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = GTK_WIDGET_CLASS (page_window_parent_class)->configure_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp5_); -#line 364 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = _tmp6_; -#line 2118 "AppWindow.c" + _tmp2_ = GTK_WIDGET_CLASS (page_window_parent_class)->configure_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), event); +#line 2224 "AppWindow.c" } else { #line 364 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = FALSE; -#line 2122 "AppWindow.c" + _tmp2_ = FALSE; +#line 2228 "AppWindow.c" } #line 364 "/home/jens/Source/shotwell/src/AppWindow.vala" - result = _tmp4_; + result = _tmp2_; #line 364 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 2128 "AppWindow.c" +#line 2234 "AppWindow.c" } -void page_window_set_busy_cursor (PageWindow* self) { +void +page_window_set_busy_cursor (PageWindow* self) +{ gint _tmp0_; GdkDisplay* display = NULL; GdkWindow* _tmp1_; @@ -2177,7 +2285,7 @@ void page_window_set_busy_cursor (PageWindow* self) { if (_tmp0_ > 0) { #line 369 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 2153 "AppWindow.c" +#line 2261 "AppWindow.c" } #line 371 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); @@ -2205,11 +2313,13 @@ void page_window_set_busy_cursor (PageWindow* self) { _g_object_unref0 (cursor); #line 367 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (display); -#line 2181 "AppWindow.c" +#line 2289 "AppWindow.c" } -void page_window_set_normal_cursor (PageWindow* self) { +void +page_window_set_normal_cursor (PageWindow* self) +{ gint _tmp0_; GdkDisplay* display = NULL; GdkWindow* _tmp3_; @@ -2230,7 +2340,7 @@ void page_window_set_normal_cursor (PageWindow* self) { self->priv->busy_counter = 0; #line 380 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 2206 "AppWindow.c" +#line 2316 "AppWindow.c" } else { gint _tmp1_; gint _tmp2_; @@ -2244,7 +2354,7 @@ void page_window_set_normal_cursor (PageWindow* self) { if (_tmp2_ > 0) { #line 382 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 2220 "AppWindow.c" +#line 2330 "AppWindow.c" } } #line 385 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2273,11 +2383,13 @@ void page_window_set_normal_cursor (PageWindow* self) { _g_object_unref0 (cursor); #line 377 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (display); -#line 2249 "AppWindow.c" +#line 2359 "AppWindow.c" } -static void page_window_class_init (PageWindowClass * klass) { +static void +page_window_class_init (PageWindowClass * klass) +{ #line 283 "/home/jens/Source/shotwell/src/AppWindow.vala" page_window_parent_class = g_type_class_peek_parent (klass); #line 283 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2300,22 +2412,26 @@ static void page_window_class_init (PageWindowClass * klass) { ((GtkWidgetClass *) klass)->configure_event = (gboolean (*) (GtkWidget *, GdkEventConfigure*)) page_window_real_configure_event; #line 283 "/home/jens/Source/shotwell/src/AppWindow.vala" G_OBJECT_CLASS (klass)->finalize = page_window_finalize; -#line 2276 "AppWindow.c" +#line 2388 "AppWindow.c" } -static void page_window_instance_init (PageWindow * self) { +static void +page_window_instance_init (PageWindow * self) +{ #line 283 "/home/jens/Source/shotwell/src/AppWindow.vala" self->priv = PAGE_WINDOW_GET_PRIVATE (self); #line 284 "/home/jens/Source/shotwell/src/AppWindow.vala" self->priv->current_page = NULL; #line 285 "/home/jens/Source/shotwell/src/AppWindow.vala" self->priv->busy_counter = 0; -#line 2287 "AppWindow.c" +#line 2401 "AppWindow.c" } -static void page_window_finalize (GObject * obj) { +static void +page_window_finalize (GObject * obj) +{ PageWindow * self; #line 283 "/home/jens/Source/shotwell/src/AppWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_WINDOW, PageWindow); @@ -2323,11 +2439,13 @@ static void page_window_finalize (GObject * obj) { _g_object_unref0 (self->priv->current_page); #line 283 "/home/jens/Source/shotwell/src/AppWindow.vala" G_OBJECT_CLASS (page_window_parent_class)->finalize (obj); -#line 2299 "AppWindow.c" +#line 2415 "AppWindow.c" } -GType page_window_get_type (void) { +GType +page_window_get_type (void) +{ static volatile gsize page_window_type_id__volatile = 0; if (g_once_init_enter (&page_window_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PageWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) page_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PageWindow), 0, (GInstanceInitFunc) page_window_instance_init, NULL }; @@ -2339,91 +2457,142 @@ GType page_window_get_type (void) { } -static void _app_window_on_about_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_app_window_on_about_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 456 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_about ((AppWindow*) self); -#line 2318 "AppWindow.c" +#line 2440 "AppWindow.c" } -static void _app_window_on_quit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_app_window_on_quit_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 456 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_quit ((AppWindow*) self); -#line 2325 "AppWindow.c" +#line 2451 "AppWindow.c" } -static void _app_window_on_fullscreen_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_app_window_on_fullscreen_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 456 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_fullscreen ((AppWindow*) self); -#line 2332 "AppWindow.c" +#line 2462 "AppWindow.c" } -static void _app_window_on_help_contents_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_app_window_on_help_contents_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 456 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_help_contents ((AppWindow*) self); -#line 2339 "AppWindow.c" +#line 2473 "AppWindow.c" } -static void _app_window_on_help_faq_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_app_window_on_help_faq_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 456 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_help_faq ((AppWindow*) self); -#line 2346 "AppWindow.c" +#line 2484 "AppWindow.c" } -static void _app_window_on_help_report_problem_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_app_window_on_help_report_problem_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 456 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_help_report_problem ((AppWindow*) self); -#line 2353 "AppWindow.c" +#line 2495 "AppWindow.c" } -static void _app_window_on_undo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_app_window_on_undo_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 456 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_undo ((AppWindow*) self); -#line 2360 "AppWindow.c" +#line 2506 "AppWindow.c" } -static void _app_window_on_redo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_app_window_on_redo_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 456 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_redo ((AppWindow*) self); -#line 2367 "AppWindow.c" +#line 2517 "AppWindow.c" } -static void _app_window_on_jump_to_file_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_app_window_on_jump_to_file_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 456 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_jump_to_file ((AppWindow*) self); -#line 2374 "AppWindow.c" +#line 2528 "AppWindow.c" } -static void _app_window_on_select_all_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_app_window_on_select_all_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 456 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_select_all ((AppWindow*) self); -#line 2381 "AppWindow.c" +#line 2539 "AppWindow.c" } -static void _app_window_on_select_none_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_app_window_on_select_none_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 456 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_select_none ((AppWindow*) self); -#line 2388 "AppWindow.c" +#line 2550 "AppWindow.c" } -static void _app_window_on_command_manager_altered_command_manager_altered (CommandManager* _sender, gboolean can_undo, gboolean can_redo, gpointer self) { +static void +_app_window_on_command_manager_altered_command_manager_altered (CommandManager* _sender, + gboolean can_undo, + gboolean can_redo, + gpointer self) +{ #line 437 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_command_manager_altered ((AppWindow*) self); -#line 2395 "AppWindow.c" +#line 2562 "AppWindow.c" } -AppWindow* app_window_construct (GType object_type) { +AppWindow* +app_window_construct (GType object_type) +{ AppWindow * self = NULL; AppWindow* _tmp0_; AppWindow* _tmp1_; @@ -2456,7 +2625,7 @@ AppWindow* app_window_construct (GType object_type) { gtk_window_set_default_icon_name ("shotwell"); #line 423 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_LIBRARY_WINDOW)) { -#line 2432 "AppWindow.c" +#line 2601 "AppWindow.c" ConfigFacade* _tmp2_; ConfigFacade* _tmp3_; gboolean _tmp4_ = FALSE; @@ -2473,7 +2642,7 @@ AppWindow* app_window_construct (GType object_type) { self->dimensions = _tmp5_; #line 424 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp3_); -#line 2449 "AppWindow.c" +#line 2618 "AppWindow.c" } else { ConfigFacade* _tmp6_; ConfigFacade* _tmp7_; @@ -2493,7 +2662,7 @@ AppWindow* app_window_construct (GType object_type) { self->dimensions = _tmp9_; #line 427 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp7_); -#line 2469 "AppWindow.c" +#line 2638 "AppWindow.c" } #line 430 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp10_ = self->dimensions; @@ -2511,7 +2680,7 @@ AppWindow* app_window_construct (GType object_type) { if (_tmp14_) { #line 433 "/home/jens/Source/shotwell/src/AppWindow.vala" gtk_window_maximize (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow)); -#line 2487 "AppWindow.c" +#line 2656 "AppWindow.c" } #line 435 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp15_ = app_window_command_manager; @@ -2533,21 +2702,21 @@ AppWindow* app_window_construct (GType object_type) { _tmp18_ = gtk_css_provider_new (); #line 447 "/home/jens/Source/shotwell/src/AppWindow.vala" provider = _tmp18_; -#line 2509 "AppWindow.c" +#line 2678 "AppWindow.c" { GdkScreen* _tmp19_; #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala" gtk_css_provider_load_from_data (provider, RESOURCES_CUSTOM_CSS, (gssize) -1, &_inner_error_); #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2516 "AppWindow.c" +#line 2685 "AppWindow.c" goto __catch238_g_error; } #line 450 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp19_ = gdk_screen_get_default (); #line 450 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_style_context_add_provider_for_screen (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (provider, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider), (guint) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); -#line 2523 "AppWindow.c" + gtk_style_context_add_provider_for_screen (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (provider, gtk_style_provider_get_type (), GtkStyleProvider), (guint) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); +#line 2692 "AppWindow.c" } goto __finally238; __catch238_g_error: @@ -2567,7 +2736,7 @@ AppWindow* app_window_construct (GType object_type) { g_debug ("AppWindow.vala:452: Unable to load custom CSS: %s", _tmp21_); #line 448 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_error_free0 (err); -#line 2543 "AppWindow.c" +#line 2712 "AppWindow.c" } __finally238: #line 448 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2580,35 +2749,41 @@ AppWindow* app_window_construct (GType object_type) { g_clear_error (&_inner_error_); #line 448 "/home/jens/Source/shotwell/src/AppWindow.vala" return NULL; -#line 2556 "AppWindow.c" +#line 2725 "AppWindow.c" } #line 414 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (provider); #line 414 "/home/jens/Source/shotwell/src/AppWindow.vala" return self; -#line 2562 "AppWindow.c" +#line 2731 "AppWindow.c" } -static void app_window_real_on_fullscreen (AppWindow* self) { +static void +app_window_real_on_fullscreen (AppWindow* self) +{ #line 470 "/home/jens/Source/shotwell/src/AppWindow.vala" g_critical ("Type `%s' does not implement abstract method `app_window_on_fullscreen'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 470 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 2571 "AppWindow.c" +#line 2742 "AppWindow.c" } -void app_window_on_fullscreen (AppWindow* self) { +void +app_window_on_fullscreen (AppWindow* self) +{ #line 470 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); #line 470 "/home/jens/Source/shotwell/src/AppWindow.vala" APP_WINDOW_GET_CLASS (self)->on_fullscreen (self); -#line 2580 "AppWindow.c" +#line 2753 "AppWindow.c" } -gboolean app_window_has_instance (void) { +gboolean +app_window_has_instance (void) +{ gboolean result = FALSE; AppWindow* _tmp0_; #line 473 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2617,11 +2792,13 @@ gboolean app_window_has_instance (void) { result = _tmp0_ != NULL; #line 473 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 2593 "AppWindow.c" +#line 2768 "AppWindow.c" } -AppWindow* app_window_get_instance (void) { +AppWindow* +app_window_get_instance (void) +{ AppWindow* result = NULL; AppWindow* _tmp0_; AppWindow* _tmp1_; @@ -2633,11 +2810,13 @@ AppWindow* app_window_get_instance (void) { result = _tmp1_; #line 477 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 2609 "AppWindow.c" +#line 2786 "AppWindow.c" } -FullscreenWindow* app_window_get_fullscreen (void) { +FullscreenWindow* +app_window_get_fullscreen (void) +{ FullscreenWindow* result = NULL; FullscreenWindow* _tmp0_; FullscreenWindow* _tmp1_; @@ -2649,15 +2828,17 @@ FullscreenWindow* app_window_get_fullscreen (void) { result = _tmp1_; #line 481 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 2625 "AppWindow.c" +#line 2804 "AppWindow.c" } -GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user) { +GtkBuilder* +app_window_create_builder (const gchar* glade_filename, + void* user) +{ GtkBuilder* result = NULL; GtkBuilder* builder = NULL; GtkBuilder* _tmp0_; - void* _tmp6_; GError * _inner_error_ = NULL; #line 484 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_val_if_fail (glade_filename != NULL, NULL); @@ -2665,24 +2846,21 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user) _tmp0_ = gtk_builder_new (); #line 485 "/home/jens/Source/shotwell/src/AppWindow.vala" builder = _tmp0_; -#line 2641 "AppWindow.c" +#line 2822 "AppWindow.c" { - const gchar* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; -#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = glade_filename; #line 487 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = resources_get_ui (_tmp1_); + _tmp1_ = resources_get_ui (glade_filename); #line 487 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 487 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_builder_add_from_resource (builder, _tmp3_, &_inner_error_); + gtk_builder_add_from_resource (builder, _tmp2_, &_inner_error_); #line 487 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 487 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2658 "AppWindow.c" +#line 2836 "AppWindow.c" goto __catch239_g_error; } } @@ -2690,21 +2868,21 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user) __catch239_g_error: { GError* _error_ = NULL; - GError* _tmp4_; - const gchar* _tmp5_; + GError* _tmp3_; + const gchar* _tmp4_; #line 486 "/home/jens/Source/shotwell/src/AppWindow.vala" _error_ = _inner_error_; #line 486 "/home/jens/Source/shotwell/src/AppWindow.vala" _inner_error_ = NULL; #line 489 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = _error_; + _tmp3_ = _error_; #line 489 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = _tmp4_->message; + _tmp4_ = _tmp3_->message; #line 489 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_warning ("AppWindow.vala:489: Unable to create Gtk.Builder: %s\n", _tmp5_); + g_warning ("AppWindow.vala:489: Unable to create Gtk.Builder: %s\n", _tmp4_); #line 486 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_error_free0 (_error_); -#line 2680 "AppWindow.c" +#line 2858 "AppWindow.c" } __finally239: #line 486 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2717,53 +2895,46 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user) g_clear_error (&_inner_error_); #line 486 "/home/jens/Source/shotwell/src/AppWindow.vala" return NULL; -#line 2693 "AppWindow.c" +#line 2871 "AppWindow.c" } #line 492 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = user; -#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_builder_connect_signals (builder, _tmp6_); + gtk_builder_connect_signals (builder, user); #line 494 "/home/jens/Source/shotwell/src/AppWindow.vala" result = builder; #line 494 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 2703 "AppWindow.c" +#line 2879 "AppWindow.c" } -void app_window_error_message (const gchar* message, GtkWindow* parent) { - const gchar* _tmp0_; - GtkWindow* _tmp1_; +void +app_window_error_message (const gchar* message, + GtkWindow* parent) +{ #line 497 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (message != NULL); #line 497 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent)); #line 498 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = message; -#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = parent; -#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala" - app_window_error_message_with_title (RESOURCES_APP_TITLE, _tmp0_, _tmp1_, TRUE); -#line 2720 "AppWindow.c" + app_window_error_message_with_title (RESOURCES_APP_TITLE, message, parent, TRUE); +#line 2893 "AppWindow.c" } -void app_window_error_message_with_title (const gchar* title, const gchar* message, GtkWindow* parent, gboolean should_escape) { +void +app_window_error_message_with_title (const gchar* title, + const gchar* message, + GtkWindow* parent, + gboolean should_escape) +{ GtkWindow* _tmp0_ = NULL; - GtkWindow* _tmp1_; GtkMessageDialog* dialog = NULL; - const gchar* _tmp5_; - const gchar* _tmp6_; - gboolean _tmp7_; + gchar* _tmp3_; + gchar* _tmp4_; + GtkMessageDialog* _tmp5_; + GtkMessageDialog* _tmp6_; + gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; - GtkMessageDialog* _tmp10_; - GtkMessageDialog* _tmp11_; - const gchar* _tmp12_; - const gchar* _tmp13_; - gboolean _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; #line 501 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (title != NULL); #line 501 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2771,65 +2942,48 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa #line 501 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent)); #line 505 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = parent; -#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp1_ != NULL) { -#line 2750 "AppWindow.c" - GtkWindow* _tmp2_; - GtkWindow* _tmp3_; -#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = parent; + if (parent != NULL) { +#line 2919 "AppWindow.c" + GtkWindow* _tmp1_; #line 505 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (parent); #line 505 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp0_); #line 505 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = _tmp3_; -#line 2761 "AppWindow.c" + _tmp0_ = _tmp1_; +#line 2927 "AppWindow.c" } else { - AppWindow* _tmp4_; + AppWindow* _tmp2_; #line 505 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = app_window_get_instance (); + _tmp2_ = app_window_get_instance (); #line 505 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp0_); #line 505 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow); -#line 2770 "AppWindow.c" + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow); +#line 2936 "AppWindow.c" } #line 505 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = title; -#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = message; -#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = should_escape; -#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp8_ = build_alert_body_text (_tmp5_, _tmp6_, _tmp7_); + _tmp3_ = build_alert_body_text (title, message, should_escape); #line 505 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp9_ = _tmp8_; + _tmp4_ = _tmp3_; #line 505 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp9_); + _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp4_); #line 505 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_object_ref_sink (_tmp10_); + g_object_ref_sink (_tmp5_); #line 505 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp11_ = _tmp10_; + _tmp6_ = _tmp5_; #line 505 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp4_); #line 505 "/home/jens/Source/shotwell/src/AppWindow.vala" - dialog = _tmp11_; -#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp12_ = title; -#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp13_ = message; -#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp14_ = should_escape; + dialog = _tmp6_; #line 509 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp15_ = build_alert_body_text (_tmp12_, _tmp13_, _tmp14_); + _tmp7_ = build_alert_body_text (title, message, should_escape); #line 509 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp16_ = _tmp15_; + _tmp8_ = _tmp7_; #line 509 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_message_dialog_set_markup (dialog, _tmp16_); + gtk_message_dialog_set_markup (dialog, _tmp8_); #line 509 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp8_); #line 511 "/home/jens/Source/shotwell/src/AppWindow.vala" g_object_set (dialog, "use-markup", TRUE, NULL); #line 512 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2840,29 +2994,27 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa _g_object_unref0 (dialog); #line 501 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp0_); -#line 2816 "AppWindow.c" +#line 2970 "AppWindow.c" } -gboolean app_window_negate_affirm_question (const gchar* message, const gchar* negative, const gchar* affirmative, const gchar* title, GtkWindow* parent) { +gboolean +app_window_negate_affirm_question (const gchar* message, + const gchar* negative, + const gchar* affirmative, + const gchar* title, + GtkWindow* parent) +{ gboolean result = FALSE; GtkWindow* _tmp0_ = NULL; - GtkWindow* _tmp1_; GtkMessageDialog* dialog = NULL; - const gchar* _tmp5_; - const gchar* _tmp6_; + gchar* _tmp3_; + gchar* _tmp4_; + GtkMessageDialog* _tmp5_; + GtkMessageDialog* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; - GtkMessageDialog* _tmp9_; - GtkMessageDialog* _tmp10_; - const gchar* _tmp11_; - const gchar* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; - const gchar* _tmp15_; - const gchar* _tmp16_; gboolean response = FALSE; - gint _tmp17_; #line 516 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_val_if_fail (message != NULL, FALSE); #line 516 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2872,73 +3024,54 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n #line 516 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), FALSE); #line 518 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = parent; -#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp1_ != NULL) { -#line 2851 "AppWindow.c" - GtkWindow* _tmp2_; - GtkWindow* _tmp3_; -#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = parent; + if (parent != NULL) { +#line 3001 "AppWindow.c" + GtkWindow* _tmp1_; #line 518 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (parent); #line 518 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp0_); #line 518 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = _tmp3_; -#line 2862 "AppWindow.c" + _tmp0_ = _tmp1_; +#line 3009 "AppWindow.c" } else { - AppWindow* _tmp4_; + AppWindow* _tmp2_; #line 518 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = app_window_get_instance (); + _tmp2_ = app_window_get_instance (); #line 518 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp0_); #line 518 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow); -#line 2871 "AppWindow.c" + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow); +#line 3018 "AppWindow.c" } #line 518 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = title; -#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = message; -#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE); + _tmp3_ = build_alert_body_text (title, message, TRUE); #line 518 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp8_ = _tmp7_; + _tmp4_ = _tmp3_; #line 518 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp9_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp8_); + _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp4_); #line 518 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_object_ref_sink (_tmp9_); + g_object_ref_sink (_tmp5_); #line 518 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp10_ = _tmp9_; + _tmp6_ = _tmp5_; #line 518 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp4_); #line 518 "/home/jens/Source/shotwell/src/AppWindow.vala" - dialog = _tmp10_; -#line 521 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp11_ = title; -#line 521 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp12_ = message; + dialog = _tmp6_; #line 521 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp13_ = build_alert_body_text (_tmp11_, _tmp12_, TRUE); + _tmp7_ = build_alert_body_text (title, message, TRUE); #line 521 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp14_ = _tmp13_; + _tmp8_ = _tmp7_; #line 521 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_message_dialog_set_markup (dialog, _tmp14_); + gtk_message_dialog_set_markup (dialog, _tmp8_); #line 521 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_free0 (_tmp14_); -#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp15_ = negative; -#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp16_ = affirmative; + _g_free0 (_tmp8_); #line 522 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp15_, GTK_RESPONSE_NO, _tmp16_, GTK_RESPONSE_YES, NULL); + gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), negative, GTK_RESPONSE_NO, affirmative, GTK_RESPONSE_YES, NULL); #line 523 "/home/jens/Source/shotwell/src/AppWindow.vala" gtk_window_set_urgency_hint (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), TRUE); #line 525 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog)); -#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala" - response = _tmp17_ == ((gint) GTK_RESPONSE_YES); + response = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog)) == ((gint) GTK_RESPONSE_YES); #line 527 "/home/jens/Source/shotwell/src/AppWindow.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget)); #line 529 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2949,29 +3082,27 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n _g_object_unref0 (_tmp0_); #line 529 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 2925 "AppWindow.c" +#line 3058 "AppWindow.c" } -GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message, const gchar* negative, const gchar* affirmative, const gchar* title, GtkWindow* parent) { +GtkResponseType +app_window_negate_affirm_cancel_question (const gchar* message, + const gchar* negative, + const gchar* affirmative, + const gchar* title, + GtkWindow* parent) +{ GtkResponseType result = 0; GtkWindow* _tmp0_ = NULL; - GtkWindow* _tmp1_; GtkMessageDialog* dialog = NULL; - const gchar* _tmp5_; - const gchar* _tmp6_; + gchar* _tmp3_; + gchar* _tmp4_; + GtkMessageDialog* _tmp5_; + GtkMessageDialog* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; - GtkMessageDialog* _tmp9_; - GtkMessageDialog* _tmp10_; - const gchar* _tmp11_; - const gchar* _tmp12_; - const gchar* _tmp13_; - const gchar* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; gint response = 0; - gint _tmp17_; #line 532 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_val_if_fail (message != NULL, 0); #line 532 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2981,73 +3112,54 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message, #line 532 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0); #line 534 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = parent; + if (parent != NULL) { +#line 3089 "AppWindow.c" + GtkWindow* _tmp1_; #line 534 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp1_ != NULL) { -#line 2960 "AppWindow.c" - GtkWindow* _tmp2_; - GtkWindow* _tmp3_; + _tmp1_ = _g_object_ref0 (parent); #line 534 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = parent; + _g_object_unref0 (_tmp0_); #line 534 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); -#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp0_); -#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = _tmp3_; -#line 2971 "AppWindow.c" + _tmp0_ = _tmp1_; +#line 3097 "AppWindow.c" } else { - AppWindow* _tmp4_; + AppWindow* _tmp2_; #line 534 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = app_window_get_instance (); + _tmp2_ = app_window_get_instance (); #line 534 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp0_); #line 534 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow); -#line 2980 "AppWindow.c" + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow); +#line 3106 "AppWindow.c" } #line 534 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = title; -#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = message; + _tmp3_ = build_alert_body_text (title, message, TRUE); #line 534 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE); + _tmp4_ = _tmp3_; #line 534 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp8_ = _tmp7_; + _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp4_); #line 534 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp9_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp8_); + g_object_ref_sink (_tmp5_); #line 534 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_object_ref_sink (_tmp9_); + _tmp6_ = _tmp5_; #line 534 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp10_ = _tmp9_; + _g_free0 (_tmp4_); #line 534 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_free0 (_tmp8_); -#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala" - dialog = _tmp10_; -#line 537 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp11_ = negative; -#line 537 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp12_ = affirmative; + dialog = _tmp6_; #line 537 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp11_, GTK_RESPONSE_NO, _tmp12_, GTK_RESPONSE_YES, _ ("_Cancel"), GTK_RESPONSE_CANCEL, NULL); -#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp13_ = title; + gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), negative, GTK_RESPONSE_NO, affirmative, GTK_RESPONSE_YES, _ ("_Cancel"), GTK_RESPONSE_CANCEL, NULL); #line 541 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp14_ = message; + _tmp7_ = build_alert_body_text (title, message, TRUE); #line 541 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp15_ = build_alert_body_text (_tmp13_, _tmp14_, TRUE); -#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp16_ = _tmp15_; + _tmp8_ = _tmp7_; #line 541 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_message_dialog_set_markup (dialog, _tmp16_); + gtk_message_dialog_set_markup (dialog, _tmp8_); #line 541 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp8_); #line 542 "/home/jens/Source/shotwell/src/AppWindow.vala" g_object_set (dialog, "use-markup", TRUE, NULL); #line 544 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog)); -#line 544 "/home/jens/Source/shotwell/src/AppWindow.vala" - response = _tmp17_; + response = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog)); #line 546 "/home/jens/Source/shotwell/src/AppWindow.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget)); #line 548 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3058,29 +3170,28 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message, _g_object_unref0 (_tmp0_); #line 548 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 3034 "AppWindow.c" +#line 3146 "AppWindow.c" } -GtkResponseType app_window_affirm_cancel_question (const gchar* message, const gchar* affirmative, const gchar* title, GtkWindow* parent) { +GtkResponseType +app_window_affirm_cancel_question (const gchar* message, + const gchar* affirmative, + const gchar* title, + GtkWindow* parent) +{ GtkResponseType result = 0; GtkWindow* _tmp0_ = NULL; - GtkWindow* _tmp1_; GtkMessageDialog* dialog = NULL; - const gchar* _tmp5_; - GtkMessageDialog* _tmp6_; + GtkMessageDialog* _tmp3_; + GtkMessageDialog* _tmp4_; + GtkMessageDialog* _tmp5_; + const gchar* _tmp6_ = NULL; GtkMessageDialog* _tmp7_; - const gchar* _tmp8_; - GtkMessageDialog* _tmp9_; - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_; - GtkMessageDialog* _tmp13_; - GtkMessageDialog* _tmp14_; - const gchar* _tmp15_; + GtkMessageDialog* _tmp8_; gint response = 0; - GtkMessageDialog* _tmp16_; - gint _tmp17_; - GtkMessageDialog* _tmp18_; + GtkMessageDialog* _tmp9_; + GtkMessageDialog* _tmp10_; #line 551 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_val_if_fail (message != NULL, 0); #line 551 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3088,85 +3199,66 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g #line 551 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0); #line 553 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = parent; + if (parent != NULL) { +#line 3176 "AppWindow.c" + GtkWindow* _tmp1_; #line 553 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp1_ != NULL) { -#line 3067 "AppWindow.c" - GtkWindow* _tmp2_; - GtkWindow* _tmp3_; -#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = parent; -#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (parent); #line 553 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp0_); #line 553 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = _tmp3_; -#line 3078 "AppWindow.c" + _tmp0_ = _tmp1_; +#line 3184 "AppWindow.c" } else { - AppWindow* _tmp4_; + AppWindow* _tmp2_; #line 553 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = app_window_get_instance (); + _tmp2_ = app_window_get_instance (); #line 553 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp0_); #line 553 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow); -#line 3087 "AppWindow.c" + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow); +#line 3193 "AppWindow.c" } #line 553 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = message; -#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp5_); + _tmp3_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", message); #line 553 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_object_ref_sink (_tmp6_); + g_object_ref_sink (_tmp3_); #line 553 "/home/jens/Source/shotwell/src/AppWindow.vala" - dialog = _tmp6_; -#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = dialog; + dialog = _tmp3_; #line 556 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp8_ = message; + _tmp4_ = dialog; #line 556 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_message_dialog_set_markup (_tmp7_, _tmp8_); + gtk_message_dialog_set_markup (_tmp4_, message); #line 557 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp9_ = dialog; + _tmp5_ = dialog; #line 557 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_object_set (_tmp9_, "use-markup", TRUE, NULL); + g_object_set (_tmp5_, "use-markup", TRUE, NULL); #line 558 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp11_ = title; + if (title != NULL) { #line 558 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp11_ != NULL) { -#line 3111 "AppWindow.c" - const gchar* _tmp12_; -#line 558 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp12_ = title; -#line 558 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp10_ = _tmp12_; -#line 3117 "AppWindow.c" + _tmp6_ = title; +#line 3213 "AppWindow.c" } else { #line 558 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp10_ = RESOURCES_APP_TITLE; -#line 3121 "AppWindow.c" + _tmp6_ = RESOURCES_APP_TITLE; +#line 3217 "AppWindow.c" } #line 558 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp13_ = dialog; + _tmp7_ = dialog; #line 558 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_window_get_type (), GtkWindow), _tmp10_); -#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp14_ = dialog; + gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_window_get_type (), GtkWindow), _tmp6_); #line 559 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp15_ = affirmative; + _tmp8_ = dialog; #line 559 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_dialog_get_type (), GtkDialog), _tmp15_, GTK_RESPONSE_YES, _ ("_Cancel"), GTK_RESPONSE_CANCEL, NULL); + gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_dialog_get_type (), GtkDialog), affirmative, GTK_RESPONSE_YES, _ ("_Cancel"), GTK_RESPONSE_CANCEL, NULL); #line 562 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp16_ = dialog; -#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_dialog_get_type (), GtkDialog)); + _tmp9_ = dialog; #line 562 "/home/jens/Source/shotwell/src/AppWindow.vala" - response = _tmp17_; + response = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_dialog_get_type (), GtkDialog)); #line 564 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp18_ = dialog; + _tmp10_ = dialog; #line 564 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget)); #line 566 "/home/jens/Source/shotwell/src/AppWindow.vala" result = (GtkResponseType) response; #line 566 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3175,28 +3267,28 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g _g_object_unref0 (_tmp0_); #line 566 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 3151 "AppWindow.c" +#line 3243 "AppWindow.c" } -GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* message, const gchar* negative, const gchar* affirmative, const gchar* affirmative_all, const gchar* title, GtkWindow* parent) { +GtkResponseType +app_window_negate_affirm_all_cancel_question (const gchar* message, + const gchar* negative, + const gchar* affirmative, + const gchar* affirmative_all, + const gchar* title, + GtkWindow* parent) +{ GtkResponseType result = 0; GtkWindow* _tmp0_ = NULL; - GtkWindow* _tmp1_; GtkMessageDialog* dialog = NULL; - const gchar* _tmp5_; + GtkMessageDialog* _tmp3_; + const gchar* _tmp4_ = NULL; + GtkMessageDialog* _tmp5_; GtkMessageDialog* _tmp6_; - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_; - GtkMessageDialog* _tmp10_; - GtkMessageDialog* _tmp11_; - const gchar* _tmp12_; - const gchar* _tmp13_; - const gchar* _tmp14_; gint response = 0; - GtkMessageDialog* _tmp15_; - gint _tmp16_; - GtkMessageDialog* _tmp17_; + GtkMessageDialog* _tmp7_; + GtkMessageDialog* _tmp8_; #line 569 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_val_if_fail (message != NULL, 0); #line 569 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3208,79 +3300,58 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa #line 569 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0); #line 572 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = parent; -#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp1_ != NULL) { -#line 3187 "AppWindow.c" - GtkWindow* _tmp2_; - GtkWindow* _tmp3_; -#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = parent; + if (parent != NULL) { +#line 3277 "AppWindow.c" + GtkWindow* _tmp1_; #line 572 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (parent); #line 572 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp0_); #line 572 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = _tmp3_; -#line 3198 "AppWindow.c" + _tmp0_ = _tmp1_; +#line 3285 "AppWindow.c" } else { - AppWindow* _tmp4_; + AppWindow* _tmp2_; #line 572 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = app_window_get_instance (); + _tmp2_ = app_window_get_instance (); #line 572 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp0_); #line 572 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow); -#line 3207 "AppWindow.c" + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow); +#line 3294 "AppWindow.c" } #line 572 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = message; -#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp5_); + _tmp3_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", message); #line 572 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_object_ref_sink (_tmp6_); + g_object_ref_sink (_tmp3_); #line 572 "/home/jens/Source/shotwell/src/AppWindow.vala" - dialog = _tmp6_; -#line 574 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp8_ = title; -#line 574 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp8_ != NULL) { -#line 3221 "AppWindow.c" - const gchar* _tmp9_; + dialog = _tmp3_; #line 574 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp9_ = title; + if (title != NULL) { #line 574 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = _tmp9_; -#line 3227 "AppWindow.c" + _tmp4_ = title; +#line 3306 "AppWindow.c" } else { #line 574 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = RESOURCES_APP_TITLE; -#line 3231 "AppWindow.c" + _tmp4_ = RESOURCES_APP_TITLE; +#line 3310 "AppWindow.c" } #line 574 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp10_ = dialog; + _tmp5_ = dialog; #line 574 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow), _tmp7_); -#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp11_ = dialog; -#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp12_ = negative; + gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow), _tmp4_); #line 575 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp13_ = affirmative; + _tmp6_ = dialog; #line 575 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp14_ = affirmative_all; -#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_dialog_get_type (), GtkDialog), _tmp12_, GTK_RESPONSE_NO, _tmp13_, GTK_RESPONSE_YES, _tmp14_, GTK_RESPONSE_APPLY, _ ("_Cancel"), GTK_RESPONSE_CANCEL, NULL); -#line 578 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp15_ = dialog; + gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_dialog_get_type (), GtkDialog), negative, GTK_RESPONSE_NO, affirmative, GTK_RESPONSE_YES, affirmative_all, GTK_RESPONSE_APPLY, _ ("_Cancel"), GTK_RESPONSE_CANCEL, NULL); #line 578 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp16_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_dialog_get_type (), GtkDialog)); + _tmp7_ = dialog; #line 578 "/home/jens/Source/shotwell/src/AppWindow.vala" - response = _tmp16_; + response = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_dialog_get_type (), GtkDialog)); #line 580 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp17_ = dialog; + _tmp8_ = dialog; #line 580 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget)); #line 582 "/home/jens/Source/shotwell/src/AppWindow.vala" result = (GtkResponseType) response; #line 582 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3289,84 +3360,85 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa _g_object_unref0 (_tmp0_); #line 582 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 3265 "AppWindow.c" +#line 3336 "AppWindow.c" } -void app_window_database_error (GError* err) { - GError* _tmp0_; - const gchar* _tmp1_; +void +app_window_database_error (GError* err) +{ + const gchar* _tmp0_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; #line 586 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = err; + _tmp0_ = err->message; #line 586 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = _tmp0_->message; -#line 586 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = g_strdup_printf (_ ("A fatal error occurred when accessing Shotwell’s library. Shotwell can" \ + _tmp1_ = g_strdup_printf (_ ("A fatal error occurred when accessing Shotwell’s library. Shotwell can" \ "not continue.\n" \ "\n" \ -"%s"), _tmp1_); +"%s"), _tmp0_); #line 586 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 586 "/home/jens/Source/shotwell/src/AppWindow.vala" - app_window_panic (_tmp3_); + app_window_panic (_tmp2_); #line 586 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_free0 (_tmp3_); -#line 3286 "AppWindow.c" + _g_free0 (_tmp2_); +#line 3356 "AppWindow.c" } -void app_window_panic (const gchar* msg) { - const gchar* _tmp0_; - const gchar* _tmp1_; - Application* _tmp2_; - Application* _tmp3_; +void +app_window_panic (const gchar* msg) +{ + Application* _tmp0_; + Application* _tmp1_; #line 590 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (msg != NULL); #line 591 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = msg; -#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_critical ("AppWindow.vala:591: %s", _tmp0_); -#line 592 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = msg; + g_critical ("AppWindow.vala:591: %s", msg); #line 592 "/home/jens/Source/shotwell/src/AppWindow.vala" - app_window_error_message (_tmp1_, NULL); + app_window_error_message (msg, NULL); #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = application_get_instance (); + _tmp0_ = application_get_instance (); #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala" - application_panic (_tmp3_); + application_panic (_tmp1_); #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala" - _application_unref0 (_tmp3_); -#line 3313 "AppWindow.c" + _application_unref0 (_tmp1_); +#line 3379 "AppWindow.c" } -static gchar* app_window_real_get_app_role (AppWindow* self) { +static gchar* +app_window_real_get_app_role (AppWindow* self) +{ #line 597 "/home/jens/Source/shotwell/src/AppWindow.vala" g_critical ("Type `%s' does not implement abstract method `app_window_get_app_role'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 597 "/home/jens/Source/shotwell/src/AppWindow.vala" return NULL; -#line 3322 "AppWindow.c" +#line 3390 "AppWindow.c" } -gchar* app_window_get_app_role (AppWindow* self) { +gchar* +app_window_get_app_role (AppWindow* self) +{ #line 597 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_val_if_fail (IS_APP_WINDOW (self), NULL); #line 597 "/home/jens/Source/shotwell/src/AppWindow.vala" return APP_WINDOW_GET_CLASS (self)->get_app_role (self); -#line 3331 "AppWindow.c" +#line 3401 "AppWindow.c" } -void app_window_on_about (AppWindow* self) { +void +app_window_on_about (AppWindow* self) +{ #line 600 "/home/jens/Source/shotwell/src/AppWindow.vala" - static const gchar* artists[] = {"Braunschweiger Löwe created by Magnus Manske., CC BY-SA 3.0, https://c" \ + static const gchar* artists[2] = {"Braunschweiger Löwe created by Magnus Manske., CC BY-SA 3.0, https://c" \ "ommons.wikimedia.org/w/index.php?curid=109735", NULL}; -#line 3338 "AppWindow.c" +#line 3410 "AppWindow.c" gchar* _tmp0_; gchar* _tmp1_; GdkPixbuf* _tmp2_; @@ -3387,15 +3459,17 @@ void app_window_on_about (AppWindow* self) { _g_object_unref0 (_tmp3_); #line 601 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_free0 (_tmp1_); -#line 3359 "AppWindow.c" +#line 3431 "AppWindow.c" } -static void app_window_on_help_contents (AppWindow* self) { +static void +app_window_on_help_contents (AppWindow* self) +{ GError * _inner_error_ = NULL; #line 616 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); -#line 3367 "AppWindow.c" +#line 3441 "AppWindow.c" { GdkScreen* _tmp0_; #line 618 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3404,7 +3478,7 @@ static void app_window_on_help_contents (AppWindow* self) { resources_launch_help (_tmp0_, NULL, &_inner_error_); #line 618 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3376 "AppWindow.c" +#line 3450 "AppWindow.c" goto __catch240_g_error; } } @@ -3434,7 +3508,7 @@ static void app_window_on_help_contents (AppWindow* self) { _g_free0 (_tmp4_); #line 617 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_error_free0 (err); -#line 3406 "AppWindow.c" +#line 3480 "AppWindow.c" } __finally240: #line 617 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3445,22 +3519,24 @@ static void app_window_on_help_contents (AppWindow* self) { g_clear_error (&_inner_error_); #line 617 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 3417 "AppWindow.c" +#line 3491 "AppWindow.c" } } -static void app_window_on_help_report_problem (AppWindow* self) { +static void +app_window_on_help_report_problem (AppWindow* self) +{ GError * _inner_error_ = NULL; #line 624 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); -#line 3426 "AppWindow.c" +#line 3502 "AppWindow.c" { #line 626 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_show_uri (self, RESOURCES_BUG_DB_URL, &_inner_error_); #line 626 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3432 "AppWindow.c" +#line 3508 "AppWindow.c" goto __catch241_g_error; } } @@ -3490,7 +3566,7 @@ static void app_window_on_help_report_problem (AppWindow* self) { _g_free0 (_tmp3_); #line 625 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_error_free0 (err); -#line 3462 "AppWindow.c" +#line 3538 "AppWindow.c" } __finally241: #line 625 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3501,22 +3577,24 @@ static void app_window_on_help_report_problem (AppWindow* self) { g_clear_error (&_inner_error_); #line 625 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 3473 "AppWindow.c" +#line 3549 "AppWindow.c" } } -static void app_window_on_help_faq (AppWindow* self) { +static void +app_window_on_help_faq (AppWindow* self) +{ GError * _inner_error_ = NULL; #line 632 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); -#line 3482 "AppWindow.c" +#line 3560 "AppWindow.c" { #line 634 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_show_uri (self, RESOURCES_FAQ_URL, &_inner_error_); #line 634 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3488 "AppWindow.c" +#line 3566 "AppWindow.c" goto __catch242_g_error; } } @@ -3546,7 +3624,7 @@ static void app_window_on_help_faq (AppWindow* self) { _g_free0 (_tmp3_); #line 633 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_error_free0 (err); -#line 3518 "AppWindow.c" +#line 3596 "AppWindow.c" } __finally242: #line 633 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3557,12 +3635,14 @@ static void app_window_on_help_faq (AppWindow* self) { g_clear_error (&_inner_error_); #line 633 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 3529 "AppWindow.c" +#line 3607 "AppWindow.c" } } -static void app_window_real_on_quit (AppWindow* self) { +static void +app_window_real_on_quit (AppWindow* self) +{ Application* _tmp0_; Application* _tmp1_; #line 641 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3573,37 +3653,40 @@ static void app_window_real_on_quit (AppWindow* self) { application_exit (_tmp1_); #line 641 "/home/jens/Source/shotwell/src/AppWindow.vala" _application_unref0 (_tmp1_); -#line 3545 "AppWindow.c" +#line 3625 "AppWindow.c" } -void app_window_on_quit (AppWindow* self) { +void +app_window_on_quit (AppWindow* self) +{ #line 640 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); #line 640 "/home/jens/Source/shotwell/src/AppWindow.vala" APP_WINDOW_GET_CLASS (self)->on_quit (self); -#line 3554 "AppWindow.c" +#line 3636 "AppWindow.c" } -void app_window_on_jump_to_file (AppWindow* self) { +void +app_window_on_jump_to_file (AppWindow* self) +{ Page* _tmp0_; Page* _tmp1_; ViewCollection* _tmp2_; ViewCollection* _tmp3_; - gint _tmp4_; - gboolean _tmp5_; + gboolean _tmp4_; MediaSource* media = NULL; + Page* _tmp5_; Page* _tmp6_; - Page* _tmp7_; + ViewCollection* _tmp7_; ViewCollection* _tmp8_; - ViewCollection* _tmp9_; + DataView* _tmp9_; DataView* _tmp10_; - DataView* _tmp11_; - DataSource* _tmp12_; + DataSource* _tmp11_; + MediaSource* _tmp12_; MediaSource* _tmp13_; MediaSource* _tmp14_; - MediaSource* _tmp15_; GError * _inner_error_ = NULL; #line 644 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); @@ -3616,86 +3699,84 @@ void app_window_on_jump_to_file (AppWindow* self) { #line 645 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp3_ = _tmp2_; #line 645 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = view_collection_get_selected_count (_tmp3_); -#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = _tmp4_ != 1; + _tmp4_ = view_collection_get_selected_count (_tmp3_) != 1; #line 645 "/home/jens/Source/shotwell/src/AppWindow.vala" _data_collection_unref0 (_tmp3_); #line 645 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp1_); #line 645 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp5_) { + if (_tmp4_) { #line 646 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 3599 "AppWindow.c" +#line 3680 "AppWindow.c" } #line 648 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); + _tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); #line 648 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 648 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp8_ = page_get_view (_tmp7_); + _tmp7_ = page_get_view (_tmp6_); #line 648 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 648 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp10_ = view_collection_get_selected_at (_tmp9_, 0); + _tmp9_ = view_collection_get_selected_at (_tmp8_, 0); #line 648 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 648 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp12_ = data_view_get_source (_tmp11_); + _tmp11_ = data_view_get_source (_tmp10_); #line 648 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp13_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp12_) : NULL; + _tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp11_) : NULL; #line 648 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp13_ == NULL) { + if (_tmp12_ == NULL) { #line 648 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp12_); -#line 3621 "AppWindow.c" + _g_object_unref0 (_tmp11_); +#line 3702 "AppWindow.c" } #line 648 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 648 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp10_); #line 648 "/home/jens/Source/shotwell/src/AppWindow.vala" - _data_collection_unref0 (_tmp9_); + _data_collection_unref0 (_tmp8_); #line 648 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 648 "/home/jens/Source/shotwell/src/AppWindow.vala" - media = _tmp14_; + media = _tmp13_; #line 650 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp15_ = media; + _tmp14_ = media; #line 650 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp15_ == NULL) { + if (_tmp14_ == NULL) { #line 651 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (media); #line 651 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 3641 "AppWindow.c" +#line 3722 "AppWindow.c" } { + AppWindow* _tmp15_; AppWindow* _tmp16_; - AppWindow* _tmp17_; - MediaSource* _tmp18_; + MediaSource* _tmp17_; + GFile* _tmp18_; GFile* _tmp19_; - GFile* _tmp20_; #line 654 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp16_ = app_window_get_instance (); + _tmp15_ = app_window_get_instance (); #line 654 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 654 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp18_ = media; + _tmp17_ = media; #line 654 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp19_ = media_source_get_master_file (_tmp18_); + _tmp18_ = media_source_get_master_file (_tmp17_); #line 654 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 654 "/home/jens/Source/shotwell/src/AppWindow.vala" - app_window_show_file_uri (_tmp17_, _tmp20_, &_inner_error_); + app_window_show_file_uri (_tmp16_, _tmp19_, &_inner_error_); #line 654 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp19_); #line 654 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp17_); + _g_object_unref0 (_tmp16_); #line 654 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3667 "AppWindow.c" +#line 3748 "AppWindow.c" goto __catch243_g_error; } } @@ -3703,26 +3784,26 @@ void app_window_on_jump_to_file (AppWindow* self) { __catch243_g_error: { GError* err = NULL; - GError* _tmp21_; + GError* _tmp20_; + gchar* _tmp21_; gchar* _tmp22_; - gchar* _tmp23_; #line 653 "/home/jens/Source/shotwell/src/AppWindow.vala" err = _inner_error_; #line 653 "/home/jens/Source/shotwell/src/AppWindow.vala" _inner_error_ = NULL; #line 656 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp21_ = err; + _tmp20_ = err; #line 656 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp22_ = resources_jump_to_file_failed (_tmp21_); + _tmp21_ = resources_jump_to_file_failed (_tmp20_); #line 656 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp23_ = _tmp22_; + _tmp22_ = _tmp21_; #line 656 "/home/jens/Source/shotwell/src/AppWindow.vala" - app_window_error_message (_tmp23_, NULL); + app_window_error_message (_tmp22_, NULL); #line 656 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_free0 (_tmp23_); + _g_free0 (_tmp22_); #line 653 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_error_free0 (err); -#line 3694 "AppWindow.c" +#line 3775 "AppWindow.c" } __finally243: #line 653 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3735,187 +3816,182 @@ void app_window_on_jump_to_file (AppWindow* self) { g_clear_error (&_inner_error_); #line 653 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 3707 "AppWindow.c" +#line 3788 "AppWindow.c" } #line 644 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (media); -#line 3711 "AppWindow.c" +#line 3792 "AppWindow.c" } -static void app_window_real_destroy (GtkWidget* base) { +static void +app_window_real_destroy (GtkWidget* base) +{ AppWindow * self; #line 660 "/home/jens/Source/shotwell/src/AppWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow); #line 661 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_quit (self); -#line 3721 "AppWindow.c" +#line 3804 "AppWindow.c" } -static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { +static gchar* +string_replace (const gchar* self, + const gchar* old, + const gchar* replacement) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if ((*((gchar*) self)) == '\0') { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 3740 "AppWindow.c" +#line 3827 "AppWindow.c" } else { - const gchar* _tmp2_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; -#line 3747 "AppWindow.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) old)) == '\0'; +#line 3831 "AppWindow.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = TRUE; -#line 3753 "AppWindow.c" +#line 3837 "AppWindow.c" } else { - const gchar* _tmp3_; - const gchar* _tmp4_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = replacement; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; -#line 3763 "AppWindow.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (old, replacement) == 0; +#line 3841 "AppWindow.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 3767 "AppWindow.c" - gchar* _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = g_strdup (self); -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 3845 "AppWindow.c" + gchar* _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = g_strdup (self); +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 3775 "AppWindow.c" +#line 3853 "AppWindow.c" } { GRegex* regex = NULL; - const gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - GRegex* _tmp9_; - GRegex* _tmp10_; - gchar* _tmp11_ = NULL; - GRegex* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = old; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = g_regex_escape_string (_tmp6_, -1); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = _tmp9_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp8_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - regex = _tmp10_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp3_; + gchar* _tmp4_; + GRegex* _tmp5_; + GRegex* _tmp6_; + gchar* _tmp7_ = NULL; + GRegex* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_regex_escape_string (old, -1); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = _tmp3_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp5_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp4_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + regex = _tmp6_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 3807 "AppWindow.c" +#line 3881 "AppWindow.c" goto __catch244_g_regex_error; } -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 3816 "AppWindow.c" +#line 3890 "AppWindow.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = regex; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = replacement; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp14_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = regex; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp9_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 3832 "AppWindow.c" +#line 3904 "AppWindow.c" goto __catch244_g_regex_error; } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 3843 "AppWindow.c" +#line 3915 "AppWindow.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = _tmp11_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = NULL; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp15_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp11_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = _tmp7_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = NULL; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp10_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp7_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 3857 "AppWindow.c" +#line 3929 "AppWindow.c" } goto __finally244; __catch244_g_regex_error: { GError* e = NULL; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 3871 "AppWindow.c" +#line 3943 "AppWindow.c" } __finally244: -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 3882 "AppWindow.c" +#line 3954 "AppWindow.c" } } -void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) { +void +app_window_show_file_uri (AppWindow* self, + GFile* file, + GError** error) +{ gchar* tmp = NULL; gchar* _tmp0_; gchar* _tmp1_; @@ -3935,30 +4011,27 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) { _g_free0 (_tmp1_); #line 669 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp2_) { -#line 3907 "AppWindow.c" - GFile* _tmp3_; +#line 3983 "AppWindow.c" + gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; - const gchar* _tmp7_; -#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = file; + const gchar* _tmp6_; #line 670 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = g_file_get_uri (_tmp3_); + _tmp3_ = g_file_get_uri (file); #line 670 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 670 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = string_replace (_tmp5_, "'", "\\\'"); + _tmp5_ = string_replace (_tmp4_, "'", "\\\'"); #line 670 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_free0 (tmp); #line 670 "/home/jens/Source/shotwell/src/AppWindow.vala" - tmp = _tmp6_; + tmp = _tmp5_; #line 670 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp4_); #line 671 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = tmp; + _tmp6_ = tmp; #line 671 "/home/jens/Source/shotwell/src/AppWindow.vala" - show_file_in_nautilus (_tmp7_, &_inner_error_); + show_file_in_nautilus (_tmp6_, &_inner_error_); #line 671 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 671 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3967,40 +4040,37 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) { _g_free0 (tmp); #line 671 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 3939 "AppWindow.c" +#line 4012 "AppWindow.c" } } else { + GFile* _tmp7_; GFile* _tmp8_; - GFile* _tmp9_; - GFile* _tmp10_; + gchar* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; - const gchar* _tmp14_; -#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp8_ = file; + const gchar* _tmp12_; #line 673 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp9_ = g_file_get_parent (_tmp8_); + _tmp7_ = g_file_get_parent (file); #line 673 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 673 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp11_ = g_file_get_uri (_tmp10_); + _tmp9_ = g_file_get_uri (_tmp8_); #line 673 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 673 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp13_ = string_replace (_tmp12_, "'", "\\\'"); + _tmp11_ = string_replace (_tmp10_, "'", "\\\'"); #line 673 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_free0 (tmp); #line 673 "/home/jens/Source/shotwell/src/AppWindow.vala" - tmp = _tmp13_; + tmp = _tmp11_; #line 673 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp10_); #line 673 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 674 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp14_ = tmp; + _tmp12_ = tmp; #line 674 "/home/jens/Source/shotwell/src/AppWindow.vala" - app_window_show_uri (self, _tmp14_, &_inner_error_); + app_window_show_uri (self, _tmp12_, &_inner_error_); #line 674 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 674 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -4009,19 +4079,22 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) { _g_free0 (tmp); #line 674 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 3981 "AppWindow.c" +#line 4051 "AppWindow.c" } } #line 664 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_free0 (tmp); -#line 3986 "AppWindow.c" +#line 4056 "AppWindow.c" } -void app_window_show_uri (AppWindow* self, const gchar* url, GError** error) { +void +app_window_show_uri (AppWindow* self, + const gchar* url, + GError** error) +{ GdkWindow* _tmp0_; GdkScreen* _tmp1_; - const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 678 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); @@ -4032,49 +4105,53 @@ void app_window_show_uri (AppWindow* self, const gchar* url, GError** error) { #line 679 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp1_ = gdk_window_get_screen (_tmp0_); #line 679 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = url; -#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala" - sys_show_uri (_tmp1_, _tmp2_, &_inner_error_); + sys_show_uri (_tmp1_, url, &_inner_error_); #line 679 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 679 "/home/jens/Source/shotwell/src/AppWindow.vala" g_propagate_error (error, _inner_error_); #line 679 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 4013 "AppWindow.c" +#line 4084 "AppWindow.c" } } -static void app_window_real_add_actions (AppWindow* self) { +static void +app_window_real_add_actions (AppWindow* self) +{ #line 683 "/home/jens/Source/shotwell/src/AppWindow.vala" g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), APP_WINDOW_common_actions, G_N_ELEMENTS (APP_WINDOW_common_actions), self); -#line 4021 "AppWindow.c" +#line 4094 "AppWindow.c" } -void app_window_add_actions (AppWindow* self) { +void +app_window_add_actions (AppWindow* self) +{ #line 682 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); #line 682 "/home/jens/Source/shotwell/src/AppWindow.vala" APP_WINDOW_GET_CLASS (self)->add_actions (self); -#line 4030 "AppWindow.c" +#line 4105 "AppWindow.c" } -void app_window_go_fullscreen (AppWindow* self, Page* page) { +void +app_window_go_fullscreen (AppWindow* self, + Page* page) +{ FullscreenWindow* _tmp0_; gint _tmp2_ = 0; gint _tmp3_ = 0; FullscreenWindow* fsw = NULL; - Page* _tmp4_; - FullscreenWindow* _tmp5_; + FullscreenWindow* _tmp4_; + Page* _tmp5_; Page* _tmp6_; - Page* _tmp7_; - gboolean _tmp8_; + gboolean _tmp7_; + FullscreenWindow* _tmp11_; FullscreenWindow* _tmp12_; FullscreenWindow* _tmp13_; - FullscreenWindow* _tmp14_; #line 686 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); #line 686 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -4083,7 +4160,7 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) { _tmp0_ = app_window_fullscreen_window; #line 688 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp0_ != NULL) { -#line 4055 "AppWindow.c" +#line 4132 "AppWindow.c" FullscreenWindow* _tmp1_; #line 689 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp1_ = app_window_fullscreen_window; @@ -4091,7 +4168,7 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) { gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow)); #line 691 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 4063 "AppWindow.c" +#line 4140 "AppWindow.c" } #line 694 "/home/jens/Source/shotwell/src/AppWindow.vala" gtk_window_get_position (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), &_tmp2_, &_tmp3_); @@ -4102,58 +4179,58 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) { #line 695 "/home/jens/Source/shotwell/src/AppWindow.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 697 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = page; -#line 697 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = fullscreen_window_new (_tmp4_); + _tmp4_ = fullscreen_window_new (page); #line 697 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_object_ref_sink (_tmp5_); + g_object_ref_sink (_tmp4_); #line 697 "/home/jens/Source/shotwell/src/AppWindow.vala" - fsw = _tmp5_; + fsw = _tmp4_; #line 699 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); + _tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); #line 699 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 699 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp8_ = _tmp7_ != NULL; + _tmp7_ = _tmp6_ != NULL; #line 699 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 699 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp8_) { -#line 4091 "AppWindow.c" + if (_tmp7_) { +#line 4166 "AppWindow.c" + Page* _tmp8_; Page* _tmp9_; - Page* _tmp10_; - FullscreenWindow* _tmp11_; + FullscreenWindow* _tmp10_; #line 700 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp9_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); + _tmp8_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); #line 700 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 700 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp11_ = fsw; + _tmp10_ = fsw; #line 700 "/home/jens/Source/shotwell/src/AppWindow.vala" - page_switching_to_fullscreen (_tmp10_, _tmp11_); + page_switching_to_fullscreen (_tmp9_, _tmp10_); #line 700 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp10_); -#line 4105 "AppWindow.c" + _g_object_unref0 (_tmp9_); +#line 4180 "AppWindow.c" } #line 702 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp12_ = fsw; + _tmp11_ = fsw; #line 702 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp13_ = _g_object_ref0 (_tmp12_); + _tmp12_ = _g_object_ref0 (_tmp11_); #line 702 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (app_window_fullscreen_window); #line 702 "/home/jens/Source/shotwell/src/AppWindow.vala" - app_window_fullscreen_window = _tmp13_; + app_window_fullscreen_window = _tmp12_; #line 703 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp14_ = app_window_fullscreen_window; + _tmp13_ = app_window_fullscreen_window; #line 703 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow)); + gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_window_get_type (), GtkWindow)); #line 686 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (fsw); -#line 4121 "AppWindow.c" +#line 4196 "AppWindow.c" } -void app_window_end_fullscreen (AppWindow* self) { +void +app_window_end_fullscreen (AppWindow* self) +{ FullscreenWindow* _tmp0_; gint _tmp1_; gint _tmp2_; @@ -4170,7 +4247,7 @@ void app_window_end_fullscreen (AppWindow* self) { if (_tmp0_ == NULL) { #line 708 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 4142 "AppWindow.c" +#line 4219 "AppWindow.c" } #line 710 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp1_ = self->pos_x; @@ -4190,7 +4267,7 @@ void app_window_end_fullscreen (AppWindow* self) { _g_object_unref0 (_tmp4_); #line 714 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp5_) { -#line 4162 "AppWindow.c" +#line 4239 "AppWindow.c" Page* _tmp6_; Page* _tmp7_; FullscreenWindow* _tmp8_; @@ -4204,7 +4281,7 @@ void app_window_end_fullscreen (AppWindow* self) { page_returning_from_fullscreen (_tmp7_, _tmp8_); #line 715 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp7_); -#line 4176 "AppWindow.c" +#line 4253 "AppWindow.c" } #line 717 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp9_ = app_window_fullscreen_window; @@ -4220,203 +4297,213 @@ void app_window_end_fullscreen (AppWindow* self) { app_window_fullscreen_window = NULL; #line 721 "/home/jens/Source/shotwell/src/AppWindow.vala" gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow)); -#line 4192 "AppWindow.c" +#line 4269 "AppWindow.c" } -GAction* app_window_get_common_action (AppWindow* self, const gchar* name) { +GAction* +app_window_get_common_action (AppWindow* self, + const gchar* name) +{ GAction* result = NULL; - const gchar* _tmp0_; + GAction* _tmp0_; GAction* _tmp1_; - GAction* _tmp2_; #line 724 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_val_if_fail (IS_APP_WINDOW (self), NULL); #line 724 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_val_if_fail (name != NULL, NULL); #line 725 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = name; -#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), _tmp0_); + _tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), name); #line 725 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 725 "/home/jens/Source/shotwell/src/AppWindow.vala" - result = _tmp2_; + result = _tmp1_; #line 725 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 4215 "AppWindow.c" +#line 4292 "AppWindow.c" } -void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name, gboolean sensitive) { +void +app_window_set_common_action_sensitive (AppWindow* self, + const gchar* name, + gboolean sensitive) +{ GSimpleAction* action = NULL; - const gchar* _tmp0_; - GAction* _tmp1_; + GAction* _tmp0_; + GSimpleAction* _tmp1_; GSimpleAction* _tmp2_; - GSimpleAction* _tmp3_; #line 728 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); #line 728 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (name != NULL); #line 729 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = name; + _tmp0_ = app_window_get_common_action (self, name); #line 729 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = app_window_get_common_action (self, _tmp0_); + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL; #line 729 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL; -#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 729 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp1_); -#line 4239 "AppWindow.c" + _g_object_unref0 (_tmp0_); +#line 4317 "AppWindow.c" } #line 729 "/home/jens/Source/shotwell/src/AppWindow.vala" - action = _tmp2_; + action = _tmp1_; #line 730 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = action; + _tmp2_ = action; #line 730 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp3_ != NULL) { -#line 4247 "AppWindow.c" - GSimpleAction* _tmp4_; - gboolean _tmp5_; -#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = action; + if (_tmp2_ != NULL) { +#line 4325 "AppWindow.c" + GSimpleAction* _tmp3_; #line 731 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = sensitive; + _tmp3_ = action; #line 731 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_simple_action_set_enabled (_tmp4_, _tmp5_); -#line 4256 "AppWindow.c" + g_simple_action_set_enabled (_tmp3_, sensitive); +#line 4331 "AppWindow.c" } #line 728 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (action); -#line 4260 "AppWindow.c" +#line 4335 "AppWindow.c" } -void app_window_set_common_action_important (AppWindow* self, const gchar* name, gboolean important) { +void +app_window_set_common_action_important (AppWindow* self, + const gchar* name, + gboolean important) +{ GSimpleAction* action = NULL; - const gchar* _tmp0_; - GAction* _tmp1_; + GAction* _tmp0_; + GSimpleAction* _tmp1_; GSimpleAction* _tmp2_; - GSimpleAction* _tmp3_; #line 734 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); #line 734 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (name != NULL); #line 735 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = name; -#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = app_window_get_common_action (self, _tmp0_); + _tmp0_ = app_window_get_common_action (self, name); #line 735 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL; + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL; #line 735 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 735 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp1_); -#line 4284 "AppWindow.c" + _g_object_unref0 (_tmp0_); +#line 4360 "AppWindow.c" } #line 735 "/home/jens/Source/shotwell/src/AppWindow.vala" - action = _tmp2_; + action = _tmp1_; #line 736 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = action; + _tmp2_ = action; #line 736 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp3_ != NULL) { -#line 4292 "AppWindow.c" - GSimpleAction* _tmp4_; + if (_tmp2_ != NULL) { +#line 4368 "AppWindow.c" + GSimpleAction* _tmp3_; + gboolean _tmp4_; gboolean _tmp5_; - gboolean _tmp6_; #line 737 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = action; + _tmp3_ = action; #line 737 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); + _tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 737 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 737 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_simple_action_set_enabled (_tmp4_, _tmp6_); -#line 4304 "AppWindow.c" + g_simple_action_set_enabled (_tmp3_, _tmp5_); +#line 4380 "AppWindow.c" } #line 734 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (action); -#line 4308 "AppWindow.c" +#line 4384 "AppWindow.c" } -void app_window_set_common_action_visible (AppWindow* self, const gchar* name, gboolean visible) { +void +app_window_set_common_action_visible (AppWindow* self, + const gchar* name, + gboolean visible) +{ GSimpleAction* action = NULL; - const gchar* _tmp0_; - GAction* _tmp1_; + GAction* _tmp0_; + GSimpleAction* _tmp1_; GSimpleAction* _tmp2_; - GSimpleAction* _tmp3_; #line 740 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); #line 740 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (name != NULL); #line 741 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = name; + _tmp0_ = app_window_get_common_action (self, name); #line 741 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = app_window_get_common_action (self, _tmp0_); + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL; #line 741 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL; -#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 741 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp1_); -#line 4332 "AppWindow.c" + _g_object_unref0 (_tmp0_); +#line 4409 "AppWindow.c" } #line 741 "/home/jens/Source/shotwell/src/AppWindow.vala" - action = _tmp2_; + action = _tmp1_; #line 742 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = action; + _tmp2_ = action; #line 742 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp3_ != NULL) { -#line 4340 "AppWindow.c" - GSimpleAction* _tmp4_; + if (_tmp2_ != NULL) { +#line 4417 "AppWindow.c" + GSimpleAction* _tmp3_; + gboolean _tmp4_; gboolean _tmp5_; - gboolean _tmp6_; #line 743 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = action; + _tmp3_ = action; #line 743 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); + _tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 743 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 743 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_simple_action_set_enabled (_tmp4_, _tmp6_); -#line 4352 "AppWindow.c" + g_simple_action_set_enabled (_tmp3_, _tmp5_); +#line 4429 "AppWindow.c" } #line 740 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (action); -#line 4356 "AppWindow.c" +#line 4433 "AppWindow.c" } -static void _app_window_on_update_common_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { +static void +_app_window_on_update_common_actions_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self) +{ #line 750 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_update_common_actions ((AppWindow*) self); -#line 4363 "AppWindow.c" +#line 4445 "AppWindow.c" } -static void _app_window_on_update_common_actions_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) { +static void +_app_window_on_update_common_actions_view_collection_selection_group_altered (ViewCollection* _sender, + gpointer self) +{ #line 751 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_update_common_actions ((AppWindow*) self); -#line 4370 "AppWindow.c" +#line 4455 "AppWindow.c" } -static void _app_window_on_update_common_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) { +static void +_app_window_on_update_common_actions_view_collection_items_state_changed (ViewCollection* _sender, + GeeIterable* changed, + gpointer self) +{ #line 752 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_update_common_actions ((AppWindow*) self); -#line 4377 "AppWindow.c" +#line 4466 "AppWindow.c" } -static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Page* new_page) { +static void +app_window_real_switched_pages (PageWindow* base, + Page* old_page, + Page* new_page) +{ AppWindow * self; - Page* _tmp0_; - Page* _tmp1_; - Page* _tmp2_; - Page* _tmp15_; - Page* _tmp34_; - Page* _tmp35_; #line 746 "/home/jens/Source/shotwell/src/AppWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow); #line 746 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -4424,222 +4511,184 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa #line 746 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page)); #line 747 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = old_page; -#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = new_page; -#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala" - app_window_update_common_action_availability (self, _tmp0_, _tmp1_); + app_window_update_common_action_availability (self, old_page, new_page); #line 749 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = old_page; -#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp2_ != NULL) { -#line 4405 "AppWindow.c" - Page* _tmp3_; + if (old_page != NULL) { +#line 4486 "AppWindow.c" + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + guint _tmp2_; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; - guint _tmp6_; - Page* _tmp7_; - ViewCollection* _tmp8_; - ViewCollection* _tmp9_; - guint _tmp10_; - Page* _tmp11_; - ViewCollection* _tmp12_; - ViewCollection* _tmp13_; - guint _tmp14_; + guint _tmp5_; + ViewCollection* _tmp6_; + ViewCollection* _tmp7_; + guint _tmp8_; #line 750 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = old_page; + _tmp0_ = page_get_view (old_page); #line 750 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = page_get_view (_tmp3_); -#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = _tmp4_; + _tmp1_ = _tmp0_; #line 750 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp6_, NULL, FALSE); + g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp2_, NULL, FALSE); #line 750 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _app_window_on_update_common_actions_data_collection_contents_altered, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _app_window_on_update_common_actions_data_collection_contents_altered, self); #line 750 "/home/jens/Source/shotwell/src/AppWindow.vala" - _data_collection_unref0 (_tmp5_); -#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = old_page; + _data_collection_unref0 (_tmp1_); #line 751 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp8_ = page_get_view (_tmp7_); + _tmp3_ = page_get_view (old_page); #line 751 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp9_ = _tmp8_; + _tmp4_ = _tmp3_; #line 751 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_signal_parse_name ("selection-group-altered", TYPE_VIEW_COLLECTION, &_tmp10_, NULL, FALSE); + g_signal_parse_name ("selection-group-altered", TYPE_VIEW_COLLECTION, &_tmp5_, NULL, FALSE); #line 751 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _app_window_on_update_common_actions_view_collection_selection_group_altered, self); + g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _app_window_on_update_common_actions_view_collection_selection_group_altered, self); #line 751 "/home/jens/Source/shotwell/src/AppWindow.vala" - _data_collection_unref0 (_tmp9_); -#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp11_ = old_page; + _data_collection_unref0 (_tmp4_); #line 752 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp12_ = page_get_view (_tmp11_); + _tmp6_ = page_get_view (old_page); #line 752 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp13_ = _tmp12_; + _tmp7_ = _tmp6_; #line 752 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp14_, NULL, FALSE); + g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp8_, NULL, FALSE); #line 752 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _app_window_on_update_common_actions_view_collection_items_state_changed, self); + g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _app_window_on_update_common_actions_view_collection_items_state_changed, self); #line 752 "/home/jens/Source/shotwell/src/AppWindow.vala" - _data_collection_unref0 (_tmp13_); -#line 4454 "AppWindow.c" + _data_collection_unref0 (_tmp7_); +#line 4526 "AppWindow.c" } #line 755 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp15_ = new_page; -#line 755 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp15_ != NULL) { -#line 4460 "AppWindow.c" - Page* _tmp16_; + if (new_page != NULL) { +#line 4530 "AppWindow.c" + ViewCollection* _tmp9_; + ViewCollection* _tmp10_; + ViewCollection* _tmp11_; + ViewCollection* _tmp12_; + ViewCollection* _tmp13_; + ViewCollection* _tmp14_; + ViewCollection* _tmp15_; + ViewCollection* _tmp16_; ViewCollection* _tmp17_; ViewCollection* _tmp18_; - Page* _tmp19_; - ViewCollection* _tmp20_; - ViewCollection* _tmp21_; - Page* _tmp22_; - ViewCollection* _tmp23_; - ViewCollection* _tmp24_; - Page* _tmp25_; - Page* _tmp26_; - ViewCollection* _tmp27_; - ViewCollection* _tmp28_; - gint _tmp29_; - Page* _tmp30_; - ViewCollection* _tmp31_; - ViewCollection* _tmp32_; - gint _tmp33_; #line 756 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp16_ = new_page; + _tmp9_ = page_get_view (new_page); #line 756 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp17_ = page_get_view (_tmp16_); -#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp18_ = _tmp17_; + _tmp10_ = _tmp9_; #line 756 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _app_window_on_update_common_actions_data_collection_contents_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _app_window_on_update_common_actions_data_collection_contents_altered, self, 0); #line 756 "/home/jens/Source/shotwell/src/AppWindow.vala" - _data_collection_unref0 (_tmp18_); + _data_collection_unref0 (_tmp10_); #line 757 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp19_ = new_page; + _tmp11_ = page_get_view (new_page); #line 757 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp20_ = page_get_view (_tmp19_); -#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp21_ = _tmp20_; + _tmp12_ = _tmp11_; #line 757 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_signal_connect_object (_tmp21_, "selection-group-altered", (GCallback) _app_window_on_update_common_actions_view_collection_selection_group_altered, self, 0); + g_signal_connect_object (_tmp12_, "selection-group-altered", (GCallback) _app_window_on_update_common_actions_view_collection_selection_group_altered, self, 0); #line 757 "/home/jens/Source/shotwell/src/AppWindow.vala" - _data_collection_unref0 (_tmp21_); + _data_collection_unref0 (_tmp12_); #line 758 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp22_ = new_page; + _tmp13_ = page_get_view (new_page); #line 758 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp23_ = page_get_view (_tmp22_); + _tmp14_ = _tmp13_; #line 758 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp24_ = _tmp23_; + g_signal_connect_object (_tmp14_, "items-state-changed", (GCallback) _app_window_on_update_common_actions_view_collection_items_state_changed, self, 0); #line 758 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_signal_connect_object (_tmp24_, "items-state-changed", (GCallback) _app_window_on_update_common_actions_view_collection_items_state_changed, self, 0); -#line 758 "/home/jens/Source/shotwell/src/AppWindow.vala" - _data_collection_unref0 (_tmp24_); -#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp25_ = new_page; -#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp26_ = new_page; -#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp27_ = page_get_view (_tmp26_); -#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp28_ = _tmp27_; + _data_collection_unref0 (_tmp14_); #line 760 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp29_ = view_collection_get_selected_count (_tmp28_); + _tmp15_ = page_get_view (new_page); #line 760 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp30_ = new_page; + _tmp16_ = _tmp15_; #line 760 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp31_ = page_get_view (_tmp30_); + _tmp17_ = page_get_view (new_page); #line 760 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp32_ = _tmp31_; -#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp33_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp18_ = _tmp17_; #line 760 "/home/jens/Source/shotwell/src/AppWindow.vala" - app_window_update_common_actions (self, _tmp25_, _tmp29_, _tmp33_); + app_window_update_common_actions (self, new_page, view_collection_get_selected_count (_tmp16_), data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_COLLECTION, DataCollection))); #line 760 "/home/jens/Source/shotwell/src/AppWindow.vala" - _data_collection_unref0 (_tmp32_); + _data_collection_unref0 (_tmp18_); #line 760 "/home/jens/Source/shotwell/src/AppWindow.vala" - _data_collection_unref0 (_tmp28_); -#line 4533 "AppWindow.c" + _data_collection_unref0 (_tmp16_); +#line 4579 "AppWindow.c" } #line 764 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp34_ = old_page; -#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp35_ = new_page; -#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala" - PAGE_WINDOW_CLASS (app_window_parent_class)->switched_pages (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), _tmp34_, _tmp35_); -#line 4541 "AppWindow.c" + PAGE_WINDOW_CLASS (app_window_parent_class)->switched_pages (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), old_page, new_page); +#line 4583 "AppWindow.c" } -static void app_window_real_update_common_action_availability (AppWindow* self, Page* old_page, Page* new_page) { +static void +app_window_real_update_common_action_availability (AppWindow* self, + Page* old_page, + Page* new_page) +{ gboolean is_checkerboard = FALSE; - Page* _tmp0_; #line 770 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page)); #line 770 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page)); #line 771 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = new_page; -#line 771 "/home/jens/Source/shotwell/src/AppWindow.vala" - is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE); + is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (new_page, TYPE_CHECKERBOARD_PAGE); #line 773 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_set_common_action_sensitive (self, "CommonSelectAll", is_checkerboard); #line 774 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_set_common_action_sensitive (self, "CommonSelectNone", is_checkerboard); -#line 4560 "AppWindow.c" +#line 4603 "AppWindow.c" } -void app_window_update_common_action_availability (AppWindow* self, Page* old_page, Page* new_page) { +void +app_window_update_common_action_availability (AppWindow* self, + Page* old_page, + Page* new_page) +{ #line 770 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); #line 770 "/home/jens/Source/shotwell/src/AppWindow.vala" APP_WINDOW_GET_CLASS (self)->update_common_action_availability (self, old_page, new_page); -#line 4569 "AppWindow.c" +#line 4616 "AppWindow.c" } -static void app_window_real_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count) { - Page* _tmp0_; - gint _tmp2_; +static void +app_window_real_update_common_actions (AppWindow* self, + Page* page, + gint selected_count, + gint count) +{ #line 780 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_PAGE (page)); #line 781 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = page; -#line 781 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE)) { -#line 4582 "AppWindow.c" - gint _tmp1_; + if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_CHECKERBOARD_PAGE)) { #line 782 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = count; -#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala" - app_window_set_common_action_sensitive (self, "CommonSelectAll", _tmp1_ > 0); -#line 4588 "AppWindow.c" + app_window_set_common_action_sensitive (self, "CommonSelectAll", count > 0); +#line 4632 "AppWindow.c" } #line 783 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = selected_count; -#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala" - app_window_set_common_action_sensitive (self, "CommonJumpToFile", _tmp2_ == 1); + app_window_set_common_action_sensitive (self, "CommonJumpToFile", selected_count == 1); #line 785 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_decorate_undo_action (self); #line 786 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_decorate_redo_action (self); -#line 4598 "AppWindow.c" +#line 4640 "AppWindow.c" } -void app_window_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count) { +void +app_window_update_common_actions (AppWindow* self, + Page* page, + gint selected_count, + gint count) +{ #line 780 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); #line 780 "/home/jens/Source/shotwell/src/AppWindow.vala" APP_WINDOW_GET_CLASS (self)->update_common_actions (self, page, selected_count, count); -#line 4607 "AppWindow.c" +#line 4654 "AppWindow.c" } -static void app_window_on_update_common_actions (AppWindow* self) { +static void +app_window_on_update_common_actions (AppWindow* self) +{ Page* page = NULL; Page* _tmp0_; Page* _tmp1_; @@ -4653,16 +4702,14 @@ static void app_window_on_update_common_actions (AppWindow* self) { _tmp1_ = page; #line 791 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp1_ != NULL) { -#line 4625 "AppWindow.c" +#line 4674 "AppWindow.c" Page* _tmp2_; Page* _tmp3_; ViewCollection* _tmp4_; ViewCollection* _tmp5_; - gint _tmp6_; - Page* _tmp7_; + Page* _tmp6_; + ViewCollection* _tmp7_; ViewCollection* _tmp8_; - ViewCollection* _tmp9_; - gint _tmp10_; #line 792 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp2_ = page; #line 792 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -4672,30 +4719,30 @@ static void app_window_on_update_common_actions (AppWindow* self) { #line 792 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp5_ = _tmp4_; #line 792 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = view_collection_get_selected_count (_tmp5_); -#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = page; -#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp8_ = page_get_view (_tmp7_); + _tmp6_ = page; #line 792 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp9_ = _tmp8_; + _tmp7_ = page_get_view (_tmp6_); #line 792 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp10_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp8_ = _tmp7_; #line 792 "/home/jens/Source/shotwell/src/AppWindow.vala" - app_window_update_common_actions (self, _tmp2_, _tmp6_, _tmp10_); + app_window_update_common_actions (self, _tmp2_, view_collection_get_selected_count (_tmp5_), data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection))); #line 792 "/home/jens/Source/shotwell/src/AppWindow.vala" - _data_collection_unref0 (_tmp9_); + _data_collection_unref0 (_tmp8_); #line 792 "/home/jens/Source/shotwell/src/AppWindow.vala" _data_collection_unref0 (_tmp5_); -#line 4659 "AppWindow.c" +#line 4702 "AppWindow.c" } #line 789 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (page); -#line 4663 "AppWindow.c" +#line 4706 "AppWindow.c" } -void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const gchar* new_label) { +void +app_window_update_menu_item_label (AppWindow* self, + const gchar* id, + const gchar* new_label) +{ GMenu* bar = NULL; Page* _tmp0_; Page* _tmp1_; @@ -4705,7 +4752,6 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const GMenu* _tmp5_; gint items = 0; GMenu* _tmp6_; - gint _tmp7_; #line 795 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); #line 795 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -4724,7 +4770,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const if (_tmp3_ == NULL) { #line 797 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp2_); -#line 4696 "AppWindow.c" +#line 4742 "AppWindow.c" } #line 797 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp4_ = _tmp3_; @@ -4740,359 +4786,336 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const _g_object_unref0 (bar); #line 800 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 4712 "AppWindow.c" +#line 4758 "AppWindow.c" } #line 803 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp6_ = bar; #line 803 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = g_menu_model_get_n_items (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, g_menu_model_get_type (), GMenuModel)); -#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala" - items = _tmp7_; -#line 4720 "AppWindow.c" + items = g_menu_model_get_n_items (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, g_menu_model_get_type (), GMenuModel)); +#line 4764 "AppWindow.c" { gint i = 0; #line 804 "/home/jens/Source/shotwell/src/AppWindow.vala" i = 0; -#line 4725 "AppWindow.c" +#line 4769 "AppWindow.c" { - gboolean _tmp8_ = FALSE; + gboolean _tmp7_ = FALSE; #line 804 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp8_ = TRUE; + _tmp7_ = TRUE; #line 804 "/home/jens/Source/shotwell/src/AppWindow.vala" while (TRUE) { -#line 4732 "AppWindow.c" +#line 4776 "AppWindow.c" + gint _tmp9_; gint _tmp10_; - gint _tmp11_; GMenuModel* model = NULL; - GMenu* _tmp12_; - gint _tmp13_; - GMenuModel* _tmp14_; - GMenu* _tmp15_; + GMenu* _tmp11_; + gint _tmp12_; + GMenuModel* _tmp13_; + GMenu* _tmp14_; gint model_items = 0; - GMenuModel* _tmp16_; - gint _tmp17_; + GMenuModel* _tmp15_; #line 804 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (!_tmp8_) { -#line 4745 "AppWindow.c" - gint _tmp9_; + if (!_tmp7_) { +#line 4788 "AppWindow.c" + gint _tmp8_; #line 804 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp9_ = i; + _tmp8_ = i; #line 804 "/home/jens/Source/shotwell/src/AppWindow.vala" - i = _tmp9_ + 1; -#line 4751 "AppWindow.c" + i = _tmp8_ + 1; +#line 4794 "AppWindow.c" } #line 804 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp8_ = FALSE; + _tmp7_ = FALSE; #line 804 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp10_ = i; + _tmp9_ = i; #line 804 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp11_ = items; + _tmp10_ = items; #line 804 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (!(_tmp10_ < _tmp11_)) { + if (!(_tmp9_ < _tmp10_)) { #line 804 "/home/jens/Source/shotwell/src/AppWindow.vala" break; -#line 4763 "AppWindow.c" +#line 4806 "AppWindow.c" } #line 805 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp12_ = bar; + _tmp11_ = bar; #line 805 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp13_ = i; + _tmp12_ = i; #line 805 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp14_ = g_menu_model_get_item_link (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, g_menu_model_get_type (), GMenuModel), _tmp13_, G_MENU_LINK_SUBMENU); + _tmp13_ = g_menu_model_get_item_link (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, g_menu_model_get_type (), GMenuModel), _tmp12_, G_MENU_LINK_SUBMENU); #line 805 "/home/jens/Source/shotwell/src/AppWindow.vala" - model = _tmp14_; + model = _tmp13_; #line 806 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp15_ = bar; + _tmp14_ = bar; #line 806 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp15_ == NULL) { + if (_tmp14_ == NULL) { #line 807 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (model); #line 807 "/home/jens/Source/shotwell/src/AppWindow.vala" continue; -#line 4781 "AppWindow.c" +#line 4824 "AppWindow.c" } #line 810 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp16_ = model; + _tmp15_ = model; #line 810 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp17_ = g_menu_model_get_n_items (_tmp16_); -#line 810 "/home/jens/Source/shotwell/src/AppWindow.vala" - model_items = _tmp17_; -#line 4789 "AppWindow.c" + model_items = g_menu_model_get_n_items (_tmp15_); +#line 4830 "AppWindow.c" { gint j = 0; #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" j = 0; -#line 4794 "AppWindow.c" +#line 4835 "AppWindow.c" { - gboolean _tmp18_ = FALSE; + gboolean _tmp16_ = FALSE; #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp18_ = TRUE; + _tmp16_ = TRUE; #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" while (TRUE) { -#line 4801 "AppWindow.c" - gint _tmp20_; - gint _tmp21_; +#line 4842 "AppWindow.c" + gint _tmp18_; + gint _tmp19_; GMenuModel* subsection = NULL; + GMenuModel* _tmp20_; + gint _tmp21_; GMenuModel* _tmp22_; - gint _tmp23_; - GMenuModel* _tmp24_; - GMenuModel* _tmp25_; + GMenuModel* _tmp23_; gint sub_items = 0; - GMenuModel* _tmp26_; - gint _tmp27_; + GMenuModel* _tmp24_; #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (!_tmp18_) { -#line 4814 "AppWindow.c" - gint _tmp19_; + if (!_tmp16_) { +#line 4854 "AppWindow.c" + gint _tmp17_; #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp19_ = j; + _tmp17_ = j; #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" - j = _tmp19_ + 1; -#line 4820 "AppWindow.c" + j = _tmp17_ + 1; +#line 4860 "AppWindow.c" } #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp18_ = FALSE; + _tmp16_ = FALSE; #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp20_ = j; + _tmp18_ = j; #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp21_ = model_items; + _tmp19_ = model_items; #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (!(_tmp20_ < _tmp21_)) { + if (!(_tmp18_ < _tmp19_)) { #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" break; -#line 4832 "AppWindow.c" +#line 4872 "AppWindow.c" } #line 812 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp22_ = model; + _tmp20_ = model; #line 812 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp23_ = j; + _tmp21_ = j; #line 812 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp24_ = g_menu_model_get_item_link (_tmp22_, _tmp23_, G_MENU_LINK_SECTION); + _tmp22_ = g_menu_model_get_item_link (_tmp20_, _tmp21_, G_MENU_LINK_SECTION); #line 812 "/home/jens/Source/shotwell/src/AppWindow.vala" - subsection = _tmp24_; + subsection = _tmp22_; #line 814 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp25_ = subsection; + _tmp23_ = subsection; #line 814 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp25_ == NULL) { + if (_tmp23_ == NULL) { #line 815 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (subsection); #line 815 "/home/jens/Source/shotwell/src/AppWindow.vala" continue; -#line 4850 "AppWindow.c" +#line 4890 "AppWindow.c" } #line 818 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp26_ = subsection; -#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp27_ = g_menu_model_get_n_items (_tmp26_); + _tmp24_ = subsection; #line 818 "/home/jens/Source/shotwell/src/AppWindow.vala" - sub_items = _tmp27_; -#line 4858 "AppWindow.c" + sub_items = g_menu_model_get_n_items (_tmp24_); +#line 4896 "AppWindow.c" { gint k = 0; #line 819 "/home/jens/Source/shotwell/src/AppWindow.vala" k = 0; -#line 4863 "AppWindow.c" +#line 4901 "AppWindow.c" { - gboolean _tmp28_ = FALSE; + gboolean _tmp25_ = FALSE; #line 819 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp28_ = TRUE; + _tmp25_ = TRUE; #line 819 "/home/jens/Source/shotwell/src/AppWindow.vala" while (TRUE) { -#line 4870 "AppWindow.c" - gint _tmp30_; - gint _tmp31_; +#line 4908 "AppWindow.c" + gint _tmp27_; + gint _tmp28_; GMenuAttributeIter* it = NULL; - GMenuModel* _tmp32_; - gint _tmp33_; - GMenuAttributeIter* _tmp34_; + GMenuModel* _tmp29_; + gint _tmp30_; + GMenuAttributeIter* _tmp31_; #line 819 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (!_tmp28_) { -#line 4879 "AppWindow.c" - gint _tmp29_; + if (!_tmp25_) { +#line 4917 "AppWindow.c" + gint _tmp26_; #line 819 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp29_ = k; + _tmp26_ = k; #line 819 "/home/jens/Source/shotwell/src/AppWindow.vala" - k = _tmp29_ + 1; -#line 4885 "AppWindow.c" + k = _tmp26_ + 1; +#line 4923 "AppWindow.c" } #line 819 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp28_ = FALSE; + _tmp25_ = FALSE; #line 819 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp30_ = k; + _tmp27_ = k; #line 819 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp31_ = sub_items; + _tmp28_ = sub_items; #line 819 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (!(_tmp30_ < _tmp31_)) { + if (!(_tmp27_ < _tmp28_)) { #line 819 "/home/jens/Source/shotwell/src/AppWindow.vala" break; -#line 4897 "AppWindow.c" +#line 4935 "AppWindow.c" } #line 820 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp32_ = subsection; + _tmp29_ = subsection; #line 820 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp33_ = k; + _tmp30_ = k; #line 820 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp34_ = g_menu_model_iterate_item_attributes (_tmp32_, _tmp33_); + _tmp31_ = g_menu_model_iterate_item_attributes (_tmp29_, _tmp30_); #line 820 "/home/jens/Source/shotwell/src/AppWindow.vala" - it = _tmp34_; + it = _tmp31_; #line 821 "/home/jens/Source/shotwell/src/AppWindow.vala" while (TRUE) { -#line 4909 "AppWindow.c" +#line 4947 "AppWindow.c" + GMenuAttributeIter* _tmp32_; + gboolean _tmp33_ = FALSE; + gboolean _tmp34_ = FALSE; GMenuAttributeIter* _tmp35_; - gboolean _tmp36_; - gboolean _tmp37_ = FALSE; - gboolean _tmp38_ = FALSE; - GMenuAttributeIter* _tmp39_; - const gchar* _tmp40_; + const gchar* _tmp36_; #line 821 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp35_ = it; + _tmp32_ = it; #line 821 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp36_ = g_menu_attribute_iter_next (_tmp35_); -#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (!_tmp36_) { + if (!g_menu_attribute_iter_next (_tmp32_)) { #line 821 "/home/jens/Source/shotwell/src/AppWindow.vala" break; -#line 4924 "AppWindow.c" +#line 4959 "AppWindow.c" } #line 822 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp39_ = it; -#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp40_ = g_menu_attribute_iter_get_name (_tmp39_); + _tmp35_ = it; #line 822 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (g_strcmp0 (_tmp40_, "id") == 0) { -#line 4932 "AppWindow.c" - GMenuAttributeIter* _tmp41_; - GVariant* _tmp42_; - GVariant* _tmp43_; - const gchar* _tmp44_; - const gchar* _tmp45_; + _tmp36_ = g_menu_attribute_iter_get_name (_tmp35_); #line 822 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp41_ = it; + if (g_strcmp0 (_tmp36_, "id") == 0) { +#line 4967 "AppWindow.c" + GMenuAttributeIter* _tmp37_; + GVariant* _tmp38_; + GVariant* _tmp39_; + const gchar* _tmp40_; #line 822 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp42_ = g_menu_attribute_iter_get_value (_tmp41_); + _tmp37_ = it; #line 822 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp43_ = _tmp42_; + _tmp38_ = g_menu_attribute_iter_get_value (_tmp37_); #line 822 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp44_ = g_variant_get_string (_tmp43_, NULL); + _tmp39_ = _tmp38_; #line 822 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp45_ = id; + _tmp40_ = g_variant_get_string (_tmp39_, NULL); #line 822 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp38_ = g_strcmp0 (_tmp44_, _tmp45_) == 0; + _tmp34_ = g_strcmp0 (_tmp40_, id) == 0; #line 822 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_variant_unref0 (_tmp43_); -#line 4952 "AppWindow.c" + _g_variant_unref0 (_tmp39_); +#line 4984 "AppWindow.c" } else { #line 822 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp38_ = FALSE; -#line 4956 "AppWindow.c" + _tmp34_ = FALSE; +#line 4988 "AppWindow.c" } #line 822 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp38_) { + if (_tmp34_) { #line 822 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp37_ = TRUE; -#line 4962 "AppWindow.c" + _tmp33_ = TRUE; +#line 4994 "AppWindow.c" } else { - gboolean _tmp46_ = FALSE; - GMenuAttributeIter* _tmp47_; - const gchar* _tmp48_; -#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp47_ = it; + gboolean _tmp41_ = FALSE; + GMenuAttributeIter* _tmp42_; + const gchar* _tmp43_; #line 823 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp48_ = g_menu_attribute_iter_get_name (_tmp47_); + _tmp42_ = it; #line 823 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (g_strcmp0 (_tmp48_, "action") == 0) { -#line 4973 "AppWindow.c" - GMenuAttributeIter* _tmp49_; - GVariant* _tmp50_; - GVariant* _tmp51_; - const gchar* _tmp52_; - const gchar* _tmp53_; - gchar* _tmp54_; - gchar* _tmp55_; - gboolean _tmp56_; + _tmp43_ = g_menu_attribute_iter_get_name (_tmp42_); #line 823 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp49_ = it; + if (g_strcmp0 (_tmp43_, "action") == 0) { +#line 5005 "AppWindow.c" + GMenuAttributeIter* _tmp44_; + GVariant* _tmp45_; + GVariant* _tmp46_; + const gchar* _tmp47_; + gchar* _tmp48_; + gchar* _tmp49_; #line 823 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp50_ = g_menu_attribute_iter_get_value (_tmp49_); + _tmp44_ = it; #line 823 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp51_ = _tmp50_; + _tmp45_ = g_menu_attribute_iter_get_value (_tmp44_); #line 823 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp52_ = g_variant_get_string (_tmp51_, NULL); + _tmp46_ = _tmp45_; #line 823 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp53_ = id; + _tmp47_ = g_variant_get_string (_tmp46_, NULL); #line 823 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp54_ = g_strconcat (".", _tmp53_, NULL); + _tmp48_ = g_strconcat (".", id, NULL); #line 823 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp55_ = _tmp54_; + _tmp49_ = _tmp48_; #line 823 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp56_ = g_str_has_suffix (_tmp52_, _tmp55_); + _tmp41_ = g_str_has_suffix (_tmp47_, _tmp49_); #line 823 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp46_ = _tmp56_; + _g_free0 (_tmp49_); #line 823 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_free0 (_tmp55_); -#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_variant_unref0 (_tmp51_); -#line 5004 "AppWindow.c" + _g_variant_unref0 (_tmp46_); +#line 5030 "AppWindow.c" } else { #line 823 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp46_ = FALSE; -#line 5008 "AppWindow.c" + _tmp41_ = FALSE; +#line 5034 "AppWindow.c" } #line 823 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp37_ = _tmp46_; -#line 5012 "AppWindow.c" + _tmp33_ = _tmp41_; +#line 5038 "AppWindow.c" } #line 822 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp37_) { -#line 5016 "AppWindow.c" + if (_tmp33_) { +#line 5042 "AppWindow.c" GMenu* md = NULL; - GMenuModel* _tmp57_; - GMenu* _tmp58_; + GMenuModel* _tmp50_; + GMenu* _tmp51_; GMenuItem* m = NULL; - GMenuModel* _tmp59_; - gint _tmp60_; - GMenuItem* _tmp61_; - GMenuItem* _tmp62_; - const gchar* _tmp63_; - GMenu* _tmp64_; - gint _tmp65_; - GMenu* _tmp66_; - gint _tmp67_; - GMenuItem* _tmp68_; + GMenuModel* _tmp52_; + gint _tmp53_; + GMenuItem* _tmp54_; + GMenuItem* _tmp55_; + GMenu* _tmp56_; + gint _tmp57_; + GMenu* _tmp58_; + gint _tmp59_; + GMenuItem* _tmp60_; #line 824 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp57_ = subsection; + _tmp50_ = subsection; #line 824 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp58_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp57_, g_menu_get_type ()) ? ((GMenu*) _tmp57_) : NULL); + _tmp51_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp50_, g_menu_get_type ()) ? ((GMenu*) _tmp50_) : NULL); #line 824 "/home/jens/Source/shotwell/src/AppWindow.vala" - md = _tmp58_; + md = _tmp51_; #line 825 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp59_ = subsection; + _tmp52_ = subsection; #line 825 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp60_ = k; + _tmp53_ = k; #line 825 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp61_ = g_menu_item_new_from_model (_tmp59_, _tmp60_); + _tmp54_ = g_menu_item_new_from_model (_tmp52_, _tmp53_); #line 825 "/home/jens/Source/shotwell/src/AppWindow.vala" - m = _tmp61_; -#line 826 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp62_ = m; + m = _tmp54_; #line 826 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp63_ = new_label; + _tmp55_ = m; #line 826 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_menu_item_set_label (_tmp62_, _tmp63_); + g_menu_item_set_label (_tmp55_, new_label); #line 827 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp64_ = md; + _tmp56_ = md; #line 827 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp65_ = k; + _tmp57_ = k; #line 827 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_menu_remove (_tmp64_, _tmp65_); + g_menu_remove (_tmp56_, _tmp57_); #line 828 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp66_ = md; + _tmp58_ = md; #line 828 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp67_ = k; + _tmp59_ = k; #line 828 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp68_ = m; + _tmp60_ = m; #line 828 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_menu_insert_item (_tmp66_, _tmp67_, _tmp68_); + g_menu_insert_item (_tmp58_, _tmp59_, _tmp60_); #line 830 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (m); #line 830 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -5107,41 +5130,45 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const _g_object_unref0 (bar); #line 830 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 5079 "AppWindow.c" +#line 5102 "AppWindow.c" } } #line 819 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (it); -#line 5084 "AppWindow.c" +#line 5107 "AppWindow.c" } } } #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (subsection); -#line 5090 "AppWindow.c" +#line 5113 "AppWindow.c" } } } #line 804 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (model); -#line 5096 "AppWindow.c" +#line 5119 "AppWindow.c" } } } #line 795 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (bar); -#line 5102 "AppWindow.c" +#line 5125 "AppWindow.c" } -static gpointer _command_manager_ref0 (gpointer self) { +static gpointer +_command_manager_ref0 (gpointer self) +{ #line 841 "/home/jens/Source/shotwell/src/AppWindow.vala" return self ? command_manager_ref (self) : NULL; -#line 5109 "AppWindow.c" +#line 5134 "AppWindow.c" } -CommandManager* app_window_get_command_manager (void) { +CommandManager* +app_window_get_command_manager (void) +{ CommandManager* result = NULL; CommandManager* _tmp0_; CommandManager* _tmp1_; @@ -5153,33 +5180,37 @@ CommandManager* app_window_get_command_manager (void) { result = _tmp1_; #line 841 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 5125 "AppWindow.c" +#line 5152 "AppWindow.c" } -static void app_window_on_command_manager_altered (AppWindow* self) { +static void +app_window_on_command_manager_altered (AppWindow* self) +{ #line 844 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); #line 845 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_decorate_undo_action (self); #line 846 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_decorate_redo_action (self); -#line 5136 "AppWindow.c" +#line 5165 "AppWindow.c" } -static void app_window_decorate_command_manager_action (AppWindow* self, const gchar* name, const gchar* prefix, const gchar* default_explanation, CommandDescription* desc) { +static void +app_window_decorate_command_manager_action (AppWindow* self, + const gchar* name, + const gchar* prefix, + const gchar* default_explanation, + CommandDescription* desc) +{ GSimpleAction* action = NULL; - const gchar* _tmp0_; - GAction* _tmp1_; + GAction* _tmp0_; + GSimpleAction* _tmp1_; GSimpleAction* _tmp2_; - GSimpleAction* _tmp3_; gchar* label = NULL; - const gchar* _tmp4_; - gchar* _tmp5_; - CommandDescription* _tmp6_; - const gchar* _tmp18_; - const gchar* _tmp19_; + gchar* _tmp3_; + const gchar* _tmp13_; #line 849 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); #line 849 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -5191,108 +5222,96 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g #line 849 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail ((desc == NULL) || IS_COMMAND_DESCRIPTION (desc)); #line 851 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp0_ = name; -#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = app_window_get_common_action (self, _tmp0_); + _tmp0_ = app_window_get_common_action (self, name); #line 851 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL; + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL; #line 851 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 851 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp1_); -#line 5172 "AppWindow.c" + _g_object_unref0 (_tmp0_); +#line 5201 "AppWindow.c" } #line 851 "/home/jens/Source/shotwell/src/AppWindow.vala" - action = _tmp2_; + action = _tmp1_; #line 852 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = action; + _tmp2_ = action; #line 852 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 853 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (action); #line 853 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 5184 "AppWindow.c" +#line 5213 "AppWindow.c" } #line 856 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = prefix; + _tmp3_ = g_strdup (prefix); #line 856 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = g_strdup (_tmp4_); -#line 856 "/home/jens/Source/shotwell/src/AppWindow.vala" - label = _tmp5_; -#line 858 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = desc; + label = _tmp3_; #line 858 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (_tmp6_ != NULL) { -#line 5196 "AppWindow.c" - const gchar* _tmp7_; - CommandDescription* _tmp8_; + if (desc != NULL) { +#line 5221 "AppWindow.c" + const gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; - GSimpleAction* _tmp14_; + GSimpleAction* _tmp10_; #line 859 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = label; + _tmp4_ = label; #line 859 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp8_ = desc; + _tmp5_ = command_description_get_name (desc); #line 859 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp9_ = command_description_get_name (_tmp8_); -#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp10_ = _tmp9_; + _tmp6_ = _tmp5_; #line 859 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp11_ = g_strconcat (" ", _tmp10_, NULL); + _tmp7_ = g_strconcat (" ", _tmp6_, NULL); #line 859 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 859 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp13_ = g_strconcat (_tmp7_, _tmp12_, NULL); + _tmp9_ = g_strconcat (_tmp4_, _tmp8_, NULL); #line 859 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_free0 (label); #line 859 "/home/jens/Source/shotwell/src/AppWindow.vala" - label = _tmp13_; + label = _tmp9_; #line 859 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp8_); #line 859 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp6_); #line 860 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp14_ = action; + _tmp10_ = action; #line 860 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_simple_action_set_enabled (_tmp14_, TRUE); -#line 5231 "AppWindow.c" + g_simple_action_set_enabled (_tmp10_, TRUE); +#line 5253 "AppWindow.c" } else { - const gchar* _tmp15_; - gchar* _tmp16_; - GSimpleAction* _tmp17_; -#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp15_ = prefix; + gchar* _tmp11_; + GSimpleAction* _tmp12_; #line 862 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp16_ = g_strdup (_tmp15_); + _tmp11_ = g_strdup (prefix); #line 862 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_free0 (label); #line 862 "/home/jens/Source/shotwell/src/AppWindow.vala" - label = _tmp16_; + label = _tmp11_; #line 863 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp17_ = action; + _tmp12_ = action; #line 863 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_simple_action_set_enabled (_tmp17_, FALSE); -#line 5248 "AppWindow.c" + g_simple_action_set_enabled (_tmp12_, FALSE); +#line 5267 "AppWindow.c" } #line 865 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp18_ = name; + _tmp13_ = label; #line 865 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp19_ = label; -#line 865 "/home/jens/Source/shotwell/src/AppWindow.vala" - app_window_update_menu_item_label (self, _tmp18_, _tmp19_); + app_window_update_menu_item_label (self, name, _tmp13_); #line 849 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_free0 (label); #line 849 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (action); -#line 5260 "AppWindow.c" +#line 5277 "AppWindow.c" } -void app_window_decorate_undo_action (AppWindow* self) { +void +app_window_decorate_undo_action (AppWindow* self) +{ CommandManager* _tmp0_; CommandManager* _tmp1_; CommandDescription* _tmp2_; @@ -5313,11 +5332,13 @@ void app_window_decorate_undo_action (AppWindow* self) { _g_object_unref0 (_tmp3_); #line 869 "/home/jens/Source/shotwell/src/AppWindow.vala" _command_manager_unref0 (_tmp1_); -#line 5285 "AppWindow.c" +#line 5304 "AppWindow.c" } -void app_window_decorate_redo_action (AppWindow* self) { +void +app_window_decorate_redo_action (AppWindow* self) +{ CommandManager* _tmp0_; CommandManager* _tmp1_; CommandDescription* _tmp2_; @@ -5338,11 +5359,13 @@ void app_window_decorate_redo_action (AppWindow* self) { _g_object_unref0 (_tmp3_); #line 874 "/home/jens/Source/shotwell/src/AppWindow.vala" _command_manager_unref0 (_tmp1_); -#line 5310 "AppWindow.c" +#line 5331 "AppWindow.c" } -static void app_window_on_undo (AppWindow* self) { +static void +app_window_on_undo (AppWindow* self) +{ CommandManager* _tmp0_; #line 878 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); @@ -5350,11 +5373,13 @@ static void app_window_on_undo (AppWindow* self) { _tmp0_ = app_window_command_manager; #line 879 "/home/jens/Source/shotwell/src/AppWindow.vala" command_manager_undo (_tmp0_); -#line 5322 "AppWindow.c" +#line 5345 "AppWindow.c" } -static void app_window_on_redo (AppWindow* self) { +static void +app_window_on_redo (AppWindow* self) +{ CommandManager* _tmp0_; #line 882 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); @@ -5362,11 +5387,13 @@ static void app_window_on_redo (AppWindow* self) { _tmp0_ = app_window_command_manager; #line 883 "/home/jens/Source/shotwell/src/AppWindow.vala" command_manager_redo (_tmp0_); -#line 5334 "AppWindow.c" +#line 5359 "AppWindow.c" } -static void app_window_on_select_all (AppWindow* self) { +static void +app_window_on_select_all (AppWindow* self) +{ Page* page = NULL; Page* _tmp0_; CheckerboardPage* _tmp1_; @@ -5381,7 +5408,7 @@ static void app_window_on_select_all (AppWindow* self) { if (_tmp1_ == NULL) { #line 887 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp0_); -#line 5353 "AppWindow.c" +#line 5380 "AppWindow.c" } #line 887 "/home/jens/Source/shotwell/src/AppWindow.vala" page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); @@ -5389,7 +5416,7 @@ static void app_window_on_select_all (AppWindow* self) { _tmp2_ = page; #line 888 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp2_ != NULL) { -#line 5361 "AppWindow.c" +#line 5388 "AppWindow.c" Page* _tmp3_; ViewCollection* _tmp4_; ViewCollection* _tmp5_; @@ -5403,15 +5430,17 @@ static void app_window_on_select_all (AppWindow* self) { view_collection_select_all (_tmp5_); #line 889 "/home/jens/Source/shotwell/src/AppWindow.vala" _data_collection_unref0 (_tmp5_); -#line 5375 "AppWindow.c" +#line 5402 "AppWindow.c" } #line 886 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (page); -#line 5379 "AppWindow.c" +#line 5406 "AppWindow.c" } -static void app_window_on_select_none (AppWindow* self) { +static void +app_window_on_select_none (AppWindow* self) +{ Page* page = NULL; Page* _tmp0_; CheckerboardPage* _tmp1_; @@ -5426,7 +5455,7 @@ static void app_window_on_select_none (AppWindow* self) { if (_tmp1_ == NULL) { #line 893 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp0_); -#line 5398 "AppWindow.c" +#line 5427 "AppWindow.c" } #line 893 "/home/jens/Source/shotwell/src/AppWindow.vala" page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); @@ -5434,7 +5463,7 @@ static void app_window_on_select_none (AppWindow* self) { _tmp2_ = page; #line 894 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp2_ != NULL) { -#line 5406 "AppWindow.c" +#line 5435 "AppWindow.c" Page* _tmp3_; ViewCollection* _tmp4_; ViewCollection* _tmp5_; @@ -5448,22 +5477,22 @@ static void app_window_on_select_none (AppWindow* self) { view_collection_unselect_all (_tmp5_); #line 895 "/home/jens/Source/shotwell/src/AppWindow.vala" _data_collection_unref0 (_tmp5_); -#line 5420 "AppWindow.c" +#line 5449 "AppWindow.c" } #line 892 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (page); -#line 5424 "AppWindow.c" +#line 5453 "AppWindow.c" } -static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfigure* event) { +static gboolean +app_window_real_configure_event (GtkWidget* base, + GdkEventConfigure* event) +{ AppWindow * self; gboolean result = FALSE; GdkWindow* _tmp0_; - GdkWindowState _tmp1_; - gboolean _tmp2_; - GdkEventConfigure* _tmp5_; - gboolean _tmp6_; + gboolean _tmp1_; #line 898 "/home/jens/Source/shotwell/src/AppWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow); #line 898 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -5471,37 +5500,33 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig #line 899 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 899 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = gdk_window_get_state (_tmp0_); -#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala" - self->maximized = _tmp1_ == GDK_WINDOW_STATE_MAXIMIZED; + self->maximized = gdk_window_get_state (_tmp0_) == GDK_WINDOW_STATE_MAXIMIZED; #line 901 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = self->maximized; + _tmp1_ = self->maximized; #line 901 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (!_tmp2_) { -#line 5450 "AppWindow.c" + if (!_tmp1_) { +#line 5477 "AppWindow.c" + gint _tmp2_ = 0; gint _tmp3_ = 0; - gint _tmp4_ = 0; #line 902 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_window_get_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), &_tmp3_, &_tmp4_); + gtk_window_get_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), &_tmp2_, &_tmp3_); #line 902 "/home/jens/Source/shotwell/src/AppWindow.vala" - self->dimensions.width = _tmp3_; + self->dimensions.width = _tmp2_; #line 902 "/home/jens/Source/shotwell/src/AppWindow.vala" - self->dimensions.height = _tmp4_; -#line 5459 "AppWindow.c" + self->dimensions.height = _tmp3_; +#line 5486 "AppWindow.c" } #line 904 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = event; -#line 904 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp6_ = GTK_WIDGET_CLASS (app_window_parent_class)->configure_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp5_); -#line 904 "/home/jens/Source/shotwell/src/AppWindow.vala" - result = _tmp6_; + result = 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), event); #line 904 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 5469 "AppWindow.c" +#line 5492 "AppWindow.c" } -static void app_window_class_init (AppWindowClass * klass) { +static void +app_window_class_init (AppWindowClass * klass) +{ #line 399 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_parent_class = g_type_class_peek_parent (klass); #line 399 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -5524,32 +5549,38 @@ static void app_window_class_init (AppWindowClass * klass) { ((GtkWidgetClass *) klass)->configure_event = (gboolean (*) (GtkWidget *, GdkEventConfigure*)) app_window_real_configure_event; #line 399 "/home/jens/Source/shotwell/src/AppWindow.vala" G_OBJECT_CLASS (klass)->finalize = app_window_finalize; -#line 5496 "AppWindow.c" +#line 5521 "AppWindow.c" } -static void app_window_instance_init (AppWindow * self) { +static void +app_window_instance_init (AppWindow * self) +{ #line 409 "/home/jens/Source/shotwell/src/AppWindow.vala" self->maximized = FALSE; #line 411 "/home/jens/Source/shotwell/src/AppWindow.vala" self->pos_x = 0; #line 412 "/home/jens/Source/shotwell/src/AppWindow.vala" self->pos_y = 0; -#line 5507 "AppWindow.c" +#line 5534 "AppWindow.c" } -static void app_window_finalize (GObject * obj) { +static void +app_window_finalize (GObject * obj) +{ AppWindow * self; #line 399 "/home/jens/Source/shotwell/src/AppWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_APP_WINDOW, AppWindow); #line 399 "/home/jens/Source/shotwell/src/AppWindow.vala" G_OBJECT_CLASS (app_window_parent_class)->finalize (obj); -#line 5517 "AppWindow.c" +#line 5546 "AppWindow.c" } -GType app_window_get_type (void) { +GType +app_window_get_type (void) +{ static volatile gsize app_window_type_id__volatile = 0; if (g_once_init_enter (&app_window_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (AppWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) app_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (AppWindow), 0, (GInstanceInitFunc) app_window_instance_init, NULL }; diff --git a/src/Application.c b/src/Application.c index a509a16..fe89877 100644 --- a/src/Application.c +++ b/src/Application.c @@ -1,4 +1,4 @@ -/* Application.c generated by valac 0.36.6, the Vala compiler +/* Application.c generated by valac 0.40.4, the Vala compiler * generated from Application.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -65,9 +66,9 @@ enum { APPLICATION_STARTING_SIGNAL, APPLICATION_EXITING_SIGNAL, APPLICATION_INIT_DONE_SIGNAL, - APPLICATION_LAST_SIGNAL + APPLICATION_NUM_SIGNALS }; -static guint application_signals[APPLICATION_LAST_SIGNAL] = {0}; +static guint application_signals[APPLICATION_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -107,67 +108,93 @@ static Application* application_instance = NULL; gpointer application_ref (gpointer instance); void application_unref (gpointer instance); -GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_application (GValue* value, gpointer v_object); -void value_take_application (GValue* value, gpointer v_object); +GParamSpec* param_spec_application (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_application (GValue* value, + gpointer v_object); +void value_take_application (GValue* value, + gpointer v_object); gpointer value_get_application (const GValue* value); GType application_get_type (void) G_GNUC_CONST; #define APPLICATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_APPLICATION, ApplicationPrivate)) -enum { - APPLICATION_DUMMY_PROPERTY -}; -void application_set_raw_thumbs_fix_required (Application* self, gboolean should_fixup); +void application_set_raw_thumbs_fix_required (Application* self, + gboolean should_fixup); gboolean application_get_raw_thumbs_fix_required (Application* self); GtkApplication* application_get_system_app (Application* self); static Application* application_new (gboolean is_direct); -static Application* application_construct (GType object_type, gboolean is_direct); +static Application* application_construct (GType object_type, + gboolean is_direct); void application_panic (Application* self); gint application_on_command_line (GApplicationCommandLine* acl); -static gint _application_on_command_line_g_application_command_line (GApplication* _sender, GApplicationCommandLine* command_line, gpointer self); +static gint _application_on_command_line_g_application_command_line (GApplication* _sender, + GApplicationCommandLine* command_line, + gpointer self); void application_on_activated (void); -static void _application_on_activated_g_application_activate (GApplication* _sender, gpointer self); -static void _application_on_activated_g_application_startup (GApplication* _sender, gpointer self); -void application_send_to_primary_instance (gchar** argv, int argv_length1); +static void _application_on_activated_g_application_activate (GApplication* _sender, + gpointer self); +static void _application_on_activated_g_application_startup (GApplication* _sender, + gpointer self); +void application_send_to_primary_instance (gchar** argv, + int argv_length1); Application* application_get_instance (void); void application_present_primary_instance (void); gboolean application_get_is_remote (void); gboolean application_get_is_direct (void); -void application_set_accels_for_action (const gchar* action, gchar** accel, int accel_length1); +void application_set_accels_for_action (const gchar* action, + gchar** accel, + int accel_length1); void application_set_menubar (GMenuModel* model); GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; GType library_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); LibraryWindow* library_window_get_app (void); -void library_window_mounted_camera_shell_notification (LibraryWindow* self, const gchar* uri, gboolean at_startup); +void library_window_mounted_camera_shell_notification (LibraryWindow* self, + const gchar* uri, + gboolean at_startup); void application_init (gboolean is_direct); void application_terminate (void); void application_exit (Application* self); -void application_start (Application* self, gchar** argv, int argv_length1); -guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, const gchar* reason); -void application_uninhibit (Application* self, guint cookie); +void application_start (Application* self, + gchar** argv, + int argv_length1); +guint application_inhibit (Application* self, + GtkApplicationInhibitFlags what, + const gchar* reason); +void application_uninhibit (Application* self, + guint cookie); gint application_get_run_return_value (Application* self); static void application_real_starting (Application* self); -static void application_real_exiting (Application* self, gboolean panicked); +static void application_real_exiting (Application* self, + gboolean panicked); static void application_real_init_done (Application* self); static void application_finalize (Application * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -void application_set_raw_thumbs_fix_required (Application* self, gboolean should_fixup) { - gboolean _tmp0_; +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); + + +void +application_set_raw_thumbs_fix_required (Application* self, + gboolean should_fixup) +{ #line 24 "/home/jens/Source/shotwell/src/Application.vala" g_return_if_fail (IS_APPLICATION (self)); #line 25 "/home/jens/Source/shotwell/src/Application.vala" - _tmp0_ = should_fixup; -#line 25 "/home/jens/Source/shotwell/src/Application.vala" - self->priv->fixup_raw_thumbs = _tmp0_; -#line 167 "Application.c" + self->priv->fixup_raw_thumbs = should_fixup; +#line 192 "Application.c" } -gboolean application_get_raw_thumbs_fix_required (Application* self) { +gboolean +application_get_raw_thumbs_fix_required (Application* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 28 "/home/jens/Source/shotwell/src/Application.vala" @@ -178,18 +205,22 @@ gboolean application_get_raw_thumbs_fix_required (Application* self) { result = _tmp0_; #line 29 "/home/jens/Source/shotwell/src/Application.vala" return result; -#line 182 "Application.c" +#line 209 "Application.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 33 "/home/jens/Source/shotwell/src/Application.vala" return self ? g_object_ref (self) : NULL; -#line 189 "Application.c" +#line 218 "Application.c" } -GtkApplication* application_get_system_app (Application* self) { +GtkApplication* +application_get_system_app (Application* self) +{ GtkApplication* result = NULL; GtkApplication* _tmp0_; GtkApplication* _tmp1_; @@ -203,75 +234,84 @@ GtkApplication* application_get_system_app (Application* self) { result = _tmp1_; #line 33 "/home/jens/Source/shotwell/src/Application.vala" return result; -#line 207 "Application.c" +#line 238 "Application.c" } -static gint _application_on_command_line_g_application_command_line (GApplication* _sender, GApplicationCommandLine* command_line, gpointer self) { +static gint +_application_on_command_line_g_application_command_line (GApplication* _sender, + GApplicationCommandLine* command_line, + gpointer self) +{ gint result; result = application_on_command_line (command_line); #line 65 "/home/jens/Source/shotwell/src/Application.vala" return result; -#line 216 "Application.c" +#line 251 "Application.c" } -static void _application_on_activated_g_application_activate (GApplication* _sender, gpointer self) { +static void +_application_on_activated_g_application_activate (GApplication* _sender, + gpointer self) +{ #line 68 "/home/jens/Source/shotwell/src/Application.vala" application_on_activated (); -#line 223 "Application.c" +#line 261 "Application.c" } -static void _application_on_activated_g_application_startup (GApplication* _sender, gpointer self) { +static void +_application_on_activated_g_application_startup (GApplication* _sender, + gpointer self) +{ #line 69 "/home/jens/Source/shotwell/src/Application.vala" application_on_activated (); -#line 230 "Application.c" +#line 271 "Application.c" } -static Application* application_construct (GType object_type, gboolean is_direct) { +static Application* +application_construct (GType object_type, + gboolean is_direct) +{ Application* self = NULL; - gboolean _tmp0_; - gboolean _tmp4_; - gboolean _tmp5_; - GtkApplication* _tmp7_; - GtkApplication* _tmp8_; + gboolean _tmp3_; + GtkApplication* _tmp5_; + GtkApplication* _tmp6_; GError * _inner_error_ = NULL; #line 39 "/home/jens/Source/shotwell/src/Application.vala" self = (Application*) g_type_create_instance (object_type); #line 40 "/home/jens/Source/shotwell/src/Application.vala" - _tmp0_ = is_direct; -#line 40 "/home/jens/Source/shotwell/src/Application.vala" - if (_tmp0_) { -#line 248 "Application.c" - GtkApplication* _tmp1_; + if (is_direct) { +#line 288 "Application.c" + GtkApplication* _tmp0_; #line 45 "/home/jens/Source/shotwell/src/Application.vala" - _tmp1_ = gtk_application_new ("org.yorba.shotwell-direct", G_APPLICATION_HANDLES_OPEN | G_APPLICATION_NON_UNIQUE); + _tmp0_ = gtk_application_new ("org.yorba.shotwell-direct", G_APPLICATION_HANDLES_OPEN | G_APPLICATION_NON_UNIQUE); #line 45 "/home/jens/Source/shotwell/src/Application.vala" _g_object_unref0 (self->priv->system_app); #line 45 "/home/jens/Source/shotwell/src/Application.vala" - self->priv->system_app = _tmp1_; -#line 256 "Application.c" + self->priv->system_app = _tmp0_; +#line 296 "Application.c" } else { - GtkApplication* _tmp2_; + GtkApplication* _tmp1_; #line 51 "/home/jens/Source/shotwell/src/Application.vala" - _tmp2_ = gtk_application_new ("org.yorba.shotwell", G_APPLICATION_HANDLES_OPEN | G_APPLICATION_HANDLES_COMMAND_LINE); + _tmp1_ = gtk_application_new ("org.yorba.shotwell", G_APPLICATION_HANDLES_OPEN | G_APPLICATION_HANDLES_COMMAND_LINE); #line 51 "/home/jens/Source/shotwell/src/Application.vala" _g_object_unref0 (self->priv->system_app); #line 51 "/home/jens/Source/shotwell/src/Application.vala" - self->priv->system_app = _tmp2_; -#line 265 "Application.c" + self->priv->system_app = _tmp1_; +#line 305 "Application.c" } { - GtkApplication* _tmp3_; + GtkApplication* _tmp2_; #line 57 "/home/jens/Source/shotwell/src/Application.vala" - _tmp3_ = self->priv->system_app; + _tmp2_ = self->priv->system_app; #line 57 "/home/jens/Source/shotwell/src/Application.vala" - g_application_register (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_application_get_type (), GApplication), NULL, &_inner_error_); + g_application_register (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_application_get_type (), GApplication), NULL, &_inner_error_); #line 57 "/home/jens/Source/shotwell/src/Application.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 275 "Application.c" +#line 315 "Application.c" goto __catch569_g_error; } } @@ -287,7 +327,7 @@ static Application* application_construct (GType object_type, gboolean is_direct application_panic (self); #line 56 "/home/jens/Source/shotwell/src/Application.vala" _g_error_free0 (e); -#line 291 "Application.c" +#line 331 "Application.c" } __finally569: #line 56 "/home/jens/Source/shotwell/src/Application.vala" @@ -298,42 +338,42 @@ static Application* application_construct (GType object_type, gboolean is_direct g_clear_error (&_inner_error_); #line 56 "/home/jens/Source/shotwell/src/Application.vala" return NULL; -#line 302 "Application.c" +#line 342 "Application.c" } #line 62 "/home/jens/Source/shotwell/src/Application.vala" - _tmp4_ = is_direct; -#line 62 "/home/jens/Source/shotwell/src/Application.vala" - self->priv->direct = _tmp4_; + self->priv->direct = is_direct; #line 64 "/home/jens/Source/shotwell/src/Application.vala" - _tmp5_ = self->priv->direct; + _tmp3_ = self->priv->direct; #line 64 "/home/jens/Source/shotwell/src/Application.vala" - if (!_tmp5_) { -#line 312 "Application.c" - GtkApplication* _tmp6_; + if (!_tmp3_) { +#line 350 "Application.c" + GtkApplication* _tmp4_; #line 65 "/home/jens/Source/shotwell/src/Application.vala" - _tmp6_ = self->priv->system_app; + _tmp4_ = self->priv->system_app; #line 65 "/home/jens/Source/shotwell/src/Application.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, g_application_get_type (), GApplication), "command-line", (GCallback) _application_on_command_line_g_application_command_line, NULL); -#line 318 "Application.c" + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, g_application_get_type (), GApplication), "command-line", (GCallback) _application_on_command_line_g_application_command_line, NULL); +#line 356 "Application.c" } #line 68 "/home/jens/Source/shotwell/src/Application.vala" - _tmp7_ = self->priv->system_app; + _tmp5_ = self->priv->system_app; #line 68 "/home/jens/Source/shotwell/src/Application.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, g_application_get_type (), GApplication), "activate", (GCallback) _application_on_activated_g_application_activate, NULL); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_application_get_type (), GApplication), "activate", (GCallback) _application_on_activated_g_application_activate, NULL); #line 69 "/home/jens/Source/shotwell/src/Application.vala" - _tmp8_ = self->priv->system_app; + _tmp6_ = self->priv->system_app; #line 69 "/home/jens/Source/shotwell/src/Application.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, g_application_get_type (), GApplication), "startup", (GCallback) _application_on_activated_g_application_startup, NULL); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, g_application_get_type (), GApplication), "startup", (GCallback) _application_on_activated_g_application_startup, NULL); #line 39 "/home/jens/Source/shotwell/src/Application.vala" return self; -#line 330 "Application.c" +#line 368 "Application.c" } -static Application* application_new (gboolean is_direct) { +static Application* +application_new (gboolean is_direct) +{ #line 39 "/home/jens/Source/shotwell/src/Application.vala" return application_construct (TYPE_APPLICATION, is_direct); -#line 337 "Application.c" +#line 377 "Application.c" } @@ -342,12 +382,13 @@ static Application* application_new (gboolean is_direct) { * called if we've gotten a camera mount and are _not_ the primary * instance. */ -void application_send_to_primary_instance (gchar** argv, int argv_length1) { +void +application_send_to_primary_instance (gchar** argv, + int argv_length1) +{ Application* _tmp0_; Application* _tmp1_; GtkApplication* _tmp2_; - gchar** _tmp3_; - gint _tmp3__length1; #line 78 "/home/jens/Source/shotwell/src/Application.vala" _tmp0_ = application_get_instance (); #line 78 "/home/jens/Source/shotwell/src/Application.vala" @@ -355,14 +396,10 @@ void application_send_to_primary_instance (gchar** argv, int argv_length1) { #line 78 "/home/jens/Source/shotwell/src/Application.vala" _tmp2_ = _tmp1_->priv->system_app; #line 78 "/home/jens/Source/shotwell/src/Application.vala" - _tmp3_ = argv; -#line 78 "/home/jens/Source/shotwell/src/Application.vala" - _tmp3__length1 = argv_length1; -#line 78 "/home/jens/Source/shotwell/src/Application.vala" - g_application_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_application_get_type (), GApplication), _tmp3__length1, _tmp3_); + g_application_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_application_get_type (), GApplication), argv_length1, argv); #line 78 "/home/jens/Source/shotwell/src/Application.vala" _application_unref0 (_tmp1_); -#line 366 "Application.c" +#line 403 "Application.c" } @@ -371,7 +408,9 @@ void application_send_to_primary_instance (gchar** argv, int argv_length1) { * instance to bring its window to the foreground. This * should only be called if we are _not_ the primary instance. */ -void application_present_primary_instance (void) { +void +application_present_primary_instance (void) +{ Application* _tmp0_; Application* _tmp1_; GtkApplication* _tmp2_; @@ -385,17 +424,18 @@ void application_present_primary_instance (void) { g_application_activate (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_application_get_type (), GApplication)); #line 87 "/home/jens/Source/shotwell/src/Application.vala" _application_unref0 (_tmp1_); -#line 389 "Application.c" +#line 428 "Application.c" } -gboolean application_get_is_remote (void) { +gboolean +application_get_is_remote (void) +{ gboolean result = FALSE; Application* _tmp0_; Application* _tmp1_; GtkApplication* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 91 "/home/jens/Source/shotwell/src/Application.vala" _tmp0_ = application_get_instance (); #line 91 "/home/jens/Source/shotwell/src/Application.vala" @@ -404,19 +444,19 @@ gboolean application_get_is_remote (void) { _tmp2_ = _tmp1_->priv->system_app; #line 91 "/home/jens/Source/shotwell/src/Application.vala" _tmp3_ = g_application_get_is_remote (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_application_get_type (), GApplication)); -#line 91 "/home/jens/Source/shotwell/src/Application.vala" - _tmp4_ = _tmp3_; #line 91 "/home/jens/Source/shotwell/src/Application.vala" _application_unref0 (_tmp1_); #line 91 "/home/jens/Source/shotwell/src/Application.vala" - result = _tmp4_; + result = _tmp3_; #line 91 "/home/jens/Source/shotwell/src/Application.vala" return result; -#line 416 "Application.c" +#line 454 "Application.c" } -gboolean application_get_is_direct (void) { +gboolean +application_get_is_direct (void) +{ gboolean result = FALSE; Application* _tmp0_; Application* _tmp1_; @@ -436,17 +476,18 @@ gboolean application_get_is_direct (void) { result = _tmp3_; #line 95 "/home/jens/Source/shotwell/src/Application.vala" return result; -#line 440 "Application.c" +#line 480 "Application.c" } -void application_set_accels_for_action (const gchar* action, gchar** accel, int accel_length1) { +void +application_set_accels_for_action (const gchar* action, + gchar** accel, + int accel_length1) +{ Application* _tmp0_; Application* _tmp1_; GtkApplication* _tmp2_; - const gchar* _tmp3_; - gchar** _tmp4_; - gint _tmp4__length1; #line 98 "/home/jens/Source/shotwell/src/Application.vala" g_return_if_fail (action != NULL); #line 99 "/home/jens/Source/shotwell/src/Application.vala" @@ -456,24 +497,19 @@ void application_set_accels_for_action (const gchar* action, gchar** accel, int #line 99 "/home/jens/Source/shotwell/src/Application.vala" _tmp2_ = _tmp1_->priv->system_app; #line 99 "/home/jens/Source/shotwell/src/Application.vala" - _tmp3_ = action; -#line 99 "/home/jens/Source/shotwell/src/Application.vala" - _tmp4_ = accel; -#line 99 "/home/jens/Source/shotwell/src/Application.vala" - _tmp4__length1 = accel_length1; -#line 99 "/home/jens/Source/shotwell/src/Application.vala" - gtk_application_set_accels_for_action (_tmp2_, _tmp3_, _tmp4_); + gtk_application_set_accels_for_action (_tmp2_, action, accel); #line 99 "/home/jens/Source/shotwell/src/Application.vala" _application_unref0 (_tmp1_); -#line 469 "Application.c" +#line 504 "Application.c" } -void application_set_menubar (GMenuModel* model) { +void +application_set_menubar (GMenuModel* model) +{ Application* _tmp0_; Application* _tmp1_; GtkApplication* _tmp2_; - GMenuModel* _tmp3_; #line 102 "/home/jens/Source/shotwell/src/Application.vala" g_return_if_fail ((model == NULL) || G_IS_MENU_MODEL (model)); #line 103 "/home/jens/Source/shotwell/src/Application.vala" @@ -483,12 +519,10 @@ void application_set_menubar (GMenuModel* model) { #line 103 "/home/jens/Source/shotwell/src/Application.vala" _tmp2_ = _tmp1_->priv->system_app; #line 103 "/home/jens/Source/shotwell/src/Application.vala" - _tmp3_ = model; -#line 103 "/home/jens/Source/shotwell/src/Application.vala" - gtk_application_set_menubar (_tmp2_, _tmp3_); + gtk_application_set_menubar (_tmp2_, model); #line 103 "/home/jens/Source/shotwell/src/Application.vala" _application_unref0 (_tmp1_); -#line 492 "Application.c" +#line 526 "Application.c" } @@ -500,7 +534,9 @@ void application_set_menubar (GMenuModel* model) { * a camera/removable-storage mount; in either case, the remote instance * will trigger this and exit, and we'll need to bring the window back up... */ -void application_on_activated (void) { +void +application_on_activated (void) +{ Application* _tmp0_; Application* _tmp1_; LibraryWindow* lw = NULL; @@ -522,7 +558,7 @@ void application_on_activated (void) { if (_tmp3_ == NULL) { #line 117 "/home/jens/Source/shotwell/src/Application.vala" _g_object_unref0 (_tmp2_); -#line 526 "Application.c" +#line 562 "Application.c" } #line 117 "/home/jens/Source/shotwell/src/Application.vala" lw = _tmp3_; @@ -530,36 +566,32 @@ void application_on_activated (void) { _tmp5_ = lw; #line 118 "/home/jens/Source/shotwell/src/Application.vala" if (_tmp5_ != NULL) { -#line 534 "Application.c" - gboolean _tmp6_; #line 118 "/home/jens/Source/shotwell/src/Application.vala" - _tmp6_ = application_get_is_direct (); -#line 118 "/home/jens/Source/shotwell/src/Application.vala" - _tmp4_ = !_tmp6_; -#line 540 "Application.c" + _tmp4_ = !application_get_is_direct (); +#line 572 "Application.c" } else { #line 118 "/home/jens/Source/shotwell/src/Application.vala" _tmp4_ = FALSE; -#line 544 "Application.c" +#line 576 "Application.c" } #line 118 "/home/jens/Source/shotwell/src/Application.vala" if (_tmp4_) { -#line 548 "Application.c" +#line 580 "Application.c" + LibraryWindow* _tmp6_; LibraryWindow* _tmp7_; - LibraryWindow* _tmp8_; #line 119 "/home/jens/Source/shotwell/src/Application.vala" - _tmp7_ = library_window_get_app (); + _tmp6_ = library_window_get_app (); #line 119 "/home/jens/Source/shotwell/src/Application.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 119 "/home/jens/Source/shotwell/src/Application.vala" - gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow)); + gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_window_get_type (), GtkWindow)); #line 119 "/home/jens/Source/shotwell/src/Application.vala" - _g_object_unref0 (_tmp8_); -#line 559 "Application.c" + _g_object_unref0 (_tmp7_); +#line 591 "Application.c" } #line 114 "/home/jens/Source/shotwell/src/Application.vala" _g_object_unref0 (lw); -#line 563 "Application.c" +#line 595 "Application.c" } @@ -571,98 +603,97 @@ void application_on_activated (void) { * * @note This does _not_ get called in direct-edit mode. */ -gint application_on_command_line (GApplicationCommandLine* acl) { +gint +application_on_command_line (GApplicationCommandLine* acl) +{ gint result = 0; gchar** argv = NULL; - GApplicationCommandLine* _tmp0_; - gint _tmp1_; - gchar** _tmp2_; + gint _tmp0_; + gchar** _tmp1_; gint argv_length1; gint _argv_size_; - gchar** _tmp3_; - gint _tmp3__length1; + gchar** _tmp2_; + gint _tmp2__length1; #line 131 "/home/jens/Source/shotwell/src/Application.vala" g_return_val_if_fail (G_IS_APPLICATION_COMMAND_LINE (acl), 0); #line 132 "/home/jens/Source/shotwell/src/Application.vala" - _tmp0_ = acl; -#line 132 "/home/jens/Source/shotwell/src/Application.vala" - _tmp2_ = g_application_command_line_get_arguments (_tmp0_, &_tmp1_); + _tmp1_ = g_application_command_line_get_arguments (acl, &_tmp0_); #line 132 "/home/jens/Source/shotwell/src/Application.vala" - argv = _tmp2_; + argv = _tmp1_; #line 132 "/home/jens/Source/shotwell/src/Application.vala" - argv_length1 = _tmp1_; + argv_length1 = _tmp0_; #line 132 "/home/jens/Source/shotwell/src/Application.vala" _argv_size_ = argv_length1; #line 134 "/home/jens/Source/shotwell/src/Application.vala" - _tmp3_ = argv; + _tmp2_ = argv; #line 134 "/home/jens/Source/shotwell/src/Application.vala" - _tmp3__length1 = argv_length1; + _tmp2__length1 = argv_length1; #line 134 "/home/jens/Source/shotwell/src/Application.vala" - if (_tmp3_ != NULL) { -#line 603 "Application.c" - gchar** _tmp4_; - gint _tmp4__length1; + if (_tmp2_ != NULL) { +#line 634 "Application.c" + gchar** _tmp3_; + gint _tmp3__length1; #line 135 "/home/jens/Source/shotwell/src/Application.vala" - _tmp4_ = argv; + _tmp3_ = argv; #line 135 "/home/jens/Source/shotwell/src/Application.vala" - _tmp4__length1 = argv_length1; -#line 610 "Application.c" + _tmp3__length1 = argv_length1; +#line 641 "Application.c" { gchar** s_collection = NULL; gint s_collection_length1 = 0; gint _s_collection_size_ = 0; gint s_it = 0; #line 135 "/home/jens/Source/shotwell/src/Application.vala" - s_collection = _tmp4_; + s_collection = _tmp3_; #line 135 "/home/jens/Source/shotwell/src/Application.vala" - s_collection_length1 = _tmp4__length1; + s_collection_length1 = _tmp3__length1; #line 135 "/home/jens/Source/shotwell/src/Application.vala" - for (s_it = 0; s_it < _tmp4__length1; s_it = s_it + 1) { -#line 622 "Application.c" - gchar* _tmp5_; + for (s_it = 0; s_it < _tmp3__length1; s_it = s_it + 1) { +#line 653 "Application.c" + gchar* _tmp4_; gchar* s = NULL; #line 135 "/home/jens/Source/shotwell/src/Application.vala" - _tmp5_ = g_strdup (s_collection[s_it]); + _tmp4_ = g_strdup (s_collection[s_it]); #line 135 "/home/jens/Source/shotwell/src/Application.vala" - s = _tmp5_; -#line 629 "Application.c" + s = _tmp4_; +#line 660 "Application.c" { LibraryWindow* lw = NULL; - AppWindow* _tmp6_; + AppWindow* _tmp5_; + LibraryWindow* _tmp6_; LibraryWindow* _tmp7_; - LibraryWindow* _tmp8_; #line 136 "/home/jens/Source/shotwell/src/Application.vala" - _tmp6_ = app_window_get_instance (); + _tmp5_ = app_window_get_instance (); #line 136 "/home/jens/Source/shotwell/src/Application.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_LIBRARY_WINDOW) ? ((LibraryWindow*) _tmp6_) : NULL; + _tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_LIBRARY_WINDOW) ? ((LibraryWindow*) _tmp5_) : NULL; #line 136 "/home/jens/Source/shotwell/src/Application.vala" - if (_tmp7_ == NULL) { + if (_tmp6_ == NULL) { #line 136 "/home/jens/Source/shotwell/src/Application.vala" - _g_object_unref0 (_tmp6_); -#line 643 "Application.c" + _g_object_unref0 (_tmp5_); +#line 674 "Application.c" } #line 136 "/home/jens/Source/shotwell/src/Application.vala" - lw = _tmp7_; + lw = _tmp6_; #line 137 "/home/jens/Source/shotwell/src/Application.vala" - _tmp8_ = lw; + _tmp7_ = lw; #line 137 "/home/jens/Source/shotwell/src/Application.vala" - if (_tmp8_ != NULL) { -#line 651 "Application.c" - LibraryWindow* _tmp9_; - const gchar* _tmp10_; + if (_tmp7_ != NULL) { +#line 682 "Application.c" + LibraryWindow* _tmp8_; + const gchar* _tmp9_; #line 138 "/home/jens/Source/shotwell/src/Application.vala" - _tmp9_ = lw; + _tmp8_ = lw; #line 138 "/home/jens/Source/shotwell/src/Application.vala" - _tmp10_ = s; + _tmp9_ = s; #line 138 "/home/jens/Source/shotwell/src/Application.vala" - library_window_mounted_camera_shell_notification (_tmp9_, _tmp10_, FALSE); -#line 660 "Application.c" + library_window_mounted_camera_shell_notification (_tmp8_, _tmp9_, FALSE); +#line 691 "Application.c" } #line 135 "/home/jens/Source/shotwell/src/Application.vala" _g_object_unref0 (lw); #line 135 "/home/jens/Source/shotwell/src/Application.vala" _g_free0 (s); -#line 666 "Application.c" +#line 697 "Application.c" } } } @@ -675,7 +706,7 @@ gint application_on_command_line (GApplicationCommandLine* acl) { argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL); #line 143 "/home/jens/Source/shotwell/src/Application.vala" return result; -#line 679 "Application.c" +#line 710 "Application.c" } @@ -690,29 +721,30 @@ gint application_on_command_line (GApplicationCommandLine* acl) { * application needs to know what mode it was brought up in; failure to * call this first will lead to an assertion. */ -void application_init (gboolean is_direct) { +void +application_init (gboolean is_direct) +{ Application* _tmp0_; #line 158 "/home/jens/Source/shotwell/src/Application.vala" _tmp0_ = application_instance; #line 158 "/home/jens/Source/shotwell/src/Application.vala" if (_tmp0_ == NULL) { -#line 700 "Application.c" - gboolean _tmp1_; - Application* _tmp2_; -#line 159 "/home/jens/Source/shotwell/src/Application.vala" - _tmp1_ = is_direct; +#line 733 "Application.c" + Application* _tmp1_; #line 159 "/home/jens/Source/shotwell/src/Application.vala" - _tmp2_ = application_new (_tmp1_); + _tmp1_ = application_new (is_direct); #line 159 "/home/jens/Source/shotwell/src/Application.vala" _application_unref0 (application_instance); #line 159 "/home/jens/Source/shotwell/src/Application.vala" - application_instance = _tmp2_; -#line 711 "Application.c" + application_instance = _tmp1_; +#line 741 "Application.c" } } -void application_terminate (void) { +void +application_terminate (void) +{ Application* _tmp0_; Application* _tmp1_; #line 163 "/home/jens/Source/shotwell/src/Application.vala" @@ -723,18 +755,22 @@ void application_terminate (void) { application_exit (_tmp1_); #line 163 "/home/jens/Source/shotwell/src/Application.vala" _application_unref0 (_tmp1_); -#line 727 "Application.c" +#line 759 "Application.c" } -static gpointer _application_ref0 (gpointer self) { +static gpointer +_application_ref0 (gpointer self) +{ #line 169 "/home/jens/Source/shotwell/src/Application.vala" return self ? application_ref (self) : NULL; -#line 734 "Application.c" +#line 768 "Application.c" } -Application* application_get_instance (void) { +Application* +application_get_instance (void) +{ Application* result = NULL; Application* _tmp0_; Application* _tmp1_; @@ -751,11 +787,15 @@ Application* application_get_instance (void) { result = _tmp2_; #line 169 "/home/jens/Source/shotwell/src/Application.vala" return result; -#line 755 "Application.c" +#line 791 "Application.c" } -void application_start (Application* self, gchar** argv, int argv_length1) { +void +application_start (Application* self, + gchar** argv, + int argv_length1) +{ gboolean _tmp0_; AppWindow* _tmp1_; AppWindow* _tmp2_; @@ -763,14 +803,11 @@ void application_start (Application* self, gchar** argv, int argv_length1) { AppWindow* _tmp4_; AppWindow* _tmp5_; GtkApplication* _tmp6_; - gchar** _tmp7_; - gint _tmp7__length1; - gint _tmp8_; - gboolean _tmp9_; + gboolean _tmp7_; + GtkApplication* _tmp10_; + guint _tmp11_; GtkApplication* _tmp12_; guint _tmp13_; - GtkApplication* _tmp14_; - guint _tmp15_; #line 172 "/home/jens/Source/shotwell/src/Application.vala" g_return_if_fail (IS_APPLICATION (self)); #line 173 "/home/jens/Source/shotwell/src/Application.vala" @@ -779,7 +816,7 @@ void application_start (Application* self, gchar** argv, int argv_length1) { if (_tmp0_) { #line 174 "/home/jens/Source/shotwell/src/Application.vala" return; -#line 783 "Application.c" +#line 820 "Application.c" } #line 176 "/home/jens/Source/shotwell/src/Application.vala" self->priv->running = TRUE; @@ -806,47 +843,43 @@ void application_start (Application* self, gchar** argv, int argv_length1) { #line 182 "/home/jens/Source/shotwell/src/Application.vala" _tmp6_ = self->priv->system_app; #line 182 "/home/jens/Source/shotwell/src/Application.vala" - _tmp7_ = argv; -#line 182 "/home/jens/Source/shotwell/src/Application.vala" - _tmp7__length1 = argv_length1; -#line 182 "/home/jens/Source/shotwell/src/Application.vala" - _tmp8_ = g_application_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, g_application_get_type (), GApplication), _tmp7__length1, _tmp7_); -#line 182 "/home/jens/Source/shotwell/src/Application.vala" - self->priv->system_app_run_retval = _tmp8_; + self->priv->system_app_run_retval = g_application_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, g_application_get_type (), GApplication), argv_length1, argv); #line 184 "/home/jens/Source/shotwell/src/Application.vala" - _tmp9_ = self->priv->direct; + _tmp7_ = self->priv->direct; #line 184 "/home/jens/Source/shotwell/src/Application.vala" - if (!_tmp9_) { -#line 821 "Application.c" - GtkApplication* _tmp10_; - guint _tmp11_; + if (!_tmp7_) { +#line 852 "Application.c" + GtkApplication* _tmp8_; + guint _tmp9_; #line 185 "/home/jens/Source/shotwell/src/Application.vala" - _tmp10_ = self->priv->system_app; + _tmp8_ = self->priv->system_app; #line 185 "/home/jens/Source/shotwell/src/Application.vala" - g_signal_parse_name ("command-line", g_application_get_type (), &_tmp11_, NULL, FALSE); + g_signal_parse_name ("command-line", g_application_get_type (), &_tmp9_, NULL, FALSE); #line 185 "/home/jens/Source/shotwell/src/Application.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_application_get_type (), GApplication), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _application_on_command_line_g_application_command_line, NULL); -#line 830 "Application.c" + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, g_application_get_type (), GApplication), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _application_on_command_line_g_application_command_line, NULL); +#line 861 "Application.c" } #line 188 "/home/jens/Source/shotwell/src/Application.vala" - _tmp12_ = self->priv->system_app; + _tmp10_ = self->priv->system_app; #line 188 "/home/jens/Source/shotwell/src/Application.vala" - g_signal_parse_name ("activate", g_application_get_type (), &_tmp13_, NULL, FALSE); + g_signal_parse_name ("activate", g_application_get_type (), &_tmp11_, NULL, FALSE); #line 188 "/home/jens/Source/shotwell/src/Application.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, g_application_get_type (), GApplication), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _application_on_activated_g_application_activate, NULL); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_application_get_type (), GApplication), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _application_on_activated_g_application_activate, NULL); #line 189 "/home/jens/Source/shotwell/src/Application.vala" - _tmp14_ = self->priv->system_app; + _tmp12_ = self->priv->system_app; #line 189 "/home/jens/Source/shotwell/src/Application.vala" - g_signal_parse_name ("startup", g_application_get_type (), &_tmp15_, NULL, FALSE); + g_signal_parse_name ("startup", g_application_get_type (), &_tmp13_, NULL, FALSE); #line 189 "/home/jens/Source/shotwell/src/Application.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, g_application_get_type (), GApplication), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _application_on_activated_g_application_startup, NULL); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, g_application_get_type (), GApplication), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _application_on_activated_g_application_startup, NULL); #line 191 "/home/jens/Source/shotwell/src/Application.vala" self->priv->running = FALSE; -#line 846 "Application.c" +#line 877 "Application.c" } -void application_exit (Application* self) { +void +application_exit (Application* self) +{ gboolean _tmp0_ = FALSE; gboolean _tmp1_; GtkApplication* _tmp3_; @@ -858,20 +891,20 @@ void application_exit (Application* self) { if (_tmp1_) { #line 197 "/home/jens/Source/shotwell/src/Application.vala" _tmp0_ = TRUE; -#line 862 "Application.c" +#line 895 "Application.c" } else { gboolean _tmp2_; #line 197 "/home/jens/Source/shotwell/src/Application.vala" _tmp2_ = self->priv->running; #line 197 "/home/jens/Source/shotwell/src/Application.vala" _tmp0_ = !_tmp2_; -#line 869 "Application.c" +#line 902 "Application.c" } #line 197 "/home/jens/Source/shotwell/src/Application.vala" if (_tmp0_) { #line 198 "/home/jens/Source/shotwell/src/Application.vala" return; -#line 875 "Application.c" +#line 908 "Application.c" } #line 200 "/home/jens/Source/shotwell/src/Application.vala" self->priv->exiting_fired = TRUE; @@ -881,11 +914,13 @@ void application_exit (Application* self) { _tmp3_ = self->priv->system_app; #line 204 "/home/jens/Source/shotwell/src/Application.vala" g_application_release (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_application_get_type (), GApplication)); -#line 885 "Application.c" +#line 918 "Application.c" } -void application_panic (Application* self) { +void +application_panic (Application* self) +{ gboolean _tmp0_; #line 209 "/home/jens/Source/shotwell/src/Application.vala" g_return_if_fail (IS_APPLICATION (self)); @@ -897,11 +932,11 @@ void application_panic (Application* self) { self->priv->exiting_fired = TRUE; #line 212 "/home/jens/Source/shotwell/src/Application.vala" g_signal_emit (self, application_signals[APPLICATION_EXITING_SIGNAL], 0, TRUE); -#line 901 "Application.c" +#line 936 "Application.c" } #line 214 "/home/jens/Source/shotwell/src/Application.vala" exit (1); -#line 905 "Application.c" +#line 940 "Application.c" } @@ -912,15 +947,16 @@ void application_panic (Application* self) { * @note The return value is a 'cookie' that needs to be passed to 'uninhibit' to turn * off a requested inhibition and should be saved by the caller. */ -guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, const gchar* reason) { +guint +application_inhibit (Application* self, + GtkApplicationInhibitFlags what, + const gchar* reason) +{ guint result = 0U; GtkApplication* _tmp0_; AppWindow* _tmp1_; AppWindow* _tmp2_; - GtkApplicationInhibitFlags _tmp3_; - const gchar* _tmp4_; - guint _tmp5_; - guint _tmp6_; + guint _tmp3_; #line 224 "/home/jens/Source/shotwell/src/Application.vala" g_return_val_if_fail (IS_APPLICATION (self), 0U); #line 225 "/home/jens/Source/shotwell/src/Application.vala" @@ -930,20 +966,14 @@ guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, c #line 225 "/home/jens/Source/shotwell/src/Application.vala" _tmp2_ = _tmp1_; #line 225 "/home/jens/Source/shotwell/src/Application.vala" - _tmp3_ = what; -#line 225 "/home/jens/Source/shotwell/src/Application.vala" - _tmp4_ = reason; -#line 225 "/home/jens/Source/shotwell/src/Application.vala" - _tmp5_ = gtk_application_inhibit (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow), _tmp3_, _tmp4_); -#line 225 "/home/jens/Source/shotwell/src/Application.vala" - _tmp6_ = _tmp5_; + _tmp3_ = gtk_application_inhibit (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow), what, reason); #line 225 "/home/jens/Source/shotwell/src/Application.vala" _g_object_unref0 (_tmp2_); #line 225 "/home/jens/Source/shotwell/src/Application.vala" - result = _tmp6_; + result = _tmp3_; #line 225 "/home/jens/Source/shotwell/src/Application.vala" return result; -#line 947 "Application.c" +#line 977 "Application.c" } @@ -951,22 +981,24 @@ guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, c * @brief Turns off a previously-requested inhibition. Wrapper for * Gtk.Application.uninhibit(). */ -void application_uninhibit (Application* self, guint cookie) { +void +application_uninhibit (Application* self, + guint cookie) +{ GtkApplication* _tmp0_; - guint _tmp1_; #line 232 "/home/jens/Source/shotwell/src/Application.vala" g_return_if_fail (IS_APPLICATION (self)); #line 233 "/home/jens/Source/shotwell/src/Application.vala" _tmp0_ = self->priv->system_app; #line 233 "/home/jens/Source/shotwell/src/Application.vala" - _tmp1_ = cookie; -#line 233 "/home/jens/Source/shotwell/src/Application.vala" - gtk_application_uninhibit (_tmp0_, _tmp1_); -#line 966 "Application.c" + gtk_application_uninhibit (_tmp0_, cookie); +#line 996 "Application.c" } -gint application_get_run_return_value (Application* self) { +gint +application_get_run_return_value (Application* self) +{ gint result = 0; gint _tmp0_; #line 236 "/home/jens/Source/shotwell/src/Application.vala" @@ -977,120 +1009,152 @@ gint application_get_run_return_value (Application* self) { result = _tmp0_; #line 237 "/home/jens/Source/shotwell/src/Application.vala" return result; -#line 981 "Application.c" +#line 1013 "Application.c" } -static void application_real_starting (Application* self) { +static void +application_real_starting (Application* self) +{ } -static void application_real_exiting (Application* self, gboolean panicked) { +static void +application_real_exiting (Application* self, + gboolean panicked) +{ } -static void application_real_init_done (Application* self) { +static void +application_real_init_done (Application* self) +{ } -static void value_application_init (GValue* value) { +static void +value_application_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/Application.vala" value->data[0].v_pointer = NULL; -#line 1000 "Application.c" +#line 1041 "Application.c" } -static void value_application_free_value (GValue* value) { +static void +value_application_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/Application.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/Application.vala" application_unref (value->data[0].v_pointer); -#line 1009 "Application.c" +#line 1052 "Application.c" } } -static void value_application_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_application_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/Application.vala" if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/Application.vala" dest_value->data[0].v_pointer = application_ref (src_value->data[0].v_pointer); -#line 1019 "Application.c" +#line 1065 "Application.c" } else { #line 7 "/home/jens/Source/shotwell/src/Application.vala" dest_value->data[0].v_pointer = NULL; -#line 1023 "Application.c" +#line 1069 "Application.c" } } -static gpointer value_application_peek_pointer (const GValue* value) { +static gpointer +value_application_peek_pointer (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/Application.vala" return value->data[0].v_pointer; -#line 1031 "Application.c" +#line 1079 "Application.c" } -static gchar* value_application_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_application_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 7 "/home/jens/Source/shotwell/src/Application.vala" if (collect_values[0].v_pointer) { -#line 1038 "Application.c" +#line 1091 "Application.c" Application * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/Application.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/Application.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1045 "Application.c" +#line 1098 "Application.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/Application.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1049 "Application.c" +#line 1102 "Application.c" } #line 7 "/home/jens/Source/shotwell/src/Application.vala" value->data[0].v_pointer = application_ref (object); -#line 1053 "Application.c" +#line 1106 "Application.c" } else { #line 7 "/home/jens/Source/shotwell/src/Application.vala" value->data[0].v_pointer = NULL; -#line 1057 "Application.c" +#line 1110 "Application.c" } #line 7 "/home/jens/Source/shotwell/src/Application.vala" return NULL; -#line 1061 "Application.c" +#line 1114 "Application.c" } -static gchar* value_application_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_application_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ Application ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/Application.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/Application.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1072 "Application.c" +#line 1130 "Application.c" } #line 7 "/home/jens/Source/shotwell/src/Application.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/Application.vala" *object_p = NULL; -#line 1078 "Application.c" +#line 1136 "Application.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/Application.vala" *object_p = value->data[0].v_pointer; -#line 1082 "Application.c" +#line 1140 "Application.c" } else { #line 7 "/home/jens/Source/shotwell/src/Application.vala" *object_p = application_ref (value->data[0].v_pointer); -#line 1086 "Application.c" +#line 1144 "Application.c" } #line 7 "/home/jens/Source/shotwell/src/Application.vala" return NULL; -#line 1090 "Application.c" +#line 1148 "Application.c" } -GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_application (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecApplication* spec; #line 7 "/home/jens/Source/shotwell/src/Application.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_APPLICATION), NULL); @@ -1100,20 +1164,25 @@ GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/Application.vala" return G_PARAM_SPEC (spec); -#line 1104 "Application.c" +#line 1168 "Application.c" } -gpointer value_get_application (const GValue* value) { +gpointer +value_get_application (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/Application.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APPLICATION), NULL); #line 7 "/home/jens/Source/shotwell/src/Application.vala" return value->data[0].v_pointer; -#line 1113 "Application.c" +#line 1179 "Application.c" } -void value_set_application (GValue* value, gpointer v_object) { +void +value_set_application (GValue* value, + gpointer v_object) +{ Application * old; #line 7 "/home/jens/Source/shotwell/src/Application.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APPLICATION)); @@ -1129,22 +1198,25 @@ void value_set_application (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/Application.vala" application_ref (value->data[0].v_pointer); -#line 1133 "Application.c" +#line 1202 "Application.c" } else { #line 7 "/home/jens/Source/shotwell/src/Application.vala" value->data[0].v_pointer = NULL; -#line 1137 "Application.c" +#line 1206 "Application.c" } #line 7 "/home/jens/Source/shotwell/src/Application.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/Application.vala" application_unref (old); -#line 1143 "Application.c" +#line 1212 "Application.c" } } -void value_take_application (GValue* value, gpointer v_object) { +void +value_take_application (GValue* value, + gpointer v_object) +{ Application * old; #line 7 "/home/jens/Source/shotwell/src/Application.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APPLICATION)); @@ -1158,22 +1230,24 @@ void value_take_application (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/Application.vala" value->data[0].v_pointer = v_object; -#line 1162 "Application.c" +#line 1234 "Application.c" } else { #line 7 "/home/jens/Source/shotwell/src/Application.vala" value->data[0].v_pointer = NULL; -#line 1166 "Application.c" +#line 1238 "Application.c" } #line 7 "/home/jens/Source/shotwell/src/Application.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/Application.vala" application_unref (old); -#line 1172 "Application.c" +#line 1244 "Application.c" } } -static void application_class_init (ApplicationClass * klass) { +static void +application_class_init (ApplicationClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/Application.vala" application_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/Application.vala" @@ -1192,11 +1266,13 @@ static void application_class_init (ApplicationClass * klass) { application_signals[APPLICATION_EXITING_SIGNAL] = g_signal_new ("exiting", TYPE_APPLICATION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ApplicationClass, exiting), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); #line 7 "/home/jens/Source/shotwell/src/Application.vala" application_signals[APPLICATION_INIT_DONE_SIGNAL] = g_signal_new ("init-done", TYPE_APPLICATION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ApplicationClass, init_done), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 1196 "Application.c" +#line 1270 "Application.c" } -static void application_instance_init (Application * self) { +static void +application_instance_init (Application * self) +{ #line 7 "/home/jens/Source/shotwell/src/Application.vala" self->priv = APPLICATION_GET_PRIVATE (self); #line 9 "/home/jens/Source/shotwell/src/Application.vala" @@ -1211,11 +1287,13 @@ static void application_instance_init (Application * self) { self->priv->exiting_fired = FALSE; #line 7 "/home/jens/Source/shotwell/src/Application.vala" self->ref_count = 1; -#line 1215 "Application.c" +#line 1291 "Application.c" } -static void application_finalize (Application * obj) { +static void +application_finalize (Application * obj) +{ Application * self; #line 7 "/home/jens/Source/shotwell/src/Application.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_APPLICATION, Application); @@ -1223,11 +1301,13 @@ static void application_finalize (Application * obj) { g_signal_handlers_destroy (self); #line 9 "/home/jens/Source/shotwell/src/Application.vala" _g_object_unref0 (self->priv->system_app); -#line 1227 "Application.c" +#line 1305 "Application.c" } -GType application_get_type (void) { +GType +application_get_type (void) +{ static volatile gsize application_type_id__volatile = 0; if (g_once_init_enter (&application_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_application_init, value_application_free_value, value_application_copy_value, value_application_peek_pointer, "p", value_application_collect_value, "p", value_application_lcopy_value }; @@ -1241,18 +1321,22 @@ GType application_get_type (void) { } -gpointer application_ref (gpointer instance) { +gpointer +application_ref (gpointer instance) +{ Application * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/Application.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/Application.vala" return instance; -#line 1252 "Application.c" +#line 1334 "Application.c" } -void application_unref (gpointer instance) { +void +application_unref (gpointer instance) +{ Application * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/Application.vala" @@ -1261,12 +1345,16 @@ void application_unref (gpointer instance) { APPLICATION_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/Application.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1265 "Application.c" +#line 1349 "Application.c" } } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -1278,7 +1366,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/BatchImport.c b/src/BatchImport.c index 3ee9b44..8ee3b4f 100644 --- a/src/BatchImport.c +++ b/src/BatchImport.c @@ -1,4 +1,4 @@ -/* BatchImport.c generated by valac 0.36.6, the Vala compiler +/* BatchImport.c generated by valac 0.40.4, the Vala compiler * generated from BatchImport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -192,6 +193,11 @@ typedef struct _PreparedFileClass PreparedFileClass; typedef struct _CompletedImportObject CompletedImportObject; typedef struct _CompletedImportObjectClass CompletedImportObjectClass; +enum { + BATCH_IMPORT_0_PROPERTY, + BATCH_IMPORT_NUM_PROPERTIES +}; +static GParamSpec* batch_import_properties[BATCH_IMPORT_NUM_PROPERTIES]; #define TYPE_APPLICATION (application_get_type ()) #define APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APPLICATION, Application)) @@ -681,10 +687,15 @@ enum { BATCH_IMPORT_FATAL_ERROR_SIGNAL, BATCH_IMPORT_IMPORT_JOB_FAILED_SIGNAL, BATCH_IMPORT_IMPORT_COMPLETE_SIGNAL, - BATCH_IMPORT_LAST_SIGNAL + BATCH_IMPORT_NUM_SIGNALS }; -static guint batch_import_signals[BATCH_IMPORT_LAST_SIGNAL] = {0}; +static guint batch_import_signals[BATCH_IMPORT_NUM_SIGNALS] = {0}; typedef struct _DuplicatedFilePrivate DuplicatedFilePrivate; +enum { + DUPLICATED_FILE_0_PROPERTY, + DUPLICATED_FILE_NUM_PROPERTIES +}; +static GParamSpec* duplicated_file_properties[DUPLICATED_FILE_NUM_PROPERTIES]; #define _video_id_free0(var) ((var == NULL) ? NULL : (var = (video_id_free (var), NULL))) #define _photo_id_free0(var) ((var == NULL) ? NULL : (var = (photo_id_free (var), NULL))) @@ -1122,304 +1133,299 @@ struct _BatchImportProcessPreparedFilesData { GeeList* list; GeeList* _prepared_file_list; GeeList* _tmp0_; - GeeList* _tmp1_; gint _prepared_file_size; - GeeList* _tmp2_; + GeeList* _tmp1_; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; gint _prepared_file_index; + gint _tmp4_; gint _tmp5_; gint _tmp6_; - gint _tmp7_; PreparedFile* prepared_file; - GeeList* _tmp8_; - gint _tmp9_; - gpointer _tmp10_; + GeeList* _tmp7_; + gint _tmp8_; + gpointer _tmp9_; BatchImportResult* import_result; LibraryPhotoSourceCollectionState photo_state; LibraryPhoto* photo; - LibraryPhotoSourceCollection* _tmp11_; - PreparedFile* _tmp12_; - GFile* _tmp13_; - LibraryPhotoSourceCollectionState _tmp14_; + LibraryPhotoSourceCollection* _tmp10_; + PreparedFile* _tmp11_; + GFile* _tmp12_; + LibraryPhotoSourceCollectionState _tmp13_; + LibraryPhoto* _tmp14_; LibraryPhoto* _tmp15_; - LibraryPhoto* _tmp16_; - LibraryPhotoSourceCollectionState _tmp17_; - PreparedFile* _tmp18_; - BatchImportJob* _tmp19_; - PreparedFile* _tmp20_; - GFile* _tmp21_; - PreparedFile* _tmp22_; - GFile* _tmp23_; + LibraryPhotoSourceCollectionState _tmp16_; + PreparedFile* _tmp17_; + BatchImportJob* _tmp18_; + PreparedFile* _tmp19_; + GFile* _tmp20_; + PreparedFile* _tmp21_; + GFile* _tmp22_; + gchar* _tmp23_; gchar* _tmp24_; - gchar* _tmp25_; - PreparedFile* _tmp26_; - GFile* _tmp27_; + PreparedFile* _tmp25_; + GFile* _tmp26_; + gchar* _tmp27_; gchar* _tmp28_; - gchar* _tmp29_; - LibraryPhoto* _tmp30_; + LibraryPhoto* _tmp29_; + GFile* _tmp30_; GFile* _tmp31_; - GFile* _tmp32_; + DuplicatedFile* _tmp32_; DuplicatedFile* _tmp33_; - DuplicatedFile* _tmp34_; - BatchImportResult* _tmp35_; - LibraryPhotoSourceCollectionState _tmp36_; - LibraryPhoto* _tmp37_; - LibraryPhotoSourceCollectionState _tmp38_; - GEnumValue* _tmp39_; + BatchImportResult* _tmp34_; + LibraryPhotoSourceCollectionState _tmp35_; + LibraryPhoto* _tmp36_; + LibraryPhotoSourceCollectionState _tmp37_; + GEnumValue* _tmp38_; + BatchImportResult* _tmp39_; BatchImportResult* _tmp40_; - BatchImportResult* _tmp41_; VideoSourceCollectionState video_state; Video* video; - VideoSourceCollection* _tmp42_; - PreparedFile* _tmp43_; - GFile* _tmp44_; - VideoSourceCollectionState _tmp45_; + VideoSourceCollection* _tmp41_; + PreparedFile* _tmp42_; + GFile* _tmp43_; + VideoSourceCollectionState _tmp44_; + Video* _tmp45_; Video* _tmp46_; - Video* _tmp47_; - VideoSourceCollectionState _tmp48_; - PreparedFile* _tmp49_; - BatchImportJob* _tmp50_; - PreparedFile* _tmp51_; - GFile* _tmp52_; - PreparedFile* _tmp53_; - GFile* _tmp54_; + VideoSourceCollectionState _tmp47_; + PreparedFile* _tmp48_; + BatchImportJob* _tmp49_; + PreparedFile* _tmp50_; + GFile* _tmp51_; + PreparedFile* _tmp52_; + GFile* _tmp53_; + gchar* _tmp54_; gchar* _tmp55_; - gchar* _tmp56_; - PreparedFile* _tmp57_; - GFile* _tmp58_; + PreparedFile* _tmp56_; + GFile* _tmp57_; + gchar* _tmp58_; gchar* _tmp59_; - gchar* _tmp60_; - Video* _tmp61_; + Video* _tmp60_; + GFile* _tmp61_; GFile* _tmp62_; - GFile* _tmp63_; + DuplicatedFile* _tmp63_; DuplicatedFile* _tmp64_; - DuplicatedFile* _tmp65_; - BatchImportResult* _tmp66_; - VideoSourceCollectionState _tmp67_; - Video* _tmp68_; - VideoSourceCollectionState _tmp69_; - GEnumValue* _tmp70_; + BatchImportResult* _tmp65_; + VideoSourceCollectionState _tmp66_; + Video* _tmp67_; + VideoSourceCollectionState _tmp68_; + GEnumValue* _tmp69_; + BatchImportResult* _tmp70_; BatchImportResult* _tmp71_; - BatchImportResult* _tmp72_; - gboolean _tmp73_; - PreparedFile* _tmp74_; - gboolean _tmp75_; - PreparedFile* _tmp76_; - GFile* _tmp77_; - PreparedFile* _tmp78_; - const gchar* _tmp79_; - gboolean _tmp80_; + gboolean _tmp72_; + PreparedFile* _tmp73_; + gboolean _tmp74_; + PreparedFile* _tmp75_; + GFile* _tmp76_; + PreparedFile* _tmp77_; + const gchar* _tmp78_; VideoID* duplicate_ids; - VideoTable* _tmp81_; - VideoTable* _tmp82_; + VideoTable* _tmp79_; + VideoTable* _tmp80_; + PreparedFile* _tmp81_; + GFile* _tmp82_; PreparedFile* _tmp83_; - GFile* _tmp84_; - PreparedFile* _tmp85_; - const gchar* _tmp86_; - gint _tmp87_; - VideoID* _tmp88_; - VideoID* _tmp89_; - gint _tmp89__length1; + const gchar* _tmp84_; + gint _tmp85_; + VideoID* _tmp86_; + VideoID* _tmp87_; + gint _tmp87__length1; gint duplicate_ids_length1; gint _duplicate_ids_size_; - VideoID* _tmp90_; - gint _tmp90__length1; + VideoID* _tmp88_; + gint _tmp88__length1; DuplicatedFile* duplicated_file; - VideoID* _tmp91_; - gint _tmp91__length1; - VideoID _tmp92_; - DuplicatedFile* _tmp93_; + VideoID* _tmp89_; + gint _tmp89__length1; + VideoID _tmp90_; + DuplicatedFile* _tmp91_; ImportResult result_code; - gboolean _tmp94_; + gboolean _tmp92_; Video* dupe_video; - VideoSourceCollection* _tmp95_; - MediaSourceHoldingTank* _tmp96_; - MediaSourceHoldingTank* _tmp97_; - PreparedFile* _tmp98_; - GFile* _tmp99_; - MediaSource* _tmp100_; - Video* _tmp101_; - Video* _tmp102_; - VideoSourceCollection* _tmp103_; - MediaSourceHoldingTank* _tmp104_; - MediaSourceHoldingTank* _tmp105_; - PreparedFile* _tmp106_; - const gchar* _tmp107_; - MediaSource* _tmp108_; - Video* _tmp109_; - PreparedFile* _tmp110_; - GFile* _tmp111_; - gchar* _tmp112_; - gchar* _tmp113_; - Video* _tmp114_; - PreparedFile* _tmp115_; - GFile* _tmp116_; - Video* _tmp117_; - ImportManifest* _tmp118_; - GeeList* _tmp119_; - Video* _tmp120_; - Video* _tmp121_; - guint64 _tmp122_; - PreparedFile* _tmp123_; - BatchImportJob* _tmp124_; - PreparedFile* _tmp125_; - GFile* _tmp126_; - PreparedFile* _tmp127_; - GFile* _tmp128_; - gchar* _tmp129_; + VideoSourceCollection* _tmp93_; + MediaSourceHoldingTank* _tmp94_; + MediaSourceHoldingTank* _tmp95_; + PreparedFile* _tmp96_; + GFile* _tmp97_; + MediaSource* _tmp98_; + Video* _tmp99_; + Video* _tmp100_; + VideoSourceCollection* _tmp101_; + MediaSourceHoldingTank* _tmp102_; + MediaSourceHoldingTank* _tmp103_; + PreparedFile* _tmp104_; + const gchar* _tmp105_; + MediaSource* _tmp106_; + Video* _tmp107_; + PreparedFile* _tmp108_; + GFile* _tmp109_; + gchar* _tmp110_; + gchar* _tmp111_; + Video* _tmp112_; + PreparedFile* _tmp113_; + GFile* _tmp114_; + Video* _tmp115_; + ImportManifest* _tmp116_; + GeeList* _tmp117_; + Video* _tmp118_; + Video* _tmp119_; + PreparedFile* _tmp120_; + BatchImportJob* _tmp121_; + PreparedFile* _tmp122_; + GFile* _tmp123_; + PreparedFile* _tmp124_; + GFile* _tmp125_; + gchar* _tmp126_; + gchar* _tmp127_; + PreparedFile* _tmp128_; + GFile* _tmp129_; gchar* _tmp130_; - PreparedFile* _tmp131_; - GFile* _tmp132_; - gchar* _tmp133_; - gchar* _tmp134_; - DuplicatedFile* _tmp135_; - ImportResult _tmp136_; + gchar* _tmp131_; + DuplicatedFile* _tmp132_; + ImportResult _tmp133_; + BatchImportResult* _tmp134_; + ImportResult _tmp135_; + ImportManifest* _tmp136_; BatchImportResult* _tmp137_; - ImportResult _tmp138_; - ImportManifest* _tmp139_; - BatchImportResult* _tmp140_; - PreparedFile* _tmp141_; - GFile* _tmp142_; - GFile* _tmp143_; - gboolean _tmp144_; - PreparedFile* _tmp145_; - BatchImportJob* _tmp146_; - PreparedFile* _tmp147_; - GFile* _tmp148_; - PreparedFile* _tmp149_; - GFile* _tmp150_; - gchar* _tmp151_; + PreparedFile* _tmp138_; + GFile* _tmp139_; + GFile* _tmp140_; + gboolean _tmp141_; + PreparedFile* _tmp142_; + BatchImportJob* _tmp143_; + PreparedFile* _tmp144_; + GFile* _tmp145_; + PreparedFile* _tmp146_; + GFile* _tmp147_; + gchar* _tmp148_; + gchar* _tmp149_; + PreparedFile* _tmp150_; + GFile* _tmp151_; gchar* _tmp152_; - PreparedFile* _tmp153_; - GFile* _tmp154_; - gchar* _tmp155_; - gchar* _tmp156_; - PreparedFile* _tmp157_; - GFile* _tmp158_; - GFile* _tmp159_; - DuplicatedFile* _tmp160_; - DuplicatedFile* _tmp161_; - BatchImportResult* _tmp162_; - PreparedFile* _tmp163_; - GFile* _tmp164_; - PreparedFile* _tmp165_; - const gchar* _tmp166_; - PreparedFile* _tmp167_; - PhotoFileFormat _tmp168_; - gboolean _tmp169_; - gboolean _tmp170_; - LibraryPhotoSourceCollection* _tmp171_; - PreparedFile* _tmp172_; - GFile* _tmp173_; - LibraryPhoto* _tmp174_; - gboolean _tmp175_; - LibraryPhoto* _tmp176_; - PreparedFile* _tmp177_; - const gchar* _tmp178_; - LibraryPhotoSourceCollection* _tmp179_; + gchar* _tmp153_; + PreparedFile* _tmp154_; + GFile* _tmp155_; + GFile* _tmp156_; + DuplicatedFile* _tmp157_; + DuplicatedFile* _tmp158_; + BatchImportResult* _tmp159_; + PreparedFile* _tmp160_; + GFile* _tmp161_; + PreparedFile* _tmp162_; + const gchar* _tmp163_; + PreparedFile* _tmp164_; + PhotoFileFormat _tmp165_; + gboolean _tmp166_; + LibraryPhotoSourceCollection* _tmp167_; + PreparedFile* _tmp168_; + GFile* _tmp169_; + LibraryPhoto* _tmp170_; + gboolean _tmp171_; + LibraryPhoto* _tmp172_; + PreparedFile* _tmp173_; + const gchar* _tmp174_; + LibraryPhotoSourceCollection* _tmp175_; + PreparedFile* _tmp176_; + const gchar* _tmp177_; + LibraryPhoto* _tmp178_; + LibraryPhoto* _tmp179_; PreparedFile* _tmp180_; - const gchar* _tmp181_; - LibraryPhoto* _tmp182_; - LibraryPhoto* _tmp183_; - PreparedFile* _tmp184_; - GFile* _tmp185_; - gchar* _tmp186_; - gchar* _tmp187_; + GFile* _tmp181_; + gchar* _tmp182_; + gchar* _tmp183_; + LibraryPhoto* _tmp184_; + PreparedFile* _tmp185_; + GFile* _tmp186_; + LibraryPhoto* _tmp187_; LibraryPhoto* _tmp188_; - PreparedFile* _tmp189_; - GFile* _tmp190_; - LibraryPhoto* _tmp191_; - LibraryPhoto* _tmp192_; - gboolean _tmp193_; - LibraryPhoto* _tmp194_; - gboolean _tmp195_; - LibraryPhotoSourceCollection* _tmp196_; - PreparedFile* _tmp197_; - GFile* _tmp198_; - LibraryPhoto* _tmp199_; - gboolean _tmp200_; - LibraryPhoto* _tmp201_; - PreparedFile* _tmp202_; - const gchar* _tmp203_; - LibraryPhotoSourceCollection* _tmp204_; + gboolean _tmp189_; + LibraryPhoto* _tmp190_; + gboolean _tmp191_; + LibraryPhotoSourceCollection* _tmp192_; + PreparedFile* _tmp193_; + GFile* _tmp194_; + LibraryPhoto* _tmp195_; + gboolean _tmp196_; + LibraryPhoto* _tmp197_; + PreparedFile* _tmp198_; + const gchar* _tmp199_; + LibraryPhotoSourceCollection* _tmp200_; + PreparedFile* _tmp201_; + const gchar* _tmp202_; + LibraryPhoto* _tmp203_; + LibraryPhoto* _tmp204_; PreparedFile* _tmp205_; - const gchar* _tmp206_; - LibraryPhoto* _tmp207_; - LibraryPhoto* _tmp208_; - PreparedFile* _tmp209_; - GFile* _tmp210_; - gchar* _tmp211_; - gchar* _tmp212_; + GFile* _tmp206_; + gchar* _tmp207_; + gchar* _tmp208_; + LibraryPhoto* _tmp209_; + PreparedFile* _tmp210_; + GFile* _tmp211_; + LibraryPhoto* _tmp212_; LibraryPhoto* _tmp213_; PreparedFile* _tmp214_; - GFile* _tmp215_; - LibraryPhoto* _tmp216_; - LibraryPhoto* _tmp217_; + BatchImportJob* _tmp215_; + PreparedFile* _tmp216_; + GFile* _tmp217_; PreparedFile* _tmp218_; - BatchImportJob* _tmp219_; - PreparedFile* _tmp220_; - GFile* _tmp221_; + GFile* _tmp219_; + gchar* _tmp220_; + gchar* _tmp221_; PreparedFile* _tmp222_; GFile* _tmp223_; gchar* _tmp224_; gchar* _tmp225_; - PreparedFile* _tmp226_; - GFile* _tmp227_; - gchar* _tmp228_; - gchar* _tmp229_; - BatchImportResult* _tmp230_; - ImportManifest* _tmp231_; - GeeList* _tmp232_; - LibraryPhoto* _tmp233_; - ImportManifest* _tmp234_; - BatchImportResult* _tmp235_; - LibraryPhoto* _tmp236_; - guint64 _tmp237_; - PreparedFile* _tmp238_; - GFile* _tmp239_; - gchar* _tmp240_; - gchar* _tmp241_; + BatchImportResult* _tmp226_; + ImportManifest* _tmp227_; + GeeList* _tmp228_; + LibraryPhoto* _tmp229_; + ImportManifest* _tmp230_; + BatchImportResult* _tmp231_; + LibraryPhoto* _tmp232_; + PreparedFile* _tmp233_; + GFile* _tmp234_; + gchar* _tmp235_; + gchar* _tmp236_; PhotoID* photo_ids; - PhotoTable* _tmp242_; - PhotoTable* _tmp243_; - PreparedFile* _tmp244_; - GFile* _tmp245_; - PreparedFile* _tmp246_; - const gchar* _tmp247_; - PreparedFile* _tmp248_; - PhotoFileFormat _tmp249_; - gint _tmp250_; - PhotoID* _tmp251_; - PhotoID* _tmp252_; - gint _tmp252__length1; + PhotoTable* _tmp237_; + PhotoTable* _tmp238_; + PreparedFile* _tmp239_; + GFile* _tmp240_; + PreparedFile* _tmp241_; + const gchar* _tmp242_; + PreparedFile* _tmp243_; + PhotoFileFormat _tmp244_; + gint _tmp245_; + PhotoID* _tmp246_; + PhotoID* _tmp247_; + gint _tmp247__length1; gint photo_ids_length1; gint _photo_ids_size_; - PhotoID* _tmp253_; - gint _tmp253__length1; + PhotoID* _tmp248_; + gint _tmp248__length1; DuplicatedFile* _vala1_duplicated_file; - PhotoID* _tmp254_; - gint _tmp254__length1; - PhotoID _tmp255_; - DuplicatedFile* _tmp256_; - PreparedFile* _tmp257_; - BatchImportJob* _tmp258_; - PreparedFile* _tmp259_; - GFile* _tmp260_; - PreparedFile* _tmp261_; - GFile* _tmp262_; + PhotoID* _tmp249_; + gint _tmp249__length1; + PhotoID _tmp250_; + DuplicatedFile* _tmp251_; + PreparedFile* _tmp252_; + BatchImportJob* _tmp253_; + PreparedFile* _tmp254_; + GFile* _tmp255_; + PreparedFile* _tmp256_; + GFile* _tmp257_; + gchar* _tmp258_; + gchar* _tmp259_; + PreparedFile* _tmp260_; + GFile* _tmp261_; + gchar* _tmp262_; gchar* _tmp263_; - gchar* _tmp264_; - PreparedFile* _tmp265_; - GFile* _tmp266_; - gchar* _tmp267_; - gchar* _tmp268_; - DuplicatedFile* _tmp269_; - BatchImportResult* _tmp270_; - BatchImportResult* _tmp271_; - BatchImportResult* _tmp272_; - GeeList* _tmp273_; - PreparedFile* _tmp274_; + DuplicatedFile* _tmp264_; + BatchImportResult* _tmp265_; + BatchImportResult* _tmp266_; + BatchImportResult* _tmp267_; + GeeList* _tmp268_; + PreparedFile* _tmp269_; }; struct _PrepareFilesJob { @@ -1681,13 +1687,20 @@ GType import_result_get_type (void) G_GNUC_CONST; gchar* import_result_to_string (ImportResult self); gboolean import_result_is_abort (ImportResult self); gboolean import_result_is_nonuser_abort (ImportResult self); -ImportResult import_result_convert_error (GError* err, ImportResult default_result); +ImportResult import_result_convert_error (GError* err, + ImportResult default_result); GQuark gphoto_error_quark (void); gpointer batch_import_job_ref (gpointer instance); void batch_import_job_unref (gpointer instance); -GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_job (GValue* value, gpointer v_object); -void value_take_batch_import_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_job (GValue* value, + gpointer v_object); +void value_take_batch_import_job (GValue* value, + gpointer v_object); gpointer value_get_batch_import_job (const GValue* value); GType batch_import_job_get_type (void) G_GNUC_CONST; GType duplicated_file_get_type (void) G_GNUC_CONST; @@ -1697,14 +1710,17 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; gpointer batch_import_roll_ref (gpointer instance); void batch_import_roll_unref (gpointer instance); -GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_roll (GValue* value, gpointer v_object); -void value_take_batch_import_roll (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_roll (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_roll (GValue* value, + gpointer v_object); +void value_take_batch_import_roll (GValue* value, + gpointer v_object); gpointer value_get_batch_import_roll (const GValue* value); GType batch_import_roll_get_type (void) G_GNUC_CONST; -enum { - BATCH_IMPORT_JOB_DUMMY_PROPERTY -}; gchar* batch_import_job_get_dest_identifier (BatchImportJob* self); static gchar* batch_import_job_real_get_dest_identifier (BatchImportJob* self); gchar* batch_import_job_get_source_identifier (BatchImportJob* self); @@ -1719,14 +1735,32 @@ DuplicatedFile* batch_import_job_get_duplicated_file (BatchImportJob* self); static DuplicatedFile* batch_import_job_real_get_duplicated_file (BatchImportJob* self); GFile* batch_import_job_get_associated_file (BatchImportJob* self); static GFile* batch_import_job_real_get_associated_file (BatchImportJob* self); -void batch_import_job_set_associated (BatchImportJob* self, BatchImportJob* associated); -static void batch_import_job_real_set_associated (BatchImportJob* self, BatchImportJob* associated); -gboolean batch_import_job_determine_file_size (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir); -static gboolean batch_import_job_real_determine_file_size (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir); -gboolean batch_import_job_prepare (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error); -static gboolean batch_import_job_real_prepare (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error); -gboolean batch_import_job_complete (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error); -static gboolean batch_import_job_real_complete (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error); +void batch_import_job_set_associated (BatchImportJob* self, + BatchImportJob* associated); +static void batch_import_job_real_set_associated (BatchImportJob* self, + BatchImportJob* associated); +gboolean batch_import_job_determine_file_size (BatchImportJob* self, + guint64* filesize, + GFile* * file_or_dir); +static gboolean batch_import_job_real_determine_file_size (BatchImportJob* self, + guint64* filesize, + GFile* * file_or_dir); +gboolean batch_import_job_prepare (BatchImportJob* self, + GFile* * file_to_import, + gboolean* copy_to_library, + GError** error); +static gboolean batch_import_job_real_prepare (BatchImportJob* self, + GFile* * file_to_import, + gboolean* copy_to_library, + GError** error); +gboolean batch_import_job_complete (BatchImportJob* self, + MediaSource* source, + BatchImportRoll* import_roll, + GError** error); +static gboolean batch_import_job_real_complete (BatchImportJob* self, + MediaSource* source, + BatchImportRoll* import_roll, + GError** error); time_t batch_import_job_get_exposure_time_override (BatchImportJob* self); static time_t batch_import_job_real_get_exposure_time_override (BatchImportJob* self); gboolean batch_import_job_recurse (BatchImportJob* self); @@ -1735,20 +1769,28 @@ BatchImportJob* batch_import_job_construct (GType object_type); static void batch_import_job_finalize (BatchImportJob * obj); GType file_import_job_get_type (void) G_GNUC_CONST; #define FILE_IMPORT_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_FILE_IMPORT_JOB, FileImportJobPrivate)) -enum { - FILE_IMPORT_JOB_DUMMY_PROPERTY -}; -FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library, gboolean recurse); -FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library, gboolean recurse); +FileImportJob* file_import_job_new (GFile* file_or_dir, + gboolean copy_to_library, + gboolean recurse); +FileImportJob* file_import_job_construct (GType object_type, + GFile* file_or_dir, + gboolean copy_to_library, + gboolean recurse); static gchar* file_import_job_real_get_dest_identifier (BatchImportJob* base); static gchar* file_import_job_real_get_source_identifier (BatchImportJob* base); static gboolean file_import_job_real_is_directory (BatchImportJob* base); gboolean query_is_directory (GFile* file); static gchar* file_import_job_real_get_basename (BatchImportJob* base); static gchar* file_import_job_real_get_path (BatchImportJob* base); -static void file_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated); -static gboolean file_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file); -static gboolean file_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy, GError** error); +static void file_import_job_real_set_associated (BatchImportJob* base, + BatchImportJob* associated); +static gboolean file_import_job_real_determine_file_size (BatchImportJob* base, + guint64* filesize, + GFile* * file); +static gboolean file_import_job_real_prepare (BatchImportJob* base, + GFile* * file_to_import, + gboolean* copy, + GError** error); GFile* file_import_job_get_file (FileImportJob* self); static gboolean file_import_job_real_recurse (BatchImportJob* base); static void file_import_job_finalize (BatchImportJob * obj); @@ -1757,88 +1799,150 @@ ImportID* import_id_dup (const ImportID* self); void import_id_free (ImportID* self); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; -enum { - BATCH_IMPORT_ROLL_DUMMY_PROPERTY -}; ViewCollection* view_collection_new (const gchar* name); -ViewCollection* view_collection_construct (GType object_type, const gchar* name); +ViewCollection* view_collection_construct (GType object_type, + const gchar* name); BatchImportRoll* batch_import_roll_new (void); BatchImportRoll* batch_import_roll_construct (GType object_type); void import_id_generate (ImportID* result); static void batch_import_roll_finalize (BatchImportRoll * obj); gpointer batch_import_result_ref (gpointer instance); void batch_import_result_unref (gpointer instance); -GParamSpec* param_spec_batch_import_result (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_result (GValue* value, gpointer v_object); -void value_take_batch_import_result (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_result (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_result (GValue* value, + gpointer v_object); +void value_take_batch_import_result (GValue* value, + gpointer v_object); gpointer value_get_batch_import_result (const GValue* value); GType batch_import_result_get_type (void) G_GNUC_CONST; -enum { - BATCH_IMPORT_RESULT_DUMMY_PROPERTY -}; -BatchImportResult* batch_import_result_new (BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, DuplicatedFile* duplicate_of, ImportResult _result_); -BatchImportResult* batch_import_result_construct (GType object_type, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, DuplicatedFile* duplicate_of, ImportResult _result_); -BatchImportResult* batch_import_result_new_from_error (BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result); -BatchImportResult* batch_import_result_construct_from_error (GType object_type, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result); +BatchImportResult* batch_import_result_new (BatchImportJob* job, + GFile* file, + const gchar* src_identifier, + const gchar* dest_identifier, + DuplicatedFile* duplicate_of, + ImportResult _result_); +BatchImportResult* batch_import_result_construct (GType object_type, + BatchImportJob* job, + GFile* file, + const gchar* src_identifier, + const gchar* dest_identifier, + DuplicatedFile* duplicate_of, + ImportResult _result_); +BatchImportResult* batch_import_result_new_from_error (BatchImportJob* job, + GFile* file, + const gchar* src_identifier, + const gchar* dest_identifier, + GError* err, + ImportResult default_result); +BatchImportResult* batch_import_result_construct_from_error (GType object_type, + BatchImportJob* job, + GFile* file, + const gchar* src_identifier, + const gchar* dest_identifier, + GError* err, + ImportResult default_result); static void batch_import_result_finalize (BatchImportResult * obj); gpointer import_manifest_ref (gpointer instance); void import_manifest_unref (gpointer instance); -GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_import_manifest (GValue* value, gpointer v_object); -void value_take_import_manifest (GValue* value, gpointer v_object); +GParamSpec* param_spec_import_manifest (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_import_manifest (GValue* value, + gpointer v_object); +void value_take_import_manifest (GValue* value, + gpointer v_object); gpointer value_get_import_manifest (const GValue* value); GType import_manifest_get_type (void) G_GNUC_CONST; -enum { - IMPORT_MANIFEST_DUMMY_PROPERTY -}; -ImportManifest* import_manifest_new (GeeList* prefailed, GeeList* pre_already_imported); -ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed, GeeList* pre_already_imported); -void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_result); +ImportManifest* import_manifest_new (GeeList* prefailed, + GeeList* pre_already_imported); +ImportManifest* import_manifest_construct (GType object_type, + GeeList* prefailed, + GeeList* pre_already_imported); +void import_manifest_add_result (ImportManifest* self, + BatchImportResult* batch_result); static void import_manifest_finalize (ImportManifest * obj); GType batch_import_get_type (void) G_GNUC_CONST; gpointer prepared_file_ref (gpointer instance); void prepared_file_unref (gpointer instance); -GParamSpec* param_spec_prepared_file (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_prepared_file (GValue* value, gpointer v_object); -void value_take_prepared_file (GValue* value, gpointer v_object); +GParamSpec* param_spec_prepared_file (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_prepared_file (GValue* value, + gpointer v_object); +void value_take_prepared_file (GValue* value, + gpointer v_object); gpointer value_get_prepared_file (const GValue* value); GType prepared_file_get_type (void) G_GNUC_CONST; gpointer completed_import_object_ref (gpointer instance); void completed_import_object_unref (gpointer instance); -GParamSpec* param_spec_completed_import_object (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_completed_import_object (GValue* value, gpointer v_object); -void value_take_completed_import_object (GValue* value, gpointer v_object); +GParamSpec* param_spec_completed_import_object (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_completed_import_object (GValue* value, + gpointer v_object); +void value_take_completed_import_object (GValue* value, + gpointer v_object); gpointer value_get_completed_import_object (const GValue* value); GType completed_import_object_get_type (void) G_GNUC_CONST; #define BATCH_IMPORT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_BATCH_IMPORT, BatchImportPrivate)) -enum { - BATCH_IMPORT_DUMMY_PROPERTY -}; gpointer application_ref (gpointer instance); void application_unref (gpointer instance); -GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_application (GValue* value, gpointer v_object); -void value_take_application (GValue* value, gpointer v_object); +GParamSpec* param_spec_application (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_application (GValue* value, + gpointer v_object); +void value_take_application (GValue* value, + gpointer v_object); gpointer value_get_application (const GValue* value); GType application_get_type (void) G_GNUC_CONST; Application* application_get_instance (void); void batch_import_user_halt (BatchImport* self); -static void _batch_import_user_halt_application_exiting (Application* _sender, gboolean panicked, gpointer self); +static void _batch_import_user_halt_application_exiting (Application* _sender, + gboolean panicked, + gpointer self); gpointer workers_ref (gpointer instance); void workers_unref (gpointer instance); -GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_workers (GValue* value, gpointer v_object); -void value_take_workers (GValue* value, gpointer v_object); +GParamSpec* param_spec_workers (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_workers (GValue* value, + gpointer v_object); +void value_take_workers (GValue* value, + gpointer v_object); gpointer value_get_workers (const GValue* value); GType workers_get_type (void) G_GNUC_CONST; -Workers* workers_new (guint max_threads, gboolean exclusive); -Workers* workers_construct (GType object_type, guint max_threads, gboolean exclusive); +Workers* workers_new (guint max_threads, + gboolean exclusive); +Workers* workers_construct (GType object_type, + guint max_threads, + gboolean exclusive); guint workers_thread_per_cpu_minus_one (void); #define BATCH_IMPORT_WORK_SNIFFER_THROBBER_MSEC 125 #define BATCH_IMPORT_REPORT_EVERY_N_PREPARED_FILES 100 @@ -1846,96 +1950,232 @@ guint workers_thread_per_cpu_minus_one (void); #define BATCH_IMPORT_READY_SOURCES_COUNT_OVERFLOW 10 #define BATCH_IMPORT_DISPLAY_QUEUE_TIMER_MSEC 125 #define BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW ((3 * 1000) / BATCH_IMPORT_DISPLAY_QUEUE_TIMER_MSEC) -BatchImport* batch_import_new (GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest); -BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest); +BatchImport* batch_import_new (GeeIterable* jobs, + const gchar* name, + BatchImportImportReporter reporter, + void* reporter_target, + GeeArrayList* prefailed, + GeeArrayList* pre_already_imported, + GCancellable* cancellable, + BatchImportRoll* import_roll, + ImportManifest* skip_manifest); +BatchImport* batch_import_construct (GType object_type, + GeeIterable* jobs, + const gchar* name, + BatchImportImportReporter reporter, + void* reporter_target, + GeeArrayList* prefailed, + GeeArrayList* pre_already_imported, + GCancellable* cancellable, + BatchImportRoll* import_roll, + ImportManifest* skip_manifest); guint file_hash (GFile* file); -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self); -gboolean file_equal (GFile* a, GFile* b); -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); +static guint _file_hash_gee_hash_data_func (gconstpointer v, + gpointer self); +gboolean file_equal (GFile* a, + GFile* b); +static gboolean _file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); GFile* media_source_get_file (MediaSource* self); static gboolean batch_import_display_imported_timer (BatchImport* self); static gboolean _batch_import_display_imported_timer_gsource_func (gpointer self); gchar* batch_import_get_name (BatchImport* self); gboolean batch_import_get_untrash_duplicates (BatchImport* self); -void batch_import_set_untrash_duplicates (BatchImport* self, gboolean untrash_duplicates); +void batch_import_set_untrash_duplicates (BatchImport* self, + gboolean untrash_duplicates); gboolean batch_import_get_mark_duplicates_online (BatchImport* self); -void batch_import_set_mark_duplicates_online (BatchImport* self, gboolean mark_duplicates_online); -static void batch_import_log_status (BatchImport* self, const gchar* where); -static gboolean batch_import_report_failure (BatchImport* self, BatchImportResult* import_result); -guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GError** error); -static void batch_import_report_progress (BatchImport* self, guint64 increment_of_progress); +void batch_import_set_mark_duplicates_online (BatchImport* self, + gboolean mark_duplicates_online); +static void batch_import_log_status (BatchImport* self, + const gchar* where); +static gboolean batch_import_report_failure (BatchImport* self, + BatchImportResult* import_result); +guint64 query_total_file_size (GFile* file_or_dir, + GCancellable* cancellable, + GError** error); +static void batch_import_report_progress (BatchImport* self, + guint64 increment_of_progress); gulong now_ms (void); gpointer background_job_ref (gpointer instance); void background_job_unref (gpointer instance); -GParamSpec* param_spec_background_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_background_job (GValue* value, gpointer v_object); -void value_take_background_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_background_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_background_job (GValue* value, + gpointer v_object); +void value_take_background_job (GValue* value, + gpointer v_object); gpointer value_get_background_job (const GValue* value); GType background_job_get_type (void) G_GNUC_CONST; GType background_import_job_get_type (void) G_GNUC_CONST; -static gboolean batch_import_report_failures (BatchImport* self, BackgroundImportJob* background_job); +static gboolean batch_import_report_failures (BatchImport* self, + BackgroundImportJob* background_job); GType background_job_job_priority_get_type (void) G_GNUC_CONST; -static void batch_import_report_completed (BatchImport* self, const gchar* where); +static void batch_import_report_completed (BatchImport* self, + const gchar* where); static void batch_import_flush_ready_sources (BatchImport* self); static void batch_import_file_import_complete (BatchImport* self); void batch_import_schedule (BatchImport* self); -void workers_enqueue (Workers* self, BackgroundJob* job); -static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob* j); -static void _batch_import_on_work_sniffed_out_completion_callback (BackgroundJob* job, gpointer self); -static void batch_import_on_sniffer_cancelled (BatchImport* self, BackgroundJob* j); -static void _batch_import_on_sniffer_cancelled_cancellation_callback (BackgroundJob* job, gpointer self); -WorkSniffer* work_sniffer_new (BatchImport* owner, GeeIterable* jobs, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, GeeHashSet* skipset); -WorkSniffer* work_sniffer_construct (GType object_type, BatchImport* owner, GeeIterable* jobs, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, GeeHashSet* skipset); +void workers_enqueue (Workers* self, + BackgroundJob* job); +static void batch_import_on_work_sniffed_out (BatchImport* self, + BackgroundJob* j); +static void _batch_import_on_work_sniffed_out_completion_callback (BackgroundJob* job, + gpointer self); +static void batch_import_on_sniffer_cancelled (BatchImport* self, + BackgroundJob* j); +static void _batch_import_on_sniffer_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self); +WorkSniffer* work_sniffer_new (BatchImport* owner, + GeeIterable* jobs, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target, + GeeHashSet* skipset); +WorkSniffer* work_sniffer_construct (GType object_type, + BatchImport* owner, + GeeIterable* jobs, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target, + GeeHashSet* skipset); GType work_sniffer_get_type (void) G_GNUC_CONST; static gboolean batch_import_on_sniffer_working (BatchImport* self); static gboolean _batch_import_on_sniffer_working_gsource_func (gpointer self); gpointer file_to_prepare_ref (gpointer instance); void file_to_prepare_unref (gpointer instance); -GParamSpec* param_spec_file_to_prepare (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_file_to_prepare (GValue* value, gpointer v_object); -void value_take_file_to_prepare (GValue* value, gpointer v_object); +GParamSpec* param_spec_file_to_prepare (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_file_to_prepare (GValue* value, + gpointer v_object); +void value_take_file_to_prepare (GValue* value, + gpointer v_object); gpointer value_get_file_to_prepare (const GValue* value); GType file_to_prepare_get_type (void) G_GNUC_CONST; GType prepare_files_job_get_type (void) G_GNUC_CONST; gpointer notification_object_ref (gpointer instance); void notification_object_unref (gpointer instance); -GParamSpec* param_spec_notification_object (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_notification_object (GValue* value, gpointer v_object); -void value_take_notification_object (GValue* value, gpointer v_object); +GParamSpec* param_spec_notification_object (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_notification_object (GValue* value, + gpointer v_object); +void value_take_notification_object (GValue* value, + gpointer v_object); gpointer value_get_notification_object (const GValue* value); GType notification_object_get_type (void) G_GNUC_CONST; -static void batch_import_on_file_prepared (BatchImport* self, BackgroundJob* j, NotificationObject* user); -static void _batch_import_on_file_prepared_notification_callback (BackgroundJob* job, NotificationObject* user, gpointer self); -static void batch_import_on_files_prepared (BatchImport* self, BackgroundJob* j); -static void _batch_import_on_files_prepared_completion_callback (BackgroundJob* job, gpointer self); -static void batch_import_on_file_prepare_cancelled (BatchImport* self, BackgroundJob* j); -static void _batch_import_on_file_prepare_cancelled_cancellation_callback (BackgroundJob* job, gpointer self); -PrepareFilesJob* prepare_files_job_new (BatchImport* owner, GeeList* files_to_prepare, NotificationCallback notification, void* notification_target, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target); -PrepareFilesJob* prepare_files_job_construct (GType object_type, BatchImport* owner, GeeList* files_to_prepare, NotificationCallback notification, void* notification_target, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target); +static void batch_import_on_file_prepared (BatchImport* self, + BackgroundJob* j, + NotificationObject* user); +static void _batch_import_on_file_prepared_notification_callback (BackgroundJob* job, + NotificationObject* user, + gpointer self); +static void batch_import_on_files_prepared (BatchImport* self, + BackgroundJob* j); +static void _batch_import_on_files_prepared_completion_callback (BackgroundJob* job, + gpointer self); +static void batch_import_on_file_prepare_cancelled (BatchImport* self, + BackgroundJob* j); +static void _batch_import_on_file_prepare_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self); +PrepareFilesJob* prepare_files_job_new (BatchImport* owner, + GeeList* files_to_prepare, + NotificationCallback notification, + void* notification_target, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target); +PrepareFilesJob* prepare_files_job_construct (GType object_type, + BatchImport* owner, + GeeList* files_to_prepare, + NotificationCallback notification, + void* notification_target, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target); static void batch_import_flush_import_jobs (BatchImport* self); gint workers_get_pending_job_count (Workers* self); -static void batch_import_on_thumbnail_writer_completed (BatchImport* self, BackgroundJob* j); -static void _batch_import_on_thumbnail_writer_completed_completion_callback (BackgroundJob* job, gpointer self); -static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, BackgroundJob* j); -static void _batch_import_on_thumbnail_writer_cancelled_cancellation_callback (BackgroundJob* job, gpointer self); -ThumbnailWriterJob* thumbnail_writer_job_new (BatchImport* owner, CompletedImportObject* completed_import_source, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancel_callback, void* cancel_callback_target); -ThumbnailWriterJob* thumbnail_writer_job_construct (GType object_type, BatchImport* owner, CompletedImportObject* completed_import_source, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancel_callback, void* cancel_callback_target); +static void batch_import_on_thumbnail_writer_completed (BatchImport* self, + BackgroundJob* j); +static void _batch_import_on_thumbnail_writer_completed_completion_callback (BackgroundJob* job, + gpointer self); +static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, + BackgroundJob* j); +static void _batch_import_on_thumbnail_writer_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self); +ThumbnailWriterJob* thumbnail_writer_job_new (BatchImport* owner, + CompletedImportObject* completed_import_source, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancel_callback, + void* cancel_callback_target); +ThumbnailWriterJob* thumbnail_writer_job_construct (GType object_type, + BatchImport* owner, + CompletedImportObject* completed_import_source, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancel_callback, + void* cancel_callback_target); GType thumbnail_writer_job_get_type (void) G_GNUC_CONST; -static void batch_import_on_import_files_completed (BatchImport* self, BackgroundJob* j); -static void _batch_import_on_import_files_completed_completion_callback (BackgroundJob* job, gpointer self); -static void batch_import_on_import_files_cancelled (BatchImport* self, BackgroundJob* j); -static void _batch_import_on_import_files_cancelled_cancellation_callback (BackgroundJob* job, gpointer self); -PreparedFileImportJob* prepared_file_import_job_new (BatchImport* owner, PreparedFile* prepared_file, ImportID* import_id, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target); -PreparedFileImportJob* prepared_file_import_job_construct (GType object_type, BatchImport* owner, PreparedFile* prepared_file, ImportID* import_id, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target); +static void batch_import_on_import_files_completed (BatchImport* self, + BackgroundJob* j); +static void _batch_import_on_import_files_completed_completion_callback (BackgroundJob* job, + gpointer self); +static void batch_import_on_import_files_cancelled (BatchImport* self, + BackgroundJob* j); +static void _batch_import_on_import_files_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self); +PreparedFileImportJob* prepared_file_import_job_new (BatchImport* owner, + PreparedFile* prepared_file, + ImportID* import_id, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target); +PreparedFileImportJob* prepared_file_import_job_construct (GType object_type, + BatchImport* owner, + PreparedFile* prepared_file, + ImportID* import_id, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target); GType prepared_file_import_job_get_type (void) G_GNUC_CONST; -static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFile* prepared_file); +static GFile* batch_import_get_in_current_import (BatchImport* self, + PreparedFile* prepared_file); GType photo_file_format_get_type (void) G_GNUC_CONST; GType interlocked_notification_object_get_type (void) G_GNUC_CONST; GType prepared_file_cluster_get_type (void) G_GNUC_CONST; -static void batch_import_process_prepared_files (BatchImport* self, GeeList* list, GAsyncReadyCallback _callback_, gpointer _user_data_); -static void batch_import_process_prepared_files_finish (BatchImport* self, GAsyncResult* _res_); +static void batch_import_process_prepared_files (BatchImport* self, + GeeList* list, + GAsyncReadyCallback _callback_, + gpointer _user_data_); +static void batch_import_process_prepared_files_finish (BatchImport* self, + GAsyncResult* _res_); static void batch_import_process_prepared_files_data_free (gpointer _data); -static void batch_import_process_prepared_files_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data); +static void batch_import_process_prepared_files_async_ready_wrapper (GObject *source_object, + GAsyncResult *res, + void *user_data); static gboolean batch_import_process_prepared_files_co (BatchImportProcessPreparedFilesData* _data_); static gboolean _batch_import_process_prepared_files_co_gsource_func (gpointer self); GType library_photo_source_collection_state_get_type (void) G_GNUC_CONST; @@ -1946,7 +2186,9 @@ GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; GType library_photo_source_collection_get_type (void) G_GNUC_CONST; -LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSourceCollection* self, GFile* file, LibraryPhotoSourceCollectionState* state); +LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSourceCollection* self, + GFile* file, + LibraryPhotoSourceCollectionState* state); DuplicatedFile* duplicated_file_create_from_file (GFile* file); GFile* media_source_get_master_file (MediaSource* self); void media_source_mark_online (MediaSource* self); @@ -1955,100 +2197,175 @@ GType video_source_collection_state_get_type (void) G_GNUC_CONST; GType video_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; GType video_source_collection_get_type (void) G_GNUC_CONST; -Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, GFile* file, VideoSourceCollectionState* state); +Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, + GFile* file, + VideoSourceCollectionState* state); const gchar* video_source_collection_state_to_string (VideoSourceCollectionState self); -gboolean video_is_duplicate (GFile* file, const gchar* full_md5); +gboolean video_is_duplicate (GFile* file, + const gchar* full_md5); GType video_id_get_type (void) G_GNUC_CONST; VideoID* video_id_dup (const VideoID* self); void video_id_free (VideoID* self); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType video_table_get_type (void) G_GNUC_CONST; VideoTable* video_table_get_instance (void); -VideoID* video_table_get_duplicate_ids (VideoTable* self, GFile* file, const gchar* md5, int* result_length1); +VideoID* video_table_get_duplicate_ids (VideoTable* self, + GFile* file, + const gchar* md5, + int* result_length1); DuplicatedFile* duplicated_file_create_from_video_id (VideoID* video_id); gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; GType database_source_holding_tank_get_type (void) G_GNUC_CONST; GType media_source_holding_tank_get_type (void) G_GNUC_CONST; MediaSourceHoldingTank* media_source_collection_get_offline_bin (MediaSourceCollection* self); -MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingTank* self, GFile* file); -MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* self, const gchar* md5); +MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingTank* self, + GFile* file); +MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* self, + const gchar* md5); GType monitorable_get_type (void) G_GNUC_CONST; -void monitorable_set_master_file (Monitorable* self, GFile* file); +void monitorable_set_master_file (Monitorable* self, + GFile* file); guint64 media_source_get_filesize (MediaSource* self); -gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format); -LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoSourceCollection* self, GFile* file); -LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSourceCollection* self, const gchar* md5); +gboolean photo_is_duplicate (GFile* file, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format); +LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoSourceCollection* self, + GFile* file); +LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSourceCollection* self, + const gchar* md5); void media_source_untrash (MediaSource* self); void photo_remove_all_transformations (Photo* self); -LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoSourceCollection* self, GFile* file); -LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSourceCollection* self, const gchar* md5); +LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoSourceCollection* self, + GFile* file); +LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSourceCollection* self, + const gchar* md5); GType photo_id_get_type (void) G_GNUC_CONST; PhotoID* photo_id_dup (const PhotoID* self); void photo_id_free (PhotoID* self); GType photo_table_get_type (void) G_GNUC_CONST; PhotoTable* photo_table_get_instance (void); -PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format, int* result_length1); +PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format, + int* result_length1); DuplicatedFile* duplicated_file_create_from_photo_id (PhotoID* photo_id); -static void batch_import_done_preparing_files (BatchImport* self, BackgroundJob* j, const gchar* caller); +static void batch_import_done_preparing_files (BatchImport* self, + BackgroundJob* j, + const gchar* caller); gpointer ready_for_import_ref (gpointer instance); void ready_for_import_unref (gpointer instance); -GParamSpec* param_spec_ready_for_import (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_ready_for_import (GValue* value, gpointer v_object); -void value_take_ready_for_import (GValue* value, gpointer v_object); +GParamSpec* param_spec_ready_for_import (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_ready_for_import (GValue* value, + gpointer v_object); +void value_take_ready_for_import (GValue* value, + gpointer v_object); gpointer value_get_ready_for_import (const GValue* value); GType ready_for_import_get_type (void) G_GNUC_CONST; gpointer photo_import_params_ref (gpointer instance); void photo_import_params_unref (gpointer instance); -GParamSpec* param_spec_photo_import_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_import_params (GValue* value, gpointer v_object); -void value_take_photo_import_params (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_import_params (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_import_params (GValue* value, + gpointer v_object); +void value_take_photo_import_params (GValue* value, + gpointer v_object); gpointer value_get_photo_import_params (const GValue* value); GType photo_import_params_get_type (void) G_GNUC_CONST; gpointer video_import_params_ref (gpointer instance); void video_import_params_unref (gpointer instance); -GParamSpec* param_spec_video_import_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_video_import_params (GValue* value, gpointer v_object); -void value_take_video_import_params (GValue* value, gpointer v_object); +GParamSpec* param_spec_video_import_params (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_video_import_params (GValue* value, + gpointer v_object); +void value_take_video_import_params (GValue* value, + gpointer v_object); gpointer value_get_video_import_params (const GValue* value); GType video_import_params_get_type (void) G_GNUC_CONST; GType tombstone_get_type (void) G_GNUC_CONST; GType tombstone_source_collection_get_type (void) G_GNUC_CONST; -Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self, GFile* file); -void tombstone_source_collection_resurrect (TombstoneSourceCollection* self, Tombstone* tombstone); -ImportResult video_import_create (VideoImportParams* params, Video* * video); -ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhoto* * photo); +Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self, + GFile* file); +void tombstone_source_collection_resurrect (TombstoneSourceCollection* self, + Tombstone* tombstone); +ImportResult video_import_create (VideoImportParams* params, + Video* * video); +ImportResult library_photo_import_create (PhotoImportParams* params, + LibraryPhoto* * photo); GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; gpointer thumbnails_ref (gpointer instance); void thumbnails_unref (gpointer instance); -GParamSpec* param_spec_thumbnails (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_thumbnails (GValue* value, gpointer v_object); -void value_take_thumbnails (GValue* value, gpointer v_object); +GParamSpec* param_spec_thumbnails (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_thumbnails (GValue* value, + gpointer v_object); +void value_take_thumbnails (GValue* value, + gpointer v_object); gpointer value_get_thumbnails (const GValue* value); GType thumbnails_get_type (void) G_GNUC_CONST; gpointer photo_row_ref (gpointer instance); void photo_row_unref (gpointer instance); -GParamSpec* param_spec_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_row (GValue* value, gpointer v_object); -void value_take_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_row (GValue* value, + gpointer v_object); +void value_take_photo_row (GValue* value, + gpointer v_object); gpointer value_get_photo_row (const GValue* value); GType photo_row_get_type (void) G_GNUC_CONST; gpointer backing_photo_row_ref (gpointer instance); void backing_photo_row_unref (gpointer instance); -GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_photo_row (GValue* value, gpointer v_object); -void value_take_backing_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_photo_row (GValue* value, + gpointer v_object); +void value_take_backing_photo_row (GValue* value, + gpointer v_object); gpointer value_get_backing_photo_row (const GValue* value); GType backing_photo_row_get_type (void) G_GNUC_CONST; BackingPhotoRow* backing_photo_row_new (void); @@ -2061,27 +2378,48 @@ Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); GType orientation_get_type (void) G_GNUC_CONST; GType raw_developer_get_type (void) G_GNUC_CONST; -void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, gboolean notify, GError** error); +void photo_add_backing_photo_for_development (Photo* self, + RawDeveloper d, + BackingPhotoRow* bpr, + gboolean notify, + GError** error); PhotoFileFormat photo_get_master_file_format (Photo* self); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self); -gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d); -void photo_set_default_raw_developer (Photo* self, RawDeveloper d); -void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify); +gboolean photo_is_raw_developer_available (Photo* self, + RawDeveloper d); +void photo_set_default_raw_developer (Photo* self, + RawDeveloper d); +void photo_set_raw_developer (Photo* self, + RawDeveloper d, + gboolean notify); Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self); -CompletedImportObject* completed_import_object_new (MediaSource* source, Thumbnails* thumbnails, BatchImportJob* original_job, BatchImportResult* import_result); -CompletedImportObject* completed_import_object_construct (GType object_type, MediaSource* source, Thumbnails* thumbnails, BatchImportJob* original_job, BatchImportResult* import_result); +CompletedImportObject* completed_import_object_new (MediaSource* source, + Thumbnails* thumbnails, + BatchImportJob* original_job, + BatchImportResult* import_result); +CompletedImportObject* completed_import_object_construct (GType object_type, + MediaSource* source, + Thumbnails* thumbnails, + BatchImportJob* original_job, + BatchImportResult* import_result); BatchImportResult* ready_for_import_abort (ReadyForImport* self); gchar* data_object_to_string (DataObject* self); void library_photo_import_failed (LibraryPhoto* photo); void video_import_failed (Video* video); gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); @@ -2090,185 +2428,342 @@ GType container_source_collection_get_type (void) G_GNUC_CONST; GType event_source_collection_get_type (void) G_GNUC_CONST; void data_collection_freeze_notifications (DataCollection* self); GType tag_source_collection_get_type (void) G_GNUC_CONST; -void media_source_collection_import_many (MediaSourceCollection* self, GeeCollection* media); -void event_generate_many_events (GeeCollection* sources, ViewCollection* events_so_far); +void media_source_collection_import_many (MediaSourceCollection* self, + GeeCollection* media); +void event_generate_many_events (GeeCollection* sources, + ViewCollection* events_so_far); void data_collection_thaw_notifications (DataCollection* self); void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistry* self); guint64 media_source_get_master_filesize (MediaSource* self); -static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void g_cclosure_user_marshal_VOID__ENUM_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); +static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void g_cclosure_user_marshal_VOID__ENUM_STRING (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); static void batch_import_finalize (GObject * obj); #define DUPLICATED_FILE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DUPLICATED_FILE, DuplicatedFilePrivate)) -enum { - DUPLICATED_FILE_DUMMY_PROPERTY -}; static DuplicatedFile* duplicated_file_new (void); static DuplicatedFile* duplicated_file_construct (GType object_type); gboolean photo_id_is_valid (PhotoID *self); gboolean video_id_is_valid (VideoID *self); GFile* duplicated_file_get_file (DuplicatedFile* self); -LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, PhotoID* photo_id); -Video* video_source_collection_fetch (VideoSourceCollection* self, VideoID* video_id); +LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, + PhotoID* photo_id); +Video* video_source_collection_fetch (VideoSourceCollection* self, + VideoID* video_id); static void duplicated_file_finalize (GObject * obj); -enum { - BACKGROUND_IMPORT_JOB_DUMMY_PROPERTY -}; -BackgroundImportJob* background_import_job_construct (GType object_type, BatchImport* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target); +BackgroundImportJob* background_import_job_construct (GType object_type, + BatchImport* owner, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target); gpointer abstract_semaphore_ref (gpointer instance); void abstract_semaphore_unref (gpointer instance); -GParamSpec* param_spec_abstract_semaphore (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_abstract_semaphore (GValue* value, gpointer v_object); -void value_take_abstract_semaphore (GValue* value, gpointer v_object); +GParamSpec* param_spec_abstract_semaphore (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_abstract_semaphore (GValue* value, + gpointer v_object); +void value_take_abstract_semaphore (GValue* value, + gpointer v_object); gpointer value_get_abstract_semaphore (const GValue* value); GType abstract_semaphore_get_type (void) G_GNUC_CONST; -BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore); +BackgroundJob* background_job_construct (GType object_type, + GObject* owner, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target, + AbstractSemaphore* completion_semaphore); ImportResult background_import_job_abort_check (BackgroundImportJob* self); gboolean background_job_is_cancelled (BackgroundJob* self); -void background_import_job_abort (BackgroundImportJob* self, ImportResult _result_); -void background_import_job_report_failure (BackgroundImportJob* self, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, ImportResult _result_); -void background_import_job_report_error (BackgroundImportJob* self, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result); +void background_import_job_abort (BackgroundImportJob* self, + ImportResult _result_); +void background_import_job_report_failure (BackgroundImportJob* self, + BatchImportJob* job, + GFile* file, + const gchar* src_identifier, + const gchar* dest_identifier, + ImportResult _result_); +void background_import_job_report_error (BackgroundImportJob* self, + BatchImportJob* job, + GFile* file, + const gchar* src_identifier, + const gchar* dest_identifier, + GError* err, + ImportResult default_result); static void background_import_job_finalize (BackgroundJob * obj); -enum { - FILE_TO_PREPARE_DUMMY_PROPERTY -}; -FileToPrepare* file_to_prepare_new (BatchImportJob* job, GFile* file, gboolean copy_to_library); -FileToPrepare* file_to_prepare_construct (GType object_type, BatchImportJob* job, GFile* file, gboolean copy_to_library); -void file_to_prepare_set_associated (FileToPrepare* self, FileToPrepare* a); +FileToPrepare* file_to_prepare_new (BatchImportJob* job, + GFile* file, + gboolean copy_to_library); +FileToPrepare* file_to_prepare_construct (GType object_type, + BatchImportJob* job, + GFile* file, + gboolean copy_to_library); +void file_to_prepare_set_associated (FileToPrepare* self, + FileToPrepare* a); gchar* file_to_prepare_get_parent_path (FileToPrepare* self); gchar* file_to_prepare_get_path (FileToPrepare* self); gchar* file_to_prepare_get_basename (FileToPrepare* self); gboolean file_to_prepare_is_directory (FileToPrepare* self); static void file_to_prepare_finalize (FileToPrepare * obj); #define WORK_SNIFFER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_WORK_SNIFFER, WorkSnifferPrivate)) -enum { - WORK_SNIFFER_DUMMY_PROPERTY -}; static void work_sniffer_real_execute (BackgroundJob* base); -static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GError** error); -static gint __lambda11_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b); -gint utf8_cs_compare (void* a, void* b); -static gint ___lambda11__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); -void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext); +static void work_sniffer_sniff_job (WorkSniffer* self, + BatchImportJob* job, + GError** error); +static gint __lambda11_ (WorkSniffer* self, + FileToPrepare* a, + FileToPrepare* b); +gint utf8_cs_compare (void* a, + void* b); +static gint ___lambda11__gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self); +void disassemble_filename (const gchar* basename, + gchar* * name, + gchar* * ext); gboolean is_string_empty (const gchar* s); gpointer photo_file_format_properties_ref (gpointer instance); void photo_file_format_properties_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_properties (GValue* value, gpointer v_object); -void value_take_photo_file_format_properties (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_properties (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_properties (GValue* value, + gpointer v_object); +void value_take_photo_file_format_properties (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_properties (const GValue* value); GType photo_file_format_properties_get_type (void) G_GNUC_CONST; GType raw_file_format_properties_get_type (void) G_GNUC_CONST; RawFileFormatProperties* raw_file_format_properties_get_instance (void); -gboolean photo_file_format_properties_is_recognized_extension (PhotoFileFormatProperties* self, const gchar* ext); -static gboolean work_sniffer_is_paired (WorkSniffer* self, FileToPrepare* raw, FileToPrepare* maybe_paired); +gboolean photo_file_format_properties_is_recognized_extension (PhotoFileFormatProperties* self, + const gchar* ext); +static gboolean work_sniffer_is_paired (WorkSniffer* self, + FileToPrepare* raw, + FileToPrepare* maybe_paired); GType jfif_file_format_properties_get_type (void) G_GNUC_CONST; JfifFileFormatProperties* jfif_file_format_properties_get_instance (void); -void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir, gboolean copy_to_library, gboolean recurse, GError** error); +void work_sniffer_search_dir (WorkSniffer* self, + BatchImportJob* job, + GFile* dir, + gboolean copy_to_library, + gboolean recurse, + GError** error); GCancellable* background_job_get_cancellable (BackgroundJob* self); gboolean photo_is_file_image (GFile* file); gboolean photo_file_format_is_file_supported (GFile* file); gboolean video_reader_is_supported_video_file (GFile* file); static void work_sniffer_finalize (BackgroundJob * obj); -enum { - PREPARED_FILE_DUMMY_PROPERTY -}; -PreparedFile* prepared_file_new (BatchImportJob* job, GFile* file, GFile* associated_file, const gchar* source_id, const gchar* dest_id, gboolean copy_to_library, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, guint64 filesize, gboolean is_video); -PreparedFile* prepared_file_construct (GType object_type, BatchImportJob* job, GFile* file, GFile* associated_file, const gchar* source_id, const gchar* dest_id, gboolean copy_to_library, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, guint64 filesize, gboolean is_video); +PreparedFile* prepared_file_new (BatchImportJob* job, + GFile* file, + GFile* associated_file, + const gchar* source_id, + const gchar* dest_id, + gboolean copy_to_library, + const gchar* exif_md5, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format, + guint64 filesize, + gboolean is_video); +PreparedFile* prepared_file_construct (GType object_type, + BatchImportJob* job, + GFile* file, + GFile* associated_file, + const gchar* source_id, + const gchar* dest_id, + gboolean copy_to_library, + const gchar* exif_md5, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format, + guint64 filesize, + gboolean is_video); static void prepared_file_finalize (PreparedFile * obj); -enum { - PREPARED_FILE_CLUSTER_DUMMY_PROPERTY -}; PreparedFileCluster* prepared_file_cluster_new (GeeArrayList* list); -PreparedFileCluster* prepared_file_cluster_construct (GType object_type, GeeArrayList* list); +PreparedFileCluster* prepared_file_cluster_construct (GType object_type, + GeeArrayList* list); InterlockedNotificationObject* interlocked_notification_object_construct (GType object_type); static void prepared_file_cluster_finalize (NotificationObject * obj); #define PREPARE_FILES_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PREPARE_FILES_JOB, PrepareFilesJobPrivate)) -enum { - PREPARE_FILES_JOB_DUMMY_PROPERTY -}; GFile* app_dirs_get_import_dir (void); static gint prepare_files_job_get_test_variable (const gchar* name); -void background_job_set_notification_priority (BackgroundJob* self, gint priority); +void background_job_set_notification_priority (BackgroundJob* self, + gint priority); static void prepare_files_job_real_execute (BackgroundJob* base); -static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImportJob* job, GFile* * file, gboolean* copy_to_library); -static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, BatchImportJob* job, GFile* file, GFile* associated_file, gboolean copy_to_library, PreparedFile* * prepared_file); -void background_job_notify (BackgroundJob* self, NotificationCallback callback, void* callback_target, NotificationObject* user); -gchar* md5_file (GFile* file, GError** error); +static gboolean prepare_files_job_create_file (PrepareFilesJob* self, + BatchImportJob* job, + GFile* * file, + gboolean* copy_to_library); +static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, + BatchImportJob* job, + GFile* file, + GFile* associated_file, + gboolean copy_to_library, + PreparedFile* * prepared_file); +void background_job_notify (BackgroundJob* self, + NotificationCallback callback, + void* callback_target, + NotificationObject* user); +gchar* md5_file (GFile* file, + GError** error); PhotoFileFormat photo_file_format_get_by_file_extension (GFile* file); gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; -PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gchar* filepath); +PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, + const gchar* filepath); gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; -PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error); +PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, + GError** error); gchar* photo_metadata_exif_hash (PhotoMetadata* self); gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self); static void prepare_files_job_finalize (BackgroundJob * obj); -enum { - READY_FOR_IMPORT_DUMMY_PROPERTY -}; -ReadyForImport* ready_for_import_new (GFile* final_file, PreparedFile* prepared_file, PhotoImportParams* photo_import_params, VideoImportParams* video_import_params, BatchImportResult* batch_result); -ReadyForImport* ready_for_import_construct (GType object_type, GFile* final_file, PreparedFile* prepared_file, PhotoImportParams* photo_import_params, VideoImportParams* video_import_params, BatchImportResult* batch_result); +ReadyForImport* ready_for_import_new (GFile* final_file, + PreparedFile* prepared_file, + PhotoImportParams* photo_import_params, + VideoImportParams* video_import_params, + BatchImportResult* batch_result); +ReadyForImport* ready_for_import_construct (GType object_type, + GFile* final_file, + PreparedFile* prepared_file, + PhotoImportParams* photo_import_params, + VideoImportParams* video_import_params, + BatchImportResult* batch_result); gpointer video_row_ref (gpointer instance); void video_row_unref (gpointer instance); -GParamSpec* param_spec_video_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_video_row (GValue* value, gpointer v_object); -void value_take_video_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_video_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_video_row (GValue* value, + gpointer v_object); +void value_take_video_row (GValue* value, + gpointer v_object); gpointer value_get_video_row (const GValue* value); GType video_row_get_type (void) G_GNUC_CONST; static void ready_for_import_finalize (ReadyForImport * obj); #define PREPARED_FILE_IMPORT_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJobPrivate)) -enum { - PREPARED_FILE_IMPORT_JOB_DUMMY_PROPERTY -}; -void background_job_set_completion_priority (BackgroundJob* self, gint priority); +void background_job_set_completion_priority (BackgroundJob* self, + gint priority); static void prepared_file_import_job_real_execute (BackgroundJob* base); -GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callback, void* progress_callback_target, gboolean blacklist, GError** error); +GFile* library_files_duplicate (GFile* src, + GFileProgressCallback progress_callback, + void* progress_callback_target, + gboolean blacklist, + GError** error); Thumbnails* thumbnails_new (void); Thumbnails* thumbnails_construct (GType object_type); -VideoImportParams* video_import_params_new (GFile* file, ImportID* import_id, const gchar* md5, Thumbnails* thumbnails, time_t exposure_time_override); -VideoImportParams* video_import_params_construct (GType object_type, GFile* file, ImportID* import_id, const gchar* md5, Thumbnails* thumbnails, time_t exposure_time_override); +VideoImportParams* video_import_params_new (GFile* file, + ImportID* import_id, + const gchar* md5, + Thumbnails* thumbnails, + time_t exposure_time_override); +VideoImportParams* video_import_params_construct (GType object_type, + GFile* file, + ImportID* import_id, + const gchar* md5, + Thumbnails* thumbnails, + time_t exposure_time_override); ImportResult video_reader_prepare_for_import (VideoImportParams* params); -PhotoImportParams* photo_import_params_new (GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails); -PhotoImportParams* photo_import_params_construct (GType object_type, GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails); +PhotoImportParams* photo_import_params_new (GFile* file, + GFile* final_associated_file, + ImportID* import_id, + PhotoFileSnifferOptions sniffer_options, + const gchar* exif_md5, + const gchar* thumbnail_md5, + const gchar* full_md5, + Thumbnails* thumbnails); +PhotoImportParams* photo_import_params_construct (GType object_type, + GFile* file, + GFile* final_associated_file, + ImportID* import_id, + PhotoFileSnifferOptions sniffer_options, + const gchar* exif_md5, + const gchar* thumbnail_md5, + const gchar* full_md5, + Thumbnails* thumbnails); ImportResult photo_prepare_for_import (PhotoImportParams* params); static void prepared_file_import_job_finalize (BackgroundJob * obj); -enum { - COMPLETED_IMPORT_OBJECT_DUMMY_PROPERTY -}; GType thumbnail_cache_size_get_type (void) G_GNUC_CONST; -GdkPixbuf* thumbnails_get (Thumbnails* self, ThumbnailCacheSize size); +GdkPixbuf* thumbnails_get (Thumbnails* self, + ThumbnailCacheSize size); static void completed_import_object_finalize (CompletedImportObject * obj); -enum { - THUMBNAIL_WRITER_JOB_DUMMY_PROPERTY -}; static void thumbnail_writer_job_real_execute (BackgroundJob* base); -void thumbnail_cache_import_thumbnails (ThumbnailSource* source, Thumbnails* thumbnails, gboolean force, GError** error); +void thumbnail_cache_import_thumbnails (ThumbnailSource* source, + Thumbnails* thumbnails, + gboolean force, + GError** error); static void thumbnail_writer_job_finalize (BackgroundJob * obj); -gchar* import_result_to_string (ImportResult self) { +gchar* +import_result_to_string (ImportResult self) +{ gchar* result = NULL; #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" switch (self) { #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_SUCCESS: -#line 2272 "BatchImport.c" +#line 2767 "BatchImport.c" { gchar* _tmp0_; #line 26 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2277,11 +2772,11 @@ gchar* import_result_to_string (ImportResult self) { result = _tmp0_; #line 26 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2281 "BatchImport.c" +#line 2776 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_FILE_ERROR: -#line 2285 "BatchImport.c" +#line 2780 "BatchImport.c" { gchar* _tmp1_; #line 29 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2290,11 +2785,11 @@ gchar* import_result_to_string (ImportResult self) { result = _tmp1_; #line 29 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2294 "BatchImport.c" +#line 2789 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_DECODE_ERROR: -#line 2298 "BatchImport.c" +#line 2793 "BatchImport.c" { gchar* _tmp2_; #line 32 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2303,11 +2798,11 @@ gchar* import_result_to_string (ImportResult self) { result = _tmp2_; #line 32 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2307 "BatchImport.c" +#line 2802 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_DATABASE_ERROR: -#line 2311 "BatchImport.c" +#line 2806 "BatchImport.c" { gchar* _tmp3_; #line 35 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2316,11 +2811,11 @@ gchar* import_result_to_string (ImportResult self) { result = _tmp3_; #line 35 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2320 "BatchImport.c" +#line 2815 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_USER_ABORT: -#line 2324 "BatchImport.c" +#line 2819 "BatchImport.c" { gchar* _tmp4_; #line 38 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2329,11 +2824,11 @@ gchar* import_result_to_string (ImportResult self) { result = _tmp4_; #line 38 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2333 "BatchImport.c" +#line 2828 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_NOT_A_FILE: -#line 2337 "BatchImport.c" +#line 2832 "BatchImport.c" { gchar* _tmp5_; #line 41 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2342,11 +2837,11 @@ gchar* import_result_to_string (ImportResult self) { result = _tmp5_; #line 41 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2346 "BatchImport.c" +#line 2841 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_PHOTO_EXISTS: -#line 2350 "BatchImport.c" +#line 2845 "BatchImport.c" { gchar* _tmp6_; #line 44 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2355,11 +2850,11 @@ gchar* import_result_to_string (ImportResult self) { result = _tmp6_; #line 44 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2359 "BatchImport.c" +#line 2854 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_UNSUPPORTED_FORMAT: -#line 2363 "BatchImport.c" +#line 2858 "BatchImport.c" { gchar* _tmp7_; #line 47 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2368,11 +2863,11 @@ gchar* import_result_to_string (ImportResult self) { result = _tmp7_; #line 47 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2372 "BatchImport.c" +#line 2867 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_NOT_AN_IMAGE: -#line 2376 "BatchImport.c" +#line 2871 "BatchImport.c" { gchar* _tmp8_; #line 50 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2381,11 +2876,11 @@ gchar* import_result_to_string (ImportResult self) { result = _tmp8_; #line 50 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2385 "BatchImport.c" +#line 2880 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_DISK_FAILURE: -#line 2389 "BatchImport.c" +#line 2884 "BatchImport.c" { gchar* _tmp9_; #line 53 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2394,11 +2889,11 @@ gchar* import_result_to_string (ImportResult self) { result = _tmp9_; #line 53 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2398 "BatchImport.c" +#line 2893 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_DISK_FULL: -#line 2402 "BatchImport.c" +#line 2897 "BatchImport.c" { gchar* _tmp10_; #line 56 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2407,11 +2902,11 @@ gchar* import_result_to_string (ImportResult self) { result = _tmp10_; #line 56 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2411 "BatchImport.c" +#line 2906 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_CAMERA_ERROR: -#line 2415 "BatchImport.c" +#line 2910 "BatchImport.c" { gchar* _tmp11_; #line 59 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2420,11 +2915,11 @@ gchar* import_result_to_string (ImportResult self) { result = _tmp11_; #line 59 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2424 "BatchImport.c" +#line 2919 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_FILE_WRITE_ERROR: -#line 2428 "BatchImport.c" +#line 2923 "BatchImport.c" { gchar* _tmp12_; #line 62 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2433,11 +2928,11 @@ gchar* import_result_to_string (ImportResult self) { result = _tmp12_; #line 62 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2437 "BatchImport.c" +#line 2932 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE: -#line 2441 "BatchImport.c" +#line 2936 "BatchImport.c" { gchar* _tmp13_; #line 65 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2446,7 +2941,7 @@ gchar* import_result_to_string (ImportResult self) { result = _tmp13_; #line 65 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2450 "BatchImport.c" +#line 2945 "BatchImport.c" } default: { @@ -2457,13 +2952,15 @@ gchar* import_result_to_string (ImportResult self) { result = _tmp14_; #line 68 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2461 "BatchImport.c" +#line 2956 "BatchImport.c" } } } -gboolean import_result_is_abort (ImportResult self) { +gboolean +import_result_is_abort (ImportResult self) +{ gboolean result = FALSE; #line 73 "/home/jens/Source/shotwell/src/BatchImport.vala" switch (self) { @@ -2473,13 +2970,13 @@ gboolean import_result_is_abort (ImportResult self) { case IMPORT_RESULT_DISK_FAILURE: #line 73 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_USER_ABORT: -#line 2477 "BatchImport.c" +#line 2974 "BatchImport.c" { #line 77 "/home/jens/Source/shotwell/src/BatchImport.vala" result = TRUE; #line 77 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2483 "BatchImport.c" +#line 2980 "BatchImport.c" } default: { @@ -2487,13 +2984,15 @@ gboolean import_result_is_abort (ImportResult self) { result = FALSE; #line 80 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2491 "BatchImport.c" +#line 2988 "BatchImport.c" } } } -gboolean import_result_is_nonuser_abort (ImportResult self) { +gboolean +import_result_is_nonuser_abort (ImportResult self) +{ gboolean result = FALSE; #line 85 "/home/jens/Source/shotwell/src/BatchImport.vala" switch (self) { @@ -2501,13 +3000,13 @@ gboolean import_result_is_nonuser_abort (ImportResult self) { case IMPORT_RESULT_DISK_FULL: #line 85 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_DISK_FAILURE: -#line 2505 "BatchImport.c" +#line 3004 "BatchImport.c" { #line 88 "/home/jens/Source/shotwell/src/BatchImport.vala" result = TRUE; #line 88 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2511 "BatchImport.c" +#line 3010 "BatchImport.c" } default: { @@ -2515,101 +3014,99 @@ gboolean import_result_is_nonuser_abort (ImportResult self) { result = FALSE; #line 91 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2519 "BatchImport.c" +#line 3018 "BatchImport.c" } } } -static gpointer _g_error_copy0 (gpointer self) { +static gpointer +_g_error_copy0 (gpointer self) +{ #line 97 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? g_error_copy (self) : NULL; -#line 2528 "BatchImport.c" +#line 3029 "BatchImport.c" } -ImportResult import_result_convert_error (GError* err, ImportResult default_result) { +ImportResult +import_result_convert_error (GError* err, + ImportResult default_result) +{ ImportResult result = 0; - GError* _tmp0_; - ImportResult _tmp32_; -#line 96 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = err; #line 96 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp0_->domain == G_FILE_ERROR) { -#line 2540 "BatchImport.c" + if (err->domain == G_FILE_ERROR) { +#line 3040 "BatchImport.c" GError* ferr = NULL; + GError* _tmp0_; GError* _tmp1_; - GError* _tmp2_; - GError* _tmp3_; -#line 97 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = err; #line 97 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = _g_error_copy0 ((GError*) _tmp1_); + _tmp0_ = _g_error_copy0 ((GError*) err); #line 97 "/home/jens/Source/shotwell/src/BatchImport.vala" - ferr = _tmp2_; + ferr = _tmp0_; #line 99 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = ferr; + _tmp1_ = ferr; #line 99 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (g_error_matches (_tmp3_, G_FILE_ERROR, G_FILE_ERROR_NOSPC)) { + if (g_error_matches (_tmp1_, G_FILE_ERROR, G_FILE_ERROR_NOSPC)) { #line 100 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_DISK_FULL; #line 100 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (ferr); #line 100 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2561 "BatchImport.c" +#line 3058 "BatchImport.c" } else { - GError* _tmp4_; + GError* _tmp2_; #line 101 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = ferr; + _tmp2_ = ferr; #line 101 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (g_error_matches (_tmp4_, G_FILE_ERROR, G_FILE_ERROR_IO)) { + if (g_error_matches (_tmp2_, G_FILE_ERROR, G_FILE_ERROR_IO)) { #line 102 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_DISK_FAILURE; #line 102 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (ferr); #line 102 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2574 "BatchImport.c" +#line 3071 "BatchImport.c" } else { - GError* _tmp5_; + GError* _tmp3_; #line 103 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = ferr; + _tmp3_ = ferr; #line 103 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (g_error_matches (_tmp5_, G_FILE_ERROR, G_FILE_ERROR_ISDIR)) { + if (g_error_matches (_tmp3_, G_FILE_ERROR, G_FILE_ERROR_ISDIR)) { #line 104 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_NOT_A_FILE; #line 104 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (ferr); #line 104 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2587 "BatchImport.c" +#line 3084 "BatchImport.c" } else { - GError* _tmp6_; + GError* _tmp4_; #line 105 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = ferr; + _tmp4_ = ferr; #line 105 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (g_error_matches (_tmp6_, G_FILE_ERROR, G_FILE_ERROR_ACCES)) { + if (g_error_matches (_tmp4_, G_FILE_ERROR, G_FILE_ERROR_ACCES)) { #line 106 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_FILE_WRITE_ERROR; #line 106 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (ferr); #line 106 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2600 "BatchImport.c" +#line 3097 "BatchImport.c" } else { - GError* _tmp7_; + GError* _tmp5_; #line 107 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = ferr; + _tmp5_ = ferr; #line 107 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (g_error_matches (_tmp7_, G_FILE_ERROR, G_FILE_ERROR_PERM)) { + if (g_error_matches (_tmp5_, G_FILE_ERROR, G_FILE_ERROR_PERM)) { #line 108 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_FILE_WRITE_ERROR; #line 108 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (ferr); #line 108 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2613 "BatchImport.c" +#line 3110 "BatchImport.c" } else { #line 110 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_FILE_ERROR; @@ -2617,7 +3114,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (ferr); #line 110 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2621 "BatchImport.c" +#line 3118 "BatchImport.c" } } } @@ -2625,100 +3122,94 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu } #line 96 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (ferr); -#line 2629 "BatchImport.c" +#line 3126 "BatchImport.c" } else { - GError* _tmp8_; -#line 111 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = err; #line 111 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp8_->domain == G_IO_ERROR) { -#line 2636 "BatchImport.c" + if (err->domain == G_IO_ERROR) { +#line 3130 "BatchImport.c" GError* ioerr = NULL; - GError* _tmp9_; - GError* _tmp10_; - GError* _tmp11_; + GError* _tmp6_; + GError* _tmp7_; #line 112 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = err; + _tmp6_ = _g_error_copy0 ((GError*) err); #line 112 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = _g_error_copy0 ((GError*) _tmp9_); -#line 112 "/home/jens/Source/shotwell/src/BatchImport.vala" - ioerr = _tmp10_; + ioerr = _tmp6_; #line 114 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = ioerr; + _tmp7_ = ioerr; #line 114 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (g_error_matches (_tmp11_, G_IO_ERROR, G_IO_ERROR_NO_SPACE)) { + if (g_error_matches (_tmp7_, G_IO_ERROR, G_IO_ERROR_NO_SPACE)) { #line 115 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_DISK_FULL; #line 115 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (ioerr); #line 115 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2657 "BatchImport.c" +#line 3148 "BatchImport.c" } else { - GError* _tmp12_; + GError* _tmp8_; #line 116 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = ioerr; + _tmp8_ = ioerr; #line 116 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (g_error_matches (_tmp12_, G_IO_ERROR, G_IO_ERROR_FAILED)) { + if (g_error_matches (_tmp8_, G_IO_ERROR, G_IO_ERROR_FAILED)) { #line 117 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_DISK_FAILURE; #line 117 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (ioerr); #line 117 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2670 "BatchImport.c" +#line 3161 "BatchImport.c" } else { - GError* _tmp13_; + GError* _tmp9_; #line 118 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = ioerr; + _tmp9_ = ioerr; #line 118 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (g_error_matches (_tmp13_, G_IO_ERROR, G_IO_ERROR_IS_DIRECTORY)) { + if (g_error_matches (_tmp9_, G_IO_ERROR, G_IO_ERROR_IS_DIRECTORY)) { #line 119 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_NOT_A_FILE; #line 119 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (ioerr); #line 119 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2683 "BatchImport.c" +#line 3174 "BatchImport.c" } else { - GError* _tmp14_; + GError* _tmp10_; #line 120 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = ioerr; + _tmp10_ = ioerr; #line 120 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (g_error_matches (_tmp14_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { + if (g_error_matches (_tmp10_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { #line 121 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_USER_ABORT; #line 121 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (ioerr); #line 121 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2696 "BatchImport.c" +#line 3187 "BatchImport.c" } else { - GError* _tmp15_; + GError* _tmp11_; #line 122 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = ioerr; + _tmp11_ = ioerr; #line 122 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (g_error_matches (_tmp15_, G_IO_ERROR, G_IO_ERROR_READ_ONLY)) { + if (g_error_matches (_tmp11_, G_IO_ERROR, G_IO_ERROR_READ_ONLY)) { #line 123 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_FILE_WRITE_ERROR; #line 123 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (ioerr); #line 123 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2709 "BatchImport.c" +#line 3200 "BatchImport.c" } else { - GError* _tmp16_; + GError* _tmp12_; #line 124 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = ioerr; + _tmp12_ = ioerr; #line 124 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (g_error_matches (_tmp16_, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED)) { + if (g_error_matches (_tmp12_, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED)) { #line 125 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_FILE_WRITE_ERROR; #line 125 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (ioerr); #line 125 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2722 "BatchImport.c" +#line 3213 "BatchImport.c" } else { #line 127 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_FILE_ERROR; @@ -2726,7 +3217,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (ioerr); #line 127 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2730 "BatchImport.c" +#line 3221 "BatchImport.c" } } } @@ -2735,138 +3226,110 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu } #line 111 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (ioerr); -#line 2739 "BatchImport.c" +#line 3230 "BatchImport.c" } else { - GError* _tmp17_; #line 128 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = err; -#line 128 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp17_->domain == GPHOTO_ERROR) { + if (err->domain == GPHOTO_ERROR) { #line 129 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_CAMERA_ERROR; #line 129 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2750 "BatchImport.c" +#line 3238 "BatchImport.c" } else { - GError* _tmp18_; -#line 130 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = err; #line 130 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp18_->domain == GDK_PIXBUF_ERROR) { -#line 2757 "BatchImport.c" + if (err->domain == GDK_PIXBUF_ERROR) { +#line 3242 "BatchImport.c" GError* pixbuferr = NULL; - GError* _tmp19_; - GError* _tmp20_; - GError* _tmp21_; -#line 131 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = err; + GError* _tmp13_; + GError* _tmp14_; #line 131 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp20_ = _g_error_copy0 ((GError*) _tmp19_); + _tmp13_ = _g_error_copy0 ((GError*) err); #line 131 "/home/jens/Source/shotwell/src/BatchImport.vala" - pixbuferr = _tmp20_; + pixbuferr = _tmp13_; #line 133 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp21_ = pixbuferr; + _tmp14_ = pixbuferr; #line 133 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (g_error_matches (_tmp21_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_CORRUPT_IMAGE)) { + if (g_error_matches (_tmp14_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_CORRUPT_IMAGE)) { #line 134 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE; #line 134 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (pixbuferr); #line 134 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2778 "BatchImport.c" +#line 3260 "BatchImport.c" } else { - GError* _tmp22_; + GError* _tmp15_; #line 135 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp22_ = pixbuferr; + _tmp15_ = pixbuferr; #line 135 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (g_error_matches (_tmp22_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY)) { -#line 2785 "BatchImport.c" - ImportResult _tmp23_; + if (g_error_matches (_tmp15_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY)) { #line 136 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp23_ = default_result; -#line 136 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp23_; + result = default_result; #line 136 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (pixbuferr); #line 136 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2795 "BatchImport.c" +#line 3273 "BatchImport.c" } else { - GError* _tmp24_; + GError* _tmp16_; #line 137 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp24_ = pixbuferr; + _tmp16_ = pixbuferr; #line 137 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (g_error_matches (_tmp24_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_BAD_OPTION)) { -#line 2802 "BatchImport.c" - ImportResult _tmp25_; + if (g_error_matches (_tmp16_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_BAD_OPTION)) { #line 138 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp25_ = default_result; -#line 138 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp25_; + result = default_result; #line 138 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (pixbuferr); #line 138 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2812 "BatchImport.c" +#line 3286 "BatchImport.c" } else { - GError* _tmp26_; + GError* _tmp17_; #line 139 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp26_ = pixbuferr; + _tmp17_ = pixbuferr; #line 139 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (g_error_matches (_tmp26_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_UNKNOWN_TYPE)) { + if (g_error_matches (_tmp17_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_UNKNOWN_TYPE)) { #line 140 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_UNSUPPORTED_FORMAT; #line 140 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (pixbuferr); #line 140 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2825 "BatchImport.c" +#line 3299 "BatchImport.c" } else { - GError* _tmp27_; + GError* _tmp18_; #line 141 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp27_ = pixbuferr; + _tmp18_ = pixbuferr; #line 141 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (g_error_matches (_tmp27_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_UNSUPPORTED_OPERATION)) { -#line 2832 "BatchImport.c" - ImportResult _tmp28_; + if (g_error_matches (_tmp18_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_UNSUPPORTED_OPERATION)) { #line 142 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp28_ = default_result; -#line 142 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp28_; + result = default_result; #line 142 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (pixbuferr); #line 142 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2842 "BatchImport.c" +#line 3312 "BatchImport.c" } else { - GError* _tmp29_; + GError* _tmp19_; #line 143 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp29_ = pixbuferr; + _tmp19_ = pixbuferr; #line 143 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (g_error_matches (_tmp29_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED)) { -#line 2849 "BatchImport.c" - ImportResult _tmp30_; -#line 144 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp30_ = default_result; + if (g_error_matches (_tmp19_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED)) { #line 144 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp30_; + result = default_result; #line 144 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (pixbuferr); #line 144 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2859 "BatchImport.c" +#line 3325 "BatchImport.c" } else { - ImportResult _tmp31_; #line 146 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp31_ = default_result; -#line 146 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp31_; + result = default_result; #line 146 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (pixbuferr); #line 146 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2870 "BatchImport.c" +#line 3333 "BatchImport.c" } } } @@ -2875,22 +3338,22 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu } #line 130 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (pixbuferr); -#line 2879 "BatchImport.c" +#line 3342 "BatchImport.c" } } } } #line 149 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp32_ = default_result; -#line 149 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp32_; + result = default_result; #line 149 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2890 "BatchImport.c" +#line 3351 "BatchImport.c" } -GType import_result_get_type (void) { +GType +import_result_get_type (void) +{ static volatile gsize import_result_type_id__volatile = 0; if (g_once_init_enter (&import_result_type_id__volatile)) { static const GEnumValue values[] = {{IMPORT_RESULT_SUCCESS, "IMPORT_RESULT_SUCCESS", "success"}, {IMPORT_RESULT_FILE_ERROR, "IMPORT_RESULT_FILE_ERROR", "file-error"}, {IMPORT_RESULT_DECODE_ERROR, "IMPORT_RESULT_DECODE_ERROR", "decode-error"}, {IMPORT_RESULT_DATABASE_ERROR, "IMPORT_RESULT_DATABASE_ERROR", "database-error"}, {IMPORT_RESULT_USER_ABORT, "IMPORT_RESULT_USER_ABORT", "user-abort"}, {IMPORT_RESULT_NOT_A_FILE, "IMPORT_RESULT_NOT_A_FILE", "not-a-file"}, {IMPORT_RESULT_PHOTO_EXISTS, "IMPORT_RESULT_PHOTO_EXISTS", "photo-exists"}, {IMPORT_RESULT_UNSUPPORTED_FORMAT, "IMPORT_RESULT_UNSUPPORTED_FORMAT", "unsupported-format"}, {IMPORT_RESULT_NOT_AN_IMAGE, "IMPORT_RESULT_NOT_AN_IMAGE", "not-an-image"}, {IMPORT_RESULT_DISK_FAILURE, "IMPORT_RESULT_DISK_FAILURE", "disk-failure"}, {IMPORT_RESULT_DISK_FULL, "IMPORT_RESULT_DISK_FULL", "disk-full"}, {IMPORT_RESULT_CAMERA_ERROR, "IMPORT_RESULT_CAMERA_ERROR", "camera-error"}, {IMPORT_RESULT_FILE_WRITE_ERROR, "IMPORT_RESULT_FILE_WRITE_ERROR", "file-write-error"}, {IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE, "IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE", "pixbuf-corrupt-image"}, {0, NULL, NULL}}; @@ -2902,192 +3365,249 @@ GType import_result_get_type (void) { } -static gchar* batch_import_job_real_get_dest_identifier (BatchImportJob* self) { +static gchar* +batch_import_job_real_get_dest_identifier (BatchImportJob* self) +{ #line 161 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_dest_identifier'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 161 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 2911 "BatchImport.c" +#line 3376 "BatchImport.c" } -gchar* batch_import_job_get_dest_identifier (BatchImportJob* self) { +gchar* +batch_import_job_get_dest_identifier (BatchImportJob* self) +{ #line 161 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL); #line 161 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->get_dest_identifier (self); -#line 2920 "BatchImport.c" +#line 3387 "BatchImport.c" } -static gchar* batch_import_job_real_get_source_identifier (BatchImportJob* self) { +static gchar* +batch_import_job_real_get_source_identifier (BatchImportJob* self) +{ #line 163 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_source_identifier'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 163 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 2929 "BatchImport.c" +#line 3398 "BatchImport.c" } -gchar* batch_import_job_get_source_identifier (BatchImportJob* self) { +gchar* +batch_import_job_get_source_identifier (BatchImportJob* self) +{ #line 163 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL); #line 163 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->get_source_identifier (self); -#line 2938 "BatchImport.c" +#line 3409 "BatchImport.c" } -static gboolean batch_import_job_real_is_directory (BatchImportJob* self) { +static gboolean +batch_import_job_real_is_directory (BatchImportJob* self) +{ gboolean _tmp0_ = FALSE; #line 165 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("Type `%s' does not implement abstract method `batch_import_job_is_directory'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 165 "/home/jens/Source/shotwell/src/BatchImport.vala" return _tmp0_; -#line 2948 "BatchImport.c" +#line 3421 "BatchImport.c" } -gboolean batch_import_job_is_directory (BatchImportJob* self) { +gboolean +batch_import_job_is_directory (BatchImportJob* self) +{ #line 165 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE); #line 165 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->is_directory (self); -#line 2957 "BatchImport.c" +#line 3432 "BatchImport.c" } -static gchar* batch_import_job_real_get_basename (BatchImportJob* self) { +static gchar* +batch_import_job_real_get_basename (BatchImportJob* self) +{ #line 167 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_basename'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 167 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 2966 "BatchImport.c" +#line 3443 "BatchImport.c" } -gchar* batch_import_job_get_basename (BatchImportJob* self) { +gchar* +batch_import_job_get_basename (BatchImportJob* self) +{ #line 167 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL); #line 167 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->get_basename (self); -#line 2975 "BatchImport.c" +#line 3454 "BatchImport.c" } -static gchar* batch_import_job_real_get_path (BatchImportJob* self) { +static gchar* +batch_import_job_real_get_path (BatchImportJob* self) +{ #line 169 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_path'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 169 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 2984 "BatchImport.c" +#line 3465 "BatchImport.c" } -gchar* batch_import_job_get_path (BatchImportJob* self) { +gchar* +batch_import_job_get_path (BatchImportJob* self) +{ #line 169 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL); #line 169 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->get_path (self); -#line 2993 "BatchImport.c" +#line 3476 "BatchImport.c" } -static DuplicatedFile* batch_import_job_real_get_duplicated_file (BatchImportJob* self) { +static DuplicatedFile* +batch_import_job_real_get_duplicated_file (BatchImportJob* self) +{ DuplicatedFile* result = NULL; #line 172 "/home/jens/Source/shotwell/src/BatchImport.vala" result = NULL; #line 172 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3003 "BatchImport.c" +#line 3488 "BatchImport.c" } -DuplicatedFile* batch_import_job_get_duplicated_file (BatchImportJob* self) { +DuplicatedFile* +batch_import_job_get_duplicated_file (BatchImportJob* self) +{ #line 171 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL); #line 171 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->get_duplicated_file (self); -#line 3012 "BatchImport.c" +#line 3499 "BatchImport.c" } -static GFile* batch_import_job_real_get_associated_file (BatchImportJob* self) { +static GFile* +batch_import_job_real_get_associated_file (BatchImportJob* self) +{ GFile* result = NULL; #line 176 "/home/jens/Source/shotwell/src/BatchImport.vala" result = NULL; #line 176 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3022 "BatchImport.c" +#line 3511 "BatchImport.c" } -GFile* batch_import_job_get_associated_file (BatchImportJob* self) { +GFile* +batch_import_job_get_associated_file (BatchImportJob* self) +{ #line 175 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL); #line 175 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->get_associated_file (self); -#line 3031 "BatchImport.c" +#line 3522 "BatchImport.c" } -static void batch_import_job_real_set_associated (BatchImportJob* self, BatchImportJob* associated) { +static void +batch_import_job_real_set_associated (BatchImportJob* self, + BatchImportJob* associated) +{ #line 180 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("Type `%s' does not implement abstract method `batch_import_job_set_associated'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 180 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 3040 "BatchImport.c" +#line 3534 "BatchImport.c" } -void batch_import_job_set_associated (BatchImportJob* self, BatchImportJob* associated) { +void +batch_import_job_set_associated (BatchImportJob* self, + BatchImportJob* associated) +{ #line 180 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT_JOB (self)); #line 180 "/home/jens/Source/shotwell/src/BatchImport.vala" BATCH_IMPORT_JOB_GET_CLASS (self)->set_associated (self, associated); -#line 3049 "BatchImport.c" +#line 3546 "BatchImport.c" } -static gboolean batch_import_job_real_determine_file_size (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir) { +static gboolean +batch_import_job_real_determine_file_size (BatchImportJob* self, + guint64* filesize, + GFile* * file_or_dir) +{ gboolean _tmp0_ = FALSE; #line 187 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("Type `%s' does not implement abstract method `batch_import_job_determine_file_size'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 187 "/home/jens/Source/shotwell/src/BatchImport.vala" return _tmp0_; -#line 3059 "BatchImport.c" +#line 3560 "BatchImport.c" } -gboolean batch_import_job_determine_file_size (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir) { +gboolean +batch_import_job_determine_file_size (BatchImportJob* self, + guint64* filesize, + GFile* * file_or_dir) +{ #line 187 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE); #line 187 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->determine_file_size (self, filesize, file_or_dir); -#line 3068 "BatchImport.c" +#line 3573 "BatchImport.c" } -static gboolean batch_import_job_real_prepare (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error) { +static gboolean +batch_import_job_real_prepare (BatchImportJob* self, + GFile* * file_to_import, + gboolean* copy_to_library, + GError** error) +{ gboolean _tmp0_ = FALSE; #line 190 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("Type `%s' does not implement abstract method `batch_import_job_prepare'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 190 "/home/jens/Source/shotwell/src/BatchImport.vala" return _tmp0_; -#line 3078 "BatchImport.c" +#line 3588 "BatchImport.c" } -gboolean batch_import_job_prepare (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error) { +gboolean +batch_import_job_prepare (BatchImportJob* self, + GFile* * file_to_import, + gboolean* copy_to_library, + GError** error) +{ #line 190 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE); #line 190 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->prepare (self, file_to_import, copy_to_library, error); -#line 3087 "BatchImport.c" +#line 3602 "BatchImport.c" } -static gboolean batch_import_job_real_complete (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error) { +static gboolean +batch_import_job_real_complete (BatchImportJob* self, + MediaSource* source, + BatchImportRoll* import_roll, + GError** error) +{ gboolean result = FALSE; #line 200 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (source), FALSE); @@ -3097,165 +3617,205 @@ static gboolean batch_import_job_real_complete (BatchImportJob* self, MediaSourc result = FALSE; #line 201 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3101 "BatchImport.c" +#line 3621 "BatchImport.c" } -gboolean batch_import_job_complete (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error) { +gboolean +batch_import_job_complete (BatchImportJob* self, + MediaSource* source, + BatchImportRoll* import_roll, + GError** error) +{ #line 200 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE); #line 200 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->complete (self, source, import_roll, error); -#line 3110 "BatchImport.c" +#line 3635 "BatchImport.c" } -static time_t batch_import_job_real_get_exposure_time_override (BatchImportJob* self) { +static time_t +batch_import_job_real_get_exposure_time_override (BatchImportJob* self) +{ time_t result = 0; #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala" result = (time_t) 0; #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3120 "BatchImport.c" +#line 3647 "BatchImport.c" } -time_t batch_import_job_get_exposure_time_override (BatchImportJob* self) { +time_t +batch_import_job_get_exposure_time_override (BatchImportJob* self) +{ #line 206 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), 0); #line 206 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->get_exposure_time_override (self); -#line 3129 "BatchImport.c" +#line 3658 "BatchImport.c" } -static gboolean batch_import_job_real_recurse (BatchImportJob* self) { +static gboolean +batch_import_job_real_recurse (BatchImportJob* self) +{ gboolean result = FALSE; #line 211 "/home/jens/Source/shotwell/src/BatchImport.vala" result = TRUE; #line 211 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3139 "BatchImport.c" +#line 3670 "BatchImport.c" } -gboolean batch_import_job_recurse (BatchImportJob* self) { +gboolean +batch_import_job_recurse (BatchImportJob* self) +{ #line 210 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE); #line 210 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->recurse (self); -#line 3148 "BatchImport.c" +#line 3681 "BatchImport.c" } -BatchImportJob* batch_import_job_construct (GType object_type) { +BatchImportJob* +batch_import_job_construct (GType object_type) +{ BatchImportJob* self = NULL; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (BatchImportJob*) g_type_create_instance (object_type); #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 3158 "BatchImport.c" +#line 3693 "BatchImport.c" } -static void value_batch_import_job_init (GValue* value) { +static void +value_batch_import_job_init (GValue* value) +{ #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 3165 "BatchImport.c" +#line 3702 "BatchImport.c" } -static void value_batch_import_job_free_value (GValue* value) { +static void +value_batch_import_job_free_value (GValue* value) +{ #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" if (value->data[0].v_pointer) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_job_unref (value->data[0].v_pointer); -#line 3174 "BatchImport.c" +#line 3713 "BatchImport.c" } } -static void value_batch_import_job_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_batch_import_job_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" if (src_value->data[0].v_pointer) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = batch_import_job_ref (src_value->data[0].v_pointer); -#line 3184 "BatchImport.c" +#line 3726 "BatchImport.c" } else { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = NULL; -#line 3188 "BatchImport.c" +#line 3730 "BatchImport.c" } } -static gpointer value_batch_import_job_peek_pointer (const GValue* value) { +static gpointer +value_batch_import_job_peek_pointer (const GValue* value) +{ #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 3196 "BatchImport.c" +#line 3740 "BatchImport.c" } -static gchar* value_batch_import_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_batch_import_job_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" if (collect_values[0].v_pointer) { -#line 3203 "BatchImport.c" +#line 3752 "BatchImport.c" BatchImportJob * object; object = collect_values[0].v_pointer; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" if (object->parent_instance.g_class == NULL) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3210 "BatchImport.c" +#line 3759 "BatchImport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3214 "BatchImport.c" +#line 3763 "BatchImport.c" } #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = batch_import_job_ref (object); -#line 3218 "BatchImport.c" +#line 3767 "BatchImport.c" } else { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 3222 "BatchImport.c" +#line 3771 "BatchImport.c" } #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 3226 "BatchImport.c" +#line 3775 "BatchImport.c" } -static gchar* value_batch_import_job_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_batch_import_job_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ BatchImportJob ** object_p; object_p = collect_values[0].v_pointer; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!object_p) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3237 "BatchImport.c" +#line 3791 "BatchImport.c" } #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!value->data[0].v_pointer) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = NULL; -#line 3243 "BatchImport.c" +#line 3797 "BatchImport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = value->data[0].v_pointer; -#line 3247 "BatchImport.c" +#line 3801 "BatchImport.c" } else { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = batch_import_job_ref (value->data[0].v_pointer); -#line 3251 "BatchImport.c" +#line 3805 "BatchImport.c" } #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 3255 "BatchImport.c" +#line 3809 "BatchImport.c" } -GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_batch_import_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecBatchImportJob* spec; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_BATCH_IMPORT_JOB), NULL); @@ -3265,20 +3825,25 @@ GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, c G_PARAM_SPEC (spec)->value_type = object_type; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" return G_PARAM_SPEC (spec); -#line 3269 "BatchImport.c" +#line 3829 "BatchImport.c" } -gpointer value_get_batch_import_job (const GValue* value) { +gpointer +value_get_batch_import_job (const GValue* value) +{ #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_JOB), NULL); #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 3278 "BatchImport.c" +#line 3840 "BatchImport.c" } -void value_set_batch_import_job (GValue* value, gpointer v_object) { +void +value_set_batch_import_job (GValue* value, + gpointer v_object) +{ BatchImportJob * old; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_JOB)); @@ -3294,22 +3859,25 @@ void value_set_batch_import_job (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_job_ref (value->data[0].v_pointer); -#line 3298 "BatchImport.c" +#line 3863 "BatchImport.c" } else { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 3302 "BatchImport.c" +#line 3867 "BatchImport.c" } #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_job_unref (old); -#line 3308 "BatchImport.c" +#line 3873 "BatchImport.c" } } -void value_take_batch_import_job (GValue* value, gpointer v_object) { +void +value_take_batch_import_job (GValue* value, + gpointer v_object) +{ BatchImportJob * old; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_JOB)); @@ -3323,22 +3891,24 @@ void value_take_batch_import_job (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = v_object; -#line 3327 "BatchImport.c" +#line 3895 "BatchImport.c" } else { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 3331 "BatchImport.c" +#line 3899 "BatchImport.c" } #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_job_unref (old); -#line 3337 "BatchImport.c" +#line 3905 "BatchImport.c" } } -static void batch_import_job_class_init (BatchImportJobClass * klass) { +static void +batch_import_job_class_init (BatchImportJobClass * klass) +{ #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_job_parent_class = g_type_class_peek_parent (klass); #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -3369,28 +3939,34 @@ static void batch_import_job_class_init (BatchImportJobClass * klass) { ((BatchImportJobClass *) klass)->get_exposure_time_override = (time_t (*) (BatchImportJob *)) batch_import_job_real_get_exposure_time_override; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" ((BatchImportJobClass *) klass)->recurse = (gboolean (*) (BatchImportJob *)) batch_import_job_real_recurse; -#line 3373 "BatchImport.c" +#line 3943 "BatchImport.c" } -static void batch_import_job_instance_init (BatchImportJob * self) { +static void +batch_import_job_instance_init (BatchImportJob * self) +{ #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" self->ref_count = 1; -#line 3380 "BatchImport.c" +#line 3952 "BatchImport.c" } -static void batch_import_job_finalize (BatchImportJob * obj) { +static void +batch_import_job_finalize (BatchImportJob * obj) +{ BatchImportJob * self; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BATCH_IMPORT_JOB, BatchImportJob); #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" g_signal_handlers_destroy (self); -#line 3390 "BatchImport.c" +#line 3964 "BatchImport.c" } -GType batch_import_job_get_type (void) { +GType +batch_import_job_get_type (void) +{ static volatile gsize batch_import_job_type_id__volatile = 0; if (g_once_init_enter (&batch_import_job_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_batch_import_job_init, value_batch_import_job_free_value, value_batch_import_job_copy_value, value_batch_import_job_peek_pointer, "p", value_batch_import_job_collect_value, "p", value_batch_import_job_lcopy_value }; @@ -3404,18 +3980,22 @@ GType batch_import_job_get_type (void) { } -gpointer batch_import_job_ref (gpointer instance) { +gpointer +batch_import_job_ref (gpointer instance) +{ BatchImportJob * self; self = instance; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" g_atomic_int_inc (&self->ref_count); #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" return instance; -#line 3415 "BatchImport.c" +#line 3993 "BatchImport.c" } -void batch_import_job_unref (gpointer instance) { +void +batch_import_job_unref (gpointer instance) +{ BatchImportJob * self; self = instance; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -3424,58 +4004,62 @@ void batch_import_job_unref (gpointer instance) { BATCH_IMPORT_JOB_GET_CLASS (self)->finalize (self); #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3428 "BatchImport.c" +#line 4008 "BatchImport.c" } } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 222 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? g_object_ref (self) : NULL; -#line 3436 "BatchImport.c" +#line 4018 "BatchImport.c" } -FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library, gboolean recurse) { +FileImportJob* +file_import_job_construct (GType object_type, + GFile* file_or_dir, + gboolean copy_to_library, + gboolean recurse) +{ FileImportJob* self = NULL; GFile* _tmp0_; - GFile* _tmp1_; - gboolean _tmp2_; - gboolean _tmp3_; #line 221 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_IS_FILE (file_or_dir), NULL); #line 221 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (FileImportJob*) batch_import_job_construct (object_type); #line 222 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = file_or_dir; -#line 222 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (file_or_dir); #line 222 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->file_or_dir); #line 222 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->file_or_dir = _tmp1_; -#line 223 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = copy_to_library; + self->priv->file_or_dir = _tmp0_; #line 223 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->copy_to_library = _tmp2_; + self->priv->copy_to_library = copy_to_library; #line 224 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = recurse; -#line 224 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->_recurse = _tmp3_; + self->priv->_recurse = recurse; #line 221 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 3468 "BatchImport.c" +#line 4046 "BatchImport.c" } -FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library, gboolean recurse) { +FileImportJob* +file_import_job_new (GFile* file_or_dir, + gboolean copy_to_library, + gboolean recurse) +{ #line 221 "/home/jens/Source/shotwell/src/BatchImport.vala" return file_import_job_construct (TYPE_FILE_IMPORT_JOB, file_or_dir, copy_to_library, recurse); -#line 3475 "BatchImport.c" +#line 4057 "BatchImport.c" } -static gchar* file_import_job_real_get_dest_identifier (BatchImportJob* base) { +static gchar* +file_import_job_real_get_dest_identifier (BatchImportJob* base) +{ FileImportJob * self; gchar* result = NULL; GFile* _tmp0_; @@ -3490,11 +4074,13 @@ static gchar* file_import_job_real_get_dest_identifier (BatchImportJob* base) { result = _tmp1_; #line 228 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3494 "BatchImport.c" +#line 4078 "BatchImport.c" } -static gchar* file_import_job_real_get_source_identifier (BatchImportJob* base) { +static gchar* +file_import_job_real_get_source_identifier (BatchImportJob* base) +{ FileImportJob * self; gchar* result = NULL; GFile* _tmp0_; @@ -3509,30 +4095,31 @@ static gchar* file_import_job_real_get_source_identifier (BatchImportJob* base) result = _tmp1_; #line 232 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3513 "BatchImport.c" +#line 4099 "BatchImport.c" } -static gboolean file_import_job_real_is_directory (BatchImportJob* base) { +static gboolean +file_import_job_real_is_directory (BatchImportJob* base) +{ FileImportJob * self; gboolean result = FALSE; GFile* _tmp0_; - gboolean _tmp1_; #line 235 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob); #line 236 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = self->priv->file_or_dir; #line 236 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = query_is_directory (_tmp0_); -#line 236 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp1_; + result = query_is_directory (_tmp0_); #line 236 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3532 "BatchImport.c" +#line 4117 "BatchImport.c" } -static gchar* file_import_job_real_get_basename (BatchImportJob* base) { +static gchar* +file_import_job_real_get_basename (BatchImportJob* base) +{ FileImportJob * self; gchar* result = NULL; GFile* _tmp0_; @@ -3547,90 +4134,95 @@ static gchar* file_import_job_real_get_basename (BatchImportJob* base) { result = _tmp1_; #line 240 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3551 "BatchImport.c" +#line 4138 "BatchImport.c" } -static gchar* file_import_job_real_get_path (BatchImportJob* base) { +static gchar* +file_import_job_real_get_path (BatchImportJob* base) +{ FileImportJob * self; gchar* result = NULL; gchar* _tmp0_ = NULL; - gboolean _tmp1_; #line 243 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob); #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = batch_import_job_is_directory (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BATCH_IMPORT_JOB, BatchImportJob)); -#line 244 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp1_) { -#line 3566 "BatchImport.c" - GFile* _tmp2_; - gchar* _tmp3_; + if (batch_import_job_is_directory (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BATCH_IMPORT_JOB, BatchImportJob))) { +#line 4152 "BatchImport.c" + GFile* _tmp1_; + gchar* _tmp2_; #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = self->priv->file_or_dir; + _tmp1_ = self->priv->file_or_dir; #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = g_file_get_path (_tmp2_); + _tmp2_ = g_file_get_path (_tmp1_); #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp0_); #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = _tmp3_; -#line 3577 "BatchImport.c" + _tmp0_ = _tmp2_; +#line 4163 "BatchImport.c" } else { + GFile* _tmp3_; GFile* _tmp4_; GFile* _tmp5_; - GFile* _tmp6_; - gchar* _tmp7_; + gchar* _tmp6_; #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = self->priv->file_or_dir; + _tmp3_ = self->priv->file_or_dir; #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = g_file_get_parent (_tmp4_); + _tmp4_ = g_file_get_parent (_tmp3_); #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = g_file_get_path (_tmp6_); + _tmp6_ = g_file_get_path (_tmp5_); #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp0_); #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = _tmp7_; + _tmp0_ = _tmp6_; #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp6_); -#line 3597 "BatchImport.c" + _g_object_unref0 (_tmp5_); +#line 4183 "BatchImport.c" } #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _tmp0_; #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3603 "BatchImport.c" +#line 4189 "BatchImport.c" } -static gpointer _batch_import_job_ref0 (gpointer self) { +static gpointer +_batch_import_job_ref0 (gpointer self) +{ #line 248 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? batch_import_job_ref (self) : NULL; -#line 3610 "BatchImport.c" +#line 4198 "BatchImport.c" } -static void file_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated) { +static void +file_import_job_real_set_associated (BatchImportJob* base, + BatchImportJob* associated) +{ FileImportJob * self; - BatchImportJob* _tmp0_; - FileImportJob* _tmp1_; + FileImportJob* _tmp0_; #line 247 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob); #line 247 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT_JOB (associated)); #line 248 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = associated; -#line 248 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FILE_IMPORT_JOB) ? ((FileImportJob*) _tmp0_) : NULL); + _tmp0_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (associated, TYPE_FILE_IMPORT_JOB) ? ((FileImportJob*) associated) : NULL); #line 248 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (self->priv->associated); #line 248 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->associated = _tmp1_; -#line 3630 "BatchImport.c" + self->priv->associated = _tmp0_; +#line 4218 "BatchImport.c" } -static gboolean file_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file) { +static gboolean +file_import_job_real_determine_file_size (BatchImportJob* base, + guint64* filesize, + GFile* * file) +{ FileImportJob * self; guint64 _vala_filesize = 0ULL; GFile* _vala_file = NULL; @@ -3655,25 +4247,30 @@ static gboolean file_import_job_real_determine_file_size (BatchImportJob* base, if (filesize) { #line 255 "/home/jens/Source/shotwell/src/BatchImport.vala" *filesize = _vala_filesize; -#line 3659 "BatchImport.c" +#line 4251 "BatchImport.c" } #line 255 "/home/jens/Source/shotwell/src/BatchImport.vala" if (file) { #line 255 "/home/jens/Source/shotwell/src/BatchImport.vala" *file = _vala_file; -#line 3665 "BatchImport.c" +#line 4257 "BatchImport.c" } else { #line 255 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_vala_file); -#line 3669 "BatchImport.c" +#line 4261 "BatchImport.c" } #line 255 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3673 "BatchImport.c" +#line 4265 "BatchImport.c" } -static gboolean file_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy, GError** error) { +static gboolean +file_import_job_real_prepare (BatchImportJob* base, + GFile* * file_to_import, + gboolean* copy, + GError** error) +{ FileImportJob * self; GFile* _vala_file_to_import = NULL; gboolean _vala_copy = FALSE; @@ -3701,25 +4298,27 @@ static gboolean file_import_job_real_prepare (BatchImportJob* base, GFile* * fil if (file_to_import) { #line 262 "/home/jens/Source/shotwell/src/BatchImport.vala" *file_to_import = _vala_file_to_import; -#line 3705 "BatchImport.c" +#line 4302 "BatchImport.c" } else { #line 262 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_vala_file_to_import); -#line 3709 "BatchImport.c" +#line 4306 "BatchImport.c" } #line 262 "/home/jens/Source/shotwell/src/BatchImport.vala" if (copy) { #line 262 "/home/jens/Source/shotwell/src/BatchImport.vala" *copy = _vala_copy; -#line 3715 "BatchImport.c" +#line 4312 "BatchImport.c" } #line 262 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3719 "BatchImport.c" +#line 4316 "BatchImport.c" } -GFile* file_import_job_get_file (FileImportJob* self) { +GFile* +file_import_job_get_file (FileImportJob* self) +{ GFile* result = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -3733,11 +4332,13 @@ GFile* file_import_job_get_file (FileImportJob* self) { result = _tmp1_; #line 266 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3737 "BatchImport.c" +#line 4336 "BatchImport.c" } -static gboolean file_import_job_real_recurse (BatchImportJob* base) { +static gboolean +file_import_job_real_recurse (BatchImportJob* base) +{ FileImportJob * self; gboolean result = FALSE; gboolean _tmp0_; @@ -3749,11 +4350,13 @@ static gboolean file_import_job_real_recurse (BatchImportJob* base) { result = _tmp0_; #line 270 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3753 "BatchImport.c" +#line 4354 "BatchImport.c" } -static void file_import_job_class_init (FileImportJobClass * klass) { +static void +file_import_job_class_init (FileImportJobClass * klass) +{ #line 215 "/home/jens/Source/shotwell/src/BatchImport.vala" file_import_job_parent_class = g_type_class_peek_parent (klass); #line 215 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -3778,20 +4381,24 @@ static void file_import_job_class_init (FileImportJobClass * klass) { ((BatchImportJobClass *) klass)->prepare = (gboolean (*) (BatchImportJob *, GFile* *, gboolean*, GError**)) file_import_job_real_prepare; #line 215 "/home/jens/Source/shotwell/src/BatchImport.vala" ((BatchImportJobClass *) klass)->recurse = (gboolean (*) (BatchImportJob *)) file_import_job_real_recurse; -#line 3782 "BatchImport.c" +#line 4385 "BatchImport.c" } -static void file_import_job_instance_init (FileImportJob * self) { +static void +file_import_job_instance_init (FileImportJob * self) +{ #line 215 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv = FILE_IMPORT_JOB_GET_PRIVATE (self); #line 218 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->associated = NULL; -#line 3791 "BatchImport.c" +#line 4396 "BatchImport.c" } -static void file_import_job_finalize (BatchImportJob * obj) { +static void +file_import_job_finalize (BatchImportJob * obj) +{ FileImportJob * self; #line 215 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FILE_IMPORT_JOB, FileImportJob); @@ -3801,11 +4408,13 @@ static void file_import_job_finalize (BatchImportJob * obj) { _batch_import_job_unref0 (self->priv->associated); #line 215 "/home/jens/Source/shotwell/src/BatchImport.vala" BATCH_IMPORT_JOB_CLASS (file_import_job_parent_class)->finalize (obj); -#line 3805 "BatchImport.c" +#line 4412 "BatchImport.c" } -GType file_import_job_get_type (void) { +GType +file_import_job_get_type (void) +{ static volatile gsize file_import_job_type_id__volatile = 0; if (g_once_init_enter (&file_import_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (FileImportJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) file_import_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FileImportJob), 0, (GInstanceInitFunc) file_import_job_instance_init, NULL }; @@ -3817,7 +4426,9 @@ GType file_import_job_get_type (void) { } -BatchImportRoll* batch_import_roll_construct (GType object_type) { +BatchImportRoll* +batch_import_roll_construct (GType object_type) +{ BatchImportRoll* self = NULL; ImportID _tmp0_ = {0}; #line 281 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -3828,115 +4439,142 @@ BatchImportRoll* batch_import_roll_construct (GType object_type) { self->import_id = _tmp0_; #line 281 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 3832 "BatchImport.c" +#line 4443 "BatchImport.c" } -BatchImportRoll* batch_import_roll_new (void) { +BatchImportRoll* +batch_import_roll_new (void) +{ #line 281 "/home/jens/Source/shotwell/src/BatchImport.vala" return batch_import_roll_construct (TYPE_BATCH_IMPORT_ROLL); -#line 3839 "BatchImport.c" +#line 4452 "BatchImport.c" } -static void value_batch_import_roll_init (GValue* value) { +static void +value_batch_import_roll_init (GValue* value) +{ #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 3846 "BatchImport.c" +#line 4461 "BatchImport.c" } -static void value_batch_import_roll_free_value (GValue* value) { +static void +value_batch_import_roll_free_value (GValue* value) +{ #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" if (value->data[0].v_pointer) { #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_roll_unref (value->data[0].v_pointer); -#line 3855 "BatchImport.c" +#line 4472 "BatchImport.c" } } -static void value_batch_import_roll_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_batch_import_roll_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" if (src_value->data[0].v_pointer) { #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = batch_import_roll_ref (src_value->data[0].v_pointer); -#line 3865 "BatchImport.c" +#line 4485 "BatchImport.c" } else { #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = NULL; -#line 3869 "BatchImport.c" +#line 4489 "BatchImport.c" } } -static gpointer value_batch_import_roll_peek_pointer (const GValue* value) { +static gpointer +value_batch_import_roll_peek_pointer (const GValue* value) +{ #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 3877 "BatchImport.c" +#line 4499 "BatchImport.c" } -static gchar* value_batch_import_roll_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_batch_import_roll_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" if (collect_values[0].v_pointer) { -#line 3884 "BatchImport.c" +#line 4511 "BatchImport.c" BatchImportRoll * object; object = collect_values[0].v_pointer; #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" if (object->parent_instance.g_class == NULL) { #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3891 "BatchImport.c" +#line 4518 "BatchImport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3895 "BatchImport.c" +#line 4522 "BatchImport.c" } #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = batch_import_roll_ref (object); -#line 3899 "BatchImport.c" +#line 4526 "BatchImport.c" } else { #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 3903 "BatchImport.c" +#line 4530 "BatchImport.c" } #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 3907 "BatchImport.c" +#line 4534 "BatchImport.c" } -static gchar* value_batch_import_roll_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_batch_import_roll_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ BatchImportRoll ** object_p; object_p = collect_values[0].v_pointer; #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!object_p) { #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3918 "BatchImport.c" +#line 4550 "BatchImport.c" } #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!value->data[0].v_pointer) { #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = NULL; -#line 3924 "BatchImport.c" +#line 4556 "BatchImport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = value->data[0].v_pointer; -#line 3928 "BatchImport.c" +#line 4560 "BatchImport.c" } else { #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = batch_import_roll_ref (value->data[0].v_pointer); -#line 3932 "BatchImport.c" +#line 4564 "BatchImport.c" } #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 3936 "BatchImport.c" +#line 4568 "BatchImport.c" } -GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_batch_import_roll (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecBatchImportRoll* spec; #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_BATCH_IMPORT_ROLL), NULL); @@ -3946,20 +4584,25 @@ GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" return G_PARAM_SPEC (spec); -#line 3950 "BatchImport.c" +#line 4588 "BatchImport.c" } -gpointer value_get_batch_import_roll (const GValue* value) { +gpointer +value_get_batch_import_roll (const GValue* value) +{ #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_ROLL), NULL); #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 3959 "BatchImport.c" +#line 4599 "BatchImport.c" } -void value_set_batch_import_roll (GValue* value, gpointer v_object) { +void +value_set_batch_import_roll (GValue* value, + gpointer v_object) +{ BatchImportRoll * old; #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_ROLL)); @@ -3975,22 +4618,25 @@ void value_set_batch_import_roll (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_roll_ref (value->data[0].v_pointer); -#line 3979 "BatchImport.c" +#line 4622 "BatchImport.c" } else { #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 3983 "BatchImport.c" +#line 4626 "BatchImport.c" } #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_roll_unref (old); -#line 3989 "BatchImport.c" +#line 4632 "BatchImport.c" } } -void value_take_batch_import_roll (GValue* value, gpointer v_object) { +void +value_take_batch_import_roll (GValue* value, + gpointer v_object) +{ BatchImportRoll * old; #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_ROLL)); @@ -4004,31 +4650,35 @@ void value_take_batch_import_roll (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = v_object; -#line 4008 "BatchImport.c" +#line 4654 "BatchImport.c" } else { #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 4012 "BatchImport.c" +#line 4658 "BatchImport.c" } #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_roll_unref (old); -#line 4018 "BatchImport.c" +#line 4664 "BatchImport.c" } } -static void batch_import_roll_class_init (BatchImportRollClass * klass) { +static void +batch_import_roll_class_init (BatchImportRollClass * klass) +{ #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_roll_parent_class = g_type_class_peek_parent (klass); #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" ((BatchImportRollClass *) klass)->finalize = batch_import_roll_finalize; -#line 4028 "BatchImport.c" +#line 4676 "BatchImport.c" } -static void batch_import_roll_instance_init (BatchImportRoll * self) { +static void +batch_import_roll_instance_init (BatchImportRoll * self) +{ ViewCollection* _tmp0_; #line 279 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = view_collection_new ("BatchImportRoll generated events"); @@ -4036,11 +4686,13 @@ static void batch_import_roll_instance_init (BatchImportRoll * self) { self->generated_events = _tmp0_; #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" self->ref_count = 1; -#line 4040 "BatchImport.c" +#line 4690 "BatchImport.c" } -static void batch_import_roll_finalize (BatchImportRoll * obj) { +static void +batch_import_roll_finalize (BatchImportRoll * obj) +{ BatchImportRoll * self; #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BATCH_IMPORT_ROLL, BatchImportRoll); @@ -4048,11 +4700,13 @@ static void batch_import_roll_finalize (BatchImportRoll * obj) { g_signal_handlers_destroy (self); #line 279 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_collection_unref0 (self->generated_events); -#line 4052 "BatchImport.c" +#line 4704 "BatchImport.c" } -GType batch_import_roll_get_type (void) { +GType +batch_import_roll_get_type (void) +{ static volatile gsize batch_import_roll_type_id__volatile = 0; if (g_once_init_enter (&batch_import_roll_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_batch_import_roll_init, value_batch_import_roll_free_value, value_batch_import_roll_copy_value, value_batch_import_roll_peek_pointer, "p", value_batch_import_roll_collect_value, "p", value_batch_import_roll_lcopy_value }; @@ -4066,18 +4720,22 @@ GType batch_import_roll_get_type (void) { } -gpointer batch_import_roll_ref (gpointer instance) { +gpointer +batch_import_roll_ref (gpointer instance) +{ BatchImportRoll * self; self = instance; #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" g_atomic_int_inc (&self->ref_count); #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" return instance; -#line 4077 "BatchImport.c" +#line 4733 "BatchImport.c" } -void batch_import_roll_unref (gpointer instance) { +void +batch_import_roll_unref (gpointer instance) +{ BatchImportRoll * self; self = instance; #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4086,24 +4744,26 @@ void batch_import_roll_unref (gpointer instance) { BATCH_IMPORT_ROLL_GET_CLASS (self)->finalize (self); #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 4090 "BatchImport.c" +#line 4748 "BatchImport.c" } } -BatchImportResult* batch_import_result_construct (GType object_type, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, DuplicatedFile* duplicate_of, ImportResult _result_) { +BatchImportResult* +batch_import_result_construct (GType object_type, + BatchImportJob* job, + GFile* file, + const gchar* src_identifier, + const gchar* dest_identifier, + DuplicatedFile* duplicate_of, + ImportResult _result_) +{ BatchImportResult* self = NULL; BatchImportJob* _tmp0_; - BatchImportJob* _tmp1_; - GFile* _tmp2_; - GFile* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; - DuplicatedFile* _tmp8_; - DuplicatedFile* _tmp9_; - ImportResult _tmp10_; + GFile* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + DuplicatedFile* _tmp4_; #line 301 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), NULL); #line 301 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4117,78 +4777,73 @@ BatchImportResult* batch_import_result_construct (GType object_type, BatchImport #line 301 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (BatchImportResult*) g_type_create_instance (object_type); #line 303 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = job; -#line 303 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = _batch_import_job_ref0 (_tmp0_); + _tmp0_ = _batch_import_job_ref0 (job); #line 303 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (self->job); #line 303 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->job = _tmp1_; + self->job = _tmp0_; #line 304 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = file; -#line 304 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (file); #line 304 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->file); #line 304 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->file = _tmp3_; -#line 305 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = src_identifier; + self->file = _tmp1_; #line 305 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = g_strdup (_tmp4_); + _tmp2_ = g_strdup (src_identifier); #line 305 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->src_identifier); #line 305 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->src_identifier = _tmp5_; -#line 306 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = dest_identifier; + self->src_identifier = _tmp2_; #line 306 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp3_ = g_strdup (dest_identifier); #line 306 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->dest_identifier); #line 306 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->dest_identifier = _tmp7_; + self->dest_identifier = _tmp3_; #line 307 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = duplicate_of; -#line 307 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = _g_object_ref0 (_tmp8_); + _tmp4_ = _g_object_ref0 (duplicate_of); #line 307 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->duplicate_of); #line 307 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->duplicate_of = _tmp9_; -#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = _result_; + self->duplicate_of = _tmp4_; #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->result = _tmp10_; + self->result = _result_; #line 301 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 4166 "BatchImport.c" +#line 4814 "BatchImport.c" } -BatchImportResult* batch_import_result_new (BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, DuplicatedFile* duplicate_of, ImportResult _result_) { +BatchImportResult* +batch_import_result_new (BatchImportJob* job, + GFile* file, + const gchar* src_identifier, + const gchar* dest_identifier, + DuplicatedFile* duplicate_of, + ImportResult _result_) +{ #line 301 "/home/jens/Source/shotwell/src/BatchImport.vala" return batch_import_result_construct (TYPE_BATCH_IMPORT_RESULT, job, file, src_identifier, dest_identifier, duplicate_of, _result_); -#line 4173 "BatchImport.c" +#line 4828 "BatchImport.c" } -BatchImportResult* batch_import_result_construct_from_error (GType object_type, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result) { +BatchImportResult* +batch_import_result_construct_from_error (GType object_type, + BatchImportJob* job, + GFile* file, + const gchar* src_identifier, + const gchar* dest_identifier, + GError* err, + ImportResult default_result) +{ BatchImportResult* self = NULL; BatchImportJob* _tmp0_; - BatchImportJob* _tmp1_; - GFile* _tmp2_; - GFile* _tmp3_; + GFile* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; const gchar* _tmp4_; gchar* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; - GError* _tmp8_; - ImportResult _tmp9_; - ImportResult _tmp10_; - GError* _tmp11_; - const gchar* _tmp12_; - gchar* _tmp13_; #line 311 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), NULL); #line 311 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4200,166 +4855,182 @@ BatchImportResult* batch_import_result_construct_from_error (GType object_type, #line 311 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (BatchImportResult*) g_type_create_instance (object_type); #line 313 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = job; -#line 313 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = _batch_import_job_ref0 (_tmp0_); + _tmp0_ = _batch_import_job_ref0 (job); #line 313 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (self->job); #line 313 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->job = _tmp1_; -#line 314 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = file; + self->job = _tmp0_; #line 314 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (file); #line 314 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->file); #line 314 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->file = _tmp3_; + self->file = _tmp1_; #line 315 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = src_identifier; -#line 315 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = g_strdup (_tmp4_); + _tmp2_ = g_strdup (src_identifier); #line 315 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->src_identifier); #line 315 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->src_identifier = _tmp5_; + self->src_identifier = _tmp2_; #line 316 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = dest_identifier; -#line 316 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp3_ = g_strdup (dest_identifier); #line 316 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->dest_identifier); #line 316 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->dest_identifier = _tmp7_; -#line 317 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = err; + self->dest_identifier = _tmp3_; #line 317 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = default_result; -#line 317 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = import_result_convert_error (_tmp8_, _tmp9_); -#line 317 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->result = _tmp10_; + self->result = import_result_convert_error (err, default_result); #line 318 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = err; + _tmp4_ = err->message; #line 318 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = _tmp11_->message; -#line 318 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = g_strdup (_tmp12_); + _tmp5_ = g_strdup (_tmp4_); #line 318 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->errmsg); #line 318 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->errmsg = _tmp13_; + self->errmsg = _tmp5_; #line 311 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 4255 "BatchImport.c" +#line 4894 "BatchImport.c" } -BatchImportResult* batch_import_result_new_from_error (BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result) { +BatchImportResult* +batch_import_result_new_from_error (BatchImportJob* job, + GFile* file, + const gchar* src_identifier, + const gchar* dest_identifier, + GError* err, + ImportResult default_result) +{ #line 311 "/home/jens/Source/shotwell/src/BatchImport.vala" return batch_import_result_construct_from_error (TYPE_BATCH_IMPORT_RESULT, job, file, src_identifier, dest_identifier, err, default_result); -#line 4262 "BatchImport.c" +#line 4908 "BatchImport.c" } -static void value_batch_import_result_init (GValue* value) { +static void +value_batch_import_result_init (GValue* value) +{ #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 4269 "BatchImport.c" +#line 4917 "BatchImport.c" } -static void value_batch_import_result_free_value (GValue* value) { +static void +value_batch_import_result_free_value (GValue* value) +{ #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" if (value->data[0].v_pointer) { #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_result_unref (value->data[0].v_pointer); -#line 4278 "BatchImport.c" +#line 4928 "BatchImport.c" } } -static void value_batch_import_result_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_batch_import_result_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" if (src_value->data[0].v_pointer) { #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = batch_import_result_ref (src_value->data[0].v_pointer); -#line 4288 "BatchImport.c" +#line 4941 "BatchImport.c" } else { #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = NULL; -#line 4292 "BatchImport.c" +#line 4945 "BatchImport.c" } } -static gpointer value_batch_import_result_peek_pointer (const GValue* value) { +static gpointer +value_batch_import_result_peek_pointer (const GValue* value) +{ #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 4300 "BatchImport.c" +#line 4955 "BatchImport.c" } -static gchar* value_batch_import_result_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_batch_import_result_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" if (collect_values[0].v_pointer) { -#line 4307 "BatchImport.c" +#line 4967 "BatchImport.c" BatchImportResult * object; object = collect_values[0].v_pointer; #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" if (object->parent_instance.g_class == NULL) { #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4314 "BatchImport.c" +#line 4974 "BatchImport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4318 "BatchImport.c" +#line 4978 "BatchImport.c" } #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = batch_import_result_ref (object); -#line 4322 "BatchImport.c" +#line 4982 "BatchImport.c" } else { #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 4326 "BatchImport.c" +#line 4986 "BatchImport.c" } #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 4330 "BatchImport.c" +#line 4990 "BatchImport.c" } -static gchar* value_batch_import_result_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_batch_import_result_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ BatchImportResult ** object_p; object_p = collect_values[0].v_pointer; #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!object_p) { #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 4341 "BatchImport.c" +#line 5006 "BatchImport.c" } #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!value->data[0].v_pointer) { #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = NULL; -#line 4347 "BatchImport.c" +#line 5012 "BatchImport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = value->data[0].v_pointer; -#line 4351 "BatchImport.c" +#line 5016 "BatchImport.c" } else { #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = batch_import_result_ref (value->data[0].v_pointer); -#line 4355 "BatchImport.c" +#line 5020 "BatchImport.c" } #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 4359 "BatchImport.c" +#line 5024 "BatchImport.c" } -GParamSpec* param_spec_batch_import_result (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_batch_import_result (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecBatchImportResult* spec; #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_BATCH_IMPORT_RESULT), NULL); @@ -4369,20 +5040,25 @@ GParamSpec* param_spec_batch_import_result (const gchar* name, const gchar* nick G_PARAM_SPEC (spec)->value_type = object_type; #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" return G_PARAM_SPEC (spec); -#line 4373 "BatchImport.c" +#line 5044 "BatchImport.c" } -gpointer value_get_batch_import_result (const GValue* value) { +gpointer +value_get_batch_import_result (const GValue* value) +{ #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_RESULT), NULL); #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 4382 "BatchImport.c" +#line 5055 "BatchImport.c" } -void value_set_batch_import_result (GValue* value, gpointer v_object) { +void +value_set_batch_import_result (GValue* value, + gpointer v_object) +{ BatchImportResult * old; #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_RESULT)); @@ -4398,22 +5074,25 @@ void value_set_batch_import_result (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_result_ref (value->data[0].v_pointer); -#line 4402 "BatchImport.c" +#line 5078 "BatchImport.c" } else { #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 4406 "BatchImport.c" +#line 5082 "BatchImport.c" } #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_result_unref (old); -#line 4412 "BatchImport.c" +#line 5088 "BatchImport.c" } } -void value_take_batch_import_result (GValue* value, gpointer v_object) { +void +value_take_batch_import_result (GValue* value, + gpointer v_object) +{ BatchImportResult * old; #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_RESULT)); @@ -4427,40 +5106,46 @@ void value_take_batch_import_result (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = v_object; -#line 4431 "BatchImport.c" +#line 5110 "BatchImport.c" } else { #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 4435 "BatchImport.c" +#line 5114 "BatchImport.c" } #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_result_unref (old); -#line 4441 "BatchImport.c" +#line 5120 "BatchImport.c" } } -static void batch_import_result_class_init (BatchImportResultClass * klass) { +static void +batch_import_result_class_init (BatchImportResultClass * klass) +{ #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_result_parent_class = g_type_class_peek_parent (klass); #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" ((BatchImportResultClass *) klass)->finalize = batch_import_result_finalize; -#line 4451 "BatchImport.c" +#line 5132 "BatchImport.c" } -static void batch_import_result_instance_init (BatchImportResult * self) { +static void +batch_import_result_instance_init (BatchImportResult * self) +{ #line 298 "/home/jens/Source/shotwell/src/BatchImport.vala" self->errmsg = NULL; #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" self->ref_count = 1; -#line 4460 "BatchImport.c" +#line 5143 "BatchImport.c" } -static void batch_import_result_finalize (BatchImportResult * obj) { +static void +batch_import_result_finalize (BatchImportResult * obj) +{ BatchImportResult * self; #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BATCH_IMPORT_RESULT, BatchImportResult); @@ -4478,11 +5163,13 @@ static void batch_import_result_finalize (BatchImportResult * obj) { _g_free0 (self->errmsg); #line 299 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->duplicate_of); -#line 4482 "BatchImport.c" +#line 5167 "BatchImport.c" } -GType batch_import_result_get_type (void) { +GType +batch_import_result_get_type (void) +{ static volatile gsize batch_import_result_type_id__volatile = 0; if (g_once_init_enter (&batch_import_result_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_batch_import_result_init, value_batch_import_result_free_value, value_batch_import_result_copy_value, value_batch_import_result_peek_pointer, "p", value_batch_import_result_collect_value, "p", value_batch_import_result_lcopy_value }; @@ -4496,18 +5183,22 @@ GType batch_import_result_get_type (void) { } -gpointer batch_import_result_ref (gpointer instance) { +gpointer +batch_import_result_ref (gpointer instance) +{ BatchImportResult * self; self = instance; #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" g_atomic_int_inc (&self->ref_count); #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" return instance; -#line 4507 "BatchImport.c" +#line 5196 "BatchImport.c" } -void batch_import_result_unref (gpointer instance) { +void +batch_import_result_unref (gpointer instance) +{ BatchImportResult * self; self = instance; #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4516,16 +5207,18 @@ void batch_import_result_unref (gpointer instance) { BATCH_IMPORT_RESULT_GET_CLASS (self)->finalize (self); #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 4520 "BatchImport.c" +#line 5211 "BatchImport.c" } } -ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed, GeeList* pre_already_imported) { +ImportManifest* +import_manifest_construct (GType object_type, + GeeList* prefailed, + GeeList* pre_already_imported) +{ ImportManifest* self = NULL; GTimer* _tmp0_; - GeeList* _tmp1_; - GeeList* _tmp23_; #line 336 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail ((prefailed == NULL) || GEE_IS_LIST (prefailed), NULL); #line 336 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4539,277 +5232,272 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed #line 338 "/home/jens/Source/shotwell/src/BatchImport.vala" self->timer = _tmp0_; #line 339 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = prefailed; -#line 339 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp1_ != NULL) { -#line 4546 "BatchImport.c" + if (prefailed != NULL) { +#line 5237 "BatchImport.c" { GeeList* _job_list = NULL; - GeeList* _tmp2_; - GeeList* _tmp3_; + GeeList* _tmp1_; gint _job_size = 0; - GeeList* _tmp4_; - gint _tmp5_; - gint _tmp6_; + GeeList* _tmp2_; + gint _tmp3_; + gint _tmp4_; gint _job_index = 0; #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = prefailed; + _tmp1_ = _g_object_ref0 (prefailed); #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _job_list = _tmp1_; #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" - _job_list = _tmp3_; + _tmp2_ = _job_list; #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = _job_list; + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp4_ = _tmp3_; #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = _tmp5_; -#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" - _job_size = _tmp6_; + _job_size = _tmp4_; #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" _job_index = -1; #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 4574 "BatchImport.c" +#line 5262 "BatchImport.c" + gint _tmp5_; + gint _tmp6_; gint _tmp7_; - gint _tmp8_; - gint _tmp9_; BatchImportJob* job = NULL; - GeeList* _tmp10_; - gint _tmp11_; - gpointer _tmp12_; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; BatchImportResult* batch_result = NULL; - BatchImportJob* _tmp13_; - BatchImportJob* _tmp14_; - gchar* _tmp15_; + BatchImportJob* _tmp11_; + BatchImportJob* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + BatchImportJob* _tmp15_; gchar* _tmp16_; - BatchImportJob* _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; + gchar* _tmp17_; + BatchImportResult* _tmp18_; + BatchImportResult* _tmp19_; BatchImportResult* _tmp20_; - BatchImportResult* _tmp21_; - BatchImportResult* _tmp22_; #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = _job_index; + _tmp5_ = _job_index; #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" - _job_index = _tmp7_ + 1; + _job_index = _tmp5_ + 1; #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = _job_index; + _tmp6_ = _job_index; #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = _job_size; + _tmp7_ = _job_size; #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!(_tmp8_ < _tmp9_)) { + if (!(_tmp6_ < _tmp7_)) { #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4605 "BatchImport.c" +#line 5293 "BatchImport.c" } #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = _job_list; + _tmp8_ = _job_list; #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = _job_index; + _tmp9_ = _job_index; #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = gee_list_get (_tmp10_, _tmp11_); + _tmp10_ = gee_list_get (_tmp8_, _tmp9_); #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" - job = (BatchImportJob*) _tmp12_; + job = (BatchImportJob*) _tmp10_; #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = job; + _tmp11_ = job; #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = job; + _tmp12_ = job; #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = batch_import_job_get_source_identifier (_tmp14_); + _tmp13_ = batch_import_job_get_source_identifier (_tmp12_); #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = _tmp15_; + _tmp14_ = _tmp13_; #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = job; + _tmp15_ = job; #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = batch_import_job_get_dest_identifier (_tmp17_); + _tmp16_ = batch_import_job_get_dest_identifier (_tmp15_); #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = _tmp18_; + _tmp17_ = _tmp16_; #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp20_ = batch_import_result_new (_tmp13_, NULL, _tmp16_, _tmp19_, NULL, IMPORT_RESULT_FILE_ERROR); + _tmp18_ = batch_import_result_new (_tmp11_, NULL, _tmp14_, _tmp17_, NULL, IMPORT_RESULT_FILE_ERROR); #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp21_ = _tmp20_; + _tmp19_ = _tmp18_; #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp19_); + _g_free0 (_tmp17_); #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp14_); #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_result = _tmp21_; + batch_result = _tmp19_; #line 345 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp22_ = batch_result; + _tmp20_ = batch_result; #line 345 "/home/jens/Source/shotwell/src/BatchImport.vala" - import_manifest_add_result (self, _tmp22_); + import_manifest_add_result (self, _tmp20_); #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (batch_result); #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (job); -#line 4647 "BatchImport.c" +#line 5335 "BatchImport.c" } #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_job_list); -#line 4651 "BatchImport.c" +#line 5339 "BatchImport.c" } } #line 349 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp23_ = pre_already_imported; -#line 349 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp23_ != NULL) { -#line 4658 "BatchImport.c" + if (pre_already_imported != NULL) { +#line 5344 "BatchImport.c" { GeeList* _job_list = NULL; - GeeList* _tmp24_; - GeeList* _tmp25_; + GeeList* _tmp21_; gint _job_size = 0; - GeeList* _tmp26_; - gint _tmp27_; - gint _tmp28_; + GeeList* _tmp22_; + gint _tmp23_; + gint _tmp24_; gint _job_index = 0; #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp24_ = pre_already_imported; -#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp25_ = _g_object_ref0 (_tmp24_); + _tmp21_ = _g_object_ref0 (pre_already_imported); #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" - _job_list = _tmp25_; + _job_list = _tmp21_; #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp26_ = _job_list; + _tmp22_ = _job_list; #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp27_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp23_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection)); #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp28_ = _tmp27_; + _tmp24_ = _tmp23_; #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" - _job_size = _tmp28_; + _job_size = _tmp24_; #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" _job_index = -1; #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 4686 "BatchImport.c" - gint _tmp29_; - gint _tmp30_; - gint _tmp31_; +#line 5369 "BatchImport.c" + gint _tmp25_; + gint _tmp26_; + gint _tmp27_; BatchImportJob* job = NULL; - GeeList* _tmp32_; - gint _tmp33_; - gpointer _tmp34_; + GeeList* _tmp28_; + gint _tmp29_; + gpointer _tmp30_; BatchImportResult* batch_result = NULL; - BatchImportJob* _tmp35_; - BatchImportJob* _tmp36_; - gchar* _tmp37_; + BatchImportJob* _tmp31_; + BatchImportJob* _tmp32_; + gchar* _tmp33_; + gchar* _tmp34_; + GFile* _tmp35_; + GFile* _tmp36_; + BatchImportJob* _tmp37_; gchar* _tmp38_; - GFile* _tmp39_; - GFile* _tmp40_; - BatchImportJob* _tmp41_; + gchar* _tmp39_; + BatchImportJob* _tmp40_; + gchar* _tmp41_; gchar* _tmp42_; - gchar* _tmp43_; - BatchImportJob* _tmp44_; - gchar* _tmp45_; - gchar* _tmp46_; - BatchImportJob* _tmp47_; - DuplicatedFile* _tmp48_; - DuplicatedFile* _tmp49_; - BatchImportResult* _tmp50_; - BatchImportResult* _tmp51_; - BatchImportResult* _tmp52_; + BatchImportJob* _tmp43_; + DuplicatedFile* _tmp44_; + DuplicatedFile* _tmp45_; + BatchImportResult* _tmp46_; + BatchImportResult* _tmp47_; + BatchImportResult* _tmp48_; #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp29_ = _job_index; + _tmp25_ = _job_index; #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" - _job_index = _tmp29_ + 1; + _job_index = _tmp25_ + 1; #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp30_ = _job_index; + _tmp26_ = _job_index; #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp31_ = _job_size; + _tmp27_ = _job_size; #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!(_tmp30_ < _tmp31_)) { + if (!(_tmp26_ < _tmp27_)) { #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4725 "BatchImport.c" +#line 5408 "BatchImport.c" } #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp32_ = _job_list; + _tmp28_ = _job_list; #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp33_ = _job_index; + _tmp29_ = _job_index; #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp34_ = gee_list_get (_tmp32_, _tmp33_); + _tmp30_ = gee_list_get (_tmp28_, _tmp29_); #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" - job = (BatchImportJob*) _tmp34_; + job = (BatchImportJob*) _tmp30_; #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp35_ = job; + _tmp31_ = job; #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp36_ = job; + _tmp32_ = job; #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp37_ = batch_import_job_get_basename (_tmp36_); + _tmp33_ = batch_import_job_get_basename (_tmp32_); #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp38_ = _tmp37_; + _tmp34_ = _tmp33_; #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp39_ = g_file_new_for_path (_tmp38_); + _tmp35_ = g_file_new_for_path (_tmp34_); #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp40_ = _tmp39_; + _tmp36_ = _tmp35_; #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp41_ = job; + _tmp37_ = job; #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp42_ = batch_import_job_get_source_identifier (_tmp41_); + _tmp38_ = batch_import_job_get_source_identifier (_tmp37_); #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp43_ = _tmp42_; + _tmp39_ = _tmp38_; #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp44_ = job; + _tmp40_ = job; #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp45_ = batch_import_job_get_dest_identifier (_tmp44_); + _tmp41_ = batch_import_job_get_dest_identifier (_tmp40_); #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp46_ = _tmp45_; + _tmp42_ = _tmp41_; #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp47_ = job; + _tmp43_ = job; #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp48_ = batch_import_job_get_duplicated_file (_tmp47_); + _tmp44_ = batch_import_job_get_duplicated_file (_tmp43_); #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp49_ = _tmp48_; + _tmp45_ = _tmp44_; #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp50_ = batch_import_result_new (_tmp35_, _tmp40_, _tmp43_, _tmp46_, _tmp49_, IMPORT_RESULT_PHOTO_EXISTS); + _tmp46_ = batch_import_result_new (_tmp31_, _tmp36_, _tmp39_, _tmp42_, _tmp45_, IMPORT_RESULT_PHOTO_EXISTS); #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp51_ = _tmp50_; + _tmp47_ = _tmp46_; #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp49_); + _g_object_unref0 (_tmp45_); #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp46_); + _g_free0 (_tmp42_); #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp43_); + _g_free0 (_tmp39_); #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp40_); + _g_object_unref0 (_tmp36_); #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp38_); + _g_free0 (_tmp34_); #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_result = _tmp51_; + batch_result = _tmp47_; #line 356 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp52_ = batch_result; + _tmp48_ = batch_result; #line 356 "/home/jens/Source/shotwell/src/BatchImport.vala" - import_manifest_add_result (self, _tmp52_); + import_manifest_add_result (self, _tmp48_); #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (batch_result); #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (job); -#line 4789 "BatchImport.c" +#line 5472 "BatchImport.c" } #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_job_list); -#line 4793 "BatchImport.c" +#line 5476 "BatchImport.c" } } #line 336 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 4798 "BatchImport.c" +#line 5481 "BatchImport.c" } -ImportManifest* import_manifest_new (GeeList* prefailed, GeeList* pre_already_imported) { +ImportManifest* +import_manifest_new (GeeList* prefailed, + GeeList* pre_already_imported) +{ #line 336 "/home/jens/Source/shotwell/src/BatchImport.vala" return import_manifest_construct (TYPE_IMPORT_MANIFEST, prefailed, pre_already_imported); -#line 4805 "BatchImport.c" +#line 5491 "BatchImport.c" } -void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_result) { +void +import_manifest_add_result (ImportManifest* self, + BatchImportResult* batch_result) +{ gboolean reported = FALSE; - BatchImportResult* _tmp0_; - ImportResult _tmp1_; - gboolean _tmp26_; + ImportResult _tmp0_; + gboolean _tmp13_; #line 361 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_IMPORT_MANIFEST (self)); #line 361 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4817,308 +5505,292 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_ #line 362 "/home/jens/Source/shotwell/src/BatchImport.vala" reported = TRUE; #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = batch_result; -#line 363 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = _tmp0_->result; + _tmp0_ = batch_result->result; #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala" - switch (_tmp1_) { + switch (_tmp0_) { #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_SUCCESS: -#line 4828 "BatchImport.c" +#line 5514 "BatchImport.c" { - GeeList* _tmp2_; - BatchImportResult* _tmp3_; + GeeList* _tmp1_; #line 365 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = self->success; + _tmp1_ = self->success; #line 365 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = batch_result; -#line 365 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), _tmp3_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), batch_result); #line 366 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4840 "BatchImport.c" +#line 5523 "BatchImport.c" } #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_USER_ABORT: -#line 4844 "BatchImport.c" +#line 5527 "BatchImport.c" { - gboolean _tmp4_ = FALSE; - BatchImportResult* _tmp5_; - GFile* _tmp6_; -#line 369 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = batch_result; -#line 369 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = _tmp5_->file; -#line 369 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp6_ != NULL) { -#line 4855 "BatchImport.c" - BatchImportResult* _tmp7_; - GFile* _tmp8_; - gboolean _tmp9_; + gboolean _tmp2_ = FALSE; + GFile* _tmp3_; #line 369 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = batch_result; + _tmp3_ = batch_result->file; #line 369 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = _tmp7_->file; + if (_tmp3_ != NULL) { +#line 5535 "BatchImport.c" + GFile* _tmp4_; #line 369 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = query_is_directory (_tmp8_); + _tmp4_ = batch_result->file; #line 369 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = !_tmp9_; -#line 4867 "BatchImport.c" + _tmp2_ = !query_is_directory (_tmp4_); +#line 5541 "BatchImport.c" } else { #line 369 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = FALSE; -#line 4871 "BatchImport.c" + _tmp2_ = FALSE; +#line 5545 "BatchImport.c" } #line 369 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp4_) { -#line 4875 "BatchImport.c" - GeeList* _tmp10_; - BatchImportResult* _tmp11_; + if (_tmp2_) { +#line 5549 "BatchImport.c" + GeeList* _tmp5_; #line 370 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = self->aborted; + _tmp5_ = self->aborted; #line 370 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = batch_result; -#line 370 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_); -#line 4884 "BatchImport.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), batch_result); +#line 5555 "BatchImport.c" } else { #line 372 "/home/jens/Source/shotwell/src/BatchImport.vala" reported = FALSE; -#line 4888 "BatchImport.c" +#line 5559 "BatchImport.c" } #line 373 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4892 "BatchImport.c" +#line 5563 "BatchImport.c" } #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_UNSUPPORTED_FORMAT: -#line 4896 "BatchImport.c" +#line 5567 "BatchImport.c" { - GeeList* _tmp12_; - BatchImportResult* _tmp13_; -#line 376 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = self->skipped_photos; + GeeList* _tmp6_; #line 376 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = batch_result; + _tmp6_ = self->skipped_photos; #line 376 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), batch_result); #line 377 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4908 "BatchImport.c" +#line 5576 "BatchImport.c" } #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_NOT_A_FILE: #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_NOT_AN_IMAGE: -#line 4914 "BatchImport.c" +#line 5582 "BatchImport.c" { - GeeList* _tmp14_; - BatchImportResult* _tmp15_; + GeeList* _tmp7_; #line 381 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = self->skipped_files; + _tmp7_ = self->skipped_files; #line 381 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = batch_result; -#line 381 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), batch_result); #line 382 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4926 "BatchImport.c" +#line 5591 "BatchImport.c" } #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_PHOTO_EXISTS: -#line 4930 "BatchImport.c" +#line 5595 "BatchImport.c" { - GeeList* _tmp16_; - BatchImportResult* _tmp17_; + GeeList* _tmp8_; #line 385 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = self->already_imported; + _tmp8_ = self->already_imported; #line 385 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = batch_result; -#line 385 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), batch_result); #line 386 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4942 "BatchImport.c" +#line 5604 "BatchImport.c" } #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_CAMERA_ERROR: -#line 4946 "BatchImport.c" +#line 5608 "BatchImport.c" { - GeeList* _tmp18_; - BatchImportResult* _tmp19_; -#line 389 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = self->camera_failed; + GeeList* _tmp9_; #line 389 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = batch_result; + _tmp9_ = self->camera_failed; #line 389 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection), batch_result); #line 390 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4958 "BatchImport.c" +#line 5617 "BatchImport.c" } #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_FILE_WRITE_ERROR: -#line 4962 "BatchImport.c" +#line 5621 "BatchImport.c" { - GeeList* _tmp20_; - BatchImportResult* _tmp21_; -#line 393 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp20_ = self->write_failed; + GeeList* _tmp10_; #line 393 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp21_ = batch_result; + _tmp10_ = self->write_failed; #line 393 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), batch_result); #line 394 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4974 "BatchImport.c" +#line 5630 "BatchImport.c" } #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE: -#line 4978 "BatchImport.c" +#line 5634 "BatchImport.c" { - GeeList* _tmp22_; - BatchImportResult* _tmp23_; -#line 397 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp22_ = self->corrupt_files; + GeeList* _tmp11_; #line 397 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp23_ = batch_result; + _tmp11_ = self->corrupt_files; #line 397 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection), batch_result); #line 398 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4990 "BatchImport.c" +#line 5643 "BatchImport.c" } default: { - GeeList* _tmp24_; - BatchImportResult* _tmp25_; -#line 401 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp24_ = self->failed; + GeeList* _tmp12_; #line 401 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp25_ = batch_result; + _tmp12_ = self->failed; #line 401 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), batch_result); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 5004 "BatchImport.c" +#line 5654 "BatchImport.c" } } #line 405 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp26_ = reported; + _tmp13_ = reported; #line 405 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp26_) { -#line 5011 "BatchImport.c" - GeeList* _tmp27_; - BatchImportResult* _tmp28_; -#line 406 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp27_ = self->all; + if (_tmp13_) { +#line 5661 "BatchImport.c" + GeeList* _tmp14_; #line 406 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp28_ = batch_result; + _tmp14_ = self->all; #line 406 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_); -#line 5020 "BatchImport.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), batch_result); +#line 5667 "BatchImport.c" } } -static void value_import_manifest_init (GValue* value) { +static void +value_import_manifest_init (GValue* value) +{ #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 5028 "BatchImport.c" +#line 5677 "BatchImport.c" } -static void value_import_manifest_free_value (GValue* value) { +static void +value_import_manifest_free_value (GValue* value) +{ #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" if (value->data[0].v_pointer) { #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" import_manifest_unref (value->data[0].v_pointer); -#line 5037 "BatchImport.c" +#line 5688 "BatchImport.c" } } -static void value_import_manifest_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_import_manifest_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" if (src_value->data[0].v_pointer) { #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = import_manifest_ref (src_value->data[0].v_pointer); -#line 5047 "BatchImport.c" +#line 5701 "BatchImport.c" } else { #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = NULL; -#line 5051 "BatchImport.c" +#line 5705 "BatchImport.c" } } -static gpointer value_import_manifest_peek_pointer (const GValue* value) { +static gpointer +value_import_manifest_peek_pointer (const GValue* value) +{ #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 5059 "BatchImport.c" +#line 5715 "BatchImport.c" } -static gchar* value_import_manifest_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_import_manifest_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" if (collect_values[0].v_pointer) { -#line 5066 "BatchImport.c" +#line 5727 "BatchImport.c" ImportManifest * object; object = collect_values[0].v_pointer; #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" if (object->parent_instance.g_class == NULL) { #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 5073 "BatchImport.c" +#line 5734 "BatchImport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 5077 "BatchImport.c" +#line 5738 "BatchImport.c" } #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = import_manifest_ref (object); -#line 5081 "BatchImport.c" +#line 5742 "BatchImport.c" } else { #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 5085 "BatchImport.c" +#line 5746 "BatchImport.c" } #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 5089 "BatchImport.c" +#line 5750 "BatchImport.c" } -static gchar* value_import_manifest_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_import_manifest_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ ImportManifest ** object_p; object_p = collect_values[0].v_pointer; #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!object_p) { #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 5100 "BatchImport.c" +#line 5766 "BatchImport.c" } #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!value->data[0].v_pointer) { #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = NULL; -#line 5106 "BatchImport.c" +#line 5772 "BatchImport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = value->data[0].v_pointer; -#line 5110 "BatchImport.c" +#line 5776 "BatchImport.c" } else { #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = import_manifest_ref (value->data[0].v_pointer); -#line 5114 "BatchImport.c" +#line 5780 "BatchImport.c" } #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 5118 "BatchImport.c" +#line 5784 "BatchImport.c" } -GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_import_manifest (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecImportManifest* spec; #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_IMPORT_MANIFEST), NULL); @@ -5128,20 +5800,25 @@ GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, co G_PARAM_SPEC (spec)->value_type = object_type; #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" return G_PARAM_SPEC (spec); -#line 5132 "BatchImport.c" +#line 5804 "BatchImport.c" } -gpointer value_get_import_manifest (const GValue* value) { +gpointer +value_get_import_manifest (const GValue* value) +{ #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORT_MANIFEST), NULL); #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 5141 "BatchImport.c" +#line 5815 "BatchImport.c" } -void value_set_import_manifest (GValue* value, gpointer v_object) { +void +value_set_import_manifest (GValue* value, + gpointer v_object) +{ ImportManifest * old; #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORT_MANIFEST)); @@ -5157,22 +5834,25 @@ void value_set_import_manifest (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" import_manifest_ref (value->data[0].v_pointer); -#line 5161 "BatchImport.c" +#line 5838 "BatchImport.c" } else { #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 5165 "BatchImport.c" +#line 5842 "BatchImport.c" } #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" import_manifest_unref (old); -#line 5171 "BatchImport.c" +#line 5848 "BatchImport.c" } } -void value_take_import_manifest (GValue* value, gpointer v_object) { +void +value_take_import_manifest (GValue* value, + gpointer v_object) +{ ImportManifest * old; #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORT_MANIFEST)); @@ -5186,31 +5866,35 @@ void value_take_import_manifest (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = v_object; -#line 5190 "BatchImport.c" +#line 5870 "BatchImport.c" } else { #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 5194 "BatchImport.c" +#line 5874 "BatchImport.c" } #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" import_manifest_unref (old); -#line 5200 "BatchImport.c" +#line 5880 "BatchImport.c" } } -static void import_manifest_class_init (ImportManifestClass * klass) { +static void +import_manifest_class_init (ImportManifestClass * klass) +{ #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" import_manifest_parent_class = g_type_class_peek_parent (klass); #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" ((ImportManifestClass *) klass)->finalize = import_manifest_finalize; -#line 5210 "BatchImport.c" +#line 5892 "BatchImport.c" } -static void import_manifest_instance_init (ImportManifest * self) { +static void +import_manifest_instance_init (ImportManifest * self) +{ GeeArrayList* _tmp0_; GeeArrayList* _tmp1_; GeeArrayList* _tmp2_; @@ -5268,11 +5952,13 @@ static void import_manifest_instance_init (ImportManifest * self) { self->all = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_LIST, GeeList); #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" self->ref_count = 1; -#line 5272 "BatchImport.c" +#line 5956 "BatchImport.c" } -static void import_manifest_finalize (ImportManifest * obj) { +static void +import_manifest_finalize (ImportManifest * obj) +{ ImportManifest * self; #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_MANIFEST, ImportManifest); @@ -5302,11 +5988,13 @@ static void import_manifest_finalize (ImportManifest * obj) { _g_object_unref0 (self->all); #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_timer_destroy0 (self->timer); -#line 5306 "BatchImport.c" +#line 5992 "BatchImport.c" } -GType import_manifest_get_type (void) { +GType +import_manifest_get_type (void) +{ static volatile gsize import_manifest_type_id__volatile = 0; if (g_once_init_enter (&import_manifest_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_import_manifest_init, value_import_manifest_free_value, value_import_manifest_copy_value, value_import_manifest_peek_pointer, "p", value_import_manifest_collect_value, "p", value_import_manifest_lcopy_value }; @@ -5320,18 +6008,22 @@ GType import_manifest_get_type (void) { } -gpointer import_manifest_ref (gpointer instance) { +gpointer +import_manifest_ref (gpointer instance) +{ ImportManifest * self; self = instance; #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" g_atomic_int_inc (&self->ref_count); #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" return instance; -#line 5331 "BatchImport.c" +#line 6021 "BatchImport.c" } -void import_manifest_unref (gpointer instance) { +void +import_manifest_unref (gpointer instance) +{ ImportManifest * self; self = instance; #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5340,72 +6032,89 @@ void import_manifest_unref (gpointer instance) { IMPORT_MANIFEST_GET_CLASS (self)->finalize (self); #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 5344 "BatchImport.c" +#line 6036 "BatchImport.c" } } -static void _batch_import_user_halt_application_exiting (Application* _sender, gboolean panicked, gpointer self) { +static void +_batch_import_user_halt_application_exiting (Application* _sender, + gboolean panicked, + gpointer self) +{ #line 524 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_user_halt ((BatchImport*) self); -#line 5352 "BatchImport.c" +#line 6048 "BatchImport.c" } -static gpointer _batch_import_roll_ref0 (gpointer self) { +static gpointer +_batch_import_roll_ref0 (gpointer self) +{ #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? batch_import_roll_ref (self) : NULL; -#line 5359 "BatchImport.c" +#line 6057 "BatchImport.c" } -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { +static guint +_file_hash_gee_hash_data_func (gconstpointer v, + gpointer self) +{ guint result; result = file_hash ((GFile*) v); #line 507 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 5368 "BatchImport.c" +#line 6069 "BatchImport.c" } -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = file_equal ((GFile*) a, (GFile*) b); #line 507 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 5377 "BatchImport.c" +#line 6082 "BatchImport.c" } -static gboolean _batch_import_display_imported_timer_gsource_func (gpointer self) { +static gboolean +_batch_import_display_imported_timer_gsource_func (gpointer self) +{ gboolean result; result = batch_import_display_imported_timer ((BatchImport*) self); #line 517 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 5386 "BatchImport.c" -} - - -BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest) { +#line 6093 "BatchImport.c" +} + + +BatchImport* +batch_import_construct (GType object_type, + GeeIterable* jobs, + const gchar* name, + BatchImportImportReporter reporter, + void* reporter_target, + GeeArrayList* prefailed, + GeeArrayList* pre_already_imported, + GCancellable* cancellable, + BatchImportRoll* import_roll, + ImportManifest* skip_manifest) +{ BatchImport * self = NULL; GeeIterable* _tmp0_; - GeeIterable* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_; - BatchImportImportReporter _tmp4_; - void* _tmp4__target; - GeeArrayList* _tmp5_; - GeeArrayList* _tmp6_; - ImportManifest* _tmp7_; - GCancellable* _tmp8_ = NULL; - GCancellable* _tmp9_; - GCancellable* _tmp13_; - BatchImportRoll* _tmp14_ = NULL; - BatchImportRoll* _tmp15_; - BatchImportRoll* _tmp19_; - ImportManifest* _tmp20_; - Application* _tmp38_; - Application* _tmp39_; + gchar* _tmp1_; + ImportManifest* _tmp2_; + GCancellable* _tmp3_ = NULL; + GCancellable* _tmp6_; + BatchImportRoll* _tmp7_ = NULL; + BatchImportRoll* _tmp10_; + Application* _tmp27_; + Application* _tmp28_; #line 494 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (GEE_IS_ITERABLE (jobs), NULL); #line 494 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5423,229 +6132,214 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const #line 494 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (BatchImport*) g_object_new (object_type, NULL); #line 499 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = jobs; -#line 499 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (jobs); #line 499 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->jobs); #line 499 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->jobs = _tmp1_; + self->priv->jobs = _tmp0_; #line 500 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = name; -#line 500 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (name); #line 500 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->priv->name); #line 500 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->name = _tmp3_; -#line 501 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = reporter; + self->priv->name = _tmp1_; #line 501 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4__target = reporter_target; + self->priv->reporter = reporter; #line 501 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->reporter = _tmp4_; -#line 501 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->reporter_target = _tmp4__target; -#line 502 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = prefailed; + self->priv->reporter_target = reporter_target; #line 502 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = pre_already_imported; -#line 502 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = import_manifest_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_LIST, GeeList), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList)); + _tmp2_ = import_manifest_new (G_TYPE_CHECK_INSTANCE_CAST (prefailed, GEE_TYPE_LIST, GeeList), G_TYPE_CHECK_INSTANCE_CAST (pre_already_imported, GEE_TYPE_LIST, GeeList)); #line 502 "/home/jens/Source/shotwell/src/BatchImport.vala" _import_manifest_unref0 (self->priv->manifest); #line 502 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->manifest = _tmp7_; -#line 503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = cancellable; + self->priv->manifest = _tmp2_; #line 503 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp9_ != NULL) { -#line 5464 "BatchImport.c" - GCancellable* _tmp10_; - GCancellable* _tmp11_; -#line 503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = cancellable; + if (cancellable != NULL) { +#line 6159 "BatchImport.c" + GCancellable* _tmp4_; #line 503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = _g_object_ref0 (_tmp10_); + _tmp4_ = _g_object_ref0 (cancellable); #line 503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp3_); #line 503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = _tmp11_; -#line 5475 "BatchImport.c" + _tmp3_ = _tmp4_; +#line 6167 "BatchImport.c" } else { - GCancellable* _tmp12_; + GCancellable* _tmp5_; #line 503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = g_cancellable_new (); + _tmp5_ = g_cancellable_new (); #line 503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp3_); #line 503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = _tmp12_; -#line 5484 "BatchImport.c" + _tmp3_ = _tmp5_; +#line 6176 "BatchImport.c" } #line 503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = _g_object_ref0 (_tmp8_); + _tmp6_ = _g_object_ref0 (_tmp3_); #line 503 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->cancellable); #line 503 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->cancellable = _tmp13_; -#line 504 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = import_roll; -#line 504 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp15_ != NULL) { -#line 5496 "BatchImport.c" - BatchImportRoll* _tmp16_; - BatchImportRoll* _tmp17_; + self->priv->cancellable = _tmp6_; #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = import_roll; + if (import_roll != NULL) { +#line 6186 "BatchImport.c" + BatchImportRoll* _tmp8_; #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = _batch_import_roll_ref0 (_tmp16_); + _tmp8_ = _batch_import_roll_ref0 (import_roll); #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala" - _batch_import_roll_unref0 (_tmp14_); + _batch_import_roll_unref0 (_tmp7_); #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = _tmp17_; -#line 5507 "BatchImport.c" + _tmp7_ = _tmp8_; +#line 6194 "BatchImport.c" } else { - BatchImportRoll* _tmp18_; + BatchImportRoll* _tmp9_; #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = batch_import_roll_new (); + _tmp9_ = batch_import_roll_new (); #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala" - _batch_import_roll_unref0 (_tmp14_); + _batch_import_roll_unref0 (_tmp7_); #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = _tmp18_; -#line 5516 "BatchImport.c" + _tmp7_ = _tmp9_; +#line 6203 "BatchImport.c" } #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = _batch_import_roll_ref0 (_tmp14_); + _tmp10_ = _batch_import_roll_ref0 (_tmp7_); #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_roll_unref0 (self->priv->import_roll); #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->import_roll = _tmp19_; + self->priv->import_roll = _tmp10_; #line 506 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp20_ = skip_manifest; -#line 506 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp20_ != NULL) { -#line 5528 "BatchImport.c" - GeeHashSet* _tmp21_; + if (skip_manifest != NULL) { +#line 6213 "BatchImport.c" + GeeHashSet* _tmp11_; #line 507 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp21_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp11_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); #line 507 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->skipset); #line 507 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->skipset = _tmp21_; -#line 5536 "BatchImport.c" + self->priv->skipset = _tmp11_; +#line 6221 "BatchImport.c" { GeeList* _source_list = NULL; - ImportManifest* _tmp22_; - GeeList* _tmp23_; - GeeList* _tmp24_; + GeeList* _tmp12_; + GeeList* _tmp13_; gint _source_size = 0; - GeeList* _tmp25_; - gint _tmp26_; - gint _tmp27_; + GeeList* _tmp14_; + gint _tmp15_; + gint _tmp16_; gint _source_index = 0; #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp22_ = skip_manifest; -#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp23_ = _tmp22_->imported; + _tmp12_ = skip_manifest->imported; #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp24_ = _g_object_ref0 (_tmp23_); + _tmp13_ = _g_object_ref0 (_tmp12_); #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" - _source_list = _tmp24_; + _source_list = _tmp13_; #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp25_ = _source_list; + _tmp14_ = _source_list; #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp15_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection)); #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp27_ = _tmp26_; + _tmp16_ = _tmp15_; #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" - _source_size = _tmp27_; + _source_size = _tmp16_; #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" _source_index = -1; #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 5567 "BatchImport.c" - gint _tmp28_; - gint _tmp29_; - gint _tmp30_; +#line 6249 "BatchImport.c" + gint _tmp17_; + gint _tmp18_; + gint _tmp19_; MediaSource* source = NULL; - GeeList* _tmp31_; - gint _tmp32_; - gpointer _tmp33_; - GeeHashSet* _tmp34_; - MediaSource* _tmp35_; - GFile* _tmp36_; - GFile* _tmp37_; + GeeList* _tmp20_; + gint _tmp21_; + gpointer _tmp22_; + GeeHashSet* _tmp23_; + MediaSource* _tmp24_; + GFile* _tmp25_; + GFile* _tmp26_; #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp28_ = _source_index; + _tmp17_ = _source_index; #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" - _source_index = _tmp28_ + 1; + _source_index = _tmp17_ + 1; #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp29_ = _source_index; + _tmp18_ = _source_index; #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp30_ = _source_size; + _tmp19_ = _source_size; #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!(_tmp29_ < _tmp30_)) { + if (!(_tmp18_ < _tmp19_)) { #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 5591 "BatchImport.c" +#line 6273 "BatchImport.c" } #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp31_ = _source_list; + _tmp20_ = _source_list; #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp32_ = _source_index; + _tmp21_ = _source_index; #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp33_ = gee_list_get (_tmp31_, _tmp32_); + _tmp22_ = gee_list_get (_tmp20_, _tmp21_); #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" - source = (MediaSource*) _tmp33_; + source = (MediaSource*) _tmp22_; #line 509 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp34_ = self->priv->skipset; + _tmp23_ = self->priv->skipset; #line 509 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp35_ = source; + _tmp24_ = source; #line 509 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp36_ = media_source_get_file (_tmp35_); + _tmp25_ = media_source_get_file (_tmp24_); #line 509 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp37_ = _tmp36_; + _tmp26_ = _tmp25_; #line 509 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp37_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_); #line 509 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp37_); + _g_object_unref0 (_tmp26_); #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (source); -#line 5615 "BatchImport.c" +#line 6297 "BatchImport.c" } #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_source_list); -#line 5619 "BatchImport.c" +#line 6301 "BatchImport.c" } } #line 514 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp38_ = application_get_instance (); + _tmp27_ = application_get_instance (); #line 514 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp39_ = _tmp38_; + _tmp28_ = _tmp27_; #line 514 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_connect_object (_tmp39_, "exiting", (GCallback) _batch_import_user_halt_application_exiting, self, 0); + g_signal_connect_object (_tmp28_, "exiting", (GCallback) _batch_import_user_halt_application_exiting, self, 0); #line 514 "/home/jens/Source/shotwell/src/BatchImport.vala" - _application_unref0 (_tmp39_); + _application_unref0 (_tmp28_); #line 517 "/home/jens/Source/shotwell/src/BatchImport.vala" g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) BATCH_IMPORT_DISPLAY_QUEUE_TIMER_MSEC, _batch_import_display_imported_timer_gsource_func, g_object_ref (self), g_object_unref); #line 494 "/home/jens/Source/shotwell/src/BatchImport.vala" - _batch_import_roll_unref0 (_tmp14_); + _batch_import_roll_unref0 (_tmp7_); #line 494 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp3_); #line 494 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 5638 "BatchImport.c" +#line 6320 "BatchImport.c" } -BatchImport* batch_import_new (GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest) { +BatchImport* +batch_import_new (GeeIterable* jobs, + const gchar* name, + BatchImportImportReporter reporter, + void* reporter_target, + GeeArrayList* prefailed, + GeeArrayList* pre_already_imported, + GCancellable* cancellable, + BatchImportRoll* import_roll, + ImportManifest* skip_manifest) +{ #line 494 "/home/jens/Source/shotwell/src/BatchImport.vala" return batch_import_construct (TYPE_BATCH_IMPORT, jobs, name, reporter, reporter_target, prefailed, pre_already_imported, cancellable, import_roll, skip_manifest); -#line 5645 "BatchImport.c" +#line 6337 "BatchImport.c" } -gchar* batch_import_get_name (BatchImport* self) { +gchar* +batch_import_get_name (BatchImport* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -5659,11 +6353,13 @@ gchar* batch_import_get_name (BatchImport* self) { result = _tmp1_; #line 528 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 5663 "BatchImport.c" +#line 6357 "BatchImport.c" } -void batch_import_user_halt (BatchImport* self) { +void +batch_import_user_halt (BatchImport* self) +{ GCancellable* _tmp0_; #line 531 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); @@ -5671,11 +6367,13 @@ void batch_import_user_halt (BatchImport* self) { _tmp0_ = self->priv->cancellable; #line 532 "/home/jens/Source/shotwell/src/BatchImport.vala" g_cancellable_cancel (_tmp0_); -#line 5675 "BatchImport.c" +#line 6371 "BatchImport.c" } -gboolean batch_import_get_untrash_duplicates (BatchImport* self) { +gboolean +batch_import_get_untrash_duplicates (BatchImport* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 535 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5686,23 +6384,25 @@ gboolean batch_import_get_untrash_duplicates (BatchImport* self) { result = _tmp0_; #line 536 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 5690 "BatchImport.c" +#line 6388 "BatchImport.c" } -void batch_import_set_untrash_duplicates (BatchImport* self, gboolean untrash_duplicates) { - gboolean _tmp0_; +void +batch_import_set_untrash_duplicates (BatchImport* self, + gboolean untrash_duplicates) +{ #line 539 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 540 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = untrash_duplicates; -#line 540 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->untrash_duplicates = _tmp0_; -#line 5702 "BatchImport.c" + self->priv->untrash_duplicates = untrash_duplicates; +#line 6400 "BatchImport.c" } -gboolean batch_import_get_mark_duplicates_online (BatchImport* self) { +gboolean +batch_import_get_mark_duplicates_online (BatchImport* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 543 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5713,42 +6413,44 @@ gboolean batch_import_get_mark_duplicates_online (BatchImport* self) { result = _tmp0_; #line 544 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 5717 "BatchImport.c" +#line 6417 "BatchImport.c" } -void batch_import_set_mark_duplicates_online (BatchImport* self, gboolean mark_duplicates_online) { - gboolean _tmp0_; +void +batch_import_set_mark_duplicates_online (BatchImport* self, + gboolean mark_duplicates_online) +{ #line 547 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 548 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = mark_duplicates_online; -#line 548 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->mark_duplicates_online = _tmp0_; -#line 5729 "BatchImport.c" + self->priv->mark_duplicates_online = mark_duplicates_online; +#line 6429 "BatchImport.c" } -static void batch_import_log_status (BatchImport* self, const gchar* where) { +static void +batch_import_log_status (BatchImport* self, + const gchar* where) +{ #line 551 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 551 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (where != NULL); -#line 5738 "BatchImport.c" +#line 6441 "BatchImport.c" } -static gboolean batch_import_report_failure (BatchImport* self, BatchImportResult* import_result) { +static gboolean +batch_import_report_failure (BatchImport* self, + BatchImportResult* import_result) +{ gboolean result = FALSE; gboolean proceed = FALSE; ImportManifest* _tmp0_; - BatchImportResult* _tmp1_; - BatchImportResult* _tmp2_; - ImportResult _tmp3_; - gboolean _tmp23_ = FALSE; - BatchImportResult* _tmp24_; - ImportResult _tmp25_; - gboolean _tmp26_; + ImportResult _tmp1_; + gboolean _tmp14_ = FALSE; + ImportResult _tmp15_; GError * _inner_error_ = NULL; #line 561 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE); @@ -5759,265 +6461,224 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul #line 564 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = self->priv->manifest; #line 564 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = import_result; -#line 564 "/home/jens/Source/shotwell/src/BatchImport.vala" - import_manifest_add_result (_tmp0_, _tmp1_); + import_manifest_add_result (_tmp0_, import_result); #line 566 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = import_result; + _tmp1_ = import_result->result; #line 566 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = _tmp2_->result; -#line 566 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp3_ != IMPORT_RESULT_SUCCESS) { -#line 5772 "BatchImport.c" - BatchImportResult* _tmp4_; - gboolean _tmp5_ = FALSE; - BatchImportResult* _tmp6_; - GFile* _tmp7_; -#line 567 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = import_result; + if (_tmp1_ != IMPORT_RESULT_SUCCESS) { +#line 6470 "BatchImport.c" + gboolean _tmp2_ = FALSE; + GFile* _tmp3_; #line 567 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORT_JOB_FAILED_SIGNAL], 0, _tmp4_); + g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORT_JOB_FAILED_SIGNAL], 0, import_result); #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = import_result; + _tmp3_ = import_result->file; #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = _tmp6_->file; -#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp7_ != NULL) { -#line 5787 "BatchImport.c" - BatchImportResult* _tmp8_; - ImportResult _tmp9_; - gboolean _tmp10_; -#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = import_result; -#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = _tmp8_->result; + if (_tmp3_ != NULL) { +#line 6479 "BatchImport.c" + ImportResult _tmp4_; #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = import_result_is_abort (_tmp9_); + _tmp4_ = import_result->result; #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = !_tmp10_; -#line 5799 "BatchImport.c" + _tmp2_ = !import_result_is_abort (_tmp4_); +#line 6485 "BatchImport.c" } else { #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = FALSE; -#line 5803 "BatchImport.c" + _tmp2_ = FALSE; +#line 6489 "BatchImport.c" } #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp5_) { -#line 5807 "BatchImport.c" + if (_tmp2_) { +#line 6493 "BatchImport.c" guint64 filesize = 0ULL; - guint64 _tmp22_; + guint64 _tmp13_; #line 570 "/home/jens/Source/shotwell/src/BatchImport.vala" filesize = (guint64) 0; -#line 5812 "BatchImport.c" +#line 6498 "BatchImport.c" { - guint64 _tmp11_ = 0ULL; - BatchImportResult* _tmp12_; - GFile* _tmp13_; - guint64 _tmp14_; -#line 573 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = import_result; + guint64 _tmp5_ = 0ULL; + GFile* _tmp6_; #line 573 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = _tmp12_->file; + _tmp6_ = import_result->file; #line 573 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = query_total_file_size (_tmp13_, NULL, &_inner_error_); -#line 573 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = _tmp14_; + _tmp5_ = query_total_file_size (_tmp6_, NULL, &_inner_error_); #line 573 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5828 "BatchImport.c" +#line 6508 "BatchImport.c" goto __catch423_g_error; } #line 573 "/home/jens/Source/shotwell/src/BatchImport.vala" - filesize = _tmp11_; -#line 5833 "BatchImport.c" + filesize = _tmp5_; +#line 6513 "BatchImport.c" } goto __finally423; __catch423_g_error: { GError* err = NULL; - BatchImportResult* _tmp15_; - GFile* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; - GError* _tmp19_; - const gchar* _tmp20_; + GFile* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + GError* _tmp10_; + const gchar* _tmp11_; #line 571 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; #line 571 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; #line 575 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = import_result; + _tmp7_ = import_result->file; #line 575 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = _tmp15_->file; + _tmp8_ = g_file_get_path (_tmp7_); #line 575 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = g_file_get_path (_tmp16_); -#line 575 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = _tmp17_; + _tmp9_ = _tmp8_; #line 575 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = err; + _tmp10_ = err; #line 575 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp20_ = _tmp19_->message; + _tmp11_ = _tmp10_->message; #line 575 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_warning ("BatchImport.vala:575: Unable to query file size of %s: %s", _tmp18_, _tmp20_); + g_warning ("BatchImport.vala:575: Unable to query file size of %s: %s", _tmp9_, _tmp11_); #line 575 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp9_); #line 571 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 5867 "BatchImport.c" +#line 6544 "BatchImport.c" } __finally423: #line 571 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5872 "BatchImport.c" - gboolean _tmp21_ = FALSE; +#line 6549 "BatchImport.c" + gboolean _tmp12_ = FALSE; #line 571 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 571 "/home/jens/Source/shotwell/src/BatchImport.vala" g_clear_error (&_inner_error_); #line 571 "/home/jens/Source/shotwell/src/BatchImport.vala" - return _tmp21_; -#line 5880 "BatchImport.c" + return _tmp12_; +#line 6557 "BatchImport.c" } #line 579 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp22_ = filesize; + _tmp13_ = filesize; #line 579 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_report_progress (self, _tmp22_); -#line 5886 "BatchImport.c" + batch_import_report_progress (self, _tmp13_); +#line 6563 "BatchImport.c" } } #line 584 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp24_ = import_result; -#line 584 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp25_ = _tmp24_->result; + _tmp15_ = import_result->result; #line 584 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp26_ = import_result_is_nonuser_abort (_tmp25_); + if (import_result_is_nonuser_abort (_tmp15_)) { +#line 6570 "BatchImport.c" + gboolean _tmp16_; #line 584 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp26_) { -#line 5897 "BatchImport.c" - gboolean _tmp27_; -#line 584 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp27_ = proceed; + _tmp16_ = proceed; #line 584 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp23_ = _tmp27_; -#line 5903 "BatchImport.c" + _tmp14_ = _tmp16_; +#line 6576 "BatchImport.c" } else { #line 584 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp23_ = FALSE; -#line 5907 "BatchImport.c" + _tmp14_ = FALSE; +#line 6580 "BatchImport.c" } #line 584 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp23_) { -#line 5911 "BatchImport.c" - BatchImportResult* _tmp28_; - ImportResult _tmp29_; - BatchImportResult* _tmp30_; - const gchar* _tmp31_; -#line 585 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp28_ = import_result; -#line 585 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp29_ = _tmp28_->result; + if (_tmp14_) { +#line 6584 "BatchImport.c" + ImportResult _tmp17_; + const gchar* _tmp18_; #line 585 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp30_ = import_result; + _tmp17_ = import_result->result; #line 585 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp31_ = _tmp30_->errmsg; + _tmp18_ = import_result->errmsg; #line 585 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_emit (self, batch_import_signals[BATCH_IMPORT_FATAL_ERROR_SIGNAL], 0, _tmp29_, _tmp31_); + g_signal_emit (self, batch_import_signals[BATCH_IMPORT_FATAL_ERROR_SIGNAL], 0, _tmp17_, _tmp18_); #line 586 "/home/jens/Source/shotwell/src/BatchImport.vala" proceed = FALSE; -#line 5928 "BatchImport.c" +#line 6595 "BatchImport.c" } #line 589 "/home/jens/Source/shotwell/src/BatchImport.vala" result = proceed; #line 589 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 5934 "BatchImport.c" +#line 6601 "BatchImport.c" } -static void batch_import_report_progress (BatchImport* self, guint64 increment_of_progress) { +static void +batch_import_report_progress (BatchImport* self, + guint64 increment_of_progress) +{ guint64 _tmp0_; guint64 _tmp1_; - guint64 _tmp2_; #line 592 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 593 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = self->priv->completed_bytes; #line 593 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = increment_of_progress; -#line 593 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->completed_bytes = _tmp0_ + _tmp1_; + self->priv->completed_bytes = _tmp0_ + increment_of_progress; #line 597 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = self->priv->completed_bytes; + _tmp1_ = self->priv->completed_bytes; #line 597 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp2_ == ((guint64) 0)) { -#line 5954 "BatchImport.c" + if (_tmp1_ == ((guint64) 0)) { +#line 6621 "BatchImport.c" gulong now = 0UL; + gulong _tmp2_; gulong _tmp3_; - gulong _tmp4_; - gulong _tmp5_; #line 598 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = now_ms (); -#line 598 "/home/jens/Source/shotwell/src/BatchImport.vala" - now = _tmp3_; + now = now_ms (); #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = now; + _tmp2_ = now; #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = self->priv->last_preparing_ms; + _tmp3_ = self->priv->last_preparing_ms; #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala" - if ((_tmp4_ - _tmp5_) > ((gulong) 250)) { -#line 5969 "BatchImport.c" - gulong _tmp6_; + if ((_tmp2_ - _tmp3_) > ((gulong) 250)) { +#line 6633 "BatchImport.c" + gulong _tmp4_; #line 600 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = now; + _tmp4_ = now; #line 600 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->last_preparing_ms = _tmp6_; + self->priv->last_preparing_ms = _tmp4_; #line 601 "/home/jens/Source/shotwell/src/BatchImport.vala" g_signal_emit (self, batch_import_signals[BATCH_IMPORT_PREPARING_SIGNAL], 0); -#line 5977 "BatchImport.c" +#line 6641 "BatchImport.c" } } else { - guint64 _tmp7_; #line 603 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = increment_of_progress; -#line 603 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp7_ > ((guint64) 0)) { -#line 5985 "BatchImport.c" + if (increment_of_progress > ((guint64) 0)) { +#line 6646 "BatchImport.c" gulong now = 0UL; - gulong _tmp8_; - gulong _tmp9_; - gulong _tmp10_; -#line 604 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = now_ms (); + gulong _tmp5_; + gulong _tmp6_; #line 604 "/home/jens/Source/shotwell/src/BatchImport.vala" - now = _tmp8_; + now = now_ms (); #line 605 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = now; + _tmp5_ = now; #line 605 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = self->priv->last_preparing_ms; + _tmp6_ = self->priv->last_preparing_ms; #line 605 "/home/jens/Source/shotwell/src/BatchImport.vala" - if ((_tmp9_ - _tmp10_) > ((gulong) 250)) { -#line 6000 "BatchImport.c" - gulong _tmp11_; - guint64 _tmp12_; - guint64 _tmp13_; + if ((_tmp5_ - _tmp6_) > ((gulong) 250)) { +#line 6658 "BatchImport.c" + gulong _tmp7_; + guint64 _tmp8_; + guint64 _tmp9_; #line 606 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = now; + _tmp7_ = now; #line 606 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->last_preparing_ms = _tmp11_; + self->priv->last_preparing_ms = _tmp7_; #line 607 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = self->priv->completed_bytes; + _tmp8_ = self->priv->completed_bytes; #line 607 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = self->priv->total_bytes; + _tmp9_ = self->priv->total_bytes; #line 607 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_emit (self, batch_import_signals[BATCH_IMPORT_PROGRESS_SIGNAL], 0, _tmp12_, _tmp13_); -#line 6014 "BatchImport.c" + g_signal_emit (self, batch_import_signals[BATCH_IMPORT_PROGRESS_SIGNAL], 0, _tmp8_, _tmp9_); +#line 6672 "BatchImport.c" } } } } -static gboolean batch_import_report_failures (BatchImport* self, BackgroundImportJob* background_job) { +static gboolean +batch_import_report_failures (BatchImport* self, + BackgroundImportJob* background_job) +{ gboolean result = FALSE; gboolean proceed = FALSE; #line 612 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6026,107 +6687,103 @@ static gboolean batch_import_report_failures (BatchImport* self, BackgroundImpor g_return_val_if_fail (IS_BACKGROUND_IMPORT_JOB (background_job), FALSE); #line 613 "/home/jens/Source/shotwell/src/BatchImport.vala" proceed = TRUE; -#line 6030 "BatchImport.c" +#line 6691 "BatchImport.c" { GeeList* _import_result_list = NULL; - BackgroundImportJob* _tmp0_; + GeeList* _tmp0_; GeeList* _tmp1_; - GeeList* _tmp2_; gint _import_result_size = 0; - GeeList* _tmp3_; + GeeList* _tmp2_; + gint _tmp3_; gint _tmp4_; - gint _tmp5_; gint _import_result_index = 0; #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = background_job; -#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = _tmp0_->failed; + _tmp0_ = background_job->failed; #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" - _import_result_list = _tmp2_; + _import_result_list = _tmp1_; #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = _import_result_list; + _tmp2_ = _import_result_list; #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" - _import_result_size = _tmp5_; + _import_result_size = _tmp4_; #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" _import_result_index = -1; #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 6061 "BatchImport.c" +#line 6719 "BatchImport.c" + gint _tmp5_; gint _tmp6_; gint _tmp7_; - gint _tmp8_; BatchImportResult* import_result = NULL; - GeeList* _tmp9_; - gint _tmp10_; - gpointer _tmp11_; - BatchImportResult* _tmp12_; - gboolean _tmp13_; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + BatchImportResult* _tmp11_; #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = _import_result_index; + _tmp5_ = _import_result_index; #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" - _import_result_index = _tmp6_ + 1; + _import_result_index = _tmp5_ + 1; #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = _import_result_index; + _tmp6_ = _import_result_index; #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = _import_result_size; + _tmp7_ = _import_result_size; #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!(_tmp7_ < _tmp8_)) { + if (!(_tmp6_ < _tmp7_)) { #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 6083 "BatchImport.c" +#line 6740 "BatchImport.c" } #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = _import_result_list; + _tmp8_ = _import_result_list; #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = _import_result_index; + _tmp9_ = _import_result_index; #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = gee_list_get (_tmp9_, _tmp10_); + _tmp10_ = gee_list_get (_tmp8_, _tmp9_); #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" - import_result = (BatchImportResult*) _tmp11_; + import_result = (BatchImportResult*) _tmp10_; #line 616 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = import_result; + _tmp11_ = import_result; #line 616 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = batch_import_report_failure (self, _tmp12_); -#line 616 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!_tmp13_) { + if (!batch_import_report_failure (self, _tmp11_)) { #line 617 "/home/jens/Source/shotwell/src/BatchImport.vala" proceed = FALSE; -#line 6101 "BatchImport.c" +#line 6756 "BatchImport.c" } #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (import_result); -#line 6105 "BatchImport.c" +#line 6760 "BatchImport.c" } #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_import_result_list); -#line 6109 "BatchImport.c" +#line 6764 "BatchImport.c" } #line 620 "/home/jens/Source/shotwell/src/BatchImport.vala" result = proceed; #line 620 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 6115 "BatchImport.c" +#line 6770 "BatchImport.c" } -static void batch_import_report_completed (BatchImport* self, const gchar* where) { +static void +batch_import_report_completed (BatchImport* self, + const gchar* where) +{ gboolean _tmp0_; - const gchar* _tmp2_; - gchar* _tmp3_; - gchar* _tmp4_; - ImportManifest* _tmp5_; - GTimer* _tmp6_; - gdouble _tmp7_; - BatchImportImportReporter _tmp8_; - void* _tmp8__target; - ImportManifest* _tmp12_; - BatchImportRoll* _tmp13_; + gchar* _tmp1_; + gchar* _tmp2_; + ImportManifest* _tmp3_; + GTimer* _tmp4_; + gdouble _tmp5_; + BatchImportImportReporter _tmp6_; + void* _tmp6__target; + ImportManifest* _tmp10_; + BatchImportRoll* _tmp11_; #line 623 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 623 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6135,71 +6792,67 @@ static void batch_import_report_completed (BatchImport* self, const gchar* where _tmp0_ = self->priv->completed; #line 624 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp0_) { -#line 6139 "BatchImport.c" - const gchar* _tmp1_; -#line 625 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = where; #line 625 "/home/jens/Source/shotwell/src/BatchImport.vala" g_error ("BatchImport.vala:625: Attempted to complete already-completed import: " \ -"%s", _tmp1_); -#line 6145 "BatchImport.c" +"%s", where); +#line 6798 "BatchImport.c" } #line 627 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->completed = TRUE; #line 629 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_flush_ready_sources (self); #line 631 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = where; + _tmp1_ = g_strdup_printf ("Import completed: %s", where); #line 631 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = g_strdup_printf ("Import completed: %s", _tmp2_); -#line 631 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 631 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_log_status (self, _tmp4_); + batch_import_log_status (self, _tmp2_); #line 631 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp2_); #line 632 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = self->priv->manifest; + _tmp3_ = self->priv->manifest; #line 632 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = _tmp5_->timer; + _tmp4_ = _tmp3_->timer; #line 632 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = g_timer_elapsed (_tmp6_, NULL); + _tmp5_ = g_timer_elapsed (_tmp4_, NULL); #line 632 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_debug ("BatchImport.vala:632: Import complete after %f", _tmp7_); + g_debug ("BatchImport.vala:632: Import complete after %f", _tmp5_); #line 635 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = self->priv->reporter; + _tmp6_ = self->priv->reporter; #line 635 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8__target = self->priv->reporter_target; + _tmp6__target = self->priv->reporter_target; #line 635 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp8_ != NULL) { -#line 6175 "BatchImport.c" - BatchImportImportReporter _tmp9_; - void* _tmp9__target; - ImportManifest* _tmp10_; - BatchImportRoll* _tmp11_; + if (_tmp6_ != NULL) { +#line 6826 "BatchImport.c" + BatchImportImportReporter _tmp7_; + void* _tmp7__target; + ImportManifest* _tmp8_; + BatchImportRoll* _tmp9_; #line 636 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = self->priv->reporter; + _tmp7_ = self->priv->reporter; #line 636 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9__target = self->priv->reporter_target; + _tmp7__target = self->priv->reporter_target; #line 636 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = self->priv->manifest; + _tmp8_ = self->priv->manifest; #line 636 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = self->priv->import_roll; + _tmp9_ = self->priv->import_roll; #line 636 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ (_tmp10_, _tmp11_, _tmp9__target); -#line 6190 "BatchImport.c" + _tmp7_ (_tmp8_, _tmp9_, _tmp7__target); +#line 6841 "BatchImport.c" } #line 638 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = self->priv->manifest; + _tmp10_ = self->priv->manifest; #line 638 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = self->priv->import_roll; + _tmp11_ = self->priv->import_roll; #line 638 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORT_COMPLETE_SIGNAL], 0, _tmp12_, _tmp13_); -#line 6198 "BatchImport.c" + g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORT_COMPLETE_SIGNAL], 0, _tmp10_, _tmp11_); +#line 6849 "BatchImport.c" } -static void batch_import_file_import_complete (BatchImport* self) { +static void +batch_import_file_import_complete (BatchImport* self) +{ gint _tmp0_; gint _tmp1_; gboolean _tmp4_ = FALSE; @@ -6214,7 +6867,7 @@ static void batch_import_file_import_complete (BatchImport* self) { _tmp1_ = self->priv->file_imports_to_perform; #line 645 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp1_ != -1) { -#line 6217 "BatchImport.c" +#line 6870 "BatchImport.c" gint _tmp2_; gint _tmp3_; #line 646 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6223,13 +6876,13 @@ static void batch_import_file_import_complete (BatchImport* self) { _tmp3_ = self->priv->file_imports_to_perform; #line 646 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_assert (_tmp2_ <= _tmp3_, "file_imports_completed <= file_imports_to_perform"); -#line 6226 "BatchImport.c" +#line 6879 "BatchImport.c" } #line 650 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = self->priv->file_imports_to_perform; #line 650 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp5_ != -1) { -#line 6232 "BatchImport.c" +#line 6885 "BatchImport.c" gint _tmp6_; gint _tmp7_; #line 650 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6238,45 +6891,55 @@ static void batch_import_file_import_complete (BatchImport* self) { _tmp7_ = self->priv->file_imports_to_perform; #line 650 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = _tmp6_ == _tmp7_; -#line 6241 "BatchImport.c" +#line 6894 "BatchImport.c" } else { #line 650 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = FALSE; -#line 6245 "BatchImport.c" +#line 6898 "BatchImport.c" } #line 650 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp4_) { #line 651 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_report_completed (self, "completed preparing files, all outstanding imports completed"); -#line 6251 "BatchImport.c" +#line 6904 "BatchImport.c" } } -static void _batch_import_on_work_sniffed_out_completion_callback (BackgroundJob* job, gpointer self) { +static void +_batch_import_on_work_sniffed_out_completion_callback (BackgroundJob* job, + gpointer self) +{ #line 661 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_on_work_sniffed_out ((BatchImport*) self, job); -#line 6259 "BatchImport.c" +#line 6915 "BatchImport.c" } -static void _batch_import_on_sniffer_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { +static void +_batch_import_on_sniffer_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self) +{ #line 661 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_on_sniffer_cancelled ((BatchImport*) self, job); -#line 6266 "BatchImport.c" +#line 6925 "BatchImport.c" } -static gboolean _batch_import_on_sniffer_working_gsource_func (gpointer self) { +static gboolean +_batch_import_on_sniffer_working_gsource_func (gpointer self) +{ gboolean result; result = batch_import_on_sniffer_working ((BatchImport*) self); #line 663 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 6275 "BatchImport.c" +#line 6936 "BatchImport.c" } -void batch_import_schedule (BatchImport* self) { +void +batch_import_schedule (BatchImport* self) +{ gboolean _tmp0_; Workers* _tmp1_; GeeIterable* _tmp2_; @@ -6284,7 +6947,6 @@ void batch_import_schedule (BatchImport* self) { GeeHashSet* _tmp4_; WorkSniffer* _tmp5_; WorkSniffer* _tmp6_; - guint _tmp7_; #line 654 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 655 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6312,14 +6974,14 @@ void batch_import_schedule (BatchImport* self) { #line 661 "/home/jens/Source/shotwell/src/BatchImport.vala" _background_job_unref0 (_tmp6_); #line 663 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) BATCH_IMPORT_WORK_SNIFFER_THROBBER_MSEC, _batch_import_on_sniffer_working_gsource_func, g_object_ref (self), g_object_unref); -#line 663 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->throbber_id = _tmp7_; -#line 6318 "BatchImport.c" + self->priv->throbber_id = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) BATCH_IMPORT_WORK_SNIFFER_THROBBER_MSEC, _batch_import_on_sniffer_working_gsource_func, g_object_ref (self), g_object_unref); +#line 6978 "BatchImport.c" } -static gboolean batch_import_on_sniffer_working (BatchImport* self) { +static gboolean +batch_import_on_sniffer_working (BatchImport* self) +{ gboolean result = FALSE; #line 670 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE); @@ -6329,56 +6991,69 @@ static gboolean batch_import_on_sniffer_working (BatchImport* self) { result = TRUE; #line 673 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 6332 "BatchImport.c" +#line 6994 "BatchImport.c" } -static gpointer _background_job_ref0 (gpointer self) { +static gpointer +_background_job_ref0 (gpointer self) +{ #line 679 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? background_job_ref (self) : NULL; -#line 6339 "BatchImport.c" +#line 7003 "BatchImport.c" } -static void _batch_import_on_file_prepared_notification_callback (BackgroundJob* job, NotificationObject* user, gpointer self) { +static void +_batch_import_on_file_prepared_notification_callback (BackgroundJob* job, + NotificationObject* user, + gpointer self) +{ #line 696 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_on_file_prepared ((BatchImport*) self, job, user); -#line 6346 "BatchImport.c" +#line 7014 "BatchImport.c" } -static void _batch_import_on_files_prepared_completion_callback (BackgroundJob* job, gpointer self) { +static void +_batch_import_on_files_prepared_completion_callback (BackgroundJob* job, + gpointer self) +{ #line 696 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_on_files_prepared ((BatchImport*) self, job); -#line 6353 "BatchImport.c" +#line 7024 "BatchImport.c" } -static void _batch_import_on_file_prepare_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { +static void +_batch_import_on_file_prepare_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self) +{ #line 696 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_on_file_prepare_cancelled ((BatchImport*) self, job); -#line 6360 "BatchImport.c" +#line 7034 "BatchImport.c" } -static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob* j) { +static void +batch_import_on_work_sniffed_out (BatchImport* self, + BackgroundJob* j) +{ gboolean _tmp0_; WorkSniffer* sniffer = NULL; - BackgroundJob* _tmp1_; - WorkSniffer* _tmp2_; - gboolean _tmp3_ = FALSE; - WorkSniffer* _tmp4_; - gboolean _tmp5_; - WorkSniffer* _tmp10_; - guint64 _tmp11_; + WorkSniffer* _tmp1_; + gboolean _tmp2_ = FALSE; + WorkSniffer* _tmp3_; + WorkSniffer* _tmp8_; + guint64 _tmp9_; PrepareFilesJob* prepare_files_job = NULL; - WorkSniffer* _tmp12_; - GeeList* _tmp13_; - GCancellable* _tmp14_; + WorkSniffer* _tmp10_; + GeeList* _tmp11_; + GCancellable* _tmp12_; + PrepareFilesJob* _tmp13_; + Workers* _tmp14_; PrepareFilesJob* _tmp15_; - Workers* _tmp16_; - PrepareFilesJob* _tmp17_; - guint _tmp18_; + guint _tmp16_; #line 676 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 676 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6388,100 +7063,98 @@ static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob* #line 677 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_assert (!_tmp0_, "!completed"); #line 679 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = j; + _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, TYPE_WORK_SNIFFER, WorkSniffer)); #line 679 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_WORK_SNIFFER, WorkSniffer)); -#line 679 "/home/jens/Source/shotwell/src/BatchImport.vala" - sniffer = _tmp2_; + sniffer = _tmp1_; #line 681 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_log_status (self, "on_work_sniffed_out"); #line 683 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = sniffer; -#line 683 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = batch_import_report_failures (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob)); + _tmp3_ = sniffer; #line 683 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!_tmp5_) { + if (!batch_import_report_failures (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob))) { #line 683 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = TRUE; -#line 6406 "BatchImport.c" + _tmp2_ = TRUE; +#line 7077 "BatchImport.c" } else { - WorkSniffer* _tmp6_; - GeeList* _tmp7_; - gint _tmp8_; - gint _tmp9_; + WorkSniffer* _tmp4_; + GeeList* _tmp5_; + gint _tmp6_; + gint _tmp7_; #line 683 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = sniffer; + _tmp4_ = sniffer; #line 683 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = _tmp6_->files_to_prepare; + _tmp5_ = _tmp4_->files_to_prepare; #line 683 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 683 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 683 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = _tmp9_ == 0; -#line 6422 "BatchImport.c" + _tmp2_ = _tmp7_ == 0; +#line 7093 "BatchImport.c" } #line 683 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp3_) { + if (_tmp2_) { #line 684 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_report_completed (self, "work sniffed out: nothing to do"); #line 686 "/home/jens/Source/shotwell/src/BatchImport.vala" _background_job_unref0 (sniffer); #line 686 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 6432 "BatchImport.c" +#line 7103 "BatchImport.c" } #line 689 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = sniffer; + _tmp8_ = sniffer; #line 689 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = _tmp10_->total_bytes; + _tmp9_ = _tmp8_->total_bytes; #line 689 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->total_bytes = _tmp11_; + self->priv->total_bytes = _tmp9_; #line 696 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = sniffer; + _tmp10_ = sniffer; #line 696 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = _tmp12_->files_to_prepare; + _tmp11_ = _tmp10_->files_to_prepare; #line 696 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = self->priv->cancellable; + _tmp12_ = self->priv->cancellable; #line 696 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = prepare_files_job_new (self, _tmp13_, _batch_import_on_file_prepared_notification_callback, self, _batch_import_on_files_prepared_completion_callback, self, _tmp14_, _batch_import_on_file_prepare_cancelled_cancellation_callback, self); + _tmp13_ = prepare_files_job_new (self, _tmp11_, _batch_import_on_file_prepared_notification_callback, self, _batch_import_on_files_prepared_completion_callback, self, _tmp12_, _batch_import_on_file_prepare_cancelled_cancellation_callback, self); #line 696 "/home/jens/Source/shotwell/src/BatchImport.vala" - prepare_files_job = _tmp15_; + prepare_files_job = _tmp13_; #line 699 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = batch_import_feeder_workers; + _tmp14_ = batch_import_feeder_workers; #line 699 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = prepare_files_job; + _tmp15_ = prepare_files_job; #line 699 "/home/jens/Source/shotwell/src/BatchImport.vala" - workers_enqueue (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_BACKGROUND_JOB, BackgroundJob)); + workers_enqueue (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 701 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = self->priv->throbber_id; + _tmp16_ = self->priv->throbber_id; #line 701 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp18_ > ((guint) 0)) { -#line 6460 "BatchImport.c" - guint _tmp19_; + if (_tmp16_ > ((guint) 0)) { +#line 7131 "BatchImport.c" + guint _tmp17_; #line 702 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = self->priv->throbber_id; + _tmp17_ = self->priv->throbber_id; #line 702 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_source_remove (_tmp19_); + g_source_remove (_tmp17_); #line 703 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->throbber_id = (guint) 0; -#line 6468 "BatchImport.c" +#line 7139 "BatchImport.c" } #line 676 "/home/jens/Source/shotwell/src/BatchImport.vala" _background_job_unref0 (prepare_files_job); #line 676 "/home/jens/Source/shotwell/src/BatchImport.vala" _background_job_unref0 (sniffer); -#line 6474 "BatchImport.c" +#line 7145 "BatchImport.c" } -static void batch_import_on_sniffer_cancelled (BatchImport* self, BackgroundJob* j) { +static void +batch_import_on_sniffer_cancelled (BatchImport* self, + BackgroundJob* j) +{ gboolean _tmp0_; WorkSniffer* sniffer = NULL; - BackgroundJob* _tmp1_; + WorkSniffer* _tmp1_; WorkSniffer* _tmp2_; - WorkSniffer* _tmp3_; - guint _tmp4_; + guint _tmp3_; #line 707 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 707 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6491,84 +7164,96 @@ static void batch_import_on_sniffer_cancelled (BatchImport* self, BackgroundJob* #line 708 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_assert (!_tmp0_, "!completed"); #line 710 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = j; -#line 710 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_WORK_SNIFFER, WorkSniffer)); + _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, TYPE_WORK_SNIFFER, WorkSniffer)); #line 710 "/home/jens/Source/shotwell/src/BatchImport.vala" - sniffer = _tmp2_; + sniffer = _tmp1_; #line 712 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_log_status (self, "on_sniffer_cancelled"); #line 714 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = sniffer; + _tmp2_ = sniffer; #line 714 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_report_failures (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob)); + batch_import_report_failures (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob)); #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_report_completed (self, "work sniffer cancelled"); #line 717 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = self->priv->throbber_id; + _tmp3_ = self->priv->throbber_id; #line 717 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp4_ > ((guint) 0)) { -#line 6511 "BatchImport.c" - guint _tmp5_; + if (_tmp3_ > ((guint) 0)) { +#line 7182 "BatchImport.c" + guint _tmp4_; #line 718 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = self->priv->throbber_id; + _tmp4_ = self->priv->throbber_id; #line 718 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_source_remove (_tmp5_); + g_source_remove (_tmp4_); #line 719 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->throbber_id = (guint) 0; -#line 6519 "BatchImport.c" +#line 7190 "BatchImport.c" } #line 707 "/home/jens/Source/shotwell/src/BatchImport.vala" _background_job_unref0 (sniffer); -#line 6523 "BatchImport.c" +#line 7194 "BatchImport.c" } -static void _batch_import_on_thumbnail_writer_completed_completion_callback (BackgroundJob* job, gpointer self) { +static void +_batch_import_on_thumbnail_writer_completed_completion_callback (BackgroundJob* job, + gpointer self) +{ #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_on_thumbnail_writer_completed ((BatchImport*) self, job); -#line 6530 "BatchImport.c" +#line 7204 "BatchImport.c" } -static void _batch_import_on_thumbnail_writer_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { +static void +_batch_import_on_thumbnail_writer_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self) +{ #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_on_thumbnail_writer_cancelled ((BatchImport*) self, job); -#line 6537 "BatchImport.c" +#line 7214 "BatchImport.c" } -static void _batch_import_on_import_files_completed_completion_callback (BackgroundJob* job, gpointer self) { +static void +_batch_import_on_import_files_completed_completion_callback (BackgroundJob* job, + gpointer self) +{ #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_on_import_files_completed ((BatchImport*) self, job); -#line 6544 "BatchImport.c" +#line 7224 "BatchImport.c" } -static void _batch_import_on_import_files_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { +static void +_batch_import_on_import_files_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self) +{ #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_on_import_files_cancelled ((BatchImport*) self, job); -#line 6551 "BatchImport.c" +#line 7234 "BatchImport.c" } -static void batch_import_flush_import_jobs (BatchImport* self) { +static void +batch_import_flush_import_jobs (BatchImport* self) +{ #line 727 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 6560 "BatchImport.c" +#line 7245 "BatchImport.c" gboolean _tmp0_ = FALSE; GeeList* _tmp1_; gint _tmp2_; gint _tmp3_; - Workers* _tmp7_; - GeeList* _tmp8_; - gpointer _tmp9_; - CompletedImportObject* _tmp10_; - GCancellable* _tmp11_; + Workers* _tmp6_; + GeeList* _tmp7_; + gpointer _tmp8_; + CompletedImportObject* _tmp9_; + GCancellable* _tmp10_; + ThumbnailWriterJob* _tmp11_; ThumbnailWriterJob* _tmp12_; - ThumbnailWriterJob* _tmp13_; #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = self->priv->ready_thumbnails; #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6577,240 +7262,221 @@ static void batch_import_flush_import_jobs (BatchImport* self) { _tmp3_ = _tmp2_; #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp3_ > 0) { -#line 6580 "BatchImport.c" +#line 7265 "BatchImport.c" Workers* _tmp4_; - gint _tmp5_; - guint _tmp6_; + guint _tmp5_; #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = batch_import_import_workers; #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = workers_get_pending_job_count (_tmp4_); + _tmp5_ = self->priv->max_outstanding_import_jobs; #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = self->priv->max_outstanding_import_jobs; -#line 732 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = ((guint) _tmp5_) < _tmp6_; -#line 6592 "BatchImport.c" + _tmp0_ = ((guint) workers_get_pending_job_count (_tmp4_)) < _tmp5_; +#line 7274 "BatchImport.c" } else { #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = FALSE; -#line 6596 "BatchImport.c" +#line 7278 "BatchImport.c" } #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!_tmp0_) { #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 6602 "BatchImport.c" +#line 7284 "BatchImport.c" } #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = batch_import_import_workers; + _tmp6_ = batch_import_import_workers; #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = self->priv->ready_thumbnails; + _tmp7_ = self->priv->ready_thumbnails; #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = gee_list_remove_at (_tmp8_, 0); + _tmp8_ = gee_list_remove_at (_tmp7_, 0); #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = (CompletedImportObject*) _tmp9_; + _tmp9_ = (CompletedImportObject*) _tmp8_; #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = self->priv->cancellable; + _tmp10_ = self->priv->cancellable; #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = thumbnail_writer_job_new (self, _tmp10_, _batch_import_on_thumbnail_writer_completed_completion_callback, self, _tmp11_, _batch_import_on_thumbnail_writer_cancelled_cancellation_callback, self); + _tmp11_ = thumbnail_writer_job_new (self, _tmp9_, _batch_import_on_thumbnail_writer_completed_completion_callback, self, _tmp10_, _batch_import_on_thumbnail_writer_cancelled_cancellation_callback, self); #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala" - workers_enqueue (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_BACKGROUND_JOB, BackgroundJob)); + workers_enqueue (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala" - _background_job_unref0 (_tmp13_); + _background_job_unref0 (_tmp12_); #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala" - _completed_import_object_unref0 (_tmp10_); -#line 6624 "BatchImport.c" + _completed_import_object_unref0 (_tmp9_); +#line 7306 "BatchImport.c" } #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 6628 "BatchImport.c" - gboolean _tmp14_ = FALSE; - GeeList* _tmp15_; +#line 7310 "BatchImport.c" + gboolean _tmp13_ = FALSE; + GeeList* _tmp14_; + gint _tmp15_; gint _tmp16_; - gint _tmp17_; - Workers* _tmp21_; - GeeList* _tmp22_; - gpointer _tmp23_; - PreparedFile* _tmp24_; - BatchImportRoll* _tmp25_; - ImportID _tmp26_; - GCancellable* _tmp27_; - PreparedFileImportJob* _tmp28_; - PreparedFileImportJob* _tmp29_; -#line 737 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = self->priv->ready_files; + Workers* _tmp19_; + GeeList* _tmp20_; + gpointer _tmp21_; + PreparedFile* _tmp22_; + BatchImportRoll* _tmp23_; + ImportID _tmp24_; + GCancellable* _tmp25_; + PreparedFileImportJob* _tmp26_; + PreparedFileImportJob* _tmp27_; #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp14_ = self->priv->ready_files; #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = _tmp16_; + _tmp15_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection)); #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp17_ > 0) { -#line 6650 "BatchImport.c" - Workers* _tmp18_; - gint _tmp19_; - guint _tmp20_; + _tmp16_ = _tmp15_; #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = batch_import_import_workers; + if (_tmp16_ > 0) { +#line 7332 "BatchImport.c" + Workers* _tmp17_; + guint _tmp18_; #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = workers_get_pending_job_count (_tmp18_); + _tmp17_ = batch_import_import_workers; #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp20_ = self->priv->max_outstanding_import_jobs; + _tmp18_ = self->priv->max_outstanding_import_jobs; #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = ((guint) _tmp19_) < _tmp20_; -#line 6662 "BatchImport.c" + _tmp13_ = ((guint) workers_get_pending_job_count (_tmp17_)) < _tmp18_; +#line 7341 "BatchImport.c" } else { #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = FALSE; -#line 6666 "BatchImport.c" + _tmp13_ = FALSE; +#line 7345 "BatchImport.c" } #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!_tmp14_) { + if (!_tmp13_) { #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 6672 "BatchImport.c" +#line 7351 "BatchImport.c" } #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp21_ = batch_import_import_workers; + _tmp19_ = batch_import_import_workers; #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp22_ = self->priv->ready_files; + _tmp20_ = self->priv->ready_files; #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp23_ = gee_list_remove_at (_tmp22_, 0); + _tmp21_ = gee_list_remove_at (_tmp20_, 0); #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp24_ = (PreparedFile*) _tmp23_; + _tmp22_ = (PreparedFile*) _tmp21_; #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp25_ = self->priv->import_roll; + _tmp23_ = self->priv->import_roll; #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp26_ = _tmp25_->import_id; + _tmp24_ = _tmp23_->import_id; #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp27_ = self->priv->cancellable; + _tmp25_ = self->priv->cancellable; #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp28_ = prepared_file_import_job_new (self, _tmp24_, &_tmp26_, _batch_import_on_import_files_completed_completion_callback, self, _tmp27_, _batch_import_on_import_files_cancelled_cancellation_callback, self); + _tmp26_ = prepared_file_import_job_new (self, _tmp22_, &_tmp24_, _batch_import_on_import_files_completed_completion_callback, self, _tmp25_, _batch_import_on_import_files_cancelled_cancellation_callback, self); #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp29_ = _tmp28_; + _tmp27_ = _tmp26_; #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala" - workers_enqueue (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_BACKGROUND_JOB, BackgroundJob)); + workers_enqueue (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala" - _background_job_unref0 (_tmp29_); + _background_job_unref0 (_tmp27_); #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala" - _prepared_file_unref0 (_tmp24_); -#line 6698 "BatchImport.c" + _prepared_file_unref0 (_tmp22_); +#line 7377 "BatchImport.c" } } -static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFile* prepared_file) { +static GFile* +batch_import_get_in_current_import (BatchImport* self, + PreparedFile* prepared_file) +{ GFile* result = NULL; gboolean _tmp0_ = FALSE; - PreparedFile* _tmp1_; - const gchar* _tmp2_; - PreparedFile* _tmp11_; - const gchar* _tmp12_; + const gchar* _tmp1_; + const gchar* _tmp7_; #line 746 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT (self), NULL); #line 746 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_PREPARED_FILE (prepared_file), NULL); #line 748 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = prepared_file; -#line 748 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = _tmp1_->full_md5; + _tmp1_ = prepared_file->full_md5; #line 748 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp2_ != NULL) { -#line 6720 "BatchImport.c" - GeeHashMap* _tmp3_; - PreparedFile* _tmp4_; - const gchar* _tmp5_; - gboolean _tmp6_; -#line 749 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = self->priv->imported_full_md5_table; -#line 749 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = prepared_file; + if (_tmp1_ != NULL) { +#line 7398 "BatchImport.c" + GeeHashMap* _tmp2_; + const gchar* _tmp3_; #line 749 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = _tmp4_->full_md5; + _tmp2_ = self->priv->imported_full_md5_table; #line 749 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_); + _tmp3_ = prepared_file->full_md5; #line 749 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = _tmp6_; -#line 6735 "BatchImport.c" + _tmp0_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_); +#line 7407 "BatchImport.c" } else { #line 748 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = FALSE; -#line 6739 "BatchImport.c" +#line 7411 "BatchImport.c" } #line 748 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp0_) { -#line 6743 "BatchImport.c" - GeeHashMap* _tmp7_; - PreparedFile* _tmp8_; - const gchar* _tmp9_; - gpointer _tmp10_; -#line 751 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = self->priv->imported_full_md5_table; +#line 7415 "BatchImport.c" + GeeHashMap* _tmp4_; + const gchar* _tmp5_; + gpointer _tmp6_; #line 751 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = prepared_file; + _tmp4_ = self->priv->imported_full_md5_table; #line 751 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = _tmp8_->full_md5; + _tmp5_ = prepared_file->full_md5; #line 751 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_); + _tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_); #line 751 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = (GFile*) _tmp10_; + result = (GFile*) _tmp6_; #line 751 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 6760 "BatchImport.c" +#line 7429 "BatchImport.c" } #line 755 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = prepared_file; + _tmp7_ = prepared_file->full_md5; #line 755 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = _tmp11_->full_md5; -#line 755 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp12_ != NULL) { -#line 6768 "BatchImport.c" - GeeHashMap* _tmp13_; - PreparedFile* _tmp14_; - const gchar* _tmp15_; - PreparedFile* _tmp16_; - GFile* _tmp17_; -#line 756 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = self->priv->imported_full_md5_table; -#line 756 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = prepared_file; + if (_tmp7_ != NULL) { +#line 7435 "BatchImport.c" + GeeHashMap* _tmp8_; + const gchar* _tmp9_; + GFile* _tmp10_; #line 756 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = _tmp14_->full_md5; + _tmp8_ = self->priv->imported_full_md5_table; #line 756 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = prepared_file; + _tmp9_ = prepared_file->full_md5; #line 756 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = _tmp16_->file; + _tmp10_ = prepared_file->file; #line 756 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_, _tmp17_); -#line 6786 "BatchImport.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, _tmp10_); +#line 7447 "BatchImport.c" } #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" result = NULL; #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 6792 "BatchImport.c" +#line 7453 "BatchImport.c" } -static gpointer _notification_object_ref0 (gpointer self) { +static gpointer +_notification_object_ref0 (gpointer self) +{ #line 765 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? notification_object_ref (self) : NULL; -#line 6799 "BatchImport.c" +#line 7462 "BatchImport.c" } -static void batch_import_on_file_prepared (BatchImport* self, BackgroundJob* j, NotificationObject* user) { +static void +batch_import_on_file_prepared (BatchImport* self, + BackgroundJob* j, + NotificationObject* user) +{ gboolean _tmp0_; PreparedFileCluster* cluster = NULL; - NotificationObject* _tmp1_; - PreparedFileCluster* _tmp2_; - GeeArrayList* _tmp3_; + PreparedFileCluster* _tmp1_; + GeeArrayList* _tmp2_; + gint _tmp3_; gint _tmp4_; - gint _tmp5_; + gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; - GeeArrayList* _tmp8_; + GeeArrayList* _tmp7_; #line 762 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 762 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6822,36 +7488,36 @@ static void batch_import_on_file_prepared (BatchImport* self, BackgroundJob* j, #line 763 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_assert (!_tmp0_, "!completed"); #line 765 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = user; -#line 765 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = _notification_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PREPARED_FILE_CLUSTER, PreparedFileCluster)); + _tmp1_ = _notification_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (user, TYPE_PREPARED_FILE_CLUSTER, PreparedFileCluster)); #line 765 "/home/jens/Source/shotwell/src/BatchImport.vala" - cluster = _tmp2_; + cluster = _tmp1_; #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = cluster->list; + _tmp2_ = cluster->list; #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = g_strdup_printf ("on_file_prepared (%d files)", _tmp5_); + _tmp5_ = g_strdup_printf ("on_file_prepared (%d files)", _tmp4_); #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_log_status (self, _tmp7_); + batch_import_log_status (self, _tmp6_); #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 769 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = cluster->list; + _tmp7_ = cluster->list; #line 769 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_process_prepared_files (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_LIST, GeeList), NULL, NULL); + batch_import_process_prepared_files (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_LIST, GeeList), NULL, NULL); #line 762 "/home/jens/Source/shotwell/src/BatchImport.vala" _notification_object_unref0 (cluster); -#line 6850 "BatchImport.c" +#line 7514 "BatchImport.c" } -static void batch_import_process_prepared_files_data_free (gpointer _data) { +static void +batch_import_process_prepared_files_data_free (gpointer _data) +{ BatchImportProcessPreparedFilesData* _data_; _data_ = _data; #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6860,11 +7526,15 @@ static void batch_import_process_prepared_files_data_free (gpointer _data) { _g_object_unref0 (_data_->self); #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" g_slice_free (BatchImportProcessPreparedFilesData, _data_); -#line 6863 "BatchImport.c" +#line 7529 "BatchImport.c" } -static void batch_import_process_prepared_files_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) { +static void +batch_import_process_prepared_files_async_ready_wrapper (GObject *source_object, + GAsyncResult *res, + void *user_data) +{ BatchImportProcessPreparedFilesData* _task_data_; #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" _task_data_ = g_task_get_task_data (G_TASK (res)); @@ -6872,19 +7542,23 @@ static void batch_import_process_prepared_files_async_ready_wrapper (GObject *so if (_task_data_->_callback_ != NULL) { #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" _task_data_->_callback_ (source_object, res, user_data); -#line 6875 "BatchImport.c" +#line 7545 "BatchImport.c" } #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" _task_data_->_task_complete_ = TRUE; -#line 6879 "BatchImport.c" +#line 7549 "BatchImport.c" } -static void batch_import_process_prepared_files (BatchImport* self, GeeList* list, GAsyncReadyCallback _callback_, gpointer _user_data_) { +static void +batch_import_process_prepared_files (BatchImport* self, + GeeList* list, + GAsyncReadyCallback _callback_, + gpointer _user_data_) +{ BatchImportProcessPreparedFilesData* _data_; BatchImport* _tmp0_; GeeList* _tmp1_; - GeeList* _tmp2_; #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_ = g_slice_new0 (BatchImportProcessPreparedFilesData); #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6895,7 +7569,7 @@ static void batch_import_process_prepared_files (BatchImport* self, GeeList* lis if (_callback_ == NULL) { #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_task_complete_ = TRUE; -#line 6898 "BatchImport.c" +#line 7572 "BatchImport.c" } #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" g_task_set_task_data (_data_->_async_result, _data_, batch_import_process_prepared_files_data_free); @@ -6904,127 +7578,130 @@ static void batch_import_process_prepared_files (BatchImport* self, GeeList* lis #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->self = _tmp0_; #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = list; -#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (list); #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->list); #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->list = _tmp2_; + _data_->list = _tmp1_; #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_process_prepared_files_co (_data_); -#line 6916 "BatchImport.c" +#line 7588 "BatchImport.c" } -static void batch_import_process_prepared_files_finish (BatchImport* self, GAsyncResult* _res_) { +static void +batch_import_process_prepared_files_finish (BatchImport* self, + GAsyncResult* _res_) +{ BatchImportProcessPreparedFilesData* _data_; #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_ = g_task_propagate_pointer (G_TASK (_res_), NULL); -#line 6924 "BatchImport.c" +#line 7599 "BatchImport.c" } -static gboolean _batch_import_process_prepared_files_co_gsource_func (gpointer self) { +static gboolean +_batch_import_process_prepared_files_co_gsource_func (gpointer self) +{ gboolean result; result = batch_import_process_prepared_files_co (self); #line 776 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 6933 "BatchImport.c" +#line 7610 "BatchImport.c" } -static gboolean batch_import_process_prepared_files_co (BatchImportProcessPreparedFilesData* _data_) { +static gboolean +batch_import_process_prepared_files_co (BatchImportProcessPreparedFilesData* _data_) +{ #line 774 "/home/jens/Source/shotwell/src/BatchImport.vala" switch (_data_->_state_) { #line 774 "/home/jens/Source/shotwell/src/BatchImport.vala" case 0: -#line 6942 "BatchImport.c" +#line 7621 "BatchImport.c" goto _state_0; #line 774 "/home/jens/Source/shotwell/src/BatchImport.vala" case 1: -#line 6946 "BatchImport.c" +#line 7625 "BatchImport.c" goto _state_1; default: #line 774 "/home/jens/Source/shotwell/src/BatchImport.vala" g_assert_not_reached (); -#line 6951 "BatchImport.c" +#line 7630 "BatchImport.c" } _state_0: { #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp0_ = _data_->list; + _data_->_tmp0_ = _g_object_ref0 (_data_->list); #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp1_ = _g_object_ref0 (_data_->_tmp0_); + _data_->_prepared_file_list = _data_->_tmp0_; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_prepared_file_list = _data_->_tmp1_; + _data_->_tmp1_ = _data_->_prepared_file_list; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp2_ = _data_->_prepared_file_list; + _data_->_tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); + _data_->_tmp3_ = _data_->_tmp2_; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp4_ = _data_->_tmp3_; -#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_prepared_file_size = _data_->_tmp4_; + _data_->_prepared_file_size = _data_->_tmp3_; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_prepared_file_index = -1; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp5_ = _data_->_prepared_file_index; + _data_->_tmp4_ = _data_->_prepared_file_index; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_prepared_file_index = _data_->_tmp5_ + 1; + _data_->_prepared_file_index = _data_->_tmp4_ + 1; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp6_ = _data_->_prepared_file_index; + _data_->_tmp5_ = _data_->_prepared_file_index; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp7_ = _data_->_prepared_file_size; + _data_->_tmp6_ = _data_->_prepared_file_size; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!(_data_->_tmp6_ < _data_->_tmp7_)) { + if (!(_data_->_tmp5_ < _data_->_tmp6_)) { #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 6985 "BatchImport.c" +#line 7662 "BatchImport.c" } #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp8_ = _data_->_prepared_file_list; + _data_->_tmp7_ = _data_->_prepared_file_list; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp9_ = _data_->_prepared_file_index; + _data_->_tmp8_ = _data_->_prepared_file_index; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp10_ = gee_list_get (_data_->_tmp8_, _data_->_tmp9_); + _data_->_tmp9_ = gee_list_get (_data_->_tmp7_, _data_->_tmp8_); #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->prepared_file = (PreparedFile*) _data_->_tmp10_; + _data_->prepared_file = (PreparedFile*) _data_->_tmp9_; #line 776 "/home/jens/Source/shotwell/src/BatchImport.vala" g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _batch_import_process_prepared_files_co_gsource_func, _data_, NULL); #line 777 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_state_ = 1; #line 777 "/home/jens/Source/shotwell/src/BatchImport.vala" return FALSE; -#line 7001 "BatchImport.c" +#line 7678 "BatchImport.c" _state_1: ; #line 779 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->import_result = NULL; #line 784 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp11_ = library_photo_global; + _data_->_tmp10_ = library_photo_global; #line 784 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp12_ = _data_->prepared_file; + _data_->_tmp11_ = _data_->prepared_file; #line 784 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp13_ = _data_->_tmp12_->file; + _data_->_tmp12_ = _data_->_tmp11_->file; #line 784 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp14_ = 0; + _data_->_tmp13_ = 0; #line 784 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp15_ = library_photo_source_collection_get_state_by_file (_data_->_tmp11_, _data_->_tmp13_, &_data_->_tmp14_); + _data_->_tmp14_ = library_photo_source_collection_get_state_by_file (_data_->_tmp10_, _data_->_tmp12_, &_data_->_tmp13_); #line 784 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->photo_state = _data_->_tmp14_; + _data_->photo_state = _data_->_tmp13_; #line 784 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->photo = _data_->_tmp15_; + _data_->photo = _data_->_tmp14_; #line 786 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp16_ = _data_->photo; + _data_->_tmp15_ = _data_->photo; #line 786 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp16_ != NULL) { + if (_data_->_tmp15_ != NULL) { #line 787 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp17_ = _data_->photo_state; + _data_->_tmp16_ = _data_->photo_state; #line 787 "/home/jens/Source/shotwell/src/BatchImport.vala" - switch (_data_->_tmp17_) { + switch (_data_->_tmp16_) { #line 787 "/home/jens/Source/shotwell/src/BatchImport.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: #line 787 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -7033,98 +7710,98 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: #line 787 "/home/jens/Source/shotwell/src/BatchImport.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 7036 "BatchImport.c" +#line 7713 "BatchImport.c" { #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp18_ = _data_->prepared_file; + _data_->_tmp17_ = _data_->prepared_file; #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp19_ = _data_->_tmp18_->job; + _data_->_tmp18_ = _data_->_tmp17_->job; #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp20_ = _data_->prepared_file; + _data_->_tmp19_ = _data_->prepared_file; #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp21_ = _data_->_tmp20_->file; + _data_->_tmp20_ = _data_->_tmp19_->file; #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp22_ = _data_->prepared_file; + _data_->_tmp21_ = _data_->prepared_file; #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp23_ = _data_->_tmp22_->file; + _data_->_tmp22_ = _data_->_tmp21_->file; #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp24_ = g_file_get_path (_data_->_tmp23_); + _data_->_tmp23_ = g_file_get_path (_data_->_tmp22_); #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp25_ = _data_->_tmp24_; + _data_->_tmp24_ = _data_->_tmp23_; #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp26_ = _data_->prepared_file; + _data_->_tmp25_ = _data_->prepared_file; #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp27_ = _data_->_tmp26_->file; + _data_->_tmp26_ = _data_->_tmp25_->file; #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp28_ = g_file_get_path (_data_->_tmp27_); + _data_->_tmp27_ = g_file_get_path (_data_->_tmp26_); #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp29_ = _data_->_tmp28_; + _data_->_tmp28_ = _data_->_tmp27_; #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp30_ = _data_->photo; + _data_->_tmp29_ = _data_->photo; #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp31_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp30_, TYPE_MEDIA_SOURCE, MediaSource)); + _data_->_tmp30_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp29_, TYPE_MEDIA_SOURCE, MediaSource)); #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp32_ = _data_->_tmp31_; + _data_->_tmp31_ = _data_->_tmp30_; #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp33_ = duplicated_file_create_from_file (_data_->_tmp32_); + _data_->_tmp32_ = duplicated_file_create_from_file (_data_->_tmp31_); #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp34_ = _data_->_tmp33_; + _data_->_tmp33_ = _data_->_tmp32_; #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp35_ = batch_import_result_new (_data_->_tmp19_, _data_->_tmp21_, _data_->_tmp25_, _data_->_tmp29_, _data_->_tmp34_, IMPORT_RESULT_PHOTO_EXISTS); + _data_->_tmp34_ = batch_import_result_new (_data_->_tmp18_, _data_->_tmp20_, _data_->_tmp24_, _data_->_tmp28_, _data_->_tmp33_, IMPORT_RESULT_PHOTO_EXISTS); #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (_data_->import_result); #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->import_result = _data_->_tmp35_; + _data_->import_result = _data_->_tmp34_; #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_data_->_tmp34_); + _g_object_unref0 (_data_->_tmp33_); #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_data_->_tmp32_); + _g_object_unref0 (_data_->_tmp31_); #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_data_->_tmp29_); + _g_free0 (_data_->_tmp28_); #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_data_->_tmp25_); + _g_free0 (_data_->_tmp24_); #line 797 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp36_ = _data_->photo_state; + _data_->_tmp35_ = _data_->photo_state; #line 797 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp36_ == LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE) { + if (_data_->_tmp35_ == LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE) { #line 798 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp37_ = _data_->photo; + _data_->_tmp36_ = _data_->photo; #line 798 "/home/jens/Source/shotwell/src/BatchImport.vala" - media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp37_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 7094 "BatchImport.c" + media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp36_, TYPE_MEDIA_SOURCE, MediaSource)); +#line 7771 "BatchImport.c" } #line 799 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 7098 "BatchImport.c" +#line 7775 "BatchImport.c" } #line 787 "/home/jens/Source/shotwell/src/BatchImport.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH: -#line 7102 "BatchImport.c" +#line 7779 "BatchImport.c" { #line 803 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 7106 "BatchImport.c" +#line 7783 "BatchImport.c" } default: { #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp38_ = _data_->photo_state; + _data_->_tmp37_ = _data_->photo_state; #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp39_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _data_->_tmp38_); + _data_->_tmp38_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _data_->_tmp37_); #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_error ("BatchImport.vala:806: Unknown LibraryPhotoSourceCollection state: %s", (_data_->_tmp39_ != NULL) ? _data_->_tmp39_->value_name : NULL); -#line 7116 "BatchImport.c" + g_error ("BatchImport.vala:806: Unknown LibraryPhotoSourceCollection state: %s", (_data_->_tmp38_ != NULL) ? _data_->_tmp38_->value_name : NULL); +#line 7793 "BatchImport.c" } } } #line 810 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp40_ = _data_->import_result; + _data_->_tmp39_ = _data_->import_result; #line 810 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp40_ != NULL) { + if (_data_->_tmp39_ != NULL) { #line 811 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp41_ = _data_->import_result; + _data_->_tmp40_ = _data_->import_result; #line 811 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_report_failure (_data_->self, _data_->_tmp41_); + batch_import_report_failure (_data_->self, _data_->_tmp40_); #line 812 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_file_import_complete (_data_->self); #line 814 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -7135,126 +7812,126 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar _prepared_file_unref0 (_data_->prepared_file); #line 814 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 7138 "BatchImport.c" +#line 7815 "BatchImport.c" } #line 818 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp42_ = video_global; + _data_->_tmp41_ = video_global; #line 818 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp43_ = _data_->prepared_file; + _data_->_tmp42_ = _data_->prepared_file; #line 818 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp44_ = _data_->_tmp43_->file; + _data_->_tmp43_ = _data_->_tmp42_->file; #line 818 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp45_ = 0; + _data_->_tmp44_ = 0; #line 818 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp46_ = video_source_collection_get_state_by_file (_data_->_tmp42_, _data_->_tmp44_, &_data_->_tmp45_); + _data_->_tmp45_ = video_source_collection_get_state_by_file (_data_->_tmp41_, _data_->_tmp43_, &_data_->_tmp44_); #line 818 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->video_state = _data_->_tmp45_; + _data_->video_state = _data_->_tmp44_; #line 818 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->video = _data_->_tmp46_; + _data_->video = _data_->_tmp45_; #line 819 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp47_ = _data_->video; + _data_->_tmp46_ = _data_->video; #line 819 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp47_ != NULL) { + if (_data_->_tmp46_ != NULL) { #line 820 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp48_ = _data_->video_state; + _data_->_tmp47_ = _data_->video_state; #line 820 "/home/jens/Source/shotwell/src/BatchImport.vala" - switch (_data_->_tmp48_) { + switch (_data_->_tmp47_) { #line 820 "/home/jens/Source/shotwell/src/BatchImport.vala" case VIDEO_SOURCE_COLLECTION_STATE_ONLINE: #line 820 "/home/jens/Source/shotwell/src/BatchImport.vala" case VIDEO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 7166 "BatchImport.c" +#line 7843 "BatchImport.c" { #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp49_ = _data_->prepared_file; + _data_->_tmp48_ = _data_->prepared_file; #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp50_ = _data_->_tmp49_->job; + _data_->_tmp49_ = _data_->_tmp48_->job; #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp51_ = _data_->prepared_file; + _data_->_tmp50_ = _data_->prepared_file; #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp52_ = _data_->_tmp51_->file; + _data_->_tmp51_ = _data_->_tmp50_->file; #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp53_ = _data_->prepared_file; + _data_->_tmp52_ = _data_->prepared_file; #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp54_ = _data_->_tmp53_->file; + _data_->_tmp53_ = _data_->_tmp52_->file; #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp55_ = g_file_get_path (_data_->_tmp54_); + _data_->_tmp54_ = g_file_get_path (_data_->_tmp53_); #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp56_ = _data_->_tmp55_; + _data_->_tmp55_ = _data_->_tmp54_; #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp57_ = _data_->prepared_file; + _data_->_tmp56_ = _data_->prepared_file; #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp58_ = _data_->_tmp57_->file; + _data_->_tmp57_ = _data_->_tmp56_->file; #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp59_ = g_file_get_path (_data_->_tmp58_); + _data_->_tmp58_ = g_file_get_path (_data_->_tmp57_); #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp60_ = _data_->_tmp59_; + _data_->_tmp59_ = _data_->_tmp58_; #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp61_ = _data_->video; + _data_->_tmp60_ = _data_->video; #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp62_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp61_, TYPE_MEDIA_SOURCE, MediaSource)); + _data_->_tmp61_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp60_, TYPE_MEDIA_SOURCE, MediaSource)); #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp63_ = _data_->_tmp62_; + _data_->_tmp62_ = _data_->_tmp61_; #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp64_ = duplicated_file_create_from_file (_data_->_tmp63_); + _data_->_tmp63_ = duplicated_file_create_from_file (_data_->_tmp62_); #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp65_ = _data_->_tmp64_; + _data_->_tmp64_ = _data_->_tmp63_; #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp66_ = batch_import_result_new (_data_->_tmp50_, _data_->_tmp52_, _data_->_tmp56_, _data_->_tmp60_, _data_->_tmp65_, IMPORT_RESULT_PHOTO_EXISTS); + _data_->_tmp65_ = batch_import_result_new (_data_->_tmp49_, _data_->_tmp51_, _data_->_tmp55_, _data_->_tmp59_, _data_->_tmp64_, IMPORT_RESULT_PHOTO_EXISTS); #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (_data_->import_result); #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->import_result = _data_->_tmp66_; + _data_->import_result = _data_->_tmp65_; #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_data_->_tmp65_); + _g_object_unref0 (_data_->_tmp64_); #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_data_->_tmp63_); + _g_object_unref0 (_data_->_tmp62_); #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_data_->_tmp60_); + _g_free0 (_data_->_tmp59_); #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_data_->_tmp56_); + _g_free0 (_data_->_tmp55_); #line 828 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp67_ = _data_->video_state; + _data_->_tmp66_ = _data_->video_state; #line 828 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp67_ == VIDEO_SOURCE_COLLECTION_STATE_OFFLINE) { + if (_data_->_tmp66_ == VIDEO_SOURCE_COLLECTION_STATE_OFFLINE) { #line 829 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp68_ = _data_->video; + _data_->_tmp67_ = _data_->video; #line 829 "/home/jens/Source/shotwell/src/BatchImport.vala" - media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp68_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 7224 "BatchImport.c" + media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp67_, TYPE_MEDIA_SOURCE, MediaSource)); +#line 7901 "BatchImport.c" } #line 830 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 7228 "BatchImport.c" +#line 7905 "BatchImport.c" } #line 820 "/home/jens/Source/shotwell/src/BatchImport.vala" case VIDEO_SOURCE_COLLECTION_STATE_TRASH: -#line 7232 "BatchImport.c" +#line 7909 "BatchImport.c" { #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 7236 "BatchImport.c" +#line 7913 "BatchImport.c" } default: { #line 837 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp69_ = _data_->video_state; + _data_->_tmp68_ = _data_->video_state; #line 837 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp70_ = g_enum_get_value (g_type_class_ref (VIDEO_SOURCE_COLLECTION_TYPE_STATE), _data_->_tmp69_); + _data_->_tmp69_ = g_enum_get_value (g_type_class_ref (VIDEO_SOURCE_COLLECTION_TYPE_STATE), _data_->_tmp68_); #line 837 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_error ("BatchImport.vala:837: Unknown VideoSourceCollection state: %s", (_data_->_tmp70_ != NULL) ? _data_->_tmp70_->value_name : NULL); -#line 7246 "BatchImport.c" + g_error ("BatchImport.vala:837: Unknown VideoSourceCollection state: %s", (_data_->_tmp69_ != NULL) ? _data_->_tmp69_->value_name : NULL); +#line 7923 "BatchImport.c" } } } #line 841 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp71_ = _data_->import_result; + _data_->_tmp70_ = _data_->import_result; #line 841 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp71_ != NULL) { + if (_data_->_tmp70_ != NULL) { #line 842 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp72_ = _data_->import_result; + _data_->_tmp71_ = _data_->import_result; #line 842 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_report_failure (_data_->self, _data_->_tmp72_); + batch_import_report_failure (_data_->self, _data_->_tmp71_); #line 843 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_file_import_complete (_data_->self); #line 845 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -7267,229 +7944,225 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar _prepared_file_unref0 (_data_->prepared_file); #line 845 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 7270 "BatchImport.c" +#line 7947 "BatchImport.c" } #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp74_ = _data_->prepared_file; -#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp75_ = _data_->_tmp74_->is_video; + _data_->_tmp73_ = _data_->prepared_file; #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp75_) { + _data_->_tmp74_ = _data_->_tmp73_->is_video; #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp76_ = _data_->prepared_file; + if (_data_->_tmp74_) { #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp77_ = _data_->_tmp76_->file; + _data_->_tmp75_ = _data_->prepared_file; #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp78_ = _data_->prepared_file; + _data_->_tmp76_ = _data_->_tmp75_->file; #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp79_ = _data_->_tmp78_->full_md5; + _data_->_tmp77_ = _data_->prepared_file; #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp80_ = video_is_duplicate (_data_->_tmp77_, _data_->_tmp79_); + _data_->_tmp78_ = _data_->_tmp77_->full_md5; #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp73_ = _data_->_tmp80_; -#line 7290 "BatchImport.c" + _data_->_tmp72_ = video_is_duplicate (_data_->_tmp76_, _data_->_tmp78_); +#line 7965 "BatchImport.c" } else { #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp73_ = FALSE; -#line 7294 "BatchImport.c" + _data_->_tmp72_ = FALSE; +#line 7969 "BatchImport.c" } #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp73_) { + if (_data_->_tmp72_) { #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp81_ = video_table_get_instance (); + _data_->_tmp79_ = video_table_get_instance (); #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp82_ = _data_->_tmp81_; + _data_->_tmp80_ = _data_->_tmp79_; #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp83_ = _data_->prepared_file; + _data_->_tmp81_ = _data_->prepared_file; #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp84_ = _data_->_tmp83_->file; + _data_->_tmp82_ = _data_->_tmp81_->file; #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp85_ = _data_->prepared_file; + _data_->_tmp83_ = _data_->prepared_file; #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp86_ = _data_->_tmp85_->full_md5; + _data_->_tmp84_ = _data_->_tmp83_->full_md5; #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp88_ = video_table_get_duplicate_ids (_data_->_tmp82_, _data_->_tmp84_, _data_->_tmp86_, &_data_->_tmp87_); + _data_->_tmp86_ = video_table_get_duplicate_ids (_data_->_tmp80_, _data_->_tmp82_, _data_->_tmp84_, &_data_->_tmp85_); #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp89_ = _data_->_tmp88_; + _data_->_tmp87_ = _data_->_tmp86_; #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp89__length1 = _data_->_tmp87_; + _data_->_tmp87__length1 = _data_->_tmp85_; #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala" - _database_table_unref0 (_data_->_tmp82_); + _database_table_unref0 (_data_->_tmp80_); #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->duplicate_ids = _data_->_tmp89_; + _data_->duplicate_ids = _data_->_tmp87_; #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->duplicate_ids_length1 = _data_->_tmp89__length1; + _data_->duplicate_ids_length1 = _data_->_tmp87__length1; #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_duplicate_ids_size_ = _data_->duplicate_ids_length1; #line 854 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp90_ = _data_->duplicate_ids; + _data_->_tmp88_ = _data_->duplicate_ids; #line 854 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp90__length1 = _data_->duplicate_ids_length1; + _data_->_tmp88__length1 = _data_->duplicate_ids_length1; #line 854 "/home/jens/Source/shotwell/src/BatchImport.vala" - _vala_assert (_data_->_tmp90__length1 > 0, "duplicate_ids.length > 0"); + _vala_assert (_data_->_tmp88__length1 > 0, "duplicate_ids.length > 0"); #line 856 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp91_ = _data_->duplicate_ids; + _data_->_tmp89_ = _data_->duplicate_ids; #line 856 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp91__length1 = _data_->duplicate_ids_length1; + _data_->_tmp89__length1 = _data_->duplicate_ids_length1; #line 856 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp92_ = _data_->_tmp91_[0]; + _data_->_tmp90_ = _data_->_tmp89_[0]; #line 856 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp93_ = duplicated_file_create_from_video_id (&_data_->_tmp92_); + _data_->_tmp91_ = duplicated_file_create_from_video_id (&_data_->_tmp90_); #line 856 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->duplicated_file = _data_->_tmp93_; + _data_->duplicated_file = _data_->_tmp91_; #line 859 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->result_code = IMPORT_RESULT_PHOTO_EXISTS; #line 860 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp94_ = _data_->self->priv->mark_duplicates_online; + _data_->_tmp92_ = _data_->self->priv->mark_duplicates_online; #line 860 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp94_) { + if (_data_->_tmp92_) { #line 861 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp95_ = video_global; + _data_->_tmp93_ = video_global; #line 861 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp96_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp95_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _data_->_tmp94_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp93_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 861 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp97_ = _data_->_tmp96_; + _data_->_tmp95_ = _data_->_tmp94_; #line 861 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp98_ = _data_->prepared_file; + _data_->_tmp96_ = _data_->prepared_file; #line 861 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp99_ = _data_->_tmp98_->file; + _data_->_tmp97_ = _data_->_tmp96_->file; #line 861 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp100_ = media_source_holding_tank_fetch_by_master_file (_data_->_tmp97_, _data_->_tmp99_); + _data_->_tmp98_ = media_source_holding_tank_fetch_by_master_file (_data_->_tmp95_, _data_->_tmp97_); #line 861 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp101_ = G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp100_, TYPE_VIDEO, Video); + _data_->_tmp99_ = G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp98_, TYPE_VIDEO, Video); #line 861 "/home/jens/Source/shotwell/src/BatchImport.vala" - _source_holding_tank_unref0 (_data_->_tmp97_); + _source_holding_tank_unref0 (_data_->_tmp95_); #line 861 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->dupe_video = _data_->_tmp101_; + _data_->dupe_video = _data_->_tmp99_; #line 863 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp102_ = _data_->dupe_video; + _data_->_tmp100_ = _data_->dupe_video; #line 863 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp102_ == NULL) { + if (_data_->_tmp100_ == NULL) { #line 864 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp103_ = video_global; + _data_->_tmp101_ = video_global; #line 864 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp104_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp103_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _data_->_tmp102_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp101_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 864 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp105_ = _data_->_tmp104_; + _data_->_tmp103_ = _data_->_tmp102_; #line 864 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp106_ = _data_->prepared_file; + _data_->_tmp104_ = _data_->prepared_file; #line 864 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp107_ = _data_->_tmp106_->full_md5; + _data_->_tmp105_ = _data_->_tmp104_->full_md5; #line 864 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp108_ = media_source_holding_tank_fetch_by_md5 (_data_->_tmp105_, _data_->_tmp107_); + _data_->_tmp106_ = media_source_holding_tank_fetch_by_md5 (_data_->_tmp103_, _data_->_tmp105_); #line 864 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->dupe_video); #line 864 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->dupe_video = G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp108_, TYPE_VIDEO, Video); + _data_->dupe_video = G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp106_, TYPE_VIDEO, Video); #line 864 "/home/jens/Source/shotwell/src/BatchImport.vala" - _source_holding_tank_unref0 (_data_->_tmp105_); -#line 7386 "BatchImport.c" + _source_holding_tank_unref0 (_data_->_tmp103_); +#line 8061 "BatchImport.c" } #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp109_ = _data_->dupe_video; + _data_->_tmp107_ = _data_->dupe_video; #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp109_ != NULL) { + if (_data_->_tmp107_ != NULL) { #line 867 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp110_ = _data_->prepared_file; + _data_->_tmp108_ = _data_->prepared_file; #line 867 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp111_ = _data_->_tmp110_->file; + _data_->_tmp109_ = _data_->_tmp108_->file; #line 867 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp112_ = g_file_get_path (_data_->_tmp111_); + _data_->_tmp110_ = g_file_get_path (_data_->_tmp109_); #line 867 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp113_ = _data_->_tmp112_; + _data_->_tmp111_ = _data_->_tmp110_; #line 867 "/home/jens/Source/shotwell/src/BatchImport.vala" g_debug ("BatchImport.vala:867: duplicate video found offline, marking as online" \ -": %s", _data_->_tmp113_); +": %s", _data_->_tmp111_); #line 867 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_data_->_tmp113_); + _g_free0 (_data_->_tmp111_); #line 870 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp114_ = _data_->dupe_video; + _data_->_tmp112_ = _data_->dupe_video; #line 870 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp115_ = _data_->prepared_file; + _data_->_tmp113_ = _data_->prepared_file; #line 870 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp116_ = _data_->_tmp115_->file; + _data_->_tmp114_ = _data_->_tmp113_->file; #line 870 "/home/jens/Source/shotwell/src/BatchImport.vala" - monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp114_, TYPE_MONITORABLE, Monitorable), _data_->_tmp116_); + monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp112_, TYPE_MONITORABLE, Monitorable), _data_->_tmp114_); #line 871 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp117_ = _data_->dupe_video; + _data_->_tmp115_ = _data_->dupe_video; #line 871 "/home/jens/Source/shotwell/src/BatchImport.vala" - media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp117_, TYPE_MEDIA_SOURCE, MediaSource)); + media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp115_, TYPE_MEDIA_SOURCE, MediaSource)); #line 873 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->duplicated_file); #line 873 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->duplicated_file = NULL; #line 875 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp118_ = _data_->self->priv->manifest; + _data_->_tmp116_ = _data_->self->priv->manifest; #line 875 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp119_ = _data_->_tmp118_->imported; + _data_->_tmp117_ = _data_->_tmp116_->imported; #line 875 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp120_ = _data_->dupe_video; + _data_->_tmp118_ = _data_->dupe_video; #line 875 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp119_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp120_, TYPE_MEDIA_SOURCE, MediaSource)); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp117_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp118_, TYPE_MEDIA_SOURCE, MediaSource)); #line 876 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp121_ = _data_->dupe_video; + _data_->_tmp119_ = _data_->dupe_video; #line 876 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp122_ = media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp121_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 876 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_report_progress (_data_->self, _data_->_tmp122_); + batch_import_report_progress (_data_->self, media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp119_, TYPE_MEDIA_SOURCE, MediaSource))); #line 877 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_file_import_complete (_data_->self); #line 879 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->result_code = IMPORT_RESULT_SUCCESS; -#line 7438 "BatchImport.c" +#line 8111 "BatchImport.c" } #line 860 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->dupe_video); -#line 7442 "BatchImport.c" +#line 8115 "BatchImport.c" } #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp123_ = _data_->prepared_file; + _data_->_tmp120_ = _data_->prepared_file; #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp124_ = _data_->_tmp123_->job; + _data_->_tmp121_ = _data_->_tmp120_->job; #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp125_ = _data_->prepared_file; + _data_->_tmp122_ = _data_->prepared_file; #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp126_ = _data_->_tmp125_->file; + _data_->_tmp123_ = _data_->_tmp122_->file; #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp127_ = _data_->prepared_file; + _data_->_tmp124_ = _data_->prepared_file; #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp128_ = _data_->_tmp127_->file; + _data_->_tmp125_ = _data_->_tmp124_->file; #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp129_ = g_file_get_path (_data_->_tmp128_); + _data_->_tmp126_ = g_file_get_path (_data_->_tmp125_); #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp130_ = _data_->_tmp129_; + _data_->_tmp127_ = _data_->_tmp126_; #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp131_ = _data_->prepared_file; + _data_->_tmp128_ = _data_->prepared_file; #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp132_ = _data_->_tmp131_->file; + _data_->_tmp129_ = _data_->_tmp128_->file; #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp133_ = g_file_get_path (_data_->_tmp132_); + _data_->_tmp130_ = g_file_get_path (_data_->_tmp129_); #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp134_ = _data_->_tmp133_; + _data_->_tmp131_ = _data_->_tmp130_; #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp135_ = _data_->duplicated_file; + _data_->_tmp132_ = _data_->duplicated_file; #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp136_ = _data_->result_code; + _data_->_tmp133_ = _data_->result_code; #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp137_ = batch_import_result_new (_data_->_tmp124_, _data_->_tmp126_, _data_->_tmp130_, _data_->_tmp134_, _data_->_tmp135_, _data_->_tmp136_); + _data_->_tmp134_ = batch_import_result_new (_data_->_tmp121_, _data_->_tmp123_, _data_->_tmp127_, _data_->_tmp131_, _data_->_tmp132_, _data_->_tmp133_); #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (_data_->import_result); #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->import_result = _data_->_tmp137_; + _data_->import_result = _data_->_tmp134_; #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_data_->_tmp134_); + _g_free0 (_data_->_tmp131_); #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_data_->_tmp130_); + _g_free0 (_data_->_tmp127_); #line 887 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp138_ = _data_->result_code; + _data_->_tmp135_ = _data_->result_code; #line 887 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp138_ == IMPORT_RESULT_SUCCESS) { + if (_data_->_tmp135_ == IMPORT_RESULT_SUCCESS) { #line 888 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp139_ = _data_->self->priv->manifest; + _data_->_tmp136_ = _data_->self->priv->manifest; #line 888 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp140_ = _data_->import_result; + _data_->_tmp137_ = _data_->import_result; #line 888 "/home/jens/Source/shotwell/src/BatchImport.vala" - import_manifest_add_result (_data_->_tmp139_, _data_->_tmp140_); + import_manifest_add_result (_data_->_tmp136_, _data_->_tmp137_); #line 890 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->duplicated_file); #line 890 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -7504,280 +8177,286 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar _prepared_file_unref0 (_data_->prepared_file); #line 890 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 7506 "BatchImport.c" +#line 8179 "BatchImport.c" } #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->duplicated_file); #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->duplicate_ids = (g_free (_data_->duplicate_ids), NULL); -#line 7512 "BatchImport.c" +#line 8185 "BatchImport.c" } #line 894 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp141_ = _data_->prepared_file; + _data_->_tmp138_ = _data_->prepared_file; #line 894 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp142_ = batch_import_get_in_current_import (_data_->self, _data_->_tmp141_); + _data_->_tmp139_ = batch_import_get_in_current_import (_data_->self, _data_->_tmp138_); #line 894 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp143_ = _data_->_tmp142_; + _data_->_tmp140_ = _data_->_tmp139_; #line 894 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp144_ = _data_->_tmp143_ != NULL; + _data_->_tmp141_ = _data_->_tmp140_ != NULL; #line 894 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_data_->_tmp143_); + _g_object_unref0 (_data_->_tmp140_); #line 894 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp144_) { + if (_data_->_tmp141_) { #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp145_ = _data_->prepared_file; + _data_->_tmp142_ = _data_->prepared_file; #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp146_ = _data_->_tmp145_->job; + _data_->_tmp143_ = _data_->_tmp142_->job; #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp147_ = _data_->prepared_file; + _data_->_tmp144_ = _data_->prepared_file; #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp148_ = _data_->_tmp147_->file; + _data_->_tmp145_ = _data_->_tmp144_->file; #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp149_ = _data_->prepared_file; + _data_->_tmp146_ = _data_->prepared_file; #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp150_ = _data_->_tmp149_->file; + _data_->_tmp147_ = _data_->_tmp146_->file; #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp151_ = g_file_get_path (_data_->_tmp150_); + _data_->_tmp148_ = g_file_get_path (_data_->_tmp147_); #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp152_ = _data_->_tmp151_; + _data_->_tmp149_ = _data_->_tmp148_; #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp153_ = _data_->prepared_file; + _data_->_tmp150_ = _data_->prepared_file; #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp154_ = _data_->_tmp153_->file; + _data_->_tmp151_ = _data_->_tmp150_->file; #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp155_ = g_file_get_path (_data_->_tmp154_); + _data_->_tmp152_ = g_file_get_path (_data_->_tmp151_); #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp156_ = _data_->_tmp155_; + _data_->_tmp153_ = _data_->_tmp152_; #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp157_ = _data_->prepared_file; + _data_->_tmp154_ = _data_->prepared_file; #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp158_ = batch_import_get_in_current_import (_data_->self, _data_->_tmp157_); + _data_->_tmp155_ = batch_import_get_in_current_import (_data_->self, _data_->_tmp154_); #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp159_ = _data_->_tmp158_; + _data_->_tmp156_ = _data_->_tmp155_; #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp160_ = duplicated_file_create_from_file (_data_->_tmp159_); + _data_->_tmp157_ = duplicated_file_create_from_file (_data_->_tmp156_); #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp161_ = _data_->_tmp160_; + _data_->_tmp158_ = _data_->_tmp157_; #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp162_ = batch_import_result_new (_data_->_tmp146_, _data_->_tmp148_, _data_->_tmp152_, _data_->_tmp156_, _data_->_tmp161_, IMPORT_RESULT_PHOTO_EXISTS); + _data_->_tmp159_ = batch_import_result_new (_data_->_tmp143_, _data_->_tmp145_, _data_->_tmp149_, _data_->_tmp153_, _data_->_tmp158_, IMPORT_RESULT_PHOTO_EXISTS); #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (_data_->import_result); #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->import_result = _data_->_tmp162_; + _data_->import_result = _data_->_tmp159_; #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_data_->_tmp161_); + _g_object_unref0 (_data_->_tmp158_); #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_data_->_tmp159_); + _g_object_unref0 (_data_->_tmp156_); #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_data_->_tmp156_); + _g_free0 (_data_->_tmp153_); #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_data_->_tmp152_); -#line 7574 "BatchImport.c" + _g_free0 (_data_->_tmp149_); +#line 8247 "BatchImport.c" } else { #line 901 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp163_ = _data_->prepared_file; + _data_->_tmp160_ = _data_->prepared_file; #line 901 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp164_ = _data_->_tmp163_->file; + _data_->_tmp161_ = _data_->_tmp160_->file; #line 901 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp165_ = _data_->prepared_file; + _data_->_tmp162_ = _data_->prepared_file; #line 901 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp166_ = _data_->_tmp165_->full_md5; + _data_->_tmp163_ = _data_->_tmp162_->full_md5; #line 901 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp167_ = _data_->prepared_file; + _data_->_tmp164_ = _data_->prepared_file; #line 901 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp168_ = _data_->_tmp167_->file_format; + _data_->_tmp165_ = _data_->_tmp164_->file_format; #line 901 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp169_ = photo_is_duplicate (_data_->_tmp164_, NULL, _data_->_tmp166_, _data_->_tmp168_); -#line 901 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp169_) { + if (photo_is_duplicate (_data_->_tmp161_, NULL, _data_->_tmp163_, _data_->_tmp165_)) { #line 903 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp170_ = _data_->self->priv->untrash_duplicates; + _data_->_tmp166_ = _data_->self->priv->untrash_duplicates; #line 903 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp170_) { + if (_data_->_tmp166_) { #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp171_ = library_photo_global; + _data_->_tmp167_ = library_photo_global; #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp172_ = _data_->prepared_file; + _data_->_tmp168_ = _data_->prepared_file; #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp173_ = _data_->_tmp172_->file; + _data_->_tmp169_ = _data_->_tmp168_->file; #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp174_ = library_photo_source_collection_get_trashed_by_file (_data_->_tmp171_, _data_->_tmp173_); + _data_->_tmp170_ = library_photo_source_collection_get_trashed_by_file (_data_->_tmp167_, _data_->_tmp169_); #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->photo); #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->photo = _data_->_tmp174_; + _data_->photo = _data_->_tmp170_; #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp176_ = _data_->photo; + _data_->_tmp172_ = _data_->photo; #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp176_ == NULL) { + if (_data_->_tmp172_ == NULL) { #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp177_ = _data_->prepared_file; + _data_->_tmp173_ = _data_->prepared_file; #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp178_ = _data_->_tmp177_->full_md5; + _data_->_tmp174_ = _data_->_tmp173_->full_md5; #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp175_ = _data_->_tmp178_ != NULL; -#line 7618 "BatchImport.c" + _data_->_tmp171_ = _data_->_tmp174_ != NULL; +#line 8289 "BatchImport.c" } else { #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp175_ = FALSE; -#line 7622 "BatchImport.c" + _data_->_tmp171_ = FALSE; +#line 8293 "BatchImport.c" } #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp175_) { + if (_data_->_tmp171_) { #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp179_ = library_photo_global; + _data_->_tmp175_ = library_photo_global; #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp180_ = _data_->prepared_file; + _data_->_tmp176_ = _data_->prepared_file; #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp181_ = _data_->_tmp180_->full_md5; + _data_->_tmp177_ = _data_->_tmp176_->full_md5; #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp182_ = library_photo_source_collection_get_trashed_by_md5 (_data_->_tmp179_, _data_->_tmp181_); + _data_->_tmp178_ = library_photo_source_collection_get_trashed_by_md5 (_data_->_tmp175_, _data_->_tmp177_); #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->photo); #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->photo = _data_->_tmp182_; -#line 7638 "BatchImport.c" + _data_->photo = _data_->_tmp178_; +#line 8309 "BatchImport.c" } #line 911 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp183_ = _data_->photo; + _data_->_tmp179_ = _data_->photo; #line 911 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp183_ != NULL) { + if (_data_->_tmp179_ != NULL) { #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp184_ = _data_->prepared_file; + _data_->_tmp180_ = _data_->prepared_file; #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp185_ = _data_->_tmp184_->file; + _data_->_tmp181_ = _data_->_tmp180_->file; #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp186_ = g_file_get_path (_data_->_tmp185_); + _data_->_tmp182_ = g_file_get_path (_data_->_tmp181_); #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp187_ = _data_->_tmp186_; + _data_->_tmp183_ = _data_->_tmp182_; #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala" g_debug ("BatchImport.vala:912: duplicate linked photo found in trash, untrashin" \ -"g and removing transforms for %s", _data_->_tmp187_); +"g and removing transforms for %s", _data_->_tmp183_); #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_data_->_tmp187_); + _g_free0 (_data_->_tmp183_); #line 915 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp188_ = _data_->photo; + _data_->_tmp184_ = _data_->photo; #line 915 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp189_ = _data_->prepared_file; + _data_->_tmp185_ = _data_->prepared_file; #line 915 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp190_ = _data_->_tmp189_->file; + _data_->_tmp186_ = _data_->_tmp185_->file; #line 915 "/home/jens/Source/shotwell/src/BatchImport.vala" - monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp188_, TYPE_MONITORABLE, Monitorable), _data_->_tmp190_); + monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp184_, TYPE_MONITORABLE, Monitorable), _data_->_tmp186_); #line 916 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp191_ = _data_->photo; + _data_->_tmp187_ = _data_->photo; #line 916 "/home/jens/Source/shotwell/src/BatchImport.vala" - media_source_untrash (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp191_, TYPE_MEDIA_SOURCE, MediaSource)); + media_source_untrash (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp187_, TYPE_MEDIA_SOURCE, MediaSource)); #line 917 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp192_ = _data_->photo; + _data_->_tmp188_ = _data_->photo; #line 917 "/home/jens/Source/shotwell/src/BatchImport.vala" - photo_remove_all_transformations (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp192_, TYPE_PHOTO, Photo)); -#line 7672 "BatchImport.c" + photo_remove_all_transformations (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp188_, TYPE_PHOTO, Photo)); +#line 8343 "BatchImport.c" } } #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp194_ = _data_->photo; + _data_->_tmp190_ = _data_->photo; #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp194_ == NULL) { + if (_data_->_tmp190_ == NULL) { #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp195_ = _data_->self->priv->mark_duplicates_online; + _data_->_tmp191_ = _data_->self->priv->mark_duplicates_online; #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp193_ = _data_->_tmp195_; -#line 7683 "BatchImport.c" + _data_->_tmp189_ = _data_->_tmp191_; +#line 8354 "BatchImport.c" } else { #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp193_ = FALSE; -#line 7687 "BatchImport.c" + _data_->_tmp189_ = FALSE; +#line 8358 "BatchImport.c" } #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp193_) { + if (_data_->_tmp189_) { #line 923 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp196_ = library_photo_global; + _data_->_tmp192_ = library_photo_global; #line 923 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp197_ = _data_->prepared_file; + _data_->_tmp193_ = _data_->prepared_file; #line 923 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp198_ = _data_->_tmp197_->file; + _data_->_tmp194_ = _data_->_tmp193_->file; #line 923 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp199_ = library_photo_source_collection_get_offline_by_file (_data_->_tmp196_, _data_->_tmp198_); + _data_->_tmp195_ = library_photo_source_collection_get_offline_by_file (_data_->_tmp192_, _data_->_tmp194_); #line 923 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->photo); #line 923 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->photo = _data_->_tmp199_; + _data_->photo = _data_->_tmp195_; #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp201_ = _data_->photo; + _data_->_tmp197_ = _data_->photo; #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp201_ == NULL) { + if (_data_->_tmp197_ == NULL) { #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp202_ = _data_->prepared_file; + _data_->_tmp198_ = _data_->prepared_file; #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp203_ = _data_->_tmp202_->full_md5; + _data_->_tmp199_ = _data_->_tmp198_->full_md5; #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp200_ = _data_->_tmp203_ != NULL; -#line 7713 "BatchImport.c" + _data_->_tmp196_ = _data_->_tmp199_ != NULL; +#line 8384 "BatchImport.c" } else { #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp200_ = FALSE; -#line 7717 "BatchImport.c" + _data_->_tmp196_ = FALSE; +#line 8388 "BatchImport.c" } #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp200_) { + if (_data_->_tmp196_) { #line 926 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp204_ = library_photo_global; + _data_->_tmp200_ = library_photo_global; #line 926 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp205_ = _data_->prepared_file; + _data_->_tmp201_ = _data_->prepared_file; #line 926 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp206_ = _data_->_tmp205_->full_md5; + _data_->_tmp202_ = _data_->_tmp201_->full_md5; #line 926 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp207_ = library_photo_source_collection_get_offline_by_md5 (_data_->_tmp204_, _data_->_tmp206_); + _data_->_tmp203_ = library_photo_source_collection_get_offline_by_md5 (_data_->_tmp200_, _data_->_tmp202_); #line 926 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->photo); #line 926 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->photo = _data_->_tmp207_; -#line 7733 "BatchImport.c" + _data_->photo = _data_->_tmp203_; +#line 8404 "BatchImport.c" } #line 928 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp208_ = _data_->photo; + _data_->_tmp204_ = _data_->photo; #line 928 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp208_ != NULL) { + if (_data_->_tmp204_ != NULL) { #line 929 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp209_ = _data_->prepared_file; + _data_->_tmp205_ = _data_->prepared_file; #line 929 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp210_ = _data_->_tmp209_->file; + _data_->_tmp206_ = _data_->_tmp205_->file; #line 929 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp211_ = g_file_get_path (_data_->_tmp210_); + _data_->_tmp207_ = g_file_get_path (_data_->_tmp206_); #line 929 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp212_ = _data_->_tmp211_; + _data_->_tmp208_ = _data_->_tmp207_; #line 929 "/home/jens/Source/shotwell/src/BatchImport.vala" g_debug ("BatchImport.vala:929: duplicate photo found marked offline, marking on" \ -"line: %s", _data_->_tmp212_); +"line: %s", _data_->_tmp208_); #line 929 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_data_->_tmp212_); + _g_free0 (_data_->_tmp208_); #line 932 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp213_ = _data_->photo; + _data_->_tmp209_ = _data_->photo; #line 932 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp214_ = _data_->prepared_file; + _data_->_tmp210_ = _data_->prepared_file; #line 932 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp215_ = _data_->_tmp214_->file; + _data_->_tmp211_ = _data_->_tmp210_->file; #line 932 "/home/jens/Source/shotwell/src/BatchImport.vala" - monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp213_, TYPE_MONITORABLE, Monitorable), _data_->_tmp215_); + monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp209_, TYPE_MONITORABLE, Monitorable), _data_->_tmp211_); #line 933 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp216_ = _data_->photo; + _data_->_tmp212_ = _data_->photo; #line 933 "/home/jens/Source/shotwell/src/BatchImport.vala" - media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp216_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 7763 "BatchImport.c" + media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp212_, TYPE_MEDIA_SOURCE, MediaSource)); +#line 8434 "BatchImport.c" } } #line 937 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp217_ = _data_->photo; + _data_->_tmp213_ = _data_->photo; #line 937 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp217_ != NULL) { + if (_data_->_tmp213_ != NULL) { +#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" + _data_->_tmp214_ = _data_->prepared_file; +#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" + _data_->_tmp215_ = _data_->_tmp214_->job; +#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" + _data_->_tmp216_ = _data_->prepared_file; +#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" + _data_->_tmp217_ = _data_->_tmp216_->file; #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp218_ = _data_->prepared_file; #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp219_ = _data_->_tmp218_->job; + _data_->_tmp219_ = _data_->_tmp218_->file; #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp220_ = _data_->prepared_file; + _data_->_tmp220_ = g_file_get_path (_data_->_tmp219_); #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp221_ = _data_->_tmp220_->file; + _data_->_tmp221_ = _data_->_tmp220_; #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp222_ = _data_->prepared_file; #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -7787,43 +8466,33 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp225_ = _data_->_tmp224_; #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp226_ = _data_->prepared_file; -#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp227_ = _data_->_tmp226_->file; -#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp228_ = g_file_get_path (_data_->_tmp227_); -#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp229_ = _data_->_tmp228_; -#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp230_ = batch_import_result_new (_data_->_tmp219_, _data_->_tmp221_, _data_->_tmp225_, _data_->_tmp229_, NULL, IMPORT_RESULT_SUCCESS); + _data_->_tmp226_ = batch_import_result_new (_data_->_tmp215_, _data_->_tmp217_, _data_->_tmp221_, _data_->_tmp225_, NULL, IMPORT_RESULT_SUCCESS); #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (_data_->import_result); #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->import_result = _data_->_tmp230_; -#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_data_->_tmp229_); + _data_->import_result = _data_->_tmp226_; #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_data_->_tmp225_); +#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala" + _g_free0 (_data_->_tmp221_); #line 942 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp231_ = _data_->self->priv->manifest; + _data_->_tmp227_ = _data_->self->priv->manifest; #line 942 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp232_ = _data_->_tmp231_->imported; + _data_->_tmp228_ = _data_->_tmp227_->imported; #line 942 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp233_ = _data_->photo; + _data_->_tmp229_ = _data_->photo; #line 942 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp232_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp233_, TYPE_MEDIA_SOURCE, MediaSource)); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp228_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp229_, TYPE_MEDIA_SOURCE, MediaSource)); #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp234_ = _data_->self->priv->manifest; + _data_->_tmp230_ = _data_->self->priv->manifest; #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp235_ = _data_->import_result; + _data_->_tmp231_ = _data_->import_result; #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" - import_manifest_add_result (_data_->_tmp234_, _data_->_tmp235_); + import_manifest_add_result (_data_->_tmp230_, _data_->_tmp231_); #line 945 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp236_ = _data_->photo; + _data_->_tmp232_ = _data_->photo; #line 945 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp237_ = media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp236_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 945 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_report_progress (_data_->self, _data_->_tmp237_); + batch_import_report_progress (_data_->self, media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp232_, TYPE_MEDIA_SOURCE, MediaSource))); #line 946 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_file_import_complete (_data_->self); #line 948 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -7836,117 +8505,117 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar _prepared_file_unref0 (_data_->prepared_file); #line 948 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 7836 "BatchImport.c" +#line 8505 "BatchImport.c" } #line 951 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp238_ = _data_->prepared_file; + _data_->_tmp233_ = _data_->prepared_file; #line 951 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp239_ = _data_->_tmp238_->file; + _data_->_tmp234_ = _data_->_tmp233_->file; #line 951 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp240_ = g_file_get_path (_data_->_tmp239_); + _data_->_tmp235_ = g_file_get_path (_data_->_tmp234_); #line 951 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp241_ = _data_->_tmp240_; + _data_->_tmp236_ = _data_->_tmp235_; #line 951 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_debug ("BatchImport.vala:951: duplicate photo detected, not importing %s", _data_->_tmp241_); + g_debug ("BatchImport.vala:951: duplicate photo detected, not importing %s", _data_->_tmp236_); #line 951 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_data_->_tmp241_); + _g_free0 (_data_->_tmp236_); #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp242_ = photo_table_get_instance (); + _data_->_tmp237_ = photo_table_get_instance (); #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp243_ = _data_->_tmp242_; + _data_->_tmp238_ = _data_->_tmp237_; #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp244_ = _data_->prepared_file; + _data_->_tmp239_ = _data_->prepared_file; #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp245_ = _data_->_tmp244_->file; + _data_->_tmp240_ = _data_->_tmp239_->file; #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp246_ = _data_->prepared_file; + _data_->_tmp241_ = _data_->prepared_file; #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp247_ = _data_->_tmp246_->full_md5; + _data_->_tmp242_ = _data_->_tmp241_->full_md5; #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp248_ = _data_->prepared_file; + _data_->_tmp243_ = _data_->prepared_file; #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp249_ = _data_->_tmp248_->file_format; + _data_->_tmp244_ = _data_->_tmp243_->file_format; #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp251_ = photo_table_get_duplicate_ids (_data_->_tmp243_, _data_->_tmp245_, NULL, _data_->_tmp247_, _data_->_tmp249_, &_data_->_tmp250_); + _data_->_tmp246_ = photo_table_get_duplicate_ids (_data_->_tmp238_, _data_->_tmp240_, NULL, _data_->_tmp242_, _data_->_tmp244_, &_data_->_tmp245_); #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp252_ = _data_->_tmp251_; + _data_->_tmp247_ = _data_->_tmp246_; #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp252__length1 = _data_->_tmp250_; + _data_->_tmp247__length1 = _data_->_tmp245_; #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala" - _database_table_unref0 (_data_->_tmp243_); + _database_table_unref0 (_data_->_tmp238_); #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->photo_ids = _data_->_tmp252_; + _data_->photo_ids = _data_->_tmp247_; #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->photo_ids_length1 = _data_->_tmp252__length1; + _data_->photo_ids_length1 = _data_->_tmp247__length1; #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_photo_ids_size_ = _data_->photo_ids_length1; #line 956 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp253_ = _data_->photo_ids; + _data_->_tmp248_ = _data_->photo_ids; #line 956 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp253__length1 = _data_->photo_ids_length1; + _data_->_tmp248__length1 = _data_->photo_ids_length1; #line 956 "/home/jens/Source/shotwell/src/BatchImport.vala" - _vala_assert (_data_->_tmp253__length1 > 0, "photo_ids.length > 0"); + _vala_assert (_data_->_tmp248__length1 > 0, "photo_ids.length > 0"); #line 958 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp254_ = _data_->photo_ids; + _data_->_tmp249_ = _data_->photo_ids; #line 958 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp254__length1 = _data_->photo_ids_length1; + _data_->_tmp249__length1 = _data_->photo_ids_length1; #line 958 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp255_ = _data_->_tmp254_[0]; + _data_->_tmp250_ = _data_->_tmp249_[0]; #line 958 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp256_ = duplicated_file_create_from_photo_id (&_data_->_tmp255_); + _data_->_tmp251_ = duplicated_file_create_from_photo_id (&_data_->_tmp250_); #line 958 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_vala1_duplicated_file = _data_->_tmp256_; + _data_->_vala1_duplicated_file = _data_->_tmp251_; #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp257_ = _data_->prepared_file; + _data_->_tmp252_ = _data_->prepared_file; #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp258_ = _data_->_tmp257_->job; + _data_->_tmp253_ = _data_->_tmp252_->job; #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp259_ = _data_->prepared_file; + _data_->_tmp254_ = _data_->prepared_file; #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp260_ = _data_->_tmp259_->file; + _data_->_tmp255_ = _data_->_tmp254_->file; #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp261_ = _data_->prepared_file; + _data_->_tmp256_ = _data_->prepared_file; #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp262_ = _data_->_tmp261_->file; + _data_->_tmp257_ = _data_->_tmp256_->file; #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp263_ = g_file_get_path (_data_->_tmp262_); + _data_->_tmp258_ = g_file_get_path (_data_->_tmp257_); #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp264_ = _data_->_tmp263_; + _data_->_tmp259_ = _data_->_tmp258_; #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp265_ = _data_->prepared_file; + _data_->_tmp260_ = _data_->prepared_file; #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp266_ = _data_->_tmp265_->file; + _data_->_tmp261_ = _data_->_tmp260_->file; #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp267_ = g_file_get_path (_data_->_tmp266_); + _data_->_tmp262_ = g_file_get_path (_data_->_tmp261_); #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp268_ = _data_->_tmp267_; + _data_->_tmp263_ = _data_->_tmp262_; #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp269_ = _data_->_vala1_duplicated_file; + _data_->_tmp264_ = _data_->_vala1_duplicated_file; #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp270_ = batch_import_result_new (_data_->_tmp258_, _data_->_tmp260_, _data_->_tmp264_, _data_->_tmp268_, _data_->_tmp269_, IMPORT_RESULT_PHOTO_EXISTS); + _data_->_tmp265_ = batch_import_result_new (_data_->_tmp253_, _data_->_tmp255_, _data_->_tmp259_, _data_->_tmp263_, _data_->_tmp264_, IMPORT_RESULT_PHOTO_EXISTS); #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (_data_->import_result); #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->import_result = _data_->_tmp270_; + _data_->import_result = _data_->_tmp265_; #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_data_->_tmp268_); + _g_free0 (_data_->_tmp263_); #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_data_->_tmp264_); + _g_free0 (_data_->_tmp259_); #line 901 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->_vala1_duplicated_file); #line 901 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->photo_ids = (g_free (_data_->photo_ids), NULL); -#line 7936 "BatchImport.c" +#line 8605 "BatchImport.c" } } #line 965 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp271_ = _data_->import_result; + _data_->_tmp266_ = _data_->import_result; #line 965 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_tmp271_ != NULL) { + if (_data_->_tmp266_ != NULL) { #line 966 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp272_ = _data_->import_result; + _data_->_tmp267_ = _data_->import_result; #line 966 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_report_failure (_data_->self, _data_->_tmp272_); + batch_import_report_failure (_data_->self, _data_->_tmp267_); #line 967 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_file_import_complete (_data_->self); #line 969 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -7959,16 +8628,16 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar _prepared_file_unref0 (_data_->prepared_file); #line 969 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 7959 "BatchImport.c" +#line 8628 "BatchImport.c" } #line 972 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_report_progress (_data_->self, (guint64) 0); #line 973 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp273_ = _data_->self->priv->ready_files; + _data_->_tmp268_ = _data_->self->priv->ready_files; #line 973 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp274_ = _data_->prepared_file; + _data_->_tmp269_ = _data_->prepared_file; #line 973 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp273_, GEE_TYPE_COLLECTION, GeeCollection), _data_->_tmp274_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp268_, GEE_TYPE_COLLECTION, GeeCollection), _data_->_tmp269_); #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->video); #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -7977,11 +8646,11 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar _batch_import_result_unref0 (_data_->import_result); #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_data_->prepared_file); -#line 7977 "BatchImport.c" +#line 8646 "BatchImport.c" } #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->_prepared_file_list); -#line 7981 "BatchImport.c" +#line 8650 "BatchImport.c" } #line 976 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_flush_import_jobs (_data_->self); @@ -7993,30 +8662,32 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar while (_data_->_task_complete_ != TRUE) { #line 774 "/home/jens/Source/shotwell/src/BatchImport.vala" g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); -#line 7993 "BatchImport.c" +#line 8662 "BatchImport.c" } } #line 774 "/home/jens/Source/shotwell/src/BatchImport.vala" g_object_unref (_data_->_async_result); #line 774 "/home/jens/Source/shotwell/src/BatchImport.vala" return FALSE; -#line 8000 "BatchImport.c" +#line 8669 "BatchImport.c" } -static void batch_import_done_preparing_files (BatchImport* self, BackgroundJob* j, const gchar* caller) { +static void +batch_import_done_preparing_files (BatchImport* self, + BackgroundJob* j, + const gchar* caller) +{ gboolean _tmp0_; PrepareFilesJob* prepare_files_job = NULL; - BackgroundJob* _tmp1_; + PrepareFilesJob* _tmp1_; PrepareFilesJob* _tmp2_; PrepareFilesJob* _tmp3_; - PrepareFilesJob* _tmp4_; + gint _tmp4_; gint _tmp5_; gint _tmp6_; - gint _tmp7_; - const gchar* _tmp8_; - gboolean _tmp9_ = FALSE; - gint _tmp10_; + gboolean _tmp7_ = FALSE; + gint _tmp8_; #line 979 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 979 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -8028,128 +8699,126 @@ static void batch_import_done_preparing_files (BatchImport* self, BackgroundJob* #line 980 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_assert (!_tmp0_, "!completed"); #line 982 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = j; + _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, TYPE_PREPARE_FILES_JOB, PrepareFilesJob)); #line 982 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PREPARE_FILES_JOB, PrepareFilesJob)); -#line 982 "/home/jens/Source/shotwell/src/BatchImport.vala" - prepare_files_job = _tmp2_; + prepare_files_job = _tmp1_; #line 984 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = prepare_files_job; + _tmp2_ = prepare_files_job; #line 984 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_report_failures (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob)); + batch_import_report_failures (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob)); #line 987 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = prepare_files_job; + _tmp3_ = prepare_files_job; #line 987 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = _tmp4_->prepared_files; + _tmp4_ = _tmp3_->prepared_files; #line 987 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->file_imports_to_perform = _tmp5_; + self->priv->file_imports_to_perform = _tmp4_; #line 988 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = self->priv->file_imports_to_perform; + _tmp5_ = self->priv->file_imports_to_perform; #line 988 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = self->priv->file_imports_completed; + _tmp6_ = self->priv->file_imports_completed; #line 988 "/home/jens/Source/shotwell/src/BatchImport.vala" - _vala_assert (_tmp6_ >= _tmp7_, "file_imports_to_perform >= file_imports_completed"); + _vala_assert (_tmp5_ >= _tmp6_, "file_imports_to_perform >= file_imports_completed"); #line 990 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = caller; -#line 990 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_log_status (self, _tmp8_); + batch_import_log_status (self, caller); #line 993 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_flush_import_jobs (self); #line 997 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = self->priv->file_imports_to_perform; + _tmp8_ = self->priv->file_imports_to_perform; #line 997 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp10_ == 0) { -#line 8059 "BatchImport.c" - gboolean _tmp11_; + if (_tmp8_ == 0) { +#line 8726 "BatchImport.c" + gboolean _tmp9_; #line 997 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = self->priv->completed; + _tmp9_ = self->priv->completed; #line 997 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = !_tmp11_; -#line 8065 "BatchImport.c" + _tmp7_ = !_tmp9_; +#line 8732 "BatchImport.c" } else { #line 997 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = FALSE; -#line 8069 "BatchImport.c" + _tmp7_ = FALSE; +#line 8736 "BatchImport.c" } #line 997 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp9_) { + if (_tmp7_) { #line 998 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_report_completed (self, "no files prepared for import"); -#line 8075 "BatchImport.c" +#line 8742 "BatchImport.c" } else { - gboolean _tmp12_ = FALSE; - gint _tmp13_; - gint _tmp14_; + gboolean _tmp10_ = FALSE; + gint _tmp11_; + gint _tmp12_; #line 999 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = self->priv->file_imports_completed; + _tmp11_ = self->priv->file_imports_completed; #line 999 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = self->priv->file_imports_to_perform; + _tmp12_ = self->priv->file_imports_to_perform; #line 999 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp13_ == _tmp14_) { -#line 8086 "BatchImport.c" - gboolean _tmp15_; + if (_tmp11_ == _tmp12_) { +#line 8753 "BatchImport.c" + gboolean _tmp13_; #line 999 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = self->priv->completed; + _tmp13_ = self->priv->completed; #line 999 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = !_tmp15_; -#line 8092 "BatchImport.c" + _tmp10_ = !_tmp13_; +#line 8759 "BatchImport.c" } else { #line 999 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = FALSE; -#line 8096 "BatchImport.c" + _tmp10_ = FALSE; +#line 8763 "BatchImport.c" } #line 999 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp12_) { + if (_tmp10_) { #line 1000 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_report_completed (self, "completed preparing files, all outstanding imports completed"); -#line 8102 "BatchImport.c" +#line 8769 "BatchImport.c" } } #line 979 "/home/jens/Source/shotwell/src/BatchImport.vala" _background_job_unref0 (prepare_files_job); -#line 8107 "BatchImport.c" +#line 8774 "BatchImport.c" } -static void batch_import_on_files_prepared (BatchImport* self, BackgroundJob* j) { - BackgroundJob* _tmp0_; +static void +batch_import_on_files_prepared (BatchImport* self, + BackgroundJob* j) +{ #line 1003 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 1003 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BACKGROUND_JOB (j)); #line 1004 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = j; -#line 1004 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_done_preparing_files (self, _tmp0_, "on_files_prepared"); -#line 8121 "BatchImport.c" + batch_import_done_preparing_files (self, j, "on_files_prepared"); +#line 8788 "BatchImport.c" } -static void batch_import_on_file_prepare_cancelled (BatchImport* self, BackgroundJob* j) { - BackgroundJob* _tmp0_; +static void +batch_import_on_file_prepare_cancelled (BatchImport* self, + BackgroundJob* j) +{ #line 1007 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 1007 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BACKGROUND_JOB (j)); #line 1008 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = j; -#line 1008 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_done_preparing_files (self, _tmp0_, "on_file_prepare_cancelled"); -#line 8135 "BatchImport.c" + batch_import_done_preparing_files (self, j, "on_file_prepare_cancelled"); +#line 8802 "BatchImport.c" } -static void batch_import_on_import_files_completed (BatchImport* self, BackgroundJob* j) { +static void +batch_import_on_import_files_completed (BatchImport* self, + BackgroundJob* j) +{ gboolean _tmp0_; PreparedFileImportJob* job = NULL; - BackgroundJob* _tmp1_; + PreparedFileImportJob* _tmp1_; PreparedFileImportJob* _tmp2_; - PreparedFileImportJob* _tmp3_; - PreparedFile* _tmp4_; - PreparedFileImportJob* _tmp5_; - BatchImportResult* _tmp6_; - PreparedFileImportJob* _tmp12_; - ReadyForImport* _tmp13_; + PreparedFile* _tmp3_; + PreparedFileImportJob* _tmp4_; + BatchImportResult* _tmp5_; + PreparedFileImportJob* _tmp11_; + ReadyForImport* _tmp12_; GError * _inner_error_ = NULL; #line 1015 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); @@ -8160,280 +8829,277 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun #line 1016 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_assert (!_tmp0_, "!completed"); #line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = j; + _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJob)); #line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJob)); -#line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala" - job = _tmp2_; + job = _tmp1_; #line 1020 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_log_status (self, "on_import_files_completed"); #line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = job; + _tmp2_ = job; #line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = _tmp3_->not_ready; + _tmp3_ = _tmp2_->not_ready; #line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala" - _vala_assert (_tmp4_ == NULL, "job.not_ready == null"); + _vala_assert (_tmp3_ == NULL, "job.not_ready == null"); #line 1026 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = job; + _tmp4_ = job; #line 1026 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = _tmp5_->failed; + _tmp5_ = _tmp4_->failed; #line 1026 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp6_ != NULL) { -#line 8179 "BatchImport.c" - PreparedFileImportJob* _tmp7_; - BatchImportResult* _tmp8_; - ImportResult _tmp9_; - PreparedFileImportJob* _tmp10_; - BatchImportResult* _tmp11_; + if (_tmp5_ != NULL) { +#line 8846 "BatchImport.c" + PreparedFileImportJob* _tmp6_; + BatchImportResult* _tmp7_; + ImportResult _tmp8_; + PreparedFileImportJob* _tmp9_; + BatchImportResult* _tmp10_; #line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = job; + _tmp6_ = job; #line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = _tmp7_->failed; + _tmp7_ = _tmp6_->failed; #line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = _tmp8_->result; + _tmp8_ = _tmp7_->result; #line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala" - _vala_assert (_tmp9_ != IMPORT_RESULT_SUCCESS, "job.failed.result != ImportResult.SUCCESS"); + _vala_assert (_tmp8_ != IMPORT_RESULT_SUCCESS, "job.failed.result != ImportResult.SUCCESS"); #line 1029 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = job; + _tmp9_ = job; #line 1029 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = _tmp10_->failed; + _tmp10_ = _tmp9_->failed; #line 1029 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_report_failure (self, _tmp11_); + batch_import_report_failure (self, _tmp10_); #line 1030 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_file_import_complete (self); -#line 8201 "BatchImport.c" +#line 8868 "BatchImport.c" } #line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = job; + _tmp11_ = job; #line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = _tmp12_->ready; + _tmp12_ = _tmp11_->ready; #line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp13_ != NULL) { -#line 8209 "BatchImport.c" - PreparedFileImportJob* _tmp14_; - ReadyForImport* _tmp15_; - BatchImportResult* _tmp16_; - ImportResult _tmp17_; + if (_tmp12_ != NULL) { +#line 8876 "BatchImport.c" + PreparedFileImportJob* _tmp13_; + ReadyForImport* _tmp14_; + BatchImportResult* _tmp15_; + ImportResult _tmp16_; Tombstone* tombstone = NULL; - TombstoneSourceCollection* _tmp18_; - PreparedFileImportJob* _tmp19_; - ReadyForImport* _tmp20_; - GFile* _tmp21_; + TombstoneSourceCollection* _tmp17_; + PreparedFileImportJob* _tmp18_; + ReadyForImport* _tmp19_; + GFile* _tmp20_; + Tombstone* _tmp21_; Tombstone* _tmp22_; - Tombstone* _tmp23_; MediaSource* source = NULL; - PreparedFileImportJob* _tmp26_; - ReadyForImport* _tmp27_; - gboolean _tmp28_; - PreparedFileImportJob* _tmp87_; - ReadyForImport* _tmp88_; - BatchImportResult* _tmp89_; - ImportResult _tmp90_; + PreparedFileImportJob* _tmp25_; + ReadyForImport* _tmp26_; + gboolean _tmp27_; + PreparedFileImportJob* _tmp83_; + ReadyForImport* _tmp84_; + BatchImportResult* _tmp85_; + ImportResult _tmp86_; #line 1036 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = job; + _tmp13_ = job; #line 1036 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = _tmp14_->ready; + _tmp14_ = _tmp13_->ready; #line 1036 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = _tmp15_->batch_result; + _tmp15_ = _tmp14_->batch_result; #line 1036 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = _tmp16_->result; + _tmp16_ = _tmp15_->result; #line 1036 "/home/jens/Source/shotwell/src/BatchImport.vala" - _vala_assert (_tmp17_ == IMPORT_RESULT_SUCCESS, "job.ready.batch_result.result == ImportResult.SUCCESS"); + _vala_assert (_tmp16_ == IMPORT_RESULT_SUCCESS, "job.ready.batch_result.result == ImportResult.SUCCESS"); #line 1038 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = tombstone_global; + _tmp17_ = tombstone_global; #line 1038 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = job; + _tmp18_ = job; #line 1038 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp20_ = _tmp19_->ready; + _tmp19_ = _tmp18_->ready; #line 1038 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp21_ = _tmp20_->final_file; + _tmp20_ = _tmp19_->final_file; #line 1038 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp22_ = tombstone_source_collection_locate (_tmp18_, _tmp21_); + _tmp21_ = tombstone_source_collection_locate (_tmp17_, _tmp20_); #line 1038 "/home/jens/Source/shotwell/src/BatchImport.vala" - tombstone = _tmp22_; + tombstone = _tmp21_; #line 1039 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp23_ = tombstone; + _tmp22_ = tombstone; #line 1039 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp23_ != NULL) { -#line 8255 "BatchImport.c" - TombstoneSourceCollection* _tmp24_; - Tombstone* _tmp25_; + if (_tmp22_ != NULL) { +#line 8922 "BatchImport.c" + TombstoneSourceCollection* _tmp23_; + Tombstone* _tmp24_; #line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp24_ = tombstone_global; + _tmp23_ = tombstone_global; #line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp25_ = tombstone; + _tmp24_ = tombstone; #line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala" - tombstone_source_collection_resurrect (_tmp24_, _tmp25_); -#line 8264 "BatchImport.c" + tombstone_source_collection_resurrect (_tmp23_, _tmp24_); +#line 8931 "BatchImport.c" } #line 1043 "/home/jens/Source/shotwell/src/BatchImport.vala" source = NULL; #line 1044 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp26_ = job; + _tmp25_ = job; #line 1044 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp27_ = _tmp26_->ready; + _tmp26_ = _tmp25_->ready; #line 1044 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp28_ = _tmp27_->is_video; + _tmp27_ = _tmp26_->is_video; #line 1044 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp28_) { -#line 8276 "BatchImport.c" - PreparedFileImportJob* _tmp29_; - ReadyForImport* _tmp30_; - BatchImportResult* _tmp31_; - PreparedFileImportJob* _tmp32_; - ReadyForImport* _tmp33_; - VideoImportParams* _tmp34_; - Video* _tmp35_ = NULL; - ImportResult _tmp36_; + if (_tmp27_) { +#line 8943 "BatchImport.c" + PreparedFileImportJob* _tmp28_; + ReadyForImport* _tmp29_; + BatchImportResult* _tmp30_; + PreparedFileImportJob* _tmp31_; + ReadyForImport* _tmp32_; + VideoImportParams* _tmp33_; + Video* _tmp34_ = NULL; + ImportResult _tmp35_; #line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp29_ = job; + _tmp28_ = job; #line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp30_ = _tmp29_->ready; + _tmp29_ = _tmp28_->ready; #line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp31_ = _tmp30_->batch_result; + _tmp30_ = _tmp29_->batch_result; #line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp32_ = job; + _tmp31_ = job; #line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp33_ = _tmp32_->ready; + _tmp32_ = _tmp31_->ready; #line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp34_ = _tmp33_->video_import_params; + _tmp33_ = _tmp32_->video_import_params; #line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp36_ = video_import_create (_tmp34_, &_tmp35_); + _tmp35_ = video_import_create (_tmp33_, &_tmp34_); #line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (source); #line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala" - source = G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE, MediaSource); + source = G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_MEDIA_SOURCE, MediaSource); #line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp31_->result = _tmp36_; -#line 8305 "BatchImport.c" + _tmp30_->result = _tmp35_; +#line 8972 "BatchImport.c" } else { - PreparedFileImportJob* _tmp37_; - ReadyForImport* _tmp38_; - BatchImportResult* _tmp39_; - PreparedFileImportJob* _tmp40_; - ReadyForImport* _tmp41_; - PhotoImportParams* _tmp42_; - LibraryPhoto* _tmp43_ = NULL; - ImportResult _tmp44_; + PreparedFileImportJob* _tmp36_; + ReadyForImport* _tmp37_; + BatchImportResult* _tmp38_; + PreparedFileImportJob* _tmp39_; + ReadyForImport* _tmp40_; + PhotoImportParams* _tmp41_; + LibraryPhoto* _tmp42_ = NULL; + ImportResult _tmp43_; Photo* photo = NULL; - MediaSource* _tmp45_; - Photo* _tmp46_; - PreparedFileImportJob* _tmp47_; - ReadyForImport* _tmp48_; - PhotoImportParams* _tmp49_; - GFile* _tmp50_; - Photo* _tmp72_; - PhotoFileFormat _tmp73_; + MediaSource* _tmp44_; + Photo* _tmp45_; + PreparedFileImportJob* _tmp46_; + ReadyForImport* _tmp47_; + PhotoImportParams* _tmp48_; + GFile* _tmp49_; + Photo* _tmp71_; #line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp37_ = job; + _tmp36_ = job; #line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp38_ = _tmp37_->ready; + _tmp37_ = _tmp36_->ready; #line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp39_ = _tmp38_->batch_result; + _tmp38_ = _tmp37_->batch_result; #line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp40_ = job; + _tmp39_ = job; #line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp41_ = _tmp40_->ready; + _tmp40_ = _tmp39_->ready; #line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp42_ = _tmp41_->photo_import_params; + _tmp41_ = _tmp40_->photo_import_params; #line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp44_ = library_photo_import_create (_tmp42_, &_tmp43_); + _tmp43_ = library_photo_import_create (_tmp41_, &_tmp42_); #line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (source); #line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala" - source = G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_MEDIA_SOURCE, MediaSource); + source = G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_MEDIA_SOURCE, MediaSource); #line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp39_->result = _tmp44_; + _tmp38_->result = _tmp43_; #line 1050 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp45_ = source; + _tmp44_ = source; #line 1050 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp46_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp45_, TYPE_PHOTO) ? ((Photo*) _tmp45_) : NULL); + _tmp45_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp44_, TYPE_PHOTO) ? ((Photo*) _tmp44_) : NULL); #line 1050 "/home/jens/Source/shotwell/src/BatchImport.vala" - photo = _tmp46_; + photo = _tmp45_; #line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp47_ = job; + _tmp46_ = job; #line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp48_ = _tmp47_->ready; + _tmp47_ = _tmp46_->ready; #line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp49_ = _tmp48_->photo_import_params; + _tmp48_ = _tmp47_->photo_import_params; #line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp50_ = _tmp49_->final_associated_file; + _tmp49_ = _tmp48_->final_associated_file; #line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp50_ != NULL) { -#line 8360 "BatchImport.c" + if (_tmp49_ != NULL) { +#line 9026 "BatchImport.c" BackingPhotoRow* bpr = NULL; + BackingPhotoRow* _tmp50_; BackingPhotoRow* _tmp51_; BackingPhotoRow* _tmp52_; - BackingPhotoRow* _tmp53_; - PreparedFileImportJob* _tmp54_; - ReadyForImport* _tmp55_; - PhotoImportParams* _tmp56_; - GFile* _tmp57_; - gchar* _tmp58_; - MediaSource* _tmp59_; + PreparedFileImportJob* _tmp53_; + ReadyForImport* _tmp54_; + PhotoImportParams* _tmp55_; + GFile* _tmp56_; + gchar* _tmp57_; + MediaSource* _tmp58_; + GFile* _tmp59_; GFile* _tmp60_; - GFile* _tmp61_; + gchar* _tmp61_; gchar* _tmp62_; - gchar* _tmp63_; - BackingPhotoRow* _tmp64_; - const gchar* _tmp65_; + BackingPhotoRow* _tmp63_; + const gchar* _tmp64_; #line 1054 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp51_ = backing_photo_row_new (); + _tmp50_ = backing_photo_row_new (); #line 1054 "/home/jens/Source/shotwell/src/BatchImport.vala" - bpr = _tmp51_; + bpr = _tmp50_; #line 1055 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp52_ = bpr; + _tmp51_ = bpr; #line 1055 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp52_->file_format = PHOTO_FILE_FORMAT_JFIF; + _tmp51_->file_format = PHOTO_FILE_FORMAT_JFIF; #line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp53_ = bpr; + _tmp52_ = bpr; #line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp54_ = job; + _tmp53_ = job; #line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp55_ = _tmp54_->ready; + _tmp54_ = _tmp53_->ready; #line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp56_ = _tmp55_->photo_import_params; + _tmp55_ = _tmp54_->photo_import_params; #line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp57_ = _tmp56_->final_associated_file; + _tmp56_ = _tmp55_->final_associated_file; #line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp58_ = g_file_get_path (_tmp57_); + _tmp57_ = g_file_get_path (_tmp56_); #line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp53_->filepath); + _g_free0 (_tmp52_->filepath); #line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp53_->filepath = _tmp58_; + _tmp52_->filepath = _tmp57_; #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp59_ = source; + _tmp58_ = source; #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp60_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, TYPE_PHOTO, Photo), TYPE_MEDIA_SOURCE, MediaSource)); + _tmp59_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_PHOTO, Photo), TYPE_MEDIA_SOURCE, MediaSource)); #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp61_ = _tmp60_; + _tmp60_ = _tmp59_; #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp62_ = g_file_get_path (_tmp61_); + _tmp61_ = g_file_get_path (_tmp60_); #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp63_ = _tmp62_; + _tmp62_ = _tmp61_; #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp64_ = bpr; + _tmp63_ = bpr; #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp65_ = _tmp64_->filepath; + _tmp64_ = _tmp63_->filepath; #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_debug ("BatchImport.vala:1057: Associating %s with sibling %s", _tmp63_, _tmp65_); + g_debug ("BatchImport.vala:1057: Associating %s with sibling %s", _tmp62_, _tmp64_); #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp63_); + _g_free0 (_tmp62_); #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp61_); -#line 8421 "BatchImport.c" + _g_object_unref0 (_tmp60_); +#line 9087 "BatchImport.c" { - MediaSource* _tmp66_; - BackingPhotoRow* _tmp67_; + MediaSource* _tmp65_; + BackingPhotoRow* _tmp66_; #line 1060 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp66_ = source; + _tmp65_ = source; #line 1060 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp67_ = bpr; + _tmp66_ = bpr; #line 1060 "/home/jens/Source/shotwell/src/BatchImport.vala" - photo_add_backing_photo_for_development (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_PHOTO, Photo), RAW_DEVELOPER_CAMERA, _tmp67_, TRUE, &_inner_error_); + photo_add_backing_photo_for_development (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_PHOTO, Photo), RAW_DEVELOPER_CAMERA, _tmp66_, TRUE, &_inner_error_); #line 1060 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8433 "BatchImport.c" +#line 9099 "BatchImport.c" goto __catch424_g_error; } } @@ -8441,28 +9107,28 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun __catch424_g_error: { GError* e = NULL; - BackingPhotoRow* _tmp68_; - const gchar* _tmp69_; - GError* _tmp70_; - const gchar* _tmp71_; + BackingPhotoRow* _tmp67_; + const gchar* _tmp68_; + GError* _tmp69_; + const gchar* _tmp70_; #line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala" e = _inner_error_; #line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; #line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp68_ = bpr; + _tmp67_ = bpr; #line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp69_ = _tmp68_->filepath; + _tmp68_ = _tmp67_->filepath; #line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp70_ = e; + _tmp69_ = e; #line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp71_ = _tmp70_->message; + _tmp70_ = _tmp69_->message; #line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala" g_warning ("BatchImport.vala:1062: Unable to associate JPEG with RAW. File: %s Err" \ -"or: %s", _tmp69_, _tmp71_); +"or: %s", _tmp68_, _tmp70_); #line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (e); -#line 8461 "BatchImport.c" +#line 9127 "BatchImport.c" } __finally424: #line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -8483,214 +9149,208 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun g_clear_error (&_inner_error_); #line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 8482 "BatchImport.c" +#line 9148 "BatchImport.c" } #line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala" _backing_photo_row_unref0 (bpr); -#line 8486 "BatchImport.c" +#line 9152 "BatchImport.c" } #line 1068 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp72_ = photo; -#line 1068 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp73_ = photo_get_master_file_format (_tmp72_); + _tmp71_ = photo; #line 1068 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp73_ == PHOTO_FILE_FORMAT_RAW) { -#line 8494 "BatchImport.c" + if (photo_get_master_file_format (_tmp71_) == PHOTO_FILE_FORMAT_RAW) { +#line 9158 "BatchImport.c" RawDeveloper d = 0; - ConfigFacade* _tmp74_; - ConfigFacade* _tmp75_; + ConfigFacade* _tmp72_; + ConfigFacade* _tmp73_; + RawDeveloper _tmp74_; + gboolean _tmp75_ = FALSE; RawDeveloper _tmp76_; - RawDeveloper _tmp77_; - gboolean _tmp78_ = FALSE; - RawDeveloper _tmp79_; - Photo* _tmp83_; - RawDeveloper _tmp84_; - Photo* _tmp85_; - RawDeveloper _tmp86_; + Photo* _tmp79_; + RawDeveloper _tmp80_; + Photo* _tmp81_; + RawDeveloper _tmp82_; #line 1069 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp74_ = config_facade_get_instance (); + _tmp72_ = config_facade_get_instance (); #line 1069 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp75_ = _tmp74_; + _tmp73_ = _tmp72_; #line 1069 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp76_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp74_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 1069 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp77_ = _tmp76_; + _g_object_unref0 (_tmp73_); #line 1069 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp75_); -#line 1069 "/home/jens/Source/shotwell/src/BatchImport.vala" - d = _tmp77_; -#line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp79_ = d; + d = _tmp74_; #line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp79_ == RAW_DEVELOPER_CAMERA) { -#line 8522 "BatchImport.c" - Photo* _tmp80_; - RawDeveloper _tmp81_; - gboolean _tmp82_; + _tmp76_ = d; #line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp80_ = photo; + if (_tmp76_ == RAW_DEVELOPER_CAMERA) { +#line 9183 "BatchImport.c" + Photo* _tmp77_; + RawDeveloper _tmp78_; #line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp81_ = d; + _tmp77_ = photo; #line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp82_ = photo_is_raw_developer_available (_tmp80_, _tmp81_); + _tmp78_ = d; #line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp78_ = !_tmp82_; -#line 8534 "BatchImport.c" + _tmp75_ = !photo_is_raw_developer_available (_tmp77_, _tmp78_); +#line 9192 "BatchImport.c" } else { #line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp78_ = FALSE; -#line 8538 "BatchImport.c" + _tmp75_ = FALSE; +#line 9196 "BatchImport.c" } #line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp78_) { + if (_tmp75_) { #line 1071 "/home/jens/Source/shotwell/src/BatchImport.vala" d = RAW_DEVELOPER_EMBEDDED; -#line 8544 "BatchImport.c" +#line 9202 "BatchImport.c" } #line 1073 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp83_ = photo; + _tmp79_ = photo; #line 1073 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp84_ = d; + _tmp80_ = d; #line 1073 "/home/jens/Source/shotwell/src/BatchImport.vala" - photo_set_default_raw_developer (_tmp83_, _tmp84_); + photo_set_default_raw_developer (_tmp79_, _tmp80_); #line 1074 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp85_ = photo; + _tmp81_ = photo; #line 1074 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp86_ = d; + _tmp82_ = d; #line 1074 "/home/jens/Source/shotwell/src/BatchImport.vala" - photo_set_raw_developer (_tmp85_, _tmp86_, FALSE); -#line 8558 "BatchImport.c" + photo_set_raw_developer (_tmp81_, _tmp82_, FALSE); +#line 9216 "BatchImport.c" } #line 1044 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (photo); -#line 8562 "BatchImport.c" +#line 9220 "BatchImport.c" } #line 1078 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp87_ = job; + _tmp83_ = job; #line 1078 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp88_ = _tmp87_->ready; + _tmp84_ = _tmp83_->ready; #line 1078 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp89_ = _tmp88_->batch_result; + _tmp85_ = _tmp84_->batch_result; #line 1078 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp90_ = _tmp89_->result; + _tmp86_ = _tmp85_->result; #line 1078 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp90_ != IMPORT_RESULT_SUCCESS) { -#line 8574 "BatchImport.c" - PreparedFileImportJob* _tmp91_; - ReadyForImport* _tmp92_; - BatchImportResult* _tmp93_; - ImportResult _tmp94_; - gchar* _tmp95_; - gchar* _tmp96_; - PreparedFileImportJob* _tmp97_; - ReadyForImport* _tmp98_; - BatchImportResult* _tmp99_; + if (_tmp86_ != IMPORT_RESULT_SUCCESS) { +#line 9232 "BatchImport.c" + PreparedFileImportJob* _tmp87_; + ReadyForImport* _tmp88_; + BatchImportResult* _tmp89_; + ImportResult _tmp90_; + gchar* _tmp91_; + gchar* _tmp92_; + PreparedFileImportJob* _tmp93_; + ReadyForImport* _tmp94_; + BatchImportResult* _tmp95_; #line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp91_ = job; + _tmp87_ = job; #line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp92_ = _tmp91_->ready; + _tmp88_ = _tmp87_->ready; #line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp93_ = _tmp92_->batch_result; + _tmp89_ = _tmp88_->batch_result; #line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp94_ = _tmp93_->result; + _tmp90_ = _tmp89_->result; #line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp95_ = import_result_to_string (_tmp94_); + _tmp91_ = import_result_to_string (_tmp90_); #line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp96_ = _tmp95_; + _tmp92_ = _tmp91_; #line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_debug ("BatchImport.vala:1079: on_import_file_completed: %s", _tmp96_); + g_debug ("BatchImport.vala:1079: on_import_file_completed: %s", _tmp92_); #line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp96_); + _g_free0 (_tmp92_); #line 1081 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp97_ = job; + _tmp93_ = job; #line 1081 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp98_ = _tmp97_->ready; + _tmp94_ = _tmp93_->ready; #line 1081 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp99_ = _tmp98_->batch_result; + _tmp95_ = _tmp94_->batch_result; #line 1081 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_report_failure (self, _tmp99_); + batch_import_report_failure (self, _tmp95_); #line 1082 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_file_import_complete (self); -#line 8610 "BatchImport.c" +#line 9268 "BatchImport.c" } else { - GeeList* _tmp100_; - MediaSource* _tmp101_; + GeeList* _tmp96_; + MediaSource* _tmp97_; + PreparedFileImportJob* _tmp98_; + ReadyForImport* _tmp99_; + Thumbnails* _tmp100_; + Thumbnails* _tmp101_; PreparedFileImportJob* _tmp102_; ReadyForImport* _tmp103_; - Thumbnails* _tmp104_; - Thumbnails* _tmp105_; + PreparedFile* _tmp104_; + BatchImportJob* _tmp105_; PreparedFileImportJob* _tmp106_; ReadyForImport* _tmp107_; - PreparedFile* _tmp108_; - BatchImportJob* _tmp109_; - PreparedFileImportJob* _tmp110_; - ReadyForImport* _tmp111_; - BatchImportResult* _tmp112_; - CompletedImportObject* _tmp113_; - CompletedImportObject* _tmp114_; + BatchImportResult* _tmp108_; + CompletedImportObject* _tmp109_; + CompletedImportObject* _tmp110_; #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp100_ = self->priv->ready_thumbnails; + _tmp96_ = self->priv->ready_thumbnails; #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp101_ = source; + _tmp97_ = source; #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp102_ = job; + _tmp98_ = job; #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp103_ = _tmp102_->ready; + _tmp99_ = _tmp98_->ready; #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp104_ = ready_for_import_get_thumbnails (_tmp103_); + _tmp100_ = ready_for_import_get_thumbnails (_tmp99_); #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp105_ = _tmp104_; + _tmp101_ = _tmp100_; #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp106_ = job; + _tmp102_ = job; #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp107_ = _tmp106_->ready; + _tmp103_ = _tmp102_->ready; #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp108_ = _tmp107_->prepared_file; + _tmp104_ = _tmp103_->prepared_file; #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp109_ = _tmp108_->job; + _tmp105_ = _tmp104_->job; #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp110_ = job; + _tmp106_ = job; #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp111_ = _tmp110_->ready; + _tmp107_ = _tmp106_->ready; #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp112_ = _tmp111_->batch_result; + _tmp108_ = _tmp107_->batch_result; #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp113_ = completed_import_object_new (_tmp101_, _tmp105_, _tmp109_, _tmp112_); + _tmp109_ = completed_import_object_new (_tmp97_, _tmp101_, _tmp105_, _tmp108_); #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp114_ = _tmp113_; + _tmp110_ = _tmp109_; #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_COLLECTION, GeeCollection), _tmp114_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, GEE_TYPE_COLLECTION, GeeCollection), _tmp110_); #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala" - _completed_import_object_unref0 (_tmp114_); + _completed_import_object_unref0 (_tmp110_); #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala" - _thumbnails_unref0 (_tmp105_); -#line 8663 "BatchImport.c" + _thumbnails_unref0 (_tmp101_); +#line 9321 "BatchImport.c" } #line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (source); #line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (tombstone); -#line 8669 "BatchImport.c" +#line 9327 "BatchImport.c" } #line 1089 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_flush_import_jobs (self); #line 1015 "/home/jens/Source/shotwell/src/BatchImport.vala" _background_job_unref0 (job); -#line 8675 "BatchImport.c" +#line 9333 "BatchImport.c" } -static void batch_import_on_import_files_cancelled (BatchImport* self, BackgroundJob* j) { +static void +batch_import_on_import_files_cancelled (BatchImport* self, + BackgroundJob* j) +{ gboolean _tmp0_; PreparedFileImportJob* job = NULL; - BackgroundJob* _tmp1_; + PreparedFileImportJob* _tmp1_; PreparedFileImportJob* _tmp2_; - PreparedFileImportJob* _tmp3_; - PreparedFile* _tmp4_; - PreparedFileImportJob* _tmp23_; - BatchImportResult* _tmp24_; - PreparedFileImportJob* _tmp27_; - ReadyForImport* _tmp28_; + PreparedFile* _tmp3_; + PreparedFileImportJob* _tmp22_; + BatchImportResult* _tmp23_; + PreparedFileImportJob* _tmp26_; + ReadyForImport* _tmp27_; #line 1092 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 1092 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -8700,159 +9360,161 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun #line 1093 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_assert (!_tmp0_, "!completed"); #line 1095 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = j; + _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJob)); #line 1095 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJob)); -#line 1095 "/home/jens/Source/shotwell/src/BatchImport.vala" - job = _tmp2_; + job = _tmp1_; #line 1097 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_log_status (self, "on_import_files_cancelled"); #line 1099 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = job; + _tmp2_ = job; #line 1099 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = _tmp3_->not_ready; + _tmp3_ = _tmp2_->not_ready; #line 1099 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp4_ != NULL) { -#line 8712 "BatchImport.c" - PreparedFileImportJob* _tmp5_; - PreparedFile* _tmp6_; - BatchImportJob* _tmp7_; - PreparedFileImportJob* _tmp8_; - PreparedFile* _tmp9_; - GFile* _tmp10_; - PreparedFileImportJob* _tmp11_; - PreparedFile* _tmp12_; - GFile* _tmp13_; + if (_tmp3_ != NULL) { +#line 9370 "BatchImport.c" + PreparedFileImportJob* _tmp4_; + PreparedFile* _tmp5_; + BatchImportJob* _tmp6_; + PreparedFileImportJob* _tmp7_; + PreparedFile* _tmp8_; + GFile* _tmp9_; + PreparedFileImportJob* _tmp10_; + PreparedFile* _tmp11_; + GFile* _tmp12_; + gchar* _tmp13_; gchar* _tmp14_; - gchar* _tmp15_; - PreparedFileImportJob* _tmp16_; - PreparedFile* _tmp17_; - GFile* _tmp18_; + PreparedFileImportJob* _tmp15_; + PreparedFile* _tmp16_; + GFile* _tmp17_; + gchar* _tmp18_; gchar* _tmp19_; - gchar* _tmp20_; + BatchImportResult* _tmp20_; BatchImportResult* _tmp21_; - BatchImportResult* _tmp22_; #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = job; + _tmp4_ = job; #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = _tmp5_->not_ready; + _tmp5_ = _tmp4_->not_ready; #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = _tmp6_->job; + _tmp6_ = _tmp5_->job; #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = job; + _tmp7_ = job; #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = _tmp8_->not_ready; + _tmp8_ = _tmp7_->not_ready; #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = _tmp9_->file; + _tmp9_ = _tmp8_->file; #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = job; + _tmp10_ = job; #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = _tmp11_->not_ready; + _tmp11_ = _tmp10_->not_ready; #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = _tmp12_->file; + _tmp12_ = _tmp11_->file; #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = g_file_get_path (_tmp13_); + _tmp13_ = g_file_get_path (_tmp12_); #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = job; + _tmp15_ = job; #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = _tmp16_->not_ready; + _tmp16_ = _tmp15_->not_ready; #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = _tmp17_->file; + _tmp17_ = _tmp16_->file; #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = g_file_get_path (_tmp18_); + _tmp18_ = g_file_get_path (_tmp17_); #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp21_ = batch_import_result_new (_tmp7_, _tmp10_, _tmp15_, _tmp20_, NULL, IMPORT_RESULT_USER_ABORT); + _tmp20_ = batch_import_result_new (_tmp6_, _tmp9_, _tmp14_, _tmp19_, NULL, IMPORT_RESULT_USER_ABORT); #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_report_failure (self, _tmp22_); + batch_import_report_failure (self, _tmp21_); #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _batch_import_result_unref0 (_tmp22_); + _batch_import_result_unref0 (_tmp21_); #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp19_); #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp14_); #line 1103 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_file_import_complete (self); -#line 8777 "BatchImport.c" +#line 9435 "BatchImport.c" } #line 1106 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp23_ = job; + _tmp22_ = job; #line 1106 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp24_ = _tmp23_->failed; + _tmp23_ = _tmp22_->failed; #line 1106 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp24_ != NULL) { -#line 8785 "BatchImport.c" - PreparedFileImportJob* _tmp25_; - BatchImportResult* _tmp26_; + if (_tmp23_ != NULL) { +#line 9443 "BatchImport.c" + PreparedFileImportJob* _tmp24_; + BatchImportResult* _tmp25_; #line 1107 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp25_ = job; + _tmp24_ = job; #line 1107 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp26_ = _tmp25_->failed; + _tmp25_ = _tmp24_->failed; #line 1107 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_report_failure (self, _tmp26_); + batch_import_report_failure (self, _tmp25_); #line 1108 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_file_import_complete (self); -#line 8796 "BatchImport.c" +#line 9454 "BatchImport.c" } #line 1111 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp27_ = job; + _tmp26_ = job; #line 1111 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp28_ = _tmp27_->ready; + _tmp27_ = _tmp26_->ready; #line 1111 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp28_ != NULL) { -#line 8804 "BatchImport.c" - PreparedFileImportJob* _tmp29_; - ReadyForImport* _tmp30_; + if (_tmp27_ != NULL) { +#line 9462 "BatchImport.c" + PreparedFileImportJob* _tmp28_; + ReadyForImport* _tmp29_; + BatchImportResult* _tmp30_; BatchImportResult* _tmp31_; - BatchImportResult* _tmp32_; #line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp29_ = job; + _tmp28_ = job; #line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp30_ = _tmp29_->ready; + _tmp29_ = _tmp28_->ready; #line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp31_ = ready_for_import_abort (_tmp30_); + _tmp30_ = ready_for_import_abort (_tmp29_); #line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp32_ = _tmp31_; + _tmp31_ = _tmp30_; #line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_report_failure (self, _tmp32_); + batch_import_report_failure (self, _tmp31_); #line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala" - _batch_import_result_unref0 (_tmp32_); + _batch_import_result_unref0 (_tmp31_); #line 1113 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_file_import_complete (self); -#line 8823 "BatchImport.c" +#line 9481 "BatchImport.c" } #line 1116 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_flush_import_jobs (self); #line 1092 "/home/jens/Source/shotwell/src/BatchImport.vala" _background_job_unref0 (job); -#line 8829 "BatchImport.c" +#line 9487 "BatchImport.c" } -static gpointer _completed_import_object_ref0 (gpointer self) { +static gpointer +_completed_import_object_ref0 (gpointer self) +{ #line 1130 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? completed_import_object_ref (self) : NULL; -#line 8836 "BatchImport.c" +#line 9496 "BatchImport.c" } -static void batch_import_on_thumbnail_writer_completed (BatchImport* self, BackgroundJob* j) { +static void +batch_import_on_thumbnail_writer_completed (BatchImport* self, + BackgroundJob* j) +{ gboolean _tmp0_; ThumbnailWriterJob* job = NULL; - BackgroundJob* _tmp1_; - ThumbnailWriterJob* _tmp2_; + ThumbnailWriterJob* _tmp1_; CompletedImportObject* completed = NULL; - ThumbnailWriterJob* _tmp3_; + ThumbnailWriterJob* _tmp2_; + CompletedImportObject* _tmp3_; CompletedImportObject* _tmp4_; CompletedImportObject* _tmp5_; - CompletedImportObject* _tmp6_; - BatchImportResult* _tmp7_; - ImportResult _tmp8_; + BatchImportResult* _tmp6_; + ImportResult _tmp7_; #line 1126 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 1126 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -8862,149 +9524,147 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg #line 1127 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_assert (!_tmp0_, "!completed"); #line 1129 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = j; + _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob)); #line 1129 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob)); -#line 1129 "/home/jens/Source/shotwell/src/BatchImport.vala" - job = _tmp2_; + job = _tmp1_; #line 1130 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = job; + _tmp2_ = job; #line 1130 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = _tmp3_->completed_import_source; + _tmp3_ = _tmp2_->completed_import_source; #line 1130 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = _completed_import_object_ref0 (_tmp4_); + _tmp4_ = _completed_import_object_ref0 (_tmp3_); #line 1130 "/home/jens/Source/shotwell/src/BatchImport.vala" - completed = _tmp5_; + completed = _tmp4_; #line 1132 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_log_status (self, "on_thumbnail_writer_completed"); #line 1134 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = completed; + _tmp5_ = completed; #line 1134 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = _tmp6_->batch_result; + _tmp6_ = _tmp5_->batch_result; #line 1134 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = _tmp7_->result; + _tmp7_ = _tmp6_->result; #line 1134 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp8_ != IMPORT_RESULT_SUCCESS) { -#line 8884 "BatchImport.c" - CompletedImportObject* _tmp9_; - MediaSource* _tmp10_; + if (_tmp7_ != IMPORT_RESULT_SUCCESS) { +#line 9544 "BatchImport.c" + CompletedImportObject* _tmp8_; + MediaSource* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; - CompletedImportObject* _tmp13_; - BatchImportResult* _tmp14_; - ImportResult _tmp15_; + CompletedImportObject* _tmp12_; + BatchImportResult* _tmp13_; + ImportResult _tmp14_; + gchar* _tmp15_; gchar* _tmp16_; - gchar* _tmp17_; - CompletedImportObject* _tmp18_; - MediaSource* _tmp19_; - CompletedImportObject* _tmp26_; - BatchImportResult* _tmp27_; + CompletedImportObject* _tmp17_; + MediaSource* _tmp18_; + CompletedImportObject* _tmp25_; + BatchImportResult* _tmp26_; #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = completed; + _tmp8_ = completed; #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = _tmp9_->source; + _tmp9_ = _tmp8_->source; #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); + _tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = completed; + _tmp12_ = completed; #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = _tmp13_->batch_result; + _tmp13_ = _tmp12_->batch_result; #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = _tmp14_->result; + _tmp14_ = _tmp13_->result; #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = import_result_to_string (_tmp15_); + _tmp15_ = import_result_to_string (_tmp14_); #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala" g_warning ("BatchImport.vala:1135: Failed to import %s: unable to write thumbnails" \ -" (%s)", _tmp12_, _tmp17_); +" (%s)", _tmp11_, _tmp16_); #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp16_); #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp11_); #line 1138 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = completed; + _tmp17_ = completed; #line 1138 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = _tmp18_->source; + _tmp18_ = _tmp17_->source; #line 1138 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_LIBRARY_PHOTO)) { -#line 8928 "BatchImport.c" - CompletedImportObject* _tmp20_; - MediaSource* _tmp21_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_LIBRARY_PHOTO)) { +#line 9588 "BatchImport.c" + CompletedImportObject* _tmp19_; + MediaSource* _tmp20_; #line 1139 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp20_ = completed; + _tmp19_ = completed; #line 1139 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp21_ = _tmp20_->source; + _tmp20_ = _tmp19_->source; #line 1139 "/home/jens/Source/shotwell/src/BatchImport.vala" - library_photo_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp21_) : NULL); -#line 8937 "BatchImport.c" + library_photo_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp20_) : NULL); +#line 9597 "BatchImport.c" } else { - CompletedImportObject* _tmp22_; - MediaSource* _tmp23_; + CompletedImportObject* _tmp21_; + MediaSource* _tmp22_; #line 1140 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp22_ = completed; + _tmp21_ = completed; #line 1140 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp23_ = _tmp22_->source; + _tmp22_ = _tmp21_->source; #line 1140 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, TYPE_VIDEO)) { -#line 8947 "BatchImport.c" - CompletedImportObject* _tmp24_; - MediaSource* _tmp25_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_VIDEO)) { +#line 9607 "BatchImport.c" + CompletedImportObject* _tmp23_; + MediaSource* _tmp24_; #line 1141 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp24_ = completed; + _tmp23_ = completed; #line 1141 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp25_ = _tmp24_->source; + _tmp24_ = _tmp23_->source; #line 1141 "/home/jens/Source/shotwell/src/BatchImport.vala" - video_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, TYPE_VIDEO) ? ((Video*) _tmp25_) : NULL); -#line 8956 "BatchImport.c" + video_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, TYPE_VIDEO) ? ((Video*) _tmp24_) : NULL); +#line 9616 "BatchImport.c" } } #line 1143 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp26_ = completed; + _tmp25_ = completed; #line 1143 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp27_ = _tmp26_->batch_result; + _tmp26_ = _tmp25_->batch_result; #line 1143 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_report_failure (self, _tmp27_); + batch_import_report_failure (self, _tmp26_); #line 1144 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_file_import_complete (self); -#line 8967 "BatchImport.c" +#line 9627 "BatchImport.c" } else { - ImportManifest* _tmp28_; - GeeList* _tmp29_; - CompletedImportObject* _tmp30_; - MediaSource* _tmp31_; - ImportManifest* _tmp32_; - CompletedImportObject* _tmp33_; - BatchImportResult* _tmp34_; - GeeList* _tmp35_; - CompletedImportObject* _tmp36_; + ImportManifest* _tmp27_; + GeeList* _tmp28_; + CompletedImportObject* _tmp29_; + MediaSource* _tmp30_; + ImportManifest* _tmp31_; + CompletedImportObject* _tmp32_; + BatchImportResult* _tmp33_; + GeeList* _tmp34_; + CompletedImportObject* _tmp35_; #line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp28_ = self->priv->manifest; + _tmp27_ = self->priv->manifest; #line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp29_ = _tmp28_->imported; + _tmp28_ = _tmp27_->imported; #line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp30_ = completed; + _tmp29_ = completed; #line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp31_ = _tmp30_->source; + _tmp30_ = _tmp29_->source; #line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), _tmp31_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection), _tmp30_); #line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp32_ = self->priv->manifest; + _tmp31_ = self->priv->manifest; #line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp33_ = completed; + _tmp32_ = completed; #line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp34_ = _tmp33_->batch_result; + _tmp33_ = _tmp32_->batch_result; #line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala" - import_manifest_add_result (_tmp32_, _tmp34_); + import_manifest_add_result (_tmp31_, _tmp33_); #line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp35_ = self->priv->display_imported_queue; + _tmp34_ = self->priv->display_imported_queue; #line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp36_ = completed; + _tmp35_ = completed; #line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), _tmp36_); -#line 9002 "BatchImport.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection), _tmp35_); +#line 9662 "BatchImport.c" } #line 1152 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_flush_import_jobs (self); @@ -9012,23 +9672,25 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg _completed_import_object_unref0 (completed); #line 1126 "/home/jens/Source/shotwell/src/BatchImport.vala" _background_job_unref0 (job); -#line 9010 "BatchImport.c" +#line 9670 "BatchImport.c" } -static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, BackgroundJob* j) { +static void +batch_import_on_thumbnail_writer_cancelled (BatchImport* self, + BackgroundJob* j) +{ gboolean _tmp0_; ThumbnailWriterJob* job = NULL; - BackgroundJob* _tmp1_; - ThumbnailWriterJob* _tmp2_; + ThumbnailWriterJob* _tmp1_; CompletedImportObject* completed = NULL; - ThumbnailWriterJob* _tmp3_; + ThumbnailWriterJob* _tmp2_; + CompletedImportObject* _tmp3_; CompletedImportObject* _tmp4_; CompletedImportObject* _tmp5_; - CompletedImportObject* _tmp6_; - MediaSource* _tmp7_; - CompletedImportObject* _tmp14_; - BatchImportResult* _tmp15_; + MediaSource* _tmp6_; + CompletedImportObject* _tmp13_; + BatchImportResult* _tmp14_; #line 1155 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 1155 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9038,64 +9700,62 @@ static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, Backg #line 1156 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_assert (!_tmp0_, "!completed"); #line 1158 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = j; + _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob)); #line 1158 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob)); -#line 1158 "/home/jens/Source/shotwell/src/BatchImport.vala" - job = _tmp2_; + job = _tmp1_; #line 1159 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = job; + _tmp2_ = job; #line 1159 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = _tmp3_->completed_import_source; + _tmp3_ = _tmp2_->completed_import_source; #line 1159 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = _completed_import_object_ref0 (_tmp4_); + _tmp4_ = _completed_import_object_ref0 (_tmp3_); #line 1159 "/home/jens/Source/shotwell/src/BatchImport.vala" - completed = _tmp5_; + completed = _tmp4_; #line 1161 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_log_status (self, "on_thumbnail_writer_cancelled"); #line 1163 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = completed; + _tmp5_ = completed; #line 1163 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = _tmp6_->source; + _tmp6_ = _tmp5_->source; #line 1163 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO)) { -#line 9057 "BatchImport.c" - CompletedImportObject* _tmp8_; - MediaSource* _tmp9_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_LIBRARY_PHOTO)) { +#line 9717 "BatchImport.c" + CompletedImportObject* _tmp7_; + MediaSource* _tmp8_; #line 1164 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = completed; + _tmp7_ = completed; #line 1164 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = _tmp8_->source; + _tmp8_ = _tmp7_->source; #line 1164 "/home/jens/Source/shotwell/src/BatchImport.vala" - library_photo_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp9_) : NULL); -#line 9066 "BatchImport.c" + library_photo_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp8_) : NULL); +#line 9726 "BatchImport.c" } else { - CompletedImportObject* _tmp10_; - MediaSource* _tmp11_; + CompletedImportObject* _tmp9_; + MediaSource* _tmp10_; #line 1165 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = completed; + _tmp9_ = completed; #line 1165 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = _tmp10_->source; + _tmp10_ = _tmp9_->source; #line 1165 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_VIDEO)) { -#line 9076 "BatchImport.c" - CompletedImportObject* _tmp12_; - MediaSource* _tmp13_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_VIDEO)) { +#line 9736 "BatchImport.c" + CompletedImportObject* _tmp11_; + MediaSource* _tmp12_; #line 1166 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = completed; + _tmp11_ = completed; #line 1166 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = _tmp12_->source; + _tmp12_ = _tmp11_->source; #line 1166 "/home/jens/Source/shotwell/src/BatchImport.vala" - video_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_VIDEO) ? ((Video*) _tmp13_) : NULL); -#line 9085 "BatchImport.c" + video_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_VIDEO) ? ((Video*) _tmp12_) : NULL); +#line 9745 "BatchImport.c" } } #line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = completed; + _tmp13_ = completed; #line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = _tmp14_->batch_result; + _tmp14_ = _tmp13_->batch_result; #line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_report_failure (self, _tmp15_); + batch_import_report_failure (self, _tmp14_); #line 1169 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_file_import_complete (self); #line 1171 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9104,11 +9764,13 @@ static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, Backg _completed_import_object_unref0 (completed); #line 1155 "/home/jens/Source/shotwell/src/BatchImport.vala" _background_job_unref0 (job); -#line 9102 "BatchImport.c" +#line 9762 "BatchImport.c" } -static void batch_import_flush_ready_sources (BatchImport* self) { +static void +batch_import_flush_ready_sources (BatchImport* self) +{ GeeList* _tmp0_; gint _tmp1_; gint _tmp2_; @@ -9133,14 +9795,14 @@ static void batch_import_flush_ready_sources (BatchImport* self) { GeeArrayList* _tmp46_; VideoSourceCollection* _tmp47_; GeeArrayList* _tmp48_; - GeeArrayList* _tmp70_; - BatchImportRoll* _tmp71_; - ViewCollection* _tmp72_; - TagSourceCollection* _tmp73_; - EventSourceCollection* _tmp74_; + GeeArrayList* _tmp69_; + BatchImportRoll* _tmp70_; + ViewCollection* _tmp71_; + TagSourceCollection* _tmp72_; + EventSourceCollection* _tmp73_; + MediaCollectionRegistry* _tmp74_; MediaCollectionRegistry* _tmp75_; - MediaCollectionRegistry* _tmp76_; - GeeList* _tmp77_; + GeeList* _tmp76_; GError * _inner_error_ = NULL; #line 1178 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); @@ -9154,7 +9816,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) { if (_tmp2_ == 0) { #line 1180 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 9152 "BatchImport.c" +#line 9814 "BatchImport.c" } #line 1185 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = self->priv->ready_sources; @@ -9186,7 +9848,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _tmp11_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 1190 "/home/jens/Source/shotwell/src/BatchImport.vala" completion_list = _tmp11_; -#line 9184 "BatchImport.c" +#line 9846 "BatchImport.c" { GeeList* _completed_list = NULL; GeeList* _tmp12_; @@ -9214,7 +9876,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _completed_index = -1; #line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 9212 "BatchImport.c" +#line 9874 "BatchImport.c" gint _tmp17_; gint _tmp18_; gint _tmp19_; @@ -9244,7 +9906,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) { if (!(_tmp18_ < _tmp19_)) { #line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 9242 "BatchImport.c" +#line 9904 "BatchImport.c" } #line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp20_ = _completed_list; @@ -9268,7 +9930,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _tmp27_ = _tmp26_->source; #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, TYPE_LIBRARY_PHOTO)) { -#line 9266 "BatchImport.c" +#line 9928 "BatchImport.c" GeeArrayList* _tmp28_; CompletedImportObject* _tmp29_; MediaSource* _tmp30_; @@ -9280,7 +9942,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _tmp30_ = _tmp29_->source; #line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 9278 "BatchImport.c" +#line 9940 "BatchImport.c" } else { CompletedImportObject* _tmp31_; MediaSource* _tmp32_; @@ -9290,7 +9952,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _tmp32_ = _tmp31_->source; #line 1197 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, TYPE_VIDEO)) { -#line 9288 "BatchImport.c" +#line 9950 "BatchImport.c" GeeArrayList* _tmp33_; CompletedImportObject* _tmp34_; MediaSource* _tmp35_; @@ -9302,7 +9964,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _tmp35_ = _tmp34_->source; #line 1198 "/home/jens/Source/shotwell/src/BatchImport.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_VIDEO, Video)); -#line 9300 "BatchImport.c" +#line 9962 "BatchImport.c" } } #line 1200 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9319,11 +9981,11 @@ static void batch_import_flush_ready_sources (BatchImport* self) { gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp38_, _tmp40_); #line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala" _completed_import_object_unref0 (completed); -#line 9317 "BatchImport.c" +#line 9979 "BatchImport.c" } #line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_completed_list); -#line 9321 "BatchImport.c" +#line 9983 "BatchImport.c" } #line 1203 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp41_ = media_collection_registry_get_instance (); @@ -9353,7 +10015,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _tmp48_ = videos; #line 1208 "/home/jens/Source/shotwell/src/BatchImport.vala" media_source_collection_import_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 9351 "BatchImport.c" +#line 10013 "BatchImport.c" { GeeIterator* _media_it = NULL; GeeHashMap* _tmp49_; @@ -9380,55 +10042,52 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _media_it = _tmp54_; #line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 9378 "BatchImport.c" +#line 10040 "BatchImport.c" GeeIterator* _tmp55_; - gboolean _tmp56_; MediaSource* media = NULL; - GeeIterator* _tmp57_; - gpointer _tmp58_; + GeeIterator* _tmp56_; + gpointer _tmp57_; #line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp55_ = _media_it; #line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp56_ = gee_iterator_next (_tmp55_); -#line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!_tmp56_) { + if (!gee_iterator_next (_tmp55_)) { #line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 9392 "BatchImport.c" +#line 10051 "BatchImport.c" } #line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp57_ = _media_it; + _tmp56_ = _media_it; #line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp58_ = gee_iterator_get (_tmp57_); + _tmp57_ = gee_iterator_get (_tmp56_); #line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala" - media = (MediaSource*) _tmp58_; -#line 9400 "BatchImport.c" + media = (MediaSource*) _tmp57_; +#line 10059 "BatchImport.c" { - GeeHashMap* _tmp59_; - MediaSource* _tmp60_; - gpointer _tmp61_; - BatchImportJob* _tmp62_; - MediaSource* _tmp63_; - BatchImportRoll* _tmp64_; + GeeHashMap* _tmp58_; + MediaSource* _tmp59_; + gpointer _tmp60_; + BatchImportJob* _tmp61_; + MediaSource* _tmp62_; + BatchImportRoll* _tmp63_; #line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp59_ = completion_list; + _tmp58_ = completion_list; #line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp60_ = media; + _tmp59_ = media; #line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp61_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp60_); + _tmp60_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp59_); #line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp62_ = (BatchImportJob*) _tmp61_; + _tmp61_ = (BatchImportJob*) _tmp60_; #line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp63_ = media; + _tmp62_ = media; #line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp64_ = self->priv->import_roll; + _tmp63_ = self->priv->import_roll; #line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_job_complete (_tmp62_, _tmp63_, _tmp64_, &_inner_error_); + batch_import_job_complete (_tmp61_, _tmp62_, _tmp63_, &_inner_error_); #line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala" - _batch_import_job_unref0 (_tmp62_); + _batch_import_job_unref0 (_tmp61_); #line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9426 "BatchImport.c" +#line 10085 "BatchImport.c" goto __catch425_g_error; } } @@ -9436,33 +10095,33 @@ static void batch_import_flush_ready_sources (BatchImport* self) { __catch425_g_error: { GError* err = NULL; - MediaSource* _tmp65_; + MediaSource* _tmp64_; + gchar* _tmp65_; gchar* _tmp66_; - gchar* _tmp67_; - GError* _tmp68_; - const gchar* _tmp69_; + GError* _tmp67_; + const gchar* _tmp68_; #line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; #line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; #line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp65_ = media; + _tmp64_ = media; #line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp66_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_DATA_OBJECT, DataObject)); + _tmp65_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_DATA_OBJECT, DataObject)); #line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp67_ = _tmp66_; + _tmp66_ = _tmp65_; #line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp68_ = err; + _tmp67_ = err; #line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp69_ = _tmp68_->message; + _tmp68_ = _tmp67_->message; #line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala" g_warning ("BatchImport.vala:1215: Completion error when finalizing import of %s: " \ -"%s", _tmp67_, _tmp69_); +"%s", _tmp66_, _tmp68_); #line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp67_); + _g_free0 (_tmp66_); #line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 9459 "BatchImport.c" +#line 10118 "BatchImport.c" } __finally425: #line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9485,44 +10144,44 @@ static void batch_import_flush_ready_sources (BatchImport* self) { g_clear_error (&_inner_error_); #line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 9482 "BatchImport.c" +#line 10141 "BatchImport.c" } #line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (media); -#line 9486 "BatchImport.c" +#line 10145 "BatchImport.c" } #line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_media_it); -#line 9490 "BatchImport.c" +#line 10149 "BatchImport.c" } #line 1221 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp70_ = all; + _tmp69_ = all; #line 1221 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp71_ = self->priv->import_roll; + _tmp70_ = self->priv->import_roll; #line 1221 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp72_ = _tmp71_->generated_events; + _tmp71_ = _tmp70_->generated_events; #line 1221 "/home/jens/Source/shotwell/src/BatchImport.vala" - event_generate_many_events (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GEE_TYPE_COLLECTION, GeeCollection), _tmp72_); + event_generate_many_events (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_COLLECTION, GeeCollection), _tmp71_); #line 1223 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp73_ = tag_global; + _tmp72_ = tag_global; #line 1223 "/home/jens/Source/shotwell/src/BatchImport.vala" - data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_DATA_COLLECTION, DataCollection)); #line 1224 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp74_ = event_global; + _tmp73_ = event_global; #line 1224 "/home/jens/Source/shotwell/src/BatchImport.vala" - data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_DATA_COLLECTION, DataCollection)); #line 1225 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp75_ = media_collection_registry_get_instance (); + _tmp74_ = media_collection_registry_get_instance (); #line 1225 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp76_ = _tmp75_; + _tmp75_ = _tmp74_; #line 1225 "/home/jens/Source/shotwell/src/BatchImport.vala" - media_collection_registry_commit_transaction_on_all (_tmp76_); + media_collection_registry_commit_transaction_on_all (_tmp75_); #line 1225 "/home/jens/Source/shotwell/src/BatchImport.vala" - _media_collection_registry_unref0 (_tmp76_); + _media_collection_registry_unref0 (_tmp75_); #line 1227 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp77_ = self->priv->ready_sources; + _tmp76_ = self->priv->ready_sources; #line 1227 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_COLLECTION, GeeCollection)); + gee_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1178 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (completion_list); #line 1178 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9531,29 +10190,28 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _g_object_unref0 (photos); #line 1178 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (all); -#line 9528 "BatchImport.c" +#line 10187 "BatchImport.c" } -static gboolean batch_import_display_imported_timer (BatchImport* self) { +static gboolean +batch_import_display_imported_timer (BatchImport* self) +{ gboolean result = FALSE; GeeList* _tmp0_; gint _tmp1_; gint _tmp2_; GCancellable* _tmp4_; - gboolean _tmp5_; gint total = 0; - GCancellable* _tmp9_; - gboolean _tmp10_; + GCancellable* _tmp8_; + gint _tmp15_; + GeeList* _tmp16_; + gint _tmp17_; gint _tmp18_; - GeeList* _tmp19_; - gint _tmp20_; - gint _tmp21_; - gint _tmp22_; - gboolean _tmp47_ = FALSE; - GeeList* _tmp48_; - gint _tmp49_; - gint _tmp50_; + gboolean _tmp41_ = FALSE; + GeeList* _tmp42_; + gint _tmp43_; + gint _tmp44_; #line 1232 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE); #line 1233 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9564,7 +10222,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) { _tmp2_ = _tmp1_; #line 1233 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp2_ == 0) { -#line 9561 "BatchImport.c" +#line 10219 "BatchImport.c" gboolean _tmp3_; #line 1234 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = self->priv->completed; @@ -9572,200 +10230,185 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) { result = !_tmp3_; #line 1234 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 9569 "BatchImport.c" +#line 10227 "BatchImport.c" } #line 1236 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = self->priv->cancellable; #line 1236 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = g_cancellable_is_cancelled (_tmp4_); -#line 1236 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp5_) { -#line 9577 "BatchImport.c" - GeeList* _tmp6_; + if (g_cancellable_is_cancelled (_tmp4_)) { +#line 10233 "BatchImport.c" + GeeList* _tmp5_; + gint _tmp6_; gint _tmp7_; - gint _tmp8_; #line 1237 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = self->priv->display_imported_queue; + _tmp5_ = self->priv->display_imported_queue; #line 1237 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1237 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 1237 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_debug ("BatchImport.vala:1237: Importing %d photos at once", _tmp8_); -#line 9589 "BatchImport.c" + g_debug ("BatchImport.vala:1237: Importing %d photos at once", _tmp7_); +#line 10245 "BatchImport.c" } #line 1239 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_log_status (self, "display_imported_timer"); #line 1249 "/home/jens/Source/shotwell/src/BatchImport.vala" total = 1; #line 1250 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = self->priv->cancellable; -#line 1250 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = g_cancellable_is_cancelled (_tmp9_); + _tmp8_ = self->priv->cancellable; #line 1250 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!_tmp10_) { -#line 9601 "BatchImport.c" - GeeList* _tmp11_; - gint _tmp12_; - gint _tmp13_; + if (!g_cancellable_is_cancelled (_tmp8_)) { +#line 10255 "BatchImport.c" + GeeList* _tmp9_; + gint _tmp10_; + gint _tmp11_; #line 1251 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = self->priv->display_imported_queue; + _tmp9_ = self->priv->display_imported_queue; #line 1251 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1251 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 1251 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp13_ > BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW) { -#line 9613 "BatchImport.c" - GeeList* _tmp14_; - gint _tmp15_; - gint _tmp16_; - gint _tmp17_; -#line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = self->priv->display_imported_queue; + if (_tmp11_ > BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW) { +#line 10267 "BatchImport.c" + GeeList* _tmp12_; + gint _tmp13_; + gint _tmp14_; #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp12_ = self->priv->display_imported_queue; #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = _tmp15_; + _tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = CLAMP ((_tmp16_ / BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW) + 2, 0, 16); + _tmp14_ = _tmp13_; #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala" - total = 1 << _tmp17_; -#line 9628 "BatchImport.c" + total = 1 << CLAMP ((_tmp14_ / BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW) + 2, 0, 16); +#line 10279 "BatchImport.c" } } else { #line 1256 "/home/jens/Source/shotwell/src/BatchImport.vala" total = BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW; -#line 9633 "BatchImport.c" +#line 10284 "BatchImport.c" } #line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = total; + _tmp15_ = total; #line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = self->priv->display_imported_queue; + _tmp16_ = self->priv->display_imported_queue; #line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp20_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp17_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp21_ = _tmp20_; -#line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp22_ = MIN (_tmp18_, _tmp21_); + _tmp18_ = _tmp17_; #line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala" - total = _tmp22_; + total = MIN (_tmp15_, _tmp18_); #line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 9649 "BatchImport.c" - gint _tmp23_; +#line 10298 "BatchImport.c" + gint _tmp19_; CompletedImportObject* completed_object = NULL; - GeeList* _tmp24_; - gpointer _tmp25_; + GeeList* _tmp20_; + gpointer _tmp21_; GdkPixbuf* user_preview = NULL; + CompletedImportObject* _tmp22_; + GdkPixbuf* _tmp23_; + GdkPixbuf* _tmp24_; + CompletedImportObject* _tmp25_; CompletedImportObject* _tmp26_; - GdkPixbuf* _tmp27_; - GdkPixbuf* _tmp28_; + GeeList* _tmp27_; + CompletedImportObject* _tmp28_; CompletedImportObject* _tmp29_; - CompletedImportObject* _tmp30_; - GeeList* _tmp31_; - CompletedImportObject* _tmp32_; + MediaSource* _tmp30_; + GdkPixbuf* _tmp31_; + gint _tmp32_; CompletedImportObject* _tmp33_; MediaSource* _tmp34_; - GdkPixbuf* _tmp35_; - gint _tmp36_; - CompletedImportObject* _tmp37_; - MediaSource* _tmp38_; #line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp23_ = total; + _tmp19_ = total; #line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala" - total = _tmp23_ - 1; + total = _tmp19_ - 1; #line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!(_tmp23_ > 0)) { + if (!(_tmp19_ > 0)) { #line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 9676 "BatchImport.c" +#line 10325 "BatchImport.c" } #line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp24_ = self->priv->display_imported_queue; + _tmp20_ = self->priv->display_imported_queue; #line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp25_ = gee_list_remove_at (_tmp24_, 0); + _tmp21_ = gee_list_remove_at (_tmp20_, 0); #line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala" - completed_object = (CompletedImportObject*) _tmp25_; + completed_object = (CompletedImportObject*) _tmp21_; #line 1273 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp26_ = completed_object; + _tmp22_ = completed_object; #line 1273 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp27_ = _tmp26_->user_preview; + _tmp23_ = _tmp22_->user_preview; #line 1273 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp28_ = _g_object_ref0 (_tmp27_); + _tmp24_ = _g_object_ref0 (_tmp23_); #line 1273 "/home/jens/Source/shotwell/src/BatchImport.vala" - user_preview = _tmp28_; + user_preview = _tmp24_; #line 1276 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp29_ = completed_object; + _tmp25_ = completed_object; #line 1276 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp29_->user_preview); + _g_object_unref0 (_tmp25_->user_preview); #line 1276 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp29_->user_preview = NULL; + _tmp25_->user_preview = NULL; #line 1277 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp30_ = completed_object; + _tmp26_ = completed_object; #line 1277 "/home/jens/Source/shotwell/src/BatchImport.vala" - _thumbnails_unref0 (_tmp30_->thumbnails); + _thumbnails_unref0 (_tmp26_->thumbnails); #line 1277 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp30_->thumbnails = NULL; + _tmp26_->thumbnails = NULL; #line 1282 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp31_ = self->priv->ready_sources; + _tmp27_ = self->priv->ready_sources; #line 1282 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp32_ = completed_object; + _tmp28_ = completed_object; #line 1282 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection), _tmp32_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_); #line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp33_ = completed_object; + _tmp29_ = completed_object; #line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp34_ = _tmp33_->source; + _tmp30_ = _tmp29_->source; #line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp35_ = user_preview; + _tmp31_ = user_preview; #line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp36_ = total; + _tmp32_ = total; #line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORTED_SIGNAL], 0, _tmp34_, _tmp35_, _tmp36_); + g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORTED_SIGNAL], 0, _tmp30_, _tmp31_, _tmp32_); #line 1287 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp37_ = completed_object; + _tmp33_ = completed_object; #line 1287 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp38_ = _tmp37_->source; + _tmp34_ = _tmp33_->source; #line 1287 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp38_, TYPE_PHOTO_SOURCE)) { -#line 9726 "BatchImport.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp34_, TYPE_PHOTO_SOURCE)) { +#line 10375 "BatchImport.c" PhotoSource* photo_source = NULL; - CompletedImportObject* _tmp39_; - MediaSource* _tmp40_; - PhotoSource* _tmp41_; - PhotoSource* _tmp42_; - guint64 _tmp43_; + CompletedImportObject* _tmp35_; + MediaSource* _tmp36_; + PhotoSource* _tmp37_; + PhotoSource* _tmp38_; #line 1288 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp39_ = completed_object; + _tmp35_ = completed_object; #line 1288 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp40_ = _tmp39_->source; + _tmp36_ = _tmp35_->source; #line 1288 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, TYPE_PHOTO_SOURCE) ? ((PhotoSource*) _tmp40_) : NULL); + _tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp36_, TYPE_PHOTO_SOURCE) ? ((PhotoSource*) _tmp36_) : NULL); #line 1288 "/home/jens/Source/shotwell/src/BatchImport.vala" - photo_source = _tmp41_; -#line 1289 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp42_ = photo_source; + photo_source = _tmp37_; #line 1289 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp43_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp38_ = photo_source; #line 1289 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_report_progress (self, _tmp43_); + batch_import_report_progress (self, media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_MEDIA_SOURCE, MediaSource))); #line 1287 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (photo_source); -#line 9749 "BatchImport.c" +#line 10395 "BatchImport.c" } else { - CompletedImportObject* _tmp44_; - MediaSource* _tmp45_; - guint64 _tmp46_; -#line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp44_ = completed_object; + CompletedImportObject* _tmp39_; + MediaSource* _tmp40_; #line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp45_ = _tmp44_->source; + _tmp39_ = completed_object; #line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp46_ = media_source_get_filesize (_tmp45_); + _tmp40_ = _tmp39_->source; #line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_report_progress (self, _tmp46_); -#line 9762 "BatchImport.c" + batch_import_report_progress (self, media_source_get_filesize (_tmp40_)); +#line 10405 "BatchImport.c" } #line 1293 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_file_import_complete (self); @@ -9773,45 +10416,49 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) { _g_object_unref0 (user_preview); #line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala" _completed_import_object_unref0 (completed_object); -#line 9770 "BatchImport.c" +#line 10413 "BatchImport.c" } #line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp48_ = self->priv->ready_sources; + _tmp42_ = self->priv->ready_sources; #line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp49_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp43_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp50_ = _tmp49_; + _tmp44_ = _tmp43_; #line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp50_ >= BATCH_IMPORT_READY_SOURCES_COUNT_OVERFLOW) { + if (_tmp44_ >= BATCH_IMPORT_READY_SOURCES_COUNT_OVERFLOW) { #line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp47_ = TRUE; -#line 9782 "BatchImport.c" + _tmp41_ = TRUE; +#line 10425 "BatchImport.c" } else { - GCancellable* _tmp51_; - gboolean _tmp52_; + GCancellable* _tmp45_; #line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp51_ = self->priv->cancellable; + _tmp45_ = self->priv->cancellable; #line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp52_ = g_cancellable_is_cancelled (_tmp51_); -#line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp47_ = _tmp52_; -#line 9792 "BatchImport.c" + _tmp41_ = g_cancellable_is_cancelled (_tmp45_); +#line 10432 "BatchImport.c" } #line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp47_) { + if (_tmp41_) { #line 1297 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_flush_ready_sources (self); -#line 9798 "BatchImport.c" +#line 10438 "BatchImport.c" } #line 1299 "/home/jens/Source/shotwell/src/BatchImport.vala" result = TRUE; #line 1299 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 9804 "BatchImport.c" +#line 10444 "BatchImport.c" } -static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__UINT64_UINT64) (gpointer data1, guint64 arg_1, guint64 arg_2, gpointer data2); register GMarshalFunc_VOID__UINT64_UINT64 callback; register GCClosure * cc; @@ -9826,23 +10473,30 @@ static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GVa data1 = closure->data; #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" data2 = param_values->data[0].v_pointer; -#line 9823 "BatchImport.c" +#line 10470 "BatchImport.c" } else { #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" data1 = param_values->data[0].v_pointer; #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" data2 = closure->data; -#line 9829 "BatchImport.c" +#line 10476 "BatchImport.c" } #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" callback = (GMarshalFunc_VOID__UINT64_UINT64) (marshal_data ? marshal_data : cc->callback); #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" callback (data1, g_value_get_uint64 (param_values + 1), g_value_get_uint64 (param_values + 2), data2); -#line 9835 "BatchImport.c" +#line 10482 "BatchImport.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT_INT) (gpointer data1, gpointer arg_1, gpointer arg_2, gint arg_3, gpointer data2); register GMarshalFunc_VOID__OBJECT_OBJECT_INT callback; register GCClosure * cc; @@ -9857,23 +10511,30 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT (GClosure * closure, data1 = closure->data; #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" data2 = param_values->data[0].v_pointer; -#line 9854 "BatchImport.c" +#line 10508 "BatchImport.c" } else { #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" data1 = param_values->data[0].v_pointer; #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" data2 = closure->data; -#line 9860 "BatchImport.c" +#line 10514 "BatchImport.c" } #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT_INT) (marshal_data ? marshal_data : cc->callback); #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_int (param_values + 3), data2); -#line 9866 "BatchImport.c" +#line 10520 "BatchImport.c" } -static void g_cclosure_user_marshal_VOID__ENUM_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__ENUM_STRING (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__ENUM_STRING) (gpointer data1, gint arg_1, const char* arg_2, gpointer data2); register GMarshalFunc_VOID__ENUM_STRING callback; register GCClosure * cc; @@ -9888,23 +10549,30 @@ static void g_cclosure_user_marshal_VOID__ENUM_STRING (GClosure * closure, GValu data1 = closure->data; #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" data2 = param_values->data[0].v_pointer; -#line 9885 "BatchImport.c" +#line 10546 "BatchImport.c" } else { #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" data1 = param_values->data[0].v_pointer; #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" data2 = closure->data; -#line 9891 "BatchImport.c" +#line 10552 "BatchImport.c" } #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" callback = (GMarshalFunc_VOID__ENUM_STRING) (marshal_data ? marshal_data : cc->callback); #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" callback (data1, g_value_get_enum (param_values + 1), g_value_get_string (param_values + 2), data2); -#line 9897 "BatchImport.c" +#line 10558 "BatchImport.c" } -static void g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__BATCH_IMPORT_RESULT) (gpointer data1, gpointer arg_1, gpointer data2); register GMarshalFunc_VOID__BATCH_IMPORT_RESULT callback; register GCClosure * cc; @@ -9919,23 +10587,30 @@ static void g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT (GClosure * closur data1 = closure->data; #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" data2 = param_values->data[0].v_pointer; -#line 9916 "BatchImport.c" +#line 10584 "BatchImport.c" } else { #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" data1 = param_values->data[0].v_pointer; #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" data2 = closure->data; -#line 9922 "BatchImport.c" +#line 10590 "BatchImport.c" } #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" callback = (GMarshalFunc_VOID__BATCH_IMPORT_RESULT) (marshal_data ? marshal_data : cc->callback); #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" callback (data1, value_get_batch_import_result (param_values + 1), data2); -#line 9928 "BatchImport.c" +#line 10596 "BatchImport.c" } -static void g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2); register GMarshalFunc_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL callback; register GCClosure * cc; @@ -9950,26 +10625,27 @@ static void g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL (GCl data1 = closure->data; #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" data2 = param_values->data[0].v_pointer; -#line 9947 "BatchImport.c" +#line 10622 "BatchImport.c" } else { #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" data1 = param_values->data[0].v_pointer; #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" data2 = closure->data; -#line 9953 "BatchImport.c" +#line 10628 "BatchImport.c" } #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" callback = (GMarshalFunc_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL) (marshal_data ? marshal_data : cc->callback); #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" callback (data1, value_get_import_manifest (param_values + 1), value_get_batch_import_roll (param_values + 2), data2); -#line 9959 "BatchImport.c" +#line 10634 "BatchImport.c" } -static void batch_import_class_init (BatchImportClass * klass) { +static void +batch_import_class_init (BatchImportClass * klass) +{ Workers* _tmp0_; - guint _tmp1_; - Workers* _tmp2_; + Workers* _tmp1_; #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_parent_class = g_type_class_peek_parent (klass); #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9995,22 +10671,21 @@ static void batch_import_class_init (BatchImportClass * klass) { #line 429 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_feeder_workers = _tmp0_; #line 430 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = workers_thread_per_cpu_minus_one (); + _tmp1_ = workers_new (workers_thread_per_cpu_minus_one (), FALSE); #line 430 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = workers_new (_tmp1_, FALSE); -#line 430 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_import_workers = _tmp2_; -#line 9997 "BatchImport.c" + batch_import_import_workers = _tmp1_; +#line 10671 "BatchImport.c" } -static void batch_import_instance_init (BatchImport * self) { +static void +batch_import_instance_init (BatchImport * self) +{ GeeHashMap* _tmp0_; - guint _tmp1_; + GeeLinkedList* _tmp1_; GeeLinkedList* _tmp2_; GeeLinkedList* _tmp3_; GeeLinkedList* _tmp4_; - GeeLinkedList* _tmp5_; #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv = BATCH_IMPORT_GET_PRIVATE (self); #line 435 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10036,34 +10711,34 @@ static void batch_import_instance_init (BatchImport * self) { #line 449 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->throbber_id = (guint) 0; #line 450 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = workers_thread_per_cpu_minus_one (); -#line 450 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->max_outstanding_import_jobs = _tmp1_; + self->priv->max_outstanding_import_jobs = workers_thread_per_cpu_minus_one (); #line 451 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->untrash_duplicates = TRUE; #line 452 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->mark_duplicates_online = TRUE; #line 456 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = gee_linked_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL); + _tmp1_ = gee_linked_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL); #line 456 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->ready_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList); + self->priv->ready_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_LIST, GeeList); #line 457 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL); + _tmp2_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL); #line 457 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->ready_thumbnails = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_LIST, GeeList); + self->priv->ready_thumbnails = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList); #line 459 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL); + _tmp3_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL); #line 459 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->display_imported_queue = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList); + self->priv->display_imported_queue = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_LIST, GeeList); #line 461 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL); + _tmp4_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL); #line 461 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->ready_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_LIST, GeeList); -#line 10056 "BatchImport.c" + self->priv->ready_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList); +#line 10729 "BatchImport.c" } -static void batch_import_finalize (GObject * obj) { +static void +batch_import_finalize (GObject * obj) +{ BatchImport * self; Application* _tmp0_; Application* _tmp1_; @@ -10104,11 +10779,13 @@ static void batch_import_finalize (GObject * obj) { _g_object_unref0 (self->priv->ready_sources); #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala" G_OBJECT_CLASS (batch_import_parent_class)->finalize (obj); -#line 10101 "BatchImport.c" +#line 10776 "BatchImport.c" } -GType batch_import_get_type (void) { +GType +batch_import_get_type (void) +{ static volatile gsize batch_import_type_id__volatile = 0; if (g_once_init_enter (&batch_import_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (BatchImportClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) batch_import_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (BatchImport), 0, (GInstanceInitFunc) batch_import_instance_init, NULL }; @@ -10120,7 +10797,9 @@ GType batch_import_get_type (void) { } -static DuplicatedFile* duplicated_file_construct (GType object_type) { +static DuplicatedFile* +duplicated_file_construct (GType object_type) +{ DuplicatedFile * self = NULL; #line 1308 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (DuplicatedFile*) g_object_new (object_type, NULL); @@ -10138,103 +10817,108 @@ static DuplicatedFile* duplicated_file_construct (GType object_type) { self->priv->file = NULL; #line 1308 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 10135 "BatchImport.c" +#line 10814 "BatchImport.c" } -static DuplicatedFile* duplicated_file_new (void) { +static DuplicatedFile* +duplicated_file_new (void) +{ #line 1308 "/home/jens/Source/shotwell/src/BatchImport.vala" return duplicated_file_construct (TYPE_DUPLICATED_FILE); -#line 10142 "BatchImport.c" +#line 10823 "BatchImport.c" } -static gpointer _photo_id_dup0 (gpointer self) { +static gpointer +_photo_id_dup0 (gpointer self) +{ #line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? photo_id_dup (self) : NULL; -#line 10149 "BatchImport.c" +#line 10832 "BatchImport.c" } -DuplicatedFile* duplicated_file_create_from_photo_id (PhotoID* photo_id) { +DuplicatedFile* +duplicated_file_create_from_photo_id (PhotoID* photo_id) +{ DuplicatedFile* result = NULL; - gboolean _tmp0_; DuplicatedFile* _result_ = NULL; - DuplicatedFile* _tmp1_; - PhotoID _tmp2_; - PhotoID* _tmp3_; + DuplicatedFile* _tmp0_; + PhotoID _tmp1_; + PhotoID* _tmp2_; #line 1314 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (photo_id != NULL, NULL); #line 1315 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = photo_id_is_valid (photo_id); -#line 1315 "/home/jens/Source/shotwell/src/BatchImport.vala" - _vala_assert (_tmp0_, "photo_id.is_valid()"); + _vala_assert (photo_id_is_valid (photo_id), "photo_id.is_valid()"); #line 1317 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = duplicated_file_new (); + _tmp0_ = duplicated_file_new (); #line 1317 "/home/jens/Source/shotwell/src/BatchImport.vala" - _result_ = _tmp1_; + _result_ = _tmp0_; #line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = *photo_id; + _tmp1_ = *photo_id; #line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = _photo_id_dup0 (&_tmp2_); + _tmp2_ = _photo_id_dup0 (&_tmp1_); #line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala" _photo_id_free0 (_result_->priv->photo_id); #line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala" - _result_->priv->photo_id = _tmp3_; + _result_->priv->photo_id = _tmp2_; #line 1319 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _result_; #line 1319 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 10182 "BatchImport.c" +#line 10864 "BatchImport.c" } -static gpointer _video_id_dup0 (gpointer self) { +static gpointer +_video_id_dup0 (gpointer self) +{ #line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? video_id_dup (self) : NULL; -#line 10189 "BatchImport.c" +#line 10873 "BatchImport.c" } -DuplicatedFile* duplicated_file_create_from_video_id (VideoID* video_id) { +DuplicatedFile* +duplicated_file_create_from_video_id (VideoID* video_id) +{ DuplicatedFile* result = NULL; - gboolean _tmp0_; DuplicatedFile* _result_ = NULL; - DuplicatedFile* _tmp1_; - VideoID _tmp2_; - VideoID* _tmp3_; + DuplicatedFile* _tmp0_; + VideoID _tmp1_; + VideoID* _tmp2_; #line 1322 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (video_id != NULL, NULL); #line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = video_id_is_valid (video_id); -#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala" - _vala_assert (_tmp0_, "video_id.is_valid()"); + _vala_assert (video_id_is_valid (video_id), "video_id.is_valid()"); #line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = duplicated_file_new (); + _tmp0_ = duplicated_file_new (); #line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala" - _result_ = _tmp1_; + _result_ = _tmp0_; #line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = *video_id; + _tmp1_ = *video_id; #line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = _video_id_dup0 (&_tmp2_); + _tmp2_ = _video_id_dup0 (&_tmp1_); #line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala" _video_id_free0 (_result_->priv->video_id); #line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala" - _result_->priv->video_id = _tmp3_; + _result_->priv->video_id = _tmp2_; #line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _result_; #line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 10222 "BatchImport.c" +#line 10905 "BatchImport.c" } -DuplicatedFile* duplicated_file_create_from_file (GFile* file) { +DuplicatedFile* +duplicated_file_create_from_file (GFile* file) +{ DuplicatedFile* result = NULL; DuplicatedFile* _result_ = NULL; DuplicatedFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; #line 1330 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10242,22 +10926,22 @@ DuplicatedFile* duplicated_file_create_from_file (GFile* file) { #line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala" _result_ = _tmp0_; #line 1333 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = file; -#line 1333 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (file); #line 1333 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_result_->priv->file); #line 1333 "/home/jens/Source/shotwell/src/BatchImport.vala" - _result_->priv->file = _tmp2_; + _result_->priv->file = _tmp1_; #line 1335 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _result_; #line 1335 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 10250 "BatchImport.c" +#line 10932 "BatchImport.c" } -GFile* duplicated_file_get_file (DuplicatedFile* self) { +GFile* +duplicated_file_get_file (DuplicatedFile* self) +{ GFile* result = NULL; GFile* _tmp0_; #line 1338 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10266,7 +10950,7 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) { _tmp0_ = self->priv->file; #line 1339 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp0_ != NULL) { -#line 10263 "BatchImport.c" +#line 10947 "BatchImport.c" GFile* _tmp1_; GFile* _tmp2_; #line 1340 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10277,14 +10961,14 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) { result = _tmp2_; #line 1340 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 10274 "BatchImport.c" +#line 10958 "BatchImport.c" } else { PhotoID* _tmp3_; #line 1341 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = self->priv->photo_id; #line 1341 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp3_ != NULL) { -#line 10281 "BatchImport.c" +#line 10965 "BatchImport.c" Photo* photo_object = NULL; LibraryPhotoSourceCollection* _tmp4_; PhotoID* _tmp5_; @@ -10322,14 +11006,14 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) { _g_object_unref0 (photo_object); #line 1344 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 10319 "BatchImport.c" +#line 11003 "BatchImport.c" } else { VideoID* _tmp12_; #line 1345 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = self->priv->video_id; #line 1345 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp12_ != NULL) { -#line 10326 "BatchImport.c" +#line 11010 "BatchImport.c" Video* video_object = NULL; VideoSourceCollection* _tmp13_; VideoID* _tmp14_; @@ -10367,36 +11051,42 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) { _g_object_unref0 (video_object); #line 1348 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 10364 "BatchImport.c" +#line 11048 "BatchImport.c" } else { #line 1350 "/home/jens/Source/shotwell/src/BatchImport.vala" g_assert_not_reached (); -#line 10368 "BatchImport.c" +#line 11052 "BatchImport.c" } } } } -static void duplicated_file_class_init (DuplicatedFileClass * klass) { +static void +duplicated_file_class_init (DuplicatedFileClass * klass) +{ #line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala" duplicated_file_parent_class = g_type_class_peek_parent (klass); #line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_class_add_private (klass, sizeof (DuplicatedFilePrivate)); #line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala" G_OBJECT_CLASS (klass)->finalize = duplicated_file_finalize; -#line 10382 "BatchImport.c" +#line 11068 "BatchImport.c" } -static void duplicated_file_instance_init (DuplicatedFile * self) { +static void +duplicated_file_instance_init (DuplicatedFile * self) +{ #line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv = DUPLICATED_FILE_GET_PRIVATE (self); -#line 10389 "BatchImport.c" +#line 11077 "BatchImport.c" } -static void duplicated_file_finalize (GObject * obj) { +static void +duplicated_file_finalize (GObject * obj) +{ DuplicatedFile * self; #line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DUPLICATED_FILE, DuplicatedFile); @@ -10408,11 +11098,13 @@ static void duplicated_file_finalize (GObject * obj) { _g_object_unref0 (self->priv->file); #line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala" G_OBJECT_CLASS (duplicated_file_parent_class)->finalize (obj); -#line 10405 "BatchImport.c" +#line 11095 "BatchImport.c" } -GType duplicated_file_get_type (void) { +GType +duplicated_file_get_type (void) +{ static volatile gsize duplicated_file_type_id__volatile = 0; if (g_once_init_enter (&duplicated_file_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DuplicatedFileClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) duplicated_file_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DuplicatedFile), 0, (GInstanceInitFunc) duplicated_file_instance_init, NULL }; @@ -10424,78 +11116,69 @@ GType duplicated_file_get_type (void) { } -BackgroundImportJob* background_import_job_construct (GType object_type, BatchImport* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) { +BackgroundImportJob* +background_import_job_construct (GType object_type, + BatchImport* owner, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target) +{ BackgroundImportJob* self = NULL; - BatchImport* _tmp0_; - CompletionCallback _tmp1_; - void* _tmp1__target; - GCancellable* _tmp2_; - CancellationCallback _tmp3_; - void* _tmp3__target; #line 1377 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL); #line 1377 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL); #line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = owner; -#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = callback; -#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1__target = callback_target; -#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = cancellable; -#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = cancellation; -#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3__target = cancellation_target; -#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala" - self = (BackgroundImportJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target, NULL); + self = (BackgroundImportJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), callback, callback_target, cancellable, cancellation, cancellation_target, NULL); #line 1377 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 10449 "BatchImport.c" +#line 11131 "BatchImport.c" } -ImportResult background_import_job_abort_check (BackgroundImportJob* self) { +ImportResult +background_import_job_abort_check (BackgroundImportJob* self) +{ ImportResult result = 0; gboolean _tmp0_ = FALSE; ImportResult _tmp1_; - ImportResult _tmp3_; + ImportResult _tmp2_; #line 1384 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BACKGROUND_IMPORT_JOB (self), 0); #line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = self->abort_flag; #line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp1_ == IMPORT_RESULT_SUCCESS) { -#line 10464 "BatchImport.c" - gboolean _tmp2_; #line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob)); -#line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = _tmp2_; -#line 10470 "BatchImport.c" + _tmp0_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob)); +#line 11150 "BatchImport.c" } else { #line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = FALSE; -#line 10474 "BatchImport.c" +#line 11154 "BatchImport.c" } #line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp0_) { #line 1386 "/home/jens/Source/shotwell/src/BatchImport.vala" self->abort_flag = IMPORT_RESULT_USER_ABORT; -#line 10480 "BatchImport.c" +#line 11160 "BatchImport.c" } #line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = self->abort_flag; + _tmp2_ = self->abort_flag; #line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp3_; + result = _tmp2_; #line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 10488 "BatchImport.c" +#line 11168 "BatchImport.c" } -void background_import_job_abort (BackgroundImportJob* self, ImportResult _result_) { +void +background_import_job_abort (BackgroundImportJob* self, + ImportResult _result_) +{ ImportResult _tmp0_; #line 1391 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BACKGROUND_IMPORT_JOB (self)); @@ -10503,29 +11186,24 @@ void background_import_job_abort (BackgroundImportJob* self, ImportResult _resul _tmp0_ = self->abort_flag; #line 1393 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp0_ == IMPORT_RESULT_SUCCESS) { -#line 10500 "BatchImport.c" - ImportResult _tmp1_; -#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = _result_; #line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->abort_flag = _tmp1_; -#line 10506 "BatchImport.c" + self->abort_flag = _result_; +#line 11185 "BatchImport.c" } } -void background_import_job_report_failure (BackgroundImportJob* self, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, ImportResult _result_) { - ImportResult _tmp0_; - ImportResult _tmp1_; - gboolean _tmp2_; - GeeList* _tmp8_; - BatchImportJob* _tmp9_; - GFile* _tmp10_; - const gchar* _tmp11_; - const gchar* _tmp12_; - ImportResult _tmp13_; - BatchImportResult* _tmp14_; - BatchImportResult* _tmp15_; +void +background_import_job_report_failure (BackgroundImportJob* self, + BatchImportJob* job, + GFile* file, + const gchar* src_identifier, + const gchar* dest_identifier, + ImportResult _result_) +{ + GeeList* _tmp2_; + BatchImportResult* _tmp3_; + BatchImportResult* _tmp4_; #line 1397 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BACKGROUND_IMPORT_JOB (self)); #line 1397 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10537,87 +11215,57 @@ void background_import_job_report_failure (BackgroundImportJob* self, BatchImpor #line 1397 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (dest_identifier != NULL); #line 1399 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = _result_; -#line 1399 "/home/jens/Source/shotwell/src/BatchImport.vala" - _vala_assert (_tmp0_ != IMPORT_RESULT_SUCCESS, "result != ImportResult.SUCCESS"); -#line 1402 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = _result_; + _vala_assert (_result_ != IMPORT_RESULT_SUCCESS, "result != ImportResult.SUCCESS"); #line 1402 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = import_result_is_abort (_tmp1_); -#line 1402 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp2_) { -#line 10543 "BatchImport.c" - ImportResult _tmp3_; + if (import_result_is_abort (_result_)) { #line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = _result_; -#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala" - background_import_job_abort (self, _tmp3_); -#line 10549 "BatchImport.c" + background_import_job_abort (self, _result_); +#line 11217 "BatchImport.c" } else { - const gchar* _tmp4_; - ImportResult _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; -#line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = src_identifier; -#line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = _result_; + gchar* _tmp0_; + gchar* _tmp1_; #line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = import_result_to_string (_tmp5_); + _tmp0_ = import_result_to_string (_result_); #line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = _tmp6_; + _tmp1_ = _tmp0_; #line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_warning ("BatchImport.vala:1405: Import failure %s: %s", _tmp4_, _tmp7_); + g_warning ("BatchImport.vala:1405: Import failure %s: %s", src_identifier, _tmp1_); #line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp7_); -#line 10567 "BatchImport.c" + _g_free0 (_tmp1_); +#line 11229 "BatchImport.c" } #line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = self->failed; -#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = job; -#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = file; -#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = src_identifier; -#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = dest_identifier; -#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = _result_; + _tmp2_ = self->failed; #line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = batch_import_result_new (_tmp9_, _tmp10_, _tmp11_, _tmp12_, NULL, _tmp13_); + _tmp3_ = batch_import_result_new (job, file, src_identifier, dest_identifier, NULL, _result_); #line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = _tmp14_; + _tmp4_ = _tmp3_; #line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), _tmp4_); #line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala" - _batch_import_result_unref0 (_tmp15_); -#line 10589 "BatchImport.c" + _batch_import_result_unref0 (_tmp4_); +#line 11241 "BatchImport.c" } -void background_import_job_report_error (BackgroundImportJob* self, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result) { +void +background_import_job_report_error (BackgroundImportJob* self, + BatchImportJob* job, + GFile* file, + const gchar* src_identifier, + const gchar* dest_identifier, + GError* err, + ImportResult default_result) +{ ImportResult _result_ = 0; - GError* _tmp0_; + const gchar* _tmp0_; ImportResult _tmp1_; - ImportResult _tmp2_; - const gchar* _tmp3_; - GError* _tmp4_; - const gchar* _tmp5_; - ImportResult _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - ImportResult _tmp9_; - gboolean _tmp10_; - GeeList* _tmp12_; - BatchImportJob* _tmp13_; - GFile* _tmp14_; - const gchar* _tmp15_; - const gchar* _tmp16_; - GError* _tmp17_; - ImportResult _tmp18_; - BatchImportResult* _tmp19_; - BatchImportResult* _tmp20_; + gchar* _tmp2_; + gchar* _tmp3_; + ImportResult _tmp4_; + GeeList* _tmp6_; + BatchImportResult* _tmp7_; + BatchImportResult* _tmp8_; #line 1411 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BACKGROUND_IMPORT_JOB (self)); #line 1411 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10629,79 +11277,59 @@ void background_import_job_report_error (BackgroundImportJob* self, BatchImportJ #line 1411 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (dest_identifier != NULL); #line 1413 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = err; -#line 1413 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = default_result; -#line 1413 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = import_result_convert_error (_tmp0_, _tmp1_); -#line 1413 "/home/jens/Source/shotwell/src/BatchImport.vala" - _result_ = _tmp2_; -#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = src_identifier; -#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = err; + _result_ = import_result_convert_error (err, default_result); #line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = _tmp4_->message; + _tmp0_ = err->message; #line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = _result_; + _tmp1_ = _result_; #line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = import_result_to_string (_tmp6_); + _tmp2_ = import_result_to_string (_tmp1_); #line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = _tmp7_; + _tmp3_ = _tmp2_; #line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_warning ("BatchImport.vala:1415: Import error %s: %s (%s)", _tmp3_, _tmp5_, _tmp8_); + g_warning ("BatchImport.vala:1415: Import error %s: %s (%s)", src_identifier, _tmp0_, _tmp3_); #line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp3_); #line 1417 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = _result_; + _tmp4_ = _result_; #line 1417 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = import_result_is_abort (_tmp9_); -#line 1417 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp10_) { -#line 10655 "BatchImport.c" - ImportResult _tmp11_; + if (import_result_is_abort (_tmp4_)) { +#line 11291 "BatchImport.c" + ImportResult _tmp5_; #line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = _result_; + _tmp5_ = _result_; #line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala" - background_import_job_abort (self, _tmp11_); -#line 10661 "BatchImport.c" + background_import_job_abort (self, _tmp5_); +#line 11297 "BatchImport.c" } #line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = self->failed; -#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = job; -#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = file; -#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = src_identifier; + _tmp6_ = self->failed; #line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = dest_identifier; + _tmp7_ = batch_import_result_new_from_error (job, file, src_identifier, dest_identifier, err, default_result); #line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = err; -#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = default_result; -#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = batch_import_result_new_from_error (_tmp13_, _tmp14_, _tmp15_, _tmp16_, _tmp17_, _tmp18_); -#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp20_ = _tmp19_; + _tmp8_ = _tmp7_; #line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), _tmp8_); #line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala" - _batch_import_result_unref0 (_tmp20_); -#line 10685 "BatchImport.c" + _batch_import_result_unref0 (_tmp8_); +#line 11309 "BatchImport.c" } -static void background_import_job_class_init (BackgroundImportJobClass * klass) { +static void +background_import_job_class_init (BackgroundImportJobClass * klass) +{ #line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala" background_import_job_parent_class = g_type_class_peek_parent (klass); #line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala" ((BackgroundJobClass *) klass)->finalize = background_import_job_finalize; -#line 10694 "BatchImport.c" +#line 11320 "BatchImport.c" } -static void background_import_job_instance_init (BackgroundImportJob * self) { +static void +background_import_job_instance_init (BackgroundImportJob * self) +{ GeeArrayList* _tmp0_; #line 1374 "/home/jens/Source/shotwell/src/BatchImport.vala" self->abort_flag = IMPORT_RESULT_SUCCESS; @@ -10709,11 +11337,13 @@ static void background_import_job_instance_init (BackgroundImportJob * self) { _tmp0_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL); #line 1375 "/home/jens/Source/shotwell/src/BatchImport.vala" self->failed = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList); -#line 10706 "BatchImport.c" +#line 11334 "BatchImport.c" } -static void background_import_job_finalize (BackgroundJob * obj) { +static void +background_import_job_finalize (BackgroundJob * obj) +{ BackgroundImportJob * self; #line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob); @@ -10721,11 +11351,13 @@ static void background_import_job_finalize (BackgroundJob * obj) { _g_object_unref0 (self->failed); #line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala" BACKGROUND_JOB_CLASS (background_import_job_parent_class)->finalize (obj); -#line 10718 "BatchImport.c" +#line 11348 "BatchImport.c" } -GType background_import_job_get_type (void) { +GType +background_import_job_get_type (void) +{ static volatile gsize background_import_job_type_id__volatile = 0; if (g_once_init_enter (&background_import_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (BackgroundImportJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) background_import_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (BackgroundImportJob), 0, (GInstanceInitFunc) background_import_job_instance_init, NULL }; @@ -10737,13 +11369,15 @@ GType background_import_job_get_type (void) { } -FileToPrepare* file_to_prepare_construct (GType object_type, BatchImportJob* job, GFile* file, gboolean copy_to_library) { +FileToPrepare* +file_to_prepare_construct (GType object_type, + BatchImportJob* job, + GFile* file, + gboolean copy_to_library) +{ FileToPrepare* self = NULL; BatchImportJob* _tmp0_; - BatchImportJob* _tmp1_; - GFile* _tmp2_; - GFile* _tmp3_; - gboolean _tmp4_; + GFile* _tmp1_; #line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), NULL); #line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10751,65 +11385,67 @@ FileToPrepare* file_to_prepare_construct (GType object_type, BatchImportJob* job #line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (FileToPrepare*) g_type_create_instance (object_type); #line 1432 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = job; -#line 1432 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = _batch_import_job_ref0 (_tmp0_); + _tmp0_ = _batch_import_job_ref0 (job); #line 1432 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (self->job); #line 1432 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->job = _tmp1_; -#line 1433 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = file; + self->job = _tmp0_; #line 1433 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (file); #line 1433 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->file); #line 1433 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->file = _tmp3_; + self->file = _tmp1_; #line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = copy_to_library; -#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->copy_to_library = _tmp4_; + self->copy_to_library = copy_to_library; #line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 10769 "BatchImport.c" +#line 11397 "BatchImport.c" } -FileToPrepare* file_to_prepare_new (BatchImportJob* job, GFile* file, gboolean copy_to_library) { +FileToPrepare* +file_to_prepare_new (BatchImportJob* job, + GFile* file, + gboolean copy_to_library) +{ #line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala" return file_to_prepare_construct (TYPE_FILE_TO_PREPARE, job, file, copy_to_library); -#line 10776 "BatchImport.c" +#line 11408 "BatchImport.c" } -static gpointer _file_to_prepare_ref0 (gpointer self) { +static gpointer +_file_to_prepare_ref0 (gpointer self) +{ #line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? file_to_prepare_ref (self) : NULL; -#line 10783 "BatchImport.c" +#line 11417 "BatchImport.c" } -void file_to_prepare_set_associated (FileToPrepare* self, FileToPrepare* a) { +void +file_to_prepare_set_associated (FileToPrepare* self, + FileToPrepare* a) +{ FileToPrepare* _tmp0_; - FileToPrepare* _tmp1_; #line 1437 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_FILE_TO_PREPARE (self)); #line 1437 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail ((a == NULL) || IS_FILE_TO_PREPARE (a)); #line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = a; -#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = _file_to_prepare_ref0 (_tmp0_); + _tmp0_ = _file_to_prepare_ref0 (a); #line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (self->associated); #line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->associated = _tmp1_; -#line 10802 "BatchImport.c" + self->associated = _tmp0_; +#line 11436 "BatchImport.c" } -gchar* file_to_prepare_get_parent_path (FileToPrepare* self) { +gchar* +file_to_prepare_get_parent_path (FileToPrepare* self) +{ gchar* result = NULL; gchar* _tmp0_ = NULL; GFile* _tmp1_; @@ -10819,7 +11455,7 @@ gchar* file_to_prepare_get_parent_path (FileToPrepare* self) { _tmp1_ = self->file; #line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp1_ != NULL) { -#line 10816 "BatchImport.c" +#line 11452 "BatchImport.c" GFile* _tmp2_; GFile* _tmp3_; GFile* _tmp4_; @@ -10838,7 +11474,7 @@ gchar* file_to_prepare_get_parent_path (FileToPrepare* self) { _tmp0_ = _tmp5_; #line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp4_); -#line 10835 "BatchImport.c" +#line 11471 "BatchImport.c" } else { BatchImportJob* _tmp6_; gchar* _tmp7_; @@ -10850,17 +11486,19 @@ gchar* file_to_prepare_get_parent_path (FileToPrepare* self) { _g_free0 (_tmp0_); #line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp7_; -#line 10847 "BatchImport.c" +#line 11483 "BatchImport.c" } #line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _tmp0_; #line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 10853 "BatchImport.c" +#line 11489 "BatchImport.c" } -gchar* file_to_prepare_get_path (FileToPrepare* self) { +gchar* +file_to_prepare_get_path (FileToPrepare* self) +{ gchar* result = NULL; gchar* _tmp0_ = NULL; GFile* _tmp1_; @@ -10870,7 +11508,7 @@ gchar* file_to_prepare_get_path (FileToPrepare* self) { _tmp1_ = self->file; #line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp1_ != NULL) { -#line 10867 "BatchImport.c" +#line 11505 "BatchImport.c" GFile* _tmp2_; gchar* _tmp3_; #line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10881,7 +11519,7 @@ gchar* file_to_prepare_get_path (FileToPrepare* self) { _g_free0 (_tmp0_); #line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp3_; -#line 10878 "BatchImport.c" +#line 11516 "BatchImport.c" } else { BatchImportJob* _tmp4_; gchar* _tmp5_; @@ -10928,17 +11566,19 @@ gchar* file_to_prepare_get_path (FileToPrepare* self) { _g_object_unref0 (_tmp8_); #line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp6_); -#line 10925 "BatchImport.c" +#line 11563 "BatchImport.c" } #line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _tmp0_; #line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 10931 "BatchImport.c" +#line 11569 "BatchImport.c" } -gchar* file_to_prepare_get_basename (FileToPrepare* self) { +gchar* +file_to_prepare_get_basename (FileToPrepare* self) +{ gchar* result = NULL; gchar* _tmp0_ = NULL; GFile* _tmp1_; @@ -10948,7 +11588,7 @@ gchar* file_to_prepare_get_basename (FileToPrepare* self) { _tmp1_ = self->file; #line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp1_ != NULL) { -#line 10945 "BatchImport.c" +#line 11585 "BatchImport.c" GFile* _tmp2_; gchar* _tmp3_; #line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10959,7 +11599,7 @@ gchar* file_to_prepare_get_basename (FileToPrepare* self) { _g_free0 (_tmp0_); #line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp3_; -#line 10956 "BatchImport.c" +#line 11596 "BatchImport.c" } else { BatchImportJob* _tmp4_; gchar* _tmp5_; @@ -10971,17 +11611,19 @@ gchar* file_to_prepare_get_basename (FileToPrepare* self) { _g_free0 (_tmp0_); #line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp5_; -#line 10968 "BatchImport.c" +#line 11608 "BatchImport.c" } #line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _tmp0_; #line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 10974 "BatchImport.c" +#line 11614 "BatchImport.c" } -gboolean file_to_prepare_is_directory (FileToPrepare* self) { +gboolean +file_to_prepare_is_directory (FileToPrepare* self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; GFile* _tmp1_; @@ -10991,133 +11633,152 @@ gboolean file_to_prepare_is_directory (FileToPrepare* self) { _tmp1_ = self->file; #line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp1_ != NULL) { -#line 10988 "BatchImport.c" +#line 11630 "BatchImport.c" GFile* _tmp2_; - GFileType _tmp3_; #line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = self->file; #line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = g_file_query_file_type (_tmp2_, G_FILE_QUERY_INFO_NONE, NULL); -#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = _tmp3_ == G_FILE_TYPE_DIRECTORY; -#line 10997 "BatchImport.c" + _tmp0_ = g_file_query_file_type (_tmp2_, G_FILE_QUERY_INFO_NONE, NULL) == G_FILE_TYPE_DIRECTORY; +#line 11636 "BatchImport.c" } else { - BatchImportJob* _tmp4_; - gboolean _tmp5_; -#line 1456 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = self->job; + BatchImportJob* _tmp3_; #line 1456 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = batch_import_job_is_directory (_tmp4_); + _tmp3_ = self->job; #line 1456 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = _tmp5_; -#line 11007 "BatchImport.c" + _tmp0_ = batch_import_job_is_directory (_tmp3_); +#line 11643 "BatchImport.c" } #line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _tmp0_; #line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 11013 "BatchImport.c" +#line 11649 "BatchImport.c" } -static void value_file_to_prepare_init (GValue* value) { +static void +value_file_to_prepare_init (GValue* value) +{ #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 11020 "BatchImport.c" +#line 11658 "BatchImport.c" } -static void value_file_to_prepare_free_value (GValue* value) { +static void +value_file_to_prepare_free_value (GValue* value) +{ #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" if (value->data[0].v_pointer) { #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" file_to_prepare_unref (value->data[0].v_pointer); -#line 11029 "BatchImport.c" +#line 11669 "BatchImport.c" } } -static void value_file_to_prepare_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_file_to_prepare_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" if (src_value->data[0].v_pointer) { #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = file_to_prepare_ref (src_value->data[0].v_pointer); -#line 11039 "BatchImport.c" +#line 11682 "BatchImport.c" } else { #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = NULL; -#line 11043 "BatchImport.c" +#line 11686 "BatchImport.c" } } -static gpointer value_file_to_prepare_peek_pointer (const GValue* value) { +static gpointer +value_file_to_prepare_peek_pointer (const GValue* value) +{ #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 11051 "BatchImport.c" +#line 11696 "BatchImport.c" } -static gchar* value_file_to_prepare_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_file_to_prepare_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" if (collect_values[0].v_pointer) { -#line 11058 "BatchImport.c" +#line 11708 "BatchImport.c" FileToPrepare * object; object = collect_values[0].v_pointer; #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" if (object->parent_instance.g_class == NULL) { #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 11065 "BatchImport.c" +#line 11715 "BatchImport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 11069 "BatchImport.c" +#line 11719 "BatchImport.c" } #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = file_to_prepare_ref (object); -#line 11073 "BatchImport.c" +#line 11723 "BatchImport.c" } else { #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 11077 "BatchImport.c" +#line 11727 "BatchImport.c" } #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 11081 "BatchImport.c" +#line 11731 "BatchImport.c" } -static gchar* value_file_to_prepare_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_file_to_prepare_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ FileToPrepare ** object_p; object_p = collect_values[0].v_pointer; #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!object_p) { #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 11092 "BatchImport.c" +#line 11747 "BatchImport.c" } #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!value->data[0].v_pointer) { #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = NULL; -#line 11098 "BatchImport.c" +#line 11753 "BatchImport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = value->data[0].v_pointer; -#line 11102 "BatchImport.c" +#line 11757 "BatchImport.c" } else { #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = file_to_prepare_ref (value->data[0].v_pointer); -#line 11106 "BatchImport.c" +#line 11761 "BatchImport.c" } #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 11110 "BatchImport.c" +#line 11765 "BatchImport.c" } -GParamSpec* param_spec_file_to_prepare (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_file_to_prepare (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecFileToPrepare* spec; #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_FILE_TO_PREPARE), NULL); @@ -11127,20 +11788,25 @@ GParamSpec* param_spec_file_to_prepare (const gchar* name, const gchar* nick, co G_PARAM_SPEC (spec)->value_type = object_type; #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" return G_PARAM_SPEC (spec); -#line 11124 "BatchImport.c" +#line 11785 "BatchImport.c" } -gpointer value_get_file_to_prepare (const GValue* value) { +gpointer +value_get_file_to_prepare (const GValue* value) +{ #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_FILE_TO_PREPARE), NULL); #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 11133 "BatchImport.c" +#line 11796 "BatchImport.c" } -void value_set_file_to_prepare (GValue* value, gpointer v_object) { +void +value_set_file_to_prepare (GValue* value, + gpointer v_object) +{ FileToPrepare * old; #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_FILE_TO_PREPARE)); @@ -11156,22 +11822,25 @@ void value_set_file_to_prepare (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" file_to_prepare_ref (value->data[0].v_pointer); -#line 11153 "BatchImport.c" +#line 11819 "BatchImport.c" } else { #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 11157 "BatchImport.c" +#line 11823 "BatchImport.c" } #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" file_to_prepare_unref (old); -#line 11163 "BatchImport.c" +#line 11829 "BatchImport.c" } } -void value_take_file_to_prepare (GValue* value, gpointer v_object) { +void +value_take_file_to_prepare (GValue* value, + gpointer v_object) +{ FileToPrepare * old; #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_FILE_TO_PREPARE)); @@ -11185,40 +11854,46 @@ void value_take_file_to_prepare (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = v_object; -#line 11182 "BatchImport.c" +#line 11851 "BatchImport.c" } else { #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 11186 "BatchImport.c" +#line 11855 "BatchImport.c" } #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" file_to_prepare_unref (old); -#line 11192 "BatchImport.c" +#line 11861 "BatchImport.c" } } -static void file_to_prepare_class_init (FileToPrepareClass * klass) { +static void +file_to_prepare_class_init (FileToPrepareClass * klass) +{ #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" file_to_prepare_parent_class = g_type_class_peek_parent (klass); #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" ((FileToPrepareClass *) klass)->finalize = file_to_prepare_finalize; -#line 11202 "BatchImport.c" +#line 11873 "BatchImport.c" } -static void file_to_prepare_instance_init (FileToPrepare * self) { +static void +file_to_prepare_instance_init (FileToPrepare * self) +{ #line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" self->associated = NULL; #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" self->ref_count = 1; -#line 11211 "BatchImport.c" +#line 11884 "BatchImport.c" } -static void file_to_prepare_finalize (FileToPrepare * obj) { +static void +file_to_prepare_finalize (FileToPrepare * obj) +{ FileToPrepare * self; #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FILE_TO_PREPARE, FileToPrepare); @@ -11230,11 +11905,13 @@ static void file_to_prepare_finalize (FileToPrepare * obj) { _g_object_unref0 (self->file); #line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (self->associated); -#line 11227 "BatchImport.c" +#line 11902 "BatchImport.c" } -GType file_to_prepare_get_type (void) { +GType +file_to_prepare_get_type (void) +{ static volatile gsize file_to_prepare_type_id__volatile = 0; if (g_once_init_enter (&file_to_prepare_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_file_to_prepare_init, value_file_to_prepare_free_value, value_file_to_prepare_copy_value, value_file_to_prepare_peek_pointer, "p", value_file_to_prepare_collect_value, "p", value_file_to_prepare_lcopy_value }; @@ -11248,18 +11925,22 @@ GType file_to_prepare_get_type (void) { } -gpointer file_to_prepare_ref (gpointer instance) { +gpointer +file_to_prepare_ref (gpointer instance) +{ FileToPrepare * self; self = instance; #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" g_atomic_int_inc (&self->ref_count); #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" return instance; -#line 11252 "BatchImport.c" +#line 11931 "BatchImport.c" } -void file_to_prepare_unref (gpointer instance) { +void +file_to_prepare_unref (gpointer instance) +{ FileToPrepare * self; self = instance; #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -11268,23 +11949,25 @@ void file_to_prepare_unref (gpointer instance) { FILE_TO_PREPARE_GET_CLASS (self)->finalize (self); #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 11265 "BatchImport.c" +#line 11946 "BatchImport.c" } } -WorkSniffer* work_sniffer_construct (GType object_type, BatchImport* owner, GeeIterable* jobs, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, GeeHashSet* skipset) { +WorkSniffer* +work_sniffer_construct (GType object_type, + BatchImport* owner, + GeeIterable* jobs, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target, + GeeHashSet* skipset) +{ WorkSniffer* self = NULL; - BatchImport* _tmp0_; - CompletionCallback _tmp1_; - void* _tmp1__target; - GCancellable* _tmp2_; - CancellationCallback _tmp3_; - void* _tmp3__target; - GeeIterable* _tmp4_; - GeeIterable* _tmp5_; - GeeHashSet* _tmp6_; - GeeHashSet* _tmp7_; + GeeIterable* _tmp0_; + GeeHashSet* _tmp1_; #line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL); #line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -11294,89 +11977,77 @@ WorkSniffer* work_sniffer_construct (GType object_type, BatchImport* owner, GeeI #line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail ((skipset == NULL) || GEE_IS_HASH_SET (skipset), NULL); #line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = owner; -#line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = callback; -#line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1__target = callback_target; -#line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = cancellable; -#line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = cancellation; -#line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3__target = cancellation_target; -#line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala" - self = (WorkSniffer*) background_import_job_construct (object_type, _tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target); -#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = jobs; + self = (WorkSniffer*) background_import_job_construct (object_type, owner, callback, callback_target, cancellable, cancellation, cancellation_target); #line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp0_ = _g_object_ref0 (jobs); #line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->jobs); #line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->jobs = _tmp5_; + self->priv->jobs = _tmp0_; #line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = skipset; -#line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = _g_object_ref0 (_tmp6_); + _tmp1_ = _g_object_ref0 (skipset); #line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->skipset); #line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->skipset = _tmp7_; + self->priv->skipset = _tmp1_; #line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 11322 "BatchImport.c" +#line 11989 "BatchImport.c" } -WorkSniffer* work_sniffer_new (BatchImport* owner, GeeIterable* jobs, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, GeeHashSet* skipset) { +WorkSniffer* +work_sniffer_new (BatchImport* owner, + GeeIterable* jobs, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target, + GeeHashSet* skipset) +{ #line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala" return work_sniffer_construct (TYPE_WORK_SNIFFER, owner, jobs, callback, callback_target, cancellable, cancellation, cancellation_target, skipset); -#line 11329 "BatchImport.c" +#line 12005 "BatchImport.c" } -static gint __lambda11_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b) { +static gint +__lambda11_ (WorkSniffer* self, + FileToPrepare* a, + FileToPrepare* b) +{ gint result = 0; FileToPrepare* file_a = NULL; FileToPrepare* _tmp0_; - FileToPrepare* _tmp1_; FileToPrepare* file_b = NULL; - FileToPrepare* _tmp2_; - FileToPrepare* _tmp3_; + FileToPrepare* _tmp1_; gchar* sa = NULL; - gchar* _tmp4_; + gchar* _tmp2_; gchar* sb = NULL; - gchar* _tmp5_; - gint _tmp6_; + gchar* _tmp3_; #line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_FILE_TO_PREPARE (a), 0); #line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_FILE_TO_PREPARE (b), 0); #line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = a; + _tmp0_ = _file_to_prepare_ref0 (G_TYPE_CHECK_INSTANCE_CAST (a, TYPE_FILE_TO_PREPARE, FileToPrepare)); #line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = _file_to_prepare_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_FILE_TO_PREPARE, FileToPrepare)); -#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" - file_a = _tmp1_; -#line 1509 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = b; + file_a = _tmp0_; #line 1509 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = _file_to_prepare_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_FILE_TO_PREPARE, FileToPrepare)); + _tmp1_ = _file_to_prepare_ref0 (G_TYPE_CHECK_INSTANCE_CAST (b, TYPE_FILE_TO_PREPARE, FileToPrepare)); #line 1509 "/home/jens/Source/shotwell/src/BatchImport.vala" - file_b = _tmp3_; + file_b = _tmp1_; #line 1510 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = file_to_prepare_get_path (file_a); + _tmp2_ = file_to_prepare_get_path (file_a); #line 1510 "/home/jens/Source/shotwell/src/BatchImport.vala" - sa = _tmp4_; + sa = _tmp2_; #line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = file_to_prepare_get_path (file_b); + _tmp3_ = file_to_prepare_get_path (file_b); #line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala" - sb = _tmp5_; + sb = _tmp3_; #line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = utf8_cs_compare (sa, sb); -#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp6_; + result = utf8_cs_compare (sa, sb); #line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (sb); #line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -11387,28 +12058,34 @@ static gint __lambda11_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b) _file_to_prepare_unref0 (file_a); #line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 11384 "BatchImport.c" +#line 12055 "BatchImport.c" } -static gint ___lambda11__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gint +___lambda11__gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gint result; result = __lambda11_ ((WorkSniffer*) self, (FileToPrepare*) a, (FileToPrepare*) b); #line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 11393 "BatchImport.c" +#line 12068 "BatchImport.c" } -static void work_sniffer_real_execute (BackgroundJob* base) { +static void +work_sniffer_real_execute (BackgroundJob* base) +{ WorkSniffer * self; GeeList* sorted = NULL; - GeeArrayList* _tmp26_; - GeeList* _tmp42_; + GeeArrayList* _tmp23_; + GeeList* _tmp38_; GError * _inner_error_ = NULL; #line 1475 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_WORK_SNIFFER, WorkSniffer); -#line 11405 "BatchImport.c" +#line 12082 "BatchImport.c" { GeeIterator* _job_it = NULL; GeeIterable* _tmp0_; @@ -11421,86 +12098,79 @@ static void work_sniffer_real_execute (BackgroundJob* base) { _job_it = _tmp1_; #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 11418 "BatchImport.c" +#line 12095 "BatchImport.c" GeeIterator* _tmp2_; - gboolean _tmp3_; BatchImportJob* job = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp3_; + gpointer _tmp4_; ImportResult _result_ = 0; - ImportResult _tmp6_; - ImportResult _tmp7_; - gboolean _tmp25_; + ImportResult _tmp5_; #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = _job_it; #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 11436 "BatchImport.c" +#line 12108 "BatchImport.c" } #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = _job_it; + _tmp3_ = _job_it; #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" - job = (BatchImportJob*) _tmp5_; + job = (BatchImportJob*) _tmp4_; #line 1480 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob)); -#line 1480 "/home/jens/Source/shotwell/src/BatchImport.vala" - _result_ = _tmp6_; + _result_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob)); #line 1481 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = _result_; + _tmp5_ = _result_; #line 1481 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp7_ != IMPORT_RESULT_SUCCESS) { -#line 11452 "BatchImport.c" - BatchImportJob* _tmp8_; - BatchImportJob* _tmp9_; - gchar* _tmp10_; + if (_tmp5_ != IMPORT_RESULT_SUCCESS) { +#line 12122 "BatchImport.c" + BatchImportJob* _tmp6_; + BatchImportJob* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + BatchImportJob* _tmp10_; gchar* _tmp11_; - BatchImportJob* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; - ImportResult _tmp15_; + gchar* _tmp12_; + ImportResult _tmp13_; #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = job; + _tmp6_ = job; #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = job; + _tmp7_ = job; #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = batch_import_job_get_source_identifier (_tmp9_); + _tmp8_ = batch_import_job_get_source_identifier (_tmp7_); #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = job; + _tmp10_ = job; #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = batch_import_job_get_dest_identifier (_tmp12_); + _tmp11_ = batch_import_job_get_dest_identifier (_tmp10_); #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = _result_; + _tmp13_ = _result_; #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala" - background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp8_, NULL, _tmp11_, _tmp14_, _tmp15_); + background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp6_, NULL, _tmp9_, _tmp12_, _tmp13_); #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp14_); + _g_free0 (_tmp12_); #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp9_); #line 1485 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (job); #line 1485 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 11487 "BatchImport.c" +#line 12157 "BatchImport.c" } { - BatchImportJob* _tmp16_; + BatchImportJob* _tmp14_; #line 1489 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = job; + _tmp14_ = job; #line 1489 "/home/jens/Source/shotwell/src/BatchImport.vala" - work_sniffer_sniff_job (self, _tmp16_, &_inner_error_); + work_sniffer_sniff_job (self, _tmp14_, &_inner_error_); #line 1489 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 11497 "BatchImport.c" +#line 12167 "BatchImport.c" goto __catch426_g_error; } } @@ -11508,43 +12178,43 @@ static void work_sniffer_real_execute (BackgroundJob* base) { __catch426_g_error: { GError* err = NULL; - BatchImportJob* _tmp17_; - BatchImportJob* _tmp18_; - gchar* _tmp19_; + BatchImportJob* _tmp15_; + BatchImportJob* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + BatchImportJob* _tmp19_; gchar* _tmp20_; - BatchImportJob* _tmp21_; - gchar* _tmp22_; - gchar* _tmp23_; - GError* _tmp24_; + gchar* _tmp21_; + GError* _tmp22_; #line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; #line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = job; + _tmp15_ = job; #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = job; + _tmp16_ = job; #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = batch_import_job_get_source_identifier (_tmp18_); + _tmp17_ = batch_import_job_get_source_identifier (_tmp16_); #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp20_ = _tmp19_; + _tmp18_ = _tmp17_; #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp21_ = job; + _tmp19_ = job; #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp22_ = batch_import_job_get_dest_identifier (_tmp21_); + _tmp20_ = batch_import_job_get_dest_identifier (_tmp19_); #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp23_ = _tmp22_; + _tmp21_ = _tmp20_; #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp24_ = err; + _tmp22_ = err; #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala" - background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp17_, NULL, _tmp20_, _tmp23_, _tmp24_, IMPORT_RESULT_FILE_ERROR); + background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp15_, NULL, _tmp18_, _tmp21_, _tmp22_, IMPORT_RESULT_FILE_ERROR); #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp23_); + _g_free0 (_tmp21_); #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp18_); #line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 11541 "BatchImport.c" +#line 12211 "BatchImport.c" } __finally426: #line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -11559,212 +12229,203 @@ static void work_sniffer_real_execute (BackgroundJob* base) { g_clear_error (&_inner_error_); #line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 11556 "BatchImport.c" +#line 12226 "BatchImport.c" } #line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp25_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob)); -#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp25_) { + if (background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob))) { #line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (job); #line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 11566 "BatchImport.c" +#line 12234 "BatchImport.c" } #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (job); -#line 11570 "BatchImport.c" +#line 12238 "BatchImport.c" } #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_job_it); -#line 11574 "BatchImport.c" +#line 12242 "BatchImport.c" } #line 1502 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp26_ = gee_array_list_new (TYPE_FILE_TO_PREPARE, (GBoxedCopyFunc) file_to_prepare_ref, (GDestroyNotify) file_to_prepare_unref, NULL, NULL, NULL); + _tmp23_ = gee_array_list_new (TYPE_FILE_TO_PREPARE, (GBoxedCopyFunc) file_to_prepare_ref, (GDestroyNotify) file_to_prepare_unref, NULL, NULL, NULL); #line 1502 "/home/jens/Source/shotwell/src/BatchImport.vala" - sorted = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_LIST, GeeList); -#line 11580 "BatchImport.c" + sorted = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_LIST, GeeList); +#line 12248 "BatchImport.c" { GeeList* _ftp_list = NULL; - GeeList* _tmp27_; - GeeList* _tmp28_; + GeeList* _tmp24_; + GeeList* _tmp25_; gint _ftp_size = 0; - GeeList* _tmp29_; - gint _tmp30_; - gint _tmp31_; + GeeList* _tmp26_; + gint _tmp27_; + gint _tmp28_; gint _ftp_index = 0; #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp27_ = self->files_to_prepare; + _tmp24_ = self->files_to_prepare; #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp28_ = _g_object_ref0 (_tmp27_); + _tmp25_ = _g_object_ref0 (_tmp24_); #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _ftp_list = _tmp28_; + _ftp_list = _tmp25_; #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp29_ = _ftp_list; + _tmp26_ = _ftp_list; #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp30_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp27_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp31_ = _tmp30_; + _tmp28_ = _tmp27_; #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _ftp_size = _tmp31_; + _ftp_size = _tmp28_; #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" _ftp_index = -1; #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 11608 "BatchImport.c" - gint _tmp32_; - gint _tmp33_; - gint _tmp34_; +#line 12276 "BatchImport.c" + gint _tmp29_; + gint _tmp30_; + gint _tmp31_; FileToPrepare* ftp = NULL; - GeeList* _tmp35_; - gint _tmp36_; - gpointer _tmp37_; - FileToPrepare* _tmp38_; - gboolean _tmp39_; + GeeList* _tmp32_; + gint _tmp33_; + gpointer _tmp34_; + FileToPrepare* _tmp35_; #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp32_ = _ftp_index; + _tmp29_ = _ftp_index; #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _ftp_index = _tmp32_ + 1; + _ftp_index = _tmp29_ + 1; #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp33_ = _ftp_index; + _tmp30_ = _ftp_index; #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp34_ = _ftp_size; + _tmp31_ = _ftp_size; #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!(_tmp33_ < _tmp34_)) { + if (!(_tmp30_ < _tmp31_)) { #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 11630 "BatchImport.c" +#line 12297 "BatchImport.c" } #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp35_ = _ftp_list; + _tmp32_ = _ftp_list; #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp36_ = _ftp_index; + _tmp33_ = _ftp_index; #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp37_ = gee_list_get (_tmp35_, _tmp36_); + _tmp34_ = gee_list_get (_tmp32_, _tmp33_); #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" - ftp = (FileToPrepare*) _tmp37_; + ftp = (FileToPrepare*) _tmp34_; #line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp38_ = ftp; + _tmp35_ = ftp; #line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp39_ = file_to_prepare_is_directory (_tmp38_); -#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!_tmp39_) { -#line 11646 "BatchImport.c" - GeeList* _tmp40_; - FileToPrepare* _tmp41_; + if (!file_to_prepare_is_directory (_tmp35_)) { +#line 12311 "BatchImport.c" + GeeList* _tmp36_; + FileToPrepare* _tmp37_; #line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp40_ = sorted; + _tmp36_ = sorted; #line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp41_ = ftp; + _tmp37_ = ftp; #line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_COLLECTION, GeeCollection), _tmp41_); -#line 11655 "BatchImport.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_); +#line 12320 "BatchImport.c" } #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (ftp); -#line 11659 "BatchImport.c" +#line 12324 "BatchImport.c" } #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_ftp_list); -#line 11663 "BatchImport.c" +#line 12328 "BatchImport.c" } #line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp42_ = sorted; + _tmp38_ = sorted; #line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_list_sort (_tmp42_, ___lambda11__gcompare_data_func, background_job_ref (self), background_job_unref); -#line 11669 "BatchImport.c" + gee_list_sort (_tmp38_, ___lambda11__gcompare_data_func, background_job_ref (self), background_job_unref); +#line 12334 "BatchImport.c" { gint i = 0; #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala" i = 0; -#line 11674 "BatchImport.c" +#line 12339 "BatchImport.c" { - gboolean _tmp43_ = FALSE; + gboolean _tmp39_ = FALSE; #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp43_ = TRUE; + _tmp39_ = TRUE; #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 11681 "BatchImport.c" - gint _tmp45_; - GeeList* _tmp46_; - gint _tmp47_; - gint _tmp48_; +#line 12346 "BatchImport.c" + gint _tmp41_; + GeeList* _tmp42_; + gint _tmp43_; + gint _tmp44_; gchar* name = NULL; gchar* ext = NULL; FileToPrepare* ftp = NULL; - GeeList* _tmp49_; - gint _tmp50_; - gpointer _tmp51_; - FileToPrepare* _tmp52_; - gchar* _tmp53_; - gchar* _tmp54_; - gchar* _tmp55_ = NULL; - gchar* _tmp56_ = NULL; - const gchar* _tmp57_; - gboolean _tmp58_; - RawFileFormatProperties* _tmp59_; - RawFileFormatProperties* _tmp60_; - const gchar* _tmp61_; - gboolean _tmp62_; - gboolean _tmp63_; + GeeList* _tmp45_; + gint _tmp46_; + gpointer _tmp47_; + FileToPrepare* _tmp48_; + gchar* _tmp49_; + gchar* _tmp50_; + gchar* _tmp51_ = NULL; + gchar* _tmp52_ = NULL; + const gchar* _tmp53_; + RawFileFormatProperties* _tmp54_; + RawFileFormatProperties* _tmp55_; + const gchar* _tmp56_; + gboolean _tmp57_; #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!_tmp43_) { -#line 11706 "BatchImport.c" - gint _tmp44_; + if (!_tmp39_) { +#line 12369 "BatchImport.c" + gint _tmp40_; #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp44_ = i; + _tmp40_ = i; #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala" - i = _tmp44_ + 1; -#line 11712 "BatchImport.c" + i = _tmp40_ + 1; +#line 12375 "BatchImport.c" } #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp43_ = FALSE; + _tmp39_ = FALSE; #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp45_ = i; + _tmp41_ = i; #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp46_ = sorted; + _tmp42_ = sorted; #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp47_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp43_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp48_ = _tmp47_; + _tmp44_ = _tmp43_; #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!(_tmp45_ < _tmp48_)) { + if (!(_tmp41_ < _tmp44_)) { #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 11728 "BatchImport.c" +#line 12391 "BatchImport.c" } #line 1519 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp49_ = sorted; + _tmp45_ = sorted; #line 1519 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp50_ = i; + _tmp46_ = i; #line 1519 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp51_ = gee_list_get (_tmp49_, _tmp50_); + _tmp47_ = gee_list_get (_tmp45_, _tmp46_); #line 1519 "/home/jens/Source/shotwell/src/BatchImport.vala" - ftp = (FileToPrepare*) _tmp51_; + ftp = (FileToPrepare*) _tmp47_; #line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp52_ = ftp; + _tmp48_ = ftp; #line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp53_ = file_to_prepare_get_basename (_tmp52_); + _tmp49_ = file_to_prepare_get_basename (_tmp48_); #line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp54_ = _tmp53_; + _tmp50_ = _tmp49_; #line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala" - disassemble_filename (_tmp54_, &_tmp55_, &_tmp56_); + disassemble_filename (_tmp50_, &_tmp51_, &_tmp52_); #line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (name); #line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala" - name = _tmp55_; + name = _tmp51_; #line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (ext); #line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala" - ext = _tmp56_; + ext = _tmp52_; #line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp54_); -#line 1522 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp57_ = ext; + _g_free0 (_tmp50_); #line 1522 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp58_ = is_string_empty (_tmp57_); + _tmp53_ = ext; #line 1522 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp58_) { + if (is_string_empty (_tmp53_)) { #line 1523 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (ftp); #line 1523 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -11773,171 +12434,163 @@ static void work_sniffer_real_execute (BackgroundJob* base) { _g_free0 (name); #line 1523 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 11770 "BatchImport.c" +#line 12431 "BatchImport.c" } #line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp59_ = raw_file_format_properties_get_instance (); -#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp60_ = _tmp59_; + _tmp54_ = raw_file_format_properties_get_instance (); #line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp61_ = ext; + _tmp55_ = _tmp54_; #line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp62_ = photo_file_format_properties_is_recognized_extension (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties), _tmp61_); + _tmp56_ = ext; #line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp63_ = _tmp62_; + _tmp57_ = photo_file_format_properties_is_recognized_extension (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties), _tmp56_); #line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala" - _photo_file_format_properties_unref0 (_tmp60_); + _photo_file_format_properties_unref0 (_tmp55_); #line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp63_) { -#line 11786 "BatchImport.c" - gboolean _tmp64_ = FALSE; - gint _tmp65_; + if (_tmp57_) { +#line 12445 "BatchImport.c" + gboolean _tmp58_ = FALSE; + gint _tmp59_; #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp65_ = i; + _tmp59_ = i; #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp65_ > 0) { -#line 11793 "BatchImport.c" - FileToPrepare* _tmp66_; - GeeList* _tmp67_; - gint _tmp68_; - gpointer _tmp69_; - FileToPrepare* _tmp70_; - gboolean _tmp71_; -#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp66_ = ftp; + if (_tmp59_ > 0) { +#line 12452 "BatchImport.c" + FileToPrepare* _tmp60_; + GeeList* _tmp61_; + gint _tmp62_; + gpointer _tmp63_; + FileToPrepare* _tmp64_; #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp67_ = sorted; + _tmp60_ = ftp; #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp68_ = i; + _tmp61_ = sorted; #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp69_ = gee_list_get (_tmp67_, _tmp68_ - 1); + _tmp62_ = i; #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp70_ = (FileToPrepare*) _tmp69_; + _tmp63_ = gee_list_get (_tmp61_, _tmp62_ - 1); #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp71_ = work_sniffer_is_paired (self, _tmp66_, _tmp70_); + _tmp64_ = (FileToPrepare*) _tmp63_; #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp64_ = _tmp71_; + _tmp58_ = work_sniffer_is_paired (self, _tmp60_, _tmp64_); #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" - _file_to_prepare_unref0 (_tmp70_); -#line 11816 "BatchImport.c" + _file_to_prepare_unref0 (_tmp64_); +#line 12472 "BatchImport.c" } else { #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp64_ = FALSE; -#line 11820 "BatchImport.c" + _tmp58_ = FALSE; +#line 12476 "BatchImport.c" } #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp64_) { -#line 11824 "BatchImport.c" + if (_tmp58_) { +#line 12480 "BatchImport.c" FileToPrepare* associated_file = NULL; - GeeList* _tmp72_; - gint _tmp73_; - gpointer _tmp74_; - GeeList* _tmp75_; - FileToPrepare* _tmp76_; - FileToPrepare* _tmp77_; - FileToPrepare* _tmp78_; + GeeList* _tmp65_; + gint _tmp66_; + gpointer _tmp67_; + GeeList* _tmp68_; + FileToPrepare* _tmp69_; + FileToPrepare* _tmp70_; + FileToPrepare* _tmp71_; #line 1529 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp72_ = sorted; + _tmp65_ = sorted; #line 1529 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp73_ = i; + _tmp66_ = i; #line 1529 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp74_ = gee_list_get (_tmp72_, _tmp73_ - 1); + _tmp67_ = gee_list_get (_tmp65_, _tmp66_ - 1); #line 1529 "/home/jens/Source/shotwell/src/BatchImport.vala" - associated_file = (FileToPrepare*) _tmp74_; + associated_file = (FileToPrepare*) _tmp67_; #line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp75_ = self->files_to_prepare; + _tmp68_ = self->files_to_prepare; #line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp76_ = associated_file; + _tmp69_ = associated_file; #line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_COLLECTION, GeeCollection), _tmp76_); + gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_COLLECTION, GeeCollection), _tmp69_); #line 1531 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp77_ = ftp; + _tmp70_ = ftp; #line 1531 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp78_ = associated_file; + _tmp71_ = associated_file; #line 1531 "/home/jens/Source/shotwell/src/BatchImport.vala" - file_to_prepare_set_associated (_tmp77_, _tmp78_); + file_to_prepare_set_associated (_tmp70_, _tmp71_); #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (associated_file); -#line 11855 "BatchImport.c" +#line 12511 "BatchImport.c" } else { - gboolean _tmp79_ = FALSE; - gint _tmp80_; - GeeList* _tmp81_; - gint _tmp82_; - gint _tmp83_; -#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp80_ = i; + gboolean _tmp72_ = FALSE; + gint _tmp73_; + GeeList* _tmp74_; + gint _tmp75_; + gint _tmp76_; #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp81_ = sorted; + _tmp73_ = i; #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp82_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp74_ = sorted; #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp83_ = _tmp82_; + _tmp75_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp80_ < (_tmp83_ - 1)) { -#line 11872 "BatchImport.c" - FileToPrepare* _tmp84_; - GeeList* _tmp85_; - gint _tmp86_; - gpointer _tmp87_; - FileToPrepare* _tmp88_; - gboolean _tmp89_; + _tmp76_ = _tmp75_; #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp84_ = ftp; + if (_tmp73_ < (_tmp76_ - 1)) { +#line 12528 "BatchImport.c" + FileToPrepare* _tmp77_; + GeeList* _tmp78_; + gint _tmp79_; + gpointer _tmp80_; + FileToPrepare* _tmp81_; #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp85_ = sorted; + _tmp77_ = ftp; #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp86_ = i; + _tmp78_ = sorted; #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp87_ = gee_list_get (_tmp85_, _tmp86_ + 1); + _tmp79_ = i; #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp88_ = (FileToPrepare*) _tmp87_; + _tmp80_ = gee_list_get (_tmp78_, _tmp79_ + 1); #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp89_ = work_sniffer_is_paired (self, _tmp84_, _tmp88_); + _tmp81_ = (FileToPrepare*) _tmp80_; #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp79_ = _tmp89_; + _tmp72_ = work_sniffer_is_paired (self, _tmp77_, _tmp81_); #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" - _file_to_prepare_unref0 (_tmp88_); -#line 11895 "BatchImport.c" + _file_to_prepare_unref0 (_tmp81_); +#line 12548 "BatchImport.c" } else { #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp79_ = FALSE; -#line 11899 "BatchImport.c" + _tmp72_ = FALSE; +#line 12552 "BatchImport.c" } #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp79_) { -#line 11903 "BatchImport.c" + if (_tmp72_) { +#line 12556 "BatchImport.c" FileToPrepare* associated_file = NULL; - GeeList* _tmp90_; - gint _tmp91_; - gpointer _tmp92_; - GeeList* _tmp93_; - FileToPrepare* _tmp94_; - FileToPrepare* _tmp95_; - FileToPrepare* _tmp96_; + GeeList* _tmp82_; + gint _tmp83_; + gpointer _tmp84_; + GeeList* _tmp85_; + FileToPrepare* _tmp86_; + FileToPrepare* _tmp87_; + FileToPrepare* _tmp88_; #line 1533 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp90_ = sorted; + _tmp82_ = sorted; #line 1533 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp91_ = i; + _tmp83_ = i; #line 1533 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp92_ = gee_list_get (_tmp90_, _tmp91_ + 1); + _tmp84_ = gee_list_get (_tmp82_, _tmp83_ + 1); #line 1533 "/home/jens/Source/shotwell/src/BatchImport.vala" - associated_file = (FileToPrepare*) _tmp92_; + associated_file = (FileToPrepare*) _tmp84_; #line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp93_ = self->files_to_prepare; + _tmp85_ = self->files_to_prepare; #line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp94_ = associated_file; + _tmp86_ = associated_file; #line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, GEE_TYPE_COLLECTION, GeeCollection), _tmp94_); + gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_COLLECTION, GeeCollection), _tmp86_); #line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp95_ = ftp; + _tmp87_ = ftp; #line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp96_ = associated_file; + _tmp88_ = associated_file; #line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala" - file_to_prepare_set_associated (_tmp95_, _tmp96_); + file_to_prepare_set_associated (_tmp87_, _tmp88_); #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (associated_file); -#line 11934 "BatchImport.c" +#line 12587 "BatchImport.c" } } } @@ -11947,46 +12600,45 @@ static void work_sniffer_real_execute (BackgroundJob* base) { _g_free0 (ext); #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (name); -#line 11944 "BatchImport.c" +#line 12597 "BatchImport.c" } } } #line 1475 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (sorted); -#line 11950 "BatchImport.c" +#line 12603 "BatchImport.c" } -static gboolean work_sniffer_is_paired (WorkSniffer* self, FileToPrepare* raw, FileToPrepare* maybe_paired) { +static gboolean +work_sniffer_is_paired (WorkSniffer* self, + FileToPrepare* raw, + FileToPrepare* maybe_paired) +{ gboolean result = FALSE; - FileToPrepare* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; - FileToPrepare* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - gboolean _tmp6_; + gchar* _tmp3_; + gboolean _tmp4_; gchar* name = NULL; gchar* ext = NULL; gchar* test_name = NULL; gchar* test_ext = NULL; - FileToPrepare* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - JfifFileFormatProperties* _tmp12_; - JfifFileFormatProperties* _tmp13_; - const gchar* _tmp14_; - gboolean _tmp15_; - gboolean _tmp16_; - FileToPrepare* _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - const gchar* _tmp22_; - const gchar* _tmp23_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_ = NULL; + gchar* _tmp8_ = NULL; + JfifFileFormatProperties* _tmp9_; + JfifFileFormatProperties* _tmp10_; + const gchar* _tmp11_; + gboolean _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_ = NULL; + gchar* _tmp16_ = NULL; + const gchar* _tmp17_; + const gchar* _tmp18_; #line 1544 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_WORK_SNIFFER (self), FALSE); #line 1544 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -11994,63 +12646,55 @@ static gboolean work_sniffer_is_paired (WorkSniffer* self, FileToPrepare* raw, F #line 1544 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_FILE_TO_PREPARE (maybe_paired), FALSE); #line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = raw; -#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = file_to_prepare_get_parent_path (_tmp0_); -#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = _tmp1_; + _tmp0_ = file_to_prepare_get_parent_path (raw); #line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = maybe_paired; + _tmp1_ = _tmp0_; #line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = file_to_prepare_get_parent_path (_tmp3_); + _tmp2_ = file_to_prepare_get_parent_path (maybe_paired); #line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = g_strcmp0 (_tmp2_, _tmp5_) != 0; + _tmp4_ = g_strcmp0 (_tmp1_, _tmp3_) != 0; #line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp3_); #line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp6_) { + if (_tmp4_) { #line 1546 "/home/jens/Source/shotwell/src/BatchImport.vala" result = FALSE; #line 1546 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 12014 "BatchImport.c" +#line 12662 "BatchImport.c" } #line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = maybe_paired; -#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = file_to_prepare_get_basename (_tmp7_); + _tmp5_ = file_to_prepare_get_basename (maybe_paired); #line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala" - disassemble_filename (_tmp9_, &_tmp10_, &_tmp11_); + disassemble_filename (_tmp6_, &_tmp7_, &_tmp8_); #line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (test_name); #line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala" - test_name = _tmp10_; + test_name = _tmp7_; #line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (test_ext); #line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala" - test_ext = _tmp11_; + test_ext = _tmp8_; #line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp9_); -#line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = jfif_file_format_properties_get_instance (); + _g_free0 (_tmp6_); #line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = _tmp12_; + _tmp9_ = jfif_file_format_properties_get_instance (); #line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = test_ext; + _tmp10_ = _tmp9_; #line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = photo_file_format_properties_is_recognized_extension (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties), _tmp14_); + _tmp11_ = test_ext; #line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = !_tmp15_; + _tmp12_ = !photo_file_format_properties_is_recognized_extension (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties), _tmp11_); #line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala" - _photo_file_format_properties_unref0 (_tmp13_); + _photo_file_format_properties_unref0 (_tmp10_); #line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp16_) { + if (_tmp12_) { #line 1552 "/home/jens/Source/shotwell/src/BatchImport.vala" result = FALSE; #line 1552 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -12063,32 +12707,30 @@ static gboolean work_sniffer_is_paired (WorkSniffer* self, FileToPrepare* raw, F _g_free0 (name); #line 1552 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 12060 "BatchImport.c" +#line 12704 "BatchImport.c" } #line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = raw; + _tmp13_ = file_to_prepare_get_basename (raw); #line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = file_to_prepare_get_basename (_tmp17_); + _tmp14_ = _tmp13_; #line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = _tmp18_; -#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" - disassemble_filename (_tmp19_, &_tmp20_, &_tmp21_); + disassemble_filename (_tmp14_, &_tmp15_, &_tmp16_); #line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (name); #line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" - name = _tmp20_; + name = _tmp15_; #line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (ext); #line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" - ext = _tmp21_; + ext = _tmp16_; #line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp19_); + _g_free0 (_tmp14_); #line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp22_ = name; + _tmp17_ = name; #line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp23_ = test_name; + _tmp18_ = test_name; #line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = g_strcmp0 (_tmp22_, _tmp23_) == 0; + result = g_strcmp0 (_tmp17_, _tmp18_) == 0; #line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (test_ext); #line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -12099,81 +12741,72 @@ static gboolean work_sniffer_is_paired (WorkSniffer* self, FileToPrepare* raw, F _g_free0 (name); #line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 12096 "BatchImport.c" +#line 12738 "BatchImport.c" } -static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GError** error) { +static void +work_sniffer_sniff_job (WorkSniffer* self, + BatchImportJob* job, + GError** error) +{ guint64 size = 0ULL; GFile* file_or_dir = NULL; gboolean determined_size = FALSE; - BatchImportJob* _tmp0_; - guint64 _tmp1_ = 0ULL; - GFile* _tmp2_ = NULL; + guint64 _tmp0_ = 0ULL; + GFile* _tmp1_ = NULL; + gboolean _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; - BatchImportJob* _tmp7_; - gboolean _tmp8_; GError * _inner_error_ = NULL; #line 1559 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_WORK_SNIFFER (self)); #line 1559 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT_JOB (job)); #line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = job; + _tmp2_ = batch_import_job_determine_file_size (job, &_tmp0_, &_tmp1_); #line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = batch_import_job_determine_file_size (_tmp0_, &_tmp1_, &_tmp2_); -#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala" - size = _tmp1_; + size = _tmp0_; #line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (file_or_dir); #line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala" - file_or_dir = _tmp2_; + file_or_dir = _tmp1_; #line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala" - determined_size = _tmp3_; + determined_size = _tmp2_; #line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = determined_size; + _tmp3_ = determined_size; #line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp4_) { -#line 12132 "BatchImport.c" + if (_tmp3_) { +#line 12773 "BatchImport.c" + guint64 _tmp4_; guint64 _tmp5_; - guint64 _tmp6_; #line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = self->total_bytes; + _tmp4_ = self->total_bytes; #line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = size; + _tmp5_ = size; #line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->total_bytes = _tmp5_ + _tmp6_; -#line 12141 "BatchImport.c" + self->total_bytes = _tmp4_ + _tmp5_; +#line 12782 "BatchImport.c" } #line 1566 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = job; -#line 1566 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = batch_import_job_is_directory (_tmp7_); -#line 1566 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp8_) { -#line 12149 "BatchImport.c" + if (batch_import_job_is_directory (job)) { +#line 12786 "BatchImport.c" GFile* dir = NULL; gboolean copy_to_library = FALSE; - gboolean _tmp9_ = FALSE; - BatchImportJob* _tmp10_; - GFile* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - gboolean _tmp13_; - GFile* _tmp21_; - gboolean _tmp22_; -#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = job; + gboolean _tmp6_ = FALSE; + GFile* _tmp7_ = NULL; + gboolean _tmp8_ = FALSE; + gboolean _tmp9_; + GFile* _tmp14_; #line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = batch_import_job_prepare (_tmp10_, &_tmp11_, &_tmp12_, &_inner_error_); + _tmp9_ = batch_import_job_prepare (job, &_tmp7_, &_tmp8_, &_inner_error_); #line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (dir); #line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" - dir = _tmp11_; + dir = _tmp7_; #line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" - copy_to_library = _tmp12_; + copy_to_library = _tmp8_; #line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = _tmp13_; + _tmp6_ = _tmp9_; #line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -12184,74 +12817,54 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr _g_object_unref0 (file_or_dir); #line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 12181 "BatchImport.c" +#line 12814 "BatchImport.c" } #line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!_tmp9_) { -#line 12185 "BatchImport.c" - BatchImportJob* _tmp14_; - BatchImportJob* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; - BatchImportJob* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; -#line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = job; -#line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = job; -#line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = batch_import_job_get_source_identifier (_tmp15_); + if (!_tmp6_) { +#line 12818 "BatchImport.c" + gchar* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; #line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = _tmp16_; + _tmp10_ = batch_import_job_get_source_identifier (job); #line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = job; + _tmp11_ = _tmp10_; #line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = batch_import_job_get_dest_identifier (_tmp18_); + _tmp12_ = batch_import_job_get_dest_identifier (job); #line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp20_ = _tmp19_; + _tmp13_ = _tmp12_; #line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala" - background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp14_, NULL, _tmp17_, _tmp20_, IMPORT_RESULT_FILE_ERROR); + background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), job, NULL, _tmp11_, _tmp13_, IMPORT_RESULT_FILE_ERROR); #line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp13_); #line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp11_); #line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (dir); #line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (file_or_dir); #line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 12219 "BatchImport.c" +#line 12843 "BatchImport.c" } #line 1577 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp21_ = dir; + _tmp14_ = dir; #line 1577 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp22_ = query_is_directory (_tmp21_); -#line 1577 "/home/jens/Source/shotwell/src/BatchImport.vala" - _vala_assert (_tmp22_, "query_is_directory(dir)"); -#line 12227 "BatchImport.c" + _vala_assert (query_is_directory (_tmp14_), "query_is_directory(dir)"); +#line 12849 "BatchImport.c" { - BatchImportJob* _tmp23_; - GFile* _tmp24_; - gboolean _tmp25_; - BatchImportJob* _tmp26_; - gboolean _tmp27_; -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp23_ = job; -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp24_ = dir; -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp25_ = copy_to_library; + GFile* _tmp15_; + gboolean _tmp16_; #line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp26_ = job; + _tmp15_ = dir; #line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp27_ = batch_import_job_recurse (_tmp26_); + _tmp16_ = copy_to_library; #line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" - work_sniffer_search_dir (self, _tmp23_, _tmp24_, _tmp25_, _tmp27_, &_inner_error_); + work_sniffer_search_dir (self, job, _tmp15_, _tmp16_, batch_import_job_recurse (job), &_inner_error_); #line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12248 "BatchImport.c" +#line 12861 "BatchImport.c" goto __catch427_g_error; } } @@ -12259,46 +12872,40 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr __catch427_g_error: { GError* err = NULL; - BatchImportJob* _tmp28_; - GFile* _tmp29_; - BatchImportJob* _tmp30_; - gchar* _tmp31_; - gchar* _tmp32_; - GFile* _tmp33_; - gchar* _tmp34_; - gchar* _tmp35_; - GError* _tmp36_; + GFile* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + GFile* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + GError* _tmp23_; #line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; #line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp28_ = job; -#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp29_ = dir; -#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp30_ = job; + _tmp17_ = dir; #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp31_ = batch_import_job_get_source_identifier (_tmp30_); + _tmp18_ = batch_import_job_get_source_identifier (job); #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp32_ = _tmp31_; + _tmp19_ = _tmp18_; #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp33_ = dir; + _tmp20_ = dir; #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp34_ = g_file_get_path (_tmp33_); + _tmp21_ = g_file_get_path (_tmp20_); #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp35_ = _tmp34_; + _tmp22_ = _tmp21_; #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp36_ = err; + _tmp23_ = err; #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala" - background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp28_, _tmp29_, _tmp32_, _tmp35_, _tmp36_, IMPORT_RESULT_FILE_ERROR); + background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), job, _tmp17_, _tmp19_, _tmp22_, _tmp23_, IMPORT_RESULT_FILE_ERROR); #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp35_); + _g_free0 (_tmp22_); #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp32_); + _g_free0 (_tmp19_); #line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 12295 "BatchImport.c" +#line 12902 "BatchImport.c" } __finally427: #line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -12311,46 +12918,42 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr _g_object_unref0 (file_or_dir); #line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 12308 "BatchImport.c" +#line 12915 "BatchImport.c" } #line 1566 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (dir); -#line 12312 "BatchImport.c" +#line 12919 "BatchImport.c" } else { - gboolean _tmp37_; - gboolean _tmp45_ = FALSE; - gboolean _tmp46_ = FALSE; - GFile* _tmp47_; - GeeList* _tmp52_; - BatchImportJob* _tmp53_; - FileToPrepare* _tmp54_; - FileToPrepare* _tmp55_; + gboolean _tmp24_; + gboolean _tmp31_ = FALSE; + gboolean _tmp32_ = FALSE; + GFile* _tmp33_; + GeeList* _tmp37_; + FileToPrepare* _tmp38_; + FileToPrepare* _tmp39_; #line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp37_ = determined_size; + _tmp24_ = determined_size; #line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!_tmp37_) { -#line 12326 "BatchImport.c" - guint64 _tmp38_ = 0ULL; - GFile* _tmp39_; - GCancellable* _tmp40_; - GCancellable* _tmp41_; - guint64 _tmp42_; - guint64 _tmp43_; - guint64 _tmp44_; -#line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp39_ = file_or_dir; + if (!_tmp24_) { +#line 12932 "BatchImport.c" + guint64 _tmp25_ = 0ULL; + GFile* _tmp26_; + GCancellable* _tmp27_; + GCancellable* _tmp28_; + guint64 _tmp29_; + guint64 _tmp30_; #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp40_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob)); + _tmp26_ = file_or_dir; #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp41_ = _tmp40_; + _tmp27_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp42_ = query_total_file_size (_tmp39_, _tmp41_, &_inner_error_); + _tmp28_ = _tmp27_; #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp43_ = _tmp42_; + _tmp29_ = query_total_file_size (_tmp26_, _tmp28_, &_inner_error_); #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp41_); + _g_object_unref0 (_tmp28_); #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp38_ = _tmp43_; + _tmp25_ = _tmp29_; #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -12359,82 +12962,83 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr _g_object_unref0 (file_or_dir); #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 12356 "BatchImport.c" +#line 12959 "BatchImport.c" } #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp44_ = self->total_bytes; + _tmp30_ = self->total_bytes; #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->total_bytes = _tmp44_ + _tmp38_; -#line 12362 "BatchImport.c" + self->total_bytes = _tmp30_ + _tmp25_; +#line 12965 "BatchImport.c" } #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp47_ = file_or_dir; + _tmp33_ = file_or_dir; #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp47_ != NULL) { -#line 12368 "BatchImport.c" - GeeHashSet* _tmp48_; + if (_tmp33_ != NULL) { +#line 12971 "BatchImport.c" + GeeHashSet* _tmp34_; #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp48_ = self->priv->skipset; + _tmp34_ = self->priv->skipset; #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp46_ = _tmp48_ != NULL; -#line 12374 "BatchImport.c" + _tmp32_ = _tmp34_ != NULL; +#line 12977 "BatchImport.c" } else { #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp46_ = FALSE; -#line 12378 "BatchImport.c" + _tmp32_ = FALSE; +#line 12981 "BatchImport.c" } #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp46_) { -#line 12382 "BatchImport.c" - GeeHashSet* _tmp49_; - GFile* _tmp50_; - gboolean _tmp51_; -#line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp49_ = self->priv->skipset; + if (_tmp32_) { +#line 12985 "BatchImport.c" + GeeHashSet* _tmp35_; + GFile* _tmp36_; #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp50_ = file_or_dir; + _tmp35_ = self->priv->skipset; #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp51_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp50_); + _tmp36_ = file_or_dir; #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp45_ = _tmp51_; -#line 12394 "BatchImport.c" + _tmp31_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp36_); +#line 12994 "BatchImport.c" } else { #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp45_ = FALSE; -#line 12398 "BatchImport.c" + _tmp31_ = FALSE; +#line 12998 "BatchImport.c" } #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp45_) { + if (_tmp31_) { #line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (file_or_dir); #line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 12406 "BatchImport.c" +#line 13006 "BatchImport.c" } #line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp52_ = self->files_to_prepare; -#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp53_ = job; + _tmp37_ = self->files_to_prepare; #line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp54_ = file_to_prepare_new (_tmp53_, NULL, TRUE); + _tmp38_ = file_to_prepare_new (job, NULL, TRUE); #line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp55_ = _tmp54_; + _tmp39_ = _tmp38_; #line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), _tmp55_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection), _tmp39_); #line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala" - _file_to_prepare_unref0 (_tmp55_); -#line 12420 "BatchImport.c" + _file_to_prepare_unref0 (_tmp39_); +#line 13018 "BatchImport.c" } #line 1559 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (file_or_dir); -#line 12424 "BatchImport.c" +#line 13022 "BatchImport.c" } -void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir, gboolean copy_to_library, gboolean recurse, GError** error) { +void +work_sniffer_search_dir (WorkSniffer* self, + BatchImportJob* job, + GFile* dir, + gboolean copy_to_library, + gboolean recurse, + GError** error) +{ GFileEnumerator* enumerator = NULL; - GFile* _tmp0_; - GFileEnumerator* _tmp1_; + GFileEnumerator* _tmp0_; GFileInfo* info = NULL; GError * _inner_error_ = NULL; #line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -12444,56 +13048,51 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir #line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_IS_FILE (dir)); #line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = dir; -#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = g_file_enumerate_children (_tmp0_, "standard::*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); + _tmp0_ = g_file_enumerate_children (dir, "standard::*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); #line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala" - enumerator = _tmp1_; + enumerator = _tmp0_; #line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala" g_propagate_error (error, _inner_error_); #line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 12452 "BatchImport.c" +#line 13054 "BatchImport.c" } #line 1603 "/home/jens/Source/shotwell/src/BatchImport.vala" info = NULL; #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 12458 "BatchImport.c" - GFileInfo* _tmp2_ = NULL; - GFileEnumerator* _tmp3_; +#line 13060 "BatchImport.c" + GFileInfo* _tmp1_ = NULL; + GFileEnumerator* _tmp2_; + GCancellable* _tmp3_; GCancellable* _tmp4_; - GCancellable* _tmp5_; + GFileInfo* _tmp5_; GFileInfo* _tmp6_; GFileInfo* _tmp7_; GFileInfo* _tmp8_; - GFileInfo* _tmp9_; - gboolean _tmp10_; GFile* child = NULL; + GFileInfo* _tmp9_; + const gchar* _tmp10_; GFile* _tmp11_; - GFileInfo* _tmp12_; - const gchar* _tmp13_; - GFile* _tmp14_; GFileType file_type = 0; - GFileInfo* _tmp15_; - GFileType _tmp16_; - GFileType _tmp17_; + GFileInfo* _tmp12_; + GFileType _tmp13_; #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = enumerator; + _tmp2_ = enumerator; #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob)); + _tmp3_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = g_file_enumerator_next_file (_tmp3_, _tmp5_, &_inner_error_); + _tmp5_ = g_file_enumerator_next_file (_tmp2_, _tmp4_, &_inner_error_); #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = _tmp7_; + _tmp1_ = _tmp6_; #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -12504,107 +13103,86 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir _g_object_unref0 (enumerator); #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 12501 "BatchImport.c" +#line 13100 "BatchImport.c" } #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = _tmp2_; + _tmp7_ = _tmp1_; #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = NULL; + _tmp1_ = NULL; #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (info); #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" - info = _tmp8_; + info = _tmp7_; #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = info; + _tmp8_ = info; #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!(_tmp9_ != NULL)) { + if (!(_tmp8_ != NULL)) { #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 12519 "BatchImport.c" +#line 13118 "BatchImport.c" } #line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob)); -#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp10_) { + if (background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob))) { #line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 12529 "BatchImport.c" +#line 13126 "BatchImport.c" } #line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = dir; -#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = info; + _tmp9_ = info; #line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = g_file_info_get_name (_tmp12_); + _tmp10_ = g_file_info_get_name (_tmp9_); #line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = g_file_get_child (_tmp11_, _tmp13_); + _tmp11_ = g_file_get_child (dir, _tmp10_); #line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala" - child = _tmp14_; + child = _tmp11_; #line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = info; -#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = g_file_info_get_file_type (_tmp15_); + _tmp12_ = info; #line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala" - file_type = _tmp16_; + file_type = g_file_info_get_file_type (_tmp12_); #line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = file_type; + _tmp13_ = file_type; #line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp17_ == G_FILE_TYPE_DIRECTORY) { -#line 12551 "BatchImport.c" - gboolean _tmp18_; - GFileInfo* _tmp19_; - const gchar* _tmp20_; - gboolean _tmp21_; + if (_tmp13_ == G_FILE_TYPE_DIRECTORY) { +#line 13144 "BatchImport.c" + GFileInfo* _tmp14_; + const gchar* _tmp15_; #line 1613 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = recurse; -#line 1613 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!_tmp18_) { + if (!recurse) { #line 1614 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (child); #line 1614 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 1614 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 12566 "BatchImport.c" +#line 13155 "BatchImport.c" } #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = info; -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp20_ = g_file_info_get_name (_tmp19_); + _tmp14_ = info; #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp21_ = g_str_has_prefix (_tmp20_, "."); + _tmp15_ = g_file_info_get_name (_tmp14_); #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp21_) { + if (g_str_has_prefix (_tmp15_, ".")) { #line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (child); #line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 12582 "BatchImport.c" +#line 13169 "BatchImport.c" } { - BatchImportJob* _tmp22_; - GFile* _tmp23_; - gboolean _tmp24_; - gboolean _tmp25_; -#line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp22_ = job; -#line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp23_ = child; -#line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp24_ = copy_to_library; + GFile* _tmp16_; #line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp25_ = recurse; + _tmp16_ = child; #line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala" - work_sniffer_search_dir (self, _tmp22_, _tmp23_, _tmp24_, _tmp25_, &_inner_error_); + work_sniffer_search_dir (self, job, _tmp16_, copy_to_library, recurse, &_inner_error_); #line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12601 "BatchImport.c" +#line 13179 "BatchImport.c" goto __catch428_g_error; } } @@ -12612,46 +13190,43 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir __catch428_g_error: { GError* err = NULL; - BatchImportJob* _tmp26_; - GFile* _tmp27_; - GFile* _tmp28_; - gchar* _tmp29_; - gchar* _tmp30_; - GFile* _tmp31_; - gchar* _tmp32_; - gchar* _tmp33_; - GError* _tmp34_; + GFile* _tmp17_; + GFile* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; + GFile* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + GError* _tmp24_; #line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; #line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp26_ = job; -#line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp27_ = child; + _tmp17_ = child; #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp28_ = child; + _tmp18_ = child; #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp29_ = g_file_get_path (_tmp28_); + _tmp19_ = g_file_get_path (_tmp18_); #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp30_ = _tmp29_; + _tmp20_ = _tmp19_; #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp31_ = child; + _tmp21_ = child; #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp32_ = g_file_get_path (_tmp31_); + _tmp22_ = g_file_get_path (_tmp21_); #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp33_ = _tmp32_; + _tmp23_ = _tmp22_; #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp34_ = err; + _tmp24_ = err; #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala" - background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp26_, _tmp27_, _tmp30_, _tmp33_, _tmp34_, IMPORT_RESULT_FILE_ERROR); + background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), job, _tmp17_, _tmp20_, _tmp23_, _tmp24_, IMPORT_RESULT_FILE_ERROR); #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp33_); + _g_free0 (_tmp23_); #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp30_); + _g_free0 (_tmp20_); #line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 12648 "BatchImport.c" +#line 13223 "BatchImport.c" } __finally428: #line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -12661,176 +13236,157 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir #line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (child); #line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (info); #line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (enumerator); #line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 12665 "BatchImport.c" +#line 13240 "BatchImport.c" } } else { - GFileType _tmp35_; + GFileType _tmp25_; #line 1625 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp35_ = file_type; + _tmp25_ = file_type; #line 1625 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp35_ == G_FILE_TYPE_REGULAR) { -#line 12673 "BatchImport.c" - gboolean _tmp36_ = FALSE; - GeeHashSet* _tmp37_; - gboolean _tmp41_ = FALSE; - gboolean _tmp42_ = FALSE; - GFile* _tmp43_; - gboolean _tmp44_; -#line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp37_ = self->priv->skipset; + if (_tmp25_ == G_FILE_TYPE_REGULAR) { +#line 13248 "BatchImport.c" + gboolean _tmp26_ = FALSE; + GeeHashSet* _tmp27_; + gboolean _tmp30_ = FALSE; + gboolean _tmp31_ = FALSE; + GFile* _tmp32_; #line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp37_ != NULL) { -#line 12684 "BatchImport.c" - GeeHashSet* _tmp38_; - GFile* _tmp39_; - gboolean _tmp40_; + _tmp27_ = self->priv->skipset; #line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp38_ = self->priv->skipset; + if (_tmp27_ != NULL) { +#line 13258 "BatchImport.c" + GeeHashSet* _tmp28_; + GFile* _tmp29_; #line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp39_ = child; + _tmp28_ = self->priv->skipset; #line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp40_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp39_); + _tmp29_ = child; #line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp36_ = _tmp40_; -#line 12696 "BatchImport.c" + _tmp26_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_); +#line 13267 "BatchImport.c" } else { #line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp36_ = FALSE; -#line 12700 "BatchImport.c" + _tmp26_ = FALSE; +#line 13271 "BatchImport.c" } #line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp36_) { + if (_tmp26_) { #line 1627 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (child); #line 1627 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 1627 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 12710 "BatchImport.c" +#line 13281 "BatchImport.c" } #line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp43_ = child; -#line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp44_ = photo_is_file_image (_tmp43_); -#line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp44_) { -#line 12718 "BatchImport.c" - GFile* _tmp45_; - gboolean _tmp46_; + _tmp32_ = child; #line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp45_ = child; + if (photo_is_file_image (_tmp32_)) { +#line 13287 "BatchImport.c" + GFile* _tmp33_; #line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp46_ = photo_file_format_is_file_supported (_tmp45_); + _tmp33_ = child; #line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp42_ = _tmp46_; -#line 12727 "BatchImport.c" + _tmp31_ = photo_file_format_is_file_supported (_tmp33_); +#line 13293 "BatchImport.c" } else { #line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp42_ = FALSE; -#line 12731 "BatchImport.c" + _tmp31_ = FALSE; +#line 13297 "BatchImport.c" } #line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp42_) { + if (_tmp31_) { #line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp41_ = TRUE; -#line 12737 "BatchImport.c" + _tmp30_ = TRUE; +#line 13303 "BatchImport.c" } else { - GFile* _tmp47_; - gboolean _tmp48_; + GFile* _tmp34_; #line 1630 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp47_ = child; + _tmp34_ = child; #line 1630 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp48_ = video_reader_is_supported_video_file (_tmp47_); -#line 1630 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp41_ = _tmp48_; -#line 12747 "BatchImport.c" + _tmp30_ = video_reader_is_supported_video_file (_tmp34_); +#line 13310 "BatchImport.c" } #line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp41_) { -#line 12751 "BatchImport.c" - guint64 _tmp49_; - GFileInfo* _tmp50_; - gint64 _tmp51_; - GeeList* _tmp52_; - BatchImportJob* _tmp53_; - GFile* _tmp54_; - gboolean _tmp55_; - FileToPrepare* _tmp56_; - FileToPrepare* _tmp57_; -#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp49_ = self->total_bytes; + if (_tmp30_) { +#line 13314 "BatchImport.c" + guint64 _tmp35_; + GFileInfo* _tmp36_; + GeeList* _tmp37_; + GFile* _tmp38_; + FileToPrepare* _tmp39_; + FileToPrepare* _tmp40_; #line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp50_ = info; + _tmp35_ = self->total_bytes; #line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp51_ = g_file_info_get_size (_tmp50_); + _tmp36_ = info; #line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->total_bytes = _tmp49_ + _tmp51_; -#line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp52_ = self->files_to_prepare; -#line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp53_ = job; + self->total_bytes = _tmp35_ + g_file_info_get_size (_tmp36_); #line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp54_ = child; + _tmp37_ = self->files_to_prepare; #line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp55_ = copy_to_library; + _tmp38_ = child; #line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp56_ = file_to_prepare_new (_tmp53_, _tmp54_, _tmp55_); + _tmp39_ = file_to_prepare_new (job, _tmp38_, copy_to_library); #line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp57_ = _tmp56_; + _tmp40_ = _tmp39_; #line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), _tmp57_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection), _tmp40_); #line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala" - _file_to_prepare_unref0 (_tmp57_); + _file_to_prepare_unref0 (_tmp40_); #line 1634 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (child); #line 1634 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 1634 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 12791 "BatchImport.c" +#line 13345 "BatchImport.c" } } else { - GFile* _tmp58_; - gchar* _tmp59_; - gchar* _tmp60_; - GFileType _tmp61_; + GFile* _tmp41_; + gchar* _tmp42_; + gchar* _tmp43_; + GFileType _tmp44_; #line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp58_ = child; + _tmp41_ = child; #line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp59_ = g_file_get_path (_tmp58_); + _tmp42_ = g_file_get_path (_tmp41_); #line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp60_ = _tmp59_; + _tmp43_ = _tmp42_; #line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp61_ = file_type; + _tmp44_ = file_type; #line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_warning ("BatchImport.vala:1637: Ignoring import of %s file type %d", _tmp60_, (gint) _tmp61_); + g_warning ("BatchImport.vala:1637: Ignoring import of %s file type %d", _tmp43_, (gint) _tmp44_); #line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp60_); -#line 12810 "BatchImport.c" + _g_free0 (_tmp43_); +#line 13364 "BatchImport.c" } } #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (child); #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp2_); -#line 12817 "BatchImport.c" + _g_object_unref0 (_tmp1_); +#line 13371 "BatchImport.c" } #line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (info); #line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (enumerator); -#line 12823 "BatchImport.c" +#line 13377 "BatchImport.c" } -static void work_sniffer_class_init (WorkSnifferClass * klass) { +static void +work_sniffer_class_init (WorkSnifferClass * klass) +{ #line 1460 "/home/jens/Source/shotwell/src/BatchImport.vala" work_sniffer_parent_class = g_type_class_peek_parent (klass); #line 1460 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -12839,11 +13395,13 @@ static void work_sniffer_class_init (WorkSnifferClass * klass) { g_type_class_add_private (klass, sizeof (WorkSnifferPrivate)); #line 1460 "/home/jens/Source/shotwell/src/BatchImport.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) work_sniffer_real_execute; -#line 12836 "BatchImport.c" +#line 13392 "BatchImport.c" } -static void work_sniffer_instance_init (WorkSniffer * self) { +static void +work_sniffer_instance_init (WorkSniffer * self) +{ GeeArrayList* _tmp0_; #line 1460 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv = WORK_SNIFFER_GET_PRIVATE (self); @@ -12853,11 +13411,13 @@ static void work_sniffer_instance_init (WorkSniffer * self) { self->files_to_prepare = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList); #line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala" self->total_bytes = (guint64) 0; -#line 12850 "BatchImport.c" +#line 13408 "BatchImport.c" } -static void work_sniffer_finalize (BackgroundJob * obj) { +static void +work_sniffer_finalize (BackgroundJob * obj) +{ WorkSniffer * self; #line 1460 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_WORK_SNIFFER, WorkSniffer); @@ -12869,11 +13429,13 @@ static void work_sniffer_finalize (BackgroundJob * obj) { _g_object_unref0 (self->priv->skipset); #line 1460 "/home/jens/Source/shotwell/src/BatchImport.vala" BACKGROUND_JOB_CLASS (work_sniffer_parent_class)->finalize (obj); -#line 12866 "BatchImport.c" +#line 13426 "BatchImport.c" } -GType work_sniffer_get_type (void) { +GType +work_sniffer_get_type (void) +{ static volatile gsize work_sniffer_type_id__volatile = 0; if (g_once_init_enter (&work_sniffer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (WorkSnifferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) work_sniffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (WorkSniffer), 0, (GInstanceInitFunc) work_sniffer_instance_init, NULL }; @@ -12885,28 +13447,30 @@ GType work_sniffer_get_type (void) { } -PreparedFile* prepared_file_construct (GType object_type, BatchImportJob* job, GFile* file, GFile* associated_file, const gchar* source_id, const gchar* dest_id, gboolean copy_to_library, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, guint64 filesize, gboolean is_video) { +PreparedFile* +prepared_file_construct (GType object_type, + BatchImportJob* job, + GFile* file, + GFile* associated_file, + const gchar* source_id, + const gchar* dest_id, + gboolean copy_to_library, + const gchar* exif_md5, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format, + guint64 filesize, + gboolean is_video) +{ PreparedFile* self = NULL; BatchImportJob* _tmp0_; - BatchImportJob* _tmp1_; + GFile* _tmp1_; GFile* _tmp2_; - GFile* _tmp3_; - GFile* _tmp4_; - GFile* _tmp5_; - const gchar* _tmp6_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; gchar* _tmp7_; - const gchar* _tmp8_; - gchar* _tmp9_; - gboolean _tmp10_; - const gchar* _tmp11_; - gchar* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - const gchar* _tmp15_; - gchar* _tmp16_; - PhotoFileFormat _tmp17_; - guint64 _tmp18_; - gboolean _tmp19_; #line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), NULL); #line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -12920,198 +13484,212 @@ PreparedFile* prepared_file_construct (GType object_type, BatchImportJob* job, G #line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (PreparedFile*) g_type_create_instance (object_type); #line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = job; -#line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = _batch_import_job_ref0 (_tmp0_); + _tmp0_ = _batch_import_job_ref0 (job); #line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (self->job); #line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->job = _tmp1_; + self->job = _tmp0_; #line 1662 "/home/jens/Source/shotwell/src/BatchImport.vala" self->result = IMPORT_RESULT_SUCCESS; #line 1663 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = file; -#line 1663 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (file); #line 1663 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->file); #line 1663 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->file = _tmp3_; -#line 1664 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = associated_file; + self->file = _tmp1_; #line 1664 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp2_ = _g_object_ref0 (associated_file); #line 1664 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->associated_file); #line 1664 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->associated_file = _tmp5_; + self->associated_file = _tmp2_; #line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = source_id; -#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp3_ = g_strdup (source_id); #line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->source_id); #line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->source_id = _tmp7_; -#line 1666 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = dest_id; + self->source_id = _tmp3_; #line 1666 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = g_strdup (_tmp8_); + _tmp4_ = g_strdup (dest_id); #line 1666 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->dest_id); #line 1666 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->dest_id = _tmp9_; -#line 1667 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = copy_to_library; + self->dest_id = _tmp4_; #line 1667 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->copy_to_library = _tmp10_; + self->copy_to_library = copy_to_library; #line 1668 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = exif_md5; -#line 1668 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = g_strdup (_tmp11_); + _tmp5_ = g_strdup (exif_md5); #line 1668 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->exif_md5); #line 1668 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->exif_md5 = _tmp12_; -#line 1669 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = thumbnail_md5; + self->exif_md5 = _tmp5_; #line 1669 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = g_strdup (_tmp13_); + _tmp6_ = g_strdup (thumbnail_md5); #line 1669 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->thumbnail_md5); #line 1669 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->thumbnail_md5 = _tmp14_; + self->thumbnail_md5 = _tmp6_; #line 1670 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = full_md5; -#line 1670 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = g_strdup (_tmp15_); + _tmp7_ = g_strdup (full_md5); #line 1670 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->full_md5); #line 1670 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->full_md5 = _tmp16_; -#line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = file_format; + self->full_md5 = _tmp7_; #line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->file_format = _tmp17_; + self->file_format = file_format; #line 1672 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = filesize; -#line 1672 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->filesize = _tmp18_; + self->filesize = filesize; #line 1673 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = is_video; -#line 1673 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->is_video = _tmp19_; + self->is_video = is_video; #line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 13000 "BatchImport.c" -} - - -PreparedFile* prepared_file_new (BatchImportJob* job, GFile* file, GFile* associated_file, const gchar* source_id, const gchar* dest_id, gboolean copy_to_library, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, guint64 filesize, gboolean is_video) { +#line 13540 "BatchImport.c" +} + + +PreparedFile* +prepared_file_new (BatchImportJob* job, + GFile* file, + GFile* associated_file, + const gchar* source_id, + const gchar* dest_id, + gboolean copy_to_library, + const gchar* exif_md5, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format, + guint64 filesize, + gboolean is_video) +{ #line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala" return prepared_file_construct (TYPE_PREPARED_FILE, job, file, associated_file, source_id, dest_id, copy_to_library, exif_md5, thumbnail_md5, full_md5, file_format, filesize, is_video); -#line 13007 "BatchImport.c" +#line 13560 "BatchImport.c" } -static void value_prepared_file_init (GValue* value) { +static void +value_prepared_file_init (GValue* value) +{ #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 13014 "BatchImport.c" +#line 13569 "BatchImport.c" } -static void value_prepared_file_free_value (GValue* value) { +static void +value_prepared_file_free_value (GValue* value) +{ #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" if (value->data[0].v_pointer) { #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" prepared_file_unref (value->data[0].v_pointer); -#line 13023 "BatchImport.c" +#line 13580 "BatchImport.c" } } -static void value_prepared_file_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_prepared_file_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" if (src_value->data[0].v_pointer) { #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = prepared_file_ref (src_value->data[0].v_pointer); -#line 13033 "BatchImport.c" +#line 13593 "BatchImport.c" } else { #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = NULL; -#line 13037 "BatchImport.c" +#line 13597 "BatchImport.c" } } -static gpointer value_prepared_file_peek_pointer (const GValue* value) { +static gpointer +value_prepared_file_peek_pointer (const GValue* value) +{ #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 13045 "BatchImport.c" +#line 13607 "BatchImport.c" } -static gchar* value_prepared_file_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_prepared_file_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" if (collect_values[0].v_pointer) { -#line 13052 "BatchImport.c" +#line 13619 "BatchImport.c" PreparedFile * object; object = collect_values[0].v_pointer; #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" if (object->parent_instance.g_class == NULL) { #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 13059 "BatchImport.c" +#line 13626 "BatchImport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 13063 "BatchImport.c" +#line 13630 "BatchImport.c" } #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = prepared_file_ref (object); -#line 13067 "BatchImport.c" +#line 13634 "BatchImport.c" } else { #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 13071 "BatchImport.c" +#line 13638 "BatchImport.c" } #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 13075 "BatchImport.c" +#line 13642 "BatchImport.c" } -static gchar* value_prepared_file_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_prepared_file_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PreparedFile ** object_p; object_p = collect_values[0].v_pointer; #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!object_p) { #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 13086 "BatchImport.c" +#line 13658 "BatchImport.c" } #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!value->data[0].v_pointer) { #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = NULL; -#line 13092 "BatchImport.c" +#line 13664 "BatchImport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = value->data[0].v_pointer; -#line 13096 "BatchImport.c" +#line 13668 "BatchImport.c" } else { #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = prepared_file_ref (value->data[0].v_pointer); -#line 13100 "BatchImport.c" +#line 13672 "BatchImport.c" } #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 13104 "BatchImport.c" +#line 13676 "BatchImport.c" } -GParamSpec* param_spec_prepared_file (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_prepared_file (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPreparedFile* spec; #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PREPARED_FILE), NULL); @@ -13121,20 +13699,25 @@ GParamSpec* param_spec_prepared_file (const gchar* name, const gchar* nick, cons G_PARAM_SPEC (spec)->value_type = object_type; #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" return G_PARAM_SPEC (spec); -#line 13118 "BatchImport.c" +#line 13696 "BatchImport.c" } -gpointer value_get_prepared_file (const GValue* value) { +gpointer +value_get_prepared_file (const GValue* value) +{ #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREPARED_FILE), NULL); #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 13127 "BatchImport.c" +#line 13707 "BatchImport.c" } -void value_set_prepared_file (GValue* value, gpointer v_object) { +void +value_set_prepared_file (GValue* value, + gpointer v_object) +{ PreparedFile * old; #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREPARED_FILE)); @@ -13150,22 +13733,25 @@ void value_set_prepared_file (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" prepared_file_ref (value->data[0].v_pointer); -#line 13147 "BatchImport.c" +#line 13730 "BatchImport.c" } else { #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 13151 "BatchImport.c" +#line 13734 "BatchImport.c" } #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" prepared_file_unref (old); -#line 13157 "BatchImport.c" +#line 13740 "BatchImport.c" } } -void value_take_prepared_file (GValue* value, gpointer v_object) { +void +value_take_prepared_file (GValue* value, + gpointer v_object) +{ PreparedFile * old; #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREPARED_FILE)); @@ -13179,40 +13765,46 @@ void value_take_prepared_file (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = v_object; -#line 13176 "BatchImport.c" +#line 13762 "BatchImport.c" } else { #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 13180 "BatchImport.c" +#line 13766 "BatchImport.c" } #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" prepared_file_unref (old); -#line 13186 "BatchImport.c" +#line 13772 "BatchImport.c" } } -static void prepared_file_class_init (PreparedFileClass * klass) { +static void +prepared_file_class_init (PreparedFileClass * klass) +{ #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" prepared_file_parent_class = g_type_class_peek_parent (klass); #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" ((PreparedFileClass *) klass)->finalize = prepared_file_finalize; -#line 13196 "BatchImport.c" +#line 13784 "BatchImport.c" } -static void prepared_file_instance_init (PreparedFile * self) { +static void +prepared_file_instance_init (PreparedFile * self) +{ #line 1647 "/home/jens/Source/shotwell/src/BatchImport.vala" self->associated_file = NULL; #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" self->ref_count = 1; -#line 13205 "BatchImport.c" +#line 13795 "BatchImport.c" } -static void prepared_file_finalize (PreparedFile * obj) { +static void +prepared_file_finalize (PreparedFile * obj) +{ PreparedFile * self; #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREPARED_FILE, PreparedFile); @@ -13234,11 +13826,13 @@ static void prepared_file_finalize (PreparedFile * obj) { _g_free0 (self->thumbnail_md5); #line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->full_md5); -#line 13231 "BatchImport.c" +#line 13823 "BatchImport.c" } -GType prepared_file_get_type (void) { +GType +prepared_file_get_type (void) +{ static volatile gsize prepared_file_type_id__volatile = 0; if (g_once_init_enter (&prepared_file_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_prepared_file_init, value_prepared_file_free_value, value_prepared_file_copy_value, value_prepared_file_peek_pointer, "p", value_prepared_file_collect_value, "p", value_prepared_file_lcopy_value }; @@ -13252,18 +13846,22 @@ GType prepared_file_get_type (void) { } -gpointer prepared_file_ref (gpointer instance) { +gpointer +prepared_file_ref (gpointer instance) +{ PreparedFile * self; self = instance; #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" g_atomic_int_inc (&self->ref_count); #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" return instance; -#line 13256 "BatchImport.c" +#line 13852 "BatchImport.c" } -void prepared_file_unref (gpointer instance) { +void +prepared_file_unref (gpointer instance) +{ PreparedFile * self; self = instance; #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -13272,54 +13870,62 @@ void prepared_file_unref (gpointer instance) { PREPARED_FILE_GET_CLASS (self)->finalize (self); #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 13269 "BatchImport.c" +#line 13867 "BatchImport.c" } } -PreparedFileCluster* prepared_file_cluster_construct (GType object_type, GeeArrayList* list) { +PreparedFileCluster* +prepared_file_cluster_construct (GType object_type, + GeeArrayList* list) +{ PreparedFileCluster* self = NULL; GeeArrayList* _tmp0_; - GeeArrayList* _tmp1_; #line 1680 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (GEE_IS_ARRAY_LIST (list), NULL); #line 1680 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (PreparedFileCluster*) interlocked_notification_object_construct (object_type); #line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = list; -#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (list); #line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->list); #line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->list = _tmp1_; + self->list = _tmp0_; #line 1680 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 13292 "BatchImport.c" +#line 13890 "BatchImport.c" } -PreparedFileCluster* prepared_file_cluster_new (GeeArrayList* list) { +PreparedFileCluster* +prepared_file_cluster_new (GeeArrayList* list) +{ #line 1680 "/home/jens/Source/shotwell/src/BatchImport.vala" return prepared_file_cluster_construct (TYPE_PREPARED_FILE_CLUSTER, list); -#line 13299 "BatchImport.c" +#line 13899 "BatchImport.c" } -static void prepared_file_cluster_class_init (PreparedFileClusterClass * klass) { +static void +prepared_file_cluster_class_init (PreparedFileClusterClass * klass) +{ #line 1677 "/home/jens/Source/shotwell/src/BatchImport.vala" prepared_file_cluster_parent_class = g_type_class_peek_parent (klass); #line 1677 "/home/jens/Source/shotwell/src/BatchImport.vala" ((NotificationObjectClass *) klass)->finalize = prepared_file_cluster_finalize; -#line 13308 "BatchImport.c" +#line 13910 "BatchImport.c" } -static void prepared_file_cluster_instance_init (PreparedFileCluster * self) { +static void +prepared_file_cluster_instance_init (PreparedFileCluster * self) +{ } -static void prepared_file_cluster_finalize (NotificationObject * obj) { +static void +prepared_file_cluster_finalize (NotificationObject * obj) +{ PreparedFileCluster * self; #line 1677 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREPARED_FILE_CLUSTER, PreparedFileCluster); @@ -13327,11 +13933,13 @@ static void prepared_file_cluster_finalize (NotificationObject * obj) { _g_object_unref0 (self->list); #line 1677 "/home/jens/Source/shotwell/src/BatchImport.vala" NOTIFICATION_OBJECT_CLASS (prepared_file_cluster_parent_class)->finalize (obj); -#line 13324 "BatchImport.c" +#line 13930 "BatchImport.c" } -GType prepared_file_cluster_get_type (void) { +GType +prepared_file_cluster_get_type (void) +{ static volatile gsize prepared_file_cluster_type_id__volatile = 0; if (g_once_init_enter (&prepared_file_cluster_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PreparedFileClusterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) prepared_file_cluster_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PreparedFileCluster), 0, (GInstanceInitFunc) prepared_file_cluster_instance_init, NULL }; @@ -13343,21 +13951,21 @@ GType prepared_file_cluster_get_type (void) { } -PrepareFilesJob* prepare_files_job_construct (GType object_type, BatchImport* owner, GeeList* files_to_prepare, NotificationCallback notification, void* notification_target, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) { +PrepareFilesJob* +prepare_files_job_construct (GType object_type, + BatchImport* owner, + GeeList* files_to_prepare, + NotificationCallback notification, + void* notification_target, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target) +{ PrepareFilesJob* self = NULL; - BatchImport* _tmp0_; - CompletionCallback _tmp1_; - void* _tmp1__target; - GCancellable* _tmp2_; - CancellationCallback _tmp3_; - void* _tmp3__target; - GeeList* _tmp4_; - GeeList* _tmp5_; - NotificationCallback _tmp6_; - void* _tmp6__target; - GFile* _tmp7_; - gint _tmp8_; - gint _tmp9_; + GeeList* _tmp0_; + GFile* _tmp1_; #line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL); #line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -13365,139 +13973,125 @@ PrepareFilesJob* prepare_files_job_construct (GType object_type, BatchImport* ow #line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL); #line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = owner; -#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = callback; -#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1__target = callback_target; -#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = cancellable; -#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = cancellation; -#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3__target = cancellation_target; -#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala" - self = (PrepareFilesJob*) background_import_job_construct (object_type, _tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target); -#line 1703 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = files_to_prepare; + self = (PrepareFilesJob*) background_import_job_construct (object_type, owner, callback, callback_target, cancellable, cancellation, cancellation_target); #line 1703 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp0_ = _g_object_ref0 (files_to_prepare); #line 1703 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->files_to_prepare); #line 1703 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->files_to_prepare = _tmp5_; + self->priv->files_to_prepare = _tmp0_; #line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = notification; + self->priv->notification = notification; #line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6__target = notification_target; -#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->notification = _tmp6_; -#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->notification_target = _tmp6__target; + self->priv->notification_target = notification_target; #line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = app_dirs_get_import_dir (); + _tmp1_ = app_dirs_get_import_dir (); #line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->library_dir); #line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->library_dir = _tmp7_; + self->priv->library_dir = _tmp1_; #line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = prepare_files_job_get_test_variable ("SHOTWELL_FAIL_EVERY"); -#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->fail_every = _tmp8_; -#line 1707 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = prepare_files_job_get_test_variable ("SHOTWELL_SKIP_EVERY"); + self->priv->fail_every = prepare_files_job_get_test_variable ("SHOTWELL_FAIL_EVERY"); #line 1707 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->skip_every = _tmp9_; + self->priv->skip_every = prepare_files_job_get_test_variable ("SHOTWELL_SKIP_EVERY"); #line 1709 "/home/jens/Source/shotwell/src/BatchImport.vala" background_job_set_notification_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW); #line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 13409 "BatchImport.c" +#line 13995 "BatchImport.c" } -PrepareFilesJob* prepare_files_job_new (BatchImport* owner, GeeList* files_to_prepare, NotificationCallback notification, void* notification_target, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) { +PrepareFilesJob* +prepare_files_job_new (BatchImport* owner, + GeeList* files_to_prepare, + NotificationCallback notification, + void* notification_target, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target) +{ #line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" return prepare_files_job_construct (TYPE_PREPARE_FILES_JOB, owner, files_to_prepare, notification, notification_target, callback, callback_target, cancellable, cancellation, cancellation_target); -#line 13416 "BatchImport.c" +#line 14012 "BatchImport.c" } -static gint prepare_files_job_get_test_variable (const gchar* name) { +static gint +prepare_files_job_get_test_variable (const gchar* name) +{ gint result = 0; gchar* value = NULL; const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; - gint _tmp3_ = 0; - gboolean _tmp4_ = FALSE; - const gchar* _tmp5_; + gchar* _tmp1_; + gint _tmp2_ = 0; + gboolean _tmp3_ = FALSE; + const gchar* _tmp4_; #line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (name != NULL, 0); #line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = name; + _tmp0_ = g_getenv (name); #line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = g_getenv (_tmp0_); -#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_tmp0_); #line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala" - value = _tmp2_; + value = _tmp1_; #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = value; + _tmp4_ = value; #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp5_ == NULL) { + if (_tmp4_ == NULL) { #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = TRUE; -#line 13445 "BatchImport.c" + _tmp3_ = TRUE; +#line 14040 "BatchImport.c" } else { - const gchar* _tmp6_; + const gchar* _tmp5_; + gint _tmp6_; gint _tmp7_; - gint _tmp8_; #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = value; + _tmp5_ = value; #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = strlen (_tmp6_); + _tmp6_ = strlen (_tmp5_); #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = _tmp8_ == 0; -#line 13458 "BatchImport.c" + _tmp3_ = _tmp7_ == 0; +#line 14053 "BatchImport.c" } #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp4_) { + if (_tmp3_) { #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = 0; -#line 13464 "BatchImport.c" + _tmp2_ = 0; +#line 14059 "BatchImport.c" } else { - const gchar* _tmp9_; - gint _tmp10_; -#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = value; + const gchar* _tmp8_; #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = atoi (_tmp9_); + _tmp8_ = value; #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = _tmp10_; -#line 13474 "BatchImport.c" + _tmp2_ = atoi (_tmp8_); +#line 14066 "BatchImport.c" } #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp3_; + result = _tmp2_; #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (value); #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 13482 "BatchImport.c" +#line 14074 "BatchImport.c" } -static void prepare_files_job_real_execute (BackgroundJob* base) { +static void +prepare_files_job_real_execute (BackgroundJob* base) +{ PrepareFilesJob * self; GTimer* timer = NULL; GTimer* _tmp0_; GeeArrayList* list = NULL; GeeArrayList* _tmp1_; - GeeArrayList* _tmp90_; + GeeArrayList* _tmp89_; + gint _tmp90_; gint _tmp91_; - gint _tmp92_; #line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PREPARE_FILES_JOB, PrepareFilesJob); #line 1719 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -13508,7 +14102,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) { _tmp1_ = gee_array_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL); #line 1721 "/home/jens/Source/shotwell/src/BatchImport.vala" list = _tmp1_; -#line 13505 "BatchImport.c" +#line 14099 "BatchImport.c" { GeeList* _file_to_prepare_list = NULL; GeeList* _tmp2_; @@ -13536,7 +14130,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) { _file_to_prepare_index = -1; #line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 13533 "BatchImport.c" +#line 14127 "BatchImport.c" gint _tmp7_; gint _tmp8_; gint _tmp9_; @@ -13546,38 +14140,37 @@ static void prepare_files_job_real_execute (BackgroundJob* base) { gpointer _tmp12_; ImportResult _result_ = 0; ImportResult _tmp13_; - ImportResult _tmp14_; BatchImportJob* job = NULL; - FileToPrepare* _tmp26_; + FileToPrepare* _tmp25_; + BatchImportJob* _tmp26_; BatchImportJob* _tmp27_; - BatchImportJob* _tmp28_; GFile* file = NULL; - FileToPrepare* _tmp29_; + FileToPrepare* _tmp28_; + GFile* _tmp29_; GFile* _tmp30_; - GFile* _tmp31_; - GFile* _tmp32_ = NULL; + GFile* _tmp31_ = NULL; + FileToPrepare* _tmp32_; FileToPrepare* _tmp33_; - FileToPrepare* _tmp34_; GFile* associated = NULL; - GFile* _tmp38_; + GFile* _tmp37_; gboolean copy_to_library = FALSE; - FileToPrepare* _tmp39_; - gboolean _tmp40_; - GFile* _tmp41_; - gboolean _tmp46_ = FALSE; - GFile* _tmp47_; + FileToPrepare* _tmp38_; + gboolean _tmp39_; + GFile* _tmp40_; + gboolean _tmp45_ = FALSE; + GFile* _tmp46_; PreparedFile* prepared_file = NULL; - BatchImportJob* _tmp55_; + BatchImportJob* _tmp54_; + GFile* _tmp55_; GFile* _tmp56_; - GFile* _tmp57_; - gboolean _tmp58_; - PreparedFile* _tmp59_ = NULL; + gboolean _tmp57_; + PreparedFile* _tmp58_ = NULL; + ImportResult _tmp59_; ImportResult _tmp60_; - ImportResult _tmp61_; - gboolean _tmp74_ = FALSE; - GeeArrayList* _tmp75_; + gboolean _tmp73_ = FALSE; + GeeArrayList* _tmp74_; + gint _tmp75_; gint _tmp76_; - gint _tmp77_; #line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = _file_to_prepare_index; #line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -13590,7 +14183,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) { if (!(_tmp8_ < _tmp9_)) { #line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 13587 "BatchImport.c" +#line 14180 "BatchImport.c" } #line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = _file_to_prepare_list; @@ -13601,130 +14194,128 @@ static void prepare_files_job_real_execute (BackgroundJob* base) { #line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala" file_to_prepare = (FileToPrepare*) _tmp12_; #line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob)); -#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala" - _result_ = _tmp13_; + _result_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob)); #line 1724 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = _result_; + _tmp13_ = _result_; #line 1724 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp14_ != IMPORT_RESULT_SUCCESS) { -#line 13605 "BatchImport.c" - FileToPrepare* _tmp15_; - BatchImportJob* _tmp16_; - FileToPrepare* _tmp17_; - BatchImportJob* _tmp18_; + if (_tmp13_ != IMPORT_RESULT_SUCCESS) { +#line 14196 "BatchImport.c" + FileToPrepare* _tmp14_; + BatchImportJob* _tmp15_; + FileToPrepare* _tmp16_; + BatchImportJob* _tmp17_; + gchar* _tmp18_; gchar* _tmp19_; - gchar* _tmp20_; - FileToPrepare* _tmp21_; - BatchImportJob* _tmp22_; + FileToPrepare* _tmp20_; + BatchImportJob* _tmp21_; + gchar* _tmp22_; gchar* _tmp23_; - gchar* _tmp24_; - ImportResult _tmp25_; + ImportResult _tmp24_; #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = file_to_prepare; + _tmp14_ = file_to_prepare; #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = _tmp15_->job; + _tmp15_ = _tmp14_->job; #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = file_to_prepare; + _tmp16_ = file_to_prepare; #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = _tmp17_->job; + _tmp17_ = _tmp16_->job; #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = batch_import_job_get_dest_identifier (_tmp18_); + _tmp18_ = batch_import_job_get_dest_identifier (_tmp17_); #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp21_ = file_to_prepare; + _tmp20_ = file_to_prepare; #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp22_ = _tmp21_->job; + _tmp21_ = _tmp20_->job; #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp23_ = batch_import_job_get_source_identifier (_tmp22_); + _tmp22_ = batch_import_job_get_source_identifier (_tmp21_); #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp25_ = _result_; + _tmp24_ = _result_; #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" - background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp16_, NULL, _tmp20_, _tmp24_, _tmp25_); + background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp15_, NULL, _tmp19_, _tmp23_, _tmp24_); #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp24_); + _g_free0 (_tmp23_); #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp19_); #line 1728 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (file_to_prepare); #line 1728 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 13649 "BatchImport.c" +#line 14240 "BatchImport.c" } #line 1731 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp26_ = file_to_prepare; + _tmp25_ = file_to_prepare; #line 1731 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp27_ = _tmp26_->job; + _tmp26_ = _tmp25_->job; #line 1731 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp28_ = _batch_import_job_ref0 (_tmp27_); + _tmp27_ = _batch_import_job_ref0 (_tmp26_); #line 1731 "/home/jens/Source/shotwell/src/BatchImport.vala" - job = _tmp28_; + job = _tmp27_; #line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp29_ = file_to_prepare; + _tmp28_ = file_to_prepare; #line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp30_ = _tmp29_->file; + _tmp29_ = _tmp28_->file; #line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp31_ = _g_object_ref0 (_tmp30_); + _tmp30_ = _g_object_ref0 (_tmp29_); #line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala" - file = _tmp31_; + file = _tmp30_; #line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp33_ = file_to_prepare; + _tmp32_ = file_to_prepare; #line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp34_ = _tmp33_->associated; + _tmp33_ = _tmp32_->associated; #line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp34_ != NULL) { -#line 13673 "BatchImport.c" + if (_tmp33_ != NULL) { +#line 14264 "BatchImport.c" + FileToPrepare* _tmp34_; FileToPrepare* _tmp35_; - FileToPrepare* _tmp36_; - GFile* _tmp37_; + GFile* _tmp36_; #line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp35_ = file_to_prepare; + _tmp34_ = file_to_prepare; #line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp36_ = _tmp35_->associated; + _tmp35_ = _tmp34_->associated; #line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp37_ = _tmp36_->file; + _tmp36_ = _tmp35_->file; #line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp32_ = _tmp37_; -#line 13685 "BatchImport.c" + _tmp31_ = _tmp36_; +#line 14276 "BatchImport.c" } else { #line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp32_ = NULL; -#line 13689 "BatchImport.c" + _tmp31_ = NULL; +#line 14280 "BatchImport.c" } #line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp38_ = _g_object_ref0 (_tmp32_); + _tmp37_ = _g_object_ref0 (_tmp31_); #line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala" - associated = _tmp38_; + associated = _tmp37_; #line 1734 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp39_ = file_to_prepare; + _tmp38_ = file_to_prepare; #line 1734 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp40_ = _tmp39_->copy_to_library; + _tmp39_ = _tmp38_->copy_to_library; #line 1734 "/home/jens/Source/shotwell/src/BatchImport.vala" - copy_to_library = _tmp40_; + copy_to_library = _tmp39_; #line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp41_ = file; + _tmp40_ = file; #line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp41_ == NULL) { -#line 13705 "BatchImport.c" - BatchImportJob* _tmp42_; - GFile* _tmp43_ = NULL; - gboolean _tmp44_ = FALSE; - gboolean _tmp45_; + if (_tmp40_ == NULL) { +#line 14296 "BatchImport.c" + BatchImportJob* _tmp41_; + GFile* _tmp42_ = NULL; + gboolean _tmp43_ = FALSE; + gboolean _tmp44_; #line 1738 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp42_ = job; + _tmp41_ = job; #line 1738 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp45_ = prepare_files_job_create_file (self, _tmp42_, &_tmp43_, &_tmp44_); + _tmp44_ = prepare_files_job_create_file (self, _tmp41_, &_tmp42_, &_tmp43_); #line 1738 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (file); #line 1738 "/home/jens/Source/shotwell/src/BatchImport.vala" - file = _tmp43_; + file = _tmp42_; #line 1738 "/home/jens/Source/shotwell/src/BatchImport.vala" - copy_to_library = _tmp44_; + copy_to_library = _tmp43_; #line 1738 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!_tmp45_) { + if (!_tmp44_) { #line 1739 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (associated); #line 1739 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -13735,204 +14326,204 @@ static void prepare_files_job_real_execute (BackgroundJob* base) { _file_to_prepare_unref0 (file_to_prepare); #line 1739 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 13732 "BatchImport.c" +#line 14323 "BatchImport.c" } } #line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp47_ = associated; + _tmp46_ = associated; #line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp47_ == NULL) { -#line 13739 "BatchImport.c" + if (_tmp46_ == NULL) { +#line 14330 "BatchImport.c" + FileToPrepare* _tmp47_; FileToPrepare* _tmp48_; - FileToPrepare* _tmp49_; #line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp48_ = file_to_prepare; + _tmp47_ = file_to_prepare; #line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp49_ = _tmp48_->associated; + _tmp48_ = _tmp47_->associated; #line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp46_ = _tmp49_ != NULL; -#line 13748 "BatchImport.c" + _tmp45_ = _tmp48_ != NULL; +#line 14339 "BatchImport.c" } else { #line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp46_ = FALSE; -#line 13752 "BatchImport.c" + _tmp45_ = FALSE; +#line 14343 "BatchImport.c" } #line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp46_) { -#line 13756 "BatchImport.c" + if (_tmp45_) { +#line 14347 "BatchImport.c" + FileToPrepare* _tmp49_; FileToPrepare* _tmp50_; - FileToPrepare* _tmp51_; - BatchImportJob* _tmp52_; - GFile* _tmp53_ = NULL; - gboolean _tmp54_ = FALSE; + BatchImportJob* _tmp51_; + GFile* _tmp52_ = NULL; + gboolean _tmp53_ = FALSE; #line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp50_ = file_to_prepare; + _tmp49_ = file_to_prepare; #line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp51_ = _tmp50_->associated; + _tmp50_ = _tmp49_->associated; #line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp52_ = _tmp51_->job; + _tmp51_ = _tmp50_->job; #line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala" - prepare_files_job_create_file (self, _tmp52_, &_tmp53_, &_tmp54_); + prepare_files_job_create_file (self, _tmp51_, &_tmp52_, &_tmp53_); #line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (associated); #line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala" - associated = _tmp53_; + associated = _tmp52_; #line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala" - copy_to_library = _tmp54_; -#line 13776 "BatchImport.c" + copy_to_library = _tmp53_; +#line 14367 "BatchImport.c" } #line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp55_ = job; + _tmp54_ = job; #line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp56_ = file; + _tmp55_ = file; #line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp57_ = associated; + _tmp56_ = associated; #line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp58_ = copy_to_library; + _tmp57_ = copy_to_library; #line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp60_ = prepare_files_job_prepare_file (self, _tmp55_, _tmp56_, _tmp57_, _tmp58_, &_tmp59_); + _tmp59_ = prepare_files_job_prepare_file (self, _tmp54_, _tmp55_, _tmp56_, _tmp57_, &_tmp58_); #line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (prepared_file); #line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala" - prepared_file = _tmp59_; + prepared_file = _tmp58_; #line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala" - _result_ = _tmp60_; + _result_ = _tmp59_; #line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp61_ = _result_; + _tmp60_ = _result_; #line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp61_ == IMPORT_RESULT_SUCCESS) { -#line 13798 "BatchImport.c" - gint _tmp62_; - GeeArrayList* _tmp63_; - PreparedFile* _tmp64_; + if (_tmp60_ == IMPORT_RESULT_SUCCESS) { +#line 14389 "BatchImport.c" + gint _tmp61_; + GeeArrayList* _tmp62_; + PreparedFile* _tmp63_; #line 1749 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp62_ = self->prepared_files; + _tmp61_ = self->prepared_files; #line 1749 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->prepared_files = _tmp62_ + 1; + self->prepared_files = _tmp61_ + 1; #line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp63_ = list; + _tmp62_ = list; #line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp64_ = prepared_file; + _tmp63_ = prepared_file; #line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp64_); -#line 13812 "BatchImport.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp63_); +#line 14403 "BatchImport.c" } else { - BatchImportJob* _tmp65_; - GFile* _tmp66_; - BatchImportJob* _tmp67_; + BatchImportJob* _tmp64_; + GFile* _tmp65_; + BatchImportJob* _tmp66_; + gchar* _tmp67_; gchar* _tmp68_; - gchar* _tmp69_; - GFile* _tmp70_; + GFile* _tmp69_; + gchar* _tmp70_; gchar* _tmp71_; - gchar* _tmp72_; - ImportResult _tmp73_; + ImportResult _tmp72_; #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp65_ = job; + _tmp64_ = job; #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp66_ = file; + _tmp65_ = file; #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp67_ = job; + _tmp66_ = job; #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp68_ = batch_import_job_get_source_identifier (_tmp67_); + _tmp67_ = batch_import_job_get_source_identifier (_tmp66_); #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp69_ = _tmp68_; + _tmp68_ = _tmp67_; #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp70_ = file; + _tmp69_ = file; #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp71_ = g_file_get_path (_tmp70_); + _tmp70_ = g_file_get_path (_tmp69_); #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp72_ = _tmp71_; + _tmp71_ = _tmp70_; #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp73_ = _result_; + _tmp72_ = _result_; #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala" - background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp65_, _tmp66_, _tmp69_, _tmp72_, _tmp73_); + background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp64_, _tmp65_, _tmp68_, _tmp71_, _tmp72_); #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp72_); + _g_free0 (_tmp71_); #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp69_); -#line 13847 "BatchImport.c" + _g_free0 (_tmp68_); +#line 14438 "BatchImport.c" } #line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp75_ = list; + _tmp74_ = list; #line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp76_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp75_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp77_ = _tmp76_; + _tmp76_ = _tmp75_; #line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp77_ >= BATCH_IMPORT_REPORT_EVERY_N_PREPARED_FILES) { + if (_tmp76_ >= BATCH_IMPORT_REPORT_EVERY_N_PREPARED_FILES) { #line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp74_ = TRUE; -#line 13859 "BatchImport.c" + _tmp73_ = TRUE; +#line 14450 "BatchImport.c" } else { - gboolean _tmp78_ = FALSE; - GTimer* _tmp79_; - gdouble _tmp80_; + gboolean _tmp77_ = FALSE; + GTimer* _tmp78_; + gdouble _tmp79_; #line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp79_ = timer; + _tmp78_ = timer; #line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp80_ = g_timer_elapsed (_tmp79_, NULL); + _tmp79_ = g_timer_elapsed (_tmp78_, NULL); #line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" - if ((_tmp80_ * 1000.0) > ((gdouble) BATCH_IMPORT_REPORT_PREPARED_FILES_EVERY_N_MSEC)) { -#line 13870 "BatchImport.c" - GeeArrayList* _tmp81_; + if ((_tmp79_ * 1000.0) > ((gdouble) BATCH_IMPORT_REPORT_PREPARED_FILES_EVERY_N_MSEC)) { +#line 14461 "BatchImport.c" + GeeArrayList* _tmp80_; + gint _tmp81_; gint _tmp82_; - gint _tmp83_; #line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp81_ = list; + _tmp80_ = list; #line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp82_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp81_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp83_ = _tmp82_; + _tmp82_ = _tmp81_; #line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp78_ = _tmp83_ > 0; -#line 13882 "BatchImport.c" + _tmp77_ = _tmp82_ > 0; +#line 14473 "BatchImport.c" } else { #line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp78_ = FALSE; -#line 13886 "BatchImport.c" + _tmp77_ = FALSE; +#line 14477 "BatchImport.c" } #line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp74_ = _tmp78_; -#line 13890 "BatchImport.c" + _tmp73_ = _tmp77_; +#line 14481 "BatchImport.c" } #line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp74_) { -#line 13894 "BatchImport.c" + if (_tmp73_) { +#line 14485 "BatchImport.c" PreparedFileCluster* cluster = NULL; - GeeArrayList* _tmp84_; - PreparedFileCluster* _tmp85_; - GeeArrayList* _tmp86_; - NotificationCallback _tmp87_; - void* _tmp87__target; - PreparedFileCluster* _tmp88_; - GTimer* _tmp89_; + GeeArrayList* _tmp83_; + PreparedFileCluster* _tmp84_; + GeeArrayList* _tmp85_; + NotificationCallback _tmp86_; + void* _tmp86__target; + PreparedFileCluster* _tmp87_; + GTimer* _tmp88_; #line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp84_ = list; + _tmp83_ = list; #line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp85_ = prepared_file_cluster_new (_tmp84_); + _tmp84_ = prepared_file_cluster_new (_tmp83_); #line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala" - cluster = _tmp85_; + cluster = _tmp84_; #line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp86_ = gee_array_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL); + _tmp85_ = gee_array_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL); #line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (list); #line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala" - list = _tmp86_; + list = _tmp85_; #line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp87_ = self->priv->notification; + _tmp86_ = self->priv->notification; #line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp87__target = self->priv->notification_target; + _tmp86__target = self->priv->notification_target; #line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp88_ = cluster; + _tmp87_ = cluster; #line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala" - background_job_notify (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), _tmp87_, _tmp87__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_NOTIFICATION_OBJECT, NotificationObject)); + background_job_notify (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), _tmp86_, _tmp86__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_NOTIFICATION_OBJECT, NotificationObject)); #line 1764 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp89_ = timer; + _tmp88_ = timer; #line 1764 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_timer_start (_tmp89_); + g_timer_start (_tmp88_); #line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala" _notification_object_unref0 (cluster); -#line 13929 "BatchImport.c" +#line 14520 "BatchImport.c" } #line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (prepared_file); @@ -13944,192 +14535,189 @@ static void prepare_files_job_real_execute (BackgroundJob* base) { _batch_import_job_unref0 (job); #line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (file_to_prepare); -#line 13941 "BatchImport.c" +#line 14532 "BatchImport.c" } #line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_file_to_prepare_list); -#line 13945 "BatchImport.c" +#line 14536 "BatchImport.c" } #line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp90_ = list; + _tmp89_ = list; #line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp91_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp90_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp89_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp92_ = _tmp91_; + _tmp91_ = _tmp90_; #line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp92_ > 0) { -#line 13955 "BatchImport.c" + if (_tmp91_ > 0) { +#line 14546 "BatchImport.c" ImportResult _result_ = 0; - ImportResult _tmp93_; - ImportResult _tmp94_; + ImportResult _tmp92_; #line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp93_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob)); -#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" - _result_ = _tmp93_; + _result_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob)); #line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp94_ = _result_; + _tmp92_ = _result_; #line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp94_ == IMPORT_RESULT_SUCCESS) { -#line 13967 "BatchImport.c" - NotificationCallback _tmp95_; - void* _tmp95__target; - GeeArrayList* _tmp96_; - PreparedFileCluster* _tmp97_; - PreparedFileCluster* _tmp98_; + if (_tmp92_ == IMPORT_RESULT_SUCCESS) { +#line 14555 "BatchImport.c" + NotificationCallback _tmp93_; + void* _tmp93__target; + GeeArrayList* _tmp94_; + PreparedFileCluster* _tmp95_; + PreparedFileCluster* _tmp96_; #line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp95_ = self->priv->notification; + _tmp93_ = self->priv->notification; #line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp95__target = self->priv->notification_target; + _tmp93__target = self->priv->notification_target; #line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp96_ = list; + _tmp94_ = list; #line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp97_ = prepared_file_cluster_new (_tmp96_); + _tmp95_ = prepared_file_cluster_new (_tmp94_); #line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp98_ = _tmp97_; + _tmp96_ = _tmp95_; #line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala" - background_job_notify (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), _tmp95_, _tmp95__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, TYPE_NOTIFICATION_OBJECT, NotificationObject)); + background_job_notify (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), _tmp93_, _tmp93__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, TYPE_NOTIFICATION_OBJECT, NotificationObject)); #line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala" - _notification_object_unref0 (_tmp98_); -#line 13987 "BatchImport.c" + _notification_object_unref0 (_tmp96_); +#line 14575 "BatchImport.c" } else { + gint _tmp97_; + GeeArrayList* _tmp98_; gint _tmp99_; - GeeArrayList* _tmp100_; + gint _tmp100_; gint _tmp101_; - gint _tmp102_; + GeeArrayList* _tmp102_; gint _tmp103_; - GeeArrayList* _tmp104_; - gint _tmp105_; - gint _tmp106_; + gint _tmp104_; #line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp99_ = self->prepared_files; + _tmp97_ = self->prepared_files; #line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp100_ = list; + _tmp98_ = list; #line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp101_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp99_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp102_ = _tmp101_; + _tmp100_ = _tmp99_; #line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala" - _vala_assert (_tmp99_ >= _tmp102_, "prepared_files >= list.size"); + _vala_assert (_tmp97_ >= _tmp100_, "prepared_files >= list.size"); #line 1775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp103_ = self->prepared_files; + _tmp101_ = self->prepared_files; #line 1775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp104_ = list; + _tmp102_ = list; #line 1775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp105_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp103_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp106_ = _tmp105_; + _tmp104_ = _tmp103_; #line 1775 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->prepared_files = _tmp103_ - _tmp106_; -#line 14017 "BatchImport.c" + self->prepared_files = _tmp101_ - _tmp104_; +#line 14605 "BatchImport.c" { GeeArrayList* _prepared_file_list = NULL; - GeeArrayList* _tmp107_; - GeeArrayList* _tmp108_; + GeeArrayList* _tmp105_; + GeeArrayList* _tmp106_; gint _prepared_file_size = 0; - GeeArrayList* _tmp109_; - gint _tmp110_; - gint _tmp111_; + GeeArrayList* _tmp107_; + gint _tmp108_; + gint _tmp109_; gint _prepared_file_index = 0; #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp107_ = list; + _tmp105_ = list; #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp108_ = _g_object_ref0 (_tmp107_); + _tmp106_ = _g_object_ref0 (_tmp105_); #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" - _prepared_file_list = _tmp108_; + _prepared_file_list = _tmp106_; #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp109_ = _prepared_file_list; + _tmp107_ = _prepared_file_list; #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp110_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp108_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp111_ = _tmp110_; + _tmp109_ = _tmp108_; #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" - _prepared_file_size = _tmp111_; + _prepared_file_size = _tmp109_; #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_index = -1; #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 14045 "BatchImport.c" +#line 14633 "BatchImport.c" + gint _tmp110_; + gint _tmp111_; gint _tmp112_; - gint _tmp113_; - gint _tmp114_; PreparedFile* prepared_file = NULL; - GeeArrayList* _tmp115_; - gint _tmp116_; - gpointer _tmp117_; + GeeArrayList* _tmp113_; + gint _tmp114_; + gpointer _tmp115_; + PreparedFile* _tmp116_; + BatchImportJob* _tmp117_; PreparedFile* _tmp118_; - BatchImportJob* _tmp119_; + GFile* _tmp119_; PreparedFile* _tmp120_; - GFile* _tmp121_; - PreparedFile* _tmp122_; - BatchImportJob* _tmp123_; - gchar* _tmp124_; - gchar* _tmp125_; - PreparedFile* _tmp126_; - GFile* _tmp127_; - gchar* _tmp128_; - gchar* _tmp129_; - ImportResult _tmp130_; + BatchImportJob* _tmp121_; + gchar* _tmp122_; + gchar* _tmp123_; + PreparedFile* _tmp124_; + GFile* _tmp125_; + gchar* _tmp126_; + gchar* _tmp127_; + ImportResult _tmp128_; #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp112_ = _prepared_file_index; + _tmp110_ = _prepared_file_index; #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" - _prepared_file_index = _tmp112_ + 1; + _prepared_file_index = _tmp110_ + 1; #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp113_ = _prepared_file_index; + _tmp111_ = _prepared_file_index; #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp114_ = _prepared_file_size; + _tmp112_ = _prepared_file_size; #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!(_tmp113_ < _tmp114_)) { + if (!(_tmp111_ < _tmp112_)) { #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 14078 "BatchImport.c" +#line 14666 "BatchImport.c" } #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp115_ = _prepared_file_list; + _tmp113_ = _prepared_file_list; #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp116_ = _prepared_file_index; + _tmp114_ = _prepared_file_index; #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp117_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp116_); + _tmp115_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp113_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp114_); #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" - prepared_file = (PreparedFile*) _tmp117_; + prepared_file = (PreparedFile*) _tmp115_; #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp118_ = prepared_file; + _tmp116_ = prepared_file; #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp119_ = _tmp118_->job; + _tmp117_ = _tmp116_->job; #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp120_ = prepared_file; + _tmp118_ = prepared_file; #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp121_ = _tmp120_->file; + _tmp119_ = _tmp118_->file; #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp122_ = prepared_file; + _tmp120_ = prepared_file; #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp123_ = _tmp122_->job; + _tmp121_ = _tmp120_->job; #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp124_ = batch_import_job_get_source_identifier (_tmp123_); + _tmp122_ = batch_import_job_get_source_identifier (_tmp121_); #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp125_ = _tmp124_; + _tmp123_ = _tmp122_; #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp126_ = prepared_file; + _tmp124_ = prepared_file; #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp127_ = _tmp126_->file; + _tmp125_ = _tmp124_->file; #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp128_ = g_file_get_path (_tmp127_); + _tmp126_ = g_file_get_path (_tmp125_); #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp129_ = _tmp128_; + _tmp127_ = _tmp126_; #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp130_ = _result_; + _tmp128_ = _result_; #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala" - background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp119_, _tmp121_, _tmp125_, _tmp129_, _tmp130_); + background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp117_, _tmp119_, _tmp123_, _tmp127_, _tmp128_); #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp129_); + _g_free0 (_tmp127_); #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp125_); + _g_free0 (_tmp123_); #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (prepared_file); -#line 14122 "BatchImport.c" +#line 14710 "BatchImport.c" } #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_prepared_file_list); -#line 14126 "BatchImport.c" +#line 14714 "BatchImport.c" } } } @@ -14137,11 +14725,16 @@ static void prepare_files_job_real_execute (BackgroundJob* base) { _g_object_unref0 (list); #line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_timer_destroy0 (timer); -#line 14134 "BatchImport.c" +#line 14722 "BatchImport.c" } -static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImportJob* job, GFile* * file, gboolean* copy_to_library) { +static gboolean +prepare_files_job_create_file (PrepareFilesJob* self, + BatchImportJob* job, + GFile* * file, + gboolean* copy_to_library) +{ GFile* _vala_file = NULL; gboolean _vala_copy_to_library = FALSE; gboolean result = FALSE; @@ -14150,121 +14743,100 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor g_return_val_if_fail (IS_PREPARE_FILES_JOB (self), FALSE); #line 1787 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), FALSE); -#line 14147 "BatchImport.c" +#line 14740 "BatchImport.c" { gboolean _tmp0_ = FALSE; - BatchImportJob* _tmp1_; - GFile* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_; -#line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = job; + GFile* _tmp1_ = NULL; + gboolean _tmp2_ = FALSE; + gboolean _tmp3_; #line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = batch_import_job_prepare (_tmp1_, &_tmp2_, &_tmp3_, &_inner_error_); + _tmp3_ = batch_import_job_prepare (job, &_tmp1_, &_tmp2_, &_inner_error_); #line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_vala_file); #line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala" - _vala_file = _tmp2_; + _vala_file = _tmp1_; #line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala" - _vala_copy_to_library = _tmp3_; + _vala_copy_to_library = _tmp2_; #line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14168 "BatchImport.c" +#line 14758 "BatchImport.c" goto __catch429_g_error; } #line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!_tmp0_) { -#line 14173 "BatchImport.c" - BatchImportJob* _tmp5_; - BatchImportJob* _tmp6_; +#line 14763 "BatchImport.c" + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; gchar* _tmp7_; - gchar* _tmp8_; - BatchImportJob* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; -#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = job; #line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = job; + _tmp4_ = batch_import_job_get_source_identifier (job); #line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = batch_import_job_get_source_identifier (_tmp6_); + _tmp5_ = _tmp4_; #line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = _tmp7_; + _tmp6_ = batch_import_job_get_dest_identifier (job); #line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = job; + _tmp7_ = _tmp6_; #line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = batch_import_job_get_dest_identifier (_tmp9_); + background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), job, NULL, _tmp5_, _tmp7_, IMPORT_RESULT_FILE_ERROR); #line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = _tmp10_; -#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala" - background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp5_, NULL, _tmp8_, _tmp11_, IMPORT_RESULT_FILE_ERROR); -#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp7_); #line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp5_); #line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala" result = FALSE; #line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala" if (file) { #line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala" *file = _vala_file; -#line 14207 "BatchImport.c" +#line 14788 "BatchImport.c" } else { #line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_vala_file); -#line 14211 "BatchImport.c" +#line 14792 "BatchImport.c" } #line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala" if (copy_to_library) { #line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala" *copy_to_library = _vala_copy_to_library; -#line 14217 "BatchImport.c" +#line 14798 "BatchImport.c" } #line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 14221 "BatchImport.c" +#line 14802 "BatchImport.c" } } goto __finally429; __catch429_g_error: { GError* err = NULL; - BatchImportJob* _tmp12_; - BatchImportJob* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; - BatchImportJob* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; - GError* _tmp19_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + GError* _tmp12_; #line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; #line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; #line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = job; -#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = job; -#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = batch_import_job_get_source_identifier (_tmp13_); + _tmp8_ = batch_import_job_get_source_identifier (job); #line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = _tmp14_; -#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = job; + _tmp9_ = _tmp8_; #line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = batch_import_job_get_dest_identifier (_tmp16_); + _tmp10_ = batch_import_job_get_dest_identifier (job); #line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = _tmp17_; + _tmp11_ = _tmp10_; #line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = err; + _tmp12_ = err; #line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala" - background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp12_, NULL, _tmp15_, _tmp18_, _tmp19_, IMPORT_RESULT_FILE_ERROR); + background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), job, NULL, _tmp9_, _tmp11_, _tmp12_, IMPORT_RESULT_FILE_ERROR); #line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp11_); #line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp9_); #line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala" result = FALSE; #line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -14273,34 +14845,34 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor if (file) { #line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala" *file = _vala_file; -#line 14270 "BatchImport.c" +#line 14842 "BatchImport.c" } else { #line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_vala_file); -#line 14274 "BatchImport.c" +#line 14846 "BatchImport.c" } #line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala" if (copy_to_library) { #line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala" *copy_to_library = _vala_copy_to_library; -#line 14280 "BatchImport.c" +#line 14852 "BatchImport.c" } #line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 14284 "BatchImport.c" +#line 14856 "BatchImport.c" } __finally429: #line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14289 "BatchImport.c" - gboolean _tmp20_ = FALSE; +#line 14861 "BatchImport.c" + gboolean _tmp13_ = FALSE; #line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala" g_clear_error (&_inner_error_); #line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala" - return _tmp20_; -#line 14297 "BatchImport.c" + return _tmp13_; +#line 14869 "BatchImport.c" } #line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala" result = TRUE; @@ -14308,67 +14880,62 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor if (file) { #line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala" *file = _vala_file; -#line 14305 "BatchImport.c" +#line 14877 "BatchImport.c" } else { #line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_vala_file); -#line 14309 "BatchImport.c" +#line 14881 "BatchImport.c" } #line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala" if (copy_to_library) { #line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala" *copy_to_library = _vala_copy_to_library; -#line 14315 "BatchImport.c" +#line 14887 "BatchImport.c" } #line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 14319 "BatchImport.c" +#line 14891 "BatchImport.c" } -static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, BatchImportJob* job, GFile* file, GFile* associated_file, gboolean copy_to_library, PreparedFile* * prepared_file) { +static ImportResult +prepare_files_job_prepare_file (PrepareFilesJob* self, + BatchImportJob* job, + GFile* file, + GFile* associated_file, + gboolean copy_to_library, + PreparedFile* * prepared_file) +{ PreparedFile* _vala_prepared_file = NULL; ImportResult result = 0; gboolean is_video = FALSE; - GFile* _tmp0_; + gboolean _tmp0_ = FALSE; gboolean _tmp1_; gboolean _tmp2_ = FALSE; gboolean _tmp3_; - gboolean _tmp6_ = FALSE; - gboolean _tmp7_; - gint _tmp10_; - gint _tmp11_; - gint _tmp14_; + gint _tmp4_; + gint _tmp5_; + gint _tmp8_; gchar* exif_only_md5 = NULL; gchar* thumbnail_md5 = NULL; gchar* full_md5 = NULL; PhotoFileFormat file_format = 0; - GFile* _tmp28_; - PhotoFileFormat _tmp29_; - gboolean _tmp30_; + gboolean _tmp19_; guint64 filesize = 0ULL; gboolean is_in_library_dir = FALSE; - GFile* _tmp68_; - GFile* _tmp69_; - gboolean _tmp70_; - gboolean _tmp71_ = FALSE; - gboolean _tmp72_; - BatchImportJob* _tmp74_; - GFile* _tmp75_; - GFile* _tmp76_; - BatchImportJob* _tmp77_; - gchar* _tmp78_; - gchar* _tmp79_; - BatchImportJob* _tmp80_; - gchar* _tmp81_; - gchar* _tmp82_; - const gchar* _tmp83_; - const gchar* _tmp84_; - const gchar* _tmp85_; - PhotoFileFormat _tmp86_; - guint64 _tmp87_; - gboolean _tmp88_; - PreparedFile* _tmp89_; + GFile* _tmp50_; + gboolean _tmp51_ = FALSE; + gchar* _tmp53_; + gchar* _tmp54_; + gchar* _tmp55_; + gchar* _tmp56_; + const gchar* _tmp57_; + const gchar* _tmp58_; + const gchar* _tmp59_; + PhotoFileFormat _tmp60_; + guint64 _tmp61_; + gboolean _tmp62_; + PreparedFile* _tmp63_; GError * _inner_error_ = NULL; #line 1804 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_PREPARE_FILES_JOB (self), 0); @@ -14383,147 +14950,129 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch #line 1806 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_prepared_file = NULL; #line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = file; -#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = video_reader_is_supported_video_file (_tmp0_); -#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala" - is_video = _tmp1_; -#line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = is_video; -#line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!_tmp3_) { -#line 14389 "BatchImport.c" - GFile* _tmp4_; - gboolean _tmp5_; + is_video = video_reader_is_supported_video_file (file); #line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = file; + _tmp1_ = is_video; #line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = photo_is_file_image (_tmp4_); + if (!_tmp1_) { #line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = !_tmp5_; -#line 14398 "BatchImport.c" + _tmp0_ = !photo_is_file_image (file); +#line 14954 "BatchImport.c" } else { #line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = FALSE; -#line 14402 "BatchImport.c" + _tmp0_ = FALSE; +#line 14958 "BatchImport.c" } #line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp2_) { + if (_tmp0_) { #line 1811 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_NOT_AN_IMAGE; #line 1811 "/home/jens/Source/shotwell/src/BatchImport.vala" if (prepared_file) { #line 1811 "/home/jens/Source/shotwell/src/BatchImport.vala" *prepared_file = _vala_prepared_file; -#line 14412 "BatchImport.c" +#line 14968 "BatchImport.c" } else { #line 1811 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_vala_prepared_file); -#line 14416 "BatchImport.c" +#line 14972 "BatchImport.c" } #line 1811 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 14420 "BatchImport.c" +#line 14976 "BatchImport.c" } #line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = is_video; -#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!_tmp7_) { -#line 14426 "BatchImport.c" - GFile* _tmp8_; - gboolean _tmp9_; -#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = file; + _tmp3_ = is_video; #line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = photo_file_format_is_file_supported (_tmp8_); + if (!_tmp3_) { #line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = !_tmp9_; -#line 14435 "BatchImport.c" + _tmp2_ = !photo_file_format_is_file_supported (file); +#line 14984 "BatchImport.c" } else { #line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = FALSE; -#line 14439 "BatchImport.c" + _tmp2_ = FALSE; +#line 14988 "BatchImport.c" } #line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp6_) { + if (_tmp2_) { #line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_UNSUPPORTED_FORMAT; #line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala" if (prepared_file) { #line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala" *prepared_file = _vala_prepared_file; -#line 14449 "BatchImport.c" +#line 14998 "BatchImport.c" } else { #line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_vala_prepared_file); -#line 14453 "BatchImport.c" +#line 15002 "BatchImport.c" } #line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 14457 "BatchImport.c" +#line 15006 "BatchImport.c" } #line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = self->priv->import_file_count; + _tmp4_ = self->priv->import_file_count; #line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->import_file_count = _tmp10_ + 1; + self->priv->import_file_count = _tmp4_ + 1; #line 1819 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = self->priv->fail_every; + _tmp5_ = self->priv->fail_every; #line 1819 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp11_ > 0) { -#line 14467 "BatchImport.c" - gint _tmp12_; - gint _tmp13_; + if (_tmp5_ > 0) { +#line 15016 "BatchImport.c" + gint _tmp6_; + gint _tmp7_; #line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = self->priv->import_file_count; + _tmp6_ = self->priv->import_file_count; #line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = self->priv->fail_every; + _tmp7_ = self->priv->fail_every; #line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala" - if ((_tmp12_ % _tmp13_) == 0) { + if ((_tmp6_ % _tmp7_) == 0) { #line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_FILE_ERROR; #line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala" if (prepared_file) { #line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala" *prepared_file = _vala_prepared_file; -#line 14482 "BatchImport.c" +#line 15031 "BatchImport.c" } else { #line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_vala_prepared_file); -#line 14486 "BatchImport.c" +#line 15035 "BatchImport.c" } #line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 14490 "BatchImport.c" +#line 15039 "BatchImport.c" } } #line 1825 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = self->priv->skip_every; + _tmp8_ = self->priv->skip_every; #line 1825 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp14_ > 0) { -#line 14497 "BatchImport.c" - gint _tmp15_; - gint _tmp16_; + if (_tmp8_ > 0) { +#line 15046 "BatchImport.c" + gint _tmp9_; + gint _tmp10_; #line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = self->priv->import_file_count; + _tmp9_ = self->priv->import_file_count; #line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = self->priv->skip_every; + _tmp10_ = self->priv->skip_every; #line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala" - if ((_tmp15_ % _tmp16_) == 0) { + if ((_tmp9_ % _tmp10_) == 0) { #line 1827 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_NOT_A_FILE; #line 1827 "/home/jens/Source/shotwell/src/BatchImport.vala" if (prepared_file) { #line 1827 "/home/jens/Source/shotwell/src/BatchImport.vala" *prepared_file = _vala_prepared_file; -#line 14512 "BatchImport.c" +#line 15061 "BatchImport.c" } else { #line 1827 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_vala_prepared_file); -#line 14516 "BatchImport.c" +#line 15065 "BatchImport.c" } #line 1827 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 14520 "BatchImport.c" +#line 15069 "BatchImport.c" } } #line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -14532,70 +15081,61 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch thumbnail_md5 = NULL; #line 1832 "/home/jens/Source/shotwell/src/BatchImport.vala" full_md5 = NULL; -#line 14529 "BatchImport.c" +#line 15078 "BatchImport.c" { - gchar* _tmp17_ = NULL; - GFile* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; -#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = file; + gchar* _tmp11_ = NULL; + gchar* _tmp12_; + gchar* _tmp13_; #line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = md5_file (_tmp18_, &_inner_error_); + _tmp12_ = md5_file (file, &_inner_error_); #line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = _tmp19_; + _tmp11_ = _tmp12_; #line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14543 "BatchImport.c" +#line 15089 "BatchImport.c" goto __catch430_g_error; } #line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp20_ = _tmp17_; + _tmp13_ = _tmp11_; #line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = NULL; + _tmp11_ = NULL; #line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (full_md5); #line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala" - full_md5 = _tmp20_; + full_md5 = _tmp13_; #line 1834 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp17_); -#line 14556 "BatchImport.c" + _g_free0 (_tmp11_); +#line 15102 "BatchImport.c" } goto __finally430; __catch430_g_error: { GError* err = NULL; - GFile* _tmp21_; - gchar* _tmp22_; - gchar* _tmp23_; - GError* _tmp24_; - const gchar* _tmp25_; - GError* _tmp26_; - ImportResult _tmp27_; + gchar* _tmp14_; + gchar* _tmp15_; + GError* _tmp16_; + const gchar* _tmp17_; + GError* _tmp18_; #line 1834 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; #line 1834 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; #line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp21_ = file; -#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp22_ = g_file_get_path (_tmp21_); + _tmp14_ = g_file_get_path (file); #line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp23_ = _tmp22_; + _tmp15_ = _tmp14_; #line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp24_ = err; + _tmp16_ = err; #line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp25_ = _tmp24_->message; + _tmp17_ = _tmp16_->message; #line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_warning ("BatchImport.vala:1840: Unable to perform MD5 checksum on file %s: %s", _tmp23_, _tmp25_); + g_warning ("BatchImport.vala:1840: Unable to perform MD5 checksum on file %s: %s", _tmp15_, _tmp17_); #line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp23_); -#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp26_ = err; + _g_free0 (_tmp15_); #line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp27_ = import_result_convert_error (_tmp26_, IMPORT_RESULT_FILE_ERROR); + _tmp18_ = err; #line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp27_; + result = import_result_convert_error (_tmp18_, IMPORT_RESULT_FILE_ERROR); #line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); #line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -14608,15 +15148,15 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch if (prepared_file) { #line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala" *prepared_file = _vala_prepared_file; -#line 14605 "BatchImport.c" +#line 15145 "BatchImport.c" } else { #line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_vala_prepared_file); -#line 14609 "BatchImport.c" +#line 15149 "BatchImport.c" } #line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 14613 "BatchImport.c" +#line 15153 "BatchImport.c" } __finally430: #line 1834 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -14633,47 +15173,39 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch g_clear_error (&_inner_error_); #line 1834 "/home/jens/Source/shotwell/src/BatchImport.vala" return 0; -#line 14630 "BatchImport.c" +#line 15170 "BatchImport.c" } #line 1848 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp28_ = file; -#line 1848 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp29_ = photo_file_format_get_by_file_extension (_tmp28_); -#line 1848 "/home/jens/Source/shotwell/src/BatchImport.vala" - file_format = _tmp29_; + file_format = photo_file_format_get_by_file_extension (file); #line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp30_ = is_video; + _tmp19_ = is_video; #line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (!_tmp30_) { -#line 14642 "BatchImport.c" - PhotoFileFormat _tmp31_; + if (!_tmp19_) { +#line 15178 "BatchImport.c" + PhotoFileFormat _tmp20_; PhotoFileReader* reader = NULL; - PhotoFileFormat _tmp35_; - GFile* _tmp36_; - gchar* _tmp37_; - gchar* _tmp38_; - PhotoFileReader* _tmp39_; - PhotoFileReader* _tmp40_; + PhotoFileFormat _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; + PhotoFileReader* _tmp26_; + PhotoFileReader* _tmp27_; PhotoMetadata* metadata = NULL; - PhotoMetadata* _tmp50_; + PhotoMetadata* _tmp36_; #line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp31_ = file_format; + _tmp20_ = file_format; #line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp31_ == PHOTO_FILE_FORMAT_UNKNOWN) { -#line 14657 "BatchImport.c" - GFile* _tmp32_; - gchar* _tmp33_; - gchar* _tmp34_; + if (_tmp20_ == PHOTO_FILE_FORMAT_UNKNOWN) { +#line 15192 "BatchImport.c" + gchar* _tmp21_; + gchar* _tmp22_; #line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp32_ = file; + _tmp21_ = g_file_get_path (file); #line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp33_ = g_file_get_path (_tmp32_); + _tmp22_ = _tmp21_; #line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp34_ = _tmp33_; + g_warning ("BatchImport.vala:1851: Skipping %s: unrecognized file extension", _tmp22_); #line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_warning ("BatchImport.vala:1851: Skipping %s: unrecognized file extension", _tmp34_); -#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp34_); + _g_free0 (_tmp22_); #line 1853 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_UNSUPPORTED_FORMAT; #line 1853 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -14686,94 +15218,89 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch if (prepared_file) { #line 1853 "/home/jens/Source/shotwell/src/BatchImport.vala" *prepared_file = _vala_prepared_file; -#line 14683 "BatchImport.c" +#line 15215 "BatchImport.c" } else { #line 1853 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_vala_prepared_file); -#line 14687 "BatchImport.c" +#line 15219 "BatchImport.c" } #line 1853 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 14691 "BatchImport.c" +#line 15223 "BatchImport.c" } #line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp35_ = file_format; -#line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp36_ = file; + _tmp23_ = file_format; #line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp37_ = g_file_get_path (_tmp36_); + _tmp24_ = g_file_get_path (file); #line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp38_ = _tmp37_; + _tmp25_ = _tmp24_; #line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp39_ = photo_file_format_create_reader (_tmp35_, _tmp38_); + _tmp26_ = photo_file_format_create_reader (_tmp23_, _tmp25_); #line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp40_ = _tmp39_; + _tmp27_ = _tmp26_; #line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp38_); + _g_free0 (_tmp25_); #line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala" - reader = _tmp40_; + reader = _tmp27_; #line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala" metadata = NULL; -#line 14711 "BatchImport.c" +#line 15241 "BatchImport.c" { - PhotoMetadata* _tmp41_ = NULL; - PhotoFileReader* _tmp42_; - PhotoMetadata* _tmp43_; - PhotoMetadata* _tmp44_; + PhotoMetadata* _tmp28_ = NULL; + PhotoFileReader* _tmp29_; + PhotoMetadata* _tmp30_; + PhotoMetadata* _tmp31_; #line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp42_ = reader; + _tmp29_ = reader; #line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp43_ = photo_file_reader_read_metadata (_tmp42_, &_inner_error_); + _tmp30_ = photo_file_reader_read_metadata (_tmp29_, &_inner_error_); #line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp41_ = _tmp43_; + _tmp28_ = _tmp30_; #line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14725 "BatchImport.c" +#line 15255 "BatchImport.c" goto __catch431_g_error; } #line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp44_ = _tmp41_; + _tmp31_ = _tmp28_; #line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp41_ = NULL; + _tmp28_ = NULL; #line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala" _media_metadata_unref0 (metadata); #line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala" - metadata = _tmp44_; + metadata = _tmp31_; #line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala" - _media_metadata_unref0 (_tmp41_); -#line 14738 "BatchImport.c" + _media_metadata_unref0 (_tmp28_); +#line 15268 "BatchImport.c" } goto __finally431; __catch431_g_error: { GError* err = NULL; - GFile* _tmp45_; - gchar* _tmp46_; - gchar* _tmp47_; - GError* _tmp48_; - const gchar* _tmp49_; + gchar* _tmp32_; + gchar* _tmp33_; + GError* _tmp34_; + const gchar* _tmp35_; #line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; #line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; #line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp45_ = file; + _tmp32_ = g_file_get_path (file); #line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp46_ = g_file_get_path (_tmp45_); + _tmp33_ = _tmp32_; #line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp47_ = _tmp46_; + _tmp34_ = err; #line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp48_ = err; -#line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp49_ = _tmp48_->message; + _tmp35_ = _tmp34_->message; #line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala" g_warning ("BatchImport.vala:1860: Unable to read metadata for %s (%s): continuing" \ -" to attempt import", _tmp47_, _tmp49_); +" to attempt import", _tmp33_, _tmp35_); #line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp47_); + _g_free0 (_tmp33_); #line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 14769 "BatchImport.c" +#line 15296 "BatchImport.c" } __finally431: #line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -14794,109 +15321,97 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch g_clear_error (&_inner_error_); #line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala" return 0; -#line 14790 "BatchImport.c" +#line 15317 "BatchImport.c" } #line 1864 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp50_ = metadata; + _tmp36_ = metadata; #line 1864 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp50_ != NULL) { -#line 14796 "BatchImport.c" - PhotoMetadata* _tmp51_; - gchar* _tmp52_; - PhotoMetadata* _tmp53_; - gchar* _tmp54_; + if (_tmp36_ != NULL) { +#line 15323 "BatchImport.c" + PhotoMetadata* _tmp37_; + gchar* _tmp38_; + PhotoMetadata* _tmp39_; + gchar* _tmp40_; #line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp51_ = metadata; + _tmp37_ = metadata; #line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp52_ = photo_metadata_exif_hash (_tmp51_); + _tmp38_ = photo_metadata_exif_hash (_tmp37_); #line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (exif_only_md5); #line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala" - exif_only_md5 = _tmp52_; + exif_only_md5 = _tmp38_; #line 1866 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp53_ = metadata; + _tmp39_ = metadata; #line 1866 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp54_ = photo_metadata_thumbnail_hash (_tmp53_); + _tmp40_ = photo_metadata_thumbnail_hash (_tmp39_); #line 1866 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (thumbnail_md5); #line 1866 "/home/jens/Source/shotwell/src/BatchImport.vala" - thumbnail_md5 = _tmp54_; -#line 14817 "BatchImport.c" + thumbnail_md5 = _tmp40_; +#line 15344 "BatchImport.c" } #line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala" _media_metadata_unref0 (metadata); #line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala" _photo_file_adapter_unref0 (reader); -#line 14823 "BatchImport.c" +#line 15350 "BatchImport.c" } #line 1870 "/home/jens/Source/shotwell/src/BatchImport.vala" filesize = (guint64) 0; -#line 14827 "BatchImport.c" +#line 15354 "BatchImport.c" { - guint64 _tmp55_ = 0ULL; - GFile* _tmp56_; - GCancellable* _tmp57_; - GCancellable* _tmp58_; - guint64 _tmp59_; - guint64 _tmp60_; -#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp56_ = file; + guint64 _tmp41_ = 0ULL; + GCancellable* _tmp42_; + GCancellable* _tmp43_; + guint64 _tmp44_; #line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp57_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob)); + _tmp42_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp58_ = _tmp57_; + _tmp43_ = _tmp42_; #line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp59_ = query_total_file_size (_tmp56_, _tmp58_, &_inner_error_); + _tmp44_ = query_total_file_size (file, _tmp43_, &_inner_error_); #line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp60_ = _tmp59_; + _g_object_unref0 (_tmp43_); #line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_object_unref0 (_tmp58_); -#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp55_ = _tmp60_; + _tmp41_ = _tmp44_; #line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14851 "BatchImport.c" +#line 15372 "BatchImport.c" goto __catch432_g_error; } #line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala" - filesize = _tmp55_; -#line 14856 "BatchImport.c" + filesize = _tmp41_; +#line 15377 "BatchImport.c" } goto __finally432; __catch432_g_error: { GError* err = NULL; - GFile* _tmp61_; - gchar* _tmp62_; - gchar* _tmp63_; - GError* _tmp64_; - const gchar* _tmp65_; - GError* _tmp66_; - ImportResult _tmp67_; + gchar* _tmp45_; + gchar* _tmp46_; + GError* _tmp47_; + const gchar* _tmp48_; + GError* _tmp49_; #line 1871 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; #line 1871 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; #line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp61_ = file; + _tmp45_ = g_file_get_path (file); #line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp62_ = g_file_get_path (_tmp61_); + _tmp46_ = _tmp45_; #line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp63_ = _tmp62_; + _tmp47_ = err; #line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp64_ = err; + _tmp48_ = _tmp47_->message; #line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp65_ = _tmp64_->message; + g_warning ("BatchImport.vala:1874: Unable to query file size of %s: %s", _tmp46_, _tmp48_); #line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_warning ("BatchImport.vala:1874: Unable to query file size of %s: %s", _tmp63_, _tmp65_); -#line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp63_); -#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp66_ = err; + _g_free0 (_tmp46_); #line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp67_ = import_result_convert_error (_tmp66_, IMPORT_RESULT_FILE_ERROR); + _tmp49_ = err; #line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp67_; + result = import_result_convert_error (_tmp49_, IMPORT_RESULT_FILE_ERROR); #line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); #line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -14909,15 +15424,15 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch if (prepared_file) { #line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" *prepared_file = _vala_prepared_file; -#line 14905 "BatchImport.c" +#line 15420 "BatchImport.c" } else { #line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_vala_prepared_file); -#line 14909 "BatchImport.c" +#line 15424 "BatchImport.c" } #line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 14913 "BatchImport.c" +#line 15428 "BatchImport.c" } __finally432: #line 1871 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -14934,72 +15449,56 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch g_clear_error (&_inner_error_); #line 1871 "/home/jens/Source/shotwell/src/BatchImport.vala" return 0; -#line 14930 "BatchImport.c" +#line 15445 "BatchImport.c" } #line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp68_ = file; -#line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp69_ = self->priv->library_dir; + _tmp50_ = self->priv->library_dir; #line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp70_ = g_file_has_prefix (_tmp68_, _tmp69_); -#line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala" - is_in_library_dir = _tmp70_; -#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp72_ = copy_to_library; + is_in_library_dir = g_file_has_prefix (file, _tmp50_); #line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp72_) { -#line 14944 "BatchImport.c" - gboolean _tmp73_; + if (copy_to_library) { +#line 15453 "BatchImport.c" + gboolean _tmp52_; #line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp73_ = is_in_library_dir; + _tmp52_ = is_in_library_dir; #line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp71_ = !_tmp73_; -#line 14950 "BatchImport.c" + _tmp51_ = !_tmp52_; +#line 15459 "BatchImport.c" } else { #line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp71_ = FALSE; -#line 14954 "BatchImport.c" + _tmp51_ = FALSE; +#line 15463 "BatchImport.c" } #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp74_ = job; + _tmp53_ = batch_import_job_get_source_identifier (job); #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp75_ = file; + _tmp54_ = _tmp53_; #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp76_ = associated_file; + _tmp55_ = batch_import_job_get_dest_identifier (job); #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp77_ = job; + _tmp56_ = _tmp55_; #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp78_ = batch_import_job_get_source_identifier (_tmp77_); + _tmp57_ = exif_only_md5; #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp79_ = _tmp78_; + _tmp58_ = thumbnail_md5; #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp80_ = job; + _tmp59_ = full_md5; #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp81_ = batch_import_job_get_dest_identifier (_tmp80_); + _tmp60_ = file_format; #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp82_ = _tmp81_; + _tmp61_ = filesize; #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp83_ = exif_only_md5; + _tmp62_ = is_video; #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp84_ = thumbnail_md5; -#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp85_ = full_md5; -#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp86_ = file_format; -#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp87_ = filesize; -#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp88_ = is_video; -#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp89_ = prepared_file_new (_tmp74_, _tmp75_, _tmp76_, _tmp79_, _tmp82_, _tmp71_, _tmp83_, _tmp84_, _tmp85_, _tmp86_, _tmp87_, _tmp88_); + _tmp63_ = prepared_file_new (job, file, associated_file, _tmp54_, _tmp56_, _tmp51_, _tmp57_, _tmp58_, _tmp59_, _tmp60_, _tmp61_, _tmp62_); #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_vala_prepared_file); #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _vala_prepared_file = _tmp89_; + _vala_prepared_file = _tmp63_; #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp82_); + _g_free0 (_tmp56_); #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp79_); + _g_free0 (_tmp54_); #line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_SUCCESS; #line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -15012,19 +15511,21 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch if (prepared_file) { #line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala" *prepared_file = _vala_prepared_file; -#line 15008 "BatchImport.c" +#line 15507 "BatchImport.c" } else { #line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_vala_prepared_file); -#line 15012 "BatchImport.c" +#line 15511 "BatchImport.c" } #line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 15016 "BatchImport.c" +#line 15515 "BatchImport.c" } -static void prepare_files_job_class_init (PrepareFilesJobClass * klass) { +static void +prepare_files_job_class_init (PrepareFilesJobClass * klass) +{ #line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala" prepare_files_job_parent_class = g_type_class_peek_parent (klass); #line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -15033,11 +15534,13 @@ static void prepare_files_job_class_init (PrepareFilesJobClass * klass) { g_type_class_add_private (klass, sizeof (PrepareFilesJobPrivate)); #line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) prepare_files_job_real_execute; -#line 15029 "BatchImport.c" +#line 15530 "BatchImport.c" } -static void prepare_files_job_instance_init (PrepareFilesJob * self) { +static void +prepare_files_job_instance_init (PrepareFilesJob * self) +{ #line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv = PREPARE_FILES_JOB_GET_PRIVATE (self); #line 1687 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -15048,11 +15551,13 @@ static void prepare_files_job_instance_init (PrepareFilesJob * self) { self->priv->fail_every = 0; #line 1696 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->skip_every = 0; -#line 15044 "BatchImport.c" +#line 15547 "BatchImport.c" } -static void prepare_files_job_finalize (BackgroundJob * obj) { +static void +prepare_files_job_finalize (BackgroundJob * obj) +{ PrepareFilesJob * self; #line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREPARE_FILES_JOB, PrepareFilesJob); @@ -15062,11 +15567,13 @@ static void prepare_files_job_finalize (BackgroundJob * obj) { _g_object_unref0 (self->priv->library_dir); #line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala" BACKGROUND_JOB_CLASS (prepare_files_job_parent_class)->finalize (obj); -#line 15058 "BatchImport.c" +#line 15563 "BatchImport.c" } -GType prepare_files_job_get_type (void) { +GType +prepare_files_job_get_type (void) +{ static volatile gsize prepare_files_job_type_id__volatile = 0; if (g_once_init_enter (&prepare_files_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PrepareFilesJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) prepare_files_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PrepareFilesJob), 0, (GInstanceInitFunc) prepare_files_job_instance_init, NULL }; @@ -15078,50 +15585,58 @@ GType prepare_files_job_get_type (void) { } -static gpointer _prepared_file_ref0 (gpointer self) { +static gpointer +_prepared_file_ref0 (gpointer self) +{ #line 1908 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? prepared_file_ref (self) : NULL; -#line 15077 "BatchImport.c" +#line 15586 "BatchImport.c" } -static gpointer _batch_import_result_ref0 (gpointer self) { +static gpointer +_batch_import_result_ref0 (gpointer self) +{ #line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? batch_import_result_ref (self) : NULL; -#line 15084 "BatchImport.c" +#line 15595 "BatchImport.c" } -static gpointer _video_import_params_ref0 (gpointer self) { +static gpointer +_video_import_params_ref0 (gpointer self) +{ #line 1910 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? video_import_params_ref (self) : NULL; -#line 15091 "BatchImport.c" +#line 15604 "BatchImport.c" } -static gpointer _photo_import_params_ref0 (gpointer self) { +static gpointer +_photo_import_params_ref0 (gpointer self) +{ #line 1911 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? photo_import_params_ref (self) : NULL; -#line 15098 "BatchImport.c" +#line 15613 "BatchImport.c" } -ReadyForImport* ready_for_import_construct (GType object_type, GFile* final_file, PreparedFile* prepared_file, PhotoImportParams* photo_import_params, VideoImportParams* video_import_params, BatchImportResult* batch_result) { +ReadyForImport* +ready_for_import_construct (GType object_type, + GFile* final_file, + PreparedFile* prepared_file, + PhotoImportParams* photo_import_params, + VideoImportParams* video_import_params, + BatchImportResult* batch_result) +{ ReadyForImport* self = NULL; - PreparedFile* _tmp0_; - gboolean _tmp1_; - GFile* _tmp8_; - GFile* _tmp9_; - PreparedFile* _tmp10_; - PreparedFile* _tmp11_; - BatchImportResult* _tmp12_; - BatchImportResult* _tmp13_; - VideoImportParams* _tmp14_; - VideoImportParams* _tmp15_; - PhotoImportParams* _tmp16_; - PhotoImportParams* _tmp17_; - PreparedFile* _tmp18_; - gboolean _tmp19_; + gboolean _tmp0_; + GFile* _tmp3_; + PreparedFile* _tmp4_; + BatchImportResult* _tmp5_; + VideoImportParams* _tmp6_; + PhotoImportParams* _tmp7_; + gboolean _tmp8_; #line 1899 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_IS_FILE (final_file), NULL); #line 1899 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -15135,116 +15650,96 @@ ReadyForImport* ready_for_import_construct (GType object_type, GFile* final_file #line 1899 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (ReadyForImport*) g_type_create_instance (object_type); #line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = prepared_file; + _tmp0_ = prepared_file->is_video; #line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = _tmp0_->is_video; -#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp1_) { -#line 15136 "BatchImport.c" - gboolean _tmp2_ = FALSE; - VideoImportParams* _tmp3_; -#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = video_import_params; -#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp3_ != NULL) { -#line 15143 "BatchImport.c" - PhotoImportParams* _tmp4_; + if (_tmp0_) { +#line 15649 "BatchImport.c" + gboolean _tmp1_ = FALSE; #line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = photo_import_params; + if (video_import_params != NULL) { #line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = _tmp4_ == NULL; -#line 15149 "BatchImport.c" + _tmp1_ = photo_import_params == NULL; +#line 15655 "BatchImport.c" } else { #line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = FALSE; -#line 15153 "BatchImport.c" + _tmp1_ = FALSE; +#line 15659 "BatchImport.c" } #line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala" - _vala_assert (_tmp2_, "(video_import_params != null) && (photo_import_params == null)"); -#line 15157 "BatchImport.c" + _vala_assert (_tmp1_, "(video_import_params != null) && (photo_import_params == null)"); +#line 15663 "BatchImport.c" } else { - gboolean _tmp5_ = FALSE; - VideoImportParams* _tmp6_; -#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = video_import_params; -#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp6_ == NULL) { -#line 15165 "BatchImport.c" - PhotoImportParams* _tmp7_; + gboolean _tmp2_ = FALSE; #line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = photo_import_params; + if (video_import_params == NULL) { #line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = _tmp7_ != NULL; -#line 15171 "BatchImport.c" + _tmp2_ = photo_import_params != NULL; +#line 15670 "BatchImport.c" } else { #line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = FALSE; -#line 15175 "BatchImport.c" + _tmp2_ = FALSE; +#line 15674 "BatchImport.c" } #line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" - _vala_assert (_tmp5_, "(video_import_params == null) && (photo_import_params != null)"); -#line 15179 "BatchImport.c" + _vala_assert (_tmp2_, "(video_import_params == null) && (photo_import_params != null)"); +#line 15678 "BatchImport.c" } #line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = final_file; -#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = _g_object_ref0 (_tmp8_); + _tmp3_ = _g_object_ref0 (final_file); #line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->final_file); #line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->final_file = _tmp9_; -#line 1908 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = prepared_file; + self->final_file = _tmp3_; #line 1908 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = _prepared_file_ref0 (_tmp10_); + _tmp4_ = _prepared_file_ref0 (prepared_file); #line 1908 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (self->prepared_file); #line 1908 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->prepared_file = _tmp11_; + self->prepared_file = _tmp4_; #line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = batch_result; -#line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = _batch_import_result_ref0 (_tmp12_); + _tmp5_ = _batch_import_result_ref0 (batch_result); #line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (self->batch_result); #line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->batch_result = _tmp13_; -#line 1910 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = video_import_params; + self->batch_result = _tmp5_; #line 1910 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = _video_import_params_ref0 (_tmp14_); + _tmp6_ = _video_import_params_ref0 (video_import_params); #line 1910 "/home/jens/Source/shotwell/src/BatchImport.vala" _video_import_params_unref0 (self->video_import_params); #line 1910 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->video_import_params = _tmp15_; + self->video_import_params = _tmp6_; #line 1911 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = photo_import_params; -#line 1911 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = _photo_import_params_ref0 (_tmp16_); + _tmp7_ = _photo_import_params_ref0 (photo_import_params); #line 1911 "/home/jens/Source/shotwell/src/BatchImport.vala" _photo_import_params_unref0 (self->photo_import_params); #line 1911 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->photo_import_params = _tmp17_; -#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = prepared_file; + self->photo_import_params = _tmp7_; #line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = _tmp18_->is_video; + _tmp8_ = prepared_file->is_video; #line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->is_video = _tmp19_; + self->is_video = _tmp8_; #line 1899 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 15229 "BatchImport.c" +#line 15716 "BatchImport.c" } -ReadyForImport* ready_for_import_new (GFile* final_file, PreparedFile* prepared_file, PhotoImportParams* photo_import_params, VideoImportParams* video_import_params, BatchImportResult* batch_result) { +ReadyForImport* +ready_for_import_new (GFile* final_file, + PreparedFile* prepared_file, + PhotoImportParams* photo_import_params, + VideoImportParams* video_import_params, + BatchImportResult* batch_result) +{ #line 1899 "/home/jens/Source/shotwell/src/BatchImport.vala" return ready_for_import_construct (TYPE_READY_FOR_IMPORT, final_file, prepared_file, photo_import_params, video_import_params, batch_result); -#line 15236 "BatchImport.c" +#line 15729 "BatchImport.c" } -BatchImportResult* ready_for_import_abort (ReadyForImport* self) { +BatchImportResult* +ready_for_import_abort (ReadyForImport* self) +{ BatchImportResult* result = NULL; gboolean _tmp0_ = FALSE; GFile* _tmp1_; @@ -15270,7 +15765,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) { _tmp1_ = self->final_file; #line 1917 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp1_ != NULL) { -#line 15266 "BatchImport.c" +#line 15761 "BatchImport.c" GFile* _tmp2_; PreparedFile* _tmp3_; GFile* _tmp4_; @@ -15282,15 +15777,15 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) { _tmp4_ = _tmp3_->file; #line 1917 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp2_ != _tmp4_; -#line 15278 "BatchImport.c" +#line 15773 "BatchImport.c" } else { #line 1917 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = FALSE; -#line 15282 "BatchImport.c" +#line 15777 "BatchImport.c" } #line 1917 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp0_) { -#line 15286 "BatchImport.c" +#line 15781 "BatchImport.c" GFile* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; @@ -15304,7 +15799,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) { g_debug ("BatchImport.vala:1918: Deleting aborted import copy %s", _tmp7_); #line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp7_); -#line 15300 "BatchImport.c" +#line 15795 "BatchImport.c" { GFile* _tmp8_; #line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -15313,7 +15808,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) { g_file_delete (_tmp8_, NULL, &_inner_error_); #line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 15309 "BatchImport.c" +#line 15804 "BatchImport.c" goto __catch433_g_error; } } @@ -15347,7 +15842,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) { _g_free0 (_tmp11_); #line 1919 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 15342 "BatchImport.c" +#line 15837 "BatchImport.c" } __finally433: #line 1919 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -15358,7 +15853,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) { g_clear_error (&_inner_error_); #line 1919 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 15353 "BatchImport.c" +#line 15848 "BatchImport.c" } } #line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -15403,18 +15898,22 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) { result = _tmp28_; #line 1931 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 15398 "BatchImport.c" +#line 15893 "BatchImport.c" } -static gpointer _thumbnails_ref0 (gpointer self) { +static gpointer +_thumbnails_ref0 (gpointer self) +{ #line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? thumbnails_ref (self) : NULL; -#line 15405 "BatchImport.c" +#line 15902 "BatchImport.c" } -Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) { +Thumbnails* +ready_for_import_get_thumbnails (ReadyForImport* self) +{ Thumbnails* result = NULL; Thumbnails* _tmp0_ = NULL; PhotoImportParams* _tmp1_; @@ -15425,7 +15924,7 @@ Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) { _tmp1_ = self->photo_import_params; #line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp1_ != NULL) { -#line 15420 "BatchImport.c" +#line 15919 "BatchImport.c" PhotoImportParams* _tmp2_; Thumbnails* _tmp3_; #line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -15434,7 +15933,7 @@ Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) { _tmp3_ = _tmp2_->thumbnails; #line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp3_; -#line 15429 "BatchImport.c" +#line 15928 "BatchImport.c" } else { VideoImportParams* _tmp4_; Thumbnails* _tmp5_; @@ -15444,7 +15943,7 @@ Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) { _tmp5_ = _tmp4_->thumbnails; #line 1936 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp5_; -#line 15439 "BatchImport.c" +#line 15938 "BatchImport.c" } #line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = _thumbnails_ref0 (_tmp0_); @@ -15452,108 +15951,133 @@ Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) { result = _tmp6_; #line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 15447 "BatchImport.c" +#line 15946 "BatchImport.c" } -static void value_ready_for_import_init (GValue* value) { +static void +value_ready_for_import_init (GValue* value) +{ #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 15454 "BatchImport.c" +#line 15955 "BatchImport.c" } -static void value_ready_for_import_free_value (GValue* value) { +static void +value_ready_for_import_free_value (GValue* value) +{ #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" if (value->data[0].v_pointer) { #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" ready_for_import_unref (value->data[0].v_pointer); -#line 15463 "BatchImport.c" +#line 15966 "BatchImport.c" } } -static void value_ready_for_import_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_ready_for_import_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" if (src_value->data[0].v_pointer) { #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = ready_for_import_ref (src_value->data[0].v_pointer); -#line 15473 "BatchImport.c" +#line 15979 "BatchImport.c" } else { #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = NULL; -#line 15477 "BatchImport.c" +#line 15983 "BatchImport.c" } } -static gpointer value_ready_for_import_peek_pointer (const GValue* value) { +static gpointer +value_ready_for_import_peek_pointer (const GValue* value) +{ #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 15485 "BatchImport.c" +#line 15993 "BatchImport.c" } -static gchar* value_ready_for_import_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_ready_for_import_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" if (collect_values[0].v_pointer) { -#line 15492 "BatchImport.c" +#line 16005 "BatchImport.c" ReadyForImport * object; object = collect_values[0].v_pointer; #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" if (object->parent_instance.g_class == NULL) { #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 15499 "BatchImport.c" +#line 16012 "BatchImport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 15503 "BatchImport.c" +#line 16016 "BatchImport.c" } #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = ready_for_import_ref (object); -#line 15507 "BatchImport.c" +#line 16020 "BatchImport.c" } else { #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 15511 "BatchImport.c" +#line 16024 "BatchImport.c" } #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 15515 "BatchImport.c" +#line 16028 "BatchImport.c" } -static gchar* value_ready_for_import_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_ready_for_import_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ ReadyForImport ** object_p; object_p = collect_values[0].v_pointer; #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!object_p) { #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 15526 "BatchImport.c" +#line 16044 "BatchImport.c" } #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!value->data[0].v_pointer) { #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = NULL; -#line 15532 "BatchImport.c" +#line 16050 "BatchImport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = value->data[0].v_pointer; -#line 15536 "BatchImport.c" +#line 16054 "BatchImport.c" } else { #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = ready_for_import_ref (value->data[0].v_pointer); -#line 15540 "BatchImport.c" +#line 16058 "BatchImport.c" } #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 15544 "BatchImport.c" +#line 16062 "BatchImport.c" } -GParamSpec* param_spec_ready_for_import (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_ready_for_import (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecReadyForImport* spec; #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_READY_FOR_IMPORT), NULL); @@ -15563,20 +16087,25 @@ GParamSpec* param_spec_ready_for_import (const gchar* name, const gchar* nick, c G_PARAM_SPEC (spec)->value_type = object_type; #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" return G_PARAM_SPEC (spec); -#line 15558 "BatchImport.c" +#line 16082 "BatchImport.c" } -gpointer value_get_ready_for_import (const GValue* value) { +gpointer +value_get_ready_for_import (const GValue* value) +{ #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_READY_FOR_IMPORT), NULL); #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 15567 "BatchImport.c" +#line 16093 "BatchImport.c" } -void value_set_ready_for_import (GValue* value, gpointer v_object) { +void +value_set_ready_for_import (GValue* value, + gpointer v_object) +{ ReadyForImport * old; #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_READY_FOR_IMPORT)); @@ -15592,22 +16121,25 @@ void value_set_ready_for_import (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" ready_for_import_ref (value->data[0].v_pointer); -#line 15587 "BatchImport.c" +#line 16116 "BatchImport.c" } else { #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 15591 "BatchImport.c" +#line 16120 "BatchImport.c" } #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" ready_for_import_unref (old); -#line 15597 "BatchImport.c" +#line 16126 "BatchImport.c" } } -void value_take_ready_for_import (GValue* value, gpointer v_object) { +void +value_take_ready_for_import (GValue* value, + gpointer v_object) +{ ReadyForImport * old; #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_READY_FOR_IMPORT)); @@ -15621,38 +16153,44 @@ void value_take_ready_for_import (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = v_object; -#line 15616 "BatchImport.c" +#line 16148 "BatchImport.c" } else { #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 15620 "BatchImport.c" +#line 16152 "BatchImport.c" } #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" ready_for_import_unref (old); -#line 15626 "BatchImport.c" +#line 16158 "BatchImport.c" } } -static void ready_for_import_class_init (ReadyForImportClass * klass) { +static void +ready_for_import_class_init (ReadyForImportClass * klass) +{ #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" ready_for_import_parent_class = g_type_class_peek_parent (klass); #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" ((ReadyForImportClass *) klass)->finalize = ready_for_import_finalize; -#line 15636 "BatchImport.c" +#line 16170 "BatchImport.c" } -static void ready_for_import_instance_init (ReadyForImport * self) { +static void +ready_for_import_instance_init (ReadyForImport * self) +{ #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" self->ref_count = 1; -#line 15643 "BatchImport.c" +#line 16179 "BatchImport.c" } -static void ready_for_import_finalize (ReadyForImport * obj) { +static void +ready_for_import_finalize (ReadyForImport * obj) +{ ReadyForImport * self; #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_READY_FOR_IMPORT, ReadyForImport); @@ -15668,11 +16206,13 @@ static void ready_for_import_finalize (ReadyForImport * obj) { _video_import_params_unref0 (self->video_import_params); #line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (self->batch_result); -#line 15663 "BatchImport.c" +#line 16201 "BatchImport.c" } -GType ready_for_import_get_type (void) { +GType +ready_for_import_get_type (void) +{ static volatile gsize ready_for_import_type_id__volatile = 0; if (g_once_init_enter (&ready_for_import_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_ready_for_import_init, value_ready_for_import_free_value, value_ready_for_import_copy_value, value_ready_for_import_peek_pointer, "p", value_ready_for_import_collect_value, "p", value_ready_for_import_lcopy_value }; @@ -15686,18 +16226,22 @@ GType ready_for_import_get_type (void) { } -gpointer ready_for_import_ref (gpointer instance) { +gpointer +ready_for_import_ref (gpointer instance) +{ ReadyForImport * self; self = instance; #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" g_atomic_int_inc (&self->ref_count); #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" return instance; -#line 15688 "BatchImport.c" +#line 16230 "BatchImport.c" } -void ready_for_import_unref (gpointer instance) { +void +ready_for_import_unref (gpointer instance) +{ ReadyForImport * self; self = instance; #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -15706,22 +16250,25 @@ void ready_for_import_unref (gpointer instance) { READY_FOR_IMPORT_GET_CLASS (self)->finalize (self); #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 15701 "BatchImport.c" +#line 16245 "BatchImport.c" } } -PreparedFileImportJob* prepared_file_import_job_construct (GType object_type, BatchImport* owner, PreparedFile* prepared_file, ImportID* import_id, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) { +PreparedFileImportJob* +prepared_file_import_job_construct (GType object_type, + BatchImport* owner, + PreparedFile* prepared_file, + ImportID* import_id, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target) +{ PreparedFileImportJob* self = NULL; - BatchImport* _tmp0_; - CompletionCallback _tmp1_; - void* _tmp1__target; - GCancellable* _tmp2_; - CancellationCallback _tmp3_; - void* _tmp3__target; - ImportID _tmp4_; - PreparedFile* _tmp5_; - PreparedFile* _tmp6_; + ImportID _tmp0_; + PreparedFile* _tmp1_; #line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL); #line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -15731,47 +16278,44 @@ PreparedFileImportJob* prepared_file_import_job_construct (GType object_type, Ba #line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL); #line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = owner; -#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = callback; -#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1__target = callback_target; -#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = cancellable; -#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = cancellation; -#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3__target = cancellation_target; -#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala" - self = (PreparedFileImportJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target, NULL); + self = (PreparedFileImportJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), callback, callback_target, cancellable, cancellation, cancellation_target, NULL); #line 1951 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = *import_id; + _tmp0_ = *import_id; #line 1951 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->priv->import_id = _tmp4_; -#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = prepared_file; + self->priv->import_id = _tmp0_; #line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = _prepared_file_ref0 (_tmp5_); + _tmp1_ = _prepared_file_ref0 (prepared_file); #line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (self->not_ready); #line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->not_ready = _tmp6_; + self->not_ready = _tmp1_; #line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala" background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW); #line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 15755 "BatchImport.c" +#line 16288 "BatchImport.c" } -PreparedFileImportJob* prepared_file_import_job_new (BatchImport* owner, PreparedFile* prepared_file, ImportID* import_id, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) { +PreparedFileImportJob* +prepared_file_import_job_new (BatchImport* owner, + PreparedFile* prepared_file, + ImportID* import_id, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target) +{ #line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" return prepared_file_import_job_construct (TYPE_PREPARED_FILE_IMPORT_JOB, owner, prepared_file, import_id, callback, callback_target, cancellable, cancellation, cancellation_target); -#line 15762 "BatchImport.c" +#line 16304 "BatchImport.c" } -static void prepared_file_import_job_real_execute (BackgroundJob* base) { +static void +prepared_file_import_job_real_execute (BackgroundJob* base) +{ PreparedFileImportJob * self; PreparedFile* prepared_file = NULL; PreparedFile* _tmp0_; @@ -15795,23 +16339,23 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { PhotoImportParams* photo_import_params = NULL; PreparedFile* _tmp58_; gboolean _tmp59_; - gboolean _tmp86_ = FALSE; - ImportResult _tmp87_; + gboolean _tmp83_ = FALSE; + ImportResult _tmp84_; BatchImportResult* batch_result = NULL; - PreparedFile* _tmp100_; - BatchImportJob* _tmp101_; - GFile* _tmp102_; + PreparedFile* _tmp97_; + BatchImportJob* _tmp98_; + GFile* _tmp99_; + GFile* _tmp100_; + gchar* _tmp101_; + gchar* _tmp102_; GFile* _tmp103_; gchar* _tmp104_; gchar* _tmp105_; - GFile* _tmp106_; - gchar* _tmp107_; - gchar* _tmp108_; - ImportResult _tmp109_; - BatchImportResult* _tmp110_; - BatchImportResult* _tmp111_; - BatchImportResult* _tmp112_; - ImportResult _tmp113_; + ImportResult _tmp106_; + BatchImportResult* _tmp107_; + BatchImportResult* _tmp108_; + BatchImportResult* _tmp109_; + ImportResult _tmp110_; GError * _inner_error_ = NULL; #line 1957 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJob); @@ -15847,7 +16391,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { _tmp9_ = _tmp8_->copy_to_library; #line 1964 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp9_) { -#line 15842 "BatchImport.c" +#line 16386 "BatchImport.c" { GFile* _tmp10_ = NULL; PreparedFile* _tmp11_; @@ -15866,7 +16410,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { _tmp10_ = _tmp13_; #line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 15861 "BatchImport.c" +#line 16405 "BatchImport.c" goto __catch434_g_error; } #line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -15881,7 +16425,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { _tmp15_ = final_file; #line 1968 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp15_ == NULL) { -#line 15876 "BatchImport.c" +#line 16420 "BatchImport.c" PreparedFile* _tmp16_; BatchImportJob* _tmp17_; PreparedFile* _tmp18_; @@ -15939,13 +16483,13 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { _prepared_file_unref0 (prepared_file); #line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 15934 "BatchImport.c" +#line 16478 "BatchImport.c" } #line 1977 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp29_ = final_associated_file; #line 1977 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp29_ != NULL) { -#line 15940 "BatchImport.c" +#line 16484 "BatchImport.c" GFile* _tmp30_ = NULL; PreparedFile* _tmp31_; GFile* _tmp32_; @@ -15963,7 +16507,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1978 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp10_); -#line 15958 "BatchImport.c" +#line 16502 "BatchImport.c" goto __catch434_g_error; } #line 1978 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -15976,11 +16520,11 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { final_associated_file = _tmp34_; #line 1977 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp30_); -#line 15971 "BatchImport.c" +#line 16515 "BatchImport.c" } #line 1965 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp10_); -#line 15975 "BatchImport.c" +#line 16519 "BatchImport.c" } goto __finally434; __catch434_g_error: @@ -16006,7 +16550,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { _tmp36_ = final_file; #line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp36_ != NULL) { -#line 16001 "BatchImport.c" +#line 16545 "BatchImport.c" GFile* _tmp37_; gchar* _tmp38_; #line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -16017,7 +16561,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { _g_free0 (_tmp35_); #line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp35_ = _tmp38_; -#line 16012 "BatchImport.c" +#line 16556 "BatchImport.c" } else { PreparedFile* _tmp39_; const gchar* _tmp40_; @@ -16032,7 +16576,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { _g_free0 (_tmp35_); #line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp35_ = _tmp41_; -#line 16027 "BatchImport.c" +#line 16571 "BatchImport.c" } #line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp42_ = g_strdup (_tmp35_); @@ -16072,7 +16616,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { _prepared_file_unref0 (prepared_file); #line 1985 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 16067 "BatchImport.c" +#line 16611 "BatchImport.c" } __finally434: #line 1965 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -16089,14 +16633,14 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { g_clear_error (&_inner_error_); #line 1965 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 16084 "BatchImport.c" +#line 16628 "BatchImport.c" } } #line 1991 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp51_ = final_associated_file; #line 1991 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp51_ == NULL) { -#line 16091 "BatchImport.c" +#line 16635 "BatchImport.c" PreparedFile* _tmp52_; BatchImportJob* _tmp53_; GFile* _tmp54_; @@ -16110,7 +16654,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { _g_object_unref0 (final_associated_file); #line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala" final_associated_file = _tmp54_; -#line 16105 "BatchImport.c" +#line 16649 "BatchImport.c" } #line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp55_ = final_file; @@ -16134,7 +16678,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { _tmp59_ = _tmp58_->is_video; #line 2000 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp59_) { -#line 16129 "BatchImport.c" +#line 16673 "BatchImport.c" GFile* _tmp60_; ImportID _tmp61_; PreparedFile* _tmp62_; @@ -16143,10 +16687,8 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { Thumbnails* _tmp65_; PreparedFile* _tmp66_; BatchImportJob* _tmp67_; - time_t _tmp68_; + VideoImportParams* _tmp68_; VideoImportParams* _tmp69_; - VideoImportParams* _tmp70_; - ImportResult _tmp71_; #line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp60_ = final_file; #line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -16164,123 +16706,116 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { #line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp67_ = _tmp66_->job; #line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp68_ = batch_import_job_get_exposure_time_override (_tmp67_); -#line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp69_ = video_import_params_new (_tmp60_, &_tmp61_, _tmp63_, _tmp65_, _tmp68_); + _tmp68_ = video_import_params_new (_tmp60_, &_tmp61_, _tmp63_, _tmp65_, batch_import_job_get_exposure_time_override (_tmp67_)); #line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala" _video_import_params_unref0 (video_import_params); #line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala" - video_import_params = _tmp69_; + video_import_params = _tmp68_; #line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala" _thumbnails_unref0 (_tmp65_); #line 2005 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp70_ = video_import_params; -#line 2005 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp71_ = video_reader_prepare_for_import (_tmp70_); + _tmp69_ = video_import_params; #line 2005 "/home/jens/Source/shotwell/src/BatchImport.vala" - _result_ = _tmp71_; -#line 16174 "BatchImport.c" + _result_ = video_reader_prepare_for_import (_tmp69_); +#line 16712 "BatchImport.c" } else { - GFile* _tmp72_; - GFile* _tmp73_; - ImportID _tmp74_; + GFile* _tmp70_; + GFile* _tmp71_; + ImportID _tmp72_; + PreparedFile* _tmp73_; + const gchar* _tmp74_; PreparedFile* _tmp75_; const gchar* _tmp76_; PreparedFile* _tmp77_; const gchar* _tmp78_; - PreparedFile* _tmp79_; - const gchar* _tmp80_; - Thumbnails* _tmp81_; - Thumbnails* _tmp82_; - PhotoImportParams* _tmp83_; - PhotoImportParams* _tmp84_; - ImportResult _tmp85_; + Thumbnails* _tmp79_; + Thumbnails* _tmp80_; + PhotoImportParams* _tmp81_; + PhotoImportParams* _tmp82_; #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp72_ = final_file; + _tmp70_ = final_file; #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp73_ = final_associated_file; + _tmp71_ = final_associated_file; #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp74_ = self->priv->import_id; + _tmp72_ = self->priv->import_id; #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp75_ = prepared_file; + _tmp73_ = prepared_file; #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp76_ = _tmp75_->exif_md5; + _tmp74_ = _tmp73_->exif_md5; #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp77_ = prepared_file; + _tmp75_ = prepared_file; #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp78_ = _tmp77_->thumbnail_md5; + _tmp76_ = _tmp75_->thumbnail_md5; #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp79_ = prepared_file; + _tmp77_ = prepared_file; #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp80_ = _tmp79_->full_md5; + _tmp78_ = _tmp77_->full_md5; #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp81_ = thumbnails_new (); + _tmp79_ = thumbnails_new (); #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp82_ = _tmp81_; + _tmp80_ = _tmp79_; #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp83_ = photo_import_params_new (_tmp72_, _tmp73_, &_tmp74_, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL, _tmp76_, _tmp78_, _tmp80_, _tmp82_); + _tmp81_ = photo_import_params_new (_tmp70_, _tmp71_, &_tmp72_, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL, _tmp74_, _tmp76_, _tmp78_, _tmp80_); #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" _photo_import_params_unref0 (photo_import_params); #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" - photo_import_params = _tmp83_; + photo_import_params = _tmp81_; #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" - _thumbnails_unref0 (_tmp82_); + _thumbnails_unref0 (_tmp80_); #line 2011 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp84_ = photo_import_params; + _tmp82_ = photo_import_params; #line 2011 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp85_ = photo_prepare_for_import (_tmp84_); -#line 2011 "/home/jens/Source/shotwell/src/BatchImport.vala" - _result_ = _tmp85_; -#line 16226 "BatchImport.c" + _result_ = photo_prepare_for_import (_tmp82_); +#line 16761 "BatchImport.c" } #line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp87_ = _result_; + _tmp84_ = _result_; #line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp87_ != IMPORT_RESULT_SUCCESS) { -#line 16232 "BatchImport.c" - GFile* _tmp88_; - PreparedFile* _tmp89_; - GFile* _tmp90_; + if (_tmp84_ != IMPORT_RESULT_SUCCESS) { +#line 16767 "BatchImport.c" + GFile* _tmp85_; + PreparedFile* _tmp86_; + GFile* _tmp87_; #line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp88_ = final_file; + _tmp85_ = final_file; #line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp89_ = prepared_file; + _tmp86_ = prepared_file; #line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp90_ = _tmp89_->file; + _tmp87_ = _tmp86_->file; #line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp86_ = _tmp88_ != _tmp90_; -#line 16244 "BatchImport.c" + _tmp83_ = _tmp85_ != _tmp87_; +#line 16779 "BatchImport.c" } else { #line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp86_ = FALSE; -#line 16248 "BatchImport.c" + _tmp83_ = FALSE; +#line 16783 "BatchImport.c" } #line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp86_) { -#line 16252 "BatchImport.c" - GFile* _tmp91_; - gchar* _tmp92_; - gchar* _tmp93_; + if (_tmp83_) { +#line 16787 "BatchImport.c" + GFile* _tmp88_; + gchar* _tmp89_; + gchar* _tmp90_; #line 2015 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp91_ = final_file; + _tmp88_ = final_file; #line 2015 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp92_ = g_file_get_path (_tmp91_); + _tmp89_ = g_file_get_path (_tmp88_); #line 2015 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp93_ = _tmp92_; + _tmp90_ = _tmp89_; #line 2015 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_debug ("BatchImport.vala:2015: Deleting failed imported copy %s", _tmp93_); + g_debug ("BatchImport.vala:2015: Deleting failed imported copy %s", _tmp90_); #line 2015 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp93_); -#line 16266 "BatchImport.c" + _g_free0 (_tmp90_); +#line 16801 "BatchImport.c" { - GFile* _tmp94_; + GFile* _tmp91_; #line 2017 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp94_ = final_file; + _tmp91_ = final_file; #line 2017 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_file_delete (_tmp94_, NULL, &_inner_error_); + g_file_delete (_tmp91_, NULL, &_inner_error_); #line 2017 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16275 "BatchImport.c" +#line 16810 "BatchImport.c" goto __catch435_g_error; } } @@ -16288,32 +16823,32 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { __catch435_g_error: { GError* err = NULL; - GFile* _tmp95_; - gchar* _tmp96_; - gchar* _tmp97_; - GError* _tmp98_; - const gchar* _tmp99_; + GFile* _tmp92_; + gchar* _tmp93_; + gchar* _tmp94_; + GError* _tmp95_; + const gchar* _tmp96_; #line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; #line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; #line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp95_ = final_file; + _tmp92_ = final_file; #line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp96_ = g_file_get_path (_tmp95_); + _tmp93_ = g_file_get_path (_tmp92_); #line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp97_ = _tmp96_; + _tmp94_ = _tmp93_; #line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp98_ = err; + _tmp95_ = err; #line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp99_ = _tmp98_->message; + _tmp96_ = _tmp95_->message; #line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_warning ("BatchImport.vala:2020: Unable to delete copy of imported file %s: %s", _tmp97_, _tmp99_); + g_warning ("BatchImport.vala:2020: Unable to delete copy of imported file %s: %s", _tmp94_, _tmp96_); #line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp97_); + _g_free0 (_tmp94_); #line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 16308 "BatchImport.c" +#line 16843 "BatchImport.c" } __finally435: #line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -16334,15 +16869,21 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { g_clear_error (&_inner_error_); #line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 16329 "BatchImport.c" +#line 16864 "BatchImport.c" } } #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp100_ = prepared_file; + _tmp97_ = prepared_file; +#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" + _tmp98_ = _tmp97_->job; +#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" + _tmp99_ = final_file; +#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" + _tmp100_ = final_file; #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp101_ = _tmp100_->job; + _tmp101_ = g_file_get_path (_tmp100_); #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp102_ = final_file; + _tmp102_ = _tmp101_; #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp103_ = final_file; #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -16350,65 +16891,59 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp105_ = _tmp104_; #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp106_ = final_file; + _tmp106_ = _result_; #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp107_ = g_file_get_path (_tmp106_); + _tmp107_ = batch_import_result_new (_tmp98_, _tmp99_, _tmp102_, _tmp105_, NULL, _tmp106_); #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp108_ = _tmp107_; -#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp109_ = _result_; -#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp110_ = batch_import_result_new (_tmp101_, _tmp102_, _tmp105_, _tmp108_, NULL, _tmp109_); -#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp111_ = _tmp110_; -#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" - _g_free0 (_tmp108_); #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp105_); #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_result = _tmp111_; + _g_free0 (_tmp102_); +#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" + batch_result = _tmp108_; #line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp112_ = batch_result; + _tmp109_ = batch_result; #line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp113_ = _tmp112_->result; + _tmp110_ = _tmp109_->result; #line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp113_ != IMPORT_RESULT_SUCCESS) { -#line 16368 "BatchImport.c" - BatchImportResult* _tmp114_; - BatchImportResult* _tmp115_; + if (_tmp110_ != IMPORT_RESULT_SUCCESS) { +#line 16903 "BatchImport.c" + BatchImportResult* _tmp111_; + BatchImportResult* _tmp112_; #line 2028 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp114_ = batch_result; + _tmp111_ = batch_result; #line 2028 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp115_ = _batch_import_result_ref0 (_tmp114_); + _tmp112_ = _batch_import_result_ref0 (_tmp111_); #line 2028 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (self->failed); #line 2028 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->failed = _tmp115_; -#line 16379 "BatchImport.c" + self->failed = _tmp112_; +#line 16914 "BatchImport.c" } else { - GFile* _tmp116_; - PreparedFile* _tmp117_; - PhotoImportParams* _tmp118_; - VideoImportParams* _tmp119_; - BatchImportResult* _tmp120_; - ReadyForImport* _tmp121_; + GFile* _tmp113_; + PreparedFile* _tmp114_; + PhotoImportParams* _tmp115_; + VideoImportParams* _tmp116_; + BatchImportResult* _tmp117_; + ReadyForImport* _tmp118_; #line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp116_ = final_file; + _tmp113_ = final_file; #line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp117_ = prepared_file; + _tmp114_ = prepared_file; #line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp118_ = photo_import_params; + _tmp115_ = photo_import_params; #line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp119_ = video_import_params; + _tmp116_ = video_import_params; #line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp120_ = batch_result; + _tmp117_ = batch_result; #line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp121_ = ready_for_import_new (_tmp116_, _tmp117_, _tmp118_, _tmp119_, _tmp120_); + _tmp118_ = ready_for_import_new (_tmp113_, _tmp114_, _tmp115_, _tmp116_, _tmp117_); #line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala" _ready_for_import_unref0 (self->ready); #line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->ready = _tmp121_; -#line 16403 "BatchImport.c" + self->ready = _tmp118_; +#line 16938 "BatchImport.c" } #line 1957 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (batch_result); @@ -16422,11 +16957,13 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { _g_object_unref0 (final_file); #line 1957 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (prepared_file); -#line 16417 "BatchImport.c" +#line 16952 "BatchImport.c" } -static void prepared_file_import_job_class_init (PreparedFileImportJobClass * klass) { +static void +prepared_file_import_job_class_init (PreparedFileImportJobClass * klass) +{ #line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala" prepared_file_import_job_parent_class = g_type_class_peek_parent (klass); #line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -16435,22 +16972,26 @@ static void prepared_file_import_job_class_init (PreparedFileImportJobClass * kl g_type_class_add_private (klass, sizeof (PreparedFileImportJobPrivate)); #line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) prepared_file_import_job_real_execute; -#line 16430 "BatchImport.c" +#line 16967 "BatchImport.c" } -static void prepared_file_import_job_instance_init (PreparedFileImportJob * self) { +static void +prepared_file_import_job_instance_init (PreparedFileImportJob * self) +{ #line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv = PREPARED_FILE_IMPORT_JOB_GET_PRIVATE (self); #line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala" self->ready = NULL; #line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala" self->failed = NULL; -#line 16441 "BatchImport.c" +#line 16980 "BatchImport.c" } -static void prepared_file_import_job_finalize (BackgroundJob * obj) { +static void +prepared_file_import_job_finalize (BackgroundJob * obj) +{ PreparedFileImportJob * self; #line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJob); @@ -16462,11 +17003,13 @@ static void prepared_file_import_job_finalize (BackgroundJob * obj) { _batch_import_result_unref0 (self->failed); #line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala" BACKGROUND_JOB_CLASS (prepared_file_import_job_parent_class)->finalize (obj); -#line 16457 "BatchImport.c" +#line 16998 "BatchImport.c" } -GType prepared_file_import_job_get_type (void) { +GType +prepared_file_import_job_get_type (void) +{ static volatile gsize prepared_file_import_job_type_id__volatile = 0; if (g_once_init_enter (&prepared_file_import_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PreparedFileImportJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) prepared_file_import_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PreparedFileImportJob), 0, (GInstanceInitFunc) prepared_file_import_job_instance_init, NULL }; @@ -16478,18 +17021,19 @@ GType prepared_file_import_job_get_type (void) { } -CompletedImportObject* completed_import_object_construct (GType object_type, MediaSource* source, Thumbnails* thumbnails, BatchImportJob* original_job, BatchImportResult* import_result) { +CompletedImportObject* +completed_import_object_construct (GType object_type, + MediaSource* source, + Thumbnails* thumbnails, + BatchImportJob* original_job, + BatchImportResult* import_result) +{ CompletedImportObject* self = NULL; Thumbnails* _tmp0_; - Thumbnails* _tmp1_; - BatchImportResult* _tmp2_; - BatchImportResult* _tmp3_; - MediaSource* _tmp4_; - MediaSource* _tmp5_; - BatchImportJob* _tmp6_; - BatchImportJob* _tmp7_; - Thumbnails* _tmp8_; - GdkPixbuf* _tmp9_; + BatchImportResult* _tmp1_; + MediaSource* _tmp2_; + BatchImportJob* _tmp3_; + GdkPixbuf* _tmp4_; #line 2042 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL); #line 2042 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -16501,156 +17045,176 @@ CompletedImportObject* completed_import_object_construct (GType object_type, Med #line 2042 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (CompletedImportObject*) g_type_create_instance (object_type); #line 2044 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = thumbnails; -#line 2044 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = _thumbnails_ref0 (_tmp0_); + _tmp0_ = _thumbnails_ref0 (thumbnails); #line 2044 "/home/jens/Source/shotwell/src/BatchImport.vala" _thumbnails_unref0 (self->thumbnails); #line 2044 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->thumbnails = _tmp1_; + self->thumbnails = _tmp0_; #line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = import_result; -#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = _batch_import_result_ref0 (_tmp2_); + _tmp1_ = _batch_import_result_ref0 (import_result); #line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (self->batch_result); #line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->batch_result = _tmp3_; -#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = source; + self->batch_result = _tmp1_; #line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp2_ = _g_object_ref0 (source); #line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->source); #line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->source = _tmp5_; + self->source = _tmp2_; #line 2047 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = original_job; -#line 2047 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = _batch_import_job_ref0 (_tmp6_); + _tmp3_ = _batch_import_job_ref0 (original_job); #line 2047 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (self->original_job); #line 2047 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->original_job = _tmp7_; -#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = thumbnails; + self->original_job = _tmp3_; #line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = thumbnails_get (_tmp8_, THUMBNAIL_CACHE_SIZE_LARGEST); + _tmp4_ = thumbnails_get (thumbnails, THUMBNAIL_CACHE_SIZE_LARGEST); #line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->user_preview); #line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->user_preview = _tmp9_; + self->user_preview = _tmp4_; #line 2042 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 16537 "BatchImport.c" +#line 17071 "BatchImport.c" } -CompletedImportObject* completed_import_object_new (MediaSource* source, Thumbnails* thumbnails, BatchImportJob* original_job, BatchImportResult* import_result) { +CompletedImportObject* +completed_import_object_new (MediaSource* source, + Thumbnails* thumbnails, + BatchImportJob* original_job, + BatchImportResult* import_result) +{ #line 2042 "/home/jens/Source/shotwell/src/BatchImport.vala" return completed_import_object_construct (TYPE_COMPLETED_IMPORT_OBJECT, source, thumbnails, original_job, import_result); -#line 16544 "BatchImport.c" +#line 17083 "BatchImport.c" } -static void value_completed_import_object_init (GValue* value) { +static void +value_completed_import_object_init (GValue* value) +{ #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 16551 "BatchImport.c" +#line 17092 "BatchImport.c" } -static void value_completed_import_object_free_value (GValue* value) { +static void +value_completed_import_object_free_value (GValue* value) +{ #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" if (value->data[0].v_pointer) { #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" completed_import_object_unref (value->data[0].v_pointer); -#line 16560 "BatchImport.c" +#line 17103 "BatchImport.c" } } -static void value_completed_import_object_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_completed_import_object_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" if (src_value->data[0].v_pointer) { #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = completed_import_object_ref (src_value->data[0].v_pointer); -#line 16570 "BatchImport.c" +#line 17116 "BatchImport.c" } else { #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = NULL; -#line 16574 "BatchImport.c" +#line 17120 "BatchImport.c" } } -static gpointer value_completed_import_object_peek_pointer (const GValue* value) { +static gpointer +value_completed_import_object_peek_pointer (const GValue* value) +{ #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 16582 "BatchImport.c" +#line 17130 "BatchImport.c" } -static gchar* value_completed_import_object_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_completed_import_object_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" if (collect_values[0].v_pointer) { -#line 16589 "BatchImport.c" +#line 17142 "BatchImport.c" CompletedImportObject * object; object = collect_values[0].v_pointer; #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" if (object->parent_instance.g_class == NULL) { #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 16596 "BatchImport.c" +#line 17149 "BatchImport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 16600 "BatchImport.c" +#line 17153 "BatchImport.c" } #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = completed_import_object_ref (object); -#line 16604 "BatchImport.c" +#line 17157 "BatchImport.c" } else { #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 16608 "BatchImport.c" +#line 17161 "BatchImport.c" } #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 16612 "BatchImport.c" +#line 17165 "BatchImport.c" } -static gchar* value_completed_import_object_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_completed_import_object_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ CompletedImportObject ** object_p; object_p = collect_values[0].v_pointer; #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!object_p) { #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 16623 "BatchImport.c" +#line 17181 "BatchImport.c" } #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!value->data[0].v_pointer) { #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = NULL; -#line 16629 "BatchImport.c" +#line 17187 "BatchImport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = value->data[0].v_pointer; -#line 16633 "BatchImport.c" +#line 17191 "BatchImport.c" } else { #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = completed_import_object_ref (value->data[0].v_pointer); -#line 16637 "BatchImport.c" +#line 17195 "BatchImport.c" } #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 16641 "BatchImport.c" +#line 17199 "BatchImport.c" } -GParamSpec* param_spec_completed_import_object (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_completed_import_object (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecCompletedImportObject* spec; #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_COMPLETED_IMPORT_OBJECT), NULL); @@ -16660,20 +17224,25 @@ GParamSpec* param_spec_completed_import_object (const gchar* name, const gchar* G_PARAM_SPEC (spec)->value_type = object_type; #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" return G_PARAM_SPEC (spec); -#line 16655 "BatchImport.c" +#line 17219 "BatchImport.c" } -gpointer value_get_completed_import_object (const GValue* value) { +gpointer +value_get_completed_import_object (const GValue* value) +{ #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMPLETED_IMPORT_OBJECT), NULL); #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 16664 "BatchImport.c" +#line 17230 "BatchImport.c" } -void value_set_completed_import_object (GValue* value, gpointer v_object) { +void +value_set_completed_import_object (GValue* value, + gpointer v_object) +{ CompletedImportObject * old; #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMPLETED_IMPORT_OBJECT)); @@ -16689,22 +17258,25 @@ void value_set_completed_import_object (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" completed_import_object_ref (value->data[0].v_pointer); -#line 16684 "BatchImport.c" +#line 17253 "BatchImport.c" } else { #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 16688 "BatchImport.c" +#line 17257 "BatchImport.c" } #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" completed_import_object_unref (old); -#line 16694 "BatchImport.c" +#line 17263 "BatchImport.c" } } -void value_take_completed_import_object (GValue* value, gpointer v_object) { +void +value_take_completed_import_object (GValue* value, + gpointer v_object) +{ CompletedImportObject * old; #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMPLETED_IMPORT_OBJECT)); @@ -16718,38 +17290,44 @@ void value_take_completed_import_object (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = v_object; -#line 16713 "BatchImport.c" +#line 17285 "BatchImport.c" } else { #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 16717 "BatchImport.c" +#line 17289 "BatchImport.c" } #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" completed_import_object_unref (old); -#line 16723 "BatchImport.c" +#line 17295 "BatchImport.c" } } -static void completed_import_object_class_init (CompletedImportObjectClass * klass) { +static void +completed_import_object_class_init (CompletedImportObjectClass * klass) +{ #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" completed_import_object_parent_class = g_type_class_peek_parent (klass); #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" ((CompletedImportObjectClass *) klass)->finalize = completed_import_object_finalize; -#line 16733 "BatchImport.c" +#line 17307 "BatchImport.c" } -static void completed_import_object_instance_init (CompletedImportObject * self) { +static void +completed_import_object_instance_init (CompletedImportObject * self) +{ #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" self->ref_count = 1; -#line 16740 "BatchImport.c" +#line 17316 "BatchImport.c" } -static void completed_import_object_finalize (CompletedImportObject * obj) { +static void +completed_import_object_finalize (CompletedImportObject * obj) +{ CompletedImportObject * self; #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COMPLETED_IMPORT_OBJECT, CompletedImportObject); @@ -16765,11 +17343,13 @@ static void completed_import_object_finalize (CompletedImportObject * obj) { _batch_import_job_unref0 (self->original_job); #line 2040 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->user_preview); -#line 16760 "BatchImport.c" +#line 17338 "BatchImport.c" } -GType completed_import_object_get_type (void) { +GType +completed_import_object_get_type (void) +{ static volatile gsize completed_import_object_type_id__volatile = 0; if (g_once_init_enter (&completed_import_object_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_completed_import_object_init, value_completed_import_object_free_value, value_completed_import_object_copy_value, value_completed_import_object_peek_pointer, "p", value_completed_import_object_collect_value, "p", value_completed_import_object_lcopy_value }; @@ -16783,18 +17363,22 @@ GType completed_import_object_get_type (void) { } -gpointer completed_import_object_ref (gpointer instance) { +gpointer +completed_import_object_ref (gpointer instance) +{ CompletedImportObject * self; self = instance; #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" g_atomic_int_inc (&self->ref_count); #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" return instance; -#line 16785 "BatchImport.c" +#line 17367 "BatchImport.c" } -void completed_import_object_unref (gpointer instance) { +void +completed_import_object_unref (gpointer instance) +{ CompletedImportObject * self; self = instance; #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -16803,23 +17387,24 @@ void completed_import_object_unref (gpointer instance) { COMPLETED_IMPORT_OBJECT_GET_CLASS (self)->finalize (self); #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 16798 "BatchImport.c" +#line 17382 "BatchImport.c" } } -ThumbnailWriterJob* thumbnail_writer_job_construct (GType object_type, BatchImport* owner, CompletedImportObject* completed_import_source, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancel_callback, void* cancel_callback_target) { +ThumbnailWriterJob* +thumbnail_writer_job_construct (GType object_type, + BatchImport* owner, + CompletedImportObject* completed_import_source, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancel_callback, + void* cancel_callback_target) +{ ThumbnailWriterJob* self = NULL; - BatchImport* _tmp0_; - CompletionCallback _tmp1_; - void* _tmp1__target; - GCancellable* _tmp2_; - CancellationCallback _tmp3_; - void* _tmp3__target; - CompletedImportObject* _tmp4_; - Thumbnails* _tmp5_; - CompletedImportObject* _tmp6_; - CompletedImportObject* _tmp7_; + Thumbnails* _tmp0_; + CompletedImportObject* _tmp1_; #line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL); #line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -16827,55 +17412,49 @@ ThumbnailWriterJob* thumbnail_writer_job_construct (GType object_type, BatchImpo #line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL); #line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = owner; -#line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = callback; -#line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1__target = callback_target; -#line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = cancellable; -#line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = cancel_callback; -#line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3__target = cancel_callback_target; -#line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala" - self = (ThumbnailWriterJob*) background_import_job_construct (object_type, _tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target); -#line 2059 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = completed_import_source; + self = (ThumbnailWriterJob*) background_import_job_construct (object_type, owner, callback, callback_target, cancellable, cancel_callback, cancel_callback_target); #line 2059 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = _tmp4_->thumbnails; + _tmp0_ = completed_import_source->thumbnails; #line 2059 "/home/jens/Source/shotwell/src/BatchImport.vala" - _vala_assert (_tmp5_ != NULL, "completed_import_source.thumbnails != null"); + _vala_assert (_tmp0_ != NULL, "completed_import_source.thumbnails != null"); #line 2060 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = completed_import_source; -#line 2060 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = _completed_import_object_ref0 (_tmp6_); + _tmp1_ = _completed_import_object_ref0 (completed_import_source); #line 2060 "/home/jens/Source/shotwell/src/BatchImport.vala" _completed_import_object_unref0 (self->completed_import_source); #line 2060 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->completed_import_source = _tmp7_; + self->completed_import_source = _tmp1_; #line 2062 "/home/jens/Source/shotwell/src/BatchImport.vala" background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW); #line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 16853 "BatchImport.c" +#line 17422 "BatchImport.c" } -ThumbnailWriterJob* thumbnail_writer_job_new (BatchImport* owner, CompletedImportObject* completed_import_source, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancel_callback, void* cancel_callback_target) { +ThumbnailWriterJob* +thumbnail_writer_job_new (BatchImport* owner, + CompletedImportObject* completed_import_source, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancel_callback, + void* cancel_callback_target) +{ #line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala" return thumbnail_writer_job_construct (TYPE_THUMBNAIL_WRITER_JOB, owner, completed_import_source, callback, callback_target, cancellable, cancel_callback, cancel_callback_target); -#line 16860 "BatchImport.c" +#line 17437 "BatchImport.c" } -static void thumbnail_writer_job_real_execute (BackgroundJob* base) { +static void +thumbnail_writer_job_real_execute (BackgroundJob* base) +{ ThumbnailWriterJob * self; - CompletedImportObject* _tmp10_; + CompletedImportObject* _tmp9_; GError * _inner_error_ = NULL; #line 2065 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob); -#line 16870 "BatchImport.c" +#line 17449 "BatchImport.c" { CompletedImportObject* _tmp0_; MediaSource* _tmp1_; @@ -16895,7 +17474,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) { thumbnail_cache_import_thumbnails (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp3_, TRUE, &_inner_error_); #line 2067 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16890 "BatchImport.c" +#line 17469 "BatchImport.c" goto __catch436_g_error; } #line 2069 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -16904,7 +17483,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) { _tmp5_ = _tmp4_->batch_result; #line 2069 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_->result = IMPORT_RESULT_SUCCESS; -#line 16899 "BatchImport.c" +#line 17478 "BatchImport.c" } goto __finally436; __catch436_g_error: @@ -16913,7 +17492,6 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) { CompletedImportObject* _tmp6_; BatchImportResult* _tmp7_; GError* _tmp8_; - ImportResult _tmp9_; #line 2066 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; #line 2066 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -16925,12 +17503,10 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) { #line 2071 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = err; #line 2071 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = import_result_convert_error (_tmp8_, IMPORT_RESULT_FILE_ERROR); -#line 2071 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_->result = _tmp9_; + _tmp7_->result = import_result_convert_error (_tmp8_, IMPORT_RESULT_FILE_ERROR); #line 2066 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 16925 "BatchImport.c" +#line 17501 "BatchImport.c" } __finally436: #line 2066 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -16941,34 +17517,40 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) { g_clear_error (&_inner_error_); #line 2066 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 16936 "BatchImport.c" +#line 17512 "BatchImport.c" } #line 2076 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = self->completed_import_source; + _tmp9_ = self->completed_import_source; #line 2076 "/home/jens/Source/shotwell/src/BatchImport.vala" - _thumbnails_unref0 (_tmp10_->thumbnails); + _thumbnails_unref0 (_tmp9_->thumbnails); #line 2076 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_->thumbnails = NULL; -#line 16944 "BatchImport.c" + _tmp9_->thumbnails = NULL; +#line 17520 "BatchImport.c" } -static void thumbnail_writer_job_class_init (ThumbnailWriterJobClass * klass) { +static void +thumbnail_writer_job_class_init (ThumbnailWriterJobClass * klass) +{ #line 2052 "/home/jens/Source/shotwell/src/BatchImport.vala" thumbnail_writer_job_parent_class = g_type_class_peek_parent (klass); #line 2052 "/home/jens/Source/shotwell/src/BatchImport.vala" ((BackgroundJobClass *) klass)->finalize = thumbnail_writer_job_finalize; #line 2052 "/home/jens/Source/shotwell/src/BatchImport.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) thumbnail_writer_job_real_execute; -#line 16955 "BatchImport.c" +#line 17533 "BatchImport.c" } -static void thumbnail_writer_job_instance_init (ThumbnailWriterJob * self) { +static void +thumbnail_writer_job_instance_init (ThumbnailWriterJob * self) +{ } -static void thumbnail_writer_job_finalize (BackgroundJob * obj) { +static void +thumbnail_writer_job_finalize (BackgroundJob * obj) +{ ThumbnailWriterJob * self; #line 2052 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob); @@ -16976,11 +17558,13 @@ static void thumbnail_writer_job_finalize (BackgroundJob * obj) { _completed_import_object_unref0 (self->completed_import_source); #line 2052 "/home/jens/Source/shotwell/src/BatchImport.vala" BACKGROUND_JOB_CLASS (thumbnail_writer_job_parent_class)->finalize (obj); -#line 16971 "BatchImport.c" +#line 17553 "BatchImport.c" } -GType thumbnail_writer_job_get_type (void) { +GType +thumbnail_writer_job_get_type (void) +{ static volatile gsize thumbnail_writer_job_type_id__volatile = 0; if (g_once_init_enter (&thumbnail_writer_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ThumbnailWriterJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) thumbnail_writer_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ThumbnailWriterJob), 0, (GInstanceInitFunc) thumbnail_writer_job_instance_init, NULL }; diff --git a/src/Box.c b/src/Box.c index 331f476..e88688d 100644 --- a/src/Box.c +++ b/src/Box.c @@ -1,4 +1,4 @@ -/* Box.c generated by valac 0.36.6, the Vala compiler +/* Box.c generated by valac 0.40.4, the Vala compiler * generated from Box.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -69,54 +70,122 @@ struct _Dimensions { GType box_location_get_type (void) G_GNUC_CONST; GType box_complements_get_type (void) G_GNUC_CONST; -BoxComplements box_complements_derive (gboolean horizontal_complement, gboolean vertical_complement); +BoxComplements box_complements_derive (gboolean horizontal_complement, + gboolean vertical_complement); GType box_get_type (void) G_GNUC_CONST; Box* box_dup (const Box* self); void box_free (Box* self); #define BOX_HAND_GRENADES 12 -void box_init (Box *self, gint left, gint top, gint right, gint bottom); -void box_from_rectangle (GdkRectangle* rect, Box* result); -void box_from_allocation (GtkAllocation* alloc, Box* result); -void box_from_points (GdkPoint* corner1, GdkPoint* corner2, Box* result); -void box_from_center (GdkPoint* center, gint width, gint height, Box* result); +void box_init (Box *self, + gint left, + gint top, + gint right, + gint bottom); +void box_from_rectangle (GdkRectangle* rect, + Box* result); +void box_from_allocation (GtkAllocation* alloc, + Box* result); +void box_from_points (GdkPoint* corner1, + GdkPoint* corner2, + Box* result); +void box_from_center (GdkPoint* center, + gint width, + gint height, + Box* result); gint box_get_width (Box *self); gint box_get_height (Box *self); gboolean box_is_valid (Box *self); -gboolean box_equals (Box *self, Box* box); -void box_adjust_width (Box *self, gint width); -void box_adjust_height (Box *self, gint height); +gboolean box_equals (Box *self, + Box* box); +void box_adjust_width (Box *self, + gint width); +void box_adjust_height (Box *self, + gint height); GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); -void box_get_scaled (Box *self, Dimensions* scaled, Box* result); -void box_get_dimensions (Box *self, Dimensions* result); -void dimensions_get_scale_ratios (Dimensions *self, Dimensions* scaled, gdouble* width_ratio, gdouble* height_ratio); -void box_get_scaled_similar (Box *self, Dimensions* original, Dimensions* scaled, Box* result); -void box_get_offset (Box *self, gint xofs, gint yofs, Box* result); -void dimensions_init (Dimensions *self, gint width, gint height); -void box_get_points (Box *self, GdkPoint* top_left, GdkPoint* bottom_right); -void box_get_rectangle (Box *self, GdkRectangle* result); -void box_get_center (Box *self, GdkPoint* result); -void box_rotate_clockwise (Box *self, Dimensions* space, Box* result); -void box_rotate_counterclockwise (Box *self, Dimensions* space, Box* result); -void box_flip_left_to_right (Box *self, Dimensions* space, Box* result); -void box_flip_top_to_bottom (Box *self, Dimensions* space, Box* result); -gboolean box_intersects (Box *self, Box* compare); -void box_get_reduced (Box *self, gint amount, Box* result); -void box_get_expanded (Box *self, gint amount, Box* result); -gboolean box_contains (Box *self, GdkPoint* point); -BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal, gboolean* horizontal_enlarged, Box* vertical, gboolean* vertical_enlarged); -BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal_this, Box* vertical_this, Box* horizontal_shifted, Box* vertical_shifted); -void box_rubber_band (Box *self, GdkPoint* point, Box* result); +void box_get_scaled (Box *self, + Dimensions* scaled, + Box* result); +void box_get_dimensions (Box *self, + Dimensions* result); +void dimensions_get_scale_ratios (Dimensions *self, + Dimensions* scaled, + gdouble* width_ratio, + gdouble* height_ratio); +void box_get_scaled_similar (Box *self, + Dimensions* original, + Dimensions* scaled, + Box* result); +void box_get_offset (Box *self, + gint xofs, + gint yofs, + Box* result); +void dimensions_init (Dimensions *self, + gint width, + gint height); +void box_get_points (Box *self, + GdkPoint* top_left, + GdkPoint* bottom_right); +void box_get_rectangle (Box *self, + GdkRectangle* result); +void box_get_center (Box *self, + GdkPoint* result); +void box_rotate_clockwise (Box *self, + Dimensions* space, + Box* result); +void box_rotate_counterclockwise (Box *self, + Dimensions* space, + Box* result); +void box_flip_left_to_right (Box *self, + Dimensions* space, + Box* result); +void box_flip_top_to_bottom (Box *self, + Dimensions* space, + Box* result); +gboolean box_intersects (Box *self, + Box* compare); +void box_get_reduced (Box *self, + gint amount, + Box* result); +void box_get_expanded (Box *self, + gint amount, + Box* result); +gboolean box_contains (Box *self, + GdkPoint* point); +BoxComplements box_resized_complements (Box *self, + Box* resized, + Box* horizontal, + gboolean* horizontal_enlarged, + Box* vertical, + gboolean* vertical_enlarged); +BoxComplements box_shifted_complements (Box *self, + Box* shifted, + Box* horizontal_this, + Box* vertical_this, + Box* horizontal_shifted, + Box* vertical_shifted); +void box_rubber_band (Box *self, + GdkPoint* point, + Box* result); gchar* box_to_string (Box *self); gchar* dimensions_to_string (Dimensions *self); -static gboolean box_in_zone (gdouble pos, gint zone); -static gboolean box_in_between (gdouble pos, gint top, gint bottom); -static gboolean box_near_in_between (gdouble pos, gint top, gint bottom); -BoxLocation box_approx_location (Box *self, gint x, gint y); - - -GType box_location_get_type (void) { +static gboolean box_in_zone (gdouble pos, + gint zone); +static gboolean box_in_between (gdouble pos, + gint top, + gint bottom); +static gboolean box_near_in_between (gdouble pos, + gint top, + gint bottom); +BoxLocation box_approx_location (Box *self, + gint x, + gint y); + + +GType +box_location_get_type (void) +{ static volatile gsize box_location_type_id__volatile = 0; if (g_once_init_enter (&box_location_type_id__volatile)) { static const GEnumValue values[] = {{BOX_LOCATION_OUTSIDE, "BOX_LOCATION_OUTSIDE", "outside"}, {BOX_LOCATION_INSIDE, "BOX_LOCATION_INSIDE", "inside"}, {BOX_LOCATION_TOP_SIDE, "BOX_LOCATION_TOP_SIDE", "top-side"}, {BOX_LOCATION_LEFT_SIDE, "BOX_LOCATION_LEFT_SIDE", "left-side"}, {BOX_LOCATION_RIGHT_SIDE, "BOX_LOCATION_RIGHT_SIDE", "right-side"}, {BOX_LOCATION_BOTTOM_SIDE, "BOX_LOCATION_BOTTOM_SIDE", "bottom-side"}, {BOX_LOCATION_TOP_LEFT, "BOX_LOCATION_TOP_LEFT", "top-left"}, {BOX_LOCATION_BOTTOM_LEFT, "BOX_LOCATION_BOTTOM_LEFT", "bottom-left"}, {BOX_LOCATION_TOP_RIGHT, "BOX_LOCATION_TOP_RIGHT", "top-right"}, {BOX_LOCATION_BOTTOM_RIGHT, "BOX_LOCATION_BOTTOM_RIGHT", "bottom-right"}, {0, NULL, NULL}}; @@ -128,25 +197,21 @@ GType box_location_get_type (void) { } -BoxComplements box_complements_derive (gboolean horizontal_complement, gboolean vertical_complement) { +BoxComplements +box_complements_derive (gboolean horizontal_complement, + gboolean vertical_complement) +{ BoxComplements result = 0; gboolean _tmp0_ = FALSE; - gboolean _tmp1_; #line 27 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = horizontal_complement; + if (horizontal_complement) { #line 27 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp1_) { -#line 140 "Box.c" - gboolean _tmp2_; -#line 27 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = vertical_complement; -#line 27 "/home/jens/Source/shotwell/src/Box.vala" - _tmp0_ = _tmp2_; -#line 146 "Box.c" + _tmp0_ = vertical_complement; +#line 211 "Box.c" } else { #line 27 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = FALSE; -#line 150 "Box.c" +#line 215 "Box.c" } #line 27 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp0_) { @@ -154,29 +219,23 @@ BoxComplements box_complements_derive (gboolean horizontal_complement, gboolean result = BOX_COMPLEMENTS_BOTH; #line 28 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 158 "Box.c" +#line 223 "Box.c" } else { - gboolean _tmp3_; -#line 29 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = horizontal_complement; #line 29 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp3_) { + if (horizontal_complement) { #line 30 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_COMPLEMENTS_HORIZONTAL; #line 30 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 169 "Box.c" +#line 231 "Box.c" } else { - gboolean _tmp4_; #line 31 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = vertical_complement; -#line 31 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp4_) { + if (vertical_complement) { #line 32 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_COMPLEMENTS_VERTICAL; #line 32 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 180 "Box.c" +#line 239 "Box.c" } } } @@ -184,11 +243,13 @@ BoxComplements box_complements_derive (gboolean horizontal_complement, gboolean result = BOX_COMPLEMENTS_NONE; #line 34 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 188 "Box.c" +#line 247 "Box.c" } -GType box_complements_get_type (void) { +GType +box_complements_get_type (void) +{ static volatile gsize box_complements_type_id__volatile = 0; if (g_once_init_enter (&box_complements_type_id__volatile)) { static const GEnumValue values[] = {{BOX_COMPLEMENTS_NONE, "BOX_COMPLEMENTS_NONE", "none"}, {BOX_COMPLEMENTS_VERTICAL, "BOX_COMPLEMENTS_VERTICAL", "vertical"}, {BOX_COMPLEMENTS_HORIZONTAL, "BOX_COMPLEMENTS_HORIZONTAL", "horizontal"}, {BOX_COMPLEMENTS_BOTH, "BOX_COMPLEMENTS_BOTH", "both"}, {0, NULL, NULL}}; @@ -200,82 +261,47 @@ GType box_complements_get_type (void) { } -void box_init (Box *self, gint left, gint top, gint right, gint bottom) { - gint _tmp0_; - gint _tmp1_; - gint _tmp2_; - gint _tmp3_; - gint _tmp4_; - gint _tmp5_; - gint _tmp7_; - gint _tmp8_; - gint _tmp10_; - gint _tmp11_; - gint _tmp12_; - gint _tmp13_; +void +box_init (Box *self, + gint left, + gint top, + gint right, + gint bottom) +{ #line 46 "/home/jens/Source/shotwell/src/Box.vala" memset (self, 0, sizeof (Box)); #line 48 "/home/jens/Source/shotwell/src/Box.vala" - _tmp0_ = left; -#line 48 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = CLAMP (_tmp0_, 0, G_MAXINT); -#line 48 "/home/jens/Source/shotwell/src/Box.vala" - left = _tmp1_; -#line 49 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = top; + left = CLAMP (left, 0, G_MAXINT); #line 49 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = CLAMP (_tmp2_, 0, G_MAXINT); -#line 49 "/home/jens/Source/shotwell/src/Box.vala" - top = _tmp3_; -#line 53 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = right; -#line 53 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = left; + top = CLAMP (top, 0, G_MAXINT); #line 53 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp4_ <= _tmp5_) { -#line 237 "Box.c" - gint _tmp6_; -#line 54 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = left; + if (right <= left) { #line 54 "/home/jens/Source/shotwell/src/Box.vala" - right = _tmp6_ + 1; -#line 243 "Box.c" + right = left + 1; +#line 282 "Box.c" } #line 56 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = bottom; -#line 56 "/home/jens/Source/shotwell/src/Box.vala" - _tmp8_ = top; -#line 56 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp7_ <= _tmp8_) { -#line 251 "Box.c" - gint _tmp9_; -#line 57 "/home/jens/Source/shotwell/src/Box.vala" - _tmp9_ = top; + if (bottom <= top) { #line 57 "/home/jens/Source/shotwell/src/Box.vala" - bottom = _tmp9_ + 1; -#line 257 "Box.c" + bottom = top + 1; +#line 288 "Box.c" } #line 59 "/home/jens/Source/shotwell/src/Box.vala" - _tmp10_ = left; -#line 59 "/home/jens/Source/shotwell/src/Box.vala" - (*self).left = _tmp10_; + (*self).left = left; #line 60 "/home/jens/Source/shotwell/src/Box.vala" - _tmp11_ = top; -#line 60 "/home/jens/Source/shotwell/src/Box.vala" - (*self).top = _tmp11_; -#line 61 "/home/jens/Source/shotwell/src/Box.vala" - _tmp12_ = right; + (*self).top = top; #line 61 "/home/jens/Source/shotwell/src/Box.vala" - (*self).right = _tmp12_; -#line 62 "/home/jens/Source/shotwell/src/Box.vala" - _tmp13_ = bottom; + (*self).right = right; #line 62 "/home/jens/Source/shotwell/src/Box.vala" - (*self).bottom = _tmp13_; -#line 275 "Box.c" + (*self).bottom = bottom; +#line 298 "Box.c" } -void box_from_rectangle (GdkRectangle* rect, Box* result) { +void +box_from_rectangle (GdkRectangle* rect, + Box* result) +{ GdkRectangle _tmp0_; gint _tmp1_; GdkRectangle _tmp2_; @@ -321,11 +347,14 @@ void box_from_rectangle (GdkRectangle* rect, Box* result) { *result = _tmp12_; #line 66 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 325 "Box.c" +#line 351 "Box.c" } -void box_from_allocation (GtkAllocation* alloc, Box* result) { +void +box_from_allocation (GtkAllocation* alloc, + Box* result) +{ GtkAllocation _tmp0_; gint _tmp1_; GtkAllocation _tmp2_; @@ -371,32 +400,32 @@ void box_from_allocation (GtkAllocation* alloc, Box* result) { *result = _tmp12_; #line 70 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 375 "Box.c" +#line 404 "Box.c" } -void box_from_points (GdkPoint* corner1, GdkPoint* corner2, Box* result) { +void +box_from_points (GdkPoint* corner1, + GdkPoint* corner2, + Box* result) +{ GdkPoint _tmp0_; gint _tmp1_; GdkPoint _tmp2_; gint _tmp3_; - gint _tmp4_; - GdkPoint _tmp5_; - gint _tmp6_; - GdkPoint _tmp7_; - gint _tmp8_; + GdkPoint _tmp4_; + gint _tmp5_; + GdkPoint _tmp6_; + gint _tmp7_; + GdkPoint _tmp8_; gint _tmp9_; GdkPoint _tmp10_; gint _tmp11_; GdkPoint _tmp12_; gint _tmp13_; - gint _tmp14_; - GdkPoint _tmp15_; - gint _tmp16_; - GdkPoint _tmp17_; - gint _tmp18_; - gint _tmp19_; - Box _tmp20_ = {0}; + GdkPoint _tmp14_; + gint _tmp15_; + Box _tmp16_ = {0}; #line 75 "/home/jens/Source/shotwell/src/Box.vala" g_return_if_fail (corner1 != NULL); #line 75 "/home/jens/Source/shotwell/src/Box.vala" @@ -410,61 +439,54 @@ void box_from_points (GdkPoint* corner1, GdkPoint* corner2, Box* result) { #line 76 "/home/jens/Source/shotwell/src/Box.vala" _tmp3_ = _tmp2_.x; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = MIN (_tmp1_, _tmp3_); + _tmp4_ = *corner1; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = *corner1; + _tmp5_ = _tmp4_.y; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = _tmp5_.y; + _tmp6_ = *corner2; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = *corner2; + _tmp7_ = _tmp6_.y; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp8_ = _tmp7_.y; + _tmp8_ = *corner1; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp9_ = MIN (_tmp6_, _tmp8_); + _tmp9_ = _tmp8_.x; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp10_ = *corner1; + _tmp10_ = *corner2; #line 76 "/home/jens/Source/shotwell/src/Box.vala" _tmp11_ = _tmp10_.x; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp12_ = *corner2; -#line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp13_ = _tmp12_.x; -#line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp14_ = MAX (_tmp11_, _tmp13_); -#line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp15_ = *corner1; -#line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp16_ = _tmp15_.y; + _tmp12_ = *corner1; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp17_ = *corner2; + _tmp13_ = _tmp12_.y; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp18_ = _tmp17_.y; + _tmp14_ = *corner2; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp19_ = MAX (_tmp16_, _tmp18_); + _tmp15_ = _tmp14_.y; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_tmp20_, _tmp4_, _tmp9_, _tmp14_, _tmp19_); + box_init (&_tmp16_, MIN (_tmp1_, _tmp3_), MIN (_tmp5_, _tmp7_), MAX (_tmp9_, _tmp11_), MAX (_tmp13_, _tmp15_)); #line 76 "/home/jens/Source/shotwell/src/Box.vala" - *result = _tmp20_; + *result = _tmp16_; #line 76 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 451 "Box.c" +#line 472 "Box.c" } -void box_from_center (GdkPoint* center, gint width, gint height, Box* result) { +void +box_from_center (GdkPoint* center, + gint width, + gint height, + Box* result) +{ GdkPoint _tmp0_; gint _tmp1_; - gint _tmp2_; - GdkPoint _tmp3_; - gint _tmp4_; + GdkPoint _tmp2_; + gint _tmp3_; + GdkPoint _tmp4_; gint _tmp5_; GdkPoint _tmp6_; gint _tmp7_; - gint _tmp8_; - GdkPoint _tmp9_; - gint _tmp10_; - gint _tmp11_; - Box _tmp12_ = {0}; + Box _tmp8_ = {0}; #line 80 "/home/jens/Source/shotwell/src/Box.vala" g_return_if_fail (center != NULL); #line 81 "/home/jens/Source/shotwell/src/Box.vala" @@ -472,36 +494,30 @@ void box_from_center (GdkPoint* center, gint width, gint height, Box* result) { #line 81 "/home/jens/Source/shotwell/src/Box.vala" _tmp1_ = _tmp0_.x; #line 81 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = width; + _tmp2_ = *center; #line 81 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = *center; + _tmp3_ = _tmp2_.y; #line 81 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = _tmp3_.y; + _tmp4_ = *center; #line 81 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = height; + _tmp5_ = _tmp4_.x; #line 81 "/home/jens/Source/shotwell/src/Box.vala" _tmp6_ = *center; #line 81 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = _tmp6_.x; -#line 81 "/home/jens/Source/shotwell/src/Box.vala" - _tmp8_ = width; + _tmp7_ = _tmp6_.y; #line 81 "/home/jens/Source/shotwell/src/Box.vala" - _tmp9_ = *center; + box_init (&_tmp8_, _tmp1_ - (width / 2), _tmp3_ - (height / 2), _tmp5_ + (width / 2), _tmp7_ + (height / 2)); #line 81 "/home/jens/Source/shotwell/src/Box.vala" - _tmp10_ = _tmp9_.y; -#line 81 "/home/jens/Source/shotwell/src/Box.vala" - _tmp11_ = height; -#line 81 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_tmp12_, _tmp1_ - (_tmp2_ / 2), _tmp4_ - (_tmp5_ / 2), _tmp7_ + (_tmp8_ / 2), _tmp10_ + (_tmp11_ / 2)); -#line 81 "/home/jens/Source/shotwell/src/Box.vala" - *result = _tmp12_; + *result = _tmp8_; #line 81 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 501 "Box.c" +#line 515 "Box.c" } -gint box_get_width (Box *self) { +gint +box_get_width (Box *self) +{ gint result = 0; gint _tmp0_; gint _tmp1_; @@ -521,11 +537,13 @@ gint box_get_width (Box *self) { result = (_tmp2_ - _tmp3_) + 1; #line 88 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 525 "Box.c" +#line 541 "Box.c" } -gint box_get_height (Box *self) { +gint +box_get_height (Box *self) +{ gint result = 0; gint _tmp0_; gint _tmp1_; @@ -545,11 +563,13 @@ gint box_get_height (Box *self) { result = (_tmp2_ - _tmp3_) + 1; #line 94 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 549 "Box.c" +#line 567 "Box.c" } -gboolean box_is_valid (Box *self) { +gboolean +box_is_valid (Box *self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; @@ -559,21 +579,21 @@ gboolean box_is_valid (Box *self) { _tmp3_ = (*self).left; #line 98 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp3_ >= 0) { -#line 563 "Box.c" +#line 583 "Box.c" gint _tmp4_; #line 98 "/home/jens/Source/shotwell/src/Box.vala" _tmp4_ = (*self).top; #line 98 "/home/jens/Source/shotwell/src/Box.vala" _tmp2_ = _tmp4_ >= 0; -#line 569 "Box.c" +#line 589 "Box.c" } else { #line 98 "/home/jens/Source/shotwell/src/Box.vala" _tmp2_ = FALSE; -#line 573 "Box.c" +#line 593 "Box.c" } #line 98 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp2_) { -#line 577 "Box.c" +#line 597 "Box.c" gint _tmp5_; gint _tmp6_; #line 98 "/home/jens/Source/shotwell/src/Box.vala" @@ -582,15 +602,15 @@ gboolean box_is_valid (Box *self) { _tmp6_ = (*self).left; #line 98 "/home/jens/Source/shotwell/src/Box.vala" _tmp1_ = _tmp5_ >= _tmp6_; -#line 586 "Box.c" +#line 606 "Box.c" } else { #line 98 "/home/jens/Source/shotwell/src/Box.vala" _tmp1_ = FALSE; -#line 590 "Box.c" +#line 610 "Box.c" } #line 98 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp1_) { -#line 594 "Box.c" +#line 614 "Box.c" gint _tmp7_; gint _tmp8_; #line 98 "/home/jens/Source/shotwell/src/Box.vala" @@ -599,21 +619,24 @@ gboolean box_is_valid (Box *self) { _tmp8_ = (*self).top; #line 98 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = _tmp7_ >= _tmp8_; -#line 603 "Box.c" +#line 623 "Box.c" } else { #line 98 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = FALSE; -#line 607 "Box.c" +#line 627 "Box.c" } #line 98 "/home/jens/Source/shotwell/src/Box.vala" result = _tmp0_; #line 98 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 613 "Box.c" +#line 633 "Box.c" } -gboolean box_equals (Box *self, Box* box) { +gboolean +box_equals (Box *self, + Box* box) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; @@ -631,7 +654,7 @@ gboolean box_equals (Box *self, Box* box) { _tmp5_ = _tmp4_.left; #line 102 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp3_ == _tmp5_) { -#line 635 "Box.c" +#line 658 "Box.c" gint _tmp6_; Box _tmp7_; gint _tmp8_; @@ -643,15 +666,15 @@ gboolean box_equals (Box *self, Box* box) { _tmp8_ = _tmp7_.top; #line 102 "/home/jens/Source/shotwell/src/Box.vala" _tmp2_ = _tmp6_ == _tmp8_; -#line 647 "Box.c" +#line 670 "Box.c" } else { #line 102 "/home/jens/Source/shotwell/src/Box.vala" _tmp2_ = FALSE; -#line 651 "Box.c" +#line 674 "Box.c" } #line 102 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp2_) { -#line 655 "Box.c" +#line 678 "Box.c" gint _tmp9_; Box _tmp10_; gint _tmp11_; @@ -663,15 +686,15 @@ gboolean box_equals (Box *self, Box* box) { _tmp11_ = _tmp10_.right; #line 102 "/home/jens/Source/shotwell/src/Box.vala" _tmp1_ = _tmp9_ == _tmp11_; -#line 667 "Box.c" +#line 690 "Box.c" } else { #line 102 "/home/jens/Source/shotwell/src/Box.vala" _tmp1_ = FALSE; -#line 671 "Box.c" +#line 694 "Box.c" } #line 102 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp1_) { -#line 675 "Box.c" +#line 698 "Box.c" gint _tmp12_; Box _tmp13_; gint _tmp14_; @@ -683,26 +706,27 @@ gboolean box_equals (Box *self, Box* box) { _tmp14_ = _tmp13_.bottom; #line 102 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = _tmp12_ == _tmp14_; -#line 687 "Box.c" +#line 710 "Box.c" } else { #line 102 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = FALSE; -#line 691 "Box.c" +#line 714 "Box.c" } #line 102 "/home/jens/Source/shotwell/src/Box.vala" result = _tmp0_; #line 102 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 697 "Box.c" +#line 720 "Box.c" } -void box_adjust_width (Box *self, gint width) { +void +box_adjust_width (Box *self, + gint width) +{ gint center_x = 0; gint _tmp0_; gint _tmp1_; - gint _tmp2_; - gint _tmp3_; #line 107 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = (*self).left; #line 107 "/home/jens/Source/shotwell/src/Box.vala" @@ -710,23 +734,20 @@ void box_adjust_width (Box *self, gint width) { #line 107 "/home/jens/Source/shotwell/src/Box.vala" center_x = (_tmp0_ + _tmp1_) / 2; #line 108 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = width; -#line 108 "/home/jens/Source/shotwell/src/Box.vala" - (*self).left = center_x - (_tmp2_ / 2); -#line 109 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = width; + (*self).left = center_x - (width / 2); #line 109 "/home/jens/Source/shotwell/src/Box.vala" - (*self).right = center_x + (_tmp3_ / 2); -#line 721 "Box.c" + (*self).right = center_x + (width / 2); +#line 741 "Box.c" } -void box_adjust_height (Box *self, gint height) { +void +box_adjust_height (Box *self, + gint height) +{ gint center_y = 0; gint _tmp0_; gint _tmp1_; - gint _tmp2_; - gint _tmp3_; #line 114 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = (*self).top; #line 114 "/home/jens/Source/shotwell/src/Box.vala" @@ -734,18 +755,18 @@ void box_adjust_height (Box *self, gint height) { #line 114 "/home/jens/Source/shotwell/src/Box.vala" center_y = (_tmp0_ + _tmp1_) / 2; #line 115 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = height; -#line 115 "/home/jens/Source/shotwell/src/Box.vala" - (*self).top = center_y - (_tmp2_ / 2); -#line 116 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = height; + (*self).top = center_y - (height / 2); #line 116 "/home/jens/Source/shotwell/src/Box.vala" - (*self).bottom = center_y + (_tmp3_ / 2); -#line 745 "Box.c" + (*self).bottom = center_y + (height / 2); +#line 762 "Box.c" } -void box_get_scaled (Box *self, Dimensions* scaled, Box* result) { +void +box_get_scaled (Box *self, + Dimensions* scaled, + Box* result) +{ gdouble x_scale = 0.0; gdouble y_scale = 0.0; Dimensions _tmp0_ = {0}; @@ -755,28 +776,25 @@ void box_get_scaled (Box *self, Dimensions* scaled, Box* result) { gint l = 0; gint _tmp4_; gdouble _tmp5_; - gdouble _tmp6_; gint t = 0; - gint _tmp7_; - gdouble _tmp8_; - gdouble _tmp9_; + gint _tmp6_; + gdouble _tmp7_; gint r = 0; + gint _tmp8_; + Dimensions _tmp9_; gint _tmp10_; - Dimensions _tmp11_; - gint _tmp12_; gint b = 0; + gint _tmp11_; + Dimensions _tmp12_; gint _tmp13_; - Dimensions _tmp14_; - gint _tmp15_; Box box = {0}; + gint _tmp14_; + gint _tmp15_; gint _tmp16_; gint _tmp17_; - gint _tmp18_; - gint _tmp19_; - gboolean _tmp20_ = FALSE; - gint _tmp21_; - Dimensions _tmp22_; - gint _tmp23_; + gboolean _tmp18_ = FALSE; + Dimensions _tmp19_; + gint _tmp20_; #line 119 "/home/jens/Source/shotwell/src/Box.vala" g_return_if_fail (scaled != NULL); #line 121 "/home/jens/Source/shotwell/src/Box.vala" @@ -794,79 +812,75 @@ void box_get_scaled (Box *self, Dimensions* scaled, Box* result) { #line 123 "/home/jens/Source/shotwell/src/Box.vala" _tmp5_ = x_scale; #line 123 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = round (((gdouble) _tmp4_) * _tmp5_); -#line 123 "/home/jens/Source/shotwell/src/Box.vala" - l = (gint) _tmp6_; -#line 124 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = (*self).top; + l = (gint) round (((gdouble) _tmp4_) * _tmp5_); #line 124 "/home/jens/Source/shotwell/src/Box.vala" - _tmp8_ = y_scale; + _tmp6_ = (*self).top; #line 124 "/home/jens/Source/shotwell/src/Box.vala" - _tmp9_ = round (((gdouble) _tmp7_) * _tmp8_); + _tmp7_ = y_scale; #line 124 "/home/jens/Source/shotwell/src/Box.vala" - t = (gint) _tmp9_; + t = (gint) round (((gdouble) _tmp6_) * _tmp7_); #line 127 "/home/jens/Source/shotwell/src/Box.vala" - _tmp10_ = l; + _tmp8_ = l; #line 127 "/home/jens/Source/shotwell/src/Box.vala" - _tmp11_ = *scaled; + _tmp9_ = *scaled; #line 127 "/home/jens/Source/shotwell/src/Box.vala" - _tmp12_ = _tmp11_.width; + _tmp10_ = _tmp9_.width; #line 127 "/home/jens/Source/shotwell/src/Box.vala" - r = (_tmp10_ + _tmp12_) - 1; + r = (_tmp8_ + _tmp10_) - 1; #line 128 "/home/jens/Source/shotwell/src/Box.vala" - _tmp13_ = t; + _tmp11_ = t; #line 128 "/home/jens/Source/shotwell/src/Box.vala" - _tmp14_ = *scaled; + _tmp12_ = *scaled; #line 128 "/home/jens/Source/shotwell/src/Box.vala" - _tmp15_ = _tmp14_.height; + _tmp13_ = _tmp12_.height; #line 128 "/home/jens/Source/shotwell/src/Box.vala" - b = (_tmp13_ + _tmp15_) - 1; + b = (_tmp11_ + _tmp13_) - 1; #line 130 "/home/jens/Source/shotwell/src/Box.vala" - _tmp16_ = l; + _tmp14_ = l; #line 130 "/home/jens/Source/shotwell/src/Box.vala" - _tmp17_ = t; + _tmp15_ = t; #line 130 "/home/jens/Source/shotwell/src/Box.vala" - _tmp18_ = r; + _tmp16_ = r; #line 130 "/home/jens/Source/shotwell/src/Box.vala" - _tmp19_ = b; + _tmp17_ = b; #line 130 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&box, _tmp16_, _tmp17_, _tmp18_, _tmp19_); -#line 131 "/home/jens/Source/shotwell/src/Box.vala" - _tmp21_ = box_get_width (&box); + box_init (&box, _tmp14_, _tmp15_, _tmp16_, _tmp17_); #line 131 "/home/jens/Source/shotwell/src/Box.vala" - _tmp22_ = *scaled; + _tmp19_ = *scaled; #line 131 "/home/jens/Source/shotwell/src/Box.vala" - _tmp23_ = _tmp22_.width; + _tmp20_ = _tmp19_.width; #line 131 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp21_ == _tmp23_) { + if (box_get_width (&box) == _tmp20_) { #line 131 "/home/jens/Source/shotwell/src/Box.vala" - _tmp20_ = TRUE; -#line 845 "Box.c" + _tmp18_ = TRUE; +#line 857 "Box.c" } else { - gint _tmp24_; - Dimensions _tmp25_; - gint _tmp26_; -#line 131 "/home/jens/Source/shotwell/src/Box.vala" - _tmp24_ = box_get_height (&box); + Dimensions _tmp21_; + gint _tmp22_; #line 131 "/home/jens/Source/shotwell/src/Box.vala" - _tmp25_ = *scaled; + _tmp21_ = *scaled; #line 131 "/home/jens/Source/shotwell/src/Box.vala" - _tmp26_ = _tmp25_.height; + _tmp22_ = _tmp21_.height; #line 131 "/home/jens/Source/shotwell/src/Box.vala" - _tmp20_ = _tmp24_ == _tmp26_; -#line 858 "Box.c" + _tmp18_ = box_get_height (&box) == _tmp22_; +#line 867 "Box.c" } #line 131 "/home/jens/Source/shotwell/src/Box.vala" - _vala_assert (_tmp20_, "box.get_width() == scaled.width || box.get_height() == scaled.height"); + _vala_assert (_tmp18_, "box.get_width() == scaled.width || box.get_height() == scaled.height"); #line 133 "/home/jens/Source/shotwell/src/Box.vala" *result = box; #line 133 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 866 "Box.c" +#line 875 "Box.c" } -void box_get_scaled_similar (Box *self, Dimensions* original, Dimensions* scaled, Box* result) { +void +box_get_scaled_similar (Box *self, + Dimensions* original, + Dimensions* scaled, + Box* result) +{ gdouble x_scale = 0.0; gdouble y_scale = 0.0; Dimensions _tmp0_; @@ -875,30 +889,26 @@ void box_get_scaled_similar (Box *self, Dimensions* original, Dimensions* scaled gint l = 0; gint _tmp3_; gdouble _tmp4_; - gdouble _tmp5_; gint t = 0; - gint _tmp6_; - gdouble _tmp7_; - gdouble _tmp8_; + gint _tmp5_; + gdouble _tmp6_; gint r = 0; + gint _tmp7_; + gdouble _tmp8_; + gint b = 0; gint _tmp9_; gdouble _tmp10_; - gdouble _tmp11_; - gint b = 0; - gint _tmp12_; - gdouble _tmp13_; - gdouble _tmp14_; - gint _tmp15_; - Dimensions _tmp16_; - gint _tmp17_; - gint _tmp20_; - Dimensions _tmp21_; + gint _tmp11_; + Dimensions _tmp12_; + gint _tmp13_; + gint _tmp16_; + Dimensions _tmp17_; + gint _tmp18_; + gint _tmp21_; gint _tmp22_; - gint _tmp25_; - gint _tmp26_; - gint _tmp27_; - gint _tmp28_; - Box _tmp29_ = {0}; + gint _tmp23_; + gint _tmp24_; + Box _tmp25_ = {0}; #line 136 "/home/jens/Source/shotwell/src/Box.vala" g_return_if_fail (original != NULL); #line 136 "/home/jens/Source/shotwell/src/Box.vala" @@ -916,144 +926,130 @@ void box_get_scaled_similar (Box *self, Dimensions* original, Dimensions* scaled #line 140 "/home/jens/Source/shotwell/src/Box.vala" _tmp4_ = x_scale; #line 140 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = round (((gdouble) _tmp3_) * _tmp4_); -#line 140 "/home/jens/Source/shotwell/src/Box.vala" - l = (gint) _tmp5_; + l = (gint) round (((gdouble) _tmp3_) * _tmp4_); #line 141 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = (*self).top; -#line 141 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = y_scale; + _tmp5_ = (*self).top; #line 141 "/home/jens/Source/shotwell/src/Box.vala" - _tmp8_ = round (((gdouble) _tmp6_) * _tmp7_); + _tmp6_ = y_scale; #line 141 "/home/jens/Source/shotwell/src/Box.vala" - t = (gint) _tmp8_; -#line 142 "/home/jens/Source/shotwell/src/Box.vala" - _tmp9_ = (*self).right; + t = (gint) round (((gdouble) _tmp5_) * _tmp6_); #line 142 "/home/jens/Source/shotwell/src/Box.vala" - _tmp10_ = x_scale; + _tmp7_ = (*self).right; #line 142 "/home/jens/Source/shotwell/src/Box.vala" - _tmp11_ = round (((gdouble) _tmp9_) * _tmp10_); + _tmp8_ = x_scale; #line 142 "/home/jens/Source/shotwell/src/Box.vala" - r = (gint) _tmp11_; + r = (gint) round (((gdouble) _tmp7_) * _tmp8_); #line 143 "/home/jens/Source/shotwell/src/Box.vala" - _tmp12_ = (*self).bottom; + _tmp9_ = (*self).bottom; #line 143 "/home/jens/Source/shotwell/src/Box.vala" - _tmp13_ = y_scale; + _tmp10_ = y_scale; #line 143 "/home/jens/Source/shotwell/src/Box.vala" - _tmp14_ = round (((gdouble) _tmp12_) * _tmp13_); -#line 143 "/home/jens/Source/shotwell/src/Box.vala" - b = (gint) _tmp14_; + b = (gint) round (((gdouble) _tmp9_) * _tmp10_); #line 146 "/home/jens/Source/shotwell/src/Box.vala" - _tmp15_ = r; + _tmp11_ = r; #line 146 "/home/jens/Source/shotwell/src/Box.vala" - _tmp16_ = *scaled; + _tmp12_ = *scaled; #line 146 "/home/jens/Source/shotwell/src/Box.vala" - _tmp17_ = _tmp16_.width; + _tmp13_ = _tmp12_.width; #line 146 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp15_ >= _tmp17_) { -#line 955 "Box.c" - Dimensions _tmp18_; - gint _tmp19_; + if (_tmp11_ >= _tmp13_) { +#line 957 "Box.c" + Dimensions _tmp14_; + gint _tmp15_; #line 147 "/home/jens/Source/shotwell/src/Box.vala" - _tmp18_ = *scaled; + _tmp14_ = *scaled; #line 147 "/home/jens/Source/shotwell/src/Box.vala" - _tmp19_ = _tmp18_.width; + _tmp15_ = _tmp14_.width; #line 147 "/home/jens/Source/shotwell/src/Box.vala" - r = _tmp19_ - 1; -#line 964 "Box.c" + r = _tmp15_ - 1; +#line 966 "Box.c" } #line 149 "/home/jens/Source/shotwell/src/Box.vala" - _tmp20_ = b; + _tmp16_ = b; #line 149 "/home/jens/Source/shotwell/src/Box.vala" - _tmp21_ = *scaled; + _tmp17_ = *scaled; #line 149 "/home/jens/Source/shotwell/src/Box.vala" - _tmp22_ = _tmp21_.height; + _tmp18_ = _tmp17_.height; #line 149 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp20_ >= _tmp22_) { -#line 974 "Box.c" - Dimensions _tmp23_; - gint _tmp24_; + if (_tmp16_ >= _tmp18_) { +#line 976 "Box.c" + Dimensions _tmp19_; + gint _tmp20_; #line 150 "/home/jens/Source/shotwell/src/Box.vala" - _tmp23_ = *scaled; + _tmp19_ = *scaled; #line 150 "/home/jens/Source/shotwell/src/Box.vala" - _tmp24_ = _tmp23_.height; + _tmp20_ = _tmp19_.height; #line 150 "/home/jens/Source/shotwell/src/Box.vala" - b = _tmp24_ - 1; -#line 983 "Box.c" + b = _tmp20_ - 1; +#line 985 "Box.c" } #line 152 "/home/jens/Source/shotwell/src/Box.vala" - _tmp25_ = l; + _tmp21_ = l; #line 152 "/home/jens/Source/shotwell/src/Box.vala" - _tmp26_ = t; + _tmp22_ = t; #line 152 "/home/jens/Source/shotwell/src/Box.vala" - _tmp27_ = r; + _tmp23_ = r; #line 152 "/home/jens/Source/shotwell/src/Box.vala" - _tmp28_ = b; + _tmp24_ = b; #line 152 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_tmp29_, _tmp25_, _tmp26_, _tmp27_, _tmp28_); + box_init (&_tmp25_, _tmp21_, _tmp22_, _tmp23_, _tmp24_); #line 152 "/home/jens/Source/shotwell/src/Box.vala" - *result = _tmp29_; + *result = _tmp25_; #line 152 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 999 "Box.c" +#line 1001 "Box.c" } -void box_get_offset (Box *self, gint xofs, gint yofs, Box* result) { +void +box_get_offset (Box *self, + gint xofs, + gint yofs, + Box* result) +{ gint _tmp0_; gint _tmp1_; gint _tmp2_; gint _tmp3_; - gint _tmp4_; - gint _tmp5_; - gint _tmp6_; - gint _tmp7_; - Box _tmp8_ = {0}; + Box _tmp4_ = {0}; #line 156 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = (*self).left; #line 156 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = xofs; -#line 156 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = (*self).top; -#line 156 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = yofs; -#line 156 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = (*self).right; -#line 156 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = xofs; + _tmp1_ = (*self).top; #line 156 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = (*self).bottom; + _tmp2_ = (*self).right; #line 156 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = yofs; + _tmp3_ = (*self).bottom; #line 156 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_tmp8_, _tmp0_ + _tmp1_, _tmp2_ + _tmp3_, _tmp4_ + _tmp5_, _tmp6_ + _tmp7_); + box_init (&_tmp4_, _tmp0_ + xofs, _tmp1_ + yofs, _tmp2_ + xofs, _tmp3_ + yofs); #line 156 "/home/jens/Source/shotwell/src/Box.vala" - *result = _tmp8_; + *result = _tmp4_; #line 156 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 1035 "Box.c" +#line 1030 "Box.c" } -void box_get_dimensions (Box *self, Dimensions* result) { - gint _tmp0_; - gint _tmp1_; - Dimensions _tmp2_ = {0}; -#line 160 "/home/jens/Source/shotwell/src/Box.vala" - _tmp0_ = box_get_width (&(*self)); -#line 160 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = box_get_height (&(*self)); +void +box_get_dimensions (Box *self, + Dimensions* result) +{ + Dimensions _tmp0_ = {0}; #line 160 "/home/jens/Source/shotwell/src/Box.vala" - dimensions_init (&_tmp2_, _tmp0_, _tmp1_); + dimensions_init (&_tmp0_, box_get_width (&(*self)), box_get_height (&(*self))); #line 160 "/home/jens/Source/shotwell/src/Box.vala" - *result = _tmp2_; + *result = _tmp0_; #line 160 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 1053 "Box.c" +#line 1045 "Box.c" } -void box_get_points (Box *self, GdkPoint* top_left, GdkPoint* bottom_right) { +void +box_get_points (Box *self, + GdkPoint* top_left, + GdkPoint* bottom_right) +{ GdkPoint _vala_top_left = {0}; GdkPoint _vala_bottom_right = {0}; gint _tmp0_; @@ -1086,23 +1082,24 @@ void box_get_points (Box *self, GdkPoint* top_left, GdkPoint* bottom_right) { if (top_left) { #line 163 "/home/jens/Source/shotwell/src/Box.vala" *top_left = _vala_top_left; -#line 1090 "Box.c" +#line 1086 "Box.c" } #line 163 "/home/jens/Source/shotwell/src/Box.vala" if (bottom_right) { #line 163 "/home/jens/Source/shotwell/src/Box.vala" *bottom_right = _vala_bottom_right; -#line 1096 "Box.c" +#line 1092 "Box.c" } } -void box_get_rectangle (Box *self, GdkRectangle* result) { +void +box_get_rectangle (Box *self, + GdkRectangle* result) +{ GdkRectangle rect = {0}; gint _tmp0_; gint _tmp1_; - gint _tmp2_; - gint _tmp3_; #line 169 "/home/jens/Source/shotwell/src/Box.vala" memset (&rect, 0, sizeof (GdkRectangle)); #line 170 "/home/jens/Source/shotwell/src/Box.vala" @@ -1114,22 +1111,21 @@ void box_get_rectangle (Box *self, GdkRectangle* result) { #line 171 "/home/jens/Source/shotwell/src/Box.vala" rect.y = _tmp1_; #line 172 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = box_get_width (&(*self)); -#line 172 "/home/jens/Source/shotwell/src/Box.vala" - rect.width = _tmp2_; + rect.width = box_get_width (&(*self)); #line 173 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = box_get_height (&(*self)); -#line 173 "/home/jens/Source/shotwell/src/Box.vala" - rect.height = _tmp3_; + rect.height = box_get_height (&(*self)); #line 175 "/home/jens/Source/shotwell/src/Box.vala" *result = rect; #line 175 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 1129 "Box.c" +#line 1122 "Box.c" } -void box_get_center (Box *self, GdkPoint* result) { +void +box_get_center (Box *self, + GdkPoint* result) +{ gint _tmp0_; gint _tmp1_; gint _tmp2_; @@ -1151,11 +1147,15 @@ void box_get_center (Box *self, GdkPoint* result) { *result = _tmp4_; #line 179 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 1155 "Box.c" +#line 1151 "Box.c" } -void box_rotate_clockwise (Box *self, Dimensions* space, Box* result) { +void +box_rotate_clockwise (Box *self, + Dimensions* space, + Box* result) +{ gint l = 0; Dimensions _tmp0_; gint _tmp1_; @@ -1205,7 +1205,11 @@ void box_rotate_clockwise (Box *self, Dimensions* space, Box* result) { } -void box_rotate_counterclockwise (Box *self, Dimensions* space, Box* result) { +void +box_rotate_counterclockwise (Box *self, + Dimensions* space, + Box* result) +{ gint l = 0; gint _tmp0_; gint t = 0; @@ -1251,11 +1255,15 @@ void box_rotate_counterclockwise (Box *self, Dimensions* space, Box* result) { *result = _tmp8_; #line 197 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 1255 "Box.c" +#line 1259 "Box.c" } -void box_flip_left_to_right (Box *self, Dimensions* space, Box* result) { +void +box_flip_left_to_right (Box *self, + Dimensions* space, + Box* result) +{ gint l = 0; Dimensions _tmp0_; gint _tmp1_; @@ -1295,11 +1303,15 @@ void box_flip_left_to_right (Box *self, Dimensions* space, Box* result) { *result = _tmp8_; #line 204 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 1299 "Box.c" +#line 1307 "Box.c" } -void box_flip_top_to_bottom (Box *self, Dimensions* space, Box* result) { +void +box_flip_top_to_bottom (Box *self, + Dimensions* space, + Box* result) +{ gint t = 0; Dimensions _tmp0_; gint _tmp1_; @@ -1339,35 +1351,34 @@ void box_flip_top_to_bottom (Box *self, Dimensions* space, Box* result) { *result = _tmp8_; #line 211 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 1343 "Box.c" +#line 1355 "Box.c" } -gboolean box_intersects (Box *self, Box* compare) { +gboolean +box_intersects (Box *self, + Box* compare) +{ gboolean result = FALSE; gint left_intersect = 0; gint _tmp0_; Box _tmp1_; gint _tmp2_; - gint _tmp3_; gint top_intersect = 0; - gint _tmp4_; - Box _tmp5_; - gint _tmp6_; - gint _tmp7_; + gint _tmp3_; + Box _tmp4_; + gint _tmp5_; gint right_intersect = 0; + gint _tmp6_; + Box _tmp7_; gint _tmp8_; - Box _tmp9_; - gint _tmp10_; - gint _tmp11_; gint bottom_intersect = 0; - gint _tmp12_; - Box _tmp13_; + gint _tmp9_; + Box _tmp10_; + gint _tmp11_; + gboolean _tmp12_ = FALSE; + gint _tmp13_; gint _tmp14_; - gint _tmp15_; - gboolean _tmp16_ = FALSE; - gint _tmp17_; - gint _tmp18_; #line 214 "/home/jens/Source/shotwell/src/Box.vala" g_return_val_if_fail (compare != NULL, FALSE); #line 215 "/home/jens/Source/shotwell/src/Box.vala" @@ -1377,141 +1388,120 @@ gboolean box_intersects (Box *self, Box* compare) { #line 215 "/home/jens/Source/shotwell/src/Box.vala" _tmp2_ = _tmp1_.left; #line 215 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = MAX (_tmp0_, _tmp2_); -#line 215 "/home/jens/Source/shotwell/src/Box.vala" - left_intersect = _tmp3_; + left_intersect = MAX (_tmp0_, _tmp2_); #line 216 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = (*self).top; -#line 216 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = *compare; + _tmp3_ = (*self).top; #line 216 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = _tmp5_.top; + _tmp4_ = *compare; #line 216 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = MAX (_tmp4_, _tmp6_); + _tmp5_ = _tmp4_.top; #line 216 "/home/jens/Source/shotwell/src/Box.vala" - top_intersect = _tmp7_; -#line 217 "/home/jens/Source/shotwell/src/Box.vala" - _tmp8_ = (*self).right; + top_intersect = MAX (_tmp3_, _tmp5_); #line 217 "/home/jens/Source/shotwell/src/Box.vala" - _tmp9_ = *compare; + _tmp6_ = (*self).right; #line 217 "/home/jens/Source/shotwell/src/Box.vala" - _tmp10_ = _tmp9_.right; + _tmp7_ = *compare; #line 217 "/home/jens/Source/shotwell/src/Box.vala" - _tmp11_ = MIN (_tmp8_, _tmp10_); + _tmp8_ = _tmp7_.right; #line 217 "/home/jens/Source/shotwell/src/Box.vala" - right_intersect = _tmp11_; + right_intersect = MIN (_tmp6_, _tmp8_); #line 218 "/home/jens/Source/shotwell/src/Box.vala" - _tmp12_ = (*self).bottom; + _tmp9_ = (*self).bottom; #line 218 "/home/jens/Source/shotwell/src/Box.vala" - _tmp13_ = *compare; + _tmp10_ = *compare; #line 218 "/home/jens/Source/shotwell/src/Box.vala" - _tmp14_ = _tmp13_.bottom; + _tmp11_ = _tmp10_.bottom; #line 218 "/home/jens/Source/shotwell/src/Box.vala" - _tmp15_ = MIN (_tmp12_, _tmp14_); -#line 218 "/home/jens/Source/shotwell/src/Box.vala" - bottom_intersect = _tmp15_; + bottom_intersect = MIN (_tmp9_, _tmp11_); #line 220 "/home/jens/Source/shotwell/src/Box.vala" - _tmp17_ = right_intersect; + _tmp13_ = right_intersect; #line 220 "/home/jens/Source/shotwell/src/Box.vala" - _tmp18_ = left_intersect; + _tmp14_ = left_intersect; #line 220 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp17_ >= _tmp18_) { -#line 1420 "Box.c" - gint _tmp19_; - gint _tmp20_; + if (_tmp13_ >= _tmp14_) { +#line 1423 "Box.c" + gint _tmp15_; + gint _tmp16_; #line 220 "/home/jens/Source/shotwell/src/Box.vala" - _tmp19_ = bottom_intersect; + _tmp15_ = bottom_intersect; #line 220 "/home/jens/Source/shotwell/src/Box.vala" - _tmp20_ = top_intersect; + _tmp16_ = top_intersect; #line 220 "/home/jens/Source/shotwell/src/Box.vala" - _tmp16_ = _tmp19_ >= _tmp20_; -#line 1429 "Box.c" + _tmp12_ = _tmp15_ >= _tmp16_; +#line 1432 "Box.c" } else { #line 220 "/home/jens/Source/shotwell/src/Box.vala" - _tmp16_ = FALSE; -#line 1433 "Box.c" + _tmp12_ = FALSE; +#line 1436 "Box.c" } #line 220 "/home/jens/Source/shotwell/src/Box.vala" - result = _tmp16_; + result = _tmp12_; #line 220 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 1439 "Box.c" +#line 1442 "Box.c" } -void box_get_reduced (Box *self, gint amount, Box* result) { +void +box_get_reduced (Box *self, + gint amount, + Box* result) +{ gint _tmp0_; gint _tmp1_; gint _tmp2_; gint _tmp3_; - gint _tmp4_; - gint _tmp5_; - gint _tmp6_; - gint _tmp7_; - Box _tmp8_ = {0}; + Box _tmp4_ = {0}; #line 224 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = (*self).left; #line 224 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = amount; -#line 224 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = (*self).top; -#line 224 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = amount; -#line 224 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = (*self).right; -#line 224 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = amount; + _tmp1_ = (*self).top; #line 224 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = (*self).bottom; + _tmp2_ = (*self).right; #line 224 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = amount; + _tmp3_ = (*self).bottom; #line 224 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_tmp8_, _tmp0_ + _tmp1_, _tmp2_ + _tmp3_, _tmp4_ - _tmp5_, _tmp6_ - _tmp7_); + box_init (&_tmp4_, _tmp0_ + amount, _tmp1_ + amount, _tmp2_ - amount, _tmp3_ - amount); #line 224 "/home/jens/Source/shotwell/src/Box.vala" - *result = _tmp8_; + *result = _tmp4_; #line 224 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 1475 "Box.c" +#line 1470 "Box.c" } -void box_get_expanded (Box *self, gint amount, Box* result) { +void +box_get_expanded (Box *self, + gint amount, + Box* result) +{ gint _tmp0_; gint _tmp1_; gint _tmp2_; gint _tmp3_; - gint _tmp4_; - gint _tmp5_; - gint _tmp6_; - gint _tmp7_; - Box _tmp8_ = {0}; + Box _tmp4_ = {0}; #line 228 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = (*self).left; #line 228 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = amount; -#line 228 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = (*self).top; -#line 228 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = amount; -#line 228 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = (*self).right; -#line 228 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = amount; + _tmp1_ = (*self).top; #line 228 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = (*self).bottom; + _tmp2_ = (*self).right; #line 228 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = amount; + _tmp3_ = (*self).bottom; #line 228 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_tmp8_, _tmp0_ - _tmp1_, _tmp2_ - _tmp3_, _tmp4_ + _tmp5_, _tmp6_ + _tmp7_); + box_init (&_tmp4_, _tmp0_ - amount, _tmp1_ - amount, _tmp2_ + amount, _tmp3_ + amount); #line 228 "/home/jens/Source/shotwell/src/Box.vala" - *result = _tmp8_; + *result = _tmp4_; #line 228 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 1511 "Box.c" +#line 1498 "Box.c" } -gboolean box_contains (Box *self, GdkPoint* point) { +gboolean +box_contains (Box *self, + GdkPoint* point) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; @@ -1529,7 +1519,7 @@ gboolean box_contains (Box *self, GdkPoint* point) { _tmp5_ = (*self).left; #line 232 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp4_ >= _tmp5_) { -#line 1533 "Box.c" +#line 1523 "Box.c" GdkPoint _tmp6_; gint _tmp7_; gint _tmp8_; @@ -1541,15 +1531,15 @@ gboolean box_contains (Box *self, GdkPoint* point) { _tmp8_ = (*self).right; #line 232 "/home/jens/Source/shotwell/src/Box.vala" _tmp2_ = _tmp7_ <= _tmp8_; -#line 1545 "Box.c" +#line 1535 "Box.c" } else { #line 232 "/home/jens/Source/shotwell/src/Box.vala" _tmp2_ = FALSE; -#line 1549 "Box.c" +#line 1539 "Box.c" } #line 232 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp2_) { -#line 1553 "Box.c" +#line 1543 "Box.c" GdkPoint _tmp9_; gint _tmp10_; gint _tmp11_; @@ -1561,15 +1551,15 @@ gboolean box_contains (Box *self, GdkPoint* point) { _tmp11_ = (*self).top; #line 232 "/home/jens/Source/shotwell/src/Box.vala" _tmp1_ = _tmp10_ >= _tmp11_; -#line 1565 "Box.c" +#line 1555 "Box.c" } else { #line 232 "/home/jens/Source/shotwell/src/Box.vala" _tmp1_ = FALSE; -#line 1569 "Box.c" +#line 1559 "Box.c" } #line 232 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp1_) { -#line 1573 "Box.c" +#line 1563 "Box.c" GdkPoint _tmp12_; gint _tmp13_; gint _tmp14_; @@ -1581,21 +1571,28 @@ gboolean box_contains (Box *self, GdkPoint* point) { _tmp14_ = (*self).bottom; #line 232 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = _tmp13_ <= _tmp14_; -#line 1585 "Box.c" +#line 1575 "Box.c" } else { #line 232 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = FALSE; -#line 1589 "Box.c" +#line 1579 "Box.c" } #line 232 "/home/jens/Source/shotwell/src/Box.vala" result = _tmp0_; #line 232 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 1595 "Box.c" +#line 1585 "Box.c" } -BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal, gboolean* horizontal_enlarged, Box* vertical, gboolean* vertical_enlarged) { +BoxComplements +box_resized_complements (Box *self, + Box* resized, + Box* horizontal, + gboolean* horizontal_enlarged, + Box* vertical, + gboolean* vertical_enlarged) +{ Box _vala_horizontal = {0}; gboolean _vala_horizontal_enlarged = FALSE; Box _vala_vertical = {0}; @@ -1611,7 +1608,6 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal gint _tmp38_; gboolean _tmp72_; gboolean _tmp73_; - BoxComplements _tmp74_; #line 238 "/home/jens/Source/shotwell/src/Box.vala" g_return_val_if_fail (resized != NULL, 0); #line 241 "/home/jens/Source/shotwell/src/Box.vala" @@ -1624,7 +1620,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal _tmp2_ = (*self).top; #line 242 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp1_ < _tmp2_) { -#line 1628 "Box.c" +#line 1624 "Box.c" Box _tmp3_; gint _tmp4_; Box _tmp5_; @@ -1650,7 +1646,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal box_init (&_vala_horizontal, _tmp4_, _tmp6_, _tmp8_, _tmp9_); #line 245 "/home/jens/Source/shotwell/src/Box.vala" _vala_horizontal_enlarged = TRUE; -#line 1654 "Box.c" +#line 1650 "Box.c" } else { Box _tmp10_; gint _tmp11_; @@ -1663,7 +1659,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal _tmp12_ = (*self).top; #line 246 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp11_ > _tmp12_) { -#line 1667 "Box.c" +#line 1663 "Box.c" gint _tmp13_; gint _tmp14_; gint _tmp15_; @@ -1683,7 +1679,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal box_init (&_vala_horizontal, _tmp13_, _tmp14_, _tmp15_, _tmp17_); #line 249 "/home/jens/Source/shotwell/src/Box.vala" _vala_horizontal_enlarged = FALSE; -#line 1687 "Box.c" +#line 1683 "Box.c" } else { Box _tmp18_; gint _tmp19_; @@ -1696,7 +1692,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal _tmp20_ = (*self).bottom; #line 250 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp19_ < _tmp20_) { -#line 1700 "Box.c" +#line 1696 "Box.c" gint _tmp21_; Box _tmp22_; gint _tmp23_; @@ -1716,7 +1712,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal box_init (&_vala_horizontal, _tmp21_, _tmp23_, _tmp24_, _tmp25_); #line 253 "/home/jens/Source/shotwell/src/Box.vala" _vala_horizontal_enlarged = FALSE; -#line 1720 "Box.c" +#line 1716 "Box.c" } else { Box _tmp26_; gint _tmp27_; @@ -1729,7 +1725,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal _tmp28_ = (*self).bottom; #line 254 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp27_ > _tmp28_) { -#line 1733 "Box.c" +#line 1729 "Box.c" Box _tmp29_; gint _tmp30_; gint _tmp31_; @@ -1755,7 +1751,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal box_init (&_vala_horizontal, _tmp30_, _tmp31_, _tmp33_, _tmp35_); #line 257 "/home/jens/Source/shotwell/src/Box.vala" _vala_horizontal_enlarged = TRUE; -#line 1759 "Box.c" +#line 1755 "Box.c" } else { #line 259 "/home/jens/Source/shotwell/src/Box.vala" box_init (&_vala_horizontal, 0, 0, 0, 0); @@ -1763,7 +1759,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal _vala_horizontal_enlarged = FALSE; #line 261 "/home/jens/Source/shotwell/src/Box.vala" horizontal_complement = FALSE; -#line 1767 "Box.c" +#line 1763 "Box.c" } } } @@ -1778,7 +1774,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal _tmp38_ = (*self).left; #line 265 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp37_ < _tmp38_) { -#line 1782 "Box.c" +#line 1778 "Box.c" Box _tmp39_; gint _tmp40_; Box _tmp41_; @@ -1804,7 +1800,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal box_init (&_vala_vertical, _tmp40_, _tmp42_, _tmp43_, _tmp45_); #line 268 "/home/jens/Source/shotwell/src/Box.vala" _vala_vertical_enlarged = TRUE; -#line 1808 "Box.c" +#line 1804 "Box.c" } else { Box _tmp46_; gint _tmp47_; @@ -1817,7 +1813,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal _tmp48_ = (*self).left; #line 269 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp47_ > _tmp48_) { -#line 1821 "Box.c" +#line 1817 "Box.c" gint _tmp49_; gint _tmp50_; Box _tmp51_; @@ -1837,7 +1833,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal box_init (&_vala_vertical, _tmp49_, _tmp50_, _tmp52_, _tmp53_); #line 272 "/home/jens/Source/shotwell/src/Box.vala" _vala_vertical_enlarged = FALSE; -#line 1841 "Box.c" +#line 1837 "Box.c" } else { Box _tmp54_; gint _tmp55_; @@ -1850,7 +1846,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal _tmp56_ = (*self).right; #line 273 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp55_ < _tmp56_) { -#line 1854 "Box.c" +#line 1850 "Box.c" Box _tmp57_; gint _tmp58_; gint _tmp59_; @@ -1870,7 +1866,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal box_init (&_vala_vertical, _tmp58_, _tmp59_, _tmp60_, _tmp61_); #line 276 "/home/jens/Source/shotwell/src/Box.vala" _vala_vertical_enlarged = FALSE; -#line 1874 "Box.c" +#line 1870 "Box.c" } else { Box _tmp62_; gint _tmp63_; @@ -1883,7 +1879,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal _tmp64_ = (*self).right; #line 277 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp63_ > _tmp64_) { -#line 1887 "Box.c" +#line 1883 "Box.c" gint _tmp65_; Box _tmp66_; gint _tmp67_; @@ -1909,7 +1905,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal box_init (&_vala_vertical, _tmp65_, _tmp67_, _tmp69_, _tmp71_); #line 280 "/home/jens/Source/shotwell/src/Box.vala" _vala_vertical_enlarged = TRUE; -#line 1913 "Box.c" +#line 1909 "Box.c" } else { #line 282 "/home/jens/Source/shotwell/src/Box.vala" box_init (&_vala_vertical, 0, 0, 0, 0); @@ -1917,7 +1913,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal _vala_vertical_enlarged = FALSE; #line 284 "/home/jens/Source/shotwell/src/Box.vala" vertical_complement = FALSE; -#line 1921 "Box.c" +#line 1917 "Box.c" } } } @@ -1927,223 +1923,215 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal #line 287 "/home/jens/Source/shotwell/src/Box.vala" _tmp73_ = vertical_complement; #line 287 "/home/jens/Source/shotwell/src/Box.vala" - _tmp74_ = box_complements_derive (_tmp72_, _tmp73_); -#line 287 "/home/jens/Source/shotwell/src/Box.vala" - result = _tmp74_; + result = box_complements_derive (_tmp72_, _tmp73_); #line 287 "/home/jens/Source/shotwell/src/Box.vala" if (horizontal) { #line 287 "/home/jens/Source/shotwell/src/Box.vala" *horizontal = _vala_horizontal; -#line 1938 "Box.c" +#line 1932 "Box.c" } #line 287 "/home/jens/Source/shotwell/src/Box.vala" if (horizontal_enlarged) { #line 287 "/home/jens/Source/shotwell/src/Box.vala" *horizontal_enlarged = _vala_horizontal_enlarged; -#line 1944 "Box.c" +#line 1938 "Box.c" } #line 287 "/home/jens/Source/shotwell/src/Box.vala" if (vertical) { #line 287 "/home/jens/Source/shotwell/src/Box.vala" *vertical = _vala_vertical; -#line 1950 "Box.c" +#line 1944 "Box.c" } #line 287 "/home/jens/Source/shotwell/src/Box.vala" if (vertical_enlarged) { #line 287 "/home/jens/Source/shotwell/src/Box.vala" *vertical_enlarged = _vala_vertical_enlarged; -#line 1956 "Box.c" +#line 1950 "Box.c" } #line 287 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 1960 "Box.c" +#line 1954 "Box.c" } -BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal_this, Box* vertical_this, Box* horizontal_shifted, Box* vertical_shifted) { +BoxComplements +box_shifted_complements (Box *self, + Box* shifted, + Box* horizontal_this, + Box* vertical_this, + Box* horizontal_shifted, + Box* vertical_shifted) +{ Box _vala_horizontal_this = {0}; Box _vala_vertical_this = {0}; Box _vala_horizontal_shifted = {0}; Box _vala_vertical_shifted = {0}; BoxComplements result = 0; - gint _tmp0_; - gint _tmp1_; + gboolean horizontal_complement = FALSE; + gboolean _tmp0_ = FALSE; + Box _tmp1_; gint _tmp2_; gint _tmp3_; - gboolean horizontal_complement = FALSE; - gboolean _tmp4_ = FALSE; - Box _tmp5_; - gint _tmp6_; - gint _tmp7_; gboolean vertical_complement = FALSE; - gboolean _tmp42_ = FALSE; - Box _tmp43_; - gint _tmp44_; - gint _tmp45_; - gboolean _tmp80_; - gboolean _tmp81_; - BoxComplements _tmp82_; + gboolean _tmp38_ = FALSE; + Box _tmp39_; + gint _tmp40_; + gint _tmp41_; + gboolean _tmp76_; + gboolean _tmp77_; #line 293 "/home/jens/Source/shotwell/src/Box.vala" g_return_val_if_fail (shifted != NULL, 0); #line 295 "/home/jens/Source/shotwell/src/Box.vala" - _tmp0_ = box_get_width (&(*self)); -#line 295 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = box_get_width (shifted); -#line 295 "/home/jens/Source/shotwell/src/Box.vala" - _vala_assert (_tmp0_ == _tmp1_, "get_width() == shifted.get_width()"); -#line 296 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = box_get_height (&(*self)); + _vala_assert (box_get_width (&(*self)) == box_get_width (shifted), "get_width() == shifted.get_width()"); #line 296 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = box_get_height (shifted); -#line 296 "/home/jens/Source/shotwell/src/Box.vala" - _vala_assert (_tmp2_ == _tmp3_, "get_height() == shifted.get_height()"); + _vala_assert (box_get_height (&(*self)) == box_get_height (shifted), "get_height() == shifted.get_height()"); #line 298 "/home/jens/Source/shotwell/src/Box.vala" horizontal_complement = TRUE; #line 299 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = *shifted; + _tmp1_ = *shifted; #line 299 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = _tmp5_.top; + _tmp2_ = _tmp1_.top; #line 299 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = (*self).top; + _tmp3_ = (*self).top; #line 299 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp6_ < _tmp7_) { -#line 2011 "Box.c" - Box _tmp8_; - gint _tmp9_; - gint _tmp10_; + if (_tmp2_ < _tmp3_) { +#line 1999 "Box.c" + Box _tmp4_; + gint _tmp5_; + gint _tmp6_; #line 299 "/home/jens/Source/shotwell/src/Box.vala" - _tmp8_ = *shifted; + _tmp4_ = *shifted; #line 299 "/home/jens/Source/shotwell/src/Box.vala" - _tmp9_ = _tmp8_.bottom; + _tmp5_ = _tmp4_.bottom; #line 299 "/home/jens/Source/shotwell/src/Box.vala" - _tmp10_ = (*self).top; + _tmp6_ = (*self).top; #line 299 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = _tmp9_ > _tmp10_; -#line 2023 "Box.c" + _tmp0_ = _tmp5_ > _tmp6_; +#line 2011 "Box.c" } else { #line 299 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = FALSE; -#line 2027 "Box.c" + _tmp0_ = FALSE; +#line 2015 "Box.c" } #line 299 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp4_) { -#line 2031 "Box.c" + if (_tmp0_) { +#line 2019 "Box.c" + gint _tmp7_; + Box _tmp8_; + gint _tmp9_; + gint _tmp10_; gint _tmp11_; Box _tmp12_; gint _tmp13_; - gint _tmp14_; + Box _tmp14_; gint _tmp15_; Box _tmp16_; gint _tmp17_; - Box _tmp18_; - gint _tmp19_; - Box _tmp20_; - gint _tmp21_; - gint _tmp22_; + gint _tmp18_; #line 301 "/home/jens/Source/shotwell/src/Box.vala" - _tmp11_ = (*self).left; + _tmp7_ = (*self).left; #line 301 "/home/jens/Source/shotwell/src/Box.vala" - _tmp12_ = *shifted; + _tmp8_ = *shifted; #line 301 "/home/jens/Source/shotwell/src/Box.vala" - _tmp13_ = _tmp12_.bottom; + _tmp9_ = _tmp8_.bottom; #line 301 "/home/jens/Source/shotwell/src/Box.vala" - _tmp14_ = (*self).right; + _tmp10_ = (*self).right; #line 301 "/home/jens/Source/shotwell/src/Box.vala" - _tmp15_ = (*self).bottom; + _tmp11_ = (*self).bottom; #line 301 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_vala_horizontal_this, _tmp11_, _tmp13_, _tmp14_, _tmp15_); + box_init (&_vala_horizontal_this, _tmp7_, _tmp9_, _tmp10_, _tmp11_); #line 302 "/home/jens/Source/shotwell/src/Box.vala" - _tmp16_ = *shifted; + _tmp12_ = *shifted; #line 302 "/home/jens/Source/shotwell/src/Box.vala" - _tmp17_ = _tmp16_.left; + _tmp13_ = _tmp12_.left; #line 302 "/home/jens/Source/shotwell/src/Box.vala" - _tmp18_ = *shifted; + _tmp14_ = *shifted; #line 302 "/home/jens/Source/shotwell/src/Box.vala" - _tmp19_ = _tmp18_.top; + _tmp15_ = _tmp14_.top; #line 302 "/home/jens/Source/shotwell/src/Box.vala" - _tmp20_ = *shifted; + _tmp16_ = *shifted; #line 302 "/home/jens/Source/shotwell/src/Box.vala" - _tmp21_ = _tmp20_.right; + _tmp17_ = _tmp16_.right; #line 302 "/home/jens/Source/shotwell/src/Box.vala" - _tmp22_ = (*self).top; + _tmp18_ = (*self).top; #line 302 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_vala_horizontal_shifted, _tmp17_, _tmp19_, _tmp21_, _tmp22_); -#line 2072 "Box.c" + box_init (&_vala_horizontal_shifted, _tmp13_, _tmp15_, _tmp17_, _tmp18_); +#line 2060 "Box.c" } else { - gboolean _tmp23_ = FALSE; - Box _tmp24_; - gint _tmp25_; - gint _tmp26_; + gboolean _tmp19_ = FALSE; + Box _tmp20_; + gint _tmp21_; + gint _tmp22_; #line 303 "/home/jens/Source/shotwell/src/Box.vala" - _tmp24_ = *shifted; + _tmp20_ = *shifted; #line 303 "/home/jens/Source/shotwell/src/Box.vala" - _tmp25_ = _tmp24_.top; + _tmp21_ = _tmp20_.top; #line 303 "/home/jens/Source/shotwell/src/Box.vala" - _tmp26_ = (*self).top; + _tmp22_ = (*self).top; #line 303 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp25_ > _tmp26_) { -#line 2086 "Box.c" - Box _tmp27_; - gint _tmp28_; - gint _tmp29_; + if (_tmp21_ > _tmp22_) { +#line 2074 "Box.c" + Box _tmp23_; + gint _tmp24_; + gint _tmp25_; #line 303 "/home/jens/Source/shotwell/src/Box.vala" - _tmp27_ = *shifted; + _tmp23_ = *shifted; #line 303 "/home/jens/Source/shotwell/src/Box.vala" - _tmp28_ = _tmp27_.top; + _tmp24_ = _tmp23_.top; #line 303 "/home/jens/Source/shotwell/src/Box.vala" - _tmp29_ = (*self).bottom; + _tmp25_ = (*self).bottom; #line 303 "/home/jens/Source/shotwell/src/Box.vala" - _tmp23_ = _tmp28_ < _tmp29_; -#line 2098 "Box.c" + _tmp19_ = _tmp24_ < _tmp25_; +#line 2086 "Box.c" } else { #line 303 "/home/jens/Source/shotwell/src/Box.vala" - _tmp23_ = FALSE; -#line 2102 "Box.c" + _tmp19_ = FALSE; +#line 2090 "Box.c" } #line 303 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp23_) { -#line 2106 "Box.c" + if (_tmp19_) { +#line 2094 "Box.c" + gint _tmp26_; + gint _tmp27_; + gint _tmp28_; + Box _tmp29_; gint _tmp30_; - gint _tmp31_; + Box _tmp31_; gint _tmp32_; - Box _tmp33_; - gint _tmp34_; - Box _tmp35_; - gint _tmp36_; + gint _tmp33_; + Box _tmp34_; + gint _tmp35_; + Box _tmp36_; gint _tmp37_; - Box _tmp38_; - gint _tmp39_; - Box _tmp40_; - gint _tmp41_; #line 305 "/home/jens/Source/shotwell/src/Box.vala" - _tmp30_ = (*self).left; + _tmp26_ = (*self).left; #line 305 "/home/jens/Source/shotwell/src/Box.vala" - _tmp31_ = (*self).top; + _tmp27_ = (*self).top; #line 305 "/home/jens/Source/shotwell/src/Box.vala" - _tmp32_ = (*self).right; + _tmp28_ = (*self).right; #line 305 "/home/jens/Source/shotwell/src/Box.vala" - _tmp33_ = *shifted; + _tmp29_ = *shifted; #line 305 "/home/jens/Source/shotwell/src/Box.vala" - _tmp34_ = _tmp33_.top; + _tmp30_ = _tmp29_.top; #line 305 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_vala_horizontal_this, _tmp30_, _tmp31_, _tmp32_, _tmp34_); + box_init (&_vala_horizontal_this, _tmp26_, _tmp27_, _tmp28_, _tmp30_); #line 306 "/home/jens/Source/shotwell/src/Box.vala" - _tmp35_ = *shifted; + _tmp31_ = *shifted; #line 306 "/home/jens/Source/shotwell/src/Box.vala" - _tmp36_ = _tmp35_.left; + _tmp32_ = _tmp31_.left; #line 306 "/home/jens/Source/shotwell/src/Box.vala" - _tmp37_ = (*self).bottom; + _tmp33_ = (*self).bottom; #line 306 "/home/jens/Source/shotwell/src/Box.vala" - _tmp38_ = *shifted; + _tmp34_ = *shifted; #line 306 "/home/jens/Source/shotwell/src/Box.vala" - _tmp39_ = _tmp38_.right; + _tmp35_ = _tmp34_.right; #line 306 "/home/jens/Source/shotwell/src/Box.vala" - _tmp40_ = *shifted; + _tmp36_ = *shifted; #line 306 "/home/jens/Source/shotwell/src/Box.vala" - _tmp41_ = _tmp40_.bottom; + _tmp37_ = _tmp36_.bottom; #line 306 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_vala_horizontal_shifted, _tmp36_, _tmp37_, _tmp39_, _tmp41_); -#line 2147 "Box.c" + box_init (&_vala_horizontal_shifted, _tmp32_, _tmp33_, _tmp35_, _tmp37_); +#line 2135 "Box.c" } else { #line 309 "/home/jens/Source/shotwell/src/Box.vala" box_init (&_vala_horizontal_this, 0, 0, 0, 0); @@ -2151,156 +2139,156 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal box_init (&_vala_horizontal_shifted, 0, 0, 0, 0); #line 311 "/home/jens/Source/shotwell/src/Box.vala" horizontal_complement = FALSE; -#line 2155 "Box.c" +#line 2143 "Box.c" } } #line 314 "/home/jens/Source/shotwell/src/Box.vala" vertical_complement = TRUE; #line 315 "/home/jens/Source/shotwell/src/Box.vala" - _tmp43_ = *shifted; + _tmp39_ = *shifted; #line 315 "/home/jens/Source/shotwell/src/Box.vala" - _tmp44_ = _tmp43_.left; + _tmp40_ = _tmp39_.left; #line 315 "/home/jens/Source/shotwell/src/Box.vala" - _tmp45_ = (*self).left; + _tmp41_ = (*self).left; #line 315 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp44_ < _tmp45_) { -#line 2168 "Box.c" - Box _tmp46_; - gint _tmp47_; - gint _tmp48_; + if (_tmp40_ < _tmp41_) { +#line 2156 "Box.c" + Box _tmp42_; + gint _tmp43_; + gint _tmp44_; #line 315 "/home/jens/Source/shotwell/src/Box.vala" - _tmp46_ = *shifted; + _tmp42_ = *shifted; #line 315 "/home/jens/Source/shotwell/src/Box.vala" - _tmp47_ = _tmp46_.right; + _tmp43_ = _tmp42_.right; #line 315 "/home/jens/Source/shotwell/src/Box.vala" - _tmp48_ = (*self).left; + _tmp44_ = (*self).left; #line 315 "/home/jens/Source/shotwell/src/Box.vala" - _tmp42_ = _tmp47_ > _tmp48_; -#line 2180 "Box.c" + _tmp38_ = _tmp43_ > _tmp44_; +#line 2168 "Box.c" } else { #line 315 "/home/jens/Source/shotwell/src/Box.vala" - _tmp42_ = FALSE; -#line 2184 "Box.c" + _tmp38_ = FALSE; +#line 2172 "Box.c" } #line 315 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp42_) { -#line 2188 "Box.c" - Box _tmp49_; - gint _tmp50_; + if (_tmp38_) { +#line 2176 "Box.c" + Box _tmp45_; + gint _tmp46_; + gint _tmp47_; + gint _tmp48_; + gint _tmp49_; + Box _tmp50_; gint _tmp51_; - gint _tmp52_; + Box _tmp52_; gint _tmp53_; - Box _tmp54_; - gint _tmp55_; - Box _tmp56_; - gint _tmp57_; - gint _tmp58_; - Box _tmp59_; - gint _tmp60_; + gint _tmp54_; + Box _tmp55_; + gint _tmp56_; #line 317 "/home/jens/Source/shotwell/src/Box.vala" - _tmp49_ = *shifted; + _tmp45_ = *shifted; #line 317 "/home/jens/Source/shotwell/src/Box.vala" - _tmp50_ = _tmp49_.right; + _tmp46_ = _tmp45_.right; #line 317 "/home/jens/Source/shotwell/src/Box.vala" - _tmp51_ = (*self).top; + _tmp47_ = (*self).top; #line 317 "/home/jens/Source/shotwell/src/Box.vala" - _tmp52_ = (*self).right; + _tmp48_ = (*self).right; #line 317 "/home/jens/Source/shotwell/src/Box.vala" - _tmp53_ = (*self).bottom; + _tmp49_ = (*self).bottom; #line 317 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_vala_vertical_this, _tmp50_, _tmp51_, _tmp52_, _tmp53_); + box_init (&_vala_vertical_this, _tmp46_, _tmp47_, _tmp48_, _tmp49_); #line 318 "/home/jens/Source/shotwell/src/Box.vala" - _tmp54_ = *shifted; + _tmp50_ = *shifted; #line 318 "/home/jens/Source/shotwell/src/Box.vala" - _tmp55_ = _tmp54_.left; + _tmp51_ = _tmp50_.left; #line 318 "/home/jens/Source/shotwell/src/Box.vala" - _tmp56_ = *shifted; + _tmp52_ = *shifted; #line 318 "/home/jens/Source/shotwell/src/Box.vala" - _tmp57_ = _tmp56_.top; + _tmp53_ = _tmp52_.top; #line 318 "/home/jens/Source/shotwell/src/Box.vala" - _tmp58_ = (*self).left; + _tmp54_ = (*self).left; #line 318 "/home/jens/Source/shotwell/src/Box.vala" - _tmp59_ = *shifted; + _tmp55_ = *shifted; #line 318 "/home/jens/Source/shotwell/src/Box.vala" - _tmp60_ = _tmp59_.bottom; + _tmp56_ = _tmp55_.bottom; #line 318 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_vala_vertical_shifted, _tmp55_, _tmp57_, _tmp58_, _tmp60_); -#line 2229 "Box.c" + box_init (&_vala_vertical_shifted, _tmp51_, _tmp53_, _tmp54_, _tmp56_); +#line 2217 "Box.c" } else { - gboolean _tmp61_ = FALSE; - Box _tmp62_; - gint _tmp63_; - gint _tmp64_; + gboolean _tmp57_ = FALSE; + Box _tmp58_; + gint _tmp59_; + gint _tmp60_; #line 319 "/home/jens/Source/shotwell/src/Box.vala" - _tmp62_ = *shifted; + _tmp58_ = *shifted; #line 319 "/home/jens/Source/shotwell/src/Box.vala" - _tmp63_ = _tmp62_.left; + _tmp59_ = _tmp58_.left; #line 319 "/home/jens/Source/shotwell/src/Box.vala" - _tmp64_ = (*self).left; + _tmp60_ = (*self).left; #line 319 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp63_ > _tmp64_) { -#line 2243 "Box.c" - Box _tmp65_; - gint _tmp66_; - gint _tmp67_; + if (_tmp59_ > _tmp60_) { +#line 2231 "Box.c" + Box _tmp61_; + gint _tmp62_; + gint _tmp63_; #line 319 "/home/jens/Source/shotwell/src/Box.vala" - _tmp65_ = *shifted; + _tmp61_ = *shifted; #line 319 "/home/jens/Source/shotwell/src/Box.vala" - _tmp66_ = _tmp65_.left; + _tmp62_ = _tmp61_.left; #line 319 "/home/jens/Source/shotwell/src/Box.vala" - _tmp67_ = (*self).right; + _tmp63_ = (*self).right; #line 319 "/home/jens/Source/shotwell/src/Box.vala" - _tmp61_ = _tmp66_ < _tmp67_; -#line 2255 "Box.c" + _tmp57_ = _tmp62_ < _tmp63_; +#line 2243 "Box.c" } else { #line 319 "/home/jens/Source/shotwell/src/Box.vala" - _tmp61_ = FALSE; -#line 2259 "Box.c" + _tmp57_ = FALSE; +#line 2247 "Box.c" } #line 319 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp61_) { -#line 2263 "Box.c" + if (_tmp57_) { +#line 2251 "Box.c" + gint _tmp64_; + gint _tmp65_; + Box _tmp66_; + gint _tmp67_; gint _tmp68_; gint _tmp69_; Box _tmp70_; gint _tmp71_; - gint _tmp72_; + Box _tmp72_; gint _tmp73_; Box _tmp74_; gint _tmp75_; - Box _tmp76_; - gint _tmp77_; - Box _tmp78_; - gint _tmp79_; #line 321 "/home/jens/Source/shotwell/src/Box.vala" - _tmp68_ = (*self).left; + _tmp64_ = (*self).left; #line 321 "/home/jens/Source/shotwell/src/Box.vala" - _tmp69_ = (*self).top; + _tmp65_ = (*self).top; #line 321 "/home/jens/Source/shotwell/src/Box.vala" - _tmp70_ = *shifted; + _tmp66_ = *shifted; #line 321 "/home/jens/Source/shotwell/src/Box.vala" - _tmp71_ = _tmp70_.left; + _tmp67_ = _tmp66_.left; #line 321 "/home/jens/Source/shotwell/src/Box.vala" - _tmp72_ = (*self).bottom; + _tmp68_ = (*self).bottom; #line 321 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_vala_vertical_this, _tmp68_, _tmp69_, _tmp71_, _tmp72_); + box_init (&_vala_vertical_this, _tmp64_, _tmp65_, _tmp67_, _tmp68_); #line 322 "/home/jens/Source/shotwell/src/Box.vala" - _tmp73_ = (*self).right; + _tmp69_ = (*self).right; #line 322 "/home/jens/Source/shotwell/src/Box.vala" - _tmp74_ = *shifted; + _tmp70_ = *shifted; #line 322 "/home/jens/Source/shotwell/src/Box.vala" - _tmp75_ = _tmp74_.top; + _tmp71_ = _tmp70_.top; #line 322 "/home/jens/Source/shotwell/src/Box.vala" - _tmp76_ = *shifted; + _tmp72_ = *shifted; #line 322 "/home/jens/Source/shotwell/src/Box.vala" - _tmp77_ = _tmp76_.right; + _tmp73_ = _tmp72_.right; #line 322 "/home/jens/Source/shotwell/src/Box.vala" - _tmp78_ = *shifted; + _tmp74_ = *shifted; #line 322 "/home/jens/Source/shotwell/src/Box.vala" - _tmp79_ = _tmp78_.bottom; + _tmp75_ = _tmp74_.bottom; #line 322 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_vala_vertical_shifted, _tmp73_, _tmp75_, _tmp77_, _tmp79_); -#line 2304 "Box.c" + box_init (&_vala_vertical_shifted, _tmp69_, _tmp71_, _tmp73_, _tmp75_); +#line 2292 "Box.c" } else { #line 325 "/home/jens/Source/shotwell/src/Box.vala" box_init (&_vala_vertical_this, 0, 0, 0, 0); @@ -2308,48 +2296,50 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal box_init (&_vala_vertical_shifted, 0, 0, 0, 0); #line 327 "/home/jens/Source/shotwell/src/Box.vala" vertical_complement = FALSE; -#line 2312 "Box.c" +#line 2300 "Box.c" } } #line 330 "/home/jens/Source/shotwell/src/Box.vala" - _tmp80_ = horizontal_complement; + _tmp76_ = horizontal_complement; #line 330 "/home/jens/Source/shotwell/src/Box.vala" - _tmp81_ = vertical_complement; + _tmp77_ = vertical_complement; #line 330 "/home/jens/Source/shotwell/src/Box.vala" - _tmp82_ = box_complements_derive (_tmp80_, _tmp81_); -#line 330 "/home/jens/Source/shotwell/src/Box.vala" - result = _tmp82_; + result = box_complements_derive (_tmp76_, _tmp77_); #line 330 "/home/jens/Source/shotwell/src/Box.vala" if (horizontal_this) { #line 330 "/home/jens/Source/shotwell/src/Box.vala" *horizontal_this = _vala_horizontal_this; -#line 2327 "Box.c" +#line 2313 "Box.c" } #line 330 "/home/jens/Source/shotwell/src/Box.vala" if (vertical_this) { #line 330 "/home/jens/Source/shotwell/src/Box.vala" *vertical_this = _vala_vertical_this; -#line 2333 "Box.c" +#line 2319 "Box.c" } #line 330 "/home/jens/Source/shotwell/src/Box.vala" if (horizontal_shifted) { #line 330 "/home/jens/Source/shotwell/src/Box.vala" *horizontal_shifted = _vala_horizontal_shifted; -#line 2339 "Box.c" +#line 2325 "Box.c" } #line 330 "/home/jens/Source/shotwell/src/Box.vala" if (vertical_shifted) { #line 330 "/home/jens/Source/shotwell/src/Box.vala" *vertical_shifted = _vala_vertical_shifted; -#line 2345 "Box.c" +#line 2331 "Box.c" } #line 330 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2349 "Box.c" +#line 2335 "Box.c" } -void box_rubber_band (Box *self, GdkPoint* point, Box* result) { +void +box_rubber_band (Box *self, + GdkPoint* point, + Box* result) +{ GdkPoint _tmp0_; gint _tmp1_; GdkPoint _tmp2_; @@ -2358,23 +2348,19 @@ void box_rubber_band (Box *self, GdkPoint* point, Box* result) { gint _tmp4_; GdkPoint _tmp5_; gint _tmp6_; - gint _tmp7_; gint b = 0; - gint _tmp8_; - GdkPoint _tmp9_; - gint _tmp10_; - gint _tmp11_; + gint _tmp7_; + GdkPoint _tmp8_; + gint _tmp9_; gint l = 0; + gint _tmp10_; + GdkPoint _tmp11_; gint _tmp12_; - GdkPoint _tmp13_; - gint _tmp14_; - gint _tmp15_; gint r = 0; - gint _tmp16_; - GdkPoint _tmp17_; - gint _tmp18_; - gint _tmp19_; - Box _tmp20_ = {0}; + gint _tmp13_; + GdkPoint _tmp14_; + gint _tmp15_; + Box _tmp16_ = {0}; #line 333 "/home/jens/Source/shotwell/src/Box.vala" g_return_if_fail (point != NULL); #line 334 "/home/jens/Source/shotwell/src/Box.vala" @@ -2396,50 +2382,44 @@ void box_rubber_band (Box *self, GdkPoint* point, Box* result) { #line 337 "/home/jens/Source/shotwell/src/Box.vala" _tmp6_ = _tmp5_.y; #line 337 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = MIN (_tmp4_, _tmp6_); -#line 337 "/home/jens/Source/shotwell/src/Box.vala" - t = _tmp7_; -#line 338 "/home/jens/Source/shotwell/src/Box.vala" - _tmp8_ = (*self).bottom; + t = MIN (_tmp4_, _tmp6_); #line 338 "/home/jens/Source/shotwell/src/Box.vala" - _tmp9_ = *point; + _tmp7_ = (*self).bottom; #line 338 "/home/jens/Source/shotwell/src/Box.vala" - _tmp10_ = _tmp9_.y; + _tmp8_ = *point; #line 338 "/home/jens/Source/shotwell/src/Box.vala" - _tmp11_ = MAX (_tmp8_, _tmp10_); + _tmp9_ = _tmp8_.y; #line 338 "/home/jens/Source/shotwell/src/Box.vala" - b = _tmp11_; + b = MAX (_tmp7_, _tmp9_); #line 339 "/home/jens/Source/shotwell/src/Box.vala" - _tmp12_ = (*self).left; -#line 339 "/home/jens/Source/shotwell/src/Box.vala" - _tmp13_ = *point; + _tmp10_ = (*self).left; #line 339 "/home/jens/Source/shotwell/src/Box.vala" - _tmp14_ = _tmp13_.x; + _tmp11_ = *point; #line 339 "/home/jens/Source/shotwell/src/Box.vala" - _tmp15_ = MIN (_tmp12_, _tmp14_); + _tmp12_ = _tmp11_.x; #line 339 "/home/jens/Source/shotwell/src/Box.vala" - l = _tmp15_; + l = MIN (_tmp10_, _tmp12_); #line 340 "/home/jens/Source/shotwell/src/Box.vala" - _tmp16_ = (*self).right; + _tmp13_ = (*self).right; #line 340 "/home/jens/Source/shotwell/src/Box.vala" - _tmp17_ = *point; + _tmp14_ = *point; #line 340 "/home/jens/Source/shotwell/src/Box.vala" - _tmp18_ = _tmp17_.x; + _tmp15_ = _tmp14_.x; #line 340 "/home/jens/Source/shotwell/src/Box.vala" - _tmp19_ = MAX (_tmp16_, _tmp18_); -#line 340 "/home/jens/Source/shotwell/src/Box.vala" - r = _tmp19_; + r = MAX (_tmp13_, _tmp15_); #line 342 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_tmp20_, l, t, r, b); + box_init (&_tmp16_, l, t, r, b); #line 342 "/home/jens/Source/shotwell/src/Box.vala" - *result = _tmp20_; + *result = _tmp16_; #line 342 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 2439 "Box.c" +#line 2417 "Box.c" } -gchar* box_to_string (Box *self) { +gchar* +box_to_string (Box *self) +{ gchar* result = NULL; gint _tmp0_; gint _tmp1_; @@ -2474,413 +2454,326 @@ gchar* box_to_string (Box *self) { result = _tmp8_; #line 346 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2478 "Box.c" +#line 2458 "Box.c" } -static gboolean box_in_zone (gdouble pos, gint zone) { +static gboolean +box_in_zone (gdouble pos, + gint zone) +{ gboolean result = FALSE; gint top_zone = 0; - gint _tmp0_; gint bottom_zone = 0; - gint _tmp1_; - gdouble _tmp2_; - gboolean _tmp3_; #line 350 "/home/jens/Source/shotwell/src/Box.vala" - _tmp0_ = zone; -#line 350 "/home/jens/Source/shotwell/src/Box.vala" - top_zone = _tmp0_ - BOX_HAND_GRENADES; -#line 351 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = zone; + top_zone = zone - BOX_HAND_GRENADES; #line 351 "/home/jens/Source/shotwell/src/Box.vala" - bottom_zone = _tmp1_ + BOX_HAND_GRENADES; -#line 353 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = pos; + bottom_zone = zone + BOX_HAND_GRENADES; #line 353 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = box_in_between (_tmp2_, top_zone, bottom_zone); -#line 353 "/home/jens/Source/shotwell/src/Box.vala" - result = _tmp3_; + result = box_in_between (pos, top_zone, bottom_zone); #line 353 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2506 "Box.c" +#line 2477 "Box.c" } -static gboolean box_in_between (gdouble pos, gint top, gint bottom) { +static gboolean +box_in_between (gdouble pos, + gint top, + gint bottom) +{ gboolean result = FALSE; gint ipos = 0; - gdouble _tmp0_; - gboolean _tmp1_ = FALSE; - gint _tmp2_; - gint _tmp3_; -#line 357 "/home/jens/Source/shotwell/src/Box.vala" - _tmp0_ = pos; + gboolean _tmp0_ = FALSE; + gint _tmp1_; #line 357 "/home/jens/Source/shotwell/src/Box.vala" - ipos = (gint) _tmp0_; + ipos = (gint) pos; #line 359 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = ipos; + _tmp1_ = ipos; #line 359 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = top; + if (_tmp1_ > top) { +#line 2496 "Box.c" + gint _tmp2_; #line 359 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp2_ > _tmp3_) { -#line 2527 "Box.c" - gint _tmp4_; - gint _tmp5_; + _tmp2_ = ipos; #line 359 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = ipos; -#line 359 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = bottom; -#line 359 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = _tmp4_ < _tmp5_; -#line 2536 "Box.c" + _tmp0_ = _tmp2_ < bottom; +#line 2502 "Box.c" } else { #line 359 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = FALSE; -#line 2540 "Box.c" + _tmp0_ = FALSE; +#line 2506 "Box.c" } #line 359 "/home/jens/Source/shotwell/src/Box.vala" - result = _tmp1_; + result = _tmp0_; #line 359 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2546 "Box.c" +#line 2512 "Box.c" } -static gboolean box_near_in_between (gdouble pos, gint top, gint bottom) { +static gboolean +box_near_in_between (gdouble pos, + gint top, + gint bottom) +{ gboolean result = FALSE; gint ipos = 0; - gdouble _tmp0_; gint top_zone = 0; - gint _tmp1_; gint bottom_zone = 0; + gboolean _tmp0_ = FALSE; + gint _tmp1_; gint _tmp2_; - gboolean _tmp3_ = FALSE; - gint _tmp4_; - gint _tmp5_; -#line 363 "/home/jens/Source/shotwell/src/Box.vala" - _tmp0_ = pos; #line 363 "/home/jens/Source/shotwell/src/Box.vala" - ipos = (gint) _tmp0_; + ipos = (gint) pos; #line 364 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = top; -#line 364 "/home/jens/Source/shotwell/src/Box.vala" - top_zone = _tmp1_ - BOX_HAND_GRENADES; -#line 365 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = bottom; + top_zone = top - BOX_HAND_GRENADES; #line 365 "/home/jens/Source/shotwell/src/Box.vala" - bottom_zone = _tmp2_ + BOX_HAND_GRENADES; + bottom_zone = bottom + BOX_HAND_GRENADES; #line 367 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = ipos; + _tmp1_ = ipos; #line 367 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = top_zone; + _tmp2_ = top_zone; #line 367 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp4_ > _tmp5_) { -#line 2579 "Box.c" - gint _tmp6_; - gint _tmp7_; + if (_tmp1_ > _tmp2_) { +#line 2540 "Box.c" + gint _tmp3_; + gint _tmp4_; #line 367 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = ipos; + _tmp3_ = ipos; #line 367 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = bottom_zone; + _tmp4_ = bottom_zone; #line 367 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = _tmp6_ < _tmp7_; -#line 2588 "Box.c" + _tmp0_ = _tmp3_ < _tmp4_; +#line 2549 "Box.c" } else { #line 367 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = FALSE; -#line 2592 "Box.c" + _tmp0_ = FALSE; +#line 2553 "Box.c" } #line 367 "/home/jens/Source/shotwell/src/Box.vala" - result = _tmp3_; + result = _tmp0_; #line 367 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2598 "Box.c" +#line 2559 "Box.c" } -BoxLocation box_approx_location (Box *self, gint x, gint y) { +BoxLocation +box_approx_location (Box *self, + gint x, + gint y) +{ BoxLocation result = 0; gboolean near_width = FALSE; gint _tmp0_; gint _tmp1_; - gint _tmp2_; - gboolean _tmp3_; gboolean near_height = FALSE; - gint _tmp4_; + gint _tmp2_; + gint _tmp3_; + gboolean _tmp4_ = FALSE; gint _tmp5_; - gint _tmp6_; - gboolean _tmp7_; - gboolean _tmp8_ = FALSE; - gint _tmp9_; - gint _tmp10_; - gboolean _tmp11_; -#line 371 "/home/jens/Source/shotwell/src/Box.vala" - _tmp0_ = x; -#line 371 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = (*self).left; #line 371 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = (*self).right; + _tmp0_ = (*self).left; #line 371 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = box_near_in_between ((gdouble) _tmp0_, _tmp1_, _tmp2_); + _tmp1_ = (*self).right; #line 371 "/home/jens/Source/shotwell/src/Box.vala" - near_width = _tmp3_; -#line 372 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = y; + near_width = box_near_in_between ((gdouble) x, _tmp0_, _tmp1_); #line 372 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = (*self).top; -#line 372 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = (*self).bottom; + _tmp2_ = (*self).top; #line 372 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = box_near_in_between ((gdouble) _tmp4_, _tmp5_, _tmp6_); + _tmp3_ = (*self).bottom; #line 372 "/home/jens/Source/shotwell/src/Box.vala" - near_height = _tmp7_; -#line 374 "/home/jens/Source/shotwell/src/Box.vala" - _tmp9_ = x; -#line 374 "/home/jens/Source/shotwell/src/Box.vala" - _tmp10_ = (*self).left; + near_height = box_near_in_between ((gdouble) y, _tmp2_, _tmp3_); #line 374 "/home/jens/Source/shotwell/src/Box.vala" - _tmp11_ = box_in_zone ((gdouble) _tmp9_, _tmp10_); + _tmp5_ = (*self).left; #line 374 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp11_) { -#line 2646 "Box.c" - gboolean _tmp12_; + if (box_in_zone ((gdouble) x, _tmp5_)) { +#line 2593 "Box.c" + gboolean _tmp6_; #line 374 "/home/jens/Source/shotwell/src/Box.vala" - _tmp12_ = near_height; + _tmp6_ = near_height; #line 374 "/home/jens/Source/shotwell/src/Box.vala" - _tmp8_ = _tmp12_; -#line 2652 "Box.c" + _tmp4_ = _tmp6_; +#line 2599 "Box.c" } else { #line 374 "/home/jens/Source/shotwell/src/Box.vala" - _tmp8_ = FALSE; -#line 2656 "Box.c" + _tmp4_ = FALSE; +#line 2603 "Box.c" } #line 374 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp8_) { -#line 2660 "Box.c" - gint _tmp13_; - gint _tmp14_; - gboolean _tmp15_; -#line 375 "/home/jens/Source/shotwell/src/Box.vala" - _tmp13_ = y; -#line 375 "/home/jens/Source/shotwell/src/Box.vala" - _tmp14_ = (*self).top; + if (_tmp4_) { +#line 2607 "Box.c" + gint _tmp7_; #line 375 "/home/jens/Source/shotwell/src/Box.vala" - _tmp15_ = box_in_zone ((gdouble) _tmp13_, _tmp14_); + _tmp7_ = (*self).top; #line 375 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp15_) { + if (box_in_zone ((gdouble) y, _tmp7_)) { #line 376 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_LOCATION_TOP_LEFT; #line 376 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2676 "Box.c" +#line 2617 "Box.c" } else { - gint _tmp16_; - gint _tmp17_; - gboolean _tmp18_; + gint _tmp8_; #line 377 "/home/jens/Source/shotwell/src/Box.vala" - _tmp16_ = y; + _tmp8_ = (*self).bottom; #line 377 "/home/jens/Source/shotwell/src/Box.vala" - _tmp17_ = (*self).bottom; -#line 377 "/home/jens/Source/shotwell/src/Box.vala" - _tmp18_ = box_in_zone ((gdouble) _tmp16_, _tmp17_); -#line 377 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp18_) { + if (box_in_zone ((gdouble) y, _tmp8_)) { #line 378 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_LOCATION_BOTTOM_LEFT; #line 378 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2693 "Box.c" +#line 2628 "Box.c" } else { #line 380 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_LOCATION_LEFT_SIDE; #line 380 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2699 "Box.c" +#line 2634 "Box.c" } } } else { - gboolean _tmp19_ = FALSE; - gint _tmp20_; - gint _tmp21_; - gboolean _tmp22_; -#line 382 "/home/jens/Source/shotwell/src/Box.vala" - _tmp20_ = x; -#line 382 "/home/jens/Source/shotwell/src/Box.vala" - _tmp21_ = (*self).right; + gboolean _tmp9_ = FALSE; + gint _tmp10_; #line 382 "/home/jens/Source/shotwell/src/Box.vala" - _tmp22_ = box_in_zone ((gdouble) _tmp20_, _tmp21_); + _tmp10_ = (*self).right; #line 382 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp22_) { -#line 2715 "Box.c" - gboolean _tmp23_; + if (box_in_zone ((gdouble) x, _tmp10_)) { +#line 2644 "Box.c" + gboolean _tmp11_; #line 382 "/home/jens/Source/shotwell/src/Box.vala" - _tmp23_ = near_height; + _tmp11_ = near_height; #line 382 "/home/jens/Source/shotwell/src/Box.vala" - _tmp19_ = _tmp23_; -#line 2721 "Box.c" + _tmp9_ = _tmp11_; +#line 2650 "Box.c" } else { #line 382 "/home/jens/Source/shotwell/src/Box.vala" - _tmp19_ = FALSE; -#line 2725 "Box.c" + _tmp9_ = FALSE; +#line 2654 "Box.c" } #line 382 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp19_) { -#line 2729 "Box.c" - gint _tmp24_; - gint _tmp25_; - gboolean _tmp26_; + if (_tmp9_) { +#line 2658 "Box.c" + gint _tmp12_; #line 383 "/home/jens/Source/shotwell/src/Box.vala" - _tmp24_ = y; + _tmp12_ = (*self).top; #line 383 "/home/jens/Source/shotwell/src/Box.vala" - _tmp25_ = (*self).top; -#line 383 "/home/jens/Source/shotwell/src/Box.vala" - _tmp26_ = box_in_zone ((gdouble) _tmp24_, _tmp25_); -#line 383 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp26_) { + if (box_in_zone ((gdouble) y, _tmp12_)) { #line 384 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_LOCATION_TOP_RIGHT; #line 384 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2745 "Box.c" +#line 2668 "Box.c" } else { - gint _tmp27_; - gint _tmp28_; - gboolean _tmp29_; -#line 385 "/home/jens/Source/shotwell/src/Box.vala" - _tmp27_ = y; + gint _tmp13_; #line 385 "/home/jens/Source/shotwell/src/Box.vala" - _tmp28_ = (*self).bottom; + _tmp13_ = (*self).bottom; #line 385 "/home/jens/Source/shotwell/src/Box.vala" - _tmp29_ = box_in_zone ((gdouble) _tmp27_, _tmp28_); -#line 385 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp29_) { + if (box_in_zone ((gdouble) y, _tmp13_)) { #line 386 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_LOCATION_BOTTOM_RIGHT; #line 386 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2762 "Box.c" +#line 2679 "Box.c" } else { #line 388 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_LOCATION_RIGHT_SIDE; #line 388 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2768 "Box.c" +#line 2685 "Box.c" } } } else { - gboolean _tmp30_ = FALSE; - gint _tmp31_; - gint _tmp32_; - gboolean _tmp33_; -#line 390 "/home/jens/Source/shotwell/src/Box.vala" - _tmp31_ = y; -#line 390 "/home/jens/Source/shotwell/src/Box.vala" - _tmp32_ = (*self).top; + gboolean _tmp14_ = FALSE; + gint _tmp15_; #line 390 "/home/jens/Source/shotwell/src/Box.vala" - _tmp33_ = box_in_zone ((gdouble) _tmp31_, _tmp32_); + _tmp15_ = (*self).top; #line 390 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp33_) { -#line 2784 "Box.c" - gboolean _tmp34_; + if (box_in_zone ((gdouble) y, _tmp15_)) { +#line 2695 "Box.c" + gboolean _tmp16_; #line 390 "/home/jens/Source/shotwell/src/Box.vala" - _tmp34_ = near_width; + _tmp16_ = near_width; #line 390 "/home/jens/Source/shotwell/src/Box.vala" - _tmp30_ = _tmp34_; -#line 2790 "Box.c" + _tmp14_ = _tmp16_; +#line 2701 "Box.c" } else { #line 390 "/home/jens/Source/shotwell/src/Box.vala" - _tmp30_ = FALSE; -#line 2794 "Box.c" + _tmp14_ = FALSE; +#line 2705 "Box.c" } #line 390 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp30_) { + if (_tmp14_) { #line 392 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_LOCATION_TOP_SIDE; #line 392 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2802 "Box.c" +#line 2713 "Box.c" } else { - gboolean _tmp35_ = FALSE; - gint _tmp36_; - gint _tmp37_; - gboolean _tmp38_; -#line 393 "/home/jens/Source/shotwell/src/Box.vala" - _tmp36_ = y; + gboolean _tmp17_ = FALSE; + gint _tmp18_; #line 393 "/home/jens/Source/shotwell/src/Box.vala" - _tmp37_ = (*self).bottom; + _tmp18_ = (*self).bottom; #line 393 "/home/jens/Source/shotwell/src/Box.vala" - _tmp38_ = box_in_zone ((gdouble) _tmp36_, _tmp37_); -#line 393 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp38_) { -#line 2816 "Box.c" - gboolean _tmp39_; + if (box_in_zone ((gdouble) y, _tmp18_)) { +#line 2721 "Box.c" + gboolean _tmp19_; #line 393 "/home/jens/Source/shotwell/src/Box.vala" - _tmp39_ = near_width; + _tmp19_ = near_width; #line 393 "/home/jens/Source/shotwell/src/Box.vala" - _tmp35_ = _tmp39_; -#line 2822 "Box.c" + _tmp17_ = _tmp19_; +#line 2727 "Box.c" } else { #line 393 "/home/jens/Source/shotwell/src/Box.vala" - _tmp35_ = FALSE; -#line 2826 "Box.c" + _tmp17_ = FALSE; +#line 2731 "Box.c" } #line 393 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp35_) { + if (_tmp17_) { #line 395 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_LOCATION_BOTTOM_SIDE; #line 395 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2834 "Box.c" +#line 2739 "Box.c" } else { - gboolean _tmp40_ = FALSE; - gint _tmp41_; - gint _tmp42_; - gint _tmp43_; - gboolean _tmp44_; -#line 396 "/home/jens/Source/shotwell/src/Box.vala" - _tmp41_ = x; -#line 396 "/home/jens/Source/shotwell/src/Box.vala" - _tmp42_ = (*self).left; -#line 396 "/home/jens/Source/shotwell/src/Box.vala" - _tmp43_ = (*self).right; -#line 396 "/home/jens/Source/shotwell/src/Box.vala" - _tmp44_ = box_in_between ((gdouble) _tmp41_, _tmp42_, _tmp43_); + gboolean _tmp20_ = FALSE; + gint _tmp21_; + gint _tmp22_; #line 396 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp44_) { -#line 2851 "Box.c" - gint _tmp45_; - gint _tmp46_; - gint _tmp47_; - gboolean _tmp48_; + _tmp21_ = (*self).left; #line 396 "/home/jens/Source/shotwell/src/Box.vala" - _tmp45_ = y; + _tmp22_ = (*self).right; #line 396 "/home/jens/Source/shotwell/src/Box.vala" - _tmp46_ = (*self).top; + if (box_in_between ((gdouble) x, _tmp21_, _tmp22_)) { +#line 2750 "Box.c" + gint _tmp23_; + gint _tmp24_; #line 396 "/home/jens/Source/shotwell/src/Box.vala" - _tmp47_ = (*self).bottom; + _tmp23_ = (*self).top; #line 396 "/home/jens/Source/shotwell/src/Box.vala" - _tmp48_ = box_in_between ((gdouble) _tmp45_, _tmp46_, _tmp47_); + _tmp24_ = (*self).bottom; #line 396 "/home/jens/Source/shotwell/src/Box.vala" - _tmp40_ = _tmp48_; -#line 2866 "Box.c" + _tmp20_ = box_in_between ((gdouble) y, _tmp23_, _tmp24_); +#line 2759 "Box.c" } else { #line 396 "/home/jens/Source/shotwell/src/Box.vala" - _tmp40_ = FALSE; -#line 2870 "Box.c" + _tmp20_ = FALSE; +#line 2763 "Box.c" } #line 396 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp40_) { + if (_tmp20_) { #line 397 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_LOCATION_INSIDE; #line 397 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2878 "Box.c" +#line 2771 "Box.c" } else { #line 399 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_LOCATION_OUTSIDE; #line 399 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2884 "Box.c" +#line 2777 "Box.c" } } } @@ -2889,7 +2782,9 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) { } -Box* box_dup (const Box* self) { +Box* +box_dup (const Box* self) +{ Box* dup; #line 38 "/home/jens/Source/shotwell/src/Box.vala" dup = g_new0 (Box, 1); @@ -2897,18 +2792,22 @@ Box* box_dup (const Box* self) { memcpy (dup, self, sizeof (Box)); #line 38 "/home/jens/Source/shotwell/src/Box.vala" return dup; -#line 2901 "Box.c" +#line 2796 "Box.c" } -void box_free (Box* self) { +void +box_free (Box* self) +{ #line 38 "/home/jens/Source/shotwell/src/Box.vala" g_free (self); -#line 2908 "Box.c" +#line 2805 "Box.c" } -GType box_get_type (void) { +GType +box_get_type (void) +{ static volatile gsize box_type_id__volatile = 0; if (g_once_init_enter (&box_type_id__volatile)) { GType box_type_id; diff --git a/src/CheckerboardLayout.c b/src/CheckerboardLayout.c index 1ba0afb..18080e8 100644 --- a/src/CheckerboardLayout.c +++ b/src/CheckerboardLayout.c @@ -1,4 +1,4 @@ -/* CheckerboardLayout.c generated by valac 0.36.6, the Vala compiler +/* CheckerboardLayout.c generated by valac 0.40.4, the Vala compiler * generated from CheckerboardLayout.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -143,6 +144,12 @@ typedef struct _Dimensions Dimensions; typedef struct _Tag Tag; typedef struct _TagClass TagClass; +enum { + CHECKERBOARD_ITEM_0_PROPERTY, + CHECKERBOARD_ITEM_HAS_TAGS_PROPERTY, + CHECKERBOARD_ITEM_NUM_PROPERTIES +}; +static GParamSpec* checkerboard_item_properties[CHECKERBOARD_ITEM_NUM_PROPERTIES]; #define _checkerboard_item_text_unref0(var) ((var == NULL) ? NULL : (var = (checkerboard_item_text_unref (var), NULL))) #define TYPE_THUMBNAIL_SOURCE (thumbnail_source_get_type ()) @@ -189,6 +196,11 @@ typedef struct _ViewCollectionClass ViewCollectionClass; typedef struct _CheckerboardLayoutLayoutRow CheckerboardLayoutLayoutRow; typedef struct _CheckerboardLayoutLayoutRowClass CheckerboardLayoutLayoutRowClass; +enum { + CHECKERBOARD_LAYOUT_0_PROPERTY, + CHECKERBOARD_LAYOUT_NUM_PROPERTIES +}; +static GParamSpec* checkerboard_layout_properties[CHECKERBOARD_LAYOUT_NUM_PROPERTIES]; #define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ()) #define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade)) @@ -434,25 +446,38 @@ static gpointer checkerboard_layout_layout_row_parent_class = NULL; gpointer checkerboard_item_text_ref (gpointer instance); void checkerboard_item_text_unref (gpointer instance); -GParamSpec* param_spec_checkerboard_item_text (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_checkerboard_item_text (GValue* value, gpointer v_object); -void value_take_checkerboard_item_text (GValue* value, gpointer v_object); +GParamSpec* param_spec_checkerboard_item_text (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_checkerboard_item_text (GValue* value, + gpointer v_object); +void value_take_checkerboard_item_text (GValue* value, + gpointer v_object); gpointer value_get_checkerboard_item_text (const GValue* value); GType checkerboard_item_text_get_type (void) G_GNUC_CONST; #define CHECKERBOARD_ITEM_TEXT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CHECKERBOARD_ITEM_TEXT, CheckerboardItemTextPrivate)) -enum { - CHECKERBOARD_ITEM_TEXT_DUMMY_PROPERTY -}; -CheckerboardItemText* checkerboard_item_text_new (const gchar* text, PangoAlignment alignment, gboolean marked_up); -CheckerboardItemText* checkerboard_item_text_construct (GType object_type, const gchar* text, PangoAlignment alignment, gboolean marked_up); +CheckerboardItemText* checkerboard_item_text_new (const gchar* text, + PangoAlignment alignment, + gboolean marked_up); +CheckerboardItemText* checkerboard_item_text_construct (GType object_type, + const gchar* text, + PangoAlignment alignment, + gboolean marked_up); static gboolean checkerboard_item_text_is_single_line (CheckerboardItemText* self); -gboolean string_contains_char (const gchar* haystack, gunichar needle); +gboolean string_contains_char (const gchar* haystack, + gunichar needle); gboolean checkerboard_item_text_is_marked_up (CheckerboardItemText* self); -gboolean checkerboard_item_text_is_set_to (CheckerboardItemText* self, const gchar* text, gboolean marked_up, PangoAlignment alignment); +gboolean checkerboard_item_text_is_set_to (CheckerboardItemText* self, + const gchar* text, + gboolean marked_up, + PangoAlignment alignment); gchar* checkerboard_item_text_get_text (CheckerboardItemText* self); gint checkerboard_item_text_get_height (CheckerboardItemText* self); static void checkerboard_item_text_update_height (CheckerboardItemText* self); -PangoLayout* checkerboard_item_text_get_pango_layout (CheckerboardItemText* self, gint max_width); +PangoLayout* checkerboard_item_text_get_pango_layout (CheckerboardItemText* self, + gint max_width); static void checkerboard_item_text_create_pango (CheckerboardItemText* self); void checkerboard_item_text_clear_pango_layout (CheckerboardItemText* self); GType page_window_get_type (void) G_GNUC_CONST; @@ -462,16 +487,28 @@ static void checkerboard_item_text_finalize (CheckerboardItemText * obj); GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_view_get_type (void) G_GNUC_CONST; @@ -483,11 +520,9 @@ Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); GType tag_get_type (void) G_GNUC_CONST; #define CHECKERBOARD_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CHECKERBOARD_ITEM, CheckerboardItemPrivate)) -enum { - CHECKERBOARD_ITEM_DUMMY_PROPERTY, - CHECKERBOARD_ITEM_HAS_TAGS_PROPERTY -}; -void dimensions_init (Dimensions *self, gint width, gint height); +void dimensions_init (Dimensions *self, + gint width, + gint height); #define CHECKERBOARD_ITEM_PROP_SHOW_TITLES "show-titles" #define CHECKERBOARD_ITEM_PROP_SHOW_COMMENTS "show-comments" #define CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES "show-subtitles" @@ -500,44 +535,86 @@ void dimensions_init (Dimensions *self, gint width, gint height); #define CHECKERBOARD_ITEM_TRINKET_PADDING 1 #define CHECKERBOARD_ITEM_BRIGHTEN_SHIFT 0x18 GType thumbnail_source_get_type (void) G_GNUC_CONST; -CheckerboardItem* checkerboard_item_construct (GType object_type, ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment); +CheckerboardItem* checkerboard_item_construct (GType object_type, + ThumbnailSource* source, + Dimensions* initial_pixbuf_dim, + const gchar* title, + const gchar* comment, + gboolean marked_up, + PangoAlignment alignment); ThumbnailView* thumbnail_view_new (ThumbnailSource* source); -ThumbnailView* thumbnail_view_construct (GType object_type, ThumbnailSource* source); +ThumbnailView* thumbnail_view_construct (GType object_type, + ThumbnailSource* source); static gchar* checkerboard_item_real_get_name (DataObject* base); gchar* data_object_get_name (DataObject* self); gchar* checkerboard_item_get_title (CheckerboardItem* self); gchar* checkerboard_item_get_comment (CheckerboardItem* self); -void checkerboard_item_set_title (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment); -static void checkerboard_item_recalc_size (CheckerboardItem* self, const gchar* reason); +void checkerboard_item_set_title (CheckerboardItem* self, + const gchar* text, + gboolean marked_up, + PangoAlignment alignment); +static void checkerboard_item_recalc_size (CheckerboardItem* self, + const gchar* reason); void data_view_notify_view_altered (DataView* self); +void checkerboard_item_translate_coordinates (CheckerboardItem* self, + gint* x, + gint* y); void checkerboard_item_clear_title (CheckerboardItem* self); -static void checkerboard_item_set_title_visible (CheckerboardItem* self, gboolean visible); -void checkerboard_item_set_comment (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment); +static void checkerboard_item_set_title_visible (CheckerboardItem* self, + gboolean visible); +void checkerboard_item_set_comment (CheckerboardItem* self, + const gchar* text, + gboolean marked_up, + PangoAlignment alignment); void checkerboard_item_clear_comment (CheckerboardItem* self); -static void checkerboard_item_set_comment_visible (CheckerboardItem* self, gboolean visible); -void checkerboard_item_set_tags (CheckerboardItem* self, GeeCollection* tags, PangoAlignment alignment); -static void checkerboard_item_set_has_tags (CheckerboardItem* self, gboolean value); +static void checkerboard_item_set_comment_visible (CheckerboardItem* self, + gboolean visible); +void checkerboard_item_set_tags (CheckerboardItem* self, + GeeCollection* tags, + PangoAlignment alignment); +static void checkerboard_item_set_has_tags (CheckerboardItem* self, + gboolean value); gboolean checkerboard_item_get_has_tags (CheckerboardItem* self); GeeList* tag_make_user_visible_tag_list (GeeCollection* tags); -gchar* tag_make_tag_markup_string (GeeList* tags, gint highlight_index); +gchar* tag_make_tag_markup_string (GeeList* tags, + gint highlight_index); void checkerboard_item_clear_tags (CheckerboardItem* self); void checkerboard_item_clear_subtitle (CheckerboardItem* self); -void checkerboard_item_highlight_user_visible_tag (CheckerboardItem* self, gint index); -Tag* checkerboard_item_get_user_visible_tag (CheckerboardItem* self, gint index); +void checkerboard_item_highlight_user_visible_tag (CheckerboardItem* self, + gint index); +Tag* checkerboard_item_get_user_visible_tag (CheckerboardItem* self, + gint index); PangoLayout* checkerboard_item_get_tag_list_layout (CheckerboardItem* self); -void checkerboard_item_get_subtitle_allocation (CheckerboardItem* self, GdkRectangle* result); +void checkerboard_item_get_subtitle_allocation (CheckerboardItem* self, + GdkRectangle* result); gchar* checkerboard_item_get_subtitle (CheckerboardItem* self); -void checkerboard_item_set_subtitle (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment); -static void checkerboard_item_set_subtitle_visible (CheckerboardItem* self, gboolean visible); -void checkerboard_item_set_is_cursor (CheckerboardItem* self, gboolean is_cursor); +void checkerboard_item_set_subtitle (CheckerboardItem* self, + const gchar* text, + gboolean marked_up, + PangoAlignment alignment); +static void checkerboard_item_set_subtitle_visible (CheckerboardItem* self, + gboolean visible); +void checkerboard_item_set_is_cursor (CheckerboardItem* self, + gboolean is_cursor); gboolean checkerboard_item_get_is_cursor (CheckerboardItem* self); -static void checkerboard_item_real_notify_membership_changed (DataObject* base, DataCollection* collection); -void data_object_get_collection_property (DataObject* self, const gchar* name, GValue* def, GValue* result); +static void checkerboard_item_real_notify_membership_changed (DataObject* base, + DataCollection* collection); +void data_object_get_collection_property (DataObject* self, + const gchar* name, + GValue* def, + GValue* result); static void _vala_GValue_free (GValue* self); gboolean dimensions_has_area (Dimensions *self); -void data_object_notify_membership_changed (DataObject* self, DataCollection* collection); -static void checkerboard_item_real_notify_collection_property_set (DataObject* base, const gchar* name, GValue* old, GValue* val); -void data_object_notify_collection_property_set (DataObject* self, const gchar* name, GValue* old, GValue* val); +void data_object_notify_membership_changed (DataObject* self, + DataCollection* collection); +static void checkerboard_item_real_notify_collection_property_set (DataObject* base, + const gchar* name, + GValue* old, + GValue* val); +void data_object_notify_collection_property_set (DataObject* self, + const gchar* name, + GValue* old, + GValue* val); gint checkerboard_item_get_alignment_point (CheckerboardItem* self); void checkerboard_item_exposed (CheckerboardItem* self); static void checkerboard_item_real_exposed (CheckerboardItem* self); @@ -547,90 +624,202 @@ gboolean checkerboard_item_is_exposed (CheckerboardItem* self); static gboolean checkerboard_item_real_is_exposed (CheckerboardItem* self); gboolean checkerboard_item_has_image (CheckerboardItem* self); GdkPixbuf* checkerboard_item_get_image (CheckerboardItem* self); -void checkerboard_item_set_image (CheckerboardItem* self, GdkPixbuf* pixbuf); -void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result); -void checkerboard_item_clear_image (CheckerboardItem* self, Dimensions* dim); +void checkerboard_item_set_image (CheckerboardItem* self, + GdkPixbuf* pixbuf); +void dimensions_for_pixbuf (GdkPixbuf* pixbuf, + Dimensions* result); +void checkerboard_item_clear_image (CheckerboardItem* self, + Dimensions* dim); gint checkerboard_item_get_max_width (gint scale); -gboolean dimensions_approx_equals (Dimensions *self, Dimensions* dim, gint fudge); +gboolean dimensions_approx_equals (Dimensions *self, + Dimensions* dim, + gint fudge); void data_view_notify_geometry_altered (DataView* self); -void checkerboard_item_get_border_dimensions (Dimensions* object_dim, gint border_width, Dimensions* result); -void checkerboard_item_get_border_origin (GdkPoint* object_origin, gint border_width, GdkPoint* result); -void checkerboard_item_paint_shadow (CheckerboardItem* self, cairo_t* ctx, Dimensions* dimensions, GdkPoint* origin, gint radius, gfloat initial_alpha); -static void checkerboard_item_real_paint_shadow (CheckerboardItem* self, cairo_t* ctx, Dimensions* dimensions, GdkPoint* origin, gint radius, gfloat initial_alpha); -void checkerboard_item_paint_shadow_in_corner (CheckerboardItem* self, cairo_t* ctx, gint x, gint y, gdouble rgb_all, gfloat radius, gfloat initial_alpha, gdouble arc1, gdouble arc2); -void checkerboard_item_paint_border (CheckerboardItem* self, cairo_t* ctx, Dimensions* object_dimensions, GdkPoint* object_origin, gint border_width); -static void checkerboard_item_real_paint_border (CheckerboardItem* self, cairo_t* ctx, Dimensions* object_dimensions, GdkPoint* object_origin, gint border_width); -void draw_rounded_corners_filled (cairo_t* ctx, Dimensions* dim, GdkPoint* origin, gdouble radius_proportion); -void checkerboard_item_paint_image (CheckerboardItem* self, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin); -static void checkerboard_item_real_paint_image (CheckerboardItem* self, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin); -void paint_pixmap_with_background (cairo_t* ctx, GdkPixbuf* pixbuf, gint x, gint y); -static gint checkerboard_item_get_selection_border_width (CheckerboardItem* self, gint scale); +void checkerboard_item_get_border_dimensions (Dimensions* object_dim, + gint border_width, + Dimensions* result); +void checkerboard_item_get_border_origin (GdkPoint* object_origin, + gint border_width, + GdkPoint* result); +void checkerboard_item_paint_shadow (CheckerboardItem* self, + cairo_t* ctx, + Dimensions* dimensions, + GdkPoint* origin, + gint radius, + gfloat initial_alpha); +static void checkerboard_item_real_paint_shadow (CheckerboardItem* self, + cairo_t* ctx, + Dimensions* dimensions, + GdkPoint* origin, + gint radius, + gfloat initial_alpha); +void checkerboard_item_paint_shadow_in_corner (CheckerboardItem* self, + cairo_t* ctx, + gint x, + gint y, + gdouble rgb_all, + gfloat radius, + gfloat initial_alpha, + gdouble arc1, + gdouble arc2); +void checkerboard_item_paint_border (CheckerboardItem* self, + cairo_t* ctx, + Dimensions* object_dimensions, + GdkPoint* object_origin, + gint border_width); +static void checkerboard_item_real_paint_border (CheckerboardItem* self, + cairo_t* ctx, + Dimensions* object_dimensions, + GdkPoint* object_origin, + gint border_width); +void draw_rounded_corners_filled (cairo_t* ctx, + Dimensions* dim, + GdkPoint* origin, + gdouble radius_proportion); +void checkerboard_item_paint_image (CheckerboardItem* self, + cairo_t* ctx, + GdkPixbuf* pixbuf, + GdkPoint* origin); +static void checkerboard_item_real_paint_image (CheckerboardItem* self, + cairo_t* ctx, + GdkPixbuf* pixbuf, + GdkPoint* origin); +void paint_pixmap_with_background (cairo_t* ctx, + GdkPixbuf* pixbuf, + gint x, + gint y); +static gint checkerboard_item_get_selection_border_width (CheckerboardItem* self, + gint scale); gint thumbnail_get_MIN_SCALE (void); gint thumbnail_get_MAX_SCALE (void); -GdkPixbuf* checkerboard_item_get_top_left_trinket (CheckerboardItem* self, gint scale); -static GdkPixbuf* checkerboard_item_real_get_top_left_trinket (CheckerboardItem* self, gint scale); -GdkPixbuf* checkerboard_item_get_top_right_trinket (CheckerboardItem* self, gint scale); -static GdkPixbuf* checkerboard_item_real_get_top_right_trinket (CheckerboardItem* self, gint scale); -GdkPixbuf* checkerboard_item_get_bottom_left_trinket (CheckerboardItem* self, gint scale); -static GdkPixbuf* checkerboard_item_real_get_bottom_left_trinket (CheckerboardItem* self, gint scale); -GdkPixbuf* checkerboard_item_get_bottom_right_trinket (CheckerboardItem* self, gint scale); -static GdkPixbuf* checkerboard_item_real_get_bottom_right_trinket (CheckerboardItem* self, gint scale); -void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_color, GdkRGBA* selected_color, GdkRGBA* text_color, GdkRGBA* border_color); +GdkPixbuf* checkerboard_item_get_top_left_trinket (CheckerboardItem* self, + gint scale); +static GdkPixbuf* checkerboard_item_real_get_top_left_trinket (CheckerboardItem* self, + gint scale); +GdkPixbuf* checkerboard_item_get_top_right_trinket (CheckerboardItem* self, + gint scale); +static GdkPixbuf* checkerboard_item_real_get_top_right_trinket (CheckerboardItem* self, + gint scale); +GdkPixbuf* checkerboard_item_get_bottom_left_trinket (CheckerboardItem* self, + gint scale); +static GdkPixbuf* checkerboard_item_real_get_bottom_left_trinket (CheckerboardItem* self, + gint scale); +GdkPixbuf* checkerboard_item_get_bottom_right_trinket (CheckerboardItem* self, + gint scale); +static GdkPixbuf* checkerboard_item_real_get_bottom_right_trinket (CheckerboardItem* self, + gint scale); +void checkerboard_item_paint (CheckerboardItem* self, + cairo_t* ctx, + GdkRGBA* bg_color, + GdkRGBA* selected_color, + GdkRGBA* text_color, + GdkRGBA* border_color); gboolean data_view_is_selected (DataView* self); gint checkerboard_item_get_horizontal_trinket_offset (CheckerboardItem* self); -void checkerboard_item_set_horizontal_trinket_offset (CheckerboardItem* self, gint horizontal_trinket_offset); -void checkerboard_item_set_grid_coordinates (CheckerboardItem* self, gint col, gint row); +void checkerboard_item_set_horizontal_trinket_offset (CheckerboardItem* self, + gint horizontal_trinket_offset); +void checkerboard_item_set_grid_coordinates (CheckerboardItem* self, + gint col, + gint row); gint checkerboard_item_get_column (CheckerboardItem* self); gint checkerboard_item_get_row (CheckerboardItem* self); void checkerboard_item_brighten (CheckerboardItem* self); -void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alpha); +void shift_colors (GdkPixbuf* pixbuf, + gint red, + gint green, + gint blue, + gint alpha); void checkerboard_item_unbrighten (CheckerboardItem* self); -static void checkerboard_item_real_visibility_changed (DataView* base, gboolean visible); -static gboolean checkerboard_item_query_tooltip_on_text (CheckerboardItem* self, CheckerboardItemText* text, GtkTooltip* tooltip); -gboolean checkerboard_item_query_tooltip (CheckerboardItem* self, gint x, gint y, GtkTooltip* tooltip); -gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect); +static void checkerboard_item_real_visibility_changed (DataView* base, + gboolean visible); +static gboolean checkerboard_item_query_tooltip_on_text (CheckerboardItem* self, + CheckerboardItemText* text, + GtkTooltip* tooltip); +gboolean checkerboard_item_query_tooltip (CheckerboardItem* self, + gint x, + gint y, + GtkTooltip* tooltip); +gboolean coord_in_rectangle (gint x, + gint y, + GdkRectangle* rect); static void checkerboard_item_finalize (GObject * obj); -static void _vala_checkerboard_item_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void _vala_checkerboard_item_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); +static void _vala_checkerboard_item_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); +static void _vala_checkerboard_item_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec); GType checkerboard_layout_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; static gpointer checkerboard_layout_layout_row_ref (gpointer instance); static void checkerboard_layout_layout_row_unref (gpointer instance); -static GParamSpec* checkerboard_layout_param_spec_layout_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; -static void checkerboard_layout_value_set_layout_row (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void checkerboard_layout_value_take_layout_row (GValue* value, gpointer v_object) G_GNUC_UNUSED; +static GParamSpec* checkerboard_layout_param_spec_layout_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) G_GNUC_UNUSED; +static void checkerboard_layout_value_set_layout_row (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void checkerboard_layout_value_take_layout_row (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer checkerboard_layout_value_get_layout_row (const GValue* value) G_GNUC_UNUSED; static GType checkerboard_layout_layout_row_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define CHECKERBOARD_LAYOUT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayoutPrivate)) -enum { - CHECKERBOARD_LAYOUT_DUMMY_PROPERTY -}; -static void checkerboard_layout_on_contents_altered (CheckerboardLayout* self, GeeIterable* added, GeeIterable* removed); -static void _checkerboard_layout_on_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self); +static void checkerboard_layout_on_contents_altered (CheckerboardLayout* self, + GeeIterable* added, + GeeIterable* removed); +static void _checkerboard_layout_on_contents_altered_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self); static void checkerboard_layout_on_items_altered (CheckerboardLayout* self); -static void _checkerboard_layout_on_items_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); -static void checkerboard_layout_on_items_state_changed (CheckerboardLayout* self, GeeIterable* changed); -static void _checkerboard_layout_on_items_state_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self); -static void checkerboard_layout_on_items_visibility_changed (CheckerboardLayout* self, GeeIterable* changed); -static void _checkerboard_layout_on_items_visibility_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self); +static void _checkerboard_layout_on_items_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); +static void checkerboard_layout_on_items_state_changed (CheckerboardLayout* self, + GeeIterable* changed); +static void _checkerboard_layout_on_items_state_changed_view_collection_items_state_changed (ViewCollection* _sender, + GeeIterable* changed, + gpointer self); +static void checkerboard_layout_on_items_visibility_changed (CheckerboardLayout* self, + GeeIterable* changed); +static void _checkerboard_layout_on_items_visibility_changed_view_collection_items_visibility_changed (ViewCollection* _sender, + GeeCollection* changed, + gpointer self); static void checkerboard_layout_on_ordering_changed (CheckerboardLayout* self); -static void _checkerboard_layout_on_ordering_changed_data_collection_ordering_changed (DataCollection* _sender, gpointer self); -static void checkerboard_layout_on_views_altered (CheckerboardLayout* self, GeeCollection* altered); -static void _checkerboard_layout_on_views_altered_view_collection_views_altered (ViewCollection* _sender, GeeCollection* views, gpointer self); +static void _checkerboard_layout_on_ordering_changed_data_collection_ordering_changed (DataCollection* _sender, + gpointer self); +static void checkerboard_layout_on_views_altered (CheckerboardLayout* self, + GeeCollection* altered); +static void _checkerboard_layout_on_views_altered_view_collection_views_altered (ViewCollection* _sender, + GeeCollection* views, + gpointer self); static void checkerboard_layout_on_geometries_altered (CheckerboardLayout* self); -static void _checkerboard_layout_on_geometries_altered_view_collection_geometries_altered (ViewCollection* _sender, GeeCollection* views, gpointer self); +static void _checkerboard_layout_on_geometries_altered_view_collection_geometries_altered (ViewCollection* _sender, + GeeCollection* views, + gpointer self); static void checkerboard_layout_on_items_selection_changed (CheckerboardLayout* self); -static void _checkerboard_layout_on_items_selection_changed_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self); -static void _checkerboard_layout_on_items_selection_changed_view_collection_items_unselected (ViewCollection* _sender, GeeIterable* unselected, gpointer self); +static void _checkerboard_layout_on_items_selection_changed_view_collection_items_selected (ViewCollection* _sender, + GeeIterable* selected, + gpointer self); +static void _checkerboard_layout_on_items_selection_changed_view_collection_items_unselected (ViewCollection* _sender, + GeeIterable* unselected, + gpointer self); static void checkerboard_layout_on_viewport_shifted (CheckerboardLayout* self); -static void _checkerboard_layout_on_viewport_shifted_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self); +static void _checkerboard_layout_on_viewport_shifted_gtk_adjustment_value_changed (GtkAdjustment* _sender, + gpointer self); static void checkerboard_layout_on_viewport_resized (CheckerboardLayout* self); -static void _checkerboard_layout_on_viewport_resized_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self); +static void _checkerboard_layout_on_viewport_resized_gtk_widget_size_allocate (GtkWidget* _sender, + GtkAllocation* allocation, + gpointer self); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); static void checkerboard_layout_on_colors_changed (CheckerboardLayout* self); -static void _checkerboard_layout_on_colors_changed_config_facade_colors_changed (ConfigFacade* _sender, gpointer self); +static void _checkerboard_layout_on_colors_changed_config_facade_colors_changed (ConfigFacade* _sender, + gpointer self); #define CHECKERBOARD_LAYOUT_TOP_PADDING 16 #define CHECKERBOARD_LAYOUT_BOTTOM_PADDING 16 #define CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING 24 @@ -638,150 +827,217 @@ static void _checkerboard_layout_on_colors_changed_config_facade_colors_changed #define CHECKERBOARD_LAYOUT_SELECTION_ALPHA 0.40 #define CHECKERBOARD_LAYOUT_SCROLLBAR_PLACEHOLDER_WIDTH 1 CheckerboardLayout* checkerboard_layout_new (ViewCollection* view); -CheckerboardLayout* checkerboard_layout_construct (GType object_type, ViewCollection* view); +CheckerboardLayout* checkerboard_layout_construct (GType object_type, + ViewCollection* view); void checkerboard_layout_clear_drag_select (CheckerboardLayout* self); -void config_facade_get_bg_color (ConfigFacade* self, GdkRGBA* result); -void checkerboard_layout_set_adjustments (CheckerboardLayout* self, GtkAdjustment* hadjustment, GtkAdjustment* vadjustment); -void checkerboard_layout_set_scale (CheckerboardLayout* self, gint scale); +void config_facade_get_bg_color (ConfigFacade* self, + GdkRGBA* result); +void checkerboard_layout_set_adjustments (CheckerboardLayout* self, + GtkAdjustment* hadjustment, + GtkAdjustment* vadjustment); +void checkerboard_layout_set_scale (CheckerboardLayout* self, + gint scale); gint checkerboard_layout_get_scale (CheckerboardLayout* self); -void checkerboard_layout_set_name (CheckerboardLayout* self, const gchar* name); +void checkerboard_layout_set_name (CheckerboardLayout* self, + const gchar* name); static void checkerboard_layout_viewport_resized (CheckerboardLayout* self); static void checkerboard_layout_clear_anchor (CheckerboardLayout* self); static void checkerboard_layout_update_visible_page (CheckerboardLayout* self); -static void checkerboard_layout_need_exposure (CheckerboardLayout* self, const gchar* caller); +static void checkerboard_layout_need_exposure (CheckerboardLayout* self, + const gchar* caller); static void checkerboard_layout_update_anchor (CheckerboardLayout* self); -GeeList* checkerboard_layout_intersection (CheckerboardLayout* self, GdkRectangle* area); -static void checkerboard_layout_center_on_anchor (CheckerboardLayout* self, gdouble upper); -void checkerboard_layout_set_cursor (CheckerboardLayout* self, CheckerboardItem* item); -gboolean data_collection_contains (DataCollection* self, DataObject* object); +GeeList* checkerboard_layout_intersection (CheckerboardLayout* self, + GdkRectangle* area); +static void checkerboard_layout_center_on_anchor (CheckerboardLayout* self, + gdouble upper); +void checkerboard_layout_set_cursor (CheckerboardLayout* self, + CheckerboardItem* item); +gboolean data_collection_contains (DataCollection* self, + DataObject* object); CheckerboardItem* checkerboard_layout_get_cursor (CheckerboardLayout* self); -static void checkerboard_layout_need_reflow (CheckerboardLayout* self, const gchar* caller); -static void checkerboard_layout_items_dirty (CheckerboardLayout* self, const gchar* reason, GeeIterable* items); +static void checkerboard_layout_need_reflow (CheckerboardLayout* self, + const gchar* caller); +static void checkerboard_layout_items_dirty (CheckerboardLayout* self, + const gchar* reason, + GeeIterable* items); static gboolean checkerboard_layout_do_reflow (CheckerboardLayout* self); static gboolean _checkerboard_layout_do_reflow_gsource_func (gpointer self); -static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* caller); -void checkerboard_layout_set_message (CheckerboardLayout* self, const gchar* text); +static void checkerboard_layout_reflow (CheckerboardLayout* self, + const gchar* caller); +void checkerboard_layout_set_message (CheckerboardLayout* self, + const gchar* text); void checkerboard_layout_unset_message (CheckerboardLayout* self); -void get_adjustment_page (GtkAdjustment* hadj, GtkAdjustment* vadj, GdkRectangle* result); -void checkerboard_layout_set_in_view (CheckerboardLayout* self, gboolean in_view); -static void checkerboard_layout_unexpose_items (CheckerboardLayout* self, const gchar* caller); -CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* self, gdouble xd, gdouble yd); -gint checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, gint pos); +void get_adjustment_page (GtkAdjustment* hadj, + GtkAdjustment* vadj, + GdkRectangle* result); +void checkerboard_layout_set_in_view (CheckerboardLayout* self, + gboolean in_view); +static void checkerboard_layout_unexpose_items (CheckerboardLayout* self, + const gchar* caller); +CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* self, + gdouble xd, + gdouble yd); +gint checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, + gint pos); #define TAG_TAG_LIST_SEPARATOR_STRING ", " -static gint checkerboard_layout_internal_handle_tag_mouse_event (CheckerboardLayout* self, CheckerboardItem* item, gint x, gint y); -gboolean checkerboard_layout_handle_mouse_motion (CheckerboardLayout* self, CheckerboardItem* item, gint x, gint y, GdkModifierType mask); +static gint checkerboard_layout_internal_handle_tag_mouse_event (CheckerboardLayout* self, + CheckerboardItem* item, + gint x, + gint y); +gboolean checkerboard_layout_handle_mouse_motion (CheckerboardLayout* self, + CheckerboardItem* item, + gint x, + gint y, + GdkModifierType mask); gboolean checkerboard_layout_is_drag_select_active (CheckerboardLayout* self); -gboolean checkerboard_layout_handle_left_click (CheckerboardLayout* self, CheckerboardItem* item, gdouble xd, gdouble yd, GdkModifierType mask); +gboolean checkerboard_layout_handle_left_click (CheckerboardLayout* self, + CheckerboardItem* item, + gdouble xd, + gdouble yd, + GdkModifierType mask); GType library_window_get_type (void) G_GNUC_CONST; LibraryWindow* library_window_get_app (void); -void library_window_switch_to_tag (LibraryWindow* self, Tag* tag); +void library_window_switch_to_tag (LibraryWindow* self, + Tag* tag); GeeList* checkerboard_layout_get_visible_items (CheckerboardLayout* self); GType compass_point_get_type (void) G_GNUC_CONST; -CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout* self, CheckerboardItem* item, CompassPoint point); +CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout* self, + CheckerboardItem* item, + CompassPoint point); gint data_collection_get_count (DataCollection* self); -CheckerboardItem* checkerboard_layout_get_item_at_coordinate (CheckerboardLayout* self, gint col, gint row); +CheckerboardItem* checkerboard_layout_get_item_at_coordinate (CheckerboardLayout* self, + gint col, + gint row); DataView* view_collection_get_last (ViewCollection* self); -void checkerboard_layout_set_drag_select_origin (CheckerboardLayout* self, gint x, gint y); -void checkerboard_layout_set_drag_select_endpoint (CheckerboardLayout* self, gint x, gint y); +void checkerboard_layout_set_drag_select_origin (CheckerboardLayout* self, + gint x, + gint y); +void checkerboard_layout_set_drag_select_endpoint (CheckerboardLayout* self, + gint x, + gint y); GType box_get_type (void) G_GNUC_CONST; Box* box_dup (const Box* self); void box_free (Box* self); -void box_from_points (GdkPoint* corner1, GdkPoint* corner2, Box* result); -void box_get_rectangle (Box *self, GdkRectangle* result); +void box_from_points (GdkPoint* corner1, + GdkPoint* corner2, + Box* result); +void box_get_rectangle (Box *self, + GdkRectangle* result); GeeList* checkerboard_layout_items_in_selection_band (CheckerboardLayout* self); -void dimensions_for_rectangle (GdkRectangle* rect, Dimensions* result); -static void checkerboard_layout_expose_items (CheckerboardLayout* self, const gchar* caller); +void dimensions_for_rectangle (GdkRectangle* rect, + Dimensions* result); +static void checkerboard_layout_expose_items (CheckerboardLayout* self, + const gchar* caller); void data_collection_freeze_notifications (DataCollection* self); void data_collection_thaw_notifications (DataCollection* self); gboolean data_view_is_visible (DataView* self); -DataObject* data_collection_get_at (DataCollection* self, gint index); -static CheckerboardLayoutLayoutRow* checkerboard_layout_layout_row_new (gint y, gint height, gint num_in_row); -static CheckerboardLayoutLayoutRow* checkerboard_layout_layout_row_construct (GType object_type, gint y, gint height, gint num_in_row); +DataObject* data_collection_get_at (DataCollection* self, + gint index); +static CheckerboardLayoutLayoutRow* checkerboard_layout_layout_row_new (gint y, + gint height, + gint num_in_row); +static CheckerboardLayoutLayoutRow* checkerboard_layout_layout_row_construct (GType object_type, + gint y, + gint height, + gint num_in_row); static void checkerboard_layout_real_map (GtkWidget* base); -static void checkerboard_layout_set_colors (CheckerboardLayout* self, gboolean in_focus); -void config_facade_get_selected_color (ConfigFacade* self, gboolean in_focus, GdkRGBA* result); -void config_facade_get_unselected_color (ConfigFacade* self, GdkRGBA* result); -void config_facade_get_border_color (ConfigFacade* self, GdkRGBA* result); -static void checkerboard_layout_real_size_allocate (GtkWidget* base, GtkAllocation* allocation); -static gboolean checkerboard_layout_real_draw (GtkWidget* base, cairo_t* ctx); -static void checkerboard_layout_draw_selection_band (CheckerboardLayout* self, cairo_t* ctx); -static gboolean checkerboard_layout_real_query_tooltip (GtkWidget* base, gint x, gint y, gboolean keyboard_mode, GtkTooltip* tooltip); +static void checkerboard_layout_set_colors (CheckerboardLayout* self, + gboolean in_focus); +void config_facade_get_selected_color (ConfigFacade* self, + gboolean in_focus, + GdkRGBA* result); +void config_facade_get_unselected_color (ConfigFacade* self, + GdkRGBA* result); +void config_facade_get_border_color (ConfigFacade* self, + GdkRGBA* result); +static void checkerboard_layout_real_size_allocate (GtkWidget* base, + GtkAllocation* allocation); +static gboolean checkerboard_layout_real_draw (GtkWidget* base, + cairo_t* ctx); +static void checkerboard_layout_draw_selection_band (CheckerboardLayout* self, + cairo_t* ctx); +static gboolean checkerboard_layout_real_query_tooltip (GtkWidget* base, + gint x, + gint y, + gboolean keyboard_mode, + GtkTooltip* tooltip); void invalidate_transparent_background (void); -static gboolean checkerboard_layout_real_focus_in_event (GtkWidget* base, GdkEventFocus* event); +static gboolean checkerboard_layout_real_focus_in_event (GtkWidget* base, + GdkEventFocus* event); GeeList* view_collection_get_selected (ViewCollection* self); -static gboolean checkerboard_layout_real_focus_out_event (GtkWidget* base, GdkEventFocus* event); -enum { - CHECKERBOARD_LAYOUT_LAYOUT_ROW_DUMMY_PROPERTY -}; +static gboolean checkerboard_layout_real_focus_out_event (GtkWidget* base, + GdkEventFocus* event); static void checkerboard_layout_layout_row_finalize (CheckerboardLayoutLayoutRow * obj); static void checkerboard_layout_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -CheckerboardItemText* checkerboard_item_text_construct (GType object_type, const gchar* text, PangoAlignment alignment, gboolean marked_up) { +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); + + +CheckerboardItemText* +checkerboard_item_text_construct (GType object_type, + const gchar* text, + PangoAlignment alignment, + gboolean marked_up) +{ CheckerboardItemText* self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - gboolean _tmp2_; - PangoAlignment _tmp3_; - gboolean _tmp4_; + gchar* _tmp0_; #line 19 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (text != NULL, NULL); #line 19 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self = (CheckerboardItemText*) g_type_create_instance (object_type); #line 21 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = text; -#line 21 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (text); #line 21 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_free0 (self->priv->text); #line 21 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->text = _tmp1_; + self->priv->text = _tmp0_; #line 22 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = marked_up; -#line 22 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->marked_up = _tmp2_; -#line 23 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = alignment; + self->priv->marked_up = marked_up; #line 23 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->alignment = _tmp3_; + self->priv->alignment = alignment; #line 25 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = checkerboard_item_text_is_single_line (self); -#line 25 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->single_line = _tmp4_; + self->priv->single_line = checkerboard_item_text_is_single_line (self); #line 19 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return self; -#line 756 "CheckerboardLayout.c" +#line 1007 "CheckerboardLayout.c" } -CheckerboardItemText* checkerboard_item_text_new (const gchar* text, PangoAlignment alignment, gboolean marked_up) { +CheckerboardItemText* +checkerboard_item_text_new (const gchar* text, + PangoAlignment alignment, + gboolean marked_up) +{ #line 19 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return checkerboard_item_text_construct (TYPE_CHECKERBOARD_ITEM_TEXT, text, alignment, marked_up); -#line 763 "CheckerboardLayout.c" +#line 1018 "CheckerboardLayout.c" } -static gboolean checkerboard_item_text_is_single_line (CheckerboardItemText* self) { +static gboolean +checkerboard_item_text_is_single_line (CheckerboardItemText* self) +{ gboolean result = FALSE; const gchar* _tmp0_; - gboolean _tmp1_; #line 28 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM_TEXT (self), FALSE); #line 29 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->text; #line 29 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = string_contains_char (_tmp0_, (gunichar) '\n'); -#line 29 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - result = !_tmp1_; + result = !string_contains_char (_tmp0_, (gunichar) '\n'); #line 29 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 781 "CheckerboardLayout.c" +#line 1035 "CheckerboardLayout.c" } -gboolean checkerboard_item_text_is_marked_up (CheckerboardItemText* self) { +gboolean +checkerboard_item_text_is_marked_up (CheckerboardItemText* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 32 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" @@ -792,16 +1048,20 @@ gboolean checkerboard_item_text_is_marked_up (CheckerboardItemText* self) { result = _tmp0_; #line 33 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 796 "CheckerboardLayout.c" +#line 1052 "CheckerboardLayout.c" } -gboolean checkerboard_item_text_is_set_to (CheckerboardItemText* self, const gchar* text, gboolean marked_up, PangoAlignment alignment) { +gboolean +checkerboard_item_text_is_set_to (CheckerboardItemText* self, + const gchar* text, + gboolean marked_up, + PangoAlignment alignment) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; gboolean _tmp2_; - gboolean _tmp3_; #line 36 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM_TEXT (self), FALSE); #line 36 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" @@ -809,50 +1069,44 @@ gboolean checkerboard_item_text_is_set_to (CheckerboardItemText* self, const gch #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = self->priv->marked_up; #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = marked_up; -#line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp2_ == _tmp3_) { -#line 816 "CheckerboardLayout.c" - PangoAlignment _tmp4_; - PangoAlignment _tmp5_; -#line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = self->priv->alignment; + if (_tmp2_ == marked_up) { +#line 1074 "CheckerboardLayout.c" + PangoAlignment _tmp3_; #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = alignment; + _tmp3_ = self->priv->alignment; #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = _tmp4_ == _tmp5_; -#line 825 "CheckerboardLayout.c" + _tmp1_ = _tmp3_ == alignment; +#line 1080 "CheckerboardLayout.c" } else { #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = FALSE; -#line 829 "CheckerboardLayout.c" +#line 1084 "CheckerboardLayout.c" } #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp1_) { -#line 833 "CheckerboardLayout.c" - const gchar* _tmp6_; - const gchar* _tmp7_; -#line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = self->priv->text; +#line 1088 "CheckerboardLayout.c" + const gchar* _tmp4_; #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = text; + _tmp4_ = self->priv->text; #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = g_strcmp0 (_tmp6_, _tmp7_) == 0; -#line 842 "CheckerboardLayout.c" + _tmp0_ = g_strcmp0 (_tmp4_, text) == 0; +#line 1094 "CheckerboardLayout.c" } else { #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = FALSE; -#line 846 "CheckerboardLayout.c" +#line 1098 "CheckerboardLayout.c" } #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = _tmp0_; #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 852 "CheckerboardLayout.c" +#line 1104 "CheckerboardLayout.c" } -gchar* checkerboard_item_text_get_text (CheckerboardItemText* self) { +gchar* +checkerboard_item_text_get_text (CheckerboardItemText* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -866,11 +1120,13 @@ gchar* checkerboard_item_text_get_text (CheckerboardItemText* self) { result = _tmp1_; #line 41 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 870 "CheckerboardLayout.c" +#line 1124 "CheckerboardLayout.c" } -gint checkerboard_item_text_get_height (CheckerboardItemText* self) { +gint +checkerboard_item_text_get_height (CheckerboardItemText* self) +{ gint result = 0; gint _tmp0_; gint _tmp1_; @@ -882,7 +1138,7 @@ gint checkerboard_item_text_get_height (CheckerboardItemText* self) { if (_tmp0_ == 0) { #line 46 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_text_update_height (self); -#line 886 "CheckerboardLayout.c" +#line 1142 "CheckerboardLayout.c" } #line 48 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->height; @@ -890,23 +1146,27 @@ gint checkerboard_item_text_get_height (CheckerboardItemText* self) { result = _tmp1_; #line 48 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 894 "CheckerboardLayout.c" +#line 1150 "CheckerboardLayout.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 58 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return self ? g_object_ref (self) : NULL; -#line 901 "CheckerboardLayout.c" +#line 1159 "CheckerboardLayout.c" } -PangoLayout* checkerboard_item_text_get_pango_layout (CheckerboardItemText* self, gint max_width) { +PangoLayout* +checkerboard_item_text_get_pango_layout (CheckerboardItemText* self, + gint max_width) +{ PangoLayout* result = NULL; PangoLayout* _tmp0_; - gint _tmp1_; - PangoLayout* _tmp4_; - PangoLayout* _tmp5_; + PangoLayout* _tmp2_; + PangoLayout* _tmp3_; #line 51 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM_TEXT (self), NULL); #line 52 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" @@ -915,47 +1175,46 @@ PangoLayout* checkerboard_item_text_get_pango_layout (CheckerboardItemText* self if (_tmp0_ == NULL) { #line 53 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_text_create_pango (self); -#line 919 "CheckerboardLayout.c" +#line 1179 "CheckerboardLayout.c" } #line 55 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = max_width; -#line 55 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp1_ > 0) { -#line 925 "CheckerboardLayout.c" - PangoLayout* _tmp2_; - gint _tmp3_; -#line 56 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = self->priv->layout; + if (max_width > 0) { +#line 1183 "CheckerboardLayout.c" + PangoLayout* _tmp1_; #line 56 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = max_width; + _tmp1_ = self->priv->layout; #line 56 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - pango_layout_set_width (_tmp2_, _tmp3_ * PANGO_SCALE); -#line 934 "CheckerboardLayout.c" + pango_layout_set_width (_tmp1_, max_width * PANGO_SCALE); +#line 1189 "CheckerboardLayout.c" } #line 58 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = self->priv->layout; + _tmp2_ = self->priv->layout; #line 58 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp3_ = _g_object_ref0 (_tmp2_); #line 58 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - result = _tmp5_; + result = _tmp3_; #line 58 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 944 "CheckerboardLayout.c" +#line 1199 "CheckerboardLayout.c" } -void checkerboard_item_text_clear_pango_layout (CheckerboardItemText* self) { +void +checkerboard_item_text_clear_pango_layout (CheckerboardItemText* self) +{ #line 61 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM_TEXT (self)); #line 62 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->layout); #line 62 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->layout = NULL; -#line 955 "CheckerboardLayout.c" +#line 1212 "CheckerboardLayout.c" } -static void checkerboard_item_text_update_height (CheckerboardItemText* self) { +static void +checkerboard_item_text_update_height (CheckerboardItemText* self) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; #line 65 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" @@ -964,36 +1223,38 @@ static void checkerboard_item_text_update_height (CheckerboardItemText* self) { _tmp1_ = checkerboard_item_text_one_line_height; #line 66 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp1_ != 0) { -#line 968 "CheckerboardLayout.c" +#line 1227 "CheckerboardLayout.c" gboolean _tmp2_; #line 66 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = self->priv->single_line; #line 66 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = _tmp2_; -#line 974 "CheckerboardLayout.c" +#line 1233 "CheckerboardLayout.c" } else { #line 66 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = FALSE; -#line 978 "CheckerboardLayout.c" +#line 1237 "CheckerboardLayout.c" } #line 66 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp0_) { -#line 982 "CheckerboardLayout.c" +#line 1241 "CheckerboardLayout.c" gint _tmp3_; #line 67 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp3_ = checkerboard_item_text_one_line_height; #line 67 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->height = _tmp3_; -#line 988 "CheckerboardLayout.c" +#line 1247 "CheckerboardLayout.c" } else { #line 69 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_text_create_pango (self); -#line 992 "CheckerboardLayout.c" +#line 1251 "CheckerboardLayout.c" } } -static void checkerboard_item_text_create_pango (CheckerboardItemText* self) { +static void +checkerboard_item_text_create_pango (CheckerboardItemText* self) +{ AppWindow* _tmp0_; AppWindow* _tmp1_; PangoLayout* _tmp2_; @@ -1021,7 +1282,7 @@ static void checkerboard_item_text_create_pango (CheckerboardItemText* self) { _tmp3_ = self->priv->marked_up; #line 75 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (!_tmp3_) { -#line 1025 "CheckerboardLayout.c" +#line 1286 "CheckerboardLayout.c" PangoLayout* _tmp4_; const gchar* _tmp5_; #line 76 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" @@ -1030,7 +1291,7 @@ static void checkerboard_item_text_create_pango (CheckerboardItemText* self) { _tmp5_ = self->priv->text; #line 76 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" pango_layout_set_text (_tmp4_, _tmp5_, -1); -#line 1034 "CheckerboardLayout.c" +#line 1295 "CheckerboardLayout.c" } else { PangoLayout* _tmp6_; const gchar* _tmp7_; @@ -1040,7 +1301,7 @@ static void checkerboard_item_text_create_pango (CheckerboardItemText* self) { _tmp7_ = self->priv->text; #line 78 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" pango_layout_set_markup (_tmp6_, _tmp7_, -1); -#line 1044 "CheckerboardLayout.c" +#line 1305 "CheckerboardLayout.c" } #line 80 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp8_ = self->priv->layout; @@ -1056,27 +1317,27 @@ static void checkerboard_item_text_create_pango (CheckerboardItemText* self) { _tmp12_ = checkerboard_item_text_one_line_height; #line 85 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp12_ != 0) { -#line 1060 "CheckerboardLayout.c" +#line 1321 "CheckerboardLayout.c" gboolean _tmp13_; #line 85 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp13_ = self->priv->single_line; #line 85 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp11_ = _tmp13_; -#line 1066 "CheckerboardLayout.c" +#line 1327 "CheckerboardLayout.c" } else { #line 85 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp11_ = FALSE; -#line 1070 "CheckerboardLayout.c" +#line 1331 "CheckerboardLayout.c" } #line 85 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp11_) { -#line 1074 "CheckerboardLayout.c" +#line 1335 "CheckerboardLayout.c" gint _tmp14_; #line 86 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp14_ = checkerboard_item_text_one_line_height; #line 86 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->height = _tmp14_; -#line 1080 "CheckerboardLayout.c" +#line 1341 "CheckerboardLayout.c" } else { gint width = 0; PangoLayout* _tmp15_; @@ -1096,130 +1357,155 @@ static void checkerboard_item_text_create_pango (CheckerboardItemText* self) { _tmp19_ = checkerboard_item_text_one_line_height; #line 92 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp19_ == 0) { -#line 1100 "CheckerboardLayout.c" +#line 1361 "CheckerboardLayout.c" gboolean _tmp20_; #line 92 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp20_ = self->priv->single_line; #line 92 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp18_ = _tmp20_; -#line 1106 "CheckerboardLayout.c" +#line 1367 "CheckerboardLayout.c" } else { #line 92 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp18_ = FALSE; -#line 1110 "CheckerboardLayout.c" +#line 1371 "CheckerboardLayout.c" } #line 92 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp18_) { -#line 1114 "CheckerboardLayout.c" +#line 1375 "CheckerboardLayout.c" gint _tmp21_; #line 93 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp21_ = self->priv->height; #line 93 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_text_one_line_height = _tmp21_; -#line 1120 "CheckerboardLayout.c" +#line 1381 "CheckerboardLayout.c" } } } -static void value_checkerboard_item_text_init (GValue* value) { +static void +value_checkerboard_item_text_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" value->data[0].v_pointer = NULL; -#line 1129 "CheckerboardLayout.c" +#line 1392 "CheckerboardLayout.c" } -static void value_checkerboard_item_text_free_value (GValue* value) { +static void +value_checkerboard_item_text_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_text_unref (value->data[0].v_pointer); -#line 1138 "CheckerboardLayout.c" +#line 1403 "CheckerboardLayout.c" } } -static void value_checkerboard_item_text_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_checkerboard_item_text_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" dest_value->data[0].v_pointer = checkerboard_item_text_ref (src_value->data[0].v_pointer); -#line 1148 "CheckerboardLayout.c" +#line 1416 "CheckerboardLayout.c" } else { #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" dest_value->data[0].v_pointer = NULL; -#line 1152 "CheckerboardLayout.c" +#line 1420 "CheckerboardLayout.c" } } -static gpointer value_checkerboard_item_text_peek_pointer (const GValue* value) { +static gpointer +value_checkerboard_item_text_peek_pointer (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return value->data[0].v_pointer; -#line 1160 "CheckerboardLayout.c" +#line 1430 "CheckerboardLayout.c" } -static gchar* value_checkerboard_item_text_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_checkerboard_item_text_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (collect_values[0].v_pointer) { -#line 1167 "CheckerboardLayout.c" +#line 1442 "CheckerboardLayout.c" CheckerboardItemText * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1174 "CheckerboardLayout.c" +#line 1449 "CheckerboardLayout.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1178 "CheckerboardLayout.c" +#line 1453 "CheckerboardLayout.c" } #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" value->data[0].v_pointer = checkerboard_item_text_ref (object); -#line 1182 "CheckerboardLayout.c" +#line 1457 "CheckerboardLayout.c" } else { #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" value->data[0].v_pointer = NULL; -#line 1186 "CheckerboardLayout.c" +#line 1461 "CheckerboardLayout.c" } #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return NULL; -#line 1190 "CheckerboardLayout.c" +#line 1465 "CheckerboardLayout.c" } -static gchar* value_checkerboard_item_text_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_checkerboard_item_text_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ CheckerboardItemText ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1201 "CheckerboardLayout.c" +#line 1481 "CheckerboardLayout.c" } #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" *object_p = NULL; -#line 1207 "CheckerboardLayout.c" +#line 1487 "CheckerboardLayout.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" *object_p = value->data[0].v_pointer; -#line 1211 "CheckerboardLayout.c" +#line 1491 "CheckerboardLayout.c" } else { #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" *object_p = checkerboard_item_text_ref (value->data[0].v_pointer); -#line 1215 "CheckerboardLayout.c" +#line 1495 "CheckerboardLayout.c" } #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return NULL; -#line 1219 "CheckerboardLayout.c" +#line 1499 "CheckerboardLayout.c" } -GParamSpec* param_spec_checkerboard_item_text (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_checkerboard_item_text (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecCheckerboardItemText* spec; #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_CHECKERBOARD_ITEM_TEXT), NULL); @@ -1229,20 +1515,25 @@ GParamSpec* param_spec_checkerboard_item_text (const gchar* name, const gchar* n G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return G_PARAM_SPEC (spec); -#line 1233 "CheckerboardLayout.c" +#line 1519 "CheckerboardLayout.c" } -gpointer value_get_checkerboard_item_text (const GValue* value) { +gpointer +value_get_checkerboard_item_text (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CHECKERBOARD_ITEM_TEXT), NULL); #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return value->data[0].v_pointer; -#line 1242 "CheckerboardLayout.c" +#line 1530 "CheckerboardLayout.c" } -void value_set_checkerboard_item_text (GValue* value, gpointer v_object) { +void +value_set_checkerboard_item_text (GValue* value, + gpointer v_object) +{ CheckerboardItemText * old; #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CHECKERBOARD_ITEM_TEXT)); @@ -1258,22 +1549,25 @@ void value_set_checkerboard_item_text (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_text_ref (value->data[0].v_pointer); -#line 1262 "CheckerboardLayout.c" +#line 1553 "CheckerboardLayout.c" } else { #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" value->data[0].v_pointer = NULL; -#line 1266 "CheckerboardLayout.c" +#line 1557 "CheckerboardLayout.c" } #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_text_unref (old); -#line 1272 "CheckerboardLayout.c" +#line 1563 "CheckerboardLayout.c" } } -void value_take_checkerboard_item_text (GValue* value, gpointer v_object) { +void +value_take_checkerboard_item_text (GValue* value, + gpointer v_object) +{ CheckerboardItemText * old; #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CHECKERBOARD_ITEM_TEXT)); @@ -1287,33 +1581,37 @@ void value_take_checkerboard_item_text (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" value->data[0].v_pointer = v_object; -#line 1291 "CheckerboardLayout.c" +#line 1585 "CheckerboardLayout.c" } else { #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" value->data[0].v_pointer = NULL; -#line 1295 "CheckerboardLayout.c" +#line 1589 "CheckerboardLayout.c" } #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_text_unref (old); -#line 1301 "CheckerboardLayout.c" +#line 1595 "CheckerboardLayout.c" } } -static void checkerboard_item_text_class_init (CheckerboardItemTextClass * klass) { +static void +checkerboard_item_text_class_init (CheckerboardItemTextClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_text_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" ((CheckerboardItemTextClass *) klass)->finalize = checkerboard_item_text_finalize; #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_type_class_add_private (klass, sizeof (CheckerboardItemTextPrivate)); -#line 1313 "CheckerboardLayout.c" +#line 1609 "CheckerboardLayout.c" } -static void checkerboard_item_text_instance_init (CheckerboardItemText * self) { +static void +checkerboard_item_text_instance_init (CheckerboardItemText * self) +{ #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv = CHECKERBOARD_ITEM_TEXT_GET_PRIVATE (self); #line 13 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" @@ -1326,11 +1624,13 @@ static void checkerboard_item_text_instance_init (CheckerboardItemText * self) { memset (&self->allocation, 0, sizeof (GdkRectangle)); #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->ref_count = 1; -#line 1330 "CheckerboardLayout.c" +#line 1628 "CheckerboardLayout.c" } -static void checkerboard_item_text_finalize (CheckerboardItemText * obj) { +static void +checkerboard_item_text_finalize (CheckerboardItemText * obj) +{ CheckerboardItemText * self; #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CHECKERBOARD_ITEM_TEXT, CheckerboardItemText); @@ -1340,11 +1640,13 @@ static void checkerboard_item_text_finalize (CheckerboardItemText * obj) { _g_free0 (self->priv->text); #line 13 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->layout); -#line 1344 "CheckerboardLayout.c" +#line 1644 "CheckerboardLayout.c" } -GType checkerboard_item_text_get_type (void) { +GType +checkerboard_item_text_get_type (void) +{ static volatile gsize checkerboard_item_text_type_id__volatile = 0; if (g_once_init_enter (&checkerboard_item_text_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_checkerboard_item_text_init, value_checkerboard_item_text_free_value, value_checkerboard_item_text_copy_value, value_checkerboard_item_text_peek_pointer, "p", value_checkerboard_item_text_collect_value, "p", value_checkerboard_item_text_lcopy_value }; @@ -1358,18 +1660,22 @@ GType checkerboard_item_text_get_type (void) { } -gpointer checkerboard_item_text_ref (gpointer instance) { +gpointer +checkerboard_item_text_ref (gpointer instance) +{ CheckerboardItemText * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return instance; -#line 1369 "CheckerboardLayout.c" +#line 1673 "CheckerboardLayout.c" } -void checkerboard_item_text_unref (gpointer instance) { +void +checkerboard_item_text_unref (gpointer instance) +{ CheckerboardItemText * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" @@ -1378,182 +1684,174 @@ void checkerboard_item_text_unref (gpointer instance) { CHECKERBOARD_ITEM_TEXT_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1382 "CheckerboardLayout.c" +#line 1688 "CheckerboardLayout.c" } } -static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { +static gchar* +string_replace (const gchar* self, + const gchar* old, + const gchar* replacement) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if ((*((gchar*) self)) == '\0') { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 1402 "CheckerboardLayout.c" +#line 1712 "CheckerboardLayout.c" } else { - const gchar* _tmp2_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; -#line 1409 "CheckerboardLayout.c" - } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) old)) == '\0'; +#line 1716 "CheckerboardLayout.c" + } +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = TRUE; -#line 1415 "CheckerboardLayout.c" +#line 1722 "CheckerboardLayout.c" } else { - const gchar* _tmp3_; - const gchar* _tmp4_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = replacement; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; -#line 1425 "CheckerboardLayout.c" - } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (old, replacement) == 0; +#line 1726 "CheckerboardLayout.c" + } +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 1429 "CheckerboardLayout.c" - gchar* _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = g_strdup (self); -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1730 "CheckerboardLayout.c" + gchar* _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = g_strdup (self); +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1437 "CheckerboardLayout.c" +#line 1738 "CheckerboardLayout.c" } { GRegex* regex = NULL; - const gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - GRegex* _tmp9_; - GRegex* _tmp10_; - gchar* _tmp11_ = NULL; - GRegex* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = old; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = g_regex_escape_string (_tmp6_, -1); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = _tmp9_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp8_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - regex = _tmp10_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp3_; + gchar* _tmp4_; + GRegex* _tmp5_; + GRegex* _tmp6_; + gchar* _tmp7_ = NULL; + GRegex* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_regex_escape_string (old, -1); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = _tmp3_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp5_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp4_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + regex = _tmp6_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 1469 "CheckerboardLayout.c" +#line 1766 "CheckerboardLayout.c" goto __catch254_g_regex_error; } -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 1478 "CheckerboardLayout.c" +#line 1775 "CheckerboardLayout.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = regex; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = replacement; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp14_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = regex; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp9_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 1494 "CheckerboardLayout.c" +#line 1789 "CheckerboardLayout.c" goto __catch254_g_regex_error; } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 1505 "CheckerboardLayout.c" +#line 1800 "CheckerboardLayout.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = _tmp11_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = NULL; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp15_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp11_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = _tmp7_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = NULL; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp10_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp7_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1519 "CheckerboardLayout.c" +#line 1814 "CheckerboardLayout.c" } goto __finally254; __catch254_g_regex_error: { GError* e = NULL; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 1533 "CheckerboardLayout.c" +#line 1828 "CheckerboardLayout.c" } __finally254: -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 1544 "CheckerboardLayout.c" +#line 1839 "CheckerboardLayout.c" } } -CheckerboardItem* checkerboard_item_construct (GType object_type, ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment) { +CheckerboardItem* +checkerboard_item_construct (GType object_type, + ThumbnailSource* source, + Dimensions* initial_pixbuf_dim, + const gchar* title, + const gchar* comment, + gboolean marked_up, + PangoAlignment alignment) +{ CheckerboardItem * self = NULL; - ThumbnailSource* _tmp0_; - Dimensions _tmp1_; - const gchar* _tmp2_; - PangoAlignment _tmp3_; - gboolean _tmp4_; - CheckerboardItemText* _tmp5_; - const gchar* _tmp6_; + Dimensions _tmp0_; + CheckerboardItemText* _tmp1_; #line 141 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_THUMBNAIL_SOURCE (source), NULL); #line 141 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" @@ -1561,63 +1859,46 @@ CheckerboardItem* checkerboard_item_construct (GType object_type, ThumbnailSourc #line 141 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (title != NULL, NULL); #line 143 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = source; -#line 143 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self = (CheckerboardItem*) thumbnail_view_construct (object_type, _tmp0_); + self = (CheckerboardItem*) thumbnail_view_construct (object_type, source); #line 145 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = *initial_pixbuf_dim; + _tmp0_ = *initial_pixbuf_dim; #line 145 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->pixbuf_dim = _tmp1_; -#line 146 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = title; -#line 146 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = alignment; -#line 146 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = marked_up; + self->priv->pixbuf_dim = _tmp0_; #line 146 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = checkerboard_item_text_new (_tmp2_, _tmp3_, _tmp4_); + _tmp1_ = checkerboard_item_text_new (title, alignment, marked_up); #line 146 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_item_text_unref0 (self->priv->title); #line 146 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->title = _tmp5_; + self->priv->title = _tmp1_; #line 152 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = comment; -#line 152 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp6_ != NULL) { -#line 1588 "CheckerboardLayout.c" - const gchar* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - PangoAlignment _tmp10_; - gboolean _tmp11_; - CheckerboardItemText* _tmp12_; -#line 153 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = comment; -#line 153 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = string_replace (_tmp7_, "\n", " "); -#line 153 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = _tmp8_; + if (comment != NULL) { +#line 1876 "CheckerboardLayout.c" + gchar* _tmp2_; + gchar* _tmp3_; + CheckerboardItemText* _tmp4_; #line 153 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = alignment; + _tmp2_ = string_replace (comment, "\n", " "); #line 153 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = marked_up; + _tmp3_ = _tmp2_; #line 153 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = checkerboard_item_text_new (_tmp9_, _tmp10_, _tmp11_); + _tmp4_ = checkerboard_item_text_new (_tmp3_, alignment, marked_up); #line 153 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_item_text_unref0 (self->priv->comment); #line 153 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->comment = _tmp12_; + self->priv->comment = _tmp4_; #line 153 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_free0 (_tmp9_); -#line 1613 "CheckerboardLayout.c" + _g_free0 (_tmp3_); +#line 1892 "CheckerboardLayout.c" } #line 141 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return self; -#line 1617 "CheckerboardLayout.c" +#line 1896 "CheckerboardLayout.c" } -static gchar* checkerboard_item_real_get_name (DataObject* base) { +static gchar* +checkerboard_item_real_get_name (DataObject* base) +{ CheckerboardItem * self; gchar* result = NULL; gchar* _tmp0_ = NULL; @@ -1628,7 +1909,7 @@ static gchar* checkerboard_item_real_get_name (DataObject* base) { _tmp1_ = self->priv->title; #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp1_ != NULL) { -#line 1632 "CheckerboardLayout.c" +#line 1913 "CheckerboardLayout.c" CheckerboardItemText* _tmp2_; gchar* _tmp3_; #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" @@ -1639,7 +1920,7 @@ static gchar* checkerboard_item_real_get_name (DataObject* base) { _g_free0 (_tmp0_); #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = _tmp3_; -#line 1643 "CheckerboardLayout.c" +#line 1924 "CheckerboardLayout.c" } else { gchar* _tmp4_; #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" @@ -1648,17 +1929,19 @@ static gchar* checkerboard_item_real_get_name (DataObject* base) { _g_free0 (_tmp0_); #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = _tmp4_; -#line 1652 "CheckerboardLayout.c" +#line 1933 "CheckerboardLayout.c" } #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = _tmp0_; #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 1658 "CheckerboardLayout.c" +#line 1939 "CheckerboardLayout.c" } -gchar* checkerboard_item_get_title (CheckerboardItem* self) { +gchar* +checkerboard_item_get_title (CheckerboardItem* self) +{ gchar* result = NULL; gchar* _tmp0_ = NULL; CheckerboardItemText* _tmp1_; @@ -1668,7 +1951,7 @@ gchar* checkerboard_item_get_title (CheckerboardItem* self) { _tmp1_ = self->priv->title; #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp1_ != NULL) { -#line 1672 "CheckerboardLayout.c" +#line 1955 "CheckerboardLayout.c" CheckerboardItemText* _tmp2_; gchar* _tmp3_; #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" @@ -1679,7 +1962,7 @@ gchar* checkerboard_item_get_title (CheckerboardItem* self) { _g_free0 (_tmp0_); #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = _tmp3_; -#line 1683 "CheckerboardLayout.c" +#line 1966 "CheckerboardLayout.c" } else { gchar* _tmp4_; #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" @@ -1688,17 +1971,19 @@ gchar* checkerboard_item_get_title (CheckerboardItem* self) { _g_free0 (_tmp0_); #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = _tmp4_; -#line 1692 "CheckerboardLayout.c" +#line 1975 "CheckerboardLayout.c" } #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = _tmp0_; #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 1698 "CheckerboardLayout.c" +#line 1981 "CheckerboardLayout.c" } -gchar* checkerboard_item_get_comment (CheckerboardItem* self) { +gchar* +checkerboard_item_get_comment (CheckerboardItem* self) +{ gchar* result = NULL; gchar* _tmp0_ = NULL; CheckerboardItemText* _tmp1_; @@ -1708,7 +1993,7 @@ gchar* checkerboard_item_get_comment (CheckerboardItem* self) { _tmp1_ = self->priv->comment; #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp1_ != NULL) { -#line 1712 "CheckerboardLayout.c" +#line 1997 "CheckerboardLayout.c" CheckerboardItemText* _tmp2_; gchar* _tmp3_; #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" @@ -1719,7 +2004,7 @@ gchar* checkerboard_item_get_comment (CheckerboardItem* self) { _g_free0 (_tmp0_); #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = _tmp3_; -#line 1723 "CheckerboardLayout.c" +#line 2008 "CheckerboardLayout.c" } else { gchar* _tmp4_; #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" @@ -1728,24 +2013,26 @@ gchar* checkerboard_item_get_comment (CheckerboardItem* self) { _g_free0 (_tmp0_); #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = _tmp4_; -#line 1732 "CheckerboardLayout.c" +#line 2017 "CheckerboardLayout.c" } #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = _tmp0_; #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 1738 "CheckerboardLayout.c" +#line 2023 "CheckerboardLayout.c" } -void checkerboard_item_set_title (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment) { +void +checkerboard_item_set_title (CheckerboardItem* self, + const gchar* text, + gboolean marked_up, + PangoAlignment alignment) +{ gboolean _tmp0_ = FALSE; CheckerboardItemText* _tmp1_; - const gchar* _tmp7_; - PangoAlignment _tmp8_; - gboolean _tmp9_; - CheckerboardItemText* _tmp10_; - gboolean _tmp11_; + CheckerboardItemText* _tmp3_; + gboolean _tmp4_; #line 175 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); #line 175 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" @@ -1754,766 +2041,730 @@ void checkerboard_item_set_title (CheckerboardItem* self, const gchar* text, gbo _tmp1_ = self->priv->title; #line 177 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp1_ != NULL) { -#line 1758 "CheckerboardLayout.c" +#line 2045 "CheckerboardLayout.c" CheckerboardItemText* _tmp2_; - const gchar* _tmp3_; - gboolean _tmp4_; - PangoAlignment _tmp5_; - gboolean _tmp6_; #line 177 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = self->priv->title; #line 177 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = text; -#line 177 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = marked_up; -#line 177 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = alignment; -#line 177 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = checkerboard_item_text_is_set_to (_tmp2_, _tmp3_, _tmp4_, _tmp5_); -#line 177 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = _tmp6_; -#line 1776 "CheckerboardLayout.c" + _tmp0_ = checkerboard_item_text_is_set_to (_tmp2_, text, marked_up, alignment); +#line 2051 "CheckerboardLayout.c" } else { #line 177 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = FALSE; -#line 1780 "CheckerboardLayout.c" +#line 2055 "CheckerboardLayout.c" } #line 177 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp0_) { #line 178 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 1786 "CheckerboardLayout.c" +#line 2061 "CheckerboardLayout.c" } #line 180 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = text; -#line 180 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = alignment; -#line 180 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = marked_up; -#line 180 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = checkerboard_item_text_new (_tmp7_, _tmp8_, _tmp9_); + _tmp3_ = checkerboard_item_text_new (text, alignment, marked_up); #line 180 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_item_text_unref0 (self->priv->title); #line 180 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->title = _tmp10_; + self->priv->title = _tmp3_; #line 182 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = self->priv->title_visible; + _tmp4_ = self->priv->title_visible; #line 182 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp11_) { + if (_tmp4_) { #line 183 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_recalc_size (self, "set_title"); #line 184 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); -#line 1808 "CheckerboardLayout.c" +#line 2077 "CheckerboardLayout.c" } } -void checkerboard_item_clear_title (CheckerboardItem* self) { - CheckerboardItemText* _tmp0_; - gboolean _tmp1_; +void +checkerboard_item_translate_coordinates (CheckerboardItem* self, + gint* x, + gint* y) +{ + GdkRectangle _tmp0_; + gint _tmp1_; + GdkRectangle _tmp2_; + gint _tmp3_; #line 188 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); #line 189 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = self->priv->title; + _tmp0_ = self->allocation; #line 189 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp0_ == NULL) { + _tmp1_ = _tmp0_.x; +#line 189 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + *x = (*x) - (_tmp1_ + CHECKERBOARD_ITEM_FRAME_WIDTH); +#line 190 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = self->allocation; +#line 190 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = _tmp2_.y; #line 190 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + *y = (*y) - (_tmp3_ + CHECKERBOARD_ITEM_FRAME_WIDTH); +#line 2105 "CheckerboardLayout.c" +} + + +void +checkerboard_item_clear_title (CheckerboardItem* self) +{ + CheckerboardItemText* _tmp0_; + gboolean _tmp1_; +#line 193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); +#line 194 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = self->priv->title; +#line 194 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp0_ == NULL) { +#line 195 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 1824 "CheckerboardLayout.c" +#line 2122 "CheckerboardLayout.c" } -#line 192 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 197 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_item_text_unref0 (self->priv->title); -#line 192 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 197 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->title = NULL; -#line 194 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 199 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->title_visible; -#line 194 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 199 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp1_) { -#line 195 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 200 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_recalc_size (self, "clear_title"); -#line 196 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 201 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); -#line 1838 "CheckerboardLayout.c" +#line 2136 "CheckerboardLayout.c" } } -static void checkerboard_item_set_title_visible (CheckerboardItem* self, gboolean visible) { +static void +checkerboard_item_set_title_visible (CheckerboardItem* self, + gboolean visible) +{ gboolean _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_; -#line 200 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 205 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 201 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 206 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->title_visible; -#line 201 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = visible; -#line 201 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp0_ == _tmp1_) { -#line 202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 206 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp0_ == visible) { +#line 207 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 1857 "CheckerboardLayout.c" +#line 2154 "CheckerboardLayout.c" } -#line 204 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = visible; -#line 204 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->title_visible = _tmp2_; -#line 206 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 209 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->title_visible = visible; +#line 211 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_recalc_size (self, "set_title_visible"); -#line 207 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); -#line 1867 "CheckerboardLayout.c" +#line 2162 "CheckerboardLayout.c" } -void checkerboard_item_set_comment (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment) { +void +checkerboard_item_set_comment (CheckerboardItem* self, + const gchar* text, + gboolean marked_up, + PangoAlignment alignment) +{ gboolean _tmp0_ = FALSE; CheckerboardItemText* _tmp1_; - const gchar* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - PangoAlignment _tmp10_; - gboolean _tmp11_; - CheckerboardItemText* _tmp12_; - gboolean _tmp13_; -#line 210 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gchar* _tmp3_; + gchar* _tmp4_; + CheckerboardItemText* _tmp5_; + gboolean _tmp6_; +#line 215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 210 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (text != NULL); -#line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 217 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->comment; -#line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 217 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp1_ != NULL) { -#line 1889 "CheckerboardLayout.c" +#line 2186 "CheckerboardLayout.c" CheckerboardItemText* _tmp2_; - const gchar* _tmp3_; - gboolean _tmp4_; - PangoAlignment _tmp5_; - gboolean _tmp6_; -#line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 217 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = self->priv->comment; -#line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = text; -#line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = marked_up; -#line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = alignment; -#line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = checkerboard_item_text_is_set_to (_tmp2_, _tmp3_, _tmp4_, _tmp5_); -#line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = _tmp6_; -#line 1907 "CheckerboardLayout.c" +#line 217 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = checkerboard_item_text_is_set_to (_tmp2_, text, marked_up, alignment); +#line 2192 "CheckerboardLayout.c" } else { -#line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 217 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = FALSE; -#line 1911 "CheckerboardLayout.c" +#line 2196 "CheckerboardLayout.c" } -#line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 217 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp0_) { -#line 213 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 218 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 1917 "CheckerboardLayout.c" +#line 2202 "CheckerboardLayout.c" } -#line 215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = text; -#line 215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = string_replace (_tmp7_, "\n", " "); -#line 215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = _tmp8_; -#line 215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = alignment; -#line 215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = marked_up; -#line 215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = checkerboard_item_text_new (_tmp9_, _tmp10_, _tmp11_); -#line 215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = string_replace (text, "\n", " "); +#line 220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = _tmp3_; +#line 220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = checkerboard_item_text_new (_tmp4_, alignment, marked_up); +#line 220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_item_text_unref0 (self->priv->comment); -#line 215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->comment = _tmp12_; -#line 215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_free0 (_tmp9_); -#line 217 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = self->priv->comment_visible; -#line 217 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp13_) { -#line 218 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->comment = _tmp5_; +#line 220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_free0 (_tmp4_); +#line 222 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp6_ = self->priv->comment_visible; +#line 222 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp6_) { +#line 223 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_recalc_size (self, "set_comment"); -#line 219 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 224 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); -#line 1945 "CheckerboardLayout.c" +#line 2224 "CheckerboardLayout.c" } } -void checkerboard_item_clear_comment (CheckerboardItem* self) { +void +checkerboard_item_clear_comment (CheckerboardItem* self) +{ CheckerboardItemText* _tmp0_; gboolean _tmp1_; -#line 223 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 224 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 229 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->comment; -#line 224 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 229 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp0_ == NULL) { -#line 225 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 230 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 1961 "CheckerboardLayout.c" +#line 2242 "CheckerboardLayout.c" } -#line 227 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 232 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_item_text_unref0 (self->priv->comment); -#line 227 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 232 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->comment = NULL; -#line 229 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 234 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->comment_visible; -#line 229 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 234 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp1_) { -#line 230 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 235 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_recalc_size (self, "clear_comment"); -#line 231 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 236 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); -#line 1975 "CheckerboardLayout.c" +#line 2256 "CheckerboardLayout.c" } } -static void checkerboard_item_set_comment_visible (CheckerboardItem* self, gboolean visible) { +static void +checkerboard_item_set_comment_visible (CheckerboardItem* self, + gboolean visible) +{ gboolean _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_; -#line 235 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 240 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 236 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 241 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->comment_visible; -#line 236 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = visible; -#line 236 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp0_ == _tmp1_) { -#line 237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 241 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp0_ == visible) { +#line 242 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 1994 "CheckerboardLayout.c" +#line 2274 "CheckerboardLayout.c" } -#line 239 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = visible; -#line 239 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->comment_visible = _tmp2_; -#line 241 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->comment_visible = visible; +#line 246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_recalc_size (self, "set_comment_visible"); -#line 242 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); -#line 2004 "CheckerboardLayout.c" +#line 2282 "CheckerboardLayout.c" } -void checkerboard_item_set_tags (CheckerboardItem* self, GeeCollection* tags, PangoAlignment alignment) { +void +checkerboard_item_set_tags (CheckerboardItem* self, + GeeCollection* tags, + PangoAlignment alignment) +{ gboolean _tmp0_ = FALSE; - GeeCollection* _tmp1_; - PangoAlignment _tmp5_; gchar* text = NULL; - gboolean _tmp6_; - gboolean _tmp14_ = FALSE; - CheckerboardItemText* _tmp15_; - const gchar* _tmp20_; - PangoAlignment _tmp21_; - CheckerboardItemText* _tmp22_; - gboolean _tmp23_; -#line 245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_return_if_fail ((tags == NULL) || GEE_IS_COLLECTION (tags)); -#line 247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = tags; -#line 247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp1_ != NULL) { -#line 2028 "CheckerboardLayout.c" - GeeCollection* _tmp2_; - gint _tmp3_; - gint _tmp4_; -#line 247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = tags; -#line 247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = gee_collection_get_size (_tmp2_); -#line 247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = _tmp3_; -#line 247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = _tmp4_ > 0; -#line 2040 "CheckerboardLayout.c" - } else { -#line 247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = FALSE; -#line 2044 "CheckerboardLayout.c" - } -#line 247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_set_has_tags (self, _tmp0_); -#line 248 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = alignment; -#line 248 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->tag_alignment = _tmp5_; + gboolean _tmp3_; + gboolean _tmp9_ = FALSE; + CheckerboardItemText* _tmp10_; + const gchar* _tmp13_; + CheckerboardItemText* _tmp14_; + gboolean _tmp15_; #line 250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = self->priv->_has_tags; + g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); #line 250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp6_) { -#line 2056 "CheckerboardLayout.c" - GeeCollection* _tmp7_; - GeeCollection* _tmp8_; - GeeCollection* _tmp9_; - GeeList* _tmp10_; - GeeList* _tmp11_; - gchar* _tmp12_; -#line 251 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = tags; -#line 251 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = _g_object_ref0 (_tmp7_); -#line 251 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_object_unref0 (self->priv->tags); -#line 251 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->tags = _tmp8_; + g_return_if_fail ((tags == NULL) || GEE_IS_COLLECTION (tags)); #line 252 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = tags; + if (tags != NULL) { +#line 2305 "CheckerboardLayout.c" + gint _tmp1_; + gint _tmp2_; #line 252 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = tag_make_user_visible_tag_list (_tmp9_); + _tmp1_ = gee_collection_get_size (tags); #line 252 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_object_unref0 (self->priv->user_visible_tag_list); + _tmp2_ = _tmp1_; #line 252 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->user_visible_tag_list = _tmp10_; -#line 253 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = self->priv->user_visible_tag_list; -#line 253 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = tag_make_tag_markup_string (_tmp11_, -1); -#line 253 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_free0 (text); -#line 253 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - text = _tmp12_; -#line 2087 "CheckerboardLayout.c" + _tmp0_ = _tmp2_ > 0; +#line 2314 "CheckerboardLayout.c" } else { - gchar* _tmp13_; -#line 255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = g_strdup ("."); +#line 252 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = FALSE; +#line 2318 "CheckerboardLayout.c" + } +#line 252 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_item_set_has_tags (self, _tmp0_); +#line 253 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->tag_alignment = alignment; #line 255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_free0 (text); + _tmp3_ = self->priv->_has_tags; #line 255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - text = _tmp13_; -#line 2096 "CheckerboardLayout.c" - } -#line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp15_ = self->priv->subtitle; -#line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp15_ != NULL) { -#line 2102 "CheckerboardLayout.c" - CheckerboardItemText* _tmp16_; - const gchar* _tmp17_; - PangoAlignment _tmp18_; - gboolean _tmp19_; -#line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp16_ = self->priv->subtitle; + if (_tmp3_) { +#line 2328 "CheckerboardLayout.c" + GeeCollection* _tmp4_; + GeeList* _tmp5_; + GeeList* _tmp6_; + gchar* _tmp7_; +#line 256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = _g_object_ref0 (tags); +#line 256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_object_unref0 (self->priv->tags); +#line 256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->tags = _tmp4_; +#line 257 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = tag_make_user_visible_tag_list (tags); +#line 257 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_object_unref0 (self->priv->user_visible_tag_list); +#line 257 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->user_visible_tag_list = _tmp5_; #line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp17_ = text; + _tmp6_ = self->priv->user_visible_tag_list; #line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp18_ = alignment; + _tmp7_ = tag_make_tag_markup_string (_tmp6_, -1); #line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp19_ = checkerboard_item_text_is_set_to (_tmp16_, _tmp17_, TRUE, _tmp18_); + _g_free0 (text); #line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = _tmp19_; -#line 2117 "CheckerboardLayout.c" + text = _tmp7_; +#line 2353 "CheckerboardLayout.c" } else { -#line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = FALSE; -#line 2121 "CheckerboardLayout.c" + gchar* _tmp8_; +#line 260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp8_ = g_strdup ("."); +#line 260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_free0 (text); +#line 260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + text = _tmp8_; +#line 2362 "CheckerboardLayout.c" } -#line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp14_) { -#line 259 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp10_ = self->priv->subtitle; +#line 263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp10_ != NULL) { +#line 2368 "CheckerboardLayout.c" + CheckerboardItemText* _tmp11_; + const gchar* _tmp12_; +#line 263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp11_ = self->priv->subtitle; +#line 263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp12_ = text; +#line 263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp9_ = checkerboard_item_text_is_set_to (_tmp11_, _tmp12_, TRUE, alignment); +#line 2377 "CheckerboardLayout.c" + } else { +#line 263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp9_ = FALSE; +#line 2381 "CheckerboardLayout.c" + } +#line 263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp9_) { +#line 264 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_free0 (text); -#line 259 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 264 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 2129 "CheckerboardLayout.c" +#line 2389 "CheckerboardLayout.c" } -#line 260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp20_ = text; -#line 260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp21_ = alignment; -#line 260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp22_ = checkerboard_item_text_new (_tmp20_, _tmp21_, TRUE); -#line 260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 265 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp13_ = text; +#line 265 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp14_ = checkerboard_item_text_new (_tmp13_, alignment, TRUE); +#line 265 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_item_text_unref0 (self->priv->subtitle); -#line 260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->subtitle = _tmp22_; -#line 262 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp23_ = self->priv->subtitle_visible; -#line 262 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp23_) { -#line 263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 265 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->subtitle = _tmp14_; +#line 267 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp15_ = self->priv->subtitle_visible; +#line 267 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp15_) { +#line 268 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_recalc_size (self, "set_subtitle"); -#line 264 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 269 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); -#line 2149 "CheckerboardLayout.c" +#line 2407 "CheckerboardLayout.c" } -#line 245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_free0 (text); -#line 2153 "CheckerboardLayout.c" +#line 2411 "CheckerboardLayout.c" } -void checkerboard_item_clear_tags (CheckerboardItem* self) { -#line 268 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +void +checkerboard_item_clear_tags (CheckerboardItem* self) +{ +#line 273 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 269 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_clear_subtitle (self); -#line 270 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_set_has_tags (self, FALSE); -#line 271 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 276 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->user_visible_tag_list); -#line 271 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 276 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->user_visible_tag_list = NULL; -#line 2168 "CheckerboardLayout.c" +#line 2428 "CheckerboardLayout.c" } -void checkerboard_item_highlight_user_visible_tag (CheckerboardItem* self, gint index) { +void +checkerboard_item_highlight_user_visible_tag (CheckerboardItem* self, + gint index) +{ GeeList* _tmp0_; gchar* text = NULL; GeeList* _tmp1_; - gint _tmp2_; - gchar* _tmp3_; - const gchar* _tmp4_; - PangoAlignment _tmp5_; - CheckerboardItemText* _tmp6_; - gboolean _tmp7_; -#line 274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gchar* _tmp2_; + const gchar* _tmp3_; + PangoAlignment _tmp4_; + CheckerboardItemText* _tmp5_; + gboolean _tmp6_; +#line 279 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 279 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->user_visible_tag_list; -#line 274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 279 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _vala_return_if_fail (_tmp0_ != NULL, "user_visible_tag_list != null"); -#line 276 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 281 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->user_visible_tag_list; -#line 276 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = index; -#line 276 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = tag_make_tag_markup_string (_tmp1_, _tmp2_); -#line 276 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - text = _tmp3_; -#line 277 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = text; -#line 277 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = self->priv->tag_alignment; -#line 277 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = checkerboard_item_text_new (_tmp4_, _tmp5_, TRUE); -#line 277 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 281 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = tag_make_tag_markup_string (_tmp1_, index); +#line 281 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + text = _tmp2_; +#line 282 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = text; +#line 282 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = self->priv->tag_alignment; +#line 282 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = checkerboard_item_text_new (_tmp3_, _tmp4_, TRUE); +#line 282 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_item_text_unref0 (self->priv->subtitle); -#line 277 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->subtitle = _tmp6_; -#line 279 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = self->priv->subtitle_visible; -#line 279 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp7_) { -#line 280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 282 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->subtitle = _tmp5_; +#line 284 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp6_ = self->priv->subtitle_visible; +#line 284 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp6_) { +#line 285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); -#line 2212 "CheckerboardLayout.c" +#line 2472 "CheckerboardLayout.c" } -#line 274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 279 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_free0 (text); -#line 2216 "CheckerboardLayout.c" +#line 2476 "CheckerboardLayout.c" } -Tag* checkerboard_item_get_user_visible_tag (CheckerboardItem* self, gint index) { +Tag* +checkerboard_item_get_user_visible_tag (CheckerboardItem* self, + gint index) +{ Tag* result = NULL; - gint _tmp0_; + GeeList* _tmp0_; gint _tmp1_; - GeeList* _tmp2_; - gint _tmp3_; - gint _tmp4_; - GeeList* _tmp5_; - gint _tmp6_; - gpointer _tmp7_; -#line 283 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gint _tmp2_; + GeeList* _tmp3_; + gpointer _tmp4_; +#line 288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL); -#line 283 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = index; -#line 283 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = index; -#line 283 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = self->priv->user_visible_tag_list; -#line 283 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 283 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = _tmp3_; -#line 283 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _vala_return_val_if_fail ((_tmp0_ >= 0) && (_tmp1_ < _tmp4_), "index >= 0 && index < user_visible_tag_list.size", NULL); -#line 285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = self->priv->user_visible_tag_list; -#line 285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = index; -#line 285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = gee_list_get (_tmp5_, _tmp6_); -#line 285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - result = (Tag*) _tmp7_; -#line 285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = self->priv->user_visible_tag_list; +#line 288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = _tmp1_; +#line 288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _vala_return_val_if_fail ((index >= 0) && (index < _tmp2_), "index >= 0 && index < user_visible_tag_list.size", NULL); +#line 290 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = self->priv->user_visible_tag_list; +#line 290 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = gee_list_get (_tmp3_, index); +#line 290 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + result = (Tag*) _tmp4_; +#line 290 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 2254 "CheckerboardLayout.c" +#line 2508 "CheckerboardLayout.c" } -PangoLayout* checkerboard_item_get_tag_list_layout (CheckerboardItem* self) { +PangoLayout* +checkerboard_item_get_tag_list_layout (CheckerboardItem* self) +{ PangoLayout* result = NULL; PangoLayout* _tmp0_ = NULL; gboolean _tmp1_; -#line 288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 293 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL); -#line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 294 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->_has_tags; -#line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 294 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp1_) { -#line 2268 "CheckerboardLayout.c" +#line 2524 "CheckerboardLayout.c" CheckerboardItemText* _tmp2_; PangoLayout* _tmp3_; -#line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 294 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = self->priv->subtitle; -#line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 294 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp3_ = checkerboard_item_text_get_pango_layout (_tmp2_, 0); -#line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 294 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (_tmp0_); -#line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 294 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = _tmp3_; -#line 2279 "CheckerboardLayout.c" +#line 2535 "CheckerboardLayout.c" } else { -#line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 294 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (_tmp0_); -#line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 294 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = NULL; -#line 2285 "CheckerboardLayout.c" +#line 2541 "CheckerboardLayout.c" } -#line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 294 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = _tmp0_; -#line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 294 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 2291 "CheckerboardLayout.c" +#line 2547 "CheckerboardLayout.c" } -void checkerboard_item_get_subtitle_allocation (CheckerboardItem* self, GdkRectangle* result) { +void +checkerboard_item_get_subtitle_allocation (CheckerboardItem* self, + GdkRectangle* result) +{ CheckerboardItemText* _tmp0_; GdkRectangle _tmp1_; -#line 292 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 293 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 298 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->subtitle; -#line 293 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 298 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = _tmp0_->allocation; -#line 293 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 298 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" *result = _tmp1_; -#line 293 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 298 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 2308 "CheckerboardLayout.c" +#line 2567 "CheckerboardLayout.c" } -gchar* checkerboard_item_get_subtitle (CheckerboardItem* self) { +gchar* +checkerboard_item_get_subtitle (CheckerboardItem* self) +{ gchar* result = NULL; gchar* _tmp0_ = NULL; CheckerboardItemText* _tmp1_; -#line 296 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 301 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL); -#line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->subtitle; -#line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp1_ != NULL) { -#line 2322 "CheckerboardLayout.c" +#line 2583 "CheckerboardLayout.c" CheckerboardItemText* _tmp2_; gchar* _tmp3_; -#line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = self->priv->subtitle; -#line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp3_ = checkerboard_item_text_get_text (_tmp2_); -#line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_free0 (_tmp0_); -#line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = _tmp3_; -#line 2333 "CheckerboardLayout.c" +#line 2594 "CheckerboardLayout.c" } else { gchar* _tmp4_; -#line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp4_ = g_strdup (""); -#line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_free0 (_tmp0_); -#line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = _tmp4_; -#line 2342 "CheckerboardLayout.c" +#line 2603 "CheckerboardLayout.c" } -#line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = _tmp0_; -#line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 2348 "CheckerboardLayout.c" +#line 2609 "CheckerboardLayout.c" } -void checkerboard_item_set_subtitle (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment) { +void +checkerboard_item_set_subtitle (CheckerboardItem* self, + const gchar* text, + gboolean marked_up, + PangoAlignment alignment) +{ gboolean _tmp0_ = FALSE; CheckerboardItemText* _tmp1_; - const gchar* _tmp7_; - PangoAlignment _tmp8_; - gboolean _tmp9_; - CheckerboardItemText* _tmp10_; - gboolean _tmp11_; -#line 300 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + CheckerboardItemText* _tmp3_; + gboolean _tmp4_; +#line 305 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 300 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 305 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (text != NULL); -#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 307 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->subtitle; -#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 307 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp1_ != NULL) { -#line 2368 "CheckerboardLayout.c" +#line 2631 "CheckerboardLayout.c" CheckerboardItemText* _tmp2_; - const gchar* _tmp3_; - gboolean _tmp4_; - PangoAlignment _tmp5_; - gboolean _tmp6_; -#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 307 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = self->priv->subtitle; -#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = text; -#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = marked_up; -#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = alignment; -#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = checkerboard_item_text_is_set_to (_tmp2_, _tmp3_, _tmp4_, _tmp5_); -#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = _tmp6_; -#line 2386 "CheckerboardLayout.c" +#line 307 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = checkerboard_item_text_is_set_to (_tmp2_, text, marked_up, alignment); +#line 2637 "CheckerboardLayout.c" } else { -#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 307 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = FALSE; -#line 2390 "CheckerboardLayout.c" +#line 2641 "CheckerboardLayout.c" } -#line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 307 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp0_) { -#line 303 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 308 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 2396 "CheckerboardLayout.c" +#line 2647 "CheckerboardLayout.c" } -#line 305 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = text; -#line 305 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = alignment; -#line 305 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = marked_up; -#line 305 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = checkerboard_item_text_new (_tmp7_, _tmp8_, _tmp9_); -#line 305 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 310 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = checkerboard_item_text_new (text, alignment, marked_up); +#line 310 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_item_text_unref0 (self->priv->subtitle); -#line 305 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->subtitle = _tmp10_; -#line 307 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = self->priv->subtitle_visible; -#line 307 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp11_) { -#line 308 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 310 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->subtitle = _tmp3_; +#line 312 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = self->priv->subtitle_visible; +#line 312 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp4_) { +#line 313 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_recalc_size (self, "set_subtitle"); -#line 309 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 314 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); -#line 2418 "CheckerboardLayout.c" +#line 2663 "CheckerboardLayout.c" } } -void checkerboard_item_clear_subtitle (CheckerboardItem* self) { +void +checkerboard_item_clear_subtitle (CheckerboardItem* self) +{ CheckerboardItemText* _tmp0_; gboolean _tmp1_; -#line 313 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 318 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 314 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 319 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->subtitle; -#line 314 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 319 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp0_ == NULL) { -#line 315 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 320 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 2434 "CheckerboardLayout.c" +#line 2681 "CheckerboardLayout.c" } -#line 317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 322 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_item_text_unref0 (self->priv->subtitle); -#line 317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 322 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->subtitle = NULL; -#line 319 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 324 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->subtitle_visible; -#line 319 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 324 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp1_) { -#line 320 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 325 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_recalc_size (self, "clear_subtitle"); -#line 321 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 326 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); -#line 2448 "CheckerboardLayout.c" +#line 2695 "CheckerboardLayout.c" } } -static void checkerboard_item_set_subtitle_visible (CheckerboardItem* self, gboolean visible) { +static void +checkerboard_item_set_subtitle_visible (CheckerboardItem* self, + gboolean visible) +{ gboolean _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_; -#line 325 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 330 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 326 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->subtitle_visible; -#line 326 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = visible; -#line 326 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp0_ == _tmp1_) { -#line 327 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp0_ == visible) { +#line 332 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 2467 "CheckerboardLayout.c" +#line 2713 "CheckerboardLayout.c" } -#line 329 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = visible; -#line 329 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->subtitle_visible = _tmp2_; -#line 331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 334 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->subtitle_visible = visible; +#line 336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_recalc_size (self, "set_subtitle_visible"); -#line 332 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 337 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); -#line 2477 "CheckerboardLayout.c" +#line 2721 "CheckerboardLayout.c" } -void checkerboard_item_set_is_cursor (CheckerboardItem* self, gboolean is_cursor) { - gboolean _tmp0_; -#line 335 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +void +checkerboard_item_set_is_cursor (CheckerboardItem* self, + gboolean is_cursor) +{ +#line 340 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = is_cursor; -#line 336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->is_cursor = _tmp0_; -#line 2489 "CheckerboardLayout.c" +#line 341 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->is_cursor = is_cursor; +#line 2733 "CheckerboardLayout.c" } -gboolean checkerboard_item_get_is_cursor (CheckerboardItem* self) { +gboolean +checkerboard_item_get_is_cursor (CheckerboardItem* self) +{ gboolean result = FALSE; gboolean _tmp0_; -#line 339 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 344 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), FALSE); -#line 340 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 345 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->is_cursor; -#line 340 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 345 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = _tmp0_; -#line 340 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 345 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 2504 "CheckerboardLayout.c" +#line 2750 "CheckerboardLayout.c" } -static void _vala_GValue_free (GValue* self) { -#line 344 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +_vala_GValue_free (GValue* self) +{ +#line 349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_value_unset (self); -#line 344 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_free (self); -#line 2513 "CheckerboardLayout.c" +#line 2761 "CheckerboardLayout.c" } -static void checkerboard_item_real_notify_membership_changed (DataObject* base, DataCollection* collection) { +static void +checkerboard_item_real_notify_membership_changed (DataObject* base, + DataCollection* collection) +{ CheckerboardItem * self; gboolean title_visible = FALSE; GValue* _tmp0_ = NULL; @@ -2536,2608 +2787,2250 @@ static void checkerboard_item_real_notify_membership_changed (DataObject* base, gboolean _tmp16_; gboolean _tmp18_ = FALSE; gboolean _tmp19_; - DataCollection* _tmp21_; -#line 343 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 348 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); -#line 343 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 348 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail ((collection == NULL) || IS_DATA_COLLECTION (collection)); -#line 344 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = g_new0 (GValue, 1); -#line 344 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_value_init (_tmp0_, G_TYPE_BOOLEAN); -#line 344 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_value_set_boolean (_tmp0_, TRUE); -#line 344 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_object_get_collection_property (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), CHECKERBOARD_ITEM_PROP_SHOW_TITLES, _tmp0_, &_tmp1_); -#line 344 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = g_value_get_boolean (&_tmp1_); -#line 344 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" __vala_GValue_free0 (_tmp0_); -#line 344 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" title_visible = _tmp2_; -#line 345 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 350 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp3_ = g_new0 (GValue, 1); -#line 345 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 350 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_value_init (_tmp3_, G_TYPE_BOOLEAN); -#line 345 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 350 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_value_set_boolean (_tmp3_, TRUE); -#line 345 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 350 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_object_get_collection_property (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), CHECKERBOARD_ITEM_PROP_SHOW_COMMENTS, _tmp3_, &_tmp4_); -#line 345 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 350 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp5_ = g_value_get_boolean (&_tmp4_); -#line 345 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 350 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" __vala_GValue_free0 (_tmp3_); -#line 345 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 350 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" comment_visible = _tmp5_; -#line 346 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 351 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp6_ = g_new0 (GValue, 1); -#line 346 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 351 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_value_init (_tmp6_, G_TYPE_BOOLEAN); -#line 346 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 351 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_value_set_boolean (_tmp6_, FALSE); -#line 346 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 351 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_object_get_collection_property (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES, _tmp6_, &_tmp7_); -#line 346 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 351 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp8_ = g_value_get_boolean (&_tmp7_); -#line 346 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 351 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" __vala_GValue_free0 (_tmp6_); -#line 346 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 351 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" subtitle_visible = _tmp8_; -#line 348 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 353 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" altered = FALSE; -#line 349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp9_ = self->priv->title_visible; -#line 349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp10_ = title_visible; -#line 349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp9_ != _tmp10_) { -#line 2595 "CheckerboardLayout.c" +#line 2845 "CheckerboardLayout.c" gboolean _tmp11_; -#line 350 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 355 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp11_ = title_visible; -#line 350 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 355 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->title_visible = _tmp11_; -#line 351 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 356 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" altered = TRUE; -#line 2603 "CheckerboardLayout.c" +#line 2853 "CheckerboardLayout.c" } -#line 354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 359 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp12_ = self->priv->comment_visible; -#line 354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 359 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp13_ = comment_visible; -#line 354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 359 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp12_ != _tmp13_) { -#line 2611 "CheckerboardLayout.c" +#line 2861 "CheckerboardLayout.c" gboolean _tmp14_; -#line 355 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp14_ = comment_visible; -#line 355 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->comment_visible = _tmp14_; -#line 356 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 361 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" altered = TRUE; -#line 2619 "CheckerboardLayout.c" +#line 2869 "CheckerboardLayout.c" } -#line 359 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp15_ = self->priv->subtitle_visible; -#line 359 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp16_ = subtitle_visible; -#line 359 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp15_ != _tmp16_) { -#line 2627 "CheckerboardLayout.c" +#line 2877 "CheckerboardLayout.c" gboolean _tmp17_; -#line 360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 365 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp17_ = subtitle_visible; -#line 360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 365 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->subtitle_visible = _tmp17_; -#line 361 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 366 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" altered = TRUE; -#line 2635 "CheckerboardLayout.c" +#line 2885 "CheckerboardLayout.c" } -#line 364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 369 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp19_ = altered; -#line 364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 369 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp19_) { -#line 364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 369 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp18_ = TRUE; -#line 2643 "CheckerboardLayout.c" +#line 2893 "CheckerboardLayout.c" } else { - gboolean _tmp20_; -#line 364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp20_ = dimensions_has_area (&self->requisition); -#line 364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp18_ = !_tmp20_; -#line 2650 "CheckerboardLayout.c" +#line 369 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp18_ = !dimensions_has_area (&self->requisition); +#line 2897 "CheckerboardLayout.c" } -#line 364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 369 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp18_) { -#line 365 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 370 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_recalc_size (self, "notify_membership_changed"); -#line 366 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 371 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); -#line 2658 "CheckerboardLayout.c" +#line 2905 "CheckerboardLayout.c" } -#line 369 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp21_ = collection; -#line 369 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - DATA_OBJECT_CLASS (checkerboard_item_parent_class)->notify_membership_changed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_VIEW, ThumbnailView), TYPE_DATA_OBJECT, DataObject), _tmp21_); -#line 2664 "CheckerboardLayout.c" +#line 374 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + DATA_OBJECT_CLASS (checkerboard_item_parent_class)->notify_membership_changed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_VIEW, ThumbnailView), TYPE_DATA_OBJECT, DataObject), collection); +#line 2909 "CheckerboardLayout.c" } -static void checkerboard_item_real_notify_collection_property_set (DataObject* base, const gchar* name, GValue* old, GValue* val) { +static void +checkerboard_item_real_notify_collection_property_set (DataObject* base, + const gchar* name, + GValue* old, + GValue* val) +{ CheckerboardItem * self; const gchar* _tmp0_; - const gchar* _tmp1_; - GQuark _tmp3_ = 0U; - const gchar* _tmp7_; - GValue* _tmp8_; - GValue _tmp9_; -#line 372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GQuark _tmp2_ = 0U; + GValue _tmp6_; +#line 377 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); -#line 372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 377 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (name != NULL); -#line 372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 377 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (val != NULL); -#line 373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 378 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = name; -#line 373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = _tmp0_; -#line 373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_); -#line 373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp3_ == g_quark_from_string (CHECKERBOARD_ITEM_PROP_SHOW_TITLES)) { -#line 373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 378 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = (NULL == _tmp0_) ? 0 : g_quark_from_string (_tmp0_); +#line 378 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp2_ == g_quark_from_string (CHECKERBOARD_ITEM_PROP_SHOW_TITLES)) { +#line 378 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" switch (0) { -#line 2692 "CheckerboardLayout.c" +#line 2937 "CheckerboardLayout.c" default: { - GValue _tmp4_; -#line 375 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = *val; -#line 375 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_set_title_visible (self, g_value_get_boolean (&_tmp4_)); -#line 376 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GValue _tmp3_; +#line 380 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = *val; +#line 380 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_item_set_title_visible (self, g_value_get_boolean (&_tmp3_)); +#line 381 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 2702 "CheckerboardLayout.c" +#line 2947 "CheckerboardLayout.c" } } - } else if (_tmp3_ == g_quark_from_string (CHECKERBOARD_ITEM_PROP_SHOW_COMMENTS)) { -#line 373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + } else if (_tmp2_ == g_quark_from_string (CHECKERBOARD_ITEM_PROP_SHOW_COMMENTS)) { +#line 378 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" switch (0) { -#line 2708 "CheckerboardLayout.c" +#line 2953 "CheckerboardLayout.c" default: { - GValue _tmp5_; -#line 379 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = *val; -#line 379 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_set_comment_visible (self, g_value_get_boolean (&_tmp5_)); -#line 380 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GValue _tmp4_; +#line 384 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = *val; +#line 384 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_item_set_comment_visible (self, g_value_get_boolean (&_tmp4_)); +#line 385 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 2718 "CheckerboardLayout.c" +#line 2963 "CheckerboardLayout.c" } } - } else if (_tmp3_ == g_quark_from_string (CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES)) { -#line 373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + } else if (_tmp2_ == g_quark_from_string (CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES)) { +#line 378 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" switch (0) { -#line 2724 "CheckerboardLayout.c" +#line 2969 "CheckerboardLayout.c" default: { - GValue _tmp6_; -#line 383 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = *val; -#line 383 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_set_subtitle_visible (self, g_value_get_boolean (&_tmp6_)); -#line 384 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GValue _tmp5_; +#line 388 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = *val; +#line 388 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_item_set_subtitle_visible (self, g_value_get_boolean (&_tmp5_)); +#line 389 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 2734 "CheckerboardLayout.c" +#line 2979 "CheckerboardLayout.c" } } } -#line 387 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = name; -#line 387 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = old; -#line 387 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = *val; -#line 387 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - DATA_OBJECT_CLASS (checkerboard_item_parent_class)->notify_collection_property_set (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_VIEW, ThumbnailView), TYPE_DATA_OBJECT, DataObject), _tmp7_, _tmp8_, &_tmp9_); -#line 2746 "CheckerboardLayout.c" +#line 392 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp6_ = *val; +#line 392 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + DATA_OBJECT_CLASS (checkerboard_item_parent_class)->notify_collection_property_set (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_VIEW, ThumbnailView), TYPE_DATA_OBJECT, DataObject), name, old, &_tmp6_); +#line 2987 "CheckerboardLayout.c" } -gint checkerboard_item_get_alignment_point (CheckerboardItem* self) { +gint +checkerboard_item_get_alignment_point (CheckerboardItem* self) +{ gint result = 0; Dimensions _tmp0_; gint _tmp1_; -#line 393 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 398 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), 0); -#line 394 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 399 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->pixbuf_dim; -#line 394 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 399 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = _tmp0_.height; -#line 394 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 399 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = (CHECKERBOARD_ITEM_FRAME_WIDTH + CHECKERBOARD_ITEM_BORDER_WIDTH) + _tmp1_; -#line 394 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 399 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 2764 "CheckerboardLayout.c" +#line 3007 "CheckerboardLayout.c" } -static void checkerboard_item_real_exposed (CheckerboardItem* self) { -#line 398 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +checkerboard_item_real_exposed (CheckerboardItem* self) +{ +#line 403 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->exposure = TRUE; -#line 2771 "CheckerboardLayout.c" +#line 3016 "CheckerboardLayout.c" } -void checkerboard_item_exposed (CheckerboardItem* self) { -#line 397 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +void +checkerboard_item_exposed (CheckerboardItem* self) +{ +#line 402 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 397 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 402 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" CHECKERBOARD_ITEM_GET_CLASS (self)->exposed (self); -#line 2780 "CheckerboardLayout.c" +#line 3027 "CheckerboardLayout.c" } -static void checkerboard_item_real_unexposed (CheckerboardItem* self) { +static void +checkerboard_item_real_unexposed (CheckerboardItem* self) +{ CheckerboardItemText* _tmp0_; CheckerboardItemText* _tmp2_; CheckerboardItemText* _tmp4_; -#line 402 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 407 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->exposure = FALSE; -#line 404 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 409 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->title; -#line 404 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 409 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp0_ != NULL) { -#line 2794 "CheckerboardLayout.c" +#line 3043 "CheckerboardLayout.c" CheckerboardItemText* _tmp1_; -#line 405 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 410 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->title; -#line 405 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 410 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_text_clear_pango_layout (_tmp1_); -#line 2800 "CheckerboardLayout.c" +#line 3049 "CheckerboardLayout.c" } -#line 407 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 412 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = self->priv->comment; -#line 407 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 412 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp2_ != NULL) { -#line 2806 "CheckerboardLayout.c" +#line 3055 "CheckerboardLayout.c" CheckerboardItemText* _tmp3_; -#line 408 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 413 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp3_ = self->priv->comment; -#line 408 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 413 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_text_clear_pango_layout (_tmp3_); -#line 2812 "CheckerboardLayout.c" +#line 3061 "CheckerboardLayout.c" } -#line 410 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp4_ = self->priv->subtitle; -#line 410 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp4_ != NULL) { -#line 2818 "CheckerboardLayout.c" +#line 3067 "CheckerboardLayout.c" CheckerboardItemText* _tmp5_; -#line 411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 416 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp5_ = self->priv->subtitle; -#line 411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 416 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_text_clear_pango_layout (_tmp5_); -#line 2824 "CheckerboardLayout.c" +#line 3073 "CheckerboardLayout.c" } } -void checkerboard_item_unexposed (CheckerboardItem* self) { -#line 401 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +void +checkerboard_item_unexposed (CheckerboardItem* self) +{ +#line 406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 401 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" CHECKERBOARD_ITEM_GET_CLASS (self)->unexposed (self); -#line 2834 "CheckerboardLayout.c" +#line 3085 "CheckerboardLayout.c" } -static gboolean checkerboard_item_real_is_exposed (CheckerboardItem* self) { +static gboolean +checkerboard_item_real_is_exposed (CheckerboardItem* self) +{ gboolean result = FALSE; gboolean _tmp0_; -#line 415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->exposure; -#line 415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = _tmp0_; -#line 415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 2847 "CheckerboardLayout.c" +#line 3100 "CheckerboardLayout.c" } -gboolean checkerboard_item_is_exposed (CheckerboardItem* self) { -#line 414 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +gboolean +checkerboard_item_is_exposed (CheckerboardItem* self) +{ +#line 419 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), FALSE); -#line 414 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 419 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return CHECKERBOARD_ITEM_GET_CLASS (self)->is_exposed (self); -#line 2856 "CheckerboardLayout.c" +#line 3111 "CheckerboardLayout.c" } -gboolean checkerboard_item_has_image (CheckerboardItem* self) { +gboolean +checkerboard_item_has_image (CheckerboardItem* self) +{ gboolean result = FALSE; GdkPixbuf* _tmp0_; -#line 418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 423 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), FALSE); -#line 419 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 424 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->pixbuf; -#line 419 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 424 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = _tmp0_ != NULL; -#line 419 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 424 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 2871 "CheckerboardLayout.c" +#line 3128 "CheckerboardLayout.c" } -GdkPixbuf* checkerboard_item_get_image (CheckerboardItem* self) { +GdkPixbuf* +checkerboard_item_get_image (CheckerboardItem* self) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_; GdkPixbuf* _tmp1_; -#line 422 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 427 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL); -#line 423 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 428 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->pixbuf; -#line 423 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 428 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 423 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 428 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = _tmp1_; -#line 423 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 428 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 2889 "CheckerboardLayout.c" +#line 3148 "CheckerboardLayout.c" } -void checkerboard_item_set_image (CheckerboardItem* self, GdkPixbuf* pixbuf) { +void +checkerboard_item_set_image (CheckerboardItem* self, + GdkPixbuf* pixbuf) +{ GdkPixbuf* _tmp0_; GdkPixbuf* _tmp1_; - GdkPixbuf* _tmp2_; - GdkPixbuf* _tmp3_; - GdkPixbuf* _tmp4_; - Dimensions _tmp5_ = {0}; -#line 426 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + Dimensions _tmp2_ = {0}; +#line 431 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 426 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 431 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); -#line 427 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = pixbuf; -#line 427 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); -#line 427 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 432 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = _g_object_ref0 (pixbuf); +#line 432 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->pixbuf); -#line 427 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->pixbuf = _tmp1_; -#line 428 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = pixbuf; -#line 428 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); -#line 428 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 432 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->pixbuf = _tmp0_; +#line 433 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1_ = _g_object_ref0 (pixbuf); +#line 433 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->display_pixbuf); -#line 428 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->display_pixbuf = _tmp3_; -#line 429 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = pixbuf; -#line 429 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - dimensions_for_pixbuf (_tmp4_, &_tmp5_); -#line 429 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->pixbuf_dim = _tmp5_; -#line 431 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 433 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->display_pixbuf = _tmp1_; +#line 434 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + dimensions_for_pixbuf (pixbuf, &_tmp2_); +#line 434 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->pixbuf_dim = _tmp2_; +#line 436 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_recalc_size (self, "set_image"); -#line 432 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 437 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); -#line 2930 "CheckerboardLayout.c" +#line 3183 "CheckerboardLayout.c" } -void checkerboard_item_clear_image (CheckerboardItem* self, Dimensions* dim) { +void +checkerboard_item_clear_image (CheckerboardItem* self, + Dimensions* dim) +{ gboolean had_image = FALSE; GdkPixbuf* _tmp0_; Dimensions _tmp1_; gboolean _tmp2_; -#line 435 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 440 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 435 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 440 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (dim != NULL); -#line 436 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 441 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->pixbuf; -#line 436 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 441 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" had_image = _tmp0_ != NULL; -#line 438 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 443 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->pixbuf); -#line 438 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 443 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->pixbuf = NULL; -#line 439 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 444 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->display_pixbuf); -#line 439 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 444 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->display_pixbuf = NULL; -#line 440 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 445 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = *dim; -#line 440 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 445 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->pixbuf_dim = _tmp1_; -#line 442 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 447 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_recalc_size (self, "clear_image"); -#line 444 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 449 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = had_image; -#line 444 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 449 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp2_) { -#line 445 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); -#line 2967 "CheckerboardLayout.c" +#line 3223 "CheckerboardLayout.c" } } -gint checkerboard_item_get_max_width (gint scale) { +gint +checkerboard_item_get_max_width (gint scale) +{ gint result = 0; - gint _tmp0_; -#line 451 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = scale; -#line 451 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - result = (CHECKERBOARD_ITEM_FRAME_WIDTH * 2) + _tmp0_; -#line 451 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 456 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + result = (CHECKERBOARD_ITEM_FRAME_WIDTH * 2) + scale; +#line 456 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 2981 "CheckerboardLayout.c" +#line 3236 "CheckerboardLayout.c" } -static void checkerboard_item_recalc_size (CheckerboardItem* self, const gchar* reason) { +static void +checkerboard_item_recalc_size (CheckerboardItem* self, + const gchar* reason) +{ Dimensions old_requisition = {0}; Dimensions _tmp0_; gint _tmp1_ = 0; gboolean _tmp2_ = FALSE; CheckerboardItemText* _tmp3_; gint title_height = 0; - gint _tmp7_ = 0; - gboolean _tmp8_ = FALSE; - CheckerboardItemText* _tmp9_; + gint _tmp6_ = 0; + gboolean _tmp7_ = FALSE; + CheckerboardItemText* _tmp8_; gint comment_height = 0; - gint _tmp13_ = 0; - gboolean _tmp14_ = FALSE; - CheckerboardItemText* _tmp15_; + gint _tmp11_ = 0; + gboolean _tmp12_ = FALSE; + CheckerboardItemText* _tmp13_; gint subtitle_height = 0; - Dimensions _tmp19_; + Dimensions _tmp16_; + gint _tmp17_; + Dimensions _tmp18_; + gint _tmp19_; gint _tmp20_; - Dimensions _tmp21_; + gint _tmp21_; gint _tmp22_; - gint _tmp23_; - gint _tmp24_; - gint _tmp25_; - Dimensions _tmp26_; - gboolean _tmp27_; -#line 454 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + Dimensions _tmp23_; +#line 459 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 454 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 459 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (reason != NULL); -#line 455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->requisition; -#line 455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" old_requisition = _tmp0_; -#line 458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp3_ = self->priv->title; -#line 458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp3_ != NULL) { -#line 3021 "CheckerboardLayout.c" +#line 3278 "CheckerboardLayout.c" gboolean _tmp4_; -#line 458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp4_ = self->priv->title_visible; -#line 458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = _tmp4_; -#line 3027 "CheckerboardLayout.c" +#line 3284 "CheckerboardLayout.c" } else { -#line 458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = FALSE; -#line 3031 "CheckerboardLayout.c" +#line 3288 "CheckerboardLayout.c" } -#line 458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp2_) { -#line 3035 "CheckerboardLayout.c" +#line 3292 "CheckerboardLayout.c" CheckerboardItemText* _tmp5_; - gint _tmp6_; -#line 459 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 464 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp5_ = self->priv->title; -#line 459 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = checkerboard_item_text_get_height (_tmp5_); -#line 459 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = _tmp6_ + CHECKERBOARD_ITEM_LABEL_PADDING; -#line 3044 "CheckerboardLayout.c" +#line 464 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1_ = checkerboard_item_text_get_height (_tmp5_) + CHECKERBOARD_ITEM_LABEL_PADDING; +#line 3298 "CheckerboardLayout.c" } else { -#line 459 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 464 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = 0; -#line 3048 "CheckerboardLayout.c" +#line 3302 "CheckerboardLayout.c" } -#line 458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" title_height = _tmp1_; -#line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = self->priv->comment; -#line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp9_ != NULL) { -#line 3056 "CheckerboardLayout.c" - gboolean _tmp10_; -#line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = self->priv->comment_visible; -#line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = _tmp10_; -#line 3062 "CheckerboardLayout.c" +#line 465 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp8_ = self->priv->comment; +#line 465 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp8_ != NULL) { +#line 3310 "CheckerboardLayout.c" + gboolean _tmp9_; +#line 465 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp9_ = self->priv->comment_visible; +#line 465 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp7_ = _tmp9_; +#line 3316 "CheckerboardLayout.c" } else { -#line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = FALSE; -#line 3066 "CheckerboardLayout.c" +#line 465 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp7_ = FALSE; +#line 3320 "CheckerboardLayout.c" } -#line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp8_) { -#line 3070 "CheckerboardLayout.c" - CheckerboardItemText* _tmp11_; - gint _tmp12_; -#line 461 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = self->priv->comment; -#line 461 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = checkerboard_item_text_get_height (_tmp11_); -#line 461 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = _tmp12_ + CHECKERBOARD_ITEM_LABEL_PADDING; -#line 3079 "CheckerboardLayout.c" +#line 465 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp7_) { +#line 3324 "CheckerboardLayout.c" + CheckerboardItemText* _tmp10_; +#line 466 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp10_ = self->priv->comment; +#line 466 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp6_ = checkerboard_item_text_get_height (_tmp10_) + CHECKERBOARD_ITEM_LABEL_PADDING; +#line 3330 "CheckerboardLayout.c" } else { -#line 461 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = 0; -#line 3083 "CheckerboardLayout.c" +#line 466 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp6_ = 0; +#line 3334 "CheckerboardLayout.c" } -#line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - comment_height = _tmp7_; -#line 462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp15_ = self->priv->subtitle; -#line 462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp15_ != NULL) { -#line 3091 "CheckerboardLayout.c" - gboolean _tmp16_; -#line 462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp16_ = self->priv->subtitle_visible; -#line 462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = _tmp16_; -#line 3097 "CheckerboardLayout.c" +#line 465 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + comment_height = _tmp6_; +#line 467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp13_ = self->priv->subtitle; +#line 467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp13_ != NULL) { +#line 3342 "CheckerboardLayout.c" + gboolean _tmp14_; +#line 467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp14_ = self->priv->subtitle_visible; +#line 467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp12_ = _tmp14_; +#line 3348 "CheckerboardLayout.c" } else { -#line 462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = FALSE; -#line 3101 "CheckerboardLayout.c" +#line 467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp12_ = FALSE; +#line 3352 "CheckerboardLayout.c" } -#line 462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp14_) { -#line 3105 "CheckerboardLayout.c" - CheckerboardItemText* _tmp17_; - gint _tmp18_; -#line 463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp17_ = self->priv->subtitle; -#line 463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp18_ = checkerboard_item_text_get_height (_tmp17_); -#line 463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = _tmp18_ + CHECKERBOARD_ITEM_LABEL_PADDING; -#line 3114 "CheckerboardLayout.c" +#line 467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp12_) { +#line 3356 "CheckerboardLayout.c" + CheckerboardItemText* _tmp15_; +#line 468 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp15_ = self->priv->subtitle; +#line 468 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp11_ = checkerboard_item_text_get_height (_tmp15_) + CHECKERBOARD_ITEM_LABEL_PADDING; +#line 3362 "CheckerboardLayout.c" } else { -#line 463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = 0; -#line 3118 "CheckerboardLayout.c" +#line 468 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp11_ = 0; +#line 3366 "CheckerboardLayout.c" } -#line 462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - subtitle_height = _tmp13_; -#line 467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp19_ = self->priv->pixbuf_dim; #line 467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp20_ = _tmp19_.width; -#line 467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->requisition.width = ((CHECKERBOARD_ITEM_FRAME_WIDTH * 2) + (CHECKERBOARD_ITEM_BORDER_WIDTH * 2)) + _tmp20_; -#line 471 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp21_ = self->priv->pixbuf_dim; -#line 471 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp22_ = _tmp21_.height; -#line 471 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp23_ = title_height; -#line 471 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp24_ = comment_height; -#line 471 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp25_ = subtitle_height; -#line 471 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->requisition.height = (((((CHECKERBOARD_ITEM_FRAME_WIDTH * 2) + (CHECKERBOARD_ITEM_BORDER_WIDTH * 2)) + _tmp22_) + _tmp23_) + _tmp24_) + _tmp25_; -#line 480 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp26_ = old_requisition; -#line 480 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp27_ = dimensions_approx_equals (&self->requisition, &_tmp26_, 1); -#line 480 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!_tmp27_) { -#line 484 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + subtitle_height = _tmp11_; +#line 472 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp16_ = self->priv->pixbuf_dim; +#line 472 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp17_ = _tmp16_.width; +#line 472 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->requisition.width = ((CHECKERBOARD_ITEM_FRAME_WIDTH * 2) + (CHECKERBOARD_ITEM_BORDER_WIDTH * 2)) + _tmp17_; +#line 476 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp18_ = self->priv->pixbuf_dim; +#line 476 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp19_ = _tmp18_.height; +#line 476 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp20_ = title_height; +#line 476 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp21_ = comment_height; +#line 476 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp22_ = subtitle_height; +#line 476 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->requisition.height = (((((CHECKERBOARD_ITEM_FRAME_WIDTH * 2) + (CHECKERBOARD_ITEM_BORDER_WIDTH * 2)) + _tmp19_) + _tmp20_) + _tmp21_) + _tmp22_; +#line 485 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp23_ = old_requisition; +#line 485 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!dimensions_approx_equals (&self->requisition, &_tmp23_, 1)) { +#line 489 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_view_notify_geometry_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); -#line 3148 "CheckerboardLayout.c" +#line 3394 "CheckerboardLayout.c" } } -void checkerboard_item_get_border_dimensions (Dimensions* object_dim, gint border_width, Dimensions* result) { +void +checkerboard_item_get_border_dimensions (Dimensions* object_dim, + gint border_width, + Dimensions* result) +{ Dimensions dimensions = {0}; Dimensions _tmp0_; gint _tmp1_; - gint _tmp2_; - Dimensions _tmp3_; - gint _tmp4_; - gint _tmp5_; -#line 488 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + Dimensions _tmp2_; + gint _tmp3_; +#line 493 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (object_dim != NULL); -#line 489 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 494 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" dimensions_init (&dimensions, 0, 0); -#line 490 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 495 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = *object_dim; -#line 490 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 495 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = _tmp0_.width; -#line 490 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = border_width; -#line 490 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - dimensions.width = _tmp1_ + (_tmp2_ * 2); -#line 491 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = *object_dim; -#line 491 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = _tmp3_.height; -#line 491 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = border_width; -#line 491 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - dimensions.height = _tmp4_ + (_tmp5_ * 2); -#line 492 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 495 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + dimensions.width = _tmp1_ + (border_width * 2); +#line 496 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = *object_dim; +#line 496 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = _tmp2_.height; +#line 496 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + dimensions.height = _tmp3_ + (border_width * 2); +#line 497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" *result = dimensions; -#line 492 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 3185 "CheckerboardLayout.c" +#line 3429 "CheckerboardLayout.c" } -void checkerboard_item_get_border_origin (GdkPoint* object_origin, gint border_width, GdkPoint* result) { +void +checkerboard_item_get_border_origin (GdkPoint* object_origin, + gint border_width, + GdkPoint* result) +{ GdkPoint origin = {0}; GdkPoint _tmp0_; gint _tmp1_; - gint _tmp2_; - GdkPoint _tmp3_; - gint _tmp4_; - gint _tmp5_; -#line 495 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GdkPoint _tmp2_; + gint _tmp3_; +#line 500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (object_origin != NULL); -#line 496 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 501 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" memset (&origin, 0, sizeof (GdkPoint)); -#line 497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 502 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = *object_origin; -#line 497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 502 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = _tmp0_.x; -#line 497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = border_width; -#line 497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - origin.x = _tmp1_ - _tmp2_; -#line 498 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = *object_origin; -#line 498 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = _tmp3_.y; -#line 498 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = border_width; -#line 498 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - origin.y = _tmp4_ - _tmp5_; -#line 499 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 502 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + origin.x = _tmp1_ - border_width; +#line 503 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = *object_origin; +#line 503 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = _tmp2_.y; +#line 503 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + origin.y = _tmp3_ - border_width; +#line 504 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" *result = origin; -#line 499 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 504 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 3221 "CheckerboardLayout.c" +#line 3463 "CheckerboardLayout.c" } -static void checkerboard_item_real_paint_shadow (CheckerboardItem* self, cairo_t* ctx, Dimensions* dimensions, GdkPoint* origin, gint radius, gfloat initial_alpha) { +static void +checkerboard_item_real_paint_shadow (CheckerboardItem* self, + cairo_t* ctx, + Dimensions* dimensions, + GdkPoint* origin, + gint radius, + gfloat initial_alpha) +{ gdouble rgb_all = 0.0; - cairo_t* _tmp0_; - GdkPoint _tmp1_; - gint _tmp2_; - Dimensions _tmp3_; - gint _tmp4_; - GdkPoint _tmp5_; - gint _tmp6_; + GdkPoint _tmp0_; + gint _tmp1_; + Dimensions _tmp2_; + gint _tmp3_; + GdkPoint _tmp4_; + gint _tmp5_; + GdkPoint _tmp6_; gint _tmp7_; - gint _tmp8_; - gfloat _tmp9_; - cairo_t* _tmp10_; - GdkPoint _tmp11_; - gint _tmp12_; - Dimensions _tmp13_; - gint _tmp14_; - GdkPoint _tmp15_; - gint _tmp16_; - Dimensions _tmp17_; - gint _tmp18_; + Dimensions _tmp8_; + gint _tmp9_; + GdkPoint _tmp10_; + gint _tmp11_; + Dimensions _tmp12_; + gint _tmp13_; + GdkPoint _tmp14_; + gint _tmp15_; + GdkPoint _tmp16_; + gint _tmp17_; + Dimensions _tmp18_; gint _tmp19_; - gfloat _tmp20_; - cairo_t* _tmp21_; - GdkPoint _tmp22_; - gint _tmp23_; - gint _tmp24_; - GdkPoint _tmp25_; - gint _tmp26_; - Dimensions _tmp27_; - gint _tmp28_; - gint _tmp29_; - gfloat _tmp30_; cairo_pattern_t* lr = NULL; + GdkPoint _tmp20_; + gint _tmp21_; + Dimensions _tmp22_; + gint _tmp23_; + GdkPoint _tmp24_; + gint _tmp25_; + Dimensions _tmp26_; + gint _tmp27_; + cairo_pattern_t* _tmp28_; + GdkPoint _tmp29_; + gint _tmp30_; GdkPoint _tmp31_; gint _tmp32_; Dimensions _tmp33_; gint _tmp34_; - GdkPoint _tmp35_; + Dimensions _tmp35_; gint _tmp36_; - Dimensions _tmp37_; + cairo_pattern_t* td = NULL; + GdkPoint _tmp37_; gint _tmp38_; - gint _tmp39_; - cairo_pattern_t* _tmp40_; - gfloat _tmp41_; - cairo_t* _tmp42_; - cairo_t* _tmp43_; - GdkPoint _tmp44_; - gint _tmp45_; - gint _tmp46_; - GdkPoint _tmp47_; - gint _tmp48_; - Dimensions _tmp49_; - gint _tmp50_; - Dimensions _tmp51_; - gint _tmp52_; + Dimensions _tmp39_; + gint _tmp40_; + GdkPoint _tmp41_; + gint _tmp42_; + Dimensions _tmp43_; + gint _tmp44_; + cairo_pattern_t* _tmp45_; + GdkPoint _tmp46_; + gint _tmp47_; + Dimensions _tmp48_; + gint _tmp49_; + GdkPoint _tmp50_; + gint _tmp51_; + Dimensions _tmp52_; gint _tmp53_; - gint _tmp54_; - cairo_t* _tmp55_; - cairo_pattern_t* td = NULL; - GdkPoint _tmp56_; - gint _tmp57_; - Dimensions _tmp58_; - gint _tmp59_; - GdkPoint _tmp60_; - gint _tmp61_; - Dimensions _tmp62_; - gint _tmp63_; - gint _tmp64_; - cairo_pattern_t* _tmp65_; - gfloat _tmp66_; - cairo_t* _tmp67_; - cairo_t* _tmp68_; - GdkPoint _tmp69_; - gint _tmp70_; - Dimensions _tmp71_; - gint _tmp72_; - GdkPoint _tmp73_; - gint _tmp74_; - gint _tmp75_; - gint _tmp76_; - Dimensions _tmp77_; - gint _tmp78_; - gint _tmp79_; - cairo_t* _tmp80_; -#line 502 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 507 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (ctx != NULL); -#line 502 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 507 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (dimensions != NULL); -#line 502 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 507 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (origin != NULL); -#line 504 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" rgb_all = 0.0; -#line 507 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = ctx; -#line 507 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = *origin; -#line 507 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = _tmp1_.x; -#line 507 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = *dimensions; -#line 507 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = _tmp3_.width; -#line 507 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = *origin; -#line 507 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = _tmp5_.y; -#line 507 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = radius; -#line 507 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = radius; -#line 507 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = initial_alpha; -#line 507 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_paint_shadow_in_corner (self, _tmp0_, _tmp2_ + _tmp4_, _tmp6_ + _tmp7_, rgb_all, (gfloat) _tmp8_, _tmp9_, (-0.5) * G_PI, (gdouble) 0); -#line 510 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = ctx; -#line 510 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = *origin; -#line 510 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = _tmp11_.x; -#line 510 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = *dimensions; -#line 510 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = _tmp13_.width; -#line 510 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp15_ = *origin; -#line 510 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp16_ = _tmp15_.y; -#line 510 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp17_ = *dimensions; -#line 510 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp18_ = _tmp17_.height; -#line 510 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp19_ = radius; -#line 510 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp20_ = initial_alpha; -#line 510 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_paint_shadow_in_corner (self, _tmp10_, _tmp12_ + _tmp14_, _tmp16_ + _tmp18_, rgb_all, (gfloat) _tmp19_, _tmp20_, (gdouble) 0, 0.5 * G_PI); -#line 513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp21_ = ctx; -#line 513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp22_ = *origin; -#line 513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp23_ = _tmp22_.x; -#line 513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp24_ = radius; -#line 513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp25_ = *origin; -#line 513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp26_ = _tmp25_.y; -#line 513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp27_ = *dimensions; -#line 513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp28_ = _tmp27_.height; -#line 513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp29_ = radius; -#line 513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp30_ = initial_alpha; -#line 513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_paint_shadow_in_corner (self, _tmp21_, _tmp23_ + _tmp24_, _tmp26_ + _tmp28_, rgb_all, (gfloat) _tmp29_, _tmp30_, 0.5 * G_PI, G_PI); -#line 517 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp31_ = *origin; -#line 517 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp32_ = _tmp31_.y; -#line 517 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp33_ = *dimensions; -#line 517 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp34_ = _tmp33_.height; -#line 517 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp35_ = *origin; -#line 517 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp36_ = _tmp35_.y; -#line 517 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp37_ = *dimensions; -#line 517 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp38_ = _tmp37_.height; -#line 517 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp39_ = radius; -#line 517 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp40_ = cairo_pattern_create_linear ((gdouble) 0, (gdouble) (_tmp32_ + _tmp34_), (gdouble) 0, (gdouble) ((_tmp36_ + _tmp38_) + _tmp39_)); -#line 517 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - lr = _tmp40_; -#line 519 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp41_ = initial_alpha; -#line 519 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_pattern_add_color_stop_rgba (lr, 0.0, rgb_all, rgb_all, rgb_all, (gdouble) _tmp41_); -#line 520 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_pattern_add_color_stop_rgba (lr, 1.0, rgb_all, rgb_all, rgb_all, 0.0); -#line 521 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp42_ = ctx; -#line 521 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_set_source (_tmp42_, lr); -#line 522 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp43_ = ctx; -#line 522 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp44_ = *origin; -#line 522 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp45_ = _tmp44_.x; +#line 512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = *origin; +#line 512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1_ = _tmp0_.x; +#line 512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = *dimensions; +#line 512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = _tmp2_.width; +#line 512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = *origin; +#line 512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = _tmp4_.y; +#line 512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_item_paint_shadow_in_corner (self, ctx, _tmp1_ + _tmp3_, _tmp5_ + radius, rgb_all, (gfloat) radius, initial_alpha, (-0.5) * G_PI, (gdouble) 0); +#line 515 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp6_ = *origin; +#line 515 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp7_ = _tmp6_.x; +#line 515 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp8_ = *dimensions; +#line 515 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp9_ = _tmp8_.width; +#line 515 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp10_ = *origin; +#line 515 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp11_ = _tmp10_.y; +#line 515 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp12_ = *dimensions; +#line 515 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp13_ = _tmp12_.height; +#line 515 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_item_paint_shadow_in_corner (self, ctx, _tmp7_ + _tmp9_, _tmp11_ + _tmp13_, rgb_all, (gfloat) radius, initial_alpha, (gdouble) 0, 0.5 * G_PI); +#line 518 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp14_ = *origin; +#line 518 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp15_ = _tmp14_.x; +#line 518 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp16_ = *origin; +#line 518 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp17_ = _tmp16_.y; +#line 518 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp18_ = *dimensions; +#line 518 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp19_ = _tmp18_.height; +#line 518 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_item_paint_shadow_in_corner (self, ctx, _tmp15_ + radius, _tmp17_ + _tmp19_, rgb_all, (gfloat) radius, initial_alpha, 0.5 * G_PI, G_PI); #line 522 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp46_ = radius; + _tmp20_ = *origin; #line 522 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp47_ = *origin; + _tmp21_ = _tmp20_.y; #line 522 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp48_ = _tmp47_.y; + _tmp22_ = *dimensions; #line 522 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp49_ = *dimensions; + _tmp23_ = _tmp22_.height; #line 522 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp50_ = _tmp49_.height; + _tmp24_ = *origin; #line 522 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp51_ = *dimensions; + _tmp25_ = _tmp24_.y; #line 522 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp52_ = _tmp51_.width; + _tmp26_ = *dimensions; #line 522 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp53_ = radius; + _tmp27_ = _tmp26_.height; #line 522 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp54_ = radius; + _tmp28_ = cairo_pattern_create_linear ((gdouble) 0, (gdouble) (_tmp21_ + _tmp23_), (gdouble) 0, (gdouble) ((_tmp25_ + _tmp27_) + radius)); #line 522 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_rectangle (_tmp43_, (gdouble) (_tmp45_ + _tmp46_), (gdouble) (_tmp48_ + _tmp50_), (gdouble) (_tmp52_ - _tmp53_), (gdouble) _tmp54_); -#line 523 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp55_ = ctx; -#line 523 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_fill (_tmp55_); -#line 526 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp56_ = *origin; -#line 526 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp57_ = _tmp56_.x; -#line 526 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp58_ = *dimensions; -#line 526 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp59_ = _tmp58_.width; -#line 526 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp60_ = *origin; -#line 526 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp61_ = _tmp60_.x; -#line 526 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp62_ = *dimensions; -#line 526 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp63_ = _tmp62_.width; -#line 526 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp64_ = radius; -#line 526 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp65_ = cairo_pattern_create_linear ((gdouble) (_tmp57_ + _tmp59_), (gdouble) 0, (gdouble) ((_tmp61_ + _tmp63_) + _tmp64_), (gdouble) 0); + lr = _tmp28_; +#line 524 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_pattern_add_color_stop_rgba (lr, 0.0, rgb_all, rgb_all, rgb_all, (gdouble) initial_alpha); +#line 525 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_pattern_add_color_stop_rgba (lr, 1.0, rgb_all, rgb_all, rgb_all, 0.0); #line 526 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - td = _tmp65_; -#line 528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp66_ = initial_alpha; + cairo_set_source (ctx, lr); +#line 527 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp29_ = *origin; +#line 527 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp30_ = _tmp29_.x; +#line 527 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp31_ = *origin; +#line 527 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp32_ = _tmp31_.y; +#line 527 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp33_ = *dimensions; +#line 527 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp34_ = _tmp33_.height; +#line 527 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp35_ = *dimensions; +#line 527 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp36_ = _tmp35_.width; +#line 527 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_rectangle (ctx, (gdouble) (_tmp30_ + radius), (gdouble) (_tmp32_ + _tmp34_), (gdouble) (_tmp36_ - radius), (gdouble) radius); #line 528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_pattern_add_color_stop_rgba (td, 0.0, rgb_all, rgb_all, rgb_all, (gdouble) _tmp66_); -#line 529 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_pattern_add_color_stop_rgba (td, 1.0, rgb_all, rgb_all, rgb_all, 0.0); -#line 530 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp67_ = ctx; -#line 530 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_set_source (_tmp67_, td); -#line 531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp68_ = ctx; -#line 531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp69_ = *origin; -#line 531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp70_ = _tmp69_.x; + cairo_fill (ctx); #line 531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp71_ = *dimensions; + _tmp37_ = *origin; #line 531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp72_ = _tmp71_.width; + _tmp38_ = _tmp37_.x; #line 531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp73_ = *origin; + _tmp39_ = *dimensions; #line 531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp74_ = _tmp73_.y; + _tmp40_ = _tmp39_.width; #line 531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp75_ = radius; + _tmp41_ = *origin; #line 531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp76_ = radius; + _tmp42_ = _tmp41_.x; #line 531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp77_ = *dimensions; + _tmp43_ = *dimensions; #line 531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp78_ = _tmp77_.height; + _tmp44_ = _tmp43_.width; #line 531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp79_ = radius; + _tmp45_ = cairo_pattern_create_linear ((gdouble) (_tmp38_ + _tmp40_), (gdouble) 0, (gdouble) ((_tmp42_ + _tmp44_) + radius), (gdouble) 0); #line 531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_rectangle (_tmp68_, (gdouble) (_tmp70_ + _tmp72_), (gdouble) (_tmp74_ + _tmp75_), (gdouble) _tmp76_, (gdouble) (_tmp78_ - _tmp79_)); + td = _tmp45_; #line 533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp80_ = ctx; -#line 533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_fill (_tmp80_); -#line 502 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_pattern_add_color_stop_rgba (td, 0.0, rgb_all, rgb_all, rgb_all, (gdouble) initial_alpha); +#line 534 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_pattern_add_color_stop_rgba (td, 1.0, rgb_all, rgb_all, rgb_all, 0.0); +#line 535 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_set_source (ctx, td); +#line 536 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp46_ = *origin; +#line 536 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp47_ = _tmp46_.x; +#line 536 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp48_ = *dimensions; +#line 536 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp49_ = _tmp48_.width; +#line 536 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp50_ = *origin; +#line 536 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp51_ = _tmp50_.y; +#line 536 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp52_ = *dimensions; +#line 536 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp53_ = _tmp52_.height; +#line 536 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_rectangle (ctx, (gdouble) (_tmp47_ + _tmp49_), (gdouble) (_tmp51_ + radius), (gdouble) radius, (gdouble) (_tmp53_ - radius)); +#line 538 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_fill (ctx); +#line 507 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _cairo_pattern_destroy0 (td); -#line 502 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 507 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _cairo_pattern_destroy0 (lr); -#line 3514 "CheckerboardLayout.c" +#line 3682 "CheckerboardLayout.c" } -void checkerboard_item_paint_shadow (CheckerboardItem* self, cairo_t* ctx, Dimensions* dimensions, GdkPoint* origin, gint radius, gfloat initial_alpha) { -#line 502 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +void +checkerboard_item_paint_shadow (CheckerboardItem* self, + cairo_t* ctx, + Dimensions* dimensions, + GdkPoint* origin, + gint radius, + gfloat initial_alpha) +{ +#line 507 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 502 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 507 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" CHECKERBOARD_ITEM_GET_CLASS (self)->paint_shadow (self, ctx, dimensions, origin, radius, initial_alpha); -#line 3523 "CheckerboardLayout.c" +#line 3698 "CheckerboardLayout.c" } -void checkerboard_item_paint_shadow_in_corner (CheckerboardItem* self, cairo_t* ctx, gint x, gint y, gdouble rgb_all, gfloat radius, gfloat initial_alpha, gdouble arc1, gdouble arc2) { +void +checkerboard_item_paint_shadow_in_corner (CheckerboardItem* self, + cairo_t* ctx, + gint x, + gint y, + gdouble rgb_all, + gfloat radius, + gfloat initial_alpha, + gdouble arc1, + gdouble arc2) +{ cairo_pattern_t* p = NULL; - gint _tmp0_; - gint _tmp1_; - gint _tmp2_; - gint _tmp3_; - gfloat _tmp4_; - cairo_pattern_t* _tmp5_; - gdouble _tmp6_; - gdouble _tmp7_; - gdouble _tmp8_; - gfloat _tmp9_; - gdouble _tmp10_; - gdouble _tmp11_; - gdouble _tmp12_; - cairo_t* _tmp13_; - cairo_t* _tmp14_; - gint _tmp15_; - gint _tmp16_; - cairo_t* _tmp17_; - gint _tmp18_; - gint _tmp19_; - gfloat _tmp20_; - gdouble _tmp21_; - gdouble _tmp22_; - cairo_t* _tmp23_; - cairo_t* _tmp24_; -#line 536 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 536 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_return_if_fail (ctx != NULL); -#line 538 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = x; -#line 538 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = y; -#line 538 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = x; -#line 538 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = y; -#line 538 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = radius; -#line 538 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = cairo_pattern_create_radial ((gdouble) _tmp0_, (gdouble) _tmp1_, (gdouble) 0, (gdouble) _tmp2_, (gdouble) _tmp3_, (gdouble) _tmp4_); -#line 538 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - p = _tmp5_; -#line 539 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = rgb_all; -#line 539 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = rgb_all; -#line 539 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = rgb_all; -#line 539 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = initial_alpha; -#line 539 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_pattern_add_color_stop_rgba (p, 0.0, _tmp6_, _tmp7_, _tmp8_, (gdouble) _tmp9_); -#line 540 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = rgb_all; -#line 540 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = rgb_all; -#line 540 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = rgb_all; -#line 540 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_pattern_add_color_stop_rgba (p, 1.0, _tmp10_, _tmp11_, _tmp12_, (gdouble) 0); + cairo_pattern_t* _tmp0_; #line 541 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = ctx; + g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); #line 541 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_set_source (_tmp13_, p); -#line 542 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = ctx; -#line 542 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp15_ = x; -#line 542 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp16_ = y; -#line 542 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_move_to (_tmp14_, (gdouble) _tmp15_, (gdouble) _tmp16_); -#line 543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp17_ = ctx; -#line 543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp18_ = x; -#line 543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp19_ = y; -#line 543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp20_ = radius; -#line 543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp21_ = arc1; + g_return_if_fail (ctx != NULL); #line 543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp22_ = arc2; + _tmp0_ = cairo_pattern_create_radial ((gdouble) x, (gdouble) y, (gdouble) 0, (gdouble) x, (gdouble) y, (gdouble) radius); #line 543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_arc (_tmp17_, (gdouble) _tmp18_, (gdouble) _tmp19_, (gdouble) _tmp20_, _tmp21_, _tmp22_); + p = _tmp0_; #line 544 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp23_ = ctx; -#line 544 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_close_path (_tmp23_); -#line 545 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp24_ = ctx; + cairo_pattern_add_color_stop_rgba (p, 0.0, rgb_all, rgb_all, rgb_all, (gdouble) initial_alpha); #line 545 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_fill (_tmp24_); -#line 536 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_pattern_add_color_stop_rgba (p, 1.0, rgb_all, rgb_all, rgb_all, (gdouble) 0); +#line 546 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_set_source (ctx, p); +#line 547 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_move_to (ctx, (gdouble) x, (gdouble) y); +#line 548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_arc (ctx, (gdouble) x, (gdouble) y, (gdouble) radius, arc1, arc2); +#line 549 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_close_path (ctx); +#line 550 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_fill (ctx); +#line 541 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _cairo_pattern_destroy0 (p); -#line 3626 "CheckerboardLayout.c" +#line 3739 "CheckerboardLayout.c" } -static void checkerboard_item_real_paint_border (CheckerboardItem* self, cairo_t* ctx, Dimensions* object_dimensions, GdkPoint* object_origin, gint border_width) { - gint _tmp0_; -#line 548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +checkerboard_item_real_paint_border (CheckerboardItem* self, + cairo_t* ctx, + Dimensions* object_dimensions, + GdkPoint* object_origin, + gint border_width) +{ +#line 553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (ctx != NULL); -#line 548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (object_dimensions != NULL); -#line 548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (object_origin != NULL); -#line 550 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = border_width; -#line 550 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp0_ == 1) { -#line 3642 "CheckerboardLayout.c" - cairo_t* _tmp1_; +#line 555 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (border_width == 1) { +#line 3758 "CheckerboardLayout.c" + GdkPoint _tmp0_; + gint _tmp1_; GdkPoint _tmp2_; gint _tmp3_; - gint _tmp4_; - GdkPoint _tmp5_; - gint _tmp6_; + Dimensions _tmp4_; + gint _tmp5_; + Dimensions _tmp6_; gint _tmp7_; - Dimensions _tmp8_; - gint _tmp9_; - gint _tmp10_; - Dimensions _tmp11_; - gint _tmp12_; - gint _tmp13_; - cairo_t* _tmp14_; -#line 551 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = ctx; -#line 551 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 556 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = *object_origin; +#line 556 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1_ = _tmp0_.x; +#line 556 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = *object_origin; -#line 551 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = _tmp2_.x; -#line 551 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = border_width; -#line 551 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = *object_origin; -#line 551 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = _tmp5_.y; -#line 551 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = border_width; -#line 551 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = *object_dimensions; -#line 551 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = _tmp8_.width; -#line 551 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = border_width; -#line 551 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = *object_dimensions; -#line 551 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = _tmp11_.height; -#line 551 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = border_width; -#line 551 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_rectangle (_tmp1_, (gdouble) (_tmp3_ - _tmp4_), (gdouble) (_tmp6_ - _tmp7_), (gdouble) (_tmp9_ + (_tmp10_ * 2)), (gdouble) (_tmp12_ + (_tmp13_ * 2))); -#line 554 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = ctx; -#line 554 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_fill (_tmp14_); -#line 3689 "CheckerboardLayout.c" - } else { - Dimensions dimensions = {0}; - Dimensions _tmp15_; - gint _tmp16_; - Dimensions _tmp17_ = {0}; - GdkPoint origin = {0}; - GdkPoint _tmp18_; - gint _tmp19_; - GdkPoint _tmp20_ = {0}; - gdouble scale = 0.0; - Dimensions _tmp21_; - gint _tmp22_; - Dimensions _tmp23_; - gint _tmp24_; - gint _tmp25_; - cairo_t* _tmp26_; - Dimensions _tmp27_; - GdkPoint _tmp28_; - gdouble _tmp29_; #line 556 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp15_ = *object_dimensions; + _tmp3_ = _tmp2_.y; #line 556 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp16_ = border_width; + _tmp4_ = *object_dimensions; #line 556 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_get_border_dimensions (&_tmp15_, _tmp16_, &_tmp17_); + _tmp5_ = _tmp4_.width; #line 556 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - dimensions = _tmp17_; -#line 557 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp18_ = *object_origin; -#line 557 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp19_ = border_width; -#line 557 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_get_border_origin (&_tmp18_, _tmp19_, &_tmp20_); -#line 557 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - origin = _tmp20_; -#line 560 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp21_ = *object_dimensions; -#line 560 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp22_ = _tmp21_.width; -#line 560 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp23_ = *object_dimensions; -#line 560 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp24_ = _tmp23_.height; -#line 560 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp25_ = MAX (_tmp22_, _tmp24_); -#line 560 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - scale = (gdouble) _tmp25_; -#line 561 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp26_ = ctx; -#line 561 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp27_ = dimensions; + _tmp6_ = *object_dimensions; +#line 556 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp7_ = _tmp6_.height; +#line 556 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_rectangle (ctx, (gdouble) (_tmp1_ - border_width), (gdouble) (_tmp3_ - border_width), (gdouble) (_tmp5_ + (border_width * 2)), (gdouble) (_tmp7_ + (border_width * 2))); +#line 559 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_fill (ctx); +#line 3787 "CheckerboardLayout.c" + } else { + Dimensions dimensions = {0}; + Dimensions _tmp8_; + Dimensions _tmp9_ = {0}; + GdkPoint origin = {0}; + GdkPoint _tmp10_; + GdkPoint _tmp11_ = {0}; + gdouble scale = 0.0; + Dimensions _tmp12_; + gint _tmp13_; + Dimensions _tmp14_; + gint _tmp15_; + Dimensions _tmp16_; + GdkPoint _tmp17_; + gdouble _tmp18_; #line 561 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp28_ = origin; + _tmp8_ = *object_dimensions; #line 561 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp29_ = scale; + checkerboard_item_get_border_dimensions (&_tmp8_, border_width, &_tmp9_); #line 561 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - draw_rounded_corners_filled (_tmp26_, &_tmp27_, &_tmp28_, 0.25 * _tmp29_); -#line 3747 "CheckerboardLayout.c" + dimensions = _tmp9_; +#line 562 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp10_ = *object_origin; +#line 562 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_item_get_border_origin (&_tmp10_, border_width, &_tmp11_); +#line 562 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + origin = _tmp11_; +#line 565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp12_ = *object_dimensions; +#line 565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp13_ = _tmp12_.width; +#line 565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp14_ = *object_dimensions; +#line 565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp15_ = _tmp14_.height; +#line 565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + scale = (gdouble) MAX (_tmp13_, _tmp15_); +#line 566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp16_ = dimensions; +#line 566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp17_ = origin; +#line 566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp18_ = scale; +#line 566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + draw_rounded_corners_filled (ctx, &_tmp16_, &_tmp17_, 0.25 * _tmp18_); +#line 3833 "CheckerboardLayout.c" } } -void checkerboard_item_paint_border (CheckerboardItem* self, cairo_t* ctx, Dimensions* object_dimensions, GdkPoint* object_origin, gint border_width) { -#line 548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +void +checkerboard_item_paint_border (CheckerboardItem* self, + cairo_t* ctx, + Dimensions* object_dimensions, + GdkPoint* object_origin, + gint border_width) +{ +#line 553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" CHECKERBOARD_ITEM_GET_CLASS (self)->paint_border (self, ctx, object_dimensions, object_origin, border_width); -#line 3757 "CheckerboardLayout.c" +#line 3849 "CheckerboardLayout.c" } -static void checkerboard_item_real_paint_image (CheckerboardItem* self, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin) { - cairo_t* _tmp0_; - GdkPixbuf* _tmp1_; +static void +checkerboard_item_real_paint_image (CheckerboardItem* self, + cairo_t* ctx, + GdkPixbuf* pixbuf, + GdkPoint* origin) +{ + GdkPoint _tmp0_; + gint _tmp1_; GdkPoint _tmp2_; gint _tmp3_; - GdkPoint _tmp4_; - gint _tmp5_; -#line 565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (ctx != NULL); -#line 565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); -#line 565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (origin != NULL); -#line 566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = ctx; -#line 566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = pixbuf; -#line 566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 571 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = *origin; +#line 571 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1_ = _tmp0_.x; +#line 571 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = *origin; -#line 566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = _tmp2_.x; -#line 566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = *origin; -#line 566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = _tmp4_.y; -#line 566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - paint_pixmap_with_background (_tmp0_, _tmp1_, _tmp3_, _tmp5_); -#line 3788 "CheckerboardLayout.c" +#line 571 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = _tmp2_.y; +#line 571 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + paint_pixmap_with_background (ctx, pixbuf, _tmp1_, _tmp3_); +#line 3879 "CheckerboardLayout.c" } -void checkerboard_item_paint_image (CheckerboardItem* self, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin) { -#line 565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +void +checkerboard_item_paint_image (CheckerboardItem* self, + cairo_t* ctx, + GdkPixbuf* pixbuf, + GdkPoint* origin) +{ +#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" CHECKERBOARD_ITEM_GET_CLASS (self)->paint_image (self, ctx, pixbuf, origin); -#line 3797 "CheckerboardLayout.c" +#line 3893 "CheckerboardLayout.c" } -static gint checkerboard_item_get_selection_border_width (CheckerboardItem* self, gint scale) { +static gint +checkerboard_item_get_selection_border_width (CheckerboardItem* self, + gint scale) +{ gint result = 0; gint _tmp0_ = 0; gint _tmp1_; gint _tmp2_; gint _tmp3_; gint _tmp4_; - gint _tmp5_; -#line 569 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 574 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), 0); -#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = scale; -#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = thumbnail_get_MIN_SCALE (); -#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = _tmp2_; -#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = thumbnail_get_MAX_SCALE (); -#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = _tmp4_; -#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp1_ <= ((_tmp3_ + _tmp5_) / 3)) { -#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1_ = thumbnail_get_MIN_SCALE (); +#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = _tmp1_; +#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = thumbnail_get_MAX_SCALE (); +#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = _tmp3_; +#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (scale <= ((_tmp2_ + _tmp4_) / 3)) { +#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = 2; -#line 3825 "CheckerboardLayout.c" +#line 3921 "CheckerboardLayout.c" } else { -#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = 3; -#line 3829 "CheckerboardLayout.c" +#line 3925 "CheckerboardLayout.c" } -#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = _tmp0_ + CHECKERBOARD_ITEM_BORDER_WIDTH; -#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 3835 "CheckerboardLayout.c" +#line 3931 "CheckerboardLayout.c" } -static GdkPixbuf* checkerboard_item_real_get_top_left_trinket (CheckerboardItem* self, gint scale) { +static GdkPixbuf* +checkerboard_item_real_get_top_left_trinket (CheckerboardItem* self, + gint scale) +{ GdkPixbuf* result = NULL; -#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 580 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = NULL; -#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 580 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 3845 "CheckerboardLayout.c" +#line 3944 "CheckerboardLayout.c" } -GdkPixbuf* checkerboard_item_get_top_left_trinket (CheckerboardItem* self, gint scale) { -#line 574 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +GdkPixbuf* +checkerboard_item_get_top_left_trinket (CheckerboardItem* self, + gint scale) +{ +#line 579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL); -#line 574 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return CHECKERBOARD_ITEM_GET_CLASS (self)->get_top_left_trinket (self, scale); -#line 3854 "CheckerboardLayout.c" +#line 3956 "CheckerboardLayout.c" } -static GdkPixbuf* checkerboard_item_real_get_top_right_trinket (CheckerboardItem* self, gint scale) { +static GdkPixbuf* +checkerboard_item_real_get_top_right_trinket (CheckerboardItem* self, + gint scale) +{ GdkPixbuf* result = NULL; -#line 579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 584 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = NULL; -#line 579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 584 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 3864 "CheckerboardLayout.c" +#line 3969 "CheckerboardLayout.c" } -GdkPixbuf* checkerboard_item_get_top_right_trinket (CheckerboardItem* self, gint scale) { -#line 578 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +GdkPixbuf* +checkerboard_item_get_top_right_trinket (CheckerboardItem* self, + gint scale) +{ +#line 583 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL); -#line 578 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 583 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return CHECKERBOARD_ITEM_GET_CLASS (self)->get_top_right_trinket (self, scale); -#line 3873 "CheckerboardLayout.c" +#line 3981 "CheckerboardLayout.c" } -static GdkPixbuf* checkerboard_item_real_get_bottom_left_trinket (CheckerboardItem* self, gint scale) { +static GdkPixbuf* +checkerboard_item_real_get_bottom_left_trinket (CheckerboardItem* self, + gint scale) +{ GdkPixbuf* result = NULL; -#line 583 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 588 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = NULL; -#line 583 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 588 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 3883 "CheckerboardLayout.c" +#line 3994 "CheckerboardLayout.c" } -GdkPixbuf* checkerboard_item_get_bottom_left_trinket (CheckerboardItem* self, gint scale) { -#line 582 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +GdkPixbuf* +checkerboard_item_get_bottom_left_trinket (CheckerboardItem* self, + gint scale) +{ +#line 587 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL); -#line 582 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 587 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return CHECKERBOARD_ITEM_GET_CLASS (self)->get_bottom_left_trinket (self, scale); -#line 3892 "CheckerboardLayout.c" +#line 4006 "CheckerboardLayout.c" } -static GdkPixbuf* checkerboard_item_real_get_bottom_right_trinket (CheckerboardItem* self, gint scale) { +static GdkPixbuf* +checkerboard_item_real_get_bottom_right_trinket (CheckerboardItem* self, + gint scale) +{ GdkPixbuf* result = NULL; -#line 587 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 592 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = NULL; -#line 587 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 592 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 3902 "CheckerboardLayout.c" +#line 4019 "CheckerboardLayout.c" } -GdkPixbuf* checkerboard_item_get_bottom_right_trinket (CheckerboardItem* self, gint scale) { -#line 586 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +GdkPixbuf* +checkerboard_item_get_bottom_right_trinket (CheckerboardItem* self, + gint scale) +{ +#line 591 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL); -#line 586 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 591 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return CHECKERBOARD_ITEM_GET_CLASS (self)->get_bottom_right_trinket (self, scale); -#line 3911 "CheckerboardLayout.c" +#line 4031 "CheckerboardLayout.c" } -void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_color, GdkRGBA* selected_color, GdkRGBA* text_color, GdkRGBA* border_color) { - GdkPoint pixbuf_origin = {0}; +void +checkerboard_item_paint (CheckerboardItem* self, + cairo_t* ctx, + GdkRGBA* bg_color, + GdkRGBA* selected_color, + GdkRGBA* text_color, + GdkRGBA* border_color) +{ GdkRectangle _tmp0_; gint _tmp1_; GdkRectangle _tmp2_; gint _tmp3_; - cairo_t* _tmp4_; - cairo_t* _tmp5_; + GdkPoint pixbuf_origin = {0}; + GdkRGBA _tmp4_; + gdouble _tmp5_; GdkRGBA _tmp6_; gdouble _tmp7_; GdkRGBA _tmp8_; gdouble _tmp9_; GdkRGBA _tmp10_; gdouble _tmp11_; - GdkRGBA _tmp12_; - gdouble _tmp13_; - GdkRGBA* _tmp14_; - gboolean _tmp24_; - gboolean _tmp45_; - GdkRGBA* _tmp57_; - GdkPixbuf* _tmp72_; - cairo_t* _tmp87_; - GdkRGBA _tmp88_; - gdouble _tmp89_; - GdkRGBA _tmp90_; - gdouble _tmp91_; - GdkRGBA _tmp92_; - gdouble _tmp93_; - GdkRGBA _tmp94_; - gdouble _tmp95_; + gboolean _tmp18_; + GdkPixbuf* _tmp41_; + GdkRGBA _tmp52_; + gdouble _tmp53_; + GdkRGBA _tmp54_; + gdouble _tmp55_; + GdkRGBA _tmp56_; + gdouble _tmp57_; + GdkRGBA _tmp58_; + gdouble _tmp59_; gint text_y = 0; - GdkRectangle _tmp96_; - gint _tmp97_; - Dimensions _tmp98_; - gint _tmp99_; - gboolean _tmp100_ = FALSE; - CheckerboardItemText* _tmp101_; - gboolean _tmp130_ = FALSE; - CheckerboardItemText* _tmp131_; - gboolean _tmp160_ = FALSE; - CheckerboardItemText* _tmp161_; - cairo_t* _tmp187_; - GdkRGBA _tmp188_; - gdouble _tmp189_; - GdkRGBA _tmp190_; - gdouble _tmp191_; - GdkRGBA _tmp192_; - gdouble _tmp193_; - GdkRGBA _tmp194_; - gdouble _tmp195_; + Dimensions _tmp60_; + gint _tmp61_; + gboolean _tmp62_ = FALSE; + CheckerboardItemText* _tmp63_; + gboolean _tmp86_ = FALSE; + CheckerboardItemText* _tmp87_; + gboolean _tmp110_ = FALSE; + CheckerboardItemText* _tmp111_; + GdkRGBA _tmp132_; + gdouble _tmp133_; + GdkRGBA _tmp134_; + gdouble _tmp135_; + GdkRGBA _tmp136_; + gdouble _tmp137_; + GdkRGBA _tmp138_; + gdouble _tmp139_; GdkPixbuf* trinket = NULL; - GdkPixbuf* _tmp196_; - GdkPixbuf* _tmp197_; - GdkPixbuf* _tmp219_; - GdkPixbuf* _tmp220_; - GdkPixbuf* _tmp238_; - GdkPixbuf* _tmp239_; - GdkPixbuf* _tmp262_; - GdkPixbuf* _tmp263_; -#line 590 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GdkPixbuf* _tmp140_; + GdkPixbuf* _tmp141_; + GdkPixbuf* _tmp156_; + GdkPixbuf* _tmp157_; + GdkPixbuf* _tmp169_; + GdkPixbuf* _tmp170_; + GdkPixbuf* _tmp187_; + GdkPixbuf* _tmp188_; +#line 595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 590 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (ctx != NULL); -#line 590 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_return_if_fail (bg_color != NULL); -#line 590 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_return_if_fail (selected_color != NULL); -#line 590 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_return_if_fail (text_color != NULL); -#line 593 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - memset (&pixbuf_origin, 0, sizeof (GdkPoint)); -#line 594 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = self->allocation; -#line 594 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = _tmp0_.x; -#line 594 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - pixbuf_origin.x = (_tmp1_ + CHECKERBOARD_ITEM_FRAME_WIDTH) + CHECKERBOARD_ITEM_BORDER_WIDTH; #line 595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = self->allocation; + g_return_if_fail (bg_color != NULL); #line 595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = _tmp2_.y; + g_return_if_fail (selected_color != NULL); #line 595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - pixbuf_origin.y = (_tmp3_ + CHECKERBOARD_ITEM_FRAME_WIDTH) + CHECKERBOARD_ITEM_BORDER_WIDTH; -#line 597 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = ctx; + g_return_if_fail (text_color != NULL); #line 597 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_set_line_width (_tmp4_, (gdouble) CHECKERBOARD_ITEM_FRAME_WIDTH); -#line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = ctx; -#line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = *selected_color; -#line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = _tmp6_.red; + cairo_save (ctx); #line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = *selected_color; -#line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = _tmp8_.green; -#line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = *selected_color; + _tmp0_ = self->allocation; #line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = _tmp10_.blue; + _tmp1_ = _tmp0_.x; #line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = *selected_color; + _tmp2_ = self->allocation; #line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = _tmp12_.alpha; + _tmp3_ = _tmp2_.y; #line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_set_source_rgba (_tmp5_, _tmp7_, _tmp9_, _tmp11_, _tmp13_); -#line 602 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = border_color; + cairo_translate (ctx, (gdouble) (_tmp1_ + CHECKERBOARD_ITEM_FRAME_WIDTH), (gdouble) (_tmp3_ + CHECKERBOARD_ITEM_FRAME_WIDTH)); +#line 601 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + memset (&pixbuf_origin, 0, sizeof (GdkPoint)); #line 602 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp14_ != NULL) { -#line 4026 "CheckerboardLayout.c" - cairo_t* _tmp15_; - Dimensions shadow_dim = {0}; - Dimensions _tmp16_; - gint _tmp17_; - Dimensions _tmp18_; - gint _tmp19_; - cairo_t* _tmp20_; - Dimensions _tmp21_; - GdkPoint _tmp22_; - cairo_t* _tmp23_; + pixbuf_origin.x = CHECKERBOARD_ITEM_BORDER_WIDTH; #line 603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp15_ = ctx; -#line 603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_save (_tmp15_); -#line 604 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - dimensions_init (&shadow_dim, 0, 0); + pixbuf_origin.y = CHECKERBOARD_ITEM_BORDER_WIDTH; #line 605 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp16_ = self->priv->pixbuf_dim; -#line 605 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp17_ = _tmp16_.width; -#line 605 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - shadow_dim.width = _tmp17_ + CHECKERBOARD_ITEM_BORDER_WIDTH; + cairo_set_line_width (ctx, (gdouble) CHECKERBOARD_ITEM_FRAME_WIDTH); #line 606 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp18_ = self->priv->pixbuf_dim; + _tmp4_ = *selected_color; #line 606 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp19_ = _tmp18_.height; + _tmp5_ = _tmp4_.red; #line 606 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - shadow_dim.height = _tmp19_ + CHECKERBOARD_ITEM_BORDER_WIDTH; -#line 607 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp20_ = ctx; -#line 607 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp21_ = shadow_dim; -#line 607 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp22_ = pixbuf_origin; -#line 607 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_paint_shadow (self, _tmp20_, &_tmp21_, &_tmp22_, CHECKERBOARD_ITEM_SHADOW_RADIUS, CHECKERBOARD_ITEM_SHADOW_INITIAL_ALPHA); -#line 608 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp23_ = ctx; -#line 608 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_restore (_tmp23_); -#line 4067 "CheckerboardLayout.c" - } -#line 612 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp24_ = self->priv->is_cursor; -#line 612 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp24_) { -#line 4073 "CheckerboardLayout.c" - cairo_t* _tmp25_; - cairo_t* _tmp26_; - GdkRGBA* _tmp27_; - gdouble _tmp28_; - GdkRGBA* _tmp29_; - gdouble _tmp30_; - GdkRGBA* _tmp31_; - gdouble _tmp32_; - GdkRGBA* _tmp33_; - gdouble _tmp34_; - cairo_t* _tmp35_; - Dimensions _tmp36_; - GdkPoint _tmp37_; - Dimensions _tmp38_; - gint _tmp39_; - Dimensions _tmp40_; - gint _tmp41_; - gint _tmp42_; - gint _tmp43_; - cairo_t* _tmp44_; + _tmp6_ = *selected_color; +#line 606 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp7_ = _tmp6_.green; +#line 606 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp8_ = *selected_color; +#line 606 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp9_ = _tmp8_.blue; +#line 606 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp10_ = *selected_color; +#line 606 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp11_ = _tmp10_.alpha; +#line 606 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_set_source_rgba (ctx, _tmp5_, _tmp7_, _tmp9_, _tmp11_); +#line 610 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (border_color != NULL) { +#line 4142 "CheckerboardLayout.c" + Dimensions shadow_dim = {0}; + Dimensions _tmp12_; + gint _tmp13_; + Dimensions _tmp14_; + gint _tmp15_; + Dimensions _tmp16_; + GdkPoint _tmp17_; +#line 611 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_save (ctx); +#line 612 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + dimensions_init (&shadow_dim, 0, 0); #line 613 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp25_ = ctx; + _tmp12_ = self->priv->pixbuf_dim; #line 613 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_save (_tmp25_); -#line 614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp26_ = ctx; -#line 614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp27_ = border_color; -#line 614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp28_ = (*_tmp27_).red; -#line 614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp29_ = border_color; -#line 614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp30_ = (*_tmp29_).green; -#line 614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp31_ = border_color; -#line 614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp32_ = (*_tmp31_).blue; + _tmp13_ = _tmp12_.width; +#line 613 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + shadow_dim.width = _tmp13_ + CHECKERBOARD_ITEM_BORDER_WIDTH; #line 614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp33_ = border_color; + _tmp14_ = self->priv->pixbuf_dim; #line 614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp34_ = (*_tmp33_).alpha; + _tmp15_ = _tmp14_.height; #line 614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_set_source_rgba (_tmp26_, _tmp28_, _tmp30_, _tmp32_, _tmp34_); -#line 616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp35_ = ctx; -#line 616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp36_ = self->priv->pixbuf_dim; -#line 616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp37_ = pixbuf_origin; -#line 616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp38_ = self->priv->pixbuf_dim; -#line 616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp39_ = _tmp38_.width; -#line 616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp40_ = self->priv->pixbuf_dim; -#line 616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp41_ = _tmp40_.height; -#line 616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp42_ = MAX (_tmp39_, _tmp41_); -#line 616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp43_ = checkerboard_item_get_selection_border_width (self, _tmp42_); + shadow_dim.height = _tmp15_ + CHECKERBOARD_ITEM_BORDER_WIDTH; +#line 615 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp16_ = shadow_dim; +#line 615 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp17_ = pixbuf_origin; +#line 615 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_item_paint_shadow (self, ctx, &_tmp16_, &_tmp17_, CHECKERBOARD_ITEM_SHADOW_RADIUS, CHECKERBOARD_ITEM_SHADOW_INITIAL_ALPHA); #line 616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_paint_border (self, _tmp35_, &_tmp36_, &_tmp37_, _tmp43_); -#line 618 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp44_ = ctx; -#line 618 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_restore (_tmp44_); -#line 4142 "CheckerboardLayout.c" + cairo_restore (ctx); +#line 4174 "CheckerboardLayout.c" } +#line 620 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp18_ = self->priv->is_cursor; +#line 620 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp18_) { +#line 4180 "CheckerboardLayout.c" + gdouble _tmp19_; + gdouble _tmp20_; + gdouble _tmp21_; + gdouble _tmp22_; + Dimensions _tmp23_; + GdkPoint _tmp24_; + Dimensions _tmp25_; + gint _tmp26_; + Dimensions _tmp27_; + gint _tmp28_; +#line 621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_save (ctx); #line 622 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp45_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); + _tmp19_ = (*border_color).red; #line 622 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp45_) { -#line 4148 "CheckerboardLayout.c" - cairo_t* _tmp46_; - cairo_t* _tmp47_; - Dimensions _tmp48_; - GdkPoint _tmp49_; - Dimensions _tmp50_; - gint _tmp51_; - Dimensions _tmp52_; - gint _tmp53_; - gint _tmp54_; - gint _tmp55_; - cairo_t* _tmp56_; + _tmp20_ = (*border_color).green; +#line 622 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp21_ = (*border_color).blue; +#line 622 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp22_ = (*border_color).alpha; +#line 622 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_set_source_rgba (ctx, _tmp19_, _tmp20_, _tmp21_, _tmp22_); #line 624 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp46_ = ctx; + _tmp23_ = self->priv->pixbuf_dim; #line 624 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_save (_tmp46_); -#line 625 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp47_ = ctx; -#line 625 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp48_ = self->priv->pixbuf_dim; -#line 625 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp49_ = pixbuf_origin; -#line 625 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp50_ = self->priv->pixbuf_dim; -#line 625 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp51_ = _tmp50_.width; -#line 625 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp52_ = self->priv->pixbuf_dim; -#line 625 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp53_ = _tmp52_.height; -#line 625 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp54_ = MAX (_tmp51_, _tmp53_); -#line 625 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp55_ = checkerboard_item_get_selection_border_width (self, _tmp54_); -#line 625 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_paint_border (self, _tmp47_, &_tmp48_, &_tmp49_, _tmp55_); -#line 627 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp56_ = ctx; -#line 627 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_restore (_tmp56_); -#line 4188 "CheckerboardLayout.c" - } -#line 631 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp57_ = border_color; -#line 631 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp57_ != NULL) { -#line 4194 "CheckerboardLayout.c" - cairo_t* _tmp58_; - cairo_t* _tmp59_; - GdkRGBA* _tmp60_; - gdouble _tmp61_; - GdkRGBA* _tmp62_; - gdouble _tmp63_; - GdkRGBA* _tmp64_; - gdouble _tmp65_; - GdkRGBA* _tmp66_; - gdouble _tmp67_; - cairo_t* _tmp68_; - Dimensions _tmp69_; - GdkPoint _tmp70_; - cairo_t* _tmp71_; -#line 632 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp58_ = ctx; + _tmp24_ = pixbuf_origin; +#line 624 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp25_ = self->priv->pixbuf_dim; +#line 624 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp26_ = _tmp25_.width; +#line 624 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp27_ = self->priv->pixbuf_dim; +#line 624 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp28_ = _tmp27_.height; +#line 624 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_item_paint_border (self, ctx, &_tmp23_, &_tmp24_, checkerboard_item_get_selection_border_width (self, MAX (_tmp26_, _tmp28_))); +#line 626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_restore (ctx); +#line 4219 "CheckerboardLayout.c" + } +#line 630 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView))) { +#line 4223 "CheckerboardLayout.c" + Dimensions _tmp29_; + GdkPoint _tmp30_; + Dimensions _tmp31_; + gint _tmp32_; + Dimensions _tmp33_; + gint _tmp34_; #line 632 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_save (_tmp58_); -#line 633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp59_ = ctx; + cairo_save (ctx); #line 633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp60_ = border_color; + _tmp29_ = self->priv->pixbuf_dim; #line 633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp61_ = (*_tmp60_).red; + _tmp30_ = pixbuf_origin; #line 633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp62_ = border_color; + _tmp31_ = self->priv->pixbuf_dim; #line 633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp63_ = (*_tmp62_).green; + _tmp32_ = _tmp31_.width; #line 633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp64_ = border_color; + _tmp33_ = self->priv->pixbuf_dim; #line 633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp65_ = (*_tmp64_).blue; + _tmp34_ = _tmp33_.height; #line 633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp66_ = border_color; -#line 633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp67_ = (*_tmp66_).alpha; -#line 633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_set_source_rgba (_tmp59_, _tmp61_, _tmp63_, _tmp65_, _tmp67_); -#line 635 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp68_ = ctx; -#line 635 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp69_ = self->priv->pixbuf_dim; -#line 635 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp70_ = pixbuf_origin; + checkerboard_item_paint_border (self, ctx, &_tmp29_, &_tmp30_, checkerboard_item_get_selection_border_width (self, MAX (_tmp32_, _tmp34_))); #line 635 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_paint_border (self, _tmp68_, &_tmp69_, &_tmp70_, CHECKERBOARD_ITEM_BORDER_WIDTH); -#line 636 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp71_ = ctx; -#line 636 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_restore (_tmp71_); -#line 4245 "CheckerboardLayout.c" + cairo_restore (ctx); +#line 4248 "CheckerboardLayout.c" } #line 639 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp72_ = self->priv->display_pixbuf; -#line 639 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp72_ != NULL) { -#line 4251 "CheckerboardLayout.c" - cairo_t* _tmp73_; - cairo_t* _tmp74_; - GdkRGBA _tmp75_; - gdouble _tmp76_; - GdkRGBA _tmp77_; - gdouble _tmp78_; - GdkRGBA _tmp79_; - gdouble _tmp80_; - GdkRGBA _tmp81_; - gdouble _tmp82_; - cairo_t* _tmp83_; - GdkPixbuf* _tmp84_; - GdkPoint _tmp85_; - cairo_t* _tmp86_; -#line 640 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp73_ = ctx; + if (border_color != NULL) { +#line 4252 "CheckerboardLayout.c" + gdouble _tmp35_; + gdouble _tmp36_; + gdouble _tmp37_; + gdouble _tmp38_; + Dimensions _tmp39_; + GdkPoint _tmp40_; #line 640 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_save (_tmp73_); -#line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp74_ = ctx; -#line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp75_ = *bg_color; -#line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp76_ = _tmp75_.red; -#line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp77_ = *bg_color; + cairo_save (ctx); #line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp78_ = _tmp77_.green; + _tmp35_ = (*border_color).red; #line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp79_ = *bg_color; + _tmp36_ = (*border_color).green; #line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp80_ = _tmp79_.blue; + _tmp37_ = (*border_color).blue; #line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp81_ = *bg_color; + _tmp38_ = (*border_color).alpha; #line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp82_ = _tmp81_.alpha; -#line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_set_source_rgba (_tmp74_, _tmp76_, _tmp78_, _tmp80_, _tmp82_); -#line 642 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp83_ = ctx; -#line 642 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp84_ = self->priv->display_pixbuf; -#line 642 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp85_ = pixbuf_origin; -#line 642 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_paint_image (self, _tmp83_, _tmp84_, &_tmp85_); + cairo_set_source_rgba (ctx, _tmp35_, _tmp36_, _tmp37_, _tmp38_); +#line 643 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp39_ = self->priv->pixbuf_dim; #line 643 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp86_ = ctx; + _tmp40_ = pixbuf_origin; #line 643 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_restore (_tmp86_); -#line 4302 "CheckerboardLayout.c" - } -#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp87_ = ctx; -#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp88_ = *text_color; -#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp89_ = _tmp88_.red; -#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp90_ = *text_color; -#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp91_ = _tmp90_.green; -#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp92_ = *text_color; -#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp93_ = _tmp92_.blue; -#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp94_ = *text_color; -#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp95_ = _tmp94_.alpha; -#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_set_source_rgba (_tmp87_, _tmp89_, _tmp91_, _tmp93_, _tmp95_); + checkerboard_item_paint_border (self, ctx, &_tmp39_, &_tmp40_, CHECKERBOARD_ITEM_BORDER_WIDTH); +#line 644 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_restore (ctx); +#line 4279 "CheckerboardLayout.c" + } +#line 647 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp41_ = self->priv->display_pixbuf; +#line 647 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp41_ != NULL) { +#line 4285 "CheckerboardLayout.c" + GdkRGBA _tmp42_; + gdouble _tmp43_; + GdkRGBA _tmp44_; + gdouble _tmp45_; + GdkRGBA _tmp46_; + gdouble _tmp47_; + GdkRGBA _tmp48_; + gdouble _tmp49_; + GdkPixbuf* _tmp50_; + GdkPoint _tmp51_; +#line 648 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_save (ctx); #line 649 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp96_ = self->allocation; + _tmp42_ = *bg_color; #line 649 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp97_ = _tmp96_.y; + _tmp43_ = _tmp42_.red; #line 649 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp98_ = self->priv->pixbuf_dim; + _tmp44_ = *bg_color; #line 649 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp99_ = _tmp98_.height; + _tmp45_ = _tmp44_.green; #line 649 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - text_y = (((_tmp97_ + CHECKERBOARD_ITEM_FRAME_WIDTH) + _tmp99_) + CHECKERBOARD_ITEM_FRAME_WIDTH) + CHECKERBOARD_ITEM_LABEL_PADDING; -#line 650 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp101_ = self->priv->title; -#line 650 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp101_ != NULL) { -#line 4338 "CheckerboardLayout.c" - gboolean _tmp102_; + _tmp46_ = *bg_color; +#line 649 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp47_ = _tmp46_.blue; +#line 649 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp48_ = *bg_color; +#line 649 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp49_ = _tmp48_.alpha; +#line 649 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_set_source_rgba (ctx, _tmp43_, _tmp45_, _tmp47_, _tmp49_); #line 650 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp102_ = self->priv->title_visible; + _tmp50_ = self->priv->display_pixbuf; #line 650 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp100_ = _tmp102_; -#line 4344 "CheckerboardLayout.c" - } else { + _tmp51_ = pixbuf_origin; #line 650 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp100_ = FALSE; -#line 4348 "CheckerboardLayout.c" + checkerboard_item_paint_image (self, ctx, _tmp50_, &_tmp51_); +#line 651 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_restore (ctx); +#line 4324 "CheckerboardLayout.c" } -#line 650 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp100_) { -#line 4352 "CheckerboardLayout.c" - CheckerboardItemText* _tmp103_; - GdkRectangle _tmp104_; - gint _tmp105_; - CheckerboardItemText* _tmp106_; - gint _tmp107_; - CheckerboardItemText* _tmp108_; - Dimensions _tmp109_; - gint _tmp110_; - CheckerboardItemText* _tmp111_; - CheckerboardItemText* _tmp112_; - gint _tmp113_; - cairo_t* _tmp114_; - CheckerboardItemText* _tmp115_; - GdkRectangle _tmp116_; - gint _tmp117_; - CheckerboardItemText* _tmp118_; - GdkRectangle _tmp119_; - gint _tmp120_; - cairo_t* _tmp121_; - CheckerboardItemText* _tmp122_; - Dimensions _tmp123_; - gint _tmp124_; - PangoLayout* _tmp125_; - PangoLayout* _tmp126_; - gint _tmp127_; - CheckerboardItemText* _tmp128_; - gint _tmp129_; -#line 653 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp103_ = self->priv->title; -#line 653 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp104_ = self->allocation; -#line 653 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp105_ = _tmp104_.x; -#line 653 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp103_->allocation.x = _tmp105_ + CHECKERBOARD_ITEM_FRAME_WIDTH; #line 654 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp106_ = self->priv->title; + _tmp52_ = *text_color; #line 654 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp107_ = text_y; + _tmp53_ = _tmp52_.red; #line 654 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp106_->allocation.y = _tmp107_; -#line 655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp108_ = self->priv->title; -#line 655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp109_ = self->priv->pixbuf_dim; -#line 655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp110_ = _tmp109_.width; -#line 655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp108_->allocation.width = _tmp110_; -#line 656 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp111_ = self->priv->title; -#line 656 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp112_ = self->priv->title; -#line 656 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp113_ = checkerboard_item_text_get_height (_tmp112_); -#line 656 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp111_->allocation.height = _tmp113_; -#line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp114_ = ctx; -#line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp115_ = self->priv->title; + _tmp54_ = *text_color; +#line 654 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp55_ = _tmp54_.green; +#line 654 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp56_ = *text_color; +#line 654 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp57_ = _tmp56_.blue; +#line 654 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp58_ = *text_color; +#line 654 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp59_ = _tmp58_.alpha; +#line 654 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_set_source_rgba (ctx, _tmp53_, _tmp55_, _tmp57_, _tmp59_); +#line 657 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp60_ = self->priv->pixbuf_dim; +#line 657 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp61_ = _tmp60_.height; +#line 657 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + text_y = (_tmp61_ + CHECKERBOARD_ITEM_FRAME_WIDTH) + CHECKERBOARD_ITEM_LABEL_PADDING; #line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp116_ = _tmp115_->allocation; + _tmp63_ = self->priv->title; #line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp117_ = _tmp116_.x; + if (_tmp63_ != NULL) { +#line 4354 "CheckerboardLayout.c" + gboolean _tmp64_; #line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp118_ = self->priv->title; + _tmp64_ = self->priv->title_visible; #line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp119_ = _tmp118_->allocation; + _tmp62_ = _tmp64_; +#line 4360 "CheckerboardLayout.c" + } else { #line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp120_ = _tmp119_.y; + _tmp62_ = FALSE; +#line 4364 "CheckerboardLayout.c" + } #line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_move_to (_tmp114_, (gdouble) _tmp117_, (gdouble) _tmp120_); -#line 659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp121_ = ctx; -#line 659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp122_ = self->priv->title; -#line 659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp123_ = self->priv->pixbuf_dim; -#line 659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp124_ = _tmp123_.width; -#line 659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp125_ = checkerboard_item_text_get_pango_layout (_tmp122_, _tmp124_); -#line 659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp126_ = _tmp125_; -#line 659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - pango_cairo_show_layout (_tmp121_, _tmp126_); -#line 659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_object_unref0 (_tmp126_); -#line 661 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp127_ = text_y; -#line 661 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp128_ = self->priv->title; + if (_tmp62_) { +#line 4368 "CheckerboardLayout.c" + CheckerboardItemText* _tmp65_; + CheckerboardItemText* _tmp66_; + gint _tmp67_; + CheckerboardItemText* _tmp68_; + Dimensions _tmp69_; + gint _tmp70_; + CheckerboardItemText* _tmp71_; + CheckerboardItemText* _tmp72_; + CheckerboardItemText* _tmp73_; + GdkRectangle _tmp74_; + gint _tmp75_; + CheckerboardItemText* _tmp76_; + GdkRectangle _tmp77_; + gint _tmp78_; + CheckerboardItemText* _tmp79_; + Dimensions _tmp80_; + gint _tmp81_; + PangoLayout* _tmp82_; + PangoLayout* _tmp83_; + gint _tmp84_; + CheckerboardItemText* _tmp85_; #line 661 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp129_ = checkerboard_item_text_get_height (_tmp128_); + _tmp65_ = self->priv->title; #line 661 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - text_y = _tmp127_ + (_tmp129_ + CHECKERBOARD_ITEM_LABEL_PADDING); -#line 4450 "CheckerboardLayout.c" - } -#line 664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp131_ = self->priv->comment; -#line 664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp131_ != NULL) { -#line 4456 "CheckerboardLayout.c" - gboolean _tmp132_; -#line 664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp132_ = self->priv->comment_visible; + _tmp65_->allocation.x = 0; +#line 662 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp66_ = self->priv->title; +#line 662 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp67_ = text_y; +#line 662 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp66_->allocation.y = _tmp67_; +#line 663 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp68_ = self->priv->title; +#line 663 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp69_ = self->priv->pixbuf_dim; +#line 663 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp70_ = _tmp69_.width; +#line 663 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp68_->allocation.width = _tmp70_; #line 664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp130_ = _tmp132_; -#line 4462 "CheckerboardLayout.c" - } else { + _tmp71_ = self->priv->title; #line 664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp130_ = FALSE; -#line 4466 "CheckerboardLayout.c" - } + _tmp72_ = self->priv->title; #line 664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp130_) { -#line 4470 "CheckerboardLayout.c" - CheckerboardItemText* _tmp133_; - GdkRectangle _tmp134_; - gint _tmp135_; - CheckerboardItemText* _tmp136_; - gint _tmp137_; - CheckerboardItemText* _tmp138_; - Dimensions _tmp139_; - gint _tmp140_; - CheckerboardItemText* _tmp141_; - CheckerboardItemText* _tmp142_; - gint _tmp143_; - cairo_t* _tmp144_; - CheckerboardItemText* _tmp145_; - GdkRectangle _tmp146_; - gint _tmp147_; - CheckerboardItemText* _tmp148_; - GdkRectangle _tmp149_; - gint _tmp150_; - cairo_t* _tmp151_; - CheckerboardItemText* _tmp152_; - Dimensions _tmp153_; - gint _tmp154_; - PangoLayout* _tmp155_; - PangoLayout* _tmp156_; - gint _tmp157_; - CheckerboardItemText* _tmp158_; - gint _tmp159_; -#line 665 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp133_ = self->priv->comment; -#line 665 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp134_ = self->allocation; -#line 665 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp135_ = _tmp134_.x; -#line 665 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp133_->allocation.x = _tmp135_ + CHECKERBOARD_ITEM_FRAME_WIDTH; + _tmp71_->allocation.height = checkerboard_item_text_get_height (_tmp72_); +#line 666 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp73_ = self->priv->title; +#line 666 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp74_ = _tmp73_->allocation; +#line 666 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp75_ = _tmp74_.x; #line 666 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp136_ = self->priv->comment; + _tmp76_ = self->priv->title; #line 666 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp137_ = text_y; + _tmp77_ = _tmp76_->allocation; #line 666 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp136_->allocation.y = _tmp137_; + _tmp78_ = _tmp77_.y; +#line 666 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_move_to (ctx, (gdouble) _tmp75_, (gdouble) _tmp78_); #line 667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp138_ = self->priv->comment; + _tmp79_ = self->priv->title; #line 667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp139_ = self->priv->pixbuf_dim; + _tmp80_ = self->priv->pixbuf_dim; #line 667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp140_ = _tmp139_.width; + _tmp81_ = _tmp80_.width; #line 667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp138_->allocation.width = _tmp140_; -#line 668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp141_ = self->priv->comment; -#line 668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp142_ = self->priv->comment; -#line 668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp143_ = checkerboard_item_text_get_height (_tmp142_); -#line 668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp141_->allocation.height = _tmp143_; -#line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp144_ = ctx; -#line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp145_ = self->priv->comment; -#line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp146_ = _tmp145_->allocation; -#line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp147_ = _tmp146_.x; -#line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp148_ = self->priv->comment; -#line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp149_ = _tmp148_->allocation; -#line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp150_ = _tmp149_.y; -#line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_move_to (_tmp144_, (gdouble) _tmp147_, (gdouble) _tmp150_); -#line 671 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp151_ = ctx; -#line 671 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp152_ = self->priv->comment; -#line 671 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp153_ = self->priv->pixbuf_dim; -#line 671 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp154_ = _tmp153_.width; -#line 671 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp155_ = checkerboard_item_text_get_pango_layout (_tmp152_, _tmp154_); -#line 671 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp156_ = _tmp155_; -#line 671 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - pango_cairo_show_layout (_tmp151_, _tmp156_); -#line 671 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_object_unref0 (_tmp156_); -#line 673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp157_ = text_y; -#line 673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp158_ = self->priv->comment; + _tmp82_ = checkerboard_item_text_get_pango_layout (_tmp79_, _tmp81_); +#line 667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp83_ = _tmp82_; +#line 667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + pango_cairo_show_layout (ctx, _tmp83_); +#line 667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_object_unref0 (_tmp83_); +#line 669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp84_ = text_y; +#line 669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp85_ = self->priv->title; +#line 669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + text_y = _tmp84_ + (checkerboard_item_text_get_height (_tmp85_) + CHECKERBOARD_ITEM_LABEL_PADDING); +#line 4448 "CheckerboardLayout.c" + } +#line 672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp87_ = self->priv->comment; +#line 672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp87_ != NULL) { +#line 4454 "CheckerboardLayout.c" + gboolean _tmp88_; +#line 672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp88_ = self->priv->comment_visible; +#line 672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp86_ = _tmp88_; +#line 4460 "CheckerboardLayout.c" + } else { +#line 672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp86_ = FALSE; +#line 4464 "CheckerboardLayout.c" + } +#line 672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp86_) { +#line 4468 "CheckerboardLayout.c" + CheckerboardItemText* _tmp89_; + CheckerboardItemText* _tmp90_; + gint _tmp91_; + CheckerboardItemText* _tmp92_; + Dimensions _tmp93_; + gint _tmp94_; + CheckerboardItemText* _tmp95_; + CheckerboardItemText* _tmp96_; + CheckerboardItemText* _tmp97_; + GdkRectangle _tmp98_; + gint _tmp99_; + CheckerboardItemText* _tmp100_; + GdkRectangle _tmp101_; + gint _tmp102_; + CheckerboardItemText* _tmp103_; + Dimensions _tmp104_; + gint _tmp105_; + PangoLayout* _tmp106_; + PangoLayout* _tmp107_; + gint _tmp108_; + CheckerboardItemText* _tmp109_; #line 673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp159_ = checkerboard_item_text_get_height (_tmp158_); + _tmp89_ = self->priv->comment; #line 673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - text_y = _tmp157_ + (_tmp159_ + CHECKERBOARD_ITEM_LABEL_PADDING); -#line 4568 "CheckerboardLayout.c" - } -#line 676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp161_ = self->priv->subtitle; + _tmp89_->allocation.x = 0; +#line 674 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp90_ = self->priv->comment; +#line 674 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp91_ = text_y; +#line 674 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp90_->allocation.y = _tmp91_; +#line 675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp92_ = self->priv->comment; +#line 675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp93_ = self->priv->pixbuf_dim; +#line 675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp94_ = _tmp93_.width; +#line 675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp92_->allocation.width = _tmp94_; #line 676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp161_ != NULL) { -#line 4574 "CheckerboardLayout.c" - gboolean _tmp162_; + _tmp95_ = self->priv->comment; #line 676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp162_ = self->priv->subtitle_visible; -#line 676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp160_ = _tmp162_; -#line 4580 "CheckerboardLayout.c" - } else { -#line 676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp160_ = FALSE; -#line 4584 "CheckerboardLayout.c" - } + _tmp96_ = self->priv->comment; #line 676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp160_) { -#line 4588 "CheckerboardLayout.c" - CheckerboardItemText* _tmp163_; - GdkRectangle _tmp164_; - gint _tmp165_; - CheckerboardItemText* _tmp166_; - gint _tmp167_; - CheckerboardItemText* _tmp168_; - Dimensions _tmp169_; - gint _tmp170_; - CheckerboardItemText* _tmp171_; - CheckerboardItemText* _tmp172_; - gint _tmp173_; - cairo_t* _tmp174_; - CheckerboardItemText* _tmp175_; - GdkRectangle _tmp176_; - gint _tmp177_; - CheckerboardItemText* _tmp178_; - GdkRectangle _tmp179_; - gint _tmp180_; - cairo_t* _tmp181_; - CheckerboardItemText* _tmp182_; - Dimensions _tmp183_; - gint _tmp184_; - PangoLayout* _tmp185_; - PangoLayout* _tmp186_; -#line 677 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp163_ = self->priv->subtitle; -#line 677 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp164_ = self->allocation; -#line 677 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp165_ = _tmp164_.x; -#line 677 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp163_->allocation.x = _tmp165_ + CHECKERBOARD_ITEM_FRAME_WIDTH; + _tmp95_->allocation.height = checkerboard_item_text_get_height (_tmp96_); +#line 678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp97_ = self->priv->comment; #line 678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp166_ = self->priv->subtitle; + _tmp98_ = _tmp97_->allocation; #line 678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp167_ = text_y; + _tmp99_ = _tmp98_.x; #line 678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp166_->allocation.y = _tmp167_; + _tmp100_ = self->priv->comment; +#line 678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp101_ = _tmp100_->allocation; +#line 678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp102_ = _tmp101_.y; +#line 678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_move_to (ctx, (gdouble) _tmp99_, (gdouble) _tmp102_); +#line 679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp103_ = self->priv->comment; #line 679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp168_ = self->priv->subtitle; + _tmp104_ = self->priv->pixbuf_dim; #line 679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp169_ = self->priv->pixbuf_dim; + _tmp105_ = _tmp104_.width; #line 679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp170_ = _tmp169_.width; + _tmp106_ = checkerboard_item_text_get_pango_layout (_tmp103_, _tmp105_); #line 679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp168_->allocation.width = _tmp170_; -#line 680 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp171_ = self->priv->subtitle; -#line 680 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp172_ = self->priv->subtitle; -#line 680 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp173_ = checkerboard_item_text_get_height (_tmp172_); -#line 680 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp171_->allocation.height = _tmp173_; -#line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp174_ = ctx; -#line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp175_ = self->priv->subtitle; -#line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp176_ = _tmp175_->allocation; -#line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp177_ = _tmp176_.x; -#line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp178_ = self->priv->subtitle; -#line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp179_ = _tmp178_->allocation; -#line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp180_ = _tmp179_.y; -#line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_move_to (_tmp174_, (gdouble) _tmp177_, (gdouble) _tmp180_); -#line 683 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp181_ = ctx; -#line 683 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp182_ = self->priv->subtitle; -#line 683 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp183_ = self->priv->pixbuf_dim; -#line 683 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp184_ = _tmp183_.width; -#line 683 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp185_ = checkerboard_item_text_get_pango_layout (_tmp182_, _tmp184_); -#line 683 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp186_ = _tmp185_; -#line 683 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - pango_cairo_show_layout (_tmp181_, _tmp186_); -#line 683 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_object_unref0 (_tmp186_); -#line 4675 "CheckerboardLayout.c" + _tmp107_ = _tmp106_; +#line 679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + pango_cairo_show_layout (ctx, _tmp107_); +#line 679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_object_unref0 (_tmp107_); +#line 681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp108_ = text_y; +#line 681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp109_ = self->priv->comment; +#line 681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + text_y = _tmp108_ + (checkerboard_item_text_get_height (_tmp109_) + CHECKERBOARD_ITEM_LABEL_PADDING); +#line 4548 "CheckerboardLayout.c" + } +#line 684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp111_ = self->priv->subtitle; +#line 684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp111_ != NULL) { +#line 4554 "CheckerboardLayout.c" + gboolean _tmp112_; +#line 684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp112_ = self->priv->subtitle_visible; +#line 684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp110_ = _tmp112_; +#line 4560 "CheckerboardLayout.c" + } else { +#line 684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp110_ = FALSE; +#line 4564 "CheckerboardLayout.c" } +#line 684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp110_) { +#line 4568 "CheckerboardLayout.c" + CheckerboardItemText* _tmp113_; + CheckerboardItemText* _tmp114_; + gint _tmp115_; + CheckerboardItemText* _tmp116_; + Dimensions _tmp117_; + gint _tmp118_; + CheckerboardItemText* _tmp119_; + CheckerboardItemText* _tmp120_; + CheckerboardItemText* _tmp121_; + GdkRectangle _tmp122_; + gint _tmp123_; + CheckerboardItemText* _tmp124_; + GdkRectangle _tmp125_; + gint _tmp126_; + CheckerboardItemText* _tmp127_; + Dimensions _tmp128_; + gint _tmp129_; + PangoLayout* _tmp130_; + PangoLayout* _tmp131_; +#line 685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp113_ = self->priv->subtitle; +#line 685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp113_->allocation.x = 0; +#line 686 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp114_ = self->priv->subtitle; +#line 686 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp115_ = text_y; +#line 686 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp114_->allocation.y = _tmp115_; +#line 687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp116_ = self->priv->subtitle; +#line 687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp117_ = self->priv->pixbuf_dim; +#line 687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp118_ = _tmp117_.width; +#line 687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp116_->allocation.width = _tmp118_; #line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp187_ = ctx; -#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp188_ = *selected_color; -#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp189_ = _tmp188_.red; -#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp190_ = *selected_color; -#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp191_ = _tmp190_.green; -#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp192_ = *selected_color; -#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp193_ = _tmp192_.blue; -#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp194_ = *selected_color; + _tmp119_ = self->priv->subtitle; #line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp195_ = _tmp194_.alpha; + _tmp120_ = self->priv->subtitle; #line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_set_source_rgba (_tmp187_, _tmp189_, _tmp191_, _tmp193_, _tmp195_); -#line 692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp196_ = checkerboard_item_get_bottom_left_trinket (self, CHECKERBOARD_ITEM_TRINKET_SCALE); -#line 692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - trinket = _tmp196_; -#line 693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp197_ = trinket; -#line 693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp197_ != NULL) { -#line 4705 "CheckerboardLayout.c" + _tmp119_->allocation.height = checkerboard_item_text_get_height (_tmp120_); +#line 690 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp121_ = self->priv->subtitle; +#line 690 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp122_ = _tmp121_->allocation; +#line 690 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp123_ = _tmp122_.x; +#line 690 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp124_ = self->priv->subtitle; +#line 690 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp125_ = _tmp124_->allocation; +#line 690 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp126_ = _tmp125_.y; +#line 690 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_move_to (ctx, (gdouble) _tmp123_, (gdouble) _tmp126_); +#line 691 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp127_ = self->priv->subtitle; +#line 691 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp128_ = self->priv->pixbuf_dim; +#line 691 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp129_ = _tmp128_.width; +#line 691 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp130_ = checkerboard_item_text_get_pango_layout (_tmp127_, _tmp129_); +#line 691 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp131_ = _tmp130_; +#line 691 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + pango_cairo_show_layout (ctx, _tmp131_); +#line 691 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_object_unref0 (_tmp131_); +#line 4640 "CheckerboardLayout.c" + } +#line 696 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp132_ = *selected_color; +#line 696 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp133_ = _tmp132_.red; +#line 696 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp134_ = *selected_color; +#line 696 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp135_ = _tmp134_.green; +#line 696 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp136_ = *selected_color; +#line 696 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp137_ = _tmp136_.blue; +#line 696 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp138_ = *selected_color; +#line 696 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp139_ = _tmp138_.alpha; +#line 696 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_set_source_rgba (ctx, _tmp133_, _tmp135_, _tmp137_, _tmp139_); +#line 700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp140_ = checkerboard_item_get_bottom_left_trinket (self, CHECKERBOARD_ITEM_TRINKET_SCALE); +#line 700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + trinket = _tmp140_; +#line 701 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp141_ = trinket; +#line 701 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp141_ != NULL) { +#line 4668 "CheckerboardLayout.c" gint x = 0; - GdkPoint _tmp198_; - gint _tmp199_; - gint _tmp200_; + GdkPoint _tmp142_; + gint _tmp143_; gint y = 0; - GdkPoint _tmp201_; - gint _tmp202_; - Dimensions _tmp203_; - gint _tmp204_; - GdkPixbuf* _tmp205_; - gint _tmp206_; - cairo_t* _tmp207_; - GdkPixbuf* _tmp208_; - gint _tmp209_; - gint _tmp210_; - cairo_t* _tmp211_; - gint _tmp212_; - gint _tmp213_; - GdkPixbuf* _tmp214_; - gint _tmp215_; - GdkPixbuf* _tmp216_; - gint _tmp217_; - cairo_t* _tmp218_; -#line 694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp198_ = pixbuf_origin; -#line 694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp199_ = _tmp198_.x; -#line 694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp200_ = checkerboard_item_get_horizontal_trinket_offset (self); -#line 694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - x = (_tmp199_ + CHECKERBOARD_ITEM_TRINKET_PADDING) + _tmp200_; -#line 695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp201_ = pixbuf_origin; -#line 695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp202_ = _tmp201_.y; -#line 695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp203_ = self->priv->pixbuf_dim; -#line 695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp204_ = _tmp203_.height; -#line 695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp205_ = trinket; -#line 695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp206_ = gdk_pixbuf_get_height (_tmp205_); -#line 695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - y = ((_tmp202_ + _tmp204_) - _tmp206_) - CHECKERBOARD_ITEM_TRINKET_PADDING; -#line 697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp207_ = ctx; -#line 697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp208_ = trinket; -#line 697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp209_ = x; -#line 697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp210_ = y; -#line 697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gdk_cairo_set_source_pixbuf (_tmp207_, _tmp208_, (gdouble) _tmp209_, (gdouble) _tmp210_); -#line 698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp211_ = ctx; -#line 698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp212_ = x; -#line 698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp213_ = y; -#line 698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp214_ = trinket; -#line 698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp215_ = gdk_pixbuf_get_width (_tmp214_); -#line 698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp216_ = trinket; -#line 698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp217_ = gdk_pixbuf_get_height (_tmp216_); -#line 698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_rectangle (_tmp211_, (gdouble) _tmp212_, (gdouble) _tmp213_, (gdouble) _tmp215_, (gdouble) _tmp217_); -#line 699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp218_ = ctx; -#line 699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_fill (_tmp218_); -#line 4781 "CheckerboardLayout.c" - } + GdkPoint _tmp144_; + gint _tmp145_; + Dimensions _tmp146_; + gint _tmp147_; + GdkPixbuf* _tmp148_; + GdkPixbuf* _tmp149_; + gint _tmp150_; + gint _tmp151_; + gint _tmp152_; + gint _tmp153_; + GdkPixbuf* _tmp154_; + GdkPixbuf* _tmp155_; #line 702 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp219_ = checkerboard_item_get_top_left_trinket (self, CHECKERBOARD_ITEM_TRINKET_SCALE); + _tmp142_ = pixbuf_origin; #line 702 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_object_unref0 (trinket); + _tmp143_ = _tmp142_.x; #line 702 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - trinket = _tmp219_; + x = (_tmp143_ + CHECKERBOARD_ITEM_TRINKET_PADDING) + checkerboard_item_get_horizontal_trinket_offset (self); #line 703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp220_ = trinket; + _tmp144_ = pixbuf_origin; #line 703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp220_ != NULL) { -#line 4793 "CheckerboardLayout.c" - gint x = 0; - GdkPoint _tmp221_; - gint _tmp222_; - gint _tmp223_; - gint y = 0; - GdkPoint _tmp224_; - gint _tmp225_; - cairo_t* _tmp226_; - GdkPixbuf* _tmp227_; - gint _tmp228_; - gint _tmp229_; - cairo_t* _tmp230_; - gint _tmp231_; - gint _tmp232_; - GdkPixbuf* _tmp233_; - gint _tmp234_; - GdkPixbuf* _tmp235_; - gint _tmp236_; - cairo_t* _tmp237_; -#line 704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp221_ = pixbuf_origin; -#line 704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp222_ = _tmp221_.x; -#line 704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp223_ = checkerboard_item_get_horizontal_trinket_offset (self); -#line 704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - x = (_tmp222_ + CHECKERBOARD_ITEM_TRINKET_PADDING) + _tmp223_; + _tmp145_ = _tmp144_.y; +#line 703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp146_ = self->priv->pixbuf_dim; +#line 703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp147_ = _tmp146_.height; +#line 703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp148_ = trinket; +#line 703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + y = ((_tmp145_ + _tmp147_) - gdk_pixbuf_get_height (_tmp148_)) - CHECKERBOARD_ITEM_TRINKET_PADDING; +#line 705 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp149_ = trinket; #line 705 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp224_ = pixbuf_origin; + _tmp150_ = x; #line 705 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp225_ = _tmp224_.y; + _tmp151_ = y; #line 705 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - y = _tmp225_ + CHECKERBOARD_ITEM_TRINKET_PADDING; + gdk_cairo_set_source_pixbuf (ctx, _tmp149_, (gdouble) _tmp150_, (gdouble) _tmp151_); #line 706 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp226_ = ctx; + _tmp152_ = x; #line 706 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp227_ = trinket; + _tmp153_ = y; #line 706 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp228_ = x; + _tmp154_ = trinket; #line 706 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp229_ = y; + _tmp155_ = trinket; #line 706 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gdk_cairo_set_source_pixbuf (_tmp226_, _tmp227_, (gdouble) _tmp228_, (gdouble) _tmp229_); + cairo_rectangle (ctx, (gdouble) _tmp152_, (gdouble) _tmp153_, (gdouble) gdk_pixbuf_get_width (_tmp154_), (gdouble) gdk_pixbuf_get_height (_tmp155_)); #line 707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp230_ = ctx; -#line 707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp231_ = x; -#line 707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp232_ = y; -#line 707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp233_ = trinket; -#line 707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp234_ = gdk_pixbuf_get_width (_tmp233_); -#line 707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp235_ = trinket; -#line 707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp236_ = gdk_pixbuf_get_height (_tmp235_); -#line 707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_rectangle (_tmp230_, (gdouble) _tmp231_, (gdouble) _tmp232_, (gdouble) _tmp234_, (gdouble) _tmp236_); -#line 708 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp237_ = ctx; -#line 708 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_fill (_tmp237_); -#line 4857 "CheckerboardLayout.c" + cairo_fill (ctx); +#line 4723 "CheckerboardLayout.c" } -#line 711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp238_ = checkerboard_item_get_top_right_trinket (self, CHECKERBOARD_ITEM_TRINKET_SCALE); -#line 711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 710 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp156_ = checkerboard_item_get_top_left_trinket (self, CHECKERBOARD_ITEM_TRINKET_SCALE); +#line 710 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (trinket); +#line 710 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + trinket = _tmp156_; #line 711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - trinket = _tmp238_; -#line 712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp239_ = trinket; -#line 712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp239_ != NULL) { -#line 4869 "CheckerboardLayout.c" + _tmp157_ = trinket; +#line 711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp157_ != NULL) { +#line 4735 "CheckerboardLayout.c" gint x = 0; - GdkPoint _tmp240_; - gint _tmp241_; - Dimensions _tmp242_; - gint _tmp243_; - GdkPixbuf* _tmp244_; - gint _tmp245_; - gint _tmp246_; - gint _tmp247_; + GdkPoint _tmp158_; + gint _tmp159_; gint y = 0; - GdkPoint _tmp248_; - gint _tmp249_; - cairo_t* _tmp250_; - GdkPixbuf* _tmp251_; - gint _tmp252_; - gint _tmp253_; - cairo_t* _tmp254_; - gint _tmp255_; - gint _tmp256_; - GdkPixbuf* _tmp257_; - gint _tmp258_; - GdkPixbuf* _tmp259_; - gint _tmp260_; - cairo_t* _tmp261_; -#line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp240_ = pixbuf_origin; -#line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp241_ = _tmp240_.x; -#line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp242_ = self->priv->pixbuf_dim; -#line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp243_ = _tmp242_.width; -#line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp244_ = trinket; -#line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp245_ = gdk_pixbuf_get_width (_tmp244_); + GdkPoint _tmp160_; + gint _tmp161_; + GdkPixbuf* _tmp162_; + gint _tmp163_; + gint _tmp164_; + gint _tmp165_; + gint _tmp166_; + GdkPixbuf* _tmp167_; + GdkPixbuf* _tmp168_; +#line 712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp158_ = pixbuf_origin; +#line 712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp159_ = _tmp158_.x; +#line 712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + x = (_tmp159_ + CHECKERBOARD_ITEM_TRINKET_PADDING) + checkerboard_item_get_horizontal_trinket_offset (self); #line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp246_ = _tmp245_; + _tmp160_ = pixbuf_origin; #line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp247_ = checkerboard_item_get_horizontal_trinket_offset (self); + _tmp161_ = _tmp160_.y; #line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - x = (((_tmp241_ + _tmp243_) - _tmp246_) - _tmp247_) - CHECKERBOARD_ITEM_TRINKET_PADDING; + y = _tmp161_ + CHECKERBOARD_ITEM_TRINKET_PADDING; +#line 714 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp162_ = trinket; +#line 714 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp163_ = x; +#line 714 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp164_ = y; +#line 714 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gdk_cairo_set_source_pixbuf (ctx, _tmp162_, (gdouble) _tmp163_, (gdouble) _tmp164_); #line 715 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp248_ = pixbuf_origin; + _tmp165_ = x; #line 715 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp249_ = _tmp248_.y; + _tmp166_ = y; #line 715 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - y = _tmp249_ + CHECKERBOARD_ITEM_TRINKET_PADDING; -#line 716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp250_ = ctx; -#line 716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp251_ = trinket; -#line 716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp252_ = x; -#line 716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp253_ = y; + _tmp167_ = trinket; +#line 715 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp168_ = trinket; +#line 715 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_rectangle (ctx, (gdouble) _tmp165_, (gdouble) _tmp166_, (gdouble) gdk_pixbuf_get_width (_tmp167_), (gdouble) gdk_pixbuf_get_height (_tmp168_)); #line 716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gdk_cairo_set_source_pixbuf (_tmp250_, _tmp251_, (gdouble) _tmp252_, (gdouble) _tmp253_); -#line 717 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp254_ = ctx; -#line 717 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp255_ = x; -#line 717 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp256_ = y; -#line 717 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp257_ = trinket; -#line 717 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp258_ = gdk_pixbuf_get_width (_tmp257_); -#line 717 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp259_ = trinket; -#line 717 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp260_ = gdk_pixbuf_get_height (_tmp259_); -#line 717 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_rectangle (_tmp254_, (gdouble) _tmp255_, (gdouble) _tmp256_, (gdouble) _tmp258_, (gdouble) _tmp260_); -#line 718 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp261_ = ctx; -#line 718 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_fill (_tmp261_); -#line 4948 "CheckerboardLayout.c" + cairo_fill (ctx); +#line 4781 "CheckerboardLayout.c" } -#line 721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp262_ = checkerboard_item_get_bottom_right_trinket (self, CHECKERBOARD_ITEM_TRINKET_SCALE); -#line 721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 719 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp169_ = checkerboard_item_get_top_right_trinket (self, CHECKERBOARD_ITEM_TRINKET_SCALE); +#line 719 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (trinket); -#line 721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - trinket = _tmp262_; -#line 722 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp263_ = trinket; -#line 722 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp263_ != NULL) { -#line 4960 "CheckerboardLayout.c" +#line 719 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + trinket = _tmp169_; +#line 720 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp170_ = trinket; +#line 720 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp170_ != NULL) { +#line 4793 "CheckerboardLayout.c" gint x = 0; - GdkPoint _tmp264_; - gint _tmp265_; - Dimensions _tmp266_; - gint _tmp267_; - GdkPixbuf* _tmp268_; - gint _tmp269_; - gint _tmp270_; - gint _tmp271_; + GdkPoint _tmp171_; + gint _tmp172_; + Dimensions _tmp173_; + gint _tmp174_; + GdkPixbuf* _tmp175_; + gint _tmp176_; + gint _tmp177_; gint y = 0; - GdkPoint _tmp272_; - gint _tmp273_; - Dimensions _tmp274_; - gint _tmp275_; - GdkPixbuf* _tmp276_; - gint _tmp277_; - gint _tmp278_; - cairo_t* _tmp279_; - GdkPixbuf* _tmp280_; - gint _tmp281_; - gint _tmp282_; - cairo_t* _tmp283_; - gint _tmp284_; - gint _tmp285_; - GdkPixbuf* _tmp286_; - gint _tmp287_; - GdkPixbuf* _tmp288_; - gint _tmp289_; - cairo_t* _tmp290_; -#line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp264_ = pixbuf_origin; -#line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp265_ = _tmp264_.x; -#line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp266_ = self->priv->pixbuf_dim; -#line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp267_ = _tmp266_.width; -#line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp268_ = trinket; -#line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp269_ = gdk_pixbuf_get_width (_tmp268_); + GdkPoint _tmp178_; + gint _tmp179_; + GdkPixbuf* _tmp180_; + gint _tmp181_; + gint _tmp182_; + gint _tmp183_; + gint _tmp184_; + GdkPixbuf* _tmp185_; + GdkPixbuf* _tmp186_; +#line 721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp171_ = pixbuf_origin; +#line 721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp172_ = _tmp171_.x; +#line 721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp173_ = self->priv->pixbuf_dim; +#line 721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp174_ = _tmp173_.width; +#line 721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp175_ = trinket; +#line 721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp176_ = gdk_pixbuf_get_width (_tmp175_); +#line 721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp177_ = _tmp176_; +#line 721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + x = (((_tmp172_ + _tmp174_) - _tmp177_) - checkerboard_item_get_horizontal_trinket_offset (self)) - CHECKERBOARD_ITEM_TRINKET_PADDING; #line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp270_ = _tmp269_; + _tmp178_ = pixbuf_origin; #line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp271_ = checkerboard_item_get_horizontal_trinket_offset (self); + _tmp179_ = _tmp178_.y; #line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - x = (((_tmp265_ + _tmp267_) - _tmp270_) - _tmp271_) - CHECKERBOARD_ITEM_TRINKET_PADDING; -#line 725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp272_ = pixbuf_origin; -#line 725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp273_ = _tmp272_.y; + y = _tmp179_ + CHECKERBOARD_ITEM_TRINKET_PADDING; +#line 724 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp180_ = trinket; +#line 724 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp181_ = x; +#line 724 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp182_ = y; +#line 724 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gdk_cairo_set_source_pixbuf (ctx, _tmp180_, (gdouble) _tmp181_, (gdouble) _tmp182_); #line 725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp274_ = self->priv->pixbuf_dim; + _tmp183_ = x; #line 725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp275_ = _tmp274_.height; + _tmp184_ = y; #line 725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp276_ = trinket; + _tmp185_ = trinket; #line 725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp277_ = gdk_pixbuf_get_height (_tmp276_); + _tmp186_ = trinket; #line 725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp278_ = _tmp277_; -#line 725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - y = ((_tmp273_ + _tmp275_) - _tmp278_) - CHECKERBOARD_ITEM_TRINKET_PADDING; -#line 727 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp279_ = ctx; -#line 727 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp280_ = trinket; -#line 727 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp281_ = x; -#line 727 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp282_ = y; -#line 727 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gdk_cairo_set_source_pixbuf (_tmp279_, _tmp280_, (gdouble) _tmp281_, (gdouble) _tmp282_); -#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp283_ = ctx; -#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp284_ = x; -#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp285_ = y; -#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp286_ = trinket; -#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp287_ = gdk_pixbuf_get_width (_tmp286_); -#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp288_ = trinket; -#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp289_ = gdk_pixbuf_get_height (_tmp288_); -#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_rectangle (_tmp283_, (gdouble) _tmp284_, (gdouble) _tmp285_, (gdouble) _tmp287_, (gdouble) _tmp289_); + cairo_rectangle (ctx, (gdouble) _tmp183_, (gdouble) _tmp184_, (gdouble) gdk_pixbuf_get_width (_tmp185_), (gdouble) gdk_pixbuf_get_height (_tmp186_)); +#line 726 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_fill (ctx); +#line 4854 "CheckerboardLayout.c" + } #line 729 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp290_ = ctx; + _tmp187_ = checkerboard_item_get_bottom_right_trinket (self, CHECKERBOARD_ITEM_TRINKET_SCALE); +#line 729 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_object_unref0 (trinket); #line 729 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_fill (_tmp290_); -#line 5054 "CheckerboardLayout.c" + trinket = _tmp187_; +#line 730 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp188_ = trinket; +#line 730 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp188_ != NULL) { +#line 4866 "CheckerboardLayout.c" + gint x = 0; + GdkPoint _tmp189_; + gint _tmp190_; + Dimensions _tmp191_; + gint _tmp192_; + GdkPixbuf* _tmp193_; + gint _tmp194_; + gint _tmp195_; + gint y = 0; + GdkPoint _tmp196_; + gint _tmp197_; + Dimensions _tmp198_; + gint _tmp199_; + GdkPixbuf* _tmp200_; + gint _tmp201_; + gint _tmp202_; + GdkPixbuf* _tmp203_; + gint _tmp204_; + gint _tmp205_; + gint _tmp206_; + gint _tmp207_; + GdkPixbuf* _tmp208_; + GdkPixbuf* _tmp209_; +#line 731 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp189_ = pixbuf_origin; +#line 731 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp190_ = _tmp189_.x; +#line 731 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp191_ = self->priv->pixbuf_dim; +#line 731 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp192_ = _tmp191_.width; +#line 731 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp193_ = trinket; +#line 731 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp194_ = gdk_pixbuf_get_width (_tmp193_); +#line 731 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp195_ = _tmp194_; +#line 731 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + x = (((_tmp190_ + _tmp192_) - _tmp195_) - checkerboard_item_get_horizontal_trinket_offset (self)) - CHECKERBOARD_ITEM_TRINKET_PADDING; +#line 733 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp196_ = pixbuf_origin; +#line 733 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp197_ = _tmp196_.y; +#line 733 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp198_ = self->priv->pixbuf_dim; +#line 733 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp199_ = _tmp198_.height; +#line 733 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp200_ = trinket; +#line 733 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp201_ = gdk_pixbuf_get_height (_tmp200_); +#line 733 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp202_ = _tmp201_; +#line 733 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + y = ((_tmp197_ + _tmp199_) - _tmp202_) - CHECKERBOARD_ITEM_TRINKET_PADDING; +#line 735 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp203_ = trinket; +#line 735 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp204_ = x; +#line 735 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp205_ = y; +#line 735 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gdk_cairo_set_source_pixbuf (ctx, _tmp203_, (gdouble) _tmp204_, (gdouble) _tmp205_); +#line 736 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp206_ = x; +#line 736 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp207_ = y; +#line 736 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp208_ = trinket; +#line 736 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp209_ = trinket; +#line 736 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_rectangle (ctx, (gdouble) _tmp206_, (gdouble) _tmp207_, (gdouble) gdk_pixbuf_get_width (_tmp208_), (gdouble) gdk_pixbuf_get_height (_tmp209_)); +#line 737 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_fill (ctx); +#line 4942 "CheckerboardLayout.c" } -#line 590 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 739 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_restore (ctx); +#line 595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (trinket); -#line 5058 "CheckerboardLayout.c" +#line 4948 "CheckerboardLayout.c" } -void checkerboard_item_set_horizontal_trinket_offset (CheckerboardItem* self, gint horizontal_trinket_offset) { - gint _tmp0_; - gint _tmp1_; -#line 733 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +void +checkerboard_item_set_horizontal_trinket_offset (CheckerboardItem* self, + gint horizontal_trinket_offset) +{ +#line 742 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 734 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = horizontal_trinket_offset; -#line 734 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _vala_assert (_tmp0_ >= 0, "horizontal_trinket_offset >= 0"); -#line 735 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = horizontal_trinket_offset; -#line 735 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->horizontal_trinket_offset = _tmp1_; -#line 5075 "CheckerboardLayout.c" +#line 743 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _vala_assert (horizontal_trinket_offset >= 0, "horizontal_trinket_offset >= 0"); +#line 744 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->horizontal_trinket_offset = horizontal_trinket_offset; +#line 4962 "CheckerboardLayout.c" } -gint checkerboard_item_get_horizontal_trinket_offset (CheckerboardItem* self) { +gint +checkerboard_item_get_horizontal_trinket_offset (CheckerboardItem* self) +{ gint result = 0; gint _tmp0_; -#line 738 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 747 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), 0); -#line 739 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 748 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->horizontal_trinket_offset; -#line 739 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 748 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = _tmp0_; -#line 739 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 748 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 5090 "CheckerboardLayout.c" +#line 4979 "CheckerboardLayout.c" } -void checkerboard_item_set_grid_coordinates (CheckerboardItem* self, gint col, gint row) { - gint _tmp0_; - gint _tmp1_; -#line 742 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +void +checkerboard_item_set_grid_coordinates (CheckerboardItem* self, + gint col, + gint row) +{ +#line 751 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 743 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = col; -#line 743 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->col = _tmp0_; -#line 744 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = row; -#line 744 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->row = _tmp1_; -#line 5107 "CheckerboardLayout.c" +#line 752 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->col = col; +#line 753 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->row = row; +#line 4994 "CheckerboardLayout.c" } -gint checkerboard_item_get_column (CheckerboardItem* self) { +gint +checkerboard_item_get_column (CheckerboardItem* self) +{ gint result = 0; gint _tmp0_; -#line 747 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 756 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), 0); -#line 748 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->col; -#line 748 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = _tmp0_; -#line 748 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 5122 "CheckerboardLayout.c" +#line 5011 "CheckerboardLayout.c" } -gint checkerboard_item_get_row (CheckerboardItem* self) { +gint +checkerboard_item_get_row (CheckerboardItem* self) +{ gint result = 0; gint _tmp0_; -#line 751 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 760 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), 0); -#line 752 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 761 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->row; -#line 752 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 761 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = _tmp0_; -#line 752 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 761 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 5137 "CheckerboardLayout.c" +#line 5028 "CheckerboardLayout.c" } -void checkerboard_item_brighten (CheckerboardItem* self) { +void +checkerboard_item_brighten (CheckerboardItem* self) +{ gboolean _tmp0_ = FALSE; GdkPixbuf* _tmp1_; GdkPixbuf* _tmp3_; @@ -5145,413 +5038,354 @@ void checkerboard_item_brighten (CheckerboardItem* self) { GdkPixbuf* _tmp5_; GdkPixbuf* _tmp6_; GdkPixbuf* _tmp7_; -#line 755 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->brightened; -#line 757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp1_ != NULL) { -#line 757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = TRUE; -#line 5157 "CheckerboardLayout.c" +#line 5050 "CheckerboardLayout.c" } else { GdkPixbuf* _tmp2_; -#line 757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = self->priv->pixbuf; -#line 757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = _tmp2_ == NULL; -#line 5164 "CheckerboardLayout.c" +#line 5057 "CheckerboardLayout.c" } -#line 757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp0_) { -#line 758 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 767 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 5170 "CheckerboardLayout.c" +#line 5063 "CheckerboardLayout.c" } -#line 761 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 770 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp3_ = self->priv->pixbuf; -#line 761 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 770 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp4_ = gdk_pixbuf_copy (_tmp3_); -#line 761 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 770 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->brightened); -#line 761 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 770 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->brightened = _tmp4_; -#line 762 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp5_ = self->priv->brightened; -#line 762 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" shift_colors (_tmp5_, CHECKERBOARD_ITEM_BRIGHTEN_SHIFT, CHECKERBOARD_ITEM_BRIGHTEN_SHIFT, CHECKERBOARD_ITEM_BRIGHTEN_SHIFT, 0); -#line 764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 773 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp6_ = self->priv->brightened; -#line 764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 773 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp7_ = _g_object_ref0 (_tmp6_); -#line 764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 773 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->display_pixbuf); -#line 764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 773 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->display_pixbuf = _tmp7_; -#line 766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 775 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); -#line 5194 "CheckerboardLayout.c" +#line 5087 "CheckerboardLayout.c" } -void checkerboard_item_unbrighten (CheckerboardItem* self) { +void +checkerboard_item_unbrighten (CheckerboardItem* self) +{ gboolean _tmp0_ = FALSE; GdkPixbuf* _tmp1_; GdkPixbuf* _tmp3_; GdkPixbuf* _tmp4_; -#line 769 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 778 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); -#line 771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 780 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->brightened; -#line 771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 780 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp1_ == NULL) { -#line 771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 780 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = TRUE; -#line 5211 "CheckerboardLayout.c" +#line 5106 "CheckerboardLayout.c" } else { GdkPixbuf* _tmp2_; -#line 771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 780 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = self->priv->pixbuf; -#line 771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 780 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = _tmp2_ == NULL; -#line 5218 "CheckerboardLayout.c" +#line 5113 "CheckerboardLayout.c" } -#line 771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 780 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp0_) { -#line 772 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 781 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 5224 "CheckerboardLayout.c" +#line 5119 "CheckerboardLayout.c" } -#line 774 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 783 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->brightened); -#line 774 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 783 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->brightened = NULL; -#line 777 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 786 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp3_ = self->priv->pixbuf; -#line 777 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 786 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp4_ = _g_object_ref0 (_tmp3_); -#line 777 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 786 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->display_pixbuf); -#line 777 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 786 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->display_pixbuf = _tmp4_; -#line 779 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 788 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); -#line 5240 "CheckerboardLayout.c" +#line 5135 "CheckerboardLayout.c" } -static void checkerboard_item_real_visibility_changed (DataView* base, gboolean visible) { +static void +checkerboard_item_real_visibility_changed (DataView* base, + gboolean visible) +{ CheckerboardItem * self; - gboolean _tmp0_; - gboolean _tmp1_; -#line 782 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); -#line 784 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = visible; -#line 784 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!_tmp0_) { -#line 785 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 793 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!visible) { +#line 794 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_unbrighten (self); -#line 5256 "CheckerboardLayout.c" +#line 5150 "CheckerboardLayout.c" } -#line 787 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = visible; -#line 787 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - DATA_VIEW_CLASS (checkerboard_item_parent_class)->visibility_changed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_VIEW, ThumbnailView), TYPE_DATA_VIEW, DataView), _tmp1_); -#line 5262 "CheckerboardLayout.c" +#line 796 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + DATA_VIEW_CLASS (checkerboard_item_parent_class)->visibility_changed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_VIEW, ThumbnailView), TYPE_DATA_VIEW, DataView), visible); +#line 5154 "CheckerboardLayout.c" } -static gboolean checkerboard_item_query_tooltip_on_text (CheckerboardItem* self, CheckerboardItemText* text, GtkTooltip* tooltip) { +static gboolean +checkerboard_item_query_tooltip_on_text (CheckerboardItem* self, + CheckerboardItemText* text, + GtkTooltip* tooltip) +{ gboolean result = FALSE; - CheckerboardItemText* _tmp0_; + PangoLayout* _tmp0_; PangoLayout* _tmp1_; - PangoLayout* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; - CheckerboardItemText* _tmp5_; - gboolean _tmp6_; -#line 790 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gboolean _tmp2_; +#line 799 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), FALSE); -#line 790 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 799 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM_TEXT (text), FALSE); -#line 790 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 799 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (GTK_IS_TOOLTIP (tooltip), FALSE); -#line 791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = text; -#line 791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = checkerboard_item_text_get_pango_layout (_tmp0_, 0); -#line 791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = _tmp1_; -#line 791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = pango_layout_is_ellipsized (_tmp2_); -#line 791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = !_tmp3_; -#line 791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_object_unref0 (_tmp2_); -#line 791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp4_) { -#line 792 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = checkerboard_item_text_get_pango_layout (text, 0); +#line 800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1_ = _tmp0_; +#line 800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = !pango_layout_is_ellipsized (_tmp1_); +#line 800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_object_unref0 (_tmp1_); +#line 800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp2_) { +#line 801 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = FALSE; -#line 792 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 801 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 5299 "CheckerboardLayout.c" +#line 5187 "CheckerboardLayout.c" } -#line 794 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = text; -#line 794 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = checkerboard_item_text_is_marked_up (_tmp5_); -#line 794 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp6_) { -#line 5307 "CheckerboardLayout.c" - GtkTooltip* _tmp7_; - CheckerboardItemText* _tmp8_; - gchar* _tmp9_; - gchar* _tmp10_; -#line 795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = tooltip; -#line 795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = text; -#line 795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = checkerboard_item_text_get_text (_tmp8_); -#line 795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = _tmp9_; -#line 795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gtk_tooltip_set_markup (_tmp7_, _tmp10_); -#line 795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_free0 (_tmp10_); -#line 5324 "CheckerboardLayout.c" +#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (checkerboard_item_text_is_marked_up (text)) { +#line 5191 "CheckerboardLayout.c" + gchar* _tmp3_; + gchar* _tmp4_; +#line 804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = checkerboard_item_text_get_text (text); +#line 804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = _tmp3_; +#line 804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gtk_tooltip_set_markup (tooltip, _tmp4_); +#line 804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_free0 (_tmp4_); +#line 5202 "CheckerboardLayout.c" } else { - GtkTooltip* _tmp11_; - CheckerboardItemText* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; -#line 797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = tooltip; -#line 797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = text; -#line 797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = checkerboard_item_text_get_text (_tmp12_); -#line 797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = _tmp13_; -#line 797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gtk_tooltip_set_text (_tmp11_, _tmp14_); -#line 797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_free0 (_tmp14_); -#line 5342 "CheckerboardLayout.c" + gchar* _tmp5_; + gchar* _tmp6_; +#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = checkerboard_item_text_get_text (text); +#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp6_ = _tmp5_; +#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gtk_tooltip_set_text (tooltip, _tmp6_); +#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_free0 (_tmp6_); +#line 5214 "CheckerboardLayout.c" } -#line 799 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = TRUE; -#line 799 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 5348 "CheckerboardLayout.c" +#line 5220 "CheckerboardLayout.c" } -gboolean checkerboard_item_query_tooltip (CheckerboardItem* self, gint x, gint y, GtkTooltip* tooltip) { +gboolean +checkerboard_item_query_tooltip (CheckerboardItem* self, + gint x, + gint y, + GtkTooltip* tooltip) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; CheckerboardItemText* _tmp2_; - gboolean _tmp12_ = FALSE; - gboolean _tmp13_ = FALSE; - CheckerboardItemText* _tmp14_; - gboolean _tmp24_ = FALSE; - gboolean _tmp25_ = FALSE; - CheckerboardItemText* _tmp26_; -#line 802 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gboolean _tmp7_ = FALSE; + gboolean _tmp8_ = FALSE; + CheckerboardItemText* _tmp9_; + gboolean _tmp14_ = FALSE; + gboolean _tmp15_ = FALSE; + CheckerboardItemText* _tmp16_; +#line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), FALSE); -#line 802 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (GTK_IS_TOOLTIP (tooltip), FALSE); -#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = self->priv->title; -#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp2_ != NULL) { -#line 5371 "CheckerboardLayout.c" +#line 5248 "CheckerboardLayout.c" gboolean _tmp3_; -#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp3_ = self->priv->title_visible; -#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = _tmp3_; -#line 5377 "CheckerboardLayout.c" +#line 5254 "CheckerboardLayout.c" } else { -#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = FALSE; -#line 5381 "CheckerboardLayout.c" +#line 5258 "CheckerboardLayout.c" } -#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp1_) { -#line 5385 "CheckerboardLayout.c" - gint _tmp4_; - gint _tmp5_; - CheckerboardItemText* _tmp6_; - GdkRectangle _tmp7_; - gboolean _tmp8_; -#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = x; -#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = y; -#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = self->priv->title; -#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = _tmp6_->allocation; -#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = coord_in_rectangle (_tmp4_, _tmp5_, &_tmp7_); -#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = _tmp8_; -#line 5403 "CheckerboardLayout.c" +#line 5262 "CheckerboardLayout.c" + CheckerboardItemText* _tmp4_; + GdkRectangle _tmp5_; +#line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = self->priv->title; +#line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = _tmp4_->allocation; +#line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = coord_in_rectangle (x, y, &_tmp5_); +#line 5271 "CheckerboardLayout.c" } else { -#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = FALSE; -#line 5407 "CheckerboardLayout.c" +#line 5275 "CheckerboardLayout.c" } -#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp0_) { -#line 5411 "CheckerboardLayout.c" - CheckerboardItemText* _tmp9_; - GtkTooltip* _tmp10_; - gboolean _tmp11_; -#line 804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = self->priv->title; -#line 804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = tooltip; -#line 804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = checkerboard_item_query_tooltip_on_text (self, _tmp9_, _tmp10_); -#line 804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - result = _tmp11_; -#line 804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 5279 "CheckerboardLayout.c" + CheckerboardItemText* _tmp6_; +#line 813 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp6_ = self->priv->title; +#line 813 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + result = checkerboard_item_query_tooltip_on_text (self, _tmp6_, tooltip); +#line 813 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 5425 "CheckerboardLayout.c" +#line 5287 "CheckerboardLayout.c" } -#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = self->priv->comment; -#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp14_ != NULL) { -#line 5431 "CheckerboardLayout.c" - gboolean _tmp15_; -#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp15_ = self->priv->comment_visible; -#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = _tmp15_; -#line 5437 "CheckerboardLayout.c" +#line 815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp9_ = self->priv->comment; +#line 815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp9_ != NULL) { +#line 5293 "CheckerboardLayout.c" + gboolean _tmp10_; +#line 815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp10_ = self->priv->comment_visible; +#line 815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp8_ = _tmp10_; +#line 5299 "CheckerboardLayout.c" } else { -#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = FALSE; -#line 5441 "CheckerboardLayout.c" +#line 815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp8_ = FALSE; +#line 5303 "CheckerboardLayout.c" } -#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp13_) { -#line 5445 "CheckerboardLayout.c" - gint _tmp16_; - gint _tmp17_; - CheckerboardItemText* _tmp18_; - GdkRectangle _tmp19_; - gboolean _tmp20_; -#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp16_ = x; -#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp17_ = y; -#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp18_ = self->priv->comment; -#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp19_ = _tmp18_->allocation; -#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp20_ = coord_in_rectangle (_tmp16_, _tmp17_, &_tmp19_); -#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = _tmp20_; -#line 5463 "CheckerboardLayout.c" +#line 815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp8_) { +#line 5307 "CheckerboardLayout.c" + CheckerboardItemText* _tmp11_; + GdkRectangle _tmp12_; +#line 815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp11_ = self->priv->comment; +#line 815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp12_ = _tmp11_->allocation; +#line 815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp7_ = coord_in_rectangle (x, y, &_tmp12_); +#line 5316 "CheckerboardLayout.c" } else { -#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = FALSE; -#line 5467 "CheckerboardLayout.c" +#line 815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp7_ = FALSE; +#line 5320 "CheckerboardLayout.c" } -#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp12_) { -#line 5471 "CheckerboardLayout.c" - CheckerboardItemText* _tmp21_; - GtkTooltip* _tmp22_; - gboolean _tmp23_; -#line 807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp21_ = self->priv->comment; -#line 807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp22_ = tooltip; -#line 807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp23_ = checkerboard_item_query_tooltip_on_text (self, _tmp21_, _tmp22_); -#line 807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - result = _tmp23_; -#line 807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp7_) { +#line 5324 "CheckerboardLayout.c" + CheckerboardItemText* _tmp13_; +#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp13_ = self->priv->comment; +#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + result = checkerboard_item_query_tooltip_on_text (self, _tmp13_, tooltip); +#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 5485 "CheckerboardLayout.c" - } -#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp26_ = self->priv->subtitle; -#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp26_ != NULL) { -#line 5491 "CheckerboardLayout.c" - gboolean _tmp27_; -#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp27_ = self->priv->subtitle_visible; -#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp25_ = _tmp27_; -#line 5497 "CheckerboardLayout.c" +#line 5332 "CheckerboardLayout.c" + } +#line 818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp16_ = self->priv->subtitle; +#line 818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp16_ != NULL) { +#line 5338 "CheckerboardLayout.c" + gboolean _tmp17_; +#line 818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp17_ = self->priv->subtitle_visible; +#line 818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp15_ = _tmp17_; +#line 5344 "CheckerboardLayout.c" } else { -#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp25_ = FALSE; -#line 5501 "CheckerboardLayout.c" +#line 818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp15_ = FALSE; +#line 5348 "CheckerboardLayout.c" } -#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp25_) { -#line 5505 "CheckerboardLayout.c" - gint _tmp28_; - gint _tmp29_; - CheckerboardItemText* _tmp30_; - GdkRectangle _tmp31_; - gboolean _tmp32_; -#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp28_ = x; -#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp29_ = y; -#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp30_ = self->priv->subtitle; -#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp31_ = _tmp30_->allocation; -#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp32_ = coord_in_rectangle (_tmp28_, _tmp29_, &_tmp31_); -#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp24_ = _tmp32_; -#line 5523 "CheckerboardLayout.c" +#line 818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp15_) { +#line 5352 "CheckerboardLayout.c" + CheckerboardItemText* _tmp18_; + GdkRectangle _tmp19_; +#line 818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp18_ = self->priv->subtitle; +#line 818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp19_ = _tmp18_->allocation; +#line 818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp14_ = coord_in_rectangle (x, y, &_tmp19_); +#line 5361 "CheckerboardLayout.c" } else { -#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp24_ = FALSE; -#line 5527 "CheckerboardLayout.c" - } -#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp24_) { -#line 5531 "CheckerboardLayout.c" - CheckerboardItemText* _tmp33_; - GtkTooltip* _tmp34_; - gboolean _tmp35_; -#line 810 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp33_ = self->priv->subtitle; -#line 810 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp34_ = tooltip; -#line 810 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp35_ = checkerboard_item_query_tooltip_on_text (self, _tmp33_, _tmp34_); -#line 810 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - result = _tmp35_; -#line 810 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp14_ = FALSE; +#line 5365 "CheckerboardLayout.c" + } +#line 818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp14_) { +#line 5369 "CheckerboardLayout.c" + CheckerboardItemText* _tmp20_; +#line 819 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp20_ = self->priv->subtitle; +#line 819 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + result = checkerboard_item_query_tooltip_on_text (self, _tmp20_, tooltip); +#line 819 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 5545 "CheckerboardLayout.c" +#line 5377 "CheckerboardLayout.c" } -#line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = FALSE; -#line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 5551 "CheckerboardLayout.c" +#line 5383 "CheckerboardLayout.c" } -gboolean checkerboard_item_get_has_tags (CheckerboardItem* self) { +gboolean +checkerboard_item_get_has_tags (CheckerboardItem* self) +{ gboolean result; gboolean _tmp0_; #line 161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" @@ -5562,29 +5396,30 @@ gboolean checkerboard_item_get_has_tags (CheckerboardItem* self) { result = _tmp0_; #line 161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 5566 "CheckerboardLayout.c" +#line 5400 "CheckerboardLayout.c" } -static void checkerboard_item_set_has_tags (CheckerboardItem* self, gboolean value) { +static void +checkerboard_item_set_has_tags (CheckerboardItem* self, + gboolean value) +{ #line 161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (self)); #line 161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (checkerboard_item_get_has_tags (self) != value) { -#line 5575 "CheckerboardLayout.c" - gboolean _tmp0_; #line 161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = value; + self->priv->_has_tags = value; #line 161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->_has_tags = _tmp0_; -#line 161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_object_notify ((GObject *) self, "has-tags"); -#line 5583 "CheckerboardLayout.c" + g_object_notify_by_pspec ((GObject *) self, checkerboard_item_properties[CHECKERBOARD_ITEM_HAS_TAGS_PROPERTY]); +#line 5416 "CheckerboardLayout.c" } } -static void checkerboard_item_class_init (CheckerboardItemClass * klass) { +static void +checkerboard_item_class_init (CheckerboardItemClass * klass) +{ #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_parent_class = g_type_class_peek_parent (klass); #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" @@ -5624,12 +5459,14 @@ static void checkerboard_item_class_init (CheckerboardItemClass * klass) { #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" G_OBJECT_CLASS (klass)->finalize = checkerboard_item_finalize; #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), CHECKERBOARD_ITEM_HAS_TAGS_PROPERTY, g_param_spec_boolean ("has-tags", "has-tags", "has-tags", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 5629 "CheckerboardLayout.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), CHECKERBOARD_ITEM_HAS_TAGS_PROPERTY, checkerboard_item_properties[CHECKERBOARD_ITEM_HAS_TAGS_PROPERTY] = g_param_spec_boolean ("has-tags", "has-tags", "has-tags", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 5464 "CheckerboardLayout.c" } -static void checkerboard_item_instance_init (CheckerboardItem * self) { +static void +checkerboard_item_instance_init (CheckerboardItem * self) +{ #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv = CHECKERBOARD_ITEM_GET_PRIVATE (self); #line 119 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" @@ -5670,11 +5507,13 @@ static void checkerboard_item_instance_init (CheckerboardItem * self) { self->priv->row = -1; #line 139 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->horizontal_trinket_offset = 0; -#line 5674 "CheckerboardLayout.c" +#line 5511 "CheckerboardLayout.c" } -static void checkerboard_item_finalize (GObject * obj) { +static void +checkerboard_item_finalize (GObject * obj) +{ CheckerboardItem * self; #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); @@ -5696,11 +5535,13 @@ static void checkerboard_item_finalize (GObject * obj) { _g_object_unref0 (self->priv->brightened); #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" G_OBJECT_CLASS (checkerboard_item_parent_class)->finalize (obj); -#line 5700 "CheckerboardLayout.c" +#line 5539 "CheckerboardLayout.c" } -GType checkerboard_item_get_type (void) { +GType +checkerboard_item_get_type (void) +{ static volatile gsize checkerboard_item_type_id__volatile = 0; if (g_once_init_enter (&checkerboard_item_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CheckerboardItemClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) checkerboard_item_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CheckerboardItem), 0, (GInstanceInitFunc) checkerboard_item_instance_init, NULL }; @@ -5712,7 +5553,12 @@ GType checkerboard_item_get_type (void) { } -static void _vala_checkerboard_item_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_checkerboard_item_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ CheckerboardItem * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" @@ -5723,18 +5569,23 @@ static void _vala_checkerboard_item_get_property (GObject * object, guint proper g_value_set_boolean (value, checkerboard_item_get_has_tags (self)); #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 5727 "CheckerboardLayout.c" +#line 5573 "CheckerboardLayout.c" default: #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 5733 "CheckerboardLayout.c" +#line 5579 "CheckerboardLayout.c" } } -static void _vala_checkerboard_item_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { +static void +_vala_checkerboard_item_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec) +{ CheckerboardItem * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" @@ -5745,305 +5596,324 @@ static void _vala_checkerboard_item_set_property (GObject * object, guint proper checkerboard_item_set_has_tags (self, g_value_get_boolean (value)); #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 5749 "CheckerboardLayout.c" +#line 5600 "CheckerboardLayout.c" default: #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 5755 "CheckerboardLayout.c" +#line 5606 "CheckerboardLayout.c" } } -static void _checkerboard_layout_on_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { -#line 902 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +_checkerboard_layout_on_contents_altered_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self) +{ +#line 911 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_on_contents_altered ((CheckerboardLayout*) self, added, removed); -#line 5763 "CheckerboardLayout.c" +#line 5619 "CheckerboardLayout.c" } -static void _checkerboard_layout_on_items_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { -#line 903 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +_checkerboard_layout_on_items_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ +#line 912 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_on_items_altered ((CheckerboardLayout*) self); -#line 5770 "CheckerboardLayout.c" +#line 5630 "CheckerboardLayout.c" } -static void _checkerboard_layout_on_items_state_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) { -#line 904 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +_checkerboard_layout_on_items_state_changed_view_collection_items_state_changed (ViewCollection* _sender, + GeeIterable* changed, + gpointer self) +{ +#line 913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_on_items_state_changed ((CheckerboardLayout*) self, changed); -#line 5777 "CheckerboardLayout.c" +#line 5641 "CheckerboardLayout.c" } -static void _checkerboard_layout_on_items_visibility_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) { -#line 905 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +_checkerboard_layout_on_items_visibility_changed_view_collection_items_visibility_changed (ViewCollection* _sender, + GeeCollection* changed, + gpointer self) +{ +#line 914 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_on_items_visibility_changed ((CheckerboardLayout*) self, changed); -#line 5784 "CheckerboardLayout.c" +#line 5652 "CheckerboardLayout.c" } -static void _checkerboard_layout_on_ordering_changed_data_collection_ordering_changed (DataCollection* _sender, gpointer self) { -#line 906 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +_checkerboard_layout_on_ordering_changed_data_collection_ordering_changed (DataCollection* _sender, + gpointer self) +{ +#line 915 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_on_ordering_changed ((CheckerboardLayout*) self); -#line 5791 "CheckerboardLayout.c" +#line 5662 "CheckerboardLayout.c" } -static void _checkerboard_layout_on_views_altered_view_collection_views_altered (ViewCollection* _sender, GeeCollection* views, gpointer self) { -#line 907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +_checkerboard_layout_on_views_altered_view_collection_views_altered (ViewCollection* _sender, + GeeCollection* views, + gpointer self) +{ +#line 916 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_on_views_altered ((CheckerboardLayout*) self, views); -#line 5798 "CheckerboardLayout.c" +#line 5673 "CheckerboardLayout.c" } -static void _checkerboard_layout_on_geometries_altered_view_collection_geometries_altered (ViewCollection* _sender, GeeCollection* views, gpointer self) { -#line 908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +_checkerboard_layout_on_geometries_altered_view_collection_geometries_altered (ViewCollection* _sender, + GeeCollection* views, + gpointer self) +{ +#line 917 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_on_geometries_altered ((CheckerboardLayout*) self); -#line 5805 "CheckerboardLayout.c" +#line 5684 "CheckerboardLayout.c" } -static void _checkerboard_layout_on_items_selection_changed_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self) { -#line 909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +_checkerboard_layout_on_items_selection_changed_view_collection_items_selected (ViewCollection* _sender, + GeeIterable* selected, + gpointer self) +{ +#line 918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_on_items_selection_changed ((CheckerboardLayout*) self); -#line 5812 "CheckerboardLayout.c" +#line 5695 "CheckerboardLayout.c" } -static void _checkerboard_layout_on_items_selection_changed_view_collection_items_unselected (ViewCollection* _sender, GeeIterable* unselected, gpointer self) { -#line 910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +_checkerboard_layout_on_items_selection_changed_view_collection_items_unselected (ViewCollection* _sender, + GeeIterable* unselected, + gpointer self) +{ +#line 919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_on_items_selection_changed ((CheckerboardLayout*) self); -#line 5819 "CheckerboardLayout.c" +#line 5706 "CheckerboardLayout.c" } -static void _checkerboard_layout_on_viewport_shifted_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) { -#line 913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +_checkerboard_layout_on_viewport_shifted_gtk_adjustment_value_changed (GtkAdjustment* _sender, + gpointer self) +{ +#line 922 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_on_viewport_shifted ((CheckerboardLayout*) self); -#line 5826 "CheckerboardLayout.c" +#line 5716 "CheckerboardLayout.c" } -static void _checkerboard_layout_on_viewport_resized_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) { -#line 919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +_checkerboard_layout_on_viewport_resized_gtk_widget_size_allocate (GtkWidget* _sender, + GtkAllocation* allocation, + gpointer self) +{ +#line 928 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_on_viewport_resized ((CheckerboardLayout*) self); -#line 5833 "CheckerboardLayout.c" +#line 5727 "CheckerboardLayout.c" } -static void _checkerboard_layout_on_colors_changed_config_facade_colors_changed (ConfigFacade* _sender, gpointer self) { -#line 921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +_checkerboard_layout_on_colors_changed_config_facade_colors_changed (ConfigFacade* _sender, + gpointer self) +{ +#line 930 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_on_colors_changed ((CheckerboardLayout*) self); -#line 5840 "CheckerboardLayout.c" +#line 5737 "CheckerboardLayout.c" } -static gpointer _data_collection_ref0 (gpointer self) { -#line 874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static gpointer +_data_collection_ref0 (gpointer self) +{ +#line 883 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return self ? data_collection_ref (self) : NULL; -#line 5847 "CheckerboardLayout.c" +#line 5746 "CheckerboardLayout.c" } -CheckerboardLayout* checkerboard_layout_construct (GType object_type, ViewCollection* view) { +CheckerboardLayout* +checkerboard_layout_construct (GType object_type, + ViewCollection* view) +{ CheckerboardLayout * self = NULL; ViewCollection* _tmp0_; - ViewCollection* _tmp1_; - ViewCollection* _tmp2_; - ViewCollection* _tmp3_; - ViewCollection* _tmp4_; - ViewCollection* _tmp5_; - ViewCollection* _tmp6_; - ViewCollection* _tmp7_; - ViewCollection* _tmp8_; - ViewCollection* _tmp9_; - ViewCollection* _tmp10_; - ConfigFacade* _tmp11_; - ConfigFacade* _tmp12_; - GdkRGBA _tmp13_ = {0}; - ConfigFacade* _tmp14_; - ConfigFacade* _tmp15_; -#line 873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + ConfigFacade* _tmp1_; + ConfigFacade* _tmp2_; + GdkRGBA _tmp3_ = {0}; + ConfigFacade* _tmp4_; + ConfigFacade* _tmp5_; +#line 882 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (view), NULL); -#line 873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 882 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self = (CheckerboardLayout*) g_object_new (object_type, NULL); -#line 874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = view; -#line 874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = _data_collection_ref0 (_tmp0_); -#line 874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 883 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = _data_collection_ref0 (view); +#line 883 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _data_collection_unref0 (self->priv->view); -#line 874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->view = _tmp1_; -#line 876 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_layout_clear_drag_select (self); -#line 879 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = view; -#line 879 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _checkerboard_layout_on_contents_altered_data_collection_contents_altered, self, 0); -#line 880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = view; -#line 880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _checkerboard_layout_on_items_altered_data_collection_items_altered, self, 0); -#line 881 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = view; -#line 881 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_signal_connect_object (_tmp4_, "items-state-changed", (GCallback) _checkerboard_layout_on_items_state_changed_view_collection_items_state_changed, self, 0); -#line 882 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = view; -#line 882 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_signal_connect_object (_tmp5_, "items-visibility-changed", (GCallback) _checkerboard_layout_on_items_visibility_changed_view_collection_items_visibility_changed, self, 0); #line 883 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = view; -#line 883 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), "ordering-changed", (GCallback) _checkerboard_layout_on_ordering_changed_data_collection_ordering_changed, self, 0); -#line 884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = view; -#line 884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_signal_connect_object (_tmp7_, "views-altered", (GCallback) _checkerboard_layout_on_views_altered_view_collection_views_altered, self, 0); -#line 885 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = view; + self->priv->view = _tmp0_; #line 885 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_signal_connect_object (_tmp8_, "geometries-altered", (GCallback) _checkerboard_layout_on_geometries_altered_view_collection_geometries_altered, self, 0); -#line 886 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = view; -#line 886 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_signal_connect_object (_tmp9_, "items-selected", (GCallback) _checkerboard_layout_on_items_selection_changed_view_collection_items_selected, self, 0); -#line 887 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = view; -#line 887 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_signal_connect_object (_tmp10_, "items-unselected", (GCallback) _checkerboard_layout_on_items_selection_changed_view_collection_items_unselected, self, 0); -#line 889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = config_facade_get_instance (); -#line 889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = _tmp11_; -#line 889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - config_facade_get_bg_color (_tmp12_, &_tmp13_); -#line 889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gtk_widget_override_background_color (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), GTK_STATE_FLAG_NORMAL, &_tmp13_); + checkerboard_layout_clear_drag_select (self); +#line 888 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _checkerboard_layout_on_contents_altered_data_collection_contents_altered, self, 0); #line 889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_object_unref0 (_tmp12_); -#line 891 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = config_facade_get_instance (); -#line 891 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp15_ = _tmp14_; -#line 891 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_signal_connect_object (_tmp15_, "colors-changed", (GCallback) _checkerboard_layout_on_colors_changed_config_facade_colors_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _checkerboard_layout_on_items_altered_data_collection_items_altered, self, 0); +#line 890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + g_signal_connect_object (view, "items-state-changed", (GCallback) _checkerboard_layout_on_items_state_changed_view_collection_items_state_changed, self, 0); #line 891 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_object_unref0 (_tmp15_); + g_signal_connect_object (view, "items-visibility-changed", (GCallback) _checkerboard_layout_on_items_visibility_changed_view_collection_items_visibility_changed, self, 0); +#line 892 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), "ordering-changed", (GCallback) _checkerboard_layout_on_ordering_changed_data_collection_ordering_changed, self, 0); +#line 893 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + g_signal_connect_object (view, "views-altered", (GCallback) _checkerboard_layout_on_views_altered_view_collection_views_altered, self, 0); #line 894 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + g_signal_connect_object (view, "geometries-altered", (GCallback) _checkerboard_layout_on_geometries_altered_view_collection_geometries_altered, self, 0); +#line 895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + g_signal_connect_object (view, "items-selected", (GCallback) _checkerboard_layout_on_items_selection_changed_view_collection_items_selected, self, 0); +#line 896 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + g_signal_connect_object (view, "items-unselected", (GCallback) _checkerboard_layout_on_items_selection_changed_view_collection_items_unselected, self, 0); +#line 898 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1_ = config_facade_get_instance (); +#line 898 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = _tmp1_; +#line 898 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + config_facade_get_bg_color (_tmp2_, &_tmp3_); +#line 898 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gtk_widget_override_background_color (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), GTK_STATE_FLAG_NORMAL, &_tmp3_); +#line 898 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_object_unref0 (_tmp2_); +#line 900 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = config_facade_get_instance (); +#line 900 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = _tmp4_; +#line 900 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + g_signal_connect_object (_tmp5_, "colors-changed", (GCallback) _checkerboard_layout_on_colors_changed_config_facade_colors_changed, self, 0); +#line 900 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_object_unref0 (_tmp5_); +#line 903 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" gtk_widget_set_has_tooltip (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), TRUE); -#line 873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 882 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return self; -#line 5941 "CheckerboardLayout.c" +#line 5813 "CheckerboardLayout.c" } -CheckerboardLayout* checkerboard_layout_new (ViewCollection* view) { -#line 873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +CheckerboardLayout* +checkerboard_layout_new (ViewCollection* view) +{ +#line 882 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return checkerboard_layout_construct (TYPE_CHECKERBOARD_LAYOUT, view); -#line 5948 "CheckerboardLayout.c" +#line 5822 "CheckerboardLayout.c" } -void checkerboard_layout_set_adjustments (CheckerboardLayout* self, GtkAdjustment* hadjustment, GtkAdjustment* vadjustment) { +void +checkerboard_layout_set_adjustments (CheckerboardLayout* self, + GtkAdjustment* hadjustment, + GtkAdjustment* vadjustment) +{ GtkAdjustment* _tmp0_; GtkAdjustment* _tmp1_; - GtkAdjustment* _tmp2_; - GtkAdjustment* _tmp3_; - GtkAdjustment* _tmp4_; - GtkAdjustment* _tmp5_; - GtkContainer* _tmp6_; - GtkContainer* _tmp7_; -#line 924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GtkContainer* _tmp2_; + GtkContainer* _tmp3_; +#line 933 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 933 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (GTK_IS_ADJUSTMENT (hadjustment)); -#line 924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 933 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (GTK_IS_ADJUSTMENT (vadjustment)); -#line 925 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = hadjustment; -#line 925 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); -#line 925 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 934 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = _g_object_ref0 (hadjustment); +#line 934 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->hadjustment); -#line 925 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->hadjustment = _tmp1_; -#line 926 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = vadjustment; -#line 926 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); -#line 926 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 934 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->hadjustment = _tmp0_; +#line 935 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1_ = _g_object_ref0 (vadjustment); +#line 935 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->vadjustment); -#line 926 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->vadjustment = _tmp3_; -#line 929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = hadjustment; -#line 929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_signal_connect_object (_tmp4_, "value-changed", (GCallback) _checkerboard_layout_on_viewport_shifted_gtk_adjustment_value_changed, self, 0); -#line 930 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = vadjustment; -#line 930 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_signal_connect_object (_tmp5_, "value-changed", (GCallback) _checkerboard_layout_on_viewport_shifted_gtk_adjustment_value_changed, self, 0); -#line 933 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 933 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = _tmp6_; -#line 933 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), "size-allocate", (GCallback) _checkerboard_layout_on_viewport_resized_gtk_widget_size_allocate, self, 0); -#line 5997 "CheckerboardLayout.c" +#line 935 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->vadjustment = _tmp1_; +#line 938 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + g_signal_connect_object (hadjustment, "value-changed", (GCallback) _checkerboard_layout_on_viewport_shifted_gtk_adjustment_value_changed, self, 0); +#line 939 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + g_signal_connect_object (vadjustment, "value-changed", (GCallback) _checkerboard_layout_on_viewport_shifted_gtk_adjustment_value_changed, self, 0); +#line 942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); +#line 942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = _tmp2_; +#line 942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), "size-allocate", (GCallback) _checkerboard_layout_on_viewport_resized_gtk_widget_size_allocate, self, 0); +#line 5863 "CheckerboardLayout.c" } -void checkerboard_layout_set_scale (CheckerboardLayout* self, gint scale) { - gint _tmp0_; -#line 938 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +void +checkerboard_layout_set_scale (CheckerboardLayout* self, + gint scale) +{ +#line 947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 939 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = scale; -#line 939 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->scale = _tmp0_; -#line 6009 "CheckerboardLayout.c" +#line 948 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->scale = scale; +#line 5875 "CheckerboardLayout.c" } -gint checkerboard_layout_get_scale (CheckerboardLayout* self) { +gint +checkerboard_layout_get_scale (CheckerboardLayout* self) +{ gint result = 0; gint _tmp0_; -#line 942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 951 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), 0); -#line 943 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 952 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->scale; -#line 943 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 952 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = _tmp0_; -#line 943 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 952 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 6024 "CheckerboardLayout.c" +#line 5892 "CheckerboardLayout.c" } -void checkerboard_layout_set_name (CheckerboardLayout* self, const gchar* name) { - const gchar* _tmp0_; - gchar* _tmp1_; -#line 946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +void +checkerboard_layout_set_name (CheckerboardLayout* self, + const gchar* name) +{ + gchar* _tmp0_; +#line 955 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 955 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (name != NULL); -#line 947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = name; -#line 947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 956 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = g_strdup (name); +#line 956 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_free0 (self->priv->page_name); -#line 947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->page_name = _tmp1_; -#line 6043 "CheckerboardLayout.c" +#line 956 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->page_name = _tmp0_; +#line 5911 "CheckerboardLayout.c" } -static void checkerboard_layout_on_viewport_resized (CheckerboardLayout* self) { +static void +checkerboard_layout_on_viewport_resized (CheckerboardLayout* self) +{ GtkRequisition req = {0}; GtkRequisition _tmp0_ = {0}; GtkAllocation parent_allocation = {0}; @@ -6052,127 +5922,135 @@ static void checkerboard_layout_on_viewport_resized (CheckerboardLayout* self) { GtkAllocation _tmp3_ = {0}; const gchar* _tmp4_; gboolean _tmp15_; -#line 950 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 952 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 961 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" gtk_widget_get_preferred_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL, &_tmp0_); -#line 952 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 961 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" req = _tmp0_; -#line 955 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 955 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = _tmp1_; -#line 955 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), &_tmp3_); -#line 955 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" parent_allocation = _tmp3_; -#line 957 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 966 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp4_ = self->priv->message; -#line 957 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 966 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp4_ == NULL) { -#line 6074 "CheckerboardLayout.c" +#line 5944 "CheckerboardLayout.c" GtkRequisition _tmp5_; gint _tmp6_; -#line 966 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 975 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp5_ = req; -#line 966 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 975 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp6_ = _tmp5_.height; -#line 966 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 975 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp6_ != 0) { -#line 6083 "CheckerboardLayout.c" +#line 5953 "CheckerboardLayout.c" GtkAllocation _tmp7_; gint _tmp8_; GtkRequisition _tmp9_; gint _tmp10_; -#line 967 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 976 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp7_ = parent_allocation; -#line 967 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 976 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp8_ = _tmp7_.width; -#line 967 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 976 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp9_ = req; -#line 967 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 976 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp10_ = _tmp9_.height; -#line 967 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 976 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp8_ - CHECKERBOARD_LAYOUT_SCROLLBAR_PLACEHOLDER_WIDTH, _tmp10_); -#line 6098 "CheckerboardLayout.c" +#line 5968 "CheckerboardLayout.c" } } else { GtkAllocation _tmp11_; gint _tmp12_; GtkAllocation _tmp13_; gint _tmp14_; -#line 971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 980 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp11_ = parent_allocation; -#line 971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 980 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp12_ = _tmp11_.width; -#line 971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 980 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp13_ = parent_allocation; -#line 971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 980 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp14_ = _tmp13_.height; -#line 971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 980 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp12_, _tmp14_); -#line 6115 "CheckerboardLayout.c" +#line 5985 "CheckerboardLayout.c" } -#line 976 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 985 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_viewport_resized (self); -#line 978 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp15_ = self->priv->size_allocate_due_to_reflow; -#line 978 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (!_tmp15_) { -#line 979 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 988 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_clear_anchor (self); -#line 6125 "CheckerboardLayout.c" +#line 5995 "CheckerboardLayout.c" } else { -#line 981 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->size_allocate_due_to_reflow = FALSE; -#line 6129 "CheckerboardLayout.c" +#line 5999 "CheckerboardLayout.c" } } -static void checkerboard_layout_on_viewport_shifted (CheckerboardLayout* self) { -#line 984 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +checkerboard_layout_on_viewport_shifted (CheckerboardLayout* self) +{ +#line 993 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 985 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 994 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_update_visible_page (self); -#line 986 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 995 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_need_exposure (self, "on_viewport_shift"); -#line 988 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 997 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_clear_anchor (self); -#line 6143 "CheckerboardLayout.c" +#line 6015 "CheckerboardLayout.c" } -static void checkerboard_layout_on_items_selection_changed (CheckerboardLayout* self) { -#line 991 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +checkerboard_layout_on_items_selection_changed (CheckerboardLayout* self) +{ +#line 1000 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 992 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_clear_anchor (self); -#line 6152 "CheckerboardLayout.c" +#line 6026 "CheckerboardLayout.c" } -static void checkerboard_layout_clear_anchor (CheckerboardLayout* self) { +static void +checkerboard_layout_clear_anchor (CheckerboardLayout* self) +{ gboolean _tmp0_; -#line 995 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1004 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 996 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1005 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->in_center_on_anchor; -#line 996 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1005 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp0_) { -#line 997 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 6166 "CheckerboardLayout.c" +#line 6042 "CheckerboardLayout.c" } -#line 999 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1008 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->anchor); -#line 999 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1008 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->anchor = NULL; -#line 6172 "CheckerboardLayout.c" +#line 6048 "CheckerboardLayout.c" } -static void checkerboard_layout_update_anchor (CheckerboardLayout* self) { +static void +checkerboard_layout_update_anchor (CheckerboardLayout* self) +{ gboolean _tmp0_; GeeList* items_on_page = NULL; GdkRectangle _tmp1_; @@ -6180,42 +6058,41 @@ static void checkerboard_layout_update_anchor (CheckerboardLayout* self) { GeeList* _tmp3_; gint _tmp4_; gint _tmp5_; - GtkAdjustment* _tmp21_; - gdouble _tmp22_; - GeeList* _tmp23_; - GeeList* _tmp24_; - gint _tmp25_; - gint _tmp26_; - gpointer _tmp27_; -#line 1002 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GtkAdjustment* _tmp20_; + GeeList* _tmp21_; + GeeList* _tmp22_; + gint _tmp23_; + gint _tmp24_; + gpointer _tmp25_; +#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1003 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->in_center_on_anchor; -#line 1003 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _vala_assert (!_tmp0_, "!in_center_on_anchor"); -#line 1005 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->visible_page; -#line 1005 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = checkerboard_layout_intersection (self, &_tmp1_); -#line 1005 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" items_on_page = _tmp2_; -#line 1006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1015 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp3_ = items_on_page; -#line 1006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1015 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1015 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp5_ = _tmp4_; -#line 1006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1015 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp5_ == 0) { -#line 1007 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->anchor); -#line 1007 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->anchor = NULL; -#line 1008 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1017 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (items_on_page); -#line 1008 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1017 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 6219 "CheckerboardLayout.c" +#line 6096 "CheckerboardLayout.c" } { GeeList* _item_list = NULL; @@ -6226,25 +6103,25 @@ static void checkerboard_layout_update_anchor (CheckerboardLayout* self) { gint _tmp9_; gint _tmp10_; gint _item_index = 0; -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp6_ = items_on_page; -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp7_ = _g_object_ref0 (_tmp6_); -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _item_list = _tmp7_; -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp8_ = _item_list; -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp10_ = _tmp9_; -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _item_size = _tmp10_; -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _item_index = -1; -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" while (TRUE) { -#line 6248 "CheckerboardLayout.c" +#line 6125 "CheckerboardLayout.c" gint _tmp11_; gint _tmp12_; gint _tmp13_; @@ -6253,101 +6130,99 @@ static void checkerboard_layout_update_anchor (CheckerboardLayout* self) { gint _tmp15_; gpointer _tmp16_; CheckerboardItem* _tmp17_; - gboolean _tmp18_; -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp11_ = _item_index; -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _item_index = _tmp11_ + 1; -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp12_ = _item_index; -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp13_ = _item_size; -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (!(_tmp12_ < _tmp13_)) { -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 6270 "CheckerboardLayout.c" +#line 6146 "CheckerboardLayout.c" } -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp14_ = _item_list; -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp15_ = _item_index; -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp16_ = gee_list_get (_tmp14_, _tmp15_); -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" item = (CheckerboardItem*) _tmp16_; -#line 1012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1021 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp17_ = item; -#line 1012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp18_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_VIEW, DataView)); -#line 1012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp18_) { -#line 6286 "CheckerboardLayout.c" +#line 1021 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_VIEW, DataView))) { +#line 6160 "CheckerboardLayout.c" + CheckerboardItem* _tmp18_; CheckerboardItem* _tmp19_; - CheckerboardItem* _tmp20_; -#line 1013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp19_ = item; -#line 1013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp20_ = _g_object_ref0 (_tmp19_); -#line 1013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1022 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp18_ = item; +#line 1022 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp19_ = _g_object_ref0 (_tmp18_); +#line 1022 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->anchor); -#line 1013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->anchor = _tmp20_; -#line 1014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1022 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->anchor = _tmp19_; +#line 1023 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (item); -#line 1014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1023 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (_item_list); -#line 1014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1023 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (items_on_page); -#line 1014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1023 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 6305 "CheckerboardLayout.c" +#line 6179 "CheckerboardLayout.c" } -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (item); -#line 6309 "CheckerboardLayout.c" +#line 6183 "CheckerboardLayout.c" } -#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (_item_list); -#line 6313 "CheckerboardLayout.c" +#line 6187 "CheckerboardLayout.c" } -#line 1018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp21_ = self->priv->vadjustment; -#line 1018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp22_ = gtk_adjustment_get_value (_tmp21_); -#line 1018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp22_ == ((gdouble) 0)) { -#line 1019 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1027 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp20_ = self->priv->vadjustment; +#line 1027 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (gtk_adjustment_get_value (_tmp20_) == ((gdouble) 0)) { +#line 1028 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->anchor); -#line 1019 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1028 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->anchor = NULL; -#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1029 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (items_on_page); -#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1029 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 6329 "CheckerboardLayout.c" - } -#line 1025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp23_ = items_on_page; -#line 1025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp24_ = items_on_page; -#line 1025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp25_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp26_ = _tmp25_; -#line 1025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp27_ = gee_list_get (_tmp23_, ((gint) _tmp26_) / 2); -#line 1025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 6201 "CheckerboardLayout.c" + } +#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp21_ = items_on_page; +#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp22_ = items_on_page; +#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp23_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp24_ = _tmp23_; +#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp25_ = gee_list_get (_tmp21_, ((gint) _tmp24_) / 2); +#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->anchor); -#line 1025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->anchor = (CheckerboardItem*) _tmp27_; -#line 1002 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->anchor = (CheckerboardItem*) _tmp25_; +#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (items_on_page); -#line 6347 "CheckerboardLayout.c" +#line 6219 "CheckerboardLayout.c" } -static void checkerboard_layout_center_on_anchor (CheckerboardLayout* self, gdouble upper) { +static void +checkerboard_layout_center_on_anchor (CheckerboardLayout* self, + gdouble upper) +{ CheckerboardItem* _tmp0_; gdouble anchor_pos = 0.0; CheckerboardItem* _tmp1_; @@ -6357,1699 +6232,1555 @@ static void checkerboard_layout_center_on_anchor (CheckerboardLayout* self, gdou GdkRectangle _tmp5_; gint _tmp6_; GtkAdjustment* _tmp7_; - gdouble _tmp8_; - GtkAdjustment* _tmp9_; - gdouble _tmp10_; + GtkAdjustment* _tmp8_; + gdouble _tmp9_; + GtkAdjustment* _tmp10_; GtkAdjustment* _tmp11_; - gdouble _tmp12_; - GtkAdjustment* _tmp13_; - gdouble _tmp14_; - GtkAdjustment* _tmp15_; - gdouble _tmp16_; - gdouble _tmp17_; -#line 1028 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GtkAdjustment* _tmp12_; +#line 1037 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1029 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1038 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->anchor; -#line 1029 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1038 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp0_ == NULL) { -#line 1030 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1039 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 6379 "CheckerboardLayout.c" +#line 6249 "CheckerboardLayout.c" } -#line 1032 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1041 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->in_center_on_anchor = TRUE; -#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1043 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->anchor; -#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1043 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = _tmp1_->allocation; -#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1043 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp3_ = _tmp2_.y; -#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1043 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp4_ = self->priv->anchor; -#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1043 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp5_ = _tmp4_->allocation; -#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1043 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp6_ = _tmp5_.height; -#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1043 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp7_ = self->priv->vadjustment; -#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = gtk_adjustment_get_page_size (_tmp7_); -#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - anchor_pos = (_tmp3_ + (_tmp6_ / 2)) - (_tmp8_ / 2); -#line 1036 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = self->priv->vadjustment; -#line 1036 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = anchor_pos; -#line 1036 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1043 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + anchor_pos = (_tmp3_ + (_tmp6_ / 2)) - (gtk_adjustment_get_page_size (_tmp7_) / 2); +#line 1045 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp8_ = self->priv->vadjustment; +#line 1045 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp9_ = anchor_pos; +#line 1045 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp10_ = self->priv->vadjustment; +#line 1045 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp11_ = self->priv->vadjustment; -#line 1036 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = gtk_adjustment_get_lower (_tmp11_); -#line 1036 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = self->priv->vadjustment; -#line 1036 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = gtk_adjustment_get_upper (_tmp13_); -#line 1036 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp15_ = self->priv->vadjustment; -#line 1036 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp16_ = gtk_adjustment_get_page_size (_tmp15_); -#line 1036 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp17_ = CLAMP (_tmp10_, _tmp12_, _tmp14_ - _tmp16_); -#line 1036 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gtk_adjustment_set_value (_tmp9_, _tmp17_); -#line 1039 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1045 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp12_ = self->priv->vadjustment; +#line 1045 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gtk_adjustment_set_value (_tmp8_, CLAMP (_tmp9_, gtk_adjustment_get_lower (_tmp10_), gtk_adjustment_get_upper (_tmp11_) - gtk_adjustment_get_page_size (_tmp12_))); +#line 1048 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->in_center_on_anchor = FALSE; -#line 6423 "CheckerboardLayout.c" +#line 6283 "CheckerboardLayout.c" } -void checkerboard_layout_set_cursor (CheckerboardLayout* self, CheckerboardItem* item) { +void +checkerboard_layout_set_cursor (CheckerboardLayout* self, + CheckerboardItem* item) +{ GeeHashSet* collection = NULL; GeeHashSet* _tmp0_; CheckerboardItem* _tmp1_; - CheckerboardItem* _tmp8_; - CheckerboardItem* _tmp9_; - CheckerboardItem* _tmp10_; - GeeHashSet* _tmp11_; - CheckerboardItem* _tmp12_; - GeeHashSet* _tmp13_; -#line 1042 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + CheckerboardItem* _tmp7_; + GeeHashSet* _tmp8_; + GeeHashSet* _tmp9_; +#line 1051 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1042 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1051 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (item)); -#line 1043 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1052 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); -#line 1043 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1052 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" collection = _tmp0_; -#line 1044 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1053 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->cursor; -#line 1044 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1053 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp1_ != NULL) { -#line 6449 "CheckerboardLayout.c" +#line 6309 "CheckerboardLayout.c" CheckerboardItem* _tmp2_; ViewCollection* _tmp3_; CheckerboardItem* _tmp4_; - gboolean _tmp5_; -#line 1045 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1054 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = self->priv->cursor; -#line 1045 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1054 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_item_set_is_cursor (_tmp2_, FALSE); -#line 1047 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1056 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp3_ = self->priv->view; -#line 1047 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1056 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp4_ = self->priv->cursor; -#line 1047 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject)); -#line 1047 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp5_) { -#line 6466 "CheckerboardLayout.c" - GeeHashSet* _tmp6_; - CheckerboardItem* _tmp7_; -#line 1048 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = collection; -#line 1048 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = self->priv->cursor; -#line 1048 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_VIEW, DataView)); -#line 6475 "CheckerboardLayout.c" +#line 1056 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject))) { +#line 6323 "CheckerboardLayout.c" + GeeHashSet* _tmp5_; + CheckerboardItem* _tmp6_; +#line 1057 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = collection; +#line 1057 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp6_ = self->priv->cursor; +#line 1057 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_VIEW, DataView)); +#line 6332 "CheckerboardLayout.c" } } -#line 1051 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = item; -#line 1051 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_set_is_cursor (_tmp8_, TRUE); -#line 1052 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = item; -#line 1052 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = _g_object_ref0 (_tmp9_); -#line 1052 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1060 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_item_set_is_cursor (item, TRUE); +#line 1061 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp7_ = _g_object_ref0 (item); +#line 1061 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->cursor); -#line 1052 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->cursor = _tmp10_; -#line 1053 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = collection; -#line 1053 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = item; -#line 1053 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_VIEW, DataView)); -#line 1054 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = collection; -#line 1054 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_layout_on_items_state_changed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1042 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1061 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->cursor = _tmp7_; +#line 1062 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp8_ = collection; +#line 1062 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (item, TYPE_DATA_VIEW, DataView)); +#line 1063 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp9_ = collection; +#line 1063 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_layout_on_items_state_changed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); +#line 1051 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (collection); -#line 6502 "CheckerboardLayout.c" +#line 6353 "CheckerboardLayout.c" } -CheckerboardItem* checkerboard_layout_get_cursor (CheckerboardLayout* self) { +CheckerboardItem* +checkerboard_layout_get_cursor (CheckerboardLayout* self) +{ CheckerboardItem* result = NULL; CheckerboardItem* _tmp0_; CheckerboardItem* _tmp1_; -#line 1057 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1066 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL); -#line 1058 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1067 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->cursor; -#line 1058 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1067 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 1058 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1067 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = _tmp1_; -#line 1058 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1067 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 6520 "CheckerboardLayout.c" +#line 6373 "CheckerboardLayout.c" } -static void checkerboard_layout_on_contents_altered (CheckerboardLayout* self, GeeIterable* added, GeeIterable* removed) { - GeeIterable* _tmp0_; - GeeIterable* _tmp1_; -#line 1062 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +checkerboard_layout_on_contents_altered (CheckerboardLayout* self, + GeeIterable* added, + GeeIterable* removed) +{ +#line 1071 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1062 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1071 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added)); -#line 1062 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1071 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); -#line 1064 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = added; -#line 1064 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp0_ != NULL) { -#line 1065 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (added != NULL) { +#line 1074 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_free0 (self->priv->message); -#line 1065 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1074 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->message = NULL; -#line 6541 "CheckerboardLayout.c" +#line 6394 "CheckerboardLayout.c" } -#line 1067 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = removed; -#line 1067 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp1_ != NULL) { -#line 6547 "CheckerboardLayout.c" +#line 1076 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (removed != NULL) { +#line 6398 "CheckerboardLayout.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp2_; - GeeIterator* _tmp3_; -#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = removed; -#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = gee_iterable_iterator (_tmp2_); -#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _object_it = _tmp3_; -#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GeeIterator* _tmp0_; +#line 1077 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = gee_iterable_iterator (removed); +#line 1077 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _object_it = _tmp0_; +#line 1077 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" while (TRUE) { -#line 6560 "CheckerboardLayout.c" - GeeIterator* _tmp4_; - gboolean _tmp5_; +#line 6408 "CheckerboardLayout.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - GeeHashSet* _tmp8_; - DataObject* _tmp9_; -#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = _object_it; -#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!_tmp5_) { -#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GeeIterator* _tmp2_; + gpointer _tmp3_; + GeeHashSet* _tmp4_; + DataObject* _tmp5_; +#line 1077 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1_ = _object_it; +#line 1077 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!gee_iterator_next (_tmp1_)) { +#line 1077 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 6576 "CheckerboardLayout.c" +#line 6421 "CheckerboardLayout.c" } -#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = _object_it; -#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = gee_iterator_get (_tmp6_); -#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - object = (DataObject*) _tmp7_; -#line 1069 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = self->priv->exposed_items; -#line 1069 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = object; -#line 1069 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1077 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = _object_it; +#line 1077 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = gee_iterator_get (_tmp2_); +#line 1077 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + object = (DataObject*) _tmp3_; +#line 1078 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = self->priv->exposed_items; +#line 1078 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = object; +#line 1078 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); +#line 1077 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (object); -#line 6592 "CheckerboardLayout.c" +#line 6437 "CheckerboardLayout.c" } -#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1077 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (_object_it); -#line 6596 "CheckerboardLayout.c" +#line 6441 "CheckerboardLayout.c" } } -#line 1074 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1083 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->item_rows = (_vala_array_free (self->priv->item_rows, self->priv->item_rows_length1, (GDestroyNotify) checkerboard_layout_layout_row_unref), NULL); -#line 1074 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1083 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->item_rows = NULL; -#line 1074 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1083 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->item_rows_length1 = 0; -#line 1074 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1083 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->_item_rows_size_ = self->priv->item_rows_length1; -#line 1076 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1085 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_need_reflow (self, "on_contents_altered"); -#line 6609 "CheckerboardLayout.c" +#line 6454 "CheckerboardLayout.c" } -static void checkerboard_layout_on_items_altered (CheckerboardLayout* self) { -#line 1079 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +checkerboard_layout_on_items_altered (CheckerboardLayout* self) +{ +#line 1088 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1080 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1089 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_need_reflow (self, "on_items_altered"); -#line 6618 "CheckerboardLayout.c" +#line 6465 "CheckerboardLayout.c" } -static void checkerboard_layout_on_items_state_changed (CheckerboardLayout* self, GeeIterable* changed) { - GeeIterable* _tmp0_; -#line 1083 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +checkerboard_layout_on_items_state_changed (CheckerboardLayout* self, + GeeIterable* changed) +{ +#line 1092 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1083 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1092 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (GEE_IS_ITERABLE (changed)); -#line 1084 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = changed; -#line 1084 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_layout_items_dirty (self, "on_items_state_changed", _tmp0_); -#line 6632 "CheckerboardLayout.c" +#line 1093 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_layout_items_dirty (self, "on_items_state_changed", changed); +#line 6479 "CheckerboardLayout.c" } -static void checkerboard_layout_on_items_visibility_changed (CheckerboardLayout* self, GeeIterable* changed) { -#line 1087 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +checkerboard_layout_on_items_visibility_changed (CheckerboardLayout* self, + GeeIterable* changed) +{ +#line 1096 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1087 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1096 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (GEE_IS_ITERABLE (changed)); -#line 1088 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1097 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_need_reflow (self, "on_items_visibility_changed"); -#line 6643 "CheckerboardLayout.c" +#line 6493 "CheckerboardLayout.c" } -static void checkerboard_layout_on_ordering_changed (CheckerboardLayout* self) { -#line 1091 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +checkerboard_layout_on_ordering_changed (CheckerboardLayout* self) +{ +#line 1100 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1092 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1101 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_need_reflow (self, "on_ordering_changed"); -#line 6652 "CheckerboardLayout.c" +#line 6504 "CheckerboardLayout.c" } -static void checkerboard_layout_on_views_altered (CheckerboardLayout* self, GeeCollection* altered) { - GeeCollection* _tmp0_; -#line 1095 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +checkerboard_layout_on_views_altered (CheckerboardLayout* self, + GeeCollection* altered) +{ +#line 1104 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1095 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1104 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (GEE_IS_COLLECTION (altered)); -#line 1096 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = altered; -#line 1096 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_layout_items_dirty (self, "on_views_altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 6666 "CheckerboardLayout.c" +#line 1105 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_layout_items_dirty (self, "on_views_altered", G_TYPE_CHECK_INSTANCE_CAST (altered, GEE_TYPE_ITERABLE, GeeIterable)); +#line 6518 "CheckerboardLayout.c" } -static void checkerboard_layout_on_geometries_altered (CheckerboardLayout* self) { -#line 1099 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +checkerboard_layout_on_geometries_altered (CheckerboardLayout* self) +{ +#line 1108 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1100 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1109 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_need_reflow (self, "on_geometries_altered"); -#line 6675 "CheckerboardLayout.c" +#line 6529 "CheckerboardLayout.c" } -static gboolean _checkerboard_layout_do_reflow_gsource_func (gpointer self) { +static gboolean +_checkerboard_layout_do_reflow_gsource_func (gpointer self) +{ gboolean result; result = checkerboard_layout_do_reflow ((CheckerboardLayout*) self); -#line 1116 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1125 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 6684 "CheckerboardLayout.c" +#line 6540 "CheckerboardLayout.c" } -static void checkerboard_layout_need_reflow (CheckerboardLayout* self, const gchar* caller) { +static void +checkerboard_layout_need_reflow (CheckerboardLayout* self, + const gchar* caller) +{ gboolean _tmp0_; gboolean _tmp1_; -#line 1103 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1112 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1103 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1112 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (caller != NULL); -#line 1104 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1113 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->flow_scheduled; -#line 1104 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1113 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp0_) { -#line 1105 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1114 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 6701 "CheckerboardLayout.c" +#line 6560 "CheckerboardLayout.c" } -#line 1107 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1116 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->is_in_view; -#line 1107 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1116 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (!_tmp1_) { -#line 1108 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1117 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->reflow_needed = TRUE; -#line 1109 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1118 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 6711 "CheckerboardLayout.c" +#line 6570 "CheckerboardLayout.c" } -#line 1115 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1124 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->flow_scheduled = TRUE; -#line 1116 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1125 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_idle_add_full (G_PRIORITY_HIGH, _checkerboard_layout_do_reflow_gsource_func, g_object_ref (self), g_object_unref); -#line 6717 "CheckerboardLayout.c" +#line 6576 "CheckerboardLayout.c" } -static gboolean checkerboard_layout_do_reflow (CheckerboardLayout* self) { +static gboolean +checkerboard_layout_do_reflow (CheckerboardLayout* self) +{ gboolean result = FALSE; -#line 1119 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1128 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), FALSE); -#line 1120 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1129 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_reflow (self, "do_reflow"); -#line 1121 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1130 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_need_exposure (self, "do_reflow"); -#line 1123 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1132 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->flow_scheduled = FALSE; -#line 1125 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1134 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = FALSE; -#line 1125 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1134 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 6735 "CheckerboardLayout.c" +#line 6596 "CheckerboardLayout.c" } -static void checkerboard_layout_need_exposure (CheckerboardLayout* self, const gchar* caller) { -#line 1128 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +checkerboard_layout_need_exposure (CheckerboardLayout* self, + const gchar* caller) +{ +#line 1137 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1128 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1137 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (caller != NULL); -#line 1132 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1141 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->exposure_dirty = TRUE; -#line 1133 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1142 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 6748 "CheckerboardLayout.c" +#line 6612 "CheckerboardLayout.c" } -void checkerboard_layout_set_message (CheckerboardLayout* self, const gchar* text) { +void +checkerboard_layout_set_message (CheckerboardLayout* self, + const gchar* text) +{ const gchar* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_; - const gchar* _tmp4_; -#line 1136 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gchar* _tmp1_; +#line 1145 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1137 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = text; -#line 1137 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = self->priv->message; -#line 1137 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (g_strcmp0 (_tmp0_, _tmp1_) == 0) { -#line 1138 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1146 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = self->priv->message; +#line 1146 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (g_strcmp0 (text, _tmp0_) == 0) { +#line 1147 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 6768 "CheckerboardLayout.c" +#line 6630 "CheckerboardLayout.c" } -#line 1140 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = text; -#line 1140 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = g_strdup (_tmp2_); -#line 1140 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_free0 (self->priv->message); -#line 1140 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->message = _tmp3_; -#line 1142 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = text; -#line 1142 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp4_ != NULL) { -#line 6782 "CheckerboardLayout.c" - GtkContainer* _tmp5_; - GtkContainer* _tmp6_; -#line 1145 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 1145 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = _tmp5_; -#line 1145 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp6_ != NULL) { -#line 6791 "CheckerboardLayout.c" - GtkAllocation parent_allocation = {0}; - GtkContainer* _tmp7_; - GtkContainer* _tmp8_; - GtkAllocation _tmp9_ = {0}; - GtkAllocation _tmp10_; - gint _tmp11_; - GtkAllocation _tmp12_; - gint _tmp13_; -#line 1147 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 1147 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = _tmp7_; -#line 1147 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), &_tmp9_); -#line 1147 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - parent_allocation = _tmp9_; -#line 1149 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = parent_allocation; -#line 1149 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = _tmp10_.width; #line 1149 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = parent_allocation; + _tmp1_ = g_strdup (text); #line 1149 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = _tmp12_.height; + _g_free0 (self->priv->message); #line 1149 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp11_, _tmp13_); -#line 6818 "CheckerboardLayout.c" + self->priv->message = _tmp1_; +#line 1151 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (text != NULL) { +#line 6640 "CheckerboardLayout.c" + GtkContainer* _tmp2_; + GtkContainer* _tmp3_; +#line 1154 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); +#line 1154 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = _tmp2_; +#line 1154 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp3_ != NULL) { +#line 6649 "CheckerboardLayout.c" + GtkAllocation parent_allocation = {0}; + GtkContainer* _tmp4_; + GtkContainer* _tmp5_; + GtkAllocation _tmp6_ = {0}; + GtkAllocation _tmp7_; + gint _tmp8_; + GtkAllocation _tmp9_; + gint _tmp10_; +#line 1156 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); +#line 1156 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = _tmp4_; +#line 1156 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), &_tmp6_); +#line 1156 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + parent_allocation = _tmp6_; +#line 1158 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp7_ = parent_allocation; +#line 1158 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp8_ = _tmp7_.width; +#line 1158 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp9_ = parent_allocation; +#line 1158 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp10_ = _tmp9_.height; +#line 1158 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp8_, _tmp10_); +#line 6676 "CheckerboardLayout.c" } } else { -#line 1153 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1162 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_need_reflow (self, "set_message"); -#line 6823 "CheckerboardLayout.c" +#line 6681 "CheckerboardLayout.c" } } -void checkerboard_layout_unset_message (CheckerboardLayout* self) { -#line 1157 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +void +checkerboard_layout_unset_message (CheckerboardLayout* self) +{ +#line 1166 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1158 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1167 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_set_message (self, NULL); -#line 6833 "CheckerboardLayout.c" +#line 6693 "CheckerboardLayout.c" } -static void checkerboard_layout_update_visible_page (CheckerboardLayout* self) { +static void +checkerboard_layout_update_visible_page (CheckerboardLayout* self) +{ gboolean _tmp0_ = FALSE; GtkAdjustment* _tmp1_; -#line 1161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1170 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1162 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1171 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->hadjustment; -#line 1162 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1171 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp1_ != NULL) { -#line 6846 "CheckerboardLayout.c" +#line 6708 "CheckerboardLayout.c" GtkAdjustment* _tmp2_; -#line 1162 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1171 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = self->priv->vadjustment; -#line 1162 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1171 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = _tmp2_ != NULL; -#line 6852 "CheckerboardLayout.c" +#line 6714 "CheckerboardLayout.c" } else { -#line 1162 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1171 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = FALSE; -#line 6856 "CheckerboardLayout.c" +#line 6718 "CheckerboardLayout.c" } -#line 1162 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1171 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp0_) { -#line 6860 "CheckerboardLayout.c" +#line 6722 "CheckerboardLayout.c" GtkAdjustment* _tmp3_; GtkAdjustment* _tmp4_; GdkRectangle _tmp5_ = {0}; -#line 1163 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp3_ = self->priv->hadjustment; -#line 1163 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp4_ = self->priv->vadjustment; -#line 1163 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" get_adjustment_page (_tmp3_, _tmp4_, &_tmp5_); -#line 1163 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->visible_page = _tmp5_; -#line 6872 "CheckerboardLayout.c" +#line 6734 "CheckerboardLayout.c" } } -void checkerboard_layout_set_in_view (CheckerboardLayout* self, gboolean in_view) { - gboolean _tmp0_; - gboolean _tmp1_; -#line 1166 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +void +checkerboard_layout_set_in_view (CheckerboardLayout* self, + gboolean in_view) +{ +#line 1175 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1167 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = in_view; -#line 1167 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->is_in_view = _tmp0_; -#line 1169 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = in_view; -#line 1169 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp1_) { -#line 6890 "CheckerboardLayout.c" - gboolean _tmp2_; -#line 1170 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = self->priv->reflow_needed; -#line 1170 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp2_) { -#line 1171 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1176 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->is_in_view = in_view; +#line 1178 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (in_view) { +#line 6749 "CheckerboardLayout.c" + gboolean _tmp0_; +#line 1179 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = self->priv->reflow_needed; +#line 1179 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp0_) { +#line 1180 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_need_reflow (self, "set_in_view (true)"); -#line 6898 "CheckerboardLayout.c" +#line 6757 "CheckerboardLayout.c" } else { -#line 1173 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1182 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_need_exposure (self, "set_in_view (true)"); -#line 6902 "CheckerboardLayout.c" +#line 6761 "CheckerboardLayout.c" } } else { -#line 1175 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1184 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_unexpose_items (self, "set_in_view (false)"); -#line 6907 "CheckerboardLayout.c" +#line 6766 "CheckerboardLayout.c" } } -static gpointer _checkerboard_layout_layout_row_ref0 (gpointer self) { -#line 1191 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static gpointer +_checkerboard_layout_layout_row_ref0 (gpointer self) +{ +#line 1200 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return self ? checkerboard_layout_layout_row_ref (self) : NULL; -#line 6915 "CheckerboardLayout.c" +#line 6776 "CheckerboardLayout.c" } -CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* self, gdouble xd, gdouble yd) { +CheckerboardItem* +checkerboard_layout_get_item_at_pixel (CheckerboardLayout* self, + gdouble xd, + gdouble yd) +{ CheckerboardItem* result = NULL; gboolean _tmp0_ = FALSE; const gchar* _tmp1_; gint x = 0; - gdouble _tmp3_; gint y = 0; - gdouble _tmp4_; CheckerboardLayoutLayoutRow* in_range = NULL; gint min = 0; gint max = 0; - CheckerboardLayoutLayoutRow** _tmp5_; - gint _tmp5__length1; - CheckerboardLayoutLayoutRow* _tmp30_; - CheckerboardLayoutLayoutRow* _tmp31_; - CheckerboardItem** _tmp32_; - gint _tmp32__length1; -#line 1178 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + CheckerboardLayoutLayoutRow** _tmp3_; + gint _tmp3__length1; + CheckerboardLayoutLayoutRow* _tmp28_; + CheckerboardLayoutLayoutRow* _tmp29_; + CheckerboardItem** _tmp30_; + gint _tmp30__length1; +#line 1187 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL); -#line 1179 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1188 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->message; -#line 1179 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1188 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp1_ != NULL) { -#line 1179 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1188 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = TRUE; -#line 6944 "CheckerboardLayout.c" +#line 6807 "CheckerboardLayout.c" } else { CheckerboardLayoutLayoutRow** _tmp2_; gint _tmp2__length1; -#line 1179 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1188 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = self->priv->item_rows; -#line 1179 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1188 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2__length1 = self->priv->item_rows_length1; -#line 1179 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1188 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = _tmp2_ == NULL; -#line 6954 "CheckerboardLayout.c" +#line 6817 "CheckerboardLayout.c" } -#line 1179 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1188 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp0_) { -#line 1180 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1189 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = NULL; -#line 1180 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1189 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 6962 "CheckerboardLayout.c" +#line 6825 "CheckerboardLayout.c" } -#line 1182 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = xd; -#line 1182 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - x = (gint) _tmp3_; -#line 1183 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = yd; -#line 1183 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - y = (gint) _tmp4_; -#line 1186 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1191 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + x = (gint) xd; +#line 1192 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + y = (gint) yd; +#line 1195 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" in_range = NULL; -#line 1187 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1196 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" min = 0; -#line 1188 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = self->priv->item_rows; -#line 1188 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5__length1 = self->priv->item_rows_length1; -#line 1188 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - max = _tmp5__length1; -#line 6982 "CheckerboardLayout.c" +#line 1197 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = self->priv->item_rows; +#line 1197 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3__length1 = self->priv->item_rows_length1; +#line 1197 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + max = _tmp3__length1; +#line 6841 "CheckerboardLayout.c" { - gboolean _tmp6_ = FALSE; -#line 1189 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = TRUE; -#line 1189 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gboolean _tmp4_ = FALSE; +#line 1198 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = TRUE; +#line 1198 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" while (TRUE) { -#line 6989 "CheckerboardLayout.c" +#line 6848 "CheckerboardLayout.c" gint mid = 0; + gint _tmp5_; + gint _tmp6_; gint _tmp7_; - gint _tmp8_; - gint _tmp9_; CheckerboardLayoutLayoutRow* row = NULL; - CheckerboardLayoutLayoutRow** _tmp10_; - gint _tmp10__length1; - gint _tmp11_; - CheckerboardLayoutLayoutRow* _tmp12_; + CheckerboardLayoutLayoutRow** _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + CheckerboardLayoutLayoutRow* _tmp10_; + CheckerboardLayoutLayoutRow* _tmp11_; + gboolean _tmp12_ = FALSE; CheckerboardLayoutLayoutRow* _tmp13_; - gboolean _tmp14_ = FALSE; - CheckerboardLayoutLayoutRow* _tmp15_; - gint _tmp28_; - gint _tmp29_; -#line 1189 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!_tmp6_) { -#line 7006 "CheckerboardLayout.c" + gint _tmp26_; + gint _tmp27_; +#line 1198 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!_tmp4_) { +#line 6865 "CheckerboardLayout.c" } -#line 1189 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = FALSE; -#line 1190 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1198 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = FALSE; +#line 1199 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = min; +#line 1199 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp6_ = max; +#line 1199 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp7_ = min; -#line 1190 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = max; -#line 1190 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = min; -#line 1190 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - mid = _tmp7_ + ((_tmp8_ - _tmp9_) / 2); -#line 1191 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = self->priv->item_rows; -#line 1191 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10__length1 = self->priv->item_rows_length1; -#line 1191 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = mid; -#line 1191 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = _tmp10_[_tmp11_]; -#line 1191 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = _checkerboard_layout_layout_row_ref0 (_tmp12_); -#line 1191 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row = _tmp13_; -#line 1193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp15_ = row; -#line 1193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp15_ == NULL) { -#line 1193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = TRUE; -#line 7036 "CheckerboardLayout.c" +#line 1199 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + mid = _tmp5_ + ((_tmp6_ - _tmp7_) / 2); +#line 1200 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp8_ = self->priv->item_rows; +#line 1200 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp8__length1 = self->priv->item_rows_length1; +#line 1200 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp9_ = mid; +#line 1200 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp10_ = _tmp8_[_tmp9_]; +#line 1200 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp11_ = _checkerboard_layout_layout_row_ref0 (_tmp10_); +#line 1200 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + row = _tmp11_; +#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp13_ = row; +#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp13_ == NULL) { +#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp12_ = TRUE; +#line 6895 "CheckerboardLayout.c" } else { + gint _tmp14_; + CheckerboardLayoutLayoutRow* _tmp15_; gint _tmp16_; - CheckerboardLayoutLayoutRow* _tmp17_; - gint _tmp18_; -#line 1193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp16_ = y; -#line 1193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp17_ = row; -#line 1193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp18_ = _tmp17_->y; -#line 1193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = _tmp16_ < _tmp18_; -#line 7049 "CheckerboardLayout.c" +#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp14_ = y; +#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp15_ = row; +#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp16_ = _tmp15_->y; +#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp12_ = _tmp14_ < _tmp16_; +#line 6908 "CheckerboardLayout.c" } -#line 1193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp14_) { -#line 7053 "CheckerboardLayout.c" - gint _tmp19_; -#line 1196 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp19_ = mid; -#line 1196 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - max = _tmp19_ - 1; -#line 7059 "CheckerboardLayout.c" +#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp12_) { +#line 6912 "CheckerboardLayout.c" + gint _tmp17_; +#line 1205 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp17_ = mid; +#line 1205 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + max = _tmp17_ - 1; +#line 6918 "CheckerboardLayout.c" } else { + gint _tmp18_; + CheckerboardLayoutLayoutRow* _tmp19_; gint _tmp20_; CheckerboardLayoutLayoutRow* _tmp21_; gint _tmp22_; - CheckerboardLayoutLayoutRow* _tmp23_; - gint _tmp24_; -#line 1197 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp20_ = y; -#line 1197 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1206 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp18_ = y; +#line 1206 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp19_ = row; +#line 1206 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp20_ = _tmp19_->y; +#line 1206 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp21_ = row; -#line 1197 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp22_ = _tmp21_->y; -#line 1197 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp23_ = row; -#line 1197 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp24_ = _tmp23_->height; -#line 1197 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp20_ > (_tmp22_ + _tmp24_)) { -#line 7078 "CheckerboardLayout.c" - gint _tmp25_; -#line 1199 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp25_ = mid; -#line 1199 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - min = _tmp25_ + 1; -#line 7084 "CheckerboardLayout.c" +#line 1206 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp22_ = _tmp21_->height; +#line 1206 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp18_ > (_tmp20_ + _tmp22_)) { +#line 6937 "CheckerboardLayout.c" + gint _tmp23_; +#line 1208 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp23_ = mid; +#line 1208 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + min = _tmp23_ + 1; +#line 6943 "CheckerboardLayout.c" } else { - CheckerboardLayoutLayoutRow* _tmp26_; - CheckerboardLayoutLayoutRow* _tmp27_; -#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp26_ = row; -#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp27_ = _checkerboard_layout_layout_row_ref0 (_tmp26_); -#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + CheckerboardLayoutLayoutRow* _tmp24_; + CheckerboardLayoutLayoutRow* _tmp25_; +#line 1211 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp24_ = row; +#line 1211 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp25_ = _checkerboard_layout_layout_row_ref0 (_tmp24_); +#line 1211 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_layout_layout_row_unref0 (in_range); -#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - in_range = _tmp27_; -#line 1204 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1211 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + in_range = _tmp25_; +#line 1213 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_layout_layout_row_unref0 (row); -#line 1204 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1213 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 7100 "CheckerboardLayout.c" +#line 6959 "CheckerboardLayout.c" } } -#line 1207 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp28_ = min; -#line 1207 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp29_ = max; -#line 1207 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp28_ > _tmp29_) { -#line 1208 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1216 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp26_ = min; +#line 1216 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp27_ = max; +#line 1216 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp26_ > _tmp27_) { +#line 1217 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_layout_layout_row_unref0 (row); -#line 1208 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1217 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 7113 "CheckerboardLayout.c" +#line 6972 "CheckerboardLayout.c" } -#line 1189 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1198 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_layout_layout_row_unref0 (row); -#line 7117 "CheckerboardLayout.c" +#line 6976 "CheckerboardLayout.c" } } -#line 1211 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp30_ = in_range; -#line 1211 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp30_ == NULL) { -#line 1212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp28_ = in_range; +#line 1220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp28_ == NULL) { +#line 1221 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = NULL; -#line 1212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1221 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_layout_layout_row_unref0 (in_range); -#line 1212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1221 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 7130 "CheckerboardLayout.c" - } -#line 1215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp31_ = in_range; -#line 1215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp32_ = _tmp31_->items; -#line 1215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp32__length1 = _tmp31_->items_length1; -#line 7138 "CheckerboardLayout.c" - { +#line 6989 "CheckerboardLayout.c" + } +#line 1224 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp29_ = in_range; +#line 1224 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp30_ = _tmp29_->items; +#line 1224 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp30__length1 = _tmp29_->items_length1; +#line 6997 "CheckerboardLayout.c" + { CheckerboardItem** item_collection = NULL; gint item_collection_length1 = 0; gint _item_collection_size_ = 0; gint item_it = 0; -#line 1215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - item_collection = _tmp32_; -#line 1215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - item_collection_length1 = _tmp32__length1; -#line 1215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - for (item_it = 0; item_it < _tmp32__length1; item_it = item_it + 1) { -#line 7150 "CheckerboardLayout.c" - CheckerboardItem* _tmp33_; +#line 1224 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + item_collection = _tmp30_; +#line 1224 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + item_collection_length1 = _tmp30__length1; +#line 1224 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + for (item_it = 0; item_it < _tmp30__length1; item_it = item_it + 1) { +#line 7009 "CheckerboardLayout.c" + CheckerboardItem* _tmp31_; CheckerboardItem* item = NULL; -#line 1215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp33_ = _g_object_ref0 (item_collection[item_it]); -#line 1215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - item = _tmp33_; -#line 7157 "CheckerboardLayout.c" +#line 1224 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp31_ = _g_object_ref0 (item_collection[item_it]); +#line 1224 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + item = _tmp31_; +#line 7016 "CheckerboardLayout.c" { + CheckerboardItem* _tmp32_; + gint _tmp33_; CheckerboardItem* _tmp34_; - gint _tmp35_; - CheckerboardItem* _tmp36_; - GdkRectangle _tmp37_; - gint _tmp38_; - gboolean _tmp39_ = FALSE; - gboolean _tmp40_ = FALSE; - gint _tmp41_; - CheckerboardItem* _tmp42_; - GdkRectangle _tmp43_; - gint _tmp44_; - CheckerboardItem* _tmp45_; - GdkRectangle _tmp46_; - gint _tmp47_; -#line 1218 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp34_ = item; -#line 1218 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp34_ == NULL) { -#line 1219 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GdkRectangle _tmp35_; + gint _tmp36_; + gboolean _tmp37_ = FALSE; + gboolean _tmp38_ = FALSE; + gint _tmp39_; + CheckerboardItem* _tmp40_; + GdkRectangle _tmp41_; + gint _tmp42_; + CheckerboardItem* _tmp43_; + GdkRectangle _tmp44_; + gint _tmp45_; +#line 1227 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp32_ = item; +#line 1227 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp32_ == NULL) { +#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (item); -#line 1219 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" continue; -#line 7181 "CheckerboardLayout.c" +#line 7040 "CheckerboardLayout.c" } -#line 1221 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp35_ = x; -#line 1221 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp36_ = item; -#line 1221 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp37_ = _tmp36_->allocation; -#line 1221 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp38_ = _tmp37_.x; -#line 1221 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp35_ < _tmp38_) { -#line 1223 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1230 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp33_ = x; +#line 1230 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp34_ = item; +#line 1230 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp35_ = _tmp34_->allocation; +#line 1230 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp36_ = _tmp35_.x; +#line 1230 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp33_ < _tmp36_) { +#line 1232 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (item); -#line 1223 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1232 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 7197 "CheckerboardLayout.c" +#line 7056 "CheckerboardLayout.c" } -#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp41_ = x; -#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp42_ = item; -#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp43_ = _tmp42_->allocation; -#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp44_ = _tmp43_.x; -#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp45_ = item; -#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp46_ = _tmp45_->allocation; -#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp47_ = _tmp46_.width; -#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp41_ <= (_tmp44_ + _tmp47_)) { -#line 7215 "CheckerboardLayout.c" - gint _tmp48_; - CheckerboardItem* _tmp49_; - GdkRectangle _tmp50_; - gint _tmp51_; -#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp48_ = y; -#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp49_ = item; -#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp50_ = _tmp49_->allocation; -#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp51_ = _tmp50_.y; -#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp40_ = _tmp48_ >= _tmp51_; -#line 7230 "CheckerboardLayout.c" +#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp39_ = x; +#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp40_ = item; +#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp41_ = _tmp40_->allocation; +#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp42_ = _tmp41_.x; +#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp43_ = item; +#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp44_ = _tmp43_->allocation; +#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp45_ = _tmp44_.width; +#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp39_ <= (_tmp42_ + _tmp45_)) { +#line 7074 "CheckerboardLayout.c" + gint _tmp46_; + CheckerboardItem* _tmp47_; + GdkRectangle _tmp48_; + gint _tmp49_; +#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp46_ = y; +#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp47_ = item; +#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp48_ = _tmp47_->allocation; +#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp49_ = _tmp48_.y; +#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp38_ = _tmp46_ >= _tmp49_; +#line 7089 "CheckerboardLayout.c" } else { -#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp40_ = FALSE; -#line 7234 "CheckerboardLayout.c" +#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp38_ = FALSE; +#line 7093 "CheckerboardLayout.c" } -#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp40_) { -#line 7238 "CheckerboardLayout.c" - gint _tmp52_; - CheckerboardItem* _tmp53_; - GdkRectangle _tmp54_; - gint _tmp55_; - CheckerboardItem* _tmp56_; - GdkRectangle _tmp57_; - gint _tmp58_; -#line 1229 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp52_ = y; -#line 1229 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp53_ = item; -#line 1229 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp54_ = _tmp53_->allocation; -#line 1229 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp55_ = _tmp54_.y; -#line 1229 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp56_ = item; -#line 1229 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp57_ = _tmp56_->allocation; -#line 1229 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp58_ = _tmp57_.height; -#line 1229 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp39_ = _tmp52_ <= (_tmp55_ + _tmp58_); -#line 7262 "CheckerboardLayout.c" +#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp38_) { +#line 7097 "CheckerboardLayout.c" + gint _tmp50_; + CheckerboardItem* _tmp51_; + GdkRectangle _tmp52_; + gint _tmp53_; + CheckerboardItem* _tmp54_; + GdkRectangle _tmp55_; + gint _tmp56_; +#line 1238 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp50_ = y; +#line 1238 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp51_ = item; +#line 1238 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp52_ = _tmp51_->allocation; +#line 1238 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp53_ = _tmp52_.y; +#line 1238 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp54_ = item; +#line 1238 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp55_ = _tmp54_->allocation; +#line 1238 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp56_ = _tmp55_.height; +#line 1238 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp37_ = _tmp50_ <= (_tmp53_ + _tmp56_); +#line 7121 "CheckerboardLayout.c" } else { -#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp39_ = FALSE; -#line 7266 "CheckerboardLayout.c" +#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp37_ = FALSE; +#line 7125 "CheckerboardLayout.c" } -#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp39_) { -#line 1230 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp37_) { +#line 1239 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = item; -#line 1230 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1239 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_layout_layout_row_unref0 (in_range); -#line 1230 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1239 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 7276 "CheckerboardLayout.c" +#line 7135 "CheckerboardLayout.c" } -#line 1215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1224 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (item); -#line 7280 "CheckerboardLayout.c" +#line 7139 "CheckerboardLayout.c" } } } -#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1242 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = NULL; -#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1242 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_layout_layout_row_unref0 (in_range); -#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1242 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 7290 "CheckerboardLayout.c" +#line 7149 "CheckerboardLayout.c" } -static gchar string_get (const gchar* self, glong index) { +static gchar +string_get (const gchar* self, + glong index) +{ gchar result = '\0'; - glong _tmp0_; - gchar _tmp1_; -#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar _tmp0_; +#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = index; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = ((gchar*) self)[index]; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 7308 "CheckerboardLayout.c" +#line 7167 "CheckerboardLayout.c" } -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, + glong maxlen) +{ glong result = 0L; gchar* end = NULL; gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 7331 "CheckerboardLayout.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 7339 "CheckerboardLayout.c" +#line 7191 "CheckerboardLayout.c" } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 7351 "CheckerboardLayout.c" +#line 7200 "CheckerboardLayout.c" } } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, + glong offset, + glong len) +{ gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + glong _tmp6_; + gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#line 7375 "CheckerboardLayout.c" - glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = _tmp2_ >= ((glong) 0); -#line 7381 "CheckerboardLayout.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = len >= ((glong) 0); +#line 7221 "CheckerboardLayout.c" } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 7385 "CheckerboardLayout.c" +#line 7225 "CheckerboardLayout.c" } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 7389 "CheckerboardLayout.c" +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = string_strnlen ((gchar*) self, offset + len); +#line 7231 "CheckerboardLayout.c" + } else { + gint _tmp1_; + gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = (glong) _tmp2_; +#line 7241 "CheckerboardLayout.c" + } +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset < ((glong) 0)) { +#line 7245 "CheckerboardLayout.c" glong _tmp3_; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 7253 "CheckerboardLayout.c" + } else { glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 7260 "CheckerboardLayout.c" + } +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (len < ((glong) 0)) { +#line 7264 "CheckerboardLayout.c" glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 7401 "CheckerboardLayout.c" - } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#line 7411 "CheckerboardLayout.c" - } -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp8_ < ((glong) 0)) { -#line 7417 "CheckerboardLayout.c" - glong _tmp9_; - glong _tmp10_; - glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 7431 "CheckerboardLayout.c" - } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 7441 "CheckerboardLayout.c" - } -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp14_ < ((glong) 0)) { -#line 7447 "CheckerboardLayout.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 7456 "CheckerboardLayout.c" - } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp5_ - offset; +#line 7270 "CheckerboardLayout.c" + } +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 7476 "CheckerboardLayout.c" +#line 7282 "CheckerboardLayout.c" } -gint checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, gint pos) { +gint +checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, + gint pos) +{ gint result = 0; gint sep_len = 0; gint _tmp0_; gint _tmp1_; gint _tmp2_; gint len = 0; - const gchar* _tmp3_; + gint _tmp3_; gint _tmp4_; - gint _tmp5_; - gboolean _tmp6_ = FALSE; - gint _tmp7_; + gboolean _tmp5_ = FALSE; gint index = 0; -#line 1236 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (tag_list != NULL, 0); -#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = strlen (TAG_TAG_LIST_SEPARATOR_STRING); -#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = _tmp0_; -#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" sep_len = _tmp1_; -#line 1238 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = sep_len; -#line 1238 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _vala_assert (_tmp2_ > 0, "sep_len > 0"); -#line 1239 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = tag_list; -#line 1239 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = strlen (_tmp3_); -#line 1239 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = _tmp4_; -#line 1239 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - len = _tmp5_; -#line 1240 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = pos; -#line 1240 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp7_ < 0) { -#line 1240 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = TRUE; -#line 7519 "CheckerboardLayout.c" +#line 1248 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = strlen (tag_list); +#line 1248 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = _tmp3_; +#line 1248 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + len = _tmp4_; +#line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (pos < 0) { +#line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = TRUE; +#line 7322 "CheckerboardLayout.c" } else { - gint _tmp8_; - gint _tmp9_; -#line 1240 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = pos; -#line 1240 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = len; -#line 1240 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = _tmp8_ >= _tmp9_; -#line 7529 "CheckerboardLayout.c" - } -#line 1240 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp6_) { -#line 1241 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gint _tmp6_; +#line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp6_ = len; +#line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = pos >= _tmp6_; +#line 7329 "CheckerboardLayout.c" + } +#line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp5_) { +#line 1250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = -1; -#line 1241 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 7537 "CheckerboardLayout.c" +#line 7337 "CheckerboardLayout.c" } { gint i = 0; -#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1253 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" i = 0; -#line 7543 "CheckerboardLayout.c" +#line 7343 "CheckerboardLayout.c" { - gboolean _tmp10_ = FALSE; -#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = TRUE; -#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gboolean _tmp7_ = FALSE; +#line 1253 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp7_ = TRUE; +#line 1253 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" while (TRUE) { -#line 7550 "CheckerboardLayout.c" +#line 7350 "CheckerboardLayout.c" + gint _tmp9_; + gint _tmp10_; + gboolean _tmp11_ = FALSE; gint _tmp12_; - gint _tmp13_; - gboolean _tmp14_ = FALSE; - const gchar* _tmp15_; - gint _tmp16_; - gchar _tmp17_; - gint _tmp18_; - gchar _tmp19_; -#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!_tmp10_) { -#line 7561 "CheckerboardLayout.c" - gint _tmp11_; -#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = i; -#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - i = _tmp11_ + 1; -#line 7567 "CheckerboardLayout.c" +#line 1253 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!_tmp7_) { +#line 7357 "CheckerboardLayout.c" + gint _tmp8_; +#line 1253 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp8_ = i; +#line 1253 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + i = _tmp8_ + 1; +#line 7363 "CheckerboardLayout.c" } -#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = FALSE; -#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = i; -#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = sep_len; -#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!(_tmp12_ < _tmp13_)) { -#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1253 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp7_ = FALSE; +#line 1253 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp9_ = i; +#line 1253 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp10_ = sep_len; +#line 1253 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!(_tmp9_ < _tmp10_)) { +#line 1253 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 7579 "CheckerboardLayout.c" +#line 7375 "CheckerboardLayout.c" } -#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp15_ = tag_list; -#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp16_ = pos; -#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp17_ = string_get (_tmp15_, (glong) _tmp16_); -#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp18_ = i; -#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp19_ = string_get (TAG_TAG_LIST_SEPARATOR_STRING, (glong) _tmp18_); -#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp17_ == _tmp19_) { -#line 7593 "CheckerboardLayout.c" - gint _tmp20_; - gint _tmp21_; -#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp20_ = pos; -#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp21_ = i; -#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = _tmp20_ >= _tmp21_; -#line 7602 "CheckerboardLayout.c" +#line 1254 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp12_ = i; +#line 1254 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (string_get (tag_list, (glong) pos) == string_get (TAG_TAG_LIST_SEPARATOR_STRING, (glong) _tmp12_)) { +#line 7381 "CheckerboardLayout.c" + gint _tmp13_; +#line 1254 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp13_ = i; +#line 1254 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp11_ = pos >= _tmp13_; +#line 7387 "CheckerboardLayout.c" } else { -#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = FALSE; -#line 7606 "CheckerboardLayout.c" +#line 1254 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp11_ = FALSE; +#line 7391 "CheckerboardLayout.c" } -#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp14_) { -#line 7610 "CheckerboardLayout.c" - const gchar* _tmp22_; - gint _tmp23_; - gint _tmp24_; - gint _tmp25_; - gchar* _tmp26_; - gchar* _tmp27_; - gboolean _tmp28_; -#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp22_ = tag_list; -#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp23_ = pos; -#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp24_ = i; -#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp25_ = sep_len; -#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp26_ = string_substring (_tmp22_, (glong) (_tmp23_ - _tmp24_), (glong) _tmp25_); -#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp27_ = _tmp26_; -#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp28_ = g_strcmp0 (_tmp27_, TAG_TAG_LIST_SEPARATOR_STRING) == 0; -#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_free0 (_tmp27_); -#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp28_) { -#line 1247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1254 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp11_) { +#line 7395 "CheckerboardLayout.c" + gint _tmp14_; + gint _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gboolean _tmp18_; +#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp14_ = i; +#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp15_ = sep_len; +#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp16_ = string_substring (tag_list, (glong) (pos - _tmp14_), (glong) _tmp15_); +#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp17_ = _tmp16_; +#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp18_ = g_strcmp0 (_tmp17_, TAG_TAG_LIST_SEPARATOR_STRING) == 0; +#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_free0 (_tmp17_); +#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp18_) { +#line 1256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = -1; -#line 1247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 7640 "CheckerboardLayout.c" +#line 7419 "CheckerboardLayout.c" } } } } } -#line 1254 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" index = 0; -#line 7648 "CheckerboardLayout.c" +#line 7427 "CheckerboardLayout.c" { gint i = 0; -#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1264 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" i = 0; -#line 7653 "CheckerboardLayout.c" +#line 7432 "CheckerboardLayout.c" { - gboolean _tmp29_ = FALSE; -#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp29_ = TRUE; -#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gboolean _tmp19_ = FALSE; +#line 1264 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp19_ = TRUE; +#line 1264 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" while (TRUE) { -#line 7660 "CheckerboardLayout.c" - gint _tmp31_; - gint _tmp32_; - gboolean _tmp33_ = FALSE; - gboolean _tmp34_ = FALSE; - const gchar* _tmp35_; - gint _tmp36_; - gchar _tmp37_; - gchar _tmp38_; -#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!_tmp29_) { -#line 7671 "CheckerboardLayout.c" - gint _tmp30_; -#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp30_ = i; -#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - i = _tmp30_ + 1; -#line 7677 "CheckerboardLayout.c" +#line 7439 "CheckerboardLayout.c" + gint _tmp21_; + gboolean _tmp22_ = FALSE; + gboolean _tmp23_ = FALSE; + gint _tmp24_; +#line 1264 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!_tmp19_) { +#line 7446 "CheckerboardLayout.c" + gint _tmp20_; +#line 1264 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp20_ = i; +#line 1264 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + i = _tmp20_ + 1; +#line 7452 "CheckerboardLayout.c" } -#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp29_ = FALSE; -#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp31_ = i; -#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp32_ = pos; -#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!(_tmp31_ < _tmp32_)) { -#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1264 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp19_ = FALSE; +#line 1264 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp21_ = i; +#line 1264 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!(_tmp21_ < pos)) { +#line 1264 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 7689 "CheckerboardLayout.c" +#line 7462 "CheckerboardLayout.c" } -#line 1256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp35_ = tag_list; -#line 1256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp36_ = i; -#line 1256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp37_ = string_get (_tmp35_, (glong) _tmp36_); -#line 1256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp38_ = string_get (TAG_TAG_LIST_SEPARATOR_STRING, (glong) 0); -#line 1256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp37_ == _tmp38_) { -#line 7701 "CheckerboardLayout.c" - gint _tmp39_; - gint _tmp40_; - gint _tmp41_; -#line 1257 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp39_ = i; -#line 1257 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp40_ = sep_len; -#line 1257 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp41_ = len; -#line 1257 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp34_ = (_tmp39_ + _tmp40_) <= _tmp41_; -#line 7713 "CheckerboardLayout.c" +#line 1265 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp24_ = i; +#line 1265 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (string_get (tag_list, (glong) _tmp24_) == string_get (TAG_TAG_LIST_SEPARATOR_STRING, (glong) 0)) { +#line 7468 "CheckerboardLayout.c" + gint _tmp25_; + gint _tmp26_; + gint _tmp27_; +#line 1266 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp25_ = i; +#line 1266 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp26_ = sep_len; +#line 1266 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp27_ = len; +#line 1266 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp23_ = (_tmp25_ + _tmp26_) <= _tmp27_; +#line 7480 "CheckerboardLayout.c" } else { -#line 1256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp34_ = FALSE; -#line 7717 "CheckerboardLayout.c" +#line 1265 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp23_ = FALSE; +#line 7484 "CheckerboardLayout.c" } -#line 1256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp34_) { -#line 7721 "CheckerboardLayout.c" - const gchar* _tmp42_; - gint _tmp43_; - gint _tmp44_; - gchar* _tmp45_; - gchar* _tmp46_; -#line 1258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp42_ = tag_list; -#line 1258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp43_ = i; -#line 1258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp44_ = sep_len; -#line 1258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp45_ = string_substring (_tmp42_, (glong) _tmp43_, (glong) _tmp44_); -#line 1258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp46_ = _tmp45_; -#line 1258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp33_ = g_strcmp0 (_tmp46_, TAG_TAG_LIST_SEPARATOR_STRING) == 0; -#line 1258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_free0 (_tmp46_); -#line 7741 "CheckerboardLayout.c" +#line 1265 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp23_) { +#line 7488 "CheckerboardLayout.c" + gint _tmp28_; + gint _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; +#line 1267 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp28_ = i; +#line 1267 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp29_ = sep_len; +#line 1267 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp30_ = string_substring (tag_list, (glong) _tmp28_, (glong) _tmp29_); +#line 1267 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp31_ = _tmp30_; +#line 1267 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp22_ = g_strcmp0 (_tmp31_, TAG_TAG_LIST_SEPARATOR_STRING) == 0; +#line 1267 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_free0 (_tmp31_); +#line 7505 "CheckerboardLayout.c" } else { -#line 1256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp33_ = FALSE; -#line 7745 "CheckerboardLayout.c" +#line 1265 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp22_ = FALSE; +#line 7509 "CheckerboardLayout.c" } -#line 1256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp33_) { -#line 7749 "CheckerboardLayout.c" - gint _tmp47_; - gint _tmp48_; - gint _tmp49_; -#line 1259 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp47_ = index; -#line 1259 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - index = _tmp47_ + 1; -#line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp48_ = i; -#line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp49_ = sep_len; -#line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - i = _tmp48_ + (_tmp49_ - 1); -#line 7763 "CheckerboardLayout.c" +#line 1265 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp22_) { +#line 7513 "CheckerboardLayout.c" + gint _tmp32_; + gint _tmp33_; + gint _tmp34_; +#line 1268 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp32_ = index; +#line 1268 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + index = _tmp32_ + 1; +#line 1269 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp33_ = i; +#line 1269 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp34_ = sep_len; +#line 1269 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + i = _tmp33_ + (_tmp34_ - 1); +#line 7527 "CheckerboardLayout.c" } } } } -#line 1263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1272 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = index; -#line 1263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1272 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 7772 "CheckerboardLayout.c" +#line 7536 "CheckerboardLayout.c" } -static gint checkerboard_layout_internal_handle_tag_mouse_event (CheckerboardLayout* self, CheckerboardItem* item, gint x, gint y) { +static gint +checkerboard_layout_internal_handle_tag_mouse_event (CheckerboardLayout* self, + CheckerboardItem* item, + gint x, + gint y) +{ gint result = 0; PangoLayout* layout = NULL; - CheckerboardItem* _tmp0_; + PangoLayout* _tmp0_; PangoLayout* _tmp1_; - PangoLayout* _tmp2_; GdkRectangle rect = {0}; - CheckerboardItem* _tmp3_; - GdkRectangle _tmp4_ = {0}; + GdkRectangle _tmp2_ = {0}; gint index = 0; gint trailing = 0; gint px = 0; - gint _tmp5_; - GdkRectangle _tmp6_; - gint _tmp7_; + GdkRectangle _tmp3_; + gint _tmp4_; gint py = 0; + GdkRectangle _tmp5_; + gint _tmp6_; + PangoLayout* _tmp7_; gint _tmp8_; - GdkRectangle _tmp9_; - gint _tmp10_; - PangoLayout* _tmp11_; - gint _tmp12_; - gint _tmp13_; - gint _tmp14_ = 0; - gint _tmp15_ = 0; - gboolean _tmp16_; -#line 1266 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gint _tmp9_; + gint _tmp10_ = 0; + gint _tmp11_ = 0; + gboolean _tmp12_; +#line 1275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), 0); -#line 1266 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (item), 0); -#line 1267 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = item; -#line 1267 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = checkerboard_item_get_tag_list_layout (_tmp0_); -#line 1267 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - layout = _tmp1_; -#line 1268 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = layout; -#line 1268 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp2_ == NULL) { -#line 1269 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1276 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = checkerboard_item_get_tag_list_layout (item); +#line 1276 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + layout = _tmp0_; +#line 1277 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1_ = layout; +#line 1277 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp1_ == NULL) { +#line 1278 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = -1; -#line 1269 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1278 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (layout); -#line 1269 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1278 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 7821 "CheckerboardLayout.c" - } -#line 1270 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = item; -#line 1270 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_get_subtitle_allocation (_tmp3_, &_tmp4_); -#line 1270 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - rect = _tmp4_; -#line 1272 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = x; -#line 1272 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = rect; -#line 1272 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = _tmp6_.x; -#line 1272 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - px = (_tmp5_ - _tmp7_) * PANGO_SCALE; -#line 1273 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = y; -#line 1273 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = rect; -#line 1273 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = _tmp9_.y; -#line 1273 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - py = (_tmp8_ - _tmp10_) * PANGO_SCALE; -#line 1274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = layout; -#line 1274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = px; -#line 1274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = py; -#line 1274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp16_ = pango_layout_xy_to_index (_tmp11_, _tmp12_, _tmp13_, &_tmp14_, &_tmp15_); -#line 1274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - index = _tmp14_; -#line 1274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - trailing = _tmp15_; -#line 1274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp16_) { -#line 7859 "CheckerboardLayout.c" - PangoLayout* _tmp17_; - const gchar* _tmp18_; - gint _tmp19_; - gint _tmp20_; -#line 1275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp17_ = layout; -#line 1275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp18_ = pango_layout_get_text (_tmp17_); -#line 1275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp19_ = index; -#line 1275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp20_ = checkerboard_layout_get_tag_index_at_pos (_tmp18_, _tmp19_); -#line 1275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - result = _tmp20_; -#line 1275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 7584 "CheckerboardLayout.c" + } +#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_item_translate_coordinates (item, &x, &y); +#line 1282 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_item_get_subtitle_allocation (item, &_tmp2_); +#line 1282 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + rect = _tmp2_; +#line 1284 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = rect; +#line 1284 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = _tmp3_.x; +#line 1284 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + px = (x - _tmp4_) * PANGO_SCALE; +#line 1285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = rect; +#line 1285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp6_ = _tmp5_.y; +#line 1285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + py = (y - _tmp6_) * PANGO_SCALE; +#line 1286 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp7_ = layout; +#line 1286 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp8_ = px; +#line 1286 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp9_ = py; +#line 1286 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp12_ = pango_layout_xy_to_index (_tmp7_, _tmp8_, _tmp9_, &_tmp10_, &_tmp11_); +#line 1286 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + index = _tmp10_; +#line 1286 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + trailing = _tmp11_; +#line 1286 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp12_) { +#line 7618 "CheckerboardLayout.c" + PangoLayout* _tmp13_; + const gchar* _tmp14_; + gint _tmp15_; +#line 1287 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp13_ = layout; +#line 1287 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp14_ = pango_layout_get_text (_tmp13_); +#line 1287 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp15_ = index; +#line 1287 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + result = checkerboard_layout_get_tag_index_at_pos (_tmp14_, _tmp15_); +#line 1287 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (layout); -#line 1275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1287 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 7878 "CheckerboardLayout.c" +#line 7634 "CheckerboardLayout.c" } -#line 1276 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = -1; -#line 1276 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (layout); -#line 1276 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 7886 "CheckerboardLayout.c" +#line 7642 "CheckerboardLayout.c" } -gboolean checkerboard_layout_handle_mouse_motion (CheckerboardLayout* self, CheckerboardItem* item, gint x, gint y, GdkModifierType mask) { +gboolean +checkerboard_layout_handle_mouse_motion (CheckerboardLayout* self, + CheckerboardItem* item, + gint x, + gint y, + GdkModifierType mask) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; - CheckerboardItem* _tmp1_; + gboolean _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; gint tag_index = 0; - CheckerboardItem* _tmp5_; - gint _tmp6_; - gint _tmp7_; - gint _tmp8_; - CheckerboardItem* _tmp9_; - gint _tmp10_; - gint _tmp11_; -#line 1279 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gint _tmp3_; + gint _tmp4_; +#line 1291 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), FALSE); -#line 1279 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1291 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (item), FALSE); -#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = item; -#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = checkerboard_item_get_has_tags (_tmp1_); -#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = _tmp2_; -#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!_tmp3_) { -#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1292 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1_ = checkerboard_item_get_has_tags (item); +#line 1292 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = _tmp1_; +#line 1292 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!_tmp2_) { +#line 1292 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = TRUE; -#line 7918 "CheckerboardLayout.c" +#line 7672 "CheckerboardLayout.c" } else { - gboolean _tmp4_; -#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = checkerboard_layout_is_drag_select_active (self); -#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = _tmp4_; -#line 7925 "CheckerboardLayout.c" +#line 1292 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = checkerboard_layout_is_drag_select_active (self); +#line 7676 "CheckerboardLayout.c" } -#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1292 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp0_) { -#line 1281 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1293 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = FALSE; -#line 1281 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1293 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 7933 "CheckerboardLayout.c" +#line 7684 "CheckerboardLayout.c" } -#line 1282 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = item; -#line 1282 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = x; -#line 1282 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = y; -#line 1282 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = checkerboard_layout_internal_handle_tag_mouse_event (self, _tmp5_, _tmp6_, _tmp7_); -#line 1282 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - tag_index = _tmp8_; -#line 1283 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = item; -#line 1283 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = tag_index; -#line 1283 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_highlight_user_visible_tag (_tmp9_, _tmp10_); -#line 1284 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = tag_index; -#line 1284 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - result = _tmp11_ >= 0; -#line 1284 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1294 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + tag_index = checkerboard_layout_internal_handle_tag_mouse_event (self, item, x, y); +#line 1295 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = tag_index; +#line 1295 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_item_highlight_user_visible_tag (item, _tmp3_); +#line 1296 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = tag_index; +#line 1296 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + result = _tmp4_ >= 0; +#line 1296 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 7957 "CheckerboardLayout.c" +#line 7698 "CheckerboardLayout.c" } -gboolean checkerboard_layout_handle_left_click (CheckerboardLayout* self, CheckerboardItem* item, gdouble xd, gdouble yd, GdkModifierType mask) { +gboolean +checkerboard_layout_handle_left_click (CheckerboardLayout* self, + CheckerboardItem* item, + gdouble xd, + gdouble yd, + GdkModifierType mask) +{ gboolean result = FALSE; gint tag_index = 0; - CheckerboardItem* _tmp0_; - gdouble _tmp1_; - gdouble _tmp2_; - gdouble _tmp3_; - gdouble _tmp4_; - gint _tmp5_; - gint _tmp6_; -#line 1287 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gint _tmp0_; +#line 1299 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), FALSE); -#line 1287 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1299 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (item), FALSE); -#line 1288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = item; -#line 1288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = xd; -#line 1288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = round (_tmp1_); -#line 1288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = yd; -#line 1288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = round (_tmp3_); -#line 1288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = checkerboard_layout_internal_handle_tag_mouse_event (self, _tmp0_, (gint) _tmp2_, (gint) _tmp4_); -#line 1288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - tag_index = _tmp5_; -#line 1289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = tag_index; -#line 1289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp6_ >= 0) { -#line 7993 "CheckerboardLayout.c" +#line 1300 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + tag_index = checkerboard_layout_internal_handle_tag_mouse_event (self, item, (gint) round (xd), (gint) round (yd)); +#line 1301 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = tag_index; +#line 1301 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp0_ >= 0) { +#line 7722 "CheckerboardLayout.c" Tag* tag = NULL; - CheckerboardItem* _tmp7_; - gint _tmp8_; - Tag* _tmp9_; - LibraryWindow* _tmp10_; - LibraryWindow* _tmp11_; - Tag* _tmp12_; -#line 1290 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = item; -#line 1290 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = tag_index; -#line 1290 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = checkerboard_item_get_user_visible_tag (_tmp7_, _tmp8_); -#line 1290 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - tag = _tmp9_; -#line 1291 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = library_window_get_app (); -#line 1291 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = _tmp10_; -#line 1291 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = tag; -#line 1291 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - library_window_switch_to_tag (_tmp11_, _tmp12_); -#line 1291 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_object_unref0 (_tmp11_); -#line 1292 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gint _tmp1_; + Tag* _tmp2_; + LibraryWindow* _tmp3_; + LibraryWindow* _tmp4_; + Tag* _tmp5_; +#line 1302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1_ = tag_index; +#line 1302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = checkerboard_item_get_user_visible_tag (item, _tmp1_); +#line 1302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + tag = _tmp2_; +#line 1303 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = library_window_get_app (); +#line 1303 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = _tmp3_; +#line 1303 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = tag; +#line 1303 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + library_window_switch_to_tag (_tmp4_, _tmp5_); +#line 1303 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_object_unref0 (_tmp4_); +#line 1304 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = TRUE; -#line 1292 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1304 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (tag); -#line 1292 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1304 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 8025 "CheckerboardLayout.c" +#line 7751 "CheckerboardLayout.c" } -#line 1294 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1306 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = FALSE; -#line 1294 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1306 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 8031 "CheckerboardLayout.c" +#line 7757 "CheckerboardLayout.c" } -GeeList* checkerboard_layout_get_visible_items (CheckerboardLayout* self) { +GeeList* +checkerboard_layout_get_visible_items (CheckerboardLayout* self) +{ GeeList* result = NULL; GdkRectangle _tmp0_; GeeList* _tmp1_; -#line 1297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1309 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL); -#line 1298 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1310 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->visible_page; -#line 1298 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1310 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = checkerboard_layout_intersection (self, &_tmp0_); -#line 1298 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1310 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = _tmp1_; -#line 1298 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1310 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 8049 "CheckerboardLayout.c" +#line 7777 "CheckerboardLayout.c" } -GeeList* checkerboard_layout_intersection (CheckerboardLayout* self, GdkRectangle* area) { +GeeList* +checkerboard_layout_intersection (CheckerboardLayout* self, + GdkRectangle* area) +{ GeeList* result = NULL; GeeArrayList* intersects = NULL; GeeArrayList* _tmp0_; @@ -8058,44 +7789,44 @@ GeeList* checkerboard_layout_intersection (CheckerboardLayout* self, GdkRectangl GdkRectangle bitbucket = {0}; CheckerboardLayoutLayoutRow** _tmp2_; gint _tmp2__length1; -#line 1301 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1313 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL); -#line 1301 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1313 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (area != NULL, NULL); -#line 1302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1314 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = gee_array_list_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); -#line 1302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1314 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" intersects = _tmp0_; -#line 1305 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp1_); -#line 1305 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" allocation = _tmp1_; -#line 1307 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1319 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" memset (&bitbucket, 0, sizeof (GdkRectangle)); -#line 1308 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1320 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = self->priv->item_rows; -#line 1308 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1320 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2__length1 = self->priv->item_rows_length1; -#line 8080 "CheckerboardLayout.c" +#line 7811 "CheckerboardLayout.c" { CheckerboardLayoutLayoutRow** row_collection = NULL; gint row_collection_length1 = 0; gint _row_collection_size_ = 0; gint row_it = 0; -#line 1308 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1320 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" row_collection = _tmp2_; -#line 1308 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1320 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" row_collection_length1 = _tmp2__length1; -#line 1308 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1320 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" for (row_it = 0; row_it < _tmp2__length1; row_it = row_it + 1) { -#line 8092 "CheckerboardLayout.c" +#line 7823 "CheckerboardLayout.c" CheckerboardLayoutLayoutRow* _tmp3_; CheckerboardLayoutLayoutRow* row = NULL; -#line 1308 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1320 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp3_ = _checkerboard_layout_layout_row_ref0 (row_collection[row_it]); -#line 1308 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1320 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" row = _tmp3_; -#line 8099 "CheckerboardLayout.c" +#line 7830 "CheckerboardLayout.c" { CheckerboardLayoutLayoutRow* _tmp4_; GdkRectangle _tmp5_; @@ -8120,877 +7851,822 @@ GeeList* checkerboard_layout_intersection (CheckerboardLayout* self, GdkRectangl GdkRectangle _tmp23_; GdkRectangle _tmp24_ = {0}; gboolean _tmp25_; -#line 1309 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1321 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp4_ = row; -#line 1309 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1321 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp4_ == NULL) { -#line 1310 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1322 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_layout_layout_row_unref0 (row); -#line 1310 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1322 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" continue; -#line 8132 "CheckerboardLayout.c" +#line 7863 "CheckerboardLayout.c" } -#line 1312 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1324 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp5_ = *area; -#line 1312 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1324 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp6_ = _tmp5_.y; -#line 1312 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1324 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp7_ = *area; -#line 1312 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1324 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp8_ = _tmp7_.height; -#line 1312 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1324 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp9_ = row; -#line 1312 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1324 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp10_ = _tmp9_->y; -#line 1312 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1324 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if ((_tmp6_ + _tmp8_) < _tmp10_) { -#line 1314 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1326 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_layout_layout_row_unref0 (row); -#line 1314 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1326 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 8152 "CheckerboardLayout.c" +#line 7883 "CheckerboardLayout.c" } -#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1329 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp11_ = row; -#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1329 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp12_ = _tmp11_->y; -#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1329 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp13_ = row; -#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1329 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp14_ = _tmp13_->height; -#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1329 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp15_ = *area; -#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1329 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp16_ = _tmp15_.y; -#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1329 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if ((_tmp12_ + _tmp14_) < _tmp16_) { -#line 1319 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_layout_layout_row_unref0 (row); -#line 1319 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" continue; -#line 8172 "CheckerboardLayout.c" +#line 7903 "CheckerboardLayout.c" } -#line 1323 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1335 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" memset (&row_rect, 0, sizeof (GdkRectangle)); -#line 1324 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" row_rect.x = 0; -#line 1325 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1337 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp17_ = row; -#line 1325 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1337 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp18_ = _tmp17_->y; -#line 1325 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1337 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" row_rect.y = _tmp18_; -#line 1326 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1338 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp19_ = allocation; -#line 1326 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1338 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp20_ = _tmp19_.width; -#line 1326 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1338 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" row_rect.width = _tmp20_; -#line 1327 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1339 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp21_ = row; -#line 1327 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1339 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp22_ = _tmp21_->height; -#line 1327 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1339 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" row_rect.height = _tmp22_; -#line 1329 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1341 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp23_ = row_rect; -#line 1329 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1341 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp25_ = gdk_rectangle_intersect (area, &_tmp23_, &_tmp24_); -#line 1329 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1341 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" bitbucket = _tmp24_; -#line 1329 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1341 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp25_) { -#line 8204 "CheckerboardLayout.c" +#line 7935 "CheckerboardLayout.c" CheckerboardLayoutLayoutRow* _tmp26_; CheckerboardItem** _tmp27_; gint _tmp27__length1; -#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1343 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp26_ = row; -#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1343 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp27_ = _tmp26_->items; -#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1343 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp27__length1 = _tmp26_->items_length1; -#line 8214 "CheckerboardLayout.c" +#line 7945 "CheckerboardLayout.c" { CheckerboardItem** item_collection = NULL; gint item_collection_length1 = 0; gint _item_collection_size_ = 0; gint item_it = 0; -#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1343 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" item_collection = _tmp27_; -#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1343 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" item_collection_length1 = _tmp27__length1; -#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1343 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" for (item_it = 0; item_it < _tmp27__length1; item_it = item_it + 1) { -#line 8226 "CheckerboardLayout.c" +#line 7957 "CheckerboardLayout.c" CheckerboardItem* _tmp28_; CheckerboardItem* item = NULL; -#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1343 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp28_ = _g_object_ref0 (item_collection[item_it]); -#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1343 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" item = _tmp28_; -#line 8233 "CheckerboardLayout.c" +#line 7964 "CheckerboardLayout.c" { CheckerboardItem* _tmp29_; CheckerboardItem* _tmp30_; GdkRectangle _tmp31_; GdkRectangle _tmp32_ = {0}; gboolean _tmp33_; -#line 1332 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1344 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp29_ = item; -#line 1332 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1344 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp29_ == NULL) { -#line 1333 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1345 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (item); -#line 1333 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1345 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" continue; -#line 8248 "CheckerboardLayout.c" +#line 7979 "CheckerboardLayout.c" } -#line 1335 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1347 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp30_ = item; -#line 1335 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1347 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp31_ = _tmp30_->allocation; -#line 1335 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1347 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp33_ = gdk_rectangle_intersect (area, &_tmp31_, &_tmp32_); -#line 1335 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1347 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" bitbucket = _tmp32_; -#line 1335 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1347 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp33_) { -#line 8260 "CheckerboardLayout.c" +#line 7991 "CheckerboardLayout.c" GeeArrayList* _tmp34_; CheckerboardItem* _tmp35_; -#line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1348 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp34_ = intersects; -#line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1348 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp35_ = item; -#line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1348 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp35_); -#line 8269 "CheckerboardLayout.c" +#line 8000 "CheckerboardLayout.c" } -#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1343 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (item); -#line 8273 "CheckerboardLayout.c" +#line 8004 "CheckerboardLayout.c" } } } } -#line 1308 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1320 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_layout_layout_row_unref0 (row); -#line 8280 "CheckerboardLayout.c" +#line 8011 "CheckerboardLayout.c" } } } -#line 1341 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1353 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = G_TYPE_CHECK_INSTANCE_CAST (intersects, GEE_TYPE_LIST, GeeList); -#line 1341 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1353 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 8288 "CheckerboardLayout.c" +#line 8019 "CheckerboardLayout.c" } -CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout* self, CheckerboardItem* item, CompassPoint point) { +CheckerboardItem* +checkerboard_layout_get_item_relative_to (CheckerboardLayout* self, + CheckerboardItem* item, + CompassPoint point) +{ CheckerboardItem* result = NULL; ViewCollection* _tmp0_; gint _tmp1_; gint _tmp2_; - gint _tmp3_; gint col = 0; - CheckerboardItem* _tmp4_; - gint _tmp5_; gint row = 0; - CheckerboardItem* _tmp6_; - gint _tmp7_; - gboolean _tmp8_ = FALSE; - gint _tmp9_; - CompassPoint _tmp14_; + gboolean _tmp3_ = FALSE; + gint _tmp4_; CheckerboardItem* new_item = NULL; - gint _tmp35_; - gint _tmp36_; - CheckerboardItem* _tmp37_; - gboolean _tmp38_ = FALSE; - CheckerboardItem* _tmp39_; - CheckerboardItem* _tmp47_ = NULL; - CheckerboardItem* _tmp48_; - CheckerboardItem* _tmp51_; -#line 1344 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gint _tmp27_; + gint _tmp28_; + CheckerboardItem* _tmp29_; + gboolean _tmp30_ = FALSE; + CheckerboardItem* _tmp31_; + CheckerboardItem* _tmp35_ = NULL; + CheckerboardItem* _tmp36_; + CheckerboardItem* _tmp38_; +#line 1356 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL); -#line 1344 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1356 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_ITEM (item), NULL); -#line 1345 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1357 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->view; -#line 1345 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); -#line 1345 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp1_ == 0) { -#line 1346 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - result = NULL; -#line 1346 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - return result; -#line 8330 "CheckerboardLayout.c" - } -#line 1348 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = self->priv->columns; -#line 1348 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _vala_assert (_tmp2_ > 0, "columns > 0"); -#line 1349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = self->priv->rows; -#line 1349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _vala_assert (_tmp3_ > 0, "rows > 0"); -#line 1351 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = item; -#line 1351 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = checkerboard_item_get_column (_tmp4_); -#line 1351 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - col = _tmp5_; -#line 1352 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = item; -#line 1352 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = checkerboard_item_get_row (_tmp6_); -#line 1352 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row = _tmp7_; -#line 1354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = col; -#line 1354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp9_ < 0) { -#line 1354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = TRUE; -#line 8358 "CheckerboardLayout.c" - } else { - gint _tmp10_; -#line 1354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = row; -#line 1354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = _tmp10_ < 0; -#line 8365 "CheckerboardLayout.c" - } -#line 1354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp8_) { -#line 8369 "CheckerboardLayout.c" - CheckerboardItem* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; -#line 1355 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = item; -#line 1355 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = checkerboard_item_get_title (_tmp11_); -#line 1355 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = _tmp12_; -#line 1355 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_critical ("CheckerboardLayout.vala:1355: Attempting to locate item not placed in " \ -"layout: %s", _tmp13_); -#line 1355 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_free0 (_tmp13_); #line 1357 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)) == 0) { +#line 1358 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = NULL; -#line 1357 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1358 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 8387 "CheckerboardLayout.c" +#line 8057 "CheckerboardLayout.c" } #line 1360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = point; -#line 1360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - switch (_tmp14_) { + _tmp1_ = self->priv->columns; #line 1360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - case COMPASS_POINT_NORTH: -#line 8395 "CheckerboardLayout.c" - { - gint _tmp15_; - gint _tmp16_; -#line 1362 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp15_ = row; -#line 1362 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row = _tmp15_ - 1; -#line 1362 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp16_ = row; -#line 1362 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp16_ < 0) { + _vala_assert (_tmp1_ > 0, "columns > 0"); +#line 1361 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = self->priv->rows; +#line 1361 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _vala_assert (_tmp2_ > 0, "rows > 0"); #line 1363 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row = 0; -#line 8409 "CheckerboardLayout.c" - } + col = checkerboard_item_get_column (item); #line 1364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - break; -#line 8413 "CheckerboardLayout.c" - } -#line 1360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - case COMPASS_POINT_SOUTH: -#line 8417 "CheckerboardLayout.c" - { - gint _tmp17_; - gint _tmp18_; - gint _tmp19_; -#line 1367 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp17_ = row; + row = checkerboard_item_get_row (item); +#line 1366 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = col; +#line 1366 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp4_ < 0) { +#line 1366 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = TRUE; +#line 8077 "CheckerboardLayout.c" + } else { + gint _tmp5_; +#line 1366 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = row; +#line 1366 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = _tmp5_ < 0; +#line 8084 "CheckerboardLayout.c" + } +#line 1366 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp3_) { +#line 8088 "CheckerboardLayout.c" + gchar* _tmp6_; + gchar* _tmp7_; #line 1367 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row = _tmp17_ + 1; + _tmp6_ = checkerboard_item_get_title (item); #line 1367 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp18_ = row; + _tmp7_ = _tmp6_; #line 1367 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp19_ = self->priv->rows; + g_critical ("CheckerboardLayout.vala:1367: Attempting to locate item not placed in " \ +"layout: %s", _tmp7_); #line 1367 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp18_ >= _tmp19_) { -#line 8432 "CheckerboardLayout.c" - gint _tmp20_; -#line 1368 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp20_ = self->priv->rows; -#line 1368 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row = _tmp20_ - 1; -#line 8438 "CheckerboardLayout.c" - } + _g_free0 (_tmp7_); #line 1369 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - break; -#line 8442 "CheckerboardLayout.c" - } -#line 1360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - case COMPASS_POINT_EAST: -#line 8446 "CheckerboardLayout.c" - { - gint _tmp21_; - gint _tmp22_; - gint _tmp23_; -#line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp21_ = col; -#line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - col = _tmp21_ + 1; + result = NULL; +#line 1369 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + return result; +#line 8103 "CheckerboardLayout.c" + } #line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp22_ = col; + switch (point) { #line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp23_ = self->priv->columns; -#line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp22_ >= _tmp23_) { -#line 8461 "CheckerboardLayout.c" - gint _tmp24_; - gint _tmp25_; - gint _tmp26_; -#line 1373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp24_ = row; -#line 1373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row = _tmp24_ + 1; -#line 1373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp25_ = row; -#line 1373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp26_ = self->priv->rows; -#line 1373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp25_ >= _tmp26_) { -#line 8475 "CheckerboardLayout.c" - gint _tmp27_; - gint _tmp28_; + case COMPASS_POINT_NORTH: +#line 8109 "CheckerboardLayout.c" + { + gint _tmp8_; + gint _tmp9_; #line 1374 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp27_ = self->priv->rows; + _tmp8_ = row; #line 1374 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row = _tmp27_ - 1; -#line 1375 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp28_ = self->priv->columns; + row = _tmp8_ - 1; +#line 1374 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp9_ = row; +#line 1374 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp9_ < 0) { #line 1375 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - col = _tmp28_ - 1; -#line 8486 "CheckerboardLayout.c" - } else { -#line 1377 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - col = 0; -#line 8490 "CheckerboardLayout.c" - } + row = 0; +#line 8123 "CheckerboardLayout.c" } +#line 1376 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + break; +#line 8127 "CheckerboardLayout.c" + } +#line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + case COMPASS_POINT_SOUTH: +#line 8131 "CheckerboardLayout.c" + { + gint _tmp10_; + gint _tmp11_; + gint _tmp12_; +#line 1379 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp10_ = row; +#line 1379 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + row = _tmp10_ + 1; +#line 1379 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp11_ = row; +#line 1379 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp12_ = self->priv->rows; +#line 1379 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp11_ >= _tmp12_) { +#line 8146 "CheckerboardLayout.c" + gint _tmp13_; #line 1380 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp13_ = self->priv->rows; +#line 1380 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + row = _tmp13_ - 1; +#line 8152 "CheckerboardLayout.c" + } +#line 1381 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 8495 "CheckerboardLayout.c" +#line 8156 "CheckerboardLayout.c" } -#line 1360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - case COMPASS_POINT_WEST: -#line 8499 "CheckerboardLayout.c" +#line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + case COMPASS_POINT_EAST: +#line 8160 "CheckerboardLayout.c" { - gint _tmp29_; - gint _tmp30_; -#line 1383 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp29_ = col; -#line 1383 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - col = _tmp29_ - 1; -#line 1383 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp30_ = col; -#line 1383 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp30_ < 0) { -#line 8511 "CheckerboardLayout.c" - gint _tmp31_; - gint _tmp32_; + gint _tmp14_; + gint _tmp15_; + gint _tmp16_; +#line 1384 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp14_ = col; #line 1384 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp31_ = row; + col = _tmp14_ + 1; #line 1384 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row = _tmp31_ - 1; + _tmp15_ = col; #line 1384 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp32_ = row; + _tmp16_ = self->priv->columns; #line 1384 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp32_ < 0) { + if (_tmp15_ >= _tmp16_) { +#line 8175 "CheckerboardLayout.c" + gint _tmp17_; + gint _tmp18_; + gint _tmp19_; #line 1385 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row = 0; + _tmp17_ = row; +#line 1385 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + row = _tmp17_ + 1; +#line 1385 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp18_ = row; +#line 1385 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp19_ = self->priv->rows; +#line 1385 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp18_ >= _tmp19_) { +#line 8189 "CheckerboardLayout.c" + gint _tmp20_; + gint _tmp21_; +#line 1386 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp20_ = self->priv->rows; #line 1386 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + row = _tmp20_ - 1; +#line 1387 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp21_ = self->priv->columns; +#line 1387 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + col = _tmp21_ - 1; +#line 8200 "CheckerboardLayout.c" + } else { +#line 1389 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" col = 0; -#line 8526 "CheckerboardLayout.c" +#line 8204 "CheckerboardLayout.c" + } + } +#line 1392 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + break; +#line 8209 "CheckerboardLayout.c" + } +#line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + case COMPASS_POINT_WEST: +#line 8213 "CheckerboardLayout.c" + { + gint _tmp22_; + gint _tmp23_; +#line 1395 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp22_ = col; +#line 1395 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + col = _tmp22_ - 1; +#line 1395 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp23_ = col; +#line 1395 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp23_ < 0) { +#line 8225 "CheckerboardLayout.c" + gint _tmp24_; + gint _tmp25_; +#line 1396 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp24_ = row; +#line 1396 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + row = _tmp24_ - 1; +#line 1396 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp25_ = row; +#line 1396 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp25_ < 0) { +#line 1397 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + row = 0; +#line 1398 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + col = 0; +#line 8240 "CheckerboardLayout.c" } else { - gint _tmp33_; -#line 1388 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp33_ = self->priv->columns; -#line 1388 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - col = _tmp33_ - 1; -#line 8533 "CheckerboardLayout.c" + gint _tmp26_; +#line 1400 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp26_ = self->priv->columns; +#line 1400 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + col = _tmp26_ - 1; +#line 8247 "CheckerboardLayout.c" } } -#line 1391 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1403 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 8538 "CheckerboardLayout.c" +#line 8252 "CheckerboardLayout.c" } default: { - CompassPoint _tmp34_; -#line 1394 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp34_ = point; -#line 1394 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_error ("CheckerboardLayout.vala:1394: Bad compass point %d", (gint) _tmp34_); -#line 8547 "CheckerboardLayout.c" +#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + g_error ("CheckerboardLayout.vala:1406: Bad compass point %d", (gint) point); +#line 8258 "CheckerboardLayout.c" } } -#line 1397 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp35_ = col; -#line 1397 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp36_ = row; -#line 1397 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp37_ = checkerboard_layout_get_item_at_coordinate (self, _tmp35_, _tmp36_); -#line 1397 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - new_item = _tmp37_; -#line 1399 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp39_ = new_item; -#line 1399 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp39_ == NULL) { -#line 8562 "CheckerboardLayout.c" - CompassPoint _tmp40_; -#line 1399 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp40_ = point; -#line 1399 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp38_ = _tmp40_ == COMPASS_POINT_SOUTH; -#line 8568 "CheckerboardLayout.c" +#line 1409 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp27_ = col; +#line 1409 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp28_ = row; +#line 1409 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp29_ = checkerboard_layout_get_item_at_coordinate (self, _tmp27_, _tmp28_); +#line 1409 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + new_item = _tmp29_; +#line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp31_ = new_item; +#line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp31_ == NULL) { +#line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp30_ = point == COMPASS_POINT_SOUTH; +#line 8275 "CheckerboardLayout.c" } else { -#line 1399 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp38_ = FALSE; -#line 8572 "CheckerboardLayout.c" - } -#line 1399 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp38_) { -#line 8576 "CheckerboardLayout.c" - ViewCollection* _tmp41_; - DataView* _tmp42_; - CheckerboardItem* _tmp43_; - gint _tmp44_; - CheckerboardItem* _tmp45_; - gint _tmp46_; -#line 1401 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp41_ = self->priv->view; -#line 1401 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp42_ = view_collection_get_last (_tmp41_); -#line 1401 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp30_ = FALSE; +#line 8279 "CheckerboardLayout.c" + } +#line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp30_) { +#line 8283 "CheckerboardLayout.c" + ViewCollection* _tmp32_; + DataView* _tmp33_; + CheckerboardItem* _tmp34_; +#line 1413 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp32_ = self->priv->view; +#line 1413 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp33_ = view_collection_get_last (_tmp32_); +#line 1413 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (new_item); -#line 1401 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - new_item = G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); -#line 1402 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp43_ = new_item; -#line 1402 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp44_ = checkerboard_item_get_row (_tmp43_); -#line 1402 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp45_ = item; -#line 1402 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp46_ = checkerboard_item_get_row (_tmp45_); -#line 1402 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp44_ <= _tmp46_) { -#line 1403 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1413 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + new_item = G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); +#line 1414 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp34_ = new_item; +#line 1414 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (checkerboard_item_get_row (_tmp34_) <= checkerboard_item_get_row (item)) { +#line 1415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (new_item); -#line 1403 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" new_item = NULL; -#line 8605 "CheckerboardLayout.c" +#line 8303 "CheckerboardLayout.c" } } -#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp48_ = new_item; -#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp48_ != NULL) { -#line 8612 "CheckerboardLayout.c" - CheckerboardItem* _tmp49_; -#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp49_ = new_item; -#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp47_ = _tmp49_; -#line 8618 "CheckerboardLayout.c" +#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp36_ = new_item; +#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp36_ != NULL) { +#line 8310 "CheckerboardLayout.c" + CheckerboardItem* _tmp37_; +#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp37_ = new_item; +#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp35_ = _tmp37_; +#line 8316 "CheckerboardLayout.c" } else { - CheckerboardItem* _tmp50_; -#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp50_ = item; -#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp47_ = _tmp50_; -#line 8625 "CheckerboardLayout.c" +#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp35_ = item; +#line 8320 "CheckerboardLayout.c" } -#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp51_ = _g_object_ref0 (_tmp47_); -#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - result = _tmp51_; -#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp38_ = _g_object_ref0 (_tmp35_); +#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + result = _tmp38_; +#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (new_item); -#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 8635 "CheckerboardLayout.c" +#line 8330 "CheckerboardLayout.c" } -CheckerboardItem* checkerboard_layout_get_item_at_coordinate (CheckerboardLayout* self, gint col, gint row) { +CheckerboardItem* +checkerboard_layout_get_item_at_coordinate (CheckerboardLayout* self, + gint col, + gint row) +{ CheckerboardItem* result = NULL; - gint _tmp0_; + CheckerboardLayoutLayoutRow** _tmp0_; + gint _tmp0__length1; + CheckerboardLayoutLayoutRow* item_row = NULL; CheckerboardLayoutLayoutRow** _tmp1_; gint _tmp1__length1; - CheckerboardLayoutLayoutRow* item_row = NULL; - CheckerboardLayoutLayoutRow** _tmp2_; - gint _tmp2__length1; - gint _tmp3_; + CheckerboardLayoutLayoutRow* _tmp2_; + CheckerboardLayoutLayoutRow* _tmp3_; CheckerboardLayoutLayoutRow* _tmp4_; CheckerboardLayoutLayoutRow* _tmp5_; - CheckerboardLayoutLayoutRow* _tmp6_; - gint _tmp7_; - CheckerboardLayoutLayoutRow* _tmp8_; - CheckerboardItem** _tmp9_; - gint _tmp9__length1; - CheckerboardLayoutLayoutRow* _tmp10_; - CheckerboardItem** _tmp11_; - gint _tmp11__length1; - gint _tmp12_; - CheckerboardItem* _tmp13_; - CheckerboardItem* _tmp14_; -#line 1409 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + CheckerboardItem** _tmp6_; + gint _tmp6__length1; + CheckerboardLayoutLayoutRow* _tmp7_; + CheckerboardItem** _tmp8_; + gint _tmp8__length1; + CheckerboardItem* _tmp9_; + CheckerboardItem* _tmp10_; +#line 1421 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL); -#line 1410 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = row; -#line 1410 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = self->priv->item_rows; -#line 1410 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1__length1 = self->priv->item_rows_length1; -#line 1410 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp0_ >= _tmp1__length1) { -#line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1422 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = self->priv->item_rows; +#line 1422 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0__length1 = self->priv->item_rows_length1; +#line 1422 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (row >= _tmp0__length1) { +#line 1423 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = NULL; -#line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1423 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 8675 "CheckerboardLayout.c" +#line 8368 "CheckerboardLayout.c" } -#line 1413 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = self->priv->item_rows; -#line 1413 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2__length1 = self->priv->item_rows_length1; -#line 1413 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = row; -#line 1413 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = _tmp2_[_tmp3_]; -#line 1413 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = _checkerboard_layout_layout_row_ref0 (_tmp4_); -#line 1413 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - item_row = _tmp5_; -#line 1414 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = item_row; -#line 1414 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp6_ == NULL) { -#line 1415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1425 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1_ = self->priv->item_rows; +#line 1425 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1__length1 = self->priv->item_rows_length1; +#line 1425 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = _tmp1_[row]; +#line 1425 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = _checkerboard_layout_layout_row_ref0 (_tmp2_); +#line 1425 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + item_row = _tmp3_; +#line 1426 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = item_row; +#line 1426 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp4_ == NULL) { +#line 1427 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = NULL; -#line 1415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1427 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_layout_layout_row_unref0 (item_row); -#line 1415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1427 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 8699 "CheckerboardLayout.c" - } -#line 1417 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = col; -#line 1417 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = item_row; -#line 1417 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = _tmp8_->items; -#line 1417 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9__length1 = _tmp8_->items_length1; -#line 1417 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp7_ >= _tmp9__length1) { -#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 8390 "CheckerboardLayout.c" + } +#line 1429 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = item_row; +#line 1429 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp6_ = _tmp5_->items; +#line 1429 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp6__length1 = _tmp5_->items_length1; +#line 1429 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (col >= _tmp6__length1) { +#line 1430 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = NULL; -#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1430 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_layout_layout_row_unref0 (item_row); -#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1430 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 8717 "CheckerboardLayout.c" - } -#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = item_row; -#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = _tmp10_->items; -#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11__length1 = _tmp10_->items_length1; -#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = col; -#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = _tmp11_[_tmp12_]; -#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = _g_object_ref0 (_tmp13_); -#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - result = _tmp14_; -#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 8406 "CheckerboardLayout.c" + } +#line 1432 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp7_ = item_row; +#line 1432 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp8_ = _tmp7_->items; +#line 1432 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp8__length1 = _tmp7_->items_length1; +#line 1432 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp9_ = _tmp8_[col]; +#line 1432 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp10_ = _g_object_ref0 (_tmp9_); +#line 1432 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + result = _tmp10_; +#line 1432 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_layout_layout_row_unref0 (item_row); -#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1432 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 8737 "CheckerboardLayout.c" +#line 8424 "CheckerboardLayout.c" } -void checkerboard_layout_set_drag_select_origin (CheckerboardLayout* self, gint x, gint y) { +void +checkerboard_layout_set_drag_select_origin (CheckerboardLayout* self, + gint x, + gint y) +{ GtkAllocation allocation = {0}; GtkAllocation _tmp0_ = {0}; - gint _tmp1_; - GtkAllocation _tmp2_; - gint _tmp3_; + GtkAllocation _tmp1_; + gint _tmp2_; + GtkAllocation _tmp3_; gint _tmp4_; - gint _tmp5_; - GtkAllocation _tmp6_; - gint _tmp7_; - gint _tmp8_; -#line 1423 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1435 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1424 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1436 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_clear_drag_select (self); -#line 1427 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1439 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp0_); -#line 1427 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1439 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" allocation = _tmp0_; -#line 1429 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = x; -#line 1429 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = allocation; -#line 1429 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = _tmp2_.width; -#line 1429 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = CLAMP (_tmp1_, 0, _tmp3_); -#line 1429 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->drag_origin.x = _tmp4_; -#line 1430 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = y; -#line 1430 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = allocation; -#line 1430 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = _tmp6_.height; -#line 1430 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = CLAMP (_tmp5_, 0, _tmp7_); -#line 1430 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->drag_origin.y = _tmp8_; -#line 8780 "CheckerboardLayout.c" +#line 1441 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1_ = allocation; +#line 1441 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = _tmp1_.width; +#line 1441 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->drag_origin.x = CLAMP (x, 0, _tmp2_); +#line 1442 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = allocation; +#line 1442 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = _tmp3_.height; +#line 1442 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->drag_origin.y = CLAMP (y, 0, _tmp4_); +#line 8459 "CheckerboardLayout.c" } -void checkerboard_layout_set_drag_select_endpoint (CheckerboardLayout* self, gint x, gint y) { +void +checkerboard_layout_set_drag_select_endpoint (CheckerboardLayout* self, + gint x, + gint y) +{ GtkAllocation allocation = {0}; GtkAllocation _tmp0_ = {0}; - gint _tmp1_; - GtkAllocation _tmp2_; - gint _tmp3_; + GtkAllocation _tmp1_; + gint _tmp2_; + GtkAllocation _tmp3_; gint _tmp4_; - gint _tmp5_; - GtkAllocation _tmp6_; - gint _tmp7_; - gint _tmp8_; GdkRectangle old_selection_band = {0}; - GdkRectangle _tmp9_; - GdkPoint _tmp10_; - GdkPoint _tmp11_; - Box _tmp12_ = {0}; - GdkRectangle _tmp13_ = {0}; - GdkWindow* _tmp14_; -#line 1433 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GdkRectangle _tmp5_; + GdkPoint _tmp6_; + GdkPoint _tmp7_; + Box _tmp8_ = {0}; + GdkRectangle _tmp9_ = {0}; + GdkWindow* _tmp10_; +#line 1445 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1435 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1447 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp0_); -#line 1435 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1447 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" allocation = _tmp0_; -#line 1437 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = x; -#line 1437 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = allocation; -#line 1437 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = _tmp2_.width; -#line 1437 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = CLAMP (_tmp1_, 0, _tmp3_); -#line 1437 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->drag_endpoint.x = _tmp4_; -#line 1438 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = y; -#line 1438 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = allocation; -#line 1438 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = _tmp6_.height; -#line 1438 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = CLAMP (_tmp5_, 0, _tmp7_); -#line 1438 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->drag_endpoint.y = _tmp8_; -#line 1442 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = self->priv->selection_band; -#line 1442 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - old_selection_band = _tmp9_; -#line 1443 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = self->priv->drag_origin; -#line 1443 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = self->priv->drag_endpoint; -#line 1443 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - box_from_points (&_tmp10_, &_tmp11_, &_tmp12_); -#line 1443 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - box_get_rectangle (&_tmp12_, &_tmp13_); -#line 1443 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->selection_band = _tmp13_; -#line 1446 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 1446 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp14_ != NULL) { -#line 8846 "CheckerboardLayout.c" +#line 1449 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1_ = allocation; +#line 1449 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = _tmp1_.width; +#line 1449 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->drag_endpoint.x = CLAMP (x, 0, _tmp2_); +#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = allocation; +#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = _tmp3_.height; +#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->drag_endpoint.y = CLAMP (y, 0, _tmp4_); +#line 1454 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = self->priv->selection_band; +#line 1454 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + old_selection_band = _tmp5_; +#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp6_ = self->priv->drag_origin; +#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp7_ = self->priv->drag_endpoint; +#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + box_from_points (&_tmp6_, &_tmp7_, &_tmp8_); +#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + box_get_rectangle (&_tmp8_, &_tmp9_); +#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->selection_band = _tmp9_; +#line 1458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp10_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); +#line 1458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp10_ != NULL) { +#line 8517 "CheckerboardLayout.c" GdkRectangle _union_ = {0}; + GdkRectangle _tmp11_; + GdkRectangle _tmp12_ = {0}; + GdkRectangle _tmp13_; + gint _tmp14_; GdkRectangle _tmp15_; - GdkRectangle _tmp16_ = {0}; + gint _tmp16_; GdkRectangle _tmp17_; gint _tmp18_; GdkRectangle _tmp19_; gint _tmp20_; - GdkRectangle _tmp21_; - gint _tmp22_; - GdkRectangle _tmp23_; - gint _tmp24_; -#line 1448 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp15_ = old_selection_band; -#line 1448 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gdk_rectangle_union (&self->priv->selection_band, &_tmp15_, &_tmp16_); -#line 1448 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _union_ = _tmp16_; -#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp11_ = old_selection_band; +#line 1460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gdk_rectangle_union (&self->priv->selection_band, &_tmp11_, &_tmp12_); +#line 1460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _union_ = _tmp12_; +#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp13_ = _union_; +#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp14_ = _tmp13_.x; +#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp15_ = _union_; +#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp16_ = _tmp15_.y; +#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp17_ = _union_; -#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp18_ = _tmp17_.x; -#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp18_ = _tmp17_.width; +#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp19_ = _union_; -#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp20_ = _tmp19_.y; -#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp21_ = _union_; -#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp22_ = _tmp21_.width; -#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp23_ = _union_; -#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp24_ = _tmp23_.height; -#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gtk_widget_queue_draw_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp18_, _tmp20_, _tmp22_, _tmp24_); -#line 8882 "CheckerboardLayout.c" +#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp20_ = _tmp19_.height; +#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gtk_widget_queue_draw_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp14_, _tmp16_, _tmp18_, _tmp20_); +#line 8553 "CheckerboardLayout.c" } } -GeeList* checkerboard_layout_items_in_selection_band (CheckerboardLayout* self) { +GeeList* +checkerboard_layout_items_in_selection_band (CheckerboardLayout* self) +{ GeeList* result = NULL; GdkRectangle _tmp0_; Dimensions _tmp1_ = {0}; - gboolean _tmp2_; - GdkRectangle _tmp3_; - GeeList* _tmp4_; -#line 1454 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GdkRectangle _tmp2_; + GeeList* _tmp3_; +#line 1466 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL); -#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->selection_band; -#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" dimensions_for_rectangle (&_tmp0_, &_tmp1_); -#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = dimensions_has_area (&_tmp1_); -#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!_tmp2_) { -#line 1456 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!dimensions_has_area (&_tmp1_)) { +#line 1468 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = NULL; -#line 1456 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1468 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 8908 "CheckerboardLayout.c" +#line 8578 "CheckerboardLayout.c" } -#line 1458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = self->priv->selection_band; -#line 1458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = checkerboard_layout_intersection (self, &_tmp3_); -#line 1458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - result = _tmp4_; -#line 1458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1470 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = self->priv->selection_band; +#line 1470 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = checkerboard_layout_intersection (self, &_tmp2_); +#line 1470 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + result = _tmp3_; +#line 1470 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 8918 "CheckerboardLayout.c" +#line 8588 "CheckerboardLayout.c" } -gboolean checkerboard_layout_is_drag_select_active (CheckerboardLayout* self) { +gboolean +checkerboard_layout_is_drag_select_active (CheckerboardLayout* self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; GdkPoint _tmp1_; gint _tmp2_; -#line 1461 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1473 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), FALSE); -#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1474 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->drag_origin; -#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1474 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = _tmp1_.x; -#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1474 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp2_ >= 0) { -#line 8935 "CheckerboardLayout.c" +#line 8607 "CheckerboardLayout.c" GdkPoint _tmp3_; gint _tmp4_; -#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1474 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp3_ = self->priv->drag_origin; -#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1474 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp4_ = _tmp3_.y; -#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1474 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = _tmp4_ >= 0; -#line 8944 "CheckerboardLayout.c" +#line 8616 "CheckerboardLayout.c" } else { -#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1474 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = FALSE; -#line 8948 "CheckerboardLayout.c" +#line 8620 "CheckerboardLayout.c" } -#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1474 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = _tmp0_; -#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1474 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 8954 "CheckerboardLayout.c" +#line 8626 "CheckerboardLayout.c" } -void checkerboard_layout_clear_drag_select (CheckerboardLayout* self) { -#line 1465 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +void +checkerboard_layout_clear_drag_select (CheckerboardLayout* self) +{ +#line 1477 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1466 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1478 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" memset (&self->priv->selection_band, 0, sizeof (GdkRectangle)); -#line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1479 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->drag_origin.x = -1; -#line 1468 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1480 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->drag_origin.y = -1; -#line 1469 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1481 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->drag_endpoint.x = -1; -#line 1470 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1482 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->drag_endpoint.y = -1; -#line 1473 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1485 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 8973 "CheckerboardLayout.c" +#line 8647 "CheckerboardLayout.c" } -static void checkerboard_layout_viewport_resized (CheckerboardLayout* self) { +static void +checkerboard_layout_viewport_resized (CheckerboardLayout* self) +{ GdkRectangle _tmp0_; gint _tmp1_; gint _tmp2_; -#line 1476 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1488 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1478 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1490 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_update_visible_page (self); -#line 1481 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1493 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->visible_page; -#line 1481 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1493 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = _tmp0_.width; -#line 1481 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1493 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = self->priv->last_width; -#line 1481 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1493 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp1_ != _tmp2_) { -#line 8993 "CheckerboardLayout.c" +#line 8669 "CheckerboardLayout.c" gint old_width = 0; gint _tmp3_; GdkRectangle _tmp4_; @@ -9000,76 +8676,79 @@ static void checkerboard_layout_viewport_resized (CheckerboardLayout* self) { gint _tmp8_; gchar* _tmp9_; gchar* _tmp10_; -#line 1482 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1494 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp3_ = self->priv->last_width; -#line 1482 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1494 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" old_width = _tmp3_; -#line 1483 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1495 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp4_ = self->priv->visible_page; -#line 1483 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1495 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp5_ = _tmp4_.width; -#line 1483 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1495 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->last_width = _tmp5_; -#line 1485 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp6_ = old_width; -#line 1485 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp7_ = self->priv->visible_page; -#line 1485 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp8_ = _tmp7_.width; -#line 1485 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp9_ = g_strdup_printf ("viewport_resized (%d -> %d)", _tmp6_, _tmp8_); -#line 1485 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp10_ = _tmp9_; -#line 1485 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_need_reflow (self, _tmp10_); -#line 1485 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_free0 (_tmp10_); -#line 9027 "CheckerboardLayout.c" +#line 8703 "CheckerboardLayout.c" } else { gint _tmp11_; gchar* _tmp12_; gchar* _tmp13_; -#line 1488 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp11_ = self->priv->last_width; -#line 1488 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp12_ = g_strdup_printf ("viewport_resized (same width=%d)", _tmp11_); -#line 1488 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp13_ = _tmp12_; -#line 1488 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_need_exposure (self, _tmp13_); -#line 1488 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_free0 (_tmp13_); -#line 9042 "CheckerboardLayout.c" +#line 8718 "CheckerboardLayout.c" } } -static void checkerboard_layout_expose_items (CheckerboardLayout* self, const gchar* caller) { +static void +checkerboard_layout_expose_items (CheckerboardLayout* self, + const gchar* caller) +{ GeeHashSet* new_exposed_items = NULL; GeeHashSet* _tmp0_; ViewCollection* _tmp1_; GeeList* items = NULL; GeeList* _tmp2_; - GeeHashSet* _tmp27_; - GeeHashSet* _tmp28_; - ViewCollection* _tmp29_; -#line 1492 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GeeHashSet* _tmp25_; + GeeHashSet* _tmp26_; + ViewCollection* _tmp27_; +#line 1504 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1492 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1504 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (caller != NULL); -#line 1495 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1507 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = gee_hash_set_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); -#line 1495 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1507 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" new_exposed_items = _tmp0_; -#line 1497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->view; -#line 1497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)); -#line 1499 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1511 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = checkerboard_layout_get_visible_items (self); -#line 1499 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1511 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" items = _tmp2_; -#line 9072 "CheckerboardLayout.c" +#line 8751 "CheckerboardLayout.c" { GeeList* _item_list = NULL; GeeList* _tmp3_; @@ -9079,25 +8758,25 @@ static void checkerboard_layout_expose_items (CheckerboardLayout* self, const gc gint _tmp6_; gint _tmp7_; gint _item_index = 0; -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp3_ = items; -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp4_ = _g_object_ref0 (_tmp3_); -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _item_list = _tmp4_; -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp5_ = _item_list; -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp7_ = _tmp6_; -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _item_size = _tmp7_; -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _item_index = -1; -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" while (TRUE) { -#line 9100 "CheckerboardLayout.c" +#line 8779 "CheckerboardLayout.c" gint _tmp8_; gint _tmp9_; gint _tmp10_; @@ -9109,203 +8788,200 @@ static void checkerboard_layout_expose_items (CheckerboardLayout* self, const gc CheckerboardItem* _tmp15_; GeeHashSet* _tmp16_; CheckerboardItem* _tmp17_; - gboolean _tmp18_; -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp8_ = _item_index; -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _item_index = _tmp8_ + 1; -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp9_ = _item_index; -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp10_ = _item_size; -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (!(_tmp9_ < _tmp10_)) { -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 9125 "CheckerboardLayout.c" +#line 8803 "CheckerboardLayout.c" } -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp11_ = _item_list; -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp12_ = _item_index; -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp13_ = gee_list_get (_tmp11_, _tmp12_); -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" item = (CheckerboardItem*) _tmp13_; -#line 1501 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp14_ = new_exposed_items; -#line 1501 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp15_ = item; -#line 1501 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); -#line 1504 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1516 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp16_ = self->priv->exposed_items; -#line 1504 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1516 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp17_ = item; -#line 1504 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp18_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); -#line 1504 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!_tmp18_) { -#line 9149 "CheckerboardLayout.c" - CheckerboardItem* _tmp19_; -#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp19_ = item; -#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_exposed (_tmp19_); -#line 9155 "CheckerboardLayout.c" +#line 1516 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_)) { +#line 8825 "CheckerboardLayout.c" + CheckerboardItem* _tmp18_; +#line 1517 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp18_ = item; +#line 1517 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_item_exposed (_tmp18_); +#line 8831 "CheckerboardLayout.c" } -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (item); -#line 9159 "CheckerboardLayout.c" +#line 8835 "CheckerboardLayout.c" } -#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1512 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (_item_list); -#line 9163 "CheckerboardLayout.c" +#line 8839 "CheckerboardLayout.c" } { GeeIterator* _item_it = NULL; - GeeHashSet* _tmp20_; - GeeIterator* _tmp21_; -#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp20_ = self->priv->exposed_items; -#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp21_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _item_it = _tmp21_; -#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GeeHashSet* _tmp19_; + GeeIterator* _tmp20_; +#line 1521 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp19_ = self->priv->exposed_items; +#line 1521 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp20_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); +#line 1521 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _item_it = _tmp20_; +#line 1521 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" while (TRUE) { -#line 9177 "CheckerboardLayout.c" - GeeIterator* _tmp22_; - gboolean _tmp23_; +#line 8853 "CheckerboardLayout.c" + GeeIterator* _tmp21_; CheckerboardItem* item = NULL; - GeeIterator* _tmp24_; - gpointer _tmp25_; - CheckerboardItem* _tmp26_; -#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp22_ = _item_it; -#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp23_ = gee_iterator_next (_tmp22_); -#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!_tmp23_) { -#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GeeIterator* _tmp22_; + gpointer _tmp23_; + CheckerboardItem* _tmp24_; +#line 1521 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp21_ = _item_it; +#line 1521 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!gee_iterator_next (_tmp21_)) { +#line 1521 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 9192 "CheckerboardLayout.c" +#line 8865 "CheckerboardLayout.c" } -#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp24_ = _item_it; -#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp25_ = gee_iterator_get (_tmp24_); -#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - item = (CheckerboardItem*) _tmp25_; -#line 1510 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp26_ = item; -#line 1510 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_unexposed (_tmp26_); -#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1521 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp22_ = _item_it; +#line 1521 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp23_ = gee_iterator_get (_tmp22_); +#line 1521 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + item = (CheckerboardItem*) _tmp23_; +#line 1522 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp24_ = item; +#line 1522 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_item_unexposed (_tmp24_); +#line 1521 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (item); -#line 9206 "CheckerboardLayout.c" +#line 8879 "CheckerboardLayout.c" } -#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1521 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (_item_it); -#line 9210 "CheckerboardLayout.c" +#line 8883 "CheckerboardLayout.c" } -#line 1513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp27_ = new_exposed_items; -#line 1513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp28_ = _g_object_ref0 (_tmp27_); -#line 1513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1525 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp25_ = new_exposed_items; +#line 1525 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp26_ = _g_object_ref0 (_tmp25_); +#line 1525 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->exposed_items); -#line 1513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->exposed_items = _tmp28_; -#line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1525 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->exposed_items = _tmp26_; +#line 1526 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->exposure_dirty = FALSE; -#line 1519 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp29_ = self->priv->view; -#line 1519 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_COLLECTION, DataCollection)); -#line 1492 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp27_ = self->priv->view; +#line 1531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_COLLECTION, DataCollection)); +#line 1504 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (items); -#line 1492 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1504 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (new_exposed_items); -#line 9230 "CheckerboardLayout.c" +#line 8903 "CheckerboardLayout.c" } -static void checkerboard_layout_unexpose_items (CheckerboardLayout* self, const gchar* caller) { +static void +checkerboard_layout_unexpose_items (CheckerboardLayout* self, + const gchar* caller) +{ ViewCollection* _tmp0_; - GeeHashSet* _tmp8_; - ViewCollection* _tmp9_; -#line 1525 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GeeHashSet* _tmp7_; + ViewCollection* _tmp8_; +#line 1537 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1525 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1537 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (caller != NULL); -#line 1526 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1538 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->view; -#line 1526 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1538 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); -#line 9246 "CheckerboardLayout.c" +#line 8922 "CheckerboardLayout.c" { GeeIterator* _item_it = NULL; GeeHashSet* _tmp1_; GeeIterator* _tmp2_; -#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1540 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->exposed_items; -#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1540 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1540 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _item_it = _tmp2_; -#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1540 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" while (TRUE) { -#line 9259 "CheckerboardLayout.c" +#line 8935 "CheckerboardLayout.c" GeeIterator* _tmp3_; - gboolean _tmp4_; CheckerboardItem* item = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - CheckerboardItem* _tmp7_; -#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GeeIterator* _tmp4_; + gpointer _tmp5_; + CheckerboardItem* _tmp6_; +#line 1540 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp3_ = _item_it; -#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = gee_iterator_next (_tmp3_); -#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!_tmp4_) { -#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1540 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!gee_iterator_next (_tmp3_)) { +#line 1540 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 9274 "CheckerboardLayout.c" +#line 8947 "CheckerboardLayout.c" } -#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = _item_it; -#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = gee_iterator_get (_tmp5_); -#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - item = (CheckerboardItem*) _tmp6_; -#line 1529 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = item; -#line 1529 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_unexposed (_tmp7_); -#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1540 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = _item_it; +#line 1540 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = gee_iterator_get (_tmp4_); +#line 1540 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + item = (CheckerboardItem*) _tmp5_; +#line 1541 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp6_ = item; +#line 1541 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_item_unexposed (_tmp6_); +#line 1540 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (item); -#line 9288 "CheckerboardLayout.c" +#line 8961 "CheckerboardLayout.c" } -#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1540 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (_item_it); -#line 9292 "CheckerboardLayout.c" +#line 8965 "CheckerboardLayout.c" } -#line 1531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = self->priv->exposed_items; -#line 1531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 1532 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp7_ = self->priv->exposed_items; +#line 1543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); +#line 1544 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->exposure_dirty = FALSE; -#line 1537 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = self->priv->view; -#line 1537 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection)); -#line 9304 "CheckerboardLayout.c" +#line 1549 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp8_ = self->priv->view; +#line 1549 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection)); +#line 8977 "CheckerboardLayout.c" } -static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* caller) { +static void +checkerboard_layout_reflow (CheckerboardLayout* self, + const gchar* caller) +{ const gchar* _tmp0_; GtkAllocation allocation = {0}; GtkAllocation _tmp1_ = {0}; @@ -9317,15 +8993,14 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c gint total_items = 0; ViewCollection* _tmp10_; gint _tmp11_; - gint _tmp12_; - gboolean _tmp15_ = FALSE; - CheckerboardItem* _tmp16_; + gboolean _tmp14_ = FALSE; + CheckerboardItem* _tmp15_; gint max_cols = 0; - gint _tmp19_; - gint _tmp64_; + gint _tmp17_; + gint _tmp60_; gint max_rows = 0; - gint _tmp65_; - gint _tmp66_; + gint _tmp61_; + gint _tmp62_; gint row = 0; gint tallest = 0; gint widest = 0; @@ -9333,2224 +9008,2176 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c gint total_width = 0; gint col = 0; gint* column_widths = NULL; - gint _tmp67_; - gint* _tmp68_; + gint _tmp63_; + gint* _tmp64_; gint column_widths_length1; gint _column_widths_size_; gint* row_heights = NULL; - gint _tmp69_; - gint* _tmp70_; + gint _tmp65_; + gint* _tmp66_; gint row_heights_length1; gint _row_heights_size_; gint* alignment_points = NULL; - gint _tmp71_; - gint* _tmp72_; + gint _tmp67_; + gint* _tmp68_; gint alignment_points_length1; gint _alignment_points_size_; gint gutter = 0; - gint _tmp183_; - CheckerboardLayoutLayoutRow** _tmp184_; + gint _tmp177_; + CheckerboardLayoutLayoutRow** _tmp178_; gint x = 0; - gint _tmp185_; + gint _tmp179_; gint y = 0; CheckerboardLayoutLayoutRow* current_row = NULL; - CheckerboardLayoutLayoutRow* _tmp255_; + CheckerboardLayoutLayoutRow* _tmp248_; + gint _tmp254_; + gint _tmp255_; + gint _tmp256_; + gint _tmp257_; + gint total_height = 0; + gint _tmp258_; + gint* _tmp259_; + gint _tmp259__length1; + gint _tmp260_; gint _tmp261_; - gint _tmp262_; + gboolean _tmp262_ = FALSE; gint _tmp263_; - gint _tmp264_; - gint total_height = 0; + GtkAllocation _tmp264_; gint _tmp265_; - gint* _tmp266_; - gint _tmp266__length1; - gint _tmp267_; - gint _tmp268_; - gboolean _tmp269_ = FALSE; - gint _tmp270_; - GtkAllocation _tmp271_; - gint _tmp272_; -#line 1543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1555 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1555 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (caller != NULL); -#line 1544 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1556 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->reflow_needed = FALSE; -#line 1547 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1559 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->message; -#line 1547 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1559 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp0_ != NULL) { -#line 1548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1560 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 9384 "CheckerboardLayout.c" +#line 9059 "CheckerboardLayout.c" } -#line 1551 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1563 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp1_); -#line 1551 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1563 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" allocation = _tmp1_; -#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp3_ = self->priv->visible_page; -#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp4_ = _tmp3_.width; -#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp4_ > 0) { -#line 9396 "CheckerboardLayout.c" +#line 9071 "CheckerboardLayout.c" GdkRectangle _tmp5_; gint _tmp6_; -#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp5_ = self->priv->visible_page; -#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp6_ = _tmp5_.width; -#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = _tmp6_; -#line 9405 "CheckerboardLayout.c" +#line 9080 "CheckerboardLayout.c" } else { GtkAllocation _tmp7_; gint _tmp8_; -#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp7_ = allocation; -#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp8_ = _tmp7_.width; -#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = _tmp8_; -#line 9415 "CheckerboardLayout.c" +#line 9090 "CheckerboardLayout.c" } -#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" visible_width = _tmp2_; -#line 1561 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1573 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp9_ = visible_width; -#line 1561 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1573 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp9_ <= 1) { -#line 1562 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1574 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 9425 "CheckerboardLayout.c" +#line 9100 "CheckerboardLayout.c" } -#line 1564 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1576 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp10_ = self->priv->view; -#line 1564 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection)); -#line 1564 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - total_items = _tmp11_; -#line 1567 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = total_items; -#line 1567 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp12_ == 0) { -#line 9437 "CheckerboardLayout.c" - gint _tmp13_; - CheckerboardLayoutLayoutRow** _tmp14_; -#line 1568 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = visible_width; -#line 1568 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp13_, 0); -#line 1569 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = g_new0 (CheckerboardLayoutLayoutRow*, 0 + 1); -#line 1569 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1576 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + total_items = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection)); +#line 1579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp11_ = total_items; +#line 1579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp11_ == 0) { +#line 9110 "CheckerboardLayout.c" + gint _tmp12_; + CheckerboardLayoutLayoutRow** _tmp13_; +#line 1580 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp12_ = visible_width; +#line 1580 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp12_, 0); +#line 1581 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp13_ = g_new0 (CheckerboardLayoutLayoutRow*, 0 + 1); +#line 1581 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->item_rows = (_vala_array_free (self->priv->item_rows, self->priv->item_rows_length1, (GDestroyNotify) checkerboard_layout_layout_row_unref), NULL); -#line 1569 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->item_rows = _tmp14_; -#line 1569 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1581 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->item_rows = _tmp13_; +#line 1581 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->item_rows_length1 = 0; -#line 1569 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1581 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->_item_rows_size_ = self->priv->item_rows_length1; -#line 1571 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1583 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 9456 "CheckerboardLayout.c" +#line 9129 "CheckerboardLayout.c" } -#line 1579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp16_ = self->priv->anchor; -#line 1579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp16_ == NULL) { -#line 1579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp15_ = TRUE; -#line 9464 "CheckerboardLayout.c" +#line 1591 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp15_ = self->priv->anchor; +#line 1591 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp15_ == NULL) { +#line 1591 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp14_ = TRUE; +#line 9137 "CheckerboardLayout.c" } else { - CheckerboardItem* _tmp17_; - gboolean _tmp18_; -#line 1579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp17_ = self->priv->anchor; -#line 1579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp18_ = data_view_is_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_VIEW, DataView)); -#line 1579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp15_ = !_tmp18_; -#line 9474 "CheckerboardLayout.c" + CheckerboardItem* _tmp16_; +#line 1591 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp16_ = self->priv->anchor; +#line 1591 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp14_ = !data_view_is_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_VIEW, DataView)); +#line 9144 "CheckerboardLayout.c" } -#line 1579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp15_) { -#line 1580 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1591 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp14_) { +#line 1592 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_update_anchor (self); -#line 9480 "CheckerboardLayout.c" +#line 9150 "CheckerboardLayout.c" } -#line 1583 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->item_rows = (_vala_array_free (self->priv->item_rows, self->priv->item_rows_length1, (GDestroyNotify) checkerboard_layout_layout_row_unref), NULL); -#line 1583 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->item_rows = NULL; -#line 1583 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->item_rows_length1 = 0; -#line 1583 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->_item_rows_size_ = self->priv->item_rows_length1; -#line 1588 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1600 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" max_cols = 0; -#line 1589 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp19_ = self->priv->scale; -#line 1589 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp19_ > 0) { -#line 9496 "CheckerboardLayout.c" +#line 1601 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp17_ = self->priv->scale; +#line 1601 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp17_ > 0) { +#line 9166 "CheckerboardLayout.c" gint remaining_width = 0; - gint _tmp20_; + gint _tmp18_; gint max_item_width = 0; + gint _tmp19_; + gint _tmp20_; gint _tmp21_; gint _tmp22_; - gint _tmp23_; - gint _tmp24_; - gint _tmp25_; - gint _tmp33_; - gint _tmp34_; -#line 1591 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp20_ = visible_width; -#line 1591 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - remaining_width = _tmp20_ - (CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING * 2); -#line 1592 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp21_ = self->priv->scale; -#line 1592 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp22_ = checkerboard_item_get_max_width (_tmp21_); -#line 1592 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - max_item_width = _tmp22_; -#line 1593 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp23_ = remaining_width; -#line 1593 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp24_ = max_item_width; -#line 1593 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - max_cols = _tmp23_ / _tmp24_; -#line 1594 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp25_ = max_cols; -#line 1594 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp25_ <= 0) { -#line 1595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gint _tmp30_; + gint _tmp31_; +#line 1603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp18_ = visible_width; +#line 1603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + remaining_width = _tmp18_ - (CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING * 2); +#line 1604 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp19_ = self->priv->scale; +#line 1604 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + max_item_width = checkerboard_item_get_max_width (_tmp19_); +#line 1605 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp20_ = remaining_width; +#line 1605 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp21_ = max_item_width; +#line 1605 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + max_cols = _tmp20_ / _tmp21_; +#line 1606 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp22_ = max_cols; +#line 1606 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp22_ <= 0) { +#line 1607 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" max_cols = 1; -#line 9529 "CheckerboardLayout.c" +#line 9196 "CheckerboardLayout.c" } -#line 1598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1610 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" while (TRUE) { -#line 9533 "CheckerboardLayout.c" - gboolean _tmp26_ = FALSE; - gint _tmp27_; - gint _tmp32_; -#line 1598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp27_ = max_cols; -#line 1598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp27_ > 1) { -#line 9541 "CheckerboardLayout.c" +#line 9200 "CheckerboardLayout.c" + gboolean _tmp23_ = FALSE; + gint _tmp24_; + gint _tmp29_; +#line 1610 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp24_ = max_cols; +#line 1610 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp24_ > 1) { +#line 9208 "CheckerboardLayout.c" + gint _tmp25_; + gint _tmp26_; + gint _tmp27_; gint _tmp28_; - gint _tmp29_; - gint _tmp30_; - gint _tmp31_; -#line 1599 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp28_ = max_cols; -#line 1599 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp29_ = max_item_width; -#line 1599 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp30_ = max_cols; -#line 1599 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp31_ = remaining_width; -#line 1599 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp26_ = ((_tmp28_ * _tmp29_) + ((_tmp30_ - 1) * CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING)) > _tmp31_; -#line 9556 "CheckerboardLayout.c" +#line 1611 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp25_ = max_cols; +#line 1611 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp26_ = max_item_width; +#line 1611 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp27_ = max_cols; +#line 1611 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp28_ = remaining_width; +#line 1611 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp23_ = ((_tmp25_ * _tmp26_) + ((_tmp27_ - 1) * CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING)) > _tmp28_; +#line 9223 "CheckerboardLayout.c" } else { -#line 1598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp26_ = FALSE; -#line 9560 "CheckerboardLayout.c" +#line 1610 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp23_ = FALSE; +#line 9227 "CheckerboardLayout.c" } -#line 1598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!_tmp26_) { -#line 1598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1610 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!_tmp23_) { +#line 1610 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 9566 "CheckerboardLayout.c" +#line 9233 "CheckerboardLayout.c" } -#line 1604 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp32_ = max_cols; -#line 1604 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - max_cols = _tmp32_ - 1; -#line 9572 "CheckerboardLayout.c" +#line 1616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp29_ = max_cols; +#line 1616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + max_cols = _tmp29_ - 1; +#line 9239 "CheckerboardLayout.c" } -#line 1608 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp33_ = total_items; -#line 1608 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp34_ = max_cols; -#line 1608 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp33_ < _tmp34_) { -#line 9580 "CheckerboardLayout.c" - gint _tmp35_; -#line 1609 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp35_ = total_items; -#line 1609 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - max_cols = _tmp35_; -#line 9586 "CheckerboardLayout.c" +#line 1620 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp30_ = total_items; +#line 1620 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp31_ = max_cols; +#line 1620 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp30_ < _tmp31_) { +#line 9247 "CheckerboardLayout.c" + gint _tmp32_; +#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp32_ = total_items; +#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + max_cols = _tmp32_; +#line 9253 "CheckerboardLayout.c" } } else { gint x = 0; gint col = 0; gint row_width = 0; gint widest_row = 0; - gint _tmp61_; - gint _tmp62_; -#line 1616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gint _tmp57_; + gint _tmp58_; +#line 1628 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" x = CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING; -#line 1617 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1629 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" col = 0; -#line 1618 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1630 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" row_width = 0; -#line 1619 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1631 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" widest_row = 0; -#line 9603 "CheckerboardLayout.c" +#line 9270 "CheckerboardLayout.c" { gint ctr = 0; -#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" ctr = 0; -#line 9608 "CheckerboardLayout.c" +#line 9275 "CheckerboardLayout.c" { - gboolean _tmp36_ = FALSE; -#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp36_ = TRUE; -#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gboolean _tmp33_ = FALSE; +#line 1633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp33_ = TRUE; +#line 1633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" while (TRUE) { -#line 9615 "CheckerboardLayout.c" - gint _tmp38_; - gint _tmp39_; +#line 9282 "CheckerboardLayout.c" + gint _tmp35_; + gint _tmp36_; CheckerboardItem* item = NULL; - ViewCollection* _tmp40_; - gint _tmp41_; - DataObject* _tmp42_; + ViewCollection* _tmp37_; + gint _tmp38_; + DataObject* _tmp39_; Dimensions req = {0}; - CheckerboardItem* _tmp43_; - Dimensions _tmp44_; - gboolean _tmp45_; - gint _tmp46_; - Dimensions _tmp47_; - gint _tmp48_; - gint _tmp49_; - gint _tmp54_; - Dimensions _tmp55_; + CheckerboardItem* _tmp40_; + Dimensions _tmp41_; + gint _tmp42_; + Dimensions _tmp43_; + gint _tmp44_; + gint _tmp45_; + gint _tmp50_; + Dimensions _tmp51_; + gint _tmp52_; + gint _tmp53_; + Dimensions _tmp54_; + gint _tmp55_; gint _tmp56_; - gint _tmp57_; - Dimensions _tmp58_; - gint _tmp59_; - gint _tmp60_; -#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!_tmp36_) { -#line 9639 "CheckerboardLayout.c" - gint _tmp37_; -#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp37_ = ctr; -#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - ctr = _tmp37_ + 1; -#line 9645 "CheckerboardLayout.c" +#line 1633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!_tmp33_) { +#line 9305 "CheckerboardLayout.c" + gint _tmp34_; +#line 1633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp34_ = ctr; +#line 1633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + ctr = _tmp34_ + 1; +#line 9311 "CheckerboardLayout.c" } -#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp36_ = FALSE; -#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp38_ = ctr; -#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp39_ = total_items; -#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!(_tmp38_ < _tmp39_)) { -#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp33_ = FALSE; +#line 1633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp35_ = ctr; +#line 1633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp36_ = total_items; +#line 1633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!(_tmp35_ < _tmp36_)) { +#line 1633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 9657 "CheckerboardLayout.c" +#line 9323 "CheckerboardLayout.c" } -#line 1622 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp40_ = self->priv->view; -#line 1622 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp41_ = ctr; -#line 1622 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp42_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_COLLECTION, DataCollection), _tmp41_); -#line 1622 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - item = G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); -#line 1623 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp43_ = item; -#line 1623 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp44_ = _tmp43_->requisition; -#line 1623 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - req = _tmp44_; -#line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp45_ = dimensions_has_area (&req); -#line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _vala_assert (_tmp45_, "req.has_area()"); -#line 1629 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp46_ = x; -#line 1629 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp47_ = req; -#line 1629 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp48_ = _tmp47_.width; -#line 1629 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp49_ = visible_width; -#line 1629 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (((_tmp46_ + _tmp48_) + CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING) > _tmp49_) { -#line 9687 "CheckerboardLayout.c" - gint _tmp50_; - gint _tmp51_; -#line 1630 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp50_ = row_width; -#line 1630 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp51_ = widest_row; -#line 1630 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp50_ > _tmp51_) { -#line 9696 "CheckerboardLayout.c" - gint _tmp52_; - gint _tmp53_; -#line 1631 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp52_ = row_width; -#line 1631 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - widest_row = _tmp52_; -#line 1632 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp53_ = col; -#line 1632 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - max_cols = _tmp53_; -#line 9707 "CheckerboardLayout.c" - } +#line 1634 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp37_ = self->priv->view; +#line 1634 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp38_ = ctr; +#line 1634 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp39_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_DATA_COLLECTION, DataCollection), _tmp38_); +#line 1634 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + item = G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); #line 1635 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - col = 0; -#line 1636 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - x = CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING; -#line 1637 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row_width = 0; -#line 9715 "CheckerboardLayout.c" - } -#line 1640 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp54_ = x; -#line 1640 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp55_ = req; -#line 1640 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp56_ = _tmp55_.width; -#line 1640 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - x = _tmp54_ + (_tmp56_ + CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING); + _tmp40_ = item; +#line 1635 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp41_ = _tmp40_->requisition; +#line 1635 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + req = _tmp41_; +#line 1638 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _vala_assert (dimensions_has_area (&req), "req.has_area()"); #line 1641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp57_ = row_width; + _tmp42_ = x; #line 1641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp58_ = req; + _tmp43_ = req; #line 1641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp59_ = _tmp58_.width; + _tmp44_ = _tmp43_.width; #line 1641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row_width = _tmp57_ + _tmp59_; + _tmp45_ = visible_width; +#line 1641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (((_tmp42_ + _tmp44_) + CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING) > _tmp45_) { +#line 9351 "CheckerboardLayout.c" + gint _tmp46_; + gint _tmp47_; +#line 1642 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp46_ = row_width; +#line 1642 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp47_ = widest_row; +#line 1642 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp46_ > _tmp47_) { +#line 9360 "CheckerboardLayout.c" + gint _tmp48_; + gint _tmp49_; #line 1643 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp60_ = col; + _tmp48_ = row_width; #line 1643 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - col = _tmp60_ + 1; -#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + widest_row = _tmp48_; +#line 1644 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp49_ = col; +#line 1644 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + max_cols = _tmp49_; +#line 9371 "CheckerboardLayout.c" + } +#line 1647 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + col = 0; +#line 1648 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + x = CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING; +#line 1649 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + row_width = 0; +#line 9379 "CheckerboardLayout.c" + } +#line 1652 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp50_ = x; +#line 1652 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp51_ = req; +#line 1652 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp52_ = _tmp51_.width; +#line 1652 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + x = _tmp50_ + (_tmp52_ + CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING); +#line 1653 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp53_ = row_width; +#line 1653 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp54_ = req; +#line 1653 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp55_ = _tmp54_.width; +#line 1653 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + row_width = _tmp53_ + _tmp55_; +#line 1655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp56_ = col; +#line 1655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + col = _tmp56_ + 1; +#line 1633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (item); -#line 9739 "CheckerboardLayout.c" +#line 9403 "CheckerboardLayout.c" } } } -#line 1647 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp61_ = row_width; -#line 1647 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp62_ = widest_row; -#line 1647 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp61_ > _tmp62_) { -#line 9749 "CheckerboardLayout.c" - gint _tmp63_; -#line 1648 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp63_ = col; -#line 1648 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - max_cols = _tmp63_; -#line 9755 "CheckerboardLayout.c" +#line 1659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp57_ = row_width; +#line 1659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp58_ = widest_row; +#line 1659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp57_ > _tmp58_) { +#line 9413 "CheckerboardLayout.c" + gint _tmp59_; +#line 1660 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp59_ = col; +#line 1660 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + max_cols = _tmp59_; +#line 9419 "CheckerboardLayout.c" } } -#line 1656 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp64_ = max_cols; -#line 1656 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _vala_assert (_tmp64_ > 0, "max_cols > 0"); -#line 1657 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp65_ = total_items; -#line 1657 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp66_ = max_cols; -#line 1657 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - max_rows = (_tmp65_ / _tmp66_) + 1; -#line 1661 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp60_ = max_cols; +#line 1668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _vala_assert (_tmp60_ > 0, "max_cols > 0"); +#line 1669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp61_ = total_items; +#line 1669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp62_ = max_cols; +#line 1669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + max_rows = (_tmp61_ / _tmp62_) + 1; +#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" row = 0; -#line 1662 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1674 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" tallest = 0; -#line 1663 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" widest = 0; -#line 1664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" row_alignment_point = 0; -#line 1665 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1677 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" total_width = 0; -#line 1666 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" col = 0; -#line 1667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp67_ = max_cols; -#line 1667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp68_ = g_new0 (gint, _tmp67_); -#line 1667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - column_widths = _tmp68_; -#line 1667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - column_widths_length1 = _tmp67_; -#line 1667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp63_ = max_cols; +#line 1679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp64_ = g_new0 (gint, _tmp63_); +#line 1679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + column_widths = _tmp64_; +#line 1679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + column_widths_length1 = _tmp63_; +#line 1679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _column_widths_size_ = column_widths_length1; -#line 1668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp69_ = max_rows; -#line 1668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp70_ = g_new0 (gint, _tmp69_); -#line 1668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row_heights = _tmp70_; -#line 1668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row_heights_length1 = _tmp69_; -#line 1668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1680 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp65_ = max_rows; +#line 1680 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp66_ = g_new0 (gint, _tmp65_); +#line 1680 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + row_heights = _tmp66_; +#line 1680 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + row_heights_length1 = _tmp65_; +#line 1680 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _row_heights_size_ = row_heights_length1; -#line 1669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp71_ = max_rows; -#line 1669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp72_ = g_new0 (gint, _tmp71_); -#line 1669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - alignment_points = _tmp72_; -#line 1669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - alignment_points_length1 = _tmp71_; -#line 1669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp67_ = max_rows; +#line 1681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp68_ = g_new0 (gint, _tmp67_); +#line 1681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + alignment_points = _tmp68_; +#line 1681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + alignment_points_length1 = _tmp67_; +#line 1681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _alignment_points_size_ = alignment_points_length1; -#line 1670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" gutter = 0; -#line 9812 "CheckerboardLayout.c" +#line 9476 "CheckerboardLayout.c" { - gboolean _tmp73_ = FALSE; -#line 1672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp73_ = TRUE; -#line 1672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gboolean _tmp69_ = FALSE; +#line 1684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp69_ = TRUE; +#line 1684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" while (TRUE) { -#line 9819 "CheckerboardLayout.c" - gint _tmp129_; - gint _tmp138_; - gint _tmp139_; - gint _tmp140_; - gint _tmp141_; - gint _tmp142_; -#line 1672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!_tmp73_) { -#line 9828 "CheckerboardLayout.c" +#line 9483 "CheckerboardLayout.c" + gint _tmp124_; + gint _tmp133_; + gint _tmp134_; + gint _tmp135_; + gint _tmp136_; + gint _tmp137_; +#line 1684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!_tmp69_) { +#line 9492 "CheckerboardLayout.c" } -#line 1672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp73_ = FALSE; -#line 9832 "CheckerboardLayout.c" +#line 1684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp69_ = FALSE; +#line 9496 "CheckerboardLayout.c" { gint ctr = 0; -#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" ctr = 0; -#line 9837 "CheckerboardLayout.c" +#line 9501 "CheckerboardLayout.c" { - gboolean _tmp74_ = FALSE; -#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp74_ = TRUE; -#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gboolean _tmp70_ = FALSE; +#line 1685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp70_ = TRUE; +#line 1685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" while (TRUE) { -#line 9844 "CheckerboardLayout.c" - gint _tmp76_; - gint _tmp77_; +#line 9508 "CheckerboardLayout.c" + gint _tmp72_; + gint _tmp73_; CheckerboardItem* item = NULL; - ViewCollection* _tmp78_; - gint _tmp79_; - DataObject* _tmp80_; + ViewCollection* _tmp74_; + gint _tmp75_; + DataObject* _tmp76_; Dimensions req = {0}; - CheckerboardItem* _tmp81_; - Dimensions _tmp82_; + CheckerboardItem* _tmp77_; + Dimensions _tmp78_; gint alignment_point = 0; - CheckerboardItem* _tmp83_; + CheckerboardItem* _tmp79_; + gint _tmp80_; + Dimensions _tmp81_; + gint _tmp82_; + Dimensions _tmp83_; gint _tmp84_; gint _tmp85_; - Dimensions _tmp86_; - gint _tmp87_; Dimensions _tmp88_; gint _tmp89_; gint _tmp90_; - Dimensions _tmp93_; + gint _tmp93_; gint _tmp94_; - gint _tmp95_; + gint* _tmp96_; + gint _tmp96__length1; + gint _tmp97_; gint _tmp98_; - gint _tmp99_; - gint* _tmp101_; - gint _tmp101__length1; - gint _tmp102_; - gint _tmp103_; - Dimensions _tmp104_; - gint _tmp105_; - gint _tmp118_; - gint _tmp119_; - gint _tmp120_; -#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!_tmp74_) { -#line 9879 "CheckerboardLayout.c" - gint _tmp75_; -#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp75_ = ctr; -#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - ctr = _tmp75_ + 1; -#line 9885 "CheckerboardLayout.c" - } -#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp74_ = FALSE; -#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp76_ = ctr; -#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp77_ = total_items; -#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!(_tmp76_ < _tmp77_)) { -#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - break; -#line 9897 "CheckerboardLayout.c" - } -#line 1674 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp78_ = self->priv->view; -#line 1674 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp79_ = ctr; -#line 1674 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp80_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_DATA_COLLECTION, DataCollection), _tmp79_); -#line 1674 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - item = G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); -#line 1675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp81_ = item; -#line 1675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp82_ = _tmp81_->requisition; -#line 1675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - req = _tmp82_; -#line 1676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp83_ = item; -#line 1676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp84_ = checkerboard_item_get_alignment_point (_tmp83_); -#line 1676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - alignment_point = _tmp84_; -#line 1679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp85_ = alignment_point; -#line 1679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp86_ = req; -#line 1679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp87_ = _tmp86_.height; -#line 1679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _vala_assert (_tmp85_ < _tmp87_, "alignment_point < req.height"); -#line 1681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp88_ = req; -#line 1681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp89_ = _tmp88_.height; -#line 1681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp90_ = tallest; -#line 1681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp89_ > _tmp90_) { -#line 9935 "CheckerboardLayout.c" - Dimensions _tmp91_; - gint _tmp92_; -#line 1682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp91_ = req; -#line 1682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp92_ = _tmp91_.height; -#line 1682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - tallest = _tmp92_; -#line 9944 "CheckerboardLayout.c" + Dimensions _tmp99_; + gint _tmp100_; + gint _tmp113_; + gint _tmp114_; + gint _tmp115_; +#line 1685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!_tmp70_) { +#line 9542 "CheckerboardLayout.c" + gint _tmp71_; +#line 1685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp71_ = ctr; +#line 1685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + ctr = _tmp71_ + 1; +#line 9548 "CheckerboardLayout.c" } -#line 1684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp93_ = req; -#line 1684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp94_ = _tmp93_.width; -#line 1684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp95_ = widest; -#line 1684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp94_ > _tmp95_) { -#line 9954 "CheckerboardLayout.c" - Dimensions _tmp96_; - gint _tmp97_; #line 1685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp96_ = req; + _tmp70_ = FALSE; +#line 1685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp72_ = ctr; #line 1685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp97_ = _tmp96_.width; + _tmp73_ = total_items; #line 1685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - widest = _tmp97_; -#line 9963 "CheckerboardLayout.c" + if (!(_tmp72_ < _tmp73_)) { +#line 1685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + break; +#line 9560 "CheckerboardLayout.c" } +#line 1686 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp74_ = self->priv->view; +#line 1686 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp75_ = ctr; +#line 1686 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp76_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, TYPE_DATA_COLLECTION, DataCollection), _tmp75_); +#line 1686 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + item = G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); #line 1687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp98_ = alignment_point; -#line 1687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp99_ = row_alignment_point; -#line 1687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp98_ > _tmp99_) { -#line 9971 "CheckerboardLayout.c" - gint _tmp100_; -#line 1688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp100_ = alignment_point; -#line 1688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row_alignment_point = _tmp100_; -#line 9977 "CheckerboardLayout.c" - } -#line 1692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp101_ = column_widths; -#line 1692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp101__length1 = column_widths_length1; -#line 1692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp102_ = col; -#line 1692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp103_ = _tmp101_[_tmp102_]; -#line 1692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp104_ = req; -#line 1692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp105_ = _tmp104_.width; -#line 1692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp103_ < _tmp105_) { -#line 9993 "CheckerboardLayout.c" - gint _tmp106_; - gint* _tmp107_; - gint _tmp107__length1; - gint _tmp108_; - gint _tmp109_; - gint* _tmp110_; - gint _tmp110__length1; - gint _tmp111_; - Dimensions _tmp112_; - gint _tmp113_; - gint _tmp114_; - gint _tmp115_; - Dimensions _tmp116_; - gint _tmp117_; -#line 1693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp106_ = total_width; -#line 1693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp107_ = column_widths; + _tmp77_ = item; +#line 1687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp78_ = _tmp77_->requisition; +#line 1687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + req = _tmp78_; +#line 1688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp79_ = item; +#line 1688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + alignment_point = checkerboard_item_get_alignment_point (_tmp79_); +#line 1691 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp80_ = alignment_point; +#line 1691 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp81_ = req; +#line 1691 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp82_ = _tmp81_.height; +#line 1691 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _vala_assert (_tmp80_ < _tmp82_, "alignment_point < req.height"); #line 1693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp107__length1 = column_widths_length1; + _tmp83_ = req; #line 1693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp108_ = col; + _tmp84_ = _tmp83_.height; #line 1693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp109_ = _tmp107_[_tmp108_]; + _tmp85_ = tallest; #line 1693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - total_width = _tmp106_ - _tmp109_; -#line 1694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp110_ = column_widths; -#line 1694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp110__length1 = column_widths_length1; -#line 1694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp111_ = col; -#line 1694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp112_ = req; + if (_tmp84_ > _tmp85_) { +#line 9596 "CheckerboardLayout.c" + Dimensions _tmp86_; + gint _tmp87_; #line 1694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp113_ = _tmp112_.width; + _tmp86_ = req; #line 1694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp110_[_tmp111_] = _tmp113_; + _tmp87_ = _tmp86_.height; #line 1694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp114_ = _tmp110_[_tmp111_]; -#line 1695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp115_ = total_width; -#line 1695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp116_ = req; -#line 1695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp117_ = _tmp116_.width; -#line 1695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - total_width = _tmp115_ + _tmp117_; -#line 10042 "CheckerboardLayout.c" + tallest = _tmp87_; +#line 9605 "CheckerboardLayout.c" + } +#line 1696 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp88_ = req; +#line 1696 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp89_ = _tmp88_.width; +#line 1696 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp90_ = widest; +#line 1696 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp89_ > _tmp90_) { +#line 9615 "CheckerboardLayout.c" + Dimensions _tmp91_; + gint _tmp92_; +#line 1697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp91_ = req; +#line 1697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp92_ = _tmp91_.width; +#line 1697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + widest = _tmp92_; +#line 9624 "CheckerboardLayout.c" } -#line 1698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp118_ = col; -#line 1698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - col = _tmp118_ + 1; -#line 1698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp119_ = col; -#line 1698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp120_ = max_cols; -#line 1698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp119_ >= _tmp120_) { -#line 10054 "CheckerboardLayout.c" - gint* _tmp121_; - gint _tmp121__length1; - gint _tmp122_; - gint _tmp123_; - gint _tmp124_; - gint* _tmp125_; - gint _tmp125__length1; - gint _tmp126_; - gint _tmp127_; - gint _tmp128_; -#line 1699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp121_ = alignment_points; -#line 1699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp121__length1 = alignment_points_length1; -#line 1699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp122_ = row; #line 1699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp123_ = row_alignment_point; + _tmp93_ = alignment_point; #line 1699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp121_[_tmp122_] = _tmp123_; + _tmp94_ = row_alignment_point; #line 1699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp124_ = _tmp121_[_tmp122_]; -#line 1700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp125_ = row_heights; -#line 1700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp125__length1 = row_heights_length1; -#line 1700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp126_ = row; -#line 1700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row = _tmp126_ + 1; + if (_tmp93_ > _tmp94_) { +#line 9632 "CheckerboardLayout.c" + gint _tmp95_; #line 1700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp127_ = tallest; + _tmp95_ = alignment_point; #line 1700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp125_[_tmp126_] = _tmp127_; -#line 1700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp128_ = _tmp125_[_tmp126_]; -#line 1702 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - col = 0; -#line 1703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row_alignment_point = 0; + row_alignment_point = _tmp95_; +#line 9638 "CheckerboardLayout.c" + } #line 1704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - tallest = 0; -#line 10097 "CheckerboardLayout.c" + _tmp96_ = column_widths; +#line 1704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp96__length1 = column_widths_length1; +#line 1704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp97_ = col; +#line 1704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp98_ = _tmp96_[_tmp97_]; +#line 1704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp99_ = req; +#line 1704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp100_ = _tmp99_.width; +#line 1704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp98_ < _tmp100_) { +#line 9654 "CheckerboardLayout.c" + gint _tmp101_; + gint* _tmp102_; + gint _tmp102__length1; + gint _tmp103_; + gint _tmp104_; + gint* _tmp105_; + gint _tmp105__length1; + gint _tmp106_; + Dimensions _tmp107_; + gint _tmp108_; + gint _tmp109_; + gint _tmp110_; + Dimensions _tmp111_; + gint _tmp112_; +#line 1705 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp101_ = total_width; +#line 1705 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp102_ = column_widths; +#line 1705 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp102__length1 = column_widths_length1; +#line 1705 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp103_ = col; +#line 1705 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp104_ = _tmp102_[_tmp103_]; +#line 1705 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + total_width = _tmp101_ - _tmp104_; +#line 1706 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp105_ = column_widths; +#line 1706 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp105__length1 = column_widths_length1; +#line 1706 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp106_ = col; +#line 1706 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp107_ = req; +#line 1706 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp108_ = _tmp107_.width; +#line 1706 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp105_[_tmp106_] = _tmp108_; +#line 1706 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp109_ = _tmp105_[_tmp106_]; +#line 1707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp110_ = total_width; +#line 1707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp111_ = req; +#line 1707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp112_ = _tmp111_.width; +#line 1707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + total_width = _tmp110_ + _tmp112_; +#line 9703 "CheckerboardLayout.c" } -#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_object_unref0 (item); -#line 10101 "CheckerboardLayout.c" - } - } - } -#line 1709 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp129_ = col; -#line 1709 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp129_ != 0) { -#line 10109 "CheckerboardLayout.c" - gint* _tmp130_; - gint _tmp130__length1; - gint _tmp131_; - gint _tmp132_; - gint _tmp133_; - gint* _tmp134_; - gint _tmp134__length1; - gint _tmp135_; - gint _tmp136_; - gint _tmp137_; -#line 1710 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp130_ = alignment_points; #line 1710 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp130__length1 = alignment_points_length1; + _tmp113_ = col; #line 1710 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp131_ = row; + col = _tmp113_ + 1; #line 1710 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp132_ = row_alignment_point; + _tmp114_ = col; #line 1710 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp130_[_tmp131_] = _tmp132_; + _tmp115_ = max_cols; #line 1710 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp133_ = _tmp130_[_tmp131_]; + if (_tmp114_ >= _tmp115_) { +#line 9715 "CheckerboardLayout.c" + gint* _tmp116_; + gint _tmp116__length1; + gint _tmp117_; + gint _tmp118_; + gint _tmp119_; + gint* _tmp120_; + gint _tmp120__length1; + gint _tmp121_; + gint _tmp122_; + gint _tmp123_; #line 1711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp134_ = row_heights; + _tmp116_ = alignment_points; #line 1711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp134__length1 = row_heights_length1; + _tmp116__length1 = alignment_points_length1; #line 1711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp135_ = row; + _tmp117_ = row; #line 1711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp136_ = tallest; + _tmp118_ = row_alignment_point; #line 1711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp134_[_tmp135_] = _tmp136_; + _tmp116_[_tmp117_] = _tmp118_; #line 1711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp137_ = _tmp134_[_tmp135_]; -#line 10144 "CheckerboardLayout.c" - } -#line 1716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp138_ = visible_width; -#line 1716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp139_ = total_width; -#line 1716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp140_ = max_cols; + _tmp119_ = _tmp116_[_tmp117_]; +#line 1712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp120_ = row_heights; +#line 1712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp120__length1 = row_heights_length1; +#line 1712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp121_ = row; +#line 1712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + row = _tmp121_ + 1; +#line 1712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp122_ = tallest; +#line 1712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp120_[_tmp121_] = _tmp122_; +#line 1712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp123_ = _tmp120_[_tmp121_]; +#line 1714 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + col = 0; +#line 1715 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + row_alignment_point = 0; #line 1716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gutter = (_tmp138_ - _tmp139_) / (_tmp140_ + 1); -#line 1719 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp141_ = max_cols; -#line 1719 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp141_ == 1) { -#line 1720 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + tallest = 0; +#line 9758 "CheckerboardLayout.c" + } +#line 1685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_object_unref0 (item); +#line 9762 "CheckerboardLayout.c" + } + } + } +#line 1721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp124_ = col; +#line 1721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp124_ != 0) { +#line 9770 "CheckerboardLayout.c" + gint* _tmp125_; + gint _tmp125__length1; + gint _tmp126_; + gint _tmp127_; + gint _tmp128_; + gint* _tmp129_; + gint _tmp129__length1; + gint _tmp130_; + gint _tmp131_; + gint _tmp132_; +#line 1722 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp125_ = alignment_points; +#line 1722 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp125__length1 = alignment_points_length1; +#line 1722 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp126_ = row; +#line 1722 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp127_ = row_alignment_point; +#line 1722 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp125_[_tmp126_] = _tmp127_; +#line 1722 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp128_ = _tmp125_[_tmp126_]; +#line 1723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp129_ = row_heights; +#line 1723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp129__length1 = row_heights_length1; +#line 1723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp130_ = row; +#line 1723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp131_ = tallest; +#line 1723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp129_[_tmp130_] = _tmp131_; +#line 1723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp132_ = _tmp129_[_tmp130_]; +#line 9805 "CheckerboardLayout.c" + } +#line 1728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp133_ = visible_width; +#line 1728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp134_ = total_width; +#line 1728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp135_ = max_cols; +#line 1728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gutter = (_tmp133_ - _tmp134_) / (_tmp135_ + 1); +#line 1731 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp136_ = max_cols; +#line 1731 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp136_ == 1) { +#line 1732 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 10160 "CheckerboardLayout.c" +#line 9821 "CheckerboardLayout.c" } -#line 1725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp142_ = gutter; -#line 1725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp142_ < CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING) { -#line 10166 "CheckerboardLayout.c" +#line 1737 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp137_ = gutter; +#line 1737 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp137_ < CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING) { +#line 9827 "CheckerboardLayout.c" + gint _tmp138_; + gint _tmp139_; + gint _tmp140_; + gint _tmp141_; + gint* _tmp142_; gint _tmp143_; - gint _tmp144_; + gint* _tmp144_; gint _tmp145_; - gint _tmp146_; - gint* _tmp147_; - gint _tmp148_; - gint* _tmp149_; - gint _tmp150_; - gint* _tmp151_; -#line 1726 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp143_ = max_cols; -#line 1726 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - max_cols = _tmp143_ - 1; -#line 1727 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp144_ = total_items; -#line 1727 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp145_ = max_cols; -#line 1727 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - max_rows = (_tmp144_ / _tmp145_) + 1; -#line 1734 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gint* _tmp146_; +#line 1738 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp138_ = max_cols; +#line 1738 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + max_cols = _tmp138_ - 1; +#line 1739 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp139_ = total_items; +#line 1739 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp140_ = max_cols; +#line 1739 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + max_rows = (_tmp139_ / _tmp140_) + 1; +#line 1746 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" col = 0; -#line 1735 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1747 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" row = 0; -#line 1736 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1748 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" tallest = 0; -#line 1737 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1749 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" widest = 0; -#line 1738 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1750 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" total_width = 0; -#line 1739 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1751 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" row_alignment_point = 0; -#line 1740 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp146_ = max_cols; -#line 1740 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp147_ = g_new0 (gint, _tmp146_); -#line 1740 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1752 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp141_ = max_cols; +#line 1752 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp142_ = g_new0 (gint, _tmp141_); +#line 1752 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" column_widths = (g_free (column_widths), NULL); -#line 1740 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - column_widths = _tmp147_; -#line 1740 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - column_widths_length1 = _tmp146_; -#line 1740 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1752 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + column_widths = _tmp142_; +#line 1752 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + column_widths_length1 = _tmp141_; +#line 1752 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _column_widths_size_ = column_widths_length1; -#line 1741 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp148_ = max_rows; -#line 1741 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp149_ = g_new0 (gint, _tmp148_); -#line 1741 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1753 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp143_ = max_rows; +#line 1753 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp144_ = g_new0 (gint, _tmp143_); +#line 1753 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" row_heights = (g_free (row_heights), NULL); -#line 1741 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row_heights = _tmp149_; -#line 1741 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row_heights_length1 = _tmp148_; -#line 1741 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1753 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + row_heights = _tmp144_; +#line 1753 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + row_heights_length1 = _tmp143_; +#line 1753 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _row_heights_size_ = row_heights_length1; -#line 1742 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp150_ = max_rows; -#line 1742 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp151_ = g_new0 (gint, _tmp150_); -#line 1742 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1754 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp145_ = max_rows; +#line 1754 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp146_ = g_new0 (gint, _tmp145_); +#line 1754 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" alignment_points = (g_free (alignment_points), NULL); -#line 1742 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - alignment_points = _tmp151_; -#line 1742 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - alignment_points_length1 = _tmp150_; -#line 1742 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1754 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + alignment_points = _tmp146_; +#line 1754 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + alignment_points_length1 = _tmp145_; +#line 1754 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _alignment_points_size_ = alignment_points_length1; -#line 10234 "CheckerboardLayout.c" +#line 9895 "CheckerboardLayout.c" } else { -#line 1744 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1756 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 10238 "CheckerboardLayout.c" +#line 9899 "CheckerboardLayout.c" } } } -#line 1756 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1768 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" col = 0; -#line 1757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1769 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" row = 0; -#line 10246 "CheckerboardLayout.c" +#line 9907 "CheckerboardLayout.c" { gint ctr = 0; -#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" ctr = 0; -#line 10251 "CheckerboardLayout.c" +#line 9912 "CheckerboardLayout.c" { - gboolean _tmp152_ = FALSE; -#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp152_ = TRUE; -#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gboolean _tmp147_ = FALSE; +#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp147_ = TRUE; +#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" while (TRUE) { -#line 10258 "CheckerboardLayout.c" - gint _tmp154_; - gint _tmp155_; +#line 9919 "CheckerboardLayout.c" + gint _tmp149_; + gint _tmp150_; CheckerboardItem* item = NULL; - ViewCollection* _tmp156_; - gint _tmp157_; - DataObject* _tmp158_; + ViewCollection* _tmp151_; + gint _tmp152_; + DataObject* _tmp153_; Dimensions req = {0}; - CheckerboardItem* _tmp159_; - Dimensions _tmp160_; + CheckerboardItem* _tmp154_; + Dimensions _tmp155_; gint true_height = 0; - Dimensions _tmp161_; + Dimensions _tmp156_; + gint _tmp157_; + gint* _tmp158_; + gint _tmp158__length1; + gint _tmp159_; + gint _tmp160_; + CheckerboardItem* _tmp161_; gint _tmp162_; - gint* _tmp163_; - gint _tmp163__length1; + Dimensions _tmp163_; gint _tmp164_; gint _tmp165_; - CheckerboardItem* _tmp166_; + gint* _tmp166_; + gint _tmp166__length1; gint _tmp167_; gint _tmp168_; - Dimensions _tmp169_; - gint _tmp170_; - gint _tmp171_; - gint* _tmp172_; - gint _tmp172__length1; gint _tmp173_; gint _tmp174_; - gint _tmp179_; - gint _tmp180_; - gint _tmp181_; -#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!_tmp152_) { -#line 10290 "CheckerboardLayout.c" - gint _tmp153_; -#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp153_ = ctr; -#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - ctr = _tmp153_ + 1; -#line 10296 "CheckerboardLayout.c" + gint _tmp175_; +#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!_tmp147_) { +#line 9950 "CheckerboardLayout.c" + gint _tmp148_; +#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp148_ = ctr; +#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + ctr = _tmp148_ + 1; +#line 9956 "CheckerboardLayout.c" } -#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp152_ = FALSE; -#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp154_ = ctr; -#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp155_ = total_items; -#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!(_tmp154_ < _tmp155_)) { -#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp147_ = FALSE; +#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp149_ = ctr; +#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp150_ = total_items; +#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!(_tmp149_ < _tmp150_)) { +#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 10308 "CheckerboardLayout.c" - } -#line 1760 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp156_ = self->priv->view; -#line 1760 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp157_ = ctr; -#line 1760 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp158_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp156_, TYPE_DATA_COLLECTION, DataCollection), _tmp157_); -#line 1760 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - item = G_TYPE_CHECK_INSTANCE_CAST (_tmp158_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); -#line 1761 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp159_ = item; -#line 1761 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp160_ = _tmp159_->requisition; -#line 1761 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - req = _tmp160_; -#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp161_ = req; -#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp162_ = _tmp161_.height; -#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp163_ = alignment_points; -#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp163__length1 = alignment_points_length1; -#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp164_ = row; -#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp165_ = _tmp163_[_tmp164_]; -#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp166_ = item; -#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp167_ = checkerboard_item_get_alignment_point (_tmp166_); -#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - true_height = _tmp162_ + (_tmp165_ - _tmp167_); -#line 1767 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp168_ = true_height; -#line 1767 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp169_ = req; -#line 1767 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp170_ = _tmp169_.height; -#line 1767 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _vala_assert (_tmp168_ >= _tmp170_, "true_height >= req.height"); -#line 1770 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp171_ = true_height; -#line 1770 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp172_ = row_heights; -#line 1770 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp172__length1 = row_heights_length1; -#line 1770 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp173_ = row; -#line 1770 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp174_ = _tmp172_[_tmp173_]; -#line 1770 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp171_ > _tmp174_) { -#line 10362 "CheckerboardLayout.c" - gint* _tmp175_; - gint _tmp175__length1; - gint _tmp176_; - gint _tmp177_; - gint _tmp178_; -#line 1775 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp175_ = row_heights; -#line 1775 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp175__length1 = row_heights_length1; -#line 1775 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp176_ = row; -#line 1775 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp177_ = true_height; -#line 1775 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp175_[_tmp176_] = _tmp177_; -#line 1775 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp178_ = _tmp175_[_tmp176_]; -#line 10380 "CheckerboardLayout.c" +#line 9968 "CheckerboardLayout.c" } +#line 1772 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp151_ = self->priv->view; +#line 1772 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp152_ = ctr; +#line 1772 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp153_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp151_, TYPE_DATA_COLLECTION, DataCollection), _tmp152_); +#line 1772 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + item = G_TYPE_CHECK_INSTANCE_CAST (_tmp153_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); +#line 1773 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp154_ = item; +#line 1773 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp155_ = _tmp154_->requisition; +#line 1773 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + req = _tmp155_; +#line 1778 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp156_ = req; +#line 1778 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp157_ = _tmp156_.height; +#line 1778 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp158_ = alignment_points; +#line 1778 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp158__length1 = alignment_points_length1; +#line 1778 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp159_ = row; +#line 1778 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp160_ = _tmp158_[_tmp159_]; +#line 1778 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp161_ = item; +#line 1778 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + true_height = _tmp157_ + (_tmp160_ - checkerboard_item_get_alignment_point (_tmp161_)); #line 1779 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp179_ = col; -#line 1779 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - col = _tmp179_ + 1; + _tmp162_ = true_height; #line 1779 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp180_ = col; + _tmp163_ = req; #line 1779 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp181_ = max_cols; + _tmp164_ = _tmp163_.height; #line 1779 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp180_ >= _tmp181_) { -#line 10392 "CheckerboardLayout.c" - gint _tmp182_; -#line 1780 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _vala_assert (_tmp162_ >= _tmp164_, "true_height >= req.height"); +#line 1782 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp165_ = true_height; +#line 1782 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp166_ = row_heights; +#line 1782 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp166__length1 = row_heights_length1; +#line 1782 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp167_ = row; +#line 1782 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp168_ = _tmp166_[_tmp167_]; +#line 1782 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp165_ > _tmp168_) { +#line 10020 "CheckerboardLayout.c" + gint* _tmp169_; + gint _tmp169__length1; + gint _tmp170_; + gint _tmp171_; + gint _tmp172_; +#line 1787 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp169_ = row_heights; +#line 1787 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp169__length1 = row_heights_length1; +#line 1787 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp170_ = row; +#line 1787 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp171_ = true_height; +#line 1787 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp169_[_tmp170_] = _tmp171_; +#line 1787 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp172_ = _tmp169_[_tmp170_]; +#line 10038 "CheckerboardLayout.c" + } +#line 1791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp173_ = col; +#line 1791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + col = _tmp173_ + 1; +#line 1791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp174_ = col; +#line 1791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp175_ = max_cols; +#line 1791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp174_ >= _tmp175_) { +#line 10050 "CheckerboardLayout.c" + gint _tmp176_; +#line 1792 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" col = 0; -#line 1781 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp182_ = row; -#line 1781 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row = _tmp182_ + 1; -#line 10400 "CheckerboardLayout.c" +#line 1793 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp176_ = row; +#line 1793 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + row = _tmp176_ + 1; +#line 10058 "CheckerboardLayout.c" } -#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (item); -#line 10404 "CheckerboardLayout.c" +#line 10062 "CheckerboardLayout.c" } } } -#line 1786 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp183_ = max_rows; -#line 1786 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp184_ = g_new0 (CheckerboardLayoutLayoutRow*, _tmp183_ + 1); -#line 1786 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1798 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp177_ = max_rows; +#line 1798 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp178_ = g_new0 (CheckerboardLayoutLayoutRow*, _tmp177_ + 1); +#line 1798 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->item_rows = (_vala_array_free (self->priv->item_rows, self->priv->item_rows_length1, (GDestroyNotify) checkerboard_layout_layout_row_unref), NULL); -#line 1786 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->item_rows = _tmp184_; -#line 1786 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->item_rows_length1 = _tmp183_; -#line 1786 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1798 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->item_rows = _tmp178_; +#line 1798 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->item_rows_length1 = _tmp177_; +#line 1798 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->_item_rows_size_ = self->priv->item_rows_length1; -#line 1789 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp185_ = gutter; -#line 1789 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - x = _tmp185_; -#line 1790 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1801 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp179_ = gutter; +#line 1801 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + x = _tmp179_; +#line 1802 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" y = CHECKERBOARD_LAYOUT_TOP_PADDING; -#line 1791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" col = 0; -#line 1792 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" row = 0; -#line 1793 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1805 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" current_row = NULL; -#line 10432 "CheckerboardLayout.c" +#line 10090 "CheckerboardLayout.c" { gint ctr = 0; -#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" ctr = 0; -#line 10437 "CheckerboardLayout.c" +#line 10095 "CheckerboardLayout.c" { - gboolean _tmp186_ = FALSE; -#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp186_ = TRUE; -#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gboolean _tmp180_ = FALSE; +#line 1807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp180_ = TRUE; +#line 1807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" while (TRUE) { -#line 10444 "CheckerboardLayout.c" - gint _tmp188_; - gint _tmp189_; +#line 10102 "CheckerboardLayout.c" + gint _tmp182_; + gint _tmp183_; CheckerboardItem* item = NULL; - ViewCollection* _tmp190_; - gint _tmp191_; - DataObject* _tmp192_; + ViewCollection* _tmp184_; + gint _tmp185_; + DataObject* _tmp186_; Dimensions req = {0}; - CheckerboardItem* _tmp193_; - Dimensions _tmp194_; + CheckerboardItem* _tmp187_; + Dimensions _tmp188_; gint xpadding = 0; + gint* _tmp189_; + gint _tmp189__length1; + gint _tmp190_; + gint _tmp191_; + Dimensions _tmp192_; + gint _tmp193_; + gint _tmp194_; + gint ypadding = 0; gint* _tmp195_; gint _tmp195__length1; gint _tmp196_; gint _tmp197_; - Dimensions _tmp198_; + CheckerboardItem* _tmp198_; gint _tmp199_; - gint _tmp200_; - gint ypadding = 0; - gint* _tmp201_; - gint _tmp201__length1; + CheckerboardItem* _tmp200_; + gint _tmp201_; gint _tmp202_; - gint _tmp203_; - CheckerboardItem* _tmp204_; + CheckerboardItem* _tmp203_; + gint _tmp204_; gint _tmp205_; - gint _tmp206_; - CheckerboardItem* _tmp207_; + CheckerboardItem* _tmp206_; + Dimensions _tmp207_; gint _tmp208_; - gint _tmp209_; - CheckerboardItem* _tmp210_; + CheckerboardItem* _tmp209_; + Dimensions _tmp210_; gint _tmp211_; - gint _tmp212_; - CheckerboardItem* _tmp213_; - Dimensions _tmp214_; - gint _tmp215_; - CheckerboardItem* _tmp216_; - Dimensions _tmp217_; - gint _tmp218_; - CheckerboardItem* _tmp219_; - gint _tmp220_; - gint _tmp221_; + CheckerboardItem* _tmp212_; + gint _tmp213_; + gint _tmp214_; + CheckerboardLayoutLayoutRow* _tmp215_; CheckerboardLayoutLayoutRow* _tmp222_; - CheckerboardLayoutLayoutRow* _tmp229_; - CheckerboardItem** _tmp230_; - gint _tmp230__length1; + CheckerboardItem** _tmp223_; + gint _tmp223__length1; + gint _tmp224_; + CheckerboardItem* _tmp225_; + CheckerboardItem* _tmp226_; + CheckerboardItem* _tmp227_; + gint _tmp228_; + gint* _tmp229_; + gint _tmp229__length1; + gint _tmp230_; gint _tmp231_; - CheckerboardItem* _tmp232_; - CheckerboardItem* _tmp233_; - CheckerboardItem* _tmp234_; + gint _tmp232_; + gint _tmp233_; + gint _tmp234_; gint _tmp235_; - gint* _tmp236_; - gint _tmp236__length1; - gint _tmp237_; - gint _tmp238_; - gint _tmp239_; - gint _tmp240_; - gint _tmp241_; - gint _tmp242_; -#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!_tmp186_) { -#line 10504 "CheckerboardLayout.c" - gint _tmp187_; -#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp187_ = ctr; -#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - ctr = _tmp187_ + 1; -#line 10510 "CheckerboardLayout.c" +#line 1807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!_tmp180_) { +#line 10161 "CheckerboardLayout.c" + gint _tmp181_; +#line 1807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp181_ = ctr; +#line 1807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + ctr = _tmp181_ + 1; +#line 10167 "CheckerboardLayout.c" } -#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp186_ = FALSE; -#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp188_ = ctr; -#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp189_ = total_items; -#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!(_tmp188_ < _tmp189_)) { -#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp180_ = FALSE; +#line 1807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp182_ = ctr; +#line 1807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp183_ = total_items; +#line 1807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!(_tmp182_ < _tmp183_)) { +#line 1807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 10522 "CheckerboardLayout.c" +#line 10179 "CheckerboardLayout.c" } -#line 1796 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp190_ = self->priv->view; -#line 1796 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp191_ = ctr; -#line 1796 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp192_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp190_, TYPE_DATA_COLLECTION, DataCollection), _tmp191_); -#line 1796 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - item = G_TYPE_CHECK_INSTANCE_CAST (_tmp192_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); -#line 1797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp193_ = item; -#line 1797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp194_ = _tmp193_->requisition; -#line 1797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - req = _tmp194_; -#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp195_ = column_widths; -#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp195__length1 = column_widths_length1; -#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp196_ = col; -#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp197_ = _tmp195_[_tmp196_]; -#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp198_ = req; -#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp199_ = _tmp198_.width; -#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - xpadding = (_tmp197_ - _tmp199_) / 2; -#line 1801 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp200_ = xpadding; -#line 1801 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _vala_assert (_tmp200_ >= 0, "xpadding >= 0"); -#line 1804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp201_ = alignment_points; -#line 1804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp201__length1 = alignment_points_length1; -#line 1804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp202_ = row; -#line 1804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp203_ = _tmp201_[_tmp202_]; -#line 1804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp204_ = item; -#line 1804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp205_ = checkerboard_item_get_alignment_point (_tmp204_); -#line 1804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - ypadding = _tmp203_ - _tmp205_; -#line 1805 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp206_ = ypadding; -#line 1805 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _vala_assert (_tmp206_ >= 0, "ypadding >= 0"); #line 1808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp207_ = item; + _tmp184_ = self->priv->view; #line 1808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp208_ = x; + _tmp185_ = ctr; #line 1808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp209_ = xpadding; + _tmp186_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp184_, TYPE_DATA_COLLECTION, DataCollection), _tmp185_); #line 1808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp207_->allocation.x = _tmp208_ + _tmp209_; + item = G_TYPE_CHECK_INSTANCE_CAST (_tmp186_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); #line 1809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp210_ = item; + _tmp187_ = item; #line 1809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp211_ = y; + _tmp188_ = _tmp187_->requisition; #line 1809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp212_ = ypadding; -#line 1809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp210_->allocation.y = _tmp211_ + _tmp212_; -#line 1810 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp213_ = item; -#line 1810 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp214_ = req; -#line 1810 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp215_ = _tmp214_.width; -#line 1810 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp213_->allocation.width = _tmp215_; -#line 1811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp216_ = item; -#line 1811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp217_ = req; -#line 1811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp218_ = _tmp217_.height; -#line 1811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp216_->allocation.height = _tmp218_; + req = _tmp188_; #line 1812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp219_ = item; + _tmp189_ = column_widths; #line 1812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp220_ = col; + _tmp189__length1 = column_widths_length1; #line 1812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp221_ = row; + _tmp190_ = col; #line 1812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_set_grid_coordinates (_tmp219_, _tmp220_, _tmp221_); -#line 1815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp222_ = current_row; -#line 1815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp222_ == NULL) { -#line 10618 "CheckerboardLayout.c" - gint _tmp223_; - gint* _tmp224_; - gint _tmp224__length1; - gint _tmp225_; - gint _tmp226_; - gint _tmp227_; - CheckerboardLayoutLayoutRow* _tmp228_; -#line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp223_ = y; -#line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp224_ = row_heights; -#line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp224__length1 = row_heights_length1; + _tmp191_ = _tmp189_[_tmp190_]; +#line 1812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp192_ = req; +#line 1812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp193_ = _tmp192_.width; +#line 1812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + xpadding = (_tmp191_ - _tmp193_) / 2; +#line 1813 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp194_ = xpadding; +#line 1813 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _vala_assert (_tmp194_ >= 0, "xpadding >= 0"); #line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp225_ = row; + _tmp195_ = alignment_points; #line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp226_ = _tmp224_[_tmp225_]; + _tmp195__length1 = alignment_points_length1; #line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp227_ = max_cols; + _tmp196_ = row; #line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp228_ = checkerboard_layout_layout_row_new (_tmp223_, _tmp226_, _tmp227_); + _tmp197_ = _tmp195_[_tmp196_]; #line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _checkerboard_layout_layout_row_unref0 (current_row); + _tmp198_ = item; #line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - current_row = _tmp228_; -#line 10644 "CheckerboardLayout.c" - } -#line 1818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp229_ = current_row; -#line 1818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp230_ = _tmp229_->items; -#line 1818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp230__length1 = _tmp229_->items_length1; -#line 1818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp231_ = col; -#line 1818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp232_ = item; -#line 1818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp233_ = _g_object_ref0 (_tmp232_); -#line 1818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_object_unref0 (_tmp230_[_tmp231_]); -#line 1818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp230_[_tmp231_] = _tmp233_; -#line 1818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp234_ = _tmp230_[_tmp231_]; -#line 1820 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp235_ = x; -#line 1820 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp236_ = column_widths; -#line 1820 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp236__length1 = column_widths_length1; + ypadding = _tmp197_ - checkerboard_item_get_alignment_point (_tmp198_); +#line 1817 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp199_ = ypadding; +#line 1817 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _vala_assert (_tmp199_ >= 0, "ypadding >= 0"); #line 1820 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp237_ = col; + _tmp200_ = item; #line 1820 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp238_ = _tmp236_[_tmp237_]; + _tmp201_ = x; #line 1820 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp239_ = gutter; + _tmp202_ = xpadding; #line 1820 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - x = _tmp235_ + (_tmp238_ + _tmp239_); + _tmp200_->allocation.x = _tmp201_ + _tmp202_; +#line 1821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp203_ = item; +#line 1821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp204_ = y; +#line 1821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp205_ = ypadding; +#line 1821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp203_->allocation.y = _tmp204_ + _tmp205_; +#line 1822 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp206_ = item; +#line 1822 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp207_ = req; +#line 1822 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp208_ = _tmp207_.width; +#line 1822 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp206_->allocation.width = _tmp208_; #line 1823 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp240_ = col; + _tmp209_ = item; #line 1823 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - col = _tmp240_ + 1; + _tmp210_ = req; #line 1823 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp241_ = col; + _tmp211_ = _tmp210_.height; #line 1823 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp242_ = max_cols; -#line 1823 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp241_ >= _tmp242_) { -#line 10688 "CheckerboardLayout.c" - CheckerboardLayoutLayoutRow* _tmp243_; - CheckerboardLayoutLayoutRow** _tmp244_; - gint _tmp244__length1; - gint _tmp245_; - CheckerboardLayoutLayoutRow* _tmp246_; - CheckerboardLayoutLayoutRow* _tmp247_; - CheckerboardLayoutLayoutRow* _tmp248_; - gint _tmp249_; - gint _tmp250_; - gint* _tmp251_; - gint _tmp251__length1; - gint _tmp252_; - gint _tmp253_; - gint _tmp254_; + _tmp209_->allocation.height = _tmp211_; #line 1824 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp243_ = current_row; + _tmp212_ = item; #line 1824 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _vala_assert (_tmp243_ != NULL, "current_row != null"); -#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp244_ = self->priv->item_rows; -#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp244__length1 = self->priv->item_rows_length1; -#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp245_ = row; -#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp246_ = current_row; -#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp247_ = _checkerboard_layout_layout_row_ref0 (_tmp246_); -#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _checkerboard_layout_layout_row_unref0 (_tmp244_[_tmp245_]); -#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp244_[_tmp245_] = _tmp247_; -#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp248_ = _tmp244_[_tmp245_]; -#line 1826 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _checkerboard_layout_layout_row_unref0 (current_row); -#line 1826 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - current_row = NULL; + _tmp213_ = col; +#line 1824 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp214_ = row; +#line 1824 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_item_set_grid_coordinates (_tmp212_, _tmp213_, _tmp214_); +#line 1827 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp215_ = current_row; +#line 1827 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp215_ == NULL) { +#line 10273 "CheckerboardLayout.c" + gint _tmp216_; + gint* _tmp217_; + gint _tmp217__length1; + gint _tmp218_; + gint _tmp219_; + gint _tmp220_; + CheckerboardLayoutLayoutRow* _tmp221_; #line 1828 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp249_ = gutter; + _tmp216_ = y; #line 1828 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - x = _tmp249_; -#line 1829 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp250_ = y; -#line 1829 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp251_ = row_heights; -#line 1829 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp251__length1 = row_heights_length1; -#line 1829 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp252_ = row; -#line 1829 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp253_ = _tmp251_[_tmp252_]; -#line 1829 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - y = _tmp250_ + (_tmp253_ + CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING); -#line 1830 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - col = 0; -#line 1831 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp254_ = row; -#line 1831 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - row = _tmp254_ + 1; -#line 10749 "CheckerboardLayout.c" + _tmp217_ = row_heights; +#line 1828 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp217__length1 = row_heights_length1; +#line 1828 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp218_ = row; +#line 1828 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp219_ = _tmp217_[_tmp218_]; +#line 1828 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp220_ = max_cols; +#line 1828 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp221_ = checkerboard_layout_layout_row_new (_tmp216_, _tmp219_, _tmp220_); +#line 1828 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _checkerboard_layout_layout_row_unref0 (current_row); +#line 1828 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + current_row = _tmp221_; +#line 10299 "CheckerboardLayout.c" } -#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_object_unref0 (item); -#line 10753 "CheckerboardLayout.c" - } - } - } +#line 1830 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp222_ = current_row; +#line 1830 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp223_ = _tmp222_->items; +#line 1830 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp223__length1 = _tmp222_->items_length1; +#line 1830 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp224_ = col; +#line 1830 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp225_ = item; +#line 1830 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp226_ = _g_object_ref0 (_tmp225_); +#line 1830 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_object_unref0 (_tmp223_[_tmp224_]); +#line 1830 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp223_[_tmp224_] = _tmp226_; +#line 1830 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp227_ = _tmp223_[_tmp224_]; +#line 1832 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp228_ = x; +#line 1832 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp229_ = column_widths; +#line 1832 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp229__length1 = column_widths_length1; +#line 1832 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp230_ = col; +#line 1832 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp231_ = _tmp229_[_tmp230_]; +#line 1832 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp232_ = gutter; +#line 1832 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + x = _tmp228_ + (_tmp231_ + _tmp232_); +#line 1835 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp233_ = col; +#line 1835 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + col = _tmp233_ + 1; +#line 1835 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp234_ = col; +#line 1835 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp235_ = max_cols; +#line 1835 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp234_ >= _tmp235_) { +#line 10343 "CheckerboardLayout.c" + CheckerboardLayoutLayoutRow* _tmp236_; + CheckerboardLayoutLayoutRow** _tmp237_; + gint _tmp237__length1; + gint _tmp238_; + CheckerboardLayoutLayoutRow* _tmp239_; + CheckerboardLayoutLayoutRow* _tmp240_; + CheckerboardLayoutLayoutRow* _tmp241_; + gint _tmp242_; + gint _tmp243_; + gint* _tmp244_; + gint _tmp244__length1; + gint _tmp245_; + gint _tmp246_; + gint _tmp247_; #line 1836 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp255_ = current_row; + _tmp236_ = current_row; #line 1836 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp255_ != NULL) { -#line 10761 "CheckerboardLayout.c" - CheckerboardLayoutLayoutRow** _tmp256_; - gint _tmp256__length1; - gint _tmp257_; - CheckerboardLayoutLayoutRow* _tmp258_; - CheckerboardLayoutLayoutRow* _tmp259_; - CheckerboardLayoutLayoutRow* _tmp260_; + _vala_assert (_tmp236_ != NULL, "current_row != null"); #line 1837 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp256_ = self->priv->item_rows; + _tmp237_ = self->priv->item_rows; #line 1837 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp256__length1 = self->priv->item_rows_length1; + _tmp237__length1 = self->priv->item_rows_length1; #line 1837 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp257_ = row; + _tmp238_ = row; #line 1837 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp258_ = current_row; + _tmp239_ = current_row; #line 1837 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp259_ = _checkerboard_layout_layout_row_ref0 (_tmp258_); + _tmp240_ = _checkerboard_layout_layout_row_ref0 (_tmp239_); #line 1837 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _checkerboard_layout_layout_row_unref0 (_tmp256_[_tmp257_]); + _checkerboard_layout_layout_row_unref0 (_tmp237_[_tmp238_]); #line 1837 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp256_[_tmp257_] = _tmp259_; + _tmp237_[_tmp238_] = _tmp240_; #line 1837 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp260_ = _tmp256_[_tmp257_]; -#line 10784 "CheckerboardLayout.c" - } + _tmp241_ = _tmp237_[_tmp238_]; +#line 1838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _checkerboard_layout_layout_row_unref0 (current_row); +#line 1838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + current_row = NULL; #line 1840 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp261_ = max_cols; + _tmp242_ = gutter; #line 1840 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->columns = _tmp261_; + x = _tmp242_; #line 1841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp262_ = row; + _tmp243_ = y; #line 1841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->rows = _tmp262_ + 1; -#line 1842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp263_ = self->priv->rows; -#line 1842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp264_ = max_rows; + _tmp244_ = row_heights; +#line 1841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp244__length1 = row_heights_length1; +#line 1841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp245_ = row; +#line 1841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp246_ = _tmp244_[_tmp245_]; +#line 1841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + y = _tmp243_ + (_tmp246_ + CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING); #line 1842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _vala_assert (_tmp263_ == _tmp264_, "rows == max_rows"); -#line 1846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp265_ = y; -#line 1846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp266_ = row_heights; -#line 1846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp266__length1 = row_heights_length1; -#line 1846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp267_ = row; -#line 1846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp268_ = _tmp266_[_tmp267_]; -#line 1846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - total_height = (_tmp265_ + _tmp268_) + CHECKERBOARD_LAYOUT_BOTTOM_PADDING; -#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp270_ = visible_width; -#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp271_ = allocation; -#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp272_ = _tmp271_.width; -#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp270_ != _tmp272_) { -#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp269_ = TRUE; -#line 10822 "CheckerboardLayout.c" - } else { - gint _tmp273_; - GtkAllocation _tmp274_; - gint _tmp275_; -#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp273_ = total_height; -#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp274_ = allocation; -#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp275_ = _tmp274_.height; -#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp269_ = _tmp273_ != _tmp275_; -#line 10835 "CheckerboardLayout.c" - } -#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp269_) { -#line 10839 "CheckerboardLayout.c" - gint _tmp276_; - gint _tmp277_; - gint _tmp278_; -#line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp276_ = visible_width; + col = 0; +#line 1843 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp247_ = row; +#line 1843 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + row = _tmp247_ + 1; +#line 10404 "CheckerboardLayout.c" + } +#line 1807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_object_unref0 (item); +#line 10408 "CheckerboardLayout.c" + } + } + } +#line 1848 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp248_ = current_row; +#line 1848 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp248_ != NULL) { +#line 10416 "CheckerboardLayout.c" + CheckerboardLayoutLayoutRow** _tmp249_; + gint _tmp249__length1; + gint _tmp250_; + CheckerboardLayoutLayoutRow* _tmp251_; + CheckerboardLayoutLayoutRow* _tmp252_; + CheckerboardLayoutLayoutRow* _tmp253_; +#line 1849 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp249_ = self->priv->item_rows; +#line 1849 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp249__length1 = self->priv->item_rows_length1; +#line 1849 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp250_ = row; +#line 1849 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp251_ = current_row; +#line 1849 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp252_ = _checkerboard_layout_layout_row_ref0 (_tmp251_); +#line 1849 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _checkerboard_layout_layout_row_unref0 (_tmp249_[_tmp250_]); +#line 1849 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp249_[_tmp250_] = _tmp252_; +#line 1849 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp253_ = _tmp249_[_tmp250_]; +#line 10439 "CheckerboardLayout.c" + } #line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp277_ = total_height; + _tmp254_ = max_cols; #line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp276_, _tmp277_); + self->priv->columns = _tmp254_; +#line 1853 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp255_ = row; #line 1853 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->rows = _tmp255_ + 1; +#line 1854 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp256_ = self->priv->rows; +#line 1854 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp257_ = max_rows; +#line 1854 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _vala_assert (_tmp256_ == _tmp257_, "rows == max_rows"); +#line 1858 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp258_ = y; +#line 1858 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp259_ = row_heights; +#line 1858 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp259__length1 = row_heights_length1; +#line 1858 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp260_ = row; +#line 1858 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp261_ = _tmp259_[_tmp260_]; +#line 1858 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + total_height = (_tmp258_ + _tmp261_) + CHECKERBOARD_LAYOUT_BOTTOM_PADDING; +#line 1859 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp263_ = visible_width; +#line 1859 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp264_ = allocation; +#line 1859 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp265_ = _tmp264_.width; +#line 1859 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp263_ != _tmp265_) { +#line 1859 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp262_ = TRUE; +#line 10477 "CheckerboardLayout.c" + } else { + gint _tmp266_; + GtkAllocation _tmp267_; + gint _tmp268_; +#line 1859 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp266_ = total_height; +#line 1859 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp267_ = allocation; +#line 1859 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp268_ = _tmp267_.height; +#line 1859 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp262_ = _tmp266_ != _tmp268_; +#line 10490 "CheckerboardLayout.c" + } +#line 1859 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp262_) { +#line 10494 "CheckerboardLayout.c" + gint _tmp269_; + gint _tmp270_; + gint _tmp271_; +#line 1864 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp269_ = visible_width; +#line 1864 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp270_ = total_height; +#line 1864 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp269_, _tmp270_); +#line 1865 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->size_allocate_due_to_reflow = TRUE; -#line 1856 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp278_ = total_height; -#line 1856 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_layout_center_on_anchor (self, (gdouble) _tmp278_); -#line 10855 "CheckerboardLayout.c" +#line 1868 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp271_ = total_height; +#line 1868 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_layout_center_on_anchor (self, (gdouble) _tmp271_); +#line 10510 "CheckerboardLayout.c" } -#line 1543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1555 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _checkerboard_layout_layout_row_unref0 (current_row); -#line 1543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1555 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" alignment_points = (g_free (alignment_points), NULL); -#line 1543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1555 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" row_heights = (g_free (row_heights), NULL); -#line 1543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1555 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" column_widths = (g_free (column_widths), NULL); -#line 10865 "CheckerboardLayout.c" +#line 10520 "CheckerboardLayout.c" } -static void checkerboard_layout_items_dirty (CheckerboardLayout* self, const gchar* reason, GeeIterable* items) { +static void +checkerboard_layout_items_dirty (CheckerboardLayout* self, + const gchar* reason, + GeeIterable* items) +{ GdkRectangle dirty = {0}; - gboolean _tmp35_ = FALSE; - GdkRectangle _tmp36_; - gint _tmp37_; -#line 1860 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1860 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_return_if_fail (reason != NULL); -#line 1860 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - g_return_if_fail (GEE_IS_ITERABLE (items)); -#line 1861 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - memset (&dirty, 0, sizeof (GdkRectangle)); -#line 10882 "CheckerboardLayout.c" - { - GeeIterator* _data_view_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; -#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = items; -#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); -#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _data_view_it = _tmp1_; -#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - while (TRUE) { -#line 10895 "CheckerboardLayout.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; - DataView* data_view = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - CheckerboardItem* item = NULL; - DataView* _tmp6_; - CheckerboardItem* _tmp7_; - CheckerboardItem* _tmp8_; - gboolean _tmp9_; - ViewCollection* _tmp10_; - CheckerboardItem* _tmp11_; - gboolean _tmp12_; - gboolean _tmp13_ = FALSE; - CheckerboardItem* _tmp14_; - GdkRectangle _tmp15_; - gint _tmp16_; - GdkRectangle intersection = {0}; - CheckerboardItem* _tmp23_; - GdkRectangle _tmp24_; - GdkRectangle _tmp25_ = {0}; - gboolean _tmp26_; - gboolean _tmp27_ = FALSE; - GdkRectangle _tmp28_; - gint _tmp29_; -#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = _data_view_it; -#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!_tmp3_) { -#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - break; -#line 10929 "CheckerboardLayout.c" - } -#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = _data_view_it; -#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = gee_iterator_get (_tmp4_); -#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - data_view = (DataView*) _tmp5_; -#line 1863 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = data_view; -#line 1863 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 1863 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - item = _tmp7_; -#line 1865 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = item; -#line 1865 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = data_view_is_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView)); -#line 1865 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!_tmp9_) { -#line 1866 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_object_unref0 (item); -#line 1866 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_object_unref0 (data_view); -#line 1866 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - continue; -#line 10955 "CheckerboardLayout.c" - } -#line 1868 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = self->priv->view; -#line 1868 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = item; -#line 1868 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject)); -#line 1868 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _vala_assert (_tmp12_, "view.contains(item)"); -#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp14_ = item; -#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp15_ = _tmp14_->allocation; -#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp16_ = _tmp15_.width; -#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp16_ <= 0) { -#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = TRUE; -#line 10975 "CheckerboardLayout.c" - } else { - CheckerboardItem* _tmp17_; - GdkRectangle _tmp18_; - gint _tmp19_; -#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp17_ = item; -#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp18_ = _tmp17_->allocation; -#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp19_ = _tmp18_.height; -#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = _tmp19_ <= 0; -#line 10988 "CheckerboardLayout.c" - } + gboolean _tmp30_ = FALSE; + GdkRectangle _tmp31_; + gint _tmp32_; #line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp13_) { -#line 10992 "CheckerboardLayout.c" - const gchar* _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; -#line 1873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp20_ = reason; -#line 1873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp21_ = g_strdup_printf ("items_dirty: %s", _tmp20_); -#line 1873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp22_ = _tmp21_; -#line 1873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_layout_need_reflow (self, _tmp22_); + g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); +#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + g_return_if_fail (reason != NULL); +#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + g_return_if_fail (GEE_IS_ITERABLE (items)); #line 1873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_free0 (_tmp22_); -#line 1875 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_object_unref0 (item); + memset (&dirty, 0, sizeof (GdkRectangle)); +#line 10541 "CheckerboardLayout.c" + { + GeeIterator* _data_view_it = NULL; + GeeIterator* _tmp0_; +#line 1874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = gee_iterable_iterator (items); +#line 1874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _data_view_it = _tmp0_; +#line 1874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + while (TRUE) { +#line 10551 "CheckerboardLayout.c" + GeeIterator* _tmp1_; + DataView* data_view = NULL; + GeeIterator* _tmp2_; + gpointer _tmp3_; + CheckerboardItem* item = NULL; + DataView* _tmp4_; + CheckerboardItem* _tmp5_; + CheckerboardItem* _tmp6_; + ViewCollection* _tmp7_; + CheckerboardItem* _tmp8_; + gboolean _tmp9_ = FALSE; + CheckerboardItem* _tmp10_; + GdkRectangle _tmp11_; + gint _tmp12_; + GdkRectangle intersection = {0}; + CheckerboardItem* _tmp18_; + GdkRectangle _tmp19_; + GdkRectangle _tmp20_ = {0}; + gboolean _tmp21_; + gboolean _tmp22_ = FALSE; + GdkRectangle _tmp23_; + gint _tmp24_; +#line 1874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1_ = _data_view_it; +#line 1874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!gee_iterator_next (_tmp1_)) { +#line 1874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + break; +#line 10580 "CheckerboardLayout.c" + } +#line 1874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = _data_view_it; +#line 1874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = gee_iterator_get (_tmp2_); +#line 1874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + data_view = (DataView*) _tmp3_; #line 1875 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_object_unref0 (data_view); + _tmp4_ = data_view; #line 1875 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_object_unref0 (_data_view_it); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); #line 1875 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - return; -#line 11014 "CheckerboardLayout.c" - } -#line 1879 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - memset (&intersection, 0, sizeof (GdkRectangle)); -#line 1880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp23_ = item; -#line 1880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp24_ = _tmp23_->allocation; -#line 1880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp26_ = gdk_rectangle_intersect (&self->priv->visible_page, &_tmp24_, &_tmp25_); -#line 1880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - intersection = _tmp25_; -#line 1880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!_tmp26_) { -#line 1881 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + item = _tmp5_; +#line 1877 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp6_ = item; +#line 1877 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!data_view_is_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_VIEW, DataView))) { +#line 1878 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (item); -#line 1881 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1878 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (data_view); -#line 1881 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1878 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" continue; -#line 11034 "CheckerboardLayout.c" +#line 10604 "CheckerboardLayout.c" } +#line 1880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp7_ = self->priv->view; +#line 1880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp8_ = item; +#line 1880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _vala_assert (data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)), "view.contains(item)"); +#line 1884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp10_ = item; #line 1884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp28_ = dirty; + _tmp11_ = _tmp10_->allocation; #line 1884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp29_ = _tmp28_.width; + _tmp12_ = _tmp11_.width; #line 1884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp29_ == 0) { + if (_tmp12_ <= 0) { #line 1884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp27_ = TRUE; -#line 11044 "CheckerboardLayout.c" + _tmp9_ = TRUE; +#line 10622 "CheckerboardLayout.c" } else { - GdkRectangle _tmp30_; - gint _tmp31_; + CheckerboardItem* _tmp13_; + GdkRectangle _tmp14_; + gint _tmp15_; +#line 1884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp13_ = item; #line 1884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp30_ = dirty; + _tmp14_ = _tmp13_->allocation; #line 1884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp31_ = _tmp30_.height; + _tmp15_ = _tmp14_.height; #line 1884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp27_ = _tmp31_ == 0; -#line 11054 "CheckerboardLayout.c" + _tmp9_ = _tmp15_ <= 0; +#line 10635 "CheckerboardLayout.c" } #line 1884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp27_) { -#line 11058 "CheckerboardLayout.c" - GdkRectangle _tmp32_; + if (_tmp9_) { +#line 10639 "CheckerboardLayout.c" + gchar* _tmp16_; + gchar* _tmp17_; #line 1885 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp32_ = intersection; + _tmp16_ = g_strdup_printf ("items_dirty: %s", reason); #line 1885 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - dirty = _tmp32_; -#line 11064 "CheckerboardLayout.c" - } else { - GdkRectangle _tmp33_; - GdkRectangle _tmp34_ = {0}; + _tmp17_ = _tmp16_; +#line 1885 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_layout_need_reflow (self, _tmp17_); +#line 1885 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_free0 (_tmp17_); +#line 1887 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_object_unref0 (item); #line 1887 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp33_ = intersection; + _g_object_unref0 (data_view); #line 1887 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gdk_rectangle_union (&dirty, &_tmp33_, &_tmp34_); + _g_object_unref0 (_data_view_it); #line 1887 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - dirty = _tmp34_; -#line 11074 "CheckerboardLayout.c" + return; +#line 10658 "CheckerboardLayout.c" + } +#line 1891 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + memset (&intersection, 0, sizeof (GdkRectangle)); +#line 1892 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp18_ = item; +#line 1892 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp19_ = _tmp18_->allocation; +#line 1892 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp21_ = gdk_rectangle_intersect (&self->priv->visible_page, &_tmp19_, &_tmp20_); +#line 1892 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + intersection = _tmp20_; +#line 1892 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!_tmp21_) { +#line 1893 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_object_unref0 (item); +#line 1893 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_object_unref0 (data_view); +#line 1893 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + continue; +#line 10678 "CheckerboardLayout.c" + } +#line 1896 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp23_ = dirty; +#line 1896 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp24_ = _tmp23_.width; +#line 1896 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp24_ == 0) { +#line 1896 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp22_ = TRUE; +#line 10688 "CheckerboardLayout.c" + } else { + GdkRectangle _tmp25_; + gint _tmp26_; +#line 1896 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp25_ = dirty; +#line 1896 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp26_ = _tmp25_.height; +#line 1896 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp22_ = _tmp26_ == 0; +#line 10698 "CheckerboardLayout.c" + } +#line 1896 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp22_) { +#line 10702 "CheckerboardLayout.c" + GdkRectangle _tmp27_; +#line 1897 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp27_ = intersection; +#line 1897 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + dirty = _tmp27_; +#line 10708 "CheckerboardLayout.c" + } else { + GdkRectangle _tmp28_; + GdkRectangle _tmp29_ = {0}; +#line 1899 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp28_ = intersection; +#line 1899 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gdk_rectangle_union (&dirty, &_tmp28_, &_tmp29_); +#line 1899 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + dirty = _tmp29_; +#line 10718 "CheckerboardLayout.c" } -#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (item); -#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (data_view); -#line 11080 "CheckerboardLayout.c" +#line 10724 "CheckerboardLayout.c" } -#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (_data_view_it); -#line 11084 "CheckerboardLayout.c" - } -#line 1890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp36_ = dirty; -#line 1890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp37_ = _tmp36_.width; -#line 1890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp37_ > 0) { -#line 11092 "CheckerboardLayout.c" - GdkRectangle _tmp38_; - gint _tmp39_; -#line 1890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp38_ = dirty; -#line 1890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp39_ = _tmp38_.height; -#line 1890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp35_ = _tmp39_ > 0; -#line 11101 "CheckerboardLayout.c" +#line 10728 "CheckerboardLayout.c" + } +#line 1902 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp31_ = dirty; +#line 1902 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp32_ = _tmp31_.width; +#line 1902 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp32_ > 0) { +#line 10736 "CheckerboardLayout.c" + GdkRectangle _tmp33_; + gint _tmp34_; +#line 1902 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp33_ = dirty; +#line 1902 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp34_ = _tmp33_.height; +#line 1902 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp30_ = _tmp34_ > 0; +#line 10745 "CheckerboardLayout.c" } else { -#line 1890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp35_ = FALSE; -#line 11105 "CheckerboardLayout.c" - } -#line 1890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp35_) { -#line 11109 "CheckerboardLayout.c" - GdkRectangle _tmp40_; - gint _tmp41_; - GdkRectangle _tmp42_; - gint _tmp43_; - GdkRectangle _tmp44_; - gint _tmp45_; - GdkRectangle _tmp46_; - gint _tmp47_; -#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp40_ = dirty; -#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp41_ = _tmp40_.x; -#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp42_ = dirty; -#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp43_ = _tmp42_.y; -#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp44_ = dirty; -#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp45_ = _tmp44_.width; -#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp46_ = dirty; -#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp47_ = _tmp46_.height; -#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gtk_widget_queue_draw_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp41_, _tmp43_, _tmp45_, _tmp47_); -#line 11136 "CheckerboardLayout.c" - } -} - - -static void checkerboard_layout_real_map (GtkWidget* base) { +#line 1902 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp30_ = FALSE; +#line 10749 "CheckerboardLayout.c" + } +#line 1902 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp30_) { +#line 10753 "CheckerboardLayout.c" + GdkRectangle _tmp35_; + gint _tmp36_; + GdkRectangle _tmp37_; + gint _tmp38_; + GdkRectangle _tmp39_; + gint _tmp40_; + GdkRectangle _tmp41_; + gint _tmp42_; +#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp35_ = dirty; +#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp36_ = _tmp35_.x; +#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp37_ = dirty; +#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp38_ = _tmp37_.y; +#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp39_ = dirty; +#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp40_ = _tmp39_.width; +#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp41_ = dirty; +#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp42_ = _tmp41_.height; +#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gtk_widget_queue_draw_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp36_, _tmp38_, _tmp40_, _tmp42_); +#line 10780 "CheckerboardLayout.c" + } +} + + +static void +checkerboard_layout_real_map (GtkWidget* base) +{ CheckerboardLayout * self; -#line 1899 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1911 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayout); -#line 1900 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1912 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" GTK_WIDGET_CLASS (checkerboard_layout_parent_class)->map (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget)); -#line 1902 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1914 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_set_colors (self, TRUE); -#line 11149 "CheckerboardLayout.c" +#line 10795 "CheckerboardLayout.c" } -static void checkerboard_layout_set_colors (CheckerboardLayout* self, gboolean in_focus) { +static void +checkerboard_layout_set_colors (CheckerboardLayout* self, + gboolean in_focus) +{ ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - gboolean _tmp2_; - GdkRGBA _tmp3_ = {0}; + GdkRGBA _tmp2_ = {0}; + ConfigFacade* _tmp3_; ConfigFacade* _tmp4_; - ConfigFacade* _tmp5_; - GdkRGBA _tmp6_ = {0}; + GdkRGBA _tmp5_ = {0}; + ConfigFacade* _tmp6_; ConfigFacade* _tmp7_; - ConfigFacade* _tmp8_; - GdkRGBA _tmp9_ = {0}; - GtkStyleContext* _tmp10_; - GdkRGBA _tmp11_ = {0}; -#line 1905 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GdkRGBA _tmp8_ = {0}; + GtkStyleContext* _tmp9_; + GdkRGBA _tmp10_ = {0}; +#line 1917 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = config_facade_get_instance (); -#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = _tmp0_; -#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = in_focus; -#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - config_facade_get_selected_color (_tmp1_, _tmp2_, &_tmp3_); -#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->selected_color = _tmp3_; -#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + config_facade_get_selected_color (_tmp1_, in_focus, &_tmp2_); +#line 1919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->selected_color = _tmp2_; +#line 1919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (_tmp1_); -#line 1908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = config_facade_get_instance (); -#line 1908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = _tmp4_; -#line 1908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - config_facade_get_unselected_color (_tmp5_, &_tmp6_); -#line 1908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->unselected_color = _tmp6_; -#line 1908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_object_unref0 (_tmp5_); -#line 1909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = config_facade_get_instance (); -#line 1909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = _tmp7_; -#line 1909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - config_facade_get_border_color (_tmp8_, &_tmp9_); -#line 1909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->border_color = _tmp9_; -#line 1909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _g_object_unref0 (_tmp8_); -#line 1910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 1910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gtk_style_context_get_background_color (_tmp10_, GTK_STATE_FLAG_NORMAL, &_tmp11_); -#line 1910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->priv->bg_color = _tmp11_; -#line 11206 "CheckerboardLayout.c" -} - - -static void checkerboard_layout_real_size_allocate (GtkWidget* base, GtkAllocation* allocation) { +#line 1920 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = config_facade_get_instance (); +#line 1920 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = _tmp3_; +#line 1920 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + config_facade_get_unselected_color (_tmp4_, &_tmp5_); +#line 1920 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->unselected_color = _tmp5_; +#line 1920 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_object_unref0 (_tmp4_); +#line 1921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp6_ = config_facade_get_instance (); +#line 1921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp7_ = _tmp6_; +#line 1921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + config_facade_get_border_color (_tmp7_, &_tmp8_); +#line 1921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->border_color = _tmp8_; +#line 1921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _g_object_unref0 (_tmp7_); +#line 1922 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp9_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); +#line 1922 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gtk_style_context_get_background_color (_tmp9_, GTK_STATE_FLAG_NORMAL, &_tmp10_); +#line 1922 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->priv->bg_color = _tmp10_; +#line 10852 "CheckerboardLayout.c" +} + + +static void +checkerboard_layout_real_size_allocate (GtkWidget* base, + GtkAllocation* allocation) +{ CheckerboardLayout * self; GtkAllocation _tmp0_; -#line 1913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1925 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayout); -#line 1913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1925 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (allocation != NULL); -#line 1914 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1926 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = *allocation; -#line 1914 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1926 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" GTK_WIDGET_CLASS (checkerboard_layout_parent_class)->size_allocate (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), &_tmp0_); -#line 1916 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1928 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_viewport_resized (self); -#line 11223 "CheckerboardLayout.c" +#line 10872 "CheckerboardLayout.c" } -static gboolean checkerboard_layout_real_draw (GtkWidget* base, cairo_t* ctx) { +static gboolean +checkerboard_layout_real_draw (GtkWidget* base, + cairo_t* ctx) +{ CheckerboardLayout * self; gboolean result = FALSE; GtkAllocation allocation = {0}; GtkAllocation _tmp0_ = {0}; GtkStyleContext* _tmp1_; - cairo_t* _tmp2_; - GtkAllocation _tmp3_; - gint _tmp4_; - GtkAllocation _tmp5_; - gint _tmp6_; - const gchar* _tmp7_; - gboolean _tmp60_ = FALSE; + GtkAllocation _tmp2_; + gint _tmp3_; + GtkAllocation _tmp4_; + gint _tmp5_; + const gchar* _tmp6_; + gboolean _tmp54_ = FALSE; gboolean _result_ = FALSE; - cairo_t* _tmp63_; -#line 1919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1931 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayout); -#line 1919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1931 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (ctx != NULL, FALSE); -#line 1928 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1940 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp0_); -#line 1928 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1940 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" allocation = _tmp0_; -#line 1929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 1929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = ctx; -#line 1929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = allocation; -#line 1929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = _tmp3_.width; -#line 1929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = allocation; -#line 1929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = _tmp5_.height; -#line 1929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gtk_render_background (_tmp1_, _tmp2_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp4_, (gdouble) _tmp6_); -#line 1932 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = self->priv->message; -#line 1932 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp7_ == NULL) { -#line 11268 "CheckerboardLayout.c" - gboolean _tmp8_; -#line 1937 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = self->priv->exposure_dirty; -#line 1937 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp8_) { -#line 1938 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = allocation; +#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = _tmp2_.width; +#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp4_ = allocation; +#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp5_ = _tmp4_.height; +#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gtk_render_background (_tmp1_, ctx, (gdouble) 0, (gdouble) 0, (gdouble) _tmp3_, (gdouble) _tmp5_); +#line 1944 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp6_ = self->priv->message; +#line 1944 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp6_ == NULL) { +#line 10916 "CheckerboardLayout.c" + gboolean _tmp7_; +#line 1949 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp7_ = self->priv->exposure_dirty; +#line 1949 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp7_) { +#line 1950 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_expose_items (self, "draw"); -#line 11276 "CheckerboardLayout.c" +#line 10924 "CheckerboardLayout.c" } { GeeList* _item_list = NULL; - GdkRectangle _tmp9_; - GeeList* _tmp10_; + GdkRectangle _tmp8_; + GeeList* _tmp9_; gint _item_size = 0; - GeeList* _tmp11_; + GeeList* _tmp10_; + gint _tmp11_; gint _tmp12_; - gint _tmp13_; gint _item_index = 0; -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = self->priv->visible_page; -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp10_ = checkerboard_layout_intersection (self, &_tmp9_); -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _item_list = _tmp10_; -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp11_ = _item_list; -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp13_ = _tmp12_; -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _item_size = _tmp13_; -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp8_ = self->priv->visible_page; +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp9_ = checkerboard_layout_intersection (self, &_tmp8_); +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _item_list = _tmp9_; +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp10_ = _item_list; +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp11_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp12_ = _tmp11_; +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _item_size = _tmp12_; +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _item_index = -1; -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" while (TRUE) { -#line 11305 "CheckerboardLayout.c" +#line 10953 "CheckerboardLayout.c" + gint _tmp13_; gint _tmp14_; gint _tmp15_; - gint _tmp16_; CheckerboardItem* item = NULL; - GeeList* _tmp17_; - gint _tmp18_; - gpointer _tmp19_; - GdkRGBA _tmp20_ = {0}; - CheckerboardItem* _tmp21_; - gboolean _tmp22_; - CheckerboardItem* _tmp25_; - cairo_t* _tmp26_; - GdkRGBA _tmp27_; - GdkRGBA _tmp28_; - GdkRGBA _tmp29_; -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GeeList* _tmp16_; + gint _tmp17_; + gpointer _tmp18_; + GdkRGBA _tmp19_ = {0}; + CheckerboardItem* _tmp20_; + CheckerboardItem* _tmp23_; + GdkRGBA _tmp24_; + GdkRGBA _tmp25_; + GdkRGBA _tmp26_; +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp13_ = _item_index; +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _item_index = _tmp13_ + 1; +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp14_ = _item_index; -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _item_index = _tmp14_ + 1; -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp15_ = _item_index; -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp16_ = _item_size; -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (!(_tmp15_ < _tmp16_)) { -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp15_ = _item_size; +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (!(_tmp14_ < _tmp15_)) { +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" break; -#line 11333 "CheckerboardLayout.c" +#line 10979 "CheckerboardLayout.c" } -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp17_ = _item_list; -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp18_ = _item_index; -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp19_ = gee_list_get (_tmp17_, _tmp18_); -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - item = (CheckerboardItem*) _tmp19_; -#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp21_ = item; -#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp22_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_VIEW, DataView)); -#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp22_) { -#line 11349 "CheckerboardLayout.c" - GdkRGBA _tmp23_; -#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp23_ = self->priv->selected_color; -#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp20_ = _tmp23_; -#line 11355 "CheckerboardLayout.c" +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp16_ = _item_list; +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp17_ = _item_index; +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp18_ = gee_list_get (_tmp16_, _tmp17_); +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + item = (CheckerboardItem*) _tmp18_; +#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp20_ = item; +#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_VIEW, DataView))) { +#line 10993 "CheckerboardLayout.c" + GdkRGBA _tmp21_; +#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp21_ = self->priv->selected_color; +#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp19_ = _tmp21_; +#line 10999 "CheckerboardLayout.c" } else { - GdkRGBA _tmp24_; -#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp24_ = self->priv->unselected_color; -#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp20_ = _tmp24_; -#line 11362 "CheckerboardLayout.c" + GdkRGBA _tmp22_; +#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp22_ = self->priv->unselected_color; +#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp19_ = _tmp22_; +#line 11006 "CheckerboardLayout.c" } -#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp25_ = item; -#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp26_ = ctx; -#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp27_ = self->priv->bg_color; -#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp28_ = self->priv->unselected_color; -#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp29_ = self->priv->border_color; -#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_item_paint (_tmp25_, _tmp26_, &_tmp27_, &_tmp20_, &_tmp28_, &_tmp29_); -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp23_ = item; +#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp24_ = self->priv->bg_color; +#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp25_ = self->priv->unselected_color; +#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp26_ = self->priv->border_color; +#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_item_paint (_tmp23_, ctx, &_tmp24_, &_tmp19_, &_tmp25_, &_tmp26_); +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (item); -#line 11378 "CheckerboardLayout.c" +#line 11020 "CheckerboardLayout.c" } -#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (_item_list); -#line 11382 "CheckerboardLayout.c" +#line 11024 "CheckerboardLayout.c" } } else { PangoLayout* pango_layout = NULL; - const gchar* _tmp30_; - PangoLayout* _tmp31_; + const gchar* _tmp27_; + PangoLayout* _tmp28_; gint text_width = 0; gint text_height = 0; - PangoLayout* _tmp32_; - gint _tmp33_ = 0; - gint _tmp34_ = 0; - GtkAllocation _tmp35_ = {0}; + PangoLayout* _tmp29_; + gint _tmp30_ = 0; + gint _tmp31_ = 0; + GtkAllocation _tmp32_ = {0}; gint x = 0; - GtkAllocation _tmp36_; + GtkAllocation _tmp33_; + gint _tmp34_; + gint _tmp35_; + gint _tmp36_ = 0; gint _tmp37_; - gint _tmp38_; - gint _tmp39_ = 0; - gint _tmp40_; gint y = 0; - GtkAllocation _tmp42_; + GtkAllocation _tmp39_; + gint _tmp40_; + gint _tmp41_; + gint _tmp42_ = 0; gint _tmp43_; - gint _tmp44_; - gint _tmp45_ = 0; - gint _tmp46_; - cairo_t* _tmp48_; + GdkRGBA _tmp45_; + gdouble _tmp46_; + GdkRGBA _tmp47_; + gdouble _tmp48_; GdkRGBA _tmp49_; gdouble _tmp50_; - GdkRGBA _tmp51_; - gdouble _tmp52_; - GdkRGBA _tmp53_; - gdouble _tmp54_; - cairo_t* _tmp55_; - gint _tmp56_; - gint _tmp57_; - cairo_t* _tmp58_; - PangoLayout* _tmp59_; -#line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp30_ = self->priv->message; -#line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp31_ = gtk_widget_create_pango_layout (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp30_); -#line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - pango_layout = _tmp31_; -#line 1949 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp32_ = pango_layout; -#line 1949 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - pango_layout_get_pixel_size (_tmp32_, &_tmp33_, &_tmp34_); -#line 1949 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - text_width = _tmp33_; -#line 1949 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - text_height = _tmp34_; -#line 1951 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp35_); -#line 1951 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - allocation = _tmp35_; -#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp36_ = allocation; -#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp37_ = _tmp36_.width; -#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp38_ = text_width; -#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - x = _tmp37_ - _tmp38_; -#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp40_ = x; -#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp40_ > 0) { -#line 11448 "CheckerboardLayout.c" - gint _tmp41_; -#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp41_ = x; -#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp39_ = _tmp41_ / 2; -#line 11454 "CheckerboardLayout.c" - } else { -#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp39_ = 0; -#line 11458 "CheckerboardLayout.c" - } -#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - x = _tmp39_; -#line 1956 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp42_ = allocation; -#line 1956 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp43_ = _tmp42_.height; -#line 1956 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp44_ = text_height; -#line 1956 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - y = _tmp43_ - _tmp44_; -#line 1957 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp46_ = y; -#line 1957 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp46_ > 0) { -#line 11474 "CheckerboardLayout.c" - gint _tmp47_; -#line 1957 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp47_ = y; -#line 1957 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp45_ = _tmp47_ / 2; -#line 11480 "CheckerboardLayout.c" - } else { -#line 1957 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp45_ = 0; -#line 11484 "CheckerboardLayout.c" - } -#line 1957 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - y = _tmp45_; -#line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp48_ = ctx; -#line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp49_ = self->priv->unselected_color; -#line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp50_ = _tmp49_.red; -#line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp51_ = self->priv->unselected_color; -#line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp52_ = _tmp51_.green; + gint _tmp51_; + gint _tmp52_; + PangoLayout* _tmp53_; #line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp53_ = self->priv->unselected_color; + _tmp27_ = self->priv->message; #line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp54_ = _tmp53_.blue; + _tmp28_ = gtk_widget_create_pango_layout (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp27_); #line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_set_source_rgb (_tmp48_, _tmp50_, _tmp52_, _tmp54_); -#line 1960 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp55_ = ctx; -#line 1960 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp56_ = x; -#line 1960 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp57_ = y; -#line 1960 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_move_to (_tmp55_, (gdouble) _tmp56_, (gdouble) _tmp57_); + pango_layout = _tmp28_; #line 1961 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp58_ = ctx; + _tmp29_ = pango_layout; #line 1961 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp59_ = pango_layout; + pango_layout_get_pixel_size (_tmp29_, &_tmp30_, &_tmp31_); #line 1961 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - pango_cairo_show_layout (_tmp58_, _tmp59_); -#line 1932 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + text_width = _tmp30_; +#line 1961 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + text_height = _tmp31_; +#line 1963 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp32_); +#line 1963 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + allocation = _tmp32_; +#line 1965 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp33_ = allocation; +#line 1965 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp34_ = _tmp33_.width; +#line 1965 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp35_ = text_width; +#line 1965 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + x = _tmp34_ - _tmp35_; +#line 1966 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp37_ = x; +#line 1966 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp37_ > 0) { +#line 11087 "CheckerboardLayout.c" + gint _tmp38_; +#line 1966 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp38_ = x; +#line 1966 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp36_ = _tmp38_ / 2; +#line 11093 "CheckerboardLayout.c" + } else { +#line 1966 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp36_ = 0; +#line 11097 "CheckerboardLayout.c" + } +#line 1966 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + x = _tmp36_; +#line 1968 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp39_ = allocation; +#line 1968 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp40_ = _tmp39_.height; +#line 1968 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp41_ = text_height; +#line 1968 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + y = _tmp40_ - _tmp41_; +#line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp43_ = y; +#line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp43_ > 0) { +#line 11113 "CheckerboardLayout.c" + gint _tmp44_; +#line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp44_ = y; +#line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp42_ = _tmp44_ / 2; +#line 11119 "CheckerboardLayout.c" + } else { +#line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp42_ = 0; +#line 11123 "CheckerboardLayout.c" + } +#line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + y = _tmp42_; +#line 1971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp45_ = self->priv->unselected_color; +#line 1971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp46_ = _tmp45_.red; +#line 1971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp47_ = self->priv->unselected_color; +#line 1971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp48_ = _tmp47_.green; +#line 1971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp49_ = self->priv->unselected_color; +#line 1971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp50_ = _tmp49_.blue; +#line 1971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_set_source_rgb (ctx, _tmp46_, _tmp48_, _tmp50_); +#line 1972 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp51_ = x; +#line 1972 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp52_ = y; +#line 1972 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_move_to (ctx, (gdouble) _tmp51_, (gdouble) _tmp52_); +#line 1973 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp53_ = pango_layout; +#line 1973 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + pango_cairo_show_layout (ctx, _tmp53_); +#line 1944 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (pango_layout); -#line 11520 "CheckerboardLayout.c" +#line 11153 "CheckerboardLayout.c" } -#line 1964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1976 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (GTK_WIDGET_CLASS (checkerboard_layout_parent_class)->draw != NULL) { -#line 11524 "CheckerboardLayout.c" - cairo_t* _tmp61_; - gboolean _tmp62_; -#line 1964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp61_ = ctx; -#line 1964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp62_ = GTK_WIDGET_CLASS (checkerboard_layout_parent_class)->draw (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), _tmp61_); -#line 1964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp60_ = _tmp62_; -#line 11533 "CheckerboardLayout.c" +#line 1976 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp54_ = GTK_WIDGET_CLASS (checkerboard_layout_parent_class)->draw (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), ctx); +#line 11159 "CheckerboardLayout.c" } else { -#line 1964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp60_ = TRUE; -#line 11537 "CheckerboardLayout.c" - } -#line 1964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _result_ = _tmp60_; -#line 1967 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp63_ = ctx; -#line 1967 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - checkerboard_layout_draw_selection_band (self, _tmp63_); -#line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1976 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp54_ = TRUE; +#line 11163 "CheckerboardLayout.c" + } +#line 1976 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _result_ = _tmp54_; +#line 1979 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + checkerboard_layout_draw_selection_band (self, ctx); +#line 1981 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" result = _result_; -#line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1981 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 11549 "CheckerboardLayout.c" +#line 11173 "CheckerboardLayout.c" } -static void checkerboard_layout_draw_selection_band (CheckerboardLayout* self, cairo_t* ctx) { +static void +checkerboard_layout_draw_selection_band (CheckerboardLayout* self, + cairo_t* ctx) +{ gboolean _tmp0_ = FALSE; GdkRectangle _tmp1_; gint _tmp2_; @@ -11566,632 +11193,633 @@ static void checkerboard_layout_draw_selection_band (CheckerboardLayout* self, c gboolean _tmp13_ = FALSE; GdkRectangle _tmp14_; gint _tmp15_; - cairo_t* _tmp35_; - cairo_t* _tmp36_; - cairo_t* _tmp37_; - GdkRGBA _tmp38_; - gdouble _tmp39_; - GdkRGBA _tmp40_; - gdouble _tmp41_; - GdkRGBA _tmp42_; - gdouble _tmp43_; - cairo_t* _tmp44_; - GdkRectangle _tmp45_; - gint _tmp46_; - GdkRectangle _tmp47_; - gint _tmp48_; - GdkRectangle _tmp49_; - gint _tmp50_; - GdkRectangle _tmp51_; - gint _tmp52_; - cairo_t* _tmp53_; -#line 1972 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + GdkRGBA _tmp32_; + gdouble _tmp33_; + GdkRGBA _tmp34_; + gdouble _tmp35_; + GdkRGBA _tmp36_; + gdouble _tmp37_; + GdkRectangle _tmp38_; + gint _tmp39_; + GdkRectangle _tmp40_; + gint _tmp41_; + GdkRectangle _tmp42_; + gint _tmp43_; + GdkRectangle _tmp44_; + gint _tmp45_; +#line 1984 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 1972 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1984 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (ctx != NULL); -#line 1974 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1986 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = self->priv->selection_band; -#line 1974 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1986 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = _tmp1_.width; -#line 1974 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1986 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp2_ <= 1) { -#line 1974 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1986 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = TRUE; -#line 11600 "CheckerboardLayout.c" +#line 11222 "CheckerboardLayout.c" } else { GdkRectangle _tmp3_; gint _tmp4_; -#line 1974 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1986 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp3_ = self->priv->selection_band; -#line 1974 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1986 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp4_ = _tmp3_.height; -#line 1974 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1986 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = _tmp4_ <= 1; -#line 11610 "CheckerboardLayout.c" +#line 11232 "CheckerboardLayout.c" } -#line 1974 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1986 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp0_) { -#line 1975 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 11616 "CheckerboardLayout.c" +#line 11238 "CheckerboardLayout.c" } -#line 1978 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp6_ = self->priv->hadjustment; -#line 1978 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp6_ == NULL) { -#line 1978 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp5_ = TRUE; -#line 11624 "CheckerboardLayout.c" +#line 11246 "CheckerboardLayout.c" } else { GtkAdjustment* _tmp7_; -#line 1978 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp7_ = self->priv->vadjustment; -#line 1978 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp5_ = _tmp7_ == NULL; -#line 11631 "CheckerboardLayout.c" +#line 11253 "CheckerboardLayout.c" } -#line 1978 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp5_) { -#line 1979 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1991 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return; -#line 11637 "CheckerboardLayout.c" +#line 11259 "CheckerboardLayout.c" } -#line 1982 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1994 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp8_ = self->priv->hadjustment; -#line 1982 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1994 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp9_ = self->priv->vadjustment; -#line 1982 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1994 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" get_adjustment_page (_tmp8_, _tmp9_, &_tmp10_); -#line 1982 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1994 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" visible_page = _tmp10_; -#line 1983 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1995 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" memset (&visible_band, 0, sizeof (GdkRectangle)); -#line 1984 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1996 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp11_ = self->priv->selection_band; -#line 1984 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1996 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" gdk_rectangle_intersect (&visible_page, &_tmp11_, &_tmp12_); -#line 1984 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1996 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" visible_band = _tmp12_; -#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1999 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp14_ = visible_band; -#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1999 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp15_ = _tmp14_.width; -#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1999 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp15_ > 1) { -#line 11661 "CheckerboardLayout.c" +#line 11283 "CheckerboardLayout.c" GdkRectangle _tmp16_; gint _tmp17_; -#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1999 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp16_ = visible_band; -#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1999 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp17_ = _tmp16_.height; -#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1999 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp13_ = _tmp17_ > 1; -#line 11670 "CheckerboardLayout.c" +#line 11292 "CheckerboardLayout.c" } else { -#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1999 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp13_ = FALSE; -#line 11674 "CheckerboardLayout.c" +#line 11296 "CheckerboardLayout.c" } -#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 1999 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp13_) { -#line 11678 "CheckerboardLayout.c" - cairo_t* _tmp18_; - GdkRGBA _tmp19_; - gdouble _tmp20_; - GdkRGBA _tmp21_; - gdouble _tmp22_; - GdkRGBA _tmp23_; - gdouble _tmp24_; - cairo_t* _tmp25_; +#line 11300 "CheckerboardLayout.c" + GdkRGBA _tmp18_; + gdouble _tmp19_; + GdkRGBA _tmp20_; + gdouble _tmp21_; + GdkRGBA _tmp22_; + gdouble _tmp23_; + GdkRectangle _tmp24_; + gint _tmp25_; GdkRectangle _tmp26_; gint _tmp27_; GdkRectangle _tmp28_; gint _tmp29_; GdkRectangle _tmp30_; gint _tmp31_; - GdkRectangle _tmp32_; - gint _tmp33_; - cairo_t* _tmp34_; -#line 1988 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp18_ = ctx; -#line 1988 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp19_ = self->priv->selected_color; -#line 1988 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp20_ = _tmp19_.red; -#line 1988 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp21_ = self->priv->selected_color; -#line 1988 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp22_ = _tmp21_.green; -#line 1988 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp23_ = self->priv->selected_color; -#line 1988 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp24_ = _tmp23_.blue; -#line 1988 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_set_source_rgba (_tmp18_, _tmp20_, _tmp22_, _tmp24_, CHECKERBOARD_LAYOUT_SELECTION_ALPHA); -#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp25_ = ctx; -#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp26_ = visible_band; -#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp27_ = _tmp26_.x; -#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp28_ = visible_band; -#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp29_ = _tmp28_.y; -#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp30_ = visible_band; -#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp31_ = _tmp30_.width; -#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp32_ = visible_band; -#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp33_ = _tmp32_.height; -#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_rectangle (_tmp25_, (gdouble) _tmp27_, (gdouble) _tmp29_, (gdouble) _tmp31_, (gdouble) _tmp33_); -#line 1992 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp34_ = ctx; -#line 1992 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_fill (_tmp34_); -#line 11736 "CheckerboardLayout.c" - } -#line 1998 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp35_ = ctx; -#line 1998 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_set_line_width (_tmp35_, 1.0); -#line 1999 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp36_ = ctx; -#line 1999 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_set_line_cap (_tmp36_, CAIRO_LINE_CAP_SQUARE); -#line 2000 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp37_ = ctx; #line 2000 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp38_ = self->priv->selected_color; + _tmp18_ = self->priv->selected_color; #line 2000 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp39_ = _tmp38_.red; + _tmp19_ = _tmp18_.red; #line 2000 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp40_ = self->priv->selected_color; + _tmp20_ = self->priv->selected_color; #line 2000 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp41_ = _tmp40_.green; + _tmp21_ = _tmp20_.green; #line 2000 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp42_ = self->priv->selected_color; + _tmp22_ = self->priv->selected_color; #line 2000 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp43_ = _tmp42_.blue; + _tmp23_ = _tmp22_.blue; #line 2000 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_set_source_rgb (_tmp37_, _tmp39_, _tmp41_, _tmp43_); -#line 2001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp44_ = ctx; -#line 2001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp45_ = self->priv->selection_band; -#line 2001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp46_ = _tmp45_.x; -#line 2001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp47_ = self->priv->selection_band; -#line 2001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp48_ = _tmp47_.y; -#line 2001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp49_ = self->priv->selection_band; -#line 2001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp50_ = _tmp49_.width; -#line 2001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp51_ = self->priv->selection_band; -#line 2001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp52_ = _tmp51_.height; -#line 2001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_rectangle (_tmp44_, ((gdouble) _tmp46_) + 0.5, ((gdouble) _tmp48_) + 0.5, ((gdouble) _tmp50_) - 1.0, ((gdouble) _tmp52_) - 1.0); -#line 2003 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp53_ = ctx; -#line 2003 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - cairo_stroke (_tmp53_); -#line 11786 "CheckerboardLayout.c" -} - - -static gboolean checkerboard_layout_real_query_tooltip (GtkWidget* base, gint x, gint y, gboolean keyboard_mode, GtkTooltip* tooltip) { + cairo_set_source_rgba (ctx, _tmp19_, _tmp21_, _tmp23_, CHECKERBOARD_LAYOUT_SELECTION_ALPHA); +#line 2002 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp24_ = visible_band; +#line 2002 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp25_ = _tmp24_.x; +#line 2002 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp26_ = visible_band; +#line 2002 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp27_ = _tmp26_.y; +#line 2002 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp28_ = visible_band; +#line 2002 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp29_ = _tmp28_.width; +#line 2002 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp30_ = visible_band; +#line 2002 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp31_ = _tmp30_.height; +#line 2002 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_rectangle (ctx, (gdouble) _tmp25_, (gdouble) _tmp27_, (gdouble) _tmp29_, (gdouble) _tmp31_); +#line 2004 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_fill (ctx); +#line 11349 "CheckerboardLayout.c" + } +#line 2010 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_set_line_width (ctx, 1.0); +#line 2011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_set_line_cap (ctx, CAIRO_LINE_CAP_SQUARE); +#line 2012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp32_ = self->priv->selected_color; +#line 2012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp33_ = _tmp32_.red; +#line 2012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp34_ = self->priv->selected_color; +#line 2012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp35_ = _tmp34_.green; +#line 2012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp36_ = self->priv->selected_color; +#line 2012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp37_ = _tmp36_.blue; +#line 2012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_set_source_rgb (ctx, _tmp33_, _tmp35_, _tmp37_); +#line 2013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp38_ = self->priv->selection_band; +#line 2013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp39_ = _tmp38_.x; +#line 2013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp40_ = self->priv->selection_band; +#line 2013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp41_ = _tmp40_.y; +#line 2013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp42_ = self->priv->selection_band; +#line 2013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp43_ = _tmp42_.width; +#line 2013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp44_ = self->priv->selection_band; +#line 2013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp45_ = _tmp44_.height; +#line 2013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_rectangle (ctx, ((gdouble) _tmp39_) + 0.5, ((gdouble) _tmp41_) + 0.5, ((gdouble) _tmp43_) - 1.0, ((gdouble) _tmp45_) - 1.0); +#line 2015 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + cairo_stroke (ctx); +#line 11389 "CheckerboardLayout.c" +} + + +static gboolean +checkerboard_layout_real_query_tooltip (GtkWidget* base, + gint x, + gint y, + gboolean keyboard_mode, + GtkTooltip* tooltip) +{ CheckerboardLayout * self; gboolean result = FALSE; CheckerboardItem* item = NULL; - gint _tmp0_; - gint _tmp1_; + CheckerboardItem* _tmp0_; + gboolean _tmp1_ = FALSE; CheckerboardItem* _tmp2_; - gboolean _tmp3_ = FALSE; - CheckerboardItem* _tmp4_; -#line 2006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayout); -#line 2006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (GTK_IS_TOOLTIP (tooltip), FALSE); -#line 2007 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = x; -#line 2007 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = y; -#line 2007 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = checkerboard_layout_get_item_at_pixel (self, (gdouble) _tmp0_, (gdouble) _tmp1_); -#line 2007 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - item = _tmp2_; -#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = item; -#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - if (_tmp4_ != NULL) { -#line 11815 "CheckerboardLayout.c" - CheckerboardItem* _tmp5_; - gint _tmp6_; - gint _tmp7_; - GtkTooltip* _tmp8_; - gboolean _tmp9_; -#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp5_ = item; -#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp6_ = x; -#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp7_ = y; -#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp8_ = tooltip; -#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp9_ = checkerboard_item_query_tooltip (_tmp5_, _tmp6_, _tmp7_, _tmp8_); -#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = _tmp9_; -#line 11833 "CheckerboardLayout.c" +#line 2019 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = checkerboard_layout_get_item_at_pixel (self, (gdouble) x, (gdouble) y); +#line 2019 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + item = _tmp0_; +#line 2021 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp2_ = item; +#line 2021 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + if (_tmp2_ != NULL) { +#line 11418 "CheckerboardLayout.c" + CheckerboardItem* _tmp3_; +#line 2021 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp3_ = item; +#line 2021 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1_ = checkerboard_item_query_tooltip (_tmp3_, x, y, tooltip); +#line 11424 "CheckerboardLayout.c" } else { -#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = FALSE; -#line 11837 "CheckerboardLayout.c" +#line 2021 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp1_ = FALSE; +#line 11428 "CheckerboardLayout.c" } -#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - result = _tmp3_; -#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2021 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + result = _tmp1_; +#line 2021 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (item); -#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2021 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 11845 "CheckerboardLayout.c" +#line 11436 "CheckerboardLayout.c" } -static void checkerboard_layout_on_colors_changed (CheckerboardLayout* self) { +static void +checkerboard_layout_on_colors_changed (CheckerboardLayout* self) +{ ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; GdkRGBA _tmp2_ = {0}; -#line 2012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2024 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self)); -#line 2013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" invalidate_transparent_background (); -#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2026 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = config_facade_get_instance (); -#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2026 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = _tmp0_; -#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2026 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" config_facade_get_bg_color (_tmp1_, &_tmp2_); -#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2026 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" gtk_widget_override_background_color (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), GTK_STATE_FLAG_NORMAL, &_tmp2_); -#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2026 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (_tmp1_); -#line 2015 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2027 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_set_colors (self, TRUE); -#line 11869 "CheckerboardLayout.c" +#line 11462 "CheckerboardLayout.c" } -static gboolean checkerboard_layout_real_focus_in_event (GtkWidget* base, GdkEventFocus* event) { +static gboolean +checkerboard_layout_real_focus_in_event (GtkWidget* base, + GdkEventFocus* event) +{ CheckerboardLayout * self; gboolean result = FALSE; ViewCollection* _tmp0_; GeeList* _tmp1_; GeeList* _tmp2_; - GdkEventFocus* _tmp3_; - gboolean _tmp4_; -#line 2018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2030 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayout); -#line 2018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2030 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 2019 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2031 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_set_colors (self, TRUE); -#line 2020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2032 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->view; -#line 2020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2032 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = view_collection_get_selected (_tmp0_); -#line 2020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2032 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = _tmp1_; -#line 2020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2032 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_items_dirty (self, "focus_in_event", G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 2020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2032 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (_tmp2_); -#line 2022 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = event; -#line 2022 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = GTK_WIDGET_CLASS (checkerboard_layout_parent_class)->focus_in_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), _tmp3_); -#line 2022 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - result = _tmp4_; -#line 2022 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + result = GTK_WIDGET_CLASS (checkerboard_layout_parent_class)->focus_in_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), event); +#line 2034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 11905 "CheckerboardLayout.c" +#line 11495 "CheckerboardLayout.c" } -static gboolean checkerboard_layout_real_focus_out_event (GtkWidget* base, GdkEventFocus* event) { +static gboolean +checkerboard_layout_real_focus_out_event (GtkWidget* base, + GdkEventFocus* event) +{ CheckerboardLayout * self; gboolean result = FALSE; ViewCollection* _tmp0_; GeeList* _tmp1_; GeeList* _tmp2_; - GdkEventFocus* _tmp3_; - gboolean _tmp4_; -#line 2025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2037 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayout); -#line 2025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2037 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 2026 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2038 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_set_colors (self, FALSE); -#line 2027 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2039 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->view; -#line 2027 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2039 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = view_collection_get_selected (_tmp0_); -#line 2027 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2039 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = _tmp1_; -#line 2027 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2039 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_items_dirty (self, "focus_out_event", G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 2027 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2039 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (_tmp2_); -#line 2029 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = event; -#line 2029 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp4_ = GTK_WIDGET_CLASS (checkerboard_layout_parent_class)->focus_out_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), _tmp3_); -#line 2029 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - result = _tmp4_; -#line 2029 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 2041 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + result = GTK_WIDGET_CLASS (checkerboard_layout_parent_class)->focus_out_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), event); +#line 2041 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return result; -#line 11941 "CheckerboardLayout.c" +#line 11528 "CheckerboardLayout.c" } -static CheckerboardLayoutLayoutRow* checkerboard_layout_layout_row_construct (GType object_type, gint y, gint height, gint num_in_row) { +static CheckerboardLayoutLayoutRow* +checkerboard_layout_layout_row_construct (GType object_type, + gint y, + gint height, + gint num_in_row) +{ CheckerboardLayoutLayoutRow* self = NULL; - gint _tmp0_; - gint _tmp1_; - gint _tmp2_; - CheckerboardItem** _tmp3_; -#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + CheckerboardItem** _tmp0_; +#line 847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self = (CheckerboardLayoutLayoutRow*) g_type_create_instance (object_type); -#line 839 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp0_ = y; -#line 839 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->y = _tmp0_; -#line 840 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp1_ = height; -#line 840 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->height = _tmp1_; -#line 841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp2_ = num_in_row; -#line 841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - _tmp3_ = g_new0 (CheckerboardItem*, _tmp2_ + 1); -#line 841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 848 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->y = y; +#line 849 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->height = height; +#line 850 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + _tmp0_ = g_new0 (CheckerboardItem*, num_in_row + 1); +#line 850 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->items = (_vala_array_free (self->items, self->items_length1, (GDestroyNotify) g_object_unref), NULL); -#line 841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->items = _tmp3_; -#line 841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" - self->items_length1 = _tmp2_; -#line 841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 850 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->items = _tmp0_; +#line 850 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" + self->items_length1 = num_in_row; +#line 850 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->_items_size_ = self->items_length1; -#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return self; -#line 11975 "CheckerboardLayout.c" +#line 11558 "CheckerboardLayout.c" } -static CheckerboardLayoutLayoutRow* checkerboard_layout_layout_row_new (gint y, gint height, gint num_in_row) { -#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static CheckerboardLayoutLayoutRow* +checkerboard_layout_layout_row_new (gint y, + gint height, + gint num_in_row) +{ +#line 847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return checkerboard_layout_layout_row_construct (CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW, y, height, num_in_row); -#line 11982 "CheckerboardLayout.c" +#line 11569 "CheckerboardLayout.c" } -static void checkerboard_layout_value_layout_row_init (GValue* value) { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +checkerboard_layout_value_layout_row_init (GValue* value) +{ +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" value->data[0].v_pointer = NULL; -#line 11989 "CheckerboardLayout.c" +#line 11578 "CheckerboardLayout.c" } -static void checkerboard_layout_value_layout_row_free_value (GValue* value) { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +checkerboard_layout_value_layout_row_free_value (GValue* value) +{ +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (value->data[0].v_pointer) { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_layout_row_unref (value->data[0].v_pointer); -#line 11998 "CheckerboardLayout.c" +#line 11589 "CheckerboardLayout.c" } } -static void checkerboard_layout_value_layout_row_copy_value (const GValue* src_value, GValue* dest_value) { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +checkerboard_layout_value_layout_row_copy_value (const GValue* src_value, + GValue* dest_value) +{ +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (src_value->data[0].v_pointer) { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" dest_value->data[0].v_pointer = checkerboard_layout_layout_row_ref (src_value->data[0].v_pointer); -#line 12008 "CheckerboardLayout.c" +#line 11602 "CheckerboardLayout.c" } else { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" dest_value->data[0].v_pointer = NULL; -#line 12012 "CheckerboardLayout.c" +#line 11606 "CheckerboardLayout.c" } } -static gpointer checkerboard_layout_value_layout_row_peek_pointer (const GValue* value) { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static gpointer +checkerboard_layout_value_layout_row_peek_pointer (const GValue* value) +{ +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return value->data[0].v_pointer; -#line 12020 "CheckerboardLayout.c" +#line 11616 "CheckerboardLayout.c" } -static gchar* checkerboard_layout_value_layout_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static gchar* +checkerboard_layout_value_layout_row_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (collect_values[0].v_pointer) { -#line 12027 "CheckerboardLayout.c" +#line 11628 "CheckerboardLayout.c" CheckerboardLayoutLayoutRow * object; object = collect_values[0].v_pointer; -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (object->parent_instance.g_class == NULL) { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 12034 "CheckerboardLayout.c" +#line 11635 "CheckerboardLayout.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 12038 "CheckerboardLayout.c" +#line 11639 "CheckerboardLayout.c" } -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" value->data[0].v_pointer = checkerboard_layout_layout_row_ref (object); -#line 12042 "CheckerboardLayout.c" +#line 11643 "CheckerboardLayout.c" } else { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" value->data[0].v_pointer = NULL; -#line 12046 "CheckerboardLayout.c" +#line 11647 "CheckerboardLayout.c" } -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return NULL; -#line 12050 "CheckerboardLayout.c" +#line 11651 "CheckerboardLayout.c" } -static gchar* checkerboard_layout_value_layout_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +checkerboard_layout_value_layout_row_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ CheckerboardLayoutLayoutRow ** object_p; object_p = collect_values[0].v_pointer; -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (!object_p) { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 12061 "CheckerboardLayout.c" +#line 11667 "CheckerboardLayout.c" } -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (!value->data[0].v_pointer) { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" *object_p = NULL; -#line 12067 "CheckerboardLayout.c" +#line 11673 "CheckerboardLayout.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" *object_p = value->data[0].v_pointer; -#line 12071 "CheckerboardLayout.c" +#line 11677 "CheckerboardLayout.c" } else { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" *object_p = checkerboard_layout_layout_row_ref (value->data[0].v_pointer); -#line 12075 "CheckerboardLayout.c" +#line 11681 "CheckerboardLayout.c" } -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return NULL; -#line 12079 "CheckerboardLayout.c" +#line 11685 "CheckerboardLayout.c" } -static GParamSpec* checkerboard_layout_param_spec_layout_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +static GParamSpec* +checkerboard_layout_param_spec_layout_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ CheckerboardLayoutParamSpecLayoutRow* spec; -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (g_type_is_a (object_type, CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW), NULL); -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return G_PARAM_SPEC (spec); -#line 12093 "CheckerboardLayout.c" +#line 11705 "CheckerboardLayout.c" } -static gpointer checkerboard_layout_value_get_layout_row (const GValue* value) { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static gpointer +checkerboard_layout_value_get_layout_row (const GValue* value) +{ +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW), NULL); -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return value->data[0].v_pointer; -#line 12102 "CheckerboardLayout.c" +#line 11716 "CheckerboardLayout.c" } -static void checkerboard_layout_value_set_layout_row (GValue* value, gpointer v_object) { +static void +checkerboard_layout_value_set_layout_row (GValue* value, + gpointer v_object) +{ CheckerboardLayoutLayoutRow * old; -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW)); -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" old = value->data[0].v_pointer; -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (v_object) { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW)); -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" value->data[0].v_pointer = v_object; -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_layout_row_ref (value->data[0].v_pointer); -#line 12122 "CheckerboardLayout.c" +#line 11739 "CheckerboardLayout.c" } else { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" value->data[0].v_pointer = NULL; -#line 12126 "CheckerboardLayout.c" +#line 11743 "CheckerboardLayout.c" } -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (old) { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_layout_row_unref (old); -#line 12132 "CheckerboardLayout.c" +#line 11749 "CheckerboardLayout.c" } } -static void checkerboard_layout_value_take_layout_row (GValue* value, gpointer v_object) { +static void +checkerboard_layout_value_take_layout_row (GValue* value, + gpointer v_object) +{ CheckerboardLayoutLayoutRow * old; -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW)); -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" old = value->data[0].v_pointer; -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (v_object) { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW)); -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" value->data[0].v_pointer = v_object; -#line 12151 "CheckerboardLayout.c" +#line 11771 "CheckerboardLayout.c" } else { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" value->data[0].v_pointer = NULL; -#line 12155 "CheckerboardLayout.c" +#line 11775 "CheckerboardLayout.c" } -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (old) { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_layout_row_unref (old); -#line 12161 "CheckerboardLayout.c" +#line 11781 "CheckerboardLayout.c" } } -static void checkerboard_layout_layout_row_class_init (CheckerboardLayoutLayoutRowClass * klass) { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +checkerboard_layout_layout_row_class_init (CheckerboardLayoutLayoutRowClass * klass) +{ +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_layout_row_parent_class = g_type_class_peek_parent (klass); -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" ((CheckerboardLayoutLayoutRowClass *) klass)->finalize = checkerboard_layout_layout_row_finalize; -#line 12171 "CheckerboardLayout.c" +#line 11793 "CheckerboardLayout.c" } -static void checkerboard_layout_layout_row_instance_init (CheckerboardLayoutLayoutRow * self) { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +checkerboard_layout_layout_row_instance_init (CheckerboardLayoutLayoutRow * self) +{ +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->ref_count = 1; -#line 12178 "CheckerboardLayout.c" +#line 11802 "CheckerboardLayout.c" } -static void checkerboard_layout_layout_row_finalize (CheckerboardLayoutLayoutRow * obj) { +static void +checkerboard_layout_layout_row_finalize (CheckerboardLayoutLayoutRow * obj) +{ CheckerboardLayoutLayoutRow * self; -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW, CheckerboardLayoutLayoutRow); -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_handlers_destroy (self); -#line 836 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 845 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->items = (_vala_array_free (self->items, self->items_length1, (GDestroyNotify) g_object_unref), NULL); -#line 12190 "CheckerboardLayout.c" +#line 11816 "CheckerboardLayout.c" } -static GType checkerboard_layout_layout_row_get_type (void) { +static GType +checkerboard_layout_layout_row_get_type (void) +{ static volatile gsize checkerboard_layout_layout_row_type_id__volatile = 0; if (g_once_init_enter (&checkerboard_layout_layout_row_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { checkerboard_layout_value_layout_row_init, checkerboard_layout_value_layout_row_free_value, checkerboard_layout_value_layout_row_copy_value, checkerboard_layout_value_layout_row_peek_pointer, "p", checkerboard_layout_value_layout_row_collect_value, "p", checkerboard_layout_value_layout_row_lcopy_value }; @@ -12205,116 +11833,126 @@ static GType checkerboard_layout_layout_row_get_type (void) { } -static gpointer checkerboard_layout_layout_row_ref (gpointer instance) { +static gpointer +checkerboard_layout_layout_row_ref (gpointer instance) +{ CheckerboardLayoutLayoutRow * self; self = instance; -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_atomic_int_inc (&self->ref_count); -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" return instance; -#line 12215 "CheckerboardLayout.c" +#line 11845 "CheckerboardLayout.c" } -static void checkerboard_layout_layout_row_unref (gpointer instance) { +static void +checkerboard_layout_layout_row_unref (gpointer instance) +{ CheckerboardLayoutLayoutRow * self; self = instance; -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" CHECKERBOARD_LAYOUT_LAYOUT_ROW_GET_CLASS (self)->finalize (self); -#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_type_free_instance ((GTypeInstance *) self); -#line 12228 "CheckerboardLayout.c" +#line 11860 "CheckerboardLayout.c" } } -static void checkerboard_layout_class_init (CheckerboardLayoutClass * klass) { -#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +static void +checkerboard_layout_class_init (CheckerboardLayoutClass * klass) +{ +#line 825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" checkerboard_layout_parent_class = g_type_class_peek_parent (klass); -#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_type_class_add_private (klass, sizeof (CheckerboardLayoutPrivate)); -#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" ((GtkWidgetClass *) klass)->map = (void (*) (GtkWidget *)) checkerboard_layout_real_map; -#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" ((GtkWidgetClass *) klass)->size_allocate = (void (*) (GtkWidget *, GtkAllocation*)) checkerboard_layout_real_size_allocate; -#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" ((GtkWidgetClass *) klass)->draw = (gboolean (*) (GtkWidget *, cairo_t*)) checkerboard_layout_real_draw; -#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" ((GtkWidgetClass *) klass)->query_tooltip = (gboolean (*) (GtkWidget *, gint, gint, gboolean, GtkTooltip*)) checkerboard_layout_real_query_tooltip; -#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" ((GtkWidgetClass *) klass)->focus_in_event = (gboolean (*) (GtkWidget *, GdkEventFocus*)) checkerboard_layout_real_focus_in_event; -#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" ((GtkWidgetClass *) klass)->focus_out_event = (gboolean (*) (GtkWidget *, GdkEventFocus*)) checkerboard_layout_real_focus_out_event; -#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" G_OBJECT_CLASS (klass)->finalize = checkerboard_layout_finalize; -#line 12252 "CheckerboardLayout.c" +#line 11886 "CheckerboardLayout.c" } -static void checkerboard_layout_instance_init (CheckerboardLayout * self) { +static void +checkerboard_layout_instance_init (CheckerboardLayout * self) +{ gchar* _tmp0_; GeeHashSet* _tmp1_; -#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv = CHECKERBOARD_LAYOUT_GET_PRIVATE (self); -#line 846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 855 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = g_strdup (""); -#line 846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 855 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->page_name = _tmp0_; -#line 847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 856 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->item_rows = NULL; -#line 847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 856 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->item_rows_length1 = 0; -#line 847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 856 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->_item_rows_size_ = self->priv->item_rows_length1; -#line 848 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 857 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp1_ = gee_hash_set_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); -#line 848 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 857 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->exposed_items = _tmp1_; -#line 849 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 858 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->hadjustment = NULL; -#line 850 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 859 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->vadjustment = NULL; -#line 851 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 860 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->message = NULL; -#line 856 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 865 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" memset (&self->priv->visible_page, 0, sizeof (GdkRectangle)); -#line 857 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 866 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->last_width = 0; -#line 858 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->columns = 0; -#line 859 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 868 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->rows = 0; -#line 860 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 869 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" memset (&self->priv->drag_origin, 0, sizeof (GdkPoint)); -#line 861 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 870 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" memset (&self->priv->drag_endpoint, 0, sizeof (GdkPoint)); -#line 862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 871 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" memset (&self->priv->selection_band, 0, sizeof (GdkRectangle)); -#line 863 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->scale = 0; -#line 864 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->flow_scheduled = FALSE; -#line 865 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->exposure_dirty = TRUE; -#line 866 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 875 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->anchor = NULL; -#line 867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 876 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->cursor = NULL; -#line 868 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 877 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->in_center_on_anchor = FALSE; -#line 869 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 878 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->size_allocate_due_to_reflow = FALSE; -#line 870 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 879 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->is_in_view = FALSE; -#line 871 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->reflow_needed = FALSE; -#line 12313 "CheckerboardLayout.c" +#line 11949 "CheckerboardLayout.c" } -static void checkerboard_layout_finalize (GObject * obj) { +static void +checkerboard_layout_finalize (GObject * obj) +{ CheckerboardLayout * self; ViewCollection* _tmp0_; guint _tmp1_; @@ -12341,147 +11979,149 @@ static void checkerboard_layout_finalize (GObject * obj) { ConfigFacade* _tmp29_; ConfigFacade* _tmp30_; guint _tmp31_; -#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayout); -#line 902 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 911 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp0_ = self->priv->view; -#line 902 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 911 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp1_, NULL, FALSE); -#line 902 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 911 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _checkerboard_layout_on_contents_altered_data_collection_contents_altered, self); -#line 903 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 912 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp2_ = self->priv->view; -#line 903 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 912 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE); -#line 903 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 912 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _checkerboard_layout_on_items_altered_data_collection_items_altered, self); -#line 904 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp4_ = self->priv->view; -#line 904 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp5_, NULL, FALSE); -#line 904 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _checkerboard_layout_on_items_state_changed_view_collection_items_state_changed, self); -#line 905 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 914 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp6_ = self->priv->view; -#line 905 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 914 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp7_, NULL, FALSE); -#line 905 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 914 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _checkerboard_layout_on_items_visibility_changed_view_collection_items_visibility_changed, self); -#line 906 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 915 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp8_ = self->priv->view; -#line 906 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 915 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_parse_name ("ordering-changed", TYPE_DATA_COLLECTION, &_tmp9_, NULL, FALSE); -#line 906 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 915 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _checkerboard_layout_on_ordering_changed_data_collection_ordering_changed, self); -#line 907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 916 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp10_ = self->priv->view; -#line 907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 916 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_parse_name ("views-altered", TYPE_VIEW_COLLECTION, &_tmp11_, NULL, FALSE); -#line 907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 916 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _checkerboard_layout_on_views_altered_view_collection_views_altered, self); -#line 908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 917 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp12_ = self->priv->view; -#line 908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 917 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_parse_name ("geometries-altered", TYPE_VIEW_COLLECTION, &_tmp13_, NULL, FALSE); -#line 908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 917 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _checkerboard_layout_on_geometries_altered_view_collection_geometries_altered, self); -#line 909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp14_ = self->priv->view; -#line 909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_parse_name ("items-selected", TYPE_VIEW_COLLECTION, &_tmp15_, NULL, FALSE); -#line 909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_handlers_disconnect_matched (_tmp14_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _checkerboard_layout_on_items_selection_changed_view_collection_items_selected, self); -#line 910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp16_ = self->priv->view; -#line 910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_parse_name ("items-unselected", TYPE_VIEW_COLLECTION, &_tmp17_, NULL, FALSE); -#line 910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_handlers_disconnect_matched (_tmp16_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _checkerboard_layout_on_items_selection_changed_view_collection_items_unselected, self); -#line 912 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp18_ = self->priv->hadjustment; -#line 912 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp18_ != NULL) { -#line 12404 "CheckerboardLayout.c" +#line 12042 "CheckerboardLayout.c" GtkAdjustment* _tmp19_; guint _tmp20_; -#line 913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 922 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp19_ = self->priv->hadjustment; -#line 913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 922 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_parse_name ("value-changed", gtk_adjustment_get_type (), &_tmp20_, NULL, FALSE); -#line 913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 922 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_handlers_disconnect_matched (_tmp19_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _checkerboard_layout_on_viewport_shifted_gtk_adjustment_value_changed, self); -#line 12413 "CheckerboardLayout.c" +#line 12051 "CheckerboardLayout.c" } -#line 915 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp21_ = self->priv->vadjustment; -#line 915 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp21_ != NULL) { -#line 12419 "CheckerboardLayout.c" +#line 12057 "CheckerboardLayout.c" GtkAdjustment* _tmp22_; guint _tmp23_; -#line 916 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 925 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp22_ = self->priv->vadjustment; -#line 916 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 925 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_parse_name ("value-changed", gtk_adjustment_get_type (), &_tmp23_, NULL, FALSE); -#line 916 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 925 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_handlers_disconnect_matched (_tmp22_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp23_, 0, NULL, (GCallback) _checkerboard_layout_on_viewport_shifted_gtk_adjustment_value_changed, self); -#line 12428 "CheckerboardLayout.c" +#line 12066 "CheckerboardLayout.c" } -#line 918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 927 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp24_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 927 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp25_ = _tmp24_; -#line 918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 927 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" if (_tmp25_ != NULL) { -#line 12436 "CheckerboardLayout.c" +#line 12074 "CheckerboardLayout.c" GtkContainer* _tmp26_; GtkContainer* _tmp27_; guint _tmp28_; -#line 919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 928 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp26_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 928 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp27_ = _tmp26_; -#line 919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 928 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_parse_name ("size-allocate", gtk_widget_get_type (), &_tmp28_, NULL, FALSE); -#line 919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 928 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp28_, 0, NULL, (GCallback) _checkerboard_layout_on_viewport_resized_gtk_widget_size_allocate, self); -#line 12448 "CheckerboardLayout.c" +#line 12086 "CheckerboardLayout.c" } -#line 921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 930 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp29_ = config_facade_get_instance (); -#line 921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 930 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _tmp30_ = _tmp29_; -#line 921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 930 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_parse_name ("colors-changed", CONFIG_TYPE_FACADE, &_tmp31_, NULL, FALSE); -#line 921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 930 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" g_signal_handlers_disconnect_matched (_tmp30_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp31_, 0, NULL, (GCallback) _checkerboard_layout_on_colors_changed_config_facade_colors_changed, self); -#line 921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 930 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (_tmp30_); -#line 845 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 854 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _data_collection_unref0 (self->priv->view); -#line 846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 855 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_free0 (self->priv->page_name); -#line 847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 856 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" self->priv->item_rows = (_vala_array_free (self->priv->item_rows, self->priv->item_rows_length1, (GDestroyNotify) checkerboard_layout_layout_row_unref), NULL); -#line 848 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 857 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->exposed_items); -#line 849 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 858 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->hadjustment); -#line 850 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 859 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->vadjustment); -#line 851 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 860 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_free0 (self->priv->message); -#line 866 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 875 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->anchor); -#line 867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 876 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" _g_object_unref0 (self->priv->cursor); -#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" +#line 825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala" G_OBJECT_CLASS (checkerboard_layout_parent_class)->finalize (obj); -#line 12480 "CheckerboardLayout.c" +#line 12118 "CheckerboardLayout.c" } -GType checkerboard_layout_get_type (void) { +GType +checkerboard_layout_get_type (void) +{ static volatile gsize checkerboard_layout_type_id__volatile = 0; if (g_once_init_enter (&checkerboard_layout_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CheckerboardLayoutClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) checkerboard_layout_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CheckerboardLayout), 0, (GInstanceInitFunc) checkerboard_layout_instance_init, NULL }; @@ -12493,7 +12133,11 @@ GType checkerboard_layout_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -12505,7 +12149,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/CheckerboardLayout.vala b/src/CheckerboardLayout.vala index d508617..0c52748 100644 --- a/src/CheckerboardLayout.vala +++ b/src/CheckerboardLayout.vala @@ -184,6 +184,11 @@ public abstract class CheckerboardItem : ThumbnailView { notify_view_altered(); } } + + public void translate_coordinates(ref int x, ref int y) { + x -= allocation.x + FRAME_WIDTH; + y -= allocation.y + FRAME_WIDTH; + } public void clear_title() { if (title == null) @@ -589,10 +594,13 @@ public abstract class CheckerboardItem : ThumbnailView { public void paint(Cairo.Context ctx, Gdk.RGBA bg_color, Gdk.RGBA selected_color, Gdk.RGBA text_color, Gdk.RGBA? border_color) { + ctx.save(); + ctx.translate(allocation.x + FRAME_WIDTH, + allocation.y + FRAME_WIDTH); // calc the top-left point of the pixbuf Gdk.Point pixbuf_origin = Gdk.Point(); - pixbuf_origin.x = allocation.x + FRAME_WIDTH + BORDER_WIDTH; - pixbuf_origin.y = allocation.y + FRAME_WIDTH + BORDER_WIDTH; + pixbuf_origin.x = BORDER_WIDTH; + pixbuf_origin.y = BORDER_WIDTH; ctx.set_line_width(FRAME_WIDTH); ctx.set_source_rgba(selected_color.red, selected_color.green, selected_color.blue, @@ -646,11 +654,11 @@ public abstract class CheckerboardItem : ThumbnailView { ctx.set_source_rgba(text_color.red, text_color.green, text_color.blue, text_color.alpha); // title and subtitles are LABEL_PADDING below bottom of pixbuf - int text_y = allocation.y + FRAME_WIDTH + pixbuf_dim.height + FRAME_WIDTH + LABEL_PADDING; + int text_y = pixbuf_dim.height + FRAME_WIDTH + LABEL_PADDING; if (title != null && title_visible) { // get the layout sized so its with is no more than the pixbuf's // resize the text width to be no more than the pixbuf's - title.allocation.x = allocation.x + FRAME_WIDTH; + title.allocation.x = 0; title.allocation.y = text_y; title.allocation.width = pixbuf_dim.width; title.allocation.height = title.get_height(); @@ -662,7 +670,7 @@ public abstract class CheckerboardItem : ThumbnailView { } if (comment != null && comment_visible) { - comment.allocation.x = allocation.x + FRAME_WIDTH; + comment.allocation.x = 0; comment.allocation.y = text_y; comment.allocation.width = pixbuf_dim.width; comment.allocation.height = comment.get_height(); @@ -674,7 +682,7 @@ public abstract class CheckerboardItem : ThumbnailView { } if (subtitle != null && subtitle_visible) { - subtitle.allocation.x = allocation.x + FRAME_WIDTH; + subtitle.allocation.x = 0; subtitle.allocation.y = text_y; subtitle.allocation.width = pixbuf_dim.width; subtitle.allocation.height = subtitle.get_height(); @@ -728,6 +736,7 @@ public abstract class CheckerboardItem : ThumbnailView { ctx.rectangle(x, y, trinket.get_width(), trinket.get_height()); ctx.fill(); } + ctx.restore(); } protected void set_horizontal_trinket_offset(int horizontal_trinket_offset) { @@ -1267,6 +1276,9 @@ public class CheckerboardLayout : Gtk.DrawingArea { Pango.Layout? layout = item.get_tag_list_layout(); if (layout == null) return -1; + + item.translate_coordinates(ref x, ref y); + Gdk.Rectangle rect = item.get_subtitle_allocation(); int index, trailing; int px = (x - rect.x) * Pango.SCALE; diff --git a/src/CollectionPage.c b/src/CollectionPage.c index 01e92e8..6086969 100644 --- a/src/CollectionPage.c +++ b/src/CollectionPage.c @@ -1,4 +1,4 @@ -/* CollectionPage.c generated by valac 0.36.6, the Vala compiler +/* CollectionPage.c generated by valac 0.40.4, the Vala compiler * generated from CollectionPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -247,6 +248,11 @@ typedef struct _DefaultSearchViewFilterClass DefaultSearchViewFilterClass; typedef struct _CollectionPageCollectionSearchViewFilter CollectionPageCollectionSearchViewFilter; typedef struct _CollectionPageCollectionSearchViewFilterClass CollectionPageCollectionSearchViewFilterClass; +enum { + COLLECTION_PAGE_0_PROPERTY, + COLLECTION_PAGE_NUM_PROPERTIES +}; +static GParamSpec* collection_page_properties[COLLECTION_PAGE_NUM_PROPERTIES]; #define _exporter_ui_unref0(var) ((var == NULL) ? NULL : (var = (exporter_ui_unref (var), NULL))) #define _view_filter_unref0(var) ((var == NULL) ? NULL : (var = (view_filter_unref (var), NULL))) @@ -1004,9 +1010,15 @@ static gpointer collection_page_collection_search_view_filter_parent_class = NUL gpointer view_manager_ref (gpointer instance); void view_manager_unref (gpointer instance); -GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_manager (GValue* value, gpointer v_object); -void value_take_view_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_manager (GValue* value, + gpointer v_object); +void value_take_view_manager (GValue* value, + gpointer v_object); gpointer value_get_view_manager (const GValue* value); GType view_manager_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; @@ -1018,22 +1030,28 @@ GType checkerboard_page_get_type (void) G_GNUC_CONST; GType media_page_get_type (void) G_GNUC_CONST; GType collection_page_get_type (void) G_GNUC_CONST; #define COLLECTION_VIEW_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManagerPrivate)) -enum { - COLLECTION_VIEW_MANAGER_DUMMY_PROPERTY -}; CollectionViewManager* collection_view_manager_new (CollectionPage* page); -CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page); +CollectionViewManager* collection_view_manager_construct (GType object_type, + CollectionPage* page); ViewManager* view_manager_construct (GType object_type); -static DataView* collection_view_manager_real_create_view (ViewManager* base, DataSource* source); -DataView* media_page_create_thumbnail (MediaPage* self, DataSource* source); +static DataView* collection_view_manager_real_create_view (ViewManager* base, + DataSource* source); +DataView* media_page_create_thumbnail (MediaPage* self, + DataSource* source); static void collection_view_manager_finalize (ViewManager * obj); GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType thumbnail_view_get_type (void) G_GNUC_CONST; @@ -1044,17 +1062,29 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self); gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType search_view_filter_get_type (void) G_GNUC_CONST; gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; @@ -1062,108 +1092,194 @@ GType rating_get_type (void) G_GNUC_CONST; GType raw_developer_get_type (void) G_GNUC_CONST; gpointer exporter_ui_ref (gpointer instance); void exporter_ui_unref (gpointer instance); -GParamSpec* param_spec_exporter_ui (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_exporter_ui (GValue* value, gpointer v_object); -void value_take_exporter_ui (GValue* value, gpointer v_object); +GParamSpec* param_spec_exporter_ui (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_exporter_ui (GValue* value, + gpointer v_object); +void value_take_exporter_ui (GValue* value, + gpointer v_object); gpointer value_get_exporter_ui (const GValue* value); GType exporter_ui_get_type (void) G_GNUC_CONST; GType default_search_view_filter_get_type (void) G_GNUC_CONST; GType collection_page_collection_search_view_filter_get_type (void) G_GNUC_CONST; #define COLLECTION_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_COLLECTION_PAGE, CollectionPagePrivate)) -enum { - COLLECTION_PAGE_DUMMY_PROPERTY -}; CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_new (void); CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_construct (GType object_type); #define COLLECTION_PAGE_DESKTOP_SLIDESHOW_TRANSITION_SEC 2.0 static void collection_page_on_print (CollectionPage* self); -static void _collection_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _collection_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void collection_page_on_publish (CollectionPage* self); -static void _collection_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _collection_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void collection_page_on_rotate_clockwise (CollectionPage* self); -static void _collection_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _collection_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void collection_page_on_rotate_counterclockwise (CollectionPage* self); -static void _collection_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _collection_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void collection_page_on_flip_horizontally (CollectionPage* self); -static void _collection_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _collection_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void collection_page_on_flip_vertically (CollectionPage* self); -static void _collection_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _collection_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void collection_page_on_enhance (CollectionPage* self); -static void _collection_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _collection_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void collection_page_on_copy_adjustments (CollectionPage* self); -static void _collection_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _collection_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void collection_page_on_paste_adjustments (CollectionPage* self); -static void _collection_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _collection_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void collection_page_on_revert (CollectionPage* self); -static void _collection_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _collection_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void collection_page_on_set_background (CollectionPage* self); -static void _collection_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _collection_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void collection_page_on_duplicate_photo (CollectionPage* self); -static void _collection_page_on_duplicate_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _collection_page_on_duplicate_photo_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void collection_page_on_adjust_date_time (CollectionPage* self); -static void _collection_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _collection_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void collection_page_on_external_edit (CollectionPage* self); -static void _collection_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _collection_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void collection_page_on_external_edit_raw (CollectionPage* self); -static void _collection_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _collection_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void collection_page_on_slideshow (CollectionPage* self); -static void _collection_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -CollectionPage* collection_page_construct (GType object_type, const gchar* page_name); -MediaPage* media_page_construct (GType object_type, const gchar* page_name); +static void _collection_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +CollectionPage* collection_page_construct (GType object_type, + const gchar* page_name); +MediaPage* media_page_construct (GType object_type, + const gchar* page_name); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; ViewCollection* page_get_view (Page* self); gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; -static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* altered); -static void _collection_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); -void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path); -void page_init_toolbar (Page* self, const gchar* path); +static void collection_page_on_photos_altered (CollectionPage* self, + GeeMap* altered); +static void _collection_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); +void checkerboard_page_init_item_context_menu (CheckerboardPage* self, + const gchar* path); +void page_init_toolbar (Page* self, + const gchar* path); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); static void collection_page_on_external_app_changed (CollectionPage* self); -static void _collection_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self); +static void _collection_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, + gpointer self); static GtkToolbar* collection_page_real_get_toolbar (Page* base); GtkToolbar* page_get_toolbar (Page* self); GType media_page_zoom_slider_assembly_get_type (void) G_GNUC_CONST; MediaPageZoomSliderAssembly* media_page_create_zoom_slider_assembly (MediaPage* self); -void media_page_connect_slider (MediaPage* self, MediaPageZoomSliderAssembly* slider); +void media_page_connect_slider (MediaPage* self, + MediaPageZoomSliderAssembly* slider); static InjectionGroup* collection_page_create_file_menu_injectables (void); InjectionGroup* injection_group_new (const gchar* path); -InjectionGroup* injection_group_construct (GType object_type, const gchar* path); -void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator); +InjectionGroup* injection_group_construct (GType object_type, + const gchar* path); +void injection_group_add_menu_item (InjectionGroup* self, + const gchar* name, + const gchar* action, + const gchar* accellerator); void injection_group_add_separator (InjectionGroup* self); static InjectionGroup* collection_page_create_edit_menu_injectables (void); static InjectionGroup* collection_page_create_view_menu_fullscreen_injectables (void); static InjectionGroup* collection_page_create_photos_menu_edits_injectables (void); static InjectionGroup* collection_page_create_photos_menu_date_injectables (void); static InjectionGroup* collection_page_create_photos_menu_externals_injectables (void); -static void collection_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); -void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static void collection_page_real_add_actions (Page* base, GActionMap* map); -void page_add_actions (Page* self, GActionMap* map); -static void collection_page_real_remove_actions (Page* base, GActionMap* map); -void page_remove_actions (Page* self, GActionMap* map); -static InjectionGroup** collection_page_real_init_collect_injection_groups (Page* base, int* result_length1); -InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1); -static void _vala_array_add80 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); -static void _vala_array_add81 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); -static void _vala_array_add82 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); -static void _vala_array_add83 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); -static void _vala_array_add84 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); -static void _vala_array_add85 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); +static void collection_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames); +void page_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames); +static void collection_page_real_add_actions (Page* base, + GActionMap* map); +void page_add_actions (Page* self, + GActionMap* map); +static void collection_page_real_remove_actions (Page* base, + GActionMap* map); +void page_remove_actions (Page* self, + GActionMap* map); +static InjectionGroup** collection_page_real_init_collect_injection_groups (Page* base, + int* result_length1); +InjectionGroup** page_init_collect_injection_groups (Page* self, + int* result_length1); +static void _vala_array_add80 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value); +static void _vala_array_add81 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value); +static void _vala_array_add82 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value); +static void _vala_array_add83 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value); +static void _vala_array_add84 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value); +static void _vala_array_add85 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value); static gboolean collection_page_selection_has_video (CollectionPage* self); GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; @@ -1173,15 +1289,26 @@ static gboolean collection_page_page_has_photo (CollectionPage* self); gboolean media_source_collection_has_photo (GeeCollection* media); GeeCollection* view_collection_get_sources (ViewCollection* self); static gboolean collection_page_selection_has_photo (CollectionPage* self); -static void collection_page_real_init_actions (Page* base, gint selected_count, gint count); -void page_init_actions (Page* self, gint selected_count, gint count); -void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); -static void collection_page_real_update_actions (Page* base, gint selected_count, gint count); +static void collection_page_real_init_actions (Page* base, + gint selected_count, + gint count); +void page_init_actions (Page* self, + gint selected_count, + gint count); +void page_set_action_sensitive (Page* self, + const gchar* name, + gboolean sensitive); +static void collection_page_real_update_actions (Page* base, + gint selected_count, + gint count); GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); Page* page_window_get_current_page (PageWindow* self); -void page_update_actions (Page* self, gint selected_count, gint count); -DataView* view_collection_get_selected_at (ViewCollection* self, gint index); +void page_update_actions (Page* self, + gint selected_count, + gint count); +DataView* view_collection_get_selected_at (ViewCollection* self, + gint index); DataSource* data_view_get_source (DataView* self); GType video_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; @@ -1196,22 +1323,36 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self); gboolean photo_has_color_adjustments (Photo* self); #define RESOURCES_SET_BACKGROUND_MENU _ ("Set as _Desktop Background") #define RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU _ ("Set as _Desktop Slideshow…") -void page_update_menu_item_label (Page* self, const gchar* id, const gchar* new_label); +void page_update_menu_item_label (Page* self, + const gchar* id, + const gchar* new_label); gboolean data_view_is_selected (DataView* self); -gboolean alteration_has_subject (Alteration* self, const gchar* subject); +gboolean alteration_has_subject (Alteration* self, + const gchar* subject); GType library_photo_get_type (void) G_GNUC_CONST; gint view_collection_get_selected_count (ViewCollection* self); gpointer print_manager_ref (gpointer instance); void print_manager_unref (gpointer instance); -GParamSpec* param_spec_print_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_print_manager (GValue* value, gpointer v_object); -void value_take_print_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_print_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_print_manager (GValue* value, + gpointer v_object); +void value_take_print_manager (GValue* value, + gpointer v_object); gpointer value_get_print_manager (const GValue* value); GType print_manager_get_type (void) G_GNUC_CONST; PrintManager* print_manager_get_instance (void); -void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print); -GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t); -static void collection_page_real_on_item_activated (CheckerboardPage* base, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers); +void print_manager_spool_photo (PrintManager* self, + GeeCollection* to_print); +GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, + GType t); +static void collection_page_real_on_item_activated (CheckerboardPage* base, + CheckerboardItem* item, + CheckerboardPageActivator activator, + CheckerboardPageKeyboardModifiers* modifiers); GType media_source_item_get_type (void) G_GNUC_CONST; GType thumbnail_get_type (void) G_GNUC_CONST; MediaSource* thumbnail_get_media_source (Thumbnail* self); @@ -1219,18 +1360,29 @@ void media_page_on_play_video (MediaPage* self); gchar* data_object_to_string (DataObject* self); GType library_window_get_type (void) G_GNUC_CONST; LibraryWindow* library_window_get_app (void); -void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* controller, Photo* current); -static gboolean collection_page_real_on_app_key_pressed (Page* base, GdkEventKey* event); -void page_activate_action (Page* self, const gchar* name); -gboolean page_on_app_key_pressed (Page* self, GdkEventKey* event); +void library_window_switch_to_photo_page (LibraryWindow* self, + CollectionPage* controller, + Photo* current); +static gboolean collection_page_real_on_app_key_pressed (Page* base, + GdkEventKey* event); +void page_activate_action (Page* self, + const gchar* name); +gboolean page_on_app_key_pressed (Page* self, + GdkEventKey* event); static void collection_page_real_on_export (MediaPage* base); GType exporter_get_type (void) G_GNUC_CONST; -ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback done, void* done_target, gboolean export_in_place); +ExporterUI* video_export_many (GeeCollection* videos, + ExporterCompletionCallback done, + void* done_target, + gboolean export_in_place); static void collection_page_on_export_completed (CollectionPage* self); -static void _collection_page_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self); +static void _collection_page_on_export_completed_exporter_completion_callback (Exporter* exporter, + gboolean is_cancelled, + gpointer self); GType export_dialog_get_type (void) G_GNUC_CONST; ExportDialog* export_dialog_new (const gchar* title); -ExportDialog* export_dialog_construct (GType object_type, const gchar* title); +ExportDialog* export_dialog_construct (GType object_type, + const gchar* title); GType export_format_parameters_get_type (void) G_GNUC_CONST; GType export_format_mode_get_type (void) G_GNUC_CONST; GType jpeg_quality_get_type (void) G_GNUC_CONST; @@ -1239,27 +1391,55 @@ void export_format_parameters_free (ExportFormatParameters* self); void export_format_parameters_current (ExportFormatParameters* result); void export_format_parameters_last (ExportFormatParameters* result); GType scale_constraint_get_type (void) G_GNUC_CONST; -gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint* constraint, ExportFormatParameters* parameters); +gboolean export_dialog_execute (ExportDialog* self, + gint* scale, + ScaleConstraint* constraint, + ExportFormatParameters* parameters); GType scaling_get_type (void) G_GNUC_CONST; GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); Scaling* scaling_dup (const Scaling* self); void scaling_free (Scaling* self); -void scaling_for_constraint (ScaleConstraint constraint, gint scale, gboolean scale_up, Scaling* result); +void scaling_for_constraint (ScaleConstraint constraint, + gint scale, + gboolean scale_up, + Scaling* result); GFile* export_ui_choose_file (const gchar* current_file_basename); -gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParameters* params); +gchar* photo_get_export_basename_for_parameters (Photo* self, + ExportFormatParameters* params); void page_window_set_busy_cursor (PageWindow* self); -void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error); -PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportFormatParameters* params); +void photo_export (Photo* self, + GFile* dest_file, + Scaling* scaling, + JpegQuality quality, + PhotoFileFormat export_format, + gboolean direct_copy_unmodified, + gboolean export_metadata, + GError** error); +PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, + ExportFormatParameters* params); void page_window_set_normal_cursor (PageWindow* self); -GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining); +GtkResponseType export_error_dialog (GFile* dest, + gboolean photos_remaining); GFile* export_ui_choose_dir (const gchar* user_title); -Exporter* exporter_new (GeeCollection* to_export, GFile* dir, Scaling* scaling, ExportFormatParameters* export_params, gboolean auto_replace_all); -Exporter* exporter_construct (GType object_type, GeeCollection* to_export, GFile* dir, Scaling* scaling, ExportFormatParameters* export_params, gboolean auto_replace_all); +Exporter* exporter_new (GeeCollection* to_export, + GFile* dir, + Scaling* scaling, + ExportFormatParameters* export_params, + gboolean auto_replace_all); +Exporter* exporter_construct (GType object_type, + GeeCollection* to_export, + GFile* dir, + Scaling* scaling, + ExportFormatParameters* export_params, + gboolean auto_replace_all); ExporterUI* exporter_ui_new (Exporter* exporter); -ExporterUI* exporter_ui_construct (GType object_type, Exporter* exporter); -void exporter_ui_export (ExporterUI* self, ExporterCompletionCallback completion_callback, void* completion_callback_target); +ExporterUI* exporter_ui_construct (GType object_type, + Exporter* exporter); +void exporter_ui_export (ExporterUI* self, + ExporterCompletionCallback completion_callback, + void* completion_callback_target); gboolean photo_has_transformations (Photo* self); gboolean photo_has_editable (Photo* self); static gboolean collection_page_can_revert_editable_selected (CollectionPage* self); @@ -1271,135 +1451,220 @@ GeeList* view_collection_get_selected (ViewCollection* self); GType rotation_get_type (void) G_GNUC_CONST; #define RESOURCES_ROTATE_CW_FULL_LABEL _ ("Rotate Right") #define RESOURCES_ROTATE_CW_TOOLTIP _ ("Rotate the photos right (press Ctrl to rotate left)") -RotateMultipleCommand* rotate_multiple_command_new (GeeIterable* iter, Rotation rotation, const gchar* name, const gchar* explanation, const gchar* progress_text, const gchar* undo_progress_text); -RotateMultipleCommand* rotate_multiple_command_construct (GType object_type, GeeIterable* iter, Rotation rotation, const gchar* name, const gchar* explanation, const gchar* progress_text, const gchar* undo_progress_text); +RotateMultipleCommand* rotate_multiple_command_new (GeeIterable* iter, + Rotation rotation, + const gchar* name, + const gchar* explanation, + const gchar* progress_text, + const gchar* undo_progress_text); +RotateMultipleCommand* rotate_multiple_command_construct (GType object_type, + GeeIterable* iter, + Rotation rotation, + const gchar* name, + const gchar* explanation, + const gchar* progress_text, + const gchar* undo_progress_text); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* page_get_command_manager (Page* self); -void command_manager_execute (CommandManager* self, Command* command); +void command_manager_execute (CommandManager* self, + Command* command); void publishing_ui_publishing_dialog_go (GeeCollection* to_publish); #define RESOURCES_ROTATE_CCW_FULL_LABEL _ ("Rotate Left") #define RESOURCES_ROTATE_CCW_TOOLTIP _ ("Rotate the photos left") #define RESOURCES_HFLIP_LABEL _ ("Flip Horizontally") #define RESOURCES_VFLIP_LABEL _ ("Flip Vertically") -gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos); -void photo_revert_to_master (Photo* self, gboolean notify); +gboolean revert_editable_dialog (GtkWindow* owner, + GeeCollection* photos); +void photo_revert_to_master (Photo* self, + gboolean notify); GType multiple_photo_transformation_command_get_type (void) G_GNUC_CONST; GType revert_multiple_command_get_type (void) G_GNUC_CONST; RevertMultipleCommand* revert_multiple_command_new (GeeIterable* iter); -RevertMultipleCommand* revert_multiple_command_construct (GType object_type, GeeIterable* iter); +RevertMultipleCommand* revert_multiple_command_construct (GType object_type, + GeeIterable* iter); PixelTransformationBundle* photo_get_color_adjustments (Photo* self); GType adjust_colors_multiple_command_get_type (void) G_GNUC_CONST; #define RESOURCES_PASTE_ADJUSTMENTS_LABEL _ ("Paste Color Adjustments") #define RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP _ ("Apply copied color adjustments to the selected photos") -AdjustColorsMultipleCommand* adjust_colors_multiple_command_new (GeeIterable* iter, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation); -AdjustColorsMultipleCommand* adjust_colors_multiple_command_construct (GType object_type, GeeIterable* iter, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation); +AdjustColorsMultipleCommand* adjust_colors_multiple_command_new (GeeIterable* iter, + PixelTransformationBundle* transformations, + const gchar* name, + const gchar* explanation); +AdjustColorsMultipleCommand* adjust_colors_multiple_command_construct (GType object_type, + GeeIterable* iter, + PixelTransformationBundle* transformations, + const gchar* name, + const gchar* explanation); GType enhance_multiple_command_get_type (void) G_GNUC_CONST; EnhanceMultipleCommand* enhance_multiple_command_new (GeeIterable* iter); -EnhanceMultipleCommand* enhance_multiple_command_construct (GType object_type, GeeIterable* iter); +EnhanceMultipleCommand* enhance_multiple_command_construct (GType object_type, + GeeIterable* iter); GType duplicate_multiple_photos_command_get_type (void) G_GNUC_CONST; DuplicateMultiplePhotosCommand* duplicate_multiple_photos_command_new (GeeIterable* iter); -DuplicateMultiplePhotosCommand* duplicate_multiple_photos_command_construct (GType object_type, GeeIterable* iter); +DuplicateMultiplePhotosCommand* duplicate_multiple_photos_command_construct (GType object_type, + GeeIterable* iter); GType dateable_get_type (void) G_GNUC_CONST; GType adjust_date_time_dialog_get_type (void) G_GNUC_CONST; -AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video); -AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video); -gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* time_shift, gboolean* keep_relativity, gboolean* modify_originals); +AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source, + gint photo_count, + gboolean display_options, + gboolean contains_video, + gboolean only_video); +AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, + Dateable* source, + gint photo_count, + gboolean display_options, + gboolean contains_video, + gboolean only_video); +gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, + gint64* time_shift, + gboolean* keep_relativity, + gboolean* modify_originals); GType adjust_date_time_photos_command_get_type (void) G_GNUC_CONST; -AdjustDateTimePhotosCommand* adjust_date_time_photos_command_new (GeeIterable* iter, gint64 time_shift, gboolean keep_relativity, gboolean modify_originals); -AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType object_type, GeeIterable* iter, gint64 time_shift, gboolean keep_relativity, gboolean modify_originals); -void photo_open_with_external_editor (Photo* self, GError** error); -void open_external_editor_error_dialog (GError* err, Photo* photo); -void photo_open_with_raw_external_editor (Photo* self, GError** error); -void app_window_error_message (const gchar* message, GtkWindow* parent); +AdjustDateTimePhotosCommand* adjust_date_time_photos_command_new (GeeIterable* iter, + gint64 time_shift, + gboolean keep_relativity, + gboolean modify_originals); +AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType object_type, + GeeIterable* iter, + gint64 time_shift, + gboolean keep_relativity, + gboolean modify_originals); +void photo_open_with_external_editor (Photo* self, + GError** error); +void open_external_editor_error_dialog (GError* err, + Photo* photo); +void photo_open_with_raw_external_editor (Photo* self, + GError** error); +void app_window_error_message (const gchar* message, + GtkWindow* parent); gchar* resources_launch_editor_failed (GError* err); -void media_source_collection_filter_media (GeeCollection* media, GeeCollection* photos, GeeCollection* videos); +void media_source_collection_filter_media (GeeCollection* media, + GeeCollection* photos, + GeeCollection* videos); GType set_background_photo_dialog_get_type (void) G_GNUC_CONST; SetBackgroundPhotoDialog* set_background_photo_dialog_new (void); SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type); -gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gboolean* desktop_background, gboolean* screensaver); -void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolean screensaver); +gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, + gboolean* desktop_background, + gboolean* screensaver); +void desktop_integration_set_background (Photo* photo, + gboolean desktop, + gboolean screensaver); GType set_background_slideshow_dialog_get_type (void) G_GNUC_CONST; SetBackgroundSlideshowDialog* set_background_slideshow_dialog_new (void); SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType object_type); -gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self, gint* delay_value, gboolean* desktop_background, gboolean* screensaver); -void desktop_integration_set_background_slideshow (GeeCollection* photos, gdouble duration, gdouble transition, gboolean desktop_background, gboolean screensaver); +gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self, + gint* delay_value, + gboolean* desktop_background, + gboolean* screensaver); +void desktop_integration_set_background_slideshow (GeeCollection* photos, + gdouble duration, + gdouble transition, + gboolean desktop_background, + gboolean screensaver); gint data_collection_get_count (DataCollection* self); -GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t); -DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source); -void app_window_go_fullscreen (AppWindow* self, Page* page); +GeeList* view_collection_get_sources_of_type (ViewCollection* self, + GType t); +DataView* view_collection_get_view_for_source (ViewCollection* self, + DataSource* source); +void app_window_go_fullscreen (AppWindow* self, + Page* page); GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; GType library_photo_source_collection_get_type (void) G_GNUC_CONST; -SlideshowPage* slideshow_page_new (SourceCollection* sources, ViewCollection* controller, Photo* start); -SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* sources, ViewCollection* controller, Photo* start); +SlideshowPage* slideshow_page_new (SourceCollection* sources, + ViewCollection* controller, + Photo* start); +SlideshowPage* slideshow_page_construct (GType object_type, + SourceCollection* sources, + ViewCollection* controller, + Photo* start); GType single_photo_page_get_type (void) G_GNUC_CONST; GType slideshow_page_get_type (void) G_GNUC_CONST; -static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* event); -gboolean page_on_ctrl_pressed (Page* self, GdkEventKey* event); -static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey* event); -gboolean page_on_ctrl_released (Page* self, GdkEventKey* event); +static gboolean collection_page_real_on_ctrl_pressed (Page* base, + GdkEventKey* event); +gboolean page_on_ctrl_pressed (Page* self, + GdkEventKey* event); +static gboolean collection_page_real_on_ctrl_released (Page* base, + GdkEventKey* event); +gboolean page_on_ctrl_released (Page* self, + GdkEventKey* event); static SearchViewFilter* collection_page_real_get_search_view_filter (CheckerboardPage* base); -enum { - COLLECTION_PAGE_COLLECTION_SEARCH_VIEW_FILTER_DUMMY_PROPERTY -}; static guint collection_page_collection_search_view_filter_real_get_criteria (SearchViewFilter* base); GType search_filter_criteria_get_type (void) G_GNUC_CONST; DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type); static void collection_page_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static const GActionEntry COLLECTION_PAGE_entries[16] = {{"Print", _collection_page_on_print_gsimple_action_activate_callback}, {"Publish", _collection_page_on_publish_gsimple_action_activate_callback}, {"RotateClockwise", _collection_page_on_rotate_clockwise_gsimple_action_activate_callback}, {"RotateCounterclockwise", _collection_page_on_rotate_counterclockwise_gsimple_action_activate_callback}, {"FlipHorizontally", _collection_page_on_flip_horizontally_gsimple_action_activate_callback}, {"FlipVertically", _collection_page_on_flip_vertically_gsimple_action_activate_callback}, {"Enhance", _collection_page_on_enhance_gsimple_action_activate_callback}, {"CopyColorAdjustments", _collection_page_on_copy_adjustments_gsimple_action_activate_callback}, {"PasteColorAdjustments", _collection_page_on_paste_adjustments_gsimple_action_activate_callback}, {"Revert", _collection_page_on_revert_gsimple_action_activate_callback}, {"SetBackground", _collection_page_on_set_background_gsimple_action_activate_callback}, {"Duplicate", _collection_page_on_duplicate_photo_gsimple_action_activate_callback}, {"AdjustDateTime", _collection_page_on_adjust_date_time_gsimple_action_activate_callback}, {"ExternalEdit", _collection_page_on_external_edit_gsimple_action_activate_callback}, {"ExternalEditRAW", _collection_page_on_external_edit_raw_gsimple_action_activate_callback}, {"Slideshow", _collection_page_on_slideshow_gsimple_action_activate_callback}}; -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 11 "/home/jens/Source/shotwell/src/CollectionPage.vala" return self ? g_object_ref (self) : NULL; -#line 1365 "CollectionPage.c" +#line 1626 "CollectionPage.c" } -CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page) { +CollectionViewManager* +collection_view_manager_construct (GType object_type, + CollectionPage* page) +{ CollectionViewManager* self = NULL; CollectionPage* _tmp0_; - CollectionPage* _tmp1_; #line 10 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_val_if_fail (IS_COLLECTION_PAGE (page), NULL); #line 10 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = (CollectionViewManager*) view_manager_construct (object_type); #line 11 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp0_ = page; -#line 11 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (page); #line 11 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (self->priv->page); #line 11 "/home/jens/Source/shotwell/src/CollectionPage.vala" - self->priv->page = _tmp1_; + self->priv->page = _tmp0_; #line 10 "/home/jens/Source/shotwell/src/CollectionPage.vala" return self; -#line 1387 "CollectionPage.c" +#line 1648 "CollectionPage.c" } -CollectionViewManager* collection_view_manager_new (CollectionPage* page) { +CollectionViewManager* +collection_view_manager_new (CollectionPage* page) +{ #line 10 "/home/jens/Source/shotwell/src/CollectionPage.vala" return collection_view_manager_construct (TYPE_COLLECTION_VIEW_MANAGER, page); -#line 1394 "CollectionPage.c" +#line 1657 "CollectionPage.c" } -static DataView* collection_view_manager_real_create_view (ViewManager* base, DataSource* source) { +static DataView* +collection_view_manager_real_create_view (ViewManager* base, + DataSource* source) +{ CollectionViewManager * self; DataView* result = NULL; CollectionPage* _tmp0_; - DataSource* _tmp1_; - DataView* _tmp2_; + DataView* _tmp1_; #line 14 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManager); #line 14 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -1407,18 +1672,18 @@ static DataView* collection_view_manager_real_create_view (ViewManager* base, Da #line 15 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp0_ = self->priv->page; #line 15 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp1_ = source; + _tmp1_ = media_page_create_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_PAGE, MediaPage), source); #line 15 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = media_page_create_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_PAGE, MediaPage), _tmp1_); -#line 15 "/home/jens/Source/shotwell/src/CollectionPage.vala" - result = _tmp2_; + result = _tmp1_; #line 15 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 1418 "CollectionPage.c" +#line 1681 "CollectionPage.c" } -static void collection_view_manager_class_init (CollectionViewManagerClass * klass) { +static void +collection_view_manager_class_init (CollectionViewManagerClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_view_manager_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -1427,18 +1692,22 @@ static void collection_view_manager_class_init (CollectionViewManagerClass * kla g_type_class_add_private (klass, sizeof (CollectionViewManagerPrivate)); #line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala" ((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) collection_view_manager_real_create_view; -#line 1431 "CollectionPage.c" +#line 1696 "CollectionPage.c" } -static void collection_view_manager_instance_init (CollectionViewManager * self) { +static void +collection_view_manager_instance_init (CollectionViewManager * self) +{ #line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala" self->priv = COLLECTION_VIEW_MANAGER_GET_PRIVATE (self); -#line 1438 "CollectionPage.c" +#line 1705 "CollectionPage.c" } -static void collection_view_manager_finalize (ViewManager * obj) { +static void +collection_view_manager_finalize (ViewManager * obj) +{ CollectionViewManager * self; #line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManager); @@ -1446,11 +1715,13 @@ static void collection_view_manager_finalize (ViewManager * obj) { _g_object_unref0 (self->priv->page); #line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala" VIEW_MANAGER_CLASS (collection_view_manager_parent_class)->finalize (obj); -#line 1450 "CollectionPage.c" +#line 1719 "CollectionPage.c" } -GType collection_view_manager_get_type (void) { +GType +collection_view_manager_get_type (void) +{ static volatile gsize collection_view_manager_type_id__volatile = 0; if (g_once_init_enter (&collection_view_manager_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CollectionViewManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) collection_view_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CollectionViewManager), 0, (GInstanceInitFunc) collection_view_manager_instance_init, NULL }; @@ -1462,153 +1733,224 @@ GType collection_view_manager_get_type (void) { } -static void _collection_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_collection_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_print ((CollectionPage*) self); -#line 1469 "CollectionPage.c" +#line 1744 "CollectionPage.c" } -static void _collection_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_collection_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_publish ((CollectionPage*) self); -#line 1476 "CollectionPage.c" +#line 1755 "CollectionPage.c" } -static void _collection_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_collection_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_rotate_clockwise ((CollectionPage*) self); -#line 1483 "CollectionPage.c" +#line 1766 "CollectionPage.c" } -static void _collection_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_collection_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_rotate_counterclockwise ((CollectionPage*) self); -#line 1490 "CollectionPage.c" +#line 1777 "CollectionPage.c" } -static void _collection_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_collection_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_flip_horizontally ((CollectionPage*) self); -#line 1497 "CollectionPage.c" +#line 1788 "CollectionPage.c" } -static void _collection_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_collection_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_flip_vertically ((CollectionPage*) self); -#line 1504 "CollectionPage.c" +#line 1799 "CollectionPage.c" } -static void _collection_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_collection_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_enhance ((CollectionPage*) self); -#line 1511 "CollectionPage.c" +#line 1810 "CollectionPage.c" } -static void _collection_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_collection_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_copy_adjustments ((CollectionPage*) self); -#line 1518 "CollectionPage.c" +#line 1821 "CollectionPage.c" } -static void _collection_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_collection_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_paste_adjustments ((CollectionPage*) self); -#line 1525 "CollectionPage.c" +#line 1832 "CollectionPage.c" } -static void _collection_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_collection_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_revert ((CollectionPage*) self); -#line 1532 "CollectionPage.c" +#line 1843 "CollectionPage.c" } -static void _collection_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_collection_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_set_background ((CollectionPage*) self); -#line 1539 "CollectionPage.c" +#line 1854 "CollectionPage.c" } -static void _collection_page_on_duplicate_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_collection_page_on_duplicate_photo_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_duplicate_photo ((CollectionPage*) self); -#line 1546 "CollectionPage.c" +#line 1865 "CollectionPage.c" } -static void _collection_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_collection_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_adjust_date_time ((CollectionPage*) self); -#line 1553 "CollectionPage.c" +#line 1876 "CollectionPage.c" } -static void _collection_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_collection_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_external_edit ((CollectionPage*) self); -#line 1560 "CollectionPage.c" +#line 1887 "CollectionPage.c" } -static void _collection_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_collection_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_external_edit_raw ((CollectionPage*) self); -#line 1567 "CollectionPage.c" +#line 1898 "CollectionPage.c" } -static void _collection_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_collection_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_slideshow ((CollectionPage*) self); -#line 1574 "CollectionPage.c" +#line 1909 "CollectionPage.c" } -static void _collection_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_collection_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 35 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_photos_altered ((CollectionPage*) self, items); -#line 1581 "CollectionPage.c" +#line 1920 "CollectionPage.c" } -static void _collection_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self) { +static void +_collection_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, + gpointer self) +{ #line 43 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_external_app_changed ((CollectionPage*) self); -#line 1588 "CollectionPage.c" +#line 1930 "CollectionPage.c" } -CollectionPage* collection_page_construct (GType object_type, const gchar* page_name) { +CollectionPage* +collection_page_construct (GType object_type, + const gchar* page_name) +{ CollectionPage * self = NULL; - const gchar* _tmp0_; + ViewCollection* _tmp0_; ViewCollection* _tmp1_; - ViewCollection* _tmp2_; + ConfigFacade* _tmp2_; ConfigFacade* _tmp3_; - ConfigFacade* _tmp4_; #line 32 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_val_if_fail (page_name != NULL, NULL); #line 33 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp0_ = page_name; -#line 33 "/home/jens/Source/shotwell/src/CollectionPage.vala" - self = (CollectionPage*) media_page_construct (object_type, _tmp0_); + self = (CollectionPage*) media_page_construct (object_type, page_name); #line 35 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 35 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 35 "/home/jens/Source/shotwell/src/CollectionPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _collection_page_on_photos_altered_data_collection_items_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _collection_page_on_photos_altered_data_collection_items_altered, self, 0); #line 35 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp2_); + _data_collection_unref0 (_tmp1_); #line 37 "/home/jens/Source/shotwell/src/CollectionPage.vala" checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "CollectionContextMenu"); #line 38 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -1616,20 +1958,22 @@ CollectionPage* collection_page_construct (GType object_type, const gchar* page_ #line 40 "/home/jens/Source/shotwell/src/CollectionPage.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 43 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = config_facade_get_instance (); + _tmp2_ = config_facade_get_instance (); #line 43 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 43 "/home/jens/Source/shotwell/src/CollectionPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "external-app-changed", (GCallback) _collection_page_on_external_app_changed_configuration_facade_external_app_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "external-app-changed", (GCallback) _collection_page_on_external_app_changed_configuration_facade_external_app_changed, self, 0); #line 43 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 32 "/home/jens/Source/shotwell/src/CollectionPage.vala" return self; -#line 1629 "CollectionPage.c" +#line 1971 "CollectionPage.c" } -static GtkToolbar* collection_page_real_get_toolbar (Page* base) { +static GtkToolbar* +collection_page_real_get_toolbar (Page* base) +{ CollectionPage * self; GtkToolbar* result = NULL; GtkToolbar* _tmp0_; @@ -1641,7 +1985,7 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) { _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; #line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp0_ == NULL) { -#line 1645 "CollectionPage.c" +#line 1989 "CollectionPage.c" GtkToolbar* _tmp1_; GtkToolbar* _tmp2_; GtkSeparatorToolItem* separator = NULL; @@ -1759,7 +2103,7 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) { #line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp24_ = G_OBJECT_GET_CLASS (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, G_TYPE_OBJECT, GObject)); #line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp25_ = gtk_binding_set_by_class (_tmp24_); + _tmp25_ = gtk_binding_set_by_class ((gpointer) _tmp24_); #line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala" binding_set = _tmp25_; #line 69 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -1778,7 +2122,7 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) { _g_object_unref0 (drawn_separator); #line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (separator); -#line 1782 "CollectionPage.c" +#line 2126 "CollectionPage.c" } #line 74 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp28_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; @@ -1788,11 +2132,13 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) { result = _tmp29_; #line 74 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 1792 "CollectionPage.c" +#line 2136 "CollectionPage.c" } -static InjectionGroup* collection_page_create_file_menu_injectables (void) { +static InjectionGroup* +collection_page_create_file_menu_injectables (void) +{ InjectionGroup* result = NULL; InjectionGroup* group = NULL; InjectionGroup* _tmp0_; @@ -1814,11 +2160,13 @@ static InjectionGroup* collection_page_create_file_menu_injectables (void) { result = group; #line 86 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 1818 "CollectionPage.c" +#line 2164 "CollectionPage.c" } -static InjectionGroup* collection_page_create_edit_menu_injectables (void) { +static InjectionGroup* +collection_page_create_edit_menu_injectables (void) +{ InjectionGroup* result = NULL; InjectionGroup* group = NULL; InjectionGroup* _tmp0_; @@ -1832,11 +2180,13 @@ static InjectionGroup* collection_page_create_edit_menu_injectables (void) { result = group; #line 94 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 1836 "CollectionPage.c" +#line 2184 "CollectionPage.c" } -static InjectionGroup* collection_page_create_view_menu_fullscreen_injectables (void) { +static InjectionGroup* +collection_page_create_view_menu_fullscreen_injectables (void) +{ InjectionGroup* result = NULL; InjectionGroup* group = NULL; InjectionGroup* _tmp0_; @@ -1854,11 +2204,13 @@ static InjectionGroup* collection_page_create_view_menu_fullscreen_injectables ( result = group; #line 104 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 1858 "CollectionPage.c" +#line 2208 "CollectionPage.c" } -static InjectionGroup* collection_page_create_photos_menu_edits_injectables (void) { +static InjectionGroup* +collection_page_create_photos_menu_edits_injectables (void) +{ InjectionGroup* result = NULL; InjectionGroup* group = NULL; InjectionGroup* _tmp0_; @@ -1890,11 +2242,13 @@ static InjectionGroup* collection_page_create_photos_menu_edits_injectables (voi result = group; #line 129 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 1894 "CollectionPage.c" +#line 2246 "CollectionPage.c" } -static InjectionGroup* collection_page_create_photos_menu_date_injectables (void) { +static InjectionGroup* +collection_page_create_photos_menu_date_injectables (void) +{ InjectionGroup* result = NULL; InjectionGroup* group = NULL; InjectionGroup* _tmp0_; @@ -1908,11 +2262,13 @@ static InjectionGroup* collection_page_create_photos_menu_date_injectables (void result = group; #line 137 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 1912 "CollectionPage.c" +#line 2266 "CollectionPage.c" } -static InjectionGroup* collection_page_create_photos_menu_externals_injectables (void) { +static InjectionGroup* +collection_page_create_photos_menu_externals_injectables (void) +{ InjectionGroup* result = NULL; InjectionGroup* group = NULL; InjectionGroup* _tmp0_; @@ -1930,62 +2286,56 @@ static InjectionGroup* collection_page_create_photos_menu_externals_injectables result = group; #line 151 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 1934 "CollectionPage.c" +#line 2290 "CollectionPage.c" } -static void collection_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { +static void +collection_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames) +{ CollectionPage * self; - GeeList* _tmp0_; - GeeList* _tmp1_; #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); #line 155 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp0_ = ui_filenames; -#line 155 "/home/jens/Source/shotwell/src/CollectionPage.vala" - PAGE_CLASS (collection_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp0_); -#line 157 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp1_ = ui_filenames; + PAGE_CLASS (collection_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), ui_filenames); #line 157 "/home/jens/Source/shotwell/src/CollectionPage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "collection.ui"); -#line 1954 "CollectionPage.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "collection.ui"); +#line 2307 "CollectionPage.c" } -static void collection_page_real_add_actions (Page* base, GActionMap* map) { +static void +collection_page_real_add_actions (Page* base, + GActionMap* map) +{ CollectionPage * self; - GActionMap* _tmp0_; - GActionMap* _tmp1_; #line 179 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 179 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp0_ = map; -#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala" - PAGE_CLASS (collection_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp0_); -#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp1_ = map; + PAGE_CLASS (collection_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), map); #line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala" - g_action_map_add_action_entries (_tmp1_, COLLECTION_PAGE_entries, G_N_ELEMENTS (COLLECTION_PAGE_entries), self); -#line 1974 "CollectionPage.c" + g_action_map_add_action_entries (map, COLLECTION_PAGE_entries, G_N_ELEMENTS (COLLECTION_PAGE_entries), self); +#line 2324 "CollectionPage.c" } -static void collection_page_real_remove_actions (Page* base, GActionMap* map) { +static void +collection_page_real_remove_actions (Page* base, + GActionMap* map) +{ CollectionPage * self; - GActionMap* _tmp0_; #line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp0_ = map; -#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala" - PAGE_CLASS (collection_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp0_); -#line 1989 "CollectionPage.c" + PAGE_CLASS (collection_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), map); +#line 2339 "CollectionPage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -1997,133 +2347,163 @@ static void collection_page_real_remove_actions (Page* base, GActionMap* map) { entry_collection_length1 = G_N_ELEMENTS (COLLECTION_PAGE_entries); #line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (COLLECTION_PAGE_entries); entry_it = entry_it + 1) { -#line 2001 "CollectionPage.c" +#line 2351 "CollectionPage.c" GActionEntry entry = {0}; #line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala" entry = entry_collection[entry_it]; -#line 2005 "CollectionPage.c" +#line 2355 "CollectionPage.c" { - GActionMap* _tmp1_; - GActionEntry _tmp2_; - const gchar* _tmp3_; + GActionEntry _tmp0_; + const gchar* _tmp1_; #line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp1_ = map; + _tmp0_ = entry; #line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = entry; + _tmp1_ = _tmp0_.name; #line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _tmp2_.name; -#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala" - g_action_map_remove_action (_tmp1_, _tmp3_); -#line 2018 "CollectionPage.c" + g_action_map_remove_action (map, _tmp1_); +#line 2365 "CollectionPage.c" } } } } -static void _vala_array_add80 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { +static void +_vala_array_add80 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value) +{ #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala" if ((*length) == (*size)) { #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala" *size = (*size) ? (2 * (*size)) : 4; #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 2032 "CollectionPage.c" +#line 2384 "CollectionPage.c" } #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[(*length)++] = value; #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[*length] = NULL; -#line 2038 "CollectionPage.c" +#line 2390 "CollectionPage.c" } -static void _vala_array_add81 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { +static void +_vala_array_add81 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value) +{ #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala" if ((*length) == (*size)) { #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala" *size = (*size) ? (2 * (*size)) : 4; #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 2049 "CollectionPage.c" +#line 2406 "CollectionPage.c" } #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[(*length)++] = value; #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[*length] = NULL; -#line 2055 "CollectionPage.c" +#line 2412 "CollectionPage.c" } -static void _vala_array_add82 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { +static void +_vala_array_add82 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value) +{ #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala" if ((*length) == (*size)) { #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala" *size = (*size) ? (2 * (*size)) : 4; #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 2066 "CollectionPage.c" +#line 2428 "CollectionPage.c" } #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[(*length)++] = value; #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[*length] = NULL; -#line 2072 "CollectionPage.c" +#line 2434 "CollectionPage.c" } -static void _vala_array_add83 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { +static void +_vala_array_add83 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value) +{ #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala" if ((*length) == (*size)) { #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala" *size = (*size) ? (2 * (*size)) : 4; #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 2083 "CollectionPage.c" +#line 2450 "CollectionPage.c" } #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[(*length)++] = value; #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[*length] = NULL; -#line 2089 "CollectionPage.c" +#line 2456 "CollectionPage.c" } -static void _vala_array_add84 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { +static void +_vala_array_add84 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value) +{ #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala" if ((*length) == (*size)) { #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala" *size = (*size) ? (2 * (*size)) : 4; #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 2100 "CollectionPage.c" +#line 2472 "CollectionPage.c" } #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[(*length)++] = value; #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[*length] = NULL; -#line 2106 "CollectionPage.c" +#line 2478 "CollectionPage.c" } -static void _vala_array_add85 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { +static void +_vala_array_add85 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value) +{ #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala" if ((*length) == (*size)) { #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala" *size = (*size) ? (2 * (*size)) : 4; #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 2117 "CollectionPage.c" +#line 2494 "CollectionPage.c" } #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[(*length)++] = value; #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[*length] = NULL; -#line 2123 "CollectionPage.c" +#line 2500 "CollectionPage.c" } -static InjectionGroup** collection_page_real_init_collect_injection_groups (Page* base, int* result_length1) { +static InjectionGroup** +collection_page_real_init_collect_injection_groups (Page* base, + int* result_length1) +{ CollectionPage * self; InjectionGroup** result = NULL; InjectionGroup** groups = NULL; @@ -2217,24 +2597,25 @@ static InjectionGroup** collection_page_real_init_collect_injection_groups (Page if (result_length1) { #line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala" *result_length1 = _tmp14__length1; -#line 2221 "CollectionPage.c" +#line 2601 "CollectionPage.c" } #line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala" result = _tmp14_; #line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 2227 "CollectionPage.c" +#line 2607 "CollectionPage.c" } -static gboolean collection_page_selection_has_video (CollectionPage* self) { +static gboolean +collection_page_selection_has_video (CollectionPage* self) +{ gboolean result = FALSE; ViewCollection* _tmp0_; ViewCollection* _tmp1_; GeeList* _tmp2_; GeeCollection* _tmp3_; gboolean _tmp4_; - gboolean _tmp5_; #line 205 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE); #line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2247,28 +2628,27 @@ static gboolean collection_page_selection_has_video (CollectionPage* self) { _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = media_source_collection_has_video (_tmp3_); -#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = _tmp4_; #line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp3_); #line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp1_); #line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala" - result = _tmp5_; + result = _tmp4_; #line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 2261 "CollectionPage.c" +#line 2640 "CollectionPage.c" } -static gboolean collection_page_page_has_photo (CollectionPage* self) { +static gboolean +collection_page_page_has_photo (CollectionPage* self) +{ gboolean result = FALSE; ViewCollection* _tmp0_; ViewCollection* _tmp1_; GeeCollection* _tmp2_; GeeCollection* _tmp3_; gboolean _tmp4_; - gboolean _tmp5_; #line 209 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE); #line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2281,28 +2661,27 @@ static gboolean collection_page_page_has_photo (CollectionPage* self) { _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = media_source_collection_has_photo (_tmp3_); -#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = _tmp4_; #line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp3_); #line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp1_); #line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala" - result = _tmp5_; + result = _tmp4_; #line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 2295 "CollectionPage.c" +#line 2673 "CollectionPage.c" } -static gboolean collection_page_selection_has_photo (CollectionPage* self) { +static gboolean +collection_page_selection_has_photo (CollectionPage* self) +{ gboolean result = FALSE; ViewCollection* _tmp0_; ViewCollection* _tmp1_; GeeList* _tmp2_; GeeCollection* _tmp3_; gboolean _tmp4_; - gboolean _tmp5_; #line 213 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE); #line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2315,32 +2694,28 @@ static gboolean collection_page_selection_has_photo (CollectionPage* self) { _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = media_source_collection_has_photo (_tmp3_); -#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = _tmp4_; #line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp3_); #line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp1_); #line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala" - result = _tmp5_; + result = _tmp4_; #line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 2329 "CollectionPage.c" +#line 2706 "CollectionPage.c" } -static void collection_page_real_init_actions (Page* base, gint selected_count, gint count) { +static void +collection_page_real_init_actions (Page* base, + gint selected_count, + gint count) +{ CollectionPage * self; - gint _tmp0_; - gint _tmp1_; #line 217 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp0_ = selected_count; -#line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp1_ = count; -#line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala" - PAGE_CLASS (collection_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp0_, _tmp1_); + PAGE_CLASS (collection_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), selected_count, count); #line 220 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", TRUE); #line 221 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2349,68 +2724,66 @@ static void collection_page_real_init_actions (Page* base, gint selected_count, page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", TRUE); #line 223 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", TRUE); -#line 2353 "CollectionPage.c" +#line 2728 "CollectionPage.c" } -static void collection_page_real_update_actions (Page* base, gint selected_count, gint count) { +static void +collection_page_real_update_actions (Page* base, + gint selected_count, + gint count) +{ CollectionPage * self; AppWindow* _tmp0_; AppWindow* _tmp1_; Page* _tmp2_; Page* _tmp3_; gboolean _tmp4_; - gint _tmp5_; - gint _tmp6_; gboolean one_selected = FALSE; - gint _tmp7_; gboolean has_selected = FALSE; - gint _tmp8_; gboolean primary_is_video = FALSE; - gboolean _tmp9_; + gboolean _tmp5_; gboolean selection_has_videos = FALSE; - gboolean _tmp17_; gboolean page_has_photos = FALSE; + gboolean _tmp13_ = FALSE; + gboolean _tmp14_; + gboolean _tmp16_ = FALSE; + gboolean _tmp17_ = FALSE; gboolean _tmp18_; - gboolean _tmp19_ = FALSE; - gboolean _tmp20_; - gboolean _tmp22_ = FALSE; - gboolean _tmp23_ = FALSE; - gboolean _tmp24_; - gboolean _tmp31_ = FALSE; - gboolean _tmp32_ = FALSE; - gboolean _tmp33_ = FALSE; - gboolean _tmp34_; - gboolean _tmp48_ = FALSE; - gboolean _tmp49_; - gboolean _tmp51_ = FALSE; - gboolean _tmp52_; + gboolean _tmp24_ = FALSE; + gboolean _tmp25_ = FALSE; + gboolean _tmp26_ = FALSE; + gboolean _tmp27_; + gboolean _tmp39_ = FALSE; + gboolean _tmp40_; + gboolean _tmp41_ = FALSE; + gboolean _tmp42_; + gboolean _tmp44_ = FALSE; + gboolean _tmp45_ = FALSE; + gboolean _tmp46_; gboolean _tmp54_ = FALSE; gboolean _tmp55_ = FALSE; gboolean _tmp56_; - gboolean _tmp65_ = FALSE; - gboolean _tmp66_ = FALSE; - gboolean _tmp67_; - gboolean _tmp70_ = FALSE; + gboolean _tmp58_ = FALSE; + gboolean _tmp59_; + gboolean _tmp61_ = FALSE; + gboolean _tmp62_; + gboolean _tmp64_ = FALSE; + gboolean _tmp65_; + gboolean _tmp67_ = FALSE; + gboolean _tmp68_; + gboolean _tmp70_; gboolean _tmp71_; - gboolean _tmp73_ = FALSE; - gboolean _tmp74_; - gboolean _tmp76_ = FALSE; - gboolean _tmp77_; - gboolean _tmp79_ = FALSE; + gboolean _tmp72_; + gboolean _tmp73_; + gboolean _tmp74_ = FALSE; + gboolean _tmp75_; + gboolean _tmp77_ = FALSE; + gboolean _tmp78_; gboolean _tmp80_; + gboolean _tmp81_ = FALSE; gboolean _tmp82_; - gboolean _tmp83_; gboolean _tmp84_; - gboolean _tmp85_; - gboolean _tmp86_ = FALSE; - gboolean _tmp87_; - gboolean _tmp89_ = FALSE; - gboolean _tmp90_; - gboolean _tmp92_; - gboolean _tmp93_ = FALSE; - gboolean _tmp94_; - gboolean _tmp96_; #line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 228 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2431,665 +2804,619 @@ static void collection_page_real_update_actions (Page* base, gint selected_count if (_tmp4_) { #line 229 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 2435 "CollectionPage.c" +#line 2808 "CollectionPage.c" } #line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = selected_count; -#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = count; -#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala" - PAGE_CLASS (collection_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp5_, _tmp6_); -#line 234 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = selected_count; + PAGE_CLASS (collection_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), selected_count, count); #line 234 "/home/jens/Source/shotwell/src/CollectionPage.vala" - one_selected = _tmp7_ == 1; + one_selected = selected_count == 1; #line 235 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = selected_count; -#line 235 "/home/jens/Source/shotwell/src/CollectionPage.vala" - has_selected = _tmp8_ > 0; + has_selected = selected_count > 0; #line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala" primary_is_video = FALSE; #line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = has_selected; + _tmp5_ = has_selected; #line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp9_) { -#line 2457 "CollectionPage.c" - ViewCollection* _tmp10_; - ViewCollection* _tmp11_; - DataView* _tmp12_; - DataView* _tmp13_; - DataSource* _tmp14_; - DataSource* _tmp15_; - gboolean _tmp16_; + if (_tmp5_) { +#line 2822 "CollectionPage.c" + ViewCollection* _tmp6_; + ViewCollection* _tmp7_; + DataView* _tmp8_; + DataView* _tmp9_; + DataSource* _tmp10_; + DataSource* _tmp11_; + gboolean _tmp12_; #line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = _tmp10_; + _tmp7_ = _tmp6_; #line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = view_collection_get_selected_at (_tmp11_, 0); + _tmp8_ = view_collection_get_selected_at (_tmp7_, 0); #line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp13_ = _tmp12_; + _tmp9_ = _tmp8_; #line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp14_ = data_view_get_source (_tmp13_); + _tmp10_ = data_view_get_source (_tmp9_); #line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp15_ = _tmp14_; + _tmp11_ = _tmp10_; #line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_VIDEO); + _tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_VIDEO); #line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp11_); #line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp9_); #line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp11_); + _data_collection_unref0 (_tmp7_); #line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp16_) { + if (_tmp12_) { #line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala" primary_is_video = TRUE; -#line 2489 "CollectionPage.c" +#line 2854 "CollectionPage.c" } } #line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp17_ = collection_page_selection_has_video (self); -#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala" - selection_has_videos = _tmp17_; -#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp18_ = collection_page_page_has_photo (self); + selection_has_videos = collection_page_selection_has_video (self); #line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_has_photos = _tmp18_; + page_has_photos = collection_page_page_has_photo (self); #line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp20_ = has_selected; + _tmp14_ = has_selected; #line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp20_) { -#line 2504 "CollectionPage.c" - gboolean _tmp21_; + if (_tmp14_) { +#line 2865 "CollectionPage.c" + gboolean _tmp15_; #line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp21_ = selection_has_videos; + _tmp15_ = selection_has_videos; #line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp19_ = !_tmp21_; -#line 2510 "CollectionPage.c" + _tmp13_ = !_tmp15_; +#line 2871 "CollectionPage.c" } else { #line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp19_ = FALSE; -#line 2514 "CollectionPage.c" + _tmp13_ = FALSE; +#line 2875 "CollectionPage.c" } #line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Duplicate", _tmp19_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Duplicate", _tmp13_); #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp24_ = primary_is_video; + _tmp18_ = primary_is_video; #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!_tmp24_) { -#line 2522 "CollectionPage.c" - gboolean _tmp25_; + if (!_tmp18_) { +#line 2883 "CollectionPage.c" + gboolean _tmp19_; #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp25_ = one_selected; + _tmp19_ = one_selected; #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp23_ = _tmp25_; -#line 2528 "CollectionPage.c" + _tmp17_ = _tmp19_; +#line 2889 "CollectionPage.c" } else { #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp23_ = FALSE; -#line 2532 "CollectionPage.c" + _tmp17_ = FALSE; +#line 2893 "CollectionPage.c" } #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp23_) { -#line 2536 "CollectionPage.c" - ConfigFacade* _tmp26_; - ConfigFacade* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; - gboolean _tmp30_; -#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp26_ = config_facade_get_instance (); + if (_tmp17_) { +#line 2897 "CollectionPage.c" + ConfigFacade* _tmp20_; + ConfigFacade* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp27_ = _tmp26_; + _tmp20_ = config_facade_get_instance (); #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp28_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp21_ = _tmp20_; #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp29_ = _tmp28_; + _tmp22_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp30_ = is_string_empty (_tmp29_); + _tmp23_ = _tmp22_; #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp22_ = !_tmp30_; + _tmp16_ = !is_string_empty (_tmp23_); #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_free0 (_tmp29_); + _g_free0 (_tmp23_); #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp27_); -#line 2558 "CollectionPage.c" + _g_object_unref0 (_tmp21_); +#line 2916 "CollectionPage.c" } else { #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp22_ = FALSE; -#line 2562 "CollectionPage.c" + _tmp16_ = FALSE; +#line 2920 "CollectionPage.c" } #line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp22_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp16_); #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp34_ = one_selected; + _tmp27_ = one_selected; #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp34_) { -#line 2570 "CollectionPage.c" - gboolean _tmp35_; + if (_tmp27_) { +#line 2928 "CollectionPage.c" + gboolean _tmp28_; #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp35_ = primary_is_video; + _tmp28_ = primary_is_video; #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp33_ = !_tmp35_; -#line 2576 "CollectionPage.c" + _tmp26_ = !_tmp28_; +#line 2934 "CollectionPage.c" } else { #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp33_ = FALSE; -#line 2580 "CollectionPage.c" + _tmp26_ = FALSE; +#line 2938 "CollectionPage.c" } #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp33_) { -#line 2584 "CollectionPage.c" - ViewCollection* _tmp36_; - ViewCollection* _tmp37_; - DataView* _tmp38_; - DataView* _tmp39_; - DataSource* _tmp40_; - Photo* _tmp41_; - PhotoFileFormat _tmp42_; + if (_tmp26_) { +#line 2942 "CollectionPage.c" + ViewCollection* _tmp29_; + ViewCollection* _tmp30_; + DataView* _tmp31_; + DataView* _tmp32_; + DataSource* _tmp33_; + Photo* _tmp34_; #line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp36_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp37_ = _tmp36_; + _tmp30_ = _tmp29_; #line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp38_ = view_collection_get_selected_at (_tmp37_, 0); -#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp39_ = _tmp38_; + _tmp31_ = view_collection_get_selected_at (_tmp30_, 0); #line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp40_ = data_view_get_source (_tmp39_); + _tmp32_ = _tmp31_; #line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp41_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PHOTO, Photo); + _tmp33_ = data_view_get_source (_tmp32_); #line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp42_ = photo_get_master_file_format (_tmp41_); + _tmp34_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PHOTO, Photo); #line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp32_ = _tmp42_ == PHOTO_FILE_FORMAT_RAW; + _tmp25_ = photo_get_master_file_format (_tmp34_) == PHOTO_FILE_FORMAT_RAW; #line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp41_); + _g_object_unref0 (_tmp34_); #line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp39_); + _g_object_unref0 (_tmp32_); #line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp37_); -#line 2614 "CollectionPage.c" + _data_collection_unref0 (_tmp30_); +#line 2969 "CollectionPage.c" } else { #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp32_ = FALSE; -#line 2618 "CollectionPage.c" + _tmp25_ = FALSE; +#line 2973 "CollectionPage.c" } #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp32_) { -#line 2622 "CollectionPage.c" - ConfigFacade* _tmp43_; - ConfigFacade* _tmp44_; - gchar* _tmp45_; - gchar* _tmp46_; - gboolean _tmp47_; + if (_tmp25_) { +#line 2977 "CollectionPage.c" + ConfigFacade* _tmp35_; + ConfigFacade* _tmp36_; + gchar* _tmp37_; + gchar* _tmp38_; #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp43_ = config_facade_get_instance (); + _tmp35_ = config_facade_get_instance (); #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp44_ = _tmp43_; + _tmp36_ = _tmp35_; #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp45_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp46_ = _tmp45_; + _tmp37_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp47_ = is_string_empty (_tmp46_); + _tmp38_ = _tmp37_; #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp31_ = !_tmp47_; + _tmp24_ = !is_string_empty (_tmp38_); #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_free0 (_tmp46_); + _g_free0 (_tmp38_); #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp44_); -#line 2644 "CollectionPage.c" + _g_object_unref0 (_tmp36_); +#line 2996 "CollectionPage.c" } else { #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp31_ = FALSE; -#line 2648 "CollectionPage.c" + _tmp24_ = FALSE; +#line 3000 "CollectionPage.c" } #line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp31_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp24_); #line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp49_ = selection_has_videos; + _tmp40_ = selection_has_videos; #line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!_tmp49_) { -#line 2656 "CollectionPage.c" - gboolean _tmp50_; + if (!_tmp40_) { #line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp50_ = collection_page_can_revert_selected (self); -#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp48_ = _tmp50_; -#line 2662 "CollectionPage.c" + _tmp39_ = collection_page_can_revert_selected (self); +#line 3010 "CollectionPage.c" } else { #line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp48_ = FALSE; -#line 2666 "CollectionPage.c" + _tmp39_ = FALSE; +#line 3014 "CollectionPage.c" } #line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp48_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp39_); #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp52_ = selection_has_videos; + _tmp42_ = selection_has_videos; #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!_tmp52_) { -#line 2674 "CollectionPage.c" - gboolean _tmp53_; + if (!_tmp42_) { +#line 3022 "CollectionPage.c" + gboolean _tmp43_; #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp53_ = has_selected; + _tmp43_ = has_selected; #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp51_ = _tmp53_; -#line 2680 "CollectionPage.c" + _tmp41_ = _tmp43_; +#line 3028 "CollectionPage.c" } else { #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp51_ = FALSE; -#line 2684 "CollectionPage.c" + _tmp41_ = FALSE; +#line 3032 "CollectionPage.c" } #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp51_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp41_); #line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp56_ = selection_has_videos; + _tmp46_ = selection_has_videos; #line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!_tmp56_) { -#line 2692 "CollectionPage.c" - gboolean _tmp57_; + if (!_tmp46_) { +#line 3040 "CollectionPage.c" + gboolean _tmp47_; #line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp57_ = one_selected; + _tmp47_ = one_selected; #line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp55_ = _tmp57_; -#line 2698 "CollectionPage.c" + _tmp45_ = _tmp47_; +#line 3046 "CollectionPage.c" } else { #line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp55_ = FALSE; -#line 2702 "CollectionPage.c" + _tmp45_ = FALSE; +#line 3050 "CollectionPage.c" } #line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp55_) { -#line 2706 "CollectionPage.c" - ViewCollection* _tmp58_; - ViewCollection* _tmp59_; - DataView* _tmp60_; - DataView* _tmp61_; - DataSource* _tmp62_; - Photo* _tmp63_; - gboolean _tmp64_; -#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp58_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + if (_tmp45_) { +#line 3054 "CollectionPage.c" + ViewCollection* _tmp48_; + ViewCollection* _tmp49_; + DataView* _tmp50_; + DataView* _tmp51_; + DataSource* _tmp52_; + Photo* _tmp53_; #line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp59_ = _tmp58_; + _tmp48_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp60_ = view_collection_get_selected_at (_tmp59_, 0); + _tmp49_ = _tmp48_; #line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp61_ = _tmp60_; + _tmp50_ = view_collection_get_selected_at (_tmp49_, 0); #line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp62_ = data_view_get_source (_tmp61_); + _tmp51_ = _tmp50_; #line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp63_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_PHOTO, Photo); + _tmp52_ = data_view_get_source (_tmp51_); #line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp64_ = photo_has_color_adjustments (_tmp63_); + _tmp53_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_PHOTO, Photo); #line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp54_ = _tmp64_; + _tmp44_ = photo_has_color_adjustments (_tmp53_); #line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp63_); + _g_object_unref0 (_tmp53_); #line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp61_); + _g_object_unref0 (_tmp51_); #line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp59_); -#line 2736 "CollectionPage.c" + _data_collection_unref0 (_tmp49_); +#line 3081 "CollectionPage.c" } else { #line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp54_ = FALSE; -#line 2740 "CollectionPage.c" + _tmp44_ = FALSE; +#line 3085 "CollectionPage.c" } #line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp54_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp44_); #line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp67_ = selection_has_videos; + _tmp56_ = selection_has_videos; #line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!_tmp67_) { -#line 2748 "CollectionPage.c" - gboolean _tmp68_; + if (!_tmp56_) { +#line 3093 "CollectionPage.c" + gboolean _tmp57_; #line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp68_ = has_selected; + _tmp57_ = has_selected; #line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp66_ = _tmp68_; -#line 2754 "CollectionPage.c" + _tmp55_ = _tmp57_; +#line 3099 "CollectionPage.c" } else { #line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp66_ = FALSE; -#line 2758 "CollectionPage.c" + _tmp55_ = FALSE; +#line 3103 "CollectionPage.c" } #line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp66_) { -#line 2762 "CollectionPage.c" - gboolean _tmp69_; -#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp69_ = pixel_transformation_bundle_has_copied_color_adjustments (); + if (_tmp55_) { #line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp65_ = _tmp69_; -#line 2768 "CollectionPage.c" + _tmp54_ = pixel_transformation_bundle_has_copied_color_adjustments (); +#line 3109 "CollectionPage.c" } else { #line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp65_ = FALSE; -#line 2772 "CollectionPage.c" + _tmp54_ = FALSE; +#line 3113 "CollectionPage.c" } #line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", _tmp65_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", _tmp54_); #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp71_ = selection_has_videos; + _tmp59_ = selection_has_videos; #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!_tmp71_) { -#line 2780 "CollectionPage.c" - gboolean _tmp72_; + if (!_tmp59_) { +#line 3121 "CollectionPage.c" + gboolean _tmp60_; #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp72_ = has_selected; + _tmp60_ = has_selected; #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp70_ = _tmp72_; -#line 2786 "CollectionPage.c" + _tmp58_ = _tmp60_; +#line 3127 "CollectionPage.c" } else { #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp70_ = FALSE; -#line 2790 "CollectionPage.c" + _tmp58_ = FALSE; +#line 3131 "CollectionPage.c" } #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp70_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp58_); #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp74_ = selection_has_videos; + _tmp62_ = selection_has_videos; #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!_tmp74_) { -#line 2798 "CollectionPage.c" - gboolean _tmp75_; + if (!_tmp62_) { +#line 3139 "CollectionPage.c" + gboolean _tmp63_; #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp75_ = has_selected; + _tmp63_ = has_selected; #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp73_ = _tmp75_; -#line 2804 "CollectionPage.c" + _tmp61_ = _tmp63_; +#line 3145 "CollectionPage.c" } else { #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp73_ = FALSE; -#line 2808 "CollectionPage.c" + _tmp61_ = FALSE; +#line 3149 "CollectionPage.c" } #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp73_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp61_); #line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp77_ = selection_has_videos; + _tmp65_ = selection_has_videos; #line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!_tmp77_) { -#line 2816 "CollectionPage.c" - gboolean _tmp78_; + if (!_tmp65_) { +#line 3157 "CollectionPage.c" + gboolean _tmp66_; #line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp78_ = has_selected; + _tmp66_ = has_selected; #line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp76_ = _tmp78_; -#line 2822 "CollectionPage.c" + _tmp64_ = _tmp66_; +#line 3163 "CollectionPage.c" } else { #line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp76_ = FALSE; -#line 2826 "CollectionPage.c" + _tmp64_ = FALSE; +#line 3167 "CollectionPage.c" } #line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp76_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp64_); #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp80_ = selection_has_videos; + _tmp68_ = selection_has_videos; #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!_tmp80_) { -#line 2834 "CollectionPage.c" - gboolean _tmp81_; + if (!_tmp68_) { +#line 3175 "CollectionPage.c" + gboolean _tmp69_; #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp81_ = has_selected; + _tmp69_ = has_selected; #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp79_ = _tmp81_; -#line 2840 "CollectionPage.c" + _tmp67_ = _tmp69_; +#line 3181 "CollectionPage.c" } else { #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp79_ = FALSE; -#line 2844 "CollectionPage.c" + _tmp67_ = FALSE; +#line 3185 "CollectionPage.c" } #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp79_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp67_); #line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp82_ = has_selected; + _tmp70_ = has_selected; #line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp82_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp70_); #line 270 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp83_ = has_selected; + _tmp71_ = has_selected; #line 270 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NewEvent", _tmp83_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NewEvent", _tmp71_); #line 271 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp84_ = has_selected; + _tmp72_ = has_selected; #line 271 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AddTags", _tmp84_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AddTags", _tmp72_); #line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp85_ = one_selected; + _tmp73_ = one_selected; #line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ModifyTags", _tmp85_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ModifyTags", _tmp73_); #line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp87_ = page_has_photos; + _tmp75_ = page_has_photos; #line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp87_) { -#line 2868 "CollectionPage.c" - gboolean _tmp88_; + if (_tmp75_) { +#line 3209 "CollectionPage.c" + gboolean _tmp76_; #line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp88_ = primary_is_video; + _tmp76_ = primary_is_video; #line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp86_ = !_tmp88_; -#line 2874 "CollectionPage.c" + _tmp74_ = !_tmp76_; +#line 3215 "CollectionPage.c" } else { #line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp86_ = FALSE; -#line 2878 "CollectionPage.c" + _tmp74_ = FALSE; +#line 3219 "CollectionPage.c" } #line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Slideshow", _tmp86_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Slideshow", _tmp74_); #line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp90_ = selection_has_videos; + _tmp78_ = selection_has_videos; #line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!_tmp90_) { -#line 2886 "CollectionPage.c" - gboolean _tmp91_; + if (!_tmp78_) { +#line 3227 "CollectionPage.c" + gboolean _tmp79_; #line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp91_ = has_selected; + _tmp79_ = has_selected; #line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp89_ = _tmp91_; -#line 2892 "CollectionPage.c" + _tmp77_ = _tmp79_; +#line 3233 "CollectionPage.c" } else { #line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp89_ = FALSE; -#line 2896 "CollectionPage.c" + _tmp77_ = FALSE; +#line 3237 "CollectionPage.c" } #line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp89_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp77_); #line 275 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp92_ = has_selected; + _tmp80_ = has_selected; #line 275 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", _tmp92_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", _tmp80_); #line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp94_ = selection_has_videos; + _tmp82_ = selection_has_videos; #line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!_tmp94_) { -#line 2908 "CollectionPage.c" - gboolean _tmp95_; + if (!_tmp82_) { +#line 3249 "CollectionPage.c" + gboolean _tmp83_; #line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp95_ = has_selected; + _tmp83_ = has_selected; #line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp93_ = _tmp95_; -#line 2914 "CollectionPage.c" + _tmp81_ = _tmp83_; +#line 3255 "CollectionPage.c" } else { #line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp93_ = FALSE; -#line 2918 "CollectionPage.c" + _tmp81_ = FALSE; +#line 3259 "CollectionPage.c" } #line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp93_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp81_); #line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp96_ = has_selected; + _tmp84_ = has_selected; #line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp96_) { -#line 2926 "CollectionPage.c" - const gchar* _tmp97_ = NULL; - gboolean _tmp98_; + if (_tmp84_) { +#line 3267 "CollectionPage.c" + const gchar* _tmp85_ = NULL; + gboolean _tmp86_; gchar* label = NULL; - gchar* _tmp99_; - const gchar* _tmp100_; + gchar* _tmp87_; + const gchar* _tmp88_; #line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_debug ("CollectionPage.vala:279: Setting action label for SetBackground..."); #line 280 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp98_ = one_selected; + _tmp86_ = one_selected; #line 280 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp98_) { + if (_tmp86_) { #line 281 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp97_ = RESOURCES_SET_BACKGROUND_MENU; -#line 2940 "CollectionPage.c" + _tmp85_ = RESOURCES_SET_BACKGROUND_MENU; +#line 3281 "CollectionPage.c" } else { #line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp97_ = RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU; -#line 2944 "CollectionPage.c" + _tmp85_ = RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU; +#line 3285 "CollectionPage.c" } #line 280 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp99_ = g_strdup (_tmp97_); + _tmp87_ = g_strdup (_tmp85_); #line 280 "/home/jens/Source/shotwell/src/CollectionPage.vala" - label = _tmp99_; + label = _tmp87_; #line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp100_ = label; + _tmp88_ = label; #line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp100_); + page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp88_); #line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_free0 (label); -#line 2956 "CollectionPage.c" +#line 3297 "CollectionPage.c" } } -static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* altered) { +static void +collection_page_on_photos_altered (CollectionPage* self, + GeeMap* altered) +{ #line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (GEE_IS_MAP (altered)); -#line 2966 "CollectionPage.c" +#line 3310 "CollectionPage.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp0_ = altered; + _tmp0_ = gee_map_get_keys (altered); #line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp2_ = _tmp1_; #line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _tmp2_; -#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala" while (TRUE) { -#line 2993 "CollectionPage.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 3334 "CollectionPage.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp6_; + gpointer _tmp7_; DataView* view = NULL; - DataObject* _tmp10_; + DataObject* _tmp8_; + DataView* _tmp9_; + gboolean _tmp10_ = FALSE; DataView* _tmp11_; - gboolean _tmp12_ = FALSE; - DataView* _tmp13_; - gboolean _tmp14_; LibraryPhoto* photo = NULL; - DataView* _tmp20_; - DataSource* _tmp21_; - LibraryPhoto* _tmp22_; - LibraryPhoto* _tmp23_; - gboolean _tmp24_; - LibraryPhoto* _tmp25_; - gboolean _tmp26_; -#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = _object_it; + DataView* _tmp15_; + DataSource* _tmp16_; + LibraryPhoto* _tmp17_; + LibraryPhoto* _tmp18_; + LibraryPhoto* _tmp19_; #line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 3021 "CollectionPage.c" +#line 3356 "CollectionPage.c" } #line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala" - object = (DataObject*) _tmp9_; + object = (DataObject*) _tmp7_; #line 291 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = object; + _tmp8_ = object; #line 291 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView)); + _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView)); #line 291 "/home/jens/Source/shotwell/src/CollectionPage.vala" - view = _tmp11_; -#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp13_ = view; + view = _tmp9_; #line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp14_ = data_view_is_selected (_tmp13_); + _tmp11_ = view; #line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!_tmp14_) { + if (!data_view_is_selected (_tmp11_)) { #line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = TRUE; -#line 3043 "CollectionPage.c" + _tmp10_ = TRUE; +#line 3376 "CollectionPage.c" } else { - GeeMap* _tmp15_; - DataView* _tmp16_; - gpointer _tmp17_; - Alteration* _tmp18_; - gboolean _tmp19_; -#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp15_ = altered; -#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp16_ = view; + DataView* _tmp12_; + gpointer _tmp13_; + Alteration* _tmp14_; #line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp17_ = gee_map_get (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject)); + _tmp12_ = view; #line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp18_ = (Alteration*) _tmp17_; + _tmp13_ = gee_map_get (altered, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject)); #line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp19_ = alteration_has_subject (_tmp18_, "image"); + _tmp14_ = (Alteration*) _tmp13_; #line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = !_tmp19_; + _tmp10_ = !alteration_has_subject (_tmp14_, "image"); #line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _alteration_unref0 (_tmp18_); -#line 3064 "CollectionPage.c" + _alteration_unref0 (_tmp14_); +#line 3391 "CollectionPage.c" } #line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp12_) { + if (_tmp10_) { #line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (view); #line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (object); #line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala" continue; -#line 3074 "CollectionPage.c" +#line 3401 "CollectionPage.c" } #line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp20_ = view; + _tmp15_ = view; #line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp21_ = data_view_get_source (_tmp20_); + _tmp16_ = data_view_get_source (_tmp15_); #line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp22_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp21_) : NULL; + _tmp17_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp16_) : NULL; #line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp22_ == NULL) { + if (_tmp17_ == NULL) { #line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp21_); -#line 3086 "CollectionPage.c" + _g_object_unref0 (_tmp16_); +#line 3413 "CollectionPage.c" } #line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala" - photo = _tmp22_; + photo = _tmp17_; #line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp23_ = photo; + _tmp18_ = photo; #line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp23_ == NULL) { + if (_tmp18_ == NULL) { #line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photo); #line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3098,18 +3425,14 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt _g_object_unref0 (object); #line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala" continue; -#line 3102 "CollectionPage.c" +#line 3429 "CollectionPage.c" } #line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp24_ = collection_page_can_revert_selected (self); -#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp24_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", collection_page_can_revert_selected (self)); #line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp25_ = photo; + _tmp19_ = photo; #line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp26_ = photo_has_color_adjustments (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO, Photo)); -#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp26_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", photo_has_color_adjustments (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PHOTO, Photo))); #line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photo); #line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3118,20 +3441,21 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt _g_object_unref0 (object); #line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 3122 "CollectionPage.c" +#line 3445 "CollectionPage.c" } #line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_object_it); -#line 3126 "CollectionPage.c" +#line 3449 "CollectionPage.c" } } -static void collection_page_on_print (CollectionPage* self) { +static void +collection_page_on_print (CollectionPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; #line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3139,53 +3463,52 @@ static void collection_page_on_print (CollectionPage* self) { #line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = _tmp0_; #line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _tmp2_ > 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) > 0; #line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp1_); #line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp3_) { -#line 3150 "CollectionPage.c" + if (_tmp2_) { +#line 3472 "CollectionPage.c" + PrintManager* _tmp3_; PrintManager* _tmp4_; - PrintManager* _tmp5_; + ViewCollection* _tmp5_; ViewCollection* _tmp6_; - ViewCollection* _tmp7_; - GeeList* _tmp8_; - GeeCollection* _tmp9_; + GeeList* _tmp7_; + GeeCollection* _tmp8_; #line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = print_manager_get_instance (); + _tmp3_ = print_manager_get_instance (); #line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO); + _tmp7_ = view_collection_get_selected_sources_of_type (_tmp6_, TYPE_PHOTO); #line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection); #line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala" - print_manager_spool_photo (_tmp5_, _tmp9_); + print_manager_spool_photo (_tmp4_, _tmp8_); #line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp7_); + _data_collection_unref0 (_tmp6_); #line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _print_manager_unref0 (_tmp5_); -#line 3177 "CollectionPage.c" + _print_manager_unref0 (_tmp4_); +#line 3499 "CollectionPage.c" } } -static void collection_page_on_external_app_changed (CollectionPage* self) { +static void +collection_page_on_external_app_changed (CollectionPage* self) +{ gint selected_count = 0; ViewCollection* _tmp0_; ViewCollection* _tmp1_; gint _tmp2_; - gint _tmp3_; - gboolean _tmp4_ = FALSE; - gint _tmp5_; + gboolean _tmp3_ = FALSE; + gint _tmp4_; #line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 317 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3194,65 +3517,66 @@ static void collection_page_on_external_app_changed (CollectionPage* self) { _tmp1_ = _tmp0_; #line 317 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 317 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _tmp2_; #line 317 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp1_); #line 317 "/home/jens/Source/shotwell/src/CollectionPage.vala" - selected_count = _tmp3_; + selected_count = _tmp2_; #line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = selected_count; + _tmp4_ = selected_count; #line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp5_ == 1) { -#line 3208 "CollectionPage.c" + if (_tmp4_ == 1) { +#line 3529 "CollectionPage.c" + ConfigFacade* _tmp5_; ConfigFacade* _tmp6_; - ConfigFacade* _tmp7_; + gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; #line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = config_facade_get_instance (); + _tmp5_ = config_facade_get_instance (); #line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp7_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = g_strcmp0 (_tmp9_, "") != 0; + _tmp3_ = g_strcmp0 (_tmp8_, "") != 0; #line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp8_); #line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp7_); -#line 3227 "CollectionPage.c" + _g_object_unref0 (_tmp6_); +#line 3548 "CollectionPage.c" } else { #line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = FALSE; -#line 3231 "CollectionPage.c" + _tmp3_ = FALSE; +#line 3552 "CollectionPage.c" } #line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp4_); -#line 3235 "CollectionPage.c" + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp3_); +#line 3556 "CollectionPage.c" } -static void collection_page_real_on_item_activated (CheckerboardPage* base, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) { +static void +collection_page_real_on_item_activated (CheckerboardPage* base, + CheckerboardItem* item, + CheckerboardPageActivator activator, + CheckerboardPageKeyboardModifiers* modifiers) +{ CollectionPage * self; Thumbnail* thumbnail = NULL; - CheckerboardItem* _tmp0_; + Thumbnail* _tmp0_; Thumbnail* _tmp1_; - Thumbnail* _tmp2_; + MediaSource* _tmp2_; MediaSource* _tmp3_; - MediaSource* _tmp4_; - gboolean _tmp5_; + gboolean _tmp4_; LibraryPhoto* photo = NULL; - Thumbnail* _tmp6_; - MediaSource* _tmp7_; + Thumbnail* _tmp5_; + MediaSource* _tmp6_; + LibraryPhoto* _tmp7_; LibraryPhoto* _tmp8_; LibraryPhoto* _tmp9_; - LibraryPhoto* _tmp10_; + gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; - CheckerboardPageActivator _tmp13_; #line 328 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 328 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3260,147 +3584,140 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec #line 328 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (modifiers != NULL); #line 330 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp0_ = item; -#line 330 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL, Thumbnail)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (item, TYPE_THUMBNAIL, Thumbnail)); #line 330 "/home/jens/Source/shotwell/src/CollectionPage.vala" - thumbnail = _tmp1_; + thumbnail = _tmp0_; #line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = thumbnail; + _tmp1_ = thumbnail; #line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = thumbnail_get_media_source (_tmp2_); + _tmp2_ = thumbnail_get_media_source (_tmp1_); #line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_VIDEO); + _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_VIDEO); #line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp5_) { + if (_tmp4_) { #line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala" media_page_on_play_video (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage)); #line 337 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (thumbnail); #line 337 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 3287 "CollectionPage.c" +#line 3609 "CollectionPage.c" } #line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = thumbnail; + _tmp5_ = thumbnail; #line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = thumbnail_get_media_source (_tmp6_); + _tmp6_ = thumbnail_get_media_source (_tmp5_); #line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp7_) : NULL; + _tmp7_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp6_) : NULL; #line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp8_ == NULL) { + if (_tmp7_ == NULL) { #line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp7_); -#line 3299 "CollectionPage.c" + _g_object_unref0 (_tmp6_); +#line 3621 "CollectionPage.c" } #line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala" - photo = _tmp8_; + photo = _tmp7_; #line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = photo; + _tmp8_ = photo; #line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp9_ == NULL) { + if (_tmp8_ == NULL) { #line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photo); #line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (thumbnail); #line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 3313 "CollectionPage.c" +#line 3635 "CollectionPage.c" } #line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = photo; + _tmp9_ = photo; #line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); + _tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); #line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala" - g_debug ("CollectionPage.vala:345: activating %s", _tmp12_); + g_debug ("CollectionPage.vala:345: activating %s", _tmp11_); #line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_free0 (_tmp12_); -#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp13_ = activator; + _g_free0 (_tmp11_); #line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp13_ == CHECKERBOARD_PAGE_ACTIVATOR_MOUSE) { -#line 3329 "CollectionPage.c" - CheckerboardPageKeyboardModifiers _tmp14_; - gboolean _tmp15_; + if (activator == CHECKERBOARD_PAGE_ACTIVATOR_MOUSE) { +#line 3649 "CollectionPage.c" + CheckerboardPageKeyboardModifiers _tmp12_; + gboolean _tmp13_; #line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp14_ = *modifiers; + _tmp12_ = *modifiers; #line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp15_ = _tmp14_.super_pressed; + _tmp13_ = _tmp12_.super_pressed; #line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp15_) { + if (_tmp13_) { #line 349 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_external_edit (self); -#line 3340 "CollectionPage.c" +#line 3660 "CollectionPage.c" } else { - LibraryWindow* _tmp16_; - LibraryWindow* _tmp17_; - LibraryPhoto* _tmp18_; + LibraryWindow* _tmp14_; + LibraryWindow* _tmp15_; + LibraryPhoto* _tmp16_; #line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp16_ = library_window_get_app (); + _tmp14_ = library_window_get_app (); #line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp17_ = _tmp16_; + _tmp15_ = _tmp14_; #line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp18_ = photo; + _tmp16_ = photo; #line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala" - library_window_switch_to_photo_page (_tmp17_, self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo)); + library_window_switch_to_photo_page (_tmp15_, self, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO, Photo)); #line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp17_); -#line 3355 "CollectionPage.c" + _g_object_unref0 (_tmp15_); +#line 3675 "CollectionPage.c" } } else { - CheckerboardPageActivator _tmp19_; -#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp19_ = activator; #line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp19_ == CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD) { -#line 3363 "CollectionPage.c" - gboolean _tmp20_ = FALSE; - CheckerboardPageKeyboardModifiers _tmp21_; - gboolean _tmp22_; + if (activator == CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD) { +#line 3680 "CollectionPage.c" + gboolean _tmp17_ = FALSE; + CheckerboardPageKeyboardModifiers _tmp18_; + gboolean _tmp19_; #line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp21_ = *modifiers; + _tmp18_ = *modifiers; #line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp22_ = _tmp21_.shift_pressed; + _tmp19_ = _tmp18_.shift_pressed; #line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!_tmp22_) { -#line 3373 "CollectionPage.c" - CheckerboardPageKeyboardModifiers _tmp23_; - gboolean _tmp24_; + if (!_tmp19_) { +#line 3690 "CollectionPage.c" + CheckerboardPageKeyboardModifiers _tmp20_; + gboolean _tmp21_; #line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp23_ = *modifiers; + _tmp20_ = *modifiers; #line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp24_ = _tmp23_.ctrl_pressed; + _tmp21_ = _tmp20_.ctrl_pressed; #line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp20_ = !_tmp24_; -#line 3382 "CollectionPage.c" + _tmp17_ = !_tmp21_; +#line 3699 "CollectionPage.c" } else { #line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp20_ = FALSE; -#line 3386 "CollectionPage.c" + _tmp17_ = FALSE; +#line 3703 "CollectionPage.c" } #line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp20_) { -#line 3390 "CollectionPage.c" - LibraryWindow* _tmp25_; - LibraryWindow* _tmp26_; - LibraryPhoto* _tmp27_; + if (_tmp17_) { +#line 3707 "CollectionPage.c" + LibraryWindow* _tmp22_; + LibraryWindow* _tmp23_; + LibraryPhoto* _tmp24_; #line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp25_ = library_window_get_app (); + _tmp22_ = library_window_get_app (); #line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp26_ = _tmp25_; + _tmp23_ = _tmp22_; #line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp27_ = photo; + _tmp24_ = photo; #line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala" - library_window_switch_to_photo_page (_tmp26_, self, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_PHOTO, Photo)); + library_window_switch_to_photo_page (_tmp23_, self, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PHOTO, Photo)); #line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp26_); -#line 3404 "CollectionPage.c" + _g_object_unref0 (_tmp23_); +#line 3721 "CollectionPage.c" } } } @@ -3408,42 +3725,44 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec _g_object_unref0 (photo); #line 328 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (thumbnail); -#line 3412 "CollectionPage.c" +#line 3729 "CollectionPage.c" } -static gboolean collection_page_real_on_app_key_pressed (Page* base, GdkEventKey* event) { +static gboolean +collection_page_real_on_app_key_pressed (Page* base, + GdkEventKey* event) +{ CollectionPage * self; gboolean result = FALSE; gboolean handled = FALSE; - GdkEventKey* _tmp0_; - guint _tmp1_; + guint _tmp0_; + const gchar* _tmp1_; const gchar* _tmp2_; - const gchar* _tmp3_; - GQuark _tmp5_ = 0U; + GQuark _tmp4_ = 0U; #line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala" - static GQuark _tmp4_label0 = 0; + static GQuark _tmp3_label0 = 0; #line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala" - static GQuark _tmp4_label1 = 0; + static GQuark _tmp3_label1 = 0; #line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala" - static GQuark _tmp4_label2 = 0; + static GQuark _tmp3_label2 = 0; #line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala" - static GQuark _tmp4_label3 = 0; + static GQuark _tmp3_label3 = 0; #line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala" - static GQuark _tmp4_label4 = 0; + static GQuark _tmp3_label4 = 0; #line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala" - static GQuark _tmp4_label5 = 0; + static GQuark _tmp3_label5 = 0; #line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala" - static GQuark _tmp4_label6 = 0; + static GQuark _tmp3_label6 = 0; #line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala" - static GQuark _tmp4_label7 = 0; + static GQuark _tmp3_label7 = 0; #line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala" - static GQuark _tmp4_label8 = 0; + static GQuark _tmp3_label8 = 0; #line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala" - static GQuark _tmp4_label9 = 0; -#line 3445 "CollectionPage.c" - gboolean _tmp8_ = FALSE; - gboolean _tmp9_; + static GQuark _tmp3_label9 = 0; +#line 3764 "CollectionPage.c" + gboolean _tmp6_ = FALSE; + gboolean _tmp7_; #line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3451,107 +3770,102 @@ static gboolean collection_page_real_on_app_key_pressed (Page* base, GdkEventKey #line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala" handled = TRUE; #line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp0_ = event; + _tmp0_ = event->keyval; #line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp1_ = _tmp0_->keyval; + _tmp1_ = gdk_keyval_name (_tmp0_); #line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = gdk_keyval_name (_tmp1_); -#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_); + _tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_); #line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if ((((((((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("Page_Up")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("KP_Page_Up"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("Page_Down"))))) || (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("KP_Page_Down"))))) || (_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("Home"))))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Home"))))) || (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("End"))))) || (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("KP_End"))))) { + if ((((((((_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("Page_Up")))) || (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("KP_Page_Up"))))) || (_tmp4_ == ((0 != _tmp3_label2) ? _tmp3_label2 : (_tmp3_label2 = g_quark_from_static_string ("Page_Down"))))) || (_tmp4_ == ((0 != _tmp3_label3) ? _tmp3_label3 : (_tmp3_label3 = g_quark_from_static_string ("KP_Page_Down"))))) || (_tmp4_ == ((0 != _tmp3_label4) ? _tmp3_label4 : (_tmp3_label4 = g_quark_from_static_string ("Home"))))) || (_tmp4_ == ((0 != _tmp3_label5) ? _tmp3_label5 : (_tmp3_label5 = g_quark_from_static_string ("KP_Home"))))) || (_tmp4_ == ((0 != _tmp3_label6) ? _tmp3_label6 : (_tmp3_label6 = g_quark_from_static_string ("End"))))) || (_tmp4_ == ((0 != _tmp3_label7) ? _tmp3_label7 : (_tmp3_label7 = g_quark_from_static_string ("KP_End"))))) { #line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala" switch (0) { -#line 3468 "CollectionPage.c" +#line 3785 "CollectionPage.c" default: { - GdkEventKey* _tmp6_; - gboolean _tmp7_ = FALSE; -#line 369 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = event; + gboolean _tmp5_ = FALSE; #line 369 "/home/jens/Source/shotwell/src/CollectionPage.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp6_, &_tmp7_); + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "key-press-event", event, &_tmp5_); #line 370 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 3479 "CollectionPage.c" +#line 3793 "CollectionPage.c" } } - } else if (_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("bracketright")))) { + } else if (_tmp4_ == ((0 != _tmp3_label8) ? _tmp3_label8 : (_tmp3_label8 = g_quark_from_static_string ("bracketright")))) { #line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala" switch (0) { -#line 3485 "CollectionPage.c" +#line 3799 "CollectionPage.c" default: { #line 373 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise"); #line 374 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 3492 "CollectionPage.c" +#line 3806 "CollectionPage.c" } } - } else if (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("bracketleft")))) { + } else if (_tmp4_ == ((0 != _tmp3_label9) ? _tmp3_label9 : (_tmp3_label9 = g_quark_from_static_string ("bracketleft")))) { #line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala" switch (0) { -#line 3498 "CollectionPage.c" +#line 3812 "CollectionPage.c" default: { #line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise"); #line 378 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 3505 "CollectionPage.c" +#line 3819 "CollectionPage.c" } } } else { #line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala" switch (0) { -#line 3511 "CollectionPage.c" +#line 3825 "CollectionPage.c" default: { #line 381 "/home/jens/Source/shotwell/src/CollectionPage.vala" handled = FALSE; #line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 3518 "CollectionPage.c" +#line 3832 "CollectionPage.c" } } } #line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = handled; + _tmp7_ = handled; #line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp9_) { + if (_tmp7_) { #line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = TRUE; -#line 3528 "CollectionPage.c" + _tmp6_ = TRUE; +#line 3842 "CollectionPage.c" } else { - GdkEventKey* _tmp10_; - gboolean _tmp11_; #line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = event; -#line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = PAGE_CLASS (collection_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp10_); -#line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = _tmp11_; -#line 3538 "CollectionPage.c" + _tmp6_ = PAGE_CLASS (collection_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), event); +#line 3846 "CollectionPage.c" } #line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala" - result = _tmp8_; + result = _tmp6_; #line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 3544 "CollectionPage.c" +#line 3852 "CollectionPage.c" } -static void _collection_page_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) { +static void +_collection_page_on_export_completed_exporter_completion_callback (Exporter* exporter, + gboolean is_cancelled, + gpointer self) +{ #line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_export_completed ((CollectionPage*) self); -#line 3551 "CollectionPage.c" +#line 3863 "CollectionPage.c" } -static void collection_page_real_on_export (MediaPage* base) { +static void +collection_page_real_on_export (MediaPage* base) +{ CollectionPage * self; ExporterUI* _tmp0_; GeeCollection* export_list = NULL; @@ -3563,45 +3877,43 @@ static void collection_page_real_on_export (MediaPage* base) { gint _tmp6_; gint _tmp7_; gboolean has_some_photos = FALSE; - gboolean _tmp8_; gboolean has_some_videos = FALSE; + gboolean _tmp8_ = FALSE; gboolean _tmp9_; - gboolean _tmp10_ = FALSE; gboolean _tmp11_; - gboolean _tmp13_; gchar* title = NULL; - gboolean _tmp16_; + gboolean _tmp14_; ExportDialog* export_dialog = NULL; - const gchar* _tmp25_; - ExportDialog* _tmp26_; - ExportFormatParameters _tmp27_ = {0}; - gboolean _tmp28_; + const gchar* _tmp23_; + ExportDialog* _tmp24_; + ExportFormatParameters _tmp25_ = {0}; + gboolean _tmp26_; ExportFormatParameters export_params = {0}; gint scale = 0; ScaleConstraint constraint = 0; - ExportDialog* _tmp31_; - gint _tmp32_ = 0; - ScaleConstraint _tmp33_ = 0; - gboolean _tmp34_; + ExportDialog* _tmp29_; + gint _tmp30_ = 0; + ScaleConstraint _tmp31_ = 0; + gboolean _tmp32_; Scaling scaling = {0}; - ScaleConstraint _tmp35_; - gint _tmp36_; - Scaling _tmp37_ = {0}; - GeeCollection* _tmp38_; - gint _tmp39_; - gint _tmp40_; + ScaleConstraint _tmp33_; + gint _tmp34_; + Scaling _tmp35_ = {0}; + GeeCollection* _tmp36_; + gint _tmp37_; + gint _tmp38_; GFile* export_dir = NULL; - const gchar* _tmp75_; - GFile* _tmp76_; - GFile* _tmp77_; - GeeCollection* _tmp78_; - GFile* _tmp79_; - Scaling _tmp80_; - ExportFormatParameters _tmp81_; - Exporter* _tmp82_; - Exporter* _tmp83_; - ExporterUI* _tmp84_; - ExporterUI* _tmp85_; + const gchar* _tmp71_; + GFile* _tmp72_; + GFile* _tmp73_; + GeeCollection* _tmp74_; + GFile* _tmp75_; + Scaling _tmp76_; + ExportFormatParameters _tmp77_; + Exporter* _tmp78_; + Exporter* _tmp79_; + ExporterUI* _tmp80_; + ExporterUI* _tmp81_; GError * _inner_error_ = NULL; #line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); @@ -3611,7 +3923,7 @@ static void collection_page_real_on_export (MediaPage* base) { if (_tmp0_ != NULL) { #line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 3615 "CollectionPage.c" +#line 3927 "CollectionPage.c" } #line 392 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -3637,136 +3949,132 @@ static void collection_page_real_on_export (MediaPage* base) { _g_object_unref0 (export_list); #line 395 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 3641 "CollectionPage.c" +#line 3953 "CollectionPage.c" } #line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = collection_page_selection_has_photo (self); -#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala" - has_some_photos = _tmp8_; -#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = collection_page_selection_has_video (self); + has_some_photos = collection_page_selection_has_photo (self); #line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala" - has_some_videos = _tmp9_; + has_some_videos = collection_page_selection_has_video (self); #line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = has_some_photos; + _tmp9_ = has_some_photos; #line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp11_) { + if (_tmp9_) { #line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = TRUE; -#line 3657 "CollectionPage.c" + _tmp8_ = TRUE; +#line 3965 "CollectionPage.c" } else { - gboolean _tmp12_; + gboolean _tmp10_; #line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = has_some_videos; + _tmp10_ = has_some_videos; #line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = _tmp12_; -#line 3664 "CollectionPage.c" + _tmp8_ = _tmp10_; +#line 3972 "CollectionPage.c" } #line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _vala_assert (_tmp10_, "has_some_photos || has_some_videos"); + _vala_assert (_tmp8_, "has_some_photos || has_some_videos"); #line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp13_ = has_some_photos; + _tmp11_ = has_some_photos; #line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!_tmp13_) { -#line 3672 "CollectionPage.c" - GeeCollection* _tmp14_; - ExporterUI* _tmp15_; + if (!_tmp11_) { +#line 3980 "CollectionPage.c" + GeeCollection* _tmp12_; + ExporterUI* _tmp13_; #line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp14_ = export_list; + _tmp12_ = export_list; #line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp15_ = video_export_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _collection_page_on_export_completed_exporter_completion_callback, self, FALSE); + _tmp13_ = video_export_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _collection_page_on_export_completed_exporter_completion_callback, self, FALSE); #line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala" _exporter_ui_unref0 (self->priv->exporter); #line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala" - self->priv->exporter = _tmp15_; + self->priv->exporter = _tmp13_; #line 405 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (export_list); #line 405 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 3687 "CollectionPage.c" +#line 3995 "CollectionPage.c" } #line 408 "/home/jens/Source/shotwell/src/CollectionPage.vala" title = NULL; #line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp16_ = has_some_videos; + _tmp14_ = has_some_videos; #line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp16_) { -#line 3695 "CollectionPage.c" - GeeCollection* _tmp17_; - gint _tmp18_; - gint _tmp19_; - gchar* _tmp20_; + if (_tmp14_) { +#line 4003 "CollectionPage.c" + GeeCollection* _tmp15_; + gint _tmp16_; + gint _tmp17_; + gchar* _tmp18_; #line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp17_ = export_list; + _tmp15_ = export_list; #line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp18_ = gee_collection_get_size (_tmp17_); + _tmp16_ = gee_collection_get_size (_tmp15_); #line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp19_ = _tmp18_; + _tmp17_ = _tmp16_; #line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp20_ = g_strdup (ngettext ("Export Photo/Video", "Export Photos/Videos", (gulong) _tmp19_)); + _tmp18_ = g_strdup (ngettext ("Export Photo/Video", "Export Photos/Videos", (gulong) _tmp17_)); #line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_free0 (title); #line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala" - title = _tmp20_; -#line 3712 "CollectionPage.c" + title = _tmp18_; +#line 4020 "CollectionPage.c" } else { - GeeCollection* _tmp21_; - gint _tmp22_; - gint _tmp23_; - gchar* _tmp24_; + GeeCollection* _tmp19_; + gint _tmp20_; + gint _tmp21_; + gchar* _tmp22_; #line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp21_ = export_list; + _tmp19_ = export_list; #line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp22_ = gee_collection_get_size (_tmp21_); + _tmp20_ = gee_collection_get_size (_tmp19_); #line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp23_ = _tmp22_; + _tmp21_ = _tmp20_; #line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp24_ = g_strdup (ngettext ("Export Photo", "Export Photos", (gulong) _tmp23_)); + _tmp22_ = g_strdup (ngettext ("Export Photo", "Export Photos", (gulong) _tmp21_)); #line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_free0 (title); #line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala" - title = _tmp24_; -#line 3730 "CollectionPage.c" + title = _tmp22_; +#line 4038 "CollectionPage.c" } #line 413 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp25_ = title; + _tmp23_ = title; #line 413 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp26_ = export_dialog_new (_tmp25_); + _tmp24_ = export_dialog_new (_tmp23_); #line 413 "/home/jens/Source/shotwell/src/CollectionPage.vala" - g_object_ref_sink (_tmp26_); + g_object_ref_sink (_tmp24_); #line 413 "/home/jens/Source/shotwell/src/CollectionPage.vala" - export_dialog = _tmp26_; + export_dialog = _tmp24_; #line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp28_ = has_some_videos; + _tmp26_ = has_some_videos; #line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp28_) { -#line 3744 "CollectionPage.c" - ExportFormatParameters _tmp29_ = {0}; + if (_tmp26_) { +#line 4052 "CollectionPage.c" + ExportFormatParameters _tmp27_ = {0}; #line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala" - export_format_parameters_current (&_tmp29_); + export_format_parameters_current (&_tmp27_); #line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp27_ = _tmp29_; -#line 3750 "CollectionPage.c" + _tmp25_ = _tmp27_; +#line 4058 "CollectionPage.c" } else { - ExportFormatParameters _tmp30_ = {0}; + ExportFormatParameters _tmp28_ = {0}; #line 424 "/home/jens/Source/shotwell/src/CollectionPage.vala" - export_format_parameters_last (&_tmp30_); + export_format_parameters_last (&_tmp28_); #line 424 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp27_ = _tmp30_; -#line 3757 "CollectionPage.c" + _tmp25_ = _tmp28_; +#line 4065 "CollectionPage.c" } #line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala" - export_params = _tmp27_; + export_params = _tmp25_; #line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp31_ = export_dialog; + _tmp29_ = export_dialog; #line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp34_ = export_dialog_execute (_tmp31_, &_tmp32_, &_tmp33_, &export_params); + _tmp32_ = export_dialog_execute (_tmp29_, &_tmp30_, &_tmp31_, &export_params); #line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala" - scale = _tmp32_; + scale = _tmp30_; #line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala" - constraint = _tmp33_; + constraint = _tmp31_; #line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!_tmp34_) { + if (!_tmp32_) { #line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (export_dialog); #line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3775,111 +4083,108 @@ static void collection_page_real_on_export (MediaPage* base) { _g_object_unref0 (export_list); #line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 3779 "CollectionPage.c" +#line 4087 "CollectionPage.c" } #line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp35_ = constraint; + _tmp33_ = constraint; #line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp36_ = scale; + _tmp34_ = scale; #line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala" - scaling_for_constraint (_tmp35_, _tmp36_, FALSE, &_tmp37_); + scaling_for_constraint (_tmp33_, _tmp34_, FALSE, &_tmp35_); #line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala" - scaling = _tmp37_; + scaling = _tmp35_; #line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp38_ = export_list; + _tmp36_ = export_list; #line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp39_ = gee_collection_get_size (_tmp38_); + _tmp37_ = gee_collection_get_size (_tmp36_); #line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp40_ = _tmp39_; + _tmp38_ = _tmp37_; #line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp40_ == 1) { -#line 3797 "CollectionPage.c" + if (_tmp38_ == 1) { +#line 4105 "CollectionPage.c" LibraryPhoto* photo = NULL; GFile* save_as = NULL; - LibraryPhoto* _tmp49_; - ExportFormatParameters _tmp50_; - gchar* _tmp51_; - gchar* _tmp52_; - GFile* _tmp53_; - GFile* _tmp54_; - GFile* _tmp55_; + LibraryPhoto* _tmp46_; + ExportFormatParameters _tmp47_; + gchar* _tmp48_; + gchar* _tmp49_; + GFile* _tmp50_; + GFile* _tmp51_; + GFile* _tmp52_; #line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala" photo = NULL; -#line 3809 "CollectionPage.c" +#line 4117 "CollectionPage.c" { GeeIterator* _p_it = NULL; - GeeCollection* _tmp41_; - GeeIterator* _tmp42_; + GeeCollection* _tmp39_; + GeeIterator* _tmp40_; #line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp41_ = export_list; + _tmp39_ = export_list; #line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp42_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), GEE_TYPE_ITERABLE, GeeIterable)); + _tmp40_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection), GEE_TYPE_ITERABLE, GeeIterable)); #line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _p_it = _tmp42_; + _p_it = _tmp40_; #line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala" while (TRUE) { -#line 3822 "CollectionPage.c" - GeeIterator* _tmp43_; - gboolean _tmp44_; +#line 4130 "CollectionPage.c" + GeeIterator* _tmp41_; LibraryPhoto* p = NULL; - GeeIterator* _tmp45_; - gpointer _tmp46_; - LibraryPhoto* _tmp47_; - LibraryPhoto* _tmp48_; + GeeIterator* _tmp42_; + gpointer _tmp43_; + LibraryPhoto* _tmp44_; + LibraryPhoto* _tmp45_; #line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp43_ = _p_it; + _tmp41_ = _p_it; #line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp44_ = gee_iterator_next (_tmp43_); -#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!_tmp44_) { + if (!gee_iterator_next (_tmp41_)) { #line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 3838 "CollectionPage.c" +#line 4143 "CollectionPage.c" } #line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp45_ = _p_it; + _tmp42_ = _p_it; #line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp46_ = gee_iterator_get (_tmp45_); + _tmp43_ = gee_iterator_get (_tmp42_); #line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala" - p = (LibraryPhoto*) _tmp46_; + p = (LibraryPhoto*) _tmp43_; #line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp47_ = p; + _tmp44_ = p; #line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp48_ = _g_object_ref0 (_tmp47_); + _tmp45_ = _g_object_ref0 (_tmp44_); #line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photo); #line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala" - photo = _tmp48_; + photo = _tmp45_; #line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (p); #line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 3858 "CollectionPage.c" +#line 4163 "CollectionPage.c" } #line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_p_it); -#line 3862 "CollectionPage.c" +#line 4167 "CollectionPage.c" } #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp49_ = photo; + _tmp46_ = photo; #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp50_ = export_params; + _tmp47_ = export_params; #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp51_ = photo_get_export_basename_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_PHOTO, Photo), &_tmp50_); + _tmp48_ = photo_get_export_basename_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_PHOTO, Photo), &_tmp47_); #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp52_ = _tmp51_; + _tmp49_ = _tmp48_; #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp53_ = export_ui_choose_file (_tmp52_); + _tmp50_ = export_ui_choose_file (_tmp49_); #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp54_ = _tmp53_; + _tmp51_ = _tmp50_; #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_free0 (_tmp52_); + _g_free0 (_tmp49_); #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala" - save_as = _tmp54_; + save_as = _tmp51_; #line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp55_ = save_as; + _tmp52_ = save_as; #line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp55_ == NULL) { + if (_tmp52_ == NULL) { #line 444 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (save_as); #line 444 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3892,100 +4197,97 @@ static void collection_page_real_on_export (MediaPage* base) { _g_object_unref0 (export_list); #line 444 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 3896 "CollectionPage.c" +#line 4201 "CollectionPage.c" } { - AppWindow* _tmp56_; - AppWindow* _tmp57_; - LibraryPhoto* _tmp58_; - GFile* _tmp59_; - Scaling _tmp60_; + AppWindow* _tmp53_; + AppWindow* _tmp54_; + LibraryPhoto* _tmp55_; + GFile* _tmp56_; + Scaling _tmp57_; + ExportFormatParameters _tmp58_; + JpegQuality _tmp59_; + LibraryPhoto* _tmp60_; ExportFormatParameters _tmp61_; - JpegQuality _tmp62_; - LibraryPhoto* _tmp63_; + ExportFormatParameters _tmp62_; + ExportFormatMode _tmp63_; ExportFormatParameters _tmp64_; - PhotoFileFormat _tmp65_; - ExportFormatParameters _tmp66_; - ExportFormatMode _tmp67_; - ExportFormatParameters _tmp68_; - gboolean _tmp69_; - AppWindow* _tmp70_; - AppWindow* _tmp71_; + gboolean _tmp65_; + AppWindow* _tmp66_; + AppWindow* _tmp67_; #line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp56_ = app_window_get_instance (); + _tmp53_ = app_window_get_instance (); #line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp57_ = _tmp56_; + _tmp54_ = _tmp53_; #line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_PAGE_WINDOW, PageWindow)); #line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp57_); -#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp58_ = photo; + _g_object_unref0 (_tmp54_); #line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp59_ = save_as; + _tmp55_ = photo; #line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp60_ = scaling; + _tmp56_ = save_as; #line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp61_ = export_params; + _tmp57_ = scaling; #line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp62_ = _tmp61_.quality; + _tmp58_ = export_params; #line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp63_ = photo; + _tmp59_ = _tmp58_.quality; #line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp64_ = export_params; + _tmp60_ = photo; #line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp65_ = photo_get_export_format_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_PHOTO, Photo), &_tmp64_); + _tmp61_ = export_params; #line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp66_ = export_params; + _tmp62_ = export_params; #line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp67_ = _tmp66_.mode; + _tmp63_ = _tmp62_.mode; #line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp68_ = export_params; + _tmp64_ = export_params; #line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp69_ = _tmp68_.export_metadata; + _tmp65_ = _tmp64_.export_metadata; #line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala" - photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_PHOTO, Photo), _tmp59_, &_tmp60_, _tmp62_, _tmp65_, _tmp67_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp69_, &_inner_error_); + photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_PHOTO, Photo), _tmp56_, &_tmp57_, _tmp59_, photo_get_export_format_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_PHOTO, Photo), &_tmp61_), _tmp63_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp65_, &_inner_error_); #line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3951 "CollectionPage.c" +#line 4253 "CollectionPage.c" goto __catch245_g_error; } #line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp70_ = app_window_get_instance (); + _tmp66_ = app_window_get_instance (); #line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp71_ = _tmp70_; + _tmp67_ = _tmp66_; #line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_PAGE_WINDOW, PageWindow)); #line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp71_); -#line 3962 "CollectionPage.c" + _g_object_unref0 (_tmp67_); +#line 4264 "CollectionPage.c" } goto __finally245; __catch245_g_error: { GError* err = NULL; - AppWindow* _tmp72_; - AppWindow* _tmp73_; - GFile* _tmp74_; + AppWindow* _tmp68_; + AppWindow* _tmp69_; + GFile* _tmp70_; #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala" err = _inner_error_; #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala" _inner_error_ = NULL; #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp72_ = app_window_get_instance (); + _tmp68_ = app_window_get_instance (); #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp73_ = _tmp72_; + _tmp69_ = _tmp68_; #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_PAGE_WINDOW, PageWindow)); #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp73_); + _g_object_unref0 (_tmp69_); #line 454 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp74_ = save_as; + _tmp70_ = save_as; #line 454 "/home/jens/Source/shotwell/src/CollectionPage.vala" - export_error_dialog (_tmp74_, FALSE); + export_error_dialog (_tmp70_, FALSE); #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_error_free0 (err); -#line 3989 "CollectionPage.c" +#line 4291 "CollectionPage.c" } __finally245: #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4006,7 +4308,7 @@ static void collection_page_real_on_export (MediaPage* base) { g_clear_error (&_inner_error_); #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4010 "CollectionPage.c" +#line 4312 "CollectionPage.c" } #line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (save_as); @@ -4020,18 +4322,18 @@ static void collection_page_real_on_export (MediaPage* base) { _g_object_unref0 (export_list); #line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4024 "CollectionPage.c" +#line 4326 "CollectionPage.c" } #line 461 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp75_ = title; + _tmp71_ = title; #line 461 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp76_ = export_ui_choose_dir (_tmp75_); + _tmp72_ = export_ui_choose_dir (_tmp71_); #line 461 "/home/jens/Source/shotwell/src/CollectionPage.vala" - export_dir = _tmp76_; + export_dir = _tmp72_; #line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp77_ = export_dir; + _tmp73_ = export_dir; #line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp77_ == NULL) { + if (_tmp73_ == NULL) { #line 463 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (export_dir); #line 463 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4042,32 +4344,32 @@ static void collection_page_real_on_export (MediaPage* base) { _g_object_unref0 (export_list); #line 463 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4046 "CollectionPage.c" +#line 4348 "CollectionPage.c" } #line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp78_ = export_list; + _tmp74_ = export_list; #line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp79_ = export_dir; + _tmp75_ = export_dir; #line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp80_ = scaling; + _tmp76_ = scaling; #line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp81_ = export_params; + _tmp77_ = export_params; #line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp82_ = exporter_new (_tmp78_, _tmp79_, &_tmp80_, &_tmp81_, FALSE); + _tmp78_ = exporter_new (_tmp74_, _tmp75_, &_tmp76_, &_tmp77_, FALSE); #line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp83_ = _tmp82_; + _tmp79_ = _tmp78_; #line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp84_ = exporter_ui_new (_tmp83_); + _tmp80_ = exporter_ui_new (_tmp79_); #line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala" _exporter_ui_unref0 (self->priv->exporter); #line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala" - self->priv->exporter = _tmp84_; + self->priv->exporter = _tmp80_; #line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp83_); + _g_object_unref0 (_tmp79_); #line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp85_ = self->priv->exporter; + _tmp81_ = self->priv->exporter; #line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala" - exporter_ui_export (_tmp85_, _collection_page_on_export_completed_exporter_completion_callback, self); + exporter_ui_export (_tmp81_, _collection_page_on_export_completed_exporter_completion_callback, self); #line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (export_dir); #line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4076,26 +4378,30 @@ static void collection_page_real_on_export (MediaPage* base) { _g_free0 (title); #line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (export_list); -#line 4080 "CollectionPage.c" +#line 4382 "CollectionPage.c" } -static void collection_page_on_export_completed (CollectionPage* self) { +static void +collection_page_on_export_completed (CollectionPage* self) +{ #line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala" _exporter_ui_unref0 (self->priv->exporter); #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala" self->priv->exporter = NULL; -#line 4091 "CollectionPage.c" +#line 4395 "CollectionPage.c" } -static gboolean collection_page_can_revert_selected (CollectionPage* self) { +static gboolean +collection_page_can_revert_selected (CollectionPage* self) +{ gboolean result = FALSE; #line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE); -#line 4099 "CollectionPage.c" +#line 4405 "CollectionPage.c" { GeeList* _source_list = NULL; ViewCollection* _tmp0_; @@ -4131,7 +4437,7 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) { _source_index = -1; #line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala" while (TRUE) { -#line 4135 "CollectionPage.c" +#line 4441 "CollectionPage.c" gint _tmp7_; gint _tmp8_; gint _tmp9_; @@ -4156,7 +4462,7 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) { if (!(_tmp8_ < _tmp9_)) { #line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 4160 "CollectionPage.c" +#line 4466 "CollectionPage.c" } #line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp10_ = _source_list; @@ -4176,37 +4482,31 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) { _tmp16_ = photo; #line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp16_ != NULL) { -#line 4180 "CollectionPage.c" +#line 4486 "CollectionPage.c" gboolean _tmp17_ = FALSE; LibraryPhoto* _tmp18_; - gboolean _tmp19_; #line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp18_ = photo; #line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp19_ = photo_has_transformations (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo)); -#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp19_) { + if (photo_has_transformations (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo))) { #line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp17_ = TRUE; -#line 4192 "CollectionPage.c" +#line 4495 "CollectionPage.c" } else { - LibraryPhoto* _tmp20_; - gboolean _tmp21_; -#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp20_ = photo; + LibraryPhoto* _tmp19_; #line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp21_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo)); + _tmp19_ = photo; #line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp17_ = _tmp21_; -#line 4202 "CollectionPage.c" + _tmp17_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PHOTO, Photo)); +#line 4502 "CollectionPage.c" } #line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp15_ = _tmp17_; -#line 4206 "CollectionPage.c" +#line 4506 "CollectionPage.c" } else { #line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp15_ = FALSE; -#line 4210 "CollectionPage.c" +#line 4510 "CollectionPage.c" } #line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp15_) { @@ -4220,31 +4520,33 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) { _g_object_unref0 (_source_list); #line 477 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 4224 "CollectionPage.c" +#line 4524 "CollectionPage.c" } #line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photo); #line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (source); -#line 4230 "CollectionPage.c" +#line 4530 "CollectionPage.c" } #line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_source_list); -#line 4234 "CollectionPage.c" +#line 4534 "CollectionPage.c" } #line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala" result = FALSE; #line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 4240 "CollectionPage.c" +#line 4540 "CollectionPage.c" } -static gboolean collection_page_can_revert_editable_selected (CollectionPage* self) { +static gboolean +collection_page_can_revert_editable_selected (CollectionPage* self) +{ gboolean result = FALSE; #line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE); -#line 4248 "CollectionPage.c" +#line 4550 "CollectionPage.c" { GeeList* _source_list = NULL; ViewCollection* _tmp0_; @@ -4280,7 +4582,7 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se _source_index = -1; #line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala" while (TRUE) { -#line 4284 "CollectionPage.c" +#line 4586 "CollectionPage.c" gint _tmp7_; gint _tmp8_; gint _tmp9_; @@ -4305,7 +4607,7 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se if (!(_tmp8_ < _tmp9_)) { #line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 4309 "CollectionPage.c" +#line 4611 "CollectionPage.c" } #line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp10_ = _source_list; @@ -4325,20 +4627,17 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se _tmp16_ = photo; #line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp16_ != NULL) { -#line 4329 "CollectionPage.c" +#line 4631 "CollectionPage.c" LibraryPhoto* _tmp17_; - gboolean _tmp18_; #line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp17_ = photo; #line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp18_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo)); -#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp15_ = _tmp18_; -#line 4338 "CollectionPage.c" + _tmp15_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo)); +#line 4637 "CollectionPage.c" } else { #line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp15_ = FALSE; -#line 4342 "CollectionPage.c" +#line 4641 "CollectionPage.c" } #line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp15_) { @@ -4352,41 +4651,42 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se _g_object_unref0 (_source_list); #line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 4356 "CollectionPage.c" +#line 4655 "CollectionPage.c" } #line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photo); #line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (source); -#line 4362 "CollectionPage.c" +#line 4661 "CollectionPage.c" } #line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_source_list); -#line 4366 "CollectionPage.c" +#line 4665 "CollectionPage.c" } #line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala" result = FALSE; #line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 4372 "CollectionPage.c" +#line 4671 "CollectionPage.c" } -static void collection_page_on_rotate_clockwise (CollectionPage* self) { +static void +collection_page_on_rotate_clockwise (CollectionPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; RotateMultipleCommand* command = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + GeeList* _tmp5_; GeeList* _tmp6_; - GeeList* _tmp7_; + RotateMultipleCommand* _tmp7_; RotateMultipleCommand* _tmp8_; - RotateMultipleCommand* _tmp9_; + CommandManager* _tmp9_; CommandManager* _tmp10_; - CommandManager* _tmp11_; - RotateMultipleCommand* _tmp12_; + RotateMultipleCommand* _tmp11_; #line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4394,56 +4694,55 @@ static void collection_page_on_rotate_clockwise (CollectionPage* self) { #line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = _tmp0_; #line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0; #line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp1_); #line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 495 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4407 "CollectionPage.c" +#line 4705 "CollectionPage.c" } #line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = view_collection_get_selected (_tmp5_); + _tmp5_ = view_collection_get_selected (_tmp4_); #line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP, _ ("Rotating"), _ ("Undoing Rotate")); + _tmp7_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP, _ ("Rotating"), _ ("Undoing Rotate")); #line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command = _tmp9_; + command = _tmp8_; #line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = command; + _tmp11_ = command; #line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); #line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _command_manager_unref0 (_tmp11_); + _command_manager_unref0 (_tmp10_); #line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (command); -#line 4439 "CollectionPage.c" +#line 4737 "CollectionPage.c" } -static void collection_page_on_publish (CollectionPage* self) { +static void +collection_page_on_publish (CollectionPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; #line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4451,52 +4750,51 @@ static void collection_page_on_publish (CollectionPage* self) { #line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = _tmp0_; #line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _tmp2_ > 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) > 0; #line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp1_); #line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp3_) { -#line 4462 "CollectionPage.c" + if (_tmp2_) { +#line 4759 "CollectionPage.c" + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; - GeeList* _tmp6_; - GeeCollection* _tmp7_; + GeeList* _tmp5_; + GeeCollection* _tmp6_; #line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = view_collection_get_selected_sources (_tmp5_); + _tmp5_ = view_collection_get_selected_sources (_tmp4_); #line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection); #line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala" - publishing_ui_publishing_dialog_go (_tmp7_); + publishing_ui_publishing_dialog_go (_tmp6_); #line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp5_); -#line 4481 "CollectionPage.c" + _data_collection_unref0 (_tmp4_); +#line 4778 "CollectionPage.c" } } -static void collection_page_on_rotate_counterclockwise (CollectionPage* self) { +static void +collection_page_on_rotate_counterclockwise (CollectionPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; RotateMultipleCommand* command = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + GeeList* _tmp5_; GeeList* _tmp6_; - GeeList* _tmp7_; + RotateMultipleCommand* _tmp7_; RotateMultipleCommand* _tmp8_; - RotateMultipleCommand* _tmp9_; + CommandManager* _tmp9_; CommandManager* _tmp10_; - CommandManager* _tmp11_; - RotateMultipleCommand* _tmp12_; + RotateMultipleCommand* _tmp11_; #line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4504,66 +4802,65 @@ static void collection_page_on_rotate_counterclockwise (CollectionPage* self) { #line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = _tmp0_; #line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0; #line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp1_); #line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 511 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4517 "CollectionPage.c" +#line 4813 "CollectionPage.c" } #line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = view_collection_get_selected (_tmp5_); + _tmp5_ = view_collection_get_selected (_tmp4_); #line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP, _ ("Rotating"), _ ("Undoing Rotate")); + _tmp7_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP, _ ("Rotating"), _ ("Undoing Rotate")); #line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command = _tmp9_; + command = _tmp8_; #line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = command; + _tmp11_ = command; #line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); #line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _command_manager_unref0 (_tmp11_); + _command_manager_unref0 (_tmp10_); #line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (command); -#line 4549 "CollectionPage.c" +#line 4845 "CollectionPage.c" } -static void collection_page_on_flip_horizontally (CollectionPage* self) { +static void +collection_page_on_flip_horizontally (CollectionPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; RotateMultipleCommand* command = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + GeeList* _tmp5_; GeeList* _tmp6_; - GeeList* _tmp7_; + RotateMultipleCommand* _tmp7_; RotateMultipleCommand* _tmp8_; - RotateMultipleCommand* _tmp9_; + CommandManager* _tmp9_; CommandManager* _tmp10_; - CommandManager* _tmp11_; - RotateMultipleCommand* _tmp12_; + RotateMultipleCommand* _tmp11_; #line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4571,66 +4868,65 @@ static void collection_page_on_flip_horizontally (CollectionPage* self) { #line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = _tmp0_; #line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0; #line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp1_); #line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4584 "CollectionPage.c" +#line 4879 "CollectionPage.c" } #line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = view_collection_get_selected (_tmp5_); + _tmp5_ = view_collection_get_selected (_tmp4_); #line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "", _ ("Flipping Horizontally"), _ ("Undoing Flip Horizontally")); + _tmp7_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "", _ ("Flipping Horizontally"), _ ("Undoing Flip Horizontally")); #line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command = _tmp9_; + command = _tmp8_; #line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = command; + _tmp11_ = command; #line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); #line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _command_manager_unref0 (_tmp11_); + _command_manager_unref0 (_tmp10_); #line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (command); -#line 4616 "CollectionPage.c" +#line 4911 "CollectionPage.c" } -static void collection_page_on_flip_vertically (CollectionPage* self) { +static void +collection_page_on_flip_vertically (CollectionPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; RotateMultipleCommand* command = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + GeeList* _tmp5_; GeeList* _tmp6_; - GeeList* _tmp7_; + RotateMultipleCommand* _tmp7_; RotateMultipleCommand* _tmp8_; - RotateMultipleCommand* _tmp9_; + CommandManager* _tmp9_; CommandManager* _tmp10_; - CommandManager* _tmp11_; - RotateMultipleCommand* _tmp12_; + RotateMultipleCommand* _tmp11_; #line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4638,67 +4934,65 @@ static void collection_page_on_flip_vertically (CollectionPage* self) { #line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = _tmp0_; #line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0; #line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp1_); #line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4651 "CollectionPage.c" +#line 4945 "CollectionPage.c" } #line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = view_collection_get_selected (_tmp5_); + _tmp5_ = view_collection_get_selected (_tmp4_); #line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "", _ ("Flipping Vertically"), _ ("Undoing Flip Vertically")); + _tmp7_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "", _ ("Flipping Vertically"), _ ("Undoing Flip Vertically")); #line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command = _tmp9_; + command = _tmp8_; #line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = command; + _tmp11_ = command; #line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); #line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _command_manager_unref0 (_tmp11_); + _command_manager_unref0 (_tmp10_); #line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (command); -#line 4683 "CollectionPage.c" +#line 4977 "CollectionPage.c" } -static void collection_page_on_revert (CollectionPage* self) { +static void +collection_page_on_revert (CollectionPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; + gboolean _tmp2_; RevertMultipleCommand* command = NULL; - ViewCollection* _tmp27_; - ViewCollection* _tmp28_; - GeeList* _tmp29_; - GeeList* _tmp30_; - RevertMultipleCommand* _tmp31_; + ViewCollection* _tmp24_; + ViewCollection* _tmp25_; + GeeList* _tmp26_; + GeeList* _tmp27_; + RevertMultipleCommand* _tmp28_; + RevertMultipleCommand* _tmp29_; + CommandManager* _tmp30_; + CommandManager* _tmp31_; RevertMultipleCommand* _tmp32_; - CommandManager* _tmp33_; - CommandManager* _tmp34_; - RevertMultipleCommand* _tmp35_; #line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4706,186 +5000,180 @@ static void collection_page_on_revert (CollectionPage* self) { #line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = _tmp0_; #line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0; #line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp1_); #line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4719 "CollectionPage.c" +#line 5011 "CollectionPage.c" } #line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = collection_page_can_revert_editable_selected (self); -#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp4_) { -#line 4725 "CollectionPage.c" - AppWindow* _tmp5_; - AppWindow* _tmp6_; - ViewCollection* _tmp7_; - ViewCollection* _tmp8_; - GeeList* _tmp9_; - GeeCollection* _tmp10_; - gboolean _tmp11_; - gboolean _tmp12_; -#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = app_window_get_instance (); + if (collection_page_can_revert_editable_selected (self)) { +#line 5015 "CollectionPage.c" + AppWindow* _tmp3_; + AppWindow* _tmp4_; + ViewCollection* _tmp5_; + ViewCollection* _tmp6_; + GeeList* _tmp7_; + GeeCollection* _tmp8_; + gboolean _tmp9_; #line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = _tmp5_; + _tmp3_ = app_window_get_instance (); #line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp4_ = _tmp3_; #line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = _tmp7_; + _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = view_collection_get_selected_sources (_tmp8_); + _tmp6_ = _tmp5_; #line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp7_ = view_collection_get_selected_sources (_tmp6_); #line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = revert_editable_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp10_); + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection); #line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = !_tmp11_; + _tmp9_ = !revert_editable_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow), _tmp8_); #line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp8_); + _data_collection_unref0 (_tmp6_); #line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp4_); #line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp12_) { + if (_tmp9_) { #line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4760 "CollectionPage.c" +#line 5047 "CollectionPage.c" } { GeeList* _object_list = NULL; - ViewCollection* _tmp13_; - ViewCollection* _tmp14_; - GeeList* _tmp15_; - GeeList* _tmp16_; + ViewCollection* _tmp10_; + ViewCollection* _tmp11_; + GeeList* _tmp12_; + GeeList* _tmp13_; gint _object_size = 0; - GeeList* _tmp17_; - gint _tmp18_; - gint _tmp19_; + GeeList* _tmp14_; + gint _tmp15_; + gint _tmp16_; gint _object_index = 0; #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp14_ = _tmp13_; + _tmp11_ = _tmp10_; #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp15_ = view_collection_get_selected_sources (_tmp14_); + _tmp12_ = view_collection_get_selected_sources (_tmp11_); #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp16_ = _tmp15_; + _tmp13_ = _tmp12_; #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp14_); + _data_collection_unref0 (_tmp11_); #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _object_list = _tmp16_; + _object_list = _tmp13_; #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp17_ = _object_list; + _tmp14_ = _object_list; #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp15_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection)); #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp19_ = _tmp18_; + _tmp16_ = _tmp15_; #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _object_size = _tmp19_; + _object_size = _tmp16_; #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" _object_index = -1; #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" while (TRUE) { -#line 4797 "CollectionPage.c" - gint _tmp20_; - gint _tmp21_; - gint _tmp22_; +#line 5084 "CollectionPage.c" + gint _tmp17_; + gint _tmp18_; + gint _tmp19_; DataObject* object = NULL; - GeeList* _tmp23_; - gint _tmp24_; - gpointer _tmp25_; - DataObject* _tmp26_; + GeeList* _tmp20_; + gint _tmp21_; + gpointer _tmp22_; + DataObject* _tmp23_; #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp20_ = _object_index; + _tmp17_ = _object_index; #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _object_index = _tmp20_ + 1; + _object_index = _tmp17_ + 1; #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp21_ = _object_index; + _tmp18_ = _object_index; #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp22_ = _object_size; + _tmp19_ = _object_size; #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!(_tmp21_ < _tmp22_)) { + if (!(_tmp18_ < _tmp19_)) { #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 4818 "CollectionPage.c" +#line 5105 "CollectionPage.c" } #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp23_ = _object_list; + _tmp20_ = _object_list; #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp24_ = _object_index; + _tmp21_ = _object_index; #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp25_ = gee_list_get (_tmp23_, _tmp24_); + _tmp22_ = gee_list_get (_tmp20_, _tmp21_); #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" - object = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp25_, TYPE_DATA_OBJECT, DataObject); + object = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp22_, TYPE_DATA_OBJECT, DataObject); #line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp26_ = object; + _tmp23_ = object; #line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala" - photo_revert_to_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_PHOTO, Photo), TRUE); + photo_revert_to_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO, Photo), TRUE); #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (object); -#line 4834 "CollectionPage.c" +#line 5121 "CollectionPage.c" } #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_object_list); -#line 4838 "CollectionPage.c" +#line 5125 "CollectionPage.c" } } #line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp27_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp28_ = _tmp27_; + _tmp25_ = _tmp24_; #line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp29_ = view_collection_get_selected (_tmp28_); + _tmp26_ = view_collection_get_selected (_tmp25_); #line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp30_ = _tmp29_; + _tmp27_ = _tmp26_; #line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp31_ = revert_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp28_ = revert_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ITERABLE, GeeIterable)); #line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp32_ = _tmp31_; + _tmp29_ = _tmp28_; #line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp30_); + _g_object_unref0 (_tmp27_); #line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp28_); + _data_collection_unref0 (_tmp25_); #line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command = _tmp32_; + command = _tmp29_; #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp33_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp30_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp34_ = _tmp33_; + _tmp31_ = _tmp30_; #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp35_ = command; + _tmp32_ = command; #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command_manager_execute (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_COMMAND, Command)); #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _command_manager_unref0 (_tmp34_); + _command_manager_unref0 (_tmp31_); #line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (command); -#line 4871 "CollectionPage.c" +#line 5158 "CollectionPage.c" } -void collection_page_on_copy_adjustments (CollectionPage* self) { +void +collection_page_on_copy_adjustments (CollectionPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; Photo* photo = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + DataView* _tmp5_; DataView* _tmp6_; - DataView* _tmp7_; - DataSource* _tmp8_; + DataSource* _tmp7_; + Photo* _tmp8_; Photo* _tmp9_; - Photo* _tmp10_; + PixelTransformationBundle* _tmp10_; PixelTransformationBundle* _tmp11_; - PixelTransformationBundle* _tmp12_; #line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4893,72 +5181,71 @@ void collection_page_on_copy_adjustments (CollectionPage* self) { #line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = _tmp0_; #line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _tmp2_ != 1; + _tmp2_ = view_collection_get_selected_count (_tmp1_) != 1; #line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp1_); #line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4906 "CollectionPage.c" +#line 5192 "CollectionPage.c" } #line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = view_collection_get_selected_at (_tmp5_, 0); + _tmp5_ = view_collection_get_selected_at (_tmp4_, 0); #line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = data_view_get_source (_tmp7_); + _tmp7_ = data_view_get_source (_tmp6_); #line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo); + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO, Photo); #line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala" - photo = _tmp9_; + photo = _tmp8_; #line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = photo; + _tmp9_ = photo; #line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = photo_get_color_adjustments (_tmp10_); + _tmp10_ = photo_get_color_adjustments (_tmp9_); #line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala" - pixel_transformation_bundle_set_copied_color_adjustments (_tmp12_); + pixel_transformation_bundle_set_copied_color_adjustments (_tmp11_); #line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _pixel_transformation_bundle_unref0 (_tmp12_); + _pixel_transformation_bundle_unref0 (_tmp11_); #line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", TRUE); #line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photo); -#line 4940 "CollectionPage.c" +#line 5226 "CollectionPage.c" } -void collection_page_on_paste_adjustments (CollectionPage* self) { +void +collection_page_on_paste_adjustments (CollectionPage* self) +{ PixelTransformationBundle* copied_adjustments = NULL; PixelTransformationBundle* _tmp0_; gboolean _tmp1_ = FALSE; ViewCollection* _tmp2_; ViewCollection* _tmp3_; - gint _tmp4_; - gboolean _tmp5_; + gboolean _tmp4_; AdjustColorsMultipleCommand* command = NULL; + ViewCollection* _tmp6_; ViewCollection* _tmp7_; - ViewCollection* _tmp8_; + GeeList* _tmp8_; GeeList* _tmp9_; - GeeList* _tmp10_; - PixelTransformationBundle* _tmp11_; + PixelTransformationBundle* _tmp10_; + AdjustColorsMultipleCommand* _tmp11_; AdjustColorsMultipleCommand* _tmp12_; - AdjustColorsMultipleCommand* _tmp13_; + CommandManager* _tmp13_; CommandManager* _tmp14_; - CommandManager* _tmp15_; - AdjustColorsMultipleCommand* _tmp16_; + AdjustColorsMultipleCommand* _tmp15_; #line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4970,23 +5257,21 @@ void collection_page_on_paste_adjustments (CollectionPage* self) { #line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp3_ = _tmp2_; #line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = view_collection_get_selected_count (_tmp3_); -#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = _tmp4_ == 0; + _tmp4_ = view_collection_get_selected_count (_tmp3_) == 0; #line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp3_); #line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp5_) { + if (_tmp4_) { #line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = TRUE; -#line 4983 "CollectionPage.c" +#line 5268 "CollectionPage.c" } else { - PixelTransformationBundle* _tmp6_; + PixelTransformationBundle* _tmp5_; #line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = copied_adjustments; + _tmp5_ = copied_adjustments; #line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp1_ = _tmp6_ == NULL; -#line 4990 "CollectionPage.c" + _tmp1_ = _tmp5_ == NULL; +#line 5275 "CollectionPage.c" } #line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp1_) { @@ -4994,61 +5279,62 @@ void collection_page_on_paste_adjustments (CollectionPage* self) { _pixel_transformation_bundle_unref0 (copied_adjustments); #line 568 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4998 "CollectionPage.c" +#line 5283 "CollectionPage.c" } #line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = view_collection_get_selected (_tmp8_); + _tmp8_ = view_collection_get_selected (_tmp7_); #line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = copied_adjustments; + _tmp10_ = copied_adjustments; #line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = adjust_colors_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable), _tmp11_, RESOURCES_PASTE_ADJUSTMENTS_LABEL, RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP); + _tmp11_ = adjust_colors_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable), _tmp10_, RESOURCES_PASTE_ADJUSTMENTS_LABEL, RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP); #line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp9_); #line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp8_); + _data_collection_unref0 (_tmp7_); #line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command = _tmp13_; + command = _tmp12_; #line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp14_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp13_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp16_ = command; + _tmp15_ = command; #line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command_manager_execute (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_COMMAND, Command)); #line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _command_manager_unref0 (_tmp15_); + _command_manager_unref0 (_tmp14_); #line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (command); #line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala" _pixel_transformation_bundle_unref0 (copied_adjustments); -#line 5034 "CollectionPage.c" +#line 5319 "CollectionPage.c" } -static void collection_page_on_enhance (CollectionPage* self) { +static void +collection_page_on_enhance (CollectionPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; EnhanceMultipleCommand* command = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + GeeList* _tmp5_; GeeList* _tmp6_; - GeeList* _tmp7_; + EnhanceMultipleCommand* _tmp7_; EnhanceMultipleCommand* _tmp8_; - EnhanceMultipleCommand* _tmp9_; + CommandManager* _tmp9_; CommandManager* _tmp10_; - CommandManager* _tmp11_; - EnhanceMultipleCommand* _tmp12_; + EnhanceMultipleCommand* _tmp11_; #line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5056,66 +5342,65 @@ static void collection_page_on_enhance (CollectionPage* self) { #line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = _tmp0_; #line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0; #line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp1_); #line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 5069 "CollectionPage.c" +#line 5353 "CollectionPage.c" } #line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = view_collection_get_selected (_tmp5_); + _tmp5_ = view_collection_get_selected (_tmp4_); #line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = enhance_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = enhance_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command = _tmp9_; + command = _tmp8_; #line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = command; + _tmp11_ = command; #line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); #line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _command_manager_unref0 (_tmp11_); + _command_manager_unref0 (_tmp10_); #line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (command); -#line 5101 "CollectionPage.c" +#line 5385 "CollectionPage.c" } -static void collection_page_on_duplicate_photo (CollectionPage* self) { +static void +collection_page_on_duplicate_photo (CollectionPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; DuplicateMultiplePhotosCommand* command = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + GeeList* _tmp5_; GeeList* _tmp6_; - GeeList* _tmp7_; + DuplicateMultiplePhotosCommand* _tmp7_; DuplicateMultiplePhotosCommand* _tmp8_; - DuplicateMultiplePhotosCommand* _tmp9_; + CommandManager* _tmp9_; CommandManager* _tmp10_; - CommandManager* _tmp11_; - DuplicateMultiplePhotosCommand* _tmp12_; + DuplicateMultiplePhotosCommand* _tmp11_; #line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5123,82 +5408,80 @@ static void collection_page_on_duplicate_photo (CollectionPage* self) { #line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = _tmp0_; #line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0; #line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp1_); #line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 5136 "CollectionPage.c" +#line 5419 "CollectionPage.c" } #line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = view_collection_get_selected (_tmp5_); + _tmp5_ = view_collection_get_selected (_tmp4_); #line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = duplicate_multiple_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = duplicate_multiple_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command = _tmp9_; + command = _tmp8_; #line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = command; + _tmp11_ = command; #line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); #line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _command_manager_unref0 (_tmp11_); + _command_manager_unref0 (_tmp10_); #line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (command); -#line 5168 "CollectionPage.c" +#line 5451 "CollectionPage.c" } -static void collection_page_on_adjust_date_time (CollectionPage* self) { +static void +collection_page_on_adjust_date_time (CollectionPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; gboolean selected_has_videos = FALSE; gboolean only_videos_selected = FALSE; Dateable* photo_source = NULL; + ViewCollection* _tmp20_; ViewCollection* _tmp21_; - ViewCollection* _tmp22_; + DataView* _tmp22_; DataView* _tmp23_; - DataView* _tmp24_; - DataSource* _tmp25_; - Dateable* _tmp26_; + DataSource* _tmp24_; + Dateable* _tmp25_; AdjustDateTimeDialog* dialog = NULL; - Dateable* _tmp27_; + Dateable* _tmp26_; + ViewCollection* _tmp27_; ViewCollection* _tmp28_; - ViewCollection* _tmp29_; - gint _tmp30_; - gboolean _tmp31_; - gboolean _tmp32_; - AdjustDateTimeDialog* _tmp33_; - AdjustDateTimeDialog* _tmp34_; + gboolean _tmp29_; + gboolean _tmp30_; + AdjustDateTimeDialog* _tmp31_; + AdjustDateTimeDialog* _tmp32_; gint64 time_shift = 0LL; gboolean keep_relativity = FALSE; gboolean modify_originals = FALSE; - AdjustDateTimeDialog* _tmp35_; - gint64 _tmp36_ = 0LL; - gboolean _tmp37_ = FALSE; - gboolean _tmp38_ = FALSE; - gboolean _tmp39_; + AdjustDateTimeDialog* _tmp33_; + gint64 _tmp34_ = 0LL; + gboolean _tmp35_ = FALSE; + gboolean _tmp36_ = FALSE; + gboolean _tmp37_; #line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5206,243 +5489,240 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) { #line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = _tmp0_; #line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0; #line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp1_); #line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 5219 "CollectionPage.c" +#line 5500 "CollectionPage.c" } #line 596 "/home/jens/Source/shotwell/src/CollectionPage.vala" selected_has_videos = FALSE; #line 597 "/home/jens/Source/shotwell/src/CollectionPage.vala" only_videos_selected = TRUE; -#line 5225 "CollectionPage.c" +#line 5506 "CollectionPage.c" { GeeList* _dv_list = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + GeeList* _tmp5_; GeeList* _tmp6_; - GeeList* _tmp7_; gint _dv_size = 0; - GeeList* _tmp8_; + GeeList* _tmp7_; + gint _tmp8_; gint _tmp9_; - gint _tmp10_; gint _dv_index = 0; #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = view_collection_get_selected (_tmp5_); + _tmp5_ = view_collection_get_selected (_tmp4_); #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _dv_list = _tmp7_; + _dv_list = _tmp6_; #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = _dv_list; + _tmp7_ = _dv_list; #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _dv_size = _tmp10_; + _dv_size = _tmp9_; #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" _dv_index = -1; #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" while (TRUE) { -#line 5261 "CollectionPage.c" +#line 5542 "CollectionPage.c" + gint _tmp10_; gint _tmp11_; gint _tmp12_; - gint _tmp13_; DataView* dv = NULL; - GeeList* _tmp14_; - gint _tmp15_; - gpointer _tmp16_; - DataView* _tmp17_; + GeeList* _tmp13_; + gint _tmp14_; + gpointer _tmp15_; + DataView* _tmp16_; + DataSource* _tmp17_; DataSource* _tmp18_; - DataSource* _tmp19_; - gboolean _tmp20_; + gboolean _tmp19_; #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = _dv_index; + _tmp10_ = _dv_index; #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _dv_index = _tmp11_ + 1; + _dv_index = _tmp10_ + 1; #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = _dv_index; + _tmp11_ = _dv_index; #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp13_ = _dv_size; + _tmp12_ = _dv_size; #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!(_tmp12_ < _tmp13_)) { + if (!(_tmp11_ < _tmp12_)) { #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 5285 "CollectionPage.c" +#line 5566 "CollectionPage.c" } #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp14_ = _dv_list; + _tmp13_ = _dv_list; #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp15_ = _dv_index; + _tmp14_ = _dv_index; #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp16_ = gee_list_get (_tmp14_, _tmp15_); + _tmp15_ = gee_list_get (_tmp13_, _tmp14_); #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" - dv = (DataView*) _tmp16_; + dv = (DataView*) _tmp15_; #line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp17_ = dv; + _tmp16_ = dv; #line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp18_ = data_view_get_source (_tmp17_); + _tmp17_ = data_view_get_source (_tmp16_); #line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_VIDEO); + _tmp19_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_VIDEO); #line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp19_); + _g_object_unref0 (_tmp18_); #line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp20_) { + if (_tmp19_) { #line 601 "/home/jens/Source/shotwell/src/CollectionPage.vala" selected_has_videos = TRUE; -#line 5309 "CollectionPage.c" +#line 5590 "CollectionPage.c" } else { #line 603 "/home/jens/Source/shotwell/src/CollectionPage.vala" only_videos_selected = FALSE; -#line 5313 "CollectionPage.c" +#line 5594 "CollectionPage.c" } #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (dv); -#line 5317 "CollectionPage.c" +#line 5598 "CollectionPage.c" } #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_dv_list); -#line 5321 "CollectionPage.c" +#line 5602 "CollectionPage.c" } #line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp23_ = view_collection_get_selected_at (_tmp22_, 0); + _tmp22_ = view_collection_get_selected_at (_tmp21_, 0); #line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp25_ = data_view_get_source (_tmp24_); + _tmp24_ = data_view_get_source (_tmp23_); #line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp26_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATEABLE, Dateable); + _tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATEABLE, Dateable); #line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp23_); #line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp22_); + _data_collection_unref0 (_tmp21_); #line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala" - photo_source = _tmp26_; + photo_source = _tmp25_; #line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp27_ = photo_source; + _tmp26_ = photo_source; #line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp29_ = _tmp28_; + _tmp27_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp30_ = view_collection_get_selected_count (_tmp29_); + _tmp28_ = _tmp27_; #line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp31_ = selected_has_videos; + _tmp29_ = selected_has_videos; #line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp32_ = only_videos_selected; + _tmp30_ = only_videos_selected; #line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp33_ = adjust_date_time_dialog_new (_tmp27_, _tmp30_, TRUE, _tmp31_, _tmp32_); + _tmp31_ = adjust_date_time_dialog_new (_tmp26_, view_collection_get_selected_count (_tmp28_), TRUE, _tmp29_, _tmp30_); #line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala" - g_object_ref_sink (_tmp33_); + g_object_ref_sink (_tmp31_); #line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp34_ = _tmp33_; + _tmp32_ = _tmp31_; #line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp29_); + _data_collection_unref0 (_tmp28_); #line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala" - dialog = _tmp34_; + dialog = _tmp32_; #line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp35_ = dialog; + _tmp33_ = dialog; #line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp39_ = adjust_date_time_dialog_execute (_tmp35_, &_tmp36_, &_tmp37_, &_tmp38_); + _tmp37_ = adjust_date_time_dialog_execute (_tmp33_, &_tmp34_, &_tmp35_, &_tmp36_); #line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala" - time_shift = _tmp36_; + time_shift = _tmp34_; #line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala" - keep_relativity = _tmp37_; + keep_relativity = _tmp35_; #line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala" - modify_originals = _tmp38_; + modify_originals = _tmp36_; #line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp39_) { -#line 5375 "CollectionPage.c" + if (_tmp37_) { +#line 5654 "CollectionPage.c" AdjustDateTimePhotosCommand* command = NULL; - ViewCollection* _tmp40_; - ViewCollection* _tmp41_; - GeeList* _tmp42_; - GeeList* _tmp43_; - gint64 _tmp44_; - gboolean _tmp45_; - gboolean _tmp46_; - AdjustDateTimePhotosCommand* _tmp47_; - AdjustDateTimePhotosCommand* _tmp48_; - CommandManager* _tmp49_; - CommandManager* _tmp50_; - AdjustDateTimePhotosCommand* _tmp51_; + ViewCollection* _tmp38_; + ViewCollection* _tmp39_; + GeeList* _tmp40_; + GeeList* _tmp41_; + gint64 _tmp42_; + gboolean _tmp43_; + gboolean _tmp44_; + AdjustDateTimePhotosCommand* _tmp45_; + AdjustDateTimePhotosCommand* _tmp46_; + CommandManager* _tmp47_; + CommandManager* _tmp48_; + AdjustDateTimePhotosCommand* _tmp49_; #line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp40_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp38_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp41_ = _tmp40_; + _tmp39_ = _tmp38_; #line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp42_ = view_collection_get_selected (_tmp41_); + _tmp40_ = view_collection_get_selected (_tmp39_); #line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp43_ = _tmp42_; + _tmp41_ = _tmp40_; #line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp44_ = time_shift; + _tmp42_ = time_shift; #line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp45_ = keep_relativity; + _tmp43_ = keep_relativity; #line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp46_ = modify_originals; + _tmp44_ = modify_originals; #line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp47_ = adjust_date_time_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_ITERABLE, GeeIterable), _tmp44_, _tmp45_, _tmp46_); + _tmp45_ = adjust_date_time_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ITERABLE, GeeIterable), _tmp42_, _tmp43_, _tmp44_); #line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp48_ = _tmp47_; + _tmp46_ = _tmp45_; #line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp43_); + _g_object_unref0 (_tmp41_); #line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp41_); + _data_collection_unref0 (_tmp39_); #line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command = _tmp48_; + command = _tmp46_; #line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp49_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp47_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp50_ = _tmp49_; + _tmp48_ = _tmp47_; #line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp51_ = command; + _tmp49_ = command; #line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command_manager_execute (_tmp50_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_COMMAND, Command)); #line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _command_manager_unref0 (_tmp50_); + _command_manager_unref0 (_tmp48_); #line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (command); -#line 5425 "CollectionPage.c" +#line 5704 "CollectionPage.c" } #line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (dialog); #line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photo_source); -#line 5431 "CollectionPage.c" +#line 5710 "CollectionPage.c" } -static void collection_page_on_external_edit (CollectionPage* self) { +static void +collection_page_on_external_edit (CollectionPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; Photo* photo = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + DataView* _tmp5_; DataView* _tmp6_; - DataView* _tmp7_; - DataSource* _tmp8_; - Photo* _tmp9_; + DataSource* _tmp7_; + Photo* _tmp8_; GError * _inner_error_ = NULL; #line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); @@ -5451,98 +5731,96 @@ static void collection_page_on_external_edit (CollectionPage* self) { #line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = _tmp0_; #line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _tmp2_ != 1; + _tmp2_ = view_collection_get_selected_count (_tmp1_) != 1; #line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp1_); #line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 5464 "CollectionPage.c" +#line 5742 "CollectionPage.c" } #line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = view_collection_get_selected_at (_tmp5_, 0); + _tmp5_ = view_collection_get_selected_at (_tmp4_, 0); #line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = data_view_get_source (_tmp7_); + _tmp7_ = data_view_get_source (_tmp6_); #line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo); + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO, Photo); #line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala" - photo = _tmp9_; -#line 5484 "CollectionPage.c" + photo = _tmp8_; +#line 5762 "CollectionPage.c" { + AppWindow* _tmp9_; AppWindow* _tmp10_; - AppWindow* _tmp11_; - Photo* _tmp12_; + Photo* _tmp11_; + AppWindow* _tmp12_; AppWindow* _tmp13_; - AppWindow* _tmp14_; #line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = app_window_get_instance (); + _tmp9_ = app_window_get_instance (); #line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PAGE_WINDOW, PageWindow)); #line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp10_); #line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = photo; + _tmp11_ = photo; #line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala" - photo_open_with_external_editor (_tmp12_, &_inner_error_); + photo_open_with_external_editor (_tmp11_, &_inner_error_); #line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5505 "CollectionPage.c" +#line 5783 "CollectionPage.c" goto __catch246_g_error; } #line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp13_ = app_window_get_instance (); + _tmp12_ = app_window_get_instance (); #line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE_WINDOW, PageWindow)); #line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp14_); -#line 5516 "CollectionPage.c" + _g_object_unref0 (_tmp13_); +#line 5794 "CollectionPage.c" } goto __finally246; __catch246_g_error: { GError* err = NULL; + AppWindow* _tmp14_; AppWindow* _tmp15_; - AppWindow* _tmp16_; - GError* _tmp17_; - Photo* _tmp18_; + GError* _tmp16_; + Photo* _tmp17_; #line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala" err = _inner_error_; #line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala" _inner_error_ = NULL; #line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp15_ = app_window_get_instance (); + _tmp14_ = app_window_get_instance (); #line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE_WINDOW, PageWindow)); #line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp15_); #line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp17_ = err; + _tmp16_ = err; #line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp18_ = photo; + _tmp17_ = photo; #line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala" - open_external_editor_error_dialog (_tmp17_, _tmp18_); + open_external_editor_error_dialog (_tmp16_, _tmp17_); #line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_error_free0 (err); -#line 5546 "CollectionPage.c" +#line 5824 "CollectionPage.c" } __finally246: #line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5555,28 +5833,28 @@ static void collection_page_on_external_edit (CollectionPage* self) { g_clear_error (&_inner_error_); #line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 5559 "CollectionPage.c" +#line 5837 "CollectionPage.c" } #line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photo); -#line 5563 "CollectionPage.c" +#line 5841 "CollectionPage.c" } -static void collection_page_on_external_edit_raw (CollectionPage* self) { +static void +collection_page_on_external_edit_raw (CollectionPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; Photo* photo = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + DataView* _tmp5_; DataView* _tmp6_; - DataView* _tmp7_; - DataSource* _tmp8_; + DataSource* _tmp7_; + Photo* _tmp8_; Photo* _tmp9_; - Photo* _tmp10_; - PhotoFileFormat _tmp11_; GError * _inner_error_ = NULL; #line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); @@ -5585,114 +5863,110 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) { #line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = _tmp0_; #line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _tmp2_ != 1; + _tmp2_ = view_collection_get_selected_count (_tmp1_) != 1; #line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp1_); #line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 5598 "CollectionPage.c" +#line 5874 "CollectionPage.c" } #line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = view_collection_get_selected_at (_tmp5_, 0); + _tmp5_ = view_collection_get_selected_at (_tmp4_, 0); #line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = data_view_get_source (_tmp7_); + _tmp7_ = data_view_get_source (_tmp6_); #line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo); + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO, Photo); #line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala" - photo = _tmp9_; -#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = photo; + photo = _tmp8_; #line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = photo_get_master_file_format (_tmp10_); + _tmp9_ = photo; #line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp11_ != PHOTO_FILE_FORMAT_RAW) { + if (photo_get_master_file_format (_tmp9_) != PHOTO_FILE_FORMAT_RAW) { #line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photo); #line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 5628 "CollectionPage.c" +#line 5902 "CollectionPage.c" } { - AppWindow* _tmp12_; + AppWindow* _tmp10_; + AppWindow* _tmp11_; + Photo* _tmp12_; AppWindow* _tmp13_; - Photo* _tmp14_; - AppWindow* _tmp15_; - AppWindow* _tmp16_; + AppWindow* _tmp14_; #line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = app_window_get_instance (); + _tmp10_ = app_window_get_instance (); #line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE_WINDOW, PageWindow)); #line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp11_); #line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp14_ = photo; + _tmp12_ = photo; #line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala" - photo_open_with_raw_external_editor (_tmp14_, &_inner_error_); + photo_open_with_raw_external_editor (_tmp12_, &_inner_error_); #line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5650 "CollectionPage.c" +#line 5924 "CollectionPage.c" goto __catch247_g_error; } #line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp15_ = app_window_get_instance (); + _tmp13_ = app_window_get_instance (); #line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp16_ = _tmp15_; + _tmp14_ = _tmp13_; #line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PAGE_WINDOW, PageWindow)); #line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp16_); -#line 5661 "CollectionPage.c" + _g_object_unref0 (_tmp14_); +#line 5935 "CollectionPage.c" } goto __finally247; __catch247_g_error: { GError* err = NULL; - AppWindow* _tmp17_; - AppWindow* _tmp18_; - GError* _tmp19_; - gchar* _tmp20_; - gchar* _tmp21_; + AppWindow* _tmp15_; + AppWindow* _tmp16_; + GError* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; #line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala" err = _inner_error_; #line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala" _inner_error_ = NULL; #line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp17_ = app_window_get_instance (); + _tmp15_ = app_window_get_instance (); #line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp18_ = _tmp17_; + _tmp16_ = _tmp15_; #line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE_WINDOW, PageWindow)); #line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp16_); #line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp19_ = err; + _tmp17_ = err; #line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp20_ = resources_launch_editor_failed (_tmp19_); + _tmp18_ = resources_launch_editor_failed (_tmp17_); #line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp21_ = _tmp20_; + _tmp19_ = _tmp18_; #line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala" - app_window_error_message (_tmp21_, NULL); + app_window_error_message (_tmp19_, NULL); #line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_free0 (_tmp21_); + _g_free0 (_tmp19_); #line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_error_free0 (err); -#line 5696 "CollectionPage.c" +#line 5970 "CollectionPage.c" } __finally247: #line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5705,15 +5979,17 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) { g_clear_error (&_inner_error_); #line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 5709 "CollectionPage.c" +#line 5983 "CollectionPage.c" } #line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photo); -#line 5713 "CollectionPage.c" +#line 5987 "CollectionPage.c" } -void collection_page_on_set_background (CollectionPage* self) { +void +collection_page_on_set_background (CollectionPage* self) +{ GeeArrayList* photos = NULL; GeeArrayList* _tmp0_; ViewCollection* _tmp1_; @@ -5756,7 +6032,7 @@ void collection_page_on_set_background (CollectionPage* self) { _tmp8_ = _tmp7_; #line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp8_ == 1) { -#line 5760 "CollectionPage.c" +#line 6036 "CollectionPage.c" SetBackgroundPhotoDialog* dialog = NULL; SetBackgroundPhotoDialog* _tmp9_; SetBackgroundPhotoDialog* _tmp10_; @@ -5779,7 +6055,7 @@ void collection_page_on_set_background (CollectionPage* self) { screensaver = _tmp12_; #line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp13_) { -#line 5783 "CollectionPage.c" +#line 6059 "CollectionPage.c" AppWindow* _tmp14_; AppWindow* _tmp15_; GeeArrayList* _tmp16_; @@ -5819,11 +6095,11 @@ void collection_page_on_set_background (CollectionPage* self) { page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE_WINDOW, PageWindow)); #line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp22_); -#line 5823 "CollectionPage.c" +#line 6099 "CollectionPage.c" } #line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (dialog); -#line 5827 "CollectionPage.c" +#line 6103 "CollectionPage.c" } else { GeeArrayList* _tmp23_; gint _tmp24_; @@ -5836,7 +6112,7 @@ void collection_page_on_set_background (CollectionPage* self) { _tmp25_ = _tmp24_; #line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp25_ > 1) { -#line 5840 "CollectionPage.c" +#line 6116 "CollectionPage.c" SetBackgroundSlideshowDialog* dialog = NULL; SetBackgroundSlideshowDialog* _tmp26_; gint delay = 0; @@ -5863,7 +6139,7 @@ void collection_page_on_set_background (CollectionPage* self) { screensaver = _tmp30_; #line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp31_) { -#line 5867 "CollectionPage.c" +#line 6143 "CollectionPage.c" AppWindow* _tmp32_; AppWindow* _tmp33_; GeeArrayList* _tmp34_; @@ -5898,55 +6174,55 @@ void collection_page_on_set_background (CollectionPage* self) { page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PAGE_WINDOW, PageWindow)); #line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp39_); -#line 5902 "CollectionPage.c" +#line 6178 "CollectionPage.c" } #line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (dialog); -#line 5906 "CollectionPage.c" +#line 6182 "CollectionPage.c" } } #line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photos); -#line 5911 "CollectionPage.c" +#line 6187 "CollectionPage.c" } -static void collection_page_on_slideshow (CollectionPage* self) { +static void +collection_page_on_slideshow (CollectionPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; - GeeList* _tmp4_ = NULL; + gboolean _tmp2_; + GeeList* _tmp3_ = NULL; + ViewCollection* _tmp4_; ViewCollection* _tmp5_; - ViewCollection* _tmp6_; - gint _tmp7_; - gboolean _tmp8_; + gboolean _tmp6_; GeeList* sources = NULL; + GeeList* _tmp13_; + gboolean _tmp14_ = FALSE; GeeList* _tmp15_; - gboolean _tmp16_ = FALSE; - GeeList* _tmp17_; Thumbnail* thumbnail = NULL; - ViewCollection* _tmp21_; - ViewCollection* _tmp22_; - GeeList* _tmp23_; - gpointer _tmp24_; - DataSource* _tmp25_; - DataView* _tmp26_; - Thumbnail* _tmp27_; - Thumbnail* _tmp28_; + ViewCollection* _tmp19_; + ViewCollection* _tmp20_; + GeeList* _tmp21_; + gpointer _tmp22_; + DataSource* _tmp23_; + DataView* _tmp24_; + Thumbnail* _tmp25_; + Thumbnail* _tmp26_; LibraryPhoto* photo = NULL; - Thumbnail* _tmp29_; - MediaSource* _tmp30_; - LibraryPhoto* _tmp31_; - LibraryPhoto* _tmp32_; - AppWindow* _tmp33_; - AppWindow* _tmp34_; - LibraryPhotoSourceCollection* _tmp35_; - ViewCollection* _tmp36_; - ViewCollection* _tmp37_; - LibraryPhoto* _tmp38_; - SlideshowPage* _tmp39_; - SlideshowPage* _tmp40_; + Thumbnail* _tmp27_; + MediaSource* _tmp28_; + LibraryPhoto* _tmp29_; + LibraryPhoto* _tmp30_; + AppWindow* _tmp31_; + AppWindow* _tmp32_; + LibraryPhotoSourceCollection* _tmp33_; + ViewCollection* _tmp34_; + ViewCollection* _tmp35_; + LibraryPhoto* _tmp36_; + SlideshowPage* _tmp37_; + SlideshowPage* _tmp38_; #line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5954,151 +6230,147 @@ static void collection_page_on_slideshow (CollectionPage* self) { #line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = _tmp0_; #line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)); -#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)) == 0; #line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp1_); #line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 680 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 5967 "CollectionPage.c" +#line 6241 "CollectionPage.c" } #line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = _tmp5_; + _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = view_collection_get_selected_count (_tmp6_); + _tmp5_ = _tmp4_; #line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = _tmp7_ > 0; + _tmp6_ = view_collection_get_selected_count (_tmp5_) > 0; #line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp6_); + _data_collection_unref0 (_tmp5_); #line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp8_) { -#line 5981 "CollectionPage.c" - ViewCollection* _tmp9_; - ViewCollection* _tmp10_; - GeeList* _tmp11_; + if (_tmp6_) { +#line 6253 "CollectionPage.c" + ViewCollection* _tmp7_; + ViewCollection* _tmp8_; + GeeList* _tmp9_; #line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = view_collection_get_selected_sources_of_type (_tmp10_, TYPE_LIBRARY_PHOTO); + _tmp9_ = view_collection_get_selected_sources_of_type (_tmp8_, TYPE_LIBRARY_PHOTO); #line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = _tmp11_; + _tmp3_ = _tmp9_; #line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp10_); -#line 5997 "CollectionPage.c" + _data_collection_unref0 (_tmp8_); +#line 6269 "CollectionPage.c" } else { - ViewCollection* _tmp12_; - ViewCollection* _tmp13_; - GeeList* _tmp14_; + ViewCollection* _tmp10_; + ViewCollection* _tmp11_; + GeeList* _tmp12_; #line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp14_ = view_collection_get_sources_of_type (_tmp13_, TYPE_LIBRARY_PHOTO); + _tmp12_ = view_collection_get_sources_of_type (_tmp11_, TYPE_LIBRARY_PHOTO); #line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = _tmp14_; + _tmp3_ = _tmp12_; #line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp13_); -#line 6014 "CollectionPage.c" + _data_collection_unref0 (_tmp11_); +#line 6286 "CollectionPage.c" } #line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp15_ = _g_object_ref0 (_tmp4_); + _tmp13_ = _g_object_ref0 (_tmp3_); #line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala" - sources = _tmp15_; + sources = _tmp13_; #line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp17_ = sources; + _tmp15_ = sources; #line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp17_ == NULL) { + if (_tmp15_ == NULL) { #line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp16_ = TRUE; -#line 6026 "CollectionPage.c" + _tmp14_ = TRUE; +#line 6298 "CollectionPage.c" } else { - GeeList* _tmp18_; - gint _tmp19_; - gint _tmp20_; + GeeList* _tmp16_; + gint _tmp17_; + gint _tmp18_; #line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp18_ = sources; + _tmp16_ = sources; #line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp17_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection)); #line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp20_ = _tmp19_; + _tmp18_ = _tmp17_; #line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp16_ = _tmp20_ == 0; -#line 6039 "CollectionPage.c" + _tmp14_ = _tmp18_ == 0; +#line 6311 "CollectionPage.c" } #line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp16_) { + if (_tmp14_) { #line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (sources); #line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 6049 "CollectionPage.c" +#line 6321 "CollectionPage.c" } #line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp22_ = _tmp21_; + _tmp20_ = _tmp19_; #line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp23_ = sources; + _tmp21_ = sources; #line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp24_ = gee_list_get (_tmp23_, 0); + _tmp22_ = gee_list_get (_tmp21_, 0); #line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp25_ = (DataSource*) _tmp24_; + _tmp23_ = (DataSource*) _tmp22_; #line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp26_ = view_collection_get_view_for_source (_tmp22_, _tmp25_); + _tmp24_ = view_collection_get_view_for_source (_tmp20_, _tmp23_); #line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_THUMBNAIL, Thumbnail); + _tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_THUMBNAIL, Thumbnail); #line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp25_); + _g_object_unref0 (_tmp23_); #line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp22_); + _data_collection_unref0 (_tmp20_); #line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala" - thumbnail = _tmp27_; + thumbnail = _tmp25_; #line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp28_ = thumbnail; + _tmp26_ = thumbnail; #line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp28_ == NULL) { + if (_tmp26_ == NULL) { #line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (thumbnail); #line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (sources); #line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 6083 "CollectionPage.c" +#line 6355 "CollectionPage.c" } #line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp29_ = thumbnail; + _tmp27_ = thumbnail; #line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp30_ = thumbnail_get_media_source (_tmp29_); + _tmp28_ = thumbnail_get_media_source (_tmp27_); #line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp31_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp30_) : NULL; + _tmp29_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp28_) : NULL; #line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp31_ == NULL) { + if (_tmp29_ == NULL) { #line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp30_); -#line 6095 "CollectionPage.c" + _g_object_unref0 (_tmp28_); +#line 6367 "CollectionPage.c" } #line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala" - photo = _tmp31_; + photo = _tmp29_; #line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp32_ = photo; + _tmp30_ = photo; #line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp32_ == NULL) { + if (_tmp30_ == NULL) { #line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photo); #line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6106,37 +6378,37 @@ static void collection_page_on_slideshow (CollectionPage* self) { #line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (sources); #line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 6113 "CollectionPage.c" +#line 6385 "CollectionPage.c" } #line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp33_ = app_window_get_instance (); + _tmp31_ = app_window_get_instance (); #line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp34_ = _tmp33_; + _tmp32_ = _tmp31_; #line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp35_ = library_photo_global; + _tmp33_ = library_photo_global; #line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp36_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp34_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp37_ = _tmp36_; + _tmp35_ = _tmp34_; #line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp38_ = photo; + _tmp36_ = photo; #line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp39_ = slideshow_page_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PHOTO, Photo)); + _tmp37_ = slideshow_page_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_PHOTO, Photo)); #line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala" - g_object_ref_sink (_tmp39_); + g_object_ref_sink (_tmp37_); #line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp40_ = _tmp39_; + _tmp38_ = _tmp37_; #line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala" - app_window_go_fullscreen (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PAGE, Page)); + app_window_go_fullscreen (_tmp32_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PAGE, Page)); #line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp40_); + _g_object_unref0 (_tmp38_); #line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _data_collection_unref0 (_tmp37_); + _data_collection_unref0 (_tmp35_); #line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp34_); + _g_object_unref0 (_tmp32_); #line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photo); #line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6144,12 +6416,15 @@ static void collection_page_on_slideshow (CollectionPage* self) { #line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (sources); #line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp4_); -#line 6149 "CollectionPage.c" + _g_object_unref0 (_tmp3_); +#line 6421 "CollectionPage.c" } -static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* event) { +static gboolean +collection_page_real_on_ctrl_pressed (Page* base, + GdkEventKey* event) +{ CollectionPage * self; gboolean result = FALSE; GtkToolButton* rotate_button = NULL; @@ -6157,8 +6432,6 @@ static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* e GObject* _tmp1_; GtkToolButton* _tmp2_; GtkToolButton* _tmp3_; - GdkEventKey* _tmp7_; - gboolean _tmp8_; #line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6173,14 +6446,14 @@ static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* e _tmp3_ = rotate_button; #line 703 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp3_ != NULL) { -#line 6177 "CollectionPage.c" +#line 6450 "CollectionPage.c" GtkToolButton* _tmp4_; GtkToolButton* _tmp5_; GtkToolButton* _tmp6_; #line 704 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = rotate_button; #line 704 "/home/jens/Source/shotwell/src/CollectionPage.vala" - gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.RotateCounterclockwise"); + gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_actionable_get_type (), GtkActionable), "win.RotateCounterclockwise"); #line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp5_ = rotate_button; #line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6189,23 +6462,22 @@ static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* e _tmp6_ = rotate_button; #line 706 "/home/jens/Source/shotwell/src/CollectionPage.vala" gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CCW_TOOLTIP); -#line 6193 "CollectionPage.c" +#line 6466 "CollectionPage.c" } #line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = event; -#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = PAGE_CLASS (collection_page_parent_class)->on_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp7_); -#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala" - result = _tmp8_; + result = PAGE_CLASS (collection_page_parent_class)->on_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), event); #line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (rotate_button); #line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 6205 "CollectionPage.c" +#line 6474 "CollectionPage.c" } -static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey* event) { +static gboolean +collection_page_real_on_ctrl_released (Page* base, + GdkEventKey* event) +{ CollectionPage * self; gboolean result = FALSE; GtkToolButton* rotate_button = NULL; @@ -6213,8 +6485,6 @@ static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey* GObject* _tmp1_; GtkToolButton* _tmp2_; GtkToolButton* _tmp3_; - GdkEventKey* _tmp7_; - gboolean _tmp8_; #line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 713 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6229,14 +6499,14 @@ static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey* _tmp3_ = rotate_button; #line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp3_ != NULL) { -#line 6233 "CollectionPage.c" +#line 6503 "CollectionPage.c" GtkToolButton* _tmp4_; GtkToolButton* _tmp5_; GtkToolButton* _tmp6_; #line 715 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = rotate_button; #line 715 "/home/jens/Source/shotwell/src/CollectionPage.vala" - gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.RotateClockwise"); + gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_actionable_get_type (), GtkActionable), "win.RotateClockwise"); #line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp5_ = rotate_button; #line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6245,30 +6515,30 @@ static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey* _tmp6_ = rotate_button; #line 717 "/home/jens/Source/shotwell/src/CollectionPage.vala" gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CW_TOOLTIP); -#line 6249 "CollectionPage.c" +#line 6519 "CollectionPage.c" } #line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = event; -#line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = PAGE_CLASS (collection_page_parent_class)->on_ctrl_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp7_); -#line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala" - result = _tmp8_; + result = PAGE_CLASS (collection_page_parent_class)->on_ctrl_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), event); #line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (rotate_button); #line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 6261 "CollectionPage.c" +#line 6527 "CollectionPage.c" } -static gpointer _view_filter_ref0 (gpointer self) { +static gpointer +_view_filter_ref0 (gpointer self) +{ #line 724 "/home/jens/Source/shotwell/src/CollectionPage.vala" return self ? view_filter_ref (self) : NULL; -#line 6268 "CollectionPage.c" +#line 6536 "CollectionPage.c" } -static SearchViewFilter* collection_page_real_get_search_view_filter (CheckerboardPage* base) { +static SearchViewFilter* +collection_page_real_get_search_view_filter (CheckerboardPage* base) +{ CollectionPage * self; SearchViewFilter* result = NULL; CollectionPageCollectionSearchViewFilter* _tmp0_; @@ -6283,11 +6553,13 @@ static SearchViewFilter* collection_page_real_get_search_view_filter (Checkerboa result = _tmp1_; #line 724 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 6287 "CollectionPage.c" +#line 6557 "CollectionPage.c" } -static guint collection_page_collection_search_view_filter_real_get_criteria (SearchViewFilter* base) { +static guint +collection_page_collection_search_view_filter_real_get_criteria (SearchViewFilter* base) +{ CollectionPageCollectionSearchViewFilter * self; guint result = 0U; #line 23 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6296,41 +6568,51 @@ static guint collection_page_collection_search_view_filter_real_get_criteria (Se result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH); #line 24 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 6300 "CollectionPage.c" +#line 6572 "CollectionPage.c" } -CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_construct (GType object_type) { +CollectionPageCollectionSearchViewFilter* +collection_page_collection_search_view_filter_construct (GType object_type) +{ CollectionPageCollectionSearchViewFilter* self = NULL; #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = (CollectionPageCollectionSearchViewFilter*) default_search_view_filter_construct (object_type); #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala" return self; -#line 6310 "CollectionPage.c" +#line 6584 "CollectionPage.c" } -CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_new (void) { +CollectionPageCollectionSearchViewFilter* +collection_page_collection_search_view_filter_new (void) +{ #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala" return collection_page_collection_search_view_filter_construct (COLLECTION_PAGE_TYPE_COLLECTION_SEARCH_VIEW_FILTER); -#line 6317 "CollectionPage.c" +#line 6593 "CollectionPage.c" } -static void collection_page_collection_search_view_filter_class_init (CollectionPageCollectionSearchViewFilterClass * klass) { +static void +collection_page_collection_search_view_filter_class_init (CollectionPageCollectionSearchViewFilterClass * klass) +{ #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_collection_search_view_filter_parent_class = g_type_class_peek_parent (klass); #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala" ((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) collection_page_collection_search_view_filter_real_get_criteria; -#line 6326 "CollectionPage.c" +#line 6604 "CollectionPage.c" } -static void collection_page_collection_search_view_filter_instance_init (CollectionPageCollectionSearchViewFilter * self) { +static void +collection_page_collection_search_view_filter_instance_init (CollectionPageCollectionSearchViewFilter * self) +{ } -GType collection_page_collection_search_view_filter_get_type (void) { +GType +collection_page_collection_search_view_filter_get_type (void) +{ static volatile gsize collection_page_collection_search_view_filter_type_id__volatile = 0; if (g_once_init_enter (&collection_page_collection_search_view_filter_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CollectionPageCollectionSearchViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) collection_page_collection_search_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CollectionPageCollectionSearchViewFilter), 0, (GInstanceInitFunc) collection_page_collection_search_view_filter_instance_init, NULL }; @@ -6342,7 +6624,9 @@ GType collection_page_collection_search_view_filter_get_type (void) { } -static void collection_page_class_init (CollectionPageClass * klass) { +static void +collection_page_class_init (CollectionPageClass * klass) +{ #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_parent_class = g_type_class_peek_parent (klass); #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6375,11 +6659,13 @@ static void collection_page_class_init (CollectionPageClass * klass) { ((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) collection_page_real_get_search_view_filter; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" G_OBJECT_CLASS (klass)->finalize = collection_page_finalize; -#line 6379 "CollectionPage.c" +#line 6663 "CollectionPage.c" } -static void collection_page_instance_init (CollectionPage * self) { +static void +collection_page_instance_init (CollectionPage * self) +{ CollectionPageCollectionSearchViewFilter* _tmp0_; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" self->priv = COLLECTION_PAGE_GET_PRIVATE (self); @@ -6389,11 +6675,13 @@ static void collection_page_instance_init (CollectionPage * self) { _tmp0_ = collection_page_collection_search_view_filter_new (); #line 30 "/home/jens/Source/shotwell/src/CollectionPage.vala" self->priv->search_filter = _tmp0_; -#line 6393 "CollectionPage.c" +#line 6679 "CollectionPage.c" } -static void collection_page_finalize (GObject * obj) { +static void +collection_page_finalize (GObject * obj) +{ CollectionPage * self; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COLLECTION_PAGE, CollectionPage); @@ -6403,11 +6691,13 @@ static void collection_page_finalize (GObject * obj) { _view_filter_unref0 (self->priv->search_filter); #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" G_OBJECT_CLASS (collection_page_parent_class)->finalize (obj); -#line 6407 "CollectionPage.c" +#line 6695 "CollectionPage.c" } -GType collection_page_get_type (void) { +GType +collection_page_get_type (void) +{ static volatile gsize collection_page_type_id__volatile = 0; if (g_once_init_enter (&collection_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CollectionPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) collection_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CollectionPage), 0, (GInstanceInitFunc) collection_page_instance_init, NULL }; @@ -6419,7 +6709,11 @@ GType collection_page_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -6431,7 +6725,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/ColorTransformation.c b/src/ColorTransformation.c index 0cbc2d6..9110ffc 100644 --- a/src/ColorTransformation.c +++ b/src/ColorTransformation.c @@ -1,4 +1,4 @@ -/* ColorTransformation.c generated by valac 0.36.6, the Vala compiler +/* ColorTransformation.c generated by valac 0.40.4, the Vala compiler * generated from ColorTransformation.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -622,100 +623,157 @@ RGBAnalyticPixel* rgb_analytic_pixel_dup (const RGBAnalyticPixel* self); void rgb_analytic_pixel_free (RGBAnalyticPixel* self); #define RGB_ANALYTIC_PIXEL_INV_255 (1.0f / 255.0f) void rgb_analytic_pixel_init (RGBAnalyticPixel *self); -void rgb_analytic_pixel_init_from_components (RGBAnalyticPixel *self, gfloat red, gfloat green, gfloat blue); -void rgb_analytic_pixel_init_from_quantized_components (RGBAnalyticPixel *self, guchar red_quantized, guchar green_quantized, guchar blue_quantized); +void rgb_analytic_pixel_init_from_components (RGBAnalyticPixel *self, + gfloat red, + gfloat green, + gfloat blue); +void rgb_analytic_pixel_init_from_quantized_components (RGBAnalyticPixel *self, + guchar red_quantized, + guchar green_quantized, + guchar blue_quantized); GType hsv_analytic_pixel_get_type (void) G_GNUC_CONST; HSVAnalyticPixel* hsv_analytic_pixel_dup (const HSVAnalyticPixel* self); void hsv_analytic_pixel_free (HSVAnalyticPixel* self); -void rgb_analytic_pixel_init_from_hsv (RGBAnalyticPixel *self, HSVAnalyticPixel* hsv_pixel); -void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result); +void rgb_analytic_pixel_init_from_hsv (RGBAnalyticPixel *self, + HSVAnalyticPixel* hsv_pixel); +void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, + RGBAnalyticPixel* result); guchar rgb_analytic_pixel_quantized_red (RGBAnalyticPixel *self); guchar rgb_analytic_pixel_quantized_green (RGBAnalyticPixel *self); guchar rgb_analytic_pixel_quantized_blue (RGBAnalyticPixel *self); -gboolean rgb_analytic_pixel_equals (RGBAnalyticPixel *self, RGBAnalyticPixel* rhs); +gboolean rgb_analytic_pixel_equals (RGBAnalyticPixel *self, + RGBAnalyticPixel* rhs); guint rgb_analytic_pixel_hash_code (RGBAnalyticPixel *self); -void rgb_analytic_pixel_to_hsv (RGBAnalyticPixel *self, HSVAnalyticPixel* result); -void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* p); +void rgb_analytic_pixel_to_hsv (RGBAnalyticPixel *self, + HSVAnalyticPixel* result); +void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, + RGBAnalyticPixel* p); #define HSV_ANALYTIC_PIXEL_INV_255 (1.0f / 255.0f) void hsv_analytic_pixel_init (HSVAnalyticPixel *self); -void hsv_analytic_pixel_init_from_components (HSVAnalyticPixel *self, gfloat hue, gfloat saturation, gfloat light_value); -void hsv_analytic_pixel_init_from_quantized_components (HSVAnalyticPixel *self, guchar hue_quantized, guchar saturation_quantized, guchar light_value_quantized); -gboolean hsv_analytic_pixel_equals (HSVAnalyticPixel *self, HSVAnalyticPixel* rhs); +void hsv_analytic_pixel_init_from_components (HSVAnalyticPixel *self, + gfloat hue, + gfloat saturation, + gfloat light_value); +void hsv_analytic_pixel_init_from_quantized_components (HSVAnalyticPixel *self, + guchar hue_quantized, + guchar saturation_quantized, + guchar light_value_quantized); +gboolean hsv_analytic_pixel_equals (HSVAnalyticPixel *self, + HSVAnalyticPixel* rhs); guint hsv_analytic_pixel_hash_code (HSVAnalyticPixel *self); GType composition_mode_get_type (void) G_GNUC_CONST; GType pixel_format_get_type (void) G_GNUC_CONST; GType pixel_transformation_type_get_type (void) G_GNUC_CONST; gpointer pixel_transformation_bundle_ref (gpointer instance); void pixel_transformation_bundle_unref (gpointer instance); -GParamSpec* param_spec_pixel_transformation_bundle (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_pixel_transformation_bundle (GValue* value, gpointer v_object); -void value_take_pixel_transformation_bundle (GValue* value, gpointer v_object); +GParamSpec* param_spec_pixel_transformation_bundle (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_pixel_transformation_bundle (GValue* value, + gpointer v_object); +void value_take_pixel_transformation_bundle (GValue* value, + gpointer v_object); gpointer value_get_pixel_transformation_bundle (const GValue* value); GType pixel_transformation_bundle_get_type (void) G_GNUC_CONST; gpointer pixel_transformation_ref (gpointer instance); void pixel_transformation_unref (gpointer instance); -GParamSpec* param_spec_pixel_transformation (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_pixel_transformation (GValue* value, gpointer v_object); -void value_take_pixel_transformation (GValue* value, gpointer v_object); +GParamSpec* param_spec_pixel_transformation (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_pixel_transformation (GValue* value, + gpointer v_object); +void value_take_pixel_transformation (GValue* value, + gpointer v_object); gpointer value_get_pixel_transformation (const GValue* value); GType pixel_transformation_get_type (void) G_GNUC_CONST; #define PIXEL_TRANSFORMATION_BUNDLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundlePrivate)) -enum { - PIXEL_TRANSFORMATION_BUNDLE_DUMMY_PROPERTY -}; PixelTransformationBundle* pixel_transformation_bundle_new (void); PixelTransformationBundle* pixel_transformation_bundle_construct (GType object_type); PixelTransformationBundle* pixel_transformation_bundle_get_copied_color_adjustments (void); void pixel_transformation_bundle_set_copied_color_adjustments (PixelTransformationBundle* adjustments); gboolean pixel_transformation_bundle_has_copied_color_adjustments (void); -void pixel_transformation_bundle_set (PixelTransformationBundle* self, PixelTransformation* transformation); +void pixel_transformation_bundle_set (PixelTransformationBundle* self, + PixelTransformation* transformation); PixelTransformationType pixel_transformation_get_transformation_type (PixelTransformation* self); void pixel_transformation_bundle_set_to_identity (PixelTransformationBundle* self); -ExpansionTransformation* expansion_transformation_new_from_extrema (gint black_point, gint white_point); -ExpansionTransformation* expansion_transformation_construct_from_extrema (GType object_type, gint black_point, gint white_point); +ExpansionTransformation* expansion_transformation_new_from_extrema (gint black_point, + gint white_point); +ExpansionTransformation* expansion_transformation_construct_from_extrema (GType object_type, + gint black_point, + gint white_point); GType hsv_transformation_get_type (void) G_GNUC_CONST; GType expansion_transformation_get_type (void) G_GNUC_CONST; ShadowDetailTransformation* shadow_detail_transformation_new (gfloat user_intensity); -ShadowDetailTransformation* shadow_detail_transformation_construct (GType object_type, gfloat user_intensity); +ShadowDetailTransformation* shadow_detail_transformation_construct (GType object_type, + gfloat user_intensity); GType shadow_detail_transformation_get_type (void) G_GNUC_CONST; HighlightDetailTransformation* highlight_detail_transformation_new (gfloat user_intensity); -HighlightDetailTransformation* highlight_detail_transformation_construct (GType object_type, gfloat user_intensity); +HighlightDetailTransformation* highlight_detail_transformation_construct (GType object_type, + gfloat user_intensity); GType highlight_detail_transformation_get_type (void) G_GNUC_CONST; TemperatureTransformation* temperature_transformation_new (gfloat client_parameter); -TemperatureTransformation* temperature_transformation_construct (GType object_type, gfloat client_parameter); +TemperatureTransformation* temperature_transformation_construct (GType object_type, + gfloat client_parameter); GType rgb_transformation_get_type (void) G_GNUC_CONST; GType temperature_transformation_get_type (void) G_GNUC_CONST; TintTransformation* tint_transformation_new (gfloat client_param); -TintTransformation* tint_transformation_construct (GType object_type, gfloat client_param); +TintTransformation* tint_transformation_construct (GType object_type, + gfloat client_param); GType tint_transformation_get_type (void) G_GNUC_CONST; SaturationTransformation* saturation_transformation_new (gfloat client_parameter); -SaturationTransformation* saturation_transformation_construct (GType object_type, gfloat client_parameter); +SaturationTransformation* saturation_transformation_construct (GType object_type, + gfloat client_parameter); GType saturation_transformation_get_type (void) G_GNUC_CONST; ExposureTransformation* exposure_transformation_new (gfloat client_parameter); -ExposureTransformation* exposure_transformation_construct (GType object_type, gfloat client_parameter); +ExposureTransformation* exposure_transformation_construct (GType object_type, + gfloat client_parameter); GType exposure_transformation_get_type (void) G_GNUC_CONST; ContrastTransformation* contrast_transformation_new (gfloat client_parameter); -ContrastTransformation* contrast_transformation_construct (GType object_type, gfloat client_parameter); +ContrastTransformation* contrast_transformation_construct (GType object_type, + gfloat client_parameter); GType contrast_transformation_get_type (void) G_GNUC_CONST; gpointer key_value_map_ref (gpointer instance); void key_value_map_unref (gpointer instance); -GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_key_value_map (GValue* value, gpointer v_object); -void value_take_key_value_map (GValue* value, gpointer v_object); +GParamSpec* param_spec_key_value_map (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_key_value_map (GValue* value, + gpointer v_object); +void value_take_key_value_map (GValue* value, + gpointer v_object); gpointer value_get_key_value_map (const GValue* value); GType key_value_map_get_type (void) G_GNUC_CONST; -void pixel_transformation_bundle_load (PixelTransformationBundle* self, KeyValueMap* store); -gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gchar* def); +void pixel_transformation_bundle_load (PixelTransformationBundle* self, + KeyValueMap* store); +gchar* key_value_map_get_string (KeyValueMap* self, + const gchar* key, + const gchar* def); ExpansionTransformation* expansion_transformation_new_from_string (const gchar* encoded_transformation); -ExpansionTransformation* expansion_transformation_construct_from_string (GType object_type, const gchar* encoded_transformation); -gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def); -KeyValueMap* pixel_transformation_bundle_save (PixelTransformationBundle* self, const gchar* group); +ExpansionTransformation* expansion_transformation_construct_from_string (GType object_type, + const gchar* encoded_transformation); +gfloat key_value_map_get_float (KeyValueMap* self, + const gchar* key, + gfloat def); +KeyValueMap* pixel_transformation_bundle_save (PixelTransformationBundle* self, + const gchar* group); KeyValueMap* key_value_map_new (const gchar* group); -KeyValueMap* key_value_map_construct (GType object_type, const gchar* group); -PixelTransformation* pixel_transformation_bundle_get_transformation (PixelTransformationBundle* self, PixelTransformationType type); -void key_value_map_set_string (KeyValueMap* self, const gchar* key, const gchar* value); +KeyValueMap* key_value_map_construct (GType object_type, + const gchar* group); +PixelTransformation* pixel_transformation_bundle_get_transformation (PixelTransformationBundle* self, + PixelTransformationType type); +void key_value_map_set_string (KeyValueMap* self, + const gchar* key, + const gchar* value); gchar* pixel_transformation_to_string (PixelTransformation* self); -void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value); +void key_value_map_set_float (KeyValueMap* self, + const gchar* key, + gfloat value); gfloat shadow_detail_transformation_get_parameter (ShadowDetailTransformation* self); gfloat highlight_detail_transformation_get_parameter (HighlightDetailTransformation* self); gfloat temperature_transformation_get_parameter (TemperatureTransformation* self); @@ -729,108 +787,126 @@ gboolean pixel_transformation_bundle_is_identity (PixelTransformationBundle* sel gboolean pixel_transformation_is_identity (PixelTransformation* self); gpointer pixel_transformer_ref (gpointer instance); void pixel_transformer_unref (gpointer instance); -GParamSpec* param_spec_pixel_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_pixel_transformer (GValue* value, gpointer v_object); -void value_take_pixel_transformer (GValue* value, gpointer v_object); +GParamSpec* param_spec_pixel_transformer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_pixel_transformer (GValue* value, + gpointer v_object); +void value_take_pixel_transformer (GValue* value, + gpointer v_object); gpointer value_get_pixel_transformer (const GValue* value); GType pixel_transformer_get_type (void) G_GNUC_CONST; PixelTransformer* pixel_transformation_bundle_generate_transformer (PixelTransformationBundle* self); PixelTransformer* pixel_transformer_new (void); PixelTransformer* pixel_transformer_construct (GType object_type); -void pixel_transformer_attach_transformation (PixelTransformer* self, PixelTransformation* trans); +void pixel_transformer_attach_transformation (PixelTransformer* self, + PixelTransformation* trans); PixelTransformationBundle* pixel_transformation_bundle_copy (PixelTransformationBundle* self); static void pixel_transformation_bundle_finalize (PixelTransformationBundle * obj); #define PIXEL_TRANSFORMATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PIXEL_TRANSFORMATION, PixelTransformationPrivate)) -enum { - PIXEL_TRANSFORMATION_DUMMY_PROPERTY -}; -PixelTransformation* pixel_transformation_construct (GType object_type, PixelTransformationType type, PixelFormat preferred_format); +PixelTransformation* pixel_transformation_construct (GType object_type, + PixelTransformationType type, + PixelFormat preferred_format); PixelFormat pixel_transformation_get_preferred_format (PixelTransformation* self); CompositionMode pixel_transformation_get_composition_mode (PixelTransformation* self); static CompositionMode pixel_transformation_real_get_composition_mode (PixelTransformation* self); -void pixel_transformation_compose_with (PixelTransformation* self, PixelTransformation* other); -static void pixel_transformation_real_compose_with (PixelTransformation* self, PixelTransformation* other); +void pixel_transformation_compose_with (PixelTransformation* self, + PixelTransformation* other); +static void pixel_transformation_real_compose_with (PixelTransformation* self, + PixelTransformation* other); static gboolean pixel_transformation_real_is_identity (PixelTransformation* self); -void pixel_transformation_transform_pixel_hsv (PixelTransformation* self, HSVAnalyticPixel* p, HSVAnalyticPixel* result); -static void pixel_transformation_real_transform_pixel_hsv (PixelTransformation* self, HSVAnalyticPixel* p, HSVAnalyticPixel* result); -void pixel_transformation_transform_pixel_rgb (PixelTransformation* self, RGBAnalyticPixel* p, RGBAnalyticPixel* result); -static void pixel_transformation_real_transform_pixel_rgb (PixelTransformation* self, RGBAnalyticPixel* p, RGBAnalyticPixel* result); +void pixel_transformation_transform_pixel_hsv (PixelTransformation* self, + HSVAnalyticPixel* p, + HSVAnalyticPixel* result); +static void pixel_transformation_real_transform_pixel_hsv (PixelTransformation* self, + HSVAnalyticPixel* p, + HSVAnalyticPixel* result); +void pixel_transformation_transform_pixel_rgb (PixelTransformation* self, + RGBAnalyticPixel* p, + RGBAnalyticPixel* result); +static void pixel_transformation_real_transform_pixel_rgb (PixelTransformation* self, + RGBAnalyticPixel* p, + RGBAnalyticPixel* result); static gchar* pixel_transformation_real_to_string (PixelTransformation* self); PixelTransformation* pixel_transformation_copy (PixelTransformation* self); static PixelTransformation* pixel_transformation_real_copy (PixelTransformation* self); static void pixel_transformation_finalize (PixelTransformation * obj); -enum { - RGB_TRANSFORMATION_DUMMY_PROPERTY -}; #define RGB_TRANSFORMATION_MATRIX_SIZE 16 RGBTransformation* rgb_transformation_new (PixelTransformationType type); -RGBTransformation* rgb_transformation_construct (GType object_type, PixelTransformationType type); +RGBTransformation* rgb_transformation_construct (GType object_type, + PixelTransformationType type); static CompositionMode rgb_transformation_real_get_composition_mode (PixelTransformation* base); -static void rgb_transformation_real_compose_with (PixelTransformation* base, PixelTransformation* other); -static void rgb_transformation_real_transform_pixel_hsv (PixelTransformation* base, HSVAnalyticPixel* p, HSVAnalyticPixel* result); -static void rgb_transformation_real_transform_pixel_rgb (PixelTransformation* base, RGBAnalyticPixel* p, RGBAnalyticPixel* result); +static void rgb_transformation_real_compose_with (PixelTransformation* base, + PixelTransformation* other); +static void rgb_transformation_real_transform_pixel_hsv (PixelTransformation* base, + HSVAnalyticPixel* p, + HSVAnalyticPixel* result); +static void rgb_transformation_real_transform_pixel_rgb (PixelTransformation* base, + RGBAnalyticPixel* p, + RGBAnalyticPixel* result); static gboolean rgb_transformation_real_is_identity (PixelTransformation* base); static PixelTransformation* rgb_transformation_real_copy (PixelTransformation* base); static void rgb_transformation_finalize (PixelTransformation * obj); -enum { - HSV_TRANSFORMATION_DUMMY_PROPERTY -}; -HSVTransformation* hsv_transformation_construct (GType object_type, PixelTransformationType type); +HSVTransformation* hsv_transformation_construct (GType object_type, + PixelTransformationType type); static CompositionMode hsv_transformation_real_get_composition_mode (PixelTransformation* base); -static void hsv_transformation_real_transform_pixel_rgb (PixelTransformation* base, RGBAnalyticPixel* p, RGBAnalyticPixel* result); -static void hsv_transformation_real_compose_with (PixelTransformation* base, PixelTransformation* other); -static void hsv_transformation_real_transform_pixel_hsv (PixelTransformation* base, HSVAnalyticPixel* pixel, HSVAnalyticPixel* result); +static void hsv_transformation_real_transform_pixel_rgb (PixelTransformation* base, + RGBAnalyticPixel* p, + RGBAnalyticPixel* result); +static void hsv_transformation_real_compose_with (PixelTransformation* base, + PixelTransformation* other); +static void hsv_transformation_real_transform_pixel_hsv (PixelTransformation* base, + HSVAnalyticPixel* pixel, + HSVAnalyticPixel* result); static void hsv_transformation_finalize (PixelTransformation * obj); #define TINT_TRANSFORMATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TINT_TRANSFORMATION, TintTransformationPrivate)) -enum { - TINT_TRANSFORMATION_DUMMY_PROPERTY -}; #define TINT_TRANSFORMATION_INTENSITY_FACTOR 0.25f #define TINT_TRANSFORMATION_MIN_PARAMETER (-16.0f) #define TINT_TRANSFORMATION_MAX_PARAMETER 16.0f static void tint_transformation_finalize (PixelTransformation * obj); #define TEMPERATURE_TRANSFORMATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformationPrivate)) -enum { - TEMPERATURE_TRANSFORMATION_DUMMY_PROPERTY -}; #define TEMPERATURE_TRANSFORMATION_INTENSITY_FACTOR 0.33f #define TEMPERATURE_TRANSFORMATION_MIN_PARAMETER (-16.0f) #define TEMPERATURE_TRANSFORMATION_MAX_PARAMETER 16.0f static void temperature_transformation_finalize (PixelTransformation * obj); #define SATURATION_TRANSFORMATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SATURATION_TRANSFORMATION, SaturationTransformationPrivate)) -enum { - SATURATION_TRANSFORMATION_DUMMY_PROPERTY -}; #define SATURATION_TRANSFORMATION_MIN_PARAMETER (-16.0f) #define SATURATION_TRANSFORMATION_MAX_PARAMETER 16.0f static void saturation_transformation_finalize (PixelTransformation * obj); #define EXPOSURE_TRANSFORMATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformationPrivate)) -enum { - EXPOSURE_TRANSFORMATION_DUMMY_PROPERTY -}; #define EXPOSURE_TRANSFORMATION_MIN_PARAMETER (-16.0f) #define EXPOSURE_TRANSFORMATION_MAX_PARAMETER 16.0f static void exposure_transformation_finalize (PixelTransformation * obj); #define CONTRAST_TRANSFORMATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CONTRAST_TRANSFORMATION, ContrastTransformationPrivate)) -enum { - CONTRAST_TRANSFORMATION_DUMMY_PROPERTY -}; #define CONTRAST_TRANSFORMATION_MIN_PARAMETER (-16.0f) #define CONTRAST_TRANSFORMATION_MAX_PARAMETER 16.0f #define CONTRAST_TRANSFORMATION_MAX_CONTRAST_ADJUSTMENT 0.5f static void contrast_transformation_finalize (PixelTransformation * obj); #define PIXEL_TRANSFORMER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PIXEL_TRANSFORMER, PixelTransformerPrivate)) -enum { - PIXEL_TRANSFORMER_DUMMY_PROPERTY -}; PixelTransformer* pixel_transformer_copy (PixelTransformer* self); static void pixel_transformer_build_optimized_transformations (PixelTransformer* self); -void pixel_transformer_apply_transformations (PixelTransformer* self, RGBAnalyticPixel* p, RGBAnalyticPixel* result); -void pixel_transformer_detach_transformation (PixelTransformer* self, PixelTransformation* victim); -void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTransformation* old_trans, PixelTransformation* new_trans); -void pixel_transformer_transform_pixbuf (PixelTransformer* self, GdkPixbuf* pixbuf, GCancellable* cancellable); -void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPixbuf* source, GdkPixbuf* dest, GCancellable* cancellable, gint jobs); -void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pixel_cache, int* fp_pixel_cache_length1, GdkPixbuf* dest); +void pixel_transformer_apply_transformations (PixelTransformer* self, + RGBAnalyticPixel* p, + RGBAnalyticPixel* result); +void pixel_transformer_detach_transformation (PixelTransformer* self, + PixelTransformation* victim); +void pixel_transformer_replace_transformation (PixelTransformer* self, + PixelTransformation* old_trans, + PixelTransformation* new_trans); +void pixel_transformer_transform_pixbuf (PixelTransformer* self, + GdkPixbuf* pixbuf, + GCancellable* cancellable); +void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, + GdkPixbuf* source, + GdkPixbuf* dest, + GCancellable* cancellable, + gint jobs); +void pixel_transformer_transform_from_fp (PixelTransformer* self, + gfloat** fp_pixel_cache, + int* fp_pixel_cache_length1, + GdkPixbuf* dest); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); static Block2Data* block2_data_ref (Block2Data* _data2_); @@ -842,56 +918,79 @@ static void block3_data_unref (void * _userdata_); static Block4Data* block4_data_ref (Block4Data* _data4_); static void block4_data_unref (void * _userdata_); static void* _____lambda4_ (Block4Data* _data4_); -void pixel_transformer_apply_transformation (PixelTransformer* self, guint row, gint rowstride, gint rowbytes, gint n_channels, guchar* source_pixels, int source_pixels_length1, guchar* dest_pixels, int dest_pixels_length1); +void pixel_transformer_apply_transformation (PixelTransformer* self, + guint row, + gint rowstride, + gint rowbytes, + gint n_channels, + guchar* source_pixels, + int source_pixels_length1, + guchar* dest_pixels, + int dest_pixels_length1); static gpointer ______lambda4__gthread_func (gpointer self); static void pixel_transformer_finalize (PixelTransformer * obj); gpointer rgb_histogram_ref (gpointer instance); void rgb_histogram_unref (gpointer instance); -GParamSpec* param_spec_rgb_histogram (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_rgb_histogram (GValue* value, gpointer v_object); -void value_take_rgb_histogram (GValue* value, gpointer v_object); +GParamSpec* param_spec_rgb_histogram (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_rgb_histogram (GValue* value, + gpointer v_object); +void value_take_rgb_histogram (GValue* value, + gpointer v_object); gpointer value_get_rgb_histogram (const GValue* value); GType rgb_histogram_get_type (void) G_GNUC_CONST; #define RGB_HISTOGRAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_RGB_HISTOGRAM, RGBHistogramPrivate)) -enum { - RGB_HISTOGRAM_DUMMY_PROPERTY -}; #define RGB_HISTOGRAM_MARKED_BACKGROUND ((guchar) 30) #define RGB_HISTOGRAM_MARKED_FOREGROUND ((guchar) 210) #define RGB_HISTOGRAM_UNMARKED_BACKGROUND ((guchar) 120) #define RGB_HISTOGRAM_GRAPHIC_WIDTH 256 #define RGB_HISTOGRAM_GRAPHIC_HEIGHT 100 RGBHistogram* rgb_histogram_new (GdkPixbuf* pixbuf); -RGBHistogram* rgb_histogram_construct (GType object_type, GdkPixbuf* pixbuf); -static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint* buckets, int buckets_length1, gint i); -static gint rgb_histogram_correct_snap_from_quantization (RGBHistogram* self, gint* buckets, int buckets_length1, gint i); -static void rgb_histogram_smooth_extrema (RGBHistogram* self, gint** count_data, int* count_data_length1); +RGBHistogram* rgb_histogram_construct (GType object_type, + GdkPixbuf* pixbuf); +static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, + gint* buckets, + int buckets_length1, + gint i); +static gint rgb_histogram_correct_snap_from_quantization (RGBHistogram* self, + gint* buckets, + int buckets_length1, + gint i); +static void rgb_histogram_smooth_extrema (RGBHistogram* self, + gint** count_data, + int* count_data_length1); static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self); GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self); static void rgb_histogram_finalize (RGBHistogram * obj); gpointer intensity_histogram_ref (gpointer instance); void intensity_histogram_unref (gpointer instance); -GParamSpec* param_spec_intensity_histogram (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_intensity_histogram (GValue* value, gpointer v_object); -void value_take_intensity_histogram (GValue* value, gpointer v_object); +GParamSpec* param_spec_intensity_histogram (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_intensity_histogram (GValue* value, + gpointer v_object); +void value_take_intensity_histogram (GValue* value, + gpointer v_object); gpointer value_get_intensity_histogram (const GValue* value); GType intensity_histogram_get_type (void) G_GNUC_CONST; #define INTENSITY_HISTOGRAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_INTENSITY_HISTOGRAM, IntensityHistogramPrivate)) -enum { - INTENSITY_HISTOGRAM_DUMMY_PROPERTY -}; IntensityHistogram* intensity_histogram_new (GdkPixbuf* pixbuf); -IntensityHistogram* intensity_histogram_construct (GType object_type, GdkPixbuf* pixbuf); -gfloat intensity_histogram_get_cumulative_probability (IntensityHistogram* self, gint level); +IntensityHistogram* intensity_histogram_construct (GType object_type, + GdkPixbuf* pixbuf); +gfloat intensity_histogram_get_cumulative_probability (IntensityHistogram* self, + gint level); static void intensity_histogram_finalize (IntensityHistogram * obj); #define EXPANSION_TRANSFORMATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformationPrivate)) -enum { - EXPANSION_TRANSFORMATION_DUMMY_PROPERTY -}; #define EXPANSION_TRANSFORMATION_LOW_DISCARD_MASS 0.02f #define EXPANSION_TRANSFORMATION_HIGH_DISCARD_MASS 0.02f ExpansionTransformation* expansion_transformation_new (IntensityHistogram* histogram); -ExpansionTransformation* expansion_transformation_construct (GType object_type, IntensityHistogram* histogram); +ExpansionTransformation* expansion_transformation_construct (GType object_type, + IntensityHistogram* histogram); static void expansion_transformation_build_remap_table (ExpansionTransformation* self); static gchar* expansion_transformation_real_to_string (PixelTransformation* base); gint expansion_transformation_get_white_point (ExpansionTransformation* self); @@ -900,9 +999,6 @@ static gboolean expansion_transformation_real_is_identity (PixelTransformation* static PixelTransformation* expansion_transformation_real_copy (PixelTransformation* base); static void expansion_transformation_finalize (PixelTransformation * obj); #define SHADOW_DETAIL_TRANSFORMATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformationPrivate)) -enum { - SHADOW_DETAIL_TRANSFORMATION_DUMMY_PROPERTY -}; #define SHADOW_DETAIL_TRANSFORMATION_MAX_EFFECT_SHIFT 0.5f #define SHADOW_DETAIL_TRANSFORMATION_MIN_TONAL_WIDTH 0.1f #define SHADOW_DETAIL_TRANSFORMATION_MAX_TONAL_WIDTH 1.0f @@ -911,26 +1007,28 @@ enum { #define SHADOW_DETAIL_TRANSFORMATION_MAX_PARAMETER 32.0f gpointer hermite_gamma_approximation_function_ref (gpointer instance); void hermite_gamma_approximation_function_unref (gpointer instance); -GParamSpec* param_spec_hermite_gamma_approximation_function (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_hermite_gamma_approximation_function (GValue* value, gpointer v_object); -void value_take_hermite_gamma_approximation_function (GValue* value, gpointer v_object); +GParamSpec* param_spec_hermite_gamma_approximation_function (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_hermite_gamma_approximation_function (GValue* value, + gpointer v_object); +void value_take_hermite_gamma_approximation_function (GValue* value, + gpointer v_object); gpointer value_get_hermite_gamma_approximation_function (const GValue* value); GType hermite_gamma_approximation_function_get_type (void) G_GNUC_CONST; HermiteGammaApproximationFunction* hermite_gamma_approximation_function_new (gfloat user_interval_upper); -HermiteGammaApproximationFunction* hermite_gamma_approximation_function_construct (GType object_type, gfloat user_interval_upper); -gfloat hermite_gamma_approximation_function_evaluate (HermiteGammaApproximationFunction* self, gfloat x); +HermiteGammaApproximationFunction* hermite_gamma_approximation_function_construct (GType object_type, + gfloat user_interval_upper); +gfloat hermite_gamma_approximation_function_evaluate (HermiteGammaApproximationFunction* self, + gfloat x); static PixelTransformation* shadow_detail_transformation_real_copy (PixelTransformation* base); static gboolean shadow_detail_transformation_real_is_identity (PixelTransformation* base); static void shadow_detail_transformation_finalize (PixelTransformation * obj); #define HERMITE_GAMMA_APPROXIMATION_FUNCTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION, HermiteGammaApproximationFunctionPrivate)) -enum { - HERMITE_GAMMA_APPROXIMATION_FUNCTION_DUMMY_PROPERTY -}; static void hermite_gamma_approximation_function_finalize (HermiteGammaApproximationFunction * obj); #define HIGHLIGHT_DETAIL_TRANSFORMATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformationPrivate)) -enum { - HIGHLIGHT_DETAIL_TRANSFORMATION_DUMMY_PROPERTY -}; #define HIGHLIGHT_DETAIL_TRANSFORMATION_MAX_EFFECT_SHIFT 0.5f #define HIGHLIGHT_DETAIL_TRANSFORMATION_MIN_TONAL_WIDTH 0.1f #define HIGHLIGHT_DETAIL_TRANSFORMATION_MAX_TONAL_WIDTH 1.0f @@ -947,12 +1045,18 @@ static void highlight_detail_transformation_finalize (PixelTransformation * obj) #define AUTO_ENHANCE_SHADOW_AGGRESSIVENESS_MUL 0.4f #define AUTO_ENHANCE_EMPIRICAL_DARK 30 PixelTransformationBundle* auto_enhance_create_auto_enhance_adjustments (GdkPixbuf* pixbuf); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); const gfloat rgb_lookup_table[256] = {0.0f / 255.0f, 1.0f / 255.0f, 2.0f / 255.0f, 3.0f / 255.0f, 4.0f / 255.0f, 5.0f / 255.0f, 6.0f / 255.0f, 7.0f / 255.0f, 8.0f / 255.0f, 9.0f / 255.0f, 10.0f / 255.0f, 11.0f / 255.0f, 12.0f / 255.0f, 13.0f / 255.0f, 14.0f / 255.0f, 15.0f / 255.0f, 16.0f / 255.0f, 17.0f / 255.0f, 18.0f / 255.0f, 19.0f / 255.0f, 20.0f / 255.0f, 21.0f / 255.0f, 22.0f / 255.0f, 23.0f / 255.0f, 24.0f / 255.0f, 25.0f / 255.0f, 26.0f / 255.0f, 27.0f / 255.0f, 28.0f / 255.0f, 29.0f / 255.0f, 30.0f / 255.0f, 31.0f / 255.0f, 32.0f / 255.0f, 33.0f / 255.0f, 34.0f / 255.0f, 35.0f / 255.0f, 36.0f / 255.0f, 37.0f / 255.0f, 38.0f / 255.0f, 39.0f / 255.0f, 40.0f / 255.0f, 41.0f / 255.0f, 42.0f / 255.0f, 43.0f / 255.0f, 44.0f / 255.0f, 45.0f / 255.0f, 46.0f / 255.0f, 47.0f / 255.0f, 48.0f / 255.0f, 49.0f / 255.0f, 50.0f / 255.0f, 51.0f / 255.0f, 52.0f / 255.0f, 53.0f / 255.0f, 54.0f / 255.0f, 55.0f / 255.0f, 56.0f / 255.0f, 57.0f / 255.0f, 58.0f / 255.0f, 59.0f / 255.0f, 60.0f / 255.0f, 61.0f / 255.0f, 62.0f / 255.0f, 63.0f / 255.0f, 64.0f / 255.0f, 65.0f / 255.0f, 66.0f / 255.0f, 67.0f / 255.0f, 68.0f / 255.0f, 69.0f / 255.0f, 70.0f / 255.0f, 71.0f / 255.0f, 72.0f / 255.0f, 73.0f / 255.0f, 74.0f / 255.0f, 75.0f / 255.0f, 76.0f / 255.0f, 77.0f / 255.0f, 78.0f / 255.0f, 79.0f / 255.0f, 80.0f / 255.0f, 81.0f / 255.0f, 82.0f / 255.0f, 83.0f / 255.0f, 84.0f / 255.0f, 85.0f / 255.0f, 86.0f / 255.0f, 87.0f / 255.0f, 88.0f / 255.0f, 89.0f / 255.0f, 90.0f / 255.0f, 91.0f / 255.0f, 92.0f / 255.0f, 93.0f / 255.0f, 94.0f / 255.0f, 95.0f / 255.0f, 96.0f / 255.0f, 97.0f / 255.0f, 98.0f / 255.0f, 99.0f / 255.0f, 100.0f / 255.0f, 101.0f / 255.0f, 102.0f / 255.0f, 103.0f / 255.0f, 104.0f / 255.0f, 105.0f / 255.0f, 106.0f / 255.0f, 107.0f / 255.0f, 108.0f / 255.0f, 109.0f / 255.0f, 110.0f / 255.0f, 111.0f / 255.0f, 112.0f / 255.0f, 113.0f / 255.0f, 114.0f / 255.0f, 115.0f / 255.0f, 116.0f / 255.0f, 117.0f / 255.0f, 118.0f / 255.0f, 119.0f / 255.0f, 120.0f / 255.0f, 121.0f / 255.0f, 122.0f / 255.0f, 123.0f / 255.0f, 124.0f / 255.0f, 125.0f / 255.0f, 126.0f / 255.0f, 127.0f / 255.0f, 128.0f / 255.0f, 129.0f / 255.0f, 130.0f / 255.0f, 131.0f / 255.0f, 132.0f / 255.0f, 133.0f / 255.0f, 134.0f / 255.0f, 135.0f / 255.0f, 136.0f / 255.0f, 137.0f / 255.0f, 138.0f / 255.0f, 139.0f / 255.0f, 140.0f / 255.0f, 141.0f / 255.0f, 142.0f / 255.0f, 143.0f / 255.0f, 144.0f / 255.0f, 145.0f / 255.0f, 146.0f / 255.0f, 147.0f / 255.0f, 148.0f / 255.0f, 149.0f / 255.0f, 150.0f / 255.0f, 151.0f / 255.0f, 152.0f / 255.0f, 153.0f / 255.0f, 154.0f / 255.0f, 155.0f / 255.0f, 156.0f / 255.0f, 157.0f / 255.0f, 158.0f / 255.0f, 159.0f / 255.0f, 160.0f / 255.0f, 161.0f / 255.0f, 162.0f / 255.0f, 163.0f / 255.0f, 164.0f / 255.0f, 165.0f / 255.0f, 166.0f / 255.0f, 167.0f / 255.0f, 168.0f / 255.0f, 169.0f / 255.0f, 170.0f / 255.0f, 171.0f / 255.0f, 172.0f / 255.0f, 173.0f / 255.0f, 174.0f / 255.0f, 175.0f / 255.0f, 176.0f / 255.0f, 177.0f / 255.0f, 178.0f / 255.0f, 179.0f / 255.0f, 180.0f / 255.0f, 181.0f / 255.0f, 182.0f / 255.0f, 183.0f / 255.0f, 184.0f / 255.0f, 185.0f / 255.0f, 186.0f / 255.0f, 187.0f / 255.0f, 188.0f / 255.0f, 189.0f / 255.0f, 190.0f / 255.0f, 191.0f / 255.0f, 192.0f / 255.0f, 193.0f / 255.0f, 194.0f / 255.0f, 195.0f / 255.0f, 196.0f / 255.0f, 197.0f / 255.0f, 198.0f / 255.0f, 199.0f / 255.0f, 200.0f / 255.0f, 201.0f / 255.0f, 202.0f / 255.0f, 203.0f / 255.0f, 204.0f / 255.0f, 205.0f / 255.0f, 206.0f / 255.0f, 207.0f / 255.0f, 208.0f / 255.0f, 209.0f / 255.0f, 210.0f / 255.0f, 211.0f / 255.0f, 212.0f / 255.0f, 213.0f / 255.0f, 214.0f / 255.0f, 215.0f / 255.0f, 216.0f / 255.0f, 217.0f / 255.0f, 218.0f / 255.0f, 219.0f / 255.0f, 220.0f / 255.0f, 221.0f / 255.0f, 222.0f / 255.0f, 223.0f / 255.0f, 224.0f / 255.0f, 225.0f / 255.0f, 226.0f / 255.0f, 227.0f / 255.0f, 228.0f / 255.0f, 229.0f / 255.0f, 230.0f / 255.0f, 231.0f / 255.0f, 232.0f / 255.0f, 233.0f / 255.0f, 234.0f / 255.0f, 235.0f / 255.0f, 236.0f / 255.0f, 237.0f / 255.0f, 238.0f / 255.0f, 239.0f / 255.0f, 240.0f / 255.0f, 241.0f / 255.0f, 242.0f / 255.0f, 243.0f / 255.0f, 244.0f / 255.0f, 245.0f / 255.0f, 246.0f / 255.0f, 247.0f / 255.0f, 248.0f / 255.0f, 249.0f / 255.0f, 250.0f / 255.0f, 251.0f / 255.0f, 252.0f / 255.0f, 253.0f / 255.0f, 254.0f / 255.0f, 255.0f / 255.0f}; -void rgb_analytic_pixel_init (RGBAnalyticPixel *self) { +void +rgb_analytic_pixel_init (RGBAnalyticPixel *self) +{ #line 14 "/home/jens/Source/shotwell/src/ColorTransformation.vala" memset (self, 0, sizeof (RGBAnalyticPixel)); #line 15 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -961,73 +1065,59 @@ void rgb_analytic_pixel_init (RGBAnalyticPixel *self) { (*self).green = 0.0f; #line 17 "/home/jens/Source/shotwell/src/ColorTransformation.vala" (*self).blue = 0.0f; -#line 965 "ColorTransformation.c" +#line 1069 "ColorTransformation.c" } -void rgb_analytic_pixel_init_from_components (RGBAnalyticPixel *self, gfloat red, gfloat green, gfloat blue) { - gfloat _tmp0_; - gfloat _tmp1_; - gfloat _tmp2_; - gfloat _tmp3_; - gfloat _tmp4_; - gfloat _tmp5_; +void +rgb_analytic_pixel_init_from_components (RGBAnalyticPixel *self, + gfloat red, + gfloat green, + gfloat blue) +{ #line 20 "/home/jens/Source/shotwell/src/ColorTransformation.vala" memset (self, 0, sizeof (RGBAnalyticPixel)); #line 22 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = red; -#line 22 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = CLAMP (_tmp0_, 0.0f, 1.0f); -#line 22 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - (*self).red = _tmp1_; -#line 23 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = green; + (*self).red = CLAMP (red, 0.0f, 1.0f); #line 23 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = CLAMP (_tmp2_, 0.0f, 1.0f); -#line 23 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - (*self).green = _tmp3_; -#line 24 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = blue; + (*self).green = CLAMP (green, 0.0f, 1.0f); #line 24 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = CLAMP (_tmp4_, 0.0f, 1.0f); -#line 24 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - (*self).blue = _tmp5_; -#line 996 "ColorTransformation.c" + (*self).blue = CLAMP (blue, 0.0f, 1.0f); +#line 1087 "ColorTransformation.c" } -void rgb_analytic_pixel_init_from_quantized_components (RGBAnalyticPixel *self, guchar red_quantized, guchar green_quantized, guchar blue_quantized) { - guchar _tmp0_; +void +rgb_analytic_pixel_init_from_quantized_components (RGBAnalyticPixel *self, + guchar red_quantized, + guchar green_quantized, + guchar blue_quantized) +{ + gfloat _tmp0_; gfloat _tmp1_; - guchar _tmp2_; - gfloat _tmp3_; - guchar _tmp4_; - gfloat _tmp5_; + gfloat _tmp2_; #line 27 "/home/jens/Source/shotwell/src/ColorTransformation.vala" memset (self, 0, sizeof (RGBAnalyticPixel)); #line 29 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = red_quantized; -#line 29 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = rgb_lookup_table[_tmp0_]; + _tmp0_ = rgb_lookup_table[red_quantized]; #line 29 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - (*self).red = _tmp1_; + (*self).red = _tmp0_; #line 30 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = green_quantized; + _tmp1_ = rgb_lookup_table[green_quantized]; #line 30 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = rgb_lookup_table[_tmp2_]; -#line 30 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - (*self).green = _tmp3_; -#line 31 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = blue_quantized; + (*self).green = _tmp1_; #line 31 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = rgb_lookup_table[_tmp4_]; + _tmp2_ = rgb_lookup_table[blue_quantized]; #line 31 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - (*self).blue = _tmp5_; -#line 1027 "ColorTransformation.c" + (*self).blue = _tmp2_; +#line 1114 "ColorTransformation.c" } -void rgb_analytic_pixel_init_from_hsv (RGBAnalyticPixel *self, HSVAnalyticPixel* hsv_pixel) { +void +rgb_analytic_pixel_init_from_hsv (RGBAnalyticPixel *self, + HSVAnalyticPixel* hsv_pixel) +{ RGBAnalyticPixel from_hsv = {0}; RGBAnalyticPixel _tmp0_ = {0}; RGBAnalyticPixel _tmp1_; @@ -1060,11 +1150,13 @@ void rgb_analytic_pixel_init_from_hsv (RGBAnalyticPixel *self, HSVAnalyticPixel* _tmp6_ = _tmp5_.blue; #line 38 "/home/jens/Source/shotwell/src/ColorTransformation.vala" (*self).blue = _tmp6_; -#line 1064 "ColorTransformation.c" +#line 1154 "ColorTransformation.c" } -guchar rgb_analytic_pixel_quantized_red (RGBAnalyticPixel *self) { +guchar +rgb_analytic_pixel_quantized_red (RGBAnalyticPixel *self) +{ guchar result = '\0'; gfloat _tmp0_; #line 42 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -1073,11 +1165,13 @@ guchar rgb_analytic_pixel_quantized_red (RGBAnalyticPixel *self) { result = (guchar) (_tmp0_ * 255.0f); #line 42 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 1077 "ColorTransformation.c" +#line 1169 "ColorTransformation.c" } -guchar rgb_analytic_pixel_quantized_green (RGBAnalyticPixel *self) { +guchar +rgb_analytic_pixel_quantized_green (RGBAnalyticPixel *self) +{ guchar result = '\0'; gfloat _tmp0_; #line 46 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -1086,11 +1180,13 @@ guchar rgb_analytic_pixel_quantized_green (RGBAnalyticPixel *self) { result = (guchar) (_tmp0_ * 255.0f); #line 46 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 1090 "ColorTransformation.c" +#line 1184 "ColorTransformation.c" } -guchar rgb_analytic_pixel_quantized_blue (RGBAnalyticPixel *self) { +guchar +rgb_analytic_pixel_quantized_blue (RGBAnalyticPixel *self) +{ guchar result = '\0'; gfloat _tmp0_; #line 50 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -1099,72 +1195,68 @@ guchar rgb_analytic_pixel_quantized_blue (RGBAnalyticPixel *self) { result = (guchar) (_tmp0_ * 255.0f); #line 50 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 1103 "ColorTransformation.c" +#line 1199 "ColorTransformation.c" } -gboolean rgb_analytic_pixel_equals (RGBAnalyticPixel *self, RGBAnalyticPixel* rhs) { +gboolean +rgb_analytic_pixel_equals (RGBAnalyticPixel *self, + RGBAnalyticPixel* rhs) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; gfloat _tmp2_; - RGBAnalyticPixel* _tmp3_; - gfloat _tmp4_; + gfloat _tmp3_; #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp2_ = (*self).red; #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = rhs; -#line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = (*_tmp3_).red; + _tmp3_ = (*rhs).red; #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp2_ == _tmp4_) { -#line 1122 "ColorTransformation.c" + if (_tmp2_ == _tmp3_) { +#line 1218 "ColorTransformation.c" + gfloat _tmp4_; gfloat _tmp5_; - RGBAnalyticPixel* _tmp6_; - gfloat _tmp7_; -#line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = (*self).green; #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = rhs; + _tmp4_ = (*self).green; #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = (*_tmp6_).green; + _tmp5_ = (*rhs).green; #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = _tmp5_ == _tmp7_; -#line 1134 "ColorTransformation.c" + _tmp1_ = _tmp4_ == _tmp5_; +#line 1227 "ColorTransformation.c" } else { #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp1_ = FALSE; -#line 1138 "ColorTransformation.c" +#line 1231 "ColorTransformation.c" } #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (_tmp1_) { -#line 1142 "ColorTransformation.c" - gfloat _tmp8_; - RGBAnalyticPixel* _tmp9_; - gfloat _tmp10_; -#line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = (*self).blue; +#line 1235 "ColorTransformation.c" + gfloat _tmp6_; + gfloat _tmp7_; #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = rhs; + _tmp6_ = (*self).blue; #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = (*_tmp9_).blue; + _tmp7_ = (*rhs).blue; #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = _tmp8_ == _tmp10_; -#line 1154 "ColorTransformation.c" + _tmp0_ = _tmp6_ == _tmp7_; +#line 1244 "ColorTransformation.c" } else { #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp0_ = FALSE; -#line 1158 "ColorTransformation.c" +#line 1248 "ColorTransformation.c" } #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala" result = _tmp0_; #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 1164 "ColorTransformation.c" +#line 1254 "ColorTransformation.c" } -guint rgb_analytic_pixel_hash_code (RGBAnalyticPixel *self) { +guint +rgb_analytic_pixel_hash_code (RGBAnalyticPixel *self) +{ guint result = 0U; gfloat _tmp0_; gfloat _tmp1_; @@ -1179,11 +1271,14 @@ guint rgb_analytic_pixel_hash_code (RGBAnalyticPixel *self) { result = ((((guint) (_tmp0_ * 255.0f)) << 16) + (((guint) (_tmp1_ * 255.0f)) << 8)) + ((guint) (_tmp2_ * 255.0f)); #line 58 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 1183 "ColorTransformation.c" +#line 1275 "ColorTransformation.c" } -void rgb_analytic_pixel_to_hsv (RGBAnalyticPixel *self, HSVAnalyticPixel* result) { +void +rgb_analytic_pixel_to_hsv (RGBAnalyticPixel *self, + HSVAnalyticPixel* result) +{ HSVAnalyticPixel _tmp0_ = {0}; #line 63 "/home/jens/Source/shotwell/src/ColorTransformation.vala" hsv_analytic_pixel_init_from_rgb (&_tmp0_, &(*self)); @@ -1191,11 +1286,13 @@ void rgb_analytic_pixel_to_hsv (RGBAnalyticPixel *self, HSVAnalyticPixel* result *result = _tmp0_; #line 63 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return; -#line 1195 "ColorTransformation.c" +#line 1290 "ColorTransformation.c" } -RGBAnalyticPixel* rgb_analytic_pixel_dup (const RGBAnalyticPixel* self) { +RGBAnalyticPixel* +rgb_analytic_pixel_dup (const RGBAnalyticPixel* self) +{ RGBAnalyticPixel* dup; #line 7 "/home/jens/Source/shotwell/src/ColorTransformation.vala" dup = g_new0 (RGBAnalyticPixel, 1); @@ -1203,18 +1300,22 @@ RGBAnalyticPixel* rgb_analytic_pixel_dup (const RGBAnalyticPixel* self) { memcpy (dup, self, sizeof (RGBAnalyticPixel)); #line 7 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return dup; -#line 1207 "ColorTransformation.c" +#line 1304 "ColorTransformation.c" } -void rgb_analytic_pixel_free (RGBAnalyticPixel* self) { +void +rgb_analytic_pixel_free (RGBAnalyticPixel* self) +{ #line 7 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_free (self); -#line 1214 "ColorTransformation.c" +#line 1313 "ColorTransformation.c" } -GType rgb_analytic_pixel_get_type (void) { +GType +rgb_analytic_pixel_get_type (void) +{ static volatile gsize rgb_analytic_pixel_type_id__volatile = 0; if (g_once_init_enter (&rgb_analytic_pixel_type_id__volatile)) { GType rgb_analytic_pixel_type_id; @@ -1225,7 +1326,9 @@ GType rgb_analytic_pixel_get_type (void) { } -void hsv_analytic_pixel_init (HSVAnalyticPixel *self) { +void +hsv_analytic_pixel_init (HSVAnalyticPixel *self) +{ #line 74 "/home/jens/Source/shotwell/src/ColorTransformation.vala" memset (self, 0, sizeof (HSVAnalyticPixel)); #line 75 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -1234,73 +1337,59 @@ void hsv_analytic_pixel_init (HSVAnalyticPixel *self) { (*self).saturation = 0.0f; #line 77 "/home/jens/Source/shotwell/src/ColorTransformation.vala" (*self).light_value = 0.0f; -#line 1238 "ColorTransformation.c" +#line 1341 "ColorTransformation.c" } -void hsv_analytic_pixel_init_from_components (HSVAnalyticPixel *self, gfloat hue, gfloat saturation, gfloat light_value) { - gfloat _tmp0_; - gfloat _tmp1_; - gfloat _tmp2_; - gfloat _tmp3_; - gfloat _tmp4_; - gfloat _tmp5_; +void +hsv_analytic_pixel_init_from_components (HSVAnalyticPixel *self, + gfloat hue, + gfloat saturation, + gfloat light_value) +{ #line 80 "/home/jens/Source/shotwell/src/ColorTransformation.vala" memset (self, 0, sizeof (HSVAnalyticPixel)); #line 82 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = hue; -#line 82 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = CLAMP (_tmp0_, 0.0f, 1.0f); -#line 82 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - (*self).hue = _tmp1_; + (*self).hue = CLAMP (hue, 0.0f, 1.0f); #line 83 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = saturation; -#line 83 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = CLAMP (_tmp2_, 0.0f, 1.0f); -#line 83 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - (*self).saturation = _tmp3_; -#line 84 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = light_value; -#line 84 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = CLAMP (_tmp4_, 0.0f, 1.0f); + (*self).saturation = CLAMP (saturation, 0.0f, 1.0f); #line 84 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - (*self).light_value = _tmp5_; -#line 1269 "ColorTransformation.c" + (*self).light_value = CLAMP (light_value, 0.0f, 1.0f); +#line 1359 "ColorTransformation.c" } -void hsv_analytic_pixel_init_from_quantized_components (HSVAnalyticPixel *self, guchar hue_quantized, guchar saturation_quantized, guchar light_value_quantized) { - guchar _tmp0_; +void +hsv_analytic_pixel_init_from_quantized_components (HSVAnalyticPixel *self, + guchar hue_quantized, + guchar saturation_quantized, + guchar light_value_quantized) +{ + gfloat _tmp0_; gfloat _tmp1_; - guchar _tmp2_; - gfloat _tmp3_; - guchar _tmp4_; - gfloat _tmp5_; + gfloat _tmp2_; #line 87 "/home/jens/Source/shotwell/src/ColorTransformation.vala" memset (self, 0, sizeof (HSVAnalyticPixel)); #line 89 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = hue_quantized; + _tmp0_ = rgb_lookup_table[hue_quantized]; #line 89 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = rgb_lookup_table[_tmp0_]; -#line 89 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - (*self).hue = _tmp1_; -#line 90 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = saturation_quantized; + (*self).hue = _tmp0_; #line 90 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = rgb_lookup_table[_tmp2_]; + _tmp1_ = rgb_lookup_table[saturation_quantized]; #line 90 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - (*self).saturation = _tmp3_; + (*self).saturation = _tmp1_; #line 91 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = light_value_quantized; + _tmp2_ = rgb_lookup_table[light_value_quantized]; #line 91 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = rgb_lookup_table[_tmp4_]; -#line 91 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - (*self).light_value = _tmp5_; -#line 1300 "ColorTransformation.c" + (*self).light_value = _tmp2_; +#line 1386 "ColorTransformation.c" } -gboolean hsv_analytic_pixel_equals (HSVAnalyticPixel *self, HSVAnalyticPixel* rhs) { +gboolean +hsv_analytic_pixel_equals (HSVAnalyticPixel *self, + HSVAnalyticPixel* rhs) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; @@ -1315,7 +1404,7 @@ gboolean hsv_analytic_pixel_equals (HSVAnalyticPixel *self, HSVAnalyticPixel* rh _tmp4_ = _tmp3_.hue; #line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (_tmp2_ == _tmp4_) { -#line 1319 "ColorTransformation.c" +#line 1408 "ColorTransformation.c" gfloat _tmp5_; HSVAnalyticPixel _tmp6_; gfloat _tmp7_; @@ -1327,15 +1416,15 @@ gboolean hsv_analytic_pixel_equals (HSVAnalyticPixel *self, HSVAnalyticPixel* rh _tmp7_ = _tmp6_.saturation; #line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp1_ = _tmp5_ == _tmp7_; -#line 1331 "ColorTransformation.c" +#line 1420 "ColorTransformation.c" } else { #line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp1_ = FALSE; -#line 1335 "ColorTransformation.c" +#line 1424 "ColorTransformation.c" } #line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (_tmp1_) { -#line 1339 "ColorTransformation.c" +#line 1428 "ColorTransformation.c" gfloat _tmp8_; HSVAnalyticPixel _tmp9_; gfloat _tmp10_; @@ -1347,21 +1436,23 @@ gboolean hsv_analytic_pixel_equals (HSVAnalyticPixel *self, HSVAnalyticPixel* rh _tmp10_ = _tmp9_.light_value; #line 100 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp0_ = _tmp8_ == _tmp10_; -#line 1351 "ColorTransformation.c" +#line 1440 "ColorTransformation.c" } else { #line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp0_ = FALSE; -#line 1355 "ColorTransformation.c" +#line 1444 "ColorTransformation.c" } #line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala" result = _tmp0_; #line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 1361 "ColorTransformation.c" +#line 1450 "ColorTransformation.c" } -guint hsv_analytic_pixel_hash_code (HSVAnalyticPixel *self) { +guint +hsv_analytic_pixel_hash_code (HSVAnalyticPixel *self) +{ guint result = 0U; gfloat _tmp0_; gfloat _tmp1_; @@ -1376,11 +1467,13 @@ guint hsv_analytic_pixel_hash_code (HSVAnalyticPixel *self) { result = ((((guint) (_tmp0_ * 255.0f)) << 16) + (((guint) (_tmp1_ * 255.0f)) << 8)) + ((guint) (_tmp2_ * 255.0f)); #line 104 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 1380 "ColorTransformation.c" +#line 1471 "ColorTransformation.c" } -HSVAnalyticPixel* hsv_analytic_pixel_dup (const HSVAnalyticPixel* self) { +HSVAnalyticPixel* +hsv_analytic_pixel_dup (const HSVAnalyticPixel* self) +{ HSVAnalyticPixel* dup; #line 67 "/home/jens/Source/shotwell/src/ColorTransformation.vala" dup = g_new0 (HSVAnalyticPixel, 1); @@ -1388,18 +1481,22 @@ HSVAnalyticPixel* hsv_analytic_pixel_dup (const HSVAnalyticPixel* self) { memcpy (dup, self, sizeof (HSVAnalyticPixel)); #line 67 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return dup; -#line 1392 "ColorTransformation.c" +#line 1485 "ColorTransformation.c" } -void hsv_analytic_pixel_free (HSVAnalyticPixel* self) { +void +hsv_analytic_pixel_free (HSVAnalyticPixel* self) +{ #line 67 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_free (self); -#line 1399 "ColorTransformation.c" +#line 1494 "ColorTransformation.c" } -GType hsv_analytic_pixel_get_type (void) { +GType +hsv_analytic_pixel_get_type (void) +{ static volatile gsize hsv_analytic_pixel_type_id__volatile = 0; if (g_once_init_enter (&hsv_analytic_pixel_type_id__volatile)) { GType hsv_analytic_pixel_type_id; @@ -1410,7 +1507,9 @@ GType hsv_analytic_pixel_get_type (void) { } -GType composition_mode_get_type (void) { +GType +composition_mode_get_type (void) +{ static volatile gsize composition_mode_type_id__volatile = 0; if (g_once_init_enter (&composition_mode_type_id__volatile)) { static const GEnumValue values[] = {{COMPOSITION_MODE_NONE, "COMPOSITION_MODE_NONE", "none"}, {COMPOSITION_MODE_RGB_MATRIX, "COMPOSITION_MODE_RGB_MATRIX", "rgb-matrix"}, {COMPOSITION_MODE_HSV_LOOKUP, "COMPOSITION_MODE_HSV_LOOKUP", "hsv-lookup"}, {0, NULL, NULL}}; @@ -1422,7 +1521,9 @@ GType composition_mode_get_type (void) { } -GType pixel_format_get_type (void) { +GType +pixel_format_get_type (void) +{ static volatile gsize pixel_format_type_id__volatile = 0; if (g_once_init_enter (&pixel_format_type_id__volatile)) { static const GEnumValue values[] = {{PIXEL_FORMAT_RGB, "PIXEL_FORMAT_RGB", "rgb"}, {PIXEL_FORMAT_HSV, "PIXEL_FORMAT_HSV", "hsv"}, {0, NULL, NULL}}; @@ -1434,7 +1535,9 @@ GType pixel_format_get_type (void) { } -GType pixel_transformation_type_get_type (void) { +GType +pixel_transformation_type_get_type (void) +{ static volatile gsize pixel_transformation_type_type_id__volatile = 0; if (g_once_init_enter (&pixel_transformation_type_type_id__volatile)) { static const GEnumValue values[] = {{PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION, "PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION", "tone-expansion"}, {PIXEL_TRANSFORMATION_TYPE_SHADOWS, "PIXEL_TRANSFORMATION_TYPE_SHADOWS", "shadows"}, {PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS, "PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS", "highlights"}, {PIXEL_TRANSFORMATION_TYPE_TEMPERATURE, "PIXEL_TRANSFORMATION_TYPE_TEMPERATURE", "temperature"}, {PIXEL_TRANSFORMATION_TYPE_TINT, "PIXEL_TRANSFORMATION_TYPE_TINT", "tint"}, {PIXEL_TRANSFORMATION_TYPE_SATURATION, "PIXEL_TRANSFORMATION_TYPE_SATURATION", "saturation"}, {PIXEL_TRANSFORMATION_TYPE_EXPOSURE, "PIXEL_TRANSFORMATION_TYPE_EXPOSURE", "exposure"}, {PIXEL_TRANSFORMATION_TYPE_CONTRAST, "PIXEL_TRANSFORMATION_TYPE_CONTRAST", "contrast"}, {0, NULL, NULL}}; @@ -1446,31 +1549,39 @@ GType pixel_transformation_type_get_type (void) { } -PixelTransformationBundle* pixel_transformation_bundle_construct (GType object_type) { +PixelTransformationBundle* +pixel_transformation_bundle_construct (GType object_type) +{ PixelTransformationBundle* self = NULL; #line 137 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = (PixelTransformationBundle*) g_type_create_instance (object_type); #line 137 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self; -#line 1456 "ColorTransformation.c" +#line 1561 "ColorTransformation.c" } -PixelTransformationBundle* pixel_transformation_bundle_new (void) { +PixelTransformationBundle* +pixel_transformation_bundle_new (void) +{ #line 137 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return pixel_transformation_bundle_construct (TYPE_PIXEL_TRANSFORMATION_BUNDLE); -#line 1463 "ColorTransformation.c" +#line 1570 "ColorTransformation.c" } -static gpointer _pixel_transformation_bundle_ref0 (gpointer self) { +static gpointer +_pixel_transformation_bundle_ref0 (gpointer self) +{ #line 141 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self ? pixel_transformation_bundle_ref (self) : NULL; -#line 1470 "ColorTransformation.c" +#line 1579 "ColorTransformation.c" } -PixelTransformationBundle* pixel_transformation_bundle_get_copied_color_adjustments (void) { +PixelTransformationBundle* +pixel_transformation_bundle_get_copied_color_adjustments (void) +{ PixelTransformationBundle* result = NULL; PixelTransformationBundle* _tmp0_; PixelTransformationBundle* _tmp1_; @@ -1482,26 +1593,27 @@ PixelTransformationBundle* pixel_transformation_bundle_get_copied_color_adjustme result = _tmp1_; #line 141 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 1486 "ColorTransformation.c" +#line 1597 "ColorTransformation.c" } -void pixel_transformation_bundle_set_copied_color_adjustments (PixelTransformationBundle* adjustments) { +void +pixel_transformation_bundle_set_copied_color_adjustments (PixelTransformationBundle* adjustments) +{ PixelTransformationBundle* _tmp0_; - PixelTransformationBundle* _tmp1_; #line 145 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = adjustments; -#line 145 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = _pixel_transformation_bundle_ref0 (_tmp0_); + _tmp0_ = _pixel_transformation_bundle_ref0 (adjustments); #line 145 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _pixel_transformation_bundle_unref0 (pixel_transformation_bundle_copied_color_adjustments); #line 145 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_copied_color_adjustments = _tmp1_; -#line 1501 "ColorTransformation.c" + pixel_transformation_bundle_copied_color_adjustments = _tmp0_; +#line 1611 "ColorTransformation.c" } -gboolean pixel_transformation_bundle_has_copied_color_adjustments (void) { +gboolean +pixel_transformation_bundle_has_copied_color_adjustments (void) +{ gboolean result = FALSE; PixelTransformationBundle* _tmp0_; #line 149 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -1510,30 +1622,26 @@ gboolean pixel_transformation_bundle_has_copied_color_adjustments (void) { result = _tmp0_ != NULL; #line 149 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 1514 "ColorTransformation.c" +#line 1626 "ColorTransformation.c" } -void pixel_transformation_bundle_set (PixelTransformationBundle* self, PixelTransformation* transformation) { +void +pixel_transformation_bundle_set (PixelTransformationBundle* self, + PixelTransformation* transformation) +{ GeeHashMap* _tmp0_; - PixelTransformation* _tmp1_; - PixelTransformationType _tmp2_; - PixelTransformation* _tmp3_; #line 153 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp0_ = self->priv->map; #line 153 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = transformation; -#line 153 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = pixel_transformation_get_transformation_type (_tmp1_); -#line 153 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = transformation; -#line 153 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) ((gint) _tmp2_)), _tmp3_); -#line 1533 "ColorTransformation.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) ((gint) pixel_transformation_get_transformation_type (transformation))), transformation); +#line 1639 "ColorTransformation.c" } -void pixel_transformation_bundle_set_to_identity (PixelTransformationBundle* self) { +void +pixel_transformation_bundle_set_to_identity (PixelTransformationBundle* self) +{ ExpansionTransformation* _tmp0_; ExpansionTransformation* _tmp1_; ShadowDetailTransformation* _tmp2_; @@ -1614,291 +1722,228 @@ void pixel_transformation_bundle_set_to_identity (PixelTransformationBundle* sel pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 164 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _pixel_transformation_unref0 (_tmp15_); -#line 1618 "ColorTransformation.c" +#line 1726 "ColorTransformation.c" } -void pixel_transformation_bundle_load (PixelTransformationBundle* self, KeyValueMap* store) { +void +pixel_transformation_bundle_load (PixelTransformationBundle* self, + KeyValueMap* store) +{ gchar* expansion_params_encoded = NULL; - KeyValueMap* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_; - KeyValueMap* _tmp8_; - gfloat _tmp9_; - ShadowDetailTransformation* _tmp10_; - ShadowDetailTransformation* _tmp11_; - KeyValueMap* _tmp12_; - gfloat _tmp13_; - HighlightDetailTransformation* _tmp14_; - HighlightDetailTransformation* _tmp15_; - KeyValueMap* _tmp16_; - gfloat _tmp17_; - TemperatureTransformation* _tmp18_; - TemperatureTransformation* _tmp19_; - KeyValueMap* _tmp20_; - gfloat _tmp21_; - TintTransformation* _tmp22_; - TintTransformation* _tmp23_; - KeyValueMap* _tmp24_; - gfloat _tmp25_; - SaturationTransformation* _tmp26_; - SaturationTransformation* _tmp27_; - KeyValueMap* _tmp28_; - gfloat _tmp29_; - ExposureTransformation* _tmp30_; - ExposureTransformation* _tmp31_; - KeyValueMap* _tmp32_; - gfloat _tmp33_; - ContrastTransformation* _tmp34_; - ContrastTransformation* _tmp35_; -#line 168 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = store; + gchar* _tmp0_; + const gchar* _tmp1_; + ShadowDetailTransformation* _tmp7_; + ShadowDetailTransformation* _tmp8_; + HighlightDetailTransformation* _tmp9_; + HighlightDetailTransformation* _tmp10_; + TemperatureTransformation* _tmp11_; + TemperatureTransformation* _tmp12_; + TintTransformation* _tmp13_; + TintTransformation* _tmp14_; + SaturationTransformation* _tmp15_; + SaturationTransformation* _tmp16_; + ExposureTransformation* _tmp17_; + ExposureTransformation* _tmp18_; + ContrastTransformation* _tmp19_; + ContrastTransformation* _tmp20_; #line 168 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = key_value_map_get_string (_tmp0_, "expansion", "-"); + _tmp0_ = key_value_map_get_string (store, "expansion", "-"); #line 168 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - expansion_params_encoded = _tmp1_; + expansion_params_encoded = _tmp0_; #line 169 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = expansion_params_encoded; + _tmp1_ = expansion_params_encoded; #line 169 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (g_strcmp0 (_tmp2_, "-") == 0) { -#line 1665 "ColorTransformation.c" + if (g_strcmp0 (_tmp1_, "-") == 0) { +#line 1759 "ColorTransformation.c" + ExpansionTransformation* _tmp2_; ExpansionTransformation* _tmp3_; - ExpansionTransformation* _tmp4_; #line 170 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = expansion_transformation_new_from_extrema (0, 255); + _tmp2_ = expansion_transformation_new_from_extrema (0, 255); #line 170 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 170 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 170 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _pixel_transformation_unref0 (_tmp4_); -#line 1676 "ColorTransformation.c" + _pixel_transformation_unref0 (_tmp3_); +#line 1770 "ColorTransformation.c" } else { - const gchar* _tmp5_; + const gchar* _tmp4_; + ExpansionTransformation* _tmp5_; ExpansionTransformation* _tmp6_; - ExpansionTransformation* _tmp7_; #line 172 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = expansion_params_encoded; + _tmp4_ = expansion_params_encoded; #line 172 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = expansion_transformation_new_from_string (_tmp5_); + _tmp5_ = expansion_transformation_new_from_string (_tmp4_); #line 172 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 172 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 172 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _pixel_transformation_unref0 (_tmp7_); -#line 1691 "ColorTransformation.c" + _pixel_transformation_unref0 (_tmp6_); +#line 1785 "ColorTransformation.c" } #line 174 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = store; + _tmp7_ = shadow_detail_transformation_new (key_value_map_get_float (store, "shadows", 0.0f)); #line 174 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = key_value_map_get_float (_tmp8_, "shadows", 0.0f); -#line 174 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = shadow_detail_transformation_new (_tmp9_); -#line 174 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 174 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 174 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _pixel_transformation_unref0 (_tmp11_); -#line 175 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = store; -#line 175 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp13_ = key_value_map_get_float (_tmp12_, "highlights", 0.0f); + _pixel_transformation_unref0 (_tmp8_); #line 175 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_ = highlight_detail_transformation_new (_tmp13_); + _tmp9_ = highlight_detail_transformation_new (key_value_map_get_float (store, "highlights", 0.0f)); #line 175 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp15_ = _tmp14_; + _tmp10_ = _tmp9_; #line 175 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 175 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _pixel_transformation_unref0 (_tmp15_); + _pixel_transformation_unref0 (_tmp10_); #line 176 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp16_ = store; + _tmp11_ = temperature_transformation_new (key_value_map_get_float (store, "temperature", 0.0f)); #line 176 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp17_ = key_value_map_get_float (_tmp16_, "temperature", 0.0f); + _tmp12_ = _tmp11_; #line 176 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18_ = temperature_transformation_new (_tmp17_); + pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 176 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp19_ = _tmp18_; -#line 176 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); -#line 176 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _pixel_transformation_unref0 (_tmp19_); -#line 177 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp20_ = store; -#line 177 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp21_ = key_value_map_get_float (_tmp20_, "tint", 0.0f); + _pixel_transformation_unref0 (_tmp12_); #line 177 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp22_ = tint_transformation_new (_tmp21_); + _tmp13_ = tint_transformation_new (key_value_map_get_float (store, "tint", 0.0f)); #line 177 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp23_ = _tmp22_; + _tmp14_ = _tmp13_; #line 177 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 177 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _pixel_transformation_unref0 (_tmp23_); + _pixel_transformation_unref0 (_tmp14_); #line 178 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp24_ = store; + _tmp15_ = saturation_transformation_new (key_value_map_get_float (store, "saturation", 0.0f)); #line 178 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp25_ = key_value_map_get_float (_tmp24_, "saturation", 0.0f); -#line 178 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp26_ = saturation_transformation_new (_tmp25_); -#line 178 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp27_ = _tmp26_; + _tmp16_ = _tmp15_; #line 178 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 178 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _pixel_transformation_unref0 (_tmp27_); -#line 179 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp28_ = store; + _pixel_transformation_unref0 (_tmp16_); #line 179 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp29_ = key_value_map_get_float (_tmp28_, "exposure", 0.0f); + _tmp17_ = exposure_transformation_new (key_value_map_get_float (store, "exposure", 0.0f)); #line 179 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp30_ = exposure_transformation_new (_tmp29_); + _tmp18_ = _tmp17_; #line 179 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp31_ = _tmp30_; + pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 179 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); -#line 179 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _pixel_transformation_unref0 (_tmp31_); -#line 180 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp32_ = store; + _pixel_transformation_unref0 (_tmp18_); #line 180 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp33_ = key_value_map_get_float (_tmp32_, "contrast", 0.0f); + _tmp19_ = contrast_transformation_new (key_value_map_get_float (store, "contrast", 0.0f)); #line 180 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp34_ = contrast_transformation_new (_tmp33_); -#line 180 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp35_ = _tmp34_; + _tmp20_ = _tmp19_; #line 180 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 180 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _pixel_transformation_unref0 (_tmp35_); + _pixel_transformation_unref0 (_tmp20_); #line 167 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _g_free0 (expansion_params_encoded); -#line 1779 "ColorTransformation.c" +#line 1845 "ColorTransformation.c" } -KeyValueMap* pixel_transformation_bundle_save (PixelTransformationBundle* self, const gchar* group) { +KeyValueMap* +pixel_transformation_bundle_save (PixelTransformationBundle* self, + const gchar* group) +{ KeyValueMap* result = NULL; KeyValueMap* store = NULL; - const gchar* _tmp0_; - KeyValueMap* _tmp1_; + KeyValueMap* _tmp0_; ExpansionTransformation* new_expansion_trans = NULL; - PixelTransformation* _tmp2_; + PixelTransformation* _tmp1_; + gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; ShadowDetailTransformation* new_shadows_trans = NULL; - PixelTransformation* _tmp5_; - gfloat _tmp6_; + PixelTransformation* _tmp4_; HighlightDetailTransformation* new_highlight_trans = NULL; - PixelTransformation* _tmp7_; - gfloat _tmp8_; + PixelTransformation* _tmp5_; TemperatureTransformation* new_temp_trans = NULL; - PixelTransformation* _tmp9_; - gfloat _tmp10_; + PixelTransformation* _tmp6_; TintTransformation* new_tint_trans = NULL; - PixelTransformation* _tmp11_; - gfloat _tmp12_; + PixelTransformation* _tmp7_; SaturationTransformation* new_sat_trans = NULL; - PixelTransformation* _tmp13_; - gfloat _tmp14_; + PixelTransformation* _tmp8_; ExposureTransformation* new_exposure_trans = NULL; - PixelTransformation* _tmp15_; - gfloat _tmp16_; + PixelTransformation* _tmp9_; ContrastTransformation* new_contrast_trans = NULL; - PixelTransformation* _tmp17_; - gfloat _tmp18_; + PixelTransformation* _tmp10_; #line 184 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = group; + _tmp0_ = key_value_map_new (group); #line 184 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = key_value_map_new (_tmp0_); -#line 184 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - store = _tmp1_; + store = _tmp0_; #line 186 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION); + _tmp1_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION); #line 186 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - new_expansion_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation); + new_expansion_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation); #line 188 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _vala_assert (new_expansion_trans != NULL, "new_expansion_trans != null"); #line 189 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = pixel_transformation_to_string (G_TYPE_CHECK_INSTANCE_CAST (new_expansion_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + _tmp2_ = pixel_transformation_to_string (G_TYPE_CHECK_INSTANCE_CAST (new_expansion_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 189 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 189 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - key_value_map_set_string (store, "expansion", _tmp4_); + key_value_map_set_string (store, "expansion", _tmp3_); #line 189 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 191 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_SHADOWS); + _tmp4_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_SHADOWS); #line 191 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - new_shadows_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation); + new_shadows_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation); #line 193 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _vala_assert (new_shadows_trans != NULL, "new_shadows_trans != null"); #line 194 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = shadow_detail_transformation_get_parameter (new_shadows_trans); -#line 194 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - key_value_map_set_float (store, "shadows", _tmp6_); + key_value_map_set_float (store, "shadows", shadow_detail_transformation_get_parameter (new_shadows_trans)); #line 196 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS); + _tmp5_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS); #line 196 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - new_highlight_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation); + new_highlight_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation); #line 198 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _vala_assert (new_highlight_trans != NULL, "new_highlight_trans != null"); #line 199 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = highlight_detail_transformation_get_parameter (new_highlight_trans); -#line 199 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - key_value_map_set_float (store, "highlights", _tmp8_); + key_value_map_set_float (store, "highlights", highlight_detail_transformation_get_parameter (new_highlight_trans)); #line 201 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_TEMPERATURE); + _tmp6_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_TEMPERATURE); #line 201 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - new_temp_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation); + new_temp_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation); #line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _vala_assert (new_temp_trans != NULL, "new_temp_trans != null"); #line 204 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = temperature_transformation_get_parameter (new_temp_trans); -#line 204 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - key_value_map_set_float (store, "temperature", _tmp10_); + key_value_map_set_float (store, "temperature", temperature_transformation_get_parameter (new_temp_trans)); #line 206 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_TINT); + _tmp7_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_TINT); #line 206 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - new_tint_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_TINT_TRANSFORMATION, TintTransformation); + new_tint_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_TINT_TRANSFORMATION, TintTransformation); #line 208 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _vala_assert (new_tint_trans != NULL, "new_tint_trans != null"); #line 209 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = tint_transformation_get_parameter (new_tint_trans); -#line 209 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - key_value_map_set_float (store, "tint", _tmp12_); + key_value_map_set_float (store, "tint", tint_transformation_get_parameter (new_tint_trans)); #line 211 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp13_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_SATURATION); + _tmp8_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_SATURATION); #line 211 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - new_sat_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation); + new_sat_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation); #line 213 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _vala_assert (new_sat_trans != NULL, "new_sat_trans != null"); #line 214 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_ = saturation_transformation_get_parameter (new_sat_trans); -#line 214 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - key_value_map_set_float (store, "saturation", _tmp14_); + key_value_map_set_float (store, "saturation", saturation_transformation_get_parameter (new_sat_trans)); #line 216 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp15_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_EXPOSURE); + _tmp9_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_EXPOSURE); #line 216 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - new_exposure_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation); + new_exposure_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation); #line 218 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _vala_assert (new_exposure_trans != NULL, "new_exposure_trans != null"); #line 219 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp16_ = exposure_transformation_get_parameter (new_exposure_trans); -#line 219 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - key_value_map_set_float (store, "exposure", _tmp16_); + key_value_map_set_float (store, "exposure", exposure_transformation_get_parameter (new_exposure_trans)); #line 221 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp17_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_CONTRAST); + _tmp10_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_CONTRAST); #line 221 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - new_contrast_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation); + new_contrast_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation); #line 223 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _vala_assert (new_contrast_trans != NULL, "new_contrast_trans != null"); #line 224 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18_ = contrast_transformation_get_parameter (new_contrast_trans); -#line 224 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - key_value_map_set_float (store, "contrast", _tmp18_); + key_value_map_set_float (store, "contrast", contrast_transformation_get_parameter (new_contrast_trans)); #line 226 "/home/jens/Source/shotwell/src/ColorTransformation.vala" result = store; #line 226 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -1919,11 +1964,13 @@ KeyValueMap* pixel_transformation_bundle_save (PixelTransformationBundle* self, _pixel_transformation_unref0 (new_expansion_trans); #line 226 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 1923 "ColorTransformation.c" +#line 1968 "ColorTransformation.c" } -gint pixel_transformation_bundle_get_count (PixelTransformationBundle* self) { +gint +pixel_transformation_bundle_get_count (PixelTransformationBundle* self) +{ gint result = 0; GeeHashMap* _tmp0_; gint _tmp1_; @@ -1938,30 +1985,32 @@ gint pixel_transformation_bundle_get_count (PixelTransformationBundle* self) { result = _tmp2_; #line 230 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 1942 "ColorTransformation.c" +#line 1989 "ColorTransformation.c" } -PixelTransformation* pixel_transformation_bundle_get_transformation (PixelTransformationBundle* self, PixelTransformationType type) { +PixelTransformation* +pixel_transformation_bundle_get_transformation (PixelTransformationBundle* self, + PixelTransformationType type) +{ PixelTransformation* result = NULL; GeeHashMap* _tmp0_; - PixelTransformationType _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp0_ = self->priv->map; #line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = type; -#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) ((gint) _tmp1_))); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) ((gint) type))); #line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - result = (PixelTransformation*) _tmp2_; + result = (PixelTransformation*) _tmp1_; #line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 1961 "ColorTransformation.c" +#line 2008 "ColorTransformation.c" } -GeeIterable* pixel_transformation_bundle_get_transformations (PixelTransformationBundle* self) { +GeeIterable* +pixel_transformation_bundle_get_transformations (PixelTransformationBundle* self) +{ GeeIterable* result = NULL; GeeHashMap* _tmp0_; GeeCollection* _tmp1_; @@ -1976,11 +2025,13 @@ GeeIterable* pixel_transformation_bundle_get_transformations (PixelTransformatio result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable); #line 238 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 1980 "ColorTransformation.c" +#line 2029 "ColorTransformation.c" } -gboolean pixel_transformation_bundle_is_identity (PixelTransformationBundle* self) { +gboolean +pixel_transformation_bundle_is_identity (PixelTransformationBundle* self) +{ gboolean result = FALSE; { GeeIterator* _adjustment_it = NULL; @@ -2002,36 +2053,30 @@ gboolean pixel_transformation_bundle_is_identity (PixelTransformationBundle* sel _adjustment_it = _tmp3_; #line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 2006 "ColorTransformation.c" +#line 2057 "ColorTransformation.c" GeeIterator* _tmp4_; - gboolean _tmp5_; PixelTransformation* adjustment = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - PixelTransformation* _tmp8_; - gboolean _tmp9_; + GeeIterator* _tmp5_; + gpointer _tmp6_; + PixelTransformation* _tmp7_; #line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp4_ = _adjustment_it; #line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp4_)) { #line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 2022 "ColorTransformation.c" +#line 2069 "ColorTransformation.c" } #line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = _adjustment_it; + _tmp5_ = _adjustment_it; #line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - adjustment = (PixelTransformation*) _tmp7_; -#line 243 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = adjustment; + adjustment = (PixelTransformation*) _tmp6_; #line 243 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = pixel_transformation_is_identity (_tmp8_); + _tmp7_ = adjustment; #line 243 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp9_) { + if (!pixel_transformation_is_identity (_tmp7_)) { #line 244 "/home/jens/Source/shotwell/src/ColorTransformation.vala" result = FALSE; #line 244 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -2040,25 +2085,27 @@ gboolean pixel_transformation_bundle_is_identity (PixelTransformationBundle* sel _g_object_unref0 (_adjustment_it); #line 244 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 2044 "ColorTransformation.c" +#line 2089 "ColorTransformation.c" } #line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _pixel_transformation_unref0 (adjustment); -#line 2048 "ColorTransformation.c" +#line 2093 "ColorTransformation.c" } #line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _g_object_unref0 (_adjustment_it); -#line 2052 "ColorTransformation.c" +#line 2097 "ColorTransformation.c" } #line 247 "/home/jens/Source/shotwell/src/ColorTransformation.vala" result = TRUE; #line 247 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 2058 "ColorTransformation.c" +#line 2103 "ColorTransformation.c" } -PixelTransformer* pixel_transformation_bundle_generate_transformer (PixelTransformationBundle* self) { +PixelTransformer* +pixel_transformation_bundle_generate_transformer (PixelTransformationBundle* self) +{ PixelTransformer* result = NULL; PixelTransformer* transformer = NULL; PixelTransformer* _tmp0_; @@ -2066,7 +2113,7 @@ PixelTransformer* pixel_transformation_bundle_generate_transformer (PixelTransfo _tmp0_ = pixel_transformer_new (); #line 251 "/home/jens/Source/shotwell/src/ColorTransformation.vala" transformer = _tmp0_; -#line 2070 "ColorTransformation.c" +#line 2117 "ColorTransformation.c" { GeeIterator* _transformation_it = NULL; GeeIterable* _tmp1_; @@ -2087,53 +2134,52 @@ PixelTransformer* pixel_transformation_bundle_generate_transformer (PixelTransfo _transformation_it = _tmp4_; #line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 2091 "ColorTransformation.c" +#line 2138 "ColorTransformation.c" GeeIterator* _tmp5_; - gboolean _tmp6_; PixelTransformation* transformation = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; - PixelTransformer* _tmp9_; - PixelTransformation* _tmp10_; + GeeIterator* _tmp6_; + gpointer _tmp7_; + PixelTransformer* _tmp8_; + PixelTransformation* _tmp9_; #line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp5_ = _transformation_it; #line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = gee_iterator_next (_tmp5_); -#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp5_)) { #line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 2107 "ColorTransformation.c" +#line 2151 "ColorTransformation.c" } #line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = _transformation_it; + _tmp6_ = _transformation_it; #line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - transformation = (PixelTransformation*) _tmp8_; + transformation = (PixelTransformation*) _tmp7_; #line 253 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = transformer; + _tmp8_ = transformer; #line 253 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = transformation; + _tmp9_ = transformation; #line 253 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformer_attach_transformation (_tmp9_, _tmp10_); + pixel_transformer_attach_transformation (_tmp8_, _tmp9_); #line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _pixel_transformation_unref0 (transformation); -#line 2123 "ColorTransformation.c" +#line 2167 "ColorTransformation.c" } #line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _g_object_unref0 (_transformation_it); -#line 2127 "ColorTransformation.c" +#line 2171 "ColorTransformation.c" } #line 255 "/home/jens/Source/shotwell/src/ColorTransformation.vala" result = transformer; #line 255 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 2133 "ColorTransformation.c" +#line 2177 "ColorTransformation.c" } -PixelTransformationBundle* pixel_transformation_bundle_copy (PixelTransformationBundle* self) { +PixelTransformationBundle* +pixel_transformation_bundle_copy (PixelTransformationBundle* self) +{ PixelTransformationBundle* result = NULL; PixelTransformationBundle* bundle = NULL; PixelTransformationBundle* _tmp0_; @@ -2141,7 +2187,7 @@ PixelTransformationBundle* pixel_transformation_bundle_copy (PixelTransformation _tmp0_ = pixel_transformation_bundle_new (); #line 259 "/home/jens/Source/shotwell/src/ColorTransformation.vala" bundle = _tmp0_; -#line 2145 "ColorTransformation.c" +#line 2191 "ColorTransformation.c" { GeeIterator* _transformation_it = NULL; GeeIterable* _tmp1_; @@ -2162,150 +2208,172 @@ PixelTransformationBundle* pixel_transformation_bundle_copy (PixelTransformation _transformation_it = _tmp4_; #line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 2166 "ColorTransformation.c" +#line 2212 "ColorTransformation.c" GeeIterator* _tmp5_; - gboolean _tmp6_; PixelTransformation* transformation = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; - PixelTransformationBundle* _tmp9_; - PixelTransformation* _tmp10_; + GeeIterator* _tmp6_; + gpointer _tmp7_; + PixelTransformationBundle* _tmp8_; + PixelTransformation* _tmp9_; #line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp5_ = _transformation_it; #line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = gee_iterator_next (_tmp5_); -#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp5_)) { #line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 2182 "ColorTransformation.c" +#line 2225 "ColorTransformation.c" } #line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = _transformation_it; + _tmp6_ = _transformation_it; #line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - transformation = (PixelTransformation*) _tmp8_; + transformation = (PixelTransformation*) _tmp7_; #line 261 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = bundle; + _tmp8_ = bundle; #line 261 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = transformation; + _tmp9_ = transformation; #line 261 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_set (_tmp9_, _tmp10_); + pixel_transformation_bundle_set (_tmp8_, _tmp9_); #line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _pixel_transformation_unref0 (transformation); -#line 2198 "ColorTransformation.c" +#line 2241 "ColorTransformation.c" } #line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _g_object_unref0 (_transformation_it); -#line 2202 "ColorTransformation.c" +#line 2245 "ColorTransformation.c" } #line 263 "/home/jens/Source/shotwell/src/ColorTransformation.vala" result = bundle; #line 263 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 2208 "ColorTransformation.c" +#line 2251 "ColorTransformation.c" } -static void value_pixel_transformation_bundle_init (GValue* value) { +static void +value_pixel_transformation_bundle_init (GValue* value) +{ #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 2215 "ColorTransformation.c" +#line 2260 "ColorTransformation.c" } -static void value_pixel_transformation_bundle_free_value (GValue* value) { +static void +value_pixel_transformation_bundle_free_value (GValue* value) +{ #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (value->data[0].v_pointer) { #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixel_transformation_bundle_unref (value->data[0].v_pointer); -#line 2224 "ColorTransformation.c" +#line 2271 "ColorTransformation.c" } } -static void value_pixel_transformation_bundle_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_pixel_transformation_bundle_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (src_value->data[0].v_pointer) { #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" dest_value->data[0].v_pointer = pixel_transformation_bundle_ref (src_value->data[0].v_pointer); -#line 2234 "ColorTransformation.c" +#line 2284 "ColorTransformation.c" } else { #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" dest_value->data[0].v_pointer = NULL; -#line 2238 "ColorTransformation.c" +#line 2288 "ColorTransformation.c" } } -static gpointer value_pixel_transformation_bundle_peek_pointer (const GValue* value) { +static gpointer +value_pixel_transformation_bundle_peek_pointer (const GValue* value) +{ #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return value->data[0].v_pointer; -#line 2246 "ColorTransformation.c" +#line 2298 "ColorTransformation.c" } -static gchar* value_pixel_transformation_bundle_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_pixel_transformation_bundle_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (collect_values[0].v_pointer) { -#line 2253 "ColorTransformation.c" +#line 2310 "ColorTransformation.c" PixelTransformationBundle * object; object = collect_values[0].v_pointer; #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (object->parent_instance.g_class == NULL) { #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2260 "ColorTransformation.c" +#line 2317 "ColorTransformation.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2264 "ColorTransformation.c" +#line 2321 "ColorTransformation.c" } #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = pixel_transformation_bundle_ref (object); -#line 2268 "ColorTransformation.c" +#line 2325 "ColorTransformation.c" } else { #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 2272 "ColorTransformation.c" +#line 2329 "ColorTransformation.c" } #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return NULL; -#line 2276 "ColorTransformation.c" +#line 2333 "ColorTransformation.c" } -static gchar* value_pixel_transformation_bundle_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_pixel_transformation_bundle_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PixelTransformationBundle ** object_p; object_p = collect_values[0].v_pointer; #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!object_p) { #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2287 "ColorTransformation.c" +#line 2349 "ColorTransformation.c" } #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!value->data[0].v_pointer) { #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" *object_p = NULL; -#line 2293 "ColorTransformation.c" +#line 2355 "ColorTransformation.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" *object_p = value->data[0].v_pointer; -#line 2297 "ColorTransformation.c" +#line 2359 "ColorTransformation.c" } else { #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" *object_p = pixel_transformation_bundle_ref (value->data[0].v_pointer); -#line 2301 "ColorTransformation.c" +#line 2363 "ColorTransformation.c" } #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return NULL; -#line 2305 "ColorTransformation.c" +#line 2367 "ColorTransformation.c" } -GParamSpec* param_spec_pixel_transformation_bundle (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_pixel_transformation_bundle (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPixelTransformationBundle* spec; #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PIXEL_TRANSFORMATION_BUNDLE), NULL); @@ -2315,20 +2383,25 @@ GParamSpec* param_spec_pixel_transformation_bundle (const gchar* name, const gch G_PARAM_SPEC (spec)->value_type = object_type; #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return G_PARAM_SPEC (spec); -#line 2319 "ColorTransformation.c" +#line 2387 "ColorTransformation.c" } -gpointer value_get_pixel_transformation_bundle (const GValue* value) { +gpointer +value_get_pixel_transformation_bundle (const GValue* value) +{ #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION_BUNDLE), NULL); #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return value->data[0].v_pointer; -#line 2328 "ColorTransformation.c" +#line 2398 "ColorTransformation.c" } -void value_set_pixel_transformation_bundle (GValue* value, gpointer v_object) { +void +value_set_pixel_transformation_bundle (GValue* value, + gpointer v_object) +{ PixelTransformationBundle * old; #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION_BUNDLE)); @@ -2344,22 +2417,25 @@ void value_set_pixel_transformation_bundle (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixel_transformation_bundle_ref (value->data[0].v_pointer); -#line 2348 "ColorTransformation.c" +#line 2421 "ColorTransformation.c" } else { #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 2352 "ColorTransformation.c" +#line 2425 "ColorTransformation.c" } #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (old) { #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixel_transformation_bundle_unref (old); -#line 2358 "ColorTransformation.c" +#line 2431 "ColorTransformation.c" } } -void value_take_pixel_transformation_bundle (GValue* value, gpointer v_object) { +void +value_take_pixel_transformation_bundle (GValue* value, + gpointer v_object) +{ PixelTransformationBundle * old; #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION_BUNDLE)); @@ -2373,33 +2449,37 @@ void value_take_pixel_transformation_bundle (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = v_object; -#line 2377 "ColorTransformation.c" +#line 2453 "ColorTransformation.c" } else { #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 2381 "ColorTransformation.c" +#line 2457 "ColorTransformation.c" } #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (old) { #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixel_transformation_bundle_unref (old); -#line 2387 "ColorTransformation.c" +#line 2463 "ColorTransformation.c" } } -static void pixel_transformation_bundle_class_init (PixelTransformationBundleClass * klass) { +static void +pixel_transformation_bundle_class_init (PixelTransformationBundleClass * klass) +{ #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixel_transformation_bundle_parent_class = g_type_class_peek_parent (klass); #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" ((PixelTransformationBundleClass *) klass)->finalize = pixel_transformation_bundle_finalize; #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_type_class_add_private (klass, sizeof (PixelTransformationBundlePrivate)); -#line 2399 "ColorTransformation.c" +#line 2477 "ColorTransformation.c" } -static void pixel_transformation_bundle_instance_init (PixelTransformationBundle * self) { +static void +pixel_transformation_bundle_instance_init (PixelTransformationBundle * self) +{ void* _tmp0_; GDestroyNotify _tmp1_; GeeHashDataFunc _tmp2_; @@ -2419,11 +2499,13 @@ static void pixel_transformation_bundle_instance_init (PixelTransformationBundle self->priv->map = _tmp6_; #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->ref_count = 1; -#line 2423 "ColorTransformation.c" +#line 2503 "ColorTransformation.c" } -static void pixel_transformation_bundle_finalize (PixelTransformationBundle * obj) { +static void +pixel_transformation_bundle_finalize (PixelTransformationBundle * obj) +{ PixelTransformationBundle * self; #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundle); @@ -2431,11 +2513,13 @@ static void pixel_transformation_bundle_finalize (PixelTransformationBundle * ob g_signal_handlers_destroy (self); #line 134 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _g_object_unref0 (self->priv->map); -#line 2435 "ColorTransformation.c" +#line 2517 "ColorTransformation.c" } -GType pixel_transformation_bundle_get_type (void) { +GType +pixel_transformation_bundle_get_type (void) +{ static volatile gsize pixel_transformation_bundle_type_id__volatile = 0; if (g_once_init_enter (&pixel_transformation_bundle_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_pixel_transformation_bundle_init, value_pixel_transformation_bundle_free_value, value_pixel_transformation_bundle_copy_value, value_pixel_transformation_bundle_peek_pointer, "p", value_pixel_transformation_bundle_collect_value, "p", value_pixel_transformation_bundle_lcopy_value }; @@ -2449,18 +2533,22 @@ GType pixel_transformation_bundle_get_type (void) { } -gpointer pixel_transformation_bundle_ref (gpointer instance) { +gpointer +pixel_transformation_bundle_ref (gpointer instance) +{ PixelTransformationBundle * self; self = instance; #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_atomic_int_inc (&self->ref_count); #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return instance; -#line 2460 "ColorTransformation.c" +#line 2546 "ColorTransformation.c" } -void pixel_transformation_bundle_unref (gpointer instance) { +void +pixel_transformation_bundle_unref (gpointer instance) +{ PixelTransformationBundle * self; self = instance; #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -2469,32 +2557,32 @@ void pixel_transformation_bundle_unref (gpointer instance) { PIXEL_TRANSFORMATION_BUNDLE_GET_CLASS (self)->finalize (self); #line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2473 "ColorTransformation.c" +#line 2561 "ColorTransformation.c" } } -PixelTransformation* pixel_transformation_construct (GType object_type, PixelTransformationType type, PixelFormat preferred_format) { +PixelTransformation* +pixel_transformation_construct (GType object_type, + PixelTransformationType type, + PixelFormat preferred_format) +{ PixelTransformation* self = NULL; - PixelTransformationType _tmp0_; - PixelFormat _tmp1_; #line 271 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = (PixelTransformation*) g_type_create_instance (object_type); #line 273 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = type; -#line 273 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self->priv->type = _tmp0_; -#line 274 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = preferred_format; + self->priv->type = type; #line 274 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self->priv->preferred_format = _tmp1_; + self->priv->preferred_format = preferred_format; #line 271 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self; -#line 2494 "ColorTransformation.c" +#line 2580 "ColorTransformation.c" } -PixelTransformationType pixel_transformation_get_transformation_type (PixelTransformation* self) { +PixelTransformationType +pixel_transformation_get_transformation_type (PixelTransformation* self) +{ PixelTransformationType result = 0; PixelTransformationType _tmp0_; #line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -2503,11 +2591,13 @@ PixelTransformationType pixel_transformation_get_transformation_type (PixelTrans result = _tmp0_; #line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 2507 "ColorTransformation.c" +#line 2595 "ColorTransformation.c" } -PixelFormat pixel_transformation_get_preferred_format (PixelTransformation* self) { +PixelFormat +pixel_transformation_get_preferred_format (PixelTransformation* self) +{ PixelFormat result = 0; PixelFormat _tmp0_; #line 282 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -2516,59 +2606,77 @@ PixelFormat pixel_transformation_get_preferred_format (PixelTransformation* self result = _tmp0_; #line 282 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 2520 "ColorTransformation.c" +#line 2610 "ColorTransformation.c" } -static CompositionMode pixel_transformation_real_get_composition_mode (PixelTransformation* self) { +static CompositionMode +pixel_transformation_real_get_composition_mode (PixelTransformation* self) +{ CompositionMode result = 0; #line 286 "/home/jens/Source/shotwell/src/ColorTransformation.vala" result = COMPOSITION_MODE_NONE; #line 286 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 2530 "ColorTransformation.c" +#line 2622 "ColorTransformation.c" } -CompositionMode pixel_transformation_get_composition_mode (PixelTransformation* self) { +CompositionMode +pixel_transformation_get_composition_mode (PixelTransformation* self) +{ #line 285 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return PIXEL_TRANSFORMATION_GET_CLASS (self)->get_composition_mode (self); -#line 2537 "ColorTransformation.c" +#line 2631 "ColorTransformation.c" } -static void pixel_transformation_real_compose_with (PixelTransformation* self, PixelTransformation* other) { +static void +pixel_transformation_real_compose_with (PixelTransformation* self, + PixelTransformation* other) +{ #line 290 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_error ("ColorTransformation.vala:290: %s", "PixelTransformation: compose_with( ): this type of pixel " "transformation doesn't support composition."); -#line 2544 "ColorTransformation.c" +#line 2641 "ColorTransformation.c" } -void pixel_transformation_compose_with (PixelTransformation* self, PixelTransformation* other) { +void +pixel_transformation_compose_with (PixelTransformation* self, + PixelTransformation* other) +{ #line 289 "/home/jens/Source/shotwell/src/ColorTransformation.vala" PIXEL_TRANSFORMATION_GET_CLASS (self)->compose_with (self, other); -#line 2551 "ColorTransformation.c" +#line 2651 "ColorTransformation.c" } -static gboolean pixel_transformation_real_is_identity (PixelTransformation* self) { +static gboolean +pixel_transformation_real_is_identity (PixelTransformation* self) +{ gboolean result = FALSE; #line 295 "/home/jens/Source/shotwell/src/ColorTransformation.vala" result = TRUE; #line 295 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 2561 "ColorTransformation.c" +#line 2663 "ColorTransformation.c" } -gboolean pixel_transformation_is_identity (PixelTransformation* self) { +gboolean +pixel_transformation_is_identity (PixelTransformation* self) +{ #line 294 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return PIXEL_TRANSFORMATION_GET_CLASS (self)->is_identity (self); -#line 2568 "ColorTransformation.c" +#line 2672 "ColorTransformation.c" } -static void pixel_transformation_real_transform_pixel_hsv (PixelTransformation* self, HSVAnalyticPixel* p, HSVAnalyticPixel* result) { +static void +pixel_transformation_real_transform_pixel_hsv (PixelTransformation* self, + HSVAnalyticPixel* p, + HSVAnalyticPixel* result) +{ HSVAnalyticPixel _tmp0_; #line 299 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp0_ = *p; @@ -2576,18 +2684,26 @@ static void pixel_transformation_real_transform_pixel_hsv (PixelTransformation* *result = _tmp0_; #line 299 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return; -#line 2580 "ColorTransformation.c" +#line 2688 "ColorTransformation.c" } -void pixel_transformation_transform_pixel_hsv (PixelTransformation* self, HSVAnalyticPixel* p, HSVAnalyticPixel* result) { +void +pixel_transformation_transform_pixel_hsv (PixelTransformation* self, + HSVAnalyticPixel* p, + HSVAnalyticPixel* result) +{ #line 298 "/home/jens/Source/shotwell/src/ColorTransformation.vala" PIXEL_TRANSFORMATION_GET_CLASS (self)->transform_pixel_hsv (self, p, result); -#line 2587 "ColorTransformation.c" +#line 2699 "ColorTransformation.c" } -static void pixel_transformation_real_transform_pixel_rgb (PixelTransformation* self, RGBAnalyticPixel* p, RGBAnalyticPixel* result) { +static void +pixel_transformation_real_transform_pixel_rgb (PixelTransformation* self, + RGBAnalyticPixel* p, + RGBAnalyticPixel* result) +{ RGBAnalyticPixel _tmp0_; #line 303 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp0_ = *p; @@ -2595,18 +2711,24 @@ static void pixel_transformation_real_transform_pixel_rgb (PixelTransformation* *result = _tmp0_; #line 303 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return; -#line 2599 "ColorTransformation.c" +#line 2715 "ColorTransformation.c" } -void pixel_transformation_transform_pixel_rgb (PixelTransformation* self, RGBAnalyticPixel* p, RGBAnalyticPixel* result) { +void +pixel_transformation_transform_pixel_rgb (PixelTransformation* self, + RGBAnalyticPixel* p, + RGBAnalyticPixel* result) +{ #line 302 "/home/jens/Source/shotwell/src/ColorTransformation.vala" PIXEL_TRANSFORMATION_GET_CLASS (self)->transform_pixel_rgb (self, p, result); -#line 2606 "ColorTransformation.c" +#line 2726 "ColorTransformation.c" } -static gchar* pixel_transformation_real_to_string (PixelTransformation* self) { +static gchar* +pixel_transformation_real_to_string (PixelTransformation* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 307 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -2615,131 +2737,162 @@ static gchar* pixel_transformation_real_to_string (PixelTransformation* self) { result = _tmp0_; #line 307 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 2619 "ColorTransformation.c" +#line 2741 "ColorTransformation.c" } -gchar* pixel_transformation_to_string (PixelTransformation* self) { +gchar* +pixel_transformation_to_string (PixelTransformation* self) +{ #line 306 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return PIXEL_TRANSFORMATION_GET_CLASS (self)->to_string (self); -#line 2626 "ColorTransformation.c" +#line 2750 "ColorTransformation.c" } -static PixelTransformation* pixel_transformation_real_copy (PixelTransformation* self) { +static PixelTransformation* +pixel_transformation_real_copy (PixelTransformation* self) +{ #line 310 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_critical ("Type `%s' does not implement abstract method `pixel_transformation_copy'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 310 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return NULL; -#line 2635 "ColorTransformation.c" +#line 2761 "ColorTransformation.c" } -PixelTransformation* pixel_transformation_copy (PixelTransformation* self) { +PixelTransformation* +pixel_transformation_copy (PixelTransformation* self) +{ #line 310 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return PIXEL_TRANSFORMATION_GET_CLASS (self)->copy (self); -#line 2642 "ColorTransformation.c" +#line 2770 "ColorTransformation.c" } -static void value_pixel_transformation_init (GValue* value) { +static void +value_pixel_transformation_init (GValue* value) +{ #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 2649 "ColorTransformation.c" +#line 2779 "ColorTransformation.c" } -static void value_pixel_transformation_free_value (GValue* value) { +static void +value_pixel_transformation_free_value (GValue* value) +{ #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (value->data[0].v_pointer) { #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixel_transformation_unref (value->data[0].v_pointer); -#line 2658 "ColorTransformation.c" +#line 2790 "ColorTransformation.c" } } -static void value_pixel_transformation_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_pixel_transformation_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (src_value->data[0].v_pointer) { #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" dest_value->data[0].v_pointer = pixel_transformation_ref (src_value->data[0].v_pointer); -#line 2668 "ColorTransformation.c" +#line 2803 "ColorTransformation.c" } else { #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" dest_value->data[0].v_pointer = NULL; -#line 2672 "ColorTransformation.c" +#line 2807 "ColorTransformation.c" } } -static gpointer value_pixel_transformation_peek_pointer (const GValue* value) { +static gpointer +value_pixel_transformation_peek_pointer (const GValue* value) +{ #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return value->data[0].v_pointer; -#line 2680 "ColorTransformation.c" +#line 2817 "ColorTransformation.c" } -static gchar* value_pixel_transformation_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_pixel_transformation_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (collect_values[0].v_pointer) { -#line 2687 "ColorTransformation.c" +#line 2829 "ColorTransformation.c" PixelTransformation * object; object = collect_values[0].v_pointer; #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (object->parent_instance.g_class == NULL) { #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2694 "ColorTransformation.c" +#line 2836 "ColorTransformation.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2698 "ColorTransformation.c" +#line 2840 "ColorTransformation.c" } #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = pixel_transformation_ref (object); -#line 2702 "ColorTransformation.c" +#line 2844 "ColorTransformation.c" } else { #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 2706 "ColorTransformation.c" +#line 2848 "ColorTransformation.c" } #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return NULL; -#line 2710 "ColorTransformation.c" +#line 2852 "ColorTransformation.c" } -static gchar* value_pixel_transformation_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_pixel_transformation_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PixelTransformation ** object_p; object_p = collect_values[0].v_pointer; #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!object_p) { #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2721 "ColorTransformation.c" +#line 2868 "ColorTransformation.c" } #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!value->data[0].v_pointer) { #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" *object_p = NULL; -#line 2727 "ColorTransformation.c" +#line 2874 "ColorTransformation.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" *object_p = value->data[0].v_pointer; -#line 2731 "ColorTransformation.c" +#line 2878 "ColorTransformation.c" } else { #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" *object_p = pixel_transformation_ref (value->data[0].v_pointer); -#line 2735 "ColorTransformation.c" +#line 2882 "ColorTransformation.c" } #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return NULL; -#line 2739 "ColorTransformation.c" +#line 2886 "ColorTransformation.c" } -GParamSpec* param_spec_pixel_transformation (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_pixel_transformation (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPixelTransformation* spec; #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PIXEL_TRANSFORMATION), NULL); @@ -2749,20 +2902,25 @@ GParamSpec* param_spec_pixel_transformation (const gchar* name, const gchar* nic G_PARAM_SPEC (spec)->value_type = object_type; #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return G_PARAM_SPEC (spec); -#line 2753 "ColorTransformation.c" +#line 2906 "ColorTransformation.c" } -gpointer value_get_pixel_transformation (const GValue* value) { +gpointer +value_get_pixel_transformation (const GValue* value) +{ #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION), NULL); #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return value->data[0].v_pointer; -#line 2762 "ColorTransformation.c" +#line 2917 "ColorTransformation.c" } -void value_set_pixel_transformation (GValue* value, gpointer v_object) { +void +value_set_pixel_transformation (GValue* value, + gpointer v_object) +{ PixelTransformation * old; #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION)); @@ -2778,22 +2936,25 @@ void value_set_pixel_transformation (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixel_transformation_ref (value->data[0].v_pointer); -#line 2782 "ColorTransformation.c" +#line 2940 "ColorTransformation.c" } else { #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 2786 "ColorTransformation.c" +#line 2944 "ColorTransformation.c" } #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (old) { #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixel_transformation_unref (old); -#line 2792 "ColorTransformation.c" +#line 2950 "ColorTransformation.c" } } -void value_take_pixel_transformation (GValue* value, gpointer v_object) { +void +value_take_pixel_transformation (GValue* value, + gpointer v_object) +{ PixelTransformation * old; #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION)); @@ -2807,22 +2968,24 @@ void value_take_pixel_transformation (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = v_object; -#line 2811 "ColorTransformation.c" +#line 2972 "ColorTransformation.c" } else { #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 2815 "ColorTransformation.c" +#line 2976 "ColorTransformation.c" } #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (old) { #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixel_transformation_unref (old); -#line 2821 "ColorTransformation.c" +#line 2982 "ColorTransformation.c" } } -static void pixel_transformation_class_init (PixelTransformationClass * klass) { +static void +pixel_transformation_class_init (PixelTransformationClass * klass) +{ #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixel_transformation_parent_class = g_type_class_peek_parent (klass); #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -2843,30 +3006,36 @@ static void pixel_transformation_class_init (PixelTransformationClass * klass) { ((PixelTransformationClass *) klass)->to_string = (gchar* (*) (PixelTransformation *)) pixel_transformation_real_to_string; #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" ((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*) (PixelTransformation *)) pixel_transformation_real_copy; -#line 2847 "ColorTransformation.c" +#line 3010 "ColorTransformation.c" } -static void pixel_transformation_instance_init (PixelTransformation * self) { +static void +pixel_transformation_instance_init (PixelTransformation * self) +{ #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->priv = PIXEL_TRANSFORMATION_GET_PRIVATE (self); #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->ref_count = 1; -#line 2856 "ColorTransformation.c" +#line 3021 "ColorTransformation.c" } -static void pixel_transformation_finalize (PixelTransformation * obj) { +static void +pixel_transformation_finalize (PixelTransformation * obj) +{ PixelTransformation * self; #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXEL_TRANSFORMATION, PixelTransformation); #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_signal_handlers_destroy (self); -#line 2866 "ColorTransformation.c" +#line 3033 "ColorTransformation.c" } -GType pixel_transformation_get_type (void) { +GType +pixel_transformation_get_type (void) +{ static volatile gsize pixel_transformation_type_id__volatile = 0; if (g_once_init_enter (&pixel_transformation_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_pixel_transformation_init, value_pixel_transformation_free_value, value_pixel_transformation_copy_value, value_pixel_transformation_peek_pointer, "p", value_pixel_transformation_collect_value, "p", value_pixel_transformation_lcopy_value }; @@ -2880,18 +3049,22 @@ GType pixel_transformation_get_type (void) { } -gpointer pixel_transformation_ref (gpointer instance) { +gpointer +pixel_transformation_ref (gpointer instance) +{ PixelTransformation * self; self = instance; #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_atomic_int_inc (&self->ref_count); #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return instance; -#line 2891 "ColorTransformation.c" +#line 3062 "ColorTransformation.c" } -void pixel_transformation_unref (gpointer instance) { +void +pixel_transformation_unref (gpointer instance) +{ PixelTransformation * self; self = instance; #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -2900,73 +3073,77 @@ void pixel_transformation_unref (gpointer instance) { PIXEL_TRANSFORMATION_GET_CLASS (self)->finalize (self); #line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2904 "ColorTransformation.c" +#line 3077 "ColorTransformation.c" } } -RGBTransformation* rgb_transformation_construct (GType object_type, PixelTransformationType type) { +RGBTransformation* +rgb_transformation_construct (GType object_type, + PixelTransformationType type) +{ RGBTransformation* self = NULL; - PixelTransformationType _tmp0_; - gfloat* _tmp1_; -#line 323 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = type; + gfloat* _tmp0_; #line 323 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self = (RGBTransformation*) pixel_transformation_construct (object_type, _tmp0_, PIXEL_FORMAT_RGB); + self = (RGBTransformation*) pixel_transformation_construct (object_type, type, PIXEL_FORMAT_RGB); #line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = g_new0 (gfloat, 16); + _tmp0_ = g_new0 (gfloat, 16); #line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_[0] = 1.0f; + _tmp0_[0] = 1.0f; #line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_[1] = 0.0f; + _tmp0_[1] = 0.0f; #line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_[2] = 0.0f; + _tmp0_[2] = 0.0f; #line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_[3] = 0.0f; + _tmp0_[3] = 0.0f; #line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_[4] = 0.0f; + _tmp0_[4] = 0.0f; #line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_[5] = 1.0f; + _tmp0_[5] = 1.0f; #line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_[6] = 0.0f; + _tmp0_[6] = 0.0f; #line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_[7] = 0.0f; + _tmp0_[7] = 0.0f; #line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_[8] = 0.0f; + _tmp0_[8] = 0.0f; #line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_[9] = 0.0f; + _tmp0_[9] = 0.0f; #line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_[10] = 1.0f; + _tmp0_[10] = 1.0f; #line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_[11] = 0.0f; + _tmp0_[11] = 0.0f; #line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_[12] = 0.0f; + _tmp0_[12] = 0.0f; #line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_[13] = 0.0f; + _tmp0_[13] = 0.0f; #line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_[14] = 0.0f; + _tmp0_[14] = 0.0f; #line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_[15] = 1.0f; + _tmp0_[15] = 1.0f; #line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->matrix_entries = (g_free (self->matrix_entries), NULL); #line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self->matrix_entries = _tmp1_; + self->matrix_entries = _tmp0_; #line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->matrix_entries_length1 = 16; #line 322 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self; -#line 2959 "ColorTransformation.c" +#line 3132 "ColorTransformation.c" } -RGBTransformation* rgb_transformation_new (PixelTransformationType type) { +RGBTransformation* +rgb_transformation_new (PixelTransformationType type) +{ #line 322 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return rgb_transformation_construct (TYPE_RGB_TRANSFORMATION, type); -#line 2966 "ColorTransformation.c" +#line 3141 "ColorTransformation.c" } -static CompositionMode rgb_transformation_real_get_composition_mode (PixelTransformation* base) { +static CompositionMode +rgb_transformation_real_get_composition_mode (PixelTransformation* base) +{ RGBTransformation * self; CompositionMode result = 0; #line 336 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -2975,1670 +3152,1670 @@ static CompositionMode rgb_transformation_real_get_composition_mode (PixelTransf result = COMPOSITION_MODE_RGB_MATRIX; #line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 2979 "ColorTransformation.c" +#line 3156 "ColorTransformation.c" } -static gpointer _pixel_transformation_ref0 (gpointer self) { +static gpointer +_pixel_transformation_ref0 (gpointer self) +{ #line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self ? pixel_transformation_ref (self) : NULL; -#line 2986 "ColorTransformation.c" +#line 3165 "ColorTransformation.c" } -static void rgb_transformation_real_compose_with (PixelTransformation* base, PixelTransformation* other) { +static void +rgb_transformation_real_compose_with (PixelTransformation* base, + PixelTransformation* other) +{ RGBTransformation * self; - PixelTransformation* _tmp0_; - CompositionMode _tmp1_; RGBTransformation* transform = NULL; - PixelTransformation* _tmp2_; - RGBTransformation* _tmp3_; + RGBTransformation* _tmp0_; gfloat* result_matrix_entries = NULL; - gfloat* _tmp4_; + gfloat* _tmp1_; gint result_matrix_entries_length1; gint _result_matrix_entries_size_; - gfloat* _tmp5_; - gint _tmp5__length1; - RGBTransformation* _tmp6_; - gfloat* _tmp7_; - gint _tmp7__length1; - gfloat _tmp8_; + gfloat* _tmp2_; + gint _tmp2__length1; + RGBTransformation* _tmp3_; + gfloat* _tmp4_; + gint _tmp4__length1; + gfloat _tmp5_; + gfloat* _tmp6_; + gint _tmp6__length1; + gfloat _tmp7_; + RGBTransformation* _tmp8_; gfloat* _tmp9_; gint _tmp9__length1; gfloat _tmp10_; - RGBTransformation* _tmp11_; - gfloat* _tmp12_; - gint _tmp12__length1; - gfloat _tmp13_; + gfloat* _tmp11_; + gint _tmp11__length1; + gfloat _tmp12_; + RGBTransformation* _tmp13_; gfloat* _tmp14_; gint _tmp14__length1; gfloat _tmp15_; - RGBTransformation* _tmp16_; - gfloat* _tmp17_; - gint _tmp17__length1; - gfloat _tmp18_; + gfloat* _tmp16_; + gint _tmp16__length1; + gfloat _tmp17_; + RGBTransformation* _tmp18_; gfloat* _tmp19_; gint _tmp19__length1; gfloat _tmp20_; - RGBTransformation* _tmp21_; - gfloat* _tmp22_; - gint _tmp22__length1; + gfloat* _tmp21_; + gint _tmp21__length1; + gfloat _tmp22_; gfloat _tmp23_; gfloat* _tmp24_; gint _tmp24__length1; - gfloat _tmp25_; - gfloat _tmp26_; - gfloat* _tmp27_; - gint _tmp27__length1; - RGBTransformation* _tmp28_; - gfloat* _tmp29_; - gint _tmp29__length1; - gfloat _tmp30_; + RGBTransformation* _tmp25_; + gfloat* _tmp26_; + gint _tmp26__length1; + gfloat _tmp27_; + gfloat* _tmp28_; + gint _tmp28__length1; + gfloat _tmp29_; + RGBTransformation* _tmp30_; gfloat* _tmp31_; gint _tmp31__length1; gfloat _tmp32_; - RGBTransformation* _tmp33_; - gfloat* _tmp34_; - gint _tmp34__length1; - gfloat _tmp35_; + gfloat* _tmp33_; + gint _tmp33__length1; + gfloat _tmp34_; + RGBTransformation* _tmp35_; gfloat* _tmp36_; gint _tmp36__length1; gfloat _tmp37_; - RGBTransformation* _tmp38_; - gfloat* _tmp39_; - gint _tmp39__length1; - gfloat _tmp40_; + gfloat* _tmp38_; + gint _tmp38__length1; + gfloat _tmp39_; + RGBTransformation* _tmp40_; gfloat* _tmp41_; gint _tmp41__length1; gfloat _tmp42_; - RGBTransformation* _tmp43_; - gfloat* _tmp44_; - gint _tmp44__length1; + gfloat* _tmp43_; + gint _tmp43__length1; + gfloat _tmp44_; gfloat _tmp45_; gfloat* _tmp46_; gint _tmp46__length1; - gfloat _tmp47_; - gfloat _tmp48_; - gfloat* _tmp49_; - gint _tmp49__length1; - RGBTransformation* _tmp50_; - gfloat* _tmp51_; - gint _tmp51__length1; - gfloat _tmp52_; + RGBTransformation* _tmp47_; + gfloat* _tmp48_; + gint _tmp48__length1; + gfloat _tmp49_; + gfloat* _tmp50_; + gint _tmp50__length1; + gfloat _tmp51_; + RGBTransformation* _tmp52_; gfloat* _tmp53_; gint _tmp53__length1; gfloat _tmp54_; - RGBTransformation* _tmp55_; - gfloat* _tmp56_; - gint _tmp56__length1; - gfloat _tmp57_; + gfloat* _tmp55_; + gint _tmp55__length1; + gfloat _tmp56_; + RGBTransformation* _tmp57_; gfloat* _tmp58_; gint _tmp58__length1; gfloat _tmp59_; - RGBTransformation* _tmp60_; - gfloat* _tmp61_; - gint _tmp61__length1; - gfloat _tmp62_; + gfloat* _tmp60_; + gint _tmp60__length1; + gfloat _tmp61_; + RGBTransformation* _tmp62_; gfloat* _tmp63_; gint _tmp63__length1; gfloat _tmp64_; - RGBTransformation* _tmp65_; - gfloat* _tmp66_; - gint _tmp66__length1; + gfloat* _tmp65_; + gint _tmp65__length1; + gfloat _tmp66_; gfloat _tmp67_; gfloat* _tmp68_; gint _tmp68__length1; - gfloat _tmp69_; - gfloat _tmp70_; - gfloat* _tmp71_; - gint _tmp71__length1; - RGBTransformation* _tmp72_; - gfloat* _tmp73_; - gint _tmp73__length1; - gfloat _tmp74_; + RGBTransformation* _tmp69_; + gfloat* _tmp70_; + gint _tmp70__length1; + gfloat _tmp71_; + gfloat* _tmp72_; + gint _tmp72__length1; + gfloat _tmp73_; + RGBTransformation* _tmp74_; gfloat* _tmp75_; gint _tmp75__length1; gfloat _tmp76_; - RGBTransformation* _tmp77_; - gfloat* _tmp78_; - gint _tmp78__length1; - gfloat _tmp79_; + gfloat* _tmp77_; + gint _tmp77__length1; + gfloat _tmp78_; + RGBTransformation* _tmp79_; gfloat* _tmp80_; gint _tmp80__length1; gfloat _tmp81_; - RGBTransformation* _tmp82_; - gfloat* _tmp83_; - gint _tmp83__length1; - gfloat _tmp84_; + gfloat* _tmp82_; + gint _tmp82__length1; + gfloat _tmp83_; + RGBTransformation* _tmp84_; gfloat* _tmp85_; gint _tmp85__length1; gfloat _tmp86_; - RGBTransformation* _tmp87_; - gfloat* _tmp88_; - gint _tmp88__length1; + gfloat* _tmp87_; + gint _tmp87__length1; + gfloat _tmp88_; gfloat _tmp89_; gfloat* _tmp90_; gint _tmp90__length1; - gfloat _tmp91_; - gfloat _tmp92_; - gfloat* _tmp93_; - gint _tmp93__length1; - RGBTransformation* _tmp94_; - gfloat* _tmp95_; - gint _tmp95__length1; - gfloat _tmp96_; + RGBTransformation* _tmp91_; + gfloat* _tmp92_; + gint _tmp92__length1; + gfloat _tmp93_; + gfloat* _tmp94_; + gint _tmp94__length1; + gfloat _tmp95_; + RGBTransformation* _tmp96_; gfloat* _tmp97_; gint _tmp97__length1; gfloat _tmp98_; - RGBTransformation* _tmp99_; - gfloat* _tmp100_; - gint _tmp100__length1; - gfloat _tmp101_; + gfloat* _tmp99_; + gint _tmp99__length1; + gfloat _tmp100_; + RGBTransformation* _tmp101_; gfloat* _tmp102_; gint _tmp102__length1; gfloat _tmp103_; - RGBTransformation* _tmp104_; - gfloat* _tmp105_; - gint _tmp105__length1; - gfloat _tmp106_; + gfloat* _tmp104_; + gint _tmp104__length1; + gfloat _tmp105_; + RGBTransformation* _tmp106_; gfloat* _tmp107_; gint _tmp107__length1; gfloat _tmp108_; - RGBTransformation* _tmp109_; - gfloat* _tmp110_; - gint _tmp110__length1; + gfloat* _tmp109_; + gint _tmp109__length1; + gfloat _tmp110_; gfloat _tmp111_; gfloat* _tmp112_; gint _tmp112__length1; - gfloat _tmp113_; - gfloat _tmp114_; - gfloat* _tmp115_; - gint _tmp115__length1; - RGBTransformation* _tmp116_; - gfloat* _tmp117_; - gint _tmp117__length1; - gfloat _tmp118_; + RGBTransformation* _tmp113_; + gfloat* _tmp114_; + gint _tmp114__length1; + gfloat _tmp115_; + gfloat* _tmp116_; + gint _tmp116__length1; + gfloat _tmp117_; + RGBTransformation* _tmp118_; gfloat* _tmp119_; gint _tmp119__length1; gfloat _tmp120_; - RGBTransformation* _tmp121_; - gfloat* _tmp122_; - gint _tmp122__length1; - gfloat _tmp123_; + gfloat* _tmp121_; + gint _tmp121__length1; + gfloat _tmp122_; + RGBTransformation* _tmp123_; gfloat* _tmp124_; gint _tmp124__length1; gfloat _tmp125_; - RGBTransformation* _tmp126_; - gfloat* _tmp127_; - gint _tmp127__length1; - gfloat _tmp128_; + gfloat* _tmp126_; + gint _tmp126__length1; + gfloat _tmp127_; + RGBTransformation* _tmp128_; gfloat* _tmp129_; gint _tmp129__length1; gfloat _tmp130_; - RGBTransformation* _tmp131_; - gfloat* _tmp132_; - gint _tmp132__length1; + gfloat* _tmp131_; + gint _tmp131__length1; + gfloat _tmp132_; gfloat _tmp133_; gfloat* _tmp134_; gint _tmp134__length1; - gfloat _tmp135_; - gfloat _tmp136_; - gfloat* _tmp137_; - gint _tmp137__length1; - RGBTransformation* _tmp138_; - gfloat* _tmp139_; - gint _tmp139__length1; - gfloat _tmp140_; + RGBTransformation* _tmp135_; + gfloat* _tmp136_; + gint _tmp136__length1; + gfloat _tmp137_; + gfloat* _tmp138_; + gint _tmp138__length1; + gfloat _tmp139_; + RGBTransformation* _tmp140_; gfloat* _tmp141_; gint _tmp141__length1; gfloat _tmp142_; - RGBTransformation* _tmp143_; - gfloat* _tmp144_; - gint _tmp144__length1; - gfloat _tmp145_; + gfloat* _tmp143_; + gint _tmp143__length1; + gfloat _tmp144_; + RGBTransformation* _tmp145_; gfloat* _tmp146_; gint _tmp146__length1; gfloat _tmp147_; - RGBTransformation* _tmp148_; - gfloat* _tmp149_; - gint _tmp149__length1; - gfloat _tmp150_; + gfloat* _tmp148_; + gint _tmp148__length1; + gfloat _tmp149_; + RGBTransformation* _tmp150_; gfloat* _tmp151_; gint _tmp151__length1; gfloat _tmp152_; - RGBTransformation* _tmp153_; - gfloat* _tmp154_; - gint _tmp154__length1; + gfloat* _tmp153_; + gint _tmp153__length1; + gfloat _tmp154_; gfloat _tmp155_; gfloat* _tmp156_; gint _tmp156__length1; - gfloat _tmp157_; - gfloat _tmp158_; - gfloat* _tmp159_; - gint _tmp159__length1; - RGBTransformation* _tmp160_; - gfloat* _tmp161_; - gint _tmp161__length1; - gfloat _tmp162_; + RGBTransformation* _tmp157_; + gfloat* _tmp158_; + gint _tmp158__length1; + gfloat _tmp159_; + gfloat* _tmp160_; + gint _tmp160__length1; + gfloat _tmp161_; + RGBTransformation* _tmp162_; gfloat* _tmp163_; gint _tmp163__length1; gfloat _tmp164_; - RGBTransformation* _tmp165_; - gfloat* _tmp166_; - gint _tmp166__length1; - gfloat _tmp167_; + gfloat* _tmp165_; + gint _tmp165__length1; + gfloat _tmp166_; + RGBTransformation* _tmp167_; gfloat* _tmp168_; gint _tmp168__length1; gfloat _tmp169_; - RGBTransformation* _tmp170_; - gfloat* _tmp171_; - gint _tmp171__length1; - gfloat _tmp172_; + gfloat* _tmp170_; + gint _tmp170__length1; + gfloat _tmp171_; + RGBTransformation* _tmp172_; gfloat* _tmp173_; gint _tmp173__length1; gfloat _tmp174_; - RGBTransformation* _tmp175_; - gfloat* _tmp176_; - gint _tmp176__length1; + gfloat* _tmp175_; + gint _tmp175__length1; + gfloat _tmp176_; gfloat _tmp177_; gfloat* _tmp178_; gint _tmp178__length1; - gfloat _tmp179_; - gfloat _tmp180_; - gfloat* _tmp181_; - gint _tmp181__length1; - RGBTransformation* _tmp182_; - gfloat* _tmp183_; - gint _tmp183__length1; - gfloat _tmp184_; + RGBTransformation* _tmp179_; + gfloat* _tmp180_; + gint _tmp180__length1; + gfloat _tmp181_; + gfloat* _tmp182_; + gint _tmp182__length1; + gfloat _tmp183_; + RGBTransformation* _tmp184_; gfloat* _tmp185_; gint _tmp185__length1; gfloat _tmp186_; - RGBTransformation* _tmp187_; - gfloat* _tmp188_; - gint _tmp188__length1; - gfloat _tmp189_; + gfloat* _tmp187_; + gint _tmp187__length1; + gfloat _tmp188_; + RGBTransformation* _tmp189_; gfloat* _tmp190_; gint _tmp190__length1; gfloat _tmp191_; - RGBTransformation* _tmp192_; - gfloat* _tmp193_; - gint _tmp193__length1; - gfloat _tmp194_; + gfloat* _tmp192_; + gint _tmp192__length1; + gfloat _tmp193_; + RGBTransformation* _tmp194_; gfloat* _tmp195_; gint _tmp195__length1; gfloat _tmp196_; - RGBTransformation* _tmp197_; - gfloat* _tmp198_; - gint _tmp198__length1; + gfloat* _tmp197_; + gint _tmp197__length1; + gfloat _tmp198_; gfloat _tmp199_; gfloat* _tmp200_; gint _tmp200__length1; - gfloat _tmp201_; - gfloat _tmp202_; - gfloat* _tmp203_; - gint _tmp203__length1; - RGBTransformation* _tmp204_; - gfloat* _tmp205_; - gint _tmp205__length1; - gfloat _tmp206_; + RGBTransformation* _tmp201_; + gfloat* _tmp202_; + gint _tmp202__length1; + gfloat _tmp203_; + gfloat* _tmp204_; + gint _tmp204__length1; + gfloat _tmp205_; + RGBTransformation* _tmp206_; gfloat* _tmp207_; gint _tmp207__length1; gfloat _tmp208_; - RGBTransformation* _tmp209_; - gfloat* _tmp210_; - gint _tmp210__length1; - gfloat _tmp211_; + gfloat* _tmp209_; + gint _tmp209__length1; + gfloat _tmp210_; + RGBTransformation* _tmp211_; gfloat* _tmp212_; gint _tmp212__length1; gfloat _tmp213_; - RGBTransformation* _tmp214_; - gfloat* _tmp215_; - gint _tmp215__length1; - gfloat _tmp216_; + gfloat* _tmp214_; + gint _tmp214__length1; + gfloat _tmp215_; + RGBTransformation* _tmp216_; gfloat* _tmp217_; gint _tmp217__length1; gfloat _tmp218_; - RGBTransformation* _tmp219_; - gfloat* _tmp220_; - gint _tmp220__length1; + gfloat* _tmp219_; + gint _tmp219__length1; + gfloat _tmp220_; gfloat _tmp221_; gfloat* _tmp222_; gint _tmp222__length1; - gfloat _tmp223_; - gfloat _tmp224_; - gfloat* _tmp225_; - gint _tmp225__length1; - RGBTransformation* _tmp226_; - gfloat* _tmp227_; - gint _tmp227__length1; - gfloat _tmp228_; + RGBTransformation* _tmp223_; + gfloat* _tmp224_; + gint _tmp224__length1; + gfloat _tmp225_; + gfloat* _tmp226_; + gint _tmp226__length1; + gfloat _tmp227_; + RGBTransformation* _tmp228_; gfloat* _tmp229_; gint _tmp229__length1; gfloat _tmp230_; - RGBTransformation* _tmp231_; - gfloat* _tmp232_; - gint _tmp232__length1; - gfloat _tmp233_; + gfloat* _tmp231_; + gint _tmp231__length1; + gfloat _tmp232_; + RGBTransformation* _tmp233_; gfloat* _tmp234_; gint _tmp234__length1; gfloat _tmp235_; - RGBTransformation* _tmp236_; - gfloat* _tmp237_; - gint _tmp237__length1; - gfloat _tmp238_; + gfloat* _tmp236_; + gint _tmp236__length1; + gfloat _tmp237_; + RGBTransformation* _tmp238_; gfloat* _tmp239_; gint _tmp239__length1; gfloat _tmp240_; - RGBTransformation* _tmp241_; - gfloat* _tmp242_; - gint _tmp242__length1; + gfloat* _tmp241_; + gint _tmp241__length1; + gfloat _tmp242_; gfloat _tmp243_; gfloat* _tmp244_; gint _tmp244__length1; - gfloat _tmp245_; - gfloat _tmp246_; - gfloat* _tmp247_; - gint _tmp247__length1; - RGBTransformation* _tmp248_; - gfloat* _tmp249_; - gint _tmp249__length1; - gfloat _tmp250_; + RGBTransformation* _tmp245_; + gfloat* _tmp246_; + gint _tmp246__length1; + gfloat _tmp247_; + gfloat* _tmp248_; + gint _tmp248__length1; + gfloat _tmp249_; + RGBTransformation* _tmp250_; gfloat* _tmp251_; gint _tmp251__length1; gfloat _tmp252_; - RGBTransformation* _tmp253_; - gfloat* _tmp254_; - gint _tmp254__length1; - gfloat _tmp255_; + gfloat* _tmp253_; + gint _tmp253__length1; + gfloat _tmp254_; + RGBTransformation* _tmp255_; gfloat* _tmp256_; gint _tmp256__length1; gfloat _tmp257_; - RGBTransformation* _tmp258_; - gfloat* _tmp259_; - gint _tmp259__length1; - gfloat _tmp260_; + gfloat* _tmp258_; + gint _tmp258__length1; + gfloat _tmp259_; + RGBTransformation* _tmp260_; gfloat* _tmp261_; gint _tmp261__length1; gfloat _tmp262_; - RGBTransformation* _tmp263_; - gfloat* _tmp264_; - gint _tmp264__length1; + gfloat* _tmp263_; + gint _tmp263__length1; + gfloat _tmp264_; gfloat _tmp265_; gfloat* _tmp266_; gint _tmp266__length1; - gfloat _tmp267_; - gfloat _tmp268_; - gfloat* _tmp269_; - gint _tmp269__length1; - RGBTransformation* _tmp270_; - gfloat* _tmp271_; - gint _tmp271__length1; - gfloat _tmp272_; + RGBTransformation* _tmp267_; + gfloat* _tmp268_; + gint _tmp268__length1; + gfloat _tmp269_; + gfloat* _tmp270_; + gint _tmp270__length1; + gfloat _tmp271_; + RGBTransformation* _tmp272_; gfloat* _tmp273_; gint _tmp273__length1; gfloat _tmp274_; - RGBTransformation* _tmp275_; - gfloat* _tmp276_; - gint _tmp276__length1; - gfloat _tmp277_; + gfloat* _tmp275_; + gint _tmp275__length1; + gfloat _tmp276_; + RGBTransformation* _tmp277_; gfloat* _tmp278_; gint _tmp278__length1; gfloat _tmp279_; - RGBTransformation* _tmp280_; - gfloat* _tmp281_; - gint _tmp281__length1; - gfloat _tmp282_; + gfloat* _tmp280_; + gint _tmp280__length1; + gfloat _tmp281_; + RGBTransformation* _tmp282_; gfloat* _tmp283_; gint _tmp283__length1; gfloat _tmp284_; - RGBTransformation* _tmp285_; - gfloat* _tmp286_; - gint _tmp286__length1; + gfloat* _tmp285_; + gint _tmp285__length1; + gfloat _tmp286_; gfloat _tmp287_; gfloat* _tmp288_; gint _tmp288__length1; - gfloat _tmp289_; - gfloat _tmp290_; - gfloat* _tmp291_; - gint _tmp291__length1; - RGBTransformation* _tmp292_; - gfloat* _tmp293_; - gint _tmp293__length1; - gfloat _tmp294_; + RGBTransformation* _tmp289_; + gfloat* _tmp290_; + gint _tmp290__length1; + gfloat _tmp291_; + gfloat* _tmp292_; + gint _tmp292__length1; + gfloat _tmp293_; + RGBTransformation* _tmp294_; gfloat* _tmp295_; gint _tmp295__length1; gfloat _tmp296_; - RGBTransformation* _tmp297_; - gfloat* _tmp298_; - gint _tmp298__length1; - gfloat _tmp299_; + gfloat* _tmp297_; + gint _tmp297__length1; + gfloat _tmp298_; + RGBTransformation* _tmp299_; gfloat* _tmp300_; gint _tmp300__length1; gfloat _tmp301_; - RGBTransformation* _tmp302_; - gfloat* _tmp303_; - gint _tmp303__length1; - gfloat _tmp304_; + gfloat* _tmp302_; + gint _tmp302__length1; + gfloat _tmp303_; + RGBTransformation* _tmp304_; gfloat* _tmp305_; gint _tmp305__length1; gfloat _tmp306_; - RGBTransformation* _tmp307_; - gfloat* _tmp308_; - gint _tmp308__length1; + gfloat* _tmp307_; + gint _tmp307__length1; + gfloat _tmp308_; gfloat _tmp309_; gfloat* _tmp310_; gint _tmp310__length1; - gfloat _tmp311_; - gfloat _tmp312_; - gfloat* _tmp313_; - gint _tmp313__length1; - RGBTransformation* _tmp314_; - gfloat* _tmp315_; - gint _tmp315__length1; - gfloat _tmp316_; + RGBTransformation* _tmp311_; + gfloat* _tmp312_; + gint _tmp312__length1; + gfloat _tmp313_; + gfloat* _tmp314_; + gint _tmp314__length1; + gfloat _tmp315_; + RGBTransformation* _tmp316_; gfloat* _tmp317_; gint _tmp317__length1; gfloat _tmp318_; - RGBTransformation* _tmp319_; - gfloat* _tmp320_; - gint _tmp320__length1; - gfloat _tmp321_; + gfloat* _tmp319_; + gint _tmp319__length1; + gfloat _tmp320_; + RGBTransformation* _tmp321_; gfloat* _tmp322_; gint _tmp322__length1; gfloat _tmp323_; - RGBTransformation* _tmp324_; - gfloat* _tmp325_; - gint _tmp325__length1; - gfloat _tmp326_; + gfloat* _tmp324_; + gint _tmp324__length1; + gfloat _tmp325_; + RGBTransformation* _tmp326_; gfloat* _tmp327_; gint _tmp327__length1; gfloat _tmp328_; - RGBTransformation* _tmp329_; - gfloat* _tmp330_; - gint _tmp330__length1; + gfloat* _tmp329_; + gint _tmp329__length1; + gfloat _tmp330_; gfloat _tmp331_; gfloat* _tmp332_; gint _tmp332__length1; - gfloat _tmp333_; - gfloat _tmp334_; - gfloat* _tmp335_; - gint _tmp335__length1; - RGBTransformation* _tmp336_; - gfloat* _tmp337_; - gint _tmp337__length1; - gfloat _tmp338_; + RGBTransformation* _tmp333_; + gfloat* _tmp334_; + gint _tmp334__length1; + gfloat _tmp335_; + gfloat* _tmp336_; + gint _tmp336__length1; + gfloat _tmp337_; + RGBTransformation* _tmp338_; gfloat* _tmp339_; gint _tmp339__length1; gfloat _tmp340_; - RGBTransformation* _tmp341_; - gfloat* _tmp342_; - gint _tmp342__length1; - gfloat _tmp343_; + gfloat* _tmp341_; + gint _tmp341__length1; + gfloat _tmp342_; + RGBTransformation* _tmp343_; gfloat* _tmp344_; gint _tmp344__length1; gfloat _tmp345_; - RGBTransformation* _tmp346_; - gfloat* _tmp347_; - gint _tmp347__length1; - gfloat _tmp348_; + gfloat* _tmp346_; + gint _tmp346__length1; + gfloat _tmp347_; + RGBTransformation* _tmp348_; gfloat* _tmp349_; gint _tmp349__length1; gfloat _tmp350_; - RGBTransformation* _tmp351_; - gfloat* _tmp352_; - gint _tmp352__length1; + gfloat* _tmp351_; + gint _tmp351__length1; + gfloat _tmp352_; gfloat _tmp353_; - gfloat* _tmp354_; - gint _tmp354__length1; - gfloat _tmp355_; - gfloat _tmp356_; - gboolean _tmp366_ = FALSE; - gboolean _tmp367_; + gboolean _tmp363_ = FALSE; + gboolean _tmp364_; #line 340 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_TRANSFORMATION, RGBTransformation); #line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = other; -#line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = pixel_transformation_get_composition_mode (_tmp0_); -#line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp1_ != COMPOSITION_MODE_RGB_MATRIX) { + if (pixel_transformation_get_composition_mode (other) != COMPOSITION_MODE_RGB_MATRIX) { #line 342 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_error ("ColorTransformation.vala:342: %s", "RGBTransformation: compose_with( ): 'other' transformation " "does not support RGB_MATRIX composition mode"); -#line 3509 "ColorTransformation.c" +#line 3684 "ColorTransformation.c" } #line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = other; + _tmp0_ = _pixel_transformation_ref0 (G_TYPE_CHECK_INSTANCE_CAST (other, TYPE_RGB_TRANSFORMATION, RGBTransformation)); #line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = _pixel_transformation_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_RGB_TRANSFORMATION, RGBTransformation)); -#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - transform = _tmp3_; + transform = _tmp0_; #line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = g_new0 (gfloat, 16); + _tmp1_ = g_new0 (gfloat, 16); #line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - result_matrix_entries = _tmp4_; + result_matrix_entries = _tmp1_; #line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala" result_matrix_entries_length1 = 16; #line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _result_matrix_entries_size_ = result_matrix_entries_length1; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = result_matrix_entries; + _tmp2_ = result_matrix_entries; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5__length1 = result_matrix_entries_length1; + _tmp2__length1 = result_matrix_entries_length1; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = transform; + _tmp3_ = transform; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = _tmp6_->matrix_entries; + _tmp4_ = _tmp3_->matrix_entries; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7__length1 = _tmp6_->matrix_entries_length1; + _tmp4__length1 = _tmp3_->matrix_entries_length1; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = _tmp7_[0]; + _tmp5_ = _tmp4_[0]; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = self->matrix_entries; + _tmp6_ = self->matrix_entries; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9__length1 = self->matrix_entries_length1; + _tmp6__length1 = self->matrix_entries_length1; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = _tmp9_[0]; + _tmp7_ = _tmp6_[0]; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = transform; + _tmp8_ = transform; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = _tmp11_->matrix_entries; + _tmp9_ = _tmp8_->matrix_entries; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12__length1 = _tmp11_->matrix_entries_length1; + _tmp9__length1 = _tmp8_->matrix_entries_length1; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp13_ = _tmp12_[1]; + _tmp10_ = _tmp9_[1]; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_ = self->matrix_entries; + _tmp11_ = self->matrix_entries; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14__length1 = self->matrix_entries_length1; + _tmp11__length1 = self->matrix_entries_length1; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp15_ = _tmp14_[4]; + _tmp12_ = _tmp11_[4]; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp16_ = transform; + _tmp13_ = transform; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp17_ = _tmp16_->matrix_entries; + _tmp14_ = _tmp13_->matrix_entries; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp17__length1 = _tmp16_->matrix_entries_length1; + _tmp14__length1 = _tmp13_->matrix_entries_length1; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18_ = _tmp17_[2]; + _tmp15_ = _tmp14_[2]; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp19_ = self->matrix_entries; + _tmp16_ = self->matrix_entries; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp19__length1 = self->matrix_entries_length1; + _tmp16__length1 = self->matrix_entries_length1; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp20_ = _tmp19_[8]; + _tmp17_ = _tmp16_[8]; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp21_ = transform; + _tmp18_ = transform; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp22_ = _tmp21_->matrix_entries; + _tmp19_ = _tmp18_->matrix_entries; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp22__length1 = _tmp21_->matrix_entries_length1; + _tmp19__length1 = _tmp18_->matrix_entries_length1; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp23_ = _tmp22_[3]; + _tmp20_ = _tmp19_[3]; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp24_ = self->matrix_entries; + _tmp21_ = self->matrix_entries; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp24__length1 = self->matrix_entries_length1; + _tmp21__length1 = self->matrix_entries_length1; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp25_ = _tmp24_[12]; + _tmp22_ = _tmp21_[12]; #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_[0] = (((_tmp8_ * _tmp10_) + (_tmp13_ * _tmp15_)) + (_tmp18_ * _tmp20_)) + (_tmp23_ * _tmp25_); + _tmp2_[0] = (((_tmp5_ * _tmp7_) + (_tmp10_ * _tmp12_)) + (_tmp15_ * _tmp17_)) + (_tmp20_ * _tmp22_); #line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp26_ = _tmp5_[0]; + _tmp23_ = _tmp2_[0]; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp27_ = result_matrix_entries; + _tmp24_ = result_matrix_entries; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp27__length1 = result_matrix_entries_length1; + _tmp24__length1 = result_matrix_entries_length1; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp28_ = transform; + _tmp25_ = transform; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp29_ = _tmp28_->matrix_entries; + _tmp26_ = _tmp25_->matrix_entries; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp29__length1 = _tmp28_->matrix_entries_length1; + _tmp26__length1 = _tmp25_->matrix_entries_length1; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp30_ = _tmp29_[0]; + _tmp27_ = _tmp26_[0]; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp31_ = self->matrix_entries; + _tmp28_ = self->matrix_entries; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp31__length1 = self->matrix_entries_length1; + _tmp28__length1 = self->matrix_entries_length1; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp32_ = _tmp31_[1]; + _tmp29_ = _tmp28_[1]; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp33_ = transform; + _tmp30_ = transform; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp34_ = _tmp33_->matrix_entries; + _tmp31_ = _tmp30_->matrix_entries; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp34__length1 = _tmp33_->matrix_entries_length1; + _tmp31__length1 = _tmp30_->matrix_entries_length1; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp35_ = _tmp34_[1]; + _tmp32_ = _tmp31_[1]; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp36_ = self->matrix_entries; + _tmp33_ = self->matrix_entries; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp36__length1 = self->matrix_entries_length1; + _tmp33__length1 = self->matrix_entries_length1; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp37_ = _tmp36_[5]; + _tmp34_ = _tmp33_[5]; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp38_ = transform; + _tmp35_ = transform; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp39_ = _tmp38_->matrix_entries; + _tmp36_ = _tmp35_->matrix_entries; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp39__length1 = _tmp38_->matrix_entries_length1; + _tmp36__length1 = _tmp35_->matrix_entries_length1; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp40_ = _tmp39_[2]; + _tmp37_ = _tmp36_[2]; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp41_ = self->matrix_entries; + _tmp38_ = self->matrix_entries; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp41__length1 = self->matrix_entries_length1; + _tmp38__length1 = self->matrix_entries_length1; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp42_ = _tmp41_[9]; + _tmp39_ = _tmp38_[9]; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp43_ = transform; + _tmp40_ = transform; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp44_ = _tmp43_->matrix_entries; + _tmp41_ = _tmp40_->matrix_entries; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp44__length1 = _tmp43_->matrix_entries_length1; + _tmp41__length1 = _tmp40_->matrix_entries_length1; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp45_ = _tmp44_[3]; + _tmp42_ = _tmp41_[3]; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp46_ = self->matrix_entries; + _tmp43_ = self->matrix_entries; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp46__length1 = self->matrix_entries_length1; + _tmp43__length1 = self->matrix_entries_length1; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp47_ = _tmp46_[13]; + _tmp44_ = _tmp43_[13]; #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp27_[1] = (((_tmp30_ * _tmp32_) + (_tmp35_ * _tmp37_)) + (_tmp40_ * _tmp42_)) + (_tmp45_ * _tmp47_); + _tmp24_[1] = (((_tmp27_ * _tmp29_) + (_tmp32_ * _tmp34_)) + (_tmp37_ * _tmp39_)) + (_tmp42_ * _tmp44_); #line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp48_ = _tmp27_[1]; + _tmp45_ = _tmp24_[1]; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp49_ = result_matrix_entries; + _tmp46_ = result_matrix_entries; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp49__length1 = result_matrix_entries_length1; + _tmp46__length1 = result_matrix_entries_length1; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp50_ = transform; + _tmp47_ = transform; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp51_ = _tmp50_->matrix_entries; + _tmp48_ = _tmp47_->matrix_entries; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp51__length1 = _tmp50_->matrix_entries_length1; + _tmp48__length1 = _tmp47_->matrix_entries_length1; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp52_ = _tmp51_[0]; + _tmp49_ = _tmp48_[0]; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp53_ = self->matrix_entries; + _tmp50_ = self->matrix_entries; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp53__length1 = self->matrix_entries_length1; + _tmp50__length1 = self->matrix_entries_length1; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp54_ = _tmp53_[2]; + _tmp51_ = _tmp50_[2]; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp55_ = transform; + _tmp52_ = transform; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp56_ = _tmp55_->matrix_entries; + _tmp53_ = _tmp52_->matrix_entries; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp56__length1 = _tmp55_->matrix_entries_length1; + _tmp53__length1 = _tmp52_->matrix_entries_length1; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp57_ = _tmp56_[1]; + _tmp54_ = _tmp53_[1]; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp58_ = self->matrix_entries; + _tmp55_ = self->matrix_entries; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp58__length1 = self->matrix_entries_length1; + _tmp55__length1 = self->matrix_entries_length1; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp59_ = _tmp58_[6]; + _tmp56_ = _tmp55_[6]; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp60_ = transform; + _tmp57_ = transform; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp61_ = _tmp60_->matrix_entries; + _tmp58_ = _tmp57_->matrix_entries; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp61__length1 = _tmp60_->matrix_entries_length1; + _tmp58__length1 = _tmp57_->matrix_entries_length1; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp62_ = _tmp61_[2]; + _tmp59_ = _tmp58_[2]; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp63_ = self->matrix_entries; + _tmp60_ = self->matrix_entries; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp63__length1 = self->matrix_entries_length1; + _tmp60__length1 = self->matrix_entries_length1; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp64_ = _tmp63_[10]; + _tmp61_ = _tmp60_[10]; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp65_ = transform; + _tmp62_ = transform; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp66_ = _tmp65_->matrix_entries; + _tmp63_ = _tmp62_->matrix_entries; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp66__length1 = _tmp65_->matrix_entries_length1; + _tmp63__length1 = _tmp62_->matrix_entries_length1; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp67_ = _tmp66_[3]; + _tmp64_ = _tmp63_[3]; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp68_ = self->matrix_entries; + _tmp65_ = self->matrix_entries; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp68__length1 = self->matrix_entries_length1; + _tmp65__length1 = self->matrix_entries_length1; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp69_ = _tmp68_[14]; + _tmp66_ = _tmp65_[14]; #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp49_[2] = (((_tmp52_ * _tmp54_) + (_tmp57_ * _tmp59_)) + (_tmp62_ * _tmp64_)) + (_tmp67_ * _tmp69_); + _tmp46_[2] = (((_tmp49_ * _tmp51_) + (_tmp54_ * _tmp56_)) + (_tmp59_ * _tmp61_)) + (_tmp64_ * _tmp66_); #line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp70_ = _tmp49_[2]; + _tmp67_ = _tmp46_[2]; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp71_ = result_matrix_entries; + _tmp68_ = result_matrix_entries; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp71__length1 = result_matrix_entries_length1; + _tmp68__length1 = result_matrix_entries_length1; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp72_ = transform; + _tmp69_ = transform; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp73_ = _tmp72_->matrix_entries; + _tmp70_ = _tmp69_->matrix_entries; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp73__length1 = _tmp72_->matrix_entries_length1; + _tmp70__length1 = _tmp69_->matrix_entries_length1; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp74_ = _tmp73_[0]; + _tmp71_ = _tmp70_[0]; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp75_ = self->matrix_entries; + _tmp72_ = self->matrix_entries; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp75__length1 = self->matrix_entries_length1; + _tmp72__length1 = self->matrix_entries_length1; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp76_ = _tmp75_[3]; + _tmp73_ = _tmp72_[3]; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp77_ = transform; + _tmp74_ = transform; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp78_ = _tmp77_->matrix_entries; + _tmp75_ = _tmp74_->matrix_entries; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp78__length1 = _tmp77_->matrix_entries_length1; + _tmp75__length1 = _tmp74_->matrix_entries_length1; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp79_ = _tmp78_[1]; + _tmp76_ = _tmp75_[1]; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp80_ = self->matrix_entries; + _tmp77_ = self->matrix_entries; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp80__length1 = self->matrix_entries_length1; + _tmp77__length1 = self->matrix_entries_length1; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp81_ = _tmp80_[7]; + _tmp78_ = _tmp77_[7]; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp82_ = transform; + _tmp79_ = transform; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp83_ = _tmp82_->matrix_entries; + _tmp80_ = _tmp79_->matrix_entries; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp83__length1 = _tmp82_->matrix_entries_length1; + _tmp80__length1 = _tmp79_->matrix_entries_length1; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp84_ = _tmp83_[2]; + _tmp81_ = _tmp80_[2]; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp85_ = self->matrix_entries; + _tmp82_ = self->matrix_entries; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp85__length1 = self->matrix_entries_length1; + _tmp82__length1 = self->matrix_entries_length1; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp86_ = _tmp85_[11]; + _tmp83_ = _tmp82_[11]; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp87_ = transform; + _tmp84_ = transform; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp88_ = _tmp87_->matrix_entries; + _tmp85_ = _tmp84_->matrix_entries; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp88__length1 = _tmp87_->matrix_entries_length1; + _tmp85__length1 = _tmp84_->matrix_entries_length1; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp89_ = _tmp88_[3]; + _tmp86_ = _tmp85_[3]; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp90_ = self->matrix_entries; + _tmp87_ = self->matrix_entries; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp90__length1 = self->matrix_entries_length1; + _tmp87__length1 = self->matrix_entries_length1; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp91_ = _tmp90_[15]; + _tmp88_ = _tmp87_[15]; #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp71_[3] = (((_tmp74_ * _tmp76_) + (_tmp79_ * _tmp81_)) + (_tmp84_ * _tmp86_)) + (_tmp89_ * _tmp91_); + _tmp68_[3] = (((_tmp71_ * _tmp73_) + (_tmp76_ * _tmp78_)) + (_tmp81_ * _tmp83_)) + (_tmp86_ * _tmp88_); #line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp92_ = _tmp71_[3]; + _tmp89_ = _tmp68_[3]; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp93_ = result_matrix_entries; + _tmp90_ = result_matrix_entries; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp93__length1 = result_matrix_entries_length1; + _tmp90__length1 = result_matrix_entries_length1; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp94_ = transform; + _tmp91_ = transform; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp95_ = _tmp94_->matrix_entries; + _tmp92_ = _tmp91_->matrix_entries; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp95__length1 = _tmp94_->matrix_entries_length1; + _tmp92__length1 = _tmp91_->matrix_entries_length1; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp96_ = _tmp95_[4]; + _tmp93_ = _tmp92_[4]; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp97_ = self->matrix_entries; + _tmp94_ = self->matrix_entries; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp97__length1 = self->matrix_entries_length1; + _tmp94__length1 = self->matrix_entries_length1; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp98_ = _tmp97_[0]; + _tmp95_ = _tmp94_[0]; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp99_ = transform; + _tmp96_ = transform; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp100_ = _tmp99_->matrix_entries; + _tmp97_ = _tmp96_->matrix_entries; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp100__length1 = _tmp99_->matrix_entries_length1; + _tmp97__length1 = _tmp96_->matrix_entries_length1; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp101_ = _tmp100_[5]; + _tmp98_ = _tmp97_[5]; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp102_ = self->matrix_entries; + _tmp99_ = self->matrix_entries; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp102__length1 = self->matrix_entries_length1; + _tmp99__length1 = self->matrix_entries_length1; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp103_ = _tmp102_[4]; + _tmp100_ = _tmp99_[4]; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp104_ = transform; + _tmp101_ = transform; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp105_ = _tmp104_->matrix_entries; + _tmp102_ = _tmp101_->matrix_entries; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp105__length1 = _tmp104_->matrix_entries_length1; + _tmp102__length1 = _tmp101_->matrix_entries_length1; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp106_ = _tmp105_[6]; + _tmp103_ = _tmp102_[6]; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp107_ = self->matrix_entries; + _tmp104_ = self->matrix_entries; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp107__length1 = self->matrix_entries_length1; + _tmp104__length1 = self->matrix_entries_length1; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp108_ = _tmp107_[8]; + _tmp105_ = _tmp104_[8]; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp109_ = transform; + _tmp106_ = transform; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp110_ = _tmp109_->matrix_entries; + _tmp107_ = _tmp106_->matrix_entries; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp110__length1 = _tmp109_->matrix_entries_length1; + _tmp107__length1 = _tmp106_->matrix_entries_length1; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp111_ = _tmp110_[7]; + _tmp108_ = _tmp107_[7]; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp112_ = self->matrix_entries; + _tmp109_ = self->matrix_entries; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp112__length1 = self->matrix_entries_length1; + _tmp109__length1 = self->matrix_entries_length1; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp113_ = _tmp112_[12]; + _tmp110_ = _tmp109_[12]; #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp93_[4] = (((_tmp96_ * _tmp98_) + (_tmp101_ * _tmp103_)) + (_tmp106_ * _tmp108_)) + (_tmp111_ * _tmp113_); + _tmp90_[4] = (((_tmp93_ * _tmp95_) + (_tmp98_ * _tmp100_)) + (_tmp103_ * _tmp105_)) + (_tmp108_ * _tmp110_); #line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp114_ = _tmp93_[4]; + _tmp111_ = _tmp90_[4]; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp115_ = result_matrix_entries; + _tmp112_ = result_matrix_entries; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp115__length1 = result_matrix_entries_length1; + _tmp112__length1 = result_matrix_entries_length1; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp116_ = transform; + _tmp113_ = transform; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp117_ = _tmp116_->matrix_entries; + _tmp114_ = _tmp113_->matrix_entries; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp117__length1 = _tmp116_->matrix_entries_length1; + _tmp114__length1 = _tmp113_->matrix_entries_length1; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp118_ = _tmp117_[4]; + _tmp115_ = _tmp114_[4]; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp119_ = self->matrix_entries; + _tmp116_ = self->matrix_entries; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp119__length1 = self->matrix_entries_length1; + _tmp116__length1 = self->matrix_entries_length1; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp120_ = _tmp119_[1]; + _tmp117_ = _tmp116_[1]; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp121_ = transform; + _tmp118_ = transform; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp122_ = _tmp121_->matrix_entries; + _tmp119_ = _tmp118_->matrix_entries; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp122__length1 = _tmp121_->matrix_entries_length1; + _tmp119__length1 = _tmp118_->matrix_entries_length1; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp123_ = _tmp122_[5]; + _tmp120_ = _tmp119_[5]; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp124_ = self->matrix_entries; + _tmp121_ = self->matrix_entries; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp124__length1 = self->matrix_entries_length1; + _tmp121__length1 = self->matrix_entries_length1; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp125_ = _tmp124_[5]; + _tmp122_ = _tmp121_[5]; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp126_ = transform; + _tmp123_ = transform; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp127_ = _tmp126_->matrix_entries; + _tmp124_ = _tmp123_->matrix_entries; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp127__length1 = _tmp126_->matrix_entries_length1; + _tmp124__length1 = _tmp123_->matrix_entries_length1; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp128_ = _tmp127_[6]; + _tmp125_ = _tmp124_[6]; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp129_ = self->matrix_entries; + _tmp126_ = self->matrix_entries; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp129__length1 = self->matrix_entries_length1; + _tmp126__length1 = self->matrix_entries_length1; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp130_ = _tmp129_[9]; + _tmp127_ = _tmp126_[9]; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp131_ = transform; + _tmp128_ = transform; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp132_ = _tmp131_->matrix_entries; + _tmp129_ = _tmp128_->matrix_entries; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp132__length1 = _tmp131_->matrix_entries_length1; + _tmp129__length1 = _tmp128_->matrix_entries_length1; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp133_ = _tmp132_[7]; + _tmp130_ = _tmp129_[7]; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp134_ = self->matrix_entries; + _tmp131_ = self->matrix_entries; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp134__length1 = self->matrix_entries_length1; + _tmp131__length1 = self->matrix_entries_length1; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp135_ = _tmp134_[13]; + _tmp132_ = _tmp131_[13]; #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp115_[5] = (((_tmp118_ * _tmp120_) + (_tmp123_ * _tmp125_)) + (_tmp128_ * _tmp130_)) + (_tmp133_ * _tmp135_); + _tmp112_[5] = (((_tmp115_ * _tmp117_) + (_tmp120_ * _tmp122_)) + (_tmp125_ * _tmp127_)) + (_tmp130_ * _tmp132_); #line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp136_ = _tmp115_[5]; + _tmp133_ = _tmp112_[5]; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp137_ = result_matrix_entries; + _tmp134_ = result_matrix_entries; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp137__length1 = result_matrix_entries_length1; + _tmp134__length1 = result_matrix_entries_length1; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp138_ = transform; + _tmp135_ = transform; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp139_ = _tmp138_->matrix_entries; + _tmp136_ = _tmp135_->matrix_entries; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp139__length1 = _tmp138_->matrix_entries_length1; + _tmp136__length1 = _tmp135_->matrix_entries_length1; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp140_ = _tmp139_[4]; + _tmp137_ = _tmp136_[4]; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp141_ = self->matrix_entries; + _tmp138_ = self->matrix_entries; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp141__length1 = self->matrix_entries_length1; + _tmp138__length1 = self->matrix_entries_length1; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp142_ = _tmp141_[2]; + _tmp139_ = _tmp138_[2]; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp143_ = transform; + _tmp140_ = transform; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp144_ = _tmp143_->matrix_entries; + _tmp141_ = _tmp140_->matrix_entries; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp144__length1 = _tmp143_->matrix_entries_length1; + _tmp141__length1 = _tmp140_->matrix_entries_length1; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp145_ = _tmp144_[5]; + _tmp142_ = _tmp141_[5]; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp146_ = self->matrix_entries; + _tmp143_ = self->matrix_entries; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp146__length1 = self->matrix_entries_length1; + _tmp143__length1 = self->matrix_entries_length1; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp147_ = _tmp146_[6]; + _tmp144_ = _tmp143_[6]; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp148_ = transform; + _tmp145_ = transform; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp149_ = _tmp148_->matrix_entries; + _tmp146_ = _tmp145_->matrix_entries; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp149__length1 = _tmp148_->matrix_entries_length1; + _tmp146__length1 = _tmp145_->matrix_entries_length1; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp150_ = _tmp149_[6]; + _tmp147_ = _tmp146_[6]; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp151_ = self->matrix_entries; + _tmp148_ = self->matrix_entries; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp151__length1 = self->matrix_entries_length1; + _tmp148__length1 = self->matrix_entries_length1; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp152_ = _tmp151_[10]; + _tmp149_ = _tmp148_[10]; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp153_ = transform; + _tmp150_ = transform; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp154_ = _tmp153_->matrix_entries; + _tmp151_ = _tmp150_->matrix_entries; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp154__length1 = _tmp153_->matrix_entries_length1; + _tmp151__length1 = _tmp150_->matrix_entries_length1; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp155_ = _tmp154_[7]; + _tmp152_ = _tmp151_[7]; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp156_ = self->matrix_entries; + _tmp153_ = self->matrix_entries; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp156__length1 = self->matrix_entries_length1; + _tmp153__length1 = self->matrix_entries_length1; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp157_ = _tmp156_[14]; + _tmp154_ = _tmp153_[14]; #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp137_[6] = (((_tmp140_ * _tmp142_) + (_tmp145_ * _tmp147_)) + (_tmp150_ * _tmp152_)) + (_tmp155_ * _tmp157_); + _tmp134_[6] = (((_tmp137_ * _tmp139_) + (_tmp142_ * _tmp144_)) + (_tmp147_ * _tmp149_)) + (_tmp152_ * _tmp154_); #line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp158_ = _tmp137_[6]; + _tmp155_ = _tmp134_[6]; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp159_ = result_matrix_entries; + _tmp156_ = result_matrix_entries; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp159__length1 = result_matrix_entries_length1; + _tmp156__length1 = result_matrix_entries_length1; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp160_ = transform; + _tmp157_ = transform; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp161_ = _tmp160_->matrix_entries; + _tmp158_ = _tmp157_->matrix_entries; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp161__length1 = _tmp160_->matrix_entries_length1; + _tmp158__length1 = _tmp157_->matrix_entries_length1; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp162_ = _tmp161_[4]; + _tmp159_ = _tmp158_[4]; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp163_ = self->matrix_entries; + _tmp160_ = self->matrix_entries; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp163__length1 = self->matrix_entries_length1; + _tmp160__length1 = self->matrix_entries_length1; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp164_ = _tmp163_[3]; + _tmp161_ = _tmp160_[3]; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp165_ = transform; + _tmp162_ = transform; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp166_ = _tmp165_->matrix_entries; + _tmp163_ = _tmp162_->matrix_entries; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp166__length1 = _tmp165_->matrix_entries_length1; + _tmp163__length1 = _tmp162_->matrix_entries_length1; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp167_ = _tmp166_[5]; + _tmp164_ = _tmp163_[5]; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp168_ = self->matrix_entries; + _tmp165_ = self->matrix_entries; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp168__length1 = self->matrix_entries_length1; + _tmp165__length1 = self->matrix_entries_length1; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp169_ = _tmp168_[7]; + _tmp166_ = _tmp165_[7]; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp170_ = transform; + _tmp167_ = transform; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp171_ = _tmp170_->matrix_entries; + _tmp168_ = _tmp167_->matrix_entries; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp171__length1 = _tmp170_->matrix_entries_length1; + _tmp168__length1 = _tmp167_->matrix_entries_length1; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp172_ = _tmp171_[6]; + _tmp169_ = _tmp168_[6]; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp173_ = self->matrix_entries; + _tmp170_ = self->matrix_entries; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp173__length1 = self->matrix_entries_length1; + _tmp170__length1 = self->matrix_entries_length1; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp174_ = _tmp173_[11]; + _tmp171_ = _tmp170_[11]; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp175_ = transform; + _tmp172_ = transform; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp176_ = _tmp175_->matrix_entries; + _tmp173_ = _tmp172_->matrix_entries; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp176__length1 = _tmp175_->matrix_entries_length1; + _tmp173__length1 = _tmp172_->matrix_entries_length1; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp177_ = _tmp176_[7]; + _tmp174_ = _tmp173_[7]; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp178_ = self->matrix_entries; + _tmp175_ = self->matrix_entries; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp178__length1 = self->matrix_entries_length1; + _tmp175__length1 = self->matrix_entries_length1; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp179_ = _tmp178_[15]; + _tmp176_ = _tmp175_[15]; #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp159_[7] = (((_tmp162_ * _tmp164_) + (_tmp167_ * _tmp169_)) + (_tmp172_ * _tmp174_)) + (_tmp177_ * _tmp179_); + _tmp156_[7] = (((_tmp159_ * _tmp161_) + (_tmp164_ * _tmp166_)) + (_tmp169_ * _tmp171_)) + (_tmp174_ * _tmp176_); #line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp180_ = _tmp159_[7]; + _tmp177_ = _tmp156_[7]; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp181_ = result_matrix_entries; + _tmp178_ = result_matrix_entries; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp181__length1 = result_matrix_entries_length1; + _tmp178__length1 = result_matrix_entries_length1; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp182_ = transform; + _tmp179_ = transform; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp183_ = _tmp182_->matrix_entries; + _tmp180_ = _tmp179_->matrix_entries; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp183__length1 = _tmp182_->matrix_entries_length1; + _tmp180__length1 = _tmp179_->matrix_entries_length1; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp184_ = _tmp183_[8]; + _tmp181_ = _tmp180_[8]; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp185_ = self->matrix_entries; + _tmp182_ = self->matrix_entries; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp185__length1 = self->matrix_entries_length1; + _tmp182__length1 = self->matrix_entries_length1; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp186_ = _tmp185_[0]; + _tmp183_ = _tmp182_[0]; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp187_ = transform; + _tmp184_ = transform; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp188_ = _tmp187_->matrix_entries; + _tmp185_ = _tmp184_->matrix_entries; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp188__length1 = _tmp187_->matrix_entries_length1; + _tmp185__length1 = _tmp184_->matrix_entries_length1; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp189_ = _tmp188_[9]; + _tmp186_ = _tmp185_[9]; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp190_ = self->matrix_entries; + _tmp187_ = self->matrix_entries; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp190__length1 = self->matrix_entries_length1; + _tmp187__length1 = self->matrix_entries_length1; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp191_ = _tmp190_[4]; + _tmp188_ = _tmp187_[4]; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp192_ = transform; + _tmp189_ = transform; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp193_ = _tmp192_->matrix_entries; + _tmp190_ = _tmp189_->matrix_entries; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp193__length1 = _tmp192_->matrix_entries_length1; + _tmp190__length1 = _tmp189_->matrix_entries_length1; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp194_ = _tmp193_[10]; + _tmp191_ = _tmp190_[10]; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp195_ = self->matrix_entries; + _tmp192_ = self->matrix_entries; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp195__length1 = self->matrix_entries_length1; + _tmp192__length1 = self->matrix_entries_length1; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp196_ = _tmp195_[8]; + _tmp193_ = _tmp192_[8]; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp197_ = transform; + _tmp194_ = transform; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp198_ = _tmp197_->matrix_entries; + _tmp195_ = _tmp194_->matrix_entries; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp198__length1 = _tmp197_->matrix_entries_length1; + _tmp195__length1 = _tmp194_->matrix_entries_length1; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp199_ = _tmp198_[11]; + _tmp196_ = _tmp195_[11]; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp200_ = self->matrix_entries; + _tmp197_ = self->matrix_entries; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp200__length1 = self->matrix_entries_length1; + _tmp197__length1 = self->matrix_entries_length1; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp201_ = _tmp200_[12]; + _tmp198_ = _tmp197_[12]; #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp181_[8] = (((_tmp184_ * _tmp186_) + (_tmp189_ * _tmp191_)) + (_tmp194_ * _tmp196_)) + (_tmp199_ * _tmp201_); + _tmp178_[8] = (((_tmp181_ * _tmp183_) + (_tmp186_ * _tmp188_)) + (_tmp191_ * _tmp193_)) + (_tmp196_ * _tmp198_); #line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp202_ = _tmp181_[8]; + _tmp199_ = _tmp178_[8]; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp203_ = result_matrix_entries; + _tmp200_ = result_matrix_entries; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp203__length1 = result_matrix_entries_length1; + _tmp200__length1 = result_matrix_entries_length1; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp204_ = transform; + _tmp201_ = transform; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp205_ = _tmp204_->matrix_entries; + _tmp202_ = _tmp201_->matrix_entries; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp205__length1 = _tmp204_->matrix_entries_length1; + _tmp202__length1 = _tmp201_->matrix_entries_length1; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp206_ = _tmp205_[8]; + _tmp203_ = _tmp202_[8]; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp207_ = self->matrix_entries; + _tmp204_ = self->matrix_entries; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp207__length1 = self->matrix_entries_length1; + _tmp204__length1 = self->matrix_entries_length1; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp208_ = _tmp207_[1]; + _tmp205_ = _tmp204_[1]; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp209_ = transform; + _tmp206_ = transform; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp210_ = _tmp209_->matrix_entries; + _tmp207_ = _tmp206_->matrix_entries; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp210__length1 = _tmp209_->matrix_entries_length1; + _tmp207__length1 = _tmp206_->matrix_entries_length1; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp211_ = _tmp210_[9]; + _tmp208_ = _tmp207_[9]; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp212_ = self->matrix_entries; + _tmp209_ = self->matrix_entries; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp212__length1 = self->matrix_entries_length1; + _tmp209__length1 = self->matrix_entries_length1; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp213_ = _tmp212_[5]; + _tmp210_ = _tmp209_[5]; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp214_ = transform; + _tmp211_ = transform; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp215_ = _tmp214_->matrix_entries; + _tmp212_ = _tmp211_->matrix_entries; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp215__length1 = _tmp214_->matrix_entries_length1; + _tmp212__length1 = _tmp211_->matrix_entries_length1; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp216_ = _tmp215_[10]; + _tmp213_ = _tmp212_[10]; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp217_ = self->matrix_entries; + _tmp214_ = self->matrix_entries; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp217__length1 = self->matrix_entries_length1; + _tmp214__length1 = self->matrix_entries_length1; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp218_ = _tmp217_[9]; + _tmp215_ = _tmp214_[9]; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp219_ = transform; + _tmp216_ = transform; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp220_ = _tmp219_->matrix_entries; + _tmp217_ = _tmp216_->matrix_entries; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp220__length1 = _tmp219_->matrix_entries_length1; + _tmp217__length1 = _tmp216_->matrix_entries_length1; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp221_ = _tmp220_[11]; + _tmp218_ = _tmp217_[11]; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp222_ = self->matrix_entries; + _tmp219_ = self->matrix_entries; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp222__length1 = self->matrix_entries_length1; + _tmp219__length1 = self->matrix_entries_length1; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp223_ = _tmp222_[13]; + _tmp220_ = _tmp219_[13]; #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp203_[9] = (((_tmp206_ * _tmp208_) + (_tmp211_ * _tmp213_)) + (_tmp216_ * _tmp218_)) + (_tmp221_ * _tmp223_); + _tmp200_[9] = (((_tmp203_ * _tmp205_) + (_tmp208_ * _tmp210_)) + (_tmp213_ * _tmp215_)) + (_tmp218_ * _tmp220_); #line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp224_ = _tmp203_[9]; + _tmp221_ = _tmp200_[9]; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp225_ = result_matrix_entries; + _tmp222_ = result_matrix_entries; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp225__length1 = result_matrix_entries_length1; + _tmp222__length1 = result_matrix_entries_length1; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp226_ = transform; + _tmp223_ = transform; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp227_ = _tmp226_->matrix_entries; + _tmp224_ = _tmp223_->matrix_entries; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp227__length1 = _tmp226_->matrix_entries_length1; + _tmp224__length1 = _tmp223_->matrix_entries_length1; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp228_ = _tmp227_[8]; + _tmp225_ = _tmp224_[8]; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp229_ = self->matrix_entries; + _tmp226_ = self->matrix_entries; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp229__length1 = self->matrix_entries_length1; + _tmp226__length1 = self->matrix_entries_length1; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp230_ = _tmp229_[2]; + _tmp227_ = _tmp226_[2]; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp231_ = transform; + _tmp228_ = transform; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp232_ = _tmp231_->matrix_entries; + _tmp229_ = _tmp228_->matrix_entries; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp232__length1 = _tmp231_->matrix_entries_length1; + _tmp229__length1 = _tmp228_->matrix_entries_length1; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp233_ = _tmp232_[9]; + _tmp230_ = _tmp229_[9]; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp234_ = self->matrix_entries; + _tmp231_ = self->matrix_entries; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp234__length1 = self->matrix_entries_length1; + _tmp231__length1 = self->matrix_entries_length1; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp235_ = _tmp234_[6]; + _tmp232_ = _tmp231_[6]; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp236_ = transform; + _tmp233_ = transform; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp237_ = _tmp236_->matrix_entries; + _tmp234_ = _tmp233_->matrix_entries; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp237__length1 = _tmp236_->matrix_entries_length1; + _tmp234__length1 = _tmp233_->matrix_entries_length1; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp238_ = _tmp237_[10]; + _tmp235_ = _tmp234_[10]; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp239_ = self->matrix_entries; + _tmp236_ = self->matrix_entries; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp239__length1 = self->matrix_entries_length1; + _tmp236__length1 = self->matrix_entries_length1; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp240_ = _tmp239_[10]; + _tmp237_ = _tmp236_[10]; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp241_ = transform; + _tmp238_ = transform; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp242_ = _tmp241_->matrix_entries; + _tmp239_ = _tmp238_->matrix_entries; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp242__length1 = _tmp241_->matrix_entries_length1; + _tmp239__length1 = _tmp238_->matrix_entries_length1; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp243_ = _tmp242_[11]; + _tmp240_ = _tmp239_[11]; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp244_ = self->matrix_entries; + _tmp241_ = self->matrix_entries; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp244__length1 = self->matrix_entries_length1; + _tmp241__length1 = self->matrix_entries_length1; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp245_ = _tmp244_[14]; + _tmp242_ = _tmp241_[14]; #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp225_[10] = (((_tmp228_ * _tmp230_) + (_tmp233_ * _tmp235_)) + (_tmp238_ * _tmp240_)) + (_tmp243_ * _tmp245_); + _tmp222_[10] = (((_tmp225_ * _tmp227_) + (_tmp230_ * _tmp232_)) + (_tmp235_ * _tmp237_)) + (_tmp240_ * _tmp242_); #line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp246_ = _tmp225_[10]; + _tmp243_ = _tmp222_[10]; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp247_ = result_matrix_entries; + _tmp244_ = result_matrix_entries; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp247__length1 = result_matrix_entries_length1; + _tmp244__length1 = result_matrix_entries_length1; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp248_ = transform; + _tmp245_ = transform; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp249_ = _tmp248_->matrix_entries; + _tmp246_ = _tmp245_->matrix_entries; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp249__length1 = _tmp248_->matrix_entries_length1; + _tmp246__length1 = _tmp245_->matrix_entries_length1; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp250_ = _tmp249_[8]; + _tmp247_ = _tmp246_[8]; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp251_ = self->matrix_entries; + _tmp248_ = self->matrix_entries; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp251__length1 = self->matrix_entries_length1; + _tmp248__length1 = self->matrix_entries_length1; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp252_ = _tmp251_[3]; + _tmp249_ = _tmp248_[3]; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp253_ = transform; + _tmp250_ = transform; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp254_ = _tmp253_->matrix_entries; + _tmp251_ = _tmp250_->matrix_entries; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp254__length1 = _tmp253_->matrix_entries_length1; + _tmp251__length1 = _tmp250_->matrix_entries_length1; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp255_ = _tmp254_[9]; + _tmp252_ = _tmp251_[9]; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp256_ = self->matrix_entries; + _tmp253_ = self->matrix_entries; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp256__length1 = self->matrix_entries_length1; + _tmp253__length1 = self->matrix_entries_length1; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp257_ = _tmp256_[7]; + _tmp254_ = _tmp253_[7]; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp258_ = transform; + _tmp255_ = transform; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp259_ = _tmp258_->matrix_entries; + _tmp256_ = _tmp255_->matrix_entries; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp259__length1 = _tmp258_->matrix_entries_length1; + _tmp256__length1 = _tmp255_->matrix_entries_length1; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp260_ = _tmp259_[10]; + _tmp257_ = _tmp256_[10]; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp261_ = self->matrix_entries; + _tmp258_ = self->matrix_entries; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp261__length1 = self->matrix_entries_length1; + _tmp258__length1 = self->matrix_entries_length1; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp262_ = _tmp261_[11]; + _tmp259_ = _tmp258_[11]; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp263_ = transform; + _tmp260_ = transform; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp264_ = _tmp263_->matrix_entries; + _tmp261_ = _tmp260_->matrix_entries; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp264__length1 = _tmp263_->matrix_entries_length1; + _tmp261__length1 = _tmp260_->matrix_entries_length1; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp265_ = _tmp264_[11]; + _tmp262_ = _tmp261_[11]; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp266_ = self->matrix_entries; + _tmp263_ = self->matrix_entries; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp266__length1 = self->matrix_entries_length1; + _tmp263__length1 = self->matrix_entries_length1; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp267_ = _tmp266_[15]; + _tmp264_ = _tmp263_[15]; #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp247_[11] = (((_tmp250_ * _tmp252_) + (_tmp255_ * _tmp257_)) + (_tmp260_ * _tmp262_)) + (_tmp265_ * _tmp267_); + _tmp244_[11] = (((_tmp247_ * _tmp249_) + (_tmp252_ * _tmp254_)) + (_tmp257_ * _tmp259_)) + (_tmp262_ * _tmp264_); #line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp268_ = _tmp247_[11]; + _tmp265_ = _tmp244_[11]; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp269_ = result_matrix_entries; + _tmp266_ = result_matrix_entries; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp269__length1 = result_matrix_entries_length1; + _tmp266__length1 = result_matrix_entries_length1; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp270_ = transform; + _tmp267_ = transform; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp271_ = _tmp270_->matrix_entries; + _tmp268_ = _tmp267_->matrix_entries; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp271__length1 = _tmp270_->matrix_entries_length1; + _tmp268__length1 = _tmp267_->matrix_entries_length1; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp272_ = _tmp271_[12]; + _tmp269_ = _tmp268_[12]; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp273_ = self->matrix_entries; + _tmp270_ = self->matrix_entries; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp273__length1 = self->matrix_entries_length1; + _tmp270__length1 = self->matrix_entries_length1; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp274_ = _tmp273_[0]; + _tmp271_ = _tmp270_[0]; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp275_ = transform; + _tmp272_ = transform; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp276_ = _tmp275_->matrix_entries; + _tmp273_ = _tmp272_->matrix_entries; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp276__length1 = _tmp275_->matrix_entries_length1; + _tmp273__length1 = _tmp272_->matrix_entries_length1; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp277_ = _tmp276_[13]; + _tmp274_ = _tmp273_[13]; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp278_ = self->matrix_entries; + _tmp275_ = self->matrix_entries; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp278__length1 = self->matrix_entries_length1; + _tmp275__length1 = self->matrix_entries_length1; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp279_ = _tmp278_[4]; + _tmp276_ = _tmp275_[4]; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp280_ = transform; + _tmp277_ = transform; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp281_ = _tmp280_->matrix_entries; + _tmp278_ = _tmp277_->matrix_entries; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp281__length1 = _tmp280_->matrix_entries_length1; + _tmp278__length1 = _tmp277_->matrix_entries_length1; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp282_ = _tmp281_[14]; + _tmp279_ = _tmp278_[14]; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp283_ = self->matrix_entries; + _tmp280_ = self->matrix_entries; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp283__length1 = self->matrix_entries_length1; + _tmp280__length1 = self->matrix_entries_length1; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp284_ = _tmp283_[8]; + _tmp281_ = _tmp280_[8]; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp285_ = transform; + _tmp282_ = transform; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp286_ = _tmp285_->matrix_entries; + _tmp283_ = _tmp282_->matrix_entries; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp286__length1 = _tmp285_->matrix_entries_length1; + _tmp283__length1 = _tmp282_->matrix_entries_length1; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp287_ = _tmp286_[15]; + _tmp284_ = _tmp283_[15]; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp288_ = self->matrix_entries; + _tmp285_ = self->matrix_entries; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp288__length1 = self->matrix_entries_length1; + _tmp285__length1 = self->matrix_entries_length1; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp289_ = _tmp288_[12]; + _tmp286_ = _tmp285_[12]; #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp269_[12] = (((_tmp272_ * _tmp274_) + (_tmp277_ * _tmp279_)) + (_tmp282_ * _tmp284_)) + (_tmp287_ * _tmp289_); + _tmp266_[12] = (((_tmp269_ * _tmp271_) + (_tmp274_ * _tmp276_)) + (_tmp279_ * _tmp281_)) + (_tmp284_ * _tmp286_); #line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp290_ = _tmp269_[12]; + _tmp287_ = _tmp266_[12]; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp291_ = result_matrix_entries; + _tmp288_ = result_matrix_entries; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp291__length1 = result_matrix_entries_length1; + _tmp288__length1 = result_matrix_entries_length1; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp292_ = transform; + _tmp289_ = transform; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp293_ = _tmp292_->matrix_entries; + _tmp290_ = _tmp289_->matrix_entries; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp293__length1 = _tmp292_->matrix_entries_length1; + _tmp290__length1 = _tmp289_->matrix_entries_length1; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp294_ = _tmp293_[12]; + _tmp291_ = _tmp290_[12]; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp295_ = self->matrix_entries; + _tmp292_ = self->matrix_entries; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp295__length1 = self->matrix_entries_length1; + _tmp292__length1 = self->matrix_entries_length1; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp296_ = _tmp295_[1]; + _tmp293_ = _tmp292_[1]; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp297_ = transform; + _tmp294_ = transform; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp298_ = _tmp297_->matrix_entries; + _tmp295_ = _tmp294_->matrix_entries; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp298__length1 = _tmp297_->matrix_entries_length1; + _tmp295__length1 = _tmp294_->matrix_entries_length1; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp299_ = _tmp298_[13]; + _tmp296_ = _tmp295_[13]; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp300_ = self->matrix_entries; + _tmp297_ = self->matrix_entries; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp300__length1 = self->matrix_entries_length1; + _tmp297__length1 = self->matrix_entries_length1; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp301_ = _tmp300_[5]; + _tmp298_ = _tmp297_[5]; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp302_ = transform; + _tmp299_ = transform; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp303_ = _tmp302_->matrix_entries; + _tmp300_ = _tmp299_->matrix_entries; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp303__length1 = _tmp302_->matrix_entries_length1; + _tmp300__length1 = _tmp299_->matrix_entries_length1; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp304_ = _tmp303_[14]; + _tmp301_ = _tmp300_[14]; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp305_ = self->matrix_entries; + _tmp302_ = self->matrix_entries; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp305__length1 = self->matrix_entries_length1; + _tmp302__length1 = self->matrix_entries_length1; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp306_ = _tmp305_[9]; + _tmp303_ = _tmp302_[9]; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp307_ = transform; + _tmp304_ = transform; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp308_ = _tmp307_->matrix_entries; + _tmp305_ = _tmp304_->matrix_entries; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp308__length1 = _tmp307_->matrix_entries_length1; + _tmp305__length1 = _tmp304_->matrix_entries_length1; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp309_ = _tmp308_[15]; + _tmp306_ = _tmp305_[15]; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp310_ = self->matrix_entries; + _tmp307_ = self->matrix_entries; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp310__length1 = self->matrix_entries_length1; + _tmp307__length1 = self->matrix_entries_length1; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp311_ = _tmp310_[13]; + _tmp308_ = _tmp307_[13]; #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp291_[13] = (((_tmp294_ * _tmp296_) + (_tmp299_ * _tmp301_)) + (_tmp304_ * _tmp306_)) + (_tmp309_ * _tmp311_); + _tmp288_[13] = (((_tmp291_ * _tmp293_) + (_tmp296_ * _tmp298_)) + (_tmp301_ * _tmp303_)) + (_tmp306_ * _tmp308_); #line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp312_ = _tmp291_[13]; + _tmp309_ = _tmp288_[13]; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp313_ = result_matrix_entries; + _tmp310_ = result_matrix_entries; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp313__length1 = result_matrix_entries_length1; + _tmp310__length1 = result_matrix_entries_length1; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp314_ = transform; + _tmp311_ = transform; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp315_ = _tmp314_->matrix_entries; + _tmp312_ = _tmp311_->matrix_entries; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp315__length1 = _tmp314_->matrix_entries_length1; + _tmp312__length1 = _tmp311_->matrix_entries_length1; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp316_ = _tmp315_[12]; + _tmp313_ = _tmp312_[12]; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp317_ = self->matrix_entries; + _tmp314_ = self->matrix_entries; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp317__length1 = self->matrix_entries_length1; + _tmp314__length1 = self->matrix_entries_length1; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp318_ = _tmp317_[2]; + _tmp315_ = _tmp314_[2]; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp319_ = transform; + _tmp316_ = transform; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp320_ = _tmp319_->matrix_entries; + _tmp317_ = _tmp316_->matrix_entries; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp320__length1 = _tmp319_->matrix_entries_length1; + _tmp317__length1 = _tmp316_->matrix_entries_length1; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp321_ = _tmp320_[13]; + _tmp318_ = _tmp317_[13]; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp322_ = self->matrix_entries; + _tmp319_ = self->matrix_entries; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp322__length1 = self->matrix_entries_length1; + _tmp319__length1 = self->matrix_entries_length1; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp323_ = _tmp322_[6]; + _tmp320_ = _tmp319_[6]; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp324_ = transform; + _tmp321_ = transform; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp325_ = _tmp324_->matrix_entries; + _tmp322_ = _tmp321_->matrix_entries; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp325__length1 = _tmp324_->matrix_entries_length1; + _tmp322__length1 = _tmp321_->matrix_entries_length1; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp326_ = _tmp325_[14]; + _tmp323_ = _tmp322_[14]; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp327_ = self->matrix_entries; + _tmp324_ = self->matrix_entries; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp327__length1 = self->matrix_entries_length1; + _tmp324__length1 = self->matrix_entries_length1; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp328_ = _tmp327_[10]; + _tmp325_ = _tmp324_[10]; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp329_ = transform; + _tmp326_ = transform; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp330_ = _tmp329_->matrix_entries; + _tmp327_ = _tmp326_->matrix_entries; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp330__length1 = _tmp329_->matrix_entries_length1; + _tmp327__length1 = _tmp326_->matrix_entries_length1; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp331_ = _tmp330_[15]; + _tmp328_ = _tmp327_[15]; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp332_ = self->matrix_entries; + _tmp329_ = self->matrix_entries; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp332__length1 = self->matrix_entries_length1; + _tmp329__length1 = self->matrix_entries_length1; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp333_ = _tmp332_[14]; + _tmp330_ = _tmp329_[14]; #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp313_[14] = (((_tmp316_ * _tmp318_) + (_tmp321_ * _tmp323_)) + (_tmp326_ * _tmp328_)) + (_tmp331_ * _tmp333_); + _tmp310_[14] = (((_tmp313_ * _tmp315_) + (_tmp318_ * _tmp320_)) + (_tmp323_ * _tmp325_)) + (_tmp328_ * _tmp330_); #line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp334_ = _tmp313_[14]; + _tmp331_ = _tmp310_[14]; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp335_ = result_matrix_entries; + _tmp332_ = result_matrix_entries; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp335__length1 = result_matrix_entries_length1; + _tmp332__length1 = result_matrix_entries_length1; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp336_ = transform; + _tmp333_ = transform; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp337_ = _tmp336_->matrix_entries; + _tmp334_ = _tmp333_->matrix_entries; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp337__length1 = _tmp336_->matrix_entries_length1; + _tmp334__length1 = _tmp333_->matrix_entries_length1; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp338_ = _tmp337_[12]; + _tmp335_ = _tmp334_[12]; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp339_ = self->matrix_entries; + _tmp336_ = self->matrix_entries; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp339__length1 = self->matrix_entries_length1; + _tmp336__length1 = self->matrix_entries_length1; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp340_ = _tmp339_[3]; + _tmp337_ = _tmp336_[3]; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp341_ = transform; + _tmp338_ = transform; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp342_ = _tmp341_->matrix_entries; + _tmp339_ = _tmp338_->matrix_entries; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp342__length1 = _tmp341_->matrix_entries_length1; + _tmp339__length1 = _tmp338_->matrix_entries_length1; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp343_ = _tmp342_[13]; + _tmp340_ = _tmp339_[13]; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp344_ = self->matrix_entries; + _tmp341_ = self->matrix_entries; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp344__length1 = self->matrix_entries_length1; + _tmp341__length1 = self->matrix_entries_length1; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp345_ = _tmp344_[7]; + _tmp342_ = _tmp341_[7]; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp346_ = transform; + _tmp343_ = transform; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp347_ = _tmp346_->matrix_entries; + _tmp344_ = _tmp343_->matrix_entries; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp347__length1 = _tmp346_->matrix_entries_length1; + _tmp344__length1 = _tmp343_->matrix_entries_length1; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp348_ = _tmp347_[14]; + _tmp345_ = _tmp344_[14]; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp349_ = self->matrix_entries; + _tmp346_ = self->matrix_entries; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp349__length1 = self->matrix_entries_length1; + _tmp346__length1 = self->matrix_entries_length1; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp350_ = _tmp349_[11]; + _tmp347_ = _tmp346_[11]; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp351_ = transform; + _tmp348_ = transform; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp352_ = _tmp351_->matrix_entries; + _tmp349_ = _tmp348_->matrix_entries; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp352__length1 = _tmp351_->matrix_entries_length1; + _tmp349__length1 = _tmp348_->matrix_entries_length1; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp353_ = _tmp352_[15]; + _tmp350_ = _tmp349_[15]; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp354_ = self->matrix_entries; + _tmp351_ = self->matrix_entries; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp354__length1 = self->matrix_entries_length1; + _tmp351__length1 = self->matrix_entries_length1; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp355_ = _tmp354_[15]; + _tmp352_ = _tmp351_[15]; #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp335_[15] = (((_tmp338_ * _tmp340_) + (_tmp343_ * _tmp345_)) + (_tmp348_ * _tmp350_)) + (_tmp353_ * _tmp355_); + _tmp332_[15] = (((_tmp335_ * _tmp337_) + (_tmp340_ * _tmp342_)) + (_tmp345_ * _tmp347_)) + (_tmp350_ * _tmp352_); #line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp356_ = _tmp335_[15]; -#line 4549 "ColorTransformation.c" + _tmp353_ = _tmp332_[15]; +#line 4722 "ColorTransformation.c" { gint i = 0; #line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = 0; -#line 4554 "ColorTransformation.c" +#line 4727 "ColorTransformation.c" { - gboolean _tmp357_ = FALSE; + gboolean _tmp354_ = FALSE; #line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp357_ = TRUE; + _tmp354_ = TRUE; #line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 4561 "ColorTransformation.c" - gint _tmp359_; - gfloat* _tmp360_; - gint _tmp360__length1; - gint _tmp361_; - gfloat* _tmp362_; - gint _tmp362__length1; - gint _tmp363_; - gfloat _tmp364_; - gfloat _tmp365_; +#line 4734 "ColorTransformation.c" + gint _tmp356_; + gfloat* _tmp357_; + gint _tmp357__length1; + gint _tmp358_; + gfloat* _tmp359_; + gint _tmp359__length1; + gint _tmp360_; + gfloat _tmp361_; + gfloat _tmp362_; #line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp357_) { -#line 4573 "ColorTransformation.c" - gint _tmp358_; + if (!_tmp354_) { +#line 4746 "ColorTransformation.c" + gint _tmp355_; #line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp358_ = i; + _tmp355_ = i; #line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - i = _tmp358_ + 1; -#line 4579 "ColorTransformation.c" + i = _tmp355_ + 1; +#line 4752 "ColorTransformation.c" } #line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp357_ = FALSE; + _tmp354_ = FALSE; #line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp359_ = i; + _tmp356_ = i; #line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp359_ < RGB_TRANSFORMATION_MATRIX_SIZE)) { + if (!(_tmp356_ < RGB_TRANSFORMATION_MATRIX_SIZE)) { #line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 4589 "ColorTransformation.c" +#line 4762 "ColorTransformation.c" } #line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp360_ = self->matrix_entries; + _tmp357_ = self->matrix_entries; #line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp360__length1 = self->matrix_entries_length1; + _tmp357__length1 = self->matrix_entries_length1; #line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp361_ = i; + _tmp358_ = i; #line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp362_ = result_matrix_entries; + _tmp359_ = result_matrix_entries; #line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp362__length1 = result_matrix_entries_length1; + _tmp359__length1 = result_matrix_entries_length1; #line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp363_ = i; + _tmp360_ = i; #line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp364_ = _tmp362_[_tmp363_]; + _tmp361_ = _tmp359_[_tmp360_]; #line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp360_[_tmp361_] = _tmp364_; + _tmp357_[_tmp358_] = _tmp361_; #line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp365_ = _tmp360_[_tmp361_]; -#line 4609 "ColorTransformation.c" + _tmp362_ = _tmp357_[_tmp358_]; +#line 4782 "ColorTransformation.c" } } } #line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp367_ = self->identity; + _tmp364_ = self->identity; #line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp367_) { -#line 4617 "ColorTransformation.c" - RGBTransformation* _tmp368_; - gboolean _tmp369_; + if (_tmp364_) { +#line 4790 "ColorTransformation.c" + RGBTransformation* _tmp365_; + gboolean _tmp366_; #line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp368_ = transform; + _tmp365_ = transform; #line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp369_ = _tmp368_->identity; + _tmp366_ = _tmp365_->identity; #line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp366_ = _tmp369_; -#line 4626 "ColorTransformation.c" + _tmp363_ = _tmp366_; +#line 4799 "ColorTransformation.c" } else { #line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp366_ = FALSE; -#line 4630 "ColorTransformation.c" + _tmp363_ = FALSE; +#line 4803 "ColorTransformation.c" } #line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self->identity = _tmp366_; + self->identity = _tmp363_; #line 340 "/home/jens/Source/shotwell/src/ColorTransformation.vala" result_matrix_entries = (g_free (result_matrix_entries), NULL); #line 340 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _pixel_transformation_unref0 (transform); -#line 4638 "ColorTransformation.c" +#line 4811 "ColorTransformation.c" } -static void rgb_transformation_real_transform_pixel_hsv (PixelTransformation* base, HSVAnalyticPixel* p, HSVAnalyticPixel* result) { +static void +rgb_transformation_real_transform_pixel_hsv (PixelTransformation* base, + HSVAnalyticPixel* p, + HSVAnalyticPixel* result) +{ RGBTransformation * self; RGBAnalyticPixel _tmp0_ = {0}; RGBAnalyticPixel _tmp1_ = {0}; @@ -4655,11 +4832,13 @@ static void rgb_transformation_real_transform_pixel_hsv (PixelTransformation* ba *result = _tmp2_; #line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return; -#line 4659 "ColorTransformation.c" +#line 4836 "ColorTransformation.c" } -static gboolean rgb_transformation_real_is_identity (PixelTransformation* base) { +static gboolean +rgb_transformation_real_is_identity (PixelTransformation* base) +{ RGBTransformation * self; gboolean result = FALSE; gboolean _tmp0_; @@ -4671,88 +4850,87 @@ static gboolean rgb_transformation_real_is_identity (PixelTransformation* base) result = _tmp0_; #line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 4675 "ColorTransformation.c" +#line 4854 "ColorTransformation.c" } -static PixelTransformation* rgb_transformation_real_copy (PixelTransformation* base) { +static PixelTransformation* +rgb_transformation_real_copy (PixelTransformation* base) +{ RGBTransformation * self; PixelTransformation* result = NULL; RGBTransformation* _result_ = NULL; - PixelTransformationType _tmp0_; - RGBTransformation* _tmp1_; + RGBTransformation* _tmp0_; #line 465 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_TRANSFORMATION, RGBTransformation); #line 466 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = pixel_transformation_get_transformation_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); -#line 466 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = rgb_transformation_new (_tmp0_); + _tmp0_ = rgb_transformation_new (pixel_transformation_get_transformation_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PIXEL_TRANSFORMATION, PixelTransformation))); #line 466 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _result_ = _tmp1_; -#line 4693 "ColorTransformation.c" + _result_ = _tmp0_; +#line 4871 "ColorTransformation.c" { gint i = 0; #line 468 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = 0; -#line 4698 "ColorTransformation.c" +#line 4876 "ColorTransformation.c" { - gboolean _tmp2_ = FALSE; + gboolean _tmp1_ = FALSE; #line 468 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = TRUE; + _tmp1_ = TRUE; #line 468 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 4705 "ColorTransformation.c" - gint _tmp4_; - RGBTransformation* _tmp5_; - gfloat* _tmp6_; - gint _tmp6__length1; - gint _tmp7_; - gfloat* _tmp8_; - gint _tmp8__length1; - gint _tmp9_; +#line 4883 "ColorTransformation.c" + gint _tmp3_; + RGBTransformation* _tmp4_; + gfloat* _tmp5_; + gint _tmp5__length1; + gint _tmp6_; + gfloat* _tmp7_; + gint _tmp7__length1; + gint _tmp8_; + gfloat _tmp9_; gfloat _tmp10_; - gfloat _tmp11_; #line 468 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp2_) { -#line 4718 "ColorTransformation.c" - gint _tmp3_; + if (!_tmp1_) { +#line 4896 "ColorTransformation.c" + gint _tmp2_; #line 468 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = i; + _tmp2_ = i; #line 468 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - i = _tmp3_ + 1; -#line 4724 "ColorTransformation.c" + i = _tmp2_ + 1; +#line 4902 "ColorTransformation.c" } #line 468 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = FALSE; + _tmp1_ = FALSE; #line 468 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = i; + _tmp3_ = i; #line 468 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp4_ < RGB_TRANSFORMATION_MATRIX_SIZE)) { + if (!(_tmp3_ < RGB_TRANSFORMATION_MATRIX_SIZE)) { #line 468 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 4734 "ColorTransformation.c" +#line 4912 "ColorTransformation.c" } #line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = _result_; + _tmp4_ = _result_; #line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = _tmp5_->matrix_entries; + _tmp5_ = _tmp4_->matrix_entries; #line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6__length1 = _tmp5_->matrix_entries_length1; + _tmp5__length1 = _tmp4_->matrix_entries_length1; #line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = i; + _tmp6_ = i; #line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = self->matrix_entries; + _tmp7_ = self->matrix_entries; #line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8__length1 = self->matrix_entries_length1; + _tmp7__length1 = self->matrix_entries_length1; #line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = i; + _tmp8_ = i; #line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = _tmp8_[_tmp9_]; + _tmp9_ = _tmp7_[_tmp8_]; #line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_[_tmp7_] = _tmp10_; + _tmp5_[_tmp6_] = _tmp9_; #line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = _tmp6_[_tmp7_]; -#line 4756 "ColorTransformation.c" + _tmp10_ = _tmp5_[_tmp6_]; +#line 4934 "ColorTransformation.c" } } } @@ -4760,11 +4938,13 @@ static PixelTransformation* rgb_transformation_real_copy (PixelTransformation* b result = G_TYPE_CHECK_INSTANCE_CAST (_result_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation); #line 472 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 4764 "ColorTransformation.c" +#line 4942 "ColorTransformation.c" } -static void rgb_transformation_class_init (RGBTransformationClass * klass) { +static void +rgb_transformation_class_init (RGBTransformationClass * klass) +{ #line 313 "/home/jens/Source/shotwell/src/ColorTransformation.vala" rgb_transformation_parent_class = g_type_class_peek_parent (klass); #line 313 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -4781,18 +4961,22 @@ static void rgb_transformation_class_init (RGBTransformationClass * klass) { ((PixelTransformationClass *) klass)->is_identity = (gboolean (*) (PixelTransformation *)) rgb_transformation_real_is_identity; #line 313 "/home/jens/Source/shotwell/src/ColorTransformation.vala" ((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*) (PixelTransformation *)) rgb_transformation_real_copy; -#line 4785 "ColorTransformation.c" +#line 4965 "ColorTransformation.c" } -static void rgb_transformation_instance_init (RGBTransformation * self) { +static void +rgb_transformation_instance_init (RGBTransformation * self) +{ #line 320 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->identity = TRUE; -#line 4792 "ColorTransformation.c" +#line 4974 "ColorTransformation.c" } -static void rgb_transformation_finalize (PixelTransformation * obj) { +static void +rgb_transformation_finalize (PixelTransformation * obj) +{ RGBTransformation * self; #line 313 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RGB_TRANSFORMATION, RGBTransformation); @@ -4800,11 +4984,13 @@ static void rgb_transformation_finalize (PixelTransformation * obj) { self->matrix_entries = (g_free (self->matrix_entries), NULL); #line 313 "/home/jens/Source/shotwell/src/ColorTransformation.vala" PIXEL_TRANSFORMATION_CLASS (rgb_transformation_parent_class)->finalize (obj); -#line 4804 "ColorTransformation.c" +#line 4988 "ColorTransformation.c" } -GType rgb_transformation_get_type (void) { +GType +rgb_transformation_get_type (void) +{ static volatile gsize rgb_transformation_type_id__volatile = 0; if (g_once_init_enter (&rgb_transformation_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RGBTransformationClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) rgb_transformation_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RGBTransformation), 0, (GInstanceInitFunc) rgb_transformation_instance_init, NULL }; @@ -4816,20 +5002,22 @@ GType rgb_transformation_get_type (void) { } -HSVTransformation* hsv_transformation_construct (GType object_type, PixelTransformationType type) { +HSVTransformation* +hsv_transformation_construct (GType object_type, + PixelTransformationType type) +{ HSVTransformation* self = NULL; - PixelTransformationType _tmp0_; #line 480 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = type; -#line 480 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self = (HSVTransformation*) pixel_transformation_construct (object_type, _tmp0_, PIXEL_FORMAT_HSV); + self = (HSVTransformation*) pixel_transformation_construct (object_type, type, PIXEL_FORMAT_HSV); #line 479 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self; -#line 4829 "ColorTransformation.c" +#line 5015 "ColorTransformation.c" } -static CompositionMode hsv_transformation_real_get_composition_mode (PixelTransformation* base) { +static CompositionMode +hsv_transformation_real_get_composition_mode (PixelTransformation* base) +{ HSVTransformation * self; CompositionMode result = 0; #line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -4838,11 +5026,15 @@ static CompositionMode hsv_transformation_real_get_composition_mode (PixelTransf result = COMPOSITION_MODE_HSV_LOOKUP; #line 484 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 4842 "ColorTransformation.c" +#line 5030 "ColorTransformation.c" } -static void hsv_transformation_real_transform_pixel_rgb (PixelTransformation* base, RGBAnalyticPixel* p, RGBAnalyticPixel* result) { +static void +hsv_transformation_real_transform_pixel_rgb (PixelTransformation* base, + RGBAnalyticPixel* p, + RGBAnalyticPixel* result) +{ HSVTransformation * self; HSVAnalyticPixel _tmp0_ = {0}; HSVAnalyticPixel _tmp1_ = {0}; @@ -4859,109 +5051,104 @@ static void hsv_transformation_real_transform_pixel_rgb (PixelTransformation* ba *result = _tmp2_; #line 488 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return; -#line 4863 "ColorTransformation.c" +#line 5055 "ColorTransformation.c" } -static void hsv_transformation_real_compose_with (PixelTransformation* base, PixelTransformation* other) { +static void +hsv_transformation_real_compose_with (PixelTransformation* base, + PixelTransformation* other) +{ HSVTransformation * self; - PixelTransformation* _tmp0_; - CompositionMode _tmp1_; HSVTransformation* hsv_trans = NULL; - PixelTransformation* _tmp2_; - HSVTransformation* _tmp3_; + HSVTransformation* _tmp0_; #line 491 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HSV_TRANSFORMATION, HSVTransformation); #line 492 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = other; -#line 492 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = pixel_transformation_get_composition_mode (_tmp0_); -#line 492 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp1_ != COMPOSITION_MODE_HSV_LOOKUP) { + if (pixel_transformation_get_composition_mode (other) != COMPOSITION_MODE_HSV_LOOKUP) { #line 493 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_error ("ColorTransformation.vala:493: HSVTransformation: compose_with(): wrong"); -#line 4884 "ColorTransformation.c" +#line 5072 "ColorTransformation.c" } #line 496 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = other; -#line 496 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = _pixel_transformation_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_HSV_TRANSFORMATION, HSVTransformation)); + _tmp0_ = _pixel_transformation_ref0 (G_TYPE_CHECK_INSTANCE_CAST (other, TYPE_HSV_TRANSFORMATION, HSVTransformation)); #line 496 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - hsv_trans = _tmp3_; -#line 4892 "ColorTransformation.c" + hsv_trans = _tmp0_; +#line 5078 "ColorTransformation.c" { gint i = 0; #line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = 0; -#line 4897 "ColorTransformation.c" +#line 5083 "ColorTransformation.c" { - gboolean _tmp4_ = FALSE; + gboolean _tmp1_ = FALSE; #line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = TRUE; + _tmp1_ = TRUE; #line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 4904 "ColorTransformation.c" - gint _tmp6_; +#line 5090 "ColorTransformation.c" + gint _tmp3_; gint idx = 0; - gint _tmp7_; - gfloat _tmp8_; - gint _tmp9_; - HSVTransformation* _tmp10_; - gint _tmp11_; - gfloat _tmp12_; - gfloat _tmp13_; - gfloat _tmp14_; + gint _tmp4_; + gfloat _tmp5_; + gint _tmp6_; + HSVTransformation* _tmp7_; + gint _tmp8_; + gfloat _tmp9_; + gfloat _tmp10_; #line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp4_) { -#line 4917 "ColorTransformation.c" - gint _tmp5_; + if (!_tmp1_) { +#line 5102 "ColorTransformation.c" + gint _tmp2_; #line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = i; + _tmp2_ = i; #line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - i = _tmp5_ + 1; -#line 4923 "ColorTransformation.c" + i = _tmp2_ + 1; +#line 5108 "ColorTransformation.c" } #line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = FALSE; + _tmp1_ = FALSE; #line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = i; + _tmp3_ = i; #line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp6_ < 256)) { + if (!(_tmp3_ < 256)) { #line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 4933 "ColorTransformation.c" +#line 5118 "ColorTransformation.c" } #line 501 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = i; + _tmp4_ = i; #line 501 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = self->remap_table[_tmp7_]; + _tmp5_ = self->remap_table[_tmp4_]; #line 501 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - idx = (gint) (_tmp8_ * 255.0f); -#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = i; + idx = (gint) (_tmp5_ * 255.0f); #line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = hsv_trans; + _tmp6_ = i; #line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = idx; + _tmp7_ = hsv_trans; #line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = _tmp10_->remap_table[_tmp11_]; + _tmp8_ = idx; #line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp13_ = CLAMP (_tmp12_, 0.0f, 1.0f); + _tmp9_ = _tmp7_->remap_table[_tmp8_]; #line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self->remap_table[_tmp9_] = _tmp13_; + self->remap_table[_tmp6_] = CLAMP (_tmp9_, 0.0f, 1.0f); #line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_ = self->remap_table[_tmp9_]; -#line 4955 "ColorTransformation.c" + _tmp10_ = self->remap_table[_tmp6_]; +#line 5138 "ColorTransformation.c" } } } #line 491 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _pixel_transformation_unref0 (hsv_trans); -#line 4961 "ColorTransformation.c" +#line 5144 "ColorTransformation.c" } -static void hsv_transformation_real_transform_pixel_hsv (PixelTransformation* base, HSVAnalyticPixel* pixel, HSVAnalyticPixel* result) { +static void +hsv_transformation_real_transform_pixel_hsv (PixelTransformation* base, + HSVAnalyticPixel* pixel, + HSVAnalyticPixel* result) +{ HSVTransformation * self; gint remap_index = 0; HSVAnalyticPixel _tmp0_; @@ -4971,7 +5158,6 @@ static void hsv_transformation_real_transform_pixel_hsv (PixelTransformation* ba gfloat _tmp3_; HSVAnalyticPixel _tmp4_; gfloat _tmp5_; - gfloat _tmp6_; #line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HSV_TRANSFORMATION, HSVTransformation); #line 507 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -4993,18 +5179,18 @@ static void hsv_transformation_real_transform_pixel_hsv (PixelTransformation* ba #line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp5_ = _tmp4_.light_value; #line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = CLAMP (_tmp5_, 0.0f, 1.0f); -#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _result_.light_value = _tmp6_; + _result_.light_value = CLAMP (_tmp5_, 0.0f, 1.0f); #line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala" *result = _result_; #line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return; -#line 5004 "ColorTransformation.c" +#line 5188 "ColorTransformation.c" } -static void hsv_transformation_class_init (HSVTransformationClass * klass) { +static void +hsv_transformation_class_init (HSVTransformationClass * klass) +{ #line 476 "/home/jens/Source/shotwell/src/ColorTransformation.vala" hsv_transformation_parent_class = g_type_class_peek_parent (klass); #line 476 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -5017,25 +5203,31 @@ static void hsv_transformation_class_init (HSVTransformationClass * klass) { ((PixelTransformationClass *) klass)->compose_with = (void (*) (PixelTransformation *, PixelTransformation*)) hsv_transformation_real_compose_with; #line 476 "/home/jens/Source/shotwell/src/ColorTransformation.vala" ((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*) (PixelTransformation *, HSVAnalyticPixel*, HSVAnalyticPixel*)) hsv_transformation_real_transform_pixel_hsv; -#line 5021 "ColorTransformation.c" +#line 5207 "ColorTransformation.c" } -static void hsv_transformation_instance_init (HSVTransformation * self) { +static void +hsv_transformation_instance_init (HSVTransformation * self) +{ } -static void hsv_transformation_finalize (PixelTransformation * obj) { +static void +hsv_transformation_finalize (PixelTransformation * obj) +{ HSVTransformation * self; #line 476 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HSV_TRANSFORMATION, HSVTransformation); #line 476 "/home/jens/Source/shotwell/src/ColorTransformation.vala" PIXEL_TRANSFORMATION_CLASS (hsv_transformation_parent_class)->finalize (obj); -#line 5035 "ColorTransformation.c" +#line 5225 "ColorTransformation.c" } -GType hsv_transformation_get_type (void) { +GType +hsv_transformation_get_type (void) +{ static volatile gsize hsv_transformation_type_id__volatile = 0; if (g_once_init_enter (&hsv_transformation_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (HSVTransformationClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) hsv_transformation_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (HSVTransformation), 0, (GInstanceInitFunc) hsv_transformation_instance_init, NULL }; @@ -5047,95 +5239,96 @@ GType hsv_transformation_get_type (void) { } -TintTransformation* tint_transformation_construct (GType object_type, gfloat client_param) { +TintTransformation* +tint_transformation_construct (GType object_type, + gfloat client_param) +{ TintTransformation* self = NULL; gfloat _tmp0_; - gfloat _tmp1_; - gfloat _tmp2_; #line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = (TintTransformation*) rgb_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_TINT); #line 529 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = client_param; -#line 529 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = CLAMP (_tmp0_, TINT_TRANSFORMATION_MIN_PARAMETER, TINT_TRANSFORMATION_MAX_PARAMETER); -#line 529 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self->priv->parameter = _tmp1_; + self->priv->parameter = CLAMP (client_param, TINT_TRANSFORMATION_MIN_PARAMETER, TINT_TRANSFORMATION_MAX_PARAMETER); #line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = self->priv->parameter; + _tmp0_ = self->priv->parameter; #line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp2_ != 0.0f) { -#line 5068 "ColorTransformation.c" + if (_tmp0_ != 0.0f) { +#line 5257 "ColorTransformation.c" gfloat adjusted_param = 0.0F; - gfloat _tmp3_; + gfloat _tmp1_; + gfloat _tmp2_; + gfloat* _tmp3_; + gint _tmp3__length1; gfloat _tmp4_; - gfloat* _tmp5_; - gint _tmp5__length1; - gfloat _tmp6_; + gfloat _tmp5_; + gfloat* _tmp6_; + gint _tmp6__length1; gfloat _tmp7_; - gfloat* _tmp8_; - gint _tmp8__length1; - gfloat _tmp9_; + gfloat _tmp8_; + gfloat* _tmp9_; + gint _tmp9__length1; gfloat _tmp10_; - gfloat* _tmp11_; - gint _tmp11__length1; - gfloat _tmp12_; - gfloat _tmp13_; + gfloat _tmp11_; #line 532 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = self->priv->parameter; + _tmp1_ = self->priv->parameter; #line 532 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - adjusted_param = _tmp3_ / TINT_TRANSFORMATION_MAX_PARAMETER; + adjusted_param = _tmp1_ / TINT_TRANSFORMATION_MAX_PARAMETER; #line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = adjusted_param; + _tmp2_ = adjusted_param; #line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - adjusted_param = _tmp4_ * TINT_TRANSFORMATION_INTENSITY_FACTOR; + adjusted_param = _tmp2_ * TINT_TRANSFORMATION_INTENSITY_FACTOR; #line 535 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 535 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp3__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 535 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = adjusted_param; + _tmp4_ = adjusted_param; #line 535 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_[11] -= _tmp6_ / 2; + _tmp3_[11] -= _tmp4_ / 2; #line 535 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = _tmp5_[11]; + _tmp5_ = _tmp3_[11]; #line 536 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 536 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp6__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 536 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = adjusted_param; + _tmp7_ = adjusted_param; #line 536 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_[7] += _tmp9_; + _tmp6_[7] += _tmp7_; #line 536 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = _tmp8_[7]; + _tmp8_ = _tmp6_[7]; #line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp9__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = adjusted_param; + _tmp10_ = adjusted_param; #line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_[3] -= _tmp12_ / 2; + _tmp9_[3] -= _tmp10_ / 2; #line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp13_ = _tmp11_[3]; + _tmp11_ = _tmp9_[3]; #line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala" G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->identity = FALSE; -#line 5124 "ColorTransformation.c" +#line 5313 "ColorTransformation.c" } #line 526 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self; -#line 5128 "ColorTransformation.c" +#line 5317 "ColorTransformation.c" } -TintTransformation* tint_transformation_new (gfloat client_param) { +TintTransformation* +tint_transformation_new (gfloat client_param) +{ #line 526 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return tint_transformation_construct (TYPE_TINT_TRANSFORMATION, client_param); -#line 5135 "ColorTransformation.c" +#line 5326 "ColorTransformation.c" } -gfloat tint_transformation_get_parameter (TintTransformation* self) { +gfloat +tint_transformation_get_parameter (TintTransformation* self) +{ gfloat result = 0.0F; gfloat _tmp0_; #line 544 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -5144,39 +5337,47 @@ gfloat tint_transformation_get_parameter (TintTransformation* self) { result = _tmp0_; #line 544 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 5148 "ColorTransformation.c" +#line 5341 "ColorTransformation.c" } -static void tint_transformation_class_init (TintTransformationClass * klass) { +static void +tint_transformation_class_init (TintTransformationClass * klass) +{ #line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala" tint_transformation_parent_class = g_type_class_peek_parent (klass); #line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala" ((PixelTransformationClass *) klass)->finalize = tint_transformation_finalize; #line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_type_class_add_private (klass, sizeof (TintTransformationPrivate)); -#line 5159 "ColorTransformation.c" +#line 5354 "ColorTransformation.c" } -static void tint_transformation_instance_init (TintTransformation * self) { +static void +tint_transformation_instance_init (TintTransformation * self) +{ #line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->priv = TINT_TRANSFORMATION_GET_PRIVATE (self); -#line 5166 "ColorTransformation.c" +#line 5363 "ColorTransformation.c" } -static void tint_transformation_finalize (PixelTransformation * obj) { +static void +tint_transformation_finalize (PixelTransformation * obj) +{ TintTransformation * self; #line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TINT_TRANSFORMATION, TintTransformation); #line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala" PIXEL_TRANSFORMATION_CLASS (tint_transformation_parent_class)->finalize (obj); -#line 5176 "ColorTransformation.c" +#line 5375 "ColorTransformation.c" } -GType tint_transformation_get_type (void) { +GType +tint_transformation_get_type (void) +{ static volatile gsize tint_transformation_type_id__volatile = 0; if (g_once_init_enter (&tint_transformation_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TintTransformationClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tint_transformation_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TintTransformation), 0, (GInstanceInitFunc) tint_transformation_instance_init, NULL }; @@ -5188,95 +5389,96 @@ GType tint_transformation_get_type (void) { } -TemperatureTransformation* temperature_transformation_construct (GType object_type, gfloat client_parameter) { +TemperatureTransformation* +temperature_transformation_construct (GType object_type, + gfloat client_parameter) +{ TemperatureTransformation* self = NULL; gfloat _tmp0_; - gfloat _tmp1_; - gfloat _tmp2_; #line 556 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = (TemperatureTransformation*) rgb_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_TEMPERATURE); #line 558 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = client_parameter; -#line 558 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = CLAMP (_tmp0_, TEMPERATURE_TRANSFORMATION_MIN_PARAMETER, TEMPERATURE_TRANSFORMATION_MAX_PARAMETER); -#line 558 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self->priv->parameter = _tmp1_; + self->priv->parameter = CLAMP (client_parameter, TEMPERATURE_TRANSFORMATION_MIN_PARAMETER, TEMPERATURE_TRANSFORMATION_MAX_PARAMETER); #line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = self->priv->parameter; + _tmp0_ = self->priv->parameter; #line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp2_ != 0.0f) { -#line 5209 "ColorTransformation.c" + if (_tmp0_ != 0.0f) { +#line 5407 "ColorTransformation.c" gfloat adjusted_param = 0.0F; - gfloat _tmp3_; + gfloat _tmp1_; + gfloat _tmp2_; + gfloat* _tmp3_; + gint _tmp3__length1; gfloat _tmp4_; - gfloat* _tmp5_; - gint _tmp5__length1; - gfloat _tmp6_; + gfloat _tmp5_; + gfloat* _tmp6_; + gint _tmp6__length1; gfloat _tmp7_; - gfloat* _tmp8_; - gint _tmp8__length1; - gfloat _tmp9_; + gfloat _tmp8_; + gfloat* _tmp9_; + gint _tmp9__length1; gfloat _tmp10_; - gfloat* _tmp11_; - gint _tmp11__length1; - gfloat _tmp12_; - gfloat _tmp13_; + gfloat _tmp11_; #line 561 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = self->priv->parameter; + _tmp1_ = self->priv->parameter; #line 561 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - adjusted_param = _tmp3_ / TEMPERATURE_TRANSFORMATION_MAX_PARAMETER; + adjusted_param = _tmp1_ / TEMPERATURE_TRANSFORMATION_MAX_PARAMETER; #line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = adjusted_param; + _tmp2_ = adjusted_param; #line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - adjusted_param = _tmp4_ * TEMPERATURE_TRANSFORMATION_INTENSITY_FACTOR; + adjusted_param = _tmp2_ * TEMPERATURE_TRANSFORMATION_INTENSITY_FACTOR; #line 564 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 564 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp3__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 564 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = adjusted_param; + _tmp4_ = adjusted_param; #line 564 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_[11] -= _tmp6_; + _tmp3_[11] -= _tmp4_; #line 564 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = _tmp5_[11]; + _tmp5_ = _tmp3_[11]; #line 565 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 565 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp6__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 565 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = adjusted_param; + _tmp7_ = adjusted_param; #line 565 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_[7] += _tmp9_ / 2; + _tmp6_[7] += _tmp7_ / 2; #line 565 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = _tmp8_[7]; + _tmp8_ = _tmp6_[7]; #line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp9__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = adjusted_param; + _tmp10_ = adjusted_param; #line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_[3] += _tmp12_ / 2; + _tmp9_[3] += _tmp10_ / 2; #line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp13_ = _tmp11_[3]; + _tmp11_ = _tmp9_[3]; #line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala" G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->identity = FALSE; -#line 5265 "ColorTransformation.c" +#line 5463 "ColorTransformation.c" } #line 555 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self; -#line 5269 "ColorTransformation.c" +#line 5467 "ColorTransformation.c" } -TemperatureTransformation* temperature_transformation_new (gfloat client_parameter) { +TemperatureTransformation* +temperature_transformation_new (gfloat client_parameter) +{ #line 555 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return temperature_transformation_construct (TYPE_TEMPERATURE_TRANSFORMATION, client_parameter); -#line 5276 "ColorTransformation.c" +#line 5476 "ColorTransformation.c" } -gfloat temperature_transformation_get_parameter (TemperatureTransformation* self) { +gfloat +temperature_transformation_get_parameter (TemperatureTransformation* self) +{ gfloat result = 0.0F; gfloat _tmp0_; #line 573 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -5285,39 +5487,47 @@ gfloat temperature_transformation_get_parameter (TemperatureTransformation* self result = _tmp0_; #line 573 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 5289 "ColorTransformation.c" +#line 5491 "ColorTransformation.c" } -static void temperature_transformation_class_init (TemperatureTransformationClass * klass) { +static void +temperature_transformation_class_init (TemperatureTransformationClass * klass) +{ #line 548 "/home/jens/Source/shotwell/src/ColorTransformation.vala" temperature_transformation_parent_class = g_type_class_peek_parent (klass); #line 548 "/home/jens/Source/shotwell/src/ColorTransformation.vala" ((PixelTransformationClass *) klass)->finalize = temperature_transformation_finalize; #line 548 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_type_class_add_private (klass, sizeof (TemperatureTransformationPrivate)); -#line 5300 "ColorTransformation.c" +#line 5504 "ColorTransformation.c" } -static void temperature_transformation_instance_init (TemperatureTransformation * self) { +static void +temperature_transformation_instance_init (TemperatureTransformation * self) +{ #line 548 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->priv = TEMPERATURE_TRANSFORMATION_GET_PRIVATE (self); -#line 5307 "ColorTransformation.c" +#line 5513 "ColorTransformation.c" } -static void temperature_transformation_finalize (PixelTransformation * obj) { +static void +temperature_transformation_finalize (PixelTransformation * obj) +{ TemperatureTransformation * self; #line 548 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation); #line 548 "/home/jens/Source/shotwell/src/ColorTransformation.vala" PIXEL_TRANSFORMATION_CLASS (temperature_transformation_parent_class)->finalize (obj); -#line 5317 "ColorTransformation.c" +#line 5525 "ColorTransformation.c" } -GType temperature_transformation_get_type (void) { +GType +temperature_transformation_get_type (void) +{ static volatile gsize temperature_transformation_type_id__volatile = 0; if (g_once_init_enter (&temperature_transformation_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TemperatureTransformationClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) temperature_transformation_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TemperatureTransformation), 0, (GInstanceInitFunc) temperature_transformation_instance_init, NULL }; @@ -5329,218 +5539,219 @@ GType temperature_transformation_get_type (void) { } -SaturationTransformation* saturation_transformation_construct (GType object_type, gfloat client_parameter) { +SaturationTransformation* +saturation_transformation_construct (GType object_type, + gfloat client_parameter) +{ SaturationTransformation* self = NULL; gfloat _tmp0_; - gfloat _tmp1_; - gfloat _tmp2_; #line 584 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = (SaturationTransformation*) rgb_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_SATURATION); #line 586 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = client_parameter; -#line 586 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = CLAMP (_tmp0_, SATURATION_TRANSFORMATION_MIN_PARAMETER, SATURATION_TRANSFORMATION_MAX_PARAMETER); -#line 586 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self->priv->parameter = _tmp1_; + self->priv->parameter = CLAMP (client_parameter, SATURATION_TRANSFORMATION_MIN_PARAMETER, SATURATION_TRANSFORMATION_MAX_PARAMETER); #line 588 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = self->priv->parameter; + _tmp0_ = self->priv->parameter; #line 588 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp2_ != 0.0f) { -#line 5350 "ColorTransformation.c" + if (_tmp0_ != 0.0f) { +#line 5557 "ColorTransformation.c" gfloat adjusted_param = 0.0F; - gfloat _tmp3_; - gfloat _tmp4_; + gfloat _tmp1_; + gfloat _tmp2_; gfloat one_third = 0.0F; - gfloat* _tmp5_; - gint _tmp5__length1; + gfloat* _tmp3_; + gint _tmp3__length1; + gfloat _tmp4_; + gfloat _tmp5_; gfloat _tmp6_; gfloat _tmp7_; - gfloat _tmp8_; + gfloat* _tmp8_; + gint _tmp8__length1; gfloat _tmp9_; - gfloat* _tmp10_; - gint _tmp10__length1; + gfloat _tmp10_; gfloat _tmp11_; - gfloat _tmp12_; + gfloat* _tmp12_; + gint _tmp12__length1; gfloat _tmp13_; - gfloat* _tmp14_; - gint _tmp14__length1; + gfloat _tmp14_; gfloat _tmp15_; - gfloat _tmp16_; + gfloat* _tmp16_; + gint _tmp16__length1; gfloat _tmp17_; - gfloat* _tmp18_; - gint _tmp18__length1; + gfloat _tmp18_; gfloat _tmp19_; - gfloat _tmp20_; + gfloat* _tmp20_; + gint _tmp20__length1; gfloat _tmp21_; - gfloat* _tmp22_; - gint _tmp22__length1; + gfloat _tmp22_; gfloat _tmp23_; gfloat _tmp24_; - gfloat _tmp25_; + gfloat* _tmp25_; + gint _tmp25__length1; gfloat _tmp26_; - gfloat* _tmp27_; - gint _tmp27__length1; + gfloat _tmp27_; gfloat _tmp28_; - gfloat _tmp29_; + gfloat* _tmp29_; + gint _tmp29__length1; gfloat _tmp30_; - gfloat* _tmp31_; - gint _tmp31__length1; + gfloat _tmp31_; gfloat _tmp32_; - gfloat _tmp33_; + gfloat* _tmp33_; + gint _tmp33__length1; gfloat _tmp34_; - gfloat* _tmp35_; - gint _tmp35__length1; + gfloat _tmp35_; gfloat _tmp36_; - gfloat _tmp37_; + gfloat* _tmp37_; + gint _tmp37__length1; gfloat _tmp38_; - gfloat* _tmp39_; - gint _tmp39__length1; + gfloat _tmp39_; gfloat _tmp40_; gfloat _tmp41_; - gfloat _tmp42_; - gfloat _tmp43_; #line 589 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = self->priv->parameter; + _tmp1_ = self->priv->parameter; #line 589 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - adjusted_param = _tmp3_ / SATURATION_TRANSFORMATION_MAX_PARAMETER; + adjusted_param = _tmp1_ / SATURATION_TRANSFORMATION_MAX_PARAMETER; #line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = adjusted_param; + _tmp2_ = adjusted_param; #line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - adjusted_param = _tmp4_ + 1.0f; + adjusted_param = _tmp2_ + 1.0f; #line 592 "/home/jens/Source/shotwell/src/ColorTransformation.vala" one_third = 0.3333333f; #line 594 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 594 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp3__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 594 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = adjusted_param; + _tmp4_ = adjusted_param; #line 594 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = one_third; + _tmp5_ = one_third; #line 594 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = adjusted_param; + _tmp6_ = adjusted_param; #line 594 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_[0] = ((1.0f - _tmp6_) * _tmp7_) + _tmp8_; + _tmp3_[0] = ((1.0f - _tmp4_) * _tmp5_) + _tmp6_; #line 594 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = _tmp5_[0]; + _tmp7_ = _tmp3_[0]; #line 596 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 596 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp8__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 596 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = adjusted_param; + _tmp9_ = adjusted_param; #line 596 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = one_third; + _tmp10_ = one_third; #line 596 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_[1] = (1.0f - _tmp11_) * _tmp12_; + _tmp8_[1] = (1.0f - _tmp9_) * _tmp10_; #line 596 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp13_ = _tmp10_[1]; + _tmp11_ = _tmp8_[1]; #line 597 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 597 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp12__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 597 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp15_ = adjusted_param; + _tmp13_ = adjusted_param; #line 597 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp16_ = one_third; + _tmp14_ = one_third; #line 597 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_[2] = (1.0f - _tmp15_) * _tmp16_; + _tmp12_[2] = (1.0f - _tmp13_) * _tmp14_; #line 597 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp17_ = _tmp14_[2]; + _tmp15_ = _tmp12_[2]; #line 599 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 599 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp16__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 599 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp19_ = adjusted_param; + _tmp17_ = adjusted_param; #line 599 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp20_ = one_third; + _tmp18_ = one_third; #line 599 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18_[4] = (1.0f - _tmp19_) * _tmp20_; + _tmp16_[4] = (1.0f - _tmp17_) * _tmp18_; #line 599 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp21_ = _tmp18_[4]; + _tmp19_ = _tmp16_[4]; #line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp22__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp20__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp23_ = adjusted_param; + _tmp21_ = adjusted_param; #line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp24_ = one_third; + _tmp22_ = one_third; #line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp25_ = adjusted_param; + _tmp23_ = adjusted_param; #line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp22_[5] = ((1.0f - _tmp23_) * _tmp24_) + _tmp25_; + _tmp20_[5] = ((1.0f - _tmp21_) * _tmp22_) + _tmp23_; #line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp26_ = _tmp22_[5]; + _tmp24_ = _tmp20_[5]; #line 602 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 602 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp27__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp25__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 602 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp28_ = adjusted_param; + _tmp26_ = adjusted_param; #line 602 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp29_ = one_third; + _tmp27_ = one_third; #line 602 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp27_[6] = (1.0f - _tmp28_) * _tmp29_; + _tmp25_[6] = (1.0f - _tmp26_) * _tmp27_; #line 602 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp30_ = _tmp27_[6]; + _tmp28_ = _tmp25_[6]; #line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp31_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp29_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp31__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp29__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp32_ = adjusted_param; + _tmp30_ = adjusted_param; #line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp33_ = one_third; + _tmp31_ = one_third; #line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp31_[8] = (1.0f - _tmp32_) * _tmp33_; + _tmp29_[8] = (1.0f - _tmp30_) * _tmp31_; #line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp34_ = _tmp31_[8]; + _tmp32_ = _tmp29_[8]; #line 605 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 605 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp35__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp33__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 605 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp36_ = adjusted_param; + _tmp34_ = adjusted_param; #line 605 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp37_ = one_third; + _tmp35_ = one_third; #line 605 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp35_[9] = (1.0f - _tmp36_) * _tmp37_; + _tmp33_[9] = (1.0f - _tmp34_) * _tmp35_; #line 605 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp38_ = _tmp35_[9]; + _tmp36_ = _tmp33_[9]; #line 606 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp39_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 606 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp39__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp37__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 606 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp40_ = adjusted_param; + _tmp38_ = adjusted_param; #line 606 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp41_ = one_third; + _tmp39_ = one_third; #line 606 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp42_ = adjusted_param; + _tmp40_ = adjusted_param; #line 606 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp39_[10] = ((1.0f - _tmp40_) * _tmp41_) + _tmp42_; + _tmp37_[10] = ((1.0f - _tmp38_) * _tmp39_) + _tmp40_; #line 606 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp43_ = _tmp39_[10]; + _tmp41_ = _tmp37_[10]; #line 609 "/home/jens/Source/shotwell/src/ColorTransformation.vala" G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->identity = FALSE; -#line 5529 "ColorTransformation.c" +#line 5736 "ColorTransformation.c" } #line 583 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self; -#line 5533 "ColorTransformation.c" +#line 5740 "ColorTransformation.c" } -SaturationTransformation* saturation_transformation_new (gfloat client_parameter) { +SaturationTransformation* +saturation_transformation_new (gfloat client_parameter) +{ #line 583 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return saturation_transformation_construct (TYPE_SATURATION_TRANSFORMATION, client_parameter); -#line 5540 "ColorTransformation.c" +#line 5749 "ColorTransformation.c" } -gfloat saturation_transformation_get_parameter (SaturationTransformation* self) { +gfloat +saturation_transformation_get_parameter (SaturationTransformation* self) +{ gfloat result = 0.0F; gfloat _tmp0_; #line 614 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -5549,39 +5760,47 @@ gfloat saturation_transformation_get_parameter (SaturationTransformation* self) result = _tmp0_; #line 614 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 5553 "ColorTransformation.c" +#line 5764 "ColorTransformation.c" } -static void saturation_transformation_class_init (SaturationTransformationClass * klass) { +static void +saturation_transformation_class_init (SaturationTransformationClass * klass) +{ #line 577 "/home/jens/Source/shotwell/src/ColorTransformation.vala" saturation_transformation_parent_class = g_type_class_peek_parent (klass); #line 577 "/home/jens/Source/shotwell/src/ColorTransformation.vala" ((PixelTransformationClass *) klass)->finalize = saturation_transformation_finalize; #line 577 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_type_class_add_private (klass, sizeof (SaturationTransformationPrivate)); -#line 5564 "ColorTransformation.c" +#line 5777 "ColorTransformation.c" } -static void saturation_transformation_instance_init (SaturationTransformation * self) { +static void +saturation_transformation_instance_init (SaturationTransformation * self) +{ #line 577 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->priv = SATURATION_TRANSFORMATION_GET_PRIVATE (self); -#line 5571 "ColorTransformation.c" +#line 5786 "ColorTransformation.c" } -static void saturation_transformation_finalize (PixelTransformation * obj) { +static void +saturation_transformation_finalize (PixelTransformation * obj) +{ SaturationTransformation * self; #line 577 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation); #line 577 "/home/jens/Source/shotwell/src/ColorTransformation.vala" PIXEL_TRANSFORMATION_CLASS (saturation_transformation_parent_class)->finalize (obj); -#line 5581 "ColorTransformation.c" +#line 5798 "ColorTransformation.c" } -GType saturation_transformation_get_type (void) { +GType +saturation_transformation_get_type (void) +{ static volatile gsize saturation_transformation_type_id__volatile = 0; if (g_once_init_enter (&saturation_transformation_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SaturationTransformationClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saturation_transformation_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SaturationTransformation), 0, (GInstanceInitFunc) saturation_transformation_instance_init, NULL }; @@ -5593,90 +5812,91 @@ GType saturation_transformation_get_type (void) { } -ExposureTransformation* exposure_transformation_construct (GType object_type, gfloat client_parameter) { +ExposureTransformation* +exposure_transformation_construct (GType object_type, + gfloat client_parameter) +{ ExposureTransformation* self = NULL; gfloat _tmp0_; - gfloat _tmp1_; - gfloat _tmp2_; #line 625 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = (ExposureTransformation*) rgb_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_EXPOSURE); #line 627 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = client_parameter; -#line 627 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = CLAMP (_tmp0_, EXPOSURE_TRANSFORMATION_MIN_PARAMETER, EXPOSURE_TRANSFORMATION_MAX_PARAMETER); -#line 627 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self->priv->parameter = _tmp1_; + self->priv->parameter = CLAMP (client_parameter, EXPOSURE_TRANSFORMATION_MIN_PARAMETER, EXPOSURE_TRANSFORMATION_MAX_PARAMETER); #line 629 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = self->priv->parameter; + _tmp0_ = self->priv->parameter; #line 629 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp2_ != 0.0f) { -#line 5614 "ColorTransformation.c" + if (_tmp0_ != 0.0f) { +#line 5830 "ColorTransformation.c" gfloat adjusted_param = 0.0F; + gfloat _tmp1_; + gfloat* _tmp2_; + gint _tmp2__length1; gfloat _tmp3_; - gfloat* _tmp4_; - gint _tmp4__length1; - gfloat _tmp5_; + gfloat _tmp4_; + gfloat* _tmp5_; + gint _tmp5__length1; gfloat _tmp6_; - gfloat* _tmp7_; - gint _tmp7__length1; - gfloat _tmp8_; + gfloat _tmp7_; + gfloat* _tmp8_; + gint _tmp8__length1; gfloat _tmp9_; - gfloat* _tmp10_; - gint _tmp10__length1; - gfloat _tmp11_; - gfloat _tmp12_; + gfloat _tmp10_; #line 631 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = self->priv->parameter; + _tmp1_ = self->priv->parameter; #line 631 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - adjusted_param = ((_tmp3_ + 16.0f) / 32.0f) + 0.5f; + adjusted_param = ((_tmp1_ + 16.0f) / 32.0f) + 0.5f; #line 633 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 633 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp2__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 633 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = adjusted_param; + _tmp3_ = adjusted_param; #line 633 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_[0] = _tmp5_; + _tmp2_[0] = _tmp3_; #line 633 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = _tmp4_[0]; + _tmp4_ = _tmp2_[0]; #line 634 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 634 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp5__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 634 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = adjusted_param; + _tmp6_ = adjusted_param; #line 634 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_[5] = _tmp8_; + _tmp5_[5] = _tmp6_; #line 634 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = _tmp7_[5]; + _tmp7_ = _tmp5_[5]; #line 635 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 635 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp8__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 635 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = adjusted_param; + _tmp9_ = adjusted_param; #line 635 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_[10] = _tmp11_; + _tmp8_[10] = _tmp9_; #line 635 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = _tmp10_[10]; + _tmp10_ = _tmp8_[10]; #line 637 "/home/jens/Source/shotwell/src/ColorTransformation.vala" G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->identity = FALSE; -#line 5665 "ColorTransformation.c" +#line 5881 "ColorTransformation.c" } #line 624 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self; -#line 5669 "ColorTransformation.c" +#line 5885 "ColorTransformation.c" } -ExposureTransformation* exposure_transformation_new (gfloat client_parameter) { +ExposureTransformation* +exposure_transformation_new (gfloat client_parameter) +{ #line 624 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return exposure_transformation_construct (TYPE_EXPOSURE_TRANSFORMATION, client_parameter); -#line 5676 "ColorTransformation.c" +#line 5894 "ColorTransformation.c" } -gfloat exposure_transformation_get_parameter (ExposureTransformation* self) { +gfloat +exposure_transformation_get_parameter (ExposureTransformation* self) +{ gfloat result = 0.0F; gfloat _tmp0_; #line 642 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -5685,39 +5905,47 @@ gfloat exposure_transformation_get_parameter (ExposureTransformation* self) { result = _tmp0_; #line 642 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 5689 "ColorTransformation.c" +#line 5909 "ColorTransformation.c" } -static void exposure_transformation_class_init (ExposureTransformationClass * klass) { +static void +exposure_transformation_class_init (ExposureTransformationClass * klass) +{ #line 618 "/home/jens/Source/shotwell/src/ColorTransformation.vala" exposure_transformation_parent_class = g_type_class_peek_parent (klass); #line 618 "/home/jens/Source/shotwell/src/ColorTransformation.vala" ((PixelTransformationClass *) klass)->finalize = exposure_transformation_finalize; #line 618 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_type_class_add_private (klass, sizeof (ExposureTransformationPrivate)); -#line 5700 "ColorTransformation.c" +#line 5922 "ColorTransformation.c" } -static void exposure_transformation_instance_init (ExposureTransformation * self) { +static void +exposure_transformation_instance_init (ExposureTransformation * self) +{ #line 618 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->priv = EXPOSURE_TRANSFORMATION_GET_PRIVATE (self); -#line 5707 "ColorTransformation.c" +#line 5931 "ColorTransformation.c" } -static void exposure_transformation_finalize (PixelTransformation * obj) { +static void +exposure_transformation_finalize (PixelTransformation * obj) +{ ExposureTransformation * self; #line 618 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation); #line 618 "/home/jens/Source/shotwell/src/ColorTransformation.vala" PIXEL_TRANSFORMATION_CLASS (exposure_transformation_parent_class)->finalize (obj); -#line 5717 "ColorTransformation.c" +#line 5943 "ColorTransformation.c" } -GType exposure_transformation_get_type (void) { +GType +exposure_transformation_get_type (void) +{ static volatile gsize exposure_transformation_type_id__volatile = 0; if (g_once_init_enter (&exposure_transformation_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ExposureTransformationClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) exposure_transformation_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ExposureTransformation), 0, (GInstanceInitFunc) exposure_transformation_instance_init, NULL }; @@ -5729,144 +5957,145 @@ GType exposure_transformation_get_type (void) { } -ContrastTransformation* contrast_transformation_construct (GType object_type, gfloat client_parameter) { +ContrastTransformation* +contrast_transformation_construct (GType object_type, + gfloat client_parameter) +{ ContrastTransformation* self = NULL; gfloat _tmp0_; - gfloat _tmp1_; - gfloat _tmp2_; #line 655 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = (ContrastTransformation*) rgb_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_CONTRAST); #line 657 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = client_parameter; -#line 657 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = CLAMP (_tmp0_, CONTRAST_TRANSFORMATION_MIN_PARAMETER, CONTRAST_TRANSFORMATION_MAX_PARAMETER); -#line 657 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self->priv->parameter = _tmp1_; + self->priv->parameter = CLAMP (client_parameter, CONTRAST_TRANSFORMATION_MIN_PARAMETER, CONTRAST_TRANSFORMATION_MAX_PARAMETER); #line 659 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = self->priv->parameter; + _tmp0_ = self->priv->parameter; #line 659 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp2_ != 0.0f) { -#line 5750 "ColorTransformation.c" + if (_tmp0_ != 0.0f) { +#line 5975 "ColorTransformation.c" gfloat contrast_adjustment = 0.0F; - gfloat _tmp3_; + gfloat _tmp1_; gfloat component_coefficient = 0.0F; - gfloat _tmp4_; + gfloat _tmp2_; gfloat component_offset = 0.0F; + gfloat _tmp3_; + gfloat* _tmp4_; + gint _tmp4__length1; gfloat _tmp5_; - gfloat* _tmp6_; - gint _tmp6__length1; - gfloat _tmp7_; + gfloat _tmp6_; + gfloat* _tmp7_; + gint _tmp7__length1; gfloat _tmp8_; - gfloat* _tmp9_; - gint _tmp9__length1; - gfloat _tmp10_; + gfloat _tmp9_; + gfloat* _tmp10_; + gint _tmp10__length1; gfloat _tmp11_; - gfloat* _tmp12_; - gint _tmp12__length1; - gfloat _tmp13_; + gfloat _tmp12_; + gfloat* _tmp13_; + gint _tmp13__length1; gfloat _tmp14_; - gfloat* _tmp15_; - gint _tmp15__length1; - gfloat _tmp16_; + gfloat _tmp15_; + gfloat* _tmp16_; + gint _tmp16__length1; gfloat _tmp17_; - gfloat* _tmp18_; - gint _tmp18__length1; - gfloat _tmp19_; + gfloat _tmp18_; + gfloat* _tmp19_; + gint _tmp19__length1; gfloat _tmp20_; - gfloat* _tmp21_; - gint _tmp21__length1; - gfloat _tmp22_; - gfloat _tmp23_; + gfloat _tmp21_; #line 661 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = self->priv->parameter; + _tmp1_ = self->priv->parameter; #line 661 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - contrast_adjustment = (_tmp3_ / 16.0f) * CONTRAST_TRANSFORMATION_MAX_CONTRAST_ADJUSTMENT; + contrast_adjustment = (_tmp1_ / 16.0f) * CONTRAST_TRANSFORMATION_MAX_CONTRAST_ADJUSTMENT; #line 662 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = contrast_adjustment; + _tmp2_ = contrast_adjustment; #line 662 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - component_coefficient = 1.0f + _tmp4_; + component_coefficient = 1.0f + _tmp2_; #line 663 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = contrast_adjustment; + _tmp3_ = contrast_adjustment; #line 663 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - component_offset = _tmp5_ / (-2.0f); + component_offset = _tmp3_ / (-2.0f); #line 665 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 665 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp4__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 665 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = component_coefficient; + _tmp5_ = component_coefficient; #line 665 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_[0] = _tmp7_; + _tmp4_[0] = _tmp5_; #line 665 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = _tmp6_[0]; + _tmp6_ = _tmp4_[0]; #line 666 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 666 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp7__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 666 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = component_coefficient; + _tmp8_ = component_coefficient; #line 666 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_[5] = _tmp10_; + _tmp7_[5] = _tmp8_; #line 666 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = _tmp9_[5]; + _tmp9_ = _tmp7_[5]; #line 667 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 667 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp10__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 667 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp13_ = component_coefficient; + _tmp11_ = component_coefficient; #line 667 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_[10] = _tmp13_; + _tmp10_[10] = _tmp11_; #line 667 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_ = _tmp12_[10]; + _tmp12_ = _tmp10_[10]; #line 669 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 669 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp15__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp13__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 669 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp16_ = component_offset; + _tmp14_ = component_offset; #line 669 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp15_[3] = _tmp16_; + _tmp13_[3] = _tmp14_; #line 669 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp17_ = _tmp15_[3]; + _tmp15_ = _tmp13_[3]; #line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp16__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp19_ = component_offset; + _tmp17_ = component_offset; #line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18_[7] = _tmp19_; + _tmp16_[7] = _tmp17_; #line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp20_ = _tmp18_[7]; + _tmp18_ = _tmp16_[7]; #line 671 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; + _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries; #line 671 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp21__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; + _tmp19__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1; #line 671 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp22_ = component_offset; + _tmp20_ = component_offset; #line 671 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp21_[11] = _tmp22_; + _tmp19_[11] = _tmp20_; #line 671 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp23_ = _tmp21_[11]; + _tmp21_ = _tmp19_[11]; #line 673 "/home/jens/Source/shotwell/src/ColorTransformation.vala" G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->identity = FALSE; -#line 5855 "ColorTransformation.c" +#line 6080 "ColorTransformation.c" } #line 654 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self; -#line 5859 "ColorTransformation.c" +#line 6084 "ColorTransformation.c" } -ContrastTransformation* contrast_transformation_new (gfloat client_parameter) { +ContrastTransformation* +contrast_transformation_new (gfloat client_parameter) +{ #line 654 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return contrast_transformation_construct (TYPE_CONTRAST_TRANSFORMATION, client_parameter); -#line 5866 "ColorTransformation.c" +#line 6093 "ColorTransformation.c" } -gfloat contrast_transformation_get_parameter (ContrastTransformation* self) { +gfloat +contrast_transformation_get_parameter (ContrastTransformation* self) +{ gfloat result = 0.0F; gfloat _tmp0_; #line 678 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -5875,39 +6104,47 @@ gfloat contrast_transformation_get_parameter (ContrastTransformation* self) { result = _tmp0_; #line 678 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 5879 "ColorTransformation.c" +#line 6108 "ColorTransformation.c" } -static void contrast_transformation_class_init (ContrastTransformationClass * klass) { +static void +contrast_transformation_class_init (ContrastTransformationClass * klass) +{ #line 646 "/home/jens/Source/shotwell/src/ColorTransformation.vala" contrast_transformation_parent_class = g_type_class_peek_parent (klass); #line 646 "/home/jens/Source/shotwell/src/ColorTransformation.vala" ((PixelTransformationClass *) klass)->finalize = contrast_transformation_finalize; #line 646 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_type_class_add_private (klass, sizeof (ContrastTransformationPrivate)); -#line 5890 "ColorTransformation.c" +#line 6121 "ColorTransformation.c" } -static void contrast_transformation_instance_init (ContrastTransformation * self) { +static void +contrast_transformation_instance_init (ContrastTransformation * self) +{ #line 646 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->priv = CONTRAST_TRANSFORMATION_GET_PRIVATE (self); -#line 5897 "ColorTransformation.c" +#line 6130 "ColorTransformation.c" } -static void contrast_transformation_finalize (PixelTransformation * obj) { +static void +contrast_transformation_finalize (PixelTransformation * obj) +{ ContrastTransformation * self; #line 646 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation); #line 646 "/home/jens/Source/shotwell/src/ColorTransformation.vala" PIXEL_TRANSFORMATION_CLASS (contrast_transformation_parent_class)->finalize (obj); -#line 5907 "ColorTransformation.c" +#line 6142 "ColorTransformation.c" } -GType contrast_transformation_get_type (void) { +GType +contrast_transformation_get_type (void) +{ static volatile gsize contrast_transformation_type_id__volatile = 0; if (g_once_init_enter (&contrast_transformation_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ContrastTransformationClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) contrast_transformation_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ContrastTransformation), 0, (GInstanceInitFunc) contrast_transformation_instance_init, NULL }; @@ -5919,31 +6156,39 @@ GType contrast_transformation_get_type (void) { } -PixelTransformer* pixel_transformer_construct (GType object_type) { +PixelTransformer* +pixel_transformer_construct (GType object_type) +{ PixelTransformer* self = NULL; #line 688 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = (PixelTransformer*) g_type_create_instance (object_type); #line 688 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self; -#line 5929 "ColorTransformation.c" +#line 6168 "ColorTransformation.c" } -PixelTransformer* pixel_transformer_new (void) { +PixelTransformer* +pixel_transformer_new (void) +{ #line 688 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return pixel_transformer_construct (TYPE_PIXEL_TRANSFORMER); -#line 5936 "ColorTransformation.c" +#line 6177 "ColorTransformation.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self ? g_object_ref (self) : NULL; -#line 5943 "ColorTransformation.c" +#line 6186 "ColorTransformation.c" } -PixelTransformer* pixel_transformer_copy (PixelTransformer* self) { +PixelTransformer* +pixel_transformer_copy (PixelTransformer* self) +{ PixelTransformer* result = NULL; PixelTransformer* clone = NULL; PixelTransformer* _tmp0_; @@ -5951,7 +6196,7 @@ PixelTransformer* pixel_transformer_copy (PixelTransformer* self) { _tmp0_ = pixel_transformer_new (); #line 692 "/home/jens/Source/shotwell/src/ColorTransformation.vala" clone = _tmp0_; -#line 5955 "ColorTransformation.c" +#line 6200 "ColorTransformation.c" { GeeArrayList* _transformation_list = NULL; GeeArrayList* _tmp1_; @@ -5979,7 +6224,7 @@ PixelTransformer* pixel_transformer_copy (PixelTransformer* self) { _transformation_index = -1; #line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 5983 "ColorTransformation.c" +#line 6228 "ColorTransformation.c" gint _tmp6_; gint _tmp7_; gint _tmp8_; @@ -6002,7 +6247,7 @@ PixelTransformer* pixel_transformer_copy (PixelTransformer* self) { if (!(_tmp7_ < _tmp8_)) { #line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 6006 "ColorTransformation.c" +#line 6251 "ColorTransformation.c" } #line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp9_ = _transformation_list; @@ -6022,21 +6267,23 @@ PixelTransformer* pixel_transformer_copy (PixelTransformer* self) { gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_); #line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _pixel_transformation_unref0 (transformation); -#line 6026 "ColorTransformation.c" +#line 6271 "ColorTransformation.c" } #line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _g_object_unref0 (_transformation_list); -#line 6030 "ColorTransformation.c" +#line 6275 "ColorTransformation.c" } #line 697 "/home/jens/Source/shotwell/src/ColorTransformation.vala" result = clone; #line 697 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 6036 "ColorTransformation.c" +#line 6281 "ColorTransformation.c" } -static void pixel_transformer_build_optimized_transformations (PixelTransformer* self) { +static void +pixel_transformer_build_optimized_transformations (PixelTransformer* self) +{ GeeArrayList* _tmp0_; gint _tmp1_; gint _tmp2_; @@ -6060,19 +6307,19 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer* pre_trans = NULL; #line 704 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->optimized_slots_used = 0; -#line 6064 "ColorTransformation.c" +#line 6311 "ColorTransformation.c" { gint i = 0; #line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = 0; -#line 6069 "ColorTransformation.c" +#line 6316 "ColorTransformation.c" { gboolean _tmp4_ = FALSE; #line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp4_ = TRUE; #line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 6076 "ColorTransformation.c" +#line 6323 "ColorTransformation.c" gint _tmp6_; GeeArrayList* _tmp7_; gint _tmp8_; @@ -6082,22 +6329,20 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer* gint _tmp11_; gpointer _tmp12_; PixelTransformation* _tmp13_; - gboolean _tmp14_; PixelTransformation* this_trans = NULL; - PixelTransformation* _tmp15_; - CompositionMode _tmp16_; - gboolean _tmp21_ = FALSE; - gboolean _tmp22_ = FALSE; - PixelTransformation* _tmp23_; + PixelTransformation* _tmp14_; + gboolean _tmp19_ = FALSE; + gboolean _tmp20_ = FALSE; + PixelTransformation* _tmp21_; #line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!_tmp4_) { -#line 6095 "ColorTransformation.c" +#line 6340 "ColorTransformation.c" gint _tmp5_; #line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp5_ = i; #line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = _tmp5_ + 1; -#line 6101 "ColorTransformation.c" +#line 6346 "ColorTransformation.c" } #line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp4_ = FALSE; @@ -6113,7 +6358,7 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer* if (!(_tmp6_ < _tmp9_)) { #line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 6117 "ColorTransformation.c" +#line 6362 "ColorTransformation.c" } #line 706 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp10_ = self->priv->transformations; @@ -6126,204 +6371,195 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer* #line 708 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp13_ = trans; #line 708 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_ = pixel_transformation_is_identity (_tmp13_); -#line 708 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp14_) { + if (pixel_transformation_is_identity (_tmp13_)) { #line 709 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _pixel_transformation_unref0 (trans); #line 709 "/home/jens/Source/shotwell/src/ColorTransformation.vala" continue; -#line 6137 "ColorTransformation.c" +#line 6380 "ColorTransformation.c" } #line 711 "/home/jens/Source/shotwell/src/ColorTransformation.vala" this_trans = NULL; #line 712 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp15_ = trans; + _tmp14_ = trans; #line 712 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp16_ = pixel_transformation_get_composition_mode (_tmp15_); -#line 712 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp16_ == COMPOSITION_MODE_NONE) { -#line 6147 "ColorTransformation.c" - PixelTransformation* _tmp17_; - PixelTransformation* _tmp18_; + if (pixel_transformation_get_composition_mode (_tmp14_) == COMPOSITION_MODE_NONE) { +#line 6388 "ColorTransformation.c" + PixelTransformation* _tmp15_; + PixelTransformation* _tmp16_; #line 713 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp17_ = trans; + _tmp15_ = trans; #line 713 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18_ = _pixel_transformation_ref0 (_tmp17_); + _tmp16_ = _pixel_transformation_ref0 (_tmp15_); #line 713 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _pixel_transformation_unref0 (this_trans); #line 713 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - this_trans = _tmp18_; -#line 6158 "ColorTransformation.c" + this_trans = _tmp16_; +#line 6399 "ColorTransformation.c" } else { - PixelTransformation* _tmp19_; - PixelTransformation* _tmp20_; + PixelTransformation* _tmp17_; + PixelTransformation* _tmp18_; #line 715 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp19_ = trans; + _tmp17_ = trans; #line 715 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp20_ = pixel_transformation_copy (_tmp19_); + _tmp18_ = pixel_transformation_copy (_tmp17_); #line 715 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _pixel_transformation_unref0 (this_trans); #line 715 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - this_trans = _tmp20_; -#line 6170 "ColorTransformation.c" + this_trans = _tmp18_; +#line 6411 "ColorTransformation.c" } #line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp23_ = pre_trans; -#line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp23_ != NULL) { -#line 6176 "ColorTransformation.c" - PixelTransformation* _tmp24_; - CompositionMode _tmp25_; + _tmp21_ = pre_trans; #line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp24_ = this_trans; + if (_tmp21_ != NULL) { +#line 6417 "ColorTransformation.c" + PixelTransformation* _tmp22_; #line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp25_ = pixel_transformation_get_composition_mode (_tmp24_); + _tmp22_ = this_trans; #line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp22_ = _tmp25_ != COMPOSITION_MODE_NONE; -#line 6185 "ColorTransformation.c" + _tmp20_ = pixel_transformation_get_composition_mode (_tmp22_) != COMPOSITION_MODE_NONE; +#line 6423 "ColorTransformation.c" } else { #line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp22_ = FALSE; -#line 6189 "ColorTransformation.c" + _tmp20_ = FALSE; +#line 6427 "ColorTransformation.c" } #line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp22_) { -#line 6193 "ColorTransformation.c" - PixelTransformation* _tmp26_; - CompositionMode _tmp27_; - PixelTransformation* _tmp28_; - CompositionMode _tmp29_; -#line 718 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp26_ = this_trans; -#line 718 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp27_ = pixel_transformation_get_composition_mode (_tmp26_); + if (_tmp20_) { +#line 6431 "ColorTransformation.c" + PixelTransformation* _tmp23_; + PixelTransformation* _tmp24_; #line 718 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp28_ = pre_trans; + _tmp23_ = this_trans; #line 718 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp29_ = pixel_transformation_get_composition_mode (_tmp28_); + _tmp24_ = pre_trans; #line 718 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp21_ = _tmp27_ == _tmp29_; -#line 6208 "ColorTransformation.c" + _tmp19_ = pixel_transformation_get_composition_mode (_tmp23_) == pixel_transformation_get_composition_mode (_tmp24_); +#line 6440 "ColorTransformation.c" } else { #line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp21_ = FALSE; -#line 6212 "ColorTransformation.c" + _tmp19_ = FALSE; +#line 6444 "ColorTransformation.c" } #line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp21_) { -#line 6216 "ColorTransformation.c" - PixelTransformation* _tmp30_; - PixelTransformation* _tmp31_; + if (_tmp19_) { +#line 6448 "ColorTransformation.c" + PixelTransformation* _tmp25_; + PixelTransformation* _tmp26_; #line 719 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp30_ = pre_trans; + _tmp25_ = pre_trans; #line 719 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp31_ = this_trans; + _tmp26_ = this_trans; #line 719 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_compose_with (_tmp30_, _tmp31_); -#line 6225 "ColorTransformation.c" + pixel_transformation_compose_with (_tmp25_, _tmp26_); +#line 6457 "ColorTransformation.c" } else { - PixelTransformation** _tmp32_; - gint _tmp32__length1; - gint _tmp33_; - PixelTransformation* _tmp34_; - PixelTransformation* _tmp35_; - PixelTransformation* _tmp36_; - PixelTransformation* _tmp37_; - PixelTransformation* _tmp38_; + PixelTransformation** _tmp27_; + gint _tmp27__length1; + gint _tmp28_; + PixelTransformation* _tmp29_; + PixelTransformation* _tmp30_; + PixelTransformation* _tmp31_; + PixelTransformation* _tmp32_; + PixelTransformation* _tmp33_; #line 721 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp32_ = self->optimized_transformations; + _tmp27_ = self->optimized_transformations; #line 721 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp32__length1 = self->optimized_transformations_length1; + _tmp27__length1 = self->optimized_transformations_length1; #line 721 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp33_ = self->optimized_slots_used; + _tmp28_ = self->optimized_slots_used; #line 721 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self->optimized_slots_used = _tmp33_ + 1; + self->optimized_slots_used = _tmp28_ + 1; #line 721 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp34_ = this_trans; + _tmp29_ = this_trans; #line 721 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp35_ = _pixel_transformation_ref0 (_tmp34_); + _tmp30_ = _pixel_transformation_ref0 (_tmp29_); #line 721 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _pixel_transformation_unref0 (_tmp32_[_tmp33_]); + _pixel_transformation_unref0 (_tmp27_[_tmp28_]); #line 721 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp32_[_tmp33_] = _tmp35_; + _tmp27_[_tmp28_] = _tmp30_; #line 721 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp36_ = _tmp32_[_tmp33_]; + _tmp31_ = _tmp27_[_tmp28_]; #line 722 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp37_ = this_trans; + _tmp32_ = this_trans; #line 722 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp38_ = _pixel_transformation_ref0 (_tmp37_); + _tmp33_ = _pixel_transformation_ref0 (_tmp32_); #line 722 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _pixel_transformation_unref0 (pre_trans); #line 722 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pre_trans = _tmp38_; -#line 6261 "ColorTransformation.c" + pre_trans = _tmp33_; +#line 6493 "ColorTransformation.c" } #line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _pixel_transformation_unref0 (this_trans); #line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _pixel_transformation_unref0 (trans); -#line 6267 "ColorTransformation.c" +#line 6499 "ColorTransformation.c" } } } #line 700 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _pixel_transformation_unref0 (pre_trans); -#line 6273 "ColorTransformation.c" +#line 6505 "ColorTransformation.c" } -void pixel_transformer_attach_transformation (PixelTransformer* self, PixelTransformation* trans) { +void +pixel_transformer_attach_transformation (PixelTransformer* self, + PixelTransformation* trans) +{ GeeArrayList* _tmp0_; - PixelTransformation* _tmp1_; #line 733 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp0_ = self->priv->transformations; #line 733 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = trans; -#line 733 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), trans); #line 734 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->optimized_transformations = (_vala_array_free (self->optimized_transformations, self->optimized_transformations_length1, (GDestroyNotify) pixel_transformation_unref), NULL); #line 734 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->optimized_transformations = NULL; #line 734 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->optimized_transformations_length1 = 0; -#line 6292 "ColorTransformation.c" +#line 6524 "ColorTransformation.c" } -void pixel_transformer_detach_transformation (PixelTransformer* self, PixelTransformation* victim) { +void +pixel_transformer_detach_transformation (PixelTransformer* self, + PixelTransformation* victim) +{ GeeArrayList* _tmp0_; - PixelTransformation* _tmp1_; #line 740 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp0_ = self->priv->transformations; #line 740 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = victim; -#line 740 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), victim); #line 741 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->optimized_transformations = (_vala_array_free (self->optimized_transformations, self->optimized_transformations_length1, (GDestroyNotify) pixel_transformation_unref), NULL); #line 741 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->optimized_transformations = NULL; #line 741 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->optimized_transformations_length1 = 0; -#line 6311 "ColorTransformation.c" +#line 6543 "ColorTransformation.c" } -void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTransformation* old_trans, PixelTransformation* new_trans) { +void +pixel_transformer_replace_transformation (PixelTransformer* self, + PixelTransformation* old_trans, + PixelTransformation* new_trans) +{ { gint i = 0; #line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = 0; -#line 6320 "ColorTransformation.c" +#line 6556 "ColorTransformation.c" { gboolean _tmp0_ = FALSE; #line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp0_ = TRUE; #line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 6327 "ColorTransformation.c" +#line 6563 "ColorTransformation.c" gint _tmp2_; GeeArrayList* _tmp3_; gint _tmp4_; @@ -6332,17 +6568,16 @@ void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTran gint _tmp7_; gpointer _tmp8_; PixelTransformation* _tmp9_; - PixelTransformation* _tmp10_; - gboolean _tmp11_; + gboolean _tmp10_; #line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!_tmp0_) { -#line 6340 "ColorTransformation.c" +#line 6575 "ColorTransformation.c" gint _tmp1_; #line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp1_ = i; #line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = _tmp1_ + 1; -#line 6346 "ColorTransformation.c" +#line 6581 "ColorTransformation.c" } #line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp0_ = FALSE; @@ -6358,7 +6593,7 @@ void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTran if (!(_tmp2_ < _tmp5_)) { #line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 6362 "ColorTransformation.c" +#line 6597 "ColorTransformation.c" } #line 749 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp6_ = self->priv->transformations; @@ -6369,25 +6604,20 @@ void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTran #line 749 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp9_ = (PixelTransformation*) _tmp8_; #line 749 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = old_trans; -#line 749 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = _tmp9_ == _tmp10_; + _tmp10_ = _tmp9_ == old_trans; #line 749 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _pixel_transformation_unref0 (_tmp9_); #line 749 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp11_) { -#line 6380 "ColorTransformation.c" - GeeArrayList* _tmp12_; - gint _tmp13_; - PixelTransformation* _tmp14_; -#line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = self->priv->transformations; + if (_tmp10_) { +#line 6613 "ColorTransformation.c" + GeeArrayList* _tmp11_; + gint _tmp12_; #line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp13_ = i; + _tmp11_ = self->priv->transformations; #line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_ = new_trans; + _tmp12_ = i; #line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - gee_abstract_list_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp13_, _tmp14_); + gee_abstract_list_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp12_, new_trans); #line 752 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->optimized_transformations = (_vala_array_free (self->optimized_transformations, self->optimized_transformations_length1, (GDestroyNotify) pixel_transformation_unref), NULL); #line 752 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -6396,7 +6626,7 @@ void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTran self->optimized_transformations_length1 = 0; #line 753 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return; -#line 6400 "ColorTransformation.c" +#line 6630 "ColorTransformation.c" } } } @@ -6404,41 +6634,40 @@ void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTran #line 756 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_error ("ColorTransformation.vala:756: %s", "PixelTransformer: replace_transformation( ): old_trans is not present " \ "in " "transformation collection"); -#line 6407 "ColorTransformation.c" +#line 6637 "ColorTransformation.c" } -void pixel_transformer_transform_pixbuf (PixelTransformer* self, GdkPixbuf* pixbuf, GCancellable* cancellable) { - GdkPixbuf* _tmp0_; - GdkPixbuf* _tmp1_; - GCancellable* _tmp2_; +void +pixel_transformer_transform_pixbuf (PixelTransformer* self, + GdkPixbuf* pixbuf, + GCancellable* cancellable) +{ #line 761 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = pixbuf; -#line 761 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = pixbuf; -#line 761 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = cancellable; -#line 761 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformer_transform_to_other_pixbuf (self, _tmp0_, _tmp1_, _tmp2_, -1); -#line 6423 "ColorTransformation.c" + pixel_transformer_transform_to_other_pixbuf (self, pixbuf, pixbuf, cancellable, -1); +#line 6648 "ColorTransformation.c" } -static Block1Data* block1_data_ref (Block1Data* _data1_) { +static Block1Data* +block1_data_ref (Block1Data* _data1_) +{ #line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_atomic_int_inc (&_data1_->_ref_count_); #line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return _data1_; -#line 6432 "ColorTransformation.c" +#line 6659 "ColorTransformation.c" } -static void block1_data_unref (void * _userdata_) { +static void +block1_data_unref (void * _userdata_) +{ Block1Data* _data1_; _data1_ = (Block1Data*) _userdata_; #line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { -#line 6441 "ColorTransformation.c" +#line 6670 "ColorTransformation.c" PixelTransformer* self; #line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = _data1_->self; @@ -6446,26 +6675,30 @@ static void block1_data_unref (void * _userdata_) { _pixel_transformer_unref0 (self); #line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_slice_free (Block1Data, _data1_); -#line 6449 "ColorTransformation.c" +#line 6678 "ColorTransformation.c" } } -static Block2Data* block2_data_ref (Block2Data* _data2_) { +static Block2Data* +block2_data_ref (Block2Data* _data2_) +{ #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_atomic_int_inc (&_data2_->_ref_count_); #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return _data2_; -#line 6459 "ColorTransformation.c" +#line 6690 "ColorTransformation.c" } -static void block2_data_unref (void * _userdata_) { +static void +block2_data_unref (void * _userdata_) +{ Block2Data* _data2_; _data2_ = (Block2Data*) _userdata_; #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { -#line 6468 "ColorTransformation.c" +#line 6701 "ColorTransformation.c" PixelTransformer* self; #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = _data2_->_data1_->self; @@ -6475,12 +6708,14 @@ static void block2_data_unref (void * _userdata_) { _data2_->_data1_ = NULL; #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_slice_free (Block2Data, _data2_); -#line 6478 "ColorTransformation.c" +#line 6711 "ColorTransformation.c" } } -static void* _____lambda5_ (Block2Data* _data2_) { +static void* +_____lambda5_ (Block2Data* _data2_) +{ Block1Data* _data1_; PixelTransformer* self; void* result = NULL; @@ -6497,7 +6732,7 @@ static void* _____lambda5_ (Block2Data* _data2_) { _tmp1_ = _data1_->dest_width; #line 788 "/home/jens/Source/shotwell/src/ColorTransformation.vala" cache_pixel_ticker = (_tmp0_ * _tmp1_) * 3; -#line 6500 "ColorTransformation.c" +#line 6735 "ColorTransformation.c" { guint j = 0U; guint _tmp2_; @@ -6505,14 +6740,14 @@ static void* _____lambda5_ (Block2Data* _data2_) { _tmp2_ = _data2_->row; #line 789 "/home/jens/Source/shotwell/src/ColorTransformation.vala" j = _tmp2_; -#line 6508 "ColorTransformation.c" +#line 6743 "ColorTransformation.c" { gboolean _tmp3_ = FALSE; #line 789 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp3_ = TRUE; #line 789 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 6515 "ColorTransformation.c" +#line 6750 "ColorTransformation.c" guint _tmp5_; guint _tmp6_; guint row_start_index = 0U; @@ -6524,13 +6759,13 @@ static void* _____lambda5_ (Block2Data* _data2_) { gint _tmp11_; #line 789 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!_tmp3_) { -#line 6527 "ColorTransformation.c" +#line 6762 "ColorTransformation.c" guint _tmp4_; #line 789 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp4_ = j; #line 789 "/home/jens/Source/shotwell/src/ColorTransformation.vala" j = _tmp4_ + 1; -#line 6533 "ColorTransformation.c" +#line 6768 "ColorTransformation.c" } #line 789 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp3_ = FALSE; @@ -6542,7 +6777,7 @@ static void* _____lambda5_ (Block2Data* _data2_) { if (!(_tmp5_ < _tmp6_)) { #line 789 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 6545 "ColorTransformation.c" +#line 6780 "ColorTransformation.c" } #line 790 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp7_ = j; @@ -6558,7 +6793,7 @@ static void* _____lambda5_ (Block2Data* _data2_) { _tmp11_ = _data1_->dest_num_channels; #line 791 "/home/jens/Source/shotwell/src/ColorTransformation.vala" row_end_index = _tmp9_ + (_tmp10_ * _tmp11_); -#line 6561 "ColorTransformation.c" +#line 6796 "ColorTransformation.c" { guint i = 0U; guint _tmp12_; @@ -6566,14 +6801,14 @@ static void* _____lambda5_ (Block2Data* _data2_) { _tmp12_ = row_start_index; #line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = _tmp12_; -#line 6569 "ColorTransformation.c" +#line 6804 "ColorTransformation.c" { gboolean _tmp13_ = FALSE; #line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp13_ = TRUE; #line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 6576 "ColorTransformation.c" +#line 6811 "ColorTransformation.c" guint _tmp16_; guint _tmp17_; RGBAnalyticPixel pixel = {0}; @@ -6612,7 +6847,7 @@ static void* _____lambda5_ (Block2Data* _data2_) { guchar _tmp44_; #line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!_tmp13_) { -#line 6615 "ColorTransformation.c" +#line 6850 "ColorTransformation.c" guint _tmp14_; gint _tmp15_; #line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -6621,7 +6856,7 @@ static void* _____lambda5_ (Block2Data* _data2_) { _tmp15_ = _data1_->dest_num_channels; #line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = _tmp14_ + _tmp15_; -#line 6624 "ColorTransformation.c" +#line 6859 "ColorTransformation.c" } #line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp13_ = FALSE; @@ -6633,7 +6868,7 @@ static void* _____lambda5_ (Block2Data* _data2_) { if (!(_tmp16_ < _tmp17_)) { #line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 6636 "ColorTransformation.c" +#line 6871 "ColorTransformation.c" } #line 793 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp18_ = _data1_->cache; @@ -6713,7 +6948,7 @@ static void* _____lambda5_ (Block2Data* _data2_) { _tmp40_[_tmp41_ + 2] = (guchar) (_tmp43_ * 255.0f); #line 804 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp44_ = _tmp40_[_tmp41_ + 2]; -#line 6716 "ColorTransformation.c" +#line 6951 "ColorTransformation.c" } } } @@ -6724,57 +6959,54 @@ static void* _____lambda5_ (Block2Data* _data2_) { result = NULL; #line 808 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 6727 "ColorTransformation.c" +#line 6962 "ColorTransformation.c" } -static gpointer ______lambda5__gthread_func (gpointer self) { +static gpointer +______lambda5__gthread_func (gpointer self) +{ gpointer result; result = _____lambda5_ (self); #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala" block2_data_unref (self); #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 6738 "ColorTransformation.c" +#line 6975 "ColorTransformation.c" } -static gpointer _g_thread_ref0 (gpointer self) { +static gpointer +_g_thread_ref0 (gpointer self) +{ #line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self ? g_thread_ref (self) : NULL; -#line 6745 "ColorTransformation.c" +#line 6984 "ColorTransformation.c" } -void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pixel_cache, int* fp_pixel_cache_length1, GdkPixbuf* dest) { +void +pixel_transformer_transform_from_fp (PixelTransformer* self, + gfloat** fp_pixel_cache, + int* fp_pixel_cache_length1, + GdkPixbuf* dest) +{ Block1Data* _data1_; PixelTransformation** _tmp0_; gint _tmp0__length1; - GdkPixbuf* _tmp1_; - gint _tmp2_; gint dest_height = 0; - GdkPixbuf* _tmp3_; - gint _tmp4_; - GdkPixbuf* _tmp5_; - gint _tmp6_; - GdkPixbuf* _tmp7_; - gint _tmp8_; - GdkPixbuf* _tmp9_; - guint8* _tmp10_; + guint8* _tmp1_; gint jobs = 0; - guint _tmp11_; guint slice_length = 0U; - gint _tmp12_; - gint _tmp13_; + gint _tmp2_; + gint _tmp3_; GThread** threads = NULL; - gint _tmp17_; - GThread** _tmp18_; + gint _tmp7_; + GThread** _tmp8_; gint threads_length1; gint _threads_size_; - gfloat* _tmp19_; - gint _tmp19__length1; - GThread** _tmp34_; - gint _tmp34__length1; + GThread** _tmp22_; + gint _tmp22__length1; #line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _data1_ = g_slice_new0 (Block1Data); #line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -6789,115 +7021,90 @@ void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pi if (_tmp0_ == NULL) { #line 766 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixel_transformer_build_optimized_transformations (self); -#line 6792 "ColorTransformation.c" +#line 7024 "ColorTransformation.c" } #line 768 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = dest; -#line 768 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = gdk_pixbuf_get_width (_tmp1_); -#line 768 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _data1_->dest_width = _tmp2_; -#line 769 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = dest; + _data1_->dest_width = gdk_pixbuf_get_width (dest); #line 769 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = gdk_pixbuf_get_height (_tmp3_); -#line 769 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - dest_height = _tmp4_; -#line 770 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = dest; + dest_height = gdk_pixbuf_get_height (dest); #line 770 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = gdk_pixbuf_get_n_channels (_tmp5_); -#line 770 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _data1_->dest_num_channels = _tmp6_; -#line 771 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = dest; + _data1_->dest_num_channels = gdk_pixbuf_get_n_channels (dest); #line 771 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = gdk_pixbuf_get_rowstride (_tmp7_); -#line 771 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _data1_->dest_rowstride = _tmp8_; -#line 772 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = dest; + _data1_->dest_rowstride = gdk_pixbuf_get_rowstride (dest); #line 772 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = gdk_pixbuf_get_pixels (_tmp9_); + _tmp1_ = gdk_pixbuf_get_pixels (dest); #line 772 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _data1_->dest_pixels = _tmp10_; + _data1_->dest_pixels = _tmp1_; #line 772 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _data1_->dest_pixels_length1 = -1; #line 772 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _data1_->_dest_pixels_size_ = _data1_->dest_pixels_length1; #line 774 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = g_get_num_processors (); -#line 774 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - jobs = ((gint) _tmp11_) - 1; + jobs = ((gint) g_get_num_processors ()) - 1; #line 776 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = dest_height; + _tmp2_ = dest_height; #line 776 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - slice_length = (guint) _tmp12_; + slice_length = (guint) _tmp2_; #line 777 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp13_ = jobs; + _tmp3_ = jobs; #line 777 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp13_ > 0) { -#line 6840 "ColorTransformation.c" - gint _tmp14_; - gint _tmp15_; - gint _tmp16_; + if (_tmp3_ > 0) { +#line 7052 "ColorTransformation.c" + gint _tmp4_; + gint _tmp5_; + gint _tmp6_; #line 778 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_ = dest_height; + _tmp4_ = dest_height; #line 778 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp15_ = jobs; + _tmp5_ = jobs; #line 778 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp16_ = jobs; + _tmp6_ = jobs; #line 778 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - slice_length = (guint) ((_tmp14_ + (_tmp15_ - 1)) / _tmp16_); -#line 6852 "ColorTransformation.c" + slice_length = (guint) ((_tmp4_ + (_tmp5_ - 1)) / _tmp6_); +#line 7064 "ColorTransformation.c" } #line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp17_ = jobs; + _tmp7_ = jobs; #line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18_ = g_new0 (GThread*, _tmp17_ + 1); + _tmp8_ = g_new0 (GThread*, _tmp7_ + 1); #line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - threads = _tmp18_; + threads = _tmp8_; #line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - threads_length1 = _tmp17_; + threads_length1 = _tmp7_; #line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _threads_size_ = threads_length1; #line 783 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp19_ = *fp_pixel_cache; -#line 783 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp19__length1 = *fp_pixel_cache_length1; + _data1_->cache = *fp_pixel_cache; #line 783 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _data1_->cache = _tmp19_; -#line 783 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _data1_->cache_length1 = _tmp19__length1; + _data1_->cache_length1 = *fp_pixel_cache_length1; #line 783 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _data1_->_cache_size_ = _data1_->cache_length1; -#line 6874 "ColorTransformation.c" +#line 7082 "ColorTransformation.c" { gint job = 0; #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" job = 0; -#line 6879 "ColorTransformation.c" +#line 7087 "ColorTransformation.c" { - gboolean _tmp20_ = FALSE; + gboolean _tmp9_ = FALSE; #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp20_ = TRUE; + _tmp9_ = TRUE; #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 6886 "ColorTransformation.c" +#line 7094 "ColorTransformation.c" Block2Data* _data2_; - gint _tmp22_; - gint _tmp23_; - gint _tmp24_; - guint _tmp25_; - guint _tmp26_; - guint _tmp27_; - gint _tmp28_; - guint _tmp29_; - GThread** _tmp30_; - gint _tmp30__length1; - gint _tmp31_; - GThread* _tmp32_; - GThread* _tmp33_; + gint _tmp11_; + gint _tmp12_; + gint _tmp13_; + guint _tmp14_; + guint _tmp15_; + guint _tmp16_; + gint _tmp17_; + GThread** _tmp18_; + gint _tmp18__length1; + gint _tmp19_; + GThread* _tmp20_; + GThread* _tmp21_; #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _data2_ = g_slice_new0 (Block2Data); #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -6905,105 +7112,103 @@ void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pi #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _data2_->_data1_ = block1_data_ref (_data1_); #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp20_) { -#line 6909 "ColorTransformation.c" - gint _tmp21_; + if (!_tmp9_) { +#line 7116 "ColorTransformation.c" + gint _tmp10_; #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp21_ = job; + _tmp10_ = job; #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - job = _tmp21_ + 1; -#line 6915 "ColorTransformation.c" + job = _tmp10_ + 1; +#line 7122 "ColorTransformation.c" } #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp20_ = FALSE; + _tmp9_ = FALSE; #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp22_ = job; + _tmp11_ = job; #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp23_ = jobs; + _tmp12_ = jobs; #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp22_ < _tmp23_)) { + if (!(_tmp11_ < _tmp12_)) { #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" block2_data_unref (_data2_); #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _data2_ = NULL; #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 6931 "ColorTransformation.c" +#line 7138 "ColorTransformation.c" } #line 785 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp24_ = job; + _tmp13_ = job; #line 785 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp25_ = slice_length; + _tmp14_ = slice_length; #line 785 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _data2_->row = _tmp24_ * _tmp25_; -#line 786 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp26_ = _data2_->row; + _data2_->row = _tmp13_ * _tmp14_; #line 786 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp27_ = slice_length; + _tmp15_ = _data2_->row; #line 786 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp28_ = dest_height; + _tmp16_ = slice_length; #line 786 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp29_ = CLAMP (_tmp26_ + _tmp27_, (guint) 0, (guint) _tmp28_); + _tmp17_ = dest_height; #line 786 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _data2_->slice_height = _tmp29_; + _data2_->slice_height = CLAMP (_tmp15_ + _tmp16_, (guint) 0, (guint) _tmp17_); #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp30_ = threads; + _tmp18_ = threads; #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp30__length1 = threads_length1; + _tmp18__length1 = threads_length1; #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp31_ = job; + _tmp19_ = job; #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp32_ = g_thread_new ("shotwell-worker", ______lambda5__gthread_func, block2_data_ref (_data2_)); + _tmp20_ = g_thread_new ("shotwell-worker", ______lambda5__gthread_func, block2_data_ref (_data2_)); #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _g_thread_unref0 (_tmp30_[_tmp31_]); + _g_thread_unref0 (_tmp18_[_tmp19_]); #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp30_[_tmp31_] = _tmp32_; + _tmp18_[_tmp19_] = _tmp20_; #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp33_ = _tmp30_[_tmp31_]; + _tmp21_ = _tmp18_[_tmp19_]; #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" block2_data_unref (_data2_); #line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _data2_ = NULL; -#line 6967 "ColorTransformation.c" +#line 7172 "ColorTransformation.c" } } } #line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp34_ = threads; + _tmp22_ = threads; #line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp34__length1 = threads_length1; -#line 6975 "ColorTransformation.c" + _tmp22__length1 = threads_length1; +#line 7180 "ColorTransformation.c" { GThread** thread_collection = NULL; gint thread_collection_length1 = 0; gint _thread_collection_size_ = 0; gint thread_it = 0; #line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - thread_collection = _tmp34_; + thread_collection = _tmp22_; #line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - thread_collection_length1 = _tmp34__length1; + thread_collection_length1 = _tmp22__length1; #line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - for (thread_it = 0; thread_it < _tmp34__length1; thread_it = thread_it + 1) { -#line 6987 "ColorTransformation.c" - GThread* _tmp35_; + for (thread_it = 0; thread_it < _tmp22__length1; thread_it = thread_it + 1) { +#line 7192 "ColorTransformation.c" + GThread* _tmp23_; GThread* thread = NULL; #line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp35_ = _g_thread_ref0 (thread_collection[thread_it]); + _tmp23_ = _g_thread_ref0 (thread_collection[thread_it]); #line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - thread = _tmp35_; -#line 6994 "ColorTransformation.c" + thread = _tmp23_; +#line 7199 "ColorTransformation.c" { - GThread* _tmp36_; - GThread* _tmp37_; + GThread* _tmp24_; + GThread* _tmp25_; #line 813 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp36_ = thread; + _tmp24_ = thread; #line 813 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp37_ = _g_thread_ref0 (_tmp36_); + _tmp25_ = _g_thread_ref0 (_tmp24_); #line 813 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - g_thread_join (_tmp37_); + g_thread_join (_tmp25_); #line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _g_thread_unref0 (thread); -#line 7006 "ColorTransformation.c" +#line 7211 "ColorTransformation.c" } } } @@ -7013,25 +7218,29 @@ void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pi block1_data_unref (_data1_); #line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _data1_ = NULL; -#line 7016 "ColorTransformation.c" +#line 7221 "ColorTransformation.c" } -static Block3Data* block3_data_ref (Block3Data* _data3_) { +static Block3Data* +block3_data_ref (Block3Data* _data3_) +{ #line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_atomic_int_inc (&_data3_->_ref_count_); #line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return _data3_; -#line 7025 "ColorTransformation.c" +#line 7232 "ColorTransformation.c" } -static void block3_data_unref (void * _userdata_) { +static void +block3_data_unref (void * _userdata_) +{ Block3Data* _data3_; _data3_ = (Block3Data*) _userdata_; #line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { -#line 7034 "ColorTransformation.c" +#line 7243 "ColorTransformation.c" PixelTransformer* self; #line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = _data3_->self; @@ -7041,26 +7250,30 @@ static void block3_data_unref (void * _userdata_) { _pixel_transformer_unref0 (self); #line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_slice_free (Block3Data, _data3_); -#line 7044 "ColorTransformation.c" +#line 7253 "ColorTransformation.c" } } -static Block4Data* block4_data_ref (Block4Data* _data4_) { +static Block4Data* +block4_data_ref (Block4Data* _data4_) +{ #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_atomic_int_inc (&_data4_->_ref_count_); #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return _data4_; -#line 7054 "ColorTransformation.c" +#line 7265 "ColorTransformation.c" } -static void block4_data_unref (void * _userdata_) { +static void +block4_data_unref (void * _userdata_) +{ Block4Data* _data4_; _data4_ = (Block4Data*) _userdata_; #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) { -#line 7063 "ColorTransformation.c" +#line 7276 "ColorTransformation.c" PixelTransformer* self; #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = _data4_->_data3_->self; @@ -7070,12 +7283,14 @@ static void block4_data_unref (void * _userdata_) { _data4_->_data3_ = NULL; #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_slice_free (Block4Data, _data4_); -#line 7073 "ColorTransformation.c" +#line 7286 "ColorTransformation.c" } } -static void* _____lambda4_ (Block4Data* _data4_) { +static void* +_____lambda4_ (Block4Data* _data4_) +{ Block3Data* _data3_; PixelTransformer* self; void* result = NULL; @@ -7083,7 +7298,7 @@ static void* _____lambda4_ (Block4Data* _data4_) { _data3_ = _data4_->_data3_; #line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = _data3_->self; -#line 7086 "ColorTransformation.c" +#line 7301 "ColorTransformation.c" { guint j = 0U; guint _tmp0_; @@ -7091,14 +7306,14 @@ static void* _____lambda4_ (Block4Data* _data4_) { _tmp0_ = _data4_->row; #line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala" j = _tmp0_; -#line 7094 "ColorTransformation.c" +#line 7309 "ColorTransformation.c" { gboolean _tmp1_ = FALSE; #line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp1_ = TRUE; #line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 7101 "ColorTransformation.c" +#line 7316 "ColorTransformation.c" guint _tmp3_; guint _tmp4_; guint _tmp5_; @@ -7110,16 +7325,15 @@ static void* _____lambda4_ (Block4Data* _data4_) { guchar* _tmp10_; gint _tmp10__length1; gboolean _tmp11_ = FALSE; - GCancellable* _tmp12_; #line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!_tmp1_) { -#line 7116 "ColorTransformation.c" +#line 7330 "ColorTransformation.c" guint _tmp2_; #line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp2_ = j; #line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala" j = _tmp2_ + 1; -#line 7122 "ColorTransformation.c" +#line 7336 "ColorTransformation.c" } #line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp1_ = FALSE; @@ -7131,7 +7345,7 @@ static void* _____lambda4_ (Block4Data* _data4_) { if (!(_tmp3_ < _tmp4_)) { #line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 7134 "ColorTransformation.c" +#line 7348 "ColorTransformation.c" } #line 856 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp5_ = j; @@ -7152,29 +7366,20 @@ static void* _____lambda4_ (Block4Data* _data4_) { #line 856 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixel_transformer_apply_transformation (self, _tmp5_, _tmp6_, _tmp7_, _tmp8_, _tmp9_, _tmp9__length1, _tmp10_, _tmp10__length1); #line 859 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = _data3_->cancellable; -#line 859 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp12_ != NULL) { -#line 7158 "ColorTransformation.c" - GCancellable* _tmp13_; - gboolean _tmp14_; -#line 859 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp13_ = _data3_->cancellable; + if (_data3_->cancellable != NULL) { #line 859 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_ = g_cancellable_is_cancelled (_tmp13_); -#line 859 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = _tmp14_; -#line 7167 "ColorTransformation.c" + _tmp11_ = g_cancellable_is_cancelled (_data3_->cancellable); +#line 7372 "ColorTransformation.c" } else { #line 859 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp11_ = FALSE; -#line 7171 "ColorTransformation.c" +#line 7376 "ColorTransformation.c" } #line 859 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (_tmp11_) { #line 860 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 7177 "ColorTransformation.c" +#line 7382 "ColorTransformation.c" } } } @@ -7183,72 +7388,60 @@ static void* _____lambda4_ (Block4Data* _data4_) { result = NULL; #line 864 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 7186 "ColorTransformation.c" +#line 7391 "ColorTransformation.c" } -static gpointer ______lambda4__gthread_func (gpointer self) { +static gpointer +______lambda4__gthread_func (gpointer self) +{ gpointer result; result = _____lambda4_ (self); #line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala" block4_data_unref (self); #line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 7197 "ColorTransformation.c" +#line 7404 "ColorTransformation.c" } -void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPixbuf* source, GdkPixbuf* dest, GCancellable* cancellable, gint jobs) { +void +pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, + GdkPixbuf* source, + GdkPixbuf* dest, + GCancellable* cancellable, + gint jobs) +{ Block3Data* _data3_; GCancellable* _tmp0_; - GCancellable* _tmp1_; - GdkPixbuf* _tmp2_; + gint _tmp1_; + gint _tmp2_; gint _tmp3_; gint _tmp4_; - GdkPixbuf* _tmp5_; + gint _tmp5_; gint _tmp6_; gint _tmp7_; - GdkPixbuf* _tmp8_; + gint _tmp8_; gint _tmp9_; gint _tmp10_; - GdkPixbuf* _tmp11_; + gint _tmp11_; gint _tmp12_; - gint _tmp13_; - GdkPixbuf* _tmp14_; - gint _tmp15_; - gint _tmp16_; - GdkPixbuf* _tmp17_; - gint _tmp18_; - gint _tmp19_; - PixelTransformation** _tmp20_; - gint _tmp20__length1; - GdkPixbuf* _tmp21_; - gint _tmp22_; - GdkPixbuf* _tmp23_; - gint _tmp24_; + PixelTransformation** _tmp13_; + gint _tmp13__length1; gint width = 0; - GdkPixbuf* _tmp25_; - gint _tmp26_; gint height = 0; - GdkPixbuf* _tmp27_; - gint _tmp28_; - gint _tmp29_; - gint _tmp30_; - GdkPixbuf* _tmp31_; - guint8* _tmp32_; - GdkPixbuf* _tmp33_; - guint8* _tmp34_; - gint _tmp35_; + gint _tmp14_; + gint _tmp15_; + guint8* _tmp16_; + guint8* _tmp17_; guint slice_length = 0U; - gint _tmp37_; - gint _tmp38_; + gint _tmp18_; GThread** threads = NULL; - gint _tmp42_; - GThread** _tmp43_; + GThread** _tmp20_; gint threads_length1; gint _threads_size_; - GThread** _tmp58_; - gint _tmp58__length1; + GThread** _tmp33_; + gint _tmp33__length1; #line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _data3_ = g_slice_new0 (Block3Data); #line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -7256,201 +7449,149 @@ void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPix #line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _data3_->self = pixel_transformer_ref (self); #line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = cancellable; -#line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (cancellable); #line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _g_object_unref0 (_data3_->cancellable); #line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _data3_->cancellable = _tmp1_; + _data3_->cancellable = _tmp0_; #line 819 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = source; -#line 819 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = gdk_pixbuf_get_width (_tmp2_); -#line 819 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = _tmp3_; + _tmp1_ = gdk_pixbuf_get_width (source); #line 819 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = dest; + _tmp2_ = _tmp1_; #line 819 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = gdk_pixbuf_get_width (_tmp5_); + _tmp3_ = gdk_pixbuf_get_width (dest); #line 819 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 819 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp4_ != _tmp7_) { + if (_tmp2_ != _tmp4_) { #line 820 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_error ("ColorTransformation.vala:820: PixelTransformer: source and destination" \ " pixbufs must have the same width"); -#line 7282 "ColorTransformation.c" +#line 7469 "ColorTransformation.c" } #line 822 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = source; -#line 822 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = gdk_pixbuf_get_height (_tmp8_); -#line 822 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = _tmp9_; + _tmp5_ = gdk_pixbuf_get_height (source); #line 822 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = dest; + _tmp6_ = _tmp5_; #line 822 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = gdk_pixbuf_get_height (_tmp11_); + _tmp7_ = gdk_pixbuf_get_height (dest); #line 822 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp13_ = _tmp12_; + _tmp8_ = _tmp7_; #line 822 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp10_ != _tmp13_) { + if (_tmp6_ != _tmp8_) { #line 823 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_error ("ColorTransformation.vala:823: PixelTransformer: source and destination" \ " pixbufs must have the same height"); -#line 7300 "ColorTransformation.c" +#line 7483 "ColorTransformation.c" } #line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_ = source; -#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp15_ = gdk_pixbuf_get_n_channels (_tmp14_); + _tmp9_ = gdk_pixbuf_get_n_channels (source); #line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp16_ = _tmp15_; -#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp17_ = dest; + _tmp10_ = _tmp9_; #line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18_ = gdk_pixbuf_get_n_channels (_tmp17_); + _tmp11_ = gdk_pixbuf_get_n_channels (dest); #line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp19_ = _tmp18_; + _tmp12_ = _tmp11_; #line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp16_ != _tmp19_) { + if (_tmp10_ != _tmp12_) { #line 826 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_error ("ColorTransformation.vala:826: %s", "PixelTransformer: source and destination pixbufs must have the same nu" \ "mber " "of channels"); -#line 7318 "ColorTransformation.c" +#line 7497 "ColorTransformation.c" } #line 829 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp20_ = self->optimized_transformations; + _tmp13_ = self->optimized_transformations; #line 829 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp20__length1 = self->optimized_transformations_length1; + _tmp13__length1 = self->optimized_transformations_length1; #line 829 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp20_ == NULL) { + if (_tmp13_ == NULL) { #line 830 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixel_transformer_build_optimized_transformations (self); -#line 7328 "ColorTransformation.c" +#line 7507 "ColorTransformation.c" } #line 832 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp21_ = source; -#line 832 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp22_ = gdk_pixbuf_get_n_channels (_tmp21_); -#line 832 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _data3_->n_channels = _tmp22_; -#line 833 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp23_ = source; -#line 833 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp24_ = gdk_pixbuf_get_rowstride (_tmp23_); + _data3_->n_channels = gdk_pixbuf_get_n_channels (source); #line 833 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _data3_->rowstride = _tmp24_; + _data3_->rowstride = gdk_pixbuf_get_rowstride (source); #line 834 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp25_ = source; -#line 834 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp26_ = gdk_pixbuf_get_width (_tmp25_); -#line 834 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - width = _tmp26_; -#line 835 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp27_ = source; + width = gdk_pixbuf_get_width (source); #line 835 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp28_ = gdk_pixbuf_get_height (_tmp27_); -#line 835 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - height = _tmp28_; + height = gdk_pixbuf_get_height (source); #line 836 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp29_ = _data3_->n_channels; + _tmp14_ = _data3_->n_channels; #line 836 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp30_ = width; + _tmp15_ = width; #line 836 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _data3_->rowbytes = _tmp29_ * _tmp30_; -#line 837 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp31_ = source; + _data3_->rowbytes = _tmp14_ * _tmp15_; #line 837 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp32_ = gdk_pixbuf_get_pixels (_tmp31_); + _tmp16_ = gdk_pixbuf_get_pixels (source); #line 837 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _data3_->source_pixels = _tmp32_; + _data3_->source_pixels = _tmp16_; #line 837 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _data3_->source_pixels_length1 = -1; #line 837 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _data3_->_source_pixels_size_ = _data3_->source_pixels_length1; #line 838 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp33_ = dest; + _tmp17_ = gdk_pixbuf_get_pixels (dest); #line 838 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp34_ = gdk_pixbuf_get_pixels (_tmp33_); -#line 838 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _data3_->dest_pixels = _tmp34_; + _data3_->dest_pixels = _tmp17_; #line 838 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _data3_->dest_pixels_length1 = -1; #line 838 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _data3_->_dest_pixels_size_ = _data3_->dest_pixels_length1; #line 839 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp35_ = jobs; -#line 839 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp35_ == -1) { -#line 7384 "ColorTransformation.c" - guint _tmp36_; + if (jobs == -1) { #line 840 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp36_ = g_get_num_processors (); -#line 840 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - jobs = ((gint) _tmp36_) - 1; -#line 7390 "ColorTransformation.c" + jobs = ((gint) g_get_num_processors ()) - 1; +#line 7543 "ColorTransformation.c" } #line 843 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp37_ = height; + _tmp18_ = height; #line 843 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - slice_length = (guint) _tmp37_; -#line 844 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp38_ = jobs; + slice_length = (guint) _tmp18_; #line 844 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp38_ > 0) { -#line 7400 "ColorTransformation.c" - gint _tmp39_; - gint _tmp40_; - gint _tmp41_; -#line 845 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp39_ = height; + if (jobs > 0) { +#line 7551 "ColorTransformation.c" + gint _tmp19_; #line 845 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp40_ = jobs; + _tmp19_ = height; #line 845 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp41_ = jobs; -#line 845 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - slice_length = (guint) ((_tmp39_ + (_tmp40_ - 1)) / _tmp41_); -#line 7412 "ColorTransformation.c" + slice_length = (guint) ((_tmp19_ + (jobs - 1)) / jobs); +#line 7557 "ColorTransformation.c" } #line 848 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp42_ = jobs; -#line 848 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp43_ = g_new0 (GThread*, _tmp42_ + 1); + _tmp20_ = g_new0 (GThread*, jobs + 1); #line 848 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - threads = _tmp43_; + threads = _tmp20_; #line 848 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - threads_length1 = _tmp42_; + threads_length1 = jobs; #line 848 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _threads_size_ = threads_length1; -#line 7424 "ColorTransformation.c" +#line 7567 "ColorTransformation.c" { gint job = 0; #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" job = 0; -#line 7429 "ColorTransformation.c" +#line 7572 "ColorTransformation.c" { - gboolean _tmp44_ = FALSE; + gboolean _tmp21_ = FALSE; #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp44_ = TRUE; + _tmp21_ = TRUE; #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 7436 "ColorTransformation.c" +#line 7579 "ColorTransformation.c" Block4Data* _data4_; - gint _tmp46_; - gint _tmp47_; - gint _tmp48_; - guint _tmp49_; - guint _tmp50_; - guint _tmp51_; - gint _tmp52_; - guint _tmp53_; - GThread** _tmp54_; - gint _tmp54__length1; - gint _tmp55_; - GThread* _tmp56_; - GThread* _tmp57_; + gint _tmp23_; + gint _tmp24_; + guint _tmp25_; + guint _tmp26_; + guint _tmp27_; + gint _tmp28_; + GThread** _tmp29_; + gint _tmp29__length1; + gint _tmp30_; + GThread* _tmp31_; + GThread* _tmp32_; #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _data4_ = g_slice_new0 (Block4Data); #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -7458,105 +7599,101 @@ void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPix #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _data4_->_data3_ = block3_data_ref (_data3_); #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp44_) { -#line 7459 "ColorTransformation.c" - gint _tmp45_; + if (!_tmp21_) { +#line 7600 "ColorTransformation.c" + gint _tmp22_; #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp45_ = job; + _tmp22_ = job; #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - job = _tmp45_ + 1; -#line 7465 "ColorTransformation.c" + job = _tmp22_ + 1; +#line 7606 "ColorTransformation.c" } #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp44_ = FALSE; -#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp46_ = job; + _tmp21_ = FALSE; #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp47_ = jobs; + _tmp23_ = job; #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp46_ < _tmp47_)) { + if (!(_tmp23_ < jobs)) { #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" block4_data_unref (_data4_); #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _data4_ = NULL; #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 7481 "ColorTransformation.c" +#line 7620 "ColorTransformation.c" } #line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp48_ = job; + _tmp24_ = job; #line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp49_ = slice_length; + _tmp25_ = slice_length; #line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _data4_->row = _tmp48_ * _tmp49_; + _data4_->row = _tmp24_ * _tmp25_; #line 852 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp50_ = _data4_->row; + _tmp26_ = _data4_->row; #line 852 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp51_ = slice_length; -#line 852 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp52_ = height; + _tmp27_ = slice_length; #line 852 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp53_ = CLAMP (_tmp50_ + _tmp51_, (guint) 0, (guint) _tmp52_); + _tmp28_ = height; #line 852 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _data4_->slice_height = _tmp53_; + _data4_->slice_height = CLAMP (_tmp26_ + _tmp27_, (guint) 0, (guint) _tmp28_); #line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp54_ = threads; + _tmp29_ = threads; #line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp54__length1 = threads_length1; + _tmp29__length1 = threads_length1; #line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp55_ = job; + _tmp30_ = job; #line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp56_ = g_thread_new ("shotwell-worker", ______lambda4__gthread_func, block4_data_ref (_data4_)); + _tmp31_ = g_thread_new ("shotwell-worker", ______lambda4__gthread_func, block4_data_ref (_data4_)); #line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _g_thread_unref0 (_tmp54_[_tmp55_]); + _g_thread_unref0 (_tmp29_[_tmp30_]); #line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp54_[_tmp55_] = _tmp56_; + _tmp29_[_tmp30_] = _tmp31_; #line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp57_ = _tmp54_[_tmp55_]; + _tmp32_ = _tmp29_[_tmp30_]; #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" block4_data_unref (_data4_); #line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _data4_ = NULL; -#line 7517 "ColorTransformation.c" +#line 7654 "ColorTransformation.c" } } } #line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp58_ = threads; + _tmp33_ = threads; #line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp58__length1 = threads_length1; -#line 7525 "ColorTransformation.c" + _tmp33__length1 = threads_length1; +#line 7662 "ColorTransformation.c" { GThread** thread_collection = NULL; gint thread_collection_length1 = 0; gint _thread_collection_size_ = 0; gint thread_it = 0; #line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - thread_collection = _tmp58_; + thread_collection = _tmp33_; #line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - thread_collection_length1 = _tmp58__length1; + thread_collection_length1 = _tmp33__length1; #line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - for (thread_it = 0; thread_it < _tmp58__length1; thread_it = thread_it + 1) { -#line 7537 "ColorTransformation.c" - GThread* _tmp59_; + for (thread_it = 0; thread_it < _tmp33__length1; thread_it = thread_it + 1) { +#line 7674 "ColorTransformation.c" + GThread* _tmp34_; GThread* thread = NULL; #line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp59_ = _g_thread_ref0 (thread_collection[thread_it]); + _tmp34_ = _g_thread_ref0 (thread_collection[thread_it]); #line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - thread = _tmp59_; -#line 7544 "ColorTransformation.c" + thread = _tmp34_; +#line 7681 "ColorTransformation.c" { - GThread* _tmp60_; - GThread* _tmp61_; + GThread* _tmp35_; + GThread* _tmp36_; #line 869 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp60_ = thread; + _tmp35_ = thread; #line 869 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp61_ = _g_thread_ref0 (_tmp60_); + _tmp36_ = _g_thread_ref0 (_tmp35_); #line 869 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - g_thread_join (_tmp61_); + g_thread_join (_tmp36_); #line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _g_thread_unref0 (thread); -#line 7556 "ColorTransformation.c" +#line 7693 "ColorTransformation.c" } } } @@ -7566,108 +7703,133 @@ void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPix block3_data_unref (_data3_); #line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _data3_ = NULL; -#line 7566 "ColorTransformation.c" +#line 7703 "ColorTransformation.c" } -static void value_pixel_transformer_init (GValue* value) { +static void +value_pixel_transformer_init (GValue* value) +{ #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 7573 "ColorTransformation.c" +#line 7712 "ColorTransformation.c" } -static void value_pixel_transformer_free_value (GValue* value) { +static void +value_pixel_transformer_free_value (GValue* value) +{ #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (value->data[0].v_pointer) { #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixel_transformer_unref (value->data[0].v_pointer); -#line 7582 "ColorTransformation.c" +#line 7723 "ColorTransformation.c" } } -static void value_pixel_transformer_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_pixel_transformer_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (src_value->data[0].v_pointer) { #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" dest_value->data[0].v_pointer = pixel_transformer_ref (src_value->data[0].v_pointer); -#line 7592 "ColorTransformation.c" +#line 7736 "ColorTransformation.c" } else { #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" dest_value->data[0].v_pointer = NULL; -#line 7596 "ColorTransformation.c" +#line 7740 "ColorTransformation.c" } } -static gpointer value_pixel_transformer_peek_pointer (const GValue* value) { +static gpointer +value_pixel_transformer_peek_pointer (const GValue* value) +{ #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return value->data[0].v_pointer; -#line 7604 "ColorTransformation.c" +#line 7750 "ColorTransformation.c" } -static gchar* value_pixel_transformer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_pixel_transformer_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (collect_values[0].v_pointer) { -#line 7611 "ColorTransformation.c" +#line 7762 "ColorTransformation.c" PixelTransformer * object; object = collect_values[0].v_pointer; #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (object->parent_instance.g_class == NULL) { #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 7618 "ColorTransformation.c" +#line 7769 "ColorTransformation.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 7622 "ColorTransformation.c" +#line 7773 "ColorTransformation.c" } #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = pixel_transformer_ref (object); -#line 7626 "ColorTransformation.c" +#line 7777 "ColorTransformation.c" } else { #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 7630 "ColorTransformation.c" +#line 7781 "ColorTransformation.c" } #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return NULL; -#line 7634 "ColorTransformation.c" +#line 7785 "ColorTransformation.c" } -static gchar* value_pixel_transformer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_pixel_transformer_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PixelTransformer ** object_p; object_p = collect_values[0].v_pointer; #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!object_p) { #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 7645 "ColorTransformation.c" +#line 7801 "ColorTransformation.c" } #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!value->data[0].v_pointer) { #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" *object_p = NULL; -#line 7651 "ColorTransformation.c" +#line 7807 "ColorTransformation.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" *object_p = value->data[0].v_pointer; -#line 7655 "ColorTransformation.c" +#line 7811 "ColorTransformation.c" } else { #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" *object_p = pixel_transformer_ref (value->data[0].v_pointer); -#line 7659 "ColorTransformation.c" +#line 7815 "ColorTransformation.c" } #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return NULL; -#line 7663 "ColorTransformation.c" +#line 7819 "ColorTransformation.c" } -GParamSpec* param_spec_pixel_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_pixel_transformer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPixelTransformer* spec; #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PIXEL_TRANSFORMER), NULL); @@ -7677,20 +7839,25 @@ GParamSpec* param_spec_pixel_transformer (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return G_PARAM_SPEC (spec); -#line 7677 "ColorTransformation.c" +#line 7839 "ColorTransformation.c" } -gpointer value_get_pixel_transformer (const GValue* value) { +gpointer +value_get_pixel_transformer (const GValue* value) +{ #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMER), NULL); #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return value->data[0].v_pointer; -#line 7686 "ColorTransformation.c" +#line 7850 "ColorTransformation.c" } -void value_set_pixel_transformer (GValue* value, gpointer v_object) { +void +value_set_pixel_transformer (GValue* value, + gpointer v_object) +{ PixelTransformer * old; #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMER)); @@ -7706,22 +7873,25 @@ void value_set_pixel_transformer (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixel_transformer_ref (value->data[0].v_pointer); -#line 7706 "ColorTransformation.c" +#line 7873 "ColorTransformation.c" } else { #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 7710 "ColorTransformation.c" +#line 7877 "ColorTransformation.c" } #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (old) { #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixel_transformer_unref (old); -#line 7716 "ColorTransformation.c" +#line 7883 "ColorTransformation.c" } } -void value_take_pixel_transformer (GValue* value, gpointer v_object) { +void +value_take_pixel_transformer (GValue* value, + gpointer v_object) +{ PixelTransformer * old; #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMER)); @@ -7735,33 +7905,37 @@ void value_take_pixel_transformer (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = v_object; -#line 7735 "ColorTransformation.c" +#line 7905 "ColorTransformation.c" } else { #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 7739 "ColorTransformation.c" +#line 7909 "ColorTransformation.c" } #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (old) { #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixel_transformer_unref (old); -#line 7745 "ColorTransformation.c" +#line 7915 "ColorTransformation.c" } } -static void pixel_transformer_class_init (PixelTransformerClass * klass) { +static void +pixel_transformer_class_init (PixelTransformerClass * klass) +{ #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixel_transformer_parent_class = g_type_class_peek_parent (klass); #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" ((PixelTransformerClass *) klass)->finalize = pixel_transformer_finalize; #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_type_class_add_private (klass, sizeof (PixelTransformerPrivate)); -#line 7757 "ColorTransformation.c" +#line 7929 "ColorTransformation.c" } -static void pixel_transformer_instance_init (PixelTransformer * self) { +static void +pixel_transformer_instance_init (PixelTransformer * self) +{ GeeArrayList* _tmp0_; #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->priv = PIXEL_TRANSFORMER_GET_PRIVATE (self); @@ -7777,11 +7951,13 @@ static void pixel_transformer_instance_init (PixelTransformer * self) { self->optimized_slots_used = 0; #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->ref_count = 1; -#line 7777 "ColorTransformation.c" +#line 7951 "ColorTransformation.c" } -static void pixel_transformer_finalize (PixelTransformer * obj) { +static void +pixel_transformer_finalize (PixelTransformer * obj) +{ PixelTransformer * self; #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXEL_TRANSFORMER, PixelTransformer); @@ -7791,11 +7967,13 @@ static void pixel_transformer_finalize (PixelTransformer * obj) { _g_object_unref0 (self->priv->transformations); #line 685 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->optimized_transformations = (_vala_array_free (self->optimized_transformations, self->optimized_transformations_length1, (GDestroyNotify) pixel_transformation_unref), NULL); -#line 7791 "ColorTransformation.c" +#line 7967 "ColorTransformation.c" } -GType pixel_transformer_get_type (void) { +GType +pixel_transformer_get_type (void) +{ static volatile gsize pixel_transformer_type_id__volatile = 0; if (g_once_init_enter (&pixel_transformer_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_pixel_transformer_init, value_pixel_transformer_free_value, value_pixel_transformer_copy_value, value_pixel_transformer_peek_pointer, "p", value_pixel_transformer_collect_value, "p", value_pixel_transformer_lcopy_value }; @@ -7809,18 +7987,22 @@ GType pixel_transformer_get_type (void) { } -gpointer pixel_transformer_ref (gpointer instance) { +gpointer +pixel_transformer_ref (gpointer instance) +{ PixelTransformer * self; self = instance; #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_atomic_int_inc (&self->ref_count); #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return instance; -#line 7816 "ColorTransformation.c" +#line 7996 "ColorTransformation.c" } -void pixel_transformer_unref (gpointer instance) { +void +pixel_transformer_unref (gpointer instance) +{ PixelTransformer * self; self = instance; #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -7829,1282 +8011,686 @@ void pixel_transformer_unref (gpointer instance) { PIXEL_TRANSFORMER_GET_CLASS (self)->finalize (self); #line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_type_free_instance ((GTypeInstance *) self); -#line 7829 "ColorTransformation.c" +#line 8011 "ColorTransformation.c" } } -RGBHistogram* rgb_histogram_construct (GType object_type, GdkPixbuf* pixbuf) { +RGBHistogram* +rgb_histogram_construct (GType object_type, + GdkPixbuf* pixbuf) +{ RGBHistogram* self = NULL; gint sample_bytes = 0; - GdkPixbuf* _tmp0_; - gint _tmp1_; gint pixel_bytes = 0; - gint _tmp2_; - GdkPixbuf* _tmp3_; - gint _tmp4_; + gint _tmp0_; gint row_length_bytes = 0; - gint _tmp5_; - GdkPixbuf* _tmp6_; - gint _tmp7_; - gint _tmp8_; + gint _tmp1_; + gint _tmp2_; + gint _tmp3_; guchar* pixel_data = NULL; - GdkPixbuf* _tmp9_; - guint8* _tmp10_; + guint8* _tmp4_; gint pixel_data_length1; gint _pixel_data_size_; #line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = (RGBHistogram*) g_type_create_instance (object_type); #line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = pixbuf; -#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = gdk_pixbuf_get_bits_per_sample (_tmp0_); -#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - sample_bytes = _tmp1_ / 8; + sample_bytes = gdk_pixbuf_get_bits_per_sample (pixbuf) / 8; #line 900 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = sample_bytes; + _tmp0_ = sample_bytes; #line 900 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = pixbuf; -#line 900 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = gdk_pixbuf_get_n_channels (_tmp3_); -#line 900 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_bytes = _tmp2_ * _tmp4_; + pixel_bytes = _tmp0_ * gdk_pixbuf_get_n_channels (pixbuf); #line 901 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = pixel_bytes; + _tmp1_ = pixel_bytes; #line 901 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = pixbuf; + _tmp2_ = gdk_pixbuf_get_width (pixbuf); #line 901 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = gdk_pixbuf_get_width (_tmp6_); -#line 901 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = _tmp7_; + _tmp3_ = _tmp2_; #line 901 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - row_length_bytes = _tmp5_ * _tmp8_; -#line 903 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = pixbuf; + row_length_bytes = _tmp1_ * _tmp3_; #line 903 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = gdk_pixbuf_get_pixels (_tmp9_); + _tmp4_ = gdk_pixbuf_get_pixels (pixbuf); #line 903 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_data = _tmp10_; + pixel_data = _tmp4_; #line 903 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixel_data_length1 = -1; #line 903 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _pixel_data_size_ = pixel_data_length1; -#line 7889 "ColorTransformation.c" +#line 8056 "ColorTransformation.c" { gint y = 0; #line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala" y = 0; -#line 7894 "ColorTransformation.c" +#line 8061 "ColorTransformation.c" { - gboolean _tmp11_ = FALSE; + gboolean _tmp5_ = FALSE; #line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = TRUE; + _tmp5_ = TRUE; #line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 7901 "ColorTransformation.c" - gint _tmp13_; - GdkPixbuf* _tmp14_; - gint _tmp15_; - gint _tmp16_; +#line 8068 "ColorTransformation.c" + gint _tmp7_; + gint _tmp8_; + gint _tmp9_; gint row_start_offset = 0; - gint _tmp17_; - GdkPixbuf* _tmp18_; - gint _tmp19_; - gint _tmp20_; + gint _tmp10_; + gint _tmp11_; + gint _tmp12_; gint r_offset = 0; - gint _tmp21_; + gint _tmp13_; gint g_offset = 0; - gint _tmp22_; - gint _tmp23_; + gint _tmp14_; + gint _tmp15_; gint b_offset = 0; - gint _tmp24_; - gint _tmp25_; - gint _tmp26_; + gint _tmp16_; + gint _tmp17_; + gint _tmp18_; #line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp11_) { -#line 7922 "ColorTransformation.c" - gint _tmp12_; + if (!_tmp5_) { +#line 8087 "ColorTransformation.c" + gint _tmp6_; #line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = y; + _tmp6_ = y; #line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - y = _tmp12_ + 1; -#line 7928 "ColorTransformation.c" + y = _tmp6_ + 1; +#line 8093 "ColorTransformation.c" } #line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = FALSE; -#line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp13_ = y; + _tmp5_ = FALSE; #line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_ = pixbuf; + _tmp7_ = y; #line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp15_ = gdk_pixbuf_get_height (_tmp14_); + _tmp8_ = gdk_pixbuf_get_height (pixbuf); #line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp16_ = _tmp15_; + _tmp9_ = _tmp8_; #line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp13_ < _tmp16_)) { + if (!(_tmp7_ < _tmp9_)) { #line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 7944 "ColorTransformation.c" +#line 8107 "ColorTransformation.c" } #line 906 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp17_ = y; -#line 906 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18_ = pixbuf; + _tmp10_ = y; #line 906 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp19_ = gdk_pixbuf_get_rowstride (_tmp18_); + _tmp11_ = gdk_pixbuf_get_rowstride (pixbuf); #line 906 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp20_ = _tmp19_; + _tmp12_ = _tmp11_; #line 906 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - row_start_offset = _tmp17_ * _tmp20_; + row_start_offset = _tmp10_ * _tmp12_; #line 908 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp21_ = row_start_offset; + _tmp13_ = row_start_offset; #line 908 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - r_offset = _tmp21_; + r_offset = _tmp13_; #line 909 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp22_ = row_start_offset; + _tmp14_ = row_start_offset; #line 909 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp23_ = sample_bytes; + _tmp15_ = sample_bytes; #line 909 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - g_offset = _tmp22_ + _tmp23_; + g_offset = _tmp14_ + _tmp15_; #line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp24_ = row_start_offset; + _tmp16_ = row_start_offset; #line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp25_ = sample_bytes; + _tmp17_ = sample_bytes; #line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp26_ = sample_bytes; + _tmp18_ = sample_bytes; #line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - b_offset = (_tmp24_ + _tmp25_) + _tmp26_; + b_offset = (_tmp16_ + _tmp17_) + _tmp18_; #line 912 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 7976 "ColorTransformation.c" - gint _tmp27_; - gint _tmp28_; +#line 8137 "ColorTransformation.c" + gint _tmp19_; + gint _tmp20_; + gint _tmp21_; + gint* _tmp22_; + gint _tmp22__length1; + guchar* _tmp23_; + gint _tmp23__length1; + gint _tmp24_; + guchar _tmp25_; + gint _tmp26_; + gint* _tmp27_; + gint _tmp27__length1; + guchar* _tmp28_; + gint _tmp28__length1; gint _tmp29_; - gint* _tmp30_; - gint _tmp30__length1; - guchar* _tmp31_; - gint _tmp31__length1; - gint _tmp32_; - guchar _tmp33_; + guchar _tmp30_; + gint _tmp31_; + gint* _tmp32_; + gint _tmp32__length1; + guchar* _tmp33_; + gint _tmp33__length1; gint _tmp34_; - gint* _tmp35_; - gint _tmp35__length1; - guchar* _tmp36_; - gint _tmp36__length1; + guchar _tmp35_; + gint _tmp36_; gint _tmp37_; - guchar _tmp38_; + gint _tmp38_; gint _tmp39_; - gint* _tmp40_; - gint _tmp40__length1; - guchar* _tmp41_; - gint _tmp41__length1; + gint _tmp40_; + gint _tmp41_; gint _tmp42_; - guchar _tmp43_; - gint _tmp44_; - gint _tmp45_; - gint _tmp46_; - gint _tmp47_; - gint _tmp48_; - gint _tmp49_; - gint _tmp50_; #line 912 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp27_ = b_offset; + _tmp19_ = b_offset; #line 912 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp28_ = row_start_offset; + _tmp20_ = row_start_offset; #line 912 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp29_ = row_length_bytes; + _tmp21_ = row_length_bytes; #line 912 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp27_ < (_tmp28_ + _tmp29_))) { + if (!(_tmp19_ < (_tmp20_ + _tmp21_))) { #line 912 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 8017 "ColorTransformation.c" +#line 8178 "ColorTransformation.c" } #line 913 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp30_ = self->priv->red_counts; + _tmp22_ = self->priv->red_counts; #line 913 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp30__length1 = self->priv->red_counts_length1; + _tmp22__length1 = self->priv->red_counts_length1; #line 913 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp31_ = pixel_data; + _tmp23_ = pixel_data; #line 913 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp31__length1 = pixel_data_length1; + _tmp23__length1 = pixel_data_length1; #line 913 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp32_ = r_offset; + _tmp24_ = r_offset; #line 913 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp33_ = _tmp31_[_tmp32_]; + _tmp25_ = _tmp23_[_tmp24_]; #line 913 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp30_[_tmp33_] += 1; + _tmp22_[_tmp25_] += 1; #line 913 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp34_ = _tmp30_[_tmp33_]; + _tmp26_ = _tmp22_[_tmp25_]; #line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp35_ = self->priv->green_counts; + _tmp27_ = self->priv->green_counts; #line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp35__length1 = self->priv->green_counts_length1; + _tmp27__length1 = self->priv->green_counts_length1; #line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp36_ = pixel_data; + _tmp28_ = pixel_data; #line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp36__length1 = pixel_data_length1; + _tmp28__length1 = pixel_data_length1; #line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp37_ = g_offset; + _tmp29_ = g_offset; #line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp38_ = _tmp36_[_tmp37_]; + _tmp30_ = _tmp28_[_tmp29_]; #line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp35_[_tmp38_] += 1; + _tmp27_[_tmp30_] += 1; #line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp39_ = _tmp35_[_tmp38_]; + _tmp31_ = _tmp27_[_tmp30_]; #line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp40_ = self->priv->blue_counts; + _tmp32_ = self->priv->blue_counts; #line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp40__length1 = self->priv->blue_counts_length1; + _tmp32__length1 = self->priv->blue_counts_length1; #line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp41_ = pixel_data; + _tmp33_ = pixel_data; #line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp41__length1 = pixel_data_length1; + _tmp33__length1 = pixel_data_length1; #line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp42_ = b_offset; + _tmp34_ = b_offset; #line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp43_ = _tmp41_[_tmp42_]; + _tmp35_ = _tmp33_[_tmp34_]; #line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp40_[_tmp43_] += 1; + _tmp32_[_tmp35_] += 1; #line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp44_ = _tmp40_[_tmp43_]; + _tmp36_ = _tmp32_[_tmp35_]; #line 917 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp45_ = r_offset; + _tmp37_ = r_offset; #line 917 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp46_ = pixel_bytes; + _tmp38_ = pixel_bytes; #line 917 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - r_offset = _tmp45_ + _tmp46_; + r_offset = _tmp37_ + _tmp38_; #line 918 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp47_ = g_offset; + _tmp39_ = g_offset; #line 918 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp48_ = pixel_bytes; + _tmp40_ = pixel_bytes; #line 918 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - g_offset = _tmp47_ + _tmp48_; + g_offset = _tmp39_ + _tmp40_; #line 919 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp49_ = b_offset; + _tmp41_ = b_offset; #line 919 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp50_ = pixel_bytes; + _tmp42_ = pixel_bytes; #line 919 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - b_offset = _tmp49_ + _tmp50_; -#line 8085 "ColorTransformation.c" + b_offset = _tmp41_ + _tmp42_; +#line 8246 "ColorTransformation.c" } } } } #line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self; -#line 8092 "ColorTransformation.c" +#line 8253 "ColorTransformation.c" } -RGBHistogram* rgb_histogram_new (GdkPixbuf* pixbuf) { +RGBHistogram* +rgb_histogram_new (GdkPixbuf* pixbuf) +{ #line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return rgb_histogram_construct (TYPE_RGB_HISTOGRAM, pixbuf); -#line 8099 "ColorTransformation.c" +#line 8262 "ColorTransformation.c" } -static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint* buckets, int buckets_length1, gint i) { +static gint +rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, + gint* buckets, + int buckets_length1, + gint i) +{ gint result = 0; - gint* _tmp0_; - gint _tmp0__length1; - gboolean _tmp1_ = FALSE; - gint _tmp2_; - gint _tmp4_; - gint* _tmp54_; - gint _tmp54__length1; - gint _tmp55_; - gint _tmp56_; -#line 925 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = buckets; -#line 925 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0__length1 = buckets_length1; + gboolean _tmp0_ = FALSE; + gint _tmp17_; #line 925 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _vala_assert (_tmp0__length1 == 256, "buckets.length == 256"); -#line 926 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = i; + _vala_assert (buckets_length1 == 256, "buckets.length == 256"); #line 926 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp2_ >= 0) { -#line 8124 "ColorTransformation.c" - gint _tmp3_; + if (i >= 0) { #line 926 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = i; -#line 926 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = _tmp3_ <= 255; -#line 8130 "ColorTransformation.c" + _tmp0_ = i <= 255; +#line 8281 "ColorTransformation.c" } else { #line 926 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = FALSE; -#line 8134 "ColorTransformation.c" + _tmp0_ = FALSE; +#line 8285 "ColorTransformation.c" } #line 926 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _vala_assert (_tmp1_, "(i >= 0) && (i <= 255)"); + _vala_assert (_tmp0_, "(i >= 0) && (i <= 255)"); #line 928 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = i; -#line 928 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp4_ == 0) { -#line 8142 "ColorTransformation.c" - gint* _tmp5_; - gint _tmp5__length1; - gint _tmp6_; - gint _tmp7_; -#line 929 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = buckets; -#line 929 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5__length1 = buckets_length1; -#line 929 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = i; + if (i == 0) { +#line 8291 "ColorTransformation.c" + gint _tmp1_; #line 929 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = _tmp5_[_tmp6_]; + _tmp1_ = buckets[i]; #line 929 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp7_ > 0) { -#line 8157 "ColorTransformation.c" - gint* _tmp8_; - gint _tmp8__length1; - gint _tmp9_; - gint _tmp10_; -#line 930 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = buckets; -#line 930 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8__length1 = buckets_length1; -#line 930 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = i; + if (_tmp1_ > 0) { +#line 8297 "ColorTransformation.c" + gint _tmp2_; #line 930 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = _tmp8_[_tmp9_ + 1]; + _tmp2_ = buckets[i + 1]; #line 930 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp10_ > 0) { -#line 8172 "ColorTransformation.c" - gint* _tmp11_; - gint _tmp11__length1; - gint _tmp12_; - gint _tmp13_; - gint* _tmp14_; - gint _tmp14__length1; - gint _tmp15_; - gint _tmp16_; -#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = buckets; -#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11__length1 = buckets_length1; -#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = i; -#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp13_ = _tmp11_[_tmp12_]; -#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_ = buckets; -#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14__length1 = buckets_length1; + if (_tmp2_ > 0) { +#line 8303 "ColorTransformation.c" + gint _tmp3_; + gint _tmp4_; #line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp15_ = i; + _tmp3_ = buckets[i]; #line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp16_ = _tmp14_[_tmp15_ + 1]; + _tmp4_ = buckets[i + 1]; #line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp13_ > (2 * _tmp16_)) { -#line 8199 "ColorTransformation.c" - gint* _tmp17_; - gint _tmp17__length1; - gint _tmp18_; - gint _tmp19_; -#line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp17_ = buckets; -#line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp17__length1 = buckets_length1; -#line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18_ = i; + if (_tmp3_ > (2 * _tmp4_)) { +#line 8312 "ColorTransformation.c" + gint _tmp5_; #line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp19_ = _tmp17_[_tmp18_ + 1]; + _tmp5_ = buckets[i + 1]; #line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - result = _tmp19_; + result = _tmp5_; #line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 8216 "ColorTransformation.c" +#line 8320 "ColorTransformation.c" } } } } else { - gint _tmp20_; -#line 933 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp20_ = i; #line 933 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp20_ == 255) { -#line 8226 "ColorTransformation.c" - gint* _tmp21_; - gint _tmp21__length1; - gint _tmp22_; - gint _tmp23_; -#line 934 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp21_ = buckets; -#line 934 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp21__length1 = buckets_length1; -#line 934 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp22_ = i; + if (i == 255) { +#line 8327 "ColorTransformation.c" + gint _tmp6_; #line 934 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp23_ = _tmp21_[_tmp22_]; + _tmp6_ = buckets[i]; #line 934 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp23_ > 0) { -#line 8241 "ColorTransformation.c" - gint* _tmp24_; - gint _tmp24__length1; - gint _tmp25_; - gint _tmp26_; -#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp24_ = buckets; -#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp24__length1 = buckets_length1; -#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp25_ = i; + if (_tmp6_ > 0) { +#line 8333 "ColorTransformation.c" + gint _tmp7_; #line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp26_ = _tmp24_[_tmp25_ - 1]; + _tmp7_ = buckets[i - 1]; #line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp26_ > 0) { -#line 8256 "ColorTransformation.c" - gint* _tmp27_; - gint _tmp27__length1; - gint _tmp28_; - gint _tmp29_; - gint* _tmp30_; - gint _tmp30__length1; - gint _tmp31_; - gint _tmp32_; -#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp27_ = buckets; -#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp27__length1 = buckets_length1; -#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp28_ = i; -#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp29_ = _tmp27_[_tmp28_]; + if (_tmp7_ > 0) { +#line 8339 "ColorTransformation.c" + gint _tmp8_; + gint _tmp9_; #line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp30_ = buckets; + _tmp8_ = buckets[i]; #line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp30__length1 = buckets_length1; + _tmp9_ = buckets[i - 1]; #line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp31_ = i; -#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp32_ = _tmp30_[_tmp31_ - 1]; -#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp29_ > (2 * _tmp32_)) { -#line 8283 "ColorTransformation.c" - gint* _tmp33_; - gint _tmp33__length1; - gint _tmp34_; - gint _tmp35_; -#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp33_ = buckets; -#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp33__length1 = buckets_length1; -#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp34_ = i; + if (_tmp8_ > (2 * _tmp9_)) { +#line 8348 "ColorTransformation.c" + gint _tmp10_; #line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp35_ = _tmp33_[_tmp34_ - 1]; + _tmp10_ = buckets[i - 1]; #line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - result = _tmp35_; + result = _tmp10_; #line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 8300 "ColorTransformation.c" +#line 8356 "ColorTransformation.c" } } } } else { - gint* _tmp36_; - gint _tmp36__length1; - gint _tmp37_; - gint _tmp38_; -#line 939 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp36_ = buckets; -#line 939 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp36__length1 = buckets_length1; -#line 939 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp37_ = i; + gint _tmp11_; #line 939 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp38_ = _tmp36_[_tmp37_]; + _tmp11_ = buckets[i]; #line 939 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp38_ > 0) { -#line 8319 "ColorTransformation.c" - gint* _tmp39_; - gint _tmp39__length1; - gint _tmp40_; - gint _tmp41_; - gint* _tmp42_; - gint _tmp42__length1; - gint _tmp43_; - gint _tmp44_; - gint* _tmp45_; - gint _tmp45__length1; - gint _tmp46_; - gint _tmp47_; -#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp39_ = buckets; -#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp39__length1 = buckets_length1; -#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp40_ = i; -#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp41_ = _tmp39_[_tmp40_]; -#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp42_ = buckets; -#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp42__length1 = buckets_length1; -#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp43_ = i; -#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp44_ = _tmp42_[_tmp43_ - 1]; -#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp45_ = buckets; + if (_tmp11_ > 0) { +#line 8366 "ColorTransformation.c" + gint _tmp12_; + gint _tmp13_; + gint _tmp14_; #line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp45__length1 = buckets_length1; + _tmp12_ = buckets[i]; #line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp46_ = i; + _tmp13_ = buckets[i - 1]; #line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp47_ = _tmp45_[_tmp46_ + 1]; + _tmp14_ = buckets[i + 1]; #line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp41_ > ((_tmp44_ + _tmp47_) / 2)) { -#line 8358 "ColorTransformation.c" - gint* _tmp48_; - gint _tmp48__length1; - gint _tmp49_; - gint _tmp50_; - gint* _tmp51_; - gint _tmp51__length1; - gint _tmp52_; - gint _tmp53_; -#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp48_ = buckets; -#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp48__length1 = buckets_length1; -#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp49_ = i; -#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp50_ = _tmp48_[_tmp49_ - 1]; -#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp51_ = buckets; -#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp51__length1 = buckets_length1; + if (_tmp12_ > ((_tmp13_ + _tmp14_) / 2)) { +#line 8378 "ColorTransformation.c" + gint _tmp15_; + gint _tmp16_; #line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp52_ = i; + _tmp15_ = buckets[i - 1]; #line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp53_ = _tmp51_[_tmp52_ + 1]; + _tmp16_ = buckets[i + 1]; #line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - result = (_tmp50_ + _tmp53_) / 2; + result = (_tmp15_ + _tmp16_) / 2; #line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 8387 "ColorTransformation.c" +#line 8389 "ColorTransformation.c" } } } } #line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp54_ = buckets; + _tmp17_ = buckets[i]; #line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp54__length1 = buckets_length1; -#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp55_ = i; -#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp56_ = _tmp54_[_tmp55_]; -#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - result = _tmp56_; + result = _tmp17_; #line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 8404 "ColorTransformation.c" +#line 8400 "ColorTransformation.c" } -static gint rgb_histogram_correct_snap_from_quantization (RGBHistogram* self, gint* buckets, int buckets_length1, gint i) { +static gint +rgb_histogram_correct_snap_from_quantization (RGBHistogram* self, + gint* buckets, + int buckets_length1, + gint i) +{ gint result = 0; - gint* _tmp0_; - gint _tmp0__length1; - gboolean _tmp1_ = FALSE; - gint _tmp2_; - gint _tmp4_; - gint* _tmp27_; - gint _tmp27__length1; - gint _tmp28_; - gint _tmp29_; -#line 948 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = buckets; -#line 948 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0__length1 = buckets_length1; + gboolean _tmp0_ = FALSE; + gint _tmp8_; #line 948 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _vala_assert (_tmp0__length1 == 256, "buckets.length == 256"); -#line 949 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = i; -#line 949 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp2_ >= 0) { -#line 8429 "ColorTransformation.c" - gint _tmp3_; + _vala_assert (buckets_length1 == 256, "buckets.length == 256"); #line 949 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = i; + if (i >= 0) { #line 949 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = _tmp3_ <= 255; -#line 8435 "ColorTransformation.c" + _tmp0_ = i <= 255; +#line 8419 "ColorTransformation.c" } else { #line 949 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = FALSE; -#line 8439 "ColorTransformation.c" + _tmp0_ = FALSE; +#line 8423 "ColorTransformation.c" } #line 949 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _vala_assert (_tmp1_, "(i >= 0) && (i <= 255)"); -#line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = i; + _vala_assert (_tmp0_, "(i >= 0) && (i <= 255)"); #line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp4_ == 0) { -#line 8447 "ColorTransformation.c" - gint* _tmp5_; - gint _tmp5__length1; - gint _tmp6_; - gint _tmp7_; -#line 952 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = buckets; -#line 952 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5__length1 = buckets_length1; -#line 952 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = i; + if (i == 0) { +#line 8429 "ColorTransformation.c" + gint _tmp1_; #line 952 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = _tmp5_[_tmp6_]; + _tmp1_ = buckets[i]; #line 952 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - result = _tmp7_; + result = _tmp1_; #line 952 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 8464 "ColorTransformation.c" +#line 8437 "ColorTransformation.c" } else { - gint _tmp8_; -#line 953 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = i; #line 953 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp8_ == 255) { -#line 8471 "ColorTransformation.c" - gint* _tmp9_; - gint _tmp9__length1; - gint _tmp10_; - gint _tmp11_; -#line 954 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = buckets; -#line 954 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9__length1 = buckets_length1; -#line 954 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = i; + if (i == 255) { +#line 8441 "ColorTransformation.c" + gint _tmp2_; #line 954 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = _tmp9_[_tmp10_]; + _tmp2_ = buckets[i]; #line 954 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - result = _tmp11_; + result = _tmp2_; #line 954 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 8488 "ColorTransformation.c" +#line 8449 "ColorTransformation.c" } else { - gint* _tmp12_; - gint _tmp12__length1; - gint _tmp13_; - gint _tmp14_; + gint _tmp3_; #line 956 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = buckets; + _tmp3_ = buckets[i]; #line 956 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12__length1 = buckets_length1; -#line 956 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp13_ = i; -#line 956 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_ = _tmp12_[_tmp13_]; -#line 956 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp14_ == 0) { -#line 8504 "ColorTransformation.c" - gint* _tmp15_; - gint _tmp15__length1; - gint _tmp16_; - gint _tmp17_; -#line 957 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp15_ = buckets; -#line 957 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp15__length1 = buckets_length1; -#line 957 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp16_ = i; + if (_tmp3_ == 0) { +#line 8456 "ColorTransformation.c" + gint _tmp4_; #line 957 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp17_ = _tmp15_[_tmp16_ - 1]; + _tmp4_ = buckets[i - 1]; #line 957 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp17_ > 0) { -#line 8519 "ColorTransformation.c" - gint* _tmp18_; - gint _tmp18__length1; - gint _tmp19_; - gint _tmp20_; -#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18_ = buckets; -#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18__length1 = buckets_length1; -#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp19_ = i; + if (_tmp4_ > 0) { +#line 8462 "ColorTransformation.c" + gint _tmp5_; #line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp20_ = _tmp18_[_tmp19_ + 1]; + _tmp5_ = buckets[i + 1]; #line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp20_ > 0) { -#line 8534 "ColorTransformation.c" - gint* _tmp21_; - gint _tmp21__length1; - gint _tmp22_; - gint _tmp23_; - gint* _tmp24_; - gint _tmp24__length1; - gint _tmp25_; - gint _tmp26_; -#line 959 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp21_ = buckets; -#line 959 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp21__length1 = buckets_length1; + if (_tmp5_ > 0) { +#line 8468 "ColorTransformation.c" + gint _tmp6_; + gint _tmp7_; #line 959 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp22_ = i; + _tmp6_ = buckets[i - 1]; #line 959 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp23_ = _tmp21_[_tmp22_ - 1]; + _tmp7_ = buckets[i + 1]; #line 959 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp24_ = buckets; -#line 959 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp24__length1 = buckets_length1; -#line 959 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp25_ = i; -#line 959 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp26_ = _tmp24_[_tmp25_ + 1]; -#line 959 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - result = (_tmp23_ + _tmp26_) / 2; + result = (_tmp6_ + _tmp7_) / 2; #line 959 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 8563 "ColorTransformation.c" +#line 8479 "ColorTransformation.c" } } } } } #line 962 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp27_ = buckets; -#line 962 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp27__length1 = buckets_length1; -#line 962 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp28_ = i; -#line 962 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp29_ = _tmp27_[_tmp28_]; + _tmp8_ = buckets[i]; #line 962 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - result = _tmp29_; + result = _tmp8_; #line 962 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 8581 "ColorTransformation.c" +#line 8491 "ColorTransformation.c" } -static void rgb_histogram_smooth_extrema (RGBHistogram* self, gint** count_data, int* count_data_length1) { - gint* _tmp0_; - gint _tmp0__length1; - gint* _tmp1_; - gint _tmp1__length1; - gint* _tmp2_; - gint _tmp2__length1; +static void +rgb_histogram_smooth_extrema (RGBHistogram* self, + gint** count_data, + int* count_data_length1) +{ + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; gint _tmp3_; - gint* _tmp4_; - gint _tmp4__length1; + gint _tmp4_; gint _tmp5_; - gint* _tmp6_; - gint _tmp6__length1; + gint _tmp6_; gint _tmp7_; gint _tmp8_; - gint* _tmp9_; - gint _tmp9__length1; - gint* _tmp10_; - gint _tmp10__length1; + gint _tmp9_; + gint _tmp10_; gint _tmp11_; - gint* _tmp12_; - gint _tmp12__length1; + gint _tmp12_; gint _tmp13_; - gint* _tmp14_; - gint _tmp14__length1; + gint _tmp14_; gint _tmp15_; - gint* _tmp16_; - gint _tmp16__length1; + gint _tmp16_; gint _tmp17_; gint _tmp18_; - gint* _tmp19_; - gint _tmp19__length1; - gint* _tmp20_; - gint _tmp20__length1; + gint _tmp19_; + gint _tmp20_; gint _tmp21_; - gint* _tmp22_; - gint _tmp22__length1; + gint _tmp22_; gint _tmp23_; - gint* _tmp24_; - gint _tmp24__length1; + gint _tmp24_; gint _tmp25_; - gint* _tmp26_; - gint _tmp26__length1; + gint _tmp26_; gint _tmp27_; - gint* _tmp28_; - gint _tmp28__length1; + gint _tmp28_; gint _tmp29_; gint _tmp30_; - gint* _tmp31_; - gint _tmp31__length1; - gint* _tmp32_; - gint _tmp32__length1; + gint _tmp31_; + gint _tmp32_; gint _tmp33_; - gint* _tmp34_; - gint _tmp34__length1; + gint _tmp34_; gint _tmp35_; - gint* _tmp36_; - gint _tmp36__length1; + gint _tmp36_; gint _tmp37_; - gint* _tmp38_; - gint _tmp38__length1; + gint _tmp38_; gint _tmp39_; - gint* _tmp40_; - gint _tmp40__length1; + gint _tmp40_; gint _tmp41_; gint _tmp42_; - gint* _tmp43_; - gint _tmp43__length1; - gint* _tmp44_; - gint _tmp44__length1; + gint _tmp43_; + gint _tmp44_; gint _tmp45_; - gint* _tmp46_; - gint _tmp46__length1; + gint _tmp46_; gint _tmp47_; - gint* _tmp48_; - gint _tmp48__length1; + gint _tmp48_; gint _tmp49_; - gint* _tmp50_; - gint _tmp50__length1; + gint _tmp50_; gint _tmp51_; - gint* _tmp52_; - gint _tmp52__length1; + gint _tmp52_; gint _tmp53_; - gint _tmp54_; - gint* _tmp55_; - gint _tmp55__length1; - gint* _tmp56_; - gint _tmp56__length1; - gint _tmp57_; - gint* _tmp58_; - gint _tmp58__length1; - gint _tmp59_; - gint* _tmp60_; - gint _tmp60__length1; - gint _tmp61_; - gint _tmp62_; - gint* _tmp63_; - gint _tmp63__length1; - gint* _tmp64_; - gint _tmp64__length1; - gint _tmp65_; - gint* _tmp66_; - gint _tmp66__length1; - gint _tmp67_; - gint* _tmp68_; - gint _tmp68__length1; - gint _tmp69_; - gint* _tmp70_; - gint _tmp70__length1; - gint _tmp71_; - gint _tmp72_; - gint* _tmp73_; - gint _tmp73__length1; - gint* _tmp74_; - gint _tmp74__length1; - gint _tmp75_; - gint* _tmp76_; - gint _tmp76__length1; - gint _tmp77_; - gint* _tmp78_; - gint _tmp78__length1; - gint _tmp79_; - gint* _tmp80_; - gint _tmp80__length1; - gint _tmp81_; - gint* _tmp82_; - gint _tmp82__length1; - gint _tmp83_; - gint _tmp84_; - gint* _tmp85_; - gint _tmp85__length1; - gint* _tmp86_; - gint _tmp86__length1; - gint _tmp87_; - gint* _tmp88_; - gint _tmp88__length1; - gint _tmp89_; - gint* _tmp90_; - gint _tmp90__length1; - gint _tmp91_; - gint* _tmp92_; - gint _tmp92__length1; - gint _tmp93_; - gint* _tmp94_; - gint _tmp94__length1; - gint _tmp95_; - gint _tmp96_; - gint* _tmp97_; - gint _tmp97__length1; - gint* _tmp98_; - gint _tmp98__length1; - gint _tmp99_; - gint* _tmp100_; - gint _tmp100__length1; - gint _tmp101_; - gint* _tmp102_; - gint _tmp102__length1; - gint _tmp103_; - gint* _tmp104_; - gint _tmp104__length1; - gint _tmp105_; - gint* _tmp106_; - gint _tmp106__length1; - gint _tmp107_; - gint _tmp108_; -#line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = *count_data; -#line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0__length1 = *count_data_length1; #line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _vala_assert (_tmp0__length1 == 256, "count_data.length == 256"); + _vala_assert ((*count_data_length1) == 256, "count_data.length == 256"); #line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = *count_data; + _tmp0_ = (*count_data)[0]; #line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1__length1 = *count_data_length1; + _tmp1_ = (*count_data)[1]; #line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = *count_data; + _tmp2_ = (*count_data)[2]; #line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2__length1 = *count_data_length1; + (*count_data)[0] = (((5 * _tmp0_) + (3 * _tmp1_)) + (2 * _tmp2_)) / 10; #line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = _tmp2_[0]; -#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = *count_data; -#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4__length1 = *count_data_length1; -#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = _tmp4_[1]; -#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = *count_data; -#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6__length1 = *count_data_length1; -#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = _tmp6_[2]; -#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_[0] = (((5 * _tmp3_) + (3 * _tmp5_)) + (2 * _tmp7_)) / 10; -#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = _tmp1_[0]; -#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = *count_data; -#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9__length1 = *count_data_length1; -#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = *count_data; -#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10__length1 = *count_data_length1; -#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = _tmp10_[0]; -#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = *count_data; -#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12__length1 = *count_data_length1; -#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp13_ = _tmp12_[1]; + _tmp3_ = (*count_data)[0]; #line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_ = *count_data; + _tmp4_ = (*count_data)[0]; #line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14__length1 = *count_data_length1; + _tmp5_ = (*count_data)[1]; #line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp15_ = _tmp14_[2]; -#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp16_ = *count_data; + _tmp6_ = (*count_data)[2]; #line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp16__length1 = *count_data_length1; + _tmp7_ = (*count_data)[3]; #line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp17_ = _tmp16_[3]; + (*count_data)[1] = ((((3 * _tmp4_) + (5 * _tmp5_)) + (3 * _tmp6_)) + (2 * _tmp7_)) / 13; #line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_[1] = ((((3 * _tmp11_) + (5 * _tmp13_)) + (3 * _tmp15_)) + (2 * _tmp17_)) / 13; -#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18_ = _tmp9_[1]; -#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp19_ = *count_data; -#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp19__length1 = *count_data_length1; -#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp20_ = *count_data; -#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp20__length1 = *count_data_length1; -#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp21_ = _tmp20_[0]; + _tmp8_ = (*count_data)[1]; #line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp22_ = *count_data; + _tmp9_ = (*count_data)[0]; #line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp22__length1 = *count_data_length1; + _tmp10_ = (*count_data)[1]; #line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp23_ = _tmp22_[1]; + _tmp11_ = (*count_data)[2]; #line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp24_ = *count_data; + _tmp12_ = (*count_data)[3]; #line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp24__length1 = *count_data_length1; + _tmp13_ = (*count_data)[4]; #line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp25_ = _tmp24_[2]; + (*count_data)[2] = (((((2 * _tmp9_) + (3 * _tmp10_)) + (5 * _tmp11_)) + (3 * _tmp12_)) + (2 * _tmp13_)) / 15; #line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp26_ = *count_data; -#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp26__length1 = *count_data_length1; -#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp27_ = _tmp26_[3]; -#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp28_ = *count_data; -#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp28__length1 = *count_data_length1; -#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp29_ = _tmp28_[4]; -#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp19_[2] = (((((2 * _tmp21_) + (3 * _tmp23_)) + (5 * _tmp25_)) + (3 * _tmp27_)) + (2 * _tmp29_)) / 15; -#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp30_ = _tmp19_[2]; -#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp31_ = *count_data; + _tmp14_ = (*count_data)[2]; #line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp31__length1 = *count_data_length1; + _tmp15_ = (*count_data)[1]; #line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp32_ = *count_data; + _tmp16_ = (*count_data)[2]; #line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp32__length1 = *count_data_length1; + _tmp17_ = (*count_data)[3]; #line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp33_ = _tmp32_[1]; + _tmp18_ = (*count_data)[4]; #line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp34_ = *count_data; + _tmp19_ = (*count_data)[5]; #line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp34__length1 = *count_data_length1; + (*count_data)[3] = (((((2 * _tmp15_) + (3 * _tmp16_)) + (5 * _tmp17_)) + (3 * _tmp18_)) + (2 * _tmp19_)) / 15; #line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp35_ = _tmp34_[2]; -#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp36_ = *count_data; -#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp36__length1 = *count_data_length1; -#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp37_ = _tmp36_[3]; -#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp38_ = *count_data; -#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp38__length1 = *count_data_length1; -#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp39_ = _tmp38_[4]; -#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp40_ = *count_data; -#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp40__length1 = *count_data_length1; -#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp41_ = _tmp40_[5]; -#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp31_[3] = (((((2 * _tmp33_) + (3 * _tmp35_)) + (5 * _tmp37_)) + (3 * _tmp39_)) + (2 * _tmp41_)) / 15; -#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp42_ = _tmp31_[3]; -#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp43_ = *count_data; -#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp43__length1 = *count_data_length1; -#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp44_ = *count_data; -#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp44__length1 = *count_data_length1; -#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp45_ = _tmp44_[2]; + _tmp20_ = (*count_data)[3]; #line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp46_ = *count_data; + _tmp21_ = (*count_data)[2]; #line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp46__length1 = *count_data_length1; + _tmp22_ = (*count_data)[3]; #line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp47_ = _tmp46_[3]; + _tmp23_ = (*count_data)[4]; #line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp48_ = *count_data; + _tmp24_ = (*count_data)[5]; #line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp48__length1 = *count_data_length1; + _tmp25_ = (*count_data)[6]; #line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp49_ = _tmp48_[4]; + (*count_data)[4] = (((((2 * _tmp21_) + (3 * _tmp22_)) + (5 * _tmp23_)) + (3 * _tmp24_)) + (2 * _tmp25_)) / 15; #line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp50_ = *count_data; -#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp50__length1 = *count_data_length1; -#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp51_ = _tmp50_[5]; -#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp52_ = *count_data; -#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp52__length1 = *count_data_length1; -#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp53_ = _tmp52_[6]; -#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp43_[4] = (((((2 * _tmp45_) + (3 * _tmp47_)) + (5 * _tmp49_)) + (3 * _tmp51_)) + (2 * _tmp53_)) / 15; -#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp54_ = _tmp43_[4]; -#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp55_ = *count_data; + _tmp26_ = (*count_data)[4]; #line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp55__length1 = *count_data_length1; + _tmp27_ = (*count_data)[255]; #line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp56_ = *count_data; + _tmp28_ = (*count_data)[254]; #line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp56__length1 = *count_data_length1; + _tmp29_ = (*count_data)[253]; #line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp57_ = _tmp56_[255]; + (*count_data)[255] = (((5 * _tmp27_) + (3 * _tmp28_)) + (2 * _tmp29_)) / 10; #line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp58_ = *count_data; -#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp58__length1 = *count_data_length1; -#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp59_ = _tmp58_[254]; -#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp60_ = *count_data; -#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp60__length1 = *count_data_length1; -#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp61_ = _tmp60_[253]; -#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp55_[255] = (((5 * _tmp57_) + (3 * _tmp59_)) + (2 * _tmp61_)) / 10; -#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp62_ = _tmp55_[255]; -#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp63_ = *count_data; + _tmp30_ = (*count_data)[255]; #line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp63__length1 = *count_data_length1; + _tmp31_ = (*count_data)[255]; #line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp64_ = *count_data; + _tmp32_ = (*count_data)[254]; #line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp64__length1 = *count_data_length1; + _tmp33_ = (*count_data)[253]; #line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp65_ = _tmp64_[255]; + _tmp34_ = (*count_data)[252]; #line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp66_ = *count_data; + (*count_data)[254] = ((((3 * _tmp31_) + (5 * _tmp32_)) + (3 * _tmp33_)) + (2 * _tmp34_)) / 13; #line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp66__length1 = *count_data_length1; -#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp67_ = _tmp66_[254]; -#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp68_ = *count_data; -#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp68__length1 = *count_data_length1; -#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp69_ = _tmp68_[253]; -#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp70_ = *count_data; -#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp70__length1 = *count_data_length1; -#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp71_ = _tmp70_[252]; -#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp63_[254] = ((((3 * _tmp65_) + (5 * _tmp67_)) + (3 * _tmp69_)) + (2 * _tmp71_)) / 13; -#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp72_ = _tmp63_[254]; -#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp73_ = *count_data; -#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp73__length1 = *count_data_length1; -#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp74_ = *count_data; -#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp74__length1 = *count_data_length1; -#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp75_ = _tmp74_[255]; -#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp76_ = *count_data; -#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp76__length1 = *count_data_length1; + _tmp35_ = (*count_data)[254]; #line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp77_ = _tmp76_[254]; + _tmp36_ = (*count_data)[255]; #line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp78_ = *count_data; + _tmp37_ = (*count_data)[254]; #line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp78__length1 = *count_data_length1; + _tmp38_ = (*count_data)[253]; #line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp79_ = _tmp78_[253]; + _tmp39_ = (*count_data)[252]; #line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp80_ = *count_data; + _tmp40_ = (*count_data)[251]; #line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp80__length1 = *count_data_length1; + (*count_data)[253] = (((((2 * _tmp36_) + (3 * _tmp37_)) + (5 * _tmp38_)) + (3 * _tmp39_)) + (2 * _tmp40_)) / 15; #line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp81_ = _tmp80_[252]; -#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp82_ = *count_data; -#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp82__length1 = *count_data_length1; -#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp83_ = _tmp82_[251]; -#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp73_[253] = (((((2 * _tmp75_) + (3 * _tmp77_)) + (5 * _tmp79_)) + (3 * _tmp81_)) + (2 * _tmp83_)) / 15; -#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp84_ = _tmp73_[253]; -#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp85_ = *count_data; -#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp85__length1 = *count_data_length1; -#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp86_ = *count_data; -#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp86__length1 = *count_data_length1; -#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp87_ = _tmp86_[254]; -#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp88_ = *count_data; -#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp88__length1 = *count_data_length1; -#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp89_ = _tmp88_[253]; -#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp90_ = *count_data; -#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp90__length1 = *count_data_length1; -#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp91_ = _tmp90_[252]; + _tmp41_ = (*count_data)[253]; #line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp92_ = *count_data; + _tmp42_ = (*count_data)[254]; #line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp92__length1 = *count_data_length1; + _tmp43_ = (*count_data)[253]; #line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp93_ = _tmp92_[251]; + _tmp44_ = (*count_data)[252]; #line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp94_ = *count_data; + _tmp45_ = (*count_data)[251]; #line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp94__length1 = *count_data_length1; + _tmp46_ = (*count_data)[250]; #line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp95_ = _tmp94_[250]; + (*count_data)[252] = (((((2 * _tmp42_) + (3 * _tmp43_)) + (5 * _tmp44_)) + (3 * _tmp45_)) + (2 * _tmp46_)) / 15; #line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp85_[252] = (((((2 * _tmp87_) + (3 * _tmp89_)) + (5 * _tmp91_)) + (3 * _tmp93_)) + (2 * _tmp95_)) / 15; -#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp96_ = _tmp85_[252]; -#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp97_ = *count_data; -#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp97__length1 = *count_data_length1; -#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp98_ = *count_data; -#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp98__length1 = *count_data_length1; -#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp99_ = _tmp98_[253]; -#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp100_ = *count_data; -#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp100__length1 = *count_data_length1; + _tmp47_ = (*count_data)[252]; #line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp101_ = _tmp100_[252]; + _tmp48_ = (*count_data)[253]; #line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp102_ = *count_data; + _tmp49_ = (*count_data)[252]; #line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp102__length1 = *count_data_length1; + _tmp50_ = (*count_data)[251]; #line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp103_ = _tmp102_[251]; + _tmp51_ = (*count_data)[250]; #line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp104_ = *count_data; + _tmp52_ = (*count_data)[249]; #line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp104__length1 = *count_data_length1; + (*count_data)[251] = (((((2 * _tmp48_) + (3 * _tmp49_)) + (5 * _tmp50_)) + (3 * _tmp51_)) + (2 * _tmp52_)) / 15; #line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp105_ = _tmp104_[250]; -#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp106_ = *count_data; -#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp106__length1 = *count_data_length1; -#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp107_ = _tmp106_[249]; -#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp97_[251] = (((((2 * _tmp99_) + (3 * _tmp101_)) + (5 * _tmp103_)) + (3 * _tmp105_)) + (2 * _tmp107_)) / 15; -#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp108_ = _tmp97_[251]; -#line 9100 "ColorTransformation.c" + _tmp53_ = (*count_data)[251]; +#line 8684 "ColorTransformation.c" } -static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) { +static void +rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) +{ gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; gint* _tmp2_; @@ -9125,16 +8711,16 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) { gint temp_blue_counts_length1; gint _temp_blue_counts_size_; gint mean_qual_count = 0; - gint _tmp87_; + gint _tmp81_; gint constrained_max_qual_count = 0; - gint _tmp88_; + gint _tmp82_; #line 996 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp2_ = self->priv->qualitative_red_counts; #line 996 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp2__length1 = self->priv->qualitative_red_counts_length1; #line 996 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (_tmp2_ != NULL) { -#line 9134 "ColorTransformation.c" +#line 8720 "ColorTransformation.c" gint* _tmp3_; gint _tmp3__length1; #line 996 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -9143,15 +8729,15 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) { _tmp3__length1 = self->priv->qualitative_green_counts_length1; #line 996 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp1_ = _tmp3_ != NULL; -#line 9143 "ColorTransformation.c" +#line 8729 "ColorTransformation.c" } else { #line 996 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp1_ = FALSE; -#line 9147 "ColorTransformation.c" +#line 8733 "ColorTransformation.c" } #line 996 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (_tmp1_) { -#line 9151 "ColorTransformation.c" +#line 8737 "ColorTransformation.c" gint* _tmp4_; gint _tmp4__length1; #line 997 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -9160,17 +8746,17 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) { _tmp4__length1 = self->priv->qualitative_blue_counts_length1; #line 997 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp0_ = _tmp4_ != NULL; -#line 9160 "ColorTransformation.c" +#line 8746 "ColorTransformation.c" } else { #line 996 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp0_ = FALSE; -#line 9164 "ColorTransformation.c" +#line 8750 "ColorTransformation.c" } #line 996 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (_tmp0_) { #line 998 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return; -#line 9170 "ColorTransformation.c" +#line 8756 "ColorTransformation.c" } #line 1000 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp5_ = g_new0 (gint, 256); @@ -9226,19 +8812,19 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) { temp_blue_counts_length1 = 256; #line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _temp_blue_counts_size_ = temp_blue_counts_length1; -#line 9226 "ColorTransformation.c" +#line 8812 "ColorTransformation.c" { gint i = 0; #line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = 0; -#line 9231 "ColorTransformation.c" +#line 8817 "ColorTransformation.c" { gboolean _tmp11_ = FALSE; #line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp11_ = TRUE; #line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 9238 "ColorTransformation.c" +#line 8824 "ColorTransformation.c" gint _tmp13_; gint* _tmp14_; gint _tmp14__length1; @@ -9247,32 +8833,29 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) { gint _tmp16__length1; gint _tmp17_; gint _tmp18_; - gint _tmp19_; - gint* _tmp20_; - gint _tmp20__length1; - gint _tmp21_; - gint* _tmp22_; - gint _tmp22__length1; + gint* _tmp19_; + gint _tmp19__length1; + gint _tmp20_; + gint* _tmp21_; + gint _tmp21__length1; + gint _tmp22_; gint _tmp23_; - gint _tmp24_; + gint* _tmp24_; + gint _tmp24__length1; gint _tmp25_; gint* _tmp26_; gint _tmp26__length1; gint _tmp27_; - gint* _tmp28_; - gint _tmp28__length1; - gint _tmp29_; - gint _tmp30_; - gint _tmp31_; + gint _tmp28_; #line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!_tmp11_) { -#line 9266 "ColorTransformation.c" +#line 8849 "ColorTransformation.c" gint _tmp12_; #line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp12_ = i; #line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = _tmp12_ + 1; -#line 9272 "ColorTransformation.c" +#line 8855 "ColorTransformation.c" } #line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp11_ = FALSE; @@ -9282,7 +8865,7 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) { if (!(_tmp13_ < 256)) { #line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 9282 "ColorTransformation.c" +#line 8865 "ColorTransformation.c" } #line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp14_ = self->priv->qualitative_red_counts; @@ -9297,48 +8880,42 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) { #line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp17_ = i; #line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18_ = rgb_histogram_correct_snap_from_quantization (self, _tmp16_, _tmp16__length1, _tmp17_); -#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_[_tmp15_] = _tmp18_; + _tmp14_[_tmp15_] = rgb_histogram_correct_snap_from_quantization (self, _tmp16_, _tmp16__length1, _tmp17_); #line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp19_ = _tmp14_[_tmp15_]; + _tmp18_ = _tmp14_[_tmp15_]; #line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp20_ = self->priv->qualitative_green_counts; + _tmp19_ = self->priv->qualitative_green_counts; #line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp20__length1 = self->priv->qualitative_green_counts_length1; + _tmp19__length1 = self->priv->qualitative_green_counts_length1; #line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp21_ = i; + _tmp20_ = i; #line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp22_ = self->priv->green_counts; + _tmp21_ = self->priv->green_counts; #line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp22__length1 = self->priv->green_counts_length1; -#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp23_ = i; + _tmp21__length1 = self->priv->green_counts_length1; #line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp24_ = rgb_histogram_correct_snap_from_quantization (self, _tmp22_, _tmp22__length1, _tmp23_); + _tmp22_ = i; #line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp20_[_tmp21_] = _tmp24_; + _tmp19_[_tmp20_] = rgb_histogram_correct_snap_from_quantization (self, _tmp21_, _tmp21__length1, _tmp22_); #line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp25_ = _tmp20_[_tmp21_]; + _tmp23_ = _tmp19_[_tmp20_]; #line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp26_ = self->priv->qualitative_blue_counts; + _tmp24_ = self->priv->qualitative_blue_counts; #line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp26__length1 = self->priv->qualitative_blue_counts_length1; + _tmp24__length1 = self->priv->qualitative_blue_counts_length1; #line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp27_ = i; -#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp28_ = self->priv->blue_counts; + _tmp25_ = i; #line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp28__length1 = self->priv->blue_counts_length1; + _tmp26_ = self->priv->blue_counts; #line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp29_ = i; + _tmp26__length1 = self->priv->blue_counts_length1; #line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp30_ = rgb_histogram_correct_snap_from_quantization (self, _tmp28_, _tmp28__length1, _tmp29_); + _tmp27_ = i; #line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp26_[_tmp27_] = _tmp30_; + _tmp24_[_tmp25_] = rgb_histogram_correct_snap_from_quantization (self, _tmp26_, _tmp26__length1, _tmp27_); #line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp31_ = _tmp26_[_tmp27_]; -#line 9338 "ColorTransformation.c" + _tmp28_ = _tmp24_[_tmp25_]; +#line 8915 "ColorTransformation.c" } } } @@ -9346,114 +8923,114 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) { gint i = 0; #line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = 0; -#line 9346 "ColorTransformation.c" +#line 8923 "ColorTransformation.c" { - gboolean _tmp32_ = FALSE; + gboolean _tmp29_ = FALSE; #line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp32_ = TRUE; + _tmp29_ = TRUE; #line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 9353 "ColorTransformation.c" - gint _tmp34_; - gint* _tmp35_; - gint _tmp35__length1; +#line 8930 "ColorTransformation.c" + gint _tmp31_; + gint* _tmp32_; + gint _tmp32__length1; + gint _tmp33_; + gint* _tmp34_; + gint _tmp34__length1; + gint _tmp35_; gint _tmp36_; - gint* _tmp37_; - gint _tmp37__length1; - gint _tmp38_; + gint _tmp37_; + gint* _tmp38_; + gint _tmp38__length1; gint _tmp39_; - gint _tmp40_; - gint* _tmp41_; - gint _tmp41__length1; + gint* _tmp40_; + gint _tmp40__length1; + gint _tmp41_; gint _tmp42_; - gint* _tmp43_; - gint _tmp43__length1; - gint _tmp44_; + gint _tmp43_; + gint* _tmp44_; + gint _tmp44__length1; gint _tmp45_; - gint _tmp46_; - gint* _tmp47_; - gint _tmp47__length1; + gint* _tmp46_; + gint _tmp46__length1; + gint _tmp47_; gint _tmp48_; - gint* _tmp49_; - gint _tmp49__length1; - gint _tmp50_; - gint _tmp51_; - gint _tmp52_; + gint _tmp49_; #line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp32_) { -#line 9381 "ColorTransformation.c" - gint _tmp33_; + if (!_tmp29_) { +#line 8958 "ColorTransformation.c" + gint _tmp30_; #line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp33_ = i; + _tmp30_ = i; #line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - i = _tmp33_ + 1; -#line 9387 "ColorTransformation.c" + i = _tmp30_ + 1; +#line 8964 "ColorTransformation.c" } #line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp32_ = FALSE; + _tmp29_ = FALSE; #line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp34_ = i; + _tmp31_ = i; #line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp34_ < 256)) { + if (!(_tmp31_ < 256)) { #line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 9397 "ColorTransformation.c" +#line 8974 "ColorTransformation.c" } #line 1022 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp35_ = temp_red_counts; + _tmp32_ = temp_red_counts; #line 1022 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp35__length1 = temp_red_counts_length1; + _tmp32__length1 = temp_red_counts_length1; #line 1022 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp36_ = i; + _tmp33_ = i; #line 1022 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp37_ = self->priv->qualitative_red_counts; + _tmp34_ = self->priv->qualitative_red_counts; #line 1022 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp37__length1 = self->priv->qualitative_red_counts_length1; + _tmp34__length1 = self->priv->qualitative_red_counts_length1; #line 1022 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp38_ = i; + _tmp35_ = i; #line 1022 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp39_ = _tmp37_[_tmp38_]; + _tmp36_ = _tmp34_[_tmp35_]; #line 1022 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp35_[_tmp36_] = _tmp39_; + _tmp32_[_tmp33_] = _tmp36_; #line 1022 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp40_ = _tmp35_[_tmp36_]; + _tmp37_ = _tmp32_[_tmp33_]; #line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp41_ = temp_green_counts; + _tmp38_ = temp_green_counts; #line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp41__length1 = temp_green_counts_length1; + _tmp38__length1 = temp_green_counts_length1; #line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp42_ = i; + _tmp39_ = i; #line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp43_ = self->priv->qualitative_green_counts; + _tmp40_ = self->priv->qualitative_green_counts; #line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp43__length1 = self->priv->qualitative_green_counts_length1; + _tmp40__length1 = self->priv->qualitative_green_counts_length1; #line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp44_ = i; + _tmp41_ = i; #line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp45_ = _tmp43_[_tmp44_]; + _tmp42_ = _tmp40_[_tmp41_]; #line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp41_[_tmp42_] = _tmp45_; + _tmp38_[_tmp39_] = _tmp42_; #line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp46_ = _tmp41_[_tmp42_]; + _tmp43_ = _tmp38_[_tmp39_]; #line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp47_ = temp_blue_counts; + _tmp44_ = temp_blue_counts; #line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp47__length1 = temp_blue_counts_length1; + _tmp44__length1 = temp_blue_counts_length1; #line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp48_ = i; + _tmp45_ = i; #line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp49_ = self->priv->qualitative_blue_counts; + _tmp46_ = self->priv->qualitative_blue_counts; #line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp49__length1 = self->priv->qualitative_blue_counts_length1; + _tmp46__length1 = self->priv->qualitative_blue_counts_length1; #line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp50_ = i; + _tmp47_ = i; #line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp51_ = _tmp49_[_tmp50_]; + _tmp48_ = _tmp46_[_tmp47_]; #line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp47_[_tmp48_] = _tmp51_; + _tmp44_[_tmp45_] = _tmp48_; #line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp52_ = _tmp47_[_tmp48_]; -#line 9453 "ColorTransformation.c" + _tmp49_ = _tmp44_[_tmp45_]; +#line 9030 "ColorTransformation.c" } } } @@ -9461,350 +9038,341 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) { gint i = 0; #line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = 0; -#line 9461 "ColorTransformation.c" +#line 9038 "ColorTransformation.c" { - gboolean _tmp53_ = FALSE; + gboolean _tmp50_ = FALSE; #line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp53_ = TRUE; + _tmp50_ = TRUE; #line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 9468 "ColorTransformation.c" - gint _tmp55_; - gint* _tmp56_; - gint _tmp56__length1; +#line 9045 "ColorTransformation.c" + gint _tmp52_; + gint* _tmp53_; + gint _tmp53__length1; + gint _tmp54_; + gint* _tmp55_; + gint _tmp55__length1; + gint _tmp56_; gint _tmp57_; gint* _tmp58_; gint _tmp58__length1; gint _tmp59_; - gint _tmp60_; + gint* _tmp60_; + gint _tmp60__length1; gint _tmp61_; - gint* _tmp62_; - gint _tmp62__length1; - gint _tmp63_; - gint* _tmp64_; - gint _tmp64__length1; - gint _tmp65_; + gint _tmp62_; + gint* _tmp63_; + gint _tmp63__length1; + gint _tmp64_; + gint* _tmp65_; + gint _tmp65__length1; gint _tmp66_; gint _tmp67_; - gint* _tmp68_; - gint _tmp68__length1; - gint _tmp69_; - gint* _tmp70_; - gint _tmp70__length1; - gint _tmp71_; - gint _tmp72_; - gint _tmp73_; #line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp53_) { -#line 9496 "ColorTransformation.c" - gint _tmp54_; + if (!_tmp50_) { +#line 9070 "ColorTransformation.c" + gint _tmp51_; #line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp54_ = i; + _tmp51_ = i; #line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - i = _tmp54_ + 1; -#line 9502 "ColorTransformation.c" + i = _tmp51_ + 1; +#line 9076 "ColorTransformation.c" } #line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp53_ = FALSE; + _tmp50_ = FALSE; #line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp55_ = i; + _tmp52_ = i; #line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp55_ < 256)) { + if (!(_tmp52_ < 256)) { #line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 9512 "ColorTransformation.c" +#line 9086 "ColorTransformation.c" } #line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp56_ = self->priv->qualitative_red_counts; + _tmp53_ = self->priv->qualitative_red_counts; #line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp56__length1 = self->priv->qualitative_red_counts_length1; + _tmp53__length1 = self->priv->qualitative_red_counts_length1; #line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp57_ = i; + _tmp54_ = i; #line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp58_ = temp_red_counts; + _tmp55_ = temp_red_counts; #line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp58__length1 = temp_red_counts_length1; -#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp59_ = i; + _tmp55__length1 = temp_red_counts_length1; #line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp60_ = rgb_histogram_correct_snap_to_quantization (self, _tmp58_, _tmp58__length1, _tmp59_); + _tmp56_ = i; #line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp56_[_tmp57_] = _tmp60_; + _tmp53_[_tmp54_] = rgb_histogram_correct_snap_to_quantization (self, _tmp55_, _tmp55__length1, _tmp56_); #line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp61_ = _tmp56_[_tmp57_]; + _tmp57_ = _tmp53_[_tmp54_]; #line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp62_ = self->priv->qualitative_green_counts; + _tmp58_ = self->priv->qualitative_green_counts; #line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp62__length1 = self->priv->qualitative_green_counts_length1; + _tmp58__length1 = self->priv->qualitative_green_counts_length1; #line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp63_ = i; -#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp64_ = temp_green_counts; + _tmp59_ = i; #line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp64__length1 = temp_green_counts_length1; + _tmp60_ = temp_green_counts; #line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp65_ = i; + _tmp60__length1 = temp_green_counts_length1; #line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp66_ = rgb_histogram_correct_snap_to_quantization (self, _tmp64_, _tmp64__length1, _tmp65_); + _tmp61_ = i; #line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp62_[_tmp63_] = _tmp66_; + _tmp58_[_tmp59_] = rgb_histogram_correct_snap_to_quantization (self, _tmp60_, _tmp60__length1, _tmp61_); #line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp67_ = _tmp62_[_tmp63_]; + _tmp62_ = _tmp58_[_tmp59_]; #line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp68_ = self->priv->qualitative_blue_counts; + _tmp63_ = self->priv->qualitative_blue_counts; #line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp68__length1 = self->priv->qualitative_blue_counts_length1; + _tmp63__length1 = self->priv->qualitative_blue_counts_length1; #line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp69_ = i; + _tmp64_ = i; #line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp70_ = temp_blue_counts; + _tmp65_ = temp_blue_counts; #line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp70__length1 = temp_blue_counts_length1; + _tmp65__length1 = temp_blue_counts_length1; #line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp71_ = i; + _tmp66_ = i; #line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp72_ = rgb_histogram_correct_snap_to_quantization (self, _tmp70_, _tmp70__length1, _tmp71_); + _tmp63_[_tmp64_] = rgb_histogram_correct_snap_to_quantization (self, _tmp65_, _tmp65__length1, _tmp66_); #line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp68_[_tmp69_] = _tmp72_; -#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp73_ = _tmp68_[_tmp69_]; -#line 9568 "ColorTransformation.c" + _tmp67_ = _tmp63_[_tmp64_]; +#line 9136 "ColorTransformation.c" } } } #line 1040 "/home/jens/Source/shotwell/src/ColorTransformation.vala" mean_qual_count = 0; -#line 9574 "ColorTransformation.c" +#line 9142 "ColorTransformation.c" { gint i = 0; #line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = 0; -#line 9579 "ColorTransformation.c" +#line 9147 "ColorTransformation.c" { - gboolean _tmp74_ = FALSE; + gboolean _tmp68_ = FALSE; #line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp74_ = TRUE; + _tmp68_ = TRUE; #line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 9586 "ColorTransformation.c" +#line 9154 "ColorTransformation.c" + gint _tmp70_; + gint _tmp71_; + gint* _tmp72_; + gint _tmp72__length1; + gint _tmp73_; + gint _tmp74_; + gint* _tmp75_; + gint _tmp75__length1; gint _tmp76_; gint _tmp77_; gint* _tmp78_; gint _tmp78__length1; gint _tmp79_; gint _tmp80_; - gint* _tmp81_; - gint _tmp81__length1; - gint _tmp82_; - gint _tmp83_; - gint* _tmp84_; - gint _tmp84__length1; - gint _tmp85_; - gint _tmp86_; #line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp74_) { -#line 9603 "ColorTransformation.c" - gint _tmp75_; + if (!_tmp68_) { +#line 9171 "ColorTransformation.c" + gint _tmp69_; #line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp75_ = i; + _tmp69_ = i; #line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - i = _tmp75_ + 1; -#line 9609 "ColorTransformation.c" + i = _tmp69_ + 1; +#line 9177 "ColorTransformation.c" } #line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp74_ = FALSE; + _tmp68_ = FALSE; #line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp76_ = i; + _tmp70_ = i; #line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp76_ < 256)) { + if (!(_tmp70_ < 256)) { #line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 9619 "ColorTransformation.c" +#line 9187 "ColorTransformation.c" } #line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp77_ = mean_qual_count; + _tmp71_ = mean_qual_count; #line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp78_ = self->priv->qualitative_red_counts; + _tmp72_ = self->priv->qualitative_red_counts; #line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp78__length1 = self->priv->qualitative_red_counts_length1; + _tmp72__length1 = self->priv->qualitative_red_counts_length1; #line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp79_ = i; + _tmp73_ = i; #line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp80_ = _tmp78_[_tmp79_]; + _tmp74_ = _tmp72_[_tmp73_]; #line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp81_ = self->priv->qualitative_green_counts; + _tmp75_ = self->priv->qualitative_green_counts; #line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp81__length1 = self->priv->qualitative_green_counts_length1; + _tmp75__length1 = self->priv->qualitative_green_counts_length1; #line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp82_ = i; + _tmp76_ = i; #line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp83_ = _tmp81_[_tmp82_]; + _tmp77_ = _tmp75_[_tmp76_]; #line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp84_ = self->priv->qualitative_blue_counts; + _tmp78_ = self->priv->qualitative_blue_counts; #line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp84__length1 = self->priv->qualitative_blue_counts_length1; + _tmp78__length1 = self->priv->qualitative_blue_counts_length1; #line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp85_ = i; + _tmp79_ = i; #line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp86_ = _tmp84_[_tmp85_]; + _tmp80_ = _tmp78_[_tmp79_]; #line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - mean_qual_count = _tmp77_ + ((_tmp80_ + _tmp83_) + _tmp86_); -#line 9649 "ColorTransformation.c" + mean_qual_count = _tmp71_ + ((_tmp74_ + _tmp77_) + _tmp80_); +#line 9217 "ColorTransformation.c" } } } #line 1045 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp87_ = mean_qual_count; + _tmp81_ = mean_qual_count; #line 1045 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - mean_qual_count = _tmp87_ / (256 * 3); + mean_qual_count = _tmp81_ / (256 * 3); #line 1046 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp88_ = mean_qual_count; + _tmp82_ = mean_qual_count; #line 1046 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - constrained_max_qual_count = 8 * _tmp88_; -#line 9661 "ColorTransformation.c" + constrained_max_qual_count = 8 * _tmp82_; +#line 9229 "ColorTransformation.c" { gint i = 0; #line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = 0; -#line 9666 "ColorTransformation.c" +#line 9234 "ColorTransformation.c" { - gboolean _tmp89_ = FALSE; + gboolean _tmp83_ = FALSE; #line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp89_ = TRUE; + _tmp83_ = TRUE; #line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 9673 "ColorTransformation.c" - gint _tmp91_; - gint* _tmp92_; - gint _tmp92__length1; - gint _tmp93_; - gint _tmp94_; +#line 9241 "ColorTransformation.c" + gint _tmp85_; + gint* _tmp86_; + gint _tmp86__length1; + gint _tmp87_; + gint _tmp88_; + gint _tmp89_; + gint* _tmp94_; + gint _tmp94__length1; gint _tmp95_; - gint* _tmp100_; - gint _tmp100__length1; - gint _tmp101_; - gint _tmp102_; + gint _tmp96_; + gint _tmp97_; + gint* _tmp102_; + gint _tmp102__length1; gint _tmp103_; - gint* _tmp108_; - gint _tmp108__length1; - gint _tmp109_; - gint _tmp110_; - gint _tmp111_; + gint _tmp104_; + gint _tmp105_; #line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp89_) { -#line 9692 "ColorTransformation.c" - gint _tmp90_; + if (!_tmp83_) { +#line 9260 "ColorTransformation.c" + gint _tmp84_; #line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp90_ = i; + _tmp84_ = i; #line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - i = _tmp90_ + 1; -#line 9698 "ColorTransformation.c" + i = _tmp84_ + 1; +#line 9266 "ColorTransformation.c" } #line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp89_ = FALSE; + _tmp83_ = FALSE; #line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp91_ = i; + _tmp85_ = i; #line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp91_ < 256)) { + if (!(_tmp85_ < 256)) { #line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 9708 "ColorTransformation.c" +#line 9276 "ColorTransformation.c" } #line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp92_ = self->priv->qualitative_red_counts; + _tmp86_ = self->priv->qualitative_red_counts; #line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp92__length1 = self->priv->qualitative_red_counts_length1; + _tmp86__length1 = self->priv->qualitative_red_counts_length1; #line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp93_ = i; + _tmp87_ = i; #line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp94_ = _tmp92_[_tmp93_]; + _tmp88_ = _tmp86_[_tmp87_]; #line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp95_ = constrained_max_qual_count; + _tmp89_ = constrained_max_qual_count; #line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp94_ > _tmp95_) { -#line 9722 "ColorTransformation.c" - gint* _tmp96_; - gint _tmp96__length1; - gint _tmp97_; - gint _tmp98_; - gint _tmp99_; + if (_tmp88_ > _tmp89_) { +#line 9290 "ColorTransformation.c" + gint* _tmp90_; + gint _tmp90__length1; + gint _tmp91_; + gint _tmp92_; + gint _tmp93_; #line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp96_ = self->priv->qualitative_red_counts; + _tmp90_ = self->priv->qualitative_red_counts; #line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp96__length1 = self->priv->qualitative_red_counts_length1; + _tmp90__length1 = self->priv->qualitative_red_counts_length1; #line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp97_ = i; + _tmp91_ = i; #line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp98_ = constrained_max_qual_count; + _tmp92_ = constrained_max_qual_count; #line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp96_[_tmp97_] = _tmp98_; + _tmp90_[_tmp91_] = _tmp92_; #line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp99_ = _tmp96_[_tmp97_]; -#line 9740 "ColorTransformation.c" + _tmp93_ = _tmp90_[_tmp91_]; +#line 9308 "ColorTransformation.c" } #line 1051 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp100_ = self->priv->qualitative_green_counts; + _tmp94_ = self->priv->qualitative_green_counts; #line 1051 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp100__length1 = self->priv->qualitative_green_counts_length1; + _tmp94__length1 = self->priv->qualitative_green_counts_length1; #line 1051 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp101_ = i; + _tmp95_ = i; #line 1051 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp102_ = _tmp100_[_tmp101_]; + _tmp96_ = _tmp94_[_tmp95_]; #line 1051 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp103_ = constrained_max_qual_count; + _tmp97_ = constrained_max_qual_count; #line 1051 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp102_ > _tmp103_) { -#line 9754 "ColorTransformation.c" - gint* _tmp104_; - gint _tmp104__length1; - gint _tmp105_; - gint _tmp106_; - gint _tmp107_; + if (_tmp96_ > _tmp97_) { +#line 9322 "ColorTransformation.c" + gint* _tmp98_; + gint _tmp98__length1; + gint _tmp99_; + gint _tmp100_; + gint _tmp101_; #line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp104_ = self->priv->qualitative_green_counts; + _tmp98_ = self->priv->qualitative_green_counts; #line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp104__length1 = self->priv->qualitative_green_counts_length1; + _tmp98__length1 = self->priv->qualitative_green_counts_length1; #line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp105_ = i; + _tmp99_ = i; #line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp106_ = constrained_max_qual_count; + _tmp100_ = constrained_max_qual_count; #line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp104_[_tmp105_] = _tmp106_; + _tmp98_[_tmp99_] = _tmp100_; #line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp107_ = _tmp104_[_tmp105_]; -#line 9772 "ColorTransformation.c" + _tmp101_ = _tmp98_[_tmp99_]; +#line 9340 "ColorTransformation.c" } #line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp108_ = self->priv->qualitative_blue_counts; + _tmp102_ = self->priv->qualitative_blue_counts; #line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp108__length1 = self->priv->qualitative_blue_counts_length1; + _tmp102__length1 = self->priv->qualitative_blue_counts_length1; #line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp109_ = i; + _tmp103_ = i; #line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp110_ = _tmp108_[_tmp109_]; + _tmp104_ = _tmp102_[_tmp103_]; #line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp111_ = constrained_max_qual_count; + _tmp105_ = constrained_max_qual_count; #line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp110_ > _tmp111_) { -#line 9786 "ColorTransformation.c" - gint* _tmp112_; - gint _tmp112__length1; - gint _tmp113_; - gint _tmp114_; - gint _tmp115_; + if (_tmp104_ > _tmp105_) { +#line 9354 "ColorTransformation.c" + gint* _tmp106_; + gint _tmp106__length1; + gint _tmp107_; + gint _tmp108_; + gint _tmp109_; #line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp112_ = self->priv->qualitative_blue_counts; + _tmp106_ = self->priv->qualitative_blue_counts; #line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp112__length1 = self->priv->qualitative_blue_counts_length1; + _tmp106__length1 = self->priv->qualitative_blue_counts_length1; #line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp113_ = i; + _tmp107_ = i; #line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp114_ = constrained_max_qual_count; + _tmp108_ = constrained_max_qual_count; #line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp112_[_tmp113_] = _tmp114_; + _tmp106_[_tmp107_] = _tmp108_; #line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp115_ = _tmp112_[_tmp113_]; -#line 9804 "ColorTransformation.c" + _tmp109_ = _tmp106_[_tmp107_]; +#line 9372 "ColorTransformation.c" } } } @@ -9821,20 +9389,22 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) { temp_green_counts = (g_free (temp_green_counts), NULL); #line 995 "/home/jens/Source/shotwell/src/ColorTransformation.vala" temp_red_counts = (g_free (temp_red_counts), NULL); -#line 9821 "ColorTransformation.c" +#line 9389 "ColorTransformation.c" } -GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) { +GdkPixbuf* +rgb_histogram_get_graphic (RGBHistogram* self) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_; - GdkPixbuf* _tmp121_; - GdkPixbuf* _tmp122_; + GdkPixbuf* _tmp117_; + GdkPixbuf* _tmp118_; #line 1064 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp0_ = self->priv->graphic; #line 1064 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (_tmp0_ == NULL) { -#line 9834 "ColorTransformation.c" +#line 9404 "ColorTransformation.c" gint max_count = 0; GdkPixbuf* _tmp25_; gint rowstride = 0; @@ -9843,36 +9413,34 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) { gint _tmp28_; gint sample_bytes = 0; GdkPixbuf* _tmp29_; - gint _tmp30_; gint pixel_bytes = 0; - gint _tmp31_; - GdkPixbuf* _tmp32_; - gint _tmp33_; + gint _tmp30_; + GdkPixbuf* _tmp31_; gdouble scale_bar = 0.0; - gint _tmp34_; + gint _tmp32_; guchar* pixel_data = NULL; - GdkPixbuf* _tmp35_; - guint8* _tmp36_; + GdkPixbuf* _tmp33_; + guint8* _tmp34_; gint pixel_data_length1; gint _pixel_data_size_; - gint _tmp37_; + gint _tmp35_; #line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala" rgb_histogram_prepare_qualitative_counts (self); #line 1066 "/home/jens/Source/shotwell/src/ColorTransformation.vala" max_count = 0; -#line 9860 "ColorTransformation.c" +#line 9428 "ColorTransformation.c" { gint i = 0; #line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = 0; -#line 9865 "ColorTransformation.c" +#line 9433 "ColorTransformation.c" { gboolean _tmp1_ = FALSE; #line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp1_ = TRUE; #line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 9872 "ColorTransformation.c" +#line 9440 "ColorTransformation.c" gint _tmp3_; gint* _tmp4_; gint _tmp4__length1; @@ -9891,13 +9459,13 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) { gint _tmp21_; #line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!_tmp1_) { -#line 9891 "ColorTransformation.c" +#line 9459 "ColorTransformation.c" gint _tmp2_; #line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp2_ = i; #line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = _tmp2_ + 1; -#line 9897 "ColorTransformation.c" +#line 9465 "ColorTransformation.c" } #line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp1_ = FALSE; @@ -9907,7 +9475,7 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) { if (!(_tmp3_ < 256)) { #line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 9907 "ColorTransformation.c" +#line 9475 "ColorTransformation.c" } #line 1068 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp4_ = self->priv->qualitative_red_counts; @@ -9921,7 +9489,7 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) { _tmp7_ = max_count; #line 1068 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (_tmp6_ > _tmp7_) { -#line 9921 "ColorTransformation.c" +#line 9489 "ColorTransformation.c" gint* _tmp8_; gint _tmp8__length1; gint _tmp9_; @@ -9936,7 +9504,7 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) { _tmp10_ = _tmp8_[_tmp9_]; #line 1069 "/home/jens/Source/shotwell/src/ColorTransformation.vala" max_count = _tmp10_; -#line 9936 "ColorTransformation.c" +#line 9504 "ColorTransformation.c" } #line 1070 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp11_ = self->priv->qualitative_green_counts; @@ -9950,7 +9518,7 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) { _tmp14_ = max_count; #line 1070 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (_tmp13_ > _tmp14_) { -#line 9950 "ColorTransformation.c" +#line 9518 "ColorTransformation.c" gint* _tmp15_; gint _tmp15__length1; gint _tmp16_; @@ -9965,7 +9533,7 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) { _tmp17_ = _tmp15_[_tmp16_]; #line 1071 "/home/jens/Source/shotwell/src/ColorTransformation.vala" max_count = _tmp17_; -#line 9965 "ColorTransformation.c" +#line 9533 "ColorTransformation.c" } #line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp18_ = self->priv->qualitative_blue_counts; @@ -9979,7 +9547,7 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) { _tmp21_ = max_count; #line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (_tmp20_ > _tmp21_) { -#line 9979 "ColorTransformation.c" +#line 9547 "ColorTransformation.c" gint* _tmp22_; gint _tmp22__length1; gint _tmp23_; @@ -9994,7 +9562,7 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) { _tmp24_ = _tmp22_[_tmp23_]; #line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala" max_count = _tmp24_; -#line 9994 "ColorTransformation.c" +#line 9562 "ColorTransformation.c" } } } @@ -10016,482 +9584,472 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) { #line 1080 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp29_ = self->priv->graphic; #line 1080 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp30_ = gdk_pixbuf_get_bits_per_sample (_tmp29_); -#line 1080 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - sample_bytes = _tmp30_ / 8; + sample_bytes = gdk_pixbuf_get_bits_per_sample (_tmp29_) / 8; #line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp31_ = sample_bytes; + _tmp30_ = sample_bytes; #line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp32_ = self->priv->graphic; + _tmp31_ = self->priv->graphic; #line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp33_ = gdk_pixbuf_get_n_channels (_tmp32_); -#line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_bytes = _tmp31_ * _tmp33_; + pixel_bytes = _tmp30_ * gdk_pixbuf_get_n_channels (_tmp31_); #line 1083 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp34_ = max_count; + _tmp32_ = max_count; #line 1083 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - scale_bar = (0.98 * ((gdouble) RGB_HISTOGRAM_GRAPHIC_HEIGHT)) / ((gdouble) _tmp34_); + scale_bar = (0.98 * ((gdouble) RGB_HISTOGRAM_GRAPHIC_HEIGHT)) / ((gdouble) _tmp32_); #line 1086 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp35_ = self->priv->graphic; + _tmp33_ = self->priv->graphic; #line 1086 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp36_ = gdk_pixbuf_get_pixels (_tmp35_); + _tmp34_ = gdk_pixbuf_get_pixels (_tmp33_); #line 1086 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_data = _tmp36_; + pixel_data = _tmp34_; #line 1086 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixel_data_length1 = -1; #line 1086 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _pixel_data_size_ = pixel_data_length1; #line 1090 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp37_ = max_count; + _tmp35_ = max_count; #line 1090 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp37_ == 0) { -#line 10045 "ColorTransformation.c" - GdkPixbuf* _tmp51_; - GdkPixbuf* _tmp52_; + if (_tmp35_ == 0) { +#line 9609 "ColorTransformation.c" + GdkPixbuf* _tmp49_; + GdkPixbuf* _tmp50_; { gint i = 0; #line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = 0; -#line 10052 "ColorTransformation.c" +#line 9616 "ColorTransformation.c" { - gboolean _tmp38_ = FALSE; + gboolean _tmp36_ = FALSE; #line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp38_ = TRUE; + _tmp36_ = TRUE; #line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 10059 "ColorTransformation.c" - gint _tmp40_; +#line 9623 "ColorTransformation.c" + gint _tmp38_; + gint _tmp39_; + GdkPixbuf* _tmp40_; gint _tmp41_; - GdkPixbuf* _tmp42_; - gint _tmp43_; + gint _tmp42_; + GdkPixbuf* _tmp43_; gint _tmp44_; - GdkPixbuf* _tmp45_; - gint _tmp46_; + gint _tmp45_; + guchar* _tmp46_; + gint _tmp46__length1; gint _tmp47_; - guchar* _tmp48_; - gint _tmp48__length1; - gint _tmp49_; - guchar _tmp50_; + guchar _tmp48_; #line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp38_) { -#line 10074 "ColorTransformation.c" - gint _tmp39_; + if (!_tmp36_) { +#line 9638 "ColorTransformation.c" + gint _tmp37_; #line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp39_ = i; + _tmp37_ = i; #line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - i = _tmp39_ + 1; -#line 10080 "ColorTransformation.c" + i = _tmp37_ + 1; +#line 9644 "ColorTransformation.c" } #line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp38_ = FALSE; + _tmp36_ = FALSE; #line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp40_ = i; + _tmp38_ = i; #line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp41_ = pixel_bytes; + _tmp39_ = pixel_bytes; #line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp42_ = self->priv->graphic; + _tmp40_ = self->priv->graphic; #line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp43_ = gdk_pixbuf_get_width (_tmp42_); + _tmp41_ = gdk_pixbuf_get_width (_tmp40_); #line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp44_ = _tmp43_; + _tmp42_ = _tmp41_; #line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp45_ = self->priv->graphic; + _tmp43_ = self->priv->graphic; #line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp46_ = gdk_pixbuf_get_height (_tmp45_); + _tmp44_ = gdk_pixbuf_get_height (_tmp43_); #line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp47_ = _tmp46_; + _tmp45_ = _tmp44_; #line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp40_ < ((_tmp41_ * _tmp44_) * _tmp47_))) { + if (!(_tmp38_ < ((_tmp39_ * _tmp42_) * _tmp45_))) { #line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 10104 "ColorTransformation.c" +#line 9668 "ColorTransformation.c" } #line 1092 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp48_ = pixel_data; + _tmp46_ = pixel_data; #line 1092 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp48__length1 = pixel_data_length1; + _tmp46__length1 = pixel_data_length1; #line 1092 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp49_ = i; + _tmp47_ = i; #line 1092 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp48_[_tmp49_] = RGB_HISTOGRAM_UNMARKED_BACKGROUND; + _tmp46_[_tmp47_] = RGB_HISTOGRAM_UNMARKED_BACKGROUND; #line 1092 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp50_ = _tmp48_[_tmp49_]; -#line 10116 "ColorTransformation.c" + _tmp48_ = _tmp46_[_tmp47_]; +#line 9680 "ColorTransformation.c" } } } #line 1094 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp51_ = self->priv->graphic; + _tmp49_ = self->priv->graphic; #line 1094 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp52_ = _g_object_ref0 (_tmp51_); + _tmp50_ = _g_object_ref0 (_tmp49_); #line 1094 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - result = _tmp52_; + result = _tmp50_; #line 1094 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 10128 "ColorTransformation.c" +#line 9692 "ColorTransformation.c" } { gint x = 0; #line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala" x = 0; -#line 10134 "ColorTransformation.c" +#line 9698 "ColorTransformation.c" { - gboolean _tmp53_ = FALSE; + gboolean _tmp51_ = FALSE; #line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp53_ = TRUE; + _tmp51_ = TRUE; #line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 10141 "ColorTransformation.c" - gint _tmp55_; +#line 9705 "ColorTransformation.c" + gint _tmp53_; gint red_bar_height = 0; - gint* _tmp56_; - gint _tmp56__length1; - gint _tmp57_; - gint _tmp58_; - gdouble _tmp59_; + gint* _tmp54_; + gint _tmp54__length1; + gint _tmp55_; + gint _tmp56_; + gdouble _tmp57_; gint green_bar_height = 0; - gint* _tmp60_; - gint _tmp60__length1; - gint _tmp61_; - gint _tmp62_; - gdouble _tmp63_; + gint* _tmp58_; + gint _tmp58__length1; + gint _tmp59_; + gint _tmp60_; + gdouble _tmp61_; gint blue_bar_height = 0; - gint* _tmp64_; - gint _tmp64__length1; - gint _tmp65_; - gint _tmp66_; - gdouble _tmp67_; + gint* _tmp62_; + gint _tmp62__length1; + gint _tmp63_; + gint _tmp64_; + gdouble _tmp65_; gint max_bar_height = 0; + gint _tmp66_; + gint _tmp67_; gint _tmp68_; + gint y = 0; + gint pixel_index = 0; gint _tmp69_; gint _tmp70_; gint _tmp71_; gint _tmp72_; - gint y = 0; - gint pixel_index = 0; - gint _tmp73_; - gint _tmp74_; - gint _tmp75_; - gint _tmp76_; #line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp53_) { -#line 10175 "ColorTransformation.c" - gint _tmp54_; + if (!_tmp51_) { +#line 9737 "ColorTransformation.c" + gint _tmp52_; #line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp54_ = x; + _tmp52_ = x; #line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - x = _tmp54_ + 1; -#line 10181 "ColorTransformation.c" + x = _tmp52_ + 1; +#line 9743 "ColorTransformation.c" } #line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp53_ = FALSE; + _tmp51_ = FALSE; #line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp55_ = x; + _tmp53_ = x; #line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp55_ < 256)) { + if (!(_tmp53_ < 256)) { #line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 10191 "ColorTransformation.c" +#line 9753 "ColorTransformation.c" } #line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp56_ = self->priv->qualitative_red_counts; + _tmp54_ = self->priv->qualitative_red_counts; #line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp56__length1 = self->priv->qualitative_red_counts_length1; + _tmp54__length1 = self->priv->qualitative_red_counts_length1; #line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp57_ = x; + _tmp55_ = x; #line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp58_ = _tmp56_[_tmp57_]; + _tmp56_ = _tmp54_[_tmp55_]; #line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp59_ = scale_bar; + _tmp57_ = scale_bar; #line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - red_bar_height = (gint) (((gdouble) _tmp58_) * _tmp59_); + red_bar_height = (gint) (((gdouble) _tmp56_) * _tmp57_); #line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp60_ = self->priv->qualitative_green_counts; + _tmp58_ = self->priv->qualitative_green_counts; #line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp60__length1 = self->priv->qualitative_green_counts_length1; + _tmp58__length1 = self->priv->qualitative_green_counts_length1; #line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp61_ = x; + _tmp59_ = x; #line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp62_ = _tmp60_[_tmp61_]; + _tmp60_ = _tmp58_[_tmp59_]; #line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp63_ = scale_bar; + _tmp61_ = scale_bar; #line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - green_bar_height = (gint) (((gdouble) _tmp62_) * _tmp63_); + green_bar_height = (gint) (((gdouble) _tmp60_) * _tmp61_); #line 1102 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp64_ = self->priv->qualitative_blue_counts; + _tmp62_ = self->priv->qualitative_blue_counts; #line 1102 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp64__length1 = self->priv->qualitative_blue_counts_length1; + _tmp62__length1 = self->priv->qualitative_blue_counts_length1; #line 1102 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp65_ = x; + _tmp63_ = x; #line 1102 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp66_ = _tmp64_[_tmp65_]; + _tmp64_ = _tmp62_[_tmp63_]; #line 1102 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp67_ = scale_bar; + _tmp65_ = scale_bar; #line 1102 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - blue_bar_height = (gint) (((gdouble) _tmp66_) * _tmp67_); + blue_bar_height = (gint) (((gdouble) _tmp64_) * _tmp65_); #line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp68_ = red_bar_height; + _tmp66_ = red_bar_height; #line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp69_ = green_bar_height; + _tmp67_ = green_bar_height; #line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp70_ = MAX (_tmp68_, _tmp69_); + _tmp68_ = blue_bar_height; #line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp71_ = blue_bar_height; -#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp72_ = MAX (_tmp70_, _tmp71_); -#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - max_bar_height = _tmp72_; + max_bar_height = MAX (MAX (_tmp66_, _tmp67_), _tmp68_); #line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala" y = RGB_HISTOGRAM_GRAPHIC_HEIGHT - 1; #line 1109 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp73_ = x; + _tmp69_ = x; #line 1109 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp74_ = pixel_bytes; + _tmp70_ = pixel_bytes; #line 1109 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp75_ = y; + _tmp71_ = y; #line 1109 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp76_ = rowstride; + _tmp72_ = rowstride; #line 1109 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_index = (_tmp73_ * _tmp74_) + (_tmp75_ * _tmp76_); -#line 10253 "ColorTransformation.c" + pixel_index = (_tmp69_ * _tmp70_) + (_tmp71_ * _tmp72_); +#line 9811 "ColorTransformation.c" { - gboolean _tmp77_ = FALSE; + gboolean _tmp73_ = FALSE; #line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp77_ = TRUE; + _tmp73_ = TRUE; #line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 10260 "ColorTransformation.c" - gint _tmp79_; - gint _tmp80_; - guchar* _tmp81_; - gint _tmp81__length1; - gint _tmp82_; - guchar _tmp83_; - guchar* _tmp84_; - gint _tmp84__length1; - gint _tmp85_; - guchar _tmp86_; - guchar* _tmp87_; - gint _tmp87__length1; - gint _tmp88_; - guchar _tmp89_; - gint _tmp90_; +#line 9818 "ColorTransformation.c" + gint _tmp75_; + gint _tmp76_; + guchar* _tmp77_; + gint _tmp77__length1; + gint _tmp78_; + guchar _tmp79_; + guchar* _tmp80_; + gint _tmp80__length1; + gint _tmp81_; + guchar _tmp82_; + guchar* _tmp83_; + gint _tmp83__length1; + gint _tmp84_; + guchar _tmp85_; + gint _tmp86_; + gint _tmp87_; gint _tmp91_; - gint _tmp95_; + gint _tmp92_; gint _tmp96_; - gint _tmp100_; + gint _tmp97_; gint _tmp101_; - gint _tmp105_; - gint _tmp106_; + gint _tmp102_; #line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp77_) { -#line 10285 "ColorTransformation.c" - gint _tmp78_; + if (!_tmp73_) { +#line 9843 "ColorTransformation.c" + gint _tmp74_; #line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp78_ = y; + _tmp74_ = y; #line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - y = _tmp78_ - 1; -#line 10291 "ColorTransformation.c" + y = _tmp74_ - 1; +#line 9849 "ColorTransformation.c" } #line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp77_ = FALSE; + _tmp73_ = FALSE; #line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp79_ = y; + _tmp75_ = y; #line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp80_ = max_bar_height; + _tmp76_ = max_bar_height; #line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp79_ >= (RGB_HISTOGRAM_GRAPHIC_HEIGHT - _tmp80_))) { + if (!(_tmp75_ >= (RGB_HISTOGRAM_GRAPHIC_HEIGHT - _tmp76_))) { #line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 10303 "ColorTransformation.c" +#line 9861 "ColorTransformation.c" } #line 1111 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp81_ = pixel_data; + _tmp77_ = pixel_data; #line 1111 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp81__length1 = pixel_data_length1; + _tmp77__length1 = pixel_data_length1; #line 1111 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp82_ = pixel_index; + _tmp78_ = pixel_index; #line 1111 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp81_[_tmp82_] = RGB_HISTOGRAM_MARKED_BACKGROUND; + _tmp77_[_tmp78_] = RGB_HISTOGRAM_MARKED_BACKGROUND; #line 1111 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp83_ = _tmp81_[_tmp82_]; + _tmp79_ = _tmp77_[_tmp78_]; #line 1112 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp84_ = pixel_data; + _tmp80_ = pixel_data; #line 1112 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp84__length1 = pixel_data_length1; + _tmp80__length1 = pixel_data_length1; #line 1112 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp85_ = pixel_index; + _tmp81_ = pixel_index; #line 1112 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp84_[_tmp85_ + 1] = RGB_HISTOGRAM_MARKED_BACKGROUND; + _tmp80_[_tmp81_ + 1] = RGB_HISTOGRAM_MARKED_BACKGROUND; #line 1112 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp86_ = _tmp84_[_tmp85_ + 1]; + _tmp82_ = _tmp80_[_tmp81_ + 1]; #line 1113 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp87_ = pixel_data; + _tmp83_ = pixel_data; #line 1113 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp87__length1 = pixel_data_length1; + _tmp83__length1 = pixel_data_length1; #line 1113 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp88_ = pixel_index; + _tmp84_ = pixel_index; #line 1113 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp87_[_tmp88_ + 2] = RGB_HISTOGRAM_MARKED_BACKGROUND; + _tmp83_[_tmp84_ + 2] = RGB_HISTOGRAM_MARKED_BACKGROUND; #line 1113 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp89_ = _tmp87_[_tmp88_ + 2]; + _tmp85_ = _tmp83_[_tmp84_ + 2]; #line 1115 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp90_ = y; + _tmp86_ = y; #line 1115 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp91_ = red_bar_height; + _tmp87_ = red_bar_height; #line 1115 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp90_ >= ((RGB_HISTOGRAM_GRAPHIC_HEIGHT - _tmp91_) - 1)) { -#line 10341 "ColorTransformation.c" - guchar* _tmp92_; - gint _tmp92__length1; - gint _tmp93_; - guchar _tmp94_; + if (_tmp86_ >= ((RGB_HISTOGRAM_GRAPHIC_HEIGHT - _tmp87_) - 1)) { +#line 9899 "ColorTransformation.c" + guchar* _tmp88_; + gint _tmp88__length1; + gint _tmp89_; + guchar _tmp90_; #line 1116 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp92_ = pixel_data; + _tmp88_ = pixel_data; #line 1116 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp92__length1 = pixel_data_length1; + _tmp88__length1 = pixel_data_length1; #line 1116 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp93_ = pixel_index; + _tmp89_ = pixel_index; #line 1116 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp92_[_tmp93_] = RGB_HISTOGRAM_MARKED_FOREGROUND; + _tmp88_[_tmp89_] = RGB_HISTOGRAM_MARKED_FOREGROUND; #line 1116 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp94_ = _tmp92_[_tmp93_]; -#line 10356 "ColorTransformation.c" + _tmp90_ = _tmp88_[_tmp89_]; +#line 9914 "ColorTransformation.c" } #line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp95_ = y; + _tmp91_ = y; #line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp96_ = green_bar_height; + _tmp92_ = green_bar_height; #line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp95_ >= ((RGB_HISTOGRAM_GRAPHIC_HEIGHT - _tmp96_) - 1)) { -#line 10364 "ColorTransformation.c" - guchar* _tmp97_; - gint _tmp97__length1; - gint _tmp98_; - guchar _tmp99_; + if (_tmp91_ >= ((RGB_HISTOGRAM_GRAPHIC_HEIGHT - _tmp92_) - 1)) { +#line 9922 "ColorTransformation.c" + guchar* _tmp93_; + gint _tmp93__length1; + gint _tmp94_; + guchar _tmp95_; #line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp97_ = pixel_data; + _tmp93_ = pixel_data; #line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp97__length1 = pixel_data_length1; + _tmp93__length1 = pixel_data_length1; #line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp98_ = pixel_index; + _tmp94_ = pixel_index; #line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp97_[_tmp98_ + 1] = RGB_HISTOGRAM_MARKED_FOREGROUND; + _tmp93_[_tmp94_ + 1] = RGB_HISTOGRAM_MARKED_FOREGROUND; #line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp99_ = _tmp97_[_tmp98_ + 1]; -#line 10379 "ColorTransformation.c" + _tmp95_ = _tmp93_[_tmp94_ + 1]; +#line 9937 "ColorTransformation.c" } #line 1119 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp100_ = y; + _tmp96_ = y; #line 1119 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp101_ = blue_bar_height; + _tmp97_ = blue_bar_height; #line 1119 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp100_ >= ((RGB_HISTOGRAM_GRAPHIC_HEIGHT - _tmp101_) - 1)) { -#line 10387 "ColorTransformation.c" - guchar* _tmp102_; - gint _tmp102__length1; - gint _tmp103_; - guchar _tmp104_; + if (_tmp96_ >= ((RGB_HISTOGRAM_GRAPHIC_HEIGHT - _tmp97_) - 1)) { +#line 9945 "ColorTransformation.c" + guchar* _tmp98_; + gint _tmp98__length1; + gint _tmp99_; + guchar _tmp100_; #line 1120 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp102_ = pixel_data; + _tmp98_ = pixel_data; #line 1120 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp102__length1 = pixel_data_length1; + _tmp98__length1 = pixel_data_length1; #line 1120 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp103_ = pixel_index; + _tmp99_ = pixel_index; #line 1120 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp102_[_tmp103_ + 2] = RGB_HISTOGRAM_MARKED_FOREGROUND; + _tmp98_[_tmp99_ + 2] = RGB_HISTOGRAM_MARKED_FOREGROUND; #line 1120 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp104_ = _tmp102_[_tmp103_ + 2]; -#line 10402 "ColorTransformation.c" + _tmp100_ = _tmp98_[_tmp99_ + 2]; +#line 9960 "ColorTransformation.c" } #line 1122 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp105_ = pixel_index; + _tmp101_ = pixel_index; #line 1122 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp106_ = rowstride; + _tmp102_ = rowstride; #line 1122 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_index = _tmp105_ - _tmp106_; -#line 10410 "ColorTransformation.c" + pixel_index = _tmp101_ - _tmp102_; +#line 9968 "ColorTransformation.c" } } { - gboolean _tmp107_ = FALSE; + gboolean _tmp103_ = FALSE; #line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp107_ = TRUE; + _tmp103_ = TRUE; #line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 10419 "ColorTransformation.c" - gint _tmp109_; - guchar* _tmp110_; - gint _tmp110__length1; - gint _tmp111_; - guchar _tmp112_; - guchar* _tmp113_; - gint _tmp113__length1; - gint _tmp114_; - guchar _tmp115_; - guchar* _tmp116_; - gint _tmp116__length1; - gint _tmp117_; - guchar _tmp118_; - gint _tmp119_; - gint _tmp120_; +#line 9977 "ColorTransformation.c" + gint _tmp105_; + guchar* _tmp106_; + gint _tmp106__length1; + gint _tmp107_; + guchar _tmp108_; + guchar* _tmp109_; + gint _tmp109__length1; + gint _tmp110_; + guchar _tmp111_; + guchar* _tmp112_; + gint _tmp112__length1; + gint _tmp113_; + guchar _tmp114_; + gint _tmp115_; + gint _tmp116_; #line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp107_) { -#line 10437 "ColorTransformation.c" - gint _tmp108_; + if (!_tmp103_) { +#line 9995 "ColorTransformation.c" + gint _tmp104_; #line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp108_ = y; + _tmp104_ = y; #line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - y = _tmp108_ - 1; -#line 10443 "ColorTransformation.c" + y = _tmp104_ - 1; +#line 10001 "ColorTransformation.c" } #line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp107_ = FALSE; + _tmp103_ = FALSE; #line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp109_ = y; + _tmp105_ = y; #line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp109_ >= 0)) { + if (!(_tmp105_ >= 0)) { #line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 10453 "ColorTransformation.c" +#line 10011 "ColorTransformation.c" } #line 1126 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp110_ = pixel_data; + _tmp106_ = pixel_data; #line 1126 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp110__length1 = pixel_data_length1; + _tmp106__length1 = pixel_data_length1; #line 1126 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp111_ = pixel_index; + _tmp107_ = pixel_index; #line 1126 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp110_[_tmp111_] = RGB_HISTOGRAM_UNMARKED_BACKGROUND; + _tmp106_[_tmp107_] = RGB_HISTOGRAM_UNMARKED_BACKGROUND; #line 1126 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp112_ = _tmp110_[_tmp111_]; + _tmp108_ = _tmp106_[_tmp107_]; #line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp113_ = pixel_data; + _tmp109_ = pixel_data; #line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp113__length1 = pixel_data_length1; + _tmp109__length1 = pixel_data_length1; #line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp114_ = pixel_index; + _tmp110_ = pixel_index; #line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp113_[_tmp114_ + 1] = RGB_HISTOGRAM_UNMARKED_BACKGROUND; + _tmp109_[_tmp110_ + 1] = RGB_HISTOGRAM_UNMARKED_BACKGROUND; #line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp115_ = _tmp113_[_tmp114_ + 1]; + _tmp111_ = _tmp109_[_tmp110_ + 1]; #line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp116_ = pixel_data; + _tmp112_ = pixel_data; #line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp116__length1 = pixel_data_length1; + _tmp112__length1 = pixel_data_length1; #line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp117_ = pixel_index; + _tmp113_ = pixel_index; #line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp116_[_tmp117_ + 2] = RGB_HISTOGRAM_UNMARKED_BACKGROUND; + _tmp112_[_tmp113_ + 2] = RGB_HISTOGRAM_UNMARKED_BACKGROUND; #line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp118_ = _tmp116_[_tmp117_ + 2]; + _tmp114_ = _tmp112_[_tmp113_ + 2]; #line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp119_ = pixel_index; + _tmp115_ = pixel_index; #line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp120_ = rowstride; + _tmp116_ = rowstride; #line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_index = _tmp119_ - _tmp120_; -#line 10491 "ColorTransformation.c" + pixel_index = _tmp115_ - _tmp116_; +#line 10049 "ColorTransformation.c" } } } @@ -10499,115 +10057,140 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) { } } #line 1135 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp121_ = self->priv->graphic; + _tmp117_ = self->priv->graphic; #line 1135 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp122_ = _g_object_ref0 (_tmp121_); + _tmp118_ = _g_object_ref0 (_tmp117_); #line 1135 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - result = _tmp122_; + result = _tmp118_; #line 1135 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 10506 "ColorTransformation.c" +#line 10064 "ColorTransformation.c" } -static void value_rgb_histogram_init (GValue* value) { +static void +value_rgb_histogram_init (GValue* value) +{ #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 10513 "ColorTransformation.c" +#line 10073 "ColorTransformation.c" } -static void value_rgb_histogram_free_value (GValue* value) { +static void +value_rgb_histogram_free_value (GValue* value) +{ #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (value->data[0].v_pointer) { #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" rgb_histogram_unref (value->data[0].v_pointer); -#line 10522 "ColorTransformation.c" +#line 10084 "ColorTransformation.c" } } -static void value_rgb_histogram_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_rgb_histogram_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (src_value->data[0].v_pointer) { #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" dest_value->data[0].v_pointer = rgb_histogram_ref (src_value->data[0].v_pointer); -#line 10532 "ColorTransformation.c" +#line 10097 "ColorTransformation.c" } else { #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" dest_value->data[0].v_pointer = NULL; -#line 10536 "ColorTransformation.c" +#line 10101 "ColorTransformation.c" } } -static gpointer value_rgb_histogram_peek_pointer (const GValue* value) { +static gpointer +value_rgb_histogram_peek_pointer (const GValue* value) +{ #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return value->data[0].v_pointer; -#line 10544 "ColorTransformation.c" +#line 10111 "ColorTransformation.c" } -static gchar* value_rgb_histogram_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_rgb_histogram_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (collect_values[0].v_pointer) { -#line 10551 "ColorTransformation.c" +#line 10123 "ColorTransformation.c" RGBHistogram * object; object = collect_values[0].v_pointer; #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (object->parent_instance.g_class == NULL) { #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 10558 "ColorTransformation.c" +#line 10130 "ColorTransformation.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 10562 "ColorTransformation.c" +#line 10134 "ColorTransformation.c" } #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = rgb_histogram_ref (object); -#line 10566 "ColorTransformation.c" +#line 10138 "ColorTransformation.c" } else { #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 10570 "ColorTransformation.c" +#line 10142 "ColorTransformation.c" } #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return NULL; -#line 10574 "ColorTransformation.c" +#line 10146 "ColorTransformation.c" } -static gchar* value_rgb_histogram_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_rgb_histogram_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ RGBHistogram ** object_p; object_p = collect_values[0].v_pointer; #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!object_p) { #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 10585 "ColorTransformation.c" +#line 10162 "ColorTransformation.c" } #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!value->data[0].v_pointer) { #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" *object_p = NULL; -#line 10591 "ColorTransformation.c" +#line 10168 "ColorTransformation.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" *object_p = value->data[0].v_pointer; -#line 10595 "ColorTransformation.c" +#line 10172 "ColorTransformation.c" } else { #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" *object_p = rgb_histogram_ref (value->data[0].v_pointer); -#line 10599 "ColorTransformation.c" +#line 10176 "ColorTransformation.c" } #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return NULL; -#line 10603 "ColorTransformation.c" +#line 10180 "ColorTransformation.c" } -GParamSpec* param_spec_rgb_histogram (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_rgb_histogram (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecRGBHistogram* spec; #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_RGB_HISTOGRAM), NULL); @@ -10617,20 +10200,25 @@ GParamSpec* param_spec_rgb_histogram (const gchar* name, const gchar* nick, cons G_PARAM_SPEC (spec)->value_type = object_type; #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return G_PARAM_SPEC (spec); -#line 10617 "ColorTransformation.c" +#line 10200 "ColorTransformation.c" } -gpointer value_get_rgb_histogram (const GValue* value) { +gpointer +value_get_rgb_histogram (const GValue* value) +{ #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_RGB_HISTOGRAM), NULL); #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return value->data[0].v_pointer; -#line 10626 "ColorTransformation.c" +#line 10211 "ColorTransformation.c" } -void value_set_rgb_histogram (GValue* value, gpointer v_object) { +void +value_set_rgb_histogram (GValue* value, + gpointer v_object) +{ RGBHistogram * old; #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_RGB_HISTOGRAM)); @@ -10646,22 +10234,25 @@ void value_set_rgb_histogram (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" rgb_histogram_ref (value->data[0].v_pointer); -#line 10646 "ColorTransformation.c" +#line 10234 "ColorTransformation.c" } else { #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 10650 "ColorTransformation.c" +#line 10238 "ColorTransformation.c" } #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (old) { #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" rgb_histogram_unref (old); -#line 10656 "ColorTransformation.c" +#line 10244 "ColorTransformation.c" } } -void value_take_rgb_histogram (GValue* value, gpointer v_object) { +void +value_take_rgb_histogram (GValue* value, + gpointer v_object) +{ RGBHistogram * old; #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_RGB_HISTOGRAM)); @@ -10675,33 +10266,37 @@ void value_take_rgb_histogram (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = v_object; -#line 10675 "ColorTransformation.c" +#line 10266 "ColorTransformation.c" } else { #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 10679 "ColorTransformation.c" +#line 10270 "ColorTransformation.c" } #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (old) { #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" rgb_histogram_unref (old); -#line 10685 "ColorTransformation.c" +#line 10276 "ColorTransformation.c" } } -static void rgb_histogram_class_init (RGBHistogramClass * klass) { +static void +rgb_histogram_class_init (RGBHistogramClass * klass) +{ #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" rgb_histogram_parent_class = g_type_class_peek_parent (klass); #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" ((RGBHistogramClass *) klass)->finalize = rgb_histogram_finalize; #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_type_class_add_private (klass, sizeof (RGBHistogramPrivate)); -#line 10697 "ColorTransformation.c" +#line 10290 "ColorTransformation.c" } -static void rgb_histogram_instance_init (RGBHistogram * self) { +static void +rgb_histogram_instance_init (RGBHistogram * self) +{ gint* _tmp0_; gint* _tmp1_; gint* _tmp2_; @@ -10753,11 +10348,13 @@ static void rgb_histogram_instance_init (RGBHistogram * self) { self->priv->graphic = NULL; #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->ref_count = 1; -#line 10753 "ColorTransformation.c" +#line 10348 "ColorTransformation.c" } -static void rgb_histogram_finalize (RGBHistogram * obj) { +static void +rgb_histogram_finalize (RGBHistogram * obj) +{ RGBHistogram * self; #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RGB_HISTOGRAM, RGBHistogram); @@ -10777,11 +10374,13 @@ static void rgb_histogram_finalize (RGBHistogram * obj) { self->priv->qualitative_blue_counts = (g_free (self->priv->qualitative_blue_counts), NULL); #line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _g_object_unref0 (self->priv->graphic); -#line 10777 "ColorTransformation.c" +#line 10374 "ColorTransformation.c" } -GType rgb_histogram_get_type (void) { +GType +rgb_histogram_get_type (void) +{ static volatile gsize rgb_histogram_type_id__volatile = 0; if (g_once_init_enter (&rgb_histogram_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_rgb_histogram_init, value_rgb_histogram_free_value, value_rgb_histogram_copy_value, value_rgb_histogram_peek_pointer, "p", value_rgb_histogram_collect_value, "p", value_rgb_histogram_lcopy_value }; @@ -10795,18 +10394,22 @@ GType rgb_histogram_get_type (void) { } -gpointer rgb_histogram_ref (gpointer instance) { +gpointer +rgb_histogram_ref (gpointer instance) +{ RGBHistogram * self; self = instance; #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_atomic_int_inc (&self->ref_count); #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return instance; -#line 10802 "ColorTransformation.c" +#line 10403 "ColorTransformation.c" } -void rgb_histogram_unref (gpointer instance) { +void +rgb_histogram_unref (gpointer instance) +{ RGBHistogram * self; self = instance; #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -10815,250 +10418,224 @@ void rgb_histogram_unref (gpointer instance) { RGB_HISTOGRAM_GET_CLASS (self)->finalize (self); #line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_type_free_instance ((GTypeInstance *) self); -#line 10815 "ColorTransformation.c" +#line 10418 "ColorTransformation.c" } } -IntensityHistogram* intensity_histogram_construct (GType object_type, GdkPixbuf* pixbuf) { +IntensityHistogram* +intensity_histogram_construct (GType object_type, + GdkPixbuf* pixbuf) +{ IntensityHistogram* self = NULL; gint n_channels = 0; - GdkPixbuf* _tmp0_; - gint _tmp1_; gint rowstride = 0; - GdkPixbuf* _tmp2_; - gint _tmp3_; gint width = 0; - GdkPixbuf* _tmp4_; - gint _tmp5_; gint height = 0; - GdkPixbuf* _tmp6_; - gint _tmp7_; gint rowbytes = 0; - gint _tmp8_; - gint _tmp9_; + gint _tmp0_; + gint _tmp1_; guchar* pixels = NULL; - GdkPixbuf* _tmp10_; - guint8* _tmp11_; + guint8* _tmp2_; gint pixels_length1; gint _pixels_size_; gfloat pixel_count = 0.0F; - GdkPixbuf* _tmp41_; - gint _tmp42_; - gint _tmp43_; - GdkPixbuf* _tmp44_; - gint _tmp45_; - gint _tmp46_; + gint _tmp32_; + gint _tmp33_; + gint _tmp34_; + gint _tmp35_; gfloat accumulator = 0.0F; #line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = (IntensityHistogram*) g_type_create_instance (object_type); #line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = pixbuf; -#line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = gdk_pixbuf_get_n_channels (_tmp0_); -#line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - n_channels = _tmp1_; + n_channels = gdk_pixbuf_get_n_channels (pixbuf); #line 1146 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = pixbuf; -#line 1146 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = gdk_pixbuf_get_rowstride (_tmp2_); -#line 1146 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - rowstride = _tmp3_; -#line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = pixbuf; -#line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = gdk_pixbuf_get_width (_tmp4_); + rowstride = gdk_pixbuf_get_rowstride (pixbuf); #line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - width = _tmp5_; + width = gdk_pixbuf_get_width (pixbuf); #line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = pixbuf; -#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = gdk_pixbuf_get_height (_tmp6_); -#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - height = _tmp7_; + height = gdk_pixbuf_get_height (pixbuf); #line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = n_channels; + _tmp0_ = n_channels; #line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = width; + _tmp1_ = width; #line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - rowbytes = _tmp8_ * _tmp9_; + rowbytes = _tmp0_ * _tmp1_; #line 1150 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = pixbuf; + _tmp2_ = gdk_pixbuf_get_pixels (pixbuf); #line 1150 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = gdk_pixbuf_get_pixels (_tmp10_); -#line 1150 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixels = _tmp11_; + pixels = _tmp2_; #line 1150 "/home/jens/Source/shotwell/src/ColorTransformation.vala" pixels_length1 = -1; #line 1150 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _pixels_size_ = pixels_length1; -#line 10892 "ColorTransformation.c" +#line 10469 "ColorTransformation.c" { gint j = 0; #line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala" j = 0; -#line 10897 "ColorTransformation.c" +#line 10474 "ColorTransformation.c" { - gboolean _tmp12_ = FALSE; + gboolean _tmp3_ = FALSE; #line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = TRUE; + _tmp3_ = TRUE; #line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 10904 "ColorTransformation.c" - gint _tmp14_; - gint _tmp15_; +#line 10481 "ColorTransformation.c" + gint _tmp5_; + gint _tmp6_; gint row_start_index = 0; - gint _tmp16_; - gint _tmp17_; + gint _tmp7_; + gint _tmp8_; gint row_end_index = 0; - gint _tmp18_; - gint _tmp19_; + gint _tmp9_; + gint _tmp10_; #line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp12_) { -#line 10915 "ColorTransformation.c" - gint _tmp13_; + if (!_tmp3_) { +#line 10492 "ColorTransformation.c" + gint _tmp4_; #line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp13_ = j; + _tmp4_ = j; #line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - j = _tmp13_ + 1; -#line 10921 "ColorTransformation.c" + j = _tmp4_ + 1; +#line 10498 "ColorTransformation.c" } #line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = FALSE; + _tmp3_ = FALSE; #line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_ = j; + _tmp5_ = j; #line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp15_ = height; + _tmp6_ = height; #line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp14_ < _tmp15_)) { + if (!(_tmp5_ < _tmp6_)) { #line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 10933 "ColorTransformation.c" +#line 10510 "ColorTransformation.c" } #line 1152 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp16_ = j; + _tmp7_ = j; #line 1152 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp17_ = rowstride; + _tmp8_ = rowstride; #line 1152 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - row_start_index = _tmp16_ * _tmp17_; + row_start_index = _tmp7_ * _tmp8_; #line 1153 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18_ = row_start_index; + _tmp9_ = row_start_index; #line 1153 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp19_ = rowbytes; + _tmp10_ = rowbytes; #line 1153 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - row_end_index = _tmp18_ + _tmp19_; -#line 10947 "ColorTransformation.c" + row_end_index = _tmp9_ + _tmp10_; +#line 10524 "ColorTransformation.c" { gint i = 0; - gint _tmp20_; + gint _tmp11_; #line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp20_ = row_start_index; + _tmp11_ = row_start_index; #line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - i = _tmp20_; -#line 10955 "ColorTransformation.c" + i = _tmp11_; +#line 10532 "ColorTransformation.c" { - gboolean _tmp21_ = FALSE; + gboolean _tmp12_ = FALSE; #line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp21_ = TRUE; + _tmp12_ = TRUE; #line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 10962 "ColorTransformation.c" - gint _tmp24_; - gint _tmp25_; +#line 10539 "ColorTransformation.c" + gint _tmp15_; + gint _tmp16_; RGBAnalyticPixel pix_rgb = {0}; - guchar* _tmp26_; - gint _tmp26__length1; - gint _tmp27_; - guchar _tmp28_; - guchar* _tmp29_; - gint _tmp29__length1; - gint _tmp30_; - guchar _tmp31_; - guchar* _tmp32_; - gint _tmp32__length1; - gint _tmp33_; - guchar _tmp34_; + guchar* _tmp17_; + gint _tmp17__length1; + gint _tmp18_; + guchar _tmp19_; + guchar* _tmp20_; + gint _tmp20__length1; + gint _tmp21_; + guchar _tmp22_; + guchar* _tmp23_; + gint _tmp23__length1; + gint _tmp24_; + guchar _tmp25_; HSVAnalyticPixel pix_hsi = {0}; - RGBAnalyticPixel _tmp35_; + RGBAnalyticPixel _tmp26_; gint quantized_light_value = 0; - HSVAnalyticPixel _tmp36_; - gfloat _tmp37_; - gint* _tmp38_; - gint _tmp38__length1; - gint _tmp39_; - gint _tmp40_; + HSVAnalyticPixel _tmp27_; + gfloat _tmp28_; + gint* _tmp29_; + gint _tmp29__length1; + gint _tmp30_; + gint _tmp31_; #line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp21_) { -#line 10989 "ColorTransformation.c" - gint _tmp22_; - gint _tmp23_; + if (!_tmp12_) { +#line 10566 "ColorTransformation.c" + gint _tmp13_; + gint _tmp14_; #line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp22_ = i; + _tmp13_ = i; #line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp23_ = n_channels; + _tmp14_ = n_channels; #line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - i = _tmp22_ + _tmp23_; -#line 10998 "ColorTransformation.c" + i = _tmp13_ + _tmp14_; +#line 10575 "ColorTransformation.c" } #line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp21_ = FALSE; + _tmp12_ = FALSE; #line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp24_ = i; + _tmp15_ = i; #line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp25_ = row_end_index; + _tmp16_ = row_end_index; #line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp24_ < _tmp25_)) { + if (!(_tmp15_ < _tmp16_)) { #line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 11010 "ColorTransformation.c" +#line 10587 "ColorTransformation.c" } #line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp26_ = pixels; + _tmp17_ = pixels; #line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp26__length1 = pixels_length1; + _tmp17__length1 = pixels_length1; #line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp27_ = i; + _tmp18_ = i; #line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp28_ = _tmp26_[_tmp27_]; + _tmp19_ = _tmp17_[_tmp18_]; #line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp29_ = pixels; + _tmp20_ = pixels; #line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp29__length1 = pixels_length1; + _tmp20__length1 = pixels_length1; #line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp30_ = i; + _tmp21_ = i; #line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp31_ = _tmp29_[_tmp30_ + 1]; + _tmp22_ = _tmp20_[_tmp21_ + 1]; #line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp32_ = pixels; + _tmp23_ = pixels; #line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp32__length1 = pixels_length1; + _tmp23__length1 = pixels_length1; #line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp33_ = i; + _tmp24_ = i; #line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp34_ = _tmp32_[_tmp33_ + 2]; + _tmp25_ = _tmp23_[_tmp24_ + 2]; #line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - rgb_analytic_pixel_init_from_quantized_components (&pix_rgb, _tmp28_, _tmp31_, _tmp34_); + rgb_analytic_pixel_init_from_quantized_components (&pix_rgb, _tmp19_, _tmp22_, _tmp25_); #line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp35_ = pix_rgb; + _tmp26_ = pix_rgb; #line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - hsv_analytic_pixel_init_from_rgb (&pix_hsi, &_tmp35_); + hsv_analytic_pixel_init_from_rgb (&pix_hsi, &_tmp26_); #line 1158 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp36_ = pix_hsi; + _tmp27_ = pix_hsi; #line 1158 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp37_ = _tmp36_.light_value; + _tmp28_ = _tmp27_.light_value; #line 1158 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - quantized_light_value = (gint) (_tmp37_ * 255.0f); + quantized_light_value = (gint) (_tmp28_ * 255.0f); #line 1159 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp38_ = self->priv->counts; + _tmp29_ = self->priv->counts; #line 1159 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp38__length1 = self->priv->counts_length1; + _tmp29__length1 = self->priv->counts_length1; #line 1159 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp39_ = quantized_light_value; + _tmp30_ = quantized_light_value; #line 1159 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp38_[_tmp39_] += 1; + _tmp29_[_tmp30_] += 1; #line 1159 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp40_ = _tmp38_[_tmp39_]; -#line 11058 "ColorTransformation.c" + _tmp31_ = _tmp29_[_tmp30_]; +#line 10635 "ColorTransformation.c" } } } @@ -11066,263 +10643,280 @@ IntensityHistogram* intensity_histogram_construct (GType object_type, GdkPixbuf* } } #line 1163 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp41_ = pixbuf; -#line 1163 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp42_ = gdk_pixbuf_get_width (_tmp41_); + _tmp32_ = gdk_pixbuf_get_width (pixbuf); #line 1163 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp43_ = _tmp42_; + _tmp33_ = _tmp32_; #line 1163 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp44_ = pixbuf; + _tmp34_ = gdk_pixbuf_get_height (pixbuf); #line 1163 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp45_ = gdk_pixbuf_get_height (_tmp44_); -#line 1163 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp46_ = _tmp45_; + _tmp35_ = _tmp34_; #line 1163 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_count = (gfloat) (_tmp43_ * _tmp46_); + pixel_count = (gfloat) (_tmp33_ * _tmp35_); #line 1164 "/home/jens/Source/shotwell/src/ColorTransformation.vala" accumulator = 0.0f; -#line 11081 "ColorTransformation.c" +#line 10654 "ColorTransformation.c" { gint i = 0; #line 1165 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = 0; -#line 11086 "ColorTransformation.c" +#line 10659 "ColorTransformation.c" { - gboolean _tmp47_ = FALSE; + gboolean _tmp36_ = FALSE; #line 1165 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp47_ = TRUE; + _tmp36_ = TRUE; #line 1165 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 11093 "ColorTransformation.c" - gint _tmp49_; +#line 10666 "ColorTransformation.c" + gint _tmp38_; + gfloat* _tmp39_; + gint _tmp39__length1; + gint _tmp40_; + gint* _tmp41_; + gint _tmp41__length1; + gint _tmp42_; + gint _tmp43_; + gfloat _tmp44_; + gfloat _tmp45_; + gfloat _tmp46_; + gfloat* _tmp47_; + gint _tmp47__length1; + gint _tmp48_; + gfloat _tmp49_; gfloat* _tmp50_; gint _tmp50__length1; gint _tmp51_; - gint* _tmp52_; - gint _tmp52__length1; - gint _tmp53_; - gint _tmp54_; - gfloat _tmp55_; - gfloat _tmp56_; - gfloat _tmp57_; - gfloat* _tmp58_; - gint _tmp58__length1; - gint _tmp59_; - gfloat _tmp60_; - gfloat* _tmp61_; - gint _tmp61__length1; - gint _tmp62_; - gfloat _tmp63_; - gfloat _tmp64_; + gfloat _tmp52_; + gfloat _tmp53_; #line 1165 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp47_) { -#line 11116 "ColorTransformation.c" - gint _tmp48_; + if (!_tmp36_) { +#line 10689 "ColorTransformation.c" + gint _tmp37_; #line 1165 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp48_ = i; + _tmp37_ = i; #line 1165 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - i = _tmp48_ + 1; -#line 11122 "ColorTransformation.c" + i = _tmp37_ + 1; +#line 10695 "ColorTransformation.c" } #line 1165 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp47_ = FALSE; + _tmp36_ = FALSE; #line 1165 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp49_ = i; + _tmp38_ = i; #line 1165 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp49_ < 256)) { + if (!(_tmp38_ < 256)) { #line 1165 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 11132 "ColorTransformation.c" +#line 10705 "ColorTransformation.c" } #line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp50_ = self->priv->probabilities; + _tmp39_ = self->priv->probabilities; #line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp50__length1 = self->priv->probabilities_length1; + _tmp39__length1 = self->priv->probabilities_length1; #line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp51_ = i; + _tmp40_ = i; #line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp52_ = self->priv->counts; + _tmp41_ = self->priv->counts; #line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp52__length1 = self->priv->counts_length1; + _tmp41__length1 = self->priv->counts_length1; #line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp53_ = i; + _tmp42_ = i; #line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp54_ = _tmp52_[_tmp53_]; + _tmp43_ = _tmp41_[_tmp42_]; #line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp55_ = pixel_count; + _tmp44_ = pixel_count; #line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp50_[_tmp51_] = ((gfloat) _tmp54_) / _tmp55_; + _tmp39_[_tmp40_] = ((gfloat) _tmp43_) / _tmp44_; #line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp56_ = _tmp50_[_tmp51_]; + _tmp45_ = _tmp39_[_tmp40_]; #line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp57_ = accumulator; + _tmp46_ = accumulator; #line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp58_ = self->priv->probabilities; + _tmp47_ = self->priv->probabilities; #line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp58__length1 = self->priv->probabilities_length1; + _tmp47__length1 = self->priv->probabilities_length1; #line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp59_ = i; + _tmp48_ = i; #line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp60_ = _tmp58_[_tmp59_]; + _tmp49_ = _tmp47_[_tmp48_]; #line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - accumulator = _tmp57_ + _tmp60_; + accumulator = _tmp46_ + _tmp49_; #line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp61_ = self->priv->cumulative_probabilities; + _tmp50_ = self->priv->cumulative_probabilities; #line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp61__length1 = self->priv->cumulative_probabilities_length1; + _tmp50__length1 = self->priv->cumulative_probabilities_length1; #line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp62_ = i; + _tmp51_ = i; #line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp63_ = accumulator; + _tmp52_ = accumulator; #line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp61_[_tmp62_] = _tmp63_; + _tmp50_[_tmp51_] = _tmp52_; #line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp64_ = _tmp61_[_tmp62_]; -#line 11178 "ColorTransformation.c" + _tmp53_ = _tmp50_[_tmp51_]; +#line 10751 "ColorTransformation.c" } } } #line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self; -#line 11184 "ColorTransformation.c" +#line 10757 "ColorTransformation.c" } -IntensityHistogram* intensity_histogram_new (GdkPixbuf* pixbuf) { +IntensityHistogram* +intensity_histogram_new (GdkPixbuf* pixbuf) +{ #line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return intensity_histogram_construct (TYPE_INTENSITY_HISTOGRAM, pixbuf); -#line 11191 "ColorTransformation.c" +#line 10766 "ColorTransformation.c" } -gfloat intensity_histogram_get_cumulative_probability (IntensityHistogram* self, gint level) { +gfloat +intensity_histogram_get_cumulative_probability (IntensityHistogram* self, + gint level) +{ gfloat result = 0.0F; - gint _tmp0_; - gint _tmp1_; - gfloat* _tmp2_; - gint _tmp2__length1; - gint _tmp3_; - gfloat _tmp4_; -#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = level; -#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = CLAMP (_tmp0_, 0, 255); + gfloat* _tmp0_; + gint _tmp0__length1; + gfloat _tmp1_; #line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - level = _tmp1_; -#line 1175 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = self->priv->cumulative_probabilities; + level = CLAMP (level, 0, 255); #line 1175 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2__length1 = self->priv->cumulative_probabilities_length1; + _tmp0_ = self->priv->cumulative_probabilities; #line 1175 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = level; + _tmp0__length1 = self->priv->cumulative_probabilities_length1; #line 1175 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = _tmp2_[_tmp3_]; + _tmp1_ = _tmp0_[level]; #line 1175 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - result = _tmp4_; + result = _tmp1_; #line 1175 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 11221 "ColorTransformation.c" +#line 10790 "ColorTransformation.c" } -static void value_intensity_histogram_init (GValue* value) { +static void +value_intensity_histogram_init (GValue* value) +{ #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 11228 "ColorTransformation.c" +#line 10799 "ColorTransformation.c" } -static void value_intensity_histogram_free_value (GValue* value) { +static void +value_intensity_histogram_free_value (GValue* value) +{ #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (value->data[0].v_pointer) { #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" intensity_histogram_unref (value->data[0].v_pointer); -#line 11237 "ColorTransformation.c" +#line 10810 "ColorTransformation.c" } } -static void value_intensity_histogram_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_intensity_histogram_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (src_value->data[0].v_pointer) { #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" dest_value->data[0].v_pointer = intensity_histogram_ref (src_value->data[0].v_pointer); -#line 11247 "ColorTransformation.c" +#line 10823 "ColorTransformation.c" } else { #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" dest_value->data[0].v_pointer = NULL; -#line 11251 "ColorTransformation.c" +#line 10827 "ColorTransformation.c" } } -static gpointer value_intensity_histogram_peek_pointer (const GValue* value) { +static gpointer +value_intensity_histogram_peek_pointer (const GValue* value) +{ #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return value->data[0].v_pointer; -#line 11259 "ColorTransformation.c" +#line 10837 "ColorTransformation.c" } -static gchar* value_intensity_histogram_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_intensity_histogram_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (collect_values[0].v_pointer) { -#line 11266 "ColorTransformation.c" +#line 10849 "ColorTransformation.c" IntensityHistogram * object; object = collect_values[0].v_pointer; #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (object->parent_instance.g_class == NULL) { #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 11273 "ColorTransformation.c" +#line 10856 "ColorTransformation.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 11277 "ColorTransformation.c" +#line 10860 "ColorTransformation.c" } #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = intensity_histogram_ref (object); -#line 11281 "ColorTransformation.c" +#line 10864 "ColorTransformation.c" } else { #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 11285 "ColorTransformation.c" +#line 10868 "ColorTransformation.c" } #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return NULL; -#line 11289 "ColorTransformation.c" +#line 10872 "ColorTransformation.c" } -static gchar* value_intensity_histogram_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_intensity_histogram_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ IntensityHistogram ** object_p; object_p = collect_values[0].v_pointer; #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!object_p) { #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 11300 "ColorTransformation.c" +#line 10888 "ColorTransformation.c" } #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!value->data[0].v_pointer) { #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" *object_p = NULL; -#line 11306 "ColorTransformation.c" +#line 10894 "ColorTransformation.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" *object_p = value->data[0].v_pointer; -#line 11310 "ColorTransformation.c" +#line 10898 "ColorTransformation.c" } else { #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" *object_p = intensity_histogram_ref (value->data[0].v_pointer); -#line 11314 "ColorTransformation.c" +#line 10902 "ColorTransformation.c" } #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return NULL; -#line 11318 "ColorTransformation.c" +#line 10906 "ColorTransformation.c" } -GParamSpec* param_spec_intensity_histogram (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_intensity_histogram (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecIntensityHistogram* spec; #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_INTENSITY_HISTOGRAM), NULL); @@ -11332,20 +10926,25 @@ GParamSpec* param_spec_intensity_histogram (const gchar* name, const gchar* nick G_PARAM_SPEC (spec)->value_type = object_type; #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return G_PARAM_SPEC (spec); -#line 11332 "ColorTransformation.c" +#line 10926 "ColorTransformation.c" } -gpointer value_get_intensity_histogram (const GValue* value) { +gpointer +value_get_intensity_histogram (const GValue* value) +{ #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_INTENSITY_HISTOGRAM), NULL); #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return value->data[0].v_pointer; -#line 11341 "ColorTransformation.c" +#line 10937 "ColorTransformation.c" } -void value_set_intensity_histogram (GValue* value, gpointer v_object) { +void +value_set_intensity_histogram (GValue* value, + gpointer v_object) +{ IntensityHistogram * old; #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_INTENSITY_HISTOGRAM)); @@ -11361,22 +10960,25 @@ void value_set_intensity_histogram (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" intensity_histogram_ref (value->data[0].v_pointer); -#line 11361 "ColorTransformation.c" +#line 10960 "ColorTransformation.c" } else { #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 11365 "ColorTransformation.c" +#line 10964 "ColorTransformation.c" } #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (old) { #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" intensity_histogram_unref (old); -#line 11371 "ColorTransformation.c" +#line 10970 "ColorTransformation.c" } } -void value_take_intensity_histogram (GValue* value, gpointer v_object) { +void +value_take_intensity_histogram (GValue* value, + gpointer v_object) +{ IntensityHistogram * old; #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_INTENSITY_HISTOGRAM)); @@ -11390,33 +10992,37 @@ void value_take_intensity_histogram (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = v_object; -#line 11390 "ColorTransformation.c" +#line 10992 "ColorTransformation.c" } else { #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 11394 "ColorTransformation.c" +#line 10996 "ColorTransformation.c" } #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (old) { #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" intensity_histogram_unref (old); -#line 11400 "ColorTransformation.c" +#line 11002 "ColorTransformation.c" } } -static void intensity_histogram_class_init (IntensityHistogramClass * klass) { +static void +intensity_histogram_class_init (IntensityHistogramClass * klass) +{ #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" intensity_histogram_parent_class = g_type_class_peek_parent (klass); #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" ((IntensityHistogramClass *) klass)->finalize = intensity_histogram_finalize; #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_type_class_add_private (klass, sizeof (IntensityHistogramPrivate)); -#line 11412 "ColorTransformation.c" +#line 11016 "ColorTransformation.c" } -static void intensity_histogram_instance_init (IntensityHistogram * self) { +static void +intensity_histogram_instance_init (IntensityHistogram * self) +{ gint* _tmp0_; gfloat* _tmp1_; gfloat* _tmp2_; @@ -11448,11 +11054,13 @@ static void intensity_histogram_instance_init (IntensityHistogram * self) { self->priv->_cumulative_probabilities_size_ = self->priv->cumulative_probabilities_length1; #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->ref_count = 1; -#line 11448 "ColorTransformation.c" +#line 11054 "ColorTransformation.c" } -static void intensity_histogram_finalize (IntensityHistogram * obj) { +static void +intensity_histogram_finalize (IntensityHistogram * obj) +{ IntensityHistogram * self; #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_INTENSITY_HISTOGRAM, IntensityHistogram); @@ -11464,11 +11072,13 @@ static void intensity_histogram_finalize (IntensityHistogram * obj) { self->priv->probabilities = (g_free (self->priv->probabilities), NULL); #line 1142 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->priv->cumulative_probabilities = (g_free (self->priv->cumulative_probabilities), NULL); -#line 11464 "ColorTransformation.c" +#line 11072 "ColorTransformation.c" } -GType intensity_histogram_get_type (void) { +GType +intensity_histogram_get_type (void) +{ static volatile gsize intensity_histogram_type_id__volatile = 0; if (g_once_init_enter (&intensity_histogram_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_intensity_histogram_init, value_intensity_histogram_free_value, value_intensity_histogram_copy_value, value_intensity_histogram_peek_pointer, "p", value_intensity_histogram_collect_value, "p", value_intensity_histogram_lcopy_value }; @@ -11482,18 +11092,22 @@ GType intensity_histogram_get_type (void) { } -gpointer intensity_histogram_ref (gpointer instance) { +gpointer +intensity_histogram_ref (gpointer instance) +{ IntensityHistogram * self; self = instance; #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_atomic_int_inc (&self->ref_count); #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return instance; -#line 11489 "ColorTransformation.c" +#line 11101 "ColorTransformation.c" } -void intensity_histogram_unref (gpointer instance) { +void +intensity_histogram_unref (gpointer instance) +{ IntensityHistogram * self; self = instance; #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -11502,12 +11116,15 @@ void intensity_histogram_unref (gpointer instance) { INTENSITY_HISTOGRAM_GET_CLASS (self)->finalize (self); #line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_type_free_instance ((GTypeInstance *) self); -#line 11502 "ColorTransformation.c" +#line 11116 "ColorTransformation.c" } } -ExpansionTransformation* expansion_transformation_construct (GType object_type, IntensityHistogram* histogram) { +ExpansionTransformation* +expansion_transformation_construct (GType object_type, + IntensityHistogram* histogram) +{ ExpansionTransformation* self = NULL; gfloat LOW_KINK_MASS = 0.0F; gfloat HIGH_KINK_MASS = 0.0F; @@ -11519,31 +11136,25 @@ ExpansionTransformation* expansion_transformation_construct (GType object_type, self->priv->low_kink = 0; #line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 11519 "ColorTransformation.c" - IntensityHistogram* _tmp0_; - gint _tmp1_; - gfloat _tmp2_; - gfloat _tmp3_; - gint _tmp4_; -#line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = histogram; -#line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = self->priv->low_kink; +#line 11136 "ColorTransformation.c" + gint _tmp0_; + gfloat _tmp1_; + gint _tmp2_; #line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = intensity_histogram_get_cumulative_probability (_tmp0_, _tmp1_); + _tmp0_ = self->priv->low_kink; #line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = LOW_KINK_MASS; + _tmp1_ = LOW_KINK_MASS; #line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp2_ < _tmp3_)) { + if (!(intensity_histogram_get_cumulative_probability (histogram, _tmp0_) < _tmp1_)) { #line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 11537 "ColorTransformation.c" +#line 11148 "ColorTransformation.c" } #line 1192 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = self->priv->low_kink; + _tmp2_ = self->priv->low_kink; #line 1192 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self->priv->low_kink = _tmp4_ + 1; -#line 11543 "ColorTransformation.c" + self->priv->low_kink = _tmp2_ + 1; +#line 11154 "ColorTransformation.c" } #line 1194 "/home/jens/Source/shotwell/src/ColorTransformation.vala" HIGH_KINK_MASS = 1.0f - EXPANSION_TRANSFORMATION_HIGH_DISCARD_MASS; @@ -11551,243 +11162,208 @@ ExpansionTransformation* expansion_transformation_construct (GType object_type, self->priv->high_kink = 255; #line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 11551 "ColorTransformation.c" - gboolean _tmp5_ = FALSE; - IntensityHistogram* _tmp6_; +#line 11162 "ColorTransformation.c" + gboolean _tmp3_ = FALSE; + gint _tmp4_; + gfloat _tmp5_; gint _tmp7_; - gfloat _tmp8_; - gfloat _tmp9_; - gint _tmp11_; #line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = histogram; + _tmp4_ = self->priv->high_kink; #line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = self->priv->high_kink; -#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = intensity_histogram_get_cumulative_probability (_tmp6_, _tmp7_); + _tmp5_ = HIGH_KINK_MASS; #line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = HIGH_KINK_MASS; -#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp8_ > _tmp9_) { -#line 11568 "ColorTransformation.c" - gint _tmp10_; + if (intensity_histogram_get_cumulative_probability (histogram, _tmp4_) > _tmp5_) { +#line 11173 "ColorTransformation.c" + gint _tmp6_; #line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = self->priv->high_kink; + _tmp6_ = self->priv->high_kink; #line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = _tmp10_ > 0; -#line 11574 "ColorTransformation.c" + _tmp3_ = _tmp6_ > 0; +#line 11179 "ColorTransformation.c" } else { #line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = FALSE; -#line 11578 "ColorTransformation.c" + _tmp3_ = FALSE; +#line 11183 "ColorTransformation.c" } #line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp5_) { + if (!_tmp3_) { #line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 11584 "ColorTransformation.c" +#line 11189 "ColorTransformation.c" } #line 1197 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = self->priv->high_kink; + _tmp7_ = self->priv->high_kink; #line 1197 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self->priv->high_kink = _tmp11_ - 1; -#line 11590 "ColorTransformation.c" + self->priv->high_kink = _tmp7_ - 1; +#line 11195 "ColorTransformation.c" } #line 1199 "/home/jens/Source/shotwell/src/ColorTransformation.vala" expansion_transformation_build_remap_table (self); #line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self; -#line 11596 "ColorTransformation.c" +#line 11201 "ColorTransformation.c" } -ExpansionTransformation* expansion_transformation_new (IntensityHistogram* histogram) { +ExpansionTransformation* +expansion_transformation_new (IntensityHistogram* histogram) +{ #line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return expansion_transformation_construct (TYPE_EXPANSION_TRANSFORMATION, histogram); -#line 11603 "ColorTransformation.c" +#line 11210 "ColorTransformation.c" } -ExpansionTransformation* expansion_transformation_construct_from_extrema (GType object_type, gint black_point, gint white_point) { +ExpansionTransformation* +expansion_transformation_construct_from_extrema (GType object_type, + gint black_point, + gint white_point) +{ ExpansionTransformation* self = NULL; - gint _tmp0_; - gint _tmp1_; - gint _tmp2_; - gint _tmp3_; - gint _tmp4_; - gint _tmp5_; - gint _tmp9_; - gint _tmp10_; #line 1203 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = (ExpansionTransformation*) hsv_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION); #line 1205 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = white_point; -#line 1205 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = CLAMP (_tmp0_, 0, 255); -#line 1205 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - white_point = _tmp1_; -#line 1206 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = black_point; + white_point = CLAMP (white_point, 0, 255); #line 1206 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = CLAMP (_tmp2_, 0, 255); -#line 1206 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - black_point = _tmp3_; -#line 1208 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = black_point; + black_point = CLAMP (black_point, 0, 255); #line 1208 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = white_point; -#line 1208 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp4_ == _tmp5_) { -#line 11637 "ColorTransformation.c" - gint _tmp6_; + if (black_point == white_point) { #line 1209 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = black_point; -#line 1209 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp6_ == 0) { + if (black_point == 0) { #line 1210 "/home/jens/Source/shotwell/src/ColorTransformation.vala" white_point = 1; -#line 11645 "ColorTransformation.c" +#line 11232 "ColorTransformation.c" } else { - gint _tmp7_; #line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = white_point; -#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp7_ == 255) { + if (white_point == 255) { #line 1212 "/home/jens/Source/shotwell/src/ColorTransformation.vala" black_point = 254; -#line 11654 "ColorTransformation.c" +#line 11238 "ColorTransformation.c" } else { - gint _tmp8_; #line 1214 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = white_point; -#line 1214 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - black_point = _tmp8_ - 1; -#line 11661 "ColorTransformation.c" + black_point = white_point - 1; +#line 11242 "ColorTransformation.c" } } } #line 1217 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = black_point; -#line 1217 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self->priv->low_kink = _tmp9_; + self->priv->low_kink = black_point; #line 1218 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = white_point; -#line 1218 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self->priv->high_kink = _tmp10_; + self->priv->high_kink = white_point; #line 1220 "/home/jens/Source/shotwell/src/ColorTransformation.vala" expansion_transformation_build_remap_table (self); #line 1202 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self; -#line 11677 "ColorTransformation.c" +#line 11254 "ColorTransformation.c" } -ExpansionTransformation* expansion_transformation_new_from_extrema (gint black_point, gint white_point) { +ExpansionTransformation* +expansion_transformation_new_from_extrema (gint black_point, + gint white_point) +{ #line 1202 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return expansion_transformation_construct_from_extrema (TYPE_EXPANSION_TRANSFORMATION, black_point, white_point); -#line 11684 "ColorTransformation.c" +#line 11264 "ColorTransformation.c" } -static gchar* string_chug (const gchar* self) { +static gchar* +string_chug (const gchar* self) +{ gchar* result = NULL; gchar* _result_ = NULL; gchar* _tmp0_; const gchar* _tmp1_; -#line 1227 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1241 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1227 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1241 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1228 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1242 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1228 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1242 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_strchug (_tmp1_); -#line 1229 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1243 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _result_; -#line 1229 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1243 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 11705 "ColorTransformation.c" +#line 11287 "ColorTransformation.c" } -static gchar* string_chomp (const gchar* self) { +static gchar* +string_chomp (const gchar* self) +{ gchar* result = NULL; gchar* _result_ = NULL; gchar* _tmp0_; const gchar* _tmp1_; -#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1233 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1233 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1234 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1234 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_strchomp (_tmp1_); -#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _result_; -#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 11726 "ColorTransformation.c" +#line 11310 "ColorTransformation.c" } -ExpansionTransformation* expansion_transformation_construct_from_string (GType object_type, const gchar* encoded_transformation) { +ExpansionTransformation* +expansion_transformation_construct_from_string (GType object_type, + const gchar* encoded_transformation) +{ ExpansionTransformation* self = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; + gchar* _tmp0_; + gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; gint num_captured = 0; - const gchar* _tmp7_; - gint _tmp8_; #line 1224 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = (ExpansionTransformation*) hsv_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION); #line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = encoded_transformation; -#line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - g_strcanon (_tmp0_, "0123456789. ", ' '); -#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = encoded_transformation; + g_strcanon (encoded_transformation, "0123456789. ", ' '); #line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = string_chug (_tmp1_); + _tmp0_ = string_chug (encoded_transformation); #line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _g_free0 (_tmp3_); -#line 1228 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = encoded_transformation; + _g_free0 (_tmp1_); #line 1228 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = string_chomp (_tmp4_); + _tmp2_ = string_chomp (encoded_transformation); #line 1228 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 1228 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _g_free0 (_tmp6_); -#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = encoded_transformation; -#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = sscanf (_tmp7_, "%d %d", &self->priv->low_kink, &self->priv->high_kink); + _g_free0 (_tmp3_); #line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - num_captured = _tmp8_; + num_captured = sscanf (encoded_transformation, "%d %d", &self->priv->low_kink, &self->priv->high_kink); #line 1233 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _vala_assert (num_captured == 2, "num_captured == 2"); #line 1235 "/home/jens/Source/shotwell/src/ColorTransformation.vala" expansion_transformation_build_remap_table (self); #line 1223 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self; -#line 11776 "ColorTransformation.c" +#line 11348 "ColorTransformation.c" } -ExpansionTransformation* expansion_transformation_new_from_string (const gchar* encoded_transformation) { +ExpansionTransformation* +expansion_transformation_new_from_string (const gchar* encoded_transformation) +{ #line 1223 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return expansion_transformation_construct_from_string (TYPE_EXPANSION_TRANSFORMATION, encoded_transformation); -#line 11783 "ColorTransformation.c" +#line 11357 "ColorTransformation.c" } -static void expansion_transformation_build_remap_table (ExpansionTransformation* self) { +static void +expansion_transformation_build_remap_table (ExpansionTransformation* self) +{ gfloat low_kink_f = 0.0F; gint _tmp0_; gfloat high_kink_f = 0.0F; @@ -11824,27 +11400,27 @@ static void expansion_transformation_build_remap_table (ExpansionTransformation* intercept = -(_tmp4_ / (_tmp5_ - _tmp6_)); #line 1245 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = 0; -#line 11824 "ColorTransformation.c" +#line 11400 "ColorTransformation.c" { gboolean _tmp7_ = FALSE; #line 1246 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp7_ = TRUE; #line 1246 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 11831 "ColorTransformation.c" +#line 11407 "ColorTransformation.c" gint _tmp9_; gint _tmp10_; gint _tmp11_; gfloat _tmp12_; #line 1246 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!_tmp7_) { -#line 11838 "ColorTransformation.c" +#line 11414 "ColorTransformation.c" gint _tmp8_; #line 1246 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp8_ = i; #line 1246 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = _tmp8_ + 1; -#line 11844 "ColorTransformation.c" +#line 11420 "ColorTransformation.c" } #line 1246 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp7_ = FALSE; @@ -11856,7 +11432,7 @@ static void expansion_transformation_build_remap_table (ExpansionTransformation* if (!(_tmp9_ <= _tmp10_)) { #line 1246 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 11856 "ColorTransformation.c" +#line 11432 "ColorTransformation.c" } #line 1247 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp11_ = i; @@ -11864,7 +11440,7 @@ static void expansion_transformation_build_remap_table (ExpansionTransformation* G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp11_] = 0.0f; #line 1247 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp11_]; -#line 11864 "ColorTransformation.c" +#line 11440 "ColorTransformation.c" } } { @@ -11873,7 +11449,7 @@ static void expansion_transformation_build_remap_table (ExpansionTransformation* _tmp13_ = TRUE; #line 1249 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 11873 "ColorTransformation.c" +#line 11449 "ColorTransformation.c" gint _tmp15_; gint _tmp16_; gint _tmp17_; @@ -11883,13 +11459,13 @@ static void expansion_transformation_build_remap_table (ExpansionTransformation* gfloat _tmp21_; #line 1249 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!_tmp13_) { -#line 11883 "ColorTransformation.c" +#line 11459 "ColorTransformation.c" gint _tmp14_; #line 1249 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp14_ = i; #line 1249 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = _tmp14_ + 1; -#line 11889 "ColorTransformation.c" +#line 11465 "ColorTransformation.c" } #line 1249 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp13_ = FALSE; @@ -11901,7 +11477,7 @@ static void expansion_transformation_build_remap_table (ExpansionTransformation* if (!(_tmp15_ < _tmp16_)) { #line 1249 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 11901 "ColorTransformation.c" +#line 11477 "ColorTransformation.c" } #line 1250 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp17_ = i; @@ -11915,7 +11491,7 @@ static void expansion_transformation_build_remap_table (ExpansionTransformation* G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp17_] = (_tmp18_ * (((gfloat) _tmp19_) / 255.0f)) + _tmp20_; #line 1250 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp17_]; -#line 11915 "ColorTransformation.c" +#line 11491 "ColorTransformation.c" } } { @@ -11924,19 +11500,19 @@ static void expansion_transformation_build_remap_table (ExpansionTransformation* _tmp22_ = TRUE; #line 1252 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 11924 "ColorTransformation.c" +#line 11500 "ColorTransformation.c" gint _tmp24_; gint _tmp25_; gfloat _tmp26_; #line 1252 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!_tmp22_) { -#line 11930 "ColorTransformation.c" +#line 11506 "ColorTransformation.c" gint _tmp23_; #line 1252 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp23_ = i; #line 1252 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = _tmp23_ + 1; -#line 11936 "ColorTransformation.c" +#line 11512 "ColorTransformation.c" } #line 1252 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp22_ = FALSE; @@ -11946,7 +11522,7 @@ static void expansion_transformation_build_remap_table (ExpansionTransformation* if (!(_tmp24_ < 256)) { #line 1252 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 11946 "ColorTransformation.c" +#line 11522 "ColorTransformation.c" } #line 1253 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp25_ = i; @@ -11954,13 +11530,15 @@ static void expansion_transformation_build_remap_table (ExpansionTransformation* G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp25_] = 1.0f; #line 1253 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp26_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp25_]; -#line 11954 "ColorTransformation.c" +#line 11530 "ColorTransformation.c" } } } -static gchar* expansion_transformation_real_to_string (PixelTransformation* base) { +static gchar* +expansion_transformation_real_to_string (PixelTransformation* base) +{ ExpansionTransformation * self; gchar* result = NULL; gint _tmp0_; @@ -11978,11 +11556,13 @@ static gchar* expansion_transformation_real_to_string (PixelTransformation* base result = _tmp2_; #line 1257 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 11978 "ColorTransformation.c" +#line 11556 "ColorTransformation.c" } -gint expansion_transformation_get_white_point (ExpansionTransformation* self) { +gint +expansion_transformation_get_white_point (ExpansionTransformation* self) +{ gint result = 0; gint _tmp0_; #line 1261 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -11991,11 +11571,13 @@ gint expansion_transformation_get_white_point (ExpansionTransformation* self) { result = _tmp0_; #line 1261 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 11991 "ColorTransformation.c" +#line 11571 "ColorTransformation.c" } -gint expansion_transformation_get_black_point (ExpansionTransformation* self) { +gint +expansion_transformation_get_black_point (ExpansionTransformation* self) +{ gint result = 0; gint _tmp0_; #line 1265 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -12004,11 +11586,13 @@ gint expansion_transformation_get_black_point (ExpansionTransformation* self) { result = _tmp0_; #line 1265 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 12004 "ColorTransformation.c" +#line 11586 "ColorTransformation.c" } -static gboolean expansion_transformation_real_is_identity (PixelTransformation* base) { +static gboolean +expansion_transformation_real_is_identity (PixelTransformation* base) +{ ExpansionTransformation * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; @@ -12019,27 +11603,29 @@ static gboolean expansion_transformation_real_is_identity (PixelTransformation* _tmp1_ = self->priv->low_kink; #line 1269 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (_tmp1_ == 0) { -#line 12019 "ColorTransformation.c" +#line 11603 "ColorTransformation.c" gint _tmp2_; #line 1269 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp2_ = self->priv->high_kink; #line 1269 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp0_ = _tmp2_ == 255; -#line 12025 "ColorTransformation.c" +#line 11609 "ColorTransformation.c" } else { #line 1269 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp0_ = FALSE; -#line 12029 "ColorTransformation.c" +#line 11613 "ColorTransformation.c" } #line 1269 "/home/jens/Source/shotwell/src/ColorTransformation.vala" result = _tmp0_; #line 1269 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 12035 "ColorTransformation.c" +#line 11619 "ColorTransformation.c" } -static PixelTransformation* expansion_transformation_real_copy (PixelTransformation* base) { +static PixelTransformation* +expansion_transformation_real_copy (PixelTransformation* base) +{ ExpansionTransformation * self; PixelTransformation* result = NULL; gint _tmp0_; @@ -12057,11 +11643,13 @@ static PixelTransformation* expansion_transformation_real_copy (PixelTransformat result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation); #line 1273 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 12057 "ColorTransformation.c" +#line 11643 "ColorTransformation.c" } -static void expansion_transformation_class_init (ExpansionTransformationClass * klass) { +static void +expansion_transformation_class_init (ExpansionTransformationClass * klass) +{ #line 1179 "/home/jens/Source/shotwell/src/ColorTransformation.vala" expansion_transformation_parent_class = g_type_class_peek_parent (klass); #line 1179 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -12074,28 +11662,34 @@ static void expansion_transformation_class_init (ExpansionTransformationClass * ((PixelTransformationClass *) klass)->is_identity = (gboolean (*) (PixelTransformation *)) expansion_transformation_real_is_identity; #line 1179 "/home/jens/Source/shotwell/src/ColorTransformation.vala" ((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*) (PixelTransformation *)) expansion_transformation_real_copy; -#line 12074 "ColorTransformation.c" +#line 11662 "ColorTransformation.c" } -static void expansion_transformation_instance_init (ExpansionTransformation * self) { +static void +expansion_transformation_instance_init (ExpansionTransformation * self) +{ #line 1179 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->priv = EXPANSION_TRANSFORMATION_GET_PRIVATE (self); -#line 12081 "ColorTransformation.c" +#line 11671 "ColorTransformation.c" } -static void expansion_transformation_finalize (PixelTransformation * obj) { +static void +expansion_transformation_finalize (PixelTransformation * obj) +{ ExpansionTransformation * self; #line 1179 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation); #line 1179 "/home/jens/Source/shotwell/src/ColorTransformation.vala" PIXEL_TRANSFORMATION_CLASS (expansion_transformation_parent_class)->finalize (obj); -#line 12091 "ColorTransformation.c" +#line 11683 "ColorTransformation.c" } -GType expansion_transformation_get_type (void) { +GType +expansion_transformation_get_type (void) +{ static volatile gsize expansion_transformation_type_id__volatile = 0; if (g_once_init_enter (&expansion_transformation_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ExpansionTransformationClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) expansion_transformation_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ExpansionTransformation), 0, (GInstanceInitFunc) expansion_transformation_instance_init, NULL }; @@ -12107,112 +11701,106 @@ GType expansion_transformation_get_type (void) { } -ShadowDetailTransformation* shadow_detail_transformation_construct (GType object_type, gfloat user_intensity) { +ShadowDetailTransformation* +shadow_detail_transformation_construct (GType object_type, + gfloat user_intensity) +{ ShadowDetailTransformation* self = NULL; - gfloat _tmp0_; gfloat intensity_adj = 0.0F; - gfloat _tmp1_; - gfloat _tmp2_; + gfloat _tmp0_; gfloat effect_shift = 0.0F; - gfloat _tmp3_; + gfloat _tmp1_; HermiteGammaApproximationFunction* func = NULL; - HermiteGammaApproximationFunction* _tmp4_; + HermiteGammaApproximationFunction* _tmp2_; #line 1289 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = (ShadowDetailTransformation*) hsv_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_SHADOWS); #line 1291 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = user_intensity; -#line 1291 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self->priv->intensity = _tmp0_; -#line 1292 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = self->priv->intensity; + self->priv->intensity = user_intensity; #line 1292 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = CLAMP (_tmp1_ / SHADOW_DETAIL_TRANSFORMATION_MAX_PARAMETER, 0.0f, 1.0f); + _tmp0_ = self->priv->intensity; #line 1292 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - intensity_adj = _tmp2_; + intensity_adj = CLAMP (_tmp0_ / SHADOW_DETAIL_TRANSFORMATION_MAX_PARAMETER, 0.0f, 1.0f); #line 1294 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = intensity_adj; + _tmp1_ = intensity_adj; #line 1294 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - effect_shift = SHADOW_DETAIL_TRANSFORMATION_MAX_EFFECT_SHIFT * _tmp3_; + effect_shift = SHADOW_DETAIL_TRANSFORMATION_MAX_EFFECT_SHIFT * _tmp1_; #line 1295 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = hermite_gamma_approximation_function_new (SHADOW_DETAIL_TRANSFORMATION_TONAL_WIDTH); + _tmp2_ = hermite_gamma_approximation_function_new (SHADOW_DETAIL_TRANSFORMATION_TONAL_WIDTH); #line 1295 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - func = _tmp4_; -#line 12137 "ColorTransformation.c" + func = _tmp2_; +#line 11728 "ColorTransformation.c" { gint i = 0; #line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = 0; -#line 12142 "ColorTransformation.c" +#line 11733 "ColorTransformation.c" { - gboolean _tmp5_ = FALSE; + gboolean _tmp3_ = FALSE; #line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = TRUE; + _tmp3_ = TRUE; #line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 12149 "ColorTransformation.c" - gint _tmp7_; +#line 11740 "ColorTransformation.c" + gint _tmp5_; gfloat x = 0.0F; - gint _tmp8_; + gint _tmp6_; gfloat weight = 0.0F; - HermiteGammaApproximationFunction* _tmp9_; + HermiteGammaApproximationFunction* _tmp7_; + gfloat _tmp8_; + gint _tmp9_; gfloat _tmp10_; gfloat _tmp11_; - gint _tmp12_; + gfloat _tmp12_; gfloat _tmp13_; gfloat _tmp14_; gfloat _tmp15_; - gfloat _tmp16_; - gfloat _tmp17_; - gfloat _tmp18_; #line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp5_) { -#line 12166 "ColorTransformation.c" - gint _tmp6_; + if (!_tmp3_) { +#line 11756 "ColorTransformation.c" + gint _tmp4_; #line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = i; + _tmp4_ = i; #line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - i = _tmp6_ + 1; -#line 12172 "ColorTransformation.c" + i = _tmp4_ + 1; +#line 11762 "ColorTransformation.c" } #line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = FALSE; + _tmp3_ = FALSE; #line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = i; + _tmp5_ = i; #line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp7_ < 256)) { + if (!(_tmp5_ < 256)) { #line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 12182 "ColorTransformation.c" +#line 11772 "ColorTransformation.c" } #line 1299 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = i; + _tmp6_ = i; #line 1299 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - x = ((gfloat) _tmp8_) / 255.0f; -#line 1300 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = func; + x = ((gfloat) _tmp6_) / 255.0f; #line 1300 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = x; + _tmp7_ = func; #line 1300 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = hermite_gamma_approximation_function_evaluate (_tmp9_, _tmp10_); + _tmp8_ = x; #line 1300 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - weight = _tmp11_; + weight = hermite_gamma_approximation_function_evaluate (_tmp7_, _tmp8_); #line 1301 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = i; + _tmp9_ = i; #line 1301 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp13_ = weight; + _tmp10_ = weight; #line 1301 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_ = x; + _tmp11_ = x; #line 1301 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp15_ = effect_shift; + _tmp12_ = effect_shift; #line 1301 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp16_ = weight; + _tmp13_ = weight; #line 1301 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp17_ = x; + _tmp14_ = x; #line 1301 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp12_] = (_tmp13_ * (_tmp14_ + _tmp15_)) + ((1.0f - _tmp16_) * _tmp17_); + G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp9_] = (_tmp10_ * (_tmp11_ + _tmp12_)) + ((1.0f - _tmp13_) * _tmp14_); #line 1301 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp12_]; -#line 12212 "ColorTransformation.c" + _tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp9_]; +#line 11800 "ColorTransformation.c" } } } @@ -12220,18 +11808,22 @@ ShadowDetailTransformation* shadow_detail_transformation_construct (GType object _hermite_gamma_approximation_function_unref0 (func); #line 1288 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self; -#line 12220 "ColorTransformation.c" +#line 11808 "ColorTransformation.c" } -ShadowDetailTransformation* shadow_detail_transformation_new (gfloat user_intensity) { +ShadowDetailTransformation* +shadow_detail_transformation_new (gfloat user_intensity) +{ #line 1288 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return shadow_detail_transformation_construct (TYPE_SHADOW_DETAIL_TRANSFORMATION, user_intensity); -#line 12227 "ColorTransformation.c" +#line 11817 "ColorTransformation.c" } -static PixelTransformation* shadow_detail_transformation_real_copy (PixelTransformation* base) { +static PixelTransformation* +shadow_detail_transformation_real_copy (PixelTransformation* base) +{ ShadowDetailTransformation * self; PixelTransformation* result = NULL; gfloat _tmp0_; @@ -12246,11 +11838,13 @@ static PixelTransformation* shadow_detail_transformation_real_copy (PixelTransfo result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation); #line 1306 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 12246 "ColorTransformation.c" +#line 11838 "ColorTransformation.c" } -static gboolean shadow_detail_transformation_real_is_identity (PixelTransformation* base) { +static gboolean +shadow_detail_transformation_real_is_identity (PixelTransformation* base) +{ ShadowDetailTransformation * self; gboolean result = FALSE; gfloat _tmp0_; @@ -12262,11 +11856,13 @@ static gboolean shadow_detail_transformation_real_is_identity (PixelTransformati result = _tmp0_ == 0.0f; #line 1310 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 12262 "ColorTransformation.c" +#line 11856 "ColorTransformation.c" } -gfloat shadow_detail_transformation_get_parameter (ShadowDetailTransformation* self) { +gfloat +shadow_detail_transformation_get_parameter (ShadowDetailTransformation* self) +{ gfloat result = 0.0F; gfloat _tmp0_; #line 1314 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -12275,11 +11871,13 @@ gfloat shadow_detail_transformation_get_parameter (ShadowDetailTransformation* s result = _tmp0_; #line 1314 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 12275 "ColorTransformation.c" +#line 11871 "ColorTransformation.c" } -static void shadow_detail_transformation_class_init (ShadowDetailTransformationClass * klass) { +static void +shadow_detail_transformation_class_init (ShadowDetailTransformationClass * klass) +{ #line 1277 "/home/jens/Source/shotwell/src/ColorTransformation.vala" shadow_detail_transformation_parent_class = g_type_class_peek_parent (klass); #line 1277 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -12290,30 +11888,36 @@ static void shadow_detail_transformation_class_init (ShadowDetailTransformationC ((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*) (PixelTransformation *)) shadow_detail_transformation_real_copy; #line 1277 "/home/jens/Source/shotwell/src/ColorTransformation.vala" ((PixelTransformationClass *) klass)->is_identity = (gboolean (*) (PixelTransformation *)) shadow_detail_transformation_real_is_identity; -#line 12290 "ColorTransformation.c" +#line 11888 "ColorTransformation.c" } -static void shadow_detail_transformation_instance_init (ShadowDetailTransformation * self) { +static void +shadow_detail_transformation_instance_init (ShadowDetailTransformation * self) +{ #line 1277 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->priv = SHADOW_DETAIL_TRANSFORMATION_GET_PRIVATE (self); #line 1283 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->priv->intensity = 0.0f; -#line 12299 "ColorTransformation.c" +#line 11899 "ColorTransformation.c" } -static void shadow_detail_transformation_finalize (PixelTransformation * obj) { +static void +shadow_detail_transformation_finalize (PixelTransformation * obj) +{ ShadowDetailTransformation * self; #line 1277 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation); #line 1277 "/home/jens/Source/shotwell/src/ColorTransformation.vala" PIXEL_TRANSFORMATION_CLASS (shadow_detail_transformation_parent_class)->finalize (obj); -#line 12309 "ColorTransformation.c" +#line 11911 "ColorTransformation.c" } -GType shadow_detail_transformation_get_type (void) { +GType +shadow_detail_transformation_get_type (void) +{ static volatile gsize shadow_detail_transformation_type_id__volatile = 0; if (g_once_init_enter (&shadow_detail_transformation_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ShadowDetailTransformationClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shadow_detail_transformation_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShadowDetailTransformation), 0, (GInstanceInitFunc) shadow_detail_transformation_instance_init, NULL }; @@ -12325,207 +11929,222 @@ GType shadow_detail_transformation_get_type (void) { } -HermiteGammaApproximationFunction* hermite_gamma_approximation_function_construct (GType object_type, gfloat user_interval_upper) { +HermiteGammaApproximationFunction* +hermite_gamma_approximation_function_construct (GType object_type, + gfloat user_interval_upper) +{ HermiteGammaApproximationFunction* self = NULL; gfloat _tmp0_; - gfloat _tmp1_; - gfloat _tmp2_; #line 1322 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = (HermiteGammaApproximationFunction*) g_type_create_instance (object_type); #line 1323 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = user_interval_upper; -#line 1323 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = CLAMP (_tmp0_, 0.1f, 1.0f); -#line 1323 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self->priv->nonzero_interval_upper = _tmp1_; + self->priv->nonzero_interval_upper = CLAMP (user_interval_upper, 0.1f, 1.0f); #line 1324 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = self->priv->nonzero_interval_upper; + _tmp0_ = self->priv->nonzero_interval_upper; #line 1324 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self->priv->x_scale = 1.0f / _tmp2_; + self->priv->x_scale = 1.0f / _tmp0_; #line 1322 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self; -#line 12344 "ColorTransformation.c" +#line 11945 "ColorTransformation.c" } -HermiteGammaApproximationFunction* hermite_gamma_approximation_function_new (gfloat user_interval_upper) { +HermiteGammaApproximationFunction* +hermite_gamma_approximation_function_new (gfloat user_interval_upper) +{ #line 1322 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return hermite_gamma_approximation_function_construct (TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION, user_interval_upper); -#line 12351 "ColorTransformation.c" +#line 11954 "ColorTransformation.c" } -gfloat hermite_gamma_approximation_function_evaluate (HermiteGammaApproximationFunction* self, gfloat x) { +gfloat +hermite_gamma_approximation_function_evaluate (HermiteGammaApproximationFunction* self, + gfloat x) +{ gfloat result = 0.0F; - gfloat _tmp0_; #line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = x; -#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp0_ < 0.0f) { + if (x < 0.0f) { #line 1329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" result = 0.0f; #line 1329 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 12366 "ColorTransformation.c" +#line 11969 "ColorTransformation.c" } else { - gfloat _tmp1_; - gfloat _tmp2_; -#line 1330 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = x; + gfloat _tmp0_; #line 1330 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = self->priv->nonzero_interval_upper; + _tmp0_ = self->priv->nonzero_interval_upper; #line 1330 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp1_ > _tmp2_) { + if (x > _tmp0_) { #line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala" result = 0.0f; #line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 12380 "ColorTransformation.c" +#line 11980 "ColorTransformation.c" } else { gfloat indep_var = 0.0F; + gfloat _tmp1_; + gfloat dep_var = 0.0F; + gfloat _tmp2_; gfloat _tmp3_; gfloat _tmp4_; - gfloat dep_var = 0.0F; gfloat _tmp5_; gfloat _tmp6_; gfloat _tmp7_; gfloat _tmp8_; - gfloat _tmp9_; - gfloat _tmp10_; - gfloat _tmp11_; - gfloat _tmp12_; #line 1333 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = self->priv->x_scale; + _tmp1_ = self->priv->x_scale; #line 1333 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = x; -#line 1333 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - indep_var = _tmp3_ * _tmp4_; + indep_var = _tmp1_ * x; #line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = indep_var; + _tmp2_ = indep_var; #line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = indep_var; + _tmp3_ = indep_var; #line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = indep_var; + _tmp4_ = indep_var; #line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = indep_var; + _tmp5_ = indep_var; #line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = indep_var; + _tmp6_ = indep_var; #line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = indep_var; + _tmp7_ = indep_var; #line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - dep_var = 6.0f * ((((_tmp5_ * _tmp6_) * _tmp7_) - (2.0f * (_tmp8_ * _tmp9_))) + _tmp10_); -#line 1338 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = dep_var; + dep_var = 6.0f * ((((_tmp2_ * _tmp3_) * _tmp4_) - (2.0f * (_tmp5_ * _tmp6_))) + _tmp7_); #line 1338 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = CLAMP (_tmp11_, 0.0f, 1.0f); + _tmp8_ = dep_var; #line 1338 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - result = _tmp12_; + result = CLAMP (_tmp8_, 0.0f, 1.0f); #line 1338 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 12422 "ColorTransformation.c" +#line 12016 "ColorTransformation.c" } } } -static void value_hermite_gamma_approximation_function_init (GValue* value) { +static void +value_hermite_gamma_approximation_function_init (GValue* value) +{ #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 12431 "ColorTransformation.c" +#line 12027 "ColorTransformation.c" } -static void value_hermite_gamma_approximation_function_free_value (GValue* value) { +static void +value_hermite_gamma_approximation_function_free_value (GValue* value) +{ #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (value->data[0].v_pointer) { #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" hermite_gamma_approximation_function_unref (value->data[0].v_pointer); -#line 12440 "ColorTransformation.c" +#line 12038 "ColorTransformation.c" } } -static void value_hermite_gamma_approximation_function_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_hermite_gamma_approximation_function_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (src_value->data[0].v_pointer) { #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" dest_value->data[0].v_pointer = hermite_gamma_approximation_function_ref (src_value->data[0].v_pointer); -#line 12450 "ColorTransformation.c" +#line 12051 "ColorTransformation.c" } else { #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" dest_value->data[0].v_pointer = NULL; -#line 12454 "ColorTransformation.c" +#line 12055 "ColorTransformation.c" } } -static gpointer value_hermite_gamma_approximation_function_peek_pointer (const GValue* value) { +static gpointer +value_hermite_gamma_approximation_function_peek_pointer (const GValue* value) +{ #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return value->data[0].v_pointer; -#line 12462 "ColorTransformation.c" +#line 12065 "ColorTransformation.c" } -static gchar* value_hermite_gamma_approximation_function_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_hermite_gamma_approximation_function_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (collect_values[0].v_pointer) { -#line 12469 "ColorTransformation.c" +#line 12077 "ColorTransformation.c" HermiteGammaApproximationFunction * object; object = collect_values[0].v_pointer; #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (object->parent_instance.g_class == NULL) { #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 12476 "ColorTransformation.c" +#line 12084 "ColorTransformation.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 12480 "ColorTransformation.c" +#line 12088 "ColorTransformation.c" } #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = hermite_gamma_approximation_function_ref (object); -#line 12484 "ColorTransformation.c" +#line 12092 "ColorTransformation.c" } else { #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 12488 "ColorTransformation.c" +#line 12096 "ColorTransformation.c" } #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return NULL; -#line 12492 "ColorTransformation.c" +#line 12100 "ColorTransformation.c" } -static gchar* value_hermite_gamma_approximation_function_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_hermite_gamma_approximation_function_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ HermiteGammaApproximationFunction ** object_p; object_p = collect_values[0].v_pointer; #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!object_p) { #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 12503 "ColorTransformation.c" +#line 12116 "ColorTransformation.c" } #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (!value->data[0].v_pointer) { #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" *object_p = NULL; -#line 12509 "ColorTransformation.c" +#line 12122 "ColorTransformation.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" *object_p = value->data[0].v_pointer; -#line 12513 "ColorTransformation.c" +#line 12126 "ColorTransformation.c" } else { #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" *object_p = hermite_gamma_approximation_function_ref (value->data[0].v_pointer); -#line 12517 "ColorTransformation.c" +#line 12130 "ColorTransformation.c" } #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return NULL; -#line 12521 "ColorTransformation.c" +#line 12134 "ColorTransformation.c" } -GParamSpec* param_spec_hermite_gamma_approximation_function (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_hermite_gamma_approximation_function (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecHermiteGammaApproximationFunction* spec; #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION), NULL); @@ -12535,20 +12154,25 @@ GParamSpec* param_spec_hermite_gamma_approximation_function (const gchar* name, G_PARAM_SPEC (spec)->value_type = object_type; #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return G_PARAM_SPEC (spec); -#line 12535 "ColorTransformation.c" +#line 12154 "ColorTransformation.c" } -gpointer value_get_hermite_gamma_approximation_function (const GValue* value) { +gpointer +value_get_hermite_gamma_approximation_function (const GValue* value) +{ #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION), NULL); #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return value->data[0].v_pointer; -#line 12544 "ColorTransformation.c" +#line 12165 "ColorTransformation.c" } -void value_set_hermite_gamma_approximation_function (GValue* value, gpointer v_object) { +void +value_set_hermite_gamma_approximation_function (GValue* value, + gpointer v_object) +{ HermiteGammaApproximationFunction * old; #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION)); @@ -12564,22 +12188,25 @@ void value_set_hermite_gamma_approximation_function (GValue* value, gpointer v_o value->data[0].v_pointer = v_object; #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" hermite_gamma_approximation_function_ref (value->data[0].v_pointer); -#line 12564 "ColorTransformation.c" +#line 12188 "ColorTransformation.c" } else { #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 12568 "ColorTransformation.c" +#line 12192 "ColorTransformation.c" } #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (old) { #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" hermite_gamma_approximation_function_unref (old); -#line 12574 "ColorTransformation.c" +#line 12198 "ColorTransformation.c" } } -void value_take_hermite_gamma_approximation_function (GValue* value, gpointer v_object) { +void +value_take_hermite_gamma_approximation_function (GValue* value, + gpointer v_object) +{ HermiteGammaApproximationFunction * old; #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION)); @@ -12593,33 +12220,37 @@ void value_take_hermite_gamma_approximation_function (GValue* value, gpointer v_ g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = v_object; -#line 12593 "ColorTransformation.c" +#line 12220 "ColorTransformation.c" } else { #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" value->data[0].v_pointer = NULL; -#line 12597 "ColorTransformation.c" +#line 12224 "ColorTransformation.c" } #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" if (old) { #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" hermite_gamma_approximation_function_unref (old); -#line 12603 "ColorTransformation.c" +#line 12230 "ColorTransformation.c" } } -static void hermite_gamma_approximation_function_class_init (HermiteGammaApproximationFunctionClass * klass) { +static void +hermite_gamma_approximation_function_class_init (HermiteGammaApproximationFunctionClass * klass) +{ #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" hermite_gamma_approximation_function_parent_class = g_type_class_peek_parent (klass); #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" ((HermiteGammaApproximationFunctionClass *) klass)->finalize = hermite_gamma_approximation_function_finalize; #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_type_class_add_private (klass, sizeof (HermiteGammaApproximationFunctionPrivate)); -#line 12615 "ColorTransformation.c" +#line 12244 "ColorTransformation.c" } -static void hermite_gamma_approximation_function_instance_init (HermiteGammaApproximationFunction * self) { +static void +hermite_gamma_approximation_function_instance_init (HermiteGammaApproximationFunction * self) +{ #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->priv = HERMITE_GAMMA_APPROXIMATION_FUNCTION_GET_PRIVATE (self); #line 1319 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -12628,21 +12259,25 @@ static void hermite_gamma_approximation_function_instance_init (HermiteGammaAppr self->priv->nonzero_interval_upper = 1.0f; #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->ref_count = 1; -#line 12628 "ColorTransformation.c" +#line 12259 "ColorTransformation.c" } -static void hermite_gamma_approximation_function_finalize (HermiteGammaApproximationFunction * obj) { +static void +hermite_gamma_approximation_function_finalize (HermiteGammaApproximationFunction * obj) +{ HermiteGammaApproximationFunction * self; #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION, HermiteGammaApproximationFunction); #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_signal_handlers_destroy (self); -#line 12638 "ColorTransformation.c" +#line 12271 "ColorTransformation.c" } -GType hermite_gamma_approximation_function_get_type (void) { +GType +hermite_gamma_approximation_function_get_type (void) +{ static volatile gsize hermite_gamma_approximation_function_type_id__volatile = 0; if (g_once_init_enter (&hermite_gamma_approximation_function_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_hermite_gamma_approximation_function_init, value_hermite_gamma_approximation_function_free_value, value_hermite_gamma_approximation_function_copy_value, value_hermite_gamma_approximation_function_peek_pointer, "p", value_hermite_gamma_approximation_function_collect_value, "p", value_hermite_gamma_approximation_function_lcopy_value }; @@ -12656,18 +12291,22 @@ GType hermite_gamma_approximation_function_get_type (void) { } -gpointer hermite_gamma_approximation_function_ref (gpointer instance) { +gpointer +hermite_gamma_approximation_function_ref (gpointer instance) +{ HermiteGammaApproximationFunction * self; self = instance; #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_atomic_int_inc (&self->ref_count); #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return instance; -#line 12663 "ColorTransformation.c" +#line 12300 "ColorTransformation.c" } -void hermite_gamma_approximation_function_unref (gpointer instance) { +void +hermite_gamma_approximation_function_unref (gpointer instance) +{ HermiteGammaApproximationFunction * self; self = instance; #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -12676,117 +12315,111 @@ void hermite_gamma_approximation_function_unref (gpointer instance) { HERMITE_GAMMA_APPROXIMATION_FUNCTION_GET_CLASS (self)->finalize (self); #line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_type_free_instance ((GTypeInstance *) self); -#line 12676 "ColorTransformation.c" +#line 12315 "ColorTransformation.c" } } -HighlightDetailTransformation* highlight_detail_transformation_construct (GType object_type, gfloat user_intensity) { +HighlightDetailTransformation* +highlight_detail_transformation_construct (GType object_type, + gfloat user_intensity) +{ HighlightDetailTransformation* self = NULL; - gfloat _tmp0_; gfloat intensity_adj = 0.0F; - gfloat _tmp1_; - gfloat _tmp2_; + gfloat _tmp0_; gfloat effect_shift = 0.0F; - gfloat _tmp3_; + gfloat _tmp1_; HermiteGammaApproximationFunction* func = NULL; - HermiteGammaApproximationFunction* _tmp4_; + HermiteGammaApproximationFunction* _tmp2_; #line 1355 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = (HighlightDetailTransformation*) hsv_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS); #line 1357 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = user_intensity; -#line 1357 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - self->priv->intensity = _tmp0_; + self->priv->intensity = user_intensity; #line 1358 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = self->priv->intensity; -#line 1358 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = CLAMP (_tmp1_ / HIGHLIGHT_DETAIL_TRANSFORMATION_MIN_PARAMETER, 0.0f, 1.0f); + _tmp0_ = self->priv->intensity; #line 1358 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - intensity_adj = _tmp2_; + intensity_adj = CLAMP (_tmp0_ / HIGHLIGHT_DETAIL_TRANSFORMATION_MIN_PARAMETER, 0.0f, 1.0f); #line 1360 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = intensity_adj; + _tmp1_ = intensity_adj; #line 1360 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - effect_shift = HIGHLIGHT_DETAIL_TRANSFORMATION_MAX_EFFECT_SHIFT * _tmp3_; + effect_shift = HIGHLIGHT_DETAIL_TRANSFORMATION_MAX_EFFECT_SHIFT * _tmp1_; #line 1361 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = hermite_gamma_approximation_function_new (HIGHLIGHT_DETAIL_TRANSFORMATION_TONAL_WIDTH); + _tmp2_ = hermite_gamma_approximation_function_new (HIGHLIGHT_DETAIL_TRANSFORMATION_TONAL_WIDTH); #line 1361 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - func = _tmp4_; -#line 12711 "ColorTransformation.c" + func = _tmp2_; +#line 12347 "ColorTransformation.c" { gint i = 0; #line 1364 "/home/jens/Source/shotwell/src/ColorTransformation.vala" i = 0; -#line 12716 "ColorTransformation.c" +#line 12352 "ColorTransformation.c" { - gboolean _tmp5_ = FALSE; + gboolean _tmp3_ = FALSE; #line 1364 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = TRUE; + _tmp3_ = TRUE; #line 1364 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 12723 "ColorTransformation.c" - gint _tmp7_; +#line 12359 "ColorTransformation.c" + gint _tmp5_; gfloat x = 0.0F; - gint _tmp8_; + gint _tmp6_; gfloat weight = 0.0F; - HermiteGammaApproximationFunction* _tmp9_; + HermiteGammaApproximationFunction* _tmp7_; + gfloat _tmp8_; + gint _tmp9_; gfloat _tmp10_; gfloat _tmp11_; - gint _tmp12_; + gfloat _tmp12_; gfloat _tmp13_; gfloat _tmp14_; gfloat _tmp15_; - gfloat _tmp16_; - gfloat _tmp17_; - gfloat _tmp18_; #line 1364 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp5_) { -#line 12740 "ColorTransformation.c" - gint _tmp6_; + if (!_tmp3_) { +#line 12375 "ColorTransformation.c" + gint _tmp4_; #line 1364 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = i; + _tmp4_ = i; #line 1364 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - i = _tmp6_ + 1; -#line 12746 "ColorTransformation.c" + i = _tmp4_ + 1; +#line 12381 "ColorTransformation.c" } #line 1364 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = FALSE; + _tmp3_ = FALSE; #line 1364 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = i; + _tmp5_ = i; #line 1364 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp7_ < 256)) { + if (!(_tmp5_ < 256)) { #line 1364 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 12756 "ColorTransformation.c" +#line 12391 "ColorTransformation.c" } #line 1365 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = i; + _tmp6_ = i; #line 1365 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - x = ((gfloat) _tmp8_) / 255.0f; + x = ((gfloat) _tmp6_) / 255.0f; #line 1366 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = func; + _tmp7_ = func; #line 1366 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = x; + _tmp8_ = x; #line 1366 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = hermite_gamma_approximation_function_evaluate (_tmp9_, 1.0f - _tmp10_); -#line 1366 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - weight = _tmp11_; + weight = hermite_gamma_approximation_function_evaluate (_tmp7_, 1.0f - _tmp8_); #line 1367 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = i; + _tmp9_ = i; #line 1367 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp13_ = weight; + _tmp10_ = weight; #line 1367 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_ = x; + _tmp11_ = x; #line 1367 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp15_ = effect_shift; + _tmp12_ = effect_shift; #line 1367 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp16_ = weight; + _tmp13_ = weight; #line 1367 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp17_ = x; + _tmp14_ = x; #line 1367 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp12_] = (_tmp13_ * (_tmp14_ - _tmp15_)) + ((1.0f - _tmp16_) * _tmp17_); + G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp9_] = (_tmp10_ * (_tmp11_ - _tmp12_)) + ((1.0f - _tmp13_) * _tmp14_); #line 1367 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp12_]; -#line 12786 "ColorTransformation.c" + _tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp9_]; +#line 12419 "ColorTransformation.c" } } } @@ -12794,18 +12427,22 @@ HighlightDetailTransformation* highlight_detail_transformation_construct (GType _hermite_gamma_approximation_function_unref0 (func); #line 1354 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return self; -#line 12794 "ColorTransformation.c" +#line 12427 "ColorTransformation.c" } -HighlightDetailTransformation* highlight_detail_transformation_new (gfloat user_intensity) { +HighlightDetailTransformation* +highlight_detail_transformation_new (gfloat user_intensity) +{ #line 1354 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return highlight_detail_transformation_construct (TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, user_intensity); -#line 12801 "ColorTransformation.c" +#line 12436 "ColorTransformation.c" } -static PixelTransformation* highlight_detail_transformation_real_copy (PixelTransformation* base) { +static PixelTransformation* +highlight_detail_transformation_real_copy (PixelTransformation* base) +{ HighlightDetailTransformation * self; PixelTransformation* result = NULL; gfloat _tmp0_; @@ -12820,11 +12457,13 @@ static PixelTransformation* highlight_detail_transformation_real_copy (PixelTran result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation); #line 1372 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 12820 "ColorTransformation.c" +#line 12457 "ColorTransformation.c" } -static gboolean highlight_detail_transformation_real_is_identity (PixelTransformation* base) { +static gboolean +highlight_detail_transformation_real_is_identity (PixelTransformation* base) +{ HighlightDetailTransformation * self; gboolean result = FALSE; gfloat _tmp0_; @@ -12836,11 +12475,13 @@ static gboolean highlight_detail_transformation_real_is_identity (PixelTransform result = _tmp0_ == 0.0f; #line 1376 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 12836 "ColorTransformation.c" +#line 12475 "ColorTransformation.c" } -gfloat highlight_detail_transformation_get_parameter (HighlightDetailTransformation* self) { +gfloat +highlight_detail_transformation_get_parameter (HighlightDetailTransformation* self) +{ gfloat result = 0.0F; gfloat _tmp0_; #line 1380 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -12849,11 +12490,13 @@ gfloat highlight_detail_transformation_get_parameter (HighlightDetailTransformat result = _tmp0_; #line 1380 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 12849 "ColorTransformation.c" +#line 12490 "ColorTransformation.c" } -static void highlight_detail_transformation_class_init (HighlightDetailTransformationClass * klass) { +static void +highlight_detail_transformation_class_init (HighlightDetailTransformationClass * klass) +{ #line 1343 "/home/jens/Source/shotwell/src/ColorTransformation.vala" highlight_detail_transformation_parent_class = g_type_class_peek_parent (klass); #line 1343 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -12864,30 +12507,36 @@ static void highlight_detail_transformation_class_init (HighlightDetailTransform ((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*) (PixelTransformation *)) highlight_detail_transformation_real_copy; #line 1343 "/home/jens/Source/shotwell/src/ColorTransformation.vala" ((PixelTransformationClass *) klass)->is_identity = (gboolean (*) (PixelTransformation *)) highlight_detail_transformation_real_is_identity; -#line 12864 "ColorTransformation.c" +#line 12507 "ColorTransformation.c" } -static void highlight_detail_transformation_instance_init (HighlightDetailTransformation * self) { +static void +highlight_detail_transformation_instance_init (HighlightDetailTransformation * self) +{ #line 1343 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->priv = HIGHLIGHT_DETAIL_TRANSFORMATION_GET_PRIVATE (self); #line 1349 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->priv->intensity = 0.0f; -#line 12873 "ColorTransformation.c" +#line 12518 "ColorTransformation.c" } -static void highlight_detail_transformation_finalize (PixelTransformation * obj) { +static void +highlight_detail_transformation_finalize (PixelTransformation * obj) +{ HighlightDetailTransformation * self; #line 1343 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation); #line 1343 "/home/jens/Source/shotwell/src/ColorTransformation.vala" PIXEL_TRANSFORMATION_CLASS (highlight_detail_transformation_parent_class)->finalize (obj); -#line 12883 "ColorTransformation.c" +#line 12530 "ColorTransformation.c" } -GType highlight_detail_transformation_get_type (void) { +GType +highlight_detail_transformation_get_type (void) +{ static volatile gsize highlight_detail_transformation_type_id__volatile = 0; if (g_once_init_enter (&highlight_detail_transformation_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (HighlightDetailTransformationClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) highlight_detail_transformation_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (HighlightDetailTransformation), 0, (GInstanceInitFunc) highlight_detail_transformation_instance_init, NULL }; @@ -12899,354 +12548,339 @@ GType highlight_detail_transformation_get_type (void) { } -PixelTransformationBundle* auto_enhance_create_auto_enhance_adjustments (GdkPixbuf* pixbuf) { +PixelTransformationBundle* +auto_enhance_create_auto_enhance_adjustments (GdkPixbuf* pixbuf) +{ PixelTransformationBundle* result = NULL; PixelTransformationBundle* adjustments = NULL; PixelTransformationBundle* _tmp0_; IntensityHistogram* analysis_histogram = NULL; - GdkPixbuf* _tmp1_; - IntensityHistogram* _tmp2_; + IntensityHistogram* _tmp1_; gfloat pct_in_range = 0.0F; + IntensityHistogram* _tmp2_; IntensityHistogram* _tmp3_; - gfloat _tmp4_; - IntensityHistogram* _tmp5_; - gfloat _tmp6_; gfloat shadow_range_mean_prob_val = 0.0F; - IntensityHistogram* _tmp7_; - gfloat _tmp8_; - IntensityHistogram* _tmp9_; - gfloat _tmp10_; + IntensityHistogram* _tmp4_; + IntensityHistogram* _tmp5_; gint shadow_mean_intensity = 0; - gboolean _tmp18_ = FALSE; - gfloat _tmp19_; - PixelTransformationBundle* _tmp46_; - HighlightDetailTransformation* _tmp47_; - HighlightDetailTransformation* _tmp48_; - PixelTransformationBundle* _tmp49_; - TemperatureTransformation* _tmp50_; - TemperatureTransformation* _tmp51_; - PixelTransformationBundle* _tmp52_; - TintTransformation* _tmp53_; - TintTransformation* _tmp54_; - PixelTransformationBundle* _tmp55_; - ExposureTransformation* _tmp56_; - ExposureTransformation* _tmp57_; - PixelTransformationBundle* _tmp58_; - ContrastTransformation* _tmp59_; - ContrastTransformation* _tmp60_; - PixelTransformationBundle* _tmp61_; - SaturationTransformation* _tmp62_; - SaturationTransformation* _tmp63_; + gboolean _tmp12_ = FALSE; + gfloat _tmp13_; + PixelTransformationBundle* _tmp39_; + HighlightDetailTransformation* _tmp40_; + HighlightDetailTransformation* _tmp41_; + PixelTransformationBundle* _tmp42_; + TemperatureTransformation* _tmp43_; + TemperatureTransformation* _tmp44_; + PixelTransformationBundle* _tmp45_; + TintTransformation* _tmp46_; + TintTransformation* _tmp47_; + PixelTransformationBundle* _tmp48_; + ExposureTransformation* _tmp49_; + ExposureTransformation* _tmp50_; + PixelTransformationBundle* _tmp51_; + ContrastTransformation* _tmp52_; + ContrastTransformation* _tmp53_; + PixelTransformationBundle* _tmp54_; + SaturationTransformation* _tmp55_; + SaturationTransformation* _tmp56_; #line 1394 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp0_ = pixel_transformation_bundle_new (); #line 1394 "/home/jens/Source/shotwell/src/ColorTransformation.vala" adjustments = _tmp0_; #line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = pixbuf; + _tmp1_ = intensity_histogram_new (pixbuf); #line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp2_ = intensity_histogram_new (_tmp1_); -#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - analysis_histogram = _tmp2_; -#line 1399 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp3_ = analysis_histogram; -#line 1399 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = intensity_histogram_get_cumulative_probability (_tmp3_, AUTO_ENHANCE_SHADOW_DETECT_MAX_INTENSITY); + analysis_histogram = _tmp1_; #line 1399 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp5_ = analysis_histogram; + _tmp2_ = analysis_histogram; #line 1399 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = intensity_histogram_get_cumulative_probability (_tmp5_, AUTO_ENHANCE_SHADOW_DETECT_MIN_INTENSITY); + _tmp3_ = analysis_histogram; #line 1399 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pct_in_range = 100.0f * (_tmp4_ - _tmp6_); + pct_in_range = 100.0f * (intensity_histogram_get_cumulative_probability (_tmp2_, AUTO_ENHANCE_SHADOW_DETECT_MAX_INTENSITY) - intensity_histogram_get_cumulative_probability (_tmp3_, AUTO_ENHANCE_SHADOW_DETECT_MIN_INTENSITY)); #line 1405 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp7_ = analysis_histogram; + _tmp4_ = analysis_histogram; #line 1405 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = intensity_histogram_get_cumulative_probability (_tmp7_, AUTO_ENHANCE_SHADOW_DETECT_MIN_INTENSITY); -#line 1405 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp9_ = analysis_histogram; -#line 1405 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp10_ = intensity_histogram_get_cumulative_probability (_tmp9_, AUTO_ENHANCE_SHADOW_DETECT_MAX_INTENSITY); + _tmp5_ = analysis_histogram; #line 1405 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - shadow_range_mean_prob_val = (_tmp8_ + _tmp10_) * 0.5f; + shadow_range_mean_prob_val = (intensity_histogram_get_cumulative_probability (_tmp4_, AUTO_ENHANCE_SHADOW_DETECT_MIN_INTENSITY) + intensity_histogram_get_cumulative_probability (_tmp5_, AUTO_ENHANCE_SHADOW_DETECT_MAX_INTENSITY)) * 0.5f; #line 1408 "/home/jens/Source/shotwell/src/ColorTransformation.vala" shadow_mean_intensity = AUTO_ENHANCE_SHADOW_DETECT_MIN_INTENSITY; -#line 12969 "ColorTransformation.c" +#line 12605 "ColorTransformation.c" { - gboolean _tmp11_ = FALSE; + gboolean _tmp6_ = FALSE; #line 1409 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = TRUE; + _tmp6_ = TRUE; #line 1409 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 12976 "ColorTransformation.c" - gint _tmp13_; - IntensityHistogram* _tmp14_; - gint _tmp15_; - gfloat _tmp16_; - gfloat _tmp17_; +#line 12612 "ColorTransformation.c" + gint _tmp8_; + IntensityHistogram* _tmp9_; + gint _tmp10_; + gfloat _tmp11_; #line 1409 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp11_) { -#line 12984 "ColorTransformation.c" - gint _tmp12_; + if (!_tmp6_) { +#line 12619 "ColorTransformation.c" + gint _tmp7_; #line 1409 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp12_ = shadow_mean_intensity; + _tmp7_ = shadow_mean_intensity; #line 1409 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - shadow_mean_intensity = _tmp12_ + 1; -#line 12990 "ColorTransformation.c" + shadow_mean_intensity = _tmp7_ + 1; +#line 12625 "ColorTransformation.c" } #line 1409 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp11_ = FALSE; + _tmp6_ = FALSE; #line 1409 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp13_ = shadow_mean_intensity; + _tmp8_ = shadow_mean_intensity; #line 1409 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp13_ <= AUTO_ENHANCE_SHADOW_DETECT_MAX_INTENSITY)) { + if (!(_tmp8_ <= AUTO_ENHANCE_SHADOW_DETECT_MAX_INTENSITY)) { #line 1409 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 13000 "ColorTransformation.c" +#line 12635 "ColorTransformation.c" } #line 1410 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp14_ = analysis_histogram; + _tmp9_ = analysis_histogram; #line 1410 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp15_ = shadow_mean_intensity; + _tmp10_ = shadow_mean_intensity; #line 1410 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp16_ = intensity_histogram_get_cumulative_probability (_tmp14_, _tmp15_); + _tmp11_ = shadow_range_mean_prob_val; #line 1410 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp17_ = shadow_range_mean_prob_val; -#line 1410 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp16_ >= _tmp17_) { + if (intensity_histogram_get_cumulative_probability (_tmp9_, _tmp10_) >= _tmp11_) { #line 1411 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 13014 "ColorTransformation.c" +#line 12647 "ColorTransformation.c" } } } #line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp19_ = pct_in_range; + _tmp13_ = pct_in_range; #line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp19_ > 40.0f) { + if (_tmp13_ > 40.0f) { #line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18_ = TRUE; -#line 13024 "ColorTransformation.c" + _tmp12_ = TRUE; +#line 12657 "ColorTransformation.c" } else { - gboolean _tmp20_ = FALSE; - gfloat _tmp21_; + gboolean _tmp14_ = FALSE; + gfloat _tmp15_; #line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp21_ = pct_in_range; + _tmp15_ = pct_in_range; #line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp21_ > 20.0f) { -#line 13032 "ColorTransformation.c" - gint _tmp22_; + if (_tmp15_ > 20.0f) { +#line 12665 "ColorTransformation.c" + gint _tmp16_; #line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp22_ = shadow_mean_intensity; + _tmp16_ = shadow_mean_intensity; #line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp20_ = _tmp22_ < AUTO_ENHANCE_EMPIRICAL_DARK; -#line 13038 "ColorTransformation.c" + _tmp14_ = _tmp16_ < AUTO_ENHANCE_EMPIRICAL_DARK; +#line 12671 "ColorTransformation.c" } else { #line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp20_ = FALSE; -#line 13042 "ColorTransformation.c" + _tmp14_ = FALSE; +#line 12675 "ColorTransformation.c" } #line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp18_ = _tmp20_; -#line 13046 "ColorTransformation.c" + _tmp12_ = _tmp14_; +#line 12679 "ColorTransformation.c" } #line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (_tmp18_) { -#line 13050 "ColorTransformation.c" + if (_tmp12_) { +#line 12683 "ColorTransformation.c" gfloat shadow_trans_effect_size = 0.0F; - gint _tmp23_; - gfloat _tmp24_; - PixelTransformationBundle* _tmp25_; - gfloat _tmp26_; - ShadowDetailTransformation* _tmp27_; - ShadowDetailTransformation* _tmp28_; + gint _tmp17_; + gfloat _tmp18_; + PixelTransformationBundle* _tmp19_; + gfloat _tmp20_; + ShadowDetailTransformation* _tmp21_; + ShadowDetailTransformation* _tmp22_; gint discard_point = 0; - PixelTransformationBundle* _tmp35_; - gint _tmp36_; - ExpansionTransformation* _tmp37_; - ExpansionTransformation* _tmp38_; + PixelTransformationBundle* _tmp28_; + gint _tmp29_; + ExpansionTransformation* _tmp30_; + ExpansionTransformation* _tmp31_; #line 1420 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp23_ = shadow_mean_intensity; + _tmp17_ = shadow_mean_intensity; #line 1420 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - shadow_trans_effect_size = ((((gfloat) AUTO_ENHANCE_SHADOW_DETECT_MAX_INTENSITY) - ((gfloat) _tmp23_)) / ((gfloat) AUTO_ENHANCE_SHADOW_DETECT_INTENSITY_RANGE)) * SHADOW_DETAIL_TRANSFORMATION_MAX_PARAMETER; + shadow_trans_effect_size = ((((gfloat) AUTO_ENHANCE_SHADOW_DETECT_MAX_INTENSITY) - ((gfloat) _tmp17_)) / ((gfloat) AUTO_ENHANCE_SHADOW_DETECT_INTENSITY_RANGE)) * SHADOW_DETAIL_TRANSFORMATION_MAX_PARAMETER; #line 1424 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp24_ = shadow_trans_effect_size; + _tmp18_ = shadow_trans_effect_size; #line 1424 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - shadow_trans_effect_size = _tmp24_ * AUTO_ENHANCE_SHADOW_AGGRESSIVENESS_MUL; + shadow_trans_effect_size = _tmp18_ * AUTO_ENHANCE_SHADOW_AGGRESSIVENESS_MUL; #line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp25_ = adjustments; + _tmp19_ = adjustments; #line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp26_ = shadow_trans_effect_size; + _tmp20_ = shadow_trans_effect_size; #line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp27_ = shadow_detail_transformation_new (_tmp26_); + _tmp21_ = shadow_detail_transformation_new (_tmp20_); #line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp28_ = _tmp27_; + _tmp22_ = _tmp21_; #line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_set (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + pixel_transformation_bundle_set (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _pixel_transformation_unref0 (_tmp28_); + _pixel_transformation_unref0 (_tmp22_); #line 1430 "/home/jens/Source/shotwell/src/ColorTransformation.vala" discard_point = 255; -#line 13085 "ColorTransformation.c" +#line 12718 "ColorTransformation.c" { - gboolean _tmp29_ = FALSE; + gboolean _tmp23_ = FALSE; #line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp29_ = TRUE; + _tmp23_ = TRUE; #line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" while (TRUE) { -#line 13092 "ColorTransformation.c" - gint _tmp31_; - IntensityHistogram* _tmp32_; - gint _tmp33_; - gfloat _tmp34_; +#line 12725 "ColorTransformation.c" + gint _tmp25_; + IntensityHistogram* _tmp26_; + gint _tmp27_; #line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!_tmp29_) { -#line 13099 "ColorTransformation.c" - gint _tmp30_; + if (!_tmp23_) { +#line 12731 "ColorTransformation.c" + gint _tmp24_; #line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp30_ = discard_point; + _tmp24_ = discard_point; #line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - discard_point = _tmp30_ - 1; -#line 13105 "ColorTransformation.c" + discard_point = _tmp24_ - 1; +#line 12737 "ColorTransformation.c" } #line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp29_ = FALSE; + _tmp23_ = FALSE; #line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp31_ = discard_point; + _tmp25_ = discard_point; #line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if (!(_tmp31_ > -1)) { + if (!(_tmp25_ > -1)) { #line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 13115 "ColorTransformation.c" +#line 12747 "ColorTransformation.c" } #line 1432 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp32_ = analysis_histogram; -#line 1432 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp33_ = discard_point; + _tmp26_ = analysis_histogram; #line 1432 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp34_ = intensity_histogram_get_cumulative_probability (_tmp32_, _tmp33_); + _tmp27_ = discard_point; #line 1432 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - if ((1.0f - _tmp34_) > AUTO_ENHANCE_SHADOW_MODE_HIGH_DISCARD_MASS) { + if ((1.0f - intensity_histogram_get_cumulative_probability (_tmp26_, _tmp27_)) > AUTO_ENHANCE_SHADOW_MODE_HIGH_DISCARD_MASS) { #line 1434 "/home/jens/Source/shotwell/src/ColorTransformation.vala" break; -#line 13127 "ColorTransformation.c" +#line 12757 "ColorTransformation.c" } } } #line 1437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp35_ = adjustments; + _tmp28_ = adjustments; #line 1437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp36_ = discard_point; + _tmp29_ = discard_point; #line 1437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp37_ = expansion_transformation_new_from_extrema (0, _tmp36_); + _tmp30_ = expansion_transformation_new_from_extrema (0, _tmp29_); #line 1437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp38_ = _tmp37_; + _tmp31_ = _tmp30_; #line 1437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_set (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + pixel_transformation_bundle_set (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 1437 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _pixel_transformation_unref0 (_tmp38_); -#line 13143 "ColorTransformation.c" + _pixel_transformation_unref0 (_tmp31_); +#line 12773 "ColorTransformation.c" } else { - PixelTransformationBundle* _tmp39_; - IntensityHistogram* _tmp40_; - ExpansionTransformation* _tmp41_; - ExpansionTransformation* _tmp42_; - PixelTransformationBundle* _tmp43_; - ShadowDetailTransformation* _tmp44_; - ShadowDetailTransformation* _tmp45_; + PixelTransformationBundle* _tmp32_; + IntensityHistogram* _tmp33_; + ExpansionTransformation* _tmp34_; + ExpansionTransformation* _tmp35_; + PixelTransformationBundle* _tmp36_; + ShadowDetailTransformation* _tmp37_; + ShadowDetailTransformation* _tmp38_; #line 1440 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp39_ = adjustments; + _tmp32_ = adjustments; #line 1440 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp40_ = analysis_histogram; + _tmp33_ = analysis_histogram; #line 1440 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp41_ = expansion_transformation_new (_tmp40_); + _tmp34_ = expansion_transformation_new (_tmp33_); #line 1440 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp42_ = _tmp41_; + _tmp35_ = _tmp34_; #line 1440 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_set (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + pixel_transformation_bundle_set (_tmp32_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 1440 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _pixel_transformation_unref0 (_tmp42_); + _pixel_transformation_unref0 (_tmp35_); #line 1441 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp43_ = adjustments; + _tmp36_ = adjustments; #line 1441 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp44_ = shadow_detail_transformation_new ((gfloat) 0); + _tmp37_ = shadow_detail_transformation_new ((gfloat) 0); #line 1441 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp45_ = _tmp44_; + _tmp38_ = _tmp37_; #line 1441 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_set (_tmp43_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + pixel_transformation_bundle_set (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 1441 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _pixel_transformation_unref0 (_tmp45_); -#line 13174 "ColorTransformation.c" + _pixel_transformation_unref0 (_tmp38_); +#line 12804 "ColorTransformation.c" } #line 1445 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp46_ = adjustments; + _tmp39_ = adjustments; #line 1445 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp47_ = highlight_detail_transformation_new (0.0f); + _tmp40_ = highlight_detail_transformation_new (0.0f); #line 1445 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp48_ = _tmp47_; + _tmp41_ = _tmp40_; #line 1445 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_set (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + pixel_transformation_bundle_set (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 1445 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _pixel_transformation_unref0 (_tmp48_); + _pixel_transformation_unref0 (_tmp41_); #line 1446 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp49_ = adjustments; + _tmp42_ = adjustments; #line 1446 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp50_ = temperature_transformation_new (0.0f); + _tmp43_ = temperature_transformation_new (0.0f); #line 1446 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp51_ = _tmp50_; + _tmp44_ = _tmp43_; #line 1446 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_set (_tmp49_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + pixel_transformation_bundle_set (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 1446 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _pixel_transformation_unref0 (_tmp51_); + _pixel_transformation_unref0 (_tmp44_); #line 1447 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp52_ = adjustments; + _tmp45_ = adjustments; #line 1447 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp53_ = tint_transformation_new (0.0f); + _tmp46_ = tint_transformation_new (0.0f); #line 1447 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp54_ = _tmp53_; + _tmp47_ = _tmp46_; #line 1447 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_set (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + pixel_transformation_bundle_set (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 1447 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _pixel_transformation_unref0 (_tmp54_); + _pixel_transformation_unref0 (_tmp47_); #line 1448 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp55_ = adjustments; + _tmp48_ = adjustments; #line 1448 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp56_ = exposure_transformation_new (0.0f); + _tmp49_ = exposure_transformation_new (0.0f); #line 1448 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp57_ = _tmp56_; + _tmp50_ = _tmp49_; #line 1448 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_set (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + pixel_transformation_bundle_set (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 1448 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _pixel_transformation_unref0 (_tmp57_); + _pixel_transformation_unref0 (_tmp50_); #line 1449 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp58_ = adjustments; + _tmp51_ = adjustments; #line 1449 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp59_ = contrast_transformation_new (0.0f); + _tmp52_ = contrast_transformation_new (0.0f); #line 1449 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp60_ = _tmp59_; + _tmp53_ = _tmp52_; #line 1449 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_set (_tmp58_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + pixel_transformation_bundle_set (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 1449 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _pixel_transformation_unref0 (_tmp60_); + _pixel_transformation_unref0 (_tmp53_); #line 1450 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp61_ = adjustments; + _tmp54_ = adjustments; #line 1450 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp62_ = saturation_transformation_new (0.0f); + _tmp55_ = saturation_transformation_new (0.0f); #line 1450 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp63_ = _tmp62_; + _tmp56_ = _tmp55_; #line 1450 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - pixel_transformation_bundle_set (_tmp61_, G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + pixel_transformation_bundle_set (_tmp54_, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 1450 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _pixel_transformation_unref0 (_tmp63_); + _pixel_transformation_unref0 (_tmp56_); #line 1452 "/home/jens/Source/shotwell/src/ColorTransformation.vala" result = adjustments; #line 1452 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _intensity_histogram_unref0 (analysis_histogram); #line 1452 "/home/jens/Source/shotwell/src/ColorTransformation.vala" return result; -#line 13242 "ColorTransformation.c" +#line 12872 "ColorTransformation.c" } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -13258,7 +12892,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/CommandManager.c b/src/CommandManager.c index bc54284..baf7d78 100644 --- a/src/CommandManager.c +++ b/src/CommandManager.c @@ -1,4 +1,4 @@ -/* CommandManager.c generated by valac 0.36.6, the Vala compiler +/* CommandManager.c generated by valac 0.40.4, the Vala compiler * generated from CommandManager.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -43,15 +44,20 @@ typedef struct _CommandPrivate CommandPrivate; typedef struct _CommandManager CommandManager; typedef struct _CommandManagerClass CommandManagerClass; +enum { + COMMAND_0_PROPERTY, + COMMAND_NUM_PROPERTIES +}; +static GParamSpec* command_properties[COMMAND_NUM_PROPERTIES]; #define _g_free0(var) (var = (g_free (var), NULL)) typedef struct _CommandManagerPrivate CommandManagerPrivate; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) typedef struct _ParamSpecCommandManager ParamSpecCommandManager; enum { COMMAND_MANAGER_ALTERED_SIGNAL, - COMMAND_MANAGER_LAST_SIGNAL + COMMAND_MANAGER_NUM_SIGNALS }; -static guint command_manager_signals[COMMAND_MANAGER_LAST_SIGNAL] = {0}; +static guint command_manager_signals[COMMAND_MANAGER_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -117,16 +123,21 @@ gchar* command_description_get_explanation (CommandDescription* self); GType command_get_type (void) G_GNUC_CONST; gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; #define COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_COMMAND, CommandPrivate)) -enum { - COMMAND_DUMMY_PROPERTY -}; -Command* command_construct (GType object_type, const gchar* name, const gchar* explanation); +Command* command_construct (GType object_type, + const gchar* name, + const gchar* explanation); void command_prepare (Command* self); static void command_real_prepare (Command* self); void command_execute (Command* self); @@ -135,68 +146,87 @@ void command_undo (Command* self); static void command_real_undo (Command* self); void command_redo (Command* self); static void command_real_redo (Command* self); -gboolean command_compress (Command* self, Command* command); -static gboolean command_real_compress (Command* self, Command* command); +gboolean command_compress (Command* self, + Command* command); +static gboolean command_real_compress (Command* self, + Command* command); gchar* command_get_name (Command* self); static gchar* command_real_get_name (Command* self); gchar* command_get_explanation (Command* self); static gchar* command_real_get_explanation (Command* self); CommandManager* command_get_command_manager (Command* self); -void command_internal_set_command_manager (Command* self, CommandManager* manager); +void command_internal_set_command_manager (Command* self, + CommandManager* manager); static void command_finalize (GObject * obj); #define COMMAND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_COMMAND_MANAGER, CommandManagerPrivate)) -enum { - COMMAND_MANAGER_DUMMY_PROPERTY -}; #define COMMAND_MANAGER_DEFAULT_DEPTH 20 CommandManager* command_manager_new (gint depth); -CommandManager* command_manager_construct (GType object_type, gint depth); +CommandManager* command_manager_construct (GType object_type, + gint depth); void command_manager_reset (CommandManager* self); -void command_manager_execute (CommandManager* self, Command* command); -static Command* command_manager_top (CommandManager* self, GeeArrayList* stack); -static void command_manager_push (CommandManager* self, GeeArrayList* stack, Command* command); +void command_manager_execute (CommandManager* self, + Command* command); +static Command* command_manager_top (CommandManager* self, + GeeArrayList* stack); +static void command_manager_push (CommandManager* self, + GeeArrayList* stack, + Command* command); gboolean command_manager_can_undo (CommandManager* self); gboolean command_manager_can_redo (CommandManager* self); CommandDescription* command_manager_get_undo_description (CommandManager* self); gboolean command_manager_undo (CommandManager* self); -static Command* command_manager_pop (CommandManager* self, GeeArrayList* stack); +static Command* command_manager_pop (CommandManager* self, + GeeArrayList* stack); CommandDescription* command_manager_get_redo_description (CommandManager* self); gboolean command_manager_redo (CommandManager* self); -static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); +static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); static void command_manager_finalize (CommandManager * obj); -gchar* command_description_get_name (CommandDescription* self) { +gchar* +command_description_get_name (CommandDescription* self) +{ #line 8 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (IS_COMMAND_DESCRIPTION (self), NULL); #line 8 "/home/jens/Source/shotwell/src/CommandManager.vala" return COMMAND_DESCRIPTION_GET_INTERFACE (self)->get_name (self); -#line 175 "CommandManager.c" +#line 199 "CommandManager.c" } -gchar* command_description_get_explanation (CommandDescription* self) { +gchar* +command_description_get_explanation (CommandDescription* self) +{ #line 10 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (IS_COMMAND_DESCRIPTION (self), NULL); #line 10 "/home/jens/Source/shotwell/src/CommandManager.vala" return COMMAND_DESCRIPTION_GET_INTERFACE (self)->get_explanation (self); -#line 184 "CommandManager.c" +#line 210 "CommandManager.c" } -static void command_description_base_init (CommandDescriptionIface * iface) { +static void +command_description_base_init (CommandDescriptionIface * iface) +{ #line 7 "/home/jens/Source/shotwell/src/CommandManager.vala" static gboolean initialized = FALSE; #line 7 "/home/jens/Source/shotwell/src/CommandManager.vala" if (!initialized) { #line 7 "/home/jens/Source/shotwell/src/CommandManager.vala" initialized = TRUE; -#line 195 "CommandManager.c" +#line 223 "CommandManager.c" } } -GType command_description_get_type (void) { +GType +command_description_get_type (void) +{ static volatile gsize command_description_type_id__volatile = 0; if (g_once_init_enter (&command_description_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CommandDescriptionIface), (GBaseInitFunc) command_description_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -209,12 +239,14 @@ GType command_description_get_type (void) { } -Command* command_construct (GType object_type, const gchar* name, const gchar* explanation) { +Command* +command_construct (GType object_type, + const gchar* name, + const gchar* explanation) +{ Command * self = NULL; - const gchar* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_; #line 32 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (name != NULL, NULL); #line 32 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -222,93 +254,108 @@ Command* command_construct (GType object_type, const gchar* name, const gchar* e #line 32 "/home/jens/Source/shotwell/src/CommandManager.vala" self = (Command*) g_object_new (object_type, NULL); #line 33 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp0_ = name; -#line 33 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (name); #line 33 "/home/jens/Source/shotwell/src/CommandManager.vala" _g_free0 (self->priv->name); #line 33 "/home/jens/Source/shotwell/src/CommandManager.vala" - self->priv->name = _tmp1_; -#line 34 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp2_ = explanation; + self->priv->name = _tmp0_; #line 34 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (explanation); #line 34 "/home/jens/Source/shotwell/src/CommandManager.vala" _g_free0 (self->priv->explanation); #line 34 "/home/jens/Source/shotwell/src/CommandManager.vala" - self->priv->explanation = _tmp3_; + self->priv->explanation = _tmp1_; #line 32 "/home/jens/Source/shotwell/src/CommandManager.vala" return self; -#line 243 "CommandManager.c" +#line 271 "CommandManager.c" } -static void command_real_prepare (Command* self) { +static void +command_real_prepare (Command* self) +{ } -void command_prepare (Command* self) { +void +command_prepare (Command* self) +{ #line 43 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (IS_COMMAND (self)); #line 43 "/home/jens/Source/shotwell/src/CommandManager.vala" COMMAND_GET_CLASS (self)->prepare (self); -#line 256 "CommandManager.c" +#line 288 "CommandManager.c" } -static void command_real_execute (Command* self) { +static void +command_real_execute (Command* self) +{ #line 46 "/home/jens/Source/shotwell/src/CommandManager.vala" g_critical ("Type `%s' does not implement abstract method `command_execute'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 46 "/home/jens/Source/shotwell/src/CommandManager.vala" return; -#line 265 "CommandManager.c" +#line 299 "CommandManager.c" } -void command_execute (Command* self) { +void +command_execute (Command* self) +{ #line 46 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (IS_COMMAND (self)); #line 46 "/home/jens/Source/shotwell/src/CommandManager.vala" COMMAND_GET_CLASS (self)->execute (self); -#line 274 "CommandManager.c" +#line 310 "CommandManager.c" } -static void command_real_undo (Command* self) { +static void +command_real_undo (Command* self) +{ #line 48 "/home/jens/Source/shotwell/src/CommandManager.vala" g_critical ("Type `%s' does not implement abstract method `command_undo'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 48 "/home/jens/Source/shotwell/src/CommandManager.vala" return; -#line 283 "CommandManager.c" +#line 321 "CommandManager.c" } -void command_undo (Command* self) { +void +command_undo (Command* self) +{ #line 48 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (IS_COMMAND (self)); #line 48 "/home/jens/Source/shotwell/src/CommandManager.vala" COMMAND_GET_CLASS (self)->undo (self); -#line 292 "CommandManager.c" +#line 332 "CommandManager.c" } -static void command_real_redo (Command* self) { +static void +command_real_redo (Command* self) +{ #line 51 "/home/jens/Source/shotwell/src/CommandManager.vala" command_execute (self); -#line 299 "CommandManager.c" +#line 341 "CommandManager.c" } -void command_redo (Command* self) { +void +command_redo (Command* self) +{ #line 50 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (IS_COMMAND (self)); #line 50 "/home/jens/Source/shotwell/src/CommandManager.vala" COMMAND_GET_CLASS (self)->redo (self); -#line 308 "CommandManager.c" +#line 352 "CommandManager.c" } -static gboolean command_real_compress (Command* self, Command* command) { +static gboolean +command_real_compress (Command* self, + Command* command) +{ gboolean result = FALSE; #line 56 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (IS_COMMAND (command), FALSE); @@ -316,20 +363,25 @@ static gboolean command_real_compress (Command* self, Command* command) { result = FALSE; #line 57 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 320 "CommandManager.c" +#line 367 "CommandManager.c" } -gboolean command_compress (Command* self, Command* command) { +gboolean +command_compress (Command* self, + Command* command) +{ #line 56 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (IS_COMMAND (self), FALSE); #line 56 "/home/jens/Source/shotwell/src/CommandManager.vala" return COMMAND_GET_CLASS (self)->compress (self, command); -#line 329 "CommandManager.c" +#line 379 "CommandManager.c" } -static gchar* command_real_get_name (Command* self) { +static gchar* +command_real_get_name (Command* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -341,20 +393,24 @@ static gchar* command_real_get_name (Command* self) { result = _tmp1_; #line 61 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 345 "CommandManager.c" +#line 397 "CommandManager.c" } -gchar* command_get_name (Command* self) { +gchar* +command_get_name (Command* self) +{ #line 60 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (IS_COMMAND (self), NULL); #line 60 "/home/jens/Source/shotwell/src/CommandManager.vala" return COMMAND_GET_CLASS (self)->get_name (self); -#line 354 "CommandManager.c" +#line 408 "CommandManager.c" } -static gchar* command_real_get_explanation (Command* self) { +static gchar* +command_real_get_explanation (Command* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -366,27 +422,33 @@ static gchar* command_real_get_explanation (Command* self) { result = _tmp1_; #line 65 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 370 "CommandManager.c" +#line 426 "CommandManager.c" } -gchar* command_get_explanation (Command* self) { +gchar* +command_get_explanation (Command* self) +{ #line 64 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (IS_COMMAND (self), NULL); #line 64 "/home/jens/Source/shotwell/src/CommandManager.vala" return COMMAND_GET_CLASS (self)->get_explanation (self); -#line 379 "CommandManager.c" +#line 437 "CommandManager.c" } -static gpointer _command_manager_ref0 (gpointer self) { +static gpointer +_command_manager_ref0 (gpointer self) +{ #line 69 "/home/jens/Source/shotwell/src/CommandManager.vala" return self ? command_manager_ref (self) : NULL; -#line 386 "CommandManager.c" +#line 446 "CommandManager.c" } -CommandManager* command_get_command_manager (Command* self) { +CommandManager* +command_get_command_manager (Command* self) +{ CommandManager* result = NULL; CommandManager* _tmp0_; CommandManager* _tmp1_; @@ -400,13 +462,15 @@ CommandManager* command_get_command_manager (Command* self) { result = _tmp1_; #line 69 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 404 "CommandManager.c" +#line 466 "CommandManager.c" } -void command_internal_set_command_manager (Command* self, CommandManager* manager) { +void +command_internal_set_command_manager (Command* self, + CommandManager* manager) +{ CommandManager* _tmp0_; - CommandManager* _tmp1_; #line 73 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (IS_COMMAND (self)); #line 73 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -416,14 +480,14 @@ void command_internal_set_command_manager (Command* self, CommandManager* manage #line 74 "/home/jens/Source/shotwell/src/CommandManager.vala" _vala_assert (_tmp0_ == NULL, "this.manager == null"); #line 76 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp1_ = manager; -#line 76 "/home/jens/Source/shotwell/src/CommandManager.vala" - self->priv->manager = _tmp1_; -#line 423 "CommandManager.c" + self->priv->manager = manager; +#line 485 "CommandManager.c" } -static void command_class_init (CommandClass * klass) { +static void +command_class_init (CommandClass * klass) +{ #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" command_parent_class = g_type_class_peek_parent (klass); #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -444,31 +508,37 @@ static void command_class_init (CommandClass * klass) { ((CommandClass *) klass)->get_explanation = (gchar* (*) (Command *)) command_real_get_explanation; #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" G_OBJECT_CLASS (klass)->finalize = command_finalize; -#line 448 "CommandManager.c" +#line 512 "CommandManager.c" } -static void command_command_description_interface_init (CommandDescriptionIface * iface) { +static void +command_command_description_interface_init (CommandDescriptionIface * iface) +{ #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" command_command_description_parent_iface = g_type_interface_peek_parent (iface); #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" iface->get_name = (gchar* (*) (CommandDescription *)) command_get_name; #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" iface->get_explanation = (gchar* (*) (CommandDescription *)) command_get_explanation; -#line 459 "CommandManager.c" +#line 525 "CommandManager.c" } -static void command_instance_init (Command * self) { +static void +command_instance_init (Command * self) +{ #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" self->priv = COMMAND_GET_PRIVATE (self); #line 30 "/home/jens/Source/shotwell/src/CommandManager.vala" self->priv->manager = NULL; -#line 468 "CommandManager.c" +#line 536 "CommandManager.c" } -static void command_finalize (GObject * obj) { +static void +command_finalize (GObject * obj) +{ Command * self; #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COMMAND, Command); @@ -478,11 +548,13 @@ static void command_finalize (GObject * obj) { _g_free0 (self->priv->explanation); #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" G_OBJECT_CLASS (command_parent_class)->finalize (obj); -#line 482 "CommandManager.c" +#line 552 "CommandManager.c" } -GType command_get_type (void) { +GType +command_get_type (void) +{ static volatile gsize command_type_id__volatile = 0; if (g_once_init_enter (&command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Command), 0, (GInstanceInitFunc) command_instance_init, NULL }; @@ -496,34 +568,35 @@ GType command_get_type (void) { } -CommandManager* command_manager_construct (GType object_type, gint depth) { +CommandManager* +command_manager_construct (GType object_type, + gint depth) +{ CommandManager* self = NULL; - gint _tmp0_; - gint _tmp1_; #line 89 "/home/jens/Source/shotwell/src/CommandManager.vala" self = (CommandManager*) g_type_create_instance (object_type); #line 90 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp0_ = depth; -#line 90 "/home/jens/Source/shotwell/src/CommandManager.vala" - _vala_assert (_tmp0_ > 0, "depth > 0"); -#line 92 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp1_ = depth; + _vala_assert (depth > 0, "depth > 0"); #line 92 "/home/jens/Source/shotwell/src/CommandManager.vala" - self->priv->depth = _tmp1_; + self->priv->depth = depth; #line 89 "/home/jens/Source/shotwell/src/CommandManager.vala" return self; -#line 516 "CommandManager.c" +#line 585 "CommandManager.c" } -CommandManager* command_manager_new (gint depth) { +CommandManager* +command_manager_new (gint depth) +{ #line 89 "/home/jens/Source/shotwell/src/CommandManager.vala" return command_manager_construct (TYPE_COMMAND_MANAGER, depth); -#line 523 "CommandManager.c" +#line 594 "CommandManager.c" } -void command_manager_reset (CommandManager* self) { +void +command_manager_reset (CommandManager* self) +{ GeeArrayList* _tmp0_; GeeArrayList* _tmp1_; #line 95 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -538,91 +611,72 @@ void command_manager_reset (CommandManager* self) { gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 99 "/home/jens/Source/shotwell/src/CommandManager.vala" g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, FALSE, FALSE); -#line 542 "CommandManager.c" +#line 615 "CommandManager.c" } -void command_manager_execute (CommandManager* self, Command* command) { - Command* _tmp0_; - GeeArrayList* _tmp1_; +void +command_manager_execute (CommandManager* self, + Command* command) +{ + GeeArrayList* _tmp0_; Command* top_command = NULL; - GeeArrayList* _tmp2_; + GeeArrayList* _tmp1_; + Command* _tmp2_; Command* _tmp3_; - Command* _tmp4_; - GeeArrayList* _tmp8_; - Command* _tmp9_; - Command* _tmp10_; - Command* _tmp11_; - gboolean _tmp12_; - gboolean _tmp13_; + GeeArrayList* _tmp5_; #line 102 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (IS_COMMAND_MANAGER (self)); #line 102 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (IS_COMMAND (command)); #line 104 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp0_ = command; -#line 104 "/home/jens/Source/shotwell/src/CommandManager.vala" - command_internal_set_command_manager (_tmp0_, self); + command_internal_set_command_manager (command, self); #line 107 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp1_ = self->priv->redo_stack; + _tmp0_ = self->priv->redo_stack; #line 107 "/home/jens/Source/shotwell/src/CommandManager.vala" - gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 110 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp2_ = self->priv->undo_stack; + _tmp1_ = self->priv->undo_stack; #line 110 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp3_ = command_manager_top (self, _tmp2_); + _tmp2_ = command_manager_top (self, _tmp1_); #line 110 "/home/jens/Source/shotwell/src/CommandManager.vala" - top_command = _tmp3_; + top_command = _tmp2_; #line 111 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp4_ = top_command; + _tmp3_ = top_command; #line 111 "/home/jens/Source/shotwell/src/CommandManager.vala" - if (_tmp4_ != NULL) { -#line 581 "CommandManager.c" - Command* _tmp5_; - Command* _tmp6_; - gboolean _tmp7_; + if (_tmp3_ != NULL) { +#line 649 "CommandManager.c" + Command* _tmp4_; #line 112 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp5_ = top_command; + _tmp4_ = top_command; #line 112 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp6_ = command; -#line 112 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp7_ = command_compress (_tmp5_, _tmp6_); -#line 112 "/home/jens/Source/shotwell/src/CommandManager.vala" - if (_tmp7_) { + if (command_compress (_tmp4_, command)) { #line 113 "/home/jens/Source/shotwell/src/CommandManager.vala" _g_object_unref0 (top_command); #line 113 "/home/jens/Source/shotwell/src/CommandManager.vala" return; -#line 597 "CommandManager.c" +#line 659 "CommandManager.c" } } #line 117 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp8_ = self->priv->undo_stack; -#line 117 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp9_ = command; + _tmp5_ = self->priv->undo_stack; #line 117 "/home/jens/Source/shotwell/src/CommandManager.vala" - command_manager_push (self, _tmp8_, _tmp9_); + command_manager_push (self, _tmp5_, command); #line 119 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp10_ = command; -#line 119 "/home/jens/Source/shotwell/src/CommandManager.vala" - command_prepare (_tmp10_); -#line 120 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp11_ = command; + command_prepare (command); #line 120 "/home/jens/Source/shotwell/src/CommandManager.vala" - command_execute (_tmp11_); + command_execute (command); #line 123 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp12_ = command_manager_can_undo (self); -#line 123 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp13_ = command_manager_can_redo (self); -#line 123 "/home/jens/Source/shotwell/src/CommandManager.vala" - g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, _tmp12_, _tmp13_); + g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, command_manager_can_undo (self), command_manager_can_redo (self)); #line 102 "/home/jens/Source/shotwell/src/CommandManager.vala" _g_object_unref0 (top_command); -#line 622 "CommandManager.c" +#line 674 "CommandManager.c" } -gboolean command_manager_can_undo (CommandManager* self) { +gboolean +command_manager_can_undo (CommandManager* self) +{ gboolean result = FALSE; GeeArrayList* _tmp0_; gint _tmp1_; @@ -639,11 +693,13 @@ gboolean command_manager_can_undo (CommandManager* self) { result = _tmp2_ > 0; #line 127 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 643 "CommandManager.c" +#line 697 "CommandManager.c" } -CommandDescription* command_manager_get_undo_description (CommandManager* self) { +CommandDescription* +command_manager_get_undo_description (CommandManager* self) +{ CommandDescription* result = NULL; GeeArrayList* _tmp0_; Command* _tmp1_; @@ -657,11 +713,13 @@ CommandDescription* command_manager_get_undo_description (CommandManager* self) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND_DESCRIPTION, CommandDescription); #line 131 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 661 "CommandManager.c" +#line 717 "CommandManager.c" } -gboolean command_manager_undo (CommandManager* self) { +gboolean +command_manager_undo (CommandManager* self) +{ gboolean result = FALSE; Command* command = NULL; GeeArrayList* _tmp0_; @@ -671,8 +729,6 @@ gboolean command_manager_undo (CommandManager* self) { Command* _tmp4_; Command* _tmp5_; Command* _tmp6_; - gboolean _tmp7_; - gboolean _tmp8_; #line 134 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (IS_COMMAND_MANAGER (self), FALSE); #line 135 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -691,7 +747,7 @@ gboolean command_manager_undo (CommandManager* self) { _g_object_unref0 (command); #line 137 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 695 "CommandManager.c" +#line 751 "CommandManager.c" } #line 140 "/home/jens/Source/shotwell/src/CommandManager.vala" _tmp3_ = self->priv->redo_stack; @@ -708,22 +764,20 @@ gboolean command_manager_undo (CommandManager* self) { #line 144 "/home/jens/Source/shotwell/src/CommandManager.vala" command_undo (_tmp6_); #line 147 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp7_ = command_manager_can_undo (self); -#line 147 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp8_ = command_manager_can_redo (self); -#line 147 "/home/jens/Source/shotwell/src/CommandManager.vala" - g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, _tmp7_, _tmp8_); + g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, command_manager_can_undo (self), command_manager_can_redo (self)); #line 149 "/home/jens/Source/shotwell/src/CommandManager.vala" result = TRUE; #line 149 "/home/jens/Source/shotwell/src/CommandManager.vala" _g_object_unref0 (command); #line 149 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 723 "CommandManager.c" +#line 775 "CommandManager.c" } -gboolean command_manager_can_redo (CommandManager* self) { +gboolean +command_manager_can_redo (CommandManager* self) +{ gboolean result = FALSE; GeeArrayList* _tmp0_; gint _tmp1_; @@ -740,11 +794,13 @@ gboolean command_manager_can_redo (CommandManager* self) { result = _tmp2_ > 0; #line 153 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 744 "CommandManager.c" +#line 798 "CommandManager.c" } -CommandDescription* command_manager_get_redo_description (CommandManager* self) { +CommandDescription* +command_manager_get_redo_description (CommandManager* self) +{ CommandDescription* result = NULL; GeeArrayList* _tmp0_; Command* _tmp1_; @@ -758,11 +814,13 @@ CommandDescription* command_manager_get_redo_description (CommandManager* self) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND_DESCRIPTION, CommandDescription); #line 157 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 762 "CommandManager.c" +#line 818 "CommandManager.c" } -gboolean command_manager_redo (CommandManager* self) { +gboolean +command_manager_redo (CommandManager* self) +{ gboolean result = FALSE; Command* command = NULL; GeeArrayList* _tmp0_; @@ -772,8 +830,6 @@ gboolean command_manager_redo (CommandManager* self) { Command* _tmp4_; Command* _tmp5_; Command* _tmp6_; - gboolean _tmp7_; - gboolean _tmp8_; #line 160 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (IS_COMMAND_MANAGER (self), FALSE); #line 161 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -792,7 +848,7 @@ gboolean command_manager_redo (CommandManager* self) { _g_object_unref0 (command); #line 163 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 796 "CommandManager.c" +#line 852 "CommandManager.c" } #line 166 "/home/jens/Source/shotwell/src/CommandManager.vala" _tmp3_ = self->priv->undo_stack; @@ -809,78 +865,70 @@ gboolean command_manager_redo (CommandManager* self) { #line 170 "/home/jens/Source/shotwell/src/CommandManager.vala" command_redo (_tmp6_); #line 173 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp7_ = command_manager_can_undo (self); -#line 173 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp8_ = command_manager_can_redo (self); -#line 173 "/home/jens/Source/shotwell/src/CommandManager.vala" - g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, _tmp7_, _tmp8_); + g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, command_manager_can_undo (self), command_manager_can_redo (self)); #line 175 "/home/jens/Source/shotwell/src/CommandManager.vala" result = TRUE; #line 175 "/home/jens/Source/shotwell/src/CommandManager.vala" _g_object_unref0 (command); #line 175 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 824 "CommandManager.c" +#line 876 "CommandManager.c" } -static Command* command_manager_top (CommandManager* self, GeeArrayList* stack) { +static Command* +command_manager_top (CommandManager* self, + GeeArrayList* stack) +{ Command* result = NULL; Command* _tmp0_ = NULL; - GeeArrayList* _tmp1_; + gint _tmp1_; gint _tmp2_; - gint _tmp3_; #line 178 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (IS_COMMAND_MANAGER (self), NULL); #line 178 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (GEE_IS_ARRAY_LIST (stack), NULL); #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp1_ = stack; -#line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (stack, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp3_ = _tmp2_; -#line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" - if (_tmp3_ > 0) { -#line 846 "CommandManager.c" - GeeArrayList* _tmp4_; - GeeArrayList* _tmp5_; - gint _tmp6_; - gint _tmp7_; - gpointer _tmp8_; -#line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp4_ = stack; + _tmp2_ = _tmp1_; #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp5_ = stack; + if (_tmp2_ > 0) { +#line 898 "CommandManager.c" + gint _tmp3_; + gint _tmp4_; + gpointer _tmp5_; #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp6_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (stack, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp8_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp7_ - 1); + _tmp5_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (stack, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp4_ - 1); #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" _g_object_unref0 (_tmp0_); #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp0_ = (Command*) _tmp8_; -#line 866 "CommandManager.c" + _tmp0_ = (Command*) _tmp5_; +#line 912 "CommandManager.c" } else { #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" _g_object_unref0 (_tmp0_); #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" _tmp0_ = NULL; -#line 872 "CommandManager.c" +#line 918 "CommandManager.c" } #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" result = _tmp0_; #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 878 "CommandManager.c" +#line 924 "CommandManager.c" } -static void command_manager_push (CommandManager* self, GeeArrayList* stack, Command* command) { - GeeArrayList* _tmp0_; - Command* _tmp1_; +static void +command_manager_push (CommandManager* self, + GeeArrayList* stack, + Command* command) +{ #line 182 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (IS_COMMAND_MANAGER (self)); #line 182 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -888,115 +936,100 @@ static void command_manager_push (CommandManager* self, GeeArrayList* stack, Com #line 182 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (IS_COMMAND (command)); #line 183 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp0_ = stack; -#line 183 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp1_ = command; -#line 183 "/home/jens/Source/shotwell/src/CommandManager.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (stack, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), command); #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala" while (TRUE) { -#line 899 "CommandManager.c" - GeeArrayList* _tmp2_; - gint _tmp3_; - gint _tmp4_; - gint _tmp5_; - GeeArrayList* _tmp6_; - gpointer _tmp7_; - Command* _tmp8_; +#line 943 "CommandManager.c" + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; + gpointer _tmp3_; + Command* _tmp4_; #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp2_ = stack; + _tmp0_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (stack, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp1_ = _tmp0_; #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp4_ = _tmp3_; + _tmp2_ = self->priv->depth; #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp5_ = self->priv->depth; -#line 186 "/home/jens/Source/shotwell/src/CommandManager.vala" - if (!(_tmp4_ >= _tmp5_)) { + if (!(_tmp1_ >= _tmp2_)) { #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala" break; -#line 919 "CommandManager.c" +#line 959 "CommandManager.c" } #line 187 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp6_ = stack; -#line 187 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp7_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); + _tmp3_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (stack, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); #line 187 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp8_ = (Command*) _tmp7_; + _tmp4_ = (Command*) _tmp3_; #line 187 "/home/jens/Source/shotwell/src/CommandManager.vala" - _g_object_unref0 (_tmp8_); -#line 929 "CommandManager.c" + _g_object_unref0 (_tmp4_); +#line 967 "CommandManager.c" } } -static Command* command_manager_pop (CommandManager* self, GeeArrayList* stack) { +static Command* +command_manager_pop (CommandManager* self, + GeeArrayList* stack) +{ Command* result = NULL; - GeeArrayList* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; Command* command = NULL; - GeeArrayList* _tmp3_; - GeeArrayList* _tmp4_; - gint _tmp5_; - gint _tmp6_; - gpointer _tmp7_; + gint _tmp2_; + gint _tmp3_; + gpointer _tmp4_; gboolean removed = FALSE; - GeeArrayList* _tmp8_; - Command* _tmp9_; - gboolean _tmp10_; - gboolean _tmp11_; + Command* _tmp5_; + gboolean _tmp6_; #line 190 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (IS_COMMAND_MANAGER (self), NULL); #line 190 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (GEE_IS_ARRAY_LIST (stack), NULL); #line 191 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp0_ = stack; + _tmp0_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (stack, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 191 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 191 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 191 "/home/jens/Source/shotwell/src/CommandManager.vala" - if (_tmp2_ <= 0) { + if (_tmp1_ <= 0) { #line 192 "/home/jens/Source/shotwell/src/CommandManager.vala" result = NULL; #line 192 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 966 "CommandManager.c" +#line 1000 "CommandManager.c" } #line 194 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp3_ = stack; + _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (stack, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 194 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp4_ = stack; -#line 194 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 194 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 194 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp7_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp6_ - 1); + _tmp4_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (stack, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp3_ - 1); #line 194 "/home/jens/Source/shotwell/src/CommandManager.vala" - command = (Command*) _tmp7_; -#line 195 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp8_ = stack; -#line 195 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp9_ = command; + command = (Command*) _tmp4_; #line 195 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp10_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_); + _tmp5_ = command; #line 195 "/home/jens/Source/shotwell/src/CommandManager.vala" - removed = _tmp10_; + removed = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (stack, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_); #line 196 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp11_ = removed; + _tmp6_ = removed; #line 196 "/home/jens/Source/shotwell/src/CommandManager.vala" - _vala_assert (_tmp11_, "removed"); + _vala_assert (_tmp6_, "removed"); #line 198 "/home/jens/Source/shotwell/src/CommandManager.vala" result = command; #line 198 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 996 "CommandManager.c" +#line 1022 "CommandManager.c" } -static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__BOOLEAN_BOOLEAN) (gpointer data1, gboolean arg_1, gboolean arg_2, gpointer data2); register GMarshalFunc_VOID__BOOLEAN_BOOLEAN callback; register GCClosure * cc; @@ -1011,120 +1044,145 @@ static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN (GClosure * closure, G data1 = closure->data; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" data2 = param_values->data[0].v_pointer; -#line 1015 "CommandManager.c" +#line 1048 "CommandManager.c" } else { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" data1 = param_values->data[0].v_pointer; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" data2 = closure->data; -#line 1021 "CommandManager.c" +#line 1054 "CommandManager.c" } #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" callback = (GMarshalFunc_VOID__BOOLEAN_BOOLEAN) (marshal_data ? marshal_data : cc->callback); #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" callback (data1, g_value_get_boolean (param_values + 1), g_value_get_boolean (param_values + 2), data2); -#line 1027 "CommandManager.c" +#line 1060 "CommandManager.c" } -static void value_command_manager_init (GValue* value) { +static void +value_command_manager_init (GValue* value) +{ #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" value->data[0].v_pointer = NULL; -#line 1034 "CommandManager.c" +#line 1069 "CommandManager.c" } -static void value_command_manager_free_value (GValue* value) { +static void +value_command_manager_free_value (GValue* value) +{ #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" if (value->data[0].v_pointer) { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" command_manager_unref (value->data[0].v_pointer); -#line 1043 "CommandManager.c" +#line 1080 "CommandManager.c" } } -static void value_command_manager_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_command_manager_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" if (src_value->data[0].v_pointer) { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" dest_value->data[0].v_pointer = command_manager_ref (src_value->data[0].v_pointer); -#line 1053 "CommandManager.c" +#line 1093 "CommandManager.c" } else { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" dest_value->data[0].v_pointer = NULL; -#line 1057 "CommandManager.c" +#line 1097 "CommandManager.c" } } -static gpointer value_command_manager_peek_pointer (const GValue* value) { +static gpointer +value_command_manager_peek_pointer (const GValue* value) +{ #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" return value->data[0].v_pointer; -#line 1065 "CommandManager.c" +#line 1107 "CommandManager.c" } -static gchar* value_command_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_command_manager_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" if (collect_values[0].v_pointer) { -#line 1072 "CommandManager.c" +#line 1119 "CommandManager.c" CommandManager * object; object = collect_values[0].v_pointer; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" if (object->parent_instance.g_class == NULL) { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1079 "CommandManager.c" +#line 1126 "CommandManager.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 80 "/home/jens/Source/shotwell/src/CommandManager.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 1083 "CommandManager.c" +#line 1130 "CommandManager.c" } #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" value->data[0].v_pointer = command_manager_ref (object); -#line 1087 "CommandManager.c" +#line 1134 "CommandManager.c" } else { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" value->data[0].v_pointer = NULL; -#line 1091 "CommandManager.c" +#line 1138 "CommandManager.c" } #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" return NULL; -#line 1095 "CommandManager.c" +#line 1142 "CommandManager.c" } -static gchar* value_command_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_command_manager_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ CommandManager ** object_p; object_p = collect_values[0].v_pointer; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" if (!object_p) { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1106 "CommandManager.c" +#line 1158 "CommandManager.c" } #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" if (!value->data[0].v_pointer) { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" *object_p = NULL; -#line 1112 "CommandManager.c" +#line 1164 "CommandManager.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" *object_p = value->data[0].v_pointer; -#line 1116 "CommandManager.c" +#line 1168 "CommandManager.c" } else { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" *object_p = command_manager_ref (value->data[0].v_pointer); -#line 1120 "CommandManager.c" +#line 1172 "CommandManager.c" } #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" return NULL; -#line 1124 "CommandManager.c" +#line 1176 "CommandManager.c" } -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecCommandManager* spec; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_COMMAND_MANAGER), NULL); @@ -1134,20 +1192,25 @@ GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, co G_PARAM_SPEC (spec)->value_type = object_type; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" return G_PARAM_SPEC (spec); -#line 1138 "CommandManager.c" +#line 1196 "CommandManager.c" } -gpointer value_get_command_manager (const GValue* value) { +gpointer +value_get_command_manager (const GValue* value) +{ #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMMAND_MANAGER), NULL); #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" return value->data[0].v_pointer; -#line 1147 "CommandManager.c" +#line 1207 "CommandManager.c" } -void value_set_command_manager (GValue* value, gpointer v_object) { +void +value_set_command_manager (GValue* value, + gpointer v_object) +{ CommandManager * old; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMMAND_MANAGER)); @@ -1163,22 +1226,25 @@ void value_set_command_manager (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" command_manager_ref (value->data[0].v_pointer); -#line 1167 "CommandManager.c" +#line 1230 "CommandManager.c" } else { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" value->data[0].v_pointer = NULL; -#line 1171 "CommandManager.c" +#line 1234 "CommandManager.c" } #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" if (old) { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" command_manager_unref (old); -#line 1177 "CommandManager.c" +#line 1240 "CommandManager.c" } } -void value_take_command_manager (GValue* value, gpointer v_object) { +void +value_take_command_manager (GValue* value, + gpointer v_object) +{ CommandManager * old; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMMAND_MANAGER)); @@ -1192,22 +1258,24 @@ void value_take_command_manager (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" value->data[0].v_pointer = v_object; -#line 1196 "CommandManager.c" +#line 1262 "CommandManager.c" } else { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" value->data[0].v_pointer = NULL; -#line 1200 "CommandManager.c" +#line 1266 "CommandManager.c" } #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" if (old) { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" command_manager_unref (old); -#line 1206 "CommandManager.c" +#line 1272 "CommandManager.c" } } -static void command_manager_class_init (CommandManagerClass * klass) { +static void +command_manager_class_init (CommandManagerClass * klass) +{ #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" command_manager_parent_class = g_type_class_peek_parent (klass); #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -1216,11 +1284,13 @@ static void command_manager_class_init (CommandManagerClass * klass) { g_type_class_add_private (klass, sizeof (CommandManagerPrivate)); #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL] = g_signal_new ("altered", TYPE_COMMAND_MANAGER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN, G_TYPE_NONE, 2, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN); -#line 1220 "CommandManager.c" +#line 1288 "CommandManager.c" } -static void command_manager_instance_init (CommandManager * self) { +static void +command_manager_instance_init (CommandManager * self) +{ GeeArrayList* _tmp0_; GeeArrayList* _tmp1_; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -1235,11 +1305,13 @@ static void command_manager_instance_init (CommandManager * self) { self->priv->redo_stack = _tmp1_; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" self->ref_count = 1; -#line 1239 "CommandManager.c" +#line 1309 "CommandManager.c" } -static void command_manager_finalize (CommandManager * obj) { +static void +command_manager_finalize (CommandManager * obj) +{ CommandManager * self; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COMMAND_MANAGER, CommandManager); @@ -1249,11 +1321,13 @@ static void command_manager_finalize (CommandManager * obj) { _g_object_unref0 (self->priv->undo_stack); #line 85 "/home/jens/Source/shotwell/src/CommandManager.vala" _g_object_unref0 (self->priv->redo_stack); -#line 1253 "CommandManager.c" +#line 1325 "CommandManager.c" } -GType command_manager_get_type (void) { +GType +command_manager_get_type (void) +{ static volatile gsize command_manager_type_id__volatile = 0; if (g_once_init_enter (&command_manager_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_command_manager_init, value_command_manager_free_value, value_command_manager_copy_value, value_command_manager_peek_pointer, "p", value_command_manager_collect_value, "p", value_command_manager_lcopy_value }; @@ -1267,18 +1341,22 @@ GType command_manager_get_type (void) { } -gpointer command_manager_ref (gpointer instance) { +gpointer +command_manager_ref (gpointer instance) +{ CommandManager * self; self = instance; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" g_atomic_int_inc (&self->ref_count); #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" return instance; -#line 1278 "CommandManager.c" +#line 1354 "CommandManager.c" } -void command_manager_unref (gpointer instance) { +void +command_manager_unref (gpointer instance) +{ CommandManager * self; self = instance; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -1287,7 +1365,7 @@ void command_manager_unref (gpointer instance) { COMMAND_MANAGER_GET_CLASS (self)->finalize (self); #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1291 "CommandManager.c" +#line 1369 "CommandManager.c" } } diff --git a/src/Commands.c b/src/Commands.c index 9abf048..9bbd51a 100644 --- a/src/Commands.c +++ b/src/Commands.c @@ -1,4 +1,4 @@ -/* Commands.c generated by valac 0.36.6, the Vala compiler +/* Commands.c generated by valac 0.40.4, the Vala compiler * generated from Commands.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ /* PageCommand stores the current page when a Command is created. Subclasses can call return_to_page()*/ /* if it's appropriate to return to that page when executing an undo() or redo().*/ + #include #include #include @@ -153,6 +154,11 @@ typedef struct _MediaPageClass MediaPageClass; typedef struct _CollectionPage CollectionPage; typedef struct _CollectionPageClass CollectionPageClass; +enum { + PAGE_COMMAND_0_PROPERTY, + PAGE_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* page_command_properties[PAGE_COMMAND_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define TYPE_PAGE_WINDOW (page_window_get_type ()) @@ -296,6 +302,11 @@ typedef struct _LibraryWindowClass LibraryWindowClass; typedef struct _SingleDataSourceCommand SingleDataSourceCommand; typedef struct _SingleDataSourceCommandClass SingleDataSourceCommandClass; typedef struct _SingleDataSourceCommandPrivate SingleDataSourceCommandPrivate; +enum { + SINGLE_DATA_SOURCE_COMMAND_0_PROPERTY, + SINGLE_DATA_SOURCE_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* single_data_source_command_properties[SINGLE_DATA_SOURCE_COMMAND_NUM_PROPERTIES]; #define TYPE_COMMAND_MANAGER (command_manager_get_type ()) #define COMMAND_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMMAND_MANAGER, CommandManager)) @@ -328,6 +339,11 @@ typedef struct _SimpleProxyableCommandPrivate SimpleProxyableCommandPrivate; typedef struct _SourceProxy SourceProxy; typedef struct _SourceProxyClass SourceProxyClass; +enum { + SIMPLE_PROXYABLE_COMMAND_0_PROPERTY, + SIMPLE_PROXYABLE_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* simple_proxyable_command_properties[SIMPLE_PROXYABLE_COMMAND_NUM_PROPERTIES]; #define _source_proxy_unref0(var) ((var == NULL) ? NULL : (var = (source_proxy_unref (var), NULL))) #define TYPE_PROXYABLE (proxyable_get_type ()) @@ -358,6 +374,11 @@ typedef struct _SinglePhotoTransformationCommandPrivate SinglePhotoTransformatio typedef struct _PhotoTransformationState PhotoTransformationState; typedef struct _PhotoTransformationStateClass PhotoTransformationStateClass; +enum { + SINGLE_PHOTO_TRANSFORMATION_COMMAND_0_PROPERTY, + SINGLE_PHOTO_TRANSFORMATION_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* single_photo_transformation_command_properties[SINGLE_PHOTO_TRANSFORMATION_COMMAND_NUM_PROPERTIES]; #define TYPE_GENERIC_PHOTO_TRANSFORMATION_COMMAND (generic_photo_transformation_command_get_type ()) #define GENERIC_PHOTO_TRANSFORMATION_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GENERIC_PHOTO_TRANSFORMATION_COMMAND, GenericPhotoTransformationCommand)) @@ -369,6 +390,11 @@ typedef struct _PhotoTransformationStateClass PhotoTransformationStateClass; typedef struct _GenericPhotoTransformationCommand GenericPhotoTransformationCommand; typedef struct _GenericPhotoTransformationCommandClass GenericPhotoTransformationCommandClass; typedef struct _GenericPhotoTransformationCommandPrivate GenericPhotoTransformationCommandPrivate; +enum { + GENERIC_PHOTO_TRANSFORMATION_COMMAND_0_PROPERTY, + GENERIC_PHOTO_TRANSFORMATION_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* generic_photo_transformation_command_properties[GENERIC_PHOTO_TRANSFORMATION_COMMAND_NUM_PROPERTIES]; #define TYPE_MULTIPLE_DATA_SOURCE_COMMAND (multiple_data_source_command_get_type ()) #define MULTIPLE_DATA_SOURCE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand)) @@ -390,6 +416,11 @@ typedef struct _MultipleDataSourceCommandPrivate MultipleDataSourceCommandPrivat typedef struct _SourceCollection SourceCollection; typedef struct _SourceCollectionClass SourceCollectionClass; +enum { + MULTIPLE_DATA_SOURCE_COMMAND_0_PROPERTY, + MULTIPLE_DATA_SOURCE_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* multiple_data_source_command_properties[MULTIPLE_DATA_SOURCE_COMMAND_NUM_PROPERTIES]; #define _g_free0(var) (var = (g_free (var), NULL)) #define TYPE_DATABASE_SOURCE_COLLECTION (database_source_collection_get_type ()) @@ -442,6 +473,11 @@ typedef struct _ProgressDialogClass ProgressDialogClass; typedef struct _MultipleDataSourceAtOnceCommand MultipleDataSourceAtOnceCommand; typedef struct _MultipleDataSourceAtOnceCommandClass MultipleDataSourceAtOnceCommandClass; typedef struct _MultipleDataSourceAtOnceCommandPrivate MultipleDataSourceAtOnceCommandPrivate; +enum { + MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND_0_PROPERTY, + MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* multiple_data_source_at_once_command_properties[MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND_NUM_PROPERTIES]; #define TYPE_MEDIA_COLLECTION_REGISTRY (media_collection_registry_get_type ()) #define MEDIA_COLLECTION_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_COLLECTION_REGISTRY, MediaCollectionRegistry)) @@ -465,6 +501,11 @@ typedef struct _MediaCollectionRegistryClass MediaCollectionRegistryClass; typedef struct _MultiplePhotoTransformationCommand MultiplePhotoTransformationCommand; typedef struct _MultiplePhotoTransformationCommandClass MultiplePhotoTransformationCommandClass; typedef struct _MultiplePhotoTransformationCommandPrivate MultiplePhotoTransformationCommandPrivate; +enum { + MULTIPLE_PHOTO_TRANSFORMATION_COMMAND_0_PROPERTY, + MULTIPLE_PHOTO_TRANSFORMATION_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* multiple_photo_transformation_command_properties[MULTIPLE_PHOTO_TRANSFORMATION_COMMAND_NUM_PROPERTIES]; #define TYPE_ROTATE_SINGLE_COMMAND (rotate_single_command_get_type ()) #define ROTATE_SINGLE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ROTATE_SINGLE_COMMAND, RotateSingleCommand)) @@ -478,6 +519,11 @@ typedef struct _RotateSingleCommandClass RotateSingleCommandClass; typedef struct _RotateSingleCommandPrivate RotateSingleCommandPrivate; #define TYPE_ROTATION (rotation_get_type ()) +enum { + ROTATE_SINGLE_COMMAND_0_PROPERTY, + ROTATE_SINGLE_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* rotate_single_command_properties[ROTATE_SINGLE_COMMAND_NUM_PROPERTIES]; #define TYPE_ROTATE_MULTIPLE_COMMAND (rotate_multiple_command_get_type ()) #define ROTATE_MULTIPLE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ROTATE_MULTIPLE_COMMAND, RotateMultipleCommand)) @@ -489,6 +535,11 @@ typedef struct _RotateSingleCommandPrivate RotateSingleCommandPrivate; typedef struct _RotateMultipleCommand RotateMultipleCommand; typedef struct _RotateMultipleCommandClass RotateMultipleCommandClass; typedef struct _RotateMultipleCommandPrivate RotateMultipleCommandPrivate; +enum { + ROTATE_MULTIPLE_COMMAND_0_PROPERTY, + ROTATE_MULTIPLE_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* rotate_multiple_command_properties[ROTATE_MULTIPLE_COMMAND_NUM_PROPERTIES]; #define TYPE_EDIT_TITLE_COMMAND (edit_title_command_get_type ()) #define EDIT_TITLE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EDIT_TITLE_COMMAND, EditTitleCommand)) @@ -500,6 +551,11 @@ typedef struct _RotateMultipleCommandPrivate RotateMultipleCommandPrivate; typedef struct _EditTitleCommand EditTitleCommand; typedef struct _EditTitleCommandClass EditTitleCommandClass; typedef struct _EditTitleCommandPrivate EditTitleCommandPrivate; +enum { + EDIT_TITLE_COMMAND_0_PROPERTY, + EDIT_TITLE_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* edit_title_command_properties[EDIT_TITLE_COMMAND_NUM_PROPERTIES]; #define TYPE_EDIT_COMMENT_COMMAND (edit_comment_command_get_type ()) #define EDIT_COMMENT_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EDIT_COMMENT_COMMAND, EditCommentCommand)) @@ -511,6 +567,11 @@ typedef struct _EditTitleCommandPrivate EditTitleCommandPrivate; typedef struct _EditCommentCommand EditCommentCommand; typedef struct _EditCommentCommandClass EditCommentCommandClass; typedef struct _EditCommentCommandPrivate EditCommentCommandPrivate; +enum { + EDIT_COMMENT_COMMAND_0_PROPERTY, + EDIT_COMMENT_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* edit_comment_command_properties[EDIT_COMMENT_COMMAND_NUM_PROPERTIES]; #define TYPE_EDIT_MULTIPLE_TITLES_COMMAND (edit_multiple_titles_command_get_type ()) #define EDIT_MULTIPLE_TITLES_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EDIT_MULTIPLE_TITLES_COMMAND, EditMultipleTitlesCommand)) @@ -522,6 +583,11 @@ typedef struct _EditCommentCommandPrivate EditCommentCommandPrivate; typedef struct _EditMultipleTitlesCommand EditMultipleTitlesCommand; typedef struct _EditMultipleTitlesCommandClass EditMultipleTitlesCommandClass; typedef struct _EditMultipleTitlesCommandPrivate EditMultipleTitlesCommandPrivate; +enum { + EDIT_MULTIPLE_TITLES_COMMAND_0_PROPERTY, + EDIT_MULTIPLE_TITLES_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* edit_multiple_titles_command_properties[EDIT_MULTIPLE_TITLES_COMMAND_NUM_PROPERTIES]; #define TYPE_EDIT_MULTIPLE_COMMENTS_COMMAND (edit_multiple_comments_command_get_type ()) #define EDIT_MULTIPLE_COMMENTS_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EDIT_MULTIPLE_COMMENTS_COMMAND, EditMultipleCommentsCommand)) @@ -533,6 +599,11 @@ typedef struct _EditMultipleTitlesCommandPrivate EditMultipleTitlesCommandPrivat typedef struct _EditMultipleCommentsCommand EditMultipleCommentsCommand; typedef struct _EditMultipleCommentsCommandClass EditMultipleCommentsCommandClass; typedef struct _EditMultipleCommentsCommandPrivate EditMultipleCommentsCommandPrivate; +enum { + EDIT_MULTIPLE_COMMENTS_COMMAND_0_PROPERTY, + EDIT_MULTIPLE_COMMENTS_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* edit_multiple_comments_command_properties[EDIT_MULTIPLE_COMMENTS_COMMAND_NUM_PROPERTIES]; #define TYPE_RENAME_EVENT_COMMAND (rename_event_command_get_type ()) #define RENAME_EVENT_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RENAME_EVENT_COMMAND, RenameEventCommand)) @@ -544,6 +615,11 @@ typedef struct _EditMultipleCommentsCommandPrivate EditMultipleCommentsCommandPr typedef struct _RenameEventCommand RenameEventCommand; typedef struct _RenameEventCommandClass RenameEventCommandClass; typedef struct _RenameEventCommandPrivate RenameEventCommandPrivate; +enum { + RENAME_EVENT_COMMAND_0_PROPERTY, + RENAME_EVENT_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* rename_event_command_properties[RENAME_EVENT_COMMAND_NUM_PROPERTIES]; #define TYPE_EVENT_SOURCE (event_source_get_type ()) #define EVENT_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EVENT_SOURCE, EventSource)) @@ -575,6 +651,11 @@ typedef struct _EventClass EventClass; typedef struct _EditEventCommentCommand EditEventCommentCommand; typedef struct _EditEventCommentCommandClass EditEventCommentCommandClass; typedef struct _EditEventCommentCommandPrivate EditEventCommentCommandPrivate; +enum { + EDIT_EVENT_COMMENT_COMMAND_0_PROPERTY, + EDIT_EVENT_COMMENT_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* edit_event_comment_command_properties[EDIT_EVENT_COMMENT_COMMAND_NUM_PROPERTIES]; #define TYPE_SET_KEY_PHOTO_COMMAND (set_key_photo_command_get_type ()) #define SET_KEY_PHOTO_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SET_KEY_PHOTO_COMMAND, SetKeyPhotoCommand)) @@ -586,6 +667,11 @@ typedef struct _EditEventCommentCommandPrivate EditEventCommentCommandPrivate; typedef struct _SetKeyPhotoCommand SetKeyPhotoCommand; typedef struct _SetKeyPhotoCommandClass SetKeyPhotoCommandClass; typedef struct _SetKeyPhotoCommandPrivate SetKeyPhotoCommandPrivate; +enum { + SET_KEY_PHOTO_COMMAND_0_PROPERTY, + SET_KEY_PHOTO_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* set_key_photo_command_properties[SET_KEY_PHOTO_COMMAND_NUM_PROPERTIES]; #define TYPE_REVERT_SINGLE_COMMAND (revert_single_command_get_type ()) #define REVERT_SINGLE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_REVERT_SINGLE_COMMAND, RevertSingleCommand)) @@ -597,6 +683,11 @@ typedef struct _SetKeyPhotoCommandPrivate SetKeyPhotoCommandPrivate; typedef struct _RevertSingleCommand RevertSingleCommand; typedef struct _RevertSingleCommandClass RevertSingleCommandClass; typedef struct _RevertSingleCommandPrivate RevertSingleCommandPrivate; +enum { + REVERT_SINGLE_COMMAND_0_PROPERTY, + REVERT_SINGLE_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* revert_single_command_properties[REVERT_SINGLE_COMMAND_NUM_PROPERTIES]; #define TYPE_REVERT_MULTIPLE_COMMAND (revert_multiple_command_get_type ()) #define REVERT_MULTIPLE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_REVERT_MULTIPLE_COMMAND, RevertMultipleCommand)) @@ -608,6 +699,11 @@ typedef struct _RevertSingleCommandPrivate RevertSingleCommandPrivate; typedef struct _RevertMultipleCommand RevertMultipleCommand; typedef struct _RevertMultipleCommandClass RevertMultipleCommandClass; typedef struct _RevertMultipleCommandPrivate RevertMultipleCommandPrivate; +enum { + REVERT_MULTIPLE_COMMAND_0_PROPERTY, + REVERT_MULTIPLE_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* revert_multiple_command_properties[REVERT_MULTIPLE_COMMAND_NUM_PROPERTIES]; #define TYPE_ENHANCE_SINGLE_COMMAND (enhance_single_command_get_type ()) #define ENHANCE_SINGLE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ENHANCE_SINGLE_COMMAND, EnhanceSingleCommand)) @@ -619,6 +715,11 @@ typedef struct _RevertMultipleCommandPrivate RevertMultipleCommandPrivate; typedef struct _EnhanceSingleCommand EnhanceSingleCommand; typedef struct _EnhanceSingleCommandClass EnhanceSingleCommandClass; typedef struct _EnhanceSingleCommandPrivate EnhanceSingleCommandPrivate; +enum { + ENHANCE_SINGLE_COMMAND_0_PROPERTY, + ENHANCE_SINGLE_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* enhance_single_command_properties[ENHANCE_SINGLE_COMMAND_NUM_PROPERTIES]; #define TYPE_ENHANCE_MULTIPLE_COMMAND (enhance_multiple_command_get_type ()) #define ENHANCE_MULTIPLE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ENHANCE_MULTIPLE_COMMAND, EnhanceMultipleCommand)) @@ -630,6 +731,11 @@ typedef struct _EnhanceSingleCommandPrivate EnhanceSingleCommandPrivate; typedef struct _EnhanceMultipleCommand EnhanceMultipleCommand; typedef struct _EnhanceMultipleCommandClass EnhanceMultipleCommandClass; typedef struct _EnhanceMultipleCommandPrivate EnhanceMultipleCommandPrivate; +enum { + ENHANCE_MULTIPLE_COMMAND_0_PROPERTY, + ENHANCE_MULTIPLE_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* enhance_multiple_command_properties[ENHANCE_MULTIPLE_COMMAND_NUM_PROPERTIES]; #define TYPE_STRAIGHTEN_COMMAND (straighten_command_get_type ()) #define STRAIGHTEN_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_STRAIGHTEN_COMMAND, StraightenCommand)) @@ -644,6 +750,11 @@ typedef struct _StraightenCommandPrivate StraightenCommandPrivate; #define TYPE_BOX (box_get_type ()) typedef struct _Box Box; +enum { + STRAIGHTEN_COMMAND_0_PROPERTY, + STRAIGHTEN_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* straighten_command_properties[STRAIGHTEN_COMMAND_NUM_PROPERTIES]; #define TYPE_CROP_COMMAND (crop_command_get_type ()) #define CROP_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CROP_COMMAND, CropCommand)) @@ -655,6 +766,11 @@ typedef struct _Box Box; typedef struct _CropCommand CropCommand; typedef struct _CropCommandClass CropCommandClass; typedef struct _CropCommandPrivate CropCommandPrivate; +enum { + CROP_COMMAND_0_PROPERTY, + CROP_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* crop_command_properties[CROP_COMMAND_NUM_PROPERTIES]; #define TYPE_ADJUST_COLORS_SINGLE_COMMAND (adjust_colors_single_command_get_type ()) #define ADJUST_COLORS_SINGLE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ADJUST_COLORS_SINGLE_COMMAND, AdjustColorsSingleCommand)) @@ -666,6 +782,11 @@ typedef struct _CropCommandPrivate CropCommandPrivate; typedef struct _AdjustColorsSingleCommand AdjustColorsSingleCommand; typedef struct _AdjustColorsSingleCommandClass AdjustColorsSingleCommandClass; typedef struct _AdjustColorsSingleCommandPrivate AdjustColorsSingleCommandPrivate; +enum { + ADJUST_COLORS_SINGLE_COMMAND_0_PROPERTY, + ADJUST_COLORS_SINGLE_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* adjust_colors_single_command_properties[ADJUST_COLORS_SINGLE_COMMAND_NUM_PROPERTIES]; #define _pixel_transformation_bundle_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformation_bundle_unref (var), NULL))) #define TYPE_ADJUST_COLORS_MULTIPLE_COMMAND (adjust_colors_multiple_command_get_type ()) @@ -678,6 +799,11 @@ typedef struct _AdjustColorsSingleCommandPrivate AdjustColorsSingleCommandPrivat typedef struct _AdjustColorsMultipleCommand AdjustColorsMultipleCommand; typedef struct _AdjustColorsMultipleCommandClass AdjustColorsMultipleCommandClass; typedef struct _AdjustColorsMultipleCommandPrivate AdjustColorsMultipleCommandPrivate; +enum { + ADJUST_COLORS_MULTIPLE_COMMAND_0_PROPERTY, + ADJUST_COLORS_MULTIPLE_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* adjust_colors_multiple_command_properties[ADJUST_COLORS_MULTIPLE_COMMAND_NUM_PROPERTIES]; #define TYPE_REDEYE_COMMAND (redeye_command_get_type ()) #define REDEYE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_REDEYE_COMMAND, RedeyeCommand)) @@ -692,6 +818,11 @@ typedef struct _RedeyeCommandPrivate RedeyeCommandPrivate; #define EDITING_TOOLS_TYPE_REDEYE_INSTANCE (editing_tools_redeye_instance_get_type ()) typedef struct _EditingToolsRedeyeInstance EditingToolsRedeyeInstance; +enum { + REDEYE_COMMAND_0_PROPERTY, + REDEYE_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* redeye_command_properties[REDEYE_COMMAND_NUM_PROPERTIES]; #define TYPE_MOVE_PHOTOS_COMMAND (move_photos_command_get_type ()) #define MOVE_PHOTOS_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)) @@ -713,7 +844,17 @@ typedef struct _MovePhotosCommandPrivate MovePhotosCommandPrivate; typedef struct _MovePhotosCommandRealMovePhotosCommand MovePhotosCommandRealMovePhotosCommand; typedef struct _MovePhotosCommandRealMovePhotosCommandClass MovePhotosCommandRealMovePhotosCommandClass; +enum { + MOVE_PHOTOS_COMMAND_0_PROPERTY, + MOVE_PHOTOS_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* move_photos_command_properties[MOVE_PHOTOS_COMMAND_NUM_PROPERTIES]; typedef struct _MovePhotosCommandRealMovePhotosCommandPrivate MovePhotosCommandRealMovePhotosCommandPrivate; +enum { + MOVE_PHOTOS_COMMAND_REAL_MOVE_PHOTOS_COMMAND_0_PROPERTY, + MOVE_PHOTOS_COMMAND_REAL_MOVE_PHOTOS_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* move_photos_command_real_move_photos_command_properties[MOVE_PHOTOS_COMMAND_REAL_MOVE_PHOTOS_COMMAND_NUM_PROPERTIES]; #define TYPE_EVENT_PAGE (event_page_get_type ()) #define EVENT_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EVENT_PAGE, EventPage)) @@ -735,6 +876,11 @@ typedef struct _EventPageClass EventPageClass; typedef struct _NewEventCommand NewEventCommand; typedef struct _NewEventCommandClass NewEventCommandClass; typedef struct _NewEventCommandPrivate NewEventCommandPrivate; +enum { + NEW_EVENT_COMMAND_0_PROPERTY, + NEW_EVENT_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* new_event_command_properties[NEW_EVENT_COMMAND_NUM_PROPERTIES]; #define TYPE_SET_EVENT_COMMAND (set_event_command_get_type ()) #define SET_EVENT_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SET_EVENT_COMMAND, SetEventCommand)) @@ -746,6 +892,11 @@ typedef struct _NewEventCommandPrivate NewEventCommandPrivate; typedef struct _SetEventCommand SetEventCommand; typedef struct _SetEventCommandClass SetEventCommandClass; typedef struct _SetEventCommandPrivate SetEventCommandPrivate; +enum { + SET_EVENT_COMMAND_0_PROPERTY, + SET_EVENT_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* set_event_command_properties[SET_EVENT_COMMAND_NUM_PROPERTIES]; #define TYPE_MERGE_EVENTS_COMMAND (merge_events_command_get_type ()) #define MERGE_EVENTS_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MERGE_EVENTS_COMMAND, MergeEventsCommand)) @@ -757,6 +908,11 @@ typedef struct _SetEventCommandPrivate SetEventCommandPrivate; typedef struct _MergeEventsCommand MergeEventsCommand; typedef struct _MergeEventsCommandClass MergeEventsCommandClass; typedef struct _MergeEventsCommandPrivate MergeEventsCommandPrivate; +enum { + MERGE_EVENTS_COMMAND_0_PROPERTY, + MERGE_EVENTS_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* merge_events_command_properties[MERGE_EVENTS_COMMAND_NUM_PROPERTIES]; #define TYPE_DUPLICATE_MULTIPLE_PHOTOS_COMMAND (duplicate_multiple_photos_command_get_type ()) #define DUPLICATE_MULTIPLE_PHOTOS_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DUPLICATE_MULTIPLE_PHOTOS_COMMAND, DuplicateMultiplePhotosCommand)) @@ -778,6 +934,11 @@ typedef struct _DuplicateMultiplePhotosCommandPrivate DuplicateMultiplePhotosCom typedef struct _LibraryPhoto LibraryPhoto; typedef struct _LibraryPhotoClass LibraryPhotoClass; +enum { + DUPLICATE_MULTIPLE_PHOTOS_COMMAND_0_PROPERTY, + DUPLICATE_MULTIPLE_PHOTOS_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* duplicate_multiple_photos_command_properties[DUPLICATE_MULTIPLE_PHOTOS_COMMAND_NUM_PROPERTIES]; #define TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION (library_photo_source_collection_get_type ()) #define LIBRARY_PHOTO_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection)) @@ -809,6 +970,11 @@ typedef struct _SetRatingSingleCommandClass SetRatingSingleCommandClass; typedef struct _SetRatingSingleCommandPrivate SetRatingSingleCommandPrivate; #define TYPE_RATING (rating_get_type ()) +enum { + SET_RATING_SINGLE_COMMAND_0_PROPERTY, + SET_RATING_SINGLE_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* set_rating_single_command_properties[SET_RATING_SINGLE_COMMAND_NUM_PROPERTIES]; #define TYPE_SET_RATING_COMMAND (set_rating_command_get_type ()) #define SET_RATING_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SET_RATING_COMMAND, SetRatingCommand)) @@ -820,6 +986,11 @@ typedef struct _SetRatingSingleCommandPrivate SetRatingSingleCommandPrivate; typedef struct _SetRatingCommand SetRatingCommand; typedef struct _SetRatingCommandClass SetRatingCommandClass; typedef struct _SetRatingCommandPrivate SetRatingCommandPrivate; +enum { + SET_RATING_COMMAND_0_PROPERTY, + SET_RATING_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* set_rating_command_properties[SET_RATING_COMMAND_NUM_PROPERTIES]; #define TYPE_SET_RAW_DEVELOPER_COMMAND (set_raw_developer_command_get_type ()) #define SET_RAW_DEVELOPER_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommand)) @@ -833,6 +1004,11 @@ typedef struct _SetRawDeveloperCommandClass SetRawDeveloperCommandClass; typedef struct _SetRawDeveloperCommandPrivate SetRawDeveloperCommandPrivate; #define TYPE_RAW_DEVELOPER (raw_developer_get_type ()) +enum { + SET_RAW_DEVELOPER_COMMAND_0_PROPERTY, + SET_RAW_DEVELOPER_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* set_raw_developer_command_properties[SET_RAW_DEVELOPER_COMMAND_NUM_PROPERTIES]; #define TYPE_PHOTO_FILE_FORMAT (photo_file_format_get_type ()) @@ -854,6 +1030,11 @@ typedef struct _AdjustDateTimePhotoCommandPrivate AdjustDateTimePhotoCommandPriv typedef struct _Dateable Dateable; typedef struct _DateableIface DateableIface; +enum { + ADJUST_DATE_TIME_PHOTO_COMMAND_0_PROPERTY, + ADJUST_DATE_TIME_PHOTO_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* adjust_date_time_photo_command_properties[ADJUST_DATE_TIME_PHOTO_COMMAND_NUM_PROPERTIES]; #define TYPE_CONTAINER_SOURCE_COLLECTION (container_source_collection_get_type ()) #define CONTAINER_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection)) @@ -895,6 +1076,11 @@ typedef struct _EventViewClass EventViewClass; typedef struct _AdjustDateTimePhotosCommand AdjustDateTimePhotosCommand; typedef struct _AdjustDateTimePhotosCommandClass AdjustDateTimePhotosCommandClass; typedef struct _AdjustDateTimePhotosCommandPrivate AdjustDateTimePhotosCommandPrivate; +enum { + ADJUST_DATE_TIME_PHOTOS_COMMAND_0_PROPERTY, + ADJUST_DATE_TIME_PHOTOS_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* adjust_date_time_photos_command_properties[ADJUST_DATE_TIME_PHOTOS_COMMAND_NUM_PROPERTIES]; #define TYPE_ADD_TAGS_COMMAND (add_tags_command_get_type ()) #define ADD_TAGS_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ADD_TAGS_COMMAND, AddTagsCommand)) @@ -906,6 +1092,11 @@ typedef struct _AdjustDateTimePhotosCommandPrivate AdjustDateTimePhotosCommandPr typedef struct _AddTagsCommand AddTagsCommand; typedef struct _AddTagsCommandClass AddTagsCommandClass; typedef struct _AddTagsCommandPrivate AddTagsCommandPrivate; +enum { + ADD_TAGS_COMMAND_0_PROPERTY, + ADD_TAGS_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* add_tags_command_properties[ADD_TAGS_COMMAND_NUM_PROPERTIES]; #define TYPE_VIDEO_SOURCE_COLLECTION (video_source_collection_get_type ()) #define VIDEO_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection)) @@ -937,6 +1128,11 @@ typedef struct _TagClass TagClass; typedef struct _RenameTagCommand RenameTagCommand; typedef struct _RenameTagCommandClass RenameTagCommandClass; typedef struct _RenameTagCommandPrivate RenameTagCommandPrivate; +enum { + RENAME_TAG_COMMAND_0_PROPERTY, + RENAME_TAG_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* rename_tag_command_properties[RENAME_TAG_COMMAND_NUM_PROPERTIES]; #define TYPE_DELETE_TAG_COMMAND (delete_tag_command_get_type ()) #define DELETE_TAG_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DELETE_TAG_COMMAND, DeleteTagCommand)) @@ -948,6 +1144,11 @@ typedef struct _RenameTagCommandPrivate RenameTagCommandPrivate; typedef struct _DeleteTagCommand DeleteTagCommand; typedef struct _DeleteTagCommandClass DeleteTagCommandClass; typedef struct _DeleteTagCommandPrivate DeleteTagCommandPrivate; +enum { + DELETE_TAG_COMMAND_0_PROPERTY, + DELETE_TAG_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* delete_tag_command_properties[DELETE_TAG_COMMAND_NUM_PROPERTIES]; #define TYPE_TAG_SOURCE_COLLECTION (tag_source_collection_get_type ()) #define TAG_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TAG_SOURCE_COLLECTION, TagSourceCollection)) @@ -969,6 +1170,11 @@ typedef struct _TagSourceCollectionClass TagSourceCollectionClass; typedef struct _NewChildTagCommand NewChildTagCommand; typedef struct _NewChildTagCommandClass NewChildTagCommandClass; typedef struct _NewChildTagCommandPrivate NewChildTagCommandPrivate; +enum { + NEW_CHILD_TAG_COMMAND_0_PROPERTY, + NEW_CHILD_TAG_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* new_child_tag_command_properties[NEW_CHILD_TAG_COMMAND_NUM_PROPERTIES]; #define TYPE_NEW_ROOT_TAG_COMMAND (new_root_tag_command_get_type ()) #define NEW_ROOT_TAG_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NEW_ROOT_TAG_COMMAND, NewRootTagCommand)) @@ -980,6 +1186,11 @@ typedef struct _NewChildTagCommandPrivate NewChildTagCommandPrivate; typedef struct _NewRootTagCommand NewRootTagCommand; typedef struct _NewRootTagCommandClass NewRootTagCommandClass; typedef struct _NewRootTagCommandPrivate NewRootTagCommandPrivate; +enum { + NEW_ROOT_TAG_COMMAND_0_PROPERTY, + NEW_ROOT_TAG_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* new_root_tag_command_properties[NEW_ROOT_TAG_COMMAND_NUM_PROPERTIES]; #define TYPE_REPARENT_TAG_COMMAND (reparent_tag_command_get_type ()) #define REPARENT_TAG_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_REPARENT_TAG_COMMAND, ReparentTagCommand)) @@ -991,6 +1202,11 @@ typedef struct _NewRootTagCommandPrivate NewRootTagCommandPrivate; typedef struct _ReparentTagCommand ReparentTagCommand; typedef struct _ReparentTagCommandClass ReparentTagCommandClass; typedef struct _ReparentTagCommandPrivate ReparentTagCommandPrivate; +enum { + REPARENT_TAG_COMMAND_0_PROPERTY, + REPARENT_TAG_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* reparent_tag_command_properties[REPARENT_TAG_COMMAND_NUM_PROPERTIES]; #define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL))) #define TYPE_MODIFY_TAGS_COMMAND (modify_tags_command_get_type ()) @@ -1003,6 +1219,11 @@ typedef struct _ReparentTagCommandPrivate ReparentTagCommandPrivate; typedef struct _ModifyTagsCommand ModifyTagsCommand; typedef struct _ModifyTagsCommandClass ModifyTagsCommandClass; typedef struct _ModifyTagsCommandPrivate ModifyTagsCommandPrivate; +enum { + MODIFY_TAGS_COMMAND_0_PROPERTY, + MODIFY_TAGS_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* modify_tags_command_properties[MODIFY_TAGS_COMMAND_NUM_PROPERTIES]; #define TYPE_TAG_UNTAG_PHOTOS_COMMAND (tag_untag_photos_command_get_type ()) #define TAG_UNTAG_PHOTOS_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TAG_UNTAG_PHOTOS_COMMAND, TagUntagPhotosCommand)) @@ -1014,6 +1235,11 @@ typedef struct _ModifyTagsCommandPrivate ModifyTagsCommandPrivate; typedef struct _TagUntagPhotosCommand TagUntagPhotosCommand; typedef struct _TagUntagPhotosCommandClass TagUntagPhotosCommandClass; typedef struct _TagUntagPhotosCommandPrivate TagUntagPhotosCommandPrivate; +enum { + TAG_UNTAG_PHOTOS_COMMAND_0_PROPERTY, + TAG_UNTAG_PHOTOS_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* tag_untag_photos_command_properties[TAG_UNTAG_PHOTOS_COMMAND_NUM_PROPERTIES]; #define TYPE_RENAME_SAVED_SEARCH_COMMAND (rename_saved_search_command_get_type ()) #define RENAME_SAVED_SEARCH_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RENAME_SAVED_SEARCH_COMMAND, RenameSavedSearchCommand)) @@ -1035,6 +1261,11 @@ typedef struct _RenameSavedSearchCommandPrivate RenameSavedSearchCommandPrivate; typedef struct _SavedSearch SavedSearch; typedef struct _SavedSearchClass SavedSearchClass; +enum { + RENAME_SAVED_SEARCH_COMMAND_0_PROPERTY, + RENAME_SAVED_SEARCH_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* rename_saved_search_command_properties[RENAME_SAVED_SEARCH_COMMAND_NUM_PROPERTIES]; #define TYPE_DELETE_SAVED_SEARCH_COMMAND (delete_saved_search_command_get_type ()) #define DELETE_SAVED_SEARCH_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DELETE_SAVED_SEARCH_COMMAND, DeleteSavedSearchCommand)) @@ -1046,6 +1277,11 @@ typedef struct _SavedSearchClass SavedSearchClass; typedef struct _DeleteSavedSearchCommand DeleteSavedSearchCommand; typedef struct _DeleteSavedSearchCommandClass DeleteSavedSearchCommandClass; typedef struct _DeleteSavedSearchCommandPrivate DeleteSavedSearchCommandPrivate; +enum { + DELETE_SAVED_SEARCH_COMMAND_0_PROPERTY, + DELETE_SAVED_SEARCH_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* delete_saved_search_command_properties[DELETE_SAVED_SEARCH_COMMAND_NUM_PROPERTIES]; #define TYPE_SAVED_SEARCH_TABLE (saved_search_table_get_type ()) #define SAVED_SEARCH_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SAVED_SEARCH_TABLE, SavedSearchTable)) @@ -1068,6 +1304,11 @@ typedef struct _SavedSearchTableClass SavedSearchTableClass; typedef struct _TrashUntrashPhotosCommand TrashUntrashPhotosCommand; typedef struct _TrashUntrashPhotosCommandClass TrashUntrashPhotosCommandClass; typedef struct _TrashUntrashPhotosCommandPrivate TrashUntrashPhotosCommandPrivate; +enum { + TRASH_UNTRASH_PHOTOS_COMMAND_0_PROPERTY, + TRASH_UNTRASH_PHOTOS_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* trash_untrash_photos_command_properties[TRASH_UNTRASH_PHOTOS_COMMAND_NUM_PROPERTIES]; #define TYPE_FLAG_UNFLAG_COMMAND (flag_unflag_command_get_type ()) #define FLAG_UNFLAG_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FLAG_UNFLAG_COMMAND, FlagUnflagCommand)) @@ -1079,6 +1320,11 @@ typedef struct _TrashUntrashPhotosCommandPrivate TrashUntrashPhotosCommandPrivat typedef struct _FlagUnflagCommand FlagUnflagCommand; typedef struct _FlagUnflagCommandClass FlagUnflagCommandClass; typedef struct _FlagUnflagCommandPrivate FlagUnflagCommandPrivate; +enum { + FLAG_UNFLAG_COMMAND_0_PROPERTY, + FLAG_UNFLAG_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* flag_unflag_command_properties[FLAG_UNFLAG_COMMAND_NUM_PROPERTIES]; #define TYPE_FLAGGABLE (flaggable_get_type ()) #define FLAGGABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FLAGGABLE, Flaggable)) @@ -1932,17 +2178,21 @@ GType checkerboard_page_get_type (void) G_GNUC_CONST; GType media_page_get_type (void) G_GNUC_CONST; GType collection_page_get_type (void) G_GNUC_CONST; #define PAGE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PAGE_COMMAND, PageCommandPrivate)) -enum { - PAGE_COMMAND_DUMMY_PROPERTY -}; static void page_command_on_page_destroyed (PageCommand* self); -static void _page_command_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self); +static void _page_command_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, + gpointer self); static void page_command_on_photo_destroyed (PageCommand* self); -static void _page_command_on_photo_destroyed_data_source_destroyed (DataSource* _sender, gpointer self); +static void _page_command_on_photo_destroyed_data_source_destroyed (DataSource* _sender, + gpointer self); static void page_command_on_controller_destroyed (PageCommand* self); -static void _page_command_on_controller_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self); -PageCommand* page_command_construct (GType object_type, const gchar* name, const gchar* explanation); -Command* command_construct (GType object_type, const gchar* name, const gchar* explanation); +static void _page_command_on_controller_destroyed_gtk_widget_destroy (GtkWidget* _sender, + gpointer self); +PageCommand* page_command_construct (GType object_type, + const gchar* name, + const gchar* explanation); +Command* command_construct (GType object_type, + const gchar* name, + const gchar* explanation); GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); @@ -1952,21 +2202,29 @@ GType editing_host_page_get_type (void) G_GNUC_CONST; GType library_photo_page_get_type (void) G_GNUC_CONST; Photo* editing_host_page_get_photo (EditingHostPage* self); CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self); -void page_command_set_auto_return_to_page (PageCommand* self, gboolean auto_return); +void page_command_set_auto_return_to_page (PageCommand* self, + gboolean auto_return); static void page_command_real_prepare (Command* base); void page_command_return_to_page (PageCommand* self); void command_prepare (Command* self); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; ViewCollection* page_get_view (Page* self); gint data_collection_get_count (DataCollection* self); -DataObject* data_collection_get_at (DataCollection* self, gint index); +DataObject* data_collection_get_at (DataCollection* self, + gint index); GType data_view_get_type (void) G_GNUC_CONST; GType thumbnail_view_get_type (void) G_GNUC_CONST; GType checkerboard_item_get_type (void) G_GNUC_CONST; @@ -1975,22 +2233,32 @@ GType thumbnail_get_type (void) G_GNUC_CONST; MediaSource* thumbnail_get_media_source (Thumbnail* self); GType library_window_get_type (void) G_GNUC_CONST; LibraryWindow* library_window_get_app (void); -void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* controller, Photo* current); -void page_window_set_current_page (PageWindow* self, Page* page); +void library_window_switch_to_photo_page (LibraryWindow* self, + CollectionPage* controller, + Photo* current); +void page_window_set_current_page (PageWindow* self, + Page* page); static void page_command_finalize (GObject * obj); GType single_data_source_command_get_type (void) G_GNUC_CONST; -enum { - SINGLE_DATA_SOURCE_COMMAND_DUMMY_PROPERTY -}; static void single_data_source_command_on_source_destroyed (SingleDataSourceCommand* self); -static void _single_data_source_command_on_source_destroyed_data_source_destroyed (DataSource* _sender, gpointer self); -SingleDataSourceCommand* single_data_source_command_construct (GType object_type, DataSource* source, const gchar* name, const gchar* explanation); +static void _single_data_source_command_on_source_destroyed_data_source_destroyed (DataSource* _sender, + gpointer self); +SingleDataSourceCommand* single_data_source_command_construct (GType object_type, + DataSource* source, + const gchar* name, + const gchar* explanation); DataSource* single_data_source_command_get_source (SingleDataSourceCommand* self); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* command_get_command_manager (Command* self); @@ -1999,91 +2267,130 @@ static void single_data_source_command_finalize (GObject * obj); GType simple_proxyable_command_get_type (void) G_GNUC_CONST; gpointer source_proxy_ref (gpointer instance); void source_proxy_unref (gpointer instance); -GParamSpec* param_spec_source_proxy (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_proxy (GValue* value, gpointer v_object); -void value_take_source_proxy (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_proxy (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_proxy (GValue* value, + gpointer v_object); +void value_take_source_proxy (GValue* value, + gpointer v_object); gpointer value_get_source_proxy (const GValue* value); GType source_proxy_get_type (void) G_GNUC_CONST; #define SIMPLE_PROXYABLE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SIMPLE_PROXYABLE_COMMAND, SimpleProxyableCommandPrivate)) -enum { - SIMPLE_PROXYABLE_COMMAND_DUMMY_PROPERTY -}; static void simple_proxyable_command_on_proxy_broken (SimpleProxyableCommand* self); -static void _simple_proxyable_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self); +static void _simple_proxyable_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, + gpointer self); void simple_proxyable_command_clear_added_proxies (SimpleProxyableCommand* self); GType proxyable_get_type (void) G_GNUC_CONST; -SimpleProxyableCommand* simple_proxyable_command_construct (GType object_type, Proxyable* proxyable, const gchar* name, const gchar* explanation); +SimpleProxyableCommand* simple_proxyable_command_construct (GType object_type, + Proxyable* proxyable, + const gchar* name, + const gchar* explanation); SourceProxy* proxyable_get_proxy (Proxyable* self); static void simple_proxyable_command_real_execute (Command* base); -void simple_proxyable_command_execute_on_source (SimpleProxyableCommand* self, DataSource* source); +void simple_proxyable_command_execute_on_source (SimpleProxyableCommand* self, + DataSource* source); DataSource* source_proxy_get_source (SourceProxy* self); -static void simple_proxyable_command_real_execute_on_source (SimpleProxyableCommand* self, DataSource* source); +static void simple_proxyable_command_real_execute_on_source (SimpleProxyableCommand* self, + DataSource* source); static void simple_proxyable_command_real_undo (Command* base); -void simple_proxyable_command_undo_on_source (SimpleProxyableCommand* self, DataSource* source); -static void simple_proxyable_command_real_undo_on_source (SimpleProxyableCommand* self, DataSource* source); -void simple_proxyable_command_add_proxyables (SimpleProxyableCommand* self, GeeCollection* proxyables); +void simple_proxyable_command_undo_on_source (SimpleProxyableCommand* self, + DataSource* source); +static void simple_proxyable_command_real_undo_on_source (SimpleProxyableCommand* self, + DataSource* source); +void simple_proxyable_command_add_proxyables (SimpleProxyableCommand* self, + GeeCollection* proxyables); static void simple_proxyable_command_finalize (GObject * obj); GType single_photo_transformation_command_get_type (void) G_GNUC_CONST; GType photo_transformation_state_get_type (void) G_GNUC_CONST; #define SINGLE_PHOTO_TRANSFORMATION_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SINGLE_PHOTO_TRANSFORMATION_COMMAND, SinglePhotoTransformationCommandPrivate)) -enum { - SINGLE_PHOTO_TRANSFORMATION_COMMAND_DUMMY_PROPERTY -}; static void single_photo_transformation_command_on_state_broken (SinglePhotoTransformationCommand* self); -static void _single_photo_transformation_command_on_state_broken_photo_transformation_state_broken (PhotoTransformationState* _sender, gpointer self); -SinglePhotoTransformationCommand* single_photo_transformation_command_construct (GType object_type, Photo* photo, const gchar* name, const gchar* explanation); +static void _single_photo_transformation_command_on_state_broken_photo_transformation_state_broken (PhotoTransformationState* _sender, + gpointer self); +SinglePhotoTransformationCommand* single_photo_transformation_command_construct (GType object_type, + Photo* photo, + const gchar* name, + const gchar* explanation); PhotoTransformationState* photo_save_transformation_state (Photo* self); static void single_photo_transformation_command_real_undo (Command* base); -gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* state); +gboolean photo_load_transformation_state (Photo* self, + PhotoTransformationState* state); static void single_photo_transformation_command_finalize (GObject * obj); GType generic_photo_transformation_command_get_type (void) G_GNUC_CONST; #define GENERIC_PHOTO_TRANSFORMATION_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_GENERIC_PHOTO_TRANSFORMATION_COMMAND, GenericPhotoTransformationCommandPrivate)) -enum { - GENERIC_PHOTO_TRANSFORMATION_COMMAND_DUMMY_PROPERTY -}; static void generic_photo_transformation_command_on_state_broken (GenericPhotoTransformationCommand* self); -static void _generic_photo_transformation_command_on_state_broken_photo_transformation_state_broken (PhotoTransformationState* _sender, gpointer self); -GenericPhotoTransformationCommand* generic_photo_transformation_command_construct (GType object_type, Photo* photo, const gchar* name, const gchar* explanation); +static void _generic_photo_transformation_command_on_state_broken_photo_transformation_state_broken (PhotoTransformationState* _sender, + gpointer self); +GenericPhotoTransformationCommand* generic_photo_transformation_command_construct (GType object_type, + Photo* photo, + const gchar* name, + const gchar* explanation); static void generic_photo_transformation_command_real_execute (Command* base); -void generic_photo_transformation_command_execute_on_photo (GenericPhotoTransformationCommand* self, Photo* photo); -static void generic_photo_transformation_command_real_execute_on_photo (GenericPhotoTransformationCommand* self, Photo* photo); +void generic_photo_transformation_command_execute_on_photo (GenericPhotoTransformationCommand* self, + Photo* photo); +static void generic_photo_transformation_command_real_execute_on_photo (GenericPhotoTransformationCommand* self, + Photo* photo); static void generic_photo_transformation_command_real_undo (Command* base); static void generic_photo_transformation_command_real_redo (Command* base); -gboolean generic_photo_transformation_command_can_compress (GenericPhotoTransformationCommand* self, Command* command); -static gboolean generic_photo_transformation_command_real_can_compress (GenericPhotoTransformationCommand* self, Command* command); -static gboolean generic_photo_transformation_command_real_compress (Command* base, Command* command); +gboolean generic_photo_transformation_command_can_compress (GenericPhotoTransformationCommand* self, + Command* command); +static gboolean generic_photo_transformation_command_real_can_compress (GenericPhotoTransformationCommand* self, + Command* command); +static gboolean generic_photo_transformation_command_real_compress (Command* base, + Command* command); void command_execute (Command* self); static void generic_photo_transformation_command_finalize (GObject * obj); GType multiple_data_source_command_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; #define MULTIPLE_DATA_SOURCE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommandPrivate)) -enum { - MULTIPLE_DATA_SOURCE_COMMAND_DUMMY_PROPERTY -}; -static void multiple_data_source_command_on_source_destroyed (MultipleDataSourceCommand* self, DataSource* source); -static void _multiple_data_source_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); +static void multiple_data_source_command_on_source_destroyed (MultipleDataSourceCommand* self, + DataSource* source); +static void _multiple_data_source_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); #define MULTIPLE_DATA_SOURCE_COMMAND_MIN_OPS_FOR_PROGRESS_WINDOW 5 -MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_type, GeeIterable* iter, const gchar* progress_text, const gchar* undo_progress_text, const gchar* name, const gchar* explanation); +MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_type, + GeeIterable* iter, + const gchar* progress_text, + const gchar* undo_progress_text, + const gchar* name, + const gchar* explanation); DataSource* data_view_get_source (DataView* self); DataCollection* data_object_get_membership (DataObject* self); GeeIterable* multiple_data_source_command_get_sources (MultipleDataSourceCommand* self); gint multiple_data_source_command_get_source_count (MultipleDataSourceCommand* self); static void multiple_data_source_command_real_execute (Command* base); static void multiple_data_source_command_start_transaction (MultipleDataSourceCommand* self); -static void multiple_data_source_command_execute_all (MultipleDataSourceCommand* self, gboolean exec, gboolean can_cancel, GeeArrayList* todo, GeeArrayList* completed); +static void multiple_data_source_command_execute_all (MultipleDataSourceCommand* self, + gboolean exec, + gboolean can_cancel, + GeeArrayList* todo, + GeeArrayList* completed); static void multiple_data_source_command_commit_transaction (MultipleDataSourceCommand* self); -void multiple_data_source_command_execute_on_source (MultipleDataSourceCommand* self, DataSource* source); -static void multiple_data_source_command_real_execute_on_source (MultipleDataSourceCommand* self, DataSource* source); +void multiple_data_source_command_execute_on_source (MultipleDataSourceCommand* self, + DataSource* source); +static void multiple_data_source_command_real_execute_on_source (MultipleDataSourceCommand* self, + DataSource* source); static void multiple_data_source_command_real_undo (Command* base); -void multiple_data_source_command_undo_on_source (MultipleDataSourceCommand* self, DataSource* source); -static void multiple_data_source_command_real_undo_on_source (MultipleDataSourceCommand* self, DataSource* source); +void multiple_data_source_command_undo_on_source (MultipleDataSourceCommand* self, + DataSource* source); +static void multiple_data_source_command_real_undo_on_source (MultipleDataSourceCommand* self, + DataSource* source); GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; gpointer transaction_controller_ref (gpointer instance); void transaction_controller_unref (gpointer instance); -GParamSpec* param_spec_transaction_controller (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_transaction_controller (GValue* value, gpointer v_object); -void value_take_transaction_controller (GValue* value, gpointer v_object); +GParamSpec* param_spec_transaction_controller (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_transaction_controller (GValue* value, + gpointer v_object); +void value_take_transaction_controller (GValue* value, + gpointer v_object); gpointer value_get_transaction_controller (const GValue* value); GType transaction_controller_get_type (void) G_GNUC_CONST; TransactionController* media_source_collection_get_transaction_controller (MediaSourceCollection* self); @@ -2091,498 +2398,651 @@ void transaction_controller_begin (TransactionController* self); void transaction_controller_commit (TransactionController* self); void page_window_set_busy_cursor (PageWindow* self); GType progress_dialog_get_type (void) G_GNUC_CONST; -ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable); -ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable); -void progress_dialog_set_fraction (ProgressDialog* self, gint current, gint total); +ProgressDialog* progress_dialog_new (GtkWindow* owner, + const gchar* text, + GCancellable* cancellable); +ProgressDialog* progress_dialog_construct (GType object_type, + GtkWindow* owner, + const gchar* text, + GCancellable* cancellable); +void progress_dialog_set_fraction (ProgressDialog* self, + gint current, + gint total); void spin_event_loop (void); void progress_dialog_close (ProgressDialog* self); void page_window_set_normal_cursor (PageWindow* self); static void multiple_data_source_command_finalize (GObject * obj); GType multiple_data_source_at_once_command_get_type (void) G_GNUC_CONST; #define MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND, MultipleDataSourceAtOnceCommandPrivate)) -enum { - MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND_DUMMY_PROPERTY -}; -static void multiple_data_source_at_once_command_on_sources_destroyed (MultipleDataSourceAtOnceCommand* self, GeeCollection* destroyed); -static void _multiple_data_source_at_once_command_on_sources_destroyed_source_collection_items_destroyed (SourceCollection* _sender, GeeCollection* destroyed, gpointer self); -MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct (GType object_type, GeeCollection* sources, const gchar* name, const gchar* explanation); +static void multiple_data_source_at_once_command_on_sources_destroyed (MultipleDataSourceAtOnceCommand* self, + GeeCollection* destroyed); +static void _multiple_data_source_at_once_command_on_sources_destroyed_source_collection_items_destroyed (SourceCollection* _sender, + GeeCollection* destroyed, + gpointer self); +MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct (GType object_type, + GeeCollection* sources, + const gchar* name, + const gchar* explanation); static void multiple_data_source_at_once_command_real_execute (Command* base); void database_table_begin_transaction (void); gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); void media_collection_registry_freeze_all (MediaCollectionRegistry* self); -void multiple_data_source_at_once_command_execute_on_all (MultipleDataSourceAtOnceCommand* self, GeeCollection* sources); +void multiple_data_source_at_once_command_execute_on_all (MultipleDataSourceAtOnceCommand* self, + GeeCollection* sources); void media_collection_registry_thaw_all (MediaCollectionRegistry* self); GQuark database_error_quark (void); void database_table_commit_transaction (GError** error); void app_window_database_error (GError* err); -static void multiple_data_source_at_once_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* self, GeeCollection* sources); +static void multiple_data_source_at_once_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* self, + GeeCollection* sources); static void multiple_data_source_at_once_command_real_undo (Command* base); -void multiple_data_source_at_once_command_undo_on_all (MultipleDataSourceAtOnceCommand* self, GeeCollection* sources); -static void multiple_data_source_at_once_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* self, GeeCollection* sources); +void multiple_data_source_at_once_command_undo_on_all (MultipleDataSourceAtOnceCommand* self, + GeeCollection* sources); +static void multiple_data_source_at_once_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* self, + GeeCollection* sources); static void multiple_data_source_at_once_command_finalize (GObject * obj); GType multiple_photo_transformation_command_get_type (void) G_GNUC_CONST; #define MULTIPLE_PHOTO_TRANSFORMATION_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MULTIPLE_PHOTO_TRANSFORMATION_COMMAND, MultiplePhotoTransformationCommandPrivate)) -enum { - MULTIPLE_PHOTO_TRANSFORMATION_COMMAND_DUMMY_PROPERTY -}; static void multiple_photo_transformation_command_on_state_broken (MultiplePhotoTransformationCommand* self); -static void _multiple_photo_transformation_command_on_state_broken_photo_transformation_state_broken (PhotoTransformationState* _sender, gpointer self); -MultiplePhotoTransformationCommand* multiple_photo_transformation_command_construct (GType object_type, GeeIterable* iter, const gchar* progress_text, const gchar* undo_progress_text, const gchar* name, const gchar* explanation); -static void multiple_photo_transformation_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source); +static void _multiple_photo_transformation_command_on_state_broken_photo_transformation_state_broken (PhotoTransformationState* _sender, + gpointer self); +MultiplePhotoTransformationCommand* multiple_photo_transformation_command_construct (GType object_type, + GeeIterable* iter, + const gchar* progress_text, + const gchar* undo_progress_text, + const gchar* name, + const gchar* explanation); +static void multiple_photo_transformation_command_real_undo_on_source (MultipleDataSourceCommand* base, + DataSource* source); static void multiple_photo_transformation_command_finalize (GObject * obj); GType rotate_single_command_get_type (void) G_GNUC_CONST; GType rotation_get_type (void) G_GNUC_CONST; #define ROTATE_SINGLE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ROTATE_SINGLE_COMMAND, RotateSingleCommandPrivate)) -enum { - ROTATE_SINGLE_COMMAND_DUMMY_PROPERTY -}; -RotateSingleCommand* rotate_single_command_new (Photo* photo, Rotation rotation, const gchar* name, const gchar* explanation); -RotateSingleCommand* rotate_single_command_construct (GType object_type, Photo* photo, Rotation rotation, const gchar* name, const gchar* explanation); +RotateSingleCommand* rotate_single_command_new (Photo* photo, + Rotation rotation, + const gchar* name, + const gchar* explanation); +RotateSingleCommand* rotate_single_command_construct (GType object_type, + Photo* photo, + Rotation rotation, + const gchar* name, + const gchar* explanation); static void rotate_single_command_real_execute (Command* base); -void photo_rotate (Photo* self, Rotation rotation); +void photo_rotate (Photo* self, + Rotation rotation); static void rotate_single_command_real_undo (Command* base); Rotation rotation_opposite (Rotation self); static void rotate_single_command_finalize (GObject * obj); GType rotate_multiple_command_get_type (void) G_GNUC_CONST; #define ROTATE_MULTIPLE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ROTATE_MULTIPLE_COMMAND, RotateMultipleCommandPrivate)) -enum { - ROTATE_MULTIPLE_COMMAND_DUMMY_PROPERTY -}; -RotateMultipleCommand* rotate_multiple_command_new (GeeIterable* iter, Rotation rotation, const gchar* name, const gchar* explanation, const gchar* progress_text, const gchar* undo_progress_text); -RotateMultipleCommand* rotate_multiple_command_construct (GType object_type, GeeIterable* iter, Rotation rotation, const gchar* name, const gchar* explanation, const gchar* progress_text, const gchar* undo_progress_text); -static void rotate_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source); -static void rotate_multiple_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source); +RotateMultipleCommand* rotate_multiple_command_new (GeeIterable* iter, + Rotation rotation, + const gchar* name, + const gchar* explanation, + const gchar* progress_text, + const gchar* undo_progress_text); +RotateMultipleCommand* rotate_multiple_command_construct (GType object_type, + GeeIterable* iter, + Rotation rotation, + const gchar* name, + const gchar* explanation, + const gchar* progress_text, + const gchar* undo_progress_text); +static void rotate_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, + DataSource* source); +static void rotate_multiple_command_real_undo_on_source (MultipleDataSourceCommand* base, + DataSource* source); static void rotate_multiple_command_finalize (GObject * obj); GType edit_title_command_get_type (void) G_GNUC_CONST; #define EDIT_TITLE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EDIT_TITLE_COMMAND, EditTitleCommandPrivate)) -enum { - EDIT_TITLE_COMMAND_DUMMY_PROPERTY -}; -EditTitleCommand* edit_title_command_new (MediaSource* source, const gchar* new_title); -EditTitleCommand* edit_title_command_construct (GType object_type, MediaSource* source, const gchar* new_title); +EditTitleCommand* edit_title_command_new (MediaSource* source, + const gchar* new_title); +EditTitleCommand* edit_title_command_construct (GType object_type, + MediaSource* source, + const gchar* new_title); #define RESOURCES_EDIT_TITLE_LABEL NC_ ("Button Label", "Edit Title") gchar* media_source_get_title (MediaSource* self); static void edit_title_command_real_execute (Command* base); -void media_source_set_title (MediaSource* self, const gchar* title); +void media_source_set_title (MediaSource* self, + const gchar* title); static void edit_title_command_real_undo (Command* base); static void edit_title_command_finalize (GObject * obj); GType edit_comment_command_get_type (void) G_GNUC_CONST; #define EDIT_COMMENT_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EDIT_COMMENT_COMMAND, EditCommentCommandPrivate)) -enum { - EDIT_COMMENT_COMMAND_DUMMY_PROPERTY -}; -EditCommentCommand* edit_comment_command_new (MediaSource* source, const gchar* new_comment); -EditCommentCommand* edit_comment_command_construct (GType object_type, MediaSource* source, const gchar* new_comment); +EditCommentCommand* edit_comment_command_new (MediaSource* source, + const gchar* new_comment); +EditCommentCommand* edit_comment_command_construct (GType object_type, + MediaSource* source, + const gchar* new_comment); #define RESOURCES_EDIT_COMMENT_LABEL _ ("Edit Comment") gchar* media_source_get_comment (MediaSource* self); static void edit_comment_command_real_execute (Command* base); -gboolean media_source_set_comment (MediaSource* self, const gchar* comment); +gboolean media_source_set_comment (MediaSource* self, + const gchar* comment); static void edit_comment_command_real_undo (Command* base); static void edit_comment_command_finalize (GObject * obj); GType edit_multiple_titles_command_get_type (void) G_GNUC_CONST; -enum { - EDIT_MULTIPLE_TITLES_COMMAND_DUMMY_PROPERTY -}; -EditMultipleTitlesCommand* edit_multiple_titles_command_new (GeeCollection* media_sources, const gchar* new_title); -EditMultipleTitlesCommand* edit_multiple_titles_command_construct (GType object_type, GeeCollection* media_sources, const gchar* new_title); -static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources); -static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources); +EditMultipleTitlesCommand* edit_multiple_titles_command_new (GeeCollection* media_sources, + const gchar* new_title); +EditMultipleTitlesCommand* edit_multiple_titles_command_construct (GType object_type, + GeeCollection* media_sources, + const gchar* new_title); +static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* base, + GeeCollection* sources); +static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* base, + GeeCollection* sources); static void edit_multiple_titles_command_finalize (GObject * obj); GType edit_multiple_comments_command_get_type (void) G_GNUC_CONST; -enum { - EDIT_MULTIPLE_COMMENTS_COMMAND_DUMMY_PROPERTY -}; -EditMultipleCommentsCommand* edit_multiple_comments_command_new (GeeCollection* media_sources, const gchar* new_comment); -EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType object_type, GeeCollection* media_sources, const gchar* new_comment); -static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources); -static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources); +EditMultipleCommentsCommand* edit_multiple_comments_command_new (GeeCollection* media_sources, + const gchar* new_comment); +EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType object_type, + GeeCollection* media_sources, + const gchar* new_comment); +static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* base, + GeeCollection* sources); +static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* base, + GeeCollection* sources); static void edit_multiple_comments_command_finalize (GObject * obj); GType rename_event_command_get_type (void) G_GNUC_CONST; #define RENAME_EVENT_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_RENAME_EVENT_COMMAND, RenameEventCommandPrivate)) -enum { - RENAME_EVENT_COMMAND_DUMMY_PROPERTY -}; GType event_source_get_type (void) G_GNUC_CONST; GType event_get_type (void) G_GNUC_CONST; -RenameEventCommand* rename_event_command_new (Event* event, const gchar* new_name); -RenameEventCommand* rename_event_command_construct (GType object_type, Event* event, const gchar* new_name); +RenameEventCommand* rename_event_command_new (Event* event, + const gchar* new_name); +RenameEventCommand* rename_event_command_construct (GType object_type, + Event* event, + const gchar* new_name); #define RESOURCES_RENAME_EVENT_LABEL _ ("Rename Event") gchar* event_get_raw_name (Event* self); -static void rename_event_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source); -gboolean event_rename (Event* self, const gchar* name); -static void rename_event_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source); +static void rename_event_command_real_execute_on_source (SimpleProxyableCommand* base, + DataSource* source); +gboolean event_rename (Event* self, + const gchar* name); +static void rename_event_command_real_undo_on_source (SimpleProxyableCommand* base, + DataSource* source); static void rename_event_command_finalize (GObject * obj); GType edit_event_comment_command_get_type (void) G_GNUC_CONST; #define EDIT_EVENT_COMMENT_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EDIT_EVENT_COMMENT_COMMAND, EditEventCommentCommandPrivate)) -enum { - EDIT_EVENT_COMMENT_COMMAND_DUMMY_PROPERTY -}; -EditEventCommentCommand* edit_event_comment_command_new (Event* event, const gchar* new_comment); -EditEventCommentCommand* edit_event_comment_command_construct (GType object_type, Event* event, const gchar* new_comment); +EditEventCommentCommand* edit_event_comment_command_new (Event* event, + const gchar* new_comment); +EditEventCommentCommand* edit_event_comment_command_construct (GType object_type, + Event* event, + const gchar* new_comment); gchar* event_source_get_comment (EventSource* self); -static void edit_event_comment_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source); -gboolean event_source_set_comment (EventSource* self, const gchar* comment); -static void edit_event_comment_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source); +static void edit_event_comment_command_real_execute_on_source (SimpleProxyableCommand* base, + DataSource* source); +gboolean event_source_set_comment (EventSource* self, + const gchar* comment); +static void edit_event_comment_command_real_undo_on_source (SimpleProxyableCommand* base, + DataSource* source); static void edit_event_comment_command_finalize (GObject * obj); GType set_key_photo_command_get_type (void) G_GNUC_CONST; #define SET_KEY_PHOTO_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_KEY_PHOTO_COMMAND, SetKeyPhotoCommandPrivate)) -enum { - SET_KEY_PHOTO_COMMAND_DUMMY_PROPERTY -}; -SetKeyPhotoCommand* set_key_photo_command_new (Event* event, MediaSource* new_primary_source); -SetKeyPhotoCommand* set_key_photo_command_construct (GType object_type, Event* event, MediaSource* new_primary_source); +SetKeyPhotoCommand* set_key_photo_command_new (Event* event, + MediaSource* new_primary_source); +SetKeyPhotoCommand* set_key_photo_command_construct (GType object_type, + Event* event, + MediaSource* new_primary_source); #define RESOURCES_MAKE_KEY_PHOTO_LABEL _ ("Make Key Photo for Event") MediaSource* event_get_primary_source (Event* self); static void set_key_photo_command_real_execute (Command* base); -gboolean event_set_primary_source (Event* self, MediaSource* source); +gboolean event_set_primary_source (Event* self, + MediaSource* source); static void set_key_photo_command_real_undo (Command* base); static void set_key_photo_command_finalize (GObject * obj); GType revert_single_command_get_type (void) G_GNUC_CONST; -enum { - REVERT_SINGLE_COMMAND_DUMMY_PROPERTY -}; RevertSingleCommand* revert_single_command_new (Photo* photo); -RevertSingleCommand* revert_single_command_construct (GType object_type, Photo* photo); +RevertSingleCommand* revert_single_command_construct (GType object_type, + Photo* photo); #define RESOURCES_REVERT_LABEL _ ("Revert to Original") -static void revert_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo); +static void revert_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, + Photo* photo); void photo_remove_all_transformations (Photo* self); -static gboolean revert_single_command_real_compress (Command* base, Command* command); +static gboolean revert_single_command_real_compress (Command* base, + Command* command); GType revert_multiple_command_get_type (void) G_GNUC_CONST; -enum { - REVERT_MULTIPLE_COMMAND_DUMMY_PROPERTY -}; RevertMultipleCommand* revert_multiple_command_new (GeeIterable* iter); -RevertMultipleCommand* revert_multiple_command_construct (GType object_type, GeeIterable* iter); -static void revert_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source); +RevertMultipleCommand* revert_multiple_command_construct (GType object_type, + GeeIterable* iter); +static void revert_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, + DataSource* source); GType enhance_single_command_get_type (void) G_GNUC_CONST; -enum { - ENHANCE_SINGLE_COMMAND_DUMMY_PROPERTY -}; EnhanceSingleCommand* enhance_single_command_new (Photo* photo); -EnhanceSingleCommand* enhance_single_command_construct (GType object_type, Photo* photo); +EnhanceSingleCommand* enhance_single_command_construct (GType object_type, + Photo* photo); #define RESOURCES_ENHANCE_LABEL _ ("Enhance") #define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo’s appearance") -static void enhance_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo); +static void enhance_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, + Photo* photo); gboolean photo_enhance (Photo* self); -static gboolean enhance_single_command_real_compress (Command* base, Command* command); +static gboolean enhance_single_command_real_compress (Command* base, + Command* command); GType enhance_multiple_command_get_type (void) G_GNUC_CONST; -enum { - ENHANCE_MULTIPLE_COMMAND_DUMMY_PROPERTY -}; EnhanceMultipleCommand* enhance_multiple_command_new (GeeIterable* iter); -EnhanceMultipleCommand* enhance_multiple_command_construct (GType object_type, GeeIterable* iter); -static void enhance_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source); +EnhanceMultipleCommand* enhance_multiple_command_construct (GType object_type, + GeeIterable* iter); +static void enhance_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, + DataSource* source); GType straighten_command_get_type (void) G_GNUC_CONST; GType box_get_type (void) G_GNUC_CONST; Box* box_dup (const Box* self); void box_free (Box* self); #define STRAIGHTEN_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_STRAIGHTEN_COMMAND, StraightenCommandPrivate)) -enum { - STRAIGHTEN_COMMAND_DUMMY_PROPERTY -}; -StraightenCommand* straighten_command_new (Photo* photo, gdouble theta, Box* crop, const gchar* name, const gchar* explanation); -StraightenCommand* straighten_command_construct (GType object_type, Photo* photo, gdouble theta, Box* crop, const gchar* name, const gchar* explanation); -static void straighten_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo); +StraightenCommand* straighten_command_new (Photo* photo, + gdouble theta, + Box* crop, + const gchar* name, + const gchar* explanation); +StraightenCommand* straighten_command_construct (GType object_type, + Photo* photo, + gdouble theta, + Box* crop, + const gchar* name, + const gchar* explanation); +static void straighten_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, + Photo* photo); void data_collection_freeze_notifications (DataCollection* self); -void photo_set_straighten (Photo* self, gdouble theta); -void photo_set_crop (Photo* self, Box* crop); +void photo_set_straighten (Photo* self, + gdouble theta); +void photo_set_crop (Photo* self, + Box* crop); void data_collection_thaw_notifications (DataCollection* self); static void straighten_command_finalize (GObject * obj); GType crop_command_get_type (void) G_GNUC_CONST; #define CROP_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CROP_COMMAND, CropCommandPrivate)) -enum { - CROP_COMMAND_DUMMY_PROPERTY -}; -CropCommand* crop_command_new (Photo* photo, Box* crop, const gchar* name, const gchar* explanation); -CropCommand* crop_command_construct (GType object_type, Photo* photo, Box* crop, const gchar* name, const gchar* explanation); -static void crop_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo); +CropCommand* crop_command_new (Photo* photo, + Box* crop, + const gchar* name, + const gchar* explanation); +CropCommand* crop_command_construct (GType object_type, + Photo* photo, + Box* crop, + const gchar* name, + const gchar* explanation); +static void crop_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, + Photo* photo); static void crop_command_finalize (GObject * obj); GType adjust_colors_single_command_get_type (void) G_GNUC_CONST; #define ADJUST_COLORS_SINGLE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ADJUST_COLORS_SINGLE_COMMAND, AdjustColorsSingleCommandPrivate)) -enum { - ADJUST_COLORS_SINGLE_COMMAND_DUMMY_PROPERTY -}; -AdjustColorsSingleCommand* adjust_colors_single_command_new (Photo* photo, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation); -AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_type, Photo* photo, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation); -static void adjust_colors_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo); -void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_adjustments); -static gboolean adjust_colors_single_command_real_can_compress (GenericPhotoTransformationCommand* base, Command* command); +AdjustColorsSingleCommand* adjust_colors_single_command_new (Photo* photo, + PixelTransformationBundle* transformations, + const gchar* name, + const gchar* explanation); +AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_type, + Photo* photo, + PixelTransformationBundle* transformations, + const gchar* name, + const gchar* explanation); +static void adjust_colors_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, + Photo* photo); +void photo_set_color_adjustments (Photo* self, + PixelTransformationBundle* new_adjustments); +static gboolean adjust_colors_single_command_real_can_compress (GenericPhotoTransformationCommand* base, + Command* command); static void adjust_colors_single_command_finalize (GObject * obj); GType adjust_colors_multiple_command_get_type (void) G_GNUC_CONST; #define ADJUST_COLORS_MULTIPLE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ADJUST_COLORS_MULTIPLE_COMMAND, AdjustColorsMultipleCommandPrivate)) -enum { - ADJUST_COLORS_MULTIPLE_COMMAND_DUMMY_PROPERTY -}; -AdjustColorsMultipleCommand* adjust_colors_multiple_command_new (GeeIterable* iter, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation); -AdjustColorsMultipleCommand* adjust_colors_multiple_command_construct (GType object_type, GeeIterable* iter, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation); -static void adjust_colors_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source); +AdjustColorsMultipleCommand* adjust_colors_multiple_command_new (GeeIterable* iter, + PixelTransformationBundle* transformations, + const gchar* name, + const gchar* explanation); +AdjustColorsMultipleCommand* adjust_colors_multiple_command_construct (GType object_type, + GeeIterable* iter, + PixelTransformationBundle* transformations, + const gchar* name, + const gchar* explanation); +static void adjust_colors_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, + DataSource* source); static void adjust_colors_multiple_command_finalize (GObject * obj); GType redeye_command_get_type (void) G_GNUC_CONST; GType editing_tools_redeye_instance_get_type (void) G_GNUC_CONST; EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingToolsRedeyeInstance* self); void editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self); #define REDEYE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_REDEYE_COMMAND, RedeyeCommandPrivate)) -enum { - REDEYE_COMMAND_DUMMY_PROPERTY -}; -RedeyeCommand* redeye_command_new (Photo* photo, EditingToolsRedeyeInstance* redeye_instance, const gchar* name, const gchar* explanation); -RedeyeCommand* redeye_command_construct (GType object_type, Photo* photo, EditingToolsRedeyeInstance* redeye_instance, const gchar* name, const gchar* explanation); -static void redeye_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo); -void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye); +RedeyeCommand* redeye_command_new (Photo* photo, + EditingToolsRedeyeInstance* redeye_instance, + const gchar* name, + const gchar* explanation); +RedeyeCommand* redeye_command_construct (GType object_type, + Photo* photo, + EditingToolsRedeyeInstance* redeye_instance, + const gchar* name, + const gchar* explanation); +static void redeye_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, + Photo* photo); +void photo_add_redeye_instance (Photo* self, + EditingToolsRedeyeInstance* redeye); static void redeye_command_finalize (GObject * obj); GType move_photos_command_get_type (void) G_GNUC_CONST; GType move_photos_command_real_move_photos_command_get_type (void) G_GNUC_CONST; -enum { - MOVE_PHOTOS_COMMAND_DUMMY_PROPERTY -}; -MovePhotosCommand* move_photos_command_construct (GType object_type, const gchar* name, const gchar* explanation); +MovePhotosCommand* move_photos_command_construct (GType object_type, + const gchar* name, + const gchar* explanation); static void move_photos_command_real_prepare (Command* base); static void move_photos_command_real_execute (Command* base); static void move_photos_command_real_undo (Command* base); void command_undo (Command* self); #define MOVE_PHOTOS_COMMAND_REAL_MOVE_PHOTOS_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MOVE_PHOTOS_COMMAND_TYPE_REAL_MOVE_PHOTOS_COMMAND, MovePhotosCommandRealMovePhotosCommandPrivate)) -enum { - MOVE_PHOTOS_COMMAND_REAL_MOVE_PHOTOS_COMMAND_DUMMY_PROPERTY -}; static void move_photos_command_real_move_photos_command_on_proxy_broken (MovePhotosCommandRealMovePhotosCommand* self); -static void _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self); -MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_command_new (Event* new_event, GeeIterable* source_views, const gchar* progress_text, const gchar* undo_progress_text, const gchar* name, const gchar* explanation); -MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_command_construct (GType object_type, Event* new_event, GeeIterable* source_views, const gchar* progress_text, const gchar* undo_progress_text, const gchar* name, const gchar* explanation); +static void _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, + gpointer self); +MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_command_new (Event* new_event, + GeeIterable* source_views, + const gchar* progress_text, + const gchar* undo_progress_text, + const gchar* name, + const gchar* explanation); +MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_command_construct (GType object_type, + Event* new_event, + GeeIterable* source_views, + const gchar* progress_text, + const gchar* undo_progress_text, + const gchar* name, + const gchar* explanation); Event* media_source_get_event (MediaSource* self); static void move_photos_command_real_move_photos_command_real_execute (Command* base); GType event_page_get_type (void) G_GNUC_CONST; Event* event_page_get_event (EventPage* self); gint event_source_get_media_count (EventSource* self); -void library_window_switch_to_event (LibraryWindow* self, Event* event); -static void move_photos_command_real_move_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source); -gboolean media_source_set_event (MediaSource* self, Event* new_event); -static void move_photos_command_real_move_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source); +void library_window_switch_to_event (LibraryWindow* self, + Event* event); +static void move_photos_command_real_move_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, + DataSource* source); +gboolean media_source_set_event (MediaSource* self, + Event* new_event); +static void move_photos_command_real_move_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, + DataSource* source); static void move_photos_command_real_move_photos_command_finalize (GObject * obj); static void move_photos_command_finalize (GObject * obj); GType new_event_command_get_type (void) G_GNUC_CONST; -enum { - NEW_EVENT_COMMAND_DUMMY_PROPERTY -}; NewEventCommand* new_event_command_new (GeeIterable* iter); -NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* iter); +NewEventCommand* new_event_command_construct (GType object_type, + GeeIterable* iter); #define RESOURCES_NEW_EVENT_LABEL _ ("New Event") Event* event_create_empty_event (MediaSource* source); GType set_event_command_get_type (void) G_GNUC_CONST; -enum { - SET_EVENT_COMMAND_DUMMY_PROPERTY -}; -SetEventCommand* set_event_command_new (GeeIterable* iter, Event* new_event); -SetEventCommand* set_event_command_construct (GType object_type, GeeIterable* iter, Event* new_event); +SetEventCommand* set_event_command_new (GeeIterable* iter, + Event* new_event); +SetEventCommand* set_event_command_construct (GType object_type, + GeeIterable* iter, + Event* new_event); #define RESOURCES_SET_PHOTO_EVENT_LABEL _ ("Move Photos") #define RESOURCES_SET_PHOTO_EVENT_TOOLTIP _ ("Move photos to an event") GType merge_events_command_get_type (void) G_GNUC_CONST; -enum { - MERGE_EVENTS_COMMAND_DUMMY_PROPERTY -}; MergeEventsCommand* merge_events_command_new (GeeIterable* iter); -MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterable* iter); +MergeEventsCommand* merge_events_command_construct (GType object_type, + GeeIterable* iter); #define RESOURCES_MERGE_LABEL _ ("Merge") gboolean event_has_name (Event* self); GeeCollection* event_source_get_media (EventSource* self); ThumbnailView* thumbnail_view_new (ThumbnailSource* source); -ThumbnailView* thumbnail_view_construct (GType object_type, ThumbnailSource* source); +ThumbnailView* thumbnail_view_construct (GType object_type, + ThumbnailSource* source); GType duplicate_multiple_photos_command_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; #define DUPLICATE_MULTIPLE_PHOTOS_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DUPLICATE_MULTIPLE_PHOTOS_COMMAND, DuplicateMultiplePhotosCommandPrivate)) -enum { - DUPLICATE_MULTIPLE_PHOTOS_COMMAND_DUMMY_PROPERTY -}; GType library_photo_source_collection_get_type (void) G_GNUC_CONST; -static void duplicate_multiple_photos_command_on_photo_destroyed (DuplicateMultiplePhotosCommand* self, DataSource* source); -static void _duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); +static void duplicate_multiple_photos_command_on_photo_destroyed (DuplicateMultiplePhotosCommand* self, + DataSource* source); +static void _duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); DuplicateMultiplePhotosCommand* duplicate_multiple_photos_command_new (GeeIterable* iter); -DuplicateMultiplePhotosCommand* duplicate_multiple_photos_command_construct (GType object_type, GeeIterable* iter); +DuplicateMultiplePhotosCommand* duplicate_multiple_photos_command_construct (GType object_type, + GeeIterable* iter); #define RESOURCES_DUPLICATE_PHOTO_LABEL _ ("Duplicate") #define RESOURCES_DUPLICATE_PHOTO_TOOLTIP _ ("Make a duplicate of the photo") static void duplicate_multiple_photos_command_real_execute (Command* base); -void app_window_error_message (const gchar* message, GtkWindow* parent); -static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source); -LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error); +void app_window_error_message (const gchar* message, + GtkWindow* parent); +static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, + DataSource* source); +LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, + GError** error); GFile* media_source_get_file (MediaSource* self); static void duplicate_multiple_photos_command_real_undo (Command* base); -static void duplicate_multiple_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source); +static void duplicate_multiple_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, + DataSource* source); GType marker_get_type (void) G_GNUC_CONST; -Marker* data_collection_mark (DataCollection* self, DataObject* object); -gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed); +Marker* data_collection_mark (DataCollection* self, + DataObject* object); +gint source_collection_destroy_marked (SourceCollection* self, + Marker* marker, + gboolean delete_backing, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_removed); static void duplicate_multiple_photos_command_finalize (GObject * obj); GType set_rating_single_command_get_type (void) G_GNUC_CONST; GType rating_get_type (void) G_GNUC_CONST; #define SET_RATING_SINGLE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_RATING_SINGLE_COMMAND, SetRatingSingleCommandPrivate)) -enum { - SET_RATING_SINGLE_COMMAND_DUMMY_PROPERTY -}; -SetRatingSingleCommand* set_rating_single_command_new (DataSource* source, Rating rating); -SetRatingSingleCommand* set_rating_single_command_construct (GType object_type, DataSource* source, Rating rating); +SetRatingSingleCommand* set_rating_single_command_new (DataSource* source, + Rating rating); +SetRatingSingleCommand* set_rating_single_command_construct (GType object_type, + DataSource* source, + Rating rating); const gchar* resources_rating_label (Rating rating); Rating media_source_get_rating (MediaSource* self); -SetRatingSingleCommand* set_rating_single_command_new_inc_dec (DataSource* source, gboolean is_incrementing); -SetRatingSingleCommand* set_rating_single_command_construct_inc_dec (GType object_type, DataSource* source, gboolean is_incrementing); +SetRatingSingleCommand* set_rating_single_command_new_inc_dec (DataSource* source, + gboolean is_incrementing); +SetRatingSingleCommand* set_rating_single_command_construct_inc_dec (GType object_type, + DataSource* source, + gboolean is_incrementing); #define RESOURCES_INCREASE_RATING_LABEL _ ("Increase Rating") #define RESOURCES_DECREASE_RATING_LABEL _ ("Decrease Rating") static void set_rating_single_command_real_execute (Command* base); -void media_source_set_rating (MediaSource* self, Rating rating); +void media_source_set_rating (MediaSource* self, + Rating rating); void media_source_increase_rating (MediaSource* self); void media_source_decrease_rating (MediaSource* self); static void set_rating_single_command_real_undo (Command* base); static void set_rating_single_command_finalize (GObject * obj); GType set_rating_command_get_type (void) G_GNUC_CONST; #define SET_RATING_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_RATING_COMMAND, SetRatingCommandPrivate)) -enum { - SET_RATING_COMMAND_DUMMY_PROPERTY -}; -SetRatingCommand* set_rating_command_new (GeeIterable* iter, Rating rating); -SetRatingCommand* set_rating_command_construct (GType object_type, GeeIterable* iter, Rating rating); +SetRatingCommand* set_rating_command_new (GeeIterable* iter, + Rating rating); +SetRatingCommand* set_rating_command_construct (GType object_type, + GeeIterable* iter, + Rating rating); gchar* resources_rating_progress (Rating rating); -static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIterable* iter); -SetRatingCommand* set_rating_command_new_inc_dec (GeeIterable* iter, gboolean is_incrementing); -SetRatingCommand* set_rating_command_construct_inc_dec (GType object_type, GeeIterable* iter, gboolean is_incrementing); +static void set_rating_command_save_source_states (SetRatingCommand* self, + GeeIterable* iter); +SetRatingCommand* set_rating_command_new_inc_dec (GeeIterable* iter, + gboolean is_incrementing); +SetRatingCommand* set_rating_command_construct_inc_dec (GType object_type, + GeeIterable* iter, + gboolean is_incrementing); static void set_rating_command_real_execute (Command* base); static void set_rating_command_real_undo (Command* base); -static void set_rating_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source); -static void set_rating_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source); +static void set_rating_command_real_execute_on_source (MultipleDataSourceCommand* base, + DataSource* source); +static void set_rating_command_real_undo_on_source (MultipleDataSourceCommand* base, + DataSource* source); static void set_rating_command_finalize (GObject * obj); GType set_raw_developer_command_get_type (void) G_GNUC_CONST; GType raw_developer_get_type (void) G_GNUC_CONST; #define SET_RAW_DEVELOPER_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommandPrivate)) -enum { - SET_RAW_DEVELOPER_COMMAND_DUMMY_PROPERTY -}; -SetRawDeveloperCommand* set_raw_developer_command_new (GeeIterable* iter, RawDeveloper developer); -SetRawDeveloperCommand* set_raw_developer_command_construct (GType object_type, GeeIterable* iter, RawDeveloper developer); -static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand* self, GeeIterable* iter); -static gboolean set_raw_developer_command_is_raw_photo (SetRawDeveloperCommand* self, Photo* photo); +SetRawDeveloperCommand* set_raw_developer_command_new (GeeIterable* iter, + RawDeveloper developer); +SetRawDeveloperCommand* set_raw_developer_command_construct (GType object_type, + GeeIterable* iter, + RawDeveloper developer); +static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand* self, + GeeIterable* iter); +static gboolean set_raw_developer_command_is_raw_photo (SetRawDeveloperCommand* self, + Photo* photo); RawDeveloper photo_get_raw_developer (Photo* self); static void set_raw_developer_command_real_execute (Command* base); static void set_raw_developer_command_real_undo (Command* base); -static void set_raw_developer_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source); -gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d); -void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify); -static void set_raw_developer_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source); +static void set_raw_developer_command_real_execute_on_source (MultipleDataSourceCommand* base, + DataSource* source); +gboolean photo_is_raw_developer_available (Photo* self, + RawDeveloper d); +void photo_set_raw_developer (Photo* self, + RawDeveloper d, + gboolean notify); +static void set_raw_developer_command_real_undo_on_source (MultipleDataSourceCommand* base, + DataSource* source); GType photo_file_format_get_type (void) G_GNUC_CONST; PhotoFileFormat photo_get_master_file_format (Photo* self); static void set_raw_developer_command_finalize (GObject * obj); GType adjust_date_time_photo_command_get_type (void) G_GNUC_CONST; GType dateable_get_type (void) G_GNUC_CONST; #define ADJUST_DATE_TIME_PHOTO_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ADJUST_DATE_TIME_PHOTO_COMMAND, AdjustDateTimePhotoCommandPrivate)) -enum { - ADJUST_DATE_TIME_PHOTO_COMMAND_DUMMY_PROPERTY -}; -AdjustDateTimePhotoCommand* adjust_date_time_photo_command_new (Dateable* dateable, gint64 time_shift, gboolean modify_original); -AdjustDateTimePhotoCommand* adjust_date_time_photo_command_construct (GType object_type, Dateable* dateable, gint64 time_shift, gboolean modify_original); +AdjustDateTimePhotoCommand* adjust_date_time_photo_command_new (Dateable* dateable, + gint64 time_shift, + gboolean modify_original); +AdjustDateTimePhotoCommand* adjust_date_time_photo_command_construct (GType object_type, + Dateable* dateable, + gint64 time_shift, + gboolean modify_original); #define RESOURCES_ADJUST_DATE_TIME_LABEL _ ("Adjust Date and Time") static void adjust_date_time_photo_command_real_execute (Command* base); -static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand* self, Dateable* dateable, time_t exposure_time); +static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand* self, + Dateable* dateable, + time_t exposure_time); time_t dateable_get_exposure_time (Dateable* self); ViewCollection* view_collection_new (const gchar* name); -ViewCollection* view_collection_construct (GType object_type, const gchar* name); +ViewCollection* view_collection_construct (GType object_type, + const gchar* name); GType container_source_collection_get_type (void) G_GNUC_CONST; GType event_source_collection_get_type (void) G_GNUC_CONST; GeeCollection* data_collection_get_all (DataCollection* self); -gboolean data_collection_add (DataCollection* self, DataObject* object); +gboolean data_collection_add (DataCollection* self, + DataObject* object); EventView* event_view_new (EventSource* source); -EventView* event_view_construct (GType object_type, EventSource* source); +EventView* event_view_construct (GType object_type, + EventSource* source); GType event_view_get_type (void) G_GNUC_CONST; -void event_generate_single_event (MediaSource* media, ViewCollection* events_so_far, const gchar* event_name); +void event_generate_single_event (MediaSource* media, + ViewCollection* events_so_far, + const gchar* event_name); static void adjust_date_time_photo_command_real_undo (Command* base); -void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** error); -void dateable_set_exposure_time (Dateable* self, time_t target_time); +void photo_set_exposure_time_persistent (Photo* self, + time_t time, + GError** error); +void dateable_set_exposure_time (Dateable* self, + time_t target_time); static void adjust_date_time_photo_command_finalize (GObject * obj); GType adjust_date_time_photos_command_get_type (void) G_GNUC_CONST; #define ADJUST_DATE_TIME_PHOTOS_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, AdjustDateTimePhotosCommandPrivate)) -enum { - ADJUST_DATE_TIME_PHOTOS_COMMAND_DUMMY_PROPERTY -}; -AdjustDateTimePhotosCommand* adjust_date_time_photos_command_new (GeeIterable* iter, gint64 time_shift, gboolean keep_relativity, gboolean modify_originals); -AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType object_type, GeeIterable* iter, gint64 time_shift, gboolean keep_relativity, gboolean modify_originals); +AdjustDateTimePhotosCommand* adjust_date_time_photos_command_new (GeeIterable* iter, + gint64 time_shift, + gboolean keep_relativity, + gboolean modify_originals); +AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType object_type, + GeeIterable* iter, + gint64 time_shift, + gboolean keep_relativity, + gboolean modify_originals); static time_t* _time_t_dup (time_t* self); static void adjust_date_time_photos_command_real_execute (Command* base); -void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message, const gchar* title); +void multiple_object_error_dialog (GeeArrayList* objects, + const gchar* message, + const gchar* title); static void adjust_date_time_photos_command_real_undo (Command* base); -static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosCommand* self, Dateable* dateable, time_t exposure_time); -static void adjust_date_time_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source); -static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source); +static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosCommand* self, + Dateable* dateable, + time_t exposure_time); +static void adjust_date_time_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, + DataSource* source); +static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, + DataSource* source); static void adjust_date_time_photos_command_finalize (GObject * obj); GType add_tags_command_get_type (void) G_GNUC_CONST; #define ADD_TAGS_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ADD_TAGS_COMMAND, AddTagsCommandPrivate)) -enum { - ADD_TAGS_COMMAND_DUMMY_PROPERTY -}; static void add_tags_command_on_proxy_broken (AddTagsCommand* self); -static void _add_tags_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self); -static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSource* source); -static void _add_tags_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); +static void _add_tags_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, + gpointer self); +static void add_tags_command_on_source_destroyed (AddTagsCommand* self, + DataSource* source); +static void _add_tags_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); GType video_source_collection_get_type (void) G_GNUC_CONST; -AddTagsCommand* add_tags_command_new (gchar** paths, int paths_length1, GeeCollection* sources); -AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, int paths_length1, GeeCollection* sources); -gchar* resources_add_tags_label (gchar** names, int names_length1); +AddTagsCommand* add_tags_command_new (gchar** paths, + int paths_length1, + GeeCollection* sources); +AddTagsCommand* add_tags_command_construct (GType object_type, + gchar** paths, + int paths_length1, + GeeCollection* sources); +gchar* resources_add_tags_label (gchar** names, + int names_length1); GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path); GType tag_get_type (void) G_GNUC_CONST; Tag* tag_for_path (const gchar* name); -gboolean tag_contains (Tag* self, MediaSource* source); +gboolean tag_contains (Tag* self, + MediaSource* source); static void add_tags_command_real_execute (Command* base); -void tag_attach_many (Tag* self, GeeCollection* sources); +void tag_attach_many (Tag* self, + GeeCollection* sources); static void add_tags_command_real_undo (Command* base); -GeeMultiMap* tag_detach_many (Tag* self, GeeCollection* sources); +GeeMultiMap* tag_detach_many (Tag* self, + GeeCollection* sources); static void add_tags_command_finalize (GObject * obj); GType rename_tag_command_get_type (void) G_GNUC_CONST; #define RENAME_TAG_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_RENAME_TAG_COMMAND, RenameTagCommandPrivate)) -enum { - RENAME_TAG_COMMAND_DUMMY_PROPERTY -}; -RenameTagCommand* rename_tag_command_new (Tag* tag, const gchar* new_name); -RenameTagCommand* rename_tag_command_construct (GType object_type, Tag* tag, const gchar* new_name); -gchar* resources_rename_tag_label (const gchar* old_name, const gchar* new_name); +RenameTagCommand* rename_tag_command_new (Tag* tag, + const gchar* new_name); +RenameTagCommand* rename_tag_command_construct (GType object_type, + Tag* tag, + const gchar* new_name); +gchar* resources_rename_tag_label (const gchar* old_name, + const gchar* new_name); gchar* tag_get_user_visible_name (Tag* self); gchar* data_object_get_name (DataObject* self); -static void rename_tag_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source); -gboolean tag_rename (Tag* self, const gchar* name); +static void rename_tag_command_real_execute_on_source (SimpleProxyableCommand* base, + DataSource* source); +gboolean tag_rename (Tag* self, + const gchar* name); gchar* resources_rename_tag_exists_message (const gchar* name); -static void rename_tag_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source); +static void rename_tag_command_real_undo_on_source (SimpleProxyableCommand* base, + DataSource* source); static void rename_tag_command_finalize (GObject * obj); GType delete_tag_command_get_type (void) G_GNUC_CONST; #define DELETE_TAG_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DELETE_TAG_COMMAND, DeleteTagCommandPrivate)) -enum { - DELETE_TAG_COMMAND_DUMMY_PROPERTY -}; DeleteTagCommand* delete_tag_command_new (Tag* tag); -DeleteTagCommand* delete_tag_command_construct (GType object_type, Tag* tag); +DeleteTagCommand* delete_tag_command_construct (GType object_type, + Tag* tag); gchar* resources_delete_tag_label (const gchar* name); -static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source); +static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* base, + DataSource* source); GeeList* tag_get_hierarchical_children (Tag* self); static void delete_tag_command_on_proxy_broken (DeleteTagCommand* self); -static void _delete_tag_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self); +static void _delete_tag_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, + gpointer self); GType tag_source_collection_get_type (void) G_GNUC_CONST; -static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source); +static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base, + DataSource* source); static void delete_tag_command_finalize (GObject * obj); GType new_child_tag_command_get_type (void) G_GNUC_CONST; #define NEW_CHILD_TAG_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_NEW_CHILD_TAG_COMMAND, NewChildTagCommandPrivate)) -enum { - NEW_CHILD_TAG_COMMAND_DUMMY_PROPERTY -}; NewChildTagCommand* new_child_tag_command_new (Tag* tag); -NewChildTagCommand* new_child_tag_command_construct (GType object_type, Tag* tag); -static void new_child_tag_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source); +NewChildTagCommand* new_child_tag_command_construct (GType object_type, + Tag* tag); +static void new_child_tag_command_real_execute_on_source (SimpleProxyableCommand* base, + DataSource* source); Tag* tag_create_new_child (Tag* self); -static void new_child_tag_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source); +static void new_child_tag_command_real_undo_on_source (SimpleProxyableCommand* base, + DataSource* source); Tag* new_child_tag_command_get_created_child (NewChildTagCommand* self); static void new_child_tag_command_finalize (GObject * obj); GType new_root_tag_command_get_type (void) G_GNUC_CONST; #define NEW_ROOT_TAG_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_NEW_ROOT_TAG_COMMAND, NewRootTagCommandPrivate)) -enum { - NEW_ROOT_TAG_COMMAND_DUMMY_PROPERTY -}; NewRootTagCommand* new_root_tag_command_new (void); NewRootTagCommand* new_root_tag_command_construct (GType object_type); static void new_root_tag_command_real_execute (Command* base); @@ -2592,283 +3052,349 @@ Tag* new_root_tag_command_get_created_tag (NewRootTagCommand* self); static void new_root_tag_command_finalize (GObject * obj); GType reparent_tag_command_get_type (void) G_GNUC_CONST; #define REPARENT_TAG_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_REPARENT_TAG_COMMAND, ReparentTagCommandPrivate)) -enum { - REPARENT_TAG_COMMAND_DUMMY_PROPERTY -}; -static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, GeeCollection* destroyed); -static void _reparent_tag_command_on_items_destroyed_source_collection_items_destroyed (SourceCollection* _sender, GeeCollection* destroyed, gpointer self); -ReparentTagCommand* reparent_tag_command_new (Tag* tag, const gchar* new_parent_path); -ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag, const gchar* new_parent_path); +static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, + GeeCollection* destroyed); +static void _reparent_tag_command_on_items_destroyed_source_collection_items_destroyed (SourceCollection* _sender, + GeeCollection* destroyed, + gpointer self); +ReparentTagCommand* reparent_tag_command_new (Tag* tag, + const gchar* new_parent_path); +ReparentTagCommand* reparent_tag_command_construct (GType object_type, + Tag* tag, + const gchar* new_parent_path); gchar* tag_get_path (Tag* self); #define TAG_PATH_SEPARATOR_STRING "/" gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path); -gboolean tag_source_collection_exists (TagSourceCollection* self, const gchar* name, gboolean treat_htags_as_root); +gboolean tag_source_collection_exists (TagSourceCollection* self, + const gchar* name, + gboolean treat_htags_as_root); GeeCollection* tag_get_sources (Tag* self); -static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand* self, const gchar* client_path); -static void reparent_tag_command_restore_child_attachments_at (ReparentTagCommand* self, const gchar* client_path, GeeMap* child_structure); +static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand* self, + const gchar* client_path); +static void reparent_tag_command_restore_child_attachments_at (ReparentTagCommand* self, + const gchar* client_path, + GeeMap* child_structure); void tag_promote (Tag* self); -void tag_attach (Tag* self, MediaSource* source); -static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand* self, const gchar* client_path); +void tag_attach (Tag* self, + MediaSource* source); +static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand* self, + const gchar* client_path); static void reparent_tag_command_save_before_state (ReparentTagCommand* self); static void reparent_tag_command_restore_before_state (ReparentTagCommand* self); -GeeList* tag_detach (Tag* self, MediaSource* source); +GeeList* tag_detach (Tag* self, + MediaSource* source); static void reparent_tag_command_save_after_state (ReparentTagCommand* self); static void reparent_tag_command_restore_after_state (ReparentTagCommand* self); -static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const gchar* path); +static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, + const gchar* path); static void reparent_tag_command_do_source_parent_detachments (ReparentTagCommand* self); Tag* tag_get_hierarchical_parent (Tag* self); -gint tag_get_attachment_count (Tag* self, MediaSource* source); +gint tag_get_attachment_count (Tag* self, + MediaSource* source); static void reparent_tag_command_do_source_parent_reattachments (ReparentTagCommand* self); static void reparent_tag_command_do_destination_parent_detachments (ReparentTagCommand* self); static void reparent_tag_command_do_destination_parent_reattachments (ReparentTagCommand* self); -static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const gchar* from, const gchar* to); -static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, const gchar* client_path); +static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, + const gchar* from, + const gchar* to); +static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, + const gchar* client_path); static void reparent_tag_command_real_execute (Command* base); static void reparent_tag_command_real_undo (Command* base); void hierarchical_tag_utilities_cleanup_root_path (const gchar* path); static void reparent_tag_command_finalize (GObject * obj); GType modify_tags_command_get_type (void) G_GNUC_CONST; #define MODIFY_TAGS_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MODIFY_TAGS_COMMAND, ModifyTagsCommandPrivate)) -enum { - MODIFY_TAGS_COMMAND_DUMMY_PROPERTY -}; static void modify_tags_command_on_proxy_broken (ModifyTagsCommand* self); -static void _modify_tags_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self); -ModifyTagsCommand* modify_tags_command_new (MediaSource* media, GeeCollection* new_tag_list); -ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource* media, GeeCollection* new_tag_list); +static void _modify_tags_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, + gpointer self); +ModifyTagsCommand* modify_tags_command_new (MediaSource* media, + GeeCollection* new_tag_list); +ModifyTagsCommand* modify_tags_command_construct (GType object_type, + MediaSource* media, + GeeCollection* new_tag_list); #define RESOURCES_MODIFY_TAGS_LABEL _ ("Modify Tags") -GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, MediaSource* source); +GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, + MediaSource* source); static void modify_tags_command_real_execute (Command* base); static void modify_tags_command_real_undo (Command* base); static void modify_tags_command_finalize (GObject * obj); GType tag_untag_photos_command_get_type (void) G_GNUC_CONST; #define TAG_UNTAG_PHOTOS_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TAG_UNTAG_PHOTOS_COMMAND, TagUntagPhotosCommandPrivate)) -enum { - TAG_UNTAG_PHOTOS_COMMAND_DUMMY_PROPERTY -}; -static void tag_untag_photos_command_on_source_destroyed (TagUntagPhotosCommand* self, DataSource* source); -static void _tag_untag_photos_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); -TagUntagPhotosCommand* tag_untag_photos_command_new (Tag* tag, GeeCollection* sources, gint count, gboolean attach); -TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Tag* tag, GeeCollection* sources, gint count, gboolean attach); -gchar* resources_tag_photos_label (const gchar* name, gint count); -gchar* resources_untag_photos_label (const gchar* name, gint count); -static void tag_untag_photos_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source); -static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag* tag); -static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag* tag); -static void tag_untag_photos_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source); +static void tag_untag_photos_command_on_source_destroyed (TagUntagPhotosCommand* self, + DataSource* source); +static void _tag_untag_photos_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); +TagUntagPhotosCommand* tag_untag_photos_command_new (Tag* tag, + GeeCollection* sources, + gint count, + gboolean attach); +TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, + Tag* tag, + GeeCollection* sources, + gint count, + gboolean attach); +gchar* resources_tag_photos_label (const gchar* name, + gint count); +gchar* resources_untag_photos_label (const gchar* name, + gint count); +static void tag_untag_photos_command_real_execute_on_source (SimpleProxyableCommand* base, + DataSource* source); +static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, + Tag* tag); +static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, + Tag* tag); +static void tag_untag_photos_command_real_undo_on_source (SimpleProxyableCommand* base, + DataSource* source); gchar* data_object_to_string (DataObject* self); static void tag_untag_photos_command_finalize (GObject * obj); GType rename_saved_search_command_get_type (void) G_GNUC_CONST; GType saved_search_get_type (void) G_GNUC_CONST; #define RENAME_SAVED_SEARCH_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_RENAME_SAVED_SEARCH_COMMAND, RenameSavedSearchCommandPrivate)) -enum { - RENAME_SAVED_SEARCH_COMMAND_DUMMY_PROPERTY -}; -RenameSavedSearchCommand* rename_saved_search_command_new (SavedSearch* search, const gchar* new_name); -RenameSavedSearchCommand* rename_saved_search_command_construct (GType object_type, SavedSearch* search, const gchar* new_name); -gchar* resources_rename_search_label (const gchar* old_name, const gchar* new_name); +RenameSavedSearchCommand* rename_saved_search_command_new (SavedSearch* search, + const gchar* new_name); +RenameSavedSearchCommand* rename_saved_search_command_construct (GType object_type, + SavedSearch* search, + const gchar* new_name); +gchar* resources_rename_search_label (const gchar* old_name, + const gchar* new_name); static void rename_saved_search_command_real_execute (Command* base); -gboolean saved_search_rename (SavedSearch* self, const gchar* new_name); +gboolean saved_search_rename (SavedSearch* self, + const gchar* new_name); gchar* resources_rename_search_exists_message (const gchar* name); static void rename_saved_search_command_real_undo (Command* base); static void rename_saved_search_command_finalize (GObject * obj); GType delete_saved_search_command_get_type (void) G_GNUC_CONST; #define DELETE_SAVED_SEARCH_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DELETE_SAVED_SEARCH_COMMAND, DeleteSavedSearchCommandPrivate)) -enum { - DELETE_SAVED_SEARCH_COMMAND_DUMMY_PROPERTY -}; DeleteSavedSearchCommand* delete_saved_search_command_new (SavedSearch* search); -DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_type, SavedSearch* search); +DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_type, + SavedSearch* search); gchar* resources_delete_search_label (const gchar* name); static void delete_saved_search_command_real_execute (Command* base); gpointer saved_search_table_ref (gpointer instance); void saved_search_table_unref (gpointer instance); -GParamSpec* param_spec_saved_search_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_saved_search_table (GValue* value, gpointer v_object); -void value_take_saved_search_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_saved_search_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_saved_search_table (GValue* value, + gpointer v_object); +void value_take_saved_search_table (GValue* value, + gpointer v_object); gpointer value_get_saved_search_table (const GValue* value); GType saved_search_table_get_type (void) G_GNUC_CONST; SavedSearchTable* saved_search_table_get_instance (void); -void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search); +void saved_search_table_remove (SavedSearchTable* self, + SavedSearch* search); static void delete_saved_search_command_real_undo (Command* base); void saved_search_reconstitute (SavedSearch* self); static void delete_saved_search_command_finalize (GObject * obj); GType trash_untrash_photos_command_get_type (void) G_GNUC_CONST; #define TRASH_UNTRASH_PHOTOS_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TRASH_UNTRASH_PHOTOS_COMMAND, TrashUntrashPhotosCommandPrivate)) -enum { - TRASH_UNTRASH_PHOTOS_COMMAND_DUMMY_PROPERTY -}; -static void trash_untrash_photos_command_on_photo_destroyed (TrashUntrashPhotosCommand* self, DataSource* source); -static void _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); -TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, gboolean to_trash); -TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type, GeeCollection* sources, gboolean to_trash); -static ProgressDialog* trash_untrash_photos_command_get_progress_dialog (TrashUntrashPhotosCommand* self, gboolean to_trash); -void progress_dialog_update_display_every (ProgressDialog* self, gint update_every); +static void trash_untrash_photos_command_on_photo_destroyed (TrashUntrashPhotosCommand* self, + DataSource* source); +static void _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); +TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, + gboolean to_trash); +TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type, + GeeCollection* sources, + gboolean to_trash); +static ProgressDialog* trash_untrash_photos_command_get_progress_dialog (TrashUntrashPhotosCommand* self, + gboolean to_trash); +void progress_dialog_update_display_every (ProgressDialog* self, + gint update_every); static void trash_untrash_photos_command_real_execute (Command* base); -gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop); -static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self); -static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self, ProgressMonitor monitor, void* monitor_target); -static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* self, ProgressMonitor monitor, void* monitor_target); +gboolean progress_dialog_monitor (ProgressDialog* self, + guint64 count, + guint64 total, + gboolean do_event_loop); +static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, + guint64 total, + gboolean do_event_loop, + gpointer self); +static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self, + ProgressMonitor monitor, + void* monitor_target); +static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* self, + ProgressMonitor monitor, + void* monitor_target); static void trash_untrash_photos_command_real_undo (Command* base); void media_source_trash (MediaSource* self); void media_source_untrash (MediaSource* self); static void trash_untrash_photos_command_finalize (GObject * obj); GType flag_unflag_command_get_type (void) G_GNUC_CONST; #define FLAG_UNFLAG_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_FLAG_UNFLAG_COMMAND, FlagUnflagCommandPrivate)) -enum { - FLAG_UNFLAG_COMMAND_DUMMY_PROPERTY -}; #define FLAG_UNFLAG_COMMAND_MIN_PROGRESS_BAR_THRESHOLD 1000 #define FLAG_UNFLAG_COMMAND_FLAG_SELECTED_STRING _ ("Flag selected photos") #define FLAG_UNFLAG_COMMAND_UNFLAG_SELECTED_STRING _ ("Unflag selected photos") #define FLAG_UNFLAG_COMMAND_FLAG_PROGRESS _ ("Flagging selected photos") #define FLAG_UNFLAG_COMMAND_UNFLAG_PROGRESS _ ("Unflagging selected photos") -FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources, gboolean flag); -FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollection* sources, gboolean flag); -static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources); -static void flag_unflag_command_flag_unflag (FlagUnflagCommand* self, DataSource* source, gboolean flag); -static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources); +FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources, + gboolean flag); +FlagUnflagCommand* flag_unflag_command_construct (GType object_type, + GeeCollection* sources, + gboolean flag); +static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* base, + GeeCollection* sources); +static void flag_unflag_command_flag_unflag (FlagUnflagCommand* self, + DataSource* source, + gboolean flag); +static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* base, + GeeCollection* sources); GType flaggable_get_type (void) G_GNUC_CONST; void flaggable_mark_flagged (Flaggable* self); void flaggable_mark_unflagged (Flaggable* self); static void flag_unflag_command_finalize (GObject * obj); -static void _page_command_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) { +static void +_page_command_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, + gpointer self) +{ #line 45 "/home/jens/Source/shotwell/src/Commands.vala" page_command_on_page_destroyed ((PageCommand*) self); -#line 2741 "Commands.c" +#line 3261 "Commands.c" } -static void _page_command_on_photo_destroyed_data_source_destroyed (DataSource* _sender, gpointer self) { +static void +_page_command_on_photo_destroyed_data_source_destroyed (DataSource* _sender, + gpointer self) +{ #line 48 "/home/jens/Source/shotwell/src/Commands.vala" page_command_on_photo_destroyed ((PageCommand*) self); -#line 2748 "Commands.c" +#line 3271 "Commands.c" } -static void _page_command_on_controller_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) { +static void +_page_command_on_controller_destroyed_gtk_widget_destroy (GtkWidget* _sender, + gpointer self) +{ #line 51 "/home/jens/Source/shotwell/src/Commands.vala" page_command_on_controller_destroyed ((PageCommand*) self); -#line 2755 "Commands.c" +#line 3281 "Commands.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 27 "/home/jens/Source/shotwell/src/Commands.vala" return self ? g_object_ref (self) : NULL; -#line 2762 "Commands.c" +#line 3290 "Commands.c" } -PageCommand* page_command_construct (GType object_type, const gchar* name, const gchar* explanation) { +PageCommand* +page_command_construct (GType object_type, + const gchar* name, + const gchar* explanation) +{ PageCommand * self = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - AppWindow* _tmp2_; - AppWindow* _tmp3_; - Page* _tmp4_; - Page* _tmp5_; + AppWindow* _tmp0_; + AppWindow* _tmp1_; + Page* _tmp2_; + Page* _tmp3_; #line 15 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (name != NULL, NULL); #line 15 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (explanation != NULL, NULL); #line 16 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = name; -#line 16 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = explanation; -#line 16 "/home/jens/Source/shotwell/src/Commands.vala" - self = (PageCommand*) command_construct (object_type, _tmp0_, _tmp1_); + self = (PageCommand*) command_construct (object_type, name, explanation); #line 18 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = app_window_get_instance (); + _tmp0_ = app_window_get_instance (); #line 18 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 18 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PAGE_WINDOW, PageWindow)); + _tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE_WINDOW, PageWindow)); #line 18 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->page); #line 18 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->page = _tmp4_; + self->priv->page = _tmp2_; #line 18 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 20 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = self->priv->page; + _tmp3_ = self->priv->page; #line 20 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp5_ != NULL) { -#line 2800 "Commands.c" - Page* _tmp6_; + if (_tmp3_ != NULL) { +#line 3326 "Commands.c" + Page* _tmp4_; LibraryPhotoPage* photo_page = NULL; - Page* _tmp7_; - LibraryPhotoPage* _tmp8_; - LibraryPhotoPage* _tmp9_; + Page* _tmp5_; + LibraryPhotoPage* _tmp6_; + LibraryPhotoPage* _tmp7_; #line 21 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = self->priv->page; + _tmp4_ = self->priv->page; #line 21 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), "destroy", (GCallback) _page_command_on_page_destroyed_gtk_widget_destroy, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), "destroy", (GCallback) _page_command_on_page_destroyed_gtk_widget_destroy, self, 0); #line 27 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = self->priv->page; + _tmp5_ = self->priv->page; #line 27 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO_PAGE) ? ((LibraryPhotoPage*) _tmp7_) : NULL); + _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_LIBRARY_PHOTO_PAGE) ? ((LibraryPhotoPage*) _tmp5_) : NULL); #line 27 "/home/jens/Source/shotwell/src/Commands.vala" - photo_page = _tmp8_; + photo_page = _tmp6_; #line 28 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = photo_page; + _tmp7_ = photo_page; #line 28 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp9_ != NULL) { -#line 2820 "Commands.c" + if (_tmp7_ != NULL) { +#line 3346 "Commands.c" + LibraryPhotoPage* _tmp8_; + Photo* _tmp9_; LibraryPhotoPage* _tmp10_; - Photo* _tmp11_; - LibraryPhotoPage* _tmp12_; - CollectionPage* _tmp13_; - gboolean _tmp14_ = FALSE; - Photo* _tmp15_; + CollectionPage* _tmp11_; + gboolean _tmp12_ = FALSE; + Photo* _tmp13_; #line 29 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = photo_page; + _tmp8_ = photo_page; #line 29 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp9_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 29 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->library_photo); #line 29 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->library_photo = _tmp11_; + self->priv->library_photo = _tmp9_; #line 30 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = photo_page; + _tmp10_ = photo_page; #line 30 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = library_photo_page_get_controller_page (_tmp12_); + _tmp11_ = library_photo_page_get_controller_page (_tmp10_); #line 30 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->collection_page); #line 30 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->collection_page = _tmp13_; + self->priv->collection_page = _tmp11_; #line 32 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = self->priv->library_photo; + _tmp13_ = self->priv->library_photo; #line 32 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp15_ != NULL) { -#line 2847 "Commands.c" - CollectionPage* _tmp16_; + if (_tmp13_ != NULL) { +#line 3373 "Commands.c" + CollectionPage* _tmp14_; #line 32 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = self->priv->collection_page; + _tmp14_ = self->priv->collection_page; #line 32 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = _tmp16_ != NULL; -#line 2853 "Commands.c" + _tmp12_ = _tmp14_ != NULL; +#line 3379 "Commands.c" } else { #line 32 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = FALSE; -#line 2857 "Commands.c" + _tmp12_ = FALSE; +#line 3383 "Commands.c" } #line 32 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp14_) { -#line 2861 "Commands.c" - Photo* _tmp17_; - CollectionPage* _tmp18_; + if (_tmp12_) { +#line 3387 "Commands.c" + Photo* _tmp15_; + CollectionPage* _tmp16_; #line 33 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = self->priv->library_photo; + _tmp15_ = self->priv->library_photo; #line 33 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource), "destroyed", (GCallback) _page_command_on_photo_destroyed_data_source_destroyed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_SOURCE, DataSource), "destroyed", (GCallback) _page_command_on_photo_destroyed_data_source_destroyed, self, 0); #line 34 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = self->priv->collection_page; + _tmp16_ = self->priv->collection_page; #line 34 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), "destroy", (GCallback) _page_command_on_controller_destroyed_gtk_widget_destroy, self, 0); -#line 2872 "Commands.c" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), "destroy", (GCallback) _page_command_on_controller_destroyed_gtk_widget_destroy, self, 0); +#line 3398 "Commands.c" } else { #line 36 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->library_photo); @@ -2878,32 +3404,34 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const _g_object_unref0 (self->priv->collection_page); #line 37 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->collection_page = NULL; -#line 2882 "Commands.c" +#line 3408 "Commands.c" } } #line 20 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (photo_page); -#line 2887 "Commands.c" +#line 3413 "Commands.c" } #line 15 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 2891 "Commands.c" +#line 3417 "Commands.c" } -void page_command_set_auto_return_to_page (PageCommand* self, gboolean auto_return) { - gboolean _tmp0_; +void +page_command_set_auto_return_to_page (PageCommand* self, + gboolean auto_return) +{ #line 54 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_PAGE_COMMAND (self)); #line 55 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = auto_return; -#line 55 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->auto_return = _tmp0_; -#line 2903 "Commands.c" + self->priv->auto_return = auto_return; +#line 3429 "Commands.c" } -static void page_command_real_prepare (Command* base) { +static void +page_command_real_prepare (Command* base) +{ PageCommand * self; gboolean _tmp0_; #line 58 "/home/jens/Source/shotwell/src/Commands.vala" @@ -2914,15 +3442,17 @@ static void page_command_real_prepare (Command* base) { if (_tmp0_) { #line 60 "/home/jens/Source/shotwell/src/Commands.vala" page_command_return_to_page (self); -#line 2918 "Commands.c" +#line 3446 "Commands.c" } #line 62 "/home/jens/Source/shotwell/src/Commands.vala" COMMAND_CLASS (page_command_parent_class)->prepare (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command)); -#line 2922 "Commands.c" +#line 3450 "Commands.c" } -void page_command_return_to_page (PageCommand* self) { +void +page_command_return_to_page (PageCommand* self) +{ LibraryPhotoPage* photo_page = NULL; Page* _tmp0_; LibraryPhotoPage* _tmp1_; @@ -2939,36 +3469,35 @@ void page_command_return_to_page (PageCommand* self) { _tmp2_ = photo_page; #line 68 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp2_ != NULL) { -#line 2943 "Commands.c" +#line 3473 "Commands.c" gboolean _tmp3_ = FALSE; Photo* _tmp4_; #line 69 "/home/jens/Source/shotwell/src/Commands.vala" _tmp4_ = self->priv->library_photo; #line 69 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp4_ != NULL) { -#line 2950 "Commands.c" +#line 3480 "Commands.c" CollectionPage* _tmp5_; #line 69 "/home/jens/Source/shotwell/src/Commands.vala" _tmp5_ = self->priv->collection_page; #line 69 "/home/jens/Source/shotwell/src/Commands.vala" _tmp3_ = _tmp5_ != NULL; -#line 2956 "Commands.c" +#line 3486 "Commands.c" } else { #line 69 "/home/jens/Source/shotwell/src/Commands.vala" _tmp3_ = FALSE; -#line 2960 "Commands.c" +#line 3490 "Commands.c" } #line 69 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp3_) { -#line 2964 "Commands.c" +#line 3494 "Commands.c" gboolean photo_in_collection = FALSE; gint count = 0; CollectionPage* _tmp6_; ViewCollection* _tmp7_; ViewCollection* _tmp8_; gint _tmp9_; - gint _tmp10_; - gboolean _tmp25_; + gboolean _tmp24_; #line 70 "/home/jens/Source/shotwell/src/Commands.vala" photo_in_collection = FALSE; #line 71 "/home/jens/Source/shotwell/src/Commands.vala" @@ -2979,150 +3508,150 @@ void page_command_return_to_page (PageCommand* self) { _tmp8_ = _tmp7_; #line 71 "/home/jens/Source/shotwell/src/Commands.vala" _tmp9_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection)); -#line 71 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = _tmp9_; #line 71 "/home/jens/Source/shotwell/src/Commands.vala" _data_collection_unref0 (_tmp8_); #line 71 "/home/jens/Source/shotwell/src/Commands.vala" - count = _tmp10_; -#line 2989 "Commands.c" + count = _tmp9_; +#line 3516 "Commands.c" { gint i = 0; #line 72 "/home/jens/Source/shotwell/src/Commands.vala" i = 0; -#line 2994 "Commands.c" +#line 3521 "Commands.c" { - gboolean _tmp11_ = FALSE; + gboolean _tmp10_ = FALSE; #line 72 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = TRUE; + _tmp10_ = TRUE; #line 72 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 3001 "Commands.c" +#line 3528 "Commands.c" + gint _tmp12_; gint _tmp13_; - gint _tmp14_; - CollectionPage* _tmp15_; + CollectionPage* _tmp14_; + ViewCollection* _tmp15_; ViewCollection* _tmp16_; - ViewCollection* _tmp17_; - gint _tmp18_; - DataObject* _tmp19_; - Thumbnail* _tmp20_; + gint _tmp17_; + DataObject* _tmp18_; + Thumbnail* _tmp19_; + MediaSource* _tmp20_; MediaSource* _tmp21_; - MediaSource* _tmp22_; - Photo* _tmp23_; - gboolean _tmp24_; + Photo* _tmp22_; + gboolean _tmp23_; #line 72 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp11_) { -#line 3016 "Commands.c" - gint _tmp12_; + if (!_tmp10_) { +#line 3543 "Commands.c" + gint _tmp11_; #line 72 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = i; + _tmp11_ = i; #line 72 "/home/jens/Source/shotwell/src/Commands.vala" - i = _tmp12_ + 1; -#line 3022 "Commands.c" + i = _tmp11_ + 1; +#line 3549 "Commands.c" } #line 72 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = FALSE; + _tmp10_ = FALSE; #line 72 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = i; + _tmp12_ = i; #line 72 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = count; + _tmp13_ = count; #line 72 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp13_ < _tmp14_)) { + if (!(_tmp12_ < _tmp13_)) { #line 72 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 3034 "Commands.c" +#line 3561 "Commands.c" } #line 73 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = self->priv->collection_page; + _tmp14_ = self->priv->collection_page; #line 73 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE, Page)); + _tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PAGE, Page)); #line 73 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 73 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = i; + _tmp17_ = i; #line 73 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection), _tmp18_); + _tmp18_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_COLLECTION, DataCollection), _tmp17_); #line 73 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_THUMBNAIL, Thumbnail); + _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_THUMBNAIL, Thumbnail); #line 73 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = thumbnail_get_media_source (_tmp20_); + _tmp20_ = thumbnail_get_media_source (_tmp19_); #line 73 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 73 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = self->priv->library_photo; + _tmp22_ = self->priv->library_photo; #line 73 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = _tmp22_ == G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp23_ = _tmp21_ == G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_MEDIA_SOURCE, MediaSource); #line 73 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp22_); + _g_object_unref0 (_tmp21_); #line 73 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp19_); #line 73 "/home/jens/Source/shotwell/src/Commands.vala" - _data_collection_unref0 (_tmp17_); + _data_collection_unref0 (_tmp16_); #line 73 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp24_) { + if (_tmp23_) { #line 74 "/home/jens/Source/shotwell/src/Commands.vala" photo_in_collection = TRUE; #line 75 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 3068 "Commands.c" +#line 3595 "Commands.c" } } } } #line 79 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = photo_in_collection; + _tmp24_ = photo_in_collection; #line 79 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp25_) { -#line 3077 "Commands.c" + if (_tmp24_) { +#line 3604 "Commands.c" + LibraryWindow* _tmp25_; LibraryWindow* _tmp26_; - LibraryWindow* _tmp27_; - CollectionPage* _tmp28_; - Photo* _tmp29_; + CollectionPage* _tmp27_; + Photo* _tmp28_; #line 80 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = library_window_get_app (); + _tmp25_ = library_window_get_app (); #line 80 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = _tmp26_; + _tmp26_ = _tmp25_; #line 80 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp28_ = self->priv->collection_page; + _tmp27_ = self->priv->collection_page; #line 80 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp29_ = self->priv->library_photo; + _tmp28_ = self->priv->library_photo; #line 80 "/home/jens/Source/shotwell/src/Commands.vala" - library_window_switch_to_photo_page (_tmp27_, _tmp28_, _tmp29_); + library_window_switch_to_photo_page (_tmp26_, _tmp27_, _tmp28_); #line 80 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp27_); -#line 3094 "Commands.c" + _g_object_unref0 (_tmp26_); +#line 3621 "Commands.c" } } } else { - Page* _tmp30_; + Page* _tmp29_; #line 82 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp30_ = self->priv->page; + _tmp29_ = self->priv->page; #line 82 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp30_ != NULL) { -#line 3103 "Commands.c" + if (_tmp29_ != NULL) { +#line 3630 "Commands.c" + AppWindow* _tmp30_; AppWindow* _tmp31_; - AppWindow* _tmp32_; - Page* _tmp33_; + Page* _tmp32_; #line 83 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp31_ = app_window_get_instance (); + _tmp30_ = app_window_get_instance (); #line 83 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp32_ = _tmp31_; + _tmp31_ = _tmp30_; #line 83 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp33_ = self->priv->page; + _tmp32_ = self->priv->page; #line 83 "/home/jens/Source/shotwell/src/Commands.vala" - page_window_set_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_PAGE_WINDOW, PageWindow), _tmp33_); + page_window_set_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PAGE_WINDOW, PageWindow), _tmp32_); #line 83 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp32_); -#line 3117 "Commands.c" + _g_object_unref0 (_tmp31_); +#line 3644 "Commands.c" } } #line 65 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (photo_page); -#line 3122 "Commands.c" +#line 3649 "Commands.c" } -static void page_command_on_page_destroyed (PageCommand* self) { +static void +page_command_on_page_destroyed (PageCommand* self) +{ Page* _tmp0_; guint _tmp1_; #line 86 "/home/jens/Source/shotwell/src/Commands.vala" @@ -3137,11 +3666,13 @@ static void page_command_on_page_destroyed (PageCommand* self) { _g_object_unref0 (self->priv->page); #line 88 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->page = NULL; -#line 3141 "Commands.c" +#line 3670 "Commands.c" } -static void page_command_on_photo_destroyed (PageCommand* self) { +static void +page_command_on_photo_destroyed (PageCommand* self) +{ Photo* _tmp0_; guint _tmp1_; #line 91 "/home/jens/Source/shotwell/src/Commands.vala" @@ -3156,11 +3687,13 @@ static void page_command_on_photo_destroyed (PageCommand* self) { _g_object_unref0 (self->priv->library_photo); #line 93 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->library_photo = NULL; -#line 3160 "Commands.c" +#line 3691 "Commands.c" } -static void page_command_on_controller_destroyed (PageCommand* self) { +static void +page_command_on_controller_destroyed (PageCommand* self) +{ CollectionPage* _tmp0_; guint _tmp1_; #line 96 "/home/jens/Source/shotwell/src/Commands.vala" @@ -3175,11 +3708,13 @@ static void page_command_on_controller_destroyed (PageCommand* self) { _g_object_unref0 (self->priv->collection_page); #line 98 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->collection_page = NULL; -#line 3179 "Commands.c" +#line 3712 "Commands.c" } -static void page_command_class_init (PageCommandClass * klass) { +static void +page_command_class_init (PageCommandClass * klass) +{ #line 9 "/home/jens/Source/shotwell/src/Commands.vala" page_command_parent_class = g_type_class_peek_parent (klass); #line 9 "/home/jens/Source/shotwell/src/Commands.vala" @@ -3188,11 +3723,13 @@ static void page_command_class_init (PageCommandClass * klass) { ((CommandClass *) klass)->prepare = (void (*) (Command *)) page_command_real_prepare; #line 9 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = page_command_finalize; -#line 3192 "Commands.c" +#line 3727 "Commands.c" } -static void page_command_instance_init (PageCommand * self) { +static void +page_command_instance_init (PageCommand * self) +{ #line 9 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = PAGE_COMMAND_GET_PRIVATE (self); #line 11 "/home/jens/Source/shotwell/src/Commands.vala" @@ -3201,11 +3738,13 @@ static void page_command_instance_init (PageCommand * self) { self->priv->library_photo = NULL; #line 13 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->collection_page = NULL; -#line 3205 "Commands.c" +#line 3742 "Commands.c" } -static void page_command_finalize (GObject * obj) { +static void +page_command_finalize (GObject * obj) +{ PageCommand * self; Page* _tmp0_; Photo* _tmp3_; @@ -3216,7 +3755,7 @@ static void page_command_finalize (GObject * obj) { _tmp0_ = self->priv->page; #line 44 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp0_ != NULL) { -#line 3220 "Commands.c" +#line 3759 "Commands.c" Page* _tmp1_; guint _tmp2_; #line 45 "/home/jens/Source/shotwell/src/Commands.vala" @@ -3225,13 +3764,13 @@ static void page_command_finalize (GObject * obj) { g_signal_parse_name ("destroy", gtk_widget_get_type (), &_tmp2_, NULL, FALSE); #line 45 "/home/jens/Source/shotwell/src/Commands.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _page_command_on_page_destroyed_gtk_widget_destroy, self); -#line 3229 "Commands.c" +#line 3768 "Commands.c" } #line 47 "/home/jens/Source/shotwell/src/Commands.vala" _tmp3_ = self->priv->library_photo; #line 47 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp3_ != NULL) { -#line 3235 "Commands.c" +#line 3774 "Commands.c" Photo* _tmp4_; guint _tmp5_; #line 48 "/home/jens/Source/shotwell/src/Commands.vala" @@ -3240,13 +3779,13 @@ static void page_command_finalize (GObject * obj) { g_signal_parse_name ("destroyed", TYPE_DATA_SOURCE, &_tmp5_, NULL, FALSE); #line 48 "/home/jens/Source/shotwell/src/Commands.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _page_command_on_photo_destroyed_data_source_destroyed, self); -#line 3244 "Commands.c" +#line 3783 "Commands.c" } #line 50 "/home/jens/Source/shotwell/src/Commands.vala" _tmp6_ = self->priv->collection_page; #line 50 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp6_ != NULL) { -#line 3250 "Commands.c" +#line 3789 "Commands.c" CollectionPage* _tmp7_; guint _tmp8_; #line 51 "/home/jens/Source/shotwell/src/Commands.vala" @@ -3255,7 +3794,7 @@ static void page_command_finalize (GObject * obj) { g_signal_parse_name ("destroy", gtk_widget_get_type (), &_tmp8_, NULL, FALSE); #line 51 "/home/jens/Source/shotwell/src/Commands.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _page_command_on_controller_destroyed_gtk_widget_destroy, self); -#line 3259 "Commands.c" +#line 3798 "Commands.c" } #line 10 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->page); @@ -3265,11 +3804,13 @@ static void page_command_finalize (GObject * obj) { _g_object_unref0 (self->priv->collection_page); #line 9 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (page_command_parent_class)->finalize (obj); -#line 3269 "Commands.c" +#line 3808 "Commands.c" } -GType page_command_get_type (void) { +GType +page_command_get_type (void) +{ static volatile gsize page_command_type_id__volatile = 0; if (g_once_init_enter (&page_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PageCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) page_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PageCommand), 0, (GInstanceInitFunc) page_command_instance_init, NULL }; @@ -3281,20 +3822,24 @@ GType page_command_get_type (void) { } -static void _single_data_source_command_on_source_destroyed_data_source_destroyed (DataSource* _sender, gpointer self) { +static void +_single_data_source_command_on_source_destroyed_data_source_destroyed (DataSource* _sender, + gpointer self) +{ #line 115 "/home/jens/Source/shotwell/src/Commands.vala" single_data_source_command_on_source_destroyed ((SingleDataSourceCommand*) self); -#line 3288 "Commands.c" +#line 3832 "Commands.c" } -SingleDataSourceCommand* single_data_source_command_construct (GType object_type, DataSource* source, const gchar* name, const gchar* explanation) { +SingleDataSourceCommand* +single_data_source_command_construct (GType object_type, + DataSource* source, + const gchar* name, + const gchar* explanation) +{ SingleDataSourceCommand * self = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - DataSource* _tmp2_; - DataSource* _tmp3_; - DataSource* _tmp4_; + DataSource* _tmp0_; #line 106 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 106 "/home/jens/Source/shotwell/src/Commands.vala" @@ -3302,30 +3847,24 @@ SingleDataSourceCommand* single_data_source_command_construct (GType object_type #line 106 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (explanation != NULL, NULL); #line 107 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = name; -#line 107 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = explanation; -#line 107 "/home/jens/Source/shotwell/src/Commands.vala" - self = (SingleDataSourceCommand*) page_command_construct (object_type, _tmp0_, _tmp1_); + self = (SingleDataSourceCommand*) page_command_construct (object_type, name, explanation); #line 109 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = source; -#line 109 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp0_ = _g_object_ref0 (source); #line 109 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->source); #line 109 "/home/jens/Source/shotwell/src/Commands.vala" - self->source = _tmp3_; -#line 111 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = source; + self->source = _tmp0_; #line 111 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (_tmp4_, "destroyed", (GCallback) _single_data_source_command_on_source_destroyed_data_source_destroyed, self, 0); + g_signal_connect_object (source, "destroyed", (GCallback) _single_data_source_command_on_source_destroyed_data_source_destroyed, self, 0); #line 106 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 3325 "Commands.c" +#line 3862 "Commands.c" } -DataSource* single_data_source_command_get_source (SingleDataSourceCommand* self) { +DataSource* +single_data_source_command_get_source (SingleDataSourceCommand* self) +{ DataSource* result = NULL; DataSource* _tmp0_; DataSource* _tmp1_; @@ -3339,11 +3878,13 @@ DataSource* single_data_source_command_get_source (SingleDataSourceCommand* self result = _tmp1_; #line 119 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 3343 "Commands.c" +#line 3882 "Commands.c" } -static void single_data_source_command_on_source_destroyed (SingleDataSourceCommand* self) { +static void +single_data_source_command_on_source_destroyed (SingleDataSourceCommand* self) +{ CommandManager* _tmp0_; CommandManager* _tmp1_; #line 122 "/home/jens/Source/shotwell/src/Commands.vala" @@ -3356,24 +3897,30 @@ static void single_data_source_command_on_source_destroyed (SingleDataSourceComm command_manager_reset (_tmp1_); #line 125 "/home/jens/Source/shotwell/src/Commands.vala" _command_manager_unref0 (_tmp1_); -#line 3360 "Commands.c" +#line 3901 "Commands.c" } -static void single_data_source_command_class_init (SingleDataSourceCommandClass * klass) { +static void +single_data_source_command_class_init (SingleDataSourceCommandClass * klass) +{ #line 103 "/home/jens/Source/shotwell/src/Commands.vala" single_data_source_command_parent_class = g_type_class_peek_parent (klass); #line 103 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = single_data_source_command_finalize; -#line 3369 "Commands.c" +#line 3912 "Commands.c" } -static void single_data_source_command_instance_init (SingleDataSourceCommand * self) { +static void +single_data_source_command_instance_init (SingleDataSourceCommand * self) +{ } -static void single_data_source_command_finalize (GObject * obj) { +static void +single_data_source_command_finalize (GObject * obj) +{ SingleDataSourceCommand * self; DataSource* _tmp0_; guint _tmp1_; @@ -3389,11 +3936,13 @@ static void single_data_source_command_finalize (GObject * obj) { _g_object_unref0 (self->source); #line 103 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (single_data_source_command_parent_class)->finalize (obj); -#line 3393 "Commands.c" +#line 3940 "Commands.c" } -GType single_data_source_command_get_type (void) { +GType +single_data_source_command_get_type (void) +{ static volatile gsize single_data_source_command_type_id__volatile = 0; if (g_once_init_enter (&single_data_source_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SingleDataSourceCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) single_data_source_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SingleDataSourceCommand), 0, (GInstanceInitFunc) single_data_source_command_instance_init, NULL }; @@ -3405,20 +3954,25 @@ GType single_data_source_command_get_type (void) { } -static void _simple_proxyable_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) { +static void +_simple_proxyable_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, + gpointer self) +{ #line 141 "/home/jens/Source/shotwell/src/Commands.vala" simple_proxyable_command_on_proxy_broken ((SimpleProxyableCommand*) self); -#line 3412 "Commands.c" +#line 3964 "Commands.c" } -SimpleProxyableCommand* simple_proxyable_command_construct (GType object_type, Proxyable* proxyable, const gchar* name, const gchar* explanation) { +SimpleProxyableCommand* +simple_proxyable_command_construct (GType object_type, + Proxyable* proxyable, + const gchar* name, + const gchar* explanation) +{ SimpleProxyableCommand * self = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - Proxyable* _tmp2_; - SourceProxy* _tmp3_; - SourceProxy* _tmp4_; + SourceProxy* _tmp0_; + SourceProxy* _tmp1_; #line 133 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_PROXYABLE (proxyable), NULL); #line 133 "/home/jens/Source/shotwell/src/Commands.vala" @@ -3426,30 +3980,26 @@ SimpleProxyableCommand* simple_proxyable_command_construct (GType object_type, P #line 133 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (explanation != NULL, NULL); #line 134 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = name; -#line 134 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = explanation; -#line 134 "/home/jens/Source/shotwell/src/Commands.vala" - self = (SimpleProxyableCommand*) page_command_construct (object_type, _tmp0_, _tmp1_); + self = (SimpleProxyableCommand*) page_command_construct (object_type, name, explanation); #line 136 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = proxyable; -#line 136 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = proxyable_get_proxy (_tmp2_); + _tmp0_ = proxyable_get_proxy (proxyable); #line 136 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (self->priv->proxy); #line 136 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->proxy = _tmp3_; + self->priv->proxy = _tmp0_; #line 137 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = self->priv->proxy; + _tmp1_ = self->priv->proxy; #line 137 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (_tmp4_, "broken", (GCallback) _simple_proxyable_command_on_proxy_broken_source_proxy_broken, self, 0); + g_signal_connect_object (_tmp1_, "broken", (GCallback) _simple_proxyable_command_on_proxy_broken_source_proxy_broken, self, 0); #line 133 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 3449 "Commands.c" +#line 3997 "Commands.c" } -static void simple_proxyable_command_real_execute (Command* base) { +static void +simple_proxyable_command_real_execute (Command* base) +{ SimpleProxyableCommand * self; SourceProxy* _tmp0_; DataSource* _tmp1_; @@ -3466,29 +4016,37 @@ static void simple_proxyable_command_real_execute (Command* base) { simple_proxyable_command_execute_on_source (self, _tmp2_); #line 146 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_tmp2_); -#line 3470 "Commands.c" +#line 4020 "Commands.c" } -static void simple_proxyable_command_real_execute_on_source (SimpleProxyableCommand* self, DataSource* source) { +static void +simple_proxyable_command_real_execute_on_source (SimpleProxyableCommand* self, + DataSource* source) +{ #line 149 "/home/jens/Source/shotwell/src/Commands.vala" g_critical ("Type `%s' does not implement abstract method `simple_proxyable_command_execute_on_source'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 149 "/home/jens/Source/shotwell/src/Commands.vala" return; -#line 3479 "Commands.c" +#line 4032 "Commands.c" } -void simple_proxyable_command_execute_on_source (SimpleProxyableCommand* self, DataSource* source) { +void +simple_proxyable_command_execute_on_source (SimpleProxyableCommand* self, + DataSource* source) +{ #line 149 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_SIMPLE_PROXYABLE_COMMAND (self)); #line 149 "/home/jens/Source/shotwell/src/Commands.vala" SIMPLE_PROXYABLE_COMMAND_GET_CLASS (self)->execute_on_source (self, source); -#line 3488 "Commands.c" +#line 4044 "Commands.c" } -static void simple_proxyable_command_real_undo (Command* base) { +static void +simple_proxyable_command_real_undo (Command* base) +{ SimpleProxyableCommand * self; SourceProxy* _tmp0_; DataSource* _tmp1_; @@ -3505,108 +4063,113 @@ static void simple_proxyable_command_real_undo (Command* base) { simple_proxyable_command_undo_on_source (self, _tmp2_); #line 152 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_tmp2_); -#line 3509 "Commands.c" +#line 4067 "Commands.c" } -static void simple_proxyable_command_real_undo_on_source (SimpleProxyableCommand* self, DataSource* source) { +static void +simple_proxyable_command_real_undo_on_source (SimpleProxyableCommand* self, + DataSource* source) +{ #line 155 "/home/jens/Source/shotwell/src/Commands.vala" g_critical ("Type `%s' does not implement abstract method `simple_proxyable_command_undo_on_source'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 155 "/home/jens/Source/shotwell/src/Commands.vala" return; -#line 3518 "Commands.c" +#line 4079 "Commands.c" } -void simple_proxyable_command_undo_on_source (SimpleProxyableCommand* self, DataSource* source) { +void +simple_proxyable_command_undo_on_source (SimpleProxyableCommand* self, + DataSource* source) +{ #line 155 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_SIMPLE_PROXYABLE_COMMAND (self)); #line 155 "/home/jens/Source/shotwell/src/Commands.vala" SIMPLE_PROXYABLE_COMMAND_GET_CLASS (self)->undo_on_source (self, source); -#line 3527 "Commands.c" +#line 4091 "Commands.c" } -void simple_proxyable_command_add_proxyables (SimpleProxyableCommand* self, GeeCollection* proxyables) { +void +simple_proxyable_command_add_proxyables (SimpleProxyableCommand* self, + GeeCollection* proxyables) +{ #line 161 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_SIMPLE_PROXYABLE_COMMAND (self)); #line 161 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (GEE_IS_COLLECTION (proxyables)); -#line 3536 "Commands.c" +#line 4103 "Commands.c" { GeeIterator* _proxyable_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 162 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = proxyables; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (proxyables, GEE_TYPE_ITERABLE, GeeIterable)); #line 162 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 162 "/home/jens/Source/shotwell/src/Commands.vala" - _proxyable_it = _tmp1_; + _proxyable_it = _tmp0_; #line 162 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 3549 "Commands.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 4113 "Commands.c" + GeeIterator* _tmp1_; Proxyable* proxyable = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; SourceProxy* added_proxy = NULL; - Proxyable* _tmp6_; - SourceProxy* _tmp7_; + Proxyable* _tmp4_; + SourceProxy* _tmp5_; + SourceProxy* _tmp6_; + GeeHashSet* _tmp7_; SourceProxy* _tmp8_; - GeeHashSet* _tmp9_; - SourceProxy* _tmp10_; -#line 162 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _proxyable_it; #line 162 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _proxyable_it; #line 162 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 162 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 3569 "Commands.c" +#line 4130 "Commands.c" } #line 162 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _proxyable_it; + _tmp2_ = _proxyable_it; #line 162 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 162 "/home/jens/Source/shotwell/src/Commands.vala" - proxyable = (Proxyable*) _tmp5_; + proxyable = (Proxyable*) _tmp3_; #line 163 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = proxyable; + _tmp4_ = proxyable; #line 163 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = proxyable_get_proxy (_tmp6_); + _tmp5_ = proxyable_get_proxy (_tmp4_); #line 163 "/home/jens/Source/shotwell/src/Commands.vala" - added_proxy = _tmp7_; + added_proxy = _tmp5_; #line 164 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = added_proxy; + _tmp6_ = added_proxy; #line 164 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (_tmp8_, "broken", (GCallback) _simple_proxyable_command_on_proxy_broken_source_proxy_broken, self, 0); + g_signal_connect_object (_tmp6_, "broken", (GCallback) _simple_proxyable_command_on_proxy_broken_source_proxy_broken, self, 0); #line 165 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = self->priv->proxies; + _tmp7_ = self->priv->proxies; #line 165 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = added_proxy; + _tmp8_ = added_proxy; #line 165 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_); #line 162 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (added_proxy); #line 162 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (proxyable); -#line 3597 "Commands.c" +#line 4158 "Commands.c" } #line 162 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_proxyable_it); -#line 3601 "Commands.c" +#line 4162 "Commands.c" } } -void simple_proxyable_command_clear_added_proxies (SimpleProxyableCommand* self) { - GeeHashSet* _tmp8_; +void +simple_proxyable_command_clear_added_proxies (SimpleProxyableCommand* self) +{ + GeeHashSet* _tmp7_; #line 170 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_SIMPLE_PROXYABLE_COMMAND (self)); -#line 3610 "Commands.c" +#line 4173 "Commands.c" { GeeIterator* _added_proxy_it = NULL; GeeHashSet* _tmp0_; @@ -3619,53 +4182,52 @@ void simple_proxyable_command_clear_added_proxies (SimpleProxyableCommand* self) _added_proxy_it = _tmp1_; #line 171 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 3623 "Commands.c" +#line 4186 "Commands.c" GeeIterator* _tmp2_; - gboolean _tmp3_; SourceProxy* added_proxy = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - SourceProxy* _tmp6_; - guint _tmp7_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + SourceProxy* _tmp5_; + guint _tmp6_; #line 171 "/home/jens/Source/shotwell/src/Commands.vala" _tmp2_ = _added_proxy_it; #line 171 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 171 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 171 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 3639 "Commands.c" +#line 4199 "Commands.c" } #line 171 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _added_proxy_it; + _tmp3_ = _added_proxy_it; #line 171 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 171 "/home/jens/Source/shotwell/src/Commands.vala" - added_proxy = (SourceProxy*) _tmp5_; + added_proxy = (SourceProxy*) _tmp4_; #line 172 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = added_proxy; + _tmp5_ = added_proxy; #line 172 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_parse_name ("broken", TYPE_SOURCE_PROXY, &_tmp7_, NULL, FALSE); + g_signal_parse_name ("broken", TYPE_SOURCE_PROXY, &_tmp6_, NULL, FALSE); #line 172 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _simple_proxyable_command_on_proxy_broken_source_proxy_broken, self); + g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _simple_proxyable_command_on_proxy_broken_source_proxy_broken, self); #line 171 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (added_proxy); -#line 3655 "Commands.c" +#line 4215 "Commands.c" } #line 171 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_added_proxy_it); -#line 3659 "Commands.c" +#line 4219 "Commands.c" } #line 174 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = self->priv->proxies; + _tmp7_ = self->priv->proxies; #line 174 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 3665 "Commands.c" + gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); +#line 4225 "Commands.c" } -static void simple_proxyable_command_on_proxy_broken (SimpleProxyableCommand* self) { +static void +simple_proxyable_command_on_proxy_broken (SimpleProxyableCommand* self) +{ CommandManager* _tmp0_; CommandManager* _tmp1_; #line 177 "/home/jens/Source/shotwell/src/Commands.vala" @@ -3680,11 +4242,13 @@ static void simple_proxyable_command_on_proxy_broken (SimpleProxyableCommand* se command_manager_reset (_tmp1_); #line 179 "/home/jens/Source/shotwell/src/Commands.vala" _command_manager_unref0 (_tmp1_); -#line 3684 "Commands.c" +#line 4246 "Commands.c" } -static void simple_proxyable_command_class_init (SimpleProxyableCommandClass * klass) { +static void +simple_proxyable_command_class_init (SimpleProxyableCommandClass * klass) +{ #line 129 "/home/jens/Source/shotwell/src/Commands.vala" simple_proxyable_command_parent_class = g_type_class_peek_parent (klass); #line 129 "/home/jens/Source/shotwell/src/Commands.vala" @@ -3699,11 +4263,13 @@ static void simple_proxyable_command_class_init (SimpleProxyableCommandClass * k ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) simple_proxyable_command_real_undo_on_source; #line 129 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = simple_proxyable_command_finalize; -#line 3703 "Commands.c" +#line 4267 "Commands.c" } -static void simple_proxyable_command_instance_init (SimpleProxyableCommand * self) { +static void +simple_proxyable_command_instance_init (SimpleProxyableCommand * self) +{ GeeHashSet* _tmp0_; #line 129 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = SIMPLE_PROXYABLE_COMMAND_GET_PRIVATE (self); @@ -3711,11 +4277,13 @@ static void simple_proxyable_command_instance_init (SimpleProxyableCommand * sel _tmp0_ = gee_hash_set_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 131 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->proxies = _tmp0_; -#line 3715 "Commands.c" +#line 4281 "Commands.c" } -static void simple_proxyable_command_finalize (GObject * obj) { +static void +simple_proxyable_command_finalize (GObject * obj) +{ SimpleProxyableCommand * self; SourceProxy* _tmp0_; guint _tmp1_; @@ -3735,11 +4303,13 @@ static void simple_proxyable_command_finalize (GObject * obj) { _g_object_unref0 (self->priv->proxies); #line 129 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (simple_proxyable_command_parent_class)->finalize (obj); -#line 3739 "Commands.c" +#line 4307 "Commands.c" } -GType simple_proxyable_command_get_type (void) { +GType +simple_proxyable_command_get_type (void) +{ static volatile gsize simple_proxyable_command_type_id__volatile = 0; if (g_once_init_enter (&simple_proxyable_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SimpleProxyableCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) simple_proxyable_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SimpleProxyableCommand), 0, (GInstanceInitFunc) simple_proxyable_command_instance_init, NULL }; @@ -3751,21 +4321,25 @@ GType simple_proxyable_command_get_type (void) { } -static void _single_photo_transformation_command_on_state_broken_photo_transformation_state_broken (PhotoTransformationState* _sender, gpointer self) { +static void +_single_photo_transformation_command_on_state_broken_photo_transformation_state_broken (PhotoTransformationState* _sender, + gpointer self) +{ #line 194 "/home/jens/Source/shotwell/src/Commands.vala" single_photo_transformation_command_on_state_broken ((SinglePhotoTransformationCommand*) self); -#line 3758 "Commands.c" +#line 4331 "Commands.c" } -SinglePhotoTransformationCommand* single_photo_transformation_command_construct (GType object_type, Photo* photo, const gchar* name, const gchar* explanation) { +SinglePhotoTransformationCommand* +single_photo_transformation_command_construct (GType object_type, + Photo* photo, + const gchar* name, + const gchar* explanation) +{ SinglePhotoTransformationCommand * self = NULL; - Photo* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - Photo* _tmp3_; - PhotoTransformationState* _tmp4_; - PhotoTransformationState* _tmp5_; + PhotoTransformationState* _tmp0_; + PhotoTransformationState* _tmp1_; #line 186 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); #line 186 "/home/jens/Source/shotwell/src/Commands.vala" @@ -3773,32 +4347,26 @@ SinglePhotoTransformationCommand* single_photo_transformation_command_construct #line 186 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (explanation != NULL, NULL); #line 187 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = photo; -#line 187 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = name; -#line 187 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = explanation; -#line 187 "/home/jens/Source/shotwell/src/Commands.vala" - self = (SinglePhotoTransformationCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource), _tmp1_, _tmp2_); + self = (SinglePhotoTransformationCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_SOURCE, DataSource), name, explanation); #line 189 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = photo; -#line 189 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = photo_save_transformation_state (_tmp3_); + _tmp0_ = photo_save_transformation_state (photo); #line 189 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->state); #line 189 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->state = _tmp4_; + self->priv->state = _tmp0_; #line 190 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = self->priv->state; + _tmp1_ = self->priv->state; #line 190 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (_tmp5_, "broken", (GCallback) _single_photo_transformation_command_on_state_broken_photo_transformation_state_broken, self, 0); + g_signal_connect_object (_tmp1_, "broken", (GCallback) _single_photo_transformation_command_on_state_broken_photo_transformation_state_broken, self, 0); #line 186 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 3798 "Commands.c" +#line 4364 "Commands.c" } -static void single_photo_transformation_command_real_undo (Command* base) { +static void +single_photo_transformation_command_real_undo (Command* base) +{ SinglePhotoTransformationCommand * self; DataSource* _tmp0_; PhotoTransformationState* _tmp1_; @@ -3810,11 +4378,13 @@ static void single_photo_transformation_command_real_undo (Command* base) { _tmp1_ = self->priv->state; #line 198 "/home/jens/Source/shotwell/src/Commands.vala" photo_load_transformation_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp1_); -#line 3814 "Commands.c" +#line 4382 "Commands.c" } -static void single_photo_transformation_command_on_state_broken (SinglePhotoTransformationCommand* self) { +static void +single_photo_transformation_command_on_state_broken (SinglePhotoTransformationCommand* self) +{ CommandManager* _tmp0_; CommandManager* _tmp1_; #line 201 "/home/jens/Source/shotwell/src/Commands.vala" @@ -3827,11 +4397,13 @@ static void single_photo_transformation_command_on_state_broken (SinglePhotoTran command_manager_reset (_tmp1_); #line 202 "/home/jens/Source/shotwell/src/Commands.vala" _command_manager_unref0 (_tmp1_); -#line 3831 "Commands.c" +#line 4401 "Commands.c" } -static void single_photo_transformation_command_class_init (SinglePhotoTransformationCommandClass * klass) { +static void +single_photo_transformation_command_class_init (SinglePhotoTransformationCommandClass * klass) +{ #line 183 "/home/jens/Source/shotwell/src/Commands.vala" single_photo_transformation_command_parent_class = g_type_class_peek_parent (klass); #line 183 "/home/jens/Source/shotwell/src/Commands.vala" @@ -3840,18 +4412,22 @@ static void single_photo_transformation_command_class_init (SinglePhotoTransform ((CommandClass *) klass)->undo = (void (*) (Command *)) single_photo_transformation_command_real_undo; #line 183 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = single_photo_transformation_command_finalize; -#line 3844 "Commands.c" +#line 4416 "Commands.c" } -static void single_photo_transformation_command_instance_init (SinglePhotoTransformationCommand * self) { +static void +single_photo_transformation_command_instance_init (SinglePhotoTransformationCommand * self) +{ #line 183 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = SINGLE_PHOTO_TRANSFORMATION_COMMAND_GET_PRIVATE (self); -#line 3851 "Commands.c" +#line 4425 "Commands.c" } -static void single_photo_transformation_command_finalize (GObject * obj) { +static void +single_photo_transformation_command_finalize (GObject * obj) +{ SinglePhotoTransformationCommand * self; PhotoTransformationState* _tmp0_; guint _tmp1_; @@ -3867,11 +4443,13 @@ static void single_photo_transformation_command_finalize (GObject * obj) { _g_object_unref0 (self->priv->state); #line 183 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (single_photo_transformation_command_parent_class)->finalize (obj); -#line 3871 "Commands.c" +#line 4447 "Commands.c" } -GType single_photo_transformation_command_get_type (void) { +GType +single_photo_transformation_command_get_type (void) +{ static volatile gsize single_photo_transformation_command_type_id__volatile = 0; if (g_once_init_enter (&single_photo_transformation_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SinglePhotoTransformationCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) single_photo_transformation_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SinglePhotoTransformationCommand), 0, (GInstanceInitFunc) single_photo_transformation_command_instance_init, NULL }; @@ -3883,18 +4461,23 @@ GType single_photo_transformation_command_get_type (void) { } -static void _generic_photo_transformation_command_on_state_broken_photo_transformation_state_broken (PhotoTransformationState* _sender, gpointer self) { +static void +_generic_photo_transformation_command_on_state_broken_photo_transformation_state_broken (PhotoTransformationState* _sender, + gpointer self) +{ #line 216 "/home/jens/Source/shotwell/src/Commands.vala" generic_photo_transformation_command_on_state_broken ((GenericPhotoTransformationCommand*) self); -#line 3890 "Commands.c" +#line 4471 "Commands.c" } -GenericPhotoTransformationCommand* generic_photo_transformation_command_construct (GType object_type, Photo* photo, const gchar* name, const gchar* explanation) { +GenericPhotoTransformationCommand* +generic_photo_transformation_command_construct (GType object_type, + Photo* photo, + const gchar* name, + const gchar* explanation) +{ GenericPhotoTransformationCommand * self = NULL; - Photo* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; #line 210 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); #line 210 "/home/jens/Source/shotwell/src/Commands.vala" @@ -3902,20 +4485,16 @@ GenericPhotoTransformationCommand* generic_photo_transformation_command_construc #line 210 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (explanation != NULL, NULL); #line 211 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = photo; -#line 211 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = name; -#line 211 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = explanation; -#line 211 "/home/jens/Source/shotwell/src/Commands.vala" - self = (GenericPhotoTransformationCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource), _tmp1_, _tmp2_); + self = (GenericPhotoTransformationCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_SOURCE, DataSource), name, explanation); #line 210 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 3915 "Commands.c" +#line 4492 "Commands.c" } -static void generic_photo_transformation_command_real_execute (Command* base) { +static void +generic_photo_transformation_command_real_execute (Command* base) +{ GenericPhotoTransformationCommand * self; Photo* photo = NULL; DataSource* _tmp0_; @@ -3956,29 +4535,37 @@ static void generic_photo_transformation_command_real_execute (Command* base) { g_signal_connect_object (_tmp5_, "broken", (GCallback) _generic_photo_transformation_command_on_state_broken_photo_transformation_state_broken, self, 0); #line 222 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (photo); -#line 3960 "Commands.c" +#line 4539 "Commands.c" } -static void generic_photo_transformation_command_real_execute_on_photo (GenericPhotoTransformationCommand* self, Photo* photo) { +static void +generic_photo_transformation_command_real_execute_on_photo (GenericPhotoTransformationCommand* self, + Photo* photo) +{ #line 234 "/home/jens/Source/shotwell/src/Commands.vala" g_critical ("Type `%s' does not implement abstract method `generic_photo_transformation_command_execute_on_photo'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 234 "/home/jens/Source/shotwell/src/Commands.vala" return; -#line 3969 "Commands.c" +#line 4551 "Commands.c" } -void generic_photo_transformation_command_execute_on_photo (GenericPhotoTransformationCommand* self, Photo* photo) { +void +generic_photo_transformation_command_execute_on_photo (GenericPhotoTransformationCommand* self, + Photo* photo) +{ #line 234 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_GENERIC_PHOTO_TRANSFORMATION_COMMAND (self)); #line 234 "/home/jens/Source/shotwell/src/Commands.vala" GENERIC_PHOTO_TRANSFORMATION_COMMAND_GET_CLASS (self)->execute_on_photo (self, photo); -#line 3978 "Commands.c" +#line 4563 "Commands.c" } -static void generic_photo_transformation_command_real_undo (Command* base) { +static void +generic_photo_transformation_command_real_undo (Command* base) +{ GenericPhotoTransformationCommand * self; DataSource* _tmp0_; PhotoTransformationState* _tmp1_; @@ -3990,11 +4577,13 @@ static void generic_photo_transformation_command_real_undo (Command* base) { _tmp1_ = self->priv->original_state; #line 238 "/home/jens/Source/shotwell/src/Commands.vala" photo_load_transformation_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp1_); -#line 3994 "Commands.c" +#line 4581 "Commands.c" } -static void generic_photo_transformation_command_real_redo (Command* base) { +static void +generic_photo_transformation_command_real_redo (Command* base) +{ GenericPhotoTransformationCommand * self; DataSource* _tmp0_; PhotoTransformationState* _tmp1_; @@ -4006,11 +4595,14 @@ static void generic_photo_transformation_command_real_redo (Command* base) { _tmp1_ = self->priv->transformed_state; #line 243 "/home/jens/Source/shotwell/src/Commands.vala" photo_load_transformation_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp1_); -#line 4010 "Commands.c" +#line 4599 "Commands.c" } -static gboolean generic_photo_transformation_command_real_can_compress (GenericPhotoTransformationCommand* self, Command* command) { +static gboolean +generic_photo_transformation_command_real_can_compress (GenericPhotoTransformationCommand* self, + Command* command) +{ gboolean result = FALSE; #line 246 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_COMMAND (command), FALSE); @@ -4018,110 +4610,109 @@ static gboolean generic_photo_transformation_command_real_can_compress (GenericP result = FALSE; #line 247 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 4022 "Commands.c" +#line 4614 "Commands.c" } -gboolean generic_photo_transformation_command_can_compress (GenericPhotoTransformationCommand* self, Command* command) { +gboolean +generic_photo_transformation_command_can_compress (GenericPhotoTransformationCommand* self, + Command* command) +{ #line 246 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_GENERIC_PHOTO_TRANSFORMATION_COMMAND (self), FALSE); #line 246 "/home/jens/Source/shotwell/src/Commands.vala" return GENERIC_PHOTO_TRANSFORMATION_COMMAND_GET_CLASS (self)->can_compress (self, command); -#line 4031 "Commands.c" +#line 4626 "Commands.c" } -static gboolean generic_photo_transformation_command_real_compress (Command* base, Command* command) { +static gboolean +generic_photo_transformation_command_real_compress (Command* base, + Command* command) +{ GenericPhotoTransformationCommand * self; gboolean result = FALSE; - Command* _tmp0_; - gboolean _tmp1_; GenericPhotoTransformationCommand* generic = NULL; - Command* _tmp2_; - GenericPhotoTransformationCommand* _tmp3_; - GenericPhotoTransformationCommand* _tmp4_; + GenericPhotoTransformationCommand* _tmp0_; + GenericPhotoTransformationCommand* _tmp1_; + GenericPhotoTransformationCommand* _tmp2_; + DataSource* _tmp3_; + DataSource* _tmp4_; GenericPhotoTransformationCommand* _tmp5_; - DataSource* _tmp6_; - DataSource* _tmp7_; - GenericPhotoTransformationCommand* _tmp8_; - GenericPhotoTransformationCommand* _tmp9_; - PhotoTransformationState* _tmp10_; - PhotoTransformationState* _tmp11_; + GenericPhotoTransformationCommand* _tmp6_; + PhotoTransformationState* _tmp7_; + PhotoTransformationState* _tmp8_; #line 250 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GENERIC_PHOTO_TRANSFORMATION_COMMAND, GenericPhotoTransformationCommand); #line 250 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_COMMAND (command), FALSE); #line 251 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = command; -#line 251 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = generic_photo_transformation_command_can_compress (self, _tmp0_); -#line 251 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp1_) { + if (!generic_photo_transformation_command_can_compress (self, command)) { #line 252 "/home/jens/Source/shotwell/src/Commands.vala" result = FALSE; #line 252 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 4065 "Commands.c" +#line 4656 "Commands.c" } #line 254 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = command; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (command, TYPE_GENERIC_PHOTO_TRANSFORMATION_COMMAND) ? ((GenericPhotoTransformationCommand*) command) : NULL); #line 254 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_GENERIC_PHOTO_TRANSFORMATION_COMMAND) ? ((GenericPhotoTransformationCommand*) _tmp2_) : NULL); -#line 254 "/home/jens/Source/shotwell/src/Commands.vala" - generic = _tmp3_; + generic = _tmp0_; #line 255 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = generic; + _tmp1_ = generic; #line 255 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp4_ == NULL) { + if (_tmp1_ == NULL) { #line 256 "/home/jens/Source/shotwell/src/Commands.vala" result = FALSE; #line 256 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (generic); #line 256 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 4083 "Commands.c" +#line 4672 "Commands.c" } #line 258 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = generic; + _tmp2_ = generic; #line 258 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source; + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source; #line 258 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source; + _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source; #line 258 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp6_ != _tmp7_) { + if (_tmp3_ != _tmp4_) { #line 259 "/home/jens/Source/shotwell/src/Commands.vala" result = FALSE; #line 259 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (generic); #line 259 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 4099 "Commands.c" +#line 4688 "Commands.c" } #line 262 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = generic; + _tmp5_ = generic; #line 262 "/home/jens/Source/shotwell/src/Commands.vala" - command_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_COMMAND, Command)); + command_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_COMMAND, Command)); #line 265 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = generic; + _tmp6_ = generic; #line 265 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = _tmp9_->priv->transformed_state; + _tmp7_ = _tmp6_->priv->transformed_state; #line 265 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = _g_object_ref0 (_tmp10_); + _tmp8_ = _g_object_ref0 (_tmp7_); #line 265 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->transformed_state); #line 265 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->transformed_state = _tmp11_; + self->priv->transformed_state = _tmp8_; #line 267 "/home/jens/Source/shotwell/src/Commands.vala" result = TRUE; #line 267 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (generic); #line 267 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 4121 "Commands.c" +#line 4710 "Commands.c" } -static void generic_photo_transformation_command_on_state_broken (GenericPhotoTransformationCommand* self) { +static void +generic_photo_transformation_command_on_state_broken (GenericPhotoTransformationCommand* self) +{ CommandManager* _tmp0_; CommandManager* _tmp1_; #line 270 "/home/jens/Source/shotwell/src/Commands.vala" @@ -4134,11 +4725,13 @@ static void generic_photo_transformation_command_on_state_broken (GenericPhotoTr command_manager_reset (_tmp1_); #line 271 "/home/jens/Source/shotwell/src/Commands.vala" _command_manager_unref0 (_tmp1_); -#line 4138 "Commands.c" +#line 4729 "Commands.c" } -static void generic_photo_transformation_command_class_init (GenericPhotoTransformationCommandClass * klass) { +static void +generic_photo_transformation_command_class_init (GenericPhotoTransformationCommandClass * klass) +{ #line 206 "/home/jens/Source/shotwell/src/Commands.vala" generic_photo_transformation_command_parent_class = g_type_class_peek_parent (klass); #line 206 "/home/jens/Source/shotwell/src/Commands.vala" @@ -4157,22 +4750,26 @@ static void generic_photo_transformation_command_class_init (GenericPhotoTransfo ((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) generic_photo_transformation_command_real_compress; #line 206 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = generic_photo_transformation_command_finalize; -#line 4161 "Commands.c" +#line 4754 "Commands.c" } -static void generic_photo_transformation_command_instance_init (GenericPhotoTransformationCommand * self) { +static void +generic_photo_transformation_command_instance_init (GenericPhotoTransformationCommand * self) +{ #line 206 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = GENERIC_PHOTO_TRANSFORMATION_COMMAND_GET_PRIVATE (self); #line 207 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->original_state = NULL; #line 208 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->transformed_state = NULL; -#line 4172 "Commands.c" +#line 4767 "Commands.c" } -static void generic_photo_transformation_command_finalize (GObject * obj) { +static void +generic_photo_transformation_command_finalize (GObject * obj) +{ GenericPhotoTransformationCommand * self; PhotoTransformationState* _tmp0_; PhotoTransformationState* _tmp3_; @@ -4182,7 +4779,7 @@ static void generic_photo_transformation_command_finalize (GObject * obj) { _tmp0_ = self->priv->original_state; #line 215 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp0_ != NULL) { -#line 4186 "Commands.c" +#line 4783 "Commands.c" PhotoTransformationState* _tmp1_; guint _tmp2_; #line 216 "/home/jens/Source/shotwell/src/Commands.vala" @@ -4191,13 +4788,13 @@ static void generic_photo_transformation_command_finalize (GObject * obj) { g_signal_parse_name ("broken", TYPE_PHOTO_TRANSFORMATION_STATE, &_tmp2_, NULL, FALSE); #line 216 "/home/jens/Source/shotwell/src/Commands.vala" g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _generic_photo_transformation_command_on_state_broken_photo_transformation_state_broken, self); -#line 4195 "Commands.c" +#line 4792 "Commands.c" } #line 218 "/home/jens/Source/shotwell/src/Commands.vala" _tmp3_ = self->priv->transformed_state; #line 218 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp3_ != NULL) { -#line 4201 "Commands.c" +#line 4798 "Commands.c" PhotoTransformationState* _tmp4_; guint _tmp5_; #line 219 "/home/jens/Source/shotwell/src/Commands.vala" @@ -4206,7 +4803,7 @@ static void generic_photo_transformation_command_finalize (GObject * obj) { g_signal_parse_name ("broken", TYPE_PHOTO_TRANSFORMATION_STATE, &_tmp5_, NULL, FALSE); #line 219 "/home/jens/Source/shotwell/src/Commands.vala" g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _generic_photo_transformation_command_on_state_broken_photo_transformation_state_broken, self); -#line 4210 "Commands.c" +#line 4807 "Commands.c" } #line 207 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->original_state); @@ -4214,11 +4811,13 @@ static void generic_photo_transformation_command_finalize (GObject * obj) { _g_object_unref0 (self->priv->transformed_state); #line 206 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (generic_photo_transformation_command_parent_class)->finalize (obj); -#line 4218 "Commands.c" +#line 4815 "Commands.c" } -GType generic_photo_transformation_command_get_type (void) { +GType +generic_photo_transformation_command_get_type (void) +{ static volatile gsize generic_photo_transformation_command_type_id__volatile = 0; if (g_once_init_enter (&generic_photo_transformation_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (GenericPhotoTransformationCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) generic_photo_transformation_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (GenericPhotoTransformationCommand), 0, (GInstanceInitFunc) generic_photo_transformation_command_instance_init, NULL }; @@ -4230,21 +4829,28 @@ GType generic_photo_transformation_command_get_type (void) { } -static void _multiple_data_source_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +static void +_multiple_data_source_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self) +{ #line 309 "/home/jens/Source/shotwell/src/Commands.vala" multiple_data_source_command_on_source_destroyed ((MultipleDataSourceCommand*) self, source); -#line 4237 "Commands.c" +#line 4840 "Commands.c" } -MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_type, GeeIterable* iter, const gchar* progress_text, const gchar* undo_progress_text, const gchar* name, const gchar* explanation) { +MultipleDataSourceCommand* +multiple_data_source_command_construct (GType object_type, + GeeIterable* iter, + const gchar* progress_text, + const gchar* undo_progress_text, + const gchar* name, + const gchar* explanation) +{ MultipleDataSourceCommand * self = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; + gchar* _tmp0_; + gchar* _tmp1_; #line 285 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL); #line 285 "/home/jens/Source/shotwell/src/Commands.vala" @@ -4256,170 +4862,155 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_ #line 285 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (explanation != NULL, NULL); #line 287 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = name; -#line 287 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = explanation; -#line 287 "/home/jens/Source/shotwell/src/Commands.vala" - self = (MultipleDataSourceCommand*) page_command_construct (object_type, _tmp0_, _tmp1_); + self = (MultipleDataSourceCommand*) page_command_construct (object_type, name, explanation); #line 289 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = progress_text; -#line 289 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp0_ = g_strdup (progress_text); #line 289 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->progress_text); #line 289 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->progress_text = _tmp3_; -#line 290 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = undo_progress_text; + self->priv->progress_text = _tmp0_; #line 290 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = g_strdup (_tmp4_); + _tmp1_ = g_strdup (undo_progress_text); #line 290 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->undo_progress_text); #line 290 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->undo_progress_text = _tmp5_; -#line 4281 "Commands.c" + self->priv->undo_progress_text = _tmp1_; +#line 4879 "Commands.c" { GeeIterator* _view_it = NULL; - GeeIterable* _tmp6_; - GeeIterator* _tmp7_; -#line 292 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = iter; + GeeIterator* _tmp2_; #line 292 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = gee_iterable_iterator (_tmp6_); + _tmp2_ = gee_iterable_iterator (iter); #line 292 "/home/jens/Source/shotwell/src/Commands.vala" - _view_it = _tmp7_; + _view_it = _tmp2_; #line 292 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 4294 "Commands.c" - GeeIterator* _tmp8_; - gboolean _tmp9_; +#line 4889 "Commands.c" + GeeIterator* _tmp3_; DataView* view = NULL; - GeeIterator* _tmp10_; - gpointer _tmp11_; + GeeIterator* _tmp4_; + gpointer _tmp5_; DataSource* source = NULL; - DataView* _tmp12_; - DataSource* _tmp13_; + DataView* _tmp6_; + DataSource* _tmp7_; SourceCollection* collection = NULL; + DataSource* _tmp8_; + DataCollection* _tmp9_; + SourceCollection* _tmp10_; + GeeArrayList* _tmp13_; DataSource* _tmp14_; - DataCollection* _tmp15_; - SourceCollection* _tmp16_; - GeeArrayList* _tmp19_; - DataSource* _tmp20_; -#line 292 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = _view_it; #line 292 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = gee_iterator_next (_tmp8_); + _tmp3_ = _view_it; #line 292 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp9_) { + if (!gee_iterator_next (_tmp3_)) { #line 292 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 4317 "Commands.c" +#line 4909 "Commands.c" } #line 292 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = _view_it; + _tmp4_ = _view_it; #line 292 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = gee_iterator_get (_tmp10_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 292 "/home/jens/Source/shotwell/src/Commands.vala" - view = (DataView*) _tmp11_; + view = (DataView*) _tmp5_; #line 293 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = view; + _tmp6_ = view; #line 293 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = data_view_get_source (_tmp12_); + _tmp7_ = data_view_get_source (_tmp6_); #line 293 "/home/jens/Source/shotwell/src/Commands.vala" - source = _tmp13_; + source = _tmp7_; #line 294 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = source; + _tmp8_ = source; #line 294 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); + _tmp9_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); #line 294 "/home/jens/Source/shotwell/src/Commands.vala" - collection = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_SOURCE_COLLECTION, SourceCollection); + collection = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_SOURCE_COLLECTION, SourceCollection); #line 296 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = collection; + _tmp10_ = collection; #line 296 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp16_ != NULL) { -#line 4341 "Commands.c" - GeeHashSet* _tmp17_; - SourceCollection* _tmp18_; + if (_tmp10_ != NULL) { +#line 4933 "Commands.c" + GeeHashSet* _tmp11_; + SourceCollection* _tmp12_; #line 297 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = self->priv->hooked_collections; + _tmp11_ = self->priv->hooked_collections; #line 297 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = collection; + _tmp12_ = collection; #line 297 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_); -#line 4350 "Commands.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp12_); +#line 4942 "Commands.c" } #line 299 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = self->source_list; + _tmp13_ = self->source_list; #line 299 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = source; + _tmp14_ = source; #line 299 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_); #line 292 "/home/jens/Source/shotwell/src/Commands.vala" _data_collection_unref0 (collection); #line 292 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); #line 292 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (view); -#line 4364 "Commands.c" +#line 4956 "Commands.c" } #line 292 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_view_it); -#line 4368 "Commands.c" +#line 4960 "Commands.c" } { GeeIterator* _current_collection_it = NULL; - GeeHashSet* _tmp21_; - GeeIterator* _tmp22_; + GeeHashSet* _tmp15_; + GeeIterator* _tmp16_; #line 302 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = self->priv->hooked_collections; + _tmp15_ = self->priv->hooked_collections; #line 302 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp16_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 302 "/home/jens/Source/shotwell/src/Commands.vala" - _current_collection_it = _tmp22_; + _current_collection_it = _tmp16_; #line 302 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 4382 "Commands.c" - GeeIterator* _tmp23_; - gboolean _tmp24_; +#line 4974 "Commands.c" + GeeIterator* _tmp17_; SourceCollection* current_collection = NULL; - GeeIterator* _tmp25_; - gpointer _tmp26_; - SourceCollection* _tmp27_; -#line 302 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = _current_collection_it; + GeeIterator* _tmp18_; + gpointer _tmp19_; + SourceCollection* _tmp20_; #line 302 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = gee_iterator_next (_tmp23_); + _tmp17_ = _current_collection_it; #line 302 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp24_) { + if (!gee_iterator_next (_tmp17_)) { #line 302 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 4397 "Commands.c" +#line 4986 "Commands.c" } #line 302 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = _current_collection_it; + _tmp18_ = _current_collection_it; #line 302 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = gee_iterator_get (_tmp25_); + _tmp19_ = gee_iterator_get (_tmp18_); #line 302 "/home/jens/Source/shotwell/src/Commands.vala" - current_collection = (SourceCollection*) _tmp26_; + current_collection = (SourceCollection*) _tmp19_; #line 303 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = current_collection; + _tmp20_ = current_collection; #line 303 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (_tmp27_, "item-destroyed", (GCallback) _multiple_data_source_command_on_source_destroyed_source_collection_item_destroyed, self, 0); + g_signal_connect_object (_tmp20_, "item-destroyed", (GCallback) _multiple_data_source_command_on_source_destroyed_source_collection_item_destroyed, self, 0); #line 302 "/home/jens/Source/shotwell/src/Commands.vala" _data_collection_unref0 (current_collection); -#line 4411 "Commands.c" +#line 5000 "Commands.c" } #line 302 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_current_collection_it); -#line 4415 "Commands.c" +#line 5004 "Commands.c" } #line 285 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 4419 "Commands.c" +#line 5008 "Commands.c" } -GeeIterable* multiple_data_source_command_get_sources (MultipleDataSourceCommand* self) { +GeeIterable* +multiple_data_source_command_get_sources (MultipleDataSourceCommand* self) +{ GeeIterable* result = NULL; GeeArrayList* _tmp0_; GeeIterable* _tmp1_; @@ -4433,11 +5024,13 @@ GeeIterable* multiple_data_source_command_get_sources (MultipleDataSourceCommand result = _tmp1_; #line 314 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 4437 "Commands.c" +#line 5028 "Commands.c" } -gint multiple_data_source_command_get_source_count (MultipleDataSourceCommand* self) { +gint +multiple_data_source_command_get_source_count (MultipleDataSourceCommand* self) +{ gint result = 0; GeeArrayList* _tmp0_; gint _tmp1_; @@ -4454,14 +5047,15 @@ gint multiple_data_source_command_get_source_count (MultipleDataSourceCommand* s result = _tmp2_; #line 318 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 4458 "Commands.c" +#line 5051 "Commands.c" } -static void multiple_data_source_command_on_source_destroyed (MultipleDataSourceCommand* self, DataSource* source) { +static void +multiple_data_source_command_on_source_destroyed (MultipleDataSourceCommand* self, + DataSource* source) +{ GeeArrayList* _tmp0_; - DataSource* _tmp1_; - gboolean _tmp2_; #line 321 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self)); #line 321 "/home/jens/Source/shotwell/src/Commands.vala" @@ -4469,28 +5063,26 @@ static void multiple_data_source_command_on_source_destroyed (MultipleDataSource #line 324 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = self->source_list; #line 324 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = source; -#line 324 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 324 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp2_) { -#line 4478 "Commands.c" - CommandManager* _tmp3_; - CommandManager* _tmp4_; + if (gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), source)) { +#line 5068 "Commands.c" + CommandManager* _tmp1_; + CommandManager* _tmp2_; #line 325 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command)); + _tmp1_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command)); #line 325 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 325 "/home/jens/Source/shotwell/src/Commands.vala" - command_manager_reset (_tmp4_); + command_manager_reset (_tmp2_); #line 325 "/home/jens/Source/shotwell/src/Commands.vala" - _command_manager_unref0 (_tmp4_); -#line 4489 "Commands.c" + _command_manager_unref0 (_tmp2_); +#line 5079 "Commands.c" } } -static void multiple_data_source_command_real_execute (Command* base) { +static void +multiple_data_source_command_real_execute (Command* base) +{ MultipleDataSourceCommand * self; GeeArrayList* _tmp0_; GeeArrayList* _tmp1_; @@ -4511,29 +5103,37 @@ static void multiple_data_source_command_real_execute (Command* base) { multiple_data_source_command_execute_all (self, TRUE, TRUE, _tmp1_, _tmp2_); #line 333 "/home/jens/Source/shotwell/src/Commands.vala" multiple_data_source_command_commit_transaction (self); -#line 4515 "Commands.c" +#line 5107 "Commands.c" } -static void multiple_data_source_command_real_execute_on_source (MultipleDataSourceCommand* self, DataSource* source) { +static void +multiple_data_source_command_real_execute_on_source (MultipleDataSourceCommand* self, + DataSource* source) +{ #line 336 "/home/jens/Source/shotwell/src/Commands.vala" g_critical ("Type `%s' does not implement abstract method `multiple_data_source_command_execute_on_source'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 336 "/home/jens/Source/shotwell/src/Commands.vala" return; -#line 4524 "Commands.c" +#line 5119 "Commands.c" } -void multiple_data_source_command_execute_on_source (MultipleDataSourceCommand* self, DataSource* source) { +void +multiple_data_source_command_execute_on_source (MultipleDataSourceCommand* self, + DataSource* source) +{ #line 336 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self)); #line 336 "/home/jens/Source/shotwell/src/Commands.vala" MULTIPLE_DATA_SOURCE_COMMAND_GET_CLASS (self)->execute_on_source (self, source); -#line 4533 "Commands.c" +#line 5131 "Commands.c" } -static void multiple_data_source_command_real_undo (Command* base) { +static void +multiple_data_source_command_real_undo (Command* base) +{ MultipleDataSourceCommand * self; GeeArrayList* _tmp0_; gint _tmp1_; @@ -4548,7 +5148,7 @@ static void multiple_data_source_command_real_undo (Command* base) { _tmp2_ = _tmp1_; #line 339 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp2_ > 0) { -#line 4552 "Commands.c" +#line 5152 "Commands.c" GeeArrayList* _tmp3_; GeeArrayList* _tmp4_; #line 340 "/home/jens/Source/shotwell/src/Commands.vala" @@ -4563,40 +5163,50 @@ static void multiple_data_source_command_real_undo (Command* base) { _tmp4_ = self->priv->acted_upon; #line 344 "/home/jens/Source/shotwell/src/Commands.vala" gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 4567 "Commands.c" +#line 5167 "Commands.c" } } -static void multiple_data_source_command_real_undo_on_source (MultipleDataSourceCommand* self, DataSource* source) { +static void +multiple_data_source_command_real_undo_on_source (MultipleDataSourceCommand* self, + DataSource* source) +{ #line 348 "/home/jens/Source/shotwell/src/Commands.vala" g_critical ("Type `%s' does not implement abstract method `multiple_data_source_command_undo_on_source'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 348 "/home/jens/Source/shotwell/src/Commands.vala" return; -#line 4577 "Commands.c" +#line 5180 "Commands.c" } -void multiple_data_source_command_undo_on_source (MultipleDataSourceCommand* self, DataSource* source) { +void +multiple_data_source_command_undo_on_source (MultipleDataSourceCommand* self, + DataSource* source) +{ #line 348 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self)); #line 348 "/home/jens/Source/shotwell/src/Commands.vala" MULTIPLE_DATA_SOURCE_COMMAND_GET_CLASS (self)->undo_on_source (self, source); -#line 4586 "Commands.c" +#line 5192 "Commands.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 352 "/home/jens/Source/shotwell/src/Commands.vala" return self ? data_collection_ref (self) : NULL; -#line 4593 "Commands.c" +#line 5201 "Commands.c" } -static void multiple_data_source_command_start_transaction (MultipleDataSourceCommand* self) { +static void +multiple_data_source_command_start_transaction (MultipleDataSourceCommand* self) +{ #line 350 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self)); -#line 4600 "Commands.c" +#line 5210 "Commands.c" { GeeIterator* _sources_it = NULL; GeeHashSet* _tmp0_; @@ -4609,73 +5219,72 @@ static void multiple_data_source_command_start_transaction (MultipleDataSourceCo _sources_it = _tmp1_; #line 351 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 4613 "Commands.c" +#line 5223 "Commands.c" GeeIterator* _tmp2_; - gboolean _tmp3_; SourceCollection* sources = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp3_; + gpointer _tmp4_; MediaSourceCollection* media_collection = NULL; - SourceCollection* _tmp6_; + SourceCollection* _tmp5_; + MediaSourceCollection* _tmp6_; MediaSourceCollection* _tmp7_; - MediaSourceCollection* _tmp8_; #line 351 "/home/jens/Source/shotwell/src/Commands.vala" _tmp2_ = _sources_it; #line 351 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 351 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 351 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 4631 "Commands.c" +#line 5238 "Commands.c" } #line 351 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _sources_it; + _tmp3_ = _sources_it; #line 351 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 351 "/home/jens/Source/shotwell/src/Commands.vala" - sources = (SourceCollection*) _tmp5_; + sources = (SourceCollection*) _tmp4_; #line 352 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = sources; + _tmp5_ = sources; #line 352 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = _data_collection_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_MEDIA_SOURCE_COLLECTION) ? ((MediaSourceCollection*) _tmp6_) : NULL); + _tmp6_ = _data_collection_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_MEDIA_SOURCE_COLLECTION) ? ((MediaSourceCollection*) _tmp5_) : NULL); #line 352 "/home/jens/Source/shotwell/src/Commands.vala" - media_collection = _tmp7_; + media_collection = _tmp6_; #line 353 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = media_collection; + _tmp7_ = media_collection; #line 353 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp8_ != NULL) { -#line 4649 "Commands.c" - MediaSourceCollection* _tmp9_; + if (_tmp7_ != NULL) { +#line 5256 "Commands.c" + MediaSourceCollection* _tmp8_; + TransactionController* _tmp9_; TransactionController* _tmp10_; - TransactionController* _tmp11_; #line 354 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = media_collection; + _tmp8_ = media_collection; #line 354 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = media_source_collection_get_transaction_controller (_tmp9_); + _tmp9_ = media_source_collection_get_transaction_controller (_tmp8_); #line 354 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 354 "/home/jens/Source/shotwell/src/Commands.vala" - transaction_controller_begin (_tmp11_); -#line 4661 "Commands.c" + transaction_controller_begin (_tmp10_); +#line 5268 "Commands.c" } #line 351 "/home/jens/Source/shotwell/src/Commands.vala" _data_collection_unref0 (media_collection); #line 351 "/home/jens/Source/shotwell/src/Commands.vala" _data_collection_unref0 (sources); -#line 4667 "Commands.c" +#line 5274 "Commands.c" } #line 351 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_sources_it); -#line 4671 "Commands.c" +#line 5278 "Commands.c" } } -static void multiple_data_source_command_commit_transaction (MultipleDataSourceCommand* self) { +static void +multiple_data_source_command_commit_transaction (MultipleDataSourceCommand* self) +{ #line 358 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self)); -#line 4679 "Commands.c" +#line 5288 "Commands.c" { GeeIterator* _sources_it = NULL; GeeHashSet* _tmp0_; @@ -4688,90 +5297,91 @@ static void multiple_data_source_command_commit_transaction (MultipleDataSourceC _sources_it = _tmp1_; #line 359 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 4692 "Commands.c" +#line 5301 "Commands.c" GeeIterator* _tmp2_; - gboolean _tmp3_; SourceCollection* sources = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp3_; + gpointer _tmp4_; MediaSourceCollection* media_collection = NULL; - SourceCollection* _tmp6_; + SourceCollection* _tmp5_; + MediaSourceCollection* _tmp6_; MediaSourceCollection* _tmp7_; - MediaSourceCollection* _tmp8_; #line 359 "/home/jens/Source/shotwell/src/Commands.vala" _tmp2_ = _sources_it; #line 359 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 359 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 359 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 4710 "Commands.c" +#line 5316 "Commands.c" } #line 359 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _sources_it; + _tmp3_ = _sources_it; #line 359 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 359 "/home/jens/Source/shotwell/src/Commands.vala" - sources = (SourceCollection*) _tmp5_; + sources = (SourceCollection*) _tmp4_; #line 360 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = sources; + _tmp5_ = sources; #line 360 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = _data_collection_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_MEDIA_SOURCE_COLLECTION) ? ((MediaSourceCollection*) _tmp6_) : NULL); + _tmp6_ = _data_collection_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_MEDIA_SOURCE_COLLECTION) ? ((MediaSourceCollection*) _tmp5_) : NULL); #line 360 "/home/jens/Source/shotwell/src/Commands.vala" - media_collection = _tmp7_; + media_collection = _tmp6_; #line 361 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = media_collection; + _tmp7_ = media_collection; #line 361 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp8_ != NULL) { -#line 4728 "Commands.c" - MediaSourceCollection* _tmp9_; + if (_tmp7_ != NULL) { +#line 5334 "Commands.c" + MediaSourceCollection* _tmp8_; + TransactionController* _tmp9_; TransactionController* _tmp10_; - TransactionController* _tmp11_; #line 362 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = media_collection; + _tmp8_ = media_collection; #line 362 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = media_source_collection_get_transaction_controller (_tmp9_); + _tmp9_ = media_source_collection_get_transaction_controller (_tmp8_); #line 362 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 362 "/home/jens/Source/shotwell/src/Commands.vala" - transaction_controller_commit (_tmp11_); -#line 4740 "Commands.c" + transaction_controller_commit (_tmp10_); +#line 5346 "Commands.c" } #line 359 "/home/jens/Source/shotwell/src/Commands.vala" _data_collection_unref0 (media_collection); #line 359 "/home/jens/Source/shotwell/src/Commands.vala" _data_collection_unref0 (sources); -#line 4746 "Commands.c" +#line 5352 "Commands.c" } #line 359 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_sources_it); -#line 4750 "Commands.c" +#line 5356 "Commands.c" } } -static void multiple_data_source_command_execute_all (MultipleDataSourceCommand* self, gboolean exec, gboolean can_cancel, GeeArrayList* todo, GeeArrayList* completed) { +static void +multiple_data_source_command_execute_all (MultipleDataSourceCommand* self, + gboolean exec, + gboolean can_cancel, + GeeArrayList* todo, + GeeArrayList* completed) +{ AppWindow* _tmp0_; AppWindow* _tmp1_; gint count = 0; gint total = 0; - GeeArrayList* _tmp2_; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; gint two_percent = 0; + gint _tmp4_; gint _tmp5_; - gint _tmp6_; - const gchar* _tmp7_ = NULL; - gboolean _tmp8_; + const gchar* _tmp6_ = NULL; gchar* text = NULL; - gchar* _tmp11_; + gchar* _tmp9_; GCancellable* cancellable = NULL; ProgressDialog* progress = NULL; - gint _tmp12_; - ProgressDialog* _tmp50_; - AppWindow* _tmp52_; - AppWindow* _tmp53_; + gint _tmp10_; + ProgressDialog* _tmp42_; + AppWindow* _tmp44_; + AppWindow* _tmp45_; #line 366 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self)); #line 366 "/home/jens/Source/shotwell/src/Commands.vala" @@ -4789,310 +5399,290 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand* #line 370 "/home/jens/Source/shotwell/src/Commands.vala" count = 0; #line 371 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = todo; -#line 371 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (todo, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 371 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 371 "/home/jens/Source/shotwell/src/Commands.vala" - total = _tmp4_; + total = _tmp3_; #line 372 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = total; + _tmp4_ = total; #line 372 "/home/jens/Source/shotwell/src/Commands.vala" - two_percent = (gint) (((gdouble) _tmp5_) / 50.0); + two_percent = (gint) (((gdouble) _tmp4_) / 50.0); #line 373 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = two_percent; + _tmp5_ = two_percent; #line 373 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp6_ <= 0) { + if (_tmp5_ <= 0) { #line 374 "/home/jens/Source/shotwell/src/Commands.vala" two_percent = 1; -#line 4810 "Commands.c" +#line 5418 "Commands.c" } #line 376 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = exec; + if (exec) { +#line 5422 "Commands.c" + const gchar* _tmp7_; #line 376 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp8_) { -#line 4816 "Commands.c" - const gchar* _tmp9_; -#line 376 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = self->priv->progress_text; + _tmp7_ = self->priv->progress_text; #line 376 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = _tmp9_; -#line 4822 "Commands.c" + _tmp6_ = _tmp7_; +#line 5428 "Commands.c" } else { - const gchar* _tmp10_; + const gchar* _tmp8_; #line 376 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = self->priv->undo_progress_text; + _tmp8_ = self->priv->undo_progress_text; #line 376 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = _tmp10_; -#line 4829 "Commands.c" + _tmp6_ = _tmp8_; +#line 5435 "Commands.c" } #line 376 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = g_strdup (_tmp7_); + _tmp9_ = g_strdup (_tmp6_); #line 376 "/home/jens/Source/shotwell/src/Commands.vala" - text = _tmp11_; + text = _tmp9_; #line 378 "/home/jens/Source/shotwell/src/Commands.vala" cancellable = NULL; #line 379 "/home/jens/Source/shotwell/src/Commands.vala" progress = NULL; #line 380 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = total; + _tmp10_ = total; #line 380 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp12_ >= MULTIPLE_DATA_SOURCE_COMMAND_MIN_OPS_FOR_PROGRESS_WINDOW) { -#line 4843 "Commands.c" - GCancellable* _tmp13_ = NULL; - gboolean _tmp14_; - GCancellable* _tmp16_; - AppWindow* _tmp17_; - AppWindow* _tmp18_; - const gchar* _tmp19_; - GCancellable* _tmp20_; - ProgressDialog* _tmp21_; -#line 381 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = can_cancel; + if (_tmp10_ >= MULTIPLE_DATA_SOURCE_COMMAND_MIN_OPS_FOR_PROGRESS_WINDOW) { +#line 5449 "Commands.c" + GCancellable* _tmp11_ = NULL; + GCancellable* _tmp13_; + AppWindow* _tmp14_; + AppWindow* _tmp15_; + const gchar* _tmp16_; + GCancellable* _tmp17_; + ProgressDialog* _tmp18_; #line 381 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp14_) { -#line 4856 "Commands.c" - GCancellable* _tmp15_; + if (can_cancel) { +#line 5459 "Commands.c" + GCancellable* _tmp12_; #line 381 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = g_cancellable_new (); + _tmp12_ = g_cancellable_new (); #line 381 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp11_); #line 381 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = _tmp15_; -#line 4864 "Commands.c" + _tmp11_ = _tmp12_; +#line 5467 "Commands.c" } else { #line 381 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp11_); #line 381 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = NULL; -#line 4870 "Commands.c" + _tmp11_ = NULL; +#line 5473 "Commands.c" } #line 381 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = _g_object_ref0 (_tmp13_); + _tmp13_ = _g_object_ref0 (_tmp11_); #line 381 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (cancellable); #line 381 "/home/jens/Source/shotwell/src/Commands.vala" - cancellable = _tmp16_; + cancellable = _tmp13_; #line 382 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = app_window_get_instance (); + _tmp14_ = app_window_get_instance (); #line 382 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = _tmp17_; + _tmp15_ = _tmp14_; #line 382 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = text; + _tmp16_ = text; #line 382 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = cancellable; + _tmp17_ = cancellable; #line 382 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_window_get_type (), GtkWindow), _tmp19_, _tmp20_); + _tmp18_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_window_get_type (), GtkWindow), _tmp16_, _tmp17_); #line 382 "/home/jens/Source/shotwell/src/Commands.vala" - g_object_ref_sink (_tmp21_); + g_object_ref_sink (_tmp18_); #line 382 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (progress); #line 382 "/home/jens/Source/shotwell/src/Commands.vala" - progress = _tmp21_; + progress = _tmp18_; #line 382 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp15_); #line 380 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp13_); -#line 4898 "Commands.c" + _g_object_unref0 (_tmp11_); +#line 5501 "Commands.c" } { GeeArrayList* _source_list = NULL; - GeeArrayList* _tmp22_; - GeeArrayList* _tmp23_; + GeeArrayList* _tmp19_; gint _source_size = 0; - GeeArrayList* _tmp24_; - gint _tmp25_; - gint _tmp26_; + GeeArrayList* _tmp20_; + gint _tmp21_; + gint _tmp22_; gint _source_index = 0; #line 385 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = todo; + _tmp19_ = _g_object_ref0 (todo); #line 385 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = _g_object_ref0 (_tmp22_); + _source_list = _tmp19_; #line 385 "/home/jens/Source/shotwell/src/Commands.vala" - _source_list = _tmp23_; + _tmp20_ = _source_list; #line 385 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = _source_list; + _tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 385 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 385 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = _tmp25_; + _tmp22_ = _tmp21_; #line 385 "/home/jens/Source/shotwell/src/Commands.vala" - _source_size = _tmp26_; + _source_size = _tmp22_; #line 385 "/home/jens/Source/shotwell/src/Commands.vala" _source_index = -1; #line 385 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 4927 "Commands.c" - gint _tmp27_; - gint _tmp28_; - gint _tmp29_; +#line 5527 "Commands.c" + gint _tmp23_; + gint _tmp24_; + gint _tmp25_; DataSource* source = NULL; - GeeArrayList* _tmp30_; - gint _tmp31_; - gpointer _tmp32_; - gboolean _tmp33_; - GeeArrayList* _tmp36_; - ProgressDialog* _tmp39_; + GeeArrayList* _tmp26_; + gint _tmp27_; + gpointer _tmp28_; + ProgressDialog* _tmp32_; #line 385 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = _source_index; + _tmp23_ = _source_index; #line 385 "/home/jens/Source/shotwell/src/Commands.vala" - _source_index = _tmp27_ + 1; + _source_index = _tmp23_ + 1; #line 385 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp28_ = _source_index; + _tmp24_ = _source_index; #line 385 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp29_ = _source_size; + _tmp25_ = _source_size; #line 385 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp28_ < _tmp29_)) { + if (!(_tmp24_ < _tmp25_)) { #line 385 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 4950 "Commands.c" +#line 5548 "Commands.c" } #line 385 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp30_ = _source_list; + _tmp26_ = _source_list; #line 385 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp31_ = _source_index; + _tmp27_ = _source_index; #line 385 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp32_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp31_); + _tmp28_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp27_); #line 385 "/home/jens/Source/shotwell/src/Commands.vala" - source = (DataSource*) _tmp32_; -#line 386 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp33_ = exec; + source = (DataSource*) _tmp28_; #line 386 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp33_) { -#line 4964 "Commands.c" - DataSource* _tmp34_; + if (exec) { +#line 5560 "Commands.c" + DataSource* _tmp29_; #line 387 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp34_ = source; + _tmp29_ = source; #line 387 "/home/jens/Source/shotwell/src/Commands.vala" - multiple_data_source_command_execute_on_source (self, _tmp34_); -#line 4970 "Commands.c" + multiple_data_source_command_execute_on_source (self, _tmp29_); +#line 5566 "Commands.c" } else { - DataSource* _tmp35_; + DataSource* _tmp30_; #line 389 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp35_ = source; + _tmp30_ = source; #line 389 "/home/jens/Source/shotwell/src/Commands.vala" - multiple_data_source_command_undo_on_source (self, _tmp35_); -#line 4977 "Commands.c" + multiple_data_source_command_undo_on_source (self, _tmp30_); +#line 5573 "Commands.c" } #line 391 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp36_ = completed; -#line 391 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp36_ != NULL) { -#line 4983 "Commands.c" - GeeArrayList* _tmp37_; - DataSource* _tmp38_; + if (completed != NULL) { +#line 5577 "Commands.c" + DataSource* _tmp31_; #line 392 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp37_ = completed; + _tmp31_ = source; #line 392 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp38_ = source; -#line 392 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp38_); -#line 4992 "Commands.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (completed, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp31_); +#line 5583 "Commands.c" } #line 394 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp39_ = progress; + _tmp32_ = progress; #line 394 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp39_ != NULL) { -#line 4998 "Commands.c" - gint _tmp40_; - gint _tmp41_; - gint _tmp42_; - gboolean _tmp46_ = FALSE; - GCancellable* _tmp47_; + if (_tmp32_ != NULL) { +#line 5589 "Commands.c" + gint _tmp33_; + gint _tmp34_; + gint _tmp35_; + gboolean _tmp39_ = FALSE; + GCancellable* _tmp40_; #line 395 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp40_ = count; + _tmp33_ = count; #line 395 "/home/jens/Source/shotwell/src/Commands.vala" - count = _tmp40_ + 1; + count = _tmp33_ + 1; #line 395 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp41_ = count; + _tmp34_ = count; #line 395 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp42_ = two_percent; + _tmp35_ = two_percent; #line 395 "/home/jens/Source/shotwell/src/Commands.vala" - if ((_tmp41_ % _tmp42_) == 0) { -#line 5014 "Commands.c" - ProgressDialog* _tmp43_; - gint _tmp44_; - gint _tmp45_; + if ((_tmp34_ % _tmp35_) == 0) { +#line 5605 "Commands.c" + ProgressDialog* _tmp36_; + gint _tmp37_; + gint _tmp38_; #line 396 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp43_ = progress; + _tmp36_ = progress; #line 396 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp44_ = count; + _tmp37_ = count; #line 396 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp45_ = total; + _tmp38_ = total; #line 396 "/home/jens/Source/shotwell/src/Commands.vala" - progress_dialog_set_fraction (_tmp43_, _tmp44_, _tmp45_); + progress_dialog_set_fraction (_tmp36_, _tmp37_, _tmp38_); #line 397 "/home/jens/Source/shotwell/src/Commands.vala" spin_event_loop (); -#line 5028 "Commands.c" +#line 5619 "Commands.c" } #line 400 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp47_ = cancellable; -#line 400 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp47_ != NULL) { -#line 5034 "Commands.c" - GCancellable* _tmp48_; - gboolean _tmp49_; + _tmp40_ = cancellable; #line 400 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp48_ = cancellable; + if (_tmp40_ != NULL) { +#line 5625 "Commands.c" + GCancellable* _tmp41_; #line 400 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp49_ = g_cancellable_is_cancelled (_tmp48_); + _tmp41_ = cancellable; #line 400 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp46_ = _tmp49_; -#line 5043 "Commands.c" + _tmp39_ = g_cancellable_is_cancelled (_tmp41_); +#line 5631 "Commands.c" } else { #line 400 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp46_ = FALSE; -#line 5047 "Commands.c" + _tmp39_ = FALSE; +#line 5635 "Commands.c" } #line 400 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp46_) { + if (_tmp39_) { #line 401 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); #line 401 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 5055 "Commands.c" +#line 5643 "Commands.c" } } #line 385 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); -#line 5060 "Commands.c" +#line 5648 "Commands.c" } #line 385 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_list); -#line 5064 "Commands.c" +#line 5652 "Commands.c" } #line 405 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp50_ = progress; + _tmp42_ = progress; #line 405 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp50_ != NULL) { -#line 5070 "Commands.c" - ProgressDialog* _tmp51_; + if (_tmp42_ != NULL) { +#line 5658 "Commands.c" + ProgressDialog* _tmp43_; #line 406 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp51_ = progress; + _tmp43_ = progress; #line 406 "/home/jens/Source/shotwell/src/Commands.vala" - progress_dialog_close (_tmp51_); -#line 5076 "Commands.c" + progress_dialog_close (_tmp43_); +#line 5664 "Commands.c" } #line 408 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp52_ = app_window_get_instance (); + _tmp44_ = app_window_get_instance (); #line 408 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp53_ = _tmp52_; + _tmp45_ = _tmp44_; #line 408 "/home/jens/Source/shotwell/src/Commands.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PAGE_WINDOW, PageWindow)); #line 408 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp53_); + _g_object_unref0 (_tmp45_); #line 366 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (progress); #line 366 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (cancellable); #line 366 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (text); -#line 5092 "Commands.c" +#line 5680 "Commands.c" } -static void multiple_data_source_command_class_init (MultipleDataSourceCommandClass * klass) { +static void +multiple_data_source_command_class_init (MultipleDataSourceCommandClass * klass) +{ #line 275 "/home/jens/Source/shotwell/src/Commands.vala" multiple_data_source_command_parent_class = g_type_class_peek_parent (klass); #line 275 "/home/jens/Source/shotwell/src/Commands.vala" @@ -5107,11 +5697,13 @@ static void multiple_data_source_command_class_init (MultipleDataSourceCommandCl ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) multiple_data_source_command_real_undo_on_source; #line 275 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = multiple_data_source_command_finalize; -#line 5111 "Commands.c" +#line 5701 "Commands.c" } -static void multiple_data_source_command_instance_init (MultipleDataSourceCommand * self) { +static void +multiple_data_source_command_instance_init (MultipleDataSourceCommand * self) +{ GeeArrayList* _tmp0_; GeeArrayList* _tmp1_; GeeHashSet* _tmp2_; @@ -5129,15 +5721,17 @@ static void multiple_data_source_command_instance_init (MultipleDataSourceComman _tmp2_ = gee_hash_set_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 283 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->hooked_collections = _tmp2_; -#line 5133 "Commands.c" +#line 5725 "Commands.c" } -static void multiple_data_source_command_finalize (GObject * obj) { +static void +multiple_data_source_command_finalize (GObject * obj) +{ MultipleDataSourceCommand * self; #line 275 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand); -#line 5141 "Commands.c" +#line 5735 "Commands.c" { GeeIterator* _current_collection_it = NULL; GeeHashSet* _tmp0_; @@ -5150,43 +5744,40 @@ static void multiple_data_source_command_finalize (GObject * obj) { _current_collection_it = _tmp1_; #line 308 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 5154 "Commands.c" +#line 5748 "Commands.c" GeeIterator* _tmp2_; - gboolean _tmp3_; SourceCollection* current_collection = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - SourceCollection* _tmp6_; - guint _tmp7_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + SourceCollection* _tmp5_; + guint _tmp6_; #line 308 "/home/jens/Source/shotwell/src/Commands.vala" _tmp2_ = _current_collection_it; #line 308 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 308 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 308 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 5170 "Commands.c" +#line 5761 "Commands.c" } #line 308 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _current_collection_it; + _tmp3_ = _current_collection_it; #line 308 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 308 "/home/jens/Source/shotwell/src/Commands.vala" - current_collection = (SourceCollection*) _tmp5_; + current_collection = (SourceCollection*) _tmp4_; #line 309 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = current_collection; + _tmp5_ = current_collection; #line 309 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_parse_name ("item-destroyed", TYPE_SOURCE_COLLECTION, &_tmp7_, NULL, FALSE); + g_signal_parse_name ("item-destroyed", TYPE_SOURCE_COLLECTION, &_tmp6_, NULL, FALSE); #line 309 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _multiple_data_source_command_on_source_destroyed_source_collection_item_destroyed, self); + g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _multiple_data_source_command_on_source_destroyed_source_collection_item_destroyed, self); #line 308 "/home/jens/Source/shotwell/src/Commands.vala" _data_collection_unref0 (current_collection); -#line 5186 "Commands.c" +#line 5777 "Commands.c" } #line 308 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_current_collection_it); -#line 5190 "Commands.c" +#line 5781 "Commands.c" } #line 278 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->source_list); @@ -5200,11 +5791,13 @@ static void multiple_data_source_command_finalize (GObject * obj) { _g_object_unref0 (self->priv->hooked_collections); #line 275 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (multiple_data_source_command_parent_class)->finalize (obj); -#line 5204 "Commands.c" +#line 5795 "Commands.c" } -GType multiple_data_source_command_get_type (void) { +GType +multiple_data_source_command_get_type (void) +{ static volatile gsize multiple_data_source_command_type_id__volatile = 0; if (g_once_init_enter (&multiple_data_source_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MultipleDataSourceCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) multiple_data_source_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MultipleDataSourceCommand), 0, (GInstanceInitFunc) multiple_data_source_command_instance_init, NULL }; @@ -5216,19 +5809,25 @@ GType multiple_data_source_command_get_type (void) { } -static void _multiple_data_source_at_once_command_on_sources_destroyed_source_collection_items_destroyed (SourceCollection* _sender, GeeCollection* destroyed, gpointer self) { +static void +_multiple_data_source_at_once_command_on_sources_destroyed_source_collection_items_destroyed (SourceCollection* _sender, + GeeCollection* destroyed, + gpointer self) +{ #line 435 "/home/jens/Source/shotwell/src/Commands.vala" multiple_data_source_at_once_command_on_sources_destroyed ((MultipleDataSourceAtOnceCommand*) self, destroyed); -#line 5223 "Commands.c" +#line 5820 "Commands.c" } -MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct (GType object_type, GeeCollection* sources, const gchar* name, const gchar* explanation) { +MultipleDataSourceAtOnceCommand* +multiple_data_source_at_once_command_construct (GType object_type, + GeeCollection* sources, + const gchar* name, + const gchar* explanation) +{ MultipleDataSourceAtOnceCommand * self = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - GeeHashSet* _tmp2_; - GeeCollection* _tmp3_; + GeeHashSet* _tmp0_; #line 417 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_COLLECTION (sources), NULL); #line 417 "/home/jens/Source/shotwell/src/Commands.vala" @@ -5236,150 +5835,140 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct #line 417 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (explanation != NULL, NULL); #line 419 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = name; -#line 419 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = explanation; -#line 419 "/home/jens/Source/shotwell/src/Commands.vala" - self = (MultipleDataSourceAtOnceCommand*) page_command_construct (object_type, _tmp0_, _tmp1_); -#line 421 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = self->priv->sources; + self = (MultipleDataSourceAtOnceCommand*) page_command_construct (object_type, name, explanation); #line 421 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = sources; + _tmp0_ = self->priv->sources; #line 421 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), _tmp3_); -#line 5251 "Commands.c" + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), sources); +#line 5844 "Commands.c" { GeeIterator* _source_it = NULL; - GeeHashSet* _tmp4_; - GeeIterator* _tmp5_; + GeeHashSet* _tmp1_; + GeeIterator* _tmp2_; #line 423 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = self->priv->sources; + _tmp1_ = self->priv->sources; #line 423 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp2_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 423 "/home/jens/Source/shotwell/src/Commands.vala" - _source_it = _tmp5_; + _source_it = _tmp2_; #line 423 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 5264 "Commands.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 5857 "Commands.c" + GeeIterator* _tmp3_; DataSource* source = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp4_; + gpointer _tmp5_; SourceCollection* membership = NULL; - DataSource* _tmp10_; - DataCollection* _tmp11_; - SourceCollection* _tmp12_; - SourceCollection* _tmp13_; -#line 423 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = _source_it; + DataSource* _tmp6_; + DataCollection* _tmp7_; + SourceCollection* _tmp8_; + SourceCollection* _tmp9_; #line 423 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp3_ = _source_it; #line 423 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp3_)) { #line 423 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 5283 "Commands.c" +#line 5873 "Commands.c" } #line 423 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = _source_it; + _tmp4_ = _source_it; #line 423 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 423 "/home/jens/Source/shotwell/src/Commands.vala" - source = (DataSource*) _tmp9_; + source = (DataSource*) _tmp5_; #line 424 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = source; + _tmp6_ = source; #line 424 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); + _tmp7_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_OBJECT, DataObject)); #line 424 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_SOURCE_COLLECTION) ? ((SourceCollection*) _tmp11_) : NULL; + _tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_SOURCE_COLLECTION) ? ((SourceCollection*) _tmp7_) : NULL; #line 424 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp12_ == NULL) { + if (_tmp8_ == NULL) { #line 424 "/home/jens/Source/shotwell/src/Commands.vala" - _data_collection_unref0 (_tmp11_); -#line 5301 "Commands.c" + _data_collection_unref0 (_tmp7_); +#line 5891 "Commands.c" } #line 424 "/home/jens/Source/shotwell/src/Commands.vala" - membership = _tmp12_; + membership = _tmp8_; #line 425 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = membership; + _tmp9_ = membership; #line 425 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp13_ != NULL) { -#line 5309 "Commands.c" - GeeHashSet* _tmp14_; - SourceCollection* _tmp15_; + if (_tmp9_ != NULL) { +#line 5899 "Commands.c" + GeeHashSet* _tmp10_; + SourceCollection* _tmp11_; #line 426 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = self->priv->hooked_collections; + _tmp10_ = self->priv->hooked_collections; #line 426 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = membership; + _tmp11_ = membership; #line 426 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); -#line 5318 "Commands.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_); +#line 5908 "Commands.c" } #line 423 "/home/jens/Source/shotwell/src/Commands.vala" _data_collection_unref0 (membership); #line 423 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); -#line 5324 "Commands.c" +#line 5914 "Commands.c" } #line 423 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_it); -#line 5328 "Commands.c" +#line 5918 "Commands.c" } { GeeIterator* _source_collection_it = NULL; - GeeHashSet* _tmp16_; - GeeIterator* _tmp17_; + GeeHashSet* _tmp12_; + GeeIterator* _tmp13_; #line 429 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = self->priv->hooked_collections; + _tmp12_ = self->priv->hooked_collections; #line 429 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp13_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 429 "/home/jens/Source/shotwell/src/Commands.vala" - _source_collection_it = _tmp17_; + _source_collection_it = _tmp13_; #line 429 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 5342 "Commands.c" - GeeIterator* _tmp18_; - gboolean _tmp19_; +#line 5932 "Commands.c" + GeeIterator* _tmp14_; SourceCollection* source_collection = NULL; - GeeIterator* _tmp20_; - gpointer _tmp21_; - SourceCollection* _tmp22_; -#line 429 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = _source_collection_it; + GeeIterator* _tmp15_; + gpointer _tmp16_; + SourceCollection* _tmp17_; #line 429 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = gee_iterator_next (_tmp18_); + _tmp14_ = _source_collection_it; #line 429 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp19_) { + if (!gee_iterator_next (_tmp14_)) { #line 429 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 5357 "Commands.c" +#line 5944 "Commands.c" } #line 429 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = _source_collection_it; + _tmp15_ = _source_collection_it; #line 429 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = gee_iterator_get (_tmp20_); + _tmp16_ = gee_iterator_get (_tmp15_); #line 429 "/home/jens/Source/shotwell/src/Commands.vala" - source_collection = (SourceCollection*) _tmp21_; + source_collection = (SourceCollection*) _tmp16_; #line 430 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = source_collection; + _tmp17_ = source_collection; #line 430 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (_tmp22_, "items-destroyed", (GCallback) _multiple_data_source_at_once_command_on_sources_destroyed_source_collection_items_destroyed, self, 0); + g_signal_connect_object (_tmp17_, "items-destroyed", (GCallback) _multiple_data_source_at_once_command_on_sources_destroyed_source_collection_items_destroyed, self, 0); #line 429 "/home/jens/Source/shotwell/src/Commands.vala" _data_collection_unref0 (source_collection); -#line 5371 "Commands.c" +#line 5958 "Commands.c" } #line 429 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_collection_it); -#line 5375 "Commands.c" +#line 5962 "Commands.c" } #line 417 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 5379 "Commands.c" +#line 5966 "Commands.c" } -static void multiple_data_source_at_once_command_real_execute (Command* base) { +static void +multiple_data_source_at_once_command_real_execute (Command* base) +{ MultipleDataSourceAtOnceCommand * self; AppWindow* _tmp0_; AppWindow* _tmp1_; @@ -5421,7 +6010,7 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) { media_collection_registry_thaw_all (_tmp6_); #line 446 "/home/jens/Source/shotwell/src/Commands.vala" _media_collection_registry_unref0 (_tmp6_); -#line 5425 "Commands.c" +#line 6014 "Commands.c" { #line 448 "/home/jens/Source/shotwell/src/Commands.vala" database_table_commit_transaction (&_inner_error_); @@ -5429,7 +6018,7 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 448 "/home/jens/Source/shotwell/src/Commands.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 5433 "Commands.c" +#line 6022 "Commands.c" goto __catch464_database_error; } { @@ -5443,7 +6032,7 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) { page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE_WINDOW, PageWindow)); #line 452 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_tmp8_); -#line 5447 "Commands.c" +#line 6036 "Commands.c" } #line 448 "/home/jens/Source/shotwell/src/Commands.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -5451,7 +6040,7 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) { g_clear_error (&_inner_error_); #line 448 "/home/jens/Source/shotwell/src/Commands.vala" return; -#line 5455 "Commands.c" +#line 6044 "Commands.c" } } goto __finally464; @@ -5469,7 +6058,7 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) { app_window_database_error (_tmp9_); #line 447 "/home/jens/Source/shotwell/src/Commands.vala" _g_error_free0 (err); -#line 5473 "Commands.c" +#line 6062 "Commands.c" } __finally464: { @@ -5483,7 +6072,7 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) { page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE_WINDOW, PageWindow)); #line 452 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_tmp11_); -#line 5487 "Commands.c" +#line 6076 "Commands.c" } #line 447 "/home/jens/Source/shotwell/src/Commands.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5493,30 +6082,38 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) { g_clear_error (&_inner_error_); #line 447 "/home/jens/Source/shotwell/src/Commands.vala" return; -#line 5497 "Commands.c" +#line 6086 "Commands.c" } } -static void multiple_data_source_at_once_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* self, GeeCollection* sources) { +static void +multiple_data_source_at_once_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* self, + GeeCollection* sources) +{ #line 456 "/home/jens/Source/shotwell/src/Commands.vala" g_critical ("Type `%s' does not implement abstract method `multiple_data_source_at_once_command_execute_on_all'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 456 "/home/jens/Source/shotwell/src/Commands.vala" return; -#line 5507 "Commands.c" +#line 6099 "Commands.c" } -void multiple_data_source_at_once_command_execute_on_all (MultipleDataSourceAtOnceCommand* self, GeeCollection* sources) { +void +multiple_data_source_at_once_command_execute_on_all (MultipleDataSourceAtOnceCommand* self, + GeeCollection* sources) +{ #line 456 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND (self)); #line 456 "/home/jens/Source/shotwell/src/Commands.vala" MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND_GET_CLASS (self)->execute_on_all (self, sources); -#line 5516 "Commands.c" +#line 6111 "Commands.c" } -static void multiple_data_source_at_once_command_real_undo (Command* base) { +static void +multiple_data_source_at_once_command_real_undo (Command* base) +{ MultipleDataSourceAtOnceCommand * self; AppWindow* _tmp0_; AppWindow* _tmp1_; @@ -5558,7 +6155,7 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) { media_collection_registry_thaw_all (_tmp6_); #line 466 "/home/jens/Source/shotwell/src/Commands.vala" _media_collection_registry_unref0 (_tmp6_); -#line 5562 "Commands.c" +#line 6159 "Commands.c" { #line 468 "/home/jens/Source/shotwell/src/Commands.vala" database_table_commit_transaction (&_inner_error_); @@ -5566,7 +6163,7 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 468 "/home/jens/Source/shotwell/src/Commands.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 5570 "Commands.c" +#line 6167 "Commands.c" goto __catch465_database_error; } { @@ -5580,7 +6177,7 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) { page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE_WINDOW, PageWindow)); #line 472 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_tmp8_); -#line 5584 "Commands.c" +#line 6181 "Commands.c" } #line 468 "/home/jens/Source/shotwell/src/Commands.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -5588,7 +6185,7 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) { g_clear_error (&_inner_error_); #line 468 "/home/jens/Source/shotwell/src/Commands.vala" return; -#line 5592 "Commands.c" +#line 6189 "Commands.c" } } goto __finally465; @@ -5606,7 +6203,7 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) { app_window_database_error (_tmp9_); #line 467 "/home/jens/Source/shotwell/src/Commands.vala" _g_error_free0 (err); -#line 5610 "Commands.c" +#line 6207 "Commands.c" } __finally465: { @@ -5620,7 +6217,7 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) { page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE_WINDOW, PageWindow)); #line 472 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_tmp11_); -#line 5624 "Commands.c" +#line 6221 "Commands.c" } #line 467 "/home/jens/Source/shotwell/src/Commands.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5630,109 +6227,111 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) { g_clear_error (&_inner_error_); #line 467 "/home/jens/Source/shotwell/src/Commands.vala" return; -#line 5634 "Commands.c" +#line 6231 "Commands.c" } } -static void multiple_data_source_at_once_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* self, GeeCollection* sources) { +static void +multiple_data_source_at_once_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* self, + GeeCollection* sources) +{ #line 476 "/home/jens/Source/shotwell/src/Commands.vala" g_critical ("Type `%s' does not implement abstract method `multiple_data_source_at_once_command_undo_on_all'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 476 "/home/jens/Source/shotwell/src/Commands.vala" return; -#line 5644 "Commands.c" +#line 6244 "Commands.c" } -void multiple_data_source_at_once_command_undo_on_all (MultipleDataSourceAtOnceCommand* self, GeeCollection* sources) { +void +multiple_data_source_at_once_command_undo_on_all (MultipleDataSourceAtOnceCommand* self, + GeeCollection* sources) +{ #line 476 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND (self)); #line 476 "/home/jens/Source/shotwell/src/Commands.vala" MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND_GET_CLASS (self)->undo_on_all (self, sources); -#line 5653 "Commands.c" +#line 6256 "Commands.c" } -static void multiple_data_source_at_once_command_on_sources_destroyed (MultipleDataSourceAtOnceCommand* self, GeeCollection* destroyed) { +static void +multiple_data_source_at_once_command_on_sources_destroyed (MultipleDataSourceAtOnceCommand* self, + GeeCollection* destroyed) +{ #line 478 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND (self)); #line 478 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (GEE_IS_COLLECTION (destroyed)); -#line 5662 "Commands.c" +#line 6268 "Commands.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 479 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = destroyed; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (destroyed, GEE_TYPE_ITERABLE, GeeIterable)); #line 479 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 479 "/home/jens/Source/shotwell/src/Commands.vala" - _source_it = _tmp1_; + _source_it = _tmp0_; #line 479 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 5675 "Commands.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 6278 "Commands.c" + GeeIterator* _tmp1_; DataSource* source = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - GeeHashSet* _tmp6_; - DataSource* _tmp7_; - gboolean _tmp8_; -#line 479 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _source_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + GeeHashSet* _tmp4_; + DataSource* _tmp5_; #line 479 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _source_it; #line 479 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 479 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 5692 "Commands.c" +#line 6291 "Commands.c" } #line 479 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _source_it; + _tmp2_ = _source_it; #line 479 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 479 "/home/jens/Source/shotwell/src/Commands.vala" - source = (DataSource*) _tmp5_; + source = (DataSource*) _tmp3_; #line 480 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = self->priv->sources; + _tmp4_ = self->priv->sources; #line 480 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = source; + _tmp5_ = source; #line 480 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_); -#line 480 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp8_) { -#line 5708 "Commands.c" - CommandManager* _tmp9_; - CommandManager* _tmp10_; + if (gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_)) { +#line 6305 "Commands.c" + CommandManager* _tmp6_; + CommandManager* _tmp7_; #line 481 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command)); + _tmp6_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command)); #line 481 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = _tmp9_; + _tmp7_ = _tmp6_; #line 481 "/home/jens/Source/shotwell/src/Commands.vala" - command_manager_reset (_tmp10_); + command_manager_reset (_tmp7_); #line 481 "/home/jens/Source/shotwell/src/Commands.vala" - _command_manager_unref0 (_tmp10_); + _command_manager_unref0 (_tmp7_); #line 483 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); #line 483 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 5723 "Commands.c" +#line 6320 "Commands.c" } #line 479 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); -#line 5727 "Commands.c" +#line 6324 "Commands.c" } #line 479 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_it); -#line 5731 "Commands.c" +#line 6328 "Commands.c" } } -static void multiple_data_source_at_once_command_class_init (MultipleDataSourceAtOnceCommandClass * klass) { +static void +multiple_data_source_at_once_command_class_init (MultipleDataSourceAtOnceCommandClass * klass) +{ #line 413 "/home/jens/Source/shotwell/src/Commands.vala" multiple_data_source_at_once_command_parent_class = g_type_class_peek_parent (klass); #line 413 "/home/jens/Source/shotwell/src/Commands.vala" @@ -5747,11 +6346,13 @@ static void multiple_data_source_at_once_command_class_init (MultipleDataSourceA ((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) multiple_data_source_at_once_command_real_undo_on_all; #line 413 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = multiple_data_source_at_once_command_finalize; -#line 5751 "Commands.c" +#line 6350 "Commands.c" } -static void multiple_data_source_at_once_command_instance_init (MultipleDataSourceAtOnceCommand * self) { +static void +multiple_data_source_at_once_command_instance_init (MultipleDataSourceAtOnceCommand * self) +{ GeeHashSet* _tmp0_; GeeHashSet* _tmp1_; #line 413 "/home/jens/Source/shotwell/src/Commands.vala" @@ -5764,15 +6365,17 @@ static void multiple_data_source_at_once_command_instance_init (MultipleDataSour _tmp1_ = gee_hash_set_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 415 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->hooked_collections = _tmp1_; -#line 5768 "Commands.c" +#line 6369 "Commands.c" } -static void multiple_data_source_at_once_command_finalize (GObject * obj) { +static void +multiple_data_source_at_once_command_finalize (GObject * obj) +{ MultipleDataSourceAtOnceCommand * self; #line 413 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND, MultipleDataSourceAtOnceCommand); -#line 5776 "Commands.c" +#line 6379 "Commands.c" { GeeIterator* _source_collection_it = NULL; GeeHashSet* _tmp0_; @@ -5785,43 +6388,40 @@ static void multiple_data_source_at_once_command_finalize (GObject * obj) { _source_collection_it = _tmp1_; #line 434 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 5789 "Commands.c" +#line 6392 "Commands.c" GeeIterator* _tmp2_; - gboolean _tmp3_; SourceCollection* source_collection = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - SourceCollection* _tmp6_; - guint _tmp7_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + SourceCollection* _tmp5_; + guint _tmp6_; #line 434 "/home/jens/Source/shotwell/src/Commands.vala" _tmp2_ = _source_collection_it; #line 434 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 434 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 434 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 5805 "Commands.c" +#line 6405 "Commands.c" } #line 434 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _source_collection_it; + _tmp3_ = _source_collection_it; #line 434 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 434 "/home/jens/Source/shotwell/src/Commands.vala" - source_collection = (SourceCollection*) _tmp5_; + source_collection = (SourceCollection*) _tmp4_; #line 435 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = source_collection; + _tmp5_ = source_collection; #line 435 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_parse_name ("items-destroyed", TYPE_SOURCE_COLLECTION, &_tmp7_, NULL, FALSE); + g_signal_parse_name ("items-destroyed", TYPE_SOURCE_COLLECTION, &_tmp6_, NULL, FALSE); #line 435 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _multiple_data_source_at_once_command_on_sources_destroyed_source_collection_items_destroyed, self); + g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _multiple_data_source_at_once_command_on_sources_destroyed_source_collection_items_destroyed, self); #line 434 "/home/jens/Source/shotwell/src/Commands.vala" _data_collection_unref0 (source_collection); -#line 5821 "Commands.c" +#line 6421 "Commands.c" } #line 434 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_collection_it); -#line 5825 "Commands.c" +#line 6425 "Commands.c" } #line 414 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->sources); @@ -5829,11 +6429,13 @@ static void multiple_data_source_at_once_command_finalize (GObject * obj) { _g_object_unref0 (self->priv->hooked_collections); #line 413 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (multiple_data_source_at_once_command_parent_class)->finalize (obj); -#line 5833 "Commands.c" +#line 6433 "Commands.c" } -GType multiple_data_source_at_once_command_get_type (void) { +GType +multiple_data_source_at_once_command_get_type (void) +{ static volatile gsize multiple_data_source_at_once_command_type_id__volatile = 0; if (g_once_init_enter (&multiple_data_source_at_once_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MultipleDataSourceAtOnceCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) multiple_data_source_at_once_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MultipleDataSourceAtOnceCommand), 0, (GInstanceInitFunc) multiple_data_source_at_once_command_instance_init, NULL }; @@ -5845,20 +6447,25 @@ GType multiple_data_source_at_once_command_get_type (void) { } -static void _multiple_photo_transformation_command_on_state_broken_photo_transformation_state_broken (PhotoTransformationState* _sender, gpointer self) { +static void +_multiple_photo_transformation_command_on_state_broken_photo_transformation_state_broken (PhotoTransformationState* _sender, + gpointer self) +{ #line 508 "/home/jens/Source/shotwell/src/Commands.vala" multiple_photo_transformation_command_on_state_broken ((MultiplePhotoTransformationCommand*) self); -#line 5852 "Commands.c" +#line 6457 "Commands.c" } -MultiplePhotoTransformationCommand* multiple_photo_transformation_command_construct (GType object_type, GeeIterable* iter, const gchar* progress_text, const gchar* undo_progress_text, const gchar* name, const gchar* explanation) { +MultiplePhotoTransformationCommand* +multiple_photo_transformation_command_construct (GType object_type, + GeeIterable* iter, + const gchar* progress_text, + const gchar* undo_progress_text, + const gchar* name, + const gchar* explanation) +{ MultiplePhotoTransformationCommand * self = NULL; - GeeIterable* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; #line 493 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL); #line 493 "/home/jens/Source/shotwell/src/Commands.vala" @@ -5870,151 +6477,141 @@ MultiplePhotoTransformationCommand* multiple_photo_transformation_command_constr #line 493 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (explanation != NULL, NULL); #line 495 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = iter; -#line 495 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = progress_text; -#line 495 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = undo_progress_text; -#line 495 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = name; -#line 495 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = explanation; -#line 495 "/home/jens/Source/shotwell/src/Commands.vala" - self = (MultiplePhotoTransformationCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_); -#line 5885 "Commands.c" + self = (MultiplePhotoTransformationCommand*) multiple_data_source_command_construct (object_type, iter, progress_text, undo_progress_text, name, explanation); +#line 6482 "Commands.c" { GeeArrayList* _source_list = NULL; - GeeArrayList* _tmp5_; - GeeArrayList* _tmp6_; + GeeArrayList* _tmp0_; + GeeArrayList* _tmp1_; gint _source_size = 0; - GeeArrayList* _tmp7_; - gint _tmp8_; - gint _tmp9_; + GeeArrayList* _tmp2_; + gint _tmp3_; + gint _tmp4_; gint _source_index = 0; #line 497 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand)->source_list; + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand)->source_list; #line 497 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 497 "/home/jens/Source/shotwell/src/Commands.vala" - _source_list = _tmp6_; + _source_list = _tmp1_; #line 497 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = _source_list; + _tmp2_ = _source_list; #line 497 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 497 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = _tmp8_; + _tmp4_ = _tmp3_; #line 497 "/home/jens/Source/shotwell/src/Commands.vala" - _source_size = _tmp9_; + _source_size = _tmp4_; #line 497 "/home/jens/Source/shotwell/src/Commands.vala" _source_index = -1; #line 497 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 5913 "Commands.c" - gint _tmp10_; - gint _tmp11_; - gint _tmp12_; +#line 6510 "Commands.c" + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; DataSource* source = NULL; - GeeArrayList* _tmp13_; - gint _tmp14_; - gpointer _tmp15_; + GeeArrayList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; Photo* photo = NULL; - DataSource* _tmp16_; - Photo* _tmp17_; + DataSource* _tmp11_; + Photo* _tmp12_; PhotoTransformationState* state = NULL; - Photo* _tmp18_; - PhotoTransformationState* _tmp19_; - PhotoTransformationState* _tmp20_; - GeeHashMap* _tmp21_; - Photo* _tmp22_; - PhotoTransformationState* _tmp23_; + Photo* _tmp13_; + PhotoTransformationState* _tmp14_; + PhotoTransformationState* _tmp15_; + GeeHashMap* _tmp16_; + Photo* _tmp17_; + PhotoTransformationState* _tmp18_; #line 497 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = _source_index; + _tmp5_ = _source_index; #line 497 "/home/jens/Source/shotwell/src/Commands.vala" - _source_index = _tmp10_ + 1; + _source_index = _tmp5_ + 1; #line 497 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = _source_index; + _tmp6_ = _source_index; #line 497 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = _source_size; + _tmp7_ = _source_size; #line 497 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp11_ < _tmp12_)) { + if (!(_tmp6_ < _tmp7_)) { #line 497 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 5943 "Commands.c" +#line 6540 "Commands.c" } #line 497 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = _source_list; + _tmp8_ = _source_list; #line 497 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = _source_index; + _tmp9_ = _source_index; #line 497 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp14_); + _tmp10_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp9_); #line 497 "/home/jens/Source/shotwell/src/Commands.vala" - source = (DataSource*) _tmp15_; + source = (DataSource*) _tmp10_; #line 498 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = source; + _tmp11_ = source; #line 498 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO, Photo)); + _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO, Photo)); #line 498 "/home/jens/Source/shotwell/src/Commands.vala" - photo = _tmp17_; + photo = _tmp12_; #line 499 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = photo; + _tmp13_ = photo; #line 499 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = photo_save_transformation_state (_tmp18_); + _tmp14_ = photo_save_transformation_state (_tmp13_); #line 499 "/home/jens/Source/shotwell/src/Commands.vala" - state = _tmp19_; + state = _tmp14_; #line 500 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = state; + _tmp15_ = state; #line 500 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (_tmp20_, "broken", (GCallback) _multiple_photo_transformation_command_on_state_broken_photo_transformation_state_broken, self, 0); + g_signal_connect_object (_tmp15_, "broken", (GCallback) _multiple_photo_transformation_command_on_state_broken_photo_transformation_state_broken, self, 0); #line 502 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = self->priv->map; + _tmp16_ = self->priv->map; #line 502 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = photo; + _tmp17_ = photo; #line 502 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = state; + _tmp18_ = state; #line 502 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, _tmp23_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_, _tmp18_); #line 497 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (state); #line 497 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (photo); #line 497 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); -#line 5983 "Commands.c" +#line 6580 "Commands.c" } #line 497 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_list); -#line 5987 "Commands.c" +#line 6584 "Commands.c" } #line 493 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 5991 "Commands.c" +#line 6588 "Commands.c" } -static void multiple_photo_transformation_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) { +static void +multiple_photo_transformation_command_real_undo_on_source (MultipleDataSourceCommand* base, + DataSource* source) +{ MultiplePhotoTransformationCommand * self; Photo* photo = NULL; - DataSource* _tmp0_; - Photo* _tmp1_; + Photo* _tmp0_; PhotoTransformationState* state = NULL; - GeeHashMap* _tmp2_; - gpointer _tmp3_; + GeeHashMap* _tmp1_; + gpointer _tmp2_; #line 511 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MULTIPLE_PHOTO_TRANSFORMATION_COMMAND, MultiplePhotoTransformationCommand); #line 511 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 512 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_PHOTO, Photo)); #line 512 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo)); -#line 512 "/home/jens/Source/shotwell/src/Commands.vala" - photo = _tmp1_; + photo = _tmp0_; #line 514 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = self->priv->map; + _tmp1_ = self->priv->map; #line 514 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo); + _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo); #line 514 "/home/jens/Source/shotwell/src/Commands.vala" - state = (PhotoTransformationState*) _tmp3_; + state = (PhotoTransformationState*) _tmp2_; #line 515 "/home/jens/Source/shotwell/src/Commands.vala" _vala_assert (state != NULL, "state != null"); #line 517 "/home/jens/Source/shotwell/src/Commands.vala" @@ -6023,11 +6620,13 @@ static void multiple_photo_transformation_command_real_undo_on_source (MultipleD _g_object_unref0 (state); #line 511 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (photo); -#line 6027 "Commands.c" +#line 6624 "Commands.c" } -static void multiple_photo_transformation_command_on_state_broken (MultiplePhotoTransformationCommand* self) { +static void +multiple_photo_transformation_command_on_state_broken (MultiplePhotoTransformationCommand* self) +{ CommandManager* _tmp0_; CommandManager* _tmp1_; #line 520 "/home/jens/Source/shotwell/src/Commands.vala" @@ -6040,11 +6639,13 @@ static void multiple_photo_transformation_command_on_state_broken (MultiplePhoto command_manager_reset (_tmp1_); #line 521 "/home/jens/Source/shotwell/src/Commands.vala" _command_manager_unref0 (_tmp1_); -#line 6044 "Commands.c" +#line 6643 "Commands.c" } -static void multiple_photo_transformation_command_class_init (MultiplePhotoTransformationCommandClass * klass) { +static void +multiple_photo_transformation_command_class_init (MultiplePhotoTransformationCommandClass * klass) +{ #line 489 "/home/jens/Source/shotwell/src/Commands.vala" multiple_photo_transformation_command_parent_class = g_type_class_peek_parent (klass); #line 489 "/home/jens/Source/shotwell/src/Commands.vala" @@ -6053,11 +6654,13 @@ static void multiple_photo_transformation_command_class_init (MultiplePhotoTrans ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) multiple_photo_transformation_command_real_undo_on_source; #line 489 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = multiple_photo_transformation_command_finalize; -#line 6057 "Commands.c" +#line 6658 "Commands.c" } -static void multiple_photo_transformation_command_instance_init (MultiplePhotoTransformationCommand * self) { +static void +multiple_photo_transformation_command_instance_init (MultiplePhotoTransformationCommand * self) +{ GeeHashMap* _tmp0_; #line 489 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = MULTIPLE_PHOTO_TRANSFORMATION_COMMAND_GET_PRIVATE (self); @@ -6065,15 +6668,17 @@ static void multiple_photo_transformation_command_instance_init (MultiplePhotoTr _tmp0_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_PHOTO_TRANSFORMATION_STATE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 490 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->map = _tmp0_; -#line 6069 "Commands.c" +#line 6672 "Commands.c" } -static void multiple_photo_transformation_command_finalize (GObject * obj) { +static void +multiple_photo_transformation_command_finalize (GObject * obj) +{ MultiplePhotoTransformationCommand * self; #line 489 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTIPLE_PHOTO_TRANSFORMATION_COMMAND, MultiplePhotoTransformationCommand); -#line 6077 "Commands.c" +#line 6682 "Commands.c" { GeeIterator* _state_it = NULL; GeeHashMap* _tmp0_; @@ -6100,53 +6705,52 @@ static void multiple_photo_transformation_command_finalize (GObject * obj) { _state_it = _tmp5_; #line 507 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 6104 "Commands.c" +#line 6709 "Commands.c" GeeIterator* _tmp6_; - gboolean _tmp7_; PhotoTransformationState* state = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - PhotoTransformationState* _tmp10_; - guint _tmp11_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + PhotoTransformationState* _tmp9_; + guint _tmp10_; #line 507 "/home/jens/Source/shotwell/src/Commands.vala" _tmp6_ = _state_it; #line 507 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 507 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 507 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 6120 "Commands.c" +#line 6722 "Commands.c" } #line 507 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = _state_it; + _tmp7_ = _state_it; #line 507 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 507 "/home/jens/Source/shotwell/src/Commands.vala" - state = (PhotoTransformationState*) _tmp9_; + state = (PhotoTransformationState*) _tmp8_; #line 508 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = state; + _tmp9_ = state; #line 508 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_parse_name ("broken", TYPE_PHOTO_TRANSFORMATION_STATE, &_tmp11_, NULL, FALSE); + g_signal_parse_name ("broken", TYPE_PHOTO_TRANSFORMATION_STATE, &_tmp10_, NULL, FALSE); #line 508 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _multiple_photo_transformation_command_on_state_broken_photo_transformation_state_broken, self); + g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _multiple_photo_transformation_command_on_state_broken_photo_transformation_state_broken, self); #line 507 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (state); -#line 6136 "Commands.c" +#line 6738 "Commands.c" } #line 507 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_state_it); -#line 6140 "Commands.c" +#line 6742 "Commands.c" } #line 490 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->map); #line 489 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (multiple_photo_transformation_command_parent_class)->finalize (obj); -#line 6146 "Commands.c" +#line 6748 "Commands.c" } -GType multiple_photo_transformation_command_get_type (void) { +GType +multiple_photo_transformation_command_get_type (void) +{ static volatile gsize multiple_photo_transformation_command_type_id__volatile = 0; if (g_once_init_enter (&multiple_photo_transformation_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MultiplePhotoTransformationCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) multiple_photo_transformation_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MultiplePhotoTransformationCommand), 0, (GInstanceInitFunc) multiple_photo_transformation_command_instance_init, NULL }; @@ -6158,12 +6762,14 @@ GType multiple_photo_transformation_command_get_type (void) { } -RotateSingleCommand* rotate_single_command_construct (GType object_type, Photo* photo, Rotation rotation, const gchar* name, const gchar* explanation) { +RotateSingleCommand* +rotate_single_command_construct (GType object_type, + Photo* photo, + Rotation rotation, + const gchar* name, + const gchar* explanation) +{ RotateSingleCommand * self = NULL; - Photo* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - Rotation _tmp3_; #line 528 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); #line 528 "/home/jens/Source/shotwell/src/Commands.vala" @@ -6171,31 +6777,30 @@ RotateSingleCommand* rotate_single_command_construct (GType object_type, Photo* #line 528 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (explanation != NULL, NULL); #line 529 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = photo; -#line 529 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = name; -#line 529 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = explanation; -#line 529 "/home/jens/Source/shotwell/src/Commands.vala" - self = (RotateSingleCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource), _tmp1_, _tmp2_); + self = (RotateSingleCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_SOURCE, DataSource), name, explanation); #line 531 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = rotation; -#line 531 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->rotation = _tmp3_; + self->priv->rotation = rotation; #line 528 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 6188 "Commands.c" +#line 6786 "Commands.c" } -RotateSingleCommand* rotate_single_command_new (Photo* photo, Rotation rotation, const gchar* name, const gchar* explanation) { +RotateSingleCommand* +rotate_single_command_new (Photo* photo, + Rotation rotation, + const gchar* name, + const gchar* explanation) +{ #line 528 "/home/jens/Source/shotwell/src/Commands.vala" return rotate_single_command_construct (TYPE_ROTATE_SINGLE_COMMAND, photo, rotation, name, explanation); -#line 6195 "Commands.c" +#line 6798 "Commands.c" } -static void rotate_single_command_real_execute (Command* base) { +static void +rotate_single_command_real_execute (Command* base) +{ RotateSingleCommand * self; DataSource* _tmp0_; Rotation _tmp1_; @@ -6207,15 +6812,16 @@ static void rotate_single_command_real_execute (Command* base) { _tmp1_ = self->priv->rotation; #line 535 "/home/jens/Source/shotwell/src/Commands.vala" photo_rotate (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp1_); -#line 6211 "Commands.c" +#line 6816 "Commands.c" } -static void rotate_single_command_real_undo (Command* base) { +static void +rotate_single_command_real_undo (Command* base) +{ RotateSingleCommand * self; DataSource* _tmp0_; Rotation _tmp1_; - Rotation _tmp2_; #line 538 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ROTATE_SINGLE_COMMAND, RotateSingleCommand); #line 539 "/home/jens/Source/shotwell/src/Commands.vala" @@ -6223,14 +6829,14 @@ static void rotate_single_command_real_undo (Command* base) { #line 539 "/home/jens/Source/shotwell/src/Commands.vala" _tmp1_ = self->priv->rotation; #line 539 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = rotation_opposite (_tmp1_); -#line 539 "/home/jens/Source/shotwell/src/Commands.vala" - photo_rotate (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp2_); -#line 6230 "Commands.c" + photo_rotate (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), rotation_opposite (_tmp1_)); +#line 6834 "Commands.c" } -static void rotate_single_command_class_init (RotateSingleCommandClass * klass) { +static void +rotate_single_command_class_init (RotateSingleCommandClass * klass) +{ #line 525 "/home/jens/Source/shotwell/src/Commands.vala" rotate_single_command_parent_class = g_type_class_peek_parent (klass); #line 525 "/home/jens/Source/shotwell/src/Commands.vala" @@ -6241,28 +6847,34 @@ static void rotate_single_command_class_init (RotateSingleCommandClass * klass) ((CommandClass *) klass)->undo = (void (*) (Command *)) rotate_single_command_real_undo; #line 525 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = rotate_single_command_finalize; -#line 6245 "Commands.c" +#line 6851 "Commands.c" } -static void rotate_single_command_instance_init (RotateSingleCommand * self) { +static void +rotate_single_command_instance_init (RotateSingleCommand * self) +{ #line 525 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = ROTATE_SINGLE_COMMAND_GET_PRIVATE (self); -#line 6252 "Commands.c" +#line 6860 "Commands.c" } -static void rotate_single_command_finalize (GObject * obj) { +static void +rotate_single_command_finalize (GObject * obj) +{ RotateSingleCommand * self; #line 525 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ROTATE_SINGLE_COMMAND, RotateSingleCommand); #line 525 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (rotate_single_command_parent_class)->finalize (obj); -#line 6262 "Commands.c" +#line 6872 "Commands.c" } -GType rotate_single_command_get_type (void) { +GType +rotate_single_command_get_type (void) +{ static volatile gsize rotate_single_command_type_id__volatile = 0; if (g_once_init_enter (&rotate_single_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RotateSingleCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) rotate_single_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RotateSingleCommand), 0, (GInstanceInitFunc) rotate_single_command_instance_init, NULL }; @@ -6274,14 +6886,16 @@ GType rotate_single_command_get_type (void) { } -RotateMultipleCommand* rotate_multiple_command_construct (GType object_type, GeeIterable* iter, Rotation rotation, const gchar* name, const gchar* explanation, const gchar* progress_text, const gchar* undo_progress_text) { +RotateMultipleCommand* +rotate_multiple_command_construct (GType object_type, + GeeIterable* iter, + Rotation rotation, + const gchar* name, + const gchar* explanation, + const gchar* progress_text, + const gchar* undo_progress_text) +{ RotateMultipleCommand * self = NULL; - GeeIterable* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - Rotation _tmp5_; #line 546 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL); #line 546 "/home/jens/Source/shotwell/src/Commands.vala" @@ -6293,74 +6907,68 @@ RotateMultipleCommand* rotate_multiple_command_construct (GType object_type, Gee #line 546 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (undo_progress_text != NULL, NULL); #line 548 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = iter; -#line 548 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = progress_text; -#line 548 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = undo_progress_text; -#line 548 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = name; -#line 548 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = explanation; -#line 548 "/home/jens/Source/shotwell/src/Commands.vala" - self = (RotateMultipleCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_); -#line 550 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = rotation; + self = (RotateMultipleCommand*) multiple_data_source_command_construct (object_type, iter, progress_text, undo_progress_text, name, explanation); #line 550 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->rotation = _tmp5_; + self->priv->rotation = rotation; #line 546 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 6314 "Commands.c" +#line 6916 "Commands.c" } -RotateMultipleCommand* rotate_multiple_command_new (GeeIterable* iter, Rotation rotation, const gchar* name, const gchar* explanation, const gchar* progress_text, const gchar* undo_progress_text) { +RotateMultipleCommand* +rotate_multiple_command_new (GeeIterable* iter, + Rotation rotation, + const gchar* name, + const gchar* explanation, + const gchar* progress_text, + const gchar* undo_progress_text) +{ #line 546 "/home/jens/Source/shotwell/src/Commands.vala" return rotate_multiple_command_construct (TYPE_ROTATE_MULTIPLE_COMMAND, iter, rotation, name, explanation, progress_text, undo_progress_text); -#line 6321 "Commands.c" +#line 6930 "Commands.c" } -static void rotate_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) { +static void +rotate_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, + DataSource* source) +{ RotateMultipleCommand * self; - DataSource* _tmp0_; - Rotation _tmp1_; + Rotation _tmp0_; #line 553 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ROTATE_MULTIPLE_COMMAND, RotateMultipleCommand); #line 553 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 554 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; + _tmp0_ = self->priv->rotation; #line 554 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = self->priv->rotation; -#line 554 "/home/jens/Source/shotwell/src/Commands.vala" - photo_rotate (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp1_); -#line 6339 "Commands.c" + photo_rotate (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_PHOTO, Photo), _tmp0_); +#line 6948 "Commands.c" } -static void rotate_multiple_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) { +static void +rotate_multiple_command_real_undo_on_source (MultipleDataSourceCommand* base, + DataSource* source) +{ RotateMultipleCommand * self; - DataSource* _tmp0_; - Rotation _tmp1_; - Rotation _tmp2_; + Rotation _tmp0_; #line 557 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ROTATE_MULTIPLE_COMMAND, RotateMultipleCommand); #line 557 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 558 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; -#line 558 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = self->priv->rotation; -#line 558 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = rotation_opposite (_tmp1_); + _tmp0_ = self->priv->rotation; #line 558 "/home/jens/Source/shotwell/src/Commands.vala" - photo_rotate (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp2_); -#line 6360 "Commands.c" + photo_rotate (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_PHOTO, Photo), rotation_opposite (_tmp0_)); +#line 6966 "Commands.c" } -static void rotate_multiple_command_class_init (RotateMultipleCommandClass * klass) { +static void +rotate_multiple_command_class_init (RotateMultipleCommandClass * klass) +{ #line 543 "/home/jens/Source/shotwell/src/Commands.vala" rotate_multiple_command_parent_class = g_type_class_peek_parent (klass); #line 543 "/home/jens/Source/shotwell/src/Commands.vala" @@ -6371,28 +6979,34 @@ static void rotate_multiple_command_class_init (RotateMultipleCommandClass * kla ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) rotate_multiple_command_real_undo_on_source; #line 543 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = rotate_multiple_command_finalize; -#line 6375 "Commands.c" +#line 6983 "Commands.c" } -static void rotate_multiple_command_instance_init (RotateMultipleCommand * self) { +static void +rotate_multiple_command_instance_init (RotateMultipleCommand * self) +{ #line 543 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = ROTATE_MULTIPLE_COMMAND_GET_PRIVATE (self); -#line 6382 "Commands.c" +#line 6992 "Commands.c" } -static void rotate_multiple_command_finalize (GObject * obj) { +static void +rotate_multiple_command_finalize (GObject * obj) +{ RotateMultipleCommand * self; #line 543 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ROTATE_MULTIPLE_COMMAND, RotateMultipleCommand); #line 543 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (rotate_multiple_command_parent_class)->finalize (obj); -#line 6392 "Commands.c" +#line 7004 "Commands.c" } -GType rotate_multiple_command_get_type (void) { +GType +rotate_multiple_command_get_type (void) +{ static volatile gsize rotate_multiple_command_type_id__volatile = 0; if (g_once_init_enter (&rotate_multiple_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RotateMultipleCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) rotate_multiple_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RotateMultipleCommand), 0, (GInstanceInitFunc) rotate_multiple_command_instance_init, NULL }; @@ -6404,15 +7018,16 @@ GType rotate_multiple_command_get_type (void) { } -EditTitleCommand* edit_title_command_construct (GType object_type, MediaSource* source, const gchar* new_title) { +EditTitleCommand* +edit_title_command_construct (GType object_type, + MediaSource* source, + const gchar* new_title) +{ EditTitleCommand * self = NULL; gchar* title = NULL; gchar* _tmp0_; - MediaSource* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_; - MediaSource* _tmp4_; - gchar* _tmp5_; + gchar* _tmp1_; + gchar* _tmp2_; #line 566 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL); #line 566 "/home/jens/Source/shotwell/src/Commands.vala" @@ -6422,41 +7037,40 @@ EditTitleCommand* edit_title_command_construct (GType object_type, MediaSource* #line 567 "/home/jens/Source/shotwell/src/Commands.vala" title = _tmp0_; #line 569 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = source; -#line 569 "/home/jens/Source/shotwell/src/Commands.vala" - self = (EditTitleCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource), title, ""); -#line 571 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = new_title; + self = (EditTitleCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource), title, ""); #line 571 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (new_title); #line 571 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->new_title); #line 571 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->new_title = _tmp3_; + self->priv->new_title = _tmp1_; #line 572 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = source; -#line 572 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = media_source_get_title (_tmp4_); + _tmp2_ = media_source_get_title (source); #line 572 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->old_title); #line 572 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->old_title = _tmp5_; + self->priv->old_title = _tmp2_; #line 566 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (title); #line 566 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 6449 "Commands.c" +#line 7058 "Commands.c" } -EditTitleCommand* edit_title_command_new (MediaSource* source, const gchar* new_title) { +EditTitleCommand* +edit_title_command_new (MediaSource* source, + const gchar* new_title) +{ #line 566 "/home/jens/Source/shotwell/src/Commands.vala" return edit_title_command_construct (TYPE_EDIT_TITLE_COMMAND, source, new_title); -#line 6456 "Commands.c" +#line 7068 "Commands.c" } -static void edit_title_command_real_execute (Command* base) { +static void +edit_title_command_real_execute (Command* base) +{ EditTitleCommand * self; DataSource* _tmp0_; const gchar* _tmp1_; @@ -6468,11 +7082,13 @@ static void edit_title_command_real_execute (Command* base) { _tmp1_ = self->priv->new_title; #line 576 "/home/jens/Source/shotwell/src/Commands.vala" media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_); -#line 6472 "Commands.c" +#line 7086 "Commands.c" } -static void edit_title_command_real_undo (Command* base) { +static void +edit_title_command_real_undo (Command* base) +{ EditTitleCommand * self; DataSource* _tmp0_; const gchar* _tmp1_; @@ -6484,11 +7100,13 @@ static void edit_title_command_real_undo (Command* base) { _tmp1_ = self->priv->old_title; #line 580 "/home/jens/Source/shotwell/src/Commands.vala" media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_); -#line 6488 "Commands.c" +#line 7104 "Commands.c" } -static void edit_title_command_class_init (EditTitleCommandClass * klass) { +static void +edit_title_command_class_init (EditTitleCommandClass * klass) +{ #line 562 "/home/jens/Source/shotwell/src/Commands.vala" edit_title_command_parent_class = g_type_class_peek_parent (klass); #line 562 "/home/jens/Source/shotwell/src/Commands.vala" @@ -6499,18 +7117,22 @@ static void edit_title_command_class_init (EditTitleCommandClass * klass) { ((CommandClass *) klass)->undo = (void (*) (Command *)) edit_title_command_real_undo; #line 562 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = edit_title_command_finalize; -#line 6503 "Commands.c" +#line 7121 "Commands.c" } -static void edit_title_command_instance_init (EditTitleCommand * self) { +static void +edit_title_command_instance_init (EditTitleCommand * self) +{ #line 562 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = EDIT_TITLE_COMMAND_GET_PRIVATE (self); -#line 6510 "Commands.c" +#line 7130 "Commands.c" } -static void edit_title_command_finalize (GObject * obj) { +static void +edit_title_command_finalize (GObject * obj) +{ EditTitleCommand * self; #line 562 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDIT_TITLE_COMMAND, EditTitleCommand); @@ -6520,11 +7142,13 @@ static void edit_title_command_finalize (GObject * obj) { _g_free0 (self->priv->old_title); #line 562 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (edit_title_command_parent_class)->finalize (obj); -#line 6524 "Commands.c" +#line 7146 "Commands.c" } -GType edit_title_command_get_type (void) { +GType +edit_title_command_get_type (void) +{ static volatile gsize edit_title_command_type_id__volatile = 0; if (g_once_init_enter (&edit_title_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditTitleCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) edit_title_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditTitleCommand), 0, (GInstanceInitFunc) edit_title_command_instance_init, NULL }; @@ -6536,51 +7160,51 @@ GType edit_title_command_get_type (void) { } -EditCommentCommand* edit_comment_command_construct (GType object_type, MediaSource* source, const gchar* new_comment) { +EditCommentCommand* +edit_comment_command_construct (GType object_type, + MediaSource* source, + const gchar* new_comment) +{ EditCommentCommand * self = NULL; - MediaSource* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; - MediaSource* _tmp3_; - gchar* _tmp4_; + gchar* _tmp0_; + gchar* _tmp1_; #line 588 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL); #line 588 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (new_comment != NULL, NULL); #line 589 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; -#line 589 "/home/jens/Source/shotwell/src/Commands.vala" - self = (EditCommentCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource), RESOURCES_EDIT_COMMENT_LABEL, ""); -#line 591 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = new_comment; + self = (EditCommentCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource), RESOURCES_EDIT_COMMENT_LABEL, ""); #line 591 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp0_ = g_strdup (new_comment); #line 591 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->new_comment); #line 591 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->new_comment = _tmp2_; + self->priv->new_comment = _tmp0_; #line 592 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = source; -#line 592 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = media_source_get_comment (_tmp3_); + _tmp1_ = media_source_get_comment (source); #line 592 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->old_comment); #line 592 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->old_comment = _tmp4_; + self->priv->old_comment = _tmp1_; #line 588 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 6573 "Commands.c" +#line 7192 "Commands.c" } -EditCommentCommand* edit_comment_command_new (MediaSource* source, const gchar* new_comment) { +EditCommentCommand* +edit_comment_command_new (MediaSource* source, + const gchar* new_comment) +{ #line 588 "/home/jens/Source/shotwell/src/Commands.vala" return edit_comment_command_construct (TYPE_EDIT_COMMENT_COMMAND, source, new_comment); -#line 6580 "Commands.c" +#line 7202 "Commands.c" } -static void edit_comment_command_real_execute (Command* base) { +static void +edit_comment_command_real_execute (Command* base) +{ EditCommentCommand * self; DataSource* _tmp0_; const gchar* _tmp1_; @@ -6592,11 +7216,13 @@ static void edit_comment_command_real_execute (Command* base) { _tmp1_ = self->priv->new_comment; #line 596 "/home/jens/Source/shotwell/src/Commands.vala" media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_); -#line 6596 "Commands.c" +#line 7220 "Commands.c" } -static void edit_comment_command_real_undo (Command* base) { +static void +edit_comment_command_real_undo (Command* base) +{ EditCommentCommand * self; DataSource* _tmp0_; const gchar* _tmp1_; @@ -6608,11 +7234,13 @@ static void edit_comment_command_real_undo (Command* base) { _tmp1_ = self->priv->old_comment; #line 600 "/home/jens/Source/shotwell/src/Commands.vala" media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_); -#line 6612 "Commands.c" +#line 7238 "Commands.c" } -static void edit_comment_command_class_init (EditCommentCommandClass * klass) { +static void +edit_comment_command_class_init (EditCommentCommandClass * klass) +{ #line 584 "/home/jens/Source/shotwell/src/Commands.vala" edit_comment_command_parent_class = g_type_class_peek_parent (klass); #line 584 "/home/jens/Source/shotwell/src/Commands.vala" @@ -6623,18 +7251,22 @@ static void edit_comment_command_class_init (EditCommentCommandClass * klass) { ((CommandClass *) klass)->undo = (void (*) (Command *)) edit_comment_command_real_undo; #line 584 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = edit_comment_command_finalize; -#line 6627 "Commands.c" +#line 7255 "Commands.c" } -static void edit_comment_command_instance_init (EditCommentCommand * self) { +static void +edit_comment_command_instance_init (EditCommentCommand * self) +{ #line 584 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = EDIT_COMMENT_COMMAND_GET_PRIVATE (self); -#line 6634 "Commands.c" +#line 7264 "Commands.c" } -static void edit_comment_command_finalize (GObject * obj) { +static void +edit_comment_command_finalize (GObject * obj) +{ EditCommentCommand * self; #line 584 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDIT_COMMENT_COMMAND, EditCommentCommand); @@ -6644,11 +7276,13 @@ static void edit_comment_command_finalize (GObject * obj) { _g_free0 (self->priv->old_comment); #line 584 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (edit_comment_command_parent_class)->finalize (obj); -#line 6648 "Commands.c" +#line 7280 "Commands.c" } -GType edit_comment_command_get_type (void) { +GType +edit_comment_command_get_type (void) +{ static volatile gsize edit_comment_command_type_id__volatile = 0; if (g_once_init_enter (&edit_comment_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditCommentCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) edit_comment_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditCommentCommand), 0, (GInstanceInitFunc) edit_comment_command_instance_init, NULL }; @@ -6660,14 +7294,16 @@ GType edit_comment_command_get_type (void) { } -EditMultipleTitlesCommand* edit_multiple_titles_command_construct (GType object_type, GeeCollection* media_sources, const gchar* new_title) { +EditMultipleTitlesCommand* +edit_multiple_titles_command_construct (GType object_type, + GeeCollection* media_sources, + const gchar* new_title) +{ EditMultipleTitlesCommand * self = NULL; gchar* title = NULL; gchar* _tmp0_; - GeeCollection* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - gchar* _tmp4_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 608 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_COLLECTION (media_sources), NULL); #line 608 "/home/jens/Source/shotwell/src/Commands.vala" @@ -6677,228 +7313,217 @@ EditMultipleTitlesCommand* edit_multiple_titles_command_construct (GType object_ #line 609 "/home/jens/Source/shotwell/src/Commands.vala" title = _tmp0_; #line 611 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = media_sources; + _tmp1_ = title; #line 611 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = title; -#line 611 "/home/jens/Source/shotwell/src/Commands.vala" - self = (EditMultipleTitlesCommand*) multiple_data_source_at_once_command_construct (object_type, _tmp1_, _tmp2_, ""); -#line 613 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = new_title; + self = (EditMultipleTitlesCommand*) multiple_data_source_at_once_command_construct (object_type, media_sources, _tmp1_, ""); #line 613 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = g_strdup (_tmp3_); + _tmp2_ = g_strdup (new_title); #line 613 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->new_title); #line 613 "/home/jens/Source/shotwell/src/Commands.vala" - self->new_title = _tmp4_; -#line 6694 "Commands.c" + self->new_title = _tmp2_; +#line 7326 "Commands.c" { GeeIterator* _media_it = NULL; - GeeCollection* _tmp5_; - GeeIterator* _tmp6_; -#line 614 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = media_sources; + GeeIterator* _tmp3_; #line 614 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (media_sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 614 "/home/jens/Source/shotwell/src/Commands.vala" - _media_it = _tmp6_; + _media_it = _tmp3_; #line 614 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 6707 "Commands.c" - GeeIterator* _tmp7_; - gboolean _tmp8_; +#line 7336 "Commands.c" + GeeIterator* _tmp4_; MediaSource* media = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; - GeeHashMap* _tmp11_; - MediaSource* _tmp12_; - MediaSource* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; -#line 614 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = _media_it; + GeeIterator* _tmp5_; + gpointer _tmp6_; + GeeHashMap* _tmp7_; + MediaSource* _tmp8_; + MediaSource* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; #line 614 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = gee_iterator_next (_tmp7_); + _tmp4_ = _media_it; #line 614 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp4_)) { #line 614 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 6726 "Commands.c" +#line 7352 "Commands.c" } #line 614 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = _media_it; + _tmp5_ = _media_it; #line 614 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 614 "/home/jens/Source/shotwell/src/Commands.vala" - media = (MediaSource*) _tmp10_; + media = (MediaSource*) _tmp6_; #line 615 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = self->old_titles; + _tmp7_ = self->old_titles; #line 615 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = media; + _tmp8_ = media; #line 615 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = media; + _tmp9_ = media; #line 615 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = media_source_get_title (_tmp13_); + _tmp10_ = media_source_get_title (_tmp9_); #line 615 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = _tmp14_; + _tmp11_ = _tmp10_; #line 615 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_, _tmp15_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_, _tmp11_); #line 615 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp11_); #line 614 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (media); -#line 6750 "Commands.c" +#line 7376 "Commands.c" } #line 614 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_media_it); -#line 6754 "Commands.c" +#line 7380 "Commands.c" } #line 608 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (title); #line 608 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 6760 "Commands.c" +#line 7386 "Commands.c" } -EditMultipleTitlesCommand* edit_multiple_titles_command_new (GeeCollection* media_sources, const gchar* new_title) { +EditMultipleTitlesCommand* +edit_multiple_titles_command_new (GeeCollection* media_sources, + const gchar* new_title) +{ #line 608 "/home/jens/Source/shotwell/src/Commands.vala" return edit_multiple_titles_command_construct (TYPE_EDIT_MULTIPLE_TITLES_COMMAND, media_sources, new_title); -#line 6767 "Commands.c" +#line 7396 "Commands.c" } -static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources) { +static void +edit_multiple_titles_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* base, + GeeCollection* sources) +{ EditMultipleTitlesCommand * self; #line 618 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_MULTIPLE_TITLES_COMMAND, EditMultipleTitlesCommand); #line 618 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); -#line 6777 "Commands.c" +#line 7409 "Commands.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; -#line 619 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = sources; + GeeIterator* _tmp0_; #line 619 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 619 "/home/jens/Source/shotwell/src/Commands.vala" - _source_it = _tmp1_; + _source_it = _tmp0_; #line 619 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 6790 "Commands.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 7419 "Commands.c" + GeeIterator* _tmp1_; DataSource* source = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - DataSource* _tmp6_; - const gchar* _tmp7_; -#line 619 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _source_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + DataSource* _tmp4_; + const gchar* _tmp5_; #line 619 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _source_it; #line 619 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 619 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 6806 "Commands.c" +#line 7432 "Commands.c" } #line 619 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _source_it; + _tmp2_ = _source_it; #line 619 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 619 "/home/jens/Source/shotwell/src/Commands.vala" - source = (DataSource*) _tmp5_; + source = (DataSource*) _tmp3_; #line 620 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = source; + _tmp4_ = source; #line 620 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = self->new_title; + _tmp5_ = self->new_title; #line 620 "/home/jens/Source/shotwell/src/Commands.vala" - media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_); + media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource), _tmp5_); #line 619 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); -#line 6822 "Commands.c" +#line 7448 "Commands.c" } #line 619 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_it); -#line 6826 "Commands.c" +#line 7452 "Commands.c" } } -static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources) { +static void +edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* base, + GeeCollection* sources) +{ EditMultipleTitlesCommand * self; #line 623 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_MULTIPLE_TITLES_COMMAND, EditMultipleTitlesCommand); #line 623 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); -#line 6837 "Commands.c" +#line 7466 "Commands.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 624 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = sources; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 624 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 624 "/home/jens/Source/shotwell/src/Commands.vala" - _source_it = _tmp1_; + _source_it = _tmp0_; #line 624 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 6850 "Commands.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 7476 "Commands.c" + GeeIterator* _tmp1_; DataSource* source = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; + DataSource* _tmp4_; + GeeHashMap* _tmp5_; DataSource* _tmp6_; - GeeHashMap* _tmp7_; - DataSource* _tmp8_; - gpointer _tmp9_; - gchar* _tmp10_; -#line 624 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _source_it; + gpointer _tmp7_; + gchar* _tmp8_; #line 624 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _source_it; #line 624 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 624 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 6869 "Commands.c" +#line 7492 "Commands.c" } #line 624 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _source_it; + _tmp2_ = _source_it; #line 624 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 624 "/home/jens/Source/shotwell/src/Commands.vala" - source = (DataSource*) _tmp5_; + source = (DataSource*) _tmp3_; #line 625 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = source; + _tmp4_ = source; #line 625 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = self->old_titles; + _tmp5_ = self->old_titles; #line 625 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = source; + _tmp6_ = source; #line 625 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp7_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource)); #line 625 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = (gchar*) _tmp9_; + _tmp8_ = (gchar*) _tmp7_; #line 625 "/home/jens/Source/shotwell/src/Commands.vala" - media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), _tmp10_); + media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource), _tmp8_); #line 625 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp8_); #line 624 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); -#line 6893 "Commands.c" +#line 7516 "Commands.c" } #line 624 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_it); -#line 6897 "Commands.c" +#line 7520 "Commands.c" } } -static void edit_multiple_titles_command_class_init (EditMultipleTitlesCommandClass * klass) { +static void +edit_multiple_titles_command_class_init (EditMultipleTitlesCommandClass * klass) +{ #line 604 "/home/jens/Source/shotwell/src/Commands.vala" edit_multiple_titles_command_parent_class = g_type_class_peek_parent (klass); #line 604 "/home/jens/Source/shotwell/src/Commands.vala" @@ -6907,21 +7532,25 @@ static void edit_multiple_titles_command_class_init (EditMultipleTitlesCommandCl ((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) edit_multiple_titles_command_real_undo_on_all; #line 604 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = edit_multiple_titles_command_finalize; -#line 6911 "Commands.c" +#line 7536 "Commands.c" } -static void edit_multiple_titles_command_instance_init (EditMultipleTitlesCommand * self) { +static void +edit_multiple_titles_command_instance_init (EditMultipleTitlesCommand * self) +{ GeeHashMap* _tmp0_; #line 606 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 606 "/home/jens/Source/shotwell/src/Commands.vala" self->old_titles = _tmp0_; -#line 6921 "Commands.c" +#line 7548 "Commands.c" } -static void edit_multiple_titles_command_finalize (GObject * obj) { +static void +edit_multiple_titles_command_finalize (GObject * obj) +{ EditMultipleTitlesCommand * self; #line 604 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDIT_MULTIPLE_TITLES_COMMAND, EditMultipleTitlesCommand); @@ -6931,11 +7560,13 @@ static void edit_multiple_titles_command_finalize (GObject * obj) { _g_object_unref0 (self->old_titles); #line 604 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (edit_multiple_titles_command_parent_class)->finalize (obj); -#line 6935 "Commands.c" +#line 7564 "Commands.c" } -GType edit_multiple_titles_command_get_type (void) { +GType +edit_multiple_titles_command_get_type (void) +{ static volatile gsize edit_multiple_titles_command_type_id__volatile = 0; if (g_once_init_enter (&edit_multiple_titles_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditMultipleTitlesCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) edit_multiple_titles_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditMultipleTitlesCommand), 0, (GInstanceInitFunc) edit_multiple_titles_command_instance_init, NULL }; @@ -6947,234 +7578,225 @@ GType edit_multiple_titles_command_get_type (void) { } -EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType object_type, GeeCollection* media_sources, const gchar* new_comment) { +EditMultipleCommentsCommand* +edit_multiple_comments_command_construct (GType object_type, + GeeCollection* media_sources, + const gchar* new_comment) +{ EditMultipleCommentsCommand * self = NULL; - GeeCollection* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp0_; #line 633 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_COLLECTION (media_sources), NULL); #line 633 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (new_comment != NULL, NULL); #line 634 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = media_sources; -#line 634 "/home/jens/Source/shotwell/src/Commands.vala" - self = (EditMultipleCommentsCommand*) multiple_data_source_at_once_command_construct (object_type, _tmp0_, RESOURCES_EDIT_COMMENT_LABEL, ""); + self = (EditMultipleCommentsCommand*) multiple_data_source_at_once_command_construct (object_type, media_sources, RESOURCES_EDIT_COMMENT_LABEL, ""); #line 636 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = new_comment; -#line 636 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp0_ = g_strdup (new_comment); #line 636 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->new_comment); #line 636 "/home/jens/Source/shotwell/src/Commands.vala" - self->new_comment = _tmp2_; -#line 6972 "Commands.c" + self->new_comment = _tmp0_; +#line 7601 "Commands.c" { GeeIterator* _media_it = NULL; - GeeCollection* _tmp3_; - GeeIterator* _tmp4_; -#line 637 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = media_sources; + GeeIterator* _tmp1_; #line 637 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (media_sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 637 "/home/jens/Source/shotwell/src/Commands.vala" - _media_it = _tmp4_; + _media_it = _tmp1_; #line 637 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 6985 "Commands.c" - GeeIterator* _tmp5_; - gboolean _tmp6_; +#line 7611 "Commands.c" + GeeIterator* _tmp2_; MediaSource* media = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; - GeeHashMap* _tmp9_; - MediaSource* _tmp10_; - MediaSource* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; -#line 637 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = _media_it; + GeeIterator* _tmp3_; + gpointer _tmp4_; + GeeHashMap* _tmp5_; + MediaSource* _tmp6_; + MediaSource* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 637 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = gee_iterator_next (_tmp5_); + _tmp2_ = _media_it; #line 637 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp2_)) { #line 637 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 7004 "Commands.c" +#line 7627 "Commands.c" } #line 637 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = _media_it; + _tmp3_ = _media_it; #line 637 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 637 "/home/jens/Source/shotwell/src/Commands.vala" - media = (MediaSource*) _tmp8_; + media = (MediaSource*) _tmp4_; #line 638 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = self->old_comments; + _tmp5_ = self->old_comments; #line 638 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = media; + _tmp6_ = media; #line 638 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = media; + _tmp7_ = media; #line 638 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = media_source_get_comment (_tmp11_); + _tmp8_ = media_source_get_comment (_tmp7_); #line 638 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = _tmp12_; + _tmp9_ = _tmp8_; #line 638 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_, _tmp13_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_, _tmp9_); #line 638 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp9_); #line 637 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (media); -#line 7028 "Commands.c" +#line 7651 "Commands.c" } #line 637 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_media_it); -#line 7032 "Commands.c" +#line 7655 "Commands.c" } #line 633 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 7036 "Commands.c" +#line 7659 "Commands.c" } -EditMultipleCommentsCommand* edit_multiple_comments_command_new (GeeCollection* media_sources, const gchar* new_comment) { +EditMultipleCommentsCommand* +edit_multiple_comments_command_new (GeeCollection* media_sources, + const gchar* new_comment) +{ #line 633 "/home/jens/Source/shotwell/src/Commands.vala" return edit_multiple_comments_command_construct (TYPE_EDIT_MULTIPLE_COMMENTS_COMMAND, media_sources, new_comment); -#line 7043 "Commands.c" +#line 7669 "Commands.c" } -static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources) { +static void +edit_multiple_comments_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* base, + GeeCollection* sources) +{ EditMultipleCommentsCommand * self; #line 641 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_MULTIPLE_COMMENTS_COMMAND, EditMultipleCommentsCommand); #line 641 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); -#line 7053 "Commands.c" +#line 7682 "Commands.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 642 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = sources; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 642 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 642 "/home/jens/Source/shotwell/src/Commands.vala" - _source_it = _tmp1_; + _source_it = _tmp0_; #line 642 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 7066 "Commands.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 7692 "Commands.c" + GeeIterator* _tmp1_; DataSource* source = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - DataSource* _tmp6_; - const gchar* _tmp7_; -#line 642 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _source_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + DataSource* _tmp4_; + const gchar* _tmp5_; #line 642 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _source_it; #line 642 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 642 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 7082 "Commands.c" +#line 7705 "Commands.c" } #line 642 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _source_it; + _tmp2_ = _source_it; #line 642 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 642 "/home/jens/Source/shotwell/src/Commands.vala" - source = (DataSource*) _tmp5_; + source = (DataSource*) _tmp3_; #line 643 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = source; + _tmp4_ = source; #line 643 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = self->new_comment; + _tmp5_ = self->new_comment; #line 643 "/home/jens/Source/shotwell/src/Commands.vala" - media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_); + media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource), _tmp5_); #line 642 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); -#line 7098 "Commands.c" +#line 7721 "Commands.c" } #line 642 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_it); -#line 7102 "Commands.c" +#line 7725 "Commands.c" } } -static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources) { +static void +edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* base, + GeeCollection* sources) +{ EditMultipleCommentsCommand * self; #line 646 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_MULTIPLE_COMMENTS_COMMAND, EditMultipleCommentsCommand); #line 646 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); -#line 7113 "Commands.c" +#line 7739 "Commands.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; -#line 647 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = sources; + GeeIterator* _tmp0_; #line 647 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 647 "/home/jens/Source/shotwell/src/Commands.vala" - _source_it = _tmp1_; + _source_it = _tmp0_; #line 647 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 7126 "Commands.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 7749 "Commands.c" + GeeIterator* _tmp1_; DataSource* source = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; + DataSource* _tmp4_; + GeeHashMap* _tmp5_; DataSource* _tmp6_; - GeeHashMap* _tmp7_; - DataSource* _tmp8_; - gpointer _tmp9_; - gchar* _tmp10_; -#line 647 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _source_it; + gpointer _tmp7_; + gchar* _tmp8_; #line 647 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _source_it; #line 647 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 647 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 7145 "Commands.c" +#line 7765 "Commands.c" } #line 647 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _source_it; + _tmp2_ = _source_it; #line 647 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 647 "/home/jens/Source/shotwell/src/Commands.vala" - source = (DataSource*) _tmp5_; + source = (DataSource*) _tmp3_; #line 648 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = source; + _tmp4_ = source; #line 648 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = self->old_comments; + _tmp5_ = self->old_comments; #line 648 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = source; + _tmp6_ = source; #line 648 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp7_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource)); #line 648 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = (gchar*) _tmp9_; + _tmp8_ = (gchar*) _tmp7_; #line 648 "/home/jens/Source/shotwell/src/Commands.vala" - media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), _tmp10_); + media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource), _tmp8_); #line 648 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp8_); #line 647 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); -#line 7169 "Commands.c" +#line 7789 "Commands.c" } #line 647 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_it); -#line 7173 "Commands.c" +#line 7793 "Commands.c" } } -static void edit_multiple_comments_command_class_init (EditMultipleCommentsCommandClass * klass) { +static void +edit_multiple_comments_command_class_init (EditMultipleCommentsCommandClass * klass) +{ #line 629 "/home/jens/Source/shotwell/src/Commands.vala" edit_multiple_comments_command_parent_class = g_type_class_peek_parent (klass); #line 629 "/home/jens/Source/shotwell/src/Commands.vala" @@ -7183,21 +7805,25 @@ static void edit_multiple_comments_command_class_init (EditMultipleCommentsComma ((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) edit_multiple_comments_command_real_undo_on_all; #line 629 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = edit_multiple_comments_command_finalize; -#line 7187 "Commands.c" +#line 7809 "Commands.c" } -static void edit_multiple_comments_command_instance_init (EditMultipleCommentsCommand * self) { +static void +edit_multiple_comments_command_instance_init (EditMultipleCommentsCommand * self) +{ GeeHashMap* _tmp0_; #line 631 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 631 "/home/jens/Source/shotwell/src/Commands.vala" self->old_comments = _tmp0_; -#line 7197 "Commands.c" +#line 7821 "Commands.c" } -static void edit_multiple_comments_command_finalize (GObject * obj) { +static void +edit_multiple_comments_command_finalize (GObject * obj) +{ EditMultipleCommentsCommand * self; #line 629 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDIT_MULTIPLE_COMMENTS_COMMAND, EditMultipleCommentsCommand); @@ -7207,11 +7833,13 @@ static void edit_multiple_comments_command_finalize (GObject * obj) { _g_object_unref0 (self->old_comments); #line 629 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (edit_multiple_comments_command_parent_class)->finalize (obj); -#line 7211 "Commands.c" +#line 7837 "Commands.c" } -GType edit_multiple_comments_command_get_type (void) { +GType +edit_multiple_comments_command_get_type (void) +{ static volatile gsize edit_multiple_comments_command_type_id__volatile = 0; if (g_once_init_enter (&edit_multiple_comments_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditMultipleCommentsCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) edit_multiple_comments_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditMultipleCommentsCommand), 0, (GInstanceInitFunc) edit_multiple_comments_command_instance_init, NULL }; @@ -7223,87 +7851,87 @@ GType edit_multiple_comments_command_get_type (void) { } -RenameEventCommand* rename_event_command_construct (GType object_type, Event* event, const gchar* new_name) { +RenameEventCommand* +rename_event_command_construct (GType object_type, + Event* event, + const gchar* new_name) +{ RenameEventCommand * self = NULL; - Event* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; - Event* _tmp3_; - gchar* _tmp4_; + gchar* _tmp0_; + gchar* _tmp1_; #line 656 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_EVENT (event), NULL); #line 656 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (new_name != NULL, NULL); #line 657 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = event; -#line 657 "/home/jens/Source/shotwell/src/Commands.vala" - self = (RenameEventCommand*) simple_proxyable_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PROXYABLE, Proxyable), RESOURCES_RENAME_EVENT_LABEL, ""); -#line 659 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = new_name; + self = (RenameEventCommand*) simple_proxyable_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_PROXYABLE, Proxyable), RESOURCES_RENAME_EVENT_LABEL, ""); #line 659 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp0_ = g_strdup (new_name); #line 659 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->new_name); #line 659 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->new_name = _tmp2_; + self->priv->new_name = _tmp0_; #line 660 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = event; -#line 660 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = event_get_raw_name (_tmp3_); + _tmp1_ = event_get_raw_name (event); #line 660 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->old_name); #line 660 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->old_name = _tmp4_; + self->priv->old_name = _tmp1_; #line 656 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 7260 "Commands.c" +#line 7883 "Commands.c" } -RenameEventCommand* rename_event_command_new (Event* event, const gchar* new_name) { +RenameEventCommand* +rename_event_command_new (Event* event, + const gchar* new_name) +{ #line 656 "/home/jens/Source/shotwell/src/Commands.vala" return rename_event_command_construct (TYPE_RENAME_EVENT_COMMAND, event, new_name); -#line 7267 "Commands.c" +#line 7893 "Commands.c" } -static void rename_event_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source) { +static void +rename_event_command_real_execute_on_source (SimpleProxyableCommand* base, + DataSource* source) +{ RenameEventCommand * self; - DataSource* _tmp0_; - const gchar* _tmp1_; + const gchar* _tmp0_; #line 663 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RENAME_EVENT_COMMAND, RenameEventCommand); #line 663 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 664 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; + _tmp0_ = self->priv->new_name; #line 664 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = self->priv->new_name; -#line 664 "/home/jens/Source/shotwell/src/Commands.vala" - event_rename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), _tmp1_); -#line 7285 "Commands.c" + event_rename (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_EVENT, Event), _tmp0_); +#line 7911 "Commands.c" } -static void rename_event_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source) { +static void +rename_event_command_real_undo_on_source (SimpleProxyableCommand* base, + DataSource* source) +{ RenameEventCommand * self; - DataSource* _tmp0_; - const gchar* _tmp1_; + const gchar* _tmp0_; #line 667 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RENAME_EVENT_COMMAND, RenameEventCommand); #line 667 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 668 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; -#line 668 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = self->priv->old_name; + _tmp0_ = self->priv->old_name; #line 668 "/home/jens/Source/shotwell/src/Commands.vala" - event_rename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), _tmp1_); -#line 7303 "Commands.c" + event_rename (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_EVENT, Event), _tmp0_); +#line 7929 "Commands.c" } -static void rename_event_command_class_init (RenameEventCommandClass * klass) { +static void +rename_event_command_class_init (RenameEventCommandClass * klass) +{ #line 652 "/home/jens/Source/shotwell/src/Commands.vala" rename_event_command_parent_class = g_type_class_peek_parent (klass); #line 652 "/home/jens/Source/shotwell/src/Commands.vala" @@ -7314,18 +7942,22 @@ static void rename_event_command_class_init (RenameEventCommandClass * klass) { ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) rename_event_command_real_undo_on_source; #line 652 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = rename_event_command_finalize; -#line 7318 "Commands.c" +#line 7946 "Commands.c" } -static void rename_event_command_instance_init (RenameEventCommand * self) { +static void +rename_event_command_instance_init (RenameEventCommand * self) +{ #line 652 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = RENAME_EVENT_COMMAND_GET_PRIVATE (self); -#line 7325 "Commands.c" +#line 7955 "Commands.c" } -static void rename_event_command_finalize (GObject * obj) { +static void +rename_event_command_finalize (GObject * obj) +{ RenameEventCommand * self; #line 652 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RENAME_EVENT_COMMAND, RenameEventCommand); @@ -7335,11 +7967,13 @@ static void rename_event_command_finalize (GObject * obj) { _g_free0 (self->priv->old_name); #line 652 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (rename_event_command_parent_class)->finalize (obj); -#line 7339 "Commands.c" +#line 7971 "Commands.c" } -GType rename_event_command_get_type (void) { +GType +rename_event_command_get_type (void) +{ static volatile gsize rename_event_command_type_id__volatile = 0; if (g_once_init_enter (&rename_event_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RenameEventCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) rename_event_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RenameEventCommand), 0, (GInstanceInitFunc) rename_event_command_instance_init, NULL }; @@ -7351,87 +7985,87 @@ GType rename_event_command_get_type (void) { } -EditEventCommentCommand* edit_event_comment_command_construct (GType object_type, Event* event, const gchar* new_comment) { +EditEventCommentCommand* +edit_event_comment_command_construct (GType object_type, + Event* event, + const gchar* new_comment) +{ EditEventCommentCommand * self = NULL; - Event* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; - Event* _tmp3_; - gchar* _tmp4_; + gchar* _tmp0_; + gchar* _tmp1_; #line 676 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_EVENT (event), NULL); #line 676 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (new_comment != NULL, NULL); #line 677 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = event; -#line 677 "/home/jens/Source/shotwell/src/Commands.vala" - self = (EditEventCommentCommand*) simple_proxyable_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PROXYABLE, Proxyable), RESOURCES_EDIT_COMMENT_LABEL, ""); -#line 679 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = new_comment; + self = (EditEventCommentCommand*) simple_proxyable_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_PROXYABLE, Proxyable), RESOURCES_EDIT_COMMENT_LABEL, ""); #line 679 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp0_ = g_strdup (new_comment); #line 679 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->new_comment); #line 679 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->new_comment = _tmp2_; + self->priv->new_comment = _tmp0_; #line 680 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = event; -#line 680 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_EVENT_SOURCE, EventSource)); + _tmp1_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_EVENT_SOURCE, EventSource)); #line 680 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->old_comment); #line 680 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->old_comment = _tmp4_; + self->priv->old_comment = _tmp1_; #line 676 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 7388 "Commands.c" +#line 8017 "Commands.c" } -EditEventCommentCommand* edit_event_comment_command_new (Event* event, const gchar* new_comment) { +EditEventCommentCommand* +edit_event_comment_command_new (Event* event, + const gchar* new_comment) +{ #line 676 "/home/jens/Source/shotwell/src/Commands.vala" return edit_event_comment_command_construct (TYPE_EDIT_EVENT_COMMENT_COMMAND, event, new_comment); -#line 7395 "Commands.c" +#line 8027 "Commands.c" } -static void edit_event_comment_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source) { +static void +edit_event_comment_command_real_execute_on_source (SimpleProxyableCommand* base, + DataSource* source) +{ EditEventCommentCommand * self; - DataSource* _tmp0_; - const gchar* _tmp1_; + const gchar* _tmp0_; #line 683 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_EVENT_COMMENT_COMMAND, EditEventCommentCommand); #line 683 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 684 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; -#line 684 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = self->priv->new_comment; + _tmp0_ = self->priv->new_comment; #line 684 "/home/jens/Source/shotwell/src/Commands.vala" - event_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), TYPE_EVENT_SOURCE, EventSource), _tmp1_); -#line 7413 "Commands.c" + event_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_EVENT, Event), TYPE_EVENT_SOURCE, EventSource), _tmp0_); +#line 8045 "Commands.c" } -static void edit_event_comment_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source) { +static void +edit_event_comment_command_real_undo_on_source (SimpleProxyableCommand* base, + DataSource* source) +{ EditEventCommentCommand * self; - DataSource* _tmp0_; - const gchar* _tmp1_; + const gchar* _tmp0_; #line 687 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_EVENT_COMMENT_COMMAND, EditEventCommentCommand); #line 687 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 688 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; -#line 688 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = self->priv->old_comment; + _tmp0_ = self->priv->old_comment; #line 688 "/home/jens/Source/shotwell/src/Commands.vala" - event_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), TYPE_EVENT_SOURCE, EventSource), _tmp1_); -#line 7431 "Commands.c" + event_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_EVENT, Event), TYPE_EVENT_SOURCE, EventSource), _tmp0_); +#line 8063 "Commands.c" } -static void edit_event_comment_command_class_init (EditEventCommentCommandClass * klass) { +static void +edit_event_comment_command_class_init (EditEventCommentCommandClass * klass) +{ #line 672 "/home/jens/Source/shotwell/src/Commands.vala" edit_event_comment_command_parent_class = g_type_class_peek_parent (klass); #line 672 "/home/jens/Source/shotwell/src/Commands.vala" @@ -7442,18 +8076,22 @@ static void edit_event_comment_command_class_init (EditEventCommentCommandClass ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) edit_event_comment_command_real_undo_on_source; #line 672 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = edit_event_comment_command_finalize; -#line 7446 "Commands.c" +#line 8080 "Commands.c" } -static void edit_event_comment_command_instance_init (EditEventCommentCommand * self) { +static void +edit_event_comment_command_instance_init (EditEventCommentCommand * self) +{ #line 672 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = EDIT_EVENT_COMMENT_COMMAND_GET_PRIVATE (self); -#line 7453 "Commands.c" +#line 8089 "Commands.c" } -static void edit_event_comment_command_finalize (GObject * obj) { +static void +edit_event_comment_command_finalize (GObject * obj) +{ EditEventCommentCommand * self; #line 672 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDIT_EVENT_COMMENT_COMMAND, EditEventCommentCommand); @@ -7463,11 +8101,13 @@ static void edit_event_comment_command_finalize (GObject * obj) { _g_free0 (self->priv->old_comment); #line 672 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (edit_event_comment_command_parent_class)->finalize (obj); -#line 7467 "Commands.c" +#line 8105 "Commands.c" } -GType edit_event_comment_command_get_type (void) { +GType +edit_event_comment_command_get_type (void) +{ static volatile gsize edit_event_comment_command_type_id__volatile = 0; if (g_once_init_enter (&edit_event_comment_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditEventCommentCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) edit_event_comment_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditEventCommentCommand), 0, (GInstanceInitFunc) edit_event_comment_command_instance_init, NULL }; @@ -7479,51 +8119,51 @@ GType edit_event_comment_command_get_type (void) { } -SetKeyPhotoCommand* set_key_photo_command_construct (GType object_type, Event* event, MediaSource* new_primary_source) { +SetKeyPhotoCommand* +set_key_photo_command_construct (GType object_type, + Event* event, + MediaSource* new_primary_source) +{ SetKeyPhotoCommand * self = NULL; - Event* _tmp0_; + MediaSource* _tmp0_; MediaSource* _tmp1_; - MediaSource* _tmp2_; - Event* _tmp3_; - MediaSource* _tmp4_; #line 696 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_EVENT (event), NULL); #line 696 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (new_primary_source), NULL); #line 697 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = event; -#line 697 "/home/jens/Source/shotwell/src/Commands.vala" - self = (SetKeyPhotoCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource), RESOURCES_MAKE_KEY_PHOTO_LABEL, ""); + self = (SetKeyPhotoCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_DATA_SOURCE, DataSource), RESOURCES_MAKE_KEY_PHOTO_LABEL, ""); #line 699 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = new_primary_source; -#line 699 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp0_ = _g_object_ref0 (new_primary_source); #line 699 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->new_primary_source); #line 699 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->new_primary_source = _tmp2_; + self->priv->new_primary_source = _tmp0_; #line 700 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = event; -#line 700 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = event_get_primary_source (_tmp3_); + _tmp1_ = event_get_primary_source (event); #line 700 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->old_primary_source); #line 700 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->old_primary_source = _tmp4_; + self->priv->old_primary_source = _tmp1_; #line 696 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 7516 "Commands.c" +#line 8151 "Commands.c" } -SetKeyPhotoCommand* set_key_photo_command_new (Event* event, MediaSource* new_primary_source) { +SetKeyPhotoCommand* +set_key_photo_command_new (Event* event, + MediaSource* new_primary_source) +{ #line 696 "/home/jens/Source/shotwell/src/Commands.vala" return set_key_photo_command_construct (TYPE_SET_KEY_PHOTO_COMMAND, event, new_primary_source); -#line 7523 "Commands.c" +#line 8161 "Commands.c" } -static void set_key_photo_command_real_execute (Command* base) { +static void +set_key_photo_command_real_execute (Command* base) +{ SetKeyPhotoCommand * self; DataSource* _tmp0_; MediaSource* _tmp1_; @@ -7535,11 +8175,13 @@ static void set_key_photo_command_real_execute (Command* base) { _tmp1_ = self->priv->new_primary_source; #line 704 "/home/jens/Source/shotwell/src/Commands.vala" event_set_primary_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), _tmp1_); -#line 7539 "Commands.c" +#line 8179 "Commands.c" } -static void set_key_photo_command_real_undo (Command* base) { +static void +set_key_photo_command_real_undo (Command* base) +{ SetKeyPhotoCommand * self; DataSource* _tmp0_; MediaSource* _tmp1_; @@ -7551,11 +8193,13 @@ static void set_key_photo_command_real_undo (Command* base) { _tmp1_ = self->priv->old_primary_source; #line 708 "/home/jens/Source/shotwell/src/Commands.vala" event_set_primary_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), _tmp1_); -#line 7555 "Commands.c" +#line 8197 "Commands.c" } -static void set_key_photo_command_class_init (SetKeyPhotoCommandClass * klass) { +static void +set_key_photo_command_class_init (SetKeyPhotoCommandClass * klass) +{ #line 692 "/home/jens/Source/shotwell/src/Commands.vala" set_key_photo_command_parent_class = g_type_class_peek_parent (klass); #line 692 "/home/jens/Source/shotwell/src/Commands.vala" @@ -7566,18 +8210,22 @@ static void set_key_photo_command_class_init (SetKeyPhotoCommandClass * klass) { ((CommandClass *) klass)->undo = (void (*) (Command *)) set_key_photo_command_real_undo; #line 692 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = set_key_photo_command_finalize; -#line 7570 "Commands.c" +#line 8214 "Commands.c" } -static void set_key_photo_command_instance_init (SetKeyPhotoCommand * self) { +static void +set_key_photo_command_instance_init (SetKeyPhotoCommand * self) +{ #line 692 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = SET_KEY_PHOTO_COMMAND_GET_PRIVATE (self); -#line 7577 "Commands.c" +#line 8223 "Commands.c" } -static void set_key_photo_command_finalize (GObject * obj) { +static void +set_key_photo_command_finalize (GObject * obj) +{ SetKeyPhotoCommand * self; #line 692 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_KEY_PHOTO_COMMAND, SetKeyPhotoCommand); @@ -7587,11 +8235,13 @@ static void set_key_photo_command_finalize (GObject * obj) { _g_object_unref0 (self->priv->old_primary_source); #line 692 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (set_key_photo_command_parent_class)->finalize (obj); -#line 7591 "Commands.c" +#line 8239 "Commands.c" } -GType set_key_photo_command_get_type (void) { +GType +set_key_photo_command_get_type (void) +{ static volatile gsize set_key_photo_command_type_id__volatile = 0; if (g_once_init_enter (&set_key_photo_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SetKeyPhotoCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) set_key_photo_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SetKeyPhotoCommand), 0, (GInstanceInitFunc) set_key_photo_command_instance_init, NULL }; @@ -7603,90 +8253,92 @@ GType set_key_photo_command_get_type (void) { } -RevertSingleCommand* revert_single_command_construct (GType object_type, Photo* photo) { +RevertSingleCommand* +revert_single_command_construct (GType object_type, + Photo* photo) +{ RevertSingleCommand * self = NULL; - Photo* _tmp0_; #line 713 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); #line 714 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = photo; -#line 714 "/home/jens/Source/shotwell/src/Commands.vala" - self = (RevertSingleCommand*) generic_photo_transformation_command_construct (object_type, _tmp0_, RESOURCES_REVERT_LABEL, ""); + self = (RevertSingleCommand*) generic_photo_transformation_command_construct (object_type, photo, RESOURCES_REVERT_LABEL, ""); #line 713 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 7618 "Commands.c" +#line 8268 "Commands.c" } -RevertSingleCommand* revert_single_command_new (Photo* photo) { +RevertSingleCommand* +revert_single_command_new (Photo* photo) +{ #line 713 "/home/jens/Source/shotwell/src/Commands.vala" return revert_single_command_construct (TYPE_REVERT_SINGLE_COMMAND, photo); -#line 7625 "Commands.c" +#line 8277 "Commands.c" } -static void revert_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo) { +static void +revert_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, + Photo* photo) +{ RevertSingleCommand * self; - Photo* _tmp0_; #line 717 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_REVERT_SINGLE_COMMAND, RevertSingleCommand); #line 717 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_PHOTO (photo)); #line 718 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = photo; -#line 718 "/home/jens/Source/shotwell/src/Commands.vala" - photo_remove_all_transformations (_tmp0_); -#line 7640 "Commands.c" + photo_remove_all_transformations (photo); +#line 8292 "Commands.c" } -static gboolean revert_single_command_real_compress (Command* base, Command* command) { +static gboolean +revert_single_command_real_compress (Command* base, + Command* command) +{ RevertSingleCommand * self; gboolean result = FALSE; RevertSingleCommand* revert_single_command = NULL; - Command* _tmp0_; + RevertSingleCommand* _tmp0_; RevertSingleCommand* _tmp1_; RevertSingleCommand* _tmp2_; - RevertSingleCommand* _tmp3_; + DataSource* _tmp3_; DataSource* _tmp4_; - DataSource* _tmp5_; #line 721 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_REVERT_SINGLE_COMMAND, RevertSingleCommand); #line 721 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_COMMAND (command), FALSE); #line 722 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = command; -#line 722 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_REVERT_SINGLE_COMMAND) ? ((RevertSingleCommand*) _tmp0_) : NULL); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (command, TYPE_REVERT_SINGLE_COMMAND) ? ((RevertSingleCommand*) command) : NULL); #line 722 "/home/jens/Source/shotwell/src/Commands.vala" - revert_single_command = _tmp1_; + revert_single_command = _tmp0_; #line 723 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = revert_single_command; + _tmp1_ = revert_single_command; #line 723 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 724 "/home/jens/Source/shotwell/src/Commands.vala" result = FALSE; #line 724 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (revert_single_command); #line 724 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 7674 "Commands.c" +#line 8326 "Commands.c" } #line 726 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = revert_single_command; + _tmp2_ = revert_single_command; #line 726 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source; + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source; #line 726 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source; + _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source; #line 726 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp4_ != _tmp5_) { + if (_tmp3_ != _tmp4_) { #line 727 "/home/jens/Source/shotwell/src/Commands.vala" result = FALSE; #line 727 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (revert_single_command); #line 727 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 7690 "Commands.c" +#line 8342 "Commands.c" } #line 731 "/home/jens/Source/shotwell/src/Commands.vala" result = TRUE; @@ -7694,26 +8346,32 @@ static gboolean revert_single_command_real_compress (Command* base, Command* com _g_object_unref0 (revert_single_command); #line 731 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 7698 "Commands.c" +#line 8350 "Commands.c" } -static void revert_single_command_class_init (RevertSingleCommandClass * klass) { +static void +revert_single_command_class_init (RevertSingleCommandClass * klass) +{ #line 712 "/home/jens/Source/shotwell/src/Commands.vala" revert_single_command_parent_class = g_type_class_peek_parent (klass); #line 712 "/home/jens/Source/shotwell/src/Commands.vala" ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) revert_single_command_real_execute_on_photo; #line 712 "/home/jens/Source/shotwell/src/Commands.vala" ((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) revert_single_command_real_compress; -#line 7709 "Commands.c" +#line 8363 "Commands.c" } -static void revert_single_command_instance_init (RevertSingleCommand * self) { +static void +revert_single_command_instance_init (RevertSingleCommand * self) +{ } -GType revert_single_command_get_type (void) { +GType +revert_single_command_get_type (void) +{ static volatile gsize revert_single_command_type_id__volatile = 0; if (g_once_init_enter (&revert_single_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RevertSingleCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) revert_single_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RevertSingleCommand), 0, (GInstanceInitFunc) revert_single_command_instance_init, NULL }; @@ -7725,57 +8383,65 @@ GType revert_single_command_get_type (void) { } -RevertMultipleCommand* revert_multiple_command_construct (GType object_type, GeeIterable* iter) { +RevertMultipleCommand* +revert_multiple_command_construct (GType object_type, + GeeIterable* iter) +{ RevertMultipleCommand * self = NULL; - GeeIterable* _tmp0_; #line 736 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL); #line 737 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = iter; -#line 737 "/home/jens/Source/shotwell/src/Commands.vala" - self = (RevertMultipleCommand*) multiple_photo_transformation_command_construct (object_type, _tmp0_, _ ("Reverting"), _ ("Undoing Revert"), RESOURCES_REVERT_LABEL, ""); + self = (RevertMultipleCommand*) multiple_photo_transformation_command_construct (object_type, iter, _ ("Reverting"), _ ("Undoing Revert"), RESOURCES_REVERT_LABEL, ""); #line 736 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 7740 "Commands.c" +#line 8398 "Commands.c" } -RevertMultipleCommand* revert_multiple_command_new (GeeIterable* iter) { +RevertMultipleCommand* +revert_multiple_command_new (GeeIterable* iter) +{ #line 736 "/home/jens/Source/shotwell/src/Commands.vala" return revert_multiple_command_construct (TYPE_REVERT_MULTIPLE_COMMAND, iter); -#line 7747 "Commands.c" +#line 8407 "Commands.c" } -static void revert_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) { +static void +revert_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, + DataSource* source) +{ RevertMultipleCommand * self; - DataSource* _tmp0_; #line 741 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_REVERT_MULTIPLE_COMMAND, RevertMultipleCommand); #line 741 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 742 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; -#line 742 "/home/jens/Source/shotwell/src/Commands.vala" - photo_remove_all_transformations (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo)); -#line 7762 "Commands.c" + photo_remove_all_transformations (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_PHOTO, Photo)); +#line 8422 "Commands.c" } -static void revert_multiple_command_class_init (RevertMultipleCommandClass * klass) { +static void +revert_multiple_command_class_init (RevertMultipleCommandClass * klass) +{ #line 735 "/home/jens/Source/shotwell/src/Commands.vala" revert_multiple_command_parent_class = g_type_class_peek_parent (klass); #line 735 "/home/jens/Source/shotwell/src/Commands.vala" ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) revert_multiple_command_real_execute_on_source; -#line 7771 "Commands.c" +#line 8433 "Commands.c" } -static void revert_multiple_command_instance_init (RevertMultipleCommand * self) { +static void +revert_multiple_command_instance_init (RevertMultipleCommand * self) +{ } -GType revert_multiple_command_get_type (void) { +GType +revert_multiple_command_get_type (void) +{ static volatile gsize revert_multiple_command_type_id__volatile = 0; if (g_once_init_enter (&revert_multiple_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RevertMultipleCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) revert_multiple_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RevertMultipleCommand), 0, (GInstanceInitFunc) revert_multiple_command_instance_init, NULL }; @@ -7787,35 +8453,39 @@ GType revert_multiple_command_get_type (void) { } -EnhanceSingleCommand* enhance_single_command_construct (GType object_type, Photo* photo) { +EnhanceSingleCommand* +enhance_single_command_construct (GType object_type, + Photo* photo) +{ EnhanceSingleCommand * self = NULL; - Photo* _tmp0_; #line 747 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); #line 748 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = photo; -#line 748 "/home/jens/Source/shotwell/src/Commands.vala" - self = (EnhanceSingleCommand*) generic_photo_transformation_command_construct (object_type, _tmp0_, RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP); + self = (EnhanceSingleCommand*) generic_photo_transformation_command_construct (object_type, photo, RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP); #line 747 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 7802 "Commands.c" +#line 8468 "Commands.c" } -EnhanceSingleCommand* enhance_single_command_new (Photo* photo) { +EnhanceSingleCommand* +enhance_single_command_new (Photo* photo) +{ #line 747 "/home/jens/Source/shotwell/src/Commands.vala" return enhance_single_command_construct (TYPE_ENHANCE_SINGLE_COMMAND, photo); -#line 7809 "Commands.c" +#line 8477 "Commands.c" } -static void enhance_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo) { +static void +enhance_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, + Photo* photo) +{ EnhanceSingleCommand * self; AppWindow* _tmp0_; AppWindow* _tmp1_; - Photo* _tmp2_; + AppWindow* _tmp2_; AppWindow* _tmp3_; - AppWindow* _tmp4_; #line 751 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ENHANCE_SINGLE_COMMAND, EnhanceSingleCommand); #line 751 "/home/jens/Source/shotwell/src/Commands.vala" @@ -7829,68 +8499,66 @@ static void enhance_single_command_real_execute_on_photo (GenericPhotoTransforma #line 752 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_tmp1_); #line 757 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = photo; -#line 757 "/home/jens/Source/shotwell/src/Commands.vala" - photo_enhance (_tmp2_); + photo_enhance (photo); #line 763 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = app_window_get_instance (); + _tmp2_ = app_window_get_instance (); #line 763 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 763 "/home/jens/Source/shotwell/src/Commands.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PAGE_WINDOW, PageWindow)); #line 763 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp4_); -#line 7844 "Commands.c" + _g_object_unref0 (_tmp3_); +#line 8512 "Commands.c" } -static gboolean enhance_single_command_real_compress (Command* base, Command* command) { +static gboolean +enhance_single_command_real_compress (Command* base, + Command* command) +{ EnhanceSingleCommand * self; gboolean result = FALSE; EnhanceSingleCommand* enhance_single_command = NULL; - Command* _tmp0_; + EnhanceSingleCommand* _tmp0_; EnhanceSingleCommand* _tmp1_; EnhanceSingleCommand* _tmp2_; - EnhanceSingleCommand* _tmp3_; + DataSource* _tmp3_; DataSource* _tmp4_; - DataSource* _tmp5_; #line 766 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ENHANCE_SINGLE_COMMAND, EnhanceSingleCommand); #line 766 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_COMMAND (command), FALSE); #line 767 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = command; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (command, TYPE_ENHANCE_SINGLE_COMMAND) ? ((EnhanceSingleCommand*) command) : NULL); #line 767 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_ENHANCE_SINGLE_COMMAND) ? ((EnhanceSingleCommand*) _tmp0_) : NULL); -#line 767 "/home/jens/Source/shotwell/src/Commands.vala" - enhance_single_command = _tmp1_; + enhance_single_command = _tmp0_; #line 768 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = enhance_single_command; + _tmp1_ = enhance_single_command; #line 768 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 769 "/home/jens/Source/shotwell/src/Commands.vala" result = FALSE; #line 769 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (enhance_single_command); #line 769 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 7878 "Commands.c" +#line 8546 "Commands.c" } #line 771 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = enhance_single_command; + _tmp2_ = enhance_single_command; #line 771 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source; + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source; #line 771 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source; + _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source; #line 771 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp4_ != _tmp5_) { + if (_tmp3_ != _tmp4_) { #line 772 "/home/jens/Source/shotwell/src/Commands.vala" result = FALSE; #line 772 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (enhance_single_command); #line 772 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 7894 "Commands.c" +#line 8562 "Commands.c" } #line 775 "/home/jens/Source/shotwell/src/Commands.vala" result = TRUE; @@ -7898,26 +8566,32 @@ static gboolean enhance_single_command_real_compress (Command* base, Command* co _g_object_unref0 (enhance_single_command); #line 775 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 7902 "Commands.c" +#line 8570 "Commands.c" } -static void enhance_single_command_class_init (EnhanceSingleCommandClass * klass) { +static void +enhance_single_command_class_init (EnhanceSingleCommandClass * klass) +{ #line 746 "/home/jens/Source/shotwell/src/Commands.vala" enhance_single_command_parent_class = g_type_class_peek_parent (klass); #line 746 "/home/jens/Source/shotwell/src/Commands.vala" ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) enhance_single_command_real_execute_on_photo; #line 746 "/home/jens/Source/shotwell/src/Commands.vala" ((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) enhance_single_command_real_compress; -#line 7913 "Commands.c" +#line 8583 "Commands.c" } -static void enhance_single_command_instance_init (EnhanceSingleCommand * self) { +static void +enhance_single_command_instance_init (EnhanceSingleCommand * self) +{ } -GType enhance_single_command_get_type (void) { +GType +enhance_single_command_get_type (void) +{ static volatile gsize enhance_single_command_type_id__volatile = 0; if (g_once_init_enter (&enhance_single_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EnhanceSingleCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) enhance_single_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EnhanceSingleCommand), 0, (GInstanceInitFunc) enhance_single_command_instance_init, NULL }; @@ -7929,57 +8603,65 @@ GType enhance_single_command_get_type (void) { } -EnhanceMultipleCommand* enhance_multiple_command_construct (GType object_type, GeeIterable* iter) { +EnhanceMultipleCommand* +enhance_multiple_command_construct (GType object_type, + GeeIterable* iter) +{ EnhanceMultipleCommand * self = NULL; - GeeIterable* _tmp0_; #line 780 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL); #line 781 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = iter; -#line 781 "/home/jens/Source/shotwell/src/Commands.vala" - self = (EnhanceMultipleCommand*) multiple_photo_transformation_command_construct (object_type, _tmp0_, _ ("Enhancing"), _ ("Undoing Enhance"), RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP); + self = (EnhanceMultipleCommand*) multiple_photo_transformation_command_construct (object_type, iter, _ ("Enhancing"), _ ("Undoing Enhance"), RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP); #line 780 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 7944 "Commands.c" +#line 8618 "Commands.c" } -EnhanceMultipleCommand* enhance_multiple_command_new (GeeIterable* iter) { +EnhanceMultipleCommand* +enhance_multiple_command_new (GeeIterable* iter) +{ #line 780 "/home/jens/Source/shotwell/src/Commands.vala" return enhance_multiple_command_construct (TYPE_ENHANCE_MULTIPLE_COMMAND, iter); -#line 7951 "Commands.c" +#line 8627 "Commands.c" } -static void enhance_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) { +static void +enhance_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, + DataSource* source) +{ EnhanceMultipleCommand * self; - DataSource* _tmp0_; #line 785 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ENHANCE_MULTIPLE_COMMAND, EnhanceMultipleCommand); #line 785 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 786 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; -#line 786 "/home/jens/Source/shotwell/src/Commands.vala" - photo_enhance (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo)); -#line 7966 "Commands.c" + photo_enhance (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_PHOTO, Photo)); +#line 8642 "Commands.c" } -static void enhance_multiple_command_class_init (EnhanceMultipleCommandClass * klass) { +static void +enhance_multiple_command_class_init (EnhanceMultipleCommandClass * klass) +{ #line 779 "/home/jens/Source/shotwell/src/Commands.vala" enhance_multiple_command_parent_class = g_type_class_peek_parent (klass); #line 779 "/home/jens/Source/shotwell/src/Commands.vala" ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) enhance_multiple_command_real_execute_on_source; -#line 7975 "Commands.c" +#line 8653 "Commands.c" } -static void enhance_multiple_command_instance_init (EnhanceMultipleCommand * self) { +static void +enhance_multiple_command_instance_init (EnhanceMultipleCommand * self) +{ } -GType enhance_multiple_command_get_type (void) { +GType +enhance_multiple_command_get_type (void) +{ static volatile gsize enhance_multiple_command_type_id__volatile = 0; if (g_once_init_enter (&enhance_multiple_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EnhanceMultipleCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) enhance_multiple_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EnhanceMultipleCommand), 0, (GInstanceInitFunc) enhance_multiple_command_instance_init, NULL }; @@ -7991,13 +8673,16 @@ GType enhance_multiple_command_get_type (void) { } -StraightenCommand* straighten_command_construct (GType object_type, Photo* photo, gdouble theta, Box* crop, const gchar* name, const gchar* explanation) { +StraightenCommand* +straighten_command_construct (GType object_type, + Photo* photo, + gdouble theta, + Box* crop, + const gchar* name, + const gchar* explanation) +{ StraightenCommand * self = NULL; - Photo* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - gdouble _tmp3_; - Box _tmp4_; + Box _tmp0_; #line 794 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); #line 794 "/home/jens/Source/shotwell/src/Commands.vala" @@ -8007,98 +8692,92 @@ StraightenCommand* straighten_command_construct (GType object_type, Photo* photo #line 794 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (explanation != NULL, NULL); #line 795 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = photo; -#line 795 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = name; -#line 795 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = explanation; -#line 795 "/home/jens/Source/shotwell/src/Commands.vala" - self = (StraightenCommand*) generic_photo_transformation_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_); -#line 797 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = theta; + self = (StraightenCommand*) generic_photo_transformation_command_construct (object_type, photo, name, explanation); #line 797 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->theta = _tmp3_; + self->priv->theta = theta; #line 798 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = *crop; + _tmp0_ = *crop; #line 798 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->crop = _tmp4_; + self->priv->crop = _tmp0_; #line 794 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 8028 "Commands.c" +#line 8705 "Commands.c" } -StraightenCommand* straighten_command_new (Photo* photo, gdouble theta, Box* crop, const gchar* name, const gchar* explanation) { +StraightenCommand* +straighten_command_new (Photo* photo, + gdouble theta, + Box* crop, + const gchar* name, + const gchar* explanation) +{ #line 794 "/home/jens/Source/shotwell/src/Commands.vala" return straighten_command_construct (TYPE_STRAIGHTEN_COMMAND, photo, theta, crop, name, explanation); -#line 8035 "Commands.c" +#line 8718 "Commands.c" } -static void straighten_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo) { +static void +straighten_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, + Photo* photo) +{ StraightenCommand * self; DataCollection* collection = NULL; - Photo* _tmp0_; + DataCollection* _tmp0_; DataCollection* _tmp1_; - DataCollection* _tmp2_; - Photo* _tmp4_; - gdouble _tmp5_; - Photo* _tmp6_; - Box _tmp7_; - DataCollection* _tmp8_; + gdouble _tmp3_; + Box _tmp4_; + DataCollection* _tmp5_; #line 801 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRAIGHTEN_COMMAND, StraightenCommand); #line 801 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_PHOTO (photo)); #line 803 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = photo; -#line 803 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_OBJECT, DataObject)); #line 803 "/home/jens/Source/shotwell/src/Commands.vala" - collection = _tmp1_; + collection = _tmp0_; #line 804 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = collection; + _tmp1_ = collection; #line 804 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp2_ != NULL) { -#line 8064 "Commands.c" - DataCollection* _tmp3_; + if (_tmp1_ != NULL) { +#line 8745 "Commands.c" + DataCollection* _tmp2_; #line 805 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = collection; + _tmp2_ = collection; #line 805 "/home/jens/Source/shotwell/src/Commands.vala" - data_collection_freeze_notifications (_tmp3_); -#line 8070 "Commands.c" + data_collection_freeze_notifications (_tmp2_); +#line 8751 "Commands.c" } #line 807 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = photo; -#line 807 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = self->priv->theta; + _tmp3_ = self->priv->theta; #line 807 "/home/jens/Source/shotwell/src/Commands.vala" - photo_set_straighten (_tmp4_, _tmp5_); + photo_set_straighten (photo, _tmp3_); #line 808 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = photo; + _tmp4_ = self->priv->crop; #line 808 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = self->priv->crop; -#line 808 "/home/jens/Source/shotwell/src/Commands.vala" - photo_set_crop (_tmp6_, &_tmp7_); + photo_set_crop (photo, &_tmp4_); #line 810 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = collection; + _tmp5_ = collection; #line 810 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp8_ != NULL) { -#line 8088 "Commands.c" - DataCollection* _tmp9_; + if (_tmp5_ != NULL) { +#line 8765 "Commands.c" + DataCollection* _tmp6_; #line 811 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = collection; + _tmp6_ = collection; #line 811 "/home/jens/Source/shotwell/src/Commands.vala" - data_collection_thaw_notifications (_tmp9_); -#line 8094 "Commands.c" + data_collection_thaw_notifications (_tmp6_); +#line 8771 "Commands.c" } #line 801 "/home/jens/Source/shotwell/src/Commands.vala" _data_collection_unref0 (collection); -#line 8098 "Commands.c" +#line 8775 "Commands.c" } -static void straighten_command_class_init (StraightenCommandClass * klass) { +static void +straighten_command_class_init (StraightenCommandClass * klass) +{ #line 790 "/home/jens/Source/shotwell/src/Commands.vala" straighten_command_parent_class = g_type_class_peek_parent (klass); #line 790 "/home/jens/Source/shotwell/src/Commands.vala" @@ -8107,28 +8786,34 @@ static void straighten_command_class_init (StraightenCommandClass * klass) { ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) straighten_command_real_execute_on_photo; #line 790 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = straighten_command_finalize; -#line 8111 "Commands.c" +#line 8790 "Commands.c" } -static void straighten_command_instance_init (StraightenCommand * self) { +static void +straighten_command_instance_init (StraightenCommand * self) +{ #line 790 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = STRAIGHTEN_COMMAND_GET_PRIVATE (self); -#line 8118 "Commands.c" +#line 8799 "Commands.c" } -static void straighten_command_finalize (GObject * obj) { +static void +straighten_command_finalize (GObject * obj) +{ StraightenCommand * self; #line 790 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_STRAIGHTEN_COMMAND, StraightenCommand); #line 790 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (straighten_command_parent_class)->finalize (obj); -#line 8128 "Commands.c" +#line 8811 "Commands.c" } -GType straighten_command_get_type (void) { +GType +straighten_command_get_type (void) +{ static volatile gsize straighten_command_type_id__volatile = 0; if (g_once_init_enter (&straighten_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (StraightenCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) straighten_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (StraightenCommand), 0, (GInstanceInitFunc) straighten_command_instance_init, NULL }; @@ -8140,12 +8825,15 @@ GType straighten_command_get_type (void) { } -CropCommand* crop_command_construct (GType object_type, Photo* photo, Box* crop, const gchar* name, const gchar* explanation) { +CropCommand* +crop_command_construct (GType object_type, + Photo* photo, + Box* crop, + const gchar* name, + const gchar* explanation) +{ CropCommand * self = NULL; - Photo* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - Box _tmp3_; + Box _tmp0_; #line 818 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); #line 818 "/home/jens/Source/shotwell/src/Commands.vala" @@ -8155,49 +8843,50 @@ CropCommand* crop_command_construct (GType object_type, Photo* photo, Box* crop, #line 818 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (explanation != NULL, NULL); #line 819 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = photo; -#line 819 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = name; -#line 819 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = explanation; -#line 819 "/home/jens/Source/shotwell/src/Commands.vala" - self = (CropCommand*) generic_photo_transformation_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_); + self = (CropCommand*) generic_photo_transformation_command_construct (object_type, photo, name, explanation); #line 821 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = *crop; + _tmp0_ = *crop; #line 821 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->crop = _tmp3_; + self->priv->crop = _tmp0_; #line 818 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 8172 "Commands.c" +#line 8854 "Commands.c" } -CropCommand* crop_command_new (Photo* photo, Box* crop, const gchar* name, const gchar* explanation) { +CropCommand* +crop_command_new (Photo* photo, + Box* crop, + const gchar* name, + const gchar* explanation) +{ #line 818 "/home/jens/Source/shotwell/src/Commands.vala" return crop_command_construct (TYPE_CROP_COMMAND, photo, crop, name, explanation); -#line 8179 "Commands.c" +#line 8866 "Commands.c" } -static void crop_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo) { +static void +crop_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, + Photo* photo) +{ CropCommand * self; - Photo* _tmp0_; - Box _tmp1_; + Box _tmp0_; #line 824 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CROP_COMMAND, CropCommand); #line 824 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_PHOTO (photo)); #line 825 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = photo; -#line 825 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = self->priv->crop; + _tmp0_ = self->priv->crop; #line 825 "/home/jens/Source/shotwell/src/Commands.vala" - photo_set_crop (_tmp0_, &_tmp1_); -#line 8197 "Commands.c" + photo_set_crop (photo, &_tmp0_); +#line 8884 "Commands.c" } -static void crop_command_class_init (CropCommandClass * klass) { +static void +crop_command_class_init (CropCommandClass * klass) +{ #line 815 "/home/jens/Source/shotwell/src/Commands.vala" crop_command_parent_class = g_type_class_peek_parent (klass); #line 815 "/home/jens/Source/shotwell/src/Commands.vala" @@ -8206,28 +8895,34 @@ static void crop_command_class_init (CropCommandClass * klass) { ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) crop_command_real_execute_on_photo; #line 815 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = crop_command_finalize; -#line 8210 "Commands.c" +#line 8899 "Commands.c" } -static void crop_command_instance_init (CropCommand * self) { +static void +crop_command_instance_init (CropCommand * self) +{ #line 815 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = CROP_COMMAND_GET_PRIVATE (self); -#line 8217 "Commands.c" +#line 8908 "Commands.c" } -static void crop_command_finalize (GObject * obj) { +static void +crop_command_finalize (GObject * obj) +{ CropCommand * self; #line 815 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CROP_COMMAND, CropCommand); #line 815 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (crop_command_parent_class)->finalize (obj); -#line 8227 "Commands.c" +#line 8920 "Commands.c" } -GType crop_command_get_type (void) { +GType +crop_command_get_type (void) +{ static volatile gsize crop_command_type_id__volatile = 0; if (g_once_init_enter (&crop_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CropCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) crop_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CropCommand), 0, (GInstanceInitFunc) crop_command_instance_init, NULL }; @@ -8239,20 +8934,24 @@ GType crop_command_get_type (void) { } -static gpointer _pixel_transformation_bundle_ref0 (gpointer self) { +static gpointer +_pixel_transformation_bundle_ref0 (gpointer self) +{ #line 836 "/home/jens/Source/shotwell/src/Commands.vala" return self ? pixel_transformation_bundle_ref (self) : NULL; -#line 8246 "Commands.c" +#line 8943 "Commands.c" } -AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_type, Photo* photo, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation) { +AdjustColorsSingleCommand* +adjust_colors_single_command_construct (GType object_type, + Photo* photo, + PixelTransformationBundle* transformations, + const gchar* name, + const gchar* explanation) +{ AdjustColorsSingleCommand * self = NULL; - Photo* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - PixelTransformationBundle* _tmp3_; - PixelTransformationBundle* _tmp4_; + PixelTransformationBundle* _tmp0_; #line 832 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); #line 832 "/home/jens/Source/shotwell/src/Commands.vala" @@ -8262,42 +8961,41 @@ AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_ #line 832 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (explanation != NULL, NULL); #line 834 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = photo; -#line 834 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = name; -#line 834 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = explanation; -#line 834 "/home/jens/Source/shotwell/src/Commands.vala" - self = (AdjustColorsSingleCommand*) generic_photo_transformation_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_); + self = (AdjustColorsSingleCommand*) generic_photo_transformation_command_construct (object_type, photo, name, explanation); #line 836 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = transformations; -#line 836 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _pixel_transformation_bundle_ref0 (_tmp3_); + _tmp0_ = _pixel_transformation_bundle_ref0 (transformations); #line 836 "/home/jens/Source/shotwell/src/Commands.vala" _pixel_transformation_bundle_unref0 (self->priv->transformations); #line 836 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->transformations = _tmp4_; + self->priv->transformations = _tmp0_; #line 832 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 8283 "Commands.c" +#line 8974 "Commands.c" } -AdjustColorsSingleCommand* adjust_colors_single_command_new (Photo* photo, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation) { +AdjustColorsSingleCommand* +adjust_colors_single_command_new (Photo* photo, + PixelTransformationBundle* transformations, + const gchar* name, + const gchar* explanation) +{ #line 832 "/home/jens/Source/shotwell/src/Commands.vala" return adjust_colors_single_command_construct (TYPE_ADJUST_COLORS_SINGLE_COMMAND, photo, transformations, name, explanation); -#line 8290 "Commands.c" +#line 8986 "Commands.c" } -static void adjust_colors_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo) { +static void +adjust_colors_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, + Photo* photo) +{ AdjustColorsSingleCommand * self; AppWindow* _tmp0_; AppWindow* _tmp1_; - Photo* _tmp2_; - PixelTransformationBundle* _tmp3_; + PixelTransformationBundle* _tmp2_; + AppWindow* _tmp3_; AppWindow* _tmp4_; - AppWindow* _tmp5_; #line 839 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_COLORS_SINGLE_COMMAND, AdjustColorsSingleCommand); #line 839 "/home/jens/Source/shotwell/src/Commands.vala" @@ -8311,42 +9009,42 @@ static void adjust_colors_single_command_real_execute_on_photo (GenericPhotoTran #line 840 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_tmp1_); #line 842 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = photo; -#line 842 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = self->priv->transformations; + _tmp2_ = self->priv->transformations; #line 842 "/home/jens/Source/shotwell/src/Commands.vala" - photo_set_color_adjustments (_tmp2_, _tmp3_); + photo_set_color_adjustments (photo, _tmp2_); #line 844 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = app_window_get_instance (); + _tmp3_ = app_window_get_instance (); #line 844 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 844 "/home/jens/Source/shotwell/src/Commands.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE_WINDOW, PageWindow)); #line 844 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp5_); -#line 8328 "Commands.c" + _g_object_unref0 (_tmp4_); +#line 9024 "Commands.c" } -static gboolean adjust_colors_single_command_real_can_compress (GenericPhotoTransformationCommand* base, Command* command) { +static gboolean +adjust_colors_single_command_real_can_compress (GenericPhotoTransformationCommand* base, + Command* command) +{ AdjustColorsSingleCommand * self; gboolean result = FALSE; - Command* _tmp0_; #line 847 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_COLORS_SINGLE_COMMAND, AdjustColorsSingleCommand); #line 847 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_COMMAND (command), FALSE); #line 848 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = command; -#line 848 "/home/jens/Source/shotwell/src/Commands.vala" - result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_ADJUST_COLORS_SINGLE_COMMAND); + result = G_TYPE_CHECK_INSTANCE_TYPE (command, TYPE_ADJUST_COLORS_SINGLE_COMMAND); #line 848 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 8346 "Commands.c" +#line 9042 "Commands.c" } -static void adjust_colors_single_command_class_init (AdjustColorsSingleCommandClass * klass) { +static void +adjust_colors_single_command_class_init (AdjustColorsSingleCommandClass * klass) +{ #line 829 "/home/jens/Source/shotwell/src/Commands.vala" adjust_colors_single_command_parent_class = g_type_class_peek_parent (klass); #line 829 "/home/jens/Source/shotwell/src/Commands.vala" @@ -8357,18 +9055,22 @@ static void adjust_colors_single_command_class_init (AdjustColorsSingleCommandCl ((GenericPhotoTransformationCommandClass *) klass)->can_compress = (gboolean (*) (GenericPhotoTransformationCommand *, Command*)) adjust_colors_single_command_real_can_compress; #line 829 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = adjust_colors_single_command_finalize; -#line 8361 "Commands.c" +#line 9059 "Commands.c" } -static void adjust_colors_single_command_instance_init (AdjustColorsSingleCommand * self) { +static void +adjust_colors_single_command_instance_init (AdjustColorsSingleCommand * self) +{ #line 829 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = ADJUST_COLORS_SINGLE_COMMAND_GET_PRIVATE (self); -#line 8368 "Commands.c" +#line 9068 "Commands.c" } -static void adjust_colors_single_command_finalize (GObject * obj) { +static void +adjust_colors_single_command_finalize (GObject * obj) +{ AdjustColorsSingleCommand * self; #line 829 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_COLORS_SINGLE_COMMAND, AdjustColorsSingleCommand); @@ -8376,11 +9078,13 @@ static void adjust_colors_single_command_finalize (GObject * obj) { _pixel_transformation_bundle_unref0 (self->priv->transformations); #line 829 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (adjust_colors_single_command_parent_class)->finalize (obj); -#line 8380 "Commands.c" +#line 9082 "Commands.c" } -GType adjust_colors_single_command_get_type (void) { +GType +adjust_colors_single_command_get_type (void) +{ static volatile gsize adjust_colors_single_command_type_id__volatile = 0; if (g_once_init_enter (&adjust_colors_single_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (AdjustColorsSingleCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) adjust_colors_single_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (AdjustColorsSingleCommand), 0, (GInstanceInitFunc) adjust_colors_single_command_instance_init, NULL }; @@ -8392,13 +9096,15 @@ GType adjust_colors_single_command_get_type (void) { } -AdjustColorsMultipleCommand* adjust_colors_multiple_command_construct (GType object_type, GeeIterable* iter, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation) { +AdjustColorsMultipleCommand* +adjust_colors_multiple_command_construct (GType object_type, + GeeIterable* iter, + PixelTransformationBundle* transformations, + const gchar* name, + const gchar* explanation) +{ AdjustColorsMultipleCommand * self = NULL; - GeeIterable* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - PixelTransformationBundle* _tmp3_; - PixelTransformationBundle* _tmp4_; + PixelTransformationBundle* _tmp0_; #line 855 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL); #line 855 "/home/jens/Source/shotwell/src/Commands.vala" @@ -8408,53 +9114,52 @@ AdjustColorsMultipleCommand* adjust_colors_multiple_command_construct (GType obj #line 855 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (explanation != NULL, NULL); #line 857 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = iter; -#line 857 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = name; -#line 857 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = explanation; -#line 857 "/home/jens/Source/shotwell/src/Commands.vala" - self = (AdjustColorsMultipleCommand*) multiple_photo_transformation_command_construct (object_type, _tmp0_, _ ("Applying Color Transformations"), _ ("Undoing Color Transformations"), _tmp1_, _tmp2_); + self = (AdjustColorsMultipleCommand*) multiple_photo_transformation_command_construct (object_type, iter, _ ("Applying Color Transformations"), _ ("Undoing Color Transformations"), name, explanation); #line 860 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = transformations; -#line 860 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _pixel_transformation_bundle_ref0 (_tmp3_); + _tmp0_ = _pixel_transformation_bundle_ref0 (transformations); #line 860 "/home/jens/Source/shotwell/src/Commands.vala" _pixel_transformation_bundle_unref0 (self->priv->transformations); #line 860 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->transformations = _tmp4_; + self->priv->transformations = _tmp0_; #line 855 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 8429 "Commands.c" +#line 9127 "Commands.c" } -AdjustColorsMultipleCommand* adjust_colors_multiple_command_new (GeeIterable* iter, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation) { +AdjustColorsMultipleCommand* +adjust_colors_multiple_command_new (GeeIterable* iter, + PixelTransformationBundle* transformations, + const gchar* name, + const gchar* explanation) +{ #line 855 "/home/jens/Source/shotwell/src/Commands.vala" return adjust_colors_multiple_command_construct (TYPE_ADJUST_COLORS_MULTIPLE_COMMAND, iter, transformations, name, explanation); -#line 8436 "Commands.c" +#line 9139 "Commands.c" } -static void adjust_colors_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) { +static void +adjust_colors_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, + DataSource* source) +{ AdjustColorsMultipleCommand * self; - DataSource* _tmp0_; - PixelTransformationBundle* _tmp1_; + PixelTransformationBundle* _tmp0_; #line 863 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_COLORS_MULTIPLE_COMMAND, AdjustColorsMultipleCommand); #line 863 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 864 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; + _tmp0_ = self->priv->transformations; #line 864 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = self->priv->transformations; -#line 864 "/home/jens/Source/shotwell/src/Commands.vala" - photo_set_color_adjustments (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp1_); -#line 8454 "Commands.c" + photo_set_color_adjustments (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_PHOTO, Photo), _tmp0_); +#line 9157 "Commands.c" } -static void adjust_colors_multiple_command_class_init (AdjustColorsMultipleCommandClass * klass) { +static void +adjust_colors_multiple_command_class_init (AdjustColorsMultipleCommandClass * klass) +{ #line 852 "/home/jens/Source/shotwell/src/Commands.vala" adjust_colors_multiple_command_parent_class = g_type_class_peek_parent (klass); #line 852 "/home/jens/Source/shotwell/src/Commands.vala" @@ -8463,18 +9168,22 @@ static void adjust_colors_multiple_command_class_init (AdjustColorsMultipleComma ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) adjust_colors_multiple_command_real_execute_on_source; #line 852 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = adjust_colors_multiple_command_finalize; -#line 8467 "Commands.c" +#line 9172 "Commands.c" } -static void adjust_colors_multiple_command_instance_init (AdjustColorsMultipleCommand * self) { +static void +adjust_colors_multiple_command_instance_init (AdjustColorsMultipleCommand * self) +{ #line 852 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = ADJUST_COLORS_MULTIPLE_COMMAND_GET_PRIVATE (self); -#line 8474 "Commands.c" +#line 9181 "Commands.c" } -static void adjust_colors_multiple_command_finalize (GObject * obj) { +static void +adjust_colors_multiple_command_finalize (GObject * obj) +{ AdjustColorsMultipleCommand * self; #line 852 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_COLORS_MULTIPLE_COMMAND, AdjustColorsMultipleCommand); @@ -8482,11 +9191,13 @@ static void adjust_colors_multiple_command_finalize (GObject * obj) { _pixel_transformation_bundle_unref0 (self->priv->transformations); #line 852 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (adjust_colors_multiple_command_parent_class)->finalize (obj); -#line 8486 "Commands.c" +#line 9195 "Commands.c" } -GType adjust_colors_multiple_command_get_type (void) { +GType +adjust_colors_multiple_command_get_type (void) +{ static volatile gsize adjust_colors_multiple_command_type_id__volatile = 0; if (g_once_init_enter (&adjust_colors_multiple_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (AdjustColorsMultipleCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) adjust_colors_multiple_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (AdjustColorsMultipleCommand), 0, (GInstanceInitFunc) adjust_colors_multiple_command_instance_init, NULL }; @@ -8498,12 +9209,15 @@ GType adjust_colors_multiple_command_get_type (void) { } -RedeyeCommand* redeye_command_construct (GType object_type, Photo* photo, EditingToolsRedeyeInstance* redeye_instance, const gchar* name, const gchar* explanation) { +RedeyeCommand* +redeye_command_construct (GType object_type, + Photo* photo, + EditingToolsRedeyeInstance* redeye_instance, + const gchar* name, + const gchar* explanation) +{ RedeyeCommand * self = NULL; - Photo* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - EditingToolsRedeyeInstance _tmp3_; + EditingToolsRedeyeInstance _tmp0_; #line 871 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); #line 871 "/home/jens/Source/shotwell/src/Commands.vala" @@ -8513,49 +9227,50 @@ RedeyeCommand* redeye_command_construct (GType object_type, Photo* photo, Editin #line 871 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (explanation != NULL, NULL); #line 873 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = photo; -#line 873 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = name; -#line 873 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = explanation; -#line 873 "/home/jens/Source/shotwell/src/Commands.vala" - self = (RedeyeCommand*) generic_photo_transformation_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_); + self = (RedeyeCommand*) generic_photo_transformation_command_construct (object_type, photo, name, explanation); #line 875 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = *redeye_instance; + _tmp0_ = *redeye_instance; #line 875 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->redeye_instance = _tmp3_; + self->priv->redeye_instance = _tmp0_; #line 871 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 8530 "Commands.c" +#line 9238 "Commands.c" } -RedeyeCommand* redeye_command_new (Photo* photo, EditingToolsRedeyeInstance* redeye_instance, const gchar* name, const gchar* explanation) { +RedeyeCommand* +redeye_command_new (Photo* photo, + EditingToolsRedeyeInstance* redeye_instance, + const gchar* name, + const gchar* explanation) +{ #line 871 "/home/jens/Source/shotwell/src/Commands.vala" return redeye_command_construct (TYPE_REDEYE_COMMAND, photo, redeye_instance, name, explanation); -#line 8537 "Commands.c" +#line 9250 "Commands.c" } -static void redeye_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo) { +static void +redeye_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, + Photo* photo) +{ RedeyeCommand * self; - Photo* _tmp0_; - EditingToolsRedeyeInstance _tmp1_; + EditingToolsRedeyeInstance _tmp0_; #line 878 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_REDEYE_COMMAND, RedeyeCommand); #line 878 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_PHOTO (photo)); #line 879 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = photo; -#line 879 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = self->priv->redeye_instance; + _tmp0_ = self->priv->redeye_instance; #line 879 "/home/jens/Source/shotwell/src/Commands.vala" - photo_add_redeye_instance (_tmp0_, &_tmp1_); -#line 8555 "Commands.c" + photo_add_redeye_instance (photo, &_tmp0_); +#line 9268 "Commands.c" } -static void redeye_command_class_init (RedeyeCommandClass * klass) { +static void +redeye_command_class_init (RedeyeCommandClass * klass) +{ #line 868 "/home/jens/Source/shotwell/src/Commands.vala" redeye_command_parent_class = g_type_class_peek_parent (klass); #line 868 "/home/jens/Source/shotwell/src/Commands.vala" @@ -8564,28 +9279,34 @@ static void redeye_command_class_init (RedeyeCommandClass * klass) { ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) redeye_command_real_execute_on_photo; #line 868 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = redeye_command_finalize; -#line 8568 "Commands.c" +#line 9283 "Commands.c" } -static void redeye_command_instance_init (RedeyeCommand * self) { +static void +redeye_command_instance_init (RedeyeCommand * self) +{ #line 868 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = REDEYE_COMMAND_GET_PRIVATE (self); -#line 8575 "Commands.c" +#line 9292 "Commands.c" } -static void redeye_command_finalize (GObject * obj) { +static void +redeye_command_finalize (GObject * obj) +{ RedeyeCommand * self; #line 868 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_REDEYE_COMMAND, RedeyeCommand); #line 868 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (redeye_command_parent_class)->finalize (obj); -#line 8585 "Commands.c" +#line 9304 "Commands.c" } -GType redeye_command_get_type (void) { +GType +redeye_command_get_type (void) +{ static volatile gsize redeye_command_type_id__volatile = 0; if (g_once_init_enter (&redeye_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RedeyeCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) redeye_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RedeyeCommand), 0, (GInstanceInitFunc) redeye_command_instance_init, NULL }; @@ -8597,27 +9318,27 @@ GType redeye_command_get_type (void) { } -MovePhotosCommand* move_photos_command_construct (GType object_type, const gchar* name, const gchar* explanation) { +MovePhotosCommand* +move_photos_command_construct (GType object_type, + const gchar* name, + const gchar* explanation) +{ MovePhotosCommand * self = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; #line 967 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (name != NULL, NULL); #line 967 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (explanation != NULL, NULL); #line 968 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = name; -#line 968 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = explanation; -#line 968 "/home/jens/Source/shotwell/src/Commands.vala" - self = (MovePhotosCommand*) command_construct (object_type, _tmp0_, _tmp1_); + self = (MovePhotosCommand*) command_construct (object_type, name, explanation); #line 967 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 8617 "Commands.c" +#line 9336 "Commands.c" } -static void move_photos_command_real_prepare (Command* base) { +static void +move_photos_command_real_prepare (Command* base) +{ MovePhotosCommand * self; MovePhotosCommandRealMovePhotosCommand* _tmp0_; MovePhotosCommandRealMovePhotosCommand* _tmp1_; @@ -8631,11 +9352,13 @@ static void move_photos_command_real_prepare (Command* base) { _tmp1_ = self->real_command; #line 973 "/home/jens/Source/shotwell/src/Commands.vala" command_prepare (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND, Command)); -#line 8635 "Commands.c" +#line 9356 "Commands.c" } -static void move_photos_command_real_execute (Command* base) { +static void +move_photos_command_real_execute (Command* base) +{ MovePhotosCommand * self; MovePhotosCommandRealMovePhotosCommand* _tmp0_; MovePhotosCommandRealMovePhotosCommand* _tmp1_; @@ -8649,11 +9372,13 @@ static void move_photos_command_real_execute (Command* base) { _tmp1_ = self->real_command; #line 978 "/home/jens/Source/shotwell/src/Commands.vala" command_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND, Command)); -#line 8653 "Commands.c" +#line 9376 "Commands.c" } -static void move_photos_command_real_undo (Command* base) { +static void +move_photos_command_real_undo (Command* base) +{ MovePhotosCommand * self; MovePhotosCommandRealMovePhotosCommand* _tmp0_; MovePhotosCommandRealMovePhotosCommand* _tmp1_; @@ -8667,34 +9392,41 @@ static void move_photos_command_real_undo (Command* base) { _tmp1_ = self->real_command; #line 983 "/home/jens/Source/shotwell/src/Commands.vala" command_undo (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND, Command)); -#line 8671 "Commands.c" +#line 9396 "Commands.c" } -static void _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) { +static void +_move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, + gpointer self) +{ #line 914 "/home/jens/Source/shotwell/src/Commands.vala" move_photos_command_real_move_photos_command_on_proxy_broken ((MovePhotosCommandRealMovePhotosCommand*) self); -#line 8678 "Commands.c" +#line 9406 "Commands.c" } -static gpointer _source_proxy_ref0 (gpointer self) { +static gpointer +_source_proxy_ref0 (gpointer self) +{ #line 899 "/home/jens/Source/shotwell/src/Commands.vala" return self ? source_proxy_ref (self) : NULL; -#line 8685 "Commands.c" +#line 9415 "Commands.c" } -MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_command_construct (GType object_type, Event* new_event, GeeIterable* source_views, const gchar* progress_text, const gchar* undo_progress_text, const gchar* name, const gchar* explanation) { +MovePhotosCommandRealMovePhotosCommand* +move_photos_command_real_move_photos_command_construct (GType object_type, + Event* new_event, + GeeIterable* source_views, + const gchar* progress_text, + const gchar* undo_progress_text, + const gchar* name, + const gchar* explanation) +{ MovePhotosCommandRealMovePhotosCommand * self = NULL; - GeeIterable* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - Event* _tmp30_; - SourceProxy* _tmp31_; - SourceProxy* _tmp32_; + SourceProxy* _tmp25_; + SourceProxy* _tmp26_; #line 891 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail ((new_event == NULL) || IS_EVENT (new_event), NULL); #line 891 "/home/jens/Source/shotwell/src/Commands.vala" @@ -8708,190 +9440,187 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com #line 891 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (explanation != NULL, NULL); #line 893 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source_views; -#line 893 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = progress_text; -#line 893 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = undo_progress_text; -#line 893 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = name; -#line 893 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = explanation; -#line 893 "/home/jens/Source/shotwell/src/Commands.vala" - self = (MovePhotosCommandRealMovePhotosCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_); -#line 8723 "Commands.c" + self = (MovePhotosCommandRealMovePhotosCommand*) multiple_data_source_command_construct (object_type, source_views, progress_text, undo_progress_text, name, explanation); +#line 9445 "Commands.c" { GeeArrayList* _source_list = NULL; - GeeArrayList* _tmp5_; - GeeArrayList* _tmp6_; + GeeArrayList* _tmp0_; + GeeArrayList* _tmp1_; gint _source_size = 0; - GeeArrayList* _tmp7_; - gint _tmp8_; - gint _tmp9_; + GeeArrayList* _tmp2_; + gint _tmp3_; + gint _tmp4_; gint _source_index = 0; #line 896 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand)->source_list; + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand)->source_list; #line 896 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 896 "/home/jens/Source/shotwell/src/Commands.vala" - _source_list = _tmp6_; + _source_list = _tmp1_; #line 896 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = _source_list; + _tmp2_ = _source_list; #line 896 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 896 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = _tmp8_; + _tmp4_ = _tmp3_; #line 896 "/home/jens/Source/shotwell/src/Commands.vala" - _source_size = _tmp9_; + _source_size = _tmp4_; #line 896 "/home/jens/Source/shotwell/src/Commands.vala" _source_index = -1; #line 896 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 8751 "Commands.c" - gint _tmp10_; - gint _tmp11_; - gint _tmp12_; +#line 9473 "Commands.c" + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; DataSource* source = NULL; - GeeArrayList* _tmp13_; - gint _tmp14_; - gpointer _tmp15_; + GeeArrayList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; MediaSource* current_media = NULL; - DataSource* _tmp16_; - MediaSource* _tmp17_; + DataSource* _tmp11_; + MediaSource* _tmp12_; Event* old_event = NULL; - MediaSource* _tmp18_; - Event* _tmp19_; - SourceProxy* _tmp20_ = NULL; - Event* _tmp21_; + MediaSource* _tmp13_; + Event* _tmp14_; + SourceProxy* _tmp15_ = NULL; + Event* _tmp16_; SourceProxy* old_event_proxy = NULL; + SourceProxy* _tmp19_; + SourceProxy* _tmp20_; + GeeHashMap* _tmp22_; + MediaSource* _tmp23_; SourceProxy* _tmp24_; - SourceProxy* _tmp25_; - GeeHashMap* _tmp27_; - MediaSource* _tmp28_; - SourceProxy* _tmp29_; #line 896 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = _source_index; + _tmp5_ = _source_index; #line 896 "/home/jens/Source/shotwell/src/Commands.vala" - _source_index = _tmp10_ + 1; + _source_index = _tmp5_ + 1; #line 896 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = _source_index; + _tmp6_ = _source_index; #line 896 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = _source_size; + _tmp7_ = _source_size; #line 896 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp11_ < _tmp12_)) { + if (!(_tmp6_ < _tmp7_)) { #line 896 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 8785 "Commands.c" +#line 9507 "Commands.c" } #line 896 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = _source_list; + _tmp8_ = _source_list; #line 896 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = _source_index; + _tmp9_ = _source_index; #line 896 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp14_); + _tmp10_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp9_); #line 896 "/home/jens/Source/shotwell/src/Commands.vala" - source = (DataSource*) _tmp15_; + source = (DataSource*) _tmp10_; #line 897 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = source; + _tmp11_ = source; #line 897 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource)); #line 897 "/home/jens/Source/shotwell/src/Commands.vala" - current_media = _tmp17_; + current_media = _tmp12_; #line 898 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = current_media; + _tmp13_ = current_media; #line 898 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = media_source_get_event (_tmp18_); + _tmp14_ = media_source_get_event (_tmp13_); #line 898 "/home/jens/Source/shotwell/src/Commands.vala" - old_event = _tmp19_; + old_event = _tmp14_; #line 899 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = old_event; + _tmp16_ = old_event; #line 899 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp21_ != NULL) { -#line 8811 "Commands.c" - Event* _tmp22_; - SourceProxy* _tmp23_; + if (_tmp16_ != NULL) { +#line 9533 "Commands.c" + Event* _tmp17_; + SourceProxy* _tmp18_; #line 899 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = old_event; + _tmp17_ = old_event; #line 899 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PROXYABLE, Proxyable)); + _tmp18_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PROXYABLE, Proxyable)); #line 899 "/home/jens/Source/shotwell/src/Commands.vala" - _source_proxy_unref0 (_tmp20_); + _source_proxy_unref0 (_tmp15_); #line 899 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = _tmp23_; -#line 8822 "Commands.c" + _tmp15_ = _tmp18_; +#line 9544 "Commands.c" } else { #line 899 "/home/jens/Source/shotwell/src/Commands.vala" - _source_proxy_unref0 (_tmp20_); + _source_proxy_unref0 (_tmp15_); #line 899 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = NULL; -#line 8828 "Commands.c" + _tmp15_ = NULL; +#line 9550 "Commands.c" } #line 899 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = _source_proxy_ref0 (_tmp20_); + _tmp19_ = _source_proxy_ref0 (_tmp15_); #line 899 "/home/jens/Source/shotwell/src/Commands.vala" - old_event_proxy = _tmp24_; + old_event_proxy = _tmp19_; #line 902 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = old_event_proxy; + _tmp20_ = old_event_proxy; #line 902 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp25_ != NULL) { -#line 8838 "Commands.c" - SourceProxy* _tmp26_; + if (_tmp20_ != NULL) { +#line 9560 "Commands.c" + SourceProxy* _tmp21_; #line 903 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = old_event_proxy; + _tmp21_ = old_event_proxy; #line 903 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (_tmp26_, "broken", (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self, 0); -#line 8844 "Commands.c" + g_signal_connect_object (_tmp21_, "broken", (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self, 0); +#line 9566 "Commands.c" } #line 905 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = self->priv->old_events; + _tmp22_ = self->priv->old_events; #line 905 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp28_ = current_media; + _tmp23_ = current_media; #line 905 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp29_ = old_event_proxy; + _tmp24_ = old_event_proxy; #line 905 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp28_, _tmp29_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp23_, _tmp24_); #line 896 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (old_event_proxy); #line 896 "/home/jens/Source/shotwell/src/Commands.vala" - _source_proxy_unref0 (_tmp20_); + _source_proxy_unref0 (_tmp15_); #line 896 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (old_event); #line 896 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (current_media); #line 896 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); -#line 8864 "Commands.c" +#line 9586 "Commands.c" } #line 896 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_list); -#line 8868 "Commands.c" +#line 9590 "Commands.c" } #line 909 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp30_ = new_event; -#line 909 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp31_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_PROXYABLE, Proxyable)); + _tmp25_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (new_event, TYPE_PROXYABLE, Proxyable)); #line 909 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (self->priv->new_event_proxy); #line 909 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->new_event_proxy = _tmp31_; + self->priv->new_event_proxy = _tmp25_; #line 910 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp32_ = self->priv->new_event_proxy; + _tmp26_ = self->priv->new_event_proxy; #line 910 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (_tmp32_, "broken", (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self, 0); + g_signal_connect_object (_tmp26_, "broken", (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self, 0); #line 891 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 8884 "Commands.c" +#line 9604 "Commands.c" } -MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_command_new (Event* new_event, GeeIterable* source_views, const gchar* progress_text, const gchar* undo_progress_text, const gchar* name, const gchar* explanation) { +MovePhotosCommandRealMovePhotosCommand* +move_photos_command_real_move_photos_command_new (Event* new_event, + GeeIterable* source_views, + const gchar* progress_text, + const gchar* undo_progress_text, + const gchar* name, + const gchar* explanation) +{ #line 891 "/home/jens/Source/shotwell/src/Commands.vala" return move_photos_command_real_move_photos_command_construct (MOVE_PHOTOS_COMMAND_TYPE_REAL_MOVE_PHOTOS_COMMAND, new_event, source_views, progress_text, undo_progress_text, name, explanation); -#line 8891 "Commands.c" +#line 9618 "Commands.c" } -static void move_photos_command_real_move_photos_command_real_execute (Command* base) { +static void +move_photos_command_real_move_photos_command_real_execute (Command* base) +{ MovePhotosCommandRealMovePhotosCommand * self; LibraryWindow* _tmp0_; LibraryWindow* _tmp1_; @@ -8918,7 +9647,7 @@ static void move_photos_command_real_move_photos_command_real_execute (Command* _g_object_unref0 (_tmp1_); #line 928 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp4_) { -#line 8922 "Commands.c" +#line 9651 "Commands.c" Event* evt = NULL; LibraryWindow* _tmp5_; LibraryWindow* _tmp6_; @@ -8927,10 +9656,9 @@ static void move_photos_command_real_move_photos_command_real_execute (Command* Event* _tmp9_; Event* _tmp10_; Event* _tmp11_; - gint _tmp12_; - GeeArrayList* _tmp13_; + GeeArrayList* _tmp12_; + gint _tmp13_; gint _tmp14_; - gint _tmp15_; #line 929 "/home/jens/Source/shotwell/src/Commands.vala" _tmp5_ = library_window_get_app (); #line 929 "/home/jens/Source/shotwell/src/Commands.vala" @@ -8952,193 +9680,190 @@ static void move_photos_command_real_move_photos_command_real_execute (Command* #line 932 "/home/jens/Source/shotwell/src/Commands.vala" _tmp11_ = evt; #line 932 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_EVENT_SOURCE, EventSource)); -#line 932 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand)->source_list; + _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand)->source_list; #line 932 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp13_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 932 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 932 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp12_ == _tmp15_) { -#line 8965 "Commands.c" + if (event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_EVENT_SOURCE, EventSource)) == _tmp14_) { +#line 9691 "Commands.c" + LibraryWindow* _tmp15_; LibraryWindow* _tmp16_; - LibraryWindow* _tmp17_; - SourceProxy* _tmp18_; - DataSource* _tmp19_; - Event* _tmp20_; + SourceProxy* _tmp17_; + DataSource* _tmp18_; + Event* _tmp19_; #line 935 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = library_window_get_app (); + _tmp15_ = library_window_get_app (); #line 935 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 935 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = self->priv->new_event_proxy; + _tmp17_ = self->priv->new_event_proxy; #line 935 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = source_proxy_get_source (_tmp18_); + _tmp18_ = source_proxy_get_source (_tmp17_); #line 935 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_EVENT, Event); + _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_EVENT, Event); #line 935 "/home/jens/Source/shotwell/src/Commands.vala" - library_window_switch_to_event (_tmp17_, _tmp20_); + library_window_switch_to_event (_tmp16_, _tmp19_); #line 935 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp19_); #line 935 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp17_); -#line 8987 "Commands.c" + _g_object_unref0 (_tmp16_); +#line 9713 "Commands.c" } #line 928 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (evt); -#line 8991 "Commands.c" +#line 9717 "Commands.c" } else { - SourceProxy* _tmp21_; - DataSource* _tmp22_; - Event* _tmp23_; + SourceProxy* _tmp20_; + DataSource* _tmp21_; + Event* _tmp22_; + GeeArrayList* _tmp23_; gint _tmp24_; - GeeArrayList* _tmp25_; - gint _tmp26_; - gint _tmp27_; - gboolean _tmp28_; -#line 941 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = self->priv->new_event_proxy; + gint _tmp25_; + gboolean _tmp26_; #line 941 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = source_proxy_get_source (_tmp21_); + _tmp20_ = self->priv->new_event_proxy; #line 941 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_EVENT, Event); + _tmp21_ = source_proxy_get_source (_tmp20_); #line 941 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_EVENT_SOURCE, EventSource)); + _tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_EVENT, Event); #line 941 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand)->source_list; + _tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand)->source_list; #line 941 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp24_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 941 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = _tmp26_; + _tmp25_ = _tmp24_; #line 941 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp28_ = _tmp24_ == _tmp27_; + _tmp26_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_EVENT_SOURCE, EventSource)) == _tmp25_; #line 941 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp22_); #line 941 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp28_) { -#line 9021 "Commands.c" - LibraryWindow* _tmp29_; - LibraryWindow* _tmp30_; - SourceProxy* _tmp31_; - DataSource* _tmp32_; - Event* _tmp33_; + if (_tmp26_) { +#line 9744 "Commands.c" + LibraryWindow* _tmp27_; + LibraryWindow* _tmp28_; + SourceProxy* _tmp29_; + DataSource* _tmp30_; + Event* _tmp31_; #line 943 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp29_ = library_window_get_app (); + _tmp27_ = library_window_get_app (); #line 943 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp30_ = _tmp29_; + _tmp28_ = _tmp27_; #line 943 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp31_ = self->priv->new_event_proxy; + _tmp29_ = self->priv->new_event_proxy; #line 943 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp32_ = source_proxy_get_source (_tmp31_); + _tmp30_ = source_proxy_get_source (_tmp29_); #line 943 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_EVENT, Event); + _tmp31_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_EVENT, Event); #line 943 "/home/jens/Source/shotwell/src/Commands.vala" - library_window_switch_to_event (_tmp30_, _tmp33_); + library_window_switch_to_event (_tmp28_, _tmp31_); #line 943 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp33_); + _g_object_unref0 (_tmp31_); #line 943 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp30_); -#line 9043 "Commands.c" + _g_object_unref0 (_tmp28_); +#line 9766 "Commands.c" } } } -static void move_photos_command_real_move_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) { +static void +move_photos_command_real_move_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, + DataSource* source) +{ MovePhotosCommandRealMovePhotosCommand * self; - DataSource* _tmp0_; - SourceProxy* _tmp1_; - DataSource* _tmp2_; - Event* _tmp3_; + SourceProxy* _tmp0_; + DataSource* _tmp1_; + Event* _tmp2_; #line 949 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, MOVE_PHOTOS_COMMAND_TYPE_REAL_MOVE_PHOTOS_COMMAND, MovePhotosCommandRealMovePhotosCommand); #line 949 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 950 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; -#line 950 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = self->priv->new_event_proxy; + _tmp0_ = self->priv->new_event_proxy; #line 950 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = source_proxy_get_source (_tmp1_); + _tmp1_ = source_proxy_get_source (_tmp0_); #line 950 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EVENT, Event); + _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_EVENT, Event); #line 950 "/home/jens/Source/shotwell/src/Commands.vala" - media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_); + media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource), _tmp2_); #line 950 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp3_); -#line 9071 "Commands.c" + _g_object_unref0 (_tmp2_); +#line 9794 "Commands.c" } -static void move_photos_command_real_move_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) { +static void +move_photos_command_real_move_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, + DataSource* source) +{ MovePhotosCommandRealMovePhotosCommand * self; MediaSource* current_media = NULL; - DataSource* _tmp0_; - MediaSource* _tmp1_; + MediaSource* _tmp0_; SourceProxy* event_proxy = NULL; - GeeHashMap* _tmp2_; - MediaSource* _tmp3_; - gpointer _tmp4_; - Event* _tmp5_ = NULL; - SourceProxy* _tmp6_; - MediaSource* _tmp9_; + GeeHashMap* _tmp1_; + MediaSource* _tmp2_; + gpointer _tmp3_; + Event* _tmp4_ = NULL; + SourceProxy* _tmp5_; + MediaSource* _tmp8_; #line 953 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, MOVE_PHOTOS_COMMAND_TYPE_REAL_MOVE_PHOTOS_COMMAND, MovePhotosCommandRealMovePhotosCommand); #line 953 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 954 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; -#line 954 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource)); #line 954 "/home/jens/Source/shotwell/src/Commands.vala" - current_media = _tmp1_; + current_media = _tmp0_; #line 955 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = self->priv->old_events; + _tmp1_ = self->priv->old_events; #line 955 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = current_media; + _tmp2_ = current_media; #line 955 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_); + _tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_); #line 955 "/home/jens/Source/shotwell/src/Commands.vala" - event_proxy = (SourceProxy*) _tmp4_; + event_proxy = (SourceProxy*) _tmp3_; #line 957 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = event_proxy; + _tmp5_ = event_proxy; #line 957 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp6_ != NULL) { -#line 9109 "Commands.c" - SourceProxy* _tmp7_; - DataSource* _tmp8_; + if (_tmp5_ != NULL) { +#line 9832 "Commands.c" + SourceProxy* _tmp6_; + DataSource* _tmp7_; #line 957 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = event_proxy; + _tmp6_ = event_proxy; #line 957 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = source_proxy_get_source (_tmp7_); + _tmp7_ = source_proxy_get_source (_tmp6_); #line 957 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 957 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_EVENT, Event); -#line 9120 "Commands.c" + _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_EVENT, Event); +#line 9843 "Commands.c" } else { #line 957 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 957 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = NULL; -#line 9126 "Commands.c" + _tmp4_ = NULL; +#line 9849 "Commands.c" } #line 957 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = current_media; + _tmp8_ = current_media; #line 957 "/home/jens/Source/shotwell/src/Commands.vala" - media_source_set_event (_tmp9_, _tmp5_); + media_source_set_event (_tmp8_, _tmp4_); #line 953 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 953 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (event_proxy); #line 953 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (current_media); -#line 9138 "Commands.c" +#line 9861 "Commands.c" } -static void move_photos_command_real_move_photos_command_on_proxy_broken (MovePhotosCommandRealMovePhotosCommand* self) { +static void +move_photos_command_real_move_photos_command_on_proxy_broken (MovePhotosCommandRealMovePhotosCommand* self) +{ CommandManager* _tmp0_; CommandManager* _tmp1_; #line 960 "/home/jens/Source/shotwell/src/Commands.vala" @@ -9151,11 +9876,13 @@ static void move_photos_command_real_move_photos_command_on_proxy_broken (MovePh command_manager_reset (_tmp1_); #line 961 "/home/jens/Source/shotwell/src/Commands.vala" _command_manager_unref0 (_tmp1_); -#line 9155 "Commands.c" +#line 9880 "Commands.c" } -static void move_photos_command_real_move_photos_command_class_init (MovePhotosCommandRealMovePhotosCommandClass * klass) { +static void +move_photos_command_real_move_photos_command_class_init (MovePhotosCommandRealMovePhotosCommandClass * klass) +{ #line 886 "/home/jens/Source/shotwell/src/Commands.vala" move_photos_command_real_move_photos_command_parent_class = g_type_class_peek_parent (klass); #line 886 "/home/jens/Source/shotwell/src/Commands.vala" @@ -9168,11 +9895,13 @@ static void move_photos_command_real_move_photos_command_class_init (MovePhotosC ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) move_photos_command_real_move_photos_command_real_undo_on_source; #line 886 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = move_photos_command_real_move_photos_command_finalize; -#line 9172 "Commands.c" +#line 9899 "Commands.c" } -static void move_photos_command_real_move_photos_command_instance_init (MovePhotosCommandRealMovePhotosCommand * self) { +static void +move_photos_command_real_move_photos_command_instance_init (MovePhotosCommandRealMovePhotosCommand * self) +{ GeeHashMap* _tmp0_; #line 886 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = MOVE_PHOTOS_COMMAND_REAL_MOVE_PHOTOS_COMMAND_GET_PRIVATE (self); @@ -9182,11 +9911,13 @@ static void move_photos_command_real_move_photos_command_instance_init (MovePhot _tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 888 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->old_events = _tmp0_; -#line 9186 "Commands.c" +#line 9915 "Commands.c" } -static void move_photos_command_real_move_photos_command_finalize (GObject * obj) { +static void +move_photos_command_real_move_photos_command_finalize (GObject * obj) +{ MovePhotosCommandRealMovePhotosCommand * self; SourceProxy* _tmp0_; guint _tmp1_; @@ -9198,7 +9929,7 @@ static void move_photos_command_real_move_photos_command_finalize (GObject * obj g_signal_parse_name ("broken", TYPE_SOURCE_PROXY, &_tmp1_, NULL, FALSE); #line 914 "/home/jens/Source/shotwell/src/Commands.vala" g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self); -#line 9202 "Commands.c" +#line 9933 "Commands.c" { GeeIterator* _proxy_it = NULL; GeeHashMap* _tmp2_; @@ -9225,51 +9956,48 @@ static void move_photos_command_real_move_photos_command_finalize (GObject * obj _proxy_it = _tmp7_; #line 916 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 9229 "Commands.c" +#line 9960 "Commands.c" GeeIterator* _tmp8_; - gboolean _tmp9_; SourceProxy* proxy = NULL; - GeeIterator* _tmp10_; - gpointer _tmp11_; - SourceProxy* _tmp12_; + GeeIterator* _tmp9_; + gpointer _tmp10_; + SourceProxy* _tmp11_; #line 916 "/home/jens/Source/shotwell/src/Commands.vala" _tmp8_ = _proxy_it; #line 916 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = gee_iterator_next (_tmp8_); -#line 916 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp9_) { + if (!gee_iterator_next (_tmp8_)) { #line 916 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 9244 "Commands.c" +#line 9972 "Commands.c" } #line 916 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = _proxy_it; + _tmp9_ = _proxy_it; #line 916 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = gee_iterator_get (_tmp10_); + _tmp10_ = gee_iterator_get (_tmp9_); #line 916 "/home/jens/Source/shotwell/src/Commands.vala" - proxy = (SourceProxy*) _tmp11_; + proxy = (SourceProxy*) _tmp10_; #line 917 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = proxy; + _tmp11_ = proxy; #line 917 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp12_ != NULL) { -#line 9256 "Commands.c" - SourceProxy* _tmp13_; - guint _tmp14_; + if (_tmp11_ != NULL) { +#line 9984 "Commands.c" + SourceProxy* _tmp12_; + guint _tmp13_; #line 918 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = proxy; + _tmp12_ = proxy; #line 918 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_parse_name ("broken", TYPE_SOURCE_PROXY, &_tmp14_, NULL, FALSE); + g_signal_parse_name ("broken", TYPE_SOURCE_PROXY, &_tmp13_, NULL, FALSE); #line 918 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self); -#line 9265 "Commands.c" + g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self); +#line 9993 "Commands.c" } #line 916 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (proxy); -#line 9269 "Commands.c" +#line 9997 "Commands.c" } #line 916 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_proxy_it); -#line 9273 "Commands.c" +#line 10001 "Commands.c" } #line 887 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (self->priv->new_event_proxy); @@ -9277,11 +10005,13 @@ static void move_photos_command_real_move_photos_command_finalize (GObject * obj _g_object_unref0 (self->priv->old_events); #line 886 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (move_photos_command_real_move_photos_command_parent_class)->finalize (obj); -#line 9281 "Commands.c" +#line 10009 "Commands.c" } -GType move_photos_command_real_move_photos_command_get_type (void) { +GType +move_photos_command_real_move_photos_command_get_type (void) +{ static volatile gsize move_photos_command_real_move_photos_command_type_id__volatile = 0; if (g_once_init_enter (&move_photos_command_real_move_photos_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MovePhotosCommandRealMovePhotosCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) move_photos_command_real_move_photos_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MovePhotosCommandRealMovePhotosCommand), 0, (GInstanceInitFunc) move_photos_command_real_move_photos_command_instance_init, NULL }; @@ -9293,7 +10023,9 @@ GType move_photos_command_real_move_photos_command_get_type (void) { } -static void move_photos_command_class_init (MovePhotosCommandClass * klass) { +static void +move_photos_command_class_init (MovePhotosCommandClass * klass) +{ #line 883 "/home/jens/Source/shotwell/src/Commands.vala" move_photos_command_parent_class = g_type_class_peek_parent (klass); #line 883 "/home/jens/Source/shotwell/src/Commands.vala" @@ -9304,15 +10036,19 @@ static void move_photos_command_class_init (MovePhotosCommandClass * klass) { ((CommandClass *) klass)->undo = (void (*) (Command *)) move_photos_command_real_undo; #line 883 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = move_photos_command_finalize; -#line 9308 "Commands.c" +#line 10040 "Commands.c" } -static void move_photos_command_instance_init (MovePhotosCommand * self) { +static void +move_photos_command_instance_init (MovePhotosCommand * self) +{ } -static void move_photos_command_finalize (GObject * obj) { +static void +move_photos_command_finalize (GObject * obj) +{ MovePhotosCommand * self; #line 883 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand); @@ -9320,11 +10056,13 @@ static void move_photos_command_finalize (GObject * obj) { _g_object_unref0 (self->real_command); #line 883 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (move_photos_command_parent_class)->finalize (obj); -#line 9324 "Commands.c" +#line 10060 "Commands.c" } -GType move_photos_command_get_type (void) { +GType +move_photos_command_get_type (void) +{ static volatile gsize move_photos_command_type_id__volatile = 0; if (g_once_init_enter (&move_photos_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MovePhotosCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) move_photos_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MovePhotosCommand), 0, (GInstanceInitFunc) move_photos_command_instance_init, NULL }; @@ -9336,146 +10074,148 @@ GType move_photos_command_get_type (void) { } -NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* iter) { +NewEventCommand* +new_event_command_construct (GType object_type, + GeeIterable* iter) +{ NewEventCommand * self = NULL; MediaSource* key_source = NULL; - MediaSource* _tmp11_; + MediaSource* _tmp9_; Event* new_event = NULL; - MediaSource* _tmp12_; - Event* _tmp13_; - GeeIterable* _tmp14_; - MovePhotosCommandRealMovePhotosCommand* _tmp15_; + MediaSource* _tmp10_; + Event* _tmp11_; + MovePhotosCommandRealMovePhotosCommand* _tmp12_; #line 988 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL); #line 989 "/home/jens/Source/shotwell/src/Commands.vala" self = (NewEventCommand*) move_photos_command_construct (object_type, RESOURCES_NEW_EVENT_LABEL, ""); #line 992 "/home/jens/Source/shotwell/src/Commands.vala" key_source = NULL; -#line 9355 "Commands.c" +#line 10095 "Commands.c" { GeeIterator* _view_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; -#line 993 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = iter; + GeeIterator* _tmp0_; #line 993 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); + _tmp0_ = gee_iterable_iterator (iter); #line 993 "/home/jens/Source/shotwell/src/Commands.vala" - _view_it = _tmp1_; + _view_it = _tmp0_; #line 993 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 9368 "Commands.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 10105 "Commands.c" + GeeIterator* _tmp1_; DataView* view = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; MediaSource* current_source = NULL; - DataView* _tmp6_; - DataSource* _tmp7_; - MediaSource* _tmp8_; + DataView* _tmp4_; + DataSource* _tmp5_; + MediaSource* _tmp6_; #line 993 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _view_it; -#line 993 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _view_it; #line 993 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 993 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 9386 "Commands.c" +#line 10120 "Commands.c" } #line 993 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _view_it; + _tmp2_ = _view_it; #line 993 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 993 "/home/jens/Source/shotwell/src/Commands.vala" - view = (DataView*) _tmp5_; + view = (DataView*) _tmp3_; #line 994 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = view; + _tmp4_ = view; #line 994 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = data_view_get_source (_tmp6_); + _tmp5_ = data_view_get_source (_tmp4_); #line 994 "/home/jens/Source/shotwell/src/Commands.vala" - current_source = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource); + current_source = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource); #line 996 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = key_source; + _tmp6_ = key_source; #line 996 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp8_ == NULL) { -#line 9404 "Commands.c" - MediaSource* _tmp9_; - MediaSource* _tmp10_; + if (_tmp6_ == NULL) { +#line 10138 "Commands.c" + MediaSource* _tmp7_; + MediaSource* _tmp8_; #line 997 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = current_source; + _tmp7_ = current_source; #line 997 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = _g_object_ref0 (_tmp9_); + _tmp8_ = _g_object_ref0 (_tmp7_); #line 997 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (key_source); #line 997 "/home/jens/Source/shotwell/src/Commands.vala" - key_source = _tmp10_; + key_source = _tmp8_; #line 998 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (current_source); #line 998 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (view); #line 998 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 9421 "Commands.c" +#line 10155 "Commands.c" } #line 993 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (current_source); #line 993 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (view); -#line 9427 "Commands.c" +#line 10161 "Commands.c" } #line 993 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_view_it); -#line 9431 "Commands.c" +#line 10165 "Commands.c" } #line 1003 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = key_source; + _tmp9_ = key_source; #line 1003 "/home/jens/Source/shotwell/src/Commands.vala" - _vala_assert (_tmp11_ != NULL, "key_source != null"); + _vala_assert (_tmp9_ != NULL, "key_source != null"); #line 1005 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = key_source; + _tmp10_ = key_source; #line 1005 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = event_create_empty_event (_tmp12_); + _tmp11_ = event_create_empty_event (_tmp10_); #line 1005 "/home/jens/Source/shotwell/src/Commands.vala" - new_event = _tmp13_; -#line 1007 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = iter; + new_event = _tmp11_; #line 1007 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = move_photos_command_real_move_photos_command_new (new_event, _tmp14_, _ ("Creating New Event"), _ ("Removing Event"), RESOURCES_NEW_EVENT_LABEL, ""); + _tmp12_ = move_photos_command_real_move_photos_command_new (new_event, iter, _ ("Creating New Event"), _ ("Removing Event"), RESOURCES_NEW_EVENT_LABEL, ""); #line 1007 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command); #line 1007 "/home/jens/Source/shotwell/src/Commands.vala" - G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command = _tmp15_; + G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command = _tmp12_; #line 988 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (new_event); #line 988 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (key_source); #line 988 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 9457 "Commands.c" +#line 10189 "Commands.c" } -NewEventCommand* new_event_command_new (GeeIterable* iter) { +NewEventCommand* +new_event_command_new (GeeIterable* iter) +{ #line 988 "/home/jens/Source/shotwell/src/Commands.vala" return new_event_command_construct (TYPE_NEW_EVENT_COMMAND, iter); -#line 9464 "Commands.c" +#line 10198 "Commands.c" } -static void new_event_command_class_init (NewEventCommandClass * klass) { +static void +new_event_command_class_init (NewEventCommandClass * klass) +{ #line 987 "/home/jens/Source/shotwell/src/Commands.vala" new_event_command_parent_class = g_type_class_peek_parent (klass); -#line 9471 "Commands.c" +#line 10207 "Commands.c" } -static void new_event_command_instance_init (NewEventCommand * self) { +static void +new_event_command_instance_init (NewEventCommand * self) +{ } -GType new_event_command_get_type (void) { +GType +new_event_command_get_type (void) +{ static volatile gsize new_event_command_type_id__volatile = 0; if (g_once_init_enter (&new_event_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (NewEventCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) new_event_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NewEventCommand), 0, (GInstanceInitFunc) new_event_command_instance_init, NULL }; @@ -9487,11 +10227,13 @@ GType new_event_command_get_type (void) { } -SetEventCommand* set_event_command_construct (GType object_type, GeeIterable* iter, Event* new_event) { +SetEventCommand* +set_event_command_construct (GType object_type, + GeeIterable* iter, + Event* new_event) +{ SetEventCommand * self = NULL; - Event* _tmp0_; - GeeIterable* _tmp1_; - MovePhotosCommandRealMovePhotosCommand* _tmp2_; + MovePhotosCommandRealMovePhotosCommand* _tmp0_; #line 1014 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL); #line 1014 "/home/jens/Source/shotwell/src/Commands.vala" @@ -9499,40 +10241,45 @@ SetEventCommand* set_event_command_construct (GType object_type, GeeIterable* it #line 1015 "/home/jens/Source/shotwell/src/Commands.vala" self = (SetEventCommand*) move_photos_command_construct (object_type, RESOURCES_SET_PHOTO_EVENT_LABEL, RESOURCES_SET_PHOTO_EVENT_TOOLTIP); #line 1017 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = new_event; -#line 1017 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = iter; -#line 1017 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = move_photos_command_real_move_photos_command_new (_tmp0_, _tmp1_, _ ("Moving Photos to New Event"), _ ("Setting Photos to Previous Event"), RESOURCES_SET_PHOTO_EVENT_LABEL, ""); + _tmp0_ = move_photos_command_real_move_photos_command_new (new_event, iter, _ ("Moving Photos to New Event"), _ ("Setting Photos to Previous Event"), RESOURCES_SET_PHOTO_EVENT_LABEL, ""); #line 1017 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command); #line 1017 "/home/jens/Source/shotwell/src/Commands.vala" - G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command = _tmp2_; + G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command = _tmp0_; #line 1014 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 9514 "Commands.c" +#line 10252 "Commands.c" } -SetEventCommand* set_event_command_new (GeeIterable* iter, Event* new_event) { +SetEventCommand* +set_event_command_new (GeeIterable* iter, + Event* new_event) +{ #line 1014 "/home/jens/Source/shotwell/src/Commands.vala" return set_event_command_construct (TYPE_SET_EVENT_COMMAND, iter, new_event); -#line 9521 "Commands.c" +#line 10262 "Commands.c" } -static void set_event_command_class_init (SetEventCommandClass * klass) { +static void +set_event_command_class_init (SetEventCommandClass * klass) +{ #line 1013 "/home/jens/Source/shotwell/src/Commands.vala" set_event_command_parent_class = g_type_class_peek_parent (klass); -#line 9528 "Commands.c" +#line 10271 "Commands.c" } -static void set_event_command_instance_init (SetEventCommand * self) { +static void +set_event_command_instance_init (SetEventCommand * self) +{ } -GType set_event_command_get_type (void) { +GType +set_event_command_get_type (void) +{ static volatile gsize set_event_command_type_id__volatile = 0; if (g_once_init_enter (&set_event_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SetEventCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) set_event_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SetEventCommand), 0, (GInstanceInitFunc) set_event_command_instance_init, NULL }; @@ -9544,20 +10291,23 @@ GType set_event_command_get_type (void) { } -MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterable* iter) { +MergeEventsCommand* +merge_events_command_construct (GType object_type, + GeeIterable* iter) +{ MergeEventsCommand * self = NULL; Event* master_event = NULL; gint named_evt_src_count = 0; gint unnamed_evt_src_count = 0; GeeArrayList* media_thumbs = NULL; GeeArrayList* _tmp0_; - Event* _tmp48_; - GeeArrayList* _tmp49_; - gint _tmp50_; - gint _tmp51_; - Event* _tmp52_; - GeeArrayList* _tmp53_; - MovePhotosCommandRealMovePhotosCommand* _tmp54_; + Event* _tmp37_; + GeeArrayList* _tmp38_; + gint _tmp39_; + gint _tmp40_; + Event* _tmp41_; + GeeArrayList* _tmp42_; + MovePhotosCommandRealMovePhotosCommand* _tmp43_; #line 1024 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL); #line 1025 "/home/jens/Source/shotwell/src/Commands.vala" @@ -9572,307 +10322,282 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab _tmp0_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1034 "/home/jens/Source/shotwell/src/Commands.vala" media_thumbs = _tmp0_; -#line 9576 "Commands.c" +#line 10326 "Commands.c" { GeeIterator* _view_it = NULL; - GeeIterable* _tmp1_; - GeeIterator* _tmp2_; -#line 1036 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = iter; + GeeIterator* _tmp1_; #line 1036 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = gee_iterable_iterator (_tmp1_); + _tmp1_ = gee_iterable_iterator (iter); #line 1036 "/home/jens/Source/shotwell/src/Commands.vala" - _view_it = _tmp2_; + _view_it = _tmp1_; #line 1036 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 9589 "Commands.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 10336 "Commands.c" + GeeIterator* _tmp2_; DataView* view = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; Event* event = NULL; - DataView* _tmp7_; - DataSource* _tmp8_; - Event* _tmp9_; -#line 1036 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = _view_it; + DataView* _tmp5_; + DataSource* _tmp6_; + Event* _tmp7_; #line 1036 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _view_it; #line 1036 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 1036 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 9607 "Commands.c" +#line 10351 "Commands.c" } #line 1036 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = _view_it; + _tmp3_ = _view_it; #line 1036 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 1036 "/home/jens/Source/shotwell/src/Commands.vala" - view = (DataView*) _tmp6_; + view = (DataView*) _tmp4_; #line 1037 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = view; + _tmp5_ = view; #line 1037 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = data_view_get_source (_tmp7_); + _tmp6_ = data_view_get_source (_tmp5_); #line 1037 "/home/jens/Source/shotwell/src/Commands.vala" - event = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_EVENT, Event); + event = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT, Event); #line 1040 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = master_event; + _tmp7_ = master_event; #line 1040 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp9_ == NULL) { -#line 9625 "Commands.c" + if (_tmp7_ == NULL) { +#line 10369 "Commands.c" + Event* _tmp8_; + Event* _tmp9_; Event* _tmp10_; Event* _tmp11_; - Event* _tmp12_; - gint _tmp13_; - Event* _tmp14_; - gboolean _tmp15_; #line 1043 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = event; + _tmp8_ = event; #line 1043 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = _g_object_ref0 (_tmp10_); + _tmp9_ = _g_object_ref0 (_tmp8_); #line 1043 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (master_event); #line 1043 "/home/jens/Source/shotwell/src/Commands.vala" - master_event = _tmp11_; + master_event = _tmp9_; #line 1044 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = master_event; + _tmp10_ = master_event; #line 1044 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_EVENT_SOURCE, EventSource)); -#line 1044 "/home/jens/Source/shotwell/src/Commands.vala" - unnamed_evt_src_count = _tmp13_; -#line 1045 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = event; + unnamed_evt_src_count = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_EVENT_SOURCE, EventSource)); #line 1045 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = event_has_name (_tmp14_); + _tmp11_ = event; #line 1045 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp15_) { -#line 9652 "Commands.c" - Event* _tmp16_; - gint _tmp17_; + if (event_has_name (_tmp11_)) { +#line 10390 "Commands.c" + Event* _tmp12_; #line 1046 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = master_event; + _tmp12_ = master_event; #line 1046 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_EVENT_SOURCE, EventSource)); -#line 1046 "/home/jens/Source/shotwell/src/Commands.vala" - named_evt_src_count = _tmp17_; -#line 9661 "Commands.c" + named_evt_src_count = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_EVENT_SOURCE, EventSource)); +#line 10396 "Commands.c" } } else { - Event* _tmp18_; - gboolean _tmp19_; + Event* _tmp13_; #line 1050 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = event; -#line 1050 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = event_has_name (_tmp18_); + _tmp13_ = event; #line 1050 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp19_) { -#line 9672 "Commands.c" - Event* _tmp20_; - gint _tmp21_; - gint _tmp22_; + if (event_has_name (_tmp13_)) { +#line 10404 "Commands.c" + Event* _tmp14_; + gint _tmp15_; #line 1051 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = event; + _tmp14_ = event; #line 1051 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_EVENT_SOURCE, EventSource)); + _tmp15_ = named_evt_src_count; #line 1051 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = named_evt_src_count; -#line 1051 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp21_ > _tmp22_) { -#line 9684 "Commands.c" - Event* _tmp23_; - gint _tmp24_; - Event* _tmp25_; - Event* _tmp26_; -#line 1052 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = event; + if (event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_EVENT_SOURCE, EventSource)) > _tmp15_) { +#line 10413 "Commands.c" + Event* _tmp16_; + Event* _tmp17_; + Event* _tmp18_; #line 1052 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_EVENT_SOURCE, EventSource)); + _tmp16_ = event; #line 1052 "/home/jens/Source/shotwell/src/Commands.vala" - named_evt_src_count = _tmp24_; + named_evt_src_count = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_EVENT_SOURCE, EventSource)); #line 1053 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = event; + _tmp17_ = event; #line 1053 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = _g_object_ref0 (_tmp25_); + _tmp18_ = _g_object_ref0 (_tmp17_); #line 1053 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (master_event); #line 1053 "/home/jens/Source/shotwell/src/Commands.vala" - master_event = _tmp26_; -#line 9703 "Commands.c" + master_event = _tmp18_; +#line 10429 "Commands.c" } } else { - gint _tmp27_; + gint _tmp19_; #line 1055 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = named_evt_src_count; + _tmp19_ = named_evt_src_count; #line 1055 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp27_ == 0) { -#line 9711 "Commands.c" - Event* _tmp28_; - gint _tmp29_; - gint _tmp30_; -#line 1059 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp28_ = event; + if (_tmp19_ == 0) { +#line 10437 "Commands.c" + Event* _tmp20_; + gint _tmp21_; #line 1059 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp29_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_EVENT_SOURCE, EventSource)); + _tmp20_ = event; #line 1059 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp30_ = unnamed_evt_src_count; + _tmp21_ = unnamed_evt_src_count; #line 1059 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp29_ > _tmp30_) { -#line 9723 "Commands.c" - Event* _tmp31_; - gint _tmp32_; - Event* _tmp33_; - Event* _tmp34_; + if (event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_EVENT_SOURCE, EventSource)) > _tmp21_) { +#line 10446 "Commands.c" + Event* _tmp22_; + Event* _tmp23_; + Event* _tmp24_; #line 1060 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp31_ = event; + _tmp22_ = event; #line 1060 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp32_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_EVENT_SOURCE, EventSource)); -#line 1060 "/home/jens/Source/shotwell/src/Commands.vala" - unnamed_evt_src_count = _tmp32_; + unnamed_evt_src_count = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_EVENT_SOURCE, EventSource)); #line 1061 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp33_ = event; + _tmp23_ = event; #line 1061 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp34_ = _g_object_ref0 (_tmp33_); + _tmp24_ = _g_object_ref0 (_tmp23_); #line 1061 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (master_event); #line 1061 "/home/jens/Source/shotwell/src/Commands.vala" - master_event = _tmp34_; -#line 9742 "Commands.c" + master_event = _tmp24_; +#line 10462 "Commands.c" } } } } { GeeIterator* _media_source_it = NULL; - Event* _tmp35_; - GeeCollection* _tmp36_; - GeeCollection* _tmp37_; - GeeIterator* _tmp38_; - GeeIterator* _tmp39_; + Event* _tmp25_; + GeeCollection* _tmp26_; + GeeCollection* _tmp27_; + GeeIterator* _tmp28_; + GeeIterator* _tmp29_; #line 1068 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp35_ = event; + _tmp25_ = event; #line 1068 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp36_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_EVENT_SOURCE, EventSource)); + _tmp26_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_EVENT_SOURCE, EventSource)); #line 1068 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp37_ = _tmp36_; + _tmp27_ = _tmp26_; #line 1068 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp38_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp28_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1068 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp39_ = _tmp38_; + _tmp29_ = _tmp28_; #line 1068 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp37_); + _g_object_unref0 (_tmp27_); #line 1068 "/home/jens/Source/shotwell/src/Commands.vala" - _media_source_it = _tmp39_; + _media_source_it = _tmp29_; #line 1068 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 9770 "Commands.c" - GeeIterator* _tmp40_; - gboolean _tmp41_; +#line 10490 "Commands.c" + GeeIterator* _tmp30_; MediaSource* media_source = NULL; - GeeIterator* _tmp42_; - gpointer _tmp43_; - GeeArrayList* _tmp44_; - MediaSource* _tmp45_; - ThumbnailView* _tmp46_; - ThumbnailView* _tmp47_; -#line 1068 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp40_ = _media_source_it; + GeeIterator* _tmp31_; + gpointer _tmp32_; + GeeArrayList* _tmp33_; + MediaSource* _tmp34_; + ThumbnailView* _tmp35_; + ThumbnailView* _tmp36_; #line 1068 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp41_ = gee_iterator_next (_tmp40_); + _tmp30_ = _media_source_it; #line 1068 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp41_) { + if (!gee_iterator_next (_tmp30_)) { #line 1068 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 9788 "Commands.c" +#line 10505 "Commands.c" } #line 1068 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp42_ = _media_source_it; + _tmp31_ = _media_source_it; #line 1068 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp43_ = gee_iterator_get (_tmp42_); + _tmp32_ = gee_iterator_get (_tmp31_); #line 1068 "/home/jens/Source/shotwell/src/Commands.vala" - media_source = (MediaSource*) _tmp43_; + media_source = (MediaSource*) _tmp32_; #line 1069 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp44_ = media_thumbs; + _tmp33_ = media_thumbs; #line 1069 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp45_ = media_source; + _tmp34_ = media_source; #line 1069 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp46_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); + _tmp35_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 1069 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp47_ = _tmp46_; + _tmp36_ = _tmp35_; #line 1069 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp47_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp36_); #line 1069 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp47_); + _g_object_unref0 (_tmp36_); #line 1068 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (media_source); -#line 9810 "Commands.c" +#line 10527 "Commands.c" } #line 1068 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_media_source_it); -#line 9814 "Commands.c" +#line 10531 "Commands.c" } #line 1036 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (event); #line 1036 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (view); -#line 9820 "Commands.c" +#line 10537 "Commands.c" } #line 1036 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_view_it); -#line 9824 "Commands.c" +#line 10541 "Commands.c" } #line 1072 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp48_ = master_event; + _tmp37_ = master_event; #line 1072 "/home/jens/Source/shotwell/src/Commands.vala" - _vala_assert (_tmp48_ != NULL, "master_event != null"); + _vala_assert (_tmp37_ != NULL, "master_event != null"); #line 1073 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp49_ = media_thumbs; + _tmp38_ = media_thumbs; #line 1073 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp50_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp39_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1073 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp51_ = _tmp50_; + _tmp40_ = _tmp39_; #line 1073 "/home/jens/Source/shotwell/src/Commands.vala" - _vala_assert (_tmp51_ > 0, "media_thumbs.size > 0"); + _vala_assert (_tmp40_ > 0, "media_thumbs.size > 0"); #line 1075 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp52_ = master_event; + _tmp41_ = master_event; #line 1075 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp53_ = media_thumbs; + _tmp42_ = media_thumbs; #line 1075 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp54_ = move_photos_command_real_move_photos_command_new (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ITERABLE, GeeIterable), _ ("Merging"), _ ("Unmerging"), RESOURCES_MERGE_LABEL, ""); + _tmp43_ = move_photos_command_real_move_photos_command_new (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ITERABLE, GeeIterable), _ ("Merging"), _ ("Unmerging"), RESOURCES_MERGE_LABEL, ""); #line 1075 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command); #line 1075 "/home/jens/Source/shotwell/src/Commands.vala" - G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command = _tmp54_; + G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command = _tmp43_; #line 1024 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (media_thumbs); #line 1024 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (master_event); #line 1024 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 9854 "Commands.c" +#line 10571 "Commands.c" } -MergeEventsCommand* merge_events_command_new (GeeIterable* iter) { +MergeEventsCommand* +merge_events_command_new (GeeIterable* iter) +{ #line 1024 "/home/jens/Source/shotwell/src/Commands.vala" return merge_events_command_construct (TYPE_MERGE_EVENTS_COMMAND, iter); -#line 9861 "Commands.c" +#line 10580 "Commands.c" } -static void merge_events_command_class_init (MergeEventsCommandClass * klass) { +static void +merge_events_command_class_init (MergeEventsCommandClass * klass) +{ #line 1023 "/home/jens/Source/shotwell/src/Commands.vala" merge_events_command_parent_class = g_type_class_peek_parent (klass); -#line 9868 "Commands.c" +#line 10589 "Commands.c" } -static void merge_events_command_instance_init (MergeEventsCommand * self) { +static void +merge_events_command_instance_init (MergeEventsCommand * self) +{ } -GType merge_events_command_get_type (void) { +GType +merge_events_command_get_type (void) +{ static volatile gsize merge_events_command_type_id__volatile = 0; if (g_once_init_enter (&merge_events_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MergeEventsCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) merge_events_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MergeEventsCommand), 0, (GInstanceInitFunc) merge_events_command_instance_init, NULL }; @@ -9884,48 +10609,55 @@ GType merge_events_command_get_type (void) { } -static void _duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +static void +_duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self) +{ #line 1092 "/home/jens/Source/shotwell/src/Commands.vala" duplicate_multiple_photos_command_on_photo_destroyed ((DuplicateMultiplePhotosCommand*) self, source); -#line 9891 "Commands.c" +#line 10620 "Commands.c" } -DuplicateMultiplePhotosCommand* duplicate_multiple_photos_command_construct (GType object_type, GeeIterable* iter) { +DuplicateMultiplePhotosCommand* +duplicate_multiple_photos_command_construct (GType object_type, + GeeIterable* iter) +{ DuplicateMultiplePhotosCommand * self = NULL; - GeeIterable* _tmp0_; - LibraryPhotoSourceCollection* _tmp1_; + LibraryPhotoSourceCollection* _tmp0_; #line 1084 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL); #line 1085 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = iter; -#line 1085 "/home/jens/Source/shotwell/src/Commands.vala" - self = (DuplicateMultiplePhotosCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _ ("Duplicating photos"), _ ("Removing duplicated photos"), RESOURCES_DUPLICATE_PHOTO_LABEL, RESOURCES_DUPLICATE_PHOTO_TOOLTIP); + self = (DuplicateMultiplePhotosCommand*) multiple_data_source_command_construct (object_type, iter, _ ("Duplicating photos"), _ ("Removing duplicated photos"), RESOURCES_DUPLICATE_PHOTO_LABEL, RESOURCES_DUPLICATE_PHOTO_TOOLTIP); #line 1088 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = library_photo_global; + _tmp0_ = library_photo_global; #line 1088 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0); #line 1084 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 9911 "Commands.c" +#line 10640 "Commands.c" } -DuplicateMultiplePhotosCommand* duplicate_multiple_photos_command_new (GeeIterable* iter) { +DuplicateMultiplePhotosCommand* +duplicate_multiple_photos_command_new (GeeIterable* iter) +{ #line 1084 "/home/jens/Source/shotwell/src/Commands.vala" return duplicate_multiple_photos_command_construct (TYPE_DUPLICATE_MULTIPLE_PHOTOS_COMMAND, iter); -#line 9918 "Commands.c" +#line 10649 "Commands.c" } -static void duplicate_multiple_photos_command_on_photo_destroyed (DuplicateMultiplePhotosCommand* self, DataSource* source) { +static void +duplicate_multiple_photos_command_on_photo_destroyed (DuplicateMultiplePhotosCommand* self, + DataSource* source) +{ GeeHashMap* _tmp0_; GeeCollection* _tmp1_; GeeCollection* _tmp2_; GeeCollection* _tmp3_; - DataSource* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; + gboolean _tmp4_; #line 1095 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DUPLICATE_MULTIPLE_PHOTOS_COMMAND (self)); #line 1095 "/home/jens/Source/shotwell/src/Commands.vala" @@ -9939,32 +10671,30 @@ static void duplicate_multiple_photos_command_on_photo_destroyed (DuplicateMulti #line 1097 "/home/jens/Source/shotwell/src/Commands.vala" _tmp3_ = _tmp2_; #line 1097 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = source; -#line 1097 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_collection_contains (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 1097 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = _tmp5_; + _tmp4_ = gee_collection_contains (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 1097 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_tmp3_); #line 1097 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp6_) { -#line 9952 "Commands.c" - CommandManager* _tmp7_; - CommandManager* _tmp8_; + if (_tmp4_) { +#line 10680 "Commands.c" + CommandManager* _tmp5_; + CommandManager* _tmp6_; #line 1098 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command)); + _tmp5_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command)); #line 1098 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 1098 "/home/jens/Source/shotwell/src/Commands.vala" - command_manager_reset (_tmp8_); + command_manager_reset (_tmp6_); #line 1098 "/home/jens/Source/shotwell/src/Commands.vala" - _command_manager_unref0 (_tmp8_); -#line 9963 "Commands.c" + _command_manager_unref0 (_tmp6_); +#line 10691 "Commands.c" } } -static void duplicate_multiple_photos_command_real_execute (Command* base) { +static void +duplicate_multiple_photos_command_real_execute (Command* base) +{ DuplicateMultiplePhotosCommand * self; GeeHashMap* _tmp0_; gint _tmp1_; @@ -9982,7 +10712,7 @@ static void duplicate_multiple_photos_command_real_execute (Command* base) { _tmp1_ = self->priv->failed; #line 1107 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp1_ > 0) { -#line 9986 "Commands.c" +#line 10716 "Commands.c" gchar* error_string = NULL; gint _tmp2_; gint _tmp3_; @@ -10002,89 +10732,89 @@ static void duplicate_multiple_photos_command_real_execute (Command* base) { app_window_error_message (_tmp5_, NULL); #line 1107 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (error_string); -#line 10006 "Commands.c" +#line 10736 "Commands.c" } } -static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) { +static void +duplicate_multiple_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, + DataSource* source) +{ DuplicateMultiplePhotosCommand * self; LibraryPhoto* photo = NULL; - DataSource* _tmp0_; - LibraryPhoto* _tmp1_; + LibraryPhoto* _tmp0_; GError * _inner_error_ = NULL; #line 1114 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DUPLICATE_MULTIPLE_PHOTOS_COMMAND, DuplicateMultiplePhotosCommand); #line 1114 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 1115 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; -#line 1115 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 1115 "/home/jens/Source/shotwell/src/Commands.vala" - photo = _tmp1_; -#line 10027 "Commands.c" + photo = _tmp0_; +#line 10757 "Commands.c" { LibraryPhoto* dupe = NULL; - LibraryPhoto* _tmp2_; - GeeHashMap* _tmp3_; + LibraryPhoto* _tmp1_; + GeeHashMap* _tmp2_; #line 1118 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = library_photo_duplicate (photo, &_inner_error_); + _tmp1_ = library_photo_duplicate (photo, &_inner_error_); #line 1118 "/home/jens/Source/shotwell/src/Commands.vala" - dupe = _tmp2_; + dupe = _tmp1_; #line 1118 "/home/jens/Source/shotwell/src/Commands.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10038 "Commands.c" +#line 10768 "Commands.c" goto __catch466_g_error; } #line 1119 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = self->priv->dupes; + _tmp2_ = self->priv->dupes; #line 1119 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo, dupe); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo, dupe); #line 1117 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (dupe); -#line 10047 "Commands.c" +#line 10777 "Commands.c" } goto __finally466; __catch466_g_error: { GError* err = NULL; + GFile* _tmp3_; GFile* _tmp4_; - GFile* _tmp5_; + gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; - GError* _tmp8_; - const gchar* _tmp9_; - gint _tmp10_; + GError* _tmp7_; + const gchar* _tmp8_; + gint _tmp9_; #line 1117 "/home/jens/Source/shotwell/src/Commands.vala" err = _inner_error_; #line 1117 "/home/jens/Source/shotwell/src/Commands.vala" _inner_error_ = NULL; #line 1121 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp3_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MEDIA_SOURCE, MediaSource)); #line 1121 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 1121 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = g_file_get_path (_tmp5_); + _tmp5_ = g_file_get_path (_tmp4_); #line 1121 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 1121 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = err; + _tmp7_ = err; #line 1121 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = _tmp8_->message; + _tmp8_ = _tmp7_->message; #line 1121 "/home/jens/Source/shotwell/src/Commands.vala" - g_critical ("Commands.vala:1121: Unable to duplicate file %s: %s", _tmp7_, _tmp9_); + g_critical ("Commands.vala:1121: Unable to duplicate file %s: %s", _tmp6_, _tmp8_); #line 1121 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 1121 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 1122 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = self->priv->failed; + _tmp9_ = self->priv->failed; #line 1122 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->failed = _tmp10_ + 1; + self->priv->failed = _tmp9_ + 1; #line 1117 "/home/jens/Source/shotwell/src/Commands.vala" _g_error_free0 (err); -#line 10088 "Commands.c" +#line 10818 "Commands.c" } __finally466: #line 1117 "/home/jens/Source/shotwell/src/Commands.vala" @@ -10097,15 +10827,17 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa g_clear_error (&_inner_error_); #line 1117 "/home/jens/Source/shotwell/src/Commands.vala" return; -#line 10101 "Commands.c" +#line 10831 "Commands.c" } #line 1114 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (photo); -#line 10105 "Commands.c" +#line 10835 "Commands.c" } -static void duplicate_multiple_photos_command_real_undo (Command* base) { +static void +duplicate_multiple_photos_command_real_undo (Command* base) +{ DuplicateMultiplePhotosCommand * self; LibraryPhotoSourceCollection* _tmp0_; guint _tmp1_; @@ -10131,62 +10863,64 @@ static void duplicate_multiple_photos_command_real_undo (Command* base) { _tmp3_ = library_photo_global; #line 1137 "/home/jens/Source/shotwell/src/Commands.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0); -#line 10135 "Commands.c" +#line 10867 "Commands.c" } -static void duplicate_multiple_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) { +static void +duplicate_multiple_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, + DataSource* source) +{ DuplicateMultiplePhotosCommand * self; LibraryPhoto* photo = NULL; - DataSource* _tmp0_; - LibraryPhoto* _tmp1_; + LibraryPhoto* _tmp0_; Marker* marker = NULL; - LibraryPhotoSourceCollection* _tmp2_; - GeeHashMap* _tmp3_; - gpointer _tmp4_; - LibraryPhoto* _tmp5_; + LibraryPhotoSourceCollection* _tmp1_; + GeeHashMap* _tmp2_; + gpointer _tmp3_; + LibraryPhoto* _tmp4_; + Marker* _tmp5_; Marker* _tmp6_; - Marker* _tmp7_; - LibraryPhotoSourceCollection* _tmp8_; + LibraryPhotoSourceCollection* _tmp7_; #line 1140 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DUPLICATE_MULTIPLE_PHOTOS_COMMAND, DuplicateMultiplePhotosCommand); #line 1140 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 1141 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 1141 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 1141 "/home/jens/Source/shotwell/src/Commands.vala" - photo = _tmp1_; + photo = _tmp0_; #line 1143 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = library_photo_global; + _tmp1_ = library_photo_global; #line 1143 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = self->priv->dupes; + _tmp2_ = self->priv->dupes; #line 1143 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo); + _tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo); #line 1143 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = (LibraryPhoto*) _tmp4_; + _tmp4_ = (LibraryPhoto*) _tmp3_; #line 1143 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); + _tmp5_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject)); #line 1143 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 1143 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 1143 "/home/jens/Source/shotwell/src/Commands.vala" - marker = _tmp7_; + marker = _tmp6_; #line 1144 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = library_photo_global; + _tmp7_ = library_photo_global; #line 1144 "/home/jens/Source/shotwell/src/Commands.vala" - source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_SOURCE_COLLECTION, SourceCollection), marker, TRUE, NULL, NULL, NULL); + source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_SOURCE_COLLECTION, SourceCollection), marker, TRUE, NULL, NULL, NULL); #line 1140 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (marker); #line 1140 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (photo); -#line 10186 "Commands.c" +#line 10918 "Commands.c" } -static void duplicate_multiple_photos_command_class_init (DuplicateMultiplePhotosCommandClass * klass) { +static void +duplicate_multiple_photos_command_class_init (DuplicateMultiplePhotosCommandClass * klass) +{ #line 1080 "/home/jens/Source/shotwell/src/Commands.vala" duplicate_multiple_photos_command_parent_class = g_type_class_peek_parent (klass); #line 1080 "/home/jens/Source/shotwell/src/Commands.vala" @@ -10201,11 +10935,13 @@ static void duplicate_multiple_photos_command_class_init (DuplicateMultiplePhoto ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) duplicate_multiple_photos_command_real_undo_on_source; #line 1080 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = duplicate_multiple_photos_command_finalize; -#line 10205 "Commands.c" +#line 10939 "Commands.c" } -static void duplicate_multiple_photos_command_instance_init (DuplicateMultiplePhotosCommand * self) { +static void +duplicate_multiple_photos_command_instance_init (DuplicateMultiplePhotosCommand * self) +{ GeeHashMap* _tmp0_; #line 1080 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = DUPLICATE_MULTIPLE_PHOTOS_COMMAND_GET_PRIVATE (self); @@ -10215,11 +10951,13 @@ static void duplicate_multiple_photos_command_instance_init (DuplicateMultiplePh self->priv->dupes = _tmp0_; #line 1082 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->failed = 0; -#line 10219 "Commands.c" +#line 10955 "Commands.c" } -static void duplicate_multiple_photos_command_finalize (GObject * obj) { +static void +duplicate_multiple_photos_command_finalize (GObject * obj) +{ DuplicateMultiplePhotosCommand * self; LibraryPhotoSourceCollection* _tmp0_; guint _tmp1_; @@ -10235,11 +10973,13 @@ static void duplicate_multiple_photos_command_finalize (GObject * obj) { _g_object_unref0 (self->priv->dupes); #line 1080 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (duplicate_multiple_photos_command_parent_class)->finalize (obj); -#line 10239 "Commands.c" +#line 10977 "Commands.c" } -GType duplicate_multiple_photos_command_get_type (void) { +GType +duplicate_multiple_photos_command_get_type (void) +{ static volatile gsize duplicate_multiple_photos_command_type_id__volatile = 0; if (g_once_init_enter (&duplicate_multiple_photos_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DuplicateMultiplePhotosCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) duplicate_multiple_photos_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DuplicateMultiplePhotosCommand), 0, (GInstanceInitFunc) duplicate_multiple_photos_command_instance_init, NULL }; @@ -10251,101 +10991,87 @@ GType duplicate_multiple_photos_command_get_type (void) { } -SetRatingSingleCommand* set_rating_single_command_construct (GType object_type, DataSource* source, Rating rating) { +SetRatingSingleCommand* +set_rating_single_command_construct (GType object_type, + DataSource* source, + Rating rating) +{ SetRatingSingleCommand * self = NULL; - DataSource* _tmp0_; - Rating _tmp1_; - const gchar* _tmp2_; - Rating _tmp3_; - DataSource* _tmp4_; - Rating _tmp5_; + const gchar* _tmp0_; #line 1154 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 1155 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; -#line 1155 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = rating; + _tmp0_ = resources_rating_label (rating); #line 1155 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = resources_rating_label (_tmp1_); -#line 1155 "/home/jens/Source/shotwell/src/Commands.vala" - self = (SetRatingSingleCommand*) single_data_source_command_construct (object_type, _tmp0_, _tmp2_, ""); + self = (SetRatingSingleCommand*) single_data_source_command_construct (object_type, source, _tmp0_, ""); #line 1156 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->set_direct = TRUE; #line 1157 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = rating; -#line 1157 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->new_rating = _tmp3_; -#line 1159 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = source; -#line 1159 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); + self->priv->new_rating = rating; #line 1159 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->last_rating = _tmp5_; + self->priv->last_rating = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); #line 1154 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 10287 "Commands.c" +#line 11016 "Commands.c" } -SetRatingSingleCommand* set_rating_single_command_new (DataSource* source, Rating rating) { +SetRatingSingleCommand* +set_rating_single_command_new (DataSource* source, + Rating rating) +{ #line 1154 "/home/jens/Source/shotwell/src/Commands.vala" return set_rating_single_command_construct (TYPE_SET_RATING_SINGLE_COMMAND, source, rating); -#line 10294 "Commands.c" +#line 11026 "Commands.c" } -SetRatingSingleCommand* set_rating_single_command_construct_inc_dec (GType object_type, DataSource* source, gboolean is_incrementing) { +SetRatingSingleCommand* +set_rating_single_command_construct_inc_dec (GType object_type, + DataSource* source, + gboolean is_incrementing) +{ SetRatingSingleCommand * self = NULL; const gchar* _tmp0_ = NULL; - gboolean _tmp1_; - DataSource* _tmp2_; - gboolean _tmp3_; - DataSource* _tmp4_; - Rating _tmp5_; #line 1162 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 1163 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = is_incrementing; -#line 1163 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp1_) { + if (is_incrementing) { #line 1163 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = RESOURCES_INCREASE_RATING_LABEL; -#line 10314 "Commands.c" +#line 11043 "Commands.c" } else { #line 1164 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = RESOURCES_DECREASE_RATING_LABEL; -#line 10318 "Commands.c" +#line 11047 "Commands.c" } #line 1163 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = source; -#line 1163 "/home/jens/Source/shotwell/src/Commands.vala" - self = (SetRatingSingleCommand*) single_data_source_command_construct (object_type, _tmp2_, _tmp0_, ""); + self = (SetRatingSingleCommand*) single_data_source_command_construct (object_type, source, _tmp0_, ""); #line 1165 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->set_direct = FALSE; #line 1166 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = is_incrementing; -#line 1166 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->incrementing = _tmp3_; + self->priv->incrementing = is_incrementing; #line 1168 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = source; -#line 1168 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 1168 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->last_rating = _tmp5_; + self->priv->last_rating = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource)); #line 1162 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 10338 "Commands.c" +#line 11059 "Commands.c" } -SetRatingSingleCommand* set_rating_single_command_new_inc_dec (DataSource* source, gboolean is_incrementing) { +SetRatingSingleCommand* +set_rating_single_command_new_inc_dec (DataSource* source, + gboolean is_incrementing) +{ #line 1162 "/home/jens/Source/shotwell/src/Commands.vala" return set_rating_single_command_construct_inc_dec (TYPE_SET_RATING_SINGLE_COMMAND, source, is_incrementing); -#line 10345 "Commands.c" +#line 11069 "Commands.c" } -static void set_rating_single_command_real_execute (Command* base) { +static void +set_rating_single_command_real_execute (Command* base) +{ SetRatingSingleCommand * self; gboolean _tmp0_; #line 1171 "/home/jens/Source/shotwell/src/Commands.vala" @@ -10354,7 +11080,7 @@ static void set_rating_single_command_real_execute (Command* base) { _tmp0_ = self->priv->set_direct; #line 1172 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp0_) { -#line 10358 "Commands.c" +#line 11084 "Commands.c" DataSource* _tmp1_; Rating _tmp2_; #line 1173 "/home/jens/Source/shotwell/src/Commands.vala" @@ -10363,33 +11089,35 @@ static void set_rating_single_command_real_execute (Command* base) { _tmp2_ = self->priv->new_rating; #line 1173 "/home/jens/Source/shotwell/src/Commands.vala" media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource), _tmp2_); -#line 10367 "Commands.c" +#line 11093 "Commands.c" } else { gboolean _tmp3_; #line 1175 "/home/jens/Source/shotwell/src/Commands.vala" _tmp3_ = self->priv->incrementing; #line 1175 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp3_) { -#line 10374 "Commands.c" +#line 11100 "Commands.c" DataSource* _tmp4_; #line 1176 "/home/jens/Source/shotwell/src/Commands.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source; #line 1176 "/home/jens/Source/shotwell/src/Commands.vala" media_source_increase_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 10380 "Commands.c" +#line 11106 "Commands.c" } else { DataSource* _tmp5_; #line 1178 "/home/jens/Source/shotwell/src/Commands.vala" _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source; #line 1178 "/home/jens/Source/shotwell/src/Commands.vala" media_source_decrease_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 10387 "Commands.c" +#line 11113 "Commands.c" } } } -static void set_rating_single_command_real_undo (Command* base) { +static void +set_rating_single_command_real_undo (Command* base) +{ SetRatingSingleCommand * self; DataSource* _tmp0_; Rating _tmp1_; @@ -10401,11 +11129,13 @@ static void set_rating_single_command_real_undo (Command* base) { _tmp1_ = self->priv->last_rating; #line 1183 "/home/jens/Source/shotwell/src/Commands.vala" media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_); -#line 10405 "Commands.c" +#line 11133 "Commands.c" } -static void set_rating_single_command_class_init (SetRatingSingleCommandClass * klass) { +static void +set_rating_single_command_class_init (SetRatingSingleCommandClass * klass) +{ #line 1148 "/home/jens/Source/shotwell/src/Commands.vala" set_rating_single_command_parent_class = g_type_class_peek_parent (klass); #line 1148 "/home/jens/Source/shotwell/src/Commands.vala" @@ -10416,28 +11146,34 @@ static void set_rating_single_command_class_init (SetRatingSingleCommandClass * ((CommandClass *) klass)->undo = (void (*) (Command *)) set_rating_single_command_real_undo; #line 1148 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = set_rating_single_command_finalize; -#line 10420 "Commands.c" +#line 11150 "Commands.c" } -static void set_rating_single_command_instance_init (SetRatingSingleCommand * self) { +static void +set_rating_single_command_instance_init (SetRatingSingleCommand * self) +{ #line 1148 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = SET_RATING_SINGLE_COMMAND_GET_PRIVATE (self); -#line 10427 "Commands.c" +#line 11159 "Commands.c" } -static void set_rating_single_command_finalize (GObject * obj) { +static void +set_rating_single_command_finalize (GObject * obj) +{ SetRatingSingleCommand * self; #line 1148 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_RATING_SINGLE_COMMAND, SetRatingSingleCommand); #line 1148 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (set_rating_single_command_parent_class)->finalize (obj); -#line 10437 "Commands.c" +#line 11171 "Commands.c" } -GType set_rating_single_command_get_type (void) { +GType +set_rating_single_command_get_type (void) +{ static volatile gsize set_rating_single_command_type_id__volatile = 0; if (g_once_init_enter (&set_rating_single_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SetRatingSingleCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) set_rating_single_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SetRatingSingleCommand), 0, (GInstanceInitFunc) set_rating_single_command_instance_init, NULL }; @@ -10449,134 +11185,118 @@ GType set_rating_single_command_get_type (void) { } -SetRatingCommand* set_rating_command_construct (GType object_type, GeeIterable* iter, Rating rating) { +SetRatingCommand* +set_rating_command_construct (GType object_type, + GeeIterable* iter, + Rating rating) +{ SetRatingCommand * self = NULL; - GeeIterable* _tmp0_; - Rating _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; - Rating _tmp4_; - const gchar* _tmp5_; - Rating _tmp6_; - GeeIterable* _tmp7_; + gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; #line 1194 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL); #line 1195 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = iter; -#line 1195 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = rating; -#line 1195 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = resources_rating_progress (_tmp1_); + _tmp0_ = resources_rating_progress (rating); #line 1195 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = _tmp2_; -#line 1195 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = rating; + _tmp1_ = _tmp0_; #line 1195 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = resources_rating_label (_tmp4_); + _tmp2_ = resources_rating_label (rating); #line 1195 "/home/jens/Source/shotwell/src/Commands.vala" - self = (SetRatingCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _tmp3_, _ ("Restoring previous rating"), _tmp5_, ""); + self = (SetRatingCommand*) multiple_data_source_command_construct (object_type, iter, _tmp1_, _ ("Restoring previous rating"), _tmp2_, ""); #line 1195 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp1_); #line 1197 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->set_direct = TRUE; #line 1198 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = rating; -#line 1198 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->new_rating = _tmp6_; -#line 1200 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = iter; + self->priv->new_rating = rating; #line 1200 "/home/jens/Source/shotwell/src/Commands.vala" - set_rating_command_save_source_states (self, _tmp7_); + set_rating_command_save_source_states (self, iter); #line 1194 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 10493 "Commands.c" +#line 11218 "Commands.c" } -SetRatingCommand* set_rating_command_new (GeeIterable* iter, Rating rating) { +SetRatingCommand* +set_rating_command_new (GeeIterable* iter, + Rating rating) +{ #line 1194 "/home/jens/Source/shotwell/src/Commands.vala" return set_rating_command_construct (TYPE_SET_RATING_COMMAND, iter, rating); -#line 10500 "Commands.c" +#line 11228 "Commands.c" } -SetRatingCommand* set_rating_command_construct_inc_dec (GType object_type, GeeIterable* iter, gboolean is_incrementing) { +SetRatingCommand* +set_rating_command_construct_inc_dec (GType object_type, + GeeIterable* iter, + gboolean is_incrementing) +{ SetRatingCommand * self = NULL; const gchar* _tmp0_ = NULL; - gboolean _tmp1_; + const gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; - gboolean _tmp3_; - const gchar* _tmp4_ = NULL; - gboolean _tmp5_; - GeeIterable* _tmp6_; - gboolean _tmp7_; - GeeIterable* _tmp8_; #line 1203 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL); #line 1205 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = is_incrementing; -#line 1205 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp1_) { + if (is_incrementing) { #line 1205 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = _ ("Increasing ratings"); -#line 10523 "Commands.c" +#line 11247 "Commands.c" } else { #line 1205 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = _ ("Decreasing ratings"); -#line 10527 "Commands.c" +#line 11251 "Commands.c" } #line 1206 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = is_incrementing; + if (is_incrementing) { #line 1206 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp3_) { -#line 1206 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _ ("Decreasing ratings"); -#line 10535 "Commands.c" + _tmp1_ = _ ("Decreasing ratings"); +#line 11257 "Commands.c" } else { #line 1206 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _ ("Increasing ratings"); -#line 10539 "Commands.c" + _tmp1_ = _ ("Increasing ratings"); +#line 11261 "Commands.c" } #line 1207 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = is_incrementing; -#line 1207 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp5_) { + if (is_incrementing) { #line 1207 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = RESOURCES_INCREASE_RATING_LABEL; -#line 10547 "Commands.c" + _tmp2_ = RESOURCES_INCREASE_RATING_LABEL; +#line 11267 "Commands.c" } else { #line 1207 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = RESOURCES_DECREASE_RATING_LABEL; -#line 10551 "Commands.c" + _tmp2_ = RESOURCES_DECREASE_RATING_LABEL; +#line 11271 "Commands.c" } #line 1204 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = iter; -#line 1204 "/home/jens/Source/shotwell/src/Commands.vala" - self = (SetRatingCommand*) multiple_data_source_command_construct (object_type, _tmp6_, _tmp0_, _tmp2_, _tmp4_, ""); + self = (SetRatingCommand*) multiple_data_source_command_construct (object_type, iter, _tmp0_, _tmp1_, _tmp2_, ""); #line 1209 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->set_direct = FALSE; #line 1210 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = is_incrementing; -#line 1210 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->incrementing = _tmp7_; + self->priv->incrementing = is_incrementing; #line 1212 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = iter; -#line 1212 "/home/jens/Source/shotwell/src/Commands.vala" - set_rating_command_save_source_states (self, _tmp8_); + set_rating_command_save_source_states (self, iter); #line 1203 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 10569 "Commands.c" +#line 11283 "Commands.c" } -SetRatingCommand* set_rating_command_new_inc_dec (GeeIterable* iter, gboolean is_incrementing) { +SetRatingCommand* +set_rating_command_new_inc_dec (GeeIterable* iter, + gboolean is_incrementing) +{ #line 1203 "/home/jens/Source/shotwell/src/Commands.vala" return set_rating_command_construct_inc_dec (TYPE_SET_RATING_COMMAND, iter, is_incrementing); -#line 10576 "Commands.c" +#line 11293 "Commands.c" } -static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIterable* iter) { +static void +set_rating_command_save_source_states (SetRatingCommand* self, + GeeIterable* iter) +{ GeeHashMap* _tmp0_; #line 1215 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_SET_RATING_COMMAND (self)); @@ -10588,78 +11308,71 @@ static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIt _g_object_unref0 (self->priv->last_rating_map); #line 1216 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->last_rating_map = _tmp0_; -#line 10592 "Commands.c" +#line 11312 "Commands.c" { GeeIterator* _view_it = NULL; - GeeIterable* _tmp1_; - GeeIterator* _tmp2_; -#line 1218 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = iter; + GeeIterator* _tmp1_; #line 1218 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = gee_iterable_iterator (_tmp1_); + _tmp1_ = gee_iterable_iterator (iter); #line 1218 "/home/jens/Source/shotwell/src/Commands.vala" - _view_it = _tmp2_; + _view_it = _tmp1_; #line 1218 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 10605 "Commands.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 11322 "Commands.c" + GeeIterator* _tmp2_; DataView* view = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; DataSource* source = NULL; - DataView* _tmp7_; + DataView* _tmp5_; + DataSource* _tmp6_; + GeeHashMap* _tmp7_; DataSource* _tmp8_; - GeeHashMap* _tmp9_; - DataSource* _tmp10_; - DataSource* _tmp11_; - Rating _tmp12_; -#line 1218 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = _view_it; + DataSource* _tmp9_; #line 1218 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _view_it; #line 1218 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 1218 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 10626 "Commands.c" +#line 11339 "Commands.c" } #line 1218 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = _view_it; + _tmp3_ = _view_it; #line 1218 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 1218 "/home/jens/Source/shotwell/src/Commands.vala" - view = (DataView*) _tmp6_; + view = (DataView*) _tmp4_; #line 1219 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = view; + _tmp5_ = view; #line 1219 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = data_view_get_source (_tmp7_); + _tmp6_ = data_view_get_source (_tmp5_); #line 1219 "/home/jens/Source/shotwell/src/Commands.vala" - source = _tmp8_; -#line 1220 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = self->priv->last_rating_map; + source = _tmp6_; #line 1220 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = source; + _tmp7_ = self->priv->last_rating_map; #line 1220 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = source; + _tmp8_ = source; #line 1220 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp9_ = source; #line 1220 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_, (gpointer) ((gintptr) _tmp12_)); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_, (gpointer) ((gintptr) media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource)))); #line 1218 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); #line 1218 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (view); -#line 10654 "Commands.c" +#line 11365 "Commands.c" } #line 1218 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_view_it); -#line 10658 "Commands.c" +#line 11369 "Commands.c" } } -static void set_rating_command_real_execute (Command* base) { +static void +set_rating_command_real_execute (Command* base) +{ SetRatingCommand * self; #line 1224 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RATING_COMMAND, SetRatingCommand); @@ -10667,11 +11380,13 @@ static void set_rating_command_real_execute (Command* base) { self->priv->action_count = 0; #line 1226 "/home/jens/Source/shotwell/src/Commands.vala" COMMAND_CLASS (set_rating_command_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command)); -#line 10671 "Commands.c" +#line 11384 "Commands.c" } -static void set_rating_command_real_undo (Command* base) { +static void +set_rating_command_real_undo (Command* base) +{ SetRatingCommand * self; #line 1229 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RATING_COMMAND, SetRatingCommand); @@ -10679,11 +11394,14 @@ static void set_rating_command_real_undo (Command* base) { self->priv->action_count = 0; #line 1231 "/home/jens/Source/shotwell/src/Commands.vala" COMMAND_CLASS (set_rating_command_parent_class)->undo (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command)); -#line 10683 "Commands.c" +#line 11398 "Commands.c" } -static void set_rating_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) { +static void +set_rating_command_real_execute_on_source (MultipleDataSourceCommand* base, + DataSource* source) +{ SetRatingCommand * self; gboolean _tmp0_; #line 1234 "/home/jens/Source/shotwell/src/Commands.vala" @@ -10694,66 +11412,55 @@ static void set_rating_command_real_execute_on_source (MultipleDataSourceCommand _tmp0_ = self->priv->set_direct; #line 1235 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp0_) { -#line 10698 "Commands.c" - DataSource* _tmp1_; - Rating _tmp2_; -#line 1236 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = source; +#line 11416 "Commands.c" + Rating _tmp1_; #line 1236 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = self->priv->new_rating; + _tmp1_ = self->priv->new_rating; #line 1236 "/home/jens/Source/shotwell/src/Commands.vala" - media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource), _tmp2_); -#line 10707 "Commands.c" + media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_); +#line 11422 "Commands.c" } else { - gboolean _tmp3_; + gboolean _tmp2_; #line 1238 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = self->priv->incrementing; + _tmp2_ = self->priv->incrementing; #line 1238 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp3_) { -#line 10714 "Commands.c" - DataSource* _tmp4_; + if (_tmp2_) { #line 1239 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = source; -#line 1239 "/home/jens/Source/shotwell/src/Commands.vala" - media_source_increase_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 10720 "Commands.c" + media_source_increase_rating (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource)); +#line 11431 "Commands.c" } else { - DataSource* _tmp5_; #line 1241 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = source; -#line 1241 "/home/jens/Source/shotwell/src/Commands.vala" - media_source_decrease_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 10727 "Commands.c" + media_source_decrease_rating (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource)); +#line 11435 "Commands.c" } } } -static void set_rating_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) { +static void +set_rating_command_real_undo_on_source (MultipleDataSourceCommand* base, + DataSource* source) +{ SetRatingCommand * self; - DataSource* _tmp0_; - GeeHashMap* _tmp1_; - DataSource* _tmp2_; - gpointer _tmp3_; + GeeHashMap* _tmp0_; + gpointer _tmp1_; #line 1245 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RATING_COMMAND, SetRatingCommand); #line 1245 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 1246 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; -#line 1246 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = self->priv->last_rating_map; + _tmp0_ = self->priv->last_rating_map; #line 1246 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = source; -#line 1246 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), source); #line 1246 "/home/jens/Source/shotwell/src/Commands.vala" - media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), (Rating) ((gintptr) _tmp3_)); -#line 10753 "Commands.c" + media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource), (Rating) ((gintptr) _tmp1_)); +#line 11458 "Commands.c" } -static void set_rating_command_class_init (SetRatingCommandClass * klass) { +static void +set_rating_command_class_init (SetRatingCommandClass * klass) +{ #line 1187 "/home/jens/Source/shotwell/src/Commands.vala" set_rating_command_parent_class = g_type_class_peek_parent (klass); #line 1187 "/home/jens/Source/shotwell/src/Commands.vala" @@ -10768,20 +11475,24 @@ static void set_rating_command_class_init (SetRatingCommandClass * klass) { ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) set_rating_command_real_undo_on_source; #line 1187 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = set_rating_command_finalize; -#line 10772 "Commands.c" +#line 11479 "Commands.c" } -static void set_rating_command_instance_init (SetRatingCommand * self) { +static void +set_rating_command_instance_init (SetRatingCommand * self) +{ #line 1187 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = SET_RATING_COMMAND_GET_PRIVATE (self); #line 1192 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->action_count = 0; -#line 10781 "Commands.c" +#line 11490 "Commands.c" } -static void set_rating_command_finalize (GObject * obj) { +static void +set_rating_command_finalize (GObject * obj) +{ SetRatingCommand * self; #line 1187 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_RATING_COMMAND, SetRatingCommand); @@ -10789,11 +11500,13 @@ static void set_rating_command_finalize (GObject * obj) { _g_object_unref0 (self->priv->last_rating_map); #line 1187 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (set_rating_command_parent_class)->finalize (obj); -#line 10793 "Commands.c" +#line 11504 "Commands.c" } -GType set_rating_command_get_type (void) { +GType +set_rating_command_get_type (void) +{ static volatile gsize set_rating_command_type_id__volatile = 0; if (g_once_init_enter (&set_rating_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SetRatingCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) set_rating_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SetRatingCommand), 0, (GInstanceInitFunc) set_rating_command_instance_init, NULL }; @@ -10805,39 +11518,40 @@ GType set_rating_command_get_type (void) { } -SetRawDeveloperCommand* set_raw_developer_command_construct (GType object_type, GeeIterable* iter, RawDeveloper developer) { +SetRawDeveloperCommand* +set_raw_developer_command_construct (GType object_type, + GeeIterable* iter, + RawDeveloper developer) +{ SetRawDeveloperCommand * self = NULL; - GeeIterable* _tmp0_; - RawDeveloper _tmp1_; - GeeIterable* _tmp2_; #line 1255 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL); #line 1256 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = iter; -#line 1256 "/home/jens/Source/shotwell/src/Commands.vala" - self = (SetRawDeveloperCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _ ("Setting RAW developer"), _ ("Restoring previous RAW developer"), _ ("Set Developer"), ""); -#line 1258 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = developer; + self = (SetRawDeveloperCommand*) multiple_data_source_command_construct (object_type, iter, _ ("Setting RAW developer"), _ ("Restoring previous RAW developer"), _ ("Set Developer"), ""); #line 1258 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->new_developer = _tmp1_; + self->priv->new_developer = developer; #line 1259 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = iter; -#line 1259 "/home/jens/Source/shotwell/src/Commands.vala" - set_raw_developer_command_save_source_states (self, _tmp2_); + set_raw_developer_command_save_source_states (self, iter); #line 1255 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 10830 "Commands.c" +#line 11538 "Commands.c" } -SetRawDeveloperCommand* set_raw_developer_command_new (GeeIterable* iter, RawDeveloper developer) { +SetRawDeveloperCommand* +set_raw_developer_command_new (GeeIterable* iter, + RawDeveloper developer) +{ #line 1255 "/home/jens/Source/shotwell/src/Commands.vala" return set_raw_developer_command_construct (TYPE_SET_RAW_DEVELOPER_COMMAND, iter, developer); -#line 10837 "Commands.c" +#line 11548 "Commands.c" } -static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand* self, GeeIterable* iter) { +static void +set_raw_developer_command_save_source_states (SetRawDeveloperCommand* self, + GeeIterable* iter) +{ GeeHashMap* _tmp0_; GeeHashMap* _tmp1_; #line 1262 "/home/jens/Source/shotwell/src/Commands.vala" @@ -10856,309 +11570,287 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand _g_object_unref0 (self->priv->last_transformation_map); #line 1264 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->last_transformation_map = _tmp1_; -#line 10860 "Commands.c" +#line 11574 "Commands.c" { GeeIterator* _view_it = NULL; - GeeIterable* _tmp2_; - GeeIterator* _tmp3_; -#line 1266 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = iter; + GeeIterator* _tmp2_; #line 1266 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_iterable_iterator (_tmp2_); + _tmp2_ = gee_iterable_iterator (iter); #line 1266 "/home/jens/Source/shotwell/src/Commands.vala" - _view_it = _tmp3_; + _view_it = _tmp2_; #line 1266 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 10873 "Commands.c" - GeeIterator* _tmp4_; - gboolean _tmp5_; +#line 11584 "Commands.c" + GeeIterator* _tmp3_; DataView* view = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; + GeeIterator* _tmp4_; + gpointer _tmp5_; Photo* photo = NULL; - DataView* _tmp8_; - DataSource* _tmp9_; - Photo* _tmp10_; - Photo* _tmp11_; - gboolean _tmp12_; -#line 1266 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _view_it; + DataView* _tmp6_; + DataSource* _tmp7_; + Photo* _tmp8_; + Photo* _tmp9_; #line 1266 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_iterator_next (_tmp4_); + _tmp3_ = _view_it; #line 1266 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp3_)) { #line 1266 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 10893 "Commands.c" +#line 11600 "Commands.c" } #line 1266 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = _view_it; + _tmp4_ = _view_it; #line 1266 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 1266 "/home/jens/Source/shotwell/src/Commands.vala" - view = (DataView*) _tmp7_; + view = (DataView*) _tmp5_; #line 1267 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = view; + _tmp6_ = view; #line 1267 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = data_view_get_source (_tmp8_); + _tmp7_ = data_view_get_source (_tmp6_); #line 1267 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO) ? ((Photo*) _tmp9_) : NULL; + _tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_PHOTO) ? ((Photo*) _tmp7_) : NULL; #line 1267 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp10_ == NULL) { + if (_tmp8_ == NULL) { #line 1267 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp9_); -#line 10911 "Commands.c" + _g_object_unref0 (_tmp7_); +#line 11618 "Commands.c" } #line 1267 "/home/jens/Source/shotwell/src/Commands.vala" - photo = _tmp10_; + photo = _tmp8_; #line 1268 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = photo; -#line 1268 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = set_raw_developer_command_is_raw_photo (self, _tmp11_); + _tmp9_ = photo; #line 1268 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp12_) { -#line 10921 "Commands.c" + if (set_raw_developer_command_is_raw_photo (self, _tmp9_)) { +#line 11626 "Commands.c" + GeeHashMap* _tmp10_; + Photo* _tmp11_; + Photo* _tmp12_; GeeHashMap* _tmp13_; Photo* _tmp14_; Photo* _tmp15_; - RawDeveloper _tmp16_; - GeeHashMap* _tmp17_; - Photo* _tmp18_; - Photo* _tmp19_; - PhotoTransformationState* _tmp20_; - PhotoTransformationState* _tmp21_; -#line 1269 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = self->priv->last_developer_map; + PhotoTransformationState* _tmp16_; + PhotoTransformationState* _tmp17_; #line 1269 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = photo; + _tmp10_ = self->priv->last_developer_map; #line 1269 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = photo; + _tmp11_ = photo; #line 1269 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = photo_get_raw_developer (_tmp15_); + _tmp12_ = photo; #line 1269 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp14_, (gpointer) ((gintptr) _tmp16_)); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, (gpointer) ((gintptr) photo_get_raw_developer (_tmp12_))); #line 1270 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = self->priv->last_transformation_map; + _tmp13_ = self->priv->last_transformation_map; #line 1270 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = photo; + _tmp14_ = photo; #line 1270 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = photo; + _tmp15_ = photo; #line 1270 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = photo_save_transformation_state (_tmp19_); + _tmp16_ = photo_save_transformation_state (_tmp15_); #line 1270 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = _tmp20_; + _tmp17_ = _tmp16_; #line 1270 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp18_, _tmp21_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp14_, _tmp17_); #line 1270 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp21_); -#line 10955 "Commands.c" + _g_object_unref0 (_tmp17_); +#line 11657 "Commands.c" } #line 1266 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (photo); #line 1266 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (view); -#line 10961 "Commands.c" +#line 11663 "Commands.c" } #line 1266 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_view_it); -#line 10965 "Commands.c" +#line 11667 "Commands.c" } } -static void set_raw_developer_command_real_execute (Command* base) { +static void +set_raw_developer_command_real_execute (Command* base) +{ SetRawDeveloperCommand * self; #line 1275 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommand); #line 1276 "/home/jens/Source/shotwell/src/Commands.vala" COMMAND_CLASS (set_raw_developer_command_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command)); -#line 10976 "Commands.c" +#line 11680 "Commands.c" } -static void set_raw_developer_command_real_undo (Command* base) { +static void +set_raw_developer_command_real_undo (Command* base) +{ SetRawDeveloperCommand * self; #line 1279 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommand); #line 1280 "/home/jens/Source/shotwell/src/Commands.vala" COMMAND_CLASS (set_raw_developer_command_parent_class)->undo (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command)); -#line 10986 "Commands.c" +#line 11692 "Commands.c" } -static void set_raw_developer_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) { +static void +set_raw_developer_command_real_execute_on_source (MultipleDataSourceCommand* base, + DataSource* source) +{ SetRawDeveloperCommand * self; Photo* photo = NULL; - DataSource* _tmp0_; + Photo* _tmp0_; Photo* _tmp1_; - Photo* _tmp2_; - gboolean _tmp3_; #line 1283 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommand); #line 1283 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 1284 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; -#line 1284 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO) ? ((Photo*) _tmp0_) : NULL); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_PHOTO) ? ((Photo*) source) : NULL); #line 1284 "/home/jens/Source/shotwell/src/Commands.vala" - photo = _tmp1_; -#line 1285 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = photo; + photo = _tmp0_; #line 1285 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = set_raw_developer_command_is_raw_photo (self, _tmp2_); + _tmp1_ = photo; #line 1285 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp3_) { -#line 11013 "Commands.c" - gboolean _tmp4_ = FALSE; - RawDeveloper _tmp5_; + if (set_raw_developer_command_is_raw_photo (self, _tmp1_)) { +#line 11716 "Commands.c" + gboolean _tmp2_ = FALSE; + RawDeveloper _tmp3_; #line 1286 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = self->priv->new_developer; -#line 1286 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp5_ == RAW_DEVELOPER_CAMERA) { -#line 11020 "Commands.c" - Photo* _tmp6_; - gboolean _tmp7_; + _tmp3_ = self->priv->new_developer; #line 1286 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = photo; + if (_tmp3_ == RAW_DEVELOPER_CAMERA) { +#line 11723 "Commands.c" + Photo* _tmp4_; #line 1286 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = photo_is_raw_developer_available (_tmp6_, RAW_DEVELOPER_CAMERA); + _tmp4_ = photo; #line 1286 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = !_tmp7_; -#line 11029 "Commands.c" + _tmp2_ = !photo_is_raw_developer_available (_tmp4_, RAW_DEVELOPER_CAMERA); +#line 11729 "Commands.c" } else { #line 1286 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = FALSE; -#line 11033 "Commands.c" + _tmp2_ = FALSE; +#line 11733 "Commands.c" } #line 1286 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp4_) { -#line 11037 "Commands.c" - Photo* _tmp8_; + if (_tmp2_) { +#line 11737 "Commands.c" + Photo* _tmp5_; #line 1287 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = photo; + _tmp5_ = photo; #line 1287 "/home/jens/Source/shotwell/src/Commands.vala" - photo_set_raw_developer (_tmp8_, RAW_DEVELOPER_EMBEDDED, TRUE); -#line 11043 "Commands.c" + photo_set_raw_developer (_tmp5_, RAW_DEVELOPER_EMBEDDED, TRUE); +#line 11743 "Commands.c" } else { - Photo* _tmp9_; - RawDeveloper _tmp10_; + Photo* _tmp6_; + RawDeveloper _tmp7_; #line 1289 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = photo; + _tmp6_ = photo; #line 1289 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = self->priv->new_developer; + _tmp7_ = self->priv->new_developer; #line 1289 "/home/jens/Source/shotwell/src/Commands.vala" - photo_set_raw_developer (_tmp9_, _tmp10_, TRUE); -#line 11053 "Commands.c" + photo_set_raw_developer (_tmp6_, _tmp7_, TRUE); +#line 11753 "Commands.c" } } #line 1283 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (photo); -#line 11058 "Commands.c" +#line 11758 "Commands.c" } -static void set_raw_developer_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) { +static void +set_raw_developer_command_real_undo_on_source (MultipleDataSourceCommand* base, + DataSource* source) +{ SetRawDeveloperCommand * self; Photo* photo = NULL; - DataSource* _tmp0_; + Photo* _tmp0_; Photo* _tmp1_; - Photo* _tmp2_; - gboolean _tmp3_; #line 1293 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommand); #line 1293 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 1294 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_PHOTO) ? ((Photo*) source) : NULL); #line 1294 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO) ? ((Photo*) _tmp0_) : NULL); -#line 1294 "/home/jens/Source/shotwell/src/Commands.vala" - photo = _tmp1_; + photo = _tmp0_; #line 1295 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = photo; -#line 1295 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = set_raw_developer_command_is_raw_photo (self, _tmp2_); + _tmp1_ = photo; #line 1295 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp3_) { -#line 11085 "Commands.c" + if (set_raw_developer_command_is_raw_photo (self, _tmp1_)) { +#line 11782 "Commands.c" + Photo* _tmp2_; + GeeHashMap* _tmp3_; Photo* _tmp4_; - GeeHashMap* _tmp5_; + gpointer _tmp5_; Photo* _tmp6_; - gpointer _tmp7_; + GeeHashMap* _tmp7_; Photo* _tmp8_; - GeeHashMap* _tmp9_; - Photo* _tmp10_; - gpointer _tmp11_; - PhotoTransformationState* _tmp12_; + gpointer _tmp9_; + PhotoTransformationState* _tmp10_; #line 1296 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = photo; + _tmp2_ = photo; #line 1296 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = self->priv->last_developer_map; + _tmp3_ = self->priv->last_developer_map; #line 1296 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = photo; + _tmp4_ = photo; #line 1296 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_); + _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); #line 1296 "/home/jens/Source/shotwell/src/Commands.vala" - photo_set_raw_developer (_tmp4_, (RawDeveloper) ((gintptr) _tmp7_), TRUE); + photo_set_raw_developer (_tmp2_, (RawDeveloper) ((gintptr) _tmp5_), TRUE); #line 1297 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = photo; + _tmp6_ = photo; #line 1297 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = self->priv->last_transformation_map; + _tmp7_ = self->priv->last_transformation_map; #line 1297 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = photo; + _tmp8_ = photo; #line 1297 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_); + _tmp9_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_); #line 1297 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = (PhotoTransformationState*) _tmp11_; + _tmp10_ = (PhotoTransformationState*) _tmp9_; #line 1297 "/home/jens/Source/shotwell/src/Commands.vala" - photo_load_transformation_state (_tmp8_, _tmp12_); + photo_load_transformation_state (_tmp6_, _tmp10_); #line 1297 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp12_); -#line 11119 "Commands.c" + _g_object_unref0 (_tmp10_); +#line 11816 "Commands.c" } #line 1293 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (photo); -#line 11123 "Commands.c" +#line 11820 "Commands.c" } -static gboolean set_raw_developer_command_is_raw_photo (SetRawDeveloperCommand* self, Photo* photo) { +static gboolean +set_raw_developer_command_is_raw_photo (SetRawDeveloperCommand* self, + Photo* photo) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; - Photo* _tmp1_; #line 1301 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_SET_RAW_DEVELOPER_COMMAND (self), FALSE); #line 1301 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail ((photo == NULL) || IS_PHOTO (photo), FALSE); #line 1302 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = photo; -#line 1302 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp1_ != NULL) { -#line 11139 "Commands.c" - Photo* _tmp2_; - PhotoFileFormat _tmp3_; -#line 1302 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = photo; -#line 1302 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = photo_get_master_file_format (_tmp2_); + if (photo != NULL) { #line 1302 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = _tmp3_ == PHOTO_FILE_FORMAT_RAW; -#line 11148 "Commands.c" + _tmp0_ = photo_get_master_file_format (photo) == PHOTO_FILE_FORMAT_RAW; +#line 11838 "Commands.c" } else { #line 1302 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = FALSE; -#line 11152 "Commands.c" +#line 11842 "Commands.c" } #line 1302 "/home/jens/Source/shotwell/src/Commands.vala" result = _tmp0_; #line 1302 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 11158 "Commands.c" +#line 11848 "Commands.c" } -static void set_raw_developer_command_class_init (SetRawDeveloperCommandClass * klass) { +static void +set_raw_developer_command_class_init (SetRawDeveloperCommandClass * klass) +{ #line 1250 "/home/jens/Source/shotwell/src/Commands.vala" set_raw_developer_command_parent_class = g_type_class_peek_parent (klass); #line 1250 "/home/jens/Source/shotwell/src/Commands.vala" @@ -11173,18 +11865,22 @@ static void set_raw_developer_command_class_init (SetRawDeveloperCommandClass * ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) set_raw_developer_command_real_undo_on_source; #line 1250 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = set_raw_developer_command_finalize; -#line 11177 "Commands.c" +#line 11869 "Commands.c" } -static void set_raw_developer_command_instance_init (SetRawDeveloperCommand * self) { +static void +set_raw_developer_command_instance_init (SetRawDeveloperCommand * self) +{ #line 1250 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = SET_RAW_DEVELOPER_COMMAND_GET_PRIVATE (self); -#line 11184 "Commands.c" +#line 11878 "Commands.c" } -static void set_raw_developer_command_finalize (GObject * obj) { +static void +set_raw_developer_command_finalize (GObject * obj) +{ SetRawDeveloperCommand * self; #line 1250 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommand); @@ -11194,11 +11890,13 @@ static void set_raw_developer_command_finalize (GObject * obj) { _g_object_unref0 (self->priv->last_transformation_map); #line 1250 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (set_raw_developer_command_parent_class)->finalize (obj); -#line 11198 "Commands.c" +#line 11894 "Commands.c" } -GType set_raw_developer_command_get_type (void) { +GType +set_raw_developer_command_get_type (void) +{ static volatile gsize set_raw_developer_command_type_id__volatile = 0; if (g_once_init_enter (&set_raw_developer_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SetRawDeveloperCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) set_raw_developer_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SetRawDeveloperCommand), 0, (GInstanceInitFunc) set_raw_developer_command_instance_init, NULL }; @@ -11210,60 +11908,58 @@ GType set_raw_developer_command_get_type (void) { } -AdjustDateTimePhotoCommand* adjust_date_time_photo_command_construct (GType object_type, Dateable* dateable, gint64 time_shift, gboolean modify_original) { +AdjustDateTimePhotoCommand* +adjust_date_time_photo_command_construct (GType object_type, + Dateable* dateable, + gint64 time_shift, + gboolean modify_original) +{ AdjustDateTimePhotoCommand * self = NULL; Dateable* _tmp0_; - Dateable* _tmp1_; - Dateable* _tmp2_; - gint64 _tmp3_; - gboolean _tmp4_; #line 1312 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_DATEABLE (dateable), NULL); #line 1313 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = dateable; -#line 1313 "/home/jens/Source/shotwell/src/Commands.vala" - self = (AdjustDateTimePhotoCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource), RESOURCES_ADJUST_DATE_TIME_LABEL, ""); + self = (AdjustDateTimePhotoCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (dateable, TYPE_DATA_SOURCE, DataSource), RESOURCES_ADJUST_DATE_TIME_LABEL, ""); #line 1315 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = dateable; -#line 1315 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp0_ = _g_object_ref0 (dateable); #line 1315 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->dateable); #line 1315 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->dateable = _tmp2_; + self->priv->dateable = _tmp0_; #line 1316 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = time_shift; -#line 1316 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->time_shift = _tmp3_; -#line 1317 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = modify_original; + self->priv->time_shift = time_shift; #line 1317 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->modify_original = _tmp4_; + self->priv->modify_original = modify_original; #line 1312 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 11245 "Commands.c" +#line 11936 "Commands.c" } -AdjustDateTimePhotoCommand* adjust_date_time_photo_command_new (Dateable* dateable, gint64 time_shift, gboolean modify_original) { +AdjustDateTimePhotoCommand* +adjust_date_time_photo_command_new (Dateable* dateable, + gint64 time_shift, + gboolean modify_original) +{ #line 1312 "/home/jens/Source/shotwell/src/Commands.vala" return adjust_date_time_photo_command_construct (TYPE_ADJUST_DATE_TIME_PHOTO_COMMAND, dateable, time_shift, modify_original); -#line 11252 "Commands.c" +#line 11947 "Commands.c" } -static void adjust_date_time_photo_command_real_execute (Command* base) { +static void +adjust_date_time_photo_command_real_execute (Command* base) +{ AdjustDateTimePhotoCommand * self; Dateable* _tmp0_; Dateable* _tmp1_; - time_t _tmp2_; - gint64 _tmp3_; - Dateable* _tmp4_; - Event* _tmp5_; + gint64 _tmp2_; + Dateable* _tmp3_; + Event* _tmp4_; ViewCollection* all_events = NULL; - ViewCollection* _tmp6_; - Dateable* _tmp23_; - ViewCollection* _tmp24_; + ViewCollection* _tmp5_; + Dateable* _tmp21_; + ViewCollection* _tmp22_; #line 1320 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_DATE_TIME_PHOTO_COMMAND, AdjustDateTimePhotoCommand); #line 1321 "/home/jens/Source/shotwell/src/Commands.vala" @@ -11271,132 +11967,128 @@ static void adjust_date_time_photo_command_real_execute (Command* base) { #line 1321 "/home/jens/Source/shotwell/src/Commands.vala" _tmp1_ = self->priv->dateable; #line 1321 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = dateable_get_exposure_time (_tmp1_); -#line 1321 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = self->priv->time_shift; + _tmp2_ = self->priv->time_shift; #line 1321 "/home/jens/Source/shotwell/src/Commands.vala" - adjust_date_time_photo_command_set_time (self, _tmp0_, _tmp2_ + ((time_t) _tmp3_)); + adjust_date_time_photo_command_set_time (self, _tmp0_, dateable_get_exposure_time (_tmp1_) + ((time_t) _tmp2_)); #line 1323 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = self->priv->dateable; + _tmp3_ = self->priv->dateable; #line 1323 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = media_source_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp4_ = media_source_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource)); #line 1323 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->prev_event); #line 1323 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->prev_event = _tmp5_; + self->priv->prev_event = _tmp4_; #line 1325 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = view_collection_new ("tmp"); + _tmp5_ = view_collection_new ("tmp"); #line 1325 "/home/jens/Source/shotwell/src/Commands.vala" - all_events = _tmp6_; -#line 11292 "Commands.c" + all_events = _tmp5_; +#line 11986 "Commands.c" { GeeIterator* _dobj_it = NULL; - EventSourceCollection* _tmp7_; + EventSourceCollection* _tmp6_; + GeeCollection* _tmp7_; GeeCollection* _tmp8_; - GeeCollection* _tmp9_; + GeeIterator* _tmp9_; GeeIterator* _tmp10_; - GeeIterator* _tmp11_; #line 1327 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = event_global; + _tmp6_ = event_global; #line 1327 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp7_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection)); #line 1327 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 1327 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1327 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 1327 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 1327 "/home/jens/Source/shotwell/src/Commands.vala" - _dobj_it = _tmp11_; + _dobj_it = _tmp10_; #line 1327 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 11316 "Commands.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 12010 "Commands.c" + GeeIterator* _tmp11_; DataObject* dobj = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; + GeeIterator* _tmp12_; + gpointer _tmp13_; Event* event = NULL; - DataObject* _tmp16_; - Event* _tmp17_; - Event* _tmp18_; + DataObject* _tmp14_; + Event* _tmp15_; + Event* _tmp16_; #line 1327 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = _dobj_it; -#line 1327 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = gee_iterator_next (_tmp12_); + _tmp11_ = _dobj_it; #line 1327 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp11_)) { #line 1327 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 11334 "Commands.c" +#line 12025 "Commands.c" } #line 1327 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = _dobj_it; + _tmp12_ = _dobj_it; #line 1327 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 1327 "/home/jens/Source/shotwell/src/Commands.vala" - dobj = (DataObject*) _tmp15_; + dobj = (DataObject*) _tmp13_; #line 1328 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = dobj; + _tmp14_ = dobj; #line 1328 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_EVENT) ? ((Event*) _tmp16_) : NULL); + _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_EVENT) ? ((Event*) _tmp14_) : NULL); #line 1328 "/home/jens/Source/shotwell/src/Commands.vala" - event = _tmp17_; + event = _tmp15_; #line 1329 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = event; + _tmp16_ = event; #line 1329 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp18_ != NULL) { -#line 11352 "Commands.c" - ViewCollection* _tmp19_; - Event* _tmp20_; - EventView* _tmp21_; - EventView* _tmp22_; + if (_tmp16_ != NULL) { +#line 12043 "Commands.c" + ViewCollection* _tmp17_; + Event* _tmp18_; + EventView* _tmp19_; + EventView* _tmp20_; #line 1330 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = all_events; + _tmp17_ = all_events; #line 1330 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = event; + _tmp18_ = event; #line 1330 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = event_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_EVENT_SOURCE, EventSource)); + _tmp19_ = event_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_EVENT_SOURCE, EventSource)); #line 1330 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = _tmp21_; + _tmp20_ = _tmp19_; #line 1330 "/home/jens/Source/shotwell/src/Commands.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_OBJECT, DataObject)); #line 1330 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp22_); -#line 11369 "Commands.c" + _g_object_unref0 (_tmp20_); +#line 12060 "Commands.c" } #line 1327 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (event); #line 1327 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (dobj); -#line 11375 "Commands.c" +#line 12066 "Commands.c" } #line 1327 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_dobj_it); -#line 11379 "Commands.c" +#line 12070 "Commands.c" } #line 1333 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = self->priv->dateable; + _tmp21_ = self->priv->dateable; #line 1333 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = all_events; + _tmp22_ = all_events; #line 1333 "/home/jens/Source/shotwell/src/Commands.vala" - event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_MEDIA_SOURCE, MediaSource), _tmp24_, NULL); + event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_MEDIA_SOURCE, MediaSource), _tmp22_, NULL); #line 1320 "/home/jens/Source/shotwell/src/Commands.vala" _data_collection_unref0 (all_events); -#line 11389 "Commands.c" +#line 12080 "Commands.c" } -static void adjust_date_time_photo_command_real_undo (Command* base) { +static void +adjust_date_time_photo_command_real_undo (Command* base) +{ AdjustDateTimePhotoCommand * self; Dateable* _tmp0_; Dateable* _tmp1_; - time_t _tmp2_; - gint64 _tmp3_; - Dateable* _tmp4_; - Event* _tmp5_; + gint64 _tmp2_; + Dateable* _tmp3_; + Event* _tmp4_; #line 1336 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_DATE_TIME_PHOTO_COMMAND, AdjustDateTimePhotoCommand); #line 1337 "/home/jens/Source/shotwell/src/Commands.vala" @@ -11404,22 +12096,24 @@ static void adjust_date_time_photo_command_real_undo (Command* base) { #line 1337 "/home/jens/Source/shotwell/src/Commands.vala" _tmp1_ = self->priv->dateable; #line 1337 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = dateable_get_exposure_time (_tmp1_); -#line 1337 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = self->priv->time_shift; + _tmp2_ = self->priv->time_shift; #line 1337 "/home/jens/Source/shotwell/src/Commands.vala" - adjust_date_time_photo_command_set_time (self, _tmp0_, _tmp2_ - ((time_t) _tmp3_)); + adjust_date_time_photo_command_set_time (self, _tmp0_, dateable_get_exposure_time (_tmp1_) - ((time_t) _tmp2_)); #line 1339 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = self->priv->dateable; + _tmp3_ = self->priv->dateable; #line 1339 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = self->priv->prev_event; + _tmp4_ = self->priv->prev_event; #line 1339 "/home/jens/Source/shotwell/src/Commands.vala" - media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource), _tmp5_); -#line 11419 "Commands.c" + media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), _tmp4_); +#line 12109 "Commands.c" } -static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand* self, Dateable* dateable, time_t exposure_time) { +static void +adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand* self, + Dateable* dateable, + time_t exposure_time) +{ gboolean _tmp0_ = FALSE; gboolean _tmp1_; GError * _inner_error_ = NULL; @@ -11431,33 +12125,23 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand* _tmp1_ = self->priv->modify_original; #line 1343 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp1_) { -#line 11435 "Commands.c" - Dateable* _tmp2_; -#line 1343 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = dateable; #line 1343 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_PHOTO); -#line 11441 "Commands.c" + _tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (dateable, TYPE_PHOTO); +#line 12131 "Commands.c" } else { #line 1343 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = FALSE; -#line 11445 "Commands.c" +#line 12135 "Commands.c" } #line 1343 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp0_) { -#line 11449 "Commands.c" +#line 12139 "Commands.c" { - Dateable* _tmp3_; - time_t _tmp4_; -#line 1345 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = dateable; -#line 1345 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = exposure_time; #line 1345 "/home/jens/Source/shotwell/src/Commands.vala" - photo_set_exposure_time_persistent (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO, Photo), _tmp4_, &_inner_error_); + photo_set_exposure_time_persistent (G_TYPE_CHECK_INSTANCE_CAST (dateable, TYPE_PHOTO, Photo), exposure_time, &_inner_error_); #line 1345 "/home/jens/Source/shotwell/src/Commands.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 11461 "Commands.c" +#line 12145 "Commands.c" goto __catch467_g_error; } } @@ -11473,7 +12157,7 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand* app_window_error_message (_ ("Original photo could not be adjusted."), NULL); #line 1344 "/home/jens/Source/shotwell/src/Commands.vala" _g_error_free0 (err); -#line 11477 "Commands.c" +#line 12161 "Commands.c" } __finally467: #line 1344 "/home/jens/Source/shotwell/src/Commands.vala" @@ -11484,23 +12168,19 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand* g_clear_error (&_inner_error_); #line 1344 "/home/jens/Source/shotwell/src/Commands.vala" return; -#line 11488 "Commands.c" +#line 12172 "Commands.c" } } else { - Dateable* _tmp5_; - time_t _tmp6_; -#line 1350 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = dateable; -#line 1350 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = exposure_time; #line 1350 "/home/jens/Source/shotwell/src/Commands.vala" - dateable_set_exposure_time (_tmp5_, _tmp6_); -#line 11499 "Commands.c" + dateable_set_exposure_time (dateable, exposure_time); +#line 12177 "Commands.c" } } -static void adjust_date_time_photo_command_class_init (AdjustDateTimePhotoCommandClass * klass) { +static void +adjust_date_time_photo_command_class_init (AdjustDateTimePhotoCommandClass * klass) +{ #line 1306 "/home/jens/Source/shotwell/src/Commands.vala" adjust_date_time_photo_command_parent_class = g_type_class_peek_parent (klass); #line 1306 "/home/jens/Source/shotwell/src/Commands.vala" @@ -11511,18 +12191,22 @@ static void adjust_date_time_photo_command_class_init (AdjustDateTimePhotoComman ((CommandClass *) klass)->undo = (void (*) (Command *)) adjust_date_time_photo_command_real_undo; #line 1306 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = adjust_date_time_photo_command_finalize; -#line 11515 "Commands.c" +#line 12195 "Commands.c" } -static void adjust_date_time_photo_command_instance_init (AdjustDateTimePhotoCommand * self) { +static void +adjust_date_time_photo_command_instance_init (AdjustDateTimePhotoCommand * self) +{ #line 1306 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = ADJUST_DATE_TIME_PHOTO_COMMAND_GET_PRIVATE (self); -#line 11522 "Commands.c" +#line 12204 "Commands.c" } -static void adjust_date_time_photo_command_finalize (GObject * obj) { +static void +adjust_date_time_photo_command_finalize (GObject * obj) +{ AdjustDateTimePhotoCommand * self; #line 1306 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_DATE_TIME_PHOTO_COMMAND, AdjustDateTimePhotoCommand); @@ -11532,11 +12216,13 @@ static void adjust_date_time_photo_command_finalize (GObject * obj) { _g_object_unref0 (self->priv->prev_event); #line 1306 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (adjust_date_time_photo_command_parent_class)->finalize (obj); -#line 11536 "Commands.c" +#line 12220 "Commands.c" } -GType adjust_date_time_photo_command_get_type (void) { +GType +adjust_date_time_photo_command_get_type (void) +{ static volatile gsize adjust_date_time_photo_command_type_id__volatile = 0; if (g_once_init_enter (&adjust_date_time_photo_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (AdjustDateTimePhotoCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) adjust_date_time_photo_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (AdjustDateTimePhotoCommand), 0, (GInstanceInitFunc) adjust_date_time_photo_command_instance_init, NULL }; @@ -11548,7 +12234,9 @@ GType adjust_date_time_photo_command_get_type (void) { } -static time_t* _time_t_dup (time_t* self) { +static time_t* +_time_t_dup (time_t* self) +{ time_t* dup; #line 1384 "/home/jens/Source/shotwell/src/Commands.vala" dup = g_new0 (time_t, 1); @@ -11556,204 +12244,195 @@ static time_t* _time_t_dup (time_t* self) { memcpy (dup, self, sizeof (time_t)); #line 1384 "/home/jens/Source/shotwell/src/Commands.vala" return dup; -#line 11560 "Commands.c" +#line 12248 "Commands.c" } -static gpointer __time_t_dup0 (gpointer self) { +static gpointer +__time_t_dup0 (gpointer self) +{ #line 1384 "/home/jens/Source/shotwell/src/Commands.vala" return self ? _time_t_dup (self) : NULL; -#line 11567 "Commands.c" +#line 12257 "Commands.c" } -AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType object_type, GeeIterable* iter, gint64 time_shift, gboolean keep_relativity, gboolean modify_originals) { +AdjustDateTimePhotosCommand* +adjust_date_time_photos_command_construct (GType object_type, + GeeIterable* iter, + gint64 time_shift, + gboolean keep_relativity, + gboolean modify_originals) +{ AdjustDateTimePhotosCommand * self = NULL; - GeeIterable* _tmp0_; - gint64 _tmp1_; - gboolean _tmp2_; - gboolean _tmp3_; - GeeHashMap* _tmp4_; - GeeHashMap* _tmp30_; + GeeHashMap* _tmp0_; + GeeHashMap* _tmp22_; #line 1366 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL); #line 1368 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = iter; -#line 1368 "/home/jens/Source/shotwell/src/Commands.vala" - self = (AdjustDateTimePhotosCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _ ("Adjusting Date and Time"), _ ("Undoing Date and Time Adjustment"), RESOURCES_ADJUST_DATE_TIME_LABEL, ""); -#line 1371 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = time_shift; + self = (AdjustDateTimePhotosCommand*) multiple_data_source_command_construct (object_type, iter, _ ("Adjusting Date and Time"), _ ("Undoing Date and Time Adjustment"), RESOURCES_ADJUST_DATE_TIME_LABEL, ""); #line 1371 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->time_shift = _tmp1_; + self->priv->time_shift = time_shift; #line 1372 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = keep_relativity; -#line 1372 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->keep_relativity = _tmp2_; -#line 1373 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = modify_originals; + self->priv->keep_relativity = keep_relativity; #line 1373 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->modify_originals = _tmp3_; + self->priv->modify_originals = modify_originals; #line 1377 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = gee_hash_map_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 1377 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->prev_events); #line 1377 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->prev_events = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MAP, GeeMap); -#line 11603 "Commands.c" + self->priv->prev_events = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap); +#line 12287 "Commands.c" { GeeIterator* _view_it = NULL; - GeeIterable* _tmp5_; - GeeIterator* _tmp6_; -#line 1380 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = iter; + GeeIterator* _tmp1_; #line 1380 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = gee_iterable_iterator (_tmp5_); + _tmp1_ = gee_iterable_iterator (iter); #line 1380 "/home/jens/Source/shotwell/src/Commands.vala" - _view_it = _tmp6_; + _view_it = _tmp1_; #line 1380 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 11616 "Commands.c" - GeeIterator* _tmp7_; - gboolean _tmp8_; +#line 12297 "Commands.c" + GeeIterator* _tmp2_; DataView* view = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; - GeeMap* _tmp11_; - DataView* _tmp12_; - DataSource* _tmp13_; - Dateable* _tmp14_; - Dateable* _tmp15_; - DataView* _tmp16_; - DataSource* _tmp17_; - MediaSource* _tmp18_; - MediaSource* _tmp19_; - Event* _tmp20_; - Event* _tmp21_; - time_t* _tmp22_; -#line 1380 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = _view_it; + GeeIterator* _tmp3_; + gpointer _tmp4_; + GeeMap* _tmp5_; + DataView* _tmp6_; + DataSource* _tmp7_; + Dateable* _tmp8_; + Dateable* _tmp9_; + DataView* _tmp10_; + DataSource* _tmp11_; + MediaSource* _tmp12_; + MediaSource* _tmp13_; + Event* _tmp14_; + Event* _tmp15_; + time_t* _tmp16_; #line 1380 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = gee_iterator_next (_tmp7_); + _tmp2_ = _view_it; #line 1380 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp2_)) { #line 1380 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 11642 "Commands.c" +#line 12320 "Commands.c" } #line 1380 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = _view_it; + _tmp3_ = _view_it; #line 1380 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 1380 "/home/jens/Source/shotwell/src/Commands.vala" - view = (DataView*) _tmp10_; + view = (DataView*) _tmp4_; #line 1381 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = self->priv->prev_events; + _tmp5_ = self->priv->prev_events; #line 1381 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = view; + _tmp6_ = view; #line 1381 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = data_view_get_source (_tmp12_); + _tmp7_ = data_view_get_source (_tmp6_); #line 1381 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_DATEABLE) ? ((Dateable*) _tmp13_) : NULL; + _tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_DATEABLE) ? ((Dateable*) _tmp7_) : NULL; #line 1381 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp14_ == NULL) { + if (_tmp8_ == NULL) { #line 1381 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp13_); -#line 11662 "Commands.c" + _g_object_unref0 (_tmp7_); +#line 12340 "Commands.c" } #line 1381 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = _tmp14_; + _tmp9_ = _tmp8_; #line 1381 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = view; + _tmp10_ = view; #line 1381 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = data_view_get_source (_tmp16_); + _tmp11_ = data_view_get_source (_tmp10_); #line 1381 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp17_) : NULL; + _tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp11_) : NULL; #line 1381 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp18_ == NULL) { + if (_tmp12_ == NULL) { #line 1381 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp17_); -#line 11676 "Commands.c" + _g_object_unref0 (_tmp11_); +#line 12354 "Commands.c" } #line 1381 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = _tmp18_; + _tmp13_ = _tmp12_; #line 1381 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = media_source_get_event (_tmp19_); + _tmp14_ = media_source_get_event (_tmp13_); #line 1381 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = _tmp20_; + _tmp15_ = _tmp14_; #line 1381 "/home/jens/Source/shotwell/src/Commands.vala" - gee_map_set (_tmp11_, _tmp15_, _tmp21_); + gee_map_set (_tmp5_, _tmp9_, _tmp15_); #line 1381 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp21_); + _g_object_unref0 (_tmp15_); #line 1381 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp19_); + _g_object_unref0 (_tmp13_); #line 1381 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp9_); #line 1383 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = self->priv->new_time; + _tmp16_ = self->priv->new_time; #line 1383 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp22_ == NULL) { -#line 11696 "Commands.c" - DataView* _tmp23_; - DataSource* _tmp24_; - Dateable* _tmp25_; - time_t _tmp26_; - gint64 _tmp27_; - time_t _tmp28_; - time_t* _tmp29_; -#line 1384 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = view; -#line 1384 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = data_view_get_source (_tmp23_); + if (_tmp16_ == NULL) { +#line 12374 "Commands.c" + DataView* _tmp17_; + DataSource* _tmp18_; + Dateable* _tmp19_; + time_t _tmp20_; + time_t* _tmp21_; #line 1384 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATEABLE, Dateable); + _tmp17_ = view; #line 1384 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = dateable_get_exposure_time (_tmp25_); + _tmp18_ = data_view_get_source (_tmp17_); #line 1384 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = time_shift; + _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATEABLE, Dateable); #line 1384 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp28_ = _tmp26_ + ((time_t) _tmp27_); + _tmp20_ = dateable_get_exposure_time (_tmp19_) + ((time_t) time_shift); #line 1384 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp29_ = __time_t_dup0 (&_tmp28_); + _tmp21_ = __time_t_dup0 (&_tmp20_); #line 1384 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->new_time); #line 1384 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->new_time = _tmp29_; + self->priv->new_time = _tmp21_; #line 1384 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp25_); + _g_object_unref0 (_tmp19_); #line 1386 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (view); #line 1386 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 11728 "Commands.c" +#line 12400 "Commands.c" } #line 1380 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (view); -#line 11732 "Commands.c" +#line 12404 "Commands.c" } #line 1380 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_view_it); -#line 11736 "Commands.c" +#line 12408 "Commands.c" } #line 1390 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp30_ = gee_hash_map_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INVALID, (GBoxedCopyFunc) _time_t_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp22_ = gee_hash_map_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INVALID, (GBoxedCopyFunc) _time_t_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 1390 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->old_times); #line 1390 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->old_times = _tmp30_; + self->priv->old_times = _tmp22_; #line 1366 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 11746 "Commands.c" +#line 12418 "Commands.c" } -AdjustDateTimePhotosCommand* adjust_date_time_photos_command_new (GeeIterable* iter, gint64 time_shift, gboolean keep_relativity, gboolean modify_originals) { +AdjustDateTimePhotosCommand* +adjust_date_time_photos_command_new (GeeIterable* iter, + gint64 time_shift, + gboolean keep_relativity, + gboolean modify_originals) +{ #line 1366 "/home/jens/Source/shotwell/src/Commands.vala" return adjust_date_time_photos_command_construct (TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, iter, time_shift, keep_relativity, modify_originals); -#line 11753 "Commands.c" +#line 12430 "Commands.c" } -static void adjust_date_time_photos_command_real_execute (Command* base) { +static void +adjust_date_time_photos_command_real_execute (Command* base) +{ AdjustDateTimePhotosCommand * self; GeeArrayList* _tmp0_; GeeArrayList* _tmp1_; @@ -11779,7 +12458,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) { _tmp3_ = _tmp2_; #line 1397 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp3_ > 0) { -#line 11783 "Commands.c" +#line 12462 "Commands.c" GeeArrayList* _tmp4_; GeeArrayList* _tmp5_; gint _tmp6_; @@ -11794,13 +12473,13 @@ static void adjust_date_time_photos_command_real_execute (Command* base) { _tmp7_ = _tmp6_; #line 1398 "/home/jens/Source/shotwell/src/Commands.vala" multiple_object_error_dialog (_tmp4_, ngettext ("One original photo could not be adjusted.", "The following original photos could not be adjusted.", (gulong) _tmp7_), _ ("Time Adjustment Error")); -#line 11798 "Commands.c" +#line 12477 "Commands.c" } #line 1404 "/home/jens/Source/shotwell/src/Commands.vala" _tmp8_ = view_collection_new ("tmp"); #line 1404 "/home/jens/Source/shotwell/src/Commands.vala" all_events = _tmp8_; -#line 11804 "Commands.c" +#line 12483 "Commands.c" { GeeIterator* _d_it = NULL; GeeMap* _tmp9_; @@ -11827,140 +12506,136 @@ static void adjust_date_time_photos_command_real_execute (Command* base) { _d_it = _tmp14_; #line 1406 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 11831 "Commands.c" +#line 12510 "Commands.c" GeeIterator* _tmp15_; - gboolean _tmp16_; Dateable* d = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; - Dateable* _tmp35_; - ViewCollection* _tmp36_; + GeeIterator* _tmp16_; + gpointer _tmp17_; + Dateable* _tmp33_; + ViewCollection* _tmp34_; #line 1406 "/home/jens/Source/shotwell/src/Commands.vala" _tmp15_ = _d_it; #line 1406 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = gee_iterator_next (_tmp15_); -#line 1406 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp15_)) { #line 1406 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 11847 "Commands.c" +#line 12523 "Commands.c" } #line 1406 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = _d_it; + _tmp16_ = _d_it; #line 1406 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp17_ = gee_iterator_get (_tmp16_); #line 1406 "/home/jens/Source/shotwell/src/Commands.vala" - d = (Dateable*) _tmp18_; -#line 11855 "Commands.c" + d = (Dateable*) _tmp17_; +#line 12531 "Commands.c" { GeeIterator* _dobj_it = NULL; - EventSourceCollection* _tmp19_; + EventSourceCollection* _tmp18_; + GeeCollection* _tmp19_; GeeCollection* _tmp20_; - GeeCollection* _tmp21_; + GeeIterator* _tmp21_; GeeIterator* _tmp22_; - GeeIterator* _tmp23_; #line 1407 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = event_global; + _tmp18_ = event_global; #line 1407 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp19_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_COLLECTION, DataCollection)); #line 1407 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = _tmp20_; + _tmp20_ = _tmp19_; #line 1407 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp21_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1407 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = _tmp22_; + _tmp22_ = _tmp21_; #line 1407 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp21_); + _g_object_unref0 (_tmp20_); #line 1407 "/home/jens/Source/shotwell/src/Commands.vala" - _dobj_it = _tmp23_; + _dobj_it = _tmp22_; #line 1407 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 11879 "Commands.c" - GeeIterator* _tmp24_; - gboolean _tmp25_; +#line 12555 "Commands.c" + GeeIterator* _tmp23_; DataObject* dobj = NULL; - GeeIterator* _tmp26_; - gpointer _tmp27_; + GeeIterator* _tmp24_; + gpointer _tmp25_; Event* event = NULL; - DataObject* _tmp28_; - Event* _tmp29_; - Event* _tmp30_; -#line 1407 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = _dobj_it; + DataObject* _tmp26_; + Event* _tmp27_; + Event* _tmp28_; #line 1407 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = gee_iterator_next (_tmp24_); + _tmp23_ = _dobj_it; #line 1407 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp25_) { + if (!gee_iterator_next (_tmp23_)) { #line 1407 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 11897 "Commands.c" +#line 12570 "Commands.c" } #line 1407 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = _dobj_it; + _tmp24_ = _dobj_it; #line 1407 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = gee_iterator_get (_tmp26_); + _tmp25_ = gee_iterator_get (_tmp24_); #line 1407 "/home/jens/Source/shotwell/src/Commands.vala" - dobj = (DataObject*) _tmp27_; + dobj = (DataObject*) _tmp25_; #line 1408 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp28_ = dobj; + _tmp26_ = dobj; #line 1408 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, TYPE_EVENT) ? ((Event*) _tmp28_) : NULL); + _tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, TYPE_EVENT) ? ((Event*) _tmp26_) : NULL); #line 1408 "/home/jens/Source/shotwell/src/Commands.vala" - event = _tmp29_; + event = _tmp27_; #line 1409 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp30_ = event; + _tmp28_ = event; #line 1409 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp30_ != NULL) { -#line 11915 "Commands.c" - ViewCollection* _tmp31_; - Event* _tmp32_; - EventView* _tmp33_; - EventView* _tmp34_; + if (_tmp28_ != NULL) { +#line 12588 "Commands.c" + ViewCollection* _tmp29_; + Event* _tmp30_; + EventView* _tmp31_; + EventView* _tmp32_; #line 1410 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp31_ = all_events; + _tmp29_ = all_events; #line 1410 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp32_ = event; + _tmp30_ = event; #line 1410 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp33_ = event_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_EVENT_SOURCE, EventSource)); + _tmp31_ = event_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_EVENT_SOURCE, EventSource)); #line 1410 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp34_ = _tmp33_; + _tmp32_ = _tmp31_; #line 1410 "/home/jens/Source/shotwell/src/Commands.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject)); #line 1410 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp34_); -#line 11932 "Commands.c" + _g_object_unref0 (_tmp32_); +#line 12605 "Commands.c" } #line 1407 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (event); #line 1407 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (dobj); -#line 11938 "Commands.c" +#line 12611 "Commands.c" } #line 1407 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_dobj_it); -#line 11942 "Commands.c" +#line 12615 "Commands.c" } #line 1413 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp35_ = d; + _tmp33_ = d; #line 1413 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp36_ = all_events; + _tmp34_ = all_events; #line 1413 "/home/jens/Source/shotwell/src/Commands.vala" - event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE, MediaSource), _tmp36_, NULL); + event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_MEDIA_SOURCE, MediaSource), _tmp34_, NULL); #line 1406 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (d); -#line 11952 "Commands.c" +#line 12625 "Commands.c" } #line 1406 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_d_it); -#line 11956 "Commands.c" +#line 12629 "Commands.c" } #line 1393 "/home/jens/Source/shotwell/src/Commands.vala" _data_collection_unref0 (all_events); -#line 11960 "Commands.c" +#line 12633 "Commands.c" } -static void adjust_date_time_photos_command_real_undo (Command* base) { +static void +adjust_date_time_photos_command_real_undo (Command* base) +{ AdjustDateTimePhotosCommand * self; GeeArrayList* _tmp0_; GeeArrayList* _tmp1_; @@ -11984,7 +12659,7 @@ static void adjust_date_time_photos_command_real_undo (Command* base) { _tmp3_ = _tmp2_; #line 1421 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp3_ > 0) { -#line 11988 "Commands.c" +#line 12663 "Commands.c" GeeArrayList* _tmp4_; GeeArrayList* _tmp5_; gint _tmp6_; @@ -11999,12 +12674,16 @@ static void adjust_date_time_photos_command_real_undo (Command* base) { _tmp7_ = _tmp6_; #line 1422 "/home/jens/Source/shotwell/src/Commands.vala" multiple_object_error_dialog (_tmp4_, ngettext ("Time adjustments could not be undone on the following photo file.", "Time adjustments could not be undone on the following photo files.", (gulong) _tmp7_), _ ("Time Adjustment Error")); -#line 12003 "Commands.c" +#line 12678 "Commands.c" } } -static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosCommand* self, Dateable* dateable, time_t exposure_time) { +static void +adjust_date_time_photos_command_set_time (AdjustDateTimePhotosCommand* self, + Dateable* dateable, + time_t exposure_time) +{ gboolean _tmp0_ = FALSE; gboolean _tmp1_; GError * _inner_error_ = NULL; @@ -12016,33 +12695,23 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman _tmp1_ = self->priv->modify_originals; #line 1433 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp1_) { -#line 12020 "Commands.c" - Dateable* _tmp2_; #line 1433 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = dateable; -#line 1433 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_PHOTO); -#line 12026 "Commands.c" + _tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (dateable, TYPE_PHOTO); +#line 12701 "Commands.c" } else { #line 1433 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = FALSE; -#line 12030 "Commands.c" +#line 12705 "Commands.c" } #line 1433 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp0_) { -#line 12034 "Commands.c" +#line 12709 "Commands.c" { - Dateable* _tmp3_; - time_t _tmp4_; -#line 1435 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = dateable; #line 1435 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = exposure_time; -#line 1435 "/home/jens/Source/shotwell/src/Commands.vala" - photo_set_exposure_time_persistent (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO, Photo), _tmp4_, &_inner_error_); + photo_set_exposure_time_persistent (G_TYPE_CHECK_INSTANCE_CAST (dateable, TYPE_PHOTO, Photo), exposure_time, &_inner_error_); #line 1435 "/home/jens/Source/shotwell/src/Commands.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12046 "Commands.c" +#line 12715 "Commands.c" goto __catch468_g_error; } } @@ -12050,21 +12719,18 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman __catch468_g_error: { GError* err = NULL; - GeeArrayList* _tmp5_; - Dateable* _tmp6_; + GeeArrayList* _tmp2_; #line 1434 "/home/jens/Source/shotwell/src/Commands.vala" err = _inner_error_; #line 1434 "/home/jens/Source/shotwell/src/Commands.vala" _inner_error_ = NULL; #line 1437 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = self->priv->error_list; + _tmp2_ = self->priv->error_list; #line 1437 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = dateable; -#line 1437 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp6_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), dateable); #line 1434 "/home/jens/Source/shotwell/src/Commands.vala" _g_error_free0 (err); -#line 12068 "Commands.c" +#line 12734 "Commands.c" } __finally468: #line 1434 "/home/jens/Source/shotwell/src/Commands.vala" @@ -12075,310 +12741,285 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman g_clear_error (&_inner_error_); #line 1434 "/home/jens/Source/shotwell/src/Commands.vala" return; -#line 12079 "Commands.c" +#line 12745 "Commands.c" } } else { - Dateable* _tmp7_; - time_t _tmp8_; -#line 1442 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = dateable; #line 1442 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = exposure_time; -#line 1442 "/home/jens/Source/shotwell/src/Commands.vala" - dateable_set_exposure_time (_tmp7_, _tmp8_); -#line 12090 "Commands.c" + dateable_set_exposure_time (dateable, exposure_time); +#line 12750 "Commands.c" } } -static void adjust_date_time_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) { +static void +adjust_date_time_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, + DataSource* source) +{ AdjustDateTimePhotosCommand * self; Dateable* dateable = NULL; - DataSource* _tmp0_; - Dateable* _tmp1_; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_; + Dateable* _tmp0_; + gboolean _tmp1_ = FALSE; + gboolean _tmp2_; ViewCollection* all_events = NULL; - ViewCollection* _tmp16_; - Dateable* _tmp33_; - ViewCollection* _tmp34_; + ViewCollection* _tmp13_; + Dateable* _tmp29_; + ViewCollection* _tmp30_; #line 1446 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, AdjustDateTimePhotosCommand); #line 1446 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 1447 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATEABLE, Dateable)); #line 1447 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATEABLE, Dateable)); -#line 1447 "/home/jens/Source/shotwell/src/Commands.vala" - dateable = _tmp1_; -#line 1449 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = self->priv->keep_relativity; + dateable = _tmp0_; #line 1449 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp3_) { -#line 12120 "Commands.c" - Dateable* _tmp4_; - time_t _tmp5_; + _tmp2_ = self->priv->keep_relativity; #line 1449 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = dateable; + if (_tmp2_) { +#line 12780 "Commands.c" + Dateable* _tmp3_; #line 1449 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = dateable_get_exposure_time (_tmp4_); + _tmp3_ = dateable; #line 1449 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _tmp5_ != ((time_t) 0); -#line 12129 "Commands.c" + _tmp1_ = dateable_get_exposure_time (_tmp3_) != ((time_t) 0); +#line 12786 "Commands.c" } else { #line 1449 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = FALSE; -#line 12133 "Commands.c" + _tmp1_ = FALSE; +#line 12790 "Commands.c" } #line 1449 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp2_) { -#line 12137 "Commands.c" - Dateable* _tmp6_; - Dateable* _tmp7_; - time_t _tmp8_; - gint64 _tmp9_; -#line 1450 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = dateable; + if (_tmp1_) { +#line 12794 "Commands.c" + Dateable* _tmp4_; + Dateable* _tmp5_; + gint64 _tmp6_; #line 1450 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = dateable; + _tmp4_ = dateable; #line 1450 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = dateable_get_exposure_time (_tmp7_); + _tmp5_ = dateable; #line 1450 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = self->priv->time_shift; + _tmp6_ = self->priv->time_shift; #line 1450 "/home/jens/Source/shotwell/src/Commands.vala" - adjust_date_time_photos_command_set_time (self, _tmp6_, _tmp8_ + ((time_t) _tmp9_)); -#line 12152 "Commands.c" + adjust_date_time_photos_command_set_time (self, _tmp4_, dateable_get_exposure_time (_tmp5_) + ((time_t) _tmp6_)); +#line 12806 "Commands.c" } else { - GeeHashMap* _tmp10_; + GeeHashMap* _tmp7_; + Dateable* _tmp8_; + Dateable* _tmp9_; + time_t _tmp10_; Dateable* _tmp11_; - Dateable* _tmp12_; - time_t _tmp13_; - Dateable* _tmp14_; - time_t* _tmp15_; + time_t* _tmp12_; #line 1452 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = self->priv->old_times; + _tmp7_ = self->priv->old_times; #line 1452 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = dateable; + _tmp8_ = dateable; #line 1452 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = dateable; + _tmp9_ = dateable; #line 1452 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = dateable_get_exposure_time (_tmp12_); + _tmp10_ = dateable_get_exposure_time (_tmp9_); #line 1452 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, &_tmp13_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_, &_tmp10_); #line 1453 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = dateable; + _tmp11_ = dateable; #line 1453 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = self->priv->new_time; + _tmp12_ = self->priv->new_time; #line 1453 "/home/jens/Source/shotwell/src/Commands.vala" - adjust_date_time_photos_command_set_time (self, _tmp14_, *_tmp15_); -#line 12176 "Commands.c" + adjust_date_time_photos_command_set_time (self, _tmp11_, *_tmp12_); +#line 12830 "Commands.c" } #line 1456 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = view_collection_new ("tmp"); + _tmp13_ = view_collection_new ("tmp"); #line 1456 "/home/jens/Source/shotwell/src/Commands.vala" - all_events = _tmp16_; -#line 12182 "Commands.c" + all_events = _tmp13_; +#line 12836 "Commands.c" { GeeIterator* _dobj_it = NULL; - EventSourceCollection* _tmp17_; - GeeCollection* _tmp18_; - GeeCollection* _tmp19_; - GeeIterator* _tmp20_; - GeeIterator* _tmp21_; + EventSourceCollection* _tmp14_; + GeeCollection* _tmp15_; + GeeCollection* _tmp16_; + GeeIterator* _tmp17_; + GeeIterator* _tmp18_; #line 1458 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = event_global; + _tmp14_ = event_global; #line 1458 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp15_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection)); #line 1458 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = _tmp18_; + _tmp16_ = _tmp15_; #line 1458 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp17_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1458 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = _tmp20_; + _tmp18_ = _tmp17_; #line 1458 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp19_); + _g_object_unref0 (_tmp16_); #line 1458 "/home/jens/Source/shotwell/src/Commands.vala" - _dobj_it = _tmp21_; + _dobj_it = _tmp18_; #line 1458 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 12206 "Commands.c" - GeeIterator* _tmp22_; - gboolean _tmp23_; +#line 12860 "Commands.c" + GeeIterator* _tmp19_; DataObject* dobj = NULL; - GeeIterator* _tmp24_; - gpointer _tmp25_; + GeeIterator* _tmp20_; + gpointer _tmp21_; Event* event = NULL; - DataObject* _tmp26_; - Event* _tmp27_; - Event* _tmp28_; -#line 1458 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = _dobj_it; + DataObject* _tmp22_; + Event* _tmp23_; + Event* _tmp24_; #line 1458 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = gee_iterator_next (_tmp22_); + _tmp19_ = _dobj_it; #line 1458 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp23_) { + if (!gee_iterator_next (_tmp19_)) { #line 1458 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 12224 "Commands.c" +#line 12875 "Commands.c" } #line 1458 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = _dobj_it; + _tmp20_ = _dobj_it; #line 1458 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = gee_iterator_get (_tmp24_); + _tmp21_ = gee_iterator_get (_tmp20_); #line 1458 "/home/jens/Source/shotwell/src/Commands.vala" - dobj = (DataObject*) _tmp25_; + dobj = (DataObject*) _tmp21_; #line 1459 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = dobj; + _tmp22_ = dobj; #line 1459 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, TYPE_EVENT) ? ((Event*) _tmp26_) : NULL); + _tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_EVENT) ? ((Event*) _tmp22_) : NULL); #line 1459 "/home/jens/Source/shotwell/src/Commands.vala" - event = _tmp27_; + event = _tmp23_; #line 1460 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp28_ = event; + _tmp24_ = event; #line 1460 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp28_ != NULL) { -#line 12242 "Commands.c" - ViewCollection* _tmp29_; - Event* _tmp30_; - EventView* _tmp31_; - EventView* _tmp32_; + if (_tmp24_ != NULL) { +#line 12893 "Commands.c" + ViewCollection* _tmp25_; + Event* _tmp26_; + EventView* _tmp27_; + EventView* _tmp28_; #line 1461 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp29_ = all_events; + _tmp25_ = all_events; #line 1461 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp30_ = event; + _tmp26_ = event; #line 1461 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp31_ = event_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_EVENT_SOURCE, EventSource)); + _tmp27_ = event_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_EVENT_SOURCE, EventSource)); #line 1461 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp32_ = _tmp31_; + _tmp28_ = _tmp27_; #line 1461 "/home/jens/Source/shotwell/src/Commands.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject)); #line 1461 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp32_); -#line 12259 "Commands.c" + _g_object_unref0 (_tmp28_); +#line 12910 "Commands.c" } #line 1458 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (event); #line 1458 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (dobj); -#line 12265 "Commands.c" +#line 12916 "Commands.c" } #line 1458 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_dobj_it); -#line 12269 "Commands.c" +#line 12920 "Commands.c" } #line 1464 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp33_ = dateable; + _tmp29_ = dateable; #line 1464 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp34_ = all_events; + _tmp30_ = all_events; #line 1464 "/home/jens/Source/shotwell/src/Commands.vala" - event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_MEDIA_SOURCE, MediaSource), _tmp34_, NULL); + event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_MEDIA_SOURCE, MediaSource), _tmp30_, NULL); #line 1446 "/home/jens/Source/shotwell/src/Commands.vala" _data_collection_unref0 (all_events); #line 1446 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (dateable); -#line 12281 "Commands.c" +#line 12932 "Commands.c" } -static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) { +static void +adjust_date_time_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, + DataSource* source) +{ AdjustDateTimePhotosCommand * self; Dateable* photo = NULL; - DataSource* _tmp0_; - Dateable* _tmp1_; - GeeHashMap* _tmp2_; - Dateable* _tmp3_; - gboolean _tmp4_; - DataSource* _tmp16_; - GeeMap* _tmp17_; - DataSource* _tmp18_; - gpointer _tmp19_; - Event* _tmp20_; + Dateable* _tmp0_; + GeeHashMap* _tmp1_; + Dateable* _tmp2_; + GeeMap* _tmp13_; + gpointer _tmp14_; + Event* _tmp15_; #line 1467 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, AdjustDateTimePhotosCommand); #line 1467 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 1468 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATEABLE, Dateable)); #line 1468 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATEABLE, Dateable)); -#line 1468 "/home/jens/Source/shotwell/src/Commands.vala" - photo = _tmp1_; + photo = _tmp0_; #line 1470 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = self->priv->old_times; + _tmp1_ = self->priv->old_times; #line 1470 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = photo; -#line 1470 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_); + _tmp2_ = photo; #line 1470 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp4_) { -#line 12316 "Commands.c" + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_)) { +#line 12962 "Commands.c" + Dateable* _tmp3_; + GeeHashMap* _tmp4_; Dateable* _tmp5_; - GeeHashMap* _tmp6_; - Dateable* _tmp7_; - gpointer _tmp8_; - time_t* _tmp9_; - GeeHashMap* _tmp10_; - Dateable* _tmp11_; + gpointer _tmp6_; + time_t* _tmp7_; + GeeHashMap* _tmp8_; + Dateable* _tmp9_; #line 1471 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = photo; + _tmp3_ = photo; #line 1471 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = self->priv->old_times; + _tmp4_ = self->priv->old_times; #line 1471 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = photo; + _tmp5_ = photo; #line 1471 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_); + _tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_); #line 1471 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = (time_t*) _tmp8_; + _tmp7_ = (time_t*) _tmp6_; #line 1471 "/home/jens/Source/shotwell/src/Commands.vala" - adjust_date_time_photos_command_set_time (self, _tmp5_, *_tmp9_); + adjust_date_time_photos_command_set_time (self, _tmp3_, *_tmp7_); #line 1471 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp7_); #line 1472 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = self->priv->old_times; + _tmp8_ = self->priv->old_times; #line 1472 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = photo; + _tmp9_ = photo; #line 1472 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL); -#line 12344 "Commands.c" + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, NULL); +#line 12990 "Commands.c" } else { - Dateable* _tmp12_; - Dateable* _tmp13_; - time_t _tmp14_; - gint64 _tmp15_; -#line 1474 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = photo; + Dateable* _tmp10_; + Dateable* _tmp11_; + gint64 _tmp12_; #line 1474 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = photo; + _tmp10_ = photo; #line 1474 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = dateable_get_exposure_time (_tmp13_); + _tmp11_ = photo; #line 1474 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = self->priv->time_shift; + _tmp12_ = self->priv->time_shift; #line 1474 "/home/jens/Source/shotwell/src/Commands.vala" - adjust_date_time_photos_command_set_time (self, _tmp12_, _tmp14_ - ((time_t) _tmp15_)); -#line 12360 "Commands.c" + adjust_date_time_photos_command_set_time (self, _tmp10_, dateable_get_exposure_time (_tmp11_) - ((time_t) _tmp12_)); +#line 13003 "Commands.c" } #line 1477 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = source; + _tmp13_ = self->priv->prev_events; #line 1477 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = self->priv->prev_events; + _tmp14_ = gee_map_get (_tmp13_, G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_DATEABLE) ? ((Dateable*) source) : NULL); #line 1477 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = source; + _tmp15_ = (Event*) _tmp14_; #line 1477 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = gee_map_get (_tmp17_, G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_DATEABLE) ? ((Dateable*) _tmp18_) : NULL); + media_source_set_event (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_MEDIA_SOURCE) ? ((MediaSource*) source) : NULL, _tmp15_); #line 1477 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = (Event*) _tmp19_; -#line 1477 "/home/jens/Source/shotwell/src/Commands.vala" - media_source_set_event (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp16_) : NULL, _tmp20_); -#line 1477 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp15_); #line 1467 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (photo); -#line 12378 "Commands.c" +#line 13017 "Commands.c" } -static void adjust_date_time_photos_command_class_init (AdjustDateTimePhotosCommandClass * klass) { +static void +adjust_date_time_photos_command_class_init (AdjustDateTimePhotosCommandClass * klass) +{ #line 1355 "/home/jens/Source/shotwell/src/Commands.vala" adjust_date_time_photos_command_parent_class = g_type_class_peek_parent (klass); #line 1355 "/home/jens/Source/shotwell/src/Commands.vala" @@ -12393,20 +13034,24 @@ static void adjust_date_time_photos_command_class_init (AdjustDateTimePhotosComm ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) adjust_date_time_photos_command_real_undo_on_source; #line 1355 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = adjust_date_time_photos_command_finalize; -#line 12397 "Commands.c" +#line 13038 "Commands.c" } -static void adjust_date_time_photos_command_instance_init (AdjustDateTimePhotosCommand * self) { +static void +adjust_date_time_photos_command_instance_init (AdjustDateTimePhotosCommand * self) +{ #line 1355 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = ADJUST_DATE_TIME_PHOTOS_COMMAND_GET_PRIVATE (self); #line 1362 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->new_time = NULL; -#line 12406 "Commands.c" +#line 13049 "Commands.c" } -static void adjust_date_time_photos_command_finalize (GObject * obj) { +static void +adjust_date_time_photos_command_finalize (GObject * obj) +{ AdjustDateTimePhotosCommand * self; #line 1355 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, AdjustDateTimePhotosCommand); @@ -12420,11 +13065,13 @@ static void adjust_date_time_photos_command_finalize (GObject * obj) { _g_object_unref0 (self->priv->error_list); #line 1355 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (adjust_date_time_photos_command_parent_class)->finalize (obj); -#line 12424 "Commands.c" +#line 13069 "Commands.c" } -GType adjust_date_time_photos_command_get_type (void) { +GType +adjust_date_time_photos_command_get_type (void) +{ static volatile gsize adjust_date_time_photos_command_type_id__volatile = 0; if (g_once_init_enter (&adjust_date_time_photos_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (AdjustDateTimePhotosCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) adjust_date_time_photos_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (AdjustDateTimePhotosCommand), 0, (GInstanceInitFunc) adjust_date_time_photos_command_instance_init, NULL }; @@ -12436,262 +13083,253 @@ GType adjust_date_time_photos_command_get_type (void) { } -static void _add_tags_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) { +static void +_add_tags_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, + gpointer self) +{ #line 1521 "/home/jens/Source/shotwell/src/Commands.vala" add_tags_command_on_proxy_broken ((AddTagsCommand*) self); -#line 12443 "Commands.c" +#line 13093 "Commands.c" } -static void _add_tags_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +static void +_add_tags_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self) +{ #line 1523 "/home/jens/Source/shotwell/src/Commands.vala" add_tags_command_on_source_destroyed ((AddTagsCommand*) self, source); -#line 12450 "Commands.c" +#line 13104 "Commands.c" } -AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, int paths_length1, GeeCollection* sources) { +AddTagsCommand* +add_tags_command_construct (GType object_type, + gchar** paths, + int paths_length1, + GeeCollection* sources) +{ AddTagsCommand * self = NULL; - gchar** _tmp0_; - gint _tmp0__length1; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - gchar** _tmp3_; - gint _tmp3__length1; - LibraryPhotoSourceCollection* _tmp43_; - VideoSourceCollection* _tmp44_; + LibraryPhotoSourceCollection* _tmp38_; + VideoSourceCollection* _tmp39_; #line 1485 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_COLLECTION (sources), NULL); #line 1486 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = paths; -#line 1486 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0__length1 = paths_length1; + _tmp0_ = resources_add_tags_label (paths, paths_length1); #line 1486 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = resources_add_tags_label (_tmp0_, _tmp0__length1); -#line 1486 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 1486 "/home/jens/Source/shotwell/src/Commands.vala" - self = (AddTagsCommand*) page_command_construct (object_type, _tmp2_, ""); + self = (AddTagsCommand*) page_command_construct (object_type, _tmp1_, ""); #line 1486 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp2_); -#line 1491 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = paths; -#line 1491 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3__length1 = paths_length1; -#line 12482 "Commands.c" + _g_free0 (_tmp1_); +#line 13129 "Commands.c" { gchar** path_collection = NULL; gint path_collection_length1 = 0; gint _path_collection_size_ = 0; gint path_it = 0; #line 1491 "/home/jens/Source/shotwell/src/Commands.vala" - path_collection = _tmp3_; + path_collection = paths; #line 1491 "/home/jens/Source/shotwell/src/Commands.vala" - path_collection_length1 = _tmp3__length1; + path_collection_length1 = paths_length1; #line 1491 "/home/jens/Source/shotwell/src/Commands.vala" - for (path_it = 0; path_it < _tmp3__length1; path_it = path_it + 1) { -#line 12494 "Commands.c" - gchar* _tmp4_; + for (path_it = 0; path_it < paths_length1; path_it = path_it + 1) { +#line 13141 "Commands.c" + gchar* _tmp2_; gchar* path = NULL; #line 1491 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = g_strdup (path_collection[path_it]); + _tmp2_ = g_strdup (path_collection[path_it]); #line 1491 "/home/jens/Source/shotwell/src/Commands.vala" - path = _tmp4_; -#line 12501 "Commands.c" + path = _tmp2_; +#line 13148 "Commands.c" { GeeList* paths_to_create = NULL; - const gchar* _tmp5_; - GeeList* _tmp6_; - GeeList* _tmp7_; - const gchar* _tmp8_; + const gchar* _tmp3_; + GeeList* _tmp4_; + GeeList* _tmp5_; + const gchar* _tmp6_; #line 1492 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = path; + _tmp3_ = path; #line 1492 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp5_); + _tmp4_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp3_); #line 1492 "/home/jens/Source/shotwell/src/Commands.vala" - paths_to_create = _tmp6_; + paths_to_create = _tmp4_; #line 1494 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = paths_to_create; + _tmp5_ = paths_to_create; #line 1494 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = path; + _tmp6_ = path; #line 1494 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp8_); -#line 12520 "Commands.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), _tmp6_); +#line 13167 "Commands.c" { GeeList* _create_path_list = NULL; - GeeList* _tmp9_; - GeeList* _tmp10_; + GeeList* _tmp7_; + GeeList* _tmp8_; gint _create_path_size = 0; - GeeList* _tmp11_; - gint _tmp12_; - gint _tmp13_; + GeeList* _tmp9_; + gint _tmp10_; + gint _tmp11_; gint _create_path_index = 0; #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = paths_to_create; + _tmp7_ = paths_to_create; #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = _g_object_ref0 (_tmp9_); + _tmp8_ = _g_object_ref0 (_tmp7_); #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" - _create_path_list = _tmp10_; + _create_path_list = _tmp8_; #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = _create_path_list; + _tmp9_ = _create_path_list; #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" - _create_path_size = _tmp13_; + _create_path_size = _tmp11_; #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" _create_path_index = -1; #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 12548 "Commands.c" +#line 13195 "Commands.c" + gint _tmp12_; + gint _tmp13_; gint _tmp14_; - gint _tmp15_; - gint _tmp16_; gchar* create_path = NULL; - GeeList* _tmp17_; - gint _tmp18_; - gpointer _tmp19_; + GeeList* _tmp15_; + gint _tmp16_; + gpointer _tmp17_; Tag* tag = NULL; - const gchar* _tmp20_; - Tag* _tmp21_; + const gchar* _tmp18_; + Tag* _tmp19_; SourceProxy* tag_proxy = NULL; - Tag* _tmp22_; - SourceProxy* _tmp23_; + Tag* _tmp20_; + SourceProxy* _tmp21_; GeeArrayList* add_sources = NULL; - GeeArrayList* _tmp24_; - GeeArrayList* _tmp36_; - gint _tmp37_; - gint _tmp38_; + GeeArrayList* _tmp22_; + GeeArrayList* _tmp31_; + gint _tmp32_; + gint _tmp33_; #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = _create_path_index; + _tmp12_ = _create_path_index; #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" - _create_path_index = _tmp14_ + 1; + _create_path_index = _tmp12_ + 1; #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = _create_path_index; + _tmp13_ = _create_path_index; #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = _create_path_size; + _tmp14_ = _create_path_size; #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp15_ < _tmp16_)) { + if (!(_tmp13_ < _tmp14_)) { #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 12579 "Commands.c" +#line 13226 "Commands.c" } #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = _create_path_list; + _tmp15_ = _create_path_list; #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = _create_path_index; + _tmp16_ = _create_path_index; #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = gee_list_get (_tmp17_, _tmp18_); + _tmp17_ = gee_list_get (_tmp15_, _tmp16_); #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" - create_path = (gchar*) _tmp19_; + create_path = (gchar*) _tmp17_; #line 1497 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = create_path; + _tmp18_ = create_path; #line 1497 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = tag_for_path (_tmp20_); + _tmp19_ = tag_for_path (_tmp18_); #line 1497 "/home/jens/Source/shotwell/src/Commands.vala" - tag = _tmp21_; + tag = _tmp19_; #line 1498 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = tag; + _tmp20_ = tag; #line 1498 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PROXYABLE, Proxyable)); + _tmp21_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PROXYABLE, Proxyable)); #line 1498 "/home/jens/Source/shotwell/src/Commands.vala" - tag_proxy = _tmp23_; + tag_proxy = _tmp21_; #line 1502 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp22_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1502 "/home/jens/Source/shotwell/src/Commands.vala" - add_sources = _tmp24_; -#line 12605 "Commands.c" + add_sources = _tmp22_; +#line 13252 "Commands.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp25_; - GeeIterator* _tmp26_; -#line 1503 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = sources; + GeeIterator* _tmp23_; #line 1503 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp23_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 1503 "/home/jens/Source/shotwell/src/Commands.vala" - _source_it = _tmp26_; + _source_it = _tmp23_; #line 1503 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 12618 "Commands.c" - GeeIterator* _tmp27_; - gboolean _tmp28_; +#line 13262 "Commands.c" + GeeIterator* _tmp24_; MediaSource* source = NULL; - GeeIterator* _tmp29_; - gpointer _tmp30_; - Tag* _tmp31_; - MediaSource* _tmp32_; - gboolean _tmp33_; + GeeIterator* _tmp25_; + gpointer _tmp26_; + Tag* _tmp27_; + MediaSource* _tmp28_; #line 1503 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = _source_it; + _tmp24_ = _source_it; #line 1503 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp28_ = gee_iterator_next (_tmp27_); -#line 1503 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp28_) { + if (!gee_iterator_next (_tmp24_)) { #line 1503 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 12635 "Commands.c" +#line 13275 "Commands.c" } #line 1503 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp29_ = _source_it; + _tmp25_ = _source_it; #line 1503 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp30_ = gee_iterator_get (_tmp29_); + _tmp26_ = gee_iterator_get (_tmp25_); #line 1503 "/home/jens/Source/shotwell/src/Commands.vala" - source = (MediaSource*) _tmp30_; -#line 1504 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp31_ = tag; + source = (MediaSource*) _tmp26_; #line 1504 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp32_ = source; + _tmp27_ = tag; #line 1504 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp33_ = tag_contains (_tmp31_, _tmp32_); + _tmp28_ = source; #line 1504 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp33_) { -#line 12651 "Commands.c" - GeeArrayList* _tmp34_; - MediaSource* _tmp35_; + if (!tag_contains (_tmp27_, _tmp28_)) { +#line 13289 "Commands.c" + GeeArrayList* _tmp29_; + MediaSource* _tmp30_; #line 1505 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp34_ = add_sources; + _tmp29_ = add_sources; #line 1505 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp35_ = source; + _tmp30_ = source; #line 1505 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp35_); -#line 12660 "Commands.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp30_); +#line 13298 "Commands.c" } #line 1503 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); -#line 12664 "Commands.c" +#line 13302 "Commands.c" } #line 1503 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_it); -#line 12668 "Commands.c" +#line 13306 "Commands.c" } #line 1508 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp36_ = add_sources; + _tmp31_ = add_sources; #line 1508 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp32_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1508 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp38_ = _tmp37_; + _tmp33_ = _tmp32_; #line 1508 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp38_ > 0) { -#line 12678 "Commands.c" - SourceProxy* _tmp39_; - GeeHashMap* _tmp40_; - SourceProxy* _tmp41_; - GeeArrayList* _tmp42_; + if (_tmp33_ > 0) { +#line 13316 "Commands.c" + SourceProxy* _tmp34_; + GeeHashMap* _tmp35_; + SourceProxy* _tmp36_; + GeeArrayList* _tmp37_; #line 1509 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp39_ = tag_proxy; + _tmp34_ = tag_proxy; #line 1509 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (_tmp39_, "broken", (GCallback) _add_tags_command_on_proxy_broken_source_proxy_broken, self, 0); + g_signal_connect_object (_tmp34_, "broken", (GCallback) _add_tags_command_on_proxy_broken_source_proxy_broken, self, 0); #line 1510 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp40_ = self->priv->map; + _tmp35_ = self->priv->map; #line 1510 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp41_ = tag_proxy; + _tmp36_ = tag_proxy; #line 1510 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp42_ = add_sources; + _tmp37_ = add_sources; #line 1510 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp41_, _tmp42_); -#line 12695 "Commands.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp36_, _tmp37_); +#line 13333 "Commands.c" } #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (add_sources); @@ -12701,46 +13339,52 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in _g_object_unref0 (tag); #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (create_path); -#line 12705 "Commands.c" +#line 13343 "Commands.c" } #line 1496 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_create_path_list); -#line 12709 "Commands.c" +#line 13347 "Commands.c" } #line 1491 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (paths_to_create); #line 1491 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (path); -#line 12715 "Commands.c" +#line 13353 "Commands.c" } } } #line 1515 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp43_ = library_photo_global; + _tmp38_ = library_photo_global; #line 1515 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _add_tags_command_on_source_destroyed_source_collection_item_destroyed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _add_tags_command_on_source_destroyed_source_collection_item_destroyed, self, 0); #line 1516 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp44_ = video_global; + _tmp39_ = video_global; #line 1516 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _add_tags_command_on_source_destroyed_source_collection_item_destroyed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _add_tags_command_on_source_destroyed_source_collection_item_destroyed, self, 0); #line 1485 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 12729 "Commands.c" +#line 13367 "Commands.c" } -AddTagsCommand* add_tags_command_new (gchar** paths, int paths_length1, GeeCollection* sources) { +AddTagsCommand* +add_tags_command_new (gchar** paths, + int paths_length1, + GeeCollection* sources) +{ #line 1485 "/home/jens/Source/shotwell/src/Commands.vala" return add_tags_command_construct (TYPE_ADD_TAGS_COMMAND, paths, paths_length1, sources); -#line 12736 "Commands.c" +#line 13378 "Commands.c" } -static void add_tags_command_real_execute (Command* base) { +static void +add_tags_command_real_execute (Command* base) +{ AddTagsCommand * self; #line 1527 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADD_TAGS_COMMAND, AddTagsCommand); -#line 12744 "Commands.c" +#line 13388 "Commands.c" { GeeIterator* _tag_proxy_it = NULL; GeeHashMap* _tmp0_; @@ -12767,71 +13411,70 @@ static void add_tags_command_real_execute (Command* base) { _tag_proxy_it = _tmp5_; #line 1528 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 12771 "Commands.c" +#line 13415 "Commands.c" GeeIterator* _tmp6_; - gboolean _tmp7_; SourceProxy* tag_proxy = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - SourceProxy* _tmp10_; - DataSource* _tmp11_; - Tag* _tmp12_; - GeeHashMap* _tmp13_; - SourceProxy* _tmp14_; - gpointer _tmp15_; - GeeArrayList* _tmp16_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + SourceProxy* _tmp9_; + DataSource* _tmp10_; + Tag* _tmp11_; + GeeHashMap* _tmp12_; + SourceProxy* _tmp13_; + gpointer _tmp14_; + GeeArrayList* _tmp15_; #line 1528 "/home/jens/Source/shotwell/src/Commands.vala" _tmp6_ = _tag_proxy_it; #line 1528 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 1528 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 1528 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 12792 "Commands.c" +#line 13433 "Commands.c" } #line 1528 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = _tag_proxy_it; + _tmp7_ = _tag_proxy_it; #line 1528 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 1528 "/home/jens/Source/shotwell/src/Commands.vala" - tag_proxy = (SourceProxy*) _tmp9_; + tag_proxy = (SourceProxy*) _tmp8_; #line 1529 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = tag_proxy; + _tmp9_ = tag_proxy; #line 1529 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = source_proxy_get_source (_tmp10_); + _tmp10_ = source_proxy_get_source (_tmp9_); #line 1529 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_TAG, Tag); + _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_TAG, Tag); #line 1529 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = self->priv->map; + _tmp12_ = self->priv->map; #line 1529 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = tag_proxy; + _tmp13_ = tag_proxy; #line 1529 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp14_); + _tmp14_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_); #line 1529 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = (GeeArrayList*) _tmp15_; + _tmp15_ = (GeeArrayList*) _tmp14_; #line 1529 "/home/jens/Source/shotwell/src/Commands.vala" - tag_attach_many (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection)); + tag_attach_many (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1529 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp15_); #line 1529 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp11_); #line 1528 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (tag_proxy); -#line 12822 "Commands.c" +#line 13463 "Commands.c" } #line 1528 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_tag_proxy_it); -#line 12826 "Commands.c" +#line 13467 "Commands.c" } } -static void add_tags_command_real_undo (Command* base) { +static void +add_tags_command_real_undo (Command* base) +{ AddTagsCommand * self; #line 1532 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADD_TAGS_COMMAND, AddTagsCommand); -#line 12835 "Commands.c" +#line 13478 "Commands.c" { GeeIterator* _tag_proxy_it = NULL; GeeHashMap* _tmp0_; @@ -12858,81 +13501,81 @@ static void add_tags_command_real_undo (Command* base) { _tag_proxy_it = _tmp5_; #line 1533 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 12862 "Commands.c" +#line 13505 "Commands.c" GeeIterator* _tmp6_; - gboolean _tmp7_; SourceProxy* tag_proxy = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp7_; + gpointer _tmp8_; Tag* tag = NULL; - SourceProxy* _tmp10_; - DataSource* _tmp11_; - Tag* _tmp12_; - GeeHashMap* _tmp13_; - SourceProxy* _tmp14_; - gpointer _tmp15_; - GeeArrayList* _tmp16_; + SourceProxy* _tmp9_; + DataSource* _tmp10_; + Tag* _tmp11_; + GeeHashMap* _tmp12_; + SourceProxy* _tmp13_; + gpointer _tmp14_; + GeeArrayList* _tmp15_; + GeeMultiMap* _tmp16_; GeeMultiMap* _tmp17_; - GeeMultiMap* _tmp18_; #line 1533 "/home/jens/Source/shotwell/src/Commands.vala" _tmp6_ = _tag_proxy_it; #line 1533 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 1533 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 1533 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 12886 "Commands.c" +#line 13526 "Commands.c" } #line 1533 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = _tag_proxy_it; + _tmp7_ = _tag_proxy_it; #line 1533 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 1533 "/home/jens/Source/shotwell/src/Commands.vala" - tag_proxy = (SourceProxy*) _tmp9_; + tag_proxy = (SourceProxy*) _tmp8_; #line 1534 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = tag_proxy; + _tmp9_ = tag_proxy; #line 1534 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = source_proxy_get_source (_tmp10_); + _tmp10_ = source_proxy_get_source (_tmp9_); #line 1534 "/home/jens/Source/shotwell/src/Commands.vala" - tag = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_TAG, Tag); + tag = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_TAG, Tag); #line 1536 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = tag; + _tmp11_ = tag; #line 1536 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = self->priv->map; + _tmp12_ = self->priv->map; #line 1536 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = tag_proxy; + _tmp13_ = tag_proxy; #line 1536 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp14_); + _tmp14_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_); #line 1536 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = (GeeArrayList*) _tmp15_; + _tmp15_ = (GeeArrayList*) _tmp14_; #line 1536 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = tag_detach_many (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp16_ = tag_detach_many (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1536 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 1536 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp17_); #line 1536 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp15_); #line 1533 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (tag); #line 1533 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (tag_proxy); -#line 12922 "Commands.c" +#line 13562 "Commands.c" } #line 1533 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_tag_proxy_it); -#line 12926 "Commands.c" +#line 13566 "Commands.c" } } -static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSource* source) { +static void +add_tags_command_on_source_destroyed (AddTagsCommand* self, + DataSource* source) +{ #line 1540 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_ADD_TAGS_COMMAND (self)); #line 1540 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); -#line 12936 "Commands.c" +#line 13579 "Commands.c" { GeeIterator* _sources_it = NULL; GeeHashMap* _tmp0_; @@ -12959,70 +13602,63 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour _sources_it = _tmp5_; #line 1541 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 12963 "Commands.c" +#line 13606 "Commands.c" GeeIterator* _tmp6_; - gboolean _tmp7_; GeeArrayList* sources = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - GeeArrayList* _tmp10_; - DataSource* _tmp11_; - gboolean _tmp12_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + GeeArrayList* _tmp9_; #line 1541 "/home/jens/Source/shotwell/src/Commands.vala" _tmp6_ = _sources_it; #line 1541 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 1541 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 1541 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 12980 "Commands.c" +#line 13618 "Commands.c" } #line 1541 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = _sources_it; + _tmp7_ = _sources_it; #line 1541 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 1541 "/home/jens/Source/shotwell/src/Commands.vala" - sources = (GeeArrayList*) _tmp9_; + sources = (GeeArrayList*) _tmp8_; #line 1542 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = sources; + _tmp9_ = sources; #line 1542 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = source; -#line 1542 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 1542 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp12_) { -#line 12996 "Commands.c" - CommandManager* _tmp13_; - CommandManager* _tmp14_; + if (gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource))) { +#line 13630 "Commands.c" + CommandManager* _tmp10_; + CommandManager* _tmp11_; #line 1543 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command)); + _tmp10_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command)); #line 1543 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = _tmp13_; + _tmp11_ = _tmp10_; #line 1543 "/home/jens/Source/shotwell/src/Commands.vala" - command_manager_reset (_tmp14_); + command_manager_reset (_tmp11_); #line 1543 "/home/jens/Source/shotwell/src/Commands.vala" - _command_manager_unref0 (_tmp14_); + _command_manager_unref0 (_tmp11_); #line 1545 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (sources); #line 1545 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_sources_it); #line 1545 "/home/jens/Source/shotwell/src/Commands.vala" return; -#line 13013 "Commands.c" +#line 13647 "Commands.c" } #line 1541 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (sources); -#line 13017 "Commands.c" +#line 13651 "Commands.c" } #line 1541 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_sources_it); -#line 13021 "Commands.c" +#line 13655 "Commands.c" } } -static void add_tags_command_on_proxy_broken (AddTagsCommand* self) { +static void +add_tags_command_on_proxy_broken (AddTagsCommand* self) +{ CommandManager* _tmp0_; CommandManager* _tmp1_; #line 1550 "/home/jens/Source/shotwell/src/Commands.vala" @@ -13035,11 +13671,13 @@ static void add_tags_command_on_proxy_broken (AddTagsCommand* self) { command_manager_reset (_tmp1_); #line 1551 "/home/jens/Source/shotwell/src/Commands.vala" _command_manager_unref0 (_tmp1_); -#line 13039 "Commands.c" +#line 13675 "Commands.c" } -static void add_tags_command_class_init (AddTagsCommandClass * klass) { +static void +add_tags_command_class_init (AddTagsCommandClass * klass) +{ #line 1481 "/home/jens/Source/shotwell/src/Commands.vala" add_tags_command_parent_class = g_type_class_peek_parent (klass); #line 1481 "/home/jens/Source/shotwell/src/Commands.vala" @@ -13050,11 +13688,13 @@ static void add_tags_command_class_init (AddTagsCommandClass * klass) { ((CommandClass *) klass)->undo = (void (*) (Command *)) add_tags_command_real_undo; #line 1481 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = add_tags_command_finalize; -#line 13054 "Commands.c" +#line 13692 "Commands.c" } -static void add_tags_command_instance_init (AddTagsCommand * self) { +static void +add_tags_command_instance_init (AddTagsCommand * self) +{ GeeHashMap* _tmp0_; #line 1481 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = ADD_TAGS_COMMAND_GET_PRIVATE (self); @@ -13062,19 +13702,21 @@ static void add_tags_command_instance_init (AddTagsCommand * self) { _tmp0_ = gee_hash_map_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, GEE_TYPE_ARRAY_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 1482 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->map = _tmp0_; -#line 13066 "Commands.c" +#line 13706 "Commands.c" } -static void add_tags_command_finalize (GObject * obj) { +static void +add_tags_command_finalize (GObject * obj) +{ AddTagsCommand * self; - LibraryPhotoSourceCollection* _tmp12_; - guint _tmp13_; - VideoSourceCollection* _tmp14_; - guint _tmp15_; + LibraryPhotoSourceCollection* _tmp11_; + guint _tmp12_; + VideoSourceCollection* _tmp13_; + guint _tmp14_; #line 1481 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADD_TAGS_COMMAND, AddTagsCommand); -#line 13078 "Commands.c" +#line 13720 "Commands.c" { GeeIterator* _tag_proxy_it = NULL; GeeHashMap* _tmp0_; @@ -13101,65 +13743,64 @@ static void add_tags_command_finalize (GObject * obj) { _tag_proxy_it = _tmp5_; #line 1520 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 13105 "Commands.c" +#line 13747 "Commands.c" GeeIterator* _tmp6_; - gboolean _tmp7_; SourceProxy* tag_proxy = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - SourceProxy* _tmp10_; - guint _tmp11_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + SourceProxy* _tmp9_; + guint _tmp10_; #line 1520 "/home/jens/Source/shotwell/src/Commands.vala" _tmp6_ = _tag_proxy_it; #line 1520 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 1520 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 1520 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 13121 "Commands.c" +#line 13760 "Commands.c" } #line 1520 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = _tag_proxy_it; + _tmp7_ = _tag_proxy_it; #line 1520 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 1520 "/home/jens/Source/shotwell/src/Commands.vala" - tag_proxy = (SourceProxy*) _tmp9_; + tag_proxy = (SourceProxy*) _tmp8_; #line 1521 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = tag_proxy; + _tmp9_ = tag_proxy; #line 1521 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_parse_name ("broken", TYPE_SOURCE_PROXY, &_tmp11_, NULL, FALSE); + g_signal_parse_name ("broken", TYPE_SOURCE_PROXY, &_tmp10_, NULL, FALSE); #line 1521 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _add_tags_command_on_proxy_broken_source_proxy_broken, self); + g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _add_tags_command_on_proxy_broken_source_proxy_broken, self); #line 1520 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (tag_proxy); -#line 13137 "Commands.c" +#line 13776 "Commands.c" } #line 1520 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_tag_proxy_it); -#line 13141 "Commands.c" +#line 13780 "Commands.c" } #line 1523 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = library_photo_global; + _tmp11_ = library_photo_global; #line 1523 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_parse_name ("item-destroyed", TYPE_SOURCE_COLLECTION, &_tmp13_, NULL, FALSE); + g_signal_parse_name ("item-destroyed", TYPE_SOURCE_COLLECTION, &_tmp12_, NULL, FALSE); #line 1523 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_SOURCE_COLLECTION, SourceCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _add_tags_command_on_source_destroyed_source_collection_item_destroyed, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _add_tags_command_on_source_destroyed_source_collection_item_destroyed, self); #line 1524 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = video_global; + _tmp13_ = video_global; #line 1524 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_parse_name ("item-destroyed", TYPE_SOURCE_COLLECTION, &_tmp15_, NULL, FALSE); + g_signal_parse_name ("item-destroyed", TYPE_SOURCE_COLLECTION, &_tmp14_, NULL, FALSE); #line 1524 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_SOURCE_COLLECTION, SourceCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _add_tags_command_on_source_destroyed_source_collection_item_destroyed, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_SOURCE_COLLECTION, SourceCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _add_tags_command_on_source_destroyed_source_collection_item_destroyed, self); #line 1482 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->map); #line 1481 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (add_tags_command_parent_class)->finalize (obj); -#line 13159 "Commands.c" +#line 13798 "Commands.c" } -GType add_tags_command_get_type (void) { +GType +add_tags_command_get_type (void) +{ static volatile gsize add_tags_command_type_id__volatile = 0; if (g_once_init_enter (&add_tags_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (AddTagsCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) add_tags_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (AddTagsCommand), 0, (GInstanceInitFunc) add_tags_command_instance_init, NULL }; @@ -13171,156 +13812,141 @@ GType add_tags_command_get_type (void) { } -RenameTagCommand* rename_tag_command_construct (GType object_type, Tag* tag, const gchar* new_name) { +RenameTagCommand* +rename_tag_command_construct (GType object_type, + Tag* tag, + const gchar* new_name) +{ RenameTagCommand * self = NULL; - Tag* _tmp0_; - Tag* _tmp1_; + gchar* _tmp0_; + gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; - Tag* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - Tag* _tmp10_; - gchar* _tmp11_; - const gchar* _tmp12_; - gchar* _tmp13_; + gchar* _tmp7_; #line 1560 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_TAG (tag), NULL); #line 1560 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (new_name != NULL, NULL); #line 1561 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = tag; + _tmp0_ = tag_get_user_visible_name (tag); #line 1561 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = tag; + _tmp1_ = _tmp0_; #line 1561 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = tag_get_user_visible_name (_tmp1_); + _tmp2_ = resources_rename_tag_label (_tmp1_, new_name); #line 1561 "/home/jens/Source/shotwell/src/Commands.vala" _tmp3_ = _tmp2_; #line 1561 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = new_name; -#line 1561 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = resources_rename_tag_label (_tmp3_, _tmp4_); + _tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (tag, TYPE_DATA_OBJECT, DataObject)); #line 1561 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = _tmp5_; -#line 1561 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = tag; -#line 1561 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject)); -#line 1561 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = _tmp8_; -#line 1561 "/home/jens/Source/shotwell/src/Commands.vala" - self = (RenameTagCommand*) simple_proxyable_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PROXYABLE, Proxyable), _tmp6_, _tmp9_); + _tmp5_ = _tmp4_; #line 1561 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp9_); + self = (RenameTagCommand*) simple_proxyable_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (tag, TYPE_PROXYABLE, Proxyable), _tmp3_, _tmp5_); #line 1561 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 1561 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (_tmp3_); +#line 1561 "/home/jens/Source/shotwell/src/Commands.vala" + _g_free0 (_tmp1_); #line 1564 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = tag; -#line 1564 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = tag_get_user_visible_name (_tmp10_); + _tmp6_ = tag_get_user_visible_name (tag); #line 1564 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->old_name); #line 1564 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->old_name = _tmp11_; -#line 1565 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = new_name; + self->priv->old_name = _tmp6_; #line 1565 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = g_strdup (_tmp12_); + _tmp7_ = g_strdup (new_name); #line 1565 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->new_name); #line 1565 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->new_name = _tmp13_; + self->priv->new_name = _tmp7_; #line 1560 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 13241 "Commands.c" +#line 13868 "Commands.c" } -RenameTagCommand* rename_tag_command_new (Tag* tag, const gchar* new_name) { +RenameTagCommand* +rename_tag_command_new (Tag* tag, + const gchar* new_name) +{ #line 1560 "/home/jens/Source/shotwell/src/Commands.vala" return rename_tag_command_construct (TYPE_RENAME_TAG_COMMAND, tag, new_name); -#line 13248 "Commands.c" +#line 13878 "Commands.c" } -static void rename_tag_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source) { +static void +rename_tag_command_real_execute_on_source (SimpleProxyableCommand* base, + DataSource* source) +{ RenameTagCommand * self; - DataSource* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; + const gchar* _tmp0_; #line 1568 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RENAME_TAG_COMMAND, RenameTagCommand); #line 1568 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 1569 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; + _tmp0_ = self->priv->new_name; #line 1569 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = self->priv->new_name; -#line 1569 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = tag_rename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TAG, Tag), _tmp1_); -#line 1569 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp2_) { -#line 13269 "Commands.c" - const gchar* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; + if (!tag_rename (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_TAG, Tag), _tmp0_)) { +#line 13896 "Commands.c" + const gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; #line 1570 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = self->priv->new_name; + _tmp1_ = self->priv->new_name; #line 1570 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = resources_rename_tag_exists_message (_tmp3_); + _tmp2_ = resources_rename_tag_exists_message (_tmp1_); #line 1570 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 1570 "/home/jens/Source/shotwell/src/Commands.vala" - app_window_error_message (_tmp5_, NULL); + app_window_error_message (_tmp3_, NULL); #line 1570 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp5_); -#line 13283 "Commands.c" + _g_free0 (_tmp3_); +#line 13910 "Commands.c" } } -static void rename_tag_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source) { +static void +rename_tag_command_real_undo_on_source (SimpleProxyableCommand* base, + DataSource* source) +{ RenameTagCommand * self; - DataSource* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; + const gchar* _tmp0_; #line 1573 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RENAME_TAG_COMMAND, RenameTagCommand); #line 1573 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 1574 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; -#line 1574 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = self->priv->old_name; -#line 1574 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = tag_rename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TAG, Tag), _tmp1_); + _tmp0_ = self->priv->old_name; #line 1574 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp2_) { -#line 13305 "Commands.c" - const gchar* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; + if (!tag_rename (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_TAG, Tag), _tmp0_)) { +#line 13929 "Commands.c" + const gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; #line 1575 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = self->priv->old_name; + _tmp1_ = self->priv->old_name; #line 1575 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = resources_rename_tag_exists_message (_tmp3_); + _tmp2_ = resources_rename_tag_exists_message (_tmp1_); #line 1575 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 1575 "/home/jens/Source/shotwell/src/Commands.vala" - app_window_error_message (_tmp5_, NULL); + app_window_error_message (_tmp3_, NULL); #line 1575 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp5_); -#line 13319 "Commands.c" + _g_free0 (_tmp3_); +#line 13943 "Commands.c" } } -static void rename_tag_command_class_init (RenameTagCommandClass * klass) { +static void +rename_tag_command_class_init (RenameTagCommandClass * klass) +{ #line 1555 "/home/jens/Source/shotwell/src/Commands.vala" rename_tag_command_parent_class = g_type_class_peek_parent (klass); #line 1555 "/home/jens/Source/shotwell/src/Commands.vala" @@ -13331,18 +13957,22 @@ static void rename_tag_command_class_init (RenameTagCommandClass * klass) { ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) rename_tag_command_real_undo_on_source; #line 1555 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = rename_tag_command_finalize; -#line 13335 "Commands.c" +#line 13961 "Commands.c" } -static void rename_tag_command_instance_init (RenameTagCommand * self) { +static void +rename_tag_command_instance_init (RenameTagCommand * self) +{ #line 1555 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = RENAME_TAG_COMMAND_GET_PRIVATE (self); -#line 13342 "Commands.c" +#line 13970 "Commands.c" } -static void rename_tag_command_finalize (GObject * obj) { +static void +rename_tag_command_finalize (GObject * obj) +{ RenameTagCommand * self; #line 1555 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RENAME_TAG_COMMAND, RenameTagCommand); @@ -13352,11 +13982,13 @@ static void rename_tag_command_finalize (GObject * obj) { _g_free0 (self->priv->new_name); #line 1555 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (rename_tag_command_parent_class)->finalize (obj); -#line 13356 "Commands.c" +#line 13986 "Commands.c" } -GType rename_tag_command_get_type (void) { +GType +rename_tag_command_get_type (void) +{ static volatile gsize rename_tag_command_type_id__volatile = 0; if (g_once_init_enter (&rename_tag_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RenameTagCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) rename_tag_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RenameTagCommand), 0, (GInstanceInitFunc) rename_tag_command_instance_init, NULL }; @@ -13368,343 +14000,339 @@ GType rename_tag_command_get_type (void) { } -DeleteTagCommand* delete_tag_command_construct (GType object_type, Tag* tag) { +DeleteTagCommand* +delete_tag_command_construct (GType object_type, + Tag* tag) +{ DeleteTagCommand * self = NULL; - Tag* _tmp0_; - Tag* _tmp1_; + gchar* _tmp0_; + gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; - Tag* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; #line 1582 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_TAG (tag), NULL); #line 1583 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = tag; + _tmp0_ = tag_get_user_visible_name (tag); #line 1583 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = tag; + _tmp1_ = _tmp0_; #line 1583 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = tag_get_user_visible_name (_tmp1_); + _tmp2_ = resources_delete_tag_label (_tmp1_); #line 1583 "/home/jens/Source/shotwell/src/Commands.vala" _tmp3_ = _tmp2_; #line 1583 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = resources_delete_tag_label (_tmp3_); + _tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (tag, TYPE_DATA_OBJECT, DataObject)); #line 1583 "/home/jens/Source/shotwell/src/Commands.vala" _tmp5_ = _tmp4_; #line 1583 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = tag; -#line 1583 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_OBJECT, DataObject)); -#line 1583 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = _tmp7_; -#line 1583 "/home/jens/Source/shotwell/src/Commands.vala" - self = (DeleteTagCommand*) simple_proxyable_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PROXYABLE, Proxyable), _tmp5_, _tmp8_); -#line 1583 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp8_); + self = (DeleteTagCommand*) simple_proxyable_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (tag, TYPE_PROXYABLE, Proxyable), _tmp3_, _tmp5_); #line 1583 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (_tmp5_); #line 1583 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (_tmp3_); +#line 1583 "/home/jens/Source/shotwell/src/Commands.vala" + _g_free0 (_tmp1_); #line 1582 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 13413 "Commands.c" +#line 14039 "Commands.c" } -DeleteTagCommand* delete_tag_command_new (Tag* tag) { +DeleteTagCommand* +delete_tag_command_new (Tag* tag) +{ #line 1582 "/home/jens/Source/shotwell/src/Commands.vala" return delete_tag_command_construct (TYPE_DELETE_TAG_COMMAND, tag); -#line 13420 "Commands.c" +#line 14048 "Commands.c" } -static void _delete_tag_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) { +static void +_delete_tag_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, + gpointer self) +{ #line 1597 "/home/jens/Source/shotwell/src/Commands.vala" delete_tag_command_on_proxy_broken ((DeleteTagCommand*) self); -#line 13427 "Commands.c" +#line 14058 "Commands.c" } -static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source) { +static void +delete_tag_command_real_execute_on_source (SimpleProxyableCommand* base, + DataSource* source) +{ DeleteTagCommand * self; Tag* tag = NULL; - DataSource* _tmp0_; - Tag* _tmp1_; + Tag* _tmp0_; GeeList* recursive_victims = NULL; - Tag* _tmp2_; + Tag* _tmp1_; + GeeList* _tmp2_; GeeList* _tmp3_; - GeeList* _tmp4_; + gint _tmp4_; gint _tmp5_; - gint _tmp6_; + TagSourceCollection* _tmp28_; TagSourceCollection* _tmp29_; - TagSourceCollection* _tmp30_; - DataSource* _tmp31_; - Marker* _tmp32_; - Marker* _tmp33_; + Marker* _tmp30_; + Marker* _tmp31_; #line 1586 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DELETE_TAG_COMMAND, DeleteTagCommand); #line 1586 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 1587 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_TAG, Tag)); #line 1587 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TAG, Tag)); -#line 1587 "/home/jens/Source/shotwell/src/Commands.vala" - tag = _tmp1_; + tag = _tmp0_; #line 1590 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = tag; + _tmp1_ = tag; #line 1590 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = tag_get_hierarchical_children (_tmp2_); + _tmp2_ = tag_get_hierarchical_children (_tmp1_); #line 1590 "/home/jens/Source/shotwell/src/Commands.vala" - recursive_victims = _tmp3_; + recursive_victims = _tmp2_; #line 1591 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = recursive_victims; + _tmp3_ = recursive_victims; #line 1591 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1591 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 1591 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp6_ > 0) { -#line 13471 "Commands.c" - GeeArrayList* _tmp7_; + if (_tmp5_ > 0) { +#line 14101 "Commands.c" + GeeArrayList* _tmp6_; #line 1594 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL); + _tmp6_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL); #line 1594 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->recursive_victim_proxies); #line 1594 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->recursive_victim_proxies = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_LIST, GeeList); -#line 13479 "Commands.c" + self->priv->recursive_victim_proxies = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList); +#line 14109 "Commands.c" { GeeList* _victim_list = NULL; + GeeList* _tmp7_; GeeList* _tmp8_; - GeeList* _tmp9_; gint _victim_size = 0; - GeeList* _tmp10_; + GeeList* _tmp9_; + gint _tmp10_; gint _tmp11_; - gint _tmp12_; gint _victim_index = 0; #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = recursive_victims; + _tmp7_ = recursive_victims; #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = _g_object_ref0 (_tmp8_); + _tmp8_ = _g_object_ref0 (_tmp7_); #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" - _victim_list = _tmp9_; + _victim_list = _tmp8_; #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = _victim_list; + _tmp9_ = _victim_list; #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" - _victim_size = _tmp12_; + _victim_size = _tmp11_; #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" _victim_index = -1; #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 13507 "Commands.c" +#line 14137 "Commands.c" + gint _tmp12_; gint _tmp13_; gint _tmp14_; - gint _tmp15_; Tag* victim = NULL; - GeeList* _tmp16_; - gint _tmp17_; - gpointer _tmp18_; + GeeList* _tmp15_; + gint _tmp16_; + gpointer _tmp17_; SourceProxy* proxy = NULL; - Tag* _tmp19_; + Tag* _tmp18_; + SourceProxy* _tmp19_; SourceProxy* _tmp20_; - SourceProxy* _tmp21_; - GeeList* _tmp22_; - SourceProxy* _tmp23_; + GeeList* _tmp21_; + SourceProxy* _tmp22_; + TagSourceCollection* _tmp23_; TagSourceCollection* _tmp24_; - TagSourceCollection* _tmp25_; - Tag* _tmp26_; + Tag* _tmp25_; + Marker* _tmp26_; Marker* _tmp27_; - Marker* _tmp28_; #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = _victim_index; + _tmp12_ = _victim_index; #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" - _victim_index = _tmp13_ + 1; + _victim_index = _tmp12_ + 1; #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = _victim_index; + _tmp13_ = _victim_index; #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = _victim_size; + _tmp14_ = _victim_size; #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp14_ < _tmp15_)) { + if (!(_tmp13_ < _tmp14_)) { #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 13538 "Commands.c" +#line 14168 "Commands.c" } #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = _victim_list; + _tmp15_ = _victim_list; #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = _victim_index; + _tmp16_ = _victim_index; #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = gee_list_get (_tmp16_, _tmp17_); + _tmp17_ = gee_list_get (_tmp15_, _tmp16_); #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" - victim = (Tag*) _tmp18_; + victim = (Tag*) _tmp17_; #line 1596 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = victim; + _tmp18_ = victim; #line 1596 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PROXYABLE, Proxyable)); + _tmp19_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PROXYABLE, Proxyable)); #line 1596 "/home/jens/Source/shotwell/src/Commands.vala" - proxy = _tmp20_; + proxy = _tmp19_; #line 1597 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = proxy; + _tmp20_ = proxy; #line 1597 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (_tmp21_, "broken", (GCallback) _delete_tag_command_on_proxy_broken_source_proxy_broken, self, 0); + g_signal_connect_object (_tmp20_, "broken", (GCallback) _delete_tag_command_on_proxy_broken_source_proxy_broken, self, 0); #line 1598 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = self->priv->recursive_victim_proxies; + _tmp21_ = self->priv->recursive_victim_proxies; #line 1598 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = proxy; + _tmp22_ = proxy; #line 1598 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), _tmp22_); #line 1600 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = tag_global; + _tmp23_ = tag_global; #line 1600 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = tag_global; + _tmp24_ = tag_global; #line 1600 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = victim; + _tmp25_ = victim; #line 1600 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_OBJECT, DataObject)); + _tmp26_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject)); #line 1600 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp28_ = _tmp27_; + _tmp27_ = _tmp26_; #line 1600 "/home/jens/Source/shotwell/src/Commands.vala" - source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp28_, FALSE, NULL, NULL, NULL); + source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp27_, FALSE, NULL, NULL, NULL); #line 1600 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp28_); + _g_object_unref0 (_tmp27_); #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (proxy); #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (victim); -#line 13582 "Commands.c" +#line 14212 "Commands.c" } #line 1595 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_victim_list); -#line 13586 "Commands.c" +#line 14216 "Commands.c" } } #line 1605 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp29_ = tag_global; -#line 1605 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp30_ = tag_global; + _tmp28_ = tag_global; #line 1605 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp31_ = source; + _tmp29_ = tag_global; #line 1605 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp32_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_OBJECT, DataObject)); + _tmp30_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 1605 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp33_ = _tmp32_; + _tmp31_ = _tmp30_; #line 1605 "/home/jens/Source/shotwell/src/Commands.vala" - source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp33_, FALSE, NULL, NULL, NULL); + source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp31_, FALSE, NULL, NULL, NULL); #line 1605 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp33_); + _g_object_unref0 (_tmp31_); #line 1586 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (recursive_victims); #line 1586 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (tag); -#line 13607 "Commands.c" +#line 14235 "Commands.c" } -static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source) { +static void +delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base, + DataSource* source) +{ DeleteTagCommand * self; - DataSource* _tmp0_; - GeeList* _tmp1_; + GeeList* _tmp0_; #line 1608 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DELETE_TAG_COMMAND, DeleteTagCommand); #line 1608 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 1611 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; -#line 1611 "/home/jens/Source/shotwell/src/Commands.vala" - _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_TAG), "source is Tag"); + _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_TAG), "source is Tag"); #line 1614 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = self->priv->recursive_victim_proxies; + _tmp0_ = self->priv->recursive_victim_proxies; #line 1614 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp1_ != NULL) { -#line 13627 "Commands.c" + if (_tmp0_ != NULL) { +#line 14255 "Commands.c" { gint i = 0; - GeeList* _tmp2_; + GeeList* _tmp1_; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; #line 1615 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = self->priv->recursive_victim_proxies; + _tmp1_ = self->priv->recursive_victim_proxies; #line 1615 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1615 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 1615 "/home/jens/Source/shotwell/src/Commands.vala" - i = _tmp4_ - 1; -#line 13641 "Commands.c" + i = _tmp3_ - 1; +#line 14269 "Commands.c" { - gboolean _tmp5_ = FALSE; + gboolean _tmp4_ = FALSE; #line 1615 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = TRUE; + _tmp4_ = TRUE; #line 1615 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 13648 "Commands.c" - gint _tmp7_; +#line 14276 "Commands.c" + gint _tmp6_; SourceProxy* proxy = NULL; - GeeList* _tmp8_; - gint _tmp9_; - gpointer _tmp10_; + GeeList* _tmp7_; + gint _tmp8_; + gpointer _tmp9_; DataSource* victim_source = NULL; - SourceProxy* _tmp11_; + SourceProxy* _tmp10_; + DataSource* _tmp11_; DataSource* _tmp12_; - DataSource* _tmp13_; - SourceProxy* _tmp14_; - guint _tmp15_; + SourceProxy* _tmp13_; + guint _tmp14_; #line 1615 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp5_) { -#line 13662 "Commands.c" - gint _tmp6_; + if (!_tmp4_) { +#line 14290 "Commands.c" + gint _tmp5_; #line 1615 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = i; + _tmp5_ = i; #line 1615 "/home/jens/Source/shotwell/src/Commands.vala" - i = _tmp6_ - 1; -#line 13668 "Commands.c" + i = _tmp5_ - 1; +#line 14296 "Commands.c" } #line 1615 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = FALSE; + _tmp4_ = FALSE; #line 1615 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = i; + _tmp6_ = i; #line 1615 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp7_ >= 0)) { + if (!(_tmp6_ >= 0)) { #line 1615 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 13678 "Commands.c" +#line 14306 "Commands.c" } #line 1616 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = self->priv->recursive_victim_proxies; + _tmp7_ = self->priv->recursive_victim_proxies; #line 1616 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = i; + _tmp8_ = i; #line 1616 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = gee_list_get (_tmp8_, _tmp9_); + _tmp9_ = gee_list_get (_tmp7_, _tmp8_); #line 1616 "/home/jens/Source/shotwell/src/Commands.vala" - proxy = (SourceProxy*) _tmp10_; + proxy = (SourceProxy*) _tmp9_; #line 1618 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = proxy; + _tmp10_ = proxy; #line 1618 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = source_proxy_get_source (_tmp11_); + _tmp11_ = source_proxy_get_source (_tmp10_); #line 1618 "/home/jens/Source/shotwell/src/Commands.vala" - victim_source = _tmp12_; + victim_source = _tmp11_; #line 1619 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = victim_source; + _tmp12_ = victim_source; #line 1619 "/home/jens/Source/shotwell/src/Commands.vala" - _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_TAG), "victim_source is Tag"); + _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_TAG), "victim_source is Tag"); #line 1621 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = proxy; + _tmp13_ = proxy; #line 1621 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_parse_name ("broken", TYPE_SOURCE_PROXY, &_tmp15_, NULL, FALSE); + g_signal_parse_name ("broken", TYPE_SOURCE_PROXY, &_tmp14_, NULL, FALSE); #line 1621 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_handlers_disconnect_matched (_tmp14_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _delete_tag_command_on_proxy_broken_source_proxy_broken, self); + g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _delete_tag_command_on_proxy_broken_source_proxy_broken, self); #line 1615 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (victim_source); #line 1615 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (proxy); -#line 13708 "Commands.c" +#line 14336 "Commands.c" } } } @@ -13712,12 +14340,14 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base _g_object_unref0 (self->priv->recursive_victim_proxies); #line 1624 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->recursive_victim_proxies = NULL; -#line 13716 "Commands.c" +#line 14344 "Commands.c" } } -static void delete_tag_command_on_proxy_broken (DeleteTagCommand* self) { +static void +delete_tag_command_on_proxy_broken (DeleteTagCommand* self) +{ CommandManager* _tmp0_; CommandManager* _tmp1_; #line 1628 "/home/jens/Source/shotwell/src/Commands.vala" @@ -13730,11 +14360,13 @@ static void delete_tag_command_on_proxy_broken (DeleteTagCommand* self) { command_manager_reset (_tmp1_); #line 1629 "/home/jens/Source/shotwell/src/Commands.vala" _command_manager_unref0 (_tmp1_); -#line 13734 "Commands.c" +#line 14364 "Commands.c" } -static void delete_tag_command_class_init (DeleteTagCommandClass * klass) { +static void +delete_tag_command_class_init (DeleteTagCommandClass * klass) +{ #line 1579 "/home/jens/Source/shotwell/src/Commands.vala" delete_tag_command_parent_class = g_type_class_peek_parent (klass); #line 1579 "/home/jens/Source/shotwell/src/Commands.vala" @@ -13745,20 +14377,24 @@ static void delete_tag_command_class_init (DeleteTagCommandClass * klass) { ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) delete_tag_command_real_undo_on_source; #line 1579 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = delete_tag_command_finalize; -#line 13749 "Commands.c" +#line 14381 "Commands.c" } -static void delete_tag_command_instance_init (DeleteTagCommand * self) { +static void +delete_tag_command_instance_init (DeleteTagCommand * self) +{ #line 1579 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = DELETE_TAG_COMMAND_GET_PRIVATE (self); #line 1580 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->recursive_victim_proxies = NULL; -#line 13758 "Commands.c" +#line 14392 "Commands.c" } -static void delete_tag_command_finalize (GObject * obj) { +static void +delete_tag_command_finalize (GObject * obj) +{ DeleteTagCommand * self; #line 1579 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DELETE_TAG_COMMAND, DeleteTagCommand); @@ -13766,11 +14402,13 @@ static void delete_tag_command_finalize (GObject * obj) { _g_object_unref0 (self->priv->recursive_victim_proxies); #line 1579 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (delete_tag_command_parent_class)->finalize (obj); -#line 13770 "Commands.c" +#line 14406 "Commands.c" } -GType delete_tag_command_get_type (void) { +GType +delete_tag_command_get_type (void) +{ static volatile gsize delete_tag_command_type_id__volatile = 0; if (g_once_init_enter (&delete_tag_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DeleteTagCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) delete_tag_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DeleteTagCommand), 0, (GInstanceInitFunc) delete_tag_command_instance_init, NULL }; @@ -13782,68 +14420,70 @@ GType delete_tag_command_get_type (void) { } -NewChildTagCommand* new_child_tag_command_construct (GType object_type, Tag* tag) { +NewChildTagCommand* +new_child_tag_command_construct (GType object_type, + Tag* tag) +{ NewChildTagCommand * self = NULL; - Tag* _tmp0_; - Tag* _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; + gchar* _tmp0_; + gchar* _tmp1_; #line 1636 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_TAG (tag), NULL); #line 1637 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = tag; -#line 1637 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = tag; -#line 1637 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (tag, TYPE_DATA_OBJECT, DataObject)); #line 1637 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 1637 "/home/jens/Source/shotwell/src/Commands.vala" - self = (NewChildTagCommand*) simple_proxyable_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PROXYABLE, Proxyable), _ ("Create Tag"), _tmp3_); + self = (NewChildTagCommand*) simple_proxyable_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (tag, TYPE_PROXYABLE, Proxyable), _ ("Create Tag"), _tmp1_); #line 1637 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp1_); #line 1636 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 13808 "Commands.c" +#line 14443 "Commands.c" } -NewChildTagCommand* new_child_tag_command_new (Tag* tag) { +NewChildTagCommand* +new_child_tag_command_new (Tag* tag) +{ #line 1636 "/home/jens/Source/shotwell/src/Commands.vala" return new_child_tag_command_construct (TYPE_NEW_CHILD_TAG_COMMAND, tag); -#line 13815 "Commands.c" +#line 14452 "Commands.c" } -static void new_child_tag_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source) { +static void +new_child_tag_command_real_execute_on_source (SimpleProxyableCommand* base, + DataSource* source) +{ NewChildTagCommand * self; Tag* tag = NULL; - DataSource* _tmp0_; + Tag* _tmp0_; Tag* _tmp1_; - Tag* _tmp2_; #line 1640 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NEW_CHILD_TAG_COMMAND, NewChildTagCommand); #line 1640 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 1641 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; -#line 1641 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TAG, Tag)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_TAG, Tag)); #line 1641 "/home/jens/Source/shotwell/src/Commands.vala" - tag = _tmp1_; + tag = _tmp0_; #line 1642 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = tag_create_new_child (tag); + _tmp1_ = tag_create_new_child (tag); #line 1642 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->created_child); #line 1642 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->created_child = _tmp2_; + self->priv->created_child = _tmp1_; #line 1640 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (tag); -#line 13843 "Commands.c" +#line 14480 "Commands.c" } -static void new_child_tag_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source) { +static void +new_child_tag_command_real_undo_on_source (SimpleProxyableCommand* base, + DataSource* source) +{ NewChildTagCommand * self; TagSourceCollection* _tmp0_; TagSourceCollection* _tmp1_; @@ -13868,11 +14508,13 @@ static void new_child_tag_command_real_undo_on_source (SimpleProxyableCommand* b source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp4_, TRUE, NULL, NULL, NULL); #line 1646 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_tmp4_); -#line 13872 "Commands.c" +#line 14512 "Commands.c" } -Tag* new_child_tag_command_get_created_child (NewChildTagCommand* self) { +Tag* +new_child_tag_command_get_created_child (NewChildTagCommand* self) +{ Tag* result = NULL; Tag* _tmp0_; Tag* _tmp1_; @@ -13891,11 +14533,13 @@ Tag* new_child_tag_command_get_created_child (NewChildTagCommand* self) { result = _tmp2_; #line 1652 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 13895 "Commands.c" +#line 14537 "Commands.c" } -static void new_child_tag_command_class_init (NewChildTagCommandClass * klass) { +static void +new_child_tag_command_class_init (NewChildTagCommandClass * klass) +{ #line 1633 "/home/jens/Source/shotwell/src/Commands.vala" new_child_tag_command_parent_class = g_type_class_peek_parent (klass); #line 1633 "/home/jens/Source/shotwell/src/Commands.vala" @@ -13906,20 +14550,24 @@ static void new_child_tag_command_class_init (NewChildTagCommandClass * klass) { ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) new_child_tag_command_real_undo_on_source; #line 1633 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = new_child_tag_command_finalize; -#line 13910 "Commands.c" +#line 14554 "Commands.c" } -static void new_child_tag_command_instance_init (NewChildTagCommand * self) { +static void +new_child_tag_command_instance_init (NewChildTagCommand * self) +{ #line 1633 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = NEW_CHILD_TAG_COMMAND_GET_PRIVATE (self); #line 1634 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->created_child = NULL; -#line 13919 "Commands.c" +#line 14565 "Commands.c" } -static void new_child_tag_command_finalize (GObject * obj) { +static void +new_child_tag_command_finalize (GObject * obj) +{ NewChildTagCommand * self; #line 1633 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NEW_CHILD_TAG_COMMAND, NewChildTagCommand); @@ -13927,11 +14575,13 @@ static void new_child_tag_command_finalize (GObject * obj) { _g_object_unref0 (self->priv->created_child); #line 1633 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (new_child_tag_command_parent_class)->finalize (obj); -#line 13931 "Commands.c" +#line 14579 "Commands.c" } -GType new_child_tag_command_get_type (void) { +GType +new_child_tag_command_get_type (void) +{ static volatile gsize new_child_tag_command_type_id__volatile = 0; if (g_once_init_enter (&new_child_tag_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (NewChildTagCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) new_child_tag_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NewChildTagCommand), 0, (GInstanceInitFunc) new_child_tag_command_instance_init, NULL }; @@ -13943,24 +14593,30 @@ GType new_child_tag_command_get_type (void) { } -NewRootTagCommand* new_root_tag_command_construct (GType object_type) { +NewRootTagCommand* +new_root_tag_command_construct (GType object_type) +{ NewRootTagCommand * self = NULL; #line 1660 "/home/jens/Source/shotwell/src/Commands.vala" self = (NewRootTagCommand*) page_command_construct (object_type, _ ("Create Tag"), ""); #line 1659 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 13953 "Commands.c" +#line 14605 "Commands.c" } -NewRootTagCommand* new_root_tag_command_new (void) { +NewRootTagCommand* +new_root_tag_command_new (void) +{ #line 1659 "/home/jens/Source/shotwell/src/Commands.vala" return new_root_tag_command_construct (TYPE_NEW_ROOT_TAG_COMMAND); -#line 13960 "Commands.c" +#line 14614 "Commands.c" } -static void new_root_tag_command_real_execute (Command* base) { +static void +new_root_tag_command_real_execute (Command* base) +{ NewRootTagCommand * self; SourceProxy* _tmp0_; #line 1663 "/home/jens/Source/shotwell/src/Commands.vala" @@ -13969,7 +14625,7 @@ static void new_root_tag_command_real_execute (Command* base) { _tmp0_ = self->priv->created_proxy; #line 1664 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp0_ == NULL) { -#line 13973 "Commands.c" +#line 14629 "Commands.c" Tag* _tmp1_; Tag* _tmp2_; SourceProxy* _tmp3_; @@ -13985,7 +14641,7 @@ static void new_root_tag_command_real_execute (Command* base) { self->priv->created_proxy = _tmp3_; #line 1665 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_tmp2_); -#line 13989 "Commands.c" +#line 14645 "Commands.c" } else { SourceProxy* _tmp4_; DataSource* _tmp5_; @@ -13998,12 +14654,14 @@ static void new_root_tag_command_real_execute (Command* base) { _tmp6_ = _tmp5_; #line 1667 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_tmp6_); -#line 14002 "Commands.c" +#line 14658 "Commands.c" } } -static void new_root_tag_command_real_undo (Command* base) { +static void +new_root_tag_command_real_undo (Command* base) +{ NewRootTagCommand * self; TagSourceCollection* _tmp0_; TagSourceCollection* _tmp1_; @@ -14034,11 +14692,13 @@ static void new_root_tag_command_real_undo (Command* base) { _g_object_unref0 (_tmp6_); #line 1671 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_tmp4_); -#line 14038 "Commands.c" +#line 14696 "Commands.c" } -Tag* new_root_tag_command_get_created_tag (NewRootTagCommand* self) { +Tag* +new_root_tag_command_get_created_tag (NewRootTagCommand* self) +{ Tag* result = NULL; SourceProxy* _tmp0_; DataSource* _tmp1_; @@ -14052,11 +14712,13 @@ Tag* new_root_tag_command_get_created_tag (NewRootTagCommand* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TAG, Tag); #line 1675 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 14056 "Commands.c" +#line 14716 "Commands.c" } -static void new_root_tag_command_class_init (NewRootTagCommandClass * klass) { +static void +new_root_tag_command_class_init (NewRootTagCommandClass * klass) +{ #line 1656 "/home/jens/Source/shotwell/src/Commands.vala" new_root_tag_command_parent_class = g_type_class_peek_parent (klass); #line 1656 "/home/jens/Source/shotwell/src/Commands.vala" @@ -14067,20 +14729,24 @@ static void new_root_tag_command_class_init (NewRootTagCommandClass * klass) { ((CommandClass *) klass)->undo = (void (*) (Command *)) new_root_tag_command_real_undo; #line 1656 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = new_root_tag_command_finalize; -#line 14071 "Commands.c" +#line 14733 "Commands.c" } -static void new_root_tag_command_instance_init (NewRootTagCommand * self) { +static void +new_root_tag_command_instance_init (NewRootTagCommand * self) +{ #line 1656 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = NEW_ROOT_TAG_COMMAND_GET_PRIVATE (self); #line 1657 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->created_proxy = NULL; -#line 14080 "Commands.c" +#line 14744 "Commands.c" } -static void new_root_tag_command_finalize (GObject * obj) { +static void +new_root_tag_command_finalize (GObject * obj) +{ NewRootTagCommand * self; #line 1656 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NEW_ROOT_TAG_COMMAND, NewRootTagCommand); @@ -14088,11 +14754,13 @@ static void new_root_tag_command_finalize (GObject * obj) { _source_proxy_unref0 (self->priv->created_proxy); #line 1656 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (new_root_tag_command_parent_class)->finalize (obj); -#line 14092 "Commands.c" +#line 14758 "Commands.c" } -GType new_root_tag_command_get_type (void) { +GType +new_root_tag_command_get_type (void) +{ static volatile gsize new_root_tag_command_type_id__volatile = 0; if (g_once_init_enter (&new_root_tag_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (NewRootTagCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) new_root_tag_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NewRootTagCommand), 0, (GInstanceInitFunc) new_root_tag_command_instance_init, NULL }; @@ -14104,746 +14772,701 @@ GType new_root_tag_command_get_type (void) { } -static void _reparent_tag_command_on_items_destroyed_source_collection_items_destroyed (SourceCollection* _sender, GeeCollection* destroyed, gpointer self) { +static void +_reparent_tag_command_on_items_destroyed_source_collection_items_destroyed (SourceCollection* _sender, + GeeCollection* destroyed, + gpointer self) +{ #line 1724 "/home/jens/Source/shotwell/src/Commands.vala" reparent_tag_command_on_items_destroyed ((ReparentTagCommand*) self, destroyed); -#line 14111 "Commands.c" +#line 14783 "Commands.c" } -ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag, const gchar* new_parent_path) { +ReparentTagCommand* +reparent_tag_command_construct (GType object_type, + Tag* tag, + const gchar* new_parent_path) +{ ReparentTagCommand * self = NULL; - Tag* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; gchar* _tmp4_; - Tag* _tmp5_; - gchar* _tmp6_; gboolean has_children = FALSE; - Tag* _tmp7_; - GeeList* _tmp8_; - GeeList* _tmp9_; - gint _tmp10_; - gint _tmp11_; - gboolean _tmp12_; + GeeList* _tmp5_; + GeeList* _tmp6_; + gint _tmp7_; + gint _tmp8_; + gboolean _tmp9_; gchar* basename = NULL; - Tag* _tmp13_; - gchar* _tmp14_; - const gchar* _tmp15_; + gchar* _tmp10_; gchar* new_to_path = NULL; - const gchar* _tmp37_; - gchar* _tmp38_; - const gchar* _tmp39_; - TagSourceCollection* _tmp42_; - const gchar* _tmp43_; - gboolean _tmp44_; - GeeHashSet* _tmp45_; - Tag* _tmp46_; - GeeCollection* _tmp47_; - GeeCollection* _tmp48_; - LibraryPhotoSourceCollection* _tmp49_; - VideoSourceCollection* _tmp50_; + const gchar* _tmp28_; + gchar* _tmp29_; + const gchar* _tmp30_; + TagSourceCollection* _tmp33_; + const gchar* _tmp34_; + GeeHashSet* _tmp35_; + GeeCollection* _tmp36_; + GeeCollection* _tmp37_; + LibraryPhotoSourceCollection* _tmp38_; + VideoSourceCollection* _tmp39_; #line 1694 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_TAG (tag), NULL); #line 1694 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (new_parent_path != NULL, NULL); #line 1695 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = tag; -#line 1695 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = tag_get_user_visible_name (_tmp0_); + _tmp0_ = tag_get_user_visible_name (tag); #line 1695 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 1695 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = g_strdup_printf (_ ("Move Tag “%s”"), _tmp2_); + _tmp2_ = g_strdup_printf (_ ("Move Tag “%s”"), _tmp1_); #line 1695 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 1695 "/home/jens/Source/shotwell/src/Commands.vala" - self = (ReparentTagCommand*) page_command_construct (object_type, _tmp4_, ""); + self = (ReparentTagCommand*) page_command_construct (object_type, _tmp3_, ""); #line 1695 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 1695 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 1697 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = tag; -#line 1697 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = tag_get_path (_tmp5_); + _tmp4_ = tag_get_path (tag); #line 1697 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->from_path); #line 1697 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->from_path = _tmp6_; -#line 1699 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = tag; + self->priv->from_path = _tmp4_; #line 1699 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = tag_get_hierarchical_children (_tmp7_); + _tmp5_ = tag_get_hierarchical_children (tag); #line 1699 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 1699 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1699 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 1699 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = _tmp11_ > 0; + _tmp9_ = _tmp8_ > 0; #line 1699 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp6_); #line 1699 "/home/jens/Source/shotwell/src/Commands.vala" - has_children = _tmp12_; + has_children = _tmp9_; #line 1700 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = tag; + _tmp10_ = tag_get_user_visible_name (tag); #line 1700 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = tag_get_user_visible_name (_tmp13_); -#line 1700 "/home/jens/Source/shotwell/src/Commands.vala" - basename = _tmp14_; -#line 1702 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = new_parent_path; + basename = _tmp10_; #line 1702 "/home/jens/Source/shotwell/src/Commands.vala" - if (g_strcmp0 (_tmp15_, TAG_PATH_SEPARATOR_STRING) == 0) { -#line 14202 "Commands.c" - gchar* _tmp16_ = NULL; - gboolean _tmp17_; - gchar* _tmp22_; + if (g_strcmp0 (new_parent_path, TAG_PATH_SEPARATOR_STRING) == 0) { +#line 14861 "Commands.c" + gchar* _tmp11_ = NULL; + gboolean _tmp12_; + gchar* _tmp17_; #line 1703 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = has_children; + _tmp12_ = has_children; #line 1703 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp17_) { -#line 14210 "Commands.c" - const gchar* _tmp18_; - gchar* _tmp19_; + if (_tmp12_) { +#line 14869 "Commands.c" + const gchar* _tmp13_; + gchar* _tmp14_; #line 1703 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = basename; + _tmp13_ = basename; #line 1703 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp18_, NULL); + _tmp14_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp13_, NULL); #line 1703 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp11_); #line 1703 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = _tmp19_; -#line 14221 "Commands.c" + _tmp11_ = _tmp14_; +#line 14880 "Commands.c" } else { - const gchar* _tmp20_; - gchar* _tmp21_; + const gchar* _tmp15_; + gchar* _tmp16_; #line 1703 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = basename; + _tmp15_ = basename; #line 1703 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = g_strdup (_tmp20_); + _tmp16_ = g_strdup (_tmp15_); #line 1703 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp11_); #line 1703 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = _tmp21_; -#line 14233 "Commands.c" + _tmp11_ = _tmp16_; +#line 14892 "Commands.c" } #line 1703 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = g_strdup (_tmp16_); + _tmp17_ = g_strdup (_tmp11_); #line 1703 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->to_path); #line 1703 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->to_path = _tmp22_; + self->priv->to_path = _tmp17_; #line 1702 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp16_); -#line 14243 "Commands.c" + _g_free0 (_tmp11_); +#line 14902 "Commands.c" } else { - const gchar* _tmp23_; - gboolean _tmp24_; #line 1704 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = new_parent_path; -#line 1704 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = g_str_has_prefix (_tmp23_, TAG_PATH_SEPARATOR_STRING); -#line 1704 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp24_) { -#line 14253 "Commands.c" - const gchar* _tmp25_; - gchar* _tmp26_; - gchar* _tmp27_; - const gchar* _tmp28_; - gchar* _tmp29_; -#line 1705 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = new_parent_path; + if (g_str_has_prefix (new_parent_path, TAG_PATH_SEPARATOR_STRING)) { +#line 14906 "Commands.c" + gchar* _tmp18_; + gchar* _tmp19_; + const gchar* _tmp20_; + gchar* _tmp21_; #line 1705 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = g_strconcat (_tmp25_, TAG_PATH_SEPARATOR_STRING, NULL); + _tmp18_ = g_strconcat (new_parent_path, TAG_PATH_SEPARATOR_STRING, NULL); #line 1705 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = _tmp26_; + _tmp19_ = _tmp18_; #line 1705 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp28_ = basename; + _tmp20_ = basename; #line 1705 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp29_ = g_strconcat (_tmp27_, _tmp28_, NULL); + _tmp21_ = g_strconcat (_tmp19_, _tmp20_, NULL); #line 1705 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->to_path); #line 1705 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->to_path = _tmp29_; + self->priv->to_path = _tmp21_; #line 1705 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp27_); -#line 14275 "Commands.c" + _g_free0 (_tmp19_); +#line 14925 "Commands.c" } else { - const gchar* _tmp30_; - gchar* _tmp31_; - gchar* _tmp32_; - gchar* _tmp33_; - gchar* _tmp34_; - const gchar* _tmp35_; - gchar* _tmp36_; -#line 1707 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp30_ = new_parent_path; + gchar* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; + const gchar* _tmp26_; + gchar* _tmp27_; #line 1707 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp31_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp30_, NULL); + _tmp22_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, new_parent_path, NULL); #line 1707 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp32_ = _tmp31_; + _tmp23_ = _tmp22_; #line 1707 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp33_ = g_strconcat (_tmp32_, TAG_PATH_SEPARATOR_STRING, NULL); + _tmp24_ = g_strconcat (_tmp23_, TAG_PATH_SEPARATOR_STRING, NULL); #line 1707 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp34_ = _tmp33_; + _tmp25_ = _tmp24_; #line 1707 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp35_ = basename; + _tmp26_ = basename; #line 1707 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp36_ = g_strconcat (_tmp34_, _tmp35_, NULL); + _tmp27_ = g_strconcat (_tmp25_, _tmp26_, NULL); #line 1707 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->to_path); #line 1707 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->to_path = _tmp36_; + self->priv->to_path = _tmp27_; #line 1707 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp34_); + _g_free0 (_tmp25_); #line 1707 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp32_); -#line 14306 "Commands.c" + _g_free0 (_tmp23_); +#line 14953 "Commands.c" } } #line 1710 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp37_ = self->priv->to_path; + _tmp28_ = self->priv->to_path; #line 1710 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp38_ = hierarchical_tag_utilities_get_root_path_form (_tmp37_); + _tmp29_ = hierarchical_tag_utilities_get_root_path_form (_tmp28_); #line 1710 "/home/jens/Source/shotwell/src/Commands.vala" - new_to_path = _tmp38_; + new_to_path = _tmp29_; #line 1711 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp39_ = new_to_path; + _tmp30_ = new_to_path; #line 1711 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp39_ != NULL) { -#line 14319 "Commands.c" - const gchar* _tmp40_; - gchar* _tmp41_; + if (_tmp30_ != NULL) { +#line 14966 "Commands.c" + const gchar* _tmp31_; + gchar* _tmp32_; #line 1712 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp40_ = new_to_path; + _tmp31_ = new_to_path; #line 1712 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp41_ = g_strdup (_tmp40_); + _tmp32_ = g_strdup (_tmp31_); #line 1712 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->to_path); #line 1712 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->to_path = _tmp41_; -#line 14330 "Commands.c" + self->priv->to_path = _tmp32_; +#line 14977 "Commands.c" } #line 1714 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp42_ = tag_global; -#line 1714 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp43_ = self->priv->to_path; + _tmp33_ = tag_global; #line 1714 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp44_ = tag_source_collection_exists (_tmp42_, _tmp43_, FALSE); + _tmp34_ = self->priv->to_path; #line 1714 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp44_) { + if (tag_source_collection_exists (_tmp33_, _tmp34_, FALSE)) { #line 1715 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->to_path_exists = TRUE; -#line 14342 "Commands.c" +#line 14987 "Commands.c" } #line 1717 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp45_ = self->priv->sources_in_play; + _tmp35_ = self->priv->sources_in_play; #line 1717 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp46_ = tag; + _tmp36_ = tag_get_sources (tag); #line 1717 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp47_ = tag_get_sources (_tmp46_); + _tmp37_ = _tmp36_; #line 1717 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp48_ = _tmp47_; + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_); #line 1717 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_COLLECTION, GeeCollection), _tmp48_); -#line 1717 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp48_); + _g_object_unref0 (_tmp37_); #line 1719 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp49_ = library_photo_global; + _tmp38_ = library_photo_global; #line 1719 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-destroyed", (GCallback) _reparent_tag_command_on_items_destroyed_source_collection_items_destroyed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-destroyed", (GCallback) _reparent_tag_command_on_items_destroyed_source_collection_items_destroyed, self, 0); #line 1720 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp50_ = video_global; + _tmp39_ = video_global; #line 1720 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-destroyed", (GCallback) _reparent_tag_command_on_items_destroyed_source_collection_items_destroyed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-destroyed", (GCallback) _reparent_tag_command_on_items_destroyed_source_collection_items_destroyed, self, 0); #line 1694 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (new_to_path); #line 1694 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (basename); #line 1694 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 14370 "Commands.c" +#line 15013 "Commands.c" } -ReparentTagCommand* reparent_tag_command_new (Tag* tag, const gchar* new_parent_path) { +ReparentTagCommand* +reparent_tag_command_new (Tag* tag, + const gchar* new_parent_path) +{ #line 1694 "/home/jens/Source/shotwell/src/Commands.vala" return reparent_tag_command_construct (TYPE_REPARENT_TAG_COMMAND, tag, new_parent_path); -#line 14377 "Commands.c" +#line 15023 "Commands.c" } -static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, GeeCollection* destroyed) { +static void +reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, + GeeCollection* destroyed) +{ #line 1728 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_REPARENT_TAG_COMMAND (self)); #line 1728 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (GEE_IS_COLLECTION (destroyed)); -#line 14386 "Commands.c" +#line 15035 "Commands.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 1729 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = destroyed; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (destroyed, GEE_TYPE_ITERABLE, GeeIterable)); #line 1729 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1729 "/home/jens/Source/shotwell/src/Commands.vala" - _source_it = _tmp1_; + _source_it = _tmp0_; #line 1729 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 14399 "Commands.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 15045 "Commands.c" + GeeIterator* _tmp1_; DataSource* source = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - GeeHashSet* _tmp6_; - DataSource* _tmp7_; - gboolean _tmp8_; -#line 1729 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _source_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + GeeHashSet* _tmp4_; + DataSource* _tmp5_; #line 1729 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _source_it; #line 1729 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 1729 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 14416 "Commands.c" +#line 15058 "Commands.c" } #line 1729 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _source_it; + _tmp2_ = _source_it; #line 1729 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 1729 "/home/jens/Source/shotwell/src/Commands.vala" - source = (DataSource*) _tmp5_; + source = (DataSource*) _tmp3_; #line 1730 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = self->priv->sources_in_play; + _tmp4_ = self->priv->sources_in_play; #line 1730 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = source; -#line 1730 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp5_ = source; #line 1730 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp8_) { -#line 14432 "Commands.c" - CommandManager* _tmp9_; - CommandManager* _tmp10_; + if (gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource))) { +#line 15072 "Commands.c" + CommandManager* _tmp6_; + CommandManager* _tmp7_; #line 1731 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command)); + _tmp6_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command)); #line 1731 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = _tmp9_; + _tmp7_ = _tmp6_; #line 1731 "/home/jens/Source/shotwell/src/Commands.vala" - command_manager_reset (_tmp10_); + command_manager_reset (_tmp7_); #line 1731 "/home/jens/Source/shotwell/src/Commands.vala" - _command_manager_unref0 (_tmp10_); -#line 14443 "Commands.c" + _command_manager_unref0 (_tmp7_); +#line 15083 "Commands.c" } #line 1729 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); -#line 14447 "Commands.c" +#line 15087 "Commands.c" } #line 1729 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_it); -#line 14451 "Commands.c" +#line 15091 "Commands.c" } } -static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { +static gchar* +string_replace (const gchar* self, + const gchar* old, + const gchar* replacement) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if ((*((gchar*) self)) == '\0') { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 14471 "Commands.c" +#line 15115 "Commands.c" } else { - const gchar* _tmp2_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; -#line 14478 "Commands.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) old)) == '\0'; +#line 15119 "Commands.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = TRUE; -#line 14484 "Commands.c" +#line 15125 "Commands.c" } else { - const gchar* _tmp3_; - const gchar* _tmp4_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = replacement; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; -#line 14494 "Commands.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (old, replacement) == 0; +#line 15129 "Commands.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 14498 "Commands.c" - gchar* _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = g_strdup (self); -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 15133 "Commands.c" + gchar* _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = g_strdup (self); +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 14506 "Commands.c" +#line 15141 "Commands.c" } { GRegex* regex = NULL; - const gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - GRegex* _tmp9_; - GRegex* _tmp10_; - gchar* _tmp11_ = NULL; - GRegex* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = old; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = g_regex_escape_string (_tmp6_, -1); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = _tmp9_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp8_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - regex = _tmp10_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp3_; + gchar* _tmp4_; + GRegex* _tmp5_; + GRegex* _tmp6_; + gchar* _tmp7_ = NULL; + GRegex* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_regex_escape_string (old, -1); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = _tmp3_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp5_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp4_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + regex = _tmp6_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 14538 "Commands.c" +#line 15169 "Commands.c" goto __catch469_g_regex_error; } -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 14547 "Commands.c" +#line 15178 "Commands.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = regex; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = replacement; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp14_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = regex; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp9_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 14563 "Commands.c" +#line 15192 "Commands.c" goto __catch469_g_regex_error; } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 14574 "Commands.c" +#line 15203 "Commands.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = _tmp11_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = NULL; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp15_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp11_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = _tmp7_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = NULL; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp10_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp7_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 14588 "Commands.c" +#line 15217 "Commands.c" } goto __finally469; __catch469_g_regex_error: { GError* e = NULL; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 14602 "Commands.c" +#line 15231 "Commands.c" } __finally469: -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 14613 "Commands.c" +#line 15242 "Commands.c" } } -static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand* self, const gchar* client_path) { +static GeeMap* +reparent_tag_command_get_child_structure_at (ReparentTagCommand* self, + const gchar* client_path) +{ GeeMap* result = NULL; gchar* path = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_; - gchar* _tmp6_; + gchar* _tmp0_; + const gchar* _tmp1_ = NULL; + const gchar* _tmp2_; + gchar* _tmp4_; GeeMap* _result_ = NULL; - GeeHashMap* _tmp7_; - TagSourceCollection* _tmp8_; - const gchar* _tmp9_; - gboolean _tmp10_; + GeeHashMap* _tmp5_; + TagSourceCollection* _tmp6_; + const gchar* _tmp7_; Tag* tag = NULL; - const gchar* _tmp11_; - Tag* _tmp12_; + const gchar* _tmp8_; + Tag* _tmp9_; gchar* path_prefix = NULL; - Tag* _tmp13_; + Tag* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; gchar* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; #line 1735 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_REPARENT_TAG_COMMAND (self), NULL); #line 1735 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (client_path != NULL, NULL); #line 1736 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = client_path; -#line 1736 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = hierarchical_tag_utilities_get_root_path_form (_tmp0_); + _tmp0_ = hierarchical_tag_utilities_get_root_path_form (client_path); #line 1736 "/home/jens/Source/shotwell/src/Commands.vala" - path = _tmp1_; + path = _tmp0_; #line 1737 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = path; + _tmp2_ = path; #line 1737 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp3_ != NULL) { -#line 14654 "Commands.c" - const gchar* _tmp4_; + if (_tmp2_ != NULL) { +#line 15282 "Commands.c" + const gchar* _tmp3_; #line 1737 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = path; + _tmp3_ = path; #line 1737 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _tmp4_; -#line 14660 "Commands.c" + _tmp1_ = _tmp3_; +#line 15288 "Commands.c" } else { - const gchar* _tmp5_; -#line 1737 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = client_path; #line 1737 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _tmp5_; -#line 14667 "Commands.c" + _tmp1_ = client_path; +#line 15292 "Commands.c" } #line 1737 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = g_strdup (_tmp2_); + _tmp4_ = g_strdup (_tmp1_); #line 1737 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (path); #line 1737 "/home/jens/Source/shotwell/src/Commands.vala" - path = _tmp6_; + path = _tmp4_; #line 1739 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp5_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 1739 "/home/jens/Source/shotwell/src/Commands.vala" - _result_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_MAP, GeeMap); + _result_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_MAP, GeeMap); #line 1742 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = tag_global; + _tmp6_ = tag_global; #line 1742 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = path; + _tmp7_ = path; #line 1742 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = tag_source_collection_exists (_tmp8_, _tmp9_, FALSE); -#line 1742 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp10_) { + if (!tag_source_collection_exists (_tmp6_, _tmp7_, FALSE)) { #line 1743 "/home/jens/Source/shotwell/src/Commands.vala" result = _result_; #line 1743 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (path); #line 1743 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 14693 "Commands.c" +#line 15316 "Commands.c" } #line 1745 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = path; + _tmp8_ = path; #line 1745 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = tag_for_path (_tmp11_); + _tmp9_ = tag_for_path (_tmp8_); #line 1745 "/home/jens/Source/shotwell/src/Commands.vala" - tag = _tmp12_; + tag = _tmp9_; #line 1747 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = tag; + _tmp10_ = tag; #line 1747 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = tag_get_path (_tmp13_); + _tmp11_ = tag_get_path (_tmp10_); #line 1747 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = _tmp14_; + _tmp12_ = _tmp11_; #line 1747 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = g_strconcat (_tmp15_, TAG_PATH_SEPARATOR_STRING, NULL); + _tmp13_ = g_strconcat (_tmp12_, TAG_PATH_SEPARATOR_STRING, NULL); #line 1747 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = _tmp16_; + _tmp14_ = _tmp13_; #line 1747 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp12_); #line 1747 "/home/jens/Source/shotwell/src/Commands.vala" - path_prefix = _tmp17_; -#line 14715 "Commands.c" + path_prefix = _tmp14_; +#line 15338 "Commands.c" { GeeList* _t_list = NULL; - Tag* _tmp18_; - GeeList* _tmp19_; + Tag* _tmp15_; + GeeList* _tmp16_; gint _t_size = 0; - GeeList* _tmp20_; - gint _tmp21_; - gint _tmp22_; + GeeList* _tmp17_; + gint _tmp18_; + gint _tmp19_; gint _t_index = 0; #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = tag; + _tmp15_ = tag; #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = tag_get_hierarchical_children (_tmp18_); + _tmp16_ = tag_get_hierarchical_children (_tmp15_); #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" - _t_list = _tmp19_; + _t_list = _tmp16_; #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = _t_list; + _tmp17_ = _t_list; #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = _tmp21_; + _tmp19_ = _tmp18_; #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" - _t_size = _tmp22_; + _t_size = _tmp19_; #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" _t_index = -1; #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 14743 "Commands.c" - gint _tmp23_; - gint _tmp24_; - gint _tmp25_; +#line 15366 "Commands.c" + gint _tmp20_; + gint _tmp21_; + gint _tmp22_; Tag* t = NULL; - GeeList* _tmp26_; - gint _tmp27_; - gpointer _tmp28_; + GeeList* _tmp23_; + gint _tmp24_; + gpointer _tmp25_; gchar* child_subpath = NULL; - Tag* _tmp29_; + Tag* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + const gchar* _tmp29_; gchar* _tmp30_; gchar* _tmp31_; - const gchar* _tmp32_; - gchar* _tmp33_; - gchar* _tmp34_; - GeeMap* _tmp35_; - const gchar* _tmp36_; - GeeHashSet* _tmp37_; - GeeHashSet* _tmp38_; - GeeMap* _tmp39_; - const gchar* _tmp40_; - gpointer _tmp41_; - GeeSet* _tmp42_; - Tag* _tmp43_; - GeeCollection* _tmp44_; - GeeCollection* _tmp45_; + GeeMap* _tmp32_; + const gchar* _tmp33_; + GeeHashSet* _tmp34_; + GeeHashSet* _tmp35_; + GeeMap* _tmp36_; + const gchar* _tmp37_; + gpointer _tmp38_; + GeeSet* _tmp39_; + Tag* _tmp40_; + GeeCollection* _tmp41_; + GeeCollection* _tmp42_; #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = _t_index; + _tmp20_ = _t_index; #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" - _t_index = _tmp23_ + 1; + _t_index = _tmp20_ + 1; #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = _t_index; + _tmp21_ = _t_index; #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = _t_size; + _tmp22_ = _t_size; #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp24_ < _tmp25_)) { + if (!(_tmp21_ < _tmp22_)) { #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 14781 "Commands.c" +#line 15404 "Commands.c" } #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = _t_list; + _tmp23_ = _t_list; #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = _t_index; + _tmp24_ = _t_index; #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp28_ = gee_list_get (_tmp26_, _tmp27_); + _tmp25_ = gee_list_get (_tmp23_, _tmp24_); #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" - t = (Tag*) _tmp28_; + t = (Tag*) _tmp25_; #line 1749 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp29_ = t; + _tmp26_ = t; #line 1749 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp30_ = tag_get_path (_tmp29_); + _tmp27_ = tag_get_path (_tmp26_); #line 1749 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp31_ = _tmp30_; + _tmp28_ = _tmp27_; #line 1749 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp32_ = path_prefix; + _tmp29_ = path_prefix; #line 1749 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp33_ = string_replace (_tmp31_, _tmp32_, ""); + _tmp30_ = string_replace (_tmp28_, _tmp29_, ""); #line 1749 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp34_ = _tmp33_; + _tmp31_ = _tmp30_; #line 1749 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp31_); + _g_free0 (_tmp28_); #line 1749 "/home/jens/Source/shotwell/src/Commands.vala" - child_subpath = _tmp34_; + child_subpath = _tmp31_; #line 1751 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp35_ = _result_; + _tmp32_ = _result_; #line 1751 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp36_ = child_subpath; + _tmp33_ = child_subpath; #line 1751 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp37_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp34_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 1751 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp38_ = _tmp37_; + _tmp35_ = _tmp34_; #line 1751 "/home/jens/Source/shotwell/src/Commands.vala" - gee_map_set (_tmp35_, _tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_SET, GeeSet)); + gee_map_set (_tmp32_, _tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_SET, GeeSet)); #line 1751 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp38_); -#line 1752 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp39_ = _result_; + _g_object_unref0 (_tmp35_); #line 1752 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp40_ = child_subpath; + _tmp36_ = _result_; #line 1752 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp41_ = gee_map_get (_tmp39_, _tmp40_); + _tmp37_ = child_subpath; #line 1752 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp42_ = (GeeSet*) _tmp41_; + _tmp38_ = gee_map_get (_tmp36_, _tmp37_); #line 1752 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp43_ = t; + _tmp39_ = (GeeSet*) _tmp38_; #line 1752 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp44_ = tag_get_sources (_tmp43_); + _tmp40_ = t; #line 1752 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp45_ = _tmp44_; + _tmp41_ = tag_get_sources (_tmp40_); #line 1752 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection), _tmp45_); + _tmp42_ = _tmp41_; #line 1752 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp45_); + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection), _tmp42_); #line 1752 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_tmp42_); +#line 1752 "/home/jens/Source/shotwell/src/Commands.vala" + _g_object_unref0 (_tmp39_); #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (child_subpath); #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (t); -#line 14843 "Commands.c" +#line 15466 "Commands.c" } #line 1748 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_t_list); -#line 14847 "Commands.c" +#line 15470 "Commands.c" } #line 1755 "/home/jens/Source/shotwell/src/Commands.vala" result = _result_; @@ -14855,24 +15478,26 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand* _g_free0 (path); #line 1755 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 14859 "Commands.c" +#line 15482 "Commands.c" } -static void reparent_tag_command_restore_child_attachments_at (ReparentTagCommand* self, const gchar* client_path, GeeMap* child_structure) { +static void +reparent_tag_command_restore_child_attachments_at (ReparentTagCommand* self, + const gchar* client_path, + GeeMap* child_structure) +{ gchar* new_path = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_; + gchar* _tmp0_; + const gchar* _tmp1_ = NULL; + const gchar* _tmp2_; gchar* path = NULL; - gchar* _tmp6_; - TagSourceCollection* _tmp7_; - const gchar* _tmp8_; - gboolean _tmp9_; + gchar* _tmp4_; + TagSourceCollection* _tmp5_; + const gchar* _tmp6_; Tag* tag = NULL; - const gchar* _tmp10_; - Tag* _tmp11_; + const gchar* _tmp7_; + Tag* _tmp8_; #line 1758 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_REPARENT_TAG_COMMAND (self)); #line 1758 "/home/jens/Source/shotwell/src/Commands.vala" @@ -14880,277 +15505,252 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman #line 1758 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (GEE_IS_MAP (child_structure)); #line 1761 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = client_path; + _tmp0_ = hierarchical_tag_utilities_get_root_path_form (client_path); #line 1761 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = hierarchical_tag_utilities_get_root_path_form (_tmp0_); -#line 1761 "/home/jens/Source/shotwell/src/Commands.vala" - new_path = _tmp1_; + new_path = _tmp0_; #line 1762 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = new_path; + _tmp2_ = new_path; #line 1762 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp3_ != NULL) { -#line 14893 "Commands.c" - const gchar* _tmp4_; + if (_tmp2_ != NULL) { +#line 15516 "Commands.c" + const gchar* _tmp3_; #line 1762 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = new_path; + _tmp3_ = new_path; #line 1762 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _tmp4_; -#line 14899 "Commands.c" + _tmp1_ = _tmp3_; +#line 15522 "Commands.c" } else { - const gchar* _tmp5_; -#line 1762 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = client_path; #line 1762 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _tmp5_; -#line 14906 "Commands.c" + _tmp1_ = client_path; +#line 15526 "Commands.c" } #line 1762 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = g_strdup (_tmp2_); + _tmp4_ = g_strdup (_tmp1_); #line 1762 "/home/jens/Source/shotwell/src/Commands.vala" - path = _tmp6_; -#line 1764 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = tag_global; + path = _tmp4_; #line 1764 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = path; + _tmp5_ = tag_global; #line 1764 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = tag_source_collection_exists (_tmp7_, _tmp8_, FALSE); + _tmp6_ = path; #line 1764 "/home/jens/Source/shotwell/src/Commands.vala" - _vala_assert (_tmp9_, "Tag.global.exists(path)"); + _vala_assert (tag_source_collection_exists (_tmp5_, _tmp6_, FALSE), "Tag.global.exists(path)"); #line 1765 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = path; + _tmp7_ = path; #line 1765 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = tag_for_path (_tmp10_); + _tmp8_ = tag_for_path (_tmp7_); #line 1765 "/home/jens/Source/shotwell/src/Commands.vala" - tag = _tmp11_; -#line 14926 "Commands.c" + tag = _tmp8_; +#line 15544 "Commands.c" { GeeIterator* _child_subpath_it = NULL; - GeeMap* _tmp12_; - GeeSet* _tmp13_; - GeeSet* _tmp14_; - GeeSet* _tmp15_; - GeeIterator* _tmp16_; - GeeIterator* _tmp17_; -#line 1767 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = child_structure; + GeeSet* _tmp9_; + GeeSet* _tmp10_; + GeeSet* _tmp11_; + GeeIterator* _tmp12_; + GeeIterator* _tmp13_; #line 1767 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = gee_map_get_keys (_tmp12_); + _tmp9_ = gee_map_get_keys (child_structure); #line 1767 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = _tmp13_; + _tmp10_ = _tmp9_; #line 1767 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = _tmp14_; + _tmp11_ = _tmp10_; #line 1767 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1767 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = _tmp16_; + _tmp13_ = _tmp12_; #line 1767 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp11_); #line 1767 "/home/jens/Source/shotwell/src/Commands.vala" - _child_subpath_it = _tmp17_; + _child_subpath_it = _tmp13_; #line 1767 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 14953 "Commands.c" - GeeIterator* _tmp18_; - gboolean _tmp19_; +#line 15568 "Commands.c" + GeeIterator* _tmp14_; gchar* child_subpath = NULL; - GeeIterator* _tmp20_; - gpointer _tmp21_; + GeeIterator* _tmp15_; + gpointer _tmp16_; gchar* child_path = NULL; - Tag* _tmp22_; + Tag* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; + const gchar* _tmp22_; gchar* _tmp23_; gchar* _tmp24_; - gchar* _tmp25_; + Tag* _tmp25_; gchar* _tmp26_; - const gchar* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; - Tag* _tmp30_; - gchar* _tmp31_; - gchar* _tmp32_; - gboolean _tmp33_; - gboolean _tmp34_; - TagSourceCollection* _tmp43_; - const gchar* _tmp44_; - gboolean _tmp45_; -#line 1767 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = _child_subpath_it; + gchar* _tmp27_; + gboolean _tmp28_; + TagSourceCollection* _tmp37_; + const gchar* _tmp38_; #line 1767 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = gee_iterator_next (_tmp18_); + _tmp14_ = _child_subpath_it; #line 1767 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp19_) { + if (!gee_iterator_next (_tmp14_)) { #line 1767 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 14984 "Commands.c" +#line 15594 "Commands.c" } #line 1767 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = _child_subpath_it; + _tmp15_ = _child_subpath_it; #line 1767 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = gee_iterator_get (_tmp20_); + _tmp16_ = gee_iterator_get (_tmp15_); #line 1767 "/home/jens/Source/shotwell/src/Commands.vala" - child_subpath = (gchar*) _tmp21_; + child_subpath = (gchar*) _tmp16_; #line 1768 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = tag; + _tmp17_ = tag; #line 1768 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = tag_get_path (_tmp22_); + _tmp18_ = tag_get_path (_tmp17_); #line 1768 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = _tmp23_; + _tmp19_ = _tmp18_; #line 1768 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = g_strconcat (_tmp24_, TAG_PATH_SEPARATOR_STRING, NULL); + _tmp20_ = g_strconcat (_tmp19_, TAG_PATH_SEPARATOR_STRING, NULL); #line 1768 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = _tmp25_; + _tmp21_ = _tmp20_; #line 1768 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = child_subpath; + _tmp22_ = child_subpath; #line 1768 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp28_ = g_strconcat (_tmp26_, _tmp27_, NULL); + _tmp23_ = g_strconcat (_tmp21_, _tmp22_, NULL); #line 1768 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp29_ = _tmp28_; + _tmp24_ = _tmp23_; #line 1768 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp21_); #line 1768 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp24_); + _g_free0 (_tmp19_); #line 1768 "/home/jens/Source/shotwell/src/Commands.vala" - child_path = _tmp29_; -#line 1770 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp30_ = tag; + child_path = _tmp24_; #line 1770 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp31_ = tag_get_path (_tmp30_); + _tmp25_ = tag; #line 1770 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp32_ = _tmp31_; + _tmp26_ = tag_get_path (_tmp25_); #line 1770 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp33_ = g_str_has_prefix (_tmp32_, TAG_PATH_SEPARATOR_STRING); + _tmp27_ = _tmp26_; #line 1770 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp34_ = !_tmp33_; + _tmp28_ = !g_str_has_prefix (_tmp27_, TAG_PATH_SEPARATOR_STRING); #line 1770 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp32_); + _g_free0 (_tmp27_); #line 1770 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp34_) { -#line 15028 "Commands.c" - Tag* _tmp35_; - Tag* _tmp36_; - gchar* _tmp37_; - gchar* _tmp38_; - gchar* _tmp39_; - gchar* _tmp40_; - const gchar* _tmp41_; - gchar* _tmp42_; + if (_tmp28_) { +#line 15636 "Commands.c" + Tag* _tmp29_; + Tag* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; + gchar* _tmp34_; + const gchar* _tmp35_; + gchar* _tmp36_; #line 1771 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp35_ = tag; + _tmp29_ = tag; #line 1771 "/home/jens/Source/shotwell/src/Commands.vala" - tag_promote (_tmp35_); + tag_promote (_tmp29_); #line 1772 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp36_ = tag; + _tmp30_ = tag; #line 1772 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp37_ = tag_get_path (_tmp36_); + _tmp31_ = tag_get_path (_tmp30_); #line 1772 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp38_ = _tmp37_; + _tmp32_ = _tmp31_; #line 1772 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp39_ = g_strconcat (_tmp38_, TAG_PATH_SEPARATOR_STRING, NULL); + _tmp33_ = g_strconcat (_tmp32_, TAG_PATH_SEPARATOR_STRING, NULL); #line 1772 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp40_ = _tmp39_; + _tmp34_ = _tmp33_; #line 1772 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp41_ = child_subpath; + _tmp35_ = child_subpath; #line 1772 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp42_ = g_strconcat (_tmp40_, _tmp41_, NULL); + _tmp36_ = g_strconcat (_tmp34_, _tmp35_, NULL); #line 1772 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (child_path); #line 1772 "/home/jens/Source/shotwell/src/Commands.vala" - child_path = _tmp42_; + child_path = _tmp36_; #line 1772 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp40_); + _g_free0 (_tmp34_); #line 1772 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp38_); -#line 15063 "Commands.c" + _g_free0 (_tmp32_); +#line 15671 "Commands.c" } #line 1775 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp43_ = tag_global; -#line 1775 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp44_ = child_path; + _tmp37_ = tag_global; #line 1775 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp45_ = tag_source_collection_exists (_tmp43_, _tmp44_, FALSE); + _tmp38_ = child_path; #line 1775 "/home/jens/Source/shotwell/src/Commands.vala" - _vala_assert (_tmp45_, "Tag.global.exists(child_path)"); -#line 15073 "Commands.c" + _vala_assert (tag_source_collection_exists (_tmp37_, _tmp38_, FALSE), "Tag.global.exists(child_path)"); +#line 15679 "Commands.c" { GeeIterator* _s_it = NULL; - GeeMap* _tmp46_; - const gchar* _tmp47_; - gpointer _tmp48_; - GeeSet* _tmp49_; - GeeIterator* _tmp50_; - GeeIterator* _tmp51_; + const gchar* _tmp39_; + gpointer _tmp40_; + GeeSet* _tmp41_; + GeeIterator* _tmp42_; + GeeIterator* _tmp43_; #line 1777 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp46_ = child_structure; + _tmp39_ = child_subpath; #line 1777 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp47_ = child_subpath; + _tmp40_ = gee_map_get (child_structure, _tmp39_); #line 1777 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp48_ = gee_map_get (_tmp46_, _tmp47_); + _tmp41_ = (GeeSet*) _tmp40_; #line 1777 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp49_ = (GeeSet*) _tmp48_; + _tmp42_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1777 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp50_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp43_ = _tmp42_; #line 1777 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp51_ = _tmp50_; + _g_object_unref0 (_tmp41_); #line 1777 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp49_); -#line 1777 "/home/jens/Source/shotwell/src/Commands.vala" - _s_it = _tmp51_; + _s_it = _tmp43_; #line 1777 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 15100 "Commands.c" - GeeIterator* _tmp52_; - gboolean _tmp53_; +#line 15703 "Commands.c" + GeeIterator* _tmp44_; MediaSource* s = NULL; - GeeIterator* _tmp54_; - gpointer _tmp55_; - const gchar* _tmp56_; - Tag* _tmp57_; - Tag* _tmp58_; - MediaSource* _tmp59_; + GeeIterator* _tmp45_; + gpointer _tmp46_; + const gchar* _tmp47_; + Tag* _tmp48_; + Tag* _tmp49_; + MediaSource* _tmp50_; #line 1777 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp52_ = _s_it; + _tmp44_ = _s_it; #line 1777 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp53_ = gee_iterator_next (_tmp52_); -#line 1777 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp53_) { + if (!gee_iterator_next (_tmp44_)) { #line 1777 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 15118 "Commands.c" +#line 15718 "Commands.c" } #line 1777 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp54_ = _s_it; + _tmp45_ = _s_it; #line 1777 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp55_ = gee_iterator_get (_tmp54_); + _tmp46_ = gee_iterator_get (_tmp45_); #line 1777 "/home/jens/Source/shotwell/src/Commands.vala" - s = (MediaSource*) _tmp55_; + s = (MediaSource*) _tmp46_; #line 1778 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp56_ = child_path; + _tmp47_ = child_path; #line 1778 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp57_ = tag_for_path (_tmp56_); + _tmp48_ = tag_for_path (_tmp47_); #line 1778 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp58_ = _tmp57_; + _tmp49_ = _tmp48_; #line 1778 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp59_ = s; + _tmp50_ = s; #line 1778 "/home/jens/Source/shotwell/src/Commands.vala" - tag_attach (_tmp58_, _tmp59_); + tag_attach (_tmp49_, _tmp50_); #line 1778 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp58_); + _g_object_unref0 (_tmp49_); #line 1777 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (s); -#line 15140 "Commands.c" +#line 15740 "Commands.c" } #line 1777 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_s_it); -#line 15144 "Commands.c" +#line 15744 "Commands.c" } #line 1767 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (child_path); #line 1767 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (child_subpath); -#line 15150 "Commands.c" +#line 15750 "Commands.c" } #line 1767 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_child_subpath_it); -#line 15154 "Commands.c" +#line 15754 "Commands.c" } #line 1758 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (tag); @@ -15158,121 +15758,112 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman _g_free0 (path); #line 1758 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (new_path); -#line 15162 "Commands.c" +#line 15762 "Commands.c" } -static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand* self, const gchar* client_path) { +static void +reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand* self, + const gchar* client_path) +{ gchar* new_path = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_; + gchar* _tmp0_; + const gchar* _tmp1_ = NULL; + const gchar* _tmp2_; gchar* path = NULL; - gchar* _tmp6_; - TagSourceCollection* _tmp7_; - const gchar* _tmp8_; - gboolean _tmp9_; + gchar* _tmp4_; + TagSourceCollection* _tmp5_; + const gchar* _tmp6_; Tag* tag = NULL; - const gchar* _tmp10_; - Tag* _tmp11_; + const gchar* _tmp7_; + Tag* _tmp8_; #line 1782 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_REPARENT_TAG_COMMAND (self)); #line 1782 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (client_path != NULL); #line 1783 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = client_path; + _tmp0_ = hierarchical_tag_utilities_get_root_path_form (client_path); #line 1783 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = hierarchical_tag_utilities_get_root_path_form (_tmp0_); -#line 1783 "/home/jens/Source/shotwell/src/Commands.vala" - new_path = _tmp1_; + new_path = _tmp0_; #line 1784 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = new_path; + _tmp2_ = new_path; #line 1784 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp3_ != NULL) { -#line 15194 "Commands.c" - const gchar* _tmp4_; + if (_tmp2_ != NULL) { +#line 15793 "Commands.c" + const gchar* _tmp3_; #line 1784 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = new_path; + _tmp3_ = new_path; #line 1784 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _tmp4_; -#line 15200 "Commands.c" + _tmp1_ = _tmp3_; +#line 15799 "Commands.c" } else { - const gchar* _tmp5_; #line 1784 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = client_path; -#line 1784 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _tmp5_; -#line 15207 "Commands.c" + _tmp1_ = client_path; +#line 15803 "Commands.c" } #line 1784 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = g_strdup (_tmp2_); + _tmp4_ = g_strdup (_tmp1_); #line 1784 "/home/jens/Source/shotwell/src/Commands.vala" - path = _tmp6_; + path = _tmp4_; #line 1786 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = tag_global; -#line 1786 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = path; + _tmp5_ = tag_global; #line 1786 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = tag_source_collection_exists (_tmp7_, _tmp8_, FALSE); + _tmp6_ = path; #line 1786 "/home/jens/Source/shotwell/src/Commands.vala" - _vala_assert (_tmp9_, "Tag.global.exists(path)"); + _vala_assert (tag_source_collection_exists (_tmp5_, _tmp6_, FALSE), "Tag.global.exists(path)"); #line 1788 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = path; + _tmp7_ = path; #line 1788 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = tag_for_path (_tmp10_); + _tmp8_ = tag_for_path (_tmp7_); #line 1788 "/home/jens/Source/shotwell/src/Commands.vala" - tag = _tmp11_; -#line 15227 "Commands.c" + tag = _tmp8_; +#line 15821 "Commands.c" { GeeIterator* _s_it = NULL; - GeeHashSet* _tmp12_; - GeeIterator* _tmp13_; + GeeHashSet* _tmp9_; + GeeIterator* _tmp10_; #line 1790 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = self->priv->sources_in_play; + _tmp9_ = self->priv->sources_in_play; #line 1790 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp10_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1790 "/home/jens/Source/shotwell/src/Commands.vala" - _s_it = _tmp13_; + _s_it = _tmp10_; #line 1790 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 15240 "Commands.c" - GeeIterator* _tmp14_; - gboolean _tmp15_; +#line 15834 "Commands.c" + GeeIterator* _tmp11_; MediaSource* s = NULL; - GeeIterator* _tmp16_; - gpointer _tmp17_; - Tag* _tmp18_; - MediaSource* _tmp19_; -#line 1790 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = _s_it; + GeeIterator* _tmp12_; + gpointer _tmp13_; + Tag* _tmp14_; + MediaSource* _tmp15_; #line 1790 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = gee_iterator_next (_tmp14_); + _tmp11_ = _s_it; #line 1790 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp15_) { + if (!gee_iterator_next (_tmp11_)) { #line 1790 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 15256 "Commands.c" +#line 15847 "Commands.c" } #line 1790 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = _s_it; + _tmp12_ = _s_it; #line 1790 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = gee_iterator_get (_tmp16_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 1790 "/home/jens/Source/shotwell/src/Commands.vala" - s = (MediaSource*) _tmp17_; + s = (MediaSource*) _tmp13_; #line 1791 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = tag; + _tmp14_ = tag; #line 1791 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = s; + _tmp15_ = s; #line 1791 "/home/jens/Source/shotwell/src/Commands.vala" - tag_attach (_tmp18_, _tmp19_); + tag_attach (_tmp14_, _tmp15_); #line 1790 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (s); -#line 15272 "Commands.c" +#line 15863 "Commands.c" } #line 1790 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_s_it); -#line 15276 "Commands.c" +#line 15867 "Commands.c" } #line 1782 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (tag); @@ -15280,11 +15871,13 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand _g_free0 (path); #line 1782 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (new_path); -#line 15284 "Commands.c" +#line 15875 "Commands.c" } -static void reparent_tag_command_save_before_state (ReparentTagCommand* self) { +static void +reparent_tag_command_save_before_state (ReparentTagCommand* self) +{ GeeList* _tmp0_; GeeList* _tmp1_; GeeArrayList* _tmp2_; @@ -15294,29 +15887,28 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) { GeeMap* _tmp6_; TagSourceCollection* _tmp7_; const gchar* _tmp8_; - gboolean _tmp9_; Tag* from_tag = NULL; - const gchar* _tmp10_; - Tag* _tmp11_; - GeeList* _tmp12_; - Tag* _tmp13_; + const gchar* _tmp9_; + Tag* _tmp10_; + GeeList* _tmp11_; + Tag* _tmp12_; + SourceProxy* _tmp13_; SourceProxy* _tmp14_; - SourceProxy* _tmp15_; GeeList* parent_paths = NULL; - const gchar* _tmp16_; + const gchar* _tmp15_; + GeeList* _tmp16_; GeeList* _tmp17_; - GeeList* _tmp18_; + gint _tmp18_; gint _tmp19_; - gint _tmp20_; - const gchar* _tmp26_; - const gchar* _tmp30_; - const gchar* _tmp42_; - const gchar* _tmp59_; + const gchar* _tmp25_; + const gchar* _tmp29_; + const gchar* _tmp41_; + const gchar* _tmp57_; GeeList* from_children = NULL; - Tag* _tmp66_; - GeeList* _tmp67_; - const gchar* _tmp81_; - const gchar* _tmp100_; + Tag* _tmp64_; + GeeList* _tmp65_; + const gchar* _tmp79_; + const gchar* _tmp98_; #line 1794 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_REPARENT_TAG_COMMAND (self)); #line 1795 "/home/jens/Source/shotwell/src/Commands.vala" @@ -15356,540 +15948,535 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) { #line 1806 "/home/jens/Source/shotwell/src/Commands.vala" _tmp8_ = self->priv->from_path; #line 1806 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = tag_source_collection_exists (_tmp7_, _tmp8_, FALSE); -#line 1806 "/home/jens/Source/shotwell/src/Commands.vala" - _vala_assert (_tmp9_, "Tag.global.exists(from_path)"); + _vala_assert (tag_source_collection_exists (_tmp7_, _tmp8_, FALSE), "Tag.global.exists(from_path)"); #line 1807 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = self->priv->from_path; + _tmp9_ = self->priv->from_path; #line 1807 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = tag_for_path (_tmp10_); + _tmp10_ = tag_for_path (_tmp9_); #line 1807 "/home/jens/Source/shotwell/src/Commands.vala" - from_tag = _tmp11_; + from_tag = _tmp10_; #line 1808 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = self->priv->src_before_state; + _tmp11_ = self->priv->src_before_state; #line 1808 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = from_tag; + _tmp12_ = from_tag; #line 1808 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PROXYABLE, Proxyable)); + _tmp13_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PROXYABLE, Proxyable)); #line 1808 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 1808 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_); #line 1808 "/home/jens/Source/shotwell/src/Commands.vala" - _source_proxy_unref0 (_tmp15_); + _source_proxy_unref0 (_tmp14_); #line 1811 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = self->priv->to_path; + _tmp15_ = self->priv->to_path; #line 1811 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp16_); + _tmp16_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp15_); #line 1811 "/home/jens/Source/shotwell/src/Commands.vala" - parent_paths = _tmp17_; + parent_paths = _tmp16_; #line 1812 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = parent_paths; + _tmp17_ = parent_paths; #line 1812 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1812 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 1812 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp20_ > 0) { -#line 15395 "Commands.c" + if (_tmp19_ > 0) { +#line 15985 "Commands.c" + GeeList* _tmp20_; GeeList* _tmp21_; - GeeList* _tmp22_; + gint _tmp22_; gint _tmp23_; - gint _tmp24_; - gpointer _tmp25_; + gpointer _tmp24_; #line 1813 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = parent_paths; + _tmp20_ = parent_paths; #line 1813 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = parent_paths; + _tmp21_ = parent_paths; #line 1813 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp22_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1813 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 1813 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = gee_list_get (_tmp21_, _tmp24_ - 1); + _tmp24_ = gee_list_get (_tmp20_, _tmp23_ - 1); #line 1813 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->to_path_parent_path); #line 1813 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->to_path_parent_path = (gchar*) _tmp25_; -#line 15415 "Commands.c" + self->priv->to_path_parent_path = (gchar*) _tmp24_; +#line 16005 "Commands.c" } #line 1814 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = self->priv->to_path_parent_path; + _tmp25_ = self->priv->to_path_parent_path; #line 1814 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp26_ != NULL) { -#line 15421 "Commands.c" - GeeMap* _tmp27_; - const gchar* _tmp28_; - GeeMap* _tmp29_; + if (_tmp25_ != NULL) { +#line 16011 "Commands.c" + GeeMap* _tmp26_; + const gchar* _tmp27_; + GeeMap* _tmp28_; #line 1815 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = self->priv->existing_dest_child_structure; + _tmp26_ = self->priv->existing_dest_child_structure; #line 1815 "/home/jens/Source/shotwell/src/Commands.vala" - _vala_assert (_tmp27_ == NULL, "existing_dest_child_structure == null"); + _vala_assert (_tmp26_ == NULL, "existing_dest_child_structure == null"); #line 1816 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp28_ = self->priv->to_path_parent_path; + _tmp27_ = self->priv->to_path_parent_path; #line 1816 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp29_ = reparent_tag_command_get_child_structure_at (self, _tmp28_); + _tmp28_ = reparent_tag_command_get_child_structure_at (self, _tmp27_); #line 1816 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->existing_dest_child_structure); #line 1816 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->existing_dest_child_structure = _tmp29_; -#line 15437 "Commands.c" + self->priv->existing_dest_child_structure = _tmp28_; +#line 16027 "Commands.c" } #line 1820 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp30_ = self->priv->to_path_parent_path; + _tmp29_ = self->priv->to_path_parent_path; #line 1820 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp30_ == NULL) { -#line 15443 "Commands.c" - GeeMap* _tmp31_; - GeeSet* _tmp32_; - const gchar* _tmp33_; - GeeMap* _tmp34_; - GeeHashSet* _tmp35_; - GeeSet* _tmp36_; - const gchar* _tmp37_; + if (_tmp29_ == NULL) { +#line 16033 "Commands.c" + GeeMap* _tmp30_; + GeeSet* _tmp31_; + const gchar* _tmp32_; + GeeMap* _tmp33_; + GeeHashSet* _tmp34_; + GeeSet* _tmp35_; + const gchar* _tmp36_; + Tag* _tmp37_; Tag* _tmp38_; - Tag* _tmp39_; + GeeCollection* _tmp39_; GeeCollection* _tmp40_; - GeeCollection* _tmp41_; #line 1821 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp31_ = self->priv->existing_dest_child_structure; + _tmp30_ = self->priv->existing_dest_child_structure; #line 1821 "/home/jens/Source/shotwell/src/Commands.vala" - _vala_assert (_tmp31_ == NULL, "existing_dest_child_structure == null"); + _vala_assert (_tmp30_ == NULL, "existing_dest_child_structure == null"); #line 1822 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp32_ = self->priv->existing_dest_membership; + _tmp31_ = self->priv->existing_dest_membership; #line 1822 "/home/jens/Source/shotwell/src/Commands.vala" - _vala_assert (_tmp32_ == NULL, "existing_dest_membership == null"); + _vala_assert (_tmp31_ == NULL, "existing_dest_membership == null"); #line 1823 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp33_ = self->priv->to_path; + _tmp32_ = self->priv->to_path; #line 1823 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp34_ = reparent_tag_command_get_child_structure_at (self, _tmp33_); + _tmp33_ = reparent_tag_command_get_child_structure_at (self, _tmp32_); #line 1823 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->existing_dest_child_structure); #line 1823 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->existing_dest_child_structure = _tmp34_; + self->priv->existing_dest_child_structure = _tmp33_; #line 1824 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp35_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp34_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 1824 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->existing_dest_membership); #line 1824 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->existing_dest_membership = G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_SET, GeeSet); + self->priv->existing_dest_membership = G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_SET, GeeSet); #line 1825 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp36_ = self->priv->existing_dest_membership; + _tmp35_ = self->priv->existing_dest_membership; #line 1825 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp37_ = self->priv->to_path; + _tmp36_ = self->priv->to_path; #line 1825 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp38_ = tag_for_path (_tmp37_); + _tmp37_ = tag_for_path (_tmp36_); #line 1825 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp39_ = _tmp38_; + _tmp38_ = _tmp37_; #line 1825 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp40_ = tag_get_sources (_tmp39_); + _tmp39_ = tag_get_sources (_tmp38_); #line 1825 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp41_ = _tmp40_; + _tmp40_ = _tmp39_; #line 1825 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), _tmp41_); + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), _tmp40_); #line 1825 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp41_); + _g_object_unref0 (_tmp40_); #line 1825 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp39_); -#line 15495 "Commands.c" + _g_object_unref0 (_tmp38_); +#line 16085 "Commands.c" } #line 1829 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp42_ = self->priv->to_path_parent_path; + _tmp41_ = self->priv->to_path_parent_path; #line 1829 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp42_ != NULL) { -#line 15501 "Commands.c" + if (_tmp41_ != NULL) { +#line 16091 "Commands.c" gchar* new_tpp = NULL; - const gchar* _tmp43_; - gchar* _tmp44_; - const gchar* _tmp45_ = NULL; - const gchar* _tmp46_; - gchar* _tmp49_; - TagSourceCollection* _tmp50_; - const gchar* _tmp51_; - gboolean _tmp52_; - GeeList* _tmp53_; - const gchar* _tmp54_; - Tag* _tmp55_; - Tag* _tmp56_; - SourceProxy* _tmp57_; - SourceProxy* _tmp58_; + const gchar* _tmp42_; + gchar* _tmp43_; + const gchar* _tmp44_ = NULL; + const gchar* _tmp45_; + gchar* _tmp48_; + TagSourceCollection* _tmp49_; + const gchar* _tmp50_; + GeeList* _tmp51_; + const gchar* _tmp52_; + Tag* _tmp53_; + Tag* _tmp54_; + SourceProxy* _tmp55_; + SourceProxy* _tmp56_; #line 1830 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp43_ = self->priv->to_path_parent_path; + _tmp42_ = self->priv->to_path_parent_path; #line 1830 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp44_ = hierarchical_tag_utilities_get_root_path_form (_tmp43_); + _tmp43_ = hierarchical_tag_utilities_get_root_path_form (_tmp42_); #line 1830 "/home/jens/Source/shotwell/src/Commands.vala" - new_tpp = _tmp44_; + new_tpp = _tmp43_; #line 1831 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp46_ = new_tpp; + _tmp45_ = new_tpp; #line 1831 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp46_ != NULL) { -#line 15527 "Commands.c" - const gchar* _tmp47_; + if (_tmp45_ != NULL) { +#line 16116 "Commands.c" + const gchar* _tmp46_; #line 1831 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp47_ = new_tpp; + _tmp46_ = new_tpp; #line 1831 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp45_ = _tmp47_; -#line 15533 "Commands.c" + _tmp44_ = _tmp46_; +#line 16122 "Commands.c" } else { - const gchar* _tmp48_; + const gchar* _tmp47_; #line 1831 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp48_ = self->priv->to_path_parent_path; + _tmp47_ = self->priv->to_path_parent_path; #line 1831 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp45_ = _tmp48_; -#line 15540 "Commands.c" + _tmp44_ = _tmp47_; +#line 16129 "Commands.c" } #line 1831 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp49_ = g_strdup (_tmp45_); + _tmp48_ = g_strdup (_tmp44_); #line 1831 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->to_path_parent_path); #line 1831 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->to_path_parent_path = _tmp49_; + self->priv->to_path_parent_path = _tmp48_; #line 1832 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp50_ = tag_global; + _tmp49_ = tag_global; #line 1832 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp51_ = self->priv->to_path_parent_path; + _tmp50_ = self->priv->to_path_parent_path; #line 1832 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp52_ = tag_source_collection_exists (_tmp50_, _tmp51_, FALSE); -#line 1832 "/home/jens/Source/shotwell/src/Commands.vala" - _vala_assert (_tmp52_, "Tag.global.exists(to_path_parent_path)"); + _vala_assert (tag_source_collection_exists (_tmp49_, _tmp50_, FALSE), "Tag.global.exists(to_path_parent_path)"); #line 1833 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp53_ = self->priv->dest_before_state; + _tmp51_ = self->priv->dest_before_state; #line 1833 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp54_ = self->priv->to_path_parent_path; + _tmp52_ = self->priv->to_path_parent_path; #line 1833 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp55_ = tag_for_path (_tmp54_); + _tmp53_ = tag_for_path (_tmp52_); #line 1833 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp56_ = _tmp55_; + _tmp54_ = _tmp53_; #line 1833 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp57_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PROXYABLE, Proxyable)); + _tmp55_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_PROXYABLE, Proxyable)); #line 1833 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp58_ = _tmp57_; + _tmp56_ = _tmp55_; #line 1833 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection), _tmp58_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection), _tmp56_); #line 1833 "/home/jens/Source/shotwell/src/Commands.vala" - _source_proxy_unref0 (_tmp58_); + _source_proxy_unref0 (_tmp56_); #line 1833 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp56_); + _g_object_unref0 (_tmp54_); #line 1829 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (new_tpp); -#line 15576 "Commands.c" +#line 16163 "Commands.c" } #line 1837 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp59_ = self->priv->to_path_parent_path; + _tmp57_ = self->priv->to_path_parent_path; #line 1837 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp59_ == NULL) { -#line 15582 "Commands.c" - GeeList* _tmp60_; - const gchar* _tmp61_; - Tag* _tmp62_; - Tag* _tmp63_; - SourceProxy* _tmp64_; - SourceProxy* _tmp65_; + if (_tmp57_ == NULL) { +#line 16169 "Commands.c" + GeeList* _tmp58_; + const gchar* _tmp59_; + Tag* _tmp60_; + Tag* _tmp61_; + SourceProxy* _tmp62_; + SourceProxy* _tmp63_; #line 1838 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp60_ = self->priv->dest_before_state; + _tmp58_ = self->priv->dest_before_state; #line 1838 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp61_ = self->priv->to_path; + _tmp59_ = self->priv->to_path; #line 1838 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp62_ = tag_for_path (_tmp61_); + _tmp60_ = tag_for_path (_tmp59_); #line 1838 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp63_ = _tmp62_; + _tmp61_ = _tmp60_; #line 1838 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp64_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_PROXYABLE, Proxyable)); + _tmp62_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_PROXYABLE, Proxyable)); #line 1838 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp65_ = _tmp64_; + _tmp63_ = _tmp62_; #line 1838 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_COLLECTION, GeeCollection), _tmp65_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_COLLECTION, GeeCollection), _tmp63_); #line 1838 "/home/jens/Source/shotwell/src/Commands.vala" - _source_proxy_unref0 (_tmp65_); + _source_proxy_unref0 (_tmp63_); #line 1838 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp63_); -#line 15607 "Commands.c" + _g_object_unref0 (_tmp61_); +#line 16194 "Commands.c" } #line 1842 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp66_ = from_tag; + _tmp64_ = from_tag; #line 1842 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp67_ = tag_get_hierarchical_children (_tmp66_); + _tmp65_ = tag_get_hierarchical_children (_tmp64_); #line 1842 "/home/jens/Source/shotwell/src/Commands.vala" - from_children = _tmp67_; -#line 15615 "Commands.c" + from_children = _tmp65_; +#line 16202 "Commands.c" { gint i = 0; - GeeList* _tmp68_; - gint _tmp69_; - gint _tmp70_; + GeeList* _tmp66_; + gint _tmp67_; + gint _tmp68_; #line 1843 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp68_ = from_children; + _tmp66_ = from_children; #line 1843 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp69_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp67_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1843 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp70_ = _tmp69_; + _tmp68_ = _tmp67_; #line 1843 "/home/jens/Source/shotwell/src/Commands.vala" - i = _tmp70_ - 1; -#line 15629 "Commands.c" + i = _tmp68_ - 1; +#line 16216 "Commands.c" { - gboolean _tmp71_ = FALSE; + gboolean _tmp69_ = FALSE; #line 1843 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp71_ = TRUE; + _tmp69_ = TRUE; #line 1843 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 15636 "Commands.c" - gint _tmp73_; - GeeList* _tmp74_; - GeeList* _tmp75_; - gint _tmp76_; - gpointer _tmp77_; - Tag* _tmp78_; - SourceProxy* _tmp79_; - SourceProxy* _tmp80_; +#line 16223 "Commands.c" + gint _tmp71_; + GeeList* _tmp72_; + GeeList* _tmp73_; + gint _tmp74_; + gpointer _tmp75_; + Tag* _tmp76_; + SourceProxy* _tmp77_; + SourceProxy* _tmp78_; #line 1843 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp71_) { -#line 15647 "Commands.c" - gint _tmp72_; + if (!_tmp69_) { +#line 16234 "Commands.c" + gint _tmp70_; #line 1843 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp72_ = i; + _tmp70_ = i; #line 1843 "/home/jens/Source/shotwell/src/Commands.vala" - i = _tmp72_ - 1; -#line 15653 "Commands.c" + i = _tmp70_ - 1; +#line 16240 "Commands.c" } #line 1843 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp71_ = FALSE; + _tmp69_ = FALSE; #line 1843 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp73_ = i; + _tmp71_ = i; #line 1843 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp73_ >= 0)) { + if (!(_tmp71_ >= 0)) { #line 1843 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 15663 "Commands.c" +#line 16250 "Commands.c" } #line 1844 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp74_ = self->priv->src_before_state; + _tmp72_ = self->priv->src_before_state; #line 1844 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp75_ = from_children; + _tmp73_ = from_children; #line 1844 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp76_ = i; + _tmp74_ = i; #line 1844 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp77_ = gee_list_get (_tmp75_, _tmp76_); + _tmp75_ = gee_list_get (_tmp73_, _tmp74_); #line 1844 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp78_ = (Tag*) _tmp77_; + _tmp76_ = (Tag*) _tmp75_; #line 1844 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp79_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_PROXYABLE, Proxyable)); + _tmp77_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, TYPE_PROXYABLE, Proxyable)); #line 1844 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp80_ = _tmp79_; + _tmp78_ = _tmp77_; #line 1844 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_COLLECTION, GeeCollection), _tmp80_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_COLLECTION, GeeCollection), _tmp78_); #line 1844 "/home/jens/Source/shotwell/src/Commands.vala" - _source_proxy_unref0 (_tmp80_); + _source_proxy_unref0 (_tmp78_); #line 1844 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp78_); -#line 15685 "Commands.c" + _g_object_unref0 (_tmp76_); +#line 16272 "Commands.c" } } } #line 1848 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp81_ = self->priv->to_path_parent_path; + _tmp79_ = self->priv->to_path_parent_path; #line 1848 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp81_ != NULL) { -#line 15693 "Commands.c" + if (_tmp79_ != NULL) { +#line 16280 "Commands.c" GeeList* to_children = NULL; - const gchar* _tmp82_; - Tag* _tmp83_; - Tag* _tmp84_; - GeeList* _tmp85_; - GeeList* _tmp86_; + const gchar* _tmp80_; + Tag* _tmp81_; + Tag* _tmp82_; + GeeList* _tmp83_; + GeeList* _tmp84_; #line 1849 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp82_ = self->priv->to_path_parent_path; + _tmp80_ = self->priv->to_path_parent_path; #line 1849 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp83_ = tag_for_path (_tmp82_); + _tmp81_ = tag_for_path (_tmp80_); #line 1849 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp84_ = _tmp83_; + _tmp82_ = _tmp81_; #line 1849 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp85_ = tag_get_hierarchical_children (_tmp84_); + _tmp83_ = tag_get_hierarchical_children (_tmp82_); #line 1849 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp86_ = _tmp85_; + _tmp84_ = _tmp83_; #line 1849 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp84_); + _g_object_unref0 (_tmp82_); #line 1849 "/home/jens/Source/shotwell/src/Commands.vala" - to_children = _tmp86_; -#line 15714 "Commands.c" + to_children = _tmp84_; +#line 16301 "Commands.c" { gint i = 0; - GeeList* _tmp87_; - gint _tmp88_; - gint _tmp89_; + GeeList* _tmp85_; + gint _tmp86_; + gint _tmp87_; #line 1850 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp87_ = to_children; + _tmp85_ = to_children; #line 1850 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp88_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp86_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1850 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp89_ = _tmp88_; + _tmp87_ = _tmp86_; #line 1850 "/home/jens/Source/shotwell/src/Commands.vala" - i = _tmp89_ - 1; -#line 15728 "Commands.c" + i = _tmp87_ - 1; +#line 16315 "Commands.c" { - gboolean _tmp90_ = FALSE; + gboolean _tmp88_ = FALSE; #line 1850 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp90_ = TRUE; + _tmp88_ = TRUE; #line 1850 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 15735 "Commands.c" - gint _tmp92_; - GeeList* _tmp93_; - GeeList* _tmp94_; - gint _tmp95_; - gpointer _tmp96_; - Tag* _tmp97_; - SourceProxy* _tmp98_; - SourceProxy* _tmp99_; +#line 16322 "Commands.c" + gint _tmp90_; + GeeList* _tmp91_; + GeeList* _tmp92_; + gint _tmp93_; + gpointer _tmp94_; + Tag* _tmp95_; + SourceProxy* _tmp96_; + SourceProxy* _tmp97_; #line 1850 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp90_) { -#line 15746 "Commands.c" - gint _tmp91_; + if (!_tmp88_) { +#line 16333 "Commands.c" + gint _tmp89_; #line 1850 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp91_ = i; + _tmp89_ = i; #line 1850 "/home/jens/Source/shotwell/src/Commands.vala" - i = _tmp91_ - 1; -#line 15752 "Commands.c" + i = _tmp89_ - 1; +#line 16339 "Commands.c" } #line 1850 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp90_ = FALSE; + _tmp88_ = FALSE; #line 1850 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp92_ = i; + _tmp90_ = i; #line 1850 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp92_ >= 0)) { + if (!(_tmp90_ >= 0)) { #line 1850 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 15762 "Commands.c" +#line 16349 "Commands.c" } #line 1851 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp93_ = self->priv->dest_before_state; + _tmp91_ = self->priv->dest_before_state; #line 1851 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp94_ = to_children; + _tmp92_ = to_children; #line 1851 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp95_ = i; + _tmp93_ = i; #line 1851 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp96_ = gee_list_get (_tmp94_, _tmp95_); + _tmp94_ = gee_list_get (_tmp92_, _tmp93_); #line 1851 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp97_ = (Tag*) _tmp96_; + _tmp95_ = (Tag*) _tmp94_; #line 1851 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp98_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, TYPE_PROXYABLE, Proxyable)); + _tmp96_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, TYPE_PROXYABLE, Proxyable)); #line 1851 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp99_ = _tmp98_; + _tmp97_ = _tmp96_; #line 1851 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, GEE_TYPE_COLLECTION, GeeCollection), _tmp99_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, GEE_TYPE_COLLECTION, GeeCollection), _tmp97_); #line 1851 "/home/jens/Source/shotwell/src/Commands.vala" - _source_proxy_unref0 (_tmp99_); + _source_proxy_unref0 (_tmp97_); #line 1851 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp97_); -#line 15784 "Commands.c" + _g_object_unref0 (_tmp95_); +#line 16371 "Commands.c" } } } #line 1848 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (to_children); -#line 15790 "Commands.c" +#line 16377 "Commands.c" } #line 1856 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp100_ = self->priv->to_path_parent_path; + _tmp98_ = self->priv->to_path_parent_path; #line 1856 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp100_ == NULL) { -#line 15796 "Commands.c" + if (_tmp98_ == NULL) { +#line 16383 "Commands.c" GeeList* to_children = NULL; - const gchar* _tmp101_; - Tag* _tmp102_; - Tag* _tmp103_; - GeeList* _tmp104_; - GeeList* _tmp105_; + const gchar* _tmp99_; + Tag* _tmp100_; + Tag* _tmp101_; + GeeList* _tmp102_; + GeeList* _tmp103_; #line 1857 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp101_ = self->priv->to_path; + _tmp99_ = self->priv->to_path; #line 1857 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp102_ = tag_for_path (_tmp101_); + _tmp100_ = tag_for_path (_tmp99_); #line 1857 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp103_ = _tmp102_; + _tmp101_ = _tmp100_; #line 1857 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp104_ = tag_get_hierarchical_children (_tmp103_); + _tmp102_ = tag_get_hierarchical_children (_tmp101_); #line 1857 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp105_ = _tmp104_; + _tmp103_ = _tmp102_; #line 1857 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp103_); + _g_object_unref0 (_tmp101_); #line 1857 "/home/jens/Source/shotwell/src/Commands.vala" - to_children = _tmp105_; -#line 15817 "Commands.c" + to_children = _tmp103_; +#line 16404 "Commands.c" { gint i = 0; - GeeList* _tmp106_; - gint _tmp107_; - gint _tmp108_; + GeeList* _tmp104_; + gint _tmp105_; + gint _tmp106_; #line 1858 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp106_ = to_children; + _tmp104_ = to_children; #line 1858 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp107_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp105_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1858 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp108_ = _tmp107_; + _tmp106_ = _tmp105_; #line 1858 "/home/jens/Source/shotwell/src/Commands.vala" - i = _tmp108_ - 1; -#line 15831 "Commands.c" + i = _tmp106_ - 1; +#line 16418 "Commands.c" { - gboolean _tmp109_ = FALSE; + gboolean _tmp107_ = FALSE; #line 1858 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp109_ = TRUE; + _tmp107_ = TRUE; #line 1858 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 15838 "Commands.c" - gint _tmp111_; - GeeList* _tmp112_; - GeeList* _tmp113_; - gint _tmp114_; - gpointer _tmp115_; - Tag* _tmp116_; - SourceProxy* _tmp117_; - SourceProxy* _tmp118_; +#line 16425 "Commands.c" + gint _tmp109_; + GeeList* _tmp110_; + GeeList* _tmp111_; + gint _tmp112_; + gpointer _tmp113_; + Tag* _tmp114_; + SourceProxy* _tmp115_; + SourceProxy* _tmp116_; #line 1858 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp109_) { -#line 15849 "Commands.c" - gint _tmp110_; + if (!_tmp107_) { +#line 16436 "Commands.c" + gint _tmp108_; #line 1858 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp110_ = i; + _tmp108_ = i; #line 1858 "/home/jens/Source/shotwell/src/Commands.vala" - i = _tmp110_ - 1; -#line 15855 "Commands.c" + i = _tmp108_ - 1; +#line 16442 "Commands.c" } #line 1858 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp109_ = FALSE; + _tmp107_ = FALSE; #line 1858 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp111_ = i; + _tmp109_ = i; #line 1858 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp111_ >= 0)) { + if (!(_tmp109_ >= 0)) { #line 1858 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 15865 "Commands.c" +#line 16452 "Commands.c" } #line 1859 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp112_ = self->priv->dest_before_state; + _tmp110_ = self->priv->dest_before_state; #line 1859 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp113_ = to_children; + _tmp111_ = to_children; #line 1859 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp114_ = i; + _tmp112_ = i; #line 1859 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp115_ = gee_list_get (_tmp113_, _tmp114_); + _tmp113_ = gee_list_get (_tmp111_, _tmp112_); #line 1859 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp116_ = (Tag*) _tmp115_; + _tmp114_ = (Tag*) _tmp113_; #line 1859 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp117_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, TYPE_PROXYABLE, Proxyable)); + _tmp115_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, TYPE_PROXYABLE, Proxyable)); #line 1859 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp118_ = _tmp117_; + _tmp116_ = _tmp115_; #line 1859 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, GEE_TYPE_COLLECTION, GeeCollection), _tmp118_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, GEE_TYPE_COLLECTION, GeeCollection), _tmp116_); #line 1859 "/home/jens/Source/shotwell/src/Commands.vala" - _source_proxy_unref0 (_tmp118_); + _source_proxy_unref0 (_tmp116_); #line 1859 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp116_); -#line 15887 "Commands.c" + _g_object_unref0 (_tmp114_); +#line 16474 "Commands.c" } } } #line 1856 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (to_children); -#line 15893 "Commands.c" +#line 16480 "Commands.c" } #line 1794 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (from_children); @@ -15897,179 +16484,128 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) { _g_object_unref0 (parent_paths); #line 1794 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (from_tag); -#line 15901 "Commands.c" +#line 16488 "Commands.c" } -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, + glong maxlen) +{ glong result = 0L; gchar* end = NULL; gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 15924 "Commands.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 15932 "Commands.c" +#line 16512 "Commands.c" } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 15944 "Commands.c" +#line 16521 "Commands.c" } } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, + glong offset, + glong len) +{ gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + glong _tmp6_; + gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#line 15968 "Commands.c" - glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = _tmp2_ >= ((glong) 0); -#line 15974 "Commands.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = len >= ((glong) 0); +#line 16542 "Commands.c" } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 15978 "Commands.c" +#line 16546 "Commands.c" } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 15982 "Commands.c" - glong _tmp3_; - glong _tmp4_; - glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 15994 "Commands.c" +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = string_strnlen ((gchar*) self, offset + len); +#line 16552 "Commands.c" } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#line 16004 "Commands.c" + gint _tmp1_; + gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = (glong) _tmp2_; +#line 16562 "Commands.c" } -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp8_ < ((glong) 0)) { -#line 16010 "Commands.c" - glong _tmp9_; - glong _tmp10_; - glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 16024 "Commands.c" +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset < ((glong) 0)) { +#line 16566 "Commands.c" + glong _tmp3_; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 16574 "Commands.c" } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 16034 "Commands.c" + glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 16581 "Commands.c" } -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp14_ < ((glong) 0)) { -#line 16040 "Commands.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 16049 "Commands.c" +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (len < ((glong) 0)) { +#line 16585 "Commands.c" + glong _tmp5_; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp5_ - offset; +#line 16591 "Commands.c" } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 16069 "Commands.c" +#line 16603 "Commands.c" } -static void reparent_tag_command_restore_before_state (ReparentTagCommand* self) { +static void +reparent_tag_command_restore_before_state (ReparentTagCommand* self) +{ GeeList* _tmp0_; GeeMap* _tmp1_; const gchar* _tmp2_; @@ -16077,7 +16613,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self) const gchar* _tmp11_; gchar* unwind_target = NULL; gchar* _tmp14_; - const gchar* _tmp93_; + const gchar* _tmp89_; #line 1863 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_REPARENT_TAG_COMMAND (self)); #line 1864 "/home/jens/Source/shotwell/src/Commands.vala" @@ -16092,7 +16628,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self) _tmp2_ = self->priv->to_path_parent_path; #line 1868 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp2_ != NULL) { -#line 16096 "Commands.c" +#line 16632 "Commands.c" gchar* new_tpp = NULL; const gchar* _tmp3_; gchar* _tmp4_; @@ -16109,20 +16645,20 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self) _tmp6_ = new_tpp; #line 1870 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp6_ != NULL) { -#line 16113 "Commands.c" +#line 16649 "Commands.c" const gchar* _tmp7_; #line 1870 "/home/jens/Source/shotwell/src/Commands.vala" _tmp7_ = new_tpp; #line 1870 "/home/jens/Source/shotwell/src/Commands.vala" _tmp5_ = _tmp7_; -#line 16119 "Commands.c" +#line 16655 "Commands.c" } else { const gchar* _tmp8_; #line 1870 "/home/jens/Source/shotwell/src/Commands.vala" _tmp8_ = self->priv->to_path_parent_path; #line 1870 "/home/jens/Source/shotwell/src/Commands.vala" _tmp5_ = _tmp8_; -#line 16126 "Commands.c" +#line 16662 "Commands.c" } #line 1870 "/home/jens/Source/shotwell/src/Commands.vala" _tmp9_ = g_strdup (_tmp5_); @@ -16132,32 +16668,32 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self) self->priv->to_path_parent_path = _tmp9_; #line 1868 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (new_tpp); -#line 16136 "Commands.c" +#line 16672 "Commands.c" } #line 1873 "/home/jens/Source/shotwell/src/Commands.vala" _tmp11_ = self->priv->to_path_parent_path; #line 1873 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp11_ != NULL) { -#line 16142 "Commands.c" +#line 16678 "Commands.c" const gchar* _tmp12_; #line 1873 "/home/jens/Source/shotwell/src/Commands.vala" _tmp12_ = self->priv->to_path_parent_path; #line 1873 "/home/jens/Source/shotwell/src/Commands.vala" _tmp10_ = _tmp12_; -#line 16148 "Commands.c" +#line 16684 "Commands.c" } else { const gchar* _tmp13_; #line 1873 "/home/jens/Source/shotwell/src/Commands.vala" _tmp13_ = self->priv->to_path; #line 1873 "/home/jens/Source/shotwell/src/Commands.vala" _tmp10_ = _tmp13_; -#line 16155 "Commands.c" +#line 16691 "Commands.c" } #line 1873 "/home/jens/Source/shotwell/src/Commands.vala" _tmp14_ = g_strdup (_tmp10_); #line 1873 "/home/jens/Source/shotwell/src/Commands.vala" unwind_target = _tmp14_; -#line 16161 "Commands.c" +#line 16697 "Commands.c" { GeeList* _t_list = NULL; const gchar* _tmp15_; @@ -16196,7 +16732,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self) _t_index = -1; #line 1874 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 16200 "Commands.c" +#line 16736 "Commands.c" gint _tmp23_; gint _tmp24_; gint _tmp25_; @@ -16212,10 +16748,8 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self) gchar* _tmp33_; gchar* _tmp34_; const gchar* _tmp35_; - gboolean _tmp36_; - GeeMap* _tmp39_; - const gchar* _tmp40_; - gboolean _tmp41_; + GeeMap* _tmp38_; + const gchar* _tmp39_; #line 1874 "/home/jens/Source/shotwell/src/Commands.vala" _tmp23_ = _t_index; #line 1874 "/home/jens/Source/shotwell/src/Commands.vala" @@ -16228,7 +16762,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self) if (!(_tmp24_ < _tmp25_)) { #line 1874 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 16232 "Commands.c" +#line 16766 "Commands.c" } #line 1874 "/home/jens/Source/shotwell/src/Commands.vala" _tmp26_ = _t_list; @@ -16257,238 +16791,228 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self) #line 1876 "/home/jens/Source/shotwell/src/Commands.vala" _tmp35_ = child_subpath; #line 1876 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp36_ = g_str_has_prefix (_tmp35_, TAG_PATH_SEPARATOR_STRING); -#line 1876 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp36_) { -#line 16264 "Commands.c" - const gchar* _tmp37_; - gchar* _tmp38_; + if (g_str_has_prefix (_tmp35_, TAG_PATH_SEPARATOR_STRING)) { +#line 16796 "Commands.c" + const gchar* _tmp36_; + gchar* _tmp37_; #line 1877 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp37_ = child_subpath; + _tmp36_ = child_subpath; #line 1877 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp38_ = string_substring (_tmp37_, (glong) 1, (glong) -1); + _tmp37_ = string_substring (_tmp36_, (glong) 1, (glong) -1); #line 1877 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (child_subpath); #line 1877 "/home/jens/Source/shotwell/src/Commands.vala" - child_subpath = _tmp38_; -#line 16275 "Commands.c" + child_subpath = _tmp37_; +#line 16807 "Commands.c" } #line 1879 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp39_ = self->priv->existing_dest_child_structure; + _tmp38_ = self->priv->existing_dest_child_structure; #line 1879 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp40_ = child_subpath; + _tmp39_ = child_subpath; #line 1879 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp41_ = gee_map_has_key (_tmp39_, _tmp40_); -#line 1879 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp41_) { -#line 16285 "Commands.c" - TagSourceCollection* _tmp42_; - TagSourceCollection* _tmp43_; - Tag* _tmp44_; - Marker* _tmp45_; - Marker* _tmp46_; + if (!gee_map_has_key (_tmp38_, _tmp39_)) { +#line 16815 "Commands.c" + TagSourceCollection* _tmp40_; + TagSourceCollection* _tmp41_; + Tag* _tmp42_; + Marker* _tmp43_; + Marker* _tmp44_; #line 1880 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp42_ = tag_global; + _tmp40_ = tag_global; #line 1880 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp43_ = tag_global; + _tmp41_ = tag_global; #line 1880 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp44_ = t; + _tmp42_ = t; #line 1880 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp45_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_DATA_OBJECT, DataObject)); + _tmp43_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_DATA_OBJECT, DataObject)); #line 1880 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp46_ = _tmp45_; + _tmp44_ = _tmp43_; #line 1880 "/home/jens/Source/shotwell/src/Commands.vala" - source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp46_, TRUE, NULL, NULL, NULL); + source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp44_, TRUE, NULL, NULL, NULL); #line 1880 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp46_); -#line 16305 "Commands.c" + _g_object_unref0 (_tmp44_); +#line 16835 "Commands.c" } else { GeeSet* starting_sources = NULL; - GeeHashSet* _tmp47_; - GeeSet* _tmp48_; - Tag* _tmp49_; - GeeCollection* _tmp50_; - GeeCollection* _tmp51_; + GeeHashSet* _tmp45_; + GeeSet* _tmp46_; + Tag* _tmp47_; + GeeCollection* _tmp48_; + GeeCollection* _tmp49_; #line 1882 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp47_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp45_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 1882 "/home/jens/Source/shotwell/src/Commands.vala" - starting_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_SET, GeeSet); + starting_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_SET, GeeSet); #line 1883 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp48_ = starting_sources; + _tmp46_ = starting_sources; #line 1883 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp49_ = t; + _tmp47_ = t; #line 1883 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp50_ = tag_get_sources (_tmp49_); + _tmp48_ = tag_get_sources (_tmp47_); #line 1883 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp51_ = _tmp50_; + _tmp49_ = _tmp48_; #line 1883 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection), _tmp51_); + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_COLLECTION, GeeCollection), _tmp49_); #line 1883 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp51_); -#line 16329 "Commands.c" + _g_object_unref0 (_tmp49_); +#line 16859 "Commands.c" { GeeIterator* _source_it = NULL; - GeeSet* _tmp52_; - GeeIterator* _tmp53_; + GeeSet* _tmp50_; + GeeIterator* _tmp51_; #line 1884 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp52_ = starting_sources; + _tmp50_ = starting_sources; #line 1884 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp53_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp51_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1884 "/home/jens/Source/shotwell/src/Commands.vala" - _source_it = _tmp53_; + _source_it = _tmp51_; #line 1884 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 16342 "Commands.c" - GeeIterator* _tmp54_; - gboolean _tmp55_; +#line 16872 "Commands.c" + GeeIterator* _tmp52_; MediaSource* source = NULL; - GeeIterator* _tmp56_; + GeeIterator* _tmp53_; + gpointer _tmp54_; + GeeMap* _tmp55_; + const gchar* _tmp56_; gpointer _tmp57_; - GeeMap* _tmp58_; - const gchar* _tmp59_; - gpointer _tmp60_; - GeeSet* _tmp61_; - MediaSource* _tmp62_; - gboolean _tmp63_; - gboolean _tmp64_; + GeeSet* _tmp58_; + MediaSource* _tmp59_; + gboolean _tmp60_; #line 1884 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp54_ = _source_it; + _tmp52_ = _source_it; #line 1884 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp55_ = gee_iterator_next (_tmp54_); -#line 1884 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp55_) { + if (!gee_iterator_next (_tmp52_)) { #line 1884 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 16363 "Commands.c" +#line 16889 "Commands.c" } #line 1884 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp56_ = _source_it; + _tmp53_ = _source_it; #line 1884 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp57_ = gee_iterator_get (_tmp56_); + _tmp54_ = gee_iterator_get (_tmp53_); #line 1884 "/home/jens/Source/shotwell/src/Commands.vala" - source = (MediaSource*) _tmp57_; -#line 1885 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp58_ = self->priv->existing_dest_child_structure; + source = (MediaSource*) _tmp54_; #line 1885 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp59_ = child_subpath; + _tmp55_ = self->priv->existing_dest_child_structure; #line 1885 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp60_ = gee_map_get (_tmp58_, _tmp59_); + _tmp56_ = child_subpath; #line 1885 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp61_ = (GeeSet*) _tmp60_; + _tmp57_ = gee_map_get (_tmp55_, _tmp56_); #line 1885 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp62_ = source; + _tmp58_ = (GeeSet*) _tmp57_; #line 1885 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp63_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection), _tmp62_); + _tmp59_ = source; #line 1885 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp64_ = !_tmp63_; + _tmp60_ = !gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_COLLECTION, GeeCollection), _tmp59_); #line 1885 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp61_); + _g_object_unref0 (_tmp58_); #line 1885 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp64_) { -#line 16389 "Commands.c" - Tag* _tmp65_; - MediaSource* _tmp66_; - GeeList* _tmp67_; - GeeList* _tmp68_; + if (_tmp60_) { +#line 16913 "Commands.c" + Tag* _tmp61_; + MediaSource* _tmp62_; + GeeList* _tmp63_; + GeeList* _tmp64_; #line 1886 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp65_ = t; + _tmp61_ = t; #line 1886 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp66_ = source; + _tmp62_ = source; #line 1886 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp67_ = tag_detach (_tmp65_, _tmp66_); + _tmp63_ = tag_detach (_tmp61_, _tmp62_); #line 1886 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp68_ = _tmp67_; + _tmp64_ = _tmp63_; #line 1886 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp68_); -#line 16404 "Commands.c" + _g_object_unref0 (_tmp64_); +#line 16928 "Commands.c" } #line 1884 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); -#line 16408 "Commands.c" +#line 16932 "Commands.c" } #line 1884 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_it); -#line 16412 "Commands.c" +#line 16936 "Commands.c" } #line 1879 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (starting_sources); -#line 16416 "Commands.c" +#line 16940 "Commands.c" } #line 1874 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (child_subpath); #line 1874 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (t); -#line 16422 "Commands.c" +#line 16946 "Commands.c" } #line 1874 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_t_list); -#line 16426 "Commands.c" +#line 16950 "Commands.c" } { gint i = 0; #line 1890 "/home/jens/Source/shotwell/src/Commands.vala" i = 0; -#line 16432 "Commands.c" +#line 16956 "Commands.c" { - gboolean _tmp69_ = FALSE; + gboolean _tmp65_ = FALSE; #line 1890 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp69_ = TRUE; + _tmp65_ = TRUE; #line 1890 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 16439 "Commands.c" - gint _tmp71_; - GeeList* _tmp72_; - gint _tmp73_; - gint _tmp74_; - GeeList* _tmp75_; - gint _tmp76_; - gpointer _tmp77_; - SourceProxy* _tmp78_; - DataSource* _tmp79_; - DataSource* _tmp80_; +#line 16963 "Commands.c" + gint _tmp67_; + GeeList* _tmp68_; + gint _tmp69_; + gint _tmp70_; + GeeList* _tmp71_; + gint _tmp72_; + gpointer _tmp73_; + SourceProxy* _tmp74_; + DataSource* _tmp75_; + DataSource* _tmp76_; #line 1890 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp69_) { -#line 16452 "Commands.c" - gint _tmp70_; + if (!_tmp65_) { +#line 16976 "Commands.c" + gint _tmp66_; #line 1890 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp70_ = i; + _tmp66_ = i; #line 1890 "/home/jens/Source/shotwell/src/Commands.vala" - i = _tmp70_ + 1; -#line 16458 "Commands.c" + i = _tmp66_ + 1; +#line 16982 "Commands.c" } #line 1890 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp69_ = FALSE; + _tmp65_ = FALSE; #line 1890 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp71_ = i; + _tmp67_ = i; #line 1890 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp72_ = self->priv->src_before_state; + _tmp68_ = self->priv->src_before_state; #line 1890 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp73_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp69_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1890 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp74_ = _tmp73_; + _tmp70_ = _tmp69_; #line 1890 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp71_ < _tmp74_)) { + if (!(_tmp67_ < _tmp70_)) { #line 1890 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 16474 "Commands.c" +#line 16998 "Commands.c" } #line 1891 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp75_ = self->priv->src_before_state; + _tmp71_ = self->priv->src_before_state; #line 1891 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp76_ = i; + _tmp72_ = i; #line 1891 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp77_ = gee_list_get (_tmp75_, _tmp76_); + _tmp73_ = gee_list_get (_tmp71_, _tmp72_); #line 1891 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp78_ = (SourceProxy*) _tmp77_; + _tmp74_ = (SourceProxy*) _tmp73_; #line 1891 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp79_ = source_proxy_get_source (_tmp78_); + _tmp75_ = source_proxy_get_source (_tmp74_); #line 1891 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp80_ = _tmp79_; + _tmp76_ = _tmp75_; #line 1891 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp80_); + _g_object_unref0 (_tmp76_); #line 1891 "/home/jens/Source/shotwell/src/Commands.vala" - _source_proxy_unref0 (_tmp78_); -#line 16492 "Commands.c" + _source_proxy_unref0 (_tmp74_); +#line 17016 "Commands.c" } } } @@ -16496,236 +17020,233 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self) gint i = 0; #line 1893 "/home/jens/Source/shotwell/src/Commands.vala" i = 0; -#line 16500 "Commands.c" +#line 17024 "Commands.c" { - gboolean _tmp81_ = FALSE; + gboolean _tmp77_ = FALSE; #line 1893 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp81_ = TRUE; + _tmp77_ = TRUE; #line 1893 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 16507 "Commands.c" - gint _tmp83_; - GeeList* _tmp84_; - gint _tmp85_; - gint _tmp86_; - GeeList* _tmp87_; - gint _tmp88_; - gpointer _tmp89_; - SourceProxy* _tmp90_; - DataSource* _tmp91_; - DataSource* _tmp92_; +#line 17031 "Commands.c" + gint _tmp79_; + GeeList* _tmp80_; + gint _tmp81_; + gint _tmp82_; + GeeList* _tmp83_; + gint _tmp84_; + gpointer _tmp85_; + SourceProxy* _tmp86_; + DataSource* _tmp87_; + DataSource* _tmp88_; #line 1893 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp81_) { -#line 16520 "Commands.c" - gint _tmp82_; + if (!_tmp77_) { +#line 17044 "Commands.c" + gint _tmp78_; #line 1893 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp82_ = i; + _tmp78_ = i; #line 1893 "/home/jens/Source/shotwell/src/Commands.vala" - i = _tmp82_ + 1; -#line 16526 "Commands.c" + i = _tmp78_ + 1; +#line 17050 "Commands.c" } #line 1893 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp81_ = FALSE; + _tmp77_ = FALSE; #line 1893 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp83_ = i; + _tmp79_ = i; #line 1893 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp84_ = self->priv->dest_before_state; + _tmp80_ = self->priv->dest_before_state; #line 1893 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp85_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp81_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1893 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp86_ = _tmp85_; + _tmp82_ = _tmp81_; #line 1893 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp83_ < _tmp86_)) { + if (!(_tmp79_ < _tmp82_)) { #line 1893 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 16542 "Commands.c" +#line 17066 "Commands.c" } #line 1894 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp87_ = self->priv->dest_before_state; + _tmp83_ = self->priv->dest_before_state; #line 1894 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp88_ = i; + _tmp84_ = i; #line 1894 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp89_ = gee_list_get (_tmp87_, _tmp88_); + _tmp85_ = gee_list_get (_tmp83_, _tmp84_); #line 1894 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp90_ = (SourceProxy*) _tmp89_; + _tmp86_ = (SourceProxy*) _tmp85_; #line 1894 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp91_ = source_proxy_get_source (_tmp90_); + _tmp87_ = source_proxy_get_source (_tmp86_); #line 1894 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp92_ = _tmp91_; + _tmp88_ = _tmp87_; #line 1894 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp92_); + _g_object_unref0 (_tmp88_); #line 1894 "/home/jens/Source/shotwell/src/Commands.vala" - _source_proxy_unref0 (_tmp90_); -#line 16560 "Commands.c" + _source_proxy_unref0 (_tmp86_); +#line 17084 "Commands.c" } } } #line 1896 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp93_ = self->priv->to_path_parent_path; + _tmp89_ = self->priv->to_path_parent_path; #line 1896 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp93_ != NULL) { -#line 16568 "Commands.c" + if (_tmp89_ != NULL) { +#line 17092 "Commands.c" gchar* new_path = NULL; - const gchar* _tmp94_; - gchar* _tmp95_; - const gchar* _tmp96_ = NULL; - const gchar* _tmp97_; + const gchar* _tmp90_; + gchar* _tmp91_; + const gchar* _tmp92_ = NULL; + const gchar* _tmp93_; gchar* path = NULL; - gchar* _tmp100_; - TagSourceCollection* _tmp101_; - const gchar* _tmp102_; - gboolean _tmp103_; + gchar* _tmp96_; + TagSourceCollection* _tmp97_; + const gchar* _tmp98_; Tag* t = NULL; - const gchar* _tmp104_; - Tag* _tmp105_; + const gchar* _tmp99_; + Tag* _tmp100_; GeeList* kids = NULL; - Tag* _tmp106_; - GeeList* _tmp107_; - const gchar* _tmp125_; - GeeMap* _tmp126_; + Tag* _tmp101_; + GeeList* _tmp102_; + const gchar* _tmp120_; + GeeMap* _tmp121_; #line 1897 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp94_ = self->priv->to_path_parent_path; + _tmp90_ = self->priv->to_path_parent_path; #line 1897 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp95_ = hierarchical_tag_utilities_get_root_path_form (_tmp94_); + _tmp91_ = hierarchical_tag_utilities_get_root_path_form (_tmp90_); #line 1897 "/home/jens/Source/shotwell/src/Commands.vala" - new_path = _tmp95_; + new_path = _tmp91_; #line 1898 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp97_ = new_path; + _tmp93_ = new_path; #line 1898 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp97_ != NULL) { -#line 16597 "Commands.c" - const gchar* _tmp98_; + if (_tmp93_ != NULL) { +#line 17120 "Commands.c" + const gchar* _tmp94_; #line 1898 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp98_ = new_path; + _tmp94_ = new_path; #line 1898 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp96_ = _tmp98_; -#line 16603 "Commands.c" + _tmp92_ = _tmp94_; +#line 17126 "Commands.c" } else { - const gchar* _tmp99_; + const gchar* _tmp95_; #line 1898 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp99_ = self->priv->to_path_parent_path; + _tmp95_ = self->priv->to_path_parent_path; #line 1898 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp96_ = _tmp99_; -#line 16610 "Commands.c" + _tmp92_ = _tmp95_; +#line 17133 "Commands.c" } #line 1898 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp100_ = g_strdup (_tmp96_); + _tmp96_ = g_strdup (_tmp92_); #line 1898 "/home/jens/Source/shotwell/src/Commands.vala" - path = _tmp100_; -#line 1900 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp101_ = tag_global; + path = _tmp96_; #line 1900 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp102_ = path; + _tmp97_ = tag_global; #line 1900 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp103_ = tag_source_collection_exists (_tmp101_, _tmp102_, FALSE); + _tmp98_ = path; #line 1900 "/home/jens/Source/shotwell/src/Commands.vala" - _vala_assert (_tmp103_, "Tag.global.exists(path)"); + _vala_assert (tag_source_collection_exists (_tmp97_, _tmp98_, FALSE), "Tag.global.exists(path)"); #line 1902 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp104_ = path; + _tmp99_ = path; #line 1902 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp105_ = tag_for_path (_tmp104_); + _tmp100_ = tag_for_path (_tmp99_); #line 1902 "/home/jens/Source/shotwell/src/Commands.vala" - t = _tmp105_; + t = _tmp100_; #line 1904 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp106_ = t; + _tmp101_ = t; #line 1904 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp107_ = tag_get_hierarchical_children (_tmp106_); + _tmp102_ = tag_get_hierarchical_children (_tmp101_); #line 1904 "/home/jens/Source/shotwell/src/Commands.vala" - kids = _tmp107_; -#line 16636 "Commands.c" + kids = _tmp102_; +#line 17157 "Commands.c" { GeeList* _kidtag_list = NULL; - GeeList* _tmp108_; - GeeList* _tmp109_; + GeeList* _tmp103_; + GeeList* _tmp104_; gint _kidtag_size = 0; - GeeList* _tmp110_; - gint _tmp111_; - gint _tmp112_; + GeeList* _tmp105_; + gint _tmp106_; + gint _tmp107_; gint _kidtag_index = 0; #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp108_ = kids; + _tmp103_ = kids; #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp109_ = _g_object_ref0 (_tmp108_); + _tmp104_ = _g_object_ref0 (_tmp103_); #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" - _kidtag_list = _tmp109_; + _kidtag_list = _tmp104_; #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp110_ = _kidtag_list; + _tmp105_ = _kidtag_list; #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp111_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp106_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp112_ = _tmp111_; + _tmp107_ = _tmp106_; #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" - _kidtag_size = _tmp112_; + _kidtag_size = _tmp107_; #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" _kidtag_index = -1; #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 16664 "Commands.c" - gint _tmp113_; - gint _tmp114_; - gint _tmp115_; +#line 17185 "Commands.c" + gint _tmp108_; + gint _tmp109_; + gint _tmp110_; Tag* kidtag = NULL; - GeeList* _tmp116_; - gint _tmp117_; - gpointer _tmp118_; - Tag* _tmp119_; - Tag* _tmp120_; - GeeCollection* _tmp121_; - GeeCollection* _tmp122_; - GeeMultiMap* _tmp123_; - GeeMultiMap* _tmp124_; + GeeList* _tmp111_; + gint _tmp112_; + gpointer _tmp113_; + Tag* _tmp114_; + Tag* _tmp115_; + GeeCollection* _tmp116_; + GeeCollection* _tmp117_; + GeeMultiMap* _tmp118_; + GeeMultiMap* _tmp119_; #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp113_ = _kidtag_index; + _tmp108_ = _kidtag_index; #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" - _kidtag_index = _tmp113_ + 1; + _kidtag_index = _tmp108_ + 1; #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp114_ = _kidtag_index; + _tmp109_ = _kidtag_index; #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp115_ = _kidtag_size; + _tmp110_ = _kidtag_size; #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp114_ < _tmp115_)) { + if (!(_tmp109_ < _tmp110_)) { #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 16690 "Commands.c" +#line 17211 "Commands.c" } #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp116_ = _kidtag_list; + _tmp111_ = _kidtag_list; #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp117_ = _kidtag_index; + _tmp112_ = _kidtag_index; #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp118_ = gee_list_get (_tmp116_, _tmp117_); + _tmp113_ = gee_list_get (_tmp111_, _tmp112_); #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" - kidtag = (Tag*) _tmp118_; + kidtag = (Tag*) _tmp113_; #line 1906 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp119_ = kidtag; + _tmp114_ = kidtag; #line 1906 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp120_ = kidtag; + _tmp115_ = kidtag; #line 1906 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp121_ = tag_get_sources (_tmp120_); + _tmp116_ = tag_get_sources (_tmp115_); #line 1906 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp122_ = _tmp121_; + _tmp117_ = _tmp116_; #line 1906 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp123_ = tag_detach_many (_tmp119_, _tmp122_); + _tmp118_ = tag_detach_many (_tmp114_, _tmp117_); #line 1906 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp124_ = _tmp123_; + _tmp119_ = _tmp118_; #line 1906 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp124_); + _g_object_unref0 (_tmp119_); #line 1906 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp122_); + _g_object_unref0 (_tmp117_); #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (kidtag); -#line 16718 "Commands.c" +#line 17239 "Commands.c" } #line 1905 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_kidtag_list); -#line 16722 "Commands.c" +#line 17243 "Commands.c" } #line 1908 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp125_ = path; + _tmp120_ = path; #line 1908 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp126_ = self->priv->existing_dest_child_structure; + _tmp121_ = self->priv->existing_dest_child_structure; #line 1908 "/home/jens/Source/shotwell/src/Commands.vala" - reparent_tag_command_restore_child_attachments_at (self, _tmp125_, _tmp126_); + reparent_tag_command_restore_child_attachments_at (self, _tmp120_, _tmp121_); #line 1896 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (kids); #line 1896 "/home/jens/Source/shotwell/src/Commands.vala" @@ -16734,209 +17255,210 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self) _g_free0 (path); #line 1896 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (new_path); -#line 16738 "Commands.c" +#line 17259 "Commands.c" } else { - GeeSet* _tmp127_; - const gchar* _tmp128_; - Tag* _tmp129_; - Tag* _tmp130_; - const gchar* _tmp131_; - Tag* _tmp132_; - Tag* _tmp133_; - GeeCollection* _tmp134_; - GeeCollection* _tmp135_; - GeeMultiMap* _tmp136_; - GeeMultiMap* _tmp137_; - const gchar* _tmp138_; - Tag* _tmp139_; - Tag* _tmp140_; - GeeSet* _tmp141_; + GeeSet* _tmp122_; + const gchar* _tmp123_; + Tag* _tmp124_; + Tag* _tmp125_; + const gchar* _tmp126_; + Tag* _tmp127_; + Tag* _tmp128_; + GeeCollection* _tmp129_; + GeeCollection* _tmp130_; + GeeMultiMap* _tmp131_; + GeeMultiMap* _tmp132_; + const gchar* _tmp133_; + Tag* _tmp134_; + Tag* _tmp135_; + GeeSet* _tmp136_; GeeList* kids = NULL; - const gchar* _tmp142_; - Tag* _tmp143_; - Tag* _tmp144_; - GeeList* _tmp145_; - GeeList* _tmp146_; - const gchar* _tmp164_; - GeeMap* _tmp165_; + const gchar* _tmp137_; + Tag* _tmp138_; + Tag* _tmp139_; + GeeList* _tmp140_; + GeeList* _tmp141_; + const gchar* _tmp159_; + GeeMap* _tmp160_; #line 1910 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp127_ = self->priv->existing_dest_membership; + _tmp122_ = self->priv->existing_dest_membership; #line 1910 "/home/jens/Source/shotwell/src/Commands.vala" - _vala_assert (_tmp127_ != NULL, "existing_dest_membership != null"); + _vala_assert (_tmp122_ != NULL, "existing_dest_membership != null"); #line 1911 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp128_ = self->priv->to_path; + _tmp123_ = self->priv->to_path; #line 1911 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp129_ = tag_for_path (_tmp128_); + _tmp124_ = tag_for_path (_tmp123_); #line 1911 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp130_ = _tmp129_; + _tmp125_ = _tmp124_; #line 1911 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp131_ = self->priv->to_path; + _tmp126_ = self->priv->to_path; #line 1911 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp132_ = tag_for_path (_tmp131_); + _tmp127_ = tag_for_path (_tmp126_); #line 1911 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp133_ = _tmp132_; + _tmp128_ = _tmp127_; #line 1911 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp134_ = tag_get_sources (_tmp133_); + _tmp129_ = tag_get_sources (_tmp128_); #line 1911 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp135_ = _tmp134_; + _tmp130_ = _tmp129_; #line 1911 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp136_ = tag_detach_many (_tmp130_, _tmp135_); + _tmp131_ = tag_detach_many (_tmp125_, _tmp130_); #line 1911 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp137_ = _tmp136_; + _tmp132_ = _tmp131_; #line 1911 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp137_); + _g_object_unref0 (_tmp132_); #line 1911 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp135_); + _g_object_unref0 (_tmp130_); #line 1911 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp133_); + _g_object_unref0 (_tmp128_); #line 1911 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp130_); + _g_object_unref0 (_tmp125_); #line 1912 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp138_ = self->priv->to_path; + _tmp133_ = self->priv->to_path; #line 1912 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp139_ = tag_for_path (_tmp138_); + _tmp134_ = tag_for_path (_tmp133_); #line 1912 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp140_ = _tmp139_; + _tmp135_ = _tmp134_; #line 1912 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp141_ = self->priv->existing_dest_membership; + _tmp136_ = self->priv->existing_dest_membership; #line 1912 "/home/jens/Source/shotwell/src/Commands.vala" - tag_attach_many (_tmp140_, G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, GEE_TYPE_COLLECTION, GeeCollection)); + tag_attach_many (_tmp135_, G_TYPE_CHECK_INSTANCE_CAST (_tmp136_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1912 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp140_); + _g_object_unref0 (_tmp135_); #line 1914 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp142_ = self->priv->to_path; + _tmp137_ = self->priv->to_path; #line 1914 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp143_ = tag_for_path (_tmp142_); + _tmp138_ = tag_for_path (_tmp137_); #line 1914 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp144_ = _tmp143_; + _tmp139_ = _tmp138_; #line 1914 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp145_ = tag_get_hierarchical_children (_tmp144_); + _tmp140_ = tag_get_hierarchical_children (_tmp139_); #line 1914 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp146_ = _tmp145_; + _tmp141_ = _tmp140_; #line 1914 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp144_); + _g_object_unref0 (_tmp139_); #line 1914 "/home/jens/Source/shotwell/src/Commands.vala" - kids = _tmp146_; -#line 16821 "Commands.c" + kids = _tmp141_; +#line 17342 "Commands.c" { GeeList* _kidtag_list = NULL; - GeeList* _tmp147_; - GeeList* _tmp148_; + GeeList* _tmp142_; + GeeList* _tmp143_; gint _kidtag_size = 0; - GeeList* _tmp149_; - gint _tmp150_; - gint _tmp151_; + GeeList* _tmp144_; + gint _tmp145_; + gint _tmp146_; gint _kidtag_index = 0; #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp147_ = kids; + _tmp142_ = kids; #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp148_ = _g_object_ref0 (_tmp147_); + _tmp143_ = _g_object_ref0 (_tmp142_); #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" - _kidtag_list = _tmp148_; + _kidtag_list = _tmp143_; #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp149_ = _kidtag_list; + _tmp144_ = _kidtag_list; #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp150_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp149_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp145_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp144_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp151_ = _tmp150_; + _tmp146_ = _tmp145_; #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" - _kidtag_size = _tmp151_; + _kidtag_size = _tmp146_; #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" _kidtag_index = -1; #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 16849 "Commands.c" - gint _tmp152_; - gint _tmp153_; - gint _tmp154_; +#line 17370 "Commands.c" + gint _tmp147_; + gint _tmp148_; + gint _tmp149_; Tag* kidtag = NULL; - GeeList* _tmp155_; - gint _tmp156_; - gpointer _tmp157_; - Tag* _tmp158_; - Tag* _tmp159_; - GeeCollection* _tmp160_; - GeeCollection* _tmp161_; - GeeMultiMap* _tmp162_; - GeeMultiMap* _tmp163_; + GeeList* _tmp150_; + gint _tmp151_; + gpointer _tmp152_; + Tag* _tmp153_; + Tag* _tmp154_; + GeeCollection* _tmp155_; + GeeCollection* _tmp156_; + GeeMultiMap* _tmp157_; + GeeMultiMap* _tmp158_; #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp152_ = _kidtag_index; + _tmp147_ = _kidtag_index; #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" - _kidtag_index = _tmp152_ + 1; + _kidtag_index = _tmp147_ + 1; #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp153_ = _kidtag_index; + _tmp148_ = _kidtag_index; #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp154_ = _kidtag_size; + _tmp149_ = _kidtag_size; #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp153_ < _tmp154_)) { + if (!(_tmp148_ < _tmp149_)) { #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 16875 "Commands.c" +#line 17396 "Commands.c" } #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp155_ = _kidtag_list; + _tmp150_ = _kidtag_list; #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp156_ = _kidtag_index; + _tmp151_ = _kidtag_index; #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp157_ = gee_list_get (_tmp155_, _tmp156_); + _tmp152_ = gee_list_get (_tmp150_, _tmp151_); #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" - kidtag = (Tag*) _tmp157_; + kidtag = (Tag*) _tmp152_; #line 1916 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp158_ = kidtag; + _tmp153_ = kidtag; #line 1916 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp159_ = kidtag; + _tmp154_ = kidtag; #line 1916 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp160_ = tag_get_sources (_tmp159_); + _tmp155_ = tag_get_sources (_tmp154_); #line 1916 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp161_ = _tmp160_; + _tmp156_ = _tmp155_; #line 1916 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp162_ = tag_detach_many (_tmp158_, _tmp161_); + _tmp157_ = tag_detach_many (_tmp153_, _tmp156_); #line 1916 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp163_ = _tmp162_; + _tmp158_ = _tmp157_; #line 1916 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp163_); + _g_object_unref0 (_tmp158_); #line 1916 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp161_); + _g_object_unref0 (_tmp156_); #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (kidtag); -#line 16903 "Commands.c" +#line 17424 "Commands.c" } #line 1915 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_kidtag_list); -#line 16907 "Commands.c" +#line 17428 "Commands.c" } #line 1918 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp164_ = self->priv->to_path; + _tmp159_ = self->priv->to_path; #line 1918 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp165_ = self->priv->existing_dest_child_structure; + _tmp160_ = self->priv->existing_dest_child_structure; #line 1918 "/home/jens/Source/shotwell/src/Commands.vala" - reparent_tag_command_restore_child_attachments_at (self, _tmp164_, _tmp165_); + reparent_tag_command_restore_child_attachments_at (self, _tmp159_, _tmp160_); #line 1896 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (kids); -#line 16917 "Commands.c" +#line 17438 "Commands.c" } #line 1863 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (unwind_target); -#line 16921 "Commands.c" +#line 17442 "Commands.c" } -static void reparent_tag_command_save_after_state (ReparentTagCommand* self) { +static void +reparent_tag_command_save_after_state (ReparentTagCommand* self) +{ GeeList* _tmp0_; GeeArrayList* _tmp1_; TagSourceCollection* _tmp2_; const gchar* _tmp3_; - gboolean _tmp4_; Tag* to_tag = NULL; - const gchar* _tmp5_; - Tag* _tmp6_; - GeeList* _tmp7_; - Tag* _tmp8_; + const gchar* _tmp4_; + Tag* _tmp5_; + GeeList* _tmp6_; + Tag* _tmp7_; + SourceProxy* _tmp8_; SourceProxy* _tmp9_; - SourceProxy* _tmp10_; GeeList* to_children = NULL; - Tag* _tmp11_; - GeeList* _tmp12_; + Tag* _tmp10_; + GeeList* _tmp11_; #line 1922 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_REPARENT_TAG_COMMAND (self)); #line 1923 "/home/jens/Source/shotwell/src/Commands.vala" @@ -16954,104 +17476,102 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) { #line 1928 "/home/jens/Source/shotwell/src/Commands.vala" _tmp3_ = self->priv->to_path; #line 1928 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = tag_source_collection_exists (_tmp2_, _tmp3_, FALSE); -#line 1928 "/home/jens/Source/shotwell/src/Commands.vala" - _vala_assert (_tmp4_, "Tag.global.exists(to_path)"); + _vala_assert (tag_source_collection_exists (_tmp2_, _tmp3_, FALSE), "Tag.global.exists(to_path)"); #line 1929 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = self->priv->to_path; + _tmp4_ = self->priv->to_path; #line 1929 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = tag_for_path (_tmp5_); + _tmp5_ = tag_for_path (_tmp4_); #line 1929 "/home/jens/Source/shotwell/src/Commands.vala" - to_tag = _tmp6_; + to_tag = _tmp5_; #line 1930 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = self->priv->after_state; + _tmp6_ = self->priv->after_state; #line 1930 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = to_tag; + _tmp7_ = to_tag; #line 1930 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PROXYABLE, Proxyable)); + _tmp8_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PROXYABLE, Proxyable)); #line 1930 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 1930 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp10_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), _tmp9_); #line 1930 "/home/jens/Source/shotwell/src/Commands.vala" - _source_proxy_unref0 (_tmp10_); + _source_proxy_unref0 (_tmp9_); #line 1933 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = to_tag; + _tmp10_ = to_tag; #line 1933 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = tag_get_hierarchical_children (_tmp11_); + _tmp11_ = tag_get_hierarchical_children (_tmp10_); #line 1933 "/home/jens/Source/shotwell/src/Commands.vala" - to_children = _tmp12_; -#line 16985 "Commands.c" + to_children = _tmp11_; +#line 17505 "Commands.c" { gint i = 0; - GeeList* _tmp13_; + GeeList* _tmp12_; + gint _tmp13_; gint _tmp14_; - gint _tmp15_; #line 1934 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = to_children; + _tmp12_ = to_children; #line 1934 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1934 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 1934 "/home/jens/Source/shotwell/src/Commands.vala" - i = _tmp15_ - 1; -#line 16999 "Commands.c" + i = _tmp14_ - 1; +#line 17519 "Commands.c" { - gboolean _tmp16_ = FALSE; + gboolean _tmp15_ = FALSE; #line 1934 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = TRUE; + _tmp15_ = TRUE; #line 1934 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 17006 "Commands.c" - gint _tmp18_; +#line 17526 "Commands.c" + gint _tmp17_; + GeeList* _tmp18_; GeeList* _tmp19_; - GeeList* _tmp20_; - gint _tmp21_; - gpointer _tmp22_; - Tag* _tmp23_; + gint _tmp20_; + gpointer _tmp21_; + Tag* _tmp22_; + SourceProxy* _tmp23_; SourceProxy* _tmp24_; - SourceProxy* _tmp25_; #line 1934 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp16_) { -#line 17017 "Commands.c" - gint _tmp17_; + if (!_tmp15_) { +#line 17537 "Commands.c" + gint _tmp16_; #line 1934 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = i; + _tmp16_ = i; #line 1934 "/home/jens/Source/shotwell/src/Commands.vala" - i = _tmp17_ - 1; -#line 17023 "Commands.c" + i = _tmp16_ - 1; +#line 17543 "Commands.c" } #line 1934 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = FALSE; + _tmp15_ = FALSE; #line 1934 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = i; + _tmp17_ = i; #line 1934 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp18_ >= 0)) { + if (!(_tmp17_ >= 0)) { #line 1934 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 17033 "Commands.c" +#line 17553 "Commands.c" } #line 1935 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = self->priv->after_state; + _tmp18_ = self->priv->after_state; #line 1935 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = to_children; + _tmp19_ = to_children; #line 1935 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = i; + _tmp20_ = i; #line 1935 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = gee_list_get (_tmp20_, _tmp21_); + _tmp21_ = gee_list_get (_tmp19_, _tmp20_); #line 1935 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = (Tag*) _tmp22_; + _tmp22_ = (Tag*) _tmp21_; #line 1935 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PROXYABLE, Proxyable)); + _tmp23_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PROXYABLE, Proxyable)); #line 1935 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = _tmp24_; + _tmp24_ = _tmp23_; #line 1935 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp24_); #line 1935 "/home/jens/Source/shotwell/src/Commands.vala" - _source_proxy_unref0 (_tmp25_); + _source_proxy_unref0 (_tmp24_); #line 1935 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp23_); -#line 17055 "Commands.c" + _g_object_unref0 (_tmp22_); +#line 17575 "Commands.c" } } } @@ -17059,11 +17579,13 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) { _g_object_unref0 (to_children); #line 1922 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (to_tag); -#line 17063 "Commands.c" +#line 17583 "Commands.c" } -static void reparent_tag_command_restore_after_state (ReparentTagCommand* self) { +static void +reparent_tag_command_restore_after_state (ReparentTagCommand* self) +{ GeeList* _tmp0_; #line 1938 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_REPARENT_TAG_COMMAND (self)); @@ -17071,19 +17593,19 @@ static void reparent_tag_command_restore_after_state (ReparentTagCommand* self) _tmp0_ = self->priv->after_state; #line 1939 "/home/jens/Source/shotwell/src/Commands.vala" _vala_assert (_tmp0_ != NULL, "after_state != null"); -#line 17075 "Commands.c" +#line 17597 "Commands.c" { gint i = 0; #line 1941 "/home/jens/Source/shotwell/src/Commands.vala" i = 0; -#line 17080 "Commands.c" +#line 17602 "Commands.c" { gboolean _tmp1_ = FALSE; #line 1941 "/home/jens/Source/shotwell/src/Commands.vala" _tmp1_ = TRUE; #line 1941 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 17087 "Commands.c" +#line 17609 "Commands.c" gint _tmp3_; GeeList* _tmp4_; gint _tmp5_; @@ -17096,13 +17618,13 @@ static void reparent_tag_command_restore_after_state (ReparentTagCommand* self) DataSource* _tmp12_; #line 1941 "/home/jens/Source/shotwell/src/Commands.vala" if (!_tmp1_) { -#line 17100 "Commands.c" +#line 17622 "Commands.c" gint _tmp2_; #line 1941 "/home/jens/Source/shotwell/src/Commands.vala" _tmp2_ = i; #line 1941 "/home/jens/Source/shotwell/src/Commands.vala" i = _tmp2_ + 1; -#line 17106 "Commands.c" +#line 17628 "Commands.c" } #line 1941 "/home/jens/Source/shotwell/src/Commands.vala" _tmp1_ = FALSE; @@ -17118,7 +17640,7 @@ static void reparent_tag_command_restore_after_state (ReparentTagCommand* self) if (!(_tmp3_ < _tmp6_)) { #line 1941 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 17122 "Commands.c" +#line 17644 "Commands.c" } #line 1942 "/home/jens/Source/shotwell/src/Commands.vala" _tmp7_ = self->priv->after_state; @@ -17136,18 +17658,19 @@ static void reparent_tag_command_restore_after_state (ReparentTagCommand* self) _g_object_unref0 (_tmp12_); #line 1942 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (_tmp10_); -#line 17140 "Commands.c" +#line 17662 "Commands.c" } } } } -static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const gchar* path) { +static void +reparent_tag_command_prepare_parent (ReparentTagCommand* self, + const gchar* path) +{ Tag* new_parent = NULL; - const gchar* _tmp0_; - gboolean _tmp1_; - Tag* _tmp27_; + Tag* _tmp22_; #line 1945 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_REPARENT_TAG_COMMAND (self)); #line 1945 "/home/jens/Source/shotwell/src/Commands.vala" @@ -17155,157 +17678,145 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const #line 1947 "/home/jens/Source/shotwell/src/Commands.vala" new_parent = NULL; #line 1948 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = path; -#line 1948 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = g_str_has_prefix (_tmp0_, TAG_PATH_SEPARATOR_STRING); -#line 1948 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp1_) { -#line 17164 "Commands.c" + if (g_str_has_prefix (path, TAG_PATH_SEPARATOR_STRING)) { +#line 17683 "Commands.c" GeeList* parent_paths = NULL; - const gchar* _tmp2_; - GeeList* _tmp3_; - GeeList* _tmp4_; - gint _tmp5_; - gint _tmp6_; -#line 1949 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = path; + GeeList* _tmp0_; + GeeList* _tmp1_; + gint _tmp2_; + gint _tmp3_; #line 1949 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp2_); + _tmp0_ = hierarchical_tag_utilities_enumerate_parent_paths (path); #line 1949 "/home/jens/Source/shotwell/src/Commands.vala" - parent_paths = _tmp3_; + parent_paths = _tmp0_; #line 1950 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = parent_paths; + _tmp1_ = parent_paths; #line 1950 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1950 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 1950 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp6_ > 0) { -#line 17185 "Commands.c" + if (_tmp3_ > 0) { +#line 17701 "Commands.c" gchar* immediate_parent_path = NULL; - GeeList* _tmp7_; - GeeList* _tmp8_; - gint _tmp9_; - gint _tmp10_; - gpointer _tmp11_; - TagSourceCollection* _tmp12_; - const gchar* _tmp13_; - gboolean _tmp14_; + GeeList* _tmp4_; + GeeList* _tmp5_; + gint _tmp6_; + gint _tmp7_; + gpointer _tmp8_; + TagSourceCollection* _tmp9_; + const gchar* _tmp10_; #line 1951 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = parent_paths; + _tmp4_ = parent_paths; #line 1951 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = parent_paths; + _tmp5_ = parent_paths; #line 1951 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1951 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = _tmp9_; + _tmp7_ = _tmp6_; #line 1951 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = gee_list_get (_tmp7_, _tmp10_ - 1); + _tmp8_ = gee_list_get (_tmp4_, _tmp7_ - 1); #line 1951 "/home/jens/Source/shotwell/src/Commands.vala" - immediate_parent_path = (gchar*) _tmp11_; + immediate_parent_path = (gchar*) _tmp8_; #line 1952 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = tag_global; + _tmp9_ = tag_global; #line 1952 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = immediate_parent_path; + _tmp10_ = immediate_parent_path; #line 1952 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = tag_source_collection_exists (_tmp12_, _tmp13_, FALSE); -#line 1952 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp14_) { -#line 17215 "Commands.c" - const gchar* _tmp15_; - Tag* _tmp16_; + if (tag_source_collection_exists (_tmp9_, _tmp10_, FALSE)) { +#line 17728 "Commands.c" + const gchar* _tmp11_; + Tag* _tmp12_; #line 1953 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = immediate_parent_path; + _tmp11_ = immediate_parent_path; #line 1953 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = tag_for_path (_tmp15_); + _tmp12_ = tag_for_path (_tmp11_); #line 1953 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (new_parent); #line 1953 "/home/jens/Source/shotwell/src/Commands.vala" - new_parent = _tmp16_; -#line 17226 "Commands.c" + new_parent = _tmp12_; +#line 17739 "Commands.c" } else { - TagSourceCollection* _tmp17_; - const gchar* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; - gboolean _tmp21_; - gboolean _tmp22_; -#line 1954 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = tag_global; + TagSourceCollection* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + gboolean _tmp17_; #line 1954 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = immediate_parent_path; + _tmp13_ = tag_global; #line 1954 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = string_substring (_tmp18_, (glong) 1, (glong) -1); + _tmp14_ = immediate_parent_path; #line 1954 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = _tmp19_; + _tmp15_ = string_substring (_tmp14_, (glong) 1, (glong) -1); #line 1954 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = tag_source_collection_exists (_tmp17_, _tmp20_, FALSE); + _tmp16_ = _tmp15_; #line 1954 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = _tmp21_; + _tmp17_ = tag_source_collection_exists (_tmp13_, _tmp16_, FALSE); #line 1954 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp16_); #line 1954 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp22_) { -#line 17250 "Commands.c" - const gchar* _tmp23_; - gchar* _tmp24_; - gchar* _tmp25_; - Tag* _tmp26_; + if (_tmp17_) { +#line 17760 "Commands.c" + const gchar* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; + Tag* _tmp21_; #line 1955 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = immediate_parent_path; + _tmp18_ = immediate_parent_path; #line 1955 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = string_substring (_tmp23_, (glong) 1, (glong) -1); + _tmp19_ = string_substring (_tmp18_, (glong) 1, (glong) -1); #line 1955 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = _tmp24_; + _tmp20_ = _tmp19_; #line 1955 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = tag_for_path (_tmp25_); + _tmp21_ = tag_for_path (_tmp20_); #line 1955 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (new_parent); #line 1955 "/home/jens/Source/shotwell/src/Commands.vala" - new_parent = _tmp26_; + new_parent = _tmp21_; #line 1955 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp25_); -#line 17269 "Commands.c" + _g_free0 (_tmp20_); +#line 17779 "Commands.c" } else { #line 1957 "/home/jens/Source/shotwell/src/Commands.vala" g_assert_not_reached (); -#line 17273 "Commands.c" +#line 17783 "Commands.c" } } #line 1950 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (immediate_parent_path); -#line 17278 "Commands.c" +#line 17788 "Commands.c" } #line 1948 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (parent_paths); -#line 17282 "Commands.c" +#line 17792 "Commands.c" } #line 1960 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = new_parent; + _tmp22_ = new_parent; #line 1960 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp27_ != NULL) { -#line 17288 "Commands.c" - Tag* _tmp28_; + if (_tmp22_ != NULL) { +#line 17798 "Commands.c" + Tag* _tmp23_; #line 1961 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp28_ = new_parent; + _tmp23_ = new_parent; #line 1961 "/home/jens/Source/shotwell/src/Commands.vala" - tag_promote (_tmp28_); -#line 17294 "Commands.c" + tag_promote (_tmp23_); +#line 17804 "Commands.c" } #line 1945 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (new_parent); -#line 17298 "Commands.c" +#line 17808 "Commands.c" } -static void reparent_tag_command_do_source_parent_detachments (ReparentTagCommand* self) { +static void +reparent_tag_command_do_source_parent_detachments (ReparentTagCommand* self) +{ TagSourceCollection* _tmp0_; const gchar* _tmp1_; - gboolean _tmp2_; Tag* from_tag = NULL; - const gchar* _tmp3_; - Tag* _tmp4_; - GeeMap* _tmp5_; + const gchar* _tmp2_; + Tag* _tmp3_; + GeeMap* _tmp4_; #line 1964 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_REPARENT_TAG_COMMAND (self)); #line 1965 "/home/jens/Source/shotwell/src/Commands.vala" @@ -17313,367 +17824,349 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman #line 1965 "/home/jens/Source/shotwell/src/Commands.vala" _tmp1_ = self->priv->from_path; #line 1965 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = tag_source_collection_exists (_tmp0_, _tmp1_, FALSE); -#line 1965 "/home/jens/Source/shotwell/src/Commands.vala" - _vala_assert (_tmp2_, "Tag.global.exists(from_path)"); + _vala_assert (tag_source_collection_exists (_tmp0_, _tmp1_, FALSE), "Tag.global.exists(from_path)"); #line 1966 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = self->priv->from_path; + _tmp2_ = self->priv->from_path; #line 1966 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = tag_for_path (_tmp3_); + _tmp3_ = tag_for_path (_tmp2_); #line 1966 "/home/jens/Source/shotwell/src/Commands.vala" - from_tag = _tmp4_; + from_tag = _tmp3_; #line 1969 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = self->priv->src_parent_detachments; + _tmp4_ = self->priv->src_parent_detachments; #line 1969 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp5_ == NULL) { -#line 17330 "Commands.c" - GeeHashMap* _tmp6_; + if (_tmp4_ == NULL) { +#line 17839 "Commands.c" + GeeHashMap* _tmp5_; #line 1970 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp5_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 1970 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->src_parent_detachments); #line 1970 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->src_parent_detachments = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_MAP, GeeMap); -#line 17338 "Commands.c" + self->priv->src_parent_detachments = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_MAP, GeeMap); +#line 17847 "Commands.c" { GeeIterator* _source_it = NULL; - Tag* _tmp7_; + Tag* _tmp6_; + GeeCollection* _tmp7_; GeeCollection* _tmp8_; - GeeCollection* _tmp9_; + GeeIterator* _tmp9_; GeeIterator* _tmp10_; - GeeIterator* _tmp11_; #line 1971 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = from_tag; + _tmp6_ = from_tag; #line 1971 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = tag_get_sources (_tmp7_); + _tmp7_ = tag_get_sources (_tmp6_); #line 1971 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 1971 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1971 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 1971 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 1971 "/home/jens/Source/shotwell/src/Commands.vala" - _source_it = _tmp11_; + _source_it = _tmp10_; #line 1971 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 17362 "Commands.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 17871 "Commands.c" + GeeIterator* _tmp11_; MediaSource* source = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; + GeeIterator* _tmp12_; + gpointer _tmp13_; Tag* current_parent = NULL; - Tag* _tmp16_; - Tag* _tmp17_; + Tag* _tmp14_; + Tag* _tmp15_; gint running_attach_count = 0; - Tag* _tmp18_; - MediaSource* _tmp19_; - gint _tmp20_; -#line 1971 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = _source_it; + Tag* _tmp16_; + MediaSource* _tmp17_; #line 1971 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = gee_iterator_next (_tmp12_); + _tmp11_ = _source_it; #line 1971 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp11_)) { #line 1971 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 17383 "Commands.c" +#line 17888 "Commands.c" } #line 1971 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = _source_it; + _tmp12_ = _source_it; #line 1971 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 1971 "/home/jens/Source/shotwell/src/Commands.vala" - source = (MediaSource*) _tmp15_; + source = (MediaSource*) _tmp13_; #line 1972 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = from_tag; + _tmp14_ = from_tag; #line 1972 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = tag_get_hierarchical_parent (_tmp16_); + _tmp15_ = tag_get_hierarchical_parent (_tmp14_); #line 1972 "/home/jens/Source/shotwell/src/Commands.vala" - current_parent = _tmp17_; + current_parent = _tmp15_; #line 1973 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = from_tag; -#line 1973 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = source; + _tmp16_ = from_tag; #line 1973 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = tag_get_attachment_count (_tmp18_, _tmp19_); + _tmp17_ = source; #line 1973 "/home/jens/Source/shotwell/src/Commands.vala" - running_attach_count = _tmp20_ + 1; + running_attach_count = tag_get_attachment_count (_tmp16_, _tmp17_) + 1; #line 1974 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 17407 "Commands.c" - Tag* _tmp21_; +#line 17910 "Commands.c" + Tag* _tmp18_; gchar* current_parent_path = NULL; - Tag* _tmp22_; - gchar* _tmp23_; - GeeMap* _tmp24_; - const gchar* _tmp25_; - gboolean _tmp26_; + Tag* _tmp19_; + gchar* _tmp20_; + GeeMap* _tmp21_; + const gchar* _tmp22_; gint curr_parent_attach_count = 0; - Tag* _tmp31_; - MediaSource* _tmp32_; - gint _tmp33_; - gint _tmp34_; - gint _tmp35_; - gint _tmp36_; - gint _tmp37_; - gint _tmp43_; - Tag* _tmp44_; - Tag* _tmp45_; + Tag* _tmp27_; + MediaSource* _tmp28_; + gint _tmp29_; + gint _tmp30_; + gint _tmp31_; + gint _tmp32_; + gint _tmp38_; + Tag* _tmp39_; + Tag* _tmp40_; #line 1974 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = current_parent; + _tmp18_ = current_parent; #line 1974 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp21_ != NULL)) { + if (!(_tmp18_ != NULL)) { #line 1974 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 17432 "Commands.c" +#line 17933 "Commands.c" } #line 1975 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = current_parent; + _tmp19_ = current_parent; #line 1975 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = tag_get_path (_tmp22_); + _tmp20_ = tag_get_path (_tmp19_); #line 1975 "/home/jens/Source/shotwell/src/Commands.vala" - current_parent_path = _tmp23_; + current_parent_path = _tmp20_; #line 1976 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = self->priv->src_parent_detachments; + _tmp21_ = self->priv->src_parent_detachments; #line 1976 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = current_parent_path; + _tmp22_ = current_parent_path; #line 1976 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = gee_map_has_key (_tmp24_, _tmp25_); -#line 1976 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp26_) { -#line 17448 "Commands.c" - GeeMap* _tmp27_; - const gchar* _tmp28_; - GeeHashSet* _tmp29_; - GeeHashSet* _tmp30_; + if (!gee_map_has_key (_tmp21_, _tmp22_)) { +#line 17947 "Commands.c" + GeeMap* _tmp23_; + const gchar* _tmp24_; + GeeHashSet* _tmp25_; + GeeHashSet* _tmp26_; #line 1977 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = self->priv->src_parent_detachments; + _tmp23_ = self->priv->src_parent_detachments; #line 1977 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp28_ = current_parent_path; + _tmp24_ = current_parent_path; #line 1977 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp29_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp25_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 1977 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp30_ = _tmp29_; + _tmp26_ = _tmp25_; #line 1977 "/home/jens/Source/shotwell/src/Commands.vala" - gee_map_set (_tmp27_, _tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_SET, GeeSet)); + gee_map_set (_tmp23_, _tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_SET, GeeSet)); #line 1977 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp30_); -#line 17465 "Commands.c" + _g_object_unref0 (_tmp26_); +#line 17964 "Commands.c" } #line 1979 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp31_ = current_parent; -#line 1979 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp32_ = source; + _tmp27_ = current_parent; #line 1979 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp33_ = tag_get_attachment_count (_tmp31_, _tmp32_); + _tmp28_ = source; #line 1979 "/home/jens/Source/shotwell/src/Commands.vala" - curr_parent_attach_count = _tmp33_; + curr_parent_attach_count = tag_get_attachment_count (_tmp27_, _tmp28_); #line 1981 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp34_ = curr_parent_attach_count; + _tmp29_ = curr_parent_attach_count; #line 1981 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp35_ = running_attach_count; + _tmp30_ = running_attach_count; #line 1981 "/home/jens/Source/shotwell/src/Commands.vala" - _vala_assert (_tmp34_ >= _tmp35_, "curr_parent_attach_count >= running_attach_count"); + _vala_assert (_tmp29_ >= _tmp30_, "curr_parent_attach_count >= running_attach_count"); #line 1985 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp36_ = curr_parent_attach_count; + _tmp31_ = curr_parent_attach_count; #line 1985 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp37_ = running_attach_count; + _tmp32_ = running_attach_count; #line 1985 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp36_ == _tmp37_) { -#line 17487 "Commands.c" - GeeMap* _tmp38_; - const gchar* _tmp39_; - gpointer _tmp40_; - GeeSet* _tmp41_; - MediaSource* _tmp42_; + if (_tmp31_ == _tmp32_) { +#line 17984 "Commands.c" + GeeMap* _tmp33_; + const gchar* _tmp34_; + gpointer _tmp35_; + GeeSet* _tmp36_; + MediaSource* _tmp37_; #line 1986 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp38_ = self->priv->src_parent_detachments; + _tmp33_ = self->priv->src_parent_detachments; #line 1986 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp39_ = current_parent_path; + _tmp34_ = current_parent_path; #line 1986 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp40_ = gee_map_get (_tmp38_, _tmp39_); + _tmp35_ = gee_map_get (_tmp33_, _tmp34_); #line 1986 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp41_ = (GeeSet*) _tmp40_; + _tmp36_ = (GeeSet*) _tmp35_; #line 1986 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp42_ = source; + _tmp37_ = source; #line 1986 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), _tmp42_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_); #line 1986 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp41_); -#line 17507 "Commands.c" + _g_object_unref0 (_tmp36_); +#line 18004 "Commands.c" } #line 1988 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp43_ = running_attach_count; + _tmp38_ = running_attach_count; #line 1988 "/home/jens/Source/shotwell/src/Commands.vala" - running_attach_count = _tmp43_ + 1; + running_attach_count = _tmp38_ + 1; #line 1989 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp44_ = current_parent; + _tmp39_ = current_parent; #line 1989 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp45_ = tag_get_hierarchical_parent (_tmp44_); + _tmp40_ = tag_get_hierarchical_parent (_tmp39_); #line 1989 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (current_parent); #line 1989 "/home/jens/Source/shotwell/src/Commands.vala" - current_parent = _tmp45_; + current_parent = _tmp40_; #line 1974 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (current_parent_path); -#line 17523 "Commands.c" +#line 18020 "Commands.c" } #line 1971 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (current_parent); #line 1971 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); -#line 17529 "Commands.c" +#line 18026 "Commands.c" } #line 1971 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_it); -#line 17533 "Commands.c" +#line 18030 "Commands.c" } } { GeeIterator* _p_it = NULL; - GeeMap* _tmp46_; - GeeSet* _tmp47_; - GeeSet* _tmp48_; - GeeSet* _tmp49_; - GeeIterator* _tmp50_; - GeeIterator* _tmp51_; + GeeMap* _tmp41_; + GeeSet* _tmp42_; + GeeSet* _tmp43_; + GeeSet* _tmp44_; + GeeIterator* _tmp45_; + GeeIterator* _tmp46_; #line 1995 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp46_ = self->priv->src_parent_detachments; + _tmp41_ = self->priv->src_parent_detachments; #line 1995 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp47_ = gee_map_get_keys (_tmp46_); + _tmp42_ = gee_map_get_keys (_tmp41_); #line 1995 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp48_ = _tmp47_; + _tmp43_ = _tmp42_; #line 1995 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp49_ = _tmp48_; + _tmp44_ = _tmp43_; #line 1995 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp50_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp45_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1995 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp51_ = _tmp50_; + _tmp46_ = _tmp45_; #line 1995 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp49_); + _g_object_unref0 (_tmp44_); #line 1995 "/home/jens/Source/shotwell/src/Commands.vala" - _p_it = _tmp51_; + _p_it = _tmp46_; #line 1995 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 17562 "Commands.c" - GeeIterator* _tmp52_; - gboolean _tmp53_; +#line 18059 "Commands.c" + GeeIterator* _tmp47_; gchar* p = NULL; - GeeIterator* _tmp54_; - gpointer _tmp55_; -#line 1995 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp52_ = _p_it; + GeeIterator* _tmp48_; + gpointer _tmp49_; #line 1995 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp53_ = gee_iterator_next (_tmp52_); + _tmp47_ = _p_it; #line 1995 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp53_) { + if (!gee_iterator_next (_tmp47_)) { #line 1995 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 17576 "Commands.c" +#line 18070 "Commands.c" } #line 1995 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp54_ = _p_it; + _tmp48_ = _p_it; #line 1995 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp55_ = gee_iterator_get (_tmp54_); + _tmp49_ = gee_iterator_get (_tmp48_); #line 1995 "/home/jens/Source/shotwell/src/Commands.vala" - p = (gchar*) _tmp55_; -#line 17584 "Commands.c" + p = (gchar*) _tmp49_; +#line 18078 "Commands.c" { GeeIterator* _s_it = NULL; - GeeMap* _tmp56_; - const gchar* _tmp57_; - gpointer _tmp58_; - GeeSet* _tmp59_; - GeeIterator* _tmp60_; - GeeIterator* _tmp61_; + GeeMap* _tmp50_; + const gchar* _tmp51_; + gpointer _tmp52_; + GeeSet* _tmp53_; + GeeIterator* _tmp54_; + GeeIterator* _tmp55_; #line 1996 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp56_ = self->priv->src_parent_detachments; + _tmp50_ = self->priv->src_parent_detachments; #line 1996 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp57_ = p; + _tmp51_ = p; #line 1996 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp58_ = gee_map_get (_tmp56_, _tmp57_); + _tmp52_ = gee_map_get (_tmp50_, _tmp51_); #line 1996 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp59_ = (GeeSet*) _tmp58_; + _tmp53_ = (GeeSet*) _tmp52_; #line 1996 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp60_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp54_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1996 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp61_ = _tmp60_; + _tmp55_ = _tmp54_; #line 1996 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp59_); + _g_object_unref0 (_tmp53_); #line 1996 "/home/jens/Source/shotwell/src/Commands.vala" - _s_it = _tmp61_; + _s_it = _tmp55_; #line 1996 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 17611 "Commands.c" - GeeIterator* _tmp62_; - gboolean _tmp63_; +#line 18105 "Commands.c" + GeeIterator* _tmp56_; MediaSource* s = NULL; - GeeIterator* _tmp64_; - gpointer _tmp65_; - const gchar* _tmp66_; - Tag* _tmp67_; - Tag* _tmp68_; - MediaSource* _tmp69_; - GeeList* _tmp70_; - GeeList* _tmp71_; + GeeIterator* _tmp57_; + gpointer _tmp58_; + const gchar* _tmp59_; + Tag* _tmp60_; + Tag* _tmp61_; + MediaSource* _tmp62_; + GeeList* _tmp63_; + GeeList* _tmp64_; #line 1996 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp62_ = _s_it; + _tmp56_ = _s_it; #line 1996 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp63_ = gee_iterator_next (_tmp62_); -#line 1996 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp63_) { + if (!gee_iterator_next (_tmp56_)) { #line 1996 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 17631 "Commands.c" +#line 18122 "Commands.c" } #line 1996 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp64_ = _s_it; + _tmp57_ = _s_it; #line 1996 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp65_ = gee_iterator_get (_tmp64_); + _tmp58_ = gee_iterator_get (_tmp57_); #line 1996 "/home/jens/Source/shotwell/src/Commands.vala" - s = (MediaSource*) _tmp65_; + s = (MediaSource*) _tmp58_; #line 1997 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp66_ = p; + _tmp59_ = p; #line 1997 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp67_ = tag_for_path (_tmp66_); + _tmp60_ = tag_for_path (_tmp59_); #line 1997 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp68_ = _tmp67_; + _tmp61_ = _tmp60_; #line 1997 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp69_ = s; + _tmp62_ = s; #line 1997 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp70_ = tag_detach (_tmp68_, _tmp69_); + _tmp63_ = tag_detach (_tmp61_, _tmp62_); #line 1997 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp71_ = _tmp70_; + _tmp64_ = _tmp63_; #line 1997 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp71_); + _g_object_unref0 (_tmp64_); #line 1997 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp68_); + _g_object_unref0 (_tmp61_); #line 1996 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (s); -#line 17657 "Commands.c" +#line 18148 "Commands.c" } #line 1996 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_s_it); -#line 17661 "Commands.c" +#line 18152 "Commands.c" } #line 1995 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (p); -#line 17665 "Commands.c" +#line 18156 "Commands.c" } #line 1995 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_p_it); -#line 17669 "Commands.c" +#line 18160 "Commands.c" } #line 1964 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (from_tag); -#line 17673 "Commands.c" +#line 18164 "Commands.c" } -static void reparent_tag_command_do_source_parent_reattachments (ReparentTagCommand* self) { +static void +reparent_tag_command_do_source_parent_reattachments (ReparentTagCommand* self) +{ GeeMap* _tmp0_; #line 2000 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_REPARENT_TAG_COMMAND (self)); @@ -17681,7 +18174,7 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm _tmp0_ = self->priv->src_parent_detachments; #line 2001 "/home/jens/Source/shotwell/src/Commands.vala" _vala_assert (_tmp0_ != NULL, "src_parent_detachments != null"); -#line 17685 "Commands.c" +#line 18178 "Commands.c" { GeeIterator* _p_it = NULL; GeeMap* _tmp1_; @@ -17708,113 +18201,109 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm _p_it = _tmp6_; #line 2003 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 17712 "Commands.c" +#line 18205 "Commands.c" GeeIterator* _tmp7_; - gboolean _tmp8_; gchar* p = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; + GeeIterator* _tmp8_; + gpointer _tmp9_; #line 2003 "/home/jens/Source/shotwell/src/Commands.vala" _tmp7_ = _p_it; #line 2003 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = gee_iterator_next (_tmp7_); -#line 2003 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp7_)) { #line 2003 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 17726 "Commands.c" +#line 18216 "Commands.c" } #line 2003 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = _p_it; + _tmp8_ = _p_it; #line 2003 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp9_ = gee_iterator_get (_tmp8_); #line 2003 "/home/jens/Source/shotwell/src/Commands.vala" - p = (gchar*) _tmp10_; -#line 17734 "Commands.c" + p = (gchar*) _tmp9_; +#line 18224 "Commands.c" { GeeIterator* _s_it = NULL; - GeeMap* _tmp11_; - const gchar* _tmp12_; - gpointer _tmp13_; - GeeSet* _tmp14_; + GeeMap* _tmp10_; + const gchar* _tmp11_; + gpointer _tmp12_; + GeeSet* _tmp13_; + GeeIterator* _tmp14_; GeeIterator* _tmp15_; - GeeIterator* _tmp16_; #line 2004 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = self->priv->src_parent_detachments; + _tmp10_ = self->priv->src_parent_detachments; #line 2004 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = p; + _tmp11_ = p; #line 2004 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = gee_map_get (_tmp11_, _tmp12_); + _tmp12_ = gee_map_get (_tmp10_, _tmp11_); #line 2004 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = (GeeSet*) _tmp13_; + _tmp13_ = (GeeSet*) _tmp12_; #line 2004 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); #line 2004 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 2004 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp13_); #line 2004 "/home/jens/Source/shotwell/src/Commands.vala" - _s_it = _tmp16_; + _s_it = _tmp15_; #line 2004 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 17761 "Commands.c" - GeeIterator* _tmp17_; - gboolean _tmp18_; +#line 18251 "Commands.c" + GeeIterator* _tmp16_; MediaSource* s = NULL; - GeeIterator* _tmp19_; - gpointer _tmp20_; - const gchar* _tmp21_; - Tag* _tmp22_; - Tag* _tmp23_; - MediaSource* _tmp24_; -#line 2004 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = _s_it; + GeeIterator* _tmp17_; + gpointer _tmp18_; + const gchar* _tmp19_; + Tag* _tmp20_; + Tag* _tmp21_; + MediaSource* _tmp22_; #line 2004 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = gee_iterator_next (_tmp17_); + _tmp16_ = _s_it; #line 2004 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp18_) { + if (!gee_iterator_next (_tmp16_)) { #line 2004 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 17779 "Commands.c" +#line 18266 "Commands.c" } #line 2004 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = _s_it; + _tmp17_ = _s_it; #line 2004 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = gee_iterator_get (_tmp19_); + _tmp18_ = gee_iterator_get (_tmp17_); #line 2004 "/home/jens/Source/shotwell/src/Commands.vala" - s = (MediaSource*) _tmp20_; + s = (MediaSource*) _tmp18_; #line 2005 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = p; + _tmp19_ = p; #line 2005 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = tag_for_path (_tmp21_); + _tmp20_ = tag_for_path (_tmp19_); #line 2005 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = _tmp22_; + _tmp21_ = _tmp20_; #line 2005 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = s; + _tmp22_ = s; #line 2005 "/home/jens/Source/shotwell/src/Commands.vala" - tag_attach (_tmp23_, _tmp24_); + tag_attach (_tmp21_, _tmp22_); #line 2005 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp21_); #line 2004 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (s); -#line 17801 "Commands.c" +#line 18288 "Commands.c" } #line 2004 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_s_it); -#line 17805 "Commands.c" +#line 18292 "Commands.c" } #line 2003 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (p); -#line 17809 "Commands.c" +#line 18296 "Commands.c" } #line 2003 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_p_it); -#line 17813 "Commands.c" +#line 18300 "Commands.c" } } -static void reparent_tag_command_do_destination_parent_detachments (ReparentTagCommand* self) { +static void +reparent_tag_command_do_destination_parent_detachments (ReparentTagCommand* self) +{ GeeMap* _tmp0_; #line 2008 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_REPARENT_TAG_COMMAND (self)); @@ -17822,7 +18311,7 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC _tmp0_ = self->priv->dest_parent_attachments; #line 2009 "/home/jens/Source/shotwell/src/Commands.vala" _vala_assert (_tmp0_ != NULL, "dest_parent_attachments != null"); -#line 17826 "Commands.c" +#line 18315 "Commands.c" { GeeIterator* _p_it = NULL; GeeMap* _tmp1_; @@ -17849,119 +18338,115 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC _p_it = _tmp6_; #line 2011 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 17853 "Commands.c" +#line 18342 "Commands.c" GeeIterator* _tmp7_; - gboolean _tmp8_; gchar* p = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; + GeeIterator* _tmp8_; + gpointer _tmp9_; #line 2011 "/home/jens/Source/shotwell/src/Commands.vala" _tmp7_ = _p_it; #line 2011 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = gee_iterator_next (_tmp7_); -#line 2011 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp7_)) { #line 2011 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 17867 "Commands.c" +#line 18353 "Commands.c" } #line 2011 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = _p_it; + _tmp8_ = _p_it; #line 2011 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp9_ = gee_iterator_get (_tmp8_); #line 2011 "/home/jens/Source/shotwell/src/Commands.vala" - p = (gchar*) _tmp10_; -#line 17875 "Commands.c" + p = (gchar*) _tmp9_; +#line 18361 "Commands.c" { GeeIterator* _s_it = NULL; - GeeMap* _tmp11_; - const gchar* _tmp12_; - gpointer _tmp13_; - GeeSet* _tmp14_; + GeeMap* _tmp10_; + const gchar* _tmp11_; + gpointer _tmp12_; + GeeSet* _tmp13_; + GeeIterator* _tmp14_; GeeIterator* _tmp15_; - GeeIterator* _tmp16_; #line 2012 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = self->priv->dest_parent_attachments; + _tmp10_ = self->priv->dest_parent_attachments; #line 2012 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = p; + _tmp11_ = p; #line 2012 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = gee_map_get (_tmp11_, _tmp12_); + _tmp12_ = gee_map_get (_tmp10_, _tmp11_); #line 2012 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = (GeeSet*) _tmp13_; + _tmp13_ = (GeeSet*) _tmp12_; #line 2012 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); #line 2012 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 2012 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp13_); #line 2012 "/home/jens/Source/shotwell/src/Commands.vala" - _s_it = _tmp16_; + _s_it = _tmp15_; #line 2012 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 17902 "Commands.c" - GeeIterator* _tmp17_; - gboolean _tmp18_; +#line 18388 "Commands.c" + GeeIterator* _tmp16_; MediaSource* s = NULL; - GeeIterator* _tmp19_; - gpointer _tmp20_; - const gchar* _tmp21_; - Tag* _tmp22_; - Tag* _tmp23_; - MediaSource* _tmp24_; - GeeList* _tmp25_; - GeeList* _tmp26_; -#line 2012 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = _s_it; + GeeIterator* _tmp17_; + gpointer _tmp18_; + const gchar* _tmp19_; + Tag* _tmp20_; + Tag* _tmp21_; + MediaSource* _tmp22_; + GeeList* _tmp23_; + GeeList* _tmp24_; #line 2012 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = gee_iterator_next (_tmp17_); + _tmp16_ = _s_it; #line 2012 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp18_) { + if (!gee_iterator_next (_tmp16_)) { #line 2012 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 17922 "Commands.c" +#line 18405 "Commands.c" } #line 2012 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = _s_it; + _tmp17_ = _s_it; #line 2012 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = gee_iterator_get (_tmp19_); + _tmp18_ = gee_iterator_get (_tmp17_); #line 2012 "/home/jens/Source/shotwell/src/Commands.vala" - s = (MediaSource*) _tmp20_; + s = (MediaSource*) _tmp18_; #line 2013 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = p; + _tmp19_ = p; #line 2013 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = tag_for_path (_tmp21_); + _tmp20_ = tag_for_path (_tmp19_); #line 2013 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = _tmp22_; + _tmp21_ = _tmp20_; #line 2013 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = s; + _tmp22_ = s; #line 2013 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = tag_detach (_tmp23_, _tmp24_); + _tmp23_ = tag_detach (_tmp21_, _tmp22_); #line 2013 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = _tmp25_; + _tmp24_ = _tmp23_; #line 2013 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp26_); + _g_object_unref0 (_tmp24_); #line 2013 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp21_); #line 2012 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (s); -#line 17948 "Commands.c" +#line 18431 "Commands.c" } #line 2012 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_s_it); -#line 17952 "Commands.c" +#line 18435 "Commands.c" } #line 2011 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (p); -#line 17956 "Commands.c" +#line 18439 "Commands.c" } #line 2011 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_p_it); -#line 17960 "Commands.c" +#line 18443 "Commands.c" } } -static void reparent_tag_command_do_destination_parent_reattachments (ReparentTagCommand* self) { +static void +reparent_tag_command_do_destination_parent_reattachments (ReparentTagCommand* self) +{ GeeMap* _tmp0_; #line 2016 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_REPARENT_TAG_COMMAND (self)); @@ -17969,7 +18454,7 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa _tmp0_ = self->priv->dest_parent_attachments; #line 2017 "/home/jens/Source/shotwell/src/Commands.vala" _vala_assert (_tmp0_ != NULL, "dest_parent_attachments != null"); -#line 17973 "Commands.c" +#line 18458 "Commands.c" { GeeIterator* _p_it = NULL; GeeMap* _tmp1_; @@ -17996,126 +18481,120 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa _p_it = _tmp6_; #line 2019 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 18000 "Commands.c" +#line 18485 "Commands.c" GeeIterator* _tmp7_; - gboolean _tmp8_; gchar* p = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; + GeeIterator* _tmp8_; + gpointer _tmp9_; #line 2019 "/home/jens/Source/shotwell/src/Commands.vala" _tmp7_ = _p_it; #line 2019 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = gee_iterator_next (_tmp7_); -#line 2019 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp7_)) { #line 2019 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 18014 "Commands.c" +#line 18496 "Commands.c" } #line 2019 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = _p_it; + _tmp8_ = _p_it; #line 2019 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp9_ = gee_iterator_get (_tmp8_); #line 2019 "/home/jens/Source/shotwell/src/Commands.vala" - p = (gchar*) _tmp10_; -#line 18022 "Commands.c" + p = (gchar*) _tmp9_; +#line 18504 "Commands.c" { GeeIterator* _s_it = NULL; - GeeMap* _tmp11_; - const gchar* _tmp12_; - gpointer _tmp13_; - GeeSet* _tmp14_; + GeeMap* _tmp10_; + const gchar* _tmp11_; + gpointer _tmp12_; + GeeSet* _tmp13_; + GeeIterator* _tmp14_; GeeIterator* _tmp15_; - GeeIterator* _tmp16_; #line 2020 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = self->priv->dest_parent_attachments; + _tmp10_ = self->priv->dest_parent_attachments; #line 2020 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = p; + _tmp11_ = p; #line 2020 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = gee_map_get (_tmp11_, _tmp12_); + _tmp12_ = gee_map_get (_tmp10_, _tmp11_); #line 2020 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = (GeeSet*) _tmp13_; + _tmp13_ = (GeeSet*) _tmp12_; #line 2020 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); #line 2020 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 2020 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp13_); #line 2020 "/home/jens/Source/shotwell/src/Commands.vala" - _s_it = _tmp16_; + _s_it = _tmp15_; #line 2020 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 18049 "Commands.c" - GeeIterator* _tmp17_; - gboolean _tmp18_; +#line 18531 "Commands.c" + GeeIterator* _tmp16_; MediaSource* s = NULL; - GeeIterator* _tmp19_; - gpointer _tmp20_; - const gchar* _tmp21_; - Tag* _tmp22_; - Tag* _tmp23_; - MediaSource* _tmp24_; -#line 2020 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = _s_it; + GeeIterator* _tmp17_; + gpointer _tmp18_; + const gchar* _tmp19_; + Tag* _tmp20_; + Tag* _tmp21_; + MediaSource* _tmp22_; #line 2020 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = gee_iterator_next (_tmp17_); + _tmp16_ = _s_it; #line 2020 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp18_) { + if (!gee_iterator_next (_tmp16_)) { #line 2020 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 18067 "Commands.c" +#line 18546 "Commands.c" } #line 2020 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = _s_it; + _tmp17_ = _s_it; #line 2020 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = gee_iterator_get (_tmp19_); + _tmp18_ = gee_iterator_get (_tmp17_); #line 2020 "/home/jens/Source/shotwell/src/Commands.vala" - s = (MediaSource*) _tmp20_; + s = (MediaSource*) _tmp18_; #line 2021 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = p; + _tmp19_ = p; #line 2021 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = tag_for_path (_tmp21_); + _tmp20_ = tag_for_path (_tmp19_); #line 2021 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = _tmp22_; + _tmp21_ = _tmp20_; #line 2021 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = s; + _tmp22_ = s; #line 2021 "/home/jens/Source/shotwell/src/Commands.vala" - tag_attach (_tmp23_, _tmp24_); + tag_attach (_tmp21_, _tmp22_); #line 2021 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp21_); #line 2020 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (s); -#line 18089 "Commands.c" +#line 18568 "Commands.c" } #line 2020 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_s_it); -#line 18093 "Commands.c" +#line 18572 "Commands.c" } #line 2019 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (p); -#line 18097 "Commands.c" +#line 18576 "Commands.c" } #line 2019 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_p_it); -#line 18101 "Commands.c" +#line 18580 "Commands.c" } } -static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const gchar* from, const gchar* to) { +static void +reparent_tag_command_copy_subtree (ReparentTagCommand* self, + const gchar* from, + const gchar* to) +{ TagSourceCollection* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; Tag* from_tag = NULL; - const gchar* _tmp3_; - Tag* _tmp4_; + Tag* _tmp1_; Tag* to_tag = NULL; - const gchar* _tmp5_; - Tag* _tmp6_; - GeeHashMap* _tmp7_; + Tag* _tmp2_; + GeeHashMap* _tmp3_; GeeList* from_children = NULL; - Tag* _tmp50_; - GeeList* _tmp51_; + Tag* _tmp42_; + GeeList* _tmp43_; #line 2024 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_REPARENT_TAG_COMMAND (self)); #line 2024 "/home/jens/Source/shotwell/src/Commands.vala" @@ -18125,445 +18604,419 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g #line 2025 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = tag_global; #line 2025 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = from; -#line 2025 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = tag_source_collection_exists (_tmp0_, _tmp1_, FALSE); -#line 2025 "/home/jens/Source/shotwell/src/Commands.vala" - _vala_assert (_tmp2_, "Tag.global.exists(from)"); + _vala_assert (tag_source_collection_exists (_tmp0_, from, FALSE), "Tag.global.exists(from)"); #line 2026 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = from; + _tmp1_ = tag_for_path (from); #line 2026 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = tag_for_path (_tmp3_); -#line 2026 "/home/jens/Source/shotwell/src/Commands.vala" - from_tag = _tmp4_; -#line 2029 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = to; + from_tag = _tmp1_; #line 2029 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = tag_for_path (_tmp5_); + _tmp2_ = tag_for_path (to); #line 2029 "/home/jens/Source/shotwell/src/Commands.vala" - to_tag = _tmp6_; + to_tag = _tmp2_; #line 2033 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp3_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 2033 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->dest_parent_attachments); #line 2033 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->dest_parent_attachments = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_MAP, GeeMap); -#line 18152 "Commands.c" + self->priv->dest_parent_attachments = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MAP, GeeMap); +#line 18623 "Commands.c" { GeeIterator* _source_it = NULL; - Tag* _tmp8_; - GeeCollection* _tmp9_; - GeeCollection* _tmp10_; - GeeIterator* _tmp11_; - GeeIterator* _tmp12_; + Tag* _tmp4_; + GeeCollection* _tmp5_; + GeeCollection* _tmp6_; + GeeIterator* _tmp7_; + GeeIterator* _tmp8_; #line 2034 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = from_tag; + _tmp4_ = from_tag; #line 2034 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = tag_get_sources (_tmp8_); + _tmp5_ = tag_get_sources (_tmp4_); #line 2034 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = _tmp9_; + _tmp6_ = _tmp5_; #line 2034 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 2034 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 2034 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp6_); #line 2034 "/home/jens/Source/shotwell/src/Commands.vala" - _source_it = _tmp12_; + _source_it = _tmp8_; #line 2034 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 18176 "Commands.c" - GeeIterator* _tmp13_; - gboolean _tmp14_; +#line 18647 "Commands.c" + GeeIterator* _tmp9_; MediaSource* source = NULL; - GeeIterator* _tmp15_; - gpointer _tmp16_; + GeeIterator* _tmp10_; + gpointer _tmp11_; Tag* current_parent = NULL; - Tag* _tmp17_; - Tag* _tmp18_; -#line 2034 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = _source_it; + Tag* _tmp12_; + Tag* _tmp13_; #line 2034 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = gee_iterator_next (_tmp13_); + _tmp9_ = _source_it; #line 2034 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp14_) { + if (!gee_iterator_next (_tmp9_)) { #line 2034 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 18193 "Commands.c" +#line 18661 "Commands.c" } #line 2034 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = _source_it; + _tmp10_ = _source_it; #line 2034 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = gee_iterator_get (_tmp15_); + _tmp11_ = gee_iterator_get (_tmp10_); #line 2034 "/home/jens/Source/shotwell/src/Commands.vala" - source = (MediaSource*) _tmp16_; + source = (MediaSource*) _tmp11_; #line 2035 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = to_tag; + _tmp12_ = to_tag; #line 2035 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = tag_get_hierarchical_parent (_tmp17_); + _tmp13_ = tag_get_hierarchical_parent (_tmp12_); #line 2035 "/home/jens/Source/shotwell/src/Commands.vala" - current_parent = _tmp18_; + current_parent = _tmp13_; #line 2036 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 18209 "Commands.c" - Tag* _tmp19_; +#line 18677 "Commands.c" + Tag* _tmp14_; gchar* current_parent_path = NULL; - Tag* _tmp20_; - gchar* _tmp21_; - GeeMap* _tmp22_; - const gchar* _tmp23_; - gboolean _tmp24_; - Tag* _tmp29_; - MediaSource* _tmp30_; - gboolean _tmp31_; - Tag* _tmp37_; - Tag* _tmp38_; + Tag* _tmp15_; + gchar* _tmp16_; + GeeMap* _tmp17_; + const gchar* _tmp18_; + Tag* _tmp23_; + MediaSource* _tmp24_; + Tag* _tmp30_; + Tag* _tmp31_; #line 2036 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = current_parent; + _tmp14_ = current_parent; #line 2036 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp19_ != NULL)) { + if (!(_tmp14_ != NULL)) { #line 2036 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 18228 "Commands.c" +#line 18694 "Commands.c" } #line 2037 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = current_parent; + _tmp15_ = current_parent; #line 2037 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = tag_get_path (_tmp20_); + _tmp16_ = tag_get_path (_tmp15_); #line 2037 "/home/jens/Source/shotwell/src/Commands.vala" - current_parent_path = _tmp21_; -#line 2038 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = self->priv->dest_parent_attachments; + current_parent_path = _tmp16_; #line 2038 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = current_parent_path; + _tmp17_ = self->priv->dest_parent_attachments; #line 2038 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = gee_map_has_key (_tmp22_, _tmp23_); + _tmp18_ = current_parent_path; #line 2038 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp24_) { -#line 18244 "Commands.c" - GeeMap* _tmp25_; - const gchar* _tmp26_; - GeeHashSet* _tmp27_; - GeeHashSet* _tmp28_; + if (!gee_map_has_key (_tmp17_, _tmp18_)) { +#line 18708 "Commands.c" + GeeMap* _tmp19_; + const gchar* _tmp20_; + GeeHashSet* _tmp21_; + GeeHashSet* _tmp22_; #line 2039 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = self->priv->dest_parent_attachments; + _tmp19_ = self->priv->dest_parent_attachments; #line 2039 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = current_parent_path; + _tmp20_ = current_parent_path; #line 2039 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp21_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 2039 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp28_ = _tmp27_; + _tmp22_ = _tmp21_; #line 2039 "/home/jens/Source/shotwell/src/Commands.vala" - gee_map_set (_tmp25_, _tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_SET, GeeSet)); + gee_map_set (_tmp19_, _tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_SET, GeeSet)); #line 2039 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp28_); -#line 18261 "Commands.c" + _g_object_unref0 (_tmp22_); +#line 18725 "Commands.c" } #line 2041 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp29_ = current_parent; -#line 2041 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp30_ = source; + _tmp23_ = current_parent; #line 2041 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp31_ = tag_contains (_tmp29_, _tmp30_); + _tmp24_ = source; #line 2041 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp31_) { -#line 18271 "Commands.c" - GeeMap* _tmp32_; - const gchar* _tmp33_; - gpointer _tmp34_; - GeeSet* _tmp35_; - MediaSource* _tmp36_; + if (!tag_contains (_tmp23_, _tmp24_)) { +#line 18733 "Commands.c" + GeeMap* _tmp25_; + const gchar* _tmp26_; + gpointer _tmp27_; + GeeSet* _tmp28_; + MediaSource* _tmp29_; #line 2042 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp32_ = self->priv->dest_parent_attachments; + _tmp25_ = self->priv->dest_parent_attachments; #line 2042 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp33_ = current_parent_path; + _tmp26_ = current_parent_path; #line 2042 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp34_ = gee_map_get (_tmp32_, _tmp33_); + _tmp27_ = gee_map_get (_tmp25_, _tmp26_); #line 2042 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp35_ = (GeeSet*) _tmp34_; + _tmp28_ = (GeeSet*) _tmp27_; #line 2042 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp36_ = source; + _tmp29_ = source; #line 2042 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), _tmp36_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection), _tmp29_); #line 2042 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp35_); -#line 18291 "Commands.c" + _g_object_unref0 (_tmp28_); +#line 18753 "Commands.c" } #line 2044 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp37_ = current_parent; + _tmp30_ = current_parent; #line 2044 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp38_ = tag_get_hierarchical_parent (_tmp37_); + _tmp31_ = tag_get_hierarchical_parent (_tmp30_); #line 2044 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (current_parent); #line 2044 "/home/jens/Source/shotwell/src/Commands.vala" - current_parent = _tmp38_; + current_parent = _tmp31_; #line 2036 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (current_parent_path); -#line 18303 "Commands.c" +#line 18765 "Commands.c" } #line 2034 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (current_parent); #line 2034 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); -#line 18309 "Commands.c" +#line 18771 "Commands.c" } #line 2034 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_it); -#line 18313 "Commands.c" +#line 18775 "Commands.c" } { GeeIterator* _source_it = NULL; - Tag* _tmp39_; - GeeCollection* _tmp40_; - GeeCollection* _tmp41_; - GeeIterator* _tmp42_; - GeeIterator* _tmp43_; + Tag* _tmp32_; + GeeCollection* _tmp33_; + GeeCollection* _tmp34_; + GeeIterator* _tmp35_; + GeeIterator* _tmp36_; #line 2048 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp39_ = from_tag; + _tmp32_ = from_tag; #line 2048 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp40_ = tag_get_sources (_tmp39_); + _tmp33_ = tag_get_sources (_tmp32_); #line 2048 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp41_ = _tmp40_; + _tmp34_ = _tmp33_; #line 2048 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp42_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp35_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ITERABLE, GeeIterable)); #line 2048 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp43_ = _tmp42_; + _tmp36_ = _tmp35_; #line 2048 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp41_); + _g_object_unref0 (_tmp34_); #line 2048 "/home/jens/Source/shotwell/src/Commands.vala" - _source_it = _tmp43_; + _source_it = _tmp36_; #line 2048 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 18338 "Commands.c" - GeeIterator* _tmp44_; - gboolean _tmp45_; +#line 18800 "Commands.c" + GeeIterator* _tmp37_; MediaSource* source = NULL; - GeeIterator* _tmp46_; - gpointer _tmp47_; - Tag* _tmp48_; - MediaSource* _tmp49_; + GeeIterator* _tmp38_; + gpointer _tmp39_; + Tag* _tmp40_; + MediaSource* _tmp41_; #line 2048 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp44_ = _source_it; + _tmp37_ = _source_it; #line 2048 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp45_ = gee_iterator_next (_tmp44_); -#line 2048 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp45_) { + if (!gee_iterator_next (_tmp37_)) { #line 2048 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 18354 "Commands.c" +#line 18813 "Commands.c" } #line 2048 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp46_ = _source_it; + _tmp38_ = _source_it; #line 2048 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp47_ = gee_iterator_get (_tmp46_); + _tmp39_ = gee_iterator_get (_tmp38_); #line 2048 "/home/jens/Source/shotwell/src/Commands.vala" - source = (MediaSource*) _tmp47_; + source = (MediaSource*) _tmp39_; #line 2049 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp48_ = to_tag; + _tmp40_ = to_tag; #line 2049 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp49_ = source; + _tmp41_ = source; #line 2049 "/home/jens/Source/shotwell/src/Commands.vala" - tag_attach (_tmp48_, _tmp49_); + tag_attach (_tmp40_, _tmp41_); #line 2048 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); -#line 18370 "Commands.c" +#line 18829 "Commands.c" } #line 2048 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_it); -#line 18374 "Commands.c" +#line 18833 "Commands.c" } #line 2053 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp50_ = from_tag; + _tmp42_ = from_tag; #line 2053 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp51_ = tag_get_hierarchical_children (_tmp50_); + _tmp43_ = tag_get_hierarchical_children (_tmp42_); #line 2053 "/home/jens/Source/shotwell/src/Commands.vala" - from_children = _tmp51_; -#line 18382 "Commands.c" + from_children = _tmp43_; +#line 18841 "Commands.c" { gint i = 0; - GeeList* _tmp52_; - gint _tmp53_; - gint _tmp54_; + GeeList* _tmp44_; + gint _tmp45_; + gint _tmp46_; #line 2054 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp52_ = from_children; + _tmp44_ = from_children; #line 2054 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp53_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp45_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection)); #line 2054 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp54_ = _tmp53_; + _tmp46_ = _tmp45_; #line 2054 "/home/jens/Source/shotwell/src/Commands.vala" - i = _tmp54_ - 1; -#line 18396 "Commands.c" + i = _tmp46_ - 1; +#line 18855 "Commands.c" { - gboolean _tmp55_ = FALSE; + gboolean _tmp47_ = FALSE; #line 2054 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp55_ = TRUE; + _tmp47_ = TRUE; #line 2054 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 18403 "Commands.c" - gint _tmp57_; +#line 18862 "Commands.c" + gint _tmp49_; Tag* from_child = NULL; - GeeList* _tmp58_; - gint _tmp59_; - gpointer _tmp60_; + GeeList* _tmp50_; + gint _tmp51_; + gpointer _tmp52_; gchar* child_subpath = NULL; - Tag* _tmp61_; + Tag* _tmp53_; + gchar* _tmp54_; + gchar* _tmp55_; + gchar* _tmp56_; + gchar* _tmp57_; + gchar* _tmp58_; + gchar* _tmp59_; + Tag* to_child = NULL; + Tag* _tmp60_; + gchar* _tmp61_; gchar* _tmp62_; gchar* _tmp63_; - const gchar* _tmp64_; - gchar* _tmp65_; + gchar* _tmp64_; + const gchar* _tmp65_; gchar* _tmp66_; gchar* _tmp67_; - gchar* _tmp68_; - Tag* to_child = NULL; + Tag* _tmp68_; Tag* _tmp69_; - gchar* _tmp70_; - gchar* _tmp71_; - gchar* _tmp72_; - gchar* _tmp73_; - const gchar* _tmp74_; - gchar* _tmp75_; - gchar* _tmp76_; - Tag* _tmp77_; - Tag* _tmp78_; #line 2054 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp55_) { -#line 18431 "Commands.c" - gint _tmp56_; + if (!_tmp47_) { +#line 18889 "Commands.c" + gint _tmp48_; #line 2054 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp56_ = i; + _tmp48_ = i; #line 2054 "/home/jens/Source/shotwell/src/Commands.vala" - i = _tmp56_ - 1; -#line 18437 "Commands.c" + i = _tmp48_ - 1; +#line 18895 "Commands.c" } #line 2054 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp55_ = FALSE; + _tmp47_ = FALSE; #line 2054 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp57_ = i; + _tmp49_ = i; #line 2054 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp57_ >= 0)) { + if (!(_tmp49_ >= 0)) { #line 2054 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 18447 "Commands.c" +#line 18905 "Commands.c" } #line 2055 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp58_ = from_children; + _tmp50_ = from_children; #line 2055 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp59_ = i; + _tmp51_ = i; #line 2055 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp60_ = gee_list_get (_tmp58_, _tmp59_); + _tmp52_ = gee_list_get (_tmp50_, _tmp51_); #line 2055 "/home/jens/Source/shotwell/src/Commands.vala" - from_child = (Tag*) _tmp60_; -#line 2057 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp61_ = from_child; + from_child = (Tag*) _tmp52_; #line 2057 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp62_ = tag_get_path (_tmp61_); + _tmp53_ = from_child; #line 2057 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp63_ = _tmp62_; + _tmp54_ = tag_get_path (_tmp53_); #line 2057 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp64_ = from; + _tmp55_ = _tmp54_; #line 2057 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp65_ = g_strconcat (_tmp64_, TAG_PATH_SEPARATOR_STRING, NULL); + _tmp56_ = g_strconcat (from, TAG_PATH_SEPARATOR_STRING, NULL); #line 2057 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp66_ = _tmp65_; + _tmp57_ = _tmp56_; #line 2057 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp67_ = string_replace (_tmp63_, _tmp66_, ""); + _tmp58_ = string_replace (_tmp55_, _tmp57_, ""); #line 2057 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp68_ = _tmp67_; + _tmp59_ = _tmp58_; #line 2057 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp66_); + _g_free0 (_tmp57_); #line 2057 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp63_); + _g_free0 (_tmp55_); #line 2057 "/home/jens/Source/shotwell/src/Commands.vala" - child_subpath = _tmp68_; + child_subpath = _tmp59_; #line 2060 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp69_ = to_tag; + _tmp60_ = to_tag; #line 2060 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp70_ = tag_get_path (_tmp69_); + _tmp61_ = tag_get_path (_tmp60_); #line 2060 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp71_ = _tmp70_; + _tmp62_ = _tmp61_; #line 2060 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp72_ = g_strconcat (_tmp71_, TAG_PATH_SEPARATOR_STRING, NULL); + _tmp63_ = g_strconcat (_tmp62_, TAG_PATH_SEPARATOR_STRING, NULL); #line 2060 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp73_ = _tmp72_; + _tmp64_ = _tmp63_; #line 2060 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp74_ = child_subpath; + _tmp65_ = child_subpath; #line 2060 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp75_ = g_strconcat (_tmp73_, _tmp74_, NULL); + _tmp66_ = g_strconcat (_tmp64_, _tmp65_, NULL); #line 2060 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp76_ = _tmp75_; + _tmp67_ = _tmp66_; #line 2060 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp77_ = tag_for_path (_tmp76_); + _tmp68_ = tag_for_path (_tmp67_); #line 2060 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp78_ = _tmp77_; + _tmp69_ = _tmp68_; #line 2060 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp76_); + _g_free0 (_tmp67_); #line 2060 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp73_); + _g_free0 (_tmp64_); #line 2060 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp71_); + _g_free0 (_tmp62_); #line 2060 "/home/jens/Source/shotwell/src/Commands.vala" - to_child = _tmp78_; -#line 18507 "Commands.c" + to_child = _tmp69_; +#line 18963 "Commands.c" { GeeIterator* _source_it = NULL; - Tag* _tmp79_; - GeeCollection* _tmp80_; - GeeCollection* _tmp81_; - GeeIterator* _tmp82_; - GeeIterator* _tmp83_; + Tag* _tmp70_; + GeeCollection* _tmp71_; + GeeCollection* _tmp72_; + GeeIterator* _tmp73_; + GeeIterator* _tmp74_; #line 2063 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp79_ = from_child; + _tmp70_ = from_child; #line 2063 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp80_ = tag_get_sources (_tmp79_); + _tmp71_ = tag_get_sources (_tmp70_); #line 2063 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp81_ = _tmp80_; + _tmp72_ = _tmp71_; #line 2063 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp82_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp73_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_ITERABLE, GeeIterable)); #line 2063 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp83_ = _tmp82_; + _tmp74_ = _tmp73_; #line 2063 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp81_); + _g_object_unref0 (_tmp72_); #line 2063 "/home/jens/Source/shotwell/src/Commands.vala" - _source_it = _tmp83_; + _source_it = _tmp74_; #line 2063 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 18531 "Commands.c" - GeeIterator* _tmp84_; - gboolean _tmp85_; +#line 18987 "Commands.c" + GeeIterator* _tmp75_; MediaSource* source = NULL; - GeeIterator* _tmp86_; - gpointer _tmp87_; - Tag* _tmp88_; - MediaSource* _tmp89_; -#line 2063 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp84_ = _source_it; + GeeIterator* _tmp76_; + gpointer _tmp77_; + Tag* _tmp78_; + MediaSource* _tmp79_; #line 2063 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp85_ = gee_iterator_next (_tmp84_); + _tmp75_ = _source_it; #line 2063 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp85_) { + if (!gee_iterator_next (_tmp75_)) { #line 2063 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 18547 "Commands.c" +#line 19000 "Commands.c" } #line 2063 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp86_ = _source_it; + _tmp76_ = _source_it; #line 2063 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp87_ = gee_iterator_get (_tmp86_); + _tmp77_ = gee_iterator_get (_tmp76_); #line 2063 "/home/jens/Source/shotwell/src/Commands.vala" - source = (MediaSource*) _tmp87_; + source = (MediaSource*) _tmp77_; #line 2064 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp88_ = to_child; + _tmp78_ = to_child; #line 2064 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp89_ = source; + _tmp79_ = source; #line 2064 "/home/jens/Source/shotwell/src/Commands.vala" - tag_attach (_tmp88_, _tmp89_); + tag_attach (_tmp78_, _tmp79_); #line 2063 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); -#line 18563 "Commands.c" +#line 19016 "Commands.c" } #line 2063 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_it); -#line 18567 "Commands.c" +#line 19020 "Commands.c" } #line 2054 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (to_child); @@ -18571,7 +19024,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g _g_free0 (child_subpath); #line 2054 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (from_child); -#line 18575 "Commands.c" +#line 19028 "Commands.c" } } } @@ -18581,184 +19034,180 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g _g_object_unref0 (to_tag); #line 2024 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (from_tag); -#line 18585 "Commands.c" +#line 19038 "Commands.c" } -static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, const gchar* client_path) { +static void +reparent_tag_command_destroy_subtree (ReparentTagCommand* self, + const gchar* client_path) +{ gchar* victim_path = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_; - TagSourceCollection* _tmp5_; - const gchar* _tmp6_; - gboolean _tmp7_; + gchar* _tmp0_; + const gchar* _tmp1_; + TagSourceCollection* _tmp3_; + const gchar* _tmp4_; Tag* victim = NULL; - const gchar* _tmp8_; - Tag* _tmp9_; + const gchar* _tmp5_; + Tag* _tmp6_; GeeList* victim_children = NULL; - Tag* _tmp10_; - GeeList* _tmp11_; - TagSourceCollection* _tmp26_; - TagSourceCollection* _tmp27_; - Tag* _tmp28_; - Marker* _tmp29_; - Marker* _tmp30_; + Tag* _tmp7_; + GeeList* _tmp8_; + TagSourceCollection* _tmp23_; + TagSourceCollection* _tmp24_; + Tag* _tmp25_; + Marker* _tmp26_; + Marker* _tmp27_; #line 2068 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_REPARENT_TAG_COMMAND (self)); #line 2068 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (client_path != NULL); #line 2069 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = client_path; + _tmp0_ = hierarchical_tag_utilities_get_root_path_form (client_path); #line 2069 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = hierarchical_tag_utilities_get_root_path_form (_tmp0_); -#line 2069 "/home/jens/Source/shotwell/src/Commands.vala" - victim_path = _tmp1_; + victim_path = _tmp0_; #line 2070 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = victim_path; + _tmp1_ = victim_path; #line 2070 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp2_ == NULL) { -#line 18622 "Commands.c" - const gchar* _tmp3_; - gchar* _tmp4_; -#line 2071 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = client_path; + if (_tmp1_ == NULL) { +#line 19074 "Commands.c" + gchar* _tmp2_; #line 2071 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = g_strdup (_tmp3_); + _tmp2_ = g_strdup (client_path); #line 2071 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (victim_path); #line 2071 "/home/jens/Source/shotwell/src/Commands.vala" - victim_path = _tmp4_; -#line 18633 "Commands.c" + victim_path = _tmp2_; +#line 19082 "Commands.c" } #line 2073 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = tag_global; -#line 2073 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = victim_path; + _tmp3_ = tag_global; #line 2073 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = tag_source_collection_exists (_tmp5_, _tmp6_, FALSE); + _tmp4_ = victim_path; #line 2073 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp7_) { + if (!tag_source_collection_exists (_tmp3_, _tmp4_, FALSE)) { #line 2074 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (victim_path); #line 2074 "/home/jens/Source/shotwell/src/Commands.vala" return; -#line 18647 "Commands.c" +#line 19094 "Commands.c" } #line 2076 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = victim_path; + _tmp5_ = victim_path; #line 2076 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = tag_for_path (_tmp8_); + _tmp6_ = tag_for_path (_tmp5_); #line 2076 "/home/jens/Source/shotwell/src/Commands.vala" - victim = _tmp9_; + victim = _tmp6_; #line 2079 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = victim; + _tmp7_ = victim; #line 2079 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = tag_get_hierarchical_children (_tmp10_); + _tmp8_ = tag_get_hierarchical_children (_tmp7_); #line 2079 "/home/jens/Source/shotwell/src/Commands.vala" - victim_children = _tmp11_; -#line 18661 "Commands.c" + victim_children = _tmp8_; +#line 19108 "Commands.c" { gint i = 0; #line 2080 "/home/jens/Source/shotwell/src/Commands.vala" i = 0; -#line 18666 "Commands.c" +#line 19113 "Commands.c" { - gboolean _tmp12_ = FALSE; + gboolean _tmp9_ = FALSE; #line 2080 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = TRUE; + _tmp9_ = TRUE; #line 2080 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 18673 "Commands.c" +#line 19120 "Commands.c" + gint _tmp11_; + GeeList* _tmp12_; + gint _tmp13_; gint _tmp14_; - GeeList* _tmp15_; - gint _tmp16_; - gint _tmp17_; - TagSourceCollection* _tmp18_; - TagSourceCollection* _tmp19_; - GeeList* _tmp20_; - gint _tmp21_; - gpointer _tmp22_; - Tag* _tmp23_; - Marker* _tmp24_; - Marker* _tmp25_; + TagSourceCollection* _tmp15_; + TagSourceCollection* _tmp16_; + GeeList* _tmp17_; + gint _tmp18_; + gpointer _tmp19_; + Tag* _tmp20_; + Marker* _tmp21_; + Marker* _tmp22_; #line 2080 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp12_) { -#line 18688 "Commands.c" - gint _tmp13_; + if (!_tmp9_) { +#line 19135 "Commands.c" + gint _tmp10_; #line 2080 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = i; + _tmp10_ = i; #line 2080 "/home/jens/Source/shotwell/src/Commands.vala" - i = _tmp13_ + 1; -#line 18694 "Commands.c" + i = _tmp10_ + 1; +#line 19141 "Commands.c" } #line 2080 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = FALSE; + _tmp9_ = FALSE; #line 2080 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = i; + _tmp11_ = i; #line 2080 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = victim_children; + _tmp12_ = victim_children; #line 2080 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection)); #line 2080 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = _tmp16_; + _tmp14_ = _tmp13_; #line 2080 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp14_ < _tmp17_)) { + if (!(_tmp11_ < _tmp14_)) { #line 2080 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 18710 "Commands.c" +#line 19157 "Commands.c" } #line 2081 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = tag_global; + _tmp15_ = tag_global; #line 2081 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = tag_global; + _tmp16_ = tag_global; #line 2081 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = victim_children; + _tmp17_ = victim_children; #line 2081 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = i; + _tmp18_ = i; #line 2081 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = gee_list_get (_tmp20_, _tmp21_); + _tmp19_ = gee_list_get (_tmp17_, _tmp18_); #line 2081 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = (Tag*) _tmp22_; + _tmp20_ = (Tag*) _tmp19_; #line 2081 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_DATA_OBJECT, DataObject)); + _tmp21_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_OBJECT, DataObject)); #line 2081 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = _tmp24_; + _tmp22_ = _tmp21_; #line 2081 "/home/jens/Source/shotwell/src/Commands.vala" - source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp25_, TRUE, NULL, NULL, NULL); + source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp22_, TRUE, NULL, NULL, NULL); #line 2081 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp25_); + _g_object_unref0 (_tmp22_); #line 2081 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp23_); -#line 18734 "Commands.c" + _g_object_unref0 (_tmp20_); +#line 19181 "Commands.c" } } } #line 2084 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = tag_global; + _tmp23_ = tag_global; #line 2084 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = tag_global; + _tmp24_ = tag_global; #line 2084 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp28_ = victim; + _tmp25_ = victim; #line 2084 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp29_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject)); + _tmp26_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject)); #line 2084 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp30_ = _tmp29_; + _tmp27_ = _tmp26_; #line 2084 "/home/jens/Source/shotwell/src/Commands.vala" - source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp30_, TRUE, NULL, NULL, NULL); + source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp27_, TRUE, NULL, NULL, NULL); #line 2084 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp30_); + _g_object_unref0 (_tmp27_); #line 2068 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (victim_children); #line 2068 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (victim); #line 2068 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (victim_path); -#line 18758 "Commands.c" +#line 19205 "Commands.c" } -static void reparent_tag_command_real_execute (Command* base) { +static void +reparent_tag_command_real_execute (Command* base) +{ ReparentTagCommand * self; GeeList* _tmp0_; #line 2087 "/home/jens/Source/shotwell/src/Commands.vala" @@ -18767,7 +19216,7 @@ static void reparent_tag_command_real_execute (Command* base) { _tmp0_ = self->priv->after_state; #line 2088 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp0_ == NULL) { -#line 18771 "Commands.c" +#line 19220 "Commands.c" const gchar* _tmp1_; const gchar* _tmp2_; const gchar* _tmp3_; @@ -18792,7 +19241,7 @@ static void reparent_tag_command_real_execute (Command* base) { _tmp4_ = self->priv->from_path; #line 2099 "/home/jens/Source/shotwell/src/Commands.vala" reparent_tag_command_destroy_subtree (self, _tmp4_); -#line 18796 "Commands.c" +#line 19245 "Commands.c" } else { const gchar* _tmp5_; const gchar* _tmp6_; @@ -18823,12 +19272,14 @@ static void reparent_tag_command_real_execute (Command* base) { _tmp9_ = self->priv->from_path; #line 2111 "/home/jens/Source/shotwell/src/Commands.vala" reparent_tag_command_destroy_subtree (self, _tmp9_); -#line 18827 "Commands.c" +#line 19276 "Commands.c" } } -static void reparent_tag_command_real_undo (Command* base) { +static void +reparent_tag_command_real_undo (Command* base) +{ ReparentTagCommand * self; GeeList* _tmp0_; const gchar* _tmp1_; @@ -18855,13 +19306,13 @@ static void reparent_tag_command_real_undo (Command* base) { _tmp2_ = self->priv->to_path_exists; #line 2122 "/home/jens/Source/shotwell/src/Commands.vala" if (!_tmp2_) { -#line 18859 "Commands.c" +#line 19310 "Commands.c" const gchar* _tmp3_; #line 2123 "/home/jens/Source/shotwell/src/Commands.vala" _tmp3_ = self->priv->to_path; #line 2123 "/home/jens/Source/shotwell/src/Commands.vala" reparent_tag_command_destroy_subtree (self, _tmp3_); -#line 18865 "Commands.c" +#line 19316 "Commands.c" } #line 2125 "/home/jens/Source/shotwell/src/Commands.vala" _tmp4_ = self->priv->from_path; @@ -18889,18 +19340,20 @@ static void reparent_tag_command_real_undo (Command* base) { _tmp9_ = self->priv->to_path_parent_path; #line 2133 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp9_ != NULL) { -#line 18893 "Commands.c" +#line 19344 "Commands.c" const gchar* _tmp10_; #line 2134 "/home/jens/Source/shotwell/src/Commands.vala" _tmp10_ = self->priv->to_path_parent_path; #line 2134 "/home/jens/Source/shotwell/src/Commands.vala" hierarchical_tag_utilities_cleanup_root_path (_tmp10_); -#line 18899 "Commands.c" +#line 19350 "Commands.c" } } -static void reparent_tag_command_class_init (ReparentTagCommandClass * klass) { +static void +reparent_tag_command_class_init (ReparentTagCommandClass * klass) +{ #line 1679 "/home/jens/Source/shotwell/src/Commands.vala" reparent_tag_command_parent_class = g_type_class_peek_parent (klass); #line 1679 "/home/jens/Source/shotwell/src/Commands.vala" @@ -18911,11 +19364,13 @@ static void reparent_tag_command_class_init (ReparentTagCommandClass * klass) { ((CommandClass *) klass)->undo = (void (*) (Command *)) reparent_tag_command_real_undo; #line 1679 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = reparent_tag_command_finalize; -#line 18915 "Commands.c" +#line 19368 "Commands.c" } -static void reparent_tag_command_instance_init (ReparentTagCommand * self) { +static void +reparent_tag_command_instance_init (ReparentTagCommand * self) +{ GeeHashSet* _tmp0_; #line 1679 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = REPARENT_TAG_COMMAND_GET_PRIVATE (self); @@ -18941,11 +19396,13 @@ static void reparent_tag_command_instance_init (ReparentTagCommand * self) { self->priv->existing_dest_membership = NULL; #line 1692 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->to_path_exists = FALSE; -#line 18945 "Commands.c" +#line 19400 "Commands.c" } -static void reparent_tag_command_finalize (GObject * obj) { +static void +reparent_tag_command_finalize (GObject * obj) +{ ReparentTagCommand * self; LibraryPhotoSourceCollection* _tmp0_; guint _tmp1_; @@ -18991,11 +19448,13 @@ static void reparent_tag_command_finalize (GObject * obj) { _g_object_unref0 (self->priv->existing_dest_membership); #line 1679 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (reparent_tag_command_parent_class)->finalize (obj); -#line 18995 "Commands.c" +#line 19452 "Commands.c" } -GType reparent_tag_command_get_type (void) { +GType +reparent_tag_command_get_type (void) +{ static volatile gsize reparent_tag_command_type_id__volatile = 0; if (g_once_init_enter (&reparent_tag_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ReparentTagCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) reparent_tag_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ReparentTagCommand), 0, (GInstanceInitFunc) reparent_tag_command_instance_init, NULL }; @@ -19007,313 +19466,299 @@ GType reparent_tag_command_get_type (void) { } -static void _modify_tags_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) { +static void +_modify_tags_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, + gpointer self) +{ #line 2179 "/home/jens/Source/shotwell/src/Commands.vala" modify_tags_command_on_proxy_broken ((ModifyTagsCommand*) self); -#line 19014 "Commands.c" +#line 19476 "Commands.c" } -ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource* media, GeeCollection* new_tag_list) { +ModifyTagsCommand* +modify_tags_command_construct (GType object_type, + MediaSource* media, + GeeCollection* new_tag_list) +{ ModifyTagsCommand * self = NULL; MediaSource* _tmp0_; - MediaSource* _tmp1_; - MediaSource* _tmp2_; GeeList* original_tags = NULL; - TagSourceCollection* _tmp3_; - MediaSource* _tmp4_; - GeeList* _tmp5_; - GeeList* _tmp6_; + TagSourceCollection* _tmp1_; + GeeList* _tmp2_; + GeeList* _tmp3_; GeeSortedSet* new_paths = NULL; - GeeTreeSet* _tmp23_; + GeeTreeSet* _tmp20_; #line 2143 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (media), NULL); #line 2143 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_COLLECTION (new_tag_list), NULL); #line 2144 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = media; -#line 2144 "/home/jens/Source/shotwell/src/Commands.vala" - self = (ModifyTagsCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource), RESOURCES_MODIFY_TAGS_LABEL, ""); -#line 2146 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = media; + self = (ModifyTagsCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (media, TYPE_DATA_SOURCE, DataSource), RESOURCES_MODIFY_TAGS_LABEL, ""); #line 2146 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp0_ = _g_object_ref0 (media); #line 2146 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->media); #line 2146 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->media = _tmp2_; -#line 2149 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = tag_global; + self->priv->media = _tmp0_; #line 2149 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = media; + _tmp1_ = tag_global; #line 2149 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = tag_source_collection_fetch_for_source (_tmp3_, _tmp4_); + _tmp2_ = tag_source_collection_fetch_for_source (_tmp1_, media); #line 2149 "/home/jens/Source/shotwell/src/Commands.vala" - original_tags = _tmp5_; + original_tags = _tmp2_; #line 2150 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = original_tags; + _tmp3_ = original_tags; #line 2150 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp6_ != NULL) { -#line 19058 "Commands.c" + if (_tmp3_ != NULL) { +#line 19515 "Commands.c" { GeeList* _tag_list = NULL; - GeeList* _tmp7_; - GeeList* _tmp8_; + GeeList* _tmp4_; + GeeList* _tmp5_; gint _tag_size = 0; - GeeList* _tmp9_; - gint _tmp10_; - gint _tmp11_; + GeeList* _tmp6_; + gint _tmp7_; + gint _tmp8_; gint _tag_index = 0; #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = original_tags; + _tmp4_ = original_tags; #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = _g_object_ref0 (_tmp7_); + _tmp5_ = _g_object_ref0 (_tmp4_); #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" - _tag_list = _tmp8_; + _tag_list = _tmp5_; #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = _tag_list; + _tmp6_ = _tag_list; #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" - _tag_size = _tmp11_; + _tag_size = _tmp8_; #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" _tag_index = -1; #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 19086 "Commands.c" - gint _tmp12_; - gint _tmp13_; - gint _tmp14_; +#line 19543 "Commands.c" + gint _tmp9_; + gint _tmp10_; + gint _tmp11_; Tag* tag = NULL; - GeeList* _tmp15_; - gint _tmp16_; - gpointer _tmp17_; + GeeList* _tmp12_; + gint _tmp13_; + gpointer _tmp14_; SourceProxy* proxy = NULL; - Tag* _tmp18_; + Tag* _tmp15_; + SourceProxy* _tmp16_; + GeeArrayList* _tmp17_; + SourceProxy* _tmp18_; SourceProxy* _tmp19_; - GeeArrayList* _tmp20_; - SourceProxy* _tmp21_; - SourceProxy* _tmp22_; #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = _tag_index; + _tmp9_ = _tag_index; #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" - _tag_index = _tmp12_ + 1; + _tag_index = _tmp9_ + 1; #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = _tag_index; + _tmp10_ = _tag_index; #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = _tag_size; + _tmp11_ = _tag_size; #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp13_ < _tmp14_)) { + if (!(_tmp10_ < _tmp11_)) { #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 19112 "Commands.c" +#line 19569 "Commands.c" } #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = _tag_list; + _tmp12_ = _tag_list; #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = _tag_index; + _tmp13_ = _tag_index; #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = gee_list_get (_tmp15_, _tmp16_); + _tmp14_ = gee_list_get (_tmp12_, _tmp13_); #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" - tag = (Tag*) _tmp17_; + tag = (Tag*) _tmp14_; #line 2152 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = tag; + _tmp15_ = tag; #line 2152 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PROXYABLE, Proxyable)); + _tmp16_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PROXYABLE, Proxyable)); #line 2152 "/home/jens/Source/shotwell/src/Commands.vala" - proxy = _tmp19_; + proxy = _tmp16_; #line 2153 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = self->priv->to_remove; + _tmp17_ = self->priv->to_remove; #line 2153 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = proxy; + _tmp18_ = proxy; #line 2153 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_); #line 2154 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = proxy; + _tmp19_ = proxy; #line 2154 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (_tmp22_, "broken", (GCallback) _modify_tags_command_on_proxy_broken_source_proxy_broken, self, 0); + g_signal_connect_object (_tmp19_, "broken", (GCallback) _modify_tags_command_on_proxy_broken_source_proxy_broken, self, 0); #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (proxy); #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (tag); -#line 19142 "Commands.c" +#line 19599 "Commands.c" } #line 2151 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_tag_list); -#line 19146 "Commands.c" +#line 19603 "Commands.c" } } #line 2160 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp20_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 2160 "/home/jens/Source/shotwell/src/Commands.vala" - new_paths = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_SORTED_SET, GeeSortedSet); -#line 19153 "Commands.c" + new_paths = G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_SORTED_SET, GeeSortedSet); +#line 19610 "Commands.c" { GeeIterator* _new_tag_it = NULL; - GeeCollection* _tmp24_; - GeeIterator* _tmp25_; -#line 2161 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = new_tag_list; + GeeIterator* _tmp21_; #line 2161 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp21_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (new_tag_list, GEE_TYPE_ITERABLE, GeeIterable)); #line 2161 "/home/jens/Source/shotwell/src/Commands.vala" - _new_tag_it = _tmp25_; + _new_tag_it = _tmp21_; #line 2161 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 19166 "Commands.c" - GeeIterator* _tmp26_; - gboolean _tmp27_; +#line 19620 "Commands.c" + GeeIterator* _tmp22_; Tag* new_tag = NULL; - GeeIterator* _tmp28_; - gpointer _tmp29_; + GeeIterator* _tmp23_; + gpointer _tmp24_; gchar* new_tag_path = NULL; - Tag* _tmp30_; - gchar* _tmp31_; - GeeSortedSet* _tmp32_; - const gchar* _tmp33_; - GeeSortedSet* _tmp34_; - const gchar* _tmp35_; - GeeList* _tmp36_; - GeeList* _tmp37_; -#line 2161 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = _new_tag_it; + Tag* _tmp25_; + gchar* _tmp26_; + GeeSortedSet* _tmp27_; + const gchar* _tmp28_; + GeeSortedSet* _tmp29_; + const gchar* _tmp30_; + GeeList* _tmp31_; + GeeList* _tmp32_; #line 2161 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = gee_iterator_next (_tmp26_); + _tmp22_ = _new_tag_it; #line 2161 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp27_) { + if (!gee_iterator_next (_tmp22_)) { #line 2161 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 19189 "Commands.c" +#line 19640 "Commands.c" } #line 2161 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp28_ = _new_tag_it; + _tmp23_ = _new_tag_it; #line 2161 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp29_ = gee_iterator_get (_tmp28_); + _tmp24_ = gee_iterator_get (_tmp23_); #line 2161 "/home/jens/Source/shotwell/src/Commands.vala" - new_tag = (Tag*) _tmp29_; + new_tag = (Tag*) _tmp24_; #line 2162 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp30_ = new_tag; + _tmp25_ = new_tag; #line 2162 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp31_ = tag_get_path (_tmp30_); + _tmp26_ = tag_get_path (_tmp25_); #line 2162 "/home/jens/Source/shotwell/src/Commands.vala" - new_tag_path = _tmp31_; + new_tag_path = _tmp26_; #line 2164 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp32_ = new_paths; + _tmp27_ = new_paths; #line 2164 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp33_ = new_tag_path; + _tmp28_ = new_tag_path; #line 2164 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection), _tmp33_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_); #line 2165 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp34_ = new_paths; + _tmp29_ = new_paths; #line 2165 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp35_ = new_tag_path; + _tmp30_ = new_tag_path; #line 2165 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp36_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp35_); + _tmp31_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp30_); #line 2165 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp37_ = _tmp36_; + _tmp32_ = _tmp31_; #line 2165 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection)); + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection)); #line 2165 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp37_); + _g_object_unref0 (_tmp32_); #line 2161 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (new_tag_path); #line 2161 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (new_tag); -#line 19225 "Commands.c" +#line 19676 "Commands.c" } #line 2161 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_new_tag_it); -#line 19229 "Commands.c" +#line 19680 "Commands.c" } { GeeIterator* _path_it = NULL; - GeeSortedSet* _tmp38_; - GeeIterator* _tmp39_; + GeeSortedSet* _tmp33_; + GeeIterator* _tmp34_; #line 2168 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp38_ = new_paths; + _tmp33_ = new_paths; #line 2168 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp39_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp34_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ITERABLE, GeeIterable)); #line 2168 "/home/jens/Source/shotwell/src/Commands.vala" - _path_it = _tmp39_; + _path_it = _tmp34_; #line 2168 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 19243 "Commands.c" - GeeIterator* _tmp40_; - gboolean _tmp41_; +#line 19694 "Commands.c" + GeeIterator* _tmp35_; gchar* path = NULL; - GeeIterator* _tmp42_; - gpointer _tmp43_; - TagSourceCollection* _tmp44_; - const gchar* _tmp45_; - gboolean _tmp46_; + GeeIterator* _tmp36_; + gpointer _tmp37_; + TagSourceCollection* _tmp38_; + const gchar* _tmp39_; SourceProxy* proxy = NULL; - const gchar* _tmp47_; - Tag* _tmp48_; - Tag* _tmp49_; - SourceProxy* _tmp50_; - SourceProxy* _tmp51_; - GeeArrayList* _tmp52_; - SourceProxy* _tmp53_; - SourceProxy* _tmp54_; -#line 2168 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp40_ = _path_it; + const gchar* _tmp40_; + Tag* _tmp41_; + Tag* _tmp42_; + SourceProxy* _tmp43_; + SourceProxy* _tmp44_; + GeeArrayList* _tmp45_; + SourceProxy* _tmp46_; + SourceProxy* _tmp47_; #line 2168 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp41_ = gee_iterator_next (_tmp40_); + _tmp35_ = _path_it; #line 2168 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp41_) { + if (!gee_iterator_next (_tmp35_)) { #line 2168 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 19269 "Commands.c" +#line 19716 "Commands.c" } #line 2168 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp42_ = _path_it; + _tmp36_ = _path_it; #line 2168 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp43_ = gee_iterator_get (_tmp42_); + _tmp37_ = gee_iterator_get (_tmp36_); #line 2168 "/home/jens/Source/shotwell/src/Commands.vala" - path = (gchar*) _tmp43_; + path = (gchar*) _tmp37_; #line 2169 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp44_ = tag_global; + _tmp38_ = tag_global; #line 2169 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp45_ = path; + _tmp39_ = path; #line 2169 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp46_ = tag_source_collection_exists (_tmp44_, _tmp45_, FALSE); -#line 2169 "/home/jens/Source/shotwell/src/Commands.vala" - _vala_assert (_tmp46_, "Tag.global.exists(path)"); + _vala_assert (tag_source_collection_exists (_tmp38_, _tmp39_, FALSE), "Tag.global.exists(path)"); #line 2171 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp47_ = path; + _tmp40_ = path; #line 2171 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp48_ = tag_for_path (_tmp47_); + _tmp41_ = tag_for_path (_tmp40_); #line 2171 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp49_ = _tmp48_; + _tmp42_ = _tmp41_; #line 2171 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp50_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_PROXYABLE, Proxyable)); + _tmp43_ = proxyable_get_proxy (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PROXYABLE, Proxyable)); #line 2171 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp51_ = _tmp50_; + _tmp44_ = _tmp43_; #line 2171 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp49_); + _g_object_unref0 (_tmp42_); #line 2171 "/home/jens/Source/shotwell/src/Commands.vala" - proxy = _tmp51_; + proxy = _tmp44_; #line 2172 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp52_ = self->priv->to_add; + _tmp45_ = self->priv->to_add; #line 2172 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp53_ = proxy; + _tmp46_ = proxy; #line 2172 "/home/jens/Source/shotwell/src/Commands.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp53_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp46_); #line 2173 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp54_ = proxy; + _tmp47_ = proxy; #line 2173 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (_tmp54_, "broken", (GCallback) _modify_tags_command_on_proxy_broken_source_proxy_broken, self, 0); + g_signal_connect_object (_tmp47_, "broken", (GCallback) _modify_tags_command_on_proxy_broken_source_proxy_broken, self, 0); #line 2168 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (proxy); #line 2168 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (path); -#line 19313 "Commands.c" +#line 19758 "Commands.c" } #line 2168 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_path_it); -#line 19317 "Commands.c" +#line 19762 "Commands.c" } #line 2143 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (new_paths); @@ -19321,22 +19766,27 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource _g_object_unref0 (original_tags); #line 2143 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 19325 "Commands.c" +#line 19770 "Commands.c" } -ModifyTagsCommand* modify_tags_command_new (MediaSource* media, GeeCollection* new_tag_list) { +ModifyTagsCommand* +modify_tags_command_new (MediaSource* media, + GeeCollection* new_tag_list) +{ #line 2143 "/home/jens/Source/shotwell/src/Commands.vala" return modify_tags_command_construct (TYPE_MODIFY_TAGS_COMMAND, media, new_tag_list); -#line 19332 "Commands.c" +#line 19780 "Commands.c" } -static void modify_tags_command_real_execute (Command* base) { +static void +modify_tags_command_real_execute (Command* base) +{ ModifyTagsCommand * self; #line 2185 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MODIFY_TAGS_COMMAND, ModifyTagsCommand); -#line 19340 "Commands.c" +#line 19790 "Commands.c" { GeeArrayList* _proxy_list = NULL; GeeArrayList* _tmp0_; @@ -19364,7 +19814,7 @@ static void modify_tags_command_real_execute (Command* base) { _proxy_index = -1; #line 2186 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 19368 "Commands.c" +#line 19818 "Commands.c" gint _tmp5_; gint _tmp6_; gint _tmp7_; @@ -19390,7 +19840,7 @@ static void modify_tags_command_real_execute (Command* base) { if (!(_tmp6_ < _tmp7_)) { #line 2186 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 19394 "Commands.c" +#line 19844 "Commands.c" } #line 2186 "/home/jens/Source/shotwell/src/Commands.vala" _tmp8_ = _proxy_list; @@ -19418,11 +19868,11 @@ static void modify_tags_command_real_execute (Command* base) { _g_object_unref0 (_tmp13_); #line 2186 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (proxy); -#line 19422 "Commands.c" +#line 19872 "Commands.c" } #line 2186 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_proxy_list); -#line 19426 "Commands.c" +#line 19876 "Commands.c" } { GeeArrayList* _proxy_list = NULL; @@ -19451,7 +19901,7 @@ static void modify_tags_command_real_execute (Command* base) { _proxy_index = -1; #line 2189 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 19455 "Commands.c" +#line 19905 "Commands.c" gint _tmp22_; gint _tmp23_; gint _tmp24_; @@ -19475,7 +19925,7 @@ static void modify_tags_command_real_execute (Command* base) { if (!(_tmp23_ < _tmp24_)) { #line 2189 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 19479 "Commands.c" +#line 19929 "Commands.c" } #line 2189 "/home/jens/Source/shotwell/src/Commands.vala" _tmp25_ = _proxy_list; @@ -19499,20 +19949,22 @@ static void modify_tags_command_real_execute (Command* base) { _g_object_unref0 (_tmp30_); #line 2189 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (proxy); -#line 19503 "Commands.c" +#line 19953 "Commands.c" } #line 2189 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_proxy_list); -#line 19507 "Commands.c" +#line 19957 "Commands.c" } } -static void modify_tags_command_real_undo (Command* base) { +static void +modify_tags_command_real_undo (Command* base) +{ ModifyTagsCommand * self; #line 2193 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MODIFY_TAGS_COMMAND, ModifyTagsCommand); -#line 19516 "Commands.c" +#line 19968 "Commands.c" { GeeArrayList* _proxy_list = NULL; GeeArrayList* _tmp0_; @@ -19540,7 +19992,7 @@ static void modify_tags_command_real_undo (Command* base) { _proxy_index = -1; #line 2194 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 19544 "Commands.c" +#line 19996 "Commands.c" gint _tmp5_; gint _tmp6_; gint _tmp7_; @@ -19566,7 +20018,7 @@ static void modify_tags_command_real_undo (Command* base) { if (!(_tmp6_ < _tmp7_)) { #line 2194 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 19570 "Commands.c" +#line 20022 "Commands.c" } #line 2194 "/home/jens/Source/shotwell/src/Commands.vala" _tmp8_ = _proxy_list; @@ -19594,11 +20046,11 @@ static void modify_tags_command_real_undo (Command* base) { _g_object_unref0 (_tmp13_); #line 2194 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (proxy); -#line 19598 "Commands.c" +#line 20050 "Commands.c" } #line 2194 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_proxy_list); -#line 19602 "Commands.c" +#line 20054 "Commands.c" } { GeeArrayList* _proxy_list = NULL; @@ -19627,7 +20079,7 @@ static void modify_tags_command_real_undo (Command* base) { _proxy_index = -1; #line 2197 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 19631 "Commands.c" +#line 20083 "Commands.c" gint _tmp22_; gint _tmp23_; gint _tmp24_; @@ -19651,7 +20103,7 @@ static void modify_tags_command_real_undo (Command* base) { if (!(_tmp23_ < _tmp24_)) { #line 2197 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 19655 "Commands.c" +#line 20107 "Commands.c" } #line 2197 "/home/jens/Source/shotwell/src/Commands.vala" _tmp25_ = _proxy_list; @@ -19675,16 +20127,18 @@ static void modify_tags_command_real_undo (Command* base) { _g_object_unref0 (_tmp30_); #line 2197 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (proxy); -#line 19679 "Commands.c" +#line 20131 "Commands.c" } #line 2197 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_proxy_list); -#line 19683 "Commands.c" +#line 20135 "Commands.c" } } -static void modify_tags_command_on_proxy_broken (ModifyTagsCommand* self) { +static void +modify_tags_command_on_proxy_broken (ModifyTagsCommand* self) +{ CommandManager* _tmp0_; CommandManager* _tmp1_; #line 2201 "/home/jens/Source/shotwell/src/Commands.vala" @@ -19697,11 +20151,13 @@ static void modify_tags_command_on_proxy_broken (ModifyTagsCommand* self) { command_manager_reset (_tmp1_); #line 2202 "/home/jens/Source/shotwell/src/Commands.vala" _command_manager_unref0 (_tmp1_); -#line 19701 "Commands.c" +#line 20155 "Commands.c" } -static void modify_tags_command_class_init (ModifyTagsCommandClass * klass) { +static void +modify_tags_command_class_init (ModifyTagsCommandClass * klass) +{ #line 2138 "/home/jens/Source/shotwell/src/Commands.vala" modify_tags_command_parent_class = g_type_class_peek_parent (klass); #line 2138 "/home/jens/Source/shotwell/src/Commands.vala" @@ -19712,11 +20168,13 @@ static void modify_tags_command_class_init (ModifyTagsCommandClass * klass) { ((CommandClass *) klass)->undo = (void (*) (Command *)) modify_tags_command_real_undo; #line 2138 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = modify_tags_command_finalize; -#line 19716 "Commands.c" +#line 20172 "Commands.c" } -static void modify_tags_command_instance_init (ModifyTagsCommand * self) { +static void +modify_tags_command_instance_init (ModifyTagsCommand * self) +{ GeeArrayList* _tmp0_; GeeArrayList* _tmp1_; #line 2138 "/home/jens/Source/shotwell/src/Commands.vala" @@ -19729,15 +20187,17 @@ static void modify_tags_command_instance_init (ModifyTagsCommand * self) { _tmp1_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL); #line 2141 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->to_remove = _tmp1_; -#line 19733 "Commands.c" +#line 20191 "Commands.c" } -static void modify_tags_command_finalize (GObject * obj) { +static void +modify_tags_command_finalize (GObject * obj) +{ ModifyTagsCommand * self; #line 2138 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MODIFY_TAGS_COMMAND, ModifyTagsCommand); -#line 19741 "Commands.c" +#line 20201 "Commands.c" { GeeArrayList* _proxy_list = NULL; GeeArrayList* _tmp0_; @@ -19765,7 +20225,7 @@ static void modify_tags_command_finalize (GObject * obj) { _proxy_index = -1; #line 2178 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 19769 "Commands.c" +#line 20229 "Commands.c" gint _tmp5_; gint _tmp6_; gint _tmp7_; @@ -19787,7 +20247,7 @@ static void modify_tags_command_finalize (GObject * obj) { if (!(_tmp6_ < _tmp7_)) { #line 2178 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 19791 "Commands.c" +#line 20251 "Commands.c" } #line 2178 "/home/jens/Source/shotwell/src/Commands.vala" _tmp8_ = _proxy_list; @@ -19805,11 +20265,11 @@ static void modify_tags_command_finalize (GObject * obj) { g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _modify_tags_command_on_proxy_broken_source_proxy_broken, self); #line 2178 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (proxy); -#line 19809 "Commands.c" +#line 20269 "Commands.c" } #line 2178 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_proxy_list); -#line 19813 "Commands.c" +#line 20273 "Commands.c" } { GeeArrayList* _proxy_list = NULL; @@ -19838,7 +20298,7 @@ static void modify_tags_command_finalize (GObject * obj) { _proxy_index = -1; #line 2181 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 19842 "Commands.c" +#line 20302 "Commands.c" gint _tmp18_; gint _tmp19_; gint _tmp20_; @@ -19860,7 +20320,7 @@ static void modify_tags_command_finalize (GObject * obj) { if (!(_tmp19_ < _tmp20_)) { #line 2181 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 19864 "Commands.c" +#line 20324 "Commands.c" } #line 2181 "/home/jens/Source/shotwell/src/Commands.vala" _tmp21_ = _proxy_list; @@ -19878,11 +20338,11 @@ static void modify_tags_command_finalize (GObject * obj) { g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _modify_tags_command_on_proxy_broken_source_proxy_broken, self); #line 2181 "/home/jens/Source/shotwell/src/Commands.vala" _source_proxy_unref0 (proxy); -#line 19882 "Commands.c" +#line 20342 "Commands.c" } #line 2181 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_proxy_list); -#line 19886 "Commands.c" +#line 20346 "Commands.c" } #line 2139 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->media); @@ -19892,11 +20352,13 @@ static void modify_tags_command_finalize (GObject * obj) { _g_object_unref0 (self->priv->to_remove); #line 2138 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (modify_tags_command_parent_class)->finalize (obj); -#line 19896 "Commands.c" +#line 20356 "Commands.c" } -GType modify_tags_command_get_type (void) { +GType +modify_tags_command_get_type (void) +{ static volatile gsize modify_tags_command_type_id__volatile = 0; if (g_once_init_enter (&modify_tags_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ModifyTagsCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) modify_tags_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ModifyTagsCommand), 0, (GInstanceInitFunc) modify_tags_command_instance_init, NULL }; @@ -19908,129 +20370,120 @@ GType modify_tags_command_get_type (void) { } -static void _tag_untag_photos_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +static void +_tag_untag_photos_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self) +{ #line 2226 "/home/jens/Source/shotwell/src/Commands.vala" tag_untag_photos_command_on_source_destroyed ((TagUntagPhotosCommand*) self, source); -#line 19915 "Commands.c" +#line 20381 "Commands.c" } -TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Tag* tag, GeeCollection* sources, gint count, gboolean attach) { +TagUntagPhotosCommand* +tag_untag_photos_command_construct (GType object_type, + Tag* tag, + GeeCollection* sources, + gint count, + gboolean attach) +{ TagUntagPhotosCommand * self = NULL; gchar* _tmp0_ = NULL; - gboolean _tmp1_; - Tag* _tmp12_; - Tag* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; - GeeCollection* _tmp16_; - GeeCollection* _tmp17_; - gboolean _tmp18_; - LibraryPhotoSourceCollection* _tmp19_; - VideoSourceCollection* _tmp20_; + gchar* _tmp7_; + gchar* _tmp8_; + GeeCollection* _tmp9_; + LibraryPhotoSourceCollection* _tmp10_; + VideoSourceCollection* _tmp11_; #line 2212 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_TAG (tag), NULL); #line 2212 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_COLLECTION (sources), NULL); #line 2214 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = attach; -#line 2214 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp1_) { -#line 19940 "Commands.c" - Tag* _tmp2_; + if (attach) { +#line 20405 "Commands.c" + gchar* _tmp1_; + gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - gint _tmp5_; - gchar* _tmp6_; -#line 2214 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = tag; #line 2214 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = tag_get_user_visible_name (_tmp2_); + _tmp1_ = tag_get_user_visible_name (tag); #line 2214 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _tmp3_; -#line 2214 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = count; + _tmp2_ = _tmp1_; #line 2214 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = resources_tag_photos_label (_tmp4_, _tmp5_); + _tmp3_ = resources_tag_photos_label (_tmp2_, count); #line 2214 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (_tmp0_); #line 2214 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = _tmp6_; + _tmp0_ = _tmp3_; #line 2214 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp4_); -#line 19962 "Commands.c" + _g_free0 (_tmp2_); +#line 20421 "Commands.c" } else { - Tag* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - gint _tmp10_; - gchar* _tmp11_; -#line 2215 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = tag; -#line 2215 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = tag_get_user_visible_name (_tmp7_); + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; #line 2215 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = _tmp8_; + _tmp4_ = tag_get_user_visible_name (tag); #line 2215 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = count; + _tmp5_ = _tmp4_; #line 2215 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = resources_untag_photos_label (_tmp9_, _tmp10_); + _tmp6_ = resources_untag_photos_label (_tmp5_, count); #line 2215 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (_tmp0_); #line 2215 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = _tmp11_; + _tmp0_ = _tmp6_; #line 2215 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp9_); -#line 19985 "Commands.c" + _g_free0 (_tmp5_); +#line 20438 "Commands.c" } #line 2213 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = tag; -#line 2213 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = tag; -#line 2213 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject)); + _tmp7_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (tag, TYPE_DATA_OBJECT, DataObject)); #line 2213 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = _tmp14_; + _tmp8_ = _tmp7_; #line 2213 "/home/jens/Source/shotwell/src/Commands.vala" - self = (TagUntagPhotosCommand*) simple_proxyable_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PROXYABLE, Proxyable), _tmp0_, _tmp15_); + self = (TagUntagPhotosCommand*) simple_proxyable_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (tag, TYPE_PROXYABLE, Proxyable), _tmp0_, _tmp8_); #line 2213 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp15_); -#line 2218 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = sources; + _g_free0 (_tmp8_); #line 2218 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = _g_object_ref0 (_tmp16_); + _tmp9_ = _g_object_ref0 (sources); #line 2218 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->sources); #line 2218 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->sources = _tmp17_; -#line 2219 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = attach; + self->priv->sources = _tmp9_; #line 2219 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->attach = _tmp18_; + self->priv->attach = attach; #line 2221 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = library_photo_global; + _tmp10_ = library_photo_global; #line 2221 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _tag_untag_photos_command_on_source_destroyed_source_collection_item_destroyed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _tag_untag_photos_command_on_source_destroyed_source_collection_item_destroyed, self, 0); #line 2222 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = video_global; + _tmp11_ = video_global; #line 2222 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _tag_untag_photos_command_on_source_destroyed_source_collection_item_destroyed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _tag_untag_photos_command_on_source_destroyed_source_collection_item_destroyed, self, 0); #line 2212 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (_tmp0_); #line 2212 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 20023 "Commands.c" +#line 20468 "Commands.c" } -TagUntagPhotosCommand* tag_untag_photos_command_new (Tag* tag, GeeCollection* sources, gint count, gboolean attach) { +TagUntagPhotosCommand* +tag_untag_photos_command_new (Tag* tag, + GeeCollection* sources, + gint count, + gboolean attach) +{ #line 2212 "/home/jens/Source/shotwell/src/Commands.vala" return tag_untag_photos_command_construct (TYPE_TAG_UNTAG_PHOTOS_COMMAND, tag, sources, count, attach); -#line 20030 "Commands.c" +#line 20480 "Commands.c" } -static void tag_untag_photos_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source) { +static void +tag_untag_photos_command_real_execute_on_source (SimpleProxyableCommand* base, + DataSource* source) +{ TagUntagPhotosCommand * self; gboolean _tmp0_; #line 2230 "/home/jens/Source/shotwell/src/Commands.vala" @@ -20041,25 +20494,21 @@ static void tag_untag_photos_command_real_execute_on_source (SimpleProxyableComm _tmp0_ = self->priv->attach; #line 2231 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp0_) { -#line 20045 "Commands.c" - DataSource* _tmp1_; -#line 2232 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = source; #line 2232 "/home/jens/Source/shotwell/src/Commands.vala" - tag_untag_photos_command_do_attach (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TAG, Tag)); -#line 20051 "Commands.c" + tag_untag_photos_command_do_attach (self, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_TAG, Tag)); +#line 20500 "Commands.c" } else { - DataSource* _tmp2_; #line 2234 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = source; -#line 2234 "/home/jens/Source/shotwell/src/Commands.vala" - tag_untag_photos_command_do_detach (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_TAG, Tag)); -#line 20058 "Commands.c" + tag_untag_photos_command_do_detach (self, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_TAG, Tag)); +#line 20504 "Commands.c" } } -static void tag_untag_photos_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source) { +static void +tag_untag_photos_command_real_undo_on_source (SimpleProxyableCommand* base, + DataSource* source) +{ TagUntagPhotosCommand * self; gboolean _tmp0_; #line 2237 "/home/jens/Source/shotwell/src/Commands.vala" @@ -20070,25 +20519,21 @@ static void tag_untag_photos_command_real_undo_on_source (SimpleProxyableCommand _tmp0_ = self->priv->attach; #line 2238 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp0_) { -#line 20074 "Commands.c" - DataSource* _tmp1_; #line 2239 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = source; -#line 2239 "/home/jens/Source/shotwell/src/Commands.vala" - tag_untag_photos_command_do_detach (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TAG, Tag)); -#line 20080 "Commands.c" + tag_untag_photos_command_do_detach (self, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_TAG, Tag)); +#line 20525 "Commands.c" } else { - DataSource* _tmp2_; #line 2241 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = source; -#line 2241 "/home/jens/Source/shotwell/src/Commands.vala" - tag_untag_photos_command_do_attach (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_TAG, Tag)); -#line 20087 "Commands.c" + tag_untag_photos_command_do_attach (self, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_TAG, Tag)); +#line 20529 "Commands.c" } } -static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag* tag) { +static void +tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, + Tag* tag) +{ GeeMultiMap* _tmp0_; #line 2244 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_TAG_UNTAG_PHOTOS_COMMAND (self)); @@ -20098,140 +20543,131 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag _tmp0_ = self->priv->detached_from; #line 2246 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp0_ == NULL) { -#line 20102 "Commands.c" - Tag* _tmp1_; - GeeCollection* _tmp2_; - GeeArrayList* _tmp3_; +#line 20547 "Commands.c" + GeeCollection* _tmp1_; + GeeArrayList* _tmp2_; Tag* curr_tmp = NULL; - Tag* _tmp4_; - Tag* _tmp5_; -#line 2247 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = tag; + Tag* _tmp3_; #line 2247 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = self->priv->sources; + _tmp1_ = self->priv->sources; #line 2247 "/home/jens/Source/shotwell/src/Commands.vala" - tag_attach_many (_tmp1_, _tmp2_); + tag_attach_many (tag, _tmp1_); #line 2249 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp2_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 2249 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->attached_to); #line 2249 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->attached_to = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_LIST, GeeList); + self->priv->attached_to = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList); #line 2251 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = tag; + _tmp3_ = _g_object_ref0 (tag); #line 2251 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); -#line 2251 "/home/jens/Source/shotwell/src/Commands.vala" - curr_tmp = _tmp5_; + curr_tmp = _tmp3_; #line 2253 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 20129 "Commands.c" +#line 20568 "Commands.c" + Tag* _tmp4_; + GeeList* _tmp5_; Tag* _tmp6_; - GeeList* _tmp7_; + Tag* _tmp7_; Tag* _tmp8_; - Tag* _tmp9_; - Tag* _tmp10_; #line 2253 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = curr_tmp; + _tmp4_ = curr_tmp; #line 2253 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp6_ != NULL)) { + if (!(_tmp4_ != NULL)) { #line 2253 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 20141 "Commands.c" +#line 20580 "Commands.c" } #line 2254 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = self->priv->attached_to; + _tmp5_ = self->priv->attached_to; #line 2254 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = curr_tmp; + _tmp6_ = curr_tmp; #line 2254 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp8_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), _tmp6_); #line 2255 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = curr_tmp; + _tmp7_ = curr_tmp; #line 2255 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = tag_get_hierarchical_parent (_tmp9_); + _tmp8_ = tag_get_hierarchical_parent (_tmp7_); #line 2255 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (curr_tmp); #line 2255 "/home/jens/Source/shotwell/src/Commands.vala" - curr_tmp = _tmp10_; -#line 20157 "Commands.c" + curr_tmp = _tmp8_; +#line 20596 "Commands.c" } #line 2258 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (curr_tmp); #line 2258 "/home/jens/Source/shotwell/src/Commands.vala" return; -#line 20163 "Commands.c" +#line 20602 "Commands.c" } { GeeIterator* _detached_tag_it = NULL; - GeeMultiMap* _tmp11_; - GeeMultiSet* _tmp12_; - GeeMultiSet* _tmp13_; - GeeIterator* _tmp14_; - GeeIterator* _tmp15_; + GeeMultiMap* _tmp9_; + GeeMultiSet* _tmp10_; + GeeMultiSet* _tmp11_; + GeeIterator* _tmp12_; + GeeIterator* _tmp13_; #line 2262 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = self->priv->detached_from; + _tmp9_ = self->priv->detached_from; #line 2262 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = gee_multi_map_get_all_keys (_tmp11_); + _tmp10_ = gee_multi_map_get_all_keys (_tmp9_); #line 2262 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 2262 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); #line 2262 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = _tmp14_; + _tmp13_ = _tmp12_; #line 2262 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp11_); #line 2262 "/home/jens/Source/shotwell/src/Commands.vala" - _detached_tag_it = _tmp15_; + _detached_tag_it = _tmp13_; #line 2262 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 20188 "Commands.c" - GeeIterator* _tmp16_; - gboolean _tmp17_; +#line 20627 "Commands.c" + GeeIterator* _tmp14_; Tag* detached_tag = NULL; - GeeIterator* _tmp18_; - gpointer _tmp19_; - Tag* _tmp20_; - GeeMultiMap* _tmp21_; - Tag* _tmp22_; - GeeCollection* _tmp23_; - GeeCollection* _tmp24_; -#line 2262 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = _detached_tag_it; + GeeIterator* _tmp15_; + gpointer _tmp16_; + Tag* _tmp17_; + GeeMultiMap* _tmp18_; + Tag* _tmp19_; + GeeCollection* _tmp20_; + GeeCollection* _tmp21_; #line 2262 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = gee_iterator_next (_tmp16_); + _tmp14_ = _detached_tag_it; #line 2262 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp17_) { + if (!gee_iterator_next (_tmp14_)) { #line 2262 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 20207 "Commands.c" +#line 20643 "Commands.c" } #line 2262 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = _detached_tag_it; + _tmp15_ = _detached_tag_it; #line 2262 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = gee_iterator_get (_tmp18_); + _tmp16_ = gee_iterator_get (_tmp15_); #line 2262 "/home/jens/Source/shotwell/src/Commands.vala" - detached_tag = (Tag*) _tmp19_; + detached_tag = (Tag*) _tmp16_; #line 2263 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = detached_tag; + _tmp17_ = detached_tag; #line 2263 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = self->priv->detached_from; + _tmp18_ = self->priv->detached_from; #line 2263 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = detached_tag; + _tmp19_ = detached_tag; #line 2263 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = gee_multi_map_get (_tmp21_, _tmp22_); + _tmp20_ = gee_multi_map_get (_tmp18_, _tmp19_); #line 2263 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = _tmp23_; + _tmp21_ = _tmp20_; #line 2263 "/home/jens/Source/shotwell/src/Commands.vala" - tag_attach_many (_tmp20_, _tmp24_); + tag_attach_many (_tmp17_, _tmp21_); #line 2263 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp21_); #line 2262 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (detached_tag); -#line 20231 "Commands.c" +#line 20667 "Commands.c" } #line 2262 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_detached_tag_it); -#line 20235 "Commands.c" +#line 20671 "Commands.c" } #line 2265 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->detached_from); @@ -20239,11 +20675,14 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag self->priv->detached_from = NULL; #line 2266 "/home/jens/Source/shotwell/src/Commands.vala" simple_proxyable_command_clear_added_proxies (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SIMPLE_PROXYABLE_COMMAND, SimpleProxyableCommand)); -#line 20243 "Commands.c" +#line 20679 "Commands.c" } -static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag* tag) { +static void +tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, + Tag* tag) +{ GeeList* _tmp0_; #line 2269 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_TAG_UNTAG_PHOTOS_COMMAND (self)); @@ -20253,221 +20692,208 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag _tmp0_ = self->priv->attached_to; #line 2270 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp0_ == NULL) { -#line 20257 "Commands.c" - Tag* _tmp1_; - GeeCollection* _tmp2_; +#line 20696 "Commands.c" + GeeCollection* _tmp1_; + GeeMultiMap* _tmp2_; GeeMultiMap* _tmp3_; - GeeMultiMap* _tmp4_; + GeeSet* _tmp4_; GeeSet* _tmp5_; - GeeSet* _tmp6_; #line 2274 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = tag; + _tmp1_ = self->priv->sources; #line 2274 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = self->priv->sources; -#line 2274 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = tag_detach_many (_tmp1_, _tmp2_); + _tmp2_ = tag_detach_many (tag, _tmp1_); #line 2274 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->detached_from); #line 2274 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->detached_from = _tmp3_; + self->priv->detached_from = _tmp2_; #line 2278 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = self->priv->detached_from; + _tmp3_ = self->priv->detached_from; #line 2278 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_multi_map_get_keys (_tmp4_); + _tmp4_ = gee_multi_map_get_keys (_tmp3_); #line 2278 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 2278 "/home/jens/Source/shotwell/src/Commands.vala" - simple_proxyable_command_add_proxyables (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SIMPLE_PROXYABLE_COMMAND, SimpleProxyableCommand), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + simple_proxyable_command_add_proxyables (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SIMPLE_PROXYABLE_COMMAND, SimpleProxyableCommand), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 2278 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp6_); -#line 20284 "Commands.c" + _g_object_unref0 (_tmp5_); +#line 20720 "Commands.c" } else { { GeeList* _t_list = NULL; + GeeList* _tmp6_; GeeList* _tmp7_; - GeeList* _tmp8_; gint _t_size = 0; - GeeList* _tmp9_; + GeeList* _tmp8_; + gint _tmp9_; gint _tmp10_; - gint _tmp11_; gint _t_index = 0; #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = self->priv->attached_to; + _tmp6_ = self->priv->attached_to; #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = _g_object_ref0 (_tmp7_); + _tmp7_ = _g_object_ref0 (_tmp6_); #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" - _t_list = _tmp8_; + _t_list = _tmp7_; #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = _t_list; + _tmp8_ = _t_list; #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" - _t_size = _tmp11_; + _t_size = _tmp10_; #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" _t_index = -1; #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 20313 "Commands.c" +#line 20749 "Commands.c" + gint _tmp11_; gint _tmp12_; gint _tmp13_; - gint _tmp14_; Tag* t = NULL; - GeeList* _tmp15_; - gint _tmp16_; - gpointer _tmp17_; + GeeList* _tmp14_; + gint _tmp15_; + gpointer _tmp16_; #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = _t_index; + _tmp11_ = _t_index; #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" - _t_index = _tmp12_ + 1; + _t_index = _tmp11_ + 1; #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = _t_index; + _tmp12_ = _t_index; #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = _t_size; + _tmp13_ = _t_size; #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" - if (!(_tmp13_ < _tmp14_)) { + if (!(_tmp12_ < _tmp13_)) { #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 20333 "Commands.c" +#line 20769 "Commands.c" } #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = _t_list; + _tmp14_ = _t_list; #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = _t_index; + _tmp15_ = _t_index; #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = gee_list_get (_tmp15_, _tmp16_); + _tmp16_ = gee_list_get (_tmp14_, _tmp15_); #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" - t = (Tag*) _tmp17_; -#line 20343 "Commands.c" + t = (Tag*) _tmp16_; +#line 20779 "Commands.c" { GeeIterator* _ms_it = NULL; - GeeCollection* _tmp18_; - GeeIterator* _tmp19_; + GeeCollection* _tmp17_; + GeeIterator* _tmp18_; #line 2281 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = self->priv->sources; + _tmp17_ = self->priv->sources; #line 2281 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable)); #line 2281 "/home/jens/Source/shotwell/src/Commands.vala" - _ms_it = _tmp19_; + _ms_it = _tmp18_; #line 2281 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 20356 "Commands.c" - GeeIterator* _tmp20_; - gboolean _tmp21_; +#line 20792 "Commands.c" + GeeIterator* _tmp19_; MediaSource* ms = NULL; - GeeIterator* _tmp22_; - gpointer _tmp23_; - Tag* _tmp24_; - MediaSource* _tmp25_; - gint _tmp26_; -#line 2281 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = _ms_it; + GeeIterator* _tmp20_; + gpointer _tmp21_; + Tag* _tmp22_; + MediaSource* _tmp23_; #line 2281 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = gee_iterator_next (_tmp20_); + _tmp19_ = _ms_it; #line 2281 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp21_) { + if (!gee_iterator_next (_tmp19_)) { #line 2281 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 20373 "Commands.c" +#line 20805 "Commands.c" } #line 2281 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = _ms_it; + _tmp20_ = _ms_it; #line 2281 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = gee_iterator_get (_tmp22_); + _tmp21_ = gee_iterator_get (_tmp20_); #line 2281 "/home/jens/Source/shotwell/src/Commands.vala" - ms = (MediaSource*) _tmp23_; + ms = (MediaSource*) _tmp21_; #line 2283 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = t; + _tmp22_ = t; #line 2283 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = ms; + _tmp23_ = ms; #line 2283 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = tag_get_attachment_count (_tmp24_, _tmp25_); -#line 2283 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp26_ < 2) { -#line 20389 "Commands.c" - Tag* _tmp27_; - MediaSource* _tmp28_; - GeeList* _tmp29_; - GeeList* _tmp30_; + if (tag_get_attachment_count (_tmp22_, _tmp23_) < 2) { +#line 20819 "Commands.c" + Tag* _tmp24_; + MediaSource* _tmp25_; + GeeList* _tmp26_; + GeeList* _tmp27_; #line 2285 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = t; + _tmp24_ = t; #line 2285 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp28_ = ms; + _tmp25_ = ms; #line 2285 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp29_ = tag_detach (_tmp27_, _tmp28_); + _tmp26_ = tag_detach (_tmp24_, _tmp25_); #line 2285 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp30_ = _tmp29_; + _tmp27_ = _tmp26_; #line 2285 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp30_); -#line 20404 "Commands.c" + _g_object_unref0 (_tmp27_); +#line 20834 "Commands.c" } #line 2281 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (ms); -#line 20408 "Commands.c" +#line 20838 "Commands.c" } #line 2281 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_ms_it); -#line 20412 "Commands.c" +#line 20842 "Commands.c" } #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (t); -#line 20416 "Commands.c" +#line 20846 "Commands.c" } #line 2280 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_t_list); -#line 20420 "Commands.c" +#line 20850 "Commands.c" } } } -static void tag_untag_photos_command_on_source_destroyed (TagUntagPhotosCommand* self, DataSource* source) { - DataSource* _tmp0_; +static void +tag_untag_photos_command_on_source_destroyed (TagUntagPhotosCommand* self, + DataSource* source) +{ + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - GeeCollection* _tmp3_; - DataSource* _tmp4_; - gboolean _tmp5_; + GeeCollection* _tmp2_; #line 2292 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_TAG_UNTAG_PHOTOS_COMMAND (self)); #line 2292 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 2293 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; + _tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 2293 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject)); -#line 2293 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 2293 "/home/jens/Source/shotwell/src/Commands.vala" - g_debug ("Commands.vala:2293: on_source_destroyed: %s", _tmp2_); + g_debug ("Commands.vala:2293: on_source_destroyed: %s", _tmp1_); #line 2293 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp2_); -#line 2294 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = self->priv->sources; + _g_free0 (_tmp1_); #line 2294 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = source; -#line 2294 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_collection_contains (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp2_ = self->priv->sources; #line 2294 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp5_) { -#line 20455 "Commands.c" - CommandManager* _tmp6_; - CommandManager* _tmp7_; + if (gee_collection_contains (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource))) { +#line 20879 "Commands.c" + CommandManager* _tmp3_; + CommandManager* _tmp4_; #line 2295 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command)); + _tmp3_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command)); #line 2295 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 2295 "/home/jens/Source/shotwell/src/Commands.vala" - command_manager_reset (_tmp7_); + command_manager_reset (_tmp4_); #line 2295 "/home/jens/Source/shotwell/src/Commands.vala" - _command_manager_unref0 (_tmp7_); -#line 20466 "Commands.c" + _command_manager_unref0 (_tmp4_); +#line 20890 "Commands.c" } } -static void tag_untag_photos_command_class_init (TagUntagPhotosCommandClass * klass) { +static void +tag_untag_photos_command_class_init (TagUntagPhotosCommandClass * klass) +{ #line 2206 "/home/jens/Source/shotwell/src/Commands.vala" tag_untag_photos_command_parent_class = g_type_class_peek_parent (klass); #line 2206 "/home/jens/Source/shotwell/src/Commands.vala" @@ -20478,22 +20904,26 @@ static void tag_untag_photos_command_class_init (TagUntagPhotosCommandClass * kl ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) tag_untag_photos_command_real_undo_on_source; #line 2206 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = tag_untag_photos_command_finalize; -#line 20482 "Commands.c" +#line 20908 "Commands.c" } -static void tag_untag_photos_command_instance_init (TagUntagPhotosCommand * self) { +static void +tag_untag_photos_command_instance_init (TagUntagPhotosCommand * self) +{ #line 2206 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = TAG_UNTAG_PHOTOS_COMMAND_GET_PRIVATE (self); #line 2209 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->detached_from = NULL; #line 2210 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->attached_to = NULL; -#line 20493 "Commands.c" +#line 20921 "Commands.c" } -static void tag_untag_photos_command_finalize (GObject * obj) { +static void +tag_untag_photos_command_finalize (GObject * obj) +{ TagUntagPhotosCommand * self; LibraryPhotoSourceCollection* _tmp0_; guint _tmp1_; @@ -20521,11 +20951,13 @@ static void tag_untag_photos_command_finalize (GObject * obj) { _g_object_unref0 (self->priv->attached_to); #line 2206 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (tag_untag_photos_command_parent_class)->finalize (obj); -#line 20525 "Commands.c" +#line 20955 "Commands.c" } -GType tag_untag_photos_command_get_type (void) { +GType +tag_untag_photos_command_get_type (void) +{ static volatile gsize tag_untag_photos_command_type_id__volatile = 0; if (g_once_init_enter (&tag_untag_photos_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TagUntagPhotosCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tag_untag_photos_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TagUntagPhotosCommand), 0, (GInstanceInitFunc) tag_untag_photos_command_instance_init, NULL }; @@ -20537,98 +20969,85 @@ GType tag_untag_photos_command_get_type (void) { } -RenameSavedSearchCommand* rename_saved_search_command_construct (GType object_type, SavedSearch* search, const gchar* new_name) { +RenameSavedSearchCommand* +rename_saved_search_command_construct (GType object_type, + SavedSearch* search, + const gchar* new_name) +{ RenameSavedSearchCommand * self = NULL; - SavedSearch* _tmp0_; - SavedSearch* _tmp1_; + gchar* _tmp0_; + gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; - SavedSearch* _tmp7_; + SavedSearch* _tmp6_; + gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; - SavedSearch* _tmp10_; - SavedSearch* _tmp11_; - SavedSearch* _tmp12_; - gchar* _tmp13_; - const gchar* _tmp14_; - gchar* _tmp15_; #line 2304 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL); #line 2304 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (new_name != NULL, NULL); #line 2305 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = search; + _tmp0_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (search, TYPE_DATA_OBJECT, DataObject)); #line 2305 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = search; + _tmp1_ = _tmp0_; #line 2305 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); + _tmp2_ = resources_rename_search_label (_tmp1_, new_name); #line 2305 "/home/jens/Source/shotwell/src/Commands.vala" _tmp3_ = _tmp2_; #line 2305 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = new_name; -#line 2305 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = resources_rename_search_label (_tmp3_, _tmp4_); -#line 2305 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = _tmp5_; -#line 2305 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = search; + _tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (search, TYPE_DATA_OBJECT, DataObject)); #line 2305 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject)); -#line 2305 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = _tmp8_; -#line 2305 "/home/jens/Source/shotwell/src/Commands.vala" - self = (RenameSavedSearchCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource), _tmp6_, _tmp9_); + _tmp5_ = _tmp4_; #line 2305 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp9_); + self = (RenameSavedSearchCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (search, TYPE_DATA_SOURCE, DataSource), _tmp3_, _tmp5_); #line 2305 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 2305 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (_tmp3_); +#line 2305 "/home/jens/Source/shotwell/src/Commands.vala" + _g_free0 (_tmp1_); #line 2307 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = search; -#line 2307 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = _g_object_ref0 (_tmp10_); + _tmp6_ = _g_object_ref0 (search); #line 2307 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->search); #line 2307 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->search = _tmp11_; -#line 2308 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = search; + self->priv->search = _tmp6_; #line 2308 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject)); + _tmp7_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (search, TYPE_DATA_OBJECT, DataObject)); #line 2308 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->old_name); #line 2308 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->old_name = _tmp13_; + self->priv->old_name = _tmp7_; #line 2309 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = new_name; -#line 2309 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = g_strdup (_tmp14_); + _tmp8_ = g_strdup (new_name); #line 2309 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (self->priv->new_name); #line 2309 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->new_name = _tmp15_; + self->priv->new_name = _tmp8_; #line 2304 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 20617 "Commands.c" +#line 21032 "Commands.c" } -RenameSavedSearchCommand* rename_saved_search_command_new (SavedSearch* search, const gchar* new_name) { +RenameSavedSearchCommand* +rename_saved_search_command_new (SavedSearch* search, + const gchar* new_name) +{ #line 2304 "/home/jens/Source/shotwell/src/Commands.vala" return rename_saved_search_command_construct (TYPE_RENAME_SAVED_SEARCH_COMMAND, search, new_name); -#line 20624 "Commands.c" +#line 21042 "Commands.c" } -static void rename_saved_search_command_real_execute (Command* base) { +static void +rename_saved_search_command_real_execute (Command* base) +{ RenameSavedSearchCommand * self; SavedSearch* _tmp0_; const gchar* _tmp1_; - gboolean _tmp2_; #line 2312 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RENAME_SAVED_SEARCH_COMMAND, RenameSavedSearchCommand); #line 2313 "/home/jens/Source/shotwell/src/Commands.vala" @@ -20636,33 +21055,32 @@ static void rename_saved_search_command_real_execute (Command* base) { #line 2313 "/home/jens/Source/shotwell/src/Commands.vala" _tmp1_ = self->priv->new_name; #line 2313 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = saved_search_rename (_tmp0_, _tmp1_); -#line 2313 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp2_) { -#line 20643 "Commands.c" - const gchar* _tmp3_; + if (!saved_search_rename (_tmp0_, _tmp1_)) { +#line 21060 "Commands.c" + const gchar* _tmp2_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; #line 2314 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = self->priv->new_name; + _tmp2_ = self->priv->new_name; #line 2314 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = resources_rename_search_exists_message (_tmp3_); + _tmp3_ = resources_rename_search_exists_message (_tmp2_); #line 2314 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 2314 "/home/jens/Source/shotwell/src/Commands.vala" - app_window_error_message (_tmp5_, NULL); + app_window_error_message (_tmp4_, NULL); #line 2314 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp5_); -#line 20657 "Commands.c" + _g_free0 (_tmp4_); +#line 21074 "Commands.c" } } -static void rename_saved_search_command_real_undo (Command* base) { +static void +rename_saved_search_command_real_undo (Command* base) +{ RenameSavedSearchCommand * self; SavedSearch* _tmp0_; const gchar* _tmp1_; - gboolean _tmp2_; #line 2317 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RENAME_SAVED_SEARCH_COMMAND, RenameSavedSearchCommand); #line 2318 "/home/jens/Source/shotwell/src/Commands.vala" @@ -20670,29 +21088,29 @@ static void rename_saved_search_command_real_undo (Command* base) { #line 2318 "/home/jens/Source/shotwell/src/Commands.vala" _tmp1_ = self->priv->old_name; #line 2318 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = saved_search_rename (_tmp0_, _tmp1_); -#line 2318 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp2_) { -#line 20677 "Commands.c" - const gchar* _tmp3_; + if (!saved_search_rename (_tmp0_, _tmp1_)) { +#line 21093 "Commands.c" + const gchar* _tmp2_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; #line 2319 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = self->priv->old_name; + _tmp2_ = self->priv->old_name; #line 2319 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = resources_rename_search_exists_message (_tmp3_); + _tmp3_ = resources_rename_search_exists_message (_tmp2_); #line 2319 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 2319 "/home/jens/Source/shotwell/src/Commands.vala" - app_window_error_message (_tmp5_, NULL); + app_window_error_message (_tmp4_, NULL); #line 2319 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp5_); -#line 20691 "Commands.c" + _g_free0 (_tmp4_); +#line 21107 "Commands.c" } } -static void rename_saved_search_command_class_init (RenameSavedSearchCommandClass * klass) { +static void +rename_saved_search_command_class_init (RenameSavedSearchCommandClass * klass) +{ #line 2299 "/home/jens/Source/shotwell/src/Commands.vala" rename_saved_search_command_parent_class = g_type_class_peek_parent (klass); #line 2299 "/home/jens/Source/shotwell/src/Commands.vala" @@ -20703,18 +21121,22 @@ static void rename_saved_search_command_class_init (RenameSavedSearchCommandClas ((CommandClass *) klass)->undo = (void (*) (Command *)) rename_saved_search_command_real_undo; #line 2299 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = rename_saved_search_command_finalize; -#line 20707 "Commands.c" +#line 21125 "Commands.c" } -static void rename_saved_search_command_instance_init (RenameSavedSearchCommand * self) { +static void +rename_saved_search_command_instance_init (RenameSavedSearchCommand * self) +{ #line 2299 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = RENAME_SAVED_SEARCH_COMMAND_GET_PRIVATE (self); -#line 20714 "Commands.c" +#line 21134 "Commands.c" } -static void rename_saved_search_command_finalize (GObject * obj) { +static void +rename_saved_search_command_finalize (GObject * obj) +{ RenameSavedSearchCommand * self; #line 2299 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RENAME_SAVED_SEARCH_COMMAND, RenameSavedSearchCommand); @@ -20726,11 +21148,13 @@ static void rename_saved_search_command_finalize (GObject * obj) { _g_free0 (self->priv->new_name); #line 2299 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (rename_saved_search_command_parent_class)->finalize (obj); -#line 20730 "Commands.c" +#line 21152 "Commands.c" } -GType rename_saved_search_command_get_type (void) { +GType +rename_saved_search_command_get_type (void) +{ static volatile gsize rename_saved_search_command_type_id__volatile = 0; if (g_once_init_enter (&rename_saved_search_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RenameSavedSearchCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) rename_saved_search_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RenameSavedSearchCommand), 0, (GInstanceInitFunc) rename_saved_search_command_instance_init, NULL }; @@ -20742,69 +21166,64 @@ GType rename_saved_search_command_get_type (void) { } -DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_type, SavedSearch* search) { +DeleteSavedSearchCommand* +delete_saved_search_command_construct (GType object_type, + SavedSearch* search) +{ DeleteSavedSearchCommand * self = NULL; - SavedSearch* _tmp0_; - SavedSearch* _tmp1_; + gchar* _tmp0_; + gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; SavedSearch* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - SavedSearch* _tmp9_; - SavedSearch* _tmp10_; #line 2326 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL); #line 2327 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = search; + _tmp0_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (search, TYPE_DATA_OBJECT, DataObject)); #line 2327 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = search; + _tmp1_ = _tmp0_; #line 2327 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); + _tmp2_ = resources_delete_search_label (_tmp1_); #line 2327 "/home/jens/Source/shotwell/src/Commands.vala" _tmp3_ = _tmp2_; #line 2327 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = resources_delete_search_label (_tmp3_); + _tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (search, TYPE_DATA_OBJECT, DataObject)); #line 2327 "/home/jens/Source/shotwell/src/Commands.vala" _tmp5_ = _tmp4_; #line 2327 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = search; -#line 2327 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_OBJECT, DataObject)); -#line 2327 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = _tmp7_; -#line 2327 "/home/jens/Source/shotwell/src/Commands.vala" - self = (DeleteSavedSearchCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource), _tmp5_, _tmp8_); -#line 2327 "/home/jens/Source/shotwell/src/Commands.vala" - _g_free0 (_tmp8_); + self = (DeleteSavedSearchCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (search, TYPE_DATA_SOURCE, DataSource), _tmp3_, _tmp5_); #line 2327 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (_tmp5_); #line 2327 "/home/jens/Source/shotwell/src/Commands.vala" _g_free0 (_tmp3_); +#line 2327 "/home/jens/Source/shotwell/src/Commands.vala" + _g_free0 (_tmp1_); #line 2329 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = search; -#line 2329 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = _g_object_ref0 (_tmp9_); + _tmp6_ = _g_object_ref0 (search); #line 2329 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->search); #line 2329 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->search = _tmp10_; + self->priv->search = _tmp6_; #line 2326 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 20797 "Commands.c" +#line 21212 "Commands.c" } -DeleteSavedSearchCommand* delete_saved_search_command_new (SavedSearch* search) { +DeleteSavedSearchCommand* +delete_saved_search_command_new (SavedSearch* search) +{ #line 2326 "/home/jens/Source/shotwell/src/Commands.vala" return delete_saved_search_command_construct (TYPE_DELETE_SAVED_SEARCH_COMMAND, search); -#line 20804 "Commands.c" +#line 21221 "Commands.c" } -static void delete_saved_search_command_real_execute (Command* base) { +static void +delete_saved_search_command_real_execute (Command* base) +{ DeleteSavedSearchCommand * self; SavedSearchTable* _tmp0_; SavedSearchTable* _tmp1_; @@ -20821,11 +21240,13 @@ static void delete_saved_search_command_real_execute (Command* base) { saved_search_table_remove (_tmp1_, _tmp2_); #line 2333 "/home/jens/Source/shotwell/src/Commands.vala" _saved_search_table_unref0 (_tmp1_); -#line 20825 "Commands.c" +#line 21244 "Commands.c" } -static void delete_saved_search_command_real_undo (Command* base) { +static void +delete_saved_search_command_real_undo (Command* base) +{ DeleteSavedSearchCommand * self; SavedSearch* _tmp0_; #line 2336 "/home/jens/Source/shotwell/src/Commands.vala" @@ -20834,11 +21255,13 @@ static void delete_saved_search_command_real_undo (Command* base) { _tmp0_ = self->priv->search; #line 2337 "/home/jens/Source/shotwell/src/Commands.vala" saved_search_reconstitute (_tmp0_); -#line 20838 "Commands.c" +#line 21259 "Commands.c" } -static void delete_saved_search_command_class_init (DeleteSavedSearchCommandClass * klass) { +static void +delete_saved_search_command_class_init (DeleteSavedSearchCommandClass * klass) +{ #line 2323 "/home/jens/Source/shotwell/src/Commands.vala" delete_saved_search_command_parent_class = g_type_class_peek_parent (klass); #line 2323 "/home/jens/Source/shotwell/src/Commands.vala" @@ -20849,18 +21272,22 @@ static void delete_saved_search_command_class_init (DeleteSavedSearchCommandClas ((CommandClass *) klass)->undo = (void (*) (Command *)) delete_saved_search_command_real_undo; #line 2323 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = delete_saved_search_command_finalize; -#line 20853 "Commands.c" +#line 21276 "Commands.c" } -static void delete_saved_search_command_instance_init (DeleteSavedSearchCommand * self) { +static void +delete_saved_search_command_instance_init (DeleteSavedSearchCommand * self) +{ #line 2323 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = DELETE_SAVED_SEARCH_COMMAND_GET_PRIVATE (self); -#line 20860 "Commands.c" +#line 21285 "Commands.c" } -static void delete_saved_search_command_finalize (GObject * obj) { +static void +delete_saved_search_command_finalize (GObject * obj) +{ DeleteSavedSearchCommand * self; #line 2323 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DELETE_SAVED_SEARCH_COMMAND, DeleteSavedSearchCommand); @@ -20868,11 +21295,13 @@ static void delete_saved_search_command_finalize (GObject * obj) { _g_object_unref0 (self->priv->search); #line 2323 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (delete_saved_search_command_parent_class)->finalize (obj); -#line 20872 "Commands.c" +#line 21299 "Commands.c" } -GType delete_saved_search_command_get_type (void) { +GType +delete_saved_search_command_get_type (void) +{ static volatile gsize delete_saved_search_command_type_id__volatile = 0; if (g_once_init_enter (&delete_saved_search_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DeleteSavedSearchCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) delete_saved_search_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DeleteSavedSearchCommand), 0, (GInstanceInitFunc) delete_saved_search_command_instance_init, NULL }; @@ -20884,102 +21313,102 @@ GType delete_saved_search_command_get_type (void) { } -static void _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +static void +_trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self) +{ #line 2358 "/home/jens/Source/shotwell/src/Commands.vala" trash_untrash_photos_command_on_photo_destroyed ((TrashUntrashPhotosCommand*) self, source); -#line 20891 "Commands.c" +#line 21324 "Commands.c" } -TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type, GeeCollection* sources, gboolean to_trash) { +TrashUntrashPhotosCommand* +trash_untrash_photos_command_construct (GType object_type, + GeeCollection* sources, + gboolean to_trash) +{ TrashUntrashPhotosCommand * self = NULL; const gchar* _tmp0_ = NULL; - gboolean _tmp1_; - const gchar* _tmp2_ = NULL; - gboolean _tmp3_; - GeeCollection* _tmp4_; - GeeCollection* _tmp5_; - gboolean _tmp6_; - LibraryPhotoSourceCollection* _tmp7_; - VideoSourceCollection* _tmp8_; + const gchar* _tmp1_ = NULL; + GeeCollection* _tmp2_; + LibraryPhotoSourceCollection* _tmp3_; + VideoSourceCollection* _tmp4_; #line 2345 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_COLLECTION (sources), NULL); #line 2347 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = to_trash; -#line 2347 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp1_) { + if (to_trash) { #line 2347 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = _ ("Move Photos to Trash"); -#line 20914 "Commands.c" +#line 21345 "Commands.c" } else { #line 2347 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = _ ("Restore Photos from Trash"); -#line 20918 "Commands.c" +#line 21349 "Commands.c" } #line 2348 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = to_trash; + if (to_trash) { #line 2348 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp3_) { -#line 2348 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _ ("Move the photos to the Shotwell trash"); -#line 20926 "Commands.c" + _tmp1_ = _ ("Move the photos to the Shotwell trash"); +#line 21355 "Commands.c" } else { #line 2348 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _ ("Restore the photos back to the Shotwell library"); -#line 20930 "Commands.c" + _tmp1_ = _ ("Restore the photos back to the Shotwell library"); +#line 21359 "Commands.c" } #line 2346 "/home/jens/Source/shotwell/src/Commands.vala" - self = (TrashUntrashPhotosCommand*) page_command_construct (object_type, _tmp0_, _tmp2_); -#line 2350 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = sources; + self = (TrashUntrashPhotosCommand*) page_command_construct (object_type, _tmp0_, _tmp1_); #line 2350 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp2_ = _g_object_ref0 (sources); #line 2350 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->sources); #line 2350 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->sources = _tmp5_; + self->priv->sources = _tmp2_; #line 2351 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = to_trash; -#line 2351 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->to_trash = _tmp6_; + self->priv->to_trash = to_trash; #line 2353 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = library_photo_global; + _tmp3_ = library_photo_global; #line 2353 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0); #line 2354 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = video_global; + _tmp4_ = video_global; #line 2354 "/home/jens/Source/shotwell/src/Commands.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0); #line 2345 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 20956 "Commands.c" +#line 21381 "Commands.c" } -TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, gboolean to_trash) { +TrashUntrashPhotosCommand* +trash_untrash_photos_command_new (GeeCollection* sources, + gboolean to_trash) +{ #line 2345 "/home/jens/Source/shotwell/src/Commands.vala" return trash_untrash_photos_command_construct (TYPE_TRASH_UNTRASH_PHOTOS_COMMAND, sources, to_trash); -#line 20963 "Commands.c" +#line 21391 "Commands.c" } -static ProgressDialog* trash_untrash_photos_command_get_progress_dialog (TrashUntrashPhotosCommand* self, gboolean to_trash) { +static ProgressDialog* +trash_untrash_photos_command_get_progress_dialog (TrashUntrashPhotosCommand* self, + gboolean to_trash) +{ ProgressDialog* result = NULL; GeeCollection* _tmp0_; gint _tmp1_; gint _tmp2_; const gchar* _tmp3_ = NULL; - gboolean _tmp4_; ProgressDialog* dialog = NULL; + AppWindow* _tmp4_; AppWindow* _tmp5_; - AppWindow* _tmp6_; + ProgressDialog* _tmp6_; ProgressDialog* _tmp7_; ProgressDialog* _tmp8_; - ProgressDialog* _tmp9_; - GeeCollection* _tmp10_; + GeeCollection* _tmp9_; + gint _tmp10_; gint _tmp11_; - gint _tmp12_; - gint _tmp13_; #line 2362 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (IS_TRASH_UNTRASH_PHOTOS_COMMAND (self), NULL); #line 2363 "/home/jens/Source/shotwell/src/Commands.vala" @@ -20994,64 +21423,67 @@ static ProgressDialog* trash_untrash_photos_command_get_progress_dialog (TrashUn result = NULL; #line 2364 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 20998 "Commands.c" +#line 21427 "Commands.c" } #line 2367 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = to_trash; -#line 2367 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp4_) { + if (to_trash) { #line 2367 "/home/jens/Source/shotwell/src/Commands.vala" _tmp3_ = _ ("Moving Photos to Trash"); -#line 21006 "Commands.c" +#line 21433 "Commands.c" } else { #line 2367 "/home/jens/Source/shotwell/src/Commands.vala" _tmp3_ = _ ("Restoring Photos From Trash"); -#line 21010 "Commands.c" +#line 21437 "Commands.c" } #line 2366 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = app_window_get_instance (); + _tmp4_ = app_window_get_instance (); #line 2366 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 2366 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp3_, NULL); + _tmp6_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow), _tmp3_, NULL); #line 2366 "/home/jens/Source/shotwell/src/Commands.vala" - g_object_ref_sink (_tmp7_); + g_object_ref_sink (_tmp6_); #line 2366 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 2366 "/home/jens/Source/shotwell/src/Commands.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp5_); #line 2366 "/home/jens/Source/shotwell/src/Commands.vala" - dialog = _tmp8_; -#line 2368 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = dialog; + dialog = _tmp7_; #line 2368 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = self->priv->sources; + _tmp8_ = dialog; #line 2368 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = gee_collection_get_size (_tmp10_); + _tmp9_ = self->priv->sources; #line 2368 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = _tmp11_; + _tmp10_ = gee_collection_get_size (_tmp9_); #line 2368 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = CLAMP (_tmp12_ / 5, 2, 10); + _tmp11_ = _tmp10_; #line 2368 "/home/jens/Source/shotwell/src/Commands.vala" - progress_dialog_update_display_every (_tmp9_, _tmp13_); + progress_dialog_update_display_every (_tmp8_, CLAMP (_tmp11_ / 5, 2, 10)); #line 2370 "/home/jens/Source/shotwell/src/Commands.vala" result = dialog; #line 2370 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 21042 "Commands.c" +#line 21467 "Commands.c" } -static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) { +static gboolean +_progress_dialog_monitor_progress_monitor (guint64 current, + guint64 total, + gboolean do_event_loop, + gpointer self) +{ gboolean result; result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop); #line 2378 "/home/jens/Source/shotwell/src/Commands.vala" return result; -#line 21051 "Commands.c" +#line 21481 "Commands.c" } -static void trash_untrash_photos_command_real_execute (Command* base) { +static void +trash_untrash_photos_command_real_execute (Command* base) +{ TrashUntrashPhotosCommand * self; ProgressDialog* dialog = NULL; gboolean _tmp0_; @@ -21080,7 +21512,7 @@ static void trash_untrash_photos_command_real_execute (Command* base) { _tmp2_ = dialog; #line 2377 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp2_ != NULL) { -#line 21084 "Commands.c" +#line 21516 "Commands.c" ProgressDialog* _tmp3_; #line 2378 "/home/jens/Source/shotwell/src/Commands.vala" _tmp3_ = dialog; @@ -21098,13 +21530,13 @@ static void trash_untrash_photos_command_real_execute (Command* base) { monitor_target = g_object_ref (_tmp3_); #line 2378 "/home/jens/Source/shotwell/src/Commands.vala" monitor_target_destroy_notify = g_object_unref; -#line 21102 "Commands.c" +#line 21534 "Commands.c" } #line 2380 "/home/jens/Source/shotwell/src/Commands.vala" _tmp4_ = self->priv->to_trash; #line 2380 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp4_) { -#line 21108 "Commands.c" +#line 21540 "Commands.c" ProgressMonitor _tmp5_; void* _tmp5__target; #line 2381 "/home/jens/Source/shotwell/src/Commands.vala" @@ -21113,7 +21545,7 @@ static void trash_untrash_photos_command_real_execute (Command* base) { _tmp5__target = monitor_target; #line 2381 "/home/jens/Source/shotwell/src/Commands.vala" trash_untrash_photos_command_trash (self, _tmp5_, _tmp5__target); -#line 21117 "Commands.c" +#line 21549 "Commands.c" } else { ProgressMonitor _tmp6_; void* _tmp6__target; @@ -21123,19 +21555,19 @@ static void trash_untrash_photos_command_real_execute (Command* base) { _tmp6__target = monitor_target; #line 2383 "/home/jens/Source/shotwell/src/Commands.vala" trash_untrash_photos_command_untrash (self, _tmp6_, _tmp6__target); -#line 21127 "Commands.c" +#line 21559 "Commands.c" } #line 2385 "/home/jens/Source/shotwell/src/Commands.vala" _tmp7_ = dialog; #line 2385 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp7_ != NULL) { -#line 21133 "Commands.c" +#line 21565 "Commands.c" ProgressDialog* _tmp8_; #line 2386 "/home/jens/Source/shotwell/src/Commands.vala" _tmp8_ = dialog; #line 2386 "/home/jens/Source/shotwell/src/Commands.vala" progress_dialog_close (_tmp8_); -#line 21139 "Commands.c" +#line 21571 "Commands.c" } #line 2373 "/home/jens/Source/shotwell/src/Commands.vala" (monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL); @@ -21147,11 +21579,13 @@ static void trash_untrash_photos_command_real_execute (Command* base) { monitor_target_destroy_notify = NULL; #line 2373 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (dialog); -#line 21151 "Commands.c" +#line 21583 "Commands.c" } -static void trash_untrash_photos_command_real_undo (Command* base) { +static void +trash_untrash_photos_command_real_undo (Command* base) +{ TrashUntrashPhotosCommand * self; ProgressDialog* dialog = NULL; gboolean _tmp0_; @@ -21180,7 +21614,7 @@ static void trash_untrash_photos_command_real_undo (Command* base) { _tmp2_ = dialog; #line 2393 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp2_ != NULL) { -#line 21184 "Commands.c" +#line 21618 "Commands.c" ProgressDialog* _tmp3_; #line 2394 "/home/jens/Source/shotwell/src/Commands.vala" _tmp3_ = dialog; @@ -21198,13 +21632,13 @@ static void trash_untrash_photos_command_real_undo (Command* base) { monitor_target = g_object_ref (_tmp3_); #line 2394 "/home/jens/Source/shotwell/src/Commands.vala" monitor_target_destroy_notify = g_object_unref; -#line 21202 "Commands.c" +#line 21636 "Commands.c" } #line 2396 "/home/jens/Source/shotwell/src/Commands.vala" _tmp4_ = self->priv->to_trash; #line 2396 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp4_) { -#line 21208 "Commands.c" +#line 21642 "Commands.c" ProgressMonitor _tmp5_; void* _tmp5__target; #line 2397 "/home/jens/Source/shotwell/src/Commands.vala" @@ -21213,7 +21647,7 @@ static void trash_untrash_photos_command_real_undo (Command* base) { _tmp5__target = monitor_target; #line 2397 "/home/jens/Source/shotwell/src/Commands.vala" trash_untrash_photos_command_untrash (self, _tmp5_, _tmp5__target); -#line 21217 "Commands.c" +#line 21651 "Commands.c" } else { ProgressMonitor _tmp6_; void* _tmp6__target; @@ -21223,19 +21657,19 @@ static void trash_untrash_photos_command_real_undo (Command* base) { _tmp6__target = monitor_target; #line 2399 "/home/jens/Source/shotwell/src/Commands.vala" trash_untrash_photos_command_trash (self, _tmp6_, _tmp6__target); -#line 21227 "Commands.c" +#line 21661 "Commands.c" } #line 2401 "/home/jens/Source/shotwell/src/Commands.vala" _tmp7_ = dialog; #line 2401 "/home/jens/Source/shotwell/src/Commands.vala" if (_tmp7_ != NULL) { -#line 21233 "Commands.c" +#line 21667 "Commands.c" ProgressDialog* _tmp8_; #line 2402 "/home/jens/Source/shotwell/src/Commands.vala" _tmp8_ = dialog; #line 2402 "/home/jens/Source/shotwell/src/Commands.vala" progress_dialog_close (_tmp8_); -#line 21239 "Commands.c" +#line 21673 "Commands.c" } #line 2389 "/home/jens/Source/shotwell/src/Commands.vala" (monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL); @@ -21247,11 +21681,15 @@ static void trash_untrash_photos_command_real_undo (Command* base) { monitor_target_destroy_notify = NULL; #line 2389 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (dialog); -#line 21251 "Commands.c" +#line 21685 "Commands.c" } -static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self, ProgressMonitor monitor, void* monitor_target) { +static void +trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self, + ProgressMonitor monitor, + void* monitor_target) +{ gint ctr = 0; gint count = 0; GeeCollection* _tmp0_; @@ -21263,12 +21701,12 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self, VideoSourceCollection* _tmp6_; TransactionController* _tmp7_; TransactionController* _tmp8_; - LibraryPhotoSourceCollection* _tmp21_; + LibraryPhotoSourceCollection* _tmp18_; + TransactionController* _tmp19_; + TransactionController* _tmp20_; + VideoSourceCollection* _tmp21_; TransactionController* _tmp22_; TransactionController* _tmp23_; - VideoSourceCollection* _tmp24_; - TransactionController* _tmp25_; - TransactionController* _tmp26_; #line 2405 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_TRASH_UNTRASH_PHOTOS_COMMAND (self)); #line 2406 "/home/jens/Source/shotwell/src/Commands.vala" @@ -21297,7 +21735,7 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self, _tmp8_ = _tmp7_; #line 2410 "/home/jens/Source/shotwell/src/Commands.vala" transaction_controller_begin (_tmp8_); -#line 21301 "Commands.c" +#line 21739 "Commands.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp9_; @@ -21310,92 +21748,81 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self, _source_it = _tmp10_; #line 2412 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 21314 "Commands.c" +#line 21752 "Commands.c" GeeIterator* _tmp11_; - gboolean _tmp12_; MediaSource* source = NULL; - GeeIterator* _tmp13_; - gpointer _tmp14_; - MediaSource* _tmp15_; - ProgressMonitor _tmp16_; - void* _tmp16__target; + GeeIterator* _tmp12_; + gpointer _tmp13_; + MediaSource* _tmp14_; #line 2412 "/home/jens/Source/shotwell/src/Commands.vala" _tmp11_ = _source_it; #line 2412 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = gee_iterator_next (_tmp11_); -#line 2412 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp12_) { + if (!gee_iterator_next (_tmp11_)) { #line 2412 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 21331 "Commands.c" +#line 21764 "Commands.c" } #line 2412 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = _source_it; + _tmp12_ = _source_it; #line 2412 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = gee_iterator_get (_tmp13_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 2412 "/home/jens/Source/shotwell/src/Commands.vala" - source = (MediaSource*) _tmp14_; + source = (MediaSource*) _tmp13_; #line 2413 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = source; + _tmp14_ = source; #line 2413 "/home/jens/Source/shotwell/src/Commands.vala" - media_source_trash (_tmp15_); -#line 2414 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = monitor; -#line 2414 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16__target = monitor_target; + media_source_trash (_tmp14_); #line 2414 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp16_ != NULL) { -#line 21349 "Commands.c" - ProgressMonitor _tmp17_; - void* _tmp17__target; - gint _tmp18_; - gint _tmp19_; - gint _tmp20_; -#line 2415 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = monitor; -#line 2415 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17__target = monitor_target; + if (monitor != NULL) { +#line 21778 "Commands.c" + gint _tmp15_; + gint _tmp16_; + gint _tmp17_; #line 2415 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = ctr; + _tmp15_ = ctr; #line 2415 "/home/jens/Source/shotwell/src/Commands.vala" - ctr = _tmp18_ + 1; + ctr = _tmp15_ + 1; #line 2415 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = ctr; + _tmp16_ = ctr; #line 2415 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = count; + _tmp17_ = count; #line 2415 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ ((guint64) _tmp19_, (guint64) _tmp20_, TRUE, _tmp17__target); -#line 21369 "Commands.c" + monitor ((guint64) _tmp16_, (guint64) _tmp17_, TRUE, monitor_target); +#line 21792 "Commands.c" } #line 2412 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); -#line 21373 "Commands.c" +#line 21796 "Commands.c" } #line 2412 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_it); -#line 21377 "Commands.c" +#line 21800 "Commands.c" } #line 2418 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = library_photo_global; + _tmp18_ = library_photo_global; #line 2418 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _tmp19_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 2418 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = _tmp22_; + _tmp20_ = _tmp19_; #line 2418 "/home/jens/Source/shotwell/src/Commands.vala" - transaction_controller_commit (_tmp23_); + transaction_controller_commit (_tmp20_); #line 2419 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = video_global; + _tmp21_ = video_global; #line 2419 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _tmp22_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 2419 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = _tmp25_; + _tmp23_ = _tmp22_; #line 2419 "/home/jens/Source/shotwell/src/Commands.vala" - transaction_controller_commit (_tmp26_); -#line 21395 "Commands.c" + transaction_controller_commit (_tmp23_); +#line 21818 "Commands.c" } -static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* self, ProgressMonitor monitor, void* monitor_target) { +static void +trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* self, + ProgressMonitor monitor, + void* monitor_target) +{ gint ctr = 0; gint count = 0; GeeCollection* _tmp0_; @@ -21407,12 +21834,12 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel VideoSourceCollection* _tmp6_; TransactionController* _tmp7_; TransactionController* _tmp8_; - LibraryPhotoSourceCollection* _tmp21_; + LibraryPhotoSourceCollection* _tmp18_; + TransactionController* _tmp19_; + TransactionController* _tmp20_; + VideoSourceCollection* _tmp21_; TransactionController* _tmp22_; TransactionController* _tmp23_; - VideoSourceCollection* _tmp24_; - TransactionController* _tmp25_; - TransactionController* _tmp26_; #line 2422 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_TRASH_UNTRASH_PHOTOS_COMMAND (self)); #line 2423 "/home/jens/Source/shotwell/src/Commands.vala" @@ -21441,7 +21868,7 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel _tmp8_ = _tmp7_; #line 2427 "/home/jens/Source/shotwell/src/Commands.vala" transaction_controller_begin (_tmp8_); -#line 21445 "Commands.c" +#line 21872 "Commands.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp9_; @@ -21454,97 +21881,84 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel _source_it = _tmp10_; #line 2429 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 21458 "Commands.c" +#line 21885 "Commands.c" GeeIterator* _tmp11_; - gboolean _tmp12_; MediaSource* source = NULL; - GeeIterator* _tmp13_; - gpointer _tmp14_; - MediaSource* _tmp15_; - ProgressMonitor _tmp16_; - void* _tmp16__target; + GeeIterator* _tmp12_; + gpointer _tmp13_; + MediaSource* _tmp14_; #line 2429 "/home/jens/Source/shotwell/src/Commands.vala" _tmp11_ = _source_it; #line 2429 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = gee_iterator_next (_tmp11_); -#line 2429 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp12_) { + if (!gee_iterator_next (_tmp11_)) { #line 2429 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 21475 "Commands.c" +#line 21897 "Commands.c" } #line 2429 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = _source_it; + _tmp12_ = _source_it; #line 2429 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = gee_iterator_get (_tmp13_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 2429 "/home/jens/Source/shotwell/src/Commands.vala" - source = (MediaSource*) _tmp14_; + source = (MediaSource*) _tmp13_; #line 2430 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = source; + _tmp14_ = source; #line 2430 "/home/jens/Source/shotwell/src/Commands.vala" - media_source_untrash (_tmp15_); -#line 2431 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = monitor; -#line 2431 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16__target = monitor_target; + media_source_untrash (_tmp14_); #line 2431 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp16_ != NULL) { -#line 21493 "Commands.c" - ProgressMonitor _tmp17_; - void* _tmp17__target; - gint _tmp18_; - gint _tmp19_; - gint _tmp20_; -#line 2432 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = monitor; -#line 2432 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17__target = monitor_target; + if (monitor != NULL) { +#line 21911 "Commands.c" + gint _tmp15_; + gint _tmp16_; + gint _tmp17_; #line 2432 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp18_ = ctr; + _tmp15_ = ctr; #line 2432 "/home/jens/Source/shotwell/src/Commands.vala" - ctr = _tmp18_ + 1; + ctr = _tmp15_ + 1; #line 2432 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp19_ = ctr; + _tmp16_ = ctr; #line 2432 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = count; + _tmp17_ = count; #line 2432 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ ((guint64) _tmp19_, (guint64) _tmp20_, TRUE, _tmp17__target); -#line 21513 "Commands.c" + monitor ((guint64) _tmp16_, (guint64) _tmp17_, TRUE, monitor_target); +#line 21925 "Commands.c" } #line 2429 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); -#line 21517 "Commands.c" +#line 21929 "Commands.c" } #line 2429 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_it); -#line 21521 "Commands.c" +#line 21933 "Commands.c" } #line 2435 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp21_ = library_photo_global; + _tmp18_ = library_photo_global; #line 2435 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp22_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _tmp19_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 2435 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = _tmp22_; + _tmp20_ = _tmp19_; #line 2435 "/home/jens/Source/shotwell/src/Commands.vala" - transaction_controller_commit (_tmp23_); + transaction_controller_commit (_tmp20_); #line 2436 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = video_global; + _tmp21_ = video_global; #line 2436 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _tmp22_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 2436 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp26_ = _tmp25_; + _tmp23_ = _tmp22_; #line 2436 "/home/jens/Source/shotwell/src/Commands.vala" - transaction_controller_commit (_tmp26_); -#line 21539 "Commands.c" + transaction_controller_commit (_tmp23_); +#line 21951 "Commands.c" } -static void trash_untrash_photos_command_on_photo_destroyed (TrashUntrashPhotosCommand* self, DataSource* source) { +static void +trash_untrash_photos_command_on_photo_destroyed (TrashUntrashPhotosCommand* self, + DataSource* source) +{ GeeCollection* _tmp0_; - DataSource* _tmp1_; - GeeCollection* _tmp2_; + GeeCollection* _tmp1_; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; #line 2439 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_TRASH_UNTRASH_PHOTOS_COMMAND (self)); #line 2439 "/home/jens/Source/shotwell/src/Commands.vala" @@ -21552,34 +21966,34 @@ static void trash_untrash_photos_command_on_photo_destroyed (TrashUntrashPhotosC #line 2442 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = self->priv->sources; #line 2442 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = source; -#line 2442 "/home/jens/Source/shotwell/src/Commands.vala" - gee_collection_remove (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource)); + gee_collection_remove (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource)); #line 2446 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = self->priv->sources; + _tmp1_ = self->priv->sources; #line 2446 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_collection_get_size (_tmp2_); + _tmp2_ = gee_collection_get_size (_tmp1_); #line 2446 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 2446 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp4_ == 0) { -#line 21567 "Commands.c" + if (_tmp3_ == 0) { +#line 21979 "Commands.c" + CommandManager* _tmp4_; CommandManager* _tmp5_; - CommandManager* _tmp6_; #line 2447 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command)); + _tmp4_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command)); #line 2447 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 2447 "/home/jens/Source/shotwell/src/Commands.vala" - command_manager_reset (_tmp6_); + command_manager_reset (_tmp5_); #line 2447 "/home/jens/Source/shotwell/src/Commands.vala" - _command_manager_unref0 (_tmp6_); -#line 21578 "Commands.c" + _command_manager_unref0 (_tmp5_); +#line 21990 "Commands.c" } } -static void trash_untrash_photos_command_class_init (TrashUntrashPhotosCommandClass * klass) { +static void +trash_untrash_photos_command_class_init (TrashUntrashPhotosCommandClass * klass) +{ #line 2341 "/home/jens/Source/shotwell/src/Commands.vala" trash_untrash_photos_command_parent_class = g_type_class_peek_parent (klass); #line 2341 "/home/jens/Source/shotwell/src/Commands.vala" @@ -21590,18 +22004,22 @@ static void trash_untrash_photos_command_class_init (TrashUntrashPhotosCommandCl ((CommandClass *) klass)->undo = (void (*) (Command *)) trash_untrash_photos_command_real_undo; #line 2341 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = trash_untrash_photos_command_finalize; -#line 21594 "Commands.c" +#line 22008 "Commands.c" } -static void trash_untrash_photos_command_instance_init (TrashUntrashPhotosCommand * self) { +static void +trash_untrash_photos_command_instance_init (TrashUntrashPhotosCommand * self) +{ #line 2341 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = TRASH_UNTRASH_PHOTOS_COMMAND_GET_PRIVATE (self); -#line 21601 "Commands.c" +#line 22017 "Commands.c" } -static void trash_untrash_photos_command_finalize (GObject * obj) { +static void +trash_untrash_photos_command_finalize (GObject * obj) +{ TrashUntrashPhotosCommand * self; LibraryPhotoSourceCollection* _tmp0_; guint _tmp1_; @@ -21625,11 +22043,13 @@ static void trash_untrash_photos_command_finalize (GObject * obj) { _g_object_unref0 (self->priv->sources); #line 2341 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (trash_untrash_photos_command_parent_class)->finalize (obj); -#line 21629 "Commands.c" +#line 22047 "Commands.c" } -GType trash_untrash_photos_command_get_type (void) { +GType +trash_untrash_photos_command_get_type (void) +{ static volatile gsize trash_untrash_photos_command_type_id__volatile = 0; if (g_once_init_enter (&trash_untrash_photos_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TrashUntrashPhotosCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) trash_untrash_photos_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TrashUntrashPhotosCommand), 0, (GInstanceInitFunc) trash_untrash_photos_command_instance_init, NULL }; @@ -21641,324 +22061,303 @@ GType trash_untrash_photos_command_get_type (void) { } -FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollection* sources, gboolean flag) { +FlagUnflagCommand* +flag_unflag_command_construct (GType object_type, + GeeCollection* sources, + gboolean flag) +{ FlagUnflagCommand * self = NULL; const gchar* _tmp0_ = NULL; - gboolean _tmp1_; - const gchar* _tmp2_ = NULL; - gboolean _tmp3_; - GeeCollection* _tmp4_; - gboolean _tmp5_; - GeeCollection* _tmp6_; - gint _tmp7_; - gint _tmp8_; + const gchar* _tmp1_ = NULL; + gint _tmp2_; + gint _tmp3_; #line 2461 "/home/jens/Source/shotwell/src/Commands.vala" g_return_val_if_fail (GEE_IS_COLLECTION (sources), NULL); #line 2463 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = flag; -#line 2463 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp1_) { + if (flag) { #line 2463 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = _ ("Flag"); -#line 21664 "Commands.c" +#line 22081 "Commands.c" } else { #line 2463 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = _ ("Unflag"); -#line 21668 "Commands.c" +#line 22085 "Commands.c" } #line 2464 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = flag; -#line 2464 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp3_) { + if (flag) { #line 2464 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = FLAG_UNFLAG_COMMAND_FLAG_SELECTED_STRING; -#line 21676 "Commands.c" + _tmp1_ = FLAG_UNFLAG_COMMAND_FLAG_SELECTED_STRING; +#line 22091 "Commands.c" } else { #line 2464 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = FLAG_UNFLAG_COMMAND_UNFLAG_SELECTED_STRING; -#line 21680 "Commands.c" + _tmp1_ = FLAG_UNFLAG_COMMAND_UNFLAG_SELECTED_STRING; +#line 22095 "Commands.c" } #line 2462 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = sources; -#line 2462 "/home/jens/Source/shotwell/src/Commands.vala" - self = (FlagUnflagCommand*) multiple_data_source_at_once_command_construct (object_type, _tmp4_, _tmp0_, _tmp2_); -#line 2466 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = flag; + self = (FlagUnflagCommand*) multiple_data_source_at_once_command_construct (object_type, sources, _tmp0_, _tmp1_); #line 2466 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->flag = _tmp5_; + self->priv->flag = flag; #line 2468 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = sources; + _tmp2_ = gee_collection_get_size (sources); #line 2468 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = gee_collection_get_size (_tmp6_); -#line 2468 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = _tmp7_; + _tmp3_ = _tmp2_; #line 2468 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp8_ >= FLAG_UNFLAG_COMMAND_MIN_PROGRESS_BAR_THRESHOLD) { -#line 21698 "Commands.c" - const gchar* _tmp9_ = NULL; - gboolean _tmp10_; - ProgressDialog* _tmp11_; - ProgressDialog* _tmp12_; -#line 2470 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = flag; + if (_tmp3_ >= FLAG_UNFLAG_COMMAND_MIN_PROGRESS_BAR_THRESHOLD) { +#line 22107 "Commands.c" + const gchar* _tmp4_ = NULL; + ProgressDialog* _tmp5_; + ProgressDialog* _tmp6_; #line 2470 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp10_) { + if (flag) { #line 2470 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = FLAG_UNFLAG_COMMAND_FLAG_PROGRESS; -#line 21709 "Commands.c" + _tmp4_ = FLAG_UNFLAG_COMMAND_FLAG_PROGRESS; +#line 22115 "Commands.c" } else { #line 2470 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = FLAG_UNFLAG_COMMAND_UNFLAG_PROGRESS; -#line 21713 "Commands.c" + _tmp4_ = FLAG_UNFLAG_COMMAND_UNFLAG_PROGRESS; +#line 22119 "Commands.c" } #line 2469 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = progress_dialog_new (NULL, _tmp9_, NULL); + _tmp5_ = progress_dialog_new (NULL, _tmp4_, NULL); #line 2469 "/home/jens/Source/shotwell/src/Commands.vala" - g_object_ref_sink (_tmp11_); + g_object_ref_sink (_tmp5_); #line 2469 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->progress_dialog); #line 2469 "/home/jens/Source/shotwell/src/Commands.vala" - self->priv->progress_dialog = _tmp11_; + self->priv->progress_dialog = _tmp5_; #line 2472 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = self->priv->progress_dialog; + _tmp6_ = self->priv->progress_dialog; #line 2472 "/home/jens/Source/shotwell/src/Commands.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget)); -#line 21727 "Commands.c" + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); +#line 22133 "Commands.c" } #line 2461 "/home/jens/Source/shotwell/src/Commands.vala" return self; -#line 21731 "Commands.c" +#line 22137 "Commands.c" } -FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources, gboolean flag) { +FlagUnflagCommand* +flag_unflag_command_new (GeeCollection* sources, + gboolean flag) +{ #line 2461 "/home/jens/Source/shotwell/src/Commands.vala" return flag_unflag_command_construct (TYPE_FLAG_UNFLAG_COMMAND, sources, flag); -#line 21738 "Commands.c" +#line 22147 "Commands.c" } -static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources) { +static void +flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* base, + GeeCollection* sources) +{ FlagUnflagCommand * self; gint num_processed = 0; - ProgressDialog* _tmp16_; + ProgressDialog* _tmp13_; #line 2476 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLAG_UNFLAG_COMMAND, FlagUnflagCommand); #line 2476 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); #line 2477 "/home/jens/Source/shotwell/src/Commands.vala" num_processed = 0; -#line 21752 "Commands.c" +#line 22164 "Commands.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 2479 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = sources; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 2479 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 2479 "/home/jens/Source/shotwell/src/Commands.vala" - _source_it = _tmp1_; + _source_it = _tmp0_; #line 2479 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 21765 "Commands.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 22174 "Commands.c" + GeeIterator* _tmp1_; DataSource* source = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - DataSource* _tmp6_; - gboolean _tmp7_; - gint _tmp8_; - ProgressDialog* _tmp9_; -#line 2479 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _source_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + DataSource* _tmp4_; + gboolean _tmp5_; + gint _tmp6_; + ProgressDialog* _tmp7_; #line 2479 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _source_it; #line 2479 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 2479 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 21783 "Commands.c" +#line 22189 "Commands.c" } #line 2479 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _source_it; + _tmp2_ = _source_it; #line 2479 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 2479 "/home/jens/Source/shotwell/src/Commands.vala" - source = (DataSource*) _tmp5_; + source = (DataSource*) _tmp3_; #line 2480 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = source; + _tmp4_ = source; #line 2480 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = self->priv->flag; + _tmp5_ = self->priv->flag; #line 2480 "/home/jens/Source/shotwell/src/Commands.vala" - flag_unflag_command_flag_unflag (self, _tmp6_, _tmp7_); + flag_unflag_command_flag_unflag (self, _tmp4_, _tmp5_); #line 2482 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp8_ = num_processed; + _tmp6_ = num_processed; #line 2482 "/home/jens/Source/shotwell/src/Commands.vala" - num_processed = _tmp8_ + 1; + num_processed = _tmp6_ + 1; #line 2484 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp9_ = self->priv->progress_dialog; + _tmp7_ = self->priv->progress_dialog; #line 2484 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp9_ != NULL) { -#line 21805 "Commands.c" - ProgressDialog* _tmp10_; + if (_tmp7_ != NULL) { +#line 22211 "Commands.c" + ProgressDialog* _tmp8_; + gint _tmp9_; + gint _tmp10_; gint _tmp11_; - GeeCollection* _tmp12_; - gint _tmp13_; - gint _tmp14_; - ProgressDialog* _tmp15_; -#line 2485 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp10_ = self->priv->progress_dialog; + ProgressDialog* _tmp12_; #line 2485 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp11_ = num_processed; + _tmp8_ = self->priv->progress_dialog; #line 2485 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp12_ = sources; + _tmp9_ = num_processed; #line 2485 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp13_ = gee_collection_get_size (_tmp12_); + _tmp10_ = gee_collection_get_size (sources); #line 2485 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = _tmp13_; + _tmp11_ = _tmp10_; #line 2485 "/home/jens/Source/shotwell/src/Commands.vala" - progress_dialog_set_fraction (_tmp10_, _tmp11_, _tmp14_); + progress_dialog_set_fraction (_tmp8_, _tmp9_, _tmp11_); #line 2486 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp15_ = self->priv->progress_dialog; + _tmp12_ = self->priv->progress_dialog; #line 2486 "/home/jens/Source/shotwell/src/Commands.vala" - gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget)); #line 2487 "/home/jens/Source/shotwell/src/Commands.vala" spin_event_loop (); -#line 21830 "Commands.c" +#line 22233 "Commands.c" } #line 2479 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); -#line 21834 "Commands.c" +#line 22237 "Commands.c" } #line 2479 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_it); -#line 21838 "Commands.c" +#line 22241 "Commands.c" } #line 2491 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp16_ = self->priv->progress_dialog; + _tmp13_ = self->priv->progress_dialog; #line 2491 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp16_ != NULL) { -#line 21844 "Commands.c" - ProgressDialog* _tmp17_; + if (_tmp13_ != NULL) { +#line 22247 "Commands.c" + ProgressDialog* _tmp14_; #line 2492 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp17_ = self->priv->progress_dialog; + _tmp14_ = self->priv->progress_dialog; #line 2492 "/home/jens/Source/shotwell/src/Commands.vala" - gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget)); -#line 21850 "Commands.c" + gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget)); +#line 22253 "Commands.c" } } -static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources) { +static void +flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* base, + GeeCollection* sources) +{ FlagUnflagCommand * self; #line 2495 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLAG_UNFLAG_COMMAND, FlagUnflagCommand); #line 2495 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); -#line 21861 "Commands.c" +#line 22267 "Commands.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; -#line 2496 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = sources; + GeeIterator* _tmp0_; #line 2496 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 2496 "/home/jens/Source/shotwell/src/Commands.vala" - _source_it = _tmp1_; + _source_it = _tmp0_; #line 2496 "/home/jens/Source/shotwell/src/Commands.vala" while (TRUE) { -#line 21874 "Commands.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 22277 "Commands.c" + GeeIterator* _tmp1_; DataSource* source = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - DataSource* _tmp6_; - gboolean _tmp7_; -#line 2496 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = _source_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + DataSource* _tmp4_; + gboolean _tmp5_; #line 2496 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _source_it; #line 2496 "/home/jens/Source/shotwell/src/Commands.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 2496 "/home/jens/Source/shotwell/src/Commands.vala" break; -#line 21890 "Commands.c" +#line 22290 "Commands.c" } #line 2496 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = _source_it; + _tmp2_ = _source_it; #line 2496 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 2496 "/home/jens/Source/shotwell/src/Commands.vala" - source = (DataSource*) _tmp5_; + source = (DataSource*) _tmp3_; #line 2497 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = source; + _tmp4_ = source; #line 2497 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = self->priv->flag; + _tmp5_ = self->priv->flag; #line 2497 "/home/jens/Source/shotwell/src/Commands.vala" - flag_unflag_command_flag_unflag (self, _tmp6_, !_tmp7_); + flag_unflag_command_flag_unflag (self, _tmp4_, !_tmp5_); #line 2496 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (source); -#line 21906 "Commands.c" +#line 22306 "Commands.c" } #line 2496 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (_source_it); -#line 21910 "Commands.c" +#line 22310 "Commands.c" } } -static void flag_unflag_command_flag_unflag (FlagUnflagCommand* self, DataSource* source, gboolean flag) { +static void +flag_unflag_command_flag_unflag (FlagUnflagCommand* self, + DataSource* source, + gboolean flag) +{ Flaggable* flaggable = NULL; - DataSource* _tmp0_; + Flaggable* _tmp0_; Flaggable* _tmp1_; - Flaggable* _tmp2_; #line 2500 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_FLAG_UNFLAG_COMMAND (self)); #line 2500 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 2501 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = source; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_FLAGGABLE) ? ((Flaggable*) source) : NULL); #line 2501 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp0_) : NULL); -#line 2501 "/home/jens/Source/shotwell/src/Commands.vala" - flaggable = _tmp1_; + flaggable = _tmp0_; #line 2502 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = flaggable; + _tmp1_ = flaggable; #line 2502 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp2_ != NULL) { -#line 21934 "Commands.c" - gboolean _tmp3_; -#line 2503 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = flag; + if (_tmp1_ != NULL) { #line 2503 "/home/jens/Source/shotwell/src/Commands.vala" - if (_tmp3_) { -#line 21940 "Commands.c" - Flaggable* _tmp4_; + if (flag) { +#line 22337 "Commands.c" + Flaggable* _tmp2_; #line 2504 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp4_ = flaggable; + _tmp2_ = flaggable; #line 2504 "/home/jens/Source/shotwell/src/Commands.vala" - flaggable_mark_flagged (_tmp4_); -#line 21946 "Commands.c" + flaggable_mark_flagged (_tmp2_); +#line 22343 "Commands.c" } else { - Flaggable* _tmp5_; + Flaggable* _tmp3_; #line 2506 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp5_ = flaggable; + _tmp3_ = flaggable; #line 2506 "/home/jens/Source/shotwell/src/Commands.vala" - flaggable_mark_unflagged (_tmp5_); -#line 21953 "Commands.c" + flaggable_mark_unflagged (_tmp3_); +#line 22350 "Commands.c" } } #line 2500 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (flaggable); -#line 21958 "Commands.c" +#line 22355 "Commands.c" } -static void flag_unflag_command_class_init (FlagUnflagCommandClass * klass) { +static void +flag_unflag_command_class_init (FlagUnflagCommandClass * klass) +{ #line 2451 "/home/jens/Source/shotwell/src/Commands.vala" flag_unflag_command_parent_class = g_type_class_peek_parent (klass); #line 2451 "/home/jens/Source/shotwell/src/Commands.vala" @@ -21969,20 +22368,24 @@ static void flag_unflag_command_class_init (FlagUnflagCommandClass * klass) { ((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) flag_unflag_command_real_undo_on_all; #line 2451 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = flag_unflag_command_finalize; -#line 21973 "Commands.c" +#line 22372 "Commands.c" } -static void flag_unflag_command_instance_init (FlagUnflagCommand * self) { +static void +flag_unflag_command_instance_init (FlagUnflagCommand * self) +{ #line 2451 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = FLAG_UNFLAG_COMMAND_GET_PRIVATE (self); #line 2459 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->progress_dialog = NULL; -#line 21982 "Commands.c" +#line 22383 "Commands.c" } -static void flag_unflag_command_finalize (GObject * obj) { +static void +flag_unflag_command_finalize (GObject * obj) +{ FlagUnflagCommand * self; #line 2451 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FLAG_UNFLAG_COMMAND, FlagUnflagCommand); @@ -21990,11 +22393,13 @@ static void flag_unflag_command_finalize (GObject * obj) { _g_object_unref0 (self->priv->progress_dialog); #line 2451 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (flag_unflag_command_parent_class)->finalize (obj); -#line 21994 "Commands.c" +#line 22397 "Commands.c" } -GType flag_unflag_command_get_type (void) { +GType +flag_unflag_command_get_type (void) +{ static volatile gsize flag_unflag_command_type_id__volatile = 0; if (g_once_init_enter (&flag_unflag_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (FlagUnflagCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) flag_unflag_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FlagUnflagCommand), 0, (GInstanceInitFunc) flag_unflag_command_instance_init, NULL }; diff --git a/src/Debug.c b/src/Debug.c index cfbf83c..a44d811 100644 --- a/src/Debug.c +++ b/src/Debug.c @@ -1,4 +1,4 @@ -/* Debug.c generated by valac 0.36.6, the Vala compiler +/* Debug.c generated by valac 0.40.4, the Vala compiler * generated from Debug.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -39,189 +40,236 @@ FILE* debug_log_file_stream = NULL; #define DEBUG_LIBRARY_PREFIX "L" void debug_init (const gchar* app_version_prefix); GFile* app_dirs_get_log_file (void); -void debug_info_handler (const gchar* domain, GLogLevelFlags flags, const gchar* message); -static void _debug_info_handler_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self); -void debug_debug_handler (const gchar* domain, GLogLevelFlags flags, const gchar* message); -static void _debug_debug_handler_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self); -void debug_message_handler (const gchar* domain, GLogLevelFlags flags, const gchar* message); -static void _debug_message_handler_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self); -void debug_warning_handler (const gchar* domain, GLogLevelFlags flags, const gchar* message); -static void _debug_warning_handler_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self); -void debug_critical_handler (const gchar* domain, GLogLevelFlags flags, const gchar* message); -static void _debug_critical_handler_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self); +void debug_info_handler (const gchar* domain, + GLogLevelFlags flags, + const gchar* message); +static void _debug_info_handler_glog_func (const gchar* log_domain, + GLogLevelFlags log_levels, + const gchar* message, + gpointer self); +void debug_debug_handler (const gchar* domain, + GLogLevelFlags flags, + const gchar* message); +static void _debug_debug_handler_glog_func (const gchar* log_domain, + GLogLevelFlags log_levels, + const gchar* message, + gpointer self); +void debug_message_handler (const gchar* domain, + GLogLevelFlags flags, + const gchar* message); +static void _debug_message_handler_glog_func (const gchar* log_domain, + GLogLevelFlags log_levels, + const gchar* message, + gpointer self); +void debug_warning_handler (const gchar* domain, + GLogLevelFlags flags, + const gchar* message); +static void _debug_warning_handler_glog_func (const gchar* log_domain, + GLogLevelFlags log_levels, + const gchar* message, + gpointer self); +void debug_critical_handler (const gchar* domain, + GLogLevelFlags flags, + const gchar* message); +static void _debug_critical_handler_glog_func (const gchar* log_domain, + GLogLevelFlags log_levels, + const gchar* message, + gpointer self); void debug_terminate (void); gboolean debug_is_enabled (GLogLevelFlags flag); -void debug_log (FILE* stream, const gchar* prefix, const gchar* message); +void debug_log (FILE* stream, + const gchar* prefix, + const gchar* message); -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 37 "/home/jens/Source/shotwell/src/Debug.vala" return self ? g_object_ref (self) : NULL; -#line 61 "Debug.c" +#line 91 "Debug.c" } -static void _debug_info_handler_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) { +static void +_debug_info_handler_glog_func (const gchar* log_domain, + GLogLevelFlags log_levels, + const gchar* message, + gpointer self) +{ #line 82 "/home/jens/Source/shotwell/src/Debug.vala" debug_info_handler (log_domain, log_levels, message); -#line 68 "Debug.c" +#line 103 "Debug.c" } -static void _debug_debug_handler_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) { +static void +_debug_debug_handler_glog_func (const gchar* log_domain, + GLogLevelFlags log_levels, + const gchar* message, + gpointer self) +{ #line 83 "/home/jens/Source/shotwell/src/Debug.vala" debug_debug_handler (log_domain, log_levels, message); -#line 75 "Debug.c" +#line 115 "Debug.c" } -static void _debug_message_handler_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) { +static void +_debug_message_handler_glog_func (const gchar* log_domain, + GLogLevelFlags log_levels, + const gchar* message, + gpointer self) +{ #line 84 "/home/jens/Source/shotwell/src/Debug.vala" debug_message_handler (log_domain, log_levels, message); -#line 82 "Debug.c" +#line 127 "Debug.c" } -static void _debug_warning_handler_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) { +static void +_debug_warning_handler_glog_func (const gchar* log_domain, + GLogLevelFlags log_levels, + const gchar* message, + gpointer self) +{ #line 85 "/home/jens/Source/shotwell/src/Debug.vala" debug_warning_handler (log_domain, log_levels, message); -#line 89 "Debug.c" +#line 139 "Debug.c" } -static void _debug_critical_handler_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) { +static void +_debug_critical_handler_glog_func (const gchar* log_domain, + GLogLevelFlags log_levels, + const gchar* message, + gpointer self) +{ #line 86 "/home/jens/Source/shotwell/src/Debug.vala" debug_critical_handler (log_domain, log_levels, message); -#line 96 "Debug.c" +#line 151 "Debug.c" } -void debug_init (const gchar* app_version_prefix) { - const gchar* _tmp0_; - gchar* _tmp1_; +void +debug_init (const gchar* app_version_prefix) +{ + gchar* _tmp0_; + FILE* _tmp1_; FILE* _tmp2_; - FILE* _tmp3_; gchar* log_file_error_msg = NULL; - GFile* _tmp4_ = NULL; - const gchar* _tmp5_; + GFile* _tmp3_ = NULL; + const gchar* _tmp4_; GFile* log_file = NULL; + GFile* _tmp6_; GFile* _tmp7_; - GFile* _tmp8_; - const gchar* _tmp34_; - gboolean _tmp55_ = FALSE; - GLogLevelFlags _tmp56_; - const gchar* _tmp58_; + const gchar* _tmp31_; + gboolean _tmp52_ = FALSE; + GLogLevelFlags _tmp53_; + const gchar* _tmp55_; GError * _inner_error_ = NULL; #line 27 "/home/jens/Source/shotwell/src/Debug.vala" g_return_if_fail (app_version_prefix != NULL); #line 28 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp0_ = app_version_prefix; -#line 28 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (app_version_prefix); #line 28 "/home/jens/Source/shotwell/src/Debug.vala" _g_free0 (debug_log_app_version_prefix); #line 28 "/home/jens/Source/shotwell/src/Debug.vala" - debug_log_app_version_prefix = _tmp1_; + debug_log_app_version_prefix = _tmp0_; #line 31 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp2_ = stdout; + _tmp1_ = stdout; #line 31 "/home/jens/Source/shotwell/src/Debug.vala" - debug_log_out = _tmp2_; + debug_log_out = _tmp1_; #line 32 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp3_ = stderr; + _tmp2_ = stderr; #line 32 "/home/jens/Source/shotwell/src/Debug.vala" - debug_log_err = _tmp3_; + debug_log_err = _tmp2_; #line 34 "/home/jens/Source/shotwell/src/Debug.vala" log_file_error_msg = NULL; #line 37 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp5_ = debug_log_app_version_prefix; + _tmp4_ = debug_log_app_version_prefix; #line 37 "/home/jens/Source/shotwell/src/Debug.vala" - if (g_strcmp0 (_tmp5_, DEBUG_LIBRARY_PREFIX) == 0) { -#line 140 "Debug.c" - GFile* _tmp6_; + if (g_strcmp0 (_tmp4_, DEBUG_LIBRARY_PREFIX) == 0) { +#line 194 "Debug.c" + GFile* _tmp5_; #line 37 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp6_ = app_dirs_get_log_file (); + _tmp5_ = app_dirs_get_log_file (); #line 37 "/home/jens/Source/shotwell/src/Debug.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 37 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp4_ = _tmp6_; -#line 148 "Debug.c" + _tmp3_ = _tmp5_; +#line 202 "Debug.c" } else { #line 37 "/home/jens/Source/shotwell/src/Debug.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 37 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp4_ = NULL; -#line 154 "Debug.c" + _tmp3_ = NULL; +#line 208 "Debug.c" } #line 37 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp7_ = _g_object_ref0 (_tmp4_); + _tmp6_ = _g_object_ref0 (_tmp3_); #line 37 "/home/jens/Source/shotwell/src/Debug.vala" - log_file = _tmp7_; + log_file = _tmp6_; #line 38 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp8_ = log_file; + _tmp7_ = log_file; #line 38 "/home/jens/Source/shotwell/src/Debug.vala" - if (_tmp8_ != NULL) { -#line 164 "Debug.c" + if (_tmp7_ != NULL) { +#line 218 "Debug.c" GFile* log_dir = NULL; + GFile* _tmp8_; GFile* _tmp9_; - GFile* _tmp10_; - GFile* _tmp23_; - gchar* _tmp24_; - gchar* _tmp25_; - FILE* _tmp26_; - FILE* _tmp27_; + GFile* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + FILE* _tmp23_; + FILE* _tmp24_; #line 39 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp9_ = log_file; + _tmp8_ = log_file; #line 39 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp10_ = g_file_get_parent (_tmp9_); + _tmp9_ = g_file_get_parent (_tmp8_); #line 39 "/home/jens/Source/shotwell/src/Debug.vala" - log_dir = _tmp10_; -#line 179 "Debug.c" + log_dir = _tmp9_; +#line 233 "Debug.c" { - GFile* _tmp11_; - gboolean _tmp12_; -#line 41 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp11_ = log_dir; + GFile* _tmp10_; #line 41 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp12_ = g_file_query_exists (_tmp11_, NULL); + _tmp10_ = log_dir; #line 41 "/home/jens/Source/shotwell/src/Debug.vala" - if (_tmp12_ == FALSE) { -#line 189 "Debug.c" - gboolean _tmp13_ = FALSE; - GFile* _tmp14_; - gboolean _tmp15_; + if (g_file_query_exists (_tmp10_, NULL) == FALSE) { +#line 240 "Debug.c" + gboolean _tmp11_ = FALSE; + GFile* _tmp12_; #line 42 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp14_ = log_dir; + _tmp12_ = log_dir; #line 42 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp15_ = g_file_make_directory_with_parents (_tmp14_, NULL, &_inner_error_); -#line 42 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp13_ = _tmp15_; + _tmp11_ = g_file_make_directory_with_parents (_tmp12_, NULL, &_inner_error_); #line 42 "/home/jens/Source/shotwell/src/Debug.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 201 "Debug.c" +#line 249 "Debug.c" goto __catch441_g_error; } #line 42 "/home/jens/Source/shotwell/src/Debug.vala" - if (!_tmp13_) { -#line 206 "Debug.c" - GFile* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; + if (!_tmp11_) { +#line 254 "Debug.c" + GFile* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; #line 43 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp16_ = log_dir; + _tmp13_ = log_dir; #line 43 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp17_ = g_file_get_path (_tmp16_); + _tmp14_ = g_file_get_path (_tmp13_); #line 43 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp18_ = _tmp17_; + _tmp15_ = _tmp14_; #line 43 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp19_ = g_strdup_printf ("Unable to create data directory %s", _tmp18_); + _tmp16_ = g_strdup_printf ("Unable to create data directory %s", _tmp15_); #line 43 "/home/jens/Source/shotwell/src/Debug.vala" _g_free0 (log_file_error_msg); #line 43 "/home/jens/Source/shotwell/src/Debug.vala" - log_file_error_msg = _tmp19_; + log_file_error_msg = _tmp16_; #line 43 "/home/jens/Source/shotwell/src/Debug.vala" - _g_free0 (_tmp18_); -#line 225 "Debug.c" + _g_free0 (_tmp15_); +#line 273 "Debug.c" } } } @@ -229,26 +277,26 @@ void debug_init (const gchar* app_version_prefix) { __catch441_g_error: { GError* err = NULL; - GError* _tmp20_; - const gchar* _tmp21_; - gchar* _tmp22_; + GError* _tmp17_; + const gchar* _tmp18_; + gchar* _tmp19_; #line 40 "/home/jens/Source/shotwell/src/Debug.vala" err = _inner_error_; #line 40 "/home/jens/Source/shotwell/src/Debug.vala" _inner_error_ = NULL; #line 47 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp20_ = err; + _tmp17_ = err; #line 47 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp21_ = _tmp20_->message; + _tmp18_ = _tmp17_->message; #line 47 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp22_ = g_strdup (_tmp21_); + _tmp19_ = g_strdup (_tmp18_); #line 47 "/home/jens/Source/shotwell/src/Debug.vala" _g_free0 (log_file_error_msg); #line 47 "/home/jens/Source/shotwell/src/Debug.vala" - log_file_error_msg = _tmp22_; + log_file_error_msg = _tmp19_; #line 40 "/home/jens/Source/shotwell/src/Debug.vala" _g_error_free0 (err); -#line 252 "Debug.c" +#line 300 "Debug.c" } __finally441: #line 40 "/home/jens/Source/shotwell/src/Debug.vala" @@ -258,7 +306,7 @@ void debug_init (const gchar* app_version_prefix) { #line 40 "/home/jens/Source/shotwell/src/Debug.vala" _g_object_unref0 (log_file); #line 40 "/home/jens/Source/shotwell/src/Debug.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 40 "/home/jens/Source/shotwell/src/Debug.vala" _g_free0 (log_file_error_msg); #line 40 "/home/jens/Source/shotwell/src/Debug.vala" @@ -267,187 +315,187 @@ void debug_init (const gchar* app_version_prefix) { g_clear_error (&_inner_error_); #line 40 "/home/jens/Source/shotwell/src/Debug.vala" return; -#line 271 "Debug.c" +#line 319 "Debug.c" } #line 53 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp23_ = log_file; + _tmp20_ = log_file; #line 53 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp24_ = g_file_get_path (_tmp23_); + _tmp21_ = g_file_get_path (_tmp20_); #line 53 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp25_ = _tmp24_; + _tmp22_ = _tmp21_; #line 53 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp26_ = g_fopen (_tmp25_, "w"); + _tmp23_ = g_fopen (_tmp22_, "w"); #line 53 "/home/jens/Source/shotwell/src/Debug.vala" _fclose0 (debug_log_file_stream); #line 53 "/home/jens/Source/shotwell/src/Debug.vala" - debug_log_file_stream = _tmp26_; + debug_log_file_stream = _tmp23_; #line 53 "/home/jens/Source/shotwell/src/Debug.vala" - _g_free0 (_tmp25_); + _g_free0 (_tmp22_); #line 54 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp27_ = debug_log_file_stream; + _tmp24_ = debug_log_file_stream; #line 54 "/home/jens/Source/shotwell/src/Debug.vala" - if (_tmp27_ != NULL) { -#line 291 "Debug.c" - FILE* _tmp28_; - FILE* _tmp29_; + if (_tmp24_ != NULL) { +#line 339 "Debug.c" + FILE* _tmp25_; + FILE* _tmp26_; #line 55 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp28_ = debug_log_file_stream; + _tmp25_ = debug_log_file_stream; #line 55 "/home/jens/Source/shotwell/src/Debug.vala" - debug_log_out = _tmp28_; + debug_log_out = _tmp25_; #line 56 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp29_ = debug_log_file_stream; + _tmp26_ = debug_log_file_stream; #line 56 "/home/jens/Source/shotwell/src/Debug.vala" - debug_log_err = _tmp29_; -#line 302 "Debug.c" + debug_log_err = _tmp26_; +#line 350 "Debug.c" } else { - GFile* _tmp30_; - gchar* _tmp31_; - gchar* _tmp32_; - gchar* _tmp33_; + GFile* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; + gchar* _tmp30_; #line 58 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp30_ = log_file; + _tmp27_ = log_file; #line 58 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp31_ = g_file_get_path (_tmp30_); + _tmp28_ = g_file_get_path (_tmp27_); #line 58 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp32_ = _tmp31_; + _tmp29_ = _tmp28_; #line 58 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp33_ = g_strdup_printf ("Unable to open or create log file %s", _tmp32_); + _tmp30_ = g_strdup_printf ("Unable to open or create log file %s", _tmp29_); #line 58 "/home/jens/Source/shotwell/src/Debug.vala" _g_free0 (log_file_error_msg); #line 58 "/home/jens/Source/shotwell/src/Debug.vala" - log_file_error_msg = _tmp33_; + log_file_error_msg = _tmp30_; #line 58 "/home/jens/Source/shotwell/src/Debug.vala" - _g_free0 (_tmp32_); -#line 322 "Debug.c" + _g_free0 (_tmp29_); +#line 370 "Debug.c" } #line 38 "/home/jens/Source/shotwell/src/Debug.vala" _g_object_unref0 (log_dir); -#line 326 "Debug.c" +#line 374 "Debug.c" } #line 62 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp34_ = g_getenv ("SHOTWELL_LOG"); + _tmp31_ = g_getenv ("SHOTWELL_LOG"); #line 62 "/home/jens/Source/shotwell/src/Debug.vala" - if (_tmp34_ != NULL) { + if (_tmp31_ != NULL) { #line 63 "/home/jens/Source/shotwell/src/Debug.vala" debug_log_mask = G_LOG_LEVEL_MASK; -#line 334 "Debug.c" +#line 382 "Debug.c" } else { - GLogLevelFlags _tmp35_ = 0; - const gchar* _tmp36_; - GLogLevelFlags _tmp39_ = 0; - const gchar* _tmp40_; - GLogLevelFlags _tmp43_ = 0; - const gchar* _tmp44_; - GLogLevelFlags _tmp47_ = 0; - const gchar* _tmp48_; - GLogLevelFlags _tmp51_ = 0; - const gchar* _tmp52_; + GLogLevelFlags _tmp32_ = 0; + const gchar* _tmp33_; + GLogLevelFlags _tmp36_ = 0; + const gchar* _tmp37_; + GLogLevelFlags _tmp40_ = 0; + const gchar* _tmp41_; + GLogLevelFlags _tmp44_ = 0; + const gchar* _tmp45_; + GLogLevelFlags _tmp48_ = 0; + const gchar* _tmp49_; #line 65 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp36_ = g_getenv ("SHOTWELL_INFO"); + _tmp33_ = g_getenv ("SHOTWELL_INFO"); #line 65 "/home/jens/Source/shotwell/src/Debug.vala" - if (_tmp36_ != NULL) { -#line 350 "Debug.c" - GLogLevelFlags _tmp37_; + if (_tmp33_ != NULL) { +#line 398 "Debug.c" + GLogLevelFlags _tmp34_; #line 66 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp37_ = debug_log_mask; + _tmp34_ = debug_log_mask; #line 66 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp35_ = _tmp37_ | G_LOG_LEVEL_INFO; -#line 356 "Debug.c" + _tmp32_ = _tmp34_ | G_LOG_LEVEL_INFO; +#line 404 "Debug.c" } else { - GLogLevelFlags _tmp38_; + GLogLevelFlags _tmp35_; #line 67 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp38_ = debug_log_mask; + _tmp35_ = debug_log_mask; #line 67 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp35_ = _tmp38_; -#line 363 "Debug.c" + _tmp32_ = _tmp35_; +#line 411 "Debug.c" } #line 65 "/home/jens/Source/shotwell/src/Debug.vala" - debug_log_mask = _tmp35_; + debug_log_mask = _tmp32_; #line 68 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp40_ = g_getenv ("SHOTWELL_DEBUG"); + _tmp37_ = g_getenv ("SHOTWELL_DEBUG"); #line 68 "/home/jens/Source/shotwell/src/Debug.vala" - if (_tmp40_ != NULL) { -#line 371 "Debug.c" - GLogLevelFlags _tmp41_; + if (_tmp37_ != NULL) { +#line 419 "Debug.c" + GLogLevelFlags _tmp38_; #line 69 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp41_ = debug_log_mask; + _tmp38_ = debug_log_mask; #line 69 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp39_ = _tmp41_ | G_LOG_LEVEL_DEBUG; -#line 377 "Debug.c" + _tmp36_ = _tmp38_ | G_LOG_LEVEL_DEBUG; +#line 425 "Debug.c" } else { - GLogLevelFlags _tmp42_; + GLogLevelFlags _tmp39_; #line 70 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp42_ = debug_log_mask; + _tmp39_ = debug_log_mask; #line 70 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp39_ = _tmp42_; -#line 384 "Debug.c" + _tmp36_ = _tmp39_; +#line 432 "Debug.c" } #line 68 "/home/jens/Source/shotwell/src/Debug.vala" - debug_log_mask = _tmp39_; + debug_log_mask = _tmp36_; #line 71 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp44_ = g_getenv ("SHOTWELL_MESSAGE"); + _tmp41_ = g_getenv ("SHOTWELL_MESSAGE"); #line 71 "/home/jens/Source/shotwell/src/Debug.vala" - if (_tmp44_ != NULL) { -#line 392 "Debug.c" - GLogLevelFlags _tmp45_; + if (_tmp41_ != NULL) { +#line 440 "Debug.c" + GLogLevelFlags _tmp42_; #line 72 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp45_ = debug_log_mask; + _tmp42_ = debug_log_mask; #line 72 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp43_ = _tmp45_ | G_LOG_LEVEL_MESSAGE; -#line 398 "Debug.c" + _tmp40_ = _tmp42_ | G_LOG_LEVEL_MESSAGE; +#line 446 "Debug.c" } else { - GLogLevelFlags _tmp46_; + GLogLevelFlags _tmp43_; #line 73 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp46_ = debug_log_mask; + _tmp43_ = debug_log_mask; #line 73 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp43_ = _tmp46_; -#line 405 "Debug.c" + _tmp40_ = _tmp43_; +#line 453 "Debug.c" } #line 71 "/home/jens/Source/shotwell/src/Debug.vala" - debug_log_mask = _tmp43_; + debug_log_mask = _tmp40_; #line 74 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp48_ = g_getenv ("SHOTWELL_WARNING"); + _tmp45_ = g_getenv ("SHOTWELL_WARNING"); #line 74 "/home/jens/Source/shotwell/src/Debug.vala" - if (_tmp48_ != NULL) { -#line 413 "Debug.c" - GLogLevelFlags _tmp49_; + if (_tmp45_ != NULL) { +#line 461 "Debug.c" + GLogLevelFlags _tmp46_; #line 75 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp49_ = debug_log_mask; + _tmp46_ = debug_log_mask; #line 75 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp47_ = _tmp49_ | G_LOG_LEVEL_WARNING; -#line 419 "Debug.c" + _tmp44_ = _tmp46_ | G_LOG_LEVEL_WARNING; +#line 467 "Debug.c" } else { - GLogLevelFlags _tmp50_; + GLogLevelFlags _tmp47_; #line 76 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp50_ = debug_log_mask; + _tmp47_ = debug_log_mask; #line 76 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp47_ = _tmp50_; -#line 426 "Debug.c" + _tmp44_ = _tmp47_; +#line 474 "Debug.c" } #line 74 "/home/jens/Source/shotwell/src/Debug.vala" - debug_log_mask = _tmp47_; + debug_log_mask = _tmp44_; #line 77 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp52_ = g_getenv ("SHOTWELL_CRITICAL"); + _tmp49_ = g_getenv ("SHOTWELL_CRITICAL"); #line 77 "/home/jens/Source/shotwell/src/Debug.vala" - if (_tmp52_ != NULL) { -#line 434 "Debug.c" - GLogLevelFlags _tmp53_; + if (_tmp49_ != NULL) { +#line 482 "Debug.c" + GLogLevelFlags _tmp50_; #line 78 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp53_ = debug_log_mask; + _tmp50_ = debug_log_mask; #line 78 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp51_ = _tmp53_ | G_LOG_LEVEL_CRITICAL; -#line 440 "Debug.c" + _tmp48_ = _tmp50_ | G_LOG_LEVEL_CRITICAL; +#line 488 "Debug.c" } else { - GLogLevelFlags _tmp54_; + GLogLevelFlags _tmp51_; #line 79 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp54_ = debug_log_mask; + _tmp51_ = debug_log_mask; #line 79 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp51_ = _tmp54_; -#line 447 "Debug.c" + _tmp48_ = _tmp51_; +#line 495 "Debug.c" } #line 77 "/home/jens/Source/shotwell/src/Debug.vala" - debug_log_mask = _tmp51_; -#line 451 "Debug.c" + debug_log_mask = _tmp48_; +#line 499 "Debug.c" } #line 82 "/home/jens/Source/shotwell/src/Debug.vala" g_log_set_handler (NULL, G_LOG_LEVEL_INFO, _debug_info_handler_glog_func, NULL); @@ -460,85 +508,91 @@ void debug_init (const gchar* app_version_prefix) { #line 86 "/home/jens/Source/shotwell/src/Debug.vala" g_log_set_handler (NULL, G_LOG_LEVEL_CRITICAL, _debug_critical_handler_glog_func, NULL); #line 88 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp56_ = debug_log_mask; + _tmp53_ = debug_log_mask; #line 88 "/home/jens/Source/shotwell/src/Debug.vala" - if (_tmp56_ == 0) { -#line 467 "Debug.c" - GFile* _tmp57_; + if (_tmp53_ == 0) { +#line 515 "Debug.c" + GFile* _tmp54_; #line 88 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp57_ = log_file; + _tmp54_ = log_file; #line 88 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp55_ = _tmp57_ != NULL; -#line 473 "Debug.c" + _tmp52_ = _tmp54_ != NULL; +#line 521 "Debug.c" } else { #line 88 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp55_ = FALSE; -#line 477 "Debug.c" + _tmp52_ = FALSE; +#line 525 "Debug.c" } #line 88 "/home/jens/Source/shotwell/src/Debug.vala" - if (_tmp55_) { + if (_tmp52_) { #line 91 "/home/jens/Source/shotwell/src/Debug.vala" debug_log_mask = DEBUG_DEFAULT_LOG_MASK; -#line 483 "Debug.c" +#line 531 "Debug.c" } #line 94 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp58_ = log_file_error_msg; + _tmp55_ = log_file_error_msg; #line 94 "/home/jens/Source/shotwell/src/Debug.vala" - if (_tmp58_ != NULL) { -#line 489 "Debug.c" - const gchar* _tmp59_; + if (_tmp55_ != NULL) { +#line 537 "Debug.c" + const gchar* _tmp56_; #line 95 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp59_ = log_file_error_msg; + _tmp56_ = log_file_error_msg; #line 95 "/home/jens/Source/shotwell/src/Debug.vala" - g_warning ("Debug.vala:95: %s", _tmp59_); -#line 495 "Debug.c" + g_warning ("Debug.vala:95: %s", _tmp56_); +#line 543 "Debug.c" } #line 27 "/home/jens/Source/shotwell/src/Debug.vala" _g_object_unref0 (log_file); #line 27 "/home/jens/Source/shotwell/src/Debug.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 27 "/home/jens/Source/shotwell/src/Debug.vala" _g_free0 (log_file_error_msg); -#line 503 "Debug.c" +#line 551 "Debug.c" } -void debug_terminate (void) { +void +debug_terminate (void) +{ } -gboolean debug_is_enabled (GLogLevelFlags flag) { +gboolean +debug_is_enabled (GLogLevelFlags flag) +{ gboolean result = FALSE; GLogLevelFlags _tmp0_; - GLogLevelFlags _tmp1_; #line 103 "/home/jens/Source/shotwell/src/Debug.vala" _tmp0_ = debug_log_mask; #line 103 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp1_ = flag; -#line 103 "/home/jens/Source/shotwell/src/Debug.vala" - result = (_tmp0_ & _tmp1_) > 0; + result = (_tmp0_ & flag) > 0; #line 103 "/home/jens/Source/shotwell/src/Debug.vala" return result; -#line 523 "Debug.c" +#line 572 "Debug.c" } -static void g_time_local (time_t time, struct tm* result) { +static void +g_time_local (time_t time, + struct tm* result) +{ struct tm _result_ = {0}; struct tm _tmp0_ = {0}; -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" localtime_r (&time, &_tmp0_); -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" *result = _result_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return; -#line 538 "Debug.c" +#line 590 "Debug.c" } -static gchar* g_time_to_string (struct tm *self) { +static gchar* +g_time_to_string (struct tm *self) +{ gchar* result = NULL; gint _tmp0_; gint _tmp1_; @@ -547,40 +601,39 @@ static gchar* g_time_to_string (struct tm *self) { gint _tmp4_; gint _tmp5_; gchar* _tmp6_; -#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2871 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = (*self).tm_year; -#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2871 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = (*self).tm_mon; -#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2871 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp2_ = (*self).tm_mday; -#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2871 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp3_ = (*self).tm_hour; -#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2871 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp4_ = (*self).tm_min; -#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2871 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp5_ = (*self).tm_sec; -#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2871 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp6_ = g_strdup_printf ("%04d-%02d-%02d %02d:%02d:%02d", _tmp0_ + 1900, _tmp1_ + 1, _tmp2_, _tmp3_, _tmp4_, _tmp5_); -#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2871 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _tmp6_; -#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2871 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 569 "Debug.c" +#line 623 "Debug.c" } -void debug_log (FILE* stream, const gchar* prefix, const gchar* message) { +void +debug_log (FILE* stream, + const gchar* prefix, + const gchar* message) +{ time_t now = 0; time_t _tmp0_; - FILE* _tmp1_; - const gchar* _tmp2_; - pid_t _tmp3_; - struct tm _tmp4_ = {0}; - gchar* _tmp5_; - gchar* _tmp6_; - const gchar* _tmp7_; - const gchar* _tmp8_; - FILE* _tmp9_; + const gchar* _tmp1_; + struct tm _tmp2_ = {0}; + gchar* _tmp3_; + gchar* _tmp4_; #line 106 "/home/jens/Source/shotwell/src/Debug.vala" g_return_if_fail (stream != NULL); #line 106 "/home/jens/Source/shotwell/src/Debug.vala" @@ -592,153 +645,130 @@ void debug_log (FILE* stream, const gchar* prefix, const gchar* message) { #line 107 "/home/jens/Source/shotwell/src/Debug.vala" now = _tmp0_; #line 108 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp1_ = stream; -#line 108 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp2_ = debug_log_app_version_prefix; -#line 108 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp3_ = getpid (); + _tmp1_ = debug_log_app_version_prefix; #line 108 "/home/jens/Source/shotwell/src/Debug.vala" - g_time_local (now, &_tmp4_); + g_time_local (now, &_tmp2_); #line 108 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp5_ = g_time_to_string (&_tmp4_); + _tmp3_ = g_time_to_string (&_tmp2_); #line 108 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 108 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp7_ = prefix; + fprintf (stream, "%s %d %s [%s] %s\n", _tmp1_, (gint) getpid (), _tmp4_, prefix, message); #line 108 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp8_ = message; -#line 108 "/home/jens/Source/shotwell/src/Debug.vala" - fprintf (_tmp1_, "%s %d %s [%s] %s\n", _tmp2_, (gint) _tmp3_, _tmp6_, _tmp7_, _tmp8_); -#line 108 "/home/jens/Source/shotwell/src/Debug.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp4_); #line 115 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp9_ = stream; -#line 115 "/home/jens/Source/shotwell/src/Debug.vala" - fflush (_tmp9_); -#line 619 "Debug.c" + fflush (stream); +#line 662 "Debug.c" } -void debug_info_handler (const gchar* domain, GLogLevelFlags flags, const gchar* message) { - gboolean _tmp0_; +void +debug_info_handler (const gchar* domain, + GLogLevelFlags flags, + const gchar* message) +{ #line 118 "/home/jens/Source/shotwell/src/Debug.vala" g_return_if_fail (message != NULL); #line 119 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp0_ = debug_is_enabled (G_LOG_LEVEL_INFO); -#line 119 "/home/jens/Source/shotwell/src/Debug.vala" - if (_tmp0_) { -#line 631 "Debug.c" - FILE* _tmp1_; - const gchar* _tmp2_; -#line 120 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp1_ = debug_log_out; + if (debug_is_enabled (G_LOG_LEVEL_INFO)) { +#line 675 "Debug.c" + FILE* _tmp0_; #line 120 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp2_ = message; + _tmp0_ = debug_log_out; #line 120 "/home/jens/Source/shotwell/src/Debug.vala" - debug_log (_tmp1_, "INF", _tmp2_); -#line 640 "Debug.c" + debug_log (_tmp0_, "INF", message); +#line 681 "Debug.c" } } -void debug_debug_handler (const gchar* domain, GLogLevelFlags flags, const gchar* message) { - gboolean _tmp0_; +void +debug_debug_handler (const gchar* domain, + GLogLevelFlags flags, + const gchar* message) +{ #line 123 "/home/jens/Source/shotwell/src/Debug.vala" g_return_if_fail (message != NULL); #line 124 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp0_ = debug_is_enabled (G_LOG_LEVEL_DEBUG); -#line 124 "/home/jens/Source/shotwell/src/Debug.vala" - if (_tmp0_) { -#line 653 "Debug.c" - FILE* _tmp1_; - const gchar* _tmp2_; -#line 125 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp1_ = debug_log_out; + if (debug_is_enabled (G_LOG_LEVEL_DEBUG)) { +#line 695 "Debug.c" + FILE* _tmp0_; #line 125 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp2_ = message; + _tmp0_ = debug_log_out; #line 125 "/home/jens/Source/shotwell/src/Debug.vala" - debug_log (_tmp1_, "DBG", _tmp2_); -#line 662 "Debug.c" + debug_log (_tmp0_, "DBG", message); +#line 701 "Debug.c" } } -void debug_message_handler (const gchar* domain, GLogLevelFlags flags, const gchar* message) { - gboolean _tmp0_; +void +debug_message_handler (const gchar* domain, + GLogLevelFlags flags, + const gchar* message) +{ #line 128 "/home/jens/Source/shotwell/src/Debug.vala" g_return_if_fail (message != NULL); #line 129 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp0_ = debug_is_enabled (G_LOG_LEVEL_MESSAGE); -#line 129 "/home/jens/Source/shotwell/src/Debug.vala" - if (_tmp0_) { -#line 675 "Debug.c" - FILE* _tmp1_; - const gchar* _tmp2_; + if (debug_is_enabled (G_LOG_LEVEL_MESSAGE)) { +#line 715 "Debug.c" + FILE* _tmp0_; #line 130 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp1_ = debug_log_err; + _tmp0_ = debug_log_err; #line 130 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp2_ = message; -#line 130 "/home/jens/Source/shotwell/src/Debug.vala" - debug_log (_tmp1_, "MSG", _tmp2_); -#line 684 "Debug.c" + debug_log (_tmp0_, "MSG", message); +#line 721 "Debug.c" } } -void debug_warning_handler (const gchar* domain, GLogLevelFlags flags, const gchar* message) { - gboolean _tmp0_; +void +debug_warning_handler (const gchar* domain, + GLogLevelFlags flags, + const gchar* message) +{ #line 133 "/home/jens/Source/shotwell/src/Debug.vala" g_return_if_fail (message != NULL); #line 134 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp0_ = debug_is_enabled (G_LOG_LEVEL_WARNING); -#line 134 "/home/jens/Source/shotwell/src/Debug.vala" - if (_tmp0_) { -#line 697 "Debug.c" - FILE* _tmp1_; - const gchar* _tmp2_; -#line 135 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp1_ = debug_log_err; + if (debug_is_enabled (G_LOG_LEVEL_WARNING)) { +#line 735 "Debug.c" + FILE* _tmp0_; #line 135 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp2_ = message; + _tmp0_ = debug_log_err; #line 135 "/home/jens/Source/shotwell/src/Debug.vala" - debug_log (_tmp1_, "WRN", _tmp2_); -#line 706 "Debug.c" + debug_log (_tmp0_, "WRN", message); +#line 741 "Debug.c" } } -void debug_critical_handler (const gchar* domain, GLogLevelFlags flags, const gchar* message) { - gboolean _tmp0_; +void +debug_critical_handler (const gchar* domain, + GLogLevelFlags flags, + const gchar* message) +{ #line 138 "/home/jens/Source/shotwell/src/Debug.vala" g_return_if_fail (message != NULL); #line 139 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp0_ = debug_is_enabled (G_LOG_LEVEL_CRITICAL); -#line 139 "/home/jens/Source/shotwell/src/Debug.vala" - if (_tmp0_) { -#line 719 "Debug.c" + if (debug_is_enabled (G_LOG_LEVEL_CRITICAL)) { +#line 755 "Debug.c" + FILE* _tmp0_; FILE* _tmp1_; - const gchar* _tmp2_; - FILE* _tmp3_; -#line 140 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp1_ = debug_log_err; #line 140 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp2_ = message; + _tmp0_ = debug_log_err; #line 140 "/home/jens/Source/shotwell/src/Debug.vala" - debug_log (_tmp1_, "CRT", _tmp2_); + debug_log (_tmp0_, "CRT", message); #line 141 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp3_ = debug_log_file_stream; + _tmp1_ = debug_log_file_stream; #line 141 "/home/jens/Source/shotwell/src/Debug.vala" - if (_tmp3_ != NULL) { -#line 733 "Debug.c" - FILE* _tmp4_; - const gchar* _tmp5_; -#line 142 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp4_ = stderr; + if (_tmp1_ != NULL) { +#line 766 "Debug.c" + FILE* _tmp2_; #line 142 "/home/jens/Source/shotwell/src/Debug.vala" - _tmp5_ = message; + _tmp2_ = stderr; #line 142 "/home/jens/Source/shotwell/src/Debug.vala" - debug_log (_tmp4_, "CRT", _tmp5_); -#line 742 "Debug.c" + debug_log (_tmp2_, "CRT", message); +#line 772 "Debug.c" } } } diff --git a/src/DesktopIntegration.c b/src/DesktopIntegration.c index 7d24773..5fb90ef 100644 --- a/src/DesktopIntegration.c +++ b/src/DesktopIntegration.c @@ -1,4 +1,4 @@ -/* DesktopIntegration.c generated by valac 0.36.6, the Vala compiler +/* DesktopIntegration.c generated by valac 0.40.4, the Vala compiler * generated from DesktopIntegration.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -321,32 +322,55 @@ static gpointer desktop_integration_background_slideshow_xml_builder_parent_clas #define DESKTOP_INTEGRATION_DESKTOP_SLIDESHOW_XML_FILENAME "wallpaper.xml" gpointer exporter_ui_ref (gpointer instance); void exporter_ui_unref (gpointer instance); -GParamSpec* param_spec_exporter_ui (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_exporter_ui (GValue* value, gpointer v_object); -void value_take_exporter_ui (GValue* value, gpointer v_object); +GParamSpec* param_spec_exporter_ui (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_exporter_ui (GValue* value, + gpointer v_object); +void value_take_exporter_ui (GValue* value, + gpointer v_object); gpointer value_get_exporter_ui (const GValue* value); GType exporter_ui_get_type (void) G_GNUC_CONST; void desktop_integration_init (void); void desktop_integration_terminate (void); -GAppInfo* desktop_integration_get_default_app_for_mime_types (gchar** mime_types, int mime_types_length1, GeeArrayList* preferred_apps); +GAppInfo* desktop_integration_get_default_app_for_mime_types (gchar** mime_types, + int mime_types_length1, + GeeArrayList* preferred_apps); GType sorted_list_get_type (void) G_GNUC_CONST; -SortedList* desktop_integration_get_apps_for_mime_types (gchar** mime_types, int mime_types_length1); -gint64 desktop_integration_app_info_comparator (void* a, void* b); -static gint64 _desktop_integration_app_info_comparator_comparator (void* a, void* b, gpointer self); -SortedList* sorted_list_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target); -SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target); +SortedList* desktop_integration_get_apps_for_mime_types (gchar** mime_types, + int mime_types_length1); +gint64 desktop_integration_app_info_comparator (void* a, + void* b); +static gint64 _desktop_integration_app_info_comparator_comparator (void* a, + void* b, + gpointer self); +SortedList* sorted_list_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + Comparator cmp, + void* cmp_target); +SortedList* sorted_list_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + Comparator cmp, + void* cmp_target); #define RESOURCES_APP_TITLE "Shotwell" static void _g_object_unref0_ (gpointer var); -static void _g_list_free__g_object_unref0_ (GList* self); +static inline void _g_list_free__g_object_unref0_ (GList* self); gchar* desktop_integration_get_app_open_command (GAppInfo* app_info); gboolean desktop_integration_is_send_to_installed (void); -void desktop_integration_files_send_to (GFile** files, int files_length1); +void desktop_integration_files_send_to (GFile** files, + int files_length1); GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); void page_window_set_busy_cursor (PageWindow* self); void page_window_set_normal_cursor (PageWindow* self); -void app_window_error_message (const gchar* message, GtkWindow* parent); +void app_window_error_message (const gchar* message, + GtkWindow* parent); GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; @@ -354,15 +378,22 @@ GType media_source_get_type (void) G_GNUC_CONST; void desktop_integration_send_to (GeeCollection* media); GType export_dialog_get_type (void) G_GNUC_CONST; ExportDialog* export_dialog_new (const gchar* title); -ExportDialog* export_dialog_construct (GType object_type, const gchar* title); +ExportDialog* export_dialog_construct (GType object_type, + const gchar* title); gboolean media_source_collection_has_video (GeeCollection* media); gboolean media_source_collection_has_photo (GeeCollection* media); GType video_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; GType exporter_get_type (void) G_GNUC_CONST; -ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback done, void* done_target, gboolean export_in_place); -void desktop_integration_on_send_to_export_completed (Exporter* exporter, gboolean is_cancelled); -static void _desktop_integration_on_send_to_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self); +ExporterUI* video_export_many (GeeCollection* videos, + ExporterCompletionCallback done, + void* done_target, + gboolean export_in_place); +void desktop_integration_on_send_to_export_completed (Exporter* exporter, + gboolean is_cancelled); +static void _desktop_integration_on_send_to_export_completed_exporter_completion_callback (Exporter* exporter, + gboolean is_cancelled, + gpointer self); GType scale_constraint_get_type (void) G_GNUC_CONST; GType export_format_parameters_get_type (void) G_GNUC_CONST; GType export_format_mode_get_type (void) G_GNUC_CONST; @@ -371,65 +402,139 @@ GType jpeg_quality_get_type (void) G_GNUC_CONST; ExportFormatParameters* export_format_parameters_dup (const ExportFormatParameters* self); void export_format_parameters_free (ExportFormatParameters* self); void export_format_parameters_current (ExportFormatParameters* result); -gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint* constraint, ExportFormatParameters* parameters); +gboolean export_dialog_execute (ExportDialog* self, + gint* scale, + ScaleConstraint* constraint, + ExportFormatParameters* parameters); GType scaling_get_type (void) G_GNUC_CONST; GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); Scaling* scaling_dup (const Scaling* self); void scaling_free (Scaling* self); -void scaling_for_constraint (ScaleConstraint constraint, gint scale, gboolean scale_up, Scaling* result); -Exporter* exporter_new_for_temp_file (GeeCollection* to_export, Scaling* scaling, ExportFormatParameters* export_params); -Exporter* exporter_construct_for_temp_file (GType object_type, GeeCollection* to_export, Scaling* scaling, ExportFormatParameters* export_params); +void scaling_for_constraint (ScaleConstraint constraint, + gint scale, + gboolean scale_up, + Scaling* result); +Exporter* exporter_new_for_temp_file (GeeCollection* to_export, + Scaling* scaling, + ExportFormatParameters* export_params); +Exporter* exporter_construct_for_temp_file (GType object_type, + GeeCollection* to_export, + Scaling* scaling, + ExportFormatParameters* export_params); ExporterUI* exporter_ui_new (Exporter* exporter); -ExporterUI* exporter_ui_construct (GType object_type, Exporter* exporter); -void exporter_ui_export (ExporterUI* self, ExporterCompletionCallback completion_callback, void* completion_callback_target); -GFile** exporter_get_exported_files (Exporter* self, int* result_length1); +ExporterUI* exporter_ui_construct (GType object_type, + Exporter* exporter); +void exporter_ui_export (ExporterUI* self, + ExporterCompletionCallback completion_callback, + void* completion_callback_target); +GFile** exporter_get_exported_files (Exporter* self, + int* result_length1); GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; -void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolean screensaver); +void desktop_integration_set_background (Photo* photo, + gboolean desktop, + gboolean screensaver); PhotoFileFormat photo_get_best_export_file_format (Photo* self); -GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname); -gchar* photo_file_format_get_default_basename (PhotoFileFormat self, const gchar* name); +GFile* app_dirs_get_data_subdir (const gchar* name, + const gchar* subname); +gchar* photo_file_format_get_default_basename (PhotoFileFormat self, + const gchar* name); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); gchar* configuration_facade_get_desktop_background (ConfigurationFacade* self); -void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error); +void photo_export (Photo* self, + GFile* dest_file, + Scaling* scaling, + JpegQuality quality, + PhotoFileFormat export_format, + gboolean direct_copy_unmodified, + gboolean export_metadata, + GError** error); void scaling_for_original (Scaling* result); -void configuration_facade_set_desktop_background (ConfigurationFacade* self, const gchar* filename); -void configuration_facade_set_screensaver (ConfigurationFacade* self, const gchar* filename); +void configuration_facade_set_desktop_background (ConfigurationFacade* self, + const gchar* filename); +void configuration_facade_set_screensaver (ConfigurationFacade* self, + const gchar* filename); gpointer desktop_integration_background_slideshow_xml_builder_ref (gpointer instance); void desktop_integration_background_slideshow_xml_builder_unref (gpointer instance); -GParamSpec* desktop_integration_param_spec_background_slideshow_xml_builder (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void desktop_integration_value_set_background_slideshow_xml_builder (GValue* value, gpointer v_object); -void desktop_integration_value_take_background_slideshow_xml_builder (GValue* value, gpointer v_object); +GParamSpec* desktop_integration_param_spec_background_slideshow_xml_builder (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void desktop_integration_value_set_background_slideshow_xml_builder (GValue* value, + gpointer v_object); +void desktop_integration_value_take_background_slideshow_xml_builder (GValue* value, + gpointer v_object); gpointer desktop_integration_value_get_background_slideshow_xml_builder (const GValue* value); GType desktop_integration_background_slideshow_xml_builder_get_type (void) G_GNUC_CONST; #define DESKTOP_INTEGRATION_BACKGROUND_SLIDESHOW_XML_BUILDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DESKTOP_INTEGRATION_TYPE_BACKGROUND_SLIDESHOW_XML_BUILDER, DesktopIntegrationBackgroundSlideshowXMLBuilderPrivate)) -enum { - DESKTOP_INTEGRATION_BACKGROUND_SLIDESHOW_XML_BUILDER_DUMMY_PROPERTY -}; -DesktopIntegrationBackgroundSlideshowXMLBuilder* desktop_integration_background_slideshow_xml_builder_new (GFile* destination, gdouble duration, gdouble transition); -DesktopIntegrationBackgroundSlideshowXMLBuilder* desktop_integration_background_slideshow_xml_builder_construct (GType object_type, GFile* destination, gdouble duration, gdouble transition); -void desktop_integration_background_slideshow_xml_builder_open (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, GError** error); -static void desktop_integration_background_slideshow_xml_builder_write_transition (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, GFile* from, GFile* to, GError** error); -static void desktop_integration_background_slideshow_xml_builder_write_static (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, GFile* file, GError** error); -void desktop_integration_background_slideshow_xml_builder_add_photo (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, GFile* file, GError** error); -GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, GError** error); +DesktopIntegrationBackgroundSlideshowXMLBuilder* desktop_integration_background_slideshow_xml_builder_new (GFile* destination, + gdouble duration, + gdouble transition); +DesktopIntegrationBackgroundSlideshowXMLBuilder* desktop_integration_background_slideshow_xml_builder_construct (GType object_type, + GFile* destination, + gdouble duration, + gdouble transition); +void desktop_integration_background_slideshow_xml_builder_open (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, + GError** error); +static void desktop_integration_background_slideshow_xml_builder_write_transition (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, + GFile* from, + GFile* to, + GError** error); +static void desktop_integration_background_slideshow_xml_builder_write_static (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, + GFile* file, + GError** error); +void desktop_integration_background_slideshow_xml_builder_add_photo (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, + GFile* file, + GError** error); +GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, + GError** error); static void desktop_integration_background_slideshow_xml_builder_finalize (DesktopIntegrationBackgroundSlideshowXMLBuilder * obj); -void desktop_integration_set_background_slideshow (GeeCollection* photos, gdouble duration, gdouble transition, gboolean desktop_background, gboolean screensaver); -void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor, void* monitor_target, guint64 file_count, GCancellable* cancellable, GError** error); -void scaling_to_fill_screen (GtkWindow* window, Scaling* result); -Exporter* exporter_new (GeeCollection* to_export, GFile* dir, Scaling* scaling, ExportFormatParameters* export_params, gboolean auto_replace_all); -Exporter* exporter_construct (GType object_type, GeeCollection* to_export, GFile* dir, Scaling* scaling, ExportFormatParameters* export_params, gboolean auto_replace_all); -void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboolean is_cancelled); -static void _desktop_integration_on_desktop_slideshow_exported_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -void desktop_integration_init (void) { +void desktop_integration_set_background_slideshow (GeeCollection* photos, + gdouble duration, + gdouble transition, + gboolean desktop_background, + gboolean screensaver); +void delete_all_files (GFile* dir, + GeeSet* exceptions, + ProgressMonitor monitor, + void* monitor_target, + guint64 file_count, + GCancellable* cancellable, + GError** error); +void scaling_to_fill_screen (GtkWindow* window, + Scaling* result); +Exporter* exporter_new (GeeCollection* to_export, + GFile* dir, + Scaling* scaling, + ExportFormatParameters* export_params, + gboolean auto_replace_all); +Exporter* exporter_construct (GType object_type, + GeeCollection* to_export, + GFile* dir, + Scaling* scaling, + ExportFormatParameters* export_params, + gboolean auto_replace_all); +void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, + gboolean is_cancelled); +static void _desktop_integration_on_desktop_slideshow_exported_exporter_completion_callback (Exporter* exporter, + gboolean is_cancelled, + gpointer self); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); + + +void +desktop_integration_init (void) +{ gint _tmp0_; gchar* _tmp1_; gchar* _tmp2_; @@ -441,7 +546,7 @@ void desktop_integration_init (void) { if (_tmp0_ != 0) { #line 24 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 445 "DesktopIntegration.c" +#line 550 "DesktopIntegration.c" } #line 26 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _tmp1_ = g_find_program_in_path (DESKTOP_INTEGRATION_SENDTO_EXEC); @@ -451,11 +556,13 @@ void desktop_integration_init (void) { desktop_integration_send_to_installed = _tmp2_ != NULL; #line 26 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_free0 (_tmp2_); -#line 455 "DesktopIntegration.c" +#line 560 "DesktopIntegration.c" } -void desktop_integration_terminate (void) { +void +desktop_integration_terminate (void) +{ gint _tmp0_; gint _tmp1_; #line 30 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" @@ -468,161 +575,152 @@ void desktop_integration_terminate (void) { if (_tmp1_ == 0) { #line 31 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 472 "DesktopIntegration.c" +#line 579 "DesktopIntegration.c" } } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return self ? g_object_ref (self) : NULL; -#line 480 "DesktopIntegration.c" +#line 589 "DesktopIntegration.c" } -static gboolean string_contains (const gchar* self, const gchar* needle) { +static gboolean +string_contains (const gchar* self, + const gchar* needle) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gchar* _tmp1_; -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = needle; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_ != NULL; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = strstr ((gchar*) self, (gchar*) needle); +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_ != NULL; +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 500 "DesktopIntegration.c" +#line 609 "DesktopIntegration.c" } -GAppInfo* desktop_integration_get_default_app_for_mime_types (gchar** mime_types, int mime_types_length1, GeeArrayList* preferred_apps) { +GAppInfo* +desktop_integration_get_default_app_for_mime_types (gchar** mime_types, + int mime_types_length1, + GeeArrayList* preferred_apps) +{ GAppInfo* result = NULL; SortedList* external_apps = NULL; - gchar** _tmp0_; - gint _tmp0__length1; - SortedList* _tmp1_; + SortedList* _tmp0_; #line 34 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_return_val_if_fail (GEE_IS_ARRAY_LIST (preferred_apps), NULL); #line 36 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp0_ = mime_types; -#line 36 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp0__length1 = mime_types_length1; -#line 36 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp1_ = desktop_integration_get_apps_for_mime_types (_tmp0_, _tmp0__length1); + _tmp0_ = desktop_integration_get_apps_for_mime_types (mime_types, mime_types_length1); #line 36 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - external_apps = _tmp1_; -#line 520 "DesktopIntegration.c" + external_apps = _tmp0_; +#line 627 "DesktopIntegration.c" { GeeArrayList* _preferred_app_list = NULL; - GeeArrayList* _tmp2_; - GeeArrayList* _tmp3_; + GeeArrayList* _tmp1_; gint _preferred_app_size = 0; - GeeArrayList* _tmp4_; - gint _tmp5_; - gint _tmp6_; + GeeArrayList* _tmp2_; + gint _tmp3_; + gint _tmp4_; gint _preferred_app_index = 0; #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp2_ = preferred_apps; -#line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (preferred_apps); #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _preferred_app_list = _tmp3_; + _preferred_app_list = _tmp1_; #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp4_ = _preferred_app_list; + _tmp2_ = _preferred_app_list; #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _preferred_app_size = _tmp6_; + _preferred_app_size = _tmp4_; #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _preferred_app_index = -1; #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" while (TRUE) { -#line 548 "DesktopIntegration.c" +#line 652 "DesktopIntegration.c" + gint _tmp5_; + gint _tmp6_; gint _tmp7_; - gint _tmp8_; - gint _tmp9_; gchar* preferred_app = NULL; - GeeArrayList* _tmp10_; - gint _tmp11_; - gpointer _tmp12_; + GeeArrayList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp7_ = _preferred_app_index; + _tmp5_ = _preferred_app_index; #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _preferred_app_index = _tmp7_ + 1; + _preferred_app_index = _tmp5_ + 1; #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp8_ = _preferred_app_index; + _tmp6_ = _preferred_app_index; #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp9_ = _preferred_app_size; + _tmp7_ = _preferred_app_size; #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (!(_tmp8_ < _tmp9_)) { + if (!(_tmp6_ < _tmp7_)) { #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" break; -#line 568 "DesktopIntegration.c" +#line 672 "DesktopIntegration.c" } #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp10_ = _preferred_app_list; + _tmp8_ = _preferred_app_list; #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp11_ = _preferred_app_index; + _tmp9_ = _preferred_app_index; #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp12_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp11_); + _tmp10_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp9_); #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - preferred_app = (gchar*) _tmp12_; -#line 578 "DesktopIntegration.c" + preferred_app = (gchar*) _tmp10_; +#line 682 "DesktopIntegration.c" { GeeIterator* _external_app_it = NULL; - SortedList* _tmp13_; - GeeIterator* _tmp14_; + SortedList* _tmp11_; + GeeIterator* _tmp12_; #line 39 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp13_ = external_apps; + _tmp11_ = external_apps; #line 39 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); #line 39 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _external_app_it = _tmp14_; + _external_app_it = _tmp12_; #line 39 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" while (TRUE) { -#line 591 "DesktopIntegration.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 695 "DesktopIntegration.c" + GeeIterator* _tmp13_; GAppInfo* external_app = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; - GAppInfo* _tmp19_; - const gchar* _tmp20_; - const gchar* _tmp21_; - gboolean _tmp22_; + GeeIterator* _tmp14_; + gpointer _tmp15_; + GAppInfo* _tmp16_; + const gchar* _tmp17_; + const gchar* _tmp18_; #line 39 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp15_ = _external_app_it; + _tmp13_ = _external_app_it; #line 39 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp16_ = gee_iterator_next (_tmp15_); -#line 39 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp13_)) { #line 39 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" break; -#line 609 "DesktopIntegration.c" +#line 709 "DesktopIntegration.c" } #line 39 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp17_ = _external_app_it; + _tmp14_ = _external_app_it; #line 39 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp15_ = gee_iterator_get (_tmp14_); #line 39 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - external_app = (GAppInfo*) _tmp18_; -#line 40 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp19_ = external_app; + external_app = (GAppInfo*) _tmp15_; #line 40 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp20_ = g_app_info_get_name (_tmp19_); + _tmp16_ = external_app; #line 40 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp21_ = preferred_app; + _tmp17_ = g_app_info_get_name (_tmp16_); #line 40 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp22_ = string_contains (_tmp20_, _tmp21_); + _tmp18_ = preferred_app; #line 40 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (_tmp22_) { + if (string_contains (_tmp17_, _tmp18_)) { #line 41 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" result = external_app; #line 41 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" @@ -635,23 +733,23 @@ GAppInfo* desktop_integration_get_default_app_for_mime_types (gchar** mime_types _g_object_unref0 (external_apps); #line 41 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return result; -#line 639 "DesktopIntegration.c" +#line 737 "DesktopIntegration.c" } #line 39 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (external_app); -#line 643 "DesktopIntegration.c" +#line 741 "DesktopIntegration.c" } #line 39 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (_external_app_it); -#line 647 "DesktopIntegration.c" +#line 745 "DesktopIntegration.c" } #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_free0 (preferred_app); -#line 651 "DesktopIntegration.c" +#line 749 "DesktopIntegration.c" } #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (_preferred_app_list); -#line 655 "DesktopIntegration.c" +#line 753 "DesktopIntegration.c" } #line 45 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" result = NULL; @@ -659,292 +757,276 @@ GAppInfo* desktop_integration_get_default_app_for_mime_types (gchar** mime_types _g_object_unref0 (external_apps); #line 45 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return result; -#line 663 "DesktopIntegration.c" +#line 761 "DesktopIntegration.c" } -gint64 desktop_integration_app_info_comparator (void* a, void* b) { +gint64 +desktop_integration_app_info_comparator (void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; - const gchar* _tmp1_; + const gchar* _tmp0_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; - void* _tmp4_; - const gchar* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - gint _tmp8_; - gint64 _tmp9_; -#line 50 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp0_ = a; -#line 50 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp1_ = g_app_info_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_app_info_get_type (), GAppInfo)); + const gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gint64 _tmp6_; #line 50 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp2_ = g_utf8_strdown (_tmp1_, (gssize) -1); + _tmp0_ = g_app_info_get_name (G_TYPE_CHECK_INSTANCE_CAST (a, g_app_info_get_type (), GAppInfo)); #line 50 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp3_ = _tmp2_; + _tmp1_ = g_utf8_strdown (_tmp0_, (gssize) -1); #line 50 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp4_ = b; + _tmp2_ = _tmp1_; #line 50 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp5_ = g_app_info_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, g_app_info_get_type (), GAppInfo)); + _tmp3_ = g_app_info_get_name (G_TYPE_CHECK_INSTANCE_CAST (b, g_app_info_get_type (), GAppInfo)); #line 50 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp6_ = g_utf8_strdown (_tmp5_, (gssize) -1); + _tmp4_ = g_utf8_strdown (_tmp3_, (gssize) -1); #line 50 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 50 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp8_ = g_utf8_collate (_tmp3_, _tmp7_); + _tmp6_ = (gint64) g_utf8_collate (_tmp2_, _tmp5_); #line 50 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp9_ = (gint64) _tmp8_; + _g_free0 (_tmp5_); #line 50 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp7_); -#line 50 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 50 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - result = _tmp9_; + result = _tmp6_; #line 50 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return result; -#line 707 "DesktopIntegration.c" +#line 799 "DesktopIntegration.c" } -static gint64 _desktop_integration_app_info_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_desktop_integration_app_info_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = desktop_integration_app_info_comparator (a, b); #line 54 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return result; -#line 716 "DesktopIntegration.c" +#line 812 "DesktopIntegration.c" } -static void _g_object_unref0_ (gpointer var) { +static void +_g_object_unref0_ (gpointer var) +{ #line 66 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); -#line 723 "DesktopIntegration.c" +#line 821 "DesktopIntegration.c" } -static void _g_list_free__g_object_unref0_ (GList* self) { +static inline void +_g_list_free__g_object_unref0_ (GList* self) +{ #line 66 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - g_list_foreach (self, (GFunc) _g_object_unref0_, NULL); -#line 66 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - g_list_free (self); -#line 732 "DesktopIntegration.c" + g_list_free_full (self, (GDestroyNotify) _g_object_unref0_); +#line 830 "DesktopIntegration.c" } -SortedList* desktop_integration_get_apps_for_mime_types (gchar** mime_types, int mime_types_length1) { +SortedList* +desktop_integration_get_apps_for_mime_types (gchar** mime_types, + int mime_types_length1) +{ SortedList* result = NULL; SortedList* external_apps = NULL; SortedList* _tmp0_; - gchar** _tmp1_; - gint _tmp1__length1; - gchar** _tmp2_; - gint _tmp2__length1; #line 54 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _tmp0_ = sorted_list_new (g_app_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _desktop_integration_app_info_comparator_comparator, NULL); #line 54 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" external_apps = _tmp0_; #line 56 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp1_ = mime_types; -#line 56 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp1__length1 = mime_types_length1; -#line 56 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (_tmp1__length1 == 0) { + if (mime_types_length1 == 0) { #line 57 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" result = external_apps; #line 57 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return result; -#line 758 "DesktopIntegration.c" +#line 851 "DesktopIntegration.c" } -#line 61 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp2_ = mime_types; -#line 61 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp2__length1 = mime_types_length1; -#line 764 "DesktopIntegration.c" { gchar** mime_type_collection = NULL; gint mime_type_collection_length1 = 0; gint _mime_type_collection_size_ = 0; gint mime_type_it = 0; #line 61 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - mime_type_collection = _tmp2_; + mime_type_collection = mime_types; #line 61 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - mime_type_collection_length1 = _tmp2__length1; + mime_type_collection_length1 = mime_types_length1; #line 61 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - for (mime_type_it = 0; mime_type_it < _tmp2__length1; mime_type_it = mime_type_it + 1) { -#line 776 "DesktopIntegration.c" - gchar* _tmp3_; + for (mime_type_it = 0; mime_type_it < mime_types_length1; mime_type_it = mime_type_it + 1) { +#line 864 "DesktopIntegration.c" + gchar* _tmp1_; gchar* mime_type = NULL; #line 61 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp3_ = g_strdup (mime_type_collection[mime_type_it]); + _tmp1_ = g_strdup (mime_type_collection[mime_type_it]); #line 61 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - mime_type = _tmp3_; -#line 783 "DesktopIntegration.c" + mime_type = _tmp1_; +#line 871 "DesktopIntegration.c" { gchar* content_type = NULL; + const gchar* _tmp2_; + gchar* _tmp3_; const gchar* _tmp4_; - gchar* _tmp5_; - const gchar* _tmp6_; - const gchar* _tmp7_; - GList* _tmp8_; + const gchar* _tmp5_; + GList* _tmp6_; #line 62 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp4_ = mime_type; + _tmp2_ = mime_type; #line 62 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp5_ = g_content_type_from_mime_type (_tmp4_); + _tmp3_ = g_content_type_from_mime_type (_tmp2_); #line 62 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - content_type = _tmp5_; + content_type = _tmp3_; #line 63 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp6_ = content_type; + _tmp4_ = content_type; #line 63 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (_tmp6_ == NULL) { + if (_tmp4_ == NULL) { #line 64 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_free0 (content_type); #line 64 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_free0 (mime_type); #line 64 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" break; -#line 807 "DesktopIntegration.c" +#line 895 "DesktopIntegration.c" } #line 66 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp7_ = content_type; + _tmp5_ = content_type; #line 66 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp8_ = g_app_info_get_all_for_type (_tmp7_); -#line 813 "DesktopIntegration.c" + _tmp6_ = g_app_info_get_all_for_type (_tmp5_); +#line 901 "DesktopIntegration.c" { GList* external_app_collection = NULL; GList* external_app_it = NULL; #line 66 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - external_app_collection = _tmp8_; + external_app_collection = _tmp6_; #line 66 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" for (external_app_it = external_app_collection; external_app_it != NULL; external_app_it = external_app_it->next) { -#line 821 "DesktopIntegration.c" - GAppInfo* _tmp9_; +#line 909 "DesktopIntegration.c" + GAppInfo* _tmp7_; GAppInfo* external_app = NULL; #line 66 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp9_ = _g_object_ref0 ((GAppInfo*) external_app_it->data); + _tmp7_ = _g_object_ref0 ((GAppInfo*) external_app_it->data); #line 66 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - external_app = _tmp9_; -#line 828 "DesktopIntegration.c" + external_app = _tmp7_; +#line 916 "DesktopIntegration.c" { gboolean already_contains = FALSE; - gboolean _tmp20_ = FALSE; - gboolean _tmp21_; + gboolean _tmp17_ = FALSE; + gboolean _tmp18_; #line 68 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" already_contains = FALSE; -#line 835 "DesktopIntegration.c" +#line 923 "DesktopIntegration.c" { GeeIterator* _app_it = NULL; - SortedList* _tmp10_; - GeeIterator* _tmp11_; + SortedList* _tmp8_; + GeeIterator* _tmp9_; #line 70 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp10_ = external_apps; + _tmp8_ = external_apps; #line 70 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); #line 70 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _app_it = _tmp11_; + _app_it = _tmp9_; #line 70 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" while (TRUE) { -#line 848 "DesktopIntegration.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 936 "DesktopIntegration.c" + GeeIterator* _tmp10_; GAppInfo* app = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; - GAppInfo* _tmp16_; - const gchar* _tmp17_; - GAppInfo* _tmp18_; - const gchar* _tmp19_; -#line 70 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp12_ = _app_it; + GeeIterator* _tmp11_; + gpointer _tmp12_; + GAppInfo* _tmp13_; + const gchar* _tmp14_; + GAppInfo* _tmp15_; + const gchar* _tmp16_; #line 70 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp13_ = gee_iterator_next (_tmp12_); + _tmp10_ = _app_it; #line 70 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp10_)) { #line 70 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" break; -#line 866 "DesktopIntegration.c" +#line 951 "DesktopIntegration.c" } #line 70 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp14_ = _app_it; + _tmp11_ = _app_it; #line 70 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 70 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - app = (GAppInfo*) _tmp15_; + app = (GAppInfo*) _tmp12_; #line 71 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp16_ = app; + _tmp13_ = app; #line 71 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp17_ = g_app_info_get_name (_tmp16_); + _tmp14_ = g_app_info_get_name (_tmp13_); #line 71 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp18_ = external_app; + _tmp15_ = external_app; #line 71 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp19_ = g_app_info_get_name (_tmp18_); + _tmp16_ = g_app_info_get_name (_tmp15_); #line 71 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (g_strcmp0 (_tmp17_, _tmp19_) == 0) { + if (g_strcmp0 (_tmp14_, _tmp16_) == 0) { #line 72 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" already_contains = TRUE; #line 73 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (app); #line 73 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" break; -#line 890 "DesktopIntegration.c" +#line 975 "DesktopIntegration.c" } #line 70 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (app); -#line 894 "DesktopIntegration.c" +#line 979 "DesktopIntegration.c" } #line 70 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (_app_it); -#line 898 "DesktopIntegration.c" +#line 983 "DesktopIntegration.c" } #line 78 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp21_ = already_contains; -#line 78 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (!_tmp21_) { -#line 904 "DesktopIntegration.c" - GAppInfo* _tmp22_; - const gchar* _tmp23_; - gboolean _tmp24_; + _tmp18_ = already_contains; #line 78 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp22_ = external_app; + if (!_tmp18_) { +#line 989 "DesktopIntegration.c" + GAppInfo* _tmp19_; + const gchar* _tmp20_; #line 78 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp23_ = g_app_info_get_name (_tmp22_); + _tmp19_ = external_app; #line 78 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp24_ = string_contains (_tmp23_, RESOURCES_APP_TITLE); + _tmp20_ = g_app_info_get_name (_tmp19_); #line 78 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp20_ = !_tmp24_; -#line 916 "DesktopIntegration.c" + _tmp17_ = !string_contains (_tmp20_, RESOURCES_APP_TITLE); +#line 998 "DesktopIntegration.c" } else { #line 78 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp20_ = FALSE; -#line 920 "DesktopIntegration.c" + _tmp17_ = FALSE; +#line 1002 "DesktopIntegration.c" } #line 78 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (_tmp20_) { -#line 924 "DesktopIntegration.c" - SortedList* _tmp25_; - GAppInfo* _tmp26_; + if (_tmp17_) { +#line 1006 "DesktopIntegration.c" + SortedList* _tmp21_; + GAppInfo* _tmp22_; #line 79 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp25_ = external_apps; + _tmp21_ = external_apps; #line 79 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp26_ = external_app; + _tmp22_ = external_app; #line 79 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), _tmp26_); -#line 933 "DesktopIntegration.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), _tmp22_); +#line 1015 "DesktopIntegration.c" } #line 66 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (external_app); -#line 937 "DesktopIntegration.c" +#line 1019 "DesktopIntegration.c" } } #line 66 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" __g_list_free__g_object_unref0_0 (external_app_collection); -#line 942 "DesktopIntegration.c" +#line 1024 "DesktopIntegration.c" } #line 61 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_free0 (content_type); #line 61 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_free0 (mime_type); -#line 948 "DesktopIntegration.c" +#line 1030 "DesktopIntegration.c" } } } @@ -952,64 +1034,62 @@ SortedList* desktop_integration_get_apps_for_mime_types (gchar** mime_types, int result = external_apps; #line 83 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return result; -#line 956 "DesktopIntegration.c" +#line 1038 "DesktopIntegration.c" } -gchar* desktop_integration_get_app_open_command (GAppInfo* app_info) { +gchar* +desktop_integration_get_app_open_command (GAppInfo* app_info) +{ gchar* result = NULL; gchar* str = NULL; - GAppInfo* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_; - gchar* _tmp8_; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_ = NULL; + const gchar* _tmp3_; + gchar* _tmp6_; #line 86 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_return_val_if_fail (G_IS_APP_INFO (app_info), NULL); #line 87 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp0_ = app_info; + _tmp0_ = g_app_info_get_commandline (app_info); #line 87 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp1_ = g_app_info_get_commandline (_tmp0_); + _tmp1_ = g_strdup (_tmp0_); #line 87 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp2_ = g_strdup (_tmp1_); -#line 87 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - str = _tmp2_; + str = _tmp1_; #line 89 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp4_ = str; + _tmp3_ = str; #line 89 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (_tmp4_ != NULL) { -#line 983 "DesktopIntegration.c" - const gchar* _tmp5_; + if (_tmp3_ != NULL) { +#line 1064 "DesktopIntegration.c" + const gchar* _tmp4_; #line 89 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp5_ = str; + _tmp4_ = str; #line 89 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp3_ = _tmp5_; -#line 989 "DesktopIntegration.c" + _tmp2_ = _tmp4_; +#line 1070 "DesktopIntegration.c" } else { - GAppInfo* _tmp6_; - const gchar* _tmp7_; -#line 89 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp6_ = app_info; + const gchar* _tmp5_; #line 89 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp7_ = g_app_info_get_executable (_tmp6_); + _tmp5_ = g_app_info_get_executable (app_info); #line 89 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp3_ = _tmp7_; -#line 999 "DesktopIntegration.c" + _tmp2_ = _tmp5_; +#line 1077 "DesktopIntegration.c" } #line 89 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp8_ = g_strdup (_tmp3_); + _tmp6_ = g_strdup (_tmp2_); #line 89 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - result = _tmp8_; + result = _tmp6_; #line 89 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_free0 (str); #line 89 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return result; -#line 1009 "DesktopIntegration.c" +#line 1087 "DesktopIntegration.c" } -gboolean desktop_integration_is_send_to_installed (void) { +gboolean +desktop_integration_is_send_to_installed (void) +{ gboolean result = FALSE; gboolean _tmp0_; #line 93 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" @@ -1018,210 +1098,189 @@ gboolean desktop_integration_is_send_to_installed (void) { result = _tmp0_; #line 93 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return result; -#line 1022 "DesktopIntegration.c" +#line 1102 "DesktopIntegration.c" } -void desktop_integration_files_send_to (GFile** files, int files_length1) { - GFile** _tmp0_; - gint _tmp0__length1; +void +desktop_integration_files_send_to (GFile** files, + int files_length1) +{ gchar** argv = NULL; - GFile** _tmp1_; - gint _tmp1__length1; - gchar** _tmp2_; + gchar** _tmp0_; gint argv_length1; gint _argv_size_; - gchar** _tmp3_; - gint _tmp3__length1; - gchar* _tmp4_; - gchar* _tmp5_; + gchar** _tmp1_; + gint _tmp1__length1; + gchar* _tmp2_; + gchar* _tmp3_; GError * _inner_error_ = NULL; #line 97 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp0_ = files; -#line 97 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp0__length1 = files_length1; -#line 97 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (_tmp0__length1 == 0) { + if (files_length1 == 0) { #line 98 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 1048 "DesktopIntegration.c" +#line 1123 "DesktopIntegration.c" } #line 100 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp1_ = files; -#line 100 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp1__length1 = files_length1; + _tmp0_ = g_new0 (gchar*, (files_length1 + 1) + 1); #line 100 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp2_ = g_new0 (gchar*, (_tmp1__length1 + 1) + 1); + argv = _tmp0_; #line 100 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - argv = _tmp2_; -#line 100 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - argv_length1 = _tmp1__length1 + 1; + argv_length1 = files_length1 + 1; #line 100 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _argv_size_ = argv_length1; #line 101 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp3_ = argv; + _tmp1_ = argv; #line 101 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp3__length1 = argv_length1; + _tmp1__length1 = argv_length1; #line 101 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp4_ = g_strdup (DESKTOP_INTEGRATION_SENDTO_EXEC); + _tmp2_ = g_strdup (DESKTOP_INTEGRATION_SENDTO_EXEC); #line 101 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp3_[0]); + _g_free0 (_tmp1_[0]); #line 101 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp3_[0] = _tmp4_; + _tmp1_[0] = _tmp2_; #line 101 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp5_ = _tmp3_[0]; -#line 1074 "DesktopIntegration.c" + _tmp3_ = _tmp1_[0]; +#line 1145 "DesktopIntegration.c" { gint ctr = 0; #line 103 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" ctr = 0; -#line 1079 "DesktopIntegration.c" +#line 1150 "DesktopIntegration.c" { - gboolean _tmp6_ = FALSE; + gboolean _tmp4_ = FALSE; #line 103 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp6_ = TRUE; + _tmp4_ = TRUE; #line 103 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" while (TRUE) { -#line 1086 "DesktopIntegration.c" +#line 1157 "DesktopIntegration.c" + gint _tmp6_; + gchar** _tmp7_; + gint _tmp7__length1; gint _tmp8_; - GFile** _tmp9_; - gint _tmp9__length1; - gchar** _tmp10_; - gint _tmp10__length1; - gint _tmp11_; - GFile** _tmp12_; - gint _tmp12__length1; - gint _tmp13_; - GFile* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; + gint _tmp9_; + GFile* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; #line 103 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (!_tmp6_) { -#line 1101 "DesktopIntegration.c" - gint _tmp7_; + if (!_tmp4_) { +#line 1168 "DesktopIntegration.c" + gint _tmp5_; #line 103 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp7_ = ctr; + _tmp5_ = ctr; #line 103 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - ctr = _tmp7_ + 1; -#line 1107 "DesktopIntegration.c" + ctr = _tmp5_ + 1; +#line 1174 "DesktopIntegration.c" } #line 103 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp6_ = FALSE; + _tmp4_ = FALSE; #line 103 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp8_ = ctr; -#line 103 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp9_ = files; -#line 103 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp9__length1 = files_length1; + _tmp6_ = ctr; #line 103 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (!(_tmp8_ < _tmp9__length1)) { + if (!(_tmp6_ < files_length1)) { #line 103 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" break; -#line 1121 "DesktopIntegration.c" +#line 1184 "DesktopIntegration.c" } #line 104 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp10_ = argv; -#line 104 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp10__length1 = argv_length1; -#line 104 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp11_ = ctr; + _tmp7_ = argv; #line 104 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp12_ = files; + _tmp7__length1 = argv_length1; #line 104 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp12__length1 = files_length1; + _tmp8_ = ctr; #line 104 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp13_ = ctr; + _tmp9_ = ctr; #line 104 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp14_ = _tmp12_[_tmp13_]; + _tmp10_ = files[_tmp9_]; #line 104 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp15_ = g_file_get_path (_tmp14_); + _tmp11_ = g_file_get_path (_tmp10_); #line 104 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp10_[_tmp11_ + 1]); + _g_free0 (_tmp7_[_tmp8_ + 1]); #line 104 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp10_[_tmp11_ + 1] = _tmp15_; + _tmp7_[_tmp8_ + 1] = _tmp11_; #line 104 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp16_ = _tmp10_[_tmp11_ + 1]; -#line 1145 "DesktopIntegration.c" + _tmp12_ = _tmp7_[_tmp8_ + 1]; +#line 1204 "DesktopIntegration.c" } } } { + AppWindow* _tmp13_; + AppWindow* _tmp14_; + GPid child_pid = 0; + gchar** _tmp15_; + gint _tmp15__length1; + GPid _tmp16_ = 0; AppWindow* _tmp17_; AppWindow* _tmp18_; - GPid child_pid = 0; - gchar** _tmp19_; - gint _tmp19__length1; - GPid _tmp20_ = 0; - AppWindow* _tmp21_; - AppWindow* _tmp22_; #line 107 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp17_ = app_window_get_instance (); + _tmp13_ = app_window_get_instance (); #line 107 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp18_ = _tmp17_; + _tmp14_ = _tmp13_; #line 107 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PAGE_WINDOW, PageWindow)); #line 107 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp14_); #line 110 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp19_ = argv; + _tmp15_ = argv; #line 110 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp19__length1 = argv_length1; + _tmp15__length1 = argv_length1; #line 110 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - g_spawn_async ("/", _tmp19_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &_tmp20_, &_inner_error_); + g_spawn_async ("/", _tmp15_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &_tmp16_, &_inner_error_); #line 110 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - child_pid = _tmp20_; + child_pid = _tmp16_; #line 110 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1176 "DesktopIntegration.c" +#line 1235 "DesktopIntegration.c" goto __catch577_g_error; } #line 118 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp21_ = app_window_get_instance (); + _tmp17_ = app_window_get_instance (); #line 118 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp22_ = _tmp21_; + _tmp18_ = _tmp17_; #line 118 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PAGE_WINDOW, PageWindow)); #line 118 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_object_unref0 (_tmp22_); -#line 1187 "DesktopIntegration.c" + _g_object_unref0 (_tmp18_); +#line 1246 "DesktopIntegration.c" } goto __finally577; __catch577_g_error: { GError* err = NULL; - AppWindow* _tmp23_; - AppWindow* _tmp24_; - GError* _tmp25_; - const gchar* _tmp26_; - gchar* _tmp27_; - gchar* _tmp28_; + AppWindow* _tmp19_; + AppWindow* _tmp20_; + GError* _tmp21_; + const gchar* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" err = _inner_error_; #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _inner_error_ = NULL; #line 120 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp23_ = app_window_get_instance (); + _tmp19_ = app_window_get_instance (); #line 120 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp24_ = _tmp23_; + _tmp20_ = _tmp19_; #line 120 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PAGE_WINDOW, PageWindow)); #line 120 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp20_); #line 121 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp25_ = err; + _tmp21_ = err; #line 121 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp26_ = _tmp25_->message; + _tmp22_ = _tmp21_->message; #line 121 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp27_ = g_strdup_printf (_ ("Unable to launch Nautilus Send-To: %s"), _tmp26_); + _tmp23_ = g_strdup_printf (_ ("Unable to launch Nautilus Send-To: %s"), _tmp22_); #line 121 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp28_ = _tmp27_; + _tmp24_ = _tmp23_; #line 121 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - app_window_error_message (_tmp28_, NULL); + app_window_error_message (_tmp24_, NULL); #line 121 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp28_); + _g_free0 (_tmp24_); #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_error_free0 (err); -#line 1225 "DesktopIntegration.c" +#line 1284 "DesktopIntegration.c" } __finally577: #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" @@ -1234,334 +1293,308 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) { g_clear_error (&_inner_error_); #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 1238 "DesktopIntegration.c" +#line 1297 "DesktopIntegration.c" } #line 96 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL); -#line 1242 "DesktopIntegration.c" +#line 1301 "DesktopIntegration.c" } -static void _desktop_integration_on_send_to_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) { +static void +_desktop_integration_on_send_to_export_completed_exporter_completion_callback (Exporter* exporter, + gboolean is_cancelled, + gpointer self) +{ #line 135 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" desktop_integration_on_send_to_export_completed (exporter, is_cancelled); -#line 1249 "DesktopIntegration.c" +#line 1312 "DesktopIntegration.c" } -void desktop_integration_send_to (GeeCollection* media) { +void +desktop_integration_send_to (GeeCollection* media) +{ gboolean _tmp0_ = FALSE; - GeeCollection* _tmp1_; + gint _tmp1_; gint _tmp2_; - gint _tmp3_; ExportDialog* dialog = NULL; - ExportDialog* _tmp5_; - gboolean _tmp6_ = FALSE; - GeeCollection* _tmp7_; - gboolean _tmp8_; + ExportDialog* _tmp4_; + gboolean _tmp5_ = FALSE; gint scale = 0; ScaleConstraint constraint = 0; ExportFormatParameters export_params = {0}; - ExportFormatParameters _tmp13_ = {0}; - ExportDialog* _tmp14_; - gint _tmp15_ = 0; - ScaleConstraint _tmp16_ = 0; - gboolean _tmp17_; - GeeCollection* _tmp18_; - ScaleConstraint _tmp19_; - gint _tmp20_; - Scaling _tmp21_ = {0}; - ExportFormatParameters _tmp22_; - Exporter* _tmp23_; - Exporter* _tmp24_; - ExporterUI* _tmp25_; - ExporterUI* _tmp26_; + ExportFormatParameters _tmp7_ = {0}; + ExportDialog* _tmp8_; + gint _tmp9_ = 0; + ScaleConstraint _tmp10_ = 0; + gboolean _tmp11_; + ScaleConstraint _tmp12_; + gint _tmp13_; + Scaling _tmp14_ = {0}; + ExportFormatParameters _tmp15_; + Exporter* _tmp16_; + Exporter* _tmp17_; + ExporterUI* _tmp18_; + ExporterUI* _tmp19_; #line 125 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); #line 126 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp1_ = media; + _tmp1_ = gee_collection_get_size (media); #line 126 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp2_ = gee_collection_get_size (_tmp1_); -#line 126 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 126 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (_tmp3_ == 0) { + if (_tmp2_ == 0) { #line 126 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _tmp0_ = TRUE; -#line 1292 "DesktopIntegration.c" +#line 1351 "DesktopIntegration.c" } else { - ExporterUI* _tmp4_; + ExporterUI* _tmp3_; #line 126 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp4_ = desktop_integration_send_to_exporter; + _tmp3_ = desktop_integration_send_to_exporter; #line 126 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp0_ = _tmp4_ != NULL; -#line 1299 "DesktopIntegration.c" + _tmp0_ = _tmp3_ != NULL; +#line 1358 "DesktopIntegration.c" } #line 126 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (_tmp0_) { #line 127 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 1305 "DesktopIntegration.c" +#line 1364 "DesktopIntegration.c" } #line 129 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp5_ = export_dialog_new (_ ("Send To")); + _tmp4_ = export_dialog_new (_ ("Send To")); #line 129 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - g_object_ref_sink (_tmp5_); + g_object_ref_sink (_tmp4_); #line 129 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - dialog = _tmp5_; -#line 134 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp7_ = media; + dialog = _tmp4_; #line 134 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp8_ = media_source_collection_has_video (_tmp7_); + if (media_source_collection_has_video (media)) { #line 134 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (_tmp8_) { -#line 1319 "DesktopIntegration.c" - GeeCollection* _tmp9_; - gboolean _tmp10_; -#line 134 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp9_ = media; -#line 134 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp10_ = media_source_collection_has_photo (_tmp9_); -#line 134 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp6_ = !_tmp10_; -#line 1328 "DesktopIntegration.c" + _tmp5_ = !media_source_collection_has_photo (media); +#line 1376 "DesktopIntegration.c" } else { #line 134 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp6_ = FALSE; -#line 1332 "DesktopIntegration.c" + _tmp5_ = FALSE; +#line 1380 "DesktopIntegration.c" } #line 134 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (_tmp6_) { -#line 1336 "DesktopIntegration.c" - GeeCollection* _tmp11_; - ExporterUI* _tmp12_; + if (_tmp5_) { +#line 1384 "DesktopIntegration.c" + ExporterUI* _tmp6_; #line 135 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp11_ = media; -#line 135 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp12_ = video_export_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection), _desktop_integration_on_send_to_export_completed_exporter_completion_callback, NULL, TRUE); + _tmp6_ = video_export_many (G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_COLLECTION, GeeCollection), _desktop_integration_on_send_to_export_completed_exporter_completion_callback, NULL, TRUE); #line 135 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _exporter_ui_unref0 (desktop_integration_send_to_exporter); #line 135 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - desktop_integration_send_to_exporter = _tmp12_; + desktop_integration_send_to_exporter = _tmp6_; #line 137 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (dialog); #line 137 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 1351 "DesktopIntegration.c" +#line 1396 "DesktopIntegration.c" } #line 142 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - export_format_parameters_current (&_tmp13_); + export_format_parameters_current (&_tmp7_); #line 142 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - export_params = _tmp13_; + export_params = _tmp7_; #line 143 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp14_ = dialog; + _tmp8_ = dialog; #line 143 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp17_ = export_dialog_execute (_tmp14_, &_tmp15_, &_tmp16_, &export_params); + _tmp11_ = export_dialog_execute (_tmp8_, &_tmp9_, &_tmp10_, &export_params); #line 143 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - scale = _tmp15_; + scale = _tmp9_; #line 143 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - constraint = _tmp16_; + constraint = _tmp10_; #line 143 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (!_tmp17_) { + if (!_tmp11_) { #line 144 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (dialog); #line 144 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 1371 "DesktopIntegration.c" +#line 1416 "DesktopIntegration.c" } #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp18_ = media; -#line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp19_ = constraint; + _tmp12_ = constraint; #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp20_ = scale; + _tmp13_ = scale; #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - scaling_for_constraint (_tmp19_, _tmp20_, FALSE, &_tmp21_); + scaling_for_constraint (_tmp12_, _tmp13_, FALSE, &_tmp14_); #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp22_ = export_params; + _tmp15_ = export_params; #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp23_ = exporter_new_for_temp_file (_tmp18_, &_tmp21_, &_tmp22_); + _tmp16_ = exporter_new_for_temp_file (media, &_tmp14_, &_tmp15_); #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp24_ = _tmp23_; + _tmp17_ = _tmp16_; #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp25_ = exporter_ui_new (_tmp24_); + _tmp18_ = exporter_ui_new (_tmp17_); #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _exporter_ui_unref0 (desktop_integration_send_to_exporter); #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - desktop_integration_send_to_exporter = _tmp25_; + desktop_integration_send_to_exporter = _tmp18_; #line 146 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp17_); #line 148 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp26_ = desktop_integration_send_to_exporter; + _tmp19_ = desktop_integration_send_to_exporter; #line 148 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - exporter_ui_export (_tmp26_, _desktop_integration_on_send_to_export_completed_exporter_completion_callback, NULL); + exporter_ui_export (_tmp19_, _desktop_integration_on_send_to_export_completed_exporter_completion_callback, NULL); #line 125 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (dialog); -#line 1401 "DesktopIntegration.c" +#line 1444 "DesktopIntegration.c" } -void desktop_integration_on_send_to_export_completed (Exporter* exporter, gboolean is_cancelled) { - gboolean _tmp0_; +void +desktop_integration_on_send_to_export_completed (Exporter* exporter, + gboolean is_cancelled) +{ #line 151 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_return_if_fail (IS_EXPORTER (exporter)); #line 152 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp0_ = is_cancelled; -#line 152 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (!_tmp0_) { -#line 1413 "DesktopIntegration.c" - Exporter* _tmp1_; - gint _tmp2_; - GFile** _tmp3_; - GFile** _tmp4_; - gint _tmp4__length1; + if (!is_cancelled) { +#line 1456 "DesktopIntegration.c" + gint _tmp0_; + GFile** _tmp1_; + GFile** _tmp2_; + gint _tmp2__length1; #line 153 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp1_ = exporter; + _tmp1_ = exporter_get_exported_files (exporter, &_tmp0_); #line 153 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp3_ = exporter_get_exported_files (_tmp1_, &_tmp2_); + _tmp2_ = _tmp1_; #line 153 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp4_ = _tmp3_; + _tmp2__length1 = _tmp0_; #line 153 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp4__length1 = _tmp2_; + desktop_integration_files_send_to (_tmp2_, _tmp0_); #line 153 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - desktop_integration_files_send_to (_tmp4_, _tmp2_); -#line 153 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp4_ = (_vala_array_free (_tmp4_, _tmp4__length1, (GDestroyNotify) g_object_unref), NULL); -#line 1431 "DesktopIntegration.c" + _tmp2_ = (_vala_array_free (_tmp2_, _tmp2__length1, (GDestroyNotify) g_object_unref), NULL); +#line 1471 "DesktopIntegration.c" } #line 155 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _exporter_ui_unref0 (desktop_integration_send_to_exporter); #line 155 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" desktop_integration_send_to_exporter = NULL; -#line 1437 "DesktopIntegration.c" +#line 1477 "DesktopIntegration.c" } -void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolean screensaver) { +void +desktop_integration_set_background (Photo* photo, + gboolean desktop, + gboolean screensaver) +{ PhotoFileFormat file_format = 0; - Photo* _tmp0_; - PhotoFileFormat _tmp1_; GFile* save_as = NULL; - GFile* _tmp2_; - GFile* _tmp3_; - PhotoFileFormat _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - GFile* _tmp7_; - GFile* _tmp8_; - ConfigFacade* _tmp9_; - ConfigFacade* _tmp10_; - gchar* _tmp11_; + GFile* _tmp0_; + GFile* _tmp1_; + PhotoFileFormat _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; + ConfigFacade* _tmp7_; + ConfigFacade* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + GFile* _tmp11_; gchar* _tmp12_; - GFile* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; - gboolean _tmp16_; - gboolean _tmp34_; - gboolean _tmp40_; - GFile* _tmp46_; - gchar* _tmp47_; - gchar* _tmp48_; + gchar* _tmp13_; + gboolean _tmp14_; + GFile* _tmp41_; + gchar* _tmp42_; + gchar* _tmp43_; GError * _inner_error_ = NULL; #line 158 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_return_if_fail (IS_PHOTO (photo)); #line 161 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp0_ = photo; -#line 161 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp1_ = photo_get_best_export_file_format (_tmp0_); -#line 161 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - file_format = _tmp1_; + file_format = photo_get_best_export_file_format (photo); #line 163 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp2_ = app_dirs_get_data_subdir ("wallpaper", NULL); + _tmp0_ = app_dirs_get_data_subdir ("wallpaper", NULL); #line 163 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 163 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp4_ = file_format; + _tmp2_ = file_format; #line 163 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp5_ = photo_file_format_get_default_basename (_tmp4_, "wallpaper"); + _tmp3_ = photo_file_format_get_default_basename (_tmp2_, "wallpaper"); #line 163 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 163 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp7_ = g_file_get_child (_tmp3_, _tmp6_); + _tmp5_ = g_file_get_child (_tmp1_, _tmp4_); #line 163 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 163 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp4_); #line 163 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 163 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - save_as = _tmp8_; + save_as = _tmp6_; #line 166 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp9_ = config_facade_get_instance (); + _tmp7_ = config_facade_get_instance (); #line 166 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 166 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp11_ = configuration_facade_get_desktop_background (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp9_ = configuration_facade_get_desktop_background (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 166 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 166 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp13_ = save_as; + _tmp11_ = save_as; #line 166 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp14_ = g_file_get_path (_tmp13_); + _tmp12_ = g_file_get_path (_tmp11_); #line 166 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp15_ = _tmp14_; + _tmp13_ = _tmp12_; #line 166 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp16_ = g_strcmp0 (_tmp12_, _tmp15_) == 0; + _tmp14_ = g_strcmp0 (_tmp10_, _tmp13_) == 0; #line 166 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp13_); #line 166 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp10_); #line 166 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 166 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (_tmp16_) { -#line 1519 "DesktopIntegration.c" - GFile* _tmp17_; - GFile* _tmp18_; - PhotoFileFormat _tmp19_; - gchar* _tmp20_; - gchar* _tmp21_; - GFile* _tmp22_; + if (_tmp14_) { +#line 1555 "DesktopIntegration.c" + GFile* _tmp15_; + GFile* _tmp16_; + PhotoFileFormat _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + GFile* _tmp20_; #line 167 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp17_ = app_dirs_get_data_subdir ("wallpaper", NULL); + _tmp15_ = app_dirs_get_data_subdir ("wallpaper", NULL); #line 167 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp18_ = _tmp17_; + _tmp16_ = _tmp15_; #line 167 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp19_ = file_format; + _tmp17_ = file_format; #line 167 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp20_ = photo_file_format_get_default_basename (_tmp19_, "wallpaper_alt"); + _tmp18_ = photo_file_format_get_default_basename (_tmp17_, "wallpaper_alt"); #line 167 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp21_ = _tmp20_; + _tmp19_ = _tmp18_; #line 167 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp22_ = g_file_get_child (_tmp18_, _tmp21_); + _tmp20_ = g_file_get_child (_tmp16_, _tmp19_); #line 167 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (save_as); #line 167 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - save_as = _tmp22_; + save_as = _tmp20_; #line 167 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp21_); + _g_free0 (_tmp19_); #line 167 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_object_unref0 (_tmp18_); -#line 1546 "DesktopIntegration.c" + _g_object_unref0 (_tmp16_); +#line 1582 "DesktopIntegration.c" } { - Photo* _tmp23_; - GFile* _tmp24_; - Scaling _tmp25_ = {0}; - PhotoFileFormat _tmp26_; + GFile* _tmp21_; + Scaling _tmp22_ = {0}; + PhotoFileFormat _tmp23_; #line 172 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp23_ = photo; + _tmp21_ = save_as; #line 172 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp24_ = save_as; + scaling_for_original (&_tmp22_); #line 172 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - scaling_for_original (&_tmp25_); + _tmp23_ = file_format; #line 172 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp26_ = file_format; -#line 172 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - photo_export (_tmp23_, _tmp24_, &_tmp25_, JPEG_QUALITY_HIGH, _tmp26_, FALSE, TRUE, &_inner_error_); + photo_export (photo, _tmp21_, &_tmp22_, JPEG_QUALITY_HIGH, _tmp23_, FALSE, TRUE, &_inner_error_); #line 172 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1565 "DesktopIntegration.c" +#line 1598 "DesktopIntegration.c" goto __catch578_g_error; } } @@ -1569,44 +1602,44 @@ void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolea __catch578_g_error: { GError* err = NULL; - GFile* _tmp27_; - gchar* _tmp28_; + GFile* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; + GError* _tmp27_; + const gchar* _tmp28_; gchar* _tmp29_; - GError* _tmp30_; - const gchar* _tmp31_; - gchar* _tmp32_; - gchar* _tmp33_; + gchar* _tmp30_; #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" err = _inner_error_; #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _inner_error_ = NULL; #line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp27_ = save_as; + _tmp24_ = save_as; #line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp28_ = g_file_get_path (_tmp27_); + _tmp25_ = g_file_get_path (_tmp24_); #line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp29_ = _tmp28_; + _tmp26_ = _tmp25_; #line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp30_ = err; + _tmp27_ = err; #line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp31_ = _tmp30_->message; + _tmp28_ = _tmp27_->message; #line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp32_ = g_strdup_printf (_ ("Unable to export background to %s: %s"), _tmp29_, _tmp31_); + _tmp29_ = g_strdup_printf (_ ("Unable to export background to %s: %s"), _tmp26_, _tmp28_); #line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp33_ = _tmp32_; + _tmp30_ = _tmp29_; #line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - app_window_error_message (_tmp33_, NULL); + app_window_error_message (_tmp30_, NULL); #line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp33_); + _g_free0 (_tmp30_); #line 174 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp29_); + _g_free0 (_tmp26_); #line 177 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_error_free0 (err); #line 177 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (save_as); #line 177 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 1610 "DesktopIntegration.c" +#line 1643 "DesktopIntegration.c" } __finally578: #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" @@ -1619,157 +1652,150 @@ void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolea g_clear_error (&_inner_error_); #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 1623 "DesktopIntegration.c" +#line 1656 "DesktopIntegration.c" } #line 180 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp34_ = desktop; -#line 180 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (_tmp34_) { -#line 1629 "DesktopIntegration.c" - ConfigFacade* _tmp35_; - ConfigFacade* _tmp36_; - GFile* _tmp37_; - gchar* _tmp38_; - gchar* _tmp39_; + if (desktop) { +#line 1660 "DesktopIntegration.c" + ConfigFacade* _tmp31_; + ConfigFacade* _tmp32_; + GFile* _tmp33_; + gchar* _tmp34_; + gchar* _tmp35_; #line 181 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp35_ = config_facade_get_instance (); + _tmp31_ = config_facade_get_instance (); #line 181 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp36_ = _tmp35_; + _tmp32_ = _tmp31_; #line 181 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp37_ = save_as; + _tmp33_ = save_as; #line 181 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp38_ = g_file_get_path (_tmp37_); + _tmp34_ = g_file_get_path (_tmp33_); #line 181 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp39_ = _tmp38_; + _tmp35_ = _tmp34_; #line 181 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - configuration_facade_set_desktop_background (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp39_); + configuration_facade_set_desktop_background (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp35_); #line 181 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp39_); + _g_free0 (_tmp35_); #line 181 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_object_unref0 (_tmp36_); -#line 1651 "DesktopIntegration.c" + _g_object_unref0 (_tmp32_); +#line 1682 "DesktopIntegration.c" } #line 183 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp40_ = screensaver; -#line 183 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (_tmp40_) { -#line 1657 "DesktopIntegration.c" - ConfigFacade* _tmp41_; - ConfigFacade* _tmp42_; - GFile* _tmp43_; - gchar* _tmp44_; - gchar* _tmp45_; + if (screensaver) { +#line 1686 "DesktopIntegration.c" + ConfigFacade* _tmp36_; + ConfigFacade* _tmp37_; + GFile* _tmp38_; + gchar* _tmp39_; + gchar* _tmp40_; #line 184 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp41_ = config_facade_get_instance (); + _tmp36_ = config_facade_get_instance (); #line 184 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp42_ = _tmp41_; + _tmp37_ = _tmp36_; #line 184 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp43_ = save_as; + _tmp38_ = save_as; #line 184 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp44_ = g_file_get_path (_tmp43_); + _tmp39_ = g_file_get_path (_tmp38_); #line 184 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp45_ = _tmp44_; + _tmp40_ = _tmp39_; #line 184 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - configuration_facade_set_screensaver (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp45_); + configuration_facade_set_screensaver (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp40_); #line 184 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp45_); + _g_free0 (_tmp40_); #line 184 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_object_unref0 (_tmp42_); -#line 1679 "DesktopIntegration.c" + _g_object_unref0 (_tmp37_); +#line 1708 "DesktopIntegration.c" } #line 187 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp46_ = save_as; + _tmp41_ = save_as; #line 187 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp47_ = g_file_get_parse_name (_tmp46_); + _tmp42_ = g_file_get_parse_name (_tmp41_); #line 187 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp48_ = _tmp47_; + _tmp43_ = _tmp42_; #line 187 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - g_chmod (_tmp48_, 0644); + g_chmod (_tmp43_, 0644); #line 187 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp48_); + _g_free0 (_tmp43_); #line 158 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (save_as); -#line 1693 "DesktopIntegration.c" +#line 1722 "DesktopIntegration.c" } -DesktopIntegrationBackgroundSlideshowXMLBuilder* desktop_integration_background_slideshow_xml_builder_construct (GType object_type, GFile* destination, gdouble duration, gdouble transition) { +DesktopIntegrationBackgroundSlideshowXMLBuilder* +desktop_integration_background_slideshow_xml_builder_construct (GType object_type, + GFile* destination, + gdouble duration, + gdouble transition) +{ DesktopIntegrationBackgroundSlideshowXMLBuilder* self = NULL; GFile* _tmp0_; GFile* _tmp1_; - gdouble _tmp2_; - gdouble _tmp3_; - GFile* _tmp4_; - GFile* _tmp5_; - GFile* _tmp6_; + GFile* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; GFile* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; - GFile* _tmp12_; #line 202 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_return_val_if_fail (G_IS_FILE (destination), NULL); #line 202 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" self = (DesktopIntegrationBackgroundSlideshowXMLBuilder*) g_type_create_instance (object_type); #line 203 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp0_ = destination; -#line 203 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (destination); #line 203 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (self->priv->destination); #line 203 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - self->priv->destination = _tmp1_; -#line 204 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp2_ = duration; + self->priv->destination = _tmp0_; #line 204 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - self->priv->duration = _tmp2_; + self->priv->duration = duration; #line 205 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp3_ = transition; -#line 205 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - self->priv->transition = _tmp3_; -#line 207 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp4_ = destination; + self->priv->transition = transition; #line 207 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp5_ = g_file_get_parent (_tmp4_); + _tmp1_ = g_file_get_parent (destination); #line 207 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp6_ = _tmp5_; -#line 207 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp7_ = destination; + _tmp2_ = _tmp1_; #line 207 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp8_ = g_file_get_basename (_tmp7_); + _tmp3_ = g_file_get_basename (destination); #line 207 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp9_ = _tmp8_; + _tmp4_ = _tmp3_; #line 207 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp10_ = g_strconcat (_tmp9_, ".tmp", NULL); + _tmp5_ = g_strconcat (_tmp4_, ".tmp", NULL); #line 207 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp11_ = _tmp10_; + _tmp6_ = _tmp5_; #line 207 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp12_ = g_file_get_child (_tmp6_, _tmp11_); + _tmp7_ = g_file_get_child (_tmp2_, _tmp6_); #line 207 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (self->priv->tmp_file); #line 207 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - self->priv->tmp_file = _tmp12_; + self->priv->tmp_file = _tmp7_; #line 207 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp6_); #line 207 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp4_); #line 207 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp2_); #line 202 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return self; -#line 1762 "DesktopIntegration.c" +#line 1781 "DesktopIntegration.c" } -DesktopIntegrationBackgroundSlideshowXMLBuilder* desktop_integration_background_slideshow_xml_builder_new (GFile* destination, gdouble duration, gdouble transition) { +DesktopIntegrationBackgroundSlideshowXMLBuilder* +desktop_integration_background_slideshow_xml_builder_new (GFile* destination, + gdouble duration, + gdouble transition) +{ #line 202 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return desktop_integration_background_slideshow_xml_builder_construct (DESKTOP_INTEGRATION_TYPE_BACKGROUND_SLIDESHOW_XML_BUILDER, destination, duration, transition); -#line 1769 "DesktopIntegration.c" +#line 1792 "DesktopIntegration.c" } -void desktop_integration_background_slideshow_xml_builder_open (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, GError** error) { +void +desktop_integration_background_slideshow_xml_builder_open (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, + GError** error) +{ GFileOutputStream* _tmp0_ = NULL; GFile* _tmp1_; GFileOutputStream* _tmp2_; @@ -1790,7 +1816,7 @@ void desktop_integration_background_slideshow_xml_builder_open (DesktopIntegrati g_propagate_error (error, _inner_error_); #line 211 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 1794 "DesktopIntegration.c" +#line 1820 "DesktopIntegration.c" } #line 211 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _tmp3_ = g_data_output_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_output_stream_get_type (), GOutputStream)); @@ -1810,37 +1836,40 @@ void desktop_integration_background_slideshow_xml_builder_open (DesktopIntegrati _g_object_unref0 (_tmp0_); #line 212 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 1814 "DesktopIntegration.c" +#line 1840 "DesktopIntegration.c" } #line 210 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (_tmp0_); -#line 1818 "DesktopIntegration.c" +#line 1844 "DesktopIntegration.c" } -static void desktop_integration_background_slideshow_xml_builder_write_transition (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, GFile* from, GFile* to, GError** error) { +static void +desktop_integration_background_slideshow_xml_builder_write_transition (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, + GFile* from, + GFile* to, + GError** error) +{ GDataOutputStream* _tmp0_; GDataOutputStream* _tmp1_; gdouble _tmp2_; gchar* _tmp3_; gchar* _tmp4_; GDataOutputStream* _tmp5_; - GFile* _tmp6_; + gchar* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; gchar* _tmp9_; gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; - GDataOutputStream* _tmp13_; - GFile* _tmp14_; + GDataOutputStream* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; gchar* _tmp15_; gchar* _tmp16_; gchar* _tmp17_; gchar* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; - GDataOutputStream* _tmp21_; + GDataOutputStream* _tmp19_; GError * _inner_error_ = NULL; #line 215 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_return_if_fail (DESKTOP_INTEGRATION_IS_BACKGROUND_SLIDESHOW_XML_BUILDER (self)); @@ -1858,7 +1887,7 @@ static void desktop_integration_background_slideshow_xml_builder_write_transitio g_propagate_error (error, _inner_error_); #line 216 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 1862 "DesktopIntegration.c" +#line 1891 "DesktopIntegration.c" } #line 217 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _tmp1_ = self->priv->outs; @@ -1878,102 +1907,101 @@ static void desktop_integration_background_slideshow_xml_builder_write_transitio g_propagate_error (error, _inner_error_); #line 217 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 1882 "DesktopIntegration.c" +#line 1911 "DesktopIntegration.c" } #line 218 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _tmp5_ = self->priv->outs; #line 218 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp6_ = from; + _tmp6_ = g_file_get_path (from); #line 218 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp7_ = g_file_get_path (_tmp6_); -#line 218 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 218 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp9_ = g_markup_escape_text (_tmp8_, (gssize) -1); + _tmp8_ = g_markup_escape_text (_tmp7_, (gssize) -1); #line 218 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 218 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp11_ = g_strdup_printf (" %s\n", _tmp10_); + _tmp10_ = g_strdup_printf (" %s\n", _tmp9_); #line 218 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 218 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - g_data_output_stream_put_string (_tmp5_, _tmp12_, NULL, &_inner_error_); + g_data_output_stream_put_string (_tmp5_, _tmp11_, NULL, &_inner_error_); #line 218 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp11_); #line 218 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp9_); #line 218 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp7_); #line 218 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 218 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_propagate_error (error, _inner_error_); #line 218 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 1914 "DesktopIntegration.c" +#line 1941 "DesktopIntegration.c" } #line 219 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp13_ = self->priv->outs; + _tmp12_ = self->priv->outs; #line 219 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp14_ = to; + _tmp13_ = g_file_get_path (to); #line 219 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp15_ = g_file_get_path (_tmp14_); + _tmp14_ = _tmp13_; +#line 219 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" + _tmp15_ = g_markup_escape_text (_tmp14_, (gssize) -1); #line 219 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _tmp16_ = _tmp15_; #line 219 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp17_ = g_markup_escape_text (_tmp16_, (gssize) -1); + _tmp17_ = g_strdup_printf (" %s\n", _tmp16_); #line 219 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _tmp18_ = _tmp17_; #line 219 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp19_ = g_strdup_printf (" %s\n", _tmp18_); -#line 219 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp20_ = _tmp19_; -#line 219 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - g_data_output_stream_put_string (_tmp13_, _tmp20_, NULL, &_inner_error_); -#line 219 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp20_); + g_data_output_stream_put_string (_tmp12_, _tmp18_, NULL, &_inner_error_); #line 219 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_free0 (_tmp18_); #line 219 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_free0 (_tmp16_); +#line 219 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" + _g_free0 (_tmp14_); #line 219 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 219 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_propagate_error (error, _inner_error_); #line 219 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 1946 "DesktopIntegration.c" +#line 1971 "DesktopIntegration.c" } #line 220 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp21_ = self->priv->outs; + _tmp19_ = self->priv->outs; #line 220 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - g_data_output_stream_put_string (_tmp21_, " \n", NULL, &_inner_error_); + g_data_output_stream_put_string (_tmp19_, " \n", NULL, &_inner_error_); #line 220 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 220 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_propagate_error (error, _inner_error_); #line 220 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 1958 "DesktopIntegration.c" +#line 1983 "DesktopIntegration.c" } } -static void desktop_integration_background_slideshow_xml_builder_write_static (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, GFile* file, GError** error) { +static void +desktop_integration_background_slideshow_xml_builder_write_static (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, + GFile* file, + GError** error) +{ GDataOutputStream* _tmp0_; GDataOutputStream* _tmp1_; gdouble _tmp2_; gchar* _tmp3_; gchar* _tmp4_; GDataOutputStream* _tmp5_; - GFile* _tmp6_; + gchar* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; gchar* _tmp9_; gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; - GDataOutputStream* _tmp13_; + GDataOutputStream* _tmp12_; GError * _inner_error_ = NULL; #line 223 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_return_if_fail (DESKTOP_INTEGRATION_IS_BACKGROUND_SLIDESHOW_XML_BUILDER (self)); @@ -1989,7 +2017,7 @@ static void desktop_integration_background_slideshow_xml_builder_write_static (D g_propagate_error (error, _inner_error_); #line 224 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 1993 "DesktopIntegration.c" +#line 2021 "DesktopIntegration.c" } #line 225 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _tmp1_ = self->priv->outs; @@ -2009,62 +2037,62 @@ static void desktop_integration_background_slideshow_xml_builder_write_static (D g_propagate_error (error, _inner_error_); #line 225 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 2013 "DesktopIntegration.c" +#line 2041 "DesktopIntegration.c" } #line 226 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _tmp5_ = self->priv->outs; #line 226 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp6_ = file; + _tmp6_ = g_file_get_path (file); #line 226 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp7_ = g_file_get_path (_tmp6_); -#line 226 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 226 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp9_ = g_markup_escape_text (_tmp8_, (gssize) -1); + _tmp8_ = g_markup_escape_text (_tmp7_, (gssize) -1); #line 226 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 226 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp11_ = g_strdup_printf (" %s\n", _tmp10_); + _tmp10_ = g_strdup_printf (" %s\n", _tmp9_); #line 226 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 226 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - g_data_output_stream_put_string (_tmp5_, _tmp12_, NULL, &_inner_error_); + g_data_output_stream_put_string (_tmp5_, _tmp11_, NULL, &_inner_error_); #line 226 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp11_); #line 226 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp9_); #line 226 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp7_); #line 226 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 226 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_propagate_error (error, _inner_error_); #line 226 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 2045 "DesktopIntegration.c" +#line 2071 "DesktopIntegration.c" } #line 227 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp13_ = self->priv->outs; + _tmp12_ = self->priv->outs; #line 227 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - g_data_output_stream_put_string (_tmp13_, " \n", NULL, &_inner_error_); + g_data_output_stream_put_string (_tmp12_, " \n", NULL, &_inner_error_); #line 227 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 227 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_propagate_error (error, _inner_error_); #line 227 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 2057 "DesktopIntegration.c" +#line 2083 "DesktopIntegration.c" } } -void desktop_integration_background_slideshow_xml_builder_add_photo (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, GFile* file, GError** error) { +void +desktop_integration_background_slideshow_xml_builder_add_photo (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, + GFile* file, + GError** error) +{ GDataOutputStream* _tmp0_; GFile* _tmp1_; - GFile* _tmp4_; - GFile* _tmp7_; - GFile* _tmp8_; - GFile* _tmp9_; + GFile* _tmp3_; + GFile* _tmp5_; GError * _inner_error_ = NULL; #line 230 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_return_if_fail (DESKTOP_INTEGRATION_IS_BACKGROUND_SLIDESHOW_XML_BUILDER (self)); @@ -2078,66 +2106,59 @@ void desktop_integration_background_slideshow_xml_builder_add_photo (DesktopInte _tmp1_ = self->priv->first_file; #line 233 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (_tmp1_ == NULL) { -#line 2082 "DesktopIntegration.c" +#line 2110 "DesktopIntegration.c" GFile* _tmp2_; - GFile* _tmp3_; #line 234 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp2_ = file; -#line 234 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp2_ = _g_object_ref0 (file); #line 234 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (self->priv->first_file); #line 234 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - self->priv->first_file = _tmp3_; -#line 2093 "DesktopIntegration.c" + self->priv->first_file = _tmp2_; +#line 2118 "DesktopIntegration.c" } #line 236 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp4_ = self->priv->last_file; + _tmp3_ = self->priv->last_file; #line 236 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (_tmp4_ != NULL) { -#line 2099 "DesktopIntegration.c" - GFile* _tmp5_; - GFile* _tmp6_; -#line 237 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp5_ = self->priv->last_file; + if (_tmp3_ != NULL) { +#line 2124 "DesktopIntegration.c" + GFile* _tmp4_; #line 237 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp6_ = file; + _tmp4_ = self->priv->last_file; #line 237 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - desktop_integration_background_slideshow_xml_builder_write_transition (self, _tmp5_, _tmp6_, &_inner_error_); + desktop_integration_background_slideshow_xml_builder_write_transition (self, _tmp4_, file, &_inner_error_); #line 237 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 237 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_propagate_error (error, _inner_error_); #line 237 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 2114 "DesktopIntegration.c" +#line 2136 "DesktopIntegration.c" } } #line 239 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp7_ = file; -#line 239 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - desktop_integration_background_slideshow_xml_builder_write_static (self, _tmp7_, &_inner_error_); + desktop_integration_background_slideshow_xml_builder_write_static (self, file, &_inner_error_); #line 239 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 239 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_propagate_error (error, _inner_error_); #line 239 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 2127 "DesktopIntegration.c" +#line 2147 "DesktopIntegration.c" } #line 241 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp8_ = file; -#line 241 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp9_ = _g_object_ref0 (_tmp8_); + _tmp5_ = _g_object_ref0 (file); #line 241 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (self->priv->last_file); #line 241 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - self->priv->last_file = _tmp9_; -#line 2137 "DesktopIntegration.c" + self->priv->last_file = _tmp5_; +#line 2155 "DesktopIntegration.c" } -GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, GError** error) { +GFile* +desktop_integration_background_slideshow_xml_builder_close (DesktopIntegrationBackgroundSlideshowXMLBuilder* self, + GError** error) +{ GFile* result = NULL; GDataOutputStream* _tmp0_; gboolean _tmp1_ = FALSE; @@ -2162,27 +2183,27 @@ GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegr result = NULL; #line 246 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return result; -#line 2166 "DesktopIntegration.c" +#line 2187 "DesktopIntegration.c" } #line 249 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _tmp2_ = self->priv->first_file; #line 249 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (_tmp2_ != NULL) { -#line 2172 "DesktopIntegration.c" +#line 2193 "DesktopIntegration.c" GFile* _tmp3_; #line 249 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _tmp3_ = self->priv->last_file; #line 249 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _tmp1_ = _tmp3_ != NULL; -#line 2178 "DesktopIntegration.c" +#line 2199 "DesktopIntegration.c" } else { #line 249 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _tmp1_ = FALSE; -#line 2182 "DesktopIntegration.c" +#line 2203 "DesktopIntegration.c" } #line 249 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (_tmp1_) { -#line 2186 "DesktopIntegration.c" +#line 2207 "DesktopIntegration.c" GFile* _tmp4_; GFile* _tmp5_; #line 250 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" @@ -2197,7 +2218,7 @@ GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegr g_propagate_error (error, _inner_error_); #line 250 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return NULL; -#line 2201 "DesktopIntegration.c" +#line 2222 "DesktopIntegration.c" } } #line 252 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" @@ -2210,7 +2231,7 @@ GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegr g_propagate_error (error, _inner_error_); #line 252 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return NULL; -#line 2214 "DesktopIntegration.c" +#line 2235 "DesktopIntegration.c" } #line 254 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _tmp7_ = self->priv->outs; @@ -2222,7 +2243,7 @@ GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegr g_propagate_error (error, _inner_error_); #line 254 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return NULL; -#line 2226 "DesktopIntegration.c" +#line 2247 "DesktopIntegration.c" } #line 255 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (self->priv->outs); @@ -2240,7 +2261,7 @@ GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegr g_propagate_error (error, _inner_error_); #line 258 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return NULL; -#line 2244 "DesktopIntegration.c" +#line 2265 "DesktopIntegration.c" } #line 259 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _tmp10_ = self->priv->destination; @@ -2260,108 +2281,133 @@ GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegr result = _tmp14_; #line 261 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return result; -#line 2264 "DesktopIntegration.c" +#line 2285 "DesktopIntegration.c" } -static void desktop_integration_value_background_slideshow_xml_builder_init (GValue* value) { +static void +desktop_integration_value_background_slideshow_xml_builder_init (GValue* value) +{ #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" value->data[0].v_pointer = NULL; -#line 2271 "DesktopIntegration.c" +#line 2294 "DesktopIntegration.c" } -static void desktop_integration_value_background_slideshow_xml_builder_free_value (GValue* value) { +static void +desktop_integration_value_background_slideshow_xml_builder_free_value (GValue* value) +{ #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (value->data[0].v_pointer) { #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" desktop_integration_background_slideshow_xml_builder_unref (value->data[0].v_pointer); -#line 2280 "DesktopIntegration.c" +#line 2305 "DesktopIntegration.c" } } -static void desktop_integration_value_background_slideshow_xml_builder_copy_value (const GValue* src_value, GValue* dest_value) { +static void +desktop_integration_value_background_slideshow_xml_builder_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (src_value->data[0].v_pointer) { #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" dest_value->data[0].v_pointer = desktop_integration_background_slideshow_xml_builder_ref (src_value->data[0].v_pointer); -#line 2290 "DesktopIntegration.c" +#line 2318 "DesktopIntegration.c" } else { #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" dest_value->data[0].v_pointer = NULL; -#line 2294 "DesktopIntegration.c" +#line 2322 "DesktopIntegration.c" } } -static gpointer desktop_integration_value_background_slideshow_xml_builder_peek_pointer (const GValue* value) { +static gpointer +desktop_integration_value_background_slideshow_xml_builder_peek_pointer (const GValue* value) +{ #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return value->data[0].v_pointer; -#line 2302 "DesktopIntegration.c" +#line 2332 "DesktopIntegration.c" } -static gchar* desktop_integration_value_background_slideshow_xml_builder_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +desktop_integration_value_background_slideshow_xml_builder_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (collect_values[0].v_pointer) { -#line 2309 "DesktopIntegration.c" +#line 2344 "DesktopIntegration.c" DesktopIntegrationBackgroundSlideshowXMLBuilder * object; object = collect_values[0].v_pointer; #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (object->parent_instance.g_class == NULL) { #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2316 "DesktopIntegration.c" +#line 2351 "DesktopIntegration.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.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 2320 "DesktopIntegration.c" +#line 2355 "DesktopIntegration.c" } #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" value->data[0].v_pointer = desktop_integration_background_slideshow_xml_builder_ref (object); -#line 2324 "DesktopIntegration.c" +#line 2359 "DesktopIntegration.c" } else { #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" value->data[0].v_pointer = NULL; -#line 2328 "DesktopIntegration.c" +#line 2363 "DesktopIntegration.c" } #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return NULL; -#line 2332 "DesktopIntegration.c" +#line 2367 "DesktopIntegration.c" } -static gchar* desktop_integration_value_background_slideshow_xml_builder_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +desktop_integration_value_background_slideshow_xml_builder_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ DesktopIntegrationBackgroundSlideshowXMLBuilder ** object_p; object_p = collect_values[0].v_pointer; #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (!object_p) { #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2343 "DesktopIntegration.c" +#line 2383 "DesktopIntegration.c" } #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (!value->data[0].v_pointer) { #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" *object_p = NULL; -#line 2349 "DesktopIntegration.c" +#line 2389 "DesktopIntegration.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" *object_p = value->data[0].v_pointer; -#line 2353 "DesktopIntegration.c" +#line 2393 "DesktopIntegration.c" } else { #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" *object_p = desktop_integration_background_slideshow_xml_builder_ref (value->data[0].v_pointer); -#line 2357 "DesktopIntegration.c" +#line 2397 "DesktopIntegration.c" } #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return NULL; -#line 2361 "DesktopIntegration.c" +#line 2401 "DesktopIntegration.c" } -GParamSpec* desktop_integration_param_spec_background_slideshow_xml_builder (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +desktop_integration_param_spec_background_slideshow_xml_builder (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ DesktopIntegrationParamSpecBackgroundSlideshowXMLBuilder* spec; #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_return_val_if_fail (g_type_is_a (object_type, DESKTOP_INTEGRATION_TYPE_BACKGROUND_SLIDESHOW_XML_BUILDER), NULL); @@ -2371,20 +2417,25 @@ GParamSpec* desktop_integration_param_spec_background_slideshow_xml_builder (con G_PARAM_SPEC (spec)->value_type = object_type; #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return G_PARAM_SPEC (spec); -#line 2375 "DesktopIntegration.c" +#line 2421 "DesktopIntegration.c" } -gpointer desktop_integration_value_get_background_slideshow_xml_builder (const GValue* value) { +gpointer +desktop_integration_value_get_background_slideshow_xml_builder (const GValue* value) +{ #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DESKTOP_INTEGRATION_TYPE_BACKGROUND_SLIDESHOW_XML_BUILDER), NULL); #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return value->data[0].v_pointer; -#line 2384 "DesktopIntegration.c" +#line 2432 "DesktopIntegration.c" } -void desktop_integration_value_set_background_slideshow_xml_builder (GValue* value, gpointer v_object) { +void +desktop_integration_value_set_background_slideshow_xml_builder (GValue* value, + gpointer v_object) +{ DesktopIntegrationBackgroundSlideshowXMLBuilder * old; #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DESKTOP_INTEGRATION_TYPE_BACKGROUND_SLIDESHOW_XML_BUILDER)); @@ -2400,22 +2451,25 @@ void desktop_integration_value_set_background_slideshow_xml_builder (GValue* val value->data[0].v_pointer = v_object; #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" desktop_integration_background_slideshow_xml_builder_ref (value->data[0].v_pointer); -#line 2404 "DesktopIntegration.c" +#line 2455 "DesktopIntegration.c" } else { #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" value->data[0].v_pointer = NULL; -#line 2408 "DesktopIntegration.c" +#line 2459 "DesktopIntegration.c" } #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (old) { #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" desktop_integration_background_slideshow_xml_builder_unref (old); -#line 2414 "DesktopIntegration.c" +#line 2465 "DesktopIntegration.c" } } -void desktop_integration_value_take_background_slideshow_xml_builder (GValue* value, gpointer v_object) { +void +desktop_integration_value_take_background_slideshow_xml_builder (GValue* value, + gpointer v_object) +{ DesktopIntegrationBackgroundSlideshowXMLBuilder * old; #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DESKTOP_INTEGRATION_TYPE_BACKGROUND_SLIDESHOW_XML_BUILDER)); @@ -2429,33 +2483,37 @@ void desktop_integration_value_take_background_slideshow_xml_builder (GValue* va g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" value->data[0].v_pointer = v_object; -#line 2433 "DesktopIntegration.c" +#line 2487 "DesktopIntegration.c" } else { #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" value->data[0].v_pointer = NULL; -#line 2437 "DesktopIntegration.c" +#line 2491 "DesktopIntegration.c" } #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (old) { #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" desktop_integration_background_slideshow_xml_builder_unref (old); -#line 2443 "DesktopIntegration.c" +#line 2497 "DesktopIntegration.c" } } -static void desktop_integration_background_slideshow_xml_builder_class_init (DesktopIntegrationBackgroundSlideshowXMLBuilderClass * klass) { +static void +desktop_integration_background_slideshow_xml_builder_class_init (DesktopIntegrationBackgroundSlideshowXMLBuilderClass * klass) +{ #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" desktop_integration_background_slideshow_xml_builder_parent_class = g_type_class_peek_parent (klass); #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" ((DesktopIntegrationBackgroundSlideshowXMLBuilderClass *) klass)->finalize = desktop_integration_background_slideshow_xml_builder_finalize; #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_type_class_add_private (klass, sizeof (DesktopIntegrationBackgroundSlideshowXMLBuilderPrivate)); -#line 2455 "DesktopIntegration.c" +#line 2511 "DesktopIntegration.c" } -static void desktop_integration_background_slideshow_xml_builder_instance_init (DesktopIntegrationBackgroundSlideshowXMLBuilder * self) { +static void +desktop_integration_background_slideshow_xml_builder_instance_init (DesktopIntegrationBackgroundSlideshowXMLBuilder * self) +{ #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" self->priv = DESKTOP_INTEGRATION_BACKGROUND_SLIDESHOW_XML_BUILDER_GET_PRIVATE (self); #line 198 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" @@ -2466,11 +2524,13 @@ static void desktop_integration_background_slideshow_xml_builder_instance_init ( self->priv->last_file = NULL; #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" self->ref_count = 1; -#line 2470 "DesktopIntegration.c" +#line 2528 "DesktopIntegration.c" } -static void desktop_integration_background_slideshow_xml_builder_finalize (DesktopIntegrationBackgroundSlideshowXMLBuilder * obj) { +static void +desktop_integration_background_slideshow_xml_builder_finalize (DesktopIntegrationBackgroundSlideshowXMLBuilder * obj) +{ DesktopIntegrationBackgroundSlideshowXMLBuilder * self; #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DESKTOP_INTEGRATION_TYPE_BACKGROUND_SLIDESHOW_XML_BUILDER, DesktopIntegrationBackgroundSlideshowXMLBuilder); @@ -2486,11 +2546,13 @@ static void desktop_integration_background_slideshow_xml_builder_finalize (Deskt _g_object_unref0 (self->priv->first_file); #line 200 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (self->priv->last_file); -#line 2490 "DesktopIntegration.c" +#line 2550 "DesktopIntegration.c" } -GType desktop_integration_background_slideshow_xml_builder_get_type (void) { +GType +desktop_integration_background_slideshow_xml_builder_get_type (void) +{ static volatile gsize desktop_integration_background_slideshow_xml_builder_type_id__volatile = 0; if (g_once_init_enter (&desktop_integration_background_slideshow_xml_builder_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { desktop_integration_value_background_slideshow_xml_builder_init, desktop_integration_value_background_slideshow_xml_builder_free_value, desktop_integration_value_background_slideshow_xml_builder_copy_value, desktop_integration_value_background_slideshow_xml_builder_peek_pointer, "p", desktop_integration_value_background_slideshow_xml_builder_collect_value, "p", desktop_integration_value_background_slideshow_xml_builder_lcopy_value }; @@ -2504,18 +2566,22 @@ GType desktop_integration_background_slideshow_xml_builder_get_type (void) { } -gpointer desktop_integration_background_slideshow_xml_builder_ref (gpointer instance) { +gpointer +desktop_integration_background_slideshow_xml_builder_ref (gpointer instance) +{ DesktopIntegrationBackgroundSlideshowXMLBuilder * self; self = instance; #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_atomic_int_inc (&self->ref_count); #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return instance; -#line 2515 "DesktopIntegration.c" +#line 2579 "DesktopIntegration.c" } -void desktop_integration_background_slideshow_xml_builder_unref (gpointer instance) { +void +desktop_integration_background_slideshow_xml_builder_unref (gpointer instance) +{ DesktopIntegrationBackgroundSlideshowXMLBuilder * self; self = instance; #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" @@ -2524,41 +2590,46 @@ void desktop_integration_background_slideshow_xml_builder_unref (gpointer instan DESKTOP_INTEGRATION_BACKGROUND_SLIDESHOW_XML_BUILDER_GET_CLASS (self)->finalize (self); #line 193 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2528 "DesktopIntegration.c" +#line 2594 "DesktopIntegration.c" } } -static void _desktop_integration_on_desktop_slideshow_exported_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) { +static void +_desktop_integration_on_desktop_slideshow_exported_exporter_completion_callback (Exporter* exporter, + gboolean is_cancelled, + gpointer self) +{ #line 290 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" desktop_integration_on_desktop_slideshow_exported (exporter, is_cancelled); -#line 2536 "DesktopIntegration.c" +#line 2606 "DesktopIntegration.c" } -void desktop_integration_set_background_slideshow (GeeCollection* photos, gdouble duration, gdouble transition, gboolean desktop_background, gboolean screensaver) { +void +desktop_integration_set_background_slideshow (GeeCollection* photos, + gdouble duration, + gdouble transition, + gboolean desktop_background, + gboolean screensaver) +{ ExporterUI* _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_; GFile* wallpaper_dir = NULL; - GFile* _tmp3_; + GFile* _tmp1_; GeeSet* exceptions = NULL; - GeeHashSet* _tmp4_; - GeeSet* _tmp5_; - gdouble _tmp10_; - gdouble _tmp11_; + GeeHashSet* _tmp2_; + GeeSet* _tmp3_; Exporter* exporter = NULL; - GeeCollection* _tmp12_; - GFile* _tmp13_; - AppWindow* _tmp14_; - AppWindow* _tmp15_; - Scaling _tmp16_ = {0}; - ExportFormatParameters _tmp17_ = {0}; - Exporter* _tmp18_; - Exporter* _tmp19_; - Exporter* _tmp20_; - ExporterUI* _tmp21_; - ExporterUI* _tmp22_; + GFile* _tmp8_; + AppWindow* _tmp9_; + AppWindow* _tmp10_; + Scaling _tmp11_ = {0}; + ExportFormatParameters _tmp12_ = {0}; + Exporter* _tmp13_; + Exporter* _tmp14_; + Exporter* _tmp15_; + ExporterUI* _tmp16_; + ExporterUI* _tmp17_; GError * _inner_error_ = NULL; #line 265 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_return_if_fail (GEE_IS_COLLECTION (photos)); @@ -2568,41 +2639,37 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl if (_tmp0_ != NULL) { #line 268 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 2572 "DesktopIntegration.c" +#line 2643 "DesktopIntegration.c" } #line 270 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp1_ = desktop_background; -#line 270 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - desktop_integration_set_desktop_background = _tmp1_; -#line 271 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp2_ = screensaver; + desktop_integration_set_desktop_background = desktop_background; #line 271 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - desktop_integration_set_screensaver = _tmp2_; + desktop_integration_set_screensaver = screensaver; #line 273 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp3_ = app_dirs_get_data_subdir ("wallpaper", NULL); + _tmp1_ = app_dirs_get_data_subdir ("wallpaper", NULL); #line 273 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - wallpaper_dir = _tmp3_; + wallpaper_dir = _tmp1_; #line 275 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp4_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp2_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 275 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - exceptions = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_SET, GeeSet); + exceptions = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_SET, GeeSet); #line 276 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp5_ = exceptions; + _tmp3_ = exceptions; #line 276 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), DESKTOP_INTEGRATION_DESKTOP_SLIDESHOW_XML_FILENAME); -#line 2594 "DesktopIntegration.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), DESKTOP_INTEGRATION_DESKTOP_SLIDESHOW_XML_FILENAME); +#line 2661 "DesktopIntegration.c" { - GFile* _tmp6_; - GeeSet* _tmp7_; + GFile* _tmp4_; + GeeSet* _tmp5_; #line 278 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp6_ = wallpaper_dir; + _tmp4_ = wallpaper_dir; #line 278 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp7_ = exceptions; + _tmp5_ = exceptions; #line 278 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - delete_all_files (_tmp6_, _tmp7_, NULL, NULL, (guint64) 0, NULL, &_inner_error_); + delete_all_files (_tmp4_, _tmp5_, NULL, NULL, (guint64) 0, NULL, &_inner_error_); #line 278 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2606 "DesktopIntegration.c" +#line 2673 "DesktopIntegration.c" goto __catch579_g_error; } } @@ -2610,22 +2677,22 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl __catch579_g_error: { GError* err = NULL; - GError* _tmp8_; - const gchar* _tmp9_; + GError* _tmp6_; + const gchar* _tmp7_; #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" err = _inner_error_; #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _inner_error_ = NULL; #line 280 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp8_ = err; + _tmp6_ = err; #line 280 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp9_ = _tmp8_->message; + _tmp7_ = _tmp6_->message; #line 280 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_warning ("DesktopIntegration.vala:280: Error attempting to clear wallpaper direc" \ -"tory: %s", _tmp9_); +"tory: %s", _tmp7_); #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_error_free0 (err); -#line 2628 "DesktopIntegration.c" +#line 2695 "DesktopIntegration.c" } __finally579: #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" @@ -2640,72 +2707,68 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl g_clear_error (&_inner_error_); #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 2643 "DesktopIntegration.c" +#line 2710 "DesktopIntegration.c" } #line 283 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp10_ = duration; -#line 283 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - desktop_integration_desktop_slideshow_duration = _tmp10_; + desktop_integration_desktop_slideshow_duration = duration; #line 284 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp11_ = transition; -#line 284 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - desktop_integration_desktop_slideshow_transition = _tmp11_; -#line 286 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp12_ = photos; + desktop_integration_desktop_slideshow_transition = transition; #line 286 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp13_ = wallpaper_dir; + _tmp8_ = wallpaper_dir; #line 286 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp14_ = app_window_get_instance (); + _tmp9_ = app_window_get_instance (); #line 286 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp15_ = _tmp14_; + _tmp10_ = _tmp9_; #line 286 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - scaling_to_fill_screen (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_window_get_type (), GtkWindow), &_tmp16_); + scaling_to_fill_screen (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow), &_tmp11_); #line 286 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - export_format_parameters_current (&_tmp17_); + export_format_parameters_current (&_tmp12_); #line 286 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp18_ = exporter_new (_tmp12_, _tmp13_, &_tmp16_, &_tmp17_, TRUE); + _tmp13_ = exporter_new (photos, _tmp8_, &_tmp11_, &_tmp12_, TRUE); #line 286 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp19_ = _tmp18_; + _tmp14_ = _tmp13_; #line 286 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp10_); #line 286 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - exporter = _tmp19_; + exporter = _tmp14_; #line 289 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp20_ = exporter; + _tmp15_ = exporter; #line 289 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp21_ = exporter_ui_new (_tmp20_); + _tmp16_ = exporter_ui_new (_tmp15_); #line 289 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _exporter_ui_unref0 (desktop_integration_desktop_slideshow_exporter); #line 289 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - desktop_integration_desktop_slideshow_exporter = _tmp21_; + desktop_integration_desktop_slideshow_exporter = _tmp16_; #line 290 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp22_ = desktop_integration_desktop_slideshow_exporter; + _tmp17_ = desktop_integration_desktop_slideshow_exporter; #line 290 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - exporter_ui_export (_tmp22_, _desktop_integration_on_desktop_slideshow_exported_exporter_completion_callback, NULL); + exporter_ui_export (_tmp17_, _desktop_integration_on_desktop_slideshow_exported_exporter_completion_callback, NULL); #line 265 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (exporter); #line 265 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (exceptions); #line 265 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (wallpaper_dir); -#line 2691 "DesktopIntegration.c" +#line 2752 "DesktopIntegration.c" } -void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboolean is_cancelled) { - gboolean _tmp0_; +void +desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, + gboolean is_cancelled) +{ GFile* xml_file = NULL; DesktopIntegrationBackgroundSlideshowXMLBuilder* xml_builder = NULL; + GFile* _tmp0_; GFile* _tmp1_; GFile* _tmp2_; GFile* _tmp3_; - GFile* _tmp4_; + gdouble _tmp4_; gdouble _tmp5_; - gdouble _tmp6_; + DesktopIntegrationBackgroundSlideshowXMLBuilder* _tmp6_; DesktopIntegrationBackgroundSlideshowXMLBuilder* _tmp7_; - DesktopIntegrationBackgroundSlideshowXMLBuilder* _tmp8_; - gboolean _tmp24_; - gboolean _tmp30_; + gboolean _tmp22_; + gboolean _tmp28_; GError * _inner_error_ = NULL; #line 293 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" g_return_if_fail (IS_EXPORTER (exporter)); @@ -2714,154 +2777,149 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo #line 294 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" desktop_integration_desktop_slideshow_exporter = NULL; #line 296 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp0_ = is_cancelled; -#line 296 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (_tmp0_) { + if (is_cancelled) { #line 297 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 2722 "DesktopIntegration.c" +#line 2783 "DesktopIntegration.c" } #line 299 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" xml_file = NULL; #line 300 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp1_ = app_dirs_get_data_subdir ("wallpaper", NULL); + _tmp0_ = app_dirs_get_data_subdir ("wallpaper", NULL); #line 300 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 300 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp3_ = g_file_get_child (_tmp2_, DESKTOP_INTEGRATION_DESKTOP_SLIDESHOW_XML_FILENAME); + _tmp2_ = g_file_get_child (_tmp1_, DESKTOP_INTEGRATION_DESKTOP_SLIDESHOW_XML_FILENAME); #line 300 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 300 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp5_ = desktop_integration_desktop_slideshow_duration; + _tmp4_ = desktop_integration_desktop_slideshow_duration; #line 300 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp6_ = desktop_integration_desktop_slideshow_transition; + _tmp5_ = desktop_integration_desktop_slideshow_transition; #line 300 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp7_ = desktop_integration_background_slideshow_xml_builder_new (_tmp4_, _tmp5_, _tmp6_); + _tmp6_ = desktop_integration_background_slideshow_xml_builder_new (_tmp3_, _tmp4_, _tmp5_); #line 300 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 300 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 300 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 300 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - xml_builder = _tmp8_; -#line 2748 "DesktopIntegration.c" + xml_builder = _tmp7_; +#line 2809 "DesktopIntegration.c" { - DesktopIntegrationBackgroundSlideshowXMLBuilder* _tmp9_; - Exporter* _tmp10_; - gint _tmp11_; - GFile** _tmp12_; - GFile* _tmp16_ = NULL; - DesktopIntegrationBackgroundSlideshowXMLBuilder* _tmp17_; - GFile* _tmp18_; - GFile* _tmp19_; + DesktopIntegrationBackgroundSlideshowXMLBuilder* _tmp8_; + gint _tmp9_; + GFile** _tmp10_; + GFile* _tmp14_ = NULL; + DesktopIntegrationBackgroundSlideshowXMLBuilder* _tmp15_; + GFile* _tmp16_; + GFile* _tmp17_; #line 304 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp9_ = xml_builder; + _tmp8_ = xml_builder; #line 304 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - desktop_integration_background_slideshow_xml_builder_open (_tmp9_, &_inner_error_); + desktop_integration_background_slideshow_xml_builder_open (_tmp8_, &_inner_error_); #line 304 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2764 "DesktopIntegration.c" +#line 2824 "DesktopIntegration.c" goto __catch580_g_error; } #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp10_ = exporter; -#line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp12_ = exporter_get_exported_files (_tmp10_, &_tmp11_); -#line 2771 "DesktopIntegration.c" + _tmp10_ = exporter_get_exported_files (exporter, &_tmp9_); +#line 2829 "DesktopIntegration.c" { GFile** file_collection = NULL; gint file_collection_length1 = 0; gint _file_collection_size_ = 0; gint file_it = 0; #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - file_collection = _tmp12_; + file_collection = _tmp10_; #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - file_collection_length1 = _tmp11_; + file_collection_length1 = _tmp9_; #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - for (file_it = 0; file_it < _tmp11_; file_it = file_it + 1) { -#line 2783 "DesktopIntegration.c" - GFile* _tmp13_; + for (file_it = 0; file_it < _tmp9_; file_it = file_it + 1) { +#line 2841 "DesktopIntegration.c" + GFile* _tmp11_; GFile* file = NULL; #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp13_ = _g_object_ref0 (file_collection[file_it]); + _tmp11_ = _g_object_ref0 (file_collection[file_it]); #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - file = _tmp13_; -#line 2790 "DesktopIntegration.c" + file = _tmp11_; +#line 2848 "DesktopIntegration.c" { - DesktopIntegrationBackgroundSlideshowXMLBuilder* _tmp14_; - GFile* _tmp15_; + DesktopIntegrationBackgroundSlideshowXMLBuilder* _tmp12_; + GFile* _tmp13_; #line 307 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp14_ = xml_builder; + _tmp12_ = xml_builder; #line 307 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp15_ = file; + _tmp13_ = file; #line 307 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - desktop_integration_background_slideshow_xml_builder_add_photo (_tmp14_, _tmp15_, &_inner_error_); + desktop_integration_background_slideshow_xml_builder_add_photo (_tmp12_, _tmp13_, &_inner_error_); #line 307 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 307 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (file); #line 307 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" file_collection = (_vala_array_free (file_collection, file_collection_length1, (GDestroyNotify) g_object_unref), NULL); -#line 2806 "DesktopIntegration.c" +#line 2864 "DesktopIntegration.c" goto __catch580_g_error; } #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (file); -#line 2811 "DesktopIntegration.c" +#line 2869 "DesktopIntegration.c" } } #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" file_collection = (_vala_array_free (file_collection, file_collection_length1, (GDestroyNotify) g_object_unref), NULL); -#line 2816 "DesktopIntegration.c" +#line 2874 "DesktopIntegration.c" } #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp17_ = xml_builder; + _tmp15_ = xml_builder; #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp18_ = desktop_integration_background_slideshow_xml_builder_close (_tmp17_, &_inner_error_); + _tmp16_ = desktop_integration_background_slideshow_xml_builder_close (_tmp15_, &_inner_error_); #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp16_ = _tmp18_; + _tmp14_ = _tmp16_; #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2826 "DesktopIntegration.c" +#line 2884 "DesktopIntegration.c" goto __catch580_g_error; } #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp19_ = _tmp16_; + _tmp17_ = _tmp14_; #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp16_ = NULL; + _tmp14_ = NULL; #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (xml_file); #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - xml_file = _tmp19_; + xml_file = _tmp17_; #line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_object_unref0 (_tmp16_); -#line 2839 "DesktopIntegration.c" + _g_object_unref0 (_tmp14_); +#line 2897 "DesktopIntegration.c" } goto __finally580; __catch580_g_error: { GError* err = NULL; - GError* _tmp20_; - const gchar* _tmp21_; - gchar* _tmp22_; - gchar* _tmp23_; + GError* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; #line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" err = _inner_error_; #line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _inner_error_ = NULL; #line 311 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp20_ = err; + _tmp18_ = err; #line 311 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp21_ = _tmp20_->message; + _tmp19_ = _tmp18_->message; #line 311 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp22_ = g_strdup_printf (_ ("Unable to prepare desktop slideshow: %s"), _tmp21_); + _tmp20_ = g_strdup_printf (_ ("Unable to prepare desktop slideshow: %s"), _tmp19_); #line 311 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp23_ = _tmp22_; + _tmp21_ = _tmp20_; #line 311 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - app_window_error_message (_tmp23_, NULL); + app_window_error_message (_tmp21_, NULL); #line 311 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp23_); + _g_free0 (_tmp21_); #line 314 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_error_free0 (err); #line 314 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" @@ -2870,7 +2928,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo _g_object_unref0 (xml_file); #line 314 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 2873 "DesktopIntegration.c" +#line 2931 "DesktopIntegration.c" } __finally580: #line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" @@ -2885,73 +2943,77 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo g_clear_error (&_inner_error_); #line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" return; -#line 2888 "DesktopIntegration.c" +#line 2946 "DesktopIntegration.c" } #line 317 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp24_ = desktop_integration_set_desktop_background; + _tmp22_ = desktop_integration_set_desktop_background; #line 317 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (_tmp24_) { -#line 2894 "DesktopIntegration.c" - ConfigFacade* _tmp25_; - ConfigFacade* _tmp26_; - GFile* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; + if (_tmp22_) { +#line 2952 "DesktopIntegration.c" + ConfigFacade* _tmp23_; + ConfigFacade* _tmp24_; + GFile* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; #line 318 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp25_ = config_facade_get_instance (); + _tmp23_ = config_facade_get_instance (); #line 318 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp26_ = _tmp25_; + _tmp24_ = _tmp23_; #line 318 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp27_ = xml_file; + _tmp25_ = xml_file; #line 318 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp28_ = g_file_get_path (_tmp27_); + _tmp26_ = g_file_get_path (_tmp25_); #line 318 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp29_ = _tmp28_; + _tmp27_ = _tmp26_; #line 318 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - configuration_facade_set_desktop_background (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp29_); + configuration_facade_set_desktop_background (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp27_); #line 318 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp29_); + _g_free0 (_tmp27_); #line 318 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_object_unref0 (_tmp26_); -#line 2916 "DesktopIntegration.c" + _g_object_unref0 (_tmp24_); +#line 2974 "DesktopIntegration.c" } #line 320 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp30_ = desktop_integration_set_screensaver; + _tmp28_ = desktop_integration_set_screensaver; #line 320 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - if (_tmp30_) { -#line 2922 "DesktopIntegration.c" - ConfigFacade* _tmp31_; - ConfigFacade* _tmp32_; - GFile* _tmp33_; - gchar* _tmp34_; - gchar* _tmp35_; + if (_tmp28_) { +#line 2980 "DesktopIntegration.c" + ConfigFacade* _tmp29_; + ConfigFacade* _tmp30_; + GFile* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; #line 321 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp31_ = config_facade_get_instance (); + _tmp29_ = config_facade_get_instance (); #line 321 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp32_ = _tmp31_; + _tmp30_ = _tmp29_; #line 321 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp33_ = xml_file; + _tmp31_ = xml_file; #line 321 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp34_ = g_file_get_path (_tmp33_); + _tmp32_ = g_file_get_path (_tmp31_); #line 321 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp35_ = _tmp34_; + _tmp33_ = _tmp32_; #line 321 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - configuration_facade_set_screensaver (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp35_); + configuration_facade_set_screensaver (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp33_); #line 321 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_free0 (_tmp35_); + _g_free0 (_tmp33_); #line 321 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _g_object_unref0 (_tmp32_); -#line 2944 "DesktopIntegration.c" + _g_object_unref0 (_tmp30_); +#line 3002 "DesktopIntegration.c" } #line 293 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _desktop_integration_background_slideshow_xml_builder_unref0 (xml_builder); #line 293 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (xml_file); -#line 2950 "DesktopIntegration.c" +#line 3008 "DesktopIntegration.c" } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -2963,7 +3025,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/Dialogs.c b/src/Dialogs.c index 16d93b5..ae9723a 100644 --- a/src/Dialogs.c +++ b/src/Dialogs.c @@ -1,4 +1,4 @@ -/* Dialogs.c generated by valac 0.36.6, the Vala compiler +/* Dialogs.c generated by valac 0.40.4, the Vala compiler * generated from Dialogs.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ /* namespace for future migration of AppWindow alert and other question dialogs into single*/ /* place: http://trac.yorba.org/ticket/3452*/ + #include #include #include @@ -635,7 +636,11 @@ GType tag_get_type (void) G_GNUC_CONST; gboolean dialogs_confirm_delete_tag (Tag* tag); gint tag_get_sources_count (Tag* self); gchar* tag_get_user_visible_name (Tag* self); -gboolean app_window_negate_affirm_question (const gchar* message, const gchar* negative, const gchar* affirmative, const gchar* title, GtkWindow* parent); +gboolean app_window_negate_affirm_question (const gchar* message, + const gchar* negative, + const gchar* affirmative, + const gchar* title, + GtkWindow* parent); #define RESOURCES_DELETE_TAG_TITLE _ ("Delete Tag") GType saved_search_get_type (void) G_GNUC_CONST; gboolean dialogs_confirm_delete_saved_search (SavedSearch* search); @@ -655,366 +660,476 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; -void open_external_editor_error_dialog (GError* err, Photo* photo); -void app_window_error_message (const gchar* message, GtkWindow* parent); +void open_external_editor_error_dialog (GError* err, + Photo* photo); +void app_window_error_message (const gchar* message, + GtkWindow* parent); GFile* media_source_get_master_file (MediaSource* self); gchar* resources_launch_editor_failed (GError* err); -GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining); -GtkResponseType app_window_affirm_cancel_question (const gchar* message, const gchar* affirmative, const gchar* title, GtkWindow* parent); +GtkResponseType export_error_dialog (GFile* dest, + gboolean photos_remaining); +GtkResponseType app_window_affirm_cancel_question (const gchar* message, + const gchar* affirmative, + const gchar* title, + GtkWindow* parent); #define IMPORT_UI_REPORT_FAILURE_COUNT 4 #define IMPORT_UI_SAVE_RESULTS_BUTTON_NAME _ ("Save Details…") #define IMPORT_UI_SAVE_RESULTS_FILE_CHOOSER_TITLE _ ("Save Details") #define IMPORT_UI_SAVE_RESULTS_RESPONSE_ID 1024 gpointer batch_import_result_ref (gpointer instance); void batch_import_result_unref (gpointer instance); -GParamSpec* param_spec_batch_import_result (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_result (GValue* value, gpointer v_object); -void value_take_batch_import_result (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_result (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_result (GValue* value, + gpointer v_object); +void value_take_batch_import_result (GValue* value, + gpointer v_object); gpointer value_get_batch_import_result (const GValue* value); GType batch_import_result_get_type (void) G_GNUC_CONST; -gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_dest_id); +gchar* import_ui_generate_import_failure_list (GeeList* failed, + gboolean show_dest_id); gpointer batch_import_job_ref (gpointer instance); void batch_import_job_unref (gpointer instance); -GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_job (GValue* value, gpointer v_object); -void value_take_batch_import_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_job (GValue* value, + gpointer v_object); +void value_take_batch_import_job (GValue* value, + gpointer v_object); gpointer value_get_batch_import_job (const GValue* value); GType batch_import_job_get_type (void) G_GNUC_CONST; GType import_result_get_type (void) G_GNUC_CONST; GType duplicated_file_get_type (void) G_GNUC_CONST; gpointer import_ui_question_params_ref (gpointer instance); void import_ui_question_params_unref (gpointer instance); -GParamSpec* import_ui_param_spec_question_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void import_ui_value_set_question_params (GValue* value, gpointer v_object); -void import_ui_value_take_question_params (GValue* value, gpointer v_object); +GParamSpec* import_ui_param_spec_question_params (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void import_ui_value_set_question_params (GValue* value, + gpointer v_object); +void import_ui_value_take_question_params (GValue* value, + gpointer v_object); gpointer import_ui_value_get_question_params (const GValue* value); GType import_ui_question_params_get_type (void) G_GNUC_CONST; -enum { - IMPORT_UI_QUESTION_PARAMS_DUMMY_PROPERTY -}; -ImportUIQuestionParams* import_ui_question_params_new (const gchar* question, const gchar* yes_button, const gchar* no_button); -ImportUIQuestionParams* import_ui_question_params_construct (GType object_type, const gchar* question, const gchar* yes_button, const gchar* no_button); +ImportUIQuestionParams* import_ui_question_params_new (const gchar* question, + const gchar* yes_button, + const gchar* no_button); +ImportUIQuestionParams* import_ui_question_params_construct (GType object_type, + const gchar* question, + const gchar* yes_button, + const gchar* no_button); static void import_ui_question_params_finalize (ImportUIQuestionParams * obj); gboolean import_ui_import_has_photos (GeeCollection* import_collection); GType photo_file_format_get_type (void) G_GNUC_CONST; PhotoFileFormat photo_file_format_get_by_file_extension (GFile* file); gboolean import_ui_import_has_videos (GeeCollection* import_collection); gboolean video_reader_is_supported_video_file (GFile* file); -gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, const gchar* photos_msg, const gchar* videos_msg, const gchar* both_msg, const gchar* neither_msg); +gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, + const gchar* photos_msg, + const gchar* videos_msg, + const gchar* both_msg, + const gchar* neither_msg); gpointer import_manifest_ref (gpointer instance); void import_manifest_unref (gpointer instance); -GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_import_manifest (GValue* value, gpointer v_object); -void value_take_import_manifest (GValue* value, gpointer v_object); +GParamSpec* param_spec_import_manifest (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_import_manifest (GValue* value, + gpointer v_object); +void value_take_import_manifest (GValue* value, + gpointer v_object); gpointer value_get_import_manifest (const GValue* value); GType import_manifest_get_type (void) G_GNUC_CONST; gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest); #define RESOURCES_APP_VERSION _VERSION GFile* duplicated_file_get_file (DuplicatedFile* self); -gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest_id, ImportUIQuestionParams* question); -void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gchar* results_log); +gboolean import_ui_report_manifest (ImportManifest* manifest, + gboolean show_dest_id, + ImportUIQuestionParams* question); +void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, + const gchar* results_log); #define RESOURCES_SAVE_AS_LABEL _ ("Save _As") gpointer text_entry_dialog_mediator_ref (gpointer instance); void text_entry_dialog_mediator_unref (gpointer instance); -GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_text_entry_dialog_mediator (GValue* value, gpointer v_object); -void value_take_text_entry_dialog_mediator (GValue* value, gpointer v_object); +GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_text_entry_dialog_mediator (GValue* value, + gpointer v_object); +void value_take_text_entry_dialog_mediator (GValue* value, + gpointer v_object); gpointer value_get_text_entry_dialog_mediator (const GValue* value); GType text_entry_dialog_mediator_get_type (void) G_GNUC_CONST; GType text_entry_dialog_get_type (void) G_GNUC_CONST; #define TEXT_ENTRY_DIALOG_MEDIATOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediatorPrivate)) -enum { - TEXT_ENTRY_DIALOG_MEDIATOR_DUMMY_PROPERTY -}; -TextEntryDialogMediator* text_entry_dialog_mediator_construct (GType object_type, const gchar* title, const gchar* label, const gchar* initial_text, GeeCollection* completion_list, const gchar* completion_delimiter); +TextEntryDialogMediator* text_entry_dialog_mediator_construct (GType object_type, + const gchar* title, + const gchar* label, + const gchar* initial_text, + GeeCollection* completion_list, + const gchar* completion_delimiter); TextEntryDialog* text_entry_dialog_new (void); TextEntryDialog* text_entry_dialog_construct (GType object_type); -void text_entry_dialog_setup (TextEntryDialog* self, TextEntryDialogOnModifyValidateType modify_validate, void* modify_validate_target, const gchar* title, const gchar* label, const gchar* initial_text, GeeCollection* completion_list, const gchar* completion_delimiter); -gboolean text_entry_dialog_mediator_on_modify_validate (TextEntryDialogMediator* self, const gchar* text); -static gboolean _text_entry_dialog_mediator_on_modify_validate_text_entry_dialog_on_modify_validate_type (const gchar* text, gpointer self); -static gboolean text_entry_dialog_mediator_real_on_modify_validate (TextEntryDialogMediator* self, const gchar* text); +void text_entry_dialog_setup (TextEntryDialog* self, + TextEntryDialogOnModifyValidateType modify_validate, + void* modify_validate_target, + const gchar* title, + const gchar* label, + const gchar* initial_text, + GeeCollection* completion_list, + const gchar* completion_delimiter); +gboolean text_entry_dialog_mediator_on_modify_validate (TextEntryDialogMediator* self, + const gchar* text); +static gboolean _text_entry_dialog_mediator_on_modify_validate_text_entry_dialog_on_modify_validate_type (const gchar* text, + gpointer self); +static gboolean text_entry_dialog_mediator_real_on_modify_validate (TextEntryDialogMediator* self, + const gchar* text); gchar* _text_entry_dialog_mediator_execute (TextEntryDialogMediator* self); gchar* text_entry_dialog_execute (TextEntryDialog* self); static void text_entry_dialog_mediator_finalize (TextEntryDialogMediator * obj); gpointer multi_text_entry_dialog_mediator_ref (gpointer instance); void multi_text_entry_dialog_mediator_unref (gpointer instance); -GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object); -void value_take_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object); +GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_multi_text_entry_dialog_mediator (GValue* value, + gpointer v_object); +void value_take_multi_text_entry_dialog_mediator (GValue* value, + gpointer v_object); gpointer value_get_multi_text_entry_dialog_mediator (const GValue* value); GType multi_text_entry_dialog_mediator_get_type (void) G_GNUC_CONST; GType multi_text_entry_dialog_get_type (void) G_GNUC_CONST; #define MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR, MultiTextEntryDialogMediatorPrivate)) -enum { - MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_DUMMY_PROPERTY -}; -MultiTextEntryDialogMediator* multi_text_entry_dialog_mediator_construct (GType object_type, const gchar* title, const gchar* label, const gchar* initial_text); +MultiTextEntryDialogMediator* multi_text_entry_dialog_mediator_construct (GType object_type, + const gchar* title, + const gchar* label, + const gchar* initial_text); MultiTextEntryDialog* multi_text_entry_dialog_new (void); MultiTextEntryDialog* multi_text_entry_dialog_construct (GType object_type); -void multi_text_entry_dialog_setup (MultiTextEntryDialog* self, MultiTextEntryDialogOnModifyValidateType modify_validate, void* modify_validate_target, const gchar* title, const gchar* label, const gchar* initial_text); -gboolean multi_text_entry_dialog_mediator_on_modify_validate (MultiTextEntryDialogMediator* self, const gchar* text); -static gboolean _multi_text_entry_dialog_mediator_on_modify_validate_multi_text_entry_dialog_on_modify_validate_type (const gchar* text, gpointer self); -static gboolean multi_text_entry_dialog_mediator_real_on_modify_validate (MultiTextEntryDialogMediator* self, const gchar* text); +void multi_text_entry_dialog_setup (MultiTextEntryDialog* self, + MultiTextEntryDialogOnModifyValidateType modify_validate, + void* modify_validate_target, + const gchar* title, + const gchar* label, + const gchar* initial_text); +gboolean multi_text_entry_dialog_mediator_on_modify_validate (MultiTextEntryDialogMediator* self, + const gchar* text); +static gboolean _multi_text_entry_dialog_mediator_on_modify_validate_multi_text_entry_dialog_on_modify_validate_type (const gchar* text, + gpointer self); +static gboolean multi_text_entry_dialog_mediator_real_on_modify_validate (MultiTextEntryDialogMediator* self, + const gchar* text); gchar* _multi_text_entry_dialog_mediator_execute (MultiTextEntryDialogMediator* self); gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self); static void multi_text_entry_dialog_mediator_finalize (MultiTextEntryDialogMediator * obj); -gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_text, gboolean should_escape); +gchar* build_alert_body_text (const gchar* primary_text, + const gchar* secondary_text, + gboolean should_escape); gchar* guarded_markup_escape_text (const gchar* plain); GType event_rename_dialog_get_type (void) G_GNUC_CONST; -enum { - EVENT_RENAME_DIALOG_DUMMY_PROPERTY -}; EventRenameDialog* event_rename_dialog_new (const gchar* event_name); -EventRenameDialog* event_rename_dialog_construct (GType object_type, const gchar* event_name); +EventRenameDialog* event_rename_dialog_construct (GType object_type, + const gchar* event_name); gchar* event_rename_dialog_execute (EventRenameDialog* self); static gchar* event_rename_dialog_real_execute (EventRenameDialog* self); gchar* event_prep_event_name (const gchar* name); GType edit_title_dialog_get_type (void) G_GNUC_CONST; -enum { - EDIT_TITLE_DIALOG_DUMMY_PROPERTY -}; EditTitleDialog* edit_title_dialog_new (const gchar* photo_title); -EditTitleDialog* edit_title_dialog_construct (GType object_type, const gchar* photo_title); +EditTitleDialog* edit_title_dialog_construct (GType object_type, + const gchar* photo_title); gchar* edit_title_dialog_execute (EditTitleDialog* self); static gchar* edit_title_dialog_real_execute (EditTitleDialog* self); gchar* media_source_prep_title (const gchar* title); -static gboolean edit_title_dialog_real_on_modify_validate (TextEntryDialogMediator* base, const gchar* text); +static gboolean edit_title_dialog_real_on_modify_validate (TextEntryDialogMediator* base, + const gchar* text); GType edit_comment_dialog_get_type (void) G_GNUC_CONST; -enum { - EDIT_COMMENT_DIALOG_DUMMY_PROPERTY -}; -EditCommentDialog* edit_comment_dialog_new (const gchar* comment, gboolean is_event); -EditCommentDialog* edit_comment_dialog_construct (GType object_type, const gchar* comment, gboolean is_event); +EditCommentDialog* edit_comment_dialog_new (const gchar* comment, + gboolean is_event); +EditCommentDialog* edit_comment_dialog_construct (GType object_type, + const gchar* comment, + gboolean is_event); gchar* edit_comment_dialog_execute (EditCommentDialog* self); static gchar* edit_comment_dialog_real_execute (EditCommentDialog* self); gchar* media_source_prep_comment (const gchar* comment); -static gboolean edit_comment_dialog_real_on_modify_validate (MultiTextEntryDialogMediator* base, const gchar* text); -GtkResponseType remove_from_library_dialog (GtkWindow* owner, const gchar* title, const gchar* user_message, gint count); -GtkResponseType remove_from_filesystem_dialog (GtkWindow* owner, const gchar* title, const gchar* user_message); -gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos); +static gboolean edit_comment_dialog_real_on_modify_validate (MultiTextEntryDialogMediator* base, + const gchar* text); +GtkResponseType remove_from_library_dialog (GtkWindow* owner, + const gchar* title, + const gchar* user_message, + gint count); +GtkResponseType remove_from_filesystem_dialog (GtkWindow* owner, + const gchar* title, + const gchar* user_message); +gboolean revert_editable_dialog (GtkWindow* owner, + GeeCollection* photos); gboolean photo_has_editable (Photo* self); -gboolean remove_offline_dialog (GtkWindow* owner, gint count); +gboolean remove_offline_dialog (GtkWindow* owner, + gint count); #define MAX_OBJECTS_DISPLAYED 3 -void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message, const gchar* title); +void multiple_object_error_dialog (GeeArrayList* objects, + const gchar* message, + const gchar* title); gchar* data_object_to_string (DataObject* self); GType tags_dialog_get_type (void) G_GNUC_CONST; -enum { - TAGS_DIALOG_DUMMY_PROPERTY -}; -TagsDialog* tags_dialog_construct (GType object_type, const gchar* title, const gchar* label, const gchar* initial_text); +TagsDialog* tags_dialog_construct (GType object_type, + const gchar* title, + const gchar* label, + const gchar* initial_text); gpointer hierarchical_tag_index_ref (gpointer instance); void hierarchical_tag_index_unref (gpointer instance); -GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_hierarchical_tag_index (GValue* value, gpointer v_object); -void value_take_hierarchical_tag_index (GValue* value, gpointer v_object); +GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_hierarchical_tag_index (GValue* value, + gpointer v_object); +void value_take_hierarchical_tag_index (GValue* value, + gpointer v_object); gpointer value_get_hierarchical_tag_index (const GValue* value); GType hierarchical_tag_index_get_type (void) G_GNUC_CONST; HierarchicalTagIndex* hierarchical_tag_index_get_global_index (void); GeeCollection* hierarchical_tag_index_get_all_tags (HierarchicalTagIndex* self); GType add_tags_dialog_get_type (void) G_GNUC_CONST; -enum { - ADD_TAGS_DIALOG_DUMMY_PROPERTY -}; AddTagsDialog* add_tags_dialog_new (void); AddTagsDialog* add_tags_dialog_construct (GType object_type); #define RESOURCES_ADD_TAGS_TITLE NC_ ("Dialog Title", "Add Tags") -gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1); -gchar** tag_prep_tag_names (gchar** names, int names_length1, int* result_length1); -static gboolean add_tags_dialog_real_on_modify_validate (TextEntryDialogMediator* base, const gchar* text); +gchar** add_tags_dialog_execute (AddTagsDialog* self, + int* result_length1); +gchar** tag_prep_tag_names (gchar** names, + int names_length1, + int* result_length1); +static gboolean add_tags_dialog_real_on_modify_validate (TextEntryDialogMediator* base, + const gchar* text); #define TAG_PATH_SEPARATOR_STRING "/" GType modify_tags_dialog_get_type (void) G_GNUC_CONST; -enum { - MODIFY_TAGS_DIALOG_DUMMY_PROPERTY -}; ModifyTagsDialog* modify_tags_dialog_new (MediaSource* source); -ModifyTagsDialog* modify_tags_dialog_construct (GType object_type, MediaSource* source); +ModifyTagsDialog* modify_tags_dialog_construct (GType object_type, + MediaSource* source); #define RESOURCES_MODIFY_TAGS_LABEL _ ("Modify Tags") static gchar* modify_tags_dialog_get_initial_text (MediaSource* source); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType tag_source_collection_get_type (void) G_GNUC_CONST; -GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, MediaSource* source); +GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, + MediaSource* source); GeeCollection* tag_get_terminal_tags (GeeCollection* tags); gchar* hierarchical_tag_utilities_get_basename (const gchar* in_path); gchar* tag_get_path (Tag* self); GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self); gboolean is_string_empty (const gchar* s); -gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, gchar** names, int names_length1, int* result_length1); +gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, + gchar** names, + int names_length1, + int* result_length1); Tag* tag_for_path (const gchar* name); -static gboolean modify_tags_dialog_real_on_modify_validate (TextEntryDialogMediator* base, const gchar* text); +static gboolean modify_tags_dialog_real_on_modify_validate (TextEntryDialogMediator* base, + const gchar* text); GtkResponseType copy_files_dialog (void); GType library_photo_get_type (void) G_GNUC_CONST; void remove_photos_from_library (GeeCollection* photos); -void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const gchar* progress_dialog_text); +void remove_from_app (GeeCollection* sources, + const gchar* dialog_title, + const gchar* progress_dialog_text); GType video_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; -void media_source_collection_filter_media (GeeCollection* media, GeeCollection* photos, GeeCollection* videos); +void media_source_collection_filter_media (GeeCollection* media, + GeeCollection* photos, + GeeCollection* videos); void page_window_set_busy_cursor (PageWindow* self); GType progress_dialog_get_type (void) G_GNUC_CONST; -ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable); -ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable); -gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop); -static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self); +ProgressDialog* progress_dialog_new (GtkWindow* owner, + const gchar* text, + GCancellable* cancellable); +ProgressDialog* progress_dialog_construct (GType object_type, + GtkWindow* owner, + const gchar* text, + GCancellable* cancellable); +gboolean progress_dialog_monitor (ProgressDialog* self, + guint64 count, + guint64 total, + gboolean do_event_loop); +static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, + guint64 total, + gboolean do_event_loop, + gpointer self); GType media_source_collection_get_type (void) G_GNUC_CONST; GType library_photo_source_collection_get_type (void) G_GNUC_CONST; -void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCollection* sources, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed); +void media_source_collection_remove_from_app (MediaSourceCollection* self, + GeeCollection* sources, + gboolean delete_backing, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_removed); GType video_source_collection_get_type (void) G_GNUC_CONST; -void media_source_collection_delete_backing_files (MediaSourceCollection* self, GeeCollection* sources, ProgressMonitor monitor, void* monitor_target, GeeList* not_deleted); -void app_window_error_message_with_title (const gchar* title, const gchar* message, GtkWindow* parent, gboolean should_escape); +void media_source_collection_delete_backing_files (MediaSourceCollection* self, + GeeCollection* sources, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_deleted); +void app_window_error_message_with_title (const gchar* title, + const gchar* message, + GtkWindow* parent, + gboolean should_escape); void progress_dialog_close (ProgressDialog* self); void page_window_set_normal_cursor (PageWindow* self); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); -gboolean dialogs_confirm_delete_tag (Tag* tag) { +gboolean +dialogs_confirm_delete_tag (Tag* tag) +{ gboolean result = FALSE; gint count = 0; - Tag* _tmp0_; - gint _tmp1_; - gint _tmp2_; + gint _tmp0_; gchar* msg = NULL; - gint _tmp3_; - Tag* _tmp4_; + gint _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gint _tmp4_; gchar* _tmp5_; gchar* _tmp6_; - gint _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - const gchar* _tmp10_; - gboolean _tmp11_; + const gchar* _tmp7_; #line 11 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (IS_TAG (tag), FALSE); #line 12 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = tag; -#line 12 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = tag_get_sources_count (_tmp0_); -#line 12 "/home/jens/Source/shotwell/src/Dialogs.vala" - count = _tmp1_; + count = tag_get_sources_count (tag); #line 13 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = count; + _tmp0_ = count; #line 13 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp2_ == 0) { + if (_tmp0_ == 0) { #line 14 "/home/jens/Source/shotwell/src/Dialogs.vala" result = TRUE; #line 14 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 912 "Dialogs.c" +#line 1039 "Dialogs.c" } #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = count; -#line 15 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = tag; + _tmp1_ = count; #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = tag_get_user_visible_name (_tmp4_); + _tmp2_ = tag_get_user_visible_name (tag); #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = count; + _tmp4_ = count; #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = g_strdup_printf (ngettext ("This will remove the tag “%s” from one photo. Continue?", "This will remove the tag “%s” from %d photos. Continue?", (gulong) _tmp3_), _tmp6_, _tmp7_); + _tmp5_ = g_strdup_printf (ngettext ("This will remove the tag “%s” from one photo. Continue?", "This will remove the tag “%s” from %d photos. Continue?", (gulong) _tmp1_), _tmp3_, _tmp4_); #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp3_); #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala" - msg = _tmp9_; -#line 20 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp10_ = msg; + msg = _tmp6_; #line 20 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp11_ = app_window_negate_affirm_question (_tmp10_, _ ("_Cancel"), _ ("_Delete"), RESOURCES_DELETE_TAG_TITLE, NULL); + _tmp7_ = msg; #line 20 "/home/jens/Source/shotwell/src/Dialogs.vala" - result = _tmp11_; + result = app_window_negate_affirm_question (_tmp7_, _ ("_Cancel"), _ ("_Delete"), RESOURCES_DELETE_TAG_TITLE, NULL); #line 20 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (msg); #line 20 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 942 "Dialogs.c" +#line 1065 "Dialogs.c" } -gboolean dialogs_confirm_delete_saved_search (SavedSearch* search) { +gboolean +dialogs_confirm_delete_saved_search (SavedSearch* search) +{ gboolean result = FALSE; gchar* msg = NULL; - SavedSearch* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - gboolean _tmp5_; #line 24 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (IS_SAVED_SEARCH (search), FALSE); #line 25 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = search; + _tmp0_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (search, TYPE_DATA_OBJECT, DataObject)); #line 25 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject)); -#line 25 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 25 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = g_strdup_printf (_ ("This will remove the saved search “%s”. Continue?"), _tmp2_); + _tmp2_ = g_strdup_printf (_ ("This will remove the saved search “%s”. Continue?"), _tmp1_); #line 25 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 25 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 25 "/home/jens/Source/shotwell/src/Dialogs.vala" - msg = _tmp4_; -#line 28 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = app_window_negate_affirm_question (msg, _ ("_Cancel"), _ ("_Delete"), RESOURCES_DELETE_SAVED_SEARCH_DIALOG_TITLE, NULL); + msg = _tmp3_; #line 28 "/home/jens/Source/shotwell/src/Dialogs.vala" - result = _tmp5_; + result = app_window_negate_affirm_question (msg, _ ("_Cancel"), _ ("_Delete"), RESOURCES_DELETE_SAVED_SEARCH_DIALOG_TITLE, NULL); #line 28 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (msg); #line 28 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 979 "Dialogs.c" +#line 1098 "Dialogs.c" } -gboolean dialogs_confirm_warn_developer_changed (gint number) { +gboolean +dialogs_confirm_warn_developer_changed (gint number) +{ gboolean result = FALSE; GtkMessageDialog* dialog = NULL; AppWindow* _tmp0_; AppWindow* _tmp1_; - gint _tmp2_; + GtkMessageDialog* _tmp2_; GtkMessageDialog* _tmp3_; - GtkMessageDialog* _tmp4_; gint response = 0; - gint _tmp5_; #line 33 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp0_ = app_window_get_instance (); #line 33 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp1_ = _tmp0_; #line 33 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = number; -#line 33 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", ngettext ("Switching developers will undo all changes you have made to this photo" \ + _tmp2_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", ngettext ("Switching developers will undo all changes you have made to this photo" \ " in Shotwell", "Switching developers will undo all changes you have made to these phot" \ -"os in Shotwell", (gulong) _tmp2_)); +"os in Shotwell", (gulong) number)); #line 33 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_object_ref_sink (_tmp3_); + g_object_ref_sink (_tmp2_); #line 33 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 33 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_tmp1_); #line 33 "/home/jens/Source/shotwell/src/Dialogs.vala" - dialog = _tmp4_; + dialog = _tmp3_; #line 39 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, NULL); #line 40 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _ ("_Switch Developer"), GTK_RESPONSE_YES, NULL); #line 42 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog)); -#line 42 "/home/jens/Source/shotwell/src/Dialogs.vala" - response = _tmp5_; + response = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog)); #line 44 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget)); #line 46 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -1023,43 +1138,41 @@ gboolean dialogs_confirm_warn_developer_changed (gint number) { _g_object_unref0 (dialog); #line 46 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 1025 "Dialogs.c" +#line 1140 "Dialogs.c" } -GFile* export_ui_choose_file (const gchar* current_file_basename) { +GFile* +export_ui_choose_file (const gchar* current_file_basename) +{ GFile* result = NULL; GFile* _tmp0_; const gchar* _tmp3_ = NULL; - const gchar* _tmp4_; - gboolean _tmp5_; gchar* file_chooser_title = NULL; - gchar* _tmp6_; + gchar* _tmp4_; GtkFileChooserDialog* chooser = NULL; - const gchar* _tmp7_; - AppWindow* _tmp8_; - AppWindow* _tmp9_; + const gchar* _tmp5_; + AppWindow* _tmp6_; + AppWindow* _tmp7_; + GtkFileChooserDialog* _tmp8_; + GtkFileChooserDialog* _tmp9_; GtkFileChooserDialog* _tmp10_; GtkFileChooserDialog* _tmp11_; - GtkFileChooserDialog* _tmp12_; - GtkFileChooserDialog* _tmp13_; - GFile* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; - GtkFileChooserDialog* _tmp17_; - const gchar* _tmp18_; - GtkFileChooserDialog* _tmp19_; + GFile* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + GtkFileChooserDialog* _tmp15_; + GtkFileChooserDialog* _tmp16_; GFile* file = NULL; - GtkFileChooserDialog* _tmp20_; - gint _tmp21_; - GtkFileChooserDialog* _tmp28_; + GtkFileChooserDialog* _tmp17_; + GtkFileChooserDialog* _tmp24_; #line 54 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (current_file_basename != NULL, NULL); #line 55 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp0_ = export_ui_current_export_dir; #line 55 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp0_ == NULL) { -#line 1061 "Dialogs.c" +#line 1174 "Dialogs.c" const gchar* _tmp1_; GFile* _tmp2_; #line 56 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -1070,111 +1183,103 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) { _g_object_unref0 (export_ui_current_export_dir); #line 56 "/home/jens/Source/shotwell/src/Dialogs.vala" export_ui_current_export_dir = _tmp2_; -#line 1072 "Dialogs.c" +#line 1185 "Dialogs.c" } #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = current_file_basename; -#line 58 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = video_reader_is_supported_video_filename (_tmp4_); -#line 58 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp5_) { + if (video_reader_is_supported_video_filename (current_file_basename)) { #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp3_ = _ ("Export Video"); -#line 1082 "Dialogs.c" +#line 1191 "Dialogs.c" } else { #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp3_ = _ ("Export Photo"); -#line 1086 "Dialogs.c" +#line 1195 "Dialogs.c" } #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = g_strdup (_tmp3_); + _tmp4_ = g_strdup (_tmp3_); #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala" - file_chooser_title = _tmp6_; + file_chooser_title = _tmp4_; #line 61 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = file_chooser_title; + _tmp5_ = file_chooser_title; #line 61 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = app_window_get_instance (); + _tmp6_ = app_window_get_instance (); #line 61 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 61 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp10_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SAVE, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_SAVE_LABEL, GTK_RESPONSE_ACCEPT, NULL, NULL); + _tmp8_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SAVE, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_SAVE_LABEL, GTK_RESPONSE_ACCEPT, NULL, NULL); #line 61 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_object_ref_sink (_tmp10_); + g_object_ref_sink (_tmp8_); #line 61 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 61 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp7_); #line 61 "/home/jens/Source/shotwell/src/Dialogs.vala" - chooser = _tmp11_; + chooser = _tmp9_; #line 64 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp12_ = chooser; + _tmp10_ = chooser; #line 64 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_file_chooser_set_do_overwrite_confirmation (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE); + gtk_file_chooser_set_do_overwrite_confirmation (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_file_chooser_get_type (), GtkFileChooser), TRUE); #line 65 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp13_ = chooser; + _tmp11_ = chooser; #line 65 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp14_ = export_ui_current_export_dir; + _tmp12_ = export_ui_current_export_dir; #line 65 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp15_ = g_file_get_path (_tmp14_); + _tmp13_ = g_file_get_path (_tmp12_); #line 65 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp16_ = _tmp15_; + _tmp14_ = _tmp13_; #line 65 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp16_); + gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_file_chooser_get_type (), GtkFileChooser), _tmp14_); #line 65 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp16_); -#line 66 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp17_ = chooser; + _g_free0 (_tmp14_); #line 66 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp18_ = current_file_basename; + _tmp15_ = chooser; #line 66 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_file_chooser_set_current_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp18_); + gtk_file_chooser_set_current_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_file_chooser_get_type (), GtkFileChooser), current_file_basename); #line 67 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp19_ = chooser; + _tmp16_ = chooser; #line 67 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE); + gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_file_chooser_get_type (), GtkFileChooser), FALSE); #line 69 "/home/jens/Source/shotwell/src/Dialogs.vala" file = NULL; #line 70 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp20_ = chooser; -#line 70 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp21_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_dialog_get_type (), GtkDialog)); + _tmp17_ = chooser; #line 70 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp21_ == ((gint) GTK_RESPONSE_ACCEPT)) { -#line 1142 "Dialogs.c" - GtkFileChooserDialog* _tmp22_; - gchar* _tmp23_; - gchar* _tmp24_; - GFile* _tmp25_; - GFile* _tmp26_; - GFile* _tmp27_; + if (gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_dialog_get_type (), GtkDialog)) == ((gint) GTK_RESPONSE_ACCEPT)) { +#line 1247 "Dialogs.c" + GtkFileChooserDialog* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; + GFile* _tmp21_; + GFile* _tmp22_; + GFile* _tmp23_; #line 71 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp22_ = chooser; + _tmp18_ = chooser; #line 71 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp23_ = gtk_file_chooser_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); + _tmp19_ = gtk_file_chooser_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_file_chooser_get_type (), GtkFileChooser)); #line 71 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp24_ = _tmp23_; + _tmp20_ = _tmp19_; #line 71 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp25_ = g_file_new_for_path (_tmp24_); + _tmp21_ = g_file_new_for_path (_tmp20_); #line 71 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (file); #line 71 "/home/jens/Source/shotwell/src/Dialogs.vala" - file = _tmp25_; + file = _tmp21_; #line 71 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp24_); + _g_free0 (_tmp20_); #line 72 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp26_ = file; + _tmp22_ = file; #line 72 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp27_ = g_file_get_parent (_tmp26_); + _tmp23_ = g_file_get_parent (_tmp22_); #line 72 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (export_ui_current_export_dir); #line 72 "/home/jens/Source/shotwell/src/Dialogs.vala" - export_ui_current_export_dir = _tmp27_; -#line 1171 "Dialogs.c" + export_ui_current_export_dir = _tmp23_; +#line 1276 "Dialogs.c" } #line 74 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp28_ = chooser; + _tmp24_ = chooser; #line 74 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget)); #line 76 "/home/jens/Source/shotwell/src/Dialogs.vala" result = file; #line 76 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -1183,41 +1288,42 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) { _g_free0 (file_chooser_title); #line 76 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 1185 "Dialogs.c" +#line 1290 "Dialogs.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 95 "/home/jens/Source/shotwell/src/Dialogs.vala" return self ? g_object_ref (self) : NULL; -#line 1192 "Dialogs.c" +#line 1299 "Dialogs.c" } -GFile* export_ui_choose_dir (const gchar* user_title) { +GFile* +export_ui_choose_dir (const gchar* user_title) +{ GFile* result = NULL; GFile* _tmp0_; - const gchar* _tmp3_; GtkFileChooserDialog* chooser = NULL; - const gchar* _tmp4_; - AppWindow* _tmp5_; - AppWindow* _tmp6_; + AppWindow* _tmp3_; + AppWindow* _tmp4_; + GtkFileChooserDialog* _tmp5_; + GtkFileChooserDialog* _tmp6_; GtkFileChooserDialog* _tmp7_; - GtkFileChooserDialog* _tmp8_; - GtkFileChooserDialog* _tmp9_; - GFile* _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; - GtkFileChooserDialog* _tmp13_; + GFile* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + GtkFileChooserDialog* _tmp11_; GFile* dir = NULL; - GtkFileChooserDialog* _tmp14_; - gint _tmp15_; - GtkFileChooserDialog* _tmp22_; + GtkFileChooserDialog* _tmp12_; + GtkFileChooserDialog* _tmp19_; #line 80 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp0_ = export_ui_current_export_dir; #line 80 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp0_ == NULL) { -#line 1219 "Dialogs.c" +#line 1325 "Dialogs.c" const gchar* _tmp1_; GFile* _tmp2_; #line 81 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -1228,241 +1334,220 @@ GFile* export_ui_choose_dir (const gchar* user_title) { _g_object_unref0 (export_ui_current_export_dir); #line 81 "/home/jens/Source/shotwell/src/Dialogs.vala" export_ui_current_export_dir = _tmp2_; -#line 1230 "Dialogs.c" +#line 1336 "Dialogs.c" } #line 83 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = user_title; -#line 83 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp3_ == NULL) { + if (user_title == NULL) { #line 84 "/home/jens/Source/shotwell/src/Dialogs.vala" user_title = _ ("Export Photos"); -#line 1238 "Dialogs.c" +#line 1342 "Dialogs.c" } #line 86 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = user_title; -#line 86 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = app_window_get_instance (); + _tmp3_ = app_window_get_instance (); #line 86 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 86 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_ACCEPT, NULL, NULL); + _tmp5_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (user_title, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_ACCEPT, NULL, NULL); #line 86 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_object_ref_sink (_tmp7_); + g_object_ref_sink (_tmp5_); #line 86 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 86 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp4_); #line 86 "/home/jens/Source/shotwell/src/Dialogs.vala" - chooser = _tmp8_; + chooser = _tmp6_; #line 89 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9_ = chooser; + _tmp7_ = chooser; #line 89 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp10_ = export_ui_current_export_dir; + _tmp8_ = export_ui_current_export_dir; #line 89 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp11_ = g_file_get_path (_tmp10_); + _tmp9_ = g_file_get_path (_tmp8_); #line 89 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 89 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp12_); + gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_file_chooser_get_type (), GtkFileChooser), _tmp10_); #line 89 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp10_); #line 90 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp13_ = chooser; + _tmp11_ = chooser; #line 90 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE); + gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_file_chooser_get_type (), GtkFileChooser), FALSE); #line 92 "/home/jens/Source/shotwell/src/Dialogs.vala" dir = NULL; #line 93 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp14_ = chooser; -#line 93 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp15_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_dialog_get_type (), GtkDialog)); + _tmp12_ = chooser; #line 93 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp15_ == ((gint) GTK_RESPONSE_ACCEPT)) { -#line 1280 "Dialogs.c" - GtkFileChooserDialog* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; - GFile* _tmp19_; - GFile* _tmp20_; - GFile* _tmp21_; + if (gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_dialog_get_type (), GtkDialog)) == ((gint) GTK_RESPONSE_ACCEPT)) { +#line 1380 "Dialogs.c" + GtkFileChooserDialog* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + GFile* _tmp16_; + GFile* _tmp17_; + GFile* _tmp18_; #line 94 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp16_ = chooser; + _tmp13_ = chooser; #line 94 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp17_ = gtk_file_chooser_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); + _tmp14_ = gtk_file_chooser_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_file_chooser_get_type (), GtkFileChooser)); #line 94 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp18_ = _tmp17_; + _tmp15_ = _tmp14_; #line 94 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp19_ = g_file_new_for_path (_tmp18_); + _tmp16_ = g_file_new_for_path (_tmp15_); #line 94 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (dir); #line 94 "/home/jens/Source/shotwell/src/Dialogs.vala" - dir = _tmp19_; + dir = _tmp16_; #line 94 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp15_); #line 95 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp20_ = dir; + _tmp17_ = dir; #line 95 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp21_ = _g_object_ref0 (_tmp20_); + _tmp18_ = _g_object_ref0 (_tmp17_); #line 95 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (export_ui_current_export_dir); #line 95 "/home/jens/Source/shotwell/src/Dialogs.vala" - export_ui_current_export_dir = _tmp21_; -#line 1309 "Dialogs.c" + export_ui_current_export_dir = _tmp18_; +#line 1409 "Dialogs.c" } #line 98 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp22_ = chooser; + _tmp19_ = chooser; #line 98 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget)); #line 100 "/home/jens/Source/shotwell/src/Dialogs.vala" result = dir; #line 100 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (chooser); #line 100 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 1321 "Dialogs.c" +#line 1421 "Dialogs.c" } -void open_external_editor_error_dialog (GError* err, Photo* photo) { +void +open_external_editor_error_dialog (GError* err, + Photo* photo) +{ gboolean _tmp0_ = FALSE; - GError* _tmp1_; #line 107 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_if_fail (IS_PHOTO (photo)); #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = err; -#line 109 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (g_error_matches (_tmp1_, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED)) { + if (g_error_matches (err, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED)) { #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp0_ = TRUE; -#line 1336 "Dialogs.c" +#line 1436 "Dialogs.c" } else { - GError* _tmp2_; -#line 109 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = err; #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = g_error_matches (_tmp2_, G_FILE_ERROR, G_FILE_ERROR_PERM); -#line 1343 "Dialogs.c" + _tmp0_ = g_error_matches (err, G_FILE_ERROR, G_FILE_ERROR_PERM); +#line 1440 "Dialogs.c" } #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp0_) { -#line 1347 "Dialogs.c" - Photo* _tmp3_; +#line 1444 "Dialogs.c" + GFile* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; GFile* _tmp4_; - GFile* _tmp5_; - GFile* _tmp6_; - GFile* _tmp7_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = photo; + _tmp1_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MEDIA_SOURCE, MediaSource)); #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp2_ = _tmp1_; #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = _tmp4_; -#line 111 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = g_file_get_parent (_tmp5_); + _tmp3_ = g_file_get_parent (_tmp2_); #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = g_file_get_path (_tmp7_); + _tmp5_ = g_file_get_path (_tmp4_); #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp10_ = g_strdup_printf (_ ("Shotwell couldn’t create a file for editing this photo because you do " \ -"not have permission to write to %s."), _tmp9_); + _tmp7_ = g_strdup_printf (_ ("Shotwell couldn’t create a file for editing this photo because you do " \ +"not have permission to write to %s."), _tmp6_); #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala" - app_window_error_message (_tmp11_, NULL); + app_window_error_message (_tmp8_, NULL); #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp8_); #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp6_); #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp4_); #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_object_unref0 (_tmp5_); -#line 1385 "Dialogs.c" + _g_object_unref0 (_tmp2_); +#line 1479 "Dialogs.c" } else { - GError* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; -#line 116 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp12_ = err; + gchar* _tmp9_; + gchar* _tmp10_; #line 116 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp13_ = resources_launch_editor_failed (_tmp12_); + _tmp9_ = resources_launch_editor_failed (err); #line 116 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp14_ = _tmp13_; + _tmp10_ = _tmp9_; #line 116 "/home/jens/Source/shotwell/src/Dialogs.vala" - app_window_error_message (_tmp14_, NULL); + app_window_error_message (_tmp10_, NULL); #line 116 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp14_); -#line 1400 "Dialogs.c" + _g_free0 (_tmp10_); +#line 1491 "Dialogs.c" } } -GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining) { +GtkResponseType +export_error_dialog (GFile* dest, + gboolean photos_remaining) +{ GtkResponseType result = 0; gchar* message = NULL; - GFile* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; GtkResponseType response = 0; - gboolean _tmp5_; #line 120 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (G_IS_FILE (dest), 0); #line 121 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = dest; -#line 121 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = g_file_get_path (_tmp0_); + _tmp0_ = g_file_get_path (dest); #line 121 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 121 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = g_strconcat (_ ("Unable to export the following photo due to a file error.\n\n"), _tmp2_, NULL); + _tmp2_ = g_strconcat (_ ("Unable to export the following photo due to a file error.\n\n"), _tmp1_, NULL); #line 121 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 121 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 121 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp4_; + message = _tmp3_; #line 124 "/home/jens/Source/shotwell/src/Dialogs.vala" response = GTK_RESPONSE_NONE; #line 126 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = photos_remaining; -#line 126 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp5_) { -#line 1437 "Dialogs.c" + if (photos_remaining) { +#line 1525 "Dialogs.c" + const gchar* _tmp4_; + gchar* _tmp5_; const gchar* _tmp6_; - gchar* _tmp7_; - const gchar* _tmp8_; - GtkResponseType _tmp9_; #line 127 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = message; + _tmp4_ = message; #line 127 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = g_strconcat (_tmp6_, _ ("\n\nWould you like to continue exporting?"), NULL); + _tmp5_ = g_strconcat (_tmp4_, _ ("\n\nWould you like to continue exporting?"), NULL); #line 127 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 127 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp7_; -#line 128 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = message; + message = _tmp5_; #line 128 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9_ = app_window_affirm_cancel_question (_tmp8_, _ ("Con_tinue"), NULL, NULL); + _tmp6_ = message; #line 128 "/home/jens/Source/shotwell/src/Dialogs.vala" - response = _tmp9_; -#line 1456 "Dialogs.c" + response = app_window_affirm_cancel_question (_tmp6_, _ ("Con_tinue"), NULL, NULL); +#line 1541 "Dialogs.c" } else { - const gchar* _tmp10_; + const gchar* _tmp7_; #line 130 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp10_ = message; + _tmp7_ = message; #line 130 "/home/jens/Source/shotwell/src/Dialogs.vala" - app_window_error_message (_tmp10_, NULL); -#line 1463 "Dialogs.c" + app_window_error_message (_tmp7_, NULL); +#line 1548 "Dialogs.c" } #line 133 "/home/jens/Source/shotwell/src/Dialogs.vala" result = response; @@ -1470,223 +1555,210 @@ GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining) { _g_free0 (message); #line 133 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 1471 "Dialogs.c" +#line 1556 "Dialogs.c" } -gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_dest_id) { +gchar* +import_ui_generate_import_failure_list (GeeList* failed, + gboolean show_dest_id) +{ gchar* result = NULL; - GeeList* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; gchar* list = NULL; - gchar* _tmp3_; + gchar* _tmp2_; gint remaining = 0; - GeeList* _tmp28_; - gint _tmp29_; - gint _tmp30_; - gint _tmp31_; + gint _tmp23_; + gint _tmp24_; + gint _tmp25_; #line 143 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (GEE_IS_LIST (failed), NULL); #line 144 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = failed; + _tmp0_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (failed, GEE_TYPE_COLLECTION, GeeCollection)); #line 144 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 144 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 144 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 145 "/home/jens/Source/shotwell/src/Dialogs.vala" result = NULL; #line 145 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 1501 "Dialogs.c" +#line 1585 "Dialogs.c" } #line 147 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = g_strdup (""); + _tmp2_ = g_strdup (""); #line 147 "/home/jens/Source/shotwell/src/Dialogs.vala" - list = _tmp3_; -#line 1507 "Dialogs.c" + list = _tmp2_; +#line 1591 "Dialogs.c" { gint ctr = 0; #line 148 "/home/jens/Source/shotwell/src/Dialogs.vala" ctr = 0; -#line 1512 "Dialogs.c" +#line 1596 "Dialogs.c" { - gboolean _tmp4_ = FALSE; + gboolean _tmp3_ = FALSE; #line 148 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = TRUE; + _tmp3_ = TRUE; #line 148 "/home/jens/Source/shotwell/src/Dialogs.vala" while (TRUE) { -#line 1519 "Dialogs.c" - gboolean _tmp6_ = FALSE; - gint _tmp7_; - const gchar* _tmp12_ = NULL; - gboolean _tmp13_; - const gchar* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; - gchar* _tmp27_; +#line 1603 "Dialogs.c" + gboolean _tmp5_ = FALSE; + gint _tmp6_; + const gchar* _tmp10_ = NULL; + const gchar* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; #line 148 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (!_tmp4_) { -#line 1530 "Dialogs.c" - gint _tmp5_; + if (!_tmp3_) { +#line 1613 "Dialogs.c" + gint _tmp4_; #line 148 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = ctr; + _tmp4_ = ctr; #line 148 "/home/jens/Source/shotwell/src/Dialogs.vala" - ctr = _tmp5_ + 1; -#line 1536 "Dialogs.c" + ctr = _tmp4_ + 1; +#line 1619 "Dialogs.c" } #line 148 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = FALSE; + _tmp3_ = FALSE; #line 148 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = ctr; + _tmp6_ = ctr; #line 148 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp7_ < IMPORT_UI_REPORT_FAILURE_COUNT) { -#line 1544 "Dialogs.c" + if (_tmp6_ < IMPORT_UI_REPORT_FAILURE_COUNT) { +#line 1627 "Dialogs.c" + gint _tmp7_; gint _tmp8_; - GeeList* _tmp9_; - gint _tmp10_; - gint _tmp11_; -#line 148 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = ctr; + gint _tmp9_; #line 148 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9_ = failed; + _tmp7_ = ctr; #line 148 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (failed, GEE_TYPE_COLLECTION, GeeCollection)); #line 148 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 148 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = _tmp8_ < _tmp11_; -#line 1559 "Dialogs.c" + _tmp5_ = _tmp7_ < _tmp9_; +#line 1639 "Dialogs.c" } else { #line 148 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = FALSE; -#line 1563 "Dialogs.c" + _tmp5_ = FALSE; +#line 1643 "Dialogs.c" } #line 148 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (!_tmp6_) { + if (!_tmp5_) { #line 148 "/home/jens/Source/shotwell/src/Dialogs.vala" break; -#line 1569 "Dialogs.c" +#line 1649 "Dialogs.c" } #line 149 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp13_ = show_dest_id; -#line 149 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp13_) { -#line 1575 "Dialogs.c" - GeeList* _tmp14_; - gint _tmp15_; - gpointer _tmp16_; - BatchImportResult* _tmp17_; - const gchar* _tmp18_; -#line 149 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp14_ = failed; + if (show_dest_id) { +#line 1653 "Dialogs.c" + gint _tmp11_; + gpointer _tmp12_; + BatchImportResult* _tmp13_; + const gchar* _tmp14_; #line 149 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp15_ = ctr; + _tmp11_ = ctr; #line 149 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp16_ = gee_list_get (_tmp14_, _tmp15_); + _tmp12_ = gee_list_get (failed, _tmp11_); #line 149 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp17_ = (BatchImportResult*) _tmp16_; + _tmp13_ = (BatchImportResult*) _tmp12_; #line 149 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp18_ = _tmp17_->dest_identifier; + _tmp14_ = _tmp13_->dest_identifier; #line 149 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp12_ = _tmp18_; + _tmp10_ = _tmp14_; #line 149 "/home/jens/Source/shotwell/src/Dialogs.vala" - _batch_import_result_unref0 (_tmp17_); -#line 1595 "Dialogs.c" + _batch_import_result_unref0 (_tmp13_); +#line 1670 "Dialogs.c" } else { - GeeList* _tmp19_; - gint _tmp20_; - gpointer _tmp21_; - BatchImportResult* _tmp22_; - const gchar* _tmp23_; -#line 150 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp19_ = failed; + gint _tmp15_; + gpointer _tmp16_; + BatchImportResult* _tmp17_; + const gchar* _tmp18_; #line 150 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp20_ = ctr; + _tmp15_ = ctr; #line 150 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp21_ = gee_list_get (_tmp19_, _tmp20_); + _tmp16_ = gee_list_get (failed, _tmp15_); #line 150 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp22_ = (BatchImportResult*) _tmp21_; + _tmp17_ = (BatchImportResult*) _tmp16_; #line 150 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp23_ = _tmp22_->src_identifier; + _tmp18_ = _tmp17_->src_identifier; #line 150 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp12_ = _tmp23_; + _tmp10_ = _tmp18_; #line 150 "/home/jens/Source/shotwell/src/Dialogs.vala" - _batch_import_result_unref0 (_tmp22_); -#line 1616 "Dialogs.c" + _batch_import_result_unref0 (_tmp17_); +#line 1688 "Dialogs.c" } #line 149 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp24_ = list; + _tmp19_ = list; #line 149 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp25_ = g_strdup_printf ("%s\n", _tmp12_); + _tmp20_ = g_strdup_printf ("%s\n", _tmp10_); #line 149 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp26_ = _tmp25_; + _tmp21_ = _tmp20_; #line 149 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp27_ = g_strconcat (_tmp24_, _tmp26_, NULL); + _tmp22_ = g_strconcat (_tmp19_, _tmp21_, NULL); #line 149 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (list); #line 149 "/home/jens/Source/shotwell/src/Dialogs.vala" - list = _tmp27_; + list = _tmp22_; #line 149 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp26_); -#line 1632 "Dialogs.c" + _g_free0 (_tmp21_); +#line 1704 "Dialogs.c" } } } #line 153 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp28_ = failed; -#line 153 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp29_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp23_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (failed, GEE_TYPE_COLLECTION, GeeCollection)); #line 153 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp30_ = _tmp29_; + _tmp24_ = _tmp23_; #line 153 "/home/jens/Source/shotwell/src/Dialogs.vala" - remaining = _tmp30_ - IMPORT_UI_REPORT_FAILURE_COUNT; + remaining = _tmp24_ - IMPORT_UI_REPORT_FAILURE_COUNT; #line 154 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp31_ = remaining; + _tmp25_ = remaining; #line 154 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp31_ > 0) { -#line 1648 "Dialogs.c" - const gchar* _tmp32_; - gint _tmp33_; - gchar* _tmp34_; - gchar* _tmp35_; - gchar* _tmp36_; + if (_tmp25_ > 0) { +#line 1718 "Dialogs.c" + const gchar* _tmp26_; + gint _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; + gchar* _tmp30_; #line 155 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp32_ = list; + _tmp26_ = list; #line 155 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp33_ = remaining; + _tmp27_ = remaining; #line 155 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp34_ = g_strdup_printf (_ ("(and %d more)\n"), _tmp33_); + _tmp28_ = g_strdup_printf (_ ("(and %d more)\n"), _tmp27_); #line 155 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp35_ = _tmp34_; + _tmp29_ = _tmp28_; #line 155 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp36_ = g_strconcat (_tmp32_, _tmp35_, NULL); + _tmp30_ = g_strconcat (_tmp26_, _tmp29_, NULL); #line 155 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (list); #line 155 "/home/jens/Source/shotwell/src/Dialogs.vala" - list = _tmp36_; + list = _tmp30_; #line 155 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp35_); -#line 1670 "Dialogs.c" + _g_free0 (_tmp29_); +#line 1740 "Dialogs.c" } #line 157 "/home/jens/Source/shotwell/src/Dialogs.vala" result = list; #line 157 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 1676 "Dialogs.c" +#line 1746 "Dialogs.c" } -ImportUIQuestionParams* import_ui_question_params_construct (GType object_type, const gchar* question, const gchar* yes_button, const gchar* no_button) { +ImportUIQuestionParams* +import_ui_question_params_construct (GType object_type, + const gchar* question, + const gchar* yes_button, + const gchar* no_button) +{ ImportUIQuestionParams* self = NULL; - const gchar* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; + gchar* _tmp2_; #line 165 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (question != NULL, NULL); #line 165 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -1696,140 +1768,163 @@ ImportUIQuestionParams* import_ui_question_params_construct (GType object_type, #line 165 "/home/jens/Source/shotwell/src/Dialogs.vala" self = (ImportUIQuestionParams*) g_type_create_instance (object_type); #line 166 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = question; -#line 166 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (question); #line 166 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (self->question); #line 166 "/home/jens/Source/shotwell/src/Dialogs.vala" - self->question = _tmp1_; + self->question = _tmp0_; #line 167 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = yes_button; -#line 167 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (yes_button); #line 167 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (self->yes_button); #line 167 "/home/jens/Source/shotwell/src/Dialogs.vala" - self->yes_button = _tmp3_; -#line 168 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = no_button; + self->yes_button = _tmp1_; #line 168 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = g_strdup (_tmp4_); + _tmp2_ = g_strdup (no_button); #line 168 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (self->no_button); #line 168 "/home/jens/Source/shotwell/src/Dialogs.vala" - self->no_button = _tmp5_; + self->no_button = _tmp2_; #line 165 "/home/jens/Source/shotwell/src/Dialogs.vala" return self; -#line 1722 "Dialogs.c" +#line 1788 "Dialogs.c" } -ImportUIQuestionParams* import_ui_question_params_new (const gchar* question, const gchar* yes_button, const gchar* no_button) { +ImportUIQuestionParams* +import_ui_question_params_new (const gchar* question, + const gchar* yes_button, + const gchar* no_button) +{ #line 165 "/home/jens/Source/shotwell/src/Dialogs.vala" return import_ui_question_params_construct (IMPORT_UI_TYPE_QUESTION_PARAMS, question, yes_button, no_button); -#line 1729 "Dialogs.c" +#line 1799 "Dialogs.c" } -static void import_ui_value_question_params_init (GValue* value) { +static void +import_ui_value_question_params_init (GValue* value) +{ #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = NULL; -#line 1736 "Dialogs.c" +#line 1808 "Dialogs.c" } -static void import_ui_value_question_params_free_value (GValue* value) { +static void +import_ui_value_question_params_free_value (GValue* value) +{ #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" if (value->data[0].v_pointer) { #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" import_ui_question_params_unref (value->data[0].v_pointer); -#line 1745 "Dialogs.c" +#line 1819 "Dialogs.c" } } -static void import_ui_value_question_params_copy_value (const GValue* src_value, GValue* dest_value) { +static void +import_ui_value_question_params_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" if (src_value->data[0].v_pointer) { #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" dest_value->data[0].v_pointer = import_ui_question_params_ref (src_value->data[0].v_pointer); -#line 1755 "Dialogs.c" +#line 1832 "Dialogs.c" } else { #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" dest_value->data[0].v_pointer = NULL; -#line 1759 "Dialogs.c" +#line 1836 "Dialogs.c" } } -static gpointer import_ui_value_question_params_peek_pointer (const GValue* value) { +static gpointer +import_ui_value_question_params_peek_pointer (const GValue* value) +{ #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" return value->data[0].v_pointer; -#line 1767 "Dialogs.c" +#line 1846 "Dialogs.c" } -static gchar* import_ui_value_question_params_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +import_ui_value_question_params_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" if (collect_values[0].v_pointer) { -#line 1774 "Dialogs.c" +#line 1858 "Dialogs.c" ImportUIQuestionParams * object; object = collect_values[0].v_pointer; #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" if (object->parent_instance.g_class == NULL) { #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1781 "Dialogs.c" +#line 1865 "Dialogs.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1785 "Dialogs.c" +#line 1869 "Dialogs.c" } #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = import_ui_question_params_ref (object); -#line 1789 "Dialogs.c" +#line 1873 "Dialogs.c" } else { #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = NULL; -#line 1793 "Dialogs.c" +#line 1877 "Dialogs.c" } #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" return NULL; -#line 1797 "Dialogs.c" +#line 1881 "Dialogs.c" } -static gchar* import_ui_value_question_params_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +import_ui_value_question_params_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ ImportUIQuestionParams ** object_p; object_p = collect_values[0].v_pointer; #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" if (!object_p) { #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1808 "Dialogs.c" +#line 1897 "Dialogs.c" } #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" if (!value->data[0].v_pointer) { #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" *object_p = NULL; -#line 1814 "Dialogs.c" +#line 1903 "Dialogs.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" *object_p = value->data[0].v_pointer; -#line 1818 "Dialogs.c" +#line 1907 "Dialogs.c" } else { #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" *object_p = import_ui_question_params_ref (value->data[0].v_pointer); -#line 1822 "Dialogs.c" +#line 1911 "Dialogs.c" } #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" return NULL; -#line 1826 "Dialogs.c" +#line 1915 "Dialogs.c" } -GParamSpec* import_ui_param_spec_question_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +import_ui_param_spec_question_params (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ImportUIParamSpecQuestionParams* spec; #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (g_type_is_a (object_type, IMPORT_UI_TYPE_QUESTION_PARAMS), NULL); @@ -1839,20 +1934,25 @@ GParamSpec* import_ui_param_spec_question_params (const gchar* name, const gchar G_PARAM_SPEC (spec)->value_type = object_type; #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" return G_PARAM_SPEC (spec); -#line 1840 "Dialogs.c" +#line 1935 "Dialogs.c" } -gpointer import_ui_value_get_question_params (const GValue* value) { +gpointer +import_ui_value_get_question_params (const GValue* value) +{ #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, IMPORT_UI_TYPE_QUESTION_PARAMS), NULL); #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" return value->data[0].v_pointer; -#line 1849 "Dialogs.c" +#line 1946 "Dialogs.c" } -void import_ui_value_set_question_params (GValue* value, gpointer v_object) { +void +import_ui_value_set_question_params (GValue* value, + gpointer v_object) +{ ImportUIQuestionParams * old; #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, IMPORT_UI_TYPE_QUESTION_PARAMS)); @@ -1868,22 +1968,25 @@ void import_ui_value_set_question_params (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" import_ui_question_params_ref (value->data[0].v_pointer); -#line 1869 "Dialogs.c" +#line 1969 "Dialogs.c" } else { #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = NULL; -#line 1873 "Dialogs.c" +#line 1973 "Dialogs.c" } #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" if (old) { #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" import_ui_question_params_unref (old); -#line 1879 "Dialogs.c" +#line 1979 "Dialogs.c" } } -void import_ui_value_take_question_params (GValue* value, gpointer v_object) { +void +import_ui_value_take_question_params (GValue* value, + gpointer v_object) +{ ImportUIQuestionParams * old; #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, IMPORT_UI_TYPE_QUESTION_PARAMS)); @@ -1897,38 +2000,44 @@ void import_ui_value_take_question_params (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = v_object; -#line 1898 "Dialogs.c" +#line 2001 "Dialogs.c" } else { #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = NULL; -#line 1902 "Dialogs.c" +#line 2005 "Dialogs.c" } #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" if (old) { #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" import_ui_question_params_unref (old); -#line 1908 "Dialogs.c" +#line 2011 "Dialogs.c" } } -static void import_ui_question_params_class_init (ImportUIQuestionParamsClass * klass) { +static void +import_ui_question_params_class_init (ImportUIQuestionParamsClass * klass) +{ #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" import_ui_question_params_parent_class = g_type_class_peek_parent (klass); #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" ((ImportUIQuestionParamsClass *) klass)->finalize = import_ui_question_params_finalize; -#line 1918 "Dialogs.c" +#line 2023 "Dialogs.c" } -static void import_ui_question_params_instance_init (ImportUIQuestionParams * self) { +static void +import_ui_question_params_instance_init (ImportUIQuestionParams * self) +{ #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" self->ref_count = 1; -#line 1925 "Dialogs.c" +#line 2032 "Dialogs.c" } -static void import_ui_question_params_finalize (ImportUIQuestionParams * obj) { +static void +import_ui_question_params_finalize (ImportUIQuestionParams * obj) +{ ImportUIQuestionParams * self; #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, IMPORT_UI_TYPE_QUESTION_PARAMS, ImportUIQuestionParams); @@ -1940,11 +2049,13 @@ static void import_ui_question_params_finalize (ImportUIQuestionParams * obj) { _g_free0 (self->yes_button); #line 163 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (self->no_button); -#line 1941 "Dialogs.c" +#line 2050 "Dialogs.c" } -GType import_ui_question_params_get_type (void) { +GType +import_ui_question_params_get_type (void) +{ static volatile gsize import_ui_question_params_type_id__volatile = 0; if (g_once_init_enter (&import_ui_question_params_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { import_ui_value_question_params_init, import_ui_value_question_params_free_value, import_ui_value_question_params_copy_value, import_ui_value_question_params_peek_pointer, "p", import_ui_value_question_params_collect_value, "p", import_ui_value_question_params_lcopy_value }; @@ -1958,18 +2069,22 @@ GType import_ui_question_params_get_type (void) { } -gpointer import_ui_question_params_ref (gpointer instance) { +gpointer +import_ui_question_params_ref (gpointer instance) +{ ImportUIQuestionParams * self; self = instance; #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" g_atomic_int_inc (&self->ref_count); #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" return instance; -#line 1966 "Dialogs.c" +#line 2079 "Dialogs.c" } -void import_ui_question_params_unref (gpointer instance) { +void +import_ui_question_params_unref (gpointer instance) +{ ImportUIQuestionParams * self; self = instance; #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -1978,79 +2093,72 @@ void import_ui_question_params_unref (gpointer instance) { IMPORT_UI_QUESTION_PARAMS_GET_CLASS (self)->finalize (self); #line 160 "/home/jens/Source/shotwell/src/Dialogs.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1979 "Dialogs.c" +#line 2094 "Dialogs.c" } } -gboolean import_ui_import_has_photos (GeeCollection* import_collection) { +gboolean +import_ui_import_has_photos (GeeCollection* import_collection) +{ gboolean result = FALSE; #line 172 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (GEE_IS_COLLECTION (import_collection), FALSE); -#line 1988 "Dialogs.c" +#line 2105 "Dialogs.c" { GeeIterator* _current_result_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 173 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = import_collection; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (import_collection, GEE_TYPE_ITERABLE, GeeIterable)); #line 173 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 173 "/home/jens/Source/shotwell/src/Dialogs.vala" - _current_result_it = _tmp1_; + _current_result_it = _tmp0_; #line 173 "/home/jens/Source/shotwell/src/Dialogs.vala" while (TRUE) { -#line 2001 "Dialogs.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 2115 "Dialogs.c" + GeeIterator* _tmp1_; BatchImportResult* current_result = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - gboolean _tmp6_ = FALSE; - BatchImportResult* _tmp7_; - GFile* _tmp8_; -#line 173 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = _current_result_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + gboolean _tmp4_ = FALSE; + BatchImportResult* _tmp5_; + GFile* _tmp6_; #line 173 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _current_result_it; #line 173 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 173 "/home/jens/Source/shotwell/src/Dialogs.vala" break; -#line 2018 "Dialogs.c" +#line 2129 "Dialogs.c" } #line 173 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = _current_result_it; + _tmp2_ = _current_result_it; #line 173 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 173 "/home/jens/Source/shotwell/src/Dialogs.vala" - current_result = (BatchImportResult*) _tmp5_; + current_result = (BatchImportResult*) _tmp3_; #line 174 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = current_result; + _tmp5_ = current_result; #line 174 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = _tmp7_->file; + _tmp6_ = _tmp5_->file; #line 174 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp8_ != NULL) { -#line 2032 "Dialogs.c" - BatchImportResult* _tmp9_; - GFile* _tmp10_; - PhotoFileFormat _tmp11_; -#line 175 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9_ = current_result; + if (_tmp6_ != NULL) { +#line 2143 "Dialogs.c" + BatchImportResult* _tmp7_; + GFile* _tmp8_; #line 175 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp10_ = _tmp9_->file; + _tmp7_ = current_result; #line 175 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp11_ = photo_file_format_get_by_file_extension (_tmp10_); + _tmp8_ = _tmp7_->file; #line 175 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = _tmp11_ != PHOTO_FILE_FORMAT_UNKNOWN; -#line 2044 "Dialogs.c" + _tmp4_ = photo_file_format_get_by_file_extension (_tmp8_) != PHOTO_FILE_FORMAT_UNKNOWN; +#line 2152 "Dialogs.c" } else { #line 174 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = FALSE; -#line 2048 "Dialogs.c" + _tmp4_ = FALSE; +#line 2156 "Dialogs.c" } #line 174 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp6_) { + if (_tmp4_) { #line 176 "/home/jens/Source/shotwell/src/Dialogs.vala" result = TRUE; #line 176 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -2059,92 +2167,85 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) { _g_object_unref0 (_current_result_it); #line 176 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 2060 "Dialogs.c" +#line 2168 "Dialogs.c" } #line 173 "/home/jens/Source/shotwell/src/Dialogs.vala" _batch_import_result_unref0 (current_result); -#line 2064 "Dialogs.c" +#line 2172 "Dialogs.c" } #line 173 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_current_result_it); -#line 2068 "Dialogs.c" +#line 2176 "Dialogs.c" } #line 179 "/home/jens/Source/shotwell/src/Dialogs.vala" result = FALSE; #line 179 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 2074 "Dialogs.c" +#line 2182 "Dialogs.c" } -gboolean import_ui_import_has_videos (GeeCollection* import_collection) { +gboolean +import_ui_import_has_videos (GeeCollection* import_collection) +{ gboolean result = FALSE; #line 182 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (GEE_IS_COLLECTION (import_collection), FALSE); -#line 2082 "Dialogs.c" +#line 2192 "Dialogs.c" { GeeIterator* _current_result_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; -#line 183 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = import_collection; + GeeIterator* _tmp0_; #line 183 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (import_collection, GEE_TYPE_ITERABLE, GeeIterable)); #line 183 "/home/jens/Source/shotwell/src/Dialogs.vala" - _current_result_it = _tmp1_; + _current_result_it = _tmp0_; #line 183 "/home/jens/Source/shotwell/src/Dialogs.vala" while (TRUE) { -#line 2095 "Dialogs.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 2202 "Dialogs.c" + GeeIterator* _tmp1_; BatchImportResult* current_result = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - gboolean _tmp6_ = FALSE; - BatchImportResult* _tmp7_; - GFile* _tmp8_; -#line 183 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = _current_result_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + gboolean _tmp4_ = FALSE; + BatchImportResult* _tmp5_; + GFile* _tmp6_; #line 183 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _current_result_it; #line 183 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 183 "/home/jens/Source/shotwell/src/Dialogs.vala" break; -#line 2112 "Dialogs.c" +#line 2216 "Dialogs.c" } #line 183 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = _current_result_it; + _tmp2_ = _current_result_it; #line 183 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 183 "/home/jens/Source/shotwell/src/Dialogs.vala" - current_result = (BatchImportResult*) _tmp5_; + current_result = (BatchImportResult*) _tmp3_; #line 184 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = current_result; + _tmp5_ = current_result; #line 184 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = _tmp7_->file; + _tmp6_ = _tmp5_->file; #line 184 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp8_ != NULL) { -#line 2126 "Dialogs.c" - BatchImportResult* _tmp9_; - GFile* _tmp10_; - gboolean _tmp11_; + if (_tmp6_ != NULL) { +#line 2230 "Dialogs.c" + BatchImportResult* _tmp7_; + GFile* _tmp8_; #line 184 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9_ = current_result; + _tmp7_ = current_result; #line 184 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp10_ = _tmp9_->file; + _tmp8_ = _tmp7_->file; #line 184 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp11_ = video_reader_is_supported_video_file (_tmp10_); -#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = _tmp11_; -#line 2138 "Dialogs.c" + _tmp4_ = video_reader_is_supported_video_file (_tmp8_); +#line 2239 "Dialogs.c" } else { #line 184 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = FALSE; -#line 2142 "Dialogs.c" + _tmp4_ = FALSE; +#line 2243 "Dialogs.c" } #line 184 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp6_) { + if (_tmp4_) { #line 185 "/home/jens/Source/shotwell/src/Dialogs.vala" result = TRUE; #line 185 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -2153,34 +2254,36 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) { _g_object_unref0 (_current_result_it); #line 185 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 2154 "Dialogs.c" +#line 2255 "Dialogs.c" } #line 183 "/home/jens/Source/shotwell/src/Dialogs.vala" _batch_import_result_unref0 (current_result); -#line 2158 "Dialogs.c" +#line 2259 "Dialogs.c" } #line 183 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_current_result_it); -#line 2162 "Dialogs.c" +#line 2263 "Dialogs.c" } #line 187 "/home/jens/Source/shotwell/src/Dialogs.vala" result = FALSE; #line 187 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 2168 "Dialogs.c" +#line 2269 "Dialogs.c" } -gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, const gchar* photos_msg, const gchar* videos_msg, const gchar* both_msg, const gchar* neither_msg) { +gchar* +import_ui_get_media_specific_string (GeeCollection* import_collection, + const gchar* photos_msg, + const gchar* videos_msg, + const gchar* both_msg, + const gchar* neither_msg) +{ gchar* result = NULL; gboolean has_photos = FALSE; - GeeCollection* _tmp0_; - gboolean _tmp1_; gboolean has_videos = FALSE; - GeeCollection* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_; + gboolean _tmp0_ = FALSE; + gboolean _tmp1_; #line 190 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (GEE_IS_COLLECTION (import_collection), NULL); #line 190 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -2192,102 +2295,84 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co #line 190 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (neither_msg != NULL, NULL); #line 192 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = import_collection; -#line 192 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = import_ui_import_has_photos (_tmp0_); -#line 192 "/home/jens/Source/shotwell/src/Dialogs.vala" - has_photos = _tmp1_; -#line 193 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = import_collection; + has_photos = import_ui_import_has_photos (import_collection); #line 193 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = import_ui_import_has_videos (_tmp2_); -#line 193 "/home/jens/Source/shotwell/src/Dialogs.vala" - has_videos = _tmp3_; + has_videos = import_ui_import_has_videos (import_collection); #line 195 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = has_photos; + _tmp1_ = has_photos; #line 195 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp5_) { -#line 2208 "Dialogs.c" - gboolean _tmp6_; + if (_tmp1_) { +#line 2303 "Dialogs.c" + gboolean _tmp2_; #line 195 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = has_videos; + _tmp2_ = has_videos; #line 195 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = _tmp6_; -#line 2214 "Dialogs.c" + _tmp0_ = _tmp2_; +#line 2309 "Dialogs.c" } else { #line 195 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = FALSE; -#line 2218 "Dialogs.c" + _tmp0_ = FALSE; +#line 2313 "Dialogs.c" } #line 195 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp4_) { -#line 2222 "Dialogs.c" - const gchar* _tmp7_; - gchar* _tmp8_; -#line 196 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = both_msg; + if (_tmp0_) { +#line 2317 "Dialogs.c" + gchar* _tmp3_; #line 196 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = g_strdup (_tmp7_); + _tmp3_ = g_strdup (both_msg); #line 196 "/home/jens/Source/shotwell/src/Dialogs.vala" - result = _tmp8_; + result = _tmp3_; #line 196 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 2233 "Dialogs.c" +#line 2325 "Dialogs.c" } else { - gboolean _tmp9_; + gboolean _tmp4_; #line 197 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9_ = has_photos; + _tmp4_ = has_photos; #line 197 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp9_) { -#line 2240 "Dialogs.c" - const gchar* _tmp10_; - gchar* _tmp11_; -#line 198 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp10_ = photos_msg; + if (_tmp4_) { +#line 2332 "Dialogs.c" + gchar* _tmp5_; #line 198 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp11_ = g_strdup (_tmp10_); + _tmp5_ = g_strdup (photos_msg); #line 198 "/home/jens/Source/shotwell/src/Dialogs.vala" - result = _tmp11_; + result = _tmp5_; #line 198 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 2251 "Dialogs.c" +#line 2340 "Dialogs.c" } else { - gboolean _tmp12_; + gboolean _tmp6_; #line 199 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp12_ = has_videos; + _tmp6_ = has_videos; #line 199 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp12_) { -#line 2258 "Dialogs.c" - const gchar* _tmp13_; - gchar* _tmp14_; -#line 200 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp13_ = videos_msg; + if (_tmp6_) { +#line 2347 "Dialogs.c" + gchar* _tmp7_; #line 200 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp14_ = g_strdup (_tmp13_); + _tmp7_ = g_strdup (videos_msg); #line 200 "/home/jens/Source/shotwell/src/Dialogs.vala" - result = _tmp14_; + result = _tmp7_; #line 200 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 2269 "Dialogs.c" +#line 2355 "Dialogs.c" } else { - const gchar* _tmp15_; - gchar* _tmp16_; -#line 202 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp15_ = neither_msg; + gchar* _tmp8_; #line 202 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp16_ = g_strdup (_tmp15_); + _tmp8_ = g_strdup (neither_msg); #line 202 "/home/jens/Source/shotwell/src/Dialogs.vala" - result = _tmp16_; + result = _tmp8_; #line 202 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 2281 "Dialogs.c" +#line 2364 "Dialogs.c" } } } } -gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) { +gchar* +import_ui_create_result_report_from_manifest (ImportManifest* manifest) +{ gchar* result = NULL; GString* builder = NULL; GString* _tmp0_; @@ -2308,66 +2393,55 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) { GString* _tmp14_; const gchar* _tmp15_; gchar* subhead = NULL; - ImportManifest* _tmp16_; - GeeList* _tmp17_; + GeeList* _tmp16_; + gint _tmp17_; gint _tmp18_; - gint _tmp19_; - ImportManifest* _tmp20_; - GeeList* _tmp21_; - gint _tmp22_; - gint _tmp23_; + GeeList* _tmp19_; + gint _tmp20_; + gint _tmp21_; + gchar* _tmp22_; + const gchar* _tmp23_; gchar* _tmp24_; const gchar* _tmp25_; - gchar* _tmp26_; - const gchar* _tmp27_; - ImportManifest* _tmp28_; + GeeList* _tmp26_; + gint _tmp27_; + gint _tmp28_; GeeList* _tmp29_; gint _tmp30_; gint _tmp31_; - ImportManifest* _tmp32_; - GeeList* _tmp33_; - gint _tmp34_; - gint _tmp35_; + gchar* _tmp32_; + gchar* _tmp33_; + gchar* _tmp34_; + const gchar* _tmp35_; gchar* _tmp36_; - gchar* _tmp37_; - gchar* _tmp38_; - const gchar* _tmp39_; - gchar* _tmp40_; - GString* _tmp41_; - const gchar* _tmp42_; + GString* _tmp37_; + const gchar* _tmp38_; gchar* current_file_summary = NULL; - gchar* _tmp43_; - ImportManifest* _tmp44_; - GeeList* _tmp45_; - gint _tmp46_; - gint _tmp47_; - ImportManifest* _tmp82_; - GeeList* _tmp83_; - gint _tmp84_; - gint _tmp85_; - ImportManifest* _tmp116_; - GeeList* _tmp117_; - gint _tmp118_; - gint _tmp119_; - ImportManifest* _tmp150_; - GeeList* _tmp151_; - gint _tmp152_; - gint _tmp153_; - ImportManifest* _tmp184_; - GeeList* _tmp185_; - gint _tmp186_; - gint _tmp187_; - ImportManifest* _tmp222_; - GeeList* _tmp223_; - gint _tmp224_; - gint _tmp225_; - ImportManifest* _tmp256_; - GeeList* _tmp257_; - gint _tmp258_; - gint _tmp259_; - GString* _tmp290_; - const gchar* _tmp291_; - gchar* _tmp292_; + gchar* _tmp39_; + GeeList* _tmp40_; + gint _tmp41_; + gint _tmp42_; + GeeList* _tmp76_; + gint _tmp77_; + gint _tmp78_; + GeeList* _tmp108_; + gint _tmp109_; + gint _tmp110_; + GeeList* _tmp140_; + gint _tmp141_; + gint _tmp142_; + GeeList* _tmp172_; + gint _tmp173_; + gint _tmp174_; + GeeList* _tmp208_; + gint _tmp209_; + gint _tmp210_; + GeeList* _tmp240_; + gint _tmp241_; + gint _tmp242_; + GString* _tmp272_; + const gchar* _tmp273_; + gchar* _tmp274_; #line 205 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (IS_IMPORT_MANIFEST (manifest), NULL); #line 206 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -2419,1193 +2493,1150 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) { #line 210 "/home/jens/Source/shotwell/src/Dialogs.vala" g_string_append (_tmp14_, _tmp15_); #line 212 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp16_ = manifest; + _tmp16_ = manifest->all; #line 212 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp17_ = _tmp16_->all; + _tmp17_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection)); #line 212 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp18_ = _tmp17_; #line 212 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp19_ = _tmp18_; + _tmp19_ = manifest->all; #line 212 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp20_ = manifest; + _tmp20_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection)); #line 212 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp21_ = _tmp20_->all; + _tmp21_ = _tmp20_; #line 212 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp22_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp22_ = g_strdup_printf (ngettext ("Attempted to import %d file.", "Attempted to import %d files.", (gulong) _tmp18_), _tmp21_); #line 212 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp23_ = _tmp22_; -#line 212 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp24_ = g_strdup_printf (ngettext ("Attempted to import %d file.", "Attempted to import %d files.", (gulong) _tmp19_), _tmp23_); -#line 212 "/home/jens/Source/shotwell/src/Dialogs.vala" - subhead = _tmp24_; + subhead = _tmp22_; #line 214 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp25_ = subhead; + _tmp23_ = subhead; #line 214 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp26_ = g_strconcat (_tmp25_, " ", NULL); + _tmp24_ = g_strconcat (_tmp23_, " ", NULL); #line 214 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (subhead); #line 214 "/home/jens/Source/shotwell/src/Dialogs.vala" - subhead = _tmp26_; -#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp27_ = subhead; -#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp28_ = manifest; + subhead = _tmp24_; #line 215 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp29_ = _tmp28_->success; + _tmp25_ = subhead; #line 215 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp30_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp26_ = manifest->success; #line 215 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp31_ = _tmp30_; + _tmp27_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection)); #line 215 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp32_ = manifest; + _tmp28_ = _tmp27_; #line 215 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp33_ = _tmp32_->success; + _tmp29_ = manifest->success; #line 215 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp34_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp30_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection)); #line 215 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp35_ = _tmp34_; + _tmp31_ = _tmp30_; #line 215 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp36_ = g_strdup_printf (ngettext ("Of these, %d file was successfully imported.", "Of these, %d files were successfully imported.", (gulong) _tmp31_), _tmp35_); + _tmp32_ = g_strdup_printf (ngettext ("Of these, %d file was successfully imported.", "Of these, %d files were successfully imported.", (gulong) _tmp28_), _tmp31_); #line 215 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp37_ = _tmp36_; + _tmp33_ = _tmp32_; #line 215 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp38_ = g_strconcat (_tmp27_, _tmp37_, NULL); + _tmp34_ = g_strconcat (_tmp25_, _tmp33_, NULL); #line 215 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (subhead); #line 215 "/home/jens/Source/shotwell/src/Dialogs.vala" - subhead = _tmp38_; + subhead = _tmp34_; #line 215 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp37_); + _g_free0 (_tmp33_); #line 218 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp39_ = subhead; + _tmp35_ = subhead; #line 218 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp40_ = g_strconcat (_tmp39_, "\n\n", NULL); + _tmp36_ = g_strconcat (_tmp35_, "\n\n", NULL); #line 218 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (subhead); #line 218 "/home/jens/Source/shotwell/src/Dialogs.vala" - subhead = _tmp40_; + subhead = _tmp36_; #line 219 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp41_ = builder; + _tmp37_ = builder; #line 219 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp42_ = subhead; + _tmp38_ = subhead; #line 219 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_string_append (_tmp41_, _tmp42_); + g_string_append (_tmp37_, _tmp38_); #line 221 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp43_ = g_strdup (""); + _tmp39_ = g_strdup (""); #line 221 "/home/jens/Source/shotwell/src/Dialogs.vala" - current_file_summary = _tmp43_; -#line 226 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp44_ = manifest; + current_file_summary = _tmp39_; #line 226 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp45_ = _tmp44_->already_imported; + _tmp40_ = manifest->already_imported; #line 226 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp46_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp41_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_COLLECTION, GeeCollection)); #line 226 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp47_ = _tmp46_; + _tmp42_ = _tmp41_; #line 226 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp47_ > 0) { -#line 2505 "Dialogs.c" - GString* _tmp48_; - gchar* _tmp49_; - gchar* _tmp50_; + if (_tmp42_ > 0) { +#line 2569 "Dialogs.c" + GString* _tmp43_; + gchar* _tmp44_; + gchar* _tmp45_; #line 227 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp48_ = builder; + _tmp43_ = builder; #line 227 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp49_ = g_strconcat (_ ("Duplicate Photos/Videos Not Imported:"), "\n\n", NULL); + _tmp44_ = g_strconcat (_ ("Duplicate Photos/Videos Not Imported:"), "\n\n", NULL); #line 227 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp50_ = _tmp49_; + _tmp45_ = _tmp44_; #line 227 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_string_append (_tmp48_, _tmp50_); + g_string_append (_tmp43_, _tmp45_); #line 227 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp50_); -#line 2519 "Dialogs.c" + _g_free0 (_tmp45_); +#line 2583 "Dialogs.c" { GeeList* _result_list = NULL; - ImportManifest* _tmp51_; - GeeList* _tmp52_; - GeeList* _tmp53_; + GeeList* _tmp46_; + GeeList* _tmp47_; gint _result_size = 0; - GeeList* _tmp54_; - gint _tmp55_; - gint _tmp56_; + GeeList* _tmp48_; + gint _tmp49_; + gint _tmp50_; gint _result_index = 0; #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp51_ = manifest; + _tmp46_ = manifest->already_imported; #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp52_ = _tmp51_->already_imported; + _tmp47_ = _g_object_ref0 (_tmp46_); #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp53_ = _g_object_ref0 (_tmp52_); + _result_list = _tmp47_; #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_list = _tmp53_; + _tmp48_ = _result_list; #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp54_ = _result_list; + _tmp49_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection)); #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp55_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp50_ = _tmp49_; #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp56_ = _tmp55_; -#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_size = _tmp56_; + _result_size = _tmp50_; #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" _result_index = -1; #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" while (TRUE) { -#line 2550 "Dialogs.c" - gint _tmp57_; - gint _tmp58_; - gint _tmp59_; +#line 2611 "Dialogs.c" + gint _tmp51_; + gint _tmp52_; + gint _tmp53_; BatchImportResult* _result_ = NULL; - GeeList* _tmp60_; - gint _tmp61_; - gpointer _tmp62_; - BatchImportResult* _tmp63_; - const gchar* _tmp64_; - gchar* _tmp65_; - gchar* _tmp66_; - gchar* _tmp67_; - gchar* _tmp68_; + GeeList* _tmp54_; + gint _tmp55_; + gpointer _tmp56_; + BatchImportResult* _tmp57_; + const gchar* _tmp58_; + gchar* _tmp59_; + gchar* _tmp60_; + gchar* _tmp61_; + gchar* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; + BatchImportResult* _tmp65_; + DuplicatedFile* _tmp66_; + GFile* _tmp67_; + GFile* _tmp68_; gchar* _tmp69_; gchar* _tmp70_; - BatchImportResult* _tmp71_; - DuplicatedFile* _tmp72_; - GFile* _tmp73_; - GFile* _tmp74_; - gchar* _tmp75_; - gchar* _tmp76_; - gchar* _tmp77_; - gchar* _tmp78_; - gchar* _tmp79_; - GString* _tmp80_; - const gchar* _tmp81_; + gchar* _tmp71_; + gchar* _tmp72_; + gchar* _tmp73_; + GString* _tmp74_; + const gchar* _tmp75_; #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp57_ = _result_index; + _tmp51_ = _result_index; #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_index = _tmp57_ + 1; + _result_index = _tmp51_ + 1; #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp58_ = _result_index; + _tmp52_ = _result_index; #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp59_ = _result_size; + _tmp53_ = _result_size; #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (!(_tmp58_ < _tmp59_)) { + if (!(_tmp52_ < _tmp53_)) { #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" break; -#line 2589 "Dialogs.c" +#line 2650 "Dialogs.c" } #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp60_ = _result_list; + _tmp54_ = _result_list; #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp61_ = _result_index; + _tmp55_ = _result_index; #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp62_ = gee_list_get (_tmp60_, _tmp61_); + _tmp56_ = gee_list_get (_tmp54_, _tmp55_); #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_ = (BatchImportResult*) _tmp62_; + _result_ = (BatchImportResult*) _tmp56_; #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp63_ = _result_; + _tmp57_ = _result_; #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp64_ = _tmp63_->src_identifier; + _tmp58_ = _tmp57_->src_identifier; #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp65_ = g_strconcat (_tmp64_, " ", NULL); + _tmp59_ = g_strconcat (_tmp58_, " ", NULL); #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp66_ = _tmp65_; + _tmp60_ = _tmp59_; #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp67_ = g_strconcat (_tmp66_, _ ("duplicates existing media item"), NULL); + _tmp61_ = g_strconcat (_tmp60_, _ ("duplicates existing media item"), NULL); #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp68_ = _tmp67_; + _tmp62_ = _tmp61_; #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp69_ = g_strconcat (_tmp68_, "\n\t", NULL); + _tmp63_ = g_strconcat (_tmp62_, "\n\t", NULL); #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp70_ = _tmp69_; + _tmp64_ = _tmp63_; #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp71_ = _result_; + _tmp65_ = _result_; #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp72_ = _tmp71_->duplicate_of; + _tmp66_ = _tmp65_->duplicate_of; #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp73_ = duplicated_file_get_file (_tmp72_); + _tmp67_ = duplicated_file_get_file (_tmp66_); #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp74_ = _tmp73_; + _tmp68_ = _tmp67_; #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp75_ = g_file_get_path (_tmp74_); + _tmp69_ = g_file_get_path (_tmp68_); #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp76_ = _tmp75_; + _tmp70_ = _tmp69_; #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp77_ = g_strconcat (_tmp70_, _tmp76_, NULL); + _tmp71_ = g_strconcat (_tmp64_, _tmp70_, NULL); #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp78_ = _tmp77_; + _tmp72_ = _tmp71_; #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp79_ = g_strconcat (_tmp78_, "\n\n", NULL); + _tmp73_ = g_strconcat (_tmp72_, "\n\n", NULL); #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (current_file_summary); #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - current_file_summary = _tmp79_; + current_file_summary = _tmp73_; #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp78_); + _g_free0 (_tmp72_); #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp76_); + _g_free0 (_tmp70_); #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_object_unref0 (_tmp74_); + _g_object_unref0 (_tmp68_); #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp70_); + _g_free0 (_tmp64_); #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp68_); + _g_free0 (_tmp62_); #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp66_); + _g_free0 (_tmp60_); #line 234 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp80_ = builder; + _tmp74_ = builder; #line 234 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp81_ = current_file_summary; + _tmp75_ = current_file_summary; #line 234 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_string_append (_tmp80_, _tmp81_); + g_string_append (_tmp74_, _tmp75_); #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" _batch_import_result_unref0 (_result_); -#line 2657 "Dialogs.c" +#line 2718 "Dialogs.c" } #line 229 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_result_list); -#line 2661 "Dialogs.c" +#line 2722 "Dialogs.c" } } #line 241 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp82_ = manifest; -#line 241 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp83_ = _tmp82_->camera_failed; + _tmp76_ = manifest->camera_failed; #line 241 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp84_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp77_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_COLLECTION, GeeCollection)); #line 241 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp85_ = _tmp84_; + _tmp78_ = _tmp77_; #line 241 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp85_ > 0) { -#line 2674 "Dialogs.c" - GString* _tmp86_; - gchar* _tmp87_; - gchar* _tmp88_; + if (_tmp78_ > 0) { +#line 2733 "Dialogs.c" + GString* _tmp79_; + gchar* _tmp80_; + gchar* _tmp81_; #line 242 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp86_ = builder; + _tmp79_ = builder; #line 242 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp87_ = g_strconcat (_ ("Photos/Videos Not Imported Due to Camera Errors:"), "\n\n", NULL); + _tmp80_ = g_strconcat (_ ("Photos/Videos Not Imported Due to Camera Errors:"), "\n\n", NULL); #line 242 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp88_ = _tmp87_; + _tmp81_ = _tmp80_; #line 242 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_string_append (_tmp86_, _tmp88_); + g_string_append (_tmp79_, _tmp81_); #line 242 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp88_); -#line 2688 "Dialogs.c" + _g_free0 (_tmp81_); +#line 2747 "Dialogs.c" { GeeList* _result_list = NULL; - ImportManifest* _tmp89_; - GeeList* _tmp90_; - GeeList* _tmp91_; + GeeList* _tmp82_; + GeeList* _tmp83_; gint _result_size = 0; - GeeList* _tmp92_; - gint _tmp93_; - gint _tmp94_; + GeeList* _tmp84_; + gint _tmp85_; + gint _tmp86_; gint _result_index = 0; #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp89_ = manifest; + _tmp82_ = manifest->camera_failed; #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp90_ = _tmp89_->camera_failed; + _tmp83_ = _g_object_ref0 (_tmp82_); #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp91_ = _g_object_ref0 (_tmp90_); + _result_list = _tmp83_; #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_list = _tmp91_; + _tmp84_ = _result_list; #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp92_ = _result_list; + _tmp85_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, GEE_TYPE_COLLECTION, GeeCollection)); #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp93_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp86_ = _tmp85_; #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp94_ = _tmp93_; -#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_size = _tmp94_; + _result_size = _tmp86_; #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" _result_index = -1; #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" while (TRUE) { -#line 2719 "Dialogs.c" - gint _tmp95_; - gint _tmp96_; - gint _tmp97_; +#line 2775 "Dialogs.c" + gint _tmp87_; + gint _tmp88_; + gint _tmp89_; BatchImportResult* _result_ = NULL; - GeeList* _tmp98_; - gint _tmp99_; - gpointer _tmp100_; + GeeList* _tmp90_; + gint _tmp91_; + gpointer _tmp92_; + BatchImportResult* _tmp93_; + const gchar* _tmp94_; + gchar* _tmp95_; + gchar* _tmp96_; + gchar* _tmp97_; + gchar* _tmp98_; + gchar* _tmp99_; + gchar* _tmp100_; BatchImportResult* _tmp101_; const gchar* _tmp102_; gchar* _tmp103_; gchar* _tmp104_; gchar* _tmp105_; - gchar* _tmp106_; - gchar* _tmp107_; - gchar* _tmp108_; - BatchImportResult* _tmp109_; - const gchar* _tmp110_; - gchar* _tmp111_; - gchar* _tmp112_; - gchar* _tmp113_; - GString* _tmp114_; - const gchar* _tmp115_; + GString* _tmp106_; + const gchar* _tmp107_; #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp95_ = _result_index; + _tmp87_ = _result_index; #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_index = _tmp95_ + 1; + _result_index = _tmp87_ + 1; #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp96_ = _result_index; + _tmp88_ = _result_index; #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp97_ = _result_size; + _tmp89_ = _result_size; #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (!(_tmp96_ < _tmp97_)) { + if (!(_tmp88_ < _tmp89_)) { #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" break; -#line 2754 "Dialogs.c" +#line 2810 "Dialogs.c" } #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp98_ = _result_list; + _tmp90_ = _result_list; #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp99_ = _result_index; + _tmp91_ = _result_index; #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp100_ = gee_list_get (_tmp98_, _tmp99_); + _tmp92_ = gee_list_get (_tmp90_, _tmp91_); #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_ = (BatchImportResult*) _tmp100_; + _result_ = (BatchImportResult*) _tmp92_; #line 245 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp101_ = _result_; + _tmp93_ = _result_; #line 245 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp102_ = _tmp101_->src_identifier; + _tmp94_ = _tmp93_->src_identifier; #line 245 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp103_ = g_strconcat (_tmp102_, "\n\t", NULL); + _tmp95_ = g_strconcat (_tmp94_, "\n\t", NULL); #line 245 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp104_ = _tmp103_; + _tmp96_ = _tmp95_; #line 245 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp105_ = g_strconcat (_tmp104_, _ ("error message:"), NULL); + _tmp97_ = g_strconcat (_tmp96_, _ ("error message:"), NULL); #line 245 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp106_ = _tmp105_; + _tmp98_ = _tmp97_; #line 245 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp107_ = g_strconcat (_tmp106_, " ", NULL); + _tmp99_ = g_strconcat (_tmp98_, " ", NULL); #line 245 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp108_ = _tmp107_; + _tmp100_ = _tmp99_; #line 245 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp109_ = _result_; + _tmp101_ = _result_; #line 245 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp110_ = _tmp109_->errmsg; + _tmp102_ = _tmp101_->errmsg; #line 245 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp111_ = g_strconcat (_tmp108_, _tmp110_, NULL); + _tmp103_ = g_strconcat (_tmp100_, _tmp102_, NULL); #line 245 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp112_ = _tmp111_; + _tmp104_ = _tmp103_; #line 245 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp113_ = g_strconcat (_tmp112_, "\n\n", NULL); + _tmp105_ = g_strconcat (_tmp104_, "\n\n", NULL); #line 245 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (current_file_summary); #line 245 "/home/jens/Source/shotwell/src/Dialogs.vala" - current_file_summary = _tmp113_; + current_file_summary = _tmp105_; #line 245 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp112_); + _g_free0 (_tmp104_); #line 245 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp108_); + _g_free0 (_tmp100_); #line 245 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp106_); + _g_free0 (_tmp98_); #line 245 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp104_); + _g_free0 (_tmp96_); #line 248 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp114_ = builder; + _tmp106_ = builder; #line 248 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp115_ = current_file_summary; + _tmp107_ = current_file_summary; #line 248 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_string_append (_tmp114_, _tmp115_); + g_string_append (_tmp106_, _tmp107_); #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" _batch_import_result_unref0 (_result_); -#line 2810 "Dialogs.c" +#line 2866 "Dialogs.c" } #line 244 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_result_list); -#line 2814 "Dialogs.c" +#line 2870 "Dialogs.c" } } #line 255 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp116_ = manifest; -#line 255 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp117_ = _tmp116_->skipped_files; + _tmp108_ = manifest->skipped_files; #line 255 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp118_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp109_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, GEE_TYPE_COLLECTION, GeeCollection)); #line 255 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp119_ = _tmp118_; + _tmp110_ = _tmp109_; #line 255 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp119_ > 0) { -#line 2827 "Dialogs.c" - GString* _tmp120_; - gchar* _tmp121_; - gchar* _tmp122_; + if (_tmp110_ > 0) { +#line 2881 "Dialogs.c" + GString* _tmp111_; + gchar* _tmp112_; + gchar* _tmp113_; #line 256 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp120_ = builder; + _tmp111_ = builder; #line 256 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp121_ = g_strconcat (_ ("Files Not Imported Because They Weren’t Recognized as Photos or Videos" \ + _tmp112_ = g_strconcat (_ ("Files Not Imported Because They Weren’t Recognized as Photos or Videos" \ ":"), "\n\n", NULL); #line 256 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp122_ = _tmp121_; + _tmp113_ = _tmp112_; #line 256 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_string_append (_tmp120_, _tmp122_); + g_string_append (_tmp111_, _tmp113_); #line 256 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp122_); -#line 2841 "Dialogs.c" + _g_free0 (_tmp113_); +#line 2895 "Dialogs.c" { GeeList* _result_list = NULL; - ImportManifest* _tmp123_; - GeeList* _tmp124_; - GeeList* _tmp125_; + GeeList* _tmp114_; + GeeList* _tmp115_; gint _result_size = 0; - GeeList* _tmp126_; - gint _tmp127_; - gint _tmp128_; + GeeList* _tmp116_; + gint _tmp117_; + gint _tmp118_; gint _result_index = 0; #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp123_ = manifest; + _tmp114_ = manifest->skipped_files; #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp124_ = _tmp123_->skipped_files; + _tmp115_ = _g_object_ref0 (_tmp114_); #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp125_ = _g_object_ref0 (_tmp124_); + _result_list = _tmp115_; #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_list = _tmp125_; + _tmp116_ = _result_list; #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp126_ = _result_list; + _tmp117_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, GEE_TYPE_COLLECTION, GeeCollection)); #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp127_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp118_ = _tmp117_; #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp128_ = _tmp127_; -#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_size = _tmp128_; + _result_size = _tmp118_; #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" _result_index = -1; #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" while (TRUE) { -#line 2872 "Dialogs.c" - gint _tmp129_; - gint _tmp130_; - gint _tmp131_; +#line 2923 "Dialogs.c" + gint _tmp119_; + gint _tmp120_; + gint _tmp121_; BatchImportResult* _result_ = NULL; - GeeList* _tmp132_; - gint _tmp133_; - gpointer _tmp134_; - BatchImportResult* _tmp135_; - const gchar* _tmp136_; + GeeList* _tmp122_; + gint _tmp123_; + gpointer _tmp124_; + BatchImportResult* _tmp125_; + const gchar* _tmp126_; + gchar* _tmp127_; + gchar* _tmp128_; + gchar* _tmp129_; + gchar* _tmp130_; + gchar* _tmp131_; + gchar* _tmp132_; + BatchImportResult* _tmp133_; + const gchar* _tmp134_; + gchar* _tmp135_; + gchar* _tmp136_; gchar* _tmp137_; - gchar* _tmp138_; - gchar* _tmp139_; - gchar* _tmp140_; - gchar* _tmp141_; - gchar* _tmp142_; - BatchImportResult* _tmp143_; - const gchar* _tmp144_; - gchar* _tmp145_; - gchar* _tmp146_; - gchar* _tmp147_; - GString* _tmp148_; - const gchar* _tmp149_; + GString* _tmp138_; + const gchar* _tmp139_; #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp129_ = _result_index; + _tmp119_ = _result_index; #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_index = _tmp129_ + 1; + _result_index = _tmp119_ + 1; #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp130_ = _result_index; + _tmp120_ = _result_index; #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp131_ = _result_size; + _tmp121_ = _result_size; #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (!(_tmp130_ < _tmp131_)) { + if (!(_tmp120_ < _tmp121_)) { #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" break; -#line 2907 "Dialogs.c" +#line 2958 "Dialogs.c" } #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp132_ = _result_list; + _tmp122_ = _result_list; #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp133_ = _result_index; + _tmp123_ = _result_index; #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp134_ = gee_list_get (_tmp132_, _tmp133_); + _tmp124_ = gee_list_get (_tmp122_, _tmp123_); #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_ = (BatchImportResult*) _tmp134_; + _result_ = (BatchImportResult*) _tmp124_; #line 260 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp135_ = _result_; + _tmp125_ = _result_; #line 260 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp136_ = _tmp135_->src_identifier; + _tmp126_ = _tmp125_->src_identifier; #line 260 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp137_ = g_strconcat (_tmp136_, "\n\t", NULL); + _tmp127_ = g_strconcat (_tmp126_, "\n\t", NULL); #line 260 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp138_ = _tmp137_; + _tmp128_ = _tmp127_; #line 260 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp139_ = g_strconcat (_tmp138_, _ ("error message:"), NULL); + _tmp129_ = g_strconcat (_tmp128_, _ ("error message:"), NULL); #line 260 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp140_ = _tmp139_; + _tmp130_ = _tmp129_; #line 260 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp141_ = g_strconcat (_tmp140_, " ", NULL); + _tmp131_ = g_strconcat (_tmp130_, " ", NULL); #line 260 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp142_ = _tmp141_; + _tmp132_ = _tmp131_; #line 260 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp143_ = _result_; + _tmp133_ = _result_; #line 260 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp144_ = _tmp143_->errmsg; + _tmp134_ = _tmp133_->errmsg; #line 260 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp145_ = g_strconcat (_tmp142_, _tmp144_, NULL); + _tmp135_ = g_strconcat (_tmp132_, _tmp134_, NULL); #line 260 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp146_ = _tmp145_; + _tmp136_ = _tmp135_; #line 260 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp147_ = g_strconcat (_tmp146_, "\n\n", NULL); + _tmp137_ = g_strconcat (_tmp136_, "\n\n", NULL); #line 260 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (current_file_summary); #line 260 "/home/jens/Source/shotwell/src/Dialogs.vala" - current_file_summary = _tmp147_; + current_file_summary = _tmp137_; #line 260 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp146_); + _g_free0 (_tmp136_); #line 260 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp142_); + _g_free0 (_tmp132_); #line 260 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp140_); + _g_free0 (_tmp130_); #line 260 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp138_); + _g_free0 (_tmp128_); #line 263 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp148_ = builder; + _tmp138_ = builder; #line 263 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp149_ = current_file_summary; + _tmp139_ = current_file_summary; #line 263 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_string_append (_tmp148_, _tmp149_); + g_string_append (_tmp138_, _tmp139_); #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" _batch_import_result_unref0 (_result_); -#line 2963 "Dialogs.c" +#line 3014 "Dialogs.c" } #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_result_list); -#line 2967 "Dialogs.c" +#line 3018 "Dialogs.c" } } #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp150_ = manifest; -#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp151_ = _tmp150_->skipped_photos; + _tmp140_ = manifest->skipped_photos; #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp152_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp151_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp141_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp140_, GEE_TYPE_COLLECTION, GeeCollection)); #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp153_ = _tmp152_; + _tmp142_ = _tmp141_; #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp153_ > 0) { -#line 2980 "Dialogs.c" - GString* _tmp154_; - gchar* _tmp155_; - gchar* _tmp156_; + if (_tmp142_ > 0) { +#line 3029 "Dialogs.c" + GString* _tmp143_; + gchar* _tmp144_; + gchar* _tmp145_; #line 271 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp154_ = builder; + _tmp143_ = builder; #line 271 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp155_ = g_strconcat (_ ("Photos/Videos Not Imported Because They Weren’t in a Format Shotwell U" \ + _tmp144_ = g_strconcat (_ ("Photos/Videos Not Imported Because They Weren’t in a Format Shotwell U" \ "nderstands:"), "\n\n", NULL); #line 271 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp156_ = _tmp155_; + _tmp145_ = _tmp144_; #line 271 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_string_append (_tmp154_, _tmp156_); + g_string_append (_tmp143_, _tmp145_); #line 271 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp156_); -#line 2994 "Dialogs.c" + _g_free0 (_tmp145_); +#line 3043 "Dialogs.c" { GeeList* _result_list = NULL; - ImportManifest* _tmp157_; - GeeList* _tmp158_; - GeeList* _tmp159_; + GeeList* _tmp146_; + GeeList* _tmp147_; gint _result_size = 0; - GeeList* _tmp160_; - gint _tmp161_; - gint _tmp162_; + GeeList* _tmp148_; + gint _tmp149_; + gint _tmp150_; gint _result_index = 0; #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp157_ = manifest; + _tmp146_ = manifest->skipped_photos; #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp158_ = _tmp157_->skipped_photos; + _tmp147_ = _g_object_ref0 (_tmp146_); #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp159_ = _g_object_ref0 (_tmp158_); + _result_list = _tmp147_; #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_list = _tmp159_; + _tmp148_ = _result_list; #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp160_ = _result_list; + _tmp149_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp148_, GEE_TYPE_COLLECTION, GeeCollection)); #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp161_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp160_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp150_ = _tmp149_; #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp162_ = _tmp161_; -#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_size = _tmp162_; + _result_size = _tmp150_; #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" _result_index = -1; #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" while (TRUE) { -#line 3025 "Dialogs.c" - gint _tmp163_; - gint _tmp164_; - gint _tmp165_; +#line 3071 "Dialogs.c" + gint _tmp151_; + gint _tmp152_; + gint _tmp153_; BatchImportResult* _result_ = NULL; - GeeList* _tmp166_; - gint _tmp167_; - gpointer _tmp168_; - BatchImportResult* _tmp169_; - const gchar* _tmp170_; - gchar* _tmp171_; - gchar* _tmp172_; - gchar* _tmp173_; - gchar* _tmp174_; - gchar* _tmp175_; - gchar* _tmp176_; - BatchImportResult* _tmp177_; - const gchar* _tmp178_; - gchar* _tmp179_; - gchar* _tmp180_; - gchar* _tmp181_; - GString* _tmp182_; - const gchar* _tmp183_; + GeeList* _tmp154_; + gint _tmp155_; + gpointer _tmp156_; + BatchImportResult* _tmp157_; + const gchar* _tmp158_; + gchar* _tmp159_; + gchar* _tmp160_; + gchar* _tmp161_; + gchar* _tmp162_; + gchar* _tmp163_; + gchar* _tmp164_; + BatchImportResult* _tmp165_; + const gchar* _tmp166_; + gchar* _tmp167_; + gchar* _tmp168_; + gchar* _tmp169_; + GString* _tmp170_; + const gchar* _tmp171_; #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp163_ = _result_index; + _tmp151_ = _result_index; #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_index = _tmp163_ + 1; + _result_index = _tmp151_ + 1; #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp164_ = _result_index; + _tmp152_ = _result_index; #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp165_ = _result_size; + _tmp153_ = _result_size; #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (!(_tmp164_ < _tmp165_)) { + if (!(_tmp152_ < _tmp153_)) { #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" break; -#line 3060 "Dialogs.c" +#line 3106 "Dialogs.c" } #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp166_ = _result_list; + _tmp154_ = _result_list; #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp167_ = _result_index; + _tmp155_ = _result_index; #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp168_ = gee_list_get (_tmp166_, _tmp167_); + _tmp156_ = gee_list_get (_tmp154_, _tmp155_); #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_ = (BatchImportResult*) _tmp168_; + _result_ = (BatchImportResult*) _tmp156_; #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp169_ = _result_; + _tmp157_ = _result_; #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp170_ = _tmp169_->src_identifier; + _tmp158_ = _tmp157_->src_identifier; #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp171_ = g_strconcat (_tmp170_, "\n\t", NULL); + _tmp159_ = g_strconcat (_tmp158_, "\n\t", NULL); #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp172_ = _tmp171_; + _tmp160_ = _tmp159_; #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp173_ = g_strconcat (_tmp172_, _ ("error message:"), NULL); + _tmp161_ = g_strconcat (_tmp160_, _ ("error message:"), NULL); #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp174_ = _tmp173_; + _tmp162_ = _tmp161_; #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp175_ = g_strconcat (_tmp174_, " ", NULL); + _tmp163_ = g_strconcat (_tmp162_, " ", NULL); #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp176_ = _tmp175_; + _tmp164_ = _tmp163_; #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp177_ = _result_; + _tmp165_ = _result_; #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp178_ = _tmp177_->errmsg; + _tmp166_ = _tmp165_->errmsg; #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp179_ = g_strconcat (_tmp176_, _tmp178_, NULL); + _tmp167_ = g_strconcat (_tmp164_, _tmp166_, NULL); #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp180_ = _tmp179_; + _tmp168_ = _tmp167_; #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp181_ = g_strconcat (_tmp180_, "\n\n", NULL); + _tmp169_ = g_strconcat (_tmp168_, "\n\n", NULL); #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (current_file_summary); #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala" - current_file_summary = _tmp181_; + current_file_summary = _tmp169_; #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp180_); + _g_free0 (_tmp168_); #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp176_); + _g_free0 (_tmp164_); #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp174_); + _g_free0 (_tmp162_); #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp172_); + _g_free0 (_tmp160_); #line 278 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp182_ = builder; + _tmp170_ = builder; #line 278 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp183_ = current_file_summary; + _tmp171_ = current_file_summary; #line 278 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_string_append (_tmp182_, _tmp183_); + g_string_append (_tmp170_, _tmp171_); #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" _batch_import_result_unref0 (_result_); -#line 3116 "Dialogs.c" +#line 3162 "Dialogs.c" } #line 274 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_result_list); -#line 3120 "Dialogs.c" +#line 3166 "Dialogs.c" } } #line 285 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp184_ = manifest; -#line 285 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp185_ = _tmp184_->write_failed; + _tmp172_ = manifest->write_failed; #line 285 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp186_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp185_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp173_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp172_, GEE_TYPE_COLLECTION, GeeCollection)); #line 285 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp187_ = _tmp186_; + _tmp174_ = _tmp173_; #line 285 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp187_ > 0) { -#line 3133 "Dialogs.c" - GString* _tmp188_; - gchar* _tmp189_; - gchar* _tmp190_; + if (_tmp174_ > 0) { +#line 3177 "Dialogs.c" + GString* _tmp175_; + gchar* _tmp176_; + gchar* _tmp177_; #line 286 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp188_ = builder; + _tmp175_ = builder; #line 286 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp189_ = g_strconcat (_ ("Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into it" \ + _tmp176_ = g_strconcat (_ ("Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into it" \ "s Library:"), "\n\n", NULL); #line 286 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp190_ = _tmp189_; + _tmp177_ = _tmp176_; #line 286 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_string_append (_tmp188_, _tmp190_); + g_string_append (_tmp175_, _tmp177_); #line 286 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp190_); -#line 3147 "Dialogs.c" + _g_free0 (_tmp177_); +#line 3191 "Dialogs.c" { GeeList* _result_list = NULL; - ImportManifest* _tmp191_; - GeeList* _tmp192_; - GeeList* _tmp193_; + GeeList* _tmp178_; + GeeList* _tmp179_; gint _result_size = 0; - GeeList* _tmp194_; - gint _tmp195_; - gint _tmp196_; + GeeList* _tmp180_; + gint _tmp181_; + gint _tmp182_; gint _result_index = 0; #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp191_ = manifest; + _tmp178_ = manifest->write_failed; #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp192_ = _tmp191_->write_failed; + _tmp179_ = _g_object_ref0 (_tmp178_); #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp193_ = _g_object_ref0 (_tmp192_); + _result_list = _tmp179_; #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_list = _tmp193_; + _tmp180_ = _result_list; #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp194_ = _result_list; + _tmp181_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp180_, GEE_TYPE_COLLECTION, GeeCollection)); #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp195_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp194_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp182_ = _tmp181_; #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp196_ = _tmp195_; -#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_size = _tmp196_; + _result_size = _tmp182_; #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" _result_index = -1; #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" while (TRUE) { -#line 3178 "Dialogs.c" - gint _tmp197_; - gint _tmp198_; - gint _tmp199_; +#line 3219 "Dialogs.c" + gint _tmp183_; + gint _tmp184_; + gint _tmp185_; BatchImportResult* _result_ = NULL; - GeeList* _tmp200_; - gint _tmp201_; - gpointer _tmp202_; - BatchImportResult* _tmp203_; - const gchar* _tmp204_; - BatchImportResult* _tmp205_; - const gchar* _tmp206_; - gchar* _tmp207_; - gchar* _tmp208_; - gchar* _tmp209_; - gchar* _tmp210_; - gchar* _tmp211_; - gchar* _tmp212_; - gchar* _tmp213_; - gchar* _tmp214_; - BatchImportResult* _tmp215_; - const gchar* _tmp216_; - gchar* _tmp217_; - gchar* _tmp218_; - gchar* _tmp219_; - GString* _tmp220_; - const gchar* _tmp221_; + GeeList* _tmp186_; + gint _tmp187_; + gpointer _tmp188_; + BatchImportResult* _tmp189_; + const gchar* _tmp190_; + BatchImportResult* _tmp191_; + const gchar* _tmp192_; + gchar* _tmp193_; + gchar* _tmp194_; + gchar* _tmp195_; + gchar* _tmp196_; + gchar* _tmp197_; + gchar* _tmp198_; + gchar* _tmp199_; + gchar* _tmp200_; + BatchImportResult* _tmp201_; + const gchar* _tmp202_; + gchar* _tmp203_; + gchar* _tmp204_; + gchar* _tmp205_; + GString* _tmp206_; + const gchar* _tmp207_; #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp197_ = _result_index; + _tmp183_ = _result_index; #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_index = _tmp197_ + 1; + _result_index = _tmp183_ + 1; #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp198_ = _result_index; + _tmp184_ = _result_index; #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp199_ = _result_size; + _tmp185_ = _result_size; #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (!(_tmp198_ < _tmp199_)) { + if (!(_tmp184_ < _tmp185_)) { #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" break; -#line 3217 "Dialogs.c" +#line 3258 "Dialogs.c" } #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp200_ = _result_list; + _tmp186_ = _result_list; #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp201_ = _result_index; + _tmp187_ = _result_index; #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp202_ = gee_list_get (_tmp200_, _tmp201_); + _tmp188_ = gee_list_get (_tmp186_, _tmp187_); #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_ = (BatchImportResult*) _tmp202_; + _result_ = (BatchImportResult*) _tmp188_; #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp203_ = _result_; + _tmp189_ = _result_; #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp204_ = _tmp203_->src_identifier; + _tmp190_ = _tmp189_->src_identifier; #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp205_ = _result_; + _tmp191_ = _result_; #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp206_ = _tmp205_->dest_identifier; + _tmp192_ = _tmp191_->dest_identifier; #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp207_ = g_strdup_printf (_ ("couldn’t copy %s\n\tto %s"), _tmp204_, _tmp206_); + _tmp193_ = g_strdup_printf (_ ("couldn’t copy %s\n\tto %s"), _tmp190_, _tmp192_); #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp208_ = _tmp207_; + _tmp194_ = _tmp193_; #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp209_ = g_strconcat (_tmp208_, "\n\t", NULL); + _tmp195_ = g_strconcat (_tmp194_, "\n\t", NULL); #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp210_ = _tmp209_; + _tmp196_ = _tmp195_; #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp211_ = g_strconcat (_tmp210_, _ ("error message:"), NULL); + _tmp197_ = g_strconcat (_tmp196_, _ ("error message:"), NULL); #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp212_ = _tmp211_; + _tmp198_ = _tmp197_; #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp213_ = g_strconcat (_tmp212_, " ", NULL); + _tmp199_ = g_strconcat (_tmp198_, " ", NULL); #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp214_ = _tmp213_; + _tmp200_ = _tmp199_; #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp215_ = _result_; + _tmp201_ = _result_; #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp216_ = _tmp215_->errmsg; + _tmp202_ = _tmp201_->errmsg; #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp217_ = g_strconcat (_tmp214_, _tmp216_, NULL); + _tmp203_ = g_strconcat (_tmp200_, _tmp202_, NULL); #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp218_ = _tmp217_; + _tmp204_ = _tmp203_; #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp219_ = g_strconcat (_tmp218_, "\n\n", NULL); + _tmp205_ = g_strconcat (_tmp204_, "\n\n", NULL); #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (current_file_summary); #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - current_file_summary = _tmp219_; + current_file_summary = _tmp205_; #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp218_); + _g_free0 (_tmp204_); #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp214_); + _g_free0 (_tmp200_); #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp212_); + _g_free0 (_tmp198_); #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp210_); + _g_free0 (_tmp196_); #line 290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp208_); + _g_free0 (_tmp194_); #line 294 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp220_ = builder; + _tmp206_ = builder; #line 294 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp221_ = current_file_summary; + _tmp207_ = current_file_summary; #line 294 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_string_append (_tmp220_, _tmp221_); + g_string_append (_tmp206_, _tmp207_); #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" _batch_import_result_unref0 (_result_); -#line 3283 "Dialogs.c" +#line 3324 "Dialogs.c" } #line 289 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_result_list); -#line 3287 "Dialogs.c" +#line 3328 "Dialogs.c" } } #line 301 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp222_ = manifest; -#line 301 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp223_ = _tmp222_->corrupt_files; + _tmp208_ = manifest->corrupt_files; #line 301 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp224_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp223_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp209_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp208_, GEE_TYPE_COLLECTION, GeeCollection)); #line 301 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp225_ = _tmp224_; + _tmp210_ = _tmp209_; #line 301 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp225_ > 0) { -#line 3300 "Dialogs.c" - GString* _tmp226_; - gchar* _tmp227_; - gchar* _tmp228_; + if (_tmp210_ > 0) { +#line 3339 "Dialogs.c" + GString* _tmp211_; + gchar* _tmp212_; + gchar* _tmp213_; #line 302 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp226_ = builder; + _tmp211_ = builder; #line 302 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp227_ = g_strconcat (_ ("Photos/Videos Not Imported Because Files Are Corrupt:"), "\n\n", NULL); + _tmp212_ = g_strconcat (_ ("Photos/Videos Not Imported Because Files Are Corrupt:"), "\n\n", NULL); #line 302 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp228_ = _tmp227_; + _tmp213_ = _tmp212_; #line 302 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_string_append (_tmp226_, _tmp228_); + g_string_append (_tmp211_, _tmp213_); #line 302 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp228_); -#line 3314 "Dialogs.c" + _g_free0 (_tmp213_); +#line 3353 "Dialogs.c" { GeeList* _result_list = NULL; - ImportManifest* _tmp229_; - GeeList* _tmp230_; - GeeList* _tmp231_; + GeeList* _tmp214_; + GeeList* _tmp215_; gint _result_size = 0; - GeeList* _tmp232_; - gint _tmp233_; - gint _tmp234_; + GeeList* _tmp216_; + gint _tmp217_; + gint _tmp218_; gint _result_index = 0; #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp229_ = manifest; + _tmp214_ = manifest->corrupt_files; #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp230_ = _tmp229_->corrupt_files; + _tmp215_ = _g_object_ref0 (_tmp214_); #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp231_ = _g_object_ref0 (_tmp230_); + _result_list = _tmp215_; #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_list = _tmp231_; + _tmp216_ = _result_list; #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp232_ = _result_list; + _tmp217_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp216_, GEE_TYPE_COLLECTION, GeeCollection)); #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp233_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp232_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp218_ = _tmp217_; #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp234_ = _tmp233_; -#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_size = _tmp234_; + _result_size = _tmp218_; #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" _result_index = -1; #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" while (TRUE) { -#line 3345 "Dialogs.c" - gint _tmp235_; - gint _tmp236_; - gint _tmp237_; +#line 3381 "Dialogs.c" + gint _tmp219_; + gint _tmp220_; + gint _tmp221_; BatchImportResult* _result_ = NULL; - GeeList* _tmp238_; - gint _tmp239_; - gpointer _tmp240_; - BatchImportResult* _tmp241_; - const gchar* _tmp242_; - gchar* _tmp243_; - gchar* _tmp244_; - gchar* _tmp245_; - gchar* _tmp246_; - gchar* _tmp247_; - gchar* _tmp248_; - BatchImportResult* _tmp249_; - const gchar* _tmp250_; - gchar* _tmp251_; - gchar* _tmp252_; - gchar* _tmp253_; - GString* _tmp254_; - const gchar* _tmp255_; + GeeList* _tmp222_; + gint _tmp223_; + gpointer _tmp224_; + BatchImportResult* _tmp225_; + const gchar* _tmp226_; + gchar* _tmp227_; + gchar* _tmp228_; + gchar* _tmp229_; + gchar* _tmp230_; + gchar* _tmp231_; + gchar* _tmp232_; + BatchImportResult* _tmp233_; + const gchar* _tmp234_; + gchar* _tmp235_; + gchar* _tmp236_; + gchar* _tmp237_; + GString* _tmp238_; + const gchar* _tmp239_; #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp235_ = _result_index; + _tmp219_ = _result_index; #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_index = _tmp235_ + 1; + _result_index = _tmp219_ + 1; #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp236_ = _result_index; + _tmp220_ = _result_index; #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp237_ = _result_size; + _tmp221_ = _result_size; #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (!(_tmp236_ < _tmp237_)) { + if (!(_tmp220_ < _tmp221_)) { #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" break; -#line 3380 "Dialogs.c" +#line 3416 "Dialogs.c" } #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp238_ = _result_list; + _tmp222_ = _result_list; #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp239_ = _result_index; + _tmp223_ = _result_index; #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp240_ = gee_list_get (_tmp238_, _tmp239_); + _tmp224_ = gee_list_get (_tmp222_, _tmp223_); #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_ = (BatchImportResult*) _tmp240_; + _result_ = (BatchImportResult*) _tmp224_; #line 306 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp241_ = _result_; + _tmp225_ = _result_; #line 306 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp242_ = _tmp241_->src_identifier; + _tmp226_ = _tmp225_->src_identifier; #line 306 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp243_ = g_strconcat (_tmp242_, "\n\t", NULL); + _tmp227_ = g_strconcat (_tmp226_, "\n\t", NULL); #line 306 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp244_ = _tmp243_; + _tmp228_ = _tmp227_; #line 306 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp245_ = g_strconcat (_tmp244_, _ ("error message:"), NULL); + _tmp229_ = g_strconcat (_tmp228_, _ ("error message:"), NULL); #line 306 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp246_ = _tmp245_; + _tmp230_ = _tmp229_; #line 306 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp247_ = g_strconcat (_tmp246_, " |", NULL); + _tmp231_ = g_strconcat (_tmp230_, " |", NULL); #line 306 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp248_ = _tmp247_; + _tmp232_ = _tmp231_; #line 306 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp249_ = _result_; + _tmp233_ = _result_; #line 306 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp250_ = _tmp249_->errmsg; + _tmp234_ = _tmp233_->errmsg; #line 306 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp251_ = g_strconcat (_tmp248_, _tmp250_, NULL); + _tmp235_ = g_strconcat (_tmp232_, _tmp234_, NULL); #line 306 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp252_ = _tmp251_; + _tmp236_ = _tmp235_; #line 306 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp253_ = g_strconcat (_tmp252_, "|\n\n", NULL); + _tmp237_ = g_strconcat (_tmp236_, "|\n\n", NULL); #line 306 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (current_file_summary); #line 306 "/home/jens/Source/shotwell/src/Dialogs.vala" - current_file_summary = _tmp253_; + current_file_summary = _tmp237_; #line 306 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp252_); + _g_free0 (_tmp236_); #line 306 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp248_); + _g_free0 (_tmp232_); #line 306 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp246_); + _g_free0 (_tmp230_); #line 306 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp244_); + _g_free0 (_tmp228_); #line 309 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp254_ = builder; + _tmp238_ = builder; #line 309 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp255_ = current_file_summary; + _tmp239_ = current_file_summary; #line 309 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_string_append (_tmp254_, _tmp255_); + g_string_append (_tmp238_, _tmp239_); #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" _batch_import_result_unref0 (_result_); -#line 3436 "Dialogs.c" +#line 3472 "Dialogs.c" } #line 305 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_result_list); -#line 3440 "Dialogs.c" +#line 3476 "Dialogs.c" } } #line 316 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp256_ = manifest; -#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp257_ = _tmp256_->failed; + _tmp240_ = manifest->failed; #line 316 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp258_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp257_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp241_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp240_, GEE_TYPE_COLLECTION, GeeCollection)); #line 316 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp259_ = _tmp258_; + _tmp242_ = _tmp241_; #line 316 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp259_ > 0) { -#line 3453 "Dialogs.c" - GString* _tmp260_; - gchar* _tmp261_; - gchar* _tmp262_; + if (_tmp242_ > 0) { +#line 3487 "Dialogs.c" + GString* _tmp243_; + gchar* _tmp244_; + gchar* _tmp245_; #line 317 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp260_ = builder; + _tmp243_ = builder; #line 317 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp261_ = g_strconcat (_ ("Photos/Videos Not Imported for Other Reasons:"), "\n\n", NULL); + _tmp244_ = g_strconcat (_ ("Photos/Videos Not Imported for Other Reasons:"), "\n\n", NULL); #line 317 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp262_ = _tmp261_; + _tmp245_ = _tmp244_; #line 317 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_string_append (_tmp260_, _tmp262_); + g_string_append (_tmp243_, _tmp245_); #line 317 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp262_); -#line 3467 "Dialogs.c" + _g_free0 (_tmp245_); +#line 3501 "Dialogs.c" { GeeList* _result_list = NULL; - ImportManifest* _tmp263_; - GeeList* _tmp264_; - GeeList* _tmp265_; + GeeList* _tmp246_; + GeeList* _tmp247_; gint _result_size = 0; - GeeList* _tmp266_; - gint _tmp267_; - gint _tmp268_; + GeeList* _tmp248_; + gint _tmp249_; + gint _tmp250_; gint _result_index = 0; #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp263_ = manifest; -#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp264_ = _tmp263_->failed; + _tmp246_ = manifest->failed; #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp265_ = _g_object_ref0 (_tmp264_); + _tmp247_ = _g_object_ref0 (_tmp246_); #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_list = _tmp265_; + _result_list = _tmp247_; #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp266_ = _result_list; + _tmp248_ = _result_list; #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp267_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp266_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp249_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp248_, GEE_TYPE_COLLECTION, GeeCollection)); #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp268_ = _tmp267_; + _tmp250_ = _tmp249_; #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_size = _tmp268_; + _result_size = _tmp250_; #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" _result_index = -1; #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" while (TRUE) { -#line 3498 "Dialogs.c" - gint _tmp269_; - gint _tmp270_; - gint _tmp271_; +#line 3529 "Dialogs.c" + gint _tmp251_; + gint _tmp252_; + gint _tmp253_; BatchImportResult* _result_ = NULL; - GeeList* _tmp272_; - gint _tmp273_; - gpointer _tmp274_; - BatchImportResult* _tmp275_; - const gchar* _tmp276_; - gchar* _tmp277_; - gchar* _tmp278_; - gchar* _tmp279_; - gchar* _tmp280_; - gchar* _tmp281_; - gchar* _tmp282_; - BatchImportResult* _tmp283_; - const gchar* _tmp284_; - gchar* _tmp285_; - gchar* _tmp286_; - gchar* _tmp287_; - GString* _tmp288_; - const gchar* _tmp289_; + GeeList* _tmp254_; + gint _tmp255_; + gpointer _tmp256_; + BatchImportResult* _tmp257_; + const gchar* _tmp258_; + gchar* _tmp259_; + gchar* _tmp260_; + gchar* _tmp261_; + gchar* _tmp262_; + gchar* _tmp263_; + gchar* _tmp264_; + BatchImportResult* _tmp265_; + const gchar* _tmp266_; + gchar* _tmp267_; + gchar* _tmp268_; + gchar* _tmp269_; + GString* _tmp270_; + const gchar* _tmp271_; #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp269_ = _result_index; + _tmp251_ = _result_index; #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_index = _tmp269_ + 1; + _result_index = _tmp251_ + 1; #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp270_ = _result_index; + _tmp252_ = _result_index; #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp271_ = _result_size; + _tmp253_ = _result_size; #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (!(_tmp270_ < _tmp271_)) { + if (!(_tmp252_ < _tmp253_)) { #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" break; -#line 3533 "Dialogs.c" +#line 3564 "Dialogs.c" } #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp272_ = _result_list; + _tmp254_ = _result_list; #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp273_ = _result_index; + _tmp255_ = _result_index; #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp274_ = gee_list_get (_tmp272_, _tmp273_); + _tmp256_ = gee_list_get (_tmp254_, _tmp255_); #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_ = (BatchImportResult*) _tmp274_; + _result_ = (BatchImportResult*) _tmp256_; #line 320 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp275_ = _result_; + _tmp257_ = _result_; #line 320 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp276_ = _tmp275_->src_identifier; + _tmp258_ = _tmp257_->src_identifier; #line 320 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp277_ = g_strconcat (_tmp276_, "\n\t", NULL); + _tmp259_ = g_strconcat (_tmp258_, "\n\t", NULL); #line 320 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp278_ = _tmp277_; + _tmp260_ = _tmp259_; #line 320 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp279_ = g_strconcat (_tmp278_, _ ("error message:"), NULL); + _tmp261_ = g_strconcat (_tmp260_, _ ("error message:"), NULL); #line 320 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp280_ = _tmp279_; + _tmp262_ = _tmp261_; #line 320 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp281_ = g_strconcat (_tmp280_, " ", NULL); + _tmp263_ = g_strconcat (_tmp262_, " ", NULL); #line 320 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp282_ = _tmp281_; + _tmp264_ = _tmp263_; #line 320 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp283_ = _result_; + _tmp265_ = _result_; #line 320 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp284_ = _tmp283_->errmsg; + _tmp266_ = _tmp265_->errmsg; #line 320 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp285_ = g_strconcat (_tmp282_, _tmp284_, NULL); + _tmp267_ = g_strconcat (_tmp264_, _tmp266_, NULL); #line 320 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp286_ = _tmp285_; + _tmp268_ = _tmp267_; #line 320 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp287_ = g_strconcat (_tmp286_, "\n\n", NULL); + _tmp269_ = g_strconcat (_tmp268_, "\n\n", NULL); #line 320 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (current_file_summary); #line 320 "/home/jens/Source/shotwell/src/Dialogs.vala" - current_file_summary = _tmp287_; + current_file_summary = _tmp269_; #line 320 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp286_); + _g_free0 (_tmp268_); #line 320 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp282_); + _g_free0 (_tmp264_); #line 320 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp280_); + _g_free0 (_tmp262_); #line 320 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp278_); + _g_free0 (_tmp260_); #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp288_ = builder; + _tmp270_ = builder; #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp289_ = current_file_summary; + _tmp271_ = current_file_summary; #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_string_append (_tmp288_, _tmp289_); + g_string_append (_tmp270_, _tmp271_); #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" _batch_import_result_unref0 (_result_); -#line 3589 "Dialogs.c" +#line 3620 "Dialogs.c" } #line 319 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_result_list); -#line 3593 "Dialogs.c" +#line 3624 "Dialogs.c" } } #line 327 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp290_ = builder; + _tmp272_ = builder; #line 327 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp291_ = _tmp290_->str; + _tmp273_ = _tmp272_->str; #line 327 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp292_ = g_strdup (_tmp291_); + _tmp274_ = g_strdup (_tmp273_); #line 327 "/home/jens/Source/shotwell/src/Dialogs.vala" - result = _tmp292_; + result = _tmp274_; #line 327 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (current_file_summary); #line 327 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -3616,97 +3647,81 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) { _g_string_free0 (builder); #line 327 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 3614 "Dialogs.c" +#line 3645 "Dialogs.c" } -gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest_id, ImportUIQuestionParams* question) { +gboolean +import_ui_report_manifest (ImportManifest* manifest, + gboolean show_dest_id, + ImportUIQuestionParams* question) +{ gboolean result = FALSE; gchar* message = NULL; gchar* _tmp0_; - ImportManifest* _tmp1_; - GeeList* _tmp2_; + GeeList* _tmp1_; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; - ImportManifest* _tmp49_; - GeeList* _tmp50_; - gint _tmp51_; - gint _tmp52_; - ImportManifest* _tmp111_; - GeeList* _tmp112_; - gint _tmp113_; - gint _tmp114_; - ImportManifest* _tmp173_; - GeeList* _tmp174_; - gint _tmp175_; - gint _tmp176_; - ImportManifest* _tmp235_; - GeeList* _tmp236_; - gint _tmp237_; - gint _tmp238_; - ImportManifest* _tmp297_; - GeeList* _tmp298_; - gint _tmp299_; - gint _tmp300_; - ImportManifest* _tmp325_; - GeeList* _tmp326_; - gint _tmp327_; - gint _tmp328_; - ImportManifest* _tmp346_; - GeeList* _tmp347_; - gint _tmp348_; - gint _tmp349_; - ImportManifest* _tmp408_; - GeeList* _tmp409_; - gint _tmp410_; - gint _tmp411_; + GeeList* _tmp39_; + gint _tmp40_; + gint _tmp41_; + GeeList* _tmp89_; + gint _tmp90_; + gint _tmp91_; + GeeList* _tmp139_; + gint _tmp140_; + gint _tmp141_; + GeeList* _tmp189_; + gint _tmp190_; + gint _tmp191_; + GeeList* _tmp239_; + gint _tmp240_; + gint _tmp241_; + GeeList* _tmp262_; + gint _tmp263_; + gint _tmp264_; + GeeList* _tmp280_; + gint _tmp281_; + gint _tmp282_; + GeeList* _tmp330_; + gint _tmp331_; + gint _tmp332_; gint total = 0; - ImportManifest* _tmp453_; - GeeList* _tmp454_; - gint _tmp455_; - gint _tmp456_; - ImportManifest* _tmp457_; - GeeList* _tmp458_; - gint _tmp459_; - gint _tmp460_; - ImportManifest* _tmp461_; - GeeList* _tmp462_; - gint _tmp463_; - gint _tmp464_; - ImportManifest* _tmp465_; - GeeList* _tmp466_; - gint _tmp467_; - gint _tmp468_; - ImportManifest* _tmp469_; - GeeList* _tmp470_; - gint _tmp471_; - gint _tmp472_; - ImportManifest* _tmp473_; - GeeList* _tmp474_; - gint _tmp475_; - gint _tmp476_; - ImportManifest* _tmp477_; - GeeList* _tmp478_; - gint _tmp479_; - gint _tmp480_; - ImportManifest* _tmp481_; - GeeList* _tmp482_; - gint _tmp483_; - gint _tmp484_; - ImportManifest* _tmp485_; - GeeList* _tmp486_; - gint _tmp487_; - gint _tmp488_; - gint _tmp489_; - ImportManifest* _tmp490_; - GeeList* _tmp491_; - gint _tmp492_; - gint _tmp493_; - gint _tmp494_; + GeeList* _tmp367_; + gint _tmp368_; + gint _tmp369_; + GeeList* _tmp370_; + gint _tmp371_; + gint _tmp372_; + GeeList* _tmp373_; + gint _tmp374_; + gint _tmp375_; + GeeList* _tmp376_; + gint _tmp377_; + gint _tmp378_; + GeeList* _tmp379_; + gint _tmp380_; + gint _tmp381_; + GeeList* _tmp382_; + gint _tmp383_; + gint _tmp384_; + GeeList* _tmp385_; + gint _tmp386_; + gint _tmp387_; + GeeList* _tmp388_; + gint _tmp389_; + gint _tmp390_; + GeeList* _tmp391_; + gint _tmp392_; + gint _tmp393_; + gint _tmp394_; + GeeList* _tmp395_; + gint _tmp396_; + gint _tmp397_; + gint _tmp398_; GtkMessageDialog* dialog = NULL; gint dialog_response = 0; - ImportUIQuestionParams* _tmp497_; - gint _tmp575_; + gint _tmp466_; #line 332 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (IS_IMPORT_MANIFEST (manifest), FALSE); #line 332 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -3716,395 +3731,331 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest #line 334 "/home/jens/Source/shotwell/src/Dialogs.vala" message = _tmp0_; #line 336 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = manifest; + _tmp1_ = manifest->already_imported; #line 336 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = _tmp1_->already_imported; + _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); #line 336 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 336 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp4_ > 0) { -#line 3723 "Dialogs.c" + if (_tmp3_ > 0) { +#line 3736 "Dialogs.c" gchar* photos_message = NULL; - ImportManifest* _tmp5_; - GeeList* _tmp6_; - gint _tmp7_; + GeeList* _tmp4_; + gint _tmp5_; + gint _tmp6_; + GeeList* _tmp7_; gint _tmp8_; - ImportManifest* _tmp9_; - GeeList* _tmp10_; - gint _tmp11_; - gint _tmp12_; - gchar* _tmp13_; + gint _tmp9_; + gchar* _tmp10_; gchar* videos_message = NULL; - ImportManifest* _tmp14_; - GeeList* _tmp15_; + GeeList* _tmp11_; + gint _tmp12_; + gint _tmp13_; + GeeList* _tmp14_; + gint _tmp15_; gint _tmp16_; - gint _tmp17_; - ImportManifest* _tmp18_; - GeeList* _tmp19_; - gint _tmp20_; - gint _tmp21_; - gchar* _tmp22_; + gchar* _tmp17_; gchar* both_message = NULL; - ImportManifest* _tmp23_; - GeeList* _tmp24_; - gint _tmp25_; - gint _tmp26_; - ImportManifest* _tmp27_; - GeeList* _tmp28_; - gint _tmp29_; - gint _tmp30_; + GeeList* _tmp18_; + gint _tmp19_; + gint _tmp20_; + GeeList* _tmp21_; + gint _tmp22_; + gint _tmp23_; + gchar* _tmp24_; + const gchar* _tmp25_; + GeeList* _tmp26_; + const gchar* _tmp27_; + const gchar* _tmp28_; + const gchar* _tmp29_; + const gchar* _tmp30_; gchar* _tmp31_; - const gchar* _tmp32_; - ImportManifest* _tmp33_; - GeeList* _tmp34_; - const gchar* _tmp35_; - const gchar* _tmp36_; - const gchar* _tmp37_; - const gchar* _tmp38_; - gchar* _tmp39_; - gchar* _tmp40_; - gchar* _tmp41_; - const gchar* _tmp42_; - ImportManifest* _tmp43_; - GeeList* _tmp44_; - gboolean _tmp45_; - gchar* _tmp46_; - gchar* _tmp47_; - gchar* _tmp48_; -#line 337 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = manifest; -#line 337 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = _tmp5_->already_imported; + gchar* _tmp32_; + gchar* _tmp33_; + const gchar* _tmp34_; + GeeList* _tmp35_; + gchar* _tmp36_; + gchar* _tmp37_; + gchar* _tmp38_; #line 337 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp4_ = manifest->already_imported; #line 337 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = _tmp7_; + _tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); #line 337 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9_ = manifest; + _tmp6_ = _tmp5_; #line 337 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp10_ = _tmp9_->already_imported; + _tmp7_ = manifest->already_imported; #line 337 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp11_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); #line 337 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp12_ = _tmp11_; + _tmp9_ = _tmp8_; #line 337 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp13_ = g_strdup_printf (ngettext ("1 duplicate photo was not imported:\n", "%d duplicate photos were not imported:\n", (gulong) _tmp8_), _tmp12_); + _tmp10_ = g_strdup_printf (ngettext ("1 duplicate photo was not imported:\n", "%d duplicate photos were not imported:\n", (gulong) _tmp6_), _tmp9_); #line 337 "/home/jens/Source/shotwell/src/Dialogs.vala" - photos_message = _tmp13_; + photos_message = _tmp10_; #line 340 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp14_ = manifest; + _tmp11_ = manifest->already_imported; #line 340 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp15_ = _tmp14_->already_imported; + _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); #line 340 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp16_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp13_ = _tmp12_; #line 340 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp17_ = _tmp16_; + _tmp14_ = manifest->already_imported; #line 340 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp18_ = manifest; + _tmp15_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection)); #line 340 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp19_ = _tmp18_->already_imported; + _tmp16_ = _tmp15_; #line 340 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp20_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp17_ = g_strdup_printf (ngettext ("1 duplicate video was not imported:\n", "%d duplicate videos were not imported:\n", (gulong) _tmp13_), _tmp16_); #line 340 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp21_ = _tmp20_; -#line 340 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp22_ = g_strdup_printf (ngettext ("1 duplicate video was not imported:\n", "%d duplicate videos were not imported:\n", (gulong) _tmp17_), _tmp21_); -#line 340 "/home/jens/Source/shotwell/src/Dialogs.vala" - videos_message = _tmp22_; -#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp23_ = manifest; -#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp24_ = _tmp23_->already_imported; + videos_message = _tmp17_; #line 343 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp25_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp18_ = manifest->already_imported; #line 343 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp26_ = _tmp25_; + _tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); #line 343 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp27_ = manifest; + _tmp20_ = _tmp19_; #line 343 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp28_ = _tmp27_->already_imported; + _tmp21_ = manifest->already_imported; #line 343 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp29_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp22_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); #line 343 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp30_ = _tmp29_; + _tmp23_ = _tmp22_; #line 343 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp31_ = g_strdup_printf (ngettext ("1 duplicate photo/video was not imported:\n", "%d duplicate photos/videos were not imported:\n", (gulong) _tmp26_), _tmp30_); + _tmp24_ = g_strdup_printf (ngettext ("1 duplicate photo/video was not imported:\n", "%d duplicate photos/videos were not imported:\n", (gulong) _tmp20_), _tmp23_); #line 343 "/home/jens/Source/shotwell/src/Dialogs.vala" - both_message = _tmp31_; -#line 347 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp32_ = message; + both_message = _tmp24_; #line 347 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp33_ = manifest; + _tmp25_ = message; #line 347 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp34_ = _tmp33_->already_imported; + _tmp26_ = manifest->already_imported; #line 347 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp35_ = photos_message; + _tmp27_ = photos_message; #line 347 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp36_ = videos_message; + _tmp28_ = videos_message; #line 347 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp37_ = both_message; + _tmp29_ = both_message; #line 347 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp38_ = both_message; + _tmp30_ = both_message; #line 347 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp39_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection), _tmp35_, _tmp36_, _tmp37_, _tmp38_); + _tmp31_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_, _tmp28_, _tmp29_, _tmp30_); #line 347 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp40_ = _tmp39_; + _tmp32_ = _tmp31_; #line 347 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp41_ = g_strconcat (_tmp32_, _tmp40_, NULL); + _tmp33_ = g_strconcat (_tmp25_, _tmp32_, NULL); #line 347 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 347 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp41_; + message = _tmp33_; #line 347 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp40_); -#line 350 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp42_ = message; + _g_free0 (_tmp32_); #line 350 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp43_ = manifest; + _tmp34_ = message; #line 350 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp44_ = _tmp43_->already_imported; + _tmp35_ = manifest->already_imported; #line 350 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp45_ = show_dest_id; + _tmp36_ = import_ui_generate_import_failure_list (_tmp35_, show_dest_id); #line 350 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp46_ = import_ui_generate_import_failure_list (_tmp44_, _tmp45_); + _tmp37_ = _tmp36_; #line 350 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp47_ = _tmp46_; -#line 350 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp48_ = g_strconcat (_tmp42_, _tmp47_, NULL); + _tmp38_ = g_strconcat (_tmp34_, _tmp37_, NULL); #line 350 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 350 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp48_; + message = _tmp38_; #line 350 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp47_); + _g_free0 (_tmp37_); #line 336 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (both_message); #line 336 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (videos_message); #line 336 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (photos_message); -#line 3883 "Dialogs.c" +#line 3869 "Dialogs.c" } #line 353 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp49_ = manifest; -#line 353 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp50_ = _tmp49_->failed; + _tmp39_ = manifest->failed; #line 353 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp51_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp40_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection)); #line 353 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp52_ = _tmp51_; + _tmp41_ = _tmp40_; #line 353 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp52_ > 0) { -#line 3895 "Dialogs.c" - const gchar* _tmp53_; - gint _tmp54_; - gint _tmp55_; + if (_tmp41_ > 0) { +#line 3879 "Dialogs.c" + const gchar* _tmp42_; + gint _tmp43_; + gint _tmp44_; gchar* photos_message = NULL; - ImportManifest* _tmp58_; - GeeList* _tmp59_; - gint _tmp60_; - gint _tmp61_; - ImportManifest* _tmp62_; - GeeList* _tmp63_; - gint _tmp64_; - gint _tmp65_; - gchar* _tmp66_; + GeeList* _tmp47_; + gint _tmp48_; + gint _tmp49_; + GeeList* _tmp50_; + gint _tmp51_; + gint _tmp52_; + gchar* _tmp53_; gchar* videos_message = NULL; - ImportManifest* _tmp67_; + GeeList* _tmp54_; + gint _tmp55_; + gint _tmp56_; + GeeList* _tmp57_; + gint _tmp58_; + gint _tmp59_; + gchar* _tmp60_; + gchar* both_message = NULL; + GeeList* _tmp61_; + gint _tmp62_; + gint _tmp63_; + GeeList* _tmp64_; + gint _tmp65_; + gint _tmp66_; + gchar* _tmp67_; + gchar* neither_message = NULL; GeeList* _tmp68_; gint _tmp69_; gint _tmp70_; - ImportManifest* _tmp71_; - GeeList* _tmp72_; + GeeList* _tmp71_; + gint _tmp72_; gint _tmp73_; - gint _tmp74_; - gchar* _tmp75_; - gchar* both_message = NULL; - ImportManifest* _tmp76_; - GeeList* _tmp77_; - gint _tmp78_; - gint _tmp79_; - ImportManifest* _tmp80_; - GeeList* _tmp81_; - gint _tmp82_; - gint _tmp83_; - gchar* _tmp84_; - gchar* neither_message = NULL; - ImportManifest* _tmp85_; - GeeList* _tmp86_; - gint _tmp87_; - gint _tmp88_; - ImportManifest* _tmp89_; - GeeList* _tmp90_; - gint _tmp91_; - gint _tmp92_; - gchar* _tmp93_; - const gchar* _tmp94_; - ImportManifest* _tmp95_; - GeeList* _tmp96_; - const gchar* _tmp97_; - const gchar* _tmp98_; - const gchar* _tmp99_; - const gchar* _tmp100_; - gchar* _tmp101_; - gchar* _tmp102_; - gchar* _tmp103_; - const gchar* _tmp104_; - ImportManifest* _tmp105_; - GeeList* _tmp106_; - gboolean _tmp107_; - gchar* _tmp108_; - gchar* _tmp109_; - gchar* _tmp110_; + gchar* _tmp74_; + const gchar* _tmp75_; + GeeList* _tmp76_; + const gchar* _tmp77_; + const gchar* _tmp78_; + const gchar* _tmp79_; + const gchar* _tmp80_; + gchar* _tmp81_; + gchar* _tmp82_; + gchar* _tmp83_; + const gchar* _tmp84_; + GeeList* _tmp85_; + gchar* _tmp86_; + gchar* _tmp87_; + gchar* _tmp88_; #line 354 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp53_ = message; + _tmp42_ = message; #line 354 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp54_ = strlen (_tmp53_); + _tmp43_ = strlen (_tmp42_); #line 354 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp55_ = _tmp54_; + _tmp44_ = _tmp43_; #line 354 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp55_ > 0) { -#line 3964 "Dialogs.c" - const gchar* _tmp56_; - gchar* _tmp57_; + if (_tmp44_ > 0) { +#line 3937 "Dialogs.c" + const gchar* _tmp45_; + gchar* _tmp46_; #line 355 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp56_ = message; + _tmp45_ = message; #line 355 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp57_ = g_strconcat (_tmp56_, "\n", NULL); + _tmp46_ = g_strconcat (_tmp45_, "\n", NULL); #line 355 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 355 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp57_; -#line 3975 "Dialogs.c" + message = _tmp46_; +#line 3948 "Dialogs.c" } #line 357 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp58_ = manifest; + _tmp47_ = manifest->failed; #line 357 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp59_ = _tmp58_->failed; + _tmp48_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_COLLECTION, GeeCollection)); #line 357 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp60_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp49_ = _tmp48_; #line 357 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp61_ = _tmp60_; + _tmp50_ = manifest->failed; #line 357 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp62_ = manifest; + _tmp51_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection)); #line 357 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp63_ = _tmp62_->failed; + _tmp52_ = _tmp51_; #line 357 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp64_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp53_ = g_strdup_printf (ngettext ("1 photo failed to import due to a file or hardware error:\n", "%d photos failed to import due to a file or hardware error:\n", (gulong) _tmp49_), _tmp52_); #line 357 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp65_ = _tmp64_; -#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp66_ = g_strdup_printf (ngettext ("1 photo failed to import due to a file or hardware error:\n", "%d photos failed to import due to a file or hardware error:\n", (gulong) _tmp61_), _tmp65_); -#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala" - photos_message = _tmp66_; -#line 360 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp67_ = manifest; -#line 360 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp68_ = _tmp67_->failed; + photos_message = _tmp53_; #line 360 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp69_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp54_ = manifest->failed; #line 360 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp70_ = _tmp69_; + _tmp55_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection)); #line 360 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp71_ = manifest; + _tmp56_ = _tmp55_; #line 360 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp72_ = _tmp71_->failed; + _tmp57_ = manifest->failed; #line 360 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp73_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp58_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_COLLECTION, GeeCollection)); #line 360 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp74_ = _tmp73_; + _tmp59_ = _tmp58_; #line 360 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp75_ = g_strdup_printf (ngettext ("1 video failed to import due to a file or hardware error:\n", "%d videos failed to import due to a file or hardware error:\n", (gulong) _tmp70_), _tmp74_); + _tmp60_ = g_strdup_printf (ngettext ("1 video failed to import due to a file or hardware error:\n", "%d videos failed to import due to a file or hardware error:\n", (gulong) _tmp56_), _tmp59_); #line 360 "/home/jens/Source/shotwell/src/Dialogs.vala" - videos_message = _tmp75_; -#line 363 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp76_ = manifest; + videos_message = _tmp60_; #line 363 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp77_ = _tmp76_->failed; + _tmp61_ = manifest->failed; #line 363 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp78_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp62_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection)); #line 363 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp79_ = _tmp78_; + _tmp63_ = _tmp62_; #line 363 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp80_ = manifest; + _tmp64_ = manifest->failed; #line 363 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp81_ = _tmp80_->failed; + _tmp65_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_COLLECTION, GeeCollection)); #line 363 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp82_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp66_ = _tmp65_; #line 363 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp83_ = _tmp82_; + _tmp67_ = g_strdup_printf (ngettext ("1 photo/video failed to import due to a file or hardware error:\n", "%d photos/videos failed to import due to a file or hardware error:\n", (gulong) _tmp63_), _tmp66_); #line 363 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp84_ = g_strdup_printf (ngettext ("1 photo/video failed to import due to a file or hardware error:\n", "%d photos/videos failed to import due to a file or hardware error:\n", (gulong) _tmp79_), _tmp83_); -#line 363 "/home/jens/Source/shotwell/src/Dialogs.vala" - both_message = _tmp84_; -#line 366 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp85_ = manifest; + both_message = _tmp67_; #line 366 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp86_ = _tmp85_->failed; + _tmp68_ = manifest->failed; #line 366 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp87_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 366 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp88_ = _tmp87_; + _tmp69_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_COLLECTION, GeeCollection)); #line 366 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp89_ = manifest; + _tmp70_ = _tmp69_; #line 366 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp90_ = _tmp89_->failed; + _tmp71_ = manifest->failed; #line 366 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp91_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp72_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_COLLECTION, GeeCollection)); #line 366 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp92_ = _tmp91_; + _tmp73_ = _tmp72_; #line 366 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp93_ = g_strdup_printf (ngettext ("1 file failed to import due to a file or hardware error:\n", "%d files failed to import due to a file or hardware error:\n", (gulong) _tmp88_), _tmp92_); + _tmp74_ = g_strdup_printf (ngettext ("1 file failed to import due to a file or hardware error:\n", "%d files failed to import due to a file or hardware error:\n", (gulong) _tmp70_), _tmp73_); #line 366 "/home/jens/Source/shotwell/src/Dialogs.vala" - neither_message = _tmp93_; -#line 370 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp94_ = message; + neither_message = _tmp74_; #line 370 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp95_ = manifest; + _tmp75_ = message; #line 370 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp96_ = _tmp95_->failed; + _tmp76_ = manifest->failed; #line 370 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp97_ = photos_message; + _tmp77_ = photos_message; #line 370 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp98_ = videos_message; + _tmp78_ = videos_message; #line 370 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp99_ = both_message; + _tmp79_ = both_message; #line 370 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp100_ = neither_message; + _tmp80_ = neither_message; #line 370 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp101_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, GEE_TYPE_COLLECTION, GeeCollection), _tmp97_, _tmp98_, _tmp99_, _tmp100_); + _tmp81_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_COLLECTION, GeeCollection), _tmp77_, _tmp78_, _tmp79_, _tmp80_); #line 370 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp102_ = _tmp101_; + _tmp82_ = _tmp81_; #line 370 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp103_ = g_strconcat (_tmp94_, _tmp102_, NULL); + _tmp83_ = g_strconcat (_tmp75_, _tmp82_, NULL); #line 370 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 370 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp103_; + message = _tmp83_; #line 370 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp102_); -#line 373 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp104_ = message; + _g_free0 (_tmp82_); #line 373 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp105_ = manifest; + _tmp84_ = message; #line 373 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp106_ = _tmp105_->failed; + _tmp85_ = manifest->failed; #line 373 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp107_ = show_dest_id; + _tmp86_ = import_ui_generate_import_failure_list (_tmp85_, show_dest_id); #line 373 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp108_ = import_ui_generate_import_failure_list (_tmp106_, _tmp107_); -#line 373 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp109_ = _tmp108_; + _tmp87_ = _tmp86_; #line 373 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp110_ = g_strconcat (_tmp104_, _tmp109_, NULL); + _tmp88_ = g_strconcat (_tmp84_, _tmp87_, NULL); #line 373 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 373 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp110_; + message = _tmp88_; #line 373 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp109_); + _g_free0 (_tmp87_); #line 353 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (neither_message); #line 353 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -4113,234 +4064,199 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest _g_free0 (videos_message); #line 353 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (photos_message); -#line 4111 "Dialogs.c" +#line 4062 "Dialogs.c" } #line 376 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp111_ = manifest; -#line 376 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp112_ = _tmp111_->write_failed; + _tmp89_ = manifest->write_failed; #line 376 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp113_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp90_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp89_, GEE_TYPE_COLLECTION, GeeCollection)); #line 376 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp114_ = _tmp113_; + _tmp91_ = _tmp90_; #line 376 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp114_ > 0) { -#line 4123 "Dialogs.c" - const gchar* _tmp115_; - gint _tmp116_; - gint _tmp117_; + if (_tmp91_ > 0) { +#line 4072 "Dialogs.c" + const gchar* _tmp92_; + gint _tmp93_; + gint _tmp94_; gchar* photos_message = NULL; - ImportManifest* _tmp120_; + GeeList* _tmp97_; + gint _tmp98_; + gint _tmp99_; + GeeList* _tmp100_; + gint _tmp101_; + gint _tmp102_; + gchar* _tmp103_; + gchar* videos_message = NULL; + GeeList* _tmp104_; + gint _tmp105_; + gint _tmp106_; + GeeList* _tmp107_; + gint _tmp108_; + gint _tmp109_; + gchar* _tmp110_; + gchar* both_message = NULL; + GeeList* _tmp111_; + gint _tmp112_; + gint _tmp113_; + GeeList* _tmp114_; + gint _tmp115_; + gint _tmp116_; + gchar* _tmp117_; + gchar* neither_message = NULL; + GeeList* _tmp118_; + gint _tmp119_; + gint _tmp120_; GeeList* _tmp121_; gint _tmp122_; gint _tmp123_; - ImportManifest* _tmp124_; - GeeList* _tmp125_; - gint _tmp126_; - gint _tmp127_; - gchar* _tmp128_; - gchar* videos_message = NULL; - ImportManifest* _tmp129_; - GeeList* _tmp130_; - gint _tmp131_; - gint _tmp132_; - ImportManifest* _tmp133_; - GeeList* _tmp134_; - gint _tmp135_; - gint _tmp136_; + gchar* _tmp124_; + const gchar* _tmp125_; + GeeList* _tmp126_; + const gchar* _tmp127_; + const gchar* _tmp128_; + const gchar* _tmp129_; + const gchar* _tmp130_; + gchar* _tmp131_; + gchar* _tmp132_; + gchar* _tmp133_; + const gchar* _tmp134_; + GeeList* _tmp135_; + gchar* _tmp136_; gchar* _tmp137_; - gchar* both_message = NULL; - ImportManifest* _tmp138_; - GeeList* _tmp139_; - gint _tmp140_; - gint _tmp141_; - ImportManifest* _tmp142_; - GeeList* _tmp143_; - gint _tmp144_; - gint _tmp145_; - gchar* _tmp146_; - gchar* neither_message = NULL; - ImportManifest* _tmp147_; - GeeList* _tmp148_; - gint _tmp149_; - gint _tmp150_; - ImportManifest* _tmp151_; - GeeList* _tmp152_; - gint _tmp153_; - gint _tmp154_; - gchar* _tmp155_; - const gchar* _tmp156_; - ImportManifest* _tmp157_; - GeeList* _tmp158_; - const gchar* _tmp159_; - const gchar* _tmp160_; - const gchar* _tmp161_; - const gchar* _tmp162_; - gchar* _tmp163_; - gchar* _tmp164_; - gchar* _tmp165_; - const gchar* _tmp166_; - ImportManifest* _tmp167_; - GeeList* _tmp168_; - gboolean _tmp169_; - gchar* _tmp170_; - gchar* _tmp171_; - gchar* _tmp172_; + gchar* _tmp138_; #line 377 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp115_ = message; + _tmp92_ = message; #line 377 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp116_ = strlen (_tmp115_); + _tmp93_ = strlen (_tmp92_); #line 377 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp117_ = _tmp116_; + _tmp94_ = _tmp93_; #line 377 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp117_ > 0) { -#line 4192 "Dialogs.c" - const gchar* _tmp118_; - gchar* _tmp119_; + if (_tmp94_ > 0) { +#line 4130 "Dialogs.c" + const gchar* _tmp95_; + gchar* _tmp96_; #line 378 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp118_ = message; + _tmp95_ = message; #line 378 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp119_ = g_strconcat (_tmp118_, "\n", NULL); + _tmp96_ = g_strconcat (_tmp95_, "\n", NULL); #line 378 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 378 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp119_; -#line 4203 "Dialogs.c" + message = _tmp96_; +#line 4141 "Dialogs.c" } #line 380 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp120_ = manifest; -#line 380 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp121_ = _tmp120_->write_failed; -#line 380 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp122_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp97_ = manifest->write_failed; #line 380 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp123_ = _tmp122_; + _tmp98_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, GEE_TYPE_COLLECTION, GeeCollection)); #line 380 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp124_ = manifest; + _tmp99_ = _tmp98_; #line 380 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp125_ = _tmp124_->write_failed; + _tmp100_ = manifest->write_failed; #line 380 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp126_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp101_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_COLLECTION, GeeCollection)); #line 380 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp127_ = _tmp126_; + _tmp102_ = _tmp101_; #line 380 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp128_ = g_strdup_printf (ngettext ("1 photo failed to import because the photo library folder was not writ" \ + _tmp103_ = g_strdup_printf (ngettext ("1 photo failed to import because the photo library folder was not writ" \ "able:\n", "%d photos failed to import because the photo library folder was not wr" \ -"itable:\n", (gulong) _tmp123_), _tmp127_); +"itable:\n", (gulong) _tmp99_), _tmp102_); #line 380 "/home/jens/Source/shotwell/src/Dialogs.vala" - photos_message = _tmp128_; -#line 383 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp129_ = manifest; -#line 383 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp130_ = _tmp129_->write_failed; + photos_message = _tmp103_; #line 383 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp131_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp104_ = manifest->write_failed; #line 383 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp132_ = _tmp131_; + _tmp105_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, GEE_TYPE_COLLECTION, GeeCollection)); #line 383 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp133_ = manifest; + _tmp106_ = _tmp105_; #line 383 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp134_ = _tmp133_->write_failed; + _tmp107_ = manifest->write_failed; #line 383 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp135_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp108_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, GEE_TYPE_COLLECTION, GeeCollection)); #line 383 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp136_ = _tmp135_; + _tmp109_ = _tmp108_; #line 383 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp137_ = g_strdup_printf (ngettext ("1 video failed to import because the photo library folder was not writ" \ + _tmp110_ = g_strdup_printf (ngettext ("1 video failed to import because the photo library folder was not writ" \ "able:\n", "%d videos failed to import because the photo library folder was not wr" \ -"itable:\n", (gulong) _tmp132_), _tmp136_); +"itable:\n", (gulong) _tmp106_), _tmp109_); #line 383 "/home/jens/Source/shotwell/src/Dialogs.vala" - videos_message = _tmp137_; -#line 386 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp138_ = manifest; -#line 386 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp139_ = _tmp138_->write_failed; + videos_message = _tmp110_; #line 386 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp140_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp111_ = manifest->write_failed; #line 386 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp141_ = _tmp140_; + _tmp112_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, GEE_TYPE_COLLECTION, GeeCollection)); #line 386 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp142_ = manifest; + _tmp113_ = _tmp112_; #line 386 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp143_ = _tmp142_->write_failed; + _tmp114_ = manifest->write_failed; #line 386 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp144_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp115_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, GEE_TYPE_COLLECTION, GeeCollection)); #line 386 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp145_ = _tmp144_; + _tmp116_ = _tmp115_; #line 386 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp146_ = g_strdup_printf (ngettext ("1 photo/video failed to import because the photo library folder was no" \ + _tmp117_ = g_strdup_printf (ngettext ("1 photo/video failed to import because the photo library folder was no" \ "t writable:\n", "%d photos/videos failed to import because the photo library folder was" \ -" not writable:\n", (gulong) _tmp141_), _tmp145_); +" not writable:\n", (gulong) _tmp113_), _tmp116_); #line 386 "/home/jens/Source/shotwell/src/Dialogs.vala" - both_message = _tmp146_; -#line 389 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp147_ = manifest; + both_message = _tmp117_; #line 389 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp148_ = _tmp147_->write_failed; + _tmp118_ = manifest->write_failed; #line 389 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp149_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp148_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp119_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, GEE_TYPE_COLLECTION, GeeCollection)); #line 389 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp150_ = _tmp149_; + _tmp120_ = _tmp119_; #line 389 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp151_ = manifest; + _tmp121_ = manifest->write_failed; #line 389 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp152_ = _tmp151_->write_failed; -#line 389 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp153_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp152_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp122_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, GEE_TYPE_COLLECTION, GeeCollection)); #line 389 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp154_ = _tmp153_; + _tmp123_ = _tmp122_; #line 389 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp155_ = g_strdup_printf (ngettext ("1 file failed to import because the photo library folder was not writa" \ + _tmp124_ = g_strdup_printf (ngettext ("1 file failed to import because the photo library folder was not writa" \ "ble:\n", "%d files failed to import because the photo library folder was not wri" \ -"table:\n", (gulong) _tmp150_), _tmp154_); +"table:\n", (gulong) _tmp120_), _tmp123_); #line 389 "/home/jens/Source/shotwell/src/Dialogs.vala" - neither_message = _tmp155_; -#line 393 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp156_ = message; + neither_message = _tmp124_; #line 393 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp157_ = manifest; + _tmp125_ = message; #line 393 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp158_ = _tmp157_->write_failed; + _tmp126_ = manifest->write_failed; #line 393 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp159_ = photos_message; + _tmp127_ = photos_message; #line 393 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp160_ = videos_message; + _tmp128_ = videos_message; #line 393 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp161_ = both_message; + _tmp129_ = both_message; #line 393 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp162_ = neither_message; + _tmp130_ = neither_message; #line 393 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp163_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp158_, GEE_TYPE_COLLECTION, GeeCollection), _tmp159_, _tmp160_, _tmp161_, _tmp162_); + _tmp131_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, GEE_TYPE_COLLECTION, GeeCollection), _tmp127_, _tmp128_, _tmp129_, _tmp130_); #line 393 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp164_ = _tmp163_; + _tmp132_ = _tmp131_; #line 393 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp165_ = g_strconcat (_tmp156_, _tmp164_, NULL); + _tmp133_ = g_strconcat (_tmp125_, _tmp132_, NULL); #line 393 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 393 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp165_; + message = _tmp133_; #line 393 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp164_); -#line 396 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp166_ = message; + _g_free0 (_tmp132_); #line 396 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp167_ = manifest; + _tmp134_ = message; #line 396 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp168_ = _tmp167_->write_failed; + _tmp135_ = manifest->write_failed; #line 396 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp169_ = show_dest_id; + _tmp136_ = import_ui_generate_import_failure_list (_tmp135_, show_dest_id); #line 396 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp170_ = import_ui_generate_import_failure_list (_tmp168_, _tmp169_); + _tmp137_ = _tmp136_; #line 396 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp171_ = _tmp170_; -#line 396 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp172_ = g_strconcat (_tmp166_, _tmp171_, NULL); + _tmp138_ = g_strconcat (_tmp134_, _tmp137_, NULL); #line 396 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 396 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp172_; + message = _tmp138_; #line 396 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp171_); + _g_free0 (_tmp137_); #line 376 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (neither_message); #line 376 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -4349,226 +4265,191 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest _g_free0 (videos_message); #line 376 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (photos_message); -#line 4339 "Dialogs.c" +#line 4255 "Dialogs.c" } #line 399 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp173_ = manifest; -#line 399 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp174_ = _tmp173_->camera_failed; + _tmp139_ = manifest->camera_failed; #line 399 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp175_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp174_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp140_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, GEE_TYPE_COLLECTION, GeeCollection)); #line 399 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp176_ = _tmp175_; + _tmp141_ = _tmp140_; #line 399 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp176_ > 0) { -#line 4351 "Dialogs.c" - const gchar* _tmp177_; - gint _tmp178_; - gint _tmp179_; + if (_tmp141_ > 0) { +#line 4265 "Dialogs.c" + const gchar* _tmp142_; + gint _tmp143_; + gint _tmp144_; gchar* photos_message = NULL; - ImportManifest* _tmp182_; - GeeList* _tmp183_; - gint _tmp184_; - gint _tmp185_; - ImportManifest* _tmp186_; - GeeList* _tmp187_; - gint _tmp188_; - gint _tmp189_; - gchar* _tmp190_; + GeeList* _tmp147_; + gint _tmp148_; + gint _tmp149_; + GeeList* _tmp150_; + gint _tmp151_; + gint _tmp152_; + gchar* _tmp153_; gchar* videos_message = NULL; - ImportManifest* _tmp191_; - GeeList* _tmp192_; - gint _tmp193_; - gint _tmp194_; - ImportManifest* _tmp195_; - GeeList* _tmp196_; - gint _tmp197_; - gint _tmp198_; - gchar* _tmp199_; + GeeList* _tmp154_; + gint _tmp155_; + gint _tmp156_; + GeeList* _tmp157_; + gint _tmp158_; + gint _tmp159_; + gchar* _tmp160_; gchar* both_message = NULL; - ImportManifest* _tmp200_; - GeeList* _tmp201_; - gint _tmp202_; - gint _tmp203_; - ImportManifest* _tmp204_; - GeeList* _tmp205_; - gint _tmp206_; - gint _tmp207_; - gchar* _tmp208_; + GeeList* _tmp161_; + gint _tmp162_; + gint _tmp163_; + GeeList* _tmp164_; + gint _tmp165_; + gint _tmp166_; + gchar* _tmp167_; gchar* neither_message = NULL; - ImportManifest* _tmp209_; - GeeList* _tmp210_; - gint _tmp211_; - gint _tmp212_; - ImportManifest* _tmp213_; - GeeList* _tmp214_; - gint _tmp215_; - gint _tmp216_; - gchar* _tmp217_; - const gchar* _tmp218_; - ImportManifest* _tmp219_; - GeeList* _tmp220_; - const gchar* _tmp221_; - const gchar* _tmp222_; - const gchar* _tmp223_; - const gchar* _tmp224_; - gchar* _tmp225_; - gchar* _tmp226_; - gchar* _tmp227_; - const gchar* _tmp228_; - ImportManifest* _tmp229_; - GeeList* _tmp230_; - gboolean _tmp231_; - gchar* _tmp232_; - gchar* _tmp233_; - gchar* _tmp234_; + GeeList* _tmp168_; + gint _tmp169_; + gint _tmp170_; + GeeList* _tmp171_; + gint _tmp172_; + gint _tmp173_; + gchar* _tmp174_; + const gchar* _tmp175_; + GeeList* _tmp176_; + const gchar* _tmp177_; + const gchar* _tmp178_; + const gchar* _tmp179_; + const gchar* _tmp180_; + gchar* _tmp181_; + gchar* _tmp182_; + gchar* _tmp183_; + const gchar* _tmp184_; + GeeList* _tmp185_; + gchar* _tmp186_; + gchar* _tmp187_; + gchar* _tmp188_; #line 400 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp177_ = message; + _tmp142_ = message; #line 400 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp178_ = strlen (_tmp177_); + _tmp143_ = strlen (_tmp142_); #line 400 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp179_ = _tmp178_; + _tmp144_ = _tmp143_; #line 400 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp179_ > 0) { -#line 4420 "Dialogs.c" - const gchar* _tmp180_; - gchar* _tmp181_; + if (_tmp144_ > 0) { +#line 4323 "Dialogs.c" + const gchar* _tmp145_; + gchar* _tmp146_; #line 401 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp180_ = message; + _tmp145_ = message; #line 401 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp181_ = g_strconcat (_tmp180_, "\n", NULL); + _tmp146_ = g_strconcat (_tmp145_, "\n", NULL); #line 401 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 401 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp181_; -#line 4431 "Dialogs.c" + message = _tmp146_; +#line 4334 "Dialogs.c" } #line 403 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp182_ = manifest; + _tmp147_ = manifest->camera_failed; #line 403 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp183_ = _tmp182_->camera_failed; + _tmp148_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp147_, GEE_TYPE_COLLECTION, GeeCollection)); #line 403 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp184_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp183_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp149_ = _tmp148_; #line 403 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp185_ = _tmp184_; + _tmp150_ = manifest->camera_failed; #line 403 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp186_ = manifest; + _tmp151_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp150_, GEE_TYPE_COLLECTION, GeeCollection)); #line 403 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp187_ = _tmp186_->camera_failed; + _tmp152_ = _tmp151_; #line 403 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp188_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp187_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp153_ = g_strdup_printf (ngettext ("1 photo failed to import due to a camera error:\n", "%d photos failed to import due to a camera error:\n", (gulong) _tmp149_), _tmp152_); #line 403 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp189_ = _tmp188_; -#line 403 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp190_ = g_strdup_printf (ngettext ("1 photo failed to import due to a camera error:\n", "%d photos failed to import due to a camera error:\n", (gulong) _tmp185_), _tmp189_); -#line 403 "/home/jens/Source/shotwell/src/Dialogs.vala" - photos_message = _tmp190_; -#line 406 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp191_ = manifest; -#line 406 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp192_ = _tmp191_->camera_failed; + photos_message = _tmp153_; #line 406 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp193_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp192_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp154_ = manifest->camera_failed; #line 406 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp194_ = _tmp193_; + _tmp155_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp154_, GEE_TYPE_COLLECTION, GeeCollection)); #line 406 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp195_ = manifest; + _tmp156_ = _tmp155_; #line 406 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp196_ = _tmp195_->camera_failed; + _tmp157_ = manifest->camera_failed; #line 406 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp197_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp196_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp158_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp157_, GEE_TYPE_COLLECTION, GeeCollection)); #line 406 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp198_ = _tmp197_; + _tmp159_ = _tmp158_; #line 406 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp199_ = g_strdup_printf (ngettext ("1 video failed to import due to a camera error:\n", "%d videos failed to import due to a camera error:\n", (gulong) _tmp194_), _tmp198_); + _tmp160_ = g_strdup_printf (ngettext ("1 video failed to import due to a camera error:\n", "%d videos failed to import due to a camera error:\n", (gulong) _tmp156_), _tmp159_); #line 406 "/home/jens/Source/shotwell/src/Dialogs.vala" - videos_message = _tmp199_; -#line 409 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp200_ = manifest; -#line 409 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp201_ = _tmp200_->camera_failed; + videos_message = _tmp160_; #line 409 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp202_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp201_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp161_ = manifest->camera_failed; #line 409 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp203_ = _tmp202_; + _tmp162_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp161_, GEE_TYPE_COLLECTION, GeeCollection)); #line 409 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp204_ = manifest; + _tmp163_ = _tmp162_; #line 409 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp205_ = _tmp204_->camera_failed; + _tmp164_ = manifest->camera_failed; #line 409 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp206_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp205_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp165_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp164_, GEE_TYPE_COLLECTION, GeeCollection)); #line 409 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp207_ = _tmp206_; + _tmp166_ = _tmp165_; #line 409 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp208_ = g_strdup_printf (ngettext ("1 photo/video failed to import due to a camera error:\n", "%d photos/videos failed to import due to a camera error:\n", (gulong) _tmp203_), _tmp207_); + _tmp167_ = g_strdup_printf (ngettext ("1 photo/video failed to import due to a camera error:\n", "%d photos/videos failed to import due to a camera error:\n", (gulong) _tmp163_), _tmp166_); #line 409 "/home/jens/Source/shotwell/src/Dialogs.vala" - both_message = _tmp208_; + both_message = _tmp167_; #line 412 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp209_ = manifest; + _tmp168_ = manifest->camera_failed; #line 412 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp210_ = _tmp209_->camera_failed; + _tmp169_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp168_, GEE_TYPE_COLLECTION, GeeCollection)); #line 412 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp211_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp210_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp170_ = _tmp169_; #line 412 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp212_ = _tmp211_; + _tmp171_ = manifest->camera_failed; #line 412 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp213_ = manifest; + _tmp172_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp171_, GEE_TYPE_COLLECTION, GeeCollection)); #line 412 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp214_ = _tmp213_->camera_failed; -#line 412 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp215_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp214_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 412 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp216_ = _tmp215_; + _tmp173_ = _tmp172_; #line 412 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp217_ = g_strdup_printf (ngettext ("1 file failed to import due to a camera error:\n", "%d files failed to import due to a camera error:\n", (gulong) _tmp212_), _tmp216_); + _tmp174_ = g_strdup_printf (ngettext ("1 file failed to import due to a camera error:\n", "%d files failed to import due to a camera error:\n", (gulong) _tmp170_), _tmp173_); #line 412 "/home/jens/Source/shotwell/src/Dialogs.vala" - neither_message = _tmp217_; + neither_message = _tmp174_; #line 416 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp218_ = message; + _tmp175_ = message; #line 416 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp219_ = manifest; + _tmp176_ = manifest->camera_failed; #line 416 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp220_ = _tmp219_->camera_failed; + _tmp177_ = photos_message; #line 416 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp221_ = photos_message; + _tmp178_ = videos_message; #line 416 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp222_ = videos_message; + _tmp179_ = both_message; #line 416 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp223_ = both_message; + _tmp180_ = neither_message; #line 416 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp224_ = neither_message; + _tmp181_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp176_, GEE_TYPE_COLLECTION, GeeCollection), _tmp177_, _tmp178_, _tmp179_, _tmp180_); #line 416 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp225_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp220_, GEE_TYPE_COLLECTION, GeeCollection), _tmp221_, _tmp222_, _tmp223_, _tmp224_); + _tmp182_ = _tmp181_; #line 416 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp226_ = _tmp225_; -#line 416 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp227_ = g_strconcat (_tmp218_, _tmp226_, NULL); + _tmp183_ = g_strconcat (_tmp175_, _tmp182_, NULL); #line 416 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 416 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp227_; + message = _tmp183_; #line 416 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp226_); -#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp228_ = message; + _g_free0 (_tmp182_); #line 419 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp229_ = manifest; + _tmp184_ = message; #line 419 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp230_ = _tmp229_->camera_failed; + _tmp185_ = manifest->camera_failed; #line 419 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp231_ = show_dest_id; + _tmp186_ = import_ui_generate_import_failure_list (_tmp185_, show_dest_id); #line 419 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp232_ = import_ui_generate_import_failure_list (_tmp230_, _tmp231_); + _tmp187_ = _tmp186_; #line 419 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp233_ = _tmp232_; -#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp234_ = g_strconcat (_tmp228_, _tmp233_, NULL); + _tmp188_ = g_strconcat (_tmp184_, _tmp187_, NULL); #line 419 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 419 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp234_; + message = _tmp188_; #line 419 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp233_); + _g_free0 (_tmp187_); #line 399 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (neither_message); #line 399 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -4577,226 +4458,191 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest _g_free0 (videos_message); #line 399 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (photos_message); -#line 4567 "Dialogs.c" +#line 4448 "Dialogs.c" } #line 422 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp235_ = manifest; -#line 422 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp236_ = _tmp235_->corrupt_files; + _tmp189_ = manifest->corrupt_files; #line 422 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp237_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp236_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp190_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp189_, GEE_TYPE_COLLECTION, GeeCollection)); #line 422 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp238_ = _tmp237_; + _tmp191_ = _tmp190_; #line 422 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp238_ > 0) { -#line 4579 "Dialogs.c" - const gchar* _tmp239_; - gint _tmp240_; - gint _tmp241_; + if (_tmp191_ > 0) { +#line 4458 "Dialogs.c" + const gchar* _tmp192_; + gint _tmp193_; + gint _tmp194_; gchar* photos_message = NULL; - ImportManifest* _tmp244_; - GeeList* _tmp245_; - gint _tmp246_; - gint _tmp247_; - ImportManifest* _tmp248_; - GeeList* _tmp249_; - gint _tmp250_; - gint _tmp251_; - gchar* _tmp252_; + GeeList* _tmp197_; + gint _tmp198_; + gint _tmp199_; + GeeList* _tmp200_; + gint _tmp201_; + gint _tmp202_; + gchar* _tmp203_; gchar* videos_message = NULL; - ImportManifest* _tmp253_; - GeeList* _tmp254_; - gint _tmp255_; - gint _tmp256_; - ImportManifest* _tmp257_; - GeeList* _tmp258_; - gint _tmp259_; - gint _tmp260_; - gchar* _tmp261_; + GeeList* _tmp204_; + gint _tmp205_; + gint _tmp206_; + GeeList* _tmp207_; + gint _tmp208_; + gint _tmp209_; + gchar* _tmp210_; gchar* both_message = NULL; - ImportManifest* _tmp262_; - GeeList* _tmp263_; - gint _tmp264_; - gint _tmp265_; - ImportManifest* _tmp266_; - GeeList* _tmp267_; - gint _tmp268_; - gint _tmp269_; - gchar* _tmp270_; + GeeList* _tmp211_; + gint _tmp212_; + gint _tmp213_; + GeeList* _tmp214_; + gint _tmp215_; + gint _tmp216_; + gchar* _tmp217_; gchar* neither_message = NULL; - ImportManifest* _tmp271_; - GeeList* _tmp272_; - gint _tmp273_; - gint _tmp274_; - ImportManifest* _tmp275_; - GeeList* _tmp276_; - gint _tmp277_; - gint _tmp278_; - gchar* _tmp279_; - const gchar* _tmp280_; - ImportManifest* _tmp281_; - GeeList* _tmp282_; - const gchar* _tmp283_; - const gchar* _tmp284_; - const gchar* _tmp285_; - const gchar* _tmp286_; - gchar* _tmp287_; - gchar* _tmp288_; - gchar* _tmp289_; - const gchar* _tmp290_; - ImportManifest* _tmp291_; - GeeList* _tmp292_; - gboolean _tmp293_; - gchar* _tmp294_; - gchar* _tmp295_; - gchar* _tmp296_; + GeeList* _tmp218_; + gint _tmp219_; + gint _tmp220_; + GeeList* _tmp221_; + gint _tmp222_; + gint _tmp223_; + gchar* _tmp224_; + const gchar* _tmp225_; + GeeList* _tmp226_; + const gchar* _tmp227_; + const gchar* _tmp228_; + const gchar* _tmp229_; + const gchar* _tmp230_; + gchar* _tmp231_; + gchar* _tmp232_; + gchar* _tmp233_; + const gchar* _tmp234_; + GeeList* _tmp235_; + gchar* _tmp236_; + gchar* _tmp237_; + gchar* _tmp238_; #line 423 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp239_ = message; + _tmp192_ = message; #line 423 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp240_ = strlen (_tmp239_); + _tmp193_ = strlen (_tmp192_); #line 423 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp241_ = _tmp240_; + _tmp194_ = _tmp193_; #line 423 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp241_ > 0) { -#line 4648 "Dialogs.c" - const gchar* _tmp242_; - gchar* _tmp243_; + if (_tmp194_ > 0) { +#line 4516 "Dialogs.c" + const gchar* _tmp195_; + gchar* _tmp196_; #line 424 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp242_ = message; + _tmp195_ = message; #line 424 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp243_ = g_strconcat (_tmp242_, "\n", NULL); + _tmp196_ = g_strconcat (_tmp195_, "\n", NULL); #line 424 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 424 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp243_; -#line 4659 "Dialogs.c" + message = _tmp196_; +#line 4527 "Dialogs.c" } #line 426 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp244_ = manifest; -#line 426 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp245_ = _tmp244_->corrupt_files; + _tmp197_ = manifest->corrupt_files; #line 426 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp246_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp245_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp198_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp197_, GEE_TYPE_COLLECTION, GeeCollection)); #line 426 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp247_ = _tmp246_; + _tmp199_ = _tmp198_; #line 426 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp248_ = manifest; + _tmp200_ = manifest->corrupt_files; #line 426 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp249_ = _tmp248_->corrupt_files; + _tmp201_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp200_, GEE_TYPE_COLLECTION, GeeCollection)); #line 426 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp250_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp249_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp202_ = _tmp201_; #line 426 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp251_ = _tmp250_; + _tmp203_ = g_strdup_printf (ngettext ("1 photo failed to import because it was corrupt:\n", "%d photos failed to import because they were corrupt:\n", (gulong) _tmp199_), _tmp202_); #line 426 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp252_ = g_strdup_printf (ngettext ("1 photo failed to import because it was corrupt:\n", "%d photos failed to import because they were corrupt:\n", (gulong) _tmp247_), _tmp251_); -#line 426 "/home/jens/Source/shotwell/src/Dialogs.vala" - photos_message = _tmp252_; -#line 429 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp253_ = manifest; + photos_message = _tmp203_; #line 429 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp254_ = _tmp253_->corrupt_files; + _tmp204_ = manifest->corrupt_files; #line 429 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp255_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp254_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp205_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp204_, GEE_TYPE_COLLECTION, GeeCollection)); #line 429 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp256_ = _tmp255_; + _tmp206_ = _tmp205_; #line 429 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp257_ = manifest; + _tmp207_ = manifest->corrupt_files; #line 429 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp258_ = _tmp257_->corrupt_files; + _tmp208_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp207_, GEE_TYPE_COLLECTION, GeeCollection)); #line 429 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp259_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp258_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp209_ = _tmp208_; #line 429 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp260_ = _tmp259_; -#line 429 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp261_ = g_strdup_printf (ngettext ("1 video failed to import because it was corrupt:\n", "%d videos failed to import because they were corrupt:\n", (gulong) _tmp256_), _tmp260_); + _tmp210_ = g_strdup_printf (ngettext ("1 video failed to import because it was corrupt:\n", "%d videos failed to import because they were corrupt:\n", (gulong) _tmp206_), _tmp209_); #line 429 "/home/jens/Source/shotwell/src/Dialogs.vala" - videos_message = _tmp261_; -#line 432 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp262_ = manifest; -#line 432 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp263_ = _tmp262_->corrupt_files; + videos_message = _tmp210_; #line 432 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp264_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp263_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp211_ = manifest->corrupt_files; #line 432 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp265_ = _tmp264_; + _tmp212_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp211_, GEE_TYPE_COLLECTION, GeeCollection)); #line 432 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp266_ = manifest; + _tmp213_ = _tmp212_; #line 432 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp267_ = _tmp266_->corrupt_files; + _tmp214_ = manifest->corrupt_files; #line 432 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp268_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp267_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp215_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp214_, GEE_TYPE_COLLECTION, GeeCollection)); #line 432 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp269_ = _tmp268_; + _tmp216_ = _tmp215_; #line 432 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp270_ = g_strdup_printf (ngettext ("1 photo/video failed to import because it was corrupt:\n", "%d photos/videos failed to import because they were corrupt:\n", (gulong) _tmp265_), _tmp269_); + _tmp217_ = g_strdup_printf (ngettext ("1 photo/video failed to import because it was corrupt:\n", "%d photos/videos failed to import because they were corrupt:\n", (gulong) _tmp213_), _tmp216_); #line 432 "/home/jens/Source/shotwell/src/Dialogs.vala" - both_message = _tmp270_; -#line 435 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp271_ = manifest; -#line 435 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp272_ = _tmp271_->corrupt_files; + both_message = _tmp217_; #line 435 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp273_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp272_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp218_ = manifest->corrupt_files; #line 435 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp274_ = _tmp273_; + _tmp219_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp218_, GEE_TYPE_COLLECTION, GeeCollection)); #line 435 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp275_ = manifest; + _tmp220_ = _tmp219_; #line 435 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp276_ = _tmp275_->corrupt_files; + _tmp221_ = manifest->corrupt_files; #line 435 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp277_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp276_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp222_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp221_, GEE_TYPE_COLLECTION, GeeCollection)); #line 435 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp278_ = _tmp277_; + _tmp223_ = _tmp222_; #line 435 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp279_ = g_strdup_printf (ngettext ("1 file failed to import because it was corrupt:\n", "%d files failed to import because it was corrupt:\n", (gulong) _tmp274_), _tmp278_); + _tmp224_ = g_strdup_printf (ngettext ("1 file failed to import because it was corrupt:\n", "%d files failed to import because it was corrupt:\n", (gulong) _tmp220_), _tmp223_); #line 435 "/home/jens/Source/shotwell/src/Dialogs.vala" - neither_message = _tmp279_; + neither_message = _tmp224_; #line 439 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp280_ = message; + _tmp225_ = message; #line 439 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp281_ = manifest; + _tmp226_ = manifest->corrupt_files; #line 439 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp282_ = _tmp281_->corrupt_files; + _tmp227_ = photos_message; #line 439 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp283_ = photos_message; + _tmp228_ = videos_message; #line 439 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp284_ = videos_message; + _tmp229_ = both_message; #line 439 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp285_ = both_message; + _tmp230_ = neither_message; #line 439 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp286_ = neither_message; + _tmp231_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp226_, GEE_TYPE_COLLECTION, GeeCollection), _tmp227_, _tmp228_, _tmp229_, _tmp230_); #line 439 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp287_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp282_, GEE_TYPE_COLLECTION, GeeCollection), _tmp283_, _tmp284_, _tmp285_, _tmp286_); + _tmp232_ = _tmp231_; #line 439 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp288_ = _tmp287_; -#line 439 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp289_ = g_strconcat (_tmp280_, _tmp288_, NULL); + _tmp233_ = g_strconcat (_tmp225_, _tmp232_, NULL); #line 439 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 439 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp289_; + message = _tmp233_; #line 439 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp288_); -#line 442 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp290_ = message; + _g_free0 (_tmp232_); #line 442 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp291_ = manifest; + _tmp234_ = message; #line 442 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp292_ = _tmp291_->corrupt_files; + _tmp235_ = manifest->corrupt_files; #line 442 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp293_ = show_dest_id; + _tmp236_ = import_ui_generate_import_failure_list (_tmp235_, show_dest_id); #line 442 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp294_ = import_ui_generate_import_failure_list (_tmp292_, _tmp293_); + _tmp237_ = _tmp236_; #line 442 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp295_ = _tmp294_; -#line 442 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp296_ = g_strconcat (_tmp290_, _tmp295_, NULL); + _tmp238_ = g_strconcat (_tmp234_, _tmp237_, NULL); #line 442 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 442 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp296_; + message = _tmp238_; #line 442 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp295_); + _g_free0 (_tmp237_); #line 422 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (neither_message); #line 422 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -4805,417 +4651,360 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest _g_free0 (videos_message); #line 422 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (photos_message); -#line 4795 "Dialogs.c" +#line 4641 "Dialogs.c" } #line 445 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp297_ = manifest; -#line 445 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp298_ = _tmp297_->skipped_photos; + _tmp239_ = manifest->skipped_photos; #line 445 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp299_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp298_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp240_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp239_, GEE_TYPE_COLLECTION, GeeCollection)); #line 445 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp300_ = _tmp299_; + _tmp241_ = _tmp240_; #line 445 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp300_ > 0) { -#line 4807 "Dialogs.c" - const gchar* _tmp301_; - gint _tmp302_; - gint _tmp303_; + if (_tmp241_ > 0) { +#line 4651 "Dialogs.c" + const gchar* _tmp242_; + gint _tmp243_; + gint _tmp244_; gchar* skipped_photos_message = NULL; - ImportManifest* _tmp306_; - GeeList* _tmp307_; - gint _tmp308_; - gint _tmp309_; - ImportManifest* _tmp310_; - GeeList* _tmp311_; - gint _tmp312_; - gint _tmp313_; - gchar* _tmp314_; - const gchar* _tmp315_; - const gchar* _tmp316_; - gchar* _tmp317_; - const gchar* _tmp318_; - ImportManifest* _tmp319_; - GeeList* _tmp320_; - gboolean _tmp321_; - gchar* _tmp322_; - gchar* _tmp323_; - gchar* _tmp324_; + GeeList* _tmp247_; + gint _tmp248_; + gint _tmp249_; + GeeList* _tmp250_; + gint _tmp251_; + gint _tmp252_; + gchar* _tmp253_; + const gchar* _tmp254_; + const gchar* _tmp255_; + gchar* _tmp256_; + const gchar* _tmp257_; + GeeList* _tmp258_; + gchar* _tmp259_; + gchar* _tmp260_; + gchar* _tmp261_; #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp301_ = message; + _tmp242_ = message; #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp302_ = strlen (_tmp301_); + _tmp243_ = strlen (_tmp242_); #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp303_ = _tmp302_; + _tmp244_ = _tmp243_; #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp303_ > 0) { -#line 4839 "Dialogs.c" - const gchar* _tmp304_; - gchar* _tmp305_; + if (_tmp244_ > 0) { +#line 4679 "Dialogs.c" + const gchar* _tmp245_; + gchar* _tmp246_; #line 447 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp304_ = message; + _tmp245_ = message; #line 447 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp305_ = g_strconcat (_tmp304_, "\n", NULL); + _tmp246_ = g_strconcat (_tmp245_, "\n", NULL); #line 447 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 447 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp305_; -#line 4850 "Dialogs.c" + message = _tmp246_; +#line 4690 "Dialogs.c" } #line 452 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp306_ = manifest; -#line 452 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp307_ = _tmp306_->skipped_photos; -#line 452 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp308_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp307_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp247_ = manifest->skipped_photos; #line 452 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp309_ = _tmp308_; + _tmp248_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp247_, GEE_TYPE_COLLECTION, GeeCollection)); #line 452 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp310_ = manifest; + _tmp249_ = _tmp248_; #line 452 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp311_ = _tmp310_->skipped_photos; + _tmp250_ = manifest->skipped_photos; #line 452 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp312_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp311_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp251_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp250_, GEE_TYPE_COLLECTION, GeeCollection)); #line 452 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp313_ = _tmp312_; + _tmp252_ = _tmp251_; #line 452 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp314_ = g_strdup_printf (ngettext ("1 unsupported photo skipped:\n", "%d unsupported photos skipped:\n", (gulong) _tmp309_), _tmp313_); + _tmp253_ = g_strdup_printf (ngettext ("1 unsupported photo skipped:\n", "%d unsupported photos skipped:\n", (gulong) _tmp249_), _tmp252_); #line 452 "/home/jens/Source/shotwell/src/Dialogs.vala" - skipped_photos_message = _tmp314_; + skipped_photos_message = _tmp253_; #line 456 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp315_ = message; + _tmp254_ = message; #line 456 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp316_ = skipped_photos_message; + _tmp255_ = skipped_photos_message; #line 456 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp317_ = g_strconcat (_tmp315_, _tmp316_, NULL); + _tmp256_ = g_strconcat (_tmp254_, _tmp255_, NULL); #line 456 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 456 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp317_; + message = _tmp256_; #line 458 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp318_ = message; + _tmp257_ = message; #line 458 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp319_ = manifest; + _tmp258_ = manifest->skipped_photos; #line 458 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp320_ = _tmp319_->skipped_photos; + _tmp259_ = import_ui_generate_import_failure_list (_tmp258_, show_dest_id); #line 458 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp321_ = show_dest_id; -#line 458 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp322_ = import_ui_generate_import_failure_list (_tmp320_, _tmp321_); -#line 458 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp323_ = _tmp322_; + _tmp260_ = _tmp259_; #line 458 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp324_ = g_strconcat (_tmp318_, _tmp323_, NULL); + _tmp261_ = g_strconcat (_tmp257_, _tmp260_, NULL); #line 458 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 458 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp324_; + message = _tmp261_; #line 458 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp323_); + _g_free0 (_tmp260_); #line 445 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (skipped_photos_message); -#line 4904 "Dialogs.c" +#line 4736 "Dialogs.c" } #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp325_ = manifest; + _tmp262_ = manifest->skipped_files; #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp326_ = _tmp325_->skipped_files; + _tmp263_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp262_, GEE_TYPE_COLLECTION, GeeCollection)); #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp327_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp326_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp264_ = _tmp263_; #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp328_ = _tmp327_; -#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp328_ > 0) { -#line 4916 "Dialogs.c" - const gchar* _tmp329_; - gint _tmp330_; - gint _tmp331_; + if (_tmp264_ > 0) { +#line 4746 "Dialogs.c" + const gchar* _tmp265_; + gint _tmp266_; + gint _tmp267_; gchar* skipped_files_message = NULL; - ImportManifest* _tmp334_; - GeeList* _tmp335_; - gint _tmp336_; - gint _tmp337_; - ImportManifest* _tmp338_; - GeeList* _tmp339_; - gint _tmp340_; - gint _tmp341_; - gchar* _tmp342_; - const gchar* _tmp343_; - const gchar* _tmp344_; - gchar* _tmp345_; + GeeList* _tmp270_; + gint _tmp271_; + gint _tmp272_; + GeeList* _tmp273_; + gint _tmp274_; + gint _tmp275_; + gchar* _tmp276_; + const gchar* _tmp277_; + const gchar* _tmp278_; + gchar* _tmp279_; #line 462 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp329_ = message; + _tmp265_ = message; #line 462 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp330_ = strlen (_tmp329_); + _tmp266_ = strlen (_tmp265_); #line 462 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp331_ = _tmp330_; + _tmp267_ = _tmp266_; #line 462 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp331_ > 0) { -#line 4941 "Dialogs.c" - const gchar* _tmp332_; - gchar* _tmp333_; + if (_tmp267_ > 0) { +#line 4769 "Dialogs.c" + const gchar* _tmp268_; + gchar* _tmp269_; #line 463 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp332_ = message; + _tmp268_ = message; #line 463 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp333_ = g_strconcat (_tmp332_, "\n", NULL); + _tmp269_ = g_strconcat (_tmp268_, "\n", NULL); #line 463 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 463 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp333_; -#line 4952 "Dialogs.c" + message = _tmp269_; +#line 4780 "Dialogs.c" } #line 467 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp334_ = manifest; -#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp335_ = _tmp334_->skipped_files; -#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp336_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp335_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp270_ = manifest->skipped_files; #line 467 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp337_ = _tmp336_; + _tmp271_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp270_, GEE_TYPE_COLLECTION, GeeCollection)); #line 467 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp338_ = manifest; + _tmp272_ = _tmp271_; #line 467 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp339_ = _tmp338_->skipped_files; + _tmp273_ = manifest->skipped_files; #line 467 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp340_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp339_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp274_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp273_, GEE_TYPE_COLLECTION, GeeCollection)); #line 467 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp341_ = _tmp340_; + _tmp275_ = _tmp274_; #line 467 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp342_ = g_strdup_printf (ngettext ("1 non-image file skipped.\n", "%d non-image files skipped.\n", (gulong) _tmp337_), _tmp341_); + _tmp276_ = g_strdup_printf (ngettext ("1 non-image file skipped.\n", "%d non-image files skipped.\n", (gulong) _tmp272_), _tmp275_); #line 467 "/home/jens/Source/shotwell/src/Dialogs.vala" - skipped_files_message = _tmp342_; + skipped_files_message = _tmp276_; #line 471 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp343_ = message; + _tmp277_ = message; #line 471 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp344_ = skipped_files_message; + _tmp278_ = skipped_files_message; #line 471 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp345_ = g_strconcat (_tmp343_, _tmp344_, NULL); + _tmp279_ = g_strconcat (_tmp277_, _tmp278_, NULL); #line 471 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 471 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp345_; + message = _tmp279_; #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (skipped_files_message); -#line 4986 "Dialogs.c" +#line 4810 "Dialogs.c" } #line 474 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp346_ = manifest; + _tmp280_ = manifest->aborted; #line 474 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp347_ = _tmp346_->aborted; + _tmp281_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp280_, GEE_TYPE_COLLECTION, GeeCollection)); #line 474 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp348_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp347_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp282_ = _tmp281_; #line 474 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp349_ = _tmp348_; -#line 474 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp349_ > 0) { -#line 4998 "Dialogs.c" - const gchar* _tmp350_; - gint _tmp351_; - gint _tmp352_; + if (_tmp282_ > 0) { +#line 4820 "Dialogs.c" + const gchar* _tmp283_; + gint _tmp284_; + gint _tmp285_; gchar* photos_message = NULL; - ImportManifest* _tmp355_; - GeeList* _tmp356_; - gint _tmp357_; - gint _tmp358_; - ImportManifest* _tmp359_; - GeeList* _tmp360_; - gint _tmp361_; - gint _tmp362_; - gchar* _tmp363_; + GeeList* _tmp288_; + gint _tmp289_; + gint _tmp290_; + GeeList* _tmp291_; + gint _tmp292_; + gint _tmp293_; + gchar* _tmp294_; gchar* videos_message = NULL; - ImportManifest* _tmp364_; - GeeList* _tmp365_; - gint _tmp366_; - gint _tmp367_; - ImportManifest* _tmp368_; - GeeList* _tmp369_; - gint _tmp370_; - gint _tmp371_; - gchar* _tmp372_; + GeeList* _tmp295_; + gint _tmp296_; + gint _tmp297_; + GeeList* _tmp298_; + gint _tmp299_; + gint _tmp300_; + gchar* _tmp301_; gchar* both_message = NULL; - ImportManifest* _tmp373_; - GeeList* _tmp374_; - gint _tmp375_; - gint _tmp376_; - ImportManifest* _tmp377_; - GeeList* _tmp378_; - gint _tmp379_; - gint _tmp380_; - gchar* _tmp381_; + GeeList* _tmp302_; + gint _tmp303_; + gint _tmp304_; + GeeList* _tmp305_; + gint _tmp306_; + gint _tmp307_; + gchar* _tmp308_; gchar* neither_message = NULL; - ImportManifest* _tmp382_; - GeeList* _tmp383_; - gint _tmp384_; - gint _tmp385_; - ImportManifest* _tmp386_; - GeeList* _tmp387_; - gint _tmp388_; - gint _tmp389_; - gchar* _tmp390_; - const gchar* _tmp391_; - ImportManifest* _tmp392_; - GeeList* _tmp393_; - const gchar* _tmp394_; - const gchar* _tmp395_; - const gchar* _tmp396_; - const gchar* _tmp397_; - gchar* _tmp398_; - gchar* _tmp399_; - gchar* _tmp400_; - const gchar* _tmp401_; - ImportManifest* _tmp402_; - GeeList* _tmp403_; - gboolean _tmp404_; - gchar* _tmp405_; - gchar* _tmp406_; - gchar* _tmp407_; + GeeList* _tmp309_; + gint _tmp310_; + gint _tmp311_; + GeeList* _tmp312_; + gint _tmp313_; + gint _tmp314_; + gchar* _tmp315_; + const gchar* _tmp316_; + GeeList* _tmp317_; + const gchar* _tmp318_; + const gchar* _tmp319_; + const gchar* _tmp320_; + const gchar* _tmp321_; + gchar* _tmp322_; + gchar* _tmp323_; + gchar* _tmp324_; + const gchar* _tmp325_; + GeeList* _tmp326_; + gchar* _tmp327_; + gchar* _tmp328_; + gchar* _tmp329_; #line 475 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp350_ = message; + _tmp283_ = message; #line 475 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp351_ = strlen (_tmp350_); + _tmp284_ = strlen (_tmp283_); #line 475 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp352_ = _tmp351_; + _tmp285_ = _tmp284_; #line 475 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp352_ > 0) { -#line 5067 "Dialogs.c" - const gchar* _tmp353_; - gchar* _tmp354_; + if (_tmp285_ > 0) { +#line 4878 "Dialogs.c" + const gchar* _tmp286_; + gchar* _tmp287_; #line 476 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp353_ = message; + _tmp286_ = message; #line 476 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp354_ = g_strconcat (_tmp353_, "\n", NULL); + _tmp287_ = g_strconcat (_tmp286_, "\n", NULL); #line 476 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 476 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp354_; -#line 5078 "Dialogs.c" + message = _tmp287_; +#line 4889 "Dialogs.c" } #line 478 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp355_ = manifest; -#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp356_ = _tmp355_->aborted; + _tmp288_ = manifest->aborted; #line 478 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp357_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp356_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp289_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp288_, GEE_TYPE_COLLECTION, GeeCollection)); #line 478 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp358_ = _tmp357_; + _tmp290_ = _tmp289_; #line 478 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp359_ = manifest; + _tmp291_ = manifest->aborted; #line 478 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp360_ = _tmp359_->aborted; + _tmp292_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp291_, GEE_TYPE_COLLECTION, GeeCollection)); #line 478 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp361_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp360_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp293_ = _tmp292_; #line 478 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp362_ = _tmp361_; + _tmp294_ = g_strdup_printf (ngettext ("1 photo skipped due to user cancel:\n", "%d photos skipped due to user cancel:\n", (gulong) _tmp290_), _tmp293_); #line 478 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp363_ = g_strdup_printf (ngettext ("1 photo skipped due to user cancel:\n", "%d photos skipped due to user cancel:\n", (gulong) _tmp358_), _tmp362_); -#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala" - photos_message = _tmp363_; -#line 481 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp364_ = manifest; + photos_message = _tmp294_; #line 481 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp365_ = _tmp364_->aborted; + _tmp295_ = manifest->aborted; #line 481 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp366_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp365_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp296_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp295_, GEE_TYPE_COLLECTION, GeeCollection)); #line 481 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp367_ = _tmp366_; + _tmp297_ = _tmp296_; #line 481 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp368_ = manifest; + _tmp298_ = manifest->aborted; #line 481 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp369_ = _tmp368_->aborted; + _tmp299_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp298_, GEE_TYPE_COLLECTION, GeeCollection)); #line 481 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp370_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp369_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp300_ = _tmp299_; #line 481 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp371_ = _tmp370_; + _tmp301_ = g_strdup_printf (ngettext ("1 video skipped due to user cancel:\n", "%d videos skipped due to user cancel:\n", (gulong) _tmp297_), _tmp300_); #line 481 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp372_ = g_strdup_printf (ngettext ("1 video skipped due to user cancel:\n", "%d videos skipped due to user cancel:\n", (gulong) _tmp367_), _tmp371_); -#line 481 "/home/jens/Source/shotwell/src/Dialogs.vala" - videos_message = _tmp372_; -#line 484 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp373_ = manifest; + videos_message = _tmp301_; #line 484 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp374_ = _tmp373_->aborted; + _tmp302_ = manifest->aborted; #line 484 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp375_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp374_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp303_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp302_, GEE_TYPE_COLLECTION, GeeCollection)); #line 484 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp376_ = _tmp375_; + _tmp304_ = _tmp303_; #line 484 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp377_ = manifest; + _tmp305_ = manifest->aborted; #line 484 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp378_ = _tmp377_->aborted; + _tmp306_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp305_, GEE_TYPE_COLLECTION, GeeCollection)); #line 484 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp379_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp378_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp307_ = _tmp306_; #line 484 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp380_ = _tmp379_; + _tmp308_ = g_strdup_printf (ngettext ("1 photo/video skipped due to user cancel:\n", "%d photos/videos skipped due to user cancel:\n", (gulong) _tmp304_), _tmp307_); #line 484 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp381_ = g_strdup_printf (ngettext ("1 photo/video skipped due to user cancel:\n", "%d photos/videos skipped due to user cancel:\n", (gulong) _tmp376_), _tmp380_); -#line 484 "/home/jens/Source/shotwell/src/Dialogs.vala" - both_message = _tmp381_; -#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp382_ = manifest; -#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp383_ = _tmp382_->aborted; + both_message = _tmp308_; #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp384_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp383_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp309_ = manifest->aborted; #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp385_ = _tmp384_; + _tmp310_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp309_, GEE_TYPE_COLLECTION, GeeCollection)); #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp386_ = manifest; + _tmp311_ = _tmp310_; #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp387_ = _tmp386_->aborted; + _tmp312_ = manifest->aborted; #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp388_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp387_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp313_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp312_, GEE_TYPE_COLLECTION, GeeCollection)); #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp389_ = _tmp388_; + _tmp314_ = _tmp313_; #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp390_ = g_strdup_printf (ngettext ("1 file skipped due to user cancel:\n", "%d file skipped due to user cancel:\n", (gulong) _tmp385_), _tmp389_); + _tmp315_ = g_strdup_printf (ngettext ("1 file skipped due to user cancel:\n", "%d file skipped due to user cancel:\n", (gulong) _tmp311_), _tmp314_); #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala" - neither_message = _tmp390_; + neither_message = _tmp315_; #line 491 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp391_ = message; + _tmp316_ = message; #line 491 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp392_ = manifest; + _tmp317_ = manifest->aborted; #line 491 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp393_ = _tmp392_->aborted; + _tmp318_ = photos_message; #line 491 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp394_ = photos_message; + _tmp319_ = videos_message; #line 491 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp395_ = videos_message; + _tmp320_ = both_message; #line 491 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp396_ = both_message; + _tmp321_ = neither_message; #line 491 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp397_ = neither_message; + _tmp322_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp317_, GEE_TYPE_COLLECTION, GeeCollection), _tmp318_, _tmp319_, _tmp320_, _tmp321_); #line 491 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp398_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp393_, GEE_TYPE_COLLECTION, GeeCollection), _tmp394_, _tmp395_, _tmp396_, _tmp397_); -#line 491 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp399_ = _tmp398_; + _tmp323_ = _tmp322_; #line 491 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp400_ = g_strconcat (_tmp391_, _tmp399_, NULL); + _tmp324_ = g_strconcat (_tmp316_, _tmp323_, NULL); #line 491 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 491 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp400_; + message = _tmp324_; #line 491 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp399_); -#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp401_ = message; -#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp402_ = manifest; + _g_free0 (_tmp323_); #line 494 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp403_ = _tmp402_->aborted; + _tmp325_ = message; #line 494 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp404_ = show_dest_id; + _tmp326_ = manifest->aborted; #line 494 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp405_ = import_ui_generate_import_failure_list (_tmp403_, _tmp404_); + _tmp327_ = import_ui_generate_import_failure_list (_tmp326_, show_dest_id); #line 494 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp406_ = _tmp405_; + _tmp328_ = _tmp327_; #line 494 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp407_ = g_strconcat (_tmp401_, _tmp406_, NULL); + _tmp329_ = g_strconcat (_tmp325_, _tmp328_, NULL); #line 494 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 494 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp407_; + message = _tmp329_; #line 494 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp406_); + _g_free0 (_tmp328_); #line 474 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (neither_message); #line 474 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -5224,420 +5013,363 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest _g_free0 (videos_message); #line 474 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (photos_message); -#line 5214 "Dialogs.c" +#line 5003 "Dialogs.c" } #line 497 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp408_ = manifest; + _tmp330_ = manifest->success; #line 497 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp409_ = _tmp408_->success; + _tmp331_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp330_, GEE_TYPE_COLLECTION, GeeCollection)); #line 497 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp410_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp409_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp332_ = _tmp331_; #line 497 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp411_ = _tmp410_; -#line 497 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp411_ > 0) { -#line 5226 "Dialogs.c" - const gchar* _tmp412_; - gint _tmp413_; - gint _tmp414_; + if (_tmp332_ > 0) { +#line 5013 "Dialogs.c" + const gchar* _tmp333_; + gint _tmp334_; + gint _tmp335_; gchar* photos_message = NULL; - ImportManifest* _tmp417_; - GeeList* _tmp418_; - gint _tmp419_; - gint _tmp420_; - ImportManifest* _tmp421_; - GeeList* _tmp422_; - gint _tmp423_; - gint _tmp424_; - gchar* _tmp425_; + GeeList* _tmp338_; + gint _tmp339_; + gint _tmp340_; + GeeList* _tmp341_; + gint _tmp342_; + gint _tmp343_; + gchar* _tmp344_; gchar* videos_message = NULL; - ImportManifest* _tmp426_; - GeeList* _tmp427_; - gint _tmp428_; - gint _tmp429_; - ImportManifest* _tmp430_; - GeeList* _tmp431_; - gint _tmp432_; - gint _tmp433_; - gchar* _tmp434_; + GeeList* _tmp345_; + gint _tmp346_; + gint _tmp347_; + GeeList* _tmp348_; + gint _tmp349_; + gint _tmp350_; + gchar* _tmp351_; gchar* both_message = NULL; - ImportManifest* _tmp435_; - GeeList* _tmp436_; - gint _tmp437_; - gint _tmp438_; - ImportManifest* _tmp439_; - GeeList* _tmp440_; - gint _tmp441_; - gint _tmp442_; - gchar* _tmp443_; - const gchar* _tmp444_; - ImportManifest* _tmp445_; - GeeList* _tmp446_; - const gchar* _tmp447_; - const gchar* _tmp448_; - const gchar* _tmp449_; - gchar* _tmp450_; - gchar* _tmp451_; - gchar* _tmp452_; + GeeList* _tmp352_; + gint _tmp353_; + gint _tmp354_; + GeeList* _tmp355_; + gint _tmp356_; + gint _tmp357_; + gchar* _tmp358_; + const gchar* _tmp359_; + GeeList* _tmp360_; + const gchar* _tmp361_; + const gchar* _tmp362_; + const gchar* _tmp363_; + gchar* _tmp364_; + gchar* _tmp365_; + gchar* _tmp366_; #line 498 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp412_ = message; + _tmp333_ = message; #line 498 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp413_ = strlen (_tmp412_); + _tmp334_ = strlen (_tmp333_); #line 498 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp414_ = _tmp413_; + _tmp335_ = _tmp334_; #line 498 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp414_ > 0) { -#line 5277 "Dialogs.c" - const gchar* _tmp415_; - gchar* _tmp416_; + if (_tmp335_ > 0) { +#line 5057 "Dialogs.c" + const gchar* _tmp336_; + gchar* _tmp337_; #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp415_ = message; + _tmp336_ = message; #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp416_ = g_strconcat (_tmp415_, "\n", NULL); + _tmp337_ = g_strconcat (_tmp336_, "\n", NULL); #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp416_; -#line 5288 "Dialogs.c" + message = _tmp337_; +#line 5068 "Dialogs.c" } #line 501 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp417_ = manifest; -#line 501 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp418_ = _tmp417_->success; + _tmp338_ = manifest->success; #line 501 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp419_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp418_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp339_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp338_, GEE_TYPE_COLLECTION, GeeCollection)); #line 501 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp420_ = _tmp419_; + _tmp340_ = _tmp339_; #line 501 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp421_ = manifest; + _tmp341_ = manifest->success; #line 501 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp422_ = _tmp421_->success; + _tmp342_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp341_, GEE_TYPE_COLLECTION, GeeCollection)); #line 501 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp423_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp422_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp343_ = _tmp342_; #line 501 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp424_ = _tmp423_; + _tmp344_ = g_strdup_printf (ngettext ("1 photo successfully imported.\n", "%d photos successfully imported.\n", (gulong) _tmp340_), _tmp343_); #line 501 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp425_ = g_strdup_printf (ngettext ("1 photo successfully imported.\n", "%d photos successfully imported.\n", (gulong) _tmp420_), _tmp424_); -#line 501 "/home/jens/Source/shotwell/src/Dialogs.vala" - photos_message = _tmp425_; -#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp426_ = manifest; + photos_message = _tmp344_; #line 504 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp427_ = _tmp426_->success; + _tmp345_ = manifest->success; #line 504 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp428_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp427_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp346_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp345_, GEE_TYPE_COLLECTION, GeeCollection)); #line 504 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp429_ = _tmp428_; + _tmp347_ = _tmp346_; #line 504 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp430_ = manifest; + _tmp348_ = manifest->success; #line 504 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp431_ = _tmp430_->success; + _tmp349_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp348_, GEE_TYPE_COLLECTION, GeeCollection)); #line 504 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp432_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp431_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp433_ = _tmp432_; + _tmp350_ = _tmp349_; #line 504 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp434_ = g_strdup_printf (ngettext ("1 video successfully imported.\n", "%d videos successfully imported.\n", (gulong) _tmp429_), _tmp433_); + _tmp351_ = g_strdup_printf (ngettext ("1 video successfully imported.\n", "%d videos successfully imported.\n", (gulong) _tmp347_), _tmp350_); #line 504 "/home/jens/Source/shotwell/src/Dialogs.vala" - videos_message = _tmp434_; + videos_message = _tmp351_; #line 507 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp435_ = manifest; + _tmp352_ = manifest->success; #line 507 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp436_ = _tmp435_->success; + _tmp353_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp352_, GEE_TYPE_COLLECTION, GeeCollection)); #line 507 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp437_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp436_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp354_ = _tmp353_; #line 507 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp438_ = _tmp437_; + _tmp355_ = manifest->success; #line 507 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp439_ = manifest; + _tmp356_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp355_, GEE_TYPE_COLLECTION, GeeCollection)); #line 507 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp440_ = _tmp439_->success; + _tmp357_ = _tmp356_; #line 507 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp441_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp440_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp358_ = g_strdup_printf (ngettext ("1 photo/video successfully imported.\n", "%d photos/videos successfully imported.\n", (gulong) _tmp354_), _tmp357_); #line 507 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp442_ = _tmp441_; -#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp443_ = g_strdup_printf (ngettext ("1 photo/video successfully imported.\n", "%d photos/videos successfully imported.\n", (gulong) _tmp438_), _tmp442_); -#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala" - both_message = _tmp443_; -#line 511 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp444_ = message; + both_message = _tmp358_; #line 511 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp445_ = manifest; + _tmp359_ = message; #line 511 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp446_ = _tmp445_->success; + _tmp360_ = manifest->success; #line 511 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp447_ = photos_message; + _tmp361_ = photos_message; #line 511 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp448_ = videos_message; + _tmp362_ = videos_message; #line 511 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp449_ = both_message; + _tmp363_ = both_message; #line 511 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp450_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp446_, GEE_TYPE_COLLECTION, GeeCollection), _tmp447_, _tmp448_, _tmp449_, ""); + _tmp364_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp360_, GEE_TYPE_COLLECTION, GeeCollection), _tmp361_, _tmp362_, _tmp363_, ""); #line 511 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp451_ = _tmp450_; + _tmp365_ = _tmp364_; #line 511 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp452_ = g_strconcat (_tmp444_, _tmp451_, NULL); + _tmp366_ = g_strconcat (_tmp359_, _tmp365_, NULL); #line 511 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 511 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp452_; + message = _tmp366_; #line 511 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp451_); + _g_free0 (_tmp365_); #line 497 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (both_message); #line 497 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (videos_message); #line 497 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (photos_message); -#line 5380 "Dialogs.c" +#line 5146 "Dialogs.c" } #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp453_ = manifest; -#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp454_ = _tmp453_->success; -#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp455_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp454_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp456_ = _tmp455_; -#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp457_ = manifest; -#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp458_ = _tmp457_->failed; -#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp459_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp458_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp460_ = _tmp459_; + _tmp367_ = manifest->success; #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp461_ = manifest; + _tmp368_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp367_, GEE_TYPE_COLLECTION, GeeCollection)); #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp462_ = _tmp461_->camera_failed; + _tmp369_ = _tmp368_; #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp463_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp462_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp370_ = manifest->failed; #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp464_ = _tmp463_; + _tmp371_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp370_, GEE_TYPE_COLLECTION, GeeCollection)); #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp465_ = manifest; + _tmp372_ = _tmp371_; #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp466_ = _tmp465_->skipped_photos; + _tmp373_ = manifest->camera_failed; #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp467_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp466_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp374_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp373_, GEE_TYPE_COLLECTION, GeeCollection)); #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp468_ = _tmp467_; + _tmp375_ = _tmp374_; #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp469_ = manifest; + _tmp376_ = manifest->skipped_photos; #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp470_ = _tmp469_->skipped_files; + _tmp377_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp376_, GEE_TYPE_COLLECTION, GeeCollection)); #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp471_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp470_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp378_ = _tmp377_; #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp472_ = _tmp471_; + _tmp379_ = manifest->skipped_files; #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp473_ = manifest; + _tmp380_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp379_, GEE_TYPE_COLLECTION, GeeCollection)); #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp474_ = _tmp473_->corrupt_files; + _tmp381_ = _tmp380_; #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp475_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp474_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp382_ = manifest->corrupt_files; #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp476_ = _tmp475_; + _tmp383_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp382_, GEE_TYPE_COLLECTION, GeeCollection)); #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp477_ = manifest; + _tmp384_ = _tmp383_; #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp478_ = _tmp477_->already_imported; + _tmp385_ = manifest->already_imported; #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp479_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp478_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp386_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp385_, GEE_TYPE_COLLECTION, GeeCollection)); #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp480_ = _tmp479_; + _tmp387_ = _tmp386_; #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp481_ = manifest; + _tmp388_ = manifest->aborted; #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp482_ = _tmp481_->aborted; + _tmp389_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp388_, GEE_TYPE_COLLECTION, GeeCollection)); #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp483_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp482_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp390_ = _tmp389_; #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp484_ = _tmp483_; + _tmp391_ = manifest->write_failed; #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp485_ = manifest; + _tmp392_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp391_, GEE_TYPE_COLLECTION, GeeCollection)); #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp486_ = _tmp485_->write_failed; + _tmp393_ = _tmp392_; #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp487_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp486_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp488_ = _tmp487_; -#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala" - total = (((((((_tmp456_ + _tmp460_) + _tmp464_) + _tmp468_) + _tmp472_) + _tmp476_) + _tmp480_) + _tmp484_) + _tmp488_; + total = (((((((_tmp369_ + _tmp372_) + _tmp375_) + _tmp378_) + _tmp381_) + _tmp384_) + _tmp387_) + _tmp390_) + _tmp393_; #line 518 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp489_ = total; + _tmp394_ = total; #line 518 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp490_ = manifest; + _tmp395_ = manifest->all; #line 518 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp491_ = _tmp490_->all; + _tmp396_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp395_, GEE_TYPE_COLLECTION, GeeCollection)); #line 518 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp492_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp491_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp397_ = _tmp396_; #line 518 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp493_ = _tmp492_; -#line 518 "/home/jens/Source/shotwell/src/Dialogs.vala" - _vala_assert (_tmp489_ == _tmp493_, "total == manifest.all.size"); + _vala_assert (_tmp394_ == _tmp397_, "total == manifest.all.size"); #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp494_ = total; + _tmp398_ = total; #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp494_ == 0) { -#line 5472 "Dialogs.c" - const gchar* _tmp495_; - gchar* _tmp496_; + if (_tmp398_ == 0) { +#line 5218 "Dialogs.c" + const gchar* _tmp399_; + gchar* _tmp400_; #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp495_ = message; + _tmp399_ = message; #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp496_ = g_strconcat (_tmp495_, _ ("No photos or videos imported.\n"), NULL); + _tmp400_ = g_strconcat (_tmp399_, _ ("No photos or videos imported.\n"), NULL); #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp496_; -#line 5483 "Dialogs.c" + message = _tmp400_; +#line 5229 "Dialogs.c" } #line 525 "/home/jens/Source/shotwell/src/Dialogs.vala" dialog = NULL; #line 526 "/home/jens/Source/shotwell/src/Dialogs.vala" dialog_response = (gint) GTK_RESPONSE_NONE; #line 527 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp497_ = question; -#line 527 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp497_ == NULL) { -#line 5493 "Dialogs.c" - AppWindow* _tmp498_; - AppWindow* _tmp499_; - const gchar* _tmp500_; - GtkMessageDialog* _tmp501_; - GtkMessageDialog* _tmp502_; + if (question == NULL) { +#line 5237 "Dialogs.c" + AppWindow* _tmp401_; + AppWindow* _tmp402_; + const gchar* _tmp403_; + GtkMessageDialog* _tmp404_; + GtkMessageDialog* _tmp405_; GtkWidget* save_results_button = NULL; - GtkMessageDialog* _tmp503_; - GtkWidget* _tmp504_; - GtkWidget* _tmp505_; - GtkWidget* _tmp506_; - ImportManifest* _tmp507_; - GeeList* _tmp508_; - gint _tmp509_; - gint _tmp510_; - ImportManifest* _tmp511_; - GeeList* _tmp512_; - gint _tmp513_; - gint _tmp514_; + GtkMessageDialog* _tmp406_; + GtkWidget* _tmp407_; + GtkWidget* _tmp408_; + GtkWidget* _tmp409_; + GeeList* _tmp410_; + gint _tmp411_; + gint _tmp412_; + GeeList* _tmp413_; + gint _tmp414_; + gint _tmp415_; GtkWidget* ok_button = NULL; - GtkMessageDialog* _tmp515_; - GtkWidget* _tmp516_; - GtkWidget* _tmp517_; - GtkMessageDialog* _tmp518_; - GtkWidget* _tmp519_; + GtkMessageDialog* _tmp416_; + GtkWidget* _tmp417_; + GtkWidget* _tmp418_; + GtkMessageDialog* _tmp419_; + GtkWidget* _tmp420_; GtkWindow* dialog_parent = NULL; - GtkMessageDialog* _tmp520_; - GtkContainer* _tmp521_; - GtkWindow* _tmp522_; - GtkMessageDialog* _tmp523_; - gint _tmp524_; - GtkMessageDialog* _tmp525_; - gint _tmp526_; + GtkMessageDialog* _tmp421_; + GtkContainer* _tmp422_; + GtkWindow* _tmp423_; + GtkMessageDialog* _tmp424_; + GtkMessageDialog* _tmp425_; + gint _tmp426_; #line 528 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp498_ = app_window_get_instance (); + _tmp401_ = app_window_get_instance (); #line 528 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp499_ = _tmp498_; + _tmp402_ = _tmp401_; #line 528 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp500_ = message; + _tmp403_ = message; #line 528 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp501_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp499_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_NONE, "%s", _tmp500_); + _tmp404_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp402_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_NONE, "%s", _tmp403_); #line 528 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_object_ref_sink (_tmp501_); + g_object_ref_sink (_tmp404_); #line 528 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (dialog); #line 528 "/home/jens/Source/shotwell/src/Dialogs.vala" - dialog = _tmp501_; + dialog = _tmp404_; #line 528 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_object_unref0 (_tmp499_); + _g_object_unref0 (_tmp402_); #line 530 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp502_ = dialog; + _tmp405_ = dialog; #line 530 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp502_, gtk_window_get_type (), GtkWindow), _ ("Import Complete")); + gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp405_, gtk_window_get_type (), GtkWindow), _ ("Import Complete")); #line 531 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp503_ = dialog; + _tmp406_ = dialog; #line 531 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp504_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp503_, gtk_dialog_get_type (), GtkDialog), IMPORT_UI_SAVE_RESULTS_BUTTON_NAME, IMPORT_UI_SAVE_RESULTS_RESPONSE_ID); + _tmp407_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp406_, gtk_dialog_get_type (), GtkDialog), IMPORT_UI_SAVE_RESULTS_BUTTON_NAME, IMPORT_UI_SAVE_RESULTS_RESPONSE_ID); #line 531 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp505_ = _g_object_ref0 (_tmp504_); + _tmp408_ = _g_object_ref0 (_tmp407_); #line 531 "/home/jens/Source/shotwell/src/Dialogs.vala" - save_results_button = _tmp505_; + save_results_button = _tmp408_; #line 533 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp506_ = save_results_button; + _tmp409_ = save_results_button; #line 533 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp507_ = manifest; + _tmp410_ = manifest->success; #line 533 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp508_ = _tmp507_->success; + _tmp411_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp410_, GEE_TYPE_COLLECTION, GeeCollection)); #line 533 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp509_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp508_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp412_ = _tmp411_; #line 533 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp510_ = _tmp509_; + _tmp413_ = manifest->all; #line 533 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp511_ = manifest; + _tmp414_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp413_, GEE_TYPE_COLLECTION, GeeCollection)); #line 533 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp512_ = _tmp511_->all; + _tmp415_ = _tmp414_; #line 533 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp513_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp512_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 533 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp514_ = _tmp513_; -#line 533 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_widget_set_visible (_tmp506_, _tmp510_ < _tmp514_); + gtk_widget_set_visible (_tmp409_, _tmp412_ < _tmp415_); #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp515_ = dialog; + _tmp416_ = dialog; #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp516_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp515_, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK); + _tmp417_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp416_, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK); #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp517_ = _g_object_ref0 (_tmp516_); + _tmp418_ = _g_object_ref0 (_tmp417_); #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala" - ok_button = _tmp517_; + ok_button = _tmp418_; #line 535 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp518_ = dialog; + _tmp419_ = dialog; #line 535 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp519_ = ok_button; + _tmp420_ = ok_button; #line 535 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp518_, gtk_window_get_type (), GtkWindow), _tmp519_); + gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp419_, gtk_window_get_type (), GtkWindow), _tmp420_); #line 537 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp520_ = dialog; + _tmp421_ = dialog; #line 537 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp521_ = (GtkContainer*) gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp520_, gtk_widget_get_type (), GtkWidget)); + _tmp422_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp421_, gtk_widget_get_type (), GtkWidget)); #line 537 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp522_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp521_, gtk_window_get_type (), GtkWindow)); + _tmp423_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp422_, gtk_window_get_type (), GtkWindow)); #line 537 "/home/jens/Source/shotwell/src/Dialogs.vala" - dialog_parent = _tmp522_; + dialog_parent = _tmp423_; #line 538 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp523_ = dialog; + _tmp424_ = dialog; #line 538 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp524_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp523_, gtk_dialog_get_type (), GtkDialog)); -#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala" - dialog_response = _tmp524_; + dialog_response = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp424_, gtk_dialog_get_type (), GtkDialog)); #line 539 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp525_ = dialog; + _tmp425_ = dialog; #line 539 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp525_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp425_, gtk_widget_get_type (), GtkWidget)); #line 541 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp526_ = dialog_response; + _tmp426_ = dialog_response; #line 541 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp526_ == IMPORT_UI_SAVE_RESULTS_RESPONSE_ID) { -#line 5610 "Dialogs.c" - GtkWindow* _tmp527_; - ImportManifest* _tmp528_; - gchar* _tmp529_; - gchar* _tmp530_; -#line 542 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp527_ = dialog_parent; + if (_tmp426_ == IMPORT_UI_SAVE_RESULTS_RESPONSE_ID) { +#line 5345 "Dialogs.c" + GtkWindow* _tmp427_; + gchar* _tmp428_; + gchar* _tmp429_; #line 542 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp528_ = manifest; + _tmp427_ = dialog_parent; #line 542 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp529_ = import_ui_create_result_report_from_manifest (_tmp528_); + _tmp428_ = import_ui_create_result_report_from_manifest (manifest); #line 542 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp530_ = _tmp529_; + _tmp429_ = _tmp428_; #line 542 "/home/jens/Source/shotwell/src/Dialogs.vala" - import_ui_save_import_results (_tmp527_, _tmp530_); + import_ui_save_import_results (_tmp427_, _tmp429_); #line 542 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp530_); -#line 5627 "Dialogs.c" + _g_free0 (_tmp429_); +#line 5359 "Dialogs.c" } #line 527 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (dialog_parent); @@ -5645,212 +5377,191 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest _g_object_unref0 (ok_button); #line 527 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (save_results_button); -#line 5635 "Dialogs.c" +#line 5367 "Dialogs.c" } else { - const gchar* _tmp531_; - ImportUIQuestionParams* _tmp532_; - const gchar* _tmp533_; - gchar* _tmp534_; - gchar* _tmp535_; - gchar* _tmp536_; - AppWindow* _tmp537_; - AppWindow* _tmp538_; - const gchar* _tmp539_; - GtkMessageDialog* _tmp540_; - GtkMessageDialog* _tmp541_; + const gchar* _tmp430_; + const gchar* _tmp431_; + gchar* _tmp432_; + gchar* _tmp433_; + gchar* _tmp434_; + AppWindow* _tmp435_; + AppWindow* _tmp436_; + const gchar* _tmp437_; + GtkMessageDialog* _tmp438_; + GtkMessageDialog* _tmp439_; GtkWidget* save_results_button = NULL; - GtkMessageDialog* _tmp542_; - GtkWidget* _tmp543_; - GtkWidget* _tmp544_; - GtkWidget* _tmp545_; - ImportManifest* _tmp546_; - GeeList* _tmp547_; - gint _tmp548_; - gint _tmp549_; - ImportManifest* _tmp550_; - GeeList* _tmp551_; - gint _tmp552_; - gint _tmp553_; + GtkMessageDialog* _tmp440_; + GtkWidget* _tmp441_; + GtkWidget* _tmp442_; + GtkWidget* _tmp443_; + GeeList* _tmp444_; + gint _tmp445_; + gint _tmp446_; + GeeList* _tmp447_; + gint _tmp448_; + gint _tmp449_; GtkWidget* no_button = NULL; - GtkMessageDialog* _tmp554_; - ImportUIQuestionParams* _tmp555_; - const gchar* _tmp556_; - GtkWidget* _tmp557_; - GtkWidget* _tmp558_; - GtkMessageDialog* _tmp559_; - ImportUIQuestionParams* _tmp560_; - const gchar* _tmp561_; - GtkMessageDialog* _tmp562_; - GtkWidget* _tmp563_; - GtkMessageDialog* _tmp564_; - gint _tmp565_; - GtkMessageDialog* _tmp573_; - GtkMessageDialog* _tmp574_; -#line 545 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp531_ = message; + GtkMessageDialog* _tmp450_; + const gchar* _tmp451_; + GtkWidget* _tmp452_; + GtkWidget* _tmp453_; + GtkMessageDialog* _tmp454_; + const gchar* _tmp455_; + GtkMessageDialog* _tmp456_; + GtkWidget* _tmp457_; + GtkMessageDialog* _tmp458_; + GtkMessageDialog* _tmp464_; + GtkMessageDialog* _tmp465_; #line 545 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp532_ = question; + _tmp430_ = message; #line 545 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp533_ = _tmp532_->question; + _tmp431_ = question->question; #line 545 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp534_ = g_strconcat ("\n", _tmp533_, NULL); + _tmp432_ = g_strconcat ("\n", _tmp431_, NULL); #line 545 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp535_ = _tmp534_; + _tmp433_ = _tmp432_; #line 545 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp536_ = g_strconcat (_tmp531_, _tmp535_, NULL); + _tmp434_ = g_strconcat (_tmp430_, _tmp433_, NULL); #line 545 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 545 "/home/jens/Source/shotwell/src/Dialogs.vala" - message = _tmp536_; + message = _tmp434_; #line 545 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp535_); + _g_free0 (_tmp433_); #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp537_ = app_window_get_instance (); + _tmp435_ = app_window_get_instance (); #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp538_ = _tmp537_; + _tmp436_ = _tmp435_; #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp539_ = message; + _tmp437_ = message; #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp540_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp538_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp539_); + _tmp438_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp436_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp437_); #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_object_ref_sink (_tmp540_); + g_object_ref_sink (_tmp438_); #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (dialog); #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala" - dialog = _tmp540_; + dialog = _tmp438_; #line 547 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_object_unref0 (_tmp538_); + _g_object_unref0 (_tmp436_); #line 549 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp541_ = dialog; + _tmp439_ = dialog; #line 549 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp541_, gtk_window_get_type (), GtkWindow), _ ("Import Complete")); + gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp439_, gtk_window_get_type (), GtkWindow), _ ("Import Complete")); #line 550 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp542_ = dialog; + _tmp440_ = dialog; #line 550 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp543_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp542_, gtk_dialog_get_type (), GtkDialog), IMPORT_UI_SAVE_RESULTS_BUTTON_NAME, IMPORT_UI_SAVE_RESULTS_RESPONSE_ID); + _tmp441_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp440_, gtk_dialog_get_type (), GtkDialog), IMPORT_UI_SAVE_RESULTS_BUTTON_NAME, IMPORT_UI_SAVE_RESULTS_RESPONSE_ID); #line 550 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp544_ = _g_object_ref0 (_tmp543_); + _tmp442_ = _g_object_ref0 (_tmp441_); #line 550 "/home/jens/Source/shotwell/src/Dialogs.vala" - save_results_button = _tmp544_; + save_results_button = _tmp442_; #line 552 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp545_ = save_results_button; + _tmp443_ = save_results_button; #line 552 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp546_ = manifest; + _tmp444_ = manifest->success; #line 552 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp547_ = _tmp546_->success; + _tmp445_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp444_, GEE_TYPE_COLLECTION, GeeCollection)); #line 552 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp548_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp547_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp446_ = _tmp445_; #line 552 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp549_ = _tmp548_; + _tmp447_ = manifest->all; #line 552 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp550_ = manifest; + _tmp448_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp447_, GEE_TYPE_COLLECTION, GeeCollection)); #line 552 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp551_ = _tmp550_->all; + _tmp449_ = _tmp448_; #line 552 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp552_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp551_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp553_ = _tmp552_; -#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_widget_set_visible (_tmp545_, _tmp549_ < _tmp553_); + gtk_widget_set_visible (_tmp443_, _tmp446_ < _tmp449_); #line 553 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp554_ = dialog; + _tmp450_ = dialog; #line 553 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp555_ = question; + _tmp451_ = question->no_button; #line 553 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp556_ = _tmp555_->no_button; + _tmp452_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp450_, gtk_dialog_get_type (), GtkDialog), _tmp451_, (gint) GTK_RESPONSE_NO); #line 553 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp557_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp554_, gtk_dialog_get_type (), GtkDialog), _tmp556_, (gint) GTK_RESPONSE_NO); + _tmp453_ = _g_object_ref0 (_tmp452_); #line 553 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp558_ = _g_object_ref0 (_tmp557_); -#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala" - no_button = _tmp558_; -#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp559_ = dialog; + no_button = _tmp453_; #line 554 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp560_ = question; + _tmp454_ = dialog; #line 554 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp561_ = _tmp560_->yes_button; + _tmp455_ = question->yes_button; #line 554 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp559_, gtk_dialog_get_type (), GtkDialog), _tmp561_, (gint) GTK_RESPONSE_YES); + gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp454_, gtk_dialog_get_type (), GtkDialog), _tmp455_, (gint) GTK_RESPONSE_YES); #line 555 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp562_ = dialog; + _tmp456_ = dialog; #line 555 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp563_ = no_button; + _tmp457_ = no_button; #line 555 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp562_, gtk_window_get_type (), GtkWindow), _tmp563_); + gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp456_, gtk_window_get_type (), GtkWindow), _tmp457_); #line 557 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp564_ = dialog; + _tmp458_ = dialog; #line 557 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp565_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp564_, gtk_dialog_get_type (), GtkDialog)); -#line 557 "/home/jens/Source/shotwell/src/Dialogs.vala" - dialog_response = _tmp565_; + dialog_response = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp458_, gtk_dialog_get_type (), GtkDialog)); #line 558 "/home/jens/Source/shotwell/src/Dialogs.vala" while (TRUE) { -#line 5776 "Dialogs.c" - gint _tmp566_; - GtkMessageDialog* _tmp567_; - ImportManifest* _tmp568_; - gchar* _tmp569_; - gchar* _tmp570_; - GtkMessageDialog* _tmp571_; - gint _tmp572_; +#line 5490 "Dialogs.c" + gint _tmp459_; + GtkMessageDialog* _tmp460_; + gchar* _tmp461_; + gchar* _tmp462_; + GtkMessageDialog* _tmp463_; #line 558 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp566_ = dialog_response; + _tmp459_ = dialog_response; #line 558 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (!(_tmp566_ == IMPORT_UI_SAVE_RESULTS_RESPONSE_ID)) { + if (!(_tmp459_ == IMPORT_UI_SAVE_RESULTS_RESPONSE_ID)) { #line 558 "/home/jens/Source/shotwell/src/Dialogs.vala" break; -#line 5790 "Dialogs.c" +#line 5502 "Dialogs.c" } #line 559 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp567_ = dialog; -#line 559 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp568_ = manifest; + _tmp460_ = dialog; #line 559 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp569_ = import_ui_create_result_report_from_manifest (_tmp568_); + _tmp461_ = import_ui_create_result_report_from_manifest (manifest); #line 559 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp570_ = _tmp569_; + _tmp462_ = _tmp461_; #line 559 "/home/jens/Source/shotwell/src/Dialogs.vala" - import_ui_save_import_results (G_TYPE_CHECK_INSTANCE_CAST (_tmp567_, gtk_window_get_type (), GtkWindow), _tmp570_); + import_ui_save_import_results (G_TYPE_CHECK_INSTANCE_CAST (_tmp460_, gtk_window_get_type (), GtkWindow), _tmp462_); #line 559 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp570_); -#line 560 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp571_ = dialog; + _g_free0 (_tmp462_); #line 560 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp572_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp571_, gtk_dialog_get_type (), GtkDialog)); + _tmp463_ = dialog; #line 560 "/home/jens/Source/shotwell/src/Dialogs.vala" - dialog_response = _tmp572_; -#line 5810 "Dialogs.c" + dialog_response = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp463_, gtk_dialog_get_type (), GtkDialog)); +#line 5518 "Dialogs.c" } #line 563 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp573_ = dialog; + _tmp464_ = dialog; #line 563 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp573_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp464_, gtk_widget_get_type (), GtkWidget)); #line 564 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp574_ = dialog; + _tmp465_ = dialog; #line 564 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp574_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp465_, gtk_widget_get_type (), GtkWidget)); #line 527 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (no_button); #line 527 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (save_results_button); -#line 5824 "Dialogs.c" +#line 5532 "Dialogs.c" } #line 567 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp575_ = dialog_response; + _tmp466_ = dialog_response; #line 567 "/home/jens/Source/shotwell/src/Dialogs.vala" - result = _tmp575_ == ((gint) GTK_RESPONSE_YES); + result = _tmp466_ == ((gint) GTK_RESPONSE_YES); #line 567 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (dialog); #line 567 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (message); #line 567 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 5836 "Dialogs.c" +#line 5544 "Dialogs.c" } -static guint8* string_get_data (const gchar* self, int* result_length1) { +static guint8* +string_get_data (const gchar* self, + int* result_length1) +{ guint8* result; guint8* res = NULL; gint res_length1; @@ -5862,219 +5573,213 @@ static guint8* string_get_data (const gchar* self, int* result_length1) { gint _tmp3__length1; guint8* _tmp4_; gint _tmp4__length1; -#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1442 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" res = (guint8*) self; -#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" res_length1 = -1; -#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _res_size_ = res_length1; -#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" res_length1 = (gint) _tmp1_; -#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp2_ = res_length1; -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp3_ = res; -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp3__length1 = res_length1; -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp4__length1 = _tmp3__length1; -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (result_length1) { -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" *result_length1 = _tmp4__length1; -#line 5880 "Dialogs.c" +#line 5591 "Dialogs.c" } -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 5886 "Dialogs.c" +#line 5597 "Dialogs.c" } -void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gchar* results_log) { +void +import_ui_save_import_results (GtkWindow* chooser_dialog_parent, + const gchar* results_log) +{ GtkFileChooserDialog* chooser_dialog = NULL; - GtkWindow* _tmp0_; + GtkFileChooserDialog* _tmp0_; GtkFileChooserDialog* _tmp1_; GtkFileChooserDialog* _tmp2_; - GtkFileChooserDialog* _tmp3_; - const gchar* _tmp4_; + const gchar* _tmp3_; + GtkFileChooserDialog* _tmp4_; GtkFileChooserDialog* _tmp5_; - GtkFileChooserDialog* _tmp6_; gint dialog_result = 0; - GtkFileChooserDialog* _tmp7_; - gint _tmp8_; + GtkFileChooserDialog* _tmp6_; GFile* chosen_file = NULL; + GtkFileChooserDialog* _tmp7_; + GFile* _tmp8_; GtkFileChooserDialog* _tmp9_; - GFile* _tmp10_; - GtkFileChooserDialog* _tmp11_; - GtkFileChooserDialog* _tmp12_; - gboolean _tmp13_ = FALSE; - gint _tmp14_; + GtkFileChooserDialog* _tmp10_; + gboolean _tmp11_ = FALSE; + gint _tmp12_; GError * _inner_error_ = NULL; #line 570 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_if_fail ((chooser_dialog_parent == NULL) || GTK_IS_WINDOW (chooser_dialog_parent)); #line 570 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_if_fail (results_log != NULL); #line 571 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = chooser_dialog_parent; + _tmp0_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (IMPORT_UI_SAVE_RESULTS_FILE_CHOOSER_TITLE, chooser_dialog_parent, GTK_FILE_CHOOSER_ACTION_SAVE, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_SAVE_AS_LABEL, GTK_RESPONSE_ACCEPT, NULL, NULL); #line 571 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (IMPORT_UI_SAVE_RESULTS_FILE_CHOOSER_TITLE, _tmp0_, GTK_FILE_CHOOSER_ACTION_SAVE, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_SAVE_AS_LABEL, GTK_RESPONSE_ACCEPT, NULL, NULL); -#line 571 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_object_ref_sink (_tmp1_); + g_object_ref_sink (_tmp0_); #line 571 "/home/jens/Source/shotwell/src/Dialogs.vala" - chooser_dialog = _tmp1_; + chooser_dialog = _tmp0_; #line 574 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = chooser_dialog; + _tmp1_ = chooser_dialog; #line 574 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_file_chooser_set_do_overwrite_confirmation (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE); + gtk_file_chooser_set_do_overwrite_confirmation (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_file_chooser_get_type (), GtkFileChooser), TRUE); #line 575 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = chooser_dialog; + _tmp2_ = chooser_dialog; #line 575 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = g_get_home_dir (); + _tmp3_ = g_get_home_dir (); #line 575 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp4_); + gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_file_chooser_get_type (), GtkFileChooser), _tmp3_); #line 576 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = chooser_dialog; + _tmp4_ = chooser_dialog; #line 576 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_file_chooser_set_current_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "Shotwell Import Log.txt"); + gtk_file_chooser_set_current_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_file_chooser_get_type (), GtkFileChooser), "Shotwell Import Log.txt"); #line 577 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = chooser_dialog; + _tmp5_ = chooser_dialog; #line 577 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE); -#line 579 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = chooser_dialog; + gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_file_chooser_get_type (), GtkFileChooser), FALSE); #line 579 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_dialog_get_type (), GtkDialog)); + _tmp6_ = chooser_dialog; #line 579 "/home/jens/Source/shotwell/src/Dialogs.vala" - dialog_result = _tmp8_; + dialog_result = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_dialog_get_type (), GtkDialog)); #line 580 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9_ = chooser_dialog; + _tmp7_ = chooser_dialog; #line 580 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp10_ = gtk_file_chooser_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); + _tmp8_ = gtk_file_chooser_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_file_chooser_get_type (), GtkFileChooser)); #line 580 "/home/jens/Source/shotwell/src/Dialogs.vala" - chosen_file = _tmp10_; + chosen_file = _tmp8_; #line 581 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp11_ = chooser_dialog; + _tmp9_ = chooser_dialog; #line 581 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); #line 582 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp12_ = chooser_dialog; + _tmp10_ = chooser_dialog; #line 582 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget)); #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp14_ = dialog_result; + _tmp12_ = dialog_result; #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp14_ == ((gint) GTK_RESPONSE_ACCEPT)) { -#line 5964 "Dialogs.c" - GFile* _tmp15_; + if (_tmp12_ == ((gint) GTK_RESPONSE_ACCEPT)) { +#line 5672 "Dialogs.c" + GFile* _tmp13_; #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp15_ = chosen_file; + _tmp13_ = chosen_file; #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp13_ = _tmp15_ != NULL; -#line 5970 "Dialogs.c" + _tmp11_ = _tmp13_ != NULL; +#line 5678 "Dialogs.c" } else { #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp13_ = FALSE; -#line 5974 "Dialogs.c" + _tmp11_ = FALSE; +#line 5682 "Dialogs.c" } #line 584 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp13_) { -#line 5978 "Dialogs.c" + if (_tmp11_) { +#line 5686 "Dialogs.c" { GFileOutputStream* outstream = NULL; - GFile* _tmp16_; - GFileOutputStream* _tmp17_; - GFileOutputStream* _tmp18_; - const gchar* _tmp19_; - guint8* _tmp20_; - gint _tmp20__length1; - guint8* _tmp21_; - gint _tmp21__length1; - GFileOutputStream* _tmp22_; + GFile* _tmp14_; + GFileOutputStream* _tmp15_; + GFileOutputStream* _tmp16_; + guint8* _tmp17_; + gint _tmp17__length1; + guint8* _tmp18_; + gint _tmp18__length1; + GFileOutputStream* _tmp19_; #line 586 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp16_ = chosen_file; + _tmp14_ = chosen_file; #line 586 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp17_ = g_file_replace (_tmp16_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &_inner_error_); + _tmp15_ = g_file_replace (_tmp14_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &_inner_error_); #line 586 "/home/jens/Source/shotwell/src/Dialogs.vala" - outstream = _tmp17_; + outstream = _tmp15_; #line 586 "/home/jens/Source/shotwell/src/Dialogs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5998 "Dialogs.c" +#line 5705 "Dialogs.c" goto __catch437_g_error; } #line 587 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp18_ = outstream; + _tmp16_ = outstream; #line 587 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp19_ = results_log; + _tmp17_ = string_get_data (results_log, &_tmp17__length1); #line 587 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp20_ = string_get_data (_tmp19_, &_tmp20__length1); -#line 587 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp21_ = _tmp20_; + _tmp18_ = _tmp17_; #line 587 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp21__length1 = _tmp20__length1; + _tmp18__length1 = _tmp17__length1; #line 587 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_output_stream_write (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, g_output_stream_get_type (), GOutputStream), _tmp21_, (gsize) _tmp21__length1, NULL, &_inner_error_); + g_output_stream_write (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, g_output_stream_get_type (), GOutputStream), _tmp18_, (gsize) _tmp18__length1, NULL, &_inner_error_); #line 587 "/home/jens/Source/shotwell/src/Dialogs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 587 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (outstream); -#line 6017 "Dialogs.c" +#line 5722 "Dialogs.c" goto __catch437_g_error; } #line 588 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp22_ = outstream; + _tmp19_ = outstream; #line 588 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, g_output_stream_get_type (), GOutputStream), NULL, &_inner_error_); + g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, g_output_stream_get_type (), GOutputStream), NULL, &_inner_error_); #line 588 "/home/jens/Source/shotwell/src/Dialogs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 588 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (outstream); -#line 6028 "Dialogs.c" +#line 5733 "Dialogs.c" goto __catch437_g_error; } #line 585 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (outstream); -#line 6033 "Dialogs.c" +#line 5738 "Dialogs.c" } goto __finally437; __catch437_g_error: { GError* err = NULL; - GFile* _tmp23_; - gchar* _tmp24_; - gchar* _tmp25_; - GError* _tmp26_; - const gchar* _tmp27_; + GFile* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + GError* _tmp23_; + const gchar* _tmp24_; #line 585 "/home/jens/Source/shotwell/src/Dialogs.vala" err = _inner_error_; #line 585 "/home/jens/Source/shotwell/src/Dialogs.vala" _inner_error_ = NULL; #line 590 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp23_ = chosen_file; + _tmp20_ = chosen_file; #line 590 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp24_ = g_file_get_path (_tmp23_); + _tmp21_ = g_file_get_path (_tmp20_); #line 590 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp25_ = _tmp24_; + _tmp22_ = _tmp21_; #line 590 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp26_ = err; + _tmp23_ = err; #line 590 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp27_ = _tmp26_->message; + _tmp24_ = _tmp23_->message; #line 590 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_critical ("Dialogs.vala:590: couldn't save import results to log file %s: %s", _tmp25_, _tmp27_); + g_critical ("Dialogs.vala:590: couldn't save import results to log file %s: %s", _tmp22_, _tmp24_); #line 590 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp25_); + _g_free0 (_tmp22_); #line 585 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_error_free0 (err); -#line 6064 "Dialogs.c" +#line 5769 "Dialogs.c" } __finally437: #line 585 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -6089,35 +5794,40 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha g_clear_error (&_inner_error_); #line 585 "/home/jens/Source/shotwell/src/Dialogs.vala" return; -#line 6079 "Dialogs.c" +#line 5784 "Dialogs.c" } } #line 570 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (chosen_file); #line 570 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (chooser_dialog); -#line 6086 "Dialogs.c" +#line 5791 "Dialogs.c" } -static gboolean _text_entry_dialog_mediator_on_modify_validate_text_entry_dialog_on_modify_validate_type (const gchar* text, gpointer self) { +static gboolean +_text_entry_dialog_mediator_on_modify_validate_text_entry_dialog_on_modify_validate_type (const gchar* text, + gpointer self) +{ gboolean result; result = text_entry_dialog_mediator_on_modify_validate ((TextEntryDialogMediator*) self, text); #line 604 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 6095 "Dialogs.c" +#line 5803 "Dialogs.c" } -TextEntryDialogMediator* text_entry_dialog_mediator_construct (GType object_type, const gchar* title, const gchar* label, const gchar* initial_text, GeeCollection* completion_list, const gchar* completion_delimiter) { +TextEntryDialogMediator* +text_entry_dialog_mediator_construct (GType object_type, + const gchar* title, + const gchar* label, + const gchar* initial_text, + GeeCollection* completion_list, + const gchar* completion_delimiter) +{ TextEntryDialogMediator* self = NULL; TextEntryDialog* _tmp0_; TextEntryDialog* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - GeeCollection* _tmp5_; - const gchar* _tmp6_; #line 601 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (title != NULL, NULL); #line 601 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -6137,24 +5847,17 @@ TextEntryDialogMediator* text_entry_dialog_mediator_construct (GType object_type #line 604 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp1_ = self->priv->dialog; #line 604 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = title; -#line 604 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = label; -#line 604 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = initial_text; -#line 604 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = completion_list; -#line 604 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = completion_delimiter; -#line 604 "/home/jens/Source/shotwell/src/Dialogs.vala" - text_entry_dialog_setup (_tmp1_, _text_entry_dialog_mediator_on_modify_validate_text_entry_dialog_on_modify_validate_type, self, _tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_); + text_entry_dialog_setup (_tmp1_, _text_entry_dialog_mediator_on_modify_validate_text_entry_dialog_on_modify_validate_type, self, title, label, initial_text, completion_list, completion_delimiter); #line 601 "/home/jens/Source/shotwell/src/Dialogs.vala" return self; -#line 6140 "Dialogs.c" +#line 5840 "Dialogs.c" } -static gboolean text_entry_dialog_mediator_real_on_modify_validate (TextEntryDialogMediator* self, const gchar* text) { +static gboolean +text_entry_dialog_mediator_real_on_modify_validate (TextEntryDialogMediator* self, + const gchar* text) +{ gboolean result = FALSE; #line 607 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (text != NULL, FALSE); @@ -6162,20 +5865,25 @@ static gboolean text_entry_dialog_mediator_real_on_modify_validate (TextEntryDia result = TRUE; #line 608 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 6152 "Dialogs.c" +#line 5855 "Dialogs.c" } -gboolean text_entry_dialog_mediator_on_modify_validate (TextEntryDialogMediator* self, const gchar* text) { +gboolean +text_entry_dialog_mediator_on_modify_validate (TextEntryDialogMediator* self, + const gchar* text) +{ #line 607 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (IS_TEXT_ENTRY_DIALOG_MEDIATOR (self), FALSE); #line 607 "/home/jens/Source/shotwell/src/Dialogs.vala" return TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->on_modify_validate (self, text); -#line 6161 "Dialogs.c" +#line 5867 "Dialogs.c" } -gchar* _text_entry_dialog_mediator_execute (TextEntryDialogMediator* self) { +gchar* +_text_entry_dialog_mediator_execute (TextEntryDialogMediator* self) +{ gchar* result = NULL; TextEntryDialog* _tmp0_; gchar* _tmp1_; @@ -6189,108 +5897,133 @@ gchar* _text_entry_dialog_mediator_execute (TextEntryDialogMediator* self) { result = _tmp1_; #line 612 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 6179 "Dialogs.c" +#line 5887 "Dialogs.c" } -static void value_text_entry_dialog_mediator_init (GValue* value) { +static void +value_text_entry_dialog_mediator_init (GValue* value) +{ #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = NULL; -#line 6186 "Dialogs.c" +#line 5896 "Dialogs.c" } -static void value_text_entry_dialog_mediator_free_value (GValue* value) { +static void +value_text_entry_dialog_mediator_free_value (GValue* value) +{ #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" if (value->data[0].v_pointer) { #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" text_entry_dialog_mediator_unref (value->data[0].v_pointer); -#line 6195 "Dialogs.c" +#line 5907 "Dialogs.c" } } -static void value_text_entry_dialog_mediator_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_text_entry_dialog_mediator_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" if (src_value->data[0].v_pointer) { #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" dest_value->data[0].v_pointer = text_entry_dialog_mediator_ref (src_value->data[0].v_pointer); -#line 6205 "Dialogs.c" +#line 5920 "Dialogs.c" } else { #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" dest_value->data[0].v_pointer = NULL; -#line 6209 "Dialogs.c" +#line 5924 "Dialogs.c" } } -static gpointer value_text_entry_dialog_mediator_peek_pointer (const GValue* value) { +static gpointer +value_text_entry_dialog_mediator_peek_pointer (const GValue* value) +{ #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" return value->data[0].v_pointer; -#line 6217 "Dialogs.c" +#line 5934 "Dialogs.c" } -static gchar* value_text_entry_dialog_mediator_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_text_entry_dialog_mediator_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" if (collect_values[0].v_pointer) { -#line 6224 "Dialogs.c" +#line 5946 "Dialogs.c" TextEntryDialogMediator * object; object = collect_values[0].v_pointer; #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" if (object->parent_instance.g_class == NULL) { #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6231 "Dialogs.c" +#line 5953 "Dialogs.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6235 "Dialogs.c" +#line 5957 "Dialogs.c" } #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = text_entry_dialog_mediator_ref (object); -#line 6239 "Dialogs.c" +#line 5961 "Dialogs.c" } else { #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = NULL; -#line 6243 "Dialogs.c" +#line 5965 "Dialogs.c" } #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" return NULL; -#line 6247 "Dialogs.c" +#line 5969 "Dialogs.c" } -static gchar* value_text_entry_dialog_mediator_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_text_entry_dialog_mediator_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ TextEntryDialogMediator ** object_p; object_p = collect_values[0].v_pointer; #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" if (!object_p) { #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 6258 "Dialogs.c" +#line 5985 "Dialogs.c" } #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" if (!value->data[0].v_pointer) { #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" *object_p = NULL; -#line 6264 "Dialogs.c" +#line 5991 "Dialogs.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" *object_p = value->data[0].v_pointer; -#line 6268 "Dialogs.c" +#line 5995 "Dialogs.c" } else { #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" *object_p = text_entry_dialog_mediator_ref (value->data[0].v_pointer); -#line 6272 "Dialogs.c" +#line 5999 "Dialogs.c" } #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" return NULL; -#line 6276 "Dialogs.c" +#line 6003 "Dialogs.c" } -GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_text_entry_dialog_mediator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecTextEntryDialogMediator* spec; #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR), NULL); @@ -6300,20 +6033,25 @@ GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" return G_PARAM_SPEC (spec); -#line 6290 "Dialogs.c" +#line 6023 "Dialogs.c" } -gpointer value_get_text_entry_dialog_mediator (const GValue* value) { +gpointer +value_get_text_entry_dialog_mediator (const GValue* value) +{ #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR), NULL); #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" return value->data[0].v_pointer; -#line 6299 "Dialogs.c" +#line 6034 "Dialogs.c" } -void value_set_text_entry_dialog_mediator (GValue* value, gpointer v_object) { +void +value_set_text_entry_dialog_mediator (GValue* value, + gpointer v_object) +{ TextEntryDialogMediator * old; #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR)); @@ -6329,22 +6067,25 @@ void value_set_text_entry_dialog_mediator (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" text_entry_dialog_mediator_ref (value->data[0].v_pointer); -#line 6319 "Dialogs.c" +#line 6057 "Dialogs.c" } else { #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = NULL; -#line 6323 "Dialogs.c" +#line 6061 "Dialogs.c" } #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" if (old) { #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" text_entry_dialog_mediator_unref (old); -#line 6329 "Dialogs.c" +#line 6067 "Dialogs.c" } } -void value_take_text_entry_dialog_mediator (GValue* value, gpointer v_object) { +void +value_take_text_entry_dialog_mediator (GValue* value, + gpointer v_object) +{ TextEntryDialogMediator * old; #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR)); @@ -6358,22 +6099,24 @@ void value_take_text_entry_dialog_mediator (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = v_object; -#line 6348 "Dialogs.c" +#line 6089 "Dialogs.c" } else { #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = NULL; -#line 6352 "Dialogs.c" +#line 6093 "Dialogs.c" } #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" if (old) { #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" text_entry_dialog_mediator_unref (old); -#line 6358 "Dialogs.c" +#line 6099 "Dialogs.c" } } -static void text_entry_dialog_mediator_class_init (TextEntryDialogMediatorClass * klass) { +static void +text_entry_dialog_mediator_class_init (TextEntryDialogMediatorClass * klass) +{ #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" text_entry_dialog_mediator_parent_class = g_type_class_peek_parent (klass); #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -6382,20 +6125,24 @@ static void text_entry_dialog_mediator_class_init (TextEntryDialogMediatorClass g_type_class_add_private (klass, sizeof (TextEntryDialogMediatorPrivate)); #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" ((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*) (TextEntryDialogMediator *, const gchar*)) text_entry_dialog_mediator_real_on_modify_validate; -#line 6372 "Dialogs.c" +#line 6115 "Dialogs.c" } -static void text_entry_dialog_mediator_instance_init (TextEntryDialogMediator * self) { +static void +text_entry_dialog_mediator_instance_init (TextEntryDialogMediator * self) +{ #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" self->priv = TEXT_ENTRY_DIALOG_MEDIATOR_GET_PRIVATE (self); #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" self->ref_count = 1; -#line 6381 "Dialogs.c" +#line 6126 "Dialogs.c" } -static void text_entry_dialog_mediator_finalize (TextEntryDialogMediator * obj) { +static void +text_entry_dialog_mediator_finalize (TextEntryDialogMediator * obj) +{ TextEntryDialogMediator * self; #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator); @@ -6403,11 +6150,13 @@ static void text_entry_dialog_mediator_finalize (TextEntryDialogMediator * obj) g_signal_handlers_destroy (self); #line 599 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (self->priv->dialog); -#line 6393 "Dialogs.c" +#line 6140 "Dialogs.c" } -GType text_entry_dialog_mediator_get_type (void) { +GType +text_entry_dialog_mediator_get_type (void) +{ static volatile gsize text_entry_dialog_mediator_type_id__volatile = 0; if (g_once_init_enter (&text_entry_dialog_mediator_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_text_entry_dialog_mediator_init, value_text_entry_dialog_mediator_free_value, value_text_entry_dialog_mediator_copy_value, value_text_entry_dialog_mediator_peek_pointer, "p", value_text_entry_dialog_mediator_collect_value, "p", value_text_entry_dialog_mediator_lcopy_value }; @@ -6421,18 +6170,22 @@ GType text_entry_dialog_mediator_get_type (void) { } -gpointer text_entry_dialog_mediator_ref (gpointer instance) { +gpointer +text_entry_dialog_mediator_ref (gpointer instance) +{ TextEntryDialogMediator * self; self = instance; #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" g_atomic_int_inc (&self->ref_count); #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" return instance; -#line 6418 "Dialogs.c" +#line 6169 "Dialogs.c" } -void text_entry_dialog_mediator_unref (gpointer instance) { +void +text_entry_dialog_mediator_unref (gpointer instance) +{ TextEntryDialogMediator * self; self = instance; #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -6441,27 +6194,32 @@ void text_entry_dialog_mediator_unref (gpointer instance) { TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->finalize (self); #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala" g_type_free_instance ((GTypeInstance *) self); -#line 6431 "Dialogs.c" +#line 6184 "Dialogs.c" } } -static gboolean _multi_text_entry_dialog_mediator_on_modify_validate_multi_text_entry_dialog_on_modify_validate_type (const gchar* text, gpointer self) { +static gboolean +_multi_text_entry_dialog_mediator_on_modify_validate_multi_text_entry_dialog_on_modify_validate_type (const gchar* text, + gpointer self) +{ gboolean result; result = multi_text_entry_dialog_mediator_on_modify_validate ((MultiTextEntryDialogMediator*) self, text); #line 621 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 6441 "Dialogs.c" +#line 6197 "Dialogs.c" } -MultiTextEntryDialogMediator* multi_text_entry_dialog_mediator_construct (GType object_type, const gchar* title, const gchar* label, const gchar* initial_text) { +MultiTextEntryDialogMediator* +multi_text_entry_dialog_mediator_construct (GType object_type, + const gchar* title, + const gchar* label, + const gchar* initial_text) +{ MultiTextEntryDialogMediator* self = NULL; MultiTextEntryDialog* _tmp0_; MultiTextEntryDialog* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; #line 619 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (title != NULL, NULL); #line 619 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -6479,20 +6237,17 @@ MultiTextEntryDialogMediator* multi_text_entry_dialog_mediator_construct (GType #line 621 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp1_ = self->priv->dialog; #line 621 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = title; -#line 621 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = label; -#line 621 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = initial_text; -#line 621 "/home/jens/Source/shotwell/src/Dialogs.vala" - multi_text_entry_dialog_setup (_tmp1_, _multi_text_entry_dialog_mediator_on_modify_validate_multi_text_entry_dialog_on_modify_validate_type, self, _tmp2_, _tmp3_, _tmp4_); + multi_text_entry_dialog_setup (_tmp1_, _multi_text_entry_dialog_mediator_on_modify_validate_multi_text_entry_dialog_on_modify_validate_type, self, title, label, initial_text); #line 619 "/home/jens/Source/shotwell/src/Dialogs.vala" return self; -#line 6478 "Dialogs.c" +#line 6230 "Dialogs.c" } -static gboolean multi_text_entry_dialog_mediator_real_on_modify_validate (MultiTextEntryDialogMediator* self, const gchar* text) { +static gboolean +multi_text_entry_dialog_mediator_real_on_modify_validate (MultiTextEntryDialogMediator* self, + const gchar* text) +{ gboolean result = FALSE; #line 624 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (text != NULL, FALSE); @@ -6500,20 +6255,25 @@ static gboolean multi_text_entry_dialog_mediator_real_on_modify_validate (MultiT result = TRUE; #line 625 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 6490 "Dialogs.c" +#line 6245 "Dialogs.c" } -gboolean multi_text_entry_dialog_mediator_on_modify_validate (MultiTextEntryDialogMediator* self, const gchar* text) { +gboolean +multi_text_entry_dialog_mediator_on_modify_validate (MultiTextEntryDialogMediator* self, + const gchar* text) +{ #line 624 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR (self), FALSE); #line 624 "/home/jens/Source/shotwell/src/Dialogs.vala" return MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->on_modify_validate (self, text); -#line 6499 "Dialogs.c" +#line 6257 "Dialogs.c" } -gchar* _multi_text_entry_dialog_mediator_execute (MultiTextEntryDialogMediator* self) { +gchar* +_multi_text_entry_dialog_mediator_execute (MultiTextEntryDialogMediator* self) +{ gchar* result = NULL; MultiTextEntryDialog* _tmp0_; gchar* _tmp1_; @@ -6527,108 +6287,133 @@ gchar* _multi_text_entry_dialog_mediator_execute (MultiTextEntryDialogMediator* result = _tmp1_; #line 629 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 6517 "Dialogs.c" +#line 6277 "Dialogs.c" } -static void value_multi_text_entry_dialog_mediator_init (GValue* value) { +static void +value_multi_text_entry_dialog_mediator_init (GValue* value) +{ #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = NULL; -#line 6524 "Dialogs.c" +#line 6286 "Dialogs.c" } -static void value_multi_text_entry_dialog_mediator_free_value (GValue* value) { +static void +value_multi_text_entry_dialog_mediator_free_value (GValue* value) +{ #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" if (value->data[0].v_pointer) { #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" multi_text_entry_dialog_mediator_unref (value->data[0].v_pointer); -#line 6533 "Dialogs.c" +#line 6297 "Dialogs.c" } } -static void value_multi_text_entry_dialog_mediator_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_multi_text_entry_dialog_mediator_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" if (src_value->data[0].v_pointer) { #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" dest_value->data[0].v_pointer = multi_text_entry_dialog_mediator_ref (src_value->data[0].v_pointer); -#line 6543 "Dialogs.c" +#line 6310 "Dialogs.c" } else { #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" dest_value->data[0].v_pointer = NULL; -#line 6547 "Dialogs.c" +#line 6314 "Dialogs.c" } } -static gpointer value_multi_text_entry_dialog_mediator_peek_pointer (const GValue* value) { +static gpointer +value_multi_text_entry_dialog_mediator_peek_pointer (const GValue* value) +{ #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" return value->data[0].v_pointer; -#line 6555 "Dialogs.c" +#line 6324 "Dialogs.c" } -static gchar* value_multi_text_entry_dialog_mediator_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_multi_text_entry_dialog_mediator_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" if (collect_values[0].v_pointer) { -#line 6562 "Dialogs.c" +#line 6336 "Dialogs.c" MultiTextEntryDialogMediator * object; object = collect_values[0].v_pointer; #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" if (object->parent_instance.g_class == NULL) { #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6569 "Dialogs.c" +#line 6343 "Dialogs.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6573 "Dialogs.c" +#line 6347 "Dialogs.c" } #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = multi_text_entry_dialog_mediator_ref (object); -#line 6577 "Dialogs.c" +#line 6351 "Dialogs.c" } else { #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = NULL; -#line 6581 "Dialogs.c" +#line 6355 "Dialogs.c" } #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" return NULL; -#line 6585 "Dialogs.c" +#line 6359 "Dialogs.c" } -static gchar* value_multi_text_entry_dialog_mediator_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_multi_text_entry_dialog_mediator_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ MultiTextEntryDialogMediator ** object_p; object_p = collect_values[0].v_pointer; #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" if (!object_p) { #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 6596 "Dialogs.c" +#line 6375 "Dialogs.c" } #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" if (!value->data[0].v_pointer) { #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" *object_p = NULL; -#line 6602 "Dialogs.c" +#line 6381 "Dialogs.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" *object_p = value->data[0].v_pointer; -#line 6606 "Dialogs.c" +#line 6385 "Dialogs.c" } else { #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" *object_p = multi_text_entry_dialog_mediator_ref (value->data[0].v_pointer); -#line 6610 "Dialogs.c" +#line 6389 "Dialogs.c" } #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" return NULL; -#line 6614 "Dialogs.c" +#line 6393 "Dialogs.c" } -GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_multi_text_entry_dialog_mediator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecMultiTextEntryDialogMediator* spec; #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR), NULL); @@ -6638,20 +6423,25 @@ GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, cons G_PARAM_SPEC (spec)->value_type = object_type; #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" return G_PARAM_SPEC (spec); -#line 6628 "Dialogs.c" +#line 6413 "Dialogs.c" } -gpointer value_get_multi_text_entry_dialog_mediator (const GValue* value) { +gpointer +value_get_multi_text_entry_dialog_mediator (const GValue* value) +{ #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR), NULL); #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" return value->data[0].v_pointer; -#line 6637 "Dialogs.c" +#line 6424 "Dialogs.c" } -void value_set_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object) { +void +value_set_multi_text_entry_dialog_mediator (GValue* value, + gpointer v_object) +{ MultiTextEntryDialogMediator * old; #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR)); @@ -6667,22 +6457,25 @@ void value_set_multi_text_entry_dialog_mediator (GValue* value, gpointer v_objec value->data[0].v_pointer = v_object; #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" multi_text_entry_dialog_mediator_ref (value->data[0].v_pointer); -#line 6657 "Dialogs.c" +#line 6447 "Dialogs.c" } else { #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = NULL; -#line 6661 "Dialogs.c" +#line 6451 "Dialogs.c" } #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" if (old) { #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" multi_text_entry_dialog_mediator_unref (old); -#line 6667 "Dialogs.c" +#line 6457 "Dialogs.c" } } -void value_take_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object) { +void +value_take_multi_text_entry_dialog_mediator (GValue* value, + gpointer v_object) +{ MultiTextEntryDialogMediator * old; #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR)); @@ -6696,22 +6489,24 @@ void value_take_multi_text_entry_dialog_mediator (GValue* value, gpointer v_obje g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = v_object; -#line 6686 "Dialogs.c" +#line 6479 "Dialogs.c" } else { #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = NULL; -#line 6690 "Dialogs.c" +#line 6483 "Dialogs.c" } #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" if (old) { #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" multi_text_entry_dialog_mediator_unref (old); -#line 6696 "Dialogs.c" +#line 6489 "Dialogs.c" } } -static void multi_text_entry_dialog_mediator_class_init (MultiTextEntryDialogMediatorClass * klass) { +static void +multi_text_entry_dialog_mediator_class_init (MultiTextEntryDialogMediatorClass * klass) +{ #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" multi_text_entry_dialog_mediator_parent_class = g_type_class_peek_parent (klass); #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -6720,20 +6515,24 @@ static void multi_text_entry_dialog_mediator_class_init (MultiTextEntryDialogMed g_type_class_add_private (klass, sizeof (MultiTextEntryDialogMediatorPrivate)); #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" ((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*) (MultiTextEntryDialogMediator *, const gchar*)) multi_text_entry_dialog_mediator_real_on_modify_validate; -#line 6710 "Dialogs.c" +#line 6505 "Dialogs.c" } -static void multi_text_entry_dialog_mediator_instance_init (MultiTextEntryDialogMediator * self) { +static void +multi_text_entry_dialog_mediator_instance_init (MultiTextEntryDialogMediator * self) +{ #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" self->priv = MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_PRIVATE (self); #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" self->ref_count = 1; -#line 6719 "Dialogs.c" +#line 6516 "Dialogs.c" } -static void multi_text_entry_dialog_mediator_finalize (MultiTextEntryDialogMediator * obj) { +static void +multi_text_entry_dialog_mediator_finalize (MultiTextEntryDialogMediator * obj) +{ MultiTextEntryDialogMediator * self; #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR, MultiTextEntryDialogMediator); @@ -6741,11 +6540,13 @@ static void multi_text_entry_dialog_mediator_finalize (MultiTextEntryDialogMedia g_signal_handlers_destroy (self); #line 617 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (self->priv->dialog); -#line 6731 "Dialogs.c" +#line 6530 "Dialogs.c" } -GType multi_text_entry_dialog_mediator_get_type (void) { +GType +multi_text_entry_dialog_mediator_get_type (void) +{ static volatile gsize multi_text_entry_dialog_mediator_type_id__volatile = 0; if (g_once_init_enter (&multi_text_entry_dialog_mediator_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_multi_text_entry_dialog_mediator_init, value_multi_text_entry_dialog_mediator_free_value, value_multi_text_entry_dialog_mediator_copy_value, value_multi_text_entry_dialog_mediator_peek_pointer, "p", value_multi_text_entry_dialog_mediator_collect_value, "p", value_multi_text_entry_dialog_mediator_lcopy_value }; @@ -6759,18 +6560,22 @@ GType multi_text_entry_dialog_mediator_get_type (void) { } -gpointer multi_text_entry_dialog_mediator_ref (gpointer instance) { +gpointer +multi_text_entry_dialog_mediator_ref (gpointer instance) +{ MultiTextEntryDialogMediator * self; self = instance; #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" g_atomic_int_inc (&self->ref_count); #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" return instance; -#line 6756 "Dialogs.c" +#line 6559 "Dialogs.c" } -void multi_text_entry_dialog_mediator_unref (gpointer instance) { +void +multi_text_entry_dialog_mediator_unref (gpointer instance) +{ MultiTextEntryDialogMediator * self; self = instance; #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -6779,102 +6584,95 @@ void multi_text_entry_dialog_mediator_unref (gpointer instance) { MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->finalize (self); #line 616 "/home/jens/Source/shotwell/src/Dialogs.vala" g_type_free_instance ((GTypeInstance *) self); -#line 6769 "Dialogs.c" +#line 6574 "Dialogs.c" } } -gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_text, gboolean should_escape) { +gchar* +build_alert_body_text (const gchar* primary_text, + const gchar* secondary_text, + gboolean should_escape) +{ gchar* result = NULL; - gboolean _tmp0_; - const gchar* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; - const gchar* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; -#line 638 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = should_escape; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 638 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp0_) { -#line 6787 "Dialogs.c" - const gchar* _tmp1_; + if (should_escape) { +#line 6591 "Dialogs.c" + gchar* _tmp0_; + gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; -#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = primary_text; #line 639 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = guarded_markup_escape_text (_tmp1_); + _tmp0_ = guarded_markup_escape_text (primary_text); #line 639 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = _tmp2_; -#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = secondary_text; + _tmp1_ = _tmp0_; #line 639 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = guarded_markup_escape_text (_tmp4_); -#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = _tmp5_; + _tmp2_ = guarded_markup_escape_text (secondary_text); #line 639 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = g_strdup_printf ("%s\n%s", _tmp3_, _tmp6_); + _tmp3_ = _tmp2_; #line 639 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = _tmp7_; + _tmp4_ = g_strdup_printf ("%s\n%s", _tmp1_, _tmp3_); #line 639 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp6_); + _tmp5_ = _tmp4_; #line 639 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (_tmp3_); #line 639 "/home/jens/Source/shotwell/src/Dialogs.vala" - result = _tmp8_; + _g_free0 (_tmp1_); +#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala" + result = _tmp5_; #line 639 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 6820 "Dialogs.c" +#line 6618 "Dialogs.c" } #line 643 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9_ = primary_text; + _tmp6_ = guarded_markup_escape_text (primary_text); #line 643 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp10_ = guarded_markup_escape_text (_tmp9_); -#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp11_ = _tmp10_; + _tmp7_ = _tmp6_; #line 643 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp12_ = secondary_text; + _tmp8_ = g_strdup_printf ("%s\n%s", _tmp7_, secondary_text); #line 643 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp13_ = g_strdup_printf ("%s\n%s", _tmp11_, _tmp12_); -#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp14_ = _tmp13_; + _tmp9_ = _tmp8_; #line 643 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp7_); #line 643 "/home/jens/Source/shotwell/src/Dialogs.vala" - result = _tmp14_; + result = _tmp9_; #line 643 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 6840 "Dialogs.c" +#line 6634 "Dialogs.c" } -EventRenameDialog* event_rename_dialog_construct (GType object_type, const gchar* event_name) { +EventRenameDialog* +event_rename_dialog_construct (GType object_type, + const gchar* event_name) +{ EventRenameDialog* self = NULL; - const gchar* _tmp0_; -#line 650 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = event_name; #line 650 "/home/jens/Source/shotwell/src/Dialogs.vala" - self = (EventRenameDialog*) text_entry_dialog_mediator_construct (object_type, _ ("Rename Event"), _ ("Name:"), _tmp0_, NULL, NULL); + self = (EventRenameDialog*) text_entry_dialog_mediator_construct (object_type, _ ("Rename Event"), _ ("Name:"), event_name, NULL, NULL); #line 649 "/home/jens/Source/shotwell/src/Dialogs.vala" return self; -#line 6853 "Dialogs.c" +#line 6647 "Dialogs.c" } -EventRenameDialog* event_rename_dialog_new (const gchar* event_name) { +EventRenameDialog* +event_rename_dialog_new (const gchar* event_name) +{ #line 649 "/home/jens/Source/shotwell/src/Dialogs.vala" return event_rename_dialog_construct (TYPE_EVENT_RENAME_DIALOG, event_name); -#line 6860 "Dialogs.c" +#line 6656 "Dialogs.c" } -static gchar* event_rename_dialog_real_execute (EventRenameDialog* self) { +static gchar* +event_rename_dialog_real_execute (EventRenameDialog* self) +{ gchar* result = NULL; gchar* _tmp0_; gchar* _tmp1_; @@ -6894,33 +6692,41 @@ static gchar* event_rename_dialog_real_execute (EventRenameDialog* self) { result = _tmp3_; #line 654 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 6884 "Dialogs.c" +#line 6682 "Dialogs.c" } -gchar* event_rename_dialog_execute (EventRenameDialog* self) { +gchar* +event_rename_dialog_execute (EventRenameDialog* self) +{ #line 653 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (IS_EVENT_RENAME_DIALOG (self), NULL); #line 653 "/home/jens/Source/shotwell/src/Dialogs.vala" return EVENT_RENAME_DIALOG_GET_CLASS (self)->execute (self); -#line 6893 "Dialogs.c" +#line 6693 "Dialogs.c" } -static void event_rename_dialog_class_init (EventRenameDialogClass * klass) { +static void +event_rename_dialog_class_init (EventRenameDialogClass * klass) +{ #line 648 "/home/jens/Source/shotwell/src/Dialogs.vala" event_rename_dialog_parent_class = g_type_class_peek_parent (klass); #line 648 "/home/jens/Source/shotwell/src/Dialogs.vala" ((EventRenameDialogClass *) klass)->execute = (gchar* (*) (EventRenameDialog *)) event_rename_dialog_real_execute; -#line 6902 "Dialogs.c" +#line 6704 "Dialogs.c" } -static void event_rename_dialog_instance_init (EventRenameDialog * self) { +static void +event_rename_dialog_instance_init (EventRenameDialog * self) +{ } -GType event_rename_dialog_get_type (void) { +GType +event_rename_dialog_get_type (void) +{ static volatile gsize event_rename_dialog_type_id__volatile = 0; if (g_once_init_enter (&event_rename_dialog_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventRenameDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_rename_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventRenameDialog), 0, (GInstanceInitFunc) event_rename_dialog_instance_init, NULL }; @@ -6932,27 +6738,31 @@ GType event_rename_dialog_get_type (void) { } -EditTitleDialog* edit_title_dialog_construct (GType object_type, const gchar* photo_title) { +EditTitleDialog* +edit_title_dialog_construct (GType object_type, + const gchar* photo_title) +{ EditTitleDialog* self = NULL; - const gchar* _tmp0_; #line 661 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = photo_title; -#line 661 "/home/jens/Source/shotwell/src/Dialogs.vala" - self = (EditTitleDialog*) text_entry_dialog_mediator_construct (object_type, C_ ("Dialog Title", "Edit Title"), _ ("Title:"), _tmp0_, NULL, NULL); + self = (EditTitleDialog*) text_entry_dialog_mediator_construct (object_type, C_ ("Dialog Title", "Edit Title"), _ ("Title:"), photo_title, NULL, NULL); #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala" return self; -#line 6931 "Dialogs.c" +#line 6737 "Dialogs.c" } -EditTitleDialog* edit_title_dialog_new (const gchar* photo_title) { +EditTitleDialog* +edit_title_dialog_new (const gchar* photo_title) +{ #line 659 "/home/jens/Source/shotwell/src/Dialogs.vala" return edit_title_dialog_construct (TYPE_EDIT_TITLE_DIALOG, photo_title); -#line 6938 "Dialogs.c" +#line 6746 "Dialogs.c" } -static gchar* edit_title_dialog_real_execute (EditTitleDialog* self) { +static gchar* +edit_title_dialog_real_execute (EditTitleDialog* self) +{ gchar* result = NULL; gchar* _tmp0_; gchar* _tmp1_; @@ -6972,20 +6782,25 @@ static gchar* edit_title_dialog_real_execute (EditTitleDialog* self) { result = _tmp3_; #line 666 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 6962 "Dialogs.c" +#line 6772 "Dialogs.c" } -gchar* edit_title_dialog_execute (EditTitleDialog* self) { +gchar* +edit_title_dialog_execute (EditTitleDialog* self) +{ #line 665 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (IS_EDIT_TITLE_DIALOG (self), NULL); #line 665 "/home/jens/Source/shotwell/src/Dialogs.vala" return EDIT_TITLE_DIALOG_GET_CLASS (self)->execute (self); -#line 6971 "Dialogs.c" +#line 6783 "Dialogs.c" } -static gboolean edit_title_dialog_real_on_modify_validate (TextEntryDialogMediator* base, const gchar* text) { +static gboolean +edit_title_dialog_real_on_modify_validate (TextEntryDialogMediator* base, + const gchar* text) +{ EditTitleDialog * self; gboolean result = FALSE; #line 669 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -6996,26 +6811,32 @@ static gboolean edit_title_dialog_real_on_modify_validate (TextEntryDialogMediat result = TRUE; #line 670 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 6986 "Dialogs.c" +#line 6801 "Dialogs.c" } -static void edit_title_dialog_class_init (EditTitleDialogClass * klass) { +static void +edit_title_dialog_class_init (EditTitleDialogClass * klass) +{ #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala" edit_title_dialog_parent_class = g_type_class_peek_parent (klass); #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala" ((EditTitleDialogClass *) klass)->execute = (gchar* (*) (EditTitleDialog *)) edit_title_dialog_real_execute; #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala" ((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*) (TextEntryDialogMediator *, const gchar*)) edit_title_dialog_real_on_modify_validate; -#line 6997 "Dialogs.c" +#line 6814 "Dialogs.c" } -static void edit_title_dialog_instance_init (EditTitleDialog * self) { +static void +edit_title_dialog_instance_init (EditTitleDialog * self) +{ } -GType edit_title_dialog_get_type (void) { +GType +edit_title_dialog_get_type (void) +{ static volatile gsize edit_title_dialog_type_id__volatile = 0; if (g_once_init_enter (&edit_title_dialog_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditTitleDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) edit_title_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditTitleDialog), 0, (GInstanceInitFunc) edit_title_dialog_instance_init, NULL }; @@ -7027,49 +6848,52 @@ GType edit_title_dialog_get_type (void) { } -EditCommentDialog* edit_comment_dialog_construct (GType object_type, const gchar* comment, gboolean is_event) { +EditCommentDialog* +edit_comment_dialog_construct (GType object_type, + const gchar* comment, + gboolean is_event) +{ EditCommentDialog* self = NULL; const gchar* _tmp0_ = NULL; - gboolean _tmp1_; gchar* title_tmp = NULL; - gchar* _tmp2_; - const gchar* _tmp3_; -#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = is_event; + gchar* _tmp1_; #line 676 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp1_) { + if (is_event) { #line 678 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp0_ = _ ("Edit Event Comment"); -#line 7030 "Dialogs.c" +#line 6851 "Dialogs.c" } else { #line 679 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp0_ = _ ("Edit Photo/Video Comment"); -#line 7034 "Dialogs.c" +#line 6855 "Dialogs.c" } #line 676 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = g_strdup (_tmp0_); + _tmp1_ = g_strdup (_tmp0_); #line 676 "/home/jens/Source/shotwell/src/Dialogs.vala" - title_tmp = _tmp2_; -#line 680 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = comment; + title_tmp = _tmp1_; #line 680 "/home/jens/Source/shotwell/src/Dialogs.vala" - self = (EditCommentDialog*) multi_text_entry_dialog_mediator_construct (object_type, title_tmp, _ ("Comment:"), _tmp3_); + self = (EditCommentDialog*) multi_text_entry_dialog_mediator_construct (object_type, title_tmp, _ ("Comment:"), comment); #line 675 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (title_tmp); #line 675 "/home/jens/Source/shotwell/src/Dialogs.vala" return self; -#line 7048 "Dialogs.c" +#line 6867 "Dialogs.c" } -EditCommentDialog* edit_comment_dialog_new (const gchar* comment, gboolean is_event) { +EditCommentDialog* +edit_comment_dialog_new (const gchar* comment, + gboolean is_event) +{ #line 675 "/home/jens/Source/shotwell/src/Dialogs.vala" return edit_comment_dialog_construct (TYPE_EDIT_COMMENT_DIALOG, comment, is_event); -#line 7055 "Dialogs.c" +#line 6877 "Dialogs.c" } -static gchar* edit_comment_dialog_real_execute (EditCommentDialog* self) { +static gchar* +edit_comment_dialog_real_execute (EditCommentDialog* self) +{ gchar* result = NULL; gchar* _tmp0_; gchar* _tmp1_; @@ -7089,20 +6913,25 @@ static gchar* edit_comment_dialog_real_execute (EditCommentDialog* self) { result = _tmp3_; #line 684 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 7079 "Dialogs.c" +#line 6903 "Dialogs.c" } -gchar* edit_comment_dialog_execute (EditCommentDialog* self) { +gchar* +edit_comment_dialog_execute (EditCommentDialog* self) +{ #line 683 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (IS_EDIT_COMMENT_DIALOG (self), NULL); #line 683 "/home/jens/Source/shotwell/src/Dialogs.vala" return EDIT_COMMENT_DIALOG_GET_CLASS (self)->execute (self); -#line 7088 "Dialogs.c" +#line 6914 "Dialogs.c" } -static gboolean edit_comment_dialog_real_on_modify_validate (MultiTextEntryDialogMediator* base, const gchar* text) { +static gboolean +edit_comment_dialog_real_on_modify_validate (MultiTextEntryDialogMediator* base, + const gchar* text) +{ EditCommentDialog * self; gboolean result = FALSE; #line 687 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -7113,26 +6942,32 @@ static gboolean edit_comment_dialog_real_on_modify_validate (MultiTextEntryDialo result = TRUE; #line 688 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 7103 "Dialogs.c" +#line 6932 "Dialogs.c" } -static void edit_comment_dialog_class_init (EditCommentDialogClass * klass) { +static void +edit_comment_dialog_class_init (EditCommentDialogClass * klass) +{ #line 674 "/home/jens/Source/shotwell/src/Dialogs.vala" edit_comment_dialog_parent_class = g_type_class_peek_parent (klass); #line 674 "/home/jens/Source/shotwell/src/Dialogs.vala" ((EditCommentDialogClass *) klass)->execute = (gchar* (*) (EditCommentDialog *)) edit_comment_dialog_real_execute; #line 674 "/home/jens/Source/shotwell/src/Dialogs.vala" ((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*) (MultiTextEntryDialogMediator *, const gchar*)) edit_comment_dialog_real_on_modify_validate; -#line 7114 "Dialogs.c" +#line 6945 "Dialogs.c" } -static void edit_comment_dialog_instance_init (EditCommentDialog * self) { +static void +edit_comment_dialog_instance_init (EditCommentDialog * self) +{ } -GType edit_comment_dialog_get_type (void) { +GType +edit_comment_dialog_get_type (void) +{ static volatile gsize edit_comment_dialog_type_id__volatile = 0; if (g_once_init_enter (&edit_comment_dialog_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditCommentDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) edit_comment_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditCommentDialog), 0, (GInstanceInitFunc) edit_comment_dialog_instance_init, NULL }; @@ -7144,21 +6979,20 @@ GType edit_comment_dialog_get_type (void) { } -GtkResponseType remove_from_library_dialog (GtkWindow* owner, const gchar* title, const gchar* user_message, gint count) { +GtkResponseType +remove_from_library_dialog (GtkWindow* owner, + const gchar* title, + const gchar* user_message, + gint count) +{ GtkResponseType result = 0; gchar* trash_action = NULL; - gint _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; GtkMessageDialog* dialog = NULL; - GtkWindow* _tmp2_; - const gchar* _tmp3_; - GtkMessageDialog* _tmp4_; - const gchar* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; + GtkMessageDialog* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; GtkResponseType _result_ = 0; - gint _tmp9_; #line 694 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (GTK_IS_WINDOW (owner), 0); #line 694 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -7166,41 +7000,29 @@ GtkResponseType remove_from_library_dialog (GtkWindow* owner, const gchar* title #line 694 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (user_message != NULL, 0); #line 696 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = count; -#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = g_strdup (ngettext ("Remove and _Trash File", "Remove and _Trash Files", (gulong) _tmp0_)); + _tmp0_ = g_strdup (ngettext ("Remove and _Trash File", "Remove and _Trash Files", (gulong) count)); #line 696 "/home/jens/Source/shotwell/src/Dialogs.vala" - trash_action = _tmp1_; -#line 698 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = owner; -#line 698 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = user_message; + trash_action = _tmp0_; #line 698 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp2_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_CANCEL, "%s", _tmp3_); + _tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new (owner, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_CANCEL, "%s", user_message); #line 698 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_object_ref_sink (_tmp4_); + g_object_ref_sink (_tmp1_); #line 698 "/home/jens/Source/shotwell/src/Dialogs.vala" - dialog = _tmp4_; + dialog = _tmp1_; #line 700 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _ ("_Remove From Library"), (gint) GTK_RESPONSE_NO); #line 701 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), trash_action, (gint) GTK_RESPONSE_YES); #line 706 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = title; -#line 706 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = user_message; + _tmp2_ = build_alert_body_text (title, user_message, TRUE); #line 706 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE); -#line 706 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = _tmp7_; + _tmp3_ = _tmp2_; #line 706 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_message_dialog_set_markup (dialog, _tmp8_); + gtk_message_dialog_set_markup (dialog, _tmp3_); #line 706 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp3_); #line 708 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog)); -#line 708 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_ = (GtkResponseType) _tmp9_; + _result_ = (GtkResponseType) gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog)); #line 710 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget)); #line 712 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -7211,22 +7033,21 @@ GtkResponseType remove_from_library_dialog (GtkWindow* owner, const gchar* title _g_free0 (trash_action); #line 712 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 7201 "Dialogs.c" +#line 7023 "Dialogs.c" } -GtkResponseType remove_from_filesystem_dialog (GtkWindow* owner, const gchar* title, const gchar* user_message) { +GtkResponseType +remove_from_filesystem_dialog (GtkWindow* owner, + const gchar* title, + const gchar* user_message) +{ GtkResponseType result = 0; GtkMessageDialog* dialog = NULL; - GtkWindow* _tmp0_; - const gchar* _tmp1_; - GtkMessageDialog* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; + GtkMessageDialog* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; GtkResponseType _result_ = 0; - gint _tmp7_; #line 716 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (GTK_IS_WINDOW (owner), 0); #line 716 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -7234,15 +7055,11 @@ GtkResponseType remove_from_filesystem_dialog (GtkWindow* owner, const gchar* ti #line 716 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (user_message != NULL, 0); #line 718 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = owner; -#line 718 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = user_message; -#line 718 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp1_); + _tmp0_ = (GtkMessageDialog*) gtk_message_dialog_new (owner, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", user_message); #line 718 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_object_ref_sink (_tmp2_); + g_object_ref_sink (_tmp0_); #line 718 "/home/jens/Source/shotwell/src/Dialogs.vala" - dialog = _tmp2_; + dialog = _tmp0_; #line 720 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _ ("_Keep"), (gint) GTK_RESPONSE_NO); #line 721 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -7250,21 +7067,15 @@ GtkResponseType remove_from_filesystem_dialog (GtkWindow* owner, const gchar* ti #line 722 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_NO); #line 724 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = title; -#line 724 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = user_message; + _tmp1_ = build_alert_body_text (title, user_message, TRUE); #line 724 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = build_alert_body_text (_tmp3_, _tmp4_, TRUE); -#line 724 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = _tmp5_; + _tmp2_ = _tmp1_; #line 724 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_message_dialog_set_markup (dialog, _tmp6_); + gtk_message_dialog_set_markup (dialog, _tmp2_); #line 724 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp6_); -#line 726 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog)); + _g_free0 (_tmp2_); #line 726 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_ = (GtkResponseType) _tmp7_; + _result_ = (GtkResponseType) gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog)); #line 728 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget)); #line 730 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -7273,206 +7084,194 @@ GtkResponseType remove_from_filesystem_dialog (GtkWindow* owner, const gchar* ti _g_object_unref0 (dialog); #line 730 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 7263 "Dialogs.c" +#line 7074 "Dialogs.c" } -gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos) { +gboolean +revert_editable_dialog (GtkWindow* owner, + GeeCollection* photos) +{ gboolean result = FALSE; gint count = 0; - gint _tmp9_; - const gchar* _tmp10_ = NULL; - gint _tmp11_; + gint _tmp6_; + const gchar* _tmp7_ = NULL; + gint _tmp8_; gchar* headline = NULL; - gchar* _tmp12_; + gchar* _tmp9_; gchar* msg = NULL; - gint _tmp13_; + gint _tmp10_; + gint _tmp11_; + gchar* _tmp12_; + const gchar* _tmp13_ = NULL; gint _tmp14_; - gchar* _tmp15_; - const gchar* _tmp16_ = NULL; - gint _tmp17_; gchar* action = NULL; - gchar* _tmp18_; + gchar* _tmp15_; GtkMessageDialog* dialog = NULL; - GtkWindow* _tmp19_; + const gchar* _tmp16_; + GtkMessageDialog* _tmp17_; + GtkMessageDialog* _tmp18_; + GtkMessageDialog* _tmp19_; const gchar* _tmp20_; GtkMessageDialog* _tmp21_; - GtkMessageDialog* _tmp22_; - GtkMessageDialog* _tmp23_; - const gchar* _tmp24_; - GtkMessageDialog* _tmp25_; - const gchar* _tmp26_; - const gchar* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; + const gchar* _tmp22_; + const gchar* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; GtkResponseType _result_ = 0; - GtkMessageDialog* _tmp30_; - gint _tmp31_; - GtkMessageDialog* _tmp32_; - GtkResponseType _tmp33_; + GtkMessageDialog* _tmp26_; + GtkMessageDialog* _tmp27_; + GtkResponseType _tmp28_; #line 733 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (GTK_IS_WINDOW (owner), FALSE); #line 733 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (GEE_IS_COLLECTION (photos), FALSE); #line 734 "/home/jens/Source/shotwell/src/Dialogs.vala" count = 0; -#line 7306 "Dialogs.c" +#line 7118 "Dialogs.c" { GeeIterator* _photo_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; -#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = photos; + GeeIterator* _tmp0_; #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_ITERABLE, GeeIterable)); #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala" - _photo_it = _tmp1_; + _photo_it = _tmp0_; #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala" while (TRUE) { -#line 7319 "Dialogs.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 7128 "Dialogs.c" + GeeIterator* _tmp1_; Photo* photo = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - Photo* _tmp6_; - gboolean _tmp7_; -#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = _photo_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + Photo* _tmp4_; #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _photo_it; #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala" break; -#line 7335 "Dialogs.c" +#line 7140 "Dialogs.c" } #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = _photo_it; + _tmp2_ = _photo_it; #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala" - photo = (Photo*) _tmp5_; + photo = (Photo*) _tmp3_; #line 736 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = photo; + _tmp4_ = photo; #line 736 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = photo_has_editable (_tmp6_); -#line 736 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp7_) { -#line 7349 "Dialogs.c" - gint _tmp8_; + if (photo_has_editable (_tmp4_)) { +#line 7152 "Dialogs.c" + gint _tmp5_; #line 737 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = count; + _tmp5_ = count; #line 737 "/home/jens/Source/shotwell/src/Dialogs.vala" - count = _tmp8_ + 1; -#line 7355 "Dialogs.c" + count = _tmp5_ + 1; +#line 7158 "Dialogs.c" } #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (photo); -#line 7359 "Dialogs.c" +#line 7162 "Dialogs.c" } #line 735 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_photo_it); -#line 7363 "Dialogs.c" +#line 7166 "Dialogs.c" } #line 740 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9_ = count; + _tmp6_ = count; #line 740 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp9_ == 0) { + if (_tmp6_ == 0) { #line 741 "/home/jens/Source/shotwell/src/Dialogs.vala" result = FALSE; #line 741 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 7373 "Dialogs.c" +#line 7176 "Dialogs.c" } #line 743 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp11_ = count; + _tmp8_ = count; #line 743 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp11_ == 1) { + if (_tmp8_ == 1) { #line 743 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp10_ = _ ("Revert External Edit?"); -#line 7381 "Dialogs.c" + _tmp7_ = _ ("Revert External Edit?"); +#line 7184 "Dialogs.c" } else { #line 743 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp10_ = _ ("Revert External Edits?"); -#line 7385 "Dialogs.c" + _tmp7_ = _ ("Revert External Edits?"); +#line 7188 "Dialogs.c" } #line 743 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp12_ = g_strdup (_tmp10_); + _tmp9_ = g_strdup (_tmp7_); #line 743 "/home/jens/Source/shotwell/src/Dialogs.vala" - headline = _tmp12_; + headline = _tmp9_; #line 744 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp13_ = count; + _tmp10_ = count; #line 744 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp14_ = count; + _tmp11_ = count; #line 744 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp15_ = g_strdup_printf (ngettext ("This will destroy all changes made to the external file. Continue?", "This will destroy all changes made to %d external files. Continue?", (gulong) _tmp13_), _tmp14_); + _tmp12_ = g_strdup_printf (ngettext ("This will destroy all changes made to the external file. Continue?", "This will destroy all changes made to %d external files. Continue?", (gulong) _tmp10_), _tmp11_); #line 744 "/home/jens/Source/shotwell/src/Dialogs.vala" - msg = _tmp15_; + msg = _tmp12_; #line 749 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp17_ = count; + _tmp14_ = count; #line 749 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp17_ == 1) { + if (_tmp14_ == 1) { #line 749 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp16_ = _ ("Re_vert External Edit"); -#line 7405 "Dialogs.c" + _tmp13_ = _ ("Re_vert External Edit"); +#line 7208 "Dialogs.c" } else { #line 749 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp16_ = _ ("Re_vert External Edits"); -#line 7409 "Dialogs.c" + _tmp13_ = _ ("Re_vert External Edits"); +#line 7212 "Dialogs.c" } #line 749 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp18_ = g_strdup (_tmp16_); + _tmp15_ = g_strdup (_tmp13_); #line 749 "/home/jens/Source/shotwell/src/Dialogs.vala" - action = _tmp18_; + action = _tmp15_; #line 751 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp19_ = owner; + _tmp16_ = msg; #line 751 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp20_ = msg; + _tmp17_ = (GtkMessageDialog*) gtk_message_dialog_new (owner, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp16_); #line 751 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp21_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp19_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp20_); + g_object_ref_sink (_tmp17_); #line 751 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_object_ref_sink (_tmp21_); -#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala" - dialog = _tmp21_; + dialog = _tmp17_; #line 753 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp22_ = dialog; + _tmp18_ = dialog; #line 753 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_dialog_get_type (), GtkDialog), _ ("_Cancel"), (gint) GTK_RESPONSE_CANCEL); + gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_dialog_get_type (), GtkDialog), _ ("_Cancel"), (gint) GTK_RESPONSE_CANCEL); #line 754 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp23_ = dialog; + _tmp19_ = dialog; #line 754 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp24_ = action; + _tmp20_ = action; #line 754 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_dialog_get_type (), GtkDialog), _tmp24_, (gint) GTK_RESPONSE_YES); + gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_dialog_get_type (), GtkDialog), _tmp20_, (gint) GTK_RESPONSE_YES); #line 756 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp25_ = dialog; + _tmp21_ = dialog; #line 756 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp26_ = headline; + _tmp22_ = headline; #line 756 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp27_ = msg; + _tmp23_ = msg; #line 756 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp28_ = build_alert_body_text (_tmp26_, _tmp27_, TRUE); + _tmp24_ = build_alert_body_text (_tmp22_, _tmp23_, TRUE); #line 756 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp29_ = _tmp28_; + _tmp25_ = _tmp24_; #line 756 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_message_dialog_set_markup (_tmp25_, _tmp29_); + gtk_message_dialog_set_markup (_tmp21_, _tmp25_); #line 756 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp29_); -#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp30_ = dialog; + _g_free0 (_tmp25_); #line 758 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp31_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_dialog_get_type (), GtkDialog)); + _tmp26_ = dialog; #line 758 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_ = (GtkResponseType) _tmp31_; + _result_ = (GtkResponseType) gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_dialog_get_type (), GtkDialog)); #line 760 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp32_ = dialog; + _tmp27_ = dialog; #line 760 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget)); #line 762 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp33_ = _result_; + _tmp28_ = _result_; #line 762 "/home/jens/Source/shotwell/src/Dialogs.vala" - result = _tmp33_ == GTK_RESPONSE_YES; + result = _tmp28_ == GTK_RESPONSE_YES; #line 762 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (dialog); #line 762 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -7483,125 +7282,111 @@ gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos) { _g_free0 (headline); #line 762 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 7473 "Dialogs.c" +#line 7272 "Dialogs.c" } -gboolean remove_offline_dialog (GtkWindow* owner, gint count) { +gboolean +remove_offline_dialog (GtkWindow* owner, + gint count) +{ gboolean result = FALSE; - gint _tmp0_; gchar* msg = NULL; - gint _tmp1_; - gint _tmp2_; - gchar* _tmp3_; + gchar* _tmp0_; GtkMessageDialog* dialog = NULL; - GtkWindow* _tmp4_; - const gchar* _tmp5_; + const gchar* _tmp1_; + GtkMessageDialog* _tmp2_; + GtkMessageDialog* _tmp3_; + GtkMessageDialog* _tmp4_; + const gchar* _tmp5_ = NULL; GtkMessageDialog* _tmp6_; + GtkResponseType _result_ = 0; GtkMessageDialog* _tmp7_; GtkMessageDialog* _tmp8_; - const gchar* _tmp9_ = NULL; - gint _tmp10_; - GtkMessageDialog* _tmp11_; - GtkResponseType _result_ = 0; - GtkMessageDialog* _tmp12_; - gint _tmp13_; - GtkMessageDialog* _tmp14_; - GtkResponseType _tmp15_; + GtkResponseType _tmp9_; #line 765 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (GTK_IS_WINDOW (owner), FALSE); #line 766 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = count; -#line 766 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp0_ == 0) { + if (count == 0) { #line 767 "/home/jens/Source/shotwell/src/Dialogs.vala" result = FALSE; #line 767 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 7508 "Dialogs.c" +#line 7302 "Dialogs.c" } #line 769 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = count; -#line 769 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = count; -#line 769 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = g_strdup_printf (ngettext ("This will remove the photo from the library. Continue?", "This will remove %d photos from the library. Continue?", (gulong) _tmp1_), _tmp2_); + _tmp0_ = g_strdup_printf (ngettext ("This will remove the photo from the library. Continue?", "This will remove %d photos from the library. Continue?", (gulong) count), count); #line 769 "/home/jens/Source/shotwell/src/Dialogs.vala" - msg = _tmp3_; -#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = owner; + msg = _tmp0_; #line 774 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = msg; + _tmp1_ = msg; #line 774 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp4_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp5_); + _tmp2_ = (GtkMessageDialog*) gtk_message_dialog_new (owner, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp1_); #line 774 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_object_ref_sink (_tmp6_); + g_object_ref_sink (_tmp2_); #line 774 "/home/jens/Source/shotwell/src/Dialogs.vala" - dialog = _tmp6_; + dialog = _tmp2_; #line 776 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = dialog; + _tmp3_ = dialog; #line 776 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_dialog_get_type (), GtkDialog), _ ("_Cancel"), (gint) GTK_RESPONSE_CANCEL); + gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_dialog_get_type (), GtkDialog), _ ("_Cancel"), (gint) GTK_RESPONSE_CANCEL); #line 777 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = dialog; + _tmp4_ = dialog; #line 777 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_dialog_get_type (), GtkDialog), _ ("_Remove"), (gint) GTK_RESPONSE_OK); -#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp10_ = count; + gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_dialog_get_type (), GtkDialog), _ ("_Remove"), (gint) GTK_RESPONSE_OK); #line 778 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp10_ == 1) { + if (count == 1) { #line 778 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9_ = _ ("Remove Photo From Library"); -#line 7542 "Dialogs.c" + _tmp5_ = _ ("Remove Photo From Library"); +#line 7328 "Dialogs.c" } else { #line 778 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9_ = _ ("Remove Photos From Library"); -#line 7546 "Dialogs.c" + _tmp5_ = _ ("Remove Photos From Library"); +#line 7332 "Dialogs.c" } #line 778 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp11_ = dialog; + _tmp6_ = dialog; #line 778 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow), _tmp9_); -#line 780 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp12_ = dialog; + gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp5_); #line 780 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp13_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_dialog_get_type (), GtkDialog)); + _tmp7_ = dialog; #line 780 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_ = (GtkResponseType) _tmp13_; + _result_ = (GtkResponseType) gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_dialog_get_type (), GtkDialog)); #line 782 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp14_ = dialog; + _tmp8_ = dialog; #line 782 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget)); #line 784 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp15_ = _result_; + _tmp9_ = _result_; #line 784 "/home/jens/Source/shotwell/src/Dialogs.vala" - result = _tmp15_ == GTK_RESPONSE_OK; + result = _tmp9_ == GTK_RESPONSE_OK; #line 784 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (dialog); #line 784 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (msg); #line 784 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 7572 "Dialogs.c" +#line 7356 "Dialogs.c" } -void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message, const gchar* title) { +void +multiple_object_error_dialog (GeeArrayList* objects, + const gchar* message, + const gchar* title) +{ gchar* dialog_message = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; gint remainder = 0; - GeeArrayList* _tmp20_; - gint _tmp21_; - gint _tmp22_; - gint _tmp23_; + gint _tmp17_; + gint _tmp18_; + gint _tmp19_; GtkMessageDialog* dialog = NULL; - AppWindow* _tmp30_; - AppWindow* _tmp31_; - const gchar* _tmp32_; - GtkMessageDialog* _tmp33_; - GtkMessageDialog* _tmp34_; - const gchar* _tmp35_; + AppWindow* _tmp26_; + AppWindow* _tmp27_; + const gchar* _tmp28_; + GtkMessageDialog* _tmp29_; + GtkMessageDialog* _tmp30_; #line 788 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_if_fail (GEE_IS_ARRAY_LIST (objects)); #line 788 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -7609,172 +7394,160 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message, #line 788 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_if_fail (title != NULL); #line 790 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = message; + _tmp0_ = g_strconcat (message, "\n", NULL); #line 790 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = g_strconcat (_tmp0_, "\n", NULL); -#line 790 "/home/jens/Source/shotwell/src/Dialogs.vala" - dialog_message = _tmp1_; -#line 7604 "Dialogs.c" + dialog_message = _tmp0_; +#line 7387 "Dialogs.c" { gint i = 0; #line 793 "/home/jens/Source/shotwell/src/Dialogs.vala" i = 0; -#line 7609 "Dialogs.c" +#line 7392 "Dialogs.c" { - gboolean _tmp2_ = FALSE; + gboolean _tmp1_ = FALSE; #line 793 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = TRUE; + _tmp1_ = TRUE; #line 793 "/home/jens/Source/shotwell/src/Dialogs.vala" while (TRUE) { -#line 7616 "Dialogs.c" - gboolean _tmp4_ = FALSE; - gint _tmp5_; - const gchar* _tmp10_; - GeeArrayList* _tmp11_; - gint _tmp12_; - gpointer _tmp13_; - DataObject* _tmp14_; +#line 7399 "Dialogs.c" + gboolean _tmp3_ = FALSE; + gint _tmp4_; + const gchar* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + DataObject* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; gchar* _tmp15_; gchar* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; #line 793 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (!_tmp2_) { -#line 7631 "Dialogs.c" - gint _tmp3_; + if (!_tmp1_) { +#line 7413 "Dialogs.c" + gint _tmp2_; #line 793 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = i; + _tmp2_ = i; #line 793 "/home/jens/Source/shotwell/src/Dialogs.vala" - i = _tmp3_ + 1; -#line 7637 "Dialogs.c" + i = _tmp2_ + 1; +#line 7419 "Dialogs.c" } #line 793 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = FALSE; + _tmp1_ = FALSE; #line 793 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = i; + _tmp4_ = i; #line 793 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp5_ < MAX_OBJECTS_DISPLAYED) { -#line 7645 "Dialogs.c" - GeeArrayList* _tmp6_; + if (_tmp4_ < MAX_OBJECTS_DISPLAYED) { +#line 7427 "Dialogs.c" + gint _tmp5_; + gint _tmp6_; gint _tmp7_; - gint _tmp8_; - gint _tmp9_; -#line 793 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = objects; #line 793 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (objects, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 793 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 793 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9_ = i; + _tmp7_ = i; #line 793 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = _tmp8_ > _tmp9_; -#line 7660 "Dialogs.c" + _tmp3_ = _tmp6_ > _tmp7_; +#line 7439 "Dialogs.c" } else { #line 793 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = FALSE; -#line 7664 "Dialogs.c" + _tmp3_ = FALSE; +#line 7443 "Dialogs.c" } #line 793 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (!_tmp4_) { + if (!_tmp3_) { #line 793 "/home/jens/Source/shotwell/src/Dialogs.vala" break; -#line 7670 "Dialogs.c" +#line 7449 "Dialogs.c" } #line 794 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp10_ = dialog_message; + _tmp8_ = dialog_message; #line 794 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp11_ = objects; + _tmp9_ = i; #line 794 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp12_ = i; + _tmp10_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (objects, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp9_); #line 794 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp13_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp12_); + _tmp11_ = (DataObject*) _tmp10_; #line 794 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp14_ = (DataObject*) _tmp13_; + _tmp12_ = data_object_to_string (_tmp11_); #line 794 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp15_ = data_object_to_string (_tmp14_); + _tmp13_ = _tmp12_; #line 794 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp16_ = _tmp15_; + _tmp14_ = g_strconcat ("\n", _tmp13_, NULL); #line 794 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp17_ = g_strconcat ("\n", _tmp16_, NULL); + _tmp15_ = _tmp14_; #line 794 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp18_ = _tmp17_; -#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp19_ = g_strconcat (_tmp10_, _tmp18_, NULL); + _tmp16_ = g_strconcat (_tmp8_, _tmp15_, NULL); #line 794 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (dialog_message); #line 794 "/home/jens/Source/shotwell/src/Dialogs.vala" - dialog_message = _tmp19_; + dialog_message = _tmp16_; #line 794 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp15_); #line 794 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp13_); #line 794 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_object_unref0 (_tmp14_); -#line 7702 "Dialogs.c" + _g_object_unref0 (_tmp11_); +#line 7479 "Dialogs.c" } } } #line 796 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp20_ = objects; -#line 796 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (objects, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 796 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp22_ = _tmp21_; + _tmp18_ = _tmp17_; #line 796 "/home/jens/Source/shotwell/src/Dialogs.vala" - remainder = _tmp22_ - MAX_OBJECTS_DISPLAYED; + remainder = _tmp18_ - MAX_OBJECTS_DISPLAYED; #line 797 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp23_ = remainder; + _tmp19_ = remainder; #line 797 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp23_ > 0) { -#line 7718 "Dialogs.c" - const gchar* _tmp24_; - gint _tmp25_; - gint _tmp26_; - gchar* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; + if (_tmp19_ > 0) { +#line 7493 "Dialogs.c" + const gchar* _tmp20_; + gint _tmp21_; + gint _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; #line 798 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp24_ = dialog_message; + _tmp20_ = dialog_message; #line 798 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp25_ = remainder; + _tmp21_ = remainder; #line 798 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp26_ = remainder; + _tmp22_ = remainder; #line 798 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp27_ = g_strdup_printf (ngettext ("\n\nAnd %d other.", "\n\nAnd %d others.", (gulong) _tmp25_), _tmp26_); + _tmp23_ = g_strdup_printf (ngettext ("\n\nAnd %d other.", "\n\nAnd %d others.", (gulong) _tmp21_), _tmp22_); #line 798 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp28_ = _tmp27_; + _tmp24_ = _tmp23_; #line 798 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp29_ = g_strconcat (_tmp24_, _tmp28_, NULL); + _tmp25_ = g_strconcat (_tmp20_, _tmp24_, NULL); #line 798 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (dialog_message); #line 798 "/home/jens/Source/shotwell/src/Dialogs.vala" - dialog_message = _tmp29_; + dialog_message = _tmp25_; #line 798 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp28_); -#line 7743 "Dialogs.c" + _g_free0 (_tmp24_); +#line 7518 "Dialogs.c" } #line 802 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp30_ = app_window_get_instance (); + _tmp26_ = app_window_get_instance (); #line 802 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp31_ = _tmp30_; + _tmp27_ = _tmp26_; #line 802 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp32_ = dialog_message; + _tmp28_ = dialog_message; #line 802 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp33_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp32_); + _tmp29_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp28_); #line 802 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_object_ref_sink (_tmp33_); + g_object_ref_sink (_tmp29_); #line 802 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp34_ = _tmp33_; + _tmp30_ = _tmp29_; #line 802 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_object_unref0 (_tmp31_); + _g_object_unref0 (_tmp27_); #line 802 "/home/jens/Source/shotwell/src/Dialogs.vala" - dialog = _tmp34_; -#line 805 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp35_ = title; + dialog = _tmp30_; #line 805 "/home/jens/Source/shotwell/src/Dialogs.vala" - gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), _tmp35_); + gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), title); #line 807 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog)); #line 808 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -7783,61 +7556,63 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message, _g_object_unref0 (dialog); #line 788 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (dialog_message); -#line 7773 "Dialogs.c" +#line 7546 "Dialogs.c" } -TagsDialog* tags_dialog_construct (GType object_type, const gchar* title, const gchar* label, const gchar* initial_text) { +TagsDialog* +tags_dialog_construct (GType object_type, + const gchar* title, + const gchar* label, + const gchar* initial_text) +{ TagsDialog* self = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - HierarchicalTagIndex* _tmp3_; - HierarchicalTagIndex* _tmp4_; - GeeCollection* _tmp5_; - GeeCollection* _tmp6_; + HierarchicalTagIndex* _tmp0_; + HierarchicalTagIndex* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; #line 812 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (title != NULL, NULL); #line 812 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (label != NULL, NULL); #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = title; -#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = label; + _tmp0_ = hierarchical_tag_index_get_global_index (); #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = initial_text; -#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = hierarchical_tag_index_get_global_index (); -#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = _tmp3_; + _tmp1_ = _tmp0_; #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = hierarchical_tag_index_get_all_tags (_tmp4_); + _tmp2_ = hierarchical_tag_index_get_all_tags (_tmp1_); #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala" - self = (TagsDialog*) text_entry_dialog_mediator_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp6_, ","); + self = (TagsDialog*) text_entry_dialog_mediator_construct (object_type, title, label, initial_text, _tmp3_, ","); #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp3_); #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala" - _hierarchical_tag_index_unref0 (_tmp4_); + _hierarchical_tag_index_unref0 (_tmp1_); #line 812 "/home/jens/Source/shotwell/src/Dialogs.vala" return self; -#line 7812 "Dialogs.c" +#line 7581 "Dialogs.c" } -static void tags_dialog_class_init (TagsDialogClass * klass) { +static void +tags_dialog_class_init (TagsDialogClass * klass) +{ #line 811 "/home/jens/Source/shotwell/src/Dialogs.vala" tags_dialog_parent_class = g_type_class_peek_parent (klass); -#line 7819 "Dialogs.c" +#line 7590 "Dialogs.c" } -static void tags_dialog_instance_init (TagsDialog * self) { +static void +tags_dialog_instance_init (TagsDialog * self) +{ } -GType tags_dialog_get_type (void) { +GType +tags_dialog_get_type (void) +{ static volatile gsize tags_dialog_type_id__volatile = 0; if (g_once_init_enter (&tags_dialog_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TagsDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tags_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TagsDialog), 0, (GInstanceInitFunc) tags_dialog_instance_init, NULL }; @@ -7849,7 +7624,9 @@ GType tags_dialog_get_type (void) { } -AddTagsDialog* add_tags_dialog_construct (GType object_type) { +AddTagsDialog* +add_tags_dialog_construct (GType object_type) +{ AddTagsDialog* self = NULL; gchar* title = NULL; gchar* _tmp0_; @@ -7863,18 +7640,23 @@ AddTagsDialog* add_tags_dialog_construct (GType object_type) { _g_free0 (title); #line 819 "/home/jens/Source/shotwell/src/Dialogs.vala" return self; -#line 7853 "Dialogs.c" +#line 7630 "Dialogs.c" } -AddTagsDialog* add_tags_dialog_new (void) { +AddTagsDialog* +add_tags_dialog_new (void) +{ #line 819 "/home/jens/Source/shotwell/src/Dialogs.vala" return add_tags_dialog_construct (TYPE_ADD_TAGS_DIALOG); -#line 7860 "Dialogs.c" +#line 7639 "Dialogs.c" } -gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1) { +gchar** +add_tags_dialog_execute (AddTagsDialog* self, + int* result_length1) +{ gchar** result = NULL; gchar* text = NULL; gchar* _tmp0_; @@ -7900,7 +7682,7 @@ gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1) { _tmp1_ = text; #line 827 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp1_ == NULL) { -#line 7890 "Dialogs.c" +#line 7672 "Dialogs.c" gchar** _tmp2_; gint _tmp2__length1; #line 828 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -7911,7 +7693,7 @@ gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1) { if (result_length1) { #line 828 "/home/jens/Source/shotwell/src/Dialogs.vala" *result_length1 = _tmp2__length1; -#line 7901 "Dialogs.c" +#line 7683 "Dialogs.c" } #line 828 "/home/jens/Source/shotwell/src/Dialogs.vala" result = _tmp2_; @@ -7919,7 +7701,7 @@ gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1) { _g_free0 (text); #line 828 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 7909 "Dialogs.c" +#line 7691 "Dialogs.c" } #line 832 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp3_ = text; @@ -7945,7 +7727,7 @@ gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1) { if (result_length1) { #line 832 "/home/jens/Source/shotwell/src/Dialogs.vala" *result_length1 = _tmp10__length1; -#line 7935 "Dialogs.c" +#line 7717 "Dialogs.c" } #line 832 "/home/jens/Source/shotwell/src/Dialogs.vala" result = _tmp10_; @@ -7953,115 +7735,115 @@ gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1) { _g_free0 (text); #line 832 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 7943 "Dialogs.c" +#line 7725 "Dialogs.c" } -static gboolean string_contains (const gchar* self, const gchar* needle) { +static gboolean +string_contains (const gchar* self, + const gchar* needle) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gchar* _tmp1_; -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = needle; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_ != NULL; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = strstr ((gchar*) self, (gchar*) needle); +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_ != NULL; +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 7963 "Dialogs.c" +#line 7745 "Dialogs.c" } -static gboolean add_tags_dialog_real_on_modify_validate (TextEntryDialogMediator* base, const gchar* text) { +static gboolean +add_tags_dialog_real_on_modify_validate (TextEntryDialogMediator* base, + const gchar* text) +{ AddTagsDialog * self; gboolean result = FALSE; - const gchar* _tmp0_; - gboolean _tmp1_; gchar** names = NULL; - const gchar* _tmp2_; - gchar** _tmp3_; + gchar** _tmp0_; + gchar** _tmp1_; + gchar** _tmp2_; + gint _tmp2__length1; + gint _tmp3_; gchar** _tmp4_; gchar** _tmp5_; gint _tmp5__length1; - gint _tmp6_; - gchar** _tmp7_; - gchar** _tmp8_; - gint _tmp8__length1; gint names_length1; gint _names_size_; - gchar** _tmp9_; - gint _tmp9__length1; + gchar** _tmp6_; + gint _tmp6__length1; #line 835 "/home/jens/Source/shotwell/src/Dialogs.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADD_TAGS_DIALOG, AddTagsDialog); #line 835 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (text != NULL, FALSE); #line 836 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = text; -#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = string_contains (_tmp0_, TAG_PATH_SEPARATOR_STRING); -#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp1_) { + if (string_contains (text, TAG_PATH_SEPARATOR_STRING)) { #line 837 "/home/jens/Source/shotwell/src/Dialogs.vala" result = FALSE; #line 837 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 8000 "Dialogs.c" +#line 7778 "Dialogs.c" } #line 841 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = text; -#line 841 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = _tmp3_ = g_strsplit (_tmp2_, ",", 0); + _tmp1_ = _tmp0_ = g_strsplit (text, ",", 0); #line 841 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 841 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5__length1 = _vala_array_length (_tmp3_); + _tmp2__length1 = _vala_array_length (_tmp0_); #line 841 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = tag_prep_tag_names (_tmp5_, _vala_array_length (_tmp3_), &_tmp6_); + _tmp4_ = tag_prep_tag_names (_tmp2_, _vala_array_length (_tmp0_), &_tmp3_); #line 841 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = _tmp7_; + _tmp5_ = _tmp4_; #line 841 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8__length1 = _tmp6_; + _tmp5__length1 = _tmp3_; #line 841 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = (_vala_array_free (_tmp5_, _tmp5__length1, (GDestroyNotify) g_free), NULL); + _tmp2_ = (_vala_array_free (_tmp2_, _tmp2__length1, (GDestroyNotify) g_free), NULL); #line 841 "/home/jens/Source/shotwell/src/Dialogs.vala" - names = _tmp8_; + names = _tmp5_; #line 841 "/home/jens/Source/shotwell/src/Dialogs.vala" - names_length1 = _tmp8__length1; + names_length1 = _tmp5__length1; #line 841 "/home/jens/Source/shotwell/src/Dialogs.vala" _names_size_ = names_length1; #line 843 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9_ = names; + _tmp6_ = names; #line 843 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9__length1 = names_length1; + _tmp6__length1 = names_length1; #line 843 "/home/jens/Source/shotwell/src/Dialogs.vala" - result = _tmp9__length1 > 0; + result = _tmp6__length1 > 0; #line 843 "/home/jens/Source/shotwell/src/Dialogs.vala" names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL); #line 843 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 8034 "Dialogs.c" +#line 7810 "Dialogs.c" } -static void add_tags_dialog_class_init (AddTagsDialogClass * klass) { +static void +add_tags_dialog_class_init (AddTagsDialogClass * klass) +{ #line 818 "/home/jens/Source/shotwell/src/Dialogs.vala" add_tags_dialog_parent_class = g_type_class_peek_parent (klass); #line 818 "/home/jens/Source/shotwell/src/Dialogs.vala" ((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*) (TextEntryDialogMediator *, const gchar*)) add_tags_dialog_real_on_modify_validate; -#line 8043 "Dialogs.c" +#line 7821 "Dialogs.c" } -static void add_tags_dialog_instance_init (AddTagsDialog * self) { +static void +add_tags_dialog_instance_init (AddTagsDialog * self) +{ } -GType add_tags_dialog_get_type (void) { +GType +add_tags_dialog_get_type (void) +{ static volatile gsize add_tags_dialog_type_id__volatile = 0; if (g_once_init_enter (&add_tags_dialog_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (AddTagsDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) add_tags_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (AddTagsDialog), 0, (GInstanceInitFunc) add_tags_dialog_instance_init, NULL }; @@ -8073,232 +7855,227 @@ GType add_tags_dialog_get_type (void) { } -ModifyTagsDialog* modify_tags_dialog_construct (GType object_type, MediaSource* source) { +ModifyTagsDialog* +modify_tags_dialog_construct (GType object_type, + MediaSource* source) +{ ModifyTagsDialog* self = NULL; - MediaSource* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; #line 848 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL); #line 849 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = source; + _tmp0_ = modify_tags_dialog_get_initial_text (source); #line 849 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = modify_tags_dialog_get_initial_text (_tmp0_); -#line 849 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 849 "/home/jens/Source/shotwell/src/Dialogs.vala" - self = (ModifyTagsDialog*) tags_dialog_construct (object_type, RESOURCES_MODIFY_TAGS_LABEL, _ ("Tags (separated by commas):"), _tmp2_); + self = (ModifyTagsDialog*) tags_dialog_construct (object_type, RESOURCES_MODIFY_TAGS_LABEL, _ ("Tags (separated by commas):"), _tmp1_); #line 849 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 848 "/home/jens/Source/shotwell/src/Dialogs.vala" return self; -#line 8082 "Dialogs.c" +#line 7864 "Dialogs.c" } -ModifyTagsDialog* modify_tags_dialog_new (MediaSource* source) { +ModifyTagsDialog* +modify_tags_dialog_new (MediaSource* source) +{ #line 848 "/home/jens/Source/shotwell/src/Dialogs.vala" return modify_tags_dialog_construct (TYPE_MODIFY_TAGS_DIALOG, source); -#line 8089 "Dialogs.c" +#line 7873 "Dialogs.c" } -static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) { +static gchar* +modify_tags_dialog_get_initial_text (MediaSource* source) +{ gchar* result = NULL; GeeCollection* source_tags = NULL; TagSourceCollection* _tmp0_; - MediaSource* _tmp1_; - GeeList* _tmp2_; - GeeCollection* _tmp3_; + GeeList* _tmp1_; + GeeCollection* _tmp2_; GeeCollection* terminal_tags = NULL; + GeeCollection* _tmp3_; GeeCollection* _tmp4_; - GeeCollection* _tmp5_; GeeSortedSet* tag_basenames = NULL; - GeeTreeSet* _tmp6_; + GeeTreeSet* _tmp5_; gchar* text = NULL; #line 853 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL); #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp0_ = tag_global; #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = source; -#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = tag_source_collection_fetch_for_source (_tmp0_, _tmp1_); + _tmp1_ = tag_source_collection_fetch_for_source (_tmp0_, source); #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala" - source_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); + source_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); #line 855 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = source_tags; + _tmp2_ = source_tags; #line 855 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 856 "/home/jens/Source/shotwell/src/Dialogs.vala" result = NULL; #line 856 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (source_tags); #line 856 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 8126 "Dialogs.c" +#line 7909 "Dialogs.c" } #line 858 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = source_tags; + _tmp3_ = source_tags; #line 858 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = tag_get_terminal_tags (_tmp4_); + _tmp4_ = tag_get_terminal_tags (_tmp3_); #line 858 "/home/jens/Source/shotwell/src/Dialogs.vala" - terminal_tags = _tmp5_; + terminal_tags = _tmp4_; #line 860 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp5_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 860 "/home/jens/Source/shotwell/src/Dialogs.vala" - tag_basenames = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_SORTED_SET, GeeSortedSet); -#line 8138 "Dialogs.c" + tag_basenames = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_SORTED_SET, GeeSortedSet); +#line 7921 "Dialogs.c" { GeeIterator* _tag_it = NULL; - GeeCollection* _tmp7_; - GeeIterator* _tmp8_; + GeeCollection* _tmp6_; + GeeIterator* _tmp7_; #line 861 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = terminal_tags; + _tmp6_ = terminal_tags; #line 861 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 861 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tag_it = _tmp8_; + _tag_it = _tmp7_; #line 861 "/home/jens/Source/shotwell/src/Dialogs.vala" while (TRUE) { -#line 8151 "Dialogs.c" - GeeIterator* _tmp9_; - gboolean _tmp10_; +#line 7934 "Dialogs.c" + GeeIterator* _tmp8_; Tag* tag = NULL; - GeeIterator* _tmp11_; - gpointer _tmp12_; - GeeSortedSet* _tmp13_; - Tag* _tmp14_; + GeeIterator* _tmp9_; + gpointer _tmp10_; + GeeSortedSet* _tmp11_; + Tag* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; gchar* _tmp15_; gchar* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; -#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9_ = _tag_it; #line 861 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp10_ = gee_iterator_next (_tmp9_); + _tmp8_ = _tag_it; #line 861 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (!_tmp10_) { + if (!gee_iterator_next (_tmp8_)) { #line 861 "/home/jens/Source/shotwell/src/Dialogs.vala" break; -#line 8171 "Dialogs.c" +#line 7951 "Dialogs.c" } #line 861 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp11_ = _tag_it; + _tmp9_ = _tag_it; #line 861 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp12_ = gee_iterator_get (_tmp11_); + _tmp10_ = gee_iterator_get (_tmp9_); #line 861 "/home/jens/Source/shotwell/src/Dialogs.vala" - tag = (Tag*) _tmp12_; + tag = (Tag*) _tmp10_; #line 862 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp13_ = tag_basenames; + _tmp11_ = tag_basenames; #line 862 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp14_ = tag; + _tmp12_ = tag; #line 862 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp15_ = tag_get_path (_tmp14_); + _tmp13_ = tag_get_path (_tmp12_); #line 862 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp16_ = _tmp15_; -#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp17_ = hierarchical_tag_utilities_get_basename (_tmp16_); + _tmp14_ = _tmp13_; #line 862 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp18_ = _tmp17_; + _tmp15_ = hierarchical_tag_utilities_get_basename (_tmp14_); #line 862 "/home/jens/Source/shotwell/src/Dialogs.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp18_); + _tmp16_ = _tmp15_; #line 862 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_free0 (_tmp18_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection), _tmp16_); #line 862 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (_tmp16_); +#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala" + _g_free0 (_tmp14_); #line 861 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (tag); -#line 8199 "Dialogs.c" +#line 7979 "Dialogs.c" } #line 861 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_tag_it); -#line 8203 "Dialogs.c" +#line 7983 "Dialogs.c" } #line 864 "/home/jens/Source/shotwell/src/Dialogs.vala" text = NULL; -#line 8207 "Dialogs.c" +#line 7987 "Dialogs.c" { GeeIterator* _name_it = NULL; - GeeSortedSet* _tmp19_; - GeeIterator* _tmp20_; + GeeSortedSet* _tmp17_; + GeeIterator* _tmp18_; #line 865 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp19_ = tag_basenames; + _tmp17_ = tag_basenames; #line 865 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable)); #line 865 "/home/jens/Source/shotwell/src/Dialogs.vala" - _name_it = _tmp20_; + _name_it = _tmp18_; #line 865 "/home/jens/Source/shotwell/src/Dialogs.vala" while (TRUE) { -#line 8220 "Dialogs.c" - GeeIterator* _tmp21_; - gboolean _tmp22_; +#line 8000 "Dialogs.c" + GeeIterator* _tmp19_; gchar* name = NULL; - GeeIterator* _tmp23_; - gpointer _tmp24_; - const gchar* _tmp25_; - const gchar* _tmp29_; - const gchar* _tmp30_; - gchar* _tmp31_; -#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp21_ = _name_it; + GeeIterator* _tmp20_; + gpointer _tmp21_; + const gchar* _tmp22_; + const gchar* _tmp26_; + const gchar* _tmp27_; + gchar* _tmp28_; #line 865 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp22_ = gee_iterator_next (_tmp21_); + _tmp19_ = _name_it; #line 865 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (!_tmp22_) { + if (!gee_iterator_next (_tmp19_)) { #line 865 "/home/jens/Source/shotwell/src/Dialogs.vala" break; -#line 8238 "Dialogs.c" +#line 8015 "Dialogs.c" } #line 865 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp23_ = _name_it; + _tmp20_ = _name_it; #line 865 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp24_ = gee_iterator_get (_tmp23_); + _tmp21_ = gee_iterator_get (_tmp20_); #line 865 "/home/jens/Source/shotwell/src/Dialogs.vala" - name = (gchar*) _tmp24_; + name = (gchar*) _tmp21_; #line 866 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp25_ = text; + _tmp22_ = text; #line 866 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp25_ == NULL) { -#line 8250 "Dialogs.c" - gchar* _tmp26_; + if (_tmp22_ == NULL) { +#line 8027 "Dialogs.c" + gchar* _tmp23_; #line 867 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp26_ = g_strdup (""); + _tmp23_ = g_strdup (""); #line 867 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (text); #line 867 "/home/jens/Source/shotwell/src/Dialogs.vala" - text = _tmp26_; -#line 8258 "Dialogs.c" + text = _tmp23_; +#line 8035 "Dialogs.c" } else { - const gchar* _tmp27_; - gchar* _tmp28_; + const gchar* _tmp24_; + gchar* _tmp25_; #line 869 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp27_ = text; + _tmp24_ = text; #line 869 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp28_ = g_strconcat (_tmp27_, ", ", NULL); + _tmp25_ = g_strconcat (_tmp24_, ", ", NULL); #line 869 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (text); #line 869 "/home/jens/Source/shotwell/src/Dialogs.vala" - text = _tmp28_; -#line 8270 "Dialogs.c" + text = _tmp25_; +#line 8047 "Dialogs.c" } #line 871 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp29_ = text; + _tmp26_ = text; #line 871 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp30_ = name; + _tmp27_ = name; #line 871 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp31_ = g_strconcat (_tmp29_, _tmp30_, NULL); + _tmp28_ = g_strconcat (_tmp26_, _tmp27_, NULL); #line 871 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (text); #line 871 "/home/jens/Source/shotwell/src/Dialogs.vala" - text = _tmp31_; + text = _tmp28_; #line 865 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (name); -#line 8284 "Dialogs.c" +#line 8061 "Dialogs.c" } #line 865 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_name_it); -#line 8288 "Dialogs.c" +#line 8065 "Dialogs.c" } #line 874 "/home/jens/Source/shotwell/src/Dialogs.vala" result = text; @@ -8310,11 +8087,13 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) { _g_object_unref0 (source_tags); #line 874 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 8300 "Dialogs.c" +#line 8077 "Dialogs.c" } -GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self) { +GeeArrayList* +modify_tags_dialog_execute (ModifyTagsDialog* self) +{ GeeArrayList* result = NULL; gchar* text = NULL; gchar* _tmp0_; @@ -8322,27 +8101,26 @@ GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self) { GeeArrayList* new_tags = NULL; GeeArrayList* _tmp2_; const gchar* _tmp3_; - gboolean _tmp4_; gchar** tag_names = NULL; - const gchar* _tmp5_; + const gchar* _tmp4_; + gchar** _tmp5_; gchar** _tmp6_; gchar** _tmp7_; - gchar** _tmp8_; - gint _tmp8__length1; - gint _tmp9_; + gint _tmp7__length1; + gint _tmp8_; + gchar** _tmp9_; gchar** _tmp10_; - gchar** _tmp11_; - gint _tmp11__length1; + gint _tmp10__length1; gint tag_names_length1; gint _tag_names_size_; + HierarchicalTagIndex* _tmp11_; HierarchicalTagIndex* _tmp12_; - HierarchicalTagIndex* _tmp13_; - gchar** _tmp14_; - gint _tmp14__length1; - gint _tmp15_; + gchar** _tmp13_; + gint _tmp13__length1; + gint _tmp14_; + gchar** _tmp15_; gchar** _tmp16_; - gchar** _tmp17_; - gint _tmp17__length1; + gint _tmp16__length1; #line 877 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (IS_MODIFY_TAGS_DIALOG (self), NULL); #line 878 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -8359,7 +8137,7 @@ GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self) { _g_free0 (text); #line 880 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 8349 "Dialogs.c" +#line 8127 "Dialogs.c" } #line 882 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp2_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); @@ -8368,103 +8146,101 @@ GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self) { #line 885 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp3_ = text; #line 885 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = is_string_empty (_tmp3_); -#line 885 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp4_) { + if (is_string_empty (_tmp3_)) { #line 886 "/home/jens/Source/shotwell/src/Dialogs.vala" result = new_tags; #line 886 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (text); #line 886 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 8367 "Dialogs.c" +#line 8143 "Dialogs.c" } #line 889 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = text; + _tmp4_ = text; #line 889 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = _tmp6_ = g_strsplit (_tmp5_, ",", 0); + _tmp6_ = _tmp5_ = g_strsplit (_tmp4_, ",", 0); #line 889 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 889 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8__length1 = _vala_array_length (_tmp6_); + _tmp7__length1 = _vala_array_length (_tmp5_); #line 889 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp10_ = tag_prep_tag_names (_tmp8_, _vala_array_length (_tmp6_), &_tmp9_); + _tmp9_ = tag_prep_tag_names (_tmp7_, _vala_array_length (_tmp5_), &_tmp8_); #line 889 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 889 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp11__length1 = _tmp9_; + _tmp10__length1 = _tmp8_; #line 889 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = (_vala_array_free (_tmp8_, _tmp8__length1, (GDestroyNotify) g_free), NULL); + _tmp7_ = (_vala_array_free (_tmp7_, _tmp7__length1, (GDestroyNotify) g_free), NULL); #line 889 "/home/jens/Source/shotwell/src/Dialogs.vala" - tag_names = _tmp11_; + tag_names = _tmp10_; #line 889 "/home/jens/Source/shotwell/src/Dialogs.vala" - tag_names_length1 = _tmp11__length1; + tag_names_length1 = _tmp10__length1; #line 889 "/home/jens/Source/shotwell/src/Dialogs.vala" _tag_names_size_ = tag_names_length1; #line 891 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp12_ = hierarchical_tag_index_get_global_index (); + _tmp11_ = hierarchical_tag_index_get_global_index (); #line 891 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 891 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp14_ = tag_names; + _tmp13_ = tag_names; #line 891 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp14__length1 = tag_names_length1; + _tmp13__length1 = tag_names_length1; #line 891 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp16_ = hierarchical_tag_index_get_paths_for_names_array (_tmp13_, _tmp14_, _tmp14__length1, &_tmp15_); + _tmp15_ = hierarchical_tag_index_get_paths_for_names_array (_tmp12_, _tmp13_, _tmp13__length1, &_tmp14_); #line 891 "/home/jens/Source/shotwell/src/Dialogs.vala" tag_names = (_vala_array_free (tag_names, tag_names_length1, (GDestroyNotify) g_free), NULL); #line 891 "/home/jens/Source/shotwell/src/Dialogs.vala" - tag_names = _tmp16_; + tag_names = _tmp15_; #line 891 "/home/jens/Source/shotwell/src/Dialogs.vala" - tag_names_length1 = _tmp15_; + tag_names_length1 = _tmp14_; #line 891 "/home/jens/Source/shotwell/src/Dialogs.vala" _tag_names_size_ = tag_names_length1; #line 891 "/home/jens/Source/shotwell/src/Dialogs.vala" - _hierarchical_tag_index_unref0 (_tmp13_); + _hierarchical_tag_index_unref0 (_tmp12_); #line 893 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp17_ = tag_names; + _tmp16_ = tag_names; #line 893 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp17__length1 = tag_names_length1; -#line 8415 "Dialogs.c" + _tmp16__length1 = tag_names_length1; +#line 8191 "Dialogs.c" { gchar** name_collection = NULL; gint name_collection_length1 = 0; gint _name_collection_size_ = 0; gint name_it = 0; #line 893 "/home/jens/Source/shotwell/src/Dialogs.vala" - name_collection = _tmp17_; + name_collection = _tmp16_; #line 893 "/home/jens/Source/shotwell/src/Dialogs.vala" - name_collection_length1 = _tmp17__length1; + name_collection_length1 = _tmp16__length1; #line 893 "/home/jens/Source/shotwell/src/Dialogs.vala" - for (name_it = 0; name_it < _tmp17__length1; name_it = name_it + 1) { -#line 8427 "Dialogs.c" - gchar* _tmp18_; + for (name_it = 0; name_it < _tmp16__length1; name_it = name_it + 1) { +#line 8203 "Dialogs.c" + gchar* _tmp17_; gchar* name = NULL; #line 893 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp18_ = g_strdup (name_collection[name_it]); + _tmp17_ = g_strdup (name_collection[name_it]); #line 893 "/home/jens/Source/shotwell/src/Dialogs.vala" - name = _tmp18_; -#line 8434 "Dialogs.c" + name = _tmp17_; +#line 8210 "Dialogs.c" { - GeeArrayList* _tmp19_; - const gchar* _tmp20_; + GeeArrayList* _tmp18_; + const gchar* _tmp19_; + Tag* _tmp20_; Tag* _tmp21_; - Tag* _tmp22_; #line 894 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp19_ = new_tags; + _tmp18_ = new_tags; #line 894 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp20_ = name; + _tmp19_ = name; #line 894 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp21_ = tag_for_path (_tmp20_); + _tmp20_ = tag_for_path (_tmp19_); #line 894 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 894 "/home/jens/Source/shotwell/src/Dialogs.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); #line 894 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_object_unref0 (_tmp22_); + _g_object_unref0 (_tmp21_); #line 893 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (name); -#line 8454 "Dialogs.c" +#line 8230 "Dialogs.c" } } } @@ -8476,45 +8252,48 @@ GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self) { _g_free0 (text); #line 896 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 8466 "Dialogs.c" +#line 8242 "Dialogs.c" } -static gboolean modify_tags_dialog_real_on_modify_validate (TextEntryDialogMediator* base, const gchar* text) { +static gboolean +modify_tags_dialog_real_on_modify_validate (TextEntryDialogMediator* base, + const gchar* text) +{ ModifyTagsDialog * self; gboolean result = FALSE; - const gchar* _tmp0_; - gboolean _tmp1_; #line 899 "/home/jens/Source/shotwell/src/Dialogs.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MODIFY_TAGS_DIALOG, ModifyTagsDialog); #line 899 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (text != NULL, FALSE); #line 900 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = text; -#line 900 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = string_contains (_tmp0_, TAG_PATH_SEPARATOR_STRING); -#line 900 "/home/jens/Source/shotwell/src/Dialogs.vala" - result = !_tmp1_; + result = !string_contains (text, TAG_PATH_SEPARATOR_STRING); #line 900 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 8487 "Dialogs.c" +#line 8260 "Dialogs.c" } -static void modify_tags_dialog_class_init (ModifyTagsDialogClass * klass) { +static void +modify_tags_dialog_class_init (ModifyTagsDialogClass * klass) +{ #line 847 "/home/jens/Source/shotwell/src/Dialogs.vala" modify_tags_dialog_parent_class = g_type_class_peek_parent (klass); #line 847 "/home/jens/Source/shotwell/src/Dialogs.vala" ((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*) (TextEntryDialogMediator *, const gchar*)) modify_tags_dialog_real_on_modify_validate; -#line 8496 "Dialogs.c" +#line 8271 "Dialogs.c" } -static void modify_tags_dialog_instance_init (ModifyTagsDialog * self) { +static void +modify_tags_dialog_instance_init (ModifyTagsDialog * self) +{ } -GType modify_tags_dialog_get_type (void) { +GType +modify_tags_dialog_get_type (void) +{ static volatile gsize modify_tags_dialog_type_id__volatile = 0; if (g_once_init_enter (&modify_tags_dialog_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ModifyTagsDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) modify_tags_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ModifyTagsDialog), 0, (GInstanceInitFunc) modify_tags_dialog_instance_init, NULL }; @@ -8526,7 +8305,9 @@ GType modify_tags_dialog_get_type (void) { } -GtkResponseType copy_files_dialog (void) { +GtkResponseType +copy_files_dialog (void) +{ GtkResponseType result = 0; gchar* msg = NULL; gchar* _tmp0_; @@ -8536,7 +8317,6 @@ GtkResponseType copy_files_dialog (void) { GtkMessageDialog* _tmp3_; GtkMessageDialog* _tmp4_; GtkResponseType _result_ = 0; - gint _tmp5_; #line 908 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp0_ = g_strdup (_ ("Shotwell can copy the photos into your library folder or it can import" \ " them without copying.")); @@ -8563,9 +8343,7 @@ GtkResponseType copy_files_dialog (void) { #line 915 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), _ ("Import to Library")); #line 917 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog)); -#line 917 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_ = (GtkResponseType) _tmp5_; + _result_ = (GtkResponseType) gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog)); #line 919 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget)); #line 921 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -8576,118 +8354,117 @@ GtkResponseType copy_files_dialog (void) { _g_free0 (msg); #line 921 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 8565 "Dialogs.c" +#line 8343 "Dialogs.c" } -void remove_photos_from_library (GeeCollection* photos) { +void +remove_photos_from_library (GeeCollection* photos) +{ const gchar* _tmp0_ = NULL; - GeeCollection* _tmp1_; + gint _tmp1_; gint _tmp2_; - gint _tmp3_; - GeeCollection* _tmp4_; #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_if_fail (GEE_IS_COLLECTION (photos)); #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = photos; -#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = gee_collection_get_size (_tmp1_); + _tmp1_ = gee_collection_get_size (photos); #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp3_ == 1) { + if (_tmp2_ == 1) { #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp0_ = _ ("Removing Photo From Library"); -#line 8587 "Dialogs.c" +#line 8363 "Dialogs.c" } else { #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp0_ = _ ("Removing Photos From Library"); -#line 8591 "Dialogs.c" +#line 8367 "Dialogs.c" } #line 925 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = photos; -#line 925 "/home/jens/Source/shotwell/src/Dialogs.vala" - remove_from_app (_tmp4_, _ ("Remove From Library"), _tmp0_); -#line 8597 "Dialogs.c" + remove_from_app (photos, _ ("Remove From Library"), _tmp0_); +#line 8371 "Dialogs.c" } -static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) { +static gboolean +_progress_dialog_monitor_progress_monitor (guint64 current, + guint64 total, + gboolean do_event_loop, + gpointer self) +{ gboolean result; result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop); #line 966 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 8606 "Dialogs.c" +#line 8385 "Dialogs.c" } -void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const gchar* progress_dialog_text) { - GeeCollection* _tmp0_; +void +remove_from_app (GeeCollection* sources, + const gchar* dialog_title, + const gchar* progress_dialog_text) +{ + gint _tmp0_; gint _tmp1_; - gint _tmp2_; GeeArrayList* photos = NULL; - GeeArrayList* _tmp3_; + GeeArrayList* _tmp2_; GeeArrayList* videos = NULL; + GeeArrayList* _tmp3_; GeeArrayList* _tmp4_; - GeeCollection* _tmp5_; - GeeArrayList* _tmp6_; - GeeArrayList* _tmp7_; + GeeArrayList* _tmp5_; gchar* user_message = NULL; - gboolean _tmp8_ = FALSE; - GeeArrayList* _tmp9_; - gboolean _tmp10_; - gboolean _tmp11_; + gboolean _tmp6_ = FALSE; + GeeArrayList* _tmp7_; + gboolean _tmp8_; + gboolean _tmp9_; GtkResponseType _result_ = 0; - AppWindow* _tmp39_; - AppWindow* _tmp40_; - const gchar* _tmp41_; - const gchar* _tmp42_; - GeeCollection* _tmp43_; - gint _tmp44_; - gint _tmp45_; - GtkResponseType _tmp46_; - GtkResponseType _tmp47_; - gboolean _tmp48_ = FALSE; - GtkResponseType _tmp49_; + AppWindow* _tmp31_; + AppWindow* _tmp32_; + const gchar* _tmp33_; + gint _tmp34_; + gint _tmp35_; + GtkResponseType _tmp36_; + gboolean _tmp37_ = FALSE; + GtkResponseType _tmp38_; gboolean delete_backing = FALSE; - GtkResponseType _tmp51_; - AppWindow* _tmp52_; - AppWindow* _tmp53_; + GtkResponseType _tmp40_; + AppWindow* _tmp41_; + AppWindow* _tmp42_; ProgressDialog* progress = NULL; ProgressMonitor monitor = NULL; void* monitor_target; GDestroyNotify monitor_target_destroy_notify; - GeeCollection* _tmp54_; - gint _tmp55_; - gint _tmp56_; + gint _tmp43_; + gint _tmp44_; GeeArrayList* not_removed_photos = NULL; - GeeArrayList* _tmp62_; + GeeArrayList* _tmp49_; GeeArrayList* not_removed_videos = NULL; - GeeArrayList* _tmp63_; - LibraryPhotoSourceCollection* _tmp64_; - GeeArrayList* _tmp65_; - gboolean _tmp66_; - ProgressMonitor _tmp67_; - void* _tmp67__target; - GeeArrayList* _tmp68_; - VideoSourceCollection* _tmp69_; - GeeArrayList* _tmp70_; - gboolean _tmp71_; - ProgressMonitor _tmp72_; - void* _tmp72__target; - GeeArrayList* _tmp73_; + GeeArrayList* _tmp50_; + LibraryPhotoSourceCollection* _tmp51_; + GeeArrayList* _tmp52_; + gboolean _tmp53_; + ProgressMonitor _tmp54_; + void* _tmp54__target; + GeeArrayList* _tmp55_; + VideoSourceCollection* _tmp56_; + GeeArrayList* _tmp57_; + gboolean _tmp58_; + ProgressMonitor _tmp59_; + void* _tmp59__target; + GeeArrayList* _tmp60_; gint num_not_removed = 0; - GeeArrayList* _tmp74_; - gint _tmp75_; - gint _tmp76_; - GeeArrayList* _tmp77_; - gint _tmp78_; - gint _tmp79_; - gboolean _tmp80_ = FALSE; - gboolean _tmp81_; - ProgressDialog* _tmp117_; - AppWindow* _tmp119_; - AppWindow* _tmp120_; + GeeArrayList* _tmp61_; + gint _tmp62_; + gint _tmp63_; + GeeArrayList* _tmp64_; + gint _tmp65_; + gint _tmp66_; + gboolean _tmp67_ = FALSE; + gboolean _tmp68_; + ProgressDialog* _tmp101_; + AppWindow* _tmp103_; + AppWindow* _tmp104_; #line 929 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); #line 929 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -8695,216 +8472,188 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g #line 929 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_if_fail (progress_dialog_text != NULL); #line 931 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = sources; -#line 931 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp0_ = gee_collection_get_size (sources); #line 931 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 931 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 932 "/home/jens/Source/shotwell/src/Dialogs.vala" return; -#line 8693 "Dialogs.c" +#line 8468 "Dialogs.c" } #line 934 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp2_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 934 "/home/jens/Source/shotwell/src/Dialogs.vala" - photos = _tmp3_; + photos = _tmp2_; #line 935 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp3_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 935 "/home/jens/Source/shotwell/src/Dialogs.vala" - videos = _tmp4_; + videos = _tmp3_; #line 936 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp5_ = sources; -#line 936 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = photos; + _tmp4_ = photos; #line 936 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = videos; + _tmp5_ = videos; #line 936 "/home/jens/Source/shotwell/src/Dialogs.vala" - media_source_collection_filter_media (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); + media_source_collection_filter_media (sources, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 938 "/home/jens/Source/shotwell/src/Dialogs.vala" user_message = NULL; #line 939 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp9_ = photos; + _tmp7_ = photos; #line 939 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp10_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp8_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); #line 939 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 939 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (!_tmp11_) { -#line 8721 "Dialogs.c" - GeeArrayList* _tmp12_; - gboolean _tmp13_; - gboolean _tmp14_; + if (!_tmp9_) { +#line 8494 "Dialogs.c" + GeeArrayList* _tmp10_; + gboolean _tmp11_; + gboolean _tmp12_; #line 939 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp12_ = videos; + _tmp10_ = videos; #line 939 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp13_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp11_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection)); #line 939 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 939 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = !_tmp14_; -#line 8733 "Dialogs.c" + _tmp6_ = !_tmp12_; +#line 8506 "Dialogs.c" } else { #line 939 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = FALSE; -#line 8737 "Dialogs.c" + _tmp6_ = FALSE; +#line 8510 "Dialogs.c" } #line 939 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp8_) { -#line 8741 "Dialogs.c" - GeeCollection* _tmp15_; + if (_tmp6_) { +#line 8514 "Dialogs.c" + gint _tmp13_; + gint _tmp14_; + gint _tmp15_; gint _tmp16_; - gint _tmp17_; - GeeCollection* _tmp18_; - gint _tmp19_; - gint _tmp20_; - gchar* _tmp21_; -#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp15_ = sources; -#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp16_ = gee_collection_get_size (_tmp15_); + gchar* _tmp17_; #line 940 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp17_ = _tmp16_; + _tmp13_ = gee_collection_get_size (sources); #line 940 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp18_ = sources; + _tmp14_ = _tmp13_; #line 940 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp19_ = gee_collection_get_size (_tmp18_); + _tmp15_ = gee_collection_get_size (sources); #line 940 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp20_ = _tmp19_; + _tmp16_ = _tmp15_; #line 940 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp21_ = g_strdup_printf (ngettext ("This will remove the photo/video from your Shotwell library. Would you" \ + _tmp17_ = g_strdup_printf (ngettext ("This will remove the photo/video from your Shotwell library. Would you" \ " also like to move the file to your desktop trash?\n" \ "\n" \ "This action cannot be undone.", "This will remove %d photos/videos from your Shotwell library. Would yo" \ "u also like to move the files to your desktop trash?\n" \ "\n" \ -"This action cannot be undone.", (gulong) _tmp17_), _tmp20_); +"This action cannot be undone.", (gulong) _tmp14_), _tmp16_); #line 940 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (user_message); #line 940 "/home/jens/Source/shotwell/src/Dialogs.vala" - user_message = _tmp21_; -#line 8767 "Dialogs.c" + user_message = _tmp17_; +#line 8534 "Dialogs.c" } else { - GeeArrayList* _tmp22_; - gboolean _tmp23_; - gboolean _tmp24_; + GeeArrayList* _tmp18_; + gboolean _tmp19_; + gboolean _tmp20_; #line 943 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp22_ = videos; + _tmp18_ = videos; #line 943 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp23_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp19_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); #line 943 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp24_ = _tmp23_; + _tmp20_ = _tmp19_; #line 943 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (!_tmp24_) { -#line 8780 "Dialogs.c" - GeeCollection* _tmp25_; - gint _tmp26_; - gint _tmp27_; - GeeCollection* _tmp28_; - gint _tmp29_; - gint _tmp30_; - gchar* _tmp31_; -#line 944 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp25_ = sources; + if (!_tmp20_) { +#line 8547 "Dialogs.c" + gint _tmp21_; + gint _tmp22_; + gint _tmp23_; + gint _tmp24_; + gchar* _tmp25_; #line 944 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp26_ = gee_collection_get_size (_tmp25_); + _tmp21_ = gee_collection_get_size (sources); #line 944 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp27_ = _tmp26_; + _tmp22_ = _tmp21_; #line 944 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp28_ = sources; + _tmp23_ = gee_collection_get_size (sources); #line 944 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp29_ = gee_collection_get_size (_tmp28_); + _tmp24_ = _tmp23_; #line 944 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp30_ = _tmp29_; -#line 944 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp31_ = g_strdup_printf (ngettext ("This will remove the video from your Shotwell library. Would you also " \ + _tmp25_ = g_strdup_printf (ngettext ("This will remove the video from your Shotwell library. Would you also " \ "like to move the file to your desktop trash?\n" \ "\n" \ "This action cannot be undone.", "This will remove %d videos from your Shotwell library. Would you also " \ "like to move the files to your desktop trash?\n" \ "\n" \ -"This action cannot be undone.", (gulong) _tmp27_), _tmp30_); +"This action cannot be undone.", (gulong) _tmp22_), _tmp24_); #line 944 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (user_message); #line 944 "/home/jens/Source/shotwell/src/Dialogs.vala" - user_message = _tmp31_; -#line 8806 "Dialogs.c" + user_message = _tmp25_; +#line 8567 "Dialogs.c" } else { - GeeCollection* _tmp32_; - gint _tmp33_; - gint _tmp34_; - GeeCollection* _tmp35_; - gint _tmp36_; - gint _tmp37_; - gchar* _tmp38_; -#line 948 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp32_ = sources; -#line 948 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp33_ = gee_collection_get_size (_tmp32_); + gint _tmp26_; + gint _tmp27_; + gint _tmp28_; + gint _tmp29_; + gchar* _tmp30_; #line 948 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp34_ = _tmp33_; + _tmp26_ = gee_collection_get_size (sources); #line 948 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp35_ = sources; + _tmp27_ = _tmp26_; #line 948 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp36_ = gee_collection_get_size (_tmp35_); + _tmp28_ = gee_collection_get_size (sources); #line 948 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp37_ = _tmp36_; + _tmp29_ = _tmp28_; #line 948 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp38_ = g_strdup_printf (ngettext ("This will remove the photo from your Shotwell library. Would you also " \ + _tmp30_ = g_strdup_printf (ngettext ("This will remove the photo from your Shotwell library. Would you also " \ "like to move the file to your desktop trash?\n" \ "\n" \ "This action cannot be undone.", "This will remove %d photos from your Shotwell library. Would you also " \ "like to move the files to your desktop trash?\n" \ "\n" \ -"This action cannot be undone.", (gulong) _tmp34_), _tmp37_); +"This action cannot be undone.", (gulong) _tmp27_), _tmp29_); #line 948 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (user_message); #line 948 "/home/jens/Source/shotwell/src/Dialogs.vala" - user_message = _tmp38_; -#line 8833 "Dialogs.c" + user_message = _tmp30_; +#line 8588 "Dialogs.c" } } #line 953 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp39_ = app_window_get_instance (); -#line 953 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp40_ = _tmp39_; -#line 953 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp41_ = dialog_title; -#line 953 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp42_ = user_message; + _tmp31_ = app_window_get_instance (); #line 953 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp43_ = sources; + _tmp32_ = _tmp31_; #line 953 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp44_ = gee_collection_get_size (_tmp43_); + _tmp33_ = user_message; #line 953 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp45_ = _tmp44_; + _tmp34_ = gee_collection_get_size (sources); #line 953 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp46_ = remove_from_library_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_window_get_type (), GtkWindow), _tmp41_, _tmp42_, _tmp45_); + _tmp35_ = _tmp34_; #line 953 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp47_ = _tmp46_; + _tmp36_ = remove_from_library_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_window_get_type (), GtkWindow), dialog_title, _tmp33_, _tmp35_); #line 953 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_object_unref0 (_tmp40_); + _g_object_unref0 (_tmp32_); #line 953 "/home/jens/Source/shotwell/src/Dialogs.vala" - _result_ = _tmp47_; + _result_ = _tmp36_; #line 955 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp49_ = _result_; + _tmp38_ = _result_; #line 955 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp49_ != GTK_RESPONSE_YES) { -#line 8862 "Dialogs.c" - GtkResponseType _tmp50_; + if (_tmp38_ != GTK_RESPONSE_YES) { +#line 8611 "Dialogs.c" + GtkResponseType _tmp39_; #line 955 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp50_ = _result_; + _tmp39_ = _result_; #line 955 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp48_ = _tmp50_ != GTK_RESPONSE_NO; -#line 8868 "Dialogs.c" + _tmp37_ = _tmp39_ != GTK_RESPONSE_NO; +#line 8617 "Dialogs.c" } else { #line 955 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp48_ = FALSE; -#line 8872 "Dialogs.c" + _tmp37_ = FALSE; +#line 8621 "Dialogs.c" } #line 955 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp48_) { + if (_tmp37_) { #line 956 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (user_message); #line 956 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -8913,20 +8662,20 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g _g_object_unref0 (photos); #line 956 "/home/jens/Source/shotwell/src/Dialogs.vala" return; -#line 8884 "Dialogs.c" +#line 8633 "Dialogs.c" } #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp51_ = _result_; + _tmp40_ = _result_; #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala" - delete_backing = _tmp51_ == GTK_RESPONSE_YES; + delete_backing = _tmp40_ == GTK_RESPONSE_YES; #line 960 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp52_ = app_window_get_instance (); + _tmp41_ = app_window_get_instance (); #line 960 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp53_ = _tmp52_; + _tmp42_ = _tmp41_; #line 960 "/home/jens/Source/shotwell/src/Dialogs.vala" - page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PAGE_WINDOW, PageWindow)); #line 960 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_object_unref0 (_tmp53_); + _g_object_unref0 (_tmp42_); #line 962 "/home/jens/Source/shotwell/src/Dialogs.vala" progress = NULL; #line 963 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -8936,37 +8685,32 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g #line 963 "/home/jens/Source/shotwell/src/Dialogs.vala" monitor_target_destroy_notify = NULL; #line 964 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp54_ = sources; -#line 964 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp55_ = gee_collection_get_size (_tmp54_); + _tmp43_ = gee_collection_get_size (sources); #line 964 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp56_ = _tmp55_; + _tmp44_ = _tmp43_; #line 964 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp56_ >= 20) { -#line 8914 "Dialogs.c" - AppWindow* _tmp57_; - AppWindow* _tmp58_; - const gchar* _tmp59_; - ProgressDialog* _tmp60_; - ProgressDialog* _tmp61_; + if (_tmp44_ >= 20) { +#line 8661 "Dialogs.c" + AppWindow* _tmp45_; + AppWindow* _tmp46_; + ProgressDialog* _tmp47_; + ProgressDialog* _tmp48_; #line 965 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp57_ = app_window_get_instance (); + _tmp45_ = app_window_get_instance (); #line 965 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp58_ = _tmp57_; + _tmp46_ = _tmp45_; #line 965 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp59_ = progress_dialog_text; + _tmp47_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_window_get_type (), GtkWindow), progress_dialog_text, NULL); #line 965 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp60_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_window_get_type (), GtkWindow), _tmp59_, NULL); -#line 965 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_object_ref_sink (_tmp60_); + g_object_ref_sink (_tmp47_); #line 965 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (progress); #line 965 "/home/jens/Source/shotwell/src/Dialogs.vala" - progress = _tmp60_; + progress = _tmp47_; #line 965 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_object_unref0 (_tmp58_); + _g_object_unref0 (_tmp46_); #line 966 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp61_ = progress; + _tmp48_ = progress; #line 966 "/home/jens/Source/shotwell/src/Dialogs.vala" (monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL); #line 966 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -8978,258 +8722,249 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g #line 966 "/home/jens/Source/shotwell/src/Dialogs.vala" monitor = _progress_dialog_monitor_progress_monitor; #line 966 "/home/jens/Source/shotwell/src/Dialogs.vala" - monitor_target = g_object_ref (_tmp61_); + monitor_target = g_object_ref (_tmp48_); #line 966 "/home/jens/Source/shotwell/src/Dialogs.vala" monitor_target_destroy_notify = g_object_unref; -#line 8952 "Dialogs.c" +#line 8696 "Dialogs.c" } #line 969 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp62_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp49_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 969 "/home/jens/Source/shotwell/src/Dialogs.vala" - not_removed_photos = _tmp62_; + not_removed_photos = _tmp49_; #line 970 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp63_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp50_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 970 "/home/jens/Source/shotwell/src/Dialogs.vala" - not_removed_videos = _tmp63_; + not_removed_videos = _tmp50_; #line 973 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp64_ = library_photo_global; + _tmp51_ = library_photo_global; #line 973 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp65_ = photos; + _tmp52_ = photos; #line 973 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp66_ = delete_backing; + _tmp53_ = delete_backing; #line 973 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp67_ = monitor; + _tmp54_ = monitor; #line 973 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp67__target = monitor_target; + _tmp54__target = monitor_target; #line 973 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp68_ = not_removed_photos; + _tmp55_ = not_removed_photos; #line 973 "/home/jens/Source/shotwell/src/Dialogs.vala" - media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, GEE_TYPE_COLLECTION, GeeCollection), _tmp66_, _tmp67_, _tmp67__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_LIST, GeeList)); + media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), _tmp53_, _tmp54_, _tmp54__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_LIST, GeeList)); #line 974 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp69_ = video_global; + _tmp56_ = video_global; #line 974 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp70_ = videos; + _tmp57_ = videos; #line 974 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp71_ = delete_backing; + _tmp58_ = delete_backing; #line 974 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp72_ = monitor; + _tmp59_ = monitor; #line 974 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp72__target = monitor_target; + _tmp59__target = monitor_target; #line 974 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp73_ = not_removed_videos; + _tmp60_ = not_removed_videos; #line 974 "/home/jens/Source/shotwell/src/Dialogs.vala" - media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GEE_TYPE_COLLECTION, GeeCollection), _tmp71_, _tmp72_, _tmp72__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GEE_TYPE_LIST, GeeList)); + media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_COLLECTION, GeeCollection), _tmp58_, _tmp59_, _tmp59__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_LIST, GeeList)); #line 977 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp74_ = not_removed_photos; + _tmp61_ = not_removed_photos; #line 977 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp75_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp62_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 977 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp76_ = _tmp75_; + _tmp63_ = _tmp62_; #line 977 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp77_ = not_removed_videos; + _tmp64_ = not_removed_videos; #line 977 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp78_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp65_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 977 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp79_ = _tmp78_; + _tmp66_ = _tmp65_; #line 977 "/home/jens/Source/shotwell/src/Dialogs.vala" - num_not_removed = _tmp76_ + _tmp79_; + num_not_removed = _tmp63_ + _tmp66_; #line 978 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp81_ = delete_backing; + _tmp68_ = delete_backing; #line 978 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp81_) { -#line 9008 "Dialogs.c" - gint _tmp82_; + if (_tmp68_) { +#line 8752 "Dialogs.c" + gint _tmp69_; #line 978 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp82_ = num_not_removed; + _tmp69_ = num_not_removed; #line 978 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp80_ = _tmp82_ > 0; -#line 9014 "Dialogs.c" + _tmp67_ = _tmp69_ > 0; +#line 8758 "Dialogs.c" } else { #line 978 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp80_ = FALSE; -#line 9018 "Dialogs.c" + _tmp67_ = FALSE; +#line 8762 "Dialogs.c" } #line 978 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp80_) { -#line 9022 "Dialogs.c" + if (_tmp67_) { +#line 8766 "Dialogs.c" gchar* not_deleted_message = NULL; - gint _tmp83_; - gint _tmp84_; - gchar* _tmp85_; + gint _tmp70_; + gint _tmp71_; + gchar* _tmp72_; GtkResponseType result_delete = 0; - AppWindow* _tmp86_; - AppWindow* _tmp87_; - const gchar* _tmp88_; - const gchar* _tmp89_; - GtkResponseType _tmp90_; - GtkResponseType _tmp91_; - GtkResponseType _tmp92_; + AppWindow* _tmp73_; + AppWindow* _tmp74_; + const gchar* _tmp75_; + GtkResponseType _tmp76_; + GtkResponseType _tmp77_; #line 979 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp83_ = num_not_removed; + _tmp70_ = num_not_removed; #line 979 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp84_ = num_not_removed; + _tmp71_ = num_not_removed; #line 979 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp85_ = g_strdup_printf (ngettext ("The photo or video cannot be moved to your desktop trash. Delete this " \ + _tmp72_ = g_strdup_printf (ngettext ("The photo or video cannot be moved to your desktop trash. Delete this " \ "file?", "%d photos/videos cannot be moved to your desktop trash. Delete these f" \ -"iles?", (gulong) _tmp83_), _tmp84_); +"iles?", (gulong) _tmp70_), _tmp71_); #line 979 "/home/jens/Source/shotwell/src/Dialogs.vala" - not_deleted_message = _tmp85_; -#line 983 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp86_ = app_window_get_instance (); -#line 983 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp87_ = _tmp86_; + not_deleted_message = _tmp72_; #line 983 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp88_ = dialog_title; + _tmp73_ = app_window_get_instance (); #line 983 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp89_ = not_deleted_message; + _tmp74_ = _tmp73_; #line 983 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp90_ = remove_from_filesystem_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_window_get_type (), GtkWindow), _tmp88_, _tmp89_); + _tmp75_ = not_deleted_message; #line 983 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp91_ = _tmp90_; + _tmp76_ = remove_from_filesystem_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_window_get_type (), GtkWindow), dialog_title, _tmp75_); #line 983 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_object_unref0 (_tmp87_); + _g_object_unref0 (_tmp74_); #line 983 "/home/jens/Source/shotwell/src/Dialogs.vala" - result_delete = _tmp91_; + result_delete = _tmp76_; #line 986 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp92_ = result_delete; + _tmp77_ = result_delete; #line 986 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (GTK_RESPONSE_YES == _tmp92_) { -#line 9063 "Dialogs.c" + if (GTK_RESPONSE_YES == _tmp77_) { +#line 8801 "Dialogs.c" GeeArrayList* not_deleted_photos = NULL; - GeeArrayList* _tmp93_; + GeeArrayList* _tmp78_; GeeArrayList* not_deleted_videos = NULL; - GeeArrayList* _tmp94_; - LibraryPhotoSourceCollection* _tmp95_; - GeeArrayList* _tmp96_; - ProgressMonitor _tmp97_; - void* _tmp97__target; - GeeArrayList* _tmp98_; - VideoSourceCollection* _tmp99_; - GeeArrayList* _tmp100_; - ProgressMonitor _tmp101_; - void* _tmp101__target; - GeeArrayList* _tmp102_; + GeeArrayList* _tmp79_; + LibraryPhotoSourceCollection* _tmp80_; + GeeArrayList* _tmp81_; + ProgressMonitor _tmp82_; + void* _tmp82__target; + GeeArrayList* _tmp83_; + VideoSourceCollection* _tmp84_; + GeeArrayList* _tmp85_; + ProgressMonitor _tmp86_; + void* _tmp86__target; + GeeArrayList* _tmp87_; gint num_not_deleted = 0; - GeeArrayList* _tmp103_; - gint _tmp104_; - gint _tmp105_; - GeeArrayList* _tmp106_; - gint _tmp107_; - gint _tmp108_; - gint _tmp109_; + GeeArrayList* _tmp88_; + gint _tmp89_; + gint _tmp90_; + GeeArrayList* _tmp91_; + gint _tmp92_; + gint _tmp93_; + gint _tmp94_; #line 988 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp93_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp78_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 988 "/home/jens/Source/shotwell/src/Dialogs.vala" - not_deleted_photos = _tmp93_; + not_deleted_photos = _tmp78_; #line 989 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp94_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp79_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 989 "/home/jens/Source/shotwell/src/Dialogs.vala" - not_deleted_videos = _tmp94_; + not_deleted_videos = _tmp79_; #line 990 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp95_ = library_photo_global; + _tmp80_ = library_photo_global; #line 990 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp96_ = not_removed_photos; + _tmp81_ = not_removed_photos; #line 990 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp97_ = monitor; + _tmp82_ = monitor; #line 990 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp97__target = monitor_target; + _tmp82__target = monitor_target; #line 990 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp98_ = not_deleted_photos; + _tmp83_ = not_deleted_photos; #line 990 "/home/jens/Source/shotwell/src/Dialogs.vala" - media_source_collection_delete_backing_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, GEE_TYPE_COLLECTION, GeeCollection), _tmp97_, _tmp97__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, GEE_TYPE_LIST, GeeList)); + media_source_collection_delete_backing_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GEE_TYPE_COLLECTION, GeeCollection), _tmp82_, _tmp82__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_LIST, GeeList)); #line 991 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp99_ = video_global; + _tmp84_ = video_global; #line 991 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp100_ = not_removed_videos; + _tmp85_ = not_removed_videos; #line 991 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp101_ = monitor; + _tmp86_ = monitor; #line 991 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp101__target = monitor_target; + _tmp86__target = monitor_target; #line 991 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp102_ = not_deleted_videos; + _tmp87_ = not_deleted_videos; #line 991 "/home/jens/Source/shotwell/src/Dialogs.vala" - media_source_collection_delete_backing_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_COLLECTION, GeeCollection), _tmp101_, _tmp101__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, GEE_TYPE_LIST, GeeList)); + media_source_collection_delete_backing_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_COLLECTION, GeeCollection), _tmp86_, _tmp86__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_LIST, GeeList)); #line 993 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp103_ = not_deleted_photos; + _tmp88_ = not_deleted_photos; #line 993 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp104_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp89_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 993 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp105_ = _tmp104_; + _tmp90_ = _tmp89_; #line 993 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp106_ = not_deleted_videos; + _tmp91_ = not_deleted_videos; #line 993 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp107_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp92_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 993 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp108_ = _tmp107_; + _tmp93_ = _tmp92_; #line 993 "/home/jens/Source/shotwell/src/Dialogs.vala" - num_not_deleted = _tmp105_ + _tmp108_; + num_not_deleted = _tmp90_ + _tmp93_; #line 994 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp109_ = num_not_deleted; + _tmp94_ = num_not_deleted; #line 994 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp109_ > 0) { -#line 9136 "Dialogs.c" + if (_tmp94_ > 0) { +#line 8874 "Dialogs.c" gchar* delete_failed_message = NULL; - gint _tmp110_; - gint _tmp111_; - gchar* _tmp112_; - const gchar* _tmp113_; - const gchar* _tmp114_; - AppWindow* _tmp115_; - AppWindow* _tmp116_; + gint _tmp95_; + gint _tmp96_; + gchar* _tmp97_; + const gchar* _tmp98_; + AppWindow* _tmp99_; + AppWindow* _tmp100_; #line 996 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp110_ = num_not_deleted; + _tmp95_ = num_not_deleted; #line 996 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp111_ = num_not_deleted; + _tmp96_ = num_not_deleted; #line 996 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp112_ = g_strdup_printf (ngettext ("The photo or video cannot be deleted.", "%d photos/videos cannot be deleted.", (gulong) _tmp110_), _tmp111_); + _tmp97_ = g_strdup_printf (ngettext ("The photo or video cannot be deleted.", "%d photos/videos cannot be deleted.", (gulong) _tmp95_), _tmp96_); #line 996 "/home/jens/Source/shotwell/src/Dialogs.vala" - delete_failed_message = _tmp112_; -#line 1000 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp113_ = dialog_title; + delete_failed_message = _tmp97_; #line 1000 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp114_ = delete_failed_message; + _tmp98_ = delete_failed_message; #line 1000 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp115_ = app_window_get_instance (); + _tmp99_ = app_window_get_instance (); #line 1000 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp116_ = _tmp115_; + _tmp100_ = _tmp99_; #line 1000 "/home/jens/Source/shotwell/src/Dialogs.vala" - app_window_error_message_with_title (_tmp113_, _tmp114_, G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, gtk_window_get_type (), GtkWindow), TRUE); + app_window_error_message_with_title (dialog_title, _tmp98_, G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_window_get_type (), GtkWindow), TRUE); #line 1000 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_object_unref0 (_tmp116_); + _g_object_unref0 (_tmp100_); #line 994 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (delete_failed_message); -#line 9167 "Dialogs.c" +#line 8902 "Dialogs.c" } #line 986 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (not_deleted_videos); #line 986 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (not_deleted_photos); -#line 9173 "Dialogs.c" +#line 8908 "Dialogs.c" } #line 978 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (not_deleted_message); -#line 9177 "Dialogs.c" +#line 8912 "Dialogs.c" } #line 1005 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp117_ = progress; + _tmp101_ = progress; #line 1005 "/home/jens/Source/shotwell/src/Dialogs.vala" - if (_tmp117_ != NULL) { -#line 9183 "Dialogs.c" - ProgressDialog* _tmp118_; + if (_tmp101_ != NULL) { +#line 8918 "Dialogs.c" + ProgressDialog* _tmp102_; #line 1006 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp118_ = progress; + _tmp102_ = progress; #line 1006 "/home/jens/Source/shotwell/src/Dialogs.vala" - progress_dialog_close (_tmp118_); -#line 9189 "Dialogs.c" + progress_dialog_close (_tmp102_); +#line 8924 "Dialogs.c" } #line 1008 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp119_ = app_window_get_instance (); + _tmp103_ = app_window_get_instance (); #line 1008 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp120_ = _tmp119_; + _tmp104_ = _tmp103_; #line 1008 "/home/jens/Source/shotwell/src/Dialogs.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, TYPE_PAGE_WINDOW, PageWindow)); #line 1008 "/home/jens/Source/shotwell/src/Dialogs.vala" - _g_object_unref0 (_tmp120_); + _g_object_unref0 (_tmp104_); #line 929 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (not_removed_videos); #line 929 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -9250,11 +8985,15 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g _g_object_unref0 (videos); #line 929 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (photos); -#line 9219 "Dialogs.c" +#line 8954 "Dialogs.c" } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -9266,13 +9005,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -static gint _vala_array_length (gpointer array) { +static gint +_vala_array_length (gpointer array) +{ int length; length = 0; if (array) { diff --git a/src/Dimensions.c b/src/Dimensions.c index 20bd7e9..a547b10 100644 --- a/src/Dimensions.c +++ b/src/Dimensions.c @@ -1,4 +1,4 @@ -/* Dimensions.c generated by valac 0.36.6, the Vala compiler +/* Dimensions.c generated by valac 0.40.4, the Vala compiler * generated from Dimensions.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -74,90 +75,186 @@ gchar* scale_constraint_to_string (ScaleConstraint self); GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); -void dimensions_init (Dimensions *self, gint width, gint height); -void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result); -void dimensions_for_allocation (GtkAllocation* allocation, Dimensions* result); -void dimensions_for_widget_allocation (GtkWidget* widget, Dimensions* result); -void dimensions_for_rectangle (GdkRectangle* rect, Dimensions* result); +void dimensions_init (Dimensions *self, + gint width, + gint height); +void dimensions_for_pixbuf (GdkPixbuf* pixbuf, + Dimensions* result); +void dimensions_for_allocation (GtkAllocation* allocation, + Dimensions* result); +void dimensions_for_widget_allocation (GtkWidget* widget, + Dimensions* result); +void dimensions_for_rectangle (GdkRectangle* rect, + Dimensions* result); gboolean dimensions_has_area (Dimensions *self); -void dimensions_floor (Dimensions *self, Dimensions* min, Dimensions* result); +void dimensions_floor (Dimensions *self, + Dimensions* min, + Dimensions* result); gchar* dimensions_to_string (Dimensions *self); -gboolean dimensions_equals (Dimensions *self, Dimensions* dim); -gboolean dimensions_approx_equals (Dimensions *self, Dimensions* dim, gint fudge); -gboolean dimensions_approx_scaled (Dimensions *self, gint scale, gint fudge); +gboolean dimensions_equals (Dimensions *self, + Dimensions* dim); +gboolean dimensions_approx_equals (Dimensions *self, + Dimensions* dim, + gint fudge); +gboolean dimensions_approx_scaled (Dimensions *self, + gint scale, + gint fudge); gint dimensions_major_axis (Dimensions *self); gint dimensions_minor_axis (Dimensions *self); -void dimensions_with_min (Dimensions *self, gint min_width, gint min_height, Dimensions* result); -void dimensions_with_max (Dimensions *self, gint max_width, gint max_height, Dimensions* result); -void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dimensions* result); -void dimensions_get_scaled_by_width (Dimensions *self, gint scale, Dimensions* result); -void dimensions_get_scaled_by_height (Dimensions *self, gint scale, Dimensions* result); -void dimensions_get_scale_ratios (Dimensions *self, Dimensions* scaled, gdouble* width_ratio, gdouble* height_ratio); +void dimensions_with_min (Dimensions *self, + gint min_width, + gint min_height, + Dimensions* result); +void dimensions_with_max (Dimensions *self, + gint max_width, + gint max_height, + Dimensions* result); +void dimensions_get_scaled (Dimensions *self, + gint scale, + gboolean scale_up, + Dimensions* result); +void dimensions_get_scaled_by_width (Dimensions *self, + gint scale, + Dimensions* result); +void dimensions_get_scaled_by_height (Dimensions *self, + gint scale, + Dimensions* result); +void dimensions_get_scale_ratios (Dimensions *self, + Dimensions* scaled, + gdouble* width_ratio, + gdouble* height_ratio); gdouble dimensions_get_aspect_ratio (Dimensions *self); -void dimensions_get_scaled_proportional (Dimensions *self, Dimensions* viewport, Dimensions* result); -void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewport, Dimensions* result); -void dimensions_get_scaled_rectangle (Dimensions *self, Dimensions* scaled, GdkRectangle* rect, GdkRectangle* result); -void dimensions_get_scaled_similar (Dimensions *self, Dimensions* original, Dimensions* scaled, Dimensions* result); -void dimensions_get_scaled_by_constraint (Dimensions *self, gint scale, ScaleConstraint constraint, Dimensions* result); +void dimensions_get_scaled_proportional (Dimensions *self, + Dimensions* viewport, + Dimensions* result); +void dimensions_get_scaled_to_fill_viewport (Dimensions *self, + Dimensions* viewport, + Dimensions* result); +void dimensions_get_scaled_rectangle (Dimensions *self, + Dimensions* scaled, + GdkRectangle* rect, + GdkRectangle* result); +void dimensions_get_scaled_similar (Dimensions *self, + Dimensions* original, + Dimensions* scaled, + Dimensions* result); +void dimensions_get_scaled_by_constraint (Dimensions *self, + gint scale, + ScaleConstraint constraint, + Dimensions* result); GType scaling_get_type (void) G_GNUC_CONST; Scaling* scaling_dup (const Scaling* self); void scaling_free (Scaling* self); #define SCALING_NO_SCALE 0 -static void scaling_init (Scaling *self, ScaleConstraint constraint, gint scale, Dimensions* viewport, gboolean scale_up); +static void scaling_init (Scaling *self, + ScaleConstraint constraint, + gint scale, + Dimensions* viewport, + gboolean scale_up); void scaling_for_original (Scaling* result); -void scaling_for_screen (GtkWindow* window, gboolean scale_up, Scaling* result); -void scaling_for_viewport (Dimensions* viewport, gboolean scale_up, Scaling* result); -static void scaling_get_screen_dimensions (GtkWindow* window, Dimensions* result); -void scaling_for_best_fit (gint pixels, gboolean scale_up, Scaling* result); -void scaling_for_widget (GtkWidget* widget, gboolean scale_up, Scaling* result); -void scaling_to_fill_viewport (Dimensions* viewport, Scaling* result); -void scaling_to_fill_screen (GtkWindow* window, Scaling* result); -void scaling_for_constraint (ScaleConstraint constraint, gint scale, gboolean scale_up, Scaling* result); +void scaling_for_screen (GtkWindow* window, + gboolean scale_up, + Scaling* result); +void scaling_for_viewport (Dimensions* viewport, + gboolean scale_up, + Scaling* result); +static void scaling_get_screen_dimensions (GtkWindow* window, + Dimensions* result); +void scaling_for_best_fit (gint pixels, + gboolean scale_up, + Scaling* result); +void scaling_for_widget (GtkWidget* widget, + gboolean scale_up, + Scaling* result); +void scaling_to_fill_viewport (Dimensions* viewport, + Scaling* result); +void scaling_to_fill_screen (GtkWindow* window, + Scaling* result); +void scaling_for_constraint (ScaleConstraint constraint, + gint scale, + gboolean scale_up, + Scaling* result); static gint scaling_scale_to_pixels (Scaling *self); gboolean scaling_is_unscaled (Scaling *self); -gboolean scaling_is_best_fit (Scaling *self, Dimensions* original, gint* pixels); -gboolean scaling_is_best_fit_dimensions (Scaling *self, Dimensions* original, Dimensions* scaled); -gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimensions* scaled); -gboolean scaling_is_fill_viewport (Scaling *self, Dimensions* original, Dimensions* scaled); -void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensions* result); -GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInterpType interp, gboolean scale_up); -GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gboolean scale_up); -GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp); +gboolean scaling_is_best_fit (Scaling *self, + Dimensions* original, + gint* pixels); +gboolean scaling_is_best_fit_dimensions (Scaling *self, + Dimensions* original, + Dimensions* scaled); +gboolean scaling_is_for_viewport (Scaling *self, + Dimensions* original, + Dimensions* scaled); +gboolean scaling_is_fill_viewport (Scaling *self, + Dimensions* original, + Dimensions* scaled); +void scaling_get_scaled_dimensions (Scaling *self, + Dimensions* original, + Dimensions* result); +GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, + GdkPixbuf* pixbuf, + GdkInterpType interp, + gboolean scale_up); +GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, + gint scale, + GdkInterpType interp, + gboolean scale_up); +GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, + Dimensions* resized, + GdkInterpType interp); gchar* scaling_to_string (Scaling *self); -gboolean scaling_equals (Scaling *self, Scaling* scaling); +gboolean scaling_equals (Scaling *self, + Scaling* scaling); GType zoom_state_get_type (void) G_GNUC_CONST; ZoomState* zoom_state_dup (const ZoomState* self); void zoom_state_free (ZoomState* self); -void zoom_state_init (ZoomState *self, Dimensions* content_dimensions, Dimensions* viewport_dimensions, gdouble slider_val, GdkPoint* viewport_center); +void zoom_state_init (ZoomState *self, + Dimensions* content_dimensions, + Dimensions* viewport_dimensions, + gdouble slider_val, + GdkPoint* viewport_center); static void zoom_state_compute_zoom_factors (ZoomState *self); static void zoom_state_center_viewport (ZoomState *self); static void zoom_state_clamp_viewport_center (ZoomState *self); -void zoom_state_init_rescale (ZoomState *self, ZoomState* existing, gdouble new_slider_val); -void zoom_state_init_rescale_to_isomorphic (ZoomState *self, ZoomState* existing); -void zoom_state_init_pan (ZoomState *self, ZoomState* existing, GdkPoint* new_viewport_center); +void zoom_state_init_rescale (ZoomState *self, + ZoomState* existing, + gdouble new_slider_val); +void zoom_state_init_rescale_to_isomorphic (ZoomState *self, + ZoomState* existing); +void zoom_state_init_pan (ZoomState *self, + ZoomState* existing, + GdkPoint* new_viewport_center); gint zoom_state_get_zoomed_width (ZoomState *self); gint zoom_state_get_zoomed_height (ZoomState *self); gdouble zoom_state_get_interpolation_factor (ZoomState *self); -void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle* result); -void zoom_state_get_viewing_rectangle_wrt_screen (ZoomState *self, GdkRectangle* result); -void zoom_state_get_viewing_rectangle_projection (ZoomState *self, GdkPixbuf* for_pixbuf, GdkRectangle* result); +void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, + GdkRectangle* result); +void zoom_state_get_viewing_rectangle_wrt_screen (ZoomState *self, + GdkRectangle* result); +void zoom_state_get_viewing_rectangle_projection (ZoomState *self, + GdkPixbuf* for_pixbuf, + GdkRectangle* result); gdouble zoom_state_get_zoom_factor (ZoomState *self); -void zoom_state_get_viewport_center (ZoomState *self, GdkPoint* result); +void zoom_state_get_viewport_center (ZoomState *self, + GdkPoint* result); gchar* zoom_state_to_string (ZoomState *self); gboolean zoom_state_is_min (ZoomState *self); gboolean zoom_state_is_default (ZoomState *self); gboolean zoom_state_is_isomorphic (ZoomState *self); gboolean zoom_state_is_max (ZoomState *self); -gboolean zoom_state_equals (ZoomState *self, ZoomState* other); +gboolean zoom_state_equals (ZoomState *self, + ZoomState* other); -gchar* scale_constraint_to_string (ScaleConstraint self) { +gchar* +scale_constraint_to_string (ScaleConstraint self) +{ gchar* result = NULL; #line 15 "/home/jens/Source/shotwell/src/Dimensions.vala" switch (self) { #line 15 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_ORIGINAL: -#line 161 "Dimensions.c" +#line 258 "Dimensions.c" { gchar* _tmp0_; #line 17 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -166,11 +263,11 @@ gchar* scale_constraint_to_string (ScaleConstraint self) { result = _tmp0_; #line 17 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 170 "Dimensions.c" +#line 267 "Dimensions.c" } #line 15 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_DIMENSIONS: -#line 174 "Dimensions.c" +#line 271 "Dimensions.c" { gchar* _tmp1_; #line 20 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -179,11 +276,11 @@ gchar* scale_constraint_to_string (ScaleConstraint self) { result = _tmp1_; #line 20 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 183 "Dimensions.c" +#line 280 "Dimensions.c" } #line 15 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_WIDTH: -#line 187 "Dimensions.c" +#line 284 "Dimensions.c" { gchar* _tmp2_; #line 23 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -192,11 +289,11 @@ gchar* scale_constraint_to_string (ScaleConstraint self) { result = _tmp2_; #line 23 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 196 "Dimensions.c" +#line 293 "Dimensions.c" } #line 15 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_HEIGHT: -#line 200 "Dimensions.c" +#line 297 "Dimensions.c" { gchar* _tmp3_; #line 26 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -205,11 +302,11 @@ gchar* scale_constraint_to_string (ScaleConstraint self) { result = _tmp3_; #line 26 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 209 "Dimensions.c" +#line 306 "Dimensions.c" } #line 15 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_FILL_VIEWPORT: -#line 213 "Dimensions.c" +#line 310 "Dimensions.c" { gchar* _tmp4_; #line 30 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -218,12 +315,12 @@ gchar* scale_constraint_to_string (ScaleConstraint self) { result = _tmp4_; #line 30 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 222 "Dimensions.c" +#line 319 "Dimensions.c" } default: #line 15 "/home/jens/Source/shotwell/src/Dimensions.vala" break; -#line 227 "Dimensions.c" +#line 324 "Dimensions.c" } #line 33 "/home/jens/Source/shotwell/src/Dimensions.vala" g_warn_if_reached (); @@ -231,11 +328,13 @@ gchar* scale_constraint_to_string (ScaleConstraint self) { result = NULL; #line 35 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 235 "Dimensions.c" +#line 332 "Dimensions.c" } -GType scale_constraint_get_type (void) { +GType +scale_constraint_get_type (void) +{ static volatile gsize scale_constraint_type_id__volatile = 0; if (g_once_init_enter (&scale_constraint_type_id__volatile)) { static const GEnumValue values[] = {{SCALE_CONSTRAINT_ORIGINAL, "SCALE_CONSTRAINT_ORIGINAL", "original"}, {SCALE_CONSTRAINT_DIMENSIONS, "SCALE_CONSTRAINT_DIMENSIONS", "dimensions"}, {SCALE_CONSTRAINT_WIDTH, "SCALE_CONSTRAINT_WIDTH", "width"}, {SCALE_CONSTRAINT_HEIGHT, "SCALE_CONSTRAINT_HEIGHT", "height"}, {SCALE_CONSTRAINT_FILL_VIEWPORT, "SCALE_CONSTRAINT_FILL_VIEWPORT", "fill-viewport"}, {0, NULL, NULL}}; @@ -247,86 +346,60 @@ GType scale_constraint_get_type (void) { } -void dimensions_init (Dimensions *self, gint width, gint height) { +void +dimensions_init (Dimensions *self, + gint width, + gint height) +{ gboolean _tmp0_ = FALSE; - gint _tmp1_; - gint _tmp3_; - gint _tmp4_; - gint _tmp5_; - gint _tmp6_; - gint _tmp7_; - gint _tmp8_; #line 43 "/home/jens/Source/shotwell/src/Dimensions.vala" memset (self, 0, sizeof (Dimensions)); #line 44 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = width; -#line 44 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp1_ < 0) { + if (width < 0) { #line 44 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = TRUE; -#line 268 "Dimensions.c" +#line 362 "Dimensions.c" } else { - gint _tmp2_; #line 44 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = height; -#line 44 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = _tmp2_ < 0; -#line 275 "Dimensions.c" + _tmp0_ = height < 0; +#line 366 "Dimensions.c" } #line 44 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp0_) { #line 45 "/home/jens/Source/shotwell/src/Dimensions.vala" g_warning ("Dimensions.vala:45: Tried to construct a Dimensions object with negati" \ "ve width or height - forcing sensible default values."); -#line 281 "Dimensions.c" +#line 372 "Dimensions.c" } #line 47 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = width; -#line 47 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = width; -#line 47 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = CLAMP (_tmp3_, 0, _tmp4_); -#line 47 "/home/jens/Source/shotwell/src/Dimensions.vala" - (*self).width = _tmp5_; -#line 48 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp6_ = height; -#line 48 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = height; + (*self).width = CLAMP (width, 0, width); #line 48 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp8_ = CLAMP (_tmp6_, 0, _tmp7_); -#line 48 "/home/jens/Source/shotwell/src/Dimensions.vala" - (*self).height = _tmp8_; -#line 299 "Dimensions.c" + (*self).height = CLAMP (height, 0, height); +#line 378 "Dimensions.c" } -void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result) { - GdkPixbuf* _tmp0_; - gint _tmp1_; - GdkPixbuf* _tmp2_; - gint _tmp3_; - Dimensions _tmp4_ = {0}; +void +dimensions_for_pixbuf (GdkPixbuf* pixbuf, + Dimensions* result) +{ + Dimensions _tmp0_ = {0}; #line 51 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); #line 52 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = pixbuf; -#line 52 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = gdk_pixbuf_get_width (_tmp0_); -#line 52 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = pixbuf; -#line 52 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = gdk_pixbuf_get_height (_tmp2_); + dimensions_init (&_tmp0_, gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf)); #line 52 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_init (&_tmp4_, _tmp1_, _tmp3_); -#line 52 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp4_; + *result = _tmp0_; #line 52 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 325 "Dimensions.c" +#line 395 "Dimensions.c" } -void dimensions_for_allocation (GtkAllocation* allocation, Dimensions* result) { +void +dimensions_for_allocation (GtkAllocation* allocation, + Dimensions* result) +{ GtkAllocation _tmp0_; gint _tmp1_; GtkAllocation _tmp2_; @@ -348,46 +421,49 @@ void dimensions_for_allocation (GtkAllocation* allocation, Dimensions* result) { *result = _tmp4_; #line 56 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 351 "Dimensions.c" +#line 424 "Dimensions.c" } -void dimensions_for_widget_allocation (GtkWidget* widget, Dimensions* result) { +void +dimensions_for_widget_allocation (GtkWidget* widget, + Dimensions* result) +{ GtkAllocation allocation = {0}; - GtkWidget* _tmp0_; - GtkAllocation _tmp1_ = {0}; - GtkAllocation _tmp2_; - gint _tmp3_; - GtkAllocation _tmp4_; - gint _tmp5_; - Dimensions _tmp6_ = {0}; + GtkAllocation _tmp0_ = {0}; + GtkAllocation _tmp1_; + gint _tmp2_; + GtkAllocation _tmp3_; + gint _tmp4_; + Dimensions _tmp5_ = {0}; #line 59 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (GTK_IS_WIDGET (widget)); #line 61 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = widget; + gtk_widget_get_allocation (widget, &_tmp0_); #line 61 "/home/jens/Source/shotwell/src/Dimensions.vala" - gtk_widget_get_allocation (_tmp0_, &_tmp1_); -#line 61 "/home/jens/Source/shotwell/src/Dimensions.vala" - allocation = _tmp1_; + allocation = _tmp0_; #line 63 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = allocation; + _tmp1_ = allocation; #line 63 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = _tmp2_.width; + _tmp2_ = _tmp1_.width; #line 63 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = allocation; + _tmp3_ = allocation; #line 63 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = _tmp4_.height; + _tmp4_ = _tmp3_.height; #line 63 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_init (&_tmp6_, _tmp3_, _tmp5_); + dimensions_init (&_tmp5_, _tmp2_, _tmp4_); #line 63 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp6_; + *result = _tmp5_; #line 63 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 386 "Dimensions.c" +#line 459 "Dimensions.c" } -void dimensions_for_rectangle (GdkRectangle* rect, Dimensions* result) { +void +dimensions_for_rectangle (GdkRectangle* rect, + Dimensions* result) +{ GdkRectangle _tmp0_; gint _tmp1_; GdkRectangle _tmp2_; @@ -409,11 +485,13 @@ void dimensions_for_rectangle (GdkRectangle* rect, Dimensions* result) { *result = _tmp4_; #line 67 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 412 "Dimensions.c" +#line 488 "Dimensions.c" } -gboolean dimensions_has_area (Dimensions *self) { +gboolean +dimensions_has_area (Dimensions *self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gint _tmp1_; @@ -421,27 +499,31 @@ gboolean dimensions_has_area (Dimensions *self) { _tmp1_ = (*self).width; #line 71 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp1_ > 0) { -#line 424 "Dimensions.c" +#line 502 "Dimensions.c" gint _tmp2_; #line 71 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp2_ = (*self).height; #line 71 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = _tmp2_ > 0; -#line 430 "Dimensions.c" +#line 508 "Dimensions.c" } else { #line 71 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = FALSE; -#line 434 "Dimensions.c" +#line 512 "Dimensions.c" } #line 71 "/home/jens/Source/shotwell/src/Dimensions.vala" result = _tmp0_; #line 71 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 440 "Dimensions.c" +#line 518 "Dimensions.c" } -void dimensions_floor (Dimensions *self, Dimensions* min, Dimensions* result) { +void +dimensions_floor (Dimensions *self, + Dimensions* min, + Dimensions* result) +{ gint _tmp0_ = 0; gint _tmp1_; Dimensions _tmp2_; @@ -461,13 +543,13 @@ void dimensions_floor (Dimensions *self, Dimensions* min, Dimensions* result) { _tmp3_ = _tmp2_.width; #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp1_ > _tmp3_) { -#line 464 "Dimensions.c" +#line 546 "Dimensions.c" gint _tmp4_; #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp4_ = (*self).width; #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = _tmp4_; -#line 470 "Dimensions.c" +#line 552 "Dimensions.c" } else { Dimensions _tmp5_; gint _tmp6_; @@ -477,7 +559,7 @@ void dimensions_floor (Dimensions *self, Dimensions* min, Dimensions* result) { _tmp6_ = _tmp5_.width; #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = _tmp6_; -#line 480 "Dimensions.c" +#line 562 "Dimensions.c" } #line 76 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp8_ = (*self).height; @@ -487,13 +569,13 @@ void dimensions_floor (Dimensions *self, Dimensions* min, Dimensions* result) { _tmp10_ = _tmp9_.height; #line 76 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp8_ > _tmp10_) { -#line 490 "Dimensions.c" +#line 572 "Dimensions.c" gint _tmp11_; #line 76 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp11_ = (*self).height; #line 76 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp7_ = _tmp11_; -#line 496 "Dimensions.c" +#line 578 "Dimensions.c" } else { Dimensions _tmp12_; gint _tmp13_; @@ -503,7 +585,7 @@ void dimensions_floor (Dimensions *self, Dimensions* min, Dimensions* result) { _tmp13_ = _tmp12_.height; #line 76 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp7_ = _tmp13_; -#line 506 "Dimensions.c" +#line 588 "Dimensions.c" } #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala" dimensions_init (&_tmp14_, _tmp0_, _tmp7_); @@ -511,11 +593,13 @@ void dimensions_floor (Dimensions *self, Dimensions* min, Dimensions* result) { *result = _tmp14_; #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 514 "Dimensions.c" +#line 596 "Dimensions.c" } -gchar* dimensions_to_string (Dimensions *self) { +gchar* +dimensions_to_string (Dimensions *self) +{ gchar* result = NULL; gint _tmp0_; gint _tmp1_; @@ -530,11 +614,14 @@ gchar* dimensions_to_string (Dimensions *self) { result = _tmp2_; #line 80 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 533 "Dimensions.c" +#line 617 "Dimensions.c" } -gboolean dimensions_equals (Dimensions *self, Dimensions* dim) { +gboolean +dimensions_equals (Dimensions *self, + Dimensions* dim) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gint _tmp1_; @@ -550,7 +637,7 @@ gboolean dimensions_equals (Dimensions *self, Dimensions* dim) { _tmp3_ = _tmp2_.width; #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp1_ == _tmp3_) { -#line 553 "Dimensions.c" +#line 640 "Dimensions.c" gint _tmp4_; Dimensions _tmp5_; gint _tmp6_; @@ -562,28 +649,30 @@ gboolean dimensions_equals (Dimensions *self, Dimensions* dim) { _tmp6_ = _tmp5_.height; #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = _tmp4_ == _tmp6_; -#line 565 "Dimensions.c" +#line 652 "Dimensions.c" } else { #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = FALSE; -#line 569 "Dimensions.c" +#line 656 "Dimensions.c" } #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala" result = _tmp0_; #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 575 "Dimensions.c" +#line 662 "Dimensions.c" } -gboolean dimensions_approx_equals (Dimensions *self, Dimensions* dim, gint fudge) { +gboolean +dimensions_approx_equals (Dimensions *self, + Dimensions* dim, + gint fudge) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gint _tmp1_; Dimensions _tmp2_; gint _tmp3_; - gint _tmp4_; - gint _tmp5_; #line 88 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_val_if_fail (dim != NULL, FALSE); #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -593,364 +682,304 @@ gboolean dimensions_approx_equals (Dimensions *self, Dimensions* dim, gint fudge #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp3_ = _tmp2_.width; #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = abs (_tmp1_ - _tmp3_); -#line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = fudge; -#line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp4_ <= _tmp5_) { -#line 601 "Dimensions.c" + if (abs (_tmp1_ - _tmp3_) <= fudge) { +#line 686 "Dimensions.c" + gint _tmp4_; + Dimensions _tmp5_; gint _tmp6_; - Dimensions _tmp7_; - gint _tmp8_; - gint _tmp9_; - gint _tmp10_; -#line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp6_ = (*self).height; -#line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = *dim; #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp8_ = _tmp7_.height; + _tmp4_ = (*self).height; #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp9_ = abs (_tmp6_ - _tmp8_); + _tmp5_ = *dim; #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp10_ = fudge; + _tmp6_ = _tmp5_.height; #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = _tmp9_ <= _tmp10_; -#line 619 "Dimensions.c" + _tmp0_ = abs (_tmp4_ - _tmp6_) <= fudge; +#line 698 "Dimensions.c" } else { #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = FALSE; -#line 623 "Dimensions.c" +#line 702 "Dimensions.c" } #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" result = _tmp0_; #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 629 "Dimensions.c" +#line 708 "Dimensions.c" } -gboolean dimensions_approx_scaled (Dimensions *self, gint scale, gint fudge) { +gboolean +dimensions_approx_scaled (Dimensions *self, + gint scale, + gint fudge) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gint _tmp1_; - gint _tmp2_; - gint _tmp3_; #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = (*self).width; #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = scale; -#line 93 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = fudge; -#line 93 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp1_ <= (_tmp2_ + _tmp3_)) { -#line 647 "Dimensions.c" - gint _tmp4_; - gint _tmp5_; - gint _tmp6_; -#line 93 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = (*self).height; -#line 93 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = scale; + if (_tmp1_ <= (scale + fudge)) { +#line 724 "Dimensions.c" + gint _tmp2_; #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp6_ = fudge; + _tmp2_ = (*self).height; #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = _tmp4_ <= (_tmp5_ + _tmp6_); -#line 659 "Dimensions.c" + _tmp0_ = _tmp2_ <= (scale + fudge); +#line 730 "Dimensions.c" } else { #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = FALSE; -#line 663 "Dimensions.c" +#line 734 "Dimensions.c" } #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala" result = _tmp0_; #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 669 "Dimensions.c" +#line 740 "Dimensions.c" } -gint dimensions_major_axis (Dimensions *self) { +gint +dimensions_major_axis (Dimensions *self) +{ gint result = 0; gint _tmp0_; gint _tmp1_; - gint _tmp2_; #line 97 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).width; #line 97 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = (*self).height; #line 97 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = MAX (_tmp0_, _tmp1_); -#line 97 "/home/jens/Source/shotwell/src/Dimensions.vala" - result = _tmp2_; + result = MAX (_tmp0_, _tmp1_); #line 97 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 688 "Dimensions.c" +#line 758 "Dimensions.c" } -gint dimensions_minor_axis (Dimensions *self) { +gint +dimensions_minor_axis (Dimensions *self) +{ gint result = 0; gint _tmp0_; gint _tmp1_; - gint _tmp2_; #line 101 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).width; #line 101 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = (*self).height; #line 101 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = MIN (_tmp0_, _tmp1_); -#line 101 "/home/jens/Source/shotwell/src/Dimensions.vala" - result = _tmp2_; + result = MIN (_tmp0_, _tmp1_); #line 101 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 707 "Dimensions.c" +#line 776 "Dimensions.c" } -void dimensions_with_min (Dimensions *self, gint min_width, gint min_height, Dimensions* result) { +void +dimensions_with_min (Dimensions *self, + gint min_width, + gint min_height, + Dimensions* result) +{ gint _tmp0_; gint _tmp1_; - gint _tmp2_; - gint _tmp3_; - gint _tmp4_; - gint _tmp5_; - Dimensions _tmp6_ = {0}; + Dimensions _tmp2_ = {0}; #line 105 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).width; #line 105 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = min_width; -#line 105 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = MAX (_tmp0_, _tmp1_); -#line 105 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = (*self).height; -#line 105 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = min_height; -#line 105 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = MAX (_tmp3_, _tmp4_); + _tmp1_ = (*self).height; #line 105 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_init (&_tmp6_, _tmp2_, _tmp5_); + dimensions_init (&_tmp2_, MAX (_tmp0_, min_width), MAX (_tmp1_, min_height)); #line 105 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp6_; + *result = _tmp2_; #line 105 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 737 "Dimensions.c" +#line 799 "Dimensions.c" } -void dimensions_with_max (Dimensions *self, gint max_width, gint max_height, Dimensions* result) { +void +dimensions_with_max (Dimensions *self, + gint max_width, + gint max_height, + Dimensions* result) +{ gint _tmp0_; gint _tmp1_; - gint _tmp2_; - gint _tmp3_; - gint _tmp4_; - gint _tmp5_; - Dimensions _tmp6_ = {0}; + Dimensions _tmp2_ = {0}; #line 109 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).width; #line 109 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = max_width; -#line 109 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = MIN (_tmp0_, _tmp1_); -#line 109 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = (*self).height; -#line 109 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = max_height; -#line 109 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = MIN (_tmp3_, _tmp4_); + _tmp1_ = (*self).height; #line 109 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_init (&_tmp6_, _tmp2_, _tmp5_); + dimensions_init (&_tmp2_, MIN (_tmp0_, max_width), MIN (_tmp1_, max_height)); #line 109 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp6_; + *result = _tmp2_; #line 109 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 767 "Dimensions.c" +#line 822 "Dimensions.c" } -void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dimensions* result) { - gint _tmp0_; +void +dimensions_get_scaled (Dimensions *self, + gint scale, + gboolean scale_up, + Dimensions* result) +{ + gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - gint _tmp3_; - gint _tmp4_; - gboolean _tmp15_ = FALSE; - gboolean _tmp16_; - gint _tmp25_; - gint _tmp26_; - gint _tmp27_; - gint _tmp28_; -#line 113 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = scale; + gint _tmp2_; + gboolean _tmp10_ = FALSE; + gint _tmp17_; + gint _tmp18_; #line 113 "/home/jens/Source/shotwell/src/Dimensions.vala" - _vala_assert (_tmp0_ > 0, "scale > 0"); + _vala_assert (scale > 0, "scale > 0"); #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = (*self).width; -#line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = scale; -#line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp3_ == _tmp4_) { -#line 793 "Dimensions.c" - gint _tmp5_; - gint _tmp6_; + _tmp2_ = (*self).width; #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = (*self).height; + if (_tmp2_ == scale) { +#line 844 "Dimensions.c" + gint _tmp3_; #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp6_ = scale; + _tmp3_ = (*self).height; #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = _tmp5_ < _tmp6_; -#line 802 "Dimensions.c" + _tmp1_ = _tmp3_ < scale; +#line 850 "Dimensions.c" } else { #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = FALSE; -#line 806 "Dimensions.c" + _tmp1_ = FALSE; +#line 854 "Dimensions.c" } #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp2_) { + if (_tmp1_) { #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = TRUE; -#line 812 "Dimensions.c" + _tmp0_ = TRUE; +#line 860 "Dimensions.c" } else { - gboolean _tmp7_ = FALSE; - gint _tmp8_; - gint _tmp9_; -#line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp8_ = (*self).height; -#line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp9_ = scale; + gboolean _tmp4_ = FALSE; + gint _tmp5_; #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp8_ == _tmp9_) { -#line 823 "Dimensions.c" - gint _tmp10_; - gint _tmp11_; + _tmp5_ = (*self).height; #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp10_ = (*self).width; + if (_tmp5_ == scale) { +#line 868 "Dimensions.c" + gint _tmp6_; #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp11_ = scale; + _tmp6_ = (*self).width; #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = _tmp10_ < _tmp11_; -#line 832 "Dimensions.c" + _tmp4_ = _tmp6_ < scale; +#line 874 "Dimensions.c" } else { #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = FALSE; -#line 836 "Dimensions.c" + _tmp4_ = FALSE; +#line 878 "Dimensions.c" } #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = _tmp7_; -#line 840 "Dimensions.c" + _tmp0_ = _tmp4_; +#line 882 "Dimensions.c" } #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp1_) { -#line 844 "Dimensions.c" - gint _tmp12_; - gint _tmp13_; - Dimensions _tmp14_ = {0}; + if (_tmp0_) { +#line 886 "Dimensions.c" + gint _tmp7_; + gint _tmp8_; + Dimensions _tmp9_ = {0}; #line 117 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp12_ = (*self).width; + _tmp7_ = (*self).width; #line 117 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp13_ = (*self).height; + _tmp8_ = (*self).height; #line 117 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_init (&_tmp14_, _tmp12_, _tmp13_); + dimensions_init (&_tmp9_, _tmp7_, _tmp8_); #line 117 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp14_; + *result = _tmp9_; #line 117 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 858 "Dimensions.c" +#line 900 "Dimensions.c" } #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp16_ = scale_up; -#line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (!_tmp16_) { -#line 864 "Dimensions.c" - gboolean _tmp17_ = FALSE; - gint _tmp18_; - gint _tmp19_; -#line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp18_ = (*self).width; -#line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp19_ = scale; + if (!scale_up) { +#line 904 "Dimensions.c" + gboolean _tmp11_ = FALSE; + gint _tmp12_; #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp18_ < _tmp19_) { -#line 874 "Dimensions.c" - gint _tmp20_; - gint _tmp21_; + _tmp12_ = (*self).width; #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp20_ = (*self).height; + if (_tmp12_ < scale) { +#line 911 "Dimensions.c" + gint _tmp13_; #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp21_ = scale; + _tmp13_ = (*self).height; #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp17_ = _tmp20_ < _tmp21_; -#line 883 "Dimensions.c" + _tmp11_ = _tmp13_ < scale; +#line 917 "Dimensions.c" } else { #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp17_ = FALSE; -#line 887 "Dimensions.c" + _tmp11_ = FALSE; +#line 921 "Dimensions.c" } #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp15_ = _tmp17_; -#line 891 "Dimensions.c" + _tmp10_ = _tmp11_; +#line 925 "Dimensions.c" } else { #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp15_ = FALSE; -#line 895 "Dimensions.c" + _tmp10_ = FALSE; +#line 929 "Dimensions.c" } #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp15_) { -#line 899 "Dimensions.c" - gint _tmp22_; - gint _tmp23_; - Dimensions _tmp24_ = {0}; + if (_tmp10_) { +#line 933 "Dimensions.c" + gint _tmp14_; + gint _tmp15_; + Dimensions _tmp16_ = {0}; #line 121 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp22_ = (*self).width; + _tmp14_ = (*self).width; #line 121 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp23_ = (*self).height; + _tmp15_ = (*self).height; #line 121 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_init (&_tmp24_, _tmp22_, _tmp23_); + dimensions_init (&_tmp16_, _tmp14_, _tmp15_); #line 121 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp24_; + *result = _tmp16_; #line 121 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 913 "Dimensions.c" +#line 947 "Dimensions.c" } #line 123 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp25_ = (*self).width; -#line 123 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp26_ = scale; + _tmp17_ = (*self).width; #line 123 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp27_ = (*self).height; + _tmp18_ = (*self).height; #line 123 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp28_ = scale; -#line 123 "/home/jens/Source/shotwell/src/Dimensions.vala" - if ((_tmp25_ - _tmp26_) > (_tmp27_ - _tmp28_)) { -#line 925 "Dimensions.c" - gint _tmp29_; - Dimensions _tmp30_ = {0}; + if ((_tmp17_ - scale) > (_tmp18_ - scale)) { +#line 955 "Dimensions.c" + Dimensions _tmp19_ = {0}; #line 124 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp29_ = scale; + dimensions_get_scaled_by_width (&(*self), scale, &_tmp19_); #line 124 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_get_scaled_by_width (&(*self), _tmp29_, &_tmp30_); -#line 124 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp30_; + *result = _tmp19_; #line 124 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 936 "Dimensions.c" +#line 963 "Dimensions.c" } else { - gint _tmp31_; - Dimensions _tmp32_ = {0}; -#line 126 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp31_ = scale; + Dimensions _tmp20_ = {0}; #line 126 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_get_scaled_by_height (&(*self), _tmp31_, &_tmp32_); + dimensions_get_scaled_by_height (&(*self), scale, &_tmp20_); #line 126 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp32_; + *result = _tmp20_; #line 126 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 948 "Dimensions.c" +#line 972 "Dimensions.c" } } -void dimensions_get_scale_ratios (Dimensions *self, Dimensions* scaled, gdouble* width_ratio, gdouble* height_ratio) { +void +dimensions_get_scale_ratios (Dimensions *self, + Dimensions* scaled, + gdouble* width_ratio, + gdouble* height_ratio) +{ gdouble _vala_width_ratio = 0.0; gdouble _vala_height_ratio = 0.0; Dimensions _tmp0_; @@ -981,18 +1010,20 @@ void dimensions_get_scale_ratios (Dimensions *self, Dimensions* scaled, gdouble* if (width_ratio) { #line 129 "/home/jens/Source/shotwell/src/Dimensions.vala" *width_ratio = _vala_width_ratio; -#line 984 "Dimensions.c" +#line 1013 "Dimensions.c" } #line 129 "/home/jens/Source/shotwell/src/Dimensions.vala" if (height_ratio) { #line 129 "/home/jens/Source/shotwell/src/Dimensions.vala" *height_ratio = _vala_height_ratio; -#line 990 "Dimensions.c" +#line 1019 "Dimensions.c" } } -gdouble dimensions_get_aspect_ratio (Dimensions *self) { +gdouble +dimensions_get_aspect_ratio (Dimensions *self) +{ gdouble result = 0.0; gint _tmp0_; gint _tmp1_; @@ -1004,11 +1035,15 @@ gdouble dimensions_get_aspect_ratio (Dimensions *self) { result = ((gdouble) _tmp0_) / _tmp1_; #line 135 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 1007 "Dimensions.c" +#line 1038 "Dimensions.c" } -void dimensions_get_scaled_proportional (Dimensions *self, Dimensions* viewport, Dimensions* result) { +void +dimensions_get_scaled_proportional (Dimensions *self, + Dimensions* viewport, + Dimensions* result) +{ gdouble width_ratio = 0.0; gdouble height_ratio = 0.0; Dimensions _tmp0_; @@ -1021,19 +1056,17 @@ void dimensions_get_scaled_proportional (Dimensions *self, Dimensions* viewport, Dimensions scaled = {0}; gdouble _tmp13_; gdouble _tmp14_; - gdouble _tmp15_; - gdouble _tmp16_; + Dimensions _tmp15_ = {0}; + Dimensions _tmp16_ = {0}; Dimensions _tmp17_ = {0}; - Dimensions _tmp18_ = {0}; - Dimensions _tmp19_ = {0}; + Dimensions _tmp18_; + gint _tmp19_; Dimensions _tmp20_; gint _tmp21_; Dimensions _tmp22_; gint _tmp23_; Dimensions _tmp24_; gint _tmp25_; - Dimensions _tmp26_; - gint _tmp27_; #line 138 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (viewport != NULL); #line 140 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -1050,7 +1083,7 @@ void dimensions_get_scaled_proportional (Dimensions *self, Dimensions* viewport, _tmp4_ = height_ratio; #line 143 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp3_ < _tmp4_) { -#line 1053 "Dimensions.c" +#line 1086 "Dimensions.c" Dimensions _tmp5_; gint _tmp6_; gint _tmp7_; @@ -1067,7 +1100,7 @@ void dimensions_get_scaled_proportional (Dimensions *self, Dimensions* viewport, _tmp8_ = width_ratio; #line 145 "/home/jens/Source/shotwell/src/Dimensions.vala" scaled_height = ((gdouble) _tmp7_) * _tmp8_; -#line 1070 "Dimensions.c" +#line 1103 "Dimensions.c" } else { gint _tmp9_; gdouble _tmp10_; @@ -1085,53 +1118,53 @@ void dimensions_get_scaled_proportional (Dimensions *self, Dimensions* viewport, _tmp12_ = _tmp11_.height; #line 148 "/home/jens/Source/shotwell/src/Dimensions.vala" scaled_height = (gdouble) _tmp12_; -#line 1088 "Dimensions.c" +#line 1121 "Dimensions.c" } #line 151 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp13_ = scaled_width; #line 151 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp14_ = round (_tmp13_); -#line 151 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp15_ = scaled_height; + _tmp14_ = scaled_height; #line 151 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp16_ = round (_tmp15_); + dimensions_init (&_tmp15_, (gint) round (_tmp13_), (gint) round (_tmp14_)); #line 151 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_init (&_tmp17_, (gint) _tmp14_, (gint) _tmp16_); + dimensions_init (&_tmp16_, 1, 1); #line 151 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_init (&_tmp18_, 1, 1); + dimensions_floor (&_tmp15_, &_tmp16_, &_tmp17_); #line 151 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_floor (&_tmp17_, &_tmp18_, &_tmp19_); -#line 151 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaled = _tmp19_; + scaled = _tmp17_; #line 153 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp20_ = scaled; + _tmp18_ = scaled; #line 153 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp21_ = _tmp20_.height; + _tmp19_ = _tmp18_.height; #line 153 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp22_ = *viewport; + _tmp20_ = *viewport; #line 153 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp23_ = _tmp22_.height; + _tmp21_ = _tmp20_.height; #line 153 "/home/jens/Source/shotwell/src/Dimensions.vala" - _vala_assert (_tmp21_ <= _tmp23_, "scaled.height <= viewport.height"); + _vala_assert (_tmp19_ <= _tmp21_, "scaled.height <= viewport.height"); #line 154 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp24_ = scaled; + _tmp22_ = scaled; #line 154 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp25_ = _tmp24_.width; + _tmp23_ = _tmp22_.width; #line 154 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp26_ = *viewport; + _tmp24_ = *viewport; #line 154 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp27_ = _tmp26_.width; + _tmp25_ = _tmp24_.width; #line 154 "/home/jens/Source/shotwell/src/Dimensions.vala" - _vala_assert (_tmp25_ <= _tmp27_, "scaled.width <= viewport.width"); + _vala_assert (_tmp23_ <= _tmp25_, "scaled.width <= viewport.width"); #line 156 "/home/jens/Source/shotwell/src/Dimensions.vala" *result = scaled; #line 156 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1130 "Dimensions.c" +#line 1159 "Dimensions.c" } -void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewport, Dimensions* result) { +void +dimensions_get_scaled_to_fill_viewport (Dimensions *self, + Dimensions* viewport, + Dimensions* result) +{ gdouble width_ratio = 0.0; gdouble height_ratio = 0.0; Dimensions _tmp0_; @@ -1143,13 +1176,11 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp gint _tmp4_; Dimensions _tmp5_; gint _tmp6_; + gdouble _tmp31_; gdouble _tmp32_; - gdouble _tmp33_; - gdouble _tmp34_; - gdouble _tmp35_; - Dimensions _tmp36_ = {0}; - Dimensions _tmp37_ = {0}; - Dimensions _tmp38_ = {0}; + Dimensions _tmp33_ = {0}; + Dimensions _tmp34_ = {0}; + Dimensions _tmp35_ = {0}; #line 159 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (viewport != NULL); #line 161 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -1168,7 +1199,7 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp _tmp6_ = _tmp5_.width; #line 164 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp4_ < _tmp6_) { -#line 1171 "Dimensions.c" +#line 1202 "Dimensions.c" gint _tmp7_; Dimensions _tmp8_; gint _tmp9_; @@ -1180,15 +1211,15 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp _tmp9_ = _tmp8_.height; #line 164 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp3_ = _tmp7_ >= _tmp9_; -#line 1183 "Dimensions.c" +#line 1214 "Dimensions.c" } else { #line 164 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp3_ = FALSE; -#line 1187 "Dimensions.c" +#line 1218 "Dimensions.c" } #line 164 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp3_) { -#line 1191 "Dimensions.c" +#line 1222 "Dimensions.c" Dimensions _tmp10_; gint _tmp11_; gint _tmp12_; @@ -1205,7 +1236,7 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp _tmp13_ = width_ratio; #line 167 "/home/jens/Source/shotwell/src/Dimensions.vala" scaled_height = ((gdouble) _tmp12_) * _tmp13_; -#line 1208 "Dimensions.c" +#line 1239 "Dimensions.c" } else { gboolean _tmp14_ = FALSE; gint _tmp15_; @@ -1219,7 +1250,7 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp _tmp17_ = _tmp16_.width; #line 168 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp15_ >= _tmp17_) { -#line 1222 "Dimensions.c" +#line 1253 "Dimensions.c" gint _tmp18_; Dimensions _tmp19_; gint _tmp20_; @@ -1231,15 +1262,15 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp _tmp20_ = _tmp19_.height; #line 168 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp14_ = _tmp18_ < _tmp20_; -#line 1234 "Dimensions.c" +#line 1265 "Dimensions.c" } else { #line 168 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp14_ = FALSE; -#line 1238 "Dimensions.c" +#line 1269 "Dimensions.c" } #line 168 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp14_) { -#line 1242 "Dimensions.c" +#line 1273 "Dimensions.c" gint _tmp21_; gdouble _tmp22_; Dimensions _tmp23_; @@ -1256,62 +1287,60 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp _tmp24_ = _tmp23_.height; #line 171 "/home/jens/Source/shotwell/src/Dimensions.vala" scaled_height = (gdouble) _tmp24_; -#line 1259 "Dimensions.c" +#line 1290 "Dimensions.c" } else { gdouble ratio = 0.0; gdouble _tmp25_; gdouble _tmp26_; - gdouble _tmp27_; - gint _tmp28_; - gdouble _tmp29_; - gint _tmp30_; - gdouble _tmp31_; + gint _tmp27_; + gdouble _tmp28_; + gint _tmp29_; + gdouble _tmp30_; #line 174 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp25_ = width_ratio; #line 174 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp26_ = height_ratio; #line 174 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp27_ = MAX (_tmp25_, _tmp26_); -#line 174 "/home/jens/Source/shotwell/src/Dimensions.vala" - ratio = _tmp27_; + ratio = MAX (_tmp25_, _tmp26_); #line 176 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp28_ = (*self).width; + _tmp27_ = (*self).width; #line 176 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp29_ = ratio; + _tmp28_ = ratio; #line 176 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaled_width = ((gdouble) _tmp28_) * _tmp29_; + scaled_width = ((gdouble) _tmp27_) * _tmp28_; #line 177 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp30_ = (*self).height; + _tmp29_ = (*self).height; #line 177 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp31_ = ratio; + _tmp30_ = ratio; #line 177 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaled_height = ((gdouble) _tmp30_) * _tmp31_; -#line 1289 "Dimensions.c" + scaled_height = ((gdouble) _tmp29_) * _tmp30_; +#line 1317 "Dimensions.c" } } #line 180 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp32_ = scaled_width; + _tmp31_ = scaled_width; #line 180 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp33_ = round (_tmp32_); + _tmp32_ = scaled_height; #line 180 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp34_ = scaled_height; + dimensions_init (&_tmp33_, (gint) round (_tmp31_), (gint) round (_tmp32_)); #line 180 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp35_ = round (_tmp34_); + dimensions_init (&_tmp34_, 1, 1); #line 180 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_init (&_tmp36_, (gint) _tmp33_, (gint) _tmp35_); + dimensions_floor (&_tmp33_, &_tmp34_, &_tmp35_); #line 180 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_init (&_tmp37_, 1, 1); -#line 180 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_floor (&_tmp36_, &_tmp37_, &_tmp38_); -#line 180 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp38_; + *result = _tmp35_; #line 180 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1310 "Dimensions.c" +#line 1334 "Dimensions.c" } -void dimensions_get_scaled_rectangle (Dimensions *self, Dimensions* scaled, GdkRectangle* rect, GdkRectangle* result) { +void +dimensions_get_scaled_rectangle (Dimensions *self, + Dimensions* scaled, + GdkRectangle* rect, + GdkRectangle* result) +{ gdouble x_scale = 0.0; gdouble y_scale = 0.0; Dimensions _tmp0_; @@ -1321,23 +1350,19 @@ void dimensions_get_scaled_rectangle (Dimensions *self, Dimensions* scaled, GdkR GdkRectangle _tmp3_; gint _tmp4_; gdouble _tmp5_; - gdouble _tmp6_; - GdkRectangle _tmp7_; - gint _tmp8_; - gdouble _tmp9_; - gdouble _tmp10_; - GdkRectangle _tmp11_; - gint _tmp12_; - gdouble _tmp13_; + GdkRectangle _tmp6_; + gint _tmp7_; + gdouble _tmp8_; + GdkRectangle _tmp9_; + gint _tmp10_; + gdouble _tmp11_; + GdkRectangle _tmp12_; + gint _tmp13_; gdouble _tmp14_; GdkRectangle _tmp15_; gint _tmp16_; - gdouble _tmp17_; - gdouble _tmp18_; - GdkRectangle _tmp19_; - gint _tmp20_; - GdkRectangle _tmp21_; - gint _tmp22_; + GdkRectangle _tmp17_; + gint _tmp18_; #line 183 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (scaled != NULL); #line 183 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -1359,82 +1384,76 @@ void dimensions_get_scaled_rectangle (Dimensions *self, Dimensions* scaled, GdkR #line 188 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp5_ = x_scale; #line 188 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp6_ = round (((gdouble) _tmp4_) * _tmp5_); -#line 188 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaled_rect.x = (gint) _tmp6_; -#line 189 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = *rect; + scaled_rect.x = (gint) round (((gdouble) _tmp4_) * _tmp5_); #line 189 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp8_ = _tmp7_.y; + _tmp6_ = *rect; #line 189 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp9_ = y_scale; + _tmp7_ = _tmp6_.y; #line 189 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp10_ = round (((gdouble) _tmp8_) * _tmp9_); + _tmp8_ = y_scale; #line 189 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaled_rect.y = (gint) _tmp10_; + scaled_rect.y = (gint) round (((gdouble) _tmp7_) * _tmp8_); #line 190 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp11_ = *rect; + _tmp9_ = *rect; #line 190 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp12_ = _tmp11_.width; + _tmp10_ = _tmp9_.width; #line 190 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp13_ = x_scale; + _tmp11_ = x_scale; #line 190 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp14_ = round (((gdouble) _tmp12_) * _tmp13_); -#line 190 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaled_rect.width = (gint) _tmp14_; -#line 191 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp15_ = *rect; + scaled_rect.width = (gint) round (((gdouble) _tmp10_) * _tmp11_); #line 191 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp16_ = _tmp15_.height; + _tmp12_ = *rect; #line 191 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp17_ = y_scale; + _tmp13_ = _tmp12_.height; #line 191 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp18_ = round (((gdouble) _tmp16_) * _tmp17_); + _tmp14_ = y_scale; #line 191 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaled_rect.height = (gint) _tmp18_; + scaled_rect.height = (gint) round (((gdouble) _tmp13_) * _tmp14_); #line 193 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp19_ = scaled_rect; + _tmp15_ = scaled_rect; #line 193 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp20_ = _tmp19_.width; + _tmp16_ = _tmp15_.width; #line 193 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp20_ <= 0) { + if (_tmp16_ <= 0) { #line 194 "/home/jens/Source/shotwell/src/Dimensions.vala" scaled_rect.width = 1; -#line 1403 "Dimensions.c" +#line 1420 "Dimensions.c" } #line 196 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp21_ = scaled_rect; + _tmp17_ = scaled_rect; #line 196 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp22_ = _tmp21_.height; + _tmp18_ = _tmp17_.height; #line 196 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp22_ <= 0) { + if (_tmp18_ <= 0) { #line 197 "/home/jens/Source/shotwell/src/Dimensions.vala" scaled_rect.height = 1; -#line 1413 "Dimensions.c" +#line 1430 "Dimensions.c" } #line 199 "/home/jens/Source/shotwell/src/Dimensions.vala" *result = scaled_rect; #line 199 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1419 "Dimensions.c" +#line 1436 "Dimensions.c" } -void dimensions_get_scaled_similar (Dimensions *self, Dimensions* original, Dimensions* scaled, Dimensions* result) { +void +dimensions_get_scaled_similar (Dimensions *self, + Dimensions* original, + Dimensions* scaled, + Dimensions* result) +{ gdouble x_scale = 0.0; gdouble y_scale = 0.0; Dimensions _tmp0_; gdouble _tmp1_ = 0.0; gdouble _tmp2_ = 0.0; gdouble scale = 0.0; - gdouble _tmp3_; + gint _tmp3_; gint _tmp4_; - gdouble _tmp5_; - gint _tmp6_; - gdouble _tmp7_; - Dimensions _tmp8_ = {0}; - Dimensions _tmp9_ = {0}; - Dimensions _tmp10_ = {0}; + Dimensions _tmp5_ = {0}; + Dimensions _tmp6_ = {0}; + Dimensions _tmp7_ = {0}; #line 203 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (original != NULL); #line 203 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -1448,224 +1467,191 @@ void dimensions_get_scaled_similar (Dimensions *self, Dimensions* original, Dime #line 205 "/home/jens/Source/shotwell/src/Dimensions.vala" y_scale = _tmp2_; #line 207 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = MIN (x_scale, y_scale); -#line 207 "/home/jens/Source/shotwell/src/Dimensions.vala" - scale = _tmp3_; -#line 209 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = (*self).width; + scale = MIN (x_scale, y_scale); #line 209 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = round (((gdouble) _tmp4_) * scale); -#line 209 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp6_ = (*self).height; + _tmp3_ = (*self).width; #line 209 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = round (((gdouble) _tmp6_) * scale); + _tmp4_ = (*self).height; #line 209 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_init (&_tmp8_, (gint) _tmp5_, (gint) _tmp7_); + dimensions_init (&_tmp5_, (gint) round (((gdouble) _tmp3_) * scale), (gint) round (((gdouble) _tmp4_) * scale)); #line 209 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_init (&_tmp9_, 1, 1); + dimensions_init (&_tmp6_, 1, 1); #line 209 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_floor (&_tmp8_, &_tmp9_, &_tmp10_); + dimensions_floor (&_tmp5_, &_tmp6_, &_tmp7_); #line 209 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp10_; + *result = _tmp7_; #line 209 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1472 "Dimensions.c" +#line 1485 "Dimensions.c" } -void dimensions_get_scaled_by_width (Dimensions *self, gint scale, Dimensions* result) { - gint _tmp0_; +void +dimensions_get_scaled_by_width (Dimensions *self, + gint scale, + Dimensions* result) +{ gdouble ratio = 0.0; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; - gint _tmp3_; - gint _tmp4_; - gdouble _tmp5_; - Dimensions _tmp6_ = {0}; - Dimensions _tmp7_ = {0}; - Dimensions _tmp8_ = {0}; -#line 214 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = scale; + Dimensions _tmp2_ = {0}; + Dimensions _tmp3_ = {0}; + Dimensions _tmp4_ = {0}; #line 214 "/home/jens/Source/shotwell/src/Dimensions.vala" - _vala_assert (_tmp0_ > 0, "scale > 0"); -#line 216 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = scale; + _vala_assert (scale > 0, "scale > 0"); #line 216 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = (*self).width; + _tmp0_ = (*self).width; #line 216 "/home/jens/Source/shotwell/src/Dimensions.vala" - ratio = ((gdouble) _tmp1_) / ((gdouble) _tmp2_); + ratio = ((gdouble) scale) / ((gdouble) _tmp0_); #line 218 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = scale; -#line 218 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = (*self).height; -#line 218 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = round (((gdouble) _tmp4_) * ratio); + _tmp1_ = (*self).height; #line 218 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_init (&_tmp6_, _tmp3_, (gint) _tmp5_); + dimensions_init (&_tmp2_, scale, (gint) round (((gdouble) _tmp1_) * ratio)); #line 218 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_init (&_tmp7_, 1, 1); + dimensions_init (&_tmp3_, 1, 1); #line 218 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_floor (&_tmp6_, &_tmp7_, &_tmp8_); + dimensions_floor (&_tmp2_, &_tmp3_, &_tmp4_); #line 218 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp8_; + *result = _tmp4_; #line 218 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1513 "Dimensions.c" +#line 1518 "Dimensions.c" } -void dimensions_get_scaled_by_height (Dimensions *self, gint scale, Dimensions* result) { - gint _tmp0_; +void +dimensions_get_scaled_by_height (Dimensions *self, + gint scale, + Dimensions* result) +{ gdouble ratio = 0.0; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; - gint _tmp3_; - gdouble _tmp4_; - gint _tmp5_; - Dimensions _tmp6_ = {0}; - Dimensions _tmp7_ = {0}; - Dimensions _tmp8_ = {0}; -#line 222 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = scale; + Dimensions _tmp2_ = {0}; + Dimensions _tmp3_ = {0}; + Dimensions _tmp4_ = {0}; #line 222 "/home/jens/Source/shotwell/src/Dimensions.vala" - _vala_assert (_tmp0_ > 0, "scale > 0"); -#line 224 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = scale; + _vala_assert (scale > 0, "scale > 0"); #line 224 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = (*self).height; + _tmp0_ = (*self).height; #line 224 "/home/jens/Source/shotwell/src/Dimensions.vala" - ratio = ((gdouble) _tmp1_) / ((gdouble) _tmp2_); + ratio = ((gdouble) scale) / ((gdouble) _tmp0_); #line 226 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = (*self).width; -#line 226 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = round (((gdouble) _tmp3_) * ratio); + _tmp1_ = (*self).width; #line 226 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = scale; + dimensions_init (&_tmp2_, (gint) round (((gdouble) _tmp1_) * ratio), scale); #line 226 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_init (&_tmp6_, (gint) _tmp4_, _tmp5_); + dimensions_init (&_tmp3_, 1, 1); #line 226 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_init (&_tmp7_, 1, 1); + dimensions_floor (&_tmp2_, &_tmp3_, &_tmp4_); #line 226 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_floor (&_tmp6_, &_tmp7_, &_tmp8_); -#line 226 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp8_; + *result = _tmp4_; #line 226 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1554 "Dimensions.c" +#line 1551 "Dimensions.c" } -void dimensions_get_scaled_by_constraint (Dimensions *self, gint scale, ScaleConstraint constraint, Dimensions* result) { - ScaleConstraint _tmp0_; -#line 230 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = constraint; +void +dimensions_get_scaled_by_constraint (Dimensions *self, + gint scale, + ScaleConstraint constraint, + Dimensions* result) +{ #line 230 "/home/jens/Source/shotwell/src/Dimensions.vala" - switch (_tmp0_) { + switch (constraint) { #line 230 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_ORIGINAL: -#line 1566 "Dimensions.c" +#line 1565 "Dimensions.c" { + gint _tmp0_; gint _tmp1_; - gint _tmp2_; - Dimensions _tmp3_ = {0}; + Dimensions _tmp2_ = {0}; #line 232 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = (*self).width; + _tmp0_ = (*self).width; #line 232 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = (*self).height; + _tmp1_ = (*self).height; #line 232 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_init (&_tmp3_, _tmp1_, _tmp2_); + dimensions_init (&_tmp2_, _tmp0_, _tmp1_); #line 232 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp3_; + *result = _tmp2_; #line 232 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1581 "Dimensions.c" +#line 1580 "Dimensions.c" } #line 230 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_DIMENSIONS: -#line 1585 "Dimensions.c" +#line 1584 "Dimensions.c" { - Dimensions _tmp4_ = {0}; + Dimensions _tmp3_ = {0}; + gint _tmp4_; gint _tmp5_; - gint _tmp6_; #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = (*self).width; + _tmp4_ = (*self).width; #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp6_ = (*self).height; + _tmp5_ = (*self).height; #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp5_ >= _tmp6_) { -#line 1596 "Dimensions.c" - gint _tmp7_; - Dimensions _tmp8_ = {0}; + if (_tmp4_ >= _tmp5_) { +#line 1595 "Dimensions.c" + Dimensions _tmp6_ = {0}; #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = scale; + dimensions_get_scaled_by_width (&(*self), scale, &_tmp6_); #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_get_scaled_by_width (&(*self), _tmp7_, &_tmp8_); -#line 235 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = _tmp8_; -#line 1605 "Dimensions.c" + _tmp3_ = _tmp6_; +#line 1601 "Dimensions.c" } else { - gint _tmp9_; - Dimensions _tmp10_ = {0}; -#line 235 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp9_ = scale; + Dimensions _tmp7_ = {0}; #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_get_scaled_by_height (&(*self), _tmp9_, &_tmp10_); + dimensions_get_scaled_by_height (&(*self), scale, &_tmp7_); #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = _tmp10_; -#line 1615 "Dimensions.c" + _tmp3_ = _tmp7_; +#line 1608 "Dimensions.c" } #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp4_; + *result = _tmp3_; #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1621 "Dimensions.c" +#line 1614 "Dimensions.c" } #line 230 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_WIDTH: -#line 1625 "Dimensions.c" +#line 1618 "Dimensions.c" { - gint _tmp11_; - Dimensions _tmp12_ = {0}; -#line 238 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp11_ = scale; + Dimensions _tmp8_ = {0}; #line 238 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_get_scaled_by_width (&(*self), _tmp11_, &_tmp12_); + dimensions_get_scaled_by_width (&(*self), scale, &_tmp8_); #line 238 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp12_; + *result = _tmp8_; #line 238 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1637 "Dimensions.c" +#line 1627 "Dimensions.c" } #line 230 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_HEIGHT: -#line 1641 "Dimensions.c" +#line 1631 "Dimensions.c" { - gint _tmp13_; - Dimensions _tmp14_ = {0}; + Dimensions _tmp9_ = {0}; #line 241 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp13_ = scale; + dimensions_get_scaled_by_height (&(*self), scale, &_tmp9_); #line 241 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_get_scaled_by_height (&(*self), _tmp13_, &_tmp14_); -#line 241 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp14_; + *result = _tmp9_; #line 241 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1653 "Dimensions.c" +#line 1640 "Dimensions.c" } default: { - ScaleConstraint _tmp15_; -#line 244 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp15_ = constraint; #line 244 "/home/jens/Source/shotwell/src/Dimensions.vala" - g_error ("Dimensions.vala:244: Bad constraint: %d", (gint) _tmp15_); -#line 1662 "Dimensions.c" + g_error ("Dimensions.vala:244: Bad constraint: %d", (gint) constraint); +#line 1646 "Dimensions.c" } } } -Dimensions* dimensions_dup (const Dimensions* self) { +Dimensions* +dimensions_dup (const Dimensions* self) +{ Dimensions* dup; #line 39 "/home/jens/Source/shotwell/src/Dimensions.vala" dup = g_new0 (Dimensions, 1); @@ -1673,18 +1659,22 @@ Dimensions* dimensions_dup (const Dimensions* self) { memcpy (dup, self, sizeof (Dimensions)); #line 39 "/home/jens/Source/shotwell/src/Dimensions.vala" return dup; -#line 1676 "Dimensions.c" +#line 1662 "Dimensions.c" } -void dimensions_free (Dimensions* self) { +void +dimensions_free (Dimensions* self) +{ #line 39 "/home/jens/Source/shotwell/src/Dimensions.vala" g_free (self); -#line 1683 "Dimensions.c" +#line 1671 "Dimensions.c" } -GType dimensions_get_type (void) { +GType +dimensions_get_type (void) +{ static volatile gsize dimensions_type_id__volatile = 0; if (g_once_init_enter (&dimensions_type_id__volatile)) { GType dimensions_type_id; @@ -1695,36 +1685,35 @@ GType dimensions_get_type (void) { } -static void scaling_init (Scaling *self, ScaleConstraint constraint, gint scale, Dimensions* viewport, gboolean scale_up) { - ScaleConstraint _tmp0_; - gint _tmp1_; - Dimensions _tmp2_; - gboolean _tmp3_; +static void +scaling_init (Scaling *self, + ScaleConstraint constraint, + gint scale, + Dimensions* viewport, + gboolean scale_up) +{ + Dimensions _tmp0_; #line 257 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (viewport != NULL); #line 257 "/home/jens/Source/shotwell/src/Dimensions.vala" memset (self, 0, sizeof (Scaling)); #line 258 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = constraint; -#line 258 "/home/jens/Source/shotwell/src/Dimensions.vala" - (*self).constraint = _tmp0_; -#line 259 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = scale; + (*self).constraint = constraint; #line 259 "/home/jens/Source/shotwell/src/Dimensions.vala" - (*self).scale = _tmp1_; + (*self).scale = scale; #line 260 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = *viewport; + _tmp0_ = *viewport; #line 260 "/home/jens/Source/shotwell/src/Dimensions.vala" - (*self).viewport = _tmp2_; -#line 261 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = scale_up; + (*self).viewport = _tmp0_; #line 261 "/home/jens/Source/shotwell/src/Dimensions.vala" - (*self).scale_up = _tmp3_; -#line 1723 "Dimensions.c" + (*self).scale_up = scale_up; +#line 1710 "Dimensions.c" } -void scaling_for_original (Scaling* result) { +void +scaling_for_original (Scaling* result) +{ Dimensions _tmp0_ = {0}; Scaling _tmp1_ = {0}; #line 265 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -1735,149 +1724,141 @@ void scaling_for_original (Scaling* result) { *result = _tmp1_; #line 265 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1738 "Dimensions.c" +#line 1727 "Dimensions.c" } -void scaling_for_screen (GtkWindow* window, gboolean scale_up, Scaling* result) { - GtkWindow* _tmp0_; - Dimensions _tmp1_ = {0}; - gboolean _tmp2_; - Scaling _tmp3_ = {0}; +void +scaling_for_screen (GtkWindow* window, + gboolean scale_up, + Scaling* result) +{ + Dimensions _tmp0_ = {0}; + Scaling _tmp1_ = {0}; #line 268 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (GTK_IS_WINDOW (window)); #line 269 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = window; -#line 269 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaling_get_screen_dimensions (_tmp0_, &_tmp1_); -#line 269 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = scale_up; + scaling_get_screen_dimensions (window, &_tmp0_); #line 269 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaling_for_viewport (&_tmp1_, _tmp2_, &_tmp3_); + scaling_for_viewport (&_tmp0_, scale_up, &_tmp1_); #line 269 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp3_; + *result = _tmp1_; #line 269 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1761 "Dimensions.c" +#line 1748 "Dimensions.c" } -void scaling_for_best_fit (gint pixels, gboolean scale_up, Scaling* result) { - gint _tmp0_; - gint _tmp1_; - Dimensions _tmp2_ = {0}; - gboolean _tmp3_; - Scaling _tmp4_ = {0}; -#line 273 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = pixels; +void +scaling_for_best_fit (gint pixels, + gboolean scale_up, + Scaling* result) +{ + Dimensions _tmp0_ = {0}; + Scaling _tmp1_ = {0}; #line 273 "/home/jens/Source/shotwell/src/Dimensions.vala" - _vala_assert (_tmp0_ > 0, "pixels > 0"); + _vala_assert (pixels > 0, "pixels > 0"); #line 275 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = pixels; -#line 275 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_init (&_tmp2_, 0, 0); -#line 275 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = scale_up; + dimensions_init (&_tmp0_, 0, 0); #line 275 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaling_init (&_tmp4_, SCALE_CONSTRAINT_DIMENSIONS, _tmp1_, &_tmp2_, _tmp3_); + scaling_init (&_tmp1_, SCALE_CONSTRAINT_DIMENSIONS, pixels, &_tmp0_, scale_up); #line 275 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp4_; + *result = _tmp1_; #line 275 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1787 "Dimensions.c" +#line 1769 "Dimensions.c" } -void scaling_for_viewport (Dimensions* viewport, gboolean scale_up, Scaling* result) { - gboolean _tmp0_; - Dimensions _tmp1_; - gboolean _tmp2_; - Scaling _tmp3_ = {0}; +void +scaling_for_viewport (Dimensions* viewport, + gboolean scale_up, + Scaling* result) +{ + Dimensions _tmp0_; + Scaling _tmp1_ = {0}; #line 278 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (viewport != NULL); #line 279 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = dimensions_has_area (viewport); -#line 279 "/home/jens/Source/shotwell/src/Dimensions.vala" - _vala_assert (_tmp0_, "viewport.has_area()"); -#line 281 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = *viewport; + _vala_assert (dimensions_has_area (viewport), "viewport.has_area()"); #line 281 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = scale_up; + _tmp0_ = *viewport; #line 281 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaling_init (&_tmp3_, SCALE_CONSTRAINT_DIMENSIONS, SCALING_NO_SCALE, &_tmp1_, _tmp2_); + scaling_init (&_tmp1_, SCALE_CONSTRAINT_DIMENSIONS, SCALING_NO_SCALE, &_tmp0_, scale_up); #line 281 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp3_; + *result = _tmp1_; #line 281 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1812 "Dimensions.c" +#line 1792 "Dimensions.c" } -void scaling_for_widget (GtkWidget* widget, gboolean scale_up, Scaling* result) { +void +scaling_for_widget (GtkWidget* widget, + gboolean scale_up, + Scaling* result) +{ Dimensions viewport = {0}; - GtkWidget* _tmp0_; - Dimensions _tmp1_ = {0}; - gboolean _tmp2_ = FALSE; - Dimensions _tmp3_; - gint _tmp4_; - Dimensions _tmp8_; - gboolean _tmp9_; - Scaling _tmp10_ = {0}; + Dimensions _tmp0_ = {0}; + gboolean _tmp1_ = FALSE; + Dimensions _tmp2_; + gint _tmp3_; + Dimensions _tmp7_; + Scaling _tmp8_ = {0}; #line 284 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (GTK_IS_WIDGET (widget)); #line 285 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = widget; -#line 285 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_for_widget_allocation (_tmp0_, &_tmp1_); + dimensions_for_widget_allocation (widget, &_tmp0_); #line 285 "/home/jens/Source/shotwell/src/Dimensions.vala" - viewport = _tmp1_; + viewport = _tmp0_; #line 295 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = viewport; + _tmp2_ = viewport; #line 295 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = _tmp3_.width; + _tmp3_ = _tmp2_.width; #line 295 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp4_ <= 1) { + if (_tmp3_ <= 1) { #line 295 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = TRUE; -#line 1842 "Dimensions.c" + _tmp1_ = TRUE; +#line 1822 "Dimensions.c" } else { - Dimensions _tmp5_; - gint _tmp6_; + Dimensions _tmp4_; + gint _tmp5_; #line 295 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = viewport; + _tmp4_ = viewport; #line 295 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp6_ = _tmp5_.height; + _tmp5_ = _tmp4_.height; #line 295 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = _tmp6_ <= 1; -#line 1852 "Dimensions.c" + _tmp1_ = _tmp5_ <= 1; +#line 1832 "Dimensions.c" } #line 295 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp2_) { -#line 1856 "Dimensions.c" - Scaling _tmp7_ = {0}; + if (_tmp1_) { +#line 1836 "Dimensions.c" + Scaling _tmp6_ = {0}; #line 296 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaling_for_original (&_tmp7_); + scaling_for_original (&_tmp6_); #line 296 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp7_; + *result = _tmp6_; #line 296 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1864 "Dimensions.c" +#line 1844 "Dimensions.c" } #line 298 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp8_ = viewport; -#line 298 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp9_ = scale_up; + _tmp7_ = viewport; #line 298 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaling_init (&_tmp10_, SCALE_CONSTRAINT_DIMENSIONS, SCALING_NO_SCALE, &_tmp8_, _tmp9_); + scaling_init (&_tmp8_, SCALE_CONSTRAINT_DIMENSIONS, SCALING_NO_SCALE, &_tmp7_, scale_up); #line 298 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp10_; + *result = _tmp8_; #line 298 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1876 "Dimensions.c" +#line 1854 "Dimensions.c" } -void scaling_to_fill_viewport (Dimensions* viewport, Scaling* result) { +void +scaling_to_fill_viewport (Dimensions* viewport, + Scaling* result) +{ gboolean _tmp0_ = FALSE; Dimensions _tmp1_; gint _tmp2_; @@ -1893,7 +1874,7 @@ void scaling_to_fill_viewport (Dimensions* viewport, Scaling* result) { if (_tmp2_ <= 1) { #line 304 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = TRUE; -#line 1896 "Dimensions.c" +#line 1877 "Dimensions.c" } else { Dimensions _tmp3_; gint _tmp4_; @@ -1903,11 +1884,11 @@ void scaling_to_fill_viewport (Dimensions* viewport, Scaling* result) { _tmp4_ = _tmp3_.height; #line 304 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = _tmp4_ <= 1; -#line 1906 "Dimensions.c" +#line 1887 "Dimensions.c" } #line 304 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp0_) { -#line 1910 "Dimensions.c" +#line 1891 "Dimensions.c" Scaling _tmp5_ = {0}; #line 305 "/home/jens/Source/shotwell/src/Dimensions.vala" scaling_for_original (&_tmp5_); @@ -1915,7 +1896,7 @@ void scaling_to_fill_viewport (Dimensions* viewport, Scaling* result) { *result = _tmp5_; #line 305 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1918 "Dimensions.c" +#line 1899 "Dimensions.c" } #line 307 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp6_ = *viewport; @@ -1925,96 +1906,90 @@ void scaling_to_fill_viewport (Dimensions* viewport, Scaling* result) { *result = _tmp7_; #line 307 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1928 "Dimensions.c" +#line 1909 "Dimensions.c" } -void scaling_to_fill_screen (GtkWindow* window, Scaling* result) { - GtkWindow* _tmp0_; - Dimensions _tmp1_ = {0}; - Scaling _tmp2_ = {0}; +void +scaling_to_fill_screen (GtkWindow* window, + Scaling* result) +{ + Dimensions _tmp0_ = {0}; + Scaling _tmp1_ = {0}; #line 310 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (GTK_IS_WINDOW (window)); #line 311 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = window; -#line 311 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaling_get_screen_dimensions (_tmp0_, &_tmp1_); + scaling_get_screen_dimensions (window, &_tmp0_); #line 311 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaling_to_fill_viewport (&_tmp1_, &_tmp2_); + scaling_to_fill_viewport (&_tmp0_, &_tmp1_); #line 311 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp2_; + *result = _tmp1_; #line 311 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1948 "Dimensions.c" +#line 1929 "Dimensions.c" } -void scaling_for_constraint (ScaleConstraint constraint, gint scale, gboolean scale_up, Scaling* result) { - ScaleConstraint _tmp0_; - gint _tmp1_; - Dimensions _tmp2_ = {0}; - gboolean _tmp3_; - Scaling _tmp4_ = {0}; -#line 315 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = constraint; -#line 315 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = scale; -#line 315 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_init (&_tmp2_, 0, 0); +void +scaling_for_constraint (ScaleConstraint constraint, + gint scale, + gboolean scale_up, + Scaling* result) +{ + Dimensions _tmp0_ = {0}; + Scaling _tmp1_ = {0}; #line 315 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = scale_up; + dimensions_init (&_tmp0_, 0, 0); #line 315 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaling_init (&_tmp4_, _tmp0_, _tmp1_, &_tmp2_, _tmp3_); + scaling_init (&_tmp1_, constraint, scale, &_tmp0_, scale_up); #line 315 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp4_; + *result = _tmp1_; #line 315 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1972 "Dimensions.c" +#line 1949 "Dimensions.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 319 "/home/jens/Source/shotwell/src/Dimensions.vala" return self ? g_object_ref (self) : NULL; -#line 1979 "Dimensions.c" +#line 1958 "Dimensions.c" } -static void scaling_get_screen_dimensions (GtkWindow* window, Dimensions* result) { +static void +scaling_get_screen_dimensions (GtkWindow* window, + Dimensions* result) +{ GdkScreen* screen = NULL; - GtkWindow* _tmp0_; + GdkScreen* _tmp0_; GdkScreen* _tmp1_; - GdkScreen* _tmp2_; - gint _tmp3_; - gint _tmp4_; - Dimensions _tmp5_ = {0}; + Dimensions _tmp2_ = {0}; #line 318 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (GTK_IS_WINDOW (window)); #line 319 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = window; -#line 319 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = gtk_window_get_screen (_tmp0_); + _tmp0_ = gtk_window_get_screen (window); #line 319 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 319 "/home/jens/Source/shotwell/src/Dimensions.vala" - screen = _tmp2_; -#line 321 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = gdk_screen_get_width (screen); + screen = _tmp1_; #line 321 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = gdk_screen_get_height (screen); + dimensions_init (&_tmp2_, gdk_screen_get_width (screen), gdk_screen_get_height (screen)); #line 321 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_init (&_tmp5_, _tmp3_, _tmp4_); -#line 321 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp5_; + *result = _tmp2_; #line 321 "/home/jens/Source/shotwell/src/Dimensions.vala" _g_object_unref0 (screen); #line 321 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 2013 "Dimensions.c" +#line 1986 "Dimensions.c" } -static gint scaling_scale_to_pixels (Scaling *self) { +static gint +scaling_scale_to_pixels (Scaling *self) +{ gint result = 0; gint _tmp0_ = 0; gint _tmp1_; @@ -2022,27 +1997,29 @@ static gint scaling_scale_to_pixels (Scaling *self) { _tmp1_ = (*self).scale; #line 325 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp1_ >= 0) { -#line 2025 "Dimensions.c" +#line 2000 "Dimensions.c" gint _tmp2_; #line 325 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp2_ = (*self).scale; #line 325 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = _tmp2_; -#line 2031 "Dimensions.c" +#line 2006 "Dimensions.c" } else { #line 325 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = 0; -#line 2035 "Dimensions.c" +#line 2010 "Dimensions.c" } #line 325 "/home/jens/Source/shotwell/src/Dimensions.vala" result = _tmp0_; #line 325 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2041 "Dimensions.c" +#line 2016 "Dimensions.c" } -gboolean scaling_is_unscaled (Scaling *self) { +gboolean +scaling_is_unscaled (Scaling *self) +{ gboolean result = FALSE; ScaleConstraint _tmp0_; #line 329 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -2051,11 +2028,15 @@ gboolean scaling_is_unscaled (Scaling *self) { result = _tmp0_ == SCALE_CONSTRAINT_ORIGINAL; #line 329 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2054 "Dimensions.c" +#line 2031 "Dimensions.c" } -gboolean scaling_is_best_fit (Scaling *self, Dimensions* original, gint* pixels) { +gboolean +scaling_is_best_fit (Scaling *self, + Dimensions* original, + gint* pixels) +{ gint _vala_pixels = 0; gboolean result = FALSE; gint _tmp0_; @@ -2074,11 +2055,11 @@ gboolean scaling_is_best_fit (Scaling *self, Dimensions* original, gint* pixels) if (pixels) { #line 336 "/home/jens/Source/shotwell/src/Dimensions.vala" *pixels = _vala_pixels; -#line 2077 "Dimensions.c" +#line 2058 "Dimensions.c" } #line 336 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2081 "Dimensions.c" +#line 2062 "Dimensions.c" } #line 338 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = (*self).constraint; @@ -2088,7 +2069,7 @@ gboolean scaling_is_best_fit (Scaling *self, Dimensions* original, gint* pixels) case SCALE_CONSTRAINT_ORIGINAL: #line 338 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_FILL_VIEWPORT: -#line 2091 "Dimensions.c" +#line 2072 "Dimensions.c" { #line 341 "/home/jens/Source/shotwell/src/Dimensions.vala" result = FALSE; @@ -2096,47 +2077,48 @@ gboolean scaling_is_best_fit (Scaling *self, Dimensions* original, gint* pixels) if (pixels) { #line 341 "/home/jens/Source/shotwell/src/Dimensions.vala" *pixels = _vala_pixels; -#line 2099 "Dimensions.c" +#line 2080 "Dimensions.c" } #line 341 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2103 "Dimensions.c" +#line 2084 "Dimensions.c" } default: { gint _tmp2_; - gint _tmp3_; -#line 344 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = scaling_scale_to_pixels (&(*self)); #line 344 "/home/jens/Source/shotwell/src/Dimensions.vala" - _vala_pixels = _tmp2_; + _vala_pixels = scaling_scale_to_pixels (&(*self)); #line 345 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = _vala_pixels; + _tmp2_ = _vala_pixels; #line 345 "/home/jens/Source/shotwell/src/Dimensions.vala" - _vala_assert (_tmp3_ > 0, "pixels > 0"); + _vala_assert (_tmp2_ > 0, "pixels > 0"); #line 347 "/home/jens/Source/shotwell/src/Dimensions.vala" result = TRUE; #line 347 "/home/jens/Source/shotwell/src/Dimensions.vala" if (pixels) { #line 347 "/home/jens/Source/shotwell/src/Dimensions.vala" *pixels = _vala_pixels; -#line 2123 "Dimensions.c" +#line 2101 "Dimensions.c" } #line 347 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2127 "Dimensions.c" +#line 2105 "Dimensions.c" } } #line 332 "/home/jens/Source/shotwell/src/Dimensions.vala" if (pixels) { #line 332 "/home/jens/Source/shotwell/src/Dimensions.vala" *pixels = _vala_pixels; -#line 2134 "Dimensions.c" +#line 2112 "Dimensions.c" } } -gboolean scaling_is_best_fit_dimensions (Scaling *self, Dimensions* original, Dimensions* scaled) { +gboolean +scaling_is_best_fit_dimensions (Scaling *self, + Dimensions* original, + Dimensions* scaled) +{ Dimensions _vala_scaled = {0}; gboolean result = FALSE; gint _tmp0_; @@ -2155,11 +2137,11 @@ gboolean scaling_is_best_fit_dimensions (Scaling *self, Dimensions* original, Di if (scaled) { #line 355 "/home/jens/Source/shotwell/src/Dimensions.vala" *scaled = _vala_scaled; -#line 2158 "Dimensions.c" +#line 2140 "Dimensions.c" } #line 355 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2162 "Dimensions.c" +#line 2144 "Dimensions.c" } #line 357 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = (*self).constraint; @@ -2169,7 +2151,7 @@ gboolean scaling_is_best_fit_dimensions (Scaling *self, Dimensions* original, Di case SCALE_CONSTRAINT_ORIGINAL: #line 357 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_FILL_VIEWPORT: -#line 2172 "Dimensions.c" +#line 2154 "Dimensions.c" { #line 360 "/home/jens/Source/shotwell/src/Dimensions.vala" result = FALSE; @@ -2177,59 +2159,60 @@ gboolean scaling_is_best_fit_dimensions (Scaling *self, Dimensions* original, Di if (scaled) { #line 360 "/home/jens/Source/shotwell/src/Dimensions.vala" *scaled = _vala_scaled; -#line 2180 "Dimensions.c" +#line 2162 "Dimensions.c" } #line 360 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2184 "Dimensions.c" +#line 2166 "Dimensions.c" } default: { gint pixels = 0; gint _tmp2_; gint _tmp3_; - gint _tmp4_; - ScaleConstraint _tmp5_; - Dimensions _tmp6_ = {0}; -#line 363 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = scaling_scale_to_pixels (&(*self)); + ScaleConstraint _tmp4_; + Dimensions _tmp5_ = {0}; #line 363 "/home/jens/Source/shotwell/src/Dimensions.vala" - pixels = _tmp2_; + pixels = scaling_scale_to_pixels (&(*self)); #line 364 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = pixels; + _tmp2_ = pixels; #line 364 "/home/jens/Source/shotwell/src/Dimensions.vala" - _vala_assert (_tmp3_ > 0, "pixels > 0"); + _vala_assert (_tmp2_ > 0, "pixels > 0"); #line 366 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = pixels; + _tmp3_ = pixels; #line 366 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = (*self).constraint; + _tmp4_ = (*self).constraint; #line 366 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_get_scaled_by_constraint (original, _tmp4_, _tmp5_, &_tmp6_); + dimensions_get_scaled_by_constraint (original, _tmp3_, _tmp4_, &_tmp5_); #line 366 "/home/jens/Source/shotwell/src/Dimensions.vala" - _vala_scaled = _tmp6_; + _vala_scaled = _tmp5_; #line 368 "/home/jens/Source/shotwell/src/Dimensions.vala" result = TRUE; #line 368 "/home/jens/Source/shotwell/src/Dimensions.vala" if (scaled) { #line 368 "/home/jens/Source/shotwell/src/Dimensions.vala" *scaled = _vala_scaled; -#line 2216 "Dimensions.c" +#line 2195 "Dimensions.c" } #line 368 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2220 "Dimensions.c" +#line 2199 "Dimensions.c" } } #line 351 "/home/jens/Source/shotwell/src/Dimensions.vala" if (scaled) { #line 351 "/home/jens/Source/shotwell/src/Dimensions.vala" *scaled = _vala_scaled; -#line 2227 "Dimensions.c" +#line 2206 "Dimensions.c" } } -gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimensions* scaled) { +gboolean +scaling_is_for_viewport (Scaling *self, + Dimensions* original, + Dimensions* scaled) +{ Dimensions _vala_scaled = {0}; gboolean result = FALSE; gint _tmp0_; @@ -2248,11 +2231,11 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension if (scaled) { #line 376 "/home/jens/Source/shotwell/src/Dimensions.vala" *scaled = _vala_scaled; -#line 2251 "Dimensions.c" +#line 2234 "Dimensions.c" } #line 376 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2255 "Dimensions.c" +#line 2238 "Dimensions.c" } #line 378 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = (*self).constraint; @@ -2262,7 +2245,7 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension case SCALE_CONSTRAINT_ORIGINAL: #line 378 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_FILL_VIEWPORT: -#line 2265 "Dimensions.c" +#line 2248 "Dimensions.c" { #line 381 "/home/jens/Source/shotwell/src/Dimensions.vala" result = FALSE; @@ -2270,89 +2253,86 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension if (scaled) { #line 381 "/home/jens/Source/shotwell/src/Dimensions.vala" *scaled = _vala_scaled; -#line 2273 "Dimensions.c" +#line 2256 "Dimensions.c" } #line 381 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2277 "Dimensions.c" +#line 2260 "Dimensions.c" } default: { - gboolean _tmp2_; + gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_; + gboolean _tmp4_; #line 384 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = dimensions_has_area (&(*self).viewport); -#line 384 "/home/jens/Source/shotwell/src/Dimensions.vala" - _vala_assert (_tmp2_, "viewport.has_area()"); + _vala_assert (dimensions_has_area (&(*self).viewport), "viewport.has_area()"); #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = (*self).scale_up; + _tmp4_ = (*self).scale_up; #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (!_tmp5_) { -#line 2293 "Dimensions.c" - Dimensions _tmp6_; - gint _tmp7_; - Dimensions _tmp8_; - gint _tmp9_; + if (!_tmp4_) { +#line 2273 "Dimensions.c" + Dimensions _tmp5_; + gint _tmp6_; + Dimensions _tmp7_; + gint _tmp8_; #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp6_ = *original; + _tmp5_ = *original; #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = _tmp6_.width; + _tmp6_ = _tmp5_.width; #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp8_ = (*self).viewport; + _tmp7_ = (*self).viewport; #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp9_ = _tmp8_.width; + _tmp8_ = _tmp7_.width; #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = _tmp7_ < _tmp9_; -#line 2308 "Dimensions.c" + _tmp3_ = _tmp6_ < _tmp8_; +#line 2288 "Dimensions.c" } else { #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = FALSE; -#line 2312 "Dimensions.c" + _tmp3_ = FALSE; +#line 2292 "Dimensions.c" } #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp4_) { -#line 2316 "Dimensions.c" - Dimensions _tmp10_; - gint _tmp11_; - Dimensions _tmp12_; - gint _tmp13_; + if (_tmp3_) { +#line 2296 "Dimensions.c" + Dimensions _tmp9_; + gint _tmp10_; + Dimensions _tmp11_; + gint _tmp12_; #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp10_ = *original; + _tmp9_ = *original; #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp11_ = _tmp10_.height; + _tmp10_ = _tmp9_.height; #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp12_ = (*self).viewport; + _tmp11_ = (*self).viewport; #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp13_ = _tmp12_.height; + _tmp12_ = _tmp11_.height; #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = _tmp11_ < _tmp13_; -#line 2331 "Dimensions.c" + _tmp2_ = _tmp10_ < _tmp12_; +#line 2311 "Dimensions.c" } else { #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = FALSE; -#line 2335 "Dimensions.c" + _tmp2_ = FALSE; +#line 2315 "Dimensions.c" } #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp3_) { -#line 2339 "Dimensions.c" - Dimensions _tmp14_; + if (_tmp2_) { +#line 2319 "Dimensions.c" + Dimensions _tmp13_; #line 387 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp14_ = *original; + _tmp13_ = *original; #line 387 "/home/jens/Source/shotwell/src/Dimensions.vala" - _vala_scaled = _tmp14_; -#line 2345 "Dimensions.c" + _vala_scaled = _tmp13_; +#line 2325 "Dimensions.c" } else { - Dimensions _tmp15_; - Dimensions _tmp16_ = {0}; + Dimensions _tmp14_; + Dimensions _tmp15_ = {0}; #line 389 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp15_ = (*self).viewport; + _tmp14_ = (*self).viewport; #line 389 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_get_scaled_proportional (original, &_tmp15_, &_tmp16_); + dimensions_get_scaled_proportional (original, &_tmp14_, &_tmp15_); #line 389 "/home/jens/Source/shotwell/src/Dimensions.vala" - _vala_scaled = _tmp16_; -#line 2355 "Dimensions.c" + _vala_scaled = _tmp15_; +#line 2335 "Dimensions.c" } #line 391 "/home/jens/Source/shotwell/src/Dimensions.vala" result = TRUE; @@ -2360,29 +2340,32 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension if (scaled) { #line 391 "/home/jens/Source/shotwell/src/Dimensions.vala" *scaled = _vala_scaled; -#line 2363 "Dimensions.c" +#line 2343 "Dimensions.c" } #line 391 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2367 "Dimensions.c" +#line 2347 "Dimensions.c" } } #line 372 "/home/jens/Source/shotwell/src/Dimensions.vala" if (scaled) { #line 372 "/home/jens/Source/shotwell/src/Dimensions.vala" *scaled = _vala_scaled; -#line 2374 "Dimensions.c" +#line 2354 "Dimensions.c" } } -gboolean scaling_is_fill_viewport (Scaling *self, Dimensions* original, Dimensions* scaled) { +gboolean +scaling_is_fill_viewport (Scaling *self, + Dimensions* original, + Dimensions* scaled) +{ Dimensions _vala_scaled = {0}; gboolean result = FALSE; ScaleConstraint _tmp0_; - gboolean _tmp1_; - Dimensions _tmp2_; - Dimensions _tmp3_ = {0}; + Dimensions _tmp1_; + Dimensions _tmp2_ = {0}; #line 395 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_val_if_fail (original != NULL, FALSE); #line 396 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -2397,255 +2380,231 @@ gboolean scaling_is_fill_viewport (Scaling *self, Dimensions* original, Dimensio if (scaled) { #line 399 "/home/jens/Source/shotwell/src/Dimensions.vala" *scaled = _vala_scaled; -#line 2400 "Dimensions.c" +#line 2383 "Dimensions.c" } #line 399 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2404 "Dimensions.c" +#line 2387 "Dimensions.c" } #line 401 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = dimensions_has_area (&(*self).viewport); -#line 401 "/home/jens/Source/shotwell/src/Dimensions.vala" - _vala_assert (_tmp1_, "viewport.has_area()"); + _vala_assert (dimensions_has_area (&(*self).viewport), "viewport.has_area()"); #line 402 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = (*self).viewport; + _tmp1_ = (*self).viewport; #line 402 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_get_scaled_to_fill_viewport (original, &_tmp2_, &_tmp3_); + dimensions_get_scaled_to_fill_viewport (original, &_tmp1_, &_tmp2_); #line 402 "/home/jens/Source/shotwell/src/Dimensions.vala" - _vala_scaled = _tmp3_; + _vala_scaled = _tmp2_; #line 404 "/home/jens/Source/shotwell/src/Dimensions.vala" result = TRUE; #line 404 "/home/jens/Source/shotwell/src/Dimensions.vala" if (scaled) { #line 404 "/home/jens/Source/shotwell/src/Dimensions.vala" *scaled = _vala_scaled; -#line 2422 "Dimensions.c" +#line 2403 "Dimensions.c" } #line 404 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2426 "Dimensions.c" +#line 2407 "Dimensions.c" } -void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensions* result) { - gboolean _tmp0_; +void +scaling_get_scaled_dimensions (Scaling *self, + Dimensions* original, + Dimensions* result) +{ Dimensions scaled = {0}; - Dimensions _tmp2_; - Dimensions _tmp3_ = {0}; - gboolean _tmp4_; - Dimensions _tmp5_; - Dimensions _tmp6_ = {0}; - gboolean _tmp7_; + Dimensions _tmp1_; + Dimensions _tmp2_ = {0}; + gboolean _tmp3_; + Dimensions _tmp4_; + Dimensions _tmp5_ = {0}; + gboolean _tmp6_; gboolean is_viewport = FALSE; - Dimensions _tmp8_; - Dimensions _tmp9_ = {0}; + Dimensions _tmp7_; + Dimensions _tmp8_ = {0}; + gboolean _tmp9_; gboolean _tmp10_; - gboolean _tmp11_; #line 407 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (original != NULL); #line 408 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = scaling_is_unscaled (&(*self)); -#line 408 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp0_) { -#line 2450 "Dimensions.c" - Dimensions _tmp1_; + if (scaling_is_unscaled (&(*self))) { +#line 2432 "Dimensions.c" + Dimensions _tmp0_; #line 409 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = *original; + _tmp0_ = *original; #line 409 "/home/jens/Source/shotwell/src/Dimensions.vala" - *result = _tmp1_; + *result = _tmp0_; #line 409 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 2458 "Dimensions.c" +#line 2440 "Dimensions.c" } #line 412 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = *original; + _tmp1_ = *original; #line 412 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = scaling_is_fill_viewport (&(*self), &_tmp2_, &_tmp3_); + _tmp3_ = scaling_is_fill_viewport (&(*self), &_tmp1_, &_tmp2_); #line 412 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaled = _tmp3_; + scaled = _tmp2_; #line 412 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp4_) { + if (_tmp3_) { #line 413 "/home/jens/Source/shotwell/src/Dimensions.vala" *result = scaled; #line 413 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 2472 "Dimensions.c" +#line 2454 "Dimensions.c" } #line 415 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = *original; + _tmp4_ = *original; #line 415 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = scaling_is_best_fit_dimensions (&(*self), &_tmp5_, &_tmp6_); + _tmp6_ = scaling_is_best_fit_dimensions (&(*self), &_tmp4_, &_tmp5_); #line 415 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaled = _tmp6_; + scaled = _tmp5_; #line 415 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp7_) { + if (_tmp6_) { #line 416 "/home/jens/Source/shotwell/src/Dimensions.vala" *result = scaled; #line 416 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 2486 "Dimensions.c" +#line 2468 "Dimensions.c" } #line 418 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp8_ = *original; + _tmp7_ = *original; #line 418 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp10_ = scaling_is_for_viewport (&(*self), &_tmp8_, &_tmp9_); + _tmp9_ = scaling_is_for_viewport (&(*self), &_tmp7_, &_tmp8_); #line 418 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaled = _tmp9_; + scaled = _tmp8_; #line 418 "/home/jens/Source/shotwell/src/Dimensions.vala" - is_viewport = _tmp10_; + is_viewport = _tmp9_; #line 419 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp11_ = is_viewport; + _tmp10_ = is_viewport; #line 419 "/home/jens/Source/shotwell/src/Dimensions.vala" - _vala_assert (_tmp11_, "is_viewport"); + _vala_assert (_tmp10_, "is_viewport"); #line 421 "/home/jens/Source/shotwell/src/Dimensions.vala" *result = scaled; #line 421 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 2504 "Dimensions.c" +#line 2486 "Dimensions.c" } -GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInterpType interp, gboolean scale_up) { +GdkPixbuf* +scaling_perform_on_pixbuf (Scaling *self, + GdkPixbuf* pixbuf, + GdkInterpType interp, + gboolean scale_up) +{ GdkPixbuf* result = NULL; - gboolean _tmp0_; Dimensions pixbuf_dim = {0}; - GdkPixbuf* _tmp3_; - Dimensions _tmp4_ = {0}; + Dimensions _tmp1_ = {0}; gint pixels = 0; - Dimensions _tmp5_; - gint _tmp6_ = 0; - gboolean _tmp7_; + Dimensions _tmp2_; + gint _tmp3_ = 0; + gboolean _tmp4_; Dimensions scaled = {0}; - Dimensions _tmp13_; - Dimensions _tmp14_ = {0}; - gboolean _tmp15_; + Dimensions _tmp7_; + Dimensions _tmp8_ = {0}; + gboolean _tmp9_; gboolean is_viewport = FALSE; - Dimensions _tmp20_; - Dimensions _tmp21_ = {0}; - gboolean _tmp22_; - gboolean _tmp23_; - GdkPixbuf* _tmp24_; - Dimensions _tmp25_; - GdkInterpType _tmp26_; - GdkPixbuf* _tmp27_; + Dimensions _tmp12_; + Dimensions _tmp13_ = {0}; + gboolean _tmp14_; + gboolean _tmp15_; + Dimensions _tmp16_; + GdkPixbuf* _tmp17_; #line 424 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL); #line 425 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = scaling_is_unscaled (&(*self)); -#line 425 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp0_) { -#line 2537 "Dimensions.c" - GdkPixbuf* _tmp1_; - GdkPixbuf* _tmp2_; + if (scaling_is_unscaled (&(*self))) { +#line 2518 "Dimensions.c" + GdkPixbuf* _tmp0_; #line 426 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = pixbuf; + _tmp0_ = _g_object_ref0 (pixbuf); #line 426 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); -#line 426 "/home/jens/Source/shotwell/src/Dimensions.vala" - result = _tmp2_; + result = _tmp0_; #line 426 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2548 "Dimensions.c" +#line 2526 "Dimensions.c" } #line 428 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = pixbuf; -#line 428 "/home/jens/Source/shotwell/src/Dimensions.vala" - dimensions_for_pixbuf (_tmp3_, &_tmp4_); + dimensions_for_pixbuf (pixbuf, &_tmp1_); #line 428 "/home/jens/Source/shotwell/src/Dimensions.vala" - pixbuf_dim = _tmp4_; + pixbuf_dim = _tmp1_; #line 431 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = pixbuf_dim; + _tmp2_ = pixbuf_dim; #line 431 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = scaling_is_best_fit (&(*self), &_tmp5_, &_tmp6_); + _tmp4_ = scaling_is_best_fit (&(*self), &_tmp2_, &_tmp3_); #line 431 "/home/jens/Source/shotwell/src/Dimensions.vala" - pixels = _tmp6_; + pixels = _tmp3_; #line 431 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp7_) { -#line 2564 "Dimensions.c" - GdkPixbuf* _tmp8_; - gint _tmp9_; - GdkInterpType _tmp10_; - gboolean _tmp11_; - GdkPixbuf* _tmp12_; -#line 432 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp8_ = pixbuf; -#line 432 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp9_ = pixels; -#line 432 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp10_ = interp; + if (_tmp4_) { +#line 2540 "Dimensions.c" + gint _tmp5_; + GdkPixbuf* _tmp6_; #line 432 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp11_ = scale_up; + _tmp5_ = pixels; #line 432 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp12_ = scale_pixbuf (_tmp8_, _tmp9_, _tmp10_, _tmp11_); + _tmp6_ = scale_pixbuf (pixbuf, _tmp5_, interp, scale_up); #line 432 "/home/jens/Source/shotwell/src/Dimensions.vala" - result = _tmp12_; + result = _tmp6_; #line 432 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2584 "Dimensions.c" +#line 2551 "Dimensions.c" } #line 435 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp13_ = pixbuf_dim; + _tmp7_ = pixbuf_dim; #line 435 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp15_ = scaling_is_fill_viewport (&(*self), &_tmp13_, &_tmp14_); + _tmp9_ = scaling_is_fill_viewport (&(*self), &_tmp7_, &_tmp8_); #line 435 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaled = _tmp14_; + scaled = _tmp8_; #line 435 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp15_) { -#line 2594 "Dimensions.c" - GdkPixbuf* _tmp16_; - Dimensions _tmp17_; - GdkInterpType _tmp18_; - GdkPixbuf* _tmp19_; -#line 436 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp16_ = pixbuf; -#line 436 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp17_ = scaled; + if (_tmp9_) { +#line 2561 "Dimensions.c" + Dimensions _tmp10_; + GdkPixbuf* _tmp11_; #line 436 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp18_ = interp; + _tmp10_ = scaled; #line 436 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp19_ = resize_pixbuf (_tmp16_, &_tmp17_, _tmp18_); + _tmp11_ = resize_pixbuf (pixbuf, &_tmp10_, interp); #line 436 "/home/jens/Source/shotwell/src/Dimensions.vala" - result = _tmp19_; + result = _tmp11_; #line 436 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2611 "Dimensions.c" +#line 2572 "Dimensions.c" } #line 438 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp20_ = pixbuf_dim; + _tmp12_ = pixbuf_dim; #line 438 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp22_ = scaling_is_for_viewport (&(*self), &_tmp20_, &_tmp21_); + _tmp14_ = scaling_is_for_viewport (&(*self), &_tmp12_, &_tmp13_); #line 438 "/home/jens/Source/shotwell/src/Dimensions.vala" - scaled = _tmp21_; + scaled = _tmp13_; #line 438 "/home/jens/Source/shotwell/src/Dimensions.vala" - is_viewport = _tmp22_; + is_viewport = _tmp14_; #line 439 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp23_ = is_viewport; + _tmp15_ = is_viewport; #line 439 "/home/jens/Source/shotwell/src/Dimensions.vala" - _vala_assert (_tmp23_, "is_viewport"); -#line 441 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp24_ = pixbuf; -#line 441 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp25_ = scaled; + _vala_assert (_tmp15_, "is_viewport"); #line 441 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp26_ = interp; + _tmp16_ = scaled; #line 441 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp27_ = resize_pixbuf (_tmp24_, &_tmp25_, _tmp26_); + _tmp17_ = resize_pixbuf (pixbuf, &_tmp16_, interp); #line 441 "/home/jens/Source/shotwell/src/Dimensions.vala" - result = _tmp27_; + result = _tmp17_; #line 441 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2637 "Dimensions.c" +#line 2594 "Dimensions.c" } -gchar* scaling_to_string (Scaling *self) { +gchar* +scaling_to_string (Scaling *self) +{ gchar* result = NULL; ScaleConstraint _tmp0_; #line 445 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).constraint; #line 445 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp0_ == SCALE_CONSTRAINT_ORIGINAL) { -#line 2648 "Dimensions.c" +#line 2607 "Dimensions.c" gchar* _tmp1_; #line 446 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = g_strdup ("scaling: UNSCALED"); @@ -2653,14 +2612,14 @@ gchar* scaling_to_string (Scaling *self) { result = _tmp1_; #line 446 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2656 "Dimensions.c" +#line 2615 "Dimensions.c" } else { ScaleConstraint _tmp2_; #line 447 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp2_ = (*self).constraint; #line 447 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp2_ == SCALE_CONSTRAINT_FILL_VIEWPORT) { -#line 2663 "Dimensions.c" +#line 2622 "Dimensions.c" gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; @@ -2679,33 +2638,32 @@ gchar* scaling_to_string (Scaling *self) { result = _tmp6_; #line 448 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2682 "Dimensions.c" +#line 2641 "Dimensions.c" } else { gint _tmp7_; #line 449 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp7_ = (*self).scale; #line 449 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp7_ != SCALING_NO_SCALE) { -#line 2689 "Dimensions.c" +#line 2648 "Dimensions.c" const gchar* _tmp8_ = NULL; gboolean _tmp9_; ScaleConstraint _tmp10_; gchar* _tmp11_; gchar* _tmp12_; - gint _tmp13_; + gchar* _tmp13_; gchar* _tmp14_; - gchar* _tmp15_; #line 451 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp9_ = (*self).scale_up; #line 451 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp9_) { #line 451 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp8_ = "scaled up"; -#line 2704 "Dimensions.c" +#line 2662 "Dimensions.c" } else { #line 451 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp8_ = "not scaled up"; -#line 2708 "Dimensions.c" +#line 2666 "Dimensions.c" } #line 450 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp10_ = (*self).constraint; @@ -2714,59 +2672,60 @@ gchar* scaling_to_string (Scaling *self) { #line 450 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp12_ = _tmp11_; #line 450 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp13_ = scaling_scale_to_pixels (&(*self)); -#line 450 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp14_ = g_strdup_printf ("scaling: best-fit (%s %d pixels %s)", _tmp12_, _tmp13_, _tmp8_); + _tmp13_ = g_strdup_printf ("scaling: best-fit (%s %d pixels %s)", _tmp12_, scaling_scale_to_pixels (&(*self)), _tmp8_); #line 450 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 450 "/home/jens/Source/shotwell/src/Dimensions.vala" _g_free0 (_tmp12_); #line 450 "/home/jens/Source/shotwell/src/Dimensions.vala" - result = _tmp15_; + result = _tmp14_; #line 450 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2728 "Dimensions.c" +#line 2684 "Dimensions.c" } else { - const gchar* _tmp16_ = NULL; - gboolean _tmp17_; + const gchar* _tmp15_ = NULL; + gboolean _tmp16_; + gchar* _tmp17_; gchar* _tmp18_; gchar* _tmp19_; gchar* _tmp20_; - gchar* _tmp21_; #line 454 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp17_ = (*self).scale_up; + _tmp16_ = (*self).scale_up; #line 454 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp17_) { + if (_tmp16_) { #line 454 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp16_ = "scaled up"; -#line 2742 "Dimensions.c" + _tmp15_ = "scaled up"; +#line 2698 "Dimensions.c" } else { #line 454 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp16_ = "not scaled up"; -#line 2746 "Dimensions.c" + _tmp15_ = "not scaled up"; +#line 2702 "Dimensions.c" } #line 453 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp18_ = dimensions_to_string (&(*self).viewport); + _tmp17_ = dimensions_to_string (&(*self).viewport); #line 453 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 453 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp20_ = g_strdup_printf ("scaling: viewport %s (%s)", _tmp19_, _tmp16_); + _tmp19_ = g_strdup_printf ("scaling: viewport %s (%s)", _tmp18_, _tmp15_); #line 453 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp21_ = _tmp20_; + _tmp20_ = _tmp19_; #line 453 "/home/jens/Source/shotwell/src/Dimensions.vala" - _g_free0 (_tmp19_); + _g_free0 (_tmp18_); #line 453 "/home/jens/Source/shotwell/src/Dimensions.vala" - result = _tmp21_; + result = _tmp20_; #line 453 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2762 "Dimensions.c" +#line 2718 "Dimensions.c" } } } } -gboolean scaling_equals (Scaling *self, Scaling* scaling) { +gboolean +scaling_equals (Scaling *self, + Scaling* scaling) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; @@ -2783,7 +2742,7 @@ gboolean scaling_equals (Scaling *self, Scaling* scaling) { _tmp4_ = _tmp3_.constraint; #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp2_ == _tmp4_) { -#line 2786 "Dimensions.c" +#line 2745 "Dimensions.c" gint _tmp5_; Scaling _tmp6_; gint _tmp7_; @@ -2795,41 +2754,40 @@ gboolean scaling_equals (Scaling *self, Scaling* scaling) { _tmp7_ = _tmp6_.scale; #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = _tmp5_ == _tmp7_; -#line 2798 "Dimensions.c" +#line 2757 "Dimensions.c" } else { #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = FALSE; -#line 2802 "Dimensions.c" +#line 2761 "Dimensions.c" } #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp1_) { -#line 2806 "Dimensions.c" +#line 2765 "Dimensions.c" Scaling _tmp8_; Dimensions _tmp9_; - gboolean _tmp10_; #line 459 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp8_ = *scaling; #line 459 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp9_ = _tmp8_.viewport; #line 459 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp10_ = dimensions_equals (&(*self).viewport, &_tmp9_); -#line 459 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = _tmp10_; -#line 2818 "Dimensions.c" + _tmp0_ = dimensions_equals (&(*self).viewport, &_tmp9_); +#line 2774 "Dimensions.c" } else { #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = FALSE; -#line 2822 "Dimensions.c" +#line 2778 "Dimensions.c" } #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala" result = _tmp0_; #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2828 "Dimensions.c" +#line 2784 "Dimensions.c" } -Scaling* scaling_dup (const Scaling* self) { +Scaling* +scaling_dup (const Scaling* self) +{ Scaling* dup; #line 249 "/home/jens/Source/shotwell/src/Dimensions.vala" dup = g_new0 (Scaling, 1); @@ -2837,18 +2795,22 @@ Scaling* scaling_dup (const Scaling* self) { memcpy (dup, self, sizeof (Scaling)); #line 249 "/home/jens/Source/shotwell/src/Dimensions.vala" return dup; -#line 2840 "Dimensions.c" +#line 2798 "Dimensions.c" } -void scaling_free (Scaling* self) { +void +scaling_free (Scaling* self) +{ #line 249 "/home/jens/Source/shotwell/src/Dimensions.vala" g_free (self); -#line 2847 "Dimensions.c" +#line 2807 "Dimensions.c" } -GType scaling_get_type (void) { +GType +scaling_get_type (void) +{ static volatile gsize scaling_type_id__volatile = 0; if (g_once_init_enter (&scaling_type_id__volatile)) { GType scaling_type_id; @@ -2859,13 +2821,17 @@ GType scaling_get_type (void) { } -void zoom_state_init (ZoomState *self, Dimensions* content_dimensions, Dimensions* viewport_dimensions, gdouble slider_val, GdkPoint* viewport_center) { +void +zoom_state_init (ZoomState *self, + Dimensions* content_dimensions, + Dimensions* viewport_dimensions, + gdouble slider_val, + GdkPoint* viewport_center) +{ Dimensions _tmp0_; Dimensions _tmp1_; - gdouble _tmp2_; + gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; - GdkPoint* _tmp5_; #line 472 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (content_dimensions != NULL); #line 472 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -2881,85 +2847,71 @@ void zoom_state_init (ZoomState *self, Dimensions* content_dimensions, Dimension #line 475 "/home/jens/Source/shotwell/src/Dimensions.vala" (*self).viewport_dimensions = _tmp1_; #line 476 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = slider_val; -#line 476 "/home/jens/Source/shotwell/src/Dimensions.vala" - (*self).interpolation_factor = _tmp2_; + (*self).interpolation_factor = slider_val; #line 478 "/home/jens/Source/shotwell/src/Dimensions.vala" zoom_state_compute_zoom_factors (&(*self)); #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = viewport_center; -#line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp5_ == NULL) { + if (viewport_center == NULL) { #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = TRUE; -#line 2895 "Dimensions.c" + _tmp3_ = TRUE; +#line 2857 "Dimensions.c" } else { - gboolean _tmp6_ = FALSE; - GdkPoint* _tmp7_; - gint _tmp8_; -#line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = viewport_center; -#line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp8_ = (*_tmp7_).x; + gboolean _tmp4_ = FALSE; + gint _tmp5_; #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp8_ == 0) { -#line 2906 "Dimensions.c" - GdkPoint* _tmp9_; - gint _tmp10_; + _tmp5_ = (*viewport_center).x; #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp9_ = viewport_center; + if (_tmp5_ == 0) { +#line 2865 "Dimensions.c" + gint _tmp6_; #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp10_ = (*_tmp9_).y; + _tmp6_ = (*viewport_center).y; #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp6_ = _tmp10_ == 0; -#line 2915 "Dimensions.c" + _tmp4_ = _tmp6_ == 0; +#line 2871 "Dimensions.c" } else { #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp6_ = FALSE; -#line 2919 "Dimensions.c" + _tmp4_ = FALSE; +#line 2875 "Dimensions.c" } #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = _tmp6_; -#line 2923 "Dimensions.c" + _tmp3_ = _tmp4_; +#line 2879 "Dimensions.c" } #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp4_) { + if (_tmp3_) { #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = TRUE; -#line 2929 "Dimensions.c" + _tmp2_ = TRUE; +#line 2885 "Dimensions.c" } else { - gdouble _tmp11_; #line 481 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp11_ = slider_val; -#line 481 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = _tmp11_ == 0.0; -#line 2936 "Dimensions.c" + _tmp2_ = slider_val == 0.0; +#line 2889 "Dimensions.c" } #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp3_) { + if (_tmp2_) { #line 482 "/home/jens/Source/shotwell/src/Dimensions.vala" zoom_state_center_viewport (&(*self)); -#line 2942 "Dimensions.c" +#line 2895 "Dimensions.c" } else { - GdkPoint* _tmp12_; #line 484 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp12_ = viewport_center; -#line 484 "/home/jens/Source/shotwell/src/Dimensions.vala" - (*self).viewport_center = *_tmp12_; + (*self).viewport_center = *viewport_center; #line 485 "/home/jens/Source/shotwell/src/Dimensions.vala" zoom_state_clamp_viewport_center (&(*self)); -#line 2951 "Dimensions.c" +#line 2901 "Dimensions.c" } } -void zoom_state_init_rescale (ZoomState *self, ZoomState* existing, gdouble new_slider_val) { +void +zoom_state_init_rescale (ZoomState *self, + ZoomState* existing, + gdouble new_slider_val) +{ ZoomState _tmp0_; Dimensions _tmp1_; ZoomState _tmp2_; Dimensions _tmp3_; - gdouble _tmp4_; - gdouble _tmp5_; #line 489 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (existing != NULL); #line 489 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -2977,80 +2929,77 @@ void zoom_state_init_rescale (ZoomState *self, ZoomState* existing, gdouble new_ #line 491 "/home/jens/Source/shotwell/src/Dimensions.vala" (*self).viewport_dimensions = _tmp3_; #line 492 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = new_slider_val; -#line 492 "/home/jens/Source/shotwell/src/Dimensions.vala" - (*self).interpolation_factor = _tmp4_; + (*self).interpolation_factor = new_slider_val; #line 494 "/home/jens/Source/shotwell/src/Dimensions.vala" zoom_state_compute_zoom_factors (&(*self)); #line 496 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = new_slider_val; -#line 496 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp5_ == 0.0) { + if (new_slider_val == 0.0) { #line 497 "/home/jens/Source/shotwell/src/Dimensions.vala" zoom_state_center_viewport (&(*self)); -#line 2991 "Dimensions.c" +#line 2939 "Dimensions.c" } else { - gdouble _tmp6_; - ZoomState _tmp7_; - GdkPoint _tmp8_; - gint _tmp9_; - ZoomState _tmp10_; - gdouble _tmp11_; - gdouble _tmp12_; - ZoomState _tmp13_; - GdkPoint _tmp14_; - gint _tmp15_; - ZoomState _tmp16_; - gdouble _tmp17_; + gdouble _tmp4_; + ZoomState _tmp5_; + GdkPoint _tmp6_; + gint _tmp7_; + ZoomState _tmp8_; + gdouble _tmp9_; + gdouble _tmp10_; + ZoomState _tmp11_; + GdkPoint _tmp12_; + gint _tmp13_; + ZoomState _tmp14_; + gdouble _tmp15_; #line 499 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp6_ = (*self).zoom_factor; + _tmp4_ = (*self).zoom_factor; #line 499 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = *existing; + _tmp5_ = *existing; #line 499 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp8_ = _tmp7_.viewport_center; + _tmp6_ = _tmp5_.viewport_center; #line 499 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp9_ = _tmp8_.x; + _tmp7_ = _tmp6_.x; #line 499 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp10_ = *existing; + _tmp8_ = *existing; #line 499 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp11_ = _tmp10_.zoom_factor; + _tmp9_ = _tmp8_.zoom_factor; #line 499 "/home/jens/Source/shotwell/src/Dimensions.vala" - (*self).viewport_center.x = (gint) (_tmp6_ * (_tmp9_ / _tmp11_)); + (*self).viewport_center.x = (gint) (_tmp4_ * (_tmp7_ / _tmp9_)); #line 501 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp12_ = (*self).zoom_factor; + _tmp10_ = (*self).zoom_factor; #line 501 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp13_ = *existing; + _tmp11_ = *existing; #line 501 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp14_ = _tmp13_.viewport_center; + _tmp12_ = _tmp11_.viewport_center; #line 501 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp15_ = _tmp14_.y; + _tmp13_ = _tmp12_.y; #line 501 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp16_ = *existing; + _tmp14_ = *existing; #line 501 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp17_ = _tmp16_.zoom_factor; + _tmp15_ = _tmp14_.zoom_factor; #line 501 "/home/jens/Source/shotwell/src/Dimensions.vala" - (*self).viewport_center.y = (gint) (_tmp12_ * (_tmp15_ / _tmp17_)); + (*self).viewport_center.y = (gint) (_tmp10_ * (_tmp13_ / _tmp15_)); #line 503 "/home/jens/Source/shotwell/src/Dimensions.vala" zoom_state_clamp_viewport_center (&(*self)); -#line 3035 "Dimensions.c" +#line 2983 "Dimensions.c" } } -void zoom_state_init_rescale_to_isomorphic (ZoomState *self, ZoomState* existing) { +void +zoom_state_init_rescale_to_isomorphic (ZoomState *self, + ZoomState* existing) +{ ZoomState _tmp0_; Dimensions _tmp1_; ZoomState _tmp2_; Dimensions _tmp3_; ZoomState _tmp4_; gdouble _tmp5_; - gdouble _tmp6_; - ZoomState _tmp7_; - gdouble _tmp8_; - ZoomState _tmp9_; + ZoomState _tmp6_; + gdouble _tmp7_; + ZoomState _tmp8_; + gdouble _tmp9_; gdouble _tmp10_; - gdouble _tmp11_; - gdouble _tmp12_; #line 507 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (existing != NULL); #line 507 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3072,77 +3021,77 @@ void zoom_state_init_rescale_to_isomorphic (ZoomState *self, ZoomState* existing #line 510 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp5_ = _tmp4_.min_factor; #line 510 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp6_ = log (1.0 / _tmp5_); + _tmp6_ = *existing; #line 510 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = *existing; + _tmp7_ = _tmp6_.max_factor; #line 510 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp8_ = _tmp7_.max_factor; + _tmp8_ = *existing; #line 510 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp9_ = *existing; + _tmp9_ = _tmp8_.min_factor; #line 510 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp10_ = _tmp9_.min_factor; -#line 510 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp11_ = log (_tmp8_ / _tmp10_); -#line 510 "/home/jens/Source/shotwell/src/Dimensions.vala" - (*self).interpolation_factor = _tmp6_ / _tmp11_; + (*self).interpolation_factor = log (1.0 / _tmp5_) / log (_tmp7_ / _tmp9_); #line 513 "/home/jens/Source/shotwell/src/Dimensions.vala" zoom_state_compute_zoom_factors (&(*self)); #line 515 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp12_ = (*self).interpolation_factor; + _tmp10_ = (*self).interpolation_factor; #line 515 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp12_ == 0.0) { + if (_tmp10_ == 0.0) { #line 516 "/home/jens/Source/shotwell/src/Dimensions.vala" zoom_state_center_viewport (&(*self)); -#line 3096 "Dimensions.c" +#line 3041 "Dimensions.c" } else { - gdouble _tmp13_; - ZoomState _tmp14_; - GdkPoint _tmp15_; - gint _tmp16_; - ZoomState _tmp17_; - gdouble _tmp18_; - gdouble _tmp19_; - ZoomState _tmp20_; - GdkPoint _tmp21_; - gint _tmp22_; - ZoomState _tmp23_; - gdouble _tmp24_; + gdouble _tmp11_; + ZoomState _tmp12_; + GdkPoint _tmp13_; + gint _tmp14_; + ZoomState _tmp15_; + gdouble _tmp16_; + gdouble _tmp17_; + ZoomState _tmp18_; + GdkPoint _tmp19_; + gint _tmp20_; + ZoomState _tmp21_; + gdouble _tmp22_; #line 518 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp13_ = (*self).zoom_factor; + _tmp11_ = (*self).zoom_factor; #line 518 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp14_ = *existing; + _tmp12_ = *existing; #line 518 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp15_ = _tmp14_.viewport_center; + _tmp13_ = _tmp12_.viewport_center; #line 518 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp16_ = _tmp15_.x; + _tmp14_ = _tmp13_.x; #line 518 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp17_ = *existing; + _tmp15_ = *existing; #line 518 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp18_ = _tmp17_.zoom_factor; + _tmp16_ = _tmp15_.zoom_factor; #line 518 "/home/jens/Source/shotwell/src/Dimensions.vala" - (*self).viewport_center.x = (gint) (_tmp13_ * (_tmp16_ / _tmp18_)); + (*self).viewport_center.x = (gint) (_tmp11_ * (_tmp14_ / _tmp16_)); #line 520 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp19_ = (*self).zoom_factor; + _tmp17_ = (*self).zoom_factor; #line 520 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp20_ = *existing; + _tmp18_ = *existing; #line 520 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp21_ = _tmp20_.viewport_center; + _tmp19_ = _tmp18_.viewport_center; #line 520 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp22_ = _tmp21_.y; + _tmp20_ = _tmp19_.y; #line 520 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp23_ = *existing; + _tmp21_ = *existing; #line 520 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp24_ = _tmp23_.zoom_factor; + _tmp22_ = _tmp21_.zoom_factor; #line 520 "/home/jens/Source/shotwell/src/Dimensions.vala" - (*self).viewport_center.y = (gint) (_tmp19_ * (_tmp22_ / _tmp24_)); + (*self).viewport_center.y = (gint) (_tmp17_ * (_tmp20_ / _tmp22_)); #line 522 "/home/jens/Source/shotwell/src/Dimensions.vala" zoom_state_clamp_viewport_center (&(*self)); -#line 3140 "Dimensions.c" +#line 3085 "Dimensions.c" } } -void zoom_state_init_pan (ZoomState *self, ZoomState* existing, GdkPoint* new_viewport_center) { +void +zoom_state_init_pan (ZoomState *self, + ZoomState* existing, + GdkPoint* new_viewport_center) +{ ZoomState _tmp0_; Dimensions _tmp1_; ZoomState _tmp2_; @@ -3182,89 +3131,77 @@ void zoom_state_init_pan (ZoomState *self, ZoomState* existing, GdkPoint* new_vi (*self).viewport_center = _tmp6_; #line 535 "/home/jens/Source/shotwell/src/Dimensions.vala" zoom_state_clamp_viewport_center (&(*self)); -#line 3185 "Dimensions.c" +#line 3134 "Dimensions.c" } -static void zoom_state_clamp_viewport_center (ZoomState *self) { +static void +zoom_state_clamp_viewport_center (ZoomState *self) +{ gint zoomed_width = 0; - gint _tmp0_; gint zoomed_height = 0; + GdkPoint _tmp0_; gint _tmp1_; - GdkPoint _tmp2_; + Dimensions _tmp2_; gint _tmp3_; Dimensions _tmp4_; gint _tmp5_; - Dimensions _tmp6_; + GdkPoint _tmp6_; gint _tmp7_; - gint _tmp8_; - GdkPoint _tmp9_; - gint _tmp10_; - Dimensions _tmp11_; - gint _tmp12_; - Dimensions _tmp13_; - gint _tmp14_; - gint _tmp15_; -#line 539 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = zoom_state_get_zoomed_width (&(*self)); + Dimensions _tmp8_; + gint _tmp9_; + Dimensions _tmp10_; + gint _tmp11_; #line 539 "/home/jens/Source/shotwell/src/Dimensions.vala" - zoomed_width = _tmp0_; -#line 540 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = zoom_state_get_zoomed_height (&(*self)); + zoomed_width = zoom_state_get_zoomed_width (&(*self)); #line 540 "/home/jens/Source/shotwell/src/Dimensions.vala" - zoomed_height = _tmp1_; -#line 542 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = (*self).viewport_center; + zoomed_height = zoom_state_get_zoomed_height (&(*self)); #line 542 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = _tmp2_.x; + _tmp0_ = (*self).viewport_center; #line 542 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = (*self).viewport_dimensions; + _tmp1_ = _tmp0_.x; #line 542 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = _tmp4_.width; + _tmp2_ = (*self).viewport_dimensions; #line 542 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp6_ = (*self).viewport_dimensions; + _tmp3_ = _tmp2_.width; #line 542 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = _tmp6_.width; + _tmp4_ = (*self).viewport_dimensions; #line 542 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp8_ = CLAMP (_tmp3_, _tmp5_ / 2, (zoomed_width - (_tmp7_ / 2)) - 1); + _tmp5_ = _tmp4_.width; #line 542 "/home/jens/Source/shotwell/src/Dimensions.vala" - (*self).viewport_center.x = _tmp8_; + (*self).viewport_center.x = CLAMP (_tmp1_, _tmp3_ / 2, (zoomed_width - (_tmp5_ / 2)) - 1); #line 544 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp9_ = (*self).viewport_center; + _tmp6_ = (*self).viewport_center; #line 544 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp10_ = _tmp9_.y; + _tmp7_ = _tmp6_.y; #line 544 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp11_ = (*self).viewport_dimensions; + _tmp8_ = (*self).viewport_dimensions; #line 544 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp12_ = _tmp11_.height; + _tmp9_ = _tmp8_.height; #line 544 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp13_ = (*self).viewport_dimensions; + _tmp10_ = (*self).viewport_dimensions; #line 544 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp14_ = _tmp13_.height; + _tmp11_ = _tmp10_.height; #line 544 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp15_ = CLAMP (_tmp10_, _tmp12_ / 2, (zoomed_height - (_tmp14_ / 2)) - 1); -#line 544 "/home/jens/Source/shotwell/src/Dimensions.vala" - (*self).viewport_center.y = _tmp15_; -#line 3248 "Dimensions.c" + (*self).viewport_center.y = CLAMP (_tmp7_, _tmp9_ / 2, (zoomed_height - (_tmp11_ / 2)) - 1); +#line 3187 "Dimensions.c" } -static void zoom_state_center_viewport (ZoomState *self) { - gint _tmp0_; - gint _tmp1_; -#line 549 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = zoom_state_get_zoomed_width (&(*self)); +static void +zoom_state_center_viewport (ZoomState *self) +{ #line 549 "/home/jens/Source/shotwell/src/Dimensions.vala" - (*self).viewport_center.x = _tmp0_ / 2; + (*self).viewport_center.x = zoom_state_get_zoomed_width (&(*self)) / 2; #line 550 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = zoom_state_get_zoomed_height (&(*self)); -#line 550 "/home/jens/Source/shotwell/src/Dimensions.vala" - (*self).viewport_center.y = _tmp1_ / 2; -#line 3263 "Dimensions.c" + (*self).viewport_center.y = zoom_state_get_zoomed_height (&(*self)) / 2; +#line 3198 "Dimensions.c" } -static void zoom_state_compute_zoom_factors (ZoomState *self) { +static void +zoom_state_compute_zoom_factors (ZoomState *self) +{ gdouble viewport_to_content_x = 0.0; gdouble viewport_to_content_y = 0.0; Dimensions _tmp0_; @@ -3277,8 +3214,6 @@ static void zoom_state_compute_zoom_factors (ZoomState *self) { gdouble _tmp7_; gdouble _tmp8_; gdouble _tmp9_; - gdouble _tmp10_; - gdouble _tmp11_; #line 554 "/home/jens/Source/shotwell/src/Dimensions.vala" (*self).max_factor = 2.0; #line 558 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3294,34 +3229,32 @@ static void zoom_state_compute_zoom_factors (ZoomState *self) { #line 560 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp4_ = viewport_to_content_y; #line 560 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = MIN (_tmp3_, _tmp4_); -#line 560 "/home/jens/Source/shotwell/src/Dimensions.vala" - (*self).min_factor = _tmp5_; + (*self).min_factor = MIN (_tmp3_, _tmp4_); #line 561 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp6_ = (*self).min_factor; + _tmp5_ = (*self).min_factor; #line 561 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp6_ > 1.0) { + if (_tmp5_ > 1.0) { #line 562 "/home/jens/Source/shotwell/src/Dimensions.vala" (*self).min_factor = 1.0; -#line 3306 "Dimensions.c" +#line 3239 "Dimensions.c" } #line 564 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = (*self).min_factor; + _tmp6_ = (*self).min_factor; #line 564 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp8_ = (*self).max_factor; + _tmp7_ = (*self).max_factor; #line 564 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp9_ = (*self).min_factor; + _tmp8_ = (*self).min_factor; #line 564 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp10_ = (*self).interpolation_factor; + _tmp9_ = (*self).interpolation_factor; #line 564 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp11_ = pow (_tmp8_ / _tmp9_, _tmp10_); -#line 564 "/home/jens/Source/shotwell/src/Dimensions.vala" - (*self).zoom_factor = _tmp7_ * _tmp11_; -#line 3320 "Dimensions.c" + (*self).zoom_factor = _tmp6_ * pow (_tmp7_ / _tmp8_, _tmp9_); +#line 3251 "Dimensions.c" } -gdouble zoom_state_get_interpolation_factor (ZoomState *self) { +gdouble +zoom_state_get_interpolation_factor (ZoomState *self) +{ gdouble result = 0.0; gdouble _tmp0_; #line 568 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3330,247 +3263,241 @@ gdouble zoom_state_get_interpolation_factor (ZoomState *self) { result = _tmp0_; #line 568 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 3333 "Dimensions.c" +#line 3266 "Dimensions.c" } -void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle* result) { +void +zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, + GdkRectangle* result) +{ gint zoomed_width = 0; - gint _tmp0_; gint zoomed_height = 0; - gint _tmp1_; GdkRectangle _result_ = {0}; - Dimensions _tmp2_; - gint _tmp3_; - gint _tmp4_; - GdkRectangle _tmp12_; + Dimensions _tmp0_; + gint _tmp1_; + gint _tmp2_; + GdkRectangle _tmp10_; + gint _tmp11_; + Dimensions _tmp12_; gint _tmp13_; - Dimensions _tmp14_; - gint _tmp15_; - gint _tmp16_; + gint _tmp14_; + GdkRectangle _tmp22_; + gint _tmp23_; + gint right = 0; GdkRectangle _tmp24_; gint _tmp25_; - gint right = 0; - GdkRectangle _tmp26_; + Dimensions _tmp26_; gint _tmp27_; - Dimensions _tmp28_; + gint _tmp28_; gint _tmp29_; - gint _tmp30_; gint _tmp31_; + GdkRectangle _tmp32_; gint _tmp33_; + gint bottom = 0; GdkRectangle _tmp34_; gint _tmp35_; - gint bottom = 0; - GdkRectangle _tmp36_; + Dimensions _tmp36_; gint _tmp37_; - Dimensions _tmp38_; + gint _tmp38_; gint _tmp39_; - gint _tmp40_; gint _tmp41_; + GdkRectangle _tmp42_; gint _tmp43_; GdkRectangle _tmp44_; gint _tmp45_; GdkRectangle _tmp46_; gint _tmp47_; - gint _tmp48_; - GdkRectangle _tmp49_; - gint _tmp50_; - gint _tmp51_; #line 573 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = zoom_state_get_zoomed_width (&(*self)); -#line 573 "/home/jens/Source/shotwell/src/Dimensions.vala" - zoomed_width = _tmp0_; -#line 574 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = zoom_state_get_zoomed_height (&(*self)); + zoomed_width = zoom_state_get_zoomed_width (&(*self)); #line 574 "/home/jens/Source/shotwell/src/Dimensions.vala" - zoomed_height = _tmp1_; + zoomed_height = zoom_state_get_zoomed_height (&(*self)); #line 576 "/home/jens/Source/shotwell/src/Dimensions.vala" memset (&_result_, 0, sizeof (GdkRectangle)); #line 578 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = (*self).viewport_dimensions; + _tmp0_ = (*self).viewport_dimensions; #line 578 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = _tmp2_.width; + _tmp1_ = _tmp0_.width; #line 578 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = zoomed_width; + _tmp2_ = zoomed_width; #line 578 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp3_ < _tmp4_) { -#line 3397 "Dimensions.c" - GdkPoint _tmp5_; + if (_tmp1_ < _tmp2_) { +#line 3325 "Dimensions.c" + GdkPoint _tmp3_; + gint _tmp4_; + Dimensions _tmp5_; gint _tmp6_; - Dimensions _tmp7_; - gint _tmp8_; #line 579 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = (*self).viewport_center; + _tmp3_ = (*self).viewport_center; #line 579 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp6_ = _tmp5_.x; + _tmp4_ = _tmp3_.x; #line 579 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = (*self).viewport_dimensions; + _tmp5_ = (*self).viewport_dimensions; #line 579 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp8_ = _tmp7_.width; + _tmp6_ = _tmp5_.width; #line 579 "/home/jens/Source/shotwell/src/Dimensions.vala" - _result_.x = _tmp6_ - (_tmp8_ / 2); -#line 3412 "Dimensions.c" + _result_.x = _tmp4_ - (_tmp6_ / 2); +#line 3340 "Dimensions.c" } else { + gint _tmp7_; + Dimensions _tmp8_; gint _tmp9_; - Dimensions _tmp10_; - gint _tmp11_; #line 581 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp9_ = zoomed_width; + _tmp7_ = zoomed_width; #line 581 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp10_ = (*self).viewport_dimensions; + _tmp8_ = (*self).viewport_dimensions; #line 581 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp11_ = _tmp10_.width; + _tmp9_ = _tmp8_.width; #line 581 "/home/jens/Source/shotwell/src/Dimensions.vala" - _result_.x = (_tmp9_ - _tmp11_) / 2; -#line 3425 "Dimensions.c" + _result_.x = (_tmp7_ - _tmp9_) / 2; +#line 3353 "Dimensions.c" } #line 583 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp12_ = _result_; + _tmp10_ = _result_; #line 583 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp13_ = _tmp12_.x; + _tmp11_ = _tmp10_.x; #line 583 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp13_ < 0) { + if (_tmp11_ < 0) { #line 584 "/home/jens/Source/shotwell/src/Dimensions.vala" _result_.x = 0; -#line 3435 "Dimensions.c" +#line 3363 "Dimensions.c" } #line 586 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp14_ = (*self).viewport_dimensions; + _tmp12_ = (*self).viewport_dimensions; #line 586 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp15_ = _tmp14_.height; + _tmp13_ = _tmp12_.height; #line 586 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp16_ = zoomed_height; + _tmp14_ = zoomed_height; #line 586 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp15_ < _tmp16_) { -#line 3445 "Dimensions.c" - GdkPoint _tmp17_; + if (_tmp13_ < _tmp14_) { +#line 3373 "Dimensions.c" + GdkPoint _tmp15_; + gint _tmp16_; + Dimensions _tmp17_; gint _tmp18_; - Dimensions _tmp19_; - gint _tmp20_; #line 587 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp17_ = (*self).viewport_center; + _tmp15_ = (*self).viewport_center; #line 587 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp18_ = _tmp17_.y; + _tmp16_ = _tmp15_.y; #line 587 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp19_ = (*self).viewport_dimensions; + _tmp17_ = (*self).viewport_dimensions; #line 587 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp20_ = _tmp19_.height; + _tmp18_ = _tmp17_.height; #line 587 "/home/jens/Source/shotwell/src/Dimensions.vala" - _result_.y = _tmp18_ - (_tmp20_ / 2); -#line 3460 "Dimensions.c" + _result_.y = _tmp16_ - (_tmp18_ / 2); +#line 3388 "Dimensions.c" } else { + gint _tmp19_; + Dimensions _tmp20_; gint _tmp21_; - Dimensions _tmp22_; - gint _tmp23_; #line 589 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp21_ = zoomed_height; + _tmp19_ = zoomed_height; #line 589 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp22_ = (*self).viewport_dimensions; + _tmp20_ = (*self).viewport_dimensions; #line 589 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp23_ = _tmp22_.height; + _tmp21_ = _tmp20_.height; #line 589 "/home/jens/Source/shotwell/src/Dimensions.vala" - _result_.y = (_tmp21_ - _tmp23_) / 2; -#line 3473 "Dimensions.c" + _result_.y = (_tmp19_ - _tmp21_) / 2; +#line 3401 "Dimensions.c" } #line 591 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp24_ = _result_; + _tmp22_ = _result_; #line 591 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp25_ = _tmp24_.y; + _tmp23_ = _tmp22_.y; #line 591 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp25_ < 0) { + if (_tmp23_ < 0) { #line 592 "/home/jens/Source/shotwell/src/Dimensions.vala" _result_.y = 0; -#line 3483 "Dimensions.c" +#line 3411 "Dimensions.c" } #line 594 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp26_ = _result_; + _tmp24_ = _result_; #line 594 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp27_ = _tmp26_.x; + _tmp25_ = _tmp24_.x; #line 594 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp28_ = (*self).viewport_dimensions; + _tmp26_ = (*self).viewport_dimensions; #line 594 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp29_ = _tmp28_.width; + _tmp27_ = _tmp26_.width; #line 594 "/home/jens/Source/shotwell/src/Dimensions.vala" - right = _tmp27_ + _tmp29_; + right = _tmp25_ + _tmp27_; #line 595 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp30_ = right; + _tmp28_ = right; #line 595 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp31_ = zoomed_width; + _tmp29_ = zoomed_width; #line 595 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp30_ > _tmp31_) { -#line 3501 "Dimensions.c" - gint _tmp32_; + if (_tmp28_ > _tmp29_) { +#line 3429 "Dimensions.c" + gint _tmp30_; #line 596 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp32_ = zoomed_width; + _tmp30_ = zoomed_width; #line 596 "/home/jens/Source/shotwell/src/Dimensions.vala" - right = _tmp32_; -#line 3507 "Dimensions.c" + right = _tmp30_; +#line 3435 "Dimensions.c" } #line 597 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp33_ = right; + _tmp31_ = right; #line 597 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp34_ = _result_; + _tmp32_ = _result_; #line 597 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp35_ = _tmp34_.x; + _tmp33_ = _tmp32_.x; #line 597 "/home/jens/Source/shotwell/src/Dimensions.vala" - _result_.width = _tmp33_ - _tmp35_; + _result_.width = _tmp31_ - _tmp33_; #line 599 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp36_ = _result_; + _tmp34_ = _result_; #line 599 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp37_ = _tmp36_.y; + _tmp35_ = _tmp34_.y; #line 599 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp38_ = (*self).viewport_dimensions; + _tmp36_ = (*self).viewport_dimensions; #line 599 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp39_ = _tmp38_.height; + _tmp37_ = _tmp36_.height; #line 599 "/home/jens/Source/shotwell/src/Dimensions.vala" - bottom = _tmp37_ + _tmp39_; + bottom = _tmp35_ + _tmp37_; #line 600 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp40_ = bottom; + _tmp38_ = bottom; #line 600 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp41_ = zoomed_height; + _tmp39_ = zoomed_height; #line 600 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp40_ > _tmp41_) { -#line 3533 "Dimensions.c" - gint _tmp42_; + if (_tmp38_ > _tmp39_) { +#line 3461 "Dimensions.c" + gint _tmp40_; #line 601 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp42_ = zoomed_height; + _tmp40_ = zoomed_height; #line 601 "/home/jens/Source/shotwell/src/Dimensions.vala" - bottom = _tmp42_; -#line 3539 "Dimensions.c" + bottom = _tmp40_; +#line 3467 "Dimensions.c" } #line 602 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp43_ = bottom; + _tmp41_ = bottom; #line 602 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp44_ = _result_; + _tmp42_ = _result_; #line 602 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp45_ = _tmp44_.y; + _tmp43_ = _tmp42_.y; #line 602 "/home/jens/Source/shotwell/src/Dimensions.vala" - _result_.height = _tmp43_ - _tmp45_; -#line 604 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp46_ = _result_; + _result_.height = _tmp41_ - _tmp43_; #line 604 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp47_ = _tmp46_.width; + _tmp44_ = _result_; #line 604 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp48_ = CLAMP (_tmp47_, 1, G_MAXINT); + _tmp45_ = _tmp44_.width; #line 604 "/home/jens/Source/shotwell/src/Dimensions.vala" - _result_.width = _tmp48_; -#line 605 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp49_ = _result_; + _result_.width = CLAMP (_tmp45_, 1, G_MAXINT); #line 605 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp50_ = _tmp49_.height; + _tmp46_ = _result_; #line 605 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp51_ = CLAMP (_tmp50_, 1, G_MAXINT); + _tmp47_ = _tmp46_.height; #line 605 "/home/jens/Source/shotwell/src/Dimensions.vala" - _result_.height = _tmp51_; + _result_.height = CLAMP (_tmp47_, 1, G_MAXINT); #line 607 "/home/jens/Source/shotwell/src/Dimensions.vala" *result = _result_; #line 607 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 3569 "Dimensions.c" +#line 3493 "Dimensions.c" } -void zoom_state_get_viewing_rectangle_wrt_screen (ZoomState *self, GdkRectangle* result) { +void +zoom_state_get_viewing_rectangle_wrt_screen (ZoomState *self, + GdkRectangle* result) +{ GdkRectangle wrt_content = {0}; GdkRectangle _tmp0_ = {0}; GdkRectangle _result_ = {0}; @@ -3614,7 +3541,7 @@ void zoom_state_get_viewing_rectangle_wrt_screen (ZoomState *self, GdkRectangle* if (_tmp6_ < 0) { #line 618 "/home/jens/Source/shotwell/src/Dimensions.vala" _result_.x = 0; -#line 3617 "Dimensions.c" +#line 3544 "Dimensions.c" } #line 619 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp7_ = (*self).viewport_dimensions; @@ -3634,7 +3561,7 @@ void zoom_state_get_viewing_rectangle_wrt_screen (ZoomState *self, GdkRectangle* if (_tmp12_ < 0) { #line 621 "/home/jens/Source/shotwell/src/Dimensions.vala" _result_.y = 0; -#line 3637 "Dimensions.c" +#line 3564 "Dimensions.c" } #line 622 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp13_ = wrt_content; @@ -3652,212 +3579,182 @@ void zoom_state_get_viewing_rectangle_wrt_screen (ZoomState *self, GdkRectangle* *result = _result_; #line 625 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 3655 "Dimensions.c" +#line 3582 "Dimensions.c" } -void zoom_state_get_viewing_rectangle_projection (ZoomState *self, GdkPixbuf* for_pixbuf, GdkRectangle* result) { +void +zoom_state_get_viewing_rectangle_projection (ZoomState *self, + GdkPixbuf* for_pixbuf, + GdkRectangle* result) +{ gdouble zoomed_width = 0.0; - gint _tmp0_; gdouble zoomed_height = 0.0; - gint _tmp1_; gdouble horiz_scale = 0.0; - GdkPixbuf* _tmp2_; - gint _tmp3_; - gint _tmp4_; + gint _tmp0_; + gint _tmp1_; gdouble vert_scale = 0.0; - GdkPixbuf* _tmp5_; - gint _tmp6_; - gint _tmp7_; + gint _tmp2_; + gint _tmp3_; gdouble scale = 0.0; GdkRectangle viewing_rectangle = {0}; - GdkRectangle _tmp8_ = {0}; + GdkRectangle _tmp4_ = {0}; GdkRectangle _result_ = {0}; - GdkRectangle _tmp9_; + GdkRectangle _tmp5_; + gint _tmp6_; + GdkRectangle _tmp7_; + gint _tmp8_; + gint _tmp9_; gint _tmp10_; GdkRectangle _tmp11_; gint _tmp12_; - GdkPixbuf* _tmp13_; + GdkRectangle _tmp13_; gint _tmp14_; gint _tmp15_; gint _tmp16_; + gint right = 0; GdkRectangle _tmp17_; gint _tmp18_; GdkRectangle _tmp19_; gint _tmp20_; - GdkPixbuf* _tmp21_; + gint _tmp21_; gint _tmp22_; gint _tmp23_; - gint _tmp24_; - gint right = 0; - GdkRectangle _tmp25_; - gint _tmp26_; - GdkRectangle _tmp27_; + gint bottom = 0; + GdkRectangle _tmp24_; + gint _tmp25_; + GdkRectangle _tmp26_; + gint _tmp27_; gint _tmp28_; gint _tmp29_; - GdkPixbuf* _tmp30_; + gint _tmp30_; gint _tmp31_; - gint _tmp32_; + GdkRectangle _tmp32_; gint _tmp33_; - gint bottom = 0; - GdkRectangle _tmp34_; - gint _tmp35_; - GdkRectangle _tmp36_; - gint _tmp37_; - gint _tmp38_; - GdkPixbuf* _tmp39_; - gint _tmp40_; - gint _tmp41_; - gint _tmp42_; - gint _tmp43_; - GdkRectangle _tmp44_; - gint _tmp45_; - gint _tmp46_; - GdkRectangle _tmp47_; - gint _tmp48_; + gint _tmp34_; + GdkRectangle _tmp35_; + gint _tmp36_; #line 629 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (GDK_IS_PIXBUF (for_pixbuf)); #line 630 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = zoom_state_get_zoomed_width (&(*self)); -#line 630 "/home/jens/Source/shotwell/src/Dimensions.vala" - zoomed_width = (gdouble) _tmp0_; + zoomed_width = (gdouble) zoom_state_get_zoomed_width (&(*self)); #line 631 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = zoom_state_get_zoomed_height (&(*self)); -#line 631 "/home/jens/Source/shotwell/src/Dimensions.vala" - zoomed_height = (gdouble) _tmp1_; -#line 633 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = for_pixbuf; + zoomed_height = (gdouble) zoom_state_get_zoomed_height (&(*self)); #line 633 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = gdk_pixbuf_get_width (_tmp2_); + _tmp0_ = gdk_pixbuf_get_width (for_pixbuf); #line 633 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = _tmp3_; + _tmp1_ = _tmp0_; #line 633 "/home/jens/Source/shotwell/src/Dimensions.vala" - horiz_scale = _tmp4_ / zoomed_width; -#line 634 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = for_pixbuf; + horiz_scale = _tmp1_ / zoomed_width; #line 634 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp6_ = gdk_pixbuf_get_height (_tmp5_); + _tmp2_ = gdk_pixbuf_get_height (for_pixbuf); #line 634 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = _tmp6_; + _tmp3_ = _tmp2_; #line 634 "/home/jens/Source/shotwell/src/Dimensions.vala" - vert_scale = _tmp7_ / zoomed_height; + vert_scale = _tmp3_ / zoomed_height; #line 635 "/home/jens/Source/shotwell/src/Dimensions.vala" scale = (horiz_scale + vert_scale) / 2.0; #line 637 "/home/jens/Source/shotwell/src/Dimensions.vala" - zoom_state_get_viewing_rectangle_wrt_content (&(*self), &_tmp8_); + zoom_state_get_viewing_rectangle_wrt_content (&(*self), &_tmp4_); #line 637 "/home/jens/Source/shotwell/src/Dimensions.vala" - viewing_rectangle = _tmp8_; + viewing_rectangle = _tmp4_; #line 639 "/home/jens/Source/shotwell/src/Dimensions.vala" memset (&_result_, 0, sizeof (GdkRectangle)); #line 640 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp9_ = viewing_rectangle; + _tmp5_ = viewing_rectangle; #line 640 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp10_ = _tmp9_.x; + _tmp6_ = _tmp5_.x; #line 640 "/home/jens/Source/shotwell/src/Dimensions.vala" - _result_.x = (gint) (_tmp10_ * scale); -#line 641 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp11_ = _result_; -#line 641 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp12_ = _tmp11_.x; + _result_.x = (gint) (_tmp6_ * scale); #line 641 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp13_ = for_pixbuf; + _tmp7_ = _result_; #line 641 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp14_ = gdk_pixbuf_get_width (_tmp13_); + _tmp8_ = _tmp7_.x; #line 641 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp15_ = _tmp14_; + _tmp9_ = gdk_pixbuf_get_width (for_pixbuf); #line 641 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp16_ = CLAMP (_tmp12_, 0, _tmp15_); + _tmp10_ = _tmp9_; #line 641 "/home/jens/Source/shotwell/src/Dimensions.vala" - _result_.x = _tmp16_; + _result_.x = CLAMP (_tmp8_, 0, _tmp10_); #line 642 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp17_ = viewing_rectangle; + _tmp11_ = viewing_rectangle; #line 642 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp18_ = _tmp17_.y; + _tmp12_ = _tmp11_.y; #line 642 "/home/jens/Source/shotwell/src/Dimensions.vala" - _result_.y = (gint) (_tmp18_ * scale); + _result_.y = (gint) (_tmp12_ * scale); #line 643 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp19_ = _result_; + _tmp13_ = _result_; #line 643 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp20_ = _tmp19_.y; + _tmp14_ = _tmp13_.y; #line 643 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp21_ = for_pixbuf; + _tmp15_ = gdk_pixbuf_get_height (for_pixbuf); #line 643 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp22_ = gdk_pixbuf_get_height (_tmp21_); -#line 643 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp23_ = _tmp22_; + _tmp16_ = _tmp15_; #line 643 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp24_ = CLAMP (_tmp20_, 0, _tmp23_); -#line 643 "/home/jens/Source/shotwell/src/Dimensions.vala" - _result_.y = _tmp24_; + _result_.y = CLAMP (_tmp14_, 0, _tmp16_); #line 644 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp25_ = viewing_rectangle; + _tmp17_ = viewing_rectangle; #line 644 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp26_ = _tmp25_.x; + _tmp18_ = _tmp17_.x; #line 644 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp27_ = viewing_rectangle; + _tmp19_ = viewing_rectangle; #line 644 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp28_ = _tmp27_.width; + _tmp20_ = _tmp19_.width; #line 644 "/home/jens/Source/shotwell/src/Dimensions.vala" - right = (gint) ((_tmp26_ + _tmp28_) * scale); -#line 645 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp29_ = right; + right = (gint) ((_tmp18_ + _tmp20_) * scale); #line 645 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp30_ = for_pixbuf; + _tmp21_ = right; #line 645 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp31_ = gdk_pixbuf_get_width (_tmp30_); + _tmp22_ = gdk_pixbuf_get_width (for_pixbuf); #line 645 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp32_ = _tmp31_; -#line 645 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp33_ = CLAMP (_tmp29_, 0, _tmp32_); + _tmp23_ = _tmp22_; #line 645 "/home/jens/Source/shotwell/src/Dimensions.vala" - right = _tmp33_; + right = CLAMP (_tmp21_, 0, _tmp23_); #line 646 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp34_ = viewing_rectangle; + _tmp24_ = viewing_rectangle; #line 646 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp35_ = _tmp34_.y; + _tmp25_ = _tmp24_.y; #line 646 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp36_ = viewing_rectangle; + _tmp26_ = viewing_rectangle; #line 646 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp37_ = _tmp36_.height; + _tmp27_ = _tmp26_.height; #line 646 "/home/jens/Source/shotwell/src/Dimensions.vala" - bottom = (gint) ((_tmp35_ + _tmp37_) * scale); + bottom = (gint) ((_tmp25_ + _tmp27_) * scale); #line 647 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp38_ = bottom; + _tmp28_ = bottom; #line 647 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp39_ = for_pixbuf; + _tmp29_ = gdk_pixbuf_get_height (for_pixbuf); #line 647 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp40_ = gdk_pixbuf_get_height (_tmp39_); + _tmp30_ = _tmp29_; #line 647 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp41_ = _tmp40_; -#line 647 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp42_ = CLAMP (_tmp38_, 0, _tmp41_); -#line 647 "/home/jens/Source/shotwell/src/Dimensions.vala" - bottom = _tmp42_; + bottom = CLAMP (_tmp28_, 0, _tmp30_); #line 648 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp43_ = right; + _tmp31_ = right; #line 648 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp44_ = _result_; + _tmp32_ = _result_; #line 648 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp45_ = _tmp44_.x; + _tmp33_ = _tmp32_.x; #line 648 "/home/jens/Source/shotwell/src/Dimensions.vala" - _result_.width = _tmp43_ - _tmp45_; + _result_.width = _tmp31_ - _tmp33_; #line 649 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp46_ = bottom; + _tmp34_ = bottom; #line 649 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp47_ = _result_; + _tmp35_ = _result_; #line 649 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp48_ = _tmp47_.y; + _tmp36_ = _tmp35_.y; #line 649 "/home/jens/Source/shotwell/src/Dimensions.vala" - _result_.height = _tmp46_ - _tmp48_; + _result_.height = _tmp34_ - _tmp36_; #line 651 "/home/jens/Source/shotwell/src/Dimensions.vala" *result = _result_; #line 651 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 3856 "Dimensions.c" +#line 3751 "Dimensions.c" } -gdouble zoom_state_get_zoom_factor (ZoomState *self) { +gdouble +zoom_state_get_zoom_factor (ZoomState *self) +{ gdouble result = 0.0; gdouble _tmp0_; #line 656 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3866,11 +3763,13 @@ gdouble zoom_state_get_zoom_factor (ZoomState *self) { result = _tmp0_; #line 656 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 3869 "Dimensions.c" +#line 3766 "Dimensions.c" } -gint zoom_state_get_zoomed_width (ZoomState *self) { +gint +zoom_state_get_zoomed_width (ZoomState *self) +{ gint result = 0; Dimensions _tmp0_; gint _tmp1_; @@ -3885,11 +3784,13 @@ gint zoom_state_get_zoomed_width (ZoomState *self) { result = (gint) (_tmp1_ * _tmp2_); #line 660 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 3888 "Dimensions.c" +#line 3787 "Dimensions.c" } -gint zoom_state_get_zoomed_height (ZoomState *self) { +gint +zoom_state_get_zoomed_height (ZoomState *self) +{ gint result = 0; Dimensions _tmp0_; gint _tmp1_; @@ -3904,11 +3805,14 @@ gint zoom_state_get_zoomed_height (ZoomState *self) { result = (gint) (_tmp1_ * _tmp2_); #line 664 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 3907 "Dimensions.c" +#line 3808 "Dimensions.c" } -void zoom_state_get_viewport_center (ZoomState *self, GdkPoint* result) { +void +zoom_state_get_viewport_center (ZoomState *self, + GdkPoint* result) +{ GdkPoint _tmp0_; #line 668 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).viewport_center; @@ -3916,248 +3820,232 @@ void zoom_state_get_viewport_center (ZoomState *self, GdkPoint* result) { *result = _tmp0_; #line 668 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 3919 "Dimensions.c" +#line 3823 "Dimensions.c" } -gchar* zoom_state_to_string (ZoomState *self) { +gchar* +zoom_state_to_string (ZoomState *self) +{ gchar* result = NULL; gchar* named_modes = NULL; gchar* _tmp0_; - gboolean _tmp1_; - gboolean _tmp6_; - gboolean _tmp11_; - gboolean _tmp16_; - const gchar* _tmp21_; + const gchar* _tmp17_; GdkRectangle viewing_rect = {0}; - GdkRectangle _tmp23_ = {0}; + GdkRectangle _tmp19_ = {0}; + Dimensions _tmp20_; + gint _tmp21_; + Dimensions _tmp22_; + gint _tmp23_; Dimensions _tmp24_; gint _tmp25_; Dimensions _tmp26_; gint _tmp27_; - Dimensions _tmp28_; - gint _tmp29_; - Dimensions _tmp30_; - gint _tmp31_; - gdouble _tmp32_; - gdouble _tmp33_; - gdouble _tmp34_; + gdouble _tmp28_; + gdouble _tmp29_; + gdouble _tmp30_; + const gchar* _tmp31_; + GdkRectangle _tmp32_; + gint _tmp33_; + GdkRectangle _tmp34_; gint _tmp35_; - gint _tmp36_; - const gchar* _tmp37_; + GdkRectangle _tmp36_; + gint _tmp37_; GdkRectangle _tmp38_; gint _tmp39_; - GdkRectangle _tmp40_; + GdkPoint _tmp40_; gint _tmp41_; - GdkRectangle _tmp42_; + GdkPoint _tmp42_; gint _tmp43_; - GdkRectangle _tmp44_; - gint _tmp45_; - GdkPoint _tmp46_; - gint _tmp47_; - GdkPoint _tmp48_; - gint _tmp49_; - gchar* _tmp50_; + gchar* _tmp44_; #line 672 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = g_strdup (""); #line 672 "/home/jens/Source/shotwell/src/Dimensions.vala" named_modes = _tmp0_; #line 673 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = zoom_state_is_min (&(*self)); -#line 673 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp1_) { -#line 3969 "Dimensions.c" - const gchar* _tmp2_ = NULL; + if (zoom_state_is_min (&(*self))) { +#line 3867 "Dimensions.c" + const gchar* _tmp1_ = NULL; + const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; + gchar* _tmp4_; #line 674 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = named_modes; + _tmp2_ = named_modes; #line 674 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (g_strcmp0 (_tmp3_, "") == 0) { + if (g_strcmp0 (_tmp2_, "") == 0) { #line 674 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = "MIN"; -#line 3980 "Dimensions.c" + _tmp1_ = "MIN"; +#line 3878 "Dimensions.c" } else { #line 674 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = ", MIN"; -#line 3984 "Dimensions.c" + _tmp1_ = ", MIN"; +#line 3882 "Dimensions.c" } #line 674 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = named_modes; + _tmp3_ = named_modes; #line 674 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = g_strconcat (_tmp4_, _tmp2_, NULL); + _tmp4_ = g_strconcat (_tmp3_, _tmp1_, NULL); #line 674 "/home/jens/Source/shotwell/src/Dimensions.vala" _g_free0 (named_modes); #line 674 "/home/jens/Source/shotwell/src/Dimensions.vala" - named_modes = _tmp5_; -#line 3994 "Dimensions.c" + named_modes = _tmp4_; +#line 3892 "Dimensions.c" } #line 675 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp6_ = zoom_state_is_default (&(*self)); -#line 675 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp6_) { -#line 4000 "Dimensions.c" - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_; - const gchar* _tmp9_; - gchar* _tmp10_; + if (zoom_state_is_default (&(*self))) { +#line 3896 "Dimensions.c" + const gchar* _tmp5_ = NULL; + const gchar* _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_; #line 676 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp8_ = named_modes; + _tmp6_ = named_modes; #line 676 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (g_strcmp0 (_tmp8_, "") == 0) { + if (g_strcmp0 (_tmp6_, "") == 0) { #line 676 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = "DEFAULT"; -#line 4011 "Dimensions.c" + _tmp5_ = "DEFAULT"; +#line 3907 "Dimensions.c" } else { #line 676 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = ", DEFAULT"; -#line 4015 "Dimensions.c" + _tmp5_ = ", DEFAULT"; +#line 3911 "Dimensions.c" } #line 676 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp9_ = named_modes; + _tmp7_ = named_modes; #line 676 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp10_ = g_strconcat (_tmp9_, _tmp7_, NULL); + _tmp8_ = g_strconcat (_tmp7_, _tmp5_, NULL); #line 676 "/home/jens/Source/shotwell/src/Dimensions.vala" _g_free0 (named_modes); #line 676 "/home/jens/Source/shotwell/src/Dimensions.vala" - named_modes = _tmp10_; -#line 4025 "Dimensions.c" + named_modes = _tmp8_; +#line 3921 "Dimensions.c" } #line 677 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp11_ = zoom_state_is_isomorphic (&(*self)); -#line 677 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp11_) { -#line 4031 "Dimensions.c" - const gchar* _tmp12_ = NULL; - const gchar* _tmp13_; - const gchar* _tmp14_; - gchar* _tmp15_; + if (zoom_state_is_isomorphic (&(*self))) { +#line 3925 "Dimensions.c" + const gchar* _tmp9_ = NULL; + const gchar* _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; #line 678 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp13_ = named_modes; + _tmp10_ = named_modes; #line 678 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (g_strcmp0 (_tmp13_, "") == 0) { + if (g_strcmp0 (_tmp10_, "") == 0) { #line 678 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp12_ = "ISOMORPHIC"; -#line 4042 "Dimensions.c" + _tmp9_ = "ISOMORPHIC"; +#line 3936 "Dimensions.c" } else { #line 678 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp12_ = ", ISOMORPHIC"; -#line 4046 "Dimensions.c" + _tmp9_ = ", ISOMORPHIC"; +#line 3940 "Dimensions.c" } #line 678 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp14_ = named_modes; + _tmp11_ = named_modes; #line 678 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp15_ = g_strconcat (_tmp14_, _tmp12_, NULL); + _tmp12_ = g_strconcat (_tmp11_, _tmp9_, NULL); #line 678 "/home/jens/Source/shotwell/src/Dimensions.vala" _g_free0 (named_modes); #line 678 "/home/jens/Source/shotwell/src/Dimensions.vala" - named_modes = _tmp15_; -#line 4056 "Dimensions.c" + named_modes = _tmp12_; +#line 3950 "Dimensions.c" } #line 679 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp16_ = zoom_state_is_max (&(*self)); -#line 679 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp16_) { -#line 4062 "Dimensions.c" - const gchar* _tmp17_ = NULL; - const gchar* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; + if (zoom_state_is_max (&(*self))) { +#line 3954 "Dimensions.c" + const gchar* _tmp13_ = NULL; + const gchar* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; #line 680 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp18_ = named_modes; + _tmp14_ = named_modes; #line 680 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (g_strcmp0 (_tmp18_, "") == 0) { + if (g_strcmp0 (_tmp14_, "") == 0) { #line 680 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp17_ = "MAX"; -#line 4073 "Dimensions.c" + _tmp13_ = "MAX"; +#line 3965 "Dimensions.c" } else { #line 680 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp17_ = ", MAX"; -#line 4077 "Dimensions.c" + _tmp13_ = ", MAX"; +#line 3969 "Dimensions.c" } #line 680 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp19_ = named_modes; + _tmp15_ = named_modes; #line 680 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp20_ = g_strconcat (_tmp19_, _tmp17_, NULL); + _tmp16_ = g_strconcat (_tmp15_, _tmp13_, NULL); #line 680 "/home/jens/Source/shotwell/src/Dimensions.vala" _g_free0 (named_modes); #line 680 "/home/jens/Source/shotwell/src/Dimensions.vala" - named_modes = _tmp20_; -#line 4087 "Dimensions.c" + named_modes = _tmp16_; +#line 3979 "Dimensions.c" } #line 681 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp21_ = named_modes; + _tmp17_ = named_modes; #line 681 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (g_strcmp0 (_tmp21_, "") == 0) { -#line 4093 "Dimensions.c" - gchar* _tmp22_; + if (g_strcmp0 (_tmp17_, "") == 0) { +#line 3985 "Dimensions.c" + gchar* _tmp18_; #line 682 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp22_ = g_strdup ("(none)"); + _tmp18_ = g_strdup ("(none)"); #line 682 "/home/jens/Source/shotwell/src/Dimensions.vala" _g_free0 (named_modes); #line 682 "/home/jens/Source/shotwell/src/Dimensions.vala" - named_modes = _tmp22_; -#line 4101 "Dimensions.c" + named_modes = _tmp18_; +#line 3993 "Dimensions.c" } #line 684 "/home/jens/Source/shotwell/src/Dimensions.vala" - zoom_state_get_viewing_rectangle_wrt_content (&(*self), &_tmp23_); + zoom_state_get_viewing_rectangle_wrt_content (&(*self), &_tmp19_); #line 684 "/home/jens/Source/shotwell/src/Dimensions.vala" - viewing_rect = _tmp23_; -#line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp24_ = (*self).content_dimensions; -#line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp25_ = _tmp24_.width; + viewing_rect = _tmp19_; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp26_ = (*self).content_dimensions; + _tmp20_ = (*self).content_dimensions; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp27_ = _tmp26_.height; + _tmp21_ = _tmp20_.width; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp28_ = (*self).viewport_dimensions; + _tmp22_ = (*self).content_dimensions; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp29_ = _tmp28_.width; + _tmp23_ = _tmp22_.height; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp30_ = (*self).viewport_dimensions; + _tmp24_ = (*self).viewport_dimensions; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp31_ = _tmp30_.height; + _tmp25_ = _tmp24_.width; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp32_ = (*self).min_factor; + _tmp26_ = (*self).viewport_dimensions; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp33_ = (*self).max_factor; + _tmp27_ = _tmp26_.height; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp34_ = (*self).zoom_factor; + _tmp28_ = (*self).min_factor; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp35_ = zoom_state_get_zoomed_width (&(*self)); + _tmp29_ = (*self).max_factor; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp36_ = zoom_state_get_zoomed_height (&(*self)); + _tmp30_ = (*self).zoom_factor; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp37_ = named_modes; + _tmp31_ = named_modes; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp38_ = viewing_rect; + _tmp32_ = viewing_rect; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp39_ = _tmp38_.x; + _tmp33_ = _tmp32_.x; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp40_ = viewing_rect; + _tmp34_ = viewing_rect; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp41_ = _tmp40_.y; + _tmp35_ = _tmp34_.y; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp42_ = viewing_rect; + _tmp36_ = viewing_rect; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp43_ = _tmp42_.width; + _tmp37_ = _tmp36_.width; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp44_ = viewing_rect; + _tmp38_ = viewing_rect; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp45_ = _tmp44_.height; + _tmp39_ = _tmp38_.height; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp46_ = (*self).viewport_center; + _tmp40_ = (*self).viewport_center; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp47_ = _tmp46_.x; + _tmp41_ = _tmp40_.x; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp48_ = (*self).viewport_center; + _tmp42_ = (*self).viewport_center; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp49_ = _tmp48_.y; + _tmp43_ = _tmp42_.y; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp50_ = g_strdup_printf ("ZoomState {\n" \ + _tmp44_ = g_strdup_printf ("ZoomState {\n" \ " content dimensions = %d x %d;\n" \ " viewport dimensions = " "%d x %d;\n" \ " min factor = %f;\n" \ @@ -4165,18 +4053,20 @@ gchar* zoom_state_to_string (ZoomState *self) { " current factor = %f;" "\n" \ " zoomed width = %d;\n" \ " zoomed height = %d;\n" \ -" named modes = %s;" "\n viewing rectangle = { x: %d, y: %d, width: %d, height: %d };" "\n viewport center = (%d, %d);\n}\n", _tmp25_, _tmp27_, _tmp29_, _tmp31_, _tmp32_, _tmp33_, _tmp34_, _tmp35_, _tmp36_, _tmp37_, _tmp39_, _tmp41_, _tmp43_, _tmp45_, _tmp47_, _tmp49_); +" named modes = %s;" "\n viewing rectangle = { x: %d, y: %d, width: %d, height: %d };" "\n viewport center = (%d, %d);\n}\n", _tmp21_, _tmp23_, _tmp25_, _tmp27_, _tmp28_, _tmp29_, _tmp30_, zoom_state_get_zoomed_width (&(*self)), zoom_state_get_zoomed_height (&(*self)), _tmp31_, _tmp33_, _tmp35_, _tmp37_, _tmp39_, _tmp41_, _tmp43_); #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" - result = _tmp50_; + result = _tmp44_; #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" _g_free0 (named_modes); #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4167 "Dimensions.c" +#line 4055 "Dimensions.c" } -gboolean zoom_state_is_min (ZoomState *self) { +gboolean +zoom_state_is_min (ZoomState *self) +{ gboolean result = FALSE; gdouble _tmp0_; gdouble _tmp1_; @@ -4188,24 +4078,25 @@ gboolean zoom_state_is_min (ZoomState *self) { result = _tmp0_ == _tmp1_; #line 698 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4183 "Dimensions.c" +#line 4073 "Dimensions.c" } -gboolean zoom_state_is_default (ZoomState *self) { +gboolean +zoom_state_is_default (ZoomState *self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 702 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = zoom_state_is_min (&(*self)); -#line 702 "/home/jens/Source/shotwell/src/Dimensions.vala" - result = _tmp0_; + result = zoom_state_is_min (&(*self)); #line 702 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4196 "Dimensions.c" +#line 4085 "Dimensions.c" } -gboolean zoom_state_is_max (ZoomState *self) { +gboolean +zoom_state_is_max (ZoomState *self) +{ gboolean result = FALSE; gdouble _tmp0_; gdouble _tmp1_; @@ -4217,11 +4108,13 @@ gboolean zoom_state_is_max (ZoomState *self) { result = _tmp0_ == _tmp1_; #line 706 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4212 "Dimensions.c" +#line 4103 "Dimensions.c" } -gboolean zoom_state_is_isomorphic (ZoomState *self) { +gboolean +zoom_state_is_isomorphic (ZoomState *self) +{ gboolean result = FALSE; gdouble _tmp0_; #line 710 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -4230,37 +4123,38 @@ gboolean zoom_state_is_isomorphic (ZoomState *self) { result = _tmp0_ == 1.0; #line 710 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4225 "Dimensions.c" +#line 4118 "Dimensions.c" } -gboolean zoom_state_equals (ZoomState *self, ZoomState* other) { +gboolean +zoom_state_equals (ZoomState *self, + ZoomState* other) +{ gboolean result = FALSE; ZoomState _tmp0_; Dimensions _tmp1_; - gboolean _tmp2_; - ZoomState _tmp3_; - Dimensions _tmp4_; - gboolean _tmp5_; + ZoomState _tmp2_; + Dimensions _tmp3_; + gdouble _tmp4_; + ZoomState _tmp5_; gdouble _tmp6_; - ZoomState _tmp7_; - gdouble _tmp8_; + gdouble _tmp7_; + ZoomState _tmp8_; gdouble _tmp9_; - ZoomState _tmp10_; - gdouble _tmp11_; + gdouble _tmp10_; + ZoomState _tmp11_; gdouble _tmp12_; - ZoomState _tmp13_; - gdouble _tmp14_; - GdkPoint _tmp15_; - gint _tmp16_; - ZoomState _tmp17_; + GdkPoint _tmp13_; + gint _tmp14_; + ZoomState _tmp15_; + GdkPoint _tmp16_; + gint _tmp17_; GdkPoint _tmp18_; gint _tmp19_; - GdkPoint _tmp20_; - gint _tmp21_; - ZoomState _tmp22_; - GdkPoint _tmp23_; - gint _tmp24_; + ZoomState _tmp20_; + GdkPoint _tmp21_; + gint _tmp22_; #line 713 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_val_if_fail (other != NULL, FALSE); #line 714 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -4268,116 +4162,114 @@ gboolean zoom_state_equals (ZoomState *self, ZoomState* other) { #line 714 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = _tmp0_.content_dimensions; #line 714 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = dimensions_equals (&(*self).content_dimensions, &_tmp1_); -#line 714 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (!_tmp2_) { + if (!dimensions_equals (&(*self).content_dimensions, &_tmp1_)) { #line 715 "/home/jens/Source/shotwell/src/Dimensions.vala" result = FALSE; #line 715 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4270 "Dimensions.c" +#line 4162 "Dimensions.c" } #line 716 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = *other; + _tmp2_ = *other; #line 716 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = _tmp3_.viewport_dimensions; -#line 716 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = dimensions_equals (&(*self).viewport_dimensions, &_tmp4_); + _tmp3_ = _tmp2_.viewport_dimensions; #line 716 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (!_tmp5_) { + if (!dimensions_equals (&(*self).viewport_dimensions, &_tmp3_)) { #line 717 "/home/jens/Source/shotwell/src/Dimensions.vala" result = FALSE; #line 717 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4284 "Dimensions.c" +#line 4174 "Dimensions.c" } #line 718 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp6_ = (*self).zoom_factor; + _tmp4_ = (*self).zoom_factor; #line 718 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = *other; + _tmp5_ = *other; #line 718 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp8_ = _tmp7_.zoom_factor; + _tmp6_ = _tmp5_.zoom_factor; #line 718 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp6_ != _tmp8_) { + if (_tmp4_ != _tmp6_) { #line 719 "/home/jens/Source/shotwell/src/Dimensions.vala" result = FALSE; #line 719 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4298 "Dimensions.c" +#line 4188 "Dimensions.c" } #line 720 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp9_ = (*self).min_factor; + _tmp7_ = (*self).min_factor; #line 720 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp10_ = *other; + _tmp8_ = *other; #line 720 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp11_ = _tmp10_.min_factor; + _tmp9_ = _tmp8_.min_factor; #line 720 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp9_ != _tmp11_) { + if (_tmp7_ != _tmp9_) { #line 721 "/home/jens/Source/shotwell/src/Dimensions.vala" result = FALSE; #line 721 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4312 "Dimensions.c" +#line 4202 "Dimensions.c" } #line 722 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp12_ = (*self).max_factor; + _tmp10_ = (*self).max_factor; #line 722 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp13_ = *other; + _tmp11_ = *other; #line 722 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp14_ = _tmp13_.max_factor; + _tmp12_ = _tmp11_.max_factor; #line 722 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp12_ != _tmp14_) { + if (_tmp10_ != _tmp12_) { #line 723 "/home/jens/Source/shotwell/src/Dimensions.vala" result = FALSE; #line 723 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4326 "Dimensions.c" +#line 4216 "Dimensions.c" } #line 724 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp15_ = (*self).viewport_center; + _tmp13_ = (*self).viewport_center; #line 724 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp16_ = _tmp15_.x; + _tmp14_ = _tmp13_.x; #line 724 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp17_ = *other; + _tmp15_ = *other; #line 724 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp18_ = _tmp17_.viewport_center; + _tmp16_ = _tmp15_.viewport_center; #line 724 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp19_ = _tmp18_.x; + _tmp17_ = _tmp16_.x; #line 724 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp16_ != _tmp19_) { + if (_tmp14_ != _tmp17_) { #line 725 "/home/jens/Source/shotwell/src/Dimensions.vala" result = FALSE; #line 725 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4344 "Dimensions.c" +#line 4234 "Dimensions.c" } #line 726 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp20_ = (*self).viewport_center; + _tmp18_ = (*self).viewport_center; #line 726 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp21_ = _tmp20_.y; + _tmp19_ = _tmp18_.y; #line 726 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp22_ = *other; + _tmp20_ = *other; #line 726 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp23_ = _tmp22_.viewport_center; + _tmp21_ = _tmp20_.viewport_center; #line 726 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp24_ = _tmp23_.y; + _tmp22_ = _tmp21_.y; #line 726 "/home/jens/Source/shotwell/src/Dimensions.vala" - if (_tmp21_ != _tmp24_) { + if (_tmp19_ != _tmp22_) { #line 727 "/home/jens/Source/shotwell/src/Dimensions.vala" result = FALSE; #line 727 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4362 "Dimensions.c" +#line 4252 "Dimensions.c" } #line 729 "/home/jens/Source/shotwell/src/Dimensions.vala" result = TRUE; #line 729 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4368 "Dimensions.c" +#line 4258 "Dimensions.c" } -ZoomState* zoom_state_dup (const ZoomState* self) { +ZoomState* +zoom_state_dup (const ZoomState* self) +{ ZoomState* dup; #line 463 "/home/jens/Source/shotwell/src/Dimensions.vala" dup = g_new0 (ZoomState, 1); @@ -4385,18 +4277,22 @@ ZoomState* zoom_state_dup (const ZoomState* self) { memcpy (dup, self, sizeof (ZoomState)); #line 463 "/home/jens/Source/shotwell/src/Dimensions.vala" return dup; -#line 4380 "Dimensions.c" +#line 4272 "Dimensions.c" } -void zoom_state_free (ZoomState* self) { +void +zoom_state_free (ZoomState* self) +{ #line 463 "/home/jens/Source/shotwell/src/Dimensions.vala" g_free (self); -#line 4387 "Dimensions.c" +#line 4281 "Dimensions.c" } -GType zoom_state_get_type (void) { +GType +zoom_state_get_type (void) +{ static volatile gsize zoom_state_type_id__volatile = 0; if (g_once_init_enter (&zoom_state_type_id__volatile)) { GType zoom_state_type_id; diff --git a/src/DirectoryMonitor.c b/src/DirectoryMonitor.c index ea74e69..05b8eee 100644 --- a/src/DirectoryMonitor.c +++ b/src/DirectoryMonitor.c @@ -1,4 +1,4 @@ -/* DirectoryMonitor.c generated by valac 0.36.6, the Vala compiler +/* DirectoryMonitor.c generated by valac 0.40.4, the Vala compiler * generated from DirectoryMonitor.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -59,6 +59,7 @@ /* the root directory) and to not monitor (in which case only discovery occurs).*/ /**/ + #include #include #include @@ -99,6 +100,11 @@ typedef struct _DirectoryMonitorQueryInfoQueueElementClass DirectoryMonitorQuery typedef struct _DirectoryMonitorFileInfoMap DirectoryMonitorFileInfoMap; typedef struct _DirectoryMonitorFileInfoMapClass DirectoryMonitorFileInfoMapClass; +enum { + DIRECTORY_MONITOR_0_PROPERTY, + DIRECTORY_MONITOR_NUM_PROPERTIES +}; +static GParamSpec* directory_monitor_properties[DIRECTORY_MONITOR_NUM_PROPERTIES]; #define DIRECTORY_MONITOR_TYPE_FTYPE (directory_monitor_ftype_get_type ()) #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) @@ -136,9 +142,9 @@ enum { DIRECTORY_MONITOR_DIRECTORY_ATTRIBUTES_ALTERED_SIGNAL, DIRECTORY_MONITOR_DIRECTORY_DELETED_SIGNAL, DIRECTORY_MONITOR_CLOSED_SIGNAL, - DIRECTORY_MONITOR_LAST_SIGNAL + DIRECTORY_MONITOR_NUM_SIGNALS }; -static guint directory_monitor_signals[DIRECTORY_MONITOR_LAST_SIGNAL] = {0}; +static guint directory_monitor_signals[DIRECTORY_MONITOR_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -235,88 +241,73 @@ struct _DirectoryMonitorAsyncInternalNotifyDirectoryMovedData { GeeArrayList* _tmp1_; gint count; DirectoryMonitorFileInfoMap* _tmp2_; - GFile* _tmp3_; + GeeArrayList* _tmp3_; GeeArrayList* _tmp4_; - GeeArrayList* _tmp5_; - gint _tmp6_; - gint _tmp7_; + gint _tmp5_; GeeArrayList* _dir_child_list; - GeeArrayList* _tmp8_; - GeeArrayList* _tmp9_; + GeeArrayList* _tmp6_; + GeeArrayList* _tmp7_; gint _dir_child_size; - GeeArrayList* _tmp10_; + GeeArrayList* _tmp8_; + gint _tmp9_; + gint _tmp10_; + gint _dir_child_index; gint _tmp11_; gint _tmp12_; - gint _dir_child_index; gint _tmp13_; - gint _tmp14_; - gint _tmp15_; GFile* dir_child; - GeeArrayList* _tmp16_; - gint _tmp17_; - gpointer _tmp18_; + GeeArrayList* _tmp14_; + gint _tmp15_; + gpointer _tmp16_; GFileInfo* dir_info; - DirectoryMonitorFileInfoMap* _tmp19_; - GFile* _tmp20_; - GFileInfo* _tmp21_; - GFileInfo* _tmp22_; - GFile* _tmp23_; - gchar* _tmp24_; - gchar* _tmp25_; + DirectoryMonitorFileInfoMap* _tmp17_; + GFile* _tmp18_; + GFileInfo* _tmp19_; + GFileInfo* _tmp20_; + GFile* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + GFile* _tmp24_; + GFileInfo* _tmp25_; GFile* _tmp26_; - GFileInfo* _tmp27_; - GFile* _tmp28_; + gchar* _tmp27_; + gchar* _tmp28_; GFile* _tmp29_; - gchar* _tmp30_; - gchar* _tmp31_; - GFile* _tmp32_; - GFile* _tmp33_; - GFileInfo* _tmp34_; + GFile* _tmp30_; + GFileInfo* _tmp31_; GeeArrayList* _file_child_list; - GeeArrayList* _tmp35_; - GeeArrayList* _tmp36_; + GeeArrayList* _tmp32_; + GeeArrayList* _tmp33_; gint _file_child_size; - GeeArrayList* _tmp37_; + GeeArrayList* _tmp34_; + gint _tmp35_; + gint _tmp36_; + gint _file_child_index; + gint _tmp37_; gint _tmp38_; gint _tmp39_; - gint _file_child_index; - gint _tmp40_; - gint _tmp41_; - gint _tmp42_; GFile* file_child; - GeeArrayList* _tmp43_; - gint _tmp44_; - gpointer _tmp45_; + GeeArrayList* _tmp40_; + gint _tmp41_; + gpointer _tmp42_; GFileInfo* file_info; - DirectoryMonitorFileInfoMap* _tmp46_; + DirectoryMonitorFileInfoMap* _tmp43_; + GFile* _tmp44_; + GFileInfo* _tmp45_; + GFileInfo* _tmp46_; GFile* _tmp47_; - GFileInfo* _tmp48_; - GFileInfo* _tmp49_; + gchar* _tmp48_; + gchar* _tmp49_; GFile* _tmp50_; - gchar* _tmp51_; + GFile* _tmp51_; gchar* _tmp52_; - GFile* _tmp53_; + gchar* _tmp53_; GFile* _tmp54_; GFile* _tmp55_; - gchar* _tmp56_; - gchar* _tmp57_; - GFile* _tmp58_; - GFile* _tmp59_; - GFileInfo* _tmp60_; - DirectoryMonitorFileInfoMap* _tmp61_; - GFile* _tmp62_; + GFileInfo* _tmp56_; + DirectoryMonitorFileInfoMap* _tmp57_; gboolean updated; - DirectoryMonitorFileInfoMap* _tmp63_; - GFile* _tmp64_; - GFileInfo* _tmp65_; - gboolean _tmp66_; - GFile* _tmp67_; - GFileInfo* _tmp68_; - GFile* _tmp69_; - GFileInfo* _tmp70_; - GFile* _tmp71_; - GFile* _tmp72_; - GFileInfo* _tmp73_; + DirectoryMonitorFileInfoMap* _tmp58_; }; struct _DirectoryMonitorAsyncNotifyDirectoryDeletedData { @@ -335,49 +326,44 @@ struct _DirectoryMonitorAsyncNotifyDirectoryDeletedData { GeeArrayList* _tmp1_; gint count; DirectoryMonitorFileInfoMap* _tmp2_; - GFile* _tmp3_; + GeeArrayList* _tmp3_; GeeArrayList* _tmp4_; - GeeArrayList* _tmp5_; - gint _tmp6_; - gint _tmp7_; + gint _tmp5_; GeeArrayList* _dir_child_list; - GeeArrayList* _tmp8_; - GeeArrayList* _tmp9_; + GeeArrayList* _tmp6_; + GeeArrayList* _tmp7_; gint _dir_child_size; - GeeArrayList* _tmp10_; + GeeArrayList* _tmp8_; + gint _tmp9_; + gint _tmp10_; + gint _dir_child_index; gint _tmp11_; gint _tmp12_; - gint _dir_child_index; gint _tmp13_; - gint _tmp14_; - gint _tmp15_; GFile* dir_child; - GeeArrayList* _tmp16_; - gint _tmp17_; - gpointer _tmp18_; - GFile* _tmp19_; + GeeArrayList* _tmp14_; + gint _tmp15_; + gpointer _tmp16_; + GFile* _tmp17_; GeeArrayList* _file_child_list; - GeeArrayList* _tmp20_; - GeeArrayList* _tmp21_; + GeeArrayList* _tmp18_; + GeeArrayList* _tmp19_; gint _file_child_size; - GeeArrayList* _tmp22_; + GeeArrayList* _tmp20_; + gint _tmp21_; + gint _tmp22_; + gint _file_child_index; gint _tmp23_; gint _tmp24_; - gint _file_child_index; gint _tmp25_; - gint _tmp26_; - gint _tmp27_; GFile* file_child; - GeeArrayList* _tmp28_; - gint _tmp29_; - gpointer _tmp30_; - DirectoryMonitorFileInfoMap* _tmp31_; - GFile* _tmp32_; - GFile* _tmp33_; - gboolean _tmp34_; - DirectoryMonitorFileInfoMap* _tmp35_; - GFile* _tmp36_; - GFile* _tmp37_; + GeeArrayList* _tmp26_; + gint _tmp27_; + gpointer _tmp28_; + DirectoryMonitorFileInfoMap* _tmp29_; + GFile* _tmp30_; + GFile* _tmp31_; + DirectoryMonitorFileInfoMap* _tmp32_; }; struct _DirectoryMonitorExploreAsyncData { @@ -392,157 +378,121 @@ struct _DirectoryMonitorExploreAsyncData { GFileInfo* dir_info; gboolean in_discovery; DirectoryMonitorFileInfoMap* _tmp0_; - GFile* _tmp1_; - GFileInfo* _tmp2_; - gboolean _tmp3_; - GFile* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - gboolean _tmp7_; + gchar* _tmp1_; + gchar* _tmp2_; GFileInfo* local_dir_info; + GFileInfo* _tmp3_; + GFileInfo* _tmp4_; + GFileInfo* _tmp5_; + GCancellable* _tmp6_; + GFileInfo* _tmp7_; GFileInfo* _tmp8_; - GFileInfo* _tmp9_; - GFileInfo* _tmp10_; - GFileInfo* _tmp11_; - GFile* _tmp12_; - GCancellable* _tmp13_; - GFileInfo* _tmp14_; - GFileInfo* _tmp15_; GError* err; - GFile* _tmp16_; + gchar* _tmp9_; + gchar* _tmp10_; + GError* _tmp11_; + const gchar* _tmp12_; + GFileInfo* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + GFileInfo* _tmp16_; gchar* _tmp17_; gchar* _tmp18_; - GError* _tmp19_; - const gchar* _tmp20_; - gboolean _tmp21_; - GFileInfo* _tmp22_; - gboolean _tmp23_; - GFile* _tmp24_; + gboolean _tmp19_; + GFileInfo* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + GFileInfo* _tmp23_; + gchar* _tmp24_; gchar* _tmp25_; - gchar* _tmp26_; - gboolean _tmp27_; - GFileInfo* _tmp28_; + GFileInfo* _tmp26_; + GEnumValue* _tmp27_; + gchar* _tmp28_; gchar* _tmp29_; - gchar* _tmp30_; - gboolean _tmp31_; - GFileInfo* _tmp32_; - GFile* _tmp33_; - gchar* _tmp34_; - gchar* _tmp35_; - GFileInfo* _tmp36_; - GFileType _tmp37_; - GFile* _tmp38_; - gchar* _tmp39_; - gchar* _tmp40_; - GFileInfo* _tmp41_; - GFileType _tmp42_; - GEnumValue* _tmp43_; - gchar* _tmp44_; - gchar* _tmp45_; - gboolean _tmp46_; GeeHashMap* dir_map; GeeHashMap* file_map; GFileEnumerator* enumerator; - GFile* _tmp47_; - GCancellable* _tmp48_; - GFileEnumerator* _tmp49_; - gboolean _tmp50_; + GCancellable* _tmp30_; + GFileEnumerator* _tmp31_; + gboolean _tmp32_; GList* infos; - GFileEnumerator* _tmp51_; - GCancellable* _tmp52_; - GList* _tmp53_; - GList* _tmp54_; - GList* _tmp55_; + GFileEnumerator* _tmp33_; + GCancellable* _tmp34_; + GList* _tmp35_; + GList* _tmp36_; + GList* _tmp37_; GList* info_collection; GList* info_it; - GFileInfo* _tmp56_; + GFileInfo* _tmp38_; GFileInfo* info; - GFileInfo* _tmp57_; - gchar* _tmp58_; - gchar* _tmp59_; - gboolean _tmp60_; - GFileInfo* _tmp61_; - GFile* _tmp62_; - gchar* _tmp63_; - gchar* _tmp64_; - GFileInfo* _tmp65_; - gboolean _tmp66_; - GFile* _tmp67_; - GFileInfo* _tmp68_; - const gchar* _tmp69_; - GFile* _tmp70_; - GFile* _tmp71_; + GFileInfo* _tmp39_; + gchar* _tmp40_; + gchar* _tmp41_; + gboolean _tmp42_; + GFileInfo* _tmp43_; + gchar* _tmp44_; + gchar* _tmp45_; + GFileInfo* _tmp46_; + GFileInfo* _tmp47_; + const gchar* _tmp48_; + GFile* _tmp49_; + GFile* _tmp50_; + gchar* _tmp51_; + gchar* _tmp52_; + GFileInfo* _tmp53_; + GFileInfo* _tmp54_; + GeeHashMap* _tmp55_; + GeeHashMap* _tmp56_; + GeeHashMap* _tmp57_; + GFileInfo* _tmp58_; + const gchar* _tmp59_; + GFile* _tmp60_; + GFile* _tmp61_; + GFileInfo* _tmp62_; + GeeHashMap* _tmp63_; + GeeHashMap* _tmp64_; + GeeHashMap* _tmp65_; + GFileInfo* _tmp66_; + const gchar* _tmp67_; + GFile* _tmp68_; + GFile* _tmp69_; + GFileInfo* _tmp70_; + GError* err2; + gchar* _tmp71_; gchar* _tmp72_; - gchar* _tmp73_; - GFileInfo* _tmp74_; - gboolean _tmp75_; + GError* _tmp73_; + const gchar* _tmp74_; + GFileInfo* _tmp75_; GFileInfo* _tmp76_; - GFileType _tmp77_; + GFileInfo* _tmp77_; GeeHashMap* _tmp78_; GeeHashMap* _tmp79_; - GeeHashMap* _tmp80_; - GFile* _tmp81_; - GFileInfo* _tmp82_; - const gchar* _tmp83_; - GFile* _tmp84_; - GFile* _tmp85_; - GFileInfo* _tmp86_; - GeeHashMap* _tmp87_; - GeeHashMap* _tmp88_; - GeeHashMap* _tmp89_; - GFile* _tmp90_; - GFileInfo* _tmp91_; - const gchar* _tmp92_; - GFile* _tmp93_; - GFile* _tmp94_; - GFileInfo* _tmp95_; - GError* err2; - GFile* _tmp96_; - gchar* _tmp97_; - gchar* _tmp98_; - GError* _tmp99_; - const gchar* _tmp100_; - gboolean _tmp101_; - gboolean _tmp102_; - GFile* _tmp103_; - GFileInfo* _tmp104_; - GFile* _tmp105_; - GFileInfo* _tmp106_; - GFile* _tmp107_; - GFileInfo* _tmp108_; - GeeHashMap* _tmp109_; - GeeHashMap* _tmp110_; - gboolean _tmp111_; - gboolean _tmp112_; - gboolean _tmp113_; - GeeHashMap* _tmp114_; + gboolean _tmp80_; + gboolean _tmp81_; + GeeHashMap* _tmp82_; GeeIterator* _subdir_it; - GeeHashMap* _tmp115_; - GeeSet* _tmp116_; - GeeSet* _tmp117_; - GeeSet* _tmp118_; - GeeIterator* _tmp119_; - GeeIterator* _tmp120_; - GeeIterator* _tmp121_; - gboolean _tmp122_; + GeeHashMap* _tmp83_; + GeeSet* _tmp84_; + GeeSet* _tmp85_; + GeeSet* _tmp86_; + GeeIterator* _tmp87_; + GeeIterator* _tmp88_; + GeeIterator* _tmp89_; GFile* subdir; - GeeIterator* _tmp123_; - gpointer _tmp124_; - gint _tmp125_; - gint _tmp126_; - GFile* _tmp127_; - GeeHashMap* _tmp128_; - GFile* _tmp129_; - gpointer _tmp130_; - GFileInfo* _tmp131_; - gboolean _tmp132_; - GFile* _tmp133_; - GeeHashMap* _tmp134_; - GFile* _tmp135_; - gpointer _tmp136_; - GFileInfo* _tmp137_; - gboolean _tmp138_; - gboolean _tmp139_; + GeeIterator* _tmp90_; + gpointer _tmp91_; + gint _tmp92_; + gint _tmp93_; + GFile* _tmp94_; + GeeHashMap* _tmp95_; + GFile* _tmp96_; + gpointer _tmp97_; + GFileInfo* _tmp98_; + GFile* _tmp99_; + GeeHashMap* _tmp100_; + GFile* _tmp101_; + gpointer _tmp102_; + GFileInfo* _tmp103_; GError * _inner_error_; }; @@ -557,23 +507,20 @@ struct _DirectoryMonitorNotifyDirectoryFilesData { GeeMap* map; gboolean in_discovery; GeeMapIterator* iter; - GeeMap* _tmp0_; + GeeMapIterator* _tmp0_; GeeMapIterator* _tmp1_; GeeMapIterator* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; + gpointer _tmp3_; + GFile* _tmp4_; GeeMapIterator* _tmp5_; gpointer _tmp6_; - GFile* _tmp7_; + GFileInfo* _tmp7_; GeeMapIterator* _tmp8_; gpointer _tmp9_; - GFileInfo* _tmp10_; + GFile* _tmp10_; GeeMapIterator* _tmp11_; gpointer _tmp12_; - GFile* _tmp13_; - GeeMapIterator* _tmp14_; - gpointer _tmp15_; - GFileInfo* _tmp16_; + GFileInfo* _tmp13_; }; struct _DirectoryMonitorQueryInfoQueueElement { @@ -630,22 +577,31 @@ static gpointer directory_monitor_file_info_map_parent_class = NULL; GType directory_monitor_get_type (void) G_GNUC_CONST; static gpointer directory_monitor_query_info_queue_element_ref (gpointer instance); static void directory_monitor_query_info_queue_element_unref (gpointer instance); -static GParamSpec* directory_monitor_param_spec_query_info_queue_element (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; -static void directory_monitor_value_set_query_info_queue_element (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void directory_monitor_value_take_query_info_queue_element (GValue* value, gpointer v_object) G_GNUC_UNUSED; +static GParamSpec* directory_monitor_param_spec_query_info_queue_element (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) G_GNUC_UNUSED; +static void directory_monitor_value_set_query_info_queue_element (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void directory_monitor_value_take_query_info_queue_element (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer directory_monitor_value_get_query_info_queue_element (const GValue* value) G_GNUC_UNUSED; static GType directory_monitor_query_info_queue_element_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static gpointer directory_monitor_file_info_map_ref (gpointer instance); static void directory_monitor_file_info_map_unref (gpointer instance); -static GParamSpec* directory_monitor_param_spec_file_info_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; -static void directory_monitor_value_set_file_info_map (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void directory_monitor_value_take_file_info_map (GValue* value, gpointer v_object) G_GNUC_UNUSED; +static GParamSpec* directory_monitor_param_spec_file_info_map (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) G_GNUC_UNUSED; +static void directory_monitor_value_set_file_info_map (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void directory_monitor_value_take_file_info_map (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer directory_monitor_value_get_file_info_map (const GValue* value) G_GNUC_UNUSED; static GType directory_monitor_file_info_map_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define DIRECTORY_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DIRECTORY_MONITOR, DirectoryMonitorPrivate)) -enum { - DIRECTORY_MONITOR_DUMMY_PROPERTY -}; static GType directory_monitor_ftype_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static DirectoryMonitorFileInfoMap* directory_monitor_file_info_map_new (void); static DirectoryMonitorFileInfoMap* directory_monitor_file_info_map_construct (GType object_type); @@ -660,173 +616,398 @@ static DirectoryMonitorFileInfoMap* directory_monitor_file_info_map_construct (G #define DIRECTORY_MONITOR_FILE_MONITOR_FLAGS G_FILE_MONITOR_SEND_MOVED #define DIRECTORY_MONITOR_DELETED_EXPIRATION_MSEC ((guint) 500) #define DIRECTORY_MONITOR_MAX_EXPLORATION_DIRS 5 -DirectoryMonitor* directory_monitor_new (GFile* root, gboolean recurse, gboolean monitoring); -DirectoryMonitor* directory_monitor_construct (GType object_type, GFile* root, gboolean recurse, gboolean monitoring); +DirectoryMonitor* directory_monitor_new (GFile* root, + gboolean recurse, + gboolean monitoring); +DirectoryMonitor* directory_monitor_construct (GType object_type, + GFile* root, + gboolean recurse, + gboolean monitoring); void directory_monitor_mdbg (const gchar* msg); gboolean directory_monitor_is_recursive (DirectoryMonitor* self); gboolean directory_monitor_is_monitoring (DirectoryMonitor* self); -void directory_monitor_notify_root_deleted (DirectoryMonitor* self, GFile* root); -static void directory_monitor_real_notify_root_deleted (DirectoryMonitor* self, GFile* root); -static void directory_monitor_internal_notify_root_moved (DirectoryMonitor* self, GFile* old_root, GFile* new_root, GFileInfo* new_root_info); -static gboolean directory_monitor_file_info_map_remove (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info); -static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info); -void directory_monitor_notify_root_moved (DirectoryMonitor* self, GFile* old_root, GFile* new_root, GFileInfo* new_root_info); -static void directory_monitor_real_notify_root_moved (DirectoryMonitor* self, GFile* old_root, GFile* new_root, GFileInfo* new_root_info); +void directory_monitor_notify_root_deleted (DirectoryMonitor* self, + GFile* root); +static void directory_monitor_real_notify_root_deleted (DirectoryMonitor* self, + GFile* root); +static void directory_monitor_internal_notify_root_moved (DirectoryMonitor* self, + GFile* old_root, + GFile* new_root, + GFileInfo* new_root_info); +static gboolean directory_monitor_file_info_map_remove (DirectoryMonitorFileInfoMap* self, + GFile* file, + GFileInfo* info); +static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfoMap* self, + GFile* file, + GFileInfo* info); +void directory_monitor_notify_root_moved (DirectoryMonitor* self, + GFile* old_root, + GFile* new_root, + GFileInfo* new_root_info); +static void directory_monitor_real_notify_root_moved (DirectoryMonitor* self, + GFile* old_root, + GFile* new_root, + GFileInfo* new_root_info); void directory_monitor_notify_discovery_started (DirectoryMonitor* self); static void directory_monitor_real_notify_discovery_started (DirectoryMonitor* self); -void directory_monitor_internal_notify_file_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info); -static void directory_monitor_real_internal_notify_file_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info); -void directory_monitor_notify_file_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info); -static void directory_monitor_real_notify_file_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info); -void directory_monitor_internal_notify_directory_discovered (DirectoryMonitor* self, GFile* dir, GFileInfo* info); -static void directory_monitor_real_internal_notify_directory_discovered (DirectoryMonitor* self, GFile* dir, GFileInfo* info); -void directory_monitor_notify_directory_discovered (DirectoryMonitor* self, GFile* dir, GFileInfo* info); -static void directory_monitor_real_notify_directory_discovered (DirectoryMonitor* self, GFile* dir, GFileInfo* info); -void directory_monitor_notify_discovery_failed (DirectoryMonitor* self, const gchar* reason); -static void directory_monitor_real_notify_discovery_failed (DirectoryMonitor* self, const gchar* reason); +void directory_monitor_internal_notify_file_discovered (DirectoryMonitor* self, + GFile* file, + GFileInfo* info); +static void directory_monitor_real_internal_notify_file_discovered (DirectoryMonitor* self, + GFile* file, + GFileInfo* info); +void directory_monitor_notify_file_discovered (DirectoryMonitor* self, + GFile* file, + GFileInfo* info); +static void directory_monitor_real_notify_file_discovered (DirectoryMonitor* self, + GFile* file, + GFileInfo* info); +void directory_monitor_internal_notify_directory_discovered (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info); +static void directory_monitor_real_internal_notify_directory_discovered (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info); +void directory_monitor_notify_directory_discovered (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info); +static void directory_monitor_real_notify_directory_discovered (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info); +void directory_monitor_notify_discovery_failed (DirectoryMonitor* self, + const gchar* reason); +static void directory_monitor_real_notify_discovery_failed (DirectoryMonitor* self, + const gchar* reason); void directory_monitor_notify_discovery_completed (DirectoryMonitor* self); static void directory_monitor_real_notify_discovery_completed (DirectoryMonitor* self); -static void directory_monitor_internal_notify_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info); -static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, GFile* file, GFileInfo* info, GFile* * old_file, GFileInfo* * old_file_info); -static void directory_monitor_internal_notify_file_moved (DirectoryMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info); -void directory_monitor_notify_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info); -static void directory_monitor_real_notify_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info); -void directory_monitor_notify_file_moved (DirectoryMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info); -static void directory_monitor_real_notify_file_moved (DirectoryMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info); -void directory_monitor_notify_file_altered (DirectoryMonitor* self, GFile* file); -static void directory_monitor_real_notify_file_altered (DirectoryMonitor* self, GFile* file); -static void directory_monitor_internal_notify_file_alteration_completed (DirectoryMonitor* self, GFile* file, GFileInfo* info); -void directory_monitor_notify_file_alteration_completed (DirectoryMonitor* self, GFile* file, GFileInfo* info); -static void directory_monitor_real_notify_file_alteration_completed (DirectoryMonitor* self, GFile* file, GFileInfo* info); -void directory_monitor_notify_file_attributes_altered (DirectoryMonitor* self, GFile* file); -static void directory_monitor_real_notify_file_attributes_altered (DirectoryMonitor* self, GFile* file); -static void directory_monitor_internal_notify_file_deleted (DirectoryMonitor* self, GFile* file); -void directory_monitor_notify_file_deleted (DirectoryMonitor* self, GFile* file); -static void directory_monitor_real_notify_file_deleted (DirectoryMonitor* self, GFile* file); -static void directory_monitor_internal_notify_directory_created (DirectoryMonitor* self, GFile* dir, GFileInfo* info); -static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitorFileInfoMap* self, GFile* root, DirectoryMonitorFileInfoMap* descendents); -static void directory_monitor_internal_notify_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFileInfo* old_dir_info, GFile* new_dir, GFileInfo* new_dir_info); -void directory_monitor_notify_directory_created (DirectoryMonitor* self, GFile* dir, GFileInfo* info); -static void directory_monitor_real_notify_directory_created (DirectoryMonitor* self, GFile* dir, GFileInfo* info); -static void directory_monitor_async_internal_notify_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFileInfo* old_dir_info, GFile* new_dir, GFileInfo* new_dir_info, GAsyncReadyCallback _callback_, gpointer _user_data_); -static void directory_monitor_async_internal_notify_directory_moved_finish (DirectoryMonitor* self, GAsyncResult* _res_); +static void directory_monitor_internal_notify_file_created (DirectoryMonitor* self, + GFile* file, + GFileInfo* info); +static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, + GFile* file, + GFileInfo* info, + GFile* * old_file, + GFileInfo* * old_file_info); +static void directory_monitor_internal_notify_file_moved (DirectoryMonitor* self, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info); +void directory_monitor_notify_file_created (DirectoryMonitor* self, + GFile* file, + GFileInfo* info); +static void directory_monitor_real_notify_file_created (DirectoryMonitor* self, + GFile* file, + GFileInfo* info); +void directory_monitor_notify_file_moved (DirectoryMonitor* self, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info); +static void directory_monitor_real_notify_file_moved (DirectoryMonitor* self, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info); +void directory_monitor_notify_file_altered (DirectoryMonitor* self, + GFile* file); +static void directory_monitor_real_notify_file_altered (DirectoryMonitor* self, + GFile* file); +static void directory_monitor_internal_notify_file_alteration_completed (DirectoryMonitor* self, + GFile* file, + GFileInfo* info); +void directory_monitor_notify_file_alteration_completed (DirectoryMonitor* self, + GFile* file, + GFileInfo* info); +static void directory_monitor_real_notify_file_alteration_completed (DirectoryMonitor* self, + GFile* file, + GFileInfo* info); +void directory_monitor_notify_file_attributes_altered (DirectoryMonitor* self, + GFile* file); +static void directory_monitor_real_notify_file_attributes_altered (DirectoryMonitor* self, + GFile* file); +static void directory_monitor_internal_notify_file_deleted (DirectoryMonitor* self, + GFile* file); +void directory_monitor_notify_file_deleted (DirectoryMonitor* self, + GFile* file); +static void directory_monitor_real_notify_file_deleted (DirectoryMonitor* self, + GFile* file); +static void directory_monitor_internal_notify_directory_created (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info); +static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitorFileInfoMap* self, + GFile* root, + DirectoryMonitorFileInfoMap* descendents); +static void directory_monitor_internal_notify_directory_moved (DirectoryMonitor* self, + GFile* old_dir, + GFileInfo* old_dir_info, + GFile* new_dir, + GFileInfo* new_dir_info); +void directory_monitor_notify_directory_created (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info); +static void directory_monitor_real_notify_directory_created (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info); +static void directory_monitor_async_internal_notify_directory_moved (DirectoryMonitor* self, + GFile* old_dir, + GFileInfo* old_dir_info, + GFile* new_dir, + GFileInfo* new_dir_info, + GAsyncReadyCallback _callback_, + gpointer _user_data_); +static void directory_monitor_async_internal_notify_directory_moved_finish (DirectoryMonitor* self, + GAsyncResult* _res_); static void directory_monitor_async_internal_notify_directory_moved_data_free (gpointer _data); -static void directory_monitor_async_internal_notify_directory_moved_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data); +static void directory_monitor_async_internal_notify_directory_moved_async_ready_wrapper (GObject *source_object, + GAsyncResult *res, + void *user_data); static gboolean directory_monitor_async_internal_notify_directory_moved_co (DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _data_); -gboolean file_equal (GFile* a, GFile* b); -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); -static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileInfoMap* self, GFile* root, GeeCollection* files, GeeCollection* dirs); -static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFileInfoMap* self, GFile* file); -static void directory_monitor_async_internal_notify_directory_moved_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); +gboolean file_equal (GFile* a, + GFile* b); +static gboolean _file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); +static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileInfoMap* self, + GFile* root, + GeeCollection* files, + GeeCollection* dirs); +static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFileInfoMap* self, + GFile* file); +static void directory_monitor_async_internal_notify_directory_moved_ready (GObject* source_object, + GAsyncResult* _res_, + gpointer _user_data_); static gboolean _directory_monitor_async_internal_notify_directory_moved_co_gsource_func (gpointer self); -static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile* dir, GFileInfo* info); -static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* dir, GFileInfo* info); -void directory_monitor_notify_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFile* new_dir, GFileInfo* new_dir_info); -static void directory_monitor_real_notify_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFile* new_dir, GFileInfo* new_dir_info); -void directory_monitor_notify_directory_altered (DirectoryMonitor* self, GFile* dir); -static void directory_monitor_real_notify_directory_altered (DirectoryMonitor* self, GFile* dir); -static void directory_monitor_internal_notify_directory_alteration_completed (DirectoryMonitor* self, GFile* dir, GFileInfo* info); -void directory_monitor_notify_directory_alteration_completed (DirectoryMonitor* self, GFile* dir, GFileInfo* info); -static void directory_monitor_real_notify_directory_alteration_completed (DirectoryMonitor* self, GFile* dir, GFileInfo* info); -void directory_monitor_notify_directory_attributes_altered (DirectoryMonitor* self, GFile* dir); -static void directory_monitor_real_notify_directory_attributes_altered (DirectoryMonitor* self, GFile* dir); -static void directory_monitor_internal_notify_directory_deleted (DirectoryMonitor* self, GFile* dir); -static void directory_monitor_async_notify_directory_deleted (DirectoryMonitor* self, GFile* dir, gboolean already_removed, GAsyncReadyCallback _callback_, gpointer _user_data_); -static void directory_monitor_async_notify_directory_deleted_finish (DirectoryMonitor* self, GAsyncResult* _res_); +static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info); +static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info); +void directory_monitor_notify_directory_moved (DirectoryMonitor* self, + GFile* old_dir, + GFile* new_dir, + GFileInfo* new_dir_info); +static void directory_monitor_real_notify_directory_moved (DirectoryMonitor* self, + GFile* old_dir, + GFile* new_dir, + GFileInfo* new_dir_info); +void directory_monitor_notify_directory_altered (DirectoryMonitor* self, + GFile* dir); +static void directory_monitor_real_notify_directory_altered (DirectoryMonitor* self, + GFile* dir); +static void directory_monitor_internal_notify_directory_alteration_completed (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info); +void directory_monitor_notify_directory_alteration_completed (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info); +static void directory_monitor_real_notify_directory_alteration_completed (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info); +void directory_monitor_notify_directory_attributes_altered (DirectoryMonitor* self, + GFile* dir); +static void directory_monitor_real_notify_directory_attributes_altered (DirectoryMonitor* self, + GFile* dir); +static void directory_monitor_internal_notify_directory_deleted (DirectoryMonitor* self, + GFile* dir); +static void directory_monitor_async_notify_directory_deleted (DirectoryMonitor* self, + GFile* dir, + gboolean already_removed, + GAsyncReadyCallback _callback_, + gpointer _user_data_); +static void directory_monitor_async_notify_directory_deleted_finish (DirectoryMonitor* self, + GAsyncResult* _res_); static void directory_monitor_async_notify_directory_deleted_data_free (gpointer _data); -static void directory_monitor_async_notify_directory_deleted_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data); +static void directory_monitor_async_notify_directory_deleted_async_ready_wrapper (GObject *source_object, + GAsyncResult *res, + void *user_data); static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMonitorAsyncNotifyDirectoryDeletedData* _data_); -static void directory_monitor_async_notify_directory_deleted_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); +static void directory_monitor_async_notify_directory_deleted_ready (GObject* source_object, + GAsyncResult* _res_, + gpointer _user_data_); static gboolean _directory_monitor_async_notify_directory_deleted_co_gsource_func (gpointer self); -void directory_monitor_notify_directory_deleted (DirectoryMonitor* self, GFile* dir); -static void directory_monitor_real_notify_directory_deleted (DirectoryMonitor* self, GFile* dir); +void directory_monitor_notify_directory_deleted (DirectoryMonitor* self, + GFile* dir); +static void directory_monitor_real_notify_directory_deleted (DirectoryMonitor* self, + GFile* dir); void directory_monitor_notify_closed (DirectoryMonitor* self); static void directory_monitor_real_notify_closed (DirectoryMonitor* self); GFile* directory_monitor_get_root (DirectoryMonitor* self); -gboolean directory_monitor_is_in_root (DirectoryMonitor* self, GFile* file); +gboolean directory_monitor_is_in_root (DirectoryMonitor* self, + GFile* file); gboolean directory_monitor_has_started (DirectoryMonitor* self); void directory_monitor_start_discovery (DirectoryMonitor* self); -static void directory_monitor_explore_async (DirectoryMonitor* self, GFile* dir, GFileInfo* dir_info, gboolean in_discovery, GAsyncReadyCallback _callback_, gpointer _user_data_); -static void directory_monitor_explore_finish (DirectoryMonitor* self, GAsyncResult* _res_); +static void directory_monitor_explore_async (DirectoryMonitor* self, + GFile* dir, + GFileInfo* dir_info, + gboolean in_discovery, + GAsyncReadyCallback _callback_, + gpointer _user_data_); +static void directory_monitor_explore_finish (DirectoryMonitor* self, + GAsyncResult* _res_); void directory_monitor_close (DirectoryMonitor* self); static void directory_monitor_real_close (DirectoryMonitor* self); -static void directory_monitor_cancel_monitor (DirectoryMonitor* self, GFileMonitor* monitor); +static void directory_monitor_cancel_monitor (DirectoryMonitor* self, + GFileMonitor* monitor); static DirectoryMonitorFType directory_monitor_get_ftype (GFileInfo* info); const gchar* g_file_type_to_string (GFileType self); static void directory_monitor_explore_async_data_free (gpointer _data); -static void directory_monitor_explore_async_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data); +static void directory_monitor_explore_async_async_ready_wrapper (GObject *source_object, + GAsyncResult *res, + void *user_data); static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsyncData* _data_); -static gboolean directory_monitor_file_info_map_contains (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info); -static void directory_monitor_explore_directory_completed (DirectoryMonitor* self, gboolean in_discovery); -static void directory_monitor_explore_async_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); +static gboolean directory_monitor_file_info_map_contains (DirectoryMonitorFileInfoMap* self, + GFile* file, + GFileInfo* info); +static void directory_monitor_explore_directory_completed (DirectoryMonitor* self, + gboolean in_discovery); +static void directory_monitor_explore_async_ready (GObject* source_object, + GAsyncResult* _res_, + gpointer _user_data_); gchar* get_file_info_id (GFileInfo* info); static void _g_object_unref0_ (gpointer var); -static void _g_list_free__g_object_unref0_ (GList* self); +static inline void _g_list_free__g_object_unref0_ (GList* self); gboolean directory_monitor_is_file_symlink_supported (GFileInfo* info); guint file_hash (GFile* file); -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self); -static void directory_monitor_notify_directory_files (DirectoryMonitor* self, GeeMap* map, gboolean in_discovery, GAsyncReadyCallback _callback_, gpointer _user_data_); -static void directory_monitor_notify_directory_files_finish (DirectoryMonitor* self, GAsyncResult* _res_); +static guint _file_hash_gee_hash_data_func (gconstpointer v, + gpointer self); +static void directory_monitor_notify_directory_files (DirectoryMonitor* self, + GeeMap* map, + gboolean in_discovery, + GAsyncReadyCallback _callback_, + gpointer _user_data_); +static void directory_monitor_notify_directory_files_finish (DirectoryMonitor* self, + GAsyncResult* _res_); static void directory_monitor_notify_directory_files_data_free (gpointer _data); -static void directory_monitor_notify_directory_files_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data); +static void directory_monitor_notify_directory_files_async_ready_wrapper (GObject *source_object, + GAsyncResult *res, + void *user_data); static gboolean directory_monitor_notify_directory_files_co (DirectoryMonitorNotifyDirectoryFilesData* _data_); static gboolean _directory_monitor_notify_directory_files_co_gsource_func (gpointer self); -static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info); -static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, GFile* file, GFile* other_file, GFileMonitorEvent event); -static void _directory_monitor_on_monitor_notification_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self); +static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMap* self, + GFile* file, + GFileInfo* info); +static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, + GFile* file, + GFile* other_file, + GFileMonitorEvent event); +static void _directory_monitor_on_monitor_notification_g_file_monitor_changed (GFileMonitor* _sender, + GFile* file, + GFile* other_file, + GFileMonitorEvent event_type, + gpointer self); const gchar* g_file_monitor_event_to_string (GFileMonitorEvent self); -static DirectoryMonitorQueryInfoQueueElement* directory_monitor_query_info_queue_element_new (DirectoryMonitor* owner, GFile* file, GFile* other_file, GFileMonitorEvent event); -static DirectoryMonitorQueryInfoQueueElement* directory_monitor_query_info_queue_element_construct (GType object_type, DirectoryMonitor* owner, GFile* file, GFile* other_file, GFileMonitorEvent event); -static void directory_monitor_query_info_queue_element_on_completed (DirectoryMonitorQueryInfoQueueElement* self, GObject* source, GAsyncResult* aresult); -static void _directory_monitor_query_info_queue_element_on_completed_gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); +static DirectoryMonitorQueryInfoQueueElement* directory_monitor_query_info_queue_element_new (DirectoryMonitor* owner, + GFile* file, + GFile* other_file, + GFileMonitorEvent event); +static DirectoryMonitorQueryInfoQueueElement* directory_monitor_query_info_queue_element_construct (GType object_type, + DirectoryMonitor* owner, + GFile* file, + GFile* other_file, + GFileMonitorEvent event); +static void directory_monitor_query_info_queue_element_on_completed (DirectoryMonitorQueryInfoQueueElement* self, + GObject* source, + GAsyncResult* aresult); +static void _directory_monitor_query_info_queue_element_on_completed_gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMonitor* self); static gboolean _directory_monitor_check_for_expired_delete_events_gsource_func (gpointer self); -static void directory_monitor_process_query_queue (DirectoryMonitor* self, DirectoryMonitorQueryInfoQueueElement* query_info); -static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileInfoMap* self, GFileInfo* match); -static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* self, GFile* file, GFile* other_file, GFileInfo* info, GFileMonitorEvent event); -GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, GFile* file); +static void directory_monitor_process_query_queue (DirectoryMonitor* self, + DirectoryMonitorQueryInfoQueueElement* query_info); +static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileInfoMap* self, + GFileInfo* match); +static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* self, + GFile* file, + GFile* other_file, + GFileInfo* info, + GFileMonitorEvent event); +GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, + GFile* file); gulong now_ms (void); GeeCollection* directory_monitor_get_files (DirectoryMonitor* self); static GeeCollection* directory_monitor_file_info_map_get_all (DirectoryMonitorFileInfoMap* self); -GFileInfo* directory_monitor_query_file_info (DirectoryMonitor* self, GFile* file); -static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFileInfoMap* self, GFile* file, GCancellable* cancellable); -static void directory_monitor_real_root_moved (DirectoryMonitor* self, GFile* old_root, GFile* new_root, GFileInfo* new_root_info); -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void directory_monitor_real_root_deleted (DirectoryMonitor* self, GFile* root); +GFileInfo* directory_monitor_query_file_info (DirectoryMonitor* self, + GFile* file); +static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFileInfoMap* self, + GFile* file, + GCancellable* cancellable); +static void directory_monitor_real_root_moved (DirectoryMonitor* self, + GFile* old_root, + GFile* new_root, + GFileInfo* new_root_info); +static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void directory_monitor_real_root_deleted (DirectoryMonitor* self, + GFile* root); static void directory_monitor_real_discovery_started (DirectoryMonitor* self); -static void directory_monitor_real_file_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info); -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void directory_monitor_real_directory_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info); -static void directory_monitor_real_discovery_failed (DirectoryMonitor* self, const gchar* reason); +static void directory_monitor_real_file_discovered (DirectoryMonitor* self, + GFile* file, + GFileInfo* info); +static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void directory_monitor_real_directory_discovered (DirectoryMonitor* self, + GFile* file, + GFileInfo* info); +static void directory_monitor_real_discovery_failed (DirectoryMonitor* self, + const gchar* reason); static void directory_monitor_real_discovery_completed (DirectoryMonitor* self); -static void directory_monitor_real_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info); -static void directory_monitor_real_file_moved (DirectoryMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info); -static void directory_monitor_real_file_altered (DirectoryMonitor* self, GFile* file); -static void directory_monitor_real_file_alteration_completed (DirectoryMonitor* self, GFile* file, GFileInfo* info); -static void directory_monitor_real_file_attributes_altered (DirectoryMonitor* self, GFile* file); -static void directory_monitor_real_file_deleted (DirectoryMonitor* self, GFile* file); -static void directory_monitor_real_directory_created (DirectoryMonitor* self, GFile* dir, GFileInfo* info); -static void directory_monitor_real_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFile* new_dir, GFileInfo* new_dir_info); -static void directory_monitor_real_directory_altered (DirectoryMonitor* self, GFile* dir); -static void directory_monitor_real_directory_alteration_completed (DirectoryMonitor* self, GFile* dir, GFileInfo* info); -static void directory_monitor_real_directory_attributes_altered (DirectoryMonitor* self, GFile* dir); -static void directory_monitor_real_directory_deleted (DirectoryMonitor* self, GFile* dir); +static void directory_monitor_real_file_created (DirectoryMonitor* self, + GFile* file, + GFileInfo* info); +static void directory_monitor_real_file_moved (DirectoryMonitor* self, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info); +static void directory_monitor_real_file_altered (DirectoryMonitor* self, + GFile* file); +static void directory_monitor_real_file_alteration_completed (DirectoryMonitor* self, + GFile* file, + GFileInfo* info); +static void directory_monitor_real_file_attributes_altered (DirectoryMonitor* self, + GFile* file); +static void directory_monitor_real_file_deleted (DirectoryMonitor* self, + GFile* file); +static void directory_monitor_real_directory_created (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info); +static void directory_monitor_real_directory_moved (DirectoryMonitor* self, + GFile* old_dir, + GFile* new_dir, + GFileInfo* new_dir_info); +static void directory_monitor_real_directory_altered (DirectoryMonitor* self, + GFile* dir); +static void directory_monitor_real_directory_alteration_completed (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info); +static void directory_monitor_real_directory_attributes_altered (DirectoryMonitor* self, + GFile* dir); +static void directory_monitor_real_directory_deleted (DirectoryMonitor* self, + GFile* dir); static void directory_monitor_real_closed (DirectoryMonitor* self); -enum { - DIRECTORY_MONITOR_QUERY_INFO_QUEUE_ELEMENT_DUMMY_PROPERTY -}; static void directory_monitor_query_info_queue_element_finalize (DirectoryMonitorQueryInfoQueueElement * obj); #define DIRECTORY_MONITOR_FILE_INFO_MAP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP, DirectoryMonitorFileInfoMapPrivate)) -enum { - DIRECTORY_MONITOR_FILE_INFO_MAP_DUMMY_PROPERTY -}; -static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info, GFile* * normalized, gchar* * id); -static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfoMap* self, GeeCollection* files); +static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitorFileInfoMap* self, + GFile* file, + GFileInfo* info, + GFile* * normalized, + gchar* * id); +static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfoMap* self, + GeeCollection* files); static void directory_monitor_file_info_map_finalize (DirectoryMonitorFileInfoMap * obj); static void directory_monitor_finalize (GObject * obj); -static GType directory_monitor_ftype_get_type (void) { +static GType +directory_monitor_ftype_get_type (void) +{ static volatile gsize directory_monitor_ftype_type_id__volatile = 0; if (g_once_init_enter (&directory_monitor_ftype_type_id__volatile)) { static const GEnumValue values[] = {{DIRECTORY_MONITOR_FTYPE_FILE, "DIRECTORY_MONITOR_FTYPE_FILE", "file"}, {DIRECTORY_MONITOR_FTYPE_DIRECTORY, "DIRECTORY_MONITOR_FTYPE_DIRECTORY", "directory"}, {DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "DIRECTORY_MONITOR_FTYPE_UNSUPPORTED", "unsupported"}, {0, NULL, NULL}}; @@ -838,60 +1019,66 @@ static GType directory_monitor_ftype_get_type (void) { } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 465 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return self ? g_object_ref (self) : NULL; -#line 845 "DirectoryMonitor.c" +#line 1028 "DirectoryMonitor.c" } -DirectoryMonitor* directory_monitor_construct (GType object_type, GFile* root, gboolean recurse, gboolean monitoring) { +DirectoryMonitor* +directory_monitor_construct (GType object_type, + GFile* root, + gboolean recurse, + gboolean monitoring) +{ DirectoryMonitor * self = NULL; GFile* _tmp0_; - GFile* _tmp1_; - gboolean _tmp2_; - gboolean _tmp3_; #line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE (root), NULL); #line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self = (DirectoryMonitor*) g_object_new (object_type, NULL); #line 465 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = root; -#line 465 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (root); #line 465 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (self->priv->root); #line 465 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - self->priv->root = _tmp1_; + self->priv->root = _tmp0_; #line 466 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = recurse; -#line 466 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - self->priv->recurse = _tmp2_; -#line 467 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = monitoring; + self->priv->recurse = recurse; #line 467 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - self->priv->monitoring = _tmp3_; + self->priv->monitoring = monitoring; #line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return self; -#line 877 "DirectoryMonitor.c" +#line 1056 "DirectoryMonitor.c" } -DirectoryMonitor* directory_monitor_new (GFile* root, gboolean recurse, gboolean monitoring) { +DirectoryMonitor* +directory_monitor_new (GFile* root, + gboolean recurse, + gboolean monitoring) +{ #line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return directory_monitor_construct (TYPE_DIRECTORY_MONITOR, root, recurse, monitoring); -#line 884 "DirectoryMonitor.c" +#line 1067 "DirectoryMonitor.c" } -void directory_monitor_mdbg (const gchar* msg) { +void +directory_monitor_mdbg (const gchar* msg) +{ #line 470 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (msg != NULL); -#line 891 "DirectoryMonitor.c" +#line 1076 "DirectoryMonitor.c" } -gboolean directory_monitor_is_recursive (DirectoryMonitor* self) { +gboolean +directory_monitor_is_recursive (DirectoryMonitor* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 476 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -902,11 +1089,13 @@ gboolean directory_monitor_is_recursive (DirectoryMonitor* self) { result = _tmp0_; #line 477 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 906 "DirectoryMonitor.c" +#line 1093 "DirectoryMonitor.c" } -gboolean directory_monitor_is_monitoring (DirectoryMonitor* self) { +gboolean +directory_monitor_is_monitoring (DirectoryMonitor* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 480 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -917,59 +1106,52 @@ gboolean directory_monitor_is_monitoring (DirectoryMonitor* self) { result = _tmp0_; #line 481 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 921 "DirectoryMonitor.c" +#line 1110 "DirectoryMonitor.c" } -static void directory_monitor_real_notify_root_deleted (DirectoryMonitor* self, GFile* root) { +static void +directory_monitor_real_notify_root_deleted (DirectoryMonitor* self, + GFile* root) +{ GFile* _tmp0_; - GFile* _tmp1_; - gboolean _tmp2_; - GFile* _tmp3_; #line 484 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (root)); #line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->root; #line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = root; -#line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = g_file_equal (_tmp0_, _tmp1_); -#line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp2_, "this.root.equal(root)"); + _vala_assert (g_file_equal (_tmp0_, root), "this.root.equal(root)"); #line 487 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg ("root deleted"); #line 488 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = root; -#line 488 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_ROOT_DELETED_SIGNAL], 0, _tmp3_); -#line 946 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_ROOT_DELETED_SIGNAL], 0, root); +#line 1129 "DirectoryMonitor.c" } -void directory_monitor_notify_root_deleted (DirectoryMonitor* self, GFile* root) { +void +directory_monitor_notify_root_deleted (DirectoryMonitor* self, + GFile* root) +{ #line 484 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 484 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_root_deleted (self, root); -#line 955 "DirectoryMonitor.c" +#line 1141 "DirectoryMonitor.c" } -static void directory_monitor_internal_notify_root_moved (DirectoryMonitor* self, GFile* old_root, GFile* new_root, GFileInfo* new_root_info) { +static void +directory_monitor_internal_notify_root_moved (DirectoryMonitor* self, + GFile* old_root, + GFile* new_root, + GFileInfo* new_root_info) +{ gboolean removed = FALSE; DirectoryMonitorFileInfoMap* _tmp0_; - GFile* _tmp1_; - gboolean _tmp2_; gboolean updated = FALSE; - DirectoryMonitorFileInfoMap* _tmp3_; - GFile* _tmp4_; - GFileInfo* _tmp5_; - gboolean _tmp6_; - GFile* _tmp7_; - GFile* _tmp8_; - GFile* _tmp9_; - GFile* _tmp10_; - GFileInfo* _tmp11_; + DirectoryMonitorFileInfoMap* _tmp1_; + GFile* _tmp2_; #line 491 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 491 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -981,60 +1163,40 @@ static void directory_monitor_internal_notify_root_moved (DirectoryMonitor* self #line 492 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; #line 492 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = old_root; -#line 492 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = directory_monitor_file_info_map_remove (_tmp0_, _tmp1_, NULL); -#line 492 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - removed = _tmp2_; + removed = directory_monitor_file_info_map_remove (_tmp0_, old_root, NULL); #line 493 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (removed, "removed"); #line 495 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = self->priv->files; -#line 495 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = new_root; -#line 495 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = new_root_info; -#line 495 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = directory_monitor_file_info_map_update (_tmp3_, _tmp4_, _tmp5_); + _tmp1_ = self->priv->files; #line 495 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - updated = _tmp6_; + updated = directory_monitor_file_info_map_update (_tmp1_, new_root, new_root_info); #line 496 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (updated, "updated"); #line 498 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = new_root; -#line 498 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = _g_object_ref0 (_tmp7_); + _tmp2_ = _g_object_ref0 (new_root); #line 498 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (self->priv->root); #line 498 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - self->priv->root = _tmp8_; -#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = old_root; -#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = new_root; -#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp11_ = new_root_info; + self->priv->root = _tmp2_; #line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_root_moved (self, _tmp9_, _tmp10_, _tmp11_); -#line 1020 "DirectoryMonitor.c" + directory_monitor_notify_root_moved (self, old_root, new_root, new_root_info); +#line 1184 "DirectoryMonitor.c" } -static void directory_monitor_real_notify_root_moved (DirectoryMonitor* self, GFile* old_root, GFile* new_root, GFileInfo* new_root_info) { +static void +directory_monitor_real_notify_root_moved (DirectoryMonitor* self, + GFile* old_root, + GFile* new_root, + GFileInfo* new_root_info) +{ GFile* _tmp0_; - GFile* _tmp1_; - gboolean _tmp2_; - GFile* _tmp3_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; - GFile* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - gchar* _tmp10_; - GFile* _tmp11_; - GFile* _tmp12_; - GFileInfo* _tmp13_; + gchar* _tmp6_; #line 503 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (old_root)); #line 503 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1044,81 +1206,75 @@ static void directory_monitor_real_notify_root_moved (DirectoryMonitor* self, GF #line 504 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->root; #line 504 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = old_root; -#line 504 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = g_file_equal (_tmp0_, _tmp1_); -#line 504 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp2_, "this.root.equal(old_root)"); -#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = old_root; + _vala_assert (g_file_equal (_tmp0_, old_root), "this.root.equal(old_root)"); #line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = g_file_get_path (_tmp3_); + _tmp1_ = g_file_get_path (old_root); #line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = _tmp4_; -#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = new_root; + _tmp2_ = _tmp1_; #line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = g_file_get_path (_tmp6_); + _tmp3_ = g_file_get_path (new_root); #line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = _tmp7_; + _tmp4_ = _tmp3_; #line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = g_strdup_printf ("root moved: %s -> %s", _tmp5_, _tmp8_); + _tmp5_ = g_strdup_printf ("root moved: %s -> %s", _tmp2_, _tmp4_); #line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = _tmp9_; + _tmp6_ = _tmp5_; #line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp10_); + directory_monitor_mdbg (_tmp6_); #line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp6_); #line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp4_); #line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp5_); -#line 507 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp11_ = old_root; -#line 507 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp12_ = new_root; -#line 507 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp13_ = new_root_info; + _g_free0 (_tmp2_); #line 507 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_ROOT_MOVED_SIGNAL], 0, _tmp11_, _tmp12_, _tmp13_); -#line 1085 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_ROOT_MOVED_SIGNAL], 0, old_root, new_root, new_root_info); +#line 1233 "DirectoryMonitor.c" } -void directory_monitor_notify_root_moved (DirectoryMonitor* self, GFile* old_root, GFile* new_root, GFileInfo* new_root_info) { +void +directory_monitor_notify_root_moved (DirectoryMonitor* self, + GFile* old_root, + GFile* new_root, + GFileInfo* new_root_info) +{ #line 503 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 503 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_root_moved (self, old_root, new_root, new_root_info); -#line 1094 "DirectoryMonitor.c" +#line 1247 "DirectoryMonitor.c" } -static void directory_monitor_real_notify_discovery_started (DirectoryMonitor* self) { +static void +directory_monitor_real_notify_discovery_started (DirectoryMonitor* self) +{ #line 511 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg ("discovery started"); #line 512 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DISCOVERY_STARTED_SIGNAL], 0); -#line 1103 "DirectoryMonitor.c" +#line 1258 "DirectoryMonitor.c" } -void directory_monitor_notify_discovery_started (DirectoryMonitor* self) { +void +directory_monitor_notify_discovery_started (DirectoryMonitor* self) +{ #line 510 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 510 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_discovery_started (self); -#line 1112 "DirectoryMonitor.c" +#line 1269 "DirectoryMonitor.c" } -static void directory_monitor_real_internal_notify_file_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info) { +static void +directory_monitor_real_internal_notify_file_discovered (DirectoryMonitor* self, + GFile* file, + GFileInfo* info) +{ DirectoryMonitorFileInfoMap* _tmp0_; - GFile* _tmp1_; - GFileInfo* _tmp2_; - gboolean _tmp3_; - GFile* _tmp7_; - GFileInfo* _tmp8_; #line 515 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 515 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1126,106 +1282,95 @@ static void directory_monitor_real_internal_notify_file_discovered (DirectoryMon #line 516 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; #line 516 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = file; -#line 516 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = info; -#line 516 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = directory_monitor_file_info_map_update (_tmp0_, _tmp1_, _tmp2_); -#line 516 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_tmp3_) { -#line 1137 "DirectoryMonitor.c" - GFile* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; -#line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = file; + if (!directory_monitor_file_info_map_update (_tmp0_, file, info)) { +#line 1287 "DirectoryMonitor.c" + gchar* _tmp1_; + gchar* _tmp2_; #line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = g_file_get_path (_tmp4_); + _tmp1_ = g_file_get_path (file); #line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = _tmp5_; + _tmp2_ = _tmp1_; #line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_debug ("DirectoryMonitor.vala:517: DirectoryMonitor.internal_notify_file_disco" \ -"vered: %s discovered but not added to file map", _tmp6_); +"vered: %s discovered but not added to file map", _tmp2_); #line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp2_); #line 520 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return; -#line 1153 "DirectoryMonitor.c" +#line 1300 "DirectoryMonitor.c" } #line 523 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = file; -#line 523 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = info; -#line 523 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_file_discovered (self, _tmp7_, _tmp8_); -#line 1161 "DirectoryMonitor.c" + directory_monitor_notify_file_discovered (self, file, info); +#line 1304 "DirectoryMonitor.c" } -void directory_monitor_internal_notify_file_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info) { +void +directory_monitor_internal_notify_file_discovered (DirectoryMonitor* self, + GFile* file, + GFileInfo* info) +{ #line 515 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 515 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->internal_notify_file_discovered (self, file, info); -#line 1170 "DirectoryMonitor.c" +#line 1317 "DirectoryMonitor.c" } -static void directory_monitor_real_notify_file_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info) { - GFile* _tmp0_; +static void +directory_monitor_real_notify_file_discovered (DirectoryMonitor* self, + GFile* file, + GFileInfo* info) +{ + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - GFile* _tmp5_; - GFileInfo* _tmp6_; #line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = file; -#line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = g_file_get_path (_tmp0_); + _tmp0_ = g_file_get_path (file); #line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = g_strdup_printf ("file discovered: %s", _tmp2_); + _tmp2_ = g_strdup_printf ("file discovered: %s", _tmp1_); #line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp4_); + directory_monitor_mdbg (_tmp3_); #line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 528 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = file; -#line 528 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = info; -#line 528 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_DISCOVERED_SIGNAL], 0, _tmp5_, _tmp6_); -#line 1208 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_DISCOVERED_SIGNAL], 0, file, info); +#line 1350 "DirectoryMonitor.c" } -void directory_monitor_notify_file_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info) { +void +directory_monitor_notify_file_discovered (DirectoryMonitor* self, + GFile* file, + GFileInfo* info) +{ #line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_discovered (self, file, info); -#line 1217 "DirectoryMonitor.c" +#line 1363 "DirectoryMonitor.c" } -static void directory_monitor_real_internal_notify_directory_discovered (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { +static void +directory_monitor_real_internal_notify_directory_discovered (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info) +{ gboolean updated = FALSE; DirectoryMonitorFileInfoMap* _tmp0_; - GFile* _tmp1_; - GFileInfo* _tmp2_; - gboolean _tmp3_; - GFile* _tmp4_; - GFileInfo* _tmp5_; #line 531 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); #line 531 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1233,131 +1378,130 @@ static void directory_monitor_real_internal_notify_directory_discovered (Directo #line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; #line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = dir; -#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = info; -#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = directory_monitor_file_info_map_update (_tmp0_, _tmp1_, _tmp2_); -#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - updated = _tmp3_; + updated = directory_monitor_file_info_map_update (_tmp0_, dir, info); #line 533 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (updated, "updated"); #line 535 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = dir; -#line 535 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = info; -#line 535 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_directory_discovered (self, _tmp4_, _tmp5_); -#line 1251 "DirectoryMonitor.c" + directory_monitor_notify_directory_discovered (self, dir, info); +#line 1386 "DirectoryMonitor.c" } -void directory_monitor_internal_notify_directory_discovered (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { +void +directory_monitor_internal_notify_directory_discovered (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info) +{ #line 531 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 531 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->internal_notify_directory_discovered (self, dir, info); -#line 1260 "DirectoryMonitor.c" +#line 1399 "DirectoryMonitor.c" } -static void directory_monitor_real_notify_directory_discovered (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { - GFile* _tmp0_; +static void +directory_monitor_real_notify_directory_discovered (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info) +{ + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - GFile* _tmp5_; - GFileInfo* _tmp6_; #line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); #line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = dir; -#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = g_file_get_path (_tmp0_); + _tmp0_ = g_file_get_path (dir); #line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = g_strdup_printf ("directory discovered: %s", _tmp2_); + _tmp2_ = g_strdup_printf ("directory discovered: %s", _tmp1_); #line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp4_); + directory_monitor_mdbg (_tmp3_); #line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp2_); -#line 540 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = dir; + _g_free0 (_tmp1_); #line 540 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = info; -#line 540 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_DISCOVERED_SIGNAL], 0, _tmp5_, _tmp6_); -#line 1298 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_DISCOVERED_SIGNAL], 0, dir, info); +#line 1432 "DirectoryMonitor.c" } -void directory_monitor_notify_directory_discovered (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { +void +directory_monitor_notify_directory_discovered (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info) +{ #line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_discovered (self, dir, info); -#line 1307 "DirectoryMonitor.c" +#line 1445 "DirectoryMonitor.c" } -static void directory_monitor_real_notify_discovery_failed (DirectoryMonitor* self, const gchar* reason) { - const gchar* _tmp0_; - const gchar* _tmp1_; +static void +directory_monitor_real_notify_discovery_failed (DirectoryMonitor* self, + const gchar* reason) +{ #line 543 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (reason != NULL); #line 544 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = reason; -#line 544 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:544: discovery failed: %s", _tmp0_); + g_warning ("DirectoryMonitor.vala:544: discovery failed: %s", reason); #line 545 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = reason; -#line 545 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DISCOVERY_FAILED_SIGNAL], 0, _tmp1_); -#line 1324 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DISCOVERY_FAILED_SIGNAL], 0, reason); +#line 1459 "DirectoryMonitor.c" } -void directory_monitor_notify_discovery_failed (DirectoryMonitor* self, const gchar* reason) { +void +directory_monitor_notify_discovery_failed (DirectoryMonitor* self, + const gchar* reason) +{ #line 543 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 543 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_discovery_failed (self, reason); -#line 1333 "DirectoryMonitor.c" +#line 1471 "DirectoryMonitor.c" } -static void directory_monitor_real_notify_discovery_completed (DirectoryMonitor* self) { +static void +directory_monitor_real_notify_discovery_completed (DirectoryMonitor* self) +{ #line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DISCOVERY_COMPLETED_SIGNAL], 0); -#line 1340 "DirectoryMonitor.c" +#line 1480 "DirectoryMonitor.c" } -void directory_monitor_notify_discovery_completed (DirectoryMonitor* self) { +void +directory_monitor_notify_discovery_completed (DirectoryMonitor* self) +{ #line 548 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 548 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_discovery_completed (self); -#line 1349 "DirectoryMonitor.c" +#line 1491 "DirectoryMonitor.c" } -static void directory_monitor_internal_notify_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info) { +static void +directory_monitor_internal_notify_file_created (DirectoryMonitor* self, + GFile* file, + GFileInfo* info) +{ GFile* old_file = NULL; GFileInfo* old_file_info = NULL; - GFile* _tmp0_; - GFileInfo* _tmp1_; - GFile* _tmp2_ = NULL; - GFileInfo* _tmp3_ = NULL; - gboolean _tmp4_; + GFile* _tmp0_ = NULL; + GFileInfo* _tmp1_ = NULL; + gboolean _tmp2_; #line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1365,131 +1509,103 @@ static void directory_monitor_internal_notify_file_created (DirectoryMonitor* se #line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = file; -#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = info; -#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = directory_monitor_is_file_create_move (self, _tmp0_, _tmp1_, &_tmp2_, &_tmp3_); + _tmp2_ = directory_monitor_is_file_create_move (self, file, info, &_tmp0_, &_tmp1_); #line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_file); #line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - old_file = _tmp2_; + old_file = _tmp0_; #line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_file_info); #line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - old_file_info = _tmp3_; + old_file_info = _tmp1_; #line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp4_) { -#line 1383 "DirectoryMonitor.c" - GFile* _tmp5_; - GFile* _tmp6_; - GFileInfo* _tmp7_; -#line 556 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = old_file; -#line 556 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = file; + if (_tmp2_) { +#line 1523 "DirectoryMonitor.c" + GFile* _tmp3_; #line 556 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = info; + _tmp3_ = old_file; #line 556 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_internal_notify_file_moved (self, _tmp5_, _tmp6_, _tmp7_); -#line 1395 "DirectoryMonitor.c" + directory_monitor_internal_notify_file_moved (self, _tmp3_, file, info); +#line 1529 "DirectoryMonitor.c" } else { gboolean updated = FALSE; - DirectoryMonitorFileInfoMap* _tmp8_; - GFile* _tmp9_; - GFileInfo* _tmp10_; - gboolean _tmp11_; - gboolean _tmp12_; - GFile* _tmp13_; - GFileInfo* _tmp14_; -#line 558 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = self->priv->files; -#line 558 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = file; -#line 558 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = info; + DirectoryMonitorFileInfoMap* _tmp4_; + gboolean _tmp5_; #line 558 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp11_ = directory_monitor_file_info_map_update (_tmp8_, _tmp9_, _tmp10_); + _tmp4_ = self->priv->files; #line 558 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - updated = _tmp11_; + updated = directory_monitor_file_info_map_update (_tmp4_, file, info); #line 559 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp12_ = updated; + _tmp5_ = updated; #line 559 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp12_, "updated"); -#line 561 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp13_ = file; + _vala_assert (_tmp5_, "updated"); #line 561 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp14_ = info; -#line 561 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_file_created (self, _tmp13_, _tmp14_); -#line 1425 "DirectoryMonitor.c" + directory_monitor_notify_file_created (self, file, info); +#line 1544 "DirectoryMonitor.c" } #line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_file_info); #line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_file); -#line 1431 "DirectoryMonitor.c" +#line 1550 "DirectoryMonitor.c" } -static void directory_monitor_real_notify_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info) { - GFile* _tmp0_; +static void +directory_monitor_real_notify_file_created (DirectoryMonitor* self, + GFile* file, + GFileInfo* info) +{ + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - GFile* _tmp5_; - GFileInfo* _tmp6_; #line 565 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 565 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = file; + _tmp0_ = g_file_get_path (file); #line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = g_file_get_path (_tmp0_); + _tmp1_ = _tmp0_; #line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _tmp1_; + _tmp2_ = g_strdup_printf ("file created: %s", _tmp1_); #line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = g_strdup_printf ("file created: %s", _tmp2_); + _tmp3_ = _tmp2_; #line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = _tmp3_; + directory_monitor_mdbg (_tmp3_); #line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp4_); + _g_free0 (_tmp3_); #line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp4_); -#line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp2_); -#line 567 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = file; + _g_free0 (_tmp1_); #line 567 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = info; -#line 567 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_CREATED_SIGNAL], 0, _tmp5_, _tmp6_); -#line 1469 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_CREATED_SIGNAL], 0, file, info); +#line 1583 "DirectoryMonitor.c" } -void directory_monitor_notify_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info) { +void +directory_monitor_notify_file_created (DirectoryMonitor* self, + GFile* file, + GFileInfo* info) +{ #line 565 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 565 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_created (self, file, info); -#line 1478 "DirectoryMonitor.c" +#line 1596 "DirectoryMonitor.c" } -static void directory_monitor_internal_notify_file_moved (DirectoryMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info) { +static void +directory_monitor_internal_notify_file_moved (DirectoryMonitor* self, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info) +{ DirectoryMonitorFileInfoMap* _tmp0_; - GFile* _tmp1_; gboolean updated = FALSE; - DirectoryMonitorFileInfoMap* _tmp2_; - GFile* _tmp3_; - GFileInfo* _tmp4_; - gboolean _tmp5_; - GFile* _tmp6_; - GFile* _tmp7_; - GFileInfo* _tmp8_; + DirectoryMonitorFileInfoMap* _tmp1_; #line 570 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 570 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1501,45 +1617,31 @@ static void directory_monitor_internal_notify_file_moved (DirectoryMonitor* self #line 573 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; #line 573 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = old_file; -#line 573 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_file_info_map_remove (_tmp0_, _tmp1_, NULL); -#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = self->priv->files; + directory_monitor_file_info_map_remove (_tmp0_, old_file, NULL); #line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = new_file; -#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = new_file_info; -#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = directory_monitor_file_info_map_update (_tmp2_, _tmp3_, _tmp4_); + _tmp1_ = self->priv->files; #line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - updated = _tmp5_; + updated = directory_monitor_file_info_map_update (_tmp1_, new_file, new_file_info); #line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (updated, "updated"); #line 578 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = old_file; -#line 578 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = new_file; -#line 578 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = new_file_info; -#line 578 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_file_moved (self, _tmp6_, _tmp7_, _tmp8_); -#line 1527 "DirectoryMonitor.c" + directory_monitor_notify_file_moved (self, old_file, new_file, new_file_info); +#line 1629 "DirectoryMonitor.c" } -static void directory_monitor_real_notify_file_moved (DirectoryMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info) { - GFile* _tmp0_; +static void +directory_monitor_real_notify_file_moved (DirectoryMonitor* self, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info) +{ + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; - GFile* _tmp3_; + gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - GFile* _tmp8_; - GFile* _tmp9_; - GFileInfo* _tmp10_; #line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (old_file)); #line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1547,100 +1649,94 @@ static void directory_monitor_real_notify_file_moved (DirectoryMonitor* self, GF #line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_file_info)); #line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = old_file; + _tmp0_ = g_file_get_path (old_file); #line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = g_file_get_path (_tmp0_); + _tmp1_ = _tmp0_; #line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _tmp1_; + _tmp2_ = g_file_get_path (new_file); #line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = new_file; + _tmp3_ = _tmp2_; #line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = g_file_get_path (_tmp3_); + _tmp4_ = g_strdup_printf ("file moved: %s -> %s", _tmp1_, _tmp3_); #line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = _tmp4_; #line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = g_strdup_printf ("file moved: %s -> %s", _tmp2_, _tmp5_); -#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = _tmp6_; -#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp7_); -#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp7_); + directory_monitor_mdbg (_tmp5_); #line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp5_); #line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp2_); -#line 583 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = old_file; -#line 583 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = new_file; -#line 583 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = new_file_info; + _g_free0 (_tmp3_); +#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_free0 (_tmp1_); #line 583 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_MOVED_SIGNAL], 0, _tmp8_, _tmp9_, _tmp10_); -#line 1581 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_MOVED_SIGNAL], 0, old_file, new_file, new_file_info); +#line 1673 "DirectoryMonitor.c" } -void directory_monitor_notify_file_moved (DirectoryMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info) { +void +directory_monitor_notify_file_moved (DirectoryMonitor* self, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info) +{ #line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_moved (self, old_file, new_file, new_file_info); -#line 1590 "DirectoryMonitor.c" +#line 1687 "DirectoryMonitor.c" } -static void directory_monitor_real_notify_file_altered (DirectoryMonitor* self, GFile* file) { - GFile* _tmp0_; +static void +directory_monitor_real_notify_file_altered (DirectoryMonitor* self, + GFile* file) +{ + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - GFile* _tmp5_; #line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = file; + _tmp0_ = g_file_get_path (file); #line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = g_file_get_path (_tmp0_); + _tmp1_ = _tmp0_; #line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _tmp1_; + _tmp2_ = g_strdup_printf ("file altered: %s", _tmp1_); #line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = g_strdup_printf ("file altered: %s", _tmp2_); + _tmp3_ = _tmp2_; #line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = _tmp3_; -#line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp4_); + directory_monitor_mdbg (_tmp3_); #line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp2_); -#line 588 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = file; + _g_free0 (_tmp1_); #line 588 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_ALTERED_SIGNAL], 0, _tmp5_); -#line 1623 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_ALTERED_SIGNAL], 0, file); +#line 1717 "DirectoryMonitor.c" } -void directory_monitor_notify_file_altered (DirectoryMonitor* self, GFile* file) { +void +directory_monitor_notify_file_altered (DirectoryMonitor* self, + GFile* file) +{ #line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_altered (self, file); -#line 1632 "DirectoryMonitor.c" +#line 1729 "DirectoryMonitor.c" } -static void directory_monitor_internal_notify_file_alteration_completed (DirectoryMonitor* self, GFile* file, GFileInfo* info) { +static void +directory_monitor_internal_notify_file_alteration_completed (DirectoryMonitor* self, + GFile* file, + GFileInfo* info) +{ gboolean updated = FALSE; DirectoryMonitorFileInfoMap* _tmp0_; - GFile* _tmp1_; - GFileInfo* _tmp2_; - gboolean _tmp3_; - GFile* _tmp4_; - GFileInfo* _tmp5_; #line 591 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 591 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1650,120 +1746,109 @@ static void directory_monitor_internal_notify_file_alteration_completed (Directo #line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; #line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = file; -#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = info; -#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = directory_monitor_file_info_map_update (_tmp0_, _tmp1_, _tmp2_); -#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - updated = _tmp3_; + updated = directory_monitor_file_info_map_update (_tmp0_, file, info); #line 593 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (updated, "updated"); #line 595 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = file; -#line 595 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = info; -#line 595 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_file_alteration_completed (self, _tmp4_, _tmp5_); -#line 1668 "DirectoryMonitor.c" + directory_monitor_notify_file_alteration_completed (self, file, info); +#line 1754 "DirectoryMonitor.c" } -static void directory_monitor_real_notify_file_alteration_completed (DirectoryMonitor* self, GFile* file, GFileInfo* info) { - GFile* _tmp0_; +static void +directory_monitor_real_notify_file_alteration_completed (DirectoryMonitor* self, + GFile* file, + GFileInfo* info) +{ + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - GFile* _tmp5_; - GFileInfo* _tmp6_; #line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = file; -#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = g_file_get_path (_tmp0_); + _tmp0_ = g_file_get_path (file); #line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = g_strdup_printf ("file alteration completed: %s", _tmp2_); + _tmp2_ = g_strdup_printf ("file alteration completed: %s", _tmp1_); #line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp4_); + directory_monitor_mdbg (_tmp3_); #line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp2_); -#line 600 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = file; + _g_free0 (_tmp1_); #line 600 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = info; -#line 600 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_ALTERATION_COMPLETED_SIGNAL], 0, _tmp5_, _tmp6_); -#line 1706 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_ALTERATION_COMPLETED_SIGNAL], 0, file, info); +#line 1787 "DirectoryMonitor.c" } -void directory_monitor_notify_file_alteration_completed (DirectoryMonitor* self, GFile* file, GFileInfo* info) { +void +directory_monitor_notify_file_alteration_completed (DirectoryMonitor* self, + GFile* file, + GFileInfo* info) +{ #line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_alteration_completed (self, file, info); -#line 1715 "DirectoryMonitor.c" +#line 1800 "DirectoryMonitor.c" } -static void directory_monitor_real_notify_file_attributes_altered (DirectoryMonitor* self, GFile* file) { - GFile* _tmp0_; +static void +directory_monitor_real_notify_file_attributes_altered (DirectoryMonitor* self, + GFile* file) +{ + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - GFile* _tmp5_; #line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = file; + _tmp0_ = g_file_get_path (file); #line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = g_file_get_path (_tmp0_); -#line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = g_strdup_printf ("file attributes altered: %s", _tmp2_); + _tmp2_ = g_strdup_printf ("file attributes altered: %s", _tmp1_); #line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp4_); + directory_monitor_mdbg (_tmp3_); #line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp2_); -#line 605 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = file; + _g_free0 (_tmp1_); #line 605 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_ATTRIBUTES_ALTERED_SIGNAL], 0, _tmp5_); -#line 1748 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_ATTRIBUTES_ALTERED_SIGNAL], 0, file); +#line 1830 "DirectoryMonitor.c" } -void directory_monitor_notify_file_attributes_altered (DirectoryMonitor* self, GFile* file) { +void +directory_monitor_notify_file_attributes_altered (DirectoryMonitor* self, + GFile* file) +{ #line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_attributes_altered (self, file); -#line 1757 "DirectoryMonitor.c" +#line 1842 "DirectoryMonitor.c" } -static void directory_monitor_internal_notify_file_deleted (DirectoryMonitor* self, GFile* file) { +static void +directory_monitor_internal_notify_file_deleted (DirectoryMonitor* self, + GFile* file) +{ gboolean removed = FALSE; DirectoryMonitorFileInfoMap* _tmp0_; - GFile* _tmp1_; - gboolean _tmp2_; - GFile* _tmp3_; #line 608 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 608 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1771,71 +1856,67 @@ static void directory_monitor_internal_notify_file_deleted (DirectoryMonitor* se #line 609 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; #line 609 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = file; -#line 609 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = directory_monitor_file_info_map_remove (_tmp0_, _tmp1_, NULL); -#line 609 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - removed = _tmp2_; + removed = directory_monitor_file_info_map_remove (_tmp0_, file, NULL); #line 610 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (removed, "removed"); #line 612 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = file; -#line 612 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_file_deleted (self, _tmp3_); -#line 1785 "DirectoryMonitor.c" + directory_monitor_notify_file_deleted (self, file); +#line 1864 "DirectoryMonitor.c" } -static void directory_monitor_real_notify_file_deleted (DirectoryMonitor* self, GFile* file) { - GFile* _tmp0_; +static void +directory_monitor_real_notify_file_deleted (DirectoryMonitor* self, + GFile* file) +{ + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - GFile* _tmp5_; #line 615 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = file; + _tmp0_ = g_file_get_path (file); #line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = g_file_get_path (_tmp0_); + _tmp1_ = _tmp0_; #line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _tmp1_; + _tmp2_ = g_strdup_printf ("file deleted: %s", _tmp1_); #line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = g_strdup_printf ("file deleted: %s", _tmp2_); + _tmp3_ = _tmp2_; #line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = _tmp3_; + directory_monitor_mdbg (_tmp3_); #line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp4_); + _g_free0 (_tmp3_); #line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp4_); -#line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp2_); -#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = file; + _g_free0 (_tmp1_); #line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_DELETED_SIGNAL], 0, _tmp5_); -#line 1818 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_DELETED_SIGNAL], 0, file); +#line 1894 "DirectoryMonitor.c" } -void directory_monitor_notify_file_deleted (DirectoryMonitor* self, GFile* file) { +void +directory_monitor_notify_file_deleted (DirectoryMonitor* self, + GFile* file) +{ #line 615 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 615 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_deleted (self, file); -#line 1827 "DirectoryMonitor.c" +#line 1906 "DirectoryMonitor.c" } -static void directory_monitor_internal_notify_directory_created (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { +static void +directory_monitor_internal_notify_directory_created (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info) +{ GFile* old_dir = NULL; GFileInfo* old_dir_info = NULL; - GFile* _tmp0_; - GFileInfo* _tmp1_; - GFile* _tmp2_ = NULL; - GFileInfo* _tmp3_ = NULL; - gboolean _tmp4_; + GFile* _tmp0_ = NULL; + GFileInfo* _tmp1_ = NULL; + gboolean _tmp2_; #line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1843,139 +1924,115 @@ static void directory_monitor_internal_notify_directory_created (DirectoryMonito #line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = dir; -#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = info; -#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = directory_monitor_is_file_create_move (self, _tmp0_, _tmp1_, &_tmp2_, &_tmp3_); + _tmp2_ = directory_monitor_is_file_create_move (self, dir, info, &_tmp0_, &_tmp1_); #line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_dir); #line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - old_dir = _tmp2_; + old_dir = _tmp0_; #line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_dir_info); #line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - old_dir_info = _tmp3_; + old_dir_info = _tmp1_; #line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp4_) { -#line 1861 "DirectoryMonitor.c" + if (_tmp2_) { +#line 1938 "DirectoryMonitor.c" + DirectoryMonitorFileInfoMap* _tmp3_; + GFile* _tmp4_; DirectoryMonitorFileInfoMap* _tmp5_; GFile* _tmp6_; - DirectoryMonitorFileInfoMap* _tmp7_; - GFile* _tmp8_; - GFileInfo* _tmp9_; - GFile* _tmp10_; - GFileInfo* _tmp11_; + GFileInfo* _tmp7_; #line 629 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = self->priv->files; + _tmp3_ = self->priv->files; #line 629 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = old_dir; + _tmp4_ = old_dir; #line 629 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = self->priv->parent_moved; + _tmp5_ = self->priv->parent_moved; #line 629 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_file_info_map_remove_descendents (_tmp5_, _tmp6_, _tmp7_); -#line 631 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = old_dir; -#line 631 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = old_dir_info; + directory_monitor_file_info_map_remove_descendents (_tmp3_, _tmp4_, _tmp5_); #line 631 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = dir; + _tmp6_ = old_dir; #line 631 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp11_ = info; + _tmp7_ = old_dir_info; #line 631 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_internal_notify_directory_moved (self, _tmp8_, _tmp9_, _tmp10_, _tmp11_); -#line 1887 "DirectoryMonitor.c" + directory_monitor_internal_notify_directory_moved (self, _tmp6_, _tmp7_, dir, info); +#line 1958 "DirectoryMonitor.c" } else { gboolean updated = FALSE; - DirectoryMonitorFileInfoMap* _tmp12_; - GFile* _tmp13_; - GFileInfo* _tmp14_; - gboolean _tmp15_; - gboolean _tmp16_; - GFile* _tmp17_; - GFileInfo* _tmp18_; -#line 633 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp12_ = self->priv->files; -#line 633 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp13_ = dir; -#line 633 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp14_ = info; + DirectoryMonitorFileInfoMap* _tmp8_; + gboolean _tmp9_; #line 633 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp15_ = directory_monitor_file_info_map_update (_tmp12_, _tmp13_, _tmp14_); + _tmp8_ = self->priv->files; #line 633 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - updated = _tmp15_; + updated = directory_monitor_file_info_map_update (_tmp8_, dir, info); #line 634 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp16_ = updated; + _tmp9_ = updated; #line 634 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp16_, "updated"); + _vala_assert (_tmp9_, "updated"); #line 636 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp17_ = dir; -#line 636 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp18_ = info; -#line 636 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_directory_created (self, _tmp17_, _tmp18_); -#line 1917 "DirectoryMonitor.c" + directory_monitor_notify_directory_created (self, dir, info); +#line 1973 "DirectoryMonitor.c" } #line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_dir_info); #line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_dir); -#line 1923 "DirectoryMonitor.c" +#line 1979 "DirectoryMonitor.c" } -static void directory_monitor_real_notify_directory_created (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { - GFile* _tmp0_; +static void +directory_monitor_real_notify_directory_created (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info) +{ + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - GFile* _tmp5_; - GFileInfo* _tmp6_; #line 640 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); #line 640 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = dir; -#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = g_file_get_path (_tmp0_); + _tmp0_ = g_file_get_path (dir); #line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = g_strdup_printf ("directory created: %s", _tmp2_); + _tmp2_ = g_strdup_printf ("directory created: %s", _tmp1_); #line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp4_); + directory_monitor_mdbg (_tmp3_); #line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp2_); -#line 642 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = dir; + _g_free0 (_tmp1_); #line 642 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = info; -#line 642 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_CREATED_SIGNAL], 0, _tmp5_, _tmp6_); -#line 1961 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_CREATED_SIGNAL], 0, dir, info); +#line 2012 "DirectoryMonitor.c" } -void directory_monitor_notify_directory_created (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { +void +directory_monitor_notify_directory_created (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info) +{ #line 640 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 640 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_created (self, dir, info); -#line 1970 "DirectoryMonitor.c" +#line 2025 "DirectoryMonitor.c" } -static void directory_monitor_internal_notify_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFileInfo* old_dir_info, GFile* new_dir, GFileInfo* new_dir_info) { - GFile* _tmp0_; - GFileInfo* _tmp1_; - GFile* _tmp2_; - GFileInfo* _tmp3_; +static void +directory_monitor_internal_notify_directory_moved (DirectoryMonitor* self, + GFile* old_dir, + GFileInfo* old_dir_info, + GFile* new_dir, + GFileInfo* new_dir_info) +{ #line 645 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 645 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1984,23 +2041,17 @@ static void directory_monitor_internal_notify_directory_moved (DirectoryMonitor* g_return_if_fail (G_IS_FILE_INFO (old_dir_info)); #line 645 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (new_dir)); -#line 645 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_return_if_fail (G_IS_FILE_INFO (new_dir_info)); -#line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = old_dir; -#line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = old_dir_info; -#line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = new_dir; -#line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = new_dir_info; +#line 645 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_return_if_fail (G_IS_FILE_INFO (new_dir_info)); #line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_async_internal_notify_directory_moved (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_, NULL, NULL); -#line 1999 "DirectoryMonitor.c" + directory_monitor_async_internal_notify_directory_moved (self, old_dir, old_dir_info, new_dir, new_dir_info, NULL, NULL); +#line 2048 "DirectoryMonitor.c" } -static void directory_monitor_async_internal_notify_directory_moved_data_free (gpointer _data) { +static void +directory_monitor_async_internal_notify_directory_moved_data_free (gpointer _data) +{ DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _data_; _data_ = _data; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2015,11 +2066,15 @@ static void directory_monitor_async_internal_notify_directory_moved_data_free (g _g_object_unref0 (_data_->self); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_slice_free (DirectoryMonitorAsyncInternalNotifyDirectoryMovedData, _data_); -#line 2018 "DirectoryMonitor.c" +#line 2069 "DirectoryMonitor.c" } -static void directory_monitor_async_internal_notify_directory_moved_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) { +static void +directory_monitor_async_internal_notify_directory_moved_async_ready_wrapper (GObject *source_object, + GAsyncResult *res, + void *user_data) +{ DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _task_data_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _task_data_ = g_task_get_task_data (G_TASK (res)); @@ -2027,25 +2082,29 @@ static void directory_monitor_async_internal_notify_directory_moved_async_ready_ if (_task_data_->_callback_ != NULL) { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _task_data_->_callback_ (source_object, res, user_data); -#line 2030 "DirectoryMonitor.c" +#line 2085 "DirectoryMonitor.c" } #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _task_data_->_task_complete_ = TRUE; -#line 2034 "DirectoryMonitor.c" +#line 2089 "DirectoryMonitor.c" } -static void directory_monitor_async_internal_notify_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFileInfo* old_dir_info, GFile* new_dir, GFileInfo* new_dir_info, GAsyncReadyCallback _callback_, gpointer _user_data_) { +static void +directory_monitor_async_internal_notify_directory_moved (DirectoryMonitor* self, + GFile* old_dir, + GFileInfo* old_dir_info, + GFile* new_dir, + GFileInfo* new_dir_info, + GAsyncReadyCallback _callback_, + gpointer _user_data_) +{ DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _data_; DirectoryMonitor* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; - GFileInfo* _tmp3_; + GFileInfo* _tmp2_; + GFile* _tmp3_; GFileInfo* _tmp4_; - GFile* _tmp5_; - GFile* _tmp6_; - GFileInfo* _tmp7_; - GFileInfo* _tmp8_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = g_slice_new0 (DirectoryMonitorAsyncInternalNotifyDirectoryMovedData); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2056,7 +2115,7 @@ static void directory_monitor_async_internal_notify_directory_moved (DirectoryMo if (_callback_ == NULL) { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_task_complete_ = TRUE; -#line 2059 "DirectoryMonitor.c" +#line 2118 "DirectoryMonitor.c" } #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_task_set_task_data (_data_->_async_result, _data_, directory_monitor_async_internal_notify_directory_moved_data_free); @@ -2065,61 +2124,64 @@ static void directory_monitor_async_internal_notify_directory_moved (DirectoryMo #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->self = _tmp0_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = old_dir; -#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (old_dir); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->old_dir); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->old_dir = _tmp2_; -#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = old_dir_info; + _data_->old_dir = _tmp1_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp2_ = _g_object_ref0 (old_dir_info); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->old_dir_info); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->old_dir_info = _tmp4_; + _data_->old_dir_info = _tmp2_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = new_dir; -#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp3_ = _g_object_ref0 (new_dir); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->new_dir); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->new_dir = _tmp6_; -#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = new_dir_info; + _data_->new_dir = _tmp3_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = _g_object_ref0 (_tmp7_); + _tmp4_ = _g_object_ref0 (new_dir_info); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->new_dir_info); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->new_dir_info = _tmp8_; + _data_->new_dir_info = _tmp4_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_internal_notify_directory_moved_co (_data_); -#line 2101 "DirectoryMonitor.c" +#line 2152 "DirectoryMonitor.c" } -static void directory_monitor_async_internal_notify_directory_moved_finish (DirectoryMonitor* self, GAsyncResult* _res_) { +static void +directory_monitor_async_internal_notify_directory_moved_finish (DirectoryMonitor* self, + GAsyncResult* _res_) +{ DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _data_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = g_task_propagate_pointer (G_TASK (_res_), NULL); -#line 2109 "DirectoryMonitor.c" +#line 2163 "DirectoryMonitor.c" } -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = file_equal ((GFile*) a, (GFile*) b); #line 652 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 2118 "DirectoryMonitor.c" +#line 2176 "DirectoryMonitor.c" } -static void directory_monitor_async_internal_notify_directory_moved_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { +static void +directory_monitor_async_internal_notify_directory_moved_ready (GObject* source_object, + GAsyncResult* _res_, + gpointer _user_data_) +{ DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _data_; #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = _user_data_; @@ -2131,38 +2193,42 @@ static void directory_monitor_async_internal_notify_directory_moved_ready (GObje _data_->_task_complete_ = TRUE; #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_internal_notify_directory_moved_co (_data_); -#line 2134 "DirectoryMonitor.c" +#line 2196 "DirectoryMonitor.c" } -static gboolean _directory_monitor_async_internal_notify_directory_moved_co_gsource_func (gpointer self) { +static gboolean +_directory_monitor_async_internal_notify_directory_moved_co_gsource_func (gpointer self) +{ gboolean result; result = directory_monitor_async_internal_notify_directory_moved_co (self); #line 683 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 2143 "DirectoryMonitor.c" +#line 2207 "DirectoryMonitor.c" } -static gboolean directory_monitor_async_internal_notify_directory_moved_co (DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _data_) { +static gboolean +directory_monitor_async_internal_notify_directory_moved_co (DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _data_) +{ #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" switch (_data_->_state_) { #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 0: -#line 2152 "DirectoryMonitor.c" +#line 2218 "DirectoryMonitor.c" goto _state_0; #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 1: -#line 2156 "DirectoryMonitor.c" +#line 2222 "DirectoryMonitor.c" goto _state_1; #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 2: -#line 2160 "DirectoryMonitor.c" +#line 2226 "DirectoryMonitor.c" goto _state_2; default: #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_assert_not_reached (); -#line 2165 "DirectoryMonitor.c" +#line 2231 "DirectoryMonitor.c" } _state_0: #line 652 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2176,286 +2242,256 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire #line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp2_ = _data_->self->priv->files; #line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp3_ = _data_->old_dir; -#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp4_ = _data_->file_children; + _data_->_tmp3_ = _data_->file_children; #line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp5_ = _data_->dir_children; + _data_->_tmp4_ = _data_->dir_children; #line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp6_ = directory_monitor_file_info_map_get_children (_data_->_tmp2_, _data_->_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->count = _data_->_tmp6_; + _data_->count = directory_monitor_file_info_map_get_children (_data_->_tmp2_, _data_->old_dir, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); #line 655 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp7_ = _data_->count; + _data_->_tmp5_ = _data_->count; #line 655 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp7_ > 0) { -#line 2192 "DirectoryMonitor.c" + if (_data_->_tmp5_ > 0) { +#line 2254 "DirectoryMonitor.c" { #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp8_ = _data_->dir_children; + _data_->_tmp6_ = _data_->dir_children; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp9_ = _g_object_ref0 (_data_->_tmp8_); + _data_->_tmp7_ = _g_object_ref0 (_data_->_tmp6_); #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_dir_child_list = _data_->_tmp9_; + _data_->_dir_child_list = _data_->_tmp7_; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp10_ = _data_->_dir_child_list; + _data_->_tmp8_ = _data_->_dir_child_list; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _data_->_tmp9_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp12_ = _data_->_tmp11_; + _data_->_tmp10_ = _data_->_tmp9_; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_dir_child_size = _data_->_tmp12_; + _data_->_dir_child_size = _data_->_tmp10_; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_dir_child_index = -1; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp13_ = _data_->_dir_child_index; + _data_->_tmp11_ = _data_->_dir_child_index; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_dir_child_index = _data_->_tmp13_ + 1; + _data_->_dir_child_index = _data_->_tmp11_ + 1; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp14_ = _data_->_dir_child_index; + _data_->_tmp12_ = _data_->_dir_child_index; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp15_ = _data_->_dir_child_size; + _data_->_tmp13_ = _data_->_dir_child_size; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!(_data_->_tmp14_ < _data_->_tmp15_)) { + if (!(_data_->_tmp12_ < _data_->_tmp13_)) { #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 2224 "DirectoryMonitor.c" +#line 2286 "DirectoryMonitor.c" } #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp16_ = _data_->_dir_child_list; + _data_->_tmp14_ = _data_->_dir_child_list; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp17_ = _data_->_dir_child_index; + _data_->_tmp15_ = _data_->_dir_child_index; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp18_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp17_); + _data_->_tmp16_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp14_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp15_); #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->dir_child = (GFile*) _data_->_tmp18_; + _data_->dir_child = (GFile*) _data_->_tmp16_; #line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp19_ = _data_->self->priv->files; + _data_->_tmp17_ = _data_->self->priv->files; #line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp20_ = _data_->dir_child; + _data_->_tmp18_ = _data_->dir_child; #line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp21_ = directory_monitor_file_info_map_get_info (_data_->_tmp19_, _data_->_tmp20_); + _data_->_tmp19_ = directory_monitor_file_info_map_get_info (_data_->_tmp17_, _data_->_tmp18_); #line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->dir_info = _data_->_tmp21_; + _data_->dir_info = _data_->_tmp19_; #line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp22_ = _data_->dir_info; + _data_->_tmp20_ = _data_->dir_info; #line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp22_ == NULL) { + if (_data_->_tmp20_ == NULL) { #line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp23_ = _data_->dir_child; + _data_->_tmp21_ = _data_->dir_child; #line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp24_ = g_file_get_path (_data_->_tmp23_); + _data_->_tmp22_ = g_file_get_path (_data_->_tmp21_); #line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp25_ = _data_->_tmp24_; + _data_->_tmp23_ = _data_->_tmp22_; #line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_warning ("DirectoryMonitor.vala:662: Unable to retrieve directory-moved info for" \ -" %s", _data_->_tmp25_); +" %s", _data_->_tmp23_); #line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp25_); + _g_free0 (_data_->_tmp23_); #line 664 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_info); #line 664 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_child); #line 664 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 2262 "DirectoryMonitor.c" +#line 2324 "DirectoryMonitor.c" } #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp26_ = _data_->dir_child; -#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp27_ = _data_->dir_info; + _data_->_tmp24_ = _data_->dir_child; #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp28_ = _data_->new_dir; + _data_->_tmp25_ = _data_->dir_info; #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp29_ = _data_->dir_child; + _data_->_tmp26_ = _data_->dir_child; #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp30_ = g_file_get_basename (_data_->_tmp29_); + _data_->_tmp27_ = g_file_get_basename (_data_->_tmp26_); #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp31_ = _data_->_tmp30_; + _data_->_tmp28_ = _data_->_tmp27_; #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp32_ = g_file_get_child (_data_->_tmp28_, _data_->_tmp31_); + _data_->_tmp29_ = g_file_get_child (_data_->new_dir, _data_->_tmp28_); #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp33_ = _data_->_tmp32_; + _data_->_tmp30_ = _data_->_tmp29_; #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp34_ = _data_->dir_info; + _data_->_tmp31_ = _data_->dir_info; #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 1; #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_async_internal_notify_directory_moved (_data_->self, _data_->_tmp26_, _data_->_tmp27_, _data_->_tmp33_, _data_->_tmp34_, directory_monitor_async_internal_notify_directory_moved_ready, _data_); + directory_monitor_async_internal_notify_directory_moved (_data_->self, _data_->_tmp24_, _data_->_tmp25_, _data_->_tmp30_, _data_->_tmp31_, directory_monitor_async_internal_notify_directory_moved_ready, _data_); #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 2288 "DirectoryMonitor.c" +#line 2348 "DirectoryMonitor.c" _state_1: #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_internal_notify_directory_moved_finish (_data_->self, _data_->_res_); #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp33_); + _g_object_unref0 (_data_->_tmp30_); #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp31_); + _g_free0 (_data_->_tmp28_); #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_info); #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_child); -#line 2300 "DirectoryMonitor.c" +#line 2360 "DirectoryMonitor.c" } #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_dir_child_list); -#line 2304 "DirectoryMonitor.c" +#line 2364 "DirectoryMonitor.c" } { #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp35_ = _data_->file_children; + _data_->_tmp32_ = _data_->file_children; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp36_ = _g_object_ref0 (_data_->_tmp35_); + _data_->_tmp33_ = _g_object_ref0 (_data_->_tmp32_); #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_file_child_list = _data_->_tmp36_; + _data_->_file_child_list = _data_->_tmp33_; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp37_ = _data_->_file_child_list; + _data_->_tmp34_ = _data_->_file_child_list; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp38_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _data_->_tmp35_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp39_ = _data_->_tmp38_; + _data_->_tmp36_ = _data_->_tmp35_; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_file_child_size = _data_->_tmp39_; + _data_->_file_child_size = _data_->_tmp36_; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_file_child_index = -1; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp40_ = _data_->_file_child_index; + _data_->_tmp37_ = _data_->_file_child_index; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_file_child_index = _data_->_tmp40_ + 1; + _data_->_file_child_index = _data_->_tmp37_ + 1; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp41_ = _data_->_file_child_index; + _data_->_tmp38_ = _data_->_file_child_index; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp42_ = _data_->_file_child_size; + _data_->_tmp39_ = _data_->_file_child_size; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!(_data_->_tmp41_ < _data_->_tmp42_)) { + if (!(_data_->_tmp38_ < _data_->_tmp39_)) { #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 2337 "DirectoryMonitor.c" +#line 2397 "DirectoryMonitor.c" } #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp43_ = _data_->_file_child_list; + _data_->_tmp40_ = _data_->_file_child_list; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp44_ = _data_->_file_child_index; + _data_->_tmp41_ = _data_->_file_child_index; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp45_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp43_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp44_); + _data_->_tmp42_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp40_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp41_); #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->file_child = (GFile*) _data_->_tmp45_; + _data_->file_child = (GFile*) _data_->_tmp42_; #line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp46_ = _data_->self->priv->files; + _data_->_tmp43_ = _data_->self->priv->files; #line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp47_ = _data_->file_child; + _data_->_tmp44_ = _data_->file_child; #line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp48_ = directory_monitor_file_info_map_get_info (_data_->_tmp46_, _data_->_tmp47_); + _data_->_tmp45_ = directory_monitor_file_info_map_get_info (_data_->_tmp43_, _data_->_tmp44_); #line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->file_info = _data_->_tmp48_; + _data_->file_info = _data_->_tmp45_; #line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp49_ = _data_->file_info; + _data_->_tmp46_ = _data_->file_info; #line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp49_ == NULL) { + if (_data_->_tmp46_ == NULL) { #line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp50_ = _data_->file_child; + _data_->_tmp47_ = _data_->file_child; #line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp51_ = g_file_get_path (_data_->_tmp50_); + _data_->_tmp48_ = g_file_get_path (_data_->_tmp47_); #line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp52_ = _data_->_tmp51_; + _data_->_tmp49_ = _data_->_tmp48_; #line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_warning ("DirectoryMonitor.vala:675: Unable to retrieve directory-moved info for" \ -" %s", _data_->_tmp52_); +" %s", _data_->_tmp49_); #line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp52_); + _g_free0 (_data_->_tmp49_); #line 677 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_info); #line 677 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_child); #line 677 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 2375 "DirectoryMonitor.c" +#line 2435 "DirectoryMonitor.c" } #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp53_ = _data_->file_child; + _data_->_tmp50_ = _data_->file_child; #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp54_ = _data_->new_dir; + _data_->_tmp51_ = _data_->file_child; #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp55_ = _data_->file_child; + _data_->_tmp52_ = g_file_get_basename (_data_->_tmp51_); #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp56_ = g_file_get_basename (_data_->_tmp55_); + _data_->_tmp53_ = _data_->_tmp52_; #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp57_ = _data_->_tmp56_; + _data_->_tmp54_ = g_file_get_child (_data_->new_dir, _data_->_tmp53_); #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp58_ = g_file_get_child (_data_->_tmp54_, _data_->_tmp57_); + _data_->_tmp55_ = _data_->_tmp54_; #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp59_ = _data_->_tmp58_; + _data_->_tmp56_ = _data_->file_info; #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp60_ = _data_->file_info; + directory_monitor_internal_notify_file_moved (_data_->self, _data_->_tmp50_, _data_->_tmp55_, _data_->_tmp56_); #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_internal_notify_file_moved (_data_->self, _data_->_tmp53_, _data_->_tmp59_, _data_->_tmp60_); + _g_object_unref0 (_data_->_tmp55_); #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp59_); -#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp57_); + _g_free0 (_data_->_tmp53_); #line 683 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_idle_add_full (DIRECTORY_MONITOR_DEFAULT_PRIORITY, _directory_monitor_async_internal_notify_directory_moved_co_gsource_func, _data_, NULL); #line 684 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 2; #line 684 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 2405 "DirectoryMonitor.c" +#line 2463 "DirectoryMonitor.c" _state_2: ; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_info); #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_child); -#line 2412 "DirectoryMonitor.c" +#line 2470 "DirectoryMonitor.c" } #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_file_child_list); -#line 2416 "DirectoryMonitor.c" +#line 2474 "DirectoryMonitor.c" } } #line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp61_ = _data_->self->priv->files; -#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp62_ = _data_->old_dir; + _data_->_tmp57_ = _data_->self->priv->files; #line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_file_info_map_remove (_data_->_tmp61_, _data_->_tmp62_, NULL); -#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp63_ = _data_->self->priv->files; -#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp64_ = _data_->new_dir; + directory_monitor_file_info_map_remove (_data_->_tmp57_, _data_->old_dir, NULL); #line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp65_ = _data_->new_dir_info; + _data_->_tmp58_ = _data_->self->priv->files; #line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp66_ = directory_monitor_file_info_map_update (_data_->_tmp63_, _data_->_tmp64_, _data_->_tmp65_); -#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->updated = _data_->_tmp66_; + _data_->updated = directory_monitor_file_info_map_update (_data_->_tmp58_, _data_->new_dir, _data_->new_dir_info); #line 693 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_data_->updated, "updated"); #line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp67_ = _data_->old_dir; -#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp68_ = _data_->old_dir_info; -#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_remove_monitor (_data_->self, _data_->_tmp67_, _data_->_tmp68_); -#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp69_ = _data_->new_dir; + directory_monitor_remove_monitor (_data_->self, _data_->old_dir, _data_->old_dir_info); #line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp70_ = _data_->new_dir_info; -#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_add_monitor (_data_->self, _data_->_tmp69_, _data_->_tmp70_); -#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp71_ = _data_->old_dir; -#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp72_ = _data_->new_dir; -#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp73_ = _data_->new_dir_info; + directory_monitor_add_monitor (_data_->self, _data_->new_dir, _data_->new_dir_info); #line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_directory_moved (_data_->self, _data_->_tmp71_, _data_->_tmp72_, _data_->_tmp73_); + directory_monitor_notify_directory_moved (_data_->self, _data_->old_dir, _data_->new_dir, _data_->new_dir_info); #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_children); #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2468,32 +2504,30 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire while (_data_->_task_complete_ != TRUE) { #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); -#line 2469 "DirectoryMonitor.c" +#line 2505 "DirectoryMonitor.c" } } #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 2476 "DirectoryMonitor.c" +#line 2512 "DirectoryMonitor.c" } -static void directory_monitor_real_notify_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFile* new_dir, GFileInfo* new_dir_info) { - GFile* _tmp0_; +static void +directory_monitor_real_notify_directory_moved (DirectoryMonitor* self, + GFile* old_dir, + GFile* new_dir, + GFileInfo* new_dir_info) +{ + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; - GFile* _tmp3_; + gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - GFile* _tmp8_; - GFile* _tmp9_; - GFileInfo* _tmp10_; - GFile* _tmp11_; - GFile* _tmp12_; - gboolean _tmp13_; + GFile* _tmp6_; #line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (old_dir)); #line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2501,121 +2535,101 @@ static void directory_monitor_real_notify_directory_moved (DirectoryMonitor* sel #line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_dir_info)); #line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = old_dir; + _tmp0_ = g_file_get_path (old_dir); #line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = g_file_get_path (_tmp0_); + _tmp1_ = _tmp0_; #line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _tmp1_; + _tmp2_ = g_file_get_path (new_dir); #line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = new_dir; + _tmp3_ = _tmp2_; #line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = g_file_get_path (_tmp3_); + _tmp4_ = g_strdup_printf ("directory moved: %s -> %s", _tmp1_, _tmp3_); #line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = _tmp4_; #line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = g_strdup_printf ("directory moved: %s -> %s", _tmp2_, _tmp5_); -#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = _tmp6_; -#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp7_); -#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp7_); + directory_monitor_mdbg (_tmp5_); #line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp5_); #line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp2_); -#line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = old_dir; -#line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = new_dir; -#line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = new_dir_info; + _g_free0 (_tmp3_); +#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_free0 (_tmp1_); #line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_MOVED_SIGNAL], 0, _tmp8_, _tmp9_, _tmp10_); + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_MOVED_SIGNAL], 0, old_dir, new_dir, new_dir_info); #line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp11_ = old_dir; + _tmp6_ = self->priv->root; #line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp12_ = self->priv->root; -#line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp13_ = g_file_equal (_tmp11_, _tmp12_); -#line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp13_) { -#line 2541 "DirectoryMonitor.c" - GFile* _tmp14_; - GFile* _tmp15_; - GFileInfo* _tmp16_; -#line 707 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp14_ = old_dir; + if (g_file_equal (old_dir, _tmp6_)) { #line 707 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp15_ = new_dir; -#line 707 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp16_ = new_dir_info; -#line 707 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_internal_notify_root_moved (self, _tmp14_, _tmp15_, _tmp16_); -#line 2553 "DirectoryMonitor.c" + directory_monitor_internal_notify_root_moved (self, old_dir, new_dir, new_dir_info); +#line 2563 "DirectoryMonitor.c" } } -void directory_monitor_notify_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFile* new_dir, GFileInfo* new_dir_info) { +void +directory_monitor_notify_directory_moved (DirectoryMonitor* self, + GFile* old_dir, + GFile* new_dir, + GFileInfo* new_dir_info) +{ #line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_moved (self, old_dir, new_dir, new_dir_info); -#line 2563 "DirectoryMonitor.c" +#line 2578 "DirectoryMonitor.c" } -static void directory_monitor_real_notify_directory_altered (DirectoryMonitor* self, GFile* dir) { - GFile* _tmp0_; +static void +directory_monitor_real_notify_directory_altered (DirectoryMonitor* self, + GFile* dir) +{ + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - GFile* _tmp5_; #line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); #line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = dir; -#line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = g_file_get_path (_tmp0_); + _tmp0_ = g_file_get_path (dir); #line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = g_strdup_printf ("directory altered: %s", _tmp2_); + _tmp2_ = g_strdup_printf ("directory altered: %s", _tmp1_); #line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp4_); + directory_monitor_mdbg (_tmp3_); #line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp2_); -#line 712 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = dir; + _g_free0 (_tmp1_); #line 712 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_ALTERED_SIGNAL], 0, _tmp5_); -#line 2596 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_ALTERED_SIGNAL], 0, dir); +#line 2608 "DirectoryMonitor.c" } -void directory_monitor_notify_directory_altered (DirectoryMonitor* self, GFile* dir) { +void +directory_monitor_notify_directory_altered (DirectoryMonitor* self, + GFile* dir) +{ #line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_altered (self, dir); -#line 2605 "DirectoryMonitor.c" +#line 2620 "DirectoryMonitor.c" } -static void directory_monitor_internal_notify_directory_alteration_completed (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { +static void +directory_monitor_internal_notify_directory_alteration_completed (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info) +{ gboolean updated = FALSE; DirectoryMonitorFileInfoMap* _tmp0_; - GFile* _tmp1_; - GFileInfo* _tmp2_; - gboolean _tmp3_; - GFile* _tmp4_; - GFileInfo* _tmp5_; #line 715 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 715 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2625,121 +2639,110 @@ static void directory_monitor_internal_notify_directory_alteration_completed (Di #line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; #line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = dir; -#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = info; -#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = directory_monitor_file_info_map_update (_tmp0_, _tmp1_, _tmp2_); -#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - updated = _tmp3_; + updated = directory_monitor_file_info_map_update (_tmp0_, dir, info); #line 717 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (updated, "updated"); #line 719 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = dir; -#line 719 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = info; -#line 719 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_directory_alteration_completed (self, _tmp4_, _tmp5_); -#line 2641 "DirectoryMonitor.c" + directory_monitor_notify_directory_alteration_completed (self, dir, info); +#line 2645 "DirectoryMonitor.c" } -static void directory_monitor_real_notify_directory_alteration_completed (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { - GFile* _tmp0_; +static void +directory_monitor_real_notify_directory_alteration_completed (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info) +{ + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - GFile* _tmp5_; - GFileInfo* _tmp6_; #line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); #line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = dir; -#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = g_file_get_path (_tmp0_); + _tmp0_ = g_file_get_path (dir); #line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = g_strdup_printf ("directory alteration completed: %s", _tmp2_); + _tmp2_ = g_strdup_printf ("directory alteration completed: %s", _tmp1_); #line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp4_); + directory_monitor_mdbg (_tmp3_); #line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp2_); -#line 724 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = dir; -#line 724 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = info; + _g_free0 (_tmp1_); #line 724 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_ALTERATION_COMPLETED_SIGNAL], 0, _tmp5_, _tmp6_); -#line 2679 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_ALTERATION_COMPLETED_SIGNAL], 0, dir, info); +#line 2678 "DirectoryMonitor.c" } -void directory_monitor_notify_directory_alteration_completed (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { +void +directory_monitor_notify_directory_alteration_completed (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info) +{ #line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_alteration_completed (self, dir, info); -#line 2688 "DirectoryMonitor.c" +#line 2691 "DirectoryMonitor.c" } -static void directory_monitor_real_notify_directory_attributes_altered (DirectoryMonitor* self, GFile* dir) { - GFile* _tmp0_; +static void +directory_monitor_real_notify_directory_attributes_altered (DirectoryMonitor* self, + GFile* dir) +{ + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - GFile* _tmp5_; #line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); #line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = dir; -#line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = g_file_get_path (_tmp0_); + _tmp0_ = g_file_get_path (dir); #line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = g_strdup_printf ("directory attributes altered: %s", _tmp2_); + _tmp2_ = g_strdup_printf ("directory attributes altered: %s", _tmp1_); #line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp4_); + directory_monitor_mdbg (_tmp3_); #line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp2_); -#line 729 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = dir; + _g_free0 (_tmp1_); #line 729 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_ATTRIBUTES_ALTERED_SIGNAL], 0, _tmp5_); + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_ATTRIBUTES_ALTERED_SIGNAL], 0, dir); #line 2721 "DirectoryMonitor.c" } -void directory_monitor_notify_directory_attributes_altered (DirectoryMonitor* self, GFile* dir) { +void +directory_monitor_notify_directory_attributes_altered (DirectoryMonitor* self, + GFile* dir) +{ #line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_attributes_altered (self, dir); -#line 2730 "DirectoryMonitor.c" +#line 2733 "DirectoryMonitor.c" } -static void directory_monitor_internal_notify_directory_deleted (DirectoryMonitor* self, GFile* dir) { +static void +directory_monitor_internal_notify_directory_deleted (DirectoryMonitor* self, + GFile* dir) +{ GFileInfo* info = NULL; DirectoryMonitorFileInfoMap* _tmp0_; - GFile* _tmp1_; - GFileInfo* _tmp2_; - GFile* _tmp3_; - GFile* _tmp4_; + GFileInfo* _tmp1_; #line 732 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 732 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2747,28 +2750,24 @@ static void directory_monitor_internal_notify_directory_deleted (DirectoryMonito #line 733 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; #line 733 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = dir; -#line 733 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = directory_monitor_file_info_map_get_info (_tmp0_, _tmp1_); + _tmp1_ = directory_monitor_file_info_map_get_info (_tmp0_, dir); #line 733 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - info = _tmp2_; + info = _tmp1_; #line 734 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (info != NULL, "info != null"); #line 737 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = dir; -#line 737 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_remove_monitor (self, _tmp3_, info); + directory_monitor_remove_monitor (self, dir, info); #line 739 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = dir; -#line 739 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_async_notify_directory_deleted (self, _tmp4_, FALSE, NULL, NULL); + directory_monitor_async_notify_directory_deleted (self, dir, FALSE, NULL, NULL); #line 732 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (info); -#line 2765 "DirectoryMonitor.c" +#line 2762 "DirectoryMonitor.c" } -static void directory_monitor_async_notify_directory_deleted_data_free (gpointer _data) { +static void +directory_monitor_async_notify_directory_deleted_data_free (gpointer _data) +{ DirectoryMonitorAsyncNotifyDirectoryDeletedData* _data_; _data_ = _data; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2777,11 +2776,15 @@ static void directory_monitor_async_notify_directory_deleted_data_free (gpointer _g_object_unref0 (_data_->self); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_slice_free (DirectoryMonitorAsyncNotifyDirectoryDeletedData, _data_); -#line 2778 "DirectoryMonitor.c" +#line 2777 "DirectoryMonitor.c" } -static void directory_monitor_async_notify_directory_deleted_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) { +static void +directory_monitor_async_notify_directory_deleted_async_ready_wrapper (GObject *source_object, + GAsyncResult *res, + void *user_data) +{ DirectoryMonitorAsyncNotifyDirectoryDeletedData* _task_data_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _task_data_ = g_task_get_task_data (G_TASK (res)); @@ -2789,20 +2792,24 @@ static void directory_monitor_async_notify_directory_deleted_async_ready_wrapper if (_task_data_->_callback_ != NULL) { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _task_data_->_callback_ (source_object, res, user_data); -#line 2790 "DirectoryMonitor.c" +#line 2793 "DirectoryMonitor.c" } #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _task_data_->_task_complete_ = TRUE; -#line 2794 "DirectoryMonitor.c" +#line 2797 "DirectoryMonitor.c" } -static void directory_monitor_async_notify_directory_deleted (DirectoryMonitor* self, GFile* dir, gboolean already_removed, GAsyncReadyCallback _callback_, gpointer _user_data_) { +static void +directory_monitor_async_notify_directory_deleted (DirectoryMonitor* self, + GFile* dir, + gboolean already_removed, + GAsyncReadyCallback _callback_, + gpointer _user_data_) +{ DirectoryMonitorAsyncNotifyDirectoryDeletedData* _data_; DirectoryMonitor* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; - gboolean _tmp3_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = g_slice_new0 (DirectoryMonitorAsyncNotifyDirectoryDeletedData); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2813,7 +2820,7 @@ static void directory_monitor_async_notify_directory_deleted (DirectoryMonitor* if (_callback_ == NULL) { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_task_complete_ = TRUE; -#line 2814 "DirectoryMonitor.c" +#line 2821 "DirectoryMonitor.c" } #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_task_set_task_data (_data_->_async_result, _data_, directory_monitor_async_notify_directory_deleted_data_free); @@ -2822,32 +2829,35 @@ static void directory_monitor_async_notify_directory_deleted (DirectoryMonitor* #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->self = _tmp0_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = dir; -#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (dir); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->dir = _tmp2_; + _data_->dir = _tmp1_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = already_removed; -#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->already_removed = _tmp3_; + _data_->already_removed = already_removed; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_notify_directory_deleted_co (_data_); -#line 2836 "DirectoryMonitor.c" +#line 2839 "DirectoryMonitor.c" } -static void directory_monitor_async_notify_directory_deleted_finish (DirectoryMonitor* self, GAsyncResult* _res_) { +static void +directory_monitor_async_notify_directory_deleted_finish (DirectoryMonitor* self, + GAsyncResult* _res_) +{ DirectoryMonitorAsyncNotifyDirectoryDeletedData* _data_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = g_task_propagate_pointer (G_TASK (_res_), NULL); -#line 2844 "DirectoryMonitor.c" +#line 2850 "DirectoryMonitor.c" } -static void directory_monitor_async_notify_directory_deleted_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { +static void +directory_monitor_async_notify_directory_deleted_ready (GObject* source_object, + GAsyncResult* _res_, + gpointer _user_data_) +{ DirectoryMonitorAsyncNotifyDirectoryDeletedData* _data_; #line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = _user_data_; @@ -2859,38 +2869,42 @@ static void directory_monitor_async_notify_directory_deleted_ready (GObject* sou _data_->_task_complete_ = TRUE; #line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_notify_directory_deleted_co (_data_); -#line 2860 "DirectoryMonitor.c" +#line 2870 "DirectoryMonitor.c" } -static gboolean _directory_monitor_async_notify_directory_deleted_co_gsource_func (gpointer self) { +static gboolean +_directory_monitor_async_notify_directory_deleted_co_gsource_func (gpointer self) +{ gboolean result; result = directory_monitor_async_notify_directory_deleted_co (self); #line 771 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 2869 "DirectoryMonitor.c" +#line 2881 "DirectoryMonitor.c" } -static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMonitorAsyncNotifyDirectoryDeletedData* _data_) { +static gboolean +directory_monitor_async_notify_directory_deleted_co (DirectoryMonitorAsyncNotifyDirectoryDeletedData* _data_) +{ #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" switch (_data_->_state_) { #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 0: -#line 2878 "DirectoryMonitor.c" +#line 2892 "DirectoryMonitor.c" goto _state_0; #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 1: -#line 2882 "DirectoryMonitor.c" +#line 2896 "DirectoryMonitor.c" goto _state_1; #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 2: -#line 2886 "DirectoryMonitor.c" +#line 2900 "DirectoryMonitor.c" goto _state_2; default: #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_assert_not_reached (); -#line 2891 "DirectoryMonitor.c" +#line 2905 "DirectoryMonitor.c" } _state_0: #line 750 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2904,166 +2918,156 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo #line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp2_ = _data_->self->priv->files; #line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp3_ = _data_->dir; -#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp4_ = _data_->file_children; + _data_->_tmp3_ = _data_->file_children; #line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp5_ = _data_->dir_children; + _data_->_tmp4_ = _data_->dir_children; #line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp6_ = directory_monitor_file_info_map_get_children (_data_->_tmp2_, _data_->_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->count = _data_->_tmp6_; + _data_->count = directory_monitor_file_info_map_get_children (_data_->_tmp2_, _data_->dir, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); #line 753 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp7_ = _data_->count; + _data_->_tmp5_ = _data_->count; #line 753 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp7_ > 0) { -#line 2918 "DirectoryMonitor.c" + if (_data_->_tmp5_ > 0) { +#line 2928 "DirectoryMonitor.c" { #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp8_ = _data_->dir_children; + _data_->_tmp6_ = _data_->dir_children; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp9_ = _g_object_ref0 (_data_->_tmp8_); + _data_->_tmp7_ = _g_object_ref0 (_data_->_tmp6_); #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_dir_child_list = _data_->_tmp9_; + _data_->_dir_child_list = _data_->_tmp7_; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp10_ = _data_->_dir_child_list; + _data_->_tmp8_ = _data_->_dir_child_list; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _data_->_tmp9_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp12_ = _data_->_tmp11_; + _data_->_tmp10_ = _data_->_tmp9_; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_dir_child_size = _data_->_tmp12_; + _data_->_dir_child_size = _data_->_tmp10_; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_dir_child_index = -1; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp13_ = _data_->_dir_child_index; + _data_->_tmp11_ = _data_->_dir_child_index; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_dir_child_index = _data_->_tmp13_ + 1; + _data_->_dir_child_index = _data_->_tmp11_ + 1; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp14_ = _data_->_dir_child_index; + _data_->_tmp12_ = _data_->_dir_child_index; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp15_ = _data_->_dir_child_size; + _data_->_tmp13_ = _data_->_dir_child_size; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!(_data_->_tmp14_ < _data_->_tmp15_)) { + if (!(_data_->_tmp12_ < _data_->_tmp13_)) { #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 2950 "DirectoryMonitor.c" +#line 2960 "DirectoryMonitor.c" } #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp16_ = _data_->_dir_child_list; + _data_->_tmp14_ = _data_->_dir_child_list; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp17_ = _data_->_dir_child_index; + _data_->_tmp15_ = _data_->_dir_child_index; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp18_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp17_); + _data_->_tmp16_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp14_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp15_); #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->dir_child = (GFile*) _data_->_tmp18_; + _data_->dir_child = (GFile*) _data_->_tmp16_; #line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp19_ = _data_->dir_child; + _data_->_tmp17_ = _data_->dir_child; #line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 1; #line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_async_notify_directory_deleted (_data_->self, _data_->_tmp19_, FALSE, directory_monitor_async_notify_directory_deleted_ready, _data_); + directory_monitor_async_notify_directory_deleted (_data_->self, _data_->_tmp17_, FALSE, directory_monitor_async_notify_directory_deleted_ready, _data_); #line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 2968 "DirectoryMonitor.c" +#line 2978 "DirectoryMonitor.c" _state_1: #line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_notify_directory_deleted_finish (_data_->self, _data_->_res_); #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_child); -#line 2974 "DirectoryMonitor.c" +#line 2984 "DirectoryMonitor.c" } #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_dir_child_list); -#line 2978 "DirectoryMonitor.c" +#line 2988 "DirectoryMonitor.c" } { #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp20_ = _data_->file_children; + _data_->_tmp18_ = _data_->file_children; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp21_ = _g_object_ref0 (_data_->_tmp20_); + _data_->_tmp19_ = _g_object_ref0 (_data_->_tmp18_); #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_file_child_list = _data_->_tmp21_; + _data_->_file_child_list = _data_->_tmp19_; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp22_ = _data_->_file_child_list; + _data_->_tmp20_ = _data_->_file_child_list; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp23_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _data_->_tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp24_ = _data_->_tmp23_; + _data_->_tmp22_ = _data_->_tmp21_; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_file_child_size = _data_->_tmp24_; + _data_->_file_child_size = _data_->_tmp22_; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_file_child_index = -1; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp25_ = _data_->_file_child_index; + _data_->_tmp23_ = _data_->_file_child_index; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_file_child_index = _data_->_tmp25_ + 1; + _data_->_file_child_index = _data_->_tmp23_ + 1; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp26_ = _data_->_file_child_index; + _data_->_tmp24_ = _data_->_file_child_index; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp27_ = _data_->_file_child_size; + _data_->_tmp25_ = _data_->_file_child_size; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!(_data_->_tmp26_ < _data_->_tmp27_)) { + if (!(_data_->_tmp24_ < _data_->_tmp25_)) { #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 3011 "DirectoryMonitor.c" +#line 3021 "DirectoryMonitor.c" } #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp28_ = _data_->_file_child_list; + _data_->_tmp26_ = _data_->_file_child_list; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp29_ = _data_->_file_child_index; + _data_->_tmp27_ = _data_->_file_child_index; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp30_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp28_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp29_); + _data_->_tmp28_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp26_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp27_); #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->file_child = (GFile*) _data_->_tmp30_; + _data_->file_child = (GFile*) _data_->_tmp28_; #line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp31_ = _data_->self->priv->files; + _data_->_tmp29_ = _data_->self->priv->files; #line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp32_ = _data_->file_child; + _data_->_tmp30_ = _data_->file_child; #line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_file_info_map_remove (_data_->_tmp31_, _data_->_tmp32_, NULL); + directory_monitor_file_info_map_remove (_data_->_tmp29_, _data_->_tmp30_, NULL); #line 769 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp33_ = _data_->file_child; + _data_->_tmp31_ = _data_->file_child; #line 769 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_file_deleted (_data_->self, _data_->_tmp33_); + directory_monitor_notify_file_deleted (_data_->self, _data_->_tmp31_); #line 771 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_idle_add_full (DIRECTORY_MONITOR_DEFAULT_PRIORITY, _directory_monitor_async_notify_directory_deleted_co_gsource_func, _data_, NULL); #line 772 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 2; #line 772 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3037 "DirectoryMonitor.c" +#line 3047 "DirectoryMonitor.c" _state_2: ; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_child); -#line 3042 "DirectoryMonitor.c" +#line 3052 "DirectoryMonitor.c" } #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_file_child_list); -#line 3046 "DirectoryMonitor.c" +#line 3056 "DirectoryMonitor.c" } } #line 776 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp34_ = _data_->already_removed; -#line 776 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_data_->_tmp34_) { + if (!_data_->already_removed) { #line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp35_ = _data_->self->priv->files; + _data_->_tmp32_ = _data_->self->priv->files; #line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp36_ = _data_->dir; -#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_file_info_map_remove (_data_->_tmp35_, _data_->_tmp36_, NULL); -#line 3059 "DirectoryMonitor.c" + directory_monitor_file_info_map_remove (_data_->_tmp32_, _data_->dir, NULL); +#line 3065 "DirectoryMonitor.c" } #line 779 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp37_ = _data_->dir; -#line 779 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_directory_deleted (_data_->self, _data_->_tmp37_); + directory_monitor_notify_directory_deleted (_data_->self, _data_->dir); #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_children); #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3076,78 +3080,70 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo while (_data_->_task_complete_ != TRUE) { #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); -#line 3077 "DirectoryMonitor.c" +#line 3081 "DirectoryMonitor.c" } } #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3084 "DirectoryMonitor.c" +#line 3088 "DirectoryMonitor.c" } -static void directory_monitor_real_notify_directory_deleted (DirectoryMonitor* self, GFile* dir) { - GFile* _tmp0_; +static void +directory_monitor_real_notify_directory_deleted (DirectoryMonitor* self, + GFile* dir) +{ + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - GFile* _tmp5_; - GFile* _tmp6_; - GFile* _tmp7_; - gboolean _tmp8_; + GFile* _tmp4_; #line 782 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); #line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = dir; -#line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = g_file_get_path (_tmp0_); + _tmp0_ = g_file_get_path (dir); #line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = g_strdup_printf ("directory deleted: %s", _tmp2_); + _tmp2_ = g_strdup_printf ("directory deleted: %s", _tmp1_); #line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp4_); + directory_monitor_mdbg (_tmp3_); #line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 784 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = dir; -#line 784 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_DELETED_SIGNAL], 0, _tmp5_); -#line 786 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = dir; + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_DELETED_SIGNAL], 0, dir); #line 786 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = self->priv->root; + _tmp4_ = self->priv->root; #line 786 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = g_file_equal (_tmp6_, _tmp7_); -#line 786 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp8_) { -#line 3128 "DirectoryMonitor.c" - GFile* _tmp9_; + if (g_file_equal (dir, _tmp4_)) { #line 787 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = dir; -#line 787 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_root_deleted (self, _tmp9_); -#line 3134 "DirectoryMonitor.c" + directory_monitor_notify_root_deleted (self, dir); +#line 3125 "DirectoryMonitor.c" } } -void directory_monitor_notify_directory_deleted (DirectoryMonitor* self, GFile* dir) { +void +directory_monitor_notify_directory_deleted (DirectoryMonitor* self, + GFile* dir) +{ #line 782 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 782 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_deleted (self, dir); -#line 3144 "DirectoryMonitor.c" +#line 3138 "DirectoryMonitor.c" } -static void directory_monitor_real_notify_closed (DirectoryMonitor* self) { +static void +directory_monitor_real_notify_closed (DirectoryMonitor* self) +{ GFile* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; @@ -3171,20 +3167,24 @@ static void directory_monitor_real_notify_closed (DirectoryMonitor* self) { _g_free0 (_tmp2_); #line 792 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_CLOSED_SIGNAL], 0); -#line 3172 "DirectoryMonitor.c" +#line 3168 "DirectoryMonitor.c" } -void directory_monitor_notify_closed (DirectoryMonitor* self) { +void +directory_monitor_notify_closed (DirectoryMonitor* self) +{ #line 790 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 790 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_closed (self); -#line 3181 "DirectoryMonitor.c" +#line 3179 "DirectoryMonitor.c" } -GFile* directory_monitor_get_root (DirectoryMonitor* self) { +GFile* +directory_monitor_get_root (DirectoryMonitor* self) +{ GFile* result = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -3202,30 +3202,29 @@ GFile* directory_monitor_get_root (DirectoryMonitor* self) { } -gboolean directory_monitor_is_in_root (DirectoryMonitor* self, GFile* file) { +gboolean +directory_monitor_is_in_root (DirectoryMonitor* self, + GFile* file) +{ gboolean result = FALSE; GFile* _tmp0_; - GFile* _tmp1_; - gboolean _tmp2_; #line 799 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); #line 799 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 800 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = file; -#line 800 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = self->priv->root; -#line 800 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = g_file_has_prefix (_tmp0_, _tmp1_); + _tmp0_ = self->priv->root; #line 800 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - result = _tmp2_; + result = g_file_has_prefix (file, _tmp0_); #line 800 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 3222 "DirectoryMonitor.c" +#line 3219 "DirectoryMonitor.c" } -gboolean directory_monitor_has_started (DirectoryMonitor* self) { +gboolean +directory_monitor_has_started (DirectoryMonitor* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 803 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3236,11 +3235,13 @@ gboolean directory_monitor_has_started (DirectoryMonitor* self) { result = _tmp0_; #line 804 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 3237 "DirectoryMonitor.c" +#line 3236 "DirectoryMonitor.c" } -void directory_monitor_start_discovery (DirectoryMonitor* self) { +void +directory_monitor_start_discovery (DirectoryMonitor* self) +{ gboolean _tmp0_; GFile* _tmp1_; #line 807 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3261,18 +3262,20 @@ void directory_monitor_start_discovery (DirectoryMonitor* self) { _tmp1_ = self->priv->root; #line 817 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_explore_async (self, _tmp1_, NULL, TRUE, NULL, NULL); -#line 3262 "DirectoryMonitor.c" +#line 3263 "DirectoryMonitor.c" } -static void directory_monitor_real_close (DirectoryMonitor* self) { +static void +directory_monitor_real_close (DirectoryMonitor* self) +{ GCancellable* _tmp0_; - GeeHashMap* _tmp12_; + GeeHashMap* _tmp11_; #line 824 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->cancellable; #line 824 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_cancellable_cancel (_tmp0_); -#line 3273 "DirectoryMonitor.c" +#line 3276 "DirectoryMonitor.c" { GeeIterator* _monitor_it = NULL; GeeHashMap* _tmp1_; @@ -3299,33 +3302,30 @@ static void directory_monitor_real_close (DirectoryMonitor* self) { _monitor_it = _tmp6_; #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 3300 "DirectoryMonitor.c" +#line 3303 "DirectoryMonitor.c" GeeIterator* _tmp7_; - gboolean _tmp8_; GFileMonitor* monitor = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; - GFileMonitor* _tmp11_; + GeeIterator* _tmp8_; + gpointer _tmp9_; + GFileMonitor* _tmp10_; #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = _monitor_it; #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = gee_iterator_next (_tmp7_); -#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp7_)) { #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; #line 3315 "DirectoryMonitor.c" } #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = _monitor_it; + _tmp8_ = _monitor_it; #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp9_ = gee_iterator_get (_tmp8_); #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - monitor = (GFileMonitor*) _tmp10_; + monitor = (GFileMonitor*) _tmp9_; #line 828 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp11_ = monitor; + _tmp10_ = monitor; #line 828 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_cancel_monitor (self, _tmp11_); + directory_monitor_cancel_monitor (self, _tmp10_); #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (monitor); #line 3329 "DirectoryMonitor.c" @@ -3335,91 +3335,91 @@ static void directory_monitor_real_close (DirectoryMonitor* self) { #line 3333 "DirectoryMonitor.c" } #line 830 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp12_ = self->priv->monitors; + _tmp11_ = self->priv->monitors; #line 830 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 832 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_closed (self); #line 3341 "DirectoryMonitor.c" } -void directory_monitor_close (DirectoryMonitor* self) { +void +directory_monitor_close (DirectoryMonitor* self) +{ #line 822 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 822 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->close (self); -#line 3350 "DirectoryMonitor.c" +#line 3352 "DirectoryMonitor.c" } -static DirectoryMonitorFType directory_monitor_get_ftype (GFileInfo* info) { +static DirectoryMonitorFType +directory_monitor_get_ftype (GFileInfo* info) +{ DirectoryMonitorFType result = 0; GFileType file_type = 0; - GFileInfo* _tmp0_; - GFileType _tmp1_; - GFileType _tmp2_; + GFileType _tmp0_; #line 835 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), 0); #line 836 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = info; -#line 836 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = g_file_info_get_file_type (_tmp0_); -#line 836 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - file_type = _tmp1_; + file_type = g_file_info_get_file_type (info); #line 837 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = file_type; + _tmp0_ = file_type; #line 837 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - switch (_tmp2_) { + switch (_tmp0_) { #line 837 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_TYPE_REGULAR: -#line 3374 "DirectoryMonitor.c" +#line 3372 "DirectoryMonitor.c" { #line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = DIRECTORY_MONITOR_FTYPE_FILE; #line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 3380 "DirectoryMonitor.c" +#line 3378 "DirectoryMonitor.c" } #line 837 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_TYPE_DIRECTORY: -#line 3384 "DirectoryMonitor.c" +#line 3382 "DirectoryMonitor.c" { #line 842 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = DIRECTORY_MONITOR_FTYPE_DIRECTORY; #line 842 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 3390 "DirectoryMonitor.c" +#line 3388 "DirectoryMonitor.c" } default: { - GFileType _tmp3_; - GEnumValue* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; + GFileType _tmp1_; + GEnumValue* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = file_type; + _tmp1_ = file_type; #line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = g_enum_get_value (g_type_class_ref (g_file_type_get_type ()), _tmp3_); + _tmp2_ = g_enum_get_value (g_type_class_ref (g_file_type_get_type ()), _tmp1_); #line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = g_strdup_printf ("query_ftype: Unknown file type %s", (_tmp4_ != NULL) ? _tmp4_->value_name : NULL); + _tmp3_ = g_strdup_printf ("query_ftype: Unknown file type %s", (_tmp2_ != NULL) ? _tmp2_->value_name : NULL); #line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp6_); + directory_monitor_mdbg (_tmp4_); #line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp4_); #line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = DIRECTORY_MONITOR_FTYPE_UNSUPPORTED; #line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 3414 "DirectoryMonitor.c" +#line 3412 "DirectoryMonitor.c" } } } -static void directory_monitor_explore_async_data_free (gpointer _data) { +static void +directory_monitor_explore_async_data_free (gpointer _data) +{ DirectoryMonitorExploreAsyncData* _data_; _data_ = _data; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3434,7 +3434,11 @@ static void directory_monitor_explore_async_data_free (gpointer _data) { } -static void directory_monitor_explore_async_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) { +static void +directory_monitor_explore_async_async_ready_wrapper (GObject *source_object, + GAsyncResult *res, + void *user_data) +{ DirectoryMonitorExploreAsyncData* _task_data_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _task_data_ = g_task_get_task_data (G_TASK (res)); @@ -3442,22 +3446,26 @@ static void directory_monitor_explore_async_async_ready_wrapper (GObject *source if (_task_data_->_callback_ != NULL) { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _task_data_->_callback_ (source_object, res, user_data); -#line 3443 "DirectoryMonitor.c" +#line 3447 "DirectoryMonitor.c" } #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _task_data_->_task_complete_ = TRUE; -#line 3447 "DirectoryMonitor.c" +#line 3451 "DirectoryMonitor.c" } -static void directory_monitor_explore_async (DirectoryMonitor* self, GFile* dir, GFileInfo* dir_info, gboolean in_discovery, GAsyncReadyCallback _callback_, gpointer _user_data_) { +static void +directory_monitor_explore_async (DirectoryMonitor* self, + GFile* dir, + GFileInfo* dir_info, + gboolean in_discovery, + GAsyncReadyCallback _callback_, + gpointer _user_data_) +{ DirectoryMonitorExploreAsyncData* _data_; DirectoryMonitor* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; - GFileInfo* _tmp3_; - GFileInfo* _tmp4_; - gboolean _tmp5_; + GFileInfo* _tmp2_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = g_slice_new0 (DirectoryMonitorExploreAsyncData); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3468,7 +3476,7 @@ static void directory_monitor_explore_async (DirectoryMonitor* self, GFile* dir, if (_callback_ == NULL) { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_task_complete_ = TRUE; -#line 3469 "DirectoryMonitor.c" +#line 3477 "DirectoryMonitor.c" } #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_task_set_task_data (_data_->_async_result, _data_, directory_monitor_explore_async_data_free); @@ -3477,40 +3485,41 @@ static void directory_monitor_explore_async (DirectoryMonitor* self, GFile* dir, #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->self = _tmp0_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = dir; -#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (dir); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->dir = _tmp2_; + _data_->dir = _tmp1_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = dir_info; -#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp2_ = _g_object_ref0 (dir_info); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_info); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->dir_info = _tmp4_; -#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = in_discovery; + _data_->dir_info = _tmp2_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->in_discovery = _tmp5_; + _data_->in_discovery = in_discovery; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_explore_async_co (_data_); -#line 3499 "DirectoryMonitor.c" +#line 3501 "DirectoryMonitor.c" } -static void directory_monitor_explore_finish (DirectoryMonitor* self, GAsyncResult* _res_) { +static void +directory_monitor_explore_finish (DirectoryMonitor* self, + GAsyncResult* _res_) +{ DirectoryMonitorExploreAsyncData* _data_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = g_task_propagate_pointer (G_TASK (_res_), NULL); -#line 3507 "DirectoryMonitor.c" +#line 3512 "DirectoryMonitor.c" } -static void directory_monitor_explore_async_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { +static void +directory_monitor_explore_async_ready (GObject* source_object, + GAsyncResult* _res_, + gpointer _user_data_) +{ DirectoryMonitorExploreAsyncData* _data_; #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = _user_data_; @@ -3522,93 +3531,90 @@ static void directory_monitor_explore_async_ready (GObject* source_object, GAsyn _data_->_task_complete_ = TRUE; #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_explore_async_co (_data_); -#line 3523 "DirectoryMonitor.c" +#line 3532 "DirectoryMonitor.c" } -static void _g_object_unref0_ (gpointer var) { +static void +_g_object_unref0_ (gpointer var) +{ #line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); -#line 3530 "DirectoryMonitor.c" +#line 3541 "DirectoryMonitor.c" } -static void _g_list_free__g_object_unref0_ (GList* self) { +static inline void +_g_list_free__g_object_unref0_ (GList* self) +{ #line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_list_foreach (self, (GFunc) _g_object_unref0_, NULL); -#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_list_free (self); -#line 3539 "DirectoryMonitor.c" + g_list_free_full (self, (GDestroyNotify) _g_object_unref0_); +#line 3550 "DirectoryMonitor.c" } -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { +static guint +_file_hash_gee_hash_data_func (gconstpointer v, + gpointer self) +{ guint result; result = file_hash ((GFile*) v); #line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 3548 "DirectoryMonitor.c" +#line 3562 "DirectoryMonitor.c" } -static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsyncData* _data_) { +static gboolean +directory_monitor_explore_async_co (DirectoryMonitorExploreAsyncData* _data_) +{ #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" switch (_data_->_state_) { #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 0: -#line 3557 "DirectoryMonitor.c" +#line 3573 "DirectoryMonitor.c" goto _state_0; #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 1: -#line 3561 "DirectoryMonitor.c" +#line 3577 "DirectoryMonitor.c" goto _state_1; #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 2: -#line 3565 "DirectoryMonitor.c" +#line 3581 "DirectoryMonitor.c" goto _state_2; #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 3: -#line 3569 "DirectoryMonitor.c" +#line 3585 "DirectoryMonitor.c" goto _state_3; #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 4: -#line 3573 "DirectoryMonitor.c" +#line 3589 "DirectoryMonitor.c" goto _state_4; #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 5: -#line 3577 "DirectoryMonitor.c" +#line 3593 "DirectoryMonitor.c" goto _state_5; default: #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_assert_not_reached (); -#line 3582 "DirectoryMonitor.c" +#line 3598 "DirectoryMonitor.c" } _state_0: #line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp0_ = _data_->self->priv->files; #line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp1_ = _data_->dir; -#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp2_ = _data_->dir_info; -#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp3_ = directory_monitor_file_info_map_contains (_data_->_tmp0_, _data_->_tmp1_, _data_->_tmp2_); -#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp3_) { + if (directory_monitor_file_info_map_contains (_data_->_tmp0_, _data_->dir, _data_->dir_info)) { #line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp4_ = _data_->dir; + _data_->_tmp1_ = g_file_get_path (_data_->dir); #line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp5_ = g_file_get_path (_data_->_tmp4_); -#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp6_ = _data_->_tmp5_; + _data_->_tmp2_ = _data_->_tmp1_; #line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_warning ("DirectoryMonitor.vala:852: Directory loop detected at %s, not explorin" \ -"g", _data_->_tmp6_); +"g", _data_->_tmp2_); #line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp6_); -#line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp7_ = _data_->in_discovery; + _g_free0 (_data_->_tmp2_); #line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp7_); + directory_monitor_explore_directory_completed (_data_->self, _data_->in_discovery); #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_task_return_pointer (_data_->_async_result, _data_, NULL); #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3617,59 +3623,55 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync while (_data_->_task_complete_ != TRUE) { #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); -#line 3617 "DirectoryMonitor.c" +#line 3623 "DirectoryMonitor.c" } } #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3624 "DirectoryMonitor.c" +#line 3630 "DirectoryMonitor.c" } #line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp8_ = _data_->dir_info; + _data_->_tmp3_ = _g_object_ref0 (_data_->dir_info); #line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp9_ = _g_object_ref0 (_data_->_tmp8_); -#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->local_dir_info = _data_->_tmp9_; + _data_->local_dir_info = _data_->_tmp3_; #line 861 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp10_ = _data_->local_dir_info; + _data_->_tmp4_ = _data_->local_dir_info; #line 861 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp10_ == NULL) { -#line 3636 "DirectoryMonitor.c" + if (_data_->_tmp4_ == NULL) { +#line 3640 "DirectoryMonitor.c" { #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp12_ = _data_->dir; -#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp13_ = _data_->self->priv->cancellable; + _data_->_tmp6_ = _data_->self->priv->cancellable; #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 1; #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_file_query_info_async (_data_->_tmp12_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_DIR_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp13_, directory_monitor_explore_async_ready, _data_); + g_file_query_info_async (_data_->dir, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_DIR_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp6_, directory_monitor_explore_async_ready, _data_); #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3648 "DirectoryMonitor.c" +#line 3650 "DirectoryMonitor.c" _state_1: #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp14_ = g_file_query_info_finish (_data_->_tmp12_, _data_->_res_, &_data_->_inner_error_); + _data_->_tmp7_ = g_file_query_info_finish (_data_->dir, _data_->_res_, &_data_->_inner_error_); #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp11_ = _data_->_tmp14_; + _data_->_tmp5_ = _data_->_tmp7_; #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 3656 "DirectoryMonitor.c" +#line 3658 "DirectoryMonitor.c" goto __catch490_g_error; } #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp15_ = _data_->_tmp11_; + _data_->_tmp8_ = _data_->_tmp5_; #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp11_ = NULL; + _data_->_tmp5_ = NULL; #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->local_dir_info); #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->local_dir_info = _data_->_tmp15_; + _data_->local_dir_info = _data_->_tmp8_; #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp11_); -#line 3669 "DirectoryMonitor.c" + _g_object_unref0 (_data_->_tmp5_); +#line 3671 "DirectoryMonitor.c" } goto __finally490; __catch490_g_error: @@ -3679,23 +3681,19 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_inner_error_ = NULL; #line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp16_ = _data_->dir; + _data_->_tmp9_ = g_file_get_path (_data_->dir); #line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp17_ = g_file_get_path (_data_->_tmp16_); + _data_->_tmp10_ = _data_->_tmp9_; #line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp18_ = _data_->_tmp17_; + _data_->_tmp11_ = _data_->err; #line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp19_ = _data_->err; + _data_->_tmp12_ = _data_->_tmp11_->message; #line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp20_ = _data_->_tmp19_->message; + g_warning ("DirectoryMonitor.vala:866: Unable to retrieve info on %s: %s", _data_->_tmp10_, _data_->_tmp12_); #line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:866: Unable to retrieve info on %s: %s", _data_->_tmp18_, _data_->_tmp20_); -#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp18_); -#line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp21_ = _data_->in_discovery; + _g_free0 (_data_->_tmp10_); #line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp21_); + directory_monitor_explore_directory_completed (_data_->self, _data_->in_discovery); #line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_error_free0 (_data_->err); #line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3708,14 +3706,14 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync while (_data_->_task_complete_ != TRUE) { #line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); -#line 3708 "DirectoryMonitor.c" +#line 3706 "DirectoryMonitor.c" } } #line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); #line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3715 "DirectoryMonitor.c" +#line 3713 "DirectoryMonitor.c" } __finally490: #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3730,29 +3728,23 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync g_object_unref (_data_->_async_result); #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3730 "DirectoryMonitor.c" +#line 3728 "DirectoryMonitor.c" } } #line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp22_ = _data_->local_dir_info; + _data_->_tmp13_ = _data_->local_dir_info; #line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp23_ = g_file_info_get_is_hidden (_data_->_tmp22_); -#line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp23_) { -#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp24_ = _data_->dir; + if (g_file_info_get_is_hidden (_data_->_tmp13_)) { #line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp25_ = g_file_get_path (_data_->_tmp24_); + _data_->_tmp14_ = g_file_get_path (_data_->dir); #line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp26_ = _data_->_tmp25_; + _data_->_tmp15_ = _data_->_tmp14_; #line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:875: Ignoring hidden directory %s", _data_->_tmp26_); + g_warning ("DirectoryMonitor.vala:875: Ignoring hidden directory %s", _data_->_tmp15_); #line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp26_); + _g_free0 (_data_->_tmp15_); #line 877 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp27_ = _data_->in_discovery; -#line 877 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp27_); + directory_monitor_explore_directory_completed (_data_->self, _data_->in_discovery); #line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->local_dir_info); #line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3763,73 +3755,63 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync while (_data_->_task_complete_ != TRUE) { #line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); -#line 3763 "DirectoryMonitor.c" +#line 3755 "DirectoryMonitor.c" } } #line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); #line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3770 "DirectoryMonitor.c" +#line 3762 "DirectoryMonitor.c" } #line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp28_ = _data_->local_dir_info; + _data_->_tmp16_ = _data_->local_dir_info; #line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp29_ = get_file_info_id (_data_->_tmp28_); + _data_->_tmp17_ = get_file_info_id (_data_->_tmp16_); #line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp30_ = _data_->_tmp29_; + _data_->_tmp18_ = _data_->_tmp17_; #line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp31_ = _data_->_tmp30_ == NULL; + _data_->_tmp19_ = _data_->_tmp18_ == NULL; #line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp30_); + _g_free0 (_data_->_tmp18_); #line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp31_) { -#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp32_ = _data_->local_dir_info; + if (_data_->_tmp19_) { #line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp33_ = _data_->dir; + _data_->_tmp20_ = _data_->local_dir_info; #line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp34_ = g_file_get_uri (_data_->_tmp33_); + _data_->_tmp21_ = g_file_get_uri (_data_->dir); #line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp35_ = _data_->_tmp34_; + _data_->_tmp22_ = _data_->_tmp21_; #line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_file_info_set_attribute_string (_data_->_tmp32_, G_FILE_ATTRIBUTE_ID_FILE, _data_->_tmp35_); + g_file_info_set_attribute_string (_data_->_tmp20_, G_FILE_ATTRIBUTE_ID_FILE, _data_->_tmp22_); #line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp35_); -#line 3796 "DirectoryMonitor.c" + _g_free0 (_data_->_tmp22_); +#line 3786 "DirectoryMonitor.c" } #line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp36_ = _data_->local_dir_info; + _data_->_tmp23_ = _data_->local_dir_info; #line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp37_ = g_file_info_get_file_type (_data_->_tmp36_); -#line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp37_ != G_FILE_TYPE_DIRECTORY) { -#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp38_ = _data_->dir; + if (g_file_info_get_file_type (_data_->_tmp23_) != G_FILE_TYPE_DIRECTORY) { #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp39_ = g_file_get_path (_data_->_tmp38_); + _data_->_tmp24_ = g_file_get_path (_data_->dir); #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp40_ = _data_->_tmp39_; + _data_->_tmp25_ = _data_->_tmp24_; #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp41_ = _data_->local_dir_info; -#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp42_ = g_file_info_get_file_type (_data_->_tmp41_); + _data_->_tmp26_ = _data_->local_dir_info; #line 892 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp43_ = g_enum_get_value (g_type_class_ref (g_file_type_get_type ()), _data_->_tmp42_); + _data_->_tmp27_ = g_enum_get_value (g_type_class_ref (g_file_type_get_type ()), g_file_info_get_file_type (_data_->_tmp26_)); #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp44_ = g_strdup_printf (_ ("Unable to monitor %s: Not a directory (%s)"), _data_->_tmp40_, (_data_->_tmp43_ != NULL) ? _data_->_tmp43_->value_name : NULL); + _data_->_tmp28_ = g_strdup_printf (_ ("Unable to monitor %s: Not a directory (%s)"), _data_->_tmp25_, (_data_->_tmp27_ != NULL) ? _data_->_tmp27_->value_name : NULL); #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp45_ = _data_->_tmp44_; + _data_->_tmp29_ = _data_->_tmp28_; #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_discovery_failed (_data_->self, _data_->_tmp45_); + directory_monitor_notify_discovery_failed (_data_->self, _data_->_tmp29_); #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp45_); + _g_free0 (_data_->_tmp29_); #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp40_); -#line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp46_ = _data_->in_discovery; + _g_free0 (_data_->_tmp25_); #line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp46_); + directory_monitor_explore_directory_completed (_data_->self, _data_->in_discovery); #line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->local_dir_info); #line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3840,273 +3822,257 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync while (_data_->_task_complete_ != TRUE) { #line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); -#line 3840 "DirectoryMonitor.c" +#line 3822 "DirectoryMonitor.c" } } #line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); #line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3847 "DirectoryMonitor.c" +#line 3829 "DirectoryMonitor.c" } #line 903 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->dir_map = NULL; #line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->file_map = NULL; -#line 3853 "DirectoryMonitor.c" +#line 3835 "DirectoryMonitor.c" { #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp47_ = _data_->dir; -#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp48_ = _data_->self->priv->cancellable; + _data_->_tmp30_ = _data_->self->priv->cancellable; #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 2; #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_file_enumerate_children_async (_data_->_tmp47_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp48_, directory_monitor_explore_async_ready, _data_); + g_file_enumerate_children_async (_data_->dir, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp30_, directory_monitor_explore_async_ready, _data_); #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3865 "DirectoryMonitor.c" +#line 3845 "DirectoryMonitor.c" _state_2: #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp49_ = g_file_enumerate_children_finish (_data_->_tmp47_, _data_->_res_, &_data_->_inner_error_); + _data_->_tmp31_ = g_file_enumerate_children_finish (_data_->dir, _data_->_res_, &_data_->_inner_error_); #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->enumerator = _data_->_tmp49_; + _data_->enumerator = _data_->_tmp31_; #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 3873 "DirectoryMonitor.c" +#line 3853 "DirectoryMonitor.c" goto __catch491_g_error; } { #line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp50_ = TRUE; + _data_->_tmp32_ = TRUE; #line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { #line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_data_->_tmp50_) { -#line 3883 "DirectoryMonitor.c" + if (!_data_->_tmp32_) { +#line 3863 "DirectoryMonitor.c" } #line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp50_ = FALSE; + _data_->_tmp32_ = FALSE; #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp51_ = _data_->enumerator; + _data_->_tmp33_ = _data_->enumerator; #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp52_ = _data_->self->priv->cancellable; + _data_->_tmp34_ = _data_->self->priv->cancellable; #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 3; #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_file_enumerator_next_files_async (_data_->_tmp51_, 10, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp52_, directory_monitor_explore_async_ready, _data_); + g_file_enumerator_next_files_async (_data_->_tmp33_, 10, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp34_, directory_monitor_explore_async_ready, _data_); #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3897 "DirectoryMonitor.c" +#line 3877 "DirectoryMonitor.c" _state_3: #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp53_ = g_file_enumerator_next_files_finish (_data_->_tmp51_, _data_->_res_, &_data_->_inner_error_); + _data_->_tmp35_ = g_file_enumerator_next_files_finish (_data_->_tmp33_, _data_->_res_, &_data_->_inner_error_); #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->infos = _data_->_tmp53_; + _data_->infos = _data_->_tmp35_; #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->enumerator); -#line 3907 "DirectoryMonitor.c" +#line 3887 "DirectoryMonitor.c" goto __catch491_g_error; } #line 912 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp54_ = _data_->infos; + _data_->_tmp36_ = _data_->infos; #line 912 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp54_ == NULL) { + if (_data_->_tmp36_ == NULL) { #line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" __g_list_free__g_object_unref0_0 (_data_->infos); #line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 3918 "DirectoryMonitor.c" +#line 3898 "DirectoryMonitor.c" } #line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp55_ = _data_->infos; -#line 3922 "DirectoryMonitor.c" + _data_->_tmp37_ = _data_->infos; +#line 3902 "DirectoryMonitor.c" { #line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->info_collection = _data_->_tmp55_; + _data_->info_collection = _data_->_tmp37_; #line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" for (_data_->info_it = _data_->info_collection; _data_->info_it != NULL; _data_->info_it = _data_->info_it->next) { #line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp56_ = _g_object_ref0 ((GFileInfo*) _data_->info_it->data); + _data_->_tmp38_ = _g_object_ref0 ((GFileInfo*) _data_->info_it->data); #line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->info = _data_->_tmp56_; -#line 3932 "DirectoryMonitor.c" + _data_->info = _data_->_tmp38_; +#line 3912 "DirectoryMonitor.c" { #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp57_ = _data_->info; + _data_->_tmp39_ = _data_->info; #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp58_ = get_file_info_id (_data_->_tmp57_); + _data_->_tmp40_ = get_file_info_id (_data_->_tmp39_); #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp59_ = _data_->_tmp58_; + _data_->_tmp41_ = _data_->_tmp40_; #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp60_ = _data_->_tmp59_ == NULL; + _data_->_tmp42_ = _data_->_tmp41_ == NULL; #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp59_); + _g_free0 (_data_->_tmp41_); #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp60_) { -#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp61_ = _data_->info; + if (_data_->_tmp42_) { #line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp62_ = _data_->dir; + _data_->_tmp43_ = _data_->info; #line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp63_ = g_file_get_uri (_data_->_tmp62_); + _data_->_tmp44_ = g_file_get_uri (_data_->dir); #line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp64_ = _data_->_tmp63_; + _data_->_tmp45_ = _data_->_tmp44_; #line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_file_info_set_attribute_string (_data_->_tmp61_, G_FILE_ATTRIBUTE_ID_FILE, _data_->_tmp64_); + g_file_info_set_attribute_string (_data_->_tmp43_, G_FILE_ATTRIBUTE_ID_FILE, _data_->_tmp45_); #line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp64_); -#line 3958 "DirectoryMonitor.c" + _g_free0 (_data_->_tmp45_); +#line 3936 "DirectoryMonitor.c" } #line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp65_ = _data_->info; + _data_->_tmp46_ = _data_->info; #line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp66_ = g_file_info_get_is_hidden (_data_->_tmp65_); -#line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp66_) { -#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp67_ = _data_->dir; + if (g_file_info_get_is_hidden (_data_->_tmp46_)) { #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp68_ = _data_->info; + _data_->_tmp47_ = _data_->info; #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp69_ = g_file_info_get_name (_data_->_tmp68_); + _data_->_tmp48_ = g_file_info_get_name (_data_->_tmp47_); #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp70_ = g_file_get_child (_data_->_tmp67_, _data_->_tmp69_); + _data_->_tmp49_ = g_file_get_child (_data_->dir, _data_->_tmp48_); #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp71_ = _data_->_tmp70_; + _data_->_tmp50_ = _data_->_tmp49_; #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp72_ = g_file_get_path (_data_->_tmp71_); + _data_->_tmp51_ = g_file_get_path (_data_->_tmp50_); #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp73_ = _data_->_tmp72_; + _data_->_tmp52_ = _data_->_tmp51_; #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:922: Skipping hidden file/directory %s", _data_->_tmp73_); + g_warning ("DirectoryMonitor.vala:922: Skipping hidden file/directory %s", _data_->_tmp52_); #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp73_); + _g_free0 (_data_->_tmp52_); #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp71_); + _g_object_unref0 (_data_->_tmp50_); #line 925 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->info); #line 925 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 3990 "DirectoryMonitor.c" +#line 3964 "DirectoryMonitor.c" } #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp74_ = _data_->info; + _data_->_tmp53_ = _data_->info; #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp75_ = directory_monitor_is_file_symlink_supported (_data_->_tmp74_); -#line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_data_->_tmp75_) { + if (!directory_monitor_is_file_symlink_supported (_data_->_tmp53_)) { #line 930 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->info); #line 930 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 4002 "DirectoryMonitor.c" +#line 3974 "DirectoryMonitor.c" } #line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp76_ = _data_->info; -#line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp77_ = g_file_info_get_file_type (_data_->_tmp76_); + _data_->_tmp54_ = _data_->info; #line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - switch (_data_->_tmp77_) { + switch (g_file_info_get_file_type (_data_->_tmp54_)) { #line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_TYPE_REGULAR: -#line 4012 "DirectoryMonitor.c" +#line 3982 "DirectoryMonitor.c" { #line 934 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp78_ = _data_->file_map; + _data_->_tmp55_ = _data_->file_map; #line 934 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp78_ == NULL) { + if (_data_->_tmp55_ == NULL) { #line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp79_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _data_->_tmp56_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_map); #line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->file_map = _data_->_tmp79_; -#line 4024 "DirectoryMonitor.c" + _data_->file_map = _data_->_tmp56_; +#line 3994 "DirectoryMonitor.c" } #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp80_ = _data_->file_map; + _data_->_tmp57_ = _data_->file_map; #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp81_ = _data_->dir; + _data_->_tmp58_ = _data_->info; #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp82_ = _data_->info; + _data_->_tmp59_ = g_file_info_get_name (_data_->_tmp58_); #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp83_ = g_file_info_get_name (_data_->_tmp82_); + _data_->_tmp60_ = g_file_get_child (_data_->dir, _data_->_tmp59_); #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp84_ = g_file_get_child (_data_->_tmp81_, _data_->_tmp83_); + _data_->_tmp61_ = _data_->_tmp60_; #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp85_ = _data_->_tmp84_; + _data_->_tmp62_ = _data_->info; #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp86_ = _data_->info; + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp57_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp61_, _data_->_tmp62_); #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp80_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp85_, _data_->_tmp86_); -#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp85_); + _g_object_unref0 (_data_->_tmp61_); #line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 4046 "DirectoryMonitor.c" +#line 4014 "DirectoryMonitor.c" } #line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_TYPE_DIRECTORY: -#line 4050 "DirectoryMonitor.c" +#line 4018 "DirectoryMonitor.c" { #line 941 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp87_ = _data_->dir_map; + _data_->_tmp63_ = _data_->dir_map; #line 941 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp87_ == NULL) { + if (_data_->_tmp63_ == NULL) { #line 942 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp88_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _data_->_tmp64_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 942 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_map); #line 942 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->dir_map = _data_->_tmp88_; -#line 4062 "DirectoryMonitor.c" + _data_->dir_map = _data_->_tmp64_; +#line 4030 "DirectoryMonitor.c" } #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp89_ = _data_->dir_map; + _data_->_tmp65_ = _data_->dir_map; #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp90_ = _data_->dir; + _data_->_tmp66_ = _data_->info; #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp91_ = _data_->info; + _data_->_tmp67_ = g_file_info_get_name (_data_->_tmp66_); #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp92_ = g_file_info_get_name (_data_->_tmp91_); + _data_->_tmp68_ = g_file_get_child (_data_->dir, _data_->_tmp67_); #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp93_ = g_file_get_child (_data_->_tmp90_, _data_->_tmp92_); + _data_->_tmp69_ = _data_->_tmp68_; #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp94_ = _data_->_tmp93_; + _data_->_tmp70_ = _data_->info; #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp95_ = _data_->info; + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp65_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp69_, _data_->_tmp70_); #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp89_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp94_, _data_->_tmp95_); -#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp94_); + _g_object_unref0 (_data_->_tmp69_); #line 945 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 4084 "DirectoryMonitor.c" +#line 4050 "DirectoryMonitor.c" } default: { #line 949 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 4090 "DirectoryMonitor.c" +#line 4056 "DirectoryMonitor.c" } } #line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->info); -#line 4095 "DirectoryMonitor.c" +#line 4061 "DirectoryMonitor.c" } } } #line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" __g_list_free__g_object_unref0_0 (_data_->infos); -#line 4101 "DirectoryMonitor.c" +#line 4067 "DirectoryMonitor.c" } } #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->enumerator); -#line 4106 "DirectoryMonitor.c" +#line 4072 "DirectoryMonitor.c" } goto __finally491; __catch491_g_error: @@ -4116,23 +4082,19 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_inner_error_ = NULL; #line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp96_ = _data_->dir; + _data_->_tmp71_ = g_file_get_path (_data_->dir); #line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp97_ = g_file_get_path (_data_->_tmp96_); + _data_->_tmp72_ = _data_->_tmp71_; #line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp98_ = _data_->_tmp97_; + _data_->_tmp73_ = _data_->err2; #line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp99_ = _data_->err2; + _data_->_tmp74_ = _data_->_tmp73_->message; #line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp100_ = _data_->_tmp99_->message; + g_warning ("DirectoryMonitor.vala:954: Aborted directory traversal of %s: %s", _data_->_tmp72_, _data_->_tmp74_); #line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:954: Aborted directory traversal of %s: %s", _data_->_tmp98_, _data_->_tmp100_); -#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp98_); -#line 956 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp101_ = _data_->in_discovery; + _g_free0 (_data_->_tmp72_); #line 956 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp101_); + directory_monitor_explore_directory_completed (_data_->self, _data_->in_discovery); #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_error_free0 (_data_->err2); #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4149,14 +4111,14 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync while (_data_->_task_complete_ != TRUE) { #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); -#line 4149 "DirectoryMonitor.c" +#line 4111 "DirectoryMonitor.c" } } #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4156 "DirectoryMonitor.c" +#line 4118 "DirectoryMonitor.c" } __finally491: #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4175,171 +4137,153 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync g_object_unref (_data_->_async_result); #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4175 "DirectoryMonitor.c" +#line 4137 "DirectoryMonitor.c" } #line 962 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp102_ = _data_->in_discovery; -#line 962 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp102_) { -#line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp103_ = _data_->dir; + if (_data_->in_discovery) { #line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp104_ = _data_->local_dir_info; + _data_->_tmp75_ = _data_->local_dir_info; #line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_internal_notify_directory_discovered (_data_->self, _data_->_tmp103_, _data_->_tmp104_); -#line 4187 "DirectoryMonitor.c" + directory_monitor_internal_notify_directory_discovered (_data_->self, _data_->dir, _data_->_tmp75_); +#line 4145 "DirectoryMonitor.c" } else { #line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp105_ = _data_->dir; -#line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp106_ = _data_->local_dir_info; + _data_->_tmp76_ = _data_->local_dir_info; #line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_internal_notify_directory_created (_data_->self, _data_->_tmp105_, _data_->_tmp106_); -#line 4195 "DirectoryMonitor.c" + directory_monitor_internal_notify_directory_created (_data_->self, _data_->dir, _data_->_tmp76_); +#line 4151 "DirectoryMonitor.c" } #line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp107_ = _data_->dir; + _data_->_tmp77_ = _data_->local_dir_info; #line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp108_ = _data_->local_dir_info; -#line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_add_monitor (_data_->self, _data_->_tmp107_, _data_->_tmp108_); + directory_monitor_add_monitor (_data_->self, _data_->dir, _data_->_tmp77_); #line 972 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp109_ = _data_->file_map; + _data_->_tmp78_ = _data_->file_map; #line 972 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp109_ != NULL) { -#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp110_ = _data_->file_map; + if (_data_->_tmp78_ != NULL) { #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp111_ = _data_->in_discovery; + _data_->_tmp79_ = _data_->file_map; #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 4; #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_directory_files (_data_->self, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp110_, GEE_TYPE_MAP, GeeMap), _data_->_tmp111_, directory_monitor_explore_async_ready, _data_); + directory_monitor_notify_directory_files (_data_->self, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp79_, GEE_TYPE_MAP, GeeMap), _data_->in_discovery, directory_monitor_explore_async_ready, _data_); #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4217 "DirectoryMonitor.c" +#line 4169 "DirectoryMonitor.c" _state_4: #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_directory_files_finish (_data_->self, _data_->_res_); -#line 4221 "DirectoryMonitor.c" +#line 4173 "DirectoryMonitor.c" } #line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp113_ = _data_->self->priv->recurse; + _data_->_tmp81_ = _data_->self->priv->recurse; #line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp113_) { + if (_data_->_tmp81_) { #line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp114_ = _data_->dir_map; + _data_->_tmp82_ = _data_->dir_map; #line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp112_ = _data_->_tmp114_ != NULL; -#line 4231 "DirectoryMonitor.c" + _data_->_tmp80_ = _data_->_tmp82_ != NULL; +#line 4183 "DirectoryMonitor.c" } else { #line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp112_ = FALSE; -#line 4235 "DirectoryMonitor.c" + _data_->_tmp80_ = FALSE; +#line 4187 "DirectoryMonitor.c" } #line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp112_) { -#line 4239 "DirectoryMonitor.c" + if (_data_->_tmp80_) { +#line 4191 "DirectoryMonitor.c" { #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp115_ = _data_->dir_map; + _data_->_tmp83_ = _data_->dir_map; #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp116_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp115_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _data_->_tmp84_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp83_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp117_ = _data_->_tmp116_; + _data_->_tmp85_ = _data_->_tmp84_; #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp118_ = _data_->_tmp117_; + _data_->_tmp86_ = _data_->_tmp85_; #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp119_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp118_, GEE_TYPE_ITERABLE, GeeIterable)); + _data_->_tmp87_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp86_, GEE_TYPE_ITERABLE, GeeIterable)); #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp120_ = _data_->_tmp119_; + _data_->_tmp88_ = _data_->_tmp87_; #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp118_); + _g_object_unref0 (_data_->_tmp86_); #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_subdir_it = _data_->_tmp120_; + _data_->_subdir_it = _data_->_tmp88_; #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp121_ = _data_->_subdir_it; + _data_->_tmp89_ = _data_->_subdir_it; #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp122_ = gee_iterator_next (_data_->_tmp121_); -#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_data_->_tmp122_) { + if (!gee_iterator_next (_data_->_tmp89_)) { #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 4267 "DirectoryMonitor.c" +#line 4217 "DirectoryMonitor.c" } #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp123_ = _data_->_subdir_it; + _data_->_tmp90_ = _data_->_subdir_it; #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp124_ = gee_iterator_get (_data_->_tmp123_); + _data_->_tmp91_ = gee_iterator_get (_data_->_tmp90_); #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->subdir = (GFile*) _data_->_tmp124_; + _data_->subdir = (GFile*) _data_->_tmp91_; #line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp125_ = _data_->self->priv->outstanding_exploration_dirs; + _data_->_tmp92_ = _data_->self->priv->outstanding_exploration_dirs; #line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->self->priv->outstanding_exploration_dirs = _data_->_tmp125_ + 1; + _data_->self->priv->outstanding_exploration_dirs = _data_->_tmp92_ + 1; #line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp126_ = _data_->self->priv->outstanding_exploration_dirs; + _data_->_tmp93_ = _data_->self->priv->outstanding_exploration_dirs; #line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp126_ > DIRECTORY_MONITOR_MAX_EXPLORATION_DIRS) { + if (_data_->_tmp93_ > DIRECTORY_MONITOR_MAX_EXPLORATION_DIRS) { #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp127_ = _data_->subdir; + _data_->_tmp94_ = _data_->subdir; #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp128_ = _data_->dir_map; + _data_->_tmp95_ = _data_->dir_map; #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp129_ = _data_->subdir; + _data_->_tmp96_ = _data_->subdir; #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp130_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp128_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp129_); + _data_->_tmp97_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp95_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp96_); #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp131_ = (GFileInfo*) _data_->_tmp130_; -#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp132_ = _data_->in_discovery; + _data_->_tmp98_ = (GFileInfo*) _data_->_tmp97_; #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 5; #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_explore_async (_data_->self, _data_->_tmp127_, _data_->_tmp131_, _data_->_tmp132_, directory_monitor_explore_async_ready, _data_); + directory_monitor_explore_async (_data_->self, _data_->_tmp94_, _data_->_tmp98_, _data_->in_discovery, directory_monitor_explore_async_ready, _data_); #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4301 "DirectoryMonitor.c" +#line 4249 "DirectoryMonitor.c" _state_5: #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_explore_finish (_data_->self, _data_->_res_); #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp131_); -#line 4307 "DirectoryMonitor.c" + _g_object_unref0 (_data_->_tmp98_); +#line 4255 "DirectoryMonitor.c" } else { #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp133_ = _data_->subdir; -#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp134_ = _data_->dir_map; + _data_->_tmp99_ = _data_->subdir; #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp135_ = _data_->subdir; + _data_->_tmp100_ = _data_->dir_map; #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp136_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp134_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp135_); + _data_->_tmp101_ = _data_->subdir; #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp137_ = (GFileInfo*) _data_->_tmp136_; + _data_->_tmp102_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp100_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp101_); #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp138_ = _data_->in_discovery; + _data_->_tmp103_ = (GFileInfo*) _data_->_tmp102_; #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_explore_async (_data_->self, _data_->_tmp133_, _data_->_tmp137_, _data_->_tmp138_, NULL, NULL); + directory_monitor_explore_async (_data_->self, _data_->_tmp99_, _data_->_tmp103_, _data_->in_discovery, NULL, NULL); #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp137_); -#line 4325 "DirectoryMonitor.c" + _g_object_unref0 (_data_->_tmp103_); +#line 4271 "DirectoryMonitor.c" } #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->subdir); -#line 4329 "DirectoryMonitor.c" +#line 4275 "DirectoryMonitor.c" } #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_subdir_it); -#line 4333 "DirectoryMonitor.c" +#line 4279 "DirectoryMonitor.c" } } #line 985 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp139_ = _data_->in_discovery; -#line 985 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp139_); + directory_monitor_explore_directory_completed (_data_->self, _data_->in_discovery); #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_map); #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4354,18 +4298,20 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync while (_data_->_task_complete_ != TRUE) { #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); -#line 4354 "DirectoryMonitor.c" +#line 4298 "DirectoryMonitor.c" } } #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4361 "DirectoryMonitor.c" +#line 4305 "DirectoryMonitor.c" } -static void directory_monitor_notify_directory_files_data_free (gpointer _data) { +static void +directory_monitor_notify_directory_files_data_free (gpointer _data) +{ DirectoryMonitorNotifyDirectoryFilesData* _data_; _data_ = _data; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4374,11 +4320,15 @@ static void directory_monitor_notify_directory_files_data_free (gpointer _data) _g_object_unref0 (_data_->self); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_slice_free (DirectoryMonitorNotifyDirectoryFilesData, _data_); -#line 4374 "DirectoryMonitor.c" +#line 4320 "DirectoryMonitor.c" } -static void directory_monitor_notify_directory_files_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) { +static void +directory_monitor_notify_directory_files_async_ready_wrapper (GObject *source_object, + GAsyncResult *res, + void *user_data) +{ DirectoryMonitorNotifyDirectoryFilesData* _task_data_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _task_data_ = g_task_get_task_data (G_TASK (res)); @@ -4386,20 +4336,24 @@ static void directory_monitor_notify_directory_files_async_ready_wrapper (GObjec if (_task_data_->_callback_ != NULL) { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _task_data_->_callback_ (source_object, res, user_data); -#line 4386 "DirectoryMonitor.c" +#line 4336 "DirectoryMonitor.c" } #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _task_data_->_task_complete_ = TRUE; -#line 4390 "DirectoryMonitor.c" +#line 4340 "DirectoryMonitor.c" } -static void directory_monitor_notify_directory_files (DirectoryMonitor* self, GeeMap* map, gboolean in_discovery, GAsyncReadyCallback _callback_, gpointer _user_data_) { +static void +directory_monitor_notify_directory_files (DirectoryMonitor* self, + GeeMap* map, + gboolean in_discovery, + GAsyncReadyCallback _callback_, + gpointer _user_data_) +{ DirectoryMonitorNotifyDirectoryFilesData* _data_; DirectoryMonitor* _tmp0_; GeeMap* _tmp1_; - GeeMap* _tmp2_; - gboolean _tmp3_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = g_slice_new0 (DirectoryMonitorNotifyDirectoryFilesData); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4410,7 +4364,7 @@ static void directory_monitor_notify_directory_files (DirectoryMonitor* self, Ge if (_callback_ == NULL) { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_task_complete_ = TRUE; -#line 4410 "DirectoryMonitor.c" +#line 4364 "DirectoryMonitor.c" } #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_task_set_task_data (_data_->_async_result, _data_, directory_monitor_notify_directory_files_data_free); @@ -4419,118 +4373,115 @@ static void directory_monitor_notify_directory_files (DirectoryMonitor* self, Ge #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->self = _tmp0_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = map; -#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (map); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->map); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->map = _tmp2_; -#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = in_discovery; + _data_->map = _tmp1_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->in_discovery = _tmp3_; + _data_->in_discovery = in_discovery; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_directory_files_co (_data_); -#line 4432 "DirectoryMonitor.c" +#line 4382 "DirectoryMonitor.c" } -static void directory_monitor_notify_directory_files_finish (DirectoryMonitor* self, GAsyncResult* _res_) { +static void +directory_monitor_notify_directory_files_finish (DirectoryMonitor* self, + GAsyncResult* _res_) +{ DirectoryMonitorNotifyDirectoryFilesData* _data_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = g_task_propagate_pointer (G_TASK (_res_), NULL); -#line 4440 "DirectoryMonitor.c" +#line 4393 "DirectoryMonitor.c" } -static gboolean _directory_monitor_notify_directory_files_co_gsource_func (gpointer self) { +static gboolean +_directory_monitor_notify_directory_files_co_gsource_func (gpointer self) +{ gboolean result; result = directory_monitor_notify_directory_files_co (self); #line 996 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 4449 "DirectoryMonitor.c" +#line 4404 "DirectoryMonitor.c" } -static gboolean directory_monitor_notify_directory_files_co (DirectoryMonitorNotifyDirectoryFilesData* _data_) { +static gboolean +directory_monitor_notify_directory_files_co (DirectoryMonitorNotifyDirectoryFilesData* _data_) +{ #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" switch (_data_->_state_) { #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 0: -#line 4458 "DirectoryMonitor.c" +#line 4415 "DirectoryMonitor.c" goto _state_0; #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 1: -#line 4462 "DirectoryMonitor.c" +#line 4419 "DirectoryMonitor.c" goto _state_1; default: #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_assert_not_reached (); -#line 4467 "DirectoryMonitor.c" +#line 4424 "DirectoryMonitor.c" } _state_0: #line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp0_ = _data_->map; + _data_->_tmp0_ = gee_map_map_iterator (_data_->map); #line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp1_ = gee_map_map_iterator (_data_->_tmp0_); -#line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->iter = _data_->_tmp1_; + _data_->iter = _data_->_tmp0_; #line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { #line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp2_ = _data_->iter; -#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp3_ = gee_map_iterator_next (_data_->_tmp2_); + _data_->_tmp1_ = _data_->iter; #line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_data_->_tmp3_) { + if (!gee_map_iterator_next (_data_->_tmp1_)) { #line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 4486 "DirectoryMonitor.c" +#line 4439 "DirectoryMonitor.c" } #line 991 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp4_ = _data_->in_discovery; -#line 991 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp4_) { -#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp5_ = _data_->iter; + if (_data_->in_discovery) { #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp6_ = gee_map_iterator_get_key (_data_->_tmp5_); + _data_->_tmp2_ = _data_->iter; #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp7_ = (GFile*) _data_->_tmp6_; + _data_->_tmp3_ = gee_map_iterator_get_key (_data_->_tmp2_); #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp8_ = _data_->iter; + _data_->_tmp4_ = (GFile*) _data_->_tmp3_; #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp9_ = gee_map_iterator_get_value (_data_->_tmp8_); + _data_->_tmp5_ = _data_->iter; #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp10_ = (GFileInfo*) _data_->_tmp9_; + _data_->_tmp6_ = gee_map_iterator_get_value (_data_->_tmp5_); #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_internal_notify_file_discovered (_data_->self, _data_->_tmp7_, _data_->_tmp10_); + _data_->_tmp7_ = (GFileInfo*) _data_->_tmp6_; #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp10_); + directory_monitor_internal_notify_file_discovered (_data_->self, _data_->_tmp4_, _data_->_tmp7_); #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_tmp7_); -#line 4510 "DirectoryMonitor.c" +#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_object_unref0 (_data_->_tmp4_); +#line 4461 "DirectoryMonitor.c" } else { #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp11_ = _data_->iter; -#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp12_ = gee_map_iterator_get_key (_data_->_tmp11_); + _data_->_tmp8_ = _data_->iter; #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp13_ = (GFile*) _data_->_tmp12_; + _data_->_tmp9_ = gee_map_iterator_get_key (_data_->_tmp8_); #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp14_ = _data_->iter; + _data_->_tmp10_ = (GFile*) _data_->_tmp9_; #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp15_ = gee_map_iterator_get_value (_data_->_tmp14_); + _data_->_tmp11_ = _data_->iter; #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp16_ = (GFileInfo*) _data_->_tmp15_; + _data_->_tmp12_ = gee_map_iterator_get_value (_data_->_tmp11_); #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_internal_notify_file_created (_data_->self, _data_->_tmp13_, _data_->_tmp16_); + _data_->_tmp13_ = (GFileInfo*) _data_->_tmp12_; #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp16_); + directory_monitor_internal_notify_file_created (_data_->self, _data_->_tmp10_, _data_->_tmp13_); #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_tmp13_); -#line 4530 "DirectoryMonitor.c" +#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _g_object_unref0 (_data_->_tmp10_); +#line 4481 "DirectoryMonitor.c" } #line 996 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_idle_add_full (DIRECTORY_MONITOR_DEFAULT_PRIORITY, _directory_monitor_notify_directory_files_co_gsource_func, _data_, NULL); @@ -4538,7 +4489,7 @@ static gboolean directory_monitor_notify_directory_files_co (DirectoryMonitorNot _data_->_state_ = 1; #line 997 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4538 "DirectoryMonitor.c" +#line 4489 "DirectoryMonitor.c" _state_1: ; } @@ -4552,22 +4503,24 @@ static gboolean directory_monitor_notify_directory_files_co (DirectoryMonitorNot while (_data_->_task_complete_ != TRUE) { #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); -#line 4552 "DirectoryMonitor.c" +#line 4503 "DirectoryMonitor.c" } } #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4559 "DirectoryMonitor.c" +#line 4510 "DirectoryMonitor.c" } -static void directory_monitor_explore_directory_completed (DirectoryMonitor* self, gboolean in_discovery) { +static void +directory_monitor_explore_directory_completed (DirectoryMonitor* self, + gboolean in_discovery) +{ gint _tmp0_; gint _tmp1_; gboolean _tmp2_ = FALSE; - gboolean _tmp3_; #line 1003 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 1004 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4579,59 +4532,63 @@ static void directory_monitor_explore_directory_completed (DirectoryMonitor* sel #line 1005 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->outstanding_exploration_dirs = _tmp1_ - 1; #line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = in_discovery; + if (in_discovery) { +#line 4533 "DirectoryMonitor.c" + gint _tmp3_; #line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp3_) { -#line 4582 "DirectoryMonitor.c" - gint _tmp4_; + _tmp3_ = self->priv->outstanding_exploration_dirs; #line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = self->priv->outstanding_exploration_dirs; -#line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _tmp4_ == 0; -#line 4588 "DirectoryMonitor.c" + _tmp2_ = _tmp3_ == 0; +#line 4539 "DirectoryMonitor.c" } else { #line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = FALSE; -#line 4592 "DirectoryMonitor.c" +#line 4543 "DirectoryMonitor.c" } #line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp2_) { #line 1008 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_discovery_completed (self); -#line 4598 "DirectoryMonitor.c" +#line 4549 "DirectoryMonitor.c" } } -static void _directory_monitor_on_monitor_notification_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self) { +static void +_directory_monitor_on_monitor_notification_g_file_monitor_changed (GFileMonitor* _sender, + GFile* file, + GFile* other_file, + GFileMonitorEvent event_type, + gpointer self) +{ #line 1036 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_on_monitor_notification ((DirectoryMonitor*) self, file, other_file, event_type); -#line 4606 "DirectoryMonitor.c" +#line 4563 "DirectoryMonitor.c" } -static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { +static gboolean +directory_monitor_add_monitor (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info) +{ gboolean result = FALSE; gboolean _tmp0_; gchar* id = NULL; DirectoryMonitorFileInfoMap* _tmp1_; - GFile* _tmp2_; - GFileInfo* _tmp3_; - gchar* _tmp4_; + gchar* _tmp2_; + const gchar* _tmp3_; + GeeHashMap* _tmp4_; const gchar* _tmp5_; - GeeHashMap* _tmp6_; - const gchar* _tmp7_; - gboolean _tmp8_; GFileMonitor* monitor = NULL; - GeeHashMap* _tmp19_; - const gchar* _tmp20_; - GFileMonitor* _tmp21_; - GFileMonitor* _tmp22_; - GFile* _tmp23_; - gchar* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; - gchar* _tmp27_; + GeeHashMap* _tmp14_; + const gchar* _tmp15_; + GFileMonitor* _tmp16_; + GFileMonitor* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; GError * _inner_error_ = NULL; #line 1014 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); @@ -4647,104 +4604,92 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di result = FALSE; #line 1016 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 4647 "DirectoryMonitor.c" +#line 4604 "DirectoryMonitor.c" } #line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = self->priv->files; #line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = dir; -#line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = info; -#line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = directory_monitor_file_info_map_get_id (_tmp1_, _tmp2_, _tmp3_); + _tmp2_ = directory_monitor_file_info_map_get_id (_tmp1_, dir, info); #line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - id = _tmp4_; + id = _tmp2_; #line 1019 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = id; + _tmp3_ = id; #line 1019 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp5_ == NULL) { + if (_tmp3_ == NULL) { #line 1020 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; #line 1020 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); #line 1020 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 4669 "DirectoryMonitor.c" +#line 4622 "DirectoryMonitor.c" } #line 1023 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = self->priv->monitors; + _tmp4_ = self->priv->monitors; #line 1023 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = id; -#line 1023 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_); + _tmp5_ = id; #line 1023 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp8_) { + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_)) { #line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; #line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); #line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 4685 "DirectoryMonitor.c" +#line 4636 "DirectoryMonitor.c" } #line 1026 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" monitor = NULL; -#line 4689 "DirectoryMonitor.c" +#line 4640 "DirectoryMonitor.c" { - GFileMonitor* _tmp9_ = NULL; - GFile* _tmp10_; - GFileMonitor* _tmp11_; - GFileMonitor* _tmp12_; + GFileMonitor* _tmp6_ = NULL; + GFileMonitor* _tmp7_; + GFileMonitor* _tmp8_; #line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = dir; + _tmp7_ = g_file_monitor_directory (dir, DIRECTORY_MONITOR_FILE_MONITOR_FLAGS, NULL, &_inner_error_); #line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp11_ = g_file_monitor_directory (_tmp10_, DIRECTORY_MONITOR_FILE_MONITOR_FLAGS, NULL, &_inner_error_); -#line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = _tmp11_; + _tmp6_ = _tmp7_; #line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4703 "DirectoryMonitor.c" +#line 4651 "DirectoryMonitor.c" goto __catch492_g_error; } #line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp12_ = _tmp9_; + _tmp8_ = _tmp6_; #line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = NULL; + _tmp6_ = NULL; #line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (monitor); #line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - monitor = _tmp12_; + monitor = _tmp8_; #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_tmp9_); -#line 4716 "DirectoryMonitor.c" + _g_object_unref0 (_tmp6_); +#line 4664 "DirectoryMonitor.c" } goto __finally492; __catch492_g_error: { GError* err = NULL; - GFile* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; - GError* _tmp16_; - const gchar* _tmp17_; + gchar* _tmp9_; + gchar* _tmp10_; + GError* _tmp11_; + const gchar* _tmp12_; #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" err = _inner_error_; #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _inner_error_ = NULL; #line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp13_ = dir; + _tmp9_ = g_file_get_path (dir); #line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp14_ = g_file_get_path (_tmp13_); -#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp15_ = _tmp14_; + _tmp10_ = _tmp9_; #line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp16_ = err; + _tmp11_ = err; #line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp17_ = _tmp16_->message; + _tmp12_ = _tmp11_->message; #line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:1030: Unable to monitor %s: %s", _tmp15_, _tmp17_); + g_warning ("DirectoryMonitor.vala:1030: Unable to monitor %s: %s", _tmp10_, _tmp12_); #line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp10_); #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4755,13 +4700,13 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di _g_free0 (id); #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 4755 "DirectoryMonitor.c" +#line 4700 "DirectoryMonitor.c" } __finally492: #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4760 "DirectoryMonitor.c" - gboolean _tmp18_ = FALSE; +#line 4705 "DirectoryMonitor.c" + gboolean _tmp13_ = FALSE; #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (monitor); #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4771,37 +4716,35 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_clear_error (&_inner_error_); #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - return _tmp18_; -#line 4772 "DirectoryMonitor.c" + return _tmp13_; +#line 4717 "DirectoryMonitor.c" } #line 1035 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp19_ = self->priv->monitors; + _tmp14_ = self->priv->monitors; #line 1035 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp20_ = id; + _tmp15_ = id; #line 1035 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp21_ = monitor; + _tmp16_ = monitor; #line 1035 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_, _tmp21_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_, _tmp16_); #line 1036 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp22_ = monitor; + _tmp17_ = monitor; #line 1036 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_connect_object (_tmp22_, "changed", (GCallback) _directory_monitor_on_monitor_notification_g_file_monitor_changed, self, 0); -#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp23_ = dir; + g_signal_connect_object (_tmp17_, "changed", (GCallback) _directory_monitor_on_monitor_notification_g_file_monitor_changed, self, 0); #line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp24_ = g_file_get_path (_tmp23_); + _tmp18_ = g_file_get_path (dir); #line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp25_ = _tmp24_; + _tmp19_ = _tmp18_; #line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp26_ = g_strdup_printf ("Added monitor for %s", _tmp25_); + _tmp20_ = g_strdup_printf ("Added monitor for %s", _tmp19_); #line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp27_ = _tmp26_; + _tmp21_ = _tmp20_; #line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp27_); + directory_monitor_mdbg (_tmp21_); #line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp27_); + _g_free0 (_tmp21_); #line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp25_); + _g_free0 (_tmp19_); #line 1040 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = TRUE; #line 1040 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4810,35 +4753,36 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di _g_free0 (id); #line 1040 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 4810 "DirectoryMonitor.c" +#line 4753 "DirectoryMonitor.c" } -static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { +static gboolean +directory_monitor_remove_monitor (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info) +{ gboolean result = FALSE; gboolean _tmp0_; gchar* id = NULL; DirectoryMonitorFileInfoMap* _tmp1_; - GFile* _tmp2_; - GFileInfo* _tmp3_; - gchar* _tmp4_; - const gchar* _tmp5_; + gchar* _tmp2_; + const gchar* _tmp3_; GFileMonitor* monitor = NULL; - GeeHashMap* _tmp6_; - const gchar* _tmp7_; - gpointer _tmp8_; - GFileMonitor* _tmp9_; + GeeHashMap* _tmp4_; + const gchar* _tmp5_; + gpointer _tmp6_; + GFileMonitor* _tmp7_; gboolean removed = FALSE; - GeeHashMap* _tmp10_; - const gchar* _tmp11_; - gboolean _tmp12_; - gboolean _tmp13_; - GFileMonitor* _tmp14_; - GFile* _tmp15_; + GeeHashMap* _tmp8_; + const gchar* _tmp9_; + gboolean _tmp10_; + gboolean _tmp11_; + GFileMonitor* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; gchar* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; #line 1044 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); #line 1044 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4853,42 +4797,38 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile* result = FALSE; #line 1046 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 4853 "DirectoryMonitor.c" +#line 4797 "DirectoryMonitor.c" } #line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = self->priv->files; #line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = dir; + _tmp2_ = directory_monitor_file_info_map_get_id (_tmp1_, dir, info); #line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = info; -#line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = directory_monitor_file_info_map_get_id (_tmp1_, _tmp2_, _tmp3_); -#line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - id = _tmp4_; + id = _tmp2_; #line 1049 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = id; + _tmp3_ = id; #line 1049 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp5_ == NULL) { + if (_tmp3_ == NULL) { #line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; #line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); #line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 4875 "DirectoryMonitor.c" +#line 4815 "DirectoryMonitor.c" } #line 1052 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = self->priv->monitors; + _tmp4_ = self->priv->monitors; #line 1052 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = id; + _tmp5_ = id; #line 1052 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_); + _tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_); #line 1052 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - monitor = (GFileMonitor*) _tmp8_; + monitor = (GFileMonitor*) _tmp6_; #line 1053 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = monitor; + _tmp7_ = monitor; #line 1053 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp9_ == NULL) { + if (_tmp7_ == NULL) { #line 1054 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; #line 1054 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4897,40 +4837,38 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile* _g_free0 (id); #line 1054 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 4897 "DirectoryMonitor.c" +#line 4837 "DirectoryMonitor.c" } #line 1056 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = self->priv->monitors; + _tmp8_ = self->priv->monitors; #line 1056 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp11_ = id; + _tmp9_ = id; #line 1056 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp12_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL); + _tmp10_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, NULL); #line 1056 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - removed = _tmp12_; + removed = _tmp10_; #line 1057 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp13_ = removed; + _tmp11_ = removed; #line 1057 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp13_, "removed"); + _vala_assert (_tmp11_, "removed"); #line 1059 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp14_ = monitor; + _tmp12_ = monitor; #line 1059 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_cancel_monitor (self, _tmp14_); + directory_monitor_cancel_monitor (self, _tmp12_); #line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp15_ = dir; + _tmp13_ = g_file_get_path (dir); #line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp16_ = g_file_get_path (_tmp15_); + _tmp14_ = _tmp13_; #line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp17_ = _tmp16_; + _tmp15_ = g_strdup_printf ("Removed monitor for %s", _tmp14_); #line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp18_ = g_strdup_printf ("Removed monitor for %s", _tmp17_); -#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp19_ = _tmp18_; + _tmp16_ = _tmp15_; #line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp19_); + directory_monitor_mdbg (_tmp16_); #line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp19_); + _g_free0 (_tmp16_); #line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp14_); #line 1063 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = TRUE; #line 1063 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4939,68 +4877,69 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile* _g_free0 (id); #line 1063 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 4939 "DirectoryMonitor.c" +#line 4877 "DirectoryMonitor.c" } -static void directory_monitor_cancel_monitor (DirectoryMonitor* self, GFileMonitor* monitor) { - GFileMonitor* _tmp0_; - guint _tmp1_; - GFileMonitor* _tmp2_; +static void +directory_monitor_cancel_monitor (DirectoryMonitor* self, + GFileMonitor* monitor) +{ + guint _tmp0_; #line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_MONITOR (monitor)); #line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = monitor; -#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_parse_name ("changed", g_file_monitor_get_type (), &_tmp1_, NULL, FALSE); + g_signal_parse_name ("changed", g_file_monitor_get_type (), &_tmp0_, NULL, FALSE); #line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _directory_monitor_on_monitor_notification_g_file_monitor_changed, self); + g_signal_handlers_disconnect_matched (monitor, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _directory_monitor_on_monitor_notification_g_file_monitor_changed, self); #line 1068 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = monitor; -#line 1068 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_file_monitor_cancel (_tmp2_); -#line 4961 "DirectoryMonitor.c" + g_file_monitor_cancel (monitor); +#line 4896 "DirectoryMonitor.c" } -static void _directory_monitor_query_info_queue_element_on_completed_gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { +static void +_directory_monitor_query_info_queue_element_on_completed_gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self) +{ #line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_on_completed ((DirectoryMonitorQueryInfoQueueElement*) self, source_object, res); #line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_unref (self); -#line 4970 "DirectoryMonitor.c" +#line 4909 "DirectoryMonitor.c" } -static gboolean _directory_monitor_check_for_expired_delete_events_gsource_func (gpointer self) { +static gboolean +_directory_monitor_check_for_expired_delete_events_gsource_func (gpointer self) +{ gboolean result; result = directory_monitor_check_for_expired_delete_events ((DirectoryMonitor*) self); #line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 4979 "DirectoryMonitor.c" +#line 4920 "DirectoryMonitor.c" } -static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, GFile* file, GFile* other_file, GFileMonitorEvent event) { +static void +directory_monitor_on_monitor_notification (DirectoryMonitor* self, + GFile* file, + GFile* other_file, + GFileMonitorEvent event) +{ gchar* _tmp0_ = NULL; - GFile* _tmp1_; - GFileMonitorEvent _tmp5_; - GEnumValue* _tmp6_; - GFile* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; + GEnumValue* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; DirectoryMonitorQueryInfoQueueElement* query_info = NULL; - GFile* _tmp12_; - GFile* _tmp13_; - GFileMonitorEvent _tmp14_; - DirectoryMonitorQueryInfoQueueElement* _tmp15_; - GeeQueue* _tmp16_; - DirectoryMonitorQueryInfoQueueElement* _tmp17_; - GFileMonitorEvent _tmp18_; + DirectoryMonitorQueryInfoQueueElement* _tmp8_; + GeeQueue* _tmp9_; + DirectoryMonitorQueryInfoQueueElement* _tmp10_; #line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5008,810 +4947,752 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G #line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail ((other_file == NULL) || G_IS_FILE (other_file)); #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = other_file; -#line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp1_ != NULL) { -#line 5011 "DirectoryMonitor.c" - GFile* _tmp2_; - gchar* _tmp3_; + if (other_file != NULL) { +#line 4948 "DirectoryMonitor.c" + gchar* _tmp1_; #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = other_file; -#line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = g_file_get_path (_tmp2_); + _tmp1_ = g_file_get_path (other_file); #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp0_); #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = _tmp3_; -#line 5022 "DirectoryMonitor.c" + _tmp0_ = _tmp1_; +#line 4956 "DirectoryMonitor.c" } else { - gchar* _tmp4_; + gchar* _tmp2_; #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = g_strdup ("(none)"); + _tmp2_ = g_strdup ("(none)"); #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp0_); #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = _tmp4_; -#line 5031 "DirectoryMonitor.c" + _tmp0_ = _tmp2_; +#line 4965 "DirectoryMonitor.c" } #line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = event; + _tmp3_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), event); #line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp5_); + _tmp4_ = g_file_get_path (file); #line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = file; -#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = g_file_get_path (_tmp7_); -#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = _tmp8_; + _tmp5_ = _tmp4_; #line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = g_strdup_printf ("NOTIFY %s: file=%s other_file=%s", (_tmp6_ != NULL) ? _tmp6_->value_name : NULL, _tmp9_, _tmp0_); + _tmp6_ = g_strdup_printf ("NOTIFY %s: file=%s other_file=%s", (_tmp3_ != NULL) ? _tmp3_->value_name : NULL, _tmp5_, _tmp0_); #line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp11_ = _tmp10_; + _tmp7_ = _tmp6_; #line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp11_); + directory_monitor_mdbg (_tmp7_); #line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp7_); #line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp9_); -#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp12_ = file; -#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp13_ = other_file; -#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp14_ = event; + _g_free0 (_tmp5_); #line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp15_ = directory_monitor_query_info_queue_element_new (self, _tmp12_, _tmp13_, _tmp14_); + _tmp8_ = directory_monitor_query_info_queue_element_new (self, file, other_file, event); #line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - query_info = _tmp15_; + query_info = _tmp8_; #line 1083 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp16_ = self->priv->query_info_queue; + _tmp9_ = self->priv->query_info_queue; #line 1083 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp17_ = query_info; + _tmp10_ = query_info; #line 1083 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - gee_queue_offer (_tmp16_, _tmp17_); + gee_queue_offer (_tmp9_, _tmp10_); #line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp18_ = event; -#line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - switch (_tmp18_) { + switch (event) { #line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_CREATED: #line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: -#line 5077 "DirectoryMonitor.c" +#line 4999 "DirectoryMonitor.c" { - GFile* _tmp19_; - GCancellable* _tmp20_; - DirectoryMonitorQueryInfoQueueElement* _tmp21_; -#line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp19_ = file; + GCancellable* _tmp11_; + DirectoryMonitorQueryInfoQueueElement* _tmp12_; #line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp20_ = self->priv->cancellable; + _tmp11_ = self->priv->cancellable; #line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp21_ = query_info; + _tmp12_ = query_info; #line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_file_query_info_async (_tmp19_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _tmp20_, _directory_monitor_query_info_queue_element_on_completed_gasync_ready_callback, directory_monitor_query_info_queue_element_ref (_tmp21_)); + g_file_query_info_async (file, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _tmp11_, _directory_monitor_query_info_queue_element_on_completed_gasync_ready_callback, directory_monitor_query_info_queue_element_ref (_tmp12_)); #line 1090 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5092 "DirectoryMonitor.c" +#line 5011 "DirectoryMonitor.c" } #line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_DELETED: -#line 5096 "DirectoryMonitor.c" +#line 5015 "DirectoryMonitor.c" { - guint _tmp22_; + guint _tmp13_; #line 1096 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp22_ = self->priv->delete_timer_id; + _tmp13_ = self->priv->delete_timer_id; #line 1096 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp22_ == ((guint) 0)) { -#line 5103 "DirectoryMonitor.c" - guint _tmp23_; -#line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp23_ = g_timeout_add_full (G_PRIORITY_DEFAULT, DIRECTORY_MONITOR_DELETED_EXPIRATION_MSEC / 2, _directory_monitor_check_for_expired_delete_events_gsource_func, g_object_ref (self), g_object_unref); + if (_tmp13_ == ((guint) 0)) { #line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - self->priv->delete_timer_id = _tmp23_; -#line 5109 "DirectoryMonitor.c" + self->priv->delete_timer_id = g_timeout_add_full (G_PRIORITY_DEFAULT, DIRECTORY_MONITOR_DELETED_EXPIRATION_MSEC / 2, _directory_monitor_check_for_expired_delete_events_gsource_func, g_object_ref (self), g_object_unref); +#line 5024 "DirectoryMonitor.c" } #line 1098 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5113 "DirectoryMonitor.c" +#line 5028 "DirectoryMonitor.c" } #line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_MOVED: -#line 5117 "DirectoryMonitor.c" +#line 5032 "DirectoryMonitor.c" { - GFile* _tmp24_; #line 1103 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp24_ = other_file; -#line 1103 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp24_ != NULL) { -#line 5124 "DirectoryMonitor.c" - GFile* _tmp25_; - GCancellable* _tmp26_; - DirectoryMonitorQueryInfoQueueElement* _tmp27_; + if (other_file != NULL) { +#line 5036 "DirectoryMonitor.c" + GCancellable* _tmp14_; + DirectoryMonitorQueryInfoQueueElement* _tmp15_; #line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp25_ = other_file; + _tmp14_ = self->priv->cancellable; #line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp26_ = self->priv->cancellable; + _tmp15_ = query_info; #line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp27_ = query_info; -#line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_file_query_info_async (_tmp25_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _tmp26_, _directory_monitor_query_info_queue_element_on_completed_gasync_ready_callback, directory_monitor_query_info_queue_element_ref (_tmp27_)); -#line 5136 "DirectoryMonitor.c" + g_file_query_info_async (other_file, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _tmp14_, _directory_monitor_query_info_queue_element_on_completed_gasync_ready_callback, directory_monitor_query_info_queue_element_ref (_tmp15_)); +#line 5045 "DirectoryMonitor.c" } else { - GeeQueue* _tmp28_; - DirectoryMonitorQueryInfoQueueElement* _tmp29_; + GeeQueue* _tmp16_; + DirectoryMonitorQueryInfoQueueElement* _tmp17_; #line 1107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_warning ("DirectoryMonitor.vala:1107: Unable to process MOVED event: no other_fi" \ "le"); #line 1108 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp28_ = self->priv->query_info_queue; + _tmp16_ = self->priv->query_info_queue; #line 1108 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp29_ = query_info; + _tmp17_ = query_info; #line 1108 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection), _tmp29_); -#line 5148 "DirectoryMonitor.c" + gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_); +#line 5057 "DirectoryMonitor.c" } #line 1110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5152 "DirectoryMonitor.c" +#line 5061 "DirectoryMonitor.c" } default: { - DirectoryMonitorQueryInfoQueueElement* _tmp30_; - DirectoryMonitorQueryInfoQueueElement* _tmp31_; + DirectoryMonitorQueryInfoQueueElement* _tmp18_; + DirectoryMonitorQueryInfoQueueElement* _tmp19_; #line 1114 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp30_ = query_info; + _tmp18_ = query_info; #line 1114 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp30_->completed = TRUE; + _tmp18_->completed = TRUE; #line 1115 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp31_ = query_info; + _tmp19_ = query_info; #line 1115 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_process_query_queue (self, _tmp31_); + directory_monitor_process_query_queue (self, _tmp19_); #line 1116 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5168 "DirectoryMonitor.c" +#line 5077 "DirectoryMonitor.c" } } #line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (query_info); #line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp0_); -#line 5175 "DirectoryMonitor.c" +#line 5084 "DirectoryMonitor.c" } -static void directory_monitor_process_query_queue (DirectoryMonitor* self, DirectoryMonitorQueryInfoQueueElement* query_info) { +static void +directory_monitor_process_query_queue (DirectoryMonitor* self, + DirectoryMonitorQueryInfoQueueElement* query_info) +{ gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - DirectoryMonitorQueryInfoQueueElement* _tmp2_; #line 1120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 1120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail ((query_info == NULL) || DIRECTORY_MONITOR_IS_QUERY_INFO_QUEUE_ELEMENT (query_info)); #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = query_info; -#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp2_ != NULL) { -#line 5191 "DirectoryMonitor.c" - DirectoryMonitorQueryInfoQueueElement* _tmp3_; - GFileInfo* _tmp4_; -#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = query_info; + if (query_info != NULL) { +#line 5100 "DirectoryMonitor.c" + GFileInfo* _tmp2_; #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = _tmp3_->info; + _tmp2_ = query_info->info; #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = _tmp4_ != NULL; -#line 5200 "DirectoryMonitor.c" + _tmp1_ = _tmp2_ != NULL; +#line 5106 "DirectoryMonitor.c" } else { #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = FALSE; -#line 5204 "DirectoryMonitor.c" +#line 5110 "DirectoryMonitor.c" } #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp1_) { -#line 5208 "DirectoryMonitor.c" - DirectoryMonitorQueryInfoQueueElement* _tmp5_; - GFileMonitorEvent _tmp6_; +#line 5114 "DirectoryMonitor.c" + GFileMonitorEvent _tmp3_; #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = query_info; + _tmp3_ = query_info->event; #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = _tmp5_->event; -#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = _tmp6_ == G_FILE_MONITOR_EVENT_CREATED; -#line 5217 "DirectoryMonitor.c" + _tmp0_ = _tmp3_ == G_FILE_MONITOR_EVENT_CREATED; +#line 5120 "DirectoryMonitor.c" } else { #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = FALSE; -#line 5221 "DirectoryMonitor.c" +#line 5124 "DirectoryMonitor.c" } #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp0_) { -#line 5225 "DirectoryMonitor.c" +#line 5128 "DirectoryMonitor.c" GFile* match = NULL; - DirectoryMonitorFileInfoMap* _tmp7_; - DirectoryMonitorQueryInfoQueueElement* _tmp8_; - GFileInfo* _tmp9_; - GFile* _tmp10_; - GFile* _tmp11_; -#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = self->priv->files; + DirectoryMonitorFileInfoMap* _tmp4_; + GFileInfo* _tmp5_; + GFile* _tmp6_; + GFile* _tmp7_; #line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = query_info; + _tmp4_ = self->priv->files; #line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = _tmp8_->info; + _tmp5_ = query_info->info; #line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = directory_monitor_file_info_map_find_match (_tmp7_, _tmp9_); + _tmp6_ = directory_monitor_file_info_map_find_match (_tmp4_, _tmp5_); #line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - match = _tmp10_; + match = _tmp6_; #line 1127 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp11_ = match; + _tmp7_ = match; #line 1127 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp11_ != NULL) { -#line 5246 "DirectoryMonitor.c" + if (_tmp7_ != NULL) { +#line 5146 "DirectoryMonitor.c" gboolean matched = FALSE; - gboolean _tmp48_; + gboolean _tmp39_; #line 1128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" matched = FALSE; -#line 5251 "DirectoryMonitor.c" +#line 5151 "DirectoryMonitor.c" { GeeIterator* _enqueued_it = NULL; - GeeQueue* _tmp12_; - GeeIterator* _tmp13_; + GeeQueue* _tmp8_; + GeeIterator* _tmp9_; #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp12_ = self->priv->query_info_queue; + _tmp8_ = self->priv->query_info_queue; #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _enqueued_it = _tmp13_; + _enqueued_it = _tmp9_; #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 5264 "DirectoryMonitor.c" - GeeIterator* _tmp14_; - gboolean _tmp15_; +#line 5164 "DirectoryMonitor.c" + GeeIterator* _tmp10_; DirectoryMonitorQueryInfoQueueElement* enqueued = NULL; - GeeIterator* _tmp16_; - gpointer _tmp17_; - gboolean _tmp18_ = FALSE; - gboolean _tmp19_ = FALSE; - DirectoryMonitorQueryInfoQueueElement* _tmp20_; - GFileMonitorEvent _tmp21_; - DirectoryMonitorQueryInfoQueueElement* _tmp28_; - GFile* _tmp29_; + GeeIterator* _tmp11_; + gpointer _tmp12_; + gboolean _tmp13_ = FALSE; + gboolean _tmp14_ = FALSE; + DirectoryMonitorQueryInfoQueueElement* _tmp15_; + GFileMonitorEvent _tmp16_; + GFile* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + DirectoryMonitorQueryInfoQueueElement* _tmp25_; + GFile* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; gchar* _tmp30_; - gchar* _tmp31_; + DirectoryMonitorQueryInfoQueueElement* _tmp31_; DirectoryMonitorQueryInfoQueueElement* _tmp32_; GFile* _tmp33_; - gchar* _tmp34_; - gchar* _tmp35_; - gchar* _tmp36_; - gchar* _tmp37_; + GFile* _tmp34_; + DirectoryMonitorQueryInfoQueueElement* _tmp35_; + GFileInfo* _tmp36_; + GFileInfo* _tmp37_; DirectoryMonitorQueryInfoQueueElement* _tmp38_; - DirectoryMonitorQueryInfoQueueElement* _tmp39_; - DirectoryMonitorQueryInfoQueueElement* _tmp40_; - GFile* _tmp41_; - GFile* _tmp42_; - DirectoryMonitorQueryInfoQueueElement* _tmp43_; - DirectoryMonitorQueryInfoQueueElement* _tmp44_; - GFileInfo* _tmp45_; - GFileInfo* _tmp46_; - DirectoryMonitorQueryInfoQueueElement* _tmp47_; -#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp14_ = _enqueued_it; #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp15_ = gee_iterator_next (_tmp14_); + _tmp10_ = _enqueued_it; #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_tmp15_) { + if (!gee_iterator_next (_tmp10_)) { #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5302 "DirectoryMonitor.c" +#line 5196 "DirectoryMonitor.c" } #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp16_ = _enqueued_it; + _tmp11_ = _enqueued_it; #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp17_ = gee_iterator_get (_tmp16_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - enqueued = (DirectoryMonitorQueryInfoQueueElement*) _tmp17_; + enqueued = (DirectoryMonitorQueryInfoQueueElement*) _tmp12_; #line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp20_ = enqueued; + _tmp15_ = enqueued; #line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp21_ = _tmp20_->event; + _tmp16_ = _tmp15_->event; #line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp21_ != G_FILE_MONITOR_EVENT_DELETED) { + if (_tmp16_ != G_FILE_MONITOR_EVENT_DELETED) { #line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp19_ = TRUE; -#line 5318 "DirectoryMonitor.c" + _tmp14_ = TRUE; +#line 5212 "DirectoryMonitor.c" } else { - DirectoryMonitorQueryInfoQueueElement* _tmp22_; - gboolean _tmp23_; + DirectoryMonitorQueryInfoQueueElement* _tmp17_; + gboolean _tmp18_; #line 1131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp22_ = enqueued; + _tmp17_ = enqueued; #line 1131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp23_ = _tmp22_->completed; + _tmp18_ = _tmp17_->completed; #line 1131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp19_ = _tmp23_; -#line 5328 "DirectoryMonitor.c" + _tmp14_ = _tmp18_; +#line 5222 "DirectoryMonitor.c" } #line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp19_) { + if (_tmp14_) { #line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp18_ = TRUE; -#line 5334 "DirectoryMonitor.c" + _tmp13_ = TRUE; +#line 5228 "DirectoryMonitor.c" } else { - GFile* _tmp24_; - DirectoryMonitorQueryInfoQueueElement* _tmp25_; - GFile* _tmp26_; - gboolean _tmp27_; + GFile* _tmp19_; + DirectoryMonitorQueryInfoQueueElement* _tmp20_; + GFile* _tmp21_; #line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp24_ = match; + _tmp19_ = match; #line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp25_ = enqueued; + _tmp20_ = enqueued; #line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp26_ = _tmp25_->file; + _tmp21_ = _tmp20_->file; #line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp27_ = g_file_equal (_tmp24_, _tmp26_); -#line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp18_ = !_tmp27_; -#line 5350 "DirectoryMonitor.c" + _tmp13_ = !g_file_equal (_tmp19_, _tmp21_); +#line 5241 "DirectoryMonitor.c" } #line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp18_) { + if (_tmp13_) { #line 1133 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (enqueued); #line 1133 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 5358 "DirectoryMonitor.c" +#line 5249 "DirectoryMonitor.c" } #line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp28_ = query_info; -#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp29_ = _tmp28_->file; + _tmp22_ = query_info->file; #line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp30_ = g_file_get_path (_tmp29_); + _tmp23_ = g_file_get_path (_tmp22_); #line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp31_ = _tmp30_; + _tmp24_ = _tmp23_; #line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp32_ = enqueued; + _tmp25_ = enqueued; #line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp33_ = _tmp32_->file; + _tmp26_ = _tmp25_->file; #line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp34_ = g_file_get_path (_tmp33_); + _tmp27_ = g_file_get_path (_tmp26_); #line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp35_ = _tmp34_; + _tmp28_ = _tmp27_; #line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp36_ = g_strdup_printf ("Matching CREATED %s to DELETED %s for MOVED", _tmp31_, _tmp35_); + _tmp29_ = g_strdup_printf ("Matching CREATED %s to DELETED %s for MOVED", _tmp24_, _tmp28_); #line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp37_ = _tmp36_; + _tmp30_ = _tmp29_; #line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp37_); + directory_monitor_mdbg (_tmp30_); #line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp37_); + _g_free0 (_tmp30_); #line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp35_); + _g_free0 (_tmp28_); #line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp31_); + _g_free0 (_tmp24_); #line 1139 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp38_ = enqueued; + _tmp31_ = enqueued; #line 1139 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp38_->event = G_FILE_MONITOR_EVENT_MOVED; + _tmp31_->event = G_FILE_MONITOR_EVENT_MOVED; #line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp39_ = enqueued; -#line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp40_ = query_info; + _tmp32_ = enqueued; #line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp41_ = _tmp40_->file; + _tmp33_ = query_info->file; #line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp42_ = _g_object_ref0 (_tmp41_); + _tmp34_ = _g_object_ref0 (_tmp33_); #line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_tmp39_->other_file); + _g_object_unref0 (_tmp32_->other_file); #line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp39_->other_file = _tmp42_; + _tmp32_->other_file = _tmp34_; #line 1141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp43_ = enqueued; + _tmp35_ = enqueued; #line 1141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp44_ = query_info; + _tmp36_ = query_info->info; #line 1141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp45_ = _tmp44_->info; + _tmp37_ = _g_object_ref0 (_tmp36_); #line 1141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp46_ = _g_object_ref0 (_tmp45_); + _g_object_unref0 (_tmp35_->info); #line 1141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_tmp43_->info); -#line 1141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp43_->info = _tmp46_; + _tmp35_->info = _tmp37_; #line 1142 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp47_ = enqueued; + _tmp38_ = enqueued; #line 1142 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp47_->completed = TRUE; + _tmp38_->completed = TRUE; #line 1144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" matched = TRUE; #line 1146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (enqueued); #line 1146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5426 "DirectoryMonitor.c" +#line 5311 "DirectoryMonitor.c" } #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_enqueued_it); -#line 5430 "DirectoryMonitor.c" +#line 5315 "DirectoryMonitor.c" } #line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp48_ = matched; + _tmp39_ = matched; #line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp48_) { -#line 5436 "DirectoryMonitor.c" - GeeQueue* _tmp49_; - DirectoryMonitorQueryInfoQueueElement* _tmp50_; + if (_tmp39_) { +#line 5321 "DirectoryMonitor.c" + GeeQueue* _tmp40_; #line 1150 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp49_ = self->priv->query_info_queue; + _tmp40_ = self->priv->query_info_queue; #line 1150 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp50_ = query_info; -#line 1150 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection), _tmp50_); -#line 5445 "DirectoryMonitor.c" + gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_COLLECTION, GeeCollection), query_info); +#line 5327 "DirectoryMonitor.c" } } #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (match); -#line 5450 "DirectoryMonitor.c" +#line 5332 "DirectoryMonitor.c" } { - gboolean _tmp51_ = FALSE; + gboolean _tmp41_ = FALSE; #line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp51_ = TRUE; + _tmp41_ = TRUE; #line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 5458 "DirectoryMonitor.c" +#line 5340 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement* next = NULL; - GeeQueue* _tmp52_; - gpointer _tmp53_; - gboolean _tmp54_ = FALSE; - DirectoryMonitorQueryInfoQueueElement* _tmp55_; + GeeQueue* _tmp42_; + gpointer _tmp43_; + gboolean _tmp44_ = FALSE; + DirectoryMonitorQueryInfoQueueElement* _tmp45_; DirectoryMonitorQueryInfoQueueElement* n = NULL; - GeeQueue* _tmp58_; - gpointer _tmp59_; - DirectoryMonitorQueryInfoQueueElement* _tmp60_; - DirectoryMonitorQueryInfoQueueElement* _tmp61_; - DirectoryMonitorQueryInfoQueueElement* _tmp62_; - guint _tmp63_; - DirectoryMonitorQueryInfoQueueElement* _tmp64_; - GFileMonitorEvent _tmp65_; - GEnumValue* _tmp66_; - DirectoryMonitorQueryInfoQueueElement* _tmp67_; - GFile* _tmp68_; - gchar* _tmp69_; - gchar* _tmp70_; - gchar* _tmp71_; - gchar* _tmp72_; - DirectoryMonitorQueryInfoQueueElement* _tmp73_; - GError* _tmp74_; - gboolean _tmp87_ = FALSE; - DirectoryMonitorQueryInfoQueueElement* _tmp88_; - GFileInfo* _tmp89_; - gboolean _tmp103_ = FALSE; - DirectoryMonitorQueryInfoQueueElement* _tmp104_; - GFileInfo* _tmp105_; - DirectoryMonitorQueryInfoQueueElement* _tmp118_; - GFile* _tmp119_; - DirectoryMonitorQueryInfoQueueElement* _tmp120_; - GFile* _tmp121_; - DirectoryMonitorQueryInfoQueueElement* _tmp122_; - GFileInfo* _tmp123_; - DirectoryMonitorQueryInfoQueueElement* _tmp124_; - GFileMonitorEvent _tmp125_; + GeeQueue* _tmp48_; + gpointer _tmp49_; + DirectoryMonitorQueryInfoQueueElement* _tmp50_; + DirectoryMonitorQueryInfoQueueElement* _tmp51_; + DirectoryMonitorQueryInfoQueueElement* _tmp52_; + guint _tmp53_; + DirectoryMonitorQueryInfoQueueElement* _tmp54_; + GFileMonitorEvent _tmp55_; + GEnumValue* _tmp56_; + DirectoryMonitorQueryInfoQueueElement* _tmp57_; + GFile* _tmp58_; + gchar* _tmp59_; + gchar* _tmp60_; + gchar* _tmp61_; + gchar* _tmp62_; + DirectoryMonitorQueryInfoQueueElement* _tmp63_; + GError* _tmp64_; + gboolean _tmp77_ = FALSE; + DirectoryMonitorQueryInfoQueueElement* _tmp78_; + GFileInfo* _tmp79_; + gboolean _tmp93_ = FALSE; + DirectoryMonitorQueryInfoQueueElement* _tmp94_; + GFileInfo* _tmp95_; + DirectoryMonitorQueryInfoQueueElement* _tmp107_; + GFile* _tmp108_; + DirectoryMonitorQueryInfoQueueElement* _tmp109_; + GFile* _tmp110_; + DirectoryMonitorQueryInfoQueueElement* _tmp111_; + GFileInfo* _tmp112_; + DirectoryMonitorQueryInfoQueueElement* _tmp113_; + GFileMonitorEvent _tmp114_; #line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_tmp51_) { -#line 5498 "DirectoryMonitor.c" + if (!_tmp41_) { +#line 5380 "DirectoryMonitor.c" } #line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp51_ = FALSE; + _tmp41_ = FALSE; #line 1157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp52_ = self->priv->query_info_queue; + _tmp42_ = self->priv->query_info_queue; #line 1157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp53_ = gee_queue_peek (_tmp52_); + _tmp43_ = gee_queue_peek (_tmp42_); #line 1157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - next = (DirectoryMonitorQueryInfoQueueElement*) _tmp53_; + next = (DirectoryMonitorQueryInfoQueueElement*) _tmp43_; #line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp55_ = next; + _tmp45_ = next; #line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp55_ == NULL) { + if (_tmp45_ == NULL) { #line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp54_ = TRUE; -#line 5514 "DirectoryMonitor.c" + _tmp44_ = TRUE; +#line 5396 "DirectoryMonitor.c" } else { - DirectoryMonitorQueryInfoQueueElement* _tmp56_; - gboolean _tmp57_; + DirectoryMonitorQueryInfoQueueElement* _tmp46_; + gboolean _tmp47_; #line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp56_ = next; + _tmp46_ = next; #line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp57_ = _tmp56_->completed; + _tmp47_ = _tmp46_->completed; #line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp54_ = !_tmp57_; -#line 5524 "DirectoryMonitor.c" + _tmp44_ = !_tmp47_; +#line 5406 "DirectoryMonitor.c" } #line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp54_) { + if (_tmp44_) { #line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (next); #line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5532 "DirectoryMonitor.c" +#line 5414 "DirectoryMonitor.c" } #line 1162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp58_ = self->priv->query_info_queue; + _tmp48_ = self->priv->query_info_queue; #line 1162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp59_ = gee_queue_poll (_tmp58_); + _tmp49_ = gee_queue_poll (_tmp48_); #line 1162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - n = (DirectoryMonitorQueryInfoQueueElement*) _tmp59_; + n = (DirectoryMonitorQueryInfoQueueElement*) _tmp49_; #line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp60_ = next; + _tmp50_ = next; #line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp61_ = n; + _tmp51_ = n; #line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp60_ == _tmp61_, "next == n"); + _vala_assert (_tmp50_ == _tmp51_, "next == n"); #line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp62_ = next; + _tmp52_ = next; #line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp63_ = _tmp62_->position; + _tmp53_ = _tmp52_->position; #line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp64_ = next; + _tmp54_ = next; #line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp65_ = _tmp64_->event; + _tmp55_ = _tmp54_->event; #line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp66_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp65_); + _tmp56_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp55_); #line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp67_ = next; + _tmp57_ = next; #line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp68_ = _tmp67_->file; + _tmp58_ = _tmp57_->file; #line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp69_ = g_file_get_path (_tmp68_); + _tmp59_ = g_file_get_path (_tmp58_); #line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp70_ = _tmp69_; + _tmp60_ = _tmp59_; #line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp71_ = g_strdup_printf ("Completed info query %u for %s on %s", _tmp63_, (_tmp66_ != NULL) ? _tmp66_->value_name : NULL, _tmp70_); + _tmp61_ = g_strdup_printf ("Completed info query %u for %s on %s", _tmp53_, (_tmp56_ != NULL) ? _tmp56_->value_name : NULL, _tmp60_); #line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp72_ = _tmp71_; + _tmp62_ = _tmp61_; #line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp72_); + directory_monitor_mdbg (_tmp62_); #line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp72_); + _g_free0 (_tmp62_); #line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp70_); + _g_free0 (_tmp60_); #line 1168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp73_ = next; + _tmp63_ = next; #line 1168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp74_ = _tmp73_->err; + _tmp64_ = _tmp63_->err; #line 1168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp74_ != NULL) { -#line 5580 "DirectoryMonitor.c" - DirectoryMonitorQueryInfoQueueElement* _tmp75_; - GFile* _tmp76_; - gchar* _tmp77_; - gchar* _tmp78_; - DirectoryMonitorQueryInfoQueueElement* _tmp79_; - GFileMonitorEvent _tmp80_; - GEnumValue* _tmp81_; - DirectoryMonitorQueryInfoQueueElement* _tmp82_; - GError* _tmp83_; - const gchar* _tmp84_; - gchar* _tmp85_; - gchar* _tmp86_; + if (_tmp64_ != NULL) { +#line 5462 "DirectoryMonitor.c" + DirectoryMonitorQueryInfoQueueElement* _tmp65_; + GFile* _tmp66_; + gchar* _tmp67_; + gchar* _tmp68_; + DirectoryMonitorQueryInfoQueueElement* _tmp69_; + GFileMonitorEvent _tmp70_; + GEnumValue* _tmp71_; + DirectoryMonitorQueryInfoQueueElement* _tmp72_; + GError* _tmp73_; + const gchar* _tmp74_; + gchar* _tmp75_; + gchar* _tmp76_; #line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp75_ = next; + _tmp65_ = next; #line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp76_ = _tmp75_->file; + _tmp66_ = _tmp65_->file; #line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp77_ = g_file_get_path (_tmp76_); + _tmp67_ = g_file_get_path (_tmp66_); #line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp78_ = _tmp77_; + _tmp68_ = _tmp67_; #line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp79_ = next; + _tmp69_ = next; #line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp80_ = _tmp79_->event; + _tmp70_ = _tmp69_->event; #line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp81_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp80_); + _tmp71_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp70_); #line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp82_ = next; + _tmp72_ = next; #line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp83_ = _tmp82_->err; + _tmp73_ = _tmp72_->err; #line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp84_ = _tmp83_->message; + _tmp74_ = _tmp73_->message; #line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp85_ = g_strdup_printf ("Unable to retrieve file information for %s, dropping %s: %s", _tmp78_, (_tmp81_ != NULL) ? _tmp81_->value_name : NULL, _tmp84_); + _tmp75_ = g_strdup_printf ("Unable to retrieve file information for %s, dropping %s: %s", _tmp68_, (_tmp71_ != NULL) ? _tmp71_->value_name : NULL, _tmp74_); #line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp86_ = _tmp85_; + _tmp76_ = _tmp75_; #line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp86_); + directory_monitor_mdbg (_tmp76_); #line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp86_); + _g_free0 (_tmp76_); #line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp78_); + _g_free0 (_tmp68_); #line 1172 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (n); #line 1172 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (next); #line 1172 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 5629 "DirectoryMonitor.c" +#line 5511 "DirectoryMonitor.c" } #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp88_ = next; + _tmp78_ = next; #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp89_ = _tmp88_->info; + _tmp79_ = _tmp78_->info; #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp89_ != NULL) { -#line 5637 "DirectoryMonitor.c" - DirectoryMonitorQueryInfoQueueElement* _tmp90_; - GFileInfo* _tmp91_; - gchar* _tmp92_; - gchar* _tmp93_; + if (_tmp79_ != NULL) { +#line 5519 "DirectoryMonitor.c" + DirectoryMonitorQueryInfoQueueElement* _tmp80_; + GFileInfo* _tmp81_; + gchar* _tmp82_; + gchar* _tmp83_; #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp90_ = next; + _tmp80_ = next; #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp91_ = _tmp90_->info; + _tmp81_ = _tmp80_->info; #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp92_ = get_file_info_id (_tmp91_); + _tmp82_ = get_file_info_id (_tmp81_); #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp93_ = _tmp92_; + _tmp83_ = _tmp82_; #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp87_ = _tmp93_ == NULL; + _tmp77_ = _tmp83_ == NULL; #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp93_); -#line 5654 "DirectoryMonitor.c" + _g_free0 (_tmp83_); +#line 5536 "DirectoryMonitor.c" } else { #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp87_ = FALSE; -#line 5658 "DirectoryMonitor.c" + _tmp77_ = FALSE; +#line 5540 "DirectoryMonitor.c" } #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp87_) { -#line 5662 "DirectoryMonitor.c" - DirectoryMonitorQueryInfoQueueElement* _tmp94_; - GFile* _tmp95_; - gchar* _tmp96_; - gchar* _tmp97_; - DirectoryMonitorQueryInfoQueueElement* _tmp98_; - GFileMonitorEvent _tmp99_; - GEnumValue* _tmp100_; - gchar* _tmp101_; - gchar* _tmp102_; + if (_tmp77_) { +#line 5544 "DirectoryMonitor.c" + DirectoryMonitorQueryInfoQueueElement* _tmp84_; + GFile* _tmp85_; + gchar* _tmp86_; + gchar* _tmp87_; + DirectoryMonitorQueryInfoQueueElement* _tmp88_; + GFileMonitorEvent _tmp89_; + GEnumValue* _tmp90_; + gchar* _tmp91_; + gchar* _tmp92_; #line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp94_ = next; + _tmp84_ = next; #line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp95_ = _tmp94_->file; + _tmp85_ = _tmp84_->file; #line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp96_ = g_file_get_path (_tmp95_); + _tmp86_ = g_file_get_path (_tmp85_); #line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp97_ = _tmp96_; + _tmp87_ = _tmp86_; #line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp98_ = next; + _tmp88_ = next; #line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp99_ = _tmp98_->event; + _tmp89_ = _tmp88_->event; #line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp100_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp99_); + _tmp90_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp89_); #line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp101_ = g_strdup_printf ("Unable to retrieve file ID for %s, dropping %s", _tmp97_, (_tmp100_ != NULL) ? _tmp100_->value_name : NULL); + _tmp91_ = g_strdup_printf ("Unable to retrieve file ID for %s, dropping %s", _tmp87_, (_tmp90_ != NULL) ? _tmp90_->value_name : NULL); #line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp102_ = _tmp101_; + _tmp92_ = _tmp91_; #line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp102_); + directory_monitor_mdbg (_tmp92_); #line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp102_); + _g_free0 (_tmp92_); #line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp97_); + _g_free0 (_tmp87_); #line 1180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (n); #line 1180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (next); #line 1180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 5702 "DirectoryMonitor.c" +#line 5584 "DirectoryMonitor.c" } #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp104_ = next; -#line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp105_ = _tmp104_->info; + _tmp94_ = next; #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp105_ != NULL) { -#line 5710 "DirectoryMonitor.c" - DirectoryMonitorQueryInfoQueueElement* _tmp106_; - GFileInfo* _tmp107_; - gboolean _tmp108_; + _tmp95_ = _tmp94_->info; #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp106_ = next; + if (_tmp95_ != NULL) { +#line 5592 "DirectoryMonitor.c" + DirectoryMonitorQueryInfoQueueElement* _tmp96_; + GFileInfo* _tmp97_; #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp107_ = _tmp106_->info; + _tmp96_ = next; #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp108_ = directory_monitor_is_file_symlink_supported (_tmp107_); + _tmp97_ = _tmp96_->info; #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp103_ = !_tmp108_; -#line 5722 "DirectoryMonitor.c" + _tmp93_ = !directory_monitor_is_file_symlink_supported (_tmp97_); +#line 5601 "DirectoryMonitor.c" } else { #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp103_ = FALSE; -#line 5726 "DirectoryMonitor.c" + _tmp93_ = FALSE; +#line 5605 "DirectoryMonitor.c" } #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp103_) { -#line 5730 "DirectoryMonitor.c" - DirectoryMonitorQueryInfoQueueElement* _tmp109_; - GFile* _tmp110_; - gchar* _tmp111_; - gchar* _tmp112_; - DirectoryMonitorQueryInfoQueueElement* _tmp113_; - GFileMonitorEvent _tmp114_; - GEnumValue* _tmp115_; - gchar* _tmp116_; - gchar* _tmp117_; + if (_tmp93_) { +#line 5609 "DirectoryMonitor.c" + DirectoryMonitorQueryInfoQueueElement* _tmp98_; + GFile* _tmp99_; + gchar* _tmp100_; + gchar* _tmp101_; + DirectoryMonitorQueryInfoQueueElement* _tmp102_; + GFileMonitorEvent _tmp103_; + GEnumValue* _tmp104_; + gchar* _tmp105_; + gchar* _tmp106_; #line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp109_ = next; + _tmp98_ = next; #line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp110_ = _tmp109_->file; + _tmp99_ = _tmp98_->file; #line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp111_ = g_file_get_path (_tmp110_); + _tmp100_ = g_file_get_path (_tmp99_); #line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp112_ = _tmp111_; + _tmp101_ = _tmp100_; #line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp113_ = next; + _tmp102_ = next; #line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp114_ = _tmp113_->event; + _tmp103_ = _tmp102_->event; #line 1186 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp115_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp114_); + _tmp104_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp103_); #line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp116_ = g_strdup_printf ("No symlink support for %s, dropping %s", _tmp112_, (_tmp115_ != NULL) ? _tmp115_->value_name : NULL); + _tmp105_ = g_strdup_printf ("No symlink support for %s, dropping %s", _tmp101_, (_tmp104_ != NULL) ? _tmp104_->value_name : NULL); #line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp117_ = _tmp116_; + _tmp106_ = _tmp105_; #line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp117_); + directory_monitor_mdbg (_tmp106_); #line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp117_); + _g_free0 (_tmp106_); #line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp112_); + _g_free0 (_tmp101_); #line 1188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (n); #line 1188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (next); #line 1188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 5770 "DirectoryMonitor.c" +#line 5649 "DirectoryMonitor.c" } #line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp118_ = next; + _tmp107_ = next; #line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp119_ = _tmp118_->file; + _tmp108_ = _tmp107_->file; #line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp120_ = next; + _tmp109_ = next; #line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp121_ = _tmp120_->other_file; + _tmp110_ = _tmp109_->other_file; #line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp122_ = next; + _tmp111_ = next; #line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp123_ = _tmp122_->info; + _tmp112_ = _tmp111_->info; #line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp124_ = next; + _tmp113_ = next; #line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp125_ = _tmp124_->event; + _tmp114_ = _tmp113_->event; #line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_on_monitor_notification_ready (self, _tmp119_, _tmp121_, _tmp123_, _tmp125_); + directory_monitor_on_monitor_notification_ready (self, _tmp108_, _tmp110_, _tmp112_, _tmp114_); #line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (n); #line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (next); -#line 5794 "DirectoryMonitor.c" +#line 5673 "DirectoryMonitor.c" } } } -static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* self, GFile* file, GFile* other_file, GFileInfo* info, GFileMonitorEvent event) { +static void +directory_monitor_on_monitor_notification_ready (DirectoryMonitor* self, + GFile* file, + GFile* other_file, + GFileInfo* info, + GFileMonitorEvent event) +{ gchar* _tmp0_ = NULL; - GFile* _tmp1_; - GFileMonitorEvent _tmp5_; - GEnumValue* _tmp6_; - GFile* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; - GFileMonitorEvent _tmp12_; + GEnumValue* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; #line 1195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 1195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5821,678 +5702,537 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s #line 1195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail ((info == NULL) || G_IS_FILE_INFO (info)); #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = other_file; -#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp1_ != NULL) { -#line 5823 "DirectoryMonitor.c" - GFile* _tmp2_; - gchar* _tmp3_; -#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = other_file; + if (other_file != NULL) { +#line 5702 "DirectoryMonitor.c" + gchar* _tmp1_; #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = g_file_get_path (_tmp2_); + _tmp1_ = g_file_get_path (other_file); #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp0_); #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = _tmp3_; -#line 5834 "DirectoryMonitor.c" + _tmp0_ = _tmp1_; +#line 5710 "DirectoryMonitor.c" } else { - gchar* _tmp4_; + gchar* _tmp2_; #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = g_strdup ("(null)"); + _tmp2_ = g_strdup ("(null)"); #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp0_); #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = _tmp4_; -#line 5843 "DirectoryMonitor.c" + _tmp0_ = _tmp2_; +#line 5719 "DirectoryMonitor.c" } #line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = event; + _tmp3_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), event); #line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp5_); + _tmp4_ = g_file_get_path (file); #line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = file; -#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = g_file_get_path (_tmp7_); -#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = _tmp8_; + _tmp5_ = _tmp4_; #line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = g_strdup_printf ("READY %s: file=%s other_file=%s", (_tmp6_ != NULL) ? _tmp6_->value_name : NULL, _tmp9_, _tmp0_); + _tmp6_ = g_strdup_printf ("READY %s: file=%s other_file=%s", (_tmp3_ != NULL) ? _tmp3_->value_name : NULL, _tmp5_, _tmp0_); #line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp11_ = _tmp10_; + _tmp7_ = _tmp6_; #line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp11_); + directory_monitor_mdbg (_tmp7_); #line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp7_); #line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp9_); -#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp12_ = event; + _g_free0 (_tmp5_); #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - switch (_tmp12_) { + switch (event) { #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_CREATED: -#line 5871 "DirectoryMonitor.c" +#line 5741 "DirectoryMonitor.c" { - GFileInfo* _tmp13_; DirectoryMonitorFType ftype = 0; - GFileInfo* _tmp14_; - DirectoryMonitorFType _tmp15_; - DirectoryMonitorFType _tmp16_; + DirectoryMonitorFType _tmp8_; #line 1204 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp13_ = info; -#line 1204 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp13_ != NULL, "info != null"); -#line 1206 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp14_ = info; + _vala_assert (info != NULL, "info != null"); #line 1206 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp15_ = directory_monitor_get_ftype (_tmp14_); -#line 1206 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ftype = _tmp15_; + ftype = directory_monitor_get_ftype (info); #line 1207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp16_ = ftype; + _tmp8_ = ftype; #line 1207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - switch (_tmp16_) { + switch (_tmp8_) { #line 1207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 5894 "DirectoryMonitor.c" +#line 5755 "DirectoryMonitor.c" { - GFile* _tmp17_; - GFileInfo* _tmp18_; #line 1209 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp17_ = file; -#line 1209 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp18_ = info; -#line 1209 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_internal_notify_file_created (self, _tmp17_, _tmp18_); + directory_monitor_internal_notify_file_created (self, file, info); #line 1210 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5906 "DirectoryMonitor.c" +#line 5761 "DirectoryMonitor.c" } #line 1207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 5910 "DirectoryMonitor.c" +#line 5765 "DirectoryMonitor.c" { - gint _tmp19_; - GFile* _tmp20_; - GFileInfo* _tmp21_; + gint _tmp9_; #line 1217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp19_ = self->priv->outstanding_exploration_dirs; + _tmp9_ = self->priv->outstanding_exploration_dirs; #line 1217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - self->priv->outstanding_exploration_dirs = _tmp19_ + 1; -#line 1218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp20_ = file; -#line 1218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp21_ = info; + self->priv->outstanding_exploration_dirs = _tmp9_ + 1; #line 1218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_explore_async (self, _tmp20_, _tmp21_, FALSE, NULL, NULL); + directory_monitor_explore_async (self, file, info, FALSE, NULL, NULL); #line 1219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5927 "DirectoryMonitor.c" +#line 5776 "DirectoryMonitor.c" } default: { - DirectoryMonitorFType _tmp22_; + DirectoryMonitorFType _tmp10_; #line 1222 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp22_ = ftype; + _tmp10_ = ftype; #line 1222 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp22_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); + _vala_assert (_tmp10_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 1223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5938 "DirectoryMonitor.c" +#line 5787 "DirectoryMonitor.c" } } #line 1225 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5943 "DirectoryMonitor.c" +#line 5792 "DirectoryMonitor.c" } #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_CHANGED: -#line 5947 "DirectoryMonitor.c" +#line 5796 "DirectoryMonitor.c" { - GFileInfo* _tmp23_; GFileInfo* local_info = NULL; - GFile* _tmp24_; - GFileInfo* _tmp25_; - GFileInfo* _tmp26_; + GFileInfo* _tmp11_; + GFileInfo* _tmp12_; DirectoryMonitorFType ftype = 0; - GFileInfo* _tmp32_; - DirectoryMonitorFType _tmp33_; - DirectoryMonitorFType _tmp34_; + GFileInfo* _tmp17_; + DirectoryMonitorFType _tmp18_; #line 1229 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp23_ = info; -#line 1229 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp23_ == NULL, "info == null"); -#line 1231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp24_ = file; + _vala_assert (info == NULL, "info == null"); #line 1231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp25_ = directory_monitor_get_file_info (self, _tmp24_); + _tmp11_ = directory_monitor_get_file_info (self, file); #line 1231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - local_info = _tmp25_; + local_info = _tmp11_; #line 1232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp26_ = local_info; + _tmp12_ = local_info; #line 1232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp26_ == NULL) { -#line 5972 "DirectoryMonitor.c" - GFile* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; - gchar* _tmp30_; - gchar* _tmp31_; + if (_tmp12_ == NULL) { +#line 5814 "DirectoryMonitor.c" + gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; #line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp27_ = file; + _tmp13_ = g_file_get_path (file); #line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp28_ = g_file_get_path (_tmp27_); + _tmp14_ = _tmp13_; #line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp29_ = _tmp28_; + _tmp15_ = g_strdup_printf ("Changed event for unknown file %s", _tmp14_); #line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp30_ = g_strdup_printf ("Changed event for unknown file %s", _tmp29_); + _tmp16_ = _tmp15_; #line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp31_ = _tmp30_; + directory_monitor_mdbg (_tmp16_); #line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp31_); + _g_free0 (_tmp16_); #line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp31_); -#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp29_); + _g_free0 (_tmp14_); #line 1235 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); #line 1235 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5998 "DirectoryMonitor.c" +#line 5837 "DirectoryMonitor.c" } #line 1238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp32_ = local_info; -#line 1238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp33_ = directory_monitor_get_ftype (_tmp32_); + _tmp17_ = local_info; #line 1238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ftype = _tmp33_; + ftype = directory_monitor_get_ftype (_tmp17_); #line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp34_ = ftype; + _tmp18_ = ftype; #line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - switch (_tmp34_) { + switch (_tmp18_) { #line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6012 "DirectoryMonitor.c" +#line 5849 "DirectoryMonitor.c" { - GFile* _tmp35_; #line 1241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp35_ = file; -#line 1241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_file_altered (self, _tmp35_); + directory_monitor_notify_file_altered (self, file); #line 1242 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6021 "DirectoryMonitor.c" +#line 5855 "DirectoryMonitor.c" } #line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6025 "DirectoryMonitor.c" +#line 5859 "DirectoryMonitor.c" { - GFile* _tmp36_; -#line 1245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp36_ = file; #line 1245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_directory_altered (self, _tmp36_); + directory_monitor_notify_directory_altered (self, file); #line 1246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6034 "DirectoryMonitor.c" +#line 5865 "DirectoryMonitor.c" } default: { - DirectoryMonitorFType _tmp37_; + DirectoryMonitorFType _tmp19_; #line 1249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp37_ = ftype; + _tmp19_ = ftype; #line 1249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp37_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); + _vala_assert (_tmp19_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 1250 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6045 "DirectoryMonitor.c" +#line 5876 "DirectoryMonitor.c" } } #line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); #line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6052 "DirectoryMonitor.c" +#line 5883 "DirectoryMonitor.c" } #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: -#line 6056 "DirectoryMonitor.c" +#line 5887 "DirectoryMonitor.c" { - GFileInfo* _tmp38_; DirectoryMonitorFType ftype = 0; - GFileInfo* _tmp39_; - DirectoryMonitorFType _tmp40_; - DirectoryMonitorFType _tmp41_; -#line 1255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp38_ = info; + DirectoryMonitorFType _tmp20_; #line 1255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp38_ != NULL, "info != null"); -#line 1257 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp39_ = info; -#line 1257 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp40_ = directory_monitor_get_ftype (_tmp39_); + _vala_assert (info != NULL, "info != null"); #line 1257 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ftype = _tmp40_; + ftype = directory_monitor_get_ftype (info); #line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp41_ = ftype; + _tmp20_ = ftype; #line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - switch (_tmp41_) { + switch (_tmp20_) { #line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6079 "DirectoryMonitor.c" +#line 5901 "DirectoryMonitor.c" { - GFile* _tmp42_; - GFileInfo* _tmp43_; #line 1260 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp42_ = file; -#line 1260 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp43_ = info; -#line 1260 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_internal_notify_file_alteration_completed (self, _tmp42_, _tmp43_); + directory_monitor_internal_notify_file_alteration_completed (self, file, info); #line 1261 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6091 "DirectoryMonitor.c" +#line 5907 "DirectoryMonitor.c" } #line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6095 "DirectoryMonitor.c" +#line 5911 "DirectoryMonitor.c" { - GFile* _tmp44_; - GFileInfo* _tmp45_; -#line 1264 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp44_ = file; -#line 1264 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp45_ = info; #line 1264 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_internal_notify_directory_alteration_completed (self, _tmp44_, _tmp45_); + directory_monitor_internal_notify_directory_alteration_completed (self, file, info); #line 1265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6107 "DirectoryMonitor.c" +#line 5917 "DirectoryMonitor.c" } default: { - DirectoryMonitorFType _tmp46_; + DirectoryMonitorFType _tmp21_; #line 1268 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp46_ = ftype; + _tmp21_ = ftype; #line 1268 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp46_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); + _vala_assert (_tmp21_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 1269 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6118 "DirectoryMonitor.c" +#line 5928 "DirectoryMonitor.c" } } #line 1271 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6123 "DirectoryMonitor.c" +#line 5933 "DirectoryMonitor.c" } #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_MOVED: -#line 6127 "DirectoryMonitor.c" +#line 5937 "DirectoryMonitor.c" { - GFileInfo* _tmp47_; - GFile* _tmp48_; DirectoryMonitorFType ftype = 0; - GFileInfo* _tmp49_; - DirectoryMonitorFType _tmp50_; - DirectoryMonitorFType _tmp51_; -#line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp47_ = info; + DirectoryMonitorFType _tmp22_; #line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp47_ != NULL, "info != null"); + _vala_assert (info != NULL, "info != null"); #line 1275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp48_ = other_file; -#line 1275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp48_ != NULL, "other_file != null"); -#line 1279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp49_ = info; + _vala_assert (other_file != NULL, "other_file != null"); #line 1279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp50_ = directory_monitor_get_ftype (_tmp49_); -#line 1279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ftype = _tmp50_; + ftype = directory_monitor_get_ftype (info); #line 1280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp51_ = ftype; + _tmp22_ = ftype; #line 1280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - switch (_tmp51_) { + switch (_tmp22_) { #line 1280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6155 "DirectoryMonitor.c" +#line 5953 "DirectoryMonitor.c" { - GFile* _tmp52_; - GFile* _tmp53_; - GFileInfo* _tmp54_; -#line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp52_ = file; -#line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp53_ = other_file; -#line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp54_ = info; #line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_internal_notify_file_moved (self, _tmp52_, _tmp53_, _tmp54_); + directory_monitor_internal_notify_file_moved (self, file, other_file, info); #line 1283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6170 "DirectoryMonitor.c" +#line 5959 "DirectoryMonitor.c" } #line 1280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6174 "DirectoryMonitor.c" +#line 5963 "DirectoryMonitor.c" { GFileInfo* old_dir_info = NULL; - DirectoryMonitorFileInfoMap* _tmp55_; - GFile* _tmp56_; - GFileInfo* _tmp57_; - GFileInfo* _tmp58_; - GFile* _tmp62_; - GFileInfo* _tmp63_; - GFile* _tmp64_; - GFileInfo* _tmp65_; -#line 1287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp55_ = self->priv->files; + DirectoryMonitorFileInfoMap* _tmp23_; + GFileInfo* _tmp24_; + GFileInfo* _tmp25_; + GFileInfo* _tmp28_; #line 1287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp56_ = file; + _tmp23_ = self->priv->files; #line 1287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp57_ = directory_monitor_file_info_map_get_info (_tmp55_, _tmp56_); + _tmp24_ = directory_monitor_file_info_map_get_info (_tmp23_, file); #line 1287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - old_dir_info = _tmp57_; + old_dir_info = _tmp24_; #line 1288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp58_ = old_dir_info; + _tmp25_ = old_dir_info; #line 1288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp58_ == NULL) { -#line 6197 "DirectoryMonitor.c" - GFile* _tmp59_; - gchar* _tmp60_; - gchar* _tmp61_; -#line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp59_ = file; + if (_tmp25_ == NULL) { +#line 5980 "DirectoryMonitor.c" + gchar* _tmp26_; + gchar* _tmp27_; #line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp60_ = g_file_get_path (_tmp59_); + _tmp26_ = g_file_get_path (file); #line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp61_ = _tmp60_; + _tmp27_ = _tmp26_; #line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:1289: Directory moved event for unknown file %s", _tmp61_); + g_warning ("DirectoryMonitor.vala:1289: Directory moved event for unknown file %s", _tmp27_); #line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp61_); + _g_free0 (_tmp27_); #line 1291 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_dir_info); #line 1291 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6215 "DirectoryMonitor.c" +#line 5995 "DirectoryMonitor.c" } #line 1294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp62_ = file; + _tmp28_ = old_dir_info; #line 1294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp63_ = old_dir_info; -#line 1294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp64_ = other_file; -#line 1294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp65_ = info; -#line 1294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_internal_notify_directory_moved (self, _tmp62_, _tmp63_, _tmp64_, _tmp65_); + directory_monitor_internal_notify_directory_moved (self, file, _tmp28_, other_file, info); #line 1295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_dir_info); #line 1295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6231 "DirectoryMonitor.c" +#line 6005 "DirectoryMonitor.c" } default: { - DirectoryMonitorFType _tmp66_; + DirectoryMonitorFType _tmp29_; #line 1298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp66_ = ftype; + _tmp29_ = ftype; #line 1298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp66_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); + _vala_assert (_tmp29_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 1299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6242 "DirectoryMonitor.c" +#line 6016 "DirectoryMonitor.c" } } #line 1301 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6247 "DirectoryMonitor.c" +#line 6021 "DirectoryMonitor.c" } #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_DELETED: -#line 6251 "DirectoryMonitor.c" +#line 6025 "DirectoryMonitor.c" { - GFileInfo* _tmp67_; GFileInfo* local_info = NULL; - GFile* _tmp68_; - GFileInfo* _tmp69_; - GFileInfo* _tmp70_; + GFileInfo* _tmp30_; + GFileInfo* _tmp31_; DirectoryMonitorFType ftype = 0; - GFileInfo* _tmp74_; - DirectoryMonitorFType _tmp75_; - DirectoryMonitorFType _tmp76_; + GFileInfo* _tmp34_; + DirectoryMonitorFType _tmp35_; #line 1304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp67_ = info; -#line 1304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp67_ == NULL, "info == null"); -#line 1306 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp68_ = file; + _vala_assert (info == NULL, "info == null"); #line 1306 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp69_ = directory_monitor_get_file_info (self, _tmp68_); + _tmp30_ = directory_monitor_get_file_info (self, file); #line 1306 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - local_info = _tmp69_; + local_info = _tmp30_; #line 1307 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp70_ = local_info; + _tmp31_ = local_info; #line 1307 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp70_ == NULL) { -#line 6276 "DirectoryMonitor.c" - GFile* _tmp71_; - gchar* _tmp72_; - gchar* _tmp73_; + if (_tmp31_ == NULL) { +#line 6043 "DirectoryMonitor.c" + gchar* _tmp32_; + gchar* _tmp33_; #line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp71_ = file; + _tmp32_ = g_file_get_path (file); #line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp72_ = g_file_get_path (_tmp71_); + _tmp33_ = _tmp32_; #line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp73_ = _tmp72_; + g_warning ("DirectoryMonitor.vala:1308: Deleted event for unknown file %s", _tmp33_); #line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:1308: Deleted event for unknown file %s", _tmp73_); -#line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp73_); + _g_free0 (_tmp33_); #line 1310 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); #line 1310 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6294 "DirectoryMonitor.c" +#line 6058 "DirectoryMonitor.c" } #line 1313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp74_ = local_info; -#line 1313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp75_ = directory_monitor_get_ftype (_tmp74_); + _tmp34_ = local_info; #line 1313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ftype = _tmp75_; + ftype = directory_monitor_get_ftype (_tmp34_); #line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp76_ = ftype; + _tmp35_ = ftype; #line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - switch (_tmp76_) { + switch (_tmp35_) { #line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6308 "DirectoryMonitor.c" +#line 6070 "DirectoryMonitor.c" { - GFile* _tmp77_; #line 1316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp77_ = file; -#line 1316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_internal_notify_file_deleted (self, _tmp77_); + directory_monitor_internal_notify_file_deleted (self, file); #line 1317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6317 "DirectoryMonitor.c" +#line 6076 "DirectoryMonitor.c" } #line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6321 "DirectoryMonitor.c" +#line 6080 "DirectoryMonitor.c" { - GFile* _tmp78_; -#line 1320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp78_ = file; #line 1320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_internal_notify_directory_deleted (self, _tmp78_); + directory_monitor_internal_notify_directory_deleted (self, file); #line 1321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6330 "DirectoryMonitor.c" +#line 6086 "DirectoryMonitor.c" } default: { - DirectoryMonitorFType _tmp79_; + DirectoryMonitorFType _tmp36_; #line 1324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp79_ = ftype; + _tmp36_ = ftype; #line 1324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp79_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); + _vala_assert (_tmp36_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 1325 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6341 "DirectoryMonitor.c" +#line 6097 "DirectoryMonitor.c" } } #line 1327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); #line 1327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6348 "DirectoryMonitor.c" +#line 6104 "DirectoryMonitor.c" } #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED: -#line 6352 "DirectoryMonitor.c" +#line 6108 "DirectoryMonitor.c" { - GFileInfo* _tmp80_; GFileInfo* local_info = NULL; - GFile* _tmp81_; - GFileInfo* _tmp82_; - GFileInfo* _tmp83_; + GFileInfo* _tmp37_; + GFileInfo* _tmp38_; DirectoryMonitorFType ftype = 0; - GFileInfo* _tmp87_; - DirectoryMonitorFType _tmp88_; - DirectoryMonitorFType _tmp89_; + GFileInfo* _tmp41_; + DirectoryMonitorFType _tmp42_; #line 1331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp80_ = info; -#line 1331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp80_ == NULL, "info == null"); -#line 1333 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp81_ = file; + _vala_assert (info == NULL, "info == null"); #line 1333 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp82_ = directory_monitor_get_file_info (self, _tmp81_); + _tmp37_ = directory_monitor_get_file_info (self, file); #line 1333 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - local_info = _tmp82_; + local_info = _tmp37_; #line 1334 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp83_ = local_info; + _tmp38_ = local_info; #line 1334 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp83_ == NULL) { -#line 6377 "DirectoryMonitor.c" - GFile* _tmp84_; - gchar* _tmp85_; - gchar* _tmp86_; -#line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp84_ = file; + if (_tmp38_ == NULL) { +#line 6126 "DirectoryMonitor.c" + gchar* _tmp39_; + gchar* _tmp40_; #line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp85_ = g_file_get_path (_tmp84_); + _tmp39_ = g_file_get_path (file); #line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp86_ = _tmp85_; + _tmp40_ = _tmp39_; #line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_warning ("DirectoryMonitor.vala:1335: Attribute changed event for unknown file %" \ -"s", _tmp86_); +"s", _tmp40_); #line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp86_); + _g_free0 (_tmp40_); #line 1337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); #line 1337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6395 "DirectoryMonitor.c" +#line 6141 "DirectoryMonitor.c" } #line 1340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp87_ = local_info; + _tmp41_ = local_info; #line 1340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp88_ = directory_monitor_get_ftype (_tmp87_); -#line 1340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ftype = _tmp88_; + ftype = directory_monitor_get_ftype (_tmp41_); #line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp89_ = ftype; + _tmp42_ = ftype; #line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - switch (_tmp89_) { + switch (_tmp42_) { #line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6409 "DirectoryMonitor.c" +#line 6153 "DirectoryMonitor.c" { - GFile* _tmp90_; -#line 1343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp90_ = file; #line 1343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_file_attributes_altered (self, _tmp90_); + directory_monitor_notify_file_attributes_altered (self, file); #line 1344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6418 "DirectoryMonitor.c" +#line 6159 "DirectoryMonitor.c" } #line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6422 "DirectoryMonitor.c" +#line 6163 "DirectoryMonitor.c" { - GFile* _tmp91_; #line 1347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp91_ = file; -#line 1347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_directory_attributes_altered (self, _tmp91_); + directory_monitor_notify_directory_attributes_altered (self, file); #line 1348 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6431 "DirectoryMonitor.c" +#line 6169 "DirectoryMonitor.c" } default: { - DirectoryMonitorFType _tmp92_; + DirectoryMonitorFType _tmp43_; #line 1351 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp92_ = ftype; + _tmp43_ = ftype; #line 1351 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp92_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); + _vala_assert (_tmp43_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 1352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6442 "DirectoryMonitor.c" +#line 6180 "DirectoryMonitor.c" } } #line 1354 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); #line 1354 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6449 "DirectoryMonitor.c" +#line 6187 "DirectoryMonitor.c" } #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_PRE_UNMOUNT: #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_UNMOUNTED: -#line 6455 "DirectoryMonitor.c" +#line 6193 "DirectoryMonitor.c" { #line 1359 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6459 "DirectoryMonitor.c" +#line 6197 "DirectoryMonitor.c" } default: { - GFileMonitorEvent _tmp93_; - GEnumValue* _tmp94_; + GEnumValue* _tmp44_; #line 1362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp93_ = event; + _tmp44_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), event); #line 1362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp94_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp93_); -#line 1362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:1362: Unknown directory monitor event %s", (_tmp94_ != NULL) ? _tmp94_->value_name : NULL); + g_warning ("DirectoryMonitor.vala:1362: Unknown directory monitor event %s", (_tmp44_ != NULL) ? _tmp44_->value_name : NULL); #line 1363 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6473 "DirectoryMonitor.c" +#line 6208 "DirectoryMonitor.c" } } #line 1195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp0_); -#line 6478 "DirectoryMonitor.c" +#line 6213 "DirectoryMonitor.c" } -static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, GFile* file, GFileInfo* info, GFile* * old_file, GFileInfo* * old_file_info) { +static gboolean +directory_monitor_is_file_create_move (DirectoryMonitor* self, + GFile* file, + GFileInfo* info, + GFile* * old_file, + GFileInfo* * old_file_info) +{ GFile* _vala_old_file = NULL; GFileInfo* _vala_old_file_info = NULL; gboolean result = FALSE; GFile* match = NULL; DirectoryMonitorFileInfoMap* _tmp0_; - GFileInfo* _tmp1_; + GFile* _tmp1_; GFile* _tmp2_; - GFile* _tmp3_; #line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); #line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6502,50 +6242,45 @@ static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, G #line 1372 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->parent_moved; #line 1372 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = info; -#line 1372 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = directory_monitor_file_info_map_find_match (_tmp0_, _tmp1_); + _tmp1_ = directory_monitor_file_info_map_find_match (_tmp0_, info); #line 1372 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - match = _tmp2_; + match = _tmp1_; #line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = match; + _tmp2_ = match; #line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp3_ != NULL) { -#line 6509 "DirectoryMonitor.c" + if (_tmp2_ != NULL) { +#line 6247 "DirectoryMonitor.c" + GFile* _tmp3_; GFile* _tmp4_; - GFile* _tmp5_; - DirectoryMonitorFileInfoMap* _tmp6_; - GFile* _tmp7_; - GFileInfo* _tmp8_; - DirectoryMonitorFileInfoMap* _tmp9_; - GFile* _tmp10_; - GFileInfo* _tmp11_; + DirectoryMonitorFileInfoMap* _tmp5_; + GFile* _tmp6_; + GFileInfo* _tmp7_; + DirectoryMonitorFileInfoMap* _tmp8_; + GFile* _tmp9_; #line 1374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = match; + _tmp3_ = match; #line 1374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp4_ = _g_object_ref0 (_tmp3_); #line 1374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file); #line 1374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_old_file = _tmp5_; + _vala_old_file = _tmp4_; #line 1375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = self->priv->parent_moved; + _tmp5_ = self->priv->parent_moved; #line 1375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = match; + _tmp6_ = match; #line 1375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = directory_monitor_file_info_map_get_info (_tmp6_, _tmp7_); + _tmp7_ = directory_monitor_file_info_map_get_info (_tmp5_, _tmp6_); #line 1375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file_info); #line 1375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_old_file_info = _tmp8_; -#line 1377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = self->priv->parent_moved; + _vala_old_file_info = _tmp7_; #line 1377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = match; + _tmp8_ = self->priv->parent_moved; #line 1377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp11_ = info; + _tmp9_ = match; #line 1377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_file_info_map_remove (_tmp9_, _tmp10_, _tmp11_); + directory_monitor_file_info_map_remove (_tmp8_, _tmp9_, info); #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = TRUE; #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6554,25 +6289,25 @@ static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, G if (old_file) { #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *old_file = _vala_old_file; -#line 6552 "DirectoryMonitor.c" +#line 6287 "DirectoryMonitor.c" } else { #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file); -#line 6556 "DirectoryMonitor.c" +#line 6291 "DirectoryMonitor.c" } #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old_file_info) { #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *old_file_info = _vala_old_file_info; -#line 6562 "DirectoryMonitor.c" +#line 6297 "DirectoryMonitor.c" } else { #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file_info); -#line 6566 "DirectoryMonitor.c" +#line 6301 "DirectoryMonitor.c" } #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 6570 "DirectoryMonitor.c" +#line 6305 "DirectoryMonitor.c" } #line 1382 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file); @@ -6590,158 +6325,156 @@ static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, G if (old_file) { #line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *old_file = _vala_old_file; -#line 6588 "DirectoryMonitor.c" +#line 6323 "DirectoryMonitor.c" } else { #line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file); -#line 6592 "DirectoryMonitor.c" +#line 6327 "DirectoryMonitor.c" } #line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old_file_info) { #line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *old_file_info = _vala_old_file_info; -#line 6598 "DirectoryMonitor.c" +#line 6333 "DirectoryMonitor.c" } else { #line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file_info); -#line 6602 "DirectoryMonitor.c" +#line 6337 "DirectoryMonitor.c" } #line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 6606 "DirectoryMonitor.c" +#line 6341 "DirectoryMonitor.c" } -static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMonitor* self) { +static gboolean +directory_monitor_check_for_expired_delete_events (DirectoryMonitor* self) +{ gboolean result = FALSE; gulong expiration = 0UL; - gulong _tmp0_; gboolean any_deleted = FALSE; gboolean any_expired = FALSE; - gboolean _tmp13_; - gboolean _tmp14_; + gboolean _tmp11_; + gboolean _tmp12_; #line 1388 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); #line 1389 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = now_ms (); -#line 1389 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - expiration = _tmp0_ - DIRECTORY_MONITOR_DELETED_EXPIRATION_MSEC; + expiration = now_ms () - DIRECTORY_MONITOR_DELETED_EXPIRATION_MSEC; #line 1391 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" any_deleted = FALSE; #line 1392 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" any_expired = FALSE; -#line 6628 "DirectoryMonitor.c" +#line 6362 "DirectoryMonitor.c" { GeeIterator* _element_it = NULL; - GeeQueue* _tmp1_; - GeeIterator* _tmp2_; + GeeQueue* _tmp0_; + GeeIterator* _tmp1_; #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = self->priv->query_info_queue; + _tmp0_ = self->priv->query_info_queue; #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _element_it = _tmp2_; + _element_it = _tmp1_; #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 6641 "DirectoryMonitor.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 6375 "DirectoryMonitor.c" + GeeIterator* _tmp2_; DirectoryMonitorQueryInfoQueueElement* element = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + DirectoryMonitorQueryInfoQueueElement* _tmp5_; + GFileMonitorEvent _tmp6_; DirectoryMonitorQueryInfoQueueElement* _tmp7_; - GFileMonitorEvent _tmp8_; - DirectoryMonitorQueryInfoQueueElement* _tmp9_; - gulong _tmp10_; - gulong _tmp11_; - DirectoryMonitorQueryInfoQueueElement* _tmp12_; -#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = _element_it; + gulong _tmp8_; + gulong _tmp9_; + DirectoryMonitorQueryInfoQueueElement* _tmp10_; #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _element_it; #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6661 "DirectoryMonitor.c" +#line 6392 "DirectoryMonitor.c" } #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = _element_it; + _tmp3_ = _element_it; #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - element = (DirectoryMonitorQueryInfoQueueElement*) _tmp6_; + element = (DirectoryMonitorQueryInfoQueueElement*) _tmp4_; #line 1394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = element; + _tmp5_ = element; #line 1394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = _tmp7_->event; + _tmp6_ = _tmp5_->event; #line 1394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp8_ != G_FILE_MONITOR_EVENT_DELETED) { + if (_tmp6_ != G_FILE_MONITOR_EVENT_DELETED) { #line 1395 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (element); #line 1395 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 6679 "DirectoryMonitor.c" +#line 6410 "DirectoryMonitor.c" } #line 1397 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" any_deleted = TRUE; #line 1399 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = element; + _tmp7_ = element; #line 1399 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = _tmp9_->time_created_msec; + _tmp8_ = _tmp7_->time_created_msec; #line 1399 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp11_ = expiration; + _tmp9_ = expiration; #line 1399 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp10_ > _tmp11_) { + if (_tmp8_ > _tmp9_) { #line 1400 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (element); #line 1400 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 6695 "DirectoryMonitor.c" +#line 6426 "DirectoryMonitor.c" } #line 1403 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp12_ = element; + _tmp10_ = element; #line 1403 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp12_->completed = TRUE; + _tmp10_->completed = TRUE; #line 1404 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" any_expired = TRUE; #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (element); -#line 6705 "DirectoryMonitor.c" +#line 6436 "DirectoryMonitor.c" } #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_element_it); -#line 6709 "DirectoryMonitor.c" +#line 6440 "DirectoryMonitor.c" } #line 1407 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp13_ = any_expired; + _tmp11_ = any_expired; #line 1407 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp13_) { + if (_tmp11_) { #line 1408 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_process_query_queue (self, NULL); -#line 6717 "DirectoryMonitor.c" +#line 6448 "DirectoryMonitor.c" } #line 1410 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp14_ = any_deleted; + _tmp12_ = any_deleted; #line 1410 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_tmp14_) { + if (!_tmp12_) { #line 1411 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->delete_timer_id = (guint) 0; -#line 6725 "DirectoryMonitor.c" +#line 6456 "DirectoryMonitor.c" } #line 1413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = any_deleted; #line 1413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 6731 "DirectoryMonitor.c" +#line 6462 "DirectoryMonitor.c" } -GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, GFile* file) { +GFileInfo* +directory_monitor_get_file_info (DirectoryMonitor* self, + GFile* file) +{ GFileInfo* result = NULL; DirectoryMonitorFileInfoMap* _tmp0_; - GFile* _tmp1_; - GFileInfo* _tmp2_; + GFileInfo* _tmp1_; #line 1417 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), NULL); #line 1417 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6749,18 +6482,18 @@ GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, GFile* file) #line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; #line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = file; + _tmp1_ = directory_monitor_file_info_map_get_info (_tmp0_, file); #line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = directory_monitor_file_info_map_get_info (_tmp0_, _tmp1_); -#line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - result = _tmp2_; + result = _tmp1_; #line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 6754 "DirectoryMonitor.c" +#line 6485 "DirectoryMonitor.c" } -GeeCollection* directory_monitor_get_files (DirectoryMonitor* self) { +GeeCollection* +directory_monitor_get_files (DirectoryMonitor* self) +{ GeeCollection* result = NULL; DirectoryMonitorFileInfoMap* _tmp0_; GeeCollection* _tmp1_; @@ -6774,16 +6507,18 @@ GeeCollection* directory_monitor_get_files (DirectoryMonitor* self) { result = _tmp1_; #line 1424 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 6772 "DirectoryMonitor.c" +#line 6505 "DirectoryMonitor.c" } -GFileInfo* directory_monitor_query_file_info (DirectoryMonitor* self, GFile* file) { +GFileInfo* +directory_monitor_query_file_info (DirectoryMonitor* self, + GFile* file) +{ GFileInfo* result = NULL; DirectoryMonitorFileInfoMap* _tmp0_; - GFile* _tmp1_; - GCancellable* _tmp2_; - GFileInfo* _tmp3_; + GCancellable* _tmp1_; + GFileInfo* _tmp2_; #line 1430 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), NULL); #line 1430 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6791,100 +6526,100 @@ GFileInfo* directory_monitor_query_file_info (DirectoryMonitor* self, GFile* fil #line 1431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->files; #line 1431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = file; + _tmp1_ = self->priv->cancellable; #line 1431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = self->priv->cancellable; + _tmp2_ = directory_monitor_file_info_map_query_info (_tmp0_, file, _tmp1_); #line 1431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = directory_monitor_file_info_map_query_info (_tmp0_, _tmp1_, _tmp2_); -#line 1431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - result = _tmp3_; + result = _tmp2_; #line 1431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 6798 "DirectoryMonitor.c" +#line 6531 "DirectoryMonitor.c" } -gboolean directory_monitor_is_file_symlink_supported (GFileInfo* info) { +gboolean +directory_monitor_is_file_symlink_supported (GFileInfo* info) +{ gboolean result = FALSE; - GFileInfo* _tmp0_; - gboolean _tmp1_; DirectoryMonitorFType ftype = 0; - GFileInfo* _tmp2_; - DirectoryMonitorFType _tmp3_; - DirectoryMonitorFType _tmp4_; + DirectoryMonitorFType _tmp0_; #line 1441 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); #line 1442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = info; -#line 1442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = g_file_info_get_is_symlink (_tmp0_); -#line 1442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_tmp1_) { + if (!g_file_info_get_is_symlink (info)) { #line 1443 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = TRUE; #line 1443 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 6822 "DirectoryMonitor.c" +#line 6549 "DirectoryMonitor.c" } #line 1445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = info; -#line 1445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = directory_monitor_get_ftype (_tmp2_); -#line 1445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ftype = _tmp3_; + ftype = directory_monitor_get_ftype (info); #line 1446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = ftype; + _tmp0_ = ftype; #line 1446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - switch (_tmp4_) { + switch (_tmp0_) { #line 1446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6836 "DirectoryMonitor.c" +#line 6559 "DirectoryMonitor.c" { #line 1448 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = DIRECTORY_MONITOR_SUPPORT_DIR_SYMLINKS; #line 1448 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 6842 "DirectoryMonitor.c" +#line 6565 "DirectoryMonitor.c" } #line 1446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6846 "DirectoryMonitor.c" +#line 6569 "DirectoryMonitor.c" { #line 1451 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = DIRECTORY_MONITOR_SUPPORT_FILE_SYMLINKS; #line 1451 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 6852 "DirectoryMonitor.c" +#line 6575 "DirectoryMonitor.c" } default: { - DirectoryMonitorFType _tmp5_; + DirectoryMonitorFType _tmp1_; #line 1454 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = ftype; + _tmp1_ = ftype; #line 1454 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp5_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); + _vala_assert (_tmp1_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 1456 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; #line 1456 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 6865 "DirectoryMonitor.c" +#line 6588 "DirectoryMonitor.c" } } } -static void directory_monitor_real_root_moved (DirectoryMonitor* self, GFile* old_root, GFile* new_root, GFileInfo* new_root_info) { +static void +directory_monitor_real_root_moved (DirectoryMonitor* self, + GFile* old_root, + GFile* new_root, + GFileInfo* new_root_info) +{ #line 386 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (old_root)); #line 386 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (new_root)); #line 386 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_root_info)); -#line 6878 "DirectoryMonitor.c" +#line 6606 "DirectoryMonitor.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT_OBJECT) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer arg_3, gpointer data2); register GMarshalFunc_VOID__OBJECT_OBJECT_OBJECT callback; register GCClosure * cc; @@ -6899,43 +6634,59 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT (GClosure * closu data1 = closure->data; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data2 = param_values->data[0].v_pointer; -#line 6897 "DirectoryMonitor.c" +#line 6632 "DirectoryMonitor.c" } else { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data1 = param_values->data[0].v_pointer; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data2 = closure->data; -#line 6903 "DirectoryMonitor.c" +#line 6638 "DirectoryMonitor.c" } #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_object (param_values + 3), data2); -#line 6909 "DirectoryMonitor.c" +#line 6644 "DirectoryMonitor.c" } -static void directory_monitor_real_root_deleted (DirectoryMonitor* self, GFile* root) { +static void +directory_monitor_real_root_deleted (DirectoryMonitor* self, + GFile* root) +{ #line 394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (root)); -#line 6916 "DirectoryMonitor.c" +#line 6654 "DirectoryMonitor.c" } -static void directory_monitor_real_discovery_started (DirectoryMonitor* self) { +static void +directory_monitor_real_discovery_started (DirectoryMonitor* self) +{ } -static void directory_monitor_real_file_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info) { +static void +directory_monitor_real_file_discovered (DirectoryMonitor* self, + GFile* file, + GFileInfo* info) +{ #line 400 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 400 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 6929 "DirectoryMonitor.c" +#line 6673 "DirectoryMonitor.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2); register GMarshalFunc_VOID__OBJECT_OBJECT callback; register GCClosure * cc; @@ -6950,162 +6701,218 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa data1 = closure->data; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data2 = param_values->data[0].v_pointer; -#line 6948 "DirectoryMonitor.c" +#line 6699 "DirectoryMonitor.c" } else { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data1 = param_values->data[0].v_pointer; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data2 = closure->data; -#line 6954 "DirectoryMonitor.c" +#line 6705 "DirectoryMonitor.c" } #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 6960 "DirectoryMonitor.c" +#line 6711 "DirectoryMonitor.c" } -static void directory_monitor_real_directory_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info) { +static void +directory_monitor_real_directory_discovered (DirectoryMonitor* self, + GFile* file, + GFileInfo* info) +{ #line 403 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 403 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 6969 "DirectoryMonitor.c" +#line 6724 "DirectoryMonitor.c" } -static void directory_monitor_real_discovery_failed (DirectoryMonitor* self, const gchar* reason) { +static void +directory_monitor_real_discovery_failed (DirectoryMonitor* self, + const gchar* reason) +{ #line 408 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (reason != NULL); -#line 6976 "DirectoryMonitor.c" +#line 6734 "DirectoryMonitor.c" } -static void directory_monitor_real_discovery_completed (DirectoryMonitor* self) { +static void +directory_monitor_real_discovery_completed (DirectoryMonitor* self) +{ #line 412 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->has_discovery_started = FALSE; #line 413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg ("discovery completed"); -#line 6985 "DirectoryMonitor.c" +#line 6745 "DirectoryMonitor.c" } -static void directory_monitor_real_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info) { +static void +directory_monitor_real_file_created (DirectoryMonitor* self, + GFile* file, + GFileInfo* info) +{ #line 416 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 416 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 6994 "DirectoryMonitor.c" +#line 6758 "DirectoryMonitor.c" } -static void directory_monitor_real_file_moved (DirectoryMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info) { +static void +directory_monitor_real_file_moved (DirectoryMonitor* self, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info) +{ #line 419 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (old_file)); #line 419 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (new_file)); #line 419 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_file_info)); -#line 7005 "DirectoryMonitor.c" +#line 6774 "DirectoryMonitor.c" } -static void directory_monitor_real_file_altered (DirectoryMonitor* self, GFile* file) { +static void +directory_monitor_real_file_altered (DirectoryMonitor* self, + GFile* file) +{ #line 423 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 7012 "DirectoryMonitor.c" +#line 6784 "DirectoryMonitor.c" } -static void directory_monitor_real_file_alteration_completed (DirectoryMonitor* self, GFile* file, GFileInfo* info) { +static void +directory_monitor_real_file_alteration_completed (DirectoryMonitor* self, + GFile* file, + GFileInfo* info) +{ #line 428 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 428 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7021 "DirectoryMonitor.c" +#line 6797 "DirectoryMonitor.c" } -static void directory_monitor_real_file_attributes_altered (DirectoryMonitor* self, GFile* file) { +static void +directory_monitor_real_file_attributes_altered (DirectoryMonitor* self, + GFile* file) +{ #line 431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 7028 "DirectoryMonitor.c" +#line 6807 "DirectoryMonitor.c" } -static void directory_monitor_real_file_deleted (DirectoryMonitor* self, GFile* file) { +static void +directory_monitor_real_file_deleted (DirectoryMonitor* self, + GFile* file) +{ #line 434 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 7035 "DirectoryMonitor.c" +#line 6817 "DirectoryMonitor.c" } -static void directory_monitor_real_directory_created (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { +static void +directory_monitor_real_directory_created (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info) +{ #line 438 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); #line 438 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7044 "DirectoryMonitor.c" +#line 6830 "DirectoryMonitor.c" } -static void directory_monitor_real_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFile* new_dir, GFileInfo* new_dir_info) { +static void +directory_monitor_real_directory_moved (DirectoryMonitor* self, + GFile* old_dir, + GFile* new_dir, + GFileInfo* new_dir_info) +{ #line 442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (old_dir)); #line 442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (new_dir)); #line 442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_dir_info)); -#line 7055 "DirectoryMonitor.c" +#line 6846 "DirectoryMonitor.c" } -static void directory_monitor_real_directory_altered (DirectoryMonitor* self, GFile* dir) { +static void +directory_monitor_real_directory_altered (DirectoryMonitor* self, + GFile* dir) +{ #line 446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 7062 "DirectoryMonitor.c" +#line 6856 "DirectoryMonitor.c" } -static void directory_monitor_real_directory_alteration_completed (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { +static void +directory_monitor_real_directory_alteration_completed (DirectoryMonitor* self, + GFile* dir, + GFileInfo* info) +{ #line 451 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); #line 451 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7071 "DirectoryMonitor.c" +#line 6869 "DirectoryMonitor.c" } -static void directory_monitor_real_directory_attributes_altered (DirectoryMonitor* self, GFile* dir) { +static void +directory_monitor_real_directory_attributes_altered (DirectoryMonitor* self, + GFile* dir) +{ #line 454 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 7078 "DirectoryMonitor.c" +#line 6879 "DirectoryMonitor.c" } -static void directory_monitor_real_directory_deleted (DirectoryMonitor* self, GFile* dir) { +static void +directory_monitor_real_directory_deleted (DirectoryMonitor* self, + GFile* dir) +{ #line 458 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 7085 "DirectoryMonitor.c" +#line 6889 "DirectoryMonitor.c" } -static void directory_monitor_real_closed (DirectoryMonitor* self) { +static void +directory_monitor_real_closed (DirectoryMonitor* self) +{ } -static DirectoryMonitorQueryInfoQueueElement* directory_monitor_query_info_queue_element_construct (GType object_type, DirectoryMonitor* owner, GFile* file, GFile* other_file, GFileMonitorEvent event) { +static DirectoryMonitorQueryInfoQueueElement* +directory_monitor_query_info_queue_element_construct (GType object_type, + DirectoryMonitor* owner, + GFile* file, + GFile* other_file, + GFileMonitorEvent event) +{ DirectoryMonitorQueryInfoQueueElement* self = NULL; DirectoryMonitor* _tmp0_; - DirectoryMonitor* _tmp1_; + GFile* _tmp1_; GFile* _tmp2_; - GFile* _tmp3_; - GFile* _tmp4_; - GFile* _tmp5_; - GFileMonitorEvent _tmp6_; - guint _tmp7_; - gulong _tmp8_; + guint _tmp3_; #line 96 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (owner), NULL); #line 96 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7115,68 +6922,68 @@ static DirectoryMonitorQueryInfoQueueElement* directory_monitor_query_info_queue #line 96 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self = (DirectoryMonitorQueryInfoQueueElement*) g_type_create_instance (object_type); #line 98 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = owner; -#line 98 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (owner); #line 98 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (self->owner); #line 98 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - self->owner = _tmp1_; -#line 99 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = file; + self->owner = _tmp0_; #line 99 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (file); #line 99 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (self->file); #line 99 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - self->file = _tmp3_; + self->file = _tmp1_; #line 100 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = other_file; -#line 100 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp2_ = _g_object_ref0 (other_file); #line 100 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (self->other_file); #line 100 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - self->other_file = _tmp5_; -#line 101 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = event; + self->other_file = _tmp2_; #line 101 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - self->event = _tmp6_; + self->event = event; #line 102 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = directory_monitor_query_info_queue_element_current; + _tmp3_ = directory_monitor_query_info_queue_element_current; #line 102 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_query_info_queue_element_current = _tmp7_ + 1; + directory_monitor_query_info_queue_element_current = _tmp3_ + 1; #line 102 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - self->position = _tmp7_; + self->position = _tmp3_; #line 103 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = now_ms (); -#line 103 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - self->time_created_msec = _tmp8_; + self->time_created_msec = now_ms (); #line 96 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return self; -#line 7152 "DirectoryMonitor.c" +#line 6949 "DirectoryMonitor.c" } -static DirectoryMonitorQueryInfoQueueElement* directory_monitor_query_info_queue_element_new (DirectoryMonitor* owner, GFile* file, GFile* other_file, GFileMonitorEvent event) { +static DirectoryMonitorQueryInfoQueueElement* +directory_monitor_query_info_queue_element_new (DirectoryMonitor* owner, + GFile* file, + GFile* other_file, + GFileMonitorEvent event) +{ #line 96 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return directory_monitor_query_info_queue_element_construct (DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT, owner, file, other_file, event); -#line 7159 "DirectoryMonitor.c" +#line 6961 "DirectoryMonitor.c" } -static gpointer _g_error_copy0 (gpointer self) { +static gpointer +_g_error_copy0 (gpointer self) +{ #line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return self ? g_error_copy (self) : NULL; -#line 7166 "DirectoryMonitor.c" +#line 6970 "DirectoryMonitor.c" } -static void directory_monitor_query_info_queue_element_on_completed (DirectoryMonitorQueryInfoQueueElement* self, GObject* source, GAsyncResult* aresult) { +static void +directory_monitor_query_info_queue_element_on_completed (DirectoryMonitorQueryInfoQueueElement* self, + GObject* source, + GAsyncResult* aresult) +{ GFile* source_file = NULL; - GObject* _tmp0_; - GFile* _tmp1_; - DirectoryMonitor* _tmp16_; + GFile* _tmp0_; + DirectoryMonitor* _tmp14_; GError * _inner_error_ = NULL; #line 106 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (DIRECTORY_MONITOR_IS_QUERY_INFO_QUEUE_ELEMENT (self)); @@ -7185,96 +6992,91 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo #line 106 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_ASYNC_RESULT (aresult)); #line 107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = source; -#line 107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_file_get_type (), GFile)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, g_file_get_type (), GFile)); #line 107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - source_file = _tmp1_; -#line 7188 "DirectoryMonitor.c" + source_file = _tmp0_; +#line 6993 "DirectoryMonitor.c" { - GFileInfo* _tmp2_ = NULL; - GAsyncResult* _tmp3_; + GFileInfo* _tmp1_ = NULL; + GFileInfo* _tmp2_; + GFileInfo* _tmp3_; GFileInfo* _tmp4_; - GFileInfo* _tmp5_; - GFileInfo* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - gboolean _tmp9_; -#line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = aresult; + gchar* _tmp5_; + gchar* _tmp6_; + gboolean _tmp7_; #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = g_file_query_info_finish (source_file, _tmp3_, &_inner_error_); + _tmp2_ = g_file_query_info_finish (source_file, aresult, &_inner_error_); #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _tmp4_; + _tmp1_ = _tmp2_; #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7206 "DirectoryMonitor.c" +#line 7008 "DirectoryMonitor.c" goto __catch493_g_error; } #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = _tmp2_; + _tmp3_ = _tmp1_; #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = NULL; + _tmp1_ = NULL; #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (self->info); #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - self->info = _tmp5_; + self->info = _tmp3_; #line 112 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = self->info; + _tmp4_ = self->info; #line 112 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = get_file_info_id (_tmp6_); + _tmp5_ = get_file_info_id (_tmp4_); #line 112 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 112 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = _tmp8_ == NULL; + _tmp7_ = _tmp6_ == NULL; #line 112 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp6_); #line 112 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp9_) { -#line 7229 "DirectoryMonitor.c" - GFileInfo* _tmp10_; - GFile* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; + if (_tmp7_) { +#line 7031 "DirectoryMonitor.c" + GFileInfo* _tmp8_; + GFile* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; #line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = self->info; + _tmp8_ = self->info; #line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp11_ = self->file; + _tmp9_ = self->file; #line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp12_ = g_file_get_uri (_tmp11_); + _tmp10_ = g_file_get_uri (_tmp9_); #line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_file_info_set_attribute_string (_tmp10_, G_FILE_ATTRIBUTE_ID_FILE, _tmp13_); + g_file_info_set_attribute_string (_tmp8_, G_FILE_ATTRIBUTE_ID_FILE, _tmp11_); #line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp13_); -#line 7246 "DirectoryMonitor.c" + _g_free0 (_tmp11_); +#line 7048 "DirectoryMonitor.c" } #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_tmp2_); -#line 7250 "DirectoryMonitor.c" + _g_object_unref0 (_tmp1_); +#line 7052 "DirectoryMonitor.c" } goto __finally493; __catch493_g_error: { GError* err = NULL; - GError* _tmp14_; - GError* _tmp15_; + GError* _tmp12_; + GError* _tmp13_; #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" err = _inner_error_; #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _inner_error_ = NULL; #line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp14_ = err; + _tmp12_ = err; #line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp15_ = _g_error_copy0 (_tmp14_); + _tmp13_ = _g_error_copy0 (_tmp12_); #line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_error_free0 (self->err); #line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - self->err = _tmp15_; + self->err = _tmp13_; #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_error_free0 (err); -#line 7272 "DirectoryMonitor.c" +#line 7074 "DirectoryMonitor.c" } __finally493: #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7287,118 +7089,143 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo g_clear_error (&_inner_error_); #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return; -#line 7285 "DirectoryMonitor.c" +#line 7087 "DirectoryMonitor.c" } #line 121 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->completed = TRUE; #line 124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp16_ = self->owner; + _tmp14_ = self->owner; #line 124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_process_query_queue (_tmp16_, self); + directory_monitor_process_query_queue (_tmp14_, self); #line 106 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (source_file); -#line 7295 "DirectoryMonitor.c" +#line 7097 "DirectoryMonitor.c" } -static void directory_monitor_value_query_info_queue_element_init (GValue* value) { +static void +directory_monitor_value_query_info_queue_element_init (GValue* value) +{ #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 7302 "DirectoryMonitor.c" +#line 7106 "DirectoryMonitor.c" } -static void directory_monitor_value_query_info_queue_element_free_value (GValue* value) { +static void +directory_monitor_value_query_info_queue_element_free_value (GValue* value) +{ #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (value->data[0].v_pointer) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_unref (value->data[0].v_pointer); -#line 7311 "DirectoryMonitor.c" +#line 7117 "DirectoryMonitor.c" } } -static void directory_monitor_value_query_info_queue_element_copy_value (const GValue* src_value, GValue* dest_value) { +static void +directory_monitor_value_query_info_queue_element_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (src_value->data[0].v_pointer) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" dest_value->data[0].v_pointer = directory_monitor_query_info_queue_element_ref (src_value->data[0].v_pointer); -#line 7321 "DirectoryMonitor.c" +#line 7130 "DirectoryMonitor.c" } else { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" dest_value->data[0].v_pointer = NULL; -#line 7325 "DirectoryMonitor.c" +#line 7134 "DirectoryMonitor.c" } } -static gpointer directory_monitor_value_query_info_queue_element_peek_pointer (const GValue* value) { +static gpointer +directory_monitor_value_query_info_queue_element_peek_pointer (const GValue* value) +{ #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return value->data[0].v_pointer; -#line 7333 "DirectoryMonitor.c" +#line 7144 "DirectoryMonitor.c" } -static gchar* directory_monitor_value_query_info_queue_element_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +directory_monitor_value_query_info_queue_element_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (collect_values[0].v_pointer) { -#line 7340 "DirectoryMonitor.c" +#line 7156 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement * object; object = collect_values[0].v_pointer; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (object->parent_instance.g_class == NULL) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 7347 "DirectoryMonitor.c" +#line 7163 "DirectoryMonitor.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.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 7351 "DirectoryMonitor.c" +#line 7167 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = directory_monitor_query_info_queue_element_ref (object); -#line 7355 "DirectoryMonitor.c" +#line 7171 "DirectoryMonitor.c" } else { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 7359 "DirectoryMonitor.c" +#line 7175 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return NULL; -#line 7363 "DirectoryMonitor.c" +#line 7179 "DirectoryMonitor.c" } -static gchar* directory_monitor_value_query_info_queue_element_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +directory_monitor_value_query_info_queue_element_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ DirectoryMonitorQueryInfoQueueElement ** object_p; object_p = collect_values[0].v_pointer; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!object_p) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 7374 "DirectoryMonitor.c" +#line 7195 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!value->data[0].v_pointer) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = NULL; -#line 7380 "DirectoryMonitor.c" +#line 7201 "DirectoryMonitor.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = value->data[0].v_pointer; -#line 7384 "DirectoryMonitor.c" +#line 7205 "DirectoryMonitor.c" } else { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = directory_monitor_query_info_queue_element_ref (value->data[0].v_pointer); -#line 7388 "DirectoryMonitor.c" +#line 7209 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return NULL; -#line 7392 "DirectoryMonitor.c" +#line 7213 "DirectoryMonitor.c" } -static GParamSpec* directory_monitor_param_spec_query_info_queue_element (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +static GParamSpec* +directory_monitor_param_spec_query_info_queue_element (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ DirectoryMonitorParamSpecQueryInfoQueueElement* spec; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (g_type_is_a (object_type, DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT), NULL); @@ -7408,20 +7235,25 @@ static GParamSpec* directory_monitor_param_spec_query_info_queue_element (const G_PARAM_SPEC (spec)->value_type = object_type; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return G_PARAM_SPEC (spec); -#line 7406 "DirectoryMonitor.c" +#line 7233 "DirectoryMonitor.c" } -static gpointer directory_monitor_value_get_query_info_queue_element (const GValue* value) { +static gpointer +directory_monitor_value_get_query_info_queue_element (const GValue* value) +{ #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT), NULL); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return value->data[0].v_pointer; -#line 7415 "DirectoryMonitor.c" +#line 7244 "DirectoryMonitor.c" } -static void directory_monitor_value_set_query_info_queue_element (GValue* value, gpointer v_object) { +static void +directory_monitor_value_set_query_info_queue_element (GValue* value, + gpointer v_object) +{ DirectoryMonitorQueryInfoQueueElement * old; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT)); @@ -7437,22 +7269,25 @@ static void directory_monitor_value_set_query_info_queue_element (GValue* value, value->data[0].v_pointer = v_object; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_ref (value->data[0].v_pointer); -#line 7435 "DirectoryMonitor.c" +#line 7267 "DirectoryMonitor.c" } else { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 7439 "DirectoryMonitor.c" +#line 7271 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_unref (old); -#line 7445 "DirectoryMonitor.c" +#line 7277 "DirectoryMonitor.c" } } -static void directory_monitor_value_take_query_info_queue_element (GValue* value, gpointer v_object) { +static void +directory_monitor_value_take_query_info_queue_element (GValue* value, + gpointer v_object) +{ DirectoryMonitorQueryInfoQueueElement * old; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT)); @@ -7466,31 +7301,35 @@ static void directory_monitor_value_take_query_info_queue_element (GValue* value g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = v_object; -#line 7464 "DirectoryMonitor.c" +#line 7299 "DirectoryMonitor.c" } else { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 7468 "DirectoryMonitor.c" +#line 7303 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_unref (old); -#line 7474 "DirectoryMonitor.c" +#line 7309 "DirectoryMonitor.c" } } -static void directory_monitor_query_info_queue_element_class_init (DirectoryMonitorQueryInfoQueueElementClass * klass) { +static void +directory_monitor_query_info_queue_element_class_init (DirectoryMonitorQueryInfoQueueElementClass * klass) +{ #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_parent_class = g_type_class_peek_parent (klass); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" ((DirectoryMonitorQueryInfoQueueElementClass *) klass)->finalize = directory_monitor_query_info_queue_element_finalize; -#line 7484 "DirectoryMonitor.c" +#line 7321 "DirectoryMonitor.c" } -static void directory_monitor_query_info_queue_element_instance_init (DirectoryMonitorQueryInfoQueueElement * self) { +static void +directory_monitor_query_info_queue_element_instance_init (DirectoryMonitorQueryInfoQueueElement * self) +{ #line 92 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->info = NULL; #line 93 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7499,11 +7338,13 @@ static void directory_monitor_query_info_queue_element_instance_init (DirectoryM self->completed = FALSE; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->ref_count = 1; -#line 7497 "DirectoryMonitor.c" +#line 7336 "DirectoryMonitor.c" } -static void directory_monitor_query_info_queue_element_finalize (DirectoryMonitorQueryInfoQueueElement * obj) { +static void +directory_monitor_query_info_queue_element_finalize (DirectoryMonitorQueryInfoQueueElement * obj) +{ DirectoryMonitorQueryInfoQueueElement * self; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT, DirectoryMonitorQueryInfoQueueElement); @@ -7519,11 +7360,13 @@ static void directory_monitor_query_info_queue_element_finalize (DirectoryMonito _g_object_unref0 (self->info); #line 93 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_error_free0 (self->err); -#line 7517 "DirectoryMonitor.c" +#line 7358 "DirectoryMonitor.c" } -static GType directory_monitor_query_info_queue_element_get_type (void) { +static GType +directory_monitor_query_info_queue_element_get_type (void) +{ static volatile gsize directory_monitor_query_info_queue_element_type_id__volatile = 0; if (g_once_init_enter (&directory_monitor_query_info_queue_element_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { directory_monitor_value_query_info_queue_element_init, directory_monitor_value_query_info_queue_element_free_value, directory_monitor_value_query_info_queue_element_copy_value, directory_monitor_value_query_info_queue_element_peek_pointer, "p", directory_monitor_value_query_info_queue_element_collect_value, "p", directory_monitor_value_query_info_queue_element_lcopy_value }; @@ -7537,18 +7380,22 @@ static GType directory_monitor_query_info_queue_element_get_type (void) { } -static gpointer directory_monitor_query_info_queue_element_ref (gpointer instance) { +static gpointer +directory_monitor_query_info_queue_element_ref (gpointer instance) +{ DirectoryMonitorQueryInfoQueueElement * self; self = instance; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_atomic_int_inc (&self->ref_count); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return instance; -#line 7542 "DirectoryMonitor.c" +#line 7387 "DirectoryMonitor.c" } -static void directory_monitor_query_info_queue_element_unref (gpointer instance) { +static void +directory_monitor_query_info_queue_element_unref (gpointer instance) +{ DirectoryMonitorQueryInfoQueueElement * self; self = instance; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7557,49 +7404,58 @@ static void directory_monitor_query_info_queue_element_unref (gpointer instance) DIRECTORY_MONITOR_QUERY_INFO_QUEUE_ELEMENT_GET_CLASS (self)->finalize (self); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_type_free_instance ((GTypeInstance *) self); -#line 7555 "DirectoryMonitor.c" +#line 7402 "DirectoryMonitor.c" } } -static DirectoryMonitorFileInfoMap* directory_monitor_file_info_map_construct (GType object_type) { +static DirectoryMonitorFileInfoMap* +directory_monitor_file_info_map_construct (GType object_type) +{ DirectoryMonitorFileInfoMap* self = NULL; #line 138 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self = (DirectoryMonitorFileInfoMap*) g_type_create_instance (object_type); #line 138 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return self; -#line 7566 "DirectoryMonitor.c" +#line 7415 "DirectoryMonitor.c" } -static DirectoryMonitorFileInfoMap* directory_monitor_file_info_map_new (void) { +static DirectoryMonitorFileInfoMap* +directory_monitor_file_info_map_new (void) +{ #line 138 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return directory_monitor_file_info_map_construct (DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP); -#line 7573 "DirectoryMonitor.c" +#line 7424 "DirectoryMonitor.c" } -static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info, GFile* * normalized, gchar* * id) { +static gboolean +directory_monitor_file_info_map_normalize_file (DirectoryMonitorFileInfoMap* self, + GFile* file, + GFileInfo* info, + GFile* * normalized, + gchar* * id) +{ GFile* _vala_normalized = NULL; gchar* _vala_id = NULL; gboolean result = FALSE; GFileInfo* local_info = NULL; GFileInfo* _tmp0_; GFileInfo* _tmp1_; - GFileInfo* _tmp2_; gchar* file_id = NULL; - GFileInfo* _tmp7_; - gchar* _tmp8_; - const gchar* _tmp9_; + GFileInfo* _tmp5_; + gchar* _tmp6_; + const gchar* _tmp7_; GFile* known_file = NULL; - GeeHashMap* _tmp10_; + GeeHashMap* _tmp8_; + const gchar* _tmp9_; + gpointer _tmp10_; const gchar* _tmp11_; - gpointer _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - GFile* _tmp15_ = NULL; + gchar* _tmp12_; + GFile* _tmp13_ = NULL; + GFile* _tmp14_; GFile* _tmp16_; - GFile* _tmp19_; #line 141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), FALSE); #line 141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7607,34 +7463,29 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor #line 141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail ((info == NULL) || G_IS_FILE_INFO (info), FALSE); #line 144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = info; -#line 144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (info); #line 144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - local_info = _tmp1_; + local_info = _tmp0_; #line 145 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = local_info; + _tmp1_ = local_info; #line 145 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp2_ == NULL) { -#line 7614 "DirectoryMonitor.c" - GeeHashMap* _tmp3_; - GFile* _tmp4_; - gpointer _tmp5_; - GFileInfo* _tmp6_; -#line 146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = self->priv->map; + if (_tmp1_ == NULL) { +#line 7468 "DirectoryMonitor.c" + GeeHashMap* _tmp2_; + gpointer _tmp3_; + GFileInfo* _tmp4_; #line 146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = file; + _tmp2_ = self->priv->map; #line 146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); #line 146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - local_info = (GFileInfo*) _tmp5_; + local_info = (GFileInfo*) _tmp3_; #line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = local_info; + _tmp4_ = local_info; #line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp6_ == NULL) { + if (_tmp4_ == NULL) { #line 148 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_normalized); #line 148 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7651,37 +7502,37 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor if (normalized) { #line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *normalized = _vala_normalized; -#line 7649 "DirectoryMonitor.c" +#line 7500 "DirectoryMonitor.c" } else { #line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_normalized); -#line 7653 "DirectoryMonitor.c" +#line 7504 "DirectoryMonitor.c" } #line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (id) { #line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *id = _vala_id; -#line 7659 "DirectoryMonitor.c" +#line 7510 "DirectoryMonitor.c" } else { #line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_vala_id); -#line 7663 "DirectoryMonitor.c" +#line 7514 "DirectoryMonitor.c" } #line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7667 "DirectoryMonitor.c" +#line 7518 "DirectoryMonitor.c" } } #line 155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = local_info; + _tmp5_ = local_info; #line 155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = get_file_info_id (_tmp7_); + _tmp6_ = get_file_info_id (_tmp5_); #line 155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - file_id = _tmp8_; + file_id = _tmp6_; #line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = file_id; + _tmp7_ = file_id; #line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp9_ == NULL) { + if (_tmp7_ == NULL) { #line 157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_normalized); #line 157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7700,67 +7551,64 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor if (normalized) { #line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *normalized = _vala_normalized; -#line 7698 "DirectoryMonitor.c" +#line 7549 "DirectoryMonitor.c" } else { #line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_normalized); -#line 7702 "DirectoryMonitor.c" +#line 7553 "DirectoryMonitor.c" } #line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (id) { #line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *id = _vala_id; -#line 7708 "DirectoryMonitor.c" +#line 7559 "DirectoryMonitor.c" } else { #line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_vala_id); -#line 7712 "DirectoryMonitor.c" +#line 7563 "DirectoryMonitor.c" } #line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7716 "DirectoryMonitor.c" +#line 7567 "DirectoryMonitor.c" } #line 163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = self->priv->id_map; + _tmp8_ = self->priv->id_map; #line 163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp11_ = file_id; + _tmp9_ = file_id; #line 163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp12_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_); + _tmp10_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_); #line 163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - known_file = (GFile*) _tmp12_; + known_file = (GFile*) _tmp10_; #line 165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp13_ = file_id; + _tmp11_ = file_id; #line 165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp14_ = g_strdup ((const gchar*) _tmp13_); + _tmp12_ = g_strdup ((const gchar*) _tmp11_); #line 165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_vala_id); #line 165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_id = _tmp14_; + _vala_id = _tmp12_; #line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp16_ = known_file; + _tmp14_ = known_file; #line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp16_ != NULL) { -#line 7738 "DirectoryMonitor.c" - GFile* _tmp17_; + if (_tmp14_ != NULL) { +#line 7589 "DirectoryMonitor.c" + GFile* _tmp15_; #line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp17_ = known_file; + _tmp15_ = known_file; #line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp15_ = _tmp17_; -#line 7744 "DirectoryMonitor.c" + _tmp13_ = _tmp15_; +#line 7595 "DirectoryMonitor.c" } else { - GFile* _tmp18_; #line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp18_ = file; -#line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp15_ = _tmp18_; -#line 7751 "DirectoryMonitor.c" + _tmp13_ = file; +#line 7599 "DirectoryMonitor.c" } #line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp19_ = _g_object_ref0 (_tmp15_); + _tmp16_ = _g_object_ref0 (_tmp13_); #line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_normalized); #line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_normalized = _tmp19_; + _vala_normalized = _tmp16_; #line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = TRUE; #line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7773,51 +7621,49 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor if (normalized) { #line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *normalized = _vala_normalized; -#line 7771 "DirectoryMonitor.c" +#line 7619 "DirectoryMonitor.c" } else { #line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_normalized); -#line 7775 "DirectoryMonitor.c" +#line 7623 "DirectoryMonitor.c" } #line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (id) { #line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *id = _vala_id; -#line 7781 "DirectoryMonitor.c" +#line 7629 "DirectoryMonitor.c" } else { #line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_vala_id); -#line 7785 "DirectoryMonitor.c" +#line 7633 "DirectoryMonitor.c" } #line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7789 "DirectoryMonitor.c" +#line 7637 "DirectoryMonitor.c" } -static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info) { +static gboolean +directory_monitor_file_info_map_update (DirectoryMonitorFileInfoMap* self, + GFile* file, + GFileInfo* info) +{ gboolean result = FALSE; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gboolean _tmp2_; gchar* existing_id = NULL; - GFileInfo* _tmp7_; - gchar* _tmp8_; - gboolean _tmp9_ = FALSE; - const gchar* _tmp10_; + gchar* _tmp4_; + gboolean _tmp5_ = FALSE; + const gchar* _tmp6_; gchar* id = NULL; GFile* normalized = NULL; - GFile* _tmp18_; - GFileInfo* _tmp19_; - GFile* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gboolean _tmp22_; - GeeHashMap* _tmp23_; - GFile* _tmp24_; - GFileInfo* _tmp25_; - GeeHashMap* _tmp26_; - const gchar* _tmp27_; - GFile* _tmp28_; + GFile* _tmp13_ = NULL; + gchar* _tmp14_ = NULL; + gboolean _tmp15_; + GeeHashMap* _tmp16_; + GFile* _tmp17_; + GeeHashMap* _tmp18_; + const gchar* _tmp19_; + GFile* _tmp20_; #line 171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), FALSE); #line 171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7827,97 +7673,81 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo #line 173 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->map; #line 173 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = file; -#line 173 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 173 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp2_) { -#line 7830 "DirectoryMonitor.c" + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file)) { +#line 7672 "DirectoryMonitor.c" gboolean removed = FALSE; - GeeHashMap* _tmp3_; - GFile* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; -#line 174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = self->priv->map; + GeeHashMap* _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; #line 174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = file; + _tmp1_ = self->priv->map; #line 174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, NULL); + _tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file, NULL); #line 174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - removed = _tmp5_; + removed = _tmp2_; #line 175 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = removed; + _tmp3_ = removed; #line 175 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp6_, "removed"); -#line 7848 "DirectoryMonitor.c" + _vala_assert (_tmp3_, "removed"); +#line 7687 "DirectoryMonitor.c" } #line 179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = info; -#line 179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = get_file_info_id (_tmp7_); + _tmp4_ = get_file_info_id (info); #line 179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - existing_id = _tmp8_; + existing_id = _tmp4_; #line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = existing_id; -#line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp10_ != NULL) { -#line 7860 "DirectoryMonitor.c" - GeeHashMap* _tmp11_; - const gchar* _tmp12_; - gboolean _tmp13_; + _tmp6_ = existing_id; #line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp11_ = self->priv->id_map; + if (_tmp6_ != NULL) { +#line 7697 "DirectoryMonitor.c" + GeeHashMap* _tmp7_; + const gchar* _tmp8_; #line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp12_ = existing_id; + _tmp7_ = self->priv->id_map; #line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp13_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_); + _tmp8_ = existing_id; #line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = _tmp13_; -#line 7872 "DirectoryMonitor.c" + _tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_); +#line 7706 "DirectoryMonitor.c" } else { #line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = FALSE; -#line 7876 "DirectoryMonitor.c" + _tmp5_ = FALSE; +#line 7710 "DirectoryMonitor.c" } #line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp9_) { -#line 7880 "DirectoryMonitor.c" + if (_tmp5_) { +#line 7714 "DirectoryMonitor.c" gboolean removed = FALSE; - GeeHashMap* _tmp14_; - const gchar* _tmp15_; - gboolean _tmp16_; - gboolean _tmp17_; + GeeHashMap* _tmp9_; + const gchar* _tmp10_; + gboolean _tmp11_; + gboolean _tmp12_; #line 181 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp14_ = self->priv->id_map; + _tmp9_ = self->priv->id_map; #line 181 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp15_ = existing_id; + _tmp10_ = existing_id; #line 181 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp16_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_, NULL); + _tmp11_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_, NULL); #line 181 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - removed = _tmp16_; + removed = _tmp11_; #line 182 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp17_ = removed; + _tmp12_ = removed; #line 182 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp17_, "removed"); -#line 7898 "DirectoryMonitor.c" + _vala_assert (_tmp12_, "removed"); +#line 7732 "DirectoryMonitor.c" } #line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp18_ = file; -#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp19_ = info; -#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp22_ = directory_monitor_file_info_map_normalize_file (self, _tmp18_, _tmp19_, &_tmp20_, &_tmp21_); + _tmp15_ = directory_monitor_file_info_map_normalize_file (self, file, info, &_tmp13_, &_tmp14_); #line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); #line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - normalized = _tmp20_; + normalized = _tmp13_; #line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); #line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - id = _tmp21_; + id = _tmp14_; #line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_tmp22_) { + if (!_tmp15_) { #line 188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; #line 188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7928,24 +7758,22 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo _g_free0 (existing_id); #line 188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7926 "DirectoryMonitor.c" +#line 7756 "DirectoryMonitor.c" } #line 190 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp23_ = self->priv->map; -#line 190 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp24_ = normalized; + _tmp16_ = self->priv->map; #line 190 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp25_ = info; + _tmp17_ = normalized; #line 190 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_, _tmp25_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_, info); #line 191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp26_ = self->priv->id_map; + _tmp18_ = self->priv->id_map; #line 191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp27_ = id; + _tmp19_ = id; #line 191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp28_ = normalized; + _tmp20_ = normalized; #line 191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_, _tmp28_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp19_, _tmp20_); #line 193 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = TRUE; #line 193 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7956,23 +7784,25 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo _g_free0 (existing_id); #line 193 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7954 "DirectoryMonitor.c" +#line 7782 "DirectoryMonitor.c" } -static gboolean directory_monitor_file_info_map_remove (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info) { +static gboolean +directory_monitor_file_info_map_remove (DirectoryMonitorFileInfoMap* self, + GFile* file, + GFileInfo* info) +{ gboolean result = FALSE; gchar* id = NULL; GFile* normalized = NULL; - GFile* _tmp0_; - GFileInfo* _tmp1_; - GFile* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gboolean _tmp4_; + GFile* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; + gboolean _tmp2_; + GeeHashMap* _tmp3_; + GFile* _tmp4_; GeeHashMap* _tmp5_; - GFile* _tmp6_; - GeeHashMap* _tmp7_; - const gchar* _tmp8_; + const gchar* _tmp6_; #line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), FALSE); #line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7980,21 +7810,17 @@ static gboolean directory_monitor_file_info_map_remove (DirectoryMonitorFileInfo #line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail ((info == NULL) || G_IS_FILE_INFO (info), FALSE); #line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = file; -#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = info; -#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = directory_monitor_file_info_map_normalize_file (self, _tmp0_, _tmp1_, &_tmp2_, &_tmp3_); + _tmp2_ = directory_monitor_file_info_map_normalize_file (self, file, info, &_tmp0_, &_tmp1_); #line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); #line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - normalized = _tmp2_; + normalized = _tmp0_; #line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); #line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - id = _tmp3_; + id = _tmp1_; #line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_tmp4_) { + if (!_tmp2_) { #line 200 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; #line 200 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8003,20 +7829,20 @@ static gboolean directory_monitor_file_info_map_remove (DirectoryMonitorFileInfo _g_free0 (id); #line 200 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8001 "DirectoryMonitor.c" +#line 7827 "DirectoryMonitor.c" } #line 202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = self->priv->map; + _tmp3_ = self->priv->map; #line 202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = normalized; + _tmp4_ = normalized; #line 202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, NULL); #line 203 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = self->priv->id_map; + _tmp5_ = self->priv->id_map; #line 203 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = id; + _tmp6_ = id; #line 203 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_, NULL); #line 205 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = TRUE; #line 205 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8025,78 +7851,76 @@ static gboolean directory_monitor_file_info_map_remove (DirectoryMonitorFileInfo _g_free0 (id); #line 205 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8023 "DirectoryMonitor.c" +#line 7849 "DirectoryMonitor.c" } -static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfoMap* self, GeeCollection* files) { +static void +directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfoMap* self, + GeeCollection* files) +{ #line 210 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self)); #line 210 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (GEE_IS_COLLECTION (files)); -#line 8032 "DirectoryMonitor.c" +#line 7861 "DirectoryMonitor.c" { GeeIterator* _file_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = files; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (files, GEE_TYPE_ITERABLE, GeeIterable)); #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _file_it = _tmp1_; + _file_it = _tmp0_; #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 8045 "DirectoryMonitor.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 7871 "DirectoryMonitor.c" + GeeIterator* _tmp1_; GFile* file = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - GFile* _tmp6_; -#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = _file_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + GFile* _tmp4_; #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _file_it; #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 8060 "DirectoryMonitor.c" +#line 7883 "DirectoryMonitor.c" } #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = _file_it; + _tmp2_ = _file_it; #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - file = (GFile*) _tmp5_; + file = (GFile*) _tmp3_; #line 212 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = file; + _tmp4_ = file; #line 212 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_file_info_map_remove (self, _tmp6_, NULL); + directory_monitor_file_info_map_remove (self, _tmp4_, NULL); #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (file); -#line 8074 "DirectoryMonitor.c" +#line 7897 "DirectoryMonitor.c" } #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_file_it); -#line 8078 "DirectoryMonitor.c" +#line 7901 "DirectoryMonitor.c" } } -static gboolean directory_monitor_file_info_map_contains (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info) { +static gboolean +directory_monitor_file_info_map_contains (DirectoryMonitorFileInfoMap* self, + GFile* file, + GFileInfo* info) +{ gboolean result = FALSE; gchar* id = NULL; GFile* normalized = NULL; - GFile* _tmp0_; - GFileInfo* _tmp1_; - GFile* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gboolean _tmp4_; - GeeHashMap* _tmp5_; - const gchar* _tmp6_; - gboolean _tmp7_; + GFile* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; + gboolean _tmp2_; + GeeHashMap* _tmp3_; + const gchar* _tmp4_; #line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), FALSE); #line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8104,21 +7928,17 @@ static gboolean directory_monitor_file_info_map_contains (DirectoryMonitorFileIn #line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail ((info == NULL) || G_IS_FILE_INFO (info), FALSE); #line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = file; -#line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = info; -#line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = directory_monitor_file_info_map_normalize_file (self, _tmp0_, _tmp1_, &_tmp2_, &_tmp3_); + _tmp2_ = directory_monitor_file_info_map_normalize_file (self, file, info, &_tmp0_, &_tmp1_); #line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); #line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - normalized = _tmp2_; + normalized = _tmp0_; #line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); #line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - id = _tmp3_; + id = _tmp1_; #line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_tmp4_) { + if (!_tmp2_) { #line 219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = FALSE; #line 219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8127,35 +7947,35 @@ static gboolean directory_monitor_file_info_map_contains (DirectoryMonitorFileIn _g_free0 (id); #line 219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8125 "DirectoryMonitor.c" +#line 7945 "DirectoryMonitor.c" } #line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = self->priv->id_map; -#line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = id; + _tmp3_ = self->priv->id_map; #line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_); + _tmp4_ = id; #line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - result = _tmp7_; + result = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); #line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); #line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); #line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8141 "DirectoryMonitor.c" +#line 7959 "DirectoryMonitor.c" } -static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info) { +static gchar* +directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMap* self, + GFile* file, + GFileInfo* info) +{ gchar* result = NULL; - GFileInfo* _tmp0_; gchar* id = NULL; GFile* normalized = NULL; - GFile* _tmp3_; - GFile* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gboolean _tmp6_; + GFile* _tmp1_ = NULL; + gchar* _tmp2_ = NULL; + gboolean _tmp3_; #line 224 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL); #line 224 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8163,36 +7983,29 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa #line 224 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail ((info == NULL) || G_IS_FILE_INFO (info), NULL); #line 226 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = info; -#line 226 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp0_ != NULL) { -#line 8164 "DirectoryMonitor.c" - GFileInfo* _tmp1_; - gchar* _tmp2_; -#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = info; + if (info != NULL) { +#line 7982 "DirectoryMonitor.c" + gchar* _tmp0_; #line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = get_file_info_id (_tmp1_); + _tmp0_ = get_file_info_id (info); #line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - result = _tmp2_; + result = _tmp0_; #line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8175 "DirectoryMonitor.c" +#line 7990 "DirectoryMonitor.c" } #line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = file; -#line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = directory_monitor_file_info_map_normalize_file (self, _tmp3_, NULL, &_tmp4_, &_tmp5_); + _tmp3_ = directory_monitor_file_info_map_normalize_file (self, file, NULL, &_tmp1_, &_tmp2_); #line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); #line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - normalized = _tmp4_; + normalized = _tmp1_; #line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); #line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - id = _tmp5_; + id = _tmp2_; #line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_tmp6_) { + if (!_tmp3_) { #line 232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = NULL; #line 232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8201,7 +8014,7 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa _g_free0 (id); #line 232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8199 "DirectoryMonitor.c" +#line 8012 "DirectoryMonitor.c" } #line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = id; @@ -8209,11 +8022,13 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa _g_object_unref0 (normalized); #line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8207 "DirectoryMonitor.c" +#line 8020 "DirectoryMonitor.c" } -static GeeCollection* directory_monitor_file_info_map_get_all (DirectoryMonitorFileInfoMap* self) { +static GeeCollection* +directory_monitor_file_info_map_get_all (DirectoryMonitorFileInfoMap* self) +{ GeeCollection* result = NULL; GeeHashMap* _tmp0_; GeeSet* _tmp1_; @@ -8230,26 +8045,27 @@ static GeeCollection* directory_monitor_file_info_map_get_all (DirectoryMonitorF result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8228 "DirectoryMonitor.c" +#line 8043 "DirectoryMonitor.c" } -static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFileInfoMap* self, GFile* file) { +static GFileInfo* +directory_monitor_file_info_map_get_info (DirectoryMonitorFileInfoMap* self, + GFile* file) +{ GFileInfo* result = NULL; GFileInfo* info = NULL; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gpointer _tmp2_; - GFileInfo* _tmp3_; + gpointer _tmp1_; + GFileInfo* _tmp2_; gchar* id = NULL; GFile* normalized = NULL; - GFile* _tmp4_; - GFile* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gboolean _tmp7_; - GeeHashMap* _tmp8_; - GFile* _tmp9_; - gpointer _tmp10_; + GFile* _tmp3_ = NULL; + gchar* _tmp4_ = NULL; + gboolean _tmp5_; + GeeHashMap* _tmp6_; + GFile* _tmp7_; + gpointer _tmp8_; #line 241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL); #line 241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8257,35 +8073,31 @@ static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFile #line 243 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->map; #line 243 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = file; -#line 243 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 243 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - info = (GFileInfo*) _tmp2_; + info = (GFileInfo*) _tmp1_; #line 244 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = info; + _tmp2_ = info; #line 244 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp3_ != NULL) { + if (_tmp2_ != NULL) { #line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = info; #line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8268 "DirectoryMonitor.c" +#line 8082 "DirectoryMonitor.c" } #line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = file; -#line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = directory_monitor_file_info_map_normalize_file (self, _tmp4_, NULL, &_tmp5_, &_tmp6_); + _tmp5_ = directory_monitor_file_info_map_normalize_file (self, file, NULL, &_tmp3_, &_tmp4_); #line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); #line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - normalized = _tmp5_; + normalized = _tmp3_; #line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (id); #line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - id = _tmp6_; + id = _tmp4_; #line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_tmp7_) { + if (!_tmp5_) { #line 250 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = NULL; #line 250 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8296,16 +8108,16 @@ static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFile _g_object_unref0 (info); #line 250 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8294 "DirectoryMonitor.c" +#line 8106 "DirectoryMonitor.c" } #line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = self->priv->map; + _tmp6_ = self->priv->map; #line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = normalized; + _tmp7_ = normalized; #line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_); + _tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_); #line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - result = (GFileInfo*) _tmp10_; + result = (GFileInfo*) _tmp8_; #line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); #line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8314,31 +8126,32 @@ static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFile _g_object_unref0 (info); #line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8312 "DirectoryMonitor.c" +#line 8124 "DirectoryMonitor.c" } -static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFileInfoMap* self, GFile* file, GCancellable* cancellable) { +static GFileInfo* +directory_monitor_file_info_map_query_info (DirectoryMonitorFileInfoMap* self, + GFile* file, + GCancellable* cancellable) +{ GFileInfo* result = NULL; GFileInfo* info = NULL; - GFile* _tmp0_; + GFileInfo* _tmp0_; GFileInfo* _tmp1_; - GFileInfo* _tmp2_; - GFileInfo* _tmp13_; - gboolean _tmp14_; + GFileInfo* _tmp9_; gchar* id = NULL; - GFileInfo* _tmp15_; - const gchar* _tmp16_; - gchar* _tmp17_; - const gchar* _tmp18_; + GFileInfo* _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + const gchar* _tmp13_; GFile* normalized = NULL; - GeeHashMap* _tmp23_; - const gchar* _tmp24_; - gpointer _tmp25_; - GFile* _tmp26_; - GeeHashMap* _tmp27_; - GFile* _tmp28_; - gpointer _tmp29_; + GeeHashMap* _tmp17_; + const gchar* _tmp18_; + gpointer _tmp19_; + GFile* _tmp20_; + GeeHashMap* _tmp21_; + gpointer _tmp22_; GError * _inner_error_ = NULL; #line 255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL); @@ -8347,79 +8160,68 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi #line 255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable), NULL); #line 256 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = file; -#line 256 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = directory_monitor_file_info_map_get_info (self, _tmp0_); + _tmp0_ = directory_monitor_file_info_map_get_info (self, file); #line 256 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - info = _tmp1_; + info = _tmp0_; #line 257 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = info; + _tmp1_ = info; #line 257 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp2_ != NULL) { + if (_tmp1_ != NULL) { #line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = info; #line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8358 "DirectoryMonitor.c" +#line 8169 "DirectoryMonitor.c" } { - GFileInfo* _tmp3_ = NULL; - GFile* _tmp4_; - GCancellable* _tmp5_; - GFileInfo* _tmp6_; - GFileInfo* _tmp7_; -#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = file; -#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = cancellable; + GFileInfo* _tmp2_ = NULL; + GFileInfo* _tmp3_; + GFileInfo* _tmp4_; #line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp6_ = g_file_query_info (_tmp4_, G_FILE_ATTRIBUTE_ID_FILE, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, _tmp5_, &_inner_error_); + _tmp3_ = g_file_query_info (file, G_FILE_ATTRIBUTE_ID_FILE, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, cancellable, &_inner_error_); #line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = _tmp6_; + _tmp2_ = _tmp3_; #line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8376 "DirectoryMonitor.c" +#line 8181 "DirectoryMonitor.c" goto __catch494_g_error; } #line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = _tmp3_; + _tmp4_ = _tmp2_; #line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = NULL; + _tmp2_ = NULL; #line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (info); #line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - info = _tmp7_; + info = _tmp4_; #line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_tmp3_); -#line 8389 "DirectoryMonitor.c" + _g_object_unref0 (_tmp2_); +#line 8194 "DirectoryMonitor.c" } goto __finally494; __catch494_g_error: { GError* err = NULL; - GFile* _tmp8_; - gchar* _tmp9_; - gchar* _tmp10_; - GError* _tmp11_; - const gchar* _tmp12_; + gchar* _tmp5_; + gchar* _tmp6_; + GError* _tmp7_; + const gchar* _tmp8_; #line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" err = _inner_error_; #line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _inner_error_ = NULL; #line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = file; -#line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = g_file_get_path (_tmp8_); + _tmp5_ = g_file_get_path (file); #line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = _tmp9_; + _tmp6_ = _tmp5_; #line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp11_ = err; + _tmp7_ = err; #line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp12_ = _tmp11_->message; + _tmp8_ = _tmp7_->message; #line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:265: Unable to query file ID of %s: %s", _tmp10_, _tmp12_); + g_warning ("DirectoryMonitor.vala:265: Unable to query file ID of %s: %s", _tmp6_, _tmp8_); #line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp6_); #line 267 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = NULL; #line 267 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8428,7 +8230,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi _g_object_unref0 (info); #line 267 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8426 "DirectoryMonitor.c" +#line 8228 "DirectoryMonitor.c" } __finally494: #line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8441,65 +8243,60 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi g_clear_error (&_inner_error_); #line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return NULL; -#line 8439 "DirectoryMonitor.c" +#line 8241 "DirectoryMonitor.c" } #line 270 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp13_ = info; -#line 270 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp14_ = directory_monitor_is_file_symlink_supported (_tmp13_); + _tmp9_ = info; #line 270 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_tmp14_) { + if (!directory_monitor_is_file_symlink_supported (_tmp9_)) { #line 271 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = NULL; #line 271 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (info); #line 271 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8453 "DirectoryMonitor.c" +#line 8253 "DirectoryMonitor.c" } #line 273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp15_ = info; + _tmp10_ = info; #line 273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp16_ = g_file_info_get_attribute_string (_tmp15_, G_FILE_ATTRIBUTE_ID_FILE); + _tmp11_ = g_file_info_get_attribute_string (_tmp10_, G_FILE_ATTRIBUTE_ID_FILE); #line 273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp17_ = g_strdup (_tmp16_); + _tmp12_ = g_strdup (_tmp11_); #line 273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - id = _tmp17_; + id = _tmp12_; #line 274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp18_ = id; + _tmp13_ = id; #line 274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp18_ == NULL) { -#line 8467 "DirectoryMonitor.c" - GFileInfo* _tmp19_; - GFile* _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; -#line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp19_ = info; + if (_tmp13_ == NULL) { +#line 8267 "DirectoryMonitor.c" + GFileInfo* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; #line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp20_ = file; + _tmp14_ = info; #line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp21_ = g_file_get_uri (_tmp20_); + _tmp15_ = g_file_get_uri (file); #line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp22_ = _tmp21_; + _tmp16_ = _tmp15_; #line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_file_info_set_attribute_string (_tmp19_, G_FILE_ATTRIBUTE_ID_FILE, _tmp22_); + g_file_info_set_attribute_string (_tmp14_, G_FILE_ATTRIBUTE_ID_FILE, _tmp16_); #line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp22_); -#line 8484 "DirectoryMonitor.c" + _g_free0 (_tmp16_); +#line 8281 "DirectoryMonitor.c" } #line 279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp23_ = self->priv->id_map; + _tmp17_ = self->priv->id_map; #line 279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp24_ = id; + _tmp18_ = id; #line 279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp25_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_); + _tmp19_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp18_); #line 279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - normalized = (GFile*) _tmp25_; + normalized = (GFile*) _tmp19_; #line 280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp26_ = normalized; + _tmp20_ = normalized; #line 280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp26_ == NULL) { + if (_tmp20_ == NULL) { #line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = NULL; #line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8510,16 +8307,14 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi _g_object_unref0 (info); #line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8508 "DirectoryMonitor.c" +#line 8305 "DirectoryMonitor.c" } #line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp27_ = self->priv->map; -#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp28_ = file; + _tmp21_ = self->priv->map; #line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp29_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp28_); + _tmp22_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - result = (GFileInfo*) _tmp29_; + result = (GFileInfo*) _tmp22_; #line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (normalized); #line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8528,146 +8323,133 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi _g_object_unref0 (info); #line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8526 "DirectoryMonitor.c" +#line 8321 "DirectoryMonitor.c" } -static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileInfoMap* self, GFileInfo* match) { +static GFile* +directory_monitor_file_info_map_find_match (DirectoryMonitorFileInfoMap* self, + GFileInfo* match) +{ GFile* result = NULL; gchar* match_id = NULL; - GFileInfo* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp0_; + const gchar* _tmp1_; gint64 match_size = 0LL; - GFileInfo* _tmp3_; - gint64 _tmp4_; GTimeVal match_time = {0}; - GFileInfo* _tmp5_; - GTimeVal _tmp6_ = {0}; + GTimeVal _tmp2_ = {0}; #line 286 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL); #line 286 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (match), NULL); #line 287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = match; -#line 287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = get_file_info_id (_tmp0_); + _tmp0_ = get_file_info_id (match); #line 287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - match_id = _tmp1_; + match_id = _tmp0_; #line 288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = match_id; + _tmp1_ = match_id; #line 288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = NULL; #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (match_id); #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8562 "DirectoryMonitor.c" +#line 8354 "DirectoryMonitor.c" } #line 292 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp3_ = match; -#line 292 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp4_ = g_file_info_get_size (_tmp3_); -#line 292 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - match_size = _tmp4_; + match_size = g_file_info_get_size (match); #line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp5_ = match; + g_file_info_get_modification_time (match, &_tmp2_); #line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_file_info_get_modification_time (_tmp5_, &_tmp6_); -#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - match_time = _tmp6_; -#line 8576 "DirectoryMonitor.c" + match_time = _tmp2_; +#line 8362 "DirectoryMonitor.c" { GeeIterator* _file_it = NULL; - GeeHashMap* _tmp7_; - GeeSet* _tmp8_; - GeeSet* _tmp9_; - GeeSet* _tmp10_; - GeeIterator* _tmp11_; - GeeIterator* _tmp12_; + GeeHashMap* _tmp3_; + GeeSet* _tmp4_; + GeeSet* _tmp5_; + GeeSet* _tmp6_; + GeeIterator* _tmp7_; + GeeIterator* _tmp8_; #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = self->priv->map; + _tmp3_ = self->priv->map; #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp4_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = _tmp8_; + _tmp5_ = _tmp4_; #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = _tmp9_; + _tmp6_ = _tmp5_; #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp6_); #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _file_it = _tmp12_; + _file_it = _tmp8_; #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 8603 "DirectoryMonitor.c" - GeeIterator* _tmp13_; - gboolean _tmp14_; +#line 8389 "DirectoryMonitor.c" + GeeIterator* _tmp9_; GFile* file = NULL; - GeeIterator* _tmp15_; - gpointer _tmp16_; + GeeIterator* _tmp10_; + gpointer _tmp11_; GFileInfo* info = NULL; - GeeHashMap* _tmp17_; - GFile* _tmp18_; - gpointer _tmp19_; - GFileInfo* _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; - const gchar* _tmp23_; - gboolean _tmp24_; - gint64 _tmp25_; - GFileInfo* _tmp26_; - gint64 _tmp27_; + GeeHashMap* _tmp12_; + GFile* _tmp13_; + gpointer _tmp14_; + GFileInfo* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + const gchar* _tmp18_; + gboolean _tmp19_; + gint64 _tmp20_; + GFileInfo* _tmp21_; GTimeVal time = {0}; - GFileInfo* _tmp28_; - GTimeVal _tmp29_ = {0}; - GTimeVal _tmp30_; - glong _tmp31_; - GTimeVal _tmp32_; - glong _tmp33_; + GFileInfo* _tmp22_; + GTimeVal _tmp23_ = {0}; + GTimeVal _tmp24_; + glong _tmp25_; + GTimeVal _tmp26_; + glong _tmp27_; #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp13_ = _file_it; + _tmp9_ = _file_it; #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp14_ = gee_iterator_next (_tmp13_); -#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_tmp14_) { + if (!gee_iterator_next (_tmp9_)) { #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 8636 "DirectoryMonitor.c" +#line 8418 "DirectoryMonitor.c" } #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp15_ = _file_it; + _tmp10_ = _file_it; #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp16_ = gee_iterator_get (_tmp15_); + _tmp11_ = gee_iterator_get (_tmp10_); #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - file = (GFile*) _tmp16_; + file = (GFile*) _tmp11_; #line 296 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp17_ = self->priv->map; + _tmp12_ = self->priv->map; #line 296 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp18_ = file; + _tmp13_ = file; #line 296 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp19_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp18_); + _tmp14_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_); #line 296 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - info = (GFileInfo*) _tmp19_; + info = (GFileInfo*) _tmp14_; #line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp20_ = info; + _tmp15_ = info; #line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp21_ = get_file_info_id (_tmp20_); + _tmp16_ = get_file_info_id (_tmp15_); #line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp22_ = _tmp21_; + _tmp17_ = _tmp16_; #line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp23_ = match_id; + _tmp18_ = match_id; #line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp24_ = g_strcmp0 (_tmp22_, _tmp23_) == 0; + _tmp19_ = g_strcmp0 (_tmp17_, _tmp18_) == 0; #line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp17_); #line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp24_) { + if (_tmp19_) { #line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = file; #line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8678,47 +8460,45 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn _g_free0 (match_id); #line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8676 "DirectoryMonitor.c" +#line 8458 "DirectoryMonitor.c" } #line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp25_ = match_size; -#line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp26_ = info; + _tmp20_ = match_size; #line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp27_ = g_file_info_get_size (_tmp26_); + _tmp21_ = info; #line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp25_ != _tmp27_) { + if (_tmp20_ != g_file_info_get_size (_tmp21_)) { #line 304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (info); #line 304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (file); #line 304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 8692 "DirectoryMonitor.c" +#line 8472 "DirectoryMonitor.c" } #line 306 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp28_ = info; + _tmp22_ = info; #line 306 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_file_info_get_modification_time (_tmp28_, &_tmp29_); + g_file_info_get_modification_time (_tmp22_, &_tmp23_); #line 306 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - time = _tmp29_; + time = _tmp23_; #line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp30_ = time; + _tmp24_ = time; #line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp31_ = _tmp30_.tv_sec; + _tmp25_ = _tmp24_.tv_sec; #line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp32_ = match_time; + _tmp26_ = match_time; #line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp33_ = _tmp32_.tv_sec; + _tmp27_ = _tmp26_.tv_sec; #line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp31_ != _tmp33_) { + if (_tmp25_ != _tmp27_) { #line 309 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (info); #line 309 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (file); #line 309 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 8716 "DirectoryMonitor.c" +#line 8496 "DirectoryMonitor.c" } #line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = file; @@ -8730,11 +8510,11 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn _g_free0 (match_id); #line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8728 "DirectoryMonitor.c" +#line 8508 "DirectoryMonitor.c" } #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_file_it); -#line 8732 "DirectoryMonitor.c" +#line 8512 "DirectoryMonitor.c" } #line 314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = NULL; @@ -8742,13 +8522,17 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn _g_free0 (match_id); #line 314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8740 "DirectoryMonitor.c" +#line 8520 "DirectoryMonitor.c" } -static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitorFileInfoMap* self, GFile* root, DirectoryMonitorFileInfoMap* descendents) { +static void +directory_monitor_file_info_map_remove_descendents (DirectoryMonitorFileInfoMap* self, + GFile* root, + DirectoryMonitorFileInfoMap* descendents) +{ GeeArrayList* pruned = NULL; - GeeArrayList* _tmp28_; + GeeArrayList* _tmp24_; #line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self)); #line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8757,7 +8541,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor g_return_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (descendents)); #line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" pruned = NULL; -#line 8755 "DirectoryMonitor.c" +#line 8539 "DirectoryMonitor.c" { GeeIterator* _file_it = NULL; GeeHashMap* _tmp0_; @@ -8784,151 +8568,144 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor _file_it = _tmp5_; #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 8782 "DirectoryMonitor.c" +#line 8566 "DirectoryMonitor.c" GeeIterator* _tmp6_; - gboolean _tmp7_; GFile* file = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp7_; + gpointer _tmp8_; GFile* parent = NULL; + GFile* _tmp9_; GFile* _tmp10_; - GFile* _tmp11_; #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = _file_it; #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 8799 "DirectoryMonitor.c" +#line 8580 "DirectoryMonitor.c" } #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = _file_it; + _tmp7_ = _file_it; #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - file = (GFile*) _tmp9_; + file = (GFile*) _tmp8_; #line 320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = file; + _tmp9_ = file; #line 320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp11_ = g_file_get_parent (_tmp10_); + _tmp10_ = g_file_get_parent (_tmp9_); #line 320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - parent = _tmp11_; + parent = _tmp10_; #line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 8815 "DirectoryMonitor.c" +#line 8596 "DirectoryMonitor.c" + GFile* _tmp11_; GFile* _tmp12_; - GFile* _tmp13_; - GFile* _tmp14_; - gboolean _tmp15_; - GFile* _tmp26_; - GFile* _tmp27_; + GFile* _tmp22_; + GFile* _tmp23_; #line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp12_ = parent; + _tmp11_ = parent; #line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!(_tmp12_ != NULL)) { + if (!(_tmp11_ != NULL)) { #line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 8828 "DirectoryMonitor.c" +#line 8607 "DirectoryMonitor.c" } #line 322 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp13_ = parent; -#line 322 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp14_ = root; -#line 322 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp15_ = g_file_equal (_tmp13_, _tmp14_); + _tmp12_ = parent; #line 322 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp15_) { -#line 8838 "DirectoryMonitor.c" - GeeArrayList* _tmp16_; - GeeArrayList* _tmp18_; + if (g_file_equal (_tmp12_, root)) { +#line 8613 "DirectoryMonitor.c" + GeeArrayList* _tmp13_; + GeeArrayList* _tmp15_; + GFile* _tmp16_; + GFile* _tmp17_; + GeeHashMap* _tmp18_; GFile* _tmp19_; - DirectoryMonitorFileInfoMap* _tmp20_; - GFile* _tmp21_; - GeeHashMap* _tmp22_; - GFile* _tmp23_; - gpointer _tmp24_; - GFileInfo* _tmp25_; + gpointer _tmp20_; + GFileInfo* _tmp21_; #line 323 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp16_ = pruned; + _tmp13_ = pruned; #line 323 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp16_ == NULL) { -#line 8852 "DirectoryMonitor.c" - GeeArrayList* _tmp17_; + if (_tmp13_ == NULL) { +#line 8626 "DirectoryMonitor.c" + GeeArrayList* _tmp14_; #line 324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp17_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp14_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (pruned); #line 324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - pruned = _tmp17_; -#line 8860 "DirectoryMonitor.c" + pruned = _tmp14_; +#line 8634 "DirectoryMonitor.c" } #line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp18_ = pruned; + _tmp15_ = pruned; #line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp19_ = file; + _tmp16_ = file; #line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_); -#line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp20_ = descendents; + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_); #line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp21_ = file; + _tmp17_ = file; #line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp22_ = self->priv->map; + _tmp18_ = self->priv->map; #line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp23_ = file; + _tmp19_ = file; #line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp24_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp23_); + _tmp20_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp19_); #line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp25_ = (GFileInfo*) _tmp24_; + _tmp21_ = (GFileInfo*) _tmp20_; #line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_file_info_map_update (_tmp20_, _tmp21_, _tmp25_); + directory_monitor_file_info_map_update (descendents, _tmp17_, _tmp21_); #line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_tmp25_); + _g_object_unref0 (_tmp21_); #line 329 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 8886 "DirectoryMonitor.c" +#line 8658 "DirectoryMonitor.c" } #line 332 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp26_ = parent; + _tmp22_ = parent; #line 332 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp27_ = g_file_get_parent (_tmp26_); + _tmp23_ = g_file_get_parent (_tmp22_); #line 332 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (parent); #line 332 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - parent = _tmp27_; -#line 8896 "DirectoryMonitor.c" + parent = _tmp23_; +#line 8668 "DirectoryMonitor.c" } #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (parent); #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (file); -#line 8902 "DirectoryMonitor.c" +#line 8674 "DirectoryMonitor.c" } #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_file_it); -#line 8906 "DirectoryMonitor.c" +#line 8678 "DirectoryMonitor.c" } #line 336 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp28_ = pruned; + _tmp24_ = pruned; #line 336 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp28_ != NULL) { -#line 8912 "DirectoryMonitor.c" - GeeArrayList* _tmp29_; + if (_tmp24_ != NULL) { +#line 8684 "DirectoryMonitor.c" + GeeArrayList* _tmp25_; #line 337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp29_ = pruned; + _tmp25_ = pruned; #line 337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_file_info_map_remove_all (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 8918 "DirectoryMonitor.c" + directory_monitor_file_info_map_remove_all (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 8690 "DirectoryMonitor.c" } #line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (pruned); -#line 8922 "DirectoryMonitor.c" +#line 8694 "DirectoryMonitor.c" } -static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileInfoMap* self, GFile* root, GeeCollection* files, GeeCollection* dirs) { +static gint +directory_monitor_file_info_map_get_children (DirectoryMonitorFileInfoMap* self, + GFile* root, + GeeCollection* files, + GeeCollection* dirs) +{ gint result = 0; gint count = 0; #line 342 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8941,7 +8718,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn g_return_val_if_fail (GEE_IS_COLLECTION (dirs), 0); #line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" count = 0; -#line 8939 "DirectoryMonitor.c" +#line 8716 "DirectoryMonitor.c" { GeeIterator* _file_it = NULL; GeeHashMap* _tmp0_; @@ -8968,268 +8745,275 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn _file_it = _tmp5_; #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 8966 "DirectoryMonitor.c" +#line 8743 "DirectoryMonitor.c" GeeIterator* _tmp6_; - gboolean _tmp7_; GFile* file = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp7_; + gpointer _tmp8_; GFile* parent = NULL; + GFile* _tmp9_; GFile* _tmp10_; - GFile* _tmp11_; - gboolean _tmp12_ = FALSE; - GFile* _tmp13_; + gboolean _tmp11_ = FALSE; + GFile* _tmp12_; DirectoryMonitorFType ftype = 0; - GeeHashMap* _tmp17_; - GFile* _tmp18_; - gpointer _tmp19_; - GFileInfo* _tmp20_; - DirectoryMonitorFType _tmp21_; - DirectoryMonitorFType _tmp22_; - DirectoryMonitorFType _tmp23_; + GeeHashMap* _tmp14_; + GFile* _tmp15_; + gpointer _tmp16_; + GFileInfo* _tmp17_; + DirectoryMonitorFType _tmp18_; + DirectoryMonitorFType _tmp19_; #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = _file_it; #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 8993 "DirectoryMonitor.c" +#line 8766 "DirectoryMonitor.c" } #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = _file_it; + _tmp7_ = _file_it; #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - file = (GFile*) _tmp9_; + file = (GFile*) _tmp8_; #line 345 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp10_ = file; + _tmp9_ = file; #line 345 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp11_ = g_file_get_parent (_tmp10_); + _tmp10_ = g_file_get_parent (_tmp9_); #line 345 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - parent = _tmp11_; + parent = _tmp10_; #line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp13_ = parent; + _tmp12_ = parent; #line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp13_ == NULL) { + if (_tmp12_ == NULL) { #line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp12_ = TRUE; -#line 9013 "DirectoryMonitor.c" + _tmp11_ = TRUE; +#line 8786 "DirectoryMonitor.c" } else { - GFile* _tmp14_; - GFile* _tmp15_; - gboolean _tmp16_; -#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp14_ = parent; -#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp15_ = root; + GFile* _tmp13_; #line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp16_ = g_file_equal (_tmp14_, _tmp15_); + _tmp13_ = parent; #line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp12_ = !_tmp16_; -#line 9026 "DirectoryMonitor.c" + _tmp11_ = !g_file_equal (_tmp13_, root); +#line 8793 "DirectoryMonitor.c" } #line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_tmp12_) { + if (_tmp11_) { #line 347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (parent); #line 347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (file); #line 347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 9036 "DirectoryMonitor.c" +#line 8803 "DirectoryMonitor.c" } #line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp17_ = self->priv->map; + _tmp14_ = self->priv->map; #line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp18_ = file; + _tmp15_ = file; #line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp19_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp18_); + _tmp16_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_); #line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp20_ = (GFileInfo*) _tmp19_; + _tmp17_ = (GFileInfo*) _tmp16_; #line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp21_ = directory_monitor_get_ftype (_tmp20_); + _tmp18_ = directory_monitor_get_ftype (_tmp17_); #line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp22_ = _tmp21_; + _g_object_unref0 (_tmp17_); #line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_tmp20_); -#line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ftype = _tmp22_; + ftype = _tmp18_; #line 350 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp23_ = ftype; + _tmp19_ = ftype; #line 350 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - switch (_tmp23_) { + switch (_tmp19_) { #line 350 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 9060 "DirectoryMonitor.c" +#line 8825 "DirectoryMonitor.c" { - GeeCollection* _tmp24_; - GFile* _tmp25_; - gint _tmp26_; -#line 352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp24_ = files; + GFile* _tmp20_; + gint _tmp21_; #line 352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp25_ = file; + _tmp20_ = file; #line 352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - gee_collection_add (_tmp24_, _tmp25_); + gee_collection_add (files, _tmp20_); #line 353 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp26_ = count; + _tmp21_ = count; #line 353 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - count = _tmp26_ + 1; + count = _tmp21_ + 1; #line 354 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9077 "DirectoryMonitor.c" +#line 8839 "DirectoryMonitor.c" } #line 350 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 9081 "DirectoryMonitor.c" +#line 8843 "DirectoryMonitor.c" { - GeeCollection* _tmp27_; - GFile* _tmp28_; - gint _tmp29_; + GFile* _tmp22_; + gint _tmp23_; #line 357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp27_ = dirs; + _tmp22_ = file; #line 357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp28_ = file; -#line 357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - gee_collection_add (_tmp27_, _tmp28_); + gee_collection_add (dirs, _tmp22_); #line 358 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp29_ = count; + _tmp23_ = count; #line 358 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - count = _tmp29_ + 1; + count = _tmp23_ + 1; #line 359 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9098 "DirectoryMonitor.c" +#line 8857 "DirectoryMonitor.c" } default: { - DirectoryMonitorFType _tmp30_; + DirectoryMonitorFType _tmp24_; #line 362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp30_ = ftype; + _tmp24_ = ftype; #line 362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _vala_assert (_tmp30_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); + _vala_assert (_tmp24_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 363 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9109 "DirectoryMonitor.c" +#line 8868 "DirectoryMonitor.c" } } #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (parent); #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (file); -#line 9116 "DirectoryMonitor.c" +#line 8875 "DirectoryMonitor.c" } #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_file_it); -#line 9120 "DirectoryMonitor.c" +#line 8879 "DirectoryMonitor.c" } #line 367 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = count; #line 367 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 9126 "DirectoryMonitor.c" +#line 8885 "DirectoryMonitor.c" } -static void directory_monitor_value_file_info_map_init (GValue* value) { +static void +directory_monitor_value_file_info_map_init (GValue* value) +{ #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 9133 "DirectoryMonitor.c" +#line 8894 "DirectoryMonitor.c" } -static void directory_monitor_value_file_info_map_free_value (GValue* value) { +static void +directory_monitor_value_file_info_map_free_value (GValue* value) +{ #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (value->data[0].v_pointer) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_unref (value->data[0].v_pointer); -#line 9142 "DirectoryMonitor.c" +#line 8905 "DirectoryMonitor.c" } } -static void directory_monitor_value_file_info_map_copy_value (const GValue* src_value, GValue* dest_value) { +static void +directory_monitor_value_file_info_map_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (src_value->data[0].v_pointer) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" dest_value->data[0].v_pointer = directory_monitor_file_info_map_ref (src_value->data[0].v_pointer); -#line 9152 "DirectoryMonitor.c" +#line 8918 "DirectoryMonitor.c" } else { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" dest_value->data[0].v_pointer = NULL; -#line 9156 "DirectoryMonitor.c" +#line 8922 "DirectoryMonitor.c" } } -static gpointer directory_monitor_value_file_info_map_peek_pointer (const GValue* value) { +static gpointer +directory_monitor_value_file_info_map_peek_pointer (const GValue* value) +{ #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return value->data[0].v_pointer; -#line 9164 "DirectoryMonitor.c" +#line 8932 "DirectoryMonitor.c" } -static gchar* directory_monitor_value_file_info_map_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +directory_monitor_value_file_info_map_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (collect_values[0].v_pointer) { -#line 9171 "DirectoryMonitor.c" +#line 8944 "DirectoryMonitor.c" DirectoryMonitorFileInfoMap * object; object = collect_values[0].v_pointer; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (object->parent_instance.g_class == NULL) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9178 "DirectoryMonitor.c" +#line 8951 "DirectoryMonitor.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.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 9182 "DirectoryMonitor.c" +#line 8955 "DirectoryMonitor.c" } #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = directory_monitor_file_info_map_ref (object); -#line 9186 "DirectoryMonitor.c" +#line 8959 "DirectoryMonitor.c" } else { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 9190 "DirectoryMonitor.c" +#line 8963 "DirectoryMonitor.c" } #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return NULL; -#line 9194 "DirectoryMonitor.c" +#line 8967 "DirectoryMonitor.c" } -static gchar* directory_monitor_value_file_info_map_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +directory_monitor_value_file_info_map_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ DirectoryMonitorFileInfoMap ** object_p; object_p = collect_values[0].v_pointer; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!object_p) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 9205 "DirectoryMonitor.c" +#line 8983 "DirectoryMonitor.c" } #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!value->data[0].v_pointer) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = NULL; -#line 9211 "DirectoryMonitor.c" +#line 8989 "DirectoryMonitor.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = value->data[0].v_pointer; -#line 9215 "DirectoryMonitor.c" +#line 8993 "DirectoryMonitor.c" } else { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = directory_monitor_file_info_map_ref (value->data[0].v_pointer); -#line 9219 "DirectoryMonitor.c" +#line 8997 "DirectoryMonitor.c" } #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return NULL; -#line 9223 "DirectoryMonitor.c" +#line 9001 "DirectoryMonitor.c" } -static GParamSpec* directory_monitor_param_spec_file_info_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +static GParamSpec* +directory_monitor_param_spec_file_info_map (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ DirectoryMonitorParamSpecFileInfoMap* spec; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (g_type_is_a (object_type, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP), NULL); @@ -9239,20 +9023,25 @@ static GParamSpec* directory_monitor_param_spec_file_info_map (const gchar* name G_PARAM_SPEC (spec)->value_type = object_type; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return G_PARAM_SPEC (spec); -#line 9237 "DirectoryMonitor.c" +#line 9021 "DirectoryMonitor.c" } -static gpointer directory_monitor_value_get_file_info_map (const GValue* value) { +static gpointer +directory_monitor_value_get_file_info_map (const GValue* value) +{ #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP), NULL); #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return value->data[0].v_pointer; -#line 9246 "DirectoryMonitor.c" +#line 9032 "DirectoryMonitor.c" } -static void directory_monitor_value_set_file_info_map (GValue* value, gpointer v_object) { +static void +directory_monitor_value_set_file_info_map (GValue* value, + gpointer v_object) +{ DirectoryMonitorFileInfoMap * old; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP)); @@ -9268,22 +9057,25 @@ static void directory_monitor_value_set_file_info_map (GValue* value, gpointer v value->data[0].v_pointer = v_object; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_ref (value->data[0].v_pointer); -#line 9266 "DirectoryMonitor.c" +#line 9055 "DirectoryMonitor.c" } else { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 9270 "DirectoryMonitor.c" +#line 9059 "DirectoryMonitor.c" } #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_unref (old); -#line 9276 "DirectoryMonitor.c" +#line 9065 "DirectoryMonitor.c" } } -static void directory_monitor_value_take_file_info_map (GValue* value, gpointer v_object) { +static void +directory_monitor_value_take_file_info_map (GValue* value, + gpointer v_object) +{ DirectoryMonitorFileInfoMap * old; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP)); @@ -9297,33 +9089,37 @@ static void directory_monitor_value_take_file_info_map (GValue* value, gpointer g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = v_object; -#line 9295 "DirectoryMonitor.c" +#line 9087 "DirectoryMonitor.c" } else { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 9299 "DirectoryMonitor.c" +#line 9091 "DirectoryMonitor.c" } #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_unref (old); -#line 9305 "DirectoryMonitor.c" +#line 9097 "DirectoryMonitor.c" } } -static void directory_monitor_file_info_map_class_init (DirectoryMonitorFileInfoMapClass * klass) { +static void +directory_monitor_file_info_map_class_init (DirectoryMonitorFileInfoMapClass * klass) +{ #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_parent_class = g_type_class_peek_parent (klass); #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" ((DirectoryMonitorFileInfoMapClass *) klass)->finalize = directory_monitor_file_info_map_finalize; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_type_class_add_private (klass, sizeof (DirectoryMonitorFileInfoMapPrivate)); -#line 9317 "DirectoryMonitor.c" +#line 9111 "DirectoryMonitor.c" } -static void directory_monitor_file_info_map_instance_init (DirectoryMonitorFileInfoMap * self) { +static void +directory_monitor_file_info_map_instance_init (DirectoryMonitorFileInfoMap * self) +{ GeeHashMap* _tmp0_; GeeHashMap* _tmp1_; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9338,11 +9134,13 @@ static void directory_monitor_file_info_map_instance_init (DirectoryMonitorFileI self->priv->id_map = _tmp1_; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->ref_count = 1; -#line 9336 "DirectoryMonitor.c" +#line 9132 "DirectoryMonitor.c" } -static void directory_monitor_file_info_map_finalize (DirectoryMonitorFileInfoMap * obj) { +static void +directory_monitor_file_info_map_finalize (DirectoryMonitorFileInfoMap * obj) +{ DirectoryMonitorFileInfoMap * self; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP, DirectoryMonitorFileInfoMap); @@ -9352,11 +9150,13 @@ static void directory_monitor_file_info_map_finalize (DirectoryMonitorFileInfoMa _g_object_unref0 (self->priv->map); #line 135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (self->priv->id_map); -#line 9350 "DirectoryMonitor.c" +#line 9148 "DirectoryMonitor.c" } -static GType directory_monitor_file_info_map_get_type (void) { +static GType +directory_monitor_file_info_map_get_type (void) +{ static volatile gsize directory_monitor_file_info_map_type_id__volatile = 0; if (g_once_init_enter (&directory_monitor_file_info_map_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { directory_monitor_value_file_info_map_init, directory_monitor_value_file_info_map_free_value, directory_monitor_value_file_info_map_copy_value, directory_monitor_value_file_info_map_peek_pointer, "p", directory_monitor_value_file_info_map_collect_value, "p", directory_monitor_value_file_info_map_lcopy_value }; @@ -9370,18 +9170,22 @@ static GType directory_monitor_file_info_map_get_type (void) { } -static gpointer directory_monitor_file_info_map_ref (gpointer instance) { +static gpointer +directory_monitor_file_info_map_ref (gpointer instance) +{ DirectoryMonitorFileInfoMap * self; self = instance; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_atomic_int_inc (&self->ref_count); #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return instance; -#line 9375 "DirectoryMonitor.c" +#line 9177 "DirectoryMonitor.c" } -static void directory_monitor_file_info_map_unref (gpointer instance) { +static void +directory_monitor_file_info_map_unref (gpointer instance) +{ DirectoryMonitorFileInfoMap * self; self = instance; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9390,12 +9194,14 @@ static void directory_monitor_file_info_map_unref (gpointer instance) { DIRECTORY_MONITOR_FILE_INFO_MAP_GET_CLASS (self)->finalize (self); #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_type_free_instance ((GTypeInstance *) self); -#line 9388 "DirectoryMonitor.c" +#line 9192 "DirectoryMonitor.c" } } -static void directory_monitor_class_init (DirectoryMonitorClass * klass) { +static void +directory_monitor_class_init (DirectoryMonitorClass * klass) +{ #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_parent_class = g_type_class_peek_parent (klass); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9528,11 +9334,13 @@ static void directory_monitor_class_init (DirectoryMonitorClass * klass) { directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_DELETED_SIGNAL] = g_signal_new ("directory-deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_signals[DIRECTORY_MONITOR_CLOSED_SIGNAL] = g_signal_new ("closed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, closed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 9526 "DirectoryMonitor.c" +#line 9332 "DirectoryMonitor.c" } -static void directory_monitor_instance_init (DirectoryMonitor * self) { +static void +directory_monitor_instance_init (DirectoryMonitor * self) +{ GeeHashMap* _tmp0_; GeeLinkedList* _tmp1_; DirectoryMonitorFileInfoMap* _tmp2_; @@ -9568,11 +9376,13 @@ static void directory_monitor_instance_init (DirectoryMonitor * self) { self->priv->has_discovery_started = FALSE; #line 383 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->delete_timer_id = (guint) 0; -#line 9566 "DirectoryMonitor.c" +#line 9374 "DirectoryMonitor.c" } -static void directory_monitor_finalize (GObject * obj) { +static void +directory_monitor_finalize (GObject * obj) +{ DirectoryMonitor * self; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECTORY_MONITOR, DirectoryMonitor); @@ -9590,11 +9400,13 @@ static void directory_monitor_finalize (GObject * obj) { _g_object_unref0 (self->priv->cancellable); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" G_OBJECT_CLASS (directory_monitor_parent_class)->finalize (obj); -#line 9588 "DirectoryMonitor.c" +#line 9398 "DirectoryMonitor.c" } -GType directory_monitor_get_type (void) { +GType +directory_monitor_get_type (void) +{ static volatile gsize directory_monitor_type_id__volatile = 0; if (g_once_init_enter (&directory_monitor_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DirectoryMonitorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) directory_monitor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectoryMonitor), 0, (GInstanceInitFunc) directory_monitor_instance_init, NULL }; diff --git a/src/Event.c b/src/Event.c index 984004e..7ebadad 100644 --- a/src/Event.c +++ b/src/Event.c @@ -1,4 +1,4 @@ -/* Event.c generated by valac 0.36.6, the Vala compiler +/* Event.c generated by valac 0.40.4, the Vala compiler * generated from Event.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -270,9 +271,9 @@ typedef struct _ThumbnailView ThumbnailView; typedef struct _ThumbnailViewClass ThumbnailViewClass; enum { EVENT_SOURCE_COLLECTION_NO_EVENT_COLLECTION_ALTERED_SIGNAL, - EVENT_SOURCE_COLLECTION_LAST_SIGNAL + EVENT_SOURCE_COLLECTION_NUM_SIGNALS }; -static guint event_source_collection_signals[EVENT_SOURCE_COLLECTION_LAST_SIGNAL] = {0}; +static guint event_source_collection_signals[EVENT_SOURCE_COLLECTION_NUM_SIGNALS] = {0}; typedef struct _DataObjectPrivate DataObjectPrivate; typedef struct _DataSourcePrivate DataSourcePrivate; @@ -326,6 +327,11 @@ typedef struct _SourceProxyClass SourceProxyClass; typedef struct _Indexable Indexable; typedef struct _IndexableIface IndexableIface; typedef struct _EventPrivate EventPrivate; +enum { + EVENT_0_PROPERTY, + EVENT_NUM_PROPERTIES +}; +static GParamSpec* event_properties[EVENT_NUM_PROPERTIES]; #define TYPE_DATABASE_TABLE (database_table_get_type ()) #define DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATABASE_TABLE, DatabaseTable)) @@ -915,17 +921,29 @@ static IndexableIface * event_indexable_parent_iface = NULL; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType marker_get_type (void) G_GNUC_CONST; @@ -933,9 +951,15 @@ GType source_collection_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; @@ -944,120 +968,193 @@ GType container_source_get_type (void) G_GNUC_CONST; GType event_source_collection_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; #define EVENT_SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EVENT_SOURCE_COLLECTION, EventSourceCollectionPrivate)) -enum { - EVENT_SOURCE_COLLECTION_DUMMY_PROPERTY -}; EventSourceCollection* event_source_collection_new (void); EventSourceCollection* event_source_collection_construct (GType object_type); #define EVENT_TYPENAME "event" static gint64 event_source_collection_get_event_key (DataSource* source); -static gint64 _event_source_collection_get_event_key_get_source_database_key (DataSource* source, gpointer self); -ContainerSourceCollection* container_source_collection_construct (GType object_type, const gchar* backlink_name, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target); -void container_source_collection_attach_collection (ContainerSourceCollection* self, SourceCollection* collection); +static gint64 _event_source_collection_get_event_key_get_source_database_key (DataSource* source, + gpointer self); +ContainerSourceCollection* container_source_collection_construct (GType object_type, + const gchar* backlink_name, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target); +void container_source_collection_attach_collection (ContainerSourceCollection* self, + SourceCollection* collection); GType media_source_collection_get_type (void) G_GNUC_CONST; GType library_photo_source_collection_get_type (void) G_GNUC_CONST; GType video_source_collection_get_type (void) G_GNUC_CONST; void event_source_collection_init (EventSourceCollection* self); ViewCollection* view_collection_new (const gchar* name); -ViewCollection* view_collection_construct (GType object_type, const gchar* name); +ViewCollection* view_collection_construct (GType object_type, + const gchar* name); gpointer view_manager_ref (gpointer instance); void view_manager_unref (gpointer instance); -GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_manager (GValue* value, gpointer v_object); -void value_take_view_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_manager (GValue* value, + gpointer v_object); +void value_take_view_manager (GValue* value, + gpointer v_object); gpointer value_get_view_manager (const GValue* value); GType view_manager_get_type (void) G_GNUC_CONST; static GType event_source_collection_no_event_view_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static EventSourceCollectionNoEventViewManager* event_source_collection_no_event_view_manager_new (void); static EventSourceCollectionNoEventViewManager* event_source_collection_no_event_view_manager_construct (GType object_type); -Alteration* alteration_new (const gchar* subject, const gchar* detail); -Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail); +Alteration* alteration_new (const gchar* subject, + const gchar* detail); +Alteration* alteration_construct (GType object_type, + const gchar* subject, + const gchar* detail); gpointer view_collection_monitor_ref (gpointer instance); void view_collection_monitor_unref (gpointer instance); -GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void view_collection_value_set_monitor (GValue* value, gpointer v_object); -void view_collection_value_take_monitor (GValue* value, gpointer v_object); +GParamSpec* view_collection_param_spec_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void view_collection_value_set_monitor (GValue* value, + gpointer v_object); +void view_collection_value_take_monitor (GValue* value, + gpointer v_object); gpointer view_collection_value_get_monitor (const GValue* value); GType view_collection_monitor_get_type (void) G_GNUC_CONST; -ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target); -static void event_source_collection_on_no_event_collection_altered (EventSourceCollection* self, GeeIterable* added, GeeIterable* removed); -static void _event_source_collection_on_no_event_collection_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self); -static gboolean event_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source); +ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq, + GeeCollection* initial, + ProgressMonitor progress_monitor, + void* progress_monitor_target); +static void event_source_collection_on_no_event_collection_altered (EventSourceCollection* self, + GeeIterable* added, + GeeIterable* removed); +static void _event_source_collection_on_no_event_collection_altered_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self); +static gboolean event_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source); GType thumbnail_source_get_type (void) G_GNUC_CONST; GType event_source_get_type (void) G_GNUC_CONST; GType event_get_type (void) G_GNUC_CONST; GType event_id_get_type (void) G_GNUC_CONST; EventID* event_id_dup (const EventID* self); void event_id_free (EventID* self); -void event_get_event_id (Event* self, EventID* result); -Event* event_source_collection_fetch (EventSourceCollection* self, EventID* event_id); -DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, gint64 key); -static GeeCollection* event_source_collection_real_get_containers_holding_source (ContainerSourceCollection* base, DataSource* source); +void event_get_event_id (Event* self, + EventID* result); +Event* event_source_collection_fetch (EventSourceCollection* self, + EventID* event_id); +DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, + gint64 key); +static GeeCollection* event_source_collection_real_get_containers_holding_source (ContainerSourceCollection* base, + DataSource* source); GType media_source_get_type (void) G_GNUC_CONST; Event* media_source_get_event (MediaSource* self); -static ContainerSource* event_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* base, SourceBacklink* backlink); +static ContainerSource* event_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* base, + SourceBacklink* backlink); gint64 source_backlink_get_instance_id (SourceBacklink* self); -void event_id_init (EventID *self, gint64 id); +void event_id_init (EventID *self, + gint64 id); GeeCollection* container_source_collection_get_holding_tank (ContainerSourceCollection* self); GeeCollection* event_source_collection_get_no_event_objects (EventSourceCollection* self); GeeCollection* view_collection_get_sources (ViewCollection* self); GType data_view_get_type (void) G_GNUC_CONST; -enum { - EVENT_SOURCE_COLLECTION_NO_EVENT_VIEW_MANAGER_DUMMY_PROPERTY -}; -static gboolean event_source_collection_no_event_view_manager_real_include_in_view (ViewManager* base, DataSource* source); -void media_source_get_event_id (MediaSource* self, EventID* result); +static gboolean event_source_collection_no_event_view_manager_real_include_in_view (ViewManager* base, + DataSource* source); +void media_source_get_event_id (MediaSource* self, + EventID* result); #define EVENT_ID_INVALID ((gint64) -1) -gboolean view_manager_include_in_view (ViewManager* self, DataSource* source); -static DataView* event_source_collection_no_event_view_manager_real_create_view (ViewManager* base, DataSource* source); +gboolean view_manager_include_in_view (ViewManager* self, + DataSource* source); +static DataView* event_source_collection_no_event_view_manager_real_create_view (ViewManager* base, + DataSource* source); ThumbnailView* thumbnail_view_new (ThumbnailSource* source); -ThumbnailView* thumbnail_view_construct (GType object_type, ThumbnailSource* source); +ThumbnailView* thumbnail_view_construct (GType object_type, + ThumbnailSource* source); GType thumbnail_view_get_type (void) G_GNUC_CONST; ViewManager* view_manager_construct (GType object_type); static void event_source_collection_finalize (DataCollection * obj); gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; gpointer source_snapshot_ref (gpointer instance); void source_snapshot_unref (gpointer instance); -GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_snapshot (GValue* value, gpointer v_object); -void value_take_source_snapshot (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_snapshot (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_snapshot (GValue* value, + gpointer v_object); +void value_take_source_snapshot (GValue* value, + gpointer v_object); gpointer value_get_source_snapshot (const GValue* value); GType source_snapshot_get_type (void) G_GNUC_CONST; GType photo_file_format_get_type (void) G_GNUC_CONST; gpointer source_proxy_ref (gpointer instance); void source_proxy_unref (gpointer instance); -GParamSpec* param_spec_source_proxy (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_proxy (GValue* value, gpointer v_object); -void value_take_source_proxy (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_proxy (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_proxy (GValue* value, + gpointer v_object); +void value_take_source_proxy (GValue* value, + gpointer v_object); gpointer value_get_source_proxy (const GValue* value); GType source_proxy_get_type (void) G_GNUC_CONST; GType proxyable_get_type (void) G_GNUC_CONST; GType indexable_get_type (void) G_GNUC_CONST; #define EVENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EVENT, EventPrivate)) -enum { - EVENT_DUMMY_PROPERTY -}; static void event_on_primary_thumbnail_altered (Event* self); -static void _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered (ThumbnailSource* _sender, gpointer self); -static void event_on_media_altered (Event* self, GeeMap* items); -static void _event_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); -static void event_on_media_removed (Event* self, GeeIterable* removed); -static void _event_on_media_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self); -static void event_on_media_added (Event* self, GeeIterable* added); -static void _event_on_media_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self); -static void event_on_media_destroyed (Event* self, DataSource* source); -static void _event_on_media_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); +static void _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered (ThumbnailSource* _sender, + gpointer self); +static void event_on_media_altered (Event* self, + GeeMap* items); +static void _event_on_media_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); +static void event_on_media_removed (Event* self, + GeeIterable* removed); +static void _event_on_media_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self); +static void event_on_media_added (Event* self, + GeeIterable* added); +static void _event_on_media_added_data_collection_items_added (DataCollection* _sender, + GeeIterable* added, + gpointer self); +static void event_on_media_destroyed (Event* self, + DataSource* source); +static void _event_on_media_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType event_table_get_type (void) G_GNUC_CONST; @@ -1066,37 +1163,78 @@ GType event_table_get_type (void) G_GNUC_CONST; #define EVENT_TIME_T_DAY ((time_t) ((24 * 60) * 60)) gpointer event_row_ref (gpointer instance); void event_row_unref (gpointer instance); -GParamSpec* param_spec_event_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_event_row (GValue* value, gpointer v_object); -void value_take_event_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_event_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_event_row (GValue* value, + gpointer v_object); +void value_take_event_row (GValue* value, + gpointer v_object); gpointer value_get_event_row (const GValue* value); GType event_row_get_type (void) G_GNUC_CONST; -static Event* event_new (EventRow* event_row, gint64 object_id); -static Event* event_construct (GType object_type, EventRow* event_row, gint64 object_id); -EventSource* event_source_construct (GType object_type, gint64 object_id); +static Event* event_new (EventRow* event_row, + gint64 object_id); +static Event* event_construct (GType object_type, + EventRow* event_row, + gint64 object_id); +EventSource* event_source_construct (GType object_type, + gint64 object_id); gchar* event_prep_event_name (const gchar* name); gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); -GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaCollectionRegistry* self, EventID* event_id); -MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* self, const gchar* source_id); -void data_collection_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target); -static gint64 event_view_comparator (void* a, void* b); -static gint64 _event_view_comparator_comparator (void* a, void* b, gpointer self); -static gboolean event_view_comparator_predicate (DataObject* object, Alteration* alteration); -static gboolean _event_view_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self); -GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); -void container_source_collection_notify_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked); -void container_source_collection_notify_container_contents_altered (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked); +GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaCollectionRegistry* self, + EventID* event_id); +MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* self, + const gchar* source_id); +void data_collection_set_comparator (DataCollection* self, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target); +static gint64 event_view_comparator (void* a, + void* b); +static gint64 _event_view_comparator_comparator (void* a, + void* b, + gpointer self); +static gboolean event_view_comparator_predicate (DataObject* object, + Alteration* alteration); +static gboolean _event_view_comparator_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self); +GeeCollection* data_collection_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); +void container_source_collection_notify_container_contents_added (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked); +void container_source_collection_notify_container_contents_altered (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked, + GeeCollection* removed, + gboolean unlinked); gint data_collection_get_count (DataCollection* self); DataView* view_collection_get_first_unrejected (ViewCollection* self); DataSource* data_view_get_source (DataView* self); -gboolean event_table_set_primary_source_id (EventTable* self, EventID* event_id, const gchar* primary_source_id); +gboolean event_table_set_primary_source_id (EventTable* self, + EventID* event_id, + const gchar* primary_source_id); gchar* data_source_get_source_id (DataSource* self); static void event_update_indexable_keywords (Event* self); static gchar* event_real_get_typename (DataSource* base); @@ -1105,106 +1243,178 @@ static gchar* event_real_get_representative_id (ThumbnailSource* base); static PhotoFileFormat event_real_get_preferred_thumbnail_format (ThumbnailSource* base); PhotoFileFormat thumbnail_source_get_preferred_thumbnail_format (ThumbnailSource* self); PhotoFileFormat photo_file_format_get_system_default_format (void); -static GdkPixbuf* event_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error); -GdkPixbuf* thumbnail_source_create_thumbnail (ThumbnailSource* self, gint scale, GError** error); -void event_init (ProgressMonitor monitor, void* monitor_target); +static GdkPixbuf* event_real_create_thumbnail (ThumbnailSource* base, + gint scale, + GError** error); +GdkPixbuf* thumbnail_source_create_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); +void event_init (ProgressMonitor monitor, + void* monitor_target); EventTable* event_table_get_instance (void); GeeArrayList* event_table_get_events (EventTable* self); #define DATA_OBJECT_INVALID_OBJECT_ID ((gint64) -1) gint event_source_get_media_count (EventSource* self); -void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlinked_from, const gchar* dehydrated); -void container_source_collection_init_add_many_unlinked (ContainerSourceCollection* self, GeeCollection* unlinked); +void data_source_rehydrate_backlinks (DataSource* self, + SourceCollection* unlinked_from, + const gchar* dehydrated); +void container_source_collection_init_add_many_unlinked (ContainerSourceCollection* self, + GeeCollection* unlinked); void event_terminate (void); time_t media_source_get_exposure_time (MediaSource* self); -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail); +gboolean alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail); GType prepare_input_text_options_get_type (void) G_GNUC_CONST; -gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length); +gchar* prepare_input_text (const gchar* text, + PrepareInputTextOptions options, + gint dest_length); #define DEFAULT_USER_TEXT_INPUT_LENGTH 1024 -void event_attach (Event* self, MediaSource* source); -gboolean data_collection_add (DataCollection* self, DataObject* object); -void event_attach_many (Event* self, GeeCollection* media); -void event_detach (Event* self, MediaSource* source); -void data_collection_remove_marked (DataCollection* self, Marker* m); -Marker* data_collection_mark (DataCollection* self, DataObject* object); -DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source); -void event_detach_many (Event* self, GeeCollection* media); -Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects); -gboolean event_contains_media_type (Event* self, const gchar* media_type); +void event_attach (Event* self, + MediaSource* source); +gboolean data_collection_add (DataCollection* self, + DataObject* object); +void event_attach_many (Event* self, + GeeCollection* media); +void event_detach (Event* self, + MediaSource* source); +void data_collection_remove_marked (DataCollection* self, + Marker* m); +Marker* data_collection_mark (DataCollection* self, + DataObject* object); +DataView* view_collection_get_view_for_source (ViewCollection* self, + DataSource* source); +void event_detach_many (Event* self, + GeeCollection* media); +Marker* data_collection_mark_many (DataCollection* self, + GeeCollection* objects); +gboolean event_contains_media_type (Event* self, + const gchar* media_type); GeeCollection* event_source_get_media (EventSource* self); gchar* data_source_get_typename (DataSource* self); -static GeeArrayList* event_views_to_media (Event* self, GeeIterable* views); -void data_object_notify_altered (DataObject* self, Alteration* alteration); +static GeeArrayList* event_views_to_media (Event* self, + GeeIterable* views); +void data_object_notify_altered (DataObject* self, + Alteration* alteration); Alteration* alteration_new_from_list (const gchar* list); -Alteration* alteration_construct_from_list (GType object_type, const gchar* list); -void container_source_collection_notify_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked); -gboolean event_set_primary_source (Event* self, MediaSource* source); +Alteration* alteration_construct_from_list (GType object_type, + const gchar* list); +void container_source_collection_notify_container_contents_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* removed, + gboolean unlinked); +gboolean event_set_primary_source (Event* self, + MediaSource* source); static void event_release_primary_source (Event* self); -void container_source_collection_evaporate (ContainerSourceCollection* self, ContainerSource* container); -static void event_real_notify_relinking (DataSource* base, SourceCollection* sources); -void data_source_notify_relinking (DataSource* self, SourceCollection* collection); +void container_source_collection_evaporate (ContainerSourceCollection* self, + ContainerSource* container); +static void event_real_notify_relinking (DataSource* base, + SourceCollection* sources); +void data_source_notify_relinking (DataSource* self, + SourceCollection* collection); gboolean event_has_name (Event* self); MediaSource* event_get_primary_source (Event* self); GType rating_get_type (void) G_GNUC_CONST; Rating media_source_get_rating (MediaSource* self); Event* event_create_empty_event (MediaSource* source); GQuark database_error_quark (void); -EventRow* event_table_create (EventTable* self, const gchar* primary_source_id, const gchar* comment, GError** error); +EventRow* event_table_create (EventTable* self, + const gchar* primary_source_id, + const gchar* comment, + GError** error); gchar* data_object_to_string (DataObject* self); void app_window_database_error (GError* err); -static Event* event_reconstitute (gint64 object_id, EventRow* row); -void event_table_create_from_row (EventTable* self, EventRow* row, EventID* result); -gboolean data_collection_contains (DataCollection* self, DataObject* object); +static Event* event_reconstitute (gint64 object_id, + EventRow* row); +void event_table_create_from_row (EventTable* self, + EventRow* row, + EventID* result); +gboolean data_collection_contains (DataCollection* self, + DataObject* object); static gboolean event_real_has_links (ContainerSource* base); -gboolean source_collection_has_backlink (SourceCollection* self, SourceBacklink* backlink); +gboolean source_collection_has_backlink (SourceCollection* self, + SourceBacklink* backlink); SourceBacklink* container_source_get_backlink (ContainerSource* self); static SourceBacklink* event_real_get_backlink (ContainerSource* base); SourceBacklink* source_backlink_new_from_source (DataSource* source); -SourceBacklink* source_backlink_construct_from_source (GType object_type, DataSource* source); -static void event_real_break_link (ContainerSource* base, DataSource* source); -gboolean media_source_set_event (MediaSource* self, Event* new_event); -static void event_real_break_link_many (ContainerSource* base, GeeCollection* sources); +SourceBacklink* source_backlink_construct_from_source (GType object_type, + DataSource* source); +static void event_real_break_link (ContainerSource* base, + DataSource* source); +gboolean media_source_set_event (MediaSource* self, + Event* new_event); +static void event_real_break_link_many (ContainerSource* base, + GeeCollection* sources); GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; GType video_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; -void media_source_collection_filter_media (GeeCollection* media, GeeCollection* photos, GeeCollection* videos); +void media_source_collection_filter_media (GeeCollection* media, + GeeCollection* photos, + GeeCollection* videos); gpointer transaction_controller_ref (gpointer instance); void transaction_controller_unref (gpointer instance); -GParamSpec* param_spec_transaction_controller (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_transaction_controller (GValue* value, gpointer v_object); -void value_take_transaction_controller (GValue* value, gpointer v_object); +GParamSpec* param_spec_transaction_controller (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_transaction_controller (GValue* value, + gpointer v_object); +void value_take_transaction_controller (GValue* value, + gpointer v_object); gpointer value_get_transaction_controller (const GValue* value); GType transaction_controller_get_type (void) G_GNUC_CONST; -void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, TransactionController* controller, GError** error); +void media_source_set_many_to_event (GeeCollection* media_sources, + Event* event, + TransactionController* controller, + GError** error); TransactionController* media_source_collection_get_transaction_controller (MediaSourceCollection* self); -void app_window_error_message (const gchar* message, GtkWindow* parent); -static void event_real_establish_link (ContainerSource* base, DataSource* source); -static void event_real_establish_link_many (ContainerSource* base, GeeCollection* sources); +void app_window_error_message (const gchar* message, + GtkWindow* parent); +static void event_real_establish_link (ContainerSource* base, + DataSource* source); +static void event_real_establish_link_many (ContainerSource* base, + GeeCollection* sources); gchar* event_get_raw_name (Event* self); gchar* event_source_get_comment (EventSource* self); gchar* indexable_prepare_indexable_string (const gchar* str); static const gchar* event_real_get_indexable_keywords (Indexable* base); -gboolean event_is_in_starting_day (Event* self, time_t time); -DataObject* data_collection_get_at (DataCollection* self, gint index); -static Event* event_generate_event (MediaSource* media, ViewCollection* events_so_far, const gchar* event_name, gboolean* new_event); +gboolean event_is_in_starting_day (Event* self, + time_t time); +DataObject* data_collection_get_at (DataCollection* self, + gint index); +static Event* event_generate_event (MediaSource* media, + ViewCollection* events_so_far, + const gchar* event_name, + gboolean* new_event); GType event_view_get_type (void) G_GNUC_CONST; gchar* data_object_get_name (DataObject* self); -gboolean event_rename (Event* self, const gchar* name); +gboolean event_rename (Event* self, + const gchar* name); EventView* event_view_new (EventSource* source); -EventView* event_view_construct (GType object_type, EventSource* source); -void event_generate_single_event (MediaSource* media, ViewCollection* events_so_far, const gchar* event_name); -void event_generate_many_events (GeeCollection* sources, ViewCollection* events_so_far); +EventView* event_view_construct (GType object_type, + EventSource* source); +void event_generate_single_event (MediaSource* media, + ViewCollection* events_so_far, + const gchar* event_name); +void event_generate_many_events (GeeCollection* sources, + ViewCollection* events_so_far); static SourceSnapshot* event_real_save_snapshot (DataSource* base); static EventEventSnapshot* event_event_snapshot_new (Event* event); -static EventEventSnapshot* event_event_snapshot_construct (GType object_type, Event* event); +static EventEventSnapshot* event_event_snapshot_construct (GType object_type, + Event* event); static GType event_event_snapshot_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static SourceProxy* event_real_get_proxy (Proxyable* base); static EventEventProxy* event_event_proxy_new (Event* event); -static EventEventProxy* event_event_proxy_construct (GType object_type, Event* event); +static EventEventProxy* event_event_proxy_construct (GType object_type, + Event* event); static GType event_event_proxy_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -static gboolean event_real_equals (DataSource* base, DataSource* source); -gboolean data_source_equals (DataSource* self, DataSource* source); +static gboolean event_real_equals (DataSource* base, + DataSource* source); +gboolean data_source_equals (DataSource* self, + DataSource* source); static gchar* event_real_to_string (DataObject* base); gint64 data_object_get_object_id (DataObject* self); static gchar* event_real_get_name (DataObject* base); @@ -1213,26 +1423,46 @@ gboolean is_string_empty (const gchar* s); time_t event_source_get_start_time (EventSource* self); time_t event_source_get_end_time (EventSource* self); gchar* format_local_date (struct tm* date); -gchar* format_local_datespan (struct tm* from_date, struct tm* to_date); +gchar* format_local_datespan (struct tm* from_date, + struct tm* to_date); static gchar* event_real_get_comment (EventSource* base); -gboolean event_table_rename (EventTable* self, EventID* event_id, const gchar* name); -static gboolean event_real_set_comment (EventSource* base, const gchar* comment); +gboolean event_table_rename (EventTable* self, + EventID* event_id, + const gchar* name); +static gboolean event_real_set_comment (EventSource* base, + const gchar* comment); gchar* media_source_prep_comment (const gchar* comment); -gboolean event_table_set_comment (EventTable* self, EventID* event_id, const gchar* new_comment); +gboolean event_table_set_comment (EventTable* self, + EventID* event_id, + const gchar* new_comment); time_t event_get_creation_time (Event* self); -time_t event_table_get_time_created (EventTable* self, EventID* event_id); +time_t event_table_get_time_created (EventTable* self, + EventID* event_id); static time_t event_real_get_start_time (EventSource* base); static time_t event_real_get_end_time (EventSource* base); static guint64 event_real_get_total_filesize (EventSource* base); guint64 media_source_get_filesize (MediaSource* self); static gint event_real_get_media_count (EventSource* base); static GeeCollection* event_real_get_media (EventSource* base); -void event_mirror_photos (Event* self, ViewCollection* view, CreateView mirroring_ctor, void* mirroring_ctor_target); -void view_collection_mirror (ViewCollection* self, ViewCollection* to_mirror, CreateView mirroring_ctor, void* mirroring_ctor_target, CreateViewPredicate should_mirror, void* should_mirror_target); +void event_mirror_photos (Event* self, + ViewCollection* view, + CreateView mirroring_ctor, + void* mirroring_ctor_target); +void view_collection_mirror (ViewCollection* self, + ViewCollection* to_mirror, + CreateView mirroring_ctor, + void* mirroring_ctor_target, + CreateViewPredicate should_mirror, + void* should_mirror_target); void thumbnail_source_notify_thumbnail_altered (ThumbnailSource* self); -gboolean view_collection_has_view_for_source (ViewCollection* self, DataSource* source); -static GdkPixbuf* event_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error); -GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GError** error); +gboolean view_collection_has_view_for_source (ViewCollection* self, + DataSource* source); +static GdkPixbuf* event_real_get_thumbnail (ThumbnailSource* base, + gint scale, + GError** error); +GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); GType scaling_get_type (void) G_GNUC_CONST; GType scale_constraint_get_type (void) G_GNUC_CONST; GType dimensions_get_type (void) G_GNUC_CONST; @@ -1240,52 +1470,69 @@ Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); Scaling* scaling_dup (const Scaling* self); void scaling_free (Scaling* self); -GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling); -GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, Scaling* scaling, GError** error); +GdkPixbuf* event_get_preview_pixbuf (Event* self, + Scaling* scaling); +GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, + Scaling* scaling, + GError** error); static void event_real_destroy (DataSource* base); void view_collection_halt_all_monitoring (ViewCollection* self); -void event_table_remove (EventTable* self, EventID* event_id, GError** error); +void event_table_remove (EventTable* self, + EventID* event_id, + GError** error); GType photo_table_get_type (void) G_GNUC_CONST; PhotoTable* photo_table_get_instance (void); -gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id); +gboolean photo_table_drop_event (PhotoTable* self, + EventID* event_id); GType video_table_get_type (void) G_GNUC_CONST; VideoTable* video_table_get_instance (void); -gboolean video_table_drop_event (VideoTable* self, EventID* event_id); +gboolean video_table_drop_event (VideoTable* self, + EventID* event_id); void data_source_destroy (DataSource* self); #define EVENT_EVENT_SNAPSHOT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EVENT_TYPE_EVENT_SNAPSHOT, EventEventSnapshotPrivate)) -enum { - EVENT_EVENT_SNAPSHOT_DUMMY_PROPERTY -}; -static void event_event_snapshot_on_attached_source_destroyed (EventEventSnapshot* self, DataSource* source); -static void _event_event_snapshot_on_attached_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); +static void event_event_snapshot_on_attached_source_destroyed (EventEventSnapshot* self, + DataSource* source); +static void _event_event_snapshot_on_attached_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); SourceSnapshot* source_snapshot_construct (GType object_type); -EventRow* event_table_get_row (EventTable* self, EventID* event_id); +EventRow* event_table_get_row (EventTable* self, + EventID* event_id); static EventRow* event_event_snapshot_get_row (EventEventSnapshot* self); static void event_event_snapshot_real_notify_broken (SourceSnapshot* base); EventRow* event_row_new (void); EventRow* event_row_construct (GType object_type); void source_snapshot_notify_broken (SourceSnapshot* self); static void event_event_snapshot_finalize (SourceSnapshot * obj); -enum { - EVENT_EVENT_PROXY_DUMMY_PROPERTY -}; -SourceProxy* source_proxy_construct (GType object_type, DataSource* source); -static DataSource* event_event_proxy_real_reconstitute (SourceProxy* base, gint64 object_id, SourceSnapshot* snapshot); +SourceProxy* source_proxy_construct (GType object_type, + DataSource* source); +static DataSource* event_event_proxy_real_reconstitute (SourceProxy* base, + gint64 object_id, + SourceSnapshot* snapshot); static void event_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -static gint64 _event_source_collection_get_event_key_get_source_database_key (DataSource* source, gpointer self) { +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); + + +static gint64 +_event_source_collection_get_event_key_get_source_database_key (DataSource* source, + gpointer self) +{ gint64 result; result = event_source_collection_get_event_key (source); #line 25 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1285 "Event.c" +#line 1530 "Event.c" } -EventSourceCollection* event_source_collection_construct (GType object_type) { +EventSourceCollection* +event_source_collection_construct (GType object_type) +{ EventSourceCollection* self = NULL; LibraryPhotoSourceCollection* _tmp0_; VideoSourceCollection* _tmp1_; @@ -1301,25 +1548,34 @@ EventSourceCollection* event_source_collection_construct (GType object_type) { container_source_collection_attach_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_COLLECTION, SourceCollection)); #line 24 "/home/jens/Source/shotwell/src/Event.vala" return self; -#line 1305 "Event.c" +#line 1552 "Event.c" } -EventSourceCollection* event_source_collection_new (void) { +EventSourceCollection* +event_source_collection_new (void) +{ #line 24 "/home/jens/Source/shotwell/src/Event.vala" return event_source_collection_construct (TYPE_EVENT_SOURCE_COLLECTION); -#line 1312 "Event.c" +#line 1561 "Event.c" } -static void _event_source_collection_on_no_event_collection_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { +static void +_event_source_collection_on_no_event_collection_altered_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self) +{ #line 40 "/home/jens/Source/shotwell/src/Event.vala" event_source_collection_on_no_event_collection_altered ((EventSourceCollection*) self, added, removed); -#line 1319 "Event.c" +#line 1573 "Event.c" } -void event_source_collection_init (EventSourceCollection* self) { +void +event_source_collection_init (EventSourceCollection* self) +{ ViewCollection* _tmp0_; EventSourceCollectionNoEventViewManager* view_manager = NULL; EventSourceCollectionNoEventViewManager* _tmp1_; @@ -1378,71 +1634,75 @@ void event_source_collection_init (EventSourceCollection* self) { _alteration_unref0 (filter_alteration); #line 31 "/home/jens/Source/shotwell/src/Event.vala" _view_manager_unref0 (view_manager); -#line 1382 "Event.c" +#line 1638 "Event.c" } -static gboolean event_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) { +static gboolean +event_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source) +{ EventSourceCollection * self; gboolean result = FALSE; - DataSource* _tmp0_; #line 43 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_SOURCE_COLLECTION, EventSourceCollection); #line 43 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 44 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = source; -#line 44 "/home/jens/Source/shotwell/src/Event.vala" - result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_EVENT); + result = G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_EVENT); #line 44 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1400 "Event.c" +#line 1656 "Event.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 48 "/home/jens/Source/shotwell/src/Event.vala" return self ? g_object_ref (self) : NULL; -#line 1407 "Event.c" +#line 1665 "Event.c" } -static gint64 event_source_collection_get_event_key (DataSource* source) { +static gint64 +event_source_collection_get_event_key (DataSource* source) +{ gint64 result = 0LL; Event* event = NULL; - DataSource* _tmp0_; - Event* _tmp1_; + Event* _tmp0_; EventID event_id = {0}; - EventID _tmp2_ = {0}; - EventID _tmp3_; - gint64 _tmp4_; + EventID _tmp1_ = {0}; + EventID _tmp2_; + gint64 _tmp3_; #line 47 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL); #line 48 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = source; -#line 48 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_EVENT, Event)); #line 48 "/home/jens/Source/shotwell/src/Event.vala" - event = _tmp1_; + event = _tmp0_; #line 49 "/home/jens/Source/shotwell/src/Event.vala" - event_get_event_id (event, &_tmp2_); + event_get_event_id (event, &_tmp1_); #line 49 "/home/jens/Source/shotwell/src/Event.vala" - event_id = _tmp2_; + event_id = _tmp1_; #line 51 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = event_id; + _tmp2_ = event_id; #line 51 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = _tmp3_.id; + _tmp3_ = _tmp2_.id; #line 51 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp4_; + result = _tmp3_; #line 51 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); #line 51 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1442 "Event.c" +#line 1699 "Event.c" } -Event* event_source_collection_fetch (EventSourceCollection* self, EventID* event_id) { +Event* +event_source_collection_fetch (EventSourceCollection* self, + EventID* event_id) +{ Event* result = NULL; EventID _tmp0_; gint64 _tmp1_; @@ -1461,161 +1721,158 @@ Event* event_source_collection_fetch (EventSourceCollection* self, EventID* even result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EVENT, Event); #line 55 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1465 "Event.c" +#line 1725 "Event.c" } -static GeeCollection* event_source_collection_real_get_containers_holding_source (ContainerSourceCollection* base, DataSource* source) { +static GeeCollection* +event_source_collection_real_get_containers_holding_source (ContainerSourceCollection* base, + DataSource* source) +{ EventSourceCollection * self; GeeCollection* result = NULL; Event* event = NULL; - DataSource* _tmp0_; + Event* _tmp0_; Event* _tmp1_; - Event* _tmp2_; GeeArrayList* list = NULL; + GeeArrayList* _tmp2_; GeeArrayList* _tmp3_; - GeeArrayList* _tmp4_; - Event* _tmp5_; + Event* _tmp4_; #line 58 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_SOURCE_COLLECTION, EventSourceCollection); #line 58 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 59 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = source; -#line 59 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = media_source_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp0_ = media_source_get_event (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource)); #line 59 "/home/jens/Source/shotwell/src/Event.vala" - event = _tmp1_; + event = _tmp0_; #line 60 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = event; + _tmp1_ = event; #line 60 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 61 "/home/jens/Source/shotwell/src/Event.vala" result = NULL; #line 61 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); #line 61 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1500 "Event.c" +#line 1760 "Event.c" } #line 63 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = gee_array_list_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp2_ = gee_array_list_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 63 "/home/jens/Source/shotwell/src/Event.vala" - list = _tmp3_; + list = _tmp2_; #line 64 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = list; + _tmp3_ = list; #line 64 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = event; + _tmp4_ = event; #line 64 "/home/jens/Source/shotwell/src/Event.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONTAINER_SOURCE, ContainerSource)); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONTAINER_SOURCE, ContainerSource)); #line 66 "/home/jens/Source/shotwell/src/Event.vala" result = G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_COLLECTION, GeeCollection); #line 66 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); #line 66 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1518 "Event.c" +#line 1778 "Event.c" } -static ContainerSource* event_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* base, SourceBacklink* backlink) { +static ContainerSource* +event_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* base, + SourceBacklink* backlink) +{ EventSourceCollection * self; ContainerSource* result = NULL; EventID event_id = {0}; - SourceBacklink* _tmp0_; + gint64 _tmp0_; gint64 _tmp1_; - gint64 _tmp2_; Event* event = NULL; - EventID _tmp3_; + EventID _tmp2_; + Event* _tmp3_; Event* _tmp4_; - Event* _tmp5_; #line 69 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_SOURCE_COLLECTION, EventSourceCollection); #line 69 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_SOURCE_BACKLINK (backlink), NULL); #line 70 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = backlink; + _tmp0_ = source_backlink_get_instance_id (backlink); #line 70 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = source_backlink_get_instance_id (_tmp0_); -#line 70 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 70 "/home/jens/Source/shotwell/src/Event.vala" - event_id_init (&event_id, _tmp2_); + event_id_init (&event_id, _tmp1_); #line 72 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = event_id; + _tmp2_ = event_id; #line 72 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = event_source_collection_fetch (self, &_tmp3_); + _tmp3_ = event_source_collection_fetch (self, &_tmp2_); #line 72 "/home/jens/Source/shotwell/src/Event.vala" - event = _tmp4_; + event = _tmp3_; #line 73 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = event; + _tmp4_ = event; #line 73 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp5_ != NULL) { + if (_tmp4_ != NULL) { #line 74 "/home/jens/Source/shotwell/src/Event.vala" result = G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_CONTAINER_SOURCE, ContainerSource); #line 74 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1559 "Event.c" +#line 1819 "Event.c" } { GeeIterator* _container_it = NULL; + GeeCollection* _tmp5_; GeeCollection* _tmp6_; - GeeCollection* _tmp7_; + GeeIterator* _tmp7_; GeeIterator* _tmp8_; - GeeIterator* _tmp9_; #line 76 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = container_source_collection_get_holding_tank (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection)); + _tmp5_ = container_source_collection_get_holding_tank (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection)); #line 76 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 76 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 76 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 76 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 76 "/home/jens/Source/shotwell/src/Event.vala" - _container_it = _tmp9_; + _container_it = _tmp8_; #line 76 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 1581 "Event.c" - GeeIterator* _tmp10_; - gboolean _tmp11_; +#line 1841 "Event.c" + GeeIterator* _tmp9_; ContainerSource* container = NULL; - GeeIterator* _tmp12_; - gpointer _tmp13_; - ContainerSource* _tmp14_; - EventID _tmp15_ = {0}; + GeeIterator* _tmp10_; + gpointer _tmp11_; + ContainerSource* _tmp12_; + EventID _tmp13_ = {0}; + gint64 _tmp14_; + EventID _tmp15_; gint64 _tmp16_; - EventID _tmp17_; - gint64 _tmp18_; -#line 76 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = _container_it; #line 76 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = gee_iterator_next (_tmp10_); + _tmp9_ = _container_it; #line 76 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp11_) { + if (!gee_iterator_next (_tmp9_)) { #line 76 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 1600 "Event.c" +#line 1857 "Event.c" } #line 76 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = _container_it; + _tmp10_ = _container_it; #line 76 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = gee_iterator_get (_tmp12_); + _tmp11_ = gee_iterator_get (_tmp10_); #line 76 "/home/jens/Source/shotwell/src/Event.vala" - container = (ContainerSource*) _tmp13_; + container = (ContainerSource*) _tmp11_; #line 77 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = container; + _tmp12_ = container; #line 77 "/home/jens/Source/shotwell/src/Event.vala" - event_get_event_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_EVENT, Event), &_tmp15_); + event_get_event_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_EVENT, Event), &_tmp13_); #line 77 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = _tmp15_.id; + _tmp14_ = _tmp13_.id; #line 77 "/home/jens/Source/shotwell/src/Event.vala" - _tmp17_ = event_id; + _tmp15_ = event_id; #line 77 "/home/jens/Source/shotwell/src/Event.vala" - _tmp18_ = _tmp17_.id; + _tmp16_ = _tmp15_.id; #line 77 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp16_ == _tmp18_) { + if (_tmp14_ == _tmp16_) { #line 78 "/home/jens/Source/shotwell/src/Event.vala" result = container; #line 78 "/home/jens/Source/shotwell/src/Event.vala" @@ -1624,15 +1881,15 @@ static ContainerSource* event_source_collection_real_convert_backlink_to_contain _g_object_unref0 (event); #line 78 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1628 "Event.c" +#line 1885 "Event.c" } #line 76 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (container); -#line 1632 "Event.c" +#line 1889 "Event.c" } #line 76 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_container_it); -#line 1636 "Event.c" +#line 1893 "Event.c" } #line 81 "/home/jens/Source/shotwell/src/Event.vala" result = NULL; @@ -1640,11 +1897,13 @@ static ContainerSource* event_source_collection_real_convert_backlink_to_contain _g_object_unref0 (event); #line 81 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1644 "Event.c" +#line 1901 "Event.c" } -GeeCollection* event_source_collection_get_no_event_objects (EventSourceCollection* self) { +GeeCollection* +event_source_collection_get_no_event_objects (EventSourceCollection* self) +{ GeeCollection* result = NULL; ViewCollection* _tmp0_; GeeCollection* _tmp1_; @@ -1658,11 +1917,15 @@ GeeCollection* event_source_collection_get_no_event_objects (EventSourceCollecti result = _tmp1_; #line 85 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1662 "Event.c" +#line 1921 "Event.c" } -static void event_source_collection_on_no_event_collection_altered (EventSourceCollection* self, GeeIterable* added, GeeIterable* removed) { +static void +event_source_collection_on_no_event_collection_altered (EventSourceCollection* self, + GeeIterable* added, + GeeIterable* removed) +{ #line 88 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT_SOURCE_COLLECTION (self)); #line 88 "/home/jens/Source/shotwell/src/Event.vala" @@ -1671,105 +1934,109 @@ static void event_source_collection_on_no_event_collection_altered (EventSourceC g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); #line 90 "/home/jens/Source/shotwell/src/Event.vala" g_signal_emit (self, event_source_collection_signals[EVENT_SOURCE_COLLECTION_NO_EVENT_COLLECTION_ALTERED_SIGNAL], 0); -#line 1675 "Event.c" +#line 1938 "Event.c" } -static gboolean event_source_collection_no_event_view_manager_real_include_in_view (ViewManager* base, DataSource* source) { +static gboolean +event_source_collection_no_event_view_manager_real_include_in_view (ViewManager* base, + DataSource* source) +{ EventSourceCollectionNoEventViewManager * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; - DataSource* _tmp1_; - EventID _tmp2_ = {0}; - gint64 _tmp3_; + EventID _tmp1_ = {0}; + gint64 _tmp2_; #line 13 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENT_SOURCE_COLLECTION_TYPE_NO_EVENT_VIEW_MANAGER, EventSourceCollectionNoEventViewManager); #line 13 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 15 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = source; -#line 15 "/home/jens/Source/shotwell/src/Event.vala" - media_source_get_event_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp2_); + media_source_get_event_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource), &_tmp1_); #line 15 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _tmp2_.id; + _tmp2_ = _tmp1_.id; #line 15 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp3_ != EVENT_ID_INVALID) { + if (_tmp2_ != EVENT_ID_INVALID) { #line 15 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = FALSE; -#line 1700 "Event.c" +#line 1963 "Event.c" } else { - DataSource* _tmp4_; - gboolean _tmp5_; #line 16 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = source; -#line 16 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = VIEW_MANAGER_CLASS (event_source_collection_no_event_view_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_VIEW_MANAGER, ViewManager), _tmp4_); -#line 16 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = _tmp5_; -#line 1710 "Event.c" + _tmp0_ = VIEW_MANAGER_CLASS (event_source_collection_no_event_view_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_VIEW_MANAGER, ViewManager), source); +#line 1967 "Event.c" } #line 15 "/home/jens/Source/shotwell/src/Event.vala" result = _tmp0_; #line 15 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1716 "Event.c" +#line 1973 "Event.c" } -static DataView* event_source_collection_no_event_view_manager_real_create_view (ViewManager* base, DataSource* source) { +static DataView* +event_source_collection_no_event_view_manager_real_create_view (ViewManager* base, + DataSource* source) +{ EventSourceCollectionNoEventViewManager * self; DataView* result = NULL; - DataSource* _tmp0_; - ThumbnailView* _tmp1_; + ThumbnailView* _tmp0_; #line 19 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENT_SOURCE_COLLECTION_TYPE_NO_EVENT_VIEW_MANAGER, EventSourceCollectionNoEventViewManager); #line 19 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 20 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = source; -#line 20 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); + _tmp0_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource), TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 20 "/home/jens/Source/shotwell/src/Event.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView); #line 20 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1737 "Event.c" +#line 1994 "Event.c" } -static EventSourceCollectionNoEventViewManager* event_source_collection_no_event_view_manager_construct (GType object_type) { +static EventSourceCollectionNoEventViewManager* +event_source_collection_no_event_view_manager_construct (GType object_type) +{ EventSourceCollectionNoEventViewManager* self = NULL; #line 12 "/home/jens/Source/shotwell/src/Event.vala" self = (EventSourceCollectionNoEventViewManager*) view_manager_construct (object_type); #line 12 "/home/jens/Source/shotwell/src/Event.vala" return self; -#line 1747 "Event.c" +#line 2006 "Event.c" } -static EventSourceCollectionNoEventViewManager* event_source_collection_no_event_view_manager_new (void) { +static EventSourceCollectionNoEventViewManager* +event_source_collection_no_event_view_manager_new (void) +{ #line 12 "/home/jens/Source/shotwell/src/Event.vala" return event_source_collection_no_event_view_manager_construct (EVENT_SOURCE_COLLECTION_TYPE_NO_EVENT_VIEW_MANAGER); -#line 1754 "Event.c" +#line 2015 "Event.c" } -static void event_source_collection_no_event_view_manager_class_init (EventSourceCollectionNoEventViewManagerClass * klass) { +static void +event_source_collection_no_event_view_manager_class_init (EventSourceCollectionNoEventViewManagerClass * klass) +{ #line 12 "/home/jens/Source/shotwell/src/Event.vala" event_source_collection_no_event_view_manager_parent_class = g_type_class_peek_parent (klass); #line 12 "/home/jens/Source/shotwell/src/Event.vala" ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) event_source_collection_no_event_view_manager_real_include_in_view; #line 12 "/home/jens/Source/shotwell/src/Event.vala" ((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) event_source_collection_no_event_view_manager_real_create_view; -#line 1765 "Event.c" +#line 2028 "Event.c" } -static void event_source_collection_no_event_view_manager_instance_init (EventSourceCollectionNoEventViewManager * self) { +static void +event_source_collection_no_event_view_manager_instance_init (EventSourceCollectionNoEventViewManager * self) +{ } -static GType event_source_collection_no_event_view_manager_get_type (void) { +static GType +event_source_collection_no_event_view_manager_get_type (void) +{ static volatile gsize event_source_collection_no_event_view_manager_type_id__volatile = 0; if (g_once_init_enter (&event_source_collection_no_event_view_manager_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventSourceCollectionNoEventViewManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_source_collection_no_event_view_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventSourceCollectionNoEventViewManager), 0, (GInstanceInitFunc) event_source_collection_no_event_view_manager_instance_init, NULL }; @@ -1781,7 +2048,9 @@ static GType event_source_collection_no_event_view_manager_get_type (void) { } -static void event_source_collection_class_init (EventSourceCollectionClass * klass) { +static void +event_source_collection_class_init (EventSourceCollectionClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/Event.vala" event_source_collection_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/Event.vala" @@ -1796,18 +2065,22 @@ static void event_source_collection_class_init (EventSourceCollectionClass * kla ((ContainerSourceCollectionClass *) klass)->convert_backlink_to_container = (ContainerSource* (*) (ContainerSourceCollection *, SourceBacklink*)) event_source_collection_real_convert_backlink_to_container; #line 7 "/home/jens/Source/shotwell/src/Event.vala" event_source_collection_signals[EVENT_SOURCE_COLLECTION_NO_EVENT_COLLECTION_ALTERED_SIGNAL] = g_signal_new ("no-event-collection-altered", TYPE_EVENT_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 1800 "Event.c" +#line 2069 "Event.c" } -static void event_source_collection_instance_init (EventSourceCollection * self) { +static void +event_source_collection_instance_init (EventSourceCollection * self) +{ #line 7 "/home/jens/Source/shotwell/src/Event.vala" self->priv = EVENT_SOURCE_COLLECTION_GET_PRIVATE (self); -#line 1807 "Event.c" +#line 2078 "Event.c" } -static void event_source_collection_finalize (DataCollection * obj) { +static void +event_source_collection_finalize (DataCollection * obj) +{ EventSourceCollection * self; #line 7 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_SOURCE_COLLECTION, EventSourceCollection); @@ -1815,11 +2088,13 @@ static void event_source_collection_finalize (DataCollection * obj) { _data_collection_unref0 (self->priv->no_event); #line 7 "/home/jens/Source/shotwell/src/Event.vala" DATA_COLLECTION_CLASS (event_source_collection_parent_class)->finalize (obj); -#line 1819 "Event.c" +#line 2092 "Event.c" } -GType event_source_collection_get_type (void) { +GType +event_source_collection_get_type (void) +{ static volatile gsize event_source_collection_type_id__volatile = 0; if (g_once_init_enter (&event_source_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventSourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventSourceCollection), 0, (GInstanceInitFunc) event_source_collection_instance_init, NULL }; @@ -1831,433 +2106,437 @@ GType event_source_collection_get_type (void) { } -static void _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered (ThumbnailSource* _sender, gpointer self) { +static void +_event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered (ThumbnailSource* _sender, + gpointer self) +{ #line 238 "/home/jens/Source/shotwell/src/Event.vala" event_on_primary_thumbnail_altered ((Event*) self); -#line 1838 "Event.c" +#line 2116 "Event.c" } -static void _event_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_event_on_media_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 240 "/home/jens/Source/shotwell/src/Event.vala" event_on_media_altered ((Event*) self, items); -#line 1845 "Event.c" +#line 2127 "Event.c" } -static void _event_on_media_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) { +static void +_event_on_media_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self) +{ #line 241 "/home/jens/Source/shotwell/src/Event.vala" event_on_media_removed ((Event*) self, removed); -#line 1852 "Event.c" +#line 2138 "Event.c" } -static void _event_on_media_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self) { +static void +_event_on_media_added_data_collection_items_added (DataCollection* _sender, + GeeIterable* added, + gpointer self) +{ #line 242 "/home/jens/Source/shotwell/src/Event.vala" event_on_media_added ((Event*) self, added); -#line 1859 "Event.c" +#line 2149 "Event.c" } -static void _event_on_media_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +static void +_event_on_media_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self) +{ #line 244 "/home/jens/Source/shotwell/src/Event.vala" event_on_media_destroyed ((Event*) self, source); -#line 1866 "Event.c" +#line 2160 "Event.c" } -static gint64 _event_view_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_event_view_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = event_view_comparator (a, b); #line 201 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1875 "Event.c" +#line 2173 "Event.c" } -static gboolean _event_view_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) { +static gboolean +_event_view_comparator_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self) +{ gboolean result; result = event_view_comparator_predicate (object, alteration); #line 201 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1884 "Event.c" +#line 2186 "Event.c" } -static Event* event_construct (GType object_type, EventRow* event_row, gint64 object_id) { +static Event* +event_construct (GType object_type, + EventRow* event_row, + gint64 object_id) +{ Event * self = NULL; - gint64 _tmp0_; - EventRow* _tmp1_; - EventRow* _tmp2_; + const gchar* _tmp0_; + gchar* _tmp1_; + EventID _tmp2_; const gchar* _tmp3_; gchar* _tmp4_; - EventRow* _tmp5_; - EventID _tmp6_; - EventRow* _tmp7_; - const gchar* _tmp8_; - gchar* _tmp9_; - EventRow* _tmp10_; - const gchar* _tmp11_; - gchar* _tmp12_; + const gchar* _tmp5_; + gchar* _tmp6_; GeeCollection* event_source_ids = NULL; - MediaCollectionRegistry* _tmp13_; - MediaCollectionRegistry* _tmp14_; - EventID _tmp15_; - GeeCollection* _tmp16_; - GeeCollection* _tmp17_; + MediaCollectionRegistry* _tmp7_; + MediaCollectionRegistry* _tmp8_; + EventID _tmp9_; + GeeCollection* _tmp10_; + GeeCollection* _tmp11_; GeeArrayList* event_thumbs = NULL; - GeeArrayList* _tmp18_; - EventID _tmp35_; - gint64 _tmp36_; - gchar* _tmp37_; - gchar* _tmp38_; - gchar* _tmp39_; - gchar* _tmp40_; - ViewCollection* _tmp41_; - ViewCollection* _tmp42_; - ViewCollection* _tmp43_; - GeeArrayList* _tmp44_; - GeeCollection* _tmp45_; - GeeCollection* _tmp46_; - GeeArrayList* _tmp47_; - gint _tmp48_; - gint _tmp49_; - MediaCollectionRegistry* _tmp54_; - MediaCollectionRegistry* _tmp55_; - EventRow* _tmp56_; - const gchar* _tmp57_; - MediaSource* _tmp58_; - gboolean _tmp59_ = FALSE; - MediaSource* _tmp60_; - MediaSource* _tmp72_; - ViewCollection* _tmp74_; - ViewCollection* _tmp75_; - ViewCollection* _tmp76_; - LibraryPhotoSourceCollection* _tmp77_; - VideoSourceCollection* _tmp78_; + GeeArrayList* _tmp12_; + EventID _tmp28_; + gint64 _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; + ViewCollection* _tmp34_; + ViewCollection* _tmp35_; + ViewCollection* _tmp36_; + GeeArrayList* _tmp37_; + GeeCollection* _tmp38_; + GeeCollection* _tmp39_; + GeeArrayList* _tmp40_; + gint _tmp41_; + gint _tmp42_; + MediaCollectionRegistry* _tmp47_; + MediaCollectionRegistry* _tmp48_; + const gchar* _tmp49_; + MediaSource* _tmp50_; + gboolean _tmp51_ = FALSE; + MediaSource* _tmp52_; + MediaSource* _tmp63_; + ViewCollection* _tmp65_; + ViewCollection* _tmp66_; + ViewCollection* _tmp67_; + LibraryPhotoSourceCollection* _tmp68_; + VideoSourceCollection* _tmp69_; #line 180 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT_ROW (event_row), NULL); #line 181 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = object_id; -#line 181 "/home/jens/Source/shotwell/src/Event.vala" - self = (Event*) event_source_construct (object_type, _tmp0_); -#line 184 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = event_row; + self = (Event*) event_source_construct (object_type, object_id); #line 184 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = event_row; + _tmp0_ = event_row->name; #line 184 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _tmp2_->name; -#line 184 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = event_prep_event_name (_tmp3_); + _tmp1_ = event_prep_event_name (_tmp0_); #line 184 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp1_->name); + _g_free0 (event_row->name); #line 184 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_->name = _tmp4_; + event_row->name = _tmp1_; #line 186 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = event_row; + _tmp2_ = event_row->event_id; #line 186 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = _tmp5_->event_id; -#line 186 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->event_id = _tmp6_; -#line 187 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = event_row; + self->priv->event_id = _tmp2_; #line 187 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = _tmp7_->name; + _tmp3_ = event_row->name; #line 187 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = g_strdup (_tmp8_); + _tmp4_ = g_strdup (_tmp3_); #line 187 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (self->priv->raw_name); #line 187 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->raw_name = _tmp9_; + self->priv->raw_name = _tmp4_; #line 188 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = event_row; + _tmp5_ = event_row->comment; #line 188 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = _tmp10_->comment; -#line 188 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = g_strdup (_tmp11_); + _tmp6_ = g_strdup (_tmp5_); #line 188 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (self->priv->comment); #line 188 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->comment = _tmp12_; + self->priv->comment = _tmp6_; #line 190 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = media_collection_registry_get_instance (); + _tmp7_ = media_collection_registry_get_instance (); #line 190 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = _tmp13_; + _tmp8_ = _tmp7_; #line 190 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = self->priv->event_id; + _tmp9_ = self->priv->event_id; #line 190 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = media_collection_registry_get_source_ids_for_event_id (_tmp14_, &_tmp15_); + _tmp10_ = media_collection_registry_get_source_ids_for_event_id (_tmp8_, &_tmp9_); #line 190 "/home/jens/Source/shotwell/src/Event.vala" - _tmp17_ = _tmp16_; + _tmp11_ = _tmp10_; #line 190 "/home/jens/Source/shotwell/src/Event.vala" - _media_collection_registry_unref0 (_tmp14_); + _media_collection_registry_unref0 (_tmp8_); #line 190 "/home/jens/Source/shotwell/src/Event.vala" - event_source_ids = _tmp17_; + event_source_ids = _tmp11_; #line 192 "/home/jens/Source/shotwell/src/Event.vala" - _tmp18_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp12_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 192 "/home/jens/Source/shotwell/src/Event.vala" - event_thumbs = _tmp18_; -#line 2001 "Event.c" + event_thumbs = _tmp12_; +#line 2288 "Event.c" { GeeIterator* _current_source_id_it = NULL; - GeeCollection* _tmp19_; - GeeIterator* _tmp20_; + GeeCollection* _tmp13_; + GeeIterator* _tmp14_; #line 193 "/home/jens/Source/shotwell/src/Event.vala" - _tmp19_ = event_source_ids; + _tmp13_ = event_source_ids; #line 193 "/home/jens/Source/shotwell/src/Event.vala" - _tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); #line 193 "/home/jens/Source/shotwell/src/Event.vala" - _current_source_id_it = _tmp20_; + _current_source_id_it = _tmp14_; #line 193 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 2014 "Event.c" - GeeIterator* _tmp21_; - gboolean _tmp22_; +#line 2301 "Event.c" + GeeIterator* _tmp15_; gchar* current_source_id = NULL; - GeeIterator* _tmp23_; - gpointer _tmp24_; + GeeIterator* _tmp16_; + gpointer _tmp17_; MediaSource* media = NULL; - MediaCollectionRegistry* _tmp25_; - MediaCollectionRegistry* _tmp26_; - const gchar* _tmp27_; - MediaSource* _tmp28_; - MediaSource* _tmp29_; - MediaSource* _tmp30_; -#line 193 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ = _current_source_id_it; + MediaCollectionRegistry* _tmp18_; + MediaCollectionRegistry* _tmp19_; + const gchar* _tmp20_; + MediaSource* _tmp21_; + MediaSource* _tmp22_; + MediaSource* _tmp23_; #line 193 "/home/jens/Source/shotwell/src/Event.vala" - _tmp22_ = gee_iterator_next (_tmp21_); + _tmp15_ = _current_source_id_it; #line 193 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp22_) { + if (!gee_iterator_next (_tmp15_)) { #line 193 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 2035 "Event.c" +#line 2319 "Event.c" } #line 193 "/home/jens/Source/shotwell/src/Event.vala" - _tmp23_ = _current_source_id_it; + _tmp16_ = _current_source_id_it; #line 193 "/home/jens/Source/shotwell/src/Event.vala" - _tmp24_ = gee_iterator_get (_tmp23_); + _tmp17_ = gee_iterator_get (_tmp16_); #line 193 "/home/jens/Source/shotwell/src/Event.vala" - current_source_id = (gchar*) _tmp24_; + current_source_id = (gchar*) _tmp17_; #line 194 "/home/jens/Source/shotwell/src/Event.vala" - _tmp25_ = media_collection_registry_get_instance (); + _tmp18_ = media_collection_registry_get_instance (); #line 194 "/home/jens/Source/shotwell/src/Event.vala" - _tmp26_ = _tmp25_; + _tmp19_ = _tmp18_; #line 194 "/home/jens/Source/shotwell/src/Event.vala" - _tmp27_ = current_source_id; + _tmp20_ = current_source_id; #line 194 "/home/jens/Source/shotwell/src/Event.vala" - _tmp28_ = media_collection_registry_fetch_media (_tmp26_, _tmp27_); + _tmp21_ = media_collection_registry_fetch_media (_tmp19_, _tmp20_); #line 194 "/home/jens/Source/shotwell/src/Event.vala" - _tmp29_ = _tmp28_; + _tmp22_ = _tmp21_; #line 194 "/home/jens/Source/shotwell/src/Event.vala" - _media_collection_registry_unref0 (_tmp26_); + _media_collection_registry_unref0 (_tmp19_); #line 194 "/home/jens/Source/shotwell/src/Event.vala" - media = _tmp29_; + media = _tmp22_; #line 196 "/home/jens/Source/shotwell/src/Event.vala" - _tmp30_ = media; + _tmp23_ = media; #line 196 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp30_ != NULL) { -#line 2061 "Event.c" - GeeArrayList* _tmp31_; - MediaSource* _tmp32_; - ThumbnailView* _tmp33_; - ThumbnailView* _tmp34_; + if (_tmp23_ != NULL) { +#line 2345 "Event.c" + GeeArrayList* _tmp24_; + MediaSource* _tmp25_; + ThumbnailView* _tmp26_; + ThumbnailView* _tmp27_; #line 197 "/home/jens/Source/shotwell/src/Event.vala" - _tmp31_ = event_thumbs; + _tmp24_ = event_thumbs; #line 197 "/home/jens/Source/shotwell/src/Event.vala" - _tmp32_ = media; + _tmp25_ = media; #line 197 "/home/jens/Source/shotwell/src/Event.vala" - _tmp33_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); + _tmp26_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 197 "/home/jens/Source/shotwell/src/Event.vala" - _tmp34_ = _tmp33_; + _tmp27_ = _tmp26_; #line 197 "/home/jens/Source/shotwell/src/Event.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp34_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp27_); #line 197 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp34_); -#line 2078 "Event.c" + _g_object_unref0 (_tmp27_); +#line 2362 "Event.c" } #line 193 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (media); #line 193 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (current_source_id); -#line 2084 "Event.c" +#line 2368 "Event.c" } #line 193 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_current_source_id_it); -#line 2088 "Event.c" +#line 2372 "Event.c" } #line 200 "/home/jens/Source/shotwell/src/Event.vala" - _tmp35_ = self->priv->event_id; + _tmp28_ = self->priv->event_id; #line 200 "/home/jens/Source/shotwell/src/Event.vala" - _tmp36_ = _tmp35_.id; + _tmp29_ = _tmp28_.id; #line 200 "/home/jens/Source/shotwell/src/Event.vala" - _tmp37_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp36_); + _tmp30_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp29_); #line 200 "/home/jens/Source/shotwell/src/Event.vala" - _tmp38_ = _tmp37_; + _tmp31_ = _tmp30_; #line 200 "/home/jens/Source/shotwell/src/Event.vala" - _tmp39_ = g_strdup_printf ("ViewCollection for Event %s", _tmp38_); + _tmp32_ = g_strdup_printf ("ViewCollection for Event %s", _tmp31_); #line 200 "/home/jens/Source/shotwell/src/Event.vala" - _tmp40_ = _tmp39_; + _tmp33_ = _tmp32_; #line 200 "/home/jens/Source/shotwell/src/Event.vala" - _tmp41_ = view_collection_new (_tmp40_); + _tmp34_ = view_collection_new (_tmp33_); #line 200 "/home/jens/Source/shotwell/src/Event.vala" _data_collection_unref0 (self->priv->view); #line 200 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->view = _tmp41_; + self->priv->view = _tmp34_; #line 200 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp40_); + _g_free0 (_tmp33_); #line 200 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp38_); + _g_free0 (_tmp31_); #line 201 "/home/jens/Source/shotwell/src/Event.vala" - _tmp42_ = self->priv->view; + _tmp35_ = self->priv->view; #line 201 "/home/jens/Source/shotwell/src/Event.vala" - data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_DATA_COLLECTION, DataCollection), _event_view_comparator_comparator, NULL, _event_view_comparator_predicate_comparator_predicate, NULL); + data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_DATA_COLLECTION, DataCollection), _event_view_comparator_comparator, NULL, _event_view_comparator_predicate_comparator_predicate, NULL); #line 202 "/home/jens/Source/shotwell/src/Event.vala" - _tmp43_ = self->priv->view; + _tmp36_ = self->priv->view; #line 202 "/home/jens/Source/shotwell/src/Event.vala" - _tmp44_ = event_thumbs; + _tmp37_ = event_thumbs; #line 202 "/home/jens/Source/shotwell/src/Event.vala" - _tmp45_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); + _tmp38_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); #line 202 "/home/jens/Source/shotwell/src/Event.vala" - _tmp46_ = _tmp45_; + _tmp39_ = _tmp38_; #line 202 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp46_); + _g_object_unref0 (_tmp39_); #line 206 "/home/jens/Source/shotwell/src/Event.vala" - _tmp47_ = event_thumbs; + _tmp40_ = event_thumbs; #line 206 "/home/jens/Source/shotwell/src/Event.vala" - _tmp48_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp41_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 206 "/home/jens/Source/shotwell/src/Event.vala" - _tmp49_ = _tmp48_; + _tmp42_ = _tmp41_; #line 206 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp49_ > 0) { -#line 2134 "Event.c" - EventSourceCollection* _tmp50_; - GeeArrayList* _tmp51_; - EventSourceCollection* _tmp52_; - GeeArrayList* _tmp53_; + if (_tmp42_ > 0) { +#line 2418 "Event.c" + EventSourceCollection* _tmp43_; + GeeArrayList* _tmp44_; + EventSourceCollection* _tmp45_; + GeeArrayList* _tmp46_; #line 207 "/home/jens/Source/shotwell/src/Event.vala" - _tmp50_ = event_global; + _tmp43_ = event_global; #line 207 "/home/jens/Source/shotwell/src/Event.vala" - _tmp51_ = event_thumbs; + _tmp44_ = event_thumbs; #line 207 "/home/jens/Source/shotwell/src/Event.vala" - container_source_collection_notify_container_contents_added (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection), FALSE); + container_source_collection_notify_container_contents_added (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection), FALSE); #line 208 "/home/jens/Source/shotwell/src/Event.vala" - _tmp52_ = event_global; + _tmp45_ = event_global; #line 208 "/home/jens/Source/shotwell/src/Event.vala" - _tmp53_ = event_thumbs; + _tmp46_ = event_thumbs; #line 208 "/home/jens/Source/shotwell/src/Event.vala" - container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, FALSE); -#line 2151 "Event.c" + container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, FALSE); +#line 2435 "Event.c" } #line 213 "/home/jens/Source/shotwell/src/Event.vala" - _tmp54_ = media_collection_registry_get_instance (); -#line 213 "/home/jens/Source/shotwell/src/Event.vala" - _tmp55_ = _tmp54_; + _tmp47_ = media_collection_registry_get_instance (); #line 213 "/home/jens/Source/shotwell/src/Event.vala" - _tmp56_ = event_row; + _tmp48_ = _tmp47_; #line 213 "/home/jens/Source/shotwell/src/Event.vala" - _tmp57_ = _tmp56_->primary_source_id; + _tmp49_ = event_row->primary_source_id; #line 213 "/home/jens/Source/shotwell/src/Event.vala" - _tmp58_ = media_collection_registry_fetch_media (_tmp55_, _tmp57_); + _tmp50_ = media_collection_registry_fetch_media (_tmp48_, _tmp49_); #line 213 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (self->priv->primary_source); #line 213 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->primary_source = _tmp58_; + self->priv->primary_source = _tmp50_; #line 213 "/home/jens/Source/shotwell/src/Event.vala" - _media_collection_registry_unref0 (_tmp55_); + _media_collection_registry_unref0 (_tmp48_); #line 214 "/home/jens/Source/shotwell/src/Event.vala" - _tmp60_ = self->priv->primary_source; + _tmp52_ = self->priv->primary_source; #line 214 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp60_ == NULL) { -#line 2173 "Event.c" - ViewCollection* _tmp61_; - gint _tmp62_; -#line 214 "/home/jens/Source/shotwell/src/Event.vala" - _tmp61_ = self->priv->view; + if (_tmp52_ == NULL) { +#line 2455 "Event.c" + ViewCollection* _tmp53_; #line 214 "/home/jens/Source/shotwell/src/Event.vala" - _tmp62_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp53_ = self->priv->view; #line 214 "/home/jens/Source/shotwell/src/Event.vala" - _tmp59_ = _tmp62_ > 0; -#line 2182 "Event.c" + _tmp51_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_DATA_COLLECTION, DataCollection)) > 0; +#line 2461 "Event.c" } else { #line 214 "/home/jens/Source/shotwell/src/Event.vala" - _tmp59_ = FALSE; -#line 2186 "Event.c" + _tmp51_ = FALSE; +#line 2465 "Event.c" } #line 214 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp59_) { -#line 2190 "Event.c" - ViewCollection* _tmp63_; - DataView* _tmp64_; - DataView* _tmp65_; - DataSource* _tmp66_; - EventTable* _tmp67_; - EventID _tmp68_; - MediaSource* _tmp69_; - gchar* _tmp70_; - gchar* _tmp71_; + if (_tmp51_) { +#line 2469 "Event.c" + ViewCollection* _tmp54_; + DataView* _tmp55_; + DataView* _tmp56_; + DataSource* _tmp57_; + EventTable* _tmp58_; + EventID _tmp59_; + MediaSource* _tmp60_; + gchar* _tmp61_; + gchar* _tmp62_; #line 215 "/home/jens/Source/shotwell/src/Event.vala" - _tmp63_ = self->priv->view; + _tmp54_ = self->priv->view; #line 215 "/home/jens/Source/shotwell/src/Event.vala" - _tmp64_ = view_collection_get_first_unrejected (_tmp63_); + _tmp55_ = view_collection_get_first_unrejected (_tmp54_); #line 215 "/home/jens/Source/shotwell/src/Event.vala" - _tmp65_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_DATA_VIEW, DataView); + _tmp56_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_DATA_VIEW, DataView); #line 215 "/home/jens/Source/shotwell/src/Event.vala" - _tmp66_ = data_view_get_source (_tmp65_); + _tmp57_ = data_view_get_source (_tmp56_); #line 215 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (self->priv->primary_source); #line 215 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->primary_source = G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_MEDIA_SOURCE, MediaSource); + self->priv->primary_source = G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_MEDIA_SOURCE, MediaSource); #line 215 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp65_); + _g_object_unref0 (_tmp56_); #line 216 "/home/jens/Source/shotwell/src/Event.vala" - _tmp67_ = event_event_table; + _tmp58_ = event_event_table; #line 216 "/home/jens/Source/shotwell/src/Event.vala" - _tmp68_ = self->priv->event_id; + _tmp59_ = self->priv->event_id; #line 216 "/home/jens/Source/shotwell/src/Event.vala" - _tmp69_ = self->priv->primary_source; + _tmp60_ = self->priv->primary_source; #line 216 "/home/jens/Source/shotwell/src/Event.vala" - _tmp70_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_DATA_SOURCE, DataSource)); + _tmp61_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_DATA_SOURCE, DataSource)); #line 216 "/home/jens/Source/shotwell/src/Event.vala" - _tmp71_ = _tmp70_; + _tmp62_ = _tmp61_; #line 216 "/home/jens/Source/shotwell/src/Event.vala" - event_table_set_primary_source_id (_tmp67_, &_tmp68_, _tmp71_); + event_table_set_primary_source_id (_tmp58_, &_tmp59_, _tmp62_); #line 216 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp71_); -#line 2228 "Event.c" + _g_free0 (_tmp62_); +#line 2507 "Event.c" } #line 220 "/home/jens/Source/shotwell/src/Event.vala" - _tmp72_ = self->priv->primary_source; + _tmp63_ = self->priv->primary_source; #line 220 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp72_ != NULL) { -#line 2234 "Event.c" - MediaSource* _tmp73_; + if (_tmp63_ != NULL) { +#line 2513 "Event.c" + MediaSource* _tmp64_; #line 221 "/home/jens/Source/shotwell/src/Event.vala" - _tmp73_ = self->priv->primary_source; + _tmp64_ = self->priv->primary_source; #line 221 "/home/jens/Source/shotwell/src/Event.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), "thumbnail-altered", (GCallback) _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered, self, 0); -#line 2240 "Event.c" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), "thumbnail-altered", (GCallback) _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered, self, 0); +#line 2519 "Event.c" } #line 224 "/home/jens/Source/shotwell/src/Event.vala" - _tmp74_ = self->priv->view; + _tmp65_ = self->priv->view; #line 224 "/home/jens/Source/shotwell/src/Event.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _event_on_media_added_data_collection_items_added, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _event_on_media_added_data_collection_items_added, self, 0); #line 225 "/home/jens/Source/shotwell/src/Event.vala" - _tmp75_ = self->priv->view; + _tmp66_ = self->priv->view; #line 225 "/home/jens/Source/shotwell/src/Event.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _event_on_media_removed_data_collection_items_removed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _event_on_media_removed_data_collection_items_removed, self, 0); #line 226 "/home/jens/Source/shotwell/src/Event.vala" - _tmp76_ = self->priv->view; + _tmp67_ = self->priv->view; #line 226 "/home/jens/Source/shotwell/src/Event.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _event_on_media_altered_data_collection_items_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _event_on_media_altered_data_collection_items_altered, self, 0); #line 230 "/home/jens/Source/shotwell/src/Event.vala" - _tmp77_ = library_photo_global; + _tmp68_ = library_photo_global; #line 230 "/home/jens/Source/shotwell/src/Event.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _event_on_media_destroyed_source_collection_item_destroyed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _event_on_media_destroyed_source_collection_item_destroyed, self, 0); #line 231 "/home/jens/Source/shotwell/src/Event.vala" - _tmp78_ = video_global; + _tmp69_ = video_global; #line 231 "/home/jens/Source/shotwell/src/Event.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _event_on_media_destroyed_source_collection_item_destroyed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _event_on_media_destroyed_source_collection_item_destroyed, self, 0); #line 233 "/home/jens/Source/shotwell/src/Event.vala" event_update_indexable_keywords (self); #line 180 "/home/jens/Source/shotwell/src/Event.vala" @@ -2266,18 +2545,23 @@ static Event* event_construct (GType object_type, EventRow* event_row, gint64 ob _g_object_unref0 (event_source_ids); #line 180 "/home/jens/Source/shotwell/src/Event.vala" return self; -#line 2270 "Event.c" +#line 2549 "Event.c" } -static Event* event_new (EventRow* event_row, gint64 object_id) { +static Event* +event_new (EventRow* event_row, + gint64 object_id) +{ #line 180 "/home/jens/Source/shotwell/src/Event.vala" return event_construct (TYPE_EVENT, event_row, object_id); -#line 2277 "Event.c" +#line 2559 "Event.c" } -static gchar* event_real_get_typename (DataSource* base) { +static gchar* +event_real_get_typename (DataSource* base) +{ Event * self; gchar* result = NULL; gchar* _tmp0_; @@ -2289,11 +2573,13 @@ static gchar* event_real_get_typename (DataSource* base) { result = _tmp0_; #line 249 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 2293 "Event.c" +#line 2577 "Event.c" } -static gint64 event_real_get_instance_id (DataSource* base) { +static gint64 +event_real_get_instance_id (DataSource* base) +{ Event * self; gint64 result = 0LL; EventID _tmp0_ = {0}; @@ -2308,11 +2594,13 @@ static gint64 event_real_get_instance_id (DataSource* base) { result = _tmp1_; #line 253 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 2312 "Event.c" +#line 2598 "Event.c" } -static gchar* event_real_get_representative_id (ThumbnailSource* base) { +static gchar* +event_real_get_representative_id (ThumbnailSource* base) +{ Event * self; gchar* result = NULL; gchar* _tmp0_ = NULL; @@ -2323,7 +2611,7 @@ static gchar* event_real_get_representative_id (ThumbnailSource* base) { _tmp1_ = self->priv->primary_source; #line 257 "/home/jens/Source/shotwell/src/Event.vala" if (_tmp1_ != NULL) { -#line 2327 "Event.c" +#line 2615 "Event.c" MediaSource* _tmp2_; gchar* _tmp3_; #line 257 "/home/jens/Source/shotwell/src/Event.vala" @@ -2334,7 +2622,7 @@ static gchar* event_real_get_representative_id (ThumbnailSource* base) { _g_free0 (_tmp0_); #line 257 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = _tmp3_; -#line 2338 "Event.c" +#line 2626 "Event.c" } else { gchar* _tmp4_; #line 257 "/home/jens/Source/shotwell/src/Event.vala" @@ -2343,17 +2631,19 @@ static gchar* event_real_get_representative_id (ThumbnailSource* base) { _g_free0 (_tmp0_); #line 257 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = _tmp4_; -#line 2347 "Event.c" +#line 2635 "Event.c" } #line 257 "/home/jens/Source/shotwell/src/Event.vala" result = _tmp0_; #line 257 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 2353 "Event.c" +#line 2641 "Event.c" } -static PhotoFileFormat event_real_get_preferred_thumbnail_format (ThumbnailSource* base) { +static PhotoFileFormat +event_real_get_preferred_thumbnail_format (ThumbnailSource* base) +{ Event * self; PhotoFileFormat result = 0; PhotoFileFormat _tmp0_ = 0; @@ -2364,33 +2654,31 @@ static PhotoFileFormat event_real_get_preferred_thumbnail_format (ThumbnailSourc _tmp1_ = self->priv->primary_source; #line 261 "/home/jens/Source/shotwell/src/Event.vala" if (_tmp1_ != NULL) { -#line 2368 "Event.c" +#line 2658 "Event.c" MediaSource* _tmp2_; - PhotoFileFormat _tmp3_; #line 261 "/home/jens/Source/shotwell/src/Event.vala" _tmp2_ = self->priv->primary_source; #line 261 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = thumbnail_source_get_preferred_thumbnail_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 261 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = _tmp3_; -#line 2377 "Event.c" + _tmp0_ = thumbnail_source_get_preferred_thumbnail_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); +#line 2664 "Event.c" } else { - PhotoFileFormat _tmp4_; #line 262 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = photo_file_format_get_system_default_format (); -#line 262 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = _tmp4_; -#line 2384 "Event.c" + _tmp0_ = photo_file_format_get_system_default_format (); +#line 2668 "Event.c" } #line 261 "/home/jens/Source/shotwell/src/Event.vala" result = _tmp0_; #line 261 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 2390 "Event.c" +#line 2674 "Event.c" } -static GdkPixbuf* event_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error) { +static GdkPixbuf* +event_real_create_thumbnail (ThumbnailSource* base, + gint scale, + GError** error) +{ Event * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; @@ -2402,20 +2690,17 @@ static GdkPixbuf* event_real_create_thumbnail (ThumbnailSource* base, gint scale _tmp1_ = self->priv->primary_source; #line 266 "/home/jens/Source/shotwell/src/Event.vala" if (_tmp1_ != NULL) { -#line 2406 "Event.c" +#line 2694 "Event.c" MediaSource* _tmp2_; - gint _tmp3_; - GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp3_; #line 266 "/home/jens/Source/shotwell/src/Event.vala" _tmp2_ = self->priv->primary_source; #line 266 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = scale; -#line 266 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = thumbnail_source_create_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp3_, &_inner_error_); + _tmp3_ = thumbnail_source_create_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), scale, &_inner_error_); #line 266 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_tmp0_); #line 266 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 266 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 266 "/home/jens/Source/shotwell/src/Event.vala" @@ -2424,24 +2709,27 @@ static GdkPixbuf* event_real_create_thumbnail (ThumbnailSource* base, gint scale _g_object_unref0 (_tmp0_); #line 266 "/home/jens/Source/shotwell/src/Event.vala" return NULL; -#line 2428 "Event.c" +#line 2713 "Event.c" } } else { #line 266 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_tmp0_); #line 266 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = NULL; -#line 2435 "Event.c" +#line 2720 "Event.c" } #line 266 "/home/jens/Source/shotwell/src/Event.vala" result = _tmp0_; #line 266 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 2441 "Event.c" +#line 2726 "Event.c" } -void event_init (ProgressMonitor monitor, void* monitor_target) { +void +event_init (ProgressMonitor monitor, + void* monitor_target) +{ EventTable* _tmp0_; EventSourceCollection* _tmp1_; EventSourceCollection* _tmp2_; @@ -2456,12 +2744,12 @@ void event_init (ProgressMonitor monitor, void* monitor_target) { GeeArrayList* _tmp7_; gint _tmp8_; gint _tmp9_; - EventSourceCollection* _tmp32_; - GeeArrayList* _tmp33_; - GeeCollection* _tmp34_; - GeeCollection* _tmp35_; - EventSourceCollection* _tmp36_; - GeeArrayList* _tmp37_; + EventSourceCollection* _tmp29_; + GeeArrayList* _tmp30_; + GeeCollection* _tmp31_; + GeeCollection* _tmp32_; + EventSourceCollection* _tmp33_; + GeeArrayList* _tmp34_; #line 270 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = event_table_get_instance (); #line 270 "/home/jens/Source/shotwell/src/Event.vala" @@ -2500,19 +2788,19 @@ void event_init (ProgressMonitor monitor, void* monitor_target) { _tmp9_ = _tmp8_; #line 279 "/home/jens/Source/shotwell/src/Event.vala" count = _tmp9_; -#line 2504 "Event.c" +#line 2792 "Event.c" { gint ctr = 0; #line 280 "/home/jens/Source/shotwell/src/Event.vala" ctr = 0; -#line 2509 "Event.c" +#line 2797 "Event.c" { gboolean _tmp10_ = FALSE; #line 280 "/home/jens/Source/shotwell/src/Event.vala" _tmp10_ = TRUE; #line 280 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 2516 "Event.c" +#line 2804 "Event.c" gint _tmp12_; gint _tmp13_; Event* event = NULL; @@ -2522,23 +2810,20 @@ void event_init (ProgressMonitor monitor, void* monitor_target) { EventRow* _tmp17_; Event* _tmp18_; Event* _tmp19_; - ProgressMonitor _tmp20_; - void* _tmp20__target; - Event* _tmp24_; - gint _tmp25_; + Event* _tmp22_; + Event* _tmp25_; + EventSourceCollection* _tmp26_; + GeeArrayList* _tmp27_; Event* _tmp28_; - EventSourceCollection* _tmp29_; - GeeArrayList* _tmp30_; - Event* _tmp31_; #line 280 "/home/jens/Source/shotwell/src/Event.vala" if (!_tmp10_) { -#line 2536 "Event.c" +#line 2821 "Event.c" gint _tmp11_; #line 280 "/home/jens/Source/shotwell/src/Event.vala" _tmp11_ = ctr; #line 280 "/home/jens/Source/shotwell/src/Event.vala" ctr = _tmp11_ + 1; -#line 2542 "Event.c" +#line 2827 "Event.c" } #line 280 "/home/jens/Source/shotwell/src/Event.vala" _tmp10_ = FALSE; @@ -2550,7 +2835,7 @@ void event_init (ProgressMonitor monitor, void* monitor_target) { if (!(_tmp12_ < _tmp13_)) { #line 280 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 2554 "Event.c" +#line 2839 "Event.c" } #line 281 "/home/jens/Source/shotwell/src/Event.vala" _tmp14_ = event_rows; @@ -2569,179 +2854,158 @@ void event_init (ProgressMonitor monitor, void* monitor_target) { #line 281 "/home/jens/Source/shotwell/src/Event.vala" event = _tmp19_; #line 282 "/home/jens/Source/shotwell/src/Event.vala" - _tmp20_ = monitor; -#line 282 "/home/jens/Source/shotwell/src/Event.vala" - _tmp20__target = monitor_target; -#line 282 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp20_ != NULL) { -#line 2578 "Event.c" - ProgressMonitor _tmp21_; - void* _tmp21__target; - gint _tmp22_; - gint _tmp23_; -#line 283 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ = monitor; + if (monitor != NULL) { +#line 2859 "Event.c" + gint _tmp20_; + gint _tmp21_; #line 283 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21__target = monitor_target; + _tmp20_ = ctr; #line 283 "/home/jens/Source/shotwell/src/Event.vala" - _tmp22_ = ctr; + _tmp21_ = count; #line 283 "/home/jens/Source/shotwell/src/Event.vala" - _tmp23_ = count; -#line 283 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ ((guint64) _tmp22_, (guint64) _tmp23_, TRUE, _tmp21__target); -#line 2593 "Event.c" + monitor ((guint64) _tmp20_, (guint64) _tmp21_, TRUE, monitor_target); +#line 2868 "Event.c" } #line 285 "/home/jens/Source/shotwell/src/Event.vala" - _tmp24_ = event; -#line 285 "/home/jens/Source/shotwell/src/Event.vala" - _tmp25_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_EVENT_SOURCE, EventSource)); + _tmp22_ = event; #line 285 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp25_ != 0) { -#line 2601 "Event.c" - GeeArrayList* _tmp26_; - Event* _tmp27_; + if (event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_EVENT_SOURCE, EventSource)) != 0) { +#line 2874 "Event.c" + GeeArrayList* _tmp23_; + Event* _tmp24_; #line 286 "/home/jens/Source/shotwell/src/Event.vala" - _tmp26_ = events; + _tmp23_ = events; #line 286 "/home/jens/Source/shotwell/src/Event.vala" - _tmp27_ = event; + _tmp24_ = event; #line 286 "/home/jens/Source/shotwell/src/Event.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp27_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_); #line 288 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); #line 288 "/home/jens/Source/shotwell/src/Event.vala" continue; -#line 2614 "Event.c" +#line 2887 "Event.c" } #line 294 "/home/jens/Source/shotwell/src/Event.vala" - _tmp28_ = event; + _tmp25_ = event; #line 294 "/home/jens/Source/shotwell/src/Event.vala" - _tmp29_ = event_global; + _tmp26_ = event_global; #line 294 "/home/jens/Source/shotwell/src/Event.vala" - data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_SOURCE_COLLECTION, SourceCollection), NULL); + data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_SOURCE_COLLECTION, SourceCollection), NULL); #line 295 "/home/jens/Source/shotwell/src/Event.vala" - _tmp30_ = unlinked; + _tmp27_ = unlinked; #line 295 "/home/jens/Source/shotwell/src/Event.vala" - _tmp31_ = event; + _tmp28_ = event; #line 295 "/home/jens/Source/shotwell/src/Event.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp31_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_); #line 280 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); -#line 2630 "Event.c" +#line 2903 "Event.c" } } } #line 298 "/home/jens/Source/shotwell/src/Event.vala" - _tmp32_ = event_global; + _tmp29_ = event_global; #line 298 "/home/jens/Source/shotwell/src/Event.vala" - _tmp33_ = events; + _tmp30_ = events; #line 298 "/home/jens/Source/shotwell/src/Event.vala" - _tmp34_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); + _tmp31_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); #line 298 "/home/jens/Source/shotwell/src/Event.vala" - _tmp35_ = _tmp34_; + _tmp32_ = _tmp31_; #line 298 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp35_); + _g_object_unref0 (_tmp32_); #line 299 "/home/jens/Source/shotwell/src/Event.vala" - _tmp36_ = event_global; + _tmp33_ = event_global; #line 299 "/home/jens/Source/shotwell/src/Event.vala" - _tmp37_ = unlinked; + _tmp34_ = unlinked; #line 299 "/home/jens/Source/shotwell/src/Event.vala" - container_source_collection_init_add_many_unlinked (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection)); + container_source_collection_init_add_many_unlinked (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection)); #line 269 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event_rows); #line 269 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (unlinked); #line 269 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (events); -#line 2656 "Event.c" +#line 2929 "Event.c" } -void event_terminate (void) { +void +event_terminate (void) +{ } -static gint64 event_view_comparator (void* a, void* b) { +static gint64 +event_view_comparator (void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; - DataSource* _tmp1_; - MediaSource* _tmp2_; - time_t _tmp3_; - void* _tmp4_; - DataSource* _tmp5_; - MediaSource* _tmp6_; - time_t _tmp7_; - gint64 _tmp8_; -#line 306 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = a; -#line 306 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST ((ThumbnailView*) _tmp0_, TYPE_DATA_VIEW, DataView)); -#line 306 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource); -#line 306 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = media_source_get_exposure_time (_tmp2_); + DataSource* _tmp0_; + MediaSource* _tmp1_; + DataSource* _tmp2_; + MediaSource* _tmp3_; + gint64 _tmp4_; #line 306 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = b; + _tmp0_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST ((ThumbnailView*) a, TYPE_DATA_VIEW, DataView)); #line 306 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST ((ThumbnailView*) _tmp4_, TYPE_DATA_VIEW, DataView)); + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource); #line 306 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp2_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST ((ThumbnailView*) b, TYPE_DATA_VIEW, DataView)); #line 306 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = media_source_get_exposure_time (_tmp6_); + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource); #line 306 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = (gint64) (_tmp3_ - _tmp7_); + _tmp4_ = (gint64) (media_source_get_exposure_time (_tmp1_) - media_source_get_exposure_time (_tmp3_)); #line 306 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp3_); #line 306 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 306 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp8_; + result = _tmp4_; #line 306 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 2701 "Event.c" +#line 2967 "Event.c" } -static gboolean event_view_comparator_predicate (DataObject* object, Alteration* alteration) { +static gboolean +event_view_comparator_predicate (DataObject* object, + Alteration* alteration) +{ gboolean result = FALSE; - Alteration* _tmp0_; - gboolean _tmp1_; #line 310 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 310 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 311 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = alteration; -#line 311 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "exposure-time"); -#line 311 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp1_; + result = alteration_has_detail (alteration, "metadata", "exposure-time"); #line 311 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 2721 "Event.c" +#line 2984 "Event.c" } -gchar* event_prep_event_name (const gchar* name) { +gchar* +event_prep_event_name (const gchar* name) +{ gchar* result = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; -#line 319 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = name; + gchar* _tmp0_; #line 319 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = prepare_input_text (_tmp0_, (((PREPARE_INPUT_TEXT_OPTIONS_NORMALIZE | PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) | PREPARE_INPUT_TEXT_OPTIONS_INVALID_IS_NULL) | PREPARE_INPUT_TEXT_OPTIONS_STRIP) | PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF, DEFAULT_USER_TEXT_INPUT_LENGTH); + _tmp0_ = prepare_input_text (name, (((PREPARE_INPUT_TEXT_OPTIONS_NORMALIZE | PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) | PREPARE_INPUT_TEXT_OPTIONS_INVALID_IS_NULL) | PREPARE_INPUT_TEXT_OPTIONS_STRIP) | PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF, DEFAULT_USER_TEXT_INPUT_LENGTH); #line 319 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp1_; + result = _tmp0_; #line 319 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 2737 "Event.c" +#line 2999 "Event.c" } -void event_attach (Event* self, MediaSource* source) { +void +event_attach (Event* self, + MediaSource* source) +{ ViewCollection* _tmp0_; - MediaSource* _tmp1_; + ThumbnailView* _tmp1_; ThumbnailView* _tmp2_; - ThumbnailView* _tmp3_; #line 327 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); #line 327 "/home/jens/Source/shotwell/src/Event.vala" @@ -2749,26 +3013,27 @@ void event_attach (Event* self, MediaSource* source) { #line 328 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = self->priv->view; #line 328 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = source; -#line 328 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); + _tmp1_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 328 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 328 "/home/jens/Source/shotwell/src/Event.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject)); #line 328 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp3_); -#line 2762 "Event.c" + _g_object_unref0 (_tmp2_); +#line 3024 "Event.c" } -void event_attach_many (Event* self, GeeCollection* media) { +void +event_attach_many (Event* self, + GeeCollection* media) +{ GeeArrayList* views = NULL; GeeArrayList* _tmp0_; - ViewCollection* _tmp11_; - GeeArrayList* _tmp12_; - GeeCollection* _tmp13_; - GeeCollection* _tmp14_; + ViewCollection* _tmp9_; + GeeArrayList* _tmp10_; + GeeCollection* _tmp11_; + GeeCollection* _tmp12_; #line 331 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); #line 331 "/home/jens/Source/shotwell/src/Event.vala" @@ -2777,90 +3042,86 @@ void event_attach_many (Event* self, GeeCollection* media) { _tmp0_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 332 "/home/jens/Source/shotwell/src/Event.vala" views = _tmp0_; -#line 2781 "Event.c" +#line 3046 "Event.c" { GeeIterator* _current_source_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp1_; #line 333 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = media; + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_ITERABLE, GeeIterable)); #line 333 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 333 "/home/jens/Source/shotwell/src/Event.vala" - _current_source_it = _tmp2_; + _current_source_it = _tmp1_; #line 333 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 2794 "Event.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 3056 "Event.c" + GeeIterator* _tmp2_; MediaSource* current_source = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - GeeArrayList* _tmp7_; - MediaSource* _tmp8_; - ThumbnailView* _tmp9_; - ThumbnailView* _tmp10_; -#line 333 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _current_source_it; + GeeIterator* _tmp3_; + gpointer _tmp4_; + GeeArrayList* _tmp5_; + MediaSource* _tmp6_; + ThumbnailView* _tmp7_; + ThumbnailView* _tmp8_; #line 333 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _current_source_it; #line 333 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 333 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 2812 "Event.c" +#line 3071 "Event.c" } #line 333 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _current_source_it; + _tmp3_ = _current_source_it; #line 333 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 333 "/home/jens/Source/shotwell/src/Event.vala" - current_source = (MediaSource*) _tmp6_; + current_source = (MediaSource*) _tmp4_; #line 334 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = views; + _tmp5_ = views; #line 334 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = current_source; + _tmp6_ = current_source; #line 334 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); + _tmp7_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 334 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 334 "/home/jens/Source/shotwell/src/Event.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_); #line 334 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 333 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (current_source); -#line 2834 "Event.c" +#line 3093 "Event.c" } #line 333 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_current_source_it); -#line 2838 "Event.c" +#line 3097 "Event.c" } #line 336 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = self->priv->view; + _tmp9_ = self->priv->view; #line 336 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = views; + _tmp10_ = views; #line 336 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); + _tmp11_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); #line 336 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 336 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp12_); #line 331 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (views); -#line 2852 "Event.c" +#line 3111 "Event.c" } -void event_detach (Event* self, MediaSource* source) { +void +event_detach (Event* self, + MediaSource* source) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; ViewCollection* _tmp2_; - MediaSource* _tmp3_; + DataView* _tmp3_; DataView* _tmp4_; - DataView* _tmp5_; + Marker* _tmp5_; Marker* _tmp6_; - Marker* _tmp7_; #line 342 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); #line 342 "/home/jens/Source/shotwell/src/Event.vala" @@ -2872,33 +3133,34 @@ void event_detach (Event* self, MediaSource* source) { #line 343 "/home/jens/Source/shotwell/src/Event.vala" _tmp2_ = self->priv->view; #line 343 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = source; + _tmp3_ = view_collection_get_view_for_source (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #line 343 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = view_collection_get_view_for_source (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource)); -#line 343 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 343 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); + _tmp5_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject)); #line 343 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 343 "/home/jens/Source/shotwell/src/Event.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), _tmp7_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), _tmp6_); #line 343 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 343 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp5_); -#line 2891 "Event.c" + _g_object_unref0 (_tmp4_); +#line 3150 "Event.c" } -void event_detach_many (Event* self, GeeCollection* media) { +void +event_detach_many (Event* self, + GeeCollection* media) +{ GeeArrayList* views = NULL; GeeArrayList* _tmp0_; - ViewCollection* _tmp13_; - ViewCollection* _tmp14_; - GeeArrayList* _tmp15_; - Marker* _tmp16_; - Marker* _tmp17_; + ViewCollection* _tmp11_; + ViewCollection* _tmp12_; + GeeArrayList* _tmp13_; + Marker* _tmp14_; + Marker* _tmp15_; #line 346 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); #line 346 "/home/jens/Source/shotwell/src/Event.vala" @@ -2907,106 +3169,103 @@ void event_detach_many (Event* self, GeeCollection* media) { _tmp0_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 347 "/home/jens/Source/shotwell/src/Event.vala" views = _tmp0_; -#line 2911 "Event.c" +#line 3173 "Event.c" { GeeIterator* _current_source_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; -#line 348 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = media; + GeeIterator* _tmp1_; #line 348 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_ITERABLE, GeeIterable)); #line 348 "/home/jens/Source/shotwell/src/Event.vala" - _current_source_it = _tmp2_; + _current_source_it = _tmp1_; #line 348 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 2924 "Event.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 3183 "Event.c" + GeeIterator* _tmp2_; MediaSource* current_source = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; ThumbnailView* view = NULL; - ViewCollection* _tmp7_; - MediaSource* _tmp8_; - DataView* _tmp9_; - ThumbnailView* _tmp10_; -#line 348 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _current_source_it; + ViewCollection* _tmp5_; + MediaSource* _tmp6_; + DataView* _tmp7_; + ThumbnailView* _tmp8_; #line 348 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _current_source_it; #line 348 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 348 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 2943 "Event.c" +#line 3199 "Event.c" } #line 348 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _current_source_it; + _tmp3_ = _current_source_it; #line 348 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 348 "/home/jens/Source/shotwell/src/Event.vala" - current_source = (MediaSource*) _tmp6_; + current_source = (MediaSource*) _tmp4_; #line 349 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = self->priv->view; + _tmp5_ = self->priv->view; #line 349 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = current_source; + _tmp6_ = current_source; #line 349 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = view_collection_get_view_for_source (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource)); + _tmp7_ = view_collection_get_view_for_source (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_SOURCE, DataSource)); #line 349 "/home/jens/Source/shotwell/src/Event.vala" - view = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_THUMBNAIL_VIEW, ThumbnailView); + view = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_THUMBNAIL_VIEW, ThumbnailView); #line 350 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = view; + _tmp8_ = view; #line 350 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp10_ != NULL) { -#line 2963 "Event.c" - GeeArrayList* _tmp11_; - ThumbnailView* _tmp12_; + if (_tmp8_ != NULL) { +#line 3219 "Event.c" + GeeArrayList* _tmp9_; + ThumbnailView* _tmp10_; #line 351 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = views; + _tmp9_ = views; #line 351 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = view; + _tmp10_ = view; #line 351 "/home/jens/Source/shotwell/src/Event.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp12_); -#line 2972 "Event.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); +#line 3228 "Event.c" } #line 348 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (view); #line 348 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (current_source); -#line 2978 "Event.c" +#line 3234 "Event.c" } #line 348 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_current_source_it); -#line 2982 "Event.c" +#line 3238 "Event.c" } #line 354 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = self->priv->view; + _tmp11_ = self->priv->view; #line 354 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = self->priv->view; + _tmp12_ = self->priv->view; #line 354 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = views; + _tmp13_ = views; #line 354 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp14_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection)); #line 354 "/home/jens/Source/shotwell/src/Event.vala" - _tmp17_ = _tmp16_; + _tmp15_ = _tmp14_; #line 354 "/home/jens/Source/shotwell/src/Event.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), _tmp17_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), _tmp15_); #line 354 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp17_); + _g_object_unref0 (_tmp15_); #line 346 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (views); -#line 3000 "Event.c" +#line 3256 "Event.c" } -gboolean event_contains_media_type (Event* self, const gchar* media_type) { +gboolean +event_contains_media_type (Event* self, + const gchar* media_type) +{ gboolean result = FALSE; #line 360 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT (self), FALSE); #line 360 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (media_type != NULL, FALSE); -#line 3010 "Event.c" +#line 3269 "Event.c" { GeeIterator* _media_it = NULL; GeeCollection* _tmp0_; @@ -3027,47 +3286,41 @@ gboolean event_contains_media_type (Event* self, const gchar* media_type) { _media_it = _tmp3_; #line 361 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 3031 "Event.c" +#line 3290 "Event.c" GeeIterator* _tmp4_; - gboolean _tmp5_; MediaSource* media = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - MediaSource* _tmp8_; + GeeIterator* _tmp5_; + gpointer _tmp6_; + MediaSource* _tmp7_; + gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; - const gchar* _tmp11_; - gboolean _tmp12_; + gboolean _tmp10_; #line 361 "/home/jens/Source/shotwell/src/Event.vala" _tmp4_ = _media_it; #line 361 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 361 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp4_)) { #line 361 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 3050 "Event.c" +#line 3305 "Event.c" } #line 361 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = _media_it; + _tmp5_ = _media_it; #line 361 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 361 "/home/jens/Source/shotwell/src/Event.vala" - media = (MediaSource*) _tmp7_; -#line 362 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = media; + media = (MediaSource*) _tmp6_; #line 362 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = data_source_get_typename (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource)); + _tmp7_ = media; #line 362 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = _tmp9_; + _tmp8_ = data_source_get_typename (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource)); #line 362 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = media_type; + _tmp9_ = _tmp8_; #line 362 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = g_strcmp0 (_tmp10_, _tmp11_) == 0; + _tmp10_ = g_strcmp0 (_tmp9_, media_type) == 0; #line 362 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp9_); #line 362 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp12_) { + if (_tmp10_) { #line 363 "/home/jens/Source/shotwell/src/Event.vala" result = TRUE; #line 363 "/home/jens/Source/shotwell/src/Event.vala" @@ -3076,25 +3329,28 @@ gboolean event_contains_media_type (Event* self, const gchar* media_type) { _g_object_unref0 (_media_it); #line 363 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 3080 "Event.c" +#line 3333 "Event.c" } #line 361 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (media); -#line 3084 "Event.c" +#line 3337 "Event.c" } #line 361 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_media_it); -#line 3088 "Event.c" +#line 3341 "Event.c" } #line 366 "/home/jens/Source/shotwell/src/Event.vala" result = FALSE; #line 366 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 3094 "Event.c" +#line 3347 "Event.c" } -static GeeArrayList* event_views_to_media (Event* self, GeeIterable* views) { +static GeeArrayList* +event_views_to_media (Event* self, + GeeIterable* views) +{ GeeArrayList* result = NULL; GeeArrayList* media = NULL; GeeArrayList* _tmp0_; @@ -3106,308 +3362,297 @@ static GeeArrayList* event_views_to_media (Event* self, GeeIterable* views) { _tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 370 "/home/jens/Source/shotwell/src/Event.vala" media = _tmp0_; -#line 3110 "Event.c" +#line 3366 "Event.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp1_; #line 371 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = views; + _tmp1_ = gee_iterable_iterator (views); #line 371 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = gee_iterable_iterator (_tmp1_); -#line 371 "/home/jens/Source/shotwell/src/Event.vala" - _object_it = _tmp2_; + _object_it = _tmp1_; #line 371 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 3123 "Event.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 3376 "Event.c" + GeeIterator* _tmp2_; DataObject* object = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - GeeArrayList* _tmp7_; - DataObject* _tmp8_; - DataSource* _tmp9_; - MediaSource* _tmp10_; -#line 371 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _object_it; + GeeIterator* _tmp3_; + gpointer _tmp4_; + GeeArrayList* _tmp5_; + DataObject* _tmp6_; + DataSource* _tmp7_; + MediaSource* _tmp8_; #line 371 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _object_it; #line 371 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 371 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 3141 "Event.c" +#line 3391 "Event.c" } #line 371 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _object_it; + _tmp3_ = _object_it; #line 371 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 371 "/home/jens/Source/shotwell/src/Event.vala" - object = (DataObject*) _tmp6_; + object = (DataObject*) _tmp4_; #line 372 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = media; + _tmp5_ = media; #line 372 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = object; + _tmp6_ = object; #line 372 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView)); + _tmp7_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_VIEW, DataView)); #line 372 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource); #line 372 "/home/jens/Source/shotwell/src/Event.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_); #line 372 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 371 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (object); -#line 3163 "Event.c" +#line 3413 "Event.c" } #line 371 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_object_it); -#line 3167 "Event.c" +#line 3417 "Event.c" } #line 374 "/home/jens/Source/shotwell/src/Event.vala" result = media; #line 374 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 3173 "Event.c" +#line 3423 "Event.c" } -static void event_on_media_added (Event* self, GeeIterable* added) { +static void +event_on_media_added (Event* self, + GeeIterable* added) +{ GeeCollection* media = NULL; - GeeIterable* _tmp0_; - GeeArrayList* _tmp1_; - EventSourceCollection* _tmp2_; - gboolean _tmp3_; - EventSourceCollection* _tmp4_; - gboolean _tmp5_; + GeeArrayList* _tmp0_; + EventSourceCollection* _tmp1_; + gboolean _tmp2_; + EventSourceCollection* _tmp3_; + gboolean _tmp4_; + Alteration* _tmp5_; Alteration* _tmp6_; - Alteration* _tmp7_; #line 377 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); #line 377 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (GEE_IS_ITERABLE (added)); #line 378 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = added; -#line 378 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = event_views_to_media (self, _tmp0_); + _tmp0_ = event_views_to_media (self, added); #line 378 "/home/jens/Source/shotwell/src/Event.vala" - media = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); + media = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 379 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = event_global; + _tmp1_ = event_global; #line 379 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = self->priv->relinking; + _tmp2_ = self->priv->relinking; #line 379 "/home/jens/Source/shotwell/src/Event.vala" - container_source_collection_notify_container_contents_added (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), media, _tmp3_); + container_source_collection_notify_container_contents_added (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), media, _tmp2_); #line 380 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = event_global; + _tmp3_ = event_global; #line 380 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = self->priv->relinking; + _tmp4_ = self->priv->relinking; #line 380 "/home/jens/Source/shotwell/src/Event.vala" - container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), media, _tmp5_, NULL, FALSE); + container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), media, _tmp4_, NULL, FALSE); #line 382 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = alteration_new_from_list ("contents:added, metadata:time"); + _tmp5_ = alteration_new_from_list ("contents:added, metadata:time"); #line 382 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 382 "/home/jens/Source/shotwell/src/Event.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp7_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp6_); #line 382 "/home/jens/Source/shotwell/src/Event.vala" - _alteration_unref0 (_tmp7_); + _alteration_unref0 (_tmp6_); #line 377 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (media); -#line 3219 "Event.c" +#line 3469 "Event.c" } -static void event_on_media_removed (Event* self, GeeIterable* removed) { +static void +event_on_media_removed (Event* self, + GeeIterable* removed) +{ GeeArrayList* media = NULL; - GeeIterable* _tmp0_; - GeeArrayList* _tmp1_; - EventSourceCollection* _tmp2_; - GeeArrayList* _tmp3_; - gboolean _tmp4_; - EventSourceCollection* _tmp5_; - GeeArrayList* _tmp6_; - gboolean _tmp7_; - gint _tmp27_; - Alteration* _tmp29_; - Alteration* _tmp30_; + GeeArrayList* _tmp0_; + EventSourceCollection* _tmp1_; + GeeArrayList* _tmp2_; + gboolean _tmp3_; + EventSourceCollection* _tmp4_; + GeeArrayList* _tmp5_; + gboolean _tmp6_; + Alteration* _tmp26_; + Alteration* _tmp27_; #line 386 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); #line 386 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); #line 387 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = removed; -#line 387 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = event_views_to_media (self, _tmp0_); + _tmp0_ = event_views_to_media (self, removed); #line 387 "/home/jens/Source/shotwell/src/Event.vala" - media = _tmp1_; + media = _tmp0_; #line 389 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = event_global; + _tmp1_ = event_global; #line 389 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = media; + _tmp2_ = media; #line 389 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = self->priv->unlinking; + _tmp3_ = self->priv->unlinking; #line 389 "/home/jens/Source/shotwell/src/Event.vala" - container_source_collection_notify_container_contents_removed (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), _tmp4_); + container_source_collection_notify_container_contents_removed (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), _tmp3_); #line 390 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = event_global; + _tmp4_ = event_global; #line 390 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = media; + _tmp5_ = media; #line 390 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = self->priv->unlinking; + _tmp6_ = self->priv->unlinking; #line 390 "/home/jens/Source/shotwell/src/Event.vala" - container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), NULL, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), _tmp7_); -#line 3262 "Event.c" + container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), NULL, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), _tmp6_); +#line 3511 "Event.c" { GeeArrayList* _current_source_list = NULL; + GeeArrayList* _tmp7_; GeeArrayList* _tmp8_; - GeeArrayList* _tmp9_; gint _current_source_size = 0; - GeeArrayList* _tmp10_; + GeeArrayList* _tmp9_; + gint _tmp10_; gint _tmp11_; - gint _tmp12_; gint _current_source_index = 0; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = media; + _tmp7_ = media; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = _g_object_ref0 (_tmp8_); + _tmp8_ = _g_object_ref0 (_tmp7_); #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _current_source_list = _tmp9_; + _current_source_list = _tmp8_; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = _current_source_list; + _tmp9_ = _current_source_list; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp10_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _current_source_size = _tmp12_; + _current_source_size = _tmp11_; #line 393 "/home/jens/Source/shotwell/src/Event.vala" _current_source_index = -1; #line 393 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 3290 "Event.c" +#line 3539 "Event.c" + gint _tmp12_; gint _tmp13_; gint _tmp14_; - gint _tmp15_; MediaSource* current_source = NULL; - GeeArrayList* _tmp16_; - gint _tmp17_; - gpointer _tmp18_; + GeeArrayList* _tmp15_; + gint _tmp16_; + gpointer _tmp17_; + MediaSource* _tmp18_; MediaSource* _tmp19_; - MediaSource* _tmp20_; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = _current_source_index; + _tmp12_ = _current_source_index; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _current_source_index = _tmp13_ + 1; + _current_source_index = _tmp12_ + 1; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = _current_source_index; + _tmp13_ = _current_source_index; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = _current_source_size; + _tmp14_ = _current_source_size; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - if (!(_tmp14_ < _tmp15_)) { + if (!(_tmp13_ < _tmp14_)) { #line 393 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 3312 "Event.c" +#line 3561 "Event.c" } #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = _current_source_list; + _tmp15_ = _current_source_list; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp17_ = _current_source_index; + _tmp16_ = _current_source_index; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp18_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp17_); + _tmp17_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp16_); #line 393 "/home/jens/Source/shotwell/src/Event.vala" - current_source = (MediaSource*) _tmp18_; + current_source = (MediaSource*) _tmp17_; #line 394 "/home/jens/Source/shotwell/src/Event.vala" - _tmp19_ = current_source; + _tmp18_ = current_source; #line 394 "/home/jens/Source/shotwell/src/Event.vala" - _tmp20_ = self->priv->primary_source; + _tmp19_ = self->priv->primary_source; #line 394 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp19_ == _tmp20_) { -#line 3328 "Event.c" - gint _tmp21_; -#line 395 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource)); + if (_tmp18_ == _tmp19_) { #line 395 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp21_ > 0) { -#line 3334 "Event.c" - ViewCollection* _tmp22_; - DataView* _tmp23_; - DataView* _tmp24_; - DataSource* _tmp25_; - MediaSource* _tmp26_; + if (event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource)) > 0) { +#line 3579 "Event.c" + ViewCollection* _tmp20_; + DataView* _tmp21_; + DataView* _tmp22_; + DataSource* _tmp23_; + MediaSource* _tmp24_; #line 396 "/home/jens/Source/shotwell/src/Event.vala" - _tmp22_ = self->priv->view; + _tmp20_ = self->priv->view; #line 396 "/home/jens/Source/shotwell/src/Event.vala" - _tmp23_ = view_collection_get_first_unrejected (_tmp22_); + _tmp21_ = view_collection_get_first_unrejected (_tmp20_); #line 396 "/home/jens/Source/shotwell/src/Event.vala" - _tmp24_ = _tmp23_; + _tmp22_ = _tmp21_; #line 396 "/home/jens/Source/shotwell/src/Event.vala" - _tmp25_ = data_view_get_source (_tmp24_); + _tmp23_ = data_view_get_source (_tmp22_); #line 396 "/home/jens/Source/shotwell/src/Event.vala" - _tmp26_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_MEDIA_SOURCE, MediaSource); #line 396 "/home/jens/Source/shotwell/src/Event.vala" - event_set_primary_source (self, _tmp26_); -#line 396 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp26_); + event_set_primary_source (self, _tmp24_); #line 396 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_tmp24_); -#line 3356 "Event.c" +#line 396 "/home/jens/Source/shotwell/src/Event.vala" + _g_object_unref0 (_tmp22_); +#line 3601 "Event.c" } else { #line 398 "/home/jens/Source/shotwell/src/Event.vala" event_release_primary_source (self); -#line 3360 "Event.c" +#line 3605 "Event.c" } #line 400 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (current_source); #line 400 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 3366 "Event.c" +#line 3611 "Event.c" } #line 393 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (current_source); -#line 3370 "Event.c" +#line 3615 "Event.c" } #line 393 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_current_source_list); -#line 3374 "Event.c" +#line 3619 "Event.c" } #line 405 "/home/jens/Source/shotwell/src/Event.vala" - _tmp27_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource)); -#line 405 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp27_ == 0) { -#line 3380 "Event.c" - EventSourceCollection* _tmp28_; + if (event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource)) == 0) { +#line 3623 "Event.c" + EventSourceCollection* _tmp25_; #line 406 "/home/jens/Source/shotwell/src/Event.vala" - _tmp28_ = event_global; + _tmp25_ = event_global; #line 406 "/home/jens/Source/shotwell/src/Event.vala" - container_source_collection_evaporate (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource)); + container_source_collection_evaporate (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource)); #line 410 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (media); #line 410 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 3390 "Event.c" +#line 3633 "Event.c" } #line 413 "/home/jens/Source/shotwell/src/Event.vala" - _tmp29_ = alteration_new_from_list ("contents:removed, metadata:time"); + _tmp26_ = alteration_new_from_list ("contents:removed, metadata:time"); #line 413 "/home/jens/Source/shotwell/src/Event.vala" - _tmp30_ = _tmp29_; + _tmp27_ = _tmp26_; #line 413 "/home/jens/Source/shotwell/src/Event.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp30_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp27_); #line 413 "/home/jens/Source/shotwell/src/Event.vala" - _alteration_unref0 (_tmp30_); + _alteration_unref0 (_tmp27_); #line 386 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (media); -#line 3402 "Event.c" +#line 3645 "Event.c" } -static void event_on_media_destroyed (Event* self, DataSource* source) { +static void +event_on_media_destroyed (Event* self, + DataSource* source) +{ ThumbnailView* thumbnail_view = NULL; ViewCollection* _tmp0_; - DataSource* _tmp1_; - DataView* _tmp2_; - ThumbnailView* _tmp3_; + DataView* _tmp1_; + ThumbnailView* _tmp2_; #line 416 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); #line 416 "/home/jens/Source/shotwell/src/Event.vala" @@ -3415,89 +3660,84 @@ static void event_on_media_destroyed (Event* self, DataSource* source) { #line 417 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = self->priv->view; #line 417 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = source; + _tmp1_ = view_collection_get_view_for_source (_tmp0_, source); #line 417 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = view_collection_get_view_for_source (_tmp0_, _tmp1_); -#line 417 "/home/jens/Source/shotwell/src/Event.vala" - thumbnail_view = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_THUMBNAIL_VIEW, ThumbnailView); + thumbnail_view = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_VIEW, ThumbnailView); #line 418 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = thumbnail_view; + _tmp2_ = thumbnail_view; #line 418 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp3_ != NULL) { -#line 3428 "Event.c" + if (_tmp2_ != NULL) { +#line 3671 "Event.c" + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; - ThumbnailView* _tmp6_; + ThumbnailView* _tmp5_; + Marker* _tmp6_; Marker* _tmp7_; - Marker* _tmp8_; #line 419 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = self->priv->view; + _tmp3_ = self->priv->view; #line 419 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = self->priv->view; + _tmp4_ = self->priv->view; #line 419 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = thumbnail_view; + _tmp5_ = thumbnail_view; #line 419 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_OBJECT, DataObject)); + _tmp6_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); #line 419 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 419 "/home/jens/Source/shotwell/src/Event.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), _tmp8_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), _tmp7_); #line 419 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp8_); -#line 3448 "Event.c" + _g_object_unref0 (_tmp7_); +#line 3691 "Event.c" } #line 416 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (thumbnail_view); -#line 3452 "Event.c" +#line 3695 "Event.c" } -static void event_real_notify_relinking (DataSource* base, SourceCollection* sources) { +static void +event_real_notify_relinking (DataSource* base, + SourceCollection* sources) +{ Event * self; - gint _tmp0_; - MediaSource* _tmp1_; - SourceCollection* _tmp7_; + MediaSource* _tmp0_; #line 422 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 422 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_SOURCE_COLLECTION (sources)); #line 423 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource)); -#line 423 "/home/jens/Source/shotwell/src/Event.vala" - _vala_assert (_tmp0_ > 0, "get_media_count() > 0"); + _vala_assert (event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource)) > 0, "get_media_count() > 0"); #line 426 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = self->priv->primary_source; + _tmp0_ = self->priv->primary_source; #line 426 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp1_ == NULL) { -#line 3473 "Event.c" - ViewCollection* _tmp2_; + if (_tmp0_ == NULL) { +#line 3715 "Event.c" + ViewCollection* _tmp1_; + DataView* _tmp2_; DataView* _tmp3_; - DataView* _tmp4_; - DataSource* _tmp5_; - MediaSource* _tmp6_; + DataSource* _tmp4_; + MediaSource* _tmp5_; #line 427 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = self->priv->view; + _tmp1_ = self->priv->view; #line 427 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = view_collection_get_first_unrejected (_tmp2_); + _tmp2_ = view_collection_get_first_unrejected (_tmp1_); #line 427 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 427 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = data_view_get_source (_tmp4_); + _tmp4_ = data_view_get_source (_tmp3_); #line 427 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource); #line 427 "/home/jens/Source/shotwell/src/Event.vala" - event_set_primary_source (self, _tmp6_); + event_set_primary_source (self, _tmp5_); #line 427 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp5_); #line 427 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp4_); -#line 3495 "Event.c" + _g_object_unref0 (_tmp3_); +#line 3737 "Event.c" } #line 429 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = sources; -#line 429 "/home/jens/Source/shotwell/src/Event.vala" - DATA_SOURCE_CLASS (event_parent_class)->notify_relinking (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource), TYPE_DATA_SOURCE, DataSource), _tmp7_); -#line 3501 "Event.c" + DATA_SOURCE_CLASS (event_parent_class)->notify_relinking (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource), TYPE_DATA_SOURCE, DataSource), sources); +#line 3741 "Event.c" } @@ -3510,253 +3750,237 @@ static void event_real_notify_relinking (DataSource* base, SourceCollection* sou * the thumbnail of this event may need to change, as the primary * image may have been rejected and should not be the thumbnail anymore. */ -static void event_on_media_altered (Event* self, GeeMap* items) { +static void +event_on_media_altered (Event* self, + GeeMap* items) +{ gboolean should_remake_thumb = FALSE; - gboolean _tmp21_; + gboolean _tmp16_; #line 441 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); #line 441 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (GEE_IS_MAP (items)); #line 442 "/home/jens/Source/shotwell/src/Event.vala" should_remake_thumb = FALSE; -#line 3523 "Event.c" +#line 3766 "Event.c" { GeeIterator* _alteration_it = NULL; - GeeMap* _tmp0_; + GeeCollection* _tmp0_; GeeCollection* _tmp1_; GeeCollection* _tmp2_; - GeeCollection* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 444 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = items; + _tmp0_ = gee_map_get_values (items); #line 444 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = gee_map_get_values (_tmp0_); + _tmp1_ = _tmp0_; #line 444 "/home/jens/Source/shotwell/src/Event.vala" _tmp2_ = _tmp1_; #line 444 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _tmp2_; -#line 444 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 444 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 444 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 444 "/home/jens/Source/shotwell/src/Event.vala" - _alteration_it = _tmp5_; + _alteration_it = _tmp4_; #line 444 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 3550 "Event.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 3790 "Event.c" + GeeIterator* _tmp5_; Alteration* alteration = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - Alteration* _tmp10_; - gboolean _tmp11_; - Alteration* _tmp19_; - gboolean _tmp20_; -#line 444 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = _alteration_it; + GeeIterator* _tmp6_; + gpointer _tmp7_; + Alteration* _tmp8_; + Alteration* _tmp15_; #line 444 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _alteration_it; #line 444 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 444 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 3568 "Event.c" +#line 3803 "Event.c" } #line 444 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = _alteration_it; + _tmp6_ = _alteration_it; #line 444 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 444 "/home/jens/Source/shotwell/src/Event.vala" - alteration = (Alteration*) _tmp9_; -#line 445 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = alteration; + alteration = (Alteration*) _tmp7_; #line 445 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = alteration_has_detail (_tmp10_, "metadata", "exposure-time"); + _tmp8_ = alteration; #line 445 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp11_) { -#line 3582 "Event.c" + if (alteration_has_detail (_tmp8_, "metadata", "exposure-time")) { +#line 3815 "Event.c" gchar* alt_list = NULL; - gchar* _tmp12_; - gboolean _tmp13_; - const gchar* _tmp16_; - Alteration* _tmp17_; - Alteration* _tmp18_; + gchar* _tmp9_; + const gchar* _tmp12_; + Alteration* _tmp13_; + Alteration* _tmp14_; #line 447 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = g_strdup ("metadata:time"); + _tmp9_ = g_strdup ("metadata:time"); #line 447 "/home/jens/Source/shotwell/src/Event.vala" - alt_list = _tmp12_; + alt_list = _tmp9_; #line 449 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = event_has_name (self); -#line 449 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp13_) { -#line 3597 "Event.c" - const gchar* _tmp14_; - gchar* _tmp15_; + if (!event_has_name (self)) { +#line 3827 "Event.c" + const gchar* _tmp10_; + gchar* _tmp11_; #line 450 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = alt_list; + _tmp10_ = alt_list; #line 450 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = g_strconcat (_tmp14_, ", metadata:name", NULL); + _tmp11_ = g_strconcat (_tmp10_, ", metadata:name", NULL); #line 450 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (alt_list); #line 450 "/home/jens/Source/shotwell/src/Event.vala" - alt_list = _tmp15_; -#line 3608 "Event.c" + alt_list = _tmp11_; +#line 3838 "Event.c" } #line 452 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = alt_list; + _tmp12_ = alt_list; #line 452 "/home/jens/Source/shotwell/src/Event.vala" - _tmp17_ = alteration_new_from_list (_tmp16_); + _tmp13_ = alteration_new_from_list (_tmp12_); #line 452 "/home/jens/Source/shotwell/src/Event.vala" - _tmp18_ = _tmp17_; + _tmp14_ = _tmp13_; #line 452 "/home/jens/Source/shotwell/src/Event.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp14_); #line 452 "/home/jens/Source/shotwell/src/Event.vala" - _alteration_unref0 (_tmp18_); + _alteration_unref0 (_tmp14_); #line 454 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (alt_list); #line 454 "/home/jens/Source/shotwell/src/Event.vala" _alteration_unref0 (alteration); #line 454 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 3626 "Event.c" +#line 3856 "Event.c" } #line 457 "/home/jens/Source/shotwell/src/Event.vala" - _tmp19_ = alteration; + _tmp15_ = alteration; #line 457 "/home/jens/Source/shotwell/src/Event.vala" - _tmp20_ = alteration_has_detail (_tmp19_, "metadata", "rating"); -#line 457 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp20_) { + if (alteration_has_detail (_tmp15_, "metadata", "rating")) { #line 458 "/home/jens/Source/shotwell/src/Event.vala" should_remake_thumb = TRUE; -#line 3636 "Event.c" +#line 3864 "Event.c" } #line 444 "/home/jens/Source/shotwell/src/Event.vala" _alteration_unref0 (alteration); -#line 3640 "Event.c" +#line 3868 "Event.c" } #line 444 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_alteration_it); -#line 3644 "Event.c" +#line 3872 "Event.c" } #line 461 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ = should_remake_thumb; + _tmp16_ = should_remake_thumb; #line 461 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp21_) { -#line 3650 "Event.c" - gboolean _tmp22_ = FALSE; - MediaSource* _tmp23_; - MediaSource* _tmp24_; - gboolean _tmp25_; + if (_tmp16_) { +#line 3878 "Event.c" + gboolean _tmp17_ = FALSE; + MediaSource* _tmp18_; + MediaSource* _tmp19_; + gboolean _tmp20_; #line 463 "/home/jens/Source/shotwell/src/Event.vala" - _tmp23_ = event_get_primary_source (self); + _tmp18_ = event_get_primary_source (self); #line 463 "/home/jens/Source/shotwell/src/Event.vala" - _tmp24_ = _tmp23_; + _tmp19_ = _tmp18_; #line 463 "/home/jens/Source/shotwell/src/Event.vala" - _tmp25_ = _tmp24_ == NULL; + _tmp20_ = _tmp19_ == NULL; #line 463 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp19_); #line 463 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp25_) { + if (_tmp20_) { #line 463 "/home/jens/Source/shotwell/src/Event.vala" - _tmp22_ = TRUE; -#line 3667 "Event.c" + _tmp17_ = TRUE; +#line 3895 "Event.c" } else { - MediaSource* _tmp26_; - MediaSource* _tmp27_; - Rating _tmp28_; + MediaSource* _tmp21_; + MediaSource* _tmp22_; #line 463 "/home/jens/Source/shotwell/src/Event.vala" - _tmp26_ = event_get_primary_source (self); + _tmp21_ = event_get_primary_source (self); #line 463 "/home/jens/Source/shotwell/src/Event.vala" - _tmp27_ = _tmp26_; + _tmp22_ = _tmp21_; #line 463 "/home/jens/Source/shotwell/src/Event.vala" - _tmp28_ = media_source_get_rating (_tmp27_); + _tmp17_ = media_source_get_rating (_tmp22_) == RATING_REJECTED; #line 463 "/home/jens/Source/shotwell/src/Event.vala" - _tmp22_ = _tmp28_ == RATING_REJECTED; -#line 463 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp27_); -#line 3682 "Event.c" + _g_object_unref0 (_tmp22_); +#line 3907 "Event.c" } #line 463 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp22_) { -#line 3686 "Event.c" - ViewCollection* _tmp29_; - DataView* _tmp30_; - DataView* _tmp31_; - DataSource* _tmp32_; - MediaSource* _tmp33_; + if (_tmp17_) { +#line 3911 "Event.c" + ViewCollection* _tmp23_; + DataView* _tmp24_; + DataView* _tmp25_; + DataSource* _tmp26_; + MediaSource* _tmp27_; #line 465 "/home/jens/Source/shotwell/src/Event.vala" - _tmp29_ = self->priv->view; + _tmp23_ = self->priv->view; #line 465 "/home/jens/Source/shotwell/src/Event.vala" - _tmp30_ = view_collection_get_first_unrejected (_tmp29_); + _tmp24_ = view_collection_get_first_unrejected (_tmp23_); #line 465 "/home/jens/Source/shotwell/src/Event.vala" - _tmp31_ = _tmp30_; + _tmp25_ = _tmp24_; #line 465 "/home/jens/Source/shotwell/src/Event.vala" - _tmp32_ = data_view_get_source (_tmp31_); + _tmp26_ = data_view_get_source (_tmp25_); #line 465 "/home/jens/Source/shotwell/src/Event.vala" - _tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_MEDIA_SOURCE, MediaSource); #line 465 "/home/jens/Source/shotwell/src/Event.vala" - event_set_primary_source (self, _tmp33_); + event_set_primary_source (self, _tmp27_); #line 465 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp33_); + _g_object_unref0 (_tmp27_); #line 465 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp31_); -#line 3708 "Event.c" + _g_object_unref0 (_tmp25_); +#line 3933 "Event.c" } } } -Event* event_create_empty_event (MediaSource* source) { +Event* +event_create_empty_event (MediaSource* source) +{ Event* result = NULL; GError * _inner_error_ = NULL; #line 474 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL); -#line 3719 "Event.c" +#line 3946 "Event.c" { EventRow* _tmp0_ = NULL; EventTable* _tmp1_; EventTable* _tmp2_; - MediaSource* _tmp3_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; + EventRow* _tmp5_; EventRow* _tmp6_; - EventRow* _tmp7_; Event* event = NULL; - Event* _tmp8_; - EventSourceCollection* _tmp9_; + Event* _tmp7_; + EventSourceCollection* _tmp8_; + Event* _tmp9_; Event* _tmp10_; - Event* _tmp11_; + gchar* _tmp11_; gchar* _tmp12_; - gchar* _tmp13_; #line 476 "/home/jens/Source/shotwell/src/Event.vala" _tmp1_ = event_table_get_instance (); #line 476 "/home/jens/Source/shotwell/src/Event.vala" _tmp2_ = _tmp1_; #line 476 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = source; + _tmp3_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #line 476 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource)); + _tmp4_ = _tmp3_; #line 476 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _tmp4_; + _tmp5_ = event_table_create (_tmp2_, _tmp4_, NULL, &_inner_error_); #line 476 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = event_table_create (_tmp2_, _tmp5_, NULL, &_inner_error_); + _tmp6_ = _tmp5_; #line 476 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = _tmp6_; -#line 476 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp4_); #line 476 "/home/jens/Source/shotwell/src/Event.vala" _database_table_unref0 (_tmp2_); #line 476 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = _tmp7_; + _tmp0_ = _tmp6_; #line 476 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 476 "/home/jens/Source/shotwell/src/Event.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 3760 "Event.c" +#line 3984 "Event.c" goto __catch444_database_error; } #line 476 "/home/jens/Source/shotwell/src/Event.vala" @@ -3765,56 +3989,56 @@ Event* event_create_empty_event (MediaSource* source) { g_clear_error (&_inner_error_); #line 476 "/home/jens/Source/shotwell/src/Event.vala" return NULL; -#line 3769 "Event.c" +#line 3993 "Event.c" } #line 476 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = event_new (_tmp0_, DATA_OBJECT_INVALID_OBJECT_ID); + _tmp7_ = event_new (_tmp0_, DATA_OBJECT_INVALID_OBJECT_ID); #line 476 "/home/jens/Source/shotwell/src/Event.vala" - event = _tmp8_; + event = _tmp7_; #line 477 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = event_global; + _tmp8_ = event_global; #line 477 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = event; + _tmp9_ = event; #line 477 "/home/jens/Source/shotwell/src/Event.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); #line 479 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = event; + _tmp10_ = event; #line 479 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject)); + _tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); #line 479 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 479 "/home/jens/Source/shotwell/src/Event.vala" - g_debug ("Event.vala:479: Created empty event %s", _tmp13_); + g_debug ("Event.vala:479: Created empty event %s", _tmp12_); #line 479 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp12_); #line 481 "/home/jens/Source/shotwell/src/Event.vala" result = event; #line 481 "/home/jens/Source/shotwell/src/Event.vala" _event_row_unref0 (_tmp0_); #line 481 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 3797 "Event.c" +#line 4021 "Event.c" } goto __finally444; __catch444_database_error: { GError* err = NULL; - GError* _tmp14_; + GError* _tmp13_; #line 475 "/home/jens/Source/shotwell/src/Event.vala" err = _inner_error_; #line 475 "/home/jens/Source/shotwell/src/Event.vala" _inner_error_ = NULL; #line 483 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = err; + _tmp13_ = err; #line 483 "/home/jens/Source/shotwell/src/Event.vala" - app_window_database_error (_tmp14_); + app_window_database_error (_tmp13_); #line 485 "/home/jens/Source/shotwell/src/Event.vala" result = NULL; #line 485 "/home/jens/Source/shotwell/src/Event.vala" _g_error_free0 (err); #line 485 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 3818 "Event.c" +#line 4042 "Event.c" } __finally444: #line 475 "/home/jens/Source/shotwell/src/Event.vala" @@ -3823,77 +4047,67 @@ Event* event_create_empty_event (MediaSource* source) { g_clear_error (&_inner_error_); #line 475 "/home/jens/Source/shotwell/src/Event.vala" return NULL; -#line 3827 "Event.c" +#line 4051 "Event.c" } -static Event* event_reconstitute (gint64 object_id, EventRow* row) { +static Event* +event_reconstitute (gint64 object_id, + EventRow* row) +{ Event* result = NULL; - EventRow* _tmp0_; + EventTable* _tmp0_; EventTable* _tmp1_; - EventTable* _tmp2_; - EventRow* _tmp3_; - EventID _tmp4_ = {0}; + EventID _tmp2_ = {0}; Event* event = NULL; - EventRow* _tmp5_; - gint64 _tmp6_; - Event* _tmp7_; - EventSourceCollection* _tmp8_; - EventSourceCollection* _tmp9_; - gboolean _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; + Event* _tmp3_; + EventSourceCollection* _tmp4_; + EventSourceCollection* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; #line 490 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT_ROW (row), NULL); #line 491 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = row; -#line 491 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = event_table_get_instance (); -#line 491 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = _tmp1_; + _tmp0_ = event_table_get_instance (); #line 491 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = row; + _tmp1_ = _tmp0_; #line 491 "/home/jens/Source/shotwell/src/Event.vala" - event_table_create_from_row (_tmp2_, _tmp3_, &_tmp4_); + event_table_create_from_row (_tmp1_, row, &_tmp2_); #line 491 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_->event_id = _tmp4_; + row->event_id = _tmp2_; #line 491 "/home/jens/Source/shotwell/src/Event.vala" - _database_table_unref0 (_tmp2_); -#line 492 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = row; -#line 492 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = object_id; + _database_table_unref0 (_tmp1_); #line 492 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = event_new (_tmp5_, _tmp6_); + _tmp3_ = event_new (row, object_id); #line 492 "/home/jens/Source/shotwell/src/Event.vala" - event = _tmp7_; + event = _tmp3_; #line 493 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = event_global; + _tmp4_ = event_global; #line 493 "/home/jens/Source/shotwell/src/Event.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_DATA_OBJECT, DataObject)); #line 494 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = event_global; -#line 494 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_DATA_OBJECT, DataObject)); + _tmp5_ = event_global; #line 494 "/home/jens/Source/shotwell/src/Event.vala" - _vala_assert (_tmp10_, "global.contains(event)"); + _vala_assert (data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_DATA_OBJECT, DataObject)), "global.contains(event)"); #line 496 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_DATA_OBJECT, DataObject)); + _tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_DATA_OBJECT, DataObject)); #line 496 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = _tmp11_; + _tmp7_ = _tmp6_; #line 496 "/home/jens/Source/shotwell/src/Event.vala" - g_debug ("Event.vala:496: Reconstituted event %s", _tmp12_); + g_debug ("Event.vala:496: Reconstituted event %s", _tmp7_); #line 496 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp7_); #line 498 "/home/jens/Source/shotwell/src/Event.vala" result = event; #line 498 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 3893 "Event.c" +#line 4105 "Event.c" } -static gboolean event_real_has_links (ContainerSource* base) { +static gboolean +event_real_has_links (ContainerSource* base) +{ Event * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; @@ -3901,7 +4115,6 @@ static gboolean event_real_has_links (ContainerSource* base) { SourceBacklink* _tmp2_; SourceBacklink* _tmp3_; gboolean _tmp4_; - gboolean _tmp5_; #line 501 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 502 "/home/jens/Source/shotwell/src/Event.vala" @@ -3912,43 +4125,40 @@ static gboolean event_real_has_links (ContainerSource* base) { _tmp3_ = _tmp2_; #line 502 "/home/jens/Source/shotwell/src/Event.vala" _tmp4_ = source_collection_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp3_); -#line 502 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _tmp4_; #line 502 "/home/jens/Source/shotwell/src/Event.vala" _source_backlink_unref0 (_tmp3_); #line 502 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp5_) { + if (_tmp4_) { #line 502 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = TRUE; -#line 3924 "Event.c" +#line 4135 "Event.c" } else { - VideoSourceCollection* _tmp6_; + VideoSourceCollection* _tmp5_; + SourceBacklink* _tmp6_; SourceBacklink* _tmp7_; - SourceBacklink* _tmp8_; - gboolean _tmp9_; -#line 503 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = video_global; #line 503 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = container_source_get_backlink (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource)); + _tmp5_ = video_global; #line 503 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = _tmp7_; + _tmp6_ = container_source_get_backlink (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource)); #line 503 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = source_collection_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp8_); + _tmp7_ = _tmp6_; #line 503 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = _tmp9_; + _tmp0_ = source_collection_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp7_); #line 503 "/home/jens/Source/shotwell/src/Event.vala" - _source_backlink_unref0 (_tmp8_); -#line 3942 "Event.c" + _source_backlink_unref0 (_tmp7_); +#line 4150 "Event.c" } #line 502 "/home/jens/Source/shotwell/src/Event.vala" result = _tmp0_; #line 502 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 3948 "Event.c" +#line 4156 "Event.c" } -static SourceBacklink* event_real_get_backlink (ContainerSource* base) { +static SourceBacklink* +event_real_get_backlink (ContainerSource* base) +{ Event * self; SourceBacklink* result = NULL; SourceBacklink* _tmp0_; @@ -3960,13 +4170,15 @@ static SourceBacklink* event_real_get_backlink (ContainerSource* base) { result = _tmp0_; #line 507 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 3964 "Event.c" +#line 4174 "Event.c" } -static void event_real_break_link (ContainerSource* base, DataSource* source) { +static void +event_real_break_link (ContainerSource* base, + DataSource* source) +{ Event * self; - DataSource* _tmp0_; #line 510 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 510 "/home/jens/Source/shotwell/src/Event.vala" @@ -3974,22 +4186,22 @@ static void event_real_break_link (ContainerSource* base, DataSource* source) { #line 511 "/home/jens/Source/shotwell/src/Event.vala" self->priv->unlinking = TRUE; #line 513 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = source; -#line 513 "/home/jens/Source/shotwell/src/Event.vala" - media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), NULL); + media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource), NULL); #line 515 "/home/jens/Source/shotwell/src/Event.vala" self->priv->unlinking = FALSE; -#line 3983 "Event.c" +#line 4193 "Event.c" } -static void event_real_break_link_many (ContainerSource* base, GeeCollection* sources) { +static void +event_real_break_link_many (ContainerSource* base, + GeeCollection* sources) +{ Event * self; GeeArrayList* photos = NULL; GeeArrayList* _tmp0_; GeeArrayList* videos = NULL; GeeArrayList* _tmp1_; - GeeCollection* _tmp2_; GError * _inner_error_ = NULL; #line 518 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); @@ -4006,25 +4218,23 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so #line 522 "/home/jens/Source/shotwell/src/Event.vala" videos = _tmp1_; #line 523 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = sources; -#line 523 "/home/jens/Source/shotwell/src/Event.vala" - media_source_collection_filter_media (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection)); -#line 4013 "Event.c" + media_source_collection_filter_media (G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection)); +#line 4223 "Event.c" { - LibraryPhotoSourceCollection* _tmp3_; + LibraryPhotoSourceCollection* _tmp2_; + TransactionController* _tmp3_; TransactionController* _tmp4_; - TransactionController* _tmp5_; #line 526 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = library_photo_global; + _tmp2_ = library_photo_global; #line 526 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _tmp3_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 526 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 526 "/home/jens/Source/shotwell/src/Event.vala" - media_source_set_many_to_event (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), NULL, _tmp5_, &_inner_error_); + media_source_set_many_to_event (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), NULL, _tmp4_, &_inner_error_); #line 526 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4028 "Event.c" +#line 4238 "Event.c" goto __catch445_g_error; } } @@ -4032,29 +4242,29 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so __catch445_g_error: { GError* err = NULL; - GError* _tmp6_; - const gchar* _tmp7_; + GError* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; #line 525 "/home/jens/Source/shotwell/src/Event.vala" err = _inner_error_; #line 525 "/home/jens/Source/shotwell/src/Event.vala" _inner_error_ = NULL; #line 528 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = err; + _tmp5_ = err; #line 528 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = _tmp6_->message; + _tmp6_ = _tmp5_->message; #line 528 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = g_strdup_printf ("%s", _tmp7_); + _tmp7_ = g_strdup_printf ("%s", _tmp6_); #line 528 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 528 "/home/jens/Source/shotwell/src/Event.vala" - app_window_error_message (_tmp9_, NULL); + app_window_error_message (_tmp8_, NULL); #line 528 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp8_); #line 525 "/home/jens/Source/shotwell/src/Event.vala" _g_error_free0 (err); -#line 4058 "Event.c" +#line 4268 "Event.c" } __finally445: #line 525 "/home/jens/Source/shotwell/src/Event.vala" @@ -4069,23 +4279,23 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so g_clear_error (&_inner_error_); #line 525 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 4073 "Event.c" +#line 4283 "Event.c" } { - VideoSourceCollection* _tmp10_; + VideoSourceCollection* _tmp9_; + TransactionController* _tmp10_; TransactionController* _tmp11_; - TransactionController* _tmp12_; #line 532 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = video_global; + _tmp9_ = video_global; #line 532 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _tmp10_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 532 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 532 "/home/jens/Source/shotwell/src/Event.vala" - media_source_set_many_to_event (G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection), NULL, _tmp12_, &_inner_error_); + media_source_set_many_to_event (G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection), NULL, _tmp11_, &_inner_error_); #line 532 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4089 "Event.c" +#line 4299 "Event.c" goto __catch446_g_error; } } @@ -4093,29 +4303,29 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so __catch446_g_error: { GError* err = NULL; - GError* _tmp13_; - const gchar* _tmp14_; + GError* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; gchar* _tmp15_; - gchar* _tmp16_; #line 531 "/home/jens/Source/shotwell/src/Event.vala" err = _inner_error_; #line 531 "/home/jens/Source/shotwell/src/Event.vala" _inner_error_ = NULL; #line 534 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = err; + _tmp12_ = err; #line 534 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = _tmp13_->message; + _tmp13_ = _tmp12_->message; #line 534 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = g_strdup_printf ("%s", _tmp14_); + _tmp14_ = g_strdup_printf ("%s", _tmp13_); #line 534 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 534 "/home/jens/Source/shotwell/src/Event.vala" - app_window_error_message (_tmp16_, NULL); + app_window_error_message (_tmp15_, NULL); #line 534 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp15_); #line 531 "/home/jens/Source/shotwell/src/Event.vala" _g_error_free0 (err); -#line 4119 "Event.c" +#line 4329 "Event.c" } __finally446: #line 531 "/home/jens/Source/shotwell/src/Event.vala" @@ -4130,7 +4340,7 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so g_clear_error (&_inner_error_); #line 531 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 4134 "Event.c" +#line 4344 "Event.c" } #line 537 "/home/jens/Source/shotwell/src/Event.vala" self->priv->unlinking = FALSE; @@ -4138,13 +4348,15 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so _g_object_unref0 (videos); #line 518 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (photos); -#line 4142 "Event.c" +#line 4352 "Event.c" } -static void event_real_establish_link (ContainerSource* base, DataSource* source) { +static void +event_real_establish_link (ContainerSource* base, + DataSource* source) +{ Event * self; - DataSource* _tmp0_; #line 540 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 540 "/home/jens/Source/shotwell/src/Event.vala" @@ -4152,22 +4364,22 @@ static void event_real_establish_link (ContainerSource* base, DataSource* source #line 541 "/home/jens/Source/shotwell/src/Event.vala" self->priv->relinking = TRUE; #line 543 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = source; -#line 543 "/home/jens/Source/shotwell/src/Event.vala" - media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), self); + media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource), self); #line 545 "/home/jens/Source/shotwell/src/Event.vala" self->priv->relinking = FALSE; -#line 4161 "Event.c" +#line 4371 "Event.c" } -static void event_real_establish_link_many (ContainerSource* base, GeeCollection* sources) { +static void +event_real_establish_link_many (ContainerSource* base, + GeeCollection* sources) +{ Event * self; GeeArrayList* photos = NULL; GeeArrayList* _tmp0_; GeeArrayList* videos = NULL; GeeArrayList* _tmp1_; - GeeCollection* _tmp2_; GError * _inner_error_ = NULL; #line 548 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); @@ -4184,25 +4396,23 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection #line 552 "/home/jens/Source/shotwell/src/Event.vala" videos = _tmp1_; #line 553 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = sources; -#line 553 "/home/jens/Source/shotwell/src/Event.vala" - media_source_collection_filter_media (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection)); -#line 4191 "Event.c" + media_source_collection_filter_media (G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection)); +#line 4401 "Event.c" { - LibraryPhotoSourceCollection* _tmp3_; + LibraryPhotoSourceCollection* _tmp2_; + TransactionController* _tmp3_; TransactionController* _tmp4_; - TransactionController* _tmp5_; #line 556 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = library_photo_global; + _tmp2_ = library_photo_global; #line 556 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _tmp3_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 556 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 556 "/home/jens/Source/shotwell/src/Event.vala" - media_source_set_many_to_event (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), self, _tmp5_, &_inner_error_); + media_source_set_many_to_event (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), self, _tmp4_, &_inner_error_); #line 556 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4206 "Event.c" +#line 4416 "Event.c" goto __catch447_g_error; } } @@ -4210,29 +4420,29 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection __catch447_g_error: { GError* err = NULL; - GError* _tmp6_; - const gchar* _tmp7_; + GError* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; #line 555 "/home/jens/Source/shotwell/src/Event.vala" err = _inner_error_; #line 555 "/home/jens/Source/shotwell/src/Event.vala" _inner_error_ = NULL; #line 558 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = err; + _tmp5_ = err; #line 558 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = _tmp6_->message; + _tmp6_ = _tmp5_->message; #line 558 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = g_strdup_printf ("%s", _tmp7_); + _tmp7_ = g_strdup_printf ("%s", _tmp6_); #line 558 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 558 "/home/jens/Source/shotwell/src/Event.vala" - app_window_error_message (_tmp9_, NULL); + app_window_error_message (_tmp8_, NULL); #line 558 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp8_); #line 555 "/home/jens/Source/shotwell/src/Event.vala" _g_error_free0 (err); -#line 4236 "Event.c" +#line 4446 "Event.c" } __finally447: #line 555 "/home/jens/Source/shotwell/src/Event.vala" @@ -4247,23 +4457,23 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection g_clear_error (&_inner_error_); #line 555 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 4251 "Event.c" +#line 4461 "Event.c" } { - VideoSourceCollection* _tmp10_; + VideoSourceCollection* _tmp9_; + TransactionController* _tmp10_; TransactionController* _tmp11_; - TransactionController* _tmp12_; #line 562 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = video_global; + _tmp9_ = video_global; #line 562 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _tmp10_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 562 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 562 "/home/jens/Source/shotwell/src/Event.vala" - media_source_set_many_to_event (G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection), self, _tmp12_, &_inner_error_); + media_source_set_many_to_event (G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection), self, _tmp11_, &_inner_error_); #line 562 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4267 "Event.c" +#line 4477 "Event.c" goto __catch448_g_error; } } @@ -4271,29 +4481,29 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection __catch448_g_error: { GError* err = NULL; - GError* _tmp13_; - const gchar* _tmp14_; + GError* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; gchar* _tmp15_; - gchar* _tmp16_; #line 561 "/home/jens/Source/shotwell/src/Event.vala" err = _inner_error_; #line 561 "/home/jens/Source/shotwell/src/Event.vala" _inner_error_ = NULL; #line 564 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = err; + _tmp12_ = err; #line 564 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = _tmp13_->message; + _tmp13_ = _tmp12_->message; #line 564 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = g_strdup_printf ("%s", _tmp14_); + _tmp14_ = g_strdup_printf ("%s", _tmp13_); #line 564 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 564 "/home/jens/Source/shotwell/src/Event.vala" - app_window_error_message (_tmp16_, NULL); + app_window_error_message (_tmp15_, NULL); #line 564 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp15_); #line 561 "/home/jens/Source/shotwell/src/Event.vala" _g_error_free0 (err); -#line 4297 "Event.c" +#line 4507 "Event.c" } __finally448: #line 561 "/home/jens/Source/shotwell/src/Event.vala" @@ -4308,7 +4518,7 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection g_clear_error (&_inner_error_); #line 561 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 4312 "Event.c" +#line 4522 "Event.c" } #line 567 "/home/jens/Source/shotwell/src/Event.vala" self->priv->relinking = FALSE; @@ -4316,421 +4526,335 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection _g_object_unref0 (videos); #line 548 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (photos); -#line 4320 "Event.c" +#line 4530 "Event.c" } -static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) { +static gchar* +_vala_g_strjoinv (const gchar* separator, + gchar** str_array, + int str_array_length1) +{ gchar* result = NULL; - const gchar* _tmp0_; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - gchar** _tmp3_; - gint _tmp3__length1; -#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = separator; -#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp0_ == NULL) { -#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gboolean _tmp0_ = FALSE; +#line 1092 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (separator == NULL) { +#line 1093 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" separator = ""; -#line 4337 "Event.c" - } -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = str_array; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3__length1 = str_array_length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ != NULL) { -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = TRUE; -#line 4347 "Event.c" - } else { - gchar** _tmp4_; - gint _tmp4__length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = str_array; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4__length1 = str_array_length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = _tmp4__length1 > 0; -#line 4357 "Event.c" +#line 4545 "Event.c" } -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp2_) { -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = TRUE; -#line 4363 "Event.c" - } else { - gboolean _tmp5_ = FALSE; - gchar** _tmp6_; - gint _tmp6__length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str_array; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6__length1 = str_array_length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp6__length1 == -1) { -#line 4374 "Event.c" - gchar** _tmp7_; - gint _tmp7__length1; - const gchar* _tmp8_; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = str_array; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7__length1 = str_array_length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_[0]; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = _tmp8_ != NULL; -#line 4386 "Event.c" +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array != NULL) { +#line 4549 "Event.c" + gboolean _tmp1_ = FALSE; +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array_length1 > 0) { +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = TRUE; +#line 4555 "Event.c" } else { -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = FALSE; -#line 4390 "Event.c" + gboolean _tmp2_ = FALSE; +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array_length1 == -1) { +#line 4560 "Event.c" + const gchar* _tmp3_; +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = str_array[0]; +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp3_ != NULL; +#line 4566 "Event.c" + } else { +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = FALSE; +#line 4570 "Event.c" + } +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = _tmp2_; +#line 4574 "Event.c" } -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = _tmp5_; -#line 4394 "Event.c" +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = _tmp1_; +#line 4578 "Event.c" + } else { +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = FALSE; +#line 4582 "Event.c" } -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_) { -#line 4398 "Event.c" +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp0_) { +#line 4586 "Event.c" gint i = 0; gsize len = 0UL; - gint _tmp31_; - gint _tmp33_; - gint _tmp34_; - gsize _tmp35_; - const gchar* _tmp36_; - gint _tmp37_; - gint _tmp38_; - gint _tmp39_; + gint _tmp20_; + gint _tmp22_; + gint _tmp23_; + gsize _tmp24_; + gint _tmp25_; + gint _tmp26_; + gint _tmp27_; const gchar* res = NULL; - gsize _tmp40_; - void* _tmp41_; + gsize _tmp28_; + void* _tmp29_; void* ptr = NULL; - const gchar* _tmp42_; - gchar** _tmp43_; - gint _tmp43__length1; - const gchar* _tmp44_; - void* _tmp45_; - const gchar* _tmp62_; -#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + const gchar* _tmp30_; + const gchar* _tmp31_; + void* _tmp32_; + const gchar* _tmp45_; +#line 1097 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" len = (gsize) 1; -#line 4421 "Event.c" +#line 4606 "Event.c" { - gboolean _tmp9_ = FALSE; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gboolean _tmp4_ = FALSE; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" i = 0; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = TRUE; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = TRUE; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" while (TRUE) { -#line 4430 "Event.c" - gboolean _tmp11_ = FALSE; - gboolean _tmp12_ = FALSE; - gchar** _tmp13_; - gint _tmp13__length1; - gint _tmp21_ = 0; - gchar** _tmp22_; - gint _tmp22__length1; - gint _tmp23_; - const gchar* _tmp24_; - gsize _tmp30_; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (!_tmp9_) { -#line 4443 "Event.c" - gint _tmp10_; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = i; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - i = _tmp10_ + 1; -#line 4449 "Event.c" +#line 4615 "Event.c" + gboolean _tmp6_ = FALSE; + gboolean _tmp7_ = FALSE; + gint _tmp12_ = 0; + gint _tmp13_; + const gchar* _tmp14_; + gsize _tmp19_; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (!_tmp4_) { +#line 4624 "Event.c" + gint _tmp5_; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = i; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + i = _tmp5_ + 1; +#line 4630 "Event.c" } -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = FALSE; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = str_array; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13__length1 = str_array_length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp13__length1 != -1) { -#line 4459 "Event.c" - gint _tmp14_; - gchar** _tmp15_; - gint _tmp15__length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = i; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = str_array; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15__length1 = str_array_length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = _tmp14_ < _tmp15__length1; -#line 4471 "Event.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = FALSE; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array_length1 != -1) { +#line 4636 "Event.c" + gint _tmp8_; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = i; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp8_ < str_array_length1; +#line 4642 "Event.c" } else { -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = FALSE; -#line 4475 "Event.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = FALSE; +#line 4646 "Event.c" } -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp12_) { -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = TRUE; -#line 4481 "Event.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp7_) { +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = TRUE; +#line 4652 "Event.c" } else { - gboolean _tmp16_ = FALSE; - gchar** _tmp17_; - gint _tmp17__length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = str_array; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17__length1 = str_array_length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp17__length1 == -1) { -#line 4492 "Event.c" - gchar** _tmp18_; - gint _tmp18__length1; - gint _tmp19_; - const gchar* _tmp20_; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = str_array; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18__length1 = str_array_length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = i; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = _tmp18_[_tmp19_]; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = _tmp20_ != NULL; -#line 4507 "Event.c" + gboolean _tmp9_ = FALSE; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array_length1 == -1) { +#line 4657 "Event.c" + gint _tmp10_; + const gchar* _tmp11_; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = i; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp11_ = str_array[_tmp10_]; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = _tmp11_ != NULL; +#line 4666 "Event.c" } else { -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = FALSE; -#line 4511 "Event.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = FALSE; +#line 4670 "Event.c" } -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp16_; -#line 4515 "Event.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp9_; +#line 4674 "Event.c" } -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (!_tmp11_) { -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (!_tmp6_) { +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" break; -#line 4521 "Event.c" +#line 4680 "Event.c" } -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = str_array; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22__length1 = str_array_length1; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp23_ = i; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp24_ = _tmp22_[_tmp23_]; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp24_ != NULL) { -#line 4533 "Event.c" - gchar** _tmp25_; - gint _tmp25__length1; - gint _tmp26_; - const gchar* _tmp27_; - gint _tmp28_; - gint _tmp29_; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp25_ = str_array; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp25__length1 = str_array_length1; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp26_ = i; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp27_ = _tmp25_[_tmp26_]; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp29_ = _tmp28_; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = _tmp29_; -#line 4554 "Event.c" +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp13_ = i; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp14_ = str_array[_tmp13_]; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp14_ != NULL) { +#line 4688 "Event.c" + gint _tmp15_; + const gchar* _tmp16_; + gint _tmp17_; + gint _tmp18_; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp15_ = i; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp16_ = str_array[_tmp15_]; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp17_ = strlen ((const gchar*) _tmp16_); +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp18_ = _tmp17_; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp12_ = _tmp18_; +#line 4703 "Event.c" } else { -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = 0; -#line 4558 "Event.c" +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp12_ = 0; +#line 4707 "Event.c" } -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp30_ = len; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp30_ + _tmp21_; -#line 4564 "Event.c" +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp19_ = len; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp19_ + _tmp12_; +#line 4713 "Event.c" } } -#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp31_ = i; -#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp31_ == 0) { -#line 4571 "Event.c" - gchar* _tmp32_; -#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp32_ = g_strdup (""); -#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp32_; -#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp20_ = i; +#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp20_ == 0) { +#line 4720 "Event.c" + gchar* _tmp21_; +#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp21_ = g_strdup (""); +#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp21_; +#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 4579 "Event.c" +#line 4728 "Event.c" } -#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp33_ = i; -#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - str_array_length1 = _tmp33_; -#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp34_ = str_array_length1; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp35_ = len; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp36_ = separator; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp38_ = _tmp37_; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp39_ = i; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp40_ = len; -#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp41_ = g_malloc (_tmp40_); -#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - res = _tmp41_; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp42_ = res; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp43_ = str_array; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp43__length1 = str_array_length1; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp44_ = _tmp43_[0]; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - ptr = _tmp45_; -#line 4617 "Event.c" +#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp22_ = i; +#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + str_array_length1 = _tmp22_; +#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp23_ = str_array_length1; +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp24_ = len; +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp25_ = strlen ((const gchar*) separator); +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp26_ = _tmp25_; +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp27_ = i; +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp24_ + (_tmp26_ * (_tmp27_ - 1)); +#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp28_ = len; +#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp29_ = g_malloc (_tmp28_); +#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + res = _tmp29_; +#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp30_ = res; +#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp31_ = str_array[0]; +#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp32_ = g_stpcpy ((void*) _tmp30_, (const gchar*) _tmp31_); +#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + ptr = _tmp32_; +#line 4760 "Event.c" { - gboolean _tmp46_ = FALSE; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gboolean _tmp33_ = FALSE; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" i = 1; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp46_ = TRUE; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp33_ = TRUE; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" while (TRUE) { -#line 4626 "Event.c" - gint _tmp48_; - gchar** _tmp49_; - gint _tmp49__length1; - void* _tmp50_; - const gchar* _tmp51_; - void* _tmp52_; - const gchar* _tmp53_ = NULL; - gchar** _tmp54_; - gint _tmp54__length1; - gint _tmp55_; - const gchar* _tmp56_; - void* _tmp60_; - void* _tmp61_; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (!_tmp46_) { -#line 4642 "Event.c" - gint _tmp47_; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp47_ = i; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - i = _tmp47_ + 1; -#line 4648 "Event.c" +#line 4769 "Event.c" + gint _tmp35_; + void* _tmp36_; + void* _tmp37_; + const gchar* _tmp38_ = NULL; + gint _tmp39_; + const gchar* _tmp40_; + void* _tmp43_; + void* _tmp44_; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (!_tmp33_) { +#line 4780 "Event.c" + gint _tmp34_; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp34_ = i; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + i = _tmp34_ + 1; +#line 4786 "Event.c" } -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp46_ = FALSE; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp48_ = i; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp49_ = str_array; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp49__length1 = str_array_length1; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (!(_tmp48_ < _tmp49__length1)) { -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp33_ = FALSE; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp35_ = i; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (!(_tmp35_ < str_array_length1)) { +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" break; -#line 4662 "Event.c" +#line 4796 "Event.c" } -#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp50_ = ptr; -#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp51_ = separator; -#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - ptr = _tmp52_; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp54_ = str_array; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp54__length1 = str_array_length1; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp55_ = i; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp56_ = _tmp54_[_tmp55_]; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp56_ != NULL) { -#line 4682 "Event.c" - gchar** _tmp57_; - gint _tmp57__length1; - gint _tmp58_; - const gchar* _tmp59_; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp57_ = str_array; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp57__length1 = str_array_length1; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp58_ = i; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp59_ = _tmp57_[_tmp58_]; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp53_ = (const gchar*) _tmp59_; -#line 4697 "Event.c" +#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp36_ = ptr; +#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp37_ = g_stpcpy (_tmp36_, (const gchar*) separator); +#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + ptr = _tmp37_; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp39_ = i; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp40_ = str_array[_tmp39_]; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp40_ != NULL) { +#line 4810 "Event.c" + gint _tmp41_; + const gchar* _tmp42_; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp41_ = i; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp42_ = str_array[_tmp41_]; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp38_ = (const gchar*) _tmp42_; +#line 4819 "Event.c" } else { -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp53_ = ""; -#line 4701 "Event.c" +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp38_ = ""; +#line 4823 "Event.c" } -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp60_ = ptr; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - ptr = _tmp61_; -#line 4709 "Event.c" +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp43_ = ptr; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp44_ = g_stpcpy (_tmp43_, _tmp38_); +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + ptr = _tmp44_; +#line 4831 "Event.c" } } -#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp62_ = res; -#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp45_ = res; +#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" res = NULL; -#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (gchar*) _tmp62_; -#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (gchar*) _tmp45_; +#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 4720 "Event.c" +#line 4842 "Event.c" } else { - gchar* _tmp63_; -#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp63_ = g_strdup (""); -#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp63_; -#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp46_; +#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp46_ = g_strdup (""); +#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp46_; +#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 4729 "Event.c" +#line 4851 "Event.c" } } -static void event_update_indexable_keywords (Event* self) { +static void +event_update_indexable_keywords (Event* self) +{ gchar** components = NULL; gchar** _tmp0_; gint components_length1; @@ -4763,7 +4887,7 @@ static void event_update_indexable_keywords (Event* self) { _tmp2_ = rawname; #line 575 "/home/jens/Source/shotwell/src/Event.vala" if (_tmp2_ != NULL) { -#line 4767 "Event.c" +#line 4891 "Event.c" gchar** _tmp3_; gint _tmp3__length1; gint _tmp4_; @@ -4788,7 +4912,7 @@ static void event_update_indexable_keywords (Event* self) { _tmp3_[_tmp4_] = _tmp6_; #line 576 "/home/jens/Source/shotwell/src/Event.vala" _tmp7_ = _tmp3_[_tmp4_]; -#line 4792 "Event.c" +#line 4916 "Event.c" } #line 578 "/home/jens/Source/shotwell/src/Event.vala" _tmp8_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource)); @@ -4798,7 +4922,7 @@ static void event_update_indexable_keywords (Event* self) { _tmp9_ = comment; #line 579 "/home/jens/Source/shotwell/src/Event.vala" if (_tmp9_ != NULL) { -#line 4802 "Event.c" +#line 4926 "Event.c" gchar** _tmp10_; gint _tmp10__length1; gint _tmp11_; @@ -4823,7 +4947,7 @@ static void event_update_indexable_keywords (Event* self) { _tmp10_[_tmp11_] = _tmp13_; #line 580 "/home/jens/Source/shotwell/src/Event.vala" _tmp14_ = _tmp10_[_tmp11_]; -#line 4827 "Event.c" +#line 4951 "Event.c" } #line 582 "/home/jens/Source/shotwell/src/Event.vala" _tmp15_ = i; @@ -4833,7 +4957,7 @@ static void event_update_indexable_keywords (Event* self) { _g_free0 (self->priv->indexable_keywords); #line 583 "/home/jens/Source/shotwell/src/Event.vala" self->priv->indexable_keywords = NULL; -#line 4837 "Event.c" +#line 4961 "Event.c" } else { gchar** _tmp16_; gint _tmp16__length1; @@ -4872,7 +4996,7 @@ static void event_update_indexable_keywords (Event* self) { self->priv->indexable_keywords = _tmp22_; #line 586 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (_tmp21_); -#line 4876 "Event.c" +#line 5000 "Event.c" } #line 570 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (comment); @@ -4880,11 +5004,13 @@ static void event_update_indexable_keywords (Event* self) { _g_free0 (rawname); #line 570 "/home/jens/Source/shotwell/src/Event.vala" components = (_vala_array_free (components, components_length1, (GDestroyNotify) g_free), NULL); -#line 4884 "Event.c" +#line 5008 "Event.c" } -static const gchar* event_real_get_indexable_keywords (Indexable* base) { +static const gchar* +event_real_get_indexable_keywords (Indexable* base) +{ Event * self; const gchar* result = NULL; const gchar* _tmp0_; @@ -4896,91 +5022,89 @@ static const gchar* event_real_get_indexable_keywords (Indexable* base) { result = _tmp0_; #line 591 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 4900 "Event.c" +#line 5026 "Event.c" } -static void g_time_local (time_t time, struct tm* result) { +static void +g_time_local (time_t time, + struct tm* result) +{ struct tm _result_ = {0}; struct tm _tmp0_ = {0}; -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" localtime_r (&time, &_tmp0_); -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" *result = _result_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return; -#line 4915 "Event.c" +#line 5044 "Event.c" } -gboolean event_is_in_starting_day (Event* self, time_t time) { +gboolean +event_is_in_starting_day (Event* self, + time_t time) +{ gboolean result = FALSE; ViewCollection* _tmp0_; - gint _tmp1_; MediaSource* earliest_media = NULL; - ViewCollection* _tmp2_; - DataObject* _tmp3_; - DataView* _tmp4_; - DataSource* _tmp5_; - MediaSource* _tmp6_; + ViewCollection* _tmp1_; + DataObject* _tmp2_; + DataView* _tmp3_; + DataSource* _tmp4_; + MediaSource* _tmp5_; struct tm earliest_tm = {0}; - MediaSource* _tmp7_; - time_t _tmp8_; - struct tm _tmp9_ = {0}; + MediaSource* _tmp6_; + struct tm _tmp7_ = {0}; struct tm start_boundary_tm = {0}; + struct tm _tmp8_; + gint _tmp9_; struct tm _tmp10_; gint _tmp11_; struct tm _tmp12_; gint _tmp13_; + time_t start_boundary = 0; struct tm _tmp14_; gint _tmp15_; - time_t start_boundary = 0; - time_t _tmp16_; - struct tm _tmp17_; - gint _tmp18_; time_t end_boundary = 0; - time_t _tmp20_; - gboolean _tmp21_ = FALSE; - time_t _tmp22_; - time_t _tmp23_; + time_t _tmp17_; + gboolean _tmp18_ = FALSE; + time_t _tmp19_; #line 594 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT (self), FALSE); #line 599 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = self->priv->view; #line 599 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); -#line 599 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp1_ == 0) { + if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)) == 0) { #line 600 "/home/jens/Source/shotwell/src/Event.vala" result = FALSE; #line 600 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 4961 "Event.c" +#line 5087 "Event.c" } #line 603 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = self->priv->view; + _tmp1_ = self->priv->view; #line 603 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), 0); + _tmp2_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), 0); #line 603 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_VIEW, DataView); + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView); #line 603 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = data_view_get_source (_tmp4_); + _tmp4_ = data_view_get_source (_tmp3_); #line 603 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource); #line 603 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 603 "/home/jens/Source/shotwell/src/Event.vala" - earliest_media = _tmp6_; -#line 604 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = earliest_media; + earliest_media = _tmp5_; #line 604 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = media_source_get_exposure_time (_tmp7_); + _tmp6_ = earliest_media; #line 604 "/home/jens/Source/shotwell/src/Event.vala" - g_time_local (_tmp8_, &_tmp9_); + g_time_local (media_source_get_exposure_time (_tmp6_), &_tmp7_); #line 604 "/home/jens/Source/shotwell/src/Event.vala" - earliest_tm = _tmp9_; + earliest_tm = _tmp7_; #line 607 "/home/jens/Source/shotwell/src/Event.vala" memset (&start_boundary_tm, 0, sizeof (struct tm)); #line 608 "/home/jens/Source/shotwell/src/Event.vala" @@ -4990,135 +5114,118 @@ gboolean event_is_in_starting_day (Event* self, time_t time) { #line 610 "/home/jens/Source/shotwell/src/Event.vala" start_boundary_tm.tm_hour = EVENT_EVENT_BOUNDARY_HOUR; #line 611 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = earliest_tm; + _tmp8_ = earliest_tm; #line 611 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = _tmp10_.tm_mday; + _tmp9_ = _tmp8_.tm_mday; #line 611 "/home/jens/Source/shotwell/src/Event.vala" - start_boundary_tm.tm_mday = _tmp11_; + start_boundary_tm.tm_mday = _tmp9_; #line 612 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = earliest_tm; + _tmp10_ = earliest_tm; #line 612 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = _tmp12_.tm_mon; + _tmp11_ = _tmp10_.tm_mon; #line 612 "/home/jens/Source/shotwell/src/Event.vala" - start_boundary_tm.tm_mon = _tmp13_; + start_boundary_tm.tm_mon = _tmp11_; #line 613 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = earliest_tm; + _tmp12_ = earliest_tm; #line 613 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = _tmp14_.tm_year; + _tmp13_ = _tmp12_.tm_year; #line 613 "/home/jens/Source/shotwell/src/Event.vala" - start_boundary_tm.tm_year = _tmp15_; + start_boundary_tm.tm_year = _tmp13_; #line 614 "/home/jens/Source/shotwell/src/Event.vala" start_boundary_tm.tm_isdst = -1; #line 616 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = mktime (&start_boundary_tm); -#line 616 "/home/jens/Source/shotwell/src/Event.vala" - start_boundary = _tmp16_; + start_boundary = mktime (&start_boundary_tm); #line 620 "/home/jens/Source/shotwell/src/Event.vala" - _tmp17_ = earliest_tm; + _tmp14_ = earliest_tm; #line 620 "/home/jens/Source/shotwell/src/Event.vala" - _tmp18_ = _tmp17_.tm_hour; + _tmp15_ = _tmp14_.tm_hour; #line 620 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp18_ < EVENT_EVENT_BOUNDARY_HOUR) { -#line 5023 "Event.c" - time_t _tmp19_; + if (_tmp15_ < EVENT_EVENT_BOUNDARY_HOUR) { +#line 5145 "Event.c" + time_t _tmp16_; #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; + _tmp16_ = start_boundary; #line 622 "/home/jens/Source/shotwell/src/Event.vala" - start_boundary = _tmp19_ - EVENT_TIME_T_DAY; -#line 5031 "Event.c" + start_boundary = _tmp16_ - EVENT_TIME_T_DAY; +#line 5153 "Event.c" } #line 625 "/home/jens/Source/shotwell/src/Event.vala" - _tmp20_ = start_boundary; + _tmp17_ = start_boundary; #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 627 "/home/jens/Source/shotwell/src/Event.vala" - _tmp23_ = start_boundary; + end_boundary = (_tmp17_ + EVENT_TIME_T_DAY) - 1; #line 627 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp22_ >= _tmp23_) { -#line 5043 "Event.c" - time_t _tmp24_; - time_t _tmp25_; + _tmp19_ = start_boundary; #line 627 "/home/jens/Source/shotwell/src/Event.vala" - _tmp24_ = time; + if (time >= _tmp19_) { +#line 5163 "Event.c" + time_t _tmp20_; #line 627 "/home/jens/Source/shotwell/src/Event.vala" - _tmp25_ = end_boundary; + _tmp20_ = end_boundary; #line 627 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ = _tmp24_ <= _tmp25_; -#line 5052 "Event.c" + _tmp18_ = time <= _tmp20_; +#line 5169 "Event.c" } else { #line 627 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ = FALSE; -#line 5056 "Event.c" + _tmp18_ = FALSE; +#line 5173 "Event.c" } #line 627 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp21_; + result = _tmp18_; #line 627 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (earliest_media); #line 627 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5064 "Event.c" +#line 5181 "Event.c" } -static Event* event_generate_event (MediaSource* media, ViewCollection* events_so_far, const gchar* event_name, gboolean* new_event) { +static Event* +event_generate_event (MediaSource* media, + ViewCollection* events_so_far, + const gchar* event_name, + gboolean* new_event) +{ gboolean _vala_new_event = FALSE; Event* result = NULL; time_t exposure_time = 0; - MediaSource* _tmp0_; + gboolean _tmp0_ = FALSE; time_t _tmp1_; - gboolean _tmp2_ = FALSE; - time_t _tmp3_; gint count = 0; - ViewCollection* _tmp8_; - gint _tmp9_; GError * _inner_error_ = NULL; #line 633 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (media), 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 635 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = media_source_get_exposure_time (_tmp0_); -#line 635 "/home/jens/Source/shotwell/src/Event.vala" - exposure_time = _tmp1_; + exposure_time = media_source_get_exposure_time (media); #line 637 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = exposure_time; + _tmp1_ = exposure_time; #line 637 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp3_ == ((time_t) 0)) { -#line 5094 "Event.c" - const gchar* _tmp4_; -#line 637 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = event_name; + if (_tmp1_ == ((time_t) 0)) { #line 637 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = _tmp4_ == NULL; -#line 5100 "Event.c" + _tmp0_ = event_name == NULL; +#line 5210 "Event.c" } else { #line 637 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = FALSE; -#line 5104 "Event.c" + _tmp0_ = FALSE; +#line 5214 "Event.c" } #line 637 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp2_) { -#line 5108 "Event.c" - MediaSource* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; -#line 638 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = media; + if (_tmp0_) { +#line 5218 "Event.c" + gchar* _tmp2_; + gchar* _tmp3_; #line 638 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); + _tmp2_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (media, TYPE_DATA_OBJECT, DataObject)); #line 638 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = _tmp6_; + _tmp3_ = _tmp2_; #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_); +"no event name", _tmp3_); #line 638 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp3_); #line 639 "/home/jens/Source/shotwell/src/Event.vala" _vala_new_event = FALSE; #line 641 "/home/jens/Source/shotwell/src/Event.vala" @@ -5127,147 +5234,128 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s if (new_event) { #line 641 "/home/jens/Source/shotwell/src/Event.vala" *new_event = _vala_new_event; -#line 5130 "Event.c" +#line 5237 "Event.c" } #line 641 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5134 "Event.c" +#line 5241 "Event.c" } #line 644 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = events_so_far; -#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 644 "/home/jens/Source/shotwell/src/Event.vala" - count = _tmp9_; -#line 5142 "Event.c" + count = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (events_so_far, TYPE_DATA_COLLECTION, DataCollection)); +#line 5245 "Event.c" { gint ctr = 0; #line 645 "/home/jens/Source/shotwell/src/Event.vala" ctr = 0; -#line 5147 "Event.c" +#line 5250 "Event.c" { - gboolean _tmp10_ = FALSE; + gboolean _tmp4_ = FALSE; #line 645 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = TRUE; + _tmp4_ = TRUE; #line 645 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 5154 "Event.c" - gint _tmp12_; - gint _tmp13_; +#line 5257 "Event.c" + gint _tmp6_; + gint _tmp7_; Event* event = NULL; - ViewCollection* _tmp14_; - gint _tmp15_; - DataObject* _tmp16_; - EventView* _tmp17_; - DataSource* _tmp18_; - Event* _tmp19_; - gboolean _tmp20_ = FALSE; - gboolean _tmp21_ = FALSE; - gboolean _tmp22_ = FALSE; - const gchar* _tmp23_; + gint _tmp8_; + DataObject* _tmp9_; + EventView* _tmp10_; + DataSource* _tmp11_; + Event* _tmp12_; + gboolean _tmp13_ = FALSE; + gboolean _tmp14_ = FALSE; + gboolean _tmp15_ = FALSE; #line 645 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp10_) { -#line 5170 "Event.c" - gint _tmp11_; + if (!_tmp4_) { +#line 5271 "Event.c" + gint _tmp5_; #line 645 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = ctr; + _tmp5_ = ctr; #line 645 "/home/jens/Source/shotwell/src/Event.vala" - ctr = _tmp11_ + 1; -#line 5176 "Event.c" + ctr = _tmp5_ + 1; +#line 5277 "Event.c" } #line 645 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = FALSE; + _tmp4_ = FALSE; #line 645 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = ctr; + _tmp6_ = ctr; #line 645 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = count; + _tmp7_ = count; #line 645 "/home/jens/Source/shotwell/src/Event.vala" - if (!(_tmp12_ < _tmp13_)) { + if (!(_tmp6_ < _tmp7_)) { #line 645 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 5188 "Event.c" +#line 5289 "Event.c" } #line 646 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = events_so_far; + _tmp8_ = ctr; #line 646 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = ctr; + _tmp9_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (events_so_far, TYPE_DATA_COLLECTION, DataCollection), _tmp8_); #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_); + _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_EVENT_VIEW, EventView); #line 646 "/home/jens/Source/shotwell/src/Event.vala" - _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_EVENT_VIEW, EventView); + _tmp11_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView)); #line 646 "/home/jens/Source/shotwell/src/Event.vala" - _tmp18_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_VIEW, DataView)); + _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_EVENT, Event); #line 646 "/home/jens/Source/shotwell/src/Event.vala" - _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_EVENT, Event); + _g_object_unref0 (_tmp10_); #line 646 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp17_); -#line 646 "/home/jens/Source/shotwell/src/Event.vala" - event = _tmp19_; + event = _tmp12_; #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp23_ = event_name; -#line 648 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp23_ != NULL) { -#line 5210 "Event.c" - Event* _tmp24_; - gboolean _tmp25_; -#line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp24_ = event; + if (event_name != NULL) { +#line 5307 "Event.c" + Event* _tmp16_; #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp25_ = event_has_name (_tmp24_); + _tmp16_ = event; #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp22_ = _tmp25_; -#line 5219 "Event.c" + _tmp15_ = event_has_name (_tmp16_); +#line 5313 "Event.c" } else { #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp22_ = FALSE; -#line 5223 "Event.c" + _tmp15_ = FALSE; +#line 5317 "Event.c" } #line 648 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp22_) { -#line 5227 "Event.c" - const gchar* _tmp26_; - Event* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; + if (_tmp15_) { +#line 5321 "Event.c" + Event* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp26_ = event_name; + _tmp17_ = event; #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp27_ = event; + _tmp18_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_OBJECT, DataObject)); #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp28_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_OBJECT, DataObject)); + _tmp19_ = _tmp18_; #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp29_ = _tmp28_; + _tmp14_ = g_strcmp0 (event_name, _tmp19_) == 0; #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ = g_strcmp0 (_tmp26_, _tmp29_) == 0; -#line 648 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp29_); -#line 5244 "Event.c" + _g_free0 (_tmp19_); +#line 5335 "Event.c" } else { #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ = FALSE; -#line 5248 "Event.c" + _tmp14_ = FALSE; +#line 5339 "Event.c" } #line 648 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp21_) { + if (_tmp14_) { #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp20_ = TRUE; -#line 5254 "Event.c" + _tmp13_ = TRUE; +#line 5345 "Event.c" } else { - Event* _tmp30_; - time_t _tmp31_; - gboolean _tmp32_; -#line 649 "/home/jens/Source/shotwell/src/Event.vala" - _tmp30_ = event; + Event* _tmp20_; + time_t _tmp21_; #line 649 "/home/jens/Source/shotwell/src/Event.vala" - _tmp31_ = exposure_time; + _tmp20_ = event; #line 649 "/home/jens/Source/shotwell/src/Event.vala" - _tmp32_ = event_is_in_starting_day (_tmp30_, _tmp31_); + _tmp21_ = exposure_time; #line 649 "/home/jens/Source/shotwell/src/Event.vala" - _tmp20_ = _tmp32_; -#line 5267 "Event.c" + _tmp13_ = event_is_in_starting_day (_tmp20_, _tmp21_); +#line 5355 "Event.c" } #line 648 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp20_) { + if (_tmp13_) { #line 650 "/home/jens/Source/shotwell/src/Event.vala" _vala_new_event = FALSE; #line 652 "/home/jens/Source/shotwell/src/Event.vala" @@ -5276,59 +5364,54 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s if (new_event) { #line 652 "/home/jens/Source/shotwell/src/Event.vala" *new_event = _vala_new_event; -#line 5279 "Event.c" +#line 5367 "Event.c" } #line 652 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5283 "Event.c" +#line 5371 "Event.c" } #line 645 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); -#line 5287 "Event.c" +#line 5375 "Event.c" } } } { - EventRow* _tmp33_ = NULL; - EventTable* _tmp34_; - EventTable* _tmp35_; - MediaSource* _tmp36_; - gchar* _tmp37_; - gchar* _tmp38_; - EventRow* _tmp39_; - EventRow* _tmp40_; + EventRow* _tmp22_ = NULL; + EventTable* _tmp23_; + EventTable* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; + EventRow* _tmp27_; + EventRow* _tmp28_; Event* event = NULL; - Event* _tmp41_; - const gchar* _tmp42_; - ViewCollection* _tmp45_; - Event* _tmp46_; - EventView* _tmp47_; - EventView* _tmp48_; -#line 658 "/home/jens/Source/shotwell/src/Event.vala" - _tmp34_ = event_table_get_instance (); + Event* _tmp29_; + Event* _tmp31_; + EventView* _tmp32_; + EventView* _tmp33_; #line 658 "/home/jens/Source/shotwell/src/Event.vala" - _tmp35_ = _tmp34_; + _tmp23_ = event_table_get_instance (); #line 658 "/home/jens/Source/shotwell/src/Event.vala" - _tmp36_ = media; + _tmp24_ = _tmp23_; #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)); + _tmp25_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (media, TYPE_DATA_SOURCE, DataSource)); #line 658 "/home/jens/Source/shotwell/src/Event.vala" - _tmp38_ = _tmp37_; + _tmp26_ = _tmp25_; #line 658 "/home/jens/Source/shotwell/src/Event.vala" - _tmp39_ = event_table_create (_tmp35_, _tmp38_, NULL, &_inner_error_); + _tmp27_ = event_table_create (_tmp24_, _tmp26_, NULL, &_inner_error_); #line 658 "/home/jens/Source/shotwell/src/Event.vala" - _tmp40_ = _tmp39_; + _tmp28_ = _tmp27_; #line 658 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp38_); + _g_free0 (_tmp26_); #line 658 "/home/jens/Source/shotwell/src/Event.vala" - _database_table_unref0 (_tmp35_); + _database_table_unref0 (_tmp24_); #line 658 "/home/jens/Source/shotwell/src/Event.vala" - _tmp33_ = _tmp40_; + _tmp22_ = _tmp28_; #line 658 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 658 "/home/jens/Source/shotwell/src/Event.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 5331 "Event.c" +#line 5414 "Event.c" goto __catch449_database_error; } #line 658 "/home/jens/Source/shotwell/src/Event.vala" @@ -5337,71 +5420,64 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s g_clear_error (&_inner_error_); #line 658 "/home/jens/Source/shotwell/src/Event.vala" return NULL; -#line 5340 "Event.c" +#line 5423 "Event.c" } #line 658 "/home/jens/Source/shotwell/src/Event.vala" - _tmp41_ = event_new (_tmp33_, DATA_OBJECT_INVALID_OBJECT_ID); + _tmp29_ = event_new (_tmp22_, DATA_OBJECT_INVALID_OBJECT_ID); #line 658 "/home/jens/Source/shotwell/src/Event.vala" - event = _tmp41_; -#line 659 "/home/jens/Source/shotwell/src/Event.vala" - _tmp42_ = event_name; + event = _tmp29_; #line 659 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp42_ != NULL) { -#line 5350 "Event.c" - Event* _tmp43_; - const gchar* _tmp44_; + if (event_name != NULL) { +#line 5431 "Event.c" + Event* _tmp30_; #line 660 "/home/jens/Source/shotwell/src/Event.vala" - _tmp43_ = event; + _tmp30_ = event; #line 660 "/home/jens/Source/shotwell/src/Event.vala" - _tmp44_ = event_name; -#line 660 "/home/jens/Source/shotwell/src/Event.vala" - event_rename (_tmp43_, _tmp44_); -#line 5359 "Event.c" + event_rename (_tmp30_, event_name); +#line 5437 "Event.c" } #line 662 "/home/jens/Source/shotwell/src/Event.vala" - _tmp45_ = events_so_far; -#line 662 "/home/jens/Source/shotwell/src/Event.vala" - _tmp46_ = event; + _tmp31_ = event; #line 662 "/home/jens/Source/shotwell/src/Event.vala" - _tmp47_ = event_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_EVENT_SOURCE, EventSource)); + _tmp32_ = event_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_EVENT_SOURCE, EventSource)); #line 662 "/home/jens/Source/shotwell/src/Event.vala" - _tmp48_ = _tmp47_; + _tmp33_ = _tmp32_; #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)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (events_so_far, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_OBJECT, DataObject)); #line 662 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp48_); + _g_object_unref0 (_tmp33_); #line 664 "/home/jens/Source/shotwell/src/Event.vala" _vala_new_event = TRUE; #line 665 "/home/jens/Source/shotwell/src/Event.vala" result = event; #line 665 "/home/jens/Source/shotwell/src/Event.vala" - _event_row_unref0 (_tmp33_); + _event_row_unref0 (_tmp22_); #line 665 "/home/jens/Source/shotwell/src/Event.vala" if (new_event) { #line 665 "/home/jens/Source/shotwell/src/Event.vala" *new_event = _vala_new_event; -#line 5383 "Event.c" +#line 5459 "Event.c" } #line 665 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5387 "Event.c" +#line 5463 "Event.c" } goto __finally449; __catch449_database_error: { GError* err = NULL; - GError* _tmp49_; + GError* _tmp34_; #line 657 "/home/jens/Source/shotwell/src/Event.vala" err = _inner_error_; #line 657 "/home/jens/Source/shotwell/src/Event.vala" _inner_error_ = NULL; #line 667 "/home/jens/Source/shotwell/src/Event.vala" - _tmp49_ = err; + _tmp34_ = err; #line 667 "/home/jens/Source/shotwell/src/Event.vala" - app_window_database_error (_tmp49_); + app_window_database_error (_tmp34_); #line 657 "/home/jens/Source/shotwell/src/Event.vala" _g_error_free0 (err); -#line 5404 "Event.c" +#line 5480 "Event.c" } __finally449: #line 657 "/home/jens/Source/shotwell/src/Event.vala" @@ -5412,7 +5488,7 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s g_clear_error (&_inner_error_); #line 657 "/home/jens/Source/shotwell/src/Event.vala" return NULL; -#line 5415 "Event.c" +#line 5491 "Event.c" } #line 670 "/home/jens/Source/shotwell/src/Event.vala" _vala_new_event = FALSE; @@ -5422,105 +5498,97 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s if (new_event) { #line 672 "/home/jens/Source/shotwell/src/Event.vala" *new_event = _vala_new_event; -#line 5425 "Event.c" +#line 5501 "Event.c" } #line 672 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5429 "Event.c" +#line 5505 "Event.c" } -void event_generate_single_event (MediaSource* media, ViewCollection* events_so_far, const gchar* event_name) { - MediaSource* _tmp0_; +void +event_generate_single_event (MediaSource* media, + ViewCollection* events_so_far, + const gchar* event_name) +{ + Event* _tmp0_; Event* _tmp1_; - Event* _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; gboolean new_event = FALSE; Event* event = NULL; - MediaSource* _tmp4_; - ViewCollection* _tmp5_; - const gchar* _tmp6_; - gboolean _tmp7_ = FALSE; - Event* _tmp8_; - Event* _tmp9_; - MediaSource* _tmp10_; - Event* _tmp11_; - gboolean _tmp12_; + gboolean _tmp3_ = FALSE; + Event* _tmp4_; + Event* _tmp5_; + Event* _tmp6_; + gboolean _tmp7_; #line 675 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_MEDIA_SOURCE (media)); #line 675 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_VIEW_COLLECTION (events_so_far)); #line 678 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = media; -#line 678 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = media_source_get_event (_tmp0_); + _tmp0_ = media_source_get_event (media); #line 678 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 678 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _tmp2_ != NULL; + _tmp2_ = _tmp1_ != NULL; #line 678 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 678 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp3_) { + if (_tmp2_) { #line 679 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 5467 "Event.c" +#line 5540 "Event.c" } #line 682 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = media; -#line 682 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = events_so_far; -#line 682 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = event_name; + _tmp4_ = event_generate_event (media, events_so_far, event_name, &_tmp3_); #line 682 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = event_generate_event (_tmp4_, _tmp5_, _tmp6_, &_tmp7_); + new_event = _tmp3_; #line 682 "/home/jens/Source/shotwell/src/Event.vala" - new_event = _tmp7_; -#line 682 "/home/jens/Source/shotwell/src/Event.vala" - event = _tmp8_; + event = _tmp4_; #line 683 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = event; + _tmp5_ = event; #line 683 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp9_ == NULL) { + if (_tmp5_ == NULL) { #line 684 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); #line 684 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 5489 "Event.c" +#line 5556 "Event.c" } #line 686 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = media; + _tmp6_ = event; #line 686 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = event; -#line 686 "/home/jens/Source/shotwell/src/Event.vala" - media_source_set_event (_tmp10_, _tmp11_); + media_source_set_event (media, _tmp6_); #line 688 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = new_event; + _tmp7_ = new_event; #line 688 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp12_) { -#line 5501 "Event.c" - EventSourceCollection* _tmp13_; - Event* _tmp14_; + if (_tmp7_) { +#line 5566 "Event.c" + EventSourceCollection* _tmp8_; + Event* _tmp9_; #line 689 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = event_global; + _tmp8_ = event_global; #line 689 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = event; + _tmp9_ = event; #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 5510 "Event.c" + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); +#line 5575 "Event.c" } #line 675 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); -#line 5514 "Event.c" +#line 5579 "Event.c" } -void event_generate_many_events (GeeCollection* sources, ViewCollection* events_so_far) { +void +event_generate_many_events (GeeCollection* sources, + ViewCollection* events_so_far) +{ GeeCollection* to_add = NULL; GeeArrayList* _tmp0_; - GeeCollection* _tmp21_; - gint _tmp22_; - gint _tmp23_; + GeeCollection* _tmp18_; + gint _tmp19_; + gint _tmp20_; #line 692 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); #line 692 "/home/jens/Source/shotwell/src/Event.vala" @@ -5529,158 +5597,152 @@ void event_generate_many_events (GeeCollection* sources, ViewCollection* events_ _tmp0_ = gee_array_list_new (TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 693 "/home/jens/Source/shotwell/src/Event.vala" to_add = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); -#line 5532 "Event.c" +#line 5600 "Event.c" { GeeIterator* _media_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp1_; #line 694 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = sources; -#line 694 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 694 "/home/jens/Source/shotwell/src/Event.vala" - _media_it = _tmp2_; + _media_it = _tmp1_; #line 694 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 5545 "Event.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 5610 "Event.c" + GeeIterator* _tmp2_; MediaSource* media = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - MediaSource* _tmp7_; - Event* _tmp8_; - Event* _tmp9_; - gboolean _tmp10_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + MediaSource* _tmp5_; + Event* _tmp6_; + Event* _tmp7_; + gboolean _tmp8_; gboolean new_event = FALSE; Event* event = NULL; - MediaSource* _tmp11_; - ViewCollection* _tmp12_; - gboolean _tmp13_ = FALSE; + MediaSource* _tmp9_; + gboolean _tmp10_ = FALSE; + Event* _tmp11_; + Event* _tmp12_; + MediaSource* _tmp13_; Event* _tmp14_; - Event* _tmp15_; - MediaSource* _tmp16_; - Event* _tmp17_; - gboolean _tmp18_; -#line 694 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _media_it; + gboolean _tmp15_; #line 694 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _media_it; #line 694 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 694 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 5573 "Event.c" +#line 5634 "Event.c" } #line 694 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _media_it; + _tmp3_ = _media_it; #line 694 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 694 "/home/jens/Source/shotwell/src/Event.vala" - media = (MediaSource*) _tmp6_; + media = (MediaSource*) _tmp4_; #line 696 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = media; + _tmp5_ = media; #line 696 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = media_source_get_event (_tmp7_); + _tmp6_ = media_source_get_event (_tmp5_); #line 696 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 696 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = _tmp9_ != NULL; + _tmp8_ = _tmp7_ != NULL; #line 696 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp7_); #line 696 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp10_) { + if (_tmp8_) { #line 697 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (media); #line 697 "/home/jens/Source/shotwell/src/Event.vala" continue; -#line 5597 "Event.c" +#line 5658 "Event.c" } #line 700 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = media; + _tmp9_ = media; #line 700 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = events_so_far; + _tmp11_ = event_generate_event (_tmp9_, events_so_far, NULL, &_tmp10_); #line 700 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = event_generate_event (_tmp11_, _tmp12_, NULL, &_tmp13_); + new_event = _tmp10_; #line 700 "/home/jens/Source/shotwell/src/Event.vala" - new_event = _tmp13_; -#line 700 "/home/jens/Source/shotwell/src/Event.vala" - event = _tmp14_; + event = _tmp11_; #line 701 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = event; + _tmp12_ = event; #line 701 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp15_ == NULL) { + if (_tmp12_ == NULL) { #line 702 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); #line 702 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (media); #line 702 "/home/jens/Source/shotwell/src/Event.vala" continue; -#line 5619 "Event.c" +#line 5678 "Event.c" } #line 704 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = media; + _tmp13_ = media; #line 704 "/home/jens/Source/shotwell/src/Event.vala" - _tmp17_ = event; + _tmp14_ = event; #line 704 "/home/jens/Source/shotwell/src/Event.vala" - media_source_set_event (_tmp16_, _tmp17_); + media_source_set_event (_tmp13_, _tmp14_); #line 706 "/home/jens/Source/shotwell/src/Event.vala" - _tmp18_ = new_event; + _tmp15_ = new_event; #line 706 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp18_) { -#line 5631 "Event.c" - GeeCollection* _tmp19_; - Event* _tmp20_; + if (_tmp15_) { +#line 5690 "Event.c" + GeeCollection* _tmp16_; + Event* _tmp17_; #line 707 "/home/jens/Source/shotwell/src/Event.vala" - _tmp19_ = to_add; + _tmp16_ = to_add; #line 707 "/home/jens/Source/shotwell/src/Event.vala" - _tmp20_ = event; + _tmp17_ = event; #line 707 "/home/jens/Source/shotwell/src/Event.vala" - gee_collection_add (_tmp19_, _tmp20_); -#line 5640 "Event.c" + gee_collection_add (_tmp16_, _tmp17_); +#line 5699 "Event.c" } #line 694 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); #line 694 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (media); -#line 5646 "Event.c" +#line 5705 "Event.c" } #line 694 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_media_it); -#line 5650 "Event.c" +#line 5709 "Event.c" } #line 710 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ = to_add; + _tmp18_ = to_add; #line 710 "/home/jens/Source/shotwell/src/Event.vala" - _tmp22_ = gee_collection_get_size (_tmp21_); + _tmp19_ = gee_collection_get_size (_tmp18_); #line 710 "/home/jens/Source/shotwell/src/Event.vala" - _tmp23_ = _tmp22_; + _tmp20_ = _tmp19_; #line 710 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp23_ > 0) { -#line 5660 "Event.c" - EventSourceCollection* _tmp24_; - GeeCollection* _tmp25_; - GeeCollection* _tmp26_; - GeeCollection* _tmp27_; + if (_tmp20_ > 0) { +#line 5719 "Event.c" + EventSourceCollection* _tmp21_; + GeeCollection* _tmp22_; + GeeCollection* _tmp23_; + GeeCollection* _tmp24_; #line 711 "/home/jens/Source/shotwell/src/Event.vala" - _tmp24_ = event_global; + _tmp21_ = event_global; #line 711 "/home/jens/Source/shotwell/src/Event.vala" - _tmp25_ = to_add; + _tmp22_ = to_add; #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); + _tmp23_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection), _tmp22_, NULL, NULL); #line 711 "/home/jens/Source/shotwell/src/Event.vala" - _tmp27_ = _tmp26_; + _tmp24_ = _tmp23_; #line 711 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp27_); -#line 5675 "Event.c" + _g_object_unref0 (_tmp24_); +#line 5734 "Event.c" } #line 692 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (to_add); -#line 5679 "Event.c" +#line 5738 "Event.c" } -void event_get_event_id (Event* self, EventID* result) { +void +event_get_event_id (Event* self, + EventID* result) +{ EventID _tmp0_; #line 714 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); @@ -5690,11 +5752,13 @@ void event_get_event_id (Event* self, EventID* result) { *result = _tmp0_; #line 715 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 5693 "Event.c" +#line 5755 "Event.c" } -static SourceSnapshot* event_real_save_snapshot (DataSource* base) { +static SourceSnapshot* +event_real_save_snapshot (DataSource* base) +{ Event * self; SourceSnapshot* result = NULL; EventEventSnapshot* _tmp0_; @@ -5706,11 +5770,13 @@ static SourceSnapshot* event_real_save_snapshot (DataSource* base) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_SNAPSHOT, SourceSnapshot); #line 719 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5709 "Event.c" +#line 5773 "Event.c" } -static SourceProxy* event_real_get_proxy (Proxyable* base) { +static SourceProxy* +event_real_get_proxy (Proxyable* base) +{ Event * self; SourceProxy* result = NULL; EventEventProxy* _tmp0_; @@ -5722,88 +5788,83 @@ static SourceProxy* event_real_get_proxy (Proxyable* base) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_PROXY, SourceProxy); #line 723 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5725 "Event.c" +#line 5791 "Event.c" } -static gboolean event_real_equals (DataSource* base, DataSource* source) { +static gboolean +event_real_equals (DataSource* base, + DataSource* source) +{ Event * self; gboolean result = FALSE; Event* event = NULL; - DataSource* _tmp0_; + Event* _tmp0_; Event* _tmp1_; - Event* _tmp2_; - DataSource* _tmp9_; - gboolean _tmp10_; #line 726 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #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; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_EVENT) ? ((Event*) source) : NULL); #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 728 "/home/jens/Source/shotwell/src/Event.vala" - event = _tmp1_; + event = _tmp0_; #line 729 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = event; + _tmp1_ = event; #line 729 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp2_ != NULL) { -#line 5752 "Event.c" - Event* _tmp3_; + if (_tmp1_ != NULL) { +#line 5816 "Event.c" + Event* _tmp2_; #line 730 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = event; + _tmp2_ = event; #line 730 "/home/jens/Source/shotwell/src/Event.vala" - if (self != _tmp3_) { -#line 5758 "Event.c" - EventID _tmp4_; - gint64 _tmp5_; - Event* _tmp6_; - EventID _tmp7_; - gint64 _tmp8_; + if (self != _tmp2_) { +#line 5822 "Event.c" + EventID _tmp3_; + gint64 _tmp4_; + Event* _tmp5_; + EventID _tmp6_; + gint64 _tmp7_; #line 731 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = self->priv->event_id; + _tmp3_ = self->priv->event_id; #line 731 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _tmp4_.id; + _tmp4_ = _tmp3_.id; #line 731 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = event; + _tmp5_ = event; #line 731 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = _tmp6_->priv->event_id; + _tmp6_ = _tmp5_->priv->event_id; #line 731 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = _tmp7_.id; + _tmp7_ = _tmp6_.id; #line 731 "/home/jens/Source/shotwell/src/Event.vala" - _vala_assert (_tmp5_ != _tmp8_, "event_id.id != event.event_id.id"); -#line 5776 "Event.c" + _vala_assert (_tmp4_ != _tmp7_, "event_id.id != event.event_id.id"); +#line 5840 "Event.c" } } #line 735 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = source; -#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 735 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp10_; + result = 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), source); #line 735 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); #line 735 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5789 "Event.c" +#line 5849 "Event.c" } -static gchar* event_real_to_string (DataObject* base) { +static gchar* +event_real_to_string (DataObject* base) +{ Event * self; gchar* result = NULL; EventID _tmp0_; gint64 _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gint64 _tmp4_; + gchar* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; #line 738 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 739 "/home/jens/Source/shotwell/src/Event.vala" @@ -5815,34 +5876,34 @@ static gchar* event_real_to_string (DataObject* base) { #line 739 "/home/jens/Source/shotwell/src/Event.vala" _tmp3_ = _tmp2_; #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)); + _tmp4_ = g_strdup_printf ("%" G_GINT64_FORMAT, data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject))); #line 739 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp4_); -#line 739 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 739 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp6_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 739 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 739 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = g_strdup_printf ("Event [%s/%s] %s", _tmp3_, _tmp6_, _tmp8_); + _tmp8_ = g_strdup_printf ("Event [%s/%s] %s", _tmp3_, _tmp5_, _tmp7_); #line 739 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 739 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp7_); #line 739 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 739 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (_tmp3_); #line 739 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp10_; + result = _tmp9_; #line 739 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5841 "Event.c" +#line 5900 "Event.c" } -gboolean event_has_name (Event* self) { +gboolean +event_has_name (Event* self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; const gchar* _tmp1_; @@ -5852,7 +5913,7 @@ gboolean event_has_name (Event* self) { _tmp1_ = self->priv->raw_name; #line 743 "/home/jens/Source/shotwell/src/Event.vala" if (_tmp1_ != NULL) { -#line 5855 "Event.c" +#line 5916 "Event.c" const gchar* _tmp2_; gint _tmp3_; gint _tmp4_; @@ -5864,293 +5925,287 @@ gboolean event_has_name (Event* self) { _tmp4_ = _tmp3_; #line 743 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = _tmp4_ > 0; -#line 5867 "Event.c" +#line 5928 "Event.c" } else { #line 743 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = FALSE; -#line 5871 "Event.c" +#line 5932 "Event.c" } #line 743 "/home/jens/Source/shotwell/src/Event.vala" result = _tmp0_; #line 743 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5877 "Event.c" +#line 5938 "Event.c" } -static gchar* event_real_get_name (DataObject* base) { +static gchar* +event_real_get_name (DataObject* base) +{ Event * self; gchar* result = NULL; - gboolean _tmp0_; gchar* datestring = NULL; - gchar* _tmp2_; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_; - gboolean _tmp5_; + gchar* _tmp1_; + gchar* _tmp2_ = NULL; + const gchar* _tmp3_; #line 746 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 747 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = event_has_name (self); -#line 747 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp0_) { -#line 5896 "Event.c" - gchar* _tmp1_; + if (event_has_name (self)) { +#line 5955 "Event.c" + gchar* _tmp0_; #line 748 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = event_get_raw_name (self); + _tmp0_ = event_get_raw_name (self); #line 748 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp1_; + result = _tmp0_; #line 748 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5904 "Event.c" +#line 5963 "Event.c" } #line 751 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = event_get_formatted_daterange (self); + _tmp1_ = event_get_formatted_daterange (self); #line 751 "/home/jens/Source/shotwell/src/Event.vala" - datestring = _tmp2_; + datestring = _tmp1_; #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = datestring; + _tmp3_ = datestring; #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = is_string_empty (_tmp4_); -#line 753 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp5_) { -#line 5916 "Event.c" - const gchar* _tmp6_; - gchar* _tmp7_; + if (!is_string_empty (_tmp3_)) { +#line 5973 "Event.c" + const gchar* _tmp4_; + gchar* _tmp5_; #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = datestring; + _tmp4_ = datestring; #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp5_ = g_strdup (_tmp4_); #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _tmp7_; -#line 5927 "Event.c" + _tmp2_ = _tmp5_; +#line 5984 "Event.c" } else { - EventID _tmp8_; - gint64 _tmp9_; + EventID _tmp6_; + gint64 _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; gchar* _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = self->priv->event_id; + _tmp6_ = self->priv->event_id; #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = _tmp8_.id; + _tmp7_ = _tmp6_.id; #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp9_); + _tmp8_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp7_); #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = g_strdup_printf (_ ("Event %s"), _tmp11_); + _tmp10_ = g_strdup_printf (_ ("Event %s"), _tmp9_); #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _tmp12_; + _tmp2_ = _tmp10_; #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp11_); -#line 5950 "Event.c" + _g_free0 (_tmp9_); +#line 6007 "Event.c" } #line 753 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp3_; + result = _tmp2_; #line 753 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (datestring); #line 753 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5958 "Event.c" +#line 6015 "Event.c" } -gchar* event_get_formatted_daterange (Event* self) { +gchar* +event_get_formatted_daterange (Event* self) +{ gchar* result = NULL; time_t start_time = 0; - time_t _tmp0_; time_t end_time = 0; + gboolean _tmp0_ = FALSE; time_t _tmp1_; - gboolean _tmp2_ = FALSE; - time_t _tmp3_; - gboolean _tmp5_ = FALSE; - time_t _tmp6_; + gboolean _tmp3_ = FALSE; + time_t _tmp4_; struct tm start = {0}; + time_t _tmp9_; + struct tm _tmp10_ = {0}; + struct tm end = {0}; time_t _tmp11_; struct tm _tmp12_ = {0}; - struct tm end = {0}; - time_t _tmp13_; - struct tm _tmp14_ = {0}; - gboolean _tmp15_ = FALSE; - gboolean _tmp16_ = FALSE; + gboolean _tmp13_ = FALSE; + gboolean _tmp14_ = FALSE; + struct tm _tmp15_; + gint _tmp16_; struct tm _tmp17_; gint _tmp18_; - struct tm _tmp19_; - gint _tmp20_; - struct tm _tmp32_; - struct tm _tmp33_; - gchar* _tmp34_; + struct tm _tmp30_; + struct tm _tmp31_; + gchar* _tmp32_; #line 756 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT (self), NULL); #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 757 "/home/jens/Source/shotwell/src/Event.vala" - start_time = _tmp0_; + start_time = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource)); #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 758 "/home/jens/Source/shotwell/src/Event.vala" - end_time = _tmp1_; + end_time = event_source_get_end_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource)); #line 760 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = end_time; + _tmp1_ = end_time; #line 760 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp3_ == ((time_t) 0)) { -#line 6001 "Event.c" - time_t _tmp4_; + if (_tmp1_ == ((time_t) 0)) { +#line 6054 "Event.c" + time_t _tmp2_; #line 760 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = start_time; + _tmp2_ = start_time; #line 760 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = _tmp4_ == ((time_t) 0); -#line 6007 "Event.c" + _tmp0_ = _tmp2_ == ((time_t) 0); +#line 6060 "Event.c" } else { #line 760 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = FALSE; -#line 6011 "Event.c" + _tmp0_ = FALSE; +#line 6064 "Event.c" } #line 760 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp2_) { + if (_tmp0_) { #line 761 "/home/jens/Source/shotwell/src/Event.vala" result = NULL; #line 761 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6019 "Event.c" +#line 6072 "Event.c" } #line 763 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = end_time; + _tmp4_ = end_time; #line 763 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp6_ == ((time_t) 0)) { -#line 6025 "Event.c" - time_t _tmp7_; + if (_tmp4_ == ((time_t) 0)) { +#line 6078 "Event.c" + time_t _tmp5_; #line 763 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = start_time; + _tmp5_ = start_time; #line 763 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _tmp7_ != ((time_t) 0); -#line 6031 "Event.c" + _tmp3_ = _tmp5_ != ((time_t) 0); +#line 6084 "Event.c" } else { #line 763 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = FALSE; -#line 6035 "Event.c" + _tmp3_ = FALSE; +#line 6088 "Event.c" } #line 763 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp5_) { -#line 6039 "Event.c" - time_t _tmp8_; - struct tm _tmp9_ = {0}; - gchar* _tmp10_; + if (_tmp3_) { +#line 6092 "Event.c" + time_t _tmp6_; + struct tm _tmp7_ = {0}; + gchar* _tmp8_; #line 764 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = start_time; + _tmp6_ = start_time; #line 764 "/home/jens/Source/shotwell/src/Event.vala" - g_time_local (_tmp8_, &_tmp9_); + g_time_local (_tmp6_, &_tmp7_); #line 764 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = format_local_date (&_tmp9_); + _tmp8_ = format_local_date (&_tmp7_); #line 764 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp10_; + result = _tmp8_; #line 764 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6053 "Event.c" +#line 6106 "Event.c" } #line 766 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = start_time; + _tmp9_ = start_time; #line 766 "/home/jens/Source/shotwell/src/Event.vala" - g_time_local (_tmp11_, &_tmp12_); + g_time_local (_tmp9_, &_tmp10_); #line 766 "/home/jens/Source/shotwell/src/Event.vala" - start = _tmp12_; + start = _tmp10_; #line 767 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = end_time; + _tmp11_ = end_time; #line 767 "/home/jens/Source/shotwell/src/Event.vala" - g_time_local (_tmp13_, &_tmp14_); + g_time_local (_tmp11_, &_tmp12_); #line 767 "/home/jens/Source/shotwell/src/Event.vala" - end = _tmp14_; + end = _tmp12_; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp17_ = start; + _tmp15_ = start; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp18_ = _tmp17_.tm_mday; + _tmp16_ = _tmp15_.tm_mday; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp19_ = end; + _tmp17_ = end; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp20_ = _tmp19_.tm_mday; + _tmp18_ = _tmp17_.tm_mday; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp18_ == _tmp20_) { -#line 6077 "Event.c" + if (_tmp16_ == _tmp18_) { +#line 6130 "Event.c" + struct tm _tmp19_; + gint _tmp20_; struct tm _tmp21_; gint _tmp22_; - struct tm _tmp23_; - gint _tmp24_; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ = start; + _tmp19_ = start; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp22_ = _tmp21_.tm_mon; + _tmp20_ = _tmp19_.tm_mon; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp23_ = end; + _tmp21_ = end; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp24_ = _tmp23_.tm_mon; + _tmp22_ = _tmp21_.tm_mon; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = _tmp22_ == _tmp24_; -#line 6092 "Event.c" + _tmp14_ = _tmp20_ == _tmp22_; +#line 6145 "Event.c" } else { #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = FALSE; -#line 6096 "Event.c" + _tmp14_ = FALSE; +#line 6149 "Event.c" } #line 769 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp16_) { -#line 6100 "Event.c" + if (_tmp14_) { +#line 6153 "Event.c" + struct tm _tmp23_; + gint _tmp24_; struct tm _tmp25_; gint _tmp26_; - struct tm _tmp27_; - gint _tmp28_; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp25_ = start; + _tmp23_ = start; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp26_ = _tmp25_.tm_mday; + _tmp24_ = _tmp23_.tm_mday; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp27_ = end; + _tmp25_ = end; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp28_ = _tmp27_.tm_mday; + _tmp26_ = _tmp25_.tm_mday; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = _tmp26_ == _tmp28_; -#line 6115 "Event.c" + _tmp13_ = _tmp24_ == _tmp26_; +#line 6168 "Event.c" } else { #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = FALSE; -#line 6119 "Event.c" + _tmp13_ = FALSE; +#line 6172 "Event.c" } #line 769 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp15_) { -#line 6123 "Event.c" - time_t _tmp29_; - struct tm _tmp30_ = {0}; - gchar* _tmp31_; + if (_tmp13_) { +#line 6176 "Event.c" + time_t _tmp27_; + struct tm _tmp28_ = {0}; + gchar* _tmp29_; #line 770 "/home/jens/Source/shotwell/src/Event.vala" - _tmp29_ = start_time; + _tmp27_ = start_time; #line 770 "/home/jens/Source/shotwell/src/Event.vala" - g_time_local (_tmp29_, &_tmp30_); + g_time_local (_tmp27_, &_tmp28_); #line 770 "/home/jens/Source/shotwell/src/Event.vala" - _tmp31_ = format_local_date (&_tmp30_); + _tmp29_ = format_local_date (&_tmp28_); #line 770 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp31_; + result = _tmp29_; #line 770 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6137 "Event.c" +#line 6190 "Event.c" } #line 772 "/home/jens/Source/shotwell/src/Event.vala" - _tmp32_ = start; + _tmp30_ = start; #line 772 "/home/jens/Source/shotwell/src/Event.vala" - _tmp33_ = end; + _tmp31_ = end; #line 772 "/home/jens/Source/shotwell/src/Event.vala" - _tmp34_ = format_local_datespan (&_tmp32_, &_tmp33_); + _tmp32_ = format_local_datespan (&_tmp30_, &_tmp31_); #line 772 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp34_; + result = _tmp32_; #line 772 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6149 "Event.c" +#line 6202 "Event.c" } -gchar* event_get_raw_name (Event* self) { +gchar* +event_get_raw_name (Event* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -6164,11 +6219,13 @@ gchar* event_get_raw_name (Event* self) { result = _tmp1_; #line 776 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6167 "Event.c" +#line 6222 "Event.c" } -static gchar* event_real_get_comment (EventSource* base) { +static gchar* +event_real_get_comment (EventSource* base) +{ Event * self; gchar* result = NULL; const gchar* _tmp0_; @@ -6183,93 +6240,90 @@ static gchar* event_real_get_comment (EventSource* base) { result = _tmp1_; #line 780 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6186 "Event.c" +#line 6243 "Event.c" } -gboolean event_rename (Event* self, const gchar* name) { +gboolean +event_rename (Event* self, + const gchar* name) +{ gboolean result = FALSE; gchar* new_name = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - gboolean _tmp5_; + gboolean _tmp4_; gboolean renamed = FALSE; - EventTable* _tmp7_; - EventID _tmp8_; - const gchar* _tmp9_; - gboolean _tmp10_; - gboolean _tmp11_; + EventTable* _tmp6_; + EventID _tmp7_; + const gchar* _tmp8_; + gboolean _tmp9_; #line 783 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT (self), FALSE); #line 784 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = name; -#line 784 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = event_prep_event_name (_tmp0_); + _tmp0_ = event_prep_event_name (name); #line 784 "/home/jens/Source/shotwell/src/Event.vala" - new_name = _tmp1_; + new_name = _tmp0_; #line 787 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = new_name; + _tmp1_ = new_name; #line 787 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = event_get_formatted_daterange (self); + _tmp2_ = event_get_formatted_daterange (self); #line 787 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 787 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = g_strcmp0 (_tmp2_, _tmp4_) == 0; + _tmp4_ = g_strcmp0 (_tmp1_, _tmp3_) == 0; #line 787 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 787 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp5_) { -#line 6225 "Event.c" - gchar* _tmp6_; + if (_tmp4_) { +#line 6281 "Event.c" + gchar* _tmp5_; #line 788 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = g_strdup (""); + _tmp5_ = g_strdup (""); #line 788 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (new_name); #line 788 "/home/jens/Source/shotwell/src/Event.vala" - new_name = _tmp6_; -#line 6233 "Event.c" + new_name = _tmp5_; +#line 6289 "Event.c" } #line 791 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = event_event_table; + _tmp6_ = event_event_table; #line 791 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = self->priv->event_id; + _tmp7_ = self->priv->event_id; #line 791 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = new_name; + _tmp8_ = new_name; #line 791 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = event_table_rename (_tmp7_, &_tmp8_, _tmp9_); -#line 791 "/home/jens/Source/shotwell/src/Event.vala" - renamed = _tmp10_; + renamed = event_table_rename (_tmp6_, &_tmp7_, _tmp8_); #line 792 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = renamed; + _tmp9_ = renamed; #line 792 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp11_) { -#line 6249 "Event.c" - const gchar* _tmp12_; - gchar* _tmp13_; - Alteration* _tmp14_; - Alteration* _tmp15_; + if (_tmp9_) { +#line 6303 "Event.c" + const gchar* _tmp10_; + gchar* _tmp11_; + Alteration* _tmp12_; + Alteration* _tmp13_; #line 793 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = new_name; + _tmp10_ = new_name; #line 793 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = g_strdup (_tmp12_); + _tmp11_ = g_strdup (_tmp10_); #line 793 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (self->priv->raw_name); #line 793 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->raw_name = _tmp13_; + self->priv->raw_name = _tmp11_; #line 794 "/home/jens/Source/shotwell/src/Event.vala" event_update_indexable_keywords (self); #line 795 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = alteration_new_from_list ("metadata:name, indexable:keywords"); + _tmp12_ = alteration_new_from_list ("metadata:name, indexable:keywords"); #line 795 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = _tmp14_; + _tmp13_ = _tmp12_; #line 795 "/home/jens/Source/shotwell/src/Event.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_); #line 795 "/home/jens/Source/shotwell/src/Event.vala" - _alteration_unref0 (_tmp15_); -#line 6272 "Event.c" + _alteration_unref0 (_tmp13_); +#line 6326 "Event.c" } #line 798 "/home/jens/Source/shotwell/src/Event.vala" result = renamed; @@ -6277,68 +6331,65 @@ gboolean event_rename (Event* self, const gchar* name) { _g_free0 (new_name); #line 798 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6280 "Event.c" +#line 6334 "Event.c" } -static gboolean event_real_set_comment (EventSource* base, const gchar* comment) { +static gboolean +event_real_set_comment (EventSource* base, + const gchar* comment) +{ Event * self; gboolean result = FALSE; gchar* new_comment = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; gboolean committed = FALSE; - EventTable* _tmp2_; - EventID _tmp3_; - const gchar* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; + EventTable* _tmp1_; + EventID _tmp2_; + const gchar* _tmp3_; + gboolean _tmp4_; #line 801 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 802 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = comment; -#line 802 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = media_source_prep_comment (_tmp0_); + _tmp0_ = media_source_prep_comment (comment); #line 802 "/home/jens/Source/shotwell/src/Event.vala" - new_comment = _tmp1_; + new_comment = _tmp0_; #line 804 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = event_event_table; + _tmp1_ = event_event_table; #line 804 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = self->priv->event_id; + _tmp2_ = self->priv->event_id; #line 804 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = new_comment; + _tmp3_ = new_comment; #line 804 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = event_table_set_comment (_tmp2_, &_tmp3_, _tmp4_); -#line 804 "/home/jens/Source/shotwell/src/Event.vala" - committed = _tmp5_; + committed = event_table_set_comment (_tmp1_, &_tmp2_, _tmp3_); #line 805 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = committed; + _tmp4_ = committed; #line 805 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp6_) { -#line 6318 "Event.c" - const gchar* _tmp7_; - gchar* _tmp8_; - Alteration* _tmp9_; - Alteration* _tmp10_; + if (_tmp4_) { +#line 6369 "Event.c" + const gchar* _tmp5_; + gchar* _tmp6_; + Alteration* _tmp7_; + Alteration* _tmp8_; #line 806 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = new_comment; + _tmp5_ = new_comment; #line 806 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = g_strdup (_tmp7_); + _tmp6_ = g_strdup (_tmp5_); #line 806 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (self->priv->comment); #line 806 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->comment = _tmp8_; + self->priv->comment = _tmp6_; #line 807 "/home/jens/Source/shotwell/src/Event.vala" event_update_indexable_keywords (self); #line 808 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = alteration_new_from_list ("metadata:comment, indexable:keywords"); + _tmp7_ = alteration_new_from_list ("metadata:comment, indexable:keywords"); #line 808 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 808 "/home/jens/Source/shotwell/src/Event.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp10_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp8_); #line 808 "/home/jens/Source/shotwell/src/Event.vala" - _alteration_unref0 (_tmp10_); -#line 6341 "Event.c" + _alteration_unref0 (_tmp8_); +#line 6392 "Event.c" } #line 811 "/home/jens/Source/shotwell/src/Event.vala" result = committed; @@ -6346,15 +6397,16 @@ static gboolean event_real_set_comment (EventSource* base, const gchar* comment) _g_free0 (new_comment); #line 811 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6349 "Event.c" +#line 6400 "Event.c" } -time_t event_get_creation_time (Event* self) { +time_t +event_get_creation_time (Event* self) +{ time_t result = 0; EventTable* _tmp0_; EventID _tmp1_; - time_t _tmp2_; #line 814 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT (self), 0); #line 815 "/home/jens/Source/shotwell/src/Event.vala" @@ -6362,107 +6414,101 @@ time_t event_get_creation_time (Event* self) { #line 815 "/home/jens/Source/shotwell/src/Event.vala" _tmp1_ = self->priv->event_id; #line 815 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = event_table_get_time_created (_tmp0_, &_tmp1_); -#line 815 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp2_; + result = event_table_get_time_created (_tmp0_, &_tmp1_); #line 815 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6370 "Event.c" +#line 6420 "Event.c" } -static time_t event_real_get_start_time (EventSource* base) { +static time_t +event_real_get_start_time (EventSource* base) +{ Event * self; time_t result = 0; gint count = 0; ViewCollection* _tmp0_; - gint _tmp1_; #line 818 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 821 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = self->priv->view; #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 821 "/home/jens/Source/shotwell/src/Event.vala" - count = _tmp1_; -#line 6388 "Event.c" + count = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); +#line 6437 "Event.c" { gint i = 0; #line 822 "/home/jens/Source/shotwell/src/Event.vala" i = 0; -#line 6393 "Event.c" +#line 6442 "Event.c" { - gboolean _tmp2_ = FALSE; + gboolean _tmp1_ = FALSE; #line 822 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = TRUE; + _tmp1_ = TRUE; #line 822 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 6400 "Event.c" +#line 6449 "Event.c" + gint _tmp3_; gint _tmp4_; - gint _tmp5_; time_t time = 0; - ViewCollection* _tmp6_; - gint _tmp7_; - DataObject* _tmp8_; - DataView* _tmp9_; - DataSource* _tmp10_; - MediaSource* _tmp11_; + ViewCollection* _tmp5_; + gint _tmp6_; + DataObject* _tmp7_; + DataView* _tmp8_; + DataSource* _tmp9_; + MediaSource* _tmp10_; + time_t _tmp11_; time_t _tmp12_; - time_t _tmp13_; - time_t _tmp14_; #line 822 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp2_) { -#line 6415 "Event.c" - gint _tmp3_; + if (!_tmp1_) { +#line 6463 "Event.c" + gint _tmp2_; #line 822 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = i; + _tmp2_ = i; #line 822 "/home/jens/Source/shotwell/src/Event.vala" - i = _tmp3_ + 1; -#line 6421 "Event.c" + i = _tmp2_ + 1; +#line 6469 "Event.c" } #line 822 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = FALSE; + _tmp1_ = FALSE; #line 822 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = i; + _tmp3_ = i; #line 822 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = count; + _tmp4_ = count; #line 822 "/home/jens/Source/shotwell/src/Event.vala" - if (!(_tmp4_ < _tmp5_)) { + if (!(_tmp3_ < _tmp4_)) { #line 822 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 6433 "Event.c" +#line 6481 "Event.c" } #line 823 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = self->priv->view; + _tmp5_ = self->priv->view; #line 823 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = i; + _tmp6_ = i; #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_); + _tmp7_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), _tmp6_); #line 823 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView); + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_VIEW, DataView); #line 823 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = data_view_get_source (_tmp9_); + _tmp9_ = data_view_get_source (_tmp8_); #line 823 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource); #line 823 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = media_source_get_exposure_time (_tmp11_); + _tmp11_ = media_source_get_exposure_time (_tmp10_); #line 823 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = _tmp12_; + _g_object_unref0 (_tmp10_); #line 823 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp8_); #line 823 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp9_); -#line 823 "/home/jens/Source/shotwell/src/Event.vala" - time = _tmp13_; + time = _tmp11_; #line 824 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = time; + _tmp12_ = time; #line 824 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp14_ != ((time_t) 0)) { + if (_tmp12_ != ((time_t) 0)) { #line 825 "/home/jens/Source/shotwell/src/Event.vala" result = time; #line 825 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6465 "Event.c" +#line 6511 "Event.c" } } } @@ -6471,72 +6517,70 @@ static time_t event_real_get_start_time (EventSource* base) { result = (time_t) 0; #line 828 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6474 "Event.c" +#line 6520 "Event.c" } -static time_t event_real_get_end_time (EventSource* base) { +static time_t +event_real_get_end_time (EventSource* base) +{ Event * self; time_t result = 0; gint count = 0; ViewCollection* _tmp0_; gint _tmp1_; - gint _tmp2_; - ViewCollection* _tmp3_; - gint _tmp4_; - DataObject* _tmp5_; - DataView* _tmp6_; - DataSource* _tmp7_; - MediaSource* _tmp8_; - time_t _tmp9_; - time_t _tmp10_; + ViewCollection* _tmp2_; + gint _tmp3_; + DataObject* _tmp4_; + DataView* _tmp5_; + DataSource* _tmp6_; + MediaSource* _tmp7_; + time_t _tmp8_; #line 831 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 832 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = self->priv->view; #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 832 "/home/jens/Source/shotwell/src/Event.vala" - count = _tmp1_; + count = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); #line 836 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = count; + _tmp1_ = count; #line 836 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 837 "/home/jens/Source/shotwell/src/Event.vala" result = (time_t) 0; #line 837 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6509 "Event.c" +#line 6553 "Event.c" } #line 839 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = self->priv->view; -#line 839 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = count; + _tmp2_ = self->priv->view; #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); + _tmp3_ = count; #line 839 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_VIEW, DataView); + _tmp4_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), _tmp3_ - 1); #line 839 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = data_view_get_source (_tmp6_); + _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_VIEW, DataView); #line 839 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp6_ = data_view_get_source (_tmp5_); #line 839 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = media_source_get_exposure_time (_tmp8_); + _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource); #line 839 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = _tmp9_; + _tmp8_ = media_source_get_exposure_time (_tmp7_); #line 839 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 839 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp5_); #line 839 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp10_; + result = _tmp8_; #line 839 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6535 "Event.c" +#line 6577 "Event.c" } -static guint64 event_real_get_total_filesize (EventSource* base) { +static guint64 +event_real_get_total_filesize (EventSource* base) +{ Event * self; guint64 result = 0ULL; guint64 total = 0ULL; @@ -6544,7 +6588,7 @@ static guint64 event_real_get_total_filesize (EventSource* base) { self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 843 "/home/jens/Source/shotwell/src/Event.vala" total = (guint64) 0; -#line 6547 "Event.c" +#line 6591 "Event.c" { GeeIterator* _current_source_it = NULL; GeeCollection* _tmp0_; @@ -6565,75 +6609,70 @@ static guint64 event_real_get_total_filesize (EventSource* base) { _current_source_it = _tmp3_; #line 844 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 6568 "Event.c" +#line 6612 "Event.c" GeeIterator* _tmp4_; - gboolean _tmp5_; MediaSource* current_source = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - guint64 _tmp8_; - MediaSource* _tmp9_; - guint64 _tmp10_; + GeeIterator* _tmp5_; + gpointer _tmp6_; + guint64 _tmp7_; + MediaSource* _tmp8_; #line 844 "/home/jens/Source/shotwell/src/Event.vala" _tmp4_ = _current_source_it; #line 844 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 844 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp4_)) { #line 844 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 6585 "Event.c" +#line 6625 "Event.c" } #line 844 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = _current_source_it; + _tmp5_ = _current_source_it; #line 844 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 844 "/home/jens/Source/shotwell/src/Event.vala" - current_source = (MediaSource*) _tmp7_; -#line 845 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = total; + current_source = (MediaSource*) _tmp6_; #line 845 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = current_source; + _tmp7_ = total; #line 845 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = media_source_get_filesize (_tmp9_); + _tmp8_ = current_source; #line 845 "/home/jens/Source/shotwell/src/Event.vala" - total = _tmp8_ + _tmp10_; + total = _tmp7_ + media_source_get_filesize (_tmp8_); #line 844 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (current_source); -#line 6603 "Event.c" +#line 6641 "Event.c" } #line 844 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_current_source_it); -#line 6607 "Event.c" +#line 6645 "Event.c" } #line 848 "/home/jens/Source/shotwell/src/Event.vala" result = total; #line 848 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6613 "Event.c" +#line 6651 "Event.c" } -static gint event_real_get_media_count (EventSource* base) { +static gint +event_real_get_media_count (EventSource* base) +{ Event * self; gint result = 0; ViewCollection* _tmp0_; - gint _tmp1_; #line 851 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 852 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = self->priv->view; #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 852 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp1_; + result = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); #line 852 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6632 "Event.c" +#line 6669 "Event.c" } -static GeeCollection* event_real_get_media (EventSource* base) { +static GeeCollection* +event_real_get_media (EventSource* base) +{ Event * self; GeeCollection* result = NULL; ViewCollection* _tmp0_; @@ -6648,43 +6687,43 @@ static GeeCollection* event_real_get_media (EventSource* base) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); #line 856 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6651 "Event.c" +#line 6690 "Event.c" } -void event_mirror_photos (Event* self, ViewCollection* view, CreateView mirroring_ctor, void* mirroring_ctor_target) { +void +event_mirror_photos (Event* self, + ViewCollection* view, + CreateView mirroring_ctor, + void* mirroring_ctor_target) +{ ViewCollection* _tmp0_; - ViewCollection* _tmp1_; - CreateView _tmp2_; - void* _tmp2__target; #line 859 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); #line 859 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_VIEW_COLLECTION (view)); #line 860 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = view; -#line 860 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = self->priv->view; -#line 860 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = mirroring_ctor; -#line 860 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2__target = mirroring_ctor_target; + _tmp0_ = self->priv->view; #line 860 "/home/jens/Source/shotwell/src/Event.vala" - view_collection_mirror (_tmp0_, _tmp1_, _tmp2_, _tmp2__target, NULL, NULL); -#line 6674 "Event.c" + view_collection_mirror (view, _tmp0_, mirroring_ctor, mirroring_ctor_target, NULL, NULL); +#line 6709 "Event.c" } -static void event_on_primary_thumbnail_altered (Event* self) { +static void +event_on_primary_thumbnail_altered (Event* self) +{ #line 863 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); #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 6683 "Event.c" +#line 6720 "Event.c" } -MediaSource* event_get_primary_source (Event* self) { +MediaSource* +event_get_primary_source (Event* self) +{ MediaSource* result = NULL; MediaSource* _tmp0_; MediaSource* _tmp1_; @@ -6698,24 +6737,23 @@ MediaSource* event_get_primary_source (Event* self) { result = _tmp1_; #line 868 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6701 "Event.c" +#line 6740 "Event.c" } -gboolean event_set_primary_source (Event* self, MediaSource* source) { +gboolean +event_set_primary_source (Event* self, + MediaSource* source) +{ gboolean result = FALSE; ViewCollection* _tmp0_; - MediaSource* _tmp1_; - gboolean _tmp2_; gboolean committed = FALSE; - EventTable* _tmp3_; - EventID _tmp4_; - MediaSource* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - gboolean _tmp8_; - gboolean _tmp9_; - gboolean _tmp10_; + EventTable* _tmp1_; + EventID _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gboolean _tmp5_; + gboolean _tmp6_; #line 871 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT (self), FALSE); #line 871 "/home/jens/Source/shotwell/src/Event.vala" @@ -6723,78 +6761,69 @@ gboolean event_set_primary_source (Event* self, MediaSource* source) { #line 872 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = self->priv->view; #line 872 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = source; -#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 872 "/home/jens/Source/shotwell/src/Event.vala" - _vala_assert (_tmp2_, "view.has_view_for_source(source)"); + _vala_assert (view_collection_has_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)), "view.has_view_for_source(source)"); #line 874 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = event_event_table; + _tmp1_ = event_event_table; #line 874 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = self->priv->event_id; + _tmp2_ = self->priv->event_id; #line 874 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = source; + _tmp3_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #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 874 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = _tmp6_; -#line 874 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = event_table_set_primary_source_id (_tmp3_, &_tmp4_, _tmp7_); + _tmp4_ = _tmp3_; #line 874 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = _tmp8_; + _tmp5_ = event_table_set_primary_source_id (_tmp1_, &_tmp2_, _tmp4_); #line 874 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp4_); #line 874 "/home/jens/Source/shotwell/src/Event.vala" - committed = _tmp9_; + committed = _tmp5_; #line 875 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = committed; + _tmp6_ = committed; #line 875 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp10_) { -#line 6753 "Event.c" + if (_tmp6_) { +#line 6783 "Event.c" + MediaSource* _tmp7_; + MediaSource* _tmp10_; MediaSource* _tmp11_; - MediaSource* _tmp14_; - MediaSource* _tmp15_; - MediaSource* _tmp16_; #line 877 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = self->priv->primary_source; + _tmp7_ = self->priv->primary_source; #line 877 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp11_ != NULL) { -#line 6762 "Event.c" - MediaSource* _tmp12_; - guint _tmp13_; + if (_tmp7_ != NULL) { +#line 6791 "Event.c" + MediaSource* _tmp8_; + guint _tmp9_; #line 878 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = self->priv->primary_source; + _tmp8_ = self->priv->primary_source; #line 878 "/home/jens/Source/shotwell/src/Event.vala" - g_signal_parse_name ("thumbnail-altered", TYPE_THUMBNAIL_SOURCE, &_tmp13_, NULL, FALSE); + g_signal_parse_name ("thumbnail-altered", TYPE_THUMBNAIL_SOURCE, &_tmp9_, NULL, FALSE); #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 6771 "Event.c" + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered, self); +#line 6800 "Event.c" } #line 880 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = source; -#line 880 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = _g_object_ref0 (_tmp14_); + _tmp10_ = _g_object_ref0 (source); #line 880 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (self->priv->primary_source); #line 880 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->primary_source = _tmp15_; + self->priv->primary_source = _tmp10_; #line 881 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = self->priv->primary_source; + _tmp11_ = self->priv->primary_source; #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); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, 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 6787 "Event.c" +#line 6814 "Event.c" } #line 886 "/home/jens/Source/shotwell/src/Event.vala" result = committed; #line 886 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6793 "Event.c" +#line 6820 "Event.c" } -static void event_release_primary_source (Event* self) { +static void +event_release_primary_source (Event* self) +{ MediaSource* _tmp0_; MediaSource* _tmp1_; guint _tmp2_; @@ -6806,7 +6835,7 @@ static void event_release_primary_source (Event* self) { if (_tmp0_ == NULL) { #line 891 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 6809 "Event.c" +#line 6838 "Event.c" } #line 893 "/home/jens/Source/shotwell/src/Event.vala" _tmp1_ = self->priv->primary_source; @@ -6818,11 +6847,15 @@ static void event_release_primary_source (Event* self) { _g_object_unref0 (self->priv->primary_source); #line 894 "/home/jens/Source/shotwell/src/Event.vala" self->priv->primary_source = NULL; -#line 6821 "Event.c" +#line 6850 "Event.c" } -static GdkPixbuf* event_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error) { +static GdkPixbuf* +event_real_get_thumbnail (ThumbnailSource* base, + gint scale, + GError** error) +{ Event * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; @@ -6834,20 +6867,17 @@ static GdkPixbuf* event_real_get_thumbnail (ThumbnailSource* base, gint scale, G _tmp1_ = self->priv->primary_source; #line 898 "/home/jens/Source/shotwell/src/Event.vala" if (_tmp1_ != NULL) { -#line 6837 "Event.c" +#line 6870 "Event.c" MediaSource* _tmp2_; - gint _tmp3_; - GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp3_; #line 898 "/home/jens/Source/shotwell/src/Event.vala" _tmp2_ = self->priv->primary_source; #line 898 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = scale; -#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_); + _tmp3_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), scale, &_inner_error_); #line 898 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_tmp0_); #line 898 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 898 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 898 "/home/jens/Source/shotwell/src/Event.vala" @@ -6856,31 +6886,34 @@ static GdkPixbuf* event_real_get_thumbnail (ThumbnailSource* base, gint scale, G _g_object_unref0 (_tmp0_); #line 898 "/home/jens/Source/shotwell/src/Event.vala" return NULL; -#line 6859 "Event.c" +#line 6889 "Event.c" } } else { #line 898 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_tmp0_); #line 898 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = NULL; -#line 6866 "Event.c" +#line 6896 "Event.c" } #line 898 "/home/jens/Source/shotwell/src/Event.vala" result = _tmp0_; #line 898 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6872 "Event.c" +#line 6902 "Event.c" } -GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) { +GdkPixbuf* +event_get_preview_pixbuf (Event* self, + Scaling* scaling) +{ GdkPixbuf* result = NULL; GError * _inner_error_ = NULL; #line 901 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT (self), NULL); #line 901 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 6883 "Event.c" +#line 6916 "Event.c" { GdkPixbuf* _tmp0_ = NULL; MediaSource* _tmp1_; @@ -6905,7 +6938,7 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) { _tmp0_ = _tmp5_; #line 903 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6908 "Event.c" +#line 6941 "Event.c" goto __catch450_g_error; } #line 903 "/home/jens/Source/shotwell/src/Event.vala" @@ -6918,7 +6951,7 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) { _g_object_unref0 (_tmp0_); #line 903 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6921 "Event.c" +#line 6954 "Event.c" } goto __finally450; __catch450_g_error: @@ -6934,7 +6967,7 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) { _g_error_free0 (err); #line 905 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6937 "Event.c" +#line 6970 "Event.c" } __finally450: #line 902 "/home/jens/Source/shotwell/src/Event.vala" @@ -6943,11 +6976,13 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) { g_clear_error (&_inner_error_); #line 902 "/home/jens/Source/shotwell/src/Event.vala" return NULL; -#line 6946 "Event.c" +#line 6979 "Event.c" } -static void event_real_destroy (DataSource* base) { +static void +event_real_destroy (DataSource* base) +{ Event * self; ViewCollection* _tmp0_; PhotoTable* _tmp4_; @@ -6963,7 +6998,7 @@ static void event_real_destroy (DataSource* base) { _tmp0_ = self->priv->view; #line 911 "/home/jens/Source/shotwell/src/Event.vala" view_collection_halt_all_monitoring (_tmp0_); -#line 6966 "Event.c" +#line 7001 "Event.c" { EventTable* _tmp1_; EventID _tmp2_; @@ -6977,7 +7012,7 @@ static void event_real_destroy (DataSource* base) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 915 "/home/jens/Source/shotwell/src/Event.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6980 "Event.c" +#line 7015 "Event.c" goto __catch451_database_error; } #line 915 "/home/jens/Source/shotwell/src/Event.vala" @@ -6986,7 +7021,7 @@ static void event_real_destroy (DataSource* base) { g_clear_error (&_inner_error_); #line 915 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 6989 "Event.c" +#line 7024 "Event.c" } } goto __finally451; @@ -7004,7 +7039,7 @@ static void event_real_destroy (DataSource* base) { app_window_database_error (_tmp3_); #line 914 "/home/jens/Source/shotwell/src/Event.vala" _g_error_free0 (err); -#line 7007 "Event.c" +#line 7042 "Event.c" } __finally451: #line 914 "/home/jens/Source/shotwell/src/Event.vala" @@ -7015,7 +7050,7 @@ static void event_real_destroy (DataSource* base) { g_clear_error (&_inner_error_); #line 914 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 7018 "Event.c" +#line 7053 "Event.c" } #line 921 "/home/jens/Source/shotwell/src/Event.vala" _tmp4_ = photo_table_get_instance (); @@ -7039,28 +7074,33 @@ static void event_real_destroy (DataSource* base) { _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 7042 "Event.c" +#line 7077 "Event.c" } -static void _event_event_snapshot_on_attached_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +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 7049 "Event.c" +#line 7088 "Event.c" } -static EventEventSnapshot* event_event_snapshot_construct (GType object_type, Event* event) { +static EventEventSnapshot* +event_event_snapshot_construct (GType object_type, + Event* event) +{ EventEventSnapshot* self = NULL; EventTable* _tmp0_; EventTable* _tmp1_; - Event* _tmp2_; - EventID _tmp3_ = {0}; - EventRow* _tmp4_; - Event* _tmp5_; - MediaSource* _tmp6_; - LibraryPhotoSourceCollection* _tmp18_; - VideoSourceCollection* _tmp19_; + EventID _tmp2_ = {0}; + EventRow* _tmp3_; + MediaSource* _tmp4_; + LibraryPhotoSourceCollection* _tmp14_; + VideoSourceCollection* _tmp15_; #line 110 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT (event), NULL); #line 110 "/home/jens/Source/shotwell/src/Event.vala" @@ -7070,116 +7110,112 @@ static EventEventSnapshot* event_event_snapshot_construct (GType object_type, Ev #line 112 "/home/jens/Source/shotwell/src/Event.vala" _tmp1_ = _tmp0_; #line 112 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = event; -#line 112 "/home/jens/Source/shotwell/src/Event.vala" - event_get_event_id (_tmp2_, &_tmp3_); + event_get_event_id (event, &_tmp2_); #line 112 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = event_table_get_row (_tmp1_, &_tmp3_); + _tmp3_ = event_table_get_row (_tmp1_, &_tmp2_); #line 112 "/home/jens/Source/shotwell/src/Event.vala" _event_row_unref0 (self->priv->row); #line 112 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->row = _tmp4_; + self->priv->row = _tmp3_; #line 112 "/home/jens/Source/shotwell/src/Event.vala" _database_table_unref0 (_tmp1_); #line 113 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = event; -#line 113 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = event_get_primary_source (_tmp5_); + _tmp4_ = event_get_primary_source (event); #line 113 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (self->priv->primary_source); #line 113 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->primary_source = _tmp6_; -#line 7092 "Event.c" + self->priv->primary_source = _tmp4_; +#line 7128 "Event.c" { GeeIterator* _source_it = NULL; - Event* _tmp7_; - GeeCollection* _tmp8_; - GeeCollection* _tmp9_; - GeeIterator* _tmp10_; - GeeIterator* _tmp11_; -#line 118 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = event; + GeeCollection* _tmp5_; + GeeCollection* _tmp6_; + GeeIterator* _tmp7_; + GeeIterator* _tmp8_; #line 118 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_EVENT_SOURCE, EventSource)); + _tmp5_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_EVENT_SOURCE, EventSource)); #line 118 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 118 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 118 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 118 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp6_); #line 118 "/home/jens/Source/shotwell/src/Event.vala" - _source_it = _tmp11_; + _source_it = _tmp8_; #line 118 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 7116 "Event.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 7149 "Event.c" + GeeIterator* _tmp9_; MediaSource* source = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; - GeeArrayList* _tmp16_; - MediaSource* _tmp17_; -#line 118 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = _source_it; + GeeIterator* _tmp10_; + gpointer _tmp11_; + GeeArrayList* _tmp12_; + MediaSource* _tmp13_; #line 118 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = gee_iterator_next (_tmp12_); + _tmp9_ = _source_it; #line 118 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp9_)) { #line 118 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 7132 "Event.c" +#line 7162 "Event.c" } #line 118 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = _source_it; + _tmp10_ = _source_it; #line 118 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp11_ = gee_iterator_get (_tmp10_); #line 118 "/home/jens/Source/shotwell/src/Event.vala" - source = (MediaSource*) _tmp15_; + source = (MediaSource*) _tmp11_; #line 119 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = self->priv->attached_sources; + _tmp12_ = self->priv->attached_sources; #line 119 "/home/jens/Source/shotwell/src/Event.vala" - _tmp17_ = source; + _tmp13_ = source; #line 119 "/home/jens/Source/shotwell/src/Event.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_); #line 118 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (source); -#line 7148 "Event.c" +#line 7178 "Event.c" } #line 118 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_source_it); -#line 7152 "Event.c" +#line 7182 "Event.c" } #line 121 "/home/jens/Source/shotwell/src/Event.vala" - _tmp18_ = library_photo_global; + _tmp14_ = library_photo_global; #line 121 "/home/jens/Source/shotwell/src/Event.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _event_event_snapshot_on_attached_source_destroyed_source_collection_item_destroyed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _event_event_snapshot_on_attached_source_destroyed_source_collection_item_destroyed, self); #line 122 "/home/jens/Source/shotwell/src/Event.vala" - _tmp19_ = video_global; + _tmp15_ = video_global; #line 122 "/home/jens/Source/shotwell/src/Event.vala" - 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); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, 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 7164 "Event.c" +#line 7194 "Event.c" } -static EventEventSnapshot* event_event_snapshot_new (Event* event) { +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 7171 "Event.c" +#line 7203 "Event.c" } -static gpointer _event_row_ref0 (gpointer self) { +static gpointer +_event_row_ref0 (gpointer self) +{ #line 131 "/home/jens/Source/shotwell/src/Event.vala" return self ? event_row_ref (self) : NULL; -#line 7178 "Event.c" +#line 7212 "Event.c" } -static EventRow* event_event_snapshot_get_row (EventEventSnapshot* self) { +static EventRow* +event_event_snapshot_get_row (EventEventSnapshot* self) +{ EventRow* result = NULL; EventRow* _tmp0_; EventRow* _tmp1_; @@ -7193,11 +7229,13 @@ static EventRow* event_event_snapshot_get_row (EventEventSnapshot* self) { result = _tmp1_; #line 131 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 7196 "Event.c" +#line 7232 "Event.c" } -static void event_event_snapshot_real_notify_broken (SourceSnapshot* base) { +static void +event_event_snapshot_real_notify_broken (SourceSnapshot* base) +{ EventEventSnapshot * self; EventRow* _tmp0_; GeeArrayList* _tmp1_; @@ -7219,77 +7257,73 @@ 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 7222 "Event.c" +#line 7260 "Event.c" } -static void event_event_snapshot_on_attached_source_destroyed (EventEventSnapshot* self, DataSource* source) { +static void +event_event_snapshot_on_attached_source_destroyed (EventEventSnapshot* self, + DataSource* source) +{ MediaSource* media_source = NULL; - DataSource* _tmp0_; - MediaSource* _tmp1_; - gboolean _tmp2_ = FALSE; - MediaSource* _tmp3_; + MediaSource* _tmp0_; + gboolean _tmp1_ = FALSE; + MediaSource* _tmp2_; #line 142 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (EVENT_IS_EVENT_SNAPSHOT (self)); #line 142 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 143 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = source; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource)); #line 143 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 143 "/home/jens/Source/shotwell/src/Event.vala" - media_source = _tmp1_; + media_source = _tmp0_; #line 146 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = media_source; + _tmp2_ = media_source; #line 146 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp3_ != NULL) { -#line 7246 "Event.c" + if (_tmp2_ != NULL) { +#line 7284 "Event.c" + MediaSource* _tmp3_; MediaSource* _tmp4_; - MediaSource* _tmp5_; - gboolean _tmp6_; #line 146 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = self->priv->primary_source; + _tmp3_ = self->priv->primary_source; #line 146 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = media_source; + _tmp4_ = media_source; #line 146 "/home/jens/Source/shotwell/src/Event.vala" - _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 7258 "Event.c" + _tmp1_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource)); +#line 7293 "Event.c" } else { #line 146 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = FALSE; -#line 7262 "Event.c" + _tmp1_ = FALSE; +#line 7297 "Event.c" } #line 146 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp2_) { + if (_tmp1_) { #line 147 "/home/jens/Source/shotwell/src/Event.vala" source_snapshot_notify_broken (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_SNAPSHOT, SourceSnapshot)); -#line 7268 "Event.c" +#line 7303 "Event.c" } else { - GeeArrayList* _tmp7_; - MediaSource* _tmp8_; - gboolean _tmp9_; -#line 148 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = self->priv->attached_sources; + GeeArrayList* _tmp5_; + MediaSource* _tmp6_; #line 148 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = media_source; + _tmp5_ = self->priv->attached_sources; #line 148 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_); + _tmp6_ = media_source; #line 148 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp9_) { + if (gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp6_)) { #line 149 "/home/jens/Source/shotwell/src/Event.vala" source_snapshot_notify_broken (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_SNAPSHOT, SourceSnapshot)); -#line 7283 "Event.c" +#line 7315 "Event.c" } } #line 142 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (media_source); -#line 7288 "Event.c" +#line 7320 "Event.c" } -static void event_event_snapshot_class_init (EventEventSnapshotClass * klass) { +static void +event_event_snapshot_class_init (EventEventSnapshotClass * klass) +{ #line 105 "/home/jens/Source/shotwell/src/Event.vala" event_event_snapshot_parent_class = g_type_class_peek_parent (klass); #line 105 "/home/jens/Source/shotwell/src/Event.vala" @@ -7298,11 +7332,13 @@ 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 = (void (*) (SourceSnapshot *)) event_event_snapshot_real_notify_broken; -#line 7301 "Event.c" +#line 7335 "Event.c" } -static void event_event_snapshot_instance_init (EventEventSnapshot * self) { +static void +event_event_snapshot_instance_init (EventEventSnapshot * self) +{ GeeArrayList* _tmp0_; #line 105 "/home/jens/Source/shotwell/src/Event.vala" self->priv = EVENT_EVENT_SNAPSHOT_GET_PRIVATE (self); @@ -7310,11 +7346,13 @@ static void event_event_snapshot_instance_init (EventEventSnapshot * self) { _tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 108 "/home/jens/Source/shotwell/src/Event.vala" self->priv->attached_sources = _tmp0_; -#line 7313 "Event.c" +#line 7349 "Event.c" } -static void event_event_snapshot_finalize (SourceSnapshot * obj) { +static void +event_event_snapshot_finalize (SourceSnapshot * obj) +{ EventEventSnapshot * self; LibraryPhotoSourceCollection* _tmp0_; guint _tmp1_; @@ -7342,11 +7380,13 @@ 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 7345 "Event.c" +#line 7383 "Event.c" } -static GType event_event_snapshot_get_type (void) { +static GType +event_event_snapshot_get_type (void) +{ static volatile gsize event_event_snapshot_type_id__volatile = 0; if (g_once_init_enter (&event_event_snapshot_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventEventSnapshotClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_event_snapshot_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventEventSnapshot), 0, (GInstanceInitFunc) event_event_snapshot_instance_init, NULL }; @@ -7358,94 +7398,102 @@ static GType event_event_snapshot_get_type (void) { } -static EventEventProxy* event_event_proxy_construct (GType object_type, Event* event) { +static EventEventProxy* +event_event_proxy_construct (GType object_type, + Event* event) +{ EventEventProxy* self = NULL; - Event* _tmp0_; #line 154 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT (event), NULL); #line 155 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = event; -#line 155 "/home/jens/Source/shotwell/src/Event.vala" - self = (EventEventProxy*) source_proxy_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource)); + self = (EventEventProxy*) source_proxy_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_DATA_SOURCE, DataSource)); #line 154 "/home/jens/Source/shotwell/src/Event.vala" return self; -#line 7372 "Event.c" +#line 7412 "Event.c" } -static EventEventProxy* event_event_proxy_new (Event* event) { +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 7379 "Event.c" +#line 7421 "Event.c" } -static gpointer _source_snapshot_ref0 (gpointer self) { +static gpointer +_source_snapshot_ref0 (gpointer self) +{ #line 159 "/home/jens/Source/shotwell/src/Event.vala" return self ? source_snapshot_ref (self) : NULL; -#line 7386 "Event.c" +#line 7430 "Event.c" } -static DataSource* event_event_proxy_real_reconstitute (SourceProxy* base, gint64 object_id, SourceSnapshot* snapshot) { +static DataSource* +event_event_proxy_real_reconstitute (SourceProxy* base, + gint64 object_id, + SourceSnapshot* snapshot) +{ EventEventProxy * self; DataSource* result = NULL; EventEventSnapshot* event_snapshot = NULL; - SourceSnapshot* _tmp0_; - EventEventSnapshot* _tmp1_; - gint64 _tmp2_; - EventRow* _tmp3_; - EventRow* _tmp4_; - Event* _tmp5_; - DataSource* _tmp6_; + EventEventSnapshot* _tmp0_; + EventRow* _tmp1_; + EventRow* _tmp2_; + Event* _tmp3_; + DataSource* _tmp4_; #line 158 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENT_TYPE_EVENT_PROXY, EventEventProxy); #line 158 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_SOURCE_SNAPSHOT (snapshot), NULL); #line 159 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = snapshot; -#line 159 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = _source_snapshot_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EVENT_TYPE_EVENT_SNAPSHOT) ? ((EventEventSnapshot*) _tmp0_) : NULL); + _tmp0_ = _source_snapshot_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (snapshot, EVENT_TYPE_EVENT_SNAPSHOT) ? ((EventEventSnapshot*) snapshot) : NULL); #line 159 "/home/jens/Source/shotwell/src/Event.vala" - event_snapshot = _tmp1_; + event_snapshot = _tmp0_; #line 160 "/home/jens/Source/shotwell/src/Event.vala" _vala_assert (event_snapshot != NULL, "event_snapshot != null"); #line 162 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = object_id; + _tmp1_ = event_event_snapshot_get_row (event_snapshot); #line 162 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = event_event_snapshot_get_row (event_snapshot); -#line 162 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 162 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = event_reconstitute (_tmp2_, _tmp4_); + _tmp3_ = event_reconstitute (object_id, _tmp2_); #line 162 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_SOURCE, DataSource); + _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource); #line 162 "/home/jens/Source/shotwell/src/Event.vala" - _event_row_unref0 (_tmp4_); + _event_row_unref0 (_tmp2_); #line 162 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp6_; + result = _tmp4_; #line 162 "/home/jens/Source/shotwell/src/Event.vala" _source_snapshot_unref0 (event_snapshot); #line 162 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 7431 "Event.c" +#line 7473 "Event.c" } -static void event_event_proxy_class_init (EventEventProxyClass * klass) { +static void +event_event_proxy_class_init (EventEventProxyClass * klass) +{ #line 153 "/home/jens/Source/shotwell/src/Event.vala" event_event_proxy_parent_class = g_type_class_peek_parent (klass); #line 153 "/home/jens/Source/shotwell/src/Event.vala" ((SourceProxyClass *) klass)->reconstitute = (DataSource* (*) (SourceProxy *, gint64, SourceSnapshot*)) event_event_proxy_real_reconstitute; -#line 7440 "Event.c" +#line 7484 "Event.c" } -static void event_event_proxy_instance_init (EventEventProxy * self) { +static void +event_event_proxy_instance_init (EventEventProxy * self) +{ } -static GType event_event_proxy_get_type (void) { +static GType +event_event_proxy_get_type (void) +{ static volatile gsize event_event_proxy_type_id__volatile = 0; if (g_once_init_enter (&event_event_proxy_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventEventProxyClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_event_proxy_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventEventProxy), 0, (GInstanceInitFunc) event_event_proxy_instance_init, NULL }; @@ -7457,7 +7505,9 @@ static GType event_event_proxy_get_type (void) { } -static void event_class_init (EventClass * klass) { +static void +event_class_init (EventClass * klass) +{ #line 94 "/home/jens/Source/shotwell/src/Event.vala" event_parent_class = g_type_class_peek_parent (klass); #line 94 "/home/jens/Source/shotwell/src/Event.vala" @@ -7502,11 +7552,13 @@ static void event_class_init (EventClass * klass) { ((DataSourceClass *) klass)->destroy = (void (*) (DataSource *)) event_real_destroy; #line 94 "/home/jens/Source/shotwell/src/Event.vala" G_OBJECT_CLASS (klass)->finalize = event_finalize; -#line 7505 "Event.c" +#line 7555 "Event.c" } -static void event_container_source_interface_init (ContainerSourceIface * iface) { +static void +event_container_source_interface_init (ContainerSourceIface * iface) +{ #line 94 "/home/jens/Source/shotwell/src/Event.vala" event_container_source_parent_iface = g_type_interface_peek_parent (iface); #line 94 "/home/jens/Source/shotwell/src/Event.vala" @@ -7521,29 +7573,35 @@ 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 7524 "Event.c" +#line 7576 "Event.c" } -static void event_proxyable_interface_init (ProxyableIface * iface) { +static void +event_proxyable_interface_init (ProxyableIface * iface) +{ #line 94 "/home/jens/Source/shotwell/src/Event.vala" 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 7533 "Event.c" +#line 7587 "Event.c" } -static void event_indexable_interface_init (IndexableIface * iface) { +static void +event_indexable_interface_init (IndexableIface * iface) +{ #line 94 "/home/jens/Source/shotwell/src/Event.vala" 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 7542 "Event.c" +#line 7598 "Event.c" } -static void event_instance_init (Event * self) { +static void +event_instance_init (Event * self) +{ #line 94 "/home/jens/Source/shotwell/src/Event.vala" self->priv = EVENT_GET_PRIVATE (self); #line 175 "/home/jens/Source/shotwell/src/Event.vala" @@ -7554,11 +7612,13 @@ 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 7557 "Event.c" +#line 7615 "Event.c" } -static void event_finalize (GObject * obj) { +static void +event_finalize (GObject * obj) +{ Event * self; MediaSource* _tmp0_; ViewCollection* _tmp3_; @@ -7577,7 +7637,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 7580 "Event.c" +#line 7640 "Event.c" MediaSource* _tmp1_; guint _tmp2_; #line 238 "/home/jens/Source/shotwell/src/Event.vala" @@ -7586,7 +7646,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 7589 "Event.c" +#line 7649 "Event.c" } #line 240 "/home/jens/Source/shotwell/src/Event.vala" _tmp3_ = self->priv->view; @@ -7630,11 +7690,13 @@ 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 7633 "Event.c" +#line 7693 "Event.c" } -GType event_get_type (void) { +GType +event_get_type (void) +{ static volatile gsize event_type_id__volatile = 0; if (g_once_init_enter (&event_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Event), 0, (GInstanceInitFunc) event_instance_init, NULL }; @@ -7652,7 +7714,11 @@ GType event_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -7664,7 +7730,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/Exporter.c b/src/Exporter.c index b08f9bb..e8f0cf2 100644 --- a/src/Exporter.c +++ b/src/Exporter.c @@ -1,4 +1,4 @@ -/* Exporter.c generated by valac 0.36.6, the Vala compiler +/* Exporter.c generated by valac 0.40.4, the Vala compiler * generated from Exporter.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -97,6 +98,11 @@ typedef struct _Workers Workers; typedef struct _WorkersClass WorkersClass; #define EXPORTER_TYPE_OVERWRITE (exporter_overwrite_get_type ()) +enum { + EXPORTER_0_PROPERTY, + EXPORTER_NUM_PROPERTIES +}; +static GParamSpec* exporter_properties[EXPORTER_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _workers_unref0(var) ((var == NULL) ? NULL : (var = (workers_unref (var), NULL))) @@ -391,13 +397,18 @@ GType photo_file_format_get_type (void) G_GNUC_CONST; GType jpeg_quality_get_type (void) G_GNUC_CONST; ExportFormatParameters* export_format_parameters_dup (const ExportFormatParameters* self); void export_format_parameters_free (ExportFormatParameters* self); -static void export_format_parameters_init (ExportFormatParameters *self, ExportFormatMode mode, PhotoFileFormat specified_format, JpegQuality quality); +static void export_format_parameters_init (ExportFormatParameters *self, + ExportFormatMode mode, + PhotoFileFormat specified_format, + JpegQuality quality); void export_format_parameters_current (ExportFormatParameters* result); PhotoFileFormat photo_file_format_get_system_default_format (void); void export_format_parameters_unmodified (ExportFormatParameters* result); -void export_format_parameters_for_format (PhotoFileFormat format, ExportFormatParameters* result); +void export_format_parameters_for_format (PhotoFileFormat format, + ExportFormatParameters* result); void export_format_parameters_last (ExportFormatParameters* result); -void export_format_parameters_for_JPEG (JpegQuality quality, ExportFormatParameters* result); +void export_format_parameters_for_JPEG (JpegQuality quality, + ExportFormatParameters* result); GType exporter_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; @@ -412,114 +423,251 @@ Scaling* scaling_dup (const Scaling* self); void scaling_free (Scaling* self); gpointer workers_ref (gpointer instance); void workers_unref (gpointer instance); -GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_workers (GValue* value, gpointer v_object); -void value_take_workers (GValue* value, gpointer v_object); +GParamSpec* param_spec_workers (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_workers (GValue* value, + gpointer v_object); +void value_take_workers (GValue* value, + gpointer v_object); gpointer value_get_workers (const GValue* value); GType workers_get_type (void) G_GNUC_CONST; GType exporter_overwrite_get_type (void) G_GNUC_CONST; #define EXPORTER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EXPORTER, ExporterPrivate)) -enum { - EXPORTER_DUMMY_PROPERTY -}; -guint workers_threads_per_cpu (gint per, gint max); -Workers* workers_new (guint max_threads, gboolean exclusive); -Workers* workers_construct (GType object_type, guint max_threads, gboolean exclusive); -Exporter* exporter_new (GeeCollection* to_export, GFile* dir, Scaling* scaling, ExportFormatParameters* export_params, gboolean auto_replace_all); -Exporter* exporter_construct (GType object_type, GeeCollection* to_export, GFile* dir, Scaling* scaling, ExportFormatParameters* export_params, gboolean auto_replace_all); -Exporter* exporter_new_for_temp_file (GeeCollection* to_export, Scaling* scaling, ExportFormatParameters* export_params); -Exporter* exporter_construct_for_temp_file (GType object_type, GeeCollection* to_export, Scaling* scaling, ExportFormatParameters* export_params); -void exporter_export (Exporter* self, ExporterCompletionCallback completion_callback, void* completion_callback_target, ExporterExportFailedCallback error_callback, void* error_callback_target, ExporterOverwriteCallback overwrite_callback, void* overwrite_callback_target, GCancellable* cancellable, ProgressMonitor monitor, void* monitor_target); +guint workers_threads_per_cpu (gint per, + gint max); +Workers* workers_new (guint max_threads, + gboolean exclusive); +Workers* workers_construct (GType object_type, + guint max_threads, + gboolean exclusive); +Exporter* exporter_new (GeeCollection* to_export, + GFile* dir, + Scaling* scaling, + ExportFormatParameters* export_params, + gboolean auto_replace_all); +Exporter* exporter_construct (GType object_type, + GeeCollection* to_export, + GFile* dir, + Scaling* scaling, + ExportFormatParameters* export_params, + gboolean auto_replace_all); +Exporter* exporter_new_for_temp_file (GeeCollection* to_export, + Scaling* scaling, + ExportFormatParameters* export_params); +Exporter* exporter_construct_for_temp_file (GType object_type, + GeeCollection* to_export, + Scaling* scaling, + ExportFormatParameters* export_params); +void exporter_export (Exporter* self, + ExporterCompletionCallback completion_callback, + void* completion_callback_target, + ExporterExportFailedCallback error_callback, + void* error_callback_target, + ExporterOverwriteCallback overwrite_callback, + void* overwrite_callback_target, + GCancellable* cancellable, + ProgressMonitor monitor, + void* monitor_target); static gboolean exporter_process_queue (Exporter* self); -static void exporter_export_completed (Exporter* self, gboolean is_cancelled); +static void exporter_export_completed (Exporter* self, + gboolean is_cancelled); gpointer background_job_ref (gpointer instance); void background_job_unref (gpointer instance); -GParamSpec* param_spec_background_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_background_job (GValue* value, gpointer v_object); -void value_take_background_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_background_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_background_job (GValue* value, + gpointer v_object); +void value_take_background_job (GValue* value, + gpointer v_object); gpointer value_get_background_job (const GValue* value); GType background_job_get_type (void) G_GNUC_CONST; -static void exporter_on_exported (Exporter* self, BackgroundJob* j); +static void exporter_on_exported (Exporter* self, + BackgroundJob* j); static GType exporter_export_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; GType background_job_job_priority_get_type (void) G_GNUC_CONST; -static void _vala_array_add129 (GFile** * array, int* length, int* size, GFile* value); -static void exporter_on_export_cancelled (Exporter* self, BackgroundJob* j); -GFile** exporter_get_exported_files (Exporter* self, int* result_length1); -static GFile** _vala_array_dup25 (GFile** self, int length); +static void _vala_array_add129 (GFile** * array, + int* length, + int* size, + GFile* value); +static void exporter_on_export_cancelled (Exporter* self, + BackgroundJob* j); +GFile** exporter_get_exported_files (Exporter* self, + int* result_length1); +static GFile** _vala_array_dup25 (GFile** self, + int length); GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; -PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportFormatParameters* params); -gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParameters* params); +PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, + ExportFormatParameters* params); +gchar* photo_get_export_basename_for_parameters (Photo* self, + ExportFormatParameters* params); GType video_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; gchar* media_source_get_basename (MediaSource* self); -static void _vala_array_add130 (GFile** * array, int* length, int* size, GFile* value); -GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error); +static void _vala_array_add130 (GFile** * array, + int* length, + int* size, + GFile* value); +GFile* generate_unique_file (GFile* dir, + const gchar* basename, + gboolean* collision, + GError** error); GFile* app_dirs_get_temp_dir (void); -void app_window_error_message (const gchar* message, GtkWindow* parent); +void app_window_error_message (const gchar* message, + GtkWindow* parent); GFile* media_source_get_file (MediaSource* self); -void workers_enqueue (Workers* self, BackgroundJob* job); -static ExporterExportJob* exporter_export_job_new (Exporter* owner, MediaSource* media, GFile* dest, Scaling* scaling, JpegQuality* quality, PhotoFileFormat* format, GCancellable* cancellable, gboolean direct_copy_unmodified, gboolean export_metadata); -static ExporterExportJob* exporter_export_job_construct (GType object_type, Exporter* owner, MediaSource* media, GFile* dest, Scaling* scaling, JpegQuality* quality, PhotoFileFormat* format, GCancellable* cancellable, gboolean direct_copy_unmodified, gboolean export_metadata); -enum { - EXPORTER_EXPORT_JOB_DUMMY_PROPERTY -}; -static void _exporter_on_exported_completion_callback (BackgroundJob* job, gpointer self); -static void _exporter_on_export_cancelled_cancellation_callback (BackgroundJob* job, gpointer self); +void workers_enqueue (Workers* self, + BackgroundJob* job); +static ExporterExportJob* exporter_export_job_new (Exporter* owner, + MediaSource* media, + GFile* dest, + Scaling* scaling, + JpegQuality* quality, + PhotoFileFormat* format, + GCancellable* cancellable, + gboolean direct_copy_unmodified, + gboolean export_metadata); +static ExporterExportJob* exporter_export_job_construct (GType object_type, + Exporter* owner, + MediaSource* media, + GFile* dest, + Scaling* scaling, + JpegQuality* quality, + PhotoFileFormat* format, + GCancellable* cancellable, + gboolean direct_copy_unmodified, + gboolean export_metadata); +static void _exporter_on_exported_completion_callback (BackgroundJob* job, + gpointer self); +static void _exporter_on_export_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self); gpointer abstract_semaphore_ref (gpointer instance); void abstract_semaphore_unref (gpointer instance); -GParamSpec* param_spec_abstract_semaphore (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_abstract_semaphore (GValue* value, gpointer v_object); -void value_take_abstract_semaphore (GValue* value, gpointer v_object); +GParamSpec* param_spec_abstract_semaphore (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_abstract_semaphore (GValue* value, + gpointer v_object); +void value_take_abstract_semaphore (GValue* value, + gpointer v_object); gpointer value_get_abstract_semaphore (const GValue* value); GType abstract_semaphore_get_type (void) G_GNUC_CONST; -BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore); +BackgroundJob* background_job_construct (GType object_type, + GObject* owner, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target, + AbstractSemaphore* completion_semaphore); static JpegQuality* _jpeg_quality_dup (JpegQuality* self); static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self); static void exporter_export_job_real_execute (BackgroundJob* base); -void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error); -void video_export (Video* self, GFile* dest_file, GError** error); +void photo_export (Photo* self, + GFile* dest_file, + Scaling* scaling, + JpegQuality quality, + PhotoFileFormat export_format, + gboolean direct_copy_unmodified, + gboolean export_metadata, + GError** error); +void video_export (Video* self, + GFile* dest_file, + GError** error); static void exporter_export_job_finalize (BackgroundJob * obj); static void exporter_finalize (GObject * obj); gpointer exporter_ui_ref (gpointer instance); void exporter_ui_unref (gpointer instance); -GParamSpec* param_spec_exporter_ui (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_exporter_ui (GValue* value, gpointer v_object); -void value_take_exporter_ui (GValue* value, gpointer v_object); +GParamSpec* param_spec_exporter_ui (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_exporter_ui (GValue* value, + gpointer v_object); +void value_take_exporter_ui (GValue* value, + gpointer v_object); gpointer value_get_exporter_ui (const GValue* value); GType exporter_ui_get_type (void) G_GNUC_CONST; GType progress_dialog_get_type (void) G_GNUC_CONST; #define EXPORTER_UI_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EXPORTER_UI, ExporterUIPrivate)) -enum { - EXPORTER_UI_DUMMY_PROPERTY -}; ExporterUI* exporter_ui_new (Exporter* exporter); -ExporterUI* exporter_ui_construct (GType object_type, Exporter* exporter); -void exporter_ui_export (ExporterUI* self, ExporterCompletionCallback completion_callback, void* completion_callback_target); +ExporterUI* exporter_ui_construct (GType object_type, + Exporter* exporter); +void exporter_ui_export (ExporterUI* self, + ExporterCompletionCallback completion_callback, + void* completion_callback_target); GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); void page_window_set_busy_cursor (PageWindow* self); -ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable); -ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable); -static void exporter_ui_on_export_completed (ExporterUI* self, Exporter* exporter, gboolean is_cancelled); -static void _exporter_ui_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self); -static gboolean exporter_ui_on_export_failed (ExporterUI* self, Exporter* exporter, GFile* file, gint remaining, GError* err); -static gboolean _exporter_ui_on_export_failed_exporter_export_failed_callback (Exporter* exporter, GFile* file, gint remaining, GError* err, gpointer self); -static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Exporter* exporter, GFile* file); -static ExporterOverwrite _exporter_ui_on_export_overwrite_exporter_overwrite_callback (Exporter* exporter, GFile* file, gpointer self); -gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop); -static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self); +ProgressDialog* progress_dialog_new (GtkWindow* owner, + const gchar* text, + GCancellable* cancellable); +ProgressDialog* progress_dialog_construct (GType object_type, + GtkWindow* owner, + const gchar* text, + GCancellable* cancellable); +static void exporter_ui_on_export_completed (ExporterUI* self, + Exporter* exporter, + gboolean is_cancelled); +static void _exporter_ui_on_export_completed_exporter_completion_callback (Exporter* exporter, + gboolean is_cancelled, + gpointer self); +static gboolean exporter_ui_on_export_failed (ExporterUI* self, + Exporter* exporter, + GFile* file, + gint remaining, + GError* err); +static gboolean _exporter_ui_on_export_failed_exporter_export_failed_callback (Exporter* exporter, + GFile* file, + gint remaining, + GError* err, + gpointer self); +static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, + Exporter* exporter, + GFile* file); +static ExporterOverwrite _exporter_ui_on_export_overwrite_exporter_overwrite_callback (Exporter* exporter, + GFile* file, + gpointer self); +gboolean progress_dialog_monitor (ProgressDialog* self, + guint64 count, + guint64 total, + gboolean do_event_loop); +static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, + guint64 total, + gboolean do_event_loop, + gpointer self); void progress_dialog_close (ProgressDialog* self); void page_window_set_normal_cursor (PageWindow* self); -GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* message, const gchar* negative, const gchar* affirmative, const gchar* affirmative_all, const gchar* title, GtkWindow* parent); -GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining); +GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* message, + const gchar* negative, + const gchar* affirmative, + const gchar* affirmative_all, + const gchar* title, + GtkWindow* parent); +GtkResponseType export_error_dialog (GFile* dest, + gboolean photos_remaining); static void exporter_ui_finalize (ExporterUI * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -GType export_format_mode_get_type (void) { +GType +export_format_mode_get_type (void) +{ static volatile gsize export_format_mode_type_id__volatile = 0; if (g_once_init_enter (&export_format_mode_type_id__volatile)) { static const GEnumValue values[] = {{EXPORT_FORMAT_MODE_UNMODIFIED, "EXPORT_FORMAT_MODE_UNMODIFIED", "unmodified"}, {EXPORT_FORMAT_MODE_CURRENT, "EXPORT_FORMAT_MODE_CURRENT", "current"}, {EXPORT_FORMAT_MODE_SPECIFIED, "EXPORT_FORMAT_MODE_SPECIFIED", "specified"}, {EXPORT_FORMAT_MODE_LAST, "EXPORT_FORMAT_MODE_LAST", "last"}, {0, NULL, NULL}}; @@ -531,106 +679,101 @@ GType export_format_mode_get_type (void) { } -static void export_format_parameters_init (ExportFormatParameters *self, ExportFormatMode mode, PhotoFileFormat specified_format, JpegQuality quality) { - ExportFormatMode _tmp0_; - PhotoFileFormat _tmp1_; - JpegQuality _tmp2_; +static void +export_format_parameters_init (ExportFormatParameters *self, + ExportFormatMode mode, + PhotoFileFormat specified_format, + JpegQuality quality) +{ #line 20 "/home/jens/Source/shotwell/src/Exporter.vala" memset (self, 0, sizeof (ExportFormatParameters)); #line 22 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp0_ = mode; -#line 22 "/home/jens/Source/shotwell/src/Exporter.vala" - (*self).mode = _tmp0_; + (*self).mode = mode; #line 23 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp1_ = specified_format; -#line 23 "/home/jens/Source/shotwell/src/Exporter.vala" - (*self).specified_format = _tmp1_; -#line 24 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp2_ = quality; + (*self).specified_format = specified_format; #line 24 "/home/jens/Source/shotwell/src/Exporter.vala" - (*self).quality = _tmp2_; + (*self).quality = quality; #line 25 "/home/jens/Source/shotwell/src/Exporter.vala" (*self).export_metadata = TRUE; -#line 555 "Exporter.c" +#line 699 "Exporter.c" } -void export_format_parameters_current (ExportFormatParameters* result) { - PhotoFileFormat _tmp0_; - ExportFormatParameters _tmp1_ = {0}; -#line 29 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp0_ = photo_file_format_get_system_default_format (); +void +export_format_parameters_current (ExportFormatParameters* result) +{ + ExportFormatParameters _tmp0_ = {0}; #line 29 "/home/jens/Source/shotwell/src/Exporter.vala" - export_format_parameters_init (&_tmp1_, EXPORT_FORMAT_MODE_CURRENT, _tmp0_, JPEG_QUALITY_HIGH); + export_format_parameters_init (&_tmp0_, EXPORT_FORMAT_MODE_CURRENT, photo_file_format_get_system_default_format (), JPEG_QUALITY_HIGH); #line 29 "/home/jens/Source/shotwell/src/Exporter.vala" - *result = _tmp1_; + *result = _tmp0_; #line 29 "/home/jens/Source/shotwell/src/Exporter.vala" return; -#line 570 "Exporter.c" +#line 713 "Exporter.c" } -void export_format_parameters_unmodified (ExportFormatParameters* result) { - PhotoFileFormat _tmp0_; - ExportFormatParameters _tmp1_ = {0}; +void +export_format_parameters_unmodified (ExportFormatParameters* result) +{ + ExportFormatParameters _tmp0_ = {0}; #line 34 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp0_ = photo_file_format_get_system_default_format (); + export_format_parameters_init (&_tmp0_, EXPORT_FORMAT_MODE_UNMODIFIED, photo_file_format_get_system_default_format (), JPEG_QUALITY_HIGH); #line 34 "/home/jens/Source/shotwell/src/Exporter.vala" - export_format_parameters_init (&_tmp1_, EXPORT_FORMAT_MODE_UNMODIFIED, _tmp0_, JPEG_QUALITY_HIGH); -#line 34 "/home/jens/Source/shotwell/src/Exporter.vala" - *result = _tmp1_; + *result = _tmp0_; #line 34 "/home/jens/Source/shotwell/src/Exporter.vala" return; -#line 585 "Exporter.c" +#line 727 "Exporter.c" } -void export_format_parameters_for_format (PhotoFileFormat format, ExportFormatParameters* result) { - PhotoFileFormat _tmp0_; - ExportFormatParameters _tmp1_ = {0}; -#line 39 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp0_ = format; +void +export_format_parameters_for_format (PhotoFileFormat format, + ExportFormatParameters* result) +{ + ExportFormatParameters _tmp0_ = {0}; #line 39 "/home/jens/Source/shotwell/src/Exporter.vala" - export_format_parameters_init (&_tmp1_, EXPORT_FORMAT_MODE_SPECIFIED, _tmp0_, JPEG_QUALITY_HIGH); + export_format_parameters_init (&_tmp0_, EXPORT_FORMAT_MODE_SPECIFIED, format, JPEG_QUALITY_HIGH); #line 39 "/home/jens/Source/shotwell/src/Exporter.vala" - *result = _tmp1_; + *result = _tmp0_; #line 39 "/home/jens/Source/shotwell/src/Exporter.vala" return; -#line 600 "Exporter.c" +#line 742 "Exporter.c" } -void export_format_parameters_last (ExportFormatParameters* result) { - PhotoFileFormat _tmp0_; - ExportFormatParameters _tmp1_ = {0}; +void +export_format_parameters_last (ExportFormatParameters* result) +{ + ExportFormatParameters _tmp0_ = {0}; #line 43 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp0_ = photo_file_format_get_system_default_format (); + export_format_parameters_init (&_tmp0_, EXPORT_FORMAT_MODE_LAST, photo_file_format_get_system_default_format (), JPEG_QUALITY_HIGH); #line 43 "/home/jens/Source/shotwell/src/Exporter.vala" - export_format_parameters_init (&_tmp1_, EXPORT_FORMAT_MODE_LAST, _tmp0_, JPEG_QUALITY_HIGH); -#line 43 "/home/jens/Source/shotwell/src/Exporter.vala" - *result = _tmp1_; + *result = _tmp0_; #line 43 "/home/jens/Source/shotwell/src/Exporter.vala" return; -#line 615 "Exporter.c" +#line 756 "Exporter.c" } -void export_format_parameters_for_JPEG (JpegQuality quality, ExportFormatParameters* result) { - JpegQuality _tmp0_; - ExportFormatParameters _tmp1_ = {0}; -#line 48 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp0_ = quality; +void +export_format_parameters_for_JPEG (JpegQuality quality, + ExportFormatParameters* result) +{ + ExportFormatParameters _tmp0_ = {0}; #line 48 "/home/jens/Source/shotwell/src/Exporter.vala" - export_format_parameters_init (&_tmp1_, EXPORT_FORMAT_MODE_SPECIFIED, PHOTO_FILE_FORMAT_JFIF, _tmp0_); + export_format_parameters_init (&_tmp0_, EXPORT_FORMAT_MODE_SPECIFIED, PHOTO_FILE_FORMAT_JFIF, quality); #line 48 "/home/jens/Source/shotwell/src/Exporter.vala" - *result = _tmp1_; + *result = _tmp0_; #line 48 "/home/jens/Source/shotwell/src/Exporter.vala" return; -#line 630 "Exporter.c" +#line 771 "Exporter.c" } -ExportFormatParameters* export_format_parameters_dup (const ExportFormatParameters* self) { +ExportFormatParameters* +export_format_parameters_dup (const ExportFormatParameters* self) +{ ExportFormatParameters* dup; #line 14 "/home/jens/Source/shotwell/src/Exporter.vala" dup = g_new0 (ExportFormatParameters, 1); @@ -638,18 +781,22 @@ ExportFormatParameters* export_format_parameters_dup (const ExportFormatParamete memcpy (dup, self, sizeof (ExportFormatParameters)); #line 14 "/home/jens/Source/shotwell/src/Exporter.vala" return dup; -#line 642 "Exporter.c" +#line 785 "Exporter.c" } -void export_format_parameters_free (ExportFormatParameters* self) { +void +export_format_parameters_free (ExportFormatParameters* self) +{ #line 14 "/home/jens/Source/shotwell/src/Exporter.vala" g_free (self); -#line 649 "Exporter.c" +#line 794 "Exporter.c" } -GType export_format_parameters_get_type (void) { +GType +export_format_parameters_get_type (void) +{ static volatile gsize export_format_parameters_type_id__volatile = 0; if (g_once_init_enter (&export_format_parameters_type_id__volatile)) { GType export_format_parameters_type_id; @@ -660,7 +807,9 @@ GType export_format_parameters_get_type (void) { } -GType exporter_overwrite_get_type (void) { +GType +exporter_overwrite_get_type (void) +{ static volatile gsize exporter_overwrite_type_id__volatile = 0; if (g_once_init_enter (&exporter_overwrite_type_id__volatile)) { static const GEnumValue values[] = {{EXPORTER_OVERWRITE_YES, "EXPORTER_OVERWRITE_YES", "yes"}, {EXPORTER_OVERWRITE_NO, "EXPORTER_OVERWRITE_NO", "no"}, {EXPORTER_OVERWRITE_CANCEL, "EXPORTER_OVERWRITE_CANCEL", "cancel"}, {EXPORTER_OVERWRITE_REPLACE_ALL, "EXPORTER_OVERWRITE_REPLACE_ALL", "replace-all"}, {0, NULL, NULL}}; @@ -672,22 +821,28 @@ GType exporter_overwrite_get_type (void) { } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 125 "/home/jens/Source/shotwell/src/Exporter.vala" return self ? g_object_ref (self) : NULL; -#line 679 "Exporter.c" +#line 830 "Exporter.c" } -Exporter* exporter_construct (GType object_type, GeeCollection* to_export, GFile* dir, Scaling* scaling, ExportFormatParameters* export_params, gboolean auto_replace_all) { +Exporter* +exporter_construct (GType object_type, + GeeCollection* to_export, + GFile* dir, + Scaling* scaling, + ExportFormatParameters* export_params, + gboolean auto_replace_all) +{ Exporter * self = NULL; GeeCollection* _tmp0_; - GeeCollection* _tmp1_; - GFile* _tmp2_; - GFile* _tmp3_; - Scaling _tmp4_; - ExportFormatParameters _tmp5_; - gboolean _tmp6_; + GFile* _tmp1_; + Scaling _tmp2_; + ExportFormatParameters _tmp3_; #line 122 "/home/jens/Source/shotwell/src/Exporter.vala" g_return_val_if_fail (GEE_IS_COLLECTION (to_export), NULL); #line 122 "/home/jens/Source/shotwell/src/Exporter.vala" @@ -701,48 +856,52 @@ Exporter* exporter_construct (GType object_type, GeeCollection* to_export, GFile #line 124 "/home/jens/Source/shotwell/src/Exporter.vala" _tmp0_ = self->priv->to_export; #line 124 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp1_ = to_export; -#line 124 "/home/jens/Source/shotwell/src/Exporter.vala" - gee_collection_add_all (_tmp0_, _tmp1_); + gee_collection_add_all (_tmp0_, to_export); #line 125 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp2_ = dir; -#line 125 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (dir); #line 125 "/home/jens/Source/shotwell/src/Exporter.vala" _g_object_unref0 (self->priv->dir); #line 125 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->dir = _tmp3_; + self->priv->dir = _tmp1_; #line 126 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp4_ = *scaling; + _tmp2_ = *scaling; #line 126 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->scaling = _tmp4_; + self->priv->scaling = _tmp2_; #line 127 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp5_ = *export_params; + _tmp3_ = *export_params; #line 127 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->export_params = _tmp5_; -#line 128 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp6_ = auto_replace_all; + self->priv->export_params = _tmp3_; #line 128 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->replace_all = _tmp6_; + self->priv->replace_all = auto_replace_all; #line 122 "/home/jens/Source/shotwell/src/Exporter.vala" return self; -#line 730 "Exporter.c" +#line 879 "Exporter.c" } -Exporter* exporter_new (GeeCollection* to_export, GFile* dir, Scaling* scaling, ExportFormatParameters* export_params, gboolean auto_replace_all) { +Exporter* +exporter_new (GeeCollection* to_export, + GFile* dir, + Scaling* scaling, + ExportFormatParameters* export_params, + gboolean auto_replace_all) +{ #line 122 "/home/jens/Source/shotwell/src/Exporter.vala" return exporter_construct (TYPE_EXPORTER, to_export, dir, scaling, export_params, auto_replace_all); -#line 737 "Exporter.c" +#line 892 "Exporter.c" } -Exporter* exporter_construct_for_temp_file (GType object_type, GeeCollection* to_export, Scaling* scaling, ExportFormatParameters* export_params) { +Exporter* +exporter_construct_for_temp_file (GType object_type, + GeeCollection* to_export, + Scaling* scaling, + ExportFormatParameters* export_params) +{ Exporter * self = NULL; GeeCollection* _tmp0_; - GeeCollection* _tmp1_; - Scaling _tmp2_; - ExportFormatParameters _tmp3_; + Scaling _tmp1_; + ExportFormatParameters _tmp2_; #line 131 "/home/jens/Source/shotwell/src/Exporter.vala" g_return_val_if_fail (GEE_IS_COLLECTION (to_export), NULL); #line 131 "/home/jens/Source/shotwell/src/Exporter.vala" @@ -754,355 +913,342 @@ Exporter* exporter_construct_for_temp_file (GType object_type, GeeCollection* to #line 133 "/home/jens/Source/shotwell/src/Exporter.vala" _tmp0_ = self->priv->to_export; #line 133 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp1_ = to_export; -#line 133 "/home/jens/Source/shotwell/src/Exporter.vala" - gee_collection_add_all (_tmp0_, _tmp1_); + gee_collection_add_all (_tmp0_, to_export); #line 134 "/home/jens/Source/shotwell/src/Exporter.vala" _g_object_unref0 (self->priv->dir); #line 134 "/home/jens/Source/shotwell/src/Exporter.vala" self->priv->dir = NULL; #line 135 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp2_ = *scaling; + _tmp1_ = *scaling; #line 135 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->scaling = _tmp2_; + self->priv->scaling = _tmp1_; #line 136 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp3_ = *export_params; + _tmp2_ = *export_params; #line 136 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->export_params = _tmp3_; + self->priv->export_params = _tmp2_; #line 131 "/home/jens/Source/shotwell/src/Exporter.vala" return self; -#line 775 "Exporter.c" +#line 932 "Exporter.c" } -Exporter* exporter_new_for_temp_file (GeeCollection* to_export, Scaling* scaling, ExportFormatParameters* export_params) { +Exporter* +exporter_new_for_temp_file (GeeCollection* to_export, + Scaling* scaling, + ExportFormatParameters* export_params) +{ #line 131 "/home/jens/Source/shotwell/src/Exporter.vala" return exporter_construct_for_temp_file (TYPE_EXPORTER, to_export, scaling, export_params); -#line 782 "Exporter.c" +#line 943 "Exporter.c" } -void exporter_export (Exporter* self, ExporterCompletionCallback completion_callback, void* completion_callback_target, ExporterExportFailedCallback error_callback, void* error_callback_target, ExporterOverwriteCallback overwrite_callback, void* overwrite_callback_target, GCancellable* cancellable, ProgressMonitor monitor, void* monitor_target) { - ExporterCompletionCallback _tmp0_; - void* _tmp0__target; - ExporterExportFailedCallback _tmp1_; - void* _tmp1__target; - ExporterOverwriteCallback _tmp2_; - void* _tmp2__target; - ProgressMonitor _tmp3_; - void* _tmp3__target; - GCancellable* _tmp4_ = NULL; - GCancellable* _tmp5_; - GCancellable* _tmp6_; - GCancellable* _tmp8_; - gboolean _tmp9_; +void +exporter_export (Exporter* self, + ExporterCompletionCallback completion_callback, + void* completion_callback_target, + ExporterExportFailedCallback error_callback, + void* error_callback_target, + ExporterOverwriteCallback overwrite_callback, + void* overwrite_callback_target, + GCancellable* cancellable, + ProgressMonitor monitor, + void* monitor_target) +{ + GCancellable* _tmp0_ = NULL; + GCancellable* _tmp1_; + GCancellable* _tmp3_; #line 140 "/home/jens/Source/shotwell/src/Exporter.vala" g_return_if_fail (IS_EXPORTER (self)); #line 140 "/home/jens/Source/shotwell/src/Exporter.vala" g_return_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable)); #line 142 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp0_ = completion_callback; -#line 142 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp0__target = completion_callback_target; + self->priv->completion_callback = completion_callback; #line 142 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->completion_callback = _tmp0_; -#line 142 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->completion_callback_target = _tmp0__target; -#line 143 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp1_ = error_callback; + self->priv->completion_callback_target = completion_callback_target; #line 143 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp1__target = error_callback_target; + self->priv->error_callback = error_callback; #line 143 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->error_callback = _tmp1_; -#line 143 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->error_callback_target = _tmp1__target; -#line 144 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp2_ = overwrite_callback; -#line 144 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp2__target = overwrite_callback_target; + self->priv->error_callback_target = error_callback_target; #line 144 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->overwrite_callback = _tmp2_; + self->priv->overwrite_callback = overwrite_callback; #line 144 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->overwrite_callback_target = _tmp2__target; -#line 145 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp3_ = monitor; -#line 145 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp3__target = monitor_target; + self->priv->overwrite_callback_target = overwrite_callback_target; #line 145 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->monitor = _tmp3_; + self->priv->monitor = monitor; #line 145 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->monitor_target = _tmp3__target; + self->priv->monitor_target = monitor_target; #line 146 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp5_ = cancellable; + _tmp1_ = _g_object_ref0 (cancellable); #line 146 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp0_ = _tmp1_; #line 146 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp4_ = _tmp6_; + if (_tmp0_ == NULL) { +#line 988 "Exporter.c" + GCancellable* _tmp2_; #line 146 "/home/jens/Source/shotwell/src/Exporter.vala" - if (_tmp4_ == NULL) { -#line 844 "Exporter.c" - GCancellable* _tmp7_; + _tmp2_ = g_cancellable_new (); #line 146 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp7_ = g_cancellable_new (); + _g_object_unref0 (_tmp0_); #line 146 "/home/jens/Source/shotwell/src/Exporter.vala" - _g_object_unref0 (_tmp4_); -#line 146 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp4_ = _tmp7_; -#line 852 "Exporter.c" + _tmp0_ = _tmp2_; +#line 996 "Exporter.c" } #line 146 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp8_ = _tmp4_; + _tmp3_ = _tmp0_; #line 146 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp4_ = NULL; + _tmp0_ = NULL; #line 146 "/home/jens/Source/shotwell/src/Exporter.vala" _g_object_unref0 (self->priv->cancellable); #line 146 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->cancellable = _tmp8_; -#line 148 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp9_ = exporter_process_queue (self); + self->priv->cancellable = _tmp3_; #line 148 "/home/jens/Source/shotwell/src/Exporter.vala" - if (!_tmp9_) { + if (!exporter_process_queue (self)) { #line 149 "/home/jens/Source/shotwell/src/Exporter.vala" exporter_export_completed (self, TRUE); -#line 868 "Exporter.c" +#line 1010 "Exporter.c" } #line 140 "/home/jens/Source/shotwell/src/Exporter.vala" - _g_object_unref0 (_tmp4_); -#line 872 "Exporter.c" + _g_object_unref0 (_tmp0_); +#line 1014 "Exporter.c" } -static gpointer _background_job_ref0 (gpointer self) { +static gpointer +_background_job_ref0 (gpointer self) +{ #line 153 "/home/jens/Source/shotwell/src/Exporter.vala" return self ? background_job_ref (self) : NULL; -#line 879 "Exporter.c" +#line 1023 "Exporter.c" } -static void _vala_array_add129 (GFile** * array, int* length, int* size, GFile* value) { +static void +_vala_array_add129 (GFile** * array, + int* length, + int* size, + GFile* value) +{ #line 177 "/home/jens/Source/shotwell/src/Exporter.vala" if ((*length) == (*size)) { #line 177 "/home/jens/Source/shotwell/src/Exporter.vala" *size = (*size) ? (2 * (*size)) : 4; #line 177 "/home/jens/Source/shotwell/src/Exporter.vala" *array = g_renew (GFile*, *array, (*size) + 1); -#line 890 "Exporter.c" +#line 1039 "Exporter.c" } #line 177 "/home/jens/Source/shotwell/src/Exporter.vala" (*array)[(*length)++] = value; #line 177 "/home/jens/Source/shotwell/src/Exporter.vala" (*array)[*length] = NULL; -#line 896 "Exporter.c" +#line 1045 "Exporter.c" } -static void exporter_on_exported (Exporter* self, BackgroundJob* j) { +static void +exporter_on_exported (Exporter* self, + BackgroundJob* j) +{ ExporterExportJob* job = NULL; - BackgroundJob* _tmp0_; - ExporterExportJob* _tmp1_; - gint _tmp2_; + ExporterExportJob* _tmp0_; + gint _tmp1_; gboolean completed = FALSE; - gint _tmp3_; - GeeCollection* _tmp4_; + gint _tmp2_; + GeeCollection* _tmp3_; + gint _tmp4_; gint _tmp5_; - gint _tmp6_; - gboolean _tmp7_ = FALSE; - gboolean _tmp8_; - gboolean _tmp22_ = FALSE; - gboolean _tmp23_; - gboolean _tmp36_; + gboolean _tmp6_ = FALSE; + gboolean _tmp7_; + gboolean _tmp20_ = FALSE; + gboolean _tmp21_; + gboolean _tmp33_; #line 152 "/home/jens/Source/shotwell/src/Exporter.vala" g_return_if_fail (IS_EXPORTER (self)); #line 152 "/home/jens/Source/shotwell/src/Exporter.vala" g_return_if_fail (IS_BACKGROUND_JOB (j)); #line 153 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp0_ = j; + _tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, EXPORTER_TYPE_EXPORT_JOB, ExporterExportJob)); #line 153 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EXPORTER_TYPE_EXPORT_JOB, ExporterExportJob)); -#line 153 "/home/jens/Source/shotwell/src/Exporter.vala" - job = _tmp1_; + job = _tmp0_; #line 155 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp2_ = self->priv->completed_count; + _tmp1_ = self->priv->completed_count; #line 155 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->completed_count = _tmp2_ + 1; + self->priv->completed_count = _tmp1_ + 1; #line 159 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp3_ = self->priv->completed_count; + _tmp2_ = self->priv->completed_count; #line 159 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp4_ = self->priv->to_export; + _tmp3_ = self->priv->to_export; #line 159 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp5_ = gee_collection_get_size (_tmp4_); + _tmp4_ = gee_collection_get_size (_tmp3_); #line 159 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 159 "/home/jens/Source/shotwell/src/Exporter.vala" - completed = _tmp3_ == _tmp6_; + completed = _tmp2_ == _tmp5_; #line 161 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp8_ = self->priv->aborted; + _tmp7_ = self->priv->aborted; #line 161 "/home/jens/Source/shotwell/src/Exporter.vala" - if (!_tmp8_) { -#line 943 "Exporter.c" - ExporterExportJob* _tmp9_; - GError* _tmp10_; + if (!_tmp7_) { +#line 1092 "Exporter.c" + ExporterExportJob* _tmp8_; + GError* _tmp9_; #line 161 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp9_ = job; + _tmp8_ = job; #line 161 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp10_ = _tmp9_->err; + _tmp9_ = _tmp8_->err; #line 161 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp7_ = _tmp10_ != NULL; -#line 952 "Exporter.c" + _tmp6_ = _tmp9_ != NULL; +#line 1101 "Exporter.c" } else { #line 161 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp7_ = FALSE; -#line 956 "Exporter.c" + _tmp6_ = FALSE; +#line 1105 "Exporter.c" } #line 161 "/home/jens/Source/shotwell/src/Exporter.vala" - if (_tmp7_) { -#line 960 "Exporter.c" - ExporterExportFailedCallback _tmp11_; - void* _tmp11__target; - ExporterExportJob* _tmp12_; - GFile* _tmp13_; - GeeCollection* _tmp14_; + if (_tmp6_) { +#line 1109 "Exporter.c" + ExporterExportFailedCallback _tmp10_; + void* _tmp10__target; + ExporterExportJob* _tmp11_; + GFile* _tmp12_; + GeeCollection* _tmp13_; + gint _tmp14_; gint _tmp15_; gint _tmp16_; - gint _tmp17_; - ExporterExportJob* _tmp18_; - GError* _tmp19_; - gboolean _tmp20_; -#line 162 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp11_ = self->priv->error_callback; + ExporterExportJob* _tmp17_; + GError* _tmp18_; #line 162 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp11__target = self->priv->error_callback_target; + _tmp10_ = self->priv->error_callback; #line 162 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp12_ = job; + _tmp10__target = self->priv->error_callback_target; #line 162 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp13_ = _tmp12_->dest; + _tmp11_ = job; #line 162 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp14_ = self->priv->to_export; + _tmp12_ = _tmp11_->dest; #line 162 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp15_ = gee_collection_get_size (_tmp14_); + _tmp13_ = self->priv->to_export; #line 162 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp16_ = _tmp15_; + _tmp14_ = gee_collection_get_size (_tmp13_); #line 162 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp17_ = self->priv->completed_count; + _tmp15_ = _tmp14_; #line 162 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp18_ = job; + _tmp16_ = self->priv->completed_count; #line 162 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp19_ = _tmp18_->err; + _tmp17_ = job; #line 162 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp20_ = _tmp11_ (self, _tmp13_, _tmp16_ - _tmp17_, _tmp19_, _tmp11__target); + _tmp18_ = _tmp17_->err; #line 162 "/home/jens/Source/shotwell/src/Exporter.vala" - if (!_tmp20_) { -#line 996 "Exporter.c" - gboolean _tmp21_; + if (!_tmp10_ (self, _tmp12_, _tmp15_ - _tmp16_, _tmp18_, _tmp10__target)) { +#line 1142 "Exporter.c" + gboolean _tmp19_; #line 163 "/home/jens/Source/shotwell/src/Exporter.vala" self->priv->aborted = TRUE; #line 165 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp21_ = completed; + _tmp19_ = completed; #line 165 "/home/jens/Source/shotwell/src/Exporter.vala" - if (!_tmp21_) { + if (!_tmp19_) { #line 166 "/home/jens/Source/shotwell/src/Exporter.vala" _background_job_unref0 (job); #line 166 "/home/jens/Source/shotwell/src/Exporter.vala" return; -#line 1008 "Exporter.c" +#line 1154 "Exporter.c" } } } #line 170 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp23_ = self->priv->aborted; + _tmp21_ = self->priv->aborted; #line 170 "/home/jens/Source/shotwell/src/Exporter.vala" - if (!_tmp23_) { -#line 1016 "Exporter.c" - ProgressMonitor _tmp24_; - void* _tmp24__target; + if (!_tmp21_) { +#line 1162 "Exporter.c" + ProgressMonitor _tmp22_; + void* _tmp22__target; #line 170 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp24_ = self->priv->monitor; + _tmp22_ = self->priv->monitor; #line 170 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp24__target = self->priv->monitor_target; + _tmp22__target = self->priv->monitor_target; #line 170 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp22_ = _tmp24_ != NULL; -#line 1025 "Exporter.c" + _tmp20_ = _tmp22_ != NULL; +#line 1171 "Exporter.c" } else { #line 170 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp22_ = FALSE; -#line 1029 "Exporter.c" + _tmp20_ = FALSE; +#line 1175 "Exporter.c" } #line 170 "/home/jens/Source/shotwell/src/Exporter.vala" - if (_tmp22_) { -#line 1033 "Exporter.c" - ProgressMonitor _tmp25_; - void* _tmp25__target; + if (_tmp20_) { +#line 1179 "Exporter.c" + ProgressMonitor _tmp23_; + void* _tmp23__target; + gint _tmp24_; + GeeCollection* _tmp25_; gint _tmp26_; - GeeCollection* _tmp27_; - gint _tmp28_; - gint _tmp29_; - gboolean _tmp30_; + gint _tmp27_; #line 171 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp25_ = self->priv->monitor; + _tmp23_ = self->priv->monitor; #line 171 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp25__target = self->priv->monitor_target; + _tmp23__target = self->priv->monitor_target; #line 171 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp26_ = self->priv->completed_count; + _tmp24_ = self->priv->completed_count; #line 171 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp27_ = self->priv->to_export; + _tmp25_ = self->priv->to_export; #line 171 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp28_ = gee_collection_get_size (_tmp27_); + _tmp26_ = gee_collection_get_size (_tmp25_); #line 171 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp29_ = _tmp28_; + _tmp27_ = _tmp26_; #line 171 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp30_ = _tmp25_ ((guint64) _tmp26_, (guint64) _tmp29_, FALSE, _tmp25__target); -#line 171 "/home/jens/Source/shotwell/src/Exporter.vala" - if (!_tmp30_) { -#line 1057 "Exporter.c" - gboolean _tmp31_; + if (!_tmp23_ ((guint64) _tmp24_, (guint64) _tmp27_, FALSE, _tmp23__target)) { +#line 1200 "Exporter.c" + gboolean _tmp28_; #line 172 "/home/jens/Source/shotwell/src/Exporter.vala" self->priv->aborted = TRUE; #line 174 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp31_ = completed; + _tmp28_ = completed; #line 174 "/home/jens/Source/shotwell/src/Exporter.vala" - if (!_tmp31_) { + if (!_tmp28_) { #line 175 "/home/jens/Source/shotwell/src/Exporter.vala" _background_job_unref0 (job); #line 175 "/home/jens/Source/shotwell/src/Exporter.vala" return; -#line 1069 "Exporter.c" +#line 1212 "Exporter.c" } } else { - GFile** _tmp32_; - gint _tmp32__length1; - ExporterExportJob* _tmp33_; - GFile* _tmp34_; - GFile* _tmp35_; + GFile** _tmp29_; + gint _tmp29__length1; + ExporterExportJob* _tmp30_; + GFile* _tmp31_; + GFile* _tmp32_; #line 177 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp32_ = self->priv->exported_files; + _tmp29_ = self->priv->exported_files; #line 177 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp32__length1 = self->priv->exported_files_length1; + _tmp29__length1 = self->priv->exported_files_length1; #line 177 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp33_ = job; + _tmp30_ = job; #line 177 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp34_ = _tmp33_->dest; + _tmp31_ = _tmp30_->dest; #line 177 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp35_ = _g_object_ref0 (_tmp34_); + _tmp32_ = _g_object_ref0 (_tmp31_); #line 177 "/home/jens/Source/shotwell/src/Exporter.vala" - _vala_array_add129 (&self->priv->exported_files, &self->priv->exported_files_length1, &self->priv->_exported_files_size_, _tmp35_); -#line 1089 "Exporter.c" + _vala_array_add129 (&self->priv->exported_files, &self->priv->exported_files_length1, &self->priv->_exported_files_size_, _tmp32_); +#line 1232 "Exporter.c" } } #line 181 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp36_ = completed; + _tmp33_ = completed; #line 181 "/home/jens/Source/shotwell/src/Exporter.vala" - if (_tmp36_) { + if (_tmp33_) { #line 182 "/home/jens/Source/shotwell/src/Exporter.vala" exporter_export_completed (self, FALSE); -#line 1098 "Exporter.c" +#line 1241 "Exporter.c" } #line 152 "/home/jens/Source/shotwell/src/Exporter.vala" _background_job_unref0 (job); -#line 1102 "Exporter.c" +#line 1245 "Exporter.c" } -static void exporter_on_export_cancelled (Exporter* self, BackgroundJob* j) { +static void +exporter_on_export_cancelled (Exporter* self, + BackgroundJob* j) +{ gint _tmp0_; gint _tmp1_; GeeCollection* _tmp2_; @@ -1128,33 +1274,39 @@ static void exporter_on_export_cancelled (Exporter* self, BackgroundJob* j) { if (_tmp1_ == _tmp4_) { #line 187 "/home/jens/Source/shotwell/src/Exporter.vala" exporter_export_completed (self, TRUE); -#line 1132 "Exporter.c" +#line 1278 "Exporter.c" } } -static GFile** _vala_array_dup25 (GFile** self, int length) { +static GFile** +_vala_array_dup25 (GFile** self, + int length) +{ GFile** result; int i; #line 191 "/home/jens/Source/shotwell/src/Exporter.vala" result = g_new0 (GFile*, length + 1); #line 191 "/home/jens/Source/shotwell/src/Exporter.vala" for (i = 0; i < length; i++) { -#line 1144 "Exporter.c" +#line 1293 "Exporter.c" GFile* _tmp0_; #line 191 "/home/jens/Source/shotwell/src/Exporter.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 191 "/home/jens/Source/shotwell/src/Exporter.vala" result[i] = _tmp0_; -#line 1150 "Exporter.c" +#line 1299 "Exporter.c" } #line 191 "/home/jens/Source/shotwell/src/Exporter.vala" return result; -#line 1154 "Exporter.c" +#line 1303 "Exporter.c" } -GFile** exporter_get_exported_files (Exporter* self, int* result_length1) { +GFile** +exporter_get_exported_files (Exporter* self, + int* result_length1) +{ GFile** result = NULL; GFile** _tmp0_; gint _tmp0__length1; @@ -1180,43 +1332,50 @@ GFile** exporter_get_exported_files (Exporter* self, int* result_length1) { if (result_length1) { #line 191 "/home/jens/Source/shotwell/src/Exporter.vala" *result_length1 = _tmp2__length1; -#line 1184 "Exporter.c" +#line 1336 "Exporter.c" } #line 191 "/home/jens/Source/shotwell/src/Exporter.vala" result = _tmp2_; #line 191 "/home/jens/Source/shotwell/src/Exporter.vala" return result; -#line 1190 "Exporter.c" +#line 1342 "Exporter.c" } -static void _vala_array_add130 (GFile** * array, int* length, int* size, GFile* value) { +static void +_vala_array_add130 (GFile** * array, + int* length, + int* size, + GFile* value) +{ #line 210 "/home/jens/Source/shotwell/src/Exporter.vala" if ((*length) == (*size)) { #line 210 "/home/jens/Source/shotwell/src/Exporter.vala" *size = (*size) ? (2 * (*size)) : 4; #line 210 "/home/jens/Source/shotwell/src/Exporter.vala" *array = g_renew (GFile*, *array, (*size) + 1); -#line 1201 "Exporter.c" +#line 1358 "Exporter.c" } #line 210 "/home/jens/Source/shotwell/src/Exporter.vala" (*array)[(*length)++] = value; #line 210 "/home/jens/Source/shotwell/src/Exporter.vala" (*array)[*length] = NULL; -#line 1207 "Exporter.c" +#line 1364 "Exporter.c" } -static gboolean exporter_process_queue (Exporter* self) { +static gboolean +exporter_process_queue (Exporter* self) +{ gboolean result = FALSE; gint submitted = 0; - gint _tmp89_; + gint _tmp82_; GError * _inner_error_ = NULL; #line 194 "/home/jens/Source/shotwell/src/Exporter.vala" g_return_val_if_fail (IS_EXPORTER (self), FALSE); #line 195 "/home/jens/Source/shotwell/src/Exporter.vala" submitted = 0; -#line 1220 "Exporter.c" +#line 1379 "Exporter.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp0_; @@ -1229,190 +1388,178 @@ static gboolean exporter_process_queue (Exporter* self) { _source_it = _tmp1_; #line 196 "/home/jens/Source/shotwell/src/Exporter.vala" while (TRUE) { -#line 1233 "Exporter.c" +#line 1392 "Exporter.c" GeeIterator* _tmp2_; - gboolean _tmp3_; MediaSource* source = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp3_; + gpointer _tmp4_; GFile* use_source_file = NULL; PhotoFileFormat real_export_format = 0; - PhotoFileFormat _tmp6_; gchar* basename = NULL; - MediaSource* _tmp7_; - const gchar* _tmp19_; - GFile* _tmp20_; + MediaSource* _tmp5_; + const gchar* _tmp16_; + GFile* _tmp17_; GFile* export_dir = NULL; - GFile* _tmp33_; - GFile* _tmp34_; + GFile* _tmp29_; + GFile* _tmp30_; GFile* dest = NULL; - GFile* _tmp35_; - Workers* _tmp74_; - MediaSource* _tmp75_; - GFile* _tmp76_; - Scaling _tmp77_; - ExportFormatParameters _tmp78_; - JpegQuality _tmp79_; - PhotoFileFormat _tmp80_; - GCancellable* _tmp81_; - ExportFormatParameters _tmp82_; - ExportFormatMode _tmp83_; - ExportFormatParameters _tmp84_; - gboolean _tmp85_; - ExporterExportJob* _tmp86_; - ExporterExportJob* _tmp87_; - gint _tmp88_; + GFile* _tmp31_; + Workers* _tmp67_; + MediaSource* _tmp68_; + GFile* _tmp69_; + Scaling _tmp70_; + ExportFormatParameters _tmp71_; + JpegQuality _tmp72_; + PhotoFileFormat _tmp73_; + GCancellable* _tmp74_; + ExportFormatParameters _tmp75_; + ExportFormatMode _tmp76_; + ExportFormatParameters _tmp77_; + gboolean _tmp78_; + ExporterExportJob* _tmp79_; + ExporterExportJob* _tmp80_; + gint _tmp81_; #line 196 "/home/jens/Source/shotwell/src/Exporter.vala" _tmp2_ = _source_it; #line 196 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 196 "/home/jens/Source/shotwell/src/Exporter.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 196 "/home/jens/Source/shotwell/src/Exporter.vala" break; -#line 1274 "Exporter.c" +#line 1429 "Exporter.c" } #line 196 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp4_ = _source_it; + _tmp3_ = _source_it; #line 196 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 196 "/home/jens/Source/shotwell/src/Exporter.vala" - source = (MediaSource*) _tmp5_; + source = (MediaSource*) _tmp4_; #line 197 "/home/jens/Source/shotwell/src/Exporter.vala" use_source_file = NULL; #line 198 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp6_ = photo_file_format_get_system_default_format (); -#line 198 "/home/jens/Source/shotwell/src/Exporter.vala" - real_export_format = _tmp6_; + real_export_format = photo_file_format_get_system_default_format (); #line 199 "/home/jens/Source/shotwell/src/Exporter.vala" basename = NULL; #line 200 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp7_ = source; + _tmp5_ = source; #line 200 "/home/jens/Source/shotwell/src/Exporter.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_PHOTO)) { -#line 1294 "Exporter.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_PHOTO)) { +#line 1447 "Exporter.c" Photo* photo = NULL; - MediaSource* _tmp8_; - Photo* _tmp9_; + MediaSource* _tmp6_; + Photo* _tmp7_; + Photo* _tmp8_; + ExportFormatParameters _tmp9_; Photo* _tmp10_; ExportFormatParameters _tmp11_; - PhotoFileFormat _tmp12_; - Photo* _tmp13_; - ExportFormatParameters _tmp14_; - gchar* _tmp15_; + gchar* _tmp12_; #line 201 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp8_ = source; + _tmp6_ = source; #line 201 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo)); + _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo)); #line 201 "/home/jens/Source/shotwell/src/Exporter.vala" - photo = _tmp9_; + photo = _tmp7_; #line 202 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp10_ = photo; -#line 202 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp11_ = self->priv->export_params; + _tmp8_ = photo; #line 202 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp12_ = photo_get_export_format_for_parameters (_tmp10_, &_tmp11_); + _tmp9_ = self->priv->export_params; #line 202 "/home/jens/Source/shotwell/src/Exporter.vala" - real_export_format = _tmp12_; + real_export_format = photo_get_export_format_for_parameters (_tmp8_, &_tmp9_); #line 203 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp13_ = photo; + _tmp10_ = photo; #line 203 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp14_ = self->priv->export_params; + _tmp11_ = self->priv->export_params; #line 203 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp15_ = photo_get_export_basename_for_parameters (_tmp13_, &_tmp14_); + _tmp12_ = photo_get_export_basename_for_parameters (_tmp10_, &_tmp11_); #line 203 "/home/jens/Source/shotwell/src/Exporter.vala" _g_free0 (basename); #line 203 "/home/jens/Source/shotwell/src/Exporter.vala" - basename = _tmp15_; + basename = _tmp12_; #line 200 "/home/jens/Source/shotwell/src/Exporter.vala" _g_object_unref0 (photo); -#line 1330 "Exporter.c" +#line 1480 "Exporter.c" } else { - MediaSource* _tmp16_; + MediaSource* _tmp13_; #line 204 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp16_ = source; + _tmp13_ = source; #line 204 "/home/jens/Source/shotwell/src/Exporter.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_VIDEO)) { -#line 1337 "Exporter.c" - MediaSource* _tmp17_; - gchar* _tmp18_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_VIDEO)) { +#line 1487 "Exporter.c" + MediaSource* _tmp14_; + gchar* _tmp15_; #line 205 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp17_ = source; + _tmp14_ = source; #line 205 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp18_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_VIDEO, Video), TYPE_MEDIA_SOURCE, MediaSource)); + _tmp15_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_VIDEO, Video), TYPE_MEDIA_SOURCE, MediaSource)); #line 205 "/home/jens/Source/shotwell/src/Exporter.vala" _g_free0 (basename); #line 205 "/home/jens/Source/shotwell/src/Exporter.vala" - basename = _tmp18_; -#line 1348 "Exporter.c" + basename = _tmp15_; +#line 1498 "Exporter.c" } } #line 207 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp19_ = basename; + _tmp16_ = basename; #line 207 "/home/jens/Source/shotwell/src/Exporter.vala" - _vala_assert (_tmp19_ != NULL, "basename != null"); + _vala_assert (_tmp16_ != NULL, "basename != null"); #line 209 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp20_ = use_source_file; + _tmp17_ = use_source_file; #line 209 "/home/jens/Source/shotwell/src/Exporter.vala" - if (_tmp20_ != NULL) { -#line 1359 "Exporter.c" - GFile** _tmp21_; - gint _tmp21__length1; - GFile* _tmp22_; - GFile* _tmp23_; - gint _tmp24_; - ProgressMonitor _tmp25_; - void* _tmp25__target; + if (_tmp17_ != NULL) { +#line 1509 "Exporter.c" + GFile** _tmp18_; + gint _tmp18__length1; + GFile* _tmp19_; + GFile* _tmp20_; + gint _tmp21_; + ProgressMonitor _tmp22_; + void* _tmp22__target; #line 210 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp21_ = self->priv->exported_files; + _tmp18_ = self->priv->exported_files; #line 210 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp21__length1 = self->priv->exported_files_length1; + _tmp18__length1 = self->priv->exported_files_length1; #line 210 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp22_ = use_source_file; + _tmp19_ = use_source_file; #line 210 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp23_ = _g_object_ref0 (_tmp22_); + _tmp20_ = _g_object_ref0 (_tmp19_); #line 210 "/home/jens/Source/shotwell/src/Exporter.vala" - _vala_array_add130 (&self->priv->exported_files, &self->priv->exported_files_length1, &self->priv->_exported_files_size_, _tmp23_); + _vala_array_add130 (&self->priv->exported_files, &self->priv->exported_files_length1, &self->priv->_exported_files_size_, _tmp20_); #line 212 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp24_ = self->priv->completed_count; + _tmp21_ = self->priv->completed_count; #line 212 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->completed_count = _tmp24_ + 1; + self->priv->completed_count = _tmp21_ + 1; #line 213 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp25_ = self->priv->monitor; + _tmp22_ = self->priv->monitor; #line 213 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp25__target = self->priv->monitor_target; + _tmp22__target = self->priv->monitor_target; #line 213 "/home/jens/Source/shotwell/src/Exporter.vala" - if (_tmp25_ != NULL) { -#line 1387 "Exporter.c" - ProgressMonitor _tmp26_; - void* _tmp26__target; + if (_tmp22_ != NULL) { +#line 1537 "Exporter.c" + ProgressMonitor _tmp23_; + void* _tmp23__target; + gint _tmp24_; + GeeCollection* _tmp25_; + gint _tmp26_; gint _tmp27_; - GeeCollection* _tmp28_; - gint _tmp29_; - gint _tmp30_; - gboolean _tmp31_; -#line 214 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp26_ = self->priv->monitor; #line 214 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp26__target = self->priv->monitor_target; + _tmp23_ = self->priv->monitor; #line 214 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp27_ = self->priv->completed_count; + _tmp23__target = self->priv->monitor_target; #line 214 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp28_ = self->priv->to_export; + _tmp24_ = self->priv->completed_count; #line 214 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp29_ = gee_collection_get_size (_tmp28_); + _tmp25_ = self->priv->to_export; #line 214 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp30_ = _tmp29_; + _tmp26_ = gee_collection_get_size (_tmp25_); #line 214 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp31_ = _tmp26_ ((guint64) _tmp27_, (guint64) _tmp30_, TRUE, _tmp26__target); + _tmp27_ = _tmp26_; #line 214 "/home/jens/Source/shotwell/src/Exporter.vala" - if (!_tmp31_) { -#line 1411 "Exporter.c" - GCancellable* _tmp32_; + if (!_tmp23_ ((guint64) _tmp24_, (guint64) _tmp27_, TRUE, _tmp23__target)) { +#line 1558 "Exporter.c" + GCancellable* _tmp28_; #line 215 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp32_ = self->priv->cancellable; + _tmp28_ = self->priv->cancellable; #line 215 "/home/jens/Source/shotwell/src/Exporter.vala" - g_cancellable_cancel (_tmp32_); + g_cancellable_cancel (_tmp28_); #line 217 "/home/jens/Source/shotwell/src/Exporter.vala" result = FALSE; #line 217 "/home/jens/Source/shotwell/src/Exporter.vala" @@ -1425,7 +1572,7 @@ static gboolean exporter_process_queue (Exporter* self) { _g_object_unref0 (_source_it); #line 217 "/home/jens/Source/shotwell/src/Exporter.vala" return result; -#line 1429 "Exporter.c" +#line 1576 "Exporter.c" } } #line 221 "/home/jens/Source/shotwell/src/Exporter.vala" @@ -1436,107 +1583,107 @@ static gboolean exporter_process_queue (Exporter* self) { _g_object_unref0 (source); #line 221 "/home/jens/Source/shotwell/src/Exporter.vala" continue; -#line 1440 "Exporter.c" +#line 1587 "Exporter.c" } #line 224 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp33_ = self->priv->dir; + _tmp29_ = self->priv->dir; #line 224 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp34_ = _g_object_ref0 (_tmp33_); + _tmp30_ = _g_object_ref0 (_tmp29_); #line 224 "/home/jens/Source/shotwell/src/Exporter.vala" - export_dir = _tmp34_; + export_dir = _tmp30_; #line 225 "/home/jens/Source/shotwell/src/Exporter.vala" dest = NULL; #line 227 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp35_ = export_dir; + _tmp31_ = export_dir; #line 227 "/home/jens/Source/shotwell/src/Exporter.vala" - if (_tmp35_ == NULL) { -#line 1454 "Exporter.c" + if (_tmp31_ == NULL) { +#line 1601 "Exporter.c" { gboolean collision = FALSE; - GFile* _tmp36_ = NULL; + GFile* _tmp32_ = NULL; + GFile* _tmp33_; + GFile* _tmp34_; + const gchar* _tmp35_; + gboolean _tmp36_ = FALSE; GFile* _tmp37_; GFile* _tmp38_; - const gchar* _tmp39_; - gboolean _tmp40_ = FALSE; - GFile* _tmp41_; - GFile* _tmp42_; - GFile* _tmp43_; + GFile* _tmp39_; #line 230 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp37_ = app_dirs_get_temp_dir (); + _tmp33_ = app_dirs_get_temp_dir (); #line 230 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp38_ = _tmp37_; + _tmp34_ = _tmp33_; #line 230 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp39_ = basename; + _tmp35_ = basename; #line 230 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp41_ = generate_unique_file (_tmp38_, _tmp39_, &_tmp40_, &_inner_error_); + _tmp37_ = generate_unique_file (_tmp34_, _tmp35_, &_tmp36_, &_inner_error_); #line 230 "/home/jens/Source/shotwell/src/Exporter.vala" - collision = _tmp40_; + collision = _tmp36_; #line 230 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp42_ = _tmp41_; + _tmp38_ = _tmp37_; #line 230 "/home/jens/Source/shotwell/src/Exporter.vala" - _g_object_unref0 (_tmp38_); + _g_object_unref0 (_tmp34_); #line 230 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp36_ = _tmp42_; + _tmp32_ = _tmp38_; #line 230 "/home/jens/Source/shotwell/src/Exporter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1483 "Exporter.c" +#line 1630 "Exporter.c" goto __catch488_g_error; } #line 230 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp43_ = _tmp36_; + _tmp39_ = _tmp32_; #line 230 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp36_ = NULL; + _tmp32_ = NULL; #line 230 "/home/jens/Source/shotwell/src/Exporter.vala" _g_object_unref0 (dest); #line 230 "/home/jens/Source/shotwell/src/Exporter.vala" - dest = _tmp43_; + dest = _tmp39_; #line 228 "/home/jens/Source/shotwell/src/Exporter.vala" - _g_object_unref0 (_tmp36_); -#line 1496 "Exporter.c" + _g_object_unref0 (_tmp32_); +#line 1643 "Exporter.c" } goto __finally488; __catch488_g_error: { GError* err = NULL; - MediaSource* _tmp44_; - GFile* _tmp45_; - GFile* _tmp46_; + MediaSource* _tmp40_; + GFile* _tmp41_; + GFile* _tmp42_; + gchar* _tmp43_; + gchar* _tmp44_; + GError* _tmp45_; + const gchar* _tmp46_; gchar* _tmp47_; gchar* _tmp48_; - GError* _tmp49_; - const gchar* _tmp50_; - gchar* _tmp51_; - gchar* _tmp52_; #line 228 "/home/jens/Source/shotwell/src/Exporter.vala" err = _inner_error_; #line 228 "/home/jens/Source/shotwell/src/Exporter.vala" _inner_error_ = NULL; #line 232 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp44_ = source; + _tmp40_ = source; #line 232 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp45_ = media_source_get_file (_tmp44_); + _tmp41_ = media_source_get_file (_tmp40_); #line 232 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp46_ = _tmp45_; -#line 232 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp47_ = g_file_get_basename (_tmp46_); + _tmp42_ = _tmp41_; #line 232 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp48_ = _tmp47_; + _tmp43_ = g_file_get_basename (_tmp42_); #line 232 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp49_ = err; + _tmp44_ = _tmp43_; #line 232 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp50_ = _tmp49_->message; + _tmp45_ = err; #line 232 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp51_ = g_strdup_printf (_ ("Unable to generate a temporary file for %s: %s"), _tmp48_, _tmp50_); + _tmp46_ = _tmp45_->message; #line 232 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp52_ = _tmp51_; + _tmp47_ = g_strdup_printf (_ ("Unable to generate a temporary file for %s: %s"), _tmp44_, _tmp46_); #line 232 "/home/jens/Source/shotwell/src/Exporter.vala" - app_window_error_message (_tmp52_, NULL); + _tmp48_ = _tmp47_; #line 232 "/home/jens/Source/shotwell/src/Exporter.vala" - _g_free0 (_tmp52_); + app_window_error_message (_tmp48_, NULL); #line 232 "/home/jens/Source/shotwell/src/Exporter.vala" _g_free0 (_tmp48_); #line 232 "/home/jens/Source/shotwell/src/Exporter.vala" - _g_object_unref0 (_tmp46_); + _g_free0 (_tmp44_); +#line 232 "/home/jens/Source/shotwell/src/Exporter.vala" + _g_object_unref0 (_tmp42_); #line 235 "/home/jens/Source/shotwell/src/Exporter.vala" _g_error_free0 (err); #line 235 "/home/jens/Source/shotwell/src/Exporter.vala" @@ -1551,13 +1698,13 @@ static gboolean exporter_process_queue (Exporter* self) { _g_object_unref0 (source); #line 235 "/home/jens/Source/shotwell/src/Exporter.vala" break; -#line 1555 "Exporter.c" +#line 1702 "Exporter.c" } __finally488: #line 228 "/home/jens/Source/shotwell/src/Exporter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1560 "Exporter.c" - gboolean _tmp53_ = FALSE; +#line 1707 "Exporter.c" + gboolean _tmp49_ = FALSE; #line 228 "/home/jens/Source/shotwell/src/Exporter.vala" _g_object_unref0 (dest); #line 228 "/home/jens/Source/shotwell/src/Exporter.vala" @@ -1575,88 +1722,82 @@ static gboolean exporter_process_queue (Exporter* self) { #line 228 "/home/jens/Source/shotwell/src/Exporter.vala" g_clear_error (&_inner_error_); #line 228 "/home/jens/Source/shotwell/src/Exporter.vala" - return _tmp53_; -#line 1580 "Exporter.c" + return _tmp49_; +#line 1727 "Exporter.c" } } else { - GFile* _tmp54_; - const gchar* _tmp55_; - GFile* _tmp56_; - gboolean _tmp57_ = FALSE; - gboolean _tmp58_; + GFile* _tmp50_; + const gchar* _tmp51_; + GFile* _tmp52_; + gboolean _tmp53_ = FALSE; + gboolean _tmp54_; #line 238 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp54_ = self->priv->dir; + _tmp50_ = self->priv->dir; #line 238 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp55_ = basename; + _tmp51_ = basename; #line 238 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp56_ = g_file_get_child (_tmp54_, _tmp55_); + _tmp52_ = g_file_get_child (_tmp50_, _tmp51_); #line 238 "/home/jens/Source/shotwell/src/Exporter.vala" _g_object_unref0 (dest); #line 238 "/home/jens/Source/shotwell/src/Exporter.vala" - dest = _tmp56_; + dest = _tmp52_; #line 240 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp58_ = self->priv->replace_all; + _tmp54_ = self->priv->replace_all; #line 240 "/home/jens/Source/shotwell/src/Exporter.vala" - if (!_tmp58_) { -#line 1602 "Exporter.c" - GFile* _tmp59_; - gboolean _tmp60_; + if (!_tmp54_) { +#line 1749 "Exporter.c" + GFile* _tmp55_; #line 240 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp59_ = dest; + _tmp55_ = dest; #line 240 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp60_ = g_file_query_exists (_tmp59_, NULL); -#line 240 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp57_ = _tmp60_; -#line 1611 "Exporter.c" + _tmp53_ = g_file_query_exists (_tmp55_, NULL); +#line 1755 "Exporter.c" } else { #line 240 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp57_ = FALSE; -#line 1615 "Exporter.c" + _tmp53_ = FALSE; +#line 1759 "Exporter.c" } #line 240 "/home/jens/Source/shotwell/src/Exporter.vala" - if (_tmp57_) { -#line 1619 "Exporter.c" - ExporterOverwriteCallback _tmp61_; - void* _tmp61__target; - GFile* _tmp62_; - ExporterOverwrite _tmp63_; -#line 241 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp61_ = self->priv->overwrite_callback; + if (_tmp53_) { +#line 1763 "Exporter.c" + ExporterOverwriteCallback _tmp56_; + void* _tmp56__target; + GFile* _tmp57_; #line 241 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp61__target = self->priv->overwrite_callback_target; + _tmp56_ = self->priv->overwrite_callback; #line 241 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp62_ = dest; + _tmp56__target = self->priv->overwrite_callback_target; #line 241 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp63_ = _tmp61_ (self, _tmp62_, _tmp61__target); + _tmp57_ = dest; #line 241 "/home/jens/Source/shotwell/src/Exporter.vala" - switch (_tmp63_) { + switch (_tmp56_ (self, _tmp57_, _tmp56__target)) { #line 241 "/home/jens/Source/shotwell/src/Exporter.vala" case EXPORTER_OVERWRITE_YES: -#line 1636 "Exporter.c" +#line 1777 "Exporter.c" { #line 244 "/home/jens/Source/shotwell/src/Exporter.vala" break; -#line 1640 "Exporter.c" +#line 1781 "Exporter.c" } #line 241 "/home/jens/Source/shotwell/src/Exporter.vala" case EXPORTER_OVERWRITE_REPLACE_ALL: -#line 1644 "Exporter.c" +#line 1785 "Exporter.c" { #line 247 "/home/jens/Source/shotwell/src/Exporter.vala" self->priv->replace_all = TRUE; #line 248 "/home/jens/Source/shotwell/src/Exporter.vala" break; -#line 1650 "Exporter.c" +#line 1791 "Exporter.c" } #line 241 "/home/jens/Source/shotwell/src/Exporter.vala" case EXPORTER_OVERWRITE_CANCEL: -#line 1654 "Exporter.c" +#line 1795 "Exporter.c" { - GCancellable* _tmp64_; + GCancellable* _tmp58_; #line 251 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp64_ = self->priv->cancellable; + _tmp58_ = self->priv->cancellable; #line 251 "/home/jens/Source/shotwell/src/Exporter.vala" - g_cancellable_cancel (_tmp64_); + g_cancellable_cancel (_tmp58_); #line 253 "/home/jens/Source/shotwell/src/Exporter.vala" result = FALSE; #line 253 "/home/jens/Source/shotwell/src/Exporter.vala" @@ -1673,56 +1814,53 @@ static gboolean exporter_process_queue (Exporter* self) { _g_object_unref0 (_source_it); #line 253 "/home/jens/Source/shotwell/src/Exporter.vala" return result; -#line 1677 "Exporter.c" +#line 1818 "Exporter.c" } default: #line 241 "/home/jens/Source/shotwell/src/Exporter.vala" case EXPORTER_OVERWRITE_NO: -#line 1682 "Exporter.c" +#line 1823 "Exporter.c" { - gint _tmp65_; - ProgressMonitor _tmp66_; - void* _tmp66__target; + gint _tmp59_; + ProgressMonitor _tmp60_; + void* _tmp60__target; #line 257 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp65_ = self->priv->completed_count; + _tmp59_ = self->priv->completed_count; #line 257 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->completed_count = _tmp65_ + 1; + self->priv->completed_count = _tmp59_ + 1; #line 258 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp66_ = self->priv->monitor; + _tmp60_ = self->priv->monitor; #line 258 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp66__target = self->priv->monitor_target; + _tmp60__target = self->priv->monitor_target; #line 258 "/home/jens/Source/shotwell/src/Exporter.vala" - if (_tmp66_ != NULL) { -#line 1697 "Exporter.c" - ProgressMonitor _tmp67_; - void* _tmp67__target; - gint _tmp68_; - GeeCollection* _tmp69_; - gint _tmp70_; - gint _tmp71_; - gboolean _tmp72_; + if (_tmp60_ != NULL) { +#line 1838 "Exporter.c" + ProgressMonitor _tmp61_; + void* _tmp61__target; + gint _tmp62_; + GeeCollection* _tmp63_; + gint _tmp64_; + gint _tmp65_; #line 259 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp67_ = self->priv->monitor; + _tmp61_ = self->priv->monitor; #line 259 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp67__target = self->priv->monitor_target; + _tmp61__target = self->priv->monitor_target; #line 259 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp68_ = self->priv->completed_count; + _tmp62_ = self->priv->completed_count; #line 259 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp69_ = self->priv->to_export; + _tmp63_ = self->priv->to_export; #line 259 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp70_ = gee_collection_get_size (_tmp69_); + _tmp64_ = gee_collection_get_size (_tmp63_); #line 259 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp71_ = _tmp70_; + _tmp65_ = _tmp64_; #line 259 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp72_ = _tmp67_ ((guint64) _tmp68_, (guint64) _tmp71_, TRUE, _tmp67__target); -#line 259 "/home/jens/Source/shotwell/src/Exporter.vala" - if (!_tmp72_) { -#line 1721 "Exporter.c" - GCancellable* _tmp73_; + if (!_tmp61_ ((guint64) _tmp62_, (guint64) _tmp65_, TRUE, _tmp61__target)) { +#line 1859 "Exporter.c" + GCancellable* _tmp66_; #line 260 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp73_ = self->priv->cancellable; + _tmp66_ = self->priv->cancellable; #line 260 "/home/jens/Source/shotwell/src/Exporter.vala" - g_cancellable_cancel (_tmp73_); + g_cancellable_cancel (_tmp66_); #line 262 "/home/jens/Source/shotwell/src/Exporter.vala" result = FALSE; #line 262 "/home/jens/Source/shotwell/src/Exporter.vala" @@ -1739,52 +1877,52 @@ static gboolean exporter_process_queue (Exporter* self) { _g_object_unref0 (_source_it); #line 262 "/home/jens/Source/shotwell/src/Exporter.vala" return result; -#line 1743 "Exporter.c" +#line 1881 "Exporter.c" } } #line 266 "/home/jens/Source/shotwell/src/Exporter.vala" continue; -#line 1748 "Exporter.c" +#line 1886 "Exporter.c" } } } } #line 271 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp74_ = self->priv->workers; + _tmp67_ = self->priv->workers; #line 271 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp75_ = source; + _tmp68_ = source; #line 271 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp76_ = dest; + _tmp69_ = dest; #line 271 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp77_ = self->priv->scaling; + _tmp70_ = self->priv->scaling; #line 271 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp78_ = self->priv->export_params; + _tmp71_ = self->priv->export_params; #line 271 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp79_ = _tmp78_.quality; + _tmp72_ = _tmp71_.quality; #line 271 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp80_ = real_export_format; + _tmp73_ = real_export_format; #line 271 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp81_ = self->priv->cancellable; + _tmp74_ = self->priv->cancellable; #line 271 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp82_ = self->priv->export_params; + _tmp75_ = self->priv->export_params; #line 271 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp83_ = _tmp82_.mode; + _tmp76_ = _tmp75_.mode; #line 271 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp84_ = self->priv->export_params; + _tmp77_ = self->priv->export_params; #line 271 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp85_ = _tmp84_.export_metadata; + _tmp78_ = _tmp77_.export_metadata; #line 271 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp86_ = exporter_export_job_new (self, _tmp75_, _tmp76_, &_tmp77_, &_tmp79_, &_tmp80_, _tmp81_, _tmp83_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp85_); + _tmp79_ = exporter_export_job_new (self, _tmp68_, _tmp69_, &_tmp70_, &_tmp72_, &_tmp73_, _tmp74_, _tmp76_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp78_); #line 271 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp87_ = _tmp86_; + _tmp80_ = _tmp79_; #line 271 "/home/jens/Source/shotwell/src/Exporter.vala" - workers_enqueue (_tmp74_, G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_BACKGROUND_JOB, BackgroundJob)); + workers_enqueue (_tmp67_, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 271 "/home/jens/Source/shotwell/src/Exporter.vala" - _background_job_unref0 (_tmp87_); + _background_job_unref0 (_tmp80_); #line 273 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp88_ = submitted; + _tmp81_ = submitted; #line 273 "/home/jens/Source/shotwell/src/Exporter.vala" - submitted = _tmp88_ + 1; + submitted = _tmp81_ + 1; #line 196 "/home/jens/Source/shotwell/src/Exporter.vala" _g_object_unref0 (dest); #line 196 "/home/jens/Source/shotwell/src/Exporter.vala" @@ -1795,26 +1933,28 @@ static gboolean exporter_process_queue (Exporter* self) { _g_object_unref0 (use_source_file); #line 196 "/home/jens/Source/shotwell/src/Exporter.vala" _g_object_unref0 (source); -#line 1799 "Exporter.c" +#line 1937 "Exporter.c" } #line 196 "/home/jens/Source/shotwell/src/Exporter.vala" _g_object_unref0 (_source_it); -#line 1803 "Exporter.c" +#line 1941 "Exporter.c" } #line 276 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp89_ = submitted; + _tmp82_ = submitted; #line 276 "/home/jens/Source/shotwell/src/Exporter.vala" - result = _tmp89_ > 0; + result = _tmp82_ > 0; #line 276 "/home/jens/Source/shotwell/src/Exporter.vala" return result; -#line 1811 "Exporter.c" +#line 1949 "Exporter.c" } -static void exporter_export_completed (Exporter* self, gboolean is_cancelled) { +static void +exporter_export_completed (Exporter* self, + gboolean is_cancelled) +{ ExporterCompletionCallback _tmp0_; void* _tmp0__target; - gboolean _tmp1_; #line 279 "/home/jens/Source/shotwell/src/Exporter.vala" g_return_if_fail (IS_EXPORTER (self)); #line 280 "/home/jens/Source/shotwell/src/Exporter.vala" @@ -1822,35 +1962,43 @@ static void exporter_export_completed (Exporter* self, gboolean is_cancelled) { #line 280 "/home/jens/Source/shotwell/src/Exporter.vala" _tmp0__target = self->priv->completion_callback_target; #line 280 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp1_ = is_cancelled; -#line 280 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp0_ (self, _tmp1_, _tmp0__target); -#line 1829 "Exporter.c" + _tmp0_ (self, is_cancelled, _tmp0__target); +#line 1967 "Exporter.c" } -static void _exporter_on_exported_completion_callback (BackgroundJob* job, gpointer self) { +static void +_exporter_on_exported_completion_callback (BackgroundJob* job, + gpointer self) +{ #line 81 "/home/jens/Source/shotwell/src/Exporter.vala" exporter_on_exported ((Exporter*) self, job); -#line 1836 "Exporter.c" +#line 1977 "Exporter.c" } -static void _exporter_on_export_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { +static void +_exporter_on_export_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self) +{ #line 81 "/home/jens/Source/shotwell/src/Exporter.vala" exporter_on_export_cancelled ((Exporter*) self, job); -#line 1843 "Exporter.c" +#line 1987 "Exporter.c" } -static gpointer _scaling_dup0 (gpointer self) { +static gpointer +_scaling_dup0 (gpointer self) +{ #line 87 "/home/jens/Source/shotwell/src/Exporter.vala" return self ? scaling_dup (self) : NULL; -#line 1850 "Exporter.c" +#line 1996 "Exporter.c" } -static JpegQuality* _jpeg_quality_dup (JpegQuality* self) { +static JpegQuality* +_jpeg_quality_dup (JpegQuality* self) +{ JpegQuality* dup; #line 88 "/home/jens/Source/shotwell/src/Exporter.vala" dup = g_new0 (JpegQuality, 1); @@ -1858,18 +2006,22 @@ static JpegQuality* _jpeg_quality_dup (JpegQuality* self) { memcpy (dup, self, sizeof (JpegQuality)); #line 88 "/home/jens/Source/shotwell/src/Exporter.vala" return dup; -#line 1862 "Exporter.c" +#line 2010 "Exporter.c" } -static gpointer __jpeg_quality_dup0 (gpointer self) { +static gpointer +__jpeg_quality_dup0 (gpointer self) +{ #line 88 "/home/jens/Source/shotwell/src/Exporter.vala" return self ? _jpeg_quality_dup (self) : NULL; -#line 1869 "Exporter.c" +#line 2019 "Exporter.c" } -static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self) { +static PhotoFileFormat* +_photo_file_format_dup (PhotoFileFormat* self) +{ PhotoFileFormat* dup; #line 89 "/home/jens/Source/shotwell/src/Exporter.vala" dup = g_new0 (PhotoFileFormat, 1); @@ -1877,37 +2029,38 @@ static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self) { memcpy (dup, self, sizeof (PhotoFileFormat)); #line 89 "/home/jens/Source/shotwell/src/Exporter.vala" return dup; -#line 1881 "Exporter.c" +#line 2033 "Exporter.c" } -static gpointer __photo_file_format_dup0 (gpointer self) { +static gpointer +__photo_file_format_dup0 (gpointer self) +{ #line 89 "/home/jens/Source/shotwell/src/Exporter.vala" return self ? _photo_file_format_dup (self) : NULL; -#line 1888 "Exporter.c" -} - - -static ExporterExportJob* exporter_export_job_construct (GType object_type, Exporter* owner, MediaSource* media, GFile* dest, Scaling* scaling, JpegQuality* quality, PhotoFileFormat* format, GCancellable* cancellable, gboolean direct_copy_unmodified, gboolean export_metadata) { +#line 2042 "Exporter.c" +} + + +static ExporterExportJob* +exporter_export_job_construct (GType object_type, + Exporter* owner, + MediaSource* media, + GFile* dest, + Scaling* scaling, + JpegQuality* quality, + PhotoFileFormat* format, + GCancellable* cancellable, + gboolean direct_copy_unmodified, + gboolean export_metadata) +{ ExporterExportJob* self = NULL; - Exporter* _tmp0_; - Exporter* _tmp1_; - GCancellable* _tmp2_; - Exporter* _tmp3_; - gboolean _tmp4_ = FALSE; - MediaSource* _tmp5_; - MediaSource* _tmp7_; - MediaSource* _tmp8_; - GFile* _tmp9_; - GFile* _tmp10_; - Scaling* _tmp11_; - Scaling* _tmp12_; - JpegQuality* _tmp13_; - JpegQuality* _tmp14_; - PhotoFileFormat* _tmp15_; - PhotoFileFormat* _tmp16_; - gboolean _tmp17_; - gboolean _tmp18_; + gboolean _tmp0_ = FALSE; + MediaSource* _tmp1_; + GFile* _tmp2_; + Scaling* _tmp3_; + JpegQuality* _tmp4_; + PhotoFileFormat* _tmp5_; #line 78 "/home/jens/Source/shotwell/src/Exporter.vala" g_return_val_if_fail (IS_EXPORTER (owner), NULL); #line 78 "/home/jens/Source/shotwell/src/Exporter.vala" @@ -1917,113 +2070,100 @@ static ExporterExportJob* exporter_export_job_construct (GType object_type, Expo #line 78 "/home/jens/Source/shotwell/src/Exporter.vala" g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL); #line 81 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp0_ = owner; -#line 81 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp1_ = owner; -#line 81 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp2_ = cancellable; -#line 81 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp3_ = owner; -#line 81 "/home/jens/Source/shotwell/src/Exporter.vala" - self = (ExporterExportJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _exporter_on_exported_completion_callback, _tmp1_, _tmp2_, _exporter_on_export_cancelled_cancellation_callback, _tmp3_, NULL); -#line 83 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp5_ = media; + self = (ExporterExportJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), _exporter_on_exported_completion_callback, owner, cancellable, _exporter_on_export_cancelled_cancellation_callback, owner, NULL); #line 83 "/home/jens/Source/shotwell/src/Exporter.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_PHOTO)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (media, TYPE_PHOTO)) { #line 83 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp4_ = TRUE; -#line 1936 "Exporter.c" + _tmp0_ = TRUE; +#line 2079 "Exporter.c" } else { - MediaSource* _tmp6_; #line 83 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp6_ = media; -#line 83 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_VIDEO); -#line 1943 "Exporter.c" + _tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (media, TYPE_VIDEO); +#line 2083 "Exporter.c" } #line 83 "/home/jens/Source/shotwell/src/Exporter.vala" - _vala_assert (_tmp4_, "media is Photo || media is Video"); -#line 85 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp7_ = media; + _vala_assert (_tmp0_, "media is Photo || media is Video"); #line 85 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp8_ = _g_object_ref0 (_tmp7_); + _tmp1_ = _g_object_ref0 (media); #line 85 "/home/jens/Source/shotwell/src/Exporter.vala" _g_object_unref0 (self->media); #line 85 "/home/jens/Source/shotwell/src/Exporter.vala" - self->media = _tmp8_; + self->media = _tmp1_; #line 86 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp9_ = dest; -#line 86 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp10_ = _g_object_ref0 (_tmp9_); + _tmp2_ = _g_object_ref0 (dest); #line 86 "/home/jens/Source/shotwell/src/Exporter.vala" _g_object_unref0 (self->dest); #line 86 "/home/jens/Source/shotwell/src/Exporter.vala" - self->dest = _tmp10_; -#line 87 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp11_ = scaling; + self->dest = _tmp2_; #line 87 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp12_ = _scaling_dup0 (_tmp11_); + _tmp3_ = _scaling_dup0 (scaling); #line 87 "/home/jens/Source/shotwell/src/Exporter.vala" _scaling_free0 (self->scaling); #line 87 "/home/jens/Source/shotwell/src/Exporter.vala" - self->scaling = _tmp12_; + self->scaling = _tmp3_; #line 88 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp13_ = quality; -#line 88 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp14_ = __jpeg_quality_dup0 (_tmp13_); + _tmp4_ = __jpeg_quality_dup0 (quality); #line 88 "/home/jens/Source/shotwell/src/Exporter.vala" _g_free0 (self->quality); #line 88 "/home/jens/Source/shotwell/src/Exporter.vala" - self->quality = _tmp14_; -#line 89 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp15_ = format; + self->quality = _tmp4_; #line 89 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp16_ = __photo_file_format_dup0 (_tmp15_); + _tmp5_ = __photo_file_format_dup0 (format); #line 89 "/home/jens/Source/shotwell/src/Exporter.vala" _g_free0 (self->format); #line 89 "/home/jens/Source/shotwell/src/Exporter.vala" - self->format = _tmp16_; + self->format = _tmp5_; #line 90 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp17_ = direct_copy_unmodified; -#line 90 "/home/jens/Source/shotwell/src/Exporter.vala" - self->direct_copy_unmodified = _tmp17_; -#line 91 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp18_ = export_metadata; + self->direct_copy_unmodified = direct_copy_unmodified; #line 91 "/home/jens/Source/shotwell/src/Exporter.vala" - self->export_metadata = _tmp18_; + self->export_metadata = export_metadata; #line 78 "/home/jens/Source/shotwell/src/Exporter.vala" return self; -#line 1997 "Exporter.c" +#line 2123 "Exporter.c" } -static ExporterExportJob* exporter_export_job_new (Exporter* owner, MediaSource* media, GFile* dest, Scaling* scaling, JpegQuality* quality, PhotoFileFormat* format, GCancellable* cancellable, gboolean direct_copy_unmodified, gboolean export_metadata) { +static ExporterExportJob* +exporter_export_job_new (Exporter* owner, + MediaSource* media, + GFile* dest, + Scaling* scaling, + JpegQuality* quality, + PhotoFileFormat* format, + GCancellable* cancellable, + gboolean direct_copy_unmodified, + gboolean export_metadata) +{ #line 78 "/home/jens/Source/shotwell/src/Exporter.vala" return exporter_export_job_construct (EXPORTER_TYPE_EXPORT_JOB, owner, media, dest, scaling, quality, format, cancellable, direct_copy_unmodified, export_metadata); -#line 2004 "Exporter.c" +#line 2140 "Exporter.c" } -static gpointer _g_error_copy0 (gpointer self) { +static gpointer +_g_error_copy0 (gpointer self) +{ #line 102 "/home/jens/Source/shotwell/src/Exporter.vala" return self ? g_error_copy (self) : NULL; -#line 2011 "Exporter.c" +#line 2149 "Exporter.c" } -static void exporter_export_job_real_execute (BackgroundJob* base) { +static void +exporter_export_job_real_execute (BackgroundJob* base) +{ ExporterExportJob * self; GError * _inner_error_ = NULL; #line 94 "/home/jens/Source/shotwell/src/Exporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EXPORTER_TYPE_EXPORT_JOB, ExporterExportJob); -#line 2020 "Exporter.c" +#line 2160 "Exporter.c" { MediaSource* _tmp0_; #line 96 "/home/jens/Source/shotwell/src/Exporter.vala" _tmp0_ = self->media; #line 96 "/home/jens/Source/shotwell/src/Exporter.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO)) { -#line 2027 "Exporter.c" +#line 2167 "Exporter.c" MediaSource* _tmp1_; GFile* _tmp2_; Scaling* _tmp3_; @@ -2052,7 +2192,7 @@ static void exporter_export_job_real_execute (BackgroundJob* base) { photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO, Photo), _tmp2_, &_tmp8_, *_tmp4_, *_tmp5_, _tmp6_, _tmp7_, &_inner_error_); #line 97 "/home/jens/Source/shotwell/src/Exporter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2056 "Exporter.c" +#line 2196 "Exporter.c" goto __catch489_g_error; } } else { @@ -2061,7 +2201,7 @@ static void exporter_export_job_real_execute (BackgroundJob* base) { _tmp9_ = self->media; #line 98 "/home/jens/Source/shotwell/src/Exporter.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_VIDEO)) { -#line 2065 "Exporter.c" +#line 2205 "Exporter.c" MediaSource* _tmp10_; GFile* _tmp11_; #line 99 "/home/jens/Source/shotwell/src/Exporter.vala" @@ -2072,7 +2212,7 @@ static void exporter_export_job_real_execute (BackgroundJob* base) { video_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_VIDEO, Video), _tmp11_, &_inner_error_); #line 99 "/home/jens/Source/shotwell/src/Exporter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2076 "Exporter.c" +#line 2216 "Exporter.c" goto __catch489_g_error; } } @@ -2098,7 +2238,7 @@ static void exporter_export_job_real_execute (BackgroundJob* base) { self->err = _tmp13_; #line 95 "/home/jens/Source/shotwell/src/Exporter.vala" _g_error_free0 (err); -#line 2102 "Exporter.c" +#line 2242 "Exporter.c" } __finally489: #line 95 "/home/jens/Source/shotwell/src/Exporter.vala" @@ -2109,34 +2249,40 @@ static void exporter_export_job_real_execute (BackgroundJob* base) { g_clear_error (&_inner_error_); #line 95 "/home/jens/Source/shotwell/src/Exporter.vala" return; -#line 2113 "Exporter.c" +#line 2253 "Exporter.c" } } -static void exporter_export_job_class_init (ExporterExportJobClass * klass) { +static void +exporter_export_job_class_init (ExporterExportJobClass * klass) +{ #line 68 "/home/jens/Source/shotwell/src/Exporter.vala" exporter_export_job_parent_class = g_type_class_peek_parent (klass); #line 68 "/home/jens/Source/shotwell/src/Exporter.vala" ((BackgroundJobClass *) klass)->finalize = exporter_export_job_finalize; #line 68 "/home/jens/Source/shotwell/src/Exporter.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) exporter_export_job_real_execute; -#line 2125 "Exporter.c" +#line 2267 "Exporter.c" } -static void exporter_export_job_instance_init (ExporterExportJob * self) { +static void +exporter_export_job_instance_init (ExporterExportJob * self) +{ #line 74 "/home/jens/Source/shotwell/src/Exporter.vala" self->err = NULL; #line 75 "/home/jens/Source/shotwell/src/Exporter.vala" self->direct_copy_unmodified = FALSE; #line 76 "/home/jens/Source/shotwell/src/Exporter.vala" self->export_metadata = TRUE; -#line 2136 "Exporter.c" +#line 2280 "Exporter.c" } -static void exporter_export_job_finalize (BackgroundJob * obj) { +static void +exporter_export_job_finalize (BackgroundJob * obj) +{ ExporterExportJob * self; #line 68 "/home/jens/Source/shotwell/src/Exporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EXPORTER_TYPE_EXPORT_JOB, ExporterExportJob); @@ -2154,11 +2300,13 @@ static void exporter_export_job_finalize (BackgroundJob * obj) { _g_error_free0 (self->err); #line 68 "/home/jens/Source/shotwell/src/Exporter.vala" BACKGROUND_JOB_CLASS (exporter_export_job_parent_class)->finalize (obj); -#line 2158 "Exporter.c" +#line 2304 "Exporter.c" } -static GType exporter_export_job_get_type (void) { +static GType +exporter_export_job_get_type (void) +{ static volatile gsize exporter_export_job_type_id__volatile = 0; if (g_once_init_enter (&exporter_export_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ExporterExportJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) exporter_export_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ExporterExportJob), 0, (GInstanceInitFunc) exporter_export_job_instance_init, NULL }; @@ -2170,21 +2318,24 @@ static GType exporter_export_job_get_type (void) { } -static void exporter_class_init (ExporterClass * klass) { +static void +exporter_class_init (ExporterClass * klass) +{ #line 53 "/home/jens/Source/shotwell/src/Exporter.vala" exporter_parent_class = g_type_class_peek_parent (klass); #line 53 "/home/jens/Source/shotwell/src/Exporter.vala" g_type_class_add_private (klass, sizeof (ExporterPrivate)); #line 53 "/home/jens/Source/shotwell/src/Exporter.vala" G_OBJECT_CLASS (klass)->finalize = exporter_finalize; -#line 2181 "Exporter.c" +#line 2331 "Exporter.c" } -static void exporter_instance_init (Exporter * self) { +static void +exporter_instance_init (Exporter * self) +{ GeeArrayList* _tmp0_; - guint _tmp1_; - Workers* _tmp2_; + Workers* _tmp1_; #line 53 "/home/jens/Source/shotwell/src/Exporter.vala" self->priv = EXPORTER_GET_PRIVATE (self); #line 107 "/home/jens/Source/shotwell/src/Exporter.vala" @@ -2194,11 +2345,9 @@ static void exporter_instance_init (Exporter * self) { #line 111 "/home/jens/Source/shotwell/src/Exporter.vala" self->priv->completed_count = 0; #line 112 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp1_ = workers_threads_per_cpu (1, 4); -#line 112 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp2_ = workers_new (_tmp1_, FALSE); + _tmp1_ = workers_new (workers_threads_per_cpu (1, 4), FALSE); #line 112 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->workers = _tmp2_; + self->priv->workers = _tmp1_; #line 113 "/home/jens/Source/shotwell/src/Exporter.vala" self->priv->completion_callback = NULL; #line 113 "/home/jens/Source/shotwell/src/Exporter.vala" @@ -2219,11 +2368,13 @@ static void exporter_instance_init (Exporter * self) { self->priv->replace_all = FALSE; #line 119 "/home/jens/Source/shotwell/src/Exporter.vala" self->priv->aborted = FALSE; -#line 2223 "Exporter.c" +#line 2372 "Exporter.c" } -static void exporter_finalize (GObject * obj) { +static void +exporter_finalize (GObject * obj) +{ Exporter * self; #line 53 "/home/jens/Source/shotwell/src/Exporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXPORTER, Exporter); @@ -2239,11 +2390,13 @@ static void exporter_finalize (GObject * obj) { _g_object_unref0 (self->priv->cancellable); #line 53 "/home/jens/Source/shotwell/src/Exporter.vala" G_OBJECT_CLASS (exporter_parent_class)->finalize (obj); -#line 2243 "Exporter.c" +#line 2394 "Exporter.c" } -GType exporter_get_type (void) { +GType +exporter_get_type (void) +{ static volatile gsize exporter_type_id__volatile = 0; if (g_once_init_enter (&exporter_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ExporterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) exporter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Exporter), 0, (GInstanceInitFunc) exporter_instance_init, NULL }; @@ -2255,135 +2408,156 @@ GType exporter_get_type (void) { } -ExporterUI* exporter_ui_construct (GType object_type, Exporter* exporter) { +ExporterUI* +exporter_ui_construct (GType object_type, + Exporter* exporter) +{ ExporterUI* self = NULL; Exporter* _tmp0_; - Exporter* _tmp1_; #line 290 "/home/jens/Source/shotwell/src/Exporter.vala" g_return_val_if_fail (IS_EXPORTER (exporter), NULL); #line 290 "/home/jens/Source/shotwell/src/Exporter.vala" self = (ExporterUI*) g_type_create_instance (object_type); #line 291 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp0_ = exporter; -#line 291 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (exporter); #line 291 "/home/jens/Source/shotwell/src/Exporter.vala" _g_object_unref0 (self->priv->exporter); #line 291 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->exporter = _tmp1_; + self->priv->exporter = _tmp0_; #line 290 "/home/jens/Source/shotwell/src/Exporter.vala" return self; -#line 2277 "Exporter.c" +#line 2430 "Exporter.c" } -ExporterUI* exporter_ui_new (Exporter* exporter) { +ExporterUI* +exporter_ui_new (Exporter* exporter) +{ #line 290 "/home/jens/Source/shotwell/src/Exporter.vala" return exporter_ui_construct (TYPE_EXPORTER_UI, exporter); -#line 2284 "Exporter.c" +#line 2439 "Exporter.c" } -static void _exporter_ui_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) { +static void +_exporter_ui_on_export_completed_exporter_completion_callback (Exporter* exporter, + gboolean is_cancelled, + gpointer self) +{ #line 300 "/home/jens/Source/shotwell/src/Exporter.vala" exporter_ui_on_export_completed ((ExporterUI*) self, exporter, is_cancelled); -#line 2291 "Exporter.c" +#line 2450 "Exporter.c" } -static gboolean _exporter_ui_on_export_failed_exporter_export_failed_callback (Exporter* exporter, GFile* file, gint remaining, GError* err, gpointer self) { +static gboolean +_exporter_ui_on_export_failed_exporter_export_failed_callback (Exporter* exporter, + GFile* file, + gint remaining, + GError* err, + gpointer self) +{ gboolean result; result = exporter_ui_on_export_failed ((ExporterUI*) self, exporter, file, remaining, err); #line 300 "/home/jens/Source/shotwell/src/Exporter.vala" return result; -#line 2300 "Exporter.c" +#line 2465 "Exporter.c" } -static ExporterOverwrite _exporter_ui_on_export_overwrite_exporter_overwrite_callback (Exporter* exporter, GFile* file, gpointer self) { +static ExporterOverwrite +_exporter_ui_on_export_overwrite_exporter_overwrite_callback (Exporter* exporter, + GFile* file, + gpointer self) +{ ExporterOverwrite result; result = exporter_ui_on_export_overwrite ((ExporterUI*) self, exporter, file); #line 300 "/home/jens/Source/shotwell/src/Exporter.vala" return result; -#line 2309 "Exporter.c" +#line 2478 "Exporter.c" } -static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) { +static gboolean +_progress_dialog_monitor_progress_monitor (guint64 current, + guint64 total, + gboolean do_event_loop, + gpointer self) +{ gboolean result; result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop); #line 300 "/home/jens/Source/shotwell/src/Exporter.vala" return result; -#line 2318 "Exporter.c" +#line 2492 "Exporter.c" } -void exporter_ui_export (ExporterUI* self, ExporterCompletionCallback completion_callback, void* completion_callback_target) { - ExporterCompletionCallback _tmp0_; - void* _tmp0__target; +void +exporter_ui_export (ExporterUI* self, + ExporterCompletionCallback completion_callback, + void* completion_callback_target) +{ + AppWindow* _tmp0_; AppWindow* _tmp1_; AppWindow* _tmp2_; AppWindow* _tmp3_; - AppWindow* _tmp4_; - GCancellable* _tmp5_; - ProgressDialog* _tmp6_; - Exporter* _tmp7_; - GCancellable* _tmp8_; - ProgressDialog* _tmp9_; + GCancellable* _tmp4_; + ProgressDialog* _tmp5_; + Exporter* _tmp6_; + GCancellable* _tmp7_; + ProgressDialog* _tmp8_; #line 294 "/home/jens/Source/shotwell/src/Exporter.vala" g_return_if_fail (IS_EXPORTER_UI (self)); #line 295 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp0_ = completion_callback; + self->priv->completion_callback = completion_callback; #line 295 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp0__target = completion_callback_target; -#line 295 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->completion_callback = _tmp0_; -#line 295 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->completion_callback_target = _tmp0__target; + self->priv->completion_callback_target = completion_callback_target; #line 297 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp1_ = app_window_get_instance (); + _tmp0_ = app_window_get_instance (); #line 297 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 297 "/home/jens/Source/shotwell/src/Exporter.vala" - page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE_WINDOW, PageWindow)); #line 297 "/home/jens/Source/shotwell/src/Exporter.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 299 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp3_ = app_window_get_instance (); + _tmp2_ = app_window_get_instance (); #line 299 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 299 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp5_ = self->priv->cancellable; + _tmp4_ = self->priv->cancellable; #line 299 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp6_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow), _ ("Exporting"), _tmp5_); + _tmp5_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_window_get_type (), GtkWindow), _ ("Exporting"), _tmp4_); #line 299 "/home/jens/Source/shotwell/src/Exporter.vala" - g_object_ref_sink (_tmp6_); + g_object_ref_sink (_tmp5_); #line 299 "/home/jens/Source/shotwell/src/Exporter.vala" _g_object_unref0 (self->priv->progress_dialog); #line 299 "/home/jens/Source/shotwell/src/Exporter.vala" - self->priv->progress_dialog = _tmp6_; + self->priv->progress_dialog = _tmp5_; #line 299 "/home/jens/Source/shotwell/src/Exporter.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 300 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp7_ = self->priv->exporter; + _tmp6_ = self->priv->exporter; #line 300 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp8_ = self->priv->cancellable; + _tmp7_ = self->priv->cancellable; #line 300 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp9_ = self->priv->progress_dialog; + _tmp8_ = self->priv->progress_dialog; #line 300 "/home/jens/Source/shotwell/src/Exporter.vala" - exporter_export (_tmp7_, _exporter_ui_on_export_completed_exporter_completion_callback, self, _exporter_ui_on_export_failed_exporter_export_failed_callback, self, _exporter_ui_on_export_overwrite_exporter_overwrite_callback, self, _tmp8_, _progress_dialog_monitor_progress_monitor, _tmp9_); -#line 2376 "Exporter.c" + exporter_export (_tmp6_, _exporter_ui_on_export_completed_exporter_completion_callback, self, _exporter_ui_on_export_failed_exporter_export_failed_callback, self, _exporter_ui_on_export_overwrite_exporter_overwrite_callback, self, _tmp7_, _progress_dialog_monitor_progress_monitor, _tmp8_); +#line 2548 "Exporter.c" } -static void exporter_ui_on_export_completed (ExporterUI* self, Exporter* exporter, gboolean is_cancelled) { +static void +exporter_ui_on_export_completed (ExporterUI* self, + Exporter* exporter, + gboolean is_cancelled) +{ ProgressDialog* _tmp0_; AppWindow* _tmp2_; AppWindow* _tmp3_; ExporterCompletionCallback _tmp4_; void* _tmp4__target; - Exporter* _tmp5_; - gboolean _tmp6_; #line 304 "/home/jens/Source/shotwell/src/Exporter.vala" g_return_if_fail (IS_EXPORTER_UI (self)); #line 304 "/home/jens/Source/shotwell/src/Exporter.vala" @@ -2392,7 +2566,7 @@ static void exporter_ui_on_export_completed (ExporterUI* self, Exporter* exporte _tmp0_ = self->priv->progress_dialog; #line 305 "/home/jens/Source/shotwell/src/Exporter.vala" if (_tmp0_ != NULL) { -#line 2396 "Exporter.c" +#line 2570 "Exporter.c" ProgressDialog* _tmp1_; #line 306 "/home/jens/Source/shotwell/src/Exporter.vala" _tmp1_ = self->priv->progress_dialog; @@ -2402,7 +2576,7 @@ static void exporter_ui_on_export_completed (ExporterUI* self, Exporter* exporte _g_object_unref0 (self->priv->progress_dialog); #line 307 "/home/jens/Source/shotwell/src/Exporter.vala" self->priv->progress_dialog = NULL; -#line 2406 "Exporter.c" +#line 2580 "Exporter.c" } #line 310 "/home/jens/Source/shotwell/src/Exporter.vala" _tmp2_ = app_window_get_instance (); @@ -2417,29 +2591,27 @@ static void exporter_ui_on_export_completed (ExporterUI* self, Exporter* exporte #line 312 "/home/jens/Source/shotwell/src/Exporter.vala" _tmp4__target = self->priv->completion_callback_target; #line 312 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp5_ = exporter; -#line 312 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp6_ = is_cancelled; -#line 312 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp4_ (_tmp5_, _tmp6_, _tmp4__target); -#line 2426 "Exporter.c" + _tmp4_ (exporter, is_cancelled, _tmp4__target); +#line 2596 "Exporter.c" } -static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Exporter* exporter, GFile* file) { +static ExporterOverwrite +exporter_ui_on_export_overwrite (ExporterUI* self, + Exporter* exporter, + GFile* file) +{ ExporterOverwrite result = 0; ProgressDialog* _tmp0_; gchar* question = NULL; - GFile* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; GtkResponseType response = 0; - const gchar* _tmp6_; + const gchar* _tmp5_; + ProgressDialog* _tmp6_; GtkResponseType _tmp7_; - ProgressDialog* _tmp8_; - GtkResponseType _tmp9_; #line 315 "/home/jens/Source/shotwell/src/Exporter.vala" g_return_val_if_fail (IS_EXPORTER_UI (self), 0); #line 315 "/home/jens/Source/shotwell/src/Exporter.vala" @@ -2451,36 +2623,32 @@ static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Expo #line 316 "/home/jens/Source/shotwell/src/Exporter.vala" gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_window_get_type (), GtkWindow), FALSE); #line 317 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp1_ = file; -#line 317 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp2_ = g_file_get_basename (_tmp1_); + _tmp1_ = g_file_get_basename (file); #line 317 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 317 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp4_ = g_strdup_printf (_ ("File %s already exists. Replace?"), _tmp3_); + _tmp3_ = g_strdup_printf (_ ("File %s already exists. Replace?"), _tmp2_); #line 317 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 317 "/home/jens/Source/shotwell/src/Exporter.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 317 "/home/jens/Source/shotwell/src/Exporter.vala" - question = _tmp5_; + question = _tmp4_; #line 318 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp6_ = question; + _tmp5_ = question; #line 318 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp7_ = app_window_negate_affirm_all_cancel_question (_tmp6_, _ ("_Skip"), _ ("_Replace"), _ ("Replace _All"), _ ("Export"), NULL); -#line 318 "/home/jens/Source/shotwell/src/Exporter.vala" - response = _tmp7_; + response = app_window_negate_affirm_all_cancel_question (_tmp5_, _ ("_Skip"), _ ("_Replace"), _ ("Replace _All"), _ ("Export"), NULL); #line 321 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp8_ = self->priv->progress_dialog; + _tmp6_ = self->priv->progress_dialog; #line 321 "/home/jens/Source/shotwell/src/Exporter.vala" - gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), TRUE); + gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), TRUE); #line 323 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp9_ = response; + _tmp7_ = response; #line 323 "/home/jens/Source/shotwell/src/Exporter.vala" - switch (_tmp9_) { + switch (_tmp7_) { #line 323 "/home/jens/Source/shotwell/src/Exporter.vala" case GTK_RESPONSE_APPLY: -#line 2484 "Exporter.c" +#line 2652 "Exporter.c" { #line 325 "/home/jens/Source/shotwell/src/Exporter.vala" result = EXPORTER_OVERWRITE_REPLACE_ALL; @@ -2488,11 +2656,11 @@ static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Expo _g_free0 (question); #line 325 "/home/jens/Source/shotwell/src/Exporter.vala" return result; -#line 2492 "Exporter.c" +#line 2660 "Exporter.c" } #line 323 "/home/jens/Source/shotwell/src/Exporter.vala" case GTK_RESPONSE_YES: -#line 2496 "Exporter.c" +#line 2664 "Exporter.c" { #line 328 "/home/jens/Source/shotwell/src/Exporter.vala" result = EXPORTER_OVERWRITE_YES; @@ -2500,11 +2668,11 @@ static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Expo _g_free0 (question); #line 328 "/home/jens/Source/shotwell/src/Exporter.vala" return result; -#line 2504 "Exporter.c" +#line 2672 "Exporter.c" } #line 323 "/home/jens/Source/shotwell/src/Exporter.vala" case GTK_RESPONSE_CANCEL: -#line 2508 "Exporter.c" +#line 2676 "Exporter.c" { #line 331 "/home/jens/Source/shotwell/src/Exporter.vala" result = EXPORTER_OVERWRITE_CANCEL; @@ -2512,12 +2680,12 @@ static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Expo _g_free0 (question); #line 331 "/home/jens/Source/shotwell/src/Exporter.vala" return result; -#line 2516 "Exporter.c" +#line 2684 "Exporter.c" } default: #line 323 "/home/jens/Source/shotwell/src/Exporter.vala" case GTK_RESPONSE_NO: -#line 2521 "Exporter.c" +#line 2689 "Exporter.c" { #line 335 "/home/jens/Source/shotwell/src/Exporter.vala" result = EXPORTER_OVERWRITE_NO; @@ -2525,20 +2693,23 @@ static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Expo _g_free0 (question); #line 335 "/home/jens/Source/shotwell/src/Exporter.vala" return result; -#line 2529 "Exporter.c" +#line 2697 "Exporter.c" } } #line 315 "/home/jens/Source/shotwell/src/Exporter.vala" _g_free0 (question); -#line 2534 "Exporter.c" +#line 2702 "Exporter.c" } -static gboolean exporter_ui_on_export_failed (ExporterUI* self, Exporter* exporter, GFile* file, gint remaining, GError* err) { +static gboolean +exporter_ui_on_export_failed (ExporterUI* self, + Exporter* exporter, + GFile* file, + gint remaining, + GError* err) +{ gboolean result = FALSE; - GFile* _tmp0_; - gint _tmp1_; - GtkResponseType _tmp2_; #line 339 "/home/jens/Source/shotwell/src/Exporter.vala" g_return_val_if_fail (IS_EXPORTER_UI (self), FALSE); #line 339 "/home/jens/Source/shotwell/src/Exporter.vala" @@ -2546,117 +2717,136 @@ static gboolean exporter_ui_on_export_failed (ExporterUI* self, Exporter* export #line 339 "/home/jens/Source/shotwell/src/Exporter.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 340 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp0_ = file; -#line 340 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp1_ = remaining; -#line 340 "/home/jens/Source/shotwell/src/Exporter.vala" - _tmp2_ = export_error_dialog (_tmp0_, _tmp1_ > 0); -#line 340 "/home/jens/Source/shotwell/src/Exporter.vala" - result = _tmp2_ != GTK_RESPONSE_CANCEL; + result = export_error_dialog (file, remaining > 0) != GTK_RESPONSE_CANCEL; #line 340 "/home/jens/Source/shotwell/src/Exporter.vala" return result; -#line 2559 "Exporter.c" +#line 2724 "Exporter.c" } -static void value_exporter_ui_init (GValue* value) { +static void +value_exporter_ui_init (GValue* value) +{ #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" value->data[0].v_pointer = NULL; -#line 2566 "Exporter.c" +#line 2733 "Exporter.c" } -static void value_exporter_ui_free_value (GValue* value) { +static void +value_exporter_ui_free_value (GValue* value) +{ #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" if (value->data[0].v_pointer) { #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" exporter_ui_unref (value->data[0].v_pointer); -#line 2575 "Exporter.c" +#line 2744 "Exporter.c" } } -static void value_exporter_ui_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_exporter_ui_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" if (src_value->data[0].v_pointer) { #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" dest_value->data[0].v_pointer = exporter_ui_ref (src_value->data[0].v_pointer); -#line 2585 "Exporter.c" +#line 2757 "Exporter.c" } else { #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" dest_value->data[0].v_pointer = NULL; -#line 2589 "Exporter.c" +#line 2761 "Exporter.c" } } -static gpointer value_exporter_ui_peek_pointer (const GValue* value) { +static gpointer +value_exporter_ui_peek_pointer (const GValue* value) +{ #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" return value->data[0].v_pointer; -#line 2597 "Exporter.c" +#line 2771 "Exporter.c" } -static gchar* value_exporter_ui_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_exporter_ui_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" if (collect_values[0].v_pointer) { -#line 2604 "Exporter.c" +#line 2783 "Exporter.c" ExporterUI * object; object = collect_values[0].v_pointer; #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" if (object->parent_instance.g_class == NULL) { #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2611 "Exporter.c" +#line 2790 "Exporter.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 284 "/home/jens/Source/shotwell/src/Exporter.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 2615 "Exporter.c" +#line 2794 "Exporter.c" } #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" value->data[0].v_pointer = exporter_ui_ref (object); -#line 2619 "Exporter.c" +#line 2798 "Exporter.c" } else { #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" value->data[0].v_pointer = NULL; -#line 2623 "Exporter.c" +#line 2802 "Exporter.c" } #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" return NULL; -#line 2627 "Exporter.c" +#line 2806 "Exporter.c" } -static gchar* value_exporter_ui_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_exporter_ui_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ ExporterUI ** object_p; object_p = collect_values[0].v_pointer; #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" if (!object_p) { #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2638 "Exporter.c" +#line 2822 "Exporter.c" } #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" if (!value->data[0].v_pointer) { #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" *object_p = NULL; -#line 2644 "Exporter.c" +#line 2828 "Exporter.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" *object_p = value->data[0].v_pointer; -#line 2648 "Exporter.c" +#line 2832 "Exporter.c" } else { #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" *object_p = exporter_ui_ref (value->data[0].v_pointer); -#line 2652 "Exporter.c" +#line 2836 "Exporter.c" } #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" return NULL; -#line 2656 "Exporter.c" +#line 2840 "Exporter.c" } -GParamSpec* param_spec_exporter_ui (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_exporter_ui (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecExporterUI* spec; #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_EXPORTER_UI), NULL); @@ -2666,20 +2856,25 @@ GParamSpec* param_spec_exporter_ui (const gchar* name, const gchar* nick, const G_PARAM_SPEC (spec)->value_type = object_type; #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" return G_PARAM_SPEC (spec); -#line 2670 "Exporter.c" +#line 2860 "Exporter.c" } -gpointer value_get_exporter_ui (const GValue* value) { +gpointer +value_get_exporter_ui (const GValue* value) +{ #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EXPORTER_UI), NULL); #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" return value->data[0].v_pointer; -#line 2679 "Exporter.c" +#line 2871 "Exporter.c" } -void value_set_exporter_ui (GValue* value, gpointer v_object) { +void +value_set_exporter_ui (GValue* value, + gpointer v_object) +{ ExporterUI * old; #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EXPORTER_UI)); @@ -2695,22 +2890,25 @@ void value_set_exporter_ui (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" exporter_ui_ref (value->data[0].v_pointer); -#line 2699 "Exporter.c" +#line 2894 "Exporter.c" } else { #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" value->data[0].v_pointer = NULL; -#line 2703 "Exporter.c" +#line 2898 "Exporter.c" } #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" if (old) { #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" exporter_ui_unref (old); -#line 2709 "Exporter.c" +#line 2904 "Exporter.c" } } -void value_take_exporter_ui (GValue* value, gpointer v_object) { +void +value_take_exporter_ui (GValue* value, + gpointer v_object) +{ ExporterUI * old; #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EXPORTER_UI)); @@ -2724,33 +2922,37 @@ void value_take_exporter_ui (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" value->data[0].v_pointer = v_object; -#line 2728 "Exporter.c" +#line 2926 "Exporter.c" } else { #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" value->data[0].v_pointer = NULL; -#line 2732 "Exporter.c" +#line 2930 "Exporter.c" } #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" if (old) { #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" exporter_ui_unref (old); -#line 2738 "Exporter.c" +#line 2936 "Exporter.c" } } -static void exporter_ui_class_init (ExporterUIClass * klass) { +static void +exporter_ui_class_init (ExporterUIClass * klass) +{ #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" exporter_ui_parent_class = g_type_class_peek_parent (klass); #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" ((ExporterUIClass *) klass)->finalize = exporter_ui_finalize; #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" g_type_class_add_private (klass, sizeof (ExporterUIPrivate)); -#line 2750 "Exporter.c" +#line 2950 "Exporter.c" } -static void exporter_ui_instance_init (ExporterUI * self) { +static void +exporter_ui_instance_init (ExporterUI * self) +{ GCancellable* _tmp0_; #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" self->priv = EXPORTER_UI_GET_PRIVATE (self); @@ -2766,11 +2968,13 @@ static void exporter_ui_instance_init (ExporterUI * self) { self->priv->completion_callback_target = self; #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" self->ref_count = 1; -#line 2770 "Exporter.c" +#line 2972 "Exporter.c" } -static void exporter_ui_finalize (ExporterUI * obj) { +static void +exporter_ui_finalize (ExporterUI * obj) +{ ExporterUI * self; #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXPORTER_UI, ExporterUI); @@ -2782,11 +2986,13 @@ static void exporter_ui_finalize (ExporterUI * obj) { _g_object_unref0 (self->priv->cancellable); #line 287 "/home/jens/Source/shotwell/src/Exporter.vala" _g_object_unref0 (self->priv->progress_dialog); -#line 2786 "Exporter.c" +#line 2990 "Exporter.c" } -GType exporter_ui_get_type (void) { +GType +exporter_ui_get_type (void) +{ static volatile gsize exporter_ui_type_id__volatile = 0; if (g_once_init_enter (&exporter_ui_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_exporter_ui_init, value_exporter_ui_free_value, value_exporter_ui_copy_value, value_exporter_ui_peek_pointer, "p", value_exporter_ui_collect_value, "p", value_exporter_ui_lcopy_value }; @@ -2800,18 +3006,22 @@ GType exporter_ui_get_type (void) { } -gpointer exporter_ui_ref (gpointer instance) { +gpointer +exporter_ui_ref (gpointer instance) +{ ExporterUI * self; self = instance; #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" g_atomic_int_inc (&self->ref_count); #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" return instance; -#line 2811 "Exporter.c" +#line 3019 "Exporter.c" } -void exporter_ui_unref (gpointer instance) { +void +exporter_ui_unref (gpointer instance) +{ ExporterUI * self; self = instance; #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" @@ -2820,12 +3030,16 @@ void exporter_ui_unref (gpointer instance) { EXPORTER_UI_GET_CLASS (self)->finalize (self); #line 284 "/home/jens/Source/shotwell/src/Exporter.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2824 "Exporter.c" +#line 3034 "Exporter.c" } } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -2837,7 +3051,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/International.c b/src/International.c index 422a7e4..01f33dd 100644 --- a/src/International.c +++ b/src/International.c @@ -1,4 +1,4 @@ -/* International.c generated by valac 0.36.6, the Vala compiler +/* International.c generated by valac 0.40.4, the Vala compiler * generated from International.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -23,135 +24,120 @@ #define TRANSLATABLE "translatable" #define INTERNATIONAL_SUPPORT_SYSTEM_LOCALE "" #define INTERNATIONAL_SUPPORT_LANGUAGE_SUPPORT_DIRECTORY _LANG_SUPPORT_DIR -void international_support_init (const gchar* package_name, gchar** args, int args_length1, const gchar* locale); -gchar* international_support_get_langpack_dir_path (gchar** args, int args_length1); +void international_support_init (const gchar* package_name, + gchar** args, + int args_length1, + const gchar* locale); +gchar* international_support_get_langpack_dir_path (gchar** args, + int args_length1); -void international_support_init (const gchar* package_name, gchar** args, int args_length1, const gchar* locale) { - const gchar* _tmp0_; - const gchar* _tmp1_; - gchar** _tmp2_; - gint _tmp2__length1; - gchar* _tmp3_; - gchar* _tmp4_; - const gchar* _tmp5_; - const gchar* _tmp6_; +void +international_support_init (const gchar* package_name, + gchar** args, + int args_length1, + const gchar* locale) +{ + gchar* _tmp0_; + gchar* _tmp1_; #line 15 "/home/jens/Source/shotwell/src/International.vala" g_return_if_fail (package_name != NULL); #line 15 "/home/jens/Source/shotwell/src/International.vala" g_return_if_fail (locale != NULL); #line 16 "/home/jens/Source/shotwell/src/International.vala" - _tmp0_ = locale; -#line 16 "/home/jens/Source/shotwell/src/International.vala" - setlocale (LC_ALL, _tmp0_); -#line 18 "/home/jens/Source/shotwell/src/International.vala" - _tmp1_ = package_name; + setlocale (LC_ALL, locale); #line 18 "/home/jens/Source/shotwell/src/International.vala" - _tmp2_ = args; + _tmp0_ = international_support_get_langpack_dir_path (args, args_length1); #line 18 "/home/jens/Source/shotwell/src/International.vala" - _tmp2__length1 = args_length1; -#line 18 "/home/jens/Source/shotwell/src/International.vala" - _tmp3_ = international_support_get_langpack_dir_path (_tmp2_, _tmp2__length1); -#line 18 "/home/jens/Source/shotwell/src/International.vala" - _tmp4_ = _tmp3_; + _tmp1_ = _tmp0_; #line 18 "/home/jens/Source/shotwell/src/International.vala" - bindtextdomain (_tmp1_, _tmp4_); + bindtextdomain (package_name, _tmp1_); #line 18 "/home/jens/Source/shotwell/src/International.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp1_); #line 19 "/home/jens/Source/shotwell/src/International.vala" - _tmp5_ = package_name; -#line 19 "/home/jens/Source/shotwell/src/International.vala" - bind_textdomain_codeset (_tmp5_, "UTF-8"); -#line 20 "/home/jens/Source/shotwell/src/International.vala" - _tmp6_ = package_name; + bind_textdomain_codeset (package_name, "UTF-8"); #line 20 "/home/jens/Source/shotwell/src/International.vala" - textdomain (_tmp6_); -#line 70 "International.c" + textdomain (package_name); +#line 62 "International.c" } -gchar* international_support_get_langpack_dir_path (gchar** args, int args_length1) { +gchar* +international_support_get_langpack_dir_path (gchar** args, + int args_length1) +{ gchar* result = NULL; GFile* local_langpack_dir = NULL; - gchar** _tmp0_; - gint _tmp0__length1; - const gchar* _tmp1_; + const gchar* _tmp0_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; + GFile* _tmp3_; GFile* _tmp4_; GFile* _tmp5_; GFile* _tmp6_; GFile* _tmp7_; GFile* _tmp8_; - GFile* _tmp9_; - gchar* _tmp10_ = NULL; - GFile* _tmp11_; - gboolean _tmp12_; -#line 24 "/home/jens/Source/shotwell/src/International.vala" - _tmp0_ = args; + gchar* _tmp9_ = NULL; + GFile* _tmp10_; #line 24 "/home/jens/Source/shotwell/src/International.vala" - _tmp0__length1 = args_length1; + _tmp0_ = args[0]; #line 24 "/home/jens/Source/shotwell/src/International.vala" - _tmp1_ = _tmp0_[0]; + _tmp1_ = g_find_program_in_path (_tmp0_); #line 24 "/home/jens/Source/shotwell/src/International.vala" - _tmp2_ = g_find_program_in_path (_tmp1_); + _tmp2_ = _tmp1_; #line 24 "/home/jens/Source/shotwell/src/International.vala" - _tmp3_ = _tmp2_; + _tmp3_ = g_file_new_for_path (_tmp2_); #line 24 "/home/jens/Source/shotwell/src/International.vala" - _tmp4_ = g_file_new_for_path (_tmp3_); -#line 24 "/home/jens/Source/shotwell/src/International.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 24 "/home/jens/Source/shotwell/src/International.vala" - _tmp6_ = g_file_get_parent (_tmp5_); + _tmp5_ = g_file_get_parent (_tmp4_); #line 24 "/home/jens/Source/shotwell/src/International.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 24 "/home/jens/Source/shotwell/src/International.vala" - _tmp8_ = g_file_get_child (_tmp7_, "locale-langpack"); + _tmp7_ = g_file_get_child (_tmp6_, "locale-langpack"); #line 24 "/home/jens/Source/shotwell/src/International.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 24 "/home/jens/Source/shotwell/src/International.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 24 "/home/jens/Source/shotwell/src/International.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 24 "/home/jens/Source/shotwell/src/International.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 24 "/home/jens/Source/shotwell/src/International.vala" - local_langpack_dir = _tmp9_; -#line 28 "/home/jens/Source/shotwell/src/International.vala" - _tmp11_ = local_langpack_dir; + local_langpack_dir = _tmp8_; #line 28 "/home/jens/Source/shotwell/src/International.vala" - _tmp12_ = g_file_query_exists (_tmp11_, NULL); + _tmp10_ = local_langpack_dir; #line 28 "/home/jens/Source/shotwell/src/International.vala" - if (_tmp12_) { -#line 127 "International.c" - GFile* _tmp13_; - gchar* _tmp14_; + if (g_file_query_exists (_tmp10_, NULL)) { +#line 113 "International.c" + GFile* _tmp11_; + gchar* _tmp12_; #line 28 "/home/jens/Source/shotwell/src/International.vala" - _tmp13_ = local_langpack_dir; + _tmp11_ = local_langpack_dir; #line 28 "/home/jens/Source/shotwell/src/International.vala" - _tmp14_ = g_file_get_path (_tmp13_); + _tmp12_ = g_file_get_path (_tmp11_); #line 28 "/home/jens/Source/shotwell/src/International.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp9_); #line 28 "/home/jens/Source/shotwell/src/International.vala" - _tmp10_ = _tmp14_; -#line 138 "International.c" + _tmp9_ = _tmp12_; +#line 124 "International.c" } else { - gchar* _tmp15_; + gchar* _tmp13_; #line 29 "/home/jens/Source/shotwell/src/International.vala" - _tmp15_ = g_strdup (INTERNATIONAL_SUPPORT_LANGUAGE_SUPPORT_DIRECTORY); + _tmp13_ = g_strdup (INTERNATIONAL_SUPPORT_LANGUAGE_SUPPORT_DIRECTORY); #line 29 "/home/jens/Source/shotwell/src/International.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp9_); #line 29 "/home/jens/Source/shotwell/src/International.vala" - _tmp10_ = _tmp15_; -#line 147 "International.c" + _tmp9_ = _tmp13_; +#line 133 "International.c" } #line 28 "/home/jens/Source/shotwell/src/International.vala" - result = _tmp10_; + result = _tmp9_; #line 28 "/home/jens/Source/shotwell/src/International.vala" _g_object_unref0 (local_langpack_dir); #line 28 "/home/jens/Source/shotwell/src/International.vala" return result; -#line 155 "International.c" +#line 141 "International.c" } diff --git a/src/LibraryFiles.c b/src/LibraryFiles.c index e2bfc0c..2f6ef37 100644 --- a/src/LibraryFiles.c +++ b/src/LibraryFiles.c @@ -1,4 +1,4 @@ -/* LibraryFiles.c generated by valac 0.36.6, the Vala compiler +/* LibraryFiles.c generated by valac 0.40.4, the Vala compiler * generated from LibraryFiles.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -134,88 +135,138 @@ void library_files_select_copy_function (void); GFile* app_dirs_get_import_dir (void); gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; -GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata* metadata, time_t ts, gboolean* collision, GError** error); +GFile* library_files_generate_unique_file (const gchar* basename, + MediaMetadata* metadata, + time_t ts, + gboolean* collision, + GError** error); gpointer metadata_date_time_ref (gpointer instance); void metadata_date_time_unref (gpointer instance); -GParamSpec* param_spec_metadata_date_time (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_metadata_date_time (GValue* value, gpointer v_object); -void value_take_metadata_date_time (GValue* value, gpointer v_object); +GParamSpec* param_spec_metadata_date_time (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_metadata_date_time (GValue* value, + gpointer v_object); +void value_take_metadata_date_time (GValue* value, + gpointer v_object); gpointer value_get_metadata_date_time (const GValue* value); GType metadata_date_time_get_type (void) G_GNUC_CONST; MetadataDateTime* media_metadata_get_creation_date_time (MediaMetadata* self); time_t metadata_date_time_get_timestamp (MetadataDateTime* self); GFile* app_dirs_get_baked_import_dir (time_t tm); gchar* library_files_convert_basename (const gchar* basename); -GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error); +GFile* generate_unique_file (GFile* dir, + const gchar* basename, + gboolean* collision, + GError** error); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); gboolean configuration_facade_get_use_lowercase_filenames (ConfigurationFacade* self); -GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callback, void* progress_callback_target, gboolean blacklist, GError** error); -time_t query_file_modified (GFile* file, GError** error); +GFile* library_files_duplicate (GFile* src, + GFileProgressCallback progress_callback, + void* progress_callback_target, + gboolean blacklist, + GError** error); +time_t query_file_modified (GFile* file, + GError** error); gboolean video_reader_is_supported_video_file (GFile* file); gpointer video_reader_ref (gpointer instance); void video_reader_unref (gpointer instance); -GParamSpec* param_spec_video_reader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_video_reader (GValue* value, gpointer v_object); -void value_take_video_reader (GValue* value, gpointer v_object); +GParamSpec* param_spec_video_reader (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_video_reader (GValue* value, + gpointer v_object); +void value_take_video_reader (GValue* value, + gpointer v_object); gpointer value_get_video_reader (const GValue* value); GType video_reader_get_type (void) G_GNUC_CONST; VideoReader* video_reader_new (GFile* file); -VideoReader* video_reader_construct (GType object_type, GFile* file); +VideoReader* video_reader_construct (GType object_type, + GFile* file); GType video_metadata_get_type (void) G_GNUC_CONST; -VideoMetadata* video_reader_read_metadata (VideoReader* self, GError** error); +VideoMetadata* video_reader_read_metadata (VideoReader* self, + GError** error); gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; GType photo_file_format_get_type (void) G_GNUC_CONST; PhotoFileFormat photo_file_format_get_by_file_extension (GFile* file); -PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gchar* filepath); +PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, + const gchar* filepath); GType photo_metadata_get_type (void) G_GNUC_CONST; -PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error); -void library_monitor_blacklist_file (GFile* file, const gchar* reason); -void library_files_fallback_copy (GFile* src, GFile* dst, GFileProgressCallback callback, void* callback_target, GError** error); +PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, + GError** error); +void library_monitor_blacklist_file (GFile* file, + const gchar* reason); +void library_files_fallback_copy (GFile* src, + GFile* dst, + GFileProgressCallback callback, + void* callback_target, + GError** error); void library_monitor_unblacklist_file (GFile* file); -gchar* md5_file (GFile* file, GError** error); +gchar* md5_file (GFile* file, + GError** error); -static gchar* bool_to_string (gboolean self) { +static gchar* +bool_to_string (gboolean self) +{ gchar* result = NULL; -#line 37 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 37 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (self) { -#line 197 "LibraryFiles.c" +#line 246 "LibraryFiles.c" gchar* _tmp0_; -#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 38 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_strdup ("true"); -#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 38 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _tmp0_; -#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 38 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 205 "LibraryFiles.c" +#line 254 "LibraryFiles.c" } else { gchar* _tmp1_; -#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 40 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = g_strdup ("false"); -#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 40 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _tmp1_; -#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 40 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 214 "LibraryFiles.c" +#line 263 "LibraryFiles.c" } } -void library_files_select_copy_function (void) { +void +library_files_select_copy_function (void) +{ GFile* import_dir = NULL; GFile* _tmp0_; gboolean _tmp6_; @@ -226,7 +277,7 @@ void library_files_select_copy_function (void) { _tmp0_ = app_dirs_get_import_dir (); #line 12 "/home/jens/Source/shotwell/src/LibraryFiles.vala" import_dir = _tmp0_; -#line 230 "LibraryFiles.c" +#line 281 "LibraryFiles.c" { GFileInfo* info = NULL; GFileInfo* _tmp1_; @@ -238,7 +289,7 @@ void library_files_select_copy_function (void) { info = _tmp1_; #line 15 "/home/jens/Source/shotwell/src/LibraryFiles.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 242 "LibraryFiles.c" +#line 293 "LibraryFiles.c" goto __catch471_g_error; } #line 16 "/home/jens/Source/shotwell/src/LibraryFiles.vala" @@ -251,7 +302,7 @@ void library_files_select_copy_function (void) { _g_free0 (_tmp3_); #line 14 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _g_object_unref0 (info); -#line 255 "LibraryFiles.c" +#line 306 "LibraryFiles.c" } goto __finally471; __catch471_g_error: @@ -273,7 +324,7 @@ void library_files_select_copy_function (void) { library_files_use_fallback_copy_func = TRUE; #line 14 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _g_error_free0 (_error_); -#line 277 "LibraryFiles.c" +#line 328 "LibraryFiles.c" } __finally471: #line 14 "/home/jens/Source/shotwell/src/LibraryFiles.vala" @@ -286,7 +337,7 @@ void library_files_select_copy_function (void) { g_clear_error (&_inner_error_); #line 14 "/home/jens/Source/shotwell/src/LibraryFiles.vala" return; -#line 290 "LibraryFiles.c" +#line 341 "LibraryFiles.c" } #line 22 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _tmp6_ = library_files_use_fallback_copy_func; @@ -300,107 +351,102 @@ void library_files_select_copy_function (void) { _g_free0 (_tmp8_); #line 11 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _g_object_unref0 (import_dir); -#line 304 "LibraryFiles.c" +#line 355 "LibraryFiles.c" } -static gpointer _g_error_copy0 (gpointer self) { +static gpointer +_g_error_copy0 (gpointer self) +{ #line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala" return self ? g_error_copy (self) : NULL; -#line 311 "LibraryFiles.c" +#line 364 "LibraryFiles.c" } -GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata* metadata, time_t ts, gboolean* collision, GError** error) { +GFile* +library_files_generate_unique_file (const gchar* basename, + MediaMetadata* metadata, + time_t ts, + gboolean* collision, + GError** error) +{ gboolean _vala_collision = FALSE; GFile* result = NULL; time_t timestamp = 0; - time_t _tmp0_; - MediaMetadata* _tmp1_; GFile* dir = NULL; - time_t _tmp9_; - GFile* _tmp10_; + time_t _tmp5_; + GFile* _tmp6_; gchar* newbasename = NULL; - const gchar* _tmp15_; - gchar* _tmp16_; - GFile* _tmp17_ = NULL; - GFile* _tmp18_; - gboolean _tmp19_ = FALSE; - GFile* _tmp20_; - GFile* _tmp21_; + gchar* _tmp11_; + GFile* _tmp12_ = NULL; + GFile* _tmp13_; + gboolean _tmp14_ = FALSE; + GFile* _tmp15_; + GFile* _tmp16_; GError * _inner_error_ = NULL; #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala" g_return_val_if_fail (basename != NULL, NULL); #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala" g_return_val_if_fail ((metadata == NULL) || IS_MEDIA_METADATA (metadata), NULL); #line 34 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp0_ = ts; -#line 34 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - timestamp = _tmp0_; -#line 35 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp1_ = metadata; + timestamp = ts; #line 35 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (_tmp1_ != NULL) { -#line 345 "LibraryFiles.c" + if (metadata != NULL) { +#line 397 "LibraryFiles.c" MetadataDateTime* date_time = NULL; - MediaMetadata* _tmp2_; - MetadataDateTime* _tmp3_; - MetadataDateTime* _tmp4_; + MetadataDateTime* _tmp0_; + MetadataDateTime* _tmp1_; #line 36 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp2_ = metadata; + _tmp0_ = media_metadata_get_creation_date_time (metadata); #line 36 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp3_ = media_metadata_get_creation_date_time (_tmp2_); -#line 36 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - date_time = _tmp3_; + date_time = _tmp0_; #line 37 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp4_ = date_time; + _tmp1_ = date_time; #line 37 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (_tmp4_ != NULL) { -#line 360 "LibraryFiles.c" - MetadataDateTime* _tmp5_; - time_t _tmp6_; -#line 38 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp5_ = date_time; + if (_tmp1_ != NULL) { +#line 409 "LibraryFiles.c" + MetadataDateTime* _tmp2_; #line 38 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp6_ = metadata_date_time_get_timestamp (_tmp5_); + _tmp2_ = date_time; #line 38 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - timestamp = _tmp6_; -#line 369 "LibraryFiles.c" + timestamp = metadata_date_time_get_timestamp (_tmp2_); +#line 415 "LibraryFiles.c" } else { - time_t _tmp7_; + time_t _tmp3_; #line 39 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp7_ = timestamp; + _tmp3_ = timestamp; #line 39 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (_tmp7_ == ((time_t) 0)) { -#line 376 "LibraryFiles.c" - time_t _tmp8_; + if (_tmp3_ == ((time_t) 0)) { +#line 422 "LibraryFiles.c" + time_t _tmp4_; #line 40 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp8_ = time (NULL); + _tmp4_ = time (NULL); #line 40 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - timestamp = _tmp8_; -#line 382 "LibraryFiles.c" + timestamp = _tmp4_; +#line 428 "LibraryFiles.c" } } #line 35 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _metadata_date_time_unref0 (date_time); -#line 387 "LibraryFiles.c" +#line 433 "LibraryFiles.c" } #line 44 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp9_ = timestamp; + _tmp5_ = timestamp; #line 44 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp10_ = app_dirs_get_baked_import_dir (_tmp9_); + _tmp6_ = app_dirs_get_baked_import_dir (_tmp5_); #line 44 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - dir = _tmp10_; -#line 395 "LibraryFiles.c" + dir = _tmp6_; +#line 441 "LibraryFiles.c" { - GFile* _tmp11_; + GFile* _tmp7_; #line 46 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp11_ = dir; + _tmp7_ = dir; #line 46 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - g_file_make_directory_with_parents (_tmp11_, NULL, &_inner_error_); + g_file_make_directory_with_parents (_tmp7_, NULL, &_inner_error_); #line 46 "/home/jens/Source/shotwell/src/LibraryFiles.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 404 "LibraryFiles.c" +#line 450 "LibraryFiles.c" goto __catch472_g_error; } } @@ -408,32 +454,32 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata* __catch472_g_error: { GError* err = NULL; - GError* _tmp12_; + GError* _tmp8_; #line 45 "/home/jens/Source/shotwell/src/LibraryFiles.vala" err = _inner_error_; #line 45 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _inner_error_ = NULL; #line 48 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp12_ = err; + _tmp8_ = err; #line 48 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (!g_error_matches (_tmp12_, G_IO_ERROR, G_IO_ERROR_EXISTS)) { -#line 421 "LibraryFiles.c" - GError* _tmp13_; - GError* _tmp14_; + if (!g_error_matches (_tmp8_, G_IO_ERROR, G_IO_ERROR_EXISTS)) { +#line 467 "LibraryFiles.c" + GError* _tmp9_; + GError* _tmp10_; #line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp13_ = err; + _tmp9_ = err; #line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp14_ = _g_error_copy0 (_tmp13_); + _tmp10_ = _g_error_copy0 (_tmp9_); #line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _inner_error_ = _tmp14_; + _inner_error_ = _tmp10_; #line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _g_error_free0 (err); -#line 432 "LibraryFiles.c" +#line 478 "LibraryFiles.c" goto __finally472; } #line 45 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _g_error_free0 (err); -#line 437 "LibraryFiles.c" +#line 483 "LibraryFiles.c" } __finally472: #line 45 "/home/jens/Source/shotwell/src/LibraryFiles.vala" @@ -444,22 +490,20 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata* _g_object_unref0 (dir); #line 45 "/home/jens/Source/shotwell/src/LibraryFiles.vala" return NULL; -#line 448 "LibraryFiles.c" +#line 494 "LibraryFiles.c" } #line 55 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp15_ = basename; -#line 55 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp16_ = library_files_convert_basename (_tmp15_); + _tmp11_ = library_files_convert_basename (basename); #line 55 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - newbasename = _tmp16_; + newbasename = _tmp11_; #line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp18_ = dir; + _tmp13_ = dir; #line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp20_ = generate_unique_file (_tmp18_, newbasename, &_tmp19_, &_inner_error_); + _tmp15_ = generate_unique_file (_tmp13_, newbasename, &_tmp14_, &_inner_error_); #line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _vala_collision = _tmp19_; + _vala_collision = _tmp14_; #line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp17_ = _tmp20_; + _tmp12_ = _tmp15_; #line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala" @@ -470,16 +514,16 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata* _g_object_unref0 (dir); #line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala" return NULL; -#line 474 "LibraryFiles.c" +#line 518 "LibraryFiles.c" } #line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp21_ = _tmp17_; + _tmp16_ = _tmp12_; #line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp17_ = NULL; + _tmp12_ = NULL; #line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - result = _tmp21_; + result = _tmp16_; #line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _g_object_unref0 (_tmp17_); + _g_object_unref0 (_tmp12_); #line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _g_free0 (newbasename); #line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala" @@ -488,20 +532,21 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata* if (collision) { #line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala" *collision = _vala_collision; -#line 492 "LibraryFiles.c" +#line 536 "LibraryFiles.c" } #line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala" return result; -#line 496 "LibraryFiles.c" +#line 540 "LibraryFiles.c" } -gchar* library_files_convert_basename (const gchar* basename) { +gchar* +library_files_convert_basename (const gchar* basename) +{ gchar* result = NULL; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; #line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala" g_return_val_if_fail (basename != NULL, NULL); #line 63 "/home/jens/Source/shotwell/src/LibraryFiles.vala" @@ -510,113 +555,98 @@ gchar* library_files_convert_basename (const gchar* basename) { _tmp1_ = _tmp0_; #line 63 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _tmp2_ = configuration_facade_get_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 63 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp3_ = _tmp2_; #line 63 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _g_object_unref0 (_tmp1_); #line 63 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (_tmp3_) { -#line 520 "LibraryFiles.c" - const gchar* _tmp4_; - gchar* _tmp5_; -#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp4_ = basename; + if (_tmp2_) { +#line 563 "LibraryFiles.c" + gchar* _tmp3_; #line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp5_ = g_utf8_strdown (_tmp4_, (gssize) -1); + _tmp3_ = g_utf8_strdown (basename, (gssize) -1); #line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - result = _tmp5_; + result = _tmp3_; #line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala" return result; -#line 531 "LibraryFiles.c" +#line 571 "LibraryFiles.c" } else { - const gchar* _tmp6_; - gchar* _tmp7_; -#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp6_ = basename; + gchar* _tmp4_; #line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp4_ = g_strdup (basename); #line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - result = _tmp7_; + result = _tmp4_; #line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala" return result; -#line 543 "LibraryFiles.c" +#line 580 "LibraryFiles.c" } } -GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callback, void* progress_callback_target, gboolean blacklist, GError** error) { +GFile* +library_files_duplicate (GFile* src, + GFileProgressCallback progress_callback, + void* progress_callback_target, + gboolean blacklist, + GError** error) +{ GFile* result = NULL; time_t timestamp = 0; MediaMetadata* metadata = NULL; - GFile* _tmp8_; - gboolean _tmp9_; gboolean collision = FALSE; GFile* dest = NULL; - GFile* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; - MediaMetadata* _tmp30_; - time_t _tmp31_; - gboolean _tmp32_ = FALSE; - GFile* _tmp33_; - GFile* _tmp34_; - GFile* _tmp35_; - gboolean _tmp37_; + gchar* _tmp18_; + gchar* _tmp19_; + MediaMetadata* _tmp20_; + time_t _tmp21_; + gboolean _tmp22_ = FALSE; + GFile* _tmp23_; + GFile* _tmp24_; + GFile* _tmp25_; GError * _inner_error_ = NULL; #line 73 "/home/jens/Source/shotwell/src/LibraryFiles.vala" g_return_val_if_fail (G_IS_FILE (src), NULL); #line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala" timestamp = (time_t) 0; -#line 571 "LibraryFiles.c" +#line 610 "LibraryFiles.c" { time_t _tmp0_ = 0; - GFile* _tmp1_; - time_t _tmp2_; -#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp1_ = src; #line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp2_ = query_file_modified (_tmp1_, &_inner_error_); -#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp0_ = _tmp2_; + _tmp0_ = query_file_modified (src, &_inner_error_); #line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 584 "LibraryFiles.c" +#line 617 "LibraryFiles.c" goto __catch473_g_error; } #line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala" timestamp = _tmp0_; -#line 589 "LibraryFiles.c" +#line 622 "LibraryFiles.c" } goto __finally473; __catch473_g_error: { GError* err = NULL; - GFile* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - GError* _tmp6_; - const gchar* _tmp7_; + gchar* _tmp1_; + gchar* _tmp2_; + GError* _tmp3_; + const gchar* _tmp4_; #line 75 "/home/jens/Source/shotwell/src/LibraryFiles.vala" err = _inner_error_; #line 75 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _inner_error_ = NULL; #line 78 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp3_ = src; -#line 78 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp4_ = g_file_get_path (_tmp3_); + _tmp1_ = g_file_get_path (src); #line 78 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 78 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp6_ = err; + _tmp3_ = err; #line 78 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp7_ = _tmp6_->message; + _tmp4_ = _tmp3_->message; #line 78 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - g_critical ("LibraryFiles.vala:78: Unable to access file modification for %s: %s", _tmp5_, _tmp7_); + g_critical ("LibraryFiles.vala:78: Unable to access file modification for %s: %s", _tmp2_, _tmp4_); #line 78 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp2_); #line 75 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _g_error_free0 (err); -#line 620 "LibraryFiles.c" +#line 650 "LibraryFiles.c" } __finally473: #line 75 "/home/jens/Source/shotwell/src/LibraryFiles.vala" @@ -625,54 +655,47 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb g_propagate_error (error, _inner_error_); #line 75 "/home/jens/Source/shotwell/src/LibraryFiles.vala" return NULL; -#line 629 "LibraryFiles.c" +#line 659 "LibraryFiles.c" } #line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala" metadata = NULL; #line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp8_ = src; -#line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp9_ = video_reader_is_supported_video_file (_tmp8_); -#line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (_tmp9_) { -#line 639 "LibraryFiles.c" + if (video_reader_is_supported_video_file (src)) { +#line 665 "LibraryFiles.c" VideoReader* reader = NULL; - GFile* _tmp10_; - VideoReader* _tmp11_; -#line 83 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp10_ = src; + VideoReader* _tmp5_; #line 83 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp11_ = video_reader_new (_tmp10_); + _tmp5_ = video_reader_new (src); #line 83 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - reader = _tmp11_; -#line 649 "LibraryFiles.c" + reader = _tmp5_; +#line 672 "LibraryFiles.c" { - VideoMetadata* _tmp12_ = NULL; - VideoReader* _tmp13_; - VideoMetadata* _tmp14_; - VideoMetadata* _tmp15_; + VideoMetadata* _tmp6_ = NULL; + VideoReader* _tmp7_; + VideoMetadata* _tmp8_; + VideoMetadata* _tmp9_; #line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp13_ = reader; + _tmp7_ = reader; #line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp14_ = video_reader_read_metadata (_tmp13_, &_inner_error_); + _tmp8_ = video_reader_read_metadata (_tmp7_, &_inner_error_); #line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp12_ = _tmp14_; + _tmp6_ = _tmp8_; #line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 663 "LibraryFiles.c" +#line 686 "LibraryFiles.c" goto __catch474_g_error; } #line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp15_ = _tmp12_; + _tmp9_ = _tmp6_; #line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp12_ = NULL; + _tmp6_ = NULL; #line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _media_metadata_unref0 (metadata); #line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - metadata = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_METADATA, MediaMetadata); + metadata = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_METADATA, MediaMetadata); #line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _media_metadata_unref0 (_tmp12_); -#line 676 "LibraryFiles.c" + _media_metadata_unref0 (_tmp6_); +#line 699 "LibraryFiles.c" } goto __finally474; __catch474_g_error: @@ -684,7 +707,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb _inner_error_ = NULL; #line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _g_error_free0 (err); -#line 688 "LibraryFiles.c" +#line 711 "LibraryFiles.c" } __finally474: #line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala" @@ -697,66 +720,57 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb _media_metadata_unref0 (metadata); #line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala" return NULL; -#line 701 "LibraryFiles.c" +#line 724 "LibraryFiles.c" } #line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _video_reader_unref0 (reader); -#line 705 "LibraryFiles.c" +#line 728 "LibraryFiles.c" } else { PhotoFileReader* reader = NULL; - GFile* _tmp16_; - PhotoFileFormat _tmp17_; - GFile* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; - PhotoFileReader* _tmp21_; - PhotoFileReader* _tmp22_; + gchar* _tmp10_; + gchar* _tmp11_; + PhotoFileReader* _tmp12_; + PhotoFileReader* _tmp13_; #line 90 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp16_ = src; + _tmp10_ = g_file_get_path (src); #line 90 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp17_ = photo_file_format_get_by_file_extension (_tmp16_); + _tmp11_ = _tmp10_; #line 90 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp18_ = src; + _tmp12_ = photo_file_format_create_reader (photo_file_format_get_by_file_extension (src), _tmp11_); #line 90 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp19_ = g_file_get_path (_tmp18_); + _tmp13_ = _tmp12_; #line 90 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp20_ = _tmp19_; + _g_free0 (_tmp11_); #line 90 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp21_ = photo_file_format_create_reader (_tmp17_, _tmp20_); -#line 90 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp22_ = _tmp21_; -#line 90 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _g_free0 (_tmp20_); -#line 90 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - reader = _tmp22_; -#line 733 "LibraryFiles.c" + reader = _tmp13_; +#line 747 "LibraryFiles.c" { - PhotoMetadata* _tmp23_ = NULL; - PhotoFileReader* _tmp24_; - PhotoMetadata* _tmp25_; - PhotoMetadata* _tmp26_; + PhotoMetadata* _tmp14_ = NULL; + PhotoFileReader* _tmp15_; + PhotoMetadata* _tmp16_; + PhotoMetadata* _tmp17_; #line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp24_ = reader; + _tmp15_ = reader; #line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp25_ = photo_file_reader_read_metadata (_tmp24_, &_inner_error_); + _tmp16_ = photo_file_reader_read_metadata (_tmp15_, &_inner_error_); #line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp23_ = _tmp25_; + _tmp14_ = _tmp16_; #line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 747 "LibraryFiles.c" +#line 761 "LibraryFiles.c" goto __catch475_g_error; } #line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp26_ = _tmp23_; + _tmp17_ = _tmp14_; #line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp23_ = NULL; + _tmp14_ = NULL; #line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _media_metadata_unref0 (metadata); #line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - metadata = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_MEDIA_METADATA, MediaMetadata); + metadata = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MEDIA_METADATA, MediaMetadata); #line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _media_metadata_unref0 (_tmp23_); -#line 760 "LibraryFiles.c" + _media_metadata_unref0 (_tmp14_); +#line 774 "LibraryFiles.c" } goto __finally475; __catch475_g_error: @@ -768,7 +782,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb _inner_error_ = NULL; #line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _g_error_free0 (err); -#line 772 "LibraryFiles.c" +#line 786 "LibraryFiles.c" } __finally475: #line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala" @@ -781,32 +795,30 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb _media_metadata_unref0 (metadata); #line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala" return NULL; -#line 785 "LibraryFiles.c" +#line 799 "LibraryFiles.c" } #line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _photo_file_adapter_unref0 (reader); -#line 789 "LibraryFiles.c" +#line 803 "LibraryFiles.c" } #line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp27_ = src; -#line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp28_ = g_file_get_basename (_tmp27_); + _tmp18_ = g_file_get_basename (src); #line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp29_ = _tmp28_; + _tmp19_ = _tmp18_; #line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp30_ = metadata; + _tmp20_ = metadata; #line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp31_ = timestamp; + _tmp21_ = timestamp; #line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp33_ = library_files_generate_unique_file (_tmp29_, _tmp30_, _tmp31_, &_tmp32_, &_inner_error_); + _tmp23_ = library_files_generate_unique_file (_tmp19_, _tmp20_, _tmp21_, &_tmp22_, &_inner_error_); #line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - collision = _tmp32_; + collision = _tmp22_; #line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp34_ = _tmp33_; + _tmp24_ = _tmp23_; #line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _g_free0 (_tmp29_); + _g_free0 (_tmp19_); #line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - dest = _tmp34_; + dest = _tmp24_; #line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala" @@ -815,18 +827,18 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb _media_metadata_unref0 (metadata); #line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala" return NULL; -#line 819 "LibraryFiles.c" +#line 831 "LibraryFiles.c" } #line 101 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp35_ = dest; + _tmp25_ = dest; #line 101 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (_tmp35_ == NULL) { -#line 825 "LibraryFiles.c" - GError* _tmp36_; + if (_tmp25_ == NULL) { +#line 837 "LibraryFiles.c" + GError* _tmp26_; #line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp36_ = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, "Unable to generate unique pathname for destination"); + _tmp26_ = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, "Unable to generate unique pathname for destination"); #line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _inner_error_ = _tmp36_; + _inner_error_ = _tmp26_; #line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala" g_propagate_error (error, _inner_error_); #line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala" @@ -835,174 +847,142 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb _media_metadata_unref0 (metadata); #line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala" return NULL; -#line 839 "LibraryFiles.c" +#line 851 "LibraryFiles.c" } #line 104 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp37_ = blacklist; -#line 104 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (_tmp37_) { -#line 845 "LibraryFiles.c" - GFile* _tmp38_; + if (blacklist) { +#line 855 "LibraryFiles.c" + GFile* _tmp27_; #line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp38_ = dest; + _tmp27_ = dest; #line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - library_monitor_blacklist_file (_tmp38_, "LibraryFiles.duplicate"); -#line 851 "LibraryFiles.c" + library_monitor_blacklist_file (_tmp27_, "LibraryFiles.duplicate"); +#line 861 "LibraryFiles.c" } { - gboolean _tmp39_; - gboolean _tmp46_; + gboolean _tmp28_; #line 108 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp39_ = library_files_use_fallback_copy_func; + _tmp28_ = library_files_use_fallback_copy_func; #line 108 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (_tmp39_) { -#line 860 "LibraryFiles.c" - GFile* _tmp40_; - GFile* _tmp41_; - GFileProgressCallback _tmp42_; - void* _tmp42__target; -#line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp40_ = src; -#line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp41_ = dest; + if (_tmp28_) { +#line 869 "LibraryFiles.c" + GFile* _tmp29_; #line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp42_ = progress_callback; + _tmp29_ = dest; #line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp42__target = progress_callback_target; -#line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - library_files_fallback_copy (_tmp40_, _tmp41_, _tmp42_, _tmp42__target, &_inner_error_); + library_files_fallback_copy (src, _tmp29_, progress_callback, progress_callback_target, &_inner_error_); #line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 877 "LibraryFiles.c" goto __catch476_g_error; } } else { - GFile* _tmp43_; - GFile* _tmp44_; - GFileProgressCallback _tmp45_; - void* _tmp45__target; -#line 111 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp43_ = src; -#line 111 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp44_ = dest; + GFile* _tmp30_; #line 111 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp45_ = progress_callback; + _tmp30_ = dest; #line 111 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp45__target = progress_callback_target; -#line 111 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - g_file_copy (_tmp43_, _tmp44_, G_FILE_COPY_ALL_METADATA | G_FILE_COPY_OVERWRITE, NULL, _tmp45_, _tmp45__target, &_inner_error_); + g_file_copy (src, _tmp30_, G_FILE_COPY_ALL_METADATA | G_FILE_COPY_OVERWRITE, NULL, progress_callback, progress_callback_target, &_inner_error_); #line 111 "/home/jens/Source/shotwell/src/LibraryFiles.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 897 "LibraryFiles.c" +#line 888 "LibraryFiles.c" goto __catch476_g_error; } } #line 113 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp46_ = blacklist; -#line 113 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (_tmp46_) { -#line 905 "LibraryFiles.c" - GFile* _tmp47_; + if (blacklist) { +#line 894 "LibraryFiles.c" + GFile* _tmp31_; #line 114 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp47_ = dest; + _tmp31_ = dest; #line 114 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - library_monitor_unblacklist_file (_tmp47_); -#line 911 "LibraryFiles.c" + library_monitor_unblacklist_file (_tmp31_); +#line 900 "LibraryFiles.c" } } goto __finally476; __catch476_g_error: { GError* err = NULL; - GFile* _tmp48_; - gchar* _tmp49_; - gchar* _tmp50_; - GError* _tmp51_; - const gchar* _tmp52_; - gboolean _tmp53_ = FALSE; - gboolean _tmp54_; + gchar* _tmp32_; + gchar* _tmp33_; + GError* _tmp34_; + const gchar* _tmp35_; + gboolean _tmp36_ = FALSE; #line 107 "/home/jens/Source/shotwell/src/LibraryFiles.vala" err = _inner_error_; #line 107 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _inner_error_ = NULL; #line 116 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp48_ = src; -#line 116 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp49_ = g_file_get_path (_tmp48_); + _tmp32_ = g_file_get_path (src); #line 116 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp50_ = _tmp49_; + _tmp33_ = _tmp32_; #line 116 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp51_ = err; + _tmp34_ = err; #line 116 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp52_ = _tmp51_->message; + _tmp35_ = _tmp34_->message; #line 116 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - g_message ("LibraryFiles.vala:116: There was a problem copying %s: %s", _tmp50_, _tmp52_); + g_message ("LibraryFiles.vala:116: There was a problem copying %s: %s", _tmp33_, _tmp35_); #line 116 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _g_free0 (_tmp50_); -#line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp54_ = blacklist; + _g_free0 (_tmp33_); #line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (_tmp54_) { -#line 947 "LibraryFiles.c" - gchar* _tmp55_ = NULL; - GFile* _tmp56_; - gchar* _tmp57_; - gchar* _tmp58_ = NULL; - GFile* _tmp59_; - gchar* _tmp60_; -#line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp56_ = src; + if (blacklist) { +#line 930 "LibraryFiles.c" + gchar* _tmp37_ = NULL; + gchar* _tmp38_; + gchar* _tmp39_ = NULL; + GFile* _tmp40_; + gchar* _tmp41_; #line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp57_ = md5_file (_tmp56_, &_inner_error_); + _tmp38_ = md5_file (src, &_inner_error_); #line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp55_ = _tmp57_; + _tmp37_ = _tmp38_; #line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _g_error_free0 (err); -#line 964 "LibraryFiles.c" +#line 944 "LibraryFiles.c" goto __finally476; } #line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp59_ = dest; + _tmp40_ = dest; #line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp60_ = md5_file (_tmp59_, &_inner_error_); + _tmp41_ = md5_file (_tmp40_, &_inner_error_); #line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp58_ = _tmp60_; + _tmp39_ = _tmp41_; #line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _g_free0 (_tmp55_); + _g_free0 (_tmp37_); #line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _g_error_free0 (err); -#line 979 "LibraryFiles.c" +#line 959 "LibraryFiles.c" goto __finally476; } #line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp53_ = g_strcmp0 (_tmp55_, _tmp58_) != 0; + _tmp36_ = g_strcmp0 (_tmp37_, _tmp39_) != 0; #line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _g_free0 (_tmp58_); + _g_free0 (_tmp39_); #line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _g_free0 (_tmp55_); -#line 988 "LibraryFiles.c" + _g_free0 (_tmp37_); +#line 968 "LibraryFiles.c" } else { #line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp53_ = FALSE; -#line 992 "LibraryFiles.c" + _tmp36_ = FALSE; +#line 972 "LibraryFiles.c" } #line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (_tmp53_) { -#line 996 "LibraryFiles.c" - GFile* _tmp61_; + if (_tmp36_) { +#line 976 "LibraryFiles.c" + GFile* _tmp42_; #line 118 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp61_ = dest; + _tmp42_ = dest; #line 118 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - library_monitor_unblacklist_file (_tmp61_); -#line 1002 "LibraryFiles.c" + library_monitor_unblacklist_file (_tmp42_); +#line 982 "LibraryFiles.c" } #line 107 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _g_error_free0 (err); -#line 1006 "LibraryFiles.c" +#line 986 "LibraryFiles.c" } __finally476: #line 107 "/home/jens/Source/shotwell/src/LibraryFiles.vala" @@ -1015,80 +995,74 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb _media_metadata_unref0 (metadata); #line 107 "/home/jens/Source/shotwell/src/LibraryFiles.vala" return NULL; -#line 1019 "LibraryFiles.c" +#line 999 "LibraryFiles.c" } { GFileInfo* info = NULL; - GFile* _tmp62_; - GFileInfo* _tmp63_; + GFile* _tmp43_; + GFileInfo* _tmp44_; guint32 mode = 0U; - GFileInfo* _tmp64_; - guint32 _tmp65_; - gboolean _tmp66_ = FALSE; - GFile* _tmp67_; - guint32 _tmp68_; - gboolean _tmp69_; + GFileInfo* _tmp45_; + gboolean _tmp46_ = FALSE; + GFile* _tmp47_; + guint32 _tmp48_; #line 123 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp62_ = dest; + _tmp43_ = dest; #line 123 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp63_ = g_file_query_info (_tmp62_, G_FILE_ATTRIBUTE_UNIX_MODE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); + _tmp44_ = g_file_query_info (_tmp43_, G_FILE_ATTRIBUTE_UNIX_MODE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); #line 123 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - info = _tmp63_; + info = _tmp44_; #line 123 "/home/jens/Source/shotwell/src/LibraryFiles.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1040 "LibraryFiles.c" +#line 1018 "LibraryFiles.c" goto __catch477_g_error; } #line 124 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp64_ = info; + _tmp45_ = info; #line 124 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp65_ = g_file_info_get_attribute_uint32 (_tmp64_, G_FILE_ATTRIBUTE_UNIX_MODE); -#line 124 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - mode = _tmp65_ | 0600; -#line 125 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp67_ = dest; + mode = g_file_info_get_attribute_uint32 (_tmp45_, G_FILE_ATTRIBUTE_UNIX_MODE) | 0600; #line 125 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp68_ = mode; + _tmp47_ = dest; #line 125 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp69_ = g_file_set_attribute_uint32 (_tmp67_, G_FILE_ATTRIBUTE_UNIX_MODE, _tmp68_, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); + _tmp48_ = mode; #line 125 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp66_ = _tmp69_; + _tmp46_ = g_file_set_attribute_uint32 (_tmp47_, G_FILE_ATTRIBUTE_UNIX_MODE, _tmp48_, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); #line 125 "/home/jens/Source/shotwell/src/LibraryFiles.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 125 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _g_object_unref0 (info); -#line 1061 "LibraryFiles.c" +#line 1035 "LibraryFiles.c" goto __catch477_g_error; } #line 125 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (!_tmp66_) { + if (!_tmp46_) { #line 126 "/home/jens/Source/shotwell/src/LibraryFiles.vala" g_warning ("LibraryFiles.vala:126: Could not make file writable"); -#line 1068 "LibraryFiles.c" +#line 1042 "LibraryFiles.c" } #line 122 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _g_object_unref0 (info); -#line 1072 "LibraryFiles.c" +#line 1046 "LibraryFiles.c" } goto __finally477; __catch477_g_error: { GError* err = NULL; - GError* _tmp70_; - const gchar* _tmp71_; + GError* _tmp49_; + const gchar* _tmp50_; #line 122 "/home/jens/Source/shotwell/src/LibraryFiles.vala" err = _inner_error_; #line 122 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _inner_error_ = NULL; #line 129 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp70_ = err; + _tmp49_ = err; #line 129 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp71_ = _tmp70_->message; + _tmp50_ = _tmp49_->message; #line 129 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - g_warning ("LibraryFiles.vala:129: Could not make file writable: %s", _tmp71_); + g_warning ("LibraryFiles.vala:129: Could not make file writable: %s", _tmp50_); #line 122 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _g_error_free0 (err); -#line 1092 "LibraryFiles.c" +#line 1066 "LibraryFiles.c" } __finally477: #line 122 "/home/jens/Source/shotwell/src/LibraryFiles.vala" @@ -1101,7 +1075,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb _media_metadata_unref0 (metadata); #line 122 "/home/jens/Source/shotwell/src/LibraryFiles.vala" return NULL; -#line 1105 "LibraryFiles.c" +#line 1079 "LibraryFiles.c" } #line 132 "/home/jens/Source/shotwell/src/LibraryFiles.vala" result = dest; @@ -1109,225 +1083,193 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb _media_metadata_unref0 (metadata); #line 132 "/home/jens/Source/shotwell/src/LibraryFiles.vala" return result; -#line 1113 "LibraryFiles.c" +#line 1087 "LibraryFiles.c" } -void library_files_fallback_copy (GFile* src, GFile* dst, GFileProgressCallback callback, void* callback_target, GError** error) { +void +library_files_fallback_copy (GFile* src, + GFile* dst, + GFileProgressCallback callback, + void* callback_target, + GError** error) +{ gboolean _tmp0_ = FALSE; - GFile* _tmp1_; FILE* f = NULL; - GFile* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - FILE* _tmp6_; - FILE* _tmp7_; - FILE* _tmp8_; + gchar* _tmp1_; + gchar* _tmp2_; + FILE* _tmp3_; + FILE* _tmp4_; + FILE* _tmp5_; GError * _inner_error_ = NULL; #line 135 "/home/jens/Source/shotwell/src/LibraryFiles.vala" g_return_if_fail ((src == NULL) || G_IS_FILE (src)); #line 135 "/home/jens/Source/shotwell/src/LibraryFiles.vala" g_return_if_fail ((dst == NULL) || G_IS_FILE (dst)); #line 136 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp1_ = src; -#line 136 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (_tmp1_ == NULL) { + if (src == NULL) { #line 136 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _tmp0_ = TRUE; -#line 1138 "LibraryFiles.c" +#line 1114 "LibraryFiles.c" } else { - GFile* _tmp2_; #line 136 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp2_ = dst; -#line 136 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp0_ = _tmp2_ == NULL; -#line 1145 "LibraryFiles.c" + _tmp0_ = dst == NULL; +#line 1118 "LibraryFiles.c" } #line 136 "/home/jens/Source/shotwell/src/LibraryFiles.vala" if (_tmp0_) { #line 137 "/home/jens/Source/shotwell/src/LibraryFiles.vala" return; -#line 1151 "LibraryFiles.c" +#line 1124 "LibraryFiles.c" } #line 140 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp3_ = src; -#line 140 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp4_ = g_file_get_path (_tmp3_); + _tmp1_ = g_file_get_path (src); #line 140 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 140 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp6_ = g_fopen (_tmp5_, "rb"); + _tmp3_ = g_fopen (_tmp2_, "rb"); #line 140 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 140 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp2_); #line 140 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - f = _tmp7_; + f = _tmp4_; #line 141 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp8_ = f; + _tmp5_ = f; #line 141 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (_tmp8_ != NULL) { -#line 1171 "LibraryFiles.c" - FILE* _tmp9_; + if (_tmp5_ != NULL) { +#line 1142 "LibraryFiles.c" + FILE* _tmp6_; glong size = 0L; - FILE* _tmp10_; - glong _tmp11_; - FILE* _tmp12_; - GFile* _tmp13_; + FILE* _tmp7_; + FILE* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + glong _tmp13_; + FILE* g = NULL; gchar* _tmp14_; gchar* _tmp15_; - GFile* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; - glong _tmp19_; - FILE* g = NULL; - GFile* _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; - FILE* _tmp23_; - FILE* _tmp24_; - FILE* _tmp25_; + FILE* _tmp16_; + FILE* _tmp17_; + FILE* _tmp18_; #line 142 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp9_ = f; + _tmp6_ = f; #line 142 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - fseek (_tmp9_, (glong) 0, SEEK_END); -#line 143 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp10_ = f; + fseek (_tmp6_, (glong) 0, SEEK_END); #line 143 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp11_ = ftell (_tmp10_); + _tmp7_ = f; #line 143 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - size = _tmp11_; + size = ftell (_tmp7_); #line 144 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp12_ = f; + _tmp8_ = f; #line 144 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - fseek (_tmp12_, (glong) 0, SEEK_SET); -#line 145 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp13_ = src; + fseek (_tmp8_, (glong) 0, SEEK_SET); #line 145 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp14_ = g_file_get_path (_tmp13_); + _tmp9_ = g_file_get_path (src); #line 145 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp15_ = _tmp14_; -#line 145 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp16_ = dst; + _tmp10_ = _tmp9_; #line 145 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp17_ = g_file_get_path (_tmp16_); + _tmp11_ = g_file_get_path (dst); #line 145 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp18_ = _tmp17_; + _tmp12_ = _tmp11_; #line 145 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp19_ = size; + _tmp13_ = size; #line 145 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - g_debug ("LibraryFiles.vala:145: Copying %s to %s, size is %ld", _tmp15_, _tmp18_, _tmp19_); + g_debug ("LibraryFiles.vala:145: Copying %s to %s, size is %ld", _tmp10_, _tmp12_, _tmp13_); #line 145 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp12_); #line 145 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp10_); #line 147 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp20_ = dst; + _tmp14_ = g_file_get_path (dst); #line 147 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp21_ = g_file_get_path (_tmp20_); -#line 147 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp22_ = _tmp21_; + _tmp15_ = _tmp14_; #line 147 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp23_ = g_fopen (_tmp22_, "wb"); + _tmp16_ = g_fopen (_tmp15_, "wb"); #line 147 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp24_ = _tmp23_; + _tmp17_ = _tmp16_; #line 147 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp15_); #line 147 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - g = _tmp24_; + g = _tmp17_; #line 148 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp25_ = g; + _tmp18_ = g; #line 148 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (_tmp25_ != NULL) { -#line 1243 "LibraryFiles.c" + if (_tmp18_ != NULL) { +#line 1202 "LibraryFiles.c" guint8 buffer[4096] = {0}; gsize written = 0UL; #line 150 "/home/jens/Source/shotwell/src/LibraryFiles.vala" written = (gsize) 0; #line 152 "/home/jens/Source/shotwell/src/LibraryFiles.vala" while (TRUE) { -#line 1250 "LibraryFiles.c" - FILE* _tmp26_; - gboolean _tmp27_; +#line 1209 "LibraryFiles.c" + FILE* _tmp19_; gsize len = 0UL; - FILE* _tmp28_; - gsize _tmp29_; - gsize _tmp30_; + FILE* _tmp20_; + gsize _tmp21_; #line 152 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp26_ = f; + _tmp19_ = f; #line 152 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp27_ = feof (_tmp26_); -#line 152 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (!(!_tmp27_)) { + if (!(!feof (_tmp19_))) { #line 152 "/home/jens/Source/shotwell/src/LibraryFiles.vala" break; -#line 1265 "LibraryFiles.c" +#line 1220 "LibraryFiles.c" } #line 153 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp28_ = f; -#line 153 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp29_ = fread (buffer, (gsize) 1, 4096, _tmp28_); + _tmp20_ = f; #line 153 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - len = _tmp29_; + len = fread (buffer, (gsize) 1, 4096, _tmp20_); #line 154 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp30_ = len; + _tmp21_ = len; #line 154 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (_tmp30_ > ((gsize) 0)) { -#line 1277 "LibraryFiles.c" + if (_tmp21_ > ((gsize) 0)) { +#line 1230 "LibraryFiles.c" gsize out_len = 0UL; - FILE* _tmp31_; + FILE* _tmp22_; + gsize _tmp23_; + gsize _tmp24_; + gsize _tmp31_; gsize _tmp32_; - gsize _tmp33_; - gsize _tmp34_; - gsize _tmp43_; - gsize _tmp44_; - GFileProgressCallback _tmp45_; - void* _tmp45__target; #line 155 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp31_ = g; + _tmp22_ = g; #line 155 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp32_ = len; + _tmp23_ = len; #line 155 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp33_ = fwrite (buffer + 0, (gsize) 1, ((gint) _tmp32_) - 0, _tmp31_); -#line 155 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - out_len = _tmp33_; + out_len = fwrite (buffer + 0, (gsize) 1, ((gint) _tmp23_) - 0, _tmp22_); #line 156 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp34_ = out_len; + _tmp24_ = out_len; #line 156 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (_tmp34_ < ((gsize) 0)) { -#line 1299 "LibraryFiles.c" - GFile* _tmp35_; - gchar* _tmp36_; - gchar* _tmp37_; - GFile* _tmp38_; - gchar* _tmp39_; - gchar* _tmp40_; - GError* _tmp41_; - GError* _tmp42_; + if (_tmp24_ < ((gsize) 0)) { +#line 1247 "LibraryFiles.c" + gchar* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + GError* _tmp29_; + GError* _tmp30_; #line 157 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp35_ = dst; + _tmp25_ = g_file_get_path (dst); #line 157 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp36_ = g_file_get_path (_tmp35_); + _tmp26_ = _tmp25_; #line 157 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp37_ = _tmp36_; -#line 157 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - g_critical ("LibraryFiles.vala:157: Failed to write to file %s: %m", _tmp37_); + g_critical ("LibraryFiles.vala:157: Failed to write to file %s: %m", _tmp26_); #line 157 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _g_free0 (_tmp37_); + _g_free0 (_tmp26_); #line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp38_ = dst; + _tmp27_ = g_file_get_path (dst); #line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp39_ = g_file_get_path (_tmp38_); + _tmp28_ = _tmp27_; #line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp40_ = _tmp39_; + _tmp29_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "Failed to write to %s", _tmp28_); #line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp41_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "Failed to write to %s", _tmp40_); + _tmp30_ = _tmp29_; #line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp42_ = _tmp41_; + _g_free0 (_tmp28_); #line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _g_free0 (_tmp40_); -#line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _inner_error_ = _tmp42_; + _inner_error_ = _tmp30_; #line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala" g_propagate_error (error, _inner_error_); #line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala" @@ -1336,76 +1278,60 @@ void library_files_fallback_copy (GFile* src, GFile* dst, GFileProgressCallback _fclose0 (f); #line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala" return; -#line 1340 "LibraryFiles.c" +#line 1282 "LibraryFiles.c" } #line 160 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp43_ = written; + _tmp31_ = written; #line 160 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp44_ = len; + _tmp32_ = len; #line 160 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - written = _tmp43_ + _tmp44_; -#line 162 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp45_ = callback; + written = _tmp31_ + _tmp32_; #line 162 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp45__target = callback_target; -#line 162 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (_tmp45_ != NULL) { -#line 1354 "LibraryFiles.c" - GFileProgressCallback _tmp46_; - void* _tmp46__target; - gsize _tmp47_; - glong _tmp48_; -#line 163 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp46_ = callback; -#line 163 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp46__target = callback_target; + if (callback != NULL) { +#line 1292 "LibraryFiles.c" + gsize _tmp33_; + glong _tmp34_; #line 163 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp47_ = written; + _tmp33_ = written; #line 163 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp48_ = size; + _tmp34_ = size; #line 163 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp46_ ((gint64) _tmp47_, (gint64) _tmp48_, _tmp46__target); -#line 1369 "LibraryFiles.c" + callback ((gint64) _tmp33_, (gint64) _tmp34_, callback_target); +#line 1301 "LibraryFiles.c" } } else { - gsize _tmp49_; + gsize _tmp35_; #line 164 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp49_ = len; + _tmp35_ = len; #line 164 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - if (_tmp49_ < ((gsize) 0)) { -#line 1377 "LibraryFiles.c" - GFile* _tmp50_; - gchar* _tmp51_; - gchar* _tmp52_; - GFile* _tmp53_; - gchar* _tmp54_; - gchar* _tmp55_; - GError* _tmp56_; - GError* _tmp57_; -#line 165 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp50_ = src; + if (_tmp35_ < ((gsize) 0)) { +#line 1309 "LibraryFiles.c" + gchar* _tmp36_; + gchar* _tmp37_; + gchar* _tmp38_; + gchar* _tmp39_; + GError* _tmp40_; + GError* _tmp41_; #line 165 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp51_ = g_file_get_path (_tmp50_); + _tmp36_ = g_file_get_path (src); #line 165 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp52_ = _tmp51_; + _tmp37_ = _tmp36_; #line 165 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - g_critical ("LibraryFiles.vala:165: Failed to read from file %s: %m", _tmp52_); + g_critical ("LibraryFiles.vala:165: Failed to read from file %s: %m", _tmp37_); #line 165 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _g_free0 (_tmp52_); -#line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp53_ = src; + _g_free0 (_tmp37_); #line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp54_ = g_file_get_path (_tmp53_); + _tmp38_ = g_file_get_path (src); #line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp55_ = _tmp54_; + _tmp39_ = _tmp38_; #line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp56_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "Failed to read from %s", _tmp55_); + _tmp40_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "Failed to read from %s", _tmp39_); #line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp57_ = _tmp56_; + _tmp41_ = _tmp40_; #line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _g_free0 (_tmp55_); + _g_free0 (_tmp39_); #line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _inner_error_ = _tmp57_; + _inner_error_ = _tmp41_; #line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala" g_propagate_error (error, _inner_error_); #line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala" @@ -1414,43 +1340,37 @@ void library_files_fallback_copy (GFile* src, GFile* dst, GFileProgressCallback _fclose0 (f); #line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala" return; -#line 1418 "LibraryFiles.c" +#line 1344 "LibraryFiles.c" } } } } else { - GFile* _tmp58_; - gchar* _tmp59_; - gchar* _tmp60_; - GFile* _tmp61_; - gchar* _tmp62_; - gchar* _tmp63_; - GError* _tmp64_; - GError* _tmp65_; -#line 170 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp58_ = dst; + gchar* _tmp42_; + gchar* _tmp43_; + gchar* _tmp44_; + gchar* _tmp45_; + GError* _tmp46_; + GError* _tmp47_; #line 170 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp59_ = g_file_get_path (_tmp58_); + _tmp42_ = g_file_get_path (dst); #line 170 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp60_ = _tmp59_; + _tmp43_ = _tmp42_; #line 170 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - g_critical ("LibraryFiles.vala:170: Failed to open %s: %m", _tmp60_); + g_critical ("LibraryFiles.vala:170: Failed to open %s: %m", _tmp43_); #line 170 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _g_free0 (_tmp60_); + _g_free0 (_tmp43_); #line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp61_ = dst; + _tmp44_ = g_file_get_path (dst); #line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp62_ = g_file_get_path (_tmp61_); + _tmp45_ = _tmp44_; #line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp63_ = _tmp62_; + _tmp46_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "Failed to open %s", _tmp45_); #line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp64_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "Failed to open %s", _tmp63_); + _tmp47_ = _tmp46_; #line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp65_ = _tmp64_; + _g_free0 (_tmp45_); #line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _g_free0 (_tmp63_); -#line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _inner_error_ = _tmp65_; + _inner_error_ = _tmp47_; #line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala" g_propagate_error (error, _inner_error_); #line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala" @@ -1459,55 +1379,49 @@ void library_files_fallback_copy (GFile* src, GFile* dst, GFileProgressCallback _fclose0 (f); #line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala" return; -#line 1463 "LibraryFiles.c" +#line 1383 "LibraryFiles.c" } #line 141 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _fclose0 (g); -#line 1467 "LibraryFiles.c" +#line 1387 "LibraryFiles.c" } else { - GFile* _tmp66_; - gchar* _tmp67_; - gchar* _tmp68_; - GFile* _tmp69_; - gchar* _tmp70_; - gchar* _tmp71_; - GError* _tmp72_; - GError* _tmp73_; -#line 174 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp66_ = src; + gchar* _tmp48_; + gchar* _tmp49_; + gchar* _tmp50_; + gchar* _tmp51_; + GError* _tmp52_; + GError* _tmp53_; #line 174 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp67_ = g_file_get_path (_tmp66_); + _tmp48_ = g_file_get_path (src); #line 174 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp68_ = _tmp67_; + _tmp49_ = _tmp48_; #line 174 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - g_critical ("LibraryFiles.vala:174: Failed to open %s: %m", _tmp68_); + g_critical ("LibraryFiles.vala:174: Failed to open %s: %m", _tmp49_); #line 174 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _g_free0 (_tmp68_); -#line 175 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp69_ = src; + _g_free0 (_tmp49_); #line 175 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp70_ = g_file_get_path (_tmp69_); + _tmp50_ = g_file_get_path (src); #line 175 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp71_ = _tmp70_; + _tmp51_ = _tmp50_; #line 175 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp72_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "Failed to open %s", _tmp71_); + _tmp52_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "Failed to open %s", _tmp51_); #line 175 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _tmp73_ = _tmp72_; + _tmp53_ = _tmp52_; #line 175 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _g_free0 (_tmp71_); + _g_free0 (_tmp51_); #line 175 "/home/jens/Source/shotwell/src/LibraryFiles.vala" - _inner_error_ = _tmp73_; + _inner_error_ = _tmp53_; #line 175 "/home/jens/Source/shotwell/src/LibraryFiles.vala" g_propagate_error (error, _inner_error_); #line 175 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _fclose0 (f); #line 175 "/home/jens/Source/shotwell/src/LibraryFiles.vala" return; -#line 1507 "LibraryFiles.c" +#line 1421 "LibraryFiles.c" } #line 135 "/home/jens/Source/shotwell/src/LibraryFiles.vala" _fclose0 (f); -#line 1511 "LibraryFiles.c" +#line 1425 "LibraryFiles.c" } diff --git a/src/LibraryMonitor.c b/src/LibraryMonitor.c index 123f726..572b37b 100644 --- a/src/LibraryMonitor.c +++ b/src/LibraryMonitor.c @@ -1,4 +1,4 @@ -/* LibraryMonitor.c generated by valac 0.36.6, the Vala compiler +/* LibraryMonitor.c generated by valac 0.40.4, the Vala compiler * generated from LibraryMonitor.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -27,6 +27,7 @@ /* situation (since that's a likely case).*/ /**/ + #include #include #include @@ -73,9 +74,9 @@ typedef struct _ParamSpecLibraryMonitorPool ParamSpecLibraryMonitorPool; enum { LIBRARY_MONITOR_POOL_MONITOR_INSTALLED_SIGNAL, LIBRARY_MONITOR_POOL_MONITOR_DESTROYED_SIGNAL, - LIBRARY_MONITOR_POOL_LAST_SIGNAL + LIBRARY_MONITOR_POOL_NUM_SIGNALS }; -static guint library_monitor_pool_signals[LIBRARY_MONITOR_POOL_LAST_SIGNAL] = {0}; +static guint library_monitor_pool_signals[LIBRARY_MONITOR_POOL_NUM_SIGNALS] = {0}; typedef struct _DirectoryMonitorPrivate DirectoryMonitorPrivate; typedef struct _LibraryMonitorPrivate LibraryMonitorPrivate; @@ -176,6 +177,11 @@ typedef struct _BatchImportRollClass BatchImportRollClass; typedef struct _LibraryMonitorVerifyJob LibraryMonitorVerifyJob; typedef struct _LibraryMonitorVerifyJobClass LibraryMonitorVerifyJobClass; +enum { + LIBRARY_MONITOR_0_PROPERTY, + LIBRARY_MONITOR_NUM_PROPERTIES +}; +static GParamSpec* library_monitor_properties[LIBRARY_MONITOR_NUM_PROPERTIES]; #define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ()) #define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade)) @@ -449,9 +455,9 @@ enum { LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL, LIBRARY_MONITOR_AUTO_IMPORT_PREPARING_SIGNAL, LIBRARY_MONITOR_AUTO_IMPORT_PROGRESS_SIGNAL, - LIBRARY_MONITOR_LAST_SIGNAL + LIBRARY_MONITOR_NUM_SIGNALS }; -static guint library_monitor_signals[LIBRARY_MONITOR_LAST_SIGNAL] = {0}; +static guint library_monitor_signals[LIBRARY_MONITOR_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -595,68 +601,67 @@ struct _LibraryMonitorAsyncDiscoveryCompletedData { GeeHashSet* _tmp5_; GeeIterator* _tmp6_; GeeIterator* _tmp7_; - gboolean _tmp8_; GFile* file; - GeeIterator* _tmp9_; - gpointer _tmp10_; + GeeIterator* _tmp8_; + gpointer _tmp9_; GFileInfo* info; - GFile* _tmp11_; + GFile* _tmp10_; + GFileInfo* _tmp11_; GFileInfo* _tmp12_; - GFileInfo* _tmp13_; - GeeArrayList* _tmp14_; + GeeArrayList* _tmp13_; GeeCollection* candidates; gboolean associated; GeeList* _monitor_list; + GeeList* _tmp14_; GeeList* _tmp15_; - GeeList* _tmp16_; gint _monitor_size; - GeeList* _tmp17_; + GeeList* _tmp16_; + gint _tmp17_; gint _tmp18_; - gint _tmp19_; gint _monitor_index; + gint _tmp19_; gint _tmp20_; gint _tmp21_; - gint _tmp22_; MediaMonitor* monitor; - GeeList* _tmp23_; - gint _tmp24_; - gpointer _tmp25_; + GeeList* _tmp22_; + gint _tmp23_; + gpointer _tmp24_; MediaMonitorDiscoveredFile _result_; - MediaMonitor* _tmp26_; - GFile* _tmp27_; - GFileInfo* _tmp28_; - MediaMonitorDiscoveredFile _tmp29_; - GeeCollection* _tmp30_; - gboolean _tmp31_; + MediaMonitor* _tmp25_; + GFile* _tmp26_; + GFileInfo* _tmp27_; + MediaMonitorDiscoveredFile _tmp28_; + GeeCollection* _tmp29_; + gboolean _tmp30_; + MediaMonitorDiscoveredFile _tmp31_; MediaMonitorDiscoveredFile _tmp32_; - MediaMonitorDiscoveredFile _tmp33_; - GeeCollection* _tmp34_; - GeeArrayList* _tmp35_; - GeeCollection* _tmp36_; - gboolean _tmp37_; - GeeArrayList* _tmp38_; - GFile* _tmp39_; - GeeArrayList* _tmp40_; + GeeCollection* _tmp33_; + GeeArrayList* _tmp34_; + GeeCollection* _tmp35_; + gboolean _tmp36_; + GeeArrayList* _tmp37_; + GFile* _tmp38_; + GeeArrayList* _tmp39_; + gint _tmp40_; gint _tmp41_; - gint _tmp42_; GeeArrayList* job_candidates; + GeeArrayList* _tmp42_; GeeArrayList* _tmp43_; GeeArrayList* _tmp44_; - GeeArrayList* _tmp45_; - gint _tmp46_; - Workers* _tmp47_; - GFile* _tmp48_; - GeeArrayList* _tmp49_; + gint _tmp45_; + Workers* _tmp46_; + GFile* _tmp47_; + GeeArrayList* _tmp48_; + LibraryMonitorFindMoveJob* _tmp49_; LibraryMonitorFindMoveJob* _tmp50_; - LibraryMonitorFindMoveJob* _tmp51_; - GeeHashSet* _tmp52_; - GeeArrayList* _tmp53_; + GeeHashSet* _tmp51_; + GeeArrayList* _tmp52_; + gint _tmp53_; gint _tmp54_; - gint _tmp55_; + gchar* _tmp55_; gchar* _tmp56_; - gchar* _tmp57_; + gint _tmp57_; gint _tmp58_; - gint _tmp59_; }; typedef enum { @@ -723,77 +728,61 @@ struct _LibraryMonitorVerifyMonitorableData { gint _files_size_; GFile** _tmp1_; gint _tmp1__length1; - MediaMonitor* _tmp2_; - Monitorable* _tmp3_; - GFile* _tmp4_; - GFile* _tmp5_; + GFile* _tmp2_; + GFile* _tmp3_; GFile** aux_files; - MediaMonitor* _tmp6_; - Monitorable* _tmp7_; - gint _tmp8_; - GFile** _tmp9_; + gint _tmp4_; + GFile** _tmp5_; gint aux_files_length1; gint _aux_files_size_; - GFile** _tmp10_; - gint _tmp10__length1; - GFile** _tmp11_; - gint _tmp11__length1; + GFile** _tmp6_; + gint _tmp6__length1; + GFile** _tmp7_; + gint _tmp7__length1; GFile** aux_file_collection; gint aux_file_collection_length1; gint _aux_file_collection_size_; gint aux_file_it; - GFile* _tmp12_; + GFile* _tmp8_; GFile* aux_file; - GFile** _tmp13_; - gint _tmp13__length1; - GFile* _tmp14_; - GFile* _tmp15_; + GFile** _tmp9_; + gint _tmp9__length1; + GFile* _tmp10_; + GFile* _tmp11_; gint ctr; - gboolean _tmp16_; - gint _tmp17_; - gint _tmp18_; - GFile** _tmp19_; - gint _tmp19__length1; + gboolean _tmp12_; + gint _tmp13_; + gint _tmp14_; + GFile** _tmp15_; + gint _tmp15__length1; GFile* file; - GFile** _tmp20_; - gint _tmp20__length1; - gint _tmp21_; - GFile* _tmp22_; - GFile* _tmp23_; + GFile** _tmp16_; + gint _tmp16__length1; + gint _tmp17_; + GFile* _tmp18_; + GFile* _tmp19_; GFileInfo* info; + GFile* _tmp20_; + GFileInfo* _tmp21_; + GFileInfo* _tmp22_; + GFileInfo* _tmp23_; GFile* _tmp24_; - GFileInfo* _tmp25_; + GCancellable* _tmp25_; GFileInfo* _tmp26_; GFileInfo* _tmp27_; - GFile* _tmp28_; - GCancellable* _tmp29_; - GFileInfo* _tmp30_; - GFileInfo* _tmp31_; GError* err; - gint _tmp32_; - gboolean _tmp33_; + gint _tmp28_; + gboolean _tmp29_; + GFileInfo* _tmp30_; + gboolean _tmp31_; + GFileInfo* _tmp32_; + GFile* _tmp33_; GFileInfo* _tmp34_; - MediaMonitor* _tmp35_; - Monitorable* _tmp36_; - gboolean _tmp37_; - MediaMonitor* _tmp38_; - Monitorable* _tmp39_; - gboolean _tmp40_; - GFileInfo* _tmp41_; - MediaMonitor* _tmp42_; - Monitorable* _tmp43_; - gboolean _tmp44_; - MediaMonitor* _tmp45_; - Monitorable* _tmp46_; - MediaMonitor* _tmp47_; - Monitorable* _tmp48_; - GFile* _tmp49_; - GFileInfo* _tmp50_; - gint _tmp51_; - gint _tmp52_; - gint _tmp53_; - gint _tmp54_; - gint _tmp55_; + gint _tmp35_; + gint _tmp36_; + gint _tmp37_; + gint _tmp38_; + gint _tmp39_; GError * _inner_error_; }; @@ -907,17 +896,20 @@ static gpointer library_monitor_verify_job_parent_class = NULL; gpointer library_monitor_pool_ref (gpointer instance); void library_monitor_pool_unref (gpointer instance); -GParamSpec* param_spec_library_monitor_pool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_library_monitor_pool (GValue* value, gpointer v_object); -void value_take_library_monitor_pool (GValue* value, gpointer v_object); +GParamSpec* param_spec_library_monitor_pool (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_library_monitor_pool (GValue* value, + gpointer v_object); +void value_take_library_monitor_pool (GValue* value, + gpointer v_object); gpointer value_get_library_monitor_pool (const GValue* value); GType library_monitor_pool_get_type (void) G_GNUC_CONST; GType directory_monitor_get_type (void) G_GNUC_CONST; GType library_monitor_get_type (void) G_GNUC_CONST; #define LIBRARY_MONITOR_POOL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LIBRARY_MONITOR_POOL, LibraryMonitorPoolPrivate)) -enum { - LIBRARY_MONITOR_POOL_DUMMY_PROPERTY -}; static LibraryMonitorPool* library_monitor_pool_new (void); static LibraryMonitorPool* library_monitor_pool_construct (GType object_type); void library_monitor_pool_init (void); @@ -925,7 +917,9 @@ void library_monitor_pool_terminate (void); static void library_monitor_pool_close (LibraryMonitorPool* self); LibraryMonitorPool* library_monitor_pool_get_instance (void); LibraryMonitor* library_monitor_pool_get_monitor (LibraryMonitorPool* self); -void library_monitor_pool_replace (LibraryMonitorPool* self, LibraryMonitor* replacement, gint start_msec_delay); +void library_monitor_pool_replace (LibraryMonitorPool* self, + LibraryMonitor* replacement, + gint start_msec_delay); static gboolean library_monitor_pool_on_start_monitor (LibraryMonitorPool* self); static gboolean _library_monitor_pool_on_start_monitor_gsource_func (gpointer self); void directory_monitor_close (DirectoryMonitor* self); @@ -933,9 +927,15 @@ void directory_monitor_start_discovery (DirectoryMonitor* self); static void library_monitor_pool_finalize (LibraryMonitorPool * obj); gpointer workers_ref (gpointer instance); void workers_unref (gpointer instance); -GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_workers (GValue* value, gpointer v_object); -void value_take_workers (GValue* value, gpointer v_object); +GParamSpec* param_spec_workers (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_workers (GValue* value, + gpointer v_object); +void value_take_workers (GValue* value, + gpointer v_object); gpointer value_get_workers (const GValue* value); GType workers_get_type (void) G_GNUC_CONST; GType media_monitor_get_type (void) G_GNUC_CONST; @@ -947,338 +947,630 @@ GType monitorable_get_type (void) G_GNUC_CONST; GType batch_import_get_type (void) G_GNUC_CONST; gpointer batch_import_roll_ref (gpointer instance); void batch_import_roll_unref (gpointer instance); -GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_roll (GValue* value, gpointer v_object); -void value_take_batch_import_roll (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_roll (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_roll (GValue* value, + gpointer v_object); +void value_take_batch_import_roll (GValue* value, + gpointer v_object); gpointer value_get_batch_import_roll (const GValue* value); GType batch_import_roll_get_type (void) G_GNUC_CONST; static gpointer library_monitor_verify_job_ref (gpointer instance); static void library_monitor_verify_job_unref (gpointer instance); -static GParamSpec* library_monitor_param_spec_verify_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; -static void library_monitor_value_set_verify_job (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void library_monitor_value_take_verify_job (GValue* value, gpointer v_object) G_GNUC_UNUSED; +static GParamSpec* library_monitor_param_spec_verify_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) G_GNUC_UNUSED; +static void library_monitor_value_set_verify_job (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void library_monitor_value_take_verify_job (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer library_monitor_value_get_verify_job (const GValue* value) G_GNUC_UNUSED; static GType library_monitor_verify_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define LIBRARY_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LIBRARY_MONITOR, LibraryMonitorPrivate)) -enum { - LIBRARY_MONITOR_DUMMY_PROPERTY -}; GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); static void library_monitor_on_config_changed (LibraryMonitor* self); -static void _library_monitor_on_config_changed_configuration_facade_auto_import_from_library_changed (ConfigurationFacade* _sender, gpointer self); +static void _library_monitor_on_config_changed_configuration_facade_auto_import_from_library_changed (ConfigurationFacade* _sender, + gpointer self); guint file_hash (GFile* file); -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self); -gboolean file_equal (GFile* a, GFile* b); -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); +static guint _file_hash_gee_hash_data_func (gconstpointer v, + gpointer self); +gboolean file_equal (GFile* a, + GFile* b); +static gboolean _file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); gpointer timed_queue_ref (gpointer instance); void timed_queue_unref (gpointer instance); -GParamSpec* param_spec_timed_queue (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_timed_queue (GValue* value, gpointer v_object); -void value_take_timed_queue (GValue* value, gpointer v_object); +GParamSpec* param_spec_timed_queue (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_timed_queue (GValue* value, + gpointer v_object); +void value_take_timed_queue (GValue* value, + gpointer v_object); gpointer value_get_timed_queue (const GValue* value); GType timed_queue_get_type (void) G_GNUC_CONST; GType hash_timed_queue_get_type (void) G_GNUC_CONST; #define LIBRARY_MONITOR_MIN_BLACKLIST_DURATION_MSEC (5 * 1000) static void library_monitor_on_unblacklist_file (GFile* file); -static void _library_monitor_on_unblacklist_file_dequeued_callback (gconstpointer item, gpointer self); -HashTimedQueue* hash_timed_queue_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeHashDataFunc hash_func, void* hash_func_target, GDestroyNotify hash_func_target_destroy_notify, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority); -HashTimedQueue* hash_timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeHashDataFunc hash_func, void* hash_func_target, GDestroyNotify hash_func_target_destroy_notify, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority); +static void _library_monitor_on_unblacklist_file_dequeued_callback (gconstpointer item, + gpointer self); +HashTimedQueue* hash_timed_queue_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + guint hold_msec, + DequeuedCallback callback, + void* callback_target, + GeeHashDataFunc hash_func, + void* hash_func_target, + GDestroyNotify hash_func_target_destroy_notify, + GeeEqualDataFunc equal_func, + void* equal_func_target, + GDestroyNotify equal_func_target_destroy_notify, + gint priority); +HashTimedQueue* hash_timed_queue_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + guint hold_msec, + DequeuedCallback callback, + void* callback_target, + GeeHashDataFunc hash_func, + void* hash_func_target, + GDestroyNotify hash_func_target_destroy_notify, + GeeEqualDataFunc equal_func, + void* equal_func_target, + GDestroyNotify equal_func_target_destroy_notify, + gint priority); guint workers_thread_per_cpu_minus_one (void); -Workers* workers_new (guint max_threads, gboolean exclusive); -Workers* workers_construct (GType object_type, guint max_threads, gboolean exclusive); +Workers* workers_new (guint max_threads, + gboolean exclusive); +Workers* workers_construct (GType object_type, + guint max_threads, + gboolean exclusive); #define LIBRARY_MONITOR_FLUSH_IMPORT_QUEUE_SEC 3 #define LIBRARY_MONITOR_IMPORT_ROLL_QUIET_SEC (5 * 60) #define LIBRARY_MONITOR_MAX_VERIFY_EXISTING_MEDIA_JOBS 5 -LibraryMonitor* library_monitor_new (GFile* root, gboolean recurse, gboolean monitoring); -LibraryMonitor* library_monitor_construct (GType object_type, GFile* root, gboolean recurse, gboolean monitoring); -DirectoryMonitor* directory_monitor_new (GFile* root, gboolean recurse, gboolean monitoring); -DirectoryMonitor* directory_monitor_construct (GType object_type, GFile* root, gboolean recurse, gboolean monitoring); +LibraryMonitor* library_monitor_new (GFile* root, + gboolean recurse, + gboolean monitoring); +LibraryMonitor* library_monitor_construct (GType object_type, + GFile* root, + gboolean recurse, + gboolean monitoring); +DirectoryMonitor* directory_monitor_new (GFile* root, + gboolean recurse, + gboolean monitoring); +DirectoryMonitor* directory_monitor_construct (GType object_type, + GFile* root, + gboolean recurse, + gboolean monitoring); gboolean configuration_facade_get_auto_import_from_library (ConfigurationFacade* self); static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self); static gboolean _library_monitor_on_flush_import_queue_gsource_func (gpointer self); static void library_monitor_real_close (DirectoryMonitor* base); void media_monitor_close (MediaMonitor* self); -static void library_monitor_add_to_discovered_list (LibraryMonitor* self, MediaMonitor* monitor, Monitorable* monitorable); -static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor* self, Monitorable* monitorable); +static void library_monitor_add_to_discovered_list (LibraryMonitor* self, + MediaMonitor* monitor, + Monitorable* monitorable); +static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor* self, + Monitorable* monitorable); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; MediaSourceCollection* media_monitor_get_media_source_collection (MediaMonitor* self); -gboolean source_collection_holds_type_of_source (SourceCollection* self, DataSource* source); +gboolean source_collection_holds_type_of_source (SourceCollection* self, + DataSource* source); gchar* data_object_to_string (DataObject* self); static void library_monitor_real_discovery_started (DirectoryMonitor* base); gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self); -MediaMonitor* media_source_collection_create_media_monitor (MediaSourceCollection* self, Workers* workers, GCancellable* cancellable); +MediaMonitor* media_source_collection_create_media_monitor (MediaSourceCollection* self, + Workers* workers, + GCancellable* cancellable); void media_monitor_notify_discovery_started (MediaMonitor* self); -static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* file, GFileInfo* info); +static void library_monitor_real_file_discovered (DirectoryMonitor* base, + GFile* file, + GFileInfo* info); GType media_monitor_discovered_file_get_type (void) G_GNUC_CONST; -MediaMonitorDiscoveredFile media_monitor_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable); +MediaMonitorDiscoveredFile media_monitor_notify_file_discovered (MediaMonitor* self, + GFile* file, + GFileInfo* info, + Monitorable* * monitorable); GType tombstone_source_collection_get_type (void) G_GNUC_CONST; -gboolean tombstone_source_collection_matches (TombstoneSourceCollection* self, GFile* file); -static gboolean library_monitor_is_supported_filetype (LibraryMonitor* self, GFile* file); +gboolean tombstone_source_collection_matches (TombstoneSourceCollection* self, + GFile* file); +static gboolean library_monitor_is_supported_filetype (LibraryMonitor* self, + GFile* file); static void library_monitor_real_discovery_completed (DirectoryMonitor* base); -static void library_monitor_async_discovery_completed (LibraryMonitor* self, GAsyncReadyCallback _callback_, gpointer _user_data_); -static void library_monitor_async_discovery_completed_finish (LibraryMonitor* self, GAsyncResult* _res_); +static void library_monitor_async_discovery_completed (LibraryMonitor* self, + GAsyncReadyCallback _callback_, + gpointer _user_data_); +static void library_monitor_async_discovery_completed_finish (LibraryMonitor* self, + GAsyncResult* _res_); static void library_monitor_async_discovery_completed_data_free (gpointer _data); -static void library_monitor_async_discovery_completed_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data); +static void library_monitor_async_discovery_completed_async_ready_wrapper (GObject *source_object, + GAsyncResult *res, + void *user_data); static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyncDiscoveryCompletedData* _data_); static void library_monitor_discovery_stage_completed (LibraryMonitor* self); -GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, GFile* file); -GeeCollection* media_monitor_candidates_for_unknown_file (MediaMonitor* self, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_); +GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, + GFile* file); +GeeCollection* media_monitor_candidates_for_unknown_file (MediaMonitor* self, + GFile* file, + GFileInfo* info, + MediaMonitorDiscoveredFile* _result_); gpointer background_job_ref (gpointer instance); void background_job_unref (gpointer instance); -GParamSpec* param_spec_background_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_background_job (GValue* value, gpointer v_object); -void value_take_background_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_background_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_background_job (GValue* value, + gpointer v_object); +void value_take_background_job (GValue* value, + gpointer v_object); gpointer value_get_background_job (const GValue* value); GType background_job_get_type (void) G_GNUC_CONST; -void workers_enqueue (Workers* self, BackgroundJob* job); -static LibraryMonitorFindMoveJob* library_monitor_find_move_job_new (LibraryMonitor* owner, GFile* file, GeeCollection* candidates); -static LibraryMonitorFindMoveJob* library_monitor_find_move_job_construct (GType object_type, LibraryMonitor* owner, GFile* file, GeeCollection* candidates); +void workers_enqueue (Workers* self, + BackgroundJob* job); +static LibraryMonitorFindMoveJob* library_monitor_find_move_job_new (LibraryMonitor* owner, + GFile* file, + GeeCollection* candidates); +static LibraryMonitorFindMoveJob* library_monitor_find_move_job_construct (GType object_type, + LibraryMonitor* owner, + GFile* file, + GeeCollection* candidates); static GType library_monitor_find_move_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static gboolean _library_monitor_async_discovery_completed_co_gsource_func (gpointer self); void directory_monitor_mdbg (const gchar* msg); static void library_monitor_report_checksum_job_completed (LibraryMonitor* self); -static void library_monitor_on_find_move_completed (LibraryMonitor* self, BackgroundJob* j); +static void library_monitor_on_find_move_completed (LibraryMonitor* self, + BackgroundJob* j); GType background_job_job_priority_get_type (void) G_GNUC_CONST; -void media_monitor_update_master_file (MediaMonitor* self, Monitorable* monitorable, GFile* file); -static void library_monitor_on_find_move_cancelled (LibraryMonitor* self, BackgroundJob* j); -static void library_monitor_enqueue_verify_monitorable (LibraryMonitor* self, Monitorable* monitorable, MediaMonitor* monitor); +void media_monitor_update_master_file (MediaMonitor* self, + Monitorable* monitorable, + GFile* file); +static void library_monitor_on_find_move_cancelled (LibraryMonitor* self, + BackgroundJob* j); +static void library_monitor_enqueue_verify_monitorable (LibraryMonitor* self, + Monitorable* monitorable, + MediaMonitor* monitor); GeeCollection* data_collection_get_all (DataCollection* self); gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; GType database_source_holding_tank_get_type (void) G_GNUC_CONST; GType media_source_holding_tank_get_type (void) G_GNUC_CONST; MediaSourceHoldingTank* media_source_collection_get_offline_bin (MediaSourceCollection* self); GeeCollection* source_holding_tank_get_all (SourceHoldingTank* self); -static void library_monitor_enqueue_import_many (LibraryMonitor* self, GeeCollection* files); -void tombstone_source_collection_launch_scan (TombstoneSourceCollection* self, DirectoryMonitor* monitor, GCancellable* cancellable); -static LibraryMonitorVerifyJob* library_monitor_verify_job_new (Monitorable* monitorable, MediaMonitor* monitor); -static LibraryMonitorVerifyJob* library_monitor_verify_job_construct (GType object_type, Monitorable* monitorable, MediaMonitor* monitor); +static void library_monitor_enqueue_import_many (LibraryMonitor* self, + GeeCollection* files); +void tombstone_source_collection_launch_scan (TombstoneSourceCollection* self, + DirectoryMonitor* monitor, + GCancellable* cancellable); +static LibraryMonitorVerifyJob* library_monitor_verify_job_new (Monitorable* monitorable, + MediaMonitor* monitor); +static LibraryMonitorVerifyJob* library_monitor_verify_job_construct (GType object_type, + Monitorable* monitorable, + MediaMonitor* monitor); static void library_monitor_execute_next_verify_job (LibraryMonitor* self); -static void library_monitor_verify_monitorable (LibraryMonitor* self, Monitorable* monitorable, MediaMonitor* monitor, GAsyncReadyCallback _callback_, gpointer _user_data_); -static void library_monitor_verify_monitorable_finish (LibraryMonitor* self, GAsyncResult* _res_); +static void library_monitor_verify_monitorable (LibraryMonitor* self, + Monitorable* monitorable, + MediaMonitor* monitor, + GAsyncReadyCallback _callback_, + gpointer _user_data_); +static void library_monitor_verify_monitorable_finish (LibraryMonitor* self, + GAsyncResult* _res_); static void library_monitor_verify_monitorable_data_free (gpointer _data); -static void library_monitor_verify_monitorable_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data); +static void library_monitor_verify_monitorable_async_ready_wrapper (GObject *source_object, + GAsyncResult *res, + void *user_data); static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonitorableData* _data_); -GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorable); -GFile** media_monitor_get_auxilliary_backing_files (MediaMonitor* self, Monitorable* monitorable, int* result_length1); -static void _vala_array_add131 (GFile** * array, int* length, int* size, GFile* value); +GFile* media_monitor_get_master_file (MediaMonitor* self, + Monitorable* monitorable); +GFile** media_monitor_get_auxilliary_backing_files (MediaMonitor* self, + Monitorable* monitorable, + int* result_length1); +static void _vala_array_add131 (GFile** * array, + int* length, + int* size, + GFile* value); #define UTIL_FILE_ATTRIBUTES "standard::*,time::*,id::file,id::filesystem,etag::value" #define DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES UTIL_FILE_ATTRIBUTES #define DIRECTORY_MONITOR_FILE_INFO_FLAGS G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS #define DIRECTORY_MONITOR_DEFAULT_PRIORITY G_PRIORITY_LOW -static void library_monitor_verify_monitorable_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); -gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable); -void media_monitor_update_online (MediaMonitor* self, Monitorable* monitorable); -void media_monitor_update_offline (MediaMonitor* self, Monitorable* monitorable); -void media_monitor_update_backing_file_info (MediaMonitor* self, Monitorable* monitorable, GFile* file, GFileInfo* info); +static void library_monitor_verify_monitorable_ready (GObject* source_object, + GAsyncResult* _res_, + gpointer _user_data_); +gboolean media_monitor_is_offline (MediaMonitor* self, + Monitorable* monitorable); +void media_monitor_update_online (MediaMonitor* self, + Monitorable* monitorable); +void media_monitor_update_offline (MediaMonitor* self, + Monitorable* monitorable); +void media_monitor_update_backing_file_info (MediaMonitor* self, + Monitorable* monitorable, + GFile* file, + GFileInfo* info); static gboolean _library_monitor_verify_monitorable_co_gsource_func (gpointer self); static void library_monitor_import_unrepresented_files (LibraryMonitor* self); static void library_monitor_cancel_batch_imports (LibraryMonitor* self); -static void library_monitor_enqueue_import (LibraryMonitor* self, GFile* file); +static void library_monitor_enqueue_import (LibraryMonitor* self, + GFile* file); gboolean library_monitor_is_blacklisted (GFile* file); -static void library_monitor_remove_queued_import (LibraryMonitor* self, GFile* file); +static void library_monitor_remove_queued_import (LibraryMonitor* self, + GFile* file); gulong now_sec (void); BatchImportRoll* batch_import_roll_new (void); BatchImportRoll* batch_import_roll_construct (GType object_type); gpointer batch_import_job_ref (gpointer instance); void batch_import_job_unref (gpointer instance); -GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_job (GValue* value, gpointer v_object); -void value_take_batch_import_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_job (GValue* value, + gpointer v_object); +void value_take_batch_import_job (GValue* value, + gpointer v_object); gpointer value_get_batch_import_job (const GValue* value); GType batch_import_job_get_type (void) G_GNUC_CONST; -FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library, gboolean recurse); -FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library, gboolean recurse); +FileImportJob* file_import_job_new (GFile* file_or_dir, + gboolean copy_to_library, + gboolean recurse); +FileImportJob* file_import_job_construct (GType object_type, + GFile* file_or_dir, + gboolean copy_to_library, + gboolean recurse); GType file_import_job_get_type (void) G_GNUC_CONST; gpointer import_manifest_ref (gpointer instance); void import_manifest_unref (gpointer instance); -GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_import_manifest (GValue* value, gpointer v_object); -void value_take_import_manifest (GValue* value, gpointer v_object); +GParamSpec* param_spec_import_manifest (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_import_manifest (GValue* value, + gpointer v_object); +void value_take_import_manifest (GValue* value, + gpointer v_object); gpointer value_get_import_manifest (const GValue* value); GType import_manifest_get_type (void) G_GNUC_CONST; -BatchImport* batch_import_new (GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest); -BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest); -void batch_import_set_untrash_duplicates (BatchImport* self, gboolean untrash_duplicates); -void batch_import_set_mark_duplicates_online (BatchImport* self, gboolean mark_duplicates_online); +BatchImport* batch_import_new (GeeIterable* jobs, + const gchar* name, + BatchImportImportReporter reporter, + void* reporter_target, + GeeArrayList* prefailed, + GeeArrayList* pre_already_imported, + GCancellable* cancellable, + BatchImportRoll* import_roll, + ImportManifest* skip_manifest); +BatchImport* batch_import_construct (GType object_type, + GeeIterable* jobs, + const gchar* name, + BatchImportImportReporter reporter, + void* reporter_target, + GeeArrayList* prefailed, + GeeArrayList* pre_already_imported, + GCancellable* cancellable, + BatchImportRoll* import_roll, + ImportManifest* skip_manifest); +void batch_import_set_untrash_duplicates (BatchImport* self, + gboolean untrash_duplicates); +void batch_import_set_mark_duplicates_online (BatchImport* self, + gboolean mark_duplicates_online); static void library_monitor_schedule_next_batch_import (LibraryMonitor* self); static void library_monitor_on_import_preparing (LibraryMonitor* self); -static void _library_monitor_on_import_preparing_batch_import_preparing (BatchImport* _sender, gpointer self); -static void library_monitor_on_import_progress (LibraryMonitor* self, guint64 completed_bytes, guint64 total_bytes); -static void _library_monitor_on_import_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self); -static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImport* batch_import, ImportManifest* manifest, BatchImportRoll* import_roll); -static void _library_monitor_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self); +static void _library_monitor_on_import_preparing_batch_import_preparing (BatchImport* _sender, + gpointer self); +static void library_monitor_on_import_progress (LibraryMonitor* self, + guint64 completed_bytes, + guint64 total_bytes); +static void _library_monitor_on_import_progress_batch_import_progress (BatchImport* _sender, + guint64 completed_bytes, + guint64 total_bytes, + gpointer self); +static void library_monitor_on_import_complete (LibraryMonitor* self, + BatchImport* batch_import, + ImportManifest* manifest, + BatchImportRoll* import_roll); +static void _library_monitor_on_import_complete_batch_import_import_complete (BatchImport* _sender, + ImportManifest* manifest, + BatchImportRoll* import_roll, + gpointer self); void batch_import_schedule (BatchImport* self); static void library_monitor_discard_current_batch_import (LibraryMonitor* self); void batch_import_user_halt (BatchImport* self); gpointer batch_import_result_ref (gpointer instance); void batch_import_result_unref (gpointer instance); -GParamSpec* param_spec_batch_import_result (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_result (GValue* value, gpointer v_object); -void value_take_batch_import_result (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_result (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_result (GValue* value, + gpointer v_object); +void value_take_batch_import_result (GValue* value, + gpointer v_object); gpointer value_get_batch_import_result (const GValue* value); GType batch_import_result_get_type (void) G_GNUC_CONST; GType import_result_get_type (void) G_GNUC_CONST; GType duplicated_file_get_type (void) G_GNUC_CONST; gpointer tombstoned_file_ref (gpointer instance); void tombstoned_file_unref (gpointer instance); -GParamSpec* param_spec_tombstoned_file (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_tombstoned_file (GValue* value, gpointer v_object); -void value_take_tombstoned_file (GValue* value, gpointer v_object); +GParamSpec* param_spec_tombstoned_file (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_tombstoned_file (GValue* value, + gpointer v_object); +void value_take_tombstoned_file (GValue* value, + gpointer v_object); gpointer value_get_tombstoned_file (const GValue* value); GType tombstoned_file_get_type (void) G_GNUC_CONST; -TombstonedFile* tombstoned_file_new (GFile* file, gint64 filesize, const gchar* md5); -TombstonedFile* tombstoned_file_construct (GType object_type, GFile* file, gint64 filesize, const gchar* md5); +TombstonedFile* tombstoned_file_new (GFile* file, + gint64 filesize, + const gchar* md5); +TombstonedFile* tombstoned_file_construct (GType object_type, + GFile* file, + gint64 filesize, + const gchar* md5); GType tombstone_reason_get_type (void) G_GNUC_CONST; GQuark database_error_quark (void); -void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason, GError** error); +void tombstone_entomb_many_files (GeeCollection* files, + TombstoneReason reason, + GError** error); void app_window_database_error (GError* err); -void library_monitor_blacklist_file (GFile* file, const gchar* reason); +void library_monitor_blacklist_file (GFile* file, + const gchar* reason); void library_monitor_unblacklist_file (GFile* file); -gboolean timed_queue_contains (TimedQueue* self, gconstpointer item); -gboolean timed_queue_enqueue (TimedQueue* self, gconstpointer item); -MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaCollectionRegistry* self, GFile* file); +gboolean timed_queue_contains (TimedQueue* self, + gconstpointer item); +gboolean timed_queue_enqueue (TimedQueue* self, + gconstpointer item); +MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaCollectionRegistry* self, + GFile* file); GeeCollection* directory_monitor_get_files (DirectoryMonitor* self); -gboolean media_monitor_is_file_represented (MediaMonitor* self, GFile* file); -static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* self, GFile* file); -static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GFile* file, GFileInfo* info); -void directory_monitor_notify_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info); -gboolean media_monitor_notify_file_created (MediaMonitor* self, GFile* file, GFileInfo* info); +gboolean media_monitor_is_file_represented (MediaMonitor* self, + GFile* file); +static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* self, + GFile* file); +static void library_monitor_real_notify_file_created (DirectoryMonitor* base, + GFile* file, + GFileInfo* info); +void directory_monitor_notify_file_created (DirectoryMonitor* self, + GFile* file, + GFileInfo* info); +gboolean media_monitor_notify_file_created (MediaMonitor* self, + GFile* file, + GFileInfo* info); gchar* media_monitor_to_string (MediaMonitor* self); const gchar* media_monitor_discovered_file_to_string (MediaMonitorDiscoveredFile self); -static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_new (LibraryMonitor* owner, GFile* file, GeeCollection* candidates); -static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_construct (GType object_type, LibraryMonitor* owner, GFile* file, GeeCollection* candidates); +static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_new (LibraryMonitor* owner, + GFile* file, + GeeCollection* candidates); +static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_construct (GType object_type, + LibraryMonitor* owner, + GFile* file, + GeeCollection* candidates); static GType library_monitor_runtime_find_move_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self, BackgroundJob* j); -static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFile* old_file, GFile* new_file, GFileInfo* new_info); -void directory_monitor_notify_file_moved (DirectoryMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info); -gboolean media_monitor_notify_file_moved (MediaMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info); -static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GFile* file); -void directory_monitor_notify_file_altered (DirectoryMonitor* self, GFile* file); -gboolean media_monitor_notify_file_altered (MediaMonitor* self, GFile* file); -static void library_monitor_real_notify_file_attributes_altered (DirectoryMonitor* base, GFile* file); -void directory_monitor_notify_file_attributes_altered (DirectoryMonitor* self, GFile* file); -gboolean media_monitor_notify_file_attributes_altered (MediaMonitor* self, GFile* file); -static void library_monitor_real_notify_file_alteration_completed (DirectoryMonitor* base, GFile* file, GFileInfo* info); -void directory_monitor_notify_file_alteration_completed (DirectoryMonitor* self, GFile* file, GFileInfo* info); -gboolean media_monitor_notify_file_alteration_completed (MediaMonitor* self, GFile* file, GFileInfo* info); -static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GFile* file); -void directory_monitor_notify_file_deleted (DirectoryMonitor* self, GFile* file); -gboolean media_monitor_notify_file_deleted (MediaMonitor* self, GFile* file); +static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self, + BackgroundJob* j); +static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, + GFile* old_file, + GFile* new_file, + GFileInfo* new_info); +void directory_monitor_notify_file_moved (DirectoryMonitor* self, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info); +gboolean media_monitor_notify_file_moved (MediaMonitor* self, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info); +static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, + GFile* file); +void directory_monitor_notify_file_altered (DirectoryMonitor* self, + GFile* file); +gboolean media_monitor_notify_file_altered (MediaMonitor* self, + GFile* file); +static void library_monitor_real_notify_file_attributes_altered (DirectoryMonitor* base, + GFile* file); +void directory_monitor_notify_file_attributes_altered (DirectoryMonitor* self, + GFile* file); +gboolean media_monitor_notify_file_attributes_altered (MediaMonitor* self, + GFile* file); +static void library_monitor_real_notify_file_alteration_completed (DirectoryMonitor* base, + GFile* file, + GFileInfo* info); +void directory_monitor_notify_file_alteration_completed (DirectoryMonitor* self, + GFile* file, + GFileInfo* info); +gboolean media_monitor_notify_file_alteration_completed (MediaMonitor* self, + GFile* file, + GFileInfo* info); +static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, + GFile* file); +void directory_monitor_notify_file_deleted (DirectoryMonitor* self, + GFile* file); +gboolean media_monitor_notify_file_deleted (MediaMonitor* self, + GFile* file); GType tombstone_get_type (void) G_GNUC_CONST; -Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self, GFile* file); -void tombstone_source_collection_resurrect (TombstoneSourceCollection* self, Tombstone* tombstone); -static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -enum { - LIBRARY_MONITOR_FIND_MOVE_JOB_DUMMY_PROPERTY -}; -static void _library_monitor_on_find_move_completed_completion_callback (BackgroundJob* job, gpointer self); -static void _library_monitor_on_find_move_cancelled_cancellation_callback (BackgroundJob* job, gpointer self); +Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self, + GFile* file); +void tombstone_source_collection_resurrect (TombstoneSourceCollection* self, + Tombstone* tombstone); +static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void _library_monitor_on_find_move_completed_completion_callback (BackgroundJob* job, + gpointer self); +static void _library_monitor_on_find_move_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self); gpointer abstract_semaphore_ref (gpointer instance); void abstract_semaphore_unref (gpointer instance); -GParamSpec* param_spec_abstract_semaphore (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_abstract_semaphore (GValue* value, gpointer v_object); -void value_take_abstract_semaphore (GValue* value, gpointer v_object); +GParamSpec* param_spec_abstract_semaphore (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_abstract_semaphore (GValue* value, + gpointer v_object); +void value_take_abstract_semaphore (GValue* value, + gpointer v_object); gpointer value_get_abstract_semaphore (const GValue* value); GType abstract_semaphore_get_type (void) G_GNUC_CONST; -BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore); -void background_job_set_completion_priority (BackgroundJob* self, gint priority); +BackgroundJob* background_job_construct (GType object_type, + GObject* owner, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target, + AbstractSemaphore* completion_semaphore); +void background_job_set_completion_priority (BackgroundJob* self, + gint priority); static void library_monitor_find_move_job_real_execute (BackgroundJob* base); GFile* media_source_get_master_file (MediaSource* self); -gchar* md5_file (GFile* file, GError** error); +gchar* md5_file (GFile* file, + GError** error); gchar* media_source_get_master_md5 (MediaSource* self); static void library_monitor_find_move_job_finalize (BackgroundJob * obj); -enum { - LIBRARY_MONITOR_RUNTIME_FIND_MOVE_JOB_DUMMY_PROPERTY -}; -static void _library_monitor_on_runtime_find_move_completed_completion_callback (BackgroundJob* job, gpointer self); +static void _library_monitor_on_runtime_find_move_completed_completion_callback (BackgroundJob* job, + gpointer self); static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* base); static void library_monitor_runtime_find_move_job_finalize (BackgroundJob * obj); -enum { - LIBRARY_MONITOR_VERIFY_JOB_DUMMY_PROPERTY -}; static void library_monitor_verify_job_finalize (LibraryMonitorVerifyJob * obj); static void library_monitor_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -static LibraryMonitorPool* library_monitor_pool_construct (GType object_type) { +static LibraryMonitorPool* +library_monitor_pool_construct (GType object_type) +{ LibraryMonitorPool* self = NULL; #line 38 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = (LibraryMonitorPool*) g_type_create_instance (object_type); #line 38 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self; -#line 1238 "LibraryMonitor.c" +#line 1520 "LibraryMonitor.c" } -static LibraryMonitorPool* library_monitor_pool_new (void) { +static LibraryMonitorPool* +library_monitor_pool_new (void) +{ #line 38 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return library_monitor_pool_construct (TYPE_LIBRARY_MONITOR_POOL); -#line 1245 "LibraryMonitor.c" +#line 1529 "LibraryMonitor.c" } -void library_monitor_pool_init (void) { +void +library_monitor_pool_init (void) +{ } -void library_monitor_pool_terminate (void) { +void +library_monitor_pool_terminate (void) +{ LibraryMonitorPool* _tmp0_; #line 45 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = library_monitor_pool_instance; #line 45 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_ != NULL) { -#line 1259 "LibraryMonitor.c" +#line 1547 "LibraryMonitor.c" LibraryMonitorPool* _tmp1_; #line 46 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = library_monitor_pool_instance; #line 46 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_close (_tmp1_); -#line 1265 "LibraryMonitor.c" +#line 1553 "LibraryMonitor.c" } #line 48 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _library_monitor_pool_unref0 (library_monitor_pool_instance); #line 48 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_instance = NULL; -#line 1271 "LibraryMonitor.c" +#line 1559 "LibraryMonitor.c" } -static gpointer _library_monitor_pool_ref0 (gpointer self) { +static gpointer +_library_monitor_pool_ref0 (gpointer self) +{ #line 55 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self ? library_monitor_pool_ref (self) : NULL; -#line 1278 "LibraryMonitor.c" +#line 1568 "LibraryMonitor.c" } -LibraryMonitorPool* library_monitor_pool_get_instance (void) { +LibraryMonitorPool* +library_monitor_pool_get_instance (void) +{ LibraryMonitorPool* result = NULL; LibraryMonitorPool* _tmp0_; LibraryMonitorPool* _tmp2_; @@ -1287,7 +1579,7 @@ LibraryMonitorPool* library_monitor_pool_get_instance (void) { _tmp0_ = library_monitor_pool_instance; #line 52 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_ == NULL) { -#line 1291 "LibraryMonitor.c" +#line 1583 "LibraryMonitor.c" LibraryMonitorPool* _tmp1_; #line 53 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = library_monitor_pool_new (); @@ -1295,7 +1587,7 @@ LibraryMonitorPool* library_monitor_pool_get_instance (void) { _library_monitor_pool_unref0 (library_monitor_pool_instance); #line 53 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_instance = _tmp1_; -#line 1299 "LibraryMonitor.c" +#line 1591 "LibraryMonitor.c" } #line 55 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = library_monitor_pool_instance; @@ -1305,18 +1597,22 @@ LibraryMonitorPool* library_monitor_pool_get_instance (void) { result = _tmp3_; #line 55 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1309 "LibraryMonitor.c" +#line 1601 "LibraryMonitor.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 59 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self ? g_object_ref (self) : NULL; -#line 1316 "LibraryMonitor.c" +#line 1610 "LibraryMonitor.c" } -LibraryMonitor* library_monitor_pool_get_monitor (LibraryMonitorPool* self) { +LibraryMonitor* +library_monitor_pool_get_monitor (LibraryMonitorPool* self) +{ LibraryMonitor* result = NULL; LibraryMonitor* _tmp0_; LibraryMonitor* _tmp1_; @@ -1330,25 +1626,29 @@ LibraryMonitor* library_monitor_pool_get_monitor (LibraryMonitorPool* self) { result = _tmp1_; #line 59 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1334 "LibraryMonitor.c" +#line 1630 "LibraryMonitor.c" } -static gboolean _library_monitor_pool_on_start_monitor_gsource_func (gpointer self) { +static gboolean +_library_monitor_pool_on_start_monitor_gsource_func (gpointer self) +{ gboolean result; result = library_monitor_pool_on_start_monitor ((LibraryMonitorPool*) self); #line 68 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1343 "LibraryMonitor.c" +#line 1641 "LibraryMonitor.c" } -void library_monitor_pool_replace (LibraryMonitorPool* self, LibraryMonitor* replacement, gint start_msec_delay) { +void +library_monitor_pool_replace (LibraryMonitorPool* self, + LibraryMonitor* replacement, + gint start_msec_delay) +{ LibraryMonitor* _tmp0_; - LibraryMonitor* _tmp1_; - gboolean _tmp2_ = FALSE; - gint _tmp3_; - LibraryMonitor* _tmp7_; + gboolean _tmp1_ = FALSE; + LibraryMonitor* _tmp3_; #line 63 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR_POOL (self)); #line 63 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -1356,51 +1656,42 @@ void library_monitor_pool_replace (LibraryMonitorPool* self, LibraryMonitor* rep #line 64 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_close (self); #line 66 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = replacement; -#line 66 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (replacement); #line 66 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->priv->monitor); #line 66 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->monitor = _tmp1_; + self->priv->monitor = _tmp0_; #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = start_msec_delay; + if (start_msec_delay > 0) { +#line 1667 "LibraryMonitor.c" + guint _tmp2_; #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp3_ > 0) { -#line 1371 "LibraryMonitor.c" - guint _tmp4_; + _tmp2_ = self->priv->timer_id; #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = self->priv->timer_id; -#line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = _tmp4_ == ((guint) 0); -#line 1377 "LibraryMonitor.c" + _tmp1_ = _tmp2_ == ((guint) 0); +#line 1673 "LibraryMonitor.c" } else { #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = FALSE; -#line 1381 "LibraryMonitor.c" + _tmp1_ = FALSE; +#line 1677 "LibraryMonitor.c" } #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp2_) { -#line 1385 "LibraryMonitor.c" - gint _tmp5_; - guint _tmp6_; -#line 68 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = start_msec_delay; -#line 68 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) _tmp5_, _library_monitor_pool_on_start_monitor_gsource_func, library_monitor_pool_ref (self), library_monitor_pool_unref); + if (_tmp1_) { #line 68 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->timer_id = _tmp6_; -#line 1394 "LibraryMonitor.c" + self->priv->timer_id = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) start_msec_delay, _library_monitor_pool_on_start_monitor_gsource_func, library_monitor_pool_ref (self), library_monitor_pool_unref); +#line 1683 "LibraryMonitor.c" } #line 70 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = self->priv->monitor; + _tmp3_ = self->priv->monitor; #line 70 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_emit (self, library_monitor_pool_signals[LIBRARY_MONITOR_POOL_MONITOR_INSTALLED_SIGNAL], 0, _tmp7_); -#line 1400 "LibraryMonitor.c" + g_signal_emit (self, library_monitor_pool_signals[LIBRARY_MONITOR_POOL_MONITOR_INSTALLED_SIGNAL], 0, _tmp3_); +#line 1689 "LibraryMonitor.c" } -static void library_monitor_pool_close (LibraryMonitorPool* self) { +static void +library_monitor_pool_close (LibraryMonitorPool* self) +{ LibraryMonitor* _tmp0_; LibraryMonitor* _tmp1_; LibraryMonitor* closed = NULL; @@ -1415,7 +1706,7 @@ static void library_monitor_pool_close (LibraryMonitorPool* self) { if (_tmp0_ == NULL) { #line 75 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 1419 "LibraryMonitor.c" +#line 1710 "LibraryMonitor.c" } #line 77 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = self->priv->monitor; @@ -1437,11 +1728,13 @@ static void library_monitor_pool_close (LibraryMonitorPool* self) { g_signal_emit (self, library_monitor_pool_signals[LIBRARY_MONITOR_POOL_MONITOR_DESTROYED_SIGNAL], 0, _tmp4_); #line 73 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (closed); -#line 1441 "LibraryMonitor.c" +#line 1732 "LibraryMonitor.c" } -static gboolean library_monitor_pool_on_start_monitor (LibraryMonitorPool* self) { +static gboolean +library_monitor_pool_on_start_monitor (LibraryMonitorPool* self) +{ gboolean result = FALSE; LibraryMonitor* _tmp0_; LibraryMonitor* _tmp1_; @@ -1457,7 +1750,7 @@ static gboolean library_monitor_pool_on_start_monitor (LibraryMonitorPool* self) result = FALSE; #line 89 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1461 "LibraryMonitor.c" +#line 1754 "LibraryMonitor.c" } #line 91 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = self->priv->monitor; @@ -1467,108 +1760,133 @@ static gboolean library_monitor_pool_on_start_monitor (LibraryMonitorPool* self) result = FALSE; #line 93 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1471 "LibraryMonitor.c" +#line 1764 "LibraryMonitor.c" } -static void value_library_monitor_pool_init (GValue* value) { +static void +value_library_monitor_pool_init (GValue* value) +{ #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 1478 "LibraryMonitor.c" +#line 1773 "LibraryMonitor.c" } -static void value_library_monitor_pool_free_value (GValue* value) { +static void +value_library_monitor_pool_free_value (GValue* value) +{ #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (value->data[0].v_pointer) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_unref (value->data[0].v_pointer); -#line 1487 "LibraryMonitor.c" +#line 1784 "LibraryMonitor.c" } } -static void value_library_monitor_pool_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_library_monitor_pool_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (src_value->data[0].v_pointer) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" dest_value->data[0].v_pointer = library_monitor_pool_ref (src_value->data[0].v_pointer); -#line 1497 "LibraryMonitor.c" +#line 1797 "LibraryMonitor.c" } else { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" dest_value->data[0].v_pointer = NULL; -#line 1501 "LibraryMonitor.c" +#line 1801 "LibraryMonitor.c" } } -static gpointer value_library_monitor_pool_peek_pointer (const GValue* value) { +static gpointer +value_library_monitor_pool_peek_pointer (const GValue* value) +{ #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return value->data[0].v_pointer; -#line 1509 "LibraryMonitor.c" +#line 1811 "LibraryMonitor.c" } -static gchar* value_library_monitor_pool_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_library_monitor_pool_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (collect_values[0].v_pointer) { -#line 1516 "LibraryMonitor.c" +#line 1823 "LibraryMonitor.c" LibraryMonitorPool * object; object = collect_values[0].v_pointer; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (object->parent_instance.g_class == NULL) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1523 "LibraryMonitor.c" +#line 1830 "LibraryMonitor.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1527 "LibraryMonitor.c" +#line 1834 "LibraryMonitor.c" } #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = library_monitor_pool_ref (object); -#line 1531 "LibraryMonitor.c" +#line 1838 "LibraryMonitor.c" } else { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 1535 "LibraryMonitor.c" +#line 1842 "LibraryMonitor.c" } #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return NULL; -#line 1539 "LibraryMonitor.c" +#line 1846 "LibraryMonitor.c" } -static gchar* value_library_monitor_pool_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_library_monitor_pool_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ LibraryMonitorPool ** object_p; object_p = collect_values[0].v_pointer; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!object_p) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1550 "LibraryMonitor.c" +#line 1862 "LibraryMonitor.c" } #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!value->data[0].v_pointer) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *object_p = NULL; -#line 1556 "LibraryMonitor.c" +#line 1868 "LibraryMonitor.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *object_p = value->data[0].v_pointer; -#line 1560 "LibraryMonitor.c" +#line 1872 "LibraryMonitor.c" } else { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *object_p = library_monitor_pool_ref (value->data[0].v_pointer); -#line 1564 "LibraryMonitor.c" +#line 1876 "LibraryMonitor.c" } #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return NULL; -#line 1568 "LibraryMonitor.c" +#line 1880 "LibraryMonitor.c" } -GParamSpec* param_spec_library_monitor_pool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_library_monitor_pool (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecLibraryMonitorPool* spec; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_LIBRARY_MONITOR_POOL), NULL); @@ -1578,20 +1896,25 @@ GParamSpec* param_spec_library_monitor_pool (const gchar* name, const gchar* nic G_PARAM_SPEC (spec)->value_type = object_type; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return G_PARAM_SPEC (spec); -#line 1582 "LibraryMonitor.c" +#line 1900 "LibraryMonitor.c" } -gpointer value_get_library_monitor_pool (const GValue* value) { +gpointer +value_get_library_monitor_pool (const GValue* value) +{ #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_LIBRARY_MONITOR_POOL), NULL); #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return value->data[0].v_pointer; -#line 1591 "LibraryMonitor.c" +#line 1911 "LibraryMonitor.c" } -void value_set_library_monitor_pool (GValue* value, gpointer v_object) { +void +value_set_library_monitor_pool (GValue* value, + gpointer v_object) +{ LibraryMonitorPool * old; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_LIBRARY_MONITOR_POOL)); @@ -1607,22 +1930,25 @@ void value_set_library_monitor_pool (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_ref (value->data[0].v_pointer); -#line 1611 "LibraryMonitor.c" +#line 1934 "LibraryMonitor.c" } else { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 1615 "LibraryMonitor.c" +#line 1938 "LibraryMonitor.c" } #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (old) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_unref (old); -#line 1621 "LibraryMonitor.c" +#line 1944 "LibraryMonitor.c" } } -void value_take_library_monitor_pool (GValue* value, gpointer v_object) { +void +value_take_library_monitor_pool (GValue* value, + gpointer v_object) +{ LibraryMonitorPool * old; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_LIBRARY_MONITOR_POOL)); @@ -1636,22 +1962,24 @@ void value_take_library_monitor_pool (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = v_object; -#line 1640 "LibraryMonitor.c" +#line 1966 "LibraryMonitor.c" } else { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 1644 "LibraryMonitor.c" +#line 1970 "LibraryMonitor.c" } #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (old) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_unref (old); -#line 1650 "LibraryMonitor.c" +#line 1976 "LibraryMonitor.c" } } -static void library_monitor_pool_class_init (LibraryMonitorPoolClass * klass) { +static void +library_monitor_pool_class_init (LibraryMonitorPoolClass * klass) +{ #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_parent_class = g_type_class_peek_parent (klass); #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -1662,11 +1990,13 @@ static void library_monitor_pool_class_init (LibraryMonitorPoolClass * klass) { library_monitor_pool_signals[LIBRARY_MONITOR_POOL_MONITOR_INSTALLED_SIGNAL] = g_signal_new ("monitor-installed", TYPE_LIBRARY_MONITOR_POOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_LIBRARY_MONITOR); #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_signals[LIBRARY_MONITOR_POOL_MONITOR_DESTROYED_SIGNAL] = g_signal_new ("monitor-destroyed", TYPE_LIBRARY_MONITOR_POOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_LIBRARY_MONITOR); -#line 1666 "LibraryMonitor.c" +#line 1994 "LibraryMonitor.c" } -static void library_monitor_pool_instance_init (LibraryMonitorPool * self) { +static void +library_monitor_pool_instance_init (LibraryMonitorPool * self) +{ #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv = LIBRARY_MONITOR_POOL_GET_PRIVATE (self); #line 31 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -1675,11 +2005,13 @@ static void library_monitor_pool_instance_init (LibraryMonitorPool * self) { self->priv->timer_id = (guint) 0; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->ref_count = 1; -#line 1679 "LibraryMonitor.c" +#line 2009 "LibraryMonitor.c" } -static void library_monitor_pool_finalize (LibraryMonitorPool * obj) { +static void +library_monitor_pool_finalize (LibraryMonitorPool * obj) +{ LibraryMonitorPool * self; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_MONITOR_POOL, LibraryMonitorPool); @@ -1687,11 +2019,13 @@ static void library_monitor_pool_finalize (LibraryMonitorPool * obj) { g_signal_handlers_destroy (self); #line 31 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->priv->monitor); -#line 1691 "LibraryMonitor.c" +#line 2023 "LibraryMonitor.c" } -GType library_monitor_pool_get_type (void) { +GType +library_monitor_pool_get_type (void) +{ static volatile gsize library_monitor_pool_type_id__volatile = 0; if (g_once_init_enter (&library_monitor_pool_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_library_monitor_pool_init, value_library_monitor_pool_free_value, value_library_monitor_pool_copy_value, value_library_monitor_pool_peek_pointer, "p", value_library_monitor_pool_collect_value, "p", value_library_monitor_pool_lcopy_value }; @@ -1705,18 +2039,22 @@ GType library_monitor_pool_get_type (void) { } -gpointer library_monitor_pool_ref (gpointer instance) { +gpointer +library_monitor_pool_ref (gpointer instance) +{ LibraryMonitorPool * self; self = instance; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_atomic_int_inc (&self->ref_count); #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return instance; -#line 1716 "LibraryMonitor.c" +#line 2052 "LibraryMonitor.c" } -void library_monitor_pool_unref (gpointer instance) { +void +library_monitor_pool_unref (gpointer instance) +{ LibraryMonitorPool * self; self = instance; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -1725,109 +2063,120 @@ void library_monitor_pool_unref (gpointer instance) { LIBRARY_MONITOR_POOL_GET_CLASS (self)->finalize (self); #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1729 "LibraryMonitor.c" +#line 2067 "LibraryMonitor.c" } } -static void _library_monitor_on_config_changed_configuration_facade_auto_import_from_library_changed (ConfigurationFacade* _sender, gpointer self) { +static void +_library_monitor_on_config_changed_configuration_facade_auto_import_from_library_changed (ConfigurationFacade* _sender, + gpointer self) +{ #line 247 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_on_config_changed ((LibraryMonitor*) self); -#line 1737 "LibraryMonitor.c" +#line 2078 "LibraryMonitor.c" } -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { +static guint +_file_hash_gee_hash_data_func (gconstpointer v, + gpointer self) +{ guint result; result = file_hash ((GFile*) v); #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1746 "LibraryMonitor.c" +#line 2090 "LibraryMonitor.c" } -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = file_equal ((GFile*) a, (GFile*) b); #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1755 "LibraryMonitor.c" +#line 2103 "LibraryMonitor.c" } -static void _library_monitor_on_unblacklist_file_dequeued_callback (gconstpointer item, gpointer self) { +static void +_library_monitor_on_unblacklist_file_dequeued_callback (gconstpointer item, + gpointer self) +{ #line 207 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_on_unblacklist_file ((GFile*) item); -#line 1762 "LibraryMonitor.c" +#line 2113 "LibraryMonitor.c" } -static gboolean _library_monitor_on_flush_import_queue_gsource_func (gpointer self) { +static gboolean +_library_monitor_on_flush_import_queue_gsource_func (gpointer self) +{ gboolean result; result = library_monitor_on_flush_import_queue ((LibraryMonitor*) self); #line 243 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1771 "LibraryMonitor.c" +#line 2124 "LibraryMonitor.c" } -LibraryMonitor* library_monitor_construct (GType object_type, GFile* root, gboolean recurse, gboolean monitoring) { +LibraryMonitor* +library_monitor_construct (GType object_type, + GFile* root, + gboolean recurse, + gboolean monitoring) +{ LibraryMonitor * self = NULL; - GFile* _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + ConfigFacade* _tmp2_; ConfigFacade* _tmp3_; - ConfigFacade* _tmp4_; - gboolean _tmp5_; - ConfigFacade* _tmp6_; - ConfigFacade* _tmp7_; - guint _tmp8_; #line 236 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (G_IS_FILE (root), NULL); #line 237 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = root; -#line 237 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = recurse; -#line 237 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = monitoring; -#line 237 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self = (LibraryMonitor*) directory_monitor_construct (object_type, _tmp0_, _tmp1_, _tmp2_); + self = (LibraryMonitor*) directory_monitor_construct (object_type, root, recurse, monitoring); #line 240 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = config_facade_get_instance (); -#line 240 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = _tmp3_; + _tmp0_ = config_facade_get_instance (); #line 240 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = configuration_facade_get_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp1_ = _tmp0_; #line 240 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->auto_import = _tmp5_; + self->priv->auto_import = configuration_facade_get_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 240 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp1_); #line 241 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = config_facade_get_instance (); + _tmp2_ = config_facade_get_instance (); #line 241 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = _tmp6_; + _tmp3_ = _tmp2_; #line 241 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "auto-import-from-library-changed", (GCallback) _library_monitor_on_config_changed_configuration_facade_auto_import_from_library_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "auto-import-from-library-changed", (GCallback) _library_monitor_on_config_changed_configuration_facade_auto_import_from_library_changed, self, 0); #line 241 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_object_unref0 (_tmp7_); -#line 243 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) LIBRARY_MONITOR_FLUSH_IMPORT_QUEUE_SEC, _library_monitor_on_flush_import_queue_gsource_func, g_object_ref (self), g_object_unref); + _g_object_unref0 (_tmp3_); #line 243 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->import_queue_timer_id = _tmp8_; + self->priv->import_queue_timer_id = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) LIBRARY_MONITOR_FLUSH_IMPORT_QUEUE_SEC, _library_monitor_on_flush_import_queue_gsource_func, g_object_ref (self), g_object_unref); #line 236 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self; -#line 1820 "LibraryMonitor.c" +#line 2163 "LibraryMonitor.c" } -LibraryMonitor* library_monitor_new (GFile* root, gboolean recurse, gboolean monitoring) { +LibraryMonitor* +library_monitor_new (GFile* root, + gboolean recurse, + gboolean monitoring) +{ #line 236 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return library_monitor_construct (TYPE_LIBRARY_MONITOR, root, recurse, monitoring); -#line 1827 "LibraryMonitor.c" +#line 2174 "LibraryMonitor.c" } -static void library_monitor_real_close (DirectoryMonitor* base) { +static void +library_monitor_real_close (DirectoryMonitor* base) +{ LibraryMonitor * self; GCancellable* _tmp0_; guint _tmp13_; @@ -1837,7 +2186,7 @@ static void library_monitor_real_close (DirectoryMonitor* base) { _tmp0_ = self->priv->cancellable; #line 251 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_cancellable_cancel (_tmp0_); -#line 1841 "LibraryMonitor.c" +#line 2190 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp1_; @@ -1865,7 +2214,7 @@ static void library_monitor_real_close (DirectoryMonitor* base) { _monitor_index = -1; #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 1869 "LibraryMonitor.c" +#line 2218 "LibraryMonitor.c" gint _tmp6_; gint _tmp7_; gint _tmp8_; @@ -1886,7 +2235,7 @@ static void library_monitor_real_close (DirectoryMonitor* base) { if (!(_tmp7_ < _tmp8_)) { #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 1890 "LibraryMonitor.c" +#line 2239 "LibraryMonitor.c" } #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp9_ = _monitor_list; @@ -1902,17 +2251,17 @@ static void library_monitor_real_close (DirectoryMonitor* base) { media_monitor_close (_tmp12_); #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 1906 "LibraryMonitor.c" +#line 2255 "LibraryMonitor.c" } #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 1910 "LibraryMonitor.c" +#line 2259 "LibraryMonitor.c" } #line 256 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp13_ = self->priv->import_queue_timer_id; #line 256 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp13_ != ((guint) 0)) { -#line 1916 "LibraryMonitor.c" +#line 2265 "LibraryMonitor.c" guint _tmp14_; #line 257 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp14_ = self->priv->import_queue_timer_id; @@ -1920,23 +2269,23 @@ static void library_monitor_real_close (DirectoryMonitor* base) { g_source_remove (_tmp14_); #line 258 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->import_queue_timer_id = (guint) 0; -#line 1924 "LibraryMonitor.c" +#line 2273 "LibraryMonitor.c" } #line 261 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->close (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor)); -#line 1928 "LibraryMonitor.c" +#line 2277 "LibraryMonitor.c" } -static void library_monitor_add_to_discovered_list (LibraryMonitor* self, MediaMonitor* monitor, Monitorable* monitorable) { +static void +library_monitor_add_to_discovered_list (LibraryMonitor* self, + MediaMonitor* monitor, + Monitorable* monitorable) +{ GeeHashMap* _tmp0_; - MediaMonitor* _tmp1_; - gboolean _tmp2_; - GeeHashMap* _tmp7_; - MediaMonitor* _tmp8_; - gpointer _tmp9_; - GeeSet* _tmp10_; - Monitorable* _tmp11_; + GeeHashMap* _tmp4_; + gpointer _tmp5_; + GeeSet* _tmp6_; #line 264 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 264 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -1946,58 +2295,49 @@ static void library_monitor_add_to_discovered_list (LibraryMonitor* self, MediaM #line 265 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = self->priv->discovered; #line 265 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = monitor; -#line 265 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 265 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp2_) { -#line 1955 "LibraryMonitor.c" - GeeHashMap* _tmp3_; - MediaMonitor* _tmp4_; - GeeHashSet* _tmp5_; - GeeHashSet* _tmp6_; + if (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), monitor)) { +#line 2300 "LibraryMonitor.c" + GeeHashMap* _tmp1_; + GeeHashSet* _tmp2_; + GeeHashSet* _tmp3_; #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = self->priv->discovered; + _tmp1_ = self->priv->discovered; #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = monitor; + _tmp2_ = gee_hash_set_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = gee_hash_set_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); -#line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_SET, GeeSet)); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), monitor, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_SET, GeeSet)); #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_object_unref0 (_tmp6_); -#line 1972 "LibraryMonitor.c" + _g_object_unref0 (_tmp3_); +#line 2314 "LibraryMonitor.c" } #line 268 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = self->priv->discovered; + _tmp4_ = self->priv->discovered; #line 268 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = monitor; + _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), monitor); #line 268 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_); + _tmp6_ = (GeeSet*) _tmp5_; #line 268 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = (GeeSet*) _tmp9_; + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), monitorable); #line 268 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = monitorable; -#line 268 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_); -#line 268 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_object_unref0 (_tmp10_); -#line 1988 "LibraryMonitor.c" + _g_object_unref0 (_tmp6_); +#line 2326 "LibraryMonitor.c" } -static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor* self, Monitorable* monitorable) { +static MediaMonitor* +library_monitor_get_monitor_for_monitorable (LibraryMonitor* self, + Monitorable* monitorable) +{ MediaMonitor* result = NULL; - Monitorable* _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; + gchar* _tmp15_; + gchar* _tmp16_; #line 271 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (IS_LIBRARY_MONITOR (self), NULL); #line 271 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL); -#line 2001 "LibraryMonitor.c" +#line 2341 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp0_; @@ -2025,7 +2365,7 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor _monitor_index = -1; #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 2029 "LibraryMonitor.c" +#line 2369 "LibraryMonitor.c" gint _tmp5_; gint _tmp6_; gint _tmp7_; @@ -2036,9 +2376,7 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor MediaMonitor* _tmp11_; MediaSourceCollection* _tmp12_; MediaSourceCollection* _tmp13_; - Monitorable* _tmp14_; - gboolean _tmp15_; - gboolean _tmp16_; + gboolean _tmp14_; #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = _monitor_index; #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2051,7 +2389,7 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor if (!(_tmp6_ < _tmp7_)) { #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2055 "LibraryMonitor.c" +#line 2393 "LibraryMonitor.c" } #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _monitor_list; @@ -2068,52 +2406,48 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor #line 273 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp13_ = _tmp12_; #line 273 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = monitorable; -#line 273 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = source_collection_holds_type_of_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_SOURCE, DataSource)); -#line 273 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = _tmp15_; + _tmp14_ = source_collection_holds_type_of_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (monitorable, TYPE_DATA_SOURCE, DataSource)); #line 273 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_collection_unref0 (_tmp13_); #line 273 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp16_) { + if (_tmp14_) { #line 274 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" result = monitor; #line 274 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); #line 274 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 2087 "LibraryMonitor.c" +#line 2421 "LibraryMonitor.c" } #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 2091 "LibraryMonitor.c" +#line 2425 "LibraryMonitor.c" } #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 2095 "LibraryMonitor.c" +#line 2429 "LibraryMonitor.c" } #line 277 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = monitorable; -#line 277 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_OBJECT, DataObject)); + _tmp15_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (monitorable, TYPE_DATA_OBJECT, DataObject)); #line 277 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = _tmp18_; + _tmp16_ = _tmp15_; #line 277 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_error ("LibraryMonitor.vala:277: Unable to locate MediaMonitor for %s", _tmp19_); + g_error ("LibraryMonitor.vala:277: Unable to locate MediaMonitor for %s", _tmp16_); #line 277 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp19_); -#line 2107 "LibraryMonitor.c" + _g_free0 (_tmp16_); +#line 2439 "LibraryMonitor.c" } -static void library_monitor_real_discovery_started (DirectoryMonitor* base) { +static void +library_monitor_real_discovery_started (DirectoryMonitor* base) +{ LibraryMonitor * self; - GeeHashMap* _tmp28_; - GeeHashSet* _tmp29_; + GeeHashMap* _tmp27_; + GeeHashSet* _tmp28_; #line 280 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); -#line 2117 "LibraryMonitor.c" +#line 2451 "LibraryMonitor.c" { GeeIterator* _collection_it = NULL; MediaCollectionRegistry* _tmp0_; @@ -2142,154 +2476,153 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) { _collection_it = _tmp5_; #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 2146 "LibraryMonitor.c" +#line 2480 "LibraryMonitor.c" GeeIterator* _tmp6_; - gboolean _tmp7_; MediaSourceCollection* collection = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - GeeList* _tmp10_; - MediaSourceCollection* _tmp11_; - Workers* _tmp12_; - GCancellable* _tmp13_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + GeeList* _tmp9_; + MediaSourceCollection* _tmp10_; + Workers* _tmp11_; + GCancellable* _tmp12_; + MediaMonitor* _tmp13_; MediaMonitor* _tmp14_; - MediaMonitor* _tmp15_; #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp6_ = _collection_it; #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2166 "LibraryMonitor.c" +#line 2497 "LibraryMonitor.c" } #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = _collection_it; + _tmp7_ = _collection_it; #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - collection = (MediaSourceCollection*) _tmp9_; + collection = (MediaSourceCollection*) _tmp8_; #line 282 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = self->priv->monitors; + _tmp9_ = self->priv->monitors; #line 282 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = collection; + _tmp10_ = collection; #line 282 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = self->priv->workers; + _tmp11_ = self->priv->workers; #line 282 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = self->priv->cancellable; + _tmp12_ = self->priv->cancellable; #line 282 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = media_source_collection_create_media_monitor (_tmp11_, _tmp12_, _tmp13_); + _tmp13_ = media_source_collection_create_media_monitor (_tmp10_, _tmp11_, _tmp12_); #line 282 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 282 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_); #line 282 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp14_); #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_collection_unref0 (collection); -#line 2192 "LibraryMonitor.c" +#line 2523 "LibraryMonitor.c" } #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_collection_it); -#line 2196 "LibraryMonitor.c" +#line 2527 "LibraryMonitor.c" } { GeeList* _monitor_list = NULL; + GeeList* _tmp15_; GeeList* _tmp16_; - GeeList* _tmp17_; gint _monitor_size = 0; - GeeList* _tmp18_; + GeeList* _tmp17_; + gint _tmp18_; gint _tmp19_; - gint _tmp20_; gint _monitor_index = 0; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = self->priv->monitors; + _tmp15_ = self->priv->monitors; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = _g_object_ref0 (_tmp16_); + _tmp16_ = _g_object_ref0 (_tmp15_); #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_list = _tmp17_; + _monitor_list = _tmp16_; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = _monitor_list; + _tmp17_ = _monitor_list; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection)); #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_size = _tmp20_; + _monitor_size = _tmp19_; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _monitor_index = -1; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 2225 "LibraryMonitor.c" +#line 2556 "LibraryMonitor.c" + gint _tmp20_; gint _tmp21_; gint _tmp22_; - gint _tmp23_; MediaMonitor* monitor = NULL; - GeeList* _tmp24_; - gint _tmp25_; - gpointer _tmp26_; - MediaMonitor* _tmp27_; + GeeList* _tmp23_; + gint _tmp24_; + gpointer _tmp25_; + MediaMonitor* _tmp26_; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = _monitor_index; + _tmp20_ = _monitor_index; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_index = _tmp21_ + 1; + _monitor_index = _tmp20_ + 1; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = _monitor_index; + _tmp21_ = _monitor_index; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = _monitor_size; + _tmp22_ = _monitor_size; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp22_ < _tmp23_)) { + if (!(_tmp21_ < _tmp22_)) { #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2246 "LibraryMonitor.c" +#line 2577 "LibraryMonitor.c" } #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = _monitor_list; + _tmp23_ = _monitor_list; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = _monitor_index; + _tmp24_ = _monitor_index; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = gee_list_get (_tmp24_, _tmp25_); + _tmp25_ = gee_list_get (_tmp23_, _tmp24_); #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = (MediaMonitor*) _tmp26_; + monitor = (MediaMonitor*) _tmp25_; #line 285 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = monitor; + _tmp26_ = monitor; #line 285 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - media_monitor_notify_discovery_started (_tmp27_); + media_monitor_notify_discovery_started (_tmp26_); #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 2262 "LibraryMonitor.c" +#line 2593 "LibraryMonitor.c" } #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 2266 "LibraryMonitor.c" +#line 2597 "LibraryMonitor.c" } #line 287 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp28_ = gee_hash_map_new (TYPE_MEDIA_MONITOR, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp27_ = gee_hash_map_new (TYPE_MEDIA_MONITOR, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 287 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->priv->discovered); #line 287 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->discovered = _tmp28_; + self->priv->discovered = _tmp27_; #line 288 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp28_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); #line 288 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->priv->unknown_files); #line 288 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->unknown_files = _tmp29_; + self->priv->unknown_files = _tmp28_; #line 290 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->discovery_started (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor)); -#line 2282 "LibraryMonitor.c" +#line 2613 "LibraryMonitor.c" } -static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* file, GFileInfo* info) { +static void +library_monitor_real_file_discovered (DirectoryMonitor* base, + GFile* file, + GFileInfo* info) +{ LibraryMonitor * self; Monitorable* representation = NULL; MediaMonitor* representing = NULL; gboolean ignore = FALSE; - MediaMonitor* _tmp20_; - GFile* _tmp36_; - GFileInfo* _tmp37_; + MediaMonitor* _tmp18_; #line 293 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); #line 293 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2302,7 +2635,7 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* representing = NULL; #line 296 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" ignore = FALSE; -#line 2306 "LibraryMonitor.c" +#line 2639 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp0_; @@ -2330,7 +2663,7 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* _monitor_index = -1; #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 2334 "LibraryMonitor.c" +#line 2667 "LibraryMonitor.c" gint _tmp5_; gint _tmp6_; gint _tmp7_; @@ -2340,11 +2673,9 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* gpointer _tmp10_; MediaMonitorDiscoveredFile _result_ = 0; MediaMonitor* _tmp11_; - GFile* _tmp12_; - GFileInfo* _tmp13_; - Monitorable* _tmp14_ = NULL; - MediaMonitorDiscoveredFile _tmp15_; - MediaMonitorDiscoveredFile _tmp16_; + Monitorable* _tmp12_ = NULL; + MediaMonitorDiscoveredFile _tmp13_; + MediaMonitorDiscoveredFile _tmp14_; #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = _monitor_index; #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2357,7 +2688,7 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* if (!(_tmp6_ < _tmp7_)) { #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2361 "LibraryMonitor.c" +#line 2692 "LibraryMonitor.c" } #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _monitor_list; @@ -2370,187 +2701,171 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* #line 298 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = monitor; #line 298 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = file; -#line 298 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = info; -#line 298 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = media_monitor_notify_file_discovered (_tmp11_, _tmp12_, _tmp13_, &_tmp14_); + _tmp13_ = media_monitor_notify_file_discovered (_tmp11_, file, info, &_tmp12_); #line 298 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (representation); #line 298 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - representation = _tmp14_; + representation = _tmp12_; #line 298 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _result_ = _tmp15_; + _result_ = _tmp13_; #line 300 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = _result_; + _tmp14_ = _result_; #line 300 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp16_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) { -#line 2389 "LibraryMonitor.c" - MediaMonitor* _tmp17_; - MediaMonitor* _tmp18_; + if (_tmp14_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) { +#line 2716 "LibraryMonitor.c" + MediaMonitor* _tmp15_; + MediaMonitor* _tmp16_; #line 301 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = monitor; + _tmp15_ = monitor; #line 301 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = _g_object_ref0 (_tmp17_); + _tmp16_ = _g_object_ref0 (_tmp15_); #line 301 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (representing); #line 301 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - representing = _tmp18_; + representing = _tmp16_; #line 303 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); #line 303 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2404 "LibraryMonitor.c" +#line 2731 "LibraryMonitor.c" } else { - MediaMonitorDiscoveredFile _tmp19_; + MediaMonitorDiscoveredFile _tmp17_; #line 304 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = _result_; + _tmp17_ = _result_; #line 304 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp19_ == MEDIA_MONITOR_DISCOVERED_FILE_IGNORE) { + if (_tmp17_ == MEDIA_MONITOR_DISCOVERED_FILE_IGNORE) { #line 306 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" ignore = TRUE; #line 308 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); #line 308 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2417 "LibraryMonitor.c" +#line 2744 "LibraryMonitor.c" } } #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 2422 "LibraryMonitor.c" +#line 2749 "LibraryMonitor.c" } #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 2426 "LibraryMonitor.c" +#line 2753 "LibraryMonitor.c" } #line 312 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = representing; + _tmp18_ = representing; #line 312 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp20_ != NULL) { -#line 2432 "LibraryMonitor.c" - gboolean _tmp21_ = FALSE; - Monitorable* _tmp22_; - MediaMonitor* _tmp24_; - Monitorable* _tmp25_; + if (_tmp18_ != NULL) { +#line 2759 "LibraryMonitor.c" + gboolean _tmp19_ = FALSE; + Monitorable* _tmp20_; + MediaMonitor* _tmp22_; + Monitorable* _tmp23_; #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = representation; + _tmp20_ = representation; #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp22_ != NULL) { -#line 2441 "LibraryMonitor.c" - gboolean _tmp23_; + if (_tmp20_ != NULL) { +#line 2768 "LibraryMonitor.c" + gboolean _tmp21_; #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = ignore; + _tmp21_ = ignore; #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = !_tmp23_; -#line 2447 "LibraryMonitor.c" + _tmp19_ = !_tmp21_; +#line 2774 "LibraryMonitor.c" } else { #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = FALSE; -#line 2451 "LibraryMonitor.c" + _tmp19_ = FALSE; +#line 2778 "LibraryMonitor.c" } #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _vala_assert (_tmp21_, "representation != null && !ignore"); + _vala_assert (_tmp19_, "representation != null && !ignore"); #line 314 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = representing; + _tmp22_ = representing; #line 314 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = representation; + _tmp23_ = representation; #line 314 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_add_to_discovered_list (self, _tmp24_, _tmp25_); -#line 2461 "LibraryMonitor.c" + library_monitor_add_to_discovered_list (self, _tmp22_, _tmp23_); +#line 2788 "LibraryMonitor.c" } else { - gboolean _tmp26_ = FALSE; - gboolean _tmp27_ = FALSE; - gboolean _tmp28_; -#line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp28_ = ignore; + gboolean _tmp24_ = FALSE; + gboolean _tmp25_ = FALSE; + gboolean _tmp26_; #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp28_) { -#line 2470 "LibraryMonitor.c" - TombstoneSourceCollection* _tmp29_; - GFile* _tmp30_; - gboolean _tmp31_; + _tmp26_ = ignore; #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = tombstone_global; + if (!_tmp26_) { +#line 2797 "LibraryMonitor.c" + TombstoneSourceCollection* _tmp27_; #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp30_ = file; + _tmp27_ = tombstone_global; #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp31_ = tombstone_source_collection_matches (_tmp29_, _tmp30_); -#line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = !_tmp31_; -#line 2482 "LibraryMonitor.c" + _tmp25_ = !tombstone_source_collection_matches (_tmp27_, file); +#line 2803 "LibraryMonitor.c" } else { #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = FALSE; -#line 2486 "LibraryMonitor.c" + _tmp25_ = FALSE; +#line 2807 "LibraryMonitor.c" } #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp27_) { -#line 2490 "LibraryMonitor.c" - GFile* _tmp32_; - gboolean _tmp33_; -#line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp32_ = file; + if (_tmp25_) { #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp33_ = library_monitor_is_supported_filetype (self, _tmp32_); -#line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = _tmp33_; -#line 2499 "LibraryMonitor.c" + _tmp24_ = library_monitor_is_supported_filetype (self, file); +#line 2813 "LibraryMonitor.c" } else { #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = FALSE; -#line 2503 "LibraryMonitor.c" + _tmp24_ = FALSE; +#line 2817 "LibraryMonitor.c" } #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp26_) { -#line 2507 "LibraryMonitor.c" - GeeHashSet* _tmp34_; - GFile* _tmp35_; + if (_tmp24_) { +#line 2821 "LibraryMonitor.c" + GeeHashSet* _tmp28_; #line 316 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp34_ = self->priv->unknown_files; -#line 316 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp35_ = file; + _tmp28_ = self->priv->unknown_files; #line 316 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp35_); -#line 2516 "LibraryMonitor.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), file); +#line 2827 "LibraryMonitor.c" } } #line 319 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp36_ = file; -#line 319 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp37_ = info; -#line 319 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->file_discovered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp36_, _tmp37_); + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->file_discovered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file, info); #line 293 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (representing); #line 293 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (representation); -#line 2529 "LibraryMonitor.c" +#line 2836 "LibraryMonitor.c" } -static void library_monitor_real_discovery_completed (DirectoryMonitor* base) { +static void +library_monitor_real_discovery_completed (DirectoryMonitor* base) +{ LibraryMonitor * self; #line 322 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); #line 323 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_async_discovery_completed (self, NULL, NULL); -#line 2539 "LibraryMonitor.c" +#line 2848 "LibraryMonitor.c" } -static void library_monitor_async_discovery_completed_data_free (gpointer _data) { +static void +library_monitor_async_discovery_completed_data_free (gpointer _data) +{ LibraryMonitorAsyncDiscoveryCompletedData* _data_; _data_ = _data; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->self); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_slice_free (LibraryMonitorAsyncDiscoveryCompletedData, _data_); -#line 2550 "LibraryMonitor.c" +#line 2861 "LibraryMonitor.c" } -static void library_monitor_async_discovery_completed_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) { +static void +library_monitor_async_discovery_completed_async_ready_wrapper (GObject *source_object, + GAsyncResult *res, + void *user_data) +{ LibraryMonitorAsyncDiscoveryCompletedData* _task_data_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _task_data_ = g_task_get_task_data (G_TASK (res)); @@ -2558,15 +2873,19 @@ static void library_monitor_async_discovery_completed_async_ready_wrapper (GObje if (_task_data_->_callback_ != NULL) { #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _task_data_->_callback_ (source_object, res, user_data); -#line 2562 "LibraryMonitor.c" +#line 2877 "LibraryMonitor.c" } #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _task_data_->_task_complete_ = TRUE; -#line 2566 "LibraryMonitor.c" +#line 2881 "LibraryMonitor.c" } -static void library_monitor_async_discovery_completed (LibraryMonitor* self, GAsyncReadyCallback _callback_, gpointer _user_data_) { +static void +library_monitor_async_discovery_completed (LibraryMonitor* self, + GAsyncReadyCallback _callback_, + gpointer _user_data_) +{ LibraryMonitorAsyncDiscoveryCompletedData* _data_; LibraryMonitor* _tmp0_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2579,7 +2898,7 @@ static void library_monitor_async_discovery_completed (LibraryMonitor* self, GAs if (_callback_ == NULL) { #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_task_complete_ = TRUE; -#line 2583 "LibraryMonitor.c" +#line 2902 "LibraryMonitor.c" } #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_task_set_task_data (_data_->_async_result, _data_, library_monitor_async_discovery_completed_data_free); @@ -2589,42 +2908,49 @@ static void library_monitor_async_discovery_completed (LibraryMonitor* self, GAs _data_->self = _tmp0_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_async_discovery_completed_co (_data_); -#line 2593 "LibraryMonitor.c" +#line 2912 "LibraryMonitor.c" } -static void library_monitor_async_discovery_completed_finish (LibraryMonitor* self, GAsyncResult* _res_) { +static void +library_monitor_async_discovery_completed_finish (LibraryMonitor* self, + GAsyncResult* _res_) +{ LibraryMonitorAsyncDiscoveryCompletedData* _data_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_ = g_task_propagate_pointer (G_TASK (_res_), NULL); -#line 2601 "LibraryMonitor.c" +#line 2923 "LibraryMonitor.c" } -static gboolean _library_monitor_async_discovery_completed_co_gsource_func (gpointer self) { +static gboolean +_library_monitor_async_discovery_completed_co_gsource_func (gpointer self) +{ gboolean result; result = library_monitor_async_discovery_completed_co (self); #line 378 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 2610 "LibraryMonitor.c" +#line 2934 "LibraryMonitor.c" } -static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyncDiscoveryCompletedData* _data_) { +static gboolean +library_monitor_async_discovery_completed_co (LibraryMonitorAsyncDiscoveryCompletedData* _data_) +{ #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" switch (_data_->_state_) { #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" case 0: -#line 2619 "LibraryMonitor.c" +#line 2945 "LibraryMonitor.c" goto _state_0; #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" case 1: -#line 2623 "LibraryMonitor.c" +#line 2949 "LibraryMonitor.c" goto _state_1; default: #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_assert_not_reached (); -#line 2628 "LibraryMonitor.c" +#line 2954 "LibraryMonitor.c" } _state_0: #line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2645,14 +2971,14 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn while (_data_->_task_complete_ != TRUE) { #line 334 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); -#line 2649 "LibraryMonitor.c" +#line 2975 "LibraryMonitor.c" } } #line 334 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_object_unref (_data_->_async_result); #line 334 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return FALSE; -#line 2656 "LibraryMonitor.c" +#line 2982 "LibraryMonitor.c" } #line 337 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp3_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); @@ -2662,7 +2988,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn _data_->_tmp4_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); #line 338 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->adopted = _data_->_tmp4_; -#line 2666 "LibraryMonitor.c" +#line 2992 "LibraryMonitor.c" { #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp5_ = _data_->self->priv->unknown_files; @@ -2675,158 +3001,156 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp7_ = _data_->_file_it; #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp8_ = gee_iterator_next (_data_->_tmp7_); -#line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_data_->_tmp8_) { + if (!gee_iterator_next (_data_->_tmp7_)) { #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2684 "LibraryMonitor.c" +#line 3008 "LibraryMonitor.c" } #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp9_ = _data_->_file_it; + _data_->_tmp8_ = _data_->_file_it; #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp10_ = gee_iterator_get (_data_->_tmp9_); + _data_->_tmp9_ = gee_iterator_get (_data_->_tmp8_); #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->file = (GFile*) _data_->_tmp10_; + _data_->file = (GFile*) _data_->_tmp9_; #line 340 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp11_ = _data_->file; + _data_->_tmp10_ = _data_->file; #line 340 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp12_ = directory_monitor_get_file_info (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _data_->_tmp11_); + _data_->_tmp11_ = directory_monitor_get_file_info (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _data_->_tmp10_); #line 340 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->info = _data_->_tmp12_; + _data_->info = _data_->_tmp11_; #line 341 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp13_ = _data_->info; + _data_->_tmp12_ = _data_->info; #line 341 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp13_ == NULL) { + if (_data_->_tmp12_ == NULL) { #line 342 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->info); #line 342 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->file); #line 342 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 2708 "LibraryMonitor.c" +#line 3032 "LibraryMonitor.c" } #line 345 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp14_ = _data_->all_candidates; + _data_->_tmp13_ = _data_->all_candidates; #line 345 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 347 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->candidates = NULL; #line 348 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->associated = FALSE; -#line 2718 "LibraryMonitor.c" +#line 3042 "LibraryMonitor.c" { #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp15_ = _data_->self->priv->monitors; + _data_->_tmp14_ = _data_->self->priv->monitors; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp16_ = _g_object_ref0 (_data_->_tmp15_); + _data_->_tmp15_ = _g_object_ref0 (_data_->_tmp14_); #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_monitor_list = _data_->_tmp16_; + _data_->_monitor_list = _data_->_tmp15_; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp17_ = _data_->_monitor_list; + _data_->_tmp16_ = _data_->_monitor_list; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp17_, GEE_TYPE_COLLECTION, GeeCollection)); + _data_->_tmp17_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp16_, GEE_TYPE_COLLECTION, GeeCollection)); #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp19_ = _data_->_tmp18_; + _data_->_tmp18_ = _data_->_tmp17_; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_monitor_size = _data_->_tmp19_; + _data_->_monitor_size = _data_->_tmp18_; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_monitor_index = -1; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp20_ = _data_->_monitor_index; + _data_->_tmp19_ = _data_->_monitor_index; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_monitor_index = _data_->_tmp20_ + 1; + _data_->_monitor_index = _data_->_tmp19_ + 1; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp21_ = _data_->_monitor_index; + _data_->_tmp20_ = _data_->_monitor_index; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp22_ = _data_->_monitor_size; + _data_->_tmp21_ = _data_->_monitor_size; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_data_->_tmp21_ < _data_->_tmp22_)) { + if (!(_data_->_tmp20_ < _data_->_tmp21_)) { #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2750 "LibraryMonitor.c" +#line 3074 "LibraryMonitor.c" } #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp23_ = _data_->_monitor_list; + _data_->_tmp22_ = _data_->_monitor_list; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp24_ = _data_->_monitor_index; + _data_->_tmp23_ = _data_->_monitor_index; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp25_ = gee_list_get (_data_->_tmp23_, _data_->_tmp24_); + _data_->_tmp24_ = gee_list_get (_data_->_tmp22_, _data_->_tmp23_); #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->monitor = (MediaMonitor*) _data_->_tmp25_; + _data_->monitor = (MediaMonitor*) _data_->_tmp24_; #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp26_ = _data_->monitor; + _data_->_tmp25_ = _data_->monitor; #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp27_ = _data_->file; + _data_->_tmp26_ = _data_->file; #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp28_ = _data_->info; + _data_->_tmp27_ = _data_->info; #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp29_ = 0; + _data_->_tmp28_ = 0; #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp30_ = media_monitor_candidates_for_unknown_file (_data_->_tmp26_, _data_->_tmp27_, _data_->_tmp28_, &_data_->_tmp29_); + _data_->_tmp29_ = media_monitor_candidates_for_unknown_file (_data_->_tmp25_, _data_->_tmp26_, _data_->_tmp27_, &_data_->_tmp28_); #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_result_ = _data_->_tmp29_; + _data_->_result_ = _data_->_tmp28_; #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->candidates); #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->candidates = _data_->_tmp30_; + _data_->candidates = _data_->_tmp29_; #line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp32_ = _data_->_result_; + _data_->_tmp31_ = _data_->_result_; #line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp32_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) { + if (_data_->_tmp31_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) { #line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp31_ = TRUE; -#line 2782 "LibraryMonitor.c" + _data_->_tmp30_ = TRUE; +#line 3106 "LibraryMonitor.c" } else { #line 353 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp33_ = _data_->_result_; + _data_->_tmp32_ = _data_->_result_; #line 353 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp31_ = _data_->_tmp33_ == MEDIA_MONITOR_DISCOVERED_FILE_IGNORE; -#line 2788 "LibraryMonitor.c" + _data_->_tmp30_ = _data_->_tmp32_ == MEDIA_MONITOR_DISCOVERED_FILE_IGNORE; +#line 3112 "LibraryMonitor.c" } #line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp31_) { + if (_data_->_tmp30_) { #line 354 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->associated = TRUE; #line 356 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->monitor); #line 356 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2798 "LibraryMonitor.c" +#line 3122 "LibraryMonitor.c" } else { #line 357 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp34_ = _data_->candidates; + _data_->_tmp33_ = _data_->candidates; #line 357 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp34_ != NULL) { + if (_data_->_tmp33_ != NULL) { #line 358 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp35_ = _data_->all_candidates; + _data_->_tmp34_ = _data_->all_candidates; #line 358 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp36_ = _data_->candidates; + _data_->_tmp35_ = _data_->candidates; #line 358 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_array_list_add_all (_data_->_tmp35_, _data_->_tmp36_); -#line 2810 "LibraryMonitor.c" + gee_array_list_add_all (_data_->_tmp34_, _data_->_tmp35_); +#line 3134 "LibraryMonitor.c" } } #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->monitor); -#line 2815 "LibraryMonitor.c" +#line 3139 "LibraryMonitor.c" } #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->_monitor_list); -#line 2819 "LibraryMonitor.c" +#line 3143 "LibraryMonitor.c" } #line 362 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp37_ = _data_->associated; + _data_->_tmp36_ = _data_->associated; #line 362 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp37_) { + if (_data_->_tmp36_) { #line 363 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp38_ = _data_->adopted; + _data_->_tmp37_ = _data_->adopted; #line 363 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp39_ = _data_->file; + _data_->_tmp38_ = _data_->file; #line 363 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _data_->_tmp39_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _data_->_tmp38_); #line 365 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->candidates); #line 365 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2835,49 +3159,49 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn _g_object_unref0 (_data_->file); #line 365 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 2839 "LibraryMonitor.c" +#line 3163 "LibraryMonitor.c" } #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp40_ = _data_->all_candidates; + _data_->_tmp39_ = _data_->all_candidates; #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp41_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp40_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _data_->_tmp40_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp39_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp42_ = _data_->_tmp41_; + _data_->_tmp41_ = _data_->_tmp40_; #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp42_ > 0) { + if (_data_->_tmp41_ > 0) { #line 371 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp43_ = _data_->all_candidates; + _data_->_tmp42_ = _data_->all_candidates; #line 371 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp44_ = _g_object_ref0 (_data_->_tmp43_); + _data_->_tmp43_ = _g_object_ref0 (_data_->_tmp42_); #line 371 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->job_candidates = _data_->_tmp44_; + _data_->job_candidates = _data_->_tmp43_; #line 372 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp45_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _data_->_tmp44_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 372 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->all_candidates); #line 372 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->all_candidates = _data_->_tmp45_; + _data_->all_candidates = _data_->_tmp44_; #line 374 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp46_ = _data_->self->priv->checksums_total; + _data_->_tmp45_ = _data_->self->priv->checksums_total; #line 374 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->self->priv->checksums_total = _data_->_tmp46_ + 1; + _data_->self->priv->checksums_total = _data_->_tmp45_ + 1; #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp47_ = _data_->self->priv->workers; + _data_->_tmp46_ = _data_->self->priv->workers; #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp48_ = _data_->file; + _data_->_tmp47_ = _data_->file; #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp49_ = _data_->job_candidates; + _data_->_tmp48_ = _data_->job_candidates; #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp50_ = library_monitor_find_move_job_new (_data_->self, _data_->_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp49_, GEE_TYPE_COLLECTION, GeeCollection)); + _data_->_tmp49_ = library_monitor_find_move_job_new (_data_->self, _data_->_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp48_, GEE_TYPE_COLLECTION, GeeCollection)); #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp51_ = _data_->_tmp50_; + _data_->_tmp50_ = _data_->_tmp49_; #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - workers_enqueue (_data_->_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp51_, TYPE_BACKGROUND_JOB, BackgroundJob)); + workers_enqueue (_data_->_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp50_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _background_job_unref0 (_data_->_tmp51_); + _background_job_unref0 (_data_->_tmp50_); #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->job_candidates); -#line 2881 "LibraryMonitor.c" +#line 3205 "LibraryMonitor.c" } #line 378 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _library_monitor_async_discovery_completed_co_gsource_func, _data_, NULL); @@ -2885,7 +3209,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn _data_->_state_ = 1; #line 379 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return FALSE; -#line 2889 "LibraryMonitor.c" +#line 3213 "LibraryMonitor.c" _state_1: ; #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2894,45 +3218,45 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn _g_object_unref0 (_data_->info); #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->file); -#line 2898 "LibraryMonitor.c" +#line 3222 "LibraryMonitor.c" } #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->_file_it); -#line 2902 "LibraryMonitor.c" +#line 3226 "LibraryMonitor.c" } #line 383 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp52_ = _data_->self->priv->unknown_files; + _data_->_tmp51_ = _data_->self->priv->unknown_files; #line 383 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp53_ = _data_->adopted; + _data_->_tmp52_ = _data_->adopted; #line 383 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp53_, GEE_TYPE_COLLECTION, GeeCollection)); + gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp51_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp52_, GEE_TYPE_COLLECTION, GeeCollection)); #line 385 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->self->priv->checksums_completed = 0; #line 387 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp54_ = _data_->self->priv->checksums_total; + _data_->_tmp53_ = _data_->self->priv->checksums_total; #line 387 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp54_ == 0) { + if (_data_->_tmp53_ == 0) { #line 388 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_discovery_stage_completed (_data_->self); -#line 2918 "LibraryMonitor.c" +#line 3242 "LibraryMonitor.c" } else { #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp55_ = _data_->self->priv->checksums_total; + _data_->_tmp54_ = _data_->self->priv->checksums_total; #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp56_ = g_strdup_printf ("%d checksum jobs initiated to verify unknown photo files", _data_->_tmp55_); + _data_->_tmp55_ = g_strdup_printf ("%d checksum jobs initiated to verify unknown photo files", _data_->_tmp54_); #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp57_ = _data_->_tmp56_; + _data_->_tmp56_ = _data_->_tmp55_; #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_data_->_tmp57_); + directory_monitor_mdbg (_data_->_tmp56_); #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_data_->_tmp57_); + _g_free0 (_data_->_tmp56_); #line 391 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp58_ = _data_->self->priv->checksums_completed; + _data_->_tmp57_ = _data_->self->priv->checksums_completed; #line 391 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp59_ = _data_->self->priv->checksums_total; + _data_->_tmp58_ = _data_->self->priv->checksums_total; #line 391 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_emit (_data_->self, library_monitor_signals[LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL], 0, _data_->_tmp58_, _data_->_tmp59_); -#line 2936 "LibraryMonitor.c" + g_signal_emit (_data_->self, library_monitor_signals[LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL], 0, _data_->_tmp57_, _data_->_tmp58_); +#line 3260 "LibraryMonitor.c" } #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->adopted); @@ -2946,18 +3270,20 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn while (_data_->_task_complete_ != TRUE) { #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); -#line 2950 "LibraryMonitor.c" +#line 3274 "LibraryMonitor.c" } } #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_object_unref (_data_->_async_result); #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return FALSE; -#line 2957 "LibraryMonitor.c" +#line 3281 "LibraryMonitor.c" } -static void library_monitor_report_checksum_job_completed (LibraryMonitor* self) { +static void +library_monitor_report_checksum_job_completed (LibraryMonitor* self) +{ gint _tmp0_; gint _tmp1_; gint _tmp2_; @@ -2991,196 +3317,203 @@ static void library_monitor_report_checksum_job_completed (LibraryMonitor* self) if (_tmp5_ == _tmp6_) { #line 402 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_discovery_stage_completed (self); -#line 2995 "LibraryMonitor.c" +#line 3321 "LibraryMonitor.c" } } -static gpointer _background_job_ref0 (gpointer self) { +static gpointer +_background_job_ref0 (gpointer self) +{ #line 406 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self ? background_job_ref (self) : NULL; -#line 3003 "LibraryMonitor.c" +#line 3331 "LibraryMonitor.c" } -static void library_monitor_on_find_move_completed (LibraryMonitor* self, BackgroundJob* j) { +static void +library_monitor_on_find_move_completed (LibraryMonitor* self, + BackgroundJob* j) +{ LibraryMonitorFindMoveJob* job = NULL; - BackgroundJob* _tmp0_; + LibraryMonitorFindMoveJob* _tmp0_; LibraryMonitorFindMoveJob* _tmp1_; - LibraryMonitorFindMoveJob* _tmp2_; - Monitorable* _tmp3_; - LibraryMonitorFindMoveJob* _tmp28_; - GError* _tmp29_; + Monitorable* _tmp2_; + LibraryMonitorFindMoveJob* _tmp27_; + GError* _tmp28_; #line 405 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 405 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_BACKGROUND_JOB (j)); #line 406 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = j; + _tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, LIBRARY_MONITOR_TYPE_FIND_MOVE_JOB, LibraryMonitorFindMoveJob)); #line 406 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_MONITOR_TYPE_FIND_MOVE_JOB, LibraryMonitorFindMoveJob)); -#line 406 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - job = _tmp1_; + job = _tmp0_; #line 411 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = job; + _tmp1_ = job; #line 411 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = _tmp2_->match; + _tmp2_ = _tmp1_->match; #line 411 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp3_ != NULL) { -#line 3031 "LibraryMonitor.c" - LibraryMonitorFindMoveJob* _tmp4_; - GFile* _tmp5_; + if (_tmp2_ != NULL) { +#line 3359 "LibraryMonitor.c" + LibraryMonitorFindMoveJob* _tmp3_; + GFile* _tmp4_; + gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; - LibraryMonitorFindMoveJob* _tmp8_; - Monitorable* _tmp9_; + LibraryMonitorFindMoveJob* _tmp7_; + Monitorable* _tmp8_; + gchar* _tmp9_; gchar* _tmp10_; gchar* _tmp11_; gchar* _tmp12_; - gchar* _tmp13_; MediaMonitor* monitor = NULL; - LibraryMonitorFindMoveJob* _tmp14_; - Monitorable* _tmp15_; + LibraryMonitorFindMoveJob* _tmp13_; + Monitorable* _tmp14_; + MediaMonitor* _tmp15_; MediaMonitor* _tmp16_; - MediaMonitor* _tmp17_; - LibraryMonitorFindMoveJob* _tmp18_; - Monitorable* _tmp19_; - LibraryMonitorFindMoveJob* _tmp20_; - GFile* _tmp21_; - GeeHashSet* _tmp22_; - LibraryMonitorFindMoveJob* _tmp23_; - GFile* _tmp24_; - MediaMonitor* _tmp25_; - LibraryMonitorFindMoveJob* _tmp26_; - Monitorable* _tmp27_; + LibraryMonitorFindMoveJob* _tmp17_; + Monitorable* _tmp18_; + LibraryMonitorFindMoveJob* _tmp19_; + GFile* _tmp20_; + GeeHashSet* _tmp21_; + LibraryMonitorFindMoveJob* _tmp22_; + GFile* _tmp23_; + MediaMonitor* _tmp24_; + LibraryMonitorFindMoveJob* _tmp25_; + Monitorable* _tmp26_; #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = job; + _tmp3_ = job; #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _tmp4_->file; + _tmp4_ = _tmp3_->file; #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = g_file_get_path (_tmp5_); + _tmp5_ = g_file_get_path (_tmp4_); #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = job; + _tmp7_ = job; #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = _tmp8_->match; + _tmp8_ = _tmp7_->match; #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); + _tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = g_strdup_printf ("Found moved master file: %s matches %s", _tmp7_, _tmp11_); + _tmp11_ = g_strdup_printf ("Found moved master file: %s matches %s", _tmp6_, _tmp10_); #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_tmp13_); + directory_monitor_mdbg (_tmp12_); #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp12_); #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp10_); #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 415 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = job; + _tmp13_ = job; #line 415 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = _tmp14_->match; + _tmp14_ = _tmp13_->match; #line 415 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = library_monitor_get_monitor_for_monitorable (self, _tmp15_); + _tmp15_ = library_monitor_get_monitor_for_monitorable (self, _tmp14_); #line 415 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = _tmp16_; + monitor = _tmp15_; #line 416 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = monitor; + _tmp16_ = monitor; #line 416 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = job; + _tmp17_ = job; #line 416 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = _tmp18_->match; + _tmp18_ = _tmp17_->match; #line 416 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = job; + _tmp19_ = job; #line 416 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = _tmp20_->file; + _tmp20_ = _tmp19_->file; #line 416 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - media_monitor_update_master_file (_tmp17_, _tmp19_, _tmp21_); + media_monitor_update_master_file (_tmp16_, _tmp18_, _tmp20_); #line 417 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = self->priv->unknown_files; + _tmp21_ = self->priv->unknown_files; #line 417 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = job; + _tmp22_ = job; #line 417 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = _tmp23_->file; + _tmp23_ = _tmp22_->file; #line 417 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_); + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp23_); #line 418 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = monitor; + _tmp24_ = monitor; #line 418 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = job; + _tmp25_ = job; #line 418 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = _tmp26_->match; + _tmp26_ = _tmp25_->match; #line 418 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_add_to_discovered_list (self, _tmp25_, _tmp27_); + library_monitor_add_to_discovered_list (self, _tmp24_, _tmp26_); #line 411 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 3123 "LibraryMonitor.c" +#line 3451 "LibraryMonitor.c" } #line 421 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp28_ = job; + _tmp27_ = job; #line 421 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = _tmp28_->err; + _tmp28_ = _tmp27_->err; #line 421 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp29_ != NULL) { -#line 3131 "LibraryMonitor.c" - LibraryMonitorFindMoveJob* _tmp30_; - GFile* _tmp31_; + if (_tmp28_ != NULL) { +#line 3459 "LibraryMonitor.c" + LibraryMonitorFindMoveJob* _tmp29_; + GFile* _tmp30_; + gchar* _tmp31_; gchar* _tmp32_; - gchar* _tmp33_; - LibraryMonitorFindMoveJob* _tmp34_; - GError* _tmp35_; - const gchar* _tmp36_; + LibraryMonitorFindMoveJob* _tmp33_; + GError* _tmp34_; + const gchar* _tmp35_; #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp30_ = job; + _tmp29_ = job; #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp31_ = _tmp30_->file; + _tmp30_ = _tmp29_->file; #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp32_ = g_file_get_path (_tmp31_); + _tmp31_ = g_file_get_path (_tmp30_); #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp33_ = _tmp32_; + _tmp32_ = _tmp31_; #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp34_ = job; + _tmp33_ = job; #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp35_ = _tmp34_->err; + _tmp34_ = _tmp33_->err; #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp36_ = _tmp35_->message; + _tmp35_ = _tmp34_->message; #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_warning ("LibraryMonitor.vala:422: Unable to checksum unknown media file %s: %s", _tmp33_, _tmp36_); + g_warning ("LibraryMonitor.vala:422: Unable to checksum unknown media file %s: %s", _tmp32_, _tmp35_); #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp33_); -#line 3157 "LibraryMonitor.c" + _g_free0 (_tmp32_); +#line 3485 "LibraryMonitor.c" } #line 424 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_report_checksum_job_completed (self); #line 405 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _background_job_unref0 (job); -#line 3163 "LibraryMonitor.c" +#line 3491 "LibraryMonitor.c" } -static void library_monitor_on_find_move_cancelled (LibraryMonitor* self, BackgroundJob* j) { +static void +library_monitor_on_find_move_cancelled (LibraryMonitor* self, + BackgroundJob* j) +{ #line 427 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 427 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_BACKGROUND_JOB (j)); #line 428 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_report_checksum_job_completed (self); -#line 3174 "LibraryMonitor.c" +#line 3505 "LibraryMonitor.c" } -static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { - gboolean _tmp65_; - TombstoneSourceCollection* _tmp67_; - GCancellable* _tmp68_; +static void +library_monitor_discovery_stage_completed (LibraryMonitor* self) +{ + gboolean _tmp60_; + TombstoneSourceCollection* _tmp62_; + GCancellable* _tmp63_; #line 431 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); -#line 3184 "LibraryMonitor.c" +#line 3517 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp0_; @@ -3208,7 +3541,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _monitor_index = -1; #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 3212 "LibraryMonitor.c" +#line 3545 "LibraryMonitor.c" gint _tmp5_; gint _tmp6_; gint _tmp7_; @@ -3233,7 +3566,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { if (!(_tmp6_ < _tmp7_)) { #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 3237 "LibraryMonitor.c" +#line 3570 "LibraryMonitor.c" } #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _monitor_list; @@ -3255,7 +3588,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _tmp14_ = monitorables; #line 434 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp14_ != NULL) { -#line 3259 "LibraryMonitor.c" +#line 3592 "LibraryMonitor.c" { GeeIterator* _monitorable_it = NULL; GeeSet* _tmp15_; @@ -3268,302 +3601,287 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _monitorable_it = _tmp16_; #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 3272 "LibraryMonitor.c" +#line 3605 "LibraryMonitor.c" GeeIterator* _tmp17_; - gboolean _tmp18_; Monitorable* monitorable = NULL; - GeeIterator* _tmp19_; - gpointer _tmp20_; - Monitorable* _tmp21_; - MediaMonitor* _tmp22_; + GeeIterator* _tmp18_; + gpointer _tmp19_; + Monitorable* _tmp20_; + MediaMonitor* _tmp21_; #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp17_ = _monitorable_it; #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = gee_iterator_next (_tmp17_); -#line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp18_) { + if (!gee_iterator_next (_tmp17_)) { #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 3288 "LibraryMonitor.c" +#line 3618 "LibraryMonitor.c" } #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = _monitorable_it; + _tmp18_ = _monitorable_it; #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = gee_iterator_get (_tmp19_); + _tmp19_ = gee_iterator_get (_tmp18_); #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitorable = (Monitorable*) _tmp20_; + monitorable = (Monitorable*) _tmp19_; #line 436 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = monitorable; + _tmp20_ = monitorable; #line 436 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = monitor; + _tmp21_ = monitor; #line 436 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_enqueue_verify_monitorable (self, _tmp21_, _tmp22_); + library_monitor_enqueue_verify_monitorable (self, _tmp20_, _tmp21_); #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitorable); -#line 3304 "LibraryMonitor.c" +#line 3634 "LibraryMonitor.c" } #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitorable_it); -#line 3308 "LibraryMonitor.c" +#line 3638 "LibraryMonitor.c" } } { GeeIterator* _object_it = NULL; - MediaMonitor* _tmp23_; + MediaMonitor* _tmp22_; + MediaSourceCollection* _tmp23_; MediaSourceCollection* _tmp24_; - MediaSourceCollection* _tmp25_; + GeeCollection* _tmp25_; GeeCollection* _tmp26_; - GeeCollection* _tmp27_; + GeeIterator* _tmp27_; GeeIterator* _tmp28_; - GeeIterator* _tmp29_; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = monitor; + _tmp22_ = monitor; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = media_monitor_get_media_source_collection (_tmp23_); + _tmp23_ = media_monitor_get_media_source_collection (_tmp22_); #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = _tmp24_; + _tmp24_ = _tmp23_; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp25_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_COLLECTION, DataCollection)); #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = _tmp26_; + _tmp26_ = _tmp25_; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp28_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp27_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable)); #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = _tmp28_; + _tmp28_ = _tmp27_; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_object_unref0 (_tmp27_); + _g_object_unref0 (_tmp26_); #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_collection_unref0 (_tmp25_); + _data_collection_unref0 (_tmp24_); #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _object_it = _tmp29_; + _object_it = _tmp28_; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 3342 "LibraryMonitor.c" - GeeIterator* _tmp30_; - gboolean _tmp31_; +#line 3672 "LibraryMonitor.c" + GeeIterator* _tmp29_; DataObject* object = NULL; - GeeIterator* _tmp32_; - gpointer _tmp33_; + GeeIterator* _tmp30_; + gpointer _tmp31_; Monitorable* monitorable = NULL; - DataObject* _tmp34_; - Monitorable* _tmp35_; - gboolean _tmp36_ = FALSE; - GeeSet* _tmp37_; - Monitorable* _tmp41_; - MediaMonitor* _tmp42_; -#line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp30_ = _object_it; + DataObject* _tmp32_; + Monitorable* _tmp33_; + gboolean _tmp34_ = FALSE; + GeeSet* _tmp35_; + Monitorable* _tmp38_; + MediaMonitor* _tmp39_; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp31_ = gee_iterator_next (_tmp30_); + _tmp29_ = _object_it; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp31_) { + if (!gee_iterator_next (_tmp29_)) { #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 3363 "LibraryMonitor.c" +#line 3690 "LibraryMonitor.c" } #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp32_ = _object_it; + _tmp30_ = _object_it; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp33_ = gee_iterator_get (_tmp32_); + _tmp31_ = gee_iterator_get (_tmp30_); #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - object = (DataObject*) _tmp33_; + object = (DataObject*) _tmp31_; #line 440 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp34_ = object; + _tmp32_ = object; #line 440 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp35_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_MONITORABLE, Monitorable)); + _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_MONITORABLE, Monitorable)); #line 440 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitorable = _tmp35_; -#line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp37_ = monitorables; + monitorable = _tmp33_; #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp37_ != NULL) { -#line 3381 "LibraryMonitor.c" - GeeSet* _tmp38_; - Monitorable* _tmp39_; - gboolean _tmp40_; + _tmp35_ = monitorables; #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp38_ = monitorables; + if (_tmp35_ != NULL) { +#line 3708 "LibraryMonitor.c" + GeeSet* _tmp36_; + Monitorable* _tmp37_; #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp39_ = monitorable; + _tmp36_ = monitorables; #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp40_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_COLLECTION, GeeCollection), _tmp39_); + _tmp37_ = monitorable; #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp36_ = _tmp40_; -#line 3393 "LibraryMonitor.c" + _tmp34_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_); +#line 3717 "LibraryMonitor.c" } else { #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp36_ = FALSE; -#line 3397 "LibraryMonitor.c" + _tmp34_ = FALSE; +#line 3721 "LibraryMonitor.c" } #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp36_) { + if (_tmp34_) { #line 443 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitorable); #line 443 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (object); #line 443 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 3407 "LibraryMonitor.c" +#line 3731 "LibraryMonitor.c" } #line 445 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp41_ = monitorable; + _tmp38_ = monitorable; #line 445 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp42_ = monitor; + _tmp39_ = monitor; #line 445 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_enqueue_verify_monitorable (self, _tmp41_, _tmp42_); + library_monitor_enqueue_verify_monitorable (self, _tmp38_, _tmp39_); #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitorable); #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (object); -#line 3419 "LibraryMonitor.c" +#line 3743 "LibraryMonitor.c" } #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_object_it); -#line 3423 "LibraryMonitor.c" +#line 3747 "LibraryMonitor.c" } { GeeIterator* _source_it = NULL; - MediaMonitor* _tmp43_; - MediaSourceCollection* _tmp44_; - MediaSourceCollection* _tmp45_; - MediaSourceHoldingTank* _tmp46_; - MediaSourceHoldingTank* _tmp47_; - GeeCollection* _tmp48_; - GeeCollection* _tmp49_; - GeeIterator* _tmp50_; - GeeIterator* _tmp51_; + MediaMonitor* _tmp40_; + MediaSourceCollection* _tmp41_; + MediaSourceCollection* _tmp42_; + MediaSourceHoldingTank* _tmp43_; + MediaSourceHoldingTank* _tmp44_; + GeeCollection* _tmp45_; + GeeCollection* _tmp46_; + GeeIterator* _tmp47_; + GeeIterator* _tmp48_; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp43_ = monitor; + _tmp40_ = monitor; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp44_ = media_monitor_get_media_source_collection (_tmp43_); + _tmp41_ = media_monitor_get_media_source_collection (_tmp40_); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp45_ = _tmp44_; + _tmp42_ = _tmp41_; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp46_ = media_source_collection_get_offline_bin (_tmp45_); + _tmp43_ = media_source_collection_get_offline_bin (_tmp42_); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp47_ = _tmp46_; + _tmp44_ = _tmp43_; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp48_ = source_holding_tank_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank)); + _tmp45_ = source_holding_tank_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank)); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp49_ = _tmp48_; + _tmp46_ = _tmp45_; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp50_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp47_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ITERABLE, GeeIterable)); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp51_ = _tmp50_; + _tmp48_ = _tmp47_; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_object_unref0 (_tmp49_); + _g_object_unref0 (_tmp46_); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _source_holding_tank_unref0 (_tmp47_); + _source_holding_tank_unref0 (_tmp44_); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_collection_unref0 (_tmp45_); + _data_collection_unref0 (_tmp42_); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _source_it = _tmp51_; + _source_it = _tmp48_; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 3464 "LibraryMonitor.c" - GeeIterator* _tmp52_; - gboolean _tmp53_; +#line 3788 "LibraryMonitor.c" + GeeIterator* _tmp49_; DataSource* source = NULL; - GeeIterator* _tmp54_; - gpointer _tmp55_; + GeeIterator* _tmp50_; + gpointer _tmp51_; Monitorable* monitorable = NULL; - DataSource* _tmp56_; - Monitorable* _tmp57_; - gboolean _tmp58_ = FALSE; - GeeSet* _tmp59_; - Monitorable* _tmp63_; - MediaMonitor* _tmp64_; + DataSource* _tmp52_; + Monitorable* _tmp53_; + gboolean _tmp54_ = FALSE; + GeeSet* _tmp55_; + Monitorable* _tmp58_; + MediaMonitor* _tmp59_; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp52_ = _source_it; + _tmp49_ = _source_it; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp53_ = gee_iterator_next (_tmp52_); -#line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp53_) { + if (!gee_iterator_next (_tmp49_)) { #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 3485 "LibraryMonitor.c" +#line 3806 "LibraryMonitor.c" } #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp54_ = _source_it; + _tmp50_ = _source_it; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp55_ = gee_iterator_get (_tmp54_); + _tmp51_ = gee_iterator_get (_tmp50_); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - source = (DataSource*) _tmp55_; + source = (DataSource*) _tmp51_; #line 450 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp56_ = source; + _tmp52_ = source; #line 450 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp57_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_MONITORABLE, Monitorable)); + _tmp53_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_MONITORABLE, Monitorable)); #line 450 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitorable = _tmp57_; + monitorable = _tmp53_; #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp59_ = monitorables; + _tmp55_ = monitorables; #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp59_ != NULL) { -#line 3503 "LibraryMonitor.c" - GeeSet* _tmp60_; - Monitorable* _tmp61_; - gboolean _tmp62_; + if (_tmp55_ != NULL) { +#line 3824 "LibraryMonitor.c" + GeeSet* _tmp56_; + Monitorable* _tmp57_; #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp60_ = monitorables; + _tmp56_ = monitorables; #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp61_ = monitorable; + _tmp57_ = monitorable; #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp62_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_COLLECTION, GeeCollection), _tmp61_); -#line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp58_ = _tmp62_; -#line 3515 "LibraryMonitor.c" + _tmp54_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_COLLECTION, GeeCollection), _tmp57_); +#line 3833 "LibraryMonitor.c" } else { #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp58_ = FALSE; -#line 3519 "LibraryMonitor.c" + _tmp54_ = FALSE; +#line 3837 "LibraryMonitor.c" } #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp58_) { + if (_tmp54_) { #line 453 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitorable); #line 453 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (source); #line 453 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 3529 "LibraryMonitor.c" +#line 3847 "LibraryMonitor.c" } #line 455 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp63_ = monitorable; + _tmp58_ = monitorable; #line 455 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp64_ = monitor; + _tmp59_ = monitor; #line 455 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_enqueue_verify_monitorable (self, _tmp63_, _tmp64_); + library_monitor_enqueue_verify_monitorable (self, _tmp58_, _tmp59_); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitorable); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (source); -#line 3541 "LibraryMonitor.c" +#line 3859 "LibraryMonitor.c" } #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_source_it); -#line 3545 "LibraryMonitor.c" +#line 3863 "LibraryMonitor.c" } #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitorables); #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 3551 "LibraryMonitor.c" +#line 3869 "LibraryMonitor.c" } #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 3555 "LibraryMonitor.c" +#line 3873 "LibraryMonitor.c" } #line 460 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp65_ = self->priv->auto_import; + _tmp60_ = self->priv->auto_import; #line 460 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp65_) { -#line 3561 "LibraryMonitor.c" - GeeHashSet* _tmp66_; + if (_tmp60_) { +#line 3879 "LibraryMonitor.c" + GeeHashSet* _tmp61_; #line 461 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp66_ = self->priv->unknown_files; + _tmp61_ = self->priv->unknown_files; #line 461 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_enqueue_import_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 3567 "LibraryMonitor.c" + library_monitor_enqueue_import_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 3885 "LibraryMonitor.c" } #line 464 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->priv->discovered); @@ -3574,26 +3892,27 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { #line 465 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->unknown_files = NULL; #line 469 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp67_ = tombstone_global; + _tmp62_ = tombstone_global; #line 469 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp68_ = self->priv->cancellable; + _tmp63_ = self->priv->cancellable; #line 469 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - tombstone_source_collection_launch_scan (_tmp67_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp68_); + tombstone_source_collection_launch_scan (_tmp62_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp63_); #line 472 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->discovery_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor)); -#line 3585 "LibraryMonitor.c" +#line 3903 "LibraryMonitor.c" } -static void library_monitor_enqueue_verify_monitorable (LibraryMonitor* self, Monitorable* monitorable, MediaMonitor* monitor) { +static void +library_monitor_enqueue_verify_monitorable (LibraryMonitor* self, + Monitorable* monitorable, + MediaMonitor* monitor) +{ gboolean offered = FALSE; GeeQueue* _tmp0_; - Monitorable* _tmp1_; - MediaMonitor* _tmp2_; - LibraryMonitorVerifyJob* _tmp3_; - LibraryMonitorVerifyJob* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; + LibraryMonitorVerifyJob* _tmp1_; + LibraryMonitorVerifyJob* _tmp2_; + gboolean _tmp3_; #line 475 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 475 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3603,30 +3922,26 @@ static void library_monitor_enqueue_verify_monitorable (LibraryMonitor* self, Mo #line 476 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = self->priv->verify_queue; #line 476 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = monitorable; -#line 476 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = monitor; -#line 476 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = library_monitor_verify_job_new (_tmp1_, _tmp2_); + _tmp1_ = library_monitor_verify_job_new (monitorable, monitor); #line 476 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 476 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = gee_queue_offer (_tmp0_, _tmp4_); + _tmp3_ = gee_queue_offer (_tmp0_, _tmp2_); #line 476 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = _tmp5_; + _library_monitor_verify_job_unref0 (_tmp2_); #line 476 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _library_monitor_verify_job_unref0 (_tmp4_); -#line 476 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - offered = _tmp6_; + offered = _tmp3_; #line 477 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _vala_assert (offered, "offered"); #line 479 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_execute_next_verify_job (self); -#line 3626 "LibraryMonitor.c" +#line 3939 "LibraryMonitor.c" } -static void library_monitor_execute_next_verify_job (LibraryMonitor* self) { +static void +library_monitor_execute_next_verify_job (LibraryMonitor* self) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; LibraryMonitorVerifyJob* job = NULL; @@ -3646,7 +3961,7 @@ static void library_monitor_execute_next_verify_job (LibraryMonitor* self) { if (_tmp1_ >= LIBRARY_MONITOR_MAX_VERIFY_EXISTING_MEDIA_JOBS) { #line 483 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = TRUE; -#line 3650 "LibraryMonitor.c" +#line 3965 "LibraryMonitor.c" } else { GeeQueue* _tmp2_; gint _tmp3_; @@ -3659,13 +3974,13 @@ static void library_monitor_execute_next_verify_job (LibraryMonitor* self) { _tmp4_ = _tmp3_; #line 483 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = _tmp4_ == 0; -#line 3663 "LibraryMonitor.c" +#line 3978 "LibraryMonitor.c" } #line 483 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { #line 484 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 3669 "LibraryMonitor.c" +#line 3984 "LibraryMonitor.c" } #line 486 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = self->priv->verify_queue; @@ -3693,11 +4008,13 @@ static void library_monitor_execute_next_verify_job (LibraryMonitor* self) { library_monitor_verify_monitorable (self, _tmp10_, _tmp12_, NULL, NULL); #line 482 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _library_monitor_verify_job_unref0 (job); -#line 3697 "LibraryMonitor.c" +#line 4012 "LibraryMonitor.c" } -static void library_monitor_verify_monitorable_data_free (gpointer _data) { +static void +library_monitor_verify_monitorable_data_free (gpointer _data) +{ LibraryMonitorVerifyMonitorableData* _data_; _data_ = _data; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3708,11 +4025,15 @@ static void library_monitor_verify_monitorable_data_free (gpointer _data) { _g_object_unref0 (_data_->self); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_slice_free (LibraryMonitorVerifyMonitorableData, _data_); -#line 3712 "LibraryMonitor.c" +#line 4029 "LibraryMonitor.c" } -static void library_monitor_verify_monitorable_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) { +static void +library_monitor_verify_monitorable_async_ready_wrapper (GObject *source_object, + GAsyncResult *res, + void *user_data) +{ LibraryMonitorVerifyMonitorableData* _task_data_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _task_data_ = g_task_get_task_data (G_TASK (res)); @@ -3720,21 +4041,25 @@ static void library_monitor_verify_monitorable_async_ready_wrapper (GObject *sou if (_task_data_->_callback_ != NULL) { #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _task_data_->_callback_ (source_object, res, user_data); -#line 3724 "LibraryMonitor.c" +#line 4045 "LibraryMonitor.c" } #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _task_data_->_task_complete_ = TRUE; -#line 3728 "LibraryMonitor.c" +#line 4049 "LibraryMonitor.c" } -static void library_monitor_verify_monitorable (LibraryMonitor* self, Monitorable* monitorable, MediaMonitor* monitor, GAsyncReadyCallback _callback_, gpointer _user_data_) { +static void +library_monitor_verify_monitorable (LibraryMonitor* self, + Monitorable* monitorable, + MediaMonitor* monitor, + GAsyncReadyCallback _callback_, + gpointer _user_data_) +{ LibraryMonitorVerifyMonitorableData* _data_; LibraryMonitor* _tmp0_; Monitorable* _tmp1_; - Monitorable* _tmp2_; - MediaMonitor* _tmp3_; - MediaMonitor* _tmp4_; + MediaMonitor* _tmp2_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_ = g_slice_new0 (LibraryMonitorVerifyMonitorableData); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3745,7 +4070,7 @@ static void library_monitor_verify_monitorable (LibraryMonitor* self, Monitorabl if (_callback_ == NULL) { #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_task_complete_ = TRUE; -#line 3749 "LibraryMonitor.c" +#line 4074 "LibraryMonitor.c" } #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_task_set_task_data (_data_->_async_result, _data_, library_monitor_verify_monitorable_data_free); @@ -3754,53 +4079,61 @@ static void library_monitor_verify_monitorable (LibraryMonitor* self, Monitorabl #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->self = _tmp0_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = monitorable; -#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (monitorable); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->monitorable); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->monitorable = _tmp2_; + _data_->monitorable = _tmp1_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = monitor; -#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp2_ = _g_object_ref0 (monitor); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->monitor); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->monitor = _tmp4_; + _data_->monitor = _tmp2_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_verify_monitorable_co (_data_); -#line 3775 "LibraryMonitor.c" +#line 4096 "LibraryMonitor.c" } -static void library_monitor_verify_monitorable_finish (LibraryMonitor* self, GAsyncResult* _res_) { +static void +library_monitor_verify_monitorable_finish (LibraryMonitor* self, + GAsyncResult* _res_) +{ LibraryMonitorVerifyMonitorableData* _data_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_ = g_task_propagate_pointer (G_TASK (_res_), NULL); -#line 3783 "LibraryMonitor.c" +#line 4107 "LibraryMonitor.c" } -static void _vala_array_add131 (GFile** * array, int* length, int* size, GFile* value) { +static void +_vala_array_add131 (GFile** * array, + int* length, + int* size, + GFile* value) +{ #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if ((*length) == (*size)) { #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *size = (*size) ? (2 * (*size)) : 4; #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *array = g_renew (GFile*, *array, (*size) + 1); -#line 3794 "LibraryMonitor.c" +#line 4123 "LibraryMonitor.c" } #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" (*array)[(*length)++] = value; #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" (*array)[*length] = NULL; -#line 3800 "LibraryMonitor.c" +#line 4129 "LibraryMonitor.c" } -static void library_monitor_verify_monitorable_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { +static void +library_monitor_verify_monitorable_ready (GObject* source_object, + GAsyncResult* _res_, + gpointer _user_data_) +{ LibraryMonitorVerifyMonitorableData* _data_; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_ = _user_data_; @@ -3812,38 +4145,42 @@ static void library_monitor_verify_monitorable_ready (GObject* source_object, GA _data_->_task_complete_ = TRUE; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_verify_monitorable_co (_data_); -#line 3816 "LibraryMonitor.c" +#line 4149 "LibraryMonitor.c" } -static gboolean _library_monitor_verify_monitorable_co_gsource_func (gpointer self) { +static gboolean +_library_monitor_verify_monitorable_co_gsource_func (gpointer self) +{ gboolean result; result = library_monitor_verify_monitorable_co (self); #line 530 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 3825 "LibraryMonitor.c" +#line 4160 "LibraryMonitor.c" } -static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonitorableData* _data_) { +static gboolean +library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonitorableData* _data_) +{ #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" switch (_data_->_state_) { #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" case 0: -#line 3834 "LibraryMonitor.c" +#line 4171 "LibraryMonitor.c" goto _state_0; #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" case 1: -#line 3838 "LibraryMonitor.c" +#line 4175 "LibraryMonitor.c" goto _state_1; #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" case 2: -#line 3842 "LibraryMonitor.c" +#line 4179 "LibraryMonitor.c" goto _state_2; default: #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_assert_not_reached (); -#line 3847 "LibraryMonitor.c" +#line 4184 "LibraryMonitor.c" } _state_0: #line 494 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3859,70 +4196,62 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp1__length1 = _data_->files_length1; #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp2_ = _data_->monitor; -#line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp3_ = _data_->monitorable; -#line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp4_ = media_monitor_get_master_file (_data_->_tmp2_, _data_->_tmp3_); + _data_->_tmp2_ = media_monitor_get_master_file (_data_->monitor, _data_->monitorable); #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->_tmp1_[0]); #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp1_[0] = _data_->_tmp4_; + _data_->_tmp1_[0] = _data_->_tmp2_; #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp5_ = _data_->_tmp1_[0]; -#line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp6_ = _data_->monitor; + _data_->_tmp3_ = _data_->_tmp1_[0]; #line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp7_ = _data_->monitorable; + _data_->_tmp5_ = media_monitor_get_auxilliary_backing_files (_data_->monitor, _data_->monitorable, &_data_->_tmp4_); #line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp9_ = media_monitor_get_auxilliary_backing_files (_data_->_tmp6_, _data_->_tmp7_, &_data_->_tmp8_); + _data_->aux_files = _data_->_tmp5_; #line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->aux_files = _data_->_tmp9_; -#line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->aux_files_length1 = _data_->_tmp8_; + _data_->aux_files_length1 = _data_->_tmp4_; #line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_aux_files_size_ = _data_->aux_files_length1; #line 498 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp10_ = _data_->aux_files; + _data_->_tmp6_ = _data_->aux_files; #line 498 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp10__length1 = _data_->aux_files_length1; + _data_->_tmp6__length1 = _data_->aux_files_length1; #line 498 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp10_ != NULL) { + if (_data_->_tmp6_ != NULL) { #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp11_ = _data_->aux_files; + _data_->_tmp7_ = _data_->aux_files; #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp11__length1 = _data_->aux_files_length1; -#line 3896 "LibraryMonitor.c" + _data_->_tmp7__length1 = _data_->aux_files_length1; +#line 4225 "LibraryMonitor.c" { #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->aux_file_collection_length1 = 0; #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_aux_file_collection_size_ = 0; #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->aux_file_collection = _data_->_tmp11_; + _data_->aux_file_collection = _data_->_tmp7_; #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->aux_file_collection_length1 = _data_->_tmp11__length1; + _data_->aux_file_collection_length1 = _data_->_tmp7__length1; #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - for (_data_->aux_file_it = 0; _data_->aux_file_it < _data_->_tmp11__length1; _data_->aux_file_it = _data_->aux_file_it + 1) { + for (_data_->aux_file_it = 0; _data_->aux_file_it < _data_->_tmp7__length1; _data_->aux_file_it = _data_->aux_file_it + 1) { #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp12_ = _g_object_ref0 (_data_->aux_file_collection[_data_->aux_file_it]); + _data_->_tmp8_ = _g_object_ref0 (_data_->aux_file_collection[_data_->aux_file_it]); #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->aux_file = _data_->_tmp12_; -#line 3912 "LibraryMonitor.c" + _data_->aux_file = _data_->_tmp8_; +#line 4241 "LibraryMonitor.c" { #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp13_ = _data_->files; + _data_->_tmp9_ = _data_->files; #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp13__length1 = _data_->files_length1; + _data_->_tmp9__length1 = _data_->files_length1; #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp14_ = _data_->aux_file; + _data_->_tmp10_ = _data_->aux_file; #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp15_ = _g_object_ref0 (_data_->_tmp14_); + _data_->_tmp11_ = _g_object_ref0 (_data_->_tmp10_); #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _vala_array_add131 (&_data_->files, &_data_->files_length1, &_data_->_files_size_, _data_->_tmp15_); + _vala_array_add131 (&_data_->files, &_data_->files_length1, &_data_->_files_size_, _data_->_tmp11_); #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->aux_file); -#line 3926 "LibraryMonitor.c" +#line 4255 "LibraryMonitor.c" } } } @@ -3930,90 +4259,90 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit { #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->ctr = 0; -#line 3934 "LibraryMonitor.c" +#line 4263 "LibraryMonitor.c" { #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp16_ = TRUE; + _data_->_tmp12_ = TRUE; #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_data_->_tmp16_) { + if (!_data_->_tmp12_) { #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp17_ = _data_->ctr; + _data_->_tmp13_ = _data_->ctr; #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->ctr = _data_->_tmp17_ + 1; -#line 3946 "LibraryMonitor.c" + _data_->ctr = _data_->_tmp13_ + 1; +#line 4275 "LibraryMonitor.c" } #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp16_ = FALSE; + _data_->_tmp12_ = FALSE; #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp18_ = _data_->ctr; + _data_->_tmp14_ = _data_->ctr; #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp19_ = _data_->files; + _data_->_tmp15_ = _data_->files; #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp19__length1 = _data_->files_length1; + _data_->_tmp15__length1 = _data_->files_length1; #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_data_->_tmp18_ < _data_->_tmp19__length1)) { + if (!(_data_->_tmp14_ < _data_->_tmp15__length1)) { #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 3960 "LibraryMonitor.c" +#line 4289 "LibraryMonitor.c" } #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp20_ = _data_->files; + _data_->_tmp16_ = _data_->files; #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp20__length1 = _data_->files_length1; + _data_->_tmp16__length1 = _data_->files_length1; #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp21_ = _data_->ctr; + _data_->_tmp17_ = _data_->ctr; #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp22_ = _data_->_tmp20_[_data_->_tmp21_]; + _data_->_tmp18_ = _data_->_tmp16_[_data_->_tmp17_]; #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp23_ = _g_object_ref0 (_data_->_tmp22_); + _data_->_tmp19_ = _g_object_ref0 (_data_->_tmp18_); #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->file = _data_->_tmp23_; + _data_->file = _data_->_tmp19_; #line 506 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp24_ = _data_->file; + _data_->_tmp20_ = _data_->file; #line 506 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp25_ = directory_monitor_get_file_info (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _data_->_tmp24_); + _data_->_tmp21_ = directory_monitor_get_file_info (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _data_->_tmp20_); #line 506 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->info = _data_->_tmp25_; + _data_->info = _data_->_tmp21_; #line 507 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp26_ = _data_->info; + _data_->_tmp22_ = _data_->info; #line 507 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp26_ == NULL) { -#line 3984 "LibraryMonitor.c" + if (_data_->_tmp22_ == NULL) { +#line 4313 "LibraryMonitor.c" { #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp28_ = _data_->file; + _data_->_tmp24_ = _data_->file; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp29_ = _data_->self->priv->cancellable; + _data_->_tmp25_ = _data_->self->priv->cancellable; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_state_ = 1; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_file_query_info_async (_data_->_tmp28_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_FILE_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp29_, library_monitor_verify_monitorable_ready, _data_); + g_file_query_info_async (_data_->_tmp24_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_FILE_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp25_, library_monitor_verify_monitorable_ready, _data_); #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return FALSE; -#line 3996 "LibraryMonitor.c" +#line 4325 "LibraryMonitor.c" _state_1: #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp30_ = g_file_query_info_finish (_data_->_tmp28_, _data_->_res_, &_data_->_inner_error_); + _data_->_tmp26_ = g_file_query_info_finish (_data_->_tmp24_, _data_->_res_, &_data_->_inner_error_); #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp27_ = _data_->_tmp30_; + _data_->_tmp23_ = _data_->_tmp26_; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 4004 "LibraryMonitor.c" +#line 4333 "LibraryMonitor.c" goto __catch495_g_error; } #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp31_ = _data_->_tmp27_; + _data_->_tmp27_ = _data_->_tmp23_; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp27_ = NULL; + _data_->_tmp23_ = NULL; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->info); #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->info = _data_->_tmp31_; + _data_->info = _data_->_tmp27_; #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_object_unref0 (_data_->_tmp27_); -#line 4017 "LibraryMonitor.c" + _g_object_unref0 (_data_->_tmp23_); +#line 4346 "LibraryMonitor.c" } goto __finally495; __catch495_g_error: @@ -4024,7 +4353,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit _data_->_inner_error_ = NULL; #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_error_free0 (_data_->err); -#line 4028 "LibraryMonitor.c" +#line 4357 "LibraryMonitor.c" } __finally495: #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4045,116 +4374,92 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit g_object_unref (_data_->_async_result); #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return FALSE; -#line 4049 "LibraryMonitor.c" +#line 4378 "LibraryMonitor.c" } } #line 517 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp32_ = _data_->ctr; + _data_->_tmp28_ = _data_->ctr; #line 517 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp32_ == 0) { -#line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp34_ = _data_->info; -#line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp34_ != NULL) { -#line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp35_ = _data_->monitor; + if (_data_->_tmp28_ == 0) { #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp36_ = _data_->monitorable; + _data_->_tmp30_ = _data_->info; #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp37_ = media_monitor_is_offline (_data_->_tmp35_, _data_->_tmp36_); + if (_data_->_tmp30_ != NULL) { #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp33_ = _data_->_tmp37_; -#line 4068 "LibraryMonitor.c" + _data_->_tmp29_ = media_monitor_is_offline (_data_->monitor, _data_->monitorable); +#line 4391 "LibraryMonitor.c" } else { #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp33_ = FALSE; -#line 4072 "LibraryMonitor.c" + _data_->_tmp29_ = FALSE; +#line 4395 "LibraryMonitor.c" } #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp33_) { + if (_data_->_tmp29_) { #line 519 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp38_ = _data_->monitor; -#line 519 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp39_ = _data_->monitorable; -#line 519 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - media_monitor_update_online (_data_->_tmp38_, _data_->_tmp39_); -#line 4082 "LibraryMonitor.c" + media_monitor_update_online (_data_->monitor, _data_->monitorable); +#line 4401 "LibraryMonitor.c" } else { #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp41_ = _data_->info; -#line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp41_ == NULL) { -#line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp42_ = _data_->monitor; + _data_->_tmp32_ = _data_->info; #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp43_ = _data_->monitorable; + if (_data_->_tmp32_ == NULL) { #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp44_ = media_monitor_is_offline (_data_->_tmp42_, _data_->_tmp43_); -#line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp40_ = !_data_->_tmp44_; -#line 4096 "LibraryMonitor.c" + _data_->_tmp31_ = !media_monitor_is_offline (_data_->monitor, _data_->monitorable); +#line 4409 "LibraryMonitor.c" } else { #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp40_ = FALSE; -#line 4100 "LibraryMonitor.c" + _data_->_tmp31_ = FALSE; +#line 4413 "LibraryMonitor.c" } #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp40_) { -#line 521 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp45_ = _data_->monitor; -#line 521 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp46_ = _data_->monitorable; + if (_data_->_tmp31_) { #line 521 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - media_monitor_update_offline (_data_->_tmp45_, _data_->_tmp46_); -#line 4110 "LibraryMonitor.c" + media_monitor_update_offline (_data_->monitor, _data_->monitorable); +#line 4419 "LibraryMonitor.c" } } } #line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp47_ = _data_->monitor; + _data_->_tmp33_ = _data_->file; #line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp48_ = _data_->monitorable; + _data_->_tmp34_ = _data_->info; #line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp49_ = _data_->file; -#line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp50_ = _data_->info; -#line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - media_monitor_update_backing_file_info (_data_->_tmp47_, _data_->_tmp48_, _data_->_tmp49_, _data_->_tmp50_); + media_monitor_update_backing_file_info (_data_->monitor, _data_->monitorable, _data_->_tmp33_, _data_->_tmp34_); #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->info); #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->file); -#line 4128 "LibraryMonitor.c" +#line 4433 "LibraryMonitor.c" } } } #line 527 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp51_ = _data_->self->priv->completed_monitorable_verifies; + _data_->_tmp35_ = _data_->self->priv->completed_monitorable_verifies; #line 527 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->self->priv->completed_monitorable_verifies = _data_->_tmp51_ + 1; + _data_->self->priv->completed_monitorable_verifies = _data_->_tmp35_ + 1; #line 528 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp52_ = _data_->self->priv->completed_monitorable_verifies; + _data_->_tmp36_ = _data_->self->priv->completed_monitorable_verifies; #line 528 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp53_ = _data_->self->priv->total_monitorable_verifies; + _data_->_tmp37_ = _data_->self->priv->total_monitorable_verifies; #line 528 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_emit (_data_->self, library_monitor_signals[LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL], 0, _data_->_tmp52_, _data_->_tmp53_); + g_signal_emit (_data_->self, library_monitor_signals[LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL], 0, _data_->_tmp36_, _data_->_tmp37_); #line 530 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_idle_add_full (DIRECTORY_MONITOR_DEFAULT_PRIORITY, _library_monitor_verify_monitorable_co_gsource_func, _data_, NULL); #line 531 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_state_ = 2; #line 531 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return FALSE; -#line 4148 "LibraryMonitor.c" +#line 4453 "LibraryMonitor.c" _state_2: ; #line 534 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp54_ = _data_->self->priv->outstanding_verify_jobs; + _data_->_tmp38_ = _data_->self->priv->outstanding_verify_jobs; #line 534 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _vala_assert (_data_->_tmp54_ > 0, "outstanding_verify_jobs > 0"); + _vala_assert (_data_->_tmp38_ > 0, "outstanding_verify_jobs > 0"); #line 535 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp55_ = _data_->self->priv->outstanding_verify_jobs; + _data_->_tmp39_ = _data_->self->priv->outstanding_verify_jobs; #line 535 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->self->priv->outstanding_verify_jobs = _data_->_tmp55_ - 1; + _data_->self->priv->outstanding_verify_jobs = _data_->_tmp39_ - 1; #line 537 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_execute_next_verify_job (_data_->self); #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4169,18 +4474,20 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit while (_data_->_task_complete_ != TRUE) { #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); -#line 4173 "LibraryMonitor.c" +#line 4478 "LibraryMonitor.c" } } #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_object_unref (_data_->_async_result); #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return FALSE; -#line 4180 "LibraryMonitor.c" +#line 4485 "LibraryMonitor.c" } -static void library_monitor_on_config_changed (LibraryMonitor* self) { +static void +library_monitor_on_config_changed (LibraryMonitor* self) +{ gboolean value = FALSE; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; @@ -4189,7 +4496,6 @@ static void library_monitor_on_config_changed (LibraryMonitor* self) { gboolean _tmp4_; gboolean _tmp5_; gboolean _tmp6_; - gboolean _tmp7_; #line 540 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 541 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4198,54 +4504,53 @@ static void library_monitor_on_config_changed (LibraryMonitor* self) { _tmp1_ = _tmp0_; #line 541 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = configuration_facade_get_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 541 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = _tmp2_; #line 541 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_tmp1_); #line 541 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - value = _tmp3_; + value = _tmp2_; #line 543 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = self->priv->auto_import; + _tmp3_ = self->priv->auto_import; #line 543 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = value; + _tmp4_ = value; #line 543 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp4_ == _tmp5_) { + if (_tmp3_ == _tmp4_) { #line 544 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 4216 "LibraryMonitor.c" +#line 4520 "LibraryMonitor.c" } #line 546 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = value; + _tmp5_ = value; #line 546 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->auto_import = _tmp6_; + self->priv->auto_import = _tmp5_; #line 547 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = self->priv->auto_import; + _tmp6_ = self->priv->auto_import; #line 547 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp7_) { -#line 4226 "LibraryMonitor.c" - gboolean _tmp8_; + if (_tmp6_) { +#line 4530 "LibraryMonitor.c" + gboolean _tmp7_; #line 548 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = commandline_options_no_runtime_monitoring; + _tmp7_ = commandline_options_no_runtime_monitoring; #line 548 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp8_) { + if (!_tmp7_) { #line 549 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_import_unrepresented_files (self); -#line 4234 "LibraryMonitor.c" +#line 4538 "LibraryMonitor.c" } } else { #line 551 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_cancel_batch_imports (self); -#line 4239 "LibraryMonitor.c" +#line 4543 "LibraryMonitor.c" } } -static void library_monitor_enqueue_import (LibraryMonitor* self, GFile* file) { +static void +library_monitor_enqueue_import (LibraryMonitor* self, + GFile* file) +{ gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GeeHashSet* _tmp2_; - GFile* _tmp3_; - gboolean _tmp4_; #line 555 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 555 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4253,118 +4558,96 @@ static void library_monitor_enqueue_import (LibraryMonitor* self, GFile* file) { #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = self->priv->pending_imports; #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = file; -#line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp3_); + if (!gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), file)) { #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp4_) { -#line 4262 "LibraryMonitor.c" - GFile* _tmp5_; - gboolean _tmp6_; -#line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = file; -#line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = library_monitor_is_supported_filetype (self, _tmp5_); -#line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = _tmp6_; -#line 4271 "LibraryMonitor.c" + _tmp1_ = library_monitor_is_supported_filetype (self, file); +#line 4565 "LibraryMonitor.c" } else { #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = FALSE; -#line 4275 "LibraryMonitor.c" +#line 4569 "LibraryMonitor.c" } #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 4279 "LibraryMonitor.c" - GFile* _tmp7_; - gboolean _tmp8_; -#line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = file; -#line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = library_monitor_is_blacklisted (_tmp7_); #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = !_tmp8_; -#line 4288 "LibraryMonitor.c" + _tmp0_ = !library_monitor_is_blacklisted (file); +#line 4575 "LibraryMonitor.c" } else { #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = FALSE; -#line 4292 "LibraryMonitor.c" +#line 4579 "LibraryMonitor.c" } #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { -#line 4296 "LibraryMonitor.c" - GeeHashSet* _tmp9_; - GFile* _tmp10_; +#line 4583 "LibraryMonitor.c" + GeeHashSet* _tmp3_; #line 557 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = self->priv->import_queue; + _tmp3_ = self->priv->import_queue; #line 557 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = file; -#line 557 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); -#line 4305 "LibraryMonitor.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), file); +#line 4589 "LibraryMonitor.c" } } -static void library_monitor_enqueue_import_many (LibraryMonitor* self, GeeCollection* files) { +static void +library_monitor_enqueue_import_many (LibraryMonitor* self, + GeeCollection* files) +{ #line 560 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 560 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (GEE_IS_COLLECTION (files)); -#line 4315 "LibraryMonitor.c" +#line 4602 "LibraryMonitor.c" { GeeIterator* _file_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; -#line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = files; + GeeIterator* _tmp0_; #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (files, GEE_TYPE_ITERABLE, GeeIterable)); #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _file_it = _tmp1_; + _file_it = _tmp0_; #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 4328 "LibraryMonitor.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 4612 "LibraryMonitor.c" + GeeIterator* _tmp1_; GFile* file = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - GFile* _tmp6_; + GeeIterator* _tmp2_; + gpointer _tmp3_; + GFile* _tmp4_; #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = _file_it; -#line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _file_it; #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 4343 "LibraryMonitor.c" +#line 4624 "LibraryMonitor.c" } #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = _file_it; + _tmp2_ = _file_it; #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - file = (GFile*) _tmp5_; + file = (GFile*) _tmp3_; #line 562 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = file; + _tmp4_ = file; #line 562 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_enqueue_import (self, _tmp6_); + library_monitor_enqueue_import (self, _tmp4_); #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); -#line 4357 "LibraryMonitor.c" +#line 4638 "LibraryMonitor.c" } #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_file_it); -#line 4361 "LibraryMonitor.c" +#line 4642 "LibraryMonitor.c" } } -static void library_monitor_remove_queued_import (LibraryMonitor* self, GFile* file) { +static void +library_monitor_remove_queued_import (LibraryMonitor* self, + GFile* file) +{ GeeHashSet* _tmp0_; - GFile* _tmp1_; #line 565 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 565 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4372,243 +4655,231 @@ static void library_monitor_remove_queued_import (LibraryMonitor* self, GFile* f #line 566 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = self->priv->import_queue; #line 566 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = file; -#line 566 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 4379 "LibraryMonitor.c" + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), file); +#line 4660 "LibraryMonitor.c" } -static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) { +static gboolean +library_monitor_on_flush_import_queue (LibraryMonitor* self) +{ gboolean result = FALSE; GCancellable* _tmp0_; - gboolean _tmp1_; - GeeHashSet* _tmp2_; + GeeHashSet* _tmp1_; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; - BatchImport* _tmp5_; - GeeHashSet* _tmp6_; + BatchImport* _tmp4_; + GeeHashSet* _tmp5_; + gint _tmp6_; gint _tmp7_; - gint _tmp8_; + gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; time_t now = 0; - gulong _tmp11_; - gboolean _tmp12_ = FALSE; - BatchImportRoll* _tmp13_; - time_t _tmp17_; + gboolean _tmp10_ = FALSE; + BatchImportRoll* _tmp11_; + time_t _tmp15_; GeeArrayList* jobs = NULL; - GeeArrayList* _tmp18_; - GeeHashSet* _tmp33_; + GeeArrayList* _tmp16_; + GeeHashSet* _tmp29_; BatchImport* importer = NULL; - GeeArrayList* _tmp34_; - BatchImportRoll* _tmp35_; + GeeArrayList* _tmp30_; + BatchImportRoll* _tmp31_; + BatchImport* _tmp32_; + BatchImport* _tmp33_; + BatchImport* _tmp34_; + GeeArrayList* _tmp35_; BatchImport* _tmp36_; - BatchImport* _tmp37_; - BatchImport* _tmp38_; - GeeArrayList* _tmp39_; - BatchImport* _tmp40_; #line 569 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (IS_LIBRARY_MONITOR (self), FALSE); #line 570 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = self->priv->cancellable; #line 570 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = g_cancellable_is_cancelled (_tmp0_); -#line 570 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp1_) { + if (g_cancellable_is_cancelled (_tmp0_)) { #line 571 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" result = FALSE; #line 571 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 4424 "LibraryMonitor.c" +#line 4703 "LibraryMonitor.c" } #line 573 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = self->priv->import_queue; + _tmp1_ = self->priv->import_queue; #line 573 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 573 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 573 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp4_ == 0) { + if (_tmp3_ == 0) { #line 574 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" result = TRUE; #line 574 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 4438 "LibraryMonitor.c" +#line 4717 "LibraryMonitor.c" } #line 578 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = self->priv->current_batch_import; + _tmp4_ = self->priv->current_batch_import; #line 578 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp5_ != NULL) { + if (_tmp4_ != NULL) { #line 579 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" result = TRUE; #line 579 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 4448 "LibraryMonitor.c" +#line 4727 "LibraryMonitor.c" } #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = self->priv->import_queue; + _tmp5_ = self->priv->import_queue; #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp6_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = g_strdup_printf ("Auto-importing %d files", _tmp8_); + _tmp8_ = g_strdup_printf ("Auto-importing %d files", _tmp7_); #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_tmp10_); + directory_monitor_mdbg (_tmp9_); #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp9_); #line 586 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = now_sec (); -#line 586 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - now = (time_t) _tmp11_; + now = (time_t) now_sec (); #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = self->priv->current_import_roll; + _tmp11_ = self->priv->current_import_roll; #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp13_ == NULL) { + if (_tmp11_ == NULL) { #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = TRUE; -#line 4474 "LibraryMonitor.c" + _tmp10_ = TRUE; +#line 4751 "LibraryMonitor.c" } else { - time_t _tmp14_; - time_t _tmp15_; + time_t _tmp12_; + time_t _tmp13_; #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = now; + _tmp12_ = now; #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = self->priv->last_import_roll_use; + _tmp13_ = self->priv->last_import_roll_use; #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = (_tmp14_ - _tmp15_) >= ((time_t) LIBRARY_MONITOR_IMPORT_ROLL_QUIET_SEC); -#line 4484 "LibraryMonitor.c" + _tmp10_ = (_tmp12_ - _tmp13_) >= ((time_t) LIBRARY_MONITOR_IMPORT_ROLL_QUIET_SEC); +#line 4761 "LibraryMonitor.c" } #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp12_) { -#line 4488 "LibraryMonitor.c" - BatchImportRoll* _tmp16_; + if (_tmp10_) { +#line 4765 "LibraryMonitor.c" + BatchImportRoll* _tmp14_; #line 588 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = batch_import_roll_new (); + _tmp14_ = batch_import_roll_new (); #line 588 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _batch_import_roll_unref0 (self->priv->current_import_roll); #line 588 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->current_import_roll = _tmp16_; -#line 4496 "LibraryMonitor.c" + self->priv->current_import_roll = _tmp14_; +#line 4773 "LibraryMonitor.c" } #line 589 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = now; + _tmp15_ = now; #line 589 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->last_import_roll_use = _tmp17_; + self->priv->last_import_roll_use = _tmp15_; #line 591 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = gee_array_list_new (TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); + _tmp16_ = gee_array_list_new (TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); #line 591 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - jobs = _tmp18_; -#line 4506 "LibraryMonitor.c" + jobs = _tmp16_; +#line 4783 "LibraryMonitor.c" { GeeIterator* _file_it = NULL; - GeeHashSet* _tmp19_; - GeeIterator* _tmp20_; + GeeHashSet* _tmp17_; + GeeIterator* _tmp18_; #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = self->priv->import_queue; + _tmp17_ = self->priv->import_queue; #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp18_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _file_it = _tmp20_; + _file_it = _tmp18_; #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 4519 "LibraryMonitor.c" - GeeIterator* _tmp21_; - gboolean _tmp22_; +#line 4796 "LibraryMonitor.c" + GeeIterator* _tmp19_; GFile* file = NULL; - GeeIterator* _tmp23_; - gpointer _tmp24_; - GFile* _tmp25_; - gboolean _tmp26_; - GeeArrayList* _tmp27_; + GeeIterator* _tmp20_; + gpointer _tmp21_; + GFile* _tmp22_; + GeeArrayList* _tmp23_; + GFile* _tmp24_; + FileImportJob* _tmp25_; + FileImportJob* _tmp26_; + GeeHashSet* _tmp27_; GFile* _tmp28_; - FileImportJob* _tmp29_; - FileImportJob* _tmp30_; - GeeHashSet* _tmp31_; - GFile* _tmp32_; #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = _file_it; + _tmp19_ = _file_it; #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = gee_iterator_next (_tmp21_); -#line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp22_) { + if (!gee_iterator_next (_tmp19_)) { #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 4541 "LibraryMonitor.c" +#line 4814 "LibraryMonitor.c" } #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = _file_it; + _tmp20_ = _file_it; #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = gee_iterator_get (_tmp23_); + _tmp21_ = gee_iterator_get (_tmp20_); #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - file = (GFile*) _tmp24_; -#line 593 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = file; + file = (GFile*) _tmp21_; #line 593 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = library_monitor_is_blacklisted (_tmp25_); + _tmp22_ = file; #line 593 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp26_) { + if (library_monitor_is_blacklisted (_tmp22_)) { #line 594 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); #line 594 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 4559 "LibraryMonitor.c" +#line 4830 "LibraryMonitor.c" } #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = jobs; + _tmp23_ = jobs; #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp28_ = file; + _tmp24_ = file; #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = file_import_job_new (_tmp28_, FALSE, TRUE); + _tmp25_ = file_import_job_new (_tmp24_, FALSE, TRUE); #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp30_ = _tmp29_; + _tmp26_ = _tmp25_; #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_BATCH_IMPORT_JOB, BatchImportJob)); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_BATCH_IMPORT_JOB, BatchImportJob)); #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _batch_import_job_unref0 (_tmp30_); + _batch_import_job_unref0 (_tmp26_); #line 597 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp31_ = self->priv->pending_imports; + _tmp27_ = self->priv->pending_imports; #line 597 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp32_ = file; + _tmp28_ = file; #line 597 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp32_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_); #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); -#line 4581 "LibraryMonitor.c" +#line 4852 "LibraryMonitor.c" } #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_file_it); -#line 4585 "LibraryMonitor.c" +#line 4856 "LibraryMonitor.c" } #line 600 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp33_ = self->priv->import_queue; + _tmp29_ = self->priv->import_queue; #line 600 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 602 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp34_ = jobs; + _tmp30_ = jobs; #line 602 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp35_ = self->priv->current_import_roll; + _tmp31_ = self->priv->current_import_roll; #line 602 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp36_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ITERABLE, GeeIterable), "LibraryMonitor autoimport", NULL, NULL, NULL, NULL, NULL, _tmp35_, NULL); + _tmp32_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ITERABLE, GeeIterable), "LibraryMonitor autoimport", NULL, NULL, NULL, NULL, NULL, _tmp31_, NULL); #line 602 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - importer = _tmp36_; + importer = _tmp32_; #line 604 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp37_ = importer; + _tmp33_ = importer; #line 604 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - batch_import_set_untrash_duplicates (_tmp37_, FALSE); + batch_import_set_untrash_duplicates (_tmp33_, FALSE); #line 605 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp38_ = importer; + _tmp34_ = importer; #line 605 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - batch_import_set_mark_duplicates_online (_tmp38_, FALSE); + batch_import_set_mark_duplicates_online (_tmp34_, FALSE); #line 606 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp39_ = self->priv->batch_import_queue; + _tmp35_ = self->priv->batch_import_queue; #line 606 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp40_ = importer; + _tmp36_ = importer; #line 606 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp40_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp36_); #line 608 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_schedule_next_batch_import (self); #line 610 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4619,32 +4890,47 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) { _g_object_unref0 (jobs); #line 610 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 4623 "LibraryMonitor.c" +#line 4894 "LibraryMonitor.c" } -static void _library_monitor_on_import_preparing_batch_import_preparing (BatchImport* _sender, gpointer self) { +static void +_library_monitor_on_import_preparing_batch_import_preparing (BatchImport* _sender, + gpointer self) +{ #line 618 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_on_import_preparing ((LibraryMonitor*) self); -#line 4630 "LibraryMonitor.c" +#line 4904 "LibraryMonitor.c" } -static void _library_monitor_on_import_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) { +static void +_library_monitor_on_import_progress_batch_import_progress (BatchImport* _sender, + guint64 completed_bytes, + guint64 total_bytes, + gpointer self) +{ #line 619 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_on_import_progress ((LibraryMonitor*) self, completed_bytes, total_bytes); -#line 4637 "LibraryMonitor.c" +#line 4916 "LibraryMonitor.c" } -static void _library_monitor_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { +static void +_library_monitor_on_import_complete_batch_import_import_complete (BatchImport* _sender, + ImportManifest* manifest, + BatchImportRoll* import_roll, + gpointer self) +{ #line 620 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_on_import_complete ((LibraryMonitor*) self, _sender, manifest, import_roll); -#line 4644 "LibraryMonitor.c" +#line 4928 "LibraryMonitor.c" } -static void library_monitor_schedule_next_batch_import (LibraryMonitor* self) { +static void +library_monitor_schedule_next_batch_import (LibraryMonitor* self) +{ gboolean _tmp0_ = FALSE; BatchImport* _tmp1_; GeeArrayList* _tmp5_; @@ -4661,7 +4947,7 @@ static void library_monitor_schedule_next_batch_import (LibraryMonitor* self) { if (_tmp1_ != NULL) { #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = TRUE; -#line 4665 "LibraryMonitor.c" +#line 4951 "LibraryMonitor.c" } else { GeeArrayList* _tmp2_; gint _tmp3_; @@ -4674,13 +4960,13 @@ static void library_monitor_schedule_next_batch_import (LibraryMonitor* self) { _tmp4_ = _tmp3_; #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = _tmp4_ == 0; -#line 4678 "LibraryMonitor.c" +#line 4964 "LibraryMonitor.c" } #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { #line 615 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 4684 "LibraryMonitor.c" +#line 4970 "LibraryMonitor.c" } #line 617 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = self->priv->batch_import_queue; @@ -4706,26 +4992,27 @@ static void library_monitor_schedule_next_batch_import (LibraryMonitor* self) { _tmp10_ = self->priv->current_batch_import; #line 621 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" batch_import_schedule (_tmp10_); -#line 4710 "LibraryMonitor.c" +#line 4996 "LibraryMonitor.c" } -static void library_monitor_discard_current_batch_import (LibraryMonitor* self) { +static void +library_monitor_discard_current_batch_import (LibraryMonitor* self) +{ BatchImport* _tmp0_; gboolean removed = FALSE; GeeArrayList* _tmp1_; BatchImport* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; - BatchImport* _tmp5_; - guint _tmp6_; - BatchImport* _tmp7_; - guint _tmp8_; - BatchImport* _tmp9_; - guint _tmp10_; - GeeArrayList* _tmp11_; + BatchImport* _tmp4_; + guint _tmp5_; + BatchImport* _tmp6_; + guint _tmp7_; + BatchImport* _tmp8_; + guint _tmp9_; + GeeArrayList* _tmp10_; + gint _tmp11_; gint _tmp12_; - gint _tmp13_; #line 624 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 625 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4737,55 +5024,55 @@ static void library_monitor_discard_current_batch_import (LibraryMonitor* self) #line 627 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = self->priv->current_batch_import; #line 627 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); -#line 627 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - removed = _tmp3_; + removed = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); #line 628 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = removed; + _tmp3_ = removed; #line 628 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _vala_assert (_tmp4_, "removed"); + _vala_assert (_tmp3_, "removed"); #line 629 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = self->priv->current_batch_import; + _tmp4_ = self->priv->current_batch_import; #line 629 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_parse_name ("preparing", TYPE_BATCH_IMPORT, &_tmp6_, NULL, FALSE); + g_signal_parse_name ("preparing", TYPE_BATCH_IMPORT, &_tmp5_, NULL, FALSE); #line 629 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_monitor_on_import_preparing_batch_import_preparing, self); + g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_monitor_on_import_preparing_batch_import_preparing, self); #line 630 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = self->priv->current_batch_import; + _tmp6_ = self->priv->current_batch_import; #line 630 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_parse_name ("progress", TYPE_BATCH_IMPORT, &_tmp8_, NULL, FALSE); + g_signal_parse_name ("progress", TYPE_BATCH_IMPORT, &_tmp7_, NULL, FALSE); #line 630 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _library_monitor_on_import_progress_batch_import_progress, self); + g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _library_monitor_on_import_progress_batch_import_progress, self); #line 631 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = self->priv->current_batch_import; + _tmp8_ = self->priv->current_batch_import; #line 631 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_parse_name ("import-complete", TYPE_BATCH_IMPORT, &_tmp10_, NULL, FALSE); + g_signal_parse_name ("import-complete", TYPE_BATCH_IMPORT, &_tmp9_, NULL, FALSE); #line 631 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_monitor_on_import_complete_batch_import_import_complete, self); + g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _library_monitor_on_import_complete_batch_import_import_complete, self); #line 632 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->priv->current_batch_import); #line 632 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->current_batch_import = NULL; #line 639 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = self->priv->batch_import_queue; + _tmp10_ = self->priv->batch_import_queue; #line 639 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 639 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 639 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp13_ == 0) { -#line 4778 "LibraryMonitor.c" - GeeHashSet* _tmp14_; + if (_tmp12_ == 0) { +#line 5063 "LibraryMonitor.c" + GeeHashSet* _tmp13_; #line 640 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = self->priv->pending_imports; + _tmp13_ = self->priv->pending_imports; #line 640 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 4784 "LibraryMonitor.c" + gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); +#line 5069 "LibraryMonitor.c" } } -static void library_monitor_cancel_batch_imports (LibraryMonitor* self) { +static void +library_monitor_cancel_batch_imports (LibraryMonitor* self) +{ gint ctr = 0; BatchImport* _tmp16_; GeeHashSet* _tmp18_; @@ -4795,7 +5082,7 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) { ctr = 0; #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 4799 "LibraryMonitor.c" +#line 5086 "LibraryMonitor.c" gint _tmp0_; GeeArrayList* _tmp1_; gint _tmp2_; @@ -4823,7 +5110,7 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) { if (!(_tmp0_ < _tmp3_)) { #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 4827 "LibraryMonitor.c" +#line 5114 "LibraryMonitor.c" } #line 647 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = self->priv->batch_import_queue; @@ -4841,7 +5128,7 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) { _g_object_unref0 (_tmp7_); #line 647 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp9_) { -#line 4845 "LibraryMonitor.c" +#line 5132 "LibraryMonitor.c" gint _tmp10_; #line 648 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp10_ = ctr; @@ -4849,7 +5136,7 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) { ctr = _tmp10_ + 1; #line 650 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 4853 "LibraryMonitor.c" +#line 5140 "LibraryMonitor.c" } #line 653 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = self->priv->batch_import_queue; @@ -4865,70 +5152,72 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) { gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); #line 653 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_tmp15_); -#line 4869 "LibraryMonitor.c" +#line 5156 "LibraryMonitor.c" } #line 657 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp16_ = self->priv->current_batch_import; #line 657 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp16_ != NULL) { -#line 4875 "LibraryMonitor.c" +#line 5162 "LibraryMonitor.c" BatchImport* _tmp17_; #line 658 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp17_ = self->priv->current_batch_import; #line 658 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" batch_import_user_halt (_tmp17_); -#line 4881 "LibraryMonitor.c" +#line 5168 "LibraryMonitor.c" } #line 661 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp18_ = self->priv->pending_imports; #line 661 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 4887 "LibraryMonitor.c" +#line 5174 "LibraryMonitor.c" } -static void library_monitor_on_import_preparing (LibraryMonitor* self) { +static void +library_monitor_on_import_preparing (LibraryMonitor* self) +{ #line 664 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 665 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PREPARING_SIGNAL], 0); -#line 4896 "LibraryMonitor.c" +#line 5185 "LibraryMonitor.c" } -static void library_monitor_on_import_progress (LibraryMonitor* self, guint64 completed_bytes, guint64 total_bytes) { - guint64 _tmp0_; - guint64 _tmp1_; +static void +library_monitor_on_import_progress (LibraryMonitor* self, + guint64 completed_bytes, + guint64 total_bytes) +{ #line 668 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 669 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = completed_bytes; -#line 669 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = total_bytes; -#line 669 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PROGRESS_SIGNAL], 0, _tmp0_, _tmp1_); -#line 4911 "LibraryMonitor.c" + g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PROGRESS_SIGNAL], 0, completed_bytes, total_bytes); +#line 5198 "LibraryMonitor.c" } -static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImport* batch_import, ImportManifest* manifest, BatchImportRoll* import_roll) { +static void +library_monitor_on_import_complete (LibraryMonitor* self, + BatchImport* batch_import, + ImportManifest* manifest, + BatchImportRoll* import_roll) +{ BatchImport* _tmp0_; - BatchImport* _tmp1_; - ImportManifest* _tmp2_; - GeeList* _tmp3_; - gint _tmp4_; - gint _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - ImportManifest* _tmp25_; - GeeList* _tmp26_; - gint _tmp27_; - gint _tmp28_; - GeeHashSet* _tmp59_; - gint _tmp60_; - gint _tmp61_; - gchar* _tmp62_; - gchar* _tmp63_; + GeeList* _tmp1_; + gint _tmp2_; + gint _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + GeeList* _tmp22_; + gint _tmp23_; + gint _tmp24_; + GeeHashSet* _tmp53_; + gint _tmp54_; + gint _tmp55_; + gchar* _tmp56_; + gchar* _tmp57_; GError * _inner_error_ = NULL; #line 672 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); @@ -4939,286 +5228,271 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor #line 672 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_BATCH_IMPORT_ROLL (import_roll)); #line 674 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = batch_import; -#line 674 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = self->priv->current_batch_import; + _tmp0_ = self->priv->current_batch_import; #line 674 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _vala_assert (_tmp0_ == _tmp1_, "batch_import == current_batch_import"); -#line 676 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = manifest; + _vala_assert (batch_import == _tmp0_, "batch_import == current_batch_import"); #line 676 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = _tmp2_->all; + _tmp1_ = manifest->all; #line 676 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); #line 676 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 676 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = g_strdup_printf ("auto-import batch completed %d", _tmp5_); + _tmp4_ = g_strdup_printf ("auto-import batch completed %d", _tmp3_); #line 676 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 676 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_tmp7_); + directory_monitor_mdbg (_tmp5_); #line 676 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp5_); #line 677 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PROGRESS_SIGNAL], 0, (guint64) 0, (guint64) 0); -#line 4966 "LibraryMonitor.c" +#line 5251 "LibraryMonitor.c" { GeeList* _result_list = NULL; - ImportManifest* _tmp8_; - GeeList* _tmp9_; - GeeList* _tmp10_; + GeeList* _tmp6_; + GeeList* _tmp7_; gint _result_size = 0; - GeeList* _tmp11_; - gint _tmp12_; - gint _tmp13_; + GeeList* _tmp8_; + gint _tmp9_; + gint _tmp10_; gint _result_index = 0; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = manifest; + _tmp6_ = manifest->all; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = _tmp8_->all; + _tmp7_ = _g_object_ref0 (_tmp6_); #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _g_object_ref0 (_tmp9_); + _result_list = _tmp7_; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _result_list = _tmp10_; + _tmp8_ = _result_list; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = _result_list; + _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = _tmp12_; + _tmp10_ = _tmp9_; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _result_size = _tmp13_; + _result_size = _tmp10_; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _result_index = -1; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 4997 "LibraryMonitor.c" - gint _tmp14_; - gint _tmp15_; - gint _tmp16_; +#line 5279 "LibraryMonitor.c" + gint _tmp11_; + gint _tmp12_; + gint _tmp13_; BatchImportResult* _result_ = NULL; - GeeList* _tmp17_; - gint _tmp18_; - gpointer _tmp19_; - BatchImportResult* _tmp20_; - GFile* _tmp21_; + GeeList* _tmp14_; + gint _tmp15_; + gpointer _tmp16_; + BatchImportResult* _tmp17_; + GFile* _tmp18_; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = _result_index; + _tmp11_ = _result_index; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _result_index = _tmp14_ + 1; + _result_index = _tmp11_ + 1; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = _result_index; + _tmp12_ = _result_index; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = _result_size; + _tmp13_ = _result_size; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp15_ < _tmp16_)) { + if (!(_tmp12_ < _tmp13_)) { #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 5019 "LibraryMonitor.c" +#line 5301 "LibraryMonitor.c" } #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = _result_list; + _tmp14_ = _result_list; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = _result_index; + _tmp15_ = _result_index; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = gee_list_get (_tmp17_, _tmp18_); + _tmp16_ = gee_list_get (_tmp14_, _tmp15_); #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _result_ = (BatchImportResult*) _tmp19_; + _result_ = (BatchImportResult*) _tmp16_; #line 682 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = _result_; + _tmp17_ = _result_; #line 682 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = _tmp20_->file; + _tmp18_ = _tmp17_->file; #line 682 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp21_ != NULL) { -#line 5035 "LibraryMonitor.c" - GeeHashSet* _tmp22_; - BatchImportResult* _tmp23_; - GFile* _tmp24_; + if (_tmp18_ != NULL) { +#line 5317 "LibraryMonitor.c" + GeeHashSet* _tmp19_; + BatchImportResult* _tmp20_; + GFile* _tmp21_; #line 683 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = self->priv->pending_imports; + _tmp19_ = self->priv->pending_imports; #line 683 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = _result_; + _tmp20_ = _result_; #line 683 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = _tmp23_->file; + _tmp21_ = _tmp20_->file; #line 683 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_); -#line 5047 "LibraryMonitor.c" + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); +#line 5329 "LibraryMonitor.c" } #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _batch_import_result_unref0 (_result_); -#line 5051 "LibraryMonitor.c" +#line 5333 "LibraryMonitor.c" } #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_result_list); -#line 5055 "LibraryMonitor.c" +#line 5337 "LibraryMonitor.c" } #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = manifest; -#line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = _tmp25_->already_imported; + _tmp22_ = manifest->already_imported; #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp23_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection)); #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp28_ = _tmp27_; + _tmp24_ = _tmp23_; #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp28_ > 0) { -#line 5067 "LibraryMonitor.c" + if (_tmp24_ > 0) { +#line 5347 "LibraryMonitor.c" GeeArrayList* to_tombstone = NULL; - GeeArrayList* _tmp29_; + GeeArrayList* _tmp25_; #line 687 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = gee_array_list_new (TYPE_TOMBSTONED_FILE, (GBoxedCopyFunc) tombstoned_file_ref, (GDestroyNotify) tombstoned_file_unref, NULL, NULL, NULL); + _tmp25_ = gee_array_list_new (TYPE_TOMBSTONED_FILE, (GBoxedCopyFunc) tombstoned_file_ref, (GDestroyNotify) tombstoned_file_unref, NULL, NULL, NULL); #line 687 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - to_tombstone = _tmp29_; -#line 5074 "LibraryMonitor.c" + to_tombstone = _tmp25_; +#line 5354 "LibraryMonitor.c" { GeeList* _result_list = NULL; - ImportManifest* _tmp30_; - GeeList* _tmp31_; - GeeList* _tmp32_; + GeeList* _tmp26_; + GeeList* _tmp27_; gint _result_size = 0; - GeeList* _tmp33_; - gint _tmp34_; - gint _tmp35_; + GeeList* _tmp28_; + gint _tmp29_; + gint _tmp30_; gint _result_index = 0; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp30_ = manifest; + _tmp26_ = manifest->already_imported; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp31_ = _tmp30_->already_imported; + _tmp27_ = _g_object_ref0 (_tmp26_); #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp32_ = _g_object_ref0 (_tmp31_); + _result_list = _tmp27_; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _result_list = _tmp32_; + _tmp28_ = _result_list; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp33_ = _result_list; + _tmp29_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection)); #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp34_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp35_ = _tmp34_; + _tmp30_ = _tmp29_; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _result_size = _tmp35_; + _result_size = _tmp30_; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _result_index = -1; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 5105 "LibraryMonitor.c" - gint _tmp36_; - gint _tmp37_; - gint _tmp38_; +#line 5382 "LibraryMonitor.c" + gint _tmp31_; + gint _tmp32_; + gint _tmp33_; BatchImportResult* _result_ = NULL; - GeeList* _tmp39_; - gint _tmp40_; - gpointer _tmp41_; + GeeList* _tmp34_; + gint _tmp35_; + gpointer _tmp36_; GFileInfo* info = NULL; - BatchImportResult* _tmp42_; - GFile* _tmp43_; - GFileInfo* _tmp44_; - GFileInfo* _tmp45_; - GeeArrayList* _tmp50_; - BatchImportResult* _tmp51_; - GFile* _tmp52_; - GFileInfo* _tmp53_; - gint64 _tmp54_; - TombstonedFile* _tmp55_; - TombstonedFile* _tmp56_; + BatchImportResult* _tmp37_; + GFile* _tmp38_; + GFileInfo* _tmp39_; + GFileInfo* _tmp40_; + GeeArrayList* _tmp45_; + BatchImportResult* _tmp46_; + GFile* _tmp47_; + GFileInfo* _tmp48_; + TombstonedFile* _tmp49_; + TombstonedFile* _tmp50_; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp36_ = _result_index; + _tmp31_ = _result_index; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _result_index = _tmp36_ + 1; + _result_index = _tmp31_ + 1; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp37_ = _result_index; + _tmp32_ = _result_index; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp38_ = _result_size; + _tmp33_ = _result_size; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp37_ < _tmp38_)) { + if (!(_tmp32_ < _tmp33_)) { #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 5137 "LibraryMonitor.c" +#line 5413 "LibraryMonitor.c" } #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp39_ = _result_list; + _tmp34_ = _result_list; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp40_ = _result_index; + _tmp35_ = _result_index; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp41_ = gee_list_get (_tmp39_, _tmp40_); + _tmp36_ = gee_list_get (_tmp34_, _tmp35_); #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _result_ = (BatchImportResult*) _tmp41_; + _result_ = (BatchImportResult*) _tmp36_; #line 689 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp42_ = _result_; + _tmp37_ = _result_; #line 689 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp43_ = _tmp42_->file; + _tmp38_ = _tmp37_->file; #line 689 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp44_ = directory_monitor_get_file_info (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp43_); + _tmp39_ = directory_monitor_get_file_info (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp38_); #line 689 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - info = _tmp44_; + info = _tmp39_; #line 690 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp45_ = info; + _tmp40_ = info; #line 690 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp45_ == NULL) { -#line 5159 "LibraryMonitor.c" - BatchImportResult* _tmp46_; - GFile* _tmp47_; - gchar* _tmp48_; - gchar* _tmp49_; + if (_tmp40_ == NULL) { +#line 5435 "LibraryMonitor.c" + BatchImportResult* _tmp41_; + GFile* _tmp42_; + gchar* _tmp43_; + gchar* _tmp44_; #line 691 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp46_ = _result_; + _tmp41_ = _result_; #line 691 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp47_ = _tmp46_->file; + _tmp42_ = _tmp41_->file; #line 691 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp48_ = g_file_get_path (_tmp47_); + _tmp43_ = g_file_get_path (_tmp42_); #line 691 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp49_ = _tmp48_; + _tmp44_ = _tmp43_; #line 691 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_warning ("LibraryMonitor.vala:691: Unable to get info for duplicate file %s", _tmp49_); + g_warning ("LibraryMonitor.vala:691: Unable to get info for duplicate file %s", _tmp44_); #line 691 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp49_); + _g_free0 (_tmp44_); #line 693 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (info); #line 693 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _batch_import_result_unref0 (_result_); #line 693 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5182 "LibraryMonitor.c" +#line 5458 "LibraryMonitor.c" } #line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp50_ = to_tombstone; -#line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp51_ = _result_; + _tmp45_ = to_tombstone; #line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp52_ = _tmp51_->file; + _tmp46_ = _result_; #line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp53_ = info; + _tmp47_ = _tmp46_->file; #line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp54_ = g_file_info_get_size (_tmp53_); + _tmp48_ = info; #line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp55_ = tombstoned_file_new (_tmp52_, _tmp54_, NULL); + _tmp49_ = tombstoned_file_new (_tmp47_, g_file_info_get_size (_tmp48_), NULL); #line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp56_ = _tmp55_; + _tmp50_ = _tmp49_; #line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp56_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp50_); #line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tombstoned_file_unref0 (_tmp56_); + _tombstoned_file_unref0 (_tmp50_); #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (info); #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _batch_import_result_unref0 (_result_); -#line 5206 "LibraryMonitor.c" +#line 5480 "LibraryMonitor.c" } #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_result_list); -#line 5210 "LibraryMonitor.c" +#line 5484 "LibraryMonitor.c" } { - GeeArrayList* _tmp57_; + GeeArrayList* _tmp51_; #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp57_ = to_tombstone; + _tmp51_ = to_tombstone; #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - tombstone_entomb_many_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_COLLECTION, GeeCollection), TOMBSTONE_REASON_AUTO_DETECTED_DUPLICATE, &_inner_error_); + tombstone_entomb_many_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection), TOMBSTONE_REASON_AUTO_DETECTED_DUPLICATE, &_inner_error_); #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 5222 "LibraryMonitor.c" +#line 5496 "LibraryMonitor.c" goto __catch496_database_error; } #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5229,25 +5503,25 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor g_clear_error (&_inner_error_); #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 5233 "LibraryMonitor.c" +#line 5507 "LibraryMonitor.c" } } goto __finally496; __catch496_database_error: { GError* err = NULL; - GError* _tmp58_; + GError* _tmp52_; #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" err = _inner_error_; #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _inner_error_ = NULL; #line 702 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp58_ = err; + _tmp52_ = err; #line 702 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - app_window_database_error (_tmp58_); + app_window_database_error (_tmp52_); #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_error_free0 (err); -#line 5251 "LibraryMonitor.c" +#line 5525 "LibraryMonitor.c" } __finally496: #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5260,91 +5534,85 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor g_clear_error (&_inner_error_); #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 5264 "LibraryMonitor.c" +#line 5538 "LibraryMonitor.c" } #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (to_tombstone); -#line 5268 "LibraryMonitor.c" +#line 5542 "LibraryMonitor.c" } #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp59_ = self->priv->pending_imports; + _tmp53_ = self->priv->pending_imports; #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp60_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp54_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp61_ = _tmp60_; + _tmp55_ = _tmp54_; #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp62_ = g_strdup_printf ("%d files remain pending for auto-import", _tmp61_); + _tmp56_ = g_strdup_printf ("%d files remain pending for auto-import", _tmp55_); #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp63_ = _tmp62_; + _tmp57_ = _tmp56_; #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_tmp63_); + directory_monitor_mdbg (_tmp57_); #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp63_); + _g_free0 (_tmp57_); #line 708 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_discard_current_batch_import (self); #line 709 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_schedule_next_batch_import (self); -#line 5288 "LibraryMonitor.c" +#line 5562 "LibraryMonitor.c" } -void library_monitor_blacklist_file (GFile* file, const gchar* reason) { - const gchar* _tmp0_; - GFile* _tmp1_; +void +library_monitor_blacklist_file (GFile* file, + const gchar* reason) +{ + gchar* _tmp0_; + gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; GError * _inner_error_ = NULL; #line 725 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 725 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (reason != NULL); #line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = reason; + _tmp0_ = g_file_get_path (file); #line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = file; + _tmp1_ = _tmp0_; #line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = g_file_get_path (_tmp1_); + _tmp2_ = g_strdup_printf ("[%s] Blacklisting %s", reason, _tmp1_); #line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp3_ = _tmp2_; #line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = g_strdup_printf ("[%s] Blacklisting %s", _tmp0_, _tmp3_); -#line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _tmp4_; -#line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_tmp5_); -#line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp5_); + directory_monitor_mdbg (_tmp3_); #line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (_tmp3_); -#line 5322 "LibraryMonitor.c" +#line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + _g_free0 (_tmp1_); +#line 5593 "LibraryMonitor.c" { - GeeHashSet* _tmp6_; + GeeHashSet* _tmp4_; #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = library_monitor_blacklist; + _tmp4_ = library_monitor_blacklist; #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_lock (&__lock_library_monitor_blacklist); -#line 5329 "LibraryMonitor.c" +#line 5600 "LibraryMonitor.c" { - GeeHashSet* _tmp7_; - GFile* _tmp8_; -#line 728 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = library_monitor_blacklist; + GeeHashSet* _tmp5_; #line 728 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = file; + _tmp5_ = library_monitor_blacklist; #line 728 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_); -#line 5339 "LibraryMonitor.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), file); +#line 5607 "LibraryMonitor.c" } __finally497: { - GeeHashSet* _tmp9_; + GeeHashSet* _tmp6_; #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = library_monitor_blacklist; + _tmp6_ = library_monitor_blacklist; #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_unlock (&__lock_library_monitor_blacklist); -#line 5348 "LibraryMonitor.c" +#line 5616 "LibraryMonitor.c" } #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5354,77 +5622,64 @@ void library_monitor_blacklist_file (GFile* file, const gchar* reason) { g_clear_error (&_inner_error_); #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 5358 "LibraryMonitor.c" +#line 5626 "LibraryMonitor.c" } } } -void library_monitor_unblacklist_file (GFile* file) { +void +library_monitor_unblacklist_file (GFile* file) +{ GError * _inner_error_ = NULL; #line 732 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 5368 "LibraryMonitor.c" +#line 5638 "LibraryMonitor.c" { GeeHashSet* _tmp0_; #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = library_monitor_blacklist; #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_lock (&__lock_library_monitor_blacklist); -#line 5375 "LibraryMonitor.c" +#line 5645 "LibraryMonitor.c" { gboolean _tmp1_ = FALSE; GeeHashSet* _tmp2_; - GFile* _tmp3_; - gboolean _tmp4_; #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = library_monitor_blacklist; #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = file; -#line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp3_); + if (gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), file)) { +#line 5653 "LibraryMonitor.c" + HashTimedQueue* _tmp3_; #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp4_) { -#line 5389 "LibraryMonitor.c" - HashTimedQueue* _tmp5_; - GFile* _tmp6_; - gboolean _tmp7_; + _tmp3_ = library_monitor_to_unblacklist; #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = library_monitor_to_unblacklist; -#line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = file; -#line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = timed_queue_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_TIMED_QUEUE, TimedQueue), _tmp6_); -#line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = !_tmp7_; -#line 5401 "LibraryMonitor.c" + _tmp1_ = !timed_queue_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_TIMED_QUEUE, TimedQueue), file); +#line 5659 "LibraryMonitor.c" } else { #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = FALSE; -#line 5405 "LibraryMonitor.c" +#line 5663 "LibraryMonitor.c" } #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 5409 "LibraryMonitor.c" - HashTimedQueue* _tmp8_; - GFile* _tmp9_; -#line 737 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = library_monitor_to_unblacklist; +#line 5667 "LibraryMonitor.c" + HashTimedQueue* _tmp4_; #line 737 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = file; + _tmp4_ = library_monitor_to_unblacklist; #line 737 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - timed_queue_enqueue (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_TIMED_QUEUE, TimedQueue), _tmp9_); -#line 5418 "LibraryMonitor.c" + timed_queue_enqueue (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_TIMED_QUEUE, TimedQueue), file); +#line 5673 "LibraryMonitor.c" } } __finally498: { - GeeHashSet* _tmp10_; + GeeHashSet* _tmp5_; #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = library_monitor_blacklist; + _tmp5_ = library_monitor_blacklist; #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_unlock (&__lock_library_monitor_blacklist); -#line 5428 "LibraryMonitor.c" +#line 5683 "LibraryMonitor.c" } #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5434,47 +5689,43 @@ void library_monitor_unblacklist_file (GFile* file) { g_clear_error (&_inner_error_); #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 5438 "LibraryMonitor.c" +#line 5693 "LibraryMonitor.c" } } } -static void library_monitor_on_unblacklist_file (GFile* file) { +static void +library_monitor_on_unblacklist_file (GFile* file) +{ gboolean removed = FALSE; GError * _inner_error_ = NULL; #line 741 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 5449 "LibraryMonitor.c" +#line 5706 "LibraryMonitor.c" { GeeHashSet* _tmp0_; #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = library_monitor_blacklist; #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_lock (&__lock_library_monitor_blacklist); -#line 5456 "LibraryMonitor.c" +#line 5713 "LibraryMonitor.c" { GeeHashSet* _tmp1_; - GFile* _tmp2_; - gboolean _tmp3_; #line 744 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = library_monitor_blacklist; #line 744 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = file; -#line 744 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); -#line 744 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - removed = _tmp3_; -#line 5469 "LibraryMonitor.c" + removed = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), file); +#line 5720 "LibraryMonitor.c" } __finally499: { - GeeHashSet* _tmp4_; + GeeHashSet* _tmp2_; #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = library_monitor_blacklist; + _tmp2_ = library_monitor_blacklist; #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_unlock (&__lock_library_monitor_blacklist); -#line 5478 "LibraryMonitor.c" +#line 5729 "LibraryMonitor.c" } #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5484,120 +5735,112 @@ static void library_monitor_on_unblacklist_file (GFile* file) { g_clear_error (&_inner_error_); #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 5488 "LibraryMonitor.c" +#line 5739 "LibraryMonitor.c" } } #line 747 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (removed) { -#line 5493 "LibraryMonitor.c" - GFile* _tmp5_; +#line 5744 "LibraryMonitor.c" + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; -#line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = file; #line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = g_file_get_path (_tmp5_); + _tmp3_ = g_file_get_path (file); #line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = g_strdup_printf ("Blacklist for %s removed", _tmp7_); + _tmp5_ = g_strdup_printf ("Blacklist for %s removed", _tmp4_); #line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_tmp9_); + directory_monitor_mdbg (_tmp6_); #line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp6_); #line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp7_); -#line 5515 "LibraryMonitor.c" + _g_free0 (_tmp4_); +#line 5763 "LibraryMonitor.c" } else { - GFile* _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; -#line 750 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = file; + gchar* _tmp7_; + gchar* _tmp8_; #line 750 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = g_file_get_path (_tmp10_); + _tmp7_ = g_file_get_path (file); #line 750 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 750 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_warning ("LibraryMonitor.vala:750: File %s was not blacklisted but unblacklisted", _tmp12_); + g_warning ("LibraryMonitor.vala:750: File %s was not blacklisted but unblacklisted", _tmp8_); #line 750 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp12_); -#line 5530 "LibraryMonitor.c" + _g_free0 (_tmp8_); +#line 5775 "LibraryMonitor.c" } } -gboolean library_monitor_is_blacklisted (GFile* file) { +gboolean +library_monitor_is_blacklisted (GFile* file) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 753 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); -#line 5540 "LibraryMonitor.c" +#line 5787 "LibraryMonitor.c" { GeeHashSet* _tmp0_; - gboolean _tmp6_ = FALSE; + gboolean _tmp4_ = FALSE; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = library_monitor_blacklist; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_lock (&__lock_library_monitor_blacklist); -#line 5548 "LibraryMonitor.c" +#line 5795 "LibraryMonitor.c" { GeeHashSet* _tmp1_; - GFile* _tmp2_; - gboolean _tmp3_; #line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = library_monitor_blacklist; #line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = file; -#line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); -#line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - result = _tmp3_; -#line 5561 "LibraryMonitor.c" + result = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), file); +#line 5802 "LibraryMonitor.c" { - GeeHashSet* _tmp4_; + GeeHashSet* _tmp2_; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = library_monitor_blacklist; + _tmp2_ = library_monitor_blacklist; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_unlock (&__lock_library_monitor_blacklist); -#line 5568 "LibraryMonitor.c" +#line 5809 "LibraryMonitor.c" } #line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 5572 "LibraryMonitor.c" +#line 5813 "LibraryMonitor.c" } __finally500: { - GeeHashSet* _tmp5_; + GeeHashSet* _tmp3_; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = library_monitor_blacklist; + _tmp3_ = library_monitor_blacklist; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_unlock (&__lock_library_monitor_blacklist); -#line 5581 "LibraryMonitor.c" +#line 5822 "LibraryMonitor.c" } #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_clear_error (&_inner_error_); #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - return _tmp6_; -#line 5589 "LibraryMonitor.c" + return _tmp4_; +#line 5830 "LibraryMonitor.c" } } -static gboolean library_monitor_is_supported_filetype (LibraryMonitor* self, GFile* file) { +static gboolean +library_monitor_is_supported_filetype (LibraryMonitor* self, + GFile* file) +{ gboolean result = FALSE; MediaCollectionRegistry* _tmp0_; MediaCollectionRegistry* _tmp1_; - GFile* _tmp2_; + MediaSourceCollection* _tmp2_; MediaSourceCollection* _tmp3_; - MediaSourceCollection* _tmp4_; - gboolean _tmp5_; + gboolean _tmp4_; #line 759 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (IS_LIBRARY_MONITOR (self), FALSE); #line 759 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5607,29 +5850,29 @@ static gboolean library_monitor_is_supported_filetype (LibraryMonitor* self, GFi #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = _tmp0_; #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = file; + _tmp2_ = media_collection_registry_get_collection_for_file (_tmp1_, file); #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = media_collection_registry_get_collection_for_file (_tmp1_, _tmp2_); -#line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _tmp4_ != NULL; + _tmp4_ = _tmp3_ != NULL; #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_collection_unref0 (_tmp4_); + _data_collection_unref0 (_tmp3_); #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _media_collection_registry_unref0 (_tmp1_); #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - result = _tmp5_; + result = _tmp4_; #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 5626 "LibraryMonitor.c" +#line 5867 "LibraryMonitor.c" } -static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { +static void +library_monitor_import_unrepresented_files (LibraryMonitor* self) +{ gboolean _tmp0_; GeeArrayList* to_import = NULL; - GeeArrayList* _tmp42_; + GeeArrayList* _tmp36_; #line 765 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 766 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5638,11 +5881,11 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { if (!_tmp0_) { #line 767 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 5642 "LibraryMonitor.c" +#line 5885 "LibraryMonitor.c" } #line 769 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" to_import = NULL; -#line 5646 "LibraryMonitor.c" +#line 5889 "LibraryMonitor.c" { GeeIterator* _file_it = NULL; GeeCollection* _tmp1_; @@ -5663,274 +5906,259 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _file_it = _tmp4_; #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 5667 "LibraryMonitor.c" +#line 5910 "LibraryMonitor.c" GeeIterator* _tmp5_; - gboolean _tmp6_; GFile* file = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; + GeeIterator* _tmp6_; + gpointer _tmp7_; GFileInfo* info = NULL; - GFile* _tmp9_; - GFileInfo* _tmp10_; - gboolean _tmp11_ = FALSE; - GFileInfo* _tmp12_; - GeeHashSet* _tmp15_; + GFile* _tmp8_; + GFileInfo* _tmp9_; + gboolean _tmp10_ = FALSE; + GFileInfo* _tmp11_; + GeeHashSet* _tmp13_; + GFile* _tmp14_; + TombstoneSourceCollection* _tmp15_; GFile* _tmp16_; - gboolean _tmp17_; - TombstoneSourceCollection* _tmp18_; - GFile* _tmp19_; - gboolean _tmp20_; gboolean represented = FALSE; - gboolean _tmp35_; - GFile* _tmp36_; - gboolean _tmp37_; - GeeArrayList* _tmp38_; - GeeArrayList* _tmp40_; - GFile* _tmp41_; + gboolean _tmp30_; + GFile* _tmp31_; + GeeArrayList* _tmp32_; + GeeArrayList* _tmp34_; + GFile* _tmp35_; #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = _file_it; #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = gee_iterator_next (_tmp5_); -#line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp5_)) { #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 5699 "LibraryMonitor.c" +#line 5936 "LibraryMonitor.c" } #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = _file_it; + _tmp6_ = _file_it; #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - file = (GFile*) _tmp8_; + file = (GFile*) _tmp7_; #line 771 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = file; + _tmp8_ = file; #line 771 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = directory_monitor_get_file_info (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp9_); + _tmp9_ = directory_monitor_get_file_info (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp8_); #line 771 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - info = _tmp10_; + info = _tmp9_; #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = info; + _tmp11_ = info; #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp12_ == NULL) { + if (_tmp11_ == NULL) { #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = TRUE; -#line 5719 "LibraryMonitor.c" + _tmp10_ = TRUE; +#line 5956 "LibraryMonitor.c" } else { - GFileInfo* _tmp13_; - GFileType _tmp14_; -#line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = info; + GFileInfo* _tmp12_; #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = g_file_info_get_file_type (_tmp13_); + _tmp12_ = info; #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = _tmp14_ != G_FILE_TYPE_REGULAR; -#line 5729 "LibraryMonitor.c" + _tmp10_ = g_file_info_get_file_type (_tmp12_) != G_FILE_TYPE_REGULAR; +#line 5963 "LibraryMonitor.c" } #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp11_) { + if (_tmp10_) { #line 773 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (info); #line 773 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); #line 773 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5739 "LibraryMonitor.c" +#line 5973 "LibraryMonitor.c" } #line 775 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = self->priv->pending_imports; -#line 775 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = file; + _tmp13_ = self->priv->pending_imports; #line 775 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_); + _tmp14_ = file; #line 775 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp17_) { + if (gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_)) { #line 776 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (info); #line 776 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); #line 776 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5755 "LibraryMonitor.c" +#line 5987 "LibraryMonitor.c" } #line 778 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = tombstone_global; -#line 778 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = file; + _tmp15_ = tombstone_global; #line 778 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = tombstone_source_collection_matches (_tmp18_, _tmp19_); + _tmp16_ = file; #line 778 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp20_) { + if (tombstone_source_collection_matches (_tmp15_, _tmp16_)) { #line 779 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (info); #line 779 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); #line 779 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5771 "LibraryMonitor.c" +#line 6001 "LibraryMonitor.c" } #line 781 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" represented = FALSE; -#line 5775 "LibraryMonitor.c" +#line 6005 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp21_; - GeeList* _tmp22_; + GeeList* _tmp17_; + GeeList* _tmp18_; gint _monitor_size = 0; - GeeList* _tmp23_; - gint _tmp24_; - gint _tmp25_; + GeeList* _tmp19_; + gint _tmp20_; + gint _tmp21_; gint _monitor_index = 0; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = self->priv->monitors; + _tmp17_ = self->priv->monitors; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = _g_object_ref0 (_tmp21_); + _tmp18_ = _g_object_ref0 (_tmp17_); #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_list = _tmp22_; + _monitor_list = _tmp18_; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = _monitor_list; + _tmp19_ = _monitor_list; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp20_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection)); #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = _tmp24_; + _tmp21_ = _tmp20_; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_size = _tmp25_; + _monitor_size = _tmp21_; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _monitor_index = -1; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 5803 "LibraryMonitor.c" - gint _tmp26_; - gint _tmp27_; - gint _tmp28_; +#line 6033 "LibraryMonitor.c" + gint _tmp22_; + gint _tmp23_; + gint _tmp24_; MediaMonitor* monitor = NULL; - GeeList* _tmp29_; - gint _tmp30_; - gpointer _tmp31_; - MediaMonitor* _tmp32_; - GFile* _tmp33_; - gboolean _tmp34_; + GeeList* _tmp25_; + gint _tmp26_; + gpointer _tmp27_; + MediaMonitor* _tmp28_; + GFile* _tmp29_; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = _monitor_index; + _tmp22_ = _monitor_index; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_index = _tmp26_ + 1; + _monitor_index = _tmp22_ + 1; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = _monitor_index; + _tmp23_ = _monitor_index; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp28_ = _monitor_size; + _tmp24_ = _monitor_size; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp27_ < _tmp28_)) { + if (!(_tmp23_ < _tmp24_)) { #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 5826 "LibraryMonitor.c" +#line 6055 "LibraryMonitor.c" } #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = _monitor_list; + _tmp25_ = _monitor_list; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp30_ = _monitor_index; + _tmp26_ = _monitor_index; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp31_ = gee_list_get (_tmp29_, _tmp30_); + _tmp27_ = gee_list_get (_tmp25_, _tmp26_); #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = (MediaMonitor*) _tmp31_; + monitor = (MediaMonitor*) _tmp27_; #line 783 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp32_ = monitor; + _tmp28_ = monitor; #line 783 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp33_ = file; + _tmp29_ = file; #line 783 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp34_ = media_monitor_is_file_represented (_tmp32_, _tmp33_); -#line 783 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp34_) { + if (media_monitor_is_file_represented (_tmp28_, _tmp29_)) { #line 784 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" represented = TRUE; #line 786 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); #line 786 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 5850 "LibraryMonitor.c" +#line 6077 "LibraryMonitor.c" } #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 5854 "LibraryMonitor.c" +#line 6081 "LibraryMonitor.c" } #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 5858 "LibraryMonitor.c" +#line 6085 "LibraryMonitor.c" } #line 790 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp35_ = represented; + _tmp30_ = represented; #line 790 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp35_) { + if (_tmp30_) { #line 791 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (info); #line 791 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); #line 791 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5870 "LibraryMonitor.c" +#line 6097 "LibraryMonitor.c" } #line 793 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp36_ = file; + _tmp31_ = file; #line 793 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp37_ = library_monitor_is_supported_filetype (self, _tmp36_); -#line 793 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp37_) { + if (!library_monitor_is_supported_filetype (self, _tmp31_)) { #line 794 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (info); #line 794 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); #line 794 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5884 "LibraryMonitor.c" +#line 6109 "LibraryMonitor.c" } #line 796 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp38_ = to_import; + _tmp32_ = to_import; #line 796 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp38_ == NULL) { -#line 5890 "LibraryMonitor.c" - GeeArrayList* _tmp39_; + if (_tmp32_ == NULL) { +#line 6115 "LibraryMonitor.c" + GeeArrayList* _tmp33_; #line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp39_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp33_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); #line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (to_import); #line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - to_import = _tmp39_; -#line 5898 "LibraryMonitor.c" + to_import = _tmp33_; +#line 6123 "LibraryMonitor.c" } #line 799 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp40_ = to_import; + _tmp34_ = to_import; #line 799 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp41_ = file; + _tmp35_ = file; #line 799 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp41_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp35_); #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (info); #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); -#line 5910 "LibraryMonitor.c" +#line 6135 "LibraryMonitor.c" } #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_file_it); -#line 5914 "LibraryMonitor.c" +#line 6139 "LibraryMonitor.c" } #line 802 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp42_ = to_import; + _tmp36_ = to_import; #line 802 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp42_ != NULL) { -#line 5920 "LibraryMonitor.c" - GeeArrayList* _tmp43_; + if (_tmp36_ != NULL) { +#line 6145 "LibraryMonitor.c" + GeeArrayList* _tmp37_; #line 803 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp43_ = to_import; + _tmp37_ = to_import; #line 803 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_enqueue_import_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 5926 "LibraryMonitor.c" + library_monitor_enqueue_import_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 6151 "LibraryMonitor.c" } #line 765 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (to_import); -#line 5930 "LibraryMonitor.c" +#line 6155 "LibraryMonitor.c" } -static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* self, GFile* file) { +static void +library_monitor_runtime_unknown_file_discovered (LibraryMonitor* self, + GFile* file) +{ gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; gboolean _tmp2_; @@ -5942,84 +6170,65 @@ static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* sel _tmp2_ = self->priv->auto_import; #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp2_) { -#line 5946 "LibraryMonitor.c" - GFile* _tmp3_; - gboolean _tmp4_; -#line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = file; #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = library_monitor_is_supported_filetype (self, _tmp3_); -#line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = _tmp4_; -#line 5955 "LibraryMonitor.c" + _tmp1_ = library_monitor_is_supported_filetype (self, file); +#line 6176 "LibraryMonitor.c" } else { #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = FALSE; -#line 5959 "LibraryMonitor.c" +#line 6180 "LibraryMonitor.c" } #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 5963 "LibraryMonitor.c" - TombstoneSourceCollection* _tmp5_; - GFile* _tmp6_; - gboolean _tmp7_; -#line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = tombstone_global; -#line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = file; +#line 6184 "LibraryMonitor.c" + TombstoneSourceCollection* _tmp3_; #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = tombstone_source_collection_matches (_tmp5_, _tmp6_); + _tmp3_ = tombstone_global; #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = !_tmp7_; -#line 5975 "LibraryMonitor.c" + _tmp0_ = !tombstone_source_collection_matches (_tmp3_, file); +#line 6190 "LibraryMonitor.c" } else { #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = FALSE; -#line 5979 "LibraryMonitor.c" +#line 6194 "LibraryMonitor.c" } #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { -#line 5983 "LibraryMonitor.c" - GFile* _tmp8_; - gchar* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; - GFile* _tmp13_; -#line 810 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = file; +#line 6198 "LibraryMonitor.c" + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; #line 810 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = g_file_get_path (_tmp8_); + _tmp4_ = g_file_get_path (file); #line 810 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _tmp9_; + _tmp5_ = _tmp4_; #line 810 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = g_strdup_printf ("Unknown file %s discovered, enqueuing for import", _tmp10_); + _tmp6_ = g_strdup_printf ("Unknown file %s discovered, enqueuing for import", _tmp5_); #line 810 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = _tmp11_; + _tmp7_ = _tmp6_; #line 810 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_tmp12_); + directory_monitor_mdbg (_tmp7_); #line 810 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp7_); #line 810 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp10_); -#line 811 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = file; + _g_free0 (_tmp5_); #line 811 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_enqueue_import (self, _tmp13_); -#line 6010 "LibraryMonitor.c" + library_monitor_enqueue_import (self, file); +#line 6219 "LibraryMonitor.c" } } -static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GFile* file, GFileInfo* info) { +static void +library_monitor_real_notify_file_created (DirectoryMonitor* base, + GFile* file, + GFileInfo* info) +{ LibraryMonitor * self; - GFile* _tmp0_; - gboolean _tmp1_; gboolean known = FALSE; - gboolean _tmp19_; - gboolean _tmp98_; - GFile* _tmp100_; - GFileInfo* _tmp101_; + gboolean _tmp12_; + gboolean _tmp83_; #line 815 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); #line 815 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6027,260 +6236,231 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF #line 815 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 816 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = file; -#line 816 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = library_monitor_is_blacklisted (_tmp0_); -#line 816 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp1_) { -#line 6036 "LibraryMonitor.c" - GFile* _tmp2_; - GFileInfo* _tmp3_; -#line 817 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = file; + if (library_monitor_is_blacklisted (file)) { #line 817 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = info; -#line 817 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_created (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_, _tmp3_); + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_created (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file, info); #line 819 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 6047 "LibraryMonitor.c" +#line 6245 "LibraryMonitor.c" } #line 822 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 6051 "LibraryMonitor.c" +#line 6249 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp4_; - GeeList* _tmp5_; + GeeList* _tmp0_; + GeeList* _tmp1_; gint _monitor_size = 0; - GeeList* _tmp6_; - gint _tmp7_; - gint _tmp8_; + GeeList* _tmp2_; + gint _tmp3_; + gint _tmp4_; gint _monitor_index = 0; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = self->priv->monitors; + _tmp0_ = self->priv->monitors; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_list = _tmp5_; + _monitor_list = _tmp1_; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = _monitor_list; + _tmp2_ = _monitor_list; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = _tmp7_; + _tmp4_ = _tmp3_; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_size = _tmp8_; + _monitor_size = _tmp4_; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _monitor_index = -1; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 6079 "LibraryMonitor.c" - gint _tmp9_; - gint _tmp10_; - gint _tmp11_; +#line 6277 "LibraryMonitor.c" + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; MediaMonitor* monitor = NULL; - GeeList* _tmp12_; - gint _tmp13_; - gpointer _tmp14_; - MediaMonitor* _tmp15_; - GFile* _tmp16_; - GFileInfo* _tmp17_; - gboolean _tmp18_; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + MediaMonitor* _tmp11_; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = _monitor_index; + _tmp5_ = _monitor_index; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_index = _tmp9_ + 1; + _monitor_index = _tmp5_ + 1; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _monitor_index; + _tmp6_ = _monitor_index; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = _monitor_size; + _tmp7_ = _monitor_size; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp10_ < _tmp11_)) { + if (!(_tmp6_ < _tmp7_)) { #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6103 "LibraryMonitor.c" +#line 6298 "LibraryMonitor.c" } #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = _monitor_list; + _tmp8_ = _monitor_list; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = _monitor_index; + _tmp9_ = _monitor_index; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = gee_list_get (_tmp12_, _tmp13_); + _tmp10_ = gee_list_get (_tmp8_, _tmp9_); #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = (MediaMonitor*) _tmp14_; -#line 824 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = monitor; -#line 824 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = file; -#line 824 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = info; + monitor = (MediaMonitor*) _tmp10_; #line 824 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = media_monitor_notify_file_created (_tmp15_, _tmp16_, _tmp17_); + _tmp11_ = monitor; #line 824 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp18_) { + if (media_monitor_notify_file_created (_tmp11_, file, info)) { #line 825 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = TRUE; #line 827 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); #line 827 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6129 "LibraryMonitor.c" +#line 6318 "LibraryMonitor.c" } #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6133 "LibraryMonitor.c" +#line 6322 "LibraryMonitor.c" } #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 6137 "LibraryMonitor.c" +#line 6326 "LibraryMonitor.c" } #line 831 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = known; + _tmp12_ = known; #line 831 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp19_) { -#line 6143 "LibraryMonitor.c" + if (!_tmp12_) { +#line 6332 "LibraryMonitor.c" GeeHashSet* all_candidates = NULL; - gboolean _tmp78_ = FALSE; - gboolean _tmp79_ = FALSE; - gboolean _tmp80_; + gboolean _tmp65_ = FALSE; + gboolean _tmp66_ = FALSE; + gboolean _tmp67_; #line 833 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" all_candidates = NULL; -#line 6150 "LibraryMonitor.c" +#line 6339 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp20_; - GeeList* _tmp21_; + GeeList* _tmp13_; + GeeList* _tmp14_; gint _monitor_size = 0; - GeeList* _tmp22_; - gint _tmp23_; - gint _tmp24_; + GeeList* _tmp15_; + gint _tmp16_; + gint _tmp17_; gint _monitor_index = 0; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = self->priv->monitors; + _tmp13_ = self->priv->monitors; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = _g_object_ref0 (_tmp20_); + _tmp14_ = _g_object_ref0 (_tmp13_); #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_list = _tmp21_; + _monitor_list = _tmp14_; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = _monitor_list; + _tmp15_ = _monitor_list; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp16_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = _tmp23_; + _tmp17_ = _tmp16_; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_size = _tmp24_; + _monitor_size = _tmp17_; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _monitor_index = -1; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 6178 "LibraryMonitor.c" - gint _tmp25_; - gint _tmp26_; - gint _tmp27_; +#line 6367 "LibraryMonitor.c" + gint _tmp18_; + gint _tmp19_; + gint _tmp20_; MediaMonitor* monitor = NULL; - GeeList* _tmp28_; - gint _tmp29_; - gpointer _tmp30_; + GeeList* _tmp21_; + gint _tmp22_; + gpointer _tmp23_; MediaMonitorDiscoveredFile _result_ = 0; GeeCollection* candidates = NULL; - MediaMonitor* _tmp31_; - GFile* _tmp32_; - GFileInfo* _tmp33_; - MediaMonitorDiscoveredFile _tmp34_ = 0; - GeeCollection* _tmp35_; - gboolean _tmp36_ = FALSE; - MediaMonitorDiscoveredFile _tmp37_; + MediaMonitor* _tmp24_; + MediaMonitorDiscoveredFile _tmp25_ = 0; + GeeCollection* _tmp26_; + gboolean _tmp27_ = FALSE; + MediaMonitorDiscoveredFile _tmp28_; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = _monitor_index; + _tmp18_ = _monitor_index; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_index = _tmp25_ + 1; + _monitor_index = _tmp18_ + 1; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = _monitor_index; + _tmp19_ = _monitor_index; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = _monitor_size; + _tmp20_ = _monitor_size; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp26_ < _tmp27_)) { + if (!(_tmp19_ < _tmp20_)) { #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6207 "LibraryMonitor.c" +#line 6394 "LibraryMonitor.c" } #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp28_ = _monitor_list; + _tmp21_ = _monitor_list; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = _monitor_index; + _tmp22_ = _monitor_index; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp30_ = gee_list_get (_tmp28_, _tmp29_); + _tmp23_ = gee_list_get (_tmp21_, _tmp22_); #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = (MediaMonitor*) _tmp30_; + monitor = (MediaMonitor*) _tmp23_; #line 836 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp31_ = monitor; + _tmp24_ = monitor; #line 836 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp32_ = file; + _tmp26_ = media_monitor_candidates_for_unknown_file (_tmp24_, file, info, &_tmp25_); #line 836 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp33_ = info; + _result_ = _tmp25_; #line 836 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp35_ = media_monitor_candidates_for_unknown_file (_tmp31_, _tmp32_, _tmp33_, &_tmp34_); -#line 836 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _result_ = _tmp34_; -#line 836 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - candidates = _tmp35_; + candidates = _tmp26_; #line 838 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp37_ = _result_; + _tmp28_ = _result_; #line 838 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp37_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) { + if (_tmp28_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) { #line 838 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp36_ = TRUE; -#line 6235 "LibraryMonitor.c" + _tmp27_ = TRUE; +#line 6418 "LibraryMonitor.c" } else { - MediaMonitorDiscoveredFile _tmp38_; + MediaMonitorDiscoveredFile _tmp29_; #line 839 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp38_ = _result_; + _tmp29_ = _result_; #line 839 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp36_ = _tmp38_ == MEDIA_MONITOR_DISCOVERED_FILE_IGNORE; -#line 6242 "LibraryMonitor.c" + _tmp27_ = _tmp29_ == MEDIA_MONITOR_DISCOVERED_FILE_IGNORE; +#line 6425 "LibraryMonitor.c" } #line 838 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp36_) { -#line 6246 "LibraryMonitor.c" - MediaMonitor* _tmp39_; - gchar* _tmp40_; - gchar* _tmp41_; - MediaMonitorDiscoveredFile _tmp42_; - GEnumValue* _tmp43_; - GFile* _tmp44_; - gchar* _tmp45_; - gchar* _tmp46_; - gchar* _tmp47_; - gchar* _tmp48_; + if (_tmp27_) { +#line 6429 "LibraryMonitor.c" + MediaMonitor* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + MediaMonitorDiscoveredFile _tmp33_; + GEnumValue* _tmp34_; + gchar* _tmp35_; + gchar* _tmp36_; + gchar* _tmp37_; + gchar* _tmp38_; #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp39_ = monitor; -#line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp40_ = media_monitor_to_string (_tmp39_); + _tmp30_ = monitor; #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp41_ = _tmp40_; + _tmp31_ = media_monitor_to_string (_tmp30_); #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp42_ = _result_; + _tmp32_ = _tmp31_; #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp43_ = g_enum_get_value (g_type_class_ref (MEDIA_MONITOR_TYPE_DISCOVERED_FILE), _tmp42_); + _tmp33_ = _result_; #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp44_ = file; + _tmp34_ = g_enum_get_value (g_type_class_ref (MEDIA_MONITOR_TYPE_DISCOVERED_FILE), _tmp33_); #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp45_ = g_file_get_path (_tmp44_); + _tmp35_ = g_file_get_path (file); #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp46_ = _tmp45_; + _tmp36_ = _tmp35_; #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp47_ = g_strdup_printf ("%s %s created file %s", _tmp41_, (_tmp43_ != NULL) ? _tmp43_->value_name : NULL, _tmp46_); + _tmp37_ = g_strdup_printf ("%s %s created file %s", _tmp32_, (_tmp34_ != NULL) ? _tmp34_->value_name : NULL, _tmp36_); #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp48_ = _tmp47_; + _tmp38_ = _tmp37_; #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_tmp48_); + directory_monitor_mdbg (_tmp38_); #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp48_); + _g_free0 (_tmp38_); #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp46_); + _g_free0 (_tmp36_); #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp41_); + _g_free0 (_tmp32_); #line 843 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = TRUE; #line 845 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6289,154 +6469,145 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _g_object_unref0 (monitor); #line 845 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6293 "LibraryMonitor.c" +#line 6473 "LibraryMonitor.c" } else { - gboolean _tmp49_ = FALSE; - GeeCollection* _tmp50_; + gboolean _tmp39_ = FALSE; + GeeCollection* _tmp40_; #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp50_ = candidates; + _tmp40_ = candidates; #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp50_ != NULL) { -#line 6301 "LibraryMonitor.c" - GeeCollection* _tmp51_; - gint _tmp52_; - gint _tmp53_; + if (_tmp40_ != NULL) { +#line 6481 "LibraryMonitor.c" + GeeCollection* _tmp41_; + gint _tmp42_; + gint _tmp43_; #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp51_ = candidates; + _tmp41_ = candidates; #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp52_ = gee_collection_get_size (_tmp51_); + _tmp42_ = gee_collection_get_size (_tmp41_); #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp53_ = _tmp52_; + _tmp43_ = _tmp42_; #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp49_ = _tmp53_ > 0; -#line 6313 "LibraryMonitor.c" + _tmp39_ = _tmp43_ > 0; +#line 6493 "LibraryMonitor.c" } else { #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp49_ = FALSE; -#line 6317 "LibraryMonitor.c" + _tmp39_ = FALSE; +#line 6497 "LibraryMonitor.c" } #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp49_) { -#line 6321 "LibraryMonitor.c" - MediaMonitor* _tmp54_; - gchar* _tmp55_; - gchar* _tmp56_; - GeeCollection* _tmp57_; - gint _tmp58_; - gint _tmp59_; - GFile* _tmp60_; - gchar* _tmp61_; - gchar* _tmp62_; - gchar* _tmp63_; - gchar* _tmp64_; - GeeHashSet* _tmp65_; + if (_tmp39_) { +#line 6501 "LibraryMonitor.c" + MediaMonitor* _tmp44_; + gchar* _tmp45_; + gchar* _tmp46_; + GeeCollection* _tmp47_; + gint _tmp48_; + gint _tmp49_; + gchar* _tmp50_; + gchar* _tmp51_; + gchar* _tmp52_; + gchar* _tmp53_; + GeeHashSet* _tmp54_; #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp54_ = monitor; + _tmp44_ = monitor; #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp55_ = media_monitor_to_string (_tmp54_); + _tmp45_ = media_monitor_to_string (_tmp44_); #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp56_ = _tmp55_; + _tmp46_ = _tmp45_; #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp57_ = candidates; + _tmp47_ = candidates; #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp58_ = gee_collection_get_size (_tmp57_); + _tmp48_ = gee_collection_get_size (_tmp47_); #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp59_ = _tmp58_; + _tmp49_ = _tmp48_; #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp60_ = file; + _tmp50_ = g_file_get_path (file); #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp61_ = g_file_get_path (_tmp60_); + _tmp51_ = _tmp50_; #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp62_ = _tmp61_; + _tmp52_ = g_strdup_printf ("%s suggests %d candidates for created file %s", _tmp46_, _tmp49_, _tmp51_); #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp63_ = g_strdup_printf ("%s suggests %d candidates for created file %s", _tmp56_, _tmp59_, _tmp62_); -#line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp64_ = _tmp63_; + _tmp53_ = _tmp52_; #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_tmp64_); + directory_monitor_mdbg (_tmp53_); #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp64_); + _g_free0 (_tmp53_); #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp62_); + _g_free0 (_tmp51_); #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp56_); + _g_free0 (_tmp46_); #line 850 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp65_ = all_candidates; + _tmp54_ = all_candidates; #line 850 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp65_ == NULL) { -#line 6368 "LibraryMonitor.c" - GeeHashSet* _tmp66_; + if (_tmp54_ == NULL) { +#line 6545 "LibraryMonitor.c" + GeeHashSet* _tmp55_; #line 851 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp66_ = gee_hash_set_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp55_ = gee_hash_set_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 851 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (all_candidates); #line 851 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - all_candidates = _tmp66_; -#line 6376 "LibraryMonitor.c" + all_candidates = _tmp55_; +#line 6553 "LibraryMonitor.c" } { GeeIterator* _candidate_it = NULL; - GeeCollection* _tmp67_; - GeeIterator* _tmp68_; + GeeCollection* _tmp56_; + GeeIterator* _tmp57_; #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp67_ = candidates; + _tmp56_ = candidates; #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp68_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp57_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_ITERABLE, GeeIterable)); #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _candidate_it = _tmp68_; + _candidate_it = _tmp57_; #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 6390 "LibraryMonitor.c" - GeeIterator* _tmp69_; - gboolean _tmp70_; +#line 6567 "LibraryMonitor.c" + GeeIterator* _tmp58_; Monitorable* candidate = NULL; - GeeIterator* _tmp71_; - gpointer _tmp72_; - MediaMonitor* _tmp73_; - Monitorable* _tmp74_; - gboolean _tmp75_; -#line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp69_ = _candidate_it; + GeeIterator* _tmp59_; + gpointer _tmp60_; + MediaMonitor* _tmp61_; + Monitorable* _tmp62_; #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp70_ = gee_iterator_next (_tmp69_); + _tmp58_ = _candidate_it; #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp70_) { + if (!gee_iterator_next (_tmp58_)) { #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6407 "LibraryMonitor.c" +#line 6580 "LibraryMonitor.c" } #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp71_ = _candidate_it; + _tmp59_ = _candidate_it; #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp72_ = gee_iterator_get (_tmp71_); + _tmp60_ = gee_iterator_get (_tmp59_); #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - candidate = (Monitorable*) _tmp72_; + candidate = (Monitorable*) _tmp60_; #line 854 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp73_ = monitor; + _tmp61_ = monitor; #line 854 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp74_ = candidate; + _tmp62_ = candidate; #line 854 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp75_ = media_monitor_is_offline (_tmp73_, _tmp74_); -#line 854 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp75_) { -#line 6423 "LibraryMonitor.c" - GeeHashSet* _tmp76_; - Monitorable* _tmp77_; + if (media_monitor_is_offline (_tmp61_, _tmp62_)) { +#line 6594 "LibraryMonitor.c" + GeeHashSet* _tmp63_; + Monitorable* _tmp64_; #line 855 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp76_ = all_candidates; + _tmp63_ = all_candidates; #line 855 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp77_ = candidate; + _tmp64_ = candidate; #line 855 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp77_); -#line 6432 "LibraryMonitor.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp64_); +#line 6603 "LibraryMonitor.c" } #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (candidate); -#line 6436 "LibraryMonitor.c" +#line 6607 "LibraryMonitor.c" } #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_candidate_it); -#line 6440 "LibraryMonitor.c" +#line 6611 "LibraryMonitor.c" } } } @@ -6444,260 +6615,246 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _g_object_unref0 (candidates); #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6448 "LibraryMonitor.c" +#line 6619 "LibraryMonitor.c" } #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 6452 "LibraryMonitor.c" +#line 6623 "LibraryMonitor.c" } #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp80_ = known; + _tmp67_ = known; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp80_) { -#line 6458 "LibraryMonitor.c" - GeeHashSet* _tmp81_; + if (!_tmp67_) { +#line 6629 "LibraryMonitor.c" + GeeHashSet* _tmp68_; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp81_ = all_candidates; + _tmp68_ = all_candidates; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp79_ = _tmp81_ != NULL; -#line 6464 "LibraryMonitor.c" + _tmp66_ = _tmp68_ != NULL; +#line 6635 "LibraryMonitor.c" } else { #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp79_ = FALSE; -#line 6468 "LibraryMonitor.c" + _tmp66_ = FALSE; +#line 6639 "LibraryMonitor.c" } #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp79_) { -#line 6472 "LibraryMonitor.c" - GeeHashSet* _tmp82_; - gint _tmp83_; - gint _tmp84_; + if (_tmp66_) { +#line 6643 "LibraryMonitor.c" + GeeHashSet* _tmp69_; + gint _tmp70_; + gint _tmp71_; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp82_ = all_candidates; + _tmp69_ = all_candidates; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp83_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp70_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp84_ = _tmp83_; + _tmp71_ = _tmp70_; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp78_ = _tmp84_ > 0; -#line 6484 "LibraryMonitor.c" + _tmp65_ = _tmp71_ > 0; +#line 6655 "LibraryMonitor.c" } else { #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp78_ = FALSE; -#line 6488 "LibraryMonitor.c" + _tmp65_ = FALSE; +#line 6659 "LibraryMonitor.c" } #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp78_) { -#line 6492 "LibraryMonitor.c" - GeeHashSet* _tmp85_; - gint _tmp86_; - gint _tmp87_; - GFile* _tmp88_; - gchar* _tmp89_; - gchar* _tmp90_; - gchar* _tmp91_; - gchar* _tmp92_; - Workers* _tmp93_; - GFile* _tmp94_; - GeeHashSet* _tmp95_; - LibraryMonitorRuntimeFindMoveJob* _tmp96_; - LibraryMonitorRuntimeFindMoveJob* _tmp97_; -#line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp85_ = all_candidates; + if (_tmp65_) { +#line 6663 "LibraryMonitor.c" + GeeHashSet* _tmp72_; + gint _tmp73_; + gint _tmp74_; + gchar* _tmp75_; + gchar* _tmp76_; + gchar* _tmp77_; + gchar* _tmp78_; + Workers* _tmp79_; + GeeHashSet* _tmp80_; + LibraryMonitorRuntimeFindMoveJob* _tmp81_; + LibraryMonitorRuntimeFindMoveJob* _tmp82_; #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp86_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp72_ = all_candidates; #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp87_ = _tmp86_; + _tmp73_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp88_ = file; + _tmp74_ = _tmp73_; #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp89_ = g_file_get_path (_tmp88_); + _tmp75_ = g_file_get_path (file); #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp90_ = _tmp89_; + _tmp76_ = _tmp75_; #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp91_ = g_strdup_printf ("%d candidates for created file %s being checksummed", _tmp87_, _tmp90_); + _tmp77_ = g_strdup_printf ("%d candidates for created file %s being checksummed", _tmp74_, _tmp76_); #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp92_ = _tmp91_; + _tmp78_ = _tmp77_; #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_tmp92_); + directory_monitor_mdbg (_tmp78_); #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp92_); + _g_free0 (_tmp78_); #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp90_); -#line 864 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp93_ = self->priv->workers; + _g_free0 (_tmp76_); #line 864 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp94_ = file; + _tmp79_ = self->priv->workers; #line 864 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp95_ = all_candidates; + _tmp80_ = all_candidates; #line 864 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp96_ = library_monitor_runtime_find_move_job_new (self, _tmp94_, G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp81_ = library_monitor_runtime_find_move_job_new (self, file, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GEE_TYPE_COLLECTION, GeeCollection)); #line 864 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp97_ = _tmp96_; + _tmp82_ = _tmp81_; #line 864 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - workers_enqueue (_tmp93_, G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, TYPE_BACKGROUND_JOB, BackgroundJob)); + workers_enqueue (_tmp79_, G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 864 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _background_job_unref0 (_tmp97_); + _background_job_unref0 (_tmp82_); #line 866 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = TRUE; -#line 6544 "LibraryMonitor.c" +#line 6709 "LibraryMonitor.c" } #line 831 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (all_candidates); -#line 6548 "LibraryMonitor.c" +#line 6713 "LibraryMonitor.c" } #line 870 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp98_ = known; + _tmp83_ = known; #line 870 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp98_) { -#line 6554 "LibraryMonitor.c" - GFile* _tmp99_; + if (!_tmp83_) { #line 871 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp99_ = file; -#line 871 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_runtime_unknown_file_discovered (self, _tmp99_); -#line 6560 "LibraryMonitor.c" + library_monitor_runtime_unknown_file_discovered (self, file); +#line 6721 "LibraryMonitor.c" } #line 873 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp100_ = file; -#line 873 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp101_ = info; -#line 873 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_created (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp100_, _tmp101_); -#line 6568 "LibraryMonitor.c" + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_created (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file, info); +#line 6725 "LibraryMonitor.c" } -static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self, BackgroundJob* j) { +static void +library_monitor_on_runtime_find_move_completed (LibraryMonitor* self, + BackgroundJob* j) +{ LibraryMonitorRuntimeFindMoveJob* job = NULL; - BackgroundJob* _tmp0_; + LibraryMonitorRuntimeFindMoveJob* _tmp0_; LibraryMonitorRuntimeFindMoveJob* _tmp1_; - LibraryMonitorRuntimeFindMoveJob* _tmp2_; - GError* _tmp3_; - LibraryMonitorRuntimeFindMoveJob* _tmp11_; - Monitorable* _tmp12_; + GError* _tmp2_; + LibraryMonitorRuntimeFindMoveJob* _tmp10_; + Monitorable* _tmp11_; #line 876 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 876 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_BACKGROUND_JOB (j)); #line 877 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = j; -#line 877 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_MONITOR_TYPE_RUNTIME_FIND_MOVE_JOB, LibraryMonitorRuntimeFindMoveJob)); + _tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, LIBRARY_MONITOR_TYPE_RUNTIME_FIND_MOVE_JOB, LibraryMonitorRuntimeFindMoveJob)); #line 877 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - job = _tmp1_; + job = _tmp0_; #line 879 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = job; + _tmp1_ = job; #line 879 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = _tmp2_->err; + _tmp2_ = _tmp1_->err; #line 879 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp3_ != NULL) { -#line 6596 "LibraryMonitor.c" - LibraryMonitorRuntimeFindMoveJob* _tmp4_; - GFile* _tmp5_; + if (_tmp2_ != NULL) { +#line 6753 "LibraryMonitor.c" + LibraryMonitorRuntimeFindMoveJob* _tmp3_; + GFile* _tmp4_; + gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; - LibraryMonitorRuntimeFindMoveJob* _tmp8_; - GError* _tmp9_; - const gchar* _tmp10_; + LibraryMonitorRuntimeFindMoveJob* _tmp7_; + GError* _tmp8_; + const gchar* _tmp9_; #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = job; + _tmp3_ = job; #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _tmp4_->file; + _tmp4_ = _tmp3_->file; #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = g_file_get_path (_tmp5_); + _tmp5_ = g_file_get_path (_tmp4_); #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = job; + _tmp7_ = job; #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = _tmp8_->err; + _tmp8_ = _tmp7_->err; #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _tmp9_->message; + _tmp9_ = _tmp8_->message; #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_critical ("LibraryMonitor.vala:880: Error attempting to find a match at runtime f" \ -"or %s: %s", _tmp7_, _tmp10_); +"or %s: %s", _tmp6_, _tmp9_); #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp7_); -#line 6622 "LibraryMonitor.c" + _g_free0 (_tmp6_); +#line 6779 "LibraryMonitor.c" } #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = job; + _tmp10_ = job; #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = _tmp11_->match; + _tmp11_ = _tmp10_->match; #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp12_ != NULL) { -#line 6630 "LibraryMonitor.c" + if (_tmp11_ != NULL) { +#line 6787 "LibraryMonitor.c" MediaMonitor* monitor = NULL; - LibraryMonitorRuntimeFindMoveJob* _tmp13_; - Monitorable* _tmp14_; + LibraryMonitorRuntimeFindMoveJob* _tmp12_; + Monitorable* _tmp13_; + MediaMonitor* _tmp14_; MediaMonitor* _tmp15_; - MediaMonitor* _tmp16_; - LibraryMonitorRuntimeFindMoveJob* _tmp17_; - Monitorable* _tmp18_; - LibraryMonitorRuntimeFindMoveJob* _tmp19_; - GFile* _tmp20_; - MediaMonitor* _tmp21_; - LibraryMonitorRuntimeFindMoveJob* _tmp22_; - Monitorable* _tmp23_; + LibraryMonitorRuntimeFindMoveJob* _tmp16_; + Monitorable* _tmp17_; + LibraryMonitorRuntimeFindMoveJob* _tmp18_; + GFile* _tmp19_; + MediaMonitor* _tmp20_; + LibraryMonitorRuntimeFindMoveJob* _tmp21_; + Monitorable* _tmp22_; #line 885 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = job; + _tmp12_ = job; #line 885 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = _tmp13_->match; + _tmp13_ = _tmp12_->match; #line 885 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = library_monitor_get_monitor_for_monitorable (self, _tmp14_); + _tmp14_ = library_monitor_get_monitor_for_monitorable (self, _tmp13_); #line 885 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = _tmp15_; + monitor = _tmp14_; #line 886 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = monitor; + _tmp15_ = monitor; #line 886 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = job; + _tmp16_ = job; #line 886 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = _tmp17_->match; + _tmp17_ = _tmp16_->match; #line 886 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = job; + _tmp18_ = job; #line 886 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = _tmp19_->file; + _tmp19_ = _tmp18_->file; #line 886 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - media_monitor_update_master_file (_tmp16_, _tmp18_, _tmp20_); + media_monitor_update_master_file (_tmp15_, _tmp17_, _tmp19_); #line 887 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = monitor; + _tmp20_ = monitor; #line 887 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = job; + _tmp21_ = job; #line 887 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = _tmp22_->match; + _tmp22_ = _tmp21_->match; #line 887 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - media_monitor_update_online (_tmp21_, _tmp23_); + media_monitor_update_online (_tmp20_, _tmp22_); #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6673 "LibraryMonitor.c" +#line 6830 "LibraryMonitor.c" } else { - LibraryMonitorRuntimeFindMoveJob* _tmp24_; - GFile* _tmp25_; + LibraryMonitorRuntimeFindMoveJob* _tmp23_; + GFile* _tmp24_; #line 890 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = job; + _tmp23_ = job; #line 890 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = _tmp24_->file; + _tmp24_ = _tmp23_->file; #line 890 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_runtime_unknown_file_discovered (self, _tmp25_); -#line 6683 "LibraryMonitor.c" + library_monitor_runtime_unknown_file_discovered (self, _tmp24_); +#line 6840 "LibraryMonitor.c" } #line 876 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _background_job_unref0 (job); -#line 6687 "LibraryMonitor.c" +#line 6844 "LibraryMonitor.c" } -static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFile* old_file, GFile* new_file, GFileInfo* new_info) { +static void +library_monitor_real_notify_file_moved (DirectoryMonitor* base, + GFile* old_file, + GFile* new_file, + GFileInfo* new_info) +{ LibraryMonitor * self; gboolean _tmp0_ = FALSE; - GFile* _tmp1_; - gboolean _tmp2_; gboolean known = FALSE; - gboolean _tmp24_; - GFile* _tmp26_; - GFile* _tmp27_; - GFileInfo* _tmp28_; + gboolean _tmp13_; #line 894 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); #line 894 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6707,436 +6864,354 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil #line 894 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_info)); #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = old_file; -#line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = library_monitor_is_blacklisted (_tmp1_); -#line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp2_) { + if (library_monitor_is_blacklisted (old_file)) { #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = TRUE; -#line 6717 "LibraryMonitor.c" +#line 6870 "LibraryMonitor.c" } else { - GFile* _tmp3_; - gboolean _tmp4_; #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = new_file; -#line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = library_monitor_is_blacklisted (_tmp3_); -#line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = _tmp4_; -#line 6727 "LibraryMonitor.c" + _tmp0_ = library_monitor_is_blacklisted (new_file); +#line 6874 "LibraryMonitor.c" } #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { -#line 6731 "LibraryMonitor.c" - GFile* _tmp5_; - GFile* _tmp6_; - GFileInfo* _tmp7_; #line 896 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = old_file; -#line 896 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = new_file; -#line 896 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = new_info; -#line 896 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_moved (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp5_, _tmp6_, _tmp7_); + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_moved (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), old_file, new_file, new_info); #line 898 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 6745 "LibraryMonitor.c" +#line 6882 "LibraryMonitor.c" } #line 901 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 6749 "LibraryMonitor.c" +#line 6886 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp8_; - GeeList* _tmp9_; + GeeList* _tmp1_; + GeeList* _tmp2_; gint _monitor_size = 0; - GeeList* _tmp10_; - gint _tmp11_; - gint _tmp12_; + GeeList* _tmp3_; + gint _tmp4_; + gint _tmp5_; gint _monitor_index = 0; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = self->priv->monitors; + _tmp1_ = self->priv->monitors; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = _g_object_ref0 (_tmp8_); + _tmp2_ = _g_object_ref0 (_tmp1_); #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_list = _tmp9_; + _monitor_list = _tmp2_; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _monitor_list; + _tmp3_ = _monitor_list; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = _tmp11_; + _tmp5_ = _tmp4_; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_size = _tmp12_; + _monitor_size = _tmp5_; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _monitor_index = -1; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 6777 "LibraryMonitor.c" - gint _tmp13_; - gint _tmp14_; - gint _tmp15_; +#line 6914 "LibraryMonitor.c" + gint _tmp6_; + gint _tmp7_; + gint _tmp8_; MediaMonitor* monitor = NULL; - GeeList* _tmp16_; - gint _tmp17_; - gpointer _tmp18_; - MediaMonitor* _tmp19_; - GFile* _tmp20_; - GFile* _tmp21_; - GFileInfo* _tmp22_; - gboolean _tmp23_; + GeeList* _tmp9_; + gint _tmp10_; + gpointer _tmp11_; + MediaMonitor* _tmp12_; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = _monitor_index; + _tmp6_ = _monitor_index; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_index = _tmp13_ + 1; + _monitor_index = _tmp6_ + 1; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = _monitor_index; + _tmp7_ = _monitor_index; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = _monitor_size; + _tmp8_ = _monitor_size; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp14_ < _tmp15_)) { + if (!(_tmp7_ < _tmp8_)) { #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6802 "LibraryMonitor.c" +#line 6935 "LibraryMonitor.c" } #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = _monitor_list; + _tmp9_ = _monitor_list; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = _monitor_index; + _tmp10_ = _monitor_index; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = gee_list_get (_tmp16_, _tmp17_); + _tmp11_ = gee_list_get (_tmp9_, _tmp10_); #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = (MediaMonitor*) _tmp18_; -#line 903 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = monitor; -#line 903 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = old_file; -#line 903 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = new_file; -#line 903 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = new_info; + monitor = (MediaMonitor*) _tmp11_; #line 903 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = media_monitor_notify_file_moved (_tmp19_, _tmp20_, _tmp21_, _tmp22_); + _tmp12_ = monitor; #line 903 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp23_) { + if (media_monitor_notify_file_moved (_tmp12_, old_file, new_file, new_info)) { #line 904 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = TRUE; #line 906 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); #line 906 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6830 "LibraryMonitor.c" +#line 6955 "LibraryMonitor.c" } #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6834 "LibraryMonitor.c" +#line 6959 "LibraryMonitor.c" } #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 6838 "LibraryMonitor.c" +#line 6963 "LibraryMonitor.c" } #line 910 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = known; + _tmp13_ = known; #line 910 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp24_) { -#line 6844 "LibraryMonitor.c" - GFile* _tmp25_; -#line 911 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = new_file; + if (!_tmp13_) { #line 911 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_runtime_unknown_file_discovered (self, _tmp25_); -#line 6850 "LibraryMonitor.c" + library_monitor_runtime_unknown_file_discovered (self, new_file); +#line 6971 "LibraryMonitor.c" } #line 913 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = old_file; -#line 913 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = new_file; -#line 913 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp28_ = new_info; -#line 913 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_moved (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp26_, _tmp27_, _tmp28_); -#line 6860 "LibraryMonitor.c" + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_moved (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), old_file, new_file, new_info); +#line 6975 "LibraryMonitor.c" } -static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GFile* file) { +static void +library_monitor_real_notify_file_altered (DirectoryMonitor* base, + GFile* file) +{ LibraryMonitor * self; - GFile* _tmp0_; - gboolean _tmp1_; gboolean known = FALSE; - gboolean _tmp17_; - GFile* _tmp19_; + gboolean _tmp12_; #line 916 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); #line 916 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 917 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = file; -#line 917 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = library_monitor_is_blacklisted (_tmp0_); -#line 917 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp1_) { -#line 6881 "LibraryMonitor.c" - GFile* _tmp2_; -#line 918 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = file; + if (library_monitor_is_blacklisted (file)) { #line 918 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_); + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file); #line 920 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 6889 "LibraryMonitor.c" +#line 6996 "LibraryMonitor.c" } #line 923 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 6893 "LibraryMonitor.c" +#line 7000 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp3_; - GeeList* _tmp4_; + GeeList* _tmp0_; + GeeList* _tmp1_; gint _monitor_size = 0; - GeeList* _tmp5_; - gint _tmp6_; - gint _tmp7_; + GeeList* _tmp2_; + gint _tmp3_; + gint _tmp4_; gint _monitor_index = 0; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = self->priv->monitors; + _tmp0_ = self->priv->monitors; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_list = _tmp4_; + _monitor_list = _tmp1_; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _monitor_list; + _tmp2_ = _monitor_list; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_size = _tmp7_; + _monitor_size = _tmp4_; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _monitor_index = -1; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 6921 "LibraryMonitor.c" - gint _tmp8_; - gint _tmp9_; - gint _tmp10_; +#line 7028 "LibraryMonitor.c" + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; MediaMonitor* monitor = NULL; - GeeList* _tmp11_; - gint _tmp12_; - gpointer _tmp13_; - MediaMonitor* _tmp14_; - GFile* _tmp15_; - gboolean _tmp16_; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + MediaMonitor* _tmp11_; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = _monitor_index; + _tmp5_ = _monitor_index; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_index = _tmp8_ + 1; + _monitor_index = _tmp5_ + 1; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = _monitor_index; + _tmp6_ = _monitor_index; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _monitor_size; + _tmp7_ = _monitor_size; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp9_ < _tmp10_)) { + if (!(_tmp6_ < _tmp7_)) { #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6944 "LibraryMonitor.c" +#line 7049 "LibraryMonitor.c" } #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = _monitor_list; + _tmp8_ = _monitor_list; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = _monitor_index; + _tmp9_ = _monitor_index; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = gee_list_get (_tmp11_, _tmp12_); + _tmp10_ = gee_list_get (_tmp8_, _tmp9_); #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = (MediaMonitor*) _tmp13_; -#line 925 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = monitor; -#line 925 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = file; + monitor = (MediaMonitor*) _tmp10_; #line 925 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = media_monitor_notify_file_altered (_tmp14_, _tmp15_); + _tmp11_ = monitor; #line 925 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp16_) { + if (media_monitor_notify_file_altered (_tmp11_, file)) { #line 926 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = TRUE; #line 928 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); #line 928 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6968 "LibraryMonitor.c" +#line 7069 "LibraryMonitor.c" } #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6972 "LibraryMonitor.c" +#line 7073 "LibraryMonitor.c" } #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 6976 "LibraryMonitor.c" +#line 7077 "LibraryMonitor.c" } #line 932 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = known; + _tmp12_ = known; #line 932 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp17_) { -#line 6982 "LibraryMonitor.c" - GFile* _tmp18_; -#line 933 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = file; + if (!_tmp12_) { #line 933 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_runtime_unknown_file_discovered (self, _tmp18_); -#line 6988 "LibraryMonitor.c" + library_monitor_runtime_unknown_file_discovered (self, file); +#line 7085 "LibraryMonitor.c" } #line 935 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = file; -#line 935 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp19_); -#line 6994 "LibraryMonitor.c" + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file); +#line 7089 "LibraryMonitor.c" } -static void library_monitor_real_notify_file_attributes_altered (DirectoryMonitor* base, GFile* file) { +static void +library_monitor_real_notify_file_attributes_altered (DirectoryMonitor* base, + GFile* file) +{ LibraryMonitor * self; - GFile* _tmp0_; - gboolean _tmp1_; gboolean known = FALSE; - gboolean _tmp17_; - GFile* _tmp19_; + gboolean _tmp12_; #line 938 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); #line 938 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 939 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = file; -#line 939 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = library_monitor_is_blacklisted (_tmp0_); -#line 939 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp1_) { -#line 7015 "LibraryMonitor.c" - GFile* _tmp2_; -#line 940 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = file; + if (library_monitor_is_blacklisted (file)) { #line 940 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_attributes_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_); + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_attributes_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file); #line 942 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7023 "LibraryMonitor.c" +#line 7110 "LibraryMonitor.c" } #line 945 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 7027 "LibraryMonitor.c" +#line 7114 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp3_; - GeeList* _tmp4_; + GeeList* _tmp0_; + GeeList* _tmp1_; gint _monitor_size = 0; - GeeList* _tmp5_; - gint _tmp6_; - gint _tmp7_; + GeeList* _tmp2_; + gint _tmp3_; + gint _tmp4_; gint _monitor_index = 0; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = self->priv->monitors; + _tmp0_ = self->priv->monitors; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_list = _tmp4_; + _monitor_list = _tmp1_; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _monitor_list; + _tmp2_ = _monitor_list; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_size = _tmp7_; + _monitor_size = _tmp4_; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _monitor_index = -1; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7055 "LibraryMonitor.c" - gint _tmp8_; - gint _tmp9_; - gint _tmp10_; +#line 7142 "LibraryMonitor.c" + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; MediaMonitor* monitor = NULL; - GeeList* _tmp11_; - gint _tmp12_; - gpointer _tmp13_; - MediaMonitor* _tmp14_; - GFile* _tmp15_; - gboolean _tmp16_; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + MediaMonitor* _tmp11_; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = _monitor_index; + _tmp5_ = _monitor_index; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_index = _tmp8_ + 1; + _monitor_index = _tmp5_ + 1; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = _monitor_index; + _tmp6_ = _monitor_index; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _monitor_size; + _tmp7_ = _monitor_size; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp9_ < _tmp10_)) { + if (!(_tmp6_ < _tmp7_)) { #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7078 "LibraryMonitor.c" +#line 7163 "LibraryMonitor.c" } #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = _monitor_list; + _tmp8_ = _monitor_list; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = _monitor_index; + _tmp9_ = _monitor_index; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = gee_list_get (_tmp11_, _tmp12_); + _tmp10_ = gee_list_get (_tmp8_, _tmp9_); #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = (MediaMonitor*) _tmp13_; -#line 947 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = monitor; -#line 947 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = file; + monitor = (MediaMonitor*) _tmp10_; #line 947 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = media_monitor_notify_file_attributes_altered (_tmp14_, _tmp15_); + _tmp11_ = monitor; #line 947 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp16_) { + if (media_monitor_notify_file_attributes_altered (_tmp11_, file)) { #line 948 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = TRUE; #line 950 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); #line 950 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7102 "LibraryMonitor.c" +#line 7183 "LibraryMonitor.c" } #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 7106 "LibraryMonitor.c" +#line 7187 "LibraryMonitor.c" } #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 7110 "LibraryMonitor.c" +#line 7191 "LibraryMonitor.c" } #line 954 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = known; + _tmp12_ = known; #line 954 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp17_) { -#line 7116 "LibraryMonitor.c" - GFile* _tmp18_; -#line 955 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = file; + if (!_tmp12_) { #line 955 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_runtime_unknown_file_discovered (self, _tmp18_); -#line 7122 "LibraryMonitor.c" + library_monitor_runtime_unknown_file_discovered (self, file); +#line 7199 "LibraryMonitor.c" } #line 957 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = file; -#line 957 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_attributes_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp19_); -#line 7128 "LibraryMonitor.c" + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_attributes_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file); +#line 7203 "LibraryMonitor.c" } -static void library_monitor_real_notify_file_alteration_completed (DirectoryMonitor* base, GFile* file, GFileInfo* info) { +static void +library_monitor_real_notify_file_alteration_completed (DirectoryMonitor* base, + GFile* file, + GFileInfo* info) +{ LibraryMonitor * self; - GFile* _tmp0_; - gboolean _tmp1_; gboolean known = FALSE; - gboolean _tmp19_; - GFile* _tmp21_; - GFileInfo* _tmp22_; + gboolean _tmp12_; #line 960 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); #line 960 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7144,314 +7219,268 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni #line 960 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 961 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = file; -#line 961 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = library_monitor_is_blacklisted (_tmp0_); -#line 961 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp1_) { -#line 7152 "LibraryMonitor.c" - GFile* _tmp2_; - GFileInfo* _tmp3_; -#line 962 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = file; + if (library_monitor_is_blacklisted (file)) { #line 962 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = info; -#line 962 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_alteration_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_, _tmp3_); + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_alteration_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file, info); #line 964 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7163 "LibraryMonitor.c" +#line 7227 "LibraryMonitor.c" } #line 967 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 7167 "LibraryMonitor.c" +#line 7231 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp4_; - GeeList* _tmp5_; + GeeList* _tmp0_; + GeeList* _tmp1_; gint _monitor_size = 0; - GeeList* _tmp6_; - gint _tmp7_; - gint _tmp8_; + GeeList* _tmp2_; + gint _tmp3_; + gint _tmp4_; gint _monitor_index = 0; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = self->priv->monitors; + _tmp0_ = self->priv->monitors; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_list = _tmp5_; + _monitor_list = _tmp1_; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = _monitor_list; + _tmp2_ = _monitor_list; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = _tmp7_; + _tmp4_ = _tmp3_; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_size = _tmp8_; + _monitor_size = _tmp4_; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _monitor_index = -1; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7195 "LibraryMonitor.c" - gint _tmp9_; - gint _tmp10_; - gint _tmp11_; +#line 7259 "LibraryMonitor.c" + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; MediaMonitor* monitor = NULL; - GeeList* _tmp12_; - gint _tmp13_; - gpointer _tmp14_; - MediaMonitor* _tmp15_; - GFile* _tmp16_; - GFileInfo* _tmp17_; - gboolean _tmp18_; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + MediaMonitor* _tmp11_; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = _monitor_index; + _tmp5_ = _monitor_index; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_index = _tmp9_ + 1; + _monitor_index = _tmp5_ + 1; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _monitor_index; + _tmp6_ = _monitor_index; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = _monitor_size; + _tmp7_ = _monitor_size; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp10_ < _tmp11_)) { + if (!(_tmp6_ < _tmp7_)) { #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7219 "LibraryMonitor.c" +#line 7280 "LibraryMonitor.c" } #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = _monitor_list; + _tmp8_ = _monitor_list; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = _monitor_index; + _tmp9_ = _monitor_index; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = gee_list_get (_tmp12_, _tmp13_); + _tmp10_ = gee_list_get (_tmp8_, _tmp9_); #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = (MediaMonitor*) _tmp14_; -#line 969 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = monitor; -#line 969 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = file; -#line 969 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = info; + monitor = (MediaMonitor*) _tmp10_; #line 969 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = media_monitor_notify_file_alteration_completed (_tmp15_, _tmp16_, _tmp17_); + _tmp11_ = monitor; #line 969 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp18_) { + if (media_monitor_notify_file_alteration_completed (_tmp11_, file, info)) { #line 970 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = TRUE; #line 972 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); #line 972 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7245 "LibraryMonitor.c" +#line 7300 "LibraryMonitor.c" } #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 7249 "LibraryMonitor.c" +#line 7304 "LibraryMonitor.c" } #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 7253 "LibraryMonitor.c" +#line 7308 "LibraryMonitor.c" } #line 976 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = known; + _tmp12_ = known; #line 976 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp19_) { -#line 7259 "LibraryMonitor.c" - GFile* _tmp20_; -#line 977 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = file; + if (!_tmp12_) { #line 977 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_runtime_unknown_file_discovered (self, _tmp20_); -#line 7265 "LibraryMonitor.c" + library_monitor_runtime_unknown_file_discovered (self, file); +#line 7316 "LibraryMonitor.c" } #line 979 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = file; -#line 979 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = info; -#line 979 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_alteration_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp21_, _tmp22_); -#line 7273 "LibraryMonitor.c" + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_alteration_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file, info); +#line 7320 "LibraryMonitor.c" } -static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GFile* file) { +static void +library_monitor_real_notify_file_deleted (DirectoryMonitor* base, + GFile* file) +{ LibraryMonitor * self; - GFile* _tmp0_; - gboolean _tmp1_; gboolean known = FALSE; - gboolean _tmp17_; - GFile* _tmp28_; + gboolean _tmp12_; #line 982 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); #line 982 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 983 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = file; -#line 983 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = library_monitor_is_blacklisted (_tmp0_); -#line 983 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp1_) { -#line 7294 "LibraryMonitor.c" - GFile* _tmp2_; -#line 984 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = file; + if (library_monitor_is_blacklisted (file)) { #line 984 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_deleted (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_); + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_deleted (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file); #line 986 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7302 "LibraryMonitor.c" +#line 7341 "LibraryMonitor.c" } #line 989 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 7306 "LibraryMonitor.c" +#line 7345 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp3_; - GeeList* _tmp4_; + GeeList* _tmp0_; + GeeList* _tmp1_; gint _monitor_size = 0; - GeeList* _tmp5_; - gint _tmp6_; - gint _tmp7_; + GeeList* _tmp2_; + gint _tmp3_; + gint _tmp4_; gint _monitor_index = 0; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = self->priv->monitors; + _tmp0_ = self->priv->monitors; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_list = _tmp4_; + _monitor_list = _tmp1_; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _monitor_list; + _tmp2_ = _monitor_list; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_size = _tmp7_; + _monitor_size = _tmp4_; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _monitor_index = -1; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7334 "LibraryMonitor.c" - gint _tmp8_; - gint _tmp9_; - gint _tmp10_; +#line 7373 "LibraryMonitor.c" + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; MediaMonitor* monitor = NULL; - GeeList* _tmp11_; - gint _tmp12_; - gpointer _tmp13_; - MediaMonitor* _tmp14_; - GFile* _tmp15_; - gboolean _tmp16_; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + MediaMonitor* _tmp11_; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = _monitor_index; + _tmp5_ = _monitor_index; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_index = _tmp8_ + 1; + _monitor_index = _tmp5_ + 1; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = _monitor_index; + _tmp6_ = _monitor_index; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _monitor_size; + _tmp7_ = _monitor_size; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp9_ < _tmp10_)) { + if (!(_tmp6_ < _tmp7_)) { #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7357 "LibraryMonitor.c" +#line 7394 "LibraryMonitor.c" } #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = _monitor_list; + _tmp8_ = _monitor_list; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = _monitor_index; + _tmp9_ = _monitor_index; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = gee_list_get (_tmp11_, _tmp12_); + _tmp10_ = gee_list_get (_tmp8_, _tmp9_); #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = (MediaMonitor*) _tmp13_; -#line 991 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = monitor; -#line 991 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = file; + monitor = (MediaMonitor*) _tmp10_; #line 991 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = media_monitor_notify_file_deleted (_tmp14_, _tmp15_); + _tmp11_ = monitor; #line 991 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp16_) { + if (media_monitor_notify_file_deleted (_tmp11_, file)) { #line 992 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = TRUE; #line 994 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); #line 994 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7381 "LibraryMonitor.c" +#line 7414 "LibraryMonitor.c" } #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 7385 "LibraryMonitor.c" +#line 7418 "LibraryMonitor.c" } #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 7389 "LibraryMonitor.c" +#line 7422 "LibraryMonitor.c" } #line 998 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = known; + _tmp12_ = known; #line 998 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp17_) { -#line 7395 "LibraryMonitor.c" + if (!_tmp12_) { +#line 7428 "LibraryMonitor.c" Tombstone* tombstone = NULL; - TombstoneSourceCollection* _tmp18_; - GFile* _tmp19_; - Tombstone* _tmp20_; - Tombstone* _tmp21_; - GFile* _tmp27_; -#line 1000 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = tombstone_global; + TombstoneSourceCollection* _tmp13_; + Tombstone* _tmp14_; + Tombstone* _tmp15_; #line 1000 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = file; + _tmp13_ = tombstone_global; #line 1000 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = tombstone_source_collection_locate (_tmp18_, _tmp19_); + _tmp14_ = tombstone_source_collection_locate (_tmp13_, file); #line 1000 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - tombstone = _tmp20_; + tombstone = _tmp14_; #line 1001 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = tombstone; + _tmp15_ = tombstone; #line 1001 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp21_ != NULL) { -#line 7414 "LibraryMonitor.c" - GFile* _tmp22_; - gchar* _tmp23_; - gchar* _tmp24_; - TombstoneSourceCollection* _tmp25_; - Tombstone* _tmp26_; -#line 1002 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = file; + if (_tmp15_ != NULL) { +#line 7443 "LibraryMonitor.c" + gchar* _tmp16_; + gchar* _tmp17_; + TombstoneSourceCollection* _tmp18_; + Tombstone* _tmp19_; #line 1002 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = g_file_get_path (_tmp22_); + _tmp16_ = g_file_get_path (file); #line 1002 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = _tmp23_; + _tmp17_ = _tmp16_; #line 1002 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_debug ("LibraryMonitor.vala:1002: Resurrecting tombstoned file %s", _tmp24_); + g_debug ("LibraryMonitor.vala:1002: Resurrecting tombstoned file %s", _tmp17_); #line 1002 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp24_); + _g_free0 (_tmp17_); #line 1003 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = tombstone_global; + _tmp18_ = tombstone_global; #line 1003 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = tombstone; + _tmp19_ = tombstone; #line 1003 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - tombstone_source_collection_resurrect (_tmp25_, _tmp26_); -#line 7436 "LibraryMonitor.c" + tombstone_source_collection_resurrect (_tmp18_, _tmp19_); +#line 7462 "LibraryMonitor.c" } #line 1007 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = file; -#line 1007 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_remove_queued_import (self, _tmp27_); + library_monitor_remove_queued_import (self, file); #line 998 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (tombstone); -#line 7444 "LibraryMonitor.c" +#line 7468 "LibraryMonitor.c" } #line 1010 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp28_ = file; -#line 1010 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_deleted (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp28_); -#line 7450 "LibraryMonitor.c" + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_deleted (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file); +#line 7472 "LibraryMonitor.c" } -static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1, gint arg_1, gint arg_2, gpointer data2); register GMarshalFunc_VOID__INT_INT callback; register GCClosure * cc; @@ -7466,23 +7495,30 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * data1 = closure->data; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" data2 = param_values->data[0].v_pointer; -#line 7469 "LibraryMonitor.c" +#line 7498 "LibraryMonitor.c" } else { #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" data1 = param_values->data[0].v_pointer; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" data2 = closure->data; -#line 7475 "LibraryMonitor.c" +#line 7504 "LibraryMonitor.c" } #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" callback (data1, g_value_get_int (param_values + 1), g_value_get_int (param_values + 2), data2); -#line 7481 "LibraryMonitor.c" +#line 7510 "LibraryMonitor.c" } -static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__UINT64_UINT64) (gpointer data1, guint64 arg_1, guint64 arg_2, gpointer data2); register GMarshalFunc_VOID__UINT64_UINT64 callback; register GCClosure * cc; @@ -7497,47 +7533,52 @@ static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GVa data1 = closure->data; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" data2 = param_values->data[0].v_pointer; -#line 7500 "LibraryMonitor.c" +#line 7536 "LibraryMonitor.c" } else { #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" data1 = param_values->data[0].v_pointer; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" data2 = closure->data; -#line 7506 "LibraryMonitor.c" +#line 7542 "LibraryMonitor.c" } #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" callback = (GMarshalFunc_VOID__UINT64_UINT64) (marshal_data ? marshal_data : cc->callback); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" callback (data1, g_value_get_uint64 (param_values + 1), g_value_get_uint64 (param_values + 2), data2); -#line 7512 "LibraryMonitor.c" +#line 7548 "LibraryMonitor.c" } -static void _library_monitor_on_find_move_completed_completion_callback (BackgroundJob* job, gpointer self) { +static void +_library_monitor_on_find_move_completed_completion_callback (BackgroundJob* job, + gpointer self) +{ #line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_on_find_move_completed ((LibraryMonitor*) self, job); -#line 7519 "LibraryMonitor.c" +#line 7558 "LibraryMonitor.c" } -static void _library_monitor_on_find_move_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { +static void +_library_monitor_on_find_move_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self) +{ #line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_on_find_move_cancelled ((LibraryMonitor*) self, job); -#line 7526 "LibraryMonitor.c" +#line 7568 "LibraryMonitor.c" } -static LibraryMonitorFindMoveJob* library_monitor_find_move_job_construct (GType object_type, LibraryMonitor* owner, GFile* file, GeeCollection* candidates) { +static LibraryMonitorFindMoveJob* +library_monitor_find_move_job_construct (GType object_type, + LibraryMonitor* owner, + GFile* file, + GeeCollection* candidates) +{ LibraryMonitorFindMoveJob* self = NULL; - LibraryMonitor* _tmp0_; - LibraryMonitor* _tmp1_; - LibraryMonitor* _tmp2_; - GCancellable* _tmp3_; - LibraryMonitor* _tmp4_; - GFile* _tmp5_; - GFile* _tmp6_; - GeeCollection* _tmp7_; - GeeCollection* _tmp8_; + GCancellable* _tmp0_; + GFile* _tmp1_; + GeeCollection* _tmp2_; #line 110 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (IS_LIBRARY_MONITOR (owner), NULL); #line 110 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7545,63 +7586,59 @@ static LibraryMonitorFindMoveJob* library_monitor_find_move_job_construct (GType #line 110 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (GEE_IS_COLLECTION (candidates), NULL); #line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = owner; -#line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = owner; + _tmp0_ = owner->priv->cancellable; #line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = owner; -#line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = _tmp2_->priv->cancellable; -#line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = owner; -#line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self = (LibraryMonitorFindMoveJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _library_monitor_on_find_move_completed_completion_callback, _tmp1_, _tmp3_, _library_monitor_on_find_move_cancelled_cancellation_callback, _tmp4_, NULL); + self = (LibraryMonitorFindMoveJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), _library_monitor_on_find_move_completed_completion_callback, owner, _tmp0_, _library_monitor_on_find_move_cancelled_cancellation_callback, owner, NULL); #line 113 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = file; -#line 113 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp1_ = _g_object_ref0 (file); #line 113 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->file); #line 113 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->file = _tmp6_; -#line 114 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = candidates; + self->file = _tmp1_; #line 114 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = _g_object_ref0 (_tmp7_); + _tmp2_ = _g_object_ref0 (candidates); #line 114 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->candidates); #line 114 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->candidates = _tmp8_; + self->candidates = _tmp2_; #line 116 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW); #line 110 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self; -#line 7579 "LibraryMonitor.c" +#line 7608 "LibraryMonitor.c" } -static LibraryMonitorFindMoveJob* library_monitor_find_move_job_new (LibraryMonitor* owner, GFile* file, GeeCollection* candidates) { +static LibraryMonitorFindMoveJob* +library_monitor_find_move_job_new (LibraryMonitor* owner, + GFile* file, + GeeCollection* candidates) +{ #line 110 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return library_monitor_find_move_job_construct (LIBRARY_MONITOR_TYPE_FIND_MOVE_JOB, owner, file, candidates); -#line 7586 "LibraryMonitor.c" +#line 7619 "LibraryMonitor.c" } -static gpointer _g_error_copy0 (gpointer self) { +static gpointer +_g_error_copy0 (gpointer self) +{ #line 135 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self ? g_error_copy (self) : NULL; -#line 7593 "LibraryMonitor.c" +#line 7628 "LibraryMonitor.c" } -static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { +static void +library_monitor_find_move_job_real_execute (BackgroundJob* base) +{ LibraryMonitorFindMoveJob * self; GeeIterator* iter = NULL; GeeCollection* _tmp0_; GeeIterator* _tmp1_; - GeeCollection* _tmp12_; - gint _tmp13_; - gint _tmp14_; + GeeCollection* _tmp10_; + gint _tmp11_; + gint _tmp12_; gchar* md5 = NULL; GError * _inner_error_ = NULL; #line 119 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7614,118 +7651,112 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { iter = _tmp1_; #line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7617 "LibraryMonitor.c" +#line 7654 "LibraryMonitor.c" GeeIterator* _tmp2_; - gboolean _tmp3_; - GeeIterator* _tmp4_; - gpointer _tmp5_; - Monitorable* _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + Monitorable* _tmp5_; + GFile* _tmp6_; GFile* _tmp7_; - GFile* _tmp8_; - gboolean _tmp9_; - gboolean _tmp10_; + gboolean _tmp8_; #line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = iter; #line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7635 "LibraryMonitor.c" +#line 7668 "LibraryMonitor.c" } #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = iter; -#line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = iter; #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = (Monitorable*) _tmp5_; + _tmp4_ = gee_iterator_get (_tmp3_); #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp5_ = (Monitorable*) _tmp4_; #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = _tmp7_; + _tmp6_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource)); #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = g_file_query_exists (_tmp8_, NULL); + _tmp7_ = _tmp6_; #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _tmp9_; + _tmp8_ = g_file_query_exists (_tmp7_, NULL); #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp5_); #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp10_) { -#line 7657 "LibraryMonitor.c" - GeeIterator* _tmp11_; + if (_tmp8_) { +#line 7688 "LibraryMonitor.c" + GeeIterator* _tmp9_; #line 124 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = iter; + _tmp9_ = iter; #line 124 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_iterator_remove (_tmp11_); -#line 7663 "LibraryMonitor.c" + gee_iterator_remove (_tmp9_); +#line 7694 "LibraryMonitor.c" } } #line 128 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = self->candidates; + _tmp10_ = self->candidates; #line 128 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = gee_collection_get_size (_tmp12_); + _tmp11_ = gee_collection_get_size (_tmp10_); #line 128 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 128 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp14_ == 0) { + if (_tmp12_ == 0) { #line 129 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (iter); #line 129 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7678 "LibraryMonitor.c" +#line 7709 "LibraryMonitor.c" } #line 131 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" md5 = NULL; -#line 7682 "LibraryMonitor.c" +#line 7713 "LibraryMonitor.c" { - gchar* _tmp15_ = NULL; - GFile* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; + gchar* _tmp13_ = NULL; + GFile* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = self->file; + _tmp14_ = self->file; #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = md5_file (_tmp16_, &_inner_error_); + _tmp15_ = md5_file (_tmp14_, &_inner_error_); #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = _tmp17_; + _tmp13_ = _tmp15_; #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7696 "LibraryMonitor.c" +#line 7727 "LibraryMonitor.c" goto __catch501_g_error; } #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = _tmp15_; + _tmp16_ = _tmp13_; #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = NULL; + _tmp13_ = NULL; #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (md5); #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - md5 = _tmp18_; + md5 = _tmp16_; #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp15_); -#line 7709 "LibraryMonitor.c" + _g_free0 (_tmp13_); +#line 7740 "LibraryMonitor.c" } goto __finally501; __catch501_g_error: { GError* err = NULL; - GError* _tmp19_; - GError* _tmp20_; + GError* _tmp17_; + GError* _tmp18_; #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" err = _inner_error_; #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _inner_error_ = NULL; #line 135 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = err; + _tmp17_ = err; #line 135 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = _g_error_copy0 (_tmp19_); + _tmp18_ = _g_error_copy0 (_tmp17_); #line 135 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_error_free0 (self->err); #line 135 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->err = _tmp20_; + self->err = _tmp18_; #line 137 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_error_free0 (err); #line 137 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7734,7 +7765,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { _g_object_unref0 (iter); #line 137 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7737 "LibraryMonitor.c" +#line 7768 "LibraryMonitor.c" } __finally501: #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7749,187 +7780,190 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { g_clear_error (&_inner_error_); #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7752 "LibraryMonitor.c" +#line 7783 "LibraryMonitor.c" } { GeeIterator* _candidate_it = NULL; - GeeCollection* _tmp21_; - GeeIterator* _tmp22_; + GeeCollection* _tmp19_; + GeeIterator* _tmp20_; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = self->candidates; + _tmp19_ = self->candidates; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable)); #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _candidate_it = _tmp22_; + _candidate_it = _tmp20_; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7766 "LibraryMonitor.c" - GeeIterator* _tmp23_; - gboolean _tmp24_; +#line 7797 "LibraryMonitor.c" + GeeIterator* _tmp21_; Monitorable* candidate = NULL; - GeeIterator* _tmp25_; - gpointer _tmp26_; - Monitorable* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; - const gchar* _tmp30_; - gboolean _tmp31_; - Monitorable* _tmp32_; - Monitorable* _tmp46_; - Monitorable* _tmp47_; + GeeIterator* _tmp22_; + gpointer _tmp23_; + Monitorable* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; + const gchar* _tmp27_; + gboolean _tmp28_; + Monitorable* _tmp29_; + Monitorable* _tmp43_; + Monitorable* _tmp44_; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = _candidate_it; + _tmp21_ = _candidate_it; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = gee_iterator_next (_tmp23_); -#line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp24_) { + if (!gee_iterator_next (_tmp21_)) { #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7788 "LibraryMonitor.c" +#line 7816 "LibraryMonitor.c" } #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = _candidate_it; + _tmp22_ = _candidate_it; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = gee_iterator_get (_tmp25_); + _tmp23_ = gee_iterator_get (_tmp22_); #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - candidate = (Monitorable*) _tmp26_; + candidate = (Monitorable*) _tmp23_; #line 141 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = candidate; + _tmp24_ = candidate; #line 141 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp28_ = media_source_get_master_md5 (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp25_ = media_source_get_master_md5 (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_SOURCE, MediaSource)); #line 141 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = _tmp28_; + _tmp26_ = _tmp25_; #line 141 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp30_ = md5; + _tmp27_ = md5; #line 141 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp31_ = g_strcmp0 (_tmp29_, _tmp30_) != 0; + _tmp28_ = g_strcmp0 (_tmp26_, _tmp27_) != 0; #line 141 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp29_); + _g_free0 (_tmp26_); #line 141 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp31_) { + if (_tmp28_) { #line 142 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (candidate); #line 142 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 7814 "LibraryMonitor.c" +#line 7842 "LibraryMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp32_ = self->match; + _tmp29_ = self->match; #line 144 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp32_ != NULL) { -#line 7820 "LibraryMonitor.c" - GFile* _tmp33_; + if (_tmp29_ != NULL) { +#line 7848 "LibraryMonitor.c" + GFile* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + Monitorable* _tmp33_; gchar* _tmp34_; gchar* _tmp35_; Monitorable* _tmp36_; gchar* _tmp37_; gchar* _tmp38_; - Monitorable* _tmp39_; - gchar* _tmp40_; - gchar* _tmp41_; - GeeArrayList* _tmp42_; - GeeArrayList* _tmp44_; - Monitorable* _tmp45_; + GeeArrayList* _tmp39_; + GeeArrayList* _tmp41_; + Monitorable* _tmp42_; #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp33_ = self->file; + _tmp30_ = self->file; #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp34_ = g_file_get_path (_tmp33_); + _tmp31_ = g_file_get_path (_tmp30_); #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp35_ = _tmp34_; + _tmp32_ = _tmp31_; #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp36_ = self->match; + _tmp33_ = self->match; #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp37_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_DATA_OBJECT, DataObject)); + _tmp34_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_OBJECT, DataObject)); #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp38_ = _tmp37_; + _tmp35_ = _tmp34_; #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp39_ = candidate; + _tmp36_ = candidate; #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp40_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_DATA_OBJECT, DataObject)); + _tmp37_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_DATA_OBJECT, DataObject)); #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp41_ = _tmp40_; + _tmp38_ = _tmp37_; #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_warning ("LibraryMonitor.vala:145: Found more than one media match for %s: %s an" \ -"d %s", _tmp35_, _tmp38_, _tmp41_); -#line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp41_); +"d %s", _tmp32_, _tmp35_, _tmp38_); #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (_tmp38_); #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (_tmp35_); +#line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + _g_free0 (_tmp32_); #line 148 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp42_ = self->losers; + _tmp39_ = self->losers; #line 148 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp42_ == NULL) { -#line 7863 "LibraryMonitor.c" - GeeArrayList* _tmp43_; + if (_tmp39_ == NULL) { +#line 7891 "LibraryMonitor.c" + GeeArrayList* _tmp40_; #line 149 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp43_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp40_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 149 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->losers); #line 149 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->losers = _tmp43_; -#line 7871 "LibraryMonitor.c" + self->losers = _tmp40_; +#line 7899 "LibraryMonitor.c" } #line 151 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp44_ = self->losers; + _tmp41_ = self->losers; #line 151 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp45_ = candidate; + _tmp42_ = candidate; #line 151 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp45_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp42_); #line 153 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (candidate); #line 153 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 7883 "LibraryMonitor.c" +#line 7911 "LibraryMonitor.c" } #line 156 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp46_ = candidate; + _tmp43_ = candidate; #line 156 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp47_ = _g_object_ref0 (_tmp46_); + _tmp44_ = _g_object_ref0 (_tmp43_); #line 156 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->match); #line 156 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->match = _tmp47_; + self->match = _tmp44_; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (candidate); -#line 7895 "LibraryMonitor.c" +#line 7923 "LibraryMonitor.c" } #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_candidate_it); -#line 7899 "LibraryMonitor.c" +#line 7927 "LibraryMonitor.c" } #line 119 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (md5); #line 119 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (iter); -#line 7905 "LibraryMonitor.c" +#line 7933 "LibraryMonitor.c" } -static void library_monitor_find_move_job_class_init (LibraryMonitorFindMoveJobClass * klass) { +static void +library_monitor_find_move_job_class_init (LibraryMonitorFindMoveJobClass * klass) +{ #line 103 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_find_move_job_parent_class = g_type_class_peek_parent (klass); #line 103 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" ((BackgroundJobClass *) klass)->finalize = library_monitor_find_move_job_finalize; #line 103 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) library_monitor_find_move_job_real_execute; -#line 7916 "LibraryMonitor.c" +#line 7946 "LibraryMonitor.c" } -static void library_monitor_find_move_job_instance_init (LibraryMonitorFindMoveJob * self) { +static void +library_monitor_find_move_job_instance_init (LibraryMonitorFindMoveJob * self) +{ #line 106 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->match = NULL; #line 107 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->losers = NULL; #line 108 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->err = NULL; -#line 7927 "LibraryMonitor.c" +#line 7959 "LibraryMonitor.c" } -static void library_monitor_find_move_job_finalize (BackgroundJob * obj) { +static void +library_monitor_find_move_job_finalize (BackgroundJob * obj) +{ LibraryMonitorFindMoveJob * self; #line 103 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_MONITOR_TYPE_FIND_MOVE_JOB, LibraryMonitorFindMoveJob); @@ -7945,11 +7979,13 @@ static void library_monitor_find_move_job_finalize (BackgroundJob * obj) { _g_error_free0 (self->err); #line 103 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" BACKGROUND_JOB_CLASS (library_monitor_find_move_job_parent_class)->finalize (obj); -#line 7947 "LibraryMonitor.c" +#line 7981 "LibraryMonitor.c" } -static GType library_monitor_find_move_job_get_type (void) { +static GType +library_monitor_find_move_job_get_type (void) +{ static volatile gsize library_monitor_find_move_job_type_id__volatile = 0; if (g_once_init_enter (&library_monitor_find_move_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryMonitorFindMoveJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_monitor_find_move_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryMonitorFindMoveJob), 0, (GInstanceInitFunc) library_monitor_find_move_job_instance_init, NULL }; @@ -7961,23 +7997,26 @@ static GType library_monitor_find_move_job_get_type (void) { } -static void _library_monitor_on_runtime_find_move_completed_completion_callback (BackgroundJob* job, gpointer self) { +static void +_library_monitor_on_runtime_find_move_completed_completion_callback (BackgroundJob* job, + gpointer self) +{ #line 168 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_on_runtime_find_move_completed ((LibraryMonitor*) self, job); -#line 7966 "LibraryMonitor.c" +#line 8005 "LibraryMonitor.c" } -static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_construct (GType object_type, LibraryMonitor* owner, GFile* file, GeeCollection* candidates) { +static LibraryMonitorRuntimeFindMoveJob* +library_monitor_runtime_find_move_job_construct (GType object_type, + LibraryMonitor* owner, + GFile* file, + GeeCollection* candidates) +{ LibraryMonitorRuntimeFindMoveJob* self = NULL; - LibraryMonitor* _tmp0_; - LibraryMonitor* _tmp1_; - LibraryMonitor* _tmp2_; - GCancellable* _tmp3_; - GFile* _tmp4_; - GFile* _tmp5_; - GeeCollection* _tmp6_; - GeeCollection* _tmp7_; + GCancellable* _tmp0_; + GFile* _tmp1_; + GeeCollection* _tmp2_; #line 167 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (IS_LIBRARY_MONITOR (owner), NULL); #line 167 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7985,47 +8024,43 @@ static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_c #line 167 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (GEE_IS_COLLECTION (candidates), NULL); #line 168 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = owner; -#line 168 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = owner; -#line 168 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = owner; + _tmp0_ = owner->priv->cancellable; #line 168 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = _tmp2_->priv->cancellable; -#line 168 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self = (LibraryMonitorRuntimeFindMoveJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _library_monitor_on_runtime_find_move_completed_completion_callback, _tmp1_, _tmp3_, NULL, NULL, NULL); -#line 170 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = file; + self = (LibraryMonitorRuntimeFindMoveJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), _library_monitor_on_runtime_find_move_completed_completion_callback, owner, _tmp0_, NULL, NULL, NULL); #line 170 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp1_ = _g_object_ref0 (file); #line 170 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->file); #line 170 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->file = _tmp5_; -#line 171 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = candidates; + self->file = _tmp1_; #line 171 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = _g_object_ref0 (_tmp6_); + _tmp2_ = _g_object_ref0 (candidates); #line 171 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->candidates); #line 171 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->candidates = _tmp7_; + self->candidates = _tmp2_; #line 173 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW); #line 167 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self; -#line 8016 "LibraryMonitor.c" +#line 8045 "LibraryMonitor.c" } -static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_new (LibraryMonitor* owner, GFile* file, GeeCollection* candidates) { +static LibraryMonitorRuntimeFindMoveJob* +library_monitor_runtime_find_move_job_new (LibraryMonitor* owner, + GFile* file, + GeeCollection* candidates) +{ #line 167 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return library_monitor_runtime_find_move_job_construct (LIBRARY_MONITOR_TYPE_RUNTIME_FIND_MOVE_JOB, owner, file, candidates); -#line 8023 "LibraryMonitor.c" +#line 8056 "LibraryMonitor.c" } -static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* base) { +static void +library_monitor_runtime_find_move_job_real_execute (BackgroundJob* base) +{ LibraryMonitorRuntimeFindMoveJob * self; gchar* md5 = NULL; GError * _inner_error_ = NULL; @@ -8033,7 +8068,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_MONITOR_TYPE_RUNTIME_FIND_MOVE_JOB, LibraryMonitorRuntimeFindMoveJob); #line 177 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" md5 = NULL; -#line 8035 "LibraryMonitor.c" +#line 8070 "LibraryMonitor.c" { gchar* _tmp0_ = NULL; GFile* _tmp1_; @@ -8047,7 +8082,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b _tmp0_ = _tmp2_; #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8049 "LibraryMonitor.c" +#line 8084 "LibraryMonitor.c" goto __catch502_g_error; } #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8060,7 +8095,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b md5 = _tmp3_; #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (_tmp0_); -#line 8062 "LibraryMonitor.c" +#line 8097 "LibraryMonitor.c" } goto __finally502; __catch502_g_error: @@ -8086,7 +8121,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b _g_free0 (md5); #line 183 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 8088 "LibraryMonitor.c" +#line 8123 "LibraryMonitor.c" } __finally502: #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8099,7 +8134,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b g_clear_error (&_inner_error_); #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 8101 "LibraryMonitor.c" +#line 8136 "LibraryMonitor.c" } { GeeIterator* _candidate_it = NULL; @@ -8113,99 +8148,102 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b _candidate_it = _tmp7_; #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 8115 "LibraryMonitor.c" +#line 8150 "LibraryMonitor.c" GeeIterator* _tmp8_; - gboolean _tmp9_; Monitorable* candidate = NULL; - GeeIterator* _tmp10_; - gpointer _tmp11_; - Monitorable* _tmp12_; + GeeIterator* _tmp9_; + gpointer _tmp10_; + Monitorable* _tmp11_; + gchar* _tmp12_; gchar* _tmp13_; - gchar* _tmp14_; - const gchar* _tmp15_; - gboolean _tmp16_; + const gchar* _tmp14_; + gboolean _tmp15_; #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _candidate_it; #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = gee_iterator_next (_tmp8_); -#line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp9_) { + if (!gee_iterator_next (_tmp8_)) { #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 8134 "LibraryMonitor.c" +#line 8166 "LibraryMonitor.c" } #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _candidate_it; + _tmp9_ = _candidate_it; #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = gee_iterator_get (_tmp10_); + _tmp10_ = gee_iterator_get (_tmp9_); #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - candidate = (Monitorable*) _tmp11_; + candidate = (Monitorable*) _tmp10_; #line 187 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = candidate; + _tmp11_ = candidate; #line 187 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = media_source_get_master_md5 (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp12_ = media_source_get_master_md5 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource)); #line 187 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 187 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = md5; + _tmp14_ = md5; #line 187 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = g_strcmp0 (_tmp14_, _tmp15_) == 0; + _tmp15_ = g_strcmp0 (_tmp13_, _tmp14_) == 0; #line 187 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp14_); + _g_free0 (_tmp13_); #line 187 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp16_) { -#line 8156 "LibraryMonitor.c" + if (_tmp15_) { +#line 8188 "LibraryMonitor.c" + Monitorable* _tmp16_; Monitorable* _tmp17_; - Monitorable* _tmp18_; #line 188 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = candidate; + _tmp16_ = candidate; #line 188 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = _g_object_ref0 (_tmp17_); + _tmp17_ = _g_object_ref0 (_tmp16_); #line 188 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->match); #line 188 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->match = _tmp18_; + self->match = _tmp17_; #line 190 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (candidate); #line 190 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 8171 "LibraryMonitor.c" +#line 8203 "LibraryMonitor.c" } #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (candidate); -#line 8175 "LibraryMonitor.c" +#line 8207 "LibraryMonitor.c" } #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_candidate_it); -#line 8179 "LibraryMonitor.c" +#line 8211 "LibraryMonitor.c" } #line 176 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (md5); -#line 8183 "LibraryMonitor.c" +#line 8215 "LibraryMonitor.c" } -static void library_monitor_runtime_find_move_job_class_init (LibraryMonitorRuntimeFindMoveJobClass * klass) { +static void +library_monitor_runtime_find_move_job_class_init (LibraryMonitorRuntimeFindMoveJobClass * klass) +{ #line 161 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_runtime_find_move_job_parent_class = g_type_class_peek_parent (klass); #line 161 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" ((BackgroundJobClass *) klass)->finalize = library_monitor_runtime_find_move_job_finalize; #line 161 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) library_monitor_runtime_find_move_job_real_execute; -#line 8194 "LibraryMonitor.c" +#line 8228 "LibraryMonitor.c" } -static void library_monitor_runtime_find_move_job_instance_init (LibraryMonitorRuntimeFindMoveJob * self) { +static void +library_monitor_runtime_find_move_job_instance_init (LibraryMonitorRuntimeFindMoveJob * self) +{ #line 164 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->match = NULL; #line 165 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->err = NULL; -#line 8203 "LibraryMonitor.c" +#line 8239 "LibraryMonitor.c" } -static void library_monitor_runtime_find_move_job_finalize (BackgroundJob * obj) { +static void +library_monitor_runtime_find_move_job_finalize (BackgroundJob * obj) +{ LibraryMonitorRuntimeFindMoveJob * self; #line 161 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_MONITOR_TYPE_RUNTIME_FIND_MOVE_JOB, LibraryMonitorRuntimeFindMoveJob); @@ -8219,11 +8257,13 @@ static void library_monitor_runtime_find_move_job_finalize (BackgroundJob * obj) _g_error_free0 (self->err); #line 161 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" BACKGROUND_JOB_CLASS (library_monitor_runtime_find_move_job_parent_class)->finalize (obj); -#line 8221 "LibraryMonitor.c" +#line 8259 "LibraryMonitor.c" } -static GType library_monitor_runtime_find_move_job_get_type (void) { +static GType +library_monitor_runtime_find_move_job_get_type (void) +{ static volatile gsize library_monitor_runtime_find_move_job_type_id__volatile = 0; if (g_once_init_enter (&library_monitor_runtime_find_move_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryMonitorRuntimeFindMoveJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_monitor_runtime_find_move_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryMonitorRuntimeFindMoveJob), 0, (GInstanceInitFunc) library_monitor_runtime_find_move_job_instance_init, NULL }; @@ -8235,12 +8275,14 @@ static GType library_monitor_runtime_find_move_job_get_type (void) { } -static LibraryMonitorVerifyJob* library_monitor_verify_job_construct (GType object_type, Monitorable* monitorable, MediaMonitor* monitor) { +static LibraryMonitorVerifyJob* +library_monitor_verify_job_construct (GType object_type, + Monitorable* monitorable, + MediaMonitor* monitor) +{ LibraryMonitorVerifyJob* self = NULL; Monitorable* _tmp0_; - Monitorable* _tmp1_; - MediaMonitor* _tmp2_; - MediaMonitor* _tmp3_; + MediaMonitor* _tmp1_; #line 200 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL); #line 200 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8248,132 +8290,156 @@ static LibraryMonitorVerifyJob* library_monitor_verify_job_construct (GType obje #line 200 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = (LibraryMonitorVerifyJob*) g_type_create_instance (object_type); #line 201 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = monitorable; -#line 201 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (monitorable); #line 201 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->monitorable); #line 201 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->monitorable = _tmp1_; -#line 202 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = monitor; + self->monitorable = _tmp0_; #line 202 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (monitor); #line 202 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->monitor); #line 202 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->monitor = _tmp3_; + self->monitor = _tmp1_; #line 200 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self; -#line 8267 "LibraryMonitor.c" +#line 8305 "LibraryMonitor.c" } -static LibraryMonitorVerifyJob* library_monitor_verify_job_new (Monitorable* monitorable, MediaMonitor* monitor) { +static LibraryMonitorVerifyJob* +library_monitor_verify_job_new (Monitorable* monitorable, + MediaMonitor* monitor) +{ #line 200 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return library_monitor_verify_job_construct (LIBRARY_MONITOR_TYPE_VERIFY_JOB, monitorable, monitor); -#line 8274 "LibraryMonitor.c" +#line 8315 "LibraryMonitor.c" } -static void library_monitor_value_verify_job_init (GValue* value) { +static void +library_monitor_value_verify_job_init (GValue* value) +{ #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 8281 "LibraryMonitor.c" +#line 8324 "LibraryMonitor.c" } -static void library_monitor_value_verify_job_free_value (GValue* value) { +static void +library_monitor_value_verify_job_free_value (GValue* value) +{ #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (value->data[0].v_pointer) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_verify_job_unref (value->data[0].v_pointer); -#line 8290 "LibraryMonitor.c" +#line 8335 "LibraryMonitor.c" } } -static void library_monitor_value_verify_job_copy_value (const GValue* src_value, GValue* dest_value) { +static void +library_monitor_value_verify_job_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (src_value->data[0].v_pointer) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" dest_value->data[0].v_pointer = library_monitor_verify_job_ref (src_value->data[0].v_pointer); -#line 8300 "LibraryMonitor.c" +#line 8348 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" dest_value->data[0].v_pointer = NULL; -#line 8304 "LibraryMonitor.c" +#line 8352 "LibraryMonitor.c" } } -static gpointer library_monitor_value_verify_job_peek_pointer (const GValue* value) { +static gpointer +library_monitor_value_verify_job_peek_pointer (const GValue* value) +{ #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return value->data[0].v_pointer; -#line 8312 "LibraryMonitor.c" +#line 8362 "LibraryMonitor.c" } -static gchar* library_monitor_value_verify_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +library_monitor_value_verify_job_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (collect_values[0].v_pointer) { -#line 8319 "LibraryMonitor.c" +#line 8374 "LibraryMonitor.c" LibraryMonitorVerifyJob * object; object = collect_values[0].v_pointer; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (object->parent_instance.g_class == NULL) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8326 "LibraryMonitor.c" +#line 8381 "LibraryMonitor.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8330 "LibraryMonitor.c" +#line 8385 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = library_monitor_verify_job_ref (object); -#line 8334 "LibraryMonitor.c" +#line 8389 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 8338 "LibraryMonitor.c" +#line 8393 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return NULL; -#line 8342 "LibraryMonitor.c" +#line 8397 "LibraryMonitor.c" } -static gchar* library_monitor_value_verify_job_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +library_monitor_value_verify_job_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ LibraryMonitorVerifyJob ** object_p; object_p = collect_values[0].v_pointer; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!object_p) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8353 "LibraryMonitor.c" +#line 8413 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!value->data[0].v_pointer) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *object_p = NULL; -#line 8359 "LibraryMonitor.c" +#line 8419 "LibraryMonitor.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *object_p = value->data[0].v_pointer; -#line 8363 "LibraryMonitor.c" +#line 8423 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *object_p = library_monitor_verify_job_ref (value->data[0].v_pointer); -#line 8367 "LibraryMonitor.c" +#line 8427 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return NULL; -#line 8371 "LibraryMonitor.c" +#line 8431 "LibraryMonitor.c" } -static GParamSpec* library_monitor_param_spec_verify_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +static GParamSpec* +library_monitor_param_spec_verify_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ LibraryMonitorParamSpecVerifyJob* spec; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (g_type_is_a (object_type, LIBRARY_MONITOR_TYPE_VERIFY_JOB), NULL); @@ -8383,20 +8449,25 @@ static GParamSpec* library_monitor_param_spec_verify_job (const gchar* name, con G_PARAM_SPEC (spec)->value_type = object_type; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return G_PARAM_SPEC (spec); -#line 8385 "LibraryMonitor.c" +#line 8451 "LibraryMonitor.c" } -static gpointer library_monitor_value_get_verify_job (const GValue* value) { +static gpointer +library_monitor_value_get_verify_job (const GValue* value) +{ #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, LIBRARY_MONITOR_TYPE_VERIFY_JOB), NULL); #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return value->data[0].v_pointer; -#line 8394 "LibraryMonitor.c" +#line 8462 "LibraryMonitor.c" } -static void library_monitor_value_set_verify_job (GValue* value, gpointer v_object) { +static void +library_monitor_value_set_verify_job (GValue* value, + gpointer v_object) +{ LibraryMonitorVerifyJob * old; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, LIBRARY_MONITOR_TYPE_VERIFY_JOB)); @@ -8412,22 +8483,25 @@ static void library_monitor_value_set_verify_job (GValue* value, gpointer v_obje value->data[0].v_pointer = v_object; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_verify_job_ref (value->data[0].v_pointer); -#line 8414 "LibraryMonitor.c" +#line 8485 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 8418 "LibraryMonitor.c" +#line 8489 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (old) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_verify_job_unref (old); -#line 8424 "LibraryMonitor.c" +#line 8495 "LibraryMonitor.c" } } -static void library_monitor_value_take_verify_job (GValue* value, gpointer v_object) { +static void +library_monitor_value_take_verify_job (GValue* value, + gpointer v_object) +{ LibraryMonitorVerifyJob * old; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, LIBRARY_MONITOR_TYPE_VERIFY_JOB)); @@ -8441,38 +8515,44 @@ static void library_monitor_value_take_verify_job (GValue* value, gpointer v_obj g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = v_object; -#line 8443 "LibraryMonitor.c" +#line 8517 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 8447 "LibraryMonitor.c" +#line 8521 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (old) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_verify_job_unref (old); -#line 8453 "LibraryMonitor.c" +#line 8527 "LibraryMonitor.c" } } -static void library_monitor_verify_job_class_init (LibraryMonitorVerifyJobClass * klass) { +static void +library_monitor_verify_job_class_init (LibraryMonitorVerifyJobClass * klass) +{ #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_verify_job_parent_class = g_type_class_peek_parent (klass); #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" ((LibraryMonitorVerifyJobClass *) klass)->finalize = library_monitor_verify_job_finalize; -#line 8463 "LibraryMonitor.c" +#line 8539 "LibraryMonitor.c" } -static void library_monitor_verify_job_instance_init (LibraryMonitorVerifyJob * self) { +static void +library_monitor_verify_job_instance_init (LibraryMonitorVerifyJob * self) +{ #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->ref_count = 1; -#line 8470 "LibraryMonitor.c" +#line 8548 "LibraryMonitor.c" } -static void library_monitor_verify_job_finalize (LibraryMonitorVerifyJob * obj) { +static void +library_monitor_verify_job_finalize (LibraryMonitorVerifyJob * obj) +{ LibraryMonitorVerifyJob * self; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_MONITOR_TYPE_VERIFY_JOB, LibraryMonitorVerifyJob); @@ -8482,11 +8562,13 @@ static void library_monitor_verify_job_finalize (LibraryMonitorVerifyJob * obj) _g_object_unref0 (self->monitorable); #line 198 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->monitor); -#line 8484 "LibraryMonitor.c" +#line 8564 "LibraryMonitor.c" } -static GType library_monitor_verify_job_get_type (void) { +static GType +library_monitor_verify_job_get_type (void) +{ static volatile gsize library_monitor_verify_job_type_id__volatile = 0; if (g_once_init_enter (&library_monitor_verify_job_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { library_monitor_value_verify_job_init, library_monitor_value_verify_job_free_value, library_monitor_value_verify_job_copy_value, library_monitor_value_verify_job_peek_pointer, "p", library_monitor_value_verify_job_collect_value, "p", library_monitor_value_verify_job_lcopy_value }; @@ -8500,18 +8582,22 @@ static GType library_monitor_verify_job_get_type (void) { } -static gpointer library_monitor_verify_job_ref (gpointer instance) { +static gpointer +library_monitor_verify_job_ref (gpointer instance) +{ LibraryMonitorVerifyJob * self; self = instance; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_atomic_int_inc (&self->ref_count); #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return instance; -#line 8509 "LibraryMonitor.c" +#line 8593 "LibraryMonitor.c" } -static void library_monitor_verify_job_unref (gpointer instance) { +static void +library_monitor_verify_job_unref (gpointer instance) +{ LibraryMonitorVerifyJob * self; self = instance; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8520,12 +8606,14 @@ static void library_monitor_verify_job_unref (gpointer instance) { LIBRARY_MONITOR_VERIFY_JOB_GET_CLASS (self)->finalize (self); #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8522 "LibraryMonitor.c" +#line 8608 "LibraryMonitor.c" } } -static void library_monitor_class_init (LibraryMonitorClass * klass) { +static void +library_monitor_class_init (LibraryMonitorClass * klass) +{ GeeHashSet* _tmp0_; HashTimedQueue* _tmp1_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8570,53 +8658,52 @@ static void library_monitor_class_init (LibraryMonitorClass * klass) { _tmp1_ = hash_timed_queue_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, (guint) LIBRARY_MONITOR_MIN_BLACKLIST_DURATION_MSEC, _library_monitor_on_unblacklist_file_dequeued_callback, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, G_PRIORITY_LOW); #line 207 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_to_unblacklist = _tmp1_; -#line 8572 "LibraryMonitor.c" +#line 8660 "LibraryMonitor.c" } -static void library_monitor_instance_init (LibraryMonitor * self) { - guint _tmp0_; - Workers* _tmp1_; - GCancellable* _tmp2_; - GeeArrayList* _tmp3_; +static void +library_monitor_instance_init (LibraryMonitor * self) +{ + Workers* _tmp0_; + GCancellable* _tmp1_; + GeeArrayList* _tmp2_; + GeeHashSet* _tmp3_; GeeHashSet* _tmp4_; - GeeHashSet* _tmp5_; - GeeArrayList* _tmp6_; - GeeLinkedList* _tmp7_; + GeeArrayList* _tmp5_; + GeeLinkedList* _tmp6_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv = LIBRARY_MONITOR_GET_PRIVATE (self); #line 210 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = workers_thread_per_cpu_minus_one (); + _tmp0_ = workers_new (workers_thread_per_cpu_minus_one (), FALSE); #line 210 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = workers_new (_tmp0_, FALSE); -#line 210 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->workers = _tmp1_; + self->priv->workers = _tmp0_; #line 211 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = g_cancellable_new (); + _tmp1_ = g_cancellable_new (); #line 211 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->cancellable = _tmp2_; + self->priv->cancellable = _tmp1_; #line 212 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->auto_import = FALSE; #line 213 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->unknown_files = NULL; #line 214 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = gee_array_list_new (TYPE_MEDIA_MONITOR, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp2_ = gee_array_list_new (TYPE_MEDIA_MONITOR, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 214 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->monitors = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_LIST, GeeList); + self->priv->monitors = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList); #line 215 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->discovered = NULL; #line 216 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp3_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); #line 216 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->import_queue = _tmp4_; + self->priv->import_queue = _tmp3_; #line 217 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp4_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); #line 217 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->pending_imports = _tmp5_; + self->priv->pending_imports = _tmp4_; #line 218 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = gee_array_list_new (TYPE_BATCH_IMPORT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp5_ = gee_array_list_new (TYPE_BATCH_IMPORT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 218 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->batch_import_queue = _tmp6_; + self->priv->batch_import_queue = _tmp5_; #line 219 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->current_import_roll = NULL; #line 220 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8630,20 +8717,22 @@ static void library_monitor_instance_init (LibraryMonitor * self) { #line 224 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->import_queue_timer_id = (guint) 0; #line 225 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = gee_linked_list_new (LIBRARY_MONITOR_TYPE_VERIFY_JOB, (GBoxedCopyFunc) library_monitor_verify_job_ref, (GDestroyNotify) library_monitor_verify_job_unref, NULL, NULL, NULL); + _tmp6_ = gee_linked_list_new (LIBRARY_MONITOR_TYPE_VERIFY_JOB, (GBoxedCopyFunc) library_monitor_verify_job_ref, (GDestroyNotify) library_monitor_verify_job_unref, NULL, NULL, NULL); #line 225 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->verify_queue = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_QUEUE, GeeQueue); + self->priv->verify_queue = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_QUEUE, GeeQueue); #line 226 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->outstanding_verify_jobs = 0; #line 227 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->completed_monitorable_verifies = 0; #line 228 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->total_monitorable_verifies = 0; -#line 8641 "LibraryMonitor.c" +#line 8728 "LibraryMonitor.c" } -static void library_monitor_finalize (GObject * obj) { +static void +library_monitor_finalize (GObject * obj) +{ LibraryMonitor * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; @@ -8684,11 +8773,13 @@ static void library_monitor_finalize (GObject * obj) { _g_object_unref0 (self->priv->verify_queue); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" G_OBJECT_CLASS (library_monitor_parent_class)->finalize (obj); -#line 8686 "LibraryMonitor.c" +#line 8775 "LibraryMonitor.c" } -GType library_monitor_get_type (void) { +GType +library_monitor_get_type (void) +{ static volatile gsize library_monitor_type_id__volatile = 0; if (g_once_init_enter (&library_monitor_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryMonitorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_monitor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryMonitor), 0, (GInstanceInitFunc) library_monitor_instance_init, NULL }; @@ -8700,7 +8791,11 @@ GType library_monitor_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -8712,7 +8807,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/MediaDataRepresentation.c b/src/MediaDataRepresentation.c index a48a8dd..4d566f0 100644 --- a/src/MediaDataRepresentation.c +++ b/src/MediaDataRepresentation.c @@ -1,4 +1,4 @@ -/* MediaDataRepresentation.c generated by valac 0.36.6, the Vala compiler +/* MediaDataRepresentation.c generated by valac 0.40.4, the Vala compiler * generated from MediaDataRepresentation.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -188,6 +189,11 @@ typedef struct _EventSourceClass EventSourceClass; typedef struct _Event Event; typedef struct _EventClass EventClass; +enum { + MEDIA_SOURCE_0_PROPERTY, + MEDIA_SOURCE_NUM_PROPERTIES +}; +static GParamSpec* media_source_properties[MEDIA_SOURCE_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _alteration_unref0(var) ((var == NULL) ? NULL : (var = (alteration_unref (var), NULL))) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) @@ -235,9 +241,9 @@ typedef struct _TransactionController TransactionController; typedef struct _TransactionControllerClass TransactionControllerClass; enum { MEDIA_SOURCE_MASTER_REPLACED_SIGNAL, - MEDIA_SOURCE_LAST_SIGNAL + MEDIA_SOURCE_NUM_SIGNALS }; -static guint media_source_signals[MEDIA_SOURCE_LAST_SIGNAL] = {0}; +static guint media_source_signals[MEDIA_SOURCE_NUM_SIGNALS] = {0}; typedef struct _SourceHoldingTankPrivate SourceHoldingTankPrivate; #define TYPE_DATABASE_SOURCE_HOLDING_TANK (database_source_holding_tank_get_type ()) @@ -407,9 +413,9 @@ enum { MEDIA_SOURCE_COLLECTION_IMPORT_ROLL_ALTERED_SIGNAL, MEDIA_SOURCE_COLLECTION_OFFLINE_CONTENTS_ALTERED_SIGNAL, MEDIA_SOURCE_COLLECTION_FLAGGED_CONTENTS_ALTERED_SIGNAL, - MEDIA_SOURCE_COLLECTION_LAST_SIGNAL + MEDIA_SOURCE_COLLECTION_NUM_SIGNALS }; -static guint media_source_collection_signals[MEDIA_SOURCE_COLLECTION_LAST_SIGNAL] = {0}; +static guint media_source_collection_signals[MEDIA_SOURCE_COLLECTION_NUM_SIGNALS] = {0}; #define TYPE_MEDIA_COLLECTION_REGISTRY (media_collection_registry_get_type ()) #define MEDIA_COLLECTION_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_COLLECTION_REGISTRY, MediaCollectionRegistry)) @@ -966,25 +972,44 @@ extern gboolean commandline_options_no_runtime_monitoring; gpointer backing_file_state_ref (gpointer instance); void backing_file_state_unref (gpointer instance); -GParamSpec* param_spec_backing_file_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_file_state (GValue* value, gpointer v_object); -void value_take_backing_file_state (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_file_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_file_state (GValue* value, + gpointer v_object); +void value_take_backing_file_state (GValue* value, + gpointer v_object); gpointer value_get_backing_file_state (const GValue* value); GType backing_file_state_get_type (void) G_GNUC_CONST; -enum { - BACKING_FILE_STATE_DUMMY_PROPERTY -}; -BackingFileState* backing_file_state_new (const gchar* filepath, gint64 filesize, time_t modification_time, const gchar* md5); -BackingFileState* backing_file_state_construct (GType object_type, const gchar* filepath, gint64 filesize, time_t modification_time, const gchar* md5); +BackingFileState* backing_file_state_new (const gchar* filepath, + gint64 filesize, + time_t modification_time, + const gchar* md5); +BackingFileState* backing_file_state_construct (GType object_type, + const gchar* filepath, + gint64 filesize, + time_t modification_time, + const gchar* md5); gpointer backing_photo_row_ref (gpointer instance); void backing_photo_row_unref (gpointer instance); -GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_photo_row (GValue* value, gpointer v_object); -void value_take_backing_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_photo_row (GValue* value, + gpointer v_object); +void value_take_backing_photo_row (GValue* value, + gpointer v_object); gpointer value_get_backing_photo_row (const GValue* value); GType backing_photo_row_get_type (void) G_GNUC_CONST; -BackingFileState* backing_file_state_new_from_photo_row (BackingPhotoRow* photo_row, const gchar* md5); -BackingFileState* backing_file_state_construct_from_photo_row (GType object_type, BackingPhotoRow* photo_row, const gchar* md5); +BackingFileState* backing_file_state_new_from_photo_row (BackingPhotoRow* photo_row, + const gchar* md5); +BackingFileState* backing_file_state_construct_from_photo_row (GType object_type, + BackingPhotoRow* photo_row, + const gchar* md5); GType backing_photo_id_get_type (void) G_GNUC_CONST; BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self); void backing_photo_id_free (BackingPhotoID* self); @@ -998,32 +1023,56 @@ static void backing_file_state_finalize (BackingFileState * obj); GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; gpointer source_snapshot_ref (gpointer instance); void source_snapshot_unref (gpointer instance); -GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_snapshot (GValue* value, gpointer v_object); -void value_take_source_snapshot (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_snapshot (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_snapshot (GValue* value, + gpointer v_object); +void value_take_source_snapshot (GValue* value, + gpointer v_object); gpointer value_get_source_snapshot (const GValue* value); GType source_snapshot_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; @@ -1044,36 +1093,56 @@ void import_id_free (ImportID* self); GType event_source_get_type (void) G_GNUC_CONST; GType event_get_type (void) G_GNUC_CONST; #define MEDIA_SOURCE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MEDIA_SOURCE, MediaSourcePrivate)) -enum { - MEDIA_SOURCE_DUMMY_PROPERTY -}; -MediaSource* media_source_construct (GType object_type, gint64 object_id); -ThumbnailSource* thumbnail_source_construct (GType object_type, gint64 object_id); -guint64 media_source_internal_add_flags (guint64 flags, guint64 selector); -guint64 media_source_internal_remove_flags (guint64 flags, guint64 selector); -gboolean media_source_internal_is_flag_set (guint64 flags, guint64 selector); -void media_source_notify_master_replaced (MediaSource* self, GFile* old_file, GFile* new_file); -static void media_source_real_notify_master_replaced (MediaSource* self, GFile* old_file, GFile* new_file); -static void media_source_real_notify_altered (DataObject* base, Alteration* alteration); -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail); +MediaSource* media_source_construct (GType object_type, + gint64 object_id); +ThumbnailSource* thumbnail_source_construct (GType object_type, + gint64 object_id); +guint64 media_source_internal_add_flags (guint64 flags, + guint64 selector); +guint64 media_source_internal_remove_flags (guint64 flags, + guint64 selector); +gboolean media_source_internal_is_flag_set (guint64 flags, + guint64 selector); +void media_source_notify_master_replaced (MediaSource* self, + GFile* old_file, + GFile* new_file); +static void media_source_real_notify_master_replaced (MediaSource* self, + GFile* old_file, + GFile* new_file); +static void media_source_real_notify_altered (DataObject* base, + Alteration* alteration); +gboolean alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail); static void media_source_update_indexable_keywords (MediaSource* self); -Alteration* alteration_compress (Alteration* self, Alteration* other); -Alteration* alteration_new (const gchar* subject, const gchar* detail); -Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail); -void data_object_notify_altered (DataObject* self, Alteration* alteration); -static void media_source_real_notify_membership_changed (DataObject* base, DataCollection* collection); -void data_object_notify_membership_changed (DataObject* self, DataCollection* collection); +Alteration* alteration_compress (Alteration* self, + Alteration* other); +Alteration* alteration_new (const gchar* subject, + const gchar* detail); +Alteration* alteration_construct (GType object_type, + const gchar* subject, + const gchar* detail); +void data_object_notify_altered (DataObject* self, + Alteration* alteration); +static void media_source_real_notify_membership_changed (DataObject* base, + DataCollection* collection); +void data_object_notify_membership_changed (DataObject* self, + DataCollection* collection); gchar* media_source_get_title (MediaSource* self); gchar* media_source_get_basename (MediaSource* self); gchar* media_source_get_comment (MediaSource* self); -gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1); +gchar* indexable_prepare_indexable_strings (gchar** strs, + int strs_length1); static const gchar* media_source_real_get_indexable_keywords (Indexable* base); -gboolean media_source_set_event_id (MediaSource* self, EventID* id); -static gboolean media_source_real_set_event_id (MediaSource* self, EventID* id); +gboolean media_source_set_event_id (MediaSource* self, + EventID* id); +static gboolean media_source_real_set_event_id (MediaSource* self, + EventID* id); gboolean media_source_delete_original_file (MediaSource* self); GFile* media_source_get_master_file (MediaSource* self); GFile* app_dirs_get_import_dir (void); -gboolean query_is_directory_empty (GFile* dir, GError** error); +gboolean query_is_directory_empty (GFile* dir, + GError** error); static gchar* media_source_real_get_name (DataObject* base); gboolean is_string_empty (const gchar* s); static gchar* media_source_real_get_basename (MediaSource* self); @@ -1086,31 +1155,49 @@ guint64 media_source_get_filesize (MediaSource* self); static guint64 media_source_real_get_filesize (MediaSource* self); time_t media_source_get_timestamp (MediaSource* self); static time_t media_source_real_get_timestamp (MediaSource* self); -BackingFileState** media_source_get_backing_files_state (MediaSource* self, int* result_length1); -static BackingFileState** media_source_real_get_backing_files_state (MediaSource* self, int* result_length1); +BackingFileState** media_source_get_backing_files_state (MediaSource* self, + int* result_length1); +static BackingFileState** media_source_real_get_backing_files_state (MediaSource* self, + int* result_length1); static gchar* media_source_real_get_title (MediaSource* self); static gchar* media_source_real_get_comment (MediaSource* self); -void media_source_set_title (MediaSource* self, const gchar* title); -static void media_source_real_set_title (MediaSource* self, const gchar* title); -gboolean media_source_set_comment (MediaSource* self, const gchar* comment); -static gboolean media_source_real_set_comment (MediaSource* self, const gchar* comment); +void media_source_set_title (MediaSource* self, + const gchar* title); +static void media_source_real_set_title (MediaSource* self, + const gchar* title); +gboolean media_source_set_comment (MediaSource* self, + const gchar* comment); +static gboolean media_source_real_set_comment (MediaSource* self, + const gchar* comment); gchar* media_source_prep_title (const gchar* title); GType prepare_input_text_options_get_type (void) G_GNUC_CONST; -gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length); +gchar* prepare_input_text (const gchar* text, + PrepareInputTextOptions options, + gint dest_length); #define DEFAULT_USER_TEXT_INPUT_LENGTH 1024 gchar* media_source_prep_comment (const gchar* comment); Rating media_source_get_rating (MediaSource* self); static Rating media_source_real_get_rating (MediaSource* self); -void media_source_set_rating (MediaSource* self, Rating rating); -static void media_source_real_set_rating (MediaSource* self, Rating rating); +void media_source_set_rating (MediaSource* self, + Rating rating); +static void media_source_real_set_rating (MediaSource* self, + Rating rating); void media_source_increase_rating (MediaSource* self); static void media_source_real_increase_rating (MediaSource* self); void media_source_decrease_rating (MediaSource* self); static void media_source_real_decrease_rating (MediaSource* self); -void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result); -static void media_source_real_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result); -GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, Scaling* scaling, GError** error); -static GdkPixbuf* media_source_real_get_preview_pixbuf (MediaSource* self, Scaling* scaling, GError** error); +void media_source_get_dimensions (MediaSource* self, + PhotoException disallowed_steps, + Dimensions* result); +static void media_source_real_get_dimensions (MediaSource* self, + PhotoException disallowed_steps, + Dimensions* result); +GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, + Scaling* scaling, + GError** error); +static GdkPixbuf* media_source_real_get_preview_pixbuf (MediaSource* self, + Scaling* scaling, + GError** error); gboolean media_source_is_trashed (MediaSource* self); static gboolean media_source_real_is_trashed (MediaSource* self); void media_source_trash (MediaSource* self); @@ -1125,72 +1212,130 @@ void media_source_mark_online (MediaSource* self); static void media_source_real_mark_online (MediaSource* self); gchar* media_source_get_master_md5 (MediaSource* self); static gchar* media_source_real_get_master_md5 (MediaSource* self); -void media_source_get_event_id (MediaSource* self, EventID* result); -static void media_source_real_get_event_id (MediaSource* self, EventID* result); +void media_source_get_event_id (MediaSource* self, + EventID* result); +static void media_source_real_get_event_id (MediaSource* self, + EventID* result); Event* media_source_get_event (MediaSource* self); gboolean event_id_is_valid (EventID *self); GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType event_source_collection_get_type (void) G_GNUC_CONST; -Event* event_source_collection_fetch (EventSourceCollection* self, EventID* event_id); -gboolean media_source_set_event (MediaSource* self, Event* new_event); -void event_get_event_id (Event* self, EventID* result); +Event* event_source_collection_fetch (EventSourceCollection* self, + EventID* event_id); +gboolean media_source_set_event (MediaSource* self, + Event* new_event); +void event_get_event_id (Event* self, + EventID* result); #define EVENT_ID_INVALID ((gint64) -1) -void event_id_init (EventID *self, gint64 id); -void event_detach (Event* self, MediaSource* source); -void event_attach (Event* self, MediaSource* source); +void event_id_init (EventID *self, + gint64 id); +void event_detach (Event* self, + MediaSource* source); +void event_attach (Event* self, + MediaSource* source); gpointer transaction_controller_ref (gpointer instance); void transaction_controller_unref (gpointer instance); -GParamSpec* param_spec_transaction_controller (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_transaction_controller (GValue* value, gpointer v_object); -void value_take_transaction_controller (GValue* value, gpointer v_object); +GParamSpec* param_spec_transaction_controller (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_transaction_controller (GValue* value, + gpointer v_object); +void value_take_transaction_controller (GValue* value, + gpointer v_object); gpointer value_get_transaction_controller (const GValue* value); GType transaction_controller_get_type (void) G_GNUC_CONST; -void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, TransactionController* controller, GError** error); +void media_source_set_many_to_event (GeeCollection* media_sources, + Event* event, + TransactionController* controller, + GError** error); void transaction_controller_begin (TransactionController* self); -void event_attach_many (Event* self, GeeCollection* media); +void event_attach_many (Event* self, + GeeCollection* media); void transaction_controller_commit (TransactionController* self); time_t media_source_get_exposure_time (MediaSource* self); static time_t media_source_real_get_exposure_time (MediaSource* self); -void media_source_get_import_id (MediaSource* self, ImportID* result); -static void media_source_real_get_import_id (MediaSource* self, ImportID* result); -static void media_source_real_master_replaced (MediaSource* self, GFile* old_file, GFile* new_file); -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); +void media_source_get_import_id (MediaSource* self, + ImportID* result); +static void media_source_real_get_import_id (MediaSource* self, + ImportID* result); +static void media_source_real_master_replaced (MediaSource* self, + GFile* old_file, + GFile* new_file); +static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); static void media_source_finalize (GObject * obj); GType database_source_holding_tank_get_type (void) G_GNUC_CONST; GType media_source_holding_tank_get_type (void) G_GNUC_CONST; #define MEDIA_SOURCE_HOLDING_TANK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTankPrivate)) -enum { - MEDIA_SOURCE_HOLDING_TANK_DUMMY_PROPERTY -}; guint file_hash (GFile* file); -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self); -gboolean file_equal (GFile* a, GFile* b); -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); +static guint _file_hash_gee_hash_data_func (gconstpointer v, + gpointer self); +gboolean file_equal (GFile* a, + GFile* b); +static gboolean _file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); GType media_source_collection_get_type (void) G_GNUC_CONST; -MediaSourceHoldingTank* media_source_holding_tank_new (MediaSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target); -MediaSourceHoldingTank* media_source_holding_tank_construct (GType object_type, MediaSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target); -DatabaseSourceHoldingTank* database_source_holding_tank_new (SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target); -DatabaseSourceHoldingTank* database_source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target); -MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingTank* self, GFile* file); -MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* self, const gchar* md5); -static void media_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed); -static void media_source_holding_tank_on_master_source_replaced (MediaSourceHoldingTank* self, MediaSource* media_source, GFile* old_file, GFile* new_file); -static void _media_source_holding_tank_on_master_source_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self); -void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed); +MediaSourceHoldingTank* media_source_holding_tank_new (MediaSourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target); +MediaSourceHoldingTank* media_source_holding_tank_construct (GType object_type, + MediaSourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target); +DatabaseSourceHoldingTank* database_source_holding_tank_new (SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target); +DatabaseSourceHoldingTank* database_source_holding_tank_construct (GType object_type, + SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target); +MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingTank* self, + GFile* file); +MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* self, + const gchar* md5); +static void media_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, + GeeCollection* added, + GeeCollection* removed); +static void media_source_holding_tank_on_master_source_replaced (MediaSourceHoldingTank* self, + MediaSource* media_source, + GFile* old_file, + GFile* new_file); +static void _media_source_holding_tank_on_master_source_replaced_media_source_master_replaced (MediaSource* _sender, + GFile* old_file, + GFile* new_file, + gpointer self); +void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, + GeeCollection* added, + GeeCollection* removed); static void media_source_holding_tank_finalize (SourceHoldingTank * obj); GType media_source_transaction_controller_get_type (void) G_GNUC_CONST; #define MEDIA_SOURCE_TRANSACTION_CONTROLLER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, MediaSourceTransactionControllerPrivate)) -enum { - MEDIA_SOURCE_TRANSACTION_CONTROLLER_DUMMY_PROPERTY -}; MediaSourceTransactionController* media_source_transaction_controller_new (MediaSourceCollection* sources); -MediaSourceTransactionController* media_source_transaction_controller_construct (GType object_type, MediaSourceCollection* sources); +MediaSourceTransactionController* media_source_transaction_controller_construct (GType object_type, + MediaSourceCollection* sources); TransactionController* transaction_controller_construct (GType object_type); -static void media_source_transaction_controller_real_begin_impl (TransactionController* base, GError** error); +static void media_source_transaction_controller_real_begin_impl (TransactionController* base, + GError** error); void database_table_begin_transaction (void); void data_collection_freeze_notifications (DataCollection* self); -static void media_source_transaction_controller_real_commit_impl (TransactionController* base, GError** error); +static void media_source_transaction_controller_real_commit_impl (TransactionController* base, + GError** error); void data_collection_thaw_notifications (DataCollection* self); GQuark database_error_quark (void); void database_table_commit_transaction (GError** error); @@ -1198,27 +1343,45 @@ static void media_source_transaction_controller_finalize (TransactionController GType marker_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; gpointer workers_ref (gpointer instance); void workers_unref (gpointer instance); -GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_workers (GValue* value, gpointer v_object); -void value_take_workers (GValue* value, gpointer v_object); +GParamSpec* param_spec_workers (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_workers (GValue* value, + gpointer v_object); +void value_take_workers (GValue* value, + gpointer v_object); gpointer value_get_workers (const GValue* value); GType workers_get_type (void) G_GNUC_CONST; GType media_monitor_get_type (void) G_GNUC_CONST; #define MEDIA_SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollectionPrivate)) -enum { - MEDIA_SOURCE_COLLECTION_DUMMY_PROPERTY -}; -gint import_id_compare_func (ImportID* a, ImportID* b); -static gint _import_id_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); -MediaSourceCollection* media_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target); -DatabaseSourceCollection* database_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target); +gint import_id_compare_func (ImportID* a, + ImportID* b); +static gint _import_id_compare_func_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self); +MediaSourceCollection* media_source_collection_construct (GType object_type, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target); +DatabaseSourceCollection* database_source_collection_construct (GType object_type, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target); MediaSourceHoldingTank* media_source_collection_create_trashcan (MediaSourceCollection* self); MediaSourceHoldingTank* media_source_collection_create_offline_bin (MediaSourceCollection* self); GType photo_source_get_type (void) G_GNUC_CONST; @@ -1226,137 +1389,260 @@ GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; GType video_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; -void media_source_collection_filter_media (GeeCollection* media, GeeCollection* photos, GeeCollection* videos); +void media_source_collection_filter_media (GeeCollection* media, + GeeCollection* photos, + GeeCollection* videos); gchar* data_object_to_string (DataObject* self); -void media_source_collection_count_media (GeeCollection* media, gint* photo_count, gint* video_count); +void media_source_collection_count_media (GeeCollection* media, + gint* photo_count, + gint* video_count); gboolean media_source_collection_has_photo (GeeCollection* media); gboolean media_source_collection_has_video (GeeCollection* media); static MediaSourceHoldingTank* media_source_collection_real_create_trashcan (MediaSourceCollection* self); static MediaSourceHoldingTank* media_source_collection_real_create_offline_bin (MediaSourceCollection* self); -MediaMonitor* media_source_collection_create_media_monitor (MediaSourceCollection* self, Workers* workers, GCancellable* cancellable); -static MediaMonitor* media_source_collection_real_create_media_monitor (MediaSourceCollection* self, Workers* workers, GCancellable* cancellable); +MediaMonitor* media_source_collection_create_media_monitor (MediaSourceCollection* self, + Workers* workers, + GCancellable* cancellable); +static MediaMonitor* media_source_collection_real_create_media_monitor (MediaSourceCollection* self, + Workers* workers, + GCancellable* cancellable); gchar* media_source_collection_get_typename (MediaSourceCollection* self); static gchar* media_source_collection_real_get_typename (MediaSourceCollection* self); -gboolean media_source_collection_is_file_recognized (MediaSourceCollection* self, GFile* file); -static gboolean media_source_collection_real_is_file_recognized (MediaSourceCollection* self, GFile* file); +gboolean media_source_collection_is_file_recognized (MediaSourceCollection* self, + GFile* file); +static gboolean media_source_collection_real_is_file_recognized (MediaSourceCollection* self, + GFile* file); MediaSourceHoldingTank* media_source_collection_get_trashcan (MediaSourceCollection* self); MediaSourceHoldingTank* media_source_collection_get_offline_bin (MediaSourceCollection* self); -MediaSource* media_source_collection_fetch_by_numeric_id (MediaSourceCollection* self, gint64 numeric_id); -static MediaSource* media_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* self, gint64 numeric_id); +MediaSource* media_source_collection_fetch_by_numeric_id (MediaSourceCollection* self, + gint64 numeric_id); +static MediaSource* media_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* self, + gint64 numeric_id); void media_source_collection_notify_import_roll_altered (MediaSourceCollection* self); static void media_source_collection_real_notify_import_roll_altered (MediaSourceCollection* self); void media_source_collection_notify_flagged_contents_altered (MediaSourceCollection* self); static void media_source_collection_real_notify_flagged_contents_altered (MediaSourceCollection* self); -void media_source_collection_notify_media_import_starting (MediaSourceCollection* self, GeeCollection* media); -static void media_source_collection_real_notify_media_import_starting (MediaSourceCollection* self, GeeCollection* media); -void media_source_collection_notify_media_import_completed (MediaSourceCollection* self, GeeCollection* media); -static void media_source_collection_real_notify_media_import_completed (MediaSourceCollection* self, GeeCollection* media); -static void media_source_collection_real_items_altered (DataCollection* base, GeeMap* items); -gboolean alteration_has_subject (Alteration* self, const gchar* subject); -gboolean source_holding_tank_contains (SourceHoldingTank* self, DataSource* source); +void media_source_collection_notify_media_import_starting (MediaSourceCollection* self, + GeeCollection* media); +static void media_source_collection_real_notify_media_import_starting (MediaSourceCollection* self, + GeeCollection* media); +void media_source_collection_notify_media_import_completed (MediaSourceCollection* self, + GeeCollection* media); +static void media_source_collection_real_notify_media_import_completed (MediaSourceCollection* self, + GeeCollection* media); +static void media_source_collection_real_items_altered (DataCollection* base, + GeeMap* items); +gboolean alteration_has_subject (Alteration* self, + const gchar* subject); +gboolean source_holding_tank_contains (SourceHoldingTank* self, + DataSource* source); GType flaggable_get_type (void) G_GNUC_CONST; gboolean flaggable_is_flagged (Flaggable* self); -void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection* unlink); -static void media_source_collection_real_notify_contents_altered (DataCollection* base, GeeIterable* added, GeeIterable* removed); -static void media_source_collection_on_master_replaced (MediaSourceCollection* self, MediaSource* media, GFile* old_file, GFile* new_file); -static void _media_source_collection_on_master_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self); +void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, + GeeCollection* unlink); +static void media_source_collection_real_notify_contents_altered (DataCollection* base, + GeeIterable* added, + GeeIterable* removed); +static void media_source_collection_on_master_replaced (MediaSourceCollection* self, + MediaSource* media, + GFile* old_file, + GFile* new_file); +static void _media_source_collection_on_master_replaced_media_source_master_replaced (MediaSource* _sender, + GFile* old_file, + GFile* new_file, + gpointer self); gboolean import_id_is_valid (ImportID *self); -void data_collection_notify_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed); -MediaSource* media_source_collection_fetch_by_master_file (MediaSourceCollection* self, GFile* file); -MediaSource* media_source_collection_fetch_by_source_id (MediaSourceCollection* self, const gchar* source_id); -static MediaSource* media_source_collection_real_fetch_by_source_id (MediaSourceCollection* self, const gchar* source_id); -gint64 parse_int64 (const gchar* str, gint num_base); -GeeCollection* media_source_collection_get_event_source_ids (MediaSourceCollection* self, EventID* event_id); -static GeeCollection* media_source_collection_real_get_event_source_ids (MediaSourceCollection* self, EventID* event_id); +void data_collection_notify_contents_altered (DataCollection* self, + GeeIterable* added, + GeeIterable* removed); +MediaSource* media_source_collection_fetch_by_master_file (MediaSourceCollection* self, + GFile* file); +MediaSource* media_source_collection_fetch_by_source_id (MediaSourceCollection* self, + const gchar* source_id); +static MediaSource* media_source_collection_real_fetch_by_source_id (MediaSourceCollection* self, + const gchar* source_id); +gint64 parse_int64 (const gchar* str, + gint num_base); +GeeCollection* media_source_collection_get_event_source_ids (MediaSourceCollection* self, + EventID* event_id); +static GeeCollection* media_source_collection_real_get_event_source_ids (MediaSourceCollection* self, + EventID* event_id); GeeCollection* media_source_collection_get_trashcan_contents (MediaSourceCollection* self); GeeCollection* source_holding_tank_get_all (SourceHoldingTank* self); GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceCollection* self); GeeCollection* media_source_collection_get_flagged (MediaSourceCollection* self); GeeSortedSet* media_source_collection_get_import_roll_ids (MediaSourceCollection* self); ImportID* media_source_collection_get_last_import_id (MediaSourceCollection* self); -GeeCollection* media_source_collection_get_import_roll (MediaSourceCollection* self, ImportID* import_id); -void media_source_collection_add_many_to_trash (MediaSourceCollection* self, GeeCollection* sources); -void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many); -void media_source_collection_add_many_to_offline (MediaSourceCollection* self, GeeCollection* sources); +GeeCollection* media_source_collection_get_import_roll (MediaSourceCollection* self, + ImportID* import_id); +void media_source_collection_add_many_to_trash (MediaSourceCollection* self, + GeeCollection* sources); +void source_holding_tank_add_many (SourceHoldingTank* self, + GeeCollection* many); +void media_source_collection_add_many_to_offline (MediaSourceCollection* self, + GeeCollection* sources); gint media_source_collection_get_trashcan_count (MediaSourceCollection* self); gint source_holding_tank_get_count (SourceHoldingTank* self); -void media_source_collection_import_many (MediaSourceCollection* self, GeeCollection* media); -static void media_source_collection_real_import_many (MediaSourceCollection* self, GeeCollection* media); -GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); -void media_source_collection_postprocess_imported_media (MediaSourceCollection* self, GeeCollection* media); -static void media_source_collection_real_postprocess_imported_media (MediaSourceCollection* self, GeeCollection* media); -void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCollection* sources, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed); +void media_source_collection_import_many (MediaSourceCollection* self, + GeeCollection* media); +static void media_source_collection_real_import_many (MediaSourceCollection* self, + GeeCollection* media); +GeeCollection* data_collection_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); +void media_source_collection_postprocess_imported_media (MediaSourceCollection* self, + GeeCollection* media); +static void media_source_collection_real_postprocess_imported_media (MediaSourceCollection* self, + GeeCollection* media); +void media_source_collection_remove_from_app (MediaSourceCollection* self, + GeeCollection* sources, + gboolean delete_backing, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_removed); gpointer aggregate_progress_monitor_ref (gpointer instance); void aggregate_progress_monitor_unref (gpointer instance); -GParamSpec* param_spec_aggregate_progress_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_aggregate_progress_monitor (GValue* value, gpointer v_object); -void value_take_aggregate_progress_monitor (GValue* value, gpointer v_object); +GParamSpec* param_spec_aggregate_progress_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_aggregate_progress_monitor (GValue* value, + gpointer v_object); +void value_take_aggregate_progress_monitor (GValue* value, + gpointer v_object); gpointer value_get_aggregate_progress_monitor (const GValue* value); GType aggregate_progress_monitor_get_type (void) G_GNUC_CONST; -AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target); -AggregateProgressMonitor* aggregate_progress_monitor_construct (GType object_type, guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target); -gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, guint64 count, guint64 total); -static gboolean _aggregate_progress_monitor_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self); -void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* destroy, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed); -gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed); -Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects); +AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target); +AggregateProgressMonitor* aggregate_progress_monitor_construct (GType object_type, + guint64 grand_total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target); +gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, + guint64 count, + guint64 total); +static gboolean _aggregate_progress_monitor_monitor_progress_monitor (guint64 current, + guint64 total, + gboolean do_event_loop, + gpointer self); +void source_holding_tank_destroy_orphans (SourceHoldingTank* self, + GeeList* destroy, + gboolean delete_backing, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_removed); +gint source_collection_destroy_marked (SourceCollection* self, + Marker* marker, + gboolean delete_backing, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_removed); +Marker* data_collection_mark_many (DataCollection* self, + GeeCollection* objects); GType tombstone_reason_get_type (void) G_GNUC_CONST; -void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reason, GError** error); +void tombstone_entomb_many_sources (GeeCollection* sources, + TombstoneReason reason, + GError** error); void app_window_database_error (GError* err); -void media_source_collection_delete_backing_files (MediaSourceCollection* self, GeeCollection* sources, ProgressMonitor monitor, void* monitor_target, GeeList* not_deleted); +void media_source_collection_delete_backing_files (MediaSourceCollection* self, + GeeCollection* sources, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_deleted); TransactionController* media_source_collection_get_transaction_controller (MediaSourceCollection* self); -static void media_source_collection_real_media_import_starting (MediaSourceCollection* self, GeeCollection* media); -static void media_source_collection_real_media_import_completed (MediaSourceCollection* self, GeeCollection* media); -static void media_source_collection_real_master_file_replaced (MediaSourceCollection* self, MediaSource* media, GFile* old_file, GFile* new_file); -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void media_source_collection_real_trashcan_contents_altered (MediaSourceCollection* self, GeeCollection* added, GeeCollection* removed); +static void media_source_collection_real_media_import_starting (MediaSourceCollection* self, + GeeCollection* media); +static void media_source_collection_real_media_import_completed (MediaSourceCollection* self, + GeeCollection* media); +static void media_source_collection_real_master_file_replaced (MediaSourceCollection* self, + MediaSource* media, + GFile* old_file, + GFile* new_file); +static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void media_source_collection_real_trashcan_contents_altered (MediaSourceCollection* self, + GeeCollection* added, + GeeCollection* removed); static void media_source_collection_real_import_roll_altered (MediaSourceCollection* self); -static void media_source_collection_real_offline_contents_altered (MediaSourceCollection* self, GeeCollection* added, GeeCollection* removed); +static void media_source_collection_real_offline_contents_altered (MediaSourceCollection* self, + GeeCollection* added, + GeeCollection* removed); static void media_source_collection_real_flagged_contents_altered (MediaSourceCollection* self); static void media_source_collection_finalize (DataCollection * obj); gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; #define MEDIA_COLLECTION_REGISTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MEDIA_COLLECTION_REGISTRY, MediaCollectionRegistryPrivate)) -enum { - MEDIA_COLLECTION_REGISTRY_DUMMY_PROPERTY -}; gpointer application_ref (gpointer instance); void application_unref (gpointer instance); -GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_application (GValue* value, gpointer v_object); -void value_take_application (GValue* value, gpointer v_object); +GParamSpec* param_spec_application (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_application (GValue* value, + gpointer v_object); +void value_take_application (GValue* value, + gpointer v_object); gpointer value_get_application (const GValue* value); GType application_get_type (void) G_GNUC_CONST; Application* application_get_instance (void); static void media_collection_registry_on_init_done (MediaCollectionRegistry* self); -static void _media_collection_registry_on_init_done_application_init_done (Application* _sender, gpointer self); +static void _media_collection_registry_on_init_done_application_init_done (Application* _sender, + gpointer self); #define MEDIA_COLLECTION_REGISTRY_LIBRARY_MONITOR_START_DELAY_MSEC 1000 static MediaCollectionRegistry* media_collection_registry_new (void); static MediaCollectionRegistry* media_collection_registry_construct (GType object_type); GType directory_monitor_get_type (void) G_GNUC_CONST; GType library_monitor_get_type (void) G_GNUC_CONST; -LibraryMonitor* library_monitor_new (GFile* root, gboolean recurse, gboolean monitoring); -LibraryMonitor* library_monitor_construct (GType object_type, GFile* root, gboolean recurse, gboolean monitoring); +LibraryMonitor* library_monitor_new (GFile* root, + gboolean recurse, + gboolean monitoring); +LibraryMonitor* library_monitor_construct (GType object_type, + GFile* root, + gboolean recurse, + gboolean monitoring); gpointer library_monitor_pool_ref (gpointer instance); void library_monitor_pool_unref (gpointer instance); -GParamSpec* param_spec_library_monitor_pool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_library_monitor_pool (GValue* value, gpointer v_object); -void value_take_library_monitor_pool (GValue* value, gpointer v_object); +GParamSpec* param_spec_library_monitor_pool (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_library_monitor_pool (GValue* value, + gpointer v_object); +void value_take_library_monitor_pool (GValue* value, + gpointer v_object); gpointer value_get_library_monitor_pool (const GValue* value); GType library_monitor_pool_get_type (void) G_GNUC_CONST; LibraryMonitorPool* library_monitor_pool_get_instance (void); -void library_monitor_pool_replace (LibraryMonitorPool* self, LibraryMonitor* replacement, gint start_msec_delay); +void library_monitor_pool_replace (LibraryMonitorPool* self, + LibraryMonitor* replacement, + gint start_msec_delay); void media_collection_registry_init (void); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); static void media_collection_registry_on_import_directory_changed (void); -static void _media_collection_registry_on_import_directory_changed_configuration_facade_import_directory_changed (ConfigurationFacade* _sender, gpointer self); +static void _media_collection_registry_on_import_directory_changed_configuration_facade_import_directory_changed (ConfigurationFacade* _sender, + gpointer self); void media_collection_registry_terminate (void); LibraryMonitor* library_monitor_pool_get_monitor (LibraryMonitorPool* self); GFile* directory_monitor_get_root (DirectoryMonitor* self); @@ -1364,135 +1650,142 @@ void library_files_select_copy_function (void); MediaCollectionRegistry* media_collection_registry_get_instance (void); gchar* media_collection_registry_get_typename_from_source_id (const gchar* source_id); #define PHOTO_TYPENAME "thumb" -void media_collection_registry_register_collection (MediaCollectionRegistry* self, MediaSourceCollection* collection); -MediaSourceCollection* media_collection_registry_get_collection (MediaCollectionRegistry* self, const gchar* typename); +void media_collection_registry_register_collection (MediaCollectionRegistry* self, + MediaSourceCollection* collection); +MediaSourceCollection* media_collection_registry_get_collection (MediaCollectionRegistry* self, + const gchar* typename); GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self); void media_collection_registry_freeze_all (MediaCollectionRegistry* self); void media_collection_registry_thaw_all (MediaCollectionRegistry* self); void media_collection_registry_begin_transaction_on_all (MediaCollectionRegistry* self); void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistry* self); -MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* self, const gchar* source_id); +MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* self, + const gchar* source_id); ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* self); #define IMPORT_ID_INVALID ((gint64) 0) -void import_id_init (ImportID *self, gint64 id); -GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaCollectionRegistry* self, EventID* event_id); -MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaCollectionRegistry* self, GFile* file); -gboolean media_collection_registry_is_valid_source_id (MediaCollectionRegistry* self, const gchar* source_id); +void import_id_init (ImportID *self, + gint64 id); +GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaCollectionRegistry* self, + EventID* event_id); +MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaCollectionRegistry* self, + GFile* file); +gboolean media_collection_registry_is_valid_source_id (MediaCollectionRegistry* self, + const gchar* source_id); #define VIDEO_TYPENAME "video" static void media_collection_registry_finalize (MediaCollectionRegistry * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); -BackingFileState* backing_file_state_construct (GType object_type, const gchar* filepath, gint64 filesize, time_t modification_time, const gchar* md5) { +BackingFileState* +backing_file_state_construct (GType object_type, + const gchar* filepath, + gint64 filesize, + time_t modification_time, + const gchar* md5) +{ BackingFileState* self = NULL; - const gchar* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gint64 _tmp2_; - time_t _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; #line 13 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 13 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = (BackingFileState*) g_type_create_instance (object_type); #line 14 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = filepath; -#line 14 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (filepath); #line 14 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (self->filepath); #line 14 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - self->filepath = _tmp1_; -#line 15 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = filesize; + self->filepath = _tmp0_; #line 15 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - self->filesize = _tmp2_; -#line 16 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = modification_time; + self->filesize = filesize; #line 16 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - self->modification_time = _tmp3_; -#line 17 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = md5; + self->modification_time = modification_time; #line 17 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = g_strdup (_tmp4_); + _tmp1_ = g_strdup (md5); #line 17 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (self->md5); #line 17 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - self->md5 = _tmp5_; + self->md5 = _tmp1_; #line 13 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 1427 "MediaDataRepresentation.c" +#line 1718 "MediaDataRepresentation.c" } -BackingFileState* backing_file_state_new (const gchar* filepath, gint64 filesize, time_t modification_time, const gchar* md5) { +BackingFileState* +backing_file_state_new (const gchar* filepath, + gint64 filesize, + time_t modification_time, + const gchar* md5) +{ #line 13 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return backing_file_state_construct (TYPE_BACKING_FILE_STATE, filepath, filesize, modification_time, md5); -#line 1434 "MediaDataRepresentation.c" +#line 1730 "MediaDataRepresentation.c" } -BackingFileState* backing_file_state_construct_from_photo_row (GType object_type, BackingPhotoRow* photo_row, const gchar* md5) { +BackingFileState* +backing_file_state_construct_from_photo_row (GType object_type, + BackingPhotoRow* photo_row, + const gchar* md5) +{ BackingFileState* self = NULL; - BackingPhotoRow* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; - BackingPhotoRow* _tmp3_; - gint64 _tmp4_; - BackingPhotoRow* _tmp5_; - time_t _tmp6_; - const gchar* _tmp7_; - gchar* _tmp8_; + const gchar* _tmp0_; + gchar* _tmp1_; + gint64 _tmp2_; + time_t _tmp3_; + gchar* _tmp4_; #line 20 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_BACKING_PHOTO_ROW (photo_row), NULL); #line 20 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = (BackingFileState*) g_type_create_instance (object_type); #line 21 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = photo_row; -#line 21 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = _tmp0_->filepath; + _tmp0_ = photo_row->filepath; #line 21 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_tmp0_); #line 21 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (self->filepath); #line 21 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - self->filepath = _tmp2_; -#line 22 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = photo_row; + self->filepath = _tmp1_; #line 22 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = _tmp3_->filesize; + _tmp2_ = photo_row->filesize; #line 22 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - self->filesize = _tmp4_; -#line 23 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = photo_row; + self->filesize = _tmp2_; #line 23 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = _tmp5_->timestamp; + _tmp3_ = photo_row->timestamp; #line 23 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - self->modification_time = _tmp6_; -#line 24 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = md5; + self->modification_time = _tmp3_; #line 24 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = g_strdup (_tmp7_); + _tmp4_ = g_strdup (md5); #line 24 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (self->md5); #line 24 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - self->md5 = _tmp8_; + self->md5 = _tmp4_; #line 20 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 1485 "MediaDataRepresentation.c" +#line 1773 "MediaDataRepresentation.c" } -BackingFileState* backing_file_state_new_from_photo_row (BackingPhotoRow* photo_row, const gchar* md5) { +BackingFileState* +backing_file_state_new_from_photo_row (BackingPhotoRow* photo_row, + const gchar* md5) +{ #line 20 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return backing_file_state_construct_from_photo_row (TYPE_BACKING_FILE_STATE, photo_row, md5); -#line 1492 "MediaDataRepresentation.c" +#line 1783 "MediaDataRepresentation.c" } -GFile* backing_file_state_get_file (BackingFileState* self) { +GFile* +backing_file_state_get_file (BackingFileState* self) +{ GFile* result = NULL; const gchar* _tmp0_; GFile* _tmp1_; @@ -1506,108 +1799,133 @@ GFile* backing_file_state_get_file (BackingFileState* self) { result = _tmp1_; #line 28 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 1510 "MediaDataRepresentation.c" +#line 1803 "MediaDataRepresentation.c" } -static void value_backing_file_state_init (GValue* value) { +static void +value_backing_file_state_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 1517 "MediaDataRepresentation.c" +#line 1812 "MediaDataRepresentation.c" } -static void value_backing_file_state_free_value (GValue* value) { +static void +value_backing_file_state_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" backing_file_state_unref (value->data[0].v_pointer); -#line 1526 "MediaDataRepresentation.c" +#line 1823 "MediaDataRepresentation.c" } } -static void value_backing_file_state_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_backing_file_state_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" dest_value->data[0].v_pointer = backing_file_state_ref (src_value->data[0].v_pointer); -#line 1536 "MediaDataRepresentation.c" +#line 1836 "MediaDataRepresentation.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" dest_value->data[0].v_pointer = NULL; -#line 1540 "MediaDataRepresentation.c" +#line 1840 "MediaDataRepresentation.c" } } -static gpointer value_backing_file_state_peek_pointer (const GValue* value) { +static gpointer +value_backing_file_state_peek_pointer (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return value->data[0].v_pointer; -#line 1548 "MediaDataRepresentation.c" +#line 1850 "MediaDataRepresentation.c" } -static gchar* value_backing_file_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_backing_file_state_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (collect_values[0].v_pointer) { -#line 1555 "MediaDataRepresentation.c" +#line 1862 "MediaDataRepresentation.c" BackingFileState * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1562 "MediaDataRepresentation.c" +#line 1869 "MediaDataRepresentation.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1566 "MediaDataRepresentation.c" +#line 1873 "MediaDataRepresentation.c" } #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = backing_file_state_ref (object); -#line 1570 "MediaDataRepresentation.c" +#line 1877 "MediaDataRepresentation.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 1574 "MediaDataRepresentation.c" +#line 1881 "MediaDataRepresentation.c" } #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 1578 "MediaDataRepresentation.c" +#line 1885 "MediaDataRepresentation.c" } -static gchar* value_backing_file_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_backing_file_state_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ BackingFileState ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1589 "MediaDataRepresentation.c" +#line 1901 "MediaDataRepresentation.c" } #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = NULL; -#line 1595 "MediaDataRepresentation.c" +#line 1907 "MediaDataRepresentation.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = value->data[0].v_pointer; -#line 1599 "MediaDataRepresentation.c" +#line 1911 "MediaDataRepresentation.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = backing_file_state_ref (value->data[0].v_pointer); -#line 1603 "MediaDataRepresentation.c" +#line 1915 "MediaDataRepresentation.c" } #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 1607 "MediaDataRepresentation.c" +#line 1919 "MediaDataRepresentation.c" } -GParamSpec* param_spec_backing_file_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_backing_file_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecBackingFileState* spec; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_BACKING_FILE_STATE), NULL); @@ -1617,20 +1935,25 @@ GParamSpec* param_spec_backing_file_state (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return G_PARAM_SPEC (spec); -#line 1621 "MediaDataRepresentation.c" +#line 1939 "MediaDataRepresentation.c" } -gpointer value_get_backing_file_state (const GValue* value) { +gpointer +value_get_backing_file_state (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_FILE_STATE), NULL); #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return value->data[0].v_pointer; -#line 1630 "MediaDataRepresentation.c" +#line 1950 "MediaDataRepresentation.c" } -void value_set_backing_file_state (GValue* value, gpointer v_object) { +void +value_set_backing_file_state (GValue* value, + gpointer v_object) +{ BackingFileState * old; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_FILE_STATE)); @@ -1646,22 +1969,25 @@ void value_set_backing_file_state (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" backing_file_state_ref (value->data[0].v_pointer); -#line 1650 "MediaDataRepresentation.c" +#line 1973 "MediaDataRepresentation.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 1654 "MediaDataRepresentation.c" +#line 1977 "MediaDataRepresentation.c" } #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" backing_file_state_unref (old); -#line 1660 "MediaDataRepresentation.c" +#line 1983 "MediaDataRepresentation.c" } } -void value_take_backing_file_state (GValue* value, gpointer v_object) { +void +value_take_backing_file_state (GValue* value, + gpointer v_object) +{ BackingFileState * old; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_FILE_STATE)); @@ -1675,38 +2001,44 @@ void value_take_backing_file_state (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = v_object; -#line 1679 "MediaDataRepresentation.c" +#line 2005 "MediaDataRepresentation.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 1683 "MediaDataRepresentation.c" +#line 2009 "MediaDataRepresentation.c" } #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" backing_file_state_unref (old); -#line 1689 "MediaDataRepresentation.c" +#line 2015 "MediaDataRepresentation.c" } } -static void backing_file_state_class_init (BackingFileStateClass * klass) { +static void +backing_file_state_class_init (BackingFileStateClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" backing_file_state_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((BackingFileStateClass *) klass)->finalize = backing_file_state_finalize; -#line 1699 "MediaDataRepresentation.c" +#line 2027 "MediaDataRepresentation.c" } -static void backing_file_state_instance_init (BackingFileState * self) { +static void +backing_file_state_instance_init (BackingFileState * self) +{ #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->ref_count = 1; -#line 1706 "MediaDataRepresentation.c" +#line 2036 "MediaDataRepresentation.c" } -static void backing_file_state_finalize (BackingFileState * obj) { +static void +backing_file_state_finalize (BackingFileState * obj) +{ BackingFileState * self; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_FILE_STATE, BackingFileState); @@ -1716,11 +2048,13 @@ static void backing_file_state_finalize (BackingFileState * obj) { _g_free0 (self->filepath); #line 11 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (self->md5); -#line 1720 "MediaDataRepresentation.c" +#line 2052 "MediaDataRepresentation.c" } -GType backing_file_state_get_type (void) { +GType +backing_file_state_get_type (void) +{ static volatile gsize backing_file_state_type_id__volatile = 0; if (g_once_init_enter (&backing_file_state_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_backing_file_state_init, value_backing_file_state_free_value, value_backing_file_state_copy_value, value_backing_file_state_peek_pointer, "p", value_backing_file_state_collect_value, "p", value_backing_file_state_lcopy_value }; @@ -1734,18 +2068,22 @@ GType backing_file_state_get_type (void) { } -gpointer backing_file_state_ref (gpointer instance) { +gpointer +backing_file_state_ref (gpointer instance) +{ BackingFileState * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return instance; -#line 1745 "MediaDataRepresentation.c" +#line 2081 "MediaDataRepresentation.c" } -void backing_file_state_unref (gpointer instance) { +void +backing_file_state_unref (gpointer instance) +{ BackingFileState * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -1754,236 +2092,221 @@ void backing_file_state_unref (gpointer instance) { BACKING_FILE_STATE_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1758 "MediaDataRepresentation.c" +#line 2096 "MediaDataRepresentation.c" } } -MediaSource* media_source_construct (GType object_type, gint64 object_id) { +MediaSource* +media_source_construct (GType object_type, + gint64 object_id) +{ MediaSource * self = NULL; - gint64 _tmp0_; -#line 40 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = object_id; #line 40 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - self = (MediaSource*) thumbnail_source_construct (object_type, _tmp0_); + self = (MediaSource*) thumbnail_source_construct (object_type, object_id); #line 39 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 1772 "MediaDataRepresentation.c" +#line 2110 "MediaDataRepresentation.c" } -inline guint64 media_source_internal_add_flags (guint64 flags, guint64 selector) { +inline guint64 +media_source_internal_add_flags (guint64 flags, + guint64 selector) +{ guint64 result = 0ULL; - guint64 _tmp0_; - guint64 _tmp1_; -#line 44 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = flags; -#line 44 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = selector; #line 44 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - result = _tmp0_ | _tmp1_; + result = flags | selector; #line 44 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 1788 "MediaDataRepresentation.c" +#line 2123 "MediaDataRepresentation.c" } -inline guint64 media_source_internal_remove_flags (guint64 flags, guint64 selector) { +inline guint64 +media_source_internal_remove_flags (guint64 flags, + guint64 selector) +{ guint64 result = 0ULL; - guint64 _tmp0_; - guint64 _tmp1_; #line 48 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = flags; -#line 48 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = selector; -#line 48 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - result = _tmp0_ & (~_tmp1_); + result = flags & (~selector); #line 48 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 1804 "MediaDataRepresentation.c" +#line 2136 "MediaDataRepresentation.c" } -inline gboolean media_source_internal_is_flag_set (guint64 flags, guint64 selector) { +inline gboolean +media_source_internal_is_flag_set (guint64 flags, + guint64 selector) +{ gboolean result = FALSE; - guint64 _tmp0_; - guint64 _tmp1_; -#line 52 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = flags; -#line 52 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = selector; #line 52 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - result = (_tmp0_ & _tmp1_) != ((guint64) 0); + result = (flags & selector) != ((guint64) 0); #line 52 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 1820 "MediaDataRepresentation.c" +#line 2149 "MediaDataRepresentation.c" } -static void media_source_real_notify_master_replaced (MediaSource* self, GFile* old_file, GFile* new_file) { - GFile* _tmp0_; - GFile* _tmp1_; +static void +media_source_real_notify_master_replaced (MediaSource* self, + GFile* old_file, + GFile* new_file) +{ #line 55 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_IS_FILE (old_file)); #line 55 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_IS_FILE (new_file)); #line 56 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = old_file; -#line 56 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = new_file; -#line 56 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_emit (self, media_source_signals[MEDIA_SOURCE_MASTER_REPLACED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 1837 "MediaDataRepresentation.c" + g_signal_emit (self, media_source_signals[MEDIA_SOURCE_MASTER_REPLACED_SIGNAL], 0, old_file, new_file); +#line 2164 "MediaDataRepresentation.c" } -void media_source_notify_master_replaced (MediaSource* self, GFile* old_file, GFile* new_file) { +void +media_source_notify_master_replaced (MediaSource* self, + GFile* old_file, + GFile* new_file) +{ #line 55 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 55 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->notify_master_replaced (self, old_file, new_file); -#line 1846 "MediaDataRepresentation.c" +#line 2177 "MediaDataRepresentation.c" } -static gpointer _alteration_ref0 (gpointer self) { +static gpointer +_alteration_ref0 (gpointer self) +{ #line 60 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? alteration_ref (self) : NULL; -#line 1853 "MediaDataRepresentation.c" +#line 2186 "MediaDataRepresentation.c" } -static void media_source_real_notify_altered (DataObject* base, Alteration* alteration) { +static void +media_source_real_notify_altered (DataObject* base, + Alteration* alteration) +{ MediaSource * self; Alteration* local = NULL; Alteration* _tmp0_; - Alteration* _tmp1_; + gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; - Alteration* _tmp4_; - gboolean _tmp5_; - Alteration* _tmp14_; + Alteration* _tmp3_; + Alteration* _tmp10_; #line 59 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE, MediaSource); #line 59 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_ALTERATION (alteration)); #line 60 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = alteration; -#line 60 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = _alteration_ref0 (_tmp0_); + _tmp0_ = _alteration_ref0 (alteration); #line 60 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - local = _tmp1_; + local = _tmp0_; #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = local; + _tmp3_ = local; #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = alteration_has_detail (_tmp4_, "metadata", "name"); -#line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp5_) { + if (alteration_has_detail (_tmp3_, "metadata", "name")) { #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = TRUE; -#line 1885 "MediaDataRepresentation.c" + _tmp2_ = TRUE; +#line 2215 "MediaDataRepresentation.c" } else { - Alteration* _tmp6_; - gboolean _tmp7_; -#line 63 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = local; + Alteration* _tmp4_; #line 63 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = alteration_has_detail (_tmp6_, "metadata", "comment"); + _tmp4_ = local; #line 63 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = _tmp7_; -#line 1895 "MediaDataRepresentation.c" + _tmp2_ = alteration_has_detail (_tmp4_, "metadata", "comment"); +#line 2222 "MediaDataRepresentation.c" } #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp3_) { + if (_tmp2_) { #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = TRUE; -#line 1901 "MediaDataRepresentation.c" + _tmp1_ = TRUE; +#line 2228 "MediaDataRepresentation.c" } else { - Alteration* _tmp8_; - gboolean _tmp9_; -#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = local; + Alteration* _tmp5_; #line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp9_ = alteration_has_detail (_tmp8_, "backing", "master"); + _tmp5_ = local; #line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = _tmp9_; -#line 1911 "MediaDataRepresentation.c" + _tmp1_ = alteration_has_detail (_tmp5_, "backing", "master"); +#line 2235 "MediaDataRepresentation.c" } #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp2_) { -#line 1915 "MediaDataRepresentation.c" - Alteration* _tmp10_; - Alteration* _tmp11_; - Alteration* _tmp12_; - Alteration* _tmp13_; + if (_tmp1_) { +#line 2239 "MediaDataRepresentation.c" + Alteration* _tmp6_; + Alteration* _tmp7_; + Alteration* _tmp8_; + Alteration* _tmp9_; #line 65 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_update_indexable_keywords (self); #line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp10_ = local; + _tmp6_ = local; #line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp11_ = alteration_new ("indexable", "keywords"); + _tmp7_ = alteration_new ("indexable", "keywords"); #line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp13_ = alteration_compress (_tmp10_, _tmp12_); + _tmp9_ = alteration_compress (_tmp6_, _tmp8_); #line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _alteration_unref0 (local); #line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - local = _tmp13_; + local = _tmp9_; #line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _alteration_unref0 (_tmp12_); -#line 1936 "MediaDataRepresentation.c" + _alteration_unref0 (_tmp8_); +#line 2260 "MediaDataRepresentation.c" } #line 69 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp14_ = local; + _tmp10_ = local; #line 69 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - DATA_OBJECT_CLASS (media_source_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_OBJECT, DataObject), _tmp14_); + DATA_OBJECT_CLASS (media_source_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_OBJECT, DataObject), _tmp10_); #line 59 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _alteration_unref0 (local); -#line 1944 "MediaDataRepresentation.c" +#line 2268 "MediaDataRepresentation.c" } -static void media_source_real_notify_membership_changed (DataObject* base, DataCollection* collection) { +static void +media_source_real_notify_membership_changed (DataObject* base, + DataCollection* collection) +{ MediaSource * self; gboolean _tmp0_ = FALSE; - DataCollection* _tmp1_; - DataCollection* _tmp3_; #line 74 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE, MediaSource); #line 74 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((collection == NULL) || IS_DATA_COLLECTION (collection)); #line 75 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = collection; -#line 75 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp1_ != NULL) { -#line 1961 "MediaDataRepresentation.c" - const gchar* _tmp2_; + if (collection != NULL) { +#line 2284 "MediaDataRepresentation.c" + const gchar* _tmp1_; #line 75 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = self->priv->indexable_keywords; + _tmp1_ = self->priv->indexable_keywords; #line 75 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = _tmp2_ == NULL; -#line 1967 "MediaDataRepresentation.c" + _tmp0_ = _tmp1_ == NULL; +#line 2290 "MediaDataRepresentation.c" } else { #line 75 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = FALSE; -#line 1971 "MediaDataRepresentation.c" +#line 2294 "MediaDataRepresentation.c" } #line 75 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp0_) { #line 78 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_update_indexable_keywords (self); -#line 1977 "MediaDataRepresentation.c" +#line 2300 "MediaDataRepresentation.c" } #line 81 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = collection; -#line 81 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - DATA_OBJECT_CLASS (media_source_parent_class)->notify_membership_changed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_OBJECT, DataObject), _tmp3_); -#line 1983 "MediaDataRepresentation.c" + DATA_OBJECT_CLASS (media_source_parent_class)->notify_membership_changed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_OBJECT, DataObject), collection); +#line 2304 "MediaDataRepresentation.c" } -static void media_source_update_indexable_keywords (MediaSource* self) { +static void +media_source_update_indexable_keywords (MediaSource* self) +{ gchar** indexables = NULL; gchar** _tmp0_; gint indexables_length1; @@ -2037,11 +2360,13 @@ static void media_source_update_indexable_keywords (MediaSource* self) { self->priv->indexable_keywords = _tmp7_; #line 84 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" indexables = (_vala_array_free (indexables, indexables_length1, (GDestroyNotify) g_free), NULL); -#line 2041 "MediaDataRepresentation.c" +#line 2364 "MediaDataRepresentation.c" } -static const gchar* media_source_real_get_indexable_keywords (Indexable* base) { +static const gchar* +media_source_real_get_indexable_keywords (Indexable* base) +{ MediaSource * self; const gchar* result = NULL; const gchar* _tmp0_; @@ -2053,46 +2378,55 @@ static const gchar* media_source_real_get_indexable_keywords (Indexable* base) { result = _tmp0_; #line 94 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2057 "MediaDataRepresentation.c" +#line 2382 "MediaDataRepresentation.c" } -static gboolean media_source_real_set_event_id (MediaSource* self, EventID* id) { +static gboolean +media_source_real_set_event_id (MediaSource* self, + EventID* id) +{ gboolean _tmp0_ = FALSE; #line 97 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_set_event_id'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 97 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2067 "MediaDataRepresentation.c" +#line 2395 "MediaDataRepresentation.c" } -gboolean media_source_set_event_id (MediaSource* self, EventID* id) { +gboolean +media_source_set_event_id (MediaSource* self, + EventID* id) +{ #line 97 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); #line 97 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->set_event_id (self, id); -#line 2076 "MediaDataRepresentation.c" +#line 2407 "MediaDataRepresentation.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? g_object_ref (self) : NULL; -#line 2083 "MediaDataRepresentation.c" +#line 2416 "MediaDataRepresentation.c" } -gboolean media_source_delete_original_file (MediaSource* self) { +gboolean +media_source_delete_original_file (MediaSource* self) +{ gboolean result = FALSE; gboolean ret = FALSE; GFile* file = NULL; GFile* _tmp0_; + GFile* _tmp9_; GFile* _tmp10_; GFile* _tmp11_; - GFile* _tmp12_; - gboolean _tmp13_; - gboolean _tmp14_; + gboolean _tmp12_; GError * _inner_error_ = NULL; #line 99 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); @@ -2102,63 +2436,60 @@ gboolean media_source_delete_original_file (MediaSource* self) { _tmp0_ = media_source_get_master_file (self); #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" file = _tmp0_; -#line 2106 "MediaDataRepresentation.c" +#line 2440 "MediaDataRepresentation.c" { gboolean _tmp1_ = FALSE; GFile* _tmp2_; - gboolean _tmp3_; #line 104 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = file; #line 104 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = g_file_trash (_tmp2_, NULL, &_inner_error_); -#line 104 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = _tmp3_; + _tmp1_ = g_file_trash (_tmp2_, NULL, &_inner_error_); #line 104 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2119 "MediaDataRepresentation.c" +#line 2450 "MediaDataRepresentation.c" goto __catch571_g_error; } #line 104 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ret = _tmp1_; -#line 2124 "MediaDataRepresentation.c" +#line 2455 "MediaDataRepresentation.c" } goto __finally571; __catch571_g_error: { GError* err = NULL; - GFile* _tmp4_; + GFile* _tmp3_; + gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; - GError* _tmp7_; - const gchar* _tmp8_; + GError* _tmp6_; + const gchar* _tmp7_; #line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" err = _inner_error_; #line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _inner_error_ = NULL; #line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = file; + _tmp3_ = file; #line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = g_file_get_path (_tmp4_); + _tmp4_ = g_file_get_path (_tmp3_); #line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = err; + _tmp6_ = err; #line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = _tmp7_->message; + _tmp7_ = _tmp6_->message; #line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_message ("MediaDataRepresentation.vala:108: Unable to move original photo %s to " \ -"trash: %s", _tmp6_, _tmp8_); +"trash: %s", _tmp5_, _tmp7_); #line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_error_free0 (err); -#line 2155 "MediaDataRepresentation.c" +#line 2486 "MediaDataRepresentation.c" } __finally571: #line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2160 "MediaDataRepresentation.c" - gboolean _tmp9_ = FALSE; +#line 2491 "MediaDataRepresentation.c" + gboolean _tmp8_ = FALSE; #line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (file); #line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2166,163 +2497,152 @@ gboolean media_source_delete_original_file (MediaSource* self) { #line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_clear_error (&_inner_error_); #line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - return _tmp9_; -#line 2170 "MediaDataRepresentation.c" + return _tmp8_; +#line 2501 "MediaDataRepresentation.c" } #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp10_ = file; + _tmp9_ = file; #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp11_ = app_dirs_get_import_dir (); + _tmp10_ = app_dirs_get_import_dir (); #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp13_ = g_file_has_prefix (_tmp10_, _tmp12_); + _tmp12_ = g_file_has_prefix (_tmp9_, _tmp11_); #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp14_ = _tmp13_; + _g_object_unref0 (_tmp11_); #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp12_); -#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp14_) { -#line 2186 "MediaDataRepresentation.c" + if (_tmp12_) { +#line 2515 "MediaDataRepresentation.c" GFile* parent = NULL; - GFile* _tmp15_; - GFile* _tmp16_; + GFile* _tmp13_; + GFile* _tmp14_; #line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp15_ = file; + _tmp13_ = file; #line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp16_ = _g_object_ref0 (_tmp15_); + _tmp14_ = _g_object_ref0 (_tmp13_); #line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - parent = _tmp16_; + parent = _tmp14_; #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 2198 "MediaDataRepresentation.c" +#line 2527 "MediaDataRepresentation.c" + GFile* _tmp15_; + GFile* _tmp16_; GFile* _tmp17_; - GFile* _tmp18_; + gboolean _tmp18_; GFile* _tmp19_; - gboolean _tmp20_; - gboolean _tmp21_; + GFile* _tmp20_; + gboolean _tmp21_ = FALSE; GFile* _tmp22_; - GFile* _tmp23_; - gboolean _tmp24_ = FALSE; - GFile* _tmp25_; #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp17_ = parent; + _tmp15_ = parent; #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp18_ = app_dirs_get_import_dir (); + _tmp16_ = app_dirs_get_import_dir (); #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp19_ = _tmp18_; + _tmp17_ = _tmp16_; #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp20_ = g_file_equal (_tmp17_, _tmp19_); + _tmp18_ = !(!g_file_equal (_tmp15_, _tmp17_)); #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp21_ = !(!_tmp20_); + _g_object_unref0 (_tmp17_); #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp19_); -#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp21_) { + if (_tmp18_) { #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 2224 "MediaDataRepresentation.c" +#line 2550 "MediaDataRepresentation.c" } #line 116 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp22_ = parent; + _tmp19_ = parent; #line 116 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp23_ = g_file_get_parent (_tmp22_); + _tmp20_ = g_file_get_parent (_tmp19_); #line 116 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (parent); #line 116 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - parent = _tmp23_; + parent = _tmp20_; #line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp25_ = parent; + _tmp22_ = parent; #line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp25_ == NULL) { + if (_tmp22_ == NULL) { #line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp24_ = TRUE; -#line 2240 "MediaDataRepresentation.c" + _tmp21_ = TRUE; +#line 2566 "MediaDataRepresentation.c" } else { - GFile* _tmp26_; - GFile* _tmp27_; - GFile* _tmp28_; - gboolean _tmp29_; + GFile* _tmp23_; + GFile* _tmp24_; + GFile* _tmp25_; #line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp26_ = parent; + _tmp23_ = parent; #line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp27_ = app_dirs_get_import_dir (); + _tmp24_ = app_dirs_get_import_dir (); #line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp28_ = _tmp27_; + _tmp25_ = _tmp24_; #line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp29_ = g_file_equal (_tmp26_, _tmp28_); + _tmp21_ = g_file_equal (_tmp23_, _tmp25_); #line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp24_ = _tmp29_; -#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp28_); -#line 2258 "MediaDataRepresentation.c" + _g_object_unref0 (_tmp25_); +#line 2581 "MediaDataRepresentation.c" } #line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp24_) { + if (_tmp21_) { #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 2264 "MediaDataRepresentation.c" +#line 2587 "MediaDataRepresentation.c" } { - gboolean _tmp30_ = FALSE; - GFile* _tmp31_; - gboolean _tmp32_; -#line 121 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp31_ = parent; + gboolean _tmp26_ = FALSE; + GFile* _tmp27_; #line 121 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp32_ = query_is_directory_empty (_tmp31_, &_inner_error_); + _tmp27_ = parent; #line 121 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp30_ = _tmp32_; + _tmp26_ = query_is_directory_empty (_tmp27_, &_inner_error_); #line 121 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2278 "MediaDataRepresentation.c" +#line 2598 "MediaDataRepresentation.c" goto __catch572_g_error; } #line 121 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp30_) { + if (!_tmp26_) { #line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 2285 "MediaDataRepresentation.c" +#line 2605 "MediaDataRepresentation.c" } } goto __finally572; __catch572_g_error: { GError* err = NULL; - GFile* _tmp33_; - gchar* _tmp34_; - gchar* _tmp35_; - GError* _tmp36_; - const gchar* _tmp37_; + GFile* _tmp28_; + gchar* _tmp29_; + gchar* _tmp30_; + GError* _tmp31_; + const gchar* _tmp32_; #line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" err = _inner_error_; #line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _inner_error_ = NULL; #line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp33_ = parent; + _tmp28_ = parent; #line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp34_ = g_file_get_path (_tmp33_); + _tmp29_ = g_file_get_path (_tmp28_); #line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp35_ = _tmp34_; + _tmp30_ = _tmp29_; #line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp36_ = err; + _tmp31_ = err; #line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp37_ = _tmp36_->message; + _tmp32_ = _tmp31_->message; #line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_warning ("MediaDataRepresentation.vala:124: Unable to query file info for %s: %s", _tmp35_, _tmp37_); + g_warning ("MediaDataRepresentation.vala:124: Unable to query file info for %s: %s", _tmp30_, _tmp32_); #line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_free0 (_tmp35_); + _g_free0 (_tmp30_); #line 126 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_error_free0 (err); #line 126 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 2319 "MediaDataRepresentation.c" +#line 2639 "MediaDataRepresentation.c" } __finally572: #line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2324 "MediaDataRepresentation.c" - gboolean _tmp38_ = FALSE; +#line 2644 "MediaDataRepresentation.c" + gboolean _tmp33_ = FALSE; #line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (parent); #line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2332,72 +2652,72 @@ gboolean media_source_delete_original_file (MediaSource* self) { #line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_clear_error (&_inner_error_); #line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - return _tmp38_; -#line 2336 "MediaDataRepresentation.c" + return _tmp33_; +#line 2656 "MediaDataRepresentation.c" } { - GFile* _tmp39_; - GFile* _tmp40_; - gchar* _tmp41_; - gchar* _tmp42_; + GFile* _tmp34_; + GFile* _tmp35_; + gchar* _tmp36_; + gchar* _tmp37_; #line 130 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp39_ = parent; + _tmp34_ = parent; #line 130 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_file_delete (_tmp39_, NULL, &_inner_error_); + g_file_delete (_tmp34_, NULL, &_inner_error_); #line 130 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2349 "MediaDataRepresentation.c" +#line 2669 "MediaDataRepresentation.c" goto __catch573_g_error; } #line 131 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp40_ = parent; + _tmp35_ = parent; #line 131 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp41_ = g_file_get_path (_tmp40_); + _tmp36_ = g_file_get_path (_tmp35_); #line 131 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp42_ = _tmp41_; + _tmp37_ = _tmp36_; #line 131 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_debug ("MediaDataRepresentation.vala:131: Deleted empty directory %s", _tmp42_); + g_debug ("MediaDataRepresentation.vala:131: Deleted empty directory %s", _tmp37_); #line 131 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_free0 (_tmp42_); -#line 2362 "MediaDataRepresentation.c" + _g_free0 (_tmp37_); +#line 2682 "MediaDataRepresentation.c" } goto __finally573; __catch573_g_error: { GError* err = NULL; - GFile* _tmp43_; - gchar* _tmp44_; - gchar* _tmp45_; - GError* _tmp46_; - const gchar* _tmp47_; + GFile* _tmp38_; + gchar* _tmp39_; + gchar* _tmp40_; + GError* _tmp41_; + const gchar* _tmp42_; #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" err = _inner_error_; #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _inner_error_ = NULL; #line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp43_ = parent; + _tmp38_ = parent; #line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp44_ = g_file_get_path (_tmp43_); + _tmp39_ = g_file_get_path (_tmp38_); #line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp45_ = _tmp44_; + _tmp40_ = _tmp39_; #line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp46_ = err; + _tmp41_ = err; #line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp47_ = _tmp46_->message; + _tmp42_ = _tmp41_->message; #line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_message ("MediaDataRepresentation.vala:134: Unable to delete empty directory %s:" \ -" %s", _tmp45_, _tmp47_); +" %s", _tmp40_, _tmp42_); #line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_free0 (_tmp45_); + _g_free0 (_tmp40_); #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_error_free0 (err); -#line 2393 "MediaDataRepresentation.c" +#line 2713 "MediaDataRepresentation.c" } __finally573: #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2398 "MediaDataRepresentation.c" - gboolean _tmp48_ = FALSE; +#line 2718 "MediaDataRepresentation.c" + gboolean _tmp43_ = FALSE; #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (parent); #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2407,13 +2727,13 @@ gboolean media_source_delete_original_file (MediaSource* self) { #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_clear_error (&_inner_error_); #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - return _tmp48_; -#line 2410 "MediaDataRepresentation.c" + return _tmp43_; +#line 2730 "MediaDataRepresentation.c" } } #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (parent); -#line 2415 "MediaDataRepresentation.c" +#line 2735 "MediaDataRepresentation.c" } #line 140 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = ret; @@ -2421,18 +2741,19 @@ gboolean media_source_delete_original_file (MediaSource* self) { _g_object_unref0 (file); #line 140 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2423 "MediaDataRepresentation.c" +#line 2743 "MediaDataRepresentation.c" } -static gchar* media_source_real_get_name (DataObject* base) { +static gchar* +media_source_real_get_name (DataObject* base) +{ MediaSource * self; gchar* result = NULL; gchar* title = NULL; gchar* _tmp0_; gchar* _tmp1_ = NULL; const gchar* _tmp2_; - gboolean _tmp3_; #line 143 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE, MediaSource); #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2442,30 +2763,28 @@ static gchar* media_source_real_get_name (DataObject* base) { #line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = title; #line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = is_string_empty (_tmp2_); + if (is_string_empty (_tmp2_)) { +#line 2766 "MediaDataRepresentation.c" + gchar* _tmp3_; #line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp3_) { -#line 2447 "MediaDataRepresentation.c" - gchar* _tmp4_; -#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = media_source_get_basename (self); + _tmp3_ = media_source_get_basename (self); #line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (_tmp1_); #line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = _tmp4_; -#line 2455 "MediaDataRepresentation.c" + _tmp1_ = _tmp3_; +#line 2774 "MediaDataRepresentation.c" } else { - const gchar* _tmp5_; - gchar* _tmp6_; + const gchar* _tmp4_; + gchar* _tmp5_; #line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = title; + _tmp4_ = title; #line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = g_strdup (_tmp5_); + _tmp5_ = g_strdup (_tmp4_); #line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (_tmp1_); #line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = _tmp6_; -#line 2467 "MediaDataRepresentation.c" + _tmp1_ = _tmp5_; +#line 2786 "MediaDataRepresentation.c" } #line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp1_; @@ -2473,11 +2792,13 @@ static gchar* media_source_real_get_name (DataObject* base) { _g_free0 (title); #line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2475 "MediaDataRepresentation.c" +#line 2794 "MediaDataRepresentation.c" } -static gchar* media_source_real_get_basename (MediaSource* self) { +static gchar* +media_source_real_get_basename (MediaSource* self) +{ gchar* result = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -2497,507 +2818,622 @@ static gchar* media_source_real_get_basename (MediaSource* self) { result = _tmp3_; #line 150 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2499 "MediaDataRepresentation.c" +#line 2820 "MediaDataRepresentation.c" } -gchar* media_source_get_basename (MediaSource* self) { +gchar* +media_source_get_basename (MediaSource* self) +{ #line 149 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 149 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_basename (self); -#line 2508 "MediaDataRepresentation.c" +#line 2831 "MediaDataRepresentation.c" } -static GFile* media_source_real_get_file (MediaSource* self) { +static GFile* +media_source_real_get_file (MediaSource* self) +{ #line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_get_file'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2517 "MediaDataRepresentation.c" +#line 2842 "MediaDataRepresentation.c" } -GFile* media_source_get_file (MediaSource* self) { +GFile* +media_source_get_file (MediaSource* self) +{ #line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_file (self); -#line 2526 "MediaDataRepresentation.c" +#line 2853 "MediaDataRepresentation.c" } -static GFile* media_source_real_get_master_file (MediaSource* self) { +static GFile* +media_source_real_get_master_file (MediaSource* self) +{ #line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_get_master_file'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2535 "MediaDataRepresentation.c" +#line 2864 "MediaDataRepresentation.c" } -GFile* media_source_get_master_file (MediaSource* self) { +GFile* +media_source_get_master_file (MediaSource* self) +{ #line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_master_file (self); -#line 2544 "MediaDataRepresentation.c" +#line 2875 "MediaDataRepresentation.c" } -static guint64 media_source_real_get_master_filesize (MediaSource* self) { +static guint64 +media_source_real_get_master_filesize (MediaSource* self) +{ guint64 _tmp0_ = 0ULL; #line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_get_master_filesize'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2554 "MediaDataRepresentation.c" +#line 2887 "MediaDataRepresentation.c" } -guint64 media_source_get_master_filesize (MediaSource* self) { +guint64 +media_source_get_master_filesize (MediaSource* self) +{ #line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0ULL); #line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_master_filesize (self); -#line 2563 "MediaDataRepresentation.c" +#line 2898 "MediaDataRepresentation.c" } -static guint64 media_source_real_get_filesize (MediaSource* self) { +static guint64 +media_source_real_get_filesize (MediaSource* self) +{ guint64 _tmp0_ = 0ULL; #line 156 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_get_filesize'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 156 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2573 "MediaDataRepresentation.c" +#line 2910 "MediaDataRepresentation.c" } -guint64 media_source_get_filesize (MediaSource* self) { +guint64 +media_source_get_filesize (MediaSource* self) +{ #line 156 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0ULL); #line 156 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_filesize (self); -#line 2582 "MediaDataRepresentation.c" +#line 2921 "MediaDataRepresentation.c" } -static time_t media_source_real_get_timestamp (MediaSource* self) { +static time_t +media_source_real_get_timestamp (MediaSource* self) +{ time_t _tmp0_ = 0; #line 157 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_get_timestamp'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 157 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2592 "MediaDataRepresentation.c" +#line 2933 "MediaDataRepresentation.c" } -time_t media_source_get_timestamp (MediaSource* self) { +time_t +media_source_get_timestamp (MediaSource* self) +{ #line 157 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0); #line 157 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_timestamp (self); -#line 2601 "MediaDataRepresentation.c" +#line 2944 "MediaDataRepresentation.c" } -static BackingFileState** media_source_real_get_backing_files_state (MediaSource* self, int* result_length1) { +static BackingFileState** +media_source_real_get_backing_files_state (MediaSource* self, + int* result_length1) +{ #line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_get_backing_files_state'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2610 "MediaDataRepresentation.c" +#line 2956 "MediaDataRepresentation.c" } -BackingFileState** media_source_get_backing_files_state (MediaSource* self, int* result_length1) { +BackingFileState** +media_source_get_backing_files_state (MediaSource* self, + int* result_length1) +{ #line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_backing_files_state (self, result_length1); -#line 2619 "MediaDataRepresentation.c" +#line 2968 "MediaDataRepresentation.c" } -static gchar* media_source_real_get_title (MediaSource* self) { +static gchar* +media_source_real_get_title (MediaSource* self) +{ #line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_get_title'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2628 "MediaDataRepresentation.c" +#line 2979 "MediaDataRepresentation.c" } -gchar* media_source_get_title (MediaSource* self) { +gchar* +media_source_get_title (MediaSource* self) +{ #line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_title (self); -#line 2637 "MediaDataRepresentation.c" +#line 2990 "MediaDataRepresentation.c" } -static gchar* media_source_real_get_comment (MediaSource* self) { +static gchar* +media_source_real_get_comment (MediaSource* self) +{ #line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_get_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2646 "MediaDataRepresentation.c" +#line 3001 "MediaDataRepresentation.c" } -gchar* media_source_get_comment (MediaSource* self) { +gchar* +media_source_get_comment (MediaSource* self) +{ #line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_comment (self); -#line 2655 "MediaDataRepresentation.c" +#line 3012 "MediaDataRepresentation.c" } -static void media_source_real_set_title (MediaSource* self, const gchar* title) { +static void +media_source_real_set_title (MediaSource* self, + const gchar* title) +{ #line 164 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_set_title'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 164 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2664 "MediaDataRepresentation.c" +#line 3024 "MediaDataRepresentation.c" } -void media_source_set_title (MediaSource* self, const gchar* title) { +void +media_source_set_title (MediaSource* self, + const gchar* title) +{ #line 164 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 164 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->set_title (self, title); -#line 2673 "MediaDataRepresentation.c" +#line 3036 "MediaDataRepresentation.c" } -static gboolean media_source_real_set_comment (MediaSource* self, const gchar* comment) { +static gboolean +media_source_real_set_comment (MediaSource* self, + const gchar* comment) +{ gboolean _tmp0_ = FALSE; #line 165 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_set_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 165 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2683 "MediaDataRepresentation.c" +#line 3049 "MediaDataRepresentation.c" } -gboolean media_source_set_comment (MediaSource* self, const gchar* comment) { +gboolean +media_source_set_comment (MediaSource* self, + const gchar* comment) +{ #line 165 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); #line 165 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->set_comment (self, comment); -#line 2692 "MediaDataRepresentation.c" +#line 3061 "MediaDataRepresentation.c" } -gchar* media_source_prep_title (const gchar* title) { +gchar* +media_source_prep_title (const gchar* title) +{ gchar* result = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; -#line 168 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = title; + gchar* _tmp0_; #line 168 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = prepare_input_text (_tmp0_, PREPARE_INPUT_TEXT_OPTIONS_DEFAULT & (~PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL), DEFAULT_USER_TEXT_INPUT_LENGTH); + _tmp0_ = prepare_input_text (title, PREPARE_INPUT_TEXT_OPTIONS_DEFAULT & (~PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL), DEFAULT_USER_TEXT_INPUT_LENGTH); #line 168 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - result = _tmp1_; + result = _tmp0_; #line 168 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2708 "MediaDataRepresentation.c" +#line 3076 "MediaDataRepresentation.c" } -gchar* media_source_prep_comment (const gchar* comment) { +gchar* +media_source_prep_comment (const gchar* comment) +{ gchar* result = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; -#line 173 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = comment; + gchar* _tmp0_; #line 173 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = prepare_input_text (_tmp0_, (PREPARE_INPUT_TEXT_OPTIONS_DEFAULT & (~PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF)) & (~PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL), -1); + _tmp0_ = prepare_input_text (comment, (PREPARE_INPUT_TEXT_OPTIONS_DEFAULT & (~PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF)) & (~PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL), -1); #line 173 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - result = _tmp1_; + result = _tmp0_; #line 173 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2724 "MediaDataRepresentation.c" +#line 3091 "MediaDataRepresentation.c" } -static Rating media_source_real_get_rating (MediaSource* self) { +static Rating +media_source_real_get_rating (MediaSource* self) +{ #line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_get_rating'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return 0; -#line 2733 "MediaDataRepresentation.c" +#line 3102 "MediaDataRepresentation.c" } -Rating media_source_get_rating (MediaSource* self) { +Rating +media_source_get_rating (MediaSource* self) +{ #line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0); #line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_rating (self); -#line 2742 "MediaDataRepresentation.c" +#line 3113 "MediaDataRepresentation.c" } -static void media_source_real_set_rating (MediaSource* self, Rating rating) { +static void +media_source_real_set_rating (MediaSource* self, + Rating rating) +{ #line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_set_rating'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2751 "MediaDataRepresentation.c" +#line 3125 "MediaDataRepresentation.c" } -void media_source_set_rating (MediaSource* self, Rating rating) { +void +media_source_set_rating (MediaSource* self, + Rating rating) +{ #line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->set_rating (self, rating); -#line 2760 "MediaDataRepresentation.c" +#line 3137 "MediaDataRepresentation.c" } -static void media_source_real_increase_rating (MediaSource* self) { +static void +media_source_real_increase_rating (MediaSource* self) +{ #line 179 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_increase_rating'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 179 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2769 "MediaDataRepresentation.c" +#line 3148 "MediaDataRepresentation.c" } -void media_source_increase_rating (MediaSource* self) { +void +media_source_increase_rating (MediaSource* self) +{ #line 179 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 179 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->increase_rating (self); -#line 2778 "MediaDataRepresentation.c" +#line 3159 "MediaDataRepresentation.c" } -static void media_source_real_decrease_rating (MediaSource* self) { +static void +media_source_real_decrease_rating (MediaSource* self) +{ #line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_decrease_rating'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2787 "MediaDataRepresentation.c" +#line 3170 "MediaDataRepresentation.c" } -void media_source_decrease_rating (MediaSource* self) { +void +media_source_decrease_rating (MediaSource* self) +{ #line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->decrease_rating (self); -#line 2796 "MediaDataRepresentation.c" +#line 3181 "MediaDataRepresentation.c" } -static void media_source_real_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result) { +static void +media_source_real_get_dimensions (MediaSource* self, + PhotoException disallowed_steps, + Dimensions* result) +{ #line 182 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_get_dimensions'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 182 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2805 "MediaDataRepresentation.c" +#line 3194 "MediaDataRepresentation.c" } -void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result) { +void +media_source_get_dimensions (MediaSource* self, + PhotoException disallowed_steps, + Dimensions* result) +{ #line 182 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 182 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->get_dimensions (self, disallowed_steps, result); -#line 2814 "MediaDataRepresentation.c" +#line 3207 "MediaDataRepresentation.c" } -static GdkPixbuf* media_source_real_get_preview_pixbuf (MediaSource* self, Scaling* scaling, GError** error) { +static GdkPixbuf* +media_source_real_get_preview_pixbuf (MediaSource* self, + Scaling* scaling, + GError** error) +{ #line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_get_preview_pixbuf'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2823 "MediaDataRepresentation.c" +#line 3220 "MediaDataRepresentation.c" } -GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, Scaling* scaling, GError** error) { +GdkPixbuf* +media_source_get_preview_pixbuf (MediaSource* self, + Scaling* scaling, + GError** error) +{ #line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_preview_pixbuf (self, scaling, error); -#line 2832 "MediaDataRepresentation.c" +#line 3233 "MediaDataRepresentation.c" } -static gboolean media_source_real_is_trashed (MediaSource* self) { +static gboolean +media_source_real_is_trashed (MediaSource* self) +{ gboolean _tmp0_ = FALSE; #line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_is_trashed'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2842 "MediaDataRepresentation.c" +#line 3245 "MediaDataRepresentation.c" } -gboolean media_source_is_trashed (MediaSource* self) { +gboolean +media_source_is_trashed (MediaSource* self) +{ #line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); #line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->is_trashed (self); -#line 2851 "MediaDataRepresentation.c" +#line 3256 "MediaDataRepresentation.c" } -static void media_source_real_trash (MediaSource* self) { +static void +media_source_real_trash (MediaSource* self) +{ #line 193 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_trash'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 193 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2860 "MediaDataRepresentation.c" +#line 3267 "MediaDataRepresentation.c" } -void media_source_trash (MediaSource* self) { +void +media_source_trash (MediaSource* self) +{ #line 193 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 193 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->trash (self); -#line 2869 "MediaDataRepresentation.c" +#line 3278 "MediaDataRepresentation.c" } -static void media_source_real_untrash (MediaSource* self) { +static void +media_source_real_untrash (MediaSource* self) +{ #line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_untrash'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2878 "MediaDataRepresentation.c" +#line 3289 "MediaDataRepresentation.c" } -void media_source_untrash (MediaSource* self) { +void +media_source_untrash (MediaSource* self) +{ #line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->untrash (self); -#line 2887 "MediaDataRepresentation.c" +#line 3300 "MediaDataRepresentation.c" } -static gboolean media_source_real_is_offline (MediaSource* self) { +static gboolean +media_source_real_is_offline (MediaSource* self) +{ gboolean _tmp0_ = FALSE; #line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_is_offline'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2897 "MediaDataRepresentation.c" +#line 3312 "MediaDataRepresentation.c" } -gboolean media_source_is_offline (MediaSource* self) { +gboolean +media_source_is_offline (MediaSource* self) +{ #line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); #line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->is_offline (self); -#line 2906 "MediaDataRepresentation.c" +#line 3323 "MediaDataRepresentation.c" } -static void media_source_real_mark_offline (MediaSource* self) { +static void +media_source_real_mark_offline (MediaSource* self) +{ #line 197 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_mark_offline'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 197 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2915 "MediaDataRepresentation.c" +#line 3334 "MediaDataRepresentation.c" } -void media_source_mark_offline (MediaSource* self) { +void +media_source_mark_offline (MediaSource* self) +{ #line 197 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 197 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->mark_offline (self); -#line 2924 "MediaDataRepresentation.c" +#line 3345 "MediaDataRepresentation.c" } -static void media_source_real_mark_online (MediaSource* self) { +static void +media_source_real_mark_online (MediaSource* self) +{ #line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_mark_online'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2933 "MediaDataRepresentation.c" +#line 3356 "MediaDataRepresentation.c" } -void media_source_mark_online (MediaSource* self) { +void +media_source_mark_online (MediaSource* self) +{ #line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->mark_online (self); -#line 2942 "MediaDataRepresentation.c" +#line 3367 "MediaDataRepresentation.c" } -static gchar* media_source_real_get_master_md5 (MediaSource* self) { +static gchar* +media_source_real_get_master_md5 (MediaSource* self) +{ #line 200 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_get_master_md5'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 200 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2951 "MediaDataRepresentation.c" +#line 3378 "MediaDataRepresentation.c" } -gchar* media_source_get_master_md5 (MediaSource* self) { +gchar* +media_source_get_master_md5 (MediaSource* self) +{ #line 200 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 200 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_master_md5 (self); -#line 2960 "MediaDataRepresentation.c" +#line 3389 "MediaDataRepresentation.c" } -static void media_source_real_get_event_id (MediaSource* self, EventID* result) { +static void +media_source_real_get_event_id (MediaSource* self, + EventID* result) +{ #line 204 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_get_event_id'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 204 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2969 "MediaDataRepresentation.c" +#line 3401 "MediaDataRepresentation.c" } -void media_source_get_event_id (MediaSource* self, EventID* result) { +void +media_source_get_event_id (MediaSource* self, + EventID* result) +{ #line 204 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 204 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->get_event_id (self, result); -#line 2978 "MediaDataRepresentation.c" +#line 3413 "MediaDataRepresentation.c" } -Event* media_source_get_event (MediaSource* self) { +Event* +media_source_get_event (MediaSource* self) +{ Event* result = NULL; Event* _tmp0_; EventID event_id = {0}; EventID _tmp3_ = {0}; - gboolean _tmp4_; - EventSourceCollection* _tmp5_; - EventID _tmp6_; + EventSourceCollection* _tmp4_; + EventID _tmp5_; + Event* _tmp6_; Event* _tmp7_; Event* _tmp8_; - Event* _tmp9_; #line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 207 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->event; #line 207 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp0_ != NULL) { -#line 2999 "MediaDataRepresentation.c" +#line 3435 "MediaDataRepresentation.c" Event* _tmp1_; Event* _tmp2_; #line 208 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3008,174 +3444,157 @@ Event* media_source_get_event (MediaSource* self) { result = _tmp2_; #line 208 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3010 "MediaDataRepresentation.c" +#line 3446 "MediaDataRepresentation.c" } #line 210 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_get_event_id (self, &_tmp3_); #line 210 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_id = _tmp3_; #line 211 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = event_id_is_valid (&event_id); -#line 211 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp4_) { + if (!event_id_is_valid (&event_id)) { #line 212 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = NULL; #line 212 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3024 "MediaDataRepresentation.c" +#line 3458 "MediaDataRepresentation.c" } #line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = event_global; + _tmp4_ = event_global; #line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = event_id; + _tmp5_ = event_id; #line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = event_source_collection_fetch (_tmp5_, &_tmp6_); + _tmp6_ = event_source_collection_fetch (_tmp4_, &_tmp5_); #line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (self->priv->event); #line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - self->priv->event = _tmp7_; + self->priv->event = _tmp6_; #line 216 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = self->priv->event; + _tmp7_ = self->priv->event; #line 216 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp9_ = _g_object_ref0 (_tmp8_); + _tmp8_ = _g_object_ref0 (_tmp7_); #line 216 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - result = _tmp9_; + result = _tmp8_; #line 216 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3044 "MediaDataRepresentation.c" +#line 3478 "MediaDataRepresentation.c" } -gboolean media_source_set_event (MediaSource* self, Event* new_event) { +gboolean +media_source_set_event (MediaSource* self, + Event* new_event) +{ gboolean result = FALSE; EventID _tmp0_ = {0}; - Event* _tmp1_; EventID event_id = {0}; - EventID _tmp4_ = {0}; + EventID _tmp2_ = {0}; + gint64 _tmp3_; + EventID _tmp4_; gint64 _tmp5_; - EventID _tmp6_; - gint64 _tmp7_; gboolean committed = FALSE; - EventID _tmp8_; - gboolean _tmp9_; - gboolean _tmp10_; + EventID _tmp6_; + gboolean _tmp7_; #line 219 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); #line 219 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail ((new_event == NULL) || IS_EVENT (new_event), FALSE); #line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = new_event; + if (new_event != NULL) { +#line 3502 "MediaDataRepresentation.c" + EventID _tmp1_ = {0}; #line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp1_ != NULL) { -#line 3069 "MediaDataRepresentation.c" - Event* _tmp2_; - EventID _tmp3_ = {0}; -#line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = new_event; + event_get_event_id (new_event, &_tmp1_); #line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - event_get_event_id (_tmp2_, &_tmp3_); -#line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = _tmp3_; -#line 3078 "MediaDataRepresentation.c" + _tmp0_ = _tmp1_; +#line 3508 "MediaDataRepresentation.c" } else { #line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_id_init (&_tmp0_, EVENT_ID_INVALID); -#line 3082 "MediaDataRepresentation.c" +#line 3512 "MediaDataRepresentation.c" } #line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_id = _tmp0_; #line 221 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - media_source_get_event_id (self, &_tmp4_); + media_source_get_event_id (self, &_tmp2_); #line 221 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = _tmp4_.id; + _tmp3_ = _tmp2_.id; #line 221 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = event_id; + _tmp4_ = event_id; #line 221 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = _tmp6_.id; + _tmp5_ = _tmp4_.id; #line 221 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp5_ == _tmp7_) { + if (_tmp3_ == _tmp5_) { #line 222 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = TRUE; #line 222 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3100 "MediaDataRepresentation.c" +#line 3530 "MediaDataRepresentation.c" } #line 224 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = event_id; -#line 224 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp9_ = media_source_set_event_id (self, &_tmp8_); + _tmp6_ = event_id; #line 224 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - committed = _tmp9_; + committed = media_source_set_event_id (self, &_tmp6_); #line 225 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp10_ = committed; + _tmp7_ = committed; #line 225 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp10_) { -#line 3112 "MediaDataRepresentation.c" - Event* _tmp11_; - Event* _tmp13_; - Event* _tmp15_; - Event* _tmp16_; - Alteration* _tmp17_; - Alteration* _tmp18_; + if (_tmp7_) { +#line 3540 "MediaDataRepresentation.c" + Event* _tmp8_; + Event* _tmp10_; + Alteration* _tmp11_; + Alteration* _tmp12_; #line 226 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp11_ = self->priv->event; + _tmp8_ = self->priv->event; #line 226 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp11_ != NULL) { -#line 3123 "MediaDataRepresentation.c" - Event* _tmp12_; + if (_tmp8_ != NULL) { +#line 3549 "MediaDataRepresentation.c" + Event* _tmp9_; #line 227 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp12_ = self->priv->event; + _tmp9_ = self->priv->event; #line 227 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - event_detach (_tmp12_, self); -#line 3129 "MediaDataRepresentation.c" + event_detach (_tmp9_, self); +#line 3555 "MediaDataRepresentation.c" } #line 229 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp13_ = new_event; -#line 229 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp13_ != NULL) { -#line 3135 "MediaDataRepresentation.c" - Event* _tmp14_; + if (new_event != NULL) { #line 230 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp14_ = new_event; -#line 230 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - event_attach (_tmp14_, self); -#line 3141 "MediaDataRepresentation.c" + event_attach (new_event, self); +#line 3561 "MediaDataRepresentation.c" } #line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp15_ = new_event; -#line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp16_ = _g_object_ref0 (_tmp15_); + _tmp10_ = _g_object_ref0 (new_event); #line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (self->priv->event); #line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - self->priv->event = _tmp16_; + self->priv->event = _tmp10_; #line 234 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp17_ = alteration_new ("metadata", "event"); + _tmp11_ = alteration_new ("metadata", "event"); #line 234 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp18_ = _tmp17_; + _tmp12_ = _tmp11_; #line 234 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp12_); #line 234 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _alteration_unref0 (_tmp18_); -#line 3159 "MediaDataRepresentation.c" + _alteration_unref0 (_tmp12_); +#line 3577 "MediaDataRepresentation.c" } #line 237 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = committed; #line 237 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3165 "MediaDataRepresentation.c" +#line 3583 "MediaDataRepresentation.c" } -void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, TransactionController* controller, GError** error) { +void +media_source_set_many_to_event (GeeCollection* media_sources, + Event* event, + TransactionController* controller, + GError** error) +{ EventID _tmp0_ = {0}; - Event* _tmp1_; EventID event_id = {0}; - TransactionController* _tmp4_; - Event* _tmp21_; Alteration* alteration = NULL; - Alteration* _tmp24_; - TransactionController* _tmp33_; + Alteration* _tmp15_; #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media_sources)); #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3183,248 +3602,236 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_TRANSACTION_CONTROLLER (controller)); #line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = event; -#line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp1_ != NULL) { -#line 3188 "MediaDataRepresentation.c" - Event* _tmp2_; - EventID _tmp3_ = {0}; -#line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = event; + if (event != NULL) { +#line 3605 "MediaDataRepresentation.c" + EventID _tmp1_ = {0}; #line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - event_get_event_id (_tmp2_, &_tmp3_); + event_get_event_id (event, &_tmp1_); #line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = _tmp3_; -#line 3197 "MediaDataRepresentation.c" + _tmp0_ = _tmp1_; +#line 3611 "MediaDataRepresentation.c" } else { #line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_id_init (&_tmp0_, EVENT_ID_INVALID); -#line 3201 "MediaDataRepresentation.c" +#line 3615 "MediaDataRepresentation.c" } #line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_id = _tmp0_; #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = controller; -#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - transaction_controller_begin (_tmp4_); -#line 3209 "MediaDataRepresentation.c" + transaction_controller_begin (controller); +#line 3621 "MediaDataRepresentation.c" { GeeIterator* _media_it = NULL; - GeeCollection* _tmp5_; - GeeIterator* _tmp6_; -#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = media_sources; + GeeIterator* _tmp2_; #line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (media_sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _media_it = _tmp6_; + _media_it = _tmp2_; #line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 3222 "MediaDataRepresentation.c" - GeeIterator* _tmp7_; - gboolean _tmp8_; +#line 3631 "MediaDataRepresentation.c" + GeeIterator* _tmp3_; MediaSource* media = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; + GeeIterator* _tmp4_; + gpointer _tmp5_; Event* old_event = NULL; + MediaSource* _tmp6_; + Event* _tmp7_; + Event* _tmp8_; MediaSource* _tmp11_; - Event* _tmp12_; - Event* _tmp13_; - MediaSource* _tmp16_; - EventID _tmp17_; - MediaSource* _tmp18_; - Event* _tmp19_; - Event* _tmp20_; -#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = _media_it; + EventID _tmp12_; + MediaSource* _tmp13_; + Event* _tmp14_; #line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = gee_iterator_next (_tmp7_); + _tmp3_ = _media_it; #line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp3_)) { #line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 3245 "MediaDataRepresentation.c" +#line 3650 "MediaDataRepresentation.c" } #line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp9_ = _media_it; + _tmp4_ = _media_it; #line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - media = (MediaSource*) _tmp10_; + media = (MediaSource*) _tmp5_; #line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp11_ = media; + _tmp6_ = media; #line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp12_ = media_source_get_event (_tmp11_); + _tmp7_ = media_source_get_event (_tmp6_); #line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - old_event = _tmp12_; + old_event = _tmp7_; #line 248 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp13_ = old_event; + _tmp8_ = old_event; #line 248 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp13_ != NULL) { -#line 3263 "MediaDataRepresentation.c" - Event* _tmp14_; - MediaSource* _tmp15_; + if (_tmp8_ != NULL) { +#line 3668 "MediaDataRepresentation.c" + Event* _tmp9_; + MediaSource* _tmp10_; #line 249 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp14_ = old_event; + _tmp9_ = old_event; #line 249 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp15_ = media; + _tmp10_ = media; #line 249 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - event_detach (_tmp14_, _tmp15_); -#line 3272 "MediaDataRepresentation.c" + event_detach (_tmp9_, _tmp10_); +#line 3677 "MediaDataRepresentation.c" } #line 251 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp16_ = media; + _tmp11_ = media; #line 251 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp17_ = event_id; + _tmp12_ = event_id; #line 251 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - media_source_set_event_id (_tmp16_, &_tmp17_); + media_source_set_event_id (_tmp11_, &_tmp12_); #line 252 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp18_ = media; + _tmp13_ = media; #line 252 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp19_ = event; + _tmp14_ = _g_object_ref0 (event); #line 252 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp20_ = _g_object_ref0 (_tmp19_); + _g_object_unref0 (_tmp13_->priv->event); #line 252 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp18_->priv->event); -#line 252 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp18_->priv->event = _tmp20_; + _tmp13_->priv->event = _tmp14_; #line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (old_event); #line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (media); -#line 3294 "MediaDataRepresentation.c" +#line 3697 "MediaDataRepresentation.c" } #line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_media_it); -#line 3298 "MediaDataRepresentation.c" +#line 3701 "MediaDataRepresentation.c" } #line 255 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp21_ = event; -#line 255 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp21_ != NULL) { -#line 3304 "MediaDataRepresentation.c" - Event* _tmp22_; - GeeCollection* _tmp23_; -#line 256 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp22_ = event; -#line 256 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp23_ = media_sources; + if (event != NULL) { #line 256 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - event_attach_many (_tmp22_, _tmp23_); -#line 3313 "MediaDataRepresentation.c" + event_attach_many (event, media_sources); +#line 3707 "MediaDataRepresentation.c" } #line 258 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp24_ = alteration_new ("metadata", "event"); + _tmp15_ = alteration_new ("metadata", "event"); #line 258 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - alteration = _tmp24_; -#line 3319 "MediaDataRepresentation.c" + alteration = _tmp15_; +#line 3713 "MediaDataRepresentation.c" { GeeIterator* _media_it = NULL; - GeeCollection* _tmp25_; - GeeIterator* _tmp26_; + GeeIterator* _tmp16_; #line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp25_ = media_sources; + _tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (media_sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp26_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _media_it = _tmp26_; + _media_it = _tmp16_; #line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 3332 "MediaDataRepresentation.c" - GeeIterator* _tmp27_; - gboolean _tmp28_; +#line 3723 "MediaDataRepresentation.c" + GeeIterator* _tmp17_; MediaSource* media = NULL; - GeeIterator* _tmp29_; - gpointer _tmp30_; - MediaSource* _tmp31_; - Alteration* _tmp32_; -#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp27_ = _media_it; + GeeIterator* _tmp18_; + gpointer _tmp19_; + MediaSource* _tmp20_; + Alteration* _tmp21_; #line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp28_ = gee_iterator_next (_tmp27_); + _tmp17_ = _media_it; #line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp28_) { + if (!gee_iterator_next (_tmp17_)) { #line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 3348 "MediaDataRepresentation.c" +#line 3736 "MediaDataRepresentation.c" } #line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp29_ = _media_it; + _tmp18_ = _media_it; #line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp30_ = gee_iterator_get (_tmp29_); + _tmp19_ = gee_iterator_get (_tmp18_); #line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - media = (MediaSource*) _tmp30_; + media = (MediaSource*) _tmp19_; #line 260 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp31_ = media; + _tmp20_ = media; #line 260 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp32_ = alteration; + _tmp21_ = alteration; #line 260 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_OBJECT, DataObject), _tmp32_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_OBJECT, DataObject), _tmp21_); #line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (media); -#line 3364 "MediaDataRepresentation.c" +#line 3752 "MediaDataRepresentation.c" } #line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_media_it); -#line 3368 "MediaDataRepresentation.c" +#line 3756 "MediaDataRepresentation.c" } #line 262 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp33_ = controller; -#line 262 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - transaction_controller_commit (_tmp33_); + transaction_controller_commit (controller); #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _alteration_unref0 (alteration); -#line 3376 "MediaDataRepresentation.c" +#line 3762 "MediaDataRepresentation.c" } -static time_t media_source_real_get_exposure_time (MediaSource* self) { +static time_t +media_source_real_get_exposure_time (MediaSource* self) +{ time_t _tmp0_ = 0; #line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_get_exposure_time'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 3386 "MediaDataRepresentation.c" +#line 3774 "MediaDataRepresentation.c" } -time_t media_source_get_exposure_time (MediaSource* self) { +time_t +media_source_get_exposure_time (MediaSource* self) +{ #line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0); #line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_exposure_time (self); -#line 3395 "MediaDataRepresentation.c" +#line 3785 "MediaDataRepresentation.c" } -static void media_source_real_get_import_id (MediaSource* self, ImportID* result) { +static void +media_source_real_get_import_id (MediaSource* self, + ImportID* result) +{ #line 267 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_get_import_id'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 267 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 3404 "MediaDataRepresentation.c" +#line 3797 "MediaDataRepresentation.c" } -void media_source_get_import_id (MediaSource* self, ImportID* result) { +void +media_source_get_import_id (MediaSource* self, + ImportID* result) +{ #line 267 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 267 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->get_import_id (self, result); -#line 3413 "MediaDataRepresentation.c" +#line 3809 "MediaDataRepresentation.c" } -static void media_source_real_master_replaced (MediaSource* self, GFile* old_file, GFile* new_file) { +static void +media_source_real_master_replaced (MediaSource* self, + GFile* old_file, + GFile* new_file) +{ #line 33 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_IS_FILE (old_file)); #line 33 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_IS_FILE (new_file)); -#line 3422 "MediaDataRepresentation.c" +#line 3822 "MediaDataRepresentation.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2); register GMarshalFunc_VOID__OBJECT_OBJECT callback; register GCClosure * cc; @@ -3439,23 +3846,25 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa data1 = closure->data; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data2 = param_values->data[0].v_pointer; -#line 3441 "MediaDataRepresentation.c" +#line 3848 "MediaDataRepresentation.c" } else { #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data1 = param_values->data[0].v_pointer; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data2 = closure->data; -#line 3447 "MediaDataRepresentation.c" +#line 3854 "MediaDataRepresentation.c" } #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 3453 "MediaDataRepresentation.c" +#line 3860 "MediaDataRepresentation.c" } -static void media_source_class_init (MediaSourceClass * klass) { +static void +media_source_class_init (MediaSourceClass * klass) +{ #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_parent_class = g_type_class_peek_parent (klass); #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3530,31 +3939,37 @@ static void media_source_class_init (MediaSourceClass * klass) { G_OBJECT_CLASS (klass)->finalize = media_source_finalize; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_signals[MEDIA_SOURCE_MASTER_REPLACED_SIGNAL] = g_signal_new ("master-replaced", TYPE_MEDIA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceClass, master_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_get_type ()); -#line 3532 "MediaDataRepresentation.c" +#line 3941 "MediaDataRepresentation.c" } -static void media_source_indexable_interface_init (IndexableIface * iface) { +static void +media_source_indexable_interface_init (IndexableIface * iface) +{ #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_indexable_parent_iface = g_type_interface_peek_parent (iface); #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" iface->get_indexable_keywords = (const gchar* (*) (Indexable *)) media_source_real_get_indexable_keywords; -#line 3541 "MediaDataRepresentation.c" +#line 3952 "MediaDataRepresentation.c" } -static void media_source_instance_init (MediaSource * self) { +static void +media_source_instance_init (MediaSource * self) +{ #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv = MEDIA_SOURCE_GET_PRIVATE (self); #line 36 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->event = NULL; #line 37 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->indexable_keywords = NULL; -#line 3552 "MediaDataRepresentation.c" +#line 3965 "MediaDataRepresentation.c" } -static void media_source_finalize (GObject * obj) { +static void +media_source_finalize (GObject * obj) +{ MediaSource * self; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE, MediaSource); @@ -3564,11 +3979,13 @@ static void media_source_finalize (GObject * obj) { _g_free0 (self->priv->indexable_keywords); #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" G_OBJECT_CLASS (media_source_parent_class)->finalize (obj); -#line 3566 "MediaDataRepresentation.c" +#line 3981 "MediaDataRepresentation.c" } -GType media_source_get_type (void) { +GType +media_source_get_type (void) +{ static volatile gsize media_source_type_id__volatile = 0; if (g_once_init_enter (&media_source_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MediaSourceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) media_source_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MediaSource), 0, (GInstanceInitFunc) media_source_instance_init, NULL }; @@ -3582,63 +3999,70 @@ GType media_source_get_type (void) { } -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { +static guint +_file_hash_gee_hash_data_func (gconstpointer v, + gpointer self) +{ guint result; result = file_hash ((GFile*) v); #line 271 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3589 "MediaDataRepresentation.c" +#line 4009 "MediaDataRepresentation.c" } -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = file_equal ((GFile*) a, (GFile*) b); #line 271 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3598 "MediaDataRepresentation.c" +#line 4022 "MediaDataRepresentation.c" } -MediaSourceHoldingTank* media_source_holding_tank_construct (GType object_type, MediaSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) { +MediaSourceHoldingTank* +media_source_holding_tank_construct (GType object_type, + MediaSourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target) +{ MediaSourceHoldingTank* self = NULL; - MediaSourceCollection* _tmp0_; - SourceHoldingTankCheckToKeep _tmp1_; - void* _tmp1__target; - GetSourceDatabaseKey _tmp2_; - void* _tmp2__target; #line 274 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (sources), NULL); #line 276 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = sources; -#line 276 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = check_to_keep; -#line 276 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1__target = check_to_keep_target; -#line 276 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = get_key; -#line 276 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2__target = get_key_target; -#line 276 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - self = (MediaSourceHoldingTank*) database_source_holding_tank_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp1_, _tmp1__target, _tmp2_, _tmp2__target); + self = (MediaSourceHoldingTank*) database_source_holding_tank_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_SOURCE_COLLECTION, SourceCollection), check_to_keep, check_to_keep_target, get_key, get_key_target); #line 274 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 3625 "MediaDataRepresentation.c" +#line 4041 "MediaDataRepresentation.c" } -MediaSourceHoldingTank* media_source_holding_tank_new (MediaSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) { +MediaSourceHoldingTank* +media_source_holding_tank_new (MediaSourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target) +{ #line 274 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return media_source_holding_tank_construct (TYPE_MEDIA_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target, get_key, get_key_target); -#line 3632 "MediaDataRepresentation.c" +#line 4054 "MediaDataRepresentation.c" } -MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingTank* self, GFile* file) { +MediaSource* +media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingTank* self, + GFile* file) +{ MediaSource* result = NULL; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 279 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_HOLDING_TANK (self), NULL); #line 279 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3646,24 +4070,25 @@ MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingT #line 280 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->master_file_map; #line 280 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = file; + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 280 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 280 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - result = (MediaSource*) _tmp2_; + result = (MediaSource*) _tmp1_; #line 280 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3655 "MediaDataRepresentation.c" +#line 4077 "MediaDataRepresentation.c" } -MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* self, const gchar* md5) { +MediaSource* +media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* self, + const gchar* md5) +{ MediaSource* result = NULL; #line 283 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_HOLDING_TANK (self), NULL); #line 283 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (md5 != NULL, NULL); -#line 3665 "MediaDataRepresentation.c" +#line 4090 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; GeeHashMap* _tmp0_; @@ -3690,84 +4115,83 @@ MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* sel _source_it = _tmp5_; #line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 3692 "MediaDataRepresentation.c" +#line 4117 "MediaDataRepresentation.c" GeeIterator* _tmp6_; - gboolean _tmp7_; MediaSource* source = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - MediaSource* _tmp10_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + MediaSource* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; - const gchar* _tmp13_; - gboolean _tmp14_; + gboolean _tmp12_; #line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _source_it; #line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 3711 "MediaDataRepresentation.c" +#line 4132 "MediaDataRepresentation.c" } #line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = _source_it; + _tmp7_ = _source_it; #line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - source = (MediaSource*) _tmp9_; -#line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp10_ = source; + source = (MediaSource*) _tmp8_; #line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp11_ = media_source_get_master_md5 (_tmp10_); + _tmp9_ = source; #line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp12_ = _tmp11_; + _tmp10_ = media_source_get_master_md5 (_tmp9_); #line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp13_ = md5; + _tmp11_ = _tmp10_; #line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp14_ = g_strcmp0 (_tmp12_, _tmp13_) == 0; + _tmp12_ = g_strcmp0 (_tmp11_, md5) == 0; #line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp11_); #line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp14_) { + if (_tmp12_) { #line 286 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = source; #line 286 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); #line 286 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3739 "MediaDataRepresentation.c" +#line 4158 "MediaDataRepresentation.c" } #line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 3743 "MediaDataRepresentation.c" +#line 4162 "MediaDataRepresentation.c" } #line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 3747 "MediaDataRepresentation.c" +#line 4166 "MediaDataRepresentation.c" } #line 290 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = NULL; #line 290 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3753 "MediaDataRepresentation.c" +#line 4172 "MediaDataRepresentation.c" } -static void _media_source_holding_tank_on_master_source_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self) { +static void +_media_source_holding_tank_on_master_source_replaced_media_source_master_replaced (MediaSource* _sender, + GFile* old_file, + GFile* new_file, + gpointer self) +{ #line 299 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_holding_tank_on_master_source_replaced ((MediaSourceHoldingTank*) self, _sender, old_file, new_file); -#line 3760 "MediaDataRepresentation.c" +#line 4184 "MediaDataRepresentation.c" } -static void media_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed) { +static void +media_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, + GeeCollection* added, + GeeCollection* removed) +{ MediaSourceHoldingTank * self; - GeeCollection* _tmp0_; - GeeCollection* _tmp15_; - GeeCollection* _tmp33_; - GeeCollection* _tmp34_; #line 293 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank); #line 293 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3775,201 +4199,183 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin #line 293 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 295 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = added; -#line 295 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp0_ != NULL) { -#line 3780 "MediaDataRepresentation.c" + if (added != NULL) { +#line 4202 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp0_; #line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = added; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_ITERABLE, GeeIterable)); #line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _source_it = _tmp2_; + _source_it = _tmp0_; #line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 3793 "MediaDataRepresentation.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 4212 "MediaDataRepresentation.c" + GeeIterator* _tmp1_; DataSource* source = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp2_; + gpointer _tmp3_; MediaSource* media_source = NULL; - DataSource* _tmp7_; - MediaSource* _tmp8_; - GeeHashMap* _tmp9_; + DataSource* _tmp4_; + MediaSource* _tmp5_; + GeeHashMap* _tmp6_; + MediaSource* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; MediaSource* _tmp10_; - GFile* _tmp11_; - GFile* _tmp12_; - MediaSource* _tmp13_; - MediaSource* _tmp14_; + MediaSource* _tmp11_; #line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = _source_it; + _tmp1_ = _source_it; #line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = gee_iterator_next (_tmp3_); -#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 3816 "MediaDataRepresentation.c" +#line 4232 "MediaDataRepresentation.c" } #line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = _source_it; + _tmp2_ = _source_it; #line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - source = (DataSource*) _tmp6_; + source = (DataSource*) _tmp3_; #line 297 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = source; + _tmp4_ = source; #line 297 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource)); #line 297 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - media_source = _tmp8_; + media_source = _tmp5_; #line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp9_ = self->priv->master_file_map; + _tmp6_ = self->priv->master_file_map; #line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp10_ = media_source; + _tmp7_ = media_source; #line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp11_ = media_source_get_master_file (_tmp10_); + _tmp8_ = media_source_get_master_file (_tmp7_); #line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp12_ = _tmp11_; + _tmp9_ = _tmp8_; #line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp13_ = media_source; + _tmp10_ = media_source; #line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_, _tmp13_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, _tmp10_); #line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp9_); #line 299 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp14_ = media_source; + _tmp11_ = media_source; #line 299 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_connect (_tmp14_, "master-replaced", (GCallback) _media_source_holding_tank_on_master_source_replaced_media_source_master_replaced, self); + g_signal_connect (_tmp11_, "master-replaced", (GCallback) _media_source_holding_tank_on_master_source_replaced_media_source_master_replaced, self); #line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (media_source); #line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 3852 "MediaDataRepresentation.c" +#line 4268 "MediaDataRepresentation.c" } #line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 3856 "MediaDataRepresentation.c" +#line 4272 "MediaDataRepresentation.c" } } #line 303 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp15_ = removed; -#line 303 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp15_ != NULL) { -#line 3863 "MediaDataRepresentation.c" + if (removed != NULL) { +#line 4277 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp16_; - GeeIterator* _tmp17_; -#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp16_ = removed; + GeeIterator* _tmp12_; #line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp17_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_ITERABLE, GeeIterable)); #line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _source_it = _tmp17_; + _source_it = _tmp12_; #line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 3876 "MediaDataRepresentation.c" - GeeIterator* _tmp18_; - gboolean _tmp19_; +#line 4287 "MediaDataRepresentation.c" + GeeIterator* _tmp13_; DataSource* source = NULL; - GeeIterator* _tmp20_; - gpointer _tmp21_; + GeeIterator* _tmp14_; + gpointer _tmp15_; MediaSource* media_source = NULL; - DataSource* _tmp22_; - MediaSource* _tmp23_; + DataSource* _tmp16_; + MediaSource* _tmp17_; gboolean is_removed = FALSE; - GeeHashMap* _tmp24_; + GeeHashMap* _tmp18_; + MediaSource* _tmp19_; + GFile* _tmp20_; + GFile* _tmp21_; + gboolean _tmp22_; + gboolean _tmp23_; + gboolean _tmp24_; MediaSource* _tmp25_; - GFile* _tmp26_; - GFile* _tmp27_; - gboolean _tmp28_; - gboolean _tmp29_; - gboolean _tmp30_; - MediaSource* _tmp31_; - guint _tmp32_; -#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp18_ = _source_it; + guint _tmp26_; #line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp19_ = gee_iterator_next (_tmp18_); + _tmp13_ = _source_it; #line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp19_) { + if (!gee_iterator_next (_tmp13_)) { #line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 3903 "MediaDataRepresentation.c" +#line 4311 "MediaDataRepresentation.c" } #line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp20_ = _source_it; + _tmp14_ = _source_it; #line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp21_ = gee_iterator_get (_tmp20_); + _tmp15_ = gee_iterator_get (_tmp14_); #line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - source = (DataSource*) _tmp21_; + source = (DataSource*) _tmp15_; #line 305 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp22_ = source; + _tmp16_ = source; #line 305 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource)); #line 305 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - media_source = _tmp23_; + media_source = _tmp17_; #line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp24_ = self->priv->master_file_map; + _tmp18_ = self->priv->master_file_map; #line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp25_ = media_source; + _tmp19_ = media_source; #line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp26_ = media_source_get_master_file (_tmp25_); + _tmp20_ = media_source_get_master_file (_tmp19_); #line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp27_ = _tmp26_; + _tmp21_ = _tmp20_; #line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp28_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_, NULL); + _tmp22_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp21_, NULL); #line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp29_ = _tmp28_; + _tmp23_ = _tmp22_; #line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp27_); + _g_object_unref0 (_tmp21_); #line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - is_removed = _tmp29_; + is_removed = _tmp23_; #line 307 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp30_ = is_removed; + _tmp24_ = is_removed; #line 307 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _vala_assert (_tmp30_, "is_removed"); + _vala_assert (_tmp24_, "is_removed"); #line 308 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp31_ = media_source; + _tmp25_ = media_source; #line 308 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_parse_name ("master-replaced", TYPE_MEDIA_SOURCE, &_tmp32_, NULL, FALSE); + g_signal_parse_name ("master-replaced", TYPE_MEDIA_SOURCE, &_tmp26_, NULL, FALSE); #line 308 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_handlers_disconnect_matched (_tmp31_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp32_, 0, NULL, (GCallback) _media_source_holding_tank_on_master_source_replaced_media_source_master_replaced, self); + g_signal_handlers_disconnect_matched (_tmp25_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _media_source_holding_tank_on_master_source_replaced_media_source_master_replaced, self); #line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (media_source); #line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 3947 "MediaDataRepresentation.c" +#line 4355 "MediaDataRepresentation.c" } #line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 3951 "MediaDataRepresentation.c" +#line 4359 "MediaDataRepresentation.c" } } #line 312 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp33_ = added; -#line 312 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp34_ = removed; -#line 312 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - SOURCE_HOLDING_TANK_CLASS (media_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_HOLDING_TANK, DatabaseSourceHoldingTank), TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp33_, _tmp34_); -#line 3960 "MediaDataRepresentation.c" + SOURCE_HOLDING_TANK_CLASS (media_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_HOLDING_TANK, DatabaseSourceHoldingTank), TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), added, removed); +#line 4364 "MediaDataRepresentation.c" } -static void media_source_holding_tank_on_master_source_replaced (MediaSourceHoldingTank* self, MediaSource* media_source, GFile* old_file, GFile* new_file) { +static void +media_source_holding_tank_on_master_source_replaced (MediaSourceHoldingTank* self, + MediaSource* media_source, + GFile* old_file, + GFile* new_file) +{ gboolean removed = FALSE; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gboolean _tmp2_; - GeeHashMap* _tmp3_; - GFile* _tmp4_; - MediaSource* _tmp5_; + gboolean _tmp1_; + GeeHashMap* _tmp2_; #line 315 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_HOLDING_TANK (self)); #line 315 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3981,26 +4387,22 @@ static void media_source_holding_tank_on_master_source_replaced (MediaSourceHold #line 316 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->master_file_map; #line 316 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = old_file; -#line 316 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL); + _tmp1_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), old_file, NULL); #line 316 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - removed = _tmp2_; + removed = _tmp1_; #line 317 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _vala_assert (removed, "removed"); #line 319 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = self->priv->master_file_map; + _tmp2_ = self->priv->master_file_map; #line 319 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = new_file; -#line 319 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = media_source; -#line 319 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, _tmp5_); -#line 3998 "MediaDataRepresentation.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), new_file, media_source); +#line 4398 "MediaDataRepresentation.c" } -static void media_source_holding_tank_class_init (MediaSourceHoldingTankClass * klass) { +static void +media_source_holding_tank_class_init (MediaSourceHoldingTankClass * klass) +{ #line 270 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_holding_tank_parent_class = g_type_class_peek_parent (klass); #line 270 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4009,11 +4411,13 @@ static void media_source_holding_tank_class_init (MediaSourceHoldingTankClass * g_type_class_add_private (klass, sizeof (MediaSourceHoldingTankPrivate)); #line 270 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*) (SourceHoldingTank *, GeeCollection*, GeeCollection*)) media_source_holding_tank_real_notify_contents_altered; -#line 4011 "MediaDataRepresentation.c" +#line 4413 "MediaDataRepresentation.c" } -static void media_source_holding_tank_instance_init (MediaSourceHoldingTank * self) { +static void +media_source_holding_tank_instance_init (MediaSourceHoldingTank * self) +{ GeeHashMap* _tmp0_; #line 270 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv = MEDIA_SOURCE_HOLDING_TANK_GET_PRIVATE (self); @@ -4021,11 +4425,13 @@ static void media_source_holding_tank_instance_init (MediaSourceHoldingTank * se _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 271 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->master_file_map = _tmp0_; -#line 4023 "MediaDataRepresentation.c" +#line 4427 "MediaDataRepresentation.c" } -static void media_source_holding_tank_finalize (SourceHoldingTank * obj) { +static void +media_source_holding_tank_finalize (SourceHoldingTank * obj) +{ MediaSourceHoldingTank * self; #line 270 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank); @@ -4033,11 +4439,13 @@ static void media_source_holding_tank_finalize (SourceHoldingTank * obj) { _g_object_unref0 (self->priv->master_file_map); #line 270 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" SOURCE_HOLDING_TANK_CLASS (media_source_holding_tank_parent_class)->finalize (obj); -#line 4035 "MediaDataRepresentation.c" +#line 4441 "MediaDataRepresentation.c" } -GType media_source_holding_tank_get_type (void) { +GType +media_source_holding_tank_get_type (void) +{ static volatile gsize media_source_holding_tank_type_id__volatile = 0; if (g_once_init_enter (&media_source_holding_tank_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MediaSourceHoldingTankClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) media_source_holding_tank_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MediaSourceHoldingTank), 0, (GInstanceInitFunc) media_source_holding_tank_instance_init, NULL }; @@ -4049,43 +4457,50 @@ GType media_source_holding_tank_get_type (void) { } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 329 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? data_collection_ref (self) : NULL; -#line 4054 "MediaDataRepresentation.c" +#line 4464 "MediaDataRepresentation.c" } -MediaSourceTransactionController* media_source_transaction_controller_construct (GType object_type, MediaSourceCollection* sources) { +MediaSourceTransactionController* +media_source_transaction_controller_construct (GType object_type, + MediaSourceCollection* sources) +{ MediaSourceTransactionController* self = NULL; MediaSourceCollection* _tmp0_; - MediaSourceCollection* _tmp1_; #line 328 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (sources), NULL); #line 328 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = (MediaSourceTransactionController*) transaction_controller_construct (object_type); #line 329 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = sources; -#line 329 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = _data_collection_ref0 (_tmp0_); + _tmp0_ = _data_collection_ref0 (sources); #line 329 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (self->priv->sources); #line 329 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - self->priv->sources = _tmp1_; + self->priv->sources = _tmp0_; #line 328 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 4076 "MediaDataRepresentation.c" +#line 4486 "MediaDataRepresentation.c" } -MediaSourceTransactionController* media_source_transaction_controller_new (MediaSourceCollection* sources) { +MediaSourceTransactionController* +media_source_transaction_controller_new (MediaSourceCollection* sources) +{ #line 328 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return media_source_transaction_controller_construct (TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, sources); -#line 4083 "MediaDataRepresentation.c" +#line 4495 "MediaDataRepresentation.c" } -static void media_source_transaction_controller_real_begin_impl (TransactionController* base, GError** error) { +static void +media_source_transaction_controller_real_begin_impl (TransactionController* base, + GError** error) +{ MediaSourceTransactionController * self; MediaSourceCollection* _tmp0_; #line 332 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4096,11 +4511,14 @@ static void media_source_transaction_controller_real_begin_impl (TransactionCont _tmp0_ = self->priv->sources; #line 334 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); -#line 4098 "MediaDataRepresentation.c" +#line 4513 "MediaDataRepresentation.c" } -static void media_source_transaction_controller_real_commit_impl (TransactionController* base, GError** error) { +static void +media_source_transaction_controller_real_commit_impl (TransactionController* base, + GError** error) +{ MediaSourceTransactionController * self; MediaSourceCollection* _tmp0_; GError * _inner_error_ = NULL; @@ -4118,12 +4536,14 @@ static void media_source_transaction_controller_real_commit_impl (TransactionCon g_propagate_error (error, _inner_error_); #line 339 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 4120 "MediaDataRepresentation.c" +#line 4538 "MediaDataRepresentation.c" } } -static void media_source_transaction_controller_class_init (MediaSourceTransactionControllerClass * klass) { +static void +media_source_transaction_controller_class_init (MediaSourceTransactionControllerClass * klass) +{ #line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_transaction_controller_parent_class = g_type_class_peek_parent (klass); #line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4134,18 +4554,22 @@ static void media_source_transaction_controller_class_init (MediaSourceTransacti ((TransactionControllerClass *) klass)->begin_impl = (void (*) (TransactionController *, GError**)) media_source_transaction_controller_real_begin_impl; #line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((TransactionControllerClass *) klass)->commit_impl = (void (*) (TransactionController *, GError**)) media_source_transaction_controller_real_commit_impl; -#line 4136 "MediaDataRepresentation.c" +#line 4556 "MediaDataRepresentation.c" } -static void media_source_transaction_controller_instance_init (MediaSourceTransactionController * self) { +static void +media_source_transaction_controller_instance_init (MediaSourceTransactionController * self) +{ #line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv = MEDIA_SOURCE_TRANSACTION_CONTROLLER_GET_PRIVATE (self); -#line 4143 "MediaDataRepresentation.c" +#line 4565 "MediaDataRepresentation.c" } -static void media_source_transaction_controller_finalize (TransactionController * obj) { +static void +media_source_transaction_controller_finalize (TransactionController * obj) +{ MediaSourceTransactionController * self; #line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, MediaSourceTransactionController); @@ -4153,11 +4577,13 @@ static void media_source_transaction_controller_finalize (TransactionController _data_collection_unref0 (self->priv->sources); #line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" TRANSACTION_CONTROLLER_CLASS (media_source_transaction_controller_parent_class)->finalize (obj); -#line 4155 "MediaDataRepresentation.c" +#line 4579 "MediaDataRepresentation.c" } -GType media_source_transaction_controller_get_type (void) { +GType +media_source_transaction_controller_get_type (void) +{ static volatile gsize media_source_transaction_controller_type_id__volatile = 0; if (g_once_init_enter (&media_source_transaction_controller_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MediaSourceTransactionControllerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) media_source_transaction_controller_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MediaSourceTransactionController), 0, (GInstanceInitFunc) media_source_transaction_controller_instance_init, NULL }; @@ -4169,214 +4595,197 @@ GType media_source_transaction_controller_get_type (void) { } -static gint _import_id_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gint +_import_id_compare_func_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gint result; result = import_id_compare_func ((ImportID*) a, (ImportID*) b); #line 350 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4176 "MediaDataRepresentation.c" +#line 4606 "MediaDataRepresentation.c" } -MediaSourceCollection* media_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target) { +MediaSourceCollection* +media_source_collection_construct (GType object_type, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target) +{ MediaSourceCollection* self = NULL; - const gchar* _tmp0_; - GetSourceDatabaseKey _tmp1_; - void* _tmp1__target; - MediaSourceHoldingTank* _tmp2_; - MediaSourceHoldingTank* _tmp3_; -#line 384 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + MediaSourceHoldingTank* _tmp0_; + MediaSourceHoldingTank* _tmp1_; +#line 384 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (name != NULL, NULL); #line 385 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = name; -#line 385 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = source_key_func; -#line 385 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1__target = source_key_func_target; -#line 385 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - self = (MediaSourceCollection*) database_source_collection_construct (object_type, _tmp0_, _tmp1_, _tmp1__target); + self = (MediaSourceCollection*) database_source_collection_construct (object_type, name, source_key_func, source_key_func_target); #line 387 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = media_source_collection_create_trashcan (self); + _tmp0_ = media_source_collection_create_trashcan (self); #line 387 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (self->priv->trashcan); #line 387 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - self->priv->trashcan = _tmp2_; + self->priv->trashcan = _tmp0_; #line 388 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = media_source_collection_create_offline_bin (self); + _tmp1_ = media_source_collection_create_offline_bin (self); #line 388 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (self->priv->offline_bin); #line 388 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - self->priv->offline_bin = _tmp3_; + self->priv->offline_bin = _tmp1_; #line 384 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 4211 "MediaDataRepresentation.c" +#line 4637 "MediaDataRepresentation.c" } -void media_source_collection_filter_media (GeeCollection* media, GeeCollection* photos, GeeCollection* videos) { +void +media_source_collection_filter_media (GeeCollection* media, + GeeCollection* photos, + GeeCollection* videos) +{ #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((photos == NULL) || GEE_IS_COLLECTION (photos)); #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((videos == NULL) || GEE_IS_COLLECTION (videos)); -#line 4222 "MediaDataRepresentation.c" +#line 4652 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = media; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_ITERABLE, GeeIterable)); #line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _source_it = _tmp1_; + _source_it = _tmp0_; #line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 4235 "MediaDataRepresentation.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 4662 "MediaDataRepresentation.c" + GeeIterator* _tmp1_; MediaSource* source = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - gboolean _tmp6_ = FALSE; - GeeCollection* _tmp7_; -#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = _source_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + gboolean _tmp4_ = FALSE; #line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _source_it; #line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 4251 "MediaDataRepresentation.c" +#line 4674 "MediaDataRepresentation.c" } #line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = _source_it; + _tmp2_ = _source_it; #line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - source = (MediaSource*) _tmp5_; + source = (MediaSource*) _tmp3_; #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = photos; + if (photos != NULL) { +#line 4684 "MediaDataRepresentation.c" + MediaSource* _tmp5_; #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp7_ != NULL) { -#line 4263 "MediaDataRepresentation.c" - MediaSource* _tmp8_; + _tmp5_ = source; #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = source; -#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_LIBRARY_PHOTO); -#line 4269 "MediaDataRepresentation.c" + _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_LIBRARY_PHOTO); +#line 4690 "MediaDataRepresentation.c" } else { #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = FALSE; -#line 4273 "MediaDataRepresentation.c" + _tmp4_ = FALSE; +#line 4694 "MediaDataRepresentation.c" } #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp6_) { -#line 4277 "MediaDataRepresentation.c" - GeeCollection* _tmp9_; - MediaSource* _tmp10_; -#line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp9_ = photos; + if (_tmp4_) { +#line 4698 "MediaDataRepresentation.c" + MediaSource* _tmp6_; #line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp10_ = source; + _tmp6_ = source; #line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_collection_add (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 4286 "MediaDataRepresentation.c" + gee_collection_add (photos, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); +#line 4704 "MediaDataRepresentation.c" } else { - gboolean _tmp11_ = FALSE; - GeeCollection* _tmp12_; -#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp12_ = videos; + gboolean _tmp7_ = FALSE; #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp12_ != NULL) { -#line 4294 "MediaDataRepresentation.c" - MediaSource* _tmp13_; + if (videos != NULL) { +#line 4709 "MediaDataRepresentation.c" + MediaSource* _tmp8_; #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp13_ = source; + _tmp8_ = source; #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_VIDEO); -#line 4300 "MediaDataRepresentation.c" + _tmp7_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_VIDEO); +#line 4715 "MediaDataRepresentation.c" } else { #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp11_ = FALSE; -#line 4304 "MediaDataRepresentation.c" + _tmp7_ = FALSE; +#line 4719 "MediaDataRepresentation.c" } #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp11_) { -#line 4308 "MediaDataRepresentation.c" - GeeCollection* _tmp14_; - MediaSource* _tmp15_; -#line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp14_ = videos; + if (_tmp7_) { +#line 4723 "MediaDataRepresentation.c" + MediaSource* _tmp9_; #line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp15_ = source; + _tmp9_ = source; #line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_collection_add (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_VIDEO, Video)); -#line 4317 "MediaDataRepresentation.c" + gee_collection_add (videos, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIDEO, Video)); +#line 4729 "MediaDataRepresentation.c" } else { - gboolean _tmp16_ = FALSE; - GeeCollection* _tmp17_; -#line 398 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp17_ = photos; + gboolean _tmp10_ = FALSE; #line 398 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp17_ != NULL) { + if (photos != NULL) { #line 398 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp16_ = TRUE; -#line 4327 "MediaDataRepresentation.c" + _tmp10_ = TRUE; +#line 4736 "MediaDataRepresentation.c" } else { - GeeCollection* _tmp18_; #line 398 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp18_ = videos; -#line 398 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp16_ = _tmp18_ != NULL; -#line 4334 "MediaDataRepresentation.c" + _tmp10_ = videos != NULL; +#line 4740 "MediaDataRepresentation.c" } #line 398 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp16_) { -#line 4338 "MediaDataRepresentation.c" - MediaSource* _tmp19_; - gchar* _tmp20_; - gchar* _tmp21_; + if (_tmp10_) { +#line 4744 "MediaDataRepresentation.c" + MediaSource* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; #line 399 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp19_ = source; + _tmp11_ = source; #line 399 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp20_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_OBJECT, DataObject)); + _tmp12_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject)); #line 399 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp21_ = _tmp20_; + _tmp13_ = _tmp12_; #line 399 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_warning ("MediaDataRepresentation.vala:399: Unrecognized media: %s", _tmp21_); + g_warning ("MediaDataRepresentation.vala:399: Unrecognized media: %s", _tmp13_); #line 399 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_free0 (_tmp21_); -#line 4352 "MediaDataRepresentation.c" + _g_free0 (_tmp13_); +#line 4758 "MediaDataRepresentation.c" } } } #line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 4358 "MediaDataRepresentation.c" +#line 4764 "MediaDataRepresentation.c" } #line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 4362 "MediaDataRepresentation.c" +#line 4768 "MediaDataRepresentation.c" } } -void media_source_collection_count_media (GeeCollection* media, gint* photo_count, gint* video_count) { +void +media_source_collection_count_media (GeeCollection* media, + gint* photo_count, + gint* video_count) +{ gint _vala_photo_count = 0; gint _vala_video_count = 0; GeeArrayList* photos = NULL; GeeArrayList* _tmp0_; GeeArrayList* videos = NULL; GeeArrayList* _tmp1_; - GeeCollection* _tmp2_; + gint _tmp2_; gint _tmp3_; gint _tmp4_; gint _tmp5_; - gint _tmp6_; #line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); #line 405 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4388,21 +4797,19 @@ void media_source_collection_count_media (GeeCollection* media, gint* photo_coun #line 406 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" videos = _tmp1_; #line 408 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = media; -#line 408 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - media_source_collection_filter_media (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection)); + media_source_collection_filter_media (media, G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection)); #line 410 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 410 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 410 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _vala_photo_count = _tmp4_; + _vala_photo_count = _tmp3_; #line 411 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 411 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 411 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _vala_video_count = _tmp6_; + _vala_video_count = _tmp5_; #line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (videos); #line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4411,61 +4818,57 @@ void media_source_collection_count_media (GeeCollection* media, gint* photo_coun if (photo_count) { #line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *photo_count = _vala_photo_count; -#line 4413 "MediaDataRepresentation.c" +#line 4820 "MediaDataRepresentation.c" } #line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (video_count) { #line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *video_count = _vala_video_count; -#line 4419 "MediaDataRepresentation.c" +#line 4826 "MediaDataRepresentation.c" } } -gboolean media_source_collection_has_photo (GeeCollection* media) { +gboolean +media_source_collection_has_photo (GeeCollection* media) +{ gboolean result = FALSE; #line 414 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (GEE_IS_COLLECTION (media), FALSE); -#line 4428 "MediaDataRepresentation.c" +#line 4837 "MediaDataRepresentation.c" { GeeIterator* _current_media_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; -#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = media; + GeeIterator* _tmp0_; #line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_ITERABLE, GeeIterable)); #line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _current_media_it = _tmp1_; + _current_media_it = _tmp0_; #line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 4441 "MediaDataRepresentation.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 4847 "MediaDataRepresentation.c" + GeeIterator* _tmp1_; MediaSource* current_media = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - MediaSource* _tmp6_; -#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = _current_media_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + MediaSource* _tmp4_; #line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _current_media_it; #line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 4456 "MediaDataRepresentation.c" +#line 4859 "MediaDataRepresentation.c" } #line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = _current_media_it; + _tmp2_ = _current_media_it; #line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - current_media = (MediaSource*) _tmp5_; + current_media = (MediaSource*) _tmp3_; #line 416 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = current_media; + _tmp4_ = current_media; #line 416 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_PHOTO)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_PHOTO)) { #line 417 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = TRUE; #line 417 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4474,68 +4877,64 @@ gboolean media_source_collection_has_photo (GeeCollection* media) { _g_object_unref0 (_current_media_it); #line 417 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4476 "MediaDataRepresentation.c" +#line 4879 "MediaDataRepresentation.c" } #line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (current_media); -#line 4480 "MediaDataRepresentation.c" +#line 4883 "MediaDataRepresentation.c" } #line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_current_media_it); -#line 4484 "MediaDataRepresentation.c" +#line 4887 "MediaDataRepresentation.c" } #line 421 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = FALSE; #line 421 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4490 "MediaDataRepresentation.c" +#line 4893 "MediaDataRepresentation.c" } -gboolean media_source_collection_has_video (GeeCollection* media) { +gboolean +media_source_collection_has_video (GeeCollection* media) +{ gboolean result = FALSE; #line 424 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (GEE_IS_COLLECTION (media), FALSE); -#line 4498 "MediaDataRepresentation.c" +#line 4903 "MediaDataRepresentation.c" { GeeIterator* _current_media_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = media; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_ITERABLE, GeeIterable)); #line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _current_media_it = _tmp1_; + _current_media_it = _tmp0_; #line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 4511 "MediaDataRepresentation.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 4913 "MediaDataRepresentation.c" + GeeIterator* _tmp1_; MediaSource* current_media = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - MediaSource* _tmp6_; -#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = _current_media_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + MediaSource* _tmp4_; #line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _current_media_it; #line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 4526 "MediaDataRepresentation.c" +#line 4925 "MediaDataRepresentation.c" } #line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = _current_media_it; + _tmp2_ = _current_media_it; #line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - current_media = (MediaSource*) _tmp5_; + current_media = (MediaSource*) _tmp3_; #line 426 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = current_media; + _tmp4_ = current_media; #line 426 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_VIDEO)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_VIDEO)) { #line 427 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = TRUE; #line 427 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4544,123 +4943,153 @@ gboolean media_source_collection_has_video (GeeCollection* media) { _g_object_unref0 (_current_media_it); #line 427 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4546 "MediaDataRepresentation.c" +#line 4945 "MediaDataRepresentation.c" } #line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (current_media); -#line 4550 "MediaDataRepresentation.c" +#line 4949 "MediaDataRepresentation.c" } #line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_current_media_it); -#line 4554 "MediaDataRepresentation.c" +#line 4953 "MediaDataRepresentation.c" } #line 431 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = FALSE; #line 431 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4560 "MediaDataRepresentation.c" +#line 4959 "MediaDataRepresentation.c" } -static MediaSourceHoldingTank* media_source_collection_real_create_trashcan (MediaSourceCollection* self) { +static MediaSourceHoldingTank* +media_source_collection_real_create_trashcan (MediaSourceCollection* self) +{ #line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_collection_create_trashcan'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 4569 "MediaDataRepresentation.c" +#line 4970 "MediaDataRepresentation.c" } -MediaSourceHoldingTank* media_source_collection_create_trashcan (MediaSourceCollection* self) { +MediaSourceHoldingTank* +media_source_collection_create_trashcan (MediaSourceCollection* self) +{ #line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->create_trashcan (self); -#line 4578 "MediaDataRepresentation.c" +#line 4981 "MediaDataRepresentation.c" } -static MediaSourceHoldingTank* media_source_collection_real_create_offline_bin (MediaSourceCollection* self) { +static MediaSourceHoldingTank* +media_source_collection_real_create_offline_bin (MediaSourceCollection* self) +{ #line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_collection_create_offline_bin'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 4587 "MediaDataRepresentation.c" +#line 4992 "MediaDataRepresentation.c" } -MediaSourceHoldingTank* media_source_collection_create_offline_bin (MediaSourceCollection* self) { +MediaSourceHoldingTank* +media_source_collection_create_offline_bin (MediaSourceCollection* self) +{ #line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->create_offline_bin (self); -#line 4596 "MediaDataRepresentation.c" +#line 5003 "MediaDataRepresentation.c" } -static MediaMonitor* media_source_collection_real_create_media_monitor (MediaSourceCollection* self, Workers* workers, GCancellable* cancellable) { +static MediaMonitor* +media_source_collection_real_create_media_monitor (MediaSourceCollection* self, + Workers* workers, + GCancellable* cancellable) +{ #line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_collection_create_media_monitor'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 4605 "MediaDataRepresentation.c" +#line 5016 "MediaDataRepresentation.c" } -MediaMonitor* media_source_collection_create_media_monitor (MediaSourceCollection* self, Workers* workers, GCancellable* cancellable) { +MediaMonitor* +media_source_collection_create_media_monitor (MediaSourceCollection* self, + Workers* workers, + GCancellable* cancellable) +{ #line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->create_media_monitor (self, workers, cancellable); -#line 4614 "MediaDataRepresentation.c" +#line 5029 "MediaDataRepresentation.c" } -static gchar* media_source_collection_real_get_typename (MediaSourceCollection* self) { +static gchar* +media_source_collection_real_get_typename (MediaSourceCollection* self) +{ #line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_collection_get_typename'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 4623 "MediaDataRepresentation.c" +#line 5040 "MediaDataRepresentation.c" } -gchar* media_source_collection_get_typename (MediaSourceCollection* self) { +gchar* +media_source_collection_get_typename (MediaSourceCollection* self) +{ #line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->get_typename (self); -#line 4632 "MediaDataRepresentation.c" +#line 5051 "MediaDataRepresentation.c" } -static gboolean media_source_collection_real_is_file_recognized (MediaSourceCollection* self, GFile* file) { +static gboolean +media_source_collection_real_is_file_recognized (MediaSourceCollection* self, + GFile* file) +{ gboolean _tmp0_ = FALSE; #line 442 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_collection_is_file_recognized'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 442 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 4642 "MediaDataRepresentation.c" +#line 5064 "MediaDataRepresentation.c" } -gboolean media_source_collection_is_file_recognized (MediaSourceCollection* self, GFile* file) { +gboolean +media_source_collection_is_file_recognized (MediaSourceCollection* self, + GFile* file) +{ #line 442 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), FALSE); #line 442 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->is_file_recognized (self, file); -#line 4651 "MediaDataRepresentation.c" +#line 5076 "MediaDataRepresentation.c" } -static gpointer _source_holding_tank_ref0 (gpointer self) { +static gpointer +_source_holding_tank_ref0 (gpointer self) +{ #line 445 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? source_holding_tank_ref (self) : NULL; -#line 4658 "MediaDataRepresentation.c" +#line 5085 "MediaDataRepresentation.c" } -MediaSourceHoldingTank* media_source_collection_get_trashcan (MediaSourceCollection* self) { +MediaSourceHoldingTank* +media_source_collection_get_trashcan (MediaSourceCollection* self) +{ MediaSourceHoldingTank* result = NULL; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; @@ -4674,11 +5103,13 @@ MediaSourceHoldingTank* media_source_collection_get_trashcan (MediaSourceCollect result = _tmp1_; #line 445 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4676 "MediaDataRepresentation.c" +#line 5105 "MediaDataRepresentation.c" } -MediaSourceHoldingTank* media_source_collection_get_offline_bin (MediaSourceCollection* self) { +MediaSourceHoldingTank* +media_source_collection_get_offline_bin (MediaSourceCollection* self) +{ MediaSourceHoldingTank* result = NULL; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; @@ -4692,111 +5123,133 @@ MediaSourceHoldingTank* media_source_collection_get_offline_bin (MediaSourceColl result = _tmp1_; #line 449 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4694 "MediaDataRepresentation.c" +#line 5125 "MediaDataRepresentation.c" } -static MediaSource* media_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* self, gint64 numeric_id) { +static MediaSource* +media_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* self, + gint64 numeric_id) +{ #line 455 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_collection_fetch_by_numeric_id'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 455 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 4703 "MediaDataRepresentation.c" +#line 5137 "MediaDataRepresentation.c" } -MediaSource* media_source_collection_fetch_by_numeric_id (MediaSourceCollection* self, gint64 numeric_id) { +MediaSource* +media_source_collection_fetch_by_numeric_id (MediaSourceCollection* self, + gint64 numeric_id) +{ #line 455 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 455 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->fetch_by_numeric_id (self, numeric_id); -#line 4712 "MediaDataRepresentation.c" +#line 5149 "MediaDataRepresentation.c" } -static void media_source_collection_real_notify_import_roll_altered (MediaSourceCollection* self) { +static void +media_source_collection_real_notify_import_roll_altered (MediaSourceCollection* self) +{ #line 458 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_IMPORT_ROLL_ALTERED_SIGNAL], 0); -#line 4719 "MediaDataRepresentation.c" +#line 5158 "MediaDataRepresentation.c" } -void media_source_collection_notify_import_roll_altered (MediaSourceCollection* self) { +void +media_source_collection_notify_import_roll_altered (MediaSourceCollection* self) +{ #line 457 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 457 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_import_roll_altered (self); -#line 4728 "MediaDataRepresentation.c" +#line 5169 "MediaDataRepresentation.c" } -static void media_source_collection_real_notify_flagged_contents_altered (MediaSourceCollection* self) { +static void +media_source_collection_real_notify_flagged_contents_altered (MediaSourceCollection* self) +{ #line 462 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_FLAGGED_CONTENTS_ALTERED_SIGNAL], 0); -#line 4735 "MediaDataRepresentation.c" +#line 5178 "MediaDataRepresentation.c" } -void media_source_collection_notify_flagged_contents_altered (MediaSourceCollection* self) { +void +media_source_collection_notify_flagged_contents_altered (MediaSourceCollection* self) +{ #line 461 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 461 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_flagged_contents_altered (self); -#line 4744 "MediaDataRepresentation.c" +#line 5189 "MediaDataRepresentation.c" } -static void media_source_collection_real_notify_media_import_starting (MediaSourceCollection* self, GeeCollection* media) { - GeeCollection* _tmp0_; +static void +media_source_collection_real_notify_media_import_starting (MediaSourceCollection* self, + GeeCollection* media) +{ #line 465 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); #line 466 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = media; -#line 466 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_STARTING_SIGNAL], 0, _tmp0_); -#line 4756 "MediaDataRepresentation.c" + g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_STARTING_SIGNAL], 0, media); +#line 5201 "MediaDataRepresentation.c" } -void media_source_collection_notify_media_import_starting (MediaSourceCollection* self, GeeCollection* media) { +void +media_source_collection_notify_media_import_starting (MediaSourceCollection* self, + GeeCollection* media) +{ #line 465 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 465 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_media_import_starting (self, media); -#line 4765 "MediaDataRepresentation.c" +#line 5213 "MediaDataRepresentation.c" } -static void media_source_collection_real_notify_media_import_completed (MediaSourceCollection* self, GeeCollection* media) { - GeeCollection* _tmp0_; +static void +media_source_collection_real_notify_media_import_completed (MediaSourceCollection* self, + GeeCollection* media) +{ #line 469 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); #line 470 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = media; -#line 470 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_COMPLETED_SIGNAL], 0, _tmp0_); -#line 4777 "MediaDataRepresentation.c" + g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_COMPLETED_SIGNAL], 0, media); +#line 5225 "MediaDataRepresentation.c" } -void media_source_collection_notify_media_import_completed (MediaSourceCollection* self, GeeCollection* media) { +void +media_source_collection_notify_media_import_completed (MediaSourceCollection* self, + GeeCollection* media) +{ #line 469 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 469 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_media_import_completed (self, media); -#line 4786 "MediaDataRepresentation.c" +#line 5237 "MediaDataRepresentation.c" } -static void media_source_collection_real_items_altered (DataCollection* base, GeeMap* items) { +static void +media_source_collection_real_items_altered (DataCollection* base, + GeeMap* items) +{ MediaSourceCollection * self; GeeArrayList* to_trashcan = NULL; GeeArrayList* to_offline = NULL; gboolean flagged_altered = FALSE; - GeeArrayList* _tmp54_; - GeeArrayList* _tmp58_; - gboolean _tmp62_; - GeeMap* _tmp63_; + GeeArrayList* _tmp43_; + GeeArrayList* _tmp47_; + gboolean _tmp51_; #line 473 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection); #line 473 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4807,94 +5260,80 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge to_offline = NULL; #line 476 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = FALSE; -#line 4809 "MediaDataRepresentation.c" +#line 5262 "MediaDataRepresentation.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = items; + _tmp0_ = gee_map_get_keys (items); #line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _tmp1_; #line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = _tmp2_; -#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 4836 "MediaDataRepresentation.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 5286 "MediaDataRepresentation.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp6_; + gpointer _tmp7_; Alteration* alteration = NULL; - GeeMap* _tmp10_; - DataObject* _tmp11_; - gpointer _tmp12_; + DataObject* _tmp8_; + gpointer _tmp9_; MediaSource* source = NULL; - DataObject* _tmp13_; + DataObject* _tmp10_; + MediaSource* _tmp11_; + Alteration* _tmp12_; + gboolean _tmp13_ = FALSE; MediaSource* _tmp14_; - Alteration* _tmp15_; - gboolean _tmp16_; - gboolean _tmp17_ = FALSE; - MediaSource* _tmp18_; - gboolean _tmp19_; - gboolean _tmp28_ = FALSE; - MediaSource* _tmp29_; - gboolean _tmp30_; + gboolean _tmp22_ = FALSE; + MediaSource* _tmp23_; Flaggable* flaggable = NULL; - MediaSource* _tmp39_; - Flaggable* _tmp40_; - Flaggable* _tmp41_; -#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = _object_it; + MediaSource* _tmp31_; + Flaggable* _tmp32_; + Flaggable* _tmp33_; #line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 4869 "MediaDataRepresentation.c" +#line 5312 "MediaDataRepresentation.c" } #line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - object = (DataObject*) _tmp9_; -#line 478 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp10_ = items; + object = (DataObject*) _tmp7_; #line 478 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp11_ = object; + _tmp8_ = object; #line 478 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp12_ = gee_map_get (_tmp10_, _tmp11_); + _tmp9_ = gee_map_get (items, _tmp8_); #line 478 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - alteration = (Alteration*) _tmp12_; + alteration = (Alteration*) _tmp9_; #line 479 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp13_ = object; + _tmp10_ = object; #line 479 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource)); #line 479 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - source = _tmp14_; + source = _tmp11_; #line 481 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp15_ = alteration; + _tmp12_ = alteration; #line 481 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp16_ = alteration_has_subject (_tmp15_, "metadata"); -#line 481 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp16_) { + if (!alteration_has_subject (_tmp12_, "metadata")) { #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4903,63 +5342,58 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _g_object_unref0 (object); #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" continue; -#line 4905 "MediaDataRepresentation.c" +#line 5344 "MediaDataRepresentation.c" } #line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp18_ = source; -#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp19_ = media_source_is_trashed (_tmp18_); -#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp19_) { -#line 4913 "MediaDataRepresentation.c" - MediaSourceHoldingTank* _tmp20_; - MediaSourceHoldingTank* _tmp21_; - MediaSource* _tmp22_; - gboolean _tmp23_; + _tmp14_ = source; #line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp20_ = media_source_collection_get_trashcan (self); + if (media_source_is_trashed (_tmp14_)) { +#line 5350 "MediaDataRepresentation.c" + MediaSourceHoldingTank* _tmp15_; + MediaSourceHoldingTank* _tmp16_; + MediaSource* _tmp17_; #line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp21_ = _tmp20_; + _tmp15_ = media_source_collection_get_trashcan (self); #line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp22_ = source; + _tmp16_ = _tmp15_; #line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp23_ = source_holding_tank_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_SOURCE, DataSource)); + _tmp17_ = source; #line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp17_ = !_tmp23_; + _tmp13_ = !source_holding_tank_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource)); #line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _source_holding_tank_unref0 (_tmp21_); -#line 4930 "MediaDataRepresentation.c" + _source_holding_tank_unref0 (_tmp16_); +#line 5364 "MediaDataRepresentation.c" } else { #line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp17_ = FALSE; -#line 4934 "MediaDataRepresentation.c" + _tmp13_ = FALSE; +#line 5368 "MediaDataRepresentation.c" } #line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp17_) { -#line 4938 "MediaDataRepresentation.c" - GeeArrayList* _tmp24_; - GeeArrayList* _tmp26_; - MediaSource* _tmp27_; + if (_tmp13_) { +#line 5372 "MediaDataRepresentation.c" + GeeArrayList* _tmp18_; + GeeArrayList* _tmp20_; + MediaSource* _tmp21_; #line 485 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp24_ = to_trashcan; + _tmp18_ = to_trashcan; #line 485 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp24_ == NULL) { -#line 4946 "MediaDataRepresentation.c" - GeeArrayList* _tmp25_; + if (_tmp18_ == NULL) { +#line 5380 "MediaDataRepresentation.c" + GeeArrayList* _tmp19_; #line 486 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp25_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp19_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 486 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (to_trashcan); #line 486 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - to_trashcan = _tmp25_; -#line 4954 "MediaDataRepresentation.c" + to_trashcan = _tmp19_; +#line 5388 "MediaDataRepresentation.c" } #line 488 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp26_ = to_trashcan; + _tmp20_ = to_trashcan; #line 488 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp27_ = source; + _tmp21_ = source; #line 488 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp27_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); #line 491 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); #line 491 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4968,138 +5402,124 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _g_object_unref0 (object); #line 491 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" continue; -#line 4970 "MediaDataRepresentation.c" +#line 5404 "MediaDataRepresentation.c" } #line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp29_ = source; -#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp30_ = media_source_is_offline (_tmp29_); -#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp30_) { -#line 4978 "MediaDataRepresentation.c" - MediaSourceHoldingTank* _tmp31_; - MediaSourceHoldingTank* _tmp32_; - MediaSource* _tmp33_; - gboolean _tmp34_; + _tmp23_ = source; #line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp31_ = media_source_collection_get_offline_bin (self); + if (media_source_is_offline (_tmp23_)) { +#line 5410 "MediaDataRepresentation.c" + MediaSourceHoldingTank* _tmp24_; + MediaSourceHoldingTank* _tmp25_; + MediaSource* _tmp26_; #line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp32_ = _tmp31_; + _tmp24_ = media_source_collection_get_offline_bin (self); #line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp33_ = source; + _tmp25_ = _tmp24_; #line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp34_ = source_holding_tank_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_SOURCE, DataSource)); + _tmp26_ = source; #line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp28_ = !_tmp34_; + _tmp22_ = !source_holding_tank_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource)); #line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _source_holding_tank_unref0 (_tmp32_); -#line 4995 "MediaDataRepresentation.c" + _source_holding_tank_unref0 (_tmp25_); +#line 5424 "MediaDataRepresentation.c" } else { #line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp28_ = FALSE; -#line 4999 "MediaDataRepresentation.c" + _tmp22_ = FALSE; +#line 5428 "MediaDataRepresentation.c" } #line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp28_) { -#line 5003 "MediaDataRepresentation.c" - GeeArrayList* _tmp35_; - GeeArrayList* _tmp37_; - MediaSource* _tmp38_; + if (_tmp22_) { +#line 5432 "MediaDataRepresentation.c" + GeeArrayList* _tmp27_; + GeeArrayList* _tmp29_; + MediaSource* _tmp30_; #line 495 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp35_ = to_offline; + _tmp27_ = to_offline; #line 495 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp35_ == NULL) { -#line 5011 "MediaDataRepresentation.c" - GeeArrayList* _tmp36_; + if (_tmp27_ == NULL) { +#line 5440 "MediaDataRepresentation.c" + GeeArrayList* _tmp28_; #line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp36_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp28_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (to_offline); #line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - to_offline = _tmp36_; -#line 5019 "MediaDataRepresentation.c" + to_offline = _tmp28_; +#line 5448 "MediaDataRepresentation.c" } #line 498 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp37_ = to_offline; + _tmp29_ = to_offline; #line 498 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp38_ = source; + _tmp30_ = source; #line 498 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp38_); -#line 5027 "MediaDataRepresentation.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp30_); +#line 5456 "MediaDataRepresentation.c" } #line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp39_ = source; + _tmp31_ = source; #line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp39_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp39_) : NULL); + _tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp31_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp31_) : NULL); #line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - flaggable = _tmp40_; + flaggable = _tmp32_; #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp41_ = flaggable; + _tmp33_ = flaggable; #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp41_ != NULL) { -#line 5039 "MediaDataRepresentation.c" - Flaggable* _tmp42_; - gboolean _tmp43_; -#line 503 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp42_ = flaggable; + if (_tmp33_ != NULL) { +#line 5468 "MediaDataRepresentation.c" + Flaggable* _tmp34_; #line 503 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp43_ = flaggable_is_flagged (_tmp42_); + _tmp34_ = flaggable; #line 503 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp43_) { -#line 5048 "MediaDataRepresentation.c" - gboolean _tmp44_ = FALSE; - GeeSet* _tmp45_; - MediaSource* _tmp46_; - gboolean _tmp47_; + if (flaggable_is_flagged (_tmp34_)) { +#line 5474 "MediaDataRepresentation.c" + gboolean _tmp35_ = FALSE; + GeeSet* _tmp36_; + MediaSource* _tmp37_; #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp45_ = self->priv->flagged; + _tmp36_ = self->priv->flagged; #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp46_ = source; + _tmp37_ = source; #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp47_ = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_COLLECTION, GeeCollection), _tmp46_); + if (gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_)) { #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp47_) { -#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp44_ = TRUE; -#line 5063 "MediaDataRepresentation.c" + _tmp35_ = TRUE; +#line 5486 "MediaDataRepresentation.c" } else { - gboolean _tmp48_; + gboolean _tmp38_; #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp48_ = flagged_altered; + _tmp38_ = flagged_altered; #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp44_ = _tmp48_; -#line 5070 "MediaDataRepresentation.c" + _tmp35_ = _tmp38_; +#line 5493 "MediaDataRepresentation.c" } #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - flagged_altered = _tmp44_; -#line 5074 "MediaDataRepresentation.c" + flagged_altered = _tmp35_; +#line 5497 "MediaDataRepresentation.c" } else { - gboolean _tmp49_ = FALSE; - GeeSet* _tmp50_; - MediaSource* _tmp51_; - gboolean _tmp52_; -#line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp50_ = self->priv->flagged; + gboolean _tmp39_ = FALSE; + GeeSet* _tmp40_; + MediaSource* _tmp41_; #line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp51_ = source; + _tmp40_ = self->priv->flagged; #line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp52_ = gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection), _tmp51_); + _tmp41_ = source; #line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp52_) { + if (gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_COLLECTION, GeeCollection), _tmp41_)) { #line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp49_ = TRUE; -#line 5090 "MediaDataRepresentation.c" + _tmp39_ = TRUE; +#line 5510 "MediaDataRepresentation.c" } else { - gboolean _tmp53_; + gboolean _tmp42_; #line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp53_ = flagged_altered; + _tmp42_ = flagged_altered; #line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp49_ = _tmp53_; -#line 5097 "MediaDataRepresentation.c" + _tmp39_ = _tmp42_; +#line 5517 "MediaDataRepresentation.c" } #line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - flagged_altered = _tmp49_; -#line 5101 "MediaDataRepresentation.c" + flagged_altered = _tmp39_; +#line 5521 "MediaDataRepresentation.c" } } #line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5110,89 +5530,92 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _alteration_unref0 (alteration); #line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (object); -#line 5112 "MediaDataRepresentation.c" +#line 5532 "MediaDataRepresentation.c" } #line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_object_it); -#line 5116 "MediaDataRepresentation.c" +#line 5536 "MediaDataRepresentation.c" } #line 510 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp54_ = to_trashcan; + _tmp43_ = to_trashcan; #line 510 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp54_ != NULL) { -#line 5122 "MediaDataRepresentation.c" - MediaSourceHoldingTank* _tmp55_; - MediaSourceHoldingTank* _tmp56_; - GeeArrayList* _tmp57_; + if (_tmp43_ != NULL) { +#line 5542 "MediaDataRepresentation.c" + MediaSourceHoldingTank* _tmp44_; + MediaSourceHoldingTank* _tmp45_; + GeeArrayList* _tmp46_; #line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp55_ = media_source_collection_get_trashcan (self); + _tmp44_ = media_source_collection_get_trashcan (self); #line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp56_ = _tmp55_; + _tmp45_ = _tmp44_; #line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp57_ = to_trashcan; + _tmp46_ = to_trashcan; #line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - source_holding_tank_unlink_and_hold (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_COLLECTION, GeeCollection)); + source_holding_tank_unlink_and_hold (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_COLLECTION, GeeCollection)); #line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _source_holding_tank_unref0 (_tmp56_); -#line 5136 "MediaDataRepresentation.c" + _source_holding_tank_unref0 (_tmp45_); +#line 5556 "MediaDataRepresentation.c" } #line 513 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp58_ = to_offline; + _tmp47_ = to_offline; #line 513 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp58_ != NULL) { -#line 5142 "MediaDataRepresentation.c" - MediaSourceHoldingTank* _tmp59_; - MediaSourceHoldingTank* _tmp60_; - GeeArrayList* _tmp61_; + if (_tmp47_ != NULL) { +#line 5562 "MediaDataRepresentation.c" + MediaSourceHoldingTank* _tmp48_; + MediaSourceHoldingTank* _tmp49_; + GeeArrayList* _tmp50_; #line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp59_ = media_source_collection_get_offline_bin (self); + _tmp48_ = media_source_collection_get_offline_bin (self); #line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp60_ = _tmp59_; + _tmp49_ = _tmp48_; #line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp61_ = to_offline; + _tmp50_ = to_offline; #line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - source_holding_tank_unlink_and_hold (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection)); + source_holding_tank_unlink_and_hold (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection)); #line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _source_holding_tank_unref0 (_tmp60_); -#line 5156 "MediaDataRepresentation.c" + _source_holding_tank_unref0 (_tmp49_); +#line 5576 "MediaDataRepresentation.c" } #line 516 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp62_ = flagged_altered; + _tmp51_ = flagged_altered; #line 516 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp62_) { + if (_tmp51_) { #line 517 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_notify_flagged_contents_altered (self); -#line 5164 "MediaDataRepresentation.c" +#line 5584 "MediaDataRepresentation.c" } #line 519 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp63_ = items; -#line 519 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - DATA_COLLECTION_CLASS (media_source_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp63_); + DATA_COLLECTION_CLASS (media_source_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), items); #line 473 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (to_offline); #line 473 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (to_trashcan); -#line 5174 "MediaDataRepresentation.c" +#line 5592 "MediaDataRepresentation.c" } -static void _media_source_collection_on_master_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self) { +static void +_media_source_collection_on_master_replaced_media_source_master_replaced (MediaSource* _sender, + GFile* old_file, + GFile* new_file, + gpointer self) +{ #line 531 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_on_master_replaced ((MediaSourceCollection*) self, _sender, old_file, new_file); -#line 5181 "MediaDataRepresentation.c" +#line 5604 "MediaDataRepresentation.c" } -static void media_source_collection_real_notify_contents_altered (DataCollection* base, GeeIterable* added, GeeIterable* removed) { +static void +media_source_collection_real_notify_contents_altered (DataCollection* base, + GeeIterable* added, + GeeIterable* removed) +{ MediaSourceCollection * self; gboolean import_roll_changed = FALSE; gboolean flagged_altered = FALSE; - GeeIterable* _tmp0_; - GeeIterable* _tmp38_; - gboolean _tmp74_; - gboolean _tmp75_; - GeeIterable* _tmp76_; - GeeIterable* _tmp77_; + gboolean _tmp60_; + gboolean _tmp61_; #line 522 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection); #line 522 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5204,192 +5627,172 @@ static void media_source_collection_real_notify_contents_altered (DataCollection #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = FALSE; #line 526 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = added; -#line 526 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp0_ != NULL) { -#line 5209 "MediaDataRepresentation.c" + if (added != NULL) { +#line 5630 "MediaDataRepresentation.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_; - GeeIterator* _tmp2_; -#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = added; + GeeIterator* _tmp0_; #line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = gee_iterable_iterator (_tmp1_); + _tmp0_ = gee_iterable_iterator (added); #line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _object_it = _tmp2_; + _object_it = _tmp0_; #line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 5222 "MediaDataRepresentation.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 5640 "MediaDataRepresentation.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp2_; + gpointer _tmp3_; MediaSource* media = NULL; - DataObject* _tmp7_; - MediaSource* _tmp8_; - GeeHashMap* _tmp9_; + DataObject* _tmp4_; + MediaSource* _tmp5_; + GeeHashMap* _tmp6_; + MediaSource* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; MediaSource* _tmp10_; - GFile* _tmp11_; - GFile* _tmp12_; - MediaSource* _tmp13_; - MediaSource* _tmp14_; + MediaSource* _tmp11_; ImportID import_id = {0}; - MediaSource* _tmp15_; - ImportID _tmp16_ = {0}; - gboolean _tmp17_; + MediaSource* _tmp12_; + ImportID _tmp13_ = {0}; Flaggable* flaggable = NULL; - MediaSource* _tmp23_; - Flaggable* _tmp24_; - Flaggable* _tmp25_; -#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = _object_it; + MediaSource* _tmp19_; + Flaggable* _tmp20_; + Flaggable* _tmp21_; #line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp1_ = _object_it; #line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 5253 "MediaDataRepresentation.c" +#line 5667 "MediaDataRepresentation.c" } #line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = _object_it; + _tmp2_ = _object_it; #line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - object = (DataObject*) _tmp6_; + object = (DataObject*) _tmp3_; #line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = object; + _tmp4_ = object; #line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource)); #line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - media = _tmp8_; + media = _tmp5_; #line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp9_ = self->priv->by_master_file; + _tmp6_ = self->priv->by_master_file; #line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp10_ = media; + _tmp7_ = media; #line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp11_ = media_source_get_master_file (_tmp10_); + _tmp8_ = media_source_get_master_file (_tmp7_); #line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp12_ = _tmp11_; + _tmp9_ = _tmp8_; #line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp13_ = media; + _tmp10_ = media; #line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_, _tmp13_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, _tmp10_); #line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp9_); #line 531 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp14_ = media; + _tmp11_ = media; #line 531 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_connect (_tmp14_, "master-replaced", (GCallback) _media_source_collection_on_master_replaced_media_source_master_replaced, self); + g_signal_connect (_tmp11_, "master-replaced", (GCallback) _media_source_collection_on_master_replaced_media_source_master_replaced, self); #line 533 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp15_ = media; + _tmp12_ = media; #line 533 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - media_source_get_import_id (_tmp15_, &_tmp16_); + media_source_get_import_id (_tmp12_, &_tmp13_); #line 533 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - import_id = _tmp16_; -#line 534 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp17_ = import_id_is_valid (&import_id); + import_id = _tmp13_; #line 534 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp17_) { -#line 5295 "MediaDataRepresentation.c" - GeeTreeSet* _tmp18_; - ImportID _tmp19_; - GeeMultiMap* _tmp20_; - ImportID _tmp21_; - MediaSource* _tmp22_; + if (import_id_is_valid (&import_id)) { +#line 5707 "MediaDataRepresentation.c" + GeeTreeSet* _tmp14_; + ImportID _tmp15_; + GeeMultiMap* _tmp16_; + ImportID _tmp17_; + MediaSource* _tmp18_; #line 535 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp18_ = self->priv->sorted_import_ids; + _tmp14_ = self->priv->sorted_import_ids; #line 535 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp19_ = import_id; + _tmp15_ = import_id; #line 535 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp19_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp15_); #line 536 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp20_ = self->priv->import_rolls; + _tmp16_ = self->priv->import_rolls; #line 536 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp21_ = import_id; + _tmp17_ = import_id; #line 536 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp22_ = media; + _tmp18_ = media; #line 536 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_multi_map_set (_tmp20_, &_tmp21_, _tmp22_); + gee_multi_map_set (_tmp16_, &_tmp17_, _tmp18_); #line 538 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" import_roll_changed = TRUE; -#line 5317 "MediaDataRepresentation.c" +#line 5729 "MediaDataRepresentation.c" } #line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp23_ = media; + _tmp19_ = media; #line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp23_) : NULL); + _tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp19_) : NULL); #line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - flaggable = _tmp24_; + flaggable = _tmp20_; #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp25_ = flaggable; + _tmp21_ = flaggable; #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp25_ != NULL) { -#line 5329 "MediaDataRepresentation.c" - Flaggable* _tmp26_; - gboolean _tmp27_; + if (_tmp21_ != NULL) { +#line 5741 "MediaDataRepresentation.c" + Flaggable* _tmp22_; #line 543 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp26_ = flaggable; + _tmp22_ = flaggable; #line 543 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp27_ = flaggable_is_flagged (_tmp26_); -#line 543 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp27_) { -#line 5338 "MediaDataRepresentation.c" - gboolean _tmp28_ = FALSE; - GeeSet* _tmp29_; - MediaSource* _tmp30_; - gboolean _tmp31_; -#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp29_ = self->priv->flagged; + if (flaggable_is_flagged (_tmp22_)) { +#line 5747 "MediaDataRepresentation.c" + gboolean _tmp23_ = FALSE; + GeeSet* _tmp24_; + MediaSource* _tmp25_; #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp30_ = media; + _tmp24_ = self->priv->flagged; #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp31_ = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), _tmp30_); + _tmp25_ = media; #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp31_) { + if (gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_)) { #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp28_ = TRUE; -#line 5353 "MediaDataRepresentation.c" + _tmp23_ = TRUE; +#line 5759 "MediaDataRepresentation.c" } else { - gboolean _tmp32_; + gboolean _tmp26_; #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp32_ = flagged_altered; + _tmp26_ = flagged_altered; #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp28_ = _tmp32_; -#line 5360 "MediaDataRepresentation.c" + _tmp23_ = _tmp26_; +#line 5766 "MediaDataRepresentation.c" } #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - flagged_altered = _tmp28_; -#line 5364 "MediaDataRepresentation.c" + flagged_altered = _tmp23_; +#line 5770 "MediaDataRepresentation.c" } else { - gboolean _tmp33_ = FALSE; - GeeSet* _tmp34_; - MediaSource* _tmp35_; - gboolean _tmp36_; -#line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp34_ = self->priv->flagged; + gboolean _tmp27_ = FALSE; + GeeSet* _tmp28_; + MediaSource* _tmp29_; #line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp35_ = media; + _tmp28_ = self->priv->flagged; #line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp36_ = gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection), _tmp35_); + _tmp29_ = media; #line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp36_) { + if (gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection), _tmp29_)) { #line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp33_ = TRUE; -#line 5380 "MediaDataRepresentation.c" + _tmp27_ = TRUE; +#line 5783 "MediaDataRepresentation.c" } else { - gboolean _tmp37_; + gboolean _tmp30_; #line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp37_ = flagged_altered; + _tmp30_ = flagged_altered; #line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp33_ = _tmp37_; -#line 5387 "MediaDataRepresentation.c" + _tmp27_ = _tmp30_; +#line 5790 "MediaDataRepresentation.c" } #line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - flagged_altered = _tmp33_; -#line 5391 "MediaDataRepresentation.c" + flagged_altered = _tmp27_; +#line 5794 "MediaDataRepresentation.c" } } #line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5398,230 +5801,205 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _g_object_unref0 (media); #line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (object); -#line 5400 "MediaDataRepresentation.c" +#line 5803 "MediaDataRepresentation.c" } #line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_object_it); -#line 5404 "MediaDataRepresentation.c" +#line 5807 "MediaDataRepresentation.c" } } #line 551 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp38_ = removed; -#line 551 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp38_ != NULL) { -#line 5411 "MediaDataRepresentation.c" + if (removed != NULL) { +#line 5812 "MediaDataRepresentation.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp39_; - GeeIterator* _tmp40_; + GeeIterator* _tmp31_; #line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp39_ = removed; + _tmp31_ = gee_iterable_iterator (removed); #line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp40_ = gee_iterable_iterator (_tmp39_); -#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _object_it = _tmp40_; + _object_it = _tmp31_; #line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 5424 "MediaDataRepresentation.c" - GeeIterator* _tmp41_; - gboolean _tmp42_; +#line 5822 "MediaDataRepresentation.c" + GeeIterator* _tmp32_; DataObject* object = NULL; - GeeIterator* _tmp43_; - gpointer _tmp44_; + GeeIterator* _tmp33_; + gpointer _tmp34_; MediaSource* media = NULL; - DataObject* _tmp45_; - MediaSource* _tmp46_; + DataObject* _tmp35_; + MediaSource* _tmp36_; gboolean is_removed = FALSE; - GeeHashMap* _tmp47_; - MediaSource* _tmp48_; - GFile* _tmp49_; - GFile* _tmp50_; - gboolean _tmp51_; - gboolean _tmp52_; - gboolean _tmp53_; - MediaSource* _tmp54_; - guint _tmp55_; + GeeHashMap* _tmp37_; + MediaSource* _tmp38_; + GFile* _tmp39_; + GFile* _tmp40_; + gboolean _tmp41_; + gboolean _tmp42_; + gboolean _tmp43_; + MediaSource* _tmp44_; + guint _tmp45_; ImportID import_id = {0}; - MediaSource* _tmp56_; - ImportID _tmp57_ = {0}; - gboolean _tmp58_; - gboolean _tmp69_ = FALSE; - GeeSet* _tmp70_; - MediaSource* _tmp71_; - gboolean _tmp72_; -#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp41_ = _object_it; + MediaSource* _tmp46_; + ImportID _tmp47_ = {0}; + gboolean _tmp56_ = FALSE; + GeeSet* _tmp57_; + MediaSource* _tmp58_; #line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp42_ = gee_iterator_next (_tmp41_); + _tmp32_ = _object_it; #line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp42_) { + if (!gee_iterator_next (_tmp32_)) { #line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 5459 "MediaDataRepresentation.c" +#line 5852 "MediaDataRepresentation.c" } #line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp43_ = _object_it; + _tmp33_ = _object_it; #line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp44_ = gee_iterator_get (_tmp43_); + _tmp34_ = gee_iterator_get (_tmp33_); #line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - object = (DataObject*) _tmp44_; + object = (DataObject*) _tmp34_; #line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp45_ = object; + _tmp35_ = object; #line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp46_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE, MediaSource)); #line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - media = _tmp46_; + media = _tmp36_; #line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp47_ = self->priv->by_master_file; + _tmp37_ = self->priv->by_master_file; #line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp48_ = media; + _tmp38_ = media; #line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp49_ = media_source_get_master_file (_tmp48_); + _tmp39_ = media_source_get_master_file (_tmp38_); #line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp50_ = _tmp49_; + _tmp40_ = _tmp39_; #line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp51_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp50_, NULL); + _tmp41_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp40_, NULL); #line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp52_ = _tmp51_; + _tmp42_ = _tmp41_; #line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp50_); + _g_object_unref0 (_tmp40_); #line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - is_removed = _tmp52_; + is_removed = _tmp42_; #line 556 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp53_ = is_removed; + _tmp43_ = is_removed; #line 556 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _vala_assert (_tmp53_, "is_removed"); + _vala_assert (_tmp43_, "is_removed"); #line 557 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp54_ = media; + _tmp44_ = media; #line 557 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_parse_name ("master-replaced", TYPE_MEDIA_SOURCE, &_tmp55_, NULL, FALSE); + g_signal_parse_name ("master-replaced", TYPE_MEDIA_SOURCE, &_tmp45_, NULL, FALSE); #line 557 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_handlers_disconnect_matched (_tmp54_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp55_, 0, NULL, (GCallback) _media_source_collection_on_master_replaced_media_source_master_replaced, self); + g_signal_handlers_disconnect_matched (_tmp44_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp45_, 0, NULL, (GCallback) _media_source_collection_on_master_replaced_media_source_master_replaced, self); #line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp56_ = media; + _tmp46_ = media; #line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - media_source_get_import_id (_tmp56_, &_tmp57_); + media_source_get_import_id (_tmp46_, &_tmp47_); #line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - import_id = _tmp57_; + import_id = _tmp47_; #line 560 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp58_ = import_id_is_valid (&import_id); -#line 560 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp58_) { -#line 5509 "MediaDataRepresentation.c" - GeeMultiMap* _tmp59_; - ImportID _tmp60_; - MediaSource* _tmp61_; - gboolean _tmp62_; - gboolean _tmp63_; - GeeMultiMap* _tmp64_; - ImportID _tmp65_; - gboolean _tmp66_; -#line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp59_ = self->priv->import_rolls; + if (import_id_is_valid (&import_id)) { +#line 5900 "MediaDataRepresentation.c" + GeeMultiMap* _tmp48_; + ImportID _tmp49_; + MediaSource* _tmp50_; + gboolean _tmp51_; + GeeMultiMap* _tmp52_; + ImportID _tmp53_; #line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp60_ = import_id; + _tmp48_ = self->priv->import_rolls; #line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp61_ = media; + _tmp49_ = import_id; #line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp62_ = gee_multi_map_remove (_tmp59_, &_tmp60_, _tmp61_); + _tmp50_ = media; #line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - is_removed = _tmp62_; + is_removed = gee_multi_map_remove (_tmp48_, &_tmp49_, _tmp50_); #line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp63_ = is_removed; + _tmp51_ = is_removed; #line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _vala_assert (_tmp63_, "is_removed"); + _vala_assert (_tmp51_, "is_removed"); #line 563 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp64_ = self->priv->import_rolls; + _tmp52_ = self->priv->import_rolls; #line 563 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp65_ = import_id; + _tmp53_ = import_id; #line 563 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp66_ = gee_multi_map_contains (_tmp64_, &_tmp65_); -#line 563 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp66_) { -#line 5540 "MediaDataRepresentation.c" - GeeTreeSet* _tmp67_; - ImportID _tmp68_; + if (!gee_multi_map_contains (_tmp52_, &_tmp53_)) { +#line 5925 "MediaDataRepresentation.c" + GeeTreeSet* _tmp54_; + ImportID _tmp55_; #line 564 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp67_ = self->priv->sorted_import_ids; + _tmp54_ = self->priv->sorted_import_ids; #line 564 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp68_ = import_id; + _tmp55_ = import_id; #line 564 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp68_); -#line 5549 "MediaDataRepresentation.c" + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp55_); +#line 5934 "MediaDataRepresentation.c" } #line 566 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" import_roll_changed = TRUE; -#line 5553 "MediaDataRepresentation.c" +#line 5938 "MediaDataRepresentation.c" } #line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp70_ = self->priv->flagged; -#line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp71_ = media; + _tmp57_ = self->priv->flagged; #line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp72_ = gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GEE_TYPE_COLLECTION, GeeCollection), _tmp71_); + _tmp58_ = media; #line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp72_) { + if (gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_COLLECTION, GeeCollection), _tmp58_)) { #line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp69_ = TRUE; -#line 5565 "MediaDataRepresentation.c" + _tmp56_ = TRUE; +#line 5948 "MediaDataRepresentation.c" } else { - gboolean _tmp73_; + gboolean _tmp59_; #line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp73_ = flagged_altered; + _tmp59_ = flagged_altered; #line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp69_ = _tmp73_; -#line 5572 "MediaDataRepresentation.c" + _tmp56_ = _tmp59_; +#line 5955 "MediaDataRepresentation.c" } #line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - flagged_altered = _tmp69_; + flagged_altered = _tmp56_; #line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (media); #line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (object); -#line 5580 "MediaDataRepresentation.c" +#line 5963 "MediaDataRepresentation.c" } #line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_object_it); -#line 5584 "MediaDataRepresentation.c" +#line 5967 "MediaDataRepresentation.c" } } #line 573 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp74_ = import_roll_changed; + _tmp60_ = import_roll_changed; #line 573 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp74_) { + if (_tmp60_) { #line 574 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_notify_import_roll_altered (self); -#line 5593 "MediaDataRepresentation.c" +#line 5976 "MediaDataRepresentation.c" } #line 576 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp75_ = flagged_altered; + _tmp61_ = flagged_altered; #line 576 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp75_) { + if (_tmp61_) { #line 577 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_notify_flagged_contents_altered (self); -#line 5601 "MediaDataRepresentation.c" +#line 5984 "MediaDataRepresentation.c" } #line 579 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp76_ = added; -#line 579 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp77_ = removed; -#line 579 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - DATA_COLLECTION_CLASS (media_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp76_, _tmp77_); -#line 5609 "MediaDataRepresentation.c" + DATA_COLLECTION_CLASS (media_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), added, removed); +#line 5988 "MediaDataRepresentation.c" } -static void media_source_collection_on_master_replaced (MediaSourceCollection* self, MediaSource* media, GFile* old_file, GFile* new_file) { +static void +media_source_collection_on_master_replaced (MediaSourceCollection* self, + MediaSource* media, + GFile* old_file, + GFile* new_file) +{ gboolean is_removed = FALSE; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gboolean _tmp2_; - GeeHashMap* _tmp3_; - GFile* _tmp4_; - MediaSource* _tmp5_; - MediaSource* _tmp6_; - GFile* _tmp7_; - GFile* _tmp8_; + gboolean _tmp1_; + GeeHashMap* _tmp2_; #line 582 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 582 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5633,38 +6011,28 @@ static void media_source_collection_on_master_replaced (MediaSourceCollection* s #line 583 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->by_master_file; #line 583 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = old_file; -#line 583 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL); + _tmp1_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), old_file, NULL); #line 583 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - is_removed = _tmp2_; + is_removed = _tmp1_; #line 584 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _vala_assert (is_removed, "is_removed"); #line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = self->priv->by_master_file; -#line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = new_file; -#line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = media; + _tmp2_ = self->priv->by_master_file; #line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, _tmp5_); -#line 588 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = media; -#line 588 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = old_file; -#line 588 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = new_file; + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), new_file, media); #line 588 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MASTER_FILE_REPLACED_SIGNAL], 0, _tmp6_, _tmp7_, _tmp8_); -#line 5658 "MediaDataRepresentation.c" + g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MASTER_FILE_REPLACED_SIGNAL], 0, media, old_file, new_file); +#line 6024 "MediaDataRepresentation.c" } -MediaSource* media_source_collection_fetch_by_master_file (MediaSourceCollection* self, GFile* file) { +MediaSource* +media_source_collection_fetch_by_master_file (MediaSourceCollection* self, + GFile* file) +{ MediaSource* result = NULL; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 591 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 591 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5672,86 +6040,92 @@ MediaSource* media_source_collection_fetch_by_master_file (MediaSourceCollection #line 592 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->by_master_file; #line 592 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = file; -#line 592 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 592 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - result = (MediaSource*) _tmp2_; + result = (MediaSource*) _tmp1_; #line 592 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5681 "MediaDataRepresentation.c" +#line 6047 "MediaDataRepresentation.c" } -static MediaSource* media_source_collection_real_fetch_by_source_id (MediaSourceCollection* self, const gchar* source_id) { +static MediaSource* +media_source_collection_real_fetch_by_source_id (MediaSourceCollection* self, + const gchar* source_id) +{ MediaSource* result = NULL; gchar** components = NULL; - const gchar* _tmp0_; + gchar** _tmp0_; gchar** _tmp1_; - gchar** _tmp2_; gint components_length1; gint _components_size_; - const gchar* _tmp3_; - gint64 _tmp4_; - MediaSource* _tmp5_; + const gchar* _tmp2_; + MediaSource* _tmp3_; #line 595 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (source_id != NULL, NULL); #line 596 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = source_id; -#line 596 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = _tmp1_ = g_strsplit (_tmp0_, "-", 0); + _tmp1_ = _tmp0_ = g_strsplit (source_id, "-", 0); #line 596 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - components = _tmp2_; + components = _tmp1_; #line 596 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - components_length1 = _vala_array_length (_tmp1_); + components_length1 = _vala_array_length (_tmp0_); #line 596 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _components_size_ = components_length1; #line 597 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _vala_assert (components_length1 == 2, "components.length == 2"); #line 599 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = components[1]; + _tmp2_ = components[1]; #line 599 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = parse_int64 (_tmp3_, 16); + _tmp3_ = media_source_collection_fetch_by_numeric_id (self, parse_int64 (_tmp2_, 16)); #line 599 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = media_source_collection_fetch_by_numeric_id (self, _tmp4_); -#line 599 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - result = _tmp5_; + result = _tmp3_; #line 599 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" components = (_vala_array_free (components, components_length1, (GDestroyNotify) g_free), NULL); #line 599 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5722 "MediaDataRepresentation.c" +#line 6085 "MediaDataRepresentation.c" } -MediaSource* media_source_collection_fetch_by_source_id (MediaSourceCollection* self, const gchar* source_id) { +MediaSource* +media_source_collection_fetch_by_source_id (MediaSourceCollection* self, + const gchar* source_id) +{ #line 595 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 595 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->fetch_by_source_id (self, source_id); -#line 5731 "MediaDataRepresentation.c" +#line 6097 "MediaDataRepresentation.c" } -static GeeCollection* media_source_collection_real_get_event_source_ids (MediaSourceCollection* self, EventID* event_id) { +static GeeCollection* +media_source_collection_real_get_event_source_ids (MediaSourceCollection* self, + EventID* event_id) +{ #line 602 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_collection_get_event_source_ids'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 602 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 5740 "MediaDataRepresentation.c" +#line 6109 "MediaDataRepresentation.c" } -GeeCollection* media_source_collection_get_event_source_ids (MediaSourceCollection* self, EventID* event_id) { +GeeCollection* +media_source_collection_get_event_source_ids (MediaSourceCollection* self, + EventID* event_id) +{ #line 602 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 602 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->get_event_source_ids (self, event_id); -#line 5749 "MediaDataRepresentation.c" +#line 6121 "MediaDataRepresentation.c" } -GeeCollection* media_source_collection_get_trashcan_contents (MediaSourceCollection* self) { +GeeCollection* +media_source_collection_get_trashcan_contents (MediaSourceCollection* self) +{ GeeCollection* result = NULL; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; @@ -5773,11 +6147,13 @@ GeeCollection* media_source_collection_get_trashcan_contents (MediaSourceCollect result = _tmp3_; #line 605 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5775 "MediaDataRepresentation.c" +#line 6149 "MediaDataRepresentation.c" } -GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceCollection* self) { +GeeCollection* +media_source_collection_get_offline_bin_contents (MediaSourceCollection* self) +{ GeeCollection* result = NULL; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; @@ -5799,11 +6175,13 @@ GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceColl result = _tmp3_; #line 609 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5801 "MediaDataRepresentation.c" +#line 6177 "MediaDataRepresentation.c" } -GeeCollection* media_source_collection_get_flagged (MediaSourceCollection* self) { +GeeCollection* +media_source_collection_get_flagged (MediaSourceCollection* self) +{ GeeCollection* result = NULL; GeeSet* _tmp0_; GeeSet* _tmp1_; @@ -5820,11 +6198,13 @@ GeeCollection* media_source_collection_get_flagged (MediaSourceCollection* self) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 613 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5822 "MediaDataRepresentation.c" +#line 6200 "MediaDataRepresentation.c" } -GeeSortedSet* media_source_collection_get_import_roll_ids (MediaSourceCollection* self) { +GeeSortedSet* +media_source_collection_get_import_roll_ids (MediaSourceCollection* self) +{ GeeSortedSet* result = NULL; GeeTreeSet* _tmp0_; GeeSortedSet* _tmp1_; @@ -5838,11 +6218,13 @@ GeeSortedSet* media_source_collection_get_import_roll_ids (MediaSourceCollection result = _tmp1_; #line 618 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5840 "MediaDataRepresentation.c" +#line 6220 "MediaDataRepresentation.c" } -ImportID* media_source_collection_get_last_import_id (MediaSourceCollection* self) { +ImportID* +media_source_collection_get_last_import_id (MediaSourceCollection* self) +{ ImportID* result = NULL; ImportID* _tmp0_ = NULL; GeeTreeSet* _tmp1_; @@ -5858,7 +6240,7 @@ ImportID* media_source_collection_get_last_import_id (MediaSourceCollection* sel _tmp3_ = _tmp2_; #line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp3_ != 0) { -#line 5860 "MediaDataRepresentation.c" +#line 6242 "MediaDataRepresentation.c" GeeTreeSet* _tmp4_; gpointer _tmp5_; #line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5869,23 +6251,26 @@ ImportID* media_source_collection_get_last_import_id (MediaSourceCollection* sel _import_id_free0 (_tmp0_); #line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = (ImportID*) _tmp5_; -#line 5871 "MediaDataRepresentation.c" +#line 6253 "MediaDataRepresentation.c" } else { #line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _import_id_free0 (_tmp0_); #line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = NULL; -#line 5877 "MediaDataRepresentation.c" +#line 6259 "MediaDataRepresentation.c" } #line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp0_; #line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5883 "MediaDataRepresentation.c" +#line 6265 "MediaDataRepresentation.c" } -GeeCollection* media_source_collection_get_import_roll (MediaSourceCollection* self, ImportID* import_id) { +GeeCollection* +media_source_collection_get_import_roll (MediaSourceCollection* self, + ImportID* import_id) +{ GeeCollection* result = NULL; GeeMultiMap* _tmp0_; ImportID _tmp1_; @@ -5904,14 +6289,16 @@ GeeCollection* media_source_collection_get_import_roll (MediaSourceCollection* s result = _tmp2_; #line 626 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5906 "MediaDataRepresentation.c" +#line 6291 "MediaDataRepresentation.c" } -void media_source_collection_add_many_to_trash (MediaSourceCollection* self, GeeCollection* sources) { +void +media_source_collection_add_many_to_trash (MediaSourceCollection* self, + GeeCollection* sources) +{ MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; - GeeCollection* _tmp2_; #line 629 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 629 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5921,19 +6308,19 @@ void media_source_collection_add_many_to_trash (MediaSourceCollection* self, Gee #line 630 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; #line 630 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = sources; -#line 630 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - source_holding_tank_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp2_); + source_holding_tank_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), sources); #line 630 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp1_); -#line 5928 "MediaDataRepresentation.c" +#line 6313 "MediaDataRepresentation.c" } -void media_source_collection_add_many_to_offline (MediaSourceCollection* self, GeeCollection* sources) { +void +media_source_collection_add_many_to_offline (MediaSourceCollection* self, + GeeCollection* sources) +{ MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; - GeeCollection* _tmp2_; #line 633 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 633 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5943,21 +6330,20 @@ void media_source_collection_add_many_to_offline (MediaSourceCollection* self, G #line 634 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; #line 634 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = sources; -#line 634 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - source_holding_tank_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp2_); + source_holding_tank_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), sources); #line 634 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp1_); -#line 5950 "MediaDataRepresentation.c" +#line 6335 "MediaDataRepresentation.c" } -gint media_source_collection_get_trashcan_count (MediaSourceCollection* self) { +gint +media_source_collection_get_trashcan_count (MediaSourceCollection* self) +{ gint result = 0; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; gint _tmp2_; - gint _tmp3_; #line 637 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), 0); #line 638 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5966,125 +6352,130 @@ gint media_source_collection_get_trashcan_count (MediaSourceCollection* self) { _tmp1_ = _tmp0_; #line 638 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = source_holding_tank_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank)); -#line 638 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = _tmp2_; #line 638 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp1_); #line 638 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - result = _tmp3_; + result = _tmp2_; #line 638 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5976 "MediaDataRepresentation.c" +#line 6360 "MediaDataRepresentation.c" } -static void media_source_collection_real_import_many (MediaSourceCollection* self, GeeCollection* media) { +static void +media_source_collection_real_import_many (MediaSourceCollection* self, + GeeCollection* media) +{ GeeCollection* _tmp0_; GeeCollection* _tmp1_; - GeeCollection* _tmp2_; - GeeCollection* _tmp3_; - GeeCollection* _tmp4_; - GeeCollection* _tmp5_; #line 644 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); #line 645 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = media; -#line 645 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - media_source_collection_notify_media_import_starting (self, _tmp0_); + media_source_collection_notify_media_import_starting (self, media); #line 647 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = media; + _tmp0_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), media, NULL, NULL); #line 647 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, NULL, NULL); -#line 647 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 647 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp3_); -#line 649 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = media; + _g_object_unref0 (_tmp1_); #line 649 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - media_source_collection_postprocess_imported_media (self, _tmp4_); + media_source_collection_postprocess_imported_media (self, media); #line 651 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = media; -#line 651 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - media_source_collection_notify_media_import_completed (self, _tmp5_); -#line 6009 "MediaDataRepresentation.c" + media_source_collection_notify_media_import_completed (self, media); +#line 6384 "MediaDataRepresentation.c" } -void media_source_collection_import_many (MediaSourceCollection* self, GeeCollection* media) { +void +media_source_collection_import_many (MediaSourceCollection* self, + GeeCollection* media) +{ #line 644 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 644 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->import_many (self, media); -#line 6018 "MediaDataRepresentation.c" +#line 6396 "MediaDataRepresentation.c" } -static void media_source_collection_real_postprocess_imported_media (MediaSourceCollection* self, GeeCollection* media) { +static void +media_source_collection_real_postprocess_imported_media (MediaSourceCollection* self, + GeeCollection* media) +{ #line 656 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); -#line 6025 "MediaDataRepresentation.c" +#line 6406 "MediaDataRepresentation.c" } -void media_source_collection_postprocess_imported_media (MediaSourceCollection* self, GeeCollection* media) { +void +media_source_collection_postprocess_imported_media (MediaSourceCollection* self, + GeeCollection* media) +{ #line 656 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 656 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->postprocess_imported_media (self, media); -#line 6034 "MediaDataRepresentation.c" +#line 6418 "MediaDataRepresentation.c" } -static gboolean _aggregate_progress_monitor_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) { +static gboolean +_aggregate_progress_monitor_monitor_progress_monitor (guint64 current, + guint64 total, + gboolean do_event_loop, + gpointer self) +{ gboolean result; result = aggregate_progress_monitor_monitor ((AggregateProgressMonitor*) self, current, total); #line 691 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 6043 "MediaDataRepresentation.c" +#line 6432 "MediaDataRepresentation.c" } -void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCollection* sources, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed) { - GeeCollection* _tmp0_; - GeeHashSet* _tmp1_ = NULL; - gboolean _tmp2_; +void +media_source_collection_remove_from_app (MediaSourceCollection* self, + GeeCollection* sources, + gboolean delete_backing, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_removed) +{ + GeeHashSet* _tmp0_ = NULL; GeeHashSet* to_tombstone = NULL; - GeeHashSet* _tmp4_; + GeeHashSet* _tmp2_; GeeArrayList* trashed = NULL; - GeeArrayList* _tmp5_; + GeeArrayList* _tmp3_; GeeArrayList* offlined = NULL; - GeeArrayList* _tmp6_; + GeeArrayList* _tmp4_; GeeArrayList* not_trashed = NULL; - GeeArrayList* _tmp7_; + GeeArrayList* _tmp5_; gint total_count = 0; - GeeCollection* _tmp27_; + gint _tmp21_; + gint _tmp22_; + gint _tmp23_; + GeeArrayList* _tmp24_; + gint _tmp25_; + gint _tmp26_; + GeeArrayList* _tmp27_; gint _tmp28_; gint _tmp29_; - gint _tmp30_; - GeeArrayList* _tmp31_; + GeeArrayList* _tmp30_; + gint _tmp31_; gint _tmp32_; - gint _tmp33_; - GeeArrayList* _tmp34_; - gint _tmp35_; - gint _tmp36_; - GeeArrayList* _tmp37_; - gint _tmp38_; - gint _tmp39_; AggregateProgressMonitor* agg_monitor = NULL; - ProgressMonitor _tmp40_; - void* _tmp40__target; - GeeArrayList* _tmp45_; - gint _tmp46_; - gint _tmp47_; - GeeArrayList* _tmp54_; - gint _tmp55_; - gint _tmp56_; - GeeArrayList* _tmp63_; - gint _tmp64_; - gint _tmp65_; - gboolean _tmp72_ = FALSE; - GeeHashSet* _tmp73_; + GeeArrayList* _tmp36_; + gint _tmp37_; + gint _tmp38_; + GeeArrayList* _tmp42_; + gint _tmp43_; + gint _tmp44_; + GeeArrayList* _tmp48_; + gint _tmp49_; + gint _tmp50_; + gboolean _tmp54_ = FALSE; + GeeHashSet* _tmp55_; GError * _inner_error_ = NULL; #line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); @@ -6093,361 +6484,297 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo #line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((not_removed == NULL) || GEE_IS_LIST (not_removed)); #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = sources; -#line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _vala_assert (_tmp0_ != NULL, "sources != null"); + _vala_assert (sources != NULL, "sources != null"); #line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = delete_backing; + if (!delete_backing) { +#line 6489 "MediaDataRepresentation.c" + GeeHashSet* _tmp1_; #line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp2_) { -#line 6102 "MediaDataRepresentation.c" - GeeHashSet* _tmp3_; + _tmp1_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _g_object_unref0 (_tmp0_); #line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp1_); -#line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = _tmp3_; -#line 6110 "MediaDataRepresentation.c" + _tmp0_ = _tmp1_; +#line 6497 "MediaDataRepresentation.c" } else { #line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp1_); + _g_object_unref0 (_tmp0_); #line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = NULL; -#line 6116 "MediaDataRepresentation.c" + _tmp0_ = NULL; +#line 6503 "MediaDataRepresentation.c" } #line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = _g_object_ref0 (_tmp1_); + _tmp2_ = _g_object_ref0 (_tmp0_); #line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - to_tombstone = _tmp4_; + to_tombstone = _tmp2_; #line 669 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp3_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 669 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - trashed = _tmp5_; + trashed = _tmp3_; #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp4_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - offlined = _tmp6_; + offlined = _tmp4_; #line 671 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp5_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 671 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - not_trashed = _tmp7_; -#line 6134 "MediaDataRepresentation.c" + not_trashed = _tmp5_; +#line 6521 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp8_; - GeeIterator* _tmp9_; -#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = sources; + GeeIterator* _tmp6_; #line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _source_it = _tmp9_; + _source_it = _tmp6_; #line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 6147 "MediaDataRepresentation.c" - GeeIterator* _tmp10_; - gboolean _tmp11_; +#line 6531 "MediaDataRepresentation.c" + GeeIterator* _tmp7_; MediaSource* source = NULL; - GeeIterator* _tmp12_; - gpointer _tmp13_; - MediaSource* _tmp14_; - gboolean _tmp15_; - GeeHashSet* _tmp24_; -#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp10_ = _source_it; + GeeIterator* _tmp8_; + gpointer _tmp9_; + MediaSource* _tmp10_; + GeeHashSet* _tmp18_; #line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp11_ = gee_iterator_next (_tmp10_); + _tmp7_ = _source_it; #line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp11_) { + if (!gee_iterator_next (_tmp7_)) { #line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 6164 "MediaDataRepresentation.c" +#line 6544 "MediaDataRepresentation.c" } #line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp12_ = _source_it; + _tmp8_ = _source_it; #line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp13_ = gee_iterator_get (_tmp12_); + _tmp9_ = gee_iterator_get (_tmp8_); #line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - source = (MediaSource*) _tmp13_; -#line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp14_ = source; + source = (MediaSource*) _tmp9_; #line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp15_ = media_source_is_trashed (_tmp14_); + _tmp10_ = source; #line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp15_) { -#line 6178 "MediaDataRepresentation.c" - GeeArrayList* _tmp16_; - MediaSource* _tmp17_; + if (media_source_is_trashed (_tmp10_)) { +#line 6556 "MediaDataRepresentation.c" + GeeArrayList* _tmp11_; + MediaSource* _tmp12_; #line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp16_ = trashed; + _tmp11_ = trashed; #line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp17_ = source; + _tmp12_ = source; #line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); -#line 6187 "MediaDataRepresentation.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp12_); +#line 6565 "MediaDataRepresentation.c" } else { - MediaSource* _tmp18_; - gboolean _tmp19_; -#line 675 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp18_ = source; + MediaSource* _tmp13_; #line 675 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp19_ = media_source_is_offline (_tmp18_); + _tmp13_ = source; #line 675 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp19_) { -#line 6197 "MediaDataRepresentation.c" - GeeArrayList* _tmp20_; - MediaSource* _tmp21_; + if (media_source_is_offline (_tmp13_)) { +#line 6572 "MediaDataRepresentation.c" + GeeArrayList* _tmp14_; + MediaSource* _tmp15_; #line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp20_ = offlined; + _tmp14_ = offlined; #line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp21_ = source; + _tmp15_ = source; #line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); -#line 6206 "MediaDataRepresentation.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); +#line 6581 "MediaDataRepresentation.c" } else { - GeeArrayList* _tmp22_; - MediaSource* _tmp23_; + GeeArrayList* _tmp16_; + MediaSource* _tmp17_; #line 678 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp22_ = not_trashed; + _tmp16_ = not_trashed; #line 678 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp23_ = source; + _tmp17_ = source; #line 678 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp23_); -#line 6216 "MediaDataRepresentation.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); +#line 6591 "MediaDataRepresentation.c" } } #line 680 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp24_ = to_tombstone; + _tmp18_ = to_tombstone; #line 680 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp24_ != NULL) { -#line 6223 "MediaDataRepresentation.c" - GeeHashSet* _tmp25_; - MediaSource* _tmp26_; + if (_tmp18_ != NULL) { +#line 6598 "MediaDataRepresentation.c" + GeeHashSet* _tmp19_; + MediaSource* _tmp20_; #line 681 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp25_ = to_tombstone; + _tmp19_ = to_tombstone; #line 681 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp26_ = source; + _tmp20_ = source; #line 681 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_); -#line 6232 "MediaDataRepresentation.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_); +#line 6607 "MediaDataRepresentation.c" } #line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 6236 "MediaDataRepresentation.c" +#line 6611 "MediaDataRepresentation.c" } #line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 6240 "MediaDataRepresentation.c" +#line 6615 "MediaDataRepresentation.c" } #line 684 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp27_ = sources; + _tmp21_ = gee_collection_get_size (sources); #line 684 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp28_ = gee_collection_get_size (_tmp27_); + _tmp22_ = _tmp21_; #line 684 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp29_ = _tmp28_; -#line 684 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - total_count = _tmp29_; + total_count = _tmp22_; #line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp30_ = total_count; + _tmp23_ = total_count; #line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp31_ = trashed; + _tmp24_ = trashed; #line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp32_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp33_ = _tmp32_; + _tmp26_ = _tmp25_; #line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp34_ = offlined; + _tmp27_ = offlined; #line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp35_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp36_ = _tmp35_; + _tmp29_ = _tmp28_; #line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp37_ = not_trashed; + _tmp30_ = not_trashed; #line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp38_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp31_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp39_ = _tmp38_; + _tmp32_ = _tmp31_; #line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _vala_assert (_tmp30_ == ((_tmp33_ + _tmp36_) + _tmp39_), "total_count == (trashed.size + offlined.size + not_trashed.size)"); + _vala_assert (_tmp23_ == ((_tmp26_ + _tmp29_) + _tmp32_), "total_count == (trashed.size + offlined.size + not_trashed.size)"); #line 688 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" agg_monitor = NULL; #line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp40_ = monitor; -#line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp40__target = monitor_target; -#line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp40_ != NULL) { -#line 6280 "MediaDataRepresentation.c" - gint _tmp41_; - ProgressMonitor _tmp42_; - void* _tmp42__target; - AggregateProgressMonitor* _tmp43_; - AggregateProgressMonitor* _tmp44_; -#line 690 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp41_ = total_count; -#line 690 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp42_ = monitor; + if (monitor != NULL) { +#line 6649 "MediaDataRepresentation.c" + gint _tmp33_; + AggregateProgressMonitor* _tmp34_; + AggregateProgressMonitor* _tmp35_; #line 690 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp42__target = monitor_target; + _tmp33_ = total_count; #line 690 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp43_ = aggregate_progress_monitor_new ((guint64) _tmp41_, _tmp42_, _tmp42__target); + _tmp34_ = aggregate_progress_monitor_new ((guint64) _tmp33_, monitor, monitor_target); #line 690 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _aggregate_progress_monitor_unref0 (agg_monitor); #line 690 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - agg_monitor = _tmp43_; + agg_monitor = _tmp34_; #line 691 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp44_ = agg_monitor; + _tmp35_ = agg_monitor; #line 691 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" monitor = _aggregate_progress_monitor_monitor_progress_monitor; #line 691 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - monitor_target = _tmp44_; -#line 6304 "MediaDataRepresentation.c" + monitor_target = _tmp35_; +#line 6667 "MediaDataRepresentation.c" } #line 694 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp45_ = trashed; + _tmp36_ = trashed; #line 694 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp46_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 694 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp47_ = _tmp46_; + _tmp38_ = _tmp37_; #line 694 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp47_ > 0) { -#line 6314 "MediaDataRepresentation.c" - MediaSourceHoldingTank* _tmp48_; - MediaSourceHoldingTank* _tmp49_; - GeeArrayList* _tmp50_; - gboolean _tmp51_; - ProgressMonitor _tmp52_; - void* _tmp52__target; - GeeList* _tmp53_; -#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp48_ = media_source_collection_get_trashcan (self); -#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp49_ = _tmp48_; -#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp50_ = trashed; + if (_tmp38_ > 0) { +#line 6677 "MediaDataRepresentation.c" + MediaSourceHoldingTank* _tmp39_; + MediaSourceHoldingTank* _tmp40_; + GeeArrayList* _tmp41_; #line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp51_ = delete_backing; + _tmp39_ = media_source_collection_get_trashcan (self); #line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp52_ = monitor; + _tmp40_ = _tmp39_; #line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp52__target = monitor_target; + _tmp41_ = trashed; #line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp53_ = not_removed; + source_holding_tank_destroy_orphans (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_LIST, GeeList), delete_backing, monitor, monitor_target, not_removed); #line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - source_holding_tank_destroy_orphans (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_LIST, GeeList), _tmp51_, _tmp52_, _tmp52__target, _tmp53_); -#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _source_holding_tank_unref0 (_tmp49_); -#line 6340 "MediaDataRepresentation.c" + _source_holding_tank_unref0 (_tmp40_); +#line 6691 "MediaDataRepresentation.c" } #line 697 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp54_ = offlined; + _tmp42_ = offlined; #line 697 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp55_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp43_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 697 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp56_ = _tmp55_; + _tmp44_ = _tmp43_; #line 697 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp56_ > 0) { -#line 6350 "MediaDataRepresentation.c" - MediaSourceHoldingTank* _tmp57_; - MediaSourceHoldingTank* _tmp58_; - GeeArrayList* _tmp59_; - gboolean _tmp60_; - ProgressMonitor _tmp61_; - void* _tmp61__target; - GeeList* _tmp62_; -#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp57_ = media_source_collection_get_offline_bin (self); -#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp58_ = _tmp57_; -#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp59_ = offlined; + if (_tmp44_ > 0) { +#line 6701 "MediaDataRepresentation.c" + MediaSourceHoldingTank* _tmp45_; + MediaSourceHoldingTank* _tmp46_; + GeeArrayList* _tmp47_; #line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp60_ = delete_backing; + _tmp45_ = media_source_collection_get_offline_bin (self); #line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp61_ = monitor; + _tmp46_ = _tmp45_; #line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp61__target = monitor_target; + _tmp47_ = offlined; #line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp62_ = not_removed; + source_holding_tank_destroy_orphans (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_LIST, GeeList), delete_backing, monitor, monitor_target, not_removed); #line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - source_holding_tank_destroy_orphans (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_LIST, GeeList), _tmp60_, _tmp61_, _tmp61__target, _tmp62_); -#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _source_holding_tank_unref0 (_tmp58_); -#line 6376 "MediaDataRepresentation.c" + _source_holding_tank_unref0 (_tmp46_); +#line 6715 "MediaDataRepresentation.c" } #line 701 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp63_ = not_trashed; + _tmp48_ = not_trashed; #line 701 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp64_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp49_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 701 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp65_ = _tmp64_; + _tmp50_ = _tmp49_; #line 701 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp65_ > 0) { -#line 6386 "MediaDataRepresentation.c" - GeeArrayList* _tmp66_; - Marker* _tmp67_; - Marker* _tmp68_; - gboolean _tmp69_; - ProgressMonitor _tmp70_; - void* _tmp70__target; - GeeList* _tmp71_; -#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp66_ = not_trashed; -#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp67_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp68_ = _tmp67_; + if (_tmp50_ > 0) { +#line 6725 "MediaDataRepresentation.c" + GeeArrayList* _tmp51_; + Marker* _tmp52_; + Marker* _tmp53_; #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp69_ = delete_backing; + _tmp51_ = not_trashed; #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp70_ = monitor; + _tmp52_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection)); #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp70__target = monitor_target; + _tmp53_ = _tmp52_; #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp71_ = not_removed; + source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp53_, delete_backing, monitor, monitor_target, not_removed); #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp68_, _tmp69_, _tmp70_, _tmp70__target, _tmp71_); -#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp68_); -#line 6412 "MediaDataRepresentation.c" + _g_object_unref0 (_tmp53_); +#line 6739 "MediaDataRepresentation.c" } #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp73_ = to_tombstone; + _tmp55_ = to_tombstone; #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp73_ != NULL) { -#line 6418 "MediaDataRepresentation.c" - GeeHashSet* _tmp74_; - gint _tmp75_; - gint _tmp76_; + if (_tmp55_ != NULL) { +#line 6745 "MediaDataRepresentation.c" + GeeHashSet* _tmp56_; + gint _tmp57_; + gint _tmp58_; #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp74_ = to_tombstone; + _tmp56_ = to_tombstone; #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp75_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp57_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp76_ = _tmp75_; + _tmp58_ = _tmp57_; #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp72_ = _tmp76_ > 0; -#line 6430 "MediaDataRepresentation.c" + _tmp54_ = _tmp58_ > 0; +#line 6757 "MediaDataRepresentation.c" } else { #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp72_ = FALSE; -#line 6434 "MediaDataRepresentation.c" + _tmp54_ = FALSE; +#line 6761 "MediaDataRepresentation.c" } #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp72_) { -#line 6438 "MediaDataRepresentation.c" + if (_tmp54_) { +#line 6765 "MediaDataRepresentation.c" { - GeeHashSet* _tmp77_; + GeeHashSet* _tmp59_; #line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp77_ = to_tombstone; + _tmp59_ = to_tombstone; #line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - tombstone_entomb_many_sources (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_COLLECTION, GeeCollection), TOMBSTONE_REASON_REMOVED_BY_USER, &_inner_error_); + tombstone_entomb_many_sources (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_COLLECTION, GeeCollection), TOMBSTONE_REASON_REMOVED_BY_USER, &_inner_error_); #line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6449 "MediaDataRepresentation.c" +#line 6776 "MediaDataRepresentation.c" goto __catch574_database_error; } #line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6461,32 +6788,32 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo #line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (to_tombstone); #line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp1_); + _g_object_unref0 (_tmp0_); #line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_clear_error (&_inner_error_); #line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 6470 "MediaDataRepresentation.c" +#line 6797 "MediaDataRepresentation.c" } } goto __finally574; __catch574_database_error: { GError* err = NULL; - GError* _tmp78_; + GError* _tmp60_; #line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" err = _inner_error_; #line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _inner_error_ = NULL; #line 708 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp78_ = err; + _tmp60_ = err; #line 708 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - app_window_database_error (_tmp78_); + app_window_database_error (_tmp60_); #line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_error_free0 (err); -#line 6488 "MediaDataRepresentation.c" +#line 6815 "MediaDataRepresentation.c" } __finally574: #line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6502,14 +6829,14 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo #line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (to_tombstone); #line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp1_); + _g_object_unref0 (_tmp0_); #line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_clear_error (&_inner_error_); #line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 6511 "MediaDataRepresentation.c" +#line 6838 "MediaDataRepresentation.c" } } #line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6523,16 +6850,21 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo #line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (to_tombstone); #line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp1_); -#line 6526 "MediaDataRepresentation.c" + _g_object_unref0 (_tmp0_); +#line 6853 "MediaDataRepresentation.c" } -void media_source_collection_delete_backing_files (MediaSourceCollection* self, GeeCollection* sources, ProgressMonitor monitor, void* monitor_target, GeeList* not_deleted) { +void +media_source_collection_delete_backing_files (MediaSourceCollection* self, + GeeCollection* sources, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_deleted) +{ gint total_count = 0; - GeeCollection* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; gint i = 0; GError * _inner_error_ = NULL; #line 715 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6542,81 +6874,70 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, #line 715 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((not_deleted == NULL) || GEE_IS_LIST (not_deleted)); #line 717 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = sources; + _tmp0_ = gee_collection_get_size (sources); #line 717 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); -#line 717 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 717 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - total_count = _tmp2_; + total_count = _tmp1_; #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" i = 1; -#line 6553 "MediaDataRepresentation.c" +#line 6883 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp3_; - GeeIterator* _tmp4_; + GeeIterator* _tmp2_; #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = sources; + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _source_it = _tmp4_; + _source_it = _tmp2_; #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 6566 "MediaDataRepresentation.c" - GeeIterator* _tmp5_; - gboolean _tmp6_; +#line 6893 "MediaDataRepresentation.c" + GeeIterator* _tmp3_; MediaSource* source = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; + GeeIterator* _tmp4_; + gpointer _tmp5_; GFile* file = NULL; - MediaSource* _tmp9_; - GFile* _tmp10_; + MediaSource* _tmp6_; + GFile* _tmp7_; GFile* masterfile = NULL; - MediaSource* _tmp17_; - GFile* _tmp18_; - GFile* _tmp19_; + MediaSource* _tmp14_; + GFile* _tmp15_; + GFile* _tmp16_; gboolean deleted = FALSE; - GFile* _tmp27_; - gboolean _tmp28_; - gboolean _tmp29_ = FALSE; - gboolean _tmp30_; - ProgressMonitor _tmp34_; - void* _tmp34__target; - gint _tmp38_; -#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = _source_it; + GFile* _tmp24_; + gboolean _tmp25_ = FALSE; + gboolean _tmp26_; + gint _tmp30_; #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = gee_iterator_next (_tmp5_); + _tmp3_ = _source_it; #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp3_)) { #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 6595 "MediaDataRepresentation.c" +#line 6916 "MediaDataRepresentation.c" } #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = _source_it; + _tmp4_ = _source_it; #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - source = (MediaSource*) _tmp8_; + source = (MediaSource*) _tmp5_; #line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp9_ = source; + _tmp6_ = source; #line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp10_ = media_source_get_file (_tmp9_); + _tmp7_ = media_source_get_file (_tmp6_); #line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - file = _tmp10_; -#line 6609 "MediaDataRepresentation.c" + file = _tmp7_; +#line 6930 "MediaDataRepresentation.c" { - GFile* _tmp11_; + GFile* _tmp8_; #line 723 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp11_ = file; + _tmp8_ = file; #line 723 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_file_delete (_tmp11_, NULL, &_inner_error_); + g_file_delete (_tmp8_, NULL, &_inner_error_); #line 723 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6618 "MediaDataRepresentation.c" +#line 6939 "MediaDataRepresentation.c" goto __catch575_g_error; } } @@ -6624,32 +6945,32 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, __catch575_g_error: { GError* err = NULL; - GFile* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; - GError* _tmp15_; - const gchar* _tmp16_; + GFile* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + GError* _tmp12_; + const gchar* _tmp13_; #line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" err = _inner_error_; #line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _inner_error_ = NULL; #line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp12_ = file; + _tmp9_ = file; #line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp13_ = g_file_get_path (_tmp12_); + _tmp10_ = g_file_get_path (_tmp9_); #line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp14_ = _tmp13_; + _tmp11_ = _tmp10_; #line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp15_ = err; + _tmp12_ = err; #line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp16_ = _tmp15_->message; + _tmp13_ = _tmp12_->message; #line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_debug ("MediaDataRepresentation.vala:726: Exception deleting file %s: %s", _tmp14_, _tmp16_); + g_debug ("MediaDataRepresentation.vala:726: Exception deleting file %s: %s", _tmp11_, _tmp13_); #line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_free0 (_tmp14_); + _g_free0 (_tmp11_); #line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_error_free0 (err); -#line 6651 "MediaDataRepresentation.c" +#line 6972 "MediaDataRepresentation.c" } __finally575: #line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6666,28 +6987,28 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, g_clear_error (&_inner_error_); #line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 6668 "MediaDataRepresentation.c" +#line 6989 "MediaDataRepresentation.c" } #line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp17_ = source; + _tmp14_ = source; #line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp18_ = media_source_get_master_file (_tmp17_); + _tmp15_ = media_source_get_master_file (_tmp14_); #line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - masterfile = _tmp18_; + masterfile = _tmp15_; #line 730 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp19_ = masterfile; + _tmp16_ = masterfile; #line 730 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp19_ != NULL) { -#line 6680 "MediaDataRepresentation.c" + if (_tmp16_ != NULL) { +#line 7001 "MediaDataRepresentation.c" { - GFile* _tmp20_; + GFile* _tmp17_; #line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp20_ = masterfile; + _tmp17_ = masterfile; #line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_file_delete (_tmp20_, NULL, &_inner_error_); + g_file_delete (_tmp17_, NULL, &_inner_error_); #line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6689 "MediaDataRepresentation.c" +#line 7010 "MediaDataRepresentation.c" goto __catch576_g_error; } } @@ -6695,41 +7016,41 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, __catch576_g_error: { GError* err = NULL; - GError* _tmp21_; + GError* _tmp18_; #line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" err = _inner_error_; #line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _inner_error_ = NULL; #line 734 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp21_ = err; + _tmp18_ = err; #line 734 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!g_error_matches (_tmp21_, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) { -#line 6706 "MediaDataRepresentation.c" - GFile* _tmp22_; - gchar* _tmp23_; - gchar* _tmp24_; - GError* _tmp25_; - const gchar* _tmp26_; + if (!g_error_matches (_tmp18_, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) { +#line 7027 "MediaDataRepresentation.c" + GFile* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; + GError* _tmp22_; + const gchar* _tmp23_; #line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp22_ = masterfile; + _tmp19_ = masterfile; #line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp23_ = g_file_get_path (_tmp22_); + _tmp20_ = g_file_get_path (_tmp19_); #line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp24_ = _tmp23_; + _tmp21_ = _tmp20_; #line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp25_ = err; + _tmp22_ = err; #line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp26_ = _tmp25_->message; + _tmp23_ = _tmp22_->message; #line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_debug ("MediaDataRepresentation.vala:735: Exception deleting master file %s: %" \ -"s", _tmp24_, _tmp26_); +"s", _tmp21_, _tmp23_); #line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_free0 (_tmp24_); -#line 6726 "MediaDataRepresentation.c" + _g_free0 (_tmp21_); +#line 7047 "MediaDataRepresentation.c" } #line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_error_free0 (err); -#line 6730 "MediaDataRepresentation.c" +#line 7051 "MediaDataRepresentation.c" } __finally576: #line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6748,121 +7069,122 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, g_clear_error (&_inner_error_); #line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 6749 "MediaDataRepresentation.c" +#line 7070 "MediaDataRepresentation.c" } } #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp27_ = file; + _tmp24_ = file; #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp28_ = g_file_query_exists (_tmp27_, NULL); -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - deleted = !_tmp28_; -#line 741 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp30_ = deleted; + deleted = !g_file_query_exists (_tmp24_, NULL); #line 741 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp30_) { -#line 6762 "MediaDataRepresentation.c" - GeeList* _tmp31_; + _tmp26_ = deleted; #line 741 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp31_ = not_deleted; + if (!_tmp26_) { #line 741 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp29_ = NULL != _tmp31_; -#line 6768 "MediaDataRepresentation.c" + _tmp25_ = NULL != not_deleted; +#line 7083 "MediaDataRepresentation.c" } else { #line 741 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp29_ = FALSE; -#line 6772 "MediaDataRepresentation.c" + _tmp25_ = FALSE; +#line 7087 "MediaDataRepresentation.c" } #line 741 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp29_) { -#line 6776 "MediaDataRepresentation.c" - GeeList* _tmp32_; - MediaSource* _tmp33_; -#line 742 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp32_ = not_deleted; + if (_tmp25_) { +#line 7091 "MediaDataRepresentation.c" + MediaSource* _tmp27_; #line 742 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp33_ = source; + _tmp27_ = source; #line 742 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection), _tmp33_); -#line 6785 "MediaDataRepresentation.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (not_deleted, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_); +#line 7097 "MediaDataRepresentation.c" } #line 745 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp34_ = monitor; -#line 745 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp34__target = monitor_target; -#line 745 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp34_ != NULL) { -#line 6793 "MediaDataRepresentation.c" - ProgressMonitor _tmp35_; - void* _tmp35__target; - gint _tmp36_; - gint _tmp37_; -#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp35_ = monitor; -#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp35__target = monitor_target; + if (monitor != NULL) { +#line 7101 "MediaDataRepresentation.c" + gint _tmp28_; + gint _tmp29_; #line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp36_ = i; + _tmp28_ = i; #line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp37_ = total_count; + _tmp29_ = total_count; #line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp35_ ((guint64) _tmp36_, (guint64) _tmp37_, TRUE, _tmp35__target); -#line 6808 "MediaDataRepresentation.c" + monitor ((guint64) _tmp28_, (guint64) _tmp29_, TRUE, monitor_target); +#line 7110 "MediaDataRepresentation.c" } #line 748 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp38_ = i; + _tmp30_ = i; #line 748 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - i = _tmp38_ + 1; + i = _tmp30_ + 1; #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (masterfile); #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (file); #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 6820 "MediaDataRepresentation.c" +#line 7122 "MediaDataRepresentation.c" } #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 6824 "MediaDataRepresentation.c" +#line 7126 "MediaDataRepresentation.c" } } -TransactionController* media_source_collection_get_transaction_controller (MediaSourceCollection* self) { +TransactionController* +media_source_collection_get_transaction_controller (MediaSourceCollection* self) +{ #line 344 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 344 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->get_transaction_controller (self); -#line 6834 "MediaDataRepresentation.c" +#line 7138 "MediaDataRepresentation.c" } -static void media_source_collection_real_media_import_starting (MediaSourceCollection* self, GeeCollection* media) { +static void +media_source_collection_real_media_import_starting (MediaSourceCollection* self, + GeeCollection* media) +{ #line 357 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); -#line 6841 "MediaDataRepresentation.c" +#line 7148 "MediaDataRepresentation.c" } -static void media_source_collection_real_media_import_completed (MediaSourceCollection* self, GeeCollection* media) { +static void +media_source_collection_real_media_import_completed (MediaSourceCollection* self, + GeeCollection* media) +{ #line 364 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); -#line 6848 "MediaDataRepresentation.c" +#line 7158 "MediaDataRepresentation.c" } -static void media_source_collection_real_master_file_replaced (MediaSourceCollection* self, MediaSource* media, GFile* old_file, GFile* new_file) { +static void +media_source_collection_real_master_file_replaced (MediaSourceCollection* self, + MediaSource* media, + GFile* old_file, + GFile* new_file) +{ #line 367 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (media)); #line 367 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_IS_FILE (old_file)); #line 367 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_IS_FILE (new_file)); -#line 6859 "MediaDataRepresentation.c" +#line 7174 "MediaDataRepresentation.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT_OBJECT) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer arg_3, gpointer data2); register GMarshalFunc_VOID__OBJECT_OBJECT_OBJECT callback; register GCClosure * cc; @@ -6877,49 +7199,63 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT (GClosure * closu data1 = closure->data; #line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data2 = param_values->data[0].v_pointer; -#line 6878 "MediaDataRepresentation.c" +#line 7200 "MediaDataRepresentation.c" } else { #line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data1 = param_values->data[0].v_pointer; #line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data2 = closure->data; -#line 6884 "MediaDataRepresentation.c" +#line 7206 "MediaDataRepresentation.c" } #line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_object (param_values + 3), data2); -#line 6890 "MediaDataRepresentation.c" +#line 7212 "MediaDataRepresentation.c" } -static void media_source_collection_real_trashcan_contents_altered (MediaSourceCollection* self, GeeCollection* added, GeeCollection* removed) { +static void +media_source_collection_real_trashcan_contents_altered (MediaSourceCollection* self, + GeeCollection* added, + GeeCollection* removed) +{ #line 370 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); #line 370 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 6899 "MediaDataRepresentation.c" +#line 7225 "MediaDataRepresentation.c" } -static void media_source_collection_real_import_roll_altered (MediaSourceCollection* self) { +static void +media_source_collection_real_import_roll_altered (MediaSourceCollection* self) +{ } -static void media_source_collection_real_offline_contents_altered (MediaSourceCollection* self, GeeCollection* added, GeeCollection* removed) { +static void +media_source_collection_real_offline_contents_altered (MediaSourceCollection* self, + GeeCollection* added, + GeeCollection* removed) +{ #line 377 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); #line 377 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 6912 "MediaDataRepresentation.c" +#line 7244 "MediaDataRepresentation.c" } -static void media_source_collection_real_flagged_contents_altered (MediaSourceCollection* self) { +static void +media_source_collection_real_flagged_contents_altered (MediaSourceCollection* self) +{ } -static void media_source_collection_class_init (MediaSourceCollectionClass * klass) { +static void +media_source_collection_class_init (MediaSourceCollectionClass * klass) +{ #line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_parent_class = g_type_class_peek_parent (klass); #line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6986,11 +7322,13 @@ static void media_source_collection_class_init (MediaSourceCollectionClass * kla media_source_collection_signals[MEDIA_SOURCE_COLLECTION_OFFLINE_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("offline-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, offline_contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_COLLECTION, GEE_TYPE_COLLECTION); #line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_signals[MEDIA_SOURCE_COLLECTION_FLAGGED_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("flagged-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, flagged_contents_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 6987 "MediaDataRepresentation.c" +#line 7323 "MediaDataRepresentation.c" } -static void media_source_collection_instance_init (MediaSourceCollection * self) { +static void +media_source_collection_instance_init (MediaSourceCollection * self) +{ GeeHashMap* _tmp0_; GeeTreeMultiMap* _tmp1_; GeeTreeSet* _tmp2_; @@ -7017,11 +7355,13 @@ static void media_source_collection_instance_init (MediaSourceCollection * self) _tmp3_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 353 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->flagged = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_SET, GeeSet); -#line 7018 "MediaDataRepresentation.c" +#line 7356 "MediaDataRepresentation.c" } -static void media_source_collection_finalize (DataCollection * obj) { +static void +media_source_collection_finalize (DataCollection * obj) +{ MediaSourceCollection * self; #line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection); @@ -7039,11 +7379,13 @@ static void media_source_collection_finalize (DataCollection * obj) { _g_object_unref0 (self->priv->flagged); #line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" DATA_COLLECTION_CLASS (media_source_collection_parent_class)->finalize (obj); -#line 7040 "MediaDataRepresentation.c" +#line 7380 "MediaDataRepresentation.c" } -GType media_source_collection_get_type (void) { +GType +media_source_collection_get_type (void) +{ static volatile gsize media_source_collection_type_id__volatile = 0; if (g_once_init_enter (&media_source_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MediaSourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) media_source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MediaSourceCollection), 0, (GInstanceInitFunc) media_source_collection_instance_init, NULL }; @@ -7055,14 +7397,19 @@ GType media_source_collection_get_type (void) { } -static void _media_collection_registry_on_init_done_application_init_done (Application* _sender, gpointer self) { +static void +_media_collection_registry_on_init_done_application_init_done (Application* _sender, + gpointer self) +{ #line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_on_init_done ((MediaCollectionRegistry*) self); -#line 7059 "MediaDataRepresentation.c" +#line 7404 "MediaDataRepresentation.c" } -static MediaCollectionRegistry* media_collection_registry_construct (GType object_type) { +static MediaCollectionRegistry* +media_collection_registry_construct (GType object_type) +{ MediaCollectionRegistry* self = NULL; Application* _tmp0_; Application* _tmp1_; @@ -7078,18 +7425,22 @@ static MediaCollectionRegistry* media_collection_registry_construct (GType objec _application_unref0 (_tmp1_); #line 762 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 7079 "MediaDataRepresentation.c" +#line 7426 "MediaDataRepresentation.c" } -static MediaCollectionRegistry* media_collection_registry_new (void) { +static MediaCollectionRegistry* +media_collection_registry_new (void) +{ #line 762 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return media_collection_registry_construct (TYPE_MEDIA_COLLECTION_REGISTRY); -#line 7086 "MediaDataRepresentation.c" +#line 7435 "MediaDataRepresentation.c" } -static void media_collection_registry_on_init_done (MediaCollectionRegistry* self) { +static void +media_collection_registry_on_init_done (MediaCollectionRegistry* self) +{ LibraryMonitor* library_monitor = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -7124,18 +7475,23 @@ static void media_collection_registry_on_init_done (MediaCollectionRegistry* sel _library_monitor_pool_unref0 (_tmp6_); #line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (library_monitor); -#line 7125 "MediaDataRepresentation.c" +#line 7476 "MediaDataRepresentation.c" } -static void _media_collection_registry_on_import_directory_changed_configuration_facade_import_directory_changed (ConfigurationFacade* _sender, gpointer self) { +static void +_media_collection_registry_on_import_directory_changed_configuration_facade_import_directory_changed (ConfigurationFacade* _sender, + gpointer self) +{ #line 780 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_on_import_directory_changed (); -#line 7132 "MediaDataRepresentation.c" +#line 7486 "MediaDataRepresentation.c" } -void media_collection_registry_init (void) { +void +media_collection_registry_init (void) +{ MediaCollectionRegistry* _tmp0_; ConfigFacade* _tmp1_; ConfigFacade* _tmp2_; @@ -7153,11 +7509,13 @@ void media_collection_registry_init (void) { g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "import-directory-changed", (GCallback) _media_collection_registry_on_import_directory_changed_configuration_facade_import_directory_changed, NULL); #line 780 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp2_); -#line 7154 "MediaDataRepresentation.c" +#line 7510 "MediaDataRepresentation.c" } -void media_collection_registry_terminate (void) { +void +media_collection_registry_terminate (void) +{ ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; guint _tmp2_; @@ -7171,11 +7529,13 @@ void media_collection_registry_terminate (void) { g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _media_collection_registry_on_import_directory_changed_configuration_facade_import_directory_changed, NULL); #line 784 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 7172 "MediaDataRepresentation.c" +#line 7530 "MediaDataRepresentation.c" } -static void media_collection_registry_on_import_directory_changed (void) { +static void +media_collection_registry_on_import_directory_changed (void) +{ GFile* import_dir = NULL; GFile* _tmp0_; LibraryMonitor* current = NULL; @@ -7186,12 +7546,12 @@ static void media_collection_registry_on_import_directory_changed (void) { gboolean _tmp5_ = FALSE; LibraryMonitor* _tmp6_; LibraryMonitor* replacement = NULL; - GFile* _tmp12_; - gboolean _tmp13_; - LibraryMonitor* _tmp14_; + GFile* _tmp11_; + gboolean _tmp12_; + LibraryMonitor* _tmp13_; + LibraryMonitorPool* _tmp14_; LibraryMonitorPool* _tmp15_; - LibraryMonitorPool* _tmp16_; - LibraryMonitor* _tmp17_; + LibraryMonitor* _tmp16_; #line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = app_dirs_get_import_dir (); #line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -7212,12 +7572,11 @@ static void media_collection_registry_on_import_directory_changed (void) { _tmp6_ = current; #line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp6_ != NULL) { -#line 7213 "MediaDataRepresentation.c" +#line 7573 "MediaDataRepresentation.c" LibraryMonitor* _tmp7_; GFile* _tmp8_; GFile* _tmp9_; GFile* _tmp10_; - gboolean _tmp11_; #line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = current; #line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -7227,16 +7586,14 @@ static void media_collection_registry_on_import_directory_changed (void) { #line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = import_dir; #line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp11_ = g_file_equal (_tmp9_, _tmp10_); -#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = _tmp11_; + _tmp5_ = g_file_equal (_tmp9_, _tmp10_); #line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp9_); -#line 7233 "MediaDataRepresentation.c" +#line 7590 "MediaDataRepresentation.c" } else { #line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = FALSE; -#line 7237 "MediaDataRepresentation.c" +#line 7594 "MediaDataRepresentation.c" } #line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp5_) { @@ -7246,26 +7603,26 @@ static void media_collection_registry_on_import_directory_changed (void) { _g_object_unref0 (import_dir); #line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 7247 "MediaDataRepresentation.c" +#line 7604 "MediaDataRepresentation.c" } #line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp12_ = import_dir; + _tmp11_ = import_dir; #line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp13_ = commandline_options_no_runtime_monitoring; + _tmp12_ = commandline_options_no_runtime_monitoring; #line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp14_ = library_monitor_new (_tmp12_, TRUE, !_tmp13_); + _tmp13_ = library_monitor_new (_tmp11_, TRUE, !_tmp12_); #line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - replacement = _tmp14_; + replacement = _tmp13_; #line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp15_ = library_monitor_pool_get_instance (); + _tmp14_ = library_monitor_pool_get_instance (); #line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp17_ = replacement; + _tmp16_ = replacement; #line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - library_monitor_pool_replace (_tmp16_, _tmp17_, MEDIA_COLLECTION_REGISTRY_LIBRARY_MONITOR_START_DELAY_MSEC); + library_monitor_pool_replace (_tmp15_, _tmp16_, MEDIA_COLLECTION_REGISTRY_LIBRARY_MONITOR_START_DELAY_MSEC); #line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _library_monitor_pool_unref0 (_tmp16_); + _library_monitor_pool_unref0 (_tmp15_); #line 797 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" library_files_select_copy_function (); #line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -7274,18 +7631,22 @@ static void media_collection_registry_on_import_directory_changed (void) { _g_object_unref0 (current); #line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (import_dir); -#line 7275 "MediaDataRepresentation.c" +#line 7632 "MediaDataRepresentation.c" } -static gpointer _media_collection_registry_ref0 (gpointer self) { +static gpointer +_media_collection_registry_ref0 (gpointer self) +{ #line 801 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? media_collection_registry_ref (self) : NULL; -#line 7282 "MediaDataRepresentation.c" +#line 7641 "MediaDataRepresentation.c" } -MediaCollectionRegistry* media_collection_registry_get_instance (void) { +MediaCollectionRegistry* +media_collection_registry_get_instance (void) +{ MediaCollectionRegistry* result = NULL; MediaCollectionRegistry* _tmp0_; MediaCollectionRegistry* _tmp1_; @@ -7297,87 +7658,80 @@ MediaCollectionRegistry* media_collection_registry_get_instance (void) { result = _tmp1_; #line 801 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7298 "MediaDataRepresentation.c" +#line 7659 "MediaDataRepresentation.c" } -gchar* media_collection_registry_get_typename_from_source_id (const gchar* source_id) { +gchar* +media_collection_registry_get_typename_from_source_id (const gchar* source_id) +{ gchar* result = NULL; - const gchar* _tmp0_; - gboolean _tmp1_; #line 804 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (source_id != NULL, NULL); #line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = source_id; -#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = g_str_has_prefix (_tmp0_, PHOTO_TYPENAME); -#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp1_) { -#line 7314 "MediaDataRepresentation.c" - gchar* _tmp2_; + if (g_str_has_prefix (source_id, PHOTO_TYPENAME)) { +#line 7671 "MediaDataRepresentation.c" + gchar* _tmp0_; #line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = g_strdup (PHOTO_TYPENAME); + _tmp0_ = g_strdup (PHOTO_TYPENAME); #line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - result = _tmp2_; + result = _tmp0_; #line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7322 "MediaDataRepresentation.c" +#line 7679 "MediaDataRepresentation.c" } else { gchar** components = NULL; - const gchar* _tmp3_; - gchar** _tmp4_; - gchar** _tmp5_; + gchar** _tmp1_; + gchar** _tmp2_; gint components_length1; gint _components_size_; - gchar** _tmp6_; - gint _tmp6__length1; - gchar** _tmp7_; - gint _tmp7__length1; - const gchar* _tmp8_; - gchar* _tmp9_; -#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = source_id; + gchar** _tmp3_; + gint _tmp3__length1; + gchar** _tmp4_; + gint _tmp4__length1; + const gchar* _tmp5_; + gchar* _tmp6_; #line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = _tmp4_ = g_strsplit (_tmp3_, "-", 0); + _tmp2_ = _tmp1_ = g_strsplit (source_id, "-", 0); #line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - components = _tmp5_; + components = _tmp2_; #line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - components_length1 = _vala_array_length (_tmp4_); + components_length1 = _vala_array_length (_tmp1_); #line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _components_size_ = components_length1; #line 811 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = components; + _tmp3_ = components; #line 811 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6__length1 = components_length1; + _tmp3__length1 = components_length1; #line 811 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _vala_assert (_tmp6__length1 == 2, "components.length == 2"); + _vala_assert (_tmp3__length1 == 2, "components.length == 2"); #line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = components; + _tmp4_ = components; #line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7__length1 = components_length1; + _tmp4__length1 = components_length1; #line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = _tmp7_[0]; + _tmp5_ = _tmp4_[0]; #line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp9_ = g_strdup (_tmp8_); + _tmp6_ = g_strdup (_tmp5_); #line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - result = _tmp9_; + result = _tmp6_; #line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" components = (_vala_array_free (components, components_length1, (GDestroyNotify) g_free), NULL); #line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7366 "MediaDataRepresentation.c" +#line 7720 "MediaDataRepresentation.c" } } -void media_collection_registry_register_collection (MediaCollectionRegistry* self, MediaSourceCollection* collection) { +void +media_collection_registry_register_collection (MediaCollectionRegistry* self, + MediaSourceCollection* collection) +{ GeeArrayList* _tmp0_; - MediaSourceCollection* _tmp1_; - GeeHashMap* _tmp2_; - MediaSourceCollection* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - MediaSourceCollection* _tmp6_; + GeeHashMap* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; #line 817 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); #line 817 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -7385,32 +7739,28 @@ void media_collection_registry_register_collection (MediaCollectionRegistry* sel #line 818 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->all; #line 818 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = collection; -#line 818 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), collection); #line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = self->priv->by_typename; + _tmp1_ = self->priv->by_typename; #line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = collection; + _tmp2_ = media_source_collection_get_typename (collection); #line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = media_source_collection_get_typename (_tmp3_); -#line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = _tmp4_; -#line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = collection; + _tmp3_ = _tmp2_; #line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, _tmp6_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, collection); #line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_free0 (_tmp5_); -#line 7403 "MediaDataRepresentation.c" + _g_free0 (_tmp3_); +#line 7751 "MediaDataRepresentation.c" } -MediaSourceCollection* media_collection_registry_get_collection (MediaCollectionRegistry* self, const gchar* typename) { +MediaSourceCollection* +media_collection_registry_get_collection (MediaCollectionRegistry* self, + const gchar* typename) +{ MediaSourceCollection* result = NULL; GeeHashMap* _tmp0_; - const gchar* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL); #line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -7418,18 +7768,18 @@ MediaSourceCollection* media_collection_registry_get_collection (MediaCollection #line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->by_typename; #line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = typename; -#line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), typename); #line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - result = (MediaSourceCollection*) _tmp2_; + result = (MediaSourceCollection*) _tmp1_; #line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7426 "MediaDataRepresentation.c" +#line 7774 "MediaDataRepresentation.c" } -GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self) { +GeeCollection* +media_collection_registry_get_all (MediaCollectionRegistry* self) +{ GeeCollection* result = NULL; GeeArrayList* _tmp0_; GeeBidirList* _tmp1_; @@ -7446,14 +7796,16 @@ GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7447 "MediaDataRepresentation.c" +#line 7797 "MediaDataRepresentation.c" } -void media_collection_registry_freeze_all (MediaCollectionRegistry* self) { +void +media_collection_registry_freeze_all (MediaCollectionRegistry* self) +{ #line 834 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); -#line 7454 "MediaDataRepresentation.c" +#line 7806 "MediaDataRepresentation.c" { GeeIterator* _sources_it = NULL; GeeCollection* _tmp0_; @@ -7474,48 +7826,47 @@ void media_collection_registry_freeze_all (MediaCollectionRegistry* self) { _sources_it = _tmp3_; #line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7475 "MediaDataRepresentation.c" +#line 7827 "MediaDataRepresentation.c" GeeIterator* _tmp4_; - gboolean _tmp5_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - MediaSourceCollection* _tmp8_; + GeeIterator* _tmp5_; + gpointer _tmp6_; + MediaSourceCollection* _tmp7_; #line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _sources_it; #line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp4_)) { #line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7490 "MediaDataRepresentation.c" +#line 7839 "MediaDataRepresentation.c" } #line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = _sources_it; + _tmp5_ = _sources_it; #line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - sources = (MediaSourceCollection*) _tmp7_; + sources = (MediaSourceCollection*) _tmp6_; #line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = sources; + _tmp7_ = sources; #line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection)); #line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (sources); -#line 7504 "MediaDataRepresentation.c" +#line 7853 "MediaDataRepresentation.c" } #line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_sources_it); -#line 7508 "MediaDataRepresentation.c" +#line 7857 "MediaDataRepresentation.c" } } -void media_collection_registry_thaw_all (MediaCollectionRegistry* self) { +void +media_collection_registry_thaw_all (MediaCollectionRegistry* self) +{ #line 839 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); -#line 7516 "MediaDataRepresentation.c" +#line 7867 "MediaDataRepresentation.c" { GeeIterator* _sources_it = NULL; GeeCollection* _tmp0_; @@ -7536,48 +7887,47 @@ void media_collection_registry_thaw_all (MediaCollectionRegistry* self) { _sources_it = _tmp3_; #line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7537 "MediaDataRepresentation.c" +#line 7888 "MediaDataRepresentation.c" GeeIterator* _tmp4_; - gboolean _tmp5_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - MediaSourceCollection* _tmp8_; + GeeIterator* _tmp5_; + gpointer _tmp6_; + MediaSourceCollection* _tmp7_; #line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _sources_it; #line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp4_)) { #line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7552 "MediaDataRepresentation.c" +#line 7900 "MediaDataRepresentation.c" } #line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = _sources_it; + _tmp5_ = _sources_it; #line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - sources = (MediaSourceCollection*) _tmp7_; + sources = (MediaSourceCollection*) _tmp6_; #line 841 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = sources; + _tmp7_ = sources; #line 841 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection)); #line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (sources); -#line 7566 "MediaDataRepresentation.c" +#line 7914 "MediaDataRepresentation.c" } #line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_sources_it); -#line 7570 "MediaDataRepresentation.c" +#line 7918 "MediaDataRepresentation.c" } } -void media_collection_registry_begin_transaction_on_all (MediaCollectionRegistry* self) { +void +media_collection_registry_begin_transaction_on_all (MediaCollectionRegistry* self) +{ #line 844 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); -#line 7578 "MediaDataRepresentation.c" +#line 7928 "MediaDataRepresentation.c" { GeeIterator* _sources_it = NULL; GeeCollection* _tmp0_; @@ -7598,54 +7948,53 @@ void media_collection_registry_begin_transaction_on_all (MediaCollectionRegistry _sources_it = _tmp3_; #line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7599 "MediaDataRepresentation.c" +#line 7949 "MediaDataRepresentation.c" GeeIterator* _tmp4_; - gboolean _tmp5_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - MediaSourceCollection* _tmp8_; + GeeIterator* _tmp5_; + gpointer _tmp6_; + MediaSourceCollection* _tmp7_; + TransactionController* _tmp8_; TransactionController* _tmp9_; - TransactionController* _tmp10_; #line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _sources_it; #line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp4_)) { #line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7616 "MediaDataRepresentation.c" +#line 7963 "MediaDataRepresentation.c" } #line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = _sources_it; + _tmp5_ = _sources_it; #line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - sources = (MediaSourceCollection*) _tmp7_; + sources = (MediaSourceCollection*) _tmp6_; #line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = sources; + _tmp7_ = sources; #line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp9_ = media_source_collection_get_transaction_controller (_tmp8_); + _tmp8_ = media_source_collection_get_transaction_controller (_tmp7_); #line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - transaction_controller_begin (_tmp10_); + transaction_controller_begin (_tmp9_); #line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (sources); -#line 7634 "MediaDataRepresentation.c" +#line 7981 "MediaDataRepresentation.c" } #line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_sources_it); -#line 7638 "MediaDataRepresentation.c" +#line 7985 "MediaDataRepresentation.c" } } -void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistry* self) { +void +media_collection_registry_commit_transaction_on_all (MediaCollectionRegistry* self) +{ #line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); -#line 7646 "MediaDataRepresentation.c" +#line 7995 "MediaDataRepresentation.c" { GeeIterator* _sources_it = NULL; GeeCollection* _tmp0_; @@ -7666,92 +8015,85 @@ void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistr _sources_it = _tmp3_; #line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7667 "MediaDataRepresentation.c" +#line 8016 "MediaDataRepresentation.c" GeeIterator* _tmp4_; - gboolean _tmp5_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - MediaSourceCollection* _tmp8_; + GeeIterator* _tmp5_; + gpointer _tmp6_; + MediaSourceCollection* _tmp7_; + TransactionController* _tmp8_; TransactionController* _tmp9_; - TransactionController* _tmp10_; #line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _sources_it; #line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp4_)) { #line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7684 "MediaDataRepresentation.c" +#line 8030 "MediaDataRepresentation.c" } #line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = _sources_it; + _tmp5_ = _sources_it; #line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - sources = (MediaSourceCollection*) _tmp7_; + sources = (MediaSourceCollection*) _tmp6_; #line 851 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = sources; + _tmp7_ = sources; #line 851 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp9_ = media_source_collection_get_transaction_controller (_tmp8_); + _tmp8_ = media_source_collection_get_transaction_controller (_tmp7_); #line 851 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 851 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - transaction_controller_commit (_tmp10_); + transaction_controller_commit (_tmp9_); #line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (sources); -#line 7702 "MediaDataRepresentation.c" +#line 8048 "MediaDataRepresentation.c" } #line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_sources_it); -#line 7706 "MediaDataRepresentation.c" +#line 8052 "MediaDataRepresentation.c" } } -MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* self, const gchar* source_id) { +MediaSource* +media_collection_registry_fetch_media (MediaCollectionRegistry* self, + const gchar* source_id) +{ MediaSource* result = NULL; gchar* typename = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; MediaSourceCollection* collection = NULL; - const gchar* _tmp2_; + const gchar* _tmp1_; + MediaSourceCollection* _tmp2_; MediaSourceCollection* _tmp3_; - MediaSourceCollection* _tmp4_; - MediaSourceCollection* _tmp7_; - const gchar* _tmp8_; - MediaSource* _tmp9_; + MediaSourceCollection* _tmp5_; + MediaSource* _tmp6_; #line 854 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL); #line 854 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (source_id != NULL, NULL); #line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = source_id; + _tmp0_ = media_collection_registry_get_typename_from_source_id (source_id); #line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = media_collection_registry_get_typename_from_source_id (_tmp0_); -#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - typename = _tmp1_; + typename = _tmp0_; #line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = typename; + _tmp1_ = typename; #line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = media_collection_registry_get_collection (self, _tmp2_); + _tmp2_ = media_collection_registry_get_collection (self, _tmp1_); #line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - collection = _tmp3_; + collection = _tmp2_; #line 858 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = collection; + _tmp3_ = collection; #line 858 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp4_ == NULL) { -#line 7743 "MediaDataRepresentation.c" - const gchar* _tmp5_; - const gchar* _tmp6_; -#line 859 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = source_id; + if (_tmp3_ == NULL) { +#line 8088 "MediaDataRepresentation.c" + const gchar* _tmp4_; #line 859 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = typename; + _tmp4_ = typename; #line 859 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("MediaDataRepresentation.vala:859: source id '%s' has unrecognized medi" \ -"a type '%s'", _tmp5_, _tmp6_); +"a type '%s'", source_id, _tmp4_); #line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = NULL; #line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -7760,43 +8102,45 @@ MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* sel _g_free0 (typename); #line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7760 "MediaDataRepresentation.c" +#line 8102 "MediaDataRepresentation.c" } #line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = collection; + _tmp5_ = collection; #line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = source_id; + _tmp6_ = media_source_collection_fetch_by_source_id (_tmp5_, source_id); #line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp9_ = media_source_collection_fetch_by_source_id (_tmp7_, _tmp8_); -#line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - result = _tmp9_; + result = _tmp6_; #line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (collection); #line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (typename); #line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7776 "MediaDataRepresentation.c" +#line 8116 "MediaDataRepresentation.c" } -static gpointer _import_id_dup0 (gpointer self) { +static gpointer +_import_id_dup0 (gpointer self) +{ #line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? import_id_dup (self) : NULL; -#line 7783 "MediaDataRepresentation.c" +#line 8125 "MediaDataRepresentation.c" } -ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* self) { +ImportID* +media_collection_registry_get_last_import_id (MediaCollectionRegistry* self) +{ ImportID* result = NULL; ImportID last_import_id = {0}; - ImportID _tmp16_; - gint64 _tmp17_; + ImportID _tmp15_; + gint64 _tmp16_; #line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL); #line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" import_id_init (&last_import_id, IMPORT_ID_INVALID); -#line 7796 "MediaDataRepresentation.c" +#line 8140 "MediaDataRepresentation.c" { GeeIterator* _current_collection_it = NULL; GeeCollection* _tmp0_; @@ -7817,107 +8161,107 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* _current_collection_it = _tmp3_; #line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7817 "MediaDataRepresentation.c" +#line 8161 "MediaDataRepresentation.c" GeeIterator* _tmp4_; - gboolean _tmp5_; MediaSourceCollection* current_collection = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; + GeeIterator* _tmp5_; + gpointer _tmp6_; ImportID* current_import_id = NULL; - MediaSourceCollection* _tmp8_; + MediaSourceCollection* _tmp7_; + ImportID* _tmp8_; ImportID* _tmp9_; ImportID* _tmp10_; - ImportID* _tmp11_; - gint64 _tmp12_; - ImportID _tmp13_; - gint64 _tmp14_; + gint64 _tmp11_; + ImportID _tmp12_; + gint64 _tmp13_; #line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _current_collection_it; #line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp4_)) { #line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7839 "MediaDataRepresentation.c" +#line 8180 "MediaDataRepresentation.c" } #line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = _current_collection_it; + _tmp5_ = _current_collection_it; #line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - current_collection = (MediaSourceCollection*) _tmp7_; + current_collection = (MediaSourceCollection*) _tmp6_; #line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = current_collection; + _tmp7_ = current_collection; #line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp9_ = media_source_collection_get_last_import_id (_tmp8_); + _tmp8_ = media_source_collection_get_last_import_id (_tmp7_); #line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - current_import_id = _tmp9_; + current_import_id = _tmp8_; #line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp10_ = current_import_id; + _tmp9_ = current_import_id; #line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp10_ == NULL) { + if (_tmp9_ == NULL) { #line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _import_id_free0 (current_import_id); #line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (current_collection); #line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" continue; -#line 7863 "MediaDataRepresentation.c" +#line 8204 "MediaDataRepresentation.c" } #line 875 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp11_ = current_import_id; + _tmp10_ = current_import_id; #line 875 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp12_ = (*_tmp11_).id; + _tmp11_ = (*_tmp10_).id; #line 875 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp13_ = last_import_id; + _tmp12_ = last_import_id; #line 875 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp14_ = _tmp13_.id; + _tmp13_ = _tmp12_.id; #line 875 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp12_ > _tmp14_) { -#line 7875 "MediaDataRepresentation.c" - ImportID* _tmp15_; + if (_tmp11_ > _tmp13_) { +#line 8216 "MediaDataRepresentation.c" + ImportID* _tmp14_; #line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp15_ = current_import_id; + _tmp14_ = current_import_id; #line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - last_import_id = *_tmp15_; -#line 7881 "MediaDataRepresentation.c" + last_import_id = *_tmp14_; +#line 8222 "MediaDataRepresentation.c" } #line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _import_id_free0 (current_import_id); #line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (current_collection); -#line 7887 "MediaDataRepresentation.c" +#line 8228 "MediaDataRepresentation.c" } #line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_current_collection_it); -#line 7891 "MediaDataRepresentation.c" +#line 8232 "MediaDataRepresentation.c" } #line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp16_ = last_import_id; + _tmp15_ = last_import_id; #line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp17_ = _tmp16_.id; + _tmp16_ = _tmp15_.id; #line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp17_ == IMPORT_ID_INVALID) { + if (_tmp16_ == IMPORT_ID_INVALID) { #line 882 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = NULL; #line 882 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7903 "MediaDataRepresentation.c" +#line 8244 "MediaDataRepresentation.c" } else { - ImportID* _tmp18_; + ImportID* _tmp17_; #line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp18_ = _import_id_dup0 (&last_import_id); + _tmp17_ = _import_id_dup0 (&last_import_id); #line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - result = _tmp18_; + result = _tmp17_; #line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7912 "MediaDataRepresentation.c" +#line 8253 "MediaDataRepresentation.c" } } -GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaCollectionRegistry* self, EventID* event_id) { +GeeCollection* +media_collection_registry_get_source_ids_for_event_id (MediaCollectionRegistry* self, + EventID* event_id) +{ GeeCollection* result = NULL; GeeArrayList* _result_ = NULL; GeeArrayList* _tmp0_; @@ -7929,7 +8273,7 @@ GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaColle _tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _result_ = _tmp0_; -#line 7929 "MediaDataRepresentation.c" +#line 8273 "MediaDataRepresentation.c" { GeeIterator* _current_collection_it = NULL; GeeCollection* _tmp1_; @@ -7950,70 +8294,70 @@ GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaColle _current_collection_it = _tmp4_; #line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7950 "MediaDataRepresentation.c" +#line 8294 "MediaDataRepresentation.c" GeeIterator* _tmp5_; - gboolean _tmp6_; MediaSourceCollection* current_collection = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; - GeeArrayList* _tmp9_; - MediaSourceCollection* _tmp10_; - EventID _tmp11_; + GeeIterator* _tmp6_; + gpointer _tmp7_; + GeeArrayList* _tmp8_; + MediaSourceCollection* _tmp9_; + EventID _tmp10_; + GeeCollection* _tmp11_; GeeCollection* _tmp12_; - GeeCollection* _tmp13_; #line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = _current_collection_it; #line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = gee_iterator_next (_tmp5_); -#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp5_)) { #line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7969 "MediaDataRepresentation.c" +#line 8310 "MediaDataRepresentation.c" } #line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = _current_collection_it; + _tmp6_ = _current_collection_it; #line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - current_collection = (MediaSourceCollection*) _tmp8_; + current_collection = (MediaSourceCollection*) _tmp7_; #line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp9_ = _result_; + _tmp8_ = _result_; #line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp10_ = current_collection; + _tmp9_ = current_collection; #line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp11_ = *event_id; + _tmp10_ = *event_id; #line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp12_ = media_source_collection_get_event_source_ids (_tmp10_, &_tmp11_); + _tmp11_ = media_source_collection_get_event_source_ids (_tmp9_, &_tmp10_); #line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_array_list_add_all (_tmp9_, _tmp13_); + gee_array_list_add_all (_tmp8_, _tmp12_); #line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp12_); #line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (current_collection); -#line 7993 "MediaDataRepresentation.c" +#line 8334 "MediaDataRepresentation.c" } #line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_current_collection_it); -#line 7997 "MediaDataRepresentation.c" +#line 8338 "MediaDataRepresentation.c" } #line 894 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_result_, GEE_TYPE_COLLECTION, GeeCollection); #line 894 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 8003 "MediaDataRepresentation.c" +#line 8344 "MediaDataRepresentation.c" } -MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaCollectionRegistry* self, GFile* file) { +MediaSourceCollection* +media_collection_registry_get_collection_for_file (MediaCollectionRegistry* self, + GFile* file) +{ MediaSourceCollection* result = NULL; #line 897 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL); #line 897 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 8013 "MediaDataRepresentation.c" +#line 8357 "MediaDataRepresentation.c" { GeeIterator* _collection_it = NULL; GeeCollection* _tmp0_; @@ -8034,210 +8378,211 @@ MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaC _collection_it = _tmp3_; #line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 8034 "MediaDataRepresentation.c" +#line 8378 "MediaDataRepresentation.c" GeeIterator* _tmp4_; - gboolean _tmp5_; MediaSourceCollection* collection = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - MediaSourceCollection* _tmp8_; - GFile* _tmp9_; - gboolean _tmp10_; + GeeIterator* _tmp5_; + gpointer _tmp6_; + MediaSourceCollection* _tmp7_; #line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _collection_it; #line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp4_)) { #line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 8051 "MediaDataRepresentation.c" +#line 8390 "MediaDataRepresentation.c" } #line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = _collection_it; + _tmp5_ = _collection_it; #line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - collection = (MediaSourceCollection*) _tmp7_; -#line 899 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = collection; -#line 899 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp9_ = file; + collection = (MediaSourceCollection*) _tmp6_; #line 899 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp10_ = media_source_collection_is_file_recognized (_tmp8_, _tmp9_); + _tmp7_ = collection; #line 899 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp10_) { + if (media_source_collection_is_file_recognized (_tmp7_, file)) { #line 900 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = collection; #line 900 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_collection_it); #line 900 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 8073 "MediaDataRepresentation.c" +#line 8408 "MediaDataRepresentation.c" } #line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (collection); -#line 8077 "MediaDataRepresentation.c" +#line 8412 "MediaDataRepresentation.c" } #line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_collection_it); -#line 8081 "MediaDataRepresentation.c" +#line 8416 "MediaDataRepresentation.c" } #line 903 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = NULL; #line 903 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 8087 "MediaDataRepresentation.c" +#line 8422 "MediaDataRepresentation.c" } -gboolean media_collection_registry_is_valid_source_id (MediaCollectionRegistry* self, const gchar* source_id) { +gboolean +media_collection_registry_is_valid_source_id (MediaCollectionRegistry* self, + const gchar* source_id) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_ = FALSE; - const gchar* _tmp3_; - gboolean _tmp4_; + gboolean _tmp0_ = FALSE; #line 906 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), FALSE); #line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = source_id; -#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = is_string_empty (_tmp0_); -#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp1_) { + if (is_string_empty (source_id)) { #line 908 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = FALSE; #line 908 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 8110 "MediaDataRepresentation.c" +#line 8440 "MediaDataRepresentation.c" } #line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = source_id; + if (g_str_has_prefix (source_id, PHOTO_TYPENAME)) { #line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = g_str_has_prefix (_tmp3_, PHOTO_TYPENAME); -#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp4_) { -#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = TRUE; -#line 8120 "MediaDataRepresentation.c" + _tmp0_ = TRUE; +#line 8446 "MediaDataRepresentation.c" } else { - const gchar* _tmp5_; - gboolean _tmp6_; -#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = source_id; -#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = g_str_has_prefix (_tmp5_, VIDEO_TYPENAME "-"); #line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = _tmp6_; -#line 8130 "MediaDataRepresentation.c" + _tmp0_ = g_str_has_prefix (source_id, VIDEO_TYPENAME "-"); +#line 8450 "MediaDataRepresentation.c" } #line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - result = _tmp2_; + result = _tmp0_; #line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 8136 "MediaDataRepresentation.c" +#line 8456 "MediaDataRepresentation.c" } -static void value_media_collection_registry_init (GValue* value) { +static void +value_media_collection_registry_init (GValue* value) +{ #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 8143 "MediaDataRepresentation.c" +#line 8465 "MediaDataRepresentation.c" } -static void value_media_collection_registry_free_value (GValue* value) { +static void +value_media_collection_registry_free_value (GValue* value) +{ #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (value->data[0].v_pointer) { #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_unref (value->data[0].v_pointer); -#line 8152 "MediaDataRepresentation.c" +#line 8476 "MediaDataRepresentation.c" } } -static void value_media_collection_registry_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_media_collection_registry_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (src_value->data[0].v_pointer) { #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" dest_value->data[0].v_pointer = media_collection_registry_ref (src_value->data[0].v_pointer); -#line 8162 "MediaDataRepresentation.c" +#line 8489 "MediaDataRepresentation.c" } else { #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" dest_value->data[0].v_pointer = NULL; -#line 8166 "MediaDataRepresentation.c" +#line 8493 "MediaDataRepresentation.c" } } -static gpointer value_media_collection_registry_peek_pointer (const GValue* value) { +static gpointer +value_media_collection_registry_peek_pointer (const GValue* value) +{ #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return value->data[0].v_pointer; -#line 8174 "MediaDataRepresentation.c" +#line 8503 "MediaDataRepresentation.c" } -static gchar* value_media_collection_registry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_media_collection_registry_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (collect_values[0].v_pointer) { -#line 8181 "MediaDataRepresentation.c" +#line 8515 "MediaDataRepresentation.c" MediaCollectionRegistry * object; object = collect_values[0].v_pointer; #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (object->parent_instance.g_class == NULL) { #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8188 "MediaDataRepresentation.c" +#line 8522 "MediaDataRepresentation.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8192 "MediaDataRepresentation.c" +#line 8526 "MediaDataRepresentation.c" } #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = media_collection_registry_ref (object); -#line 8196 "MediaDataRepresentation.c" +#line 8530 "MediaDataRepresentation.c" } else { #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 8200 "MediaDataRepresentation.c" +#line 8534 "MediaDataRepresentation.c" } #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 8204 "MediaDataRepresentation.c" +#line 8538 "MediaDataRepresentation.c" } -static gchar* value_media_collection_registry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_media_collection_registry_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ MediaCollectionRegistry ** object_p; object_p = collect_values[0].v_pointer; #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!object_p) { #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8215 "MediaDataRepresentation.c" +#line 8554 "MediaDataRepresentation.c" } #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!value->data[0].v_pointer) { #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = NULL; -#line 8221 "MediaDataRepresentation.c" +#line 8560 "MediaDataRepresentation.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = value->data[0].v_pointer; -#line 8225 "MediaDataRepresentation.c" +#line 8564 "MediaDataRepresentation.c" } else { #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = media_collection_registry_ref (value->data[0].v_pointer); -#line 8229 "MediaDataRepresentation.c" +#line 8568 "MediaDataRepresentation.c" } #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 8233 "MediaDataRepresentation.c" +#line 8572 "MediaDataRepresentation.c" } -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecMediaCollectionRegistry* spec; #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_MEDIA_COLLECTION_REGISTRY), NULL); @@ -8247,20 +8592,25 @@ GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar G_PARAM_SPEC (spec)->value_type = object_type; #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return G_PARAM_SPEC (spec); -#line 8247 "MediaDataRepresentation.c" +#line 8592 "MediaDataRepresentation.c" } -gpointer value_get_media_collection_registry (const GValue* value) { +gpointer +value_get_media_collection_registry (const GValue* value) +{ #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_COLLECTION_REGISTRY), NULL); #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return value->data[0].v_pointer; -#line 8256 "MediaDataRepresentation.c" +#line 8603 "MediaDataRepresentation.c" } -void value_set_media_collection_registry (GValue* value, gpointer v_object) { +void +value_set_media_collection_registry (GValue* value, + gpointer v_object) +{ MediaCollectionRegistry * old; #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_COLLECTION_REGISTRY)); @@ -8276,22 +8626,25 @@ void value_set_media_collection_registry (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_ref (value->data[0].v_pointer); -#line 8276 "MediaDataRepresentation.c" +#line 8626 "MediaDataRepresentation.c" } else { #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 8280 "MediaDataRepresentation.c" +#line 8630 "MediaDataRepresentation.c" } #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (old) { #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_unref (old); -#line 8286 "MediaDataRepresentation.c" +#line 8636 "MediaDataRepresentation.c" } } -void value_take_media_collection_registry (GValue* value, gpointer v_object) { +void +value_take_media_collection_registry (GValue* value, + gpointer v_object) +{ MediaCollectionRegistry * old; #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_COLLECTION_REGISTRY)); @@ -8305,33 +8658,37 @@ void value_take_media_collection_registry (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = v_object; -#line 8305 "MediaDataRepresentation.c" +#line 8658 "MediaDataRepresentation.c" } else { #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 8309 "MediaDataRepresentation.c" +#line 8662 "MediaDataRepresentation.c" } #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (old) { #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_unref (old); -#line 8315 "MediaDataRepresentation.c" +#line 8668 "MediaDataRepresentation.c" } } -static void media_collection_registry_class_init (MediaCollectionRegistryClass * klass) { +static void +media_collection_registry_class_init (MediaCollectionRegistryClass * klass) +{ #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_parent_class = g_type_class_peek_parent (klass); #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((MediaCollectionRegistryClass *) klass)->finalize = media_collection_registry_finalize; #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_class_add_private (klass, sizeof (MediaCollectionRegistryPrivate)); -#line 8327 "MediaDataRepresentation.c" +#line 8682 "MediaDataRepresentation.c" } -static void media_collection_registry_instance_init (MediaCollectionRegistry * self) { +static void +media_collection_registry_instance_init (MediaCollectionRegistry * self) +{ GeeArrayList* _tmp0_; GeeHashMap* _tmp1_; #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -8346,11 +8703,13 @@ static void media_collection_registry_instance_init (MediaCollectionRegistry * s self->priv->by_typename = _tmp1_; #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->ref_count = 1; -#line 8346 "MediaDataRepresentation.c" +#line 8703 "MediaDataRepresentation.c" } -static void media_collection_registry_finalize (MediaCollectionRegistry * obj) { +static void +media_collection_registry_finalize (MediaCollectionRegistry * obj) +{ MediaCollectionRegistry * self; Application* _tmp0_; Application* _tmp1_; @@ -8373,11 +8732,13 @@ static void media_collection_registry_finalize (MediaCollectionRegistry * obj) { _g_object_unref0 (self->priv->all); #line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (self->priv->by_typename); -#line 8373 "MediaDataRepresentation.c" +#line 8732 "MediaDataRepresentation.c" } -GType media_collection_registry_get_type (void) { +GType +media_collection_registry_get_type (void) +{ static volatile gsize media_collection_registry_type_id__volatile = 0; if (g_once_init_enter (&media_collection_registry_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_media_collection_registry_init, value_media_collection_registry_free_value, value_media_collection_registry_copy_value, value_media_collection_registry_peek_pointer, "p", value_media_collection_registry_collect_value, "p", value_media_collection_registry_lcopy_value }; @@ -8391,18 +8752,22 @@ GType media_collection_registry_get_type (void) { } -gpointer media_collection_registry_ref (gpointer instance) { +gpointer +media_collection_registry_ref (gpointer instance) +{ MediaCollectionRegistry * self; self = instance; #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_atomic_int_inc (&self->ref_count); #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return instance; -#line 8398 "MediaDataRepresentation.c" +#line 8761 "MediaDataRepresentation.c" } -void media_collection_registry_unref (gpointer instance) { +void +media_collection_registry_unref (gpointer instance) +{ MediaCollectionRegistry * self; self = instance; #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -8411,12 +8776,16 @@ void media_collection_registry_unref (gpointer instance) { MEDIA_COLLECTION_REGISTRY_GET_CLASS (self)->finalize (self); #line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8411 "MediaDataRepresentation.c" +#line 8776 "MediaDataRepresentation.c" } } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -8428,13 +8797,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -static gint _vala_array_length (gpointer array) { +static gint +_vala_array_length (gpointer array) +{ int length; length = 0; if (array) { diff --git a/src/MediaInterfaces.c b/src/MediaInterfaces.c index 583afbf..1d4d597 100644 --- a/src/MediaInterfaces.c +++ b/src/MediaInterfaces.c @@ -1,4 +1,4 @@ -/* MediaInterfaces.c generated by valac 0.36.6, the Vala compiler +/* MediaInterfaces.c generated by valac 0.40.4, the Vala compiler * generated from MediaInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -50,6 +50,7 @@ /* The object is thread-safe. There is no guarantee that the underlying persistent store is,*/ /* however.*/ + #include #include #include @@ -201,25 +202,32 @@ static gpointer transaction_controller_parent_class = NULL; gpointer transaction_controller_ref (gpointer instance); void transaction_controller_unref (gpointer instance); -GParamSpec* param_spec_transaction_controller (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_transaction_controller (GValue* value, gpointer v_object); -void value_take_transaction_controller (GValue* value, gpointer v_object); +GParamSpec* param_spec_transaction_controller (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_transaction_controller (GValue* value, + gpointer v_object); +void value_take_transaction_controller (GValue* value, + gpointer v_object); gpointer value_get_transaction_controller (const GValue* value); GType transaction_controller_get_type (void) G_GNUC_CONST; #define TRANSACTION_CONTROLLER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TRANSACTION_CONTROLLER, TransactionControllerPrivate)) -enum { - TRANSACTION_CONTROLLER_DUMMY_PROPERTY -}; TransactionController* transaction_controller_construct (GType object_type); void transaction_controller_begin (TransactionController* self); -void transaction_controller_begin_impl (TransactionController* self, GError** error); +void transaction_controller_begin_impl (TransactionController* self, + GError** error); GQuark database_error_quark (void); void app_window_database_error (GError* err); void app_window_panic (const gchar* msg); -static void transaction_controller_real_begin_impl (TransactionController* self, GError** error); +static void transaction_controller_real_begin_impl (TransactionController* self, + GError** error); void transaction_controller_commit (TransactionController* self); -void transaction_controller_commit_impl (TransactionController* self, GError** error); -static void transaction_controller_real_commit_impl (TransactionController* self, GError** error); +void transaction_controller_commit_impl (TransactionController* self, + GError** error); +static void transaction_controller_real_commit_impl (TransactionController* self, + GError** error); static void transaction_controller_finalize (TransactionController * obj); GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; @@ -229,43 +237,60 @@ GType flaggable_get_type (void) G_GNUC_CONST; gboolean flaggable_is_flagged (Flaggable* self); void flaggable_mark_flagged (Flaggable* self); void flaggable_mark_unflagged (Flaggable* self); -void flaggable_mark_many_flagged_unflagged (GeeCollection* flag, GeeCollection* unflag, TransactionController* controller, GError** error); +void flaggable_mark_many_flagged_unflagged (GeeCollection* flag, + GeeCollection* unflag, + TransactionController* controller, + GError** error); GType monitorable_get_type (void) G_GNUC_CONST; gboolean monitorable_is_offline (Monitorable* self); void monitorable_mark_online (Monitorable* self); void monitorable_mark_offline (Monitorable* self); -void monitorable_mark_many_online_offline (GeeCollection* online, GeeCollection* offline, TransactionController* controller, GError** error); -void monitorable_set_master_file (Monitorable* self, GFile* file); -void monitorable_set_many_master_file (GeeMap* map, TransactionController* controller, GError** error); -void monitorable_set_master_timestamp (Monitorable* self, GFileInfo* info); -void monitorable_set_many_master_timestamp (GeeMap* map, TransactionController* controller, GError** error); +void monitorable_mark_many_online_offline (GeeCollection* online, + GeeCollection* offline, + TransactionController* controller, + GError** error); +void monitorable_set_master_file (Monitorable* self, + GFile* file); +void monitorable_set_many_master_file (GeeMap* map, + TransactionController* controller, + GError** error); +void monitorable_set_master_timestamp (Monitorable* self, + GFileInfo* info); +void monitorable_set_many_master_timestamp (GeeMap* map, + TransactionController* controller, + GError** error); GType dateable_get_type (void) G_GNUC_CONST; -void dateable_set_exposure_time (Dateable* self, time_t target_time); +void dateable_set_exposure_time (Dateable* self, + time_t target_time); time_t dateable_get_exposure_time (Dateable* self); -TransactionController* transaction_controller_construct (GType object_type) { +TransactionController* +transaction_controller_construct (GType object_type) +{ TransactionController* self = NULL; #line 54 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" self = (TransactionController*) g_type_create_instance (object_type); #line 54 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" return self; -#line 254 "MediaInterfaces.c" +#line 277 "MediaInterfaces.c" } -void transaction_controller_begin (TransactionController* self) { +void +transaction_controller_begin (TransactionController* self) +{ GError * _inner_error_ = NULL; #line 63 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail (IS_TRANSACTION_CONTROLLER (self)); -#line 262 "MediaInterfaces.c" +#line 287 "MediaInterfaces.c" { gint _tmp0_; #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _tmp0_ = self->priv->count; #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_rec_mutex_lock (&self->priv->__lock_count); -#line 269 "MediaInterfaces.c" +#line 294 "MediaInterfaces.c" { gint _tmp1_; #line 65 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" @@ -274,25 +299,25 @@ void transaction_controller_begin (TransactionController* self) { self->priv->count = _tmp1_ + 1; #line 65 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (_tmp1_ != 0) { -#line 278 "MediaInterfaces.c" +#line 303 "MediaInterfaces.c" { gint _tmp2_; #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _tmp2_ = self->priv->count; #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_rec_mutex_unlock (&self->priv->__lock_count); -#line 285 "MediaInterfaces.c" +#line 310 "MediaInterfaces.c" } #line 66 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" return; -#line 289 "MediaInterfaces.c" +#line 314 "MediaInterfaces.c" } { #line 69 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" transaction_controller_begin_impl (self, &_inner_error_); #line 69 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 296 "MediaInterfaces.c" +#line 321 "MediaInterfaces.c" goto __catch583_g_error; } } @@ -314,13 +339,13 @@ void transaction_controller_begin (TransactionController* self) { _tmp4_ = err; #line 74 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (_tmp4_->domain == DATABASE_ERROR) { -#line 318 "MediaInterfaces.c" +#line 343 "MediaInterfaces.c" GError* _tmp5_; #line 75 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _tmp5_ = err; #line 75 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" app_window_database_error ((GError*) _tmp5_); -#line 324 "MediaInterfaces.c" +#line 349 "MediaInterfaces.c" } else { GError* _tmp6_; const gchar* _tmp7_; @@ -338,23 +363,23 @@ void transaction_controller_begin (TransactionController* self) { app_window_panic (_tmp9_); #line 77 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _g_free0 (_tmp9_); -#line 342 "MediaInterfaces.c" +#line 367 "MediaInterfaces.c" } #line 68 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _g_error_free0 (err); -#line 346 "MediaInterfaces.c" +#line 371 "MediaInterfaces.c" } __finally583: #line 68 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 351 "MediaInterfaces.c" +#line 376 "MediaInterfaces.c" { gint _tmp10_; #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _tmp10_ = self->priv->count; #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_rec_mutex_unlock (&self->priv->__lock_count); -#line 358 "MediaInterfaces.c" +#line 383 "MediaInterfaces.c" } #line 68 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -362,7 +387,7 @@ void transaction_controller_begin (TransactionController* self) { g_clear_error (&_inner_error_); #line 68 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" return; -#line 366 "MediaInterfaces.c" +#line 391 "MediaInterfaces.c" } } __finally582: @@ -372,7 +397,7 @@ void transaction_controller_begin (TransactionController* self) { _tmp11_ = self->priv->count; #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_rec_mutex_unlock (&self->priv->__lock_count); -#line 376 "MediaInterfaces.c" +#line 401 "MediaInterfaces.c" } #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -382,42 +407,50 @@ void transaction_controller_begin (TransactionController* self) { g_clear_error (&_inner_error_); #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" return; -#line 386 "MediaInterfaces.c" +#line 411 "MediaInterfaces.c" } } } -static void transaction_controller_real_begin_impl (TransactionController* self, GError** error) { +static void +transaction_controller_real_begin_impl (TransactionController* self, + GError** error) +{ #line 83 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_critical ("Type `%s' does not implement abstract method `transaction_controller_begin_impl'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 83 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" return; -#line 397 "MediaInterfaces.c" +#line 425 "MediaInterfaces.c" } -void transaction_controller_begin_impl (TransactionController* self, GError** error) { +void +transaction_controller_begin_impl (TransactionController* self, + GError** error) +{ #line 83 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail (IS_TRANSACTION_CONTROLLER (self)); #line 83 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" TRANSACTION_CONTROLLER_GET_CLASS (self)->begin_impl (self, error); -#line 406 "MediaInterfaces.c" +#line 437 "MediaInterfaces.c" } -void transaction_controller_commit (TransactionController* self) { +void +transaction_controller_commit (TransactionController* self) +{ GError * _inner_error_ = NULL; #line 85 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail (IS_TRANSACTION_CONTROLLER (self)); -#line 414 "MediaInterfaces.c" +#line 447 "MediaInterfaces.c" { gint _tmp0_; #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _tmp0_ = self->priv->count; #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_rec_mutex_lock (&self->priv->__lock_count); -#line 421 "MediaInterfaces.c" +#line 454 "MediaInterfaces.c" { gint _tmp1_; gint _tmp2_; @@ -434,25 +467,25 @@ void transaction_controller_commit (TransactionController* self) { _tmp3_ = self->priv->count; #line 88 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (_tmp3_ != 0) { -#line 438 "MediaInterfaces.c" +#line 471 "MediaInterfaces.c" { gint _tmp4_; #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _tmp4_ = self->priv->count; #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_rec_mutex_unlock (&self->priv->__lock_count); -#line 445 "MediaInterfaces.c" +#line 478 "MediaInterfaces.c" } #line 89 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" return; -#line 449 "MediaInterfaces.c" +#line 482 "MediaInterfaces.c" } { #line 93 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" transaction_controller_commit_impl (self, &_inner_error_); #line 93 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 456 "MediaInterfaces.c" +#line 489 "MediaInterfaces.c" goto __catch585_g_error; } } @@ -469,13 +502,13 @@ void transaction_controller_commit (TransactionController* self) { _tmp5_ = err; #line 95 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (_tmp5_->domain == DATABASE_ERROR) { -#line 473 "MediaInterfaces.c" +#line 506 "MediaInterfaces.c" GError* _tmp6_; #line 96 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _tmp6_ = err; #line 96 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" app_window_database_error ((GError*) _tmp6_); -#line 479 "MediaInterfaces.c" +#line 512 "MediaInterfaces.c" } else { GError* _tmp7_; const gchar* _tmp8_; @@ -493,23 +526,23 @@ void transaction_controller_commit (TransactionController* self) { app_window_panic (_tmp10_); #line 98 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _g_free0 (_tmp10_); -#line 497 "MediaInterfaces.c" +#line 530 "MediaInterfaces.c" } #line 92 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _g_error_free0 (err); -#line 501 "MediaInterfaces.c" +#line 534 "MediaInterfaces.c" } __finally585: #line 92 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 506 "MediaInterfaces.c" +#line 539 "MediaInterfaces.c" { gint _tmp11_; #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _tmp11_ = self->priv->count; #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_rec_mutex_unlock (&self->priv->__lock_count); -#line 513 "MediaInterfaces.c" +#line 546 "MediaInterfaces.c" } #line 92 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -517,7 +550,7 @@ void transaction_controller_commit (TransactionController* self) { g_clear_error (&_inner_error_); #line 92 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" return; -#line 521 "MediaInterfaces.c" +#line 554 "MediaInterfaces.c" } } __finally584: @@ -527,7 +560,7 @@ void transaction_controller_commit (TransactionController* self) { _tmp12_ = self->priv->count; #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_rec_mutex_unlock (&self->priv->__lock_count); -#line 531 "MediaInterfaces.c" +#line 564 "MediaInterfaces.c" } #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -537,128 +570,159 @@ void transaction_controller_commit (TransactionController* self) { g_clear_error (&_inner_error_); #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" return; -#line 541 "MediaInterfaces.c" +#line 574 "MediaInterfaces.c" } } } -static void transaction_controller_real_commit_impl (TransactionController* self, GError** error) { +static void +transaction_controller_real_commit_impl (TransactionController* self, + GError** error) +{ #line 104 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_critical ("Type `%s' does not implement abstract method `transaction_controller_commit_impl'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 104 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" return; -#line 552 "MediaInterfaces.c" +#line 588 "MediaInterfaces.c" } -void transaction_controller_commit_impl (TransactionController* self, GError** error) { +void +transaction_controller_commit_impl (TransactionController* self, + GError** error) +{ #line 104 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail (IS_TRANSACTION_CONTROLLER (self)); #line 104 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" TRANSACTION_CONTROLLER_GET_CLASS (self)->commit_impl (self, error); -#line 561 "MediaInterfaces.c" +#line 600 "MediaInterfaces.c" } -static void value_transaction_controller_init (GValue* value) { +static void +value_transaction_controller_init (GValue* value) +{ #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" value->data[0].v_pointer = NULL; -#line 568 "MediaInterfaces.c" +#line 609 "MediaInterfaces.c" } -static void value_transaction_controller_free_value (GValue* value) { +static void +value_transaction_controller_free_value (GValue* value) +{ #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (value->data[0].v_pointer) { #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" transaction_controller_unref (value->data[0].v_pointer); -#line 577 "MediaInterfaces.c" +#line 620 "MediaInterfaces.c" } } -static void value_transaction_controller_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_transaction_controller_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (src_value->data[0].v_pointer) { #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" dest_value->data[0].v_pointer = transaction_controller_ref (src_value->data[0].v_pointer); -#line 587 "MediaInterfaces.c" +#line 633 "MediaInterfaces.c" } else { #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" dest_value->data[0].v_pointer = NULL; -#line 591 "MediaInterfaces.c" +#line 637 "MediaInterfaces.c" } } -static gpointer value_transaction_controller_peek_pointer (const GValue* value) { +static gpointer +value_transaction_controller_peek_pointer (const GValue* value) +{ #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" return value->data[0].v_pointer; -#line 599 "MediaInterfaces.c" +#line 647 "MediaInterfaces.c" } -static gchar* value_transaction_controller_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_transaction_controller_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (collect_values[0].v_pointer) { -#line 606 "MediaInterfaces.c" +#line 659 "MediaInterfaces.c" TransactionController * object; object = collect_values[0].v_pointer; #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (object->parent_instance.g_class == NULL) { #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 613 "MediaInterfaces.c" +#line 666 "MediaInterfaces.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.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 617 "MediaInterfaces.c" +#line 670 "MediaInterfaces.c" } #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" value->data[0].v_pointer = transaction_controller_ref (object); -#line 621 "MediaInterfaces.c" +#line 674 "MediaInterfaces.c" } else { #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" value->data[0].v_pointer = NULL; -#line 625 "MediaInterfaces.c" +#line 678 "MediaInterfaces.c" } #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" return NULL; -#line 629 "MediaInterfaces.c" +#line 682 "MediaInterfaces.c" } -static gchar* value_transaction_controller_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_transaction_controller_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ TransactionController ** object_p; object_p = collect_values[0].v_pointer; #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (!object_p) { #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 640 "MediaInterfaces.c" +#line 698 "MediaInterfaces.c" } #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (!value->data[0].v_pointer) { #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" *object_p = NULL; -#line 646 "MediaInterfaces.c" +#line 704 "MediaInterfaces.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" *object_p = value->data[0].v_pointer; -#line 650 "MediaInterfaces.c" +#line 708 "MediaInterfaces.c" } else { #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" *object_p = transaction_controller_ref (value->data[0].v_pointer); -#line 654 "MediaInterfaces.c" +#line 712 "MediaInterfaces.c" } #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" return NULL; -#line 658 "MediaInterfaces.c" +#line 716 "MediaInterfaces.c" } -GParamSpec* param_spec_transaction_controller (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_transaction_controller (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecTransactionController* spec; #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_TRANSACTION_CONTROLLER), NULL); @@ -668,20 +732,25 @@ GParamSpec* param_spec_transaction_controller (const gchar* name, const gchar* n G_PARAM_SPEC (spec)->value_type = object_type; #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" return G_PARAM_SPEC (spec); -#line 672 "MediaInterfaces.c" +#line 736 "MediaInterfaces.c" } -gpointer value_get_transaction_controller (const GValue* value) { +gpointer +value_get_transaction_controller (const GValue* value) +{ #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSACTION_CONTROLLER), NULL); #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" return value->data[0].v_pointer; -#line 681 "MediaInterfaces.c" +#line 747 "MediaInterfaces.c" } -void value_set_transaction_controller (GValue* value, gpointer v_object) { +void +value_set_transaction_controller (GValue* value, + gpointer v_object) +{ TransactionController * old; #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSACTION_CONTROLLER)); @@ -697,22 +766,25 @@ void value_set_transaction_controller (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" transaction_controller_ref (value->data[0].v_pointer); -#line 701 "MediaInterfaces.c" +#line 770 "MediaInterfaces.c" } else { #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" value->data[0].v_pointer = NULL; -#line 705 "MediaInterfaces.c" +#line 774 "MediaInterfaces.c" } #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (old) { #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" transaction_controller_unref (old); -#line 711 "MediaInterfaces.c" +#line 780 "MediaInterfaces.c" } } -void value_take_transaction_controller (GValue* value, gpointer v_object) { +void +value_take_transaction_controller (GValue* value, + gpointer v_object) +{ TransactionController * old; #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSACTION_CONTROLLER)); @@ -726,22 +798,24 @@ void value_take_transaction_controller (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" value->data[0].v_pointer = v_object; -#line 730 "MediaInterfaces.c" +#line 802 "MediaInterfaces.c" } else { #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" value->data[0].v_pointer = NULL; -#line 734 "MediaInterfaces.c" +#line 806 "MediaInterfaces.c" } #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (old) { #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" transaction_controller_unref (old); -#line 740 "MediaInterfaces.c" +#line 812 "MediaInterfaces.c" } } -static void transaction_controller_class_init (TransactionControllerClass * klass) { +static void +transaction_controller_class_init (TransactionControllerClass * klass) +{ #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" transaction_controller_parent_class = g_type_class_peek_parent (klass); #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" @@ -752,11 +826,13 @@ static void transaction_controller_class_init (TransactionControllerClass * klas ((TransactionControllerClass *) klass)->begin_impl = (void (*) (TransactionController *, GError**)) transaction_controller_real_begin_impl; #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" ((TransactionControllerClass *) klass)->commit_impl = (void (*) (TransactionController *, GError**)) transaction_controller_real_commit_impl; -#line 756 "MediaInterfaces.c" +#line 830 "MediaInterfaces.c" } -static void transaction_controller_instance_init (TransactionController * self) { +static void +transaction_controller_instance_init (TransactionController * self) +{ #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" self->priv = TRANSACTION_CONTROLLER_GET_PRIVATE (self); #line 52 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" @@ -765,32 +841,34 @@ static void transaction_controller_instance_init (TransactionController * self) self->priv->count = 0; #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" self->ref_count = 1; -#line 769 "MediaInterfaces.c" +#line 845 "MediaInterfaces.c" } -static void transaction_controller_finalize (TransactionController * obj) { +static void +transaction_controller_finalize (TransactionController * obj) +{ TransactionController * self; GError * _inner_error_ = NULL; #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TRANSACTION_CONTROLLER, TransactionController); #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_signal_handlers_destroy (self); -#line 780 "MediaInterfaces.c" +#line 858 "MediaInterfaces.c" { gint _tmp0_; #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _tmp0_ = self->priv->count; #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_rec_mutex_lock (&self->priv->__lock_count); -#line 787 "MediaInterfaces.c" +#line 865 "MediaInterfaces.c" { gint _tmp1_; #line 59 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _tmp1_ = self->priv->count; #line 59 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _vala_assert (_tmp1_ == 0, "count == 0"); -#line 794 "MediaInterfaces.c" +#line 872 "MediaInterfaces.c" } __finally581: { @@ -799,7 +877,7 @@ static void transaction_controller_finalize (TransactionController * obj) { _tmp2_ = self->priv->count; #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_rec_mutex_unlock (&self->priv->__lock_count); -#line 803 "MediaInterfaces.c" +#line 881 "MediaInterfaces.c" } #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -807,16 +885,18 @@ static void transaction_controller_finalize (TransactionController * obj) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_clear_error (&_inner_error_); -#line 811 "MediaInterfaces.c" +#line 889 "MediaInterfaces.c" } } #line 52 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_rec_mutex_clear (&self->priv->__lock_count); -#line 816 "MediaInterfaces.c" +#line 894 "MediaInterfaces.c" } -GType transaction_controller_get_type (void) { +GType +transaction_controller_get_type (void) +{ static volatile gsize transaction_controller_type_id__volatile = 0; if (g_once_init_enter (&transaction_controller_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_transaction_controller_init, value_transaction_controller_free_value, value_transaction_controller_copy_value, value_transaction_controller_peek_pointer, "p", value_transaction_controller_collect_value, "p", value_transaction_controller_lcopy_value }; @@ -830,18 +910,22 @@ GType transaction_controller_get_type (void) { } -gpointer transaction_controller_ref (gpointer instance) { +gpointer +transaction_controller_ref (gpointer instance) +{ TransactionController * self; self = instance; #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_atomic_int_inc (&self->ref_count); #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" return instance; -#line 841 "MediaInterfaces.c" +#line 923 "MediaInterfaces.c" } -void transaction_controller_unref (gpointer instance) { +void +transaction_controller_unref (gpointer instance) +{ TransactionController * self; self = instance; #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" @@ -850,43 +934,50 @@ void transaction_controller_unref (gpointer instance) { TRANSACTION_CONTROLLER_GET_CLASS (self)->finalize (self); #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_type_free_instance ((GTypeInstance *) self); -#line 854 "MediaInterfaces.c" +#line 938 "MediaInterfaces.c" } } -gboolean flaggable_is_flagged (Flaggable* self) { +gboolean +flaggable_is_flagged (Flaggable* self) +{ #line 115 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_val_if_fail (IS_FLAGGABLE (self), FALSE); #line 115 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" return FLAGGABLE_GET_INTERFACE (self)->is_flagged (self); -#line 864 "MediaInterfaces.c" +#line 950 "MediaInterfaces.c" } -void flaggable_mark_flagged (Flaggable* self) { +void +flaggable_mark_flagged (Flaggable* self) +{ #line 117 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail (IS_FLAGGABLE (self)); #line 117 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" FLAGGABLE_GET_INTERFACE (self)->mark_flagged (self); -#line 873 "MediaInterfaces.c" +#line 961 "MediaInterfaces.c" } -void flaggable_mark_unflagged (Flaggable* self) { +void +flaggable_mark_unflagged (Flaggable* self) +{ #line 119 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail (IS_FLAGGABLE (self)); #line 119 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" FLAGGABLE_GET_INTERFACE (self)->mark_unflagged (self); -#line 882 "MediaInterfaces.c" +#line 972 "MediaInterfaces.c" } -void flaggable_mark_many_flagged_unflagged (GeeCollection* flag, GeeCollection* unflag, TransactionController* controller, GError** error) { - TransactionController* _tmp0_; - GeeCollection* _tmp1_; - GeeCollection* _tmp9_; - TransactionController* _tmp17_; +void +flaggable_mark_many_flagged_unflagged (GeeCollection* flag, + GeeCollection* unflag, + TransactionController* controller, + GError** error) +{ #line 121 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail ((flag == NULL) || GEE_IS_COLLECTION (flag)); #line 121 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" @@ -894,136 +985,120 @@ void flaggable_mark_many_flagged_unflagged (GeeCollection* flag, GeeCollection* #line 121 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail (IS_TRANSACTION_CONTROLLER (controller)); #line 123 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp0_ = controller; -#line 123 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - transaction_controller_begin (_tmp0_); + transaction_controller_begin (controller); #line 125 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp1_ = flag; -#line 125 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - if (_tmp1_ != NULL) { -#line 905 "MediaInterfaces.c" + if (flag != NULL) { +#line 992 "MediaInterfaces.c" { GeeIterator* _flaggable_it = NULL; - GeeCollection* _tmp2_; - GeeIterator* _tmp3_; -#line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp2_ = flag; + GeeIterator* _tmp0_; #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (flag, GEE_TYPE_ITERABLE, GeeIterable)); #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _flaggable_it = _tmp3_; + _flaggable_it = _tmp0_; #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" while (TRUE) { -#line 918 "MediaInterfaces.c" - GeeIterator* _tmp4_; - gboolean _tmp5_; +#line 1002 "MediaInterfaces.c" + GeeIterator* _tmp1_; Flaggable* flaggable = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - Flaggable* _tmp8_; + GeeIterator* _tmp2_; + gpointer _tmp3_; + Flaggable* _tmp4_; #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp4_ = _flaggable_it; + _tmp1_ = _flaggable_it; #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp1_)) { #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" break; -#line 933 "MediaInterfaces.c" +#line 1014 "MediaInterfaces.c" } #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp6_ = _flaggable_it; + _tmp2_ = _flaggable_it; #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - flaggable = (Flaggable*) _tmp7_; + flaggable = (Flaggable*) _tmp3_; #line 127 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp8_ = flaggable; + _tmp4_ = flaggable; #line 127 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - flaggable_mark_flagged (_tmp8_); + flaggable_mark_flagged (_tmp4_); #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _g_object_unref0 (flaggable); -#line 947 "MediaInterfaces.c" +#line 1028 "MediaInterfaces.c" } #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _g_object_unref0 (_flaggable_it); -#line 951 "MediaInterfaces.c" +#line 1032 "MediaInterfaces.c" } } #line 130 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp9_ = unflag; -#line 130 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - if (_tmp9_ != NULL) { -#line 958 "MediaInterfaces.c" + if (unflag != NULL) { +#line 1037 "MediaInterfaces.c" { GeeIterator* _flaggable_it = NULL; - GeeCollection* _tmp10_; - GeeIterator* _tmp11_; + GeeIterator* _tmp5_; #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp10_ = unflag; + _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (unflag, GEE_TYPE_ITERABLE, GeeIterable)); #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _flaggable_it = _tmp11_; + _flaggable_it = _tmp5_; #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" while (TRUE) { -#line 971 "MediaInterfaces.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 1047 "MediaInterfaces.c" + GeeIterator* _tmp6_; Flaggable* flaggable = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; - Flaggable* _tmp16_; -#line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp12_ = _flaggable_it; + GeeIterator* _tmp7_; + gpointer _tmp8_; + Flaggable* _tmp9_; #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp13_ = gee_iterator_next (_tmp12_); + _tmp6_ = _flaggable_it; #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp6_)) { #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" break; -#line 986 "MediaInterfaces.c" +#line 1059 "MediaInterfaces.c" } #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp14_ = _flaggable_it; + _tmp7_ = _flaggable_it; #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - flaggable = (Flaggable*) _tmp15_; + flaggable = (Flaggable*) _tmp8_; #line 132 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp16_ = flaggable; + _tmp9_ = flaggable; #line 132 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - flaggable_mark_unflagged (_tmp16_); + flaggable_mark_unflagged (_tmp9_); #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _g_object_unref0 (flaggable); -#line 1000 "MediaInterfaces.c" +#line 1073 "MediaInterfaces.c" } #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _g_object_unref0 (_flaggable_it); -#line 1004 "MediaInterfaces.c" +#line 1077 "MediaInterfaces.c" } } #line 135 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp17_ = controller; -#line 135 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - transaction_controller_commit (_tmp17_); -#line 1011 "MediaInterfaces.c" + transaction_controller_commit (controller); +#line 1082 "MediaInterfaces.c" } -static void flaggable_base_init (FlaggableIface * iface) { +static void +flaggable_base_init (FlaggableIface * iface) +{ #line 114 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" static gboolean initialized = FALSE; #line 114 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (!initialized) { #line 114 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" initialized = TRUE; -#line 1022 "MediaInterfaces.c" +#line 1095 "MediaInterfaces.c" } } -GType flaggable_get_type (void) { +GType +flaggable_get_type (void) +{ static volatile gsize flaggable_type_id__volatile = 0; if (g_once_init_enter (&flaggable_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (FlaggableIface), (GBaseInitFunc) flaggable_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -1036,38 +1111,45 @@ GType flaggable_get_type (void) { } -gboolean monitorable_is_offline (Monitorable* self) { +gboolean +monitorable_is_offline (Monitorable* self) +{ #line 153 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_val_if_fail (IS_MONITORABLE (self), FALSE); #line 153 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" return MONITORABLE_GET_INTERFACE (self)->is_offline (self); -#line 1045 "MediaInterfaces.c" +#line 1122 "MediaInterfaces.c" } -void monitorable_mark_online (Monitorable* self) { +void +monitorable_mark_online (Monitorable* self) +{ #line 155 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail (IS_MONITORABLE (self)); #line 155 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" MONITORABLE_GET_INTERFACE (self)->mark_online (self); -#line 1054 "MediaInterfaces.c" +#line 1133 "MediaInterfaces.c" } -void monitorable_mark_offline (Monitorable* self) { +void +monitorable_mark_offline (Monitorable* self) +{ #line 157 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail (IS_MONITORABLE (self)); #line 157 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" MONITORABLE_GET_INTERFACE (self)->mark_offline (self); -#line 1063 "MediaInterfaces.c" +#line 1144 "MediaInterfaces.c" } -void monitorable_mark_many_online_offline (GeeCollection* online, GeeCollection* offline, TransactionController* controller, GError** error) { - TransactionController* _tmp0_; - GeeCollection* _tmp1_; - GeeCollection* _tmp9_; - TransactionController* _tmp17_; +void +monitorable_mark_many_online_offline (GeeCollection* online, + GeeCollection* offline, + TransactionController* controller, + GError** error) +{ #line 159 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail ((online == NULL) || GEE_IS_COLLECTION (online)); #line 159 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" @@ -1075,296 +1157,270 @@ void monitorable_mark_many_online_offline (GeeCollection* online, GeeCollection* #line 159 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail (IS_TRANSACTION_CONTROLLER (controller)); #line 161 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp0_ = controller; -#line 161 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - transaction_controller_begin (_tmp0_); + transaction_controller_begin (controller); #line 163 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp1_ = online; -#line 163 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - if (_tmp1_ != NULL) { -#line 1086 "MediaInterfaces.c" + if (online != NULL) { +#line 1164 "MediaInterfaces.c" { GeeIterator* _monitorable_it = NULL; - GeeCollection* _tmp2_; - GeeIterator* _tmp3_; -#line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp2_ = online; + GeeIterator* _tmp0_; #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (online, GEE_TYPE_ITERABLE, GeeIterable)); #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _monitorable_it = _tmp3_; + _monitorable_it = _tmp0_; #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" while (TRUE) { -#line 1099 "MediaInterfaces.c" - GeeIterator* _tmp4_; - gboolean _tmp5_; +#line 1174 "MediaInterfaces.c" + GeeIterator* _tmp1_; Monitorable* monitorable = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - Monitorable* _tmp8_; + GeeIterator* _tmp2_; + gpointer _tmp3_; + Monitorable* _tmp4_; #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp4_ = _monitorable_it; + _tmp1_ = _monitorable_it; #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp1_)) { #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" break; -#line 1114 "MediaInterfaces.c" +#line 1186 "MediaInterfaces.c" } #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp6_ = _monitorable_it; + _tmp2_ = _monitorable_it; #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - monitorable = (Monitorable*) _tmp7_; + monitorable = (Monitorable*) _tmp3_; #line 165 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp8_ = monitorable; + _tmp4_ = monitorable; #line 165 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - monitorable_mark_online (_tmp8_); + monitorable_mark_online (_tmp4_); #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _g_object_unref0 (monitorable); -#line 1128 "MediaInterfaces.c" +#line 1200 "MediaInterfaces.c" } #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _g_object_unref0 (_monitorable_it); -#line 1132 "MediaInterfaces.c" +#line 1204 "MediaInterfaces.c" } } #line 168 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp9_ = offline; -#line 168 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - if (_tmp9_ != NULL) { -#line 1139 "MediaInterfaces.c" + if (offline != NULL) { +#line 1209 "MediaInterfaces.c" { GeeIterator* _monitorable_it = NULL; - GeeCollection* _tmp10_; - GeeIterator* _tmp11_; + GeeIterator* _tmp5_; #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp10_ = offline; + _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (offline, GEE_TYPE_ITERABLE, GeeIterable)); #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _monitorable_it = _tmp11_; + _monitorable_it = _tmp5_; #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" while (TRUE) { -#line 1152 "MediaInterfaces.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 1219 "MediaInterfaces.c" + GeeIterator* _tmp6_; Monitorable* monitorable = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; - Monitorable* _tmp16_; -#line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp12_ = _monitorable_it; + GeeIterator* _tmp7_; + gpointer _tmp8_; + Monitorable* _tmp9_; #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp13_ = gee_iterator_next (_tmp12_); + _tmp6_ = _monitorable_it; #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp6_)) { #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" break; -#line 1167 "MediaInterfaces.c" +#line 1231 "MediaInterfaces.c" } #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp14_ = _monitorable_it; + _tmp7_ = _monitorable_it; #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - monitorable = (Monitorable*) _tmp15_; + monitorable = (Monitorable*) _tmp8_; #line 170 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp16_ = monitorable; + _tmp9_ = monitorable; #line 170 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - monitorable_mark_offline (_tmp16_); + monitorable_mark_offline (_tmp9_); #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _g_object_unref0 (monitorable); -#line 1181 "MediaInterfaces.c" +#line 1245 "MediaInterfaces.c" } #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _g_object_unref0 (_monitorable_it); -#line 1185 "MediaInterfaces.c" +#line 1249 "MediaInterfaces.c" } } #line 173 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp17_ = controller; -#line 173 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - transaction_controller_commit (_tmp17_); -#line 1192 "MediaInterfaces.c" + transaction_controller_commit (controller); +#line 1254 "MediaInterfaces.c" } -void monitorable_set_master_file (Monitorable* self, GFile* file) { +void +monitorable_set_master_file (Monitorable* self, + GFile* file) +{ #line 176 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail (IS_MONITORABLE (self)); #line 176 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" MONITORABLE_GET_INTERFACE (self)->set_master_file (self, file); -#line 1201 "MediaInterfaces.c" +#line 1266 "MediaInterfaces.c" } -void monitorable_set_many_master_file (GeeMap* map, TransactionController* controller, GError** error) { - TransactionController* _tmp0_; +void +monitorable_set_many_master_file (GeeMap* map, + TransactionController* controller, + GError** error) +{ GeeMapIterator* map_iter = NULL; - GeeMap* _tmp1_; - GeeMapIterator* _tmp2_; - TransactionController* _tmp11_; + GeeMapIterator* _tmp0_; #line 178 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail (GEE_IS_MAP (map)); #line 178 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail (IS_TRANSACTION_CONTROLLER (controller)); #line 180 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp0_ = controller; -#line 180 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - transaction_controller_begin (_tmp0_); + transaction_controller_begin (controller); #line 182 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp1_ = map; + _tmp0_ = gee_map_map_iterator (map); #line 182 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp2_ = gee_map_map_iterator (_tmp1_); -#line 182 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - map_iter = _tmp2_; + map_iter = _tmp0_; #line 183 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" while (TRUE) { -#line 1227 "MediaInterfaces.c" - GeeMapIterator* _tmp3_; - gboolean _tmp4_; +#line 1289 "MediaInterfaces.c" + GeeMapIterator* _tmp1_; + GeeMapIterator* _tmp2_; + gpointer _tmp3_; + Monitorable* _tmp4_; GeeMapIterator* _tmp5_; gpointer _tmp6_; - Monitorable* _tmp7_; - GeeMapIterator* _tmp8_; - gpointer _tmp9_; - GFile* _tmp10_; -#line 183 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp3_ = map_iter; + GFile* _tmp7_; #line 183 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp4_ = gee_map_iterator_next (_tmp3_); + _tmp1_ = map_iter; #line 183 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - if (!_tmp4_) { + if (!gee_map_iterator_next (_tmp1_)) { #line 183 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" break; -#line 1244 "MediaInterfaces.c" +#line 1303 "MediaInterfaces.c" } #line 184 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp5_ = map_iter; -#line 184 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp6_ = gee_map_iterator_get_key (_tmp5_); + _tmp2_ = map_iter; #line 184 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp7_ = (Monitorable*) _tmp6_; + _tmp3_ = gee_map_iterator_get_key (_tmp2_); #line 184 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp8_ = map_iter; + _tmp4_ = (Monitorable*) _tmp3_; #line 184 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp9_ = gee_map_iterator_get_value (_tmp8_); + _tmp5_ = map_iter; #line 184 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp10_ = (GFile*) _tmp9_; + _tmp6_ = gee_map_iterator_get_value (_tmp5_); #line 184 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - monitorable_set_master_file (_tmp7_, _tmp10_); + _tmp7_ = (GFile*) _tmp6_; #line 184 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _g_object_unref0 (_tmp10_); + monitorable_set_master_file (_tmp4_, _tmp7_); #line 184 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _g_object_unref0 (_tmp7_); -#line 1264 "MediaInterfaces.c" +#line 184 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" + _g_object_unref0 (_tmp4_); +#line 1323 "MediaInterfaces.c" } #line 186 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp11_ = controller; -#line 186 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - transaction_controller_commit (_tmp11_); + transaction_controller_commit (controller); #line 178 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _g_object_unref0 (map_iter); -#line 1272 "MediaInterfaces.c" +#line 1329 "MediaInterfaces.c" } -void monitorable_set_master_timestamp (Monitorable* self, GFileInfo* info) { +void +monitorable_set_master_timestamp (Monitorable* self, + GFileInfo* info) +{ #line 189 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail (IS_MONITORABLE (self)); #line 189 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" MONITORABLE_GET_INTERFACE (self)->set_master_timestamp (self, info); -#line 1281 "MediaInterfaces.c" +#line 1341 "MediaInterfaces.c" } -void monitorable_set_many_master_timestamp (GeeMap* map, TransactionController* controller, GError** error) { - TransactionController* _tmp0_; +void +monitorable_set_many_master_timestamp (GeeMap* map, + TransactionController* controller, + GError** error) +{ GeeMapIterator* map_iter = NULL; - GeeMap* _tmp1_; - GeeMapIterator* _tmp2_; - TransactionController* _tmp11_; + GeeMapIterator* _tmp0_; #line 191 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail (GEE_IS_MAP (map)); #line 191 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail (IS_TRANSACTION_CONTROLLER (controller)); #line 193 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp0_ = controller; -#line 193 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - transaction_controller_begin (_tmp0_); -#line 195 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp1_ = map; + transaction_controller_begin (controller); #line 195 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp2_ = gee_map_map_iterator (_tmp1_); + _tmp0_ = gee_map_map_iterator (map); #line 195 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - map_iter = _tmp2_; + map_iter = _tmp0_; #line 196 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" while (TRUE) { -#line 1307 "MediaInterfaces.c" - GeeMapIterator* _tmp3_; - gboolean _tmp4_; +#line 1364 "MediaInterfaces.c" + GeeMapIterator* _tmp1_; + GeeMapIterator* _tmp2_; + gpointer _tmp3_; + Monitorable* _tmp4_; GeeMapIterator* _tmp5_; gpointer _tmp6_; - Monitorable* _tmp7_; - GeeMapIterator* _tmp8_; - gpointer _tmp9_; - GFileInfo* _tmp10_; + GFileInfo* _tmp7_; #line 196 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp3_ = map_iter; + _tmp1_ = map_iter; #line 196 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp4_ = gee_map_iterator_next (_tmp3_); -#line 196 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - if (!_tmp4_) { + if (!gee_map_iterator_next (_tmp1_)) { #line 196 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" break; -#line 1324 "MediaInterfaces.c" +#line 1378 "MediaInterfaces.c" } #line 197 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp5_ = map_iter; -#line 197 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp6_ = gee_map_iterator_get_key (_tmp5_); + _tmp2_ = map_iter; #line 197 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp7_ = (Monitorable*) _tmp6_; + _tmp3_ = gee_map_iterator_get_key (_tmp2_); #line 197 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp8_ = map_iter; + _tmp4_ = (Monitorable*) _tmp3_; #line 197 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp9_ = gee_map_iterator_get_value (_tmp8_); + _tmp5_ = map_iter; #line 197 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp10_ = (GFileInfo*) _tmp9_; + _tmp6_ = gee_map_iterator_get_value (_tmp5_); #line 197 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - monitorable_set_master_timestamp (_tmp7_, _tmp10_); + _tmp7_ = (GFileInfo*) _tmp6_; #line 197 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _g_object_unref0 (_tmp10_); + monitorable_set_master_timestamp (_tmp4_, _tmp7_); #line 197 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _g_object_unref0 (_tmp7_); -#line 1344 "MediaInterfaces.c" +#line 197 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" + _g_object_unref0 (_tmp4_); +#line 1398 "MediaInterfaces.c" } #line 199 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - _tmp11_ = controller; -#line 199 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" - transaction_controller_commit (_tmp11_); + transaction_controller_commit (controller); #line 191 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" _g_object_unref0 (map_iter); -#line 1352 "MediaInterfaces.c" +#line 1404 "MediaInterfaces.c" } -static void monitorable_base_init (MonitorableIface * iface) { +static void +monitorable_base_init (MonitorableIface * iface) +{ #line 152 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" static gboolean initialized = FALSE; #line 152 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (!initialized) { #line 152 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" initialized = TRUE; -#line 1363 "MediaInterfaces.c" +#line 1417 "MediaInterfaces.c" } } -GType monitorable_get_type (void) { +GType +monitorable_get_type (void) +{ static volatile gsize monitorable_type_id__volatile = 0; if (g_once_init_enter (&monitorable_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MonitorableIface), (GBaseInitFunc) monitorable_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -1377,37 +1433,46 @@ GType monitorable_get_type (void) { } -void dateable_set_exposure_time (Dateable* self, time_t target_time) { +void +dateable_set_exposure_time (Dateable* self, + time_t target_time) +{ #line 212 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_if_fail (IS_DATEABLE (self)); #line 212 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" DATEABLE_GET_INTERFACE (self)->set_exposure_time (self, target_time); -#line 1386 "MediaInterfaces.c" +#line 1445 "MediaInterfaces.c" } -time_t dateable_get_exposure_time (Dateable* self) { +time_t +dateable_get_exposure_time (Dateable* self) +{ #line 214 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" g_return_val_if_fail (IS_DATEABLE (self), 0); #line 214 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" return DATEABLE_GET_INTERFACE (self)->get_exposure_time (self); -#line 1395 "MediaInterfaces.c" +#line 1456 "MediaInterfaces.c" } -static void dateable_base_init (DateableIface * iface) { +static void +dateable_base_init (DateableIface * iface) +{ #line 211 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" static gboolean initialized = FALSE; #line 211 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" if (!initialized) { #line 211 "/home/jens/Source/shotwell/src/MediaInterfaces.vala" initialized = TRUE; -#line 1406 "MediaInterfaces.c" +#line 1469 "MediaInterfaces.c" } } -GType dateable_get_type (void) { +GType +dateable_get_type (void) +{ static volatile gsize dateable_type_id__volatile = 0; if (g_once_init_enter (&dateable_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DateableIface), (GBaseInitFunc) dateable_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; diff --git a/src/MediaMetadata.c b/src/MediaMetadata.c index 4bad2b6..0c11b06 100644 --- a/src/MediaMetadata.c +++ b/src/MediaMetadata.c @@ -1,4 +1,4 @@ -/* MediaMetadata.c generated by valac 0.36.6, the Vala compiler +/* MediaMetadata.c generated by valac 0.40.4, the Vala compiler * generated from MediaMetadata.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -100,24 +101,37 @@ static gpointer metadata_date_time_parent_class = NULL; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; gpointer metadata_date_time_ref (gpointer instance); void metadata_date_time_unref (gpointer instance); -GParamSpec* param_spec_metadata_date_time (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_metadata_date_time (GValue* value, gpointer v_object); -void value_take_metadata_date_time (GValue* value, gpointer v_object); +GParamSpec* param_spec_metadata_date_time (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_metadata_date_time (GValue* value, + gpointer v_object); +void value_take_metadata_date_time (GValue* value, + gpointer v_object); gpointer value_get_metadata_date_time (const GValue* value); GType metadata_date_time_get_type (void) G_GNUC_CONST; -enum { - MEDIA_METADATA_DUMMY_PROPERTY -}; MediaMetadata* media_metadata_construct (GType object_type); -void media_metadata_read_from_file (MediaMetadata* self, GFile* file, GError** error); -static void media_metadata_real_read_from_file (MediaMetadata* self, GFile* file, GError** error); +void media_metadata_read_from_file (MediaMetadata* self, + GFile* file, + GError** error); +static void media_metadata_real_read_from_file (MediaMetadata* self, + GFile* file, + GError** error); MetadataDateTime* media_metadata_get_creation_date_time (MediaMetadata* self); static MetadataDateTime* media_metadata_real_get_creation_date_time (MediaMetadata* self); gchar* media_metadata_get_title (MediaMetadata* self); @@ -128,24 +142,37 @@ static void media_metadata_finalize (MediaMetadata * obj); GType metadata_rational_get_type (void) G_GNUC_CONST; MetadataRational* metadata_rational_dup (const MetadataRational* self); void metadata_rational_free (MetadataRational* self); -void metadata_rational_init (MetadataRational *self, gint numerator, gint denominator); -static gboolean metadata_rational_is_component_valid (MetadataRational *self, gint component); +void metadata_rational_init (MetadataRational *self, + gint numerator, + gint denominator); +static gboolean metadata_rational_is_component_valid (MetadataRational *self, + gint component); gboolean metadata_rational_is_valid (MetadataRational *self); gchar* metadata_rational_to_string (MetadataRational *self); GQuark metadata_date_time_error_quark (void); #define METADATA_DATE_TIME_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_METADATA_DATE_TIME, MetadataDateTimePrivate)) -enum { - METADATA_DATE_TIME_DUMMY_PROPERTY -}; MetadataDateTime* metadata_date_time_new (time_t timestamp); -MetadataDateTime* metadata_date_time_construct (GType object_type, time_t timestamp); -MetadataDateTime* metadata_date_time_new_from_exif (const gchar* label, GError** error); -MetadataDateTime* metadata_date_time_construct_from_exif (GType object_type, const gchar* label, GError** error); -gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t* timestamp); -MetadataDateTime* metadata_date_time_new_from_iptc (const gchar* date, const gchar* time, GError** error); -MetadataDateTime* metadata_date_time_construct_from_iptc (GType object_type, const gchar* date, const gchar* time, GError** error); -MetadataDateTime* metadata_date_time_new_from_xmp (const gchar* label, GError** error); -MetadataDateTime* metadata_date_time_construct_from_xmp (GType object_type, const gchar* label, GError** error); +MetadataDateTime* metadata_date_time_construct (GType object_type, + time_t timestamp); +MetadataDateTime* metadata_date_time_new_from_exif (const gchar* label, + GError** error); +MetadataDateTime* metadata_date_time_construct_from_exif (GType object_type, + const gchar* label, + GError** error); +gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, + time_t* timestamp); +MetadataDateTime* metadata_date_time_new_from_iptc (const gchar* date, + const gchar* time, + GError** error); +MetadataDateTime* metadata_date_time_construct_from_iptc (GType object_type, + const gchar* date, + const gchar* time, + GError** error); +MetadataDateTime* metadata_date_time_new_from_xmp (const gchar* label, + GError** error); +MetadataDateTime* metadata_date_time_construct_from_xmp (GType object_type, + const gchar* label, + GError** error); time_t metadata_date_time_get_timestamp (MetadataDateTime* self); gchar* metadata_date_time_get_exif_label (MetadataDateTime* self); gchar* metadata_date_time_to_exif_date_time (time_t timestamp); @@ -154,186 +181,233 @@ gchar* metadata_date_time_to_string (MetadataDateTime* self); static void metadata_date_time_finalize (MetadataDateTime * obj); -MediaMetadata* media_metadata_construct (GType object_type) { +MediaMetadata* +media_metadata_construct (GType object_type) +{ MediaMetadata* self = NULL; #line 8 "/home/jens/Source/shotwell/src/MediaMetadata.vala" self = (MediaMetadata*) g_type_create_instance (object_type); #line 8 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return self; -#line 164 "MediaMetadata.c" +#line 193 "MediaMetadata.c" } -static void media_metadata_real_read_from_file (MediaMetadata* self, GFile* file, GError** error) { +static void +media_metadata_real_read_from_file (MediaMetadata* self, + GFile* file, + GError** error) +{ #line 11 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_critical ("Type `%s' does not implement abstract method `media_metadata_read_from_file'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 11 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return; -#line 173 "MediaMetadata.c" +#line 206 "MediaMetadata.c" } -void media_metadata_read_from_file (MediaMetadata* self, GFile* file, GError** error) { +void +media_metadata_read_from_file (MediaMetadata* self, + GFile* file, + GError** error) +{ #line 11 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_if_fail (IS_MEDIA_METADATA (self)); #line 11 "/home/jens/Source/shotwell/src/MediaMetadata.vala" MEDIA_METADATA_GET_CLASS (self)->read_from_file (self, file, error); -#line 182 "MediaMetadata.c" +#line 219 "MediaMetadata.c" } -static MetadataDateTime* media_metadata_real_get_creation_date_time (MediaMetadata* self) { +static MetadataDateTime* +media_metadata_real_get_creation_date_time (MediaMetadata* self) +{ #line 13 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_critical ("Type `%s' does not implement abstract method `media_metadata_get_creation_date_time'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 13 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return NULL; -#line 191 "MediaMetadata.c" +#line 230 "MediaMetadata.c" } -MetadataDateTime* media_metadata_get_creation_date_time (MediaMetadata* self) { +MetadataDateTime* +media_metadata_get_creation_date_time (MediaMetadata* self) +{ #line 13 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_val_if_fail (IS_MEDIA_METADATA (self), NULL); #line 13 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return MEDIA_METADATA_GET_CLASS (self)->get_creation_date_time (self); -#line 200 "MediaMetadata.c" +#line 241 "MediaMetadata.c" } -static gchar* media_metadata_real_get_title (MediaMetadata* self) { +static gchar* +media_metadata_real_get_title (MediaMetadata* self) +{ #line 15 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_critical ("Type `%s' does not implement abstract method `media_metadata_get_title'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 15 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return NULL; -#line 209 "MediaMetadata.c" +#line 252 "MediaMetadata.c" } -gchar* media_metadata_get_title (MediaMetadata* self) { +gchar* +media_metadata_get_title (MediaMetadata* self) +{ #line 15 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_val_if_fail (IS_MEDIA_METADATA (self), NULL); #line 15 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return MEDIA_METADATA_GET_CLASS (self)->get_title (self); -#line 218 "MediaMetadata.c" +#line 263 "MediaMetadata.c" } -static gchar* media_metadata_real_get_comment (MediaMetadata* self) { +static gchar* +media_metadata_real_get_comment (MediaMetadata* self) +{ #line 17 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_critical ("Type `%s' does not implement abstract method `media_metadata_get_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 17 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return NULL; -#line 227 "MediaMetadata.c" +#line 274 "MediaMetadata.c" } -gchar* media_metadata_get_comment (MediaMetadata* self) { +gchar* +media_metadata_get_comment (MediaMetadata* self) +{ #line 17 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_val_if_fail (IS_MEDIA_METADATA (self), NULL); #line 17 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return MEDIA_METADATA_GET_CLASS (self)->get_comment (self); -#line 236 "MediaMetadata.c" +#line 285 "MediaMetadata.c" } -static void value_media_metadata_init (GValue* value) { +static void +value_media_metadata_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" value->data[0].v_pointer = NULL; -#line 243 "MediaMetadata.c" +#line 294 "MediaMetadata.c" } -static void value_media_metadata_free_value (GValue* value) { +static void +value_media_metadata_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" media_metadata_unref (value->data[0].v_pointer); -#line 252 "MediaMetadata.c" +#line 305 "MediaMetadata.c" } } -static void value_media_metadata_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_media_metadata_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" dest_value->data[0].v_pointer = media_metadata_ref (src_value->data[0].v_pointer); -#line 262 "MediaMetadata.c" +#line 318 "MediaMetadata.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 266 "MediaMetadata.c" +#line 322 "MediaMetadata.c" } } -static gpointer value_media_metadata_peek_pointer (const GValue* value) { +static gpointer +value_media_metadata_peek_pointer (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return value->data[0].v_pointer; -#line 274 "MediaMetadata.c" +#line 332 "MediaMetadata.c" } -static gchar* value_media_metadata_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_media_metadata_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (collect_values[0].v_pointer) { -#line 281 "MediaMetadata.c" +#line 344 "MediaMetadata.c" MediaMetadata * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 288 "MediaMetadata.c" +#line 351 "MediaMetadata.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.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 292 "MediaMetadata.c" +#line 355 "MediaMetadata.c" } #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" value->data[0].v_pointer = media_metadata_ref (object); -#line 296 "MediaMetadata.c" +#line 359 "MediaMetadata.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" value->data[0].v_pointer = NULL; -#line 300 "MediaMetadata.c" +#line 363 "MediaMetadata.c" } #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return NULL; -#line 304 "MediaMetadata.c" +#line 367 "MediaMetadata.c" } -static gchar* value_media_metadata_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_media_metadata_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ MediaMetadata ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 315 "MediaMetadata.c" +#line 383 "MediaMetadata.c" } #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" *object_p = NULL; -#line 321 "MediaMetadata.c" +#line 389 "MediaMetadata.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" *object_p = value->data[0].v_pointer; -#line 325 "MediaMetadata.c" +#line 393 "MediaMetadata.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" *object_p = media_metadata_ref (value->data[0].v_pointer); -#line 329 "MediaMetadata.c" +#line 397 "MediaMetadata.c" } #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return NULL; -#line 333 "MediaMetadata.c" +#line 401 "MediaMetadata.c" } -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecMediaMetadata* spec; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_MEDIA_METADATA), NULL); @@ -343,20 +417,25 @@ GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, con G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return G_PARAM_SPEC (spec); -#line 347 "MediaMetadata.c" +#line 421 "MediaMetadata.c" } -gpointer value_get_media_metadata (const GValue* value) { +gpointer +value_get_media_metadata (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_METADATA), NULL); #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return value->data[0].v_pointer; -#line 356 "MediaMetadata.c" +#line 432 "MediaMetadata.c" } -void value_set_media_metadata (GValue* value, gpointer v_object) { +void +value_set_media_metadata (GValue* value, + gpointer v_object) +{ MediaMetadata * old; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_METADATA)); @@ -372,22 +451,25 @@ void value_set_media_metadata (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" media_metadata_ref (value->data[0].v_pointer); -#line 376 "MediaMetadata.c" +#line 455 "MediaMetadata.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" value->data[0].v_pointer = NULL; -#line 380 "MediaMetadata.c" +#line 459 "MediaMetadata.c" } #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" media_metadata_unref (old); -#line 386 "MediaMetadata.c" +#line 465 "MediaMetadata.c" } } -void value_take_media_metadata (GValue* value, gpointer v_object) { +void +value_take_media_metadata (GValue* value, + gpointer v_object) +{ MediaMetadata * old; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_METADATA)); @@ -401,22 +483,24 @@ void value_take_media_metadata (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" value->data[0].v_pointer = v_object; -#line 405 "MediaMetadata.c" +#line 487 "MediaMetadata.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" value->data[0].v_pointer = NULL; -#line 409 "MediaMetadata.c" +#line 491 "MediaMetadata.c" } #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" media_metadata_unref (old); -#line 415 "MediaMetadata.c" +#line 497 "MediaMetadata.c" } } -static void media_metadata_class_init (MediaMetadataClass * klass) { +static void +media_metadata_class_init (MediaMetadataClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" media_metadata_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -429,28 +513,34 @@ static void media_metadata_class_init (MediaMetadataClass * klass) { ((MediaMetadataClass *) klass)->get_title = (gchar* (*) (MediaMetadata *)) media_metadata_real_get_title; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" ((MediaMetadataClass *) klass)->get_comment = (gchar* (*) (MediaMetadata *)) media_metadata_real_get_comment; -#line 433 "MediaMetadata.c" +#line 517 "MediaMetadata.c" } -static void media_metadata_instance_init (MediaMetadata * self) { +static void +media_metadata_instance_init (MediaMetadata * self) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" self->ref_count = 1; -#line 440 "MediaMetadata.c" +#line 526 "MediaMetadata.c" } -static void media_metadata_finalize (MediaMetadata * obj) { +static void +media_metadata_finalize (MediaMetadata * obj) +{ MediaMetadata * self; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_METADATA, MediaMetadata); #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_signal_handlers_destroy (self); -#line 450 "MediaMetadata.c" +#line 538 "MediaMetadata.c" } -GType media_metadata_get_type (void) { +GType +media_metadata_get_type (void) +{ static volatile gsize media_metadata_type_id__volatile = 0; if (g_once_init_enter (&media_metadata_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_media_metadata_init, value_media_metadata_free_value, value_media_metadata_copy_value, value_media_metadata_peek_pointer, "p", value_media_metadata_collect_value, "p", value_media_metadata_lcopy_value }; @@ -464,18 +554,22 @@ GType media_metadata_get_type (void) { } -gpointer media_metadata_ref (gpointer instance) { +gpointer +media_metadata_ref (gpointer instance) +{ MediaMetadata * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return instance; -#line 475 "MediaMetadata.c" +#line 567 "MediaMetadata.c" } -void media_metadata_unref (gpointer instance) { +void +media_metadata_unref (gpointer instance) +{ MediaMetadata * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -484,132 +578,123 @@ void media_metadata_unref (gpointer instance) { MEDIA_METADATA_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_type_free_instance ((GTypeInstance *) self); -#line 488 "MediaMetadata.c" +#line 582 "MediaMetadata.c" } } -void metadata_rational_init (MetadataRational *self, gint numerator, gint denominator) { - gint _tmp0_; - gint _tmp1_; +void +metadata_rational_init (MetadataRational *self, + gint numerator, + gint denominator) +{ #line 24 "/home/jens/Source/shotwell/src/MediaMetadata.vala" memset (self, 0, sizeof (MetadataRational)); #line 25 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp0_ = numerator; -#line 25 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - (*self).numerator = _tmp0_; + (*self).numerator = numerator; #line 26 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp1_ = denominator; -#line 26 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - (*self).denominator = _tmp1_; -#line 506 "MediaMetadata.c" + (*self).denominator = denominator; +#line 598 "MediaMetadata.c" } -static gboolean metadata_rational_is_component_valid (MetadataRational *self, gint component) { +static gboolean +metadata_rational_is_component_valid (MetadataRational *self, + gint component) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; - gint _tmp1_; -#line 30 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp1_ = component; #line 30 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - if (_tmp1_ >= 0) { -#line 518 "MediaMetadata.c" - gint _tmp2_; -#line 30 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp2_ = component; + if (component >= 0) { #line 30 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp0_ = _tmp2_ <= 1000000; -#line 524 "MediaMetadata.c" + _tmp0_ = component <= 1000000; +#line 612 "MediaMetadata.c" } else { #line 30 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _tmp0_ = FALSE; -#line 528 "MediaMetadata.c" +#line 616 "MediaMetadata.c" } #line 30 "/home/jens/Source/shotwell/src/MediaMetadata.vala" result = _tmp0_; #line 30 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return result; -#line 534 "MediaMetadata.c" +#line 622 "MediaMetadata.c" } -gboolean metadata_rational_is_valid (MetadataRational *self) { +gboolean +metadata_rational_is_valid (MetadataRational *self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gint _tmp1_; - gboolean _tmp2_; #line 34 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _tmp1_ = (*self).numerator; #line 34 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp2_ = metadata_rational_is_component_valid (&(*self), _tmp1_); -#line 34 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - if (_tmp2_) { -#line 549 "MediaMetadata.c" - gint _tmp3_; - gboolean _tmp4_; -#line 34 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp3_ = (*self).denominator; + if (metadata_rational_is_component_valid (&(*self), _tmp1_)) { +#line 636 "MediaMetadata.c" + gint _tmp2_; #line 34 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp4_ = metadata_rational_is_component_valid (&(*self), _tmp3_); + _tmp2_ = (*self).denominator; #line 34 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp0_ = _tmp4_; -#line 558 "MediaMetadata.c" + _tmp0_ = metadata_rational_is_component_valid (&(*self), _tmp2_); +#line 642 "MediaMetadata.c" } else { #line 34 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _tmp0_ = FALSE; -#line 562 "MediaMetadata.c" +#line 646 "MediaMetadata.c" } #line 34 "/home/jens/Source/shotwell/src/MediaMetadata.vala" result = _tmp0_; #line 34 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return result; -#line 568 "MediaMetadata.c" +#line 652 "MediaMetadata.c" } -gchar* metadata_rational_to_string (MetadataRational *self) { +gchar* +metadata_rational_to_string (MetadataRational *self) +{ gchar* result = NULL; gchar* _tmp0_ = NULL; - gboolean _tmp1_; -#line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp1_ = metadata_rational_is_valid (&(*self)); #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - if (_tmp1_) { -#line 580 "MediaMetadata.c" + if (metadata_rational_is_valid (&(*self))) { +#line 663 "MediaMetadata.c" + gint _tmp1_; gint _tmp2_; - gint _tmp3_; - gchar* _tmp4_; + gchar* _tmp3_; #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp2_ = (*self).numerator; + _tmp1_ = (*self).numerator; #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp3_ = (*self).denominator; + _tmp2_ = (*self).denominator; #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp4_ = g_strdup_printf ("%d/%d", _tmp2_, _tmp3_); + _tmp3_ = g_strdup_printf ("%d/%d", _tmp1_, _tmp2_); #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _g_free0 (_tmp0_); #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp0_ = _tmp4_; -#line 594 "MediaMetadata.c" + _tmp0_ = _tmp3_; +#line 677 "MediaMetadata.c" } else { - gchar* _tmp5_; + gchar* _tmp4_; #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp5_ = g_strdup (""); + _tmp4_ = g_strdup (""); #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _g_free0 (_tmp0_); #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp0_ = _tmp5_; -#line 603 "MediaMetadata.c" + _tmp0_ = _tmp4_; +#line 686 "MediaMetadata.c" } #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala" result = _tmp0_; #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return result; -#line 609 "MediaMetadata.c" +#line 692 "MediaMetadata.c" } -MetadataRational* metadata_rational_dup (const MetadataRational* self) { +MetadataRational* +metadata_rational_dup (const MetadataRational* self) +{ MetadataRational* dup; #line 20 "/home/jens/Source/shotwell/src/MediaMetadata.vala" dup = g_new0 (MetadataRational, 1); @@ -617,18 +702,22 @@ MetadataRational* metadata_rational_dup (const MetadataRational* self) { memcpy (dup, self, sizeof (MetadataRational)); #line 20 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return dup; -#line 621 "MediaMetadata.c" +#line 706 "MediaMetadata.c" } -void metadata_rational_free (MetadataRational* self) { +void +metadata_rational_free (MetadataRational* self) +{ #line 20 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_free (self); -#line 628 "MediaMetadata.c" +#line 715 "MediaMetadata.c" } -GType metadata_rational_get_type (void) { +GType +metadata_rational_get_type (void) +{ static volatile gsize metadata_rational_type_id__volatile = 0; if (g_once_init_enter (&metadata_rational_type_id__volatile)) { GType metadata_rational_type_id; @@ -639,60 +728,62 @@ GType metadata_rational_get_type (void) { } -GQuark metadata_date_time_error_quark (void) { +GQuark +metadata_date_time_error_quark (void) +{ return g_quark_from_static_string ("metadata_date_time_error-quark"); } -MetadataDateTime* metadata_date_time_construct (GType object_type, time_t timestamp) { +MetadataDateTime* +metadata_date_time_construct (GType object_type, + time_t timestamp) +{ MetadataDateTime* self = NULL; - time_t _tmp0_; #line 51 "/home/jens/Source/shotwell/src/MediaMetadata.vala" self = (MetadataDateTime*) g_type_create_instance (object_type); #line 52 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp0_ = timestamp; -#line 52 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - self->priv->timestamp = _tmp0_; + self->priv->timestamp = timestamp; #line 51 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return self; -#line 659 "MediaMetadata.c" +#line 750 "MediaMetadata.c" } -MetadataDateTime* metadata_date_time_new (time_t timestamp) { +MetadataDateTime* +metadata_date_time_new (time_t timestamp) +{ #line 51 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return metadata_date_time_construct (TYPE_METADATA_DATE_TIME, timestamp); -#line 666 "MediaMetadata.c" +#line 759 "MediaMetadata.c" } -MetadataDateTime* metadata_date_time_construct_from_exif (GType object_type, const gchar* label, GError** error) { +MetadataDateTime* +metadata_date_time_construct_from_exif (GType object_type, + const gchar* label, + GError** error) +{ MetadataDateTime* self = NULL; - const gchar* _tmp0_; - time_t _tmp1_ = 0; - gboolean _tmp2_; + time_t _tmp0_ = 0; + gboolean _tmp1_; GError * _inner_error_ = NULL; #line 55 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_val_if_fail (label != NULL, NULL); #line 55 "/home/jens/Source/shotwell/src/MediaMetadata.vala" self = (MetadataDateTime*) g_type_create_instance (object_type); #line 56 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp0_ = label; + _tmp1_ = metadata_date_time_from_exif_date_time (label, &_tmp0_); #line 56 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp2_ = metadata_date_time_from_exif_date_time (_tmp0_, &_tmp1_); -#line 56 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - self->priv->timestamp = _tmp1_; + self->priv->timestamp = _tmp0_; #line 56 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - if (!_tmp2_) { -#line 688 "MediaMetadata.c" - const gchar* _tmp3_; - GError* _tmp4_; -#line 57 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp3_ = label; + if (!_tmp1_) { +#line 782 "MediaMetadata.c" + GError* _tmp2_; #line 57 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp4_ = g_error_new (METADATA_DATE_TIME_ERROR, METADATA_DATE_TIME_ERROR_INVALID_FORMAT, "%s is not EXIF format date/time", _tmp3_); + _tmp2_ = g_error_new (METADATA_DATE_TIME_ERROR, METADATA_DATE_TIME_ERROR_INVALID_FORMAT, "%s is not EXIF format date/time", label); #line 57 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _inner_error_ = _tmp4_; + _inner_error_ = _tmp2_; #line 57 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (_inner_error_->domain == METADATA_DATE_TIME_ERROR) { #line 57 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -701,7 +792,7 @@ MetadataDateTime* metadata_date_time_construct_from_exif (GType object_type, con _metadata_date_time_unref0 (self); #line 57 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return NULL; -#line 705 "MediaMetadata.c" +#line 796 "MediaMetadata.c" } else { #line 57 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -709,23 +800,31 @@ MetadataDateTime* metadata_date_time_construct_from_exif (GType object_type, con g_clear_error (&_inner_error_); #line 57 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return NULL; -#line 713 "MediaMetadata.c" +#line 804 "MediaMetadata.c" } } #line 55 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return self; -#line 718 "MediaMetadata.c" +#line 809 "MediaMetadata.c" } -MetadataDateTime* metadata_date_time_new_from_exif (const gchar* label, GError** error) { +MetadataDateTime* +metadata_date_time_new_from_exif (const gchar* label, + GError** error) +{ #line 55 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return metadata_date_time_construct_from_exif (TYPE_METADATA_DATE_TIME, label, error); -#line 725 "MediaMetadata.c" +#line 819 "MediaMetadata.c" } -MetadataDateTime* metadata_date_time_construct_from_iptc (GType object_type, const gchar* date, const gchar* time, GError** error) { +MetadataDateTime* +metadata_date_time_construct_from_iptc (GType object_type, + const gchar* date, + const gchar* time, + GError** error) +{ MetadataDateTime* self = NULL; GError* _tmp0_; GError * _inner_error_ = NULL; @@ -747,7 +846,7 @@ MetadataDateTime* metadata_date_time_construct_from_iptc (GType object_type, con _metadata_date_time_unref0 (self); #line 62 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return NULL; -#line 751 "MediaMetadata.c" +#line 850 "MediaMetadata.c" } else { #line 62 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -755,28 +854,34 @@ MetadataDateTime* metadata_date_time_construct_from_iptc (GType object_type, con g_clear_error (&_inner_error_); #line 62 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return NULL; -#line 759 "MediaMetadata.c" +#line 858 "MediaMetadata.c" } #line 60 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return self; -#line 763 "MediaMetadata.c" +#line 862 "MediaMetadata.c" } -MetadataDateTime* metadata_date_time_new_from_iptc (const gchar* date, const gchar* time, GError** error) { +MetadataDateTime* +metadata_date_time_new_from_iptc (const gchar* date, + const gchar* time, + GError** error) +{ #line 60 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return metadata_date_time_construct_from_iptc (TYPE_METADATA_DATE_TIME, date, time, error); -#line 770 "MediaMetadata.c" +#line 873 "MediaMetadata.c" } -MetadataDateTime* metadata_date_time_construct_from_xmp (GType object_type, const gchar* label, GError** error) { +MetadataDateTime* +metadata_date_time_construct_from_xmp (GType object_type, + const gchar* label, + GError** error) +{ MetadataDateTime* self = NULL; GTimeVal time_val = {0}; - const gchar* _tmp0_; - gboolean _tmp1_; - GTimeVal _tmp4_; - glong _tmp5_; + GTimeVal _tmp1_; + glong _tmp2_; GError * _inner_error_ = NULL; #line 65 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_val_if_fail (label != NULL, NULL); @@ -785,20 +890,13 @@ MetadataDateTime* metadata_date_time_construct_from_xmp (GType object_type, cons #line 66 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_get_current_time (&time_val); #line 67 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp0_ = label; -#line 67 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp1_ = g_time_val_from_iso8601 (_tmp0_, &time_val); -#line 67 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - if (!_tmp1_) { -#line 794 "MediaMetadata.c" - const gchar* _tmp2_; - GError* _tmp3_; -#line 68 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp2_ = label; + if (!g_time_val_from_iso8601 (label, &time_val)) { +#line 895 "MediaMetadata.c" + GError* _tmp0_; #line 68 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp3_ = g_error_new (METADATA_DATE_TIME_ERROR, METADATA_DATE_TIME_ERROR_INVALID_FORMAT, "%s is not XMP format date/time", _tmp2_); + _tmp0_ = g_error_new (METADATA_DATE_TIME_ERROR, METADATA_DATE_TIME_ERROR_INVALID_FORMAT, "%s is not XMP format date/time", label); #line 68 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _inner_error_ = _tmp3_; + _inner_error_ = _tmp0_; #line 68 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (_inner_error_->domain == METADATA_DATE_TIME_ERROR) { #line 68 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -807,7 +905,7 @@ MetadataDateTime* metadata_date_time_construct_from_xmp (GType object_type, cons _metadata_date_time_unref0 (self); #line 68 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return NULL; -#line 811 "MediaMetadata.c" +#line 909 "MediaMetadata.c" } else { #line 68 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -815,29 +913,34 @@ MetadataDateTime* metadata_date_time_construct_from_xmp (GType object_type, cons g_clear_error (&_inner_error_); #line 68 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return NULL; -#line 819 "MediaMetadata.c" +#line 917 "MediaMetadata.c" } } #line 70 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp4_ = time_val; + _tmp1_ = time_val; #line 70 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp5_ = _tmp4_.tv_sec; + _tmp2_ = _tmp1_.tv_sec; #line 70 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - self->priv->timestamp = (time_t) _tmp5_; + self->priv->timestamp = (time_t) _tmp2_; #line 65 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return self; -#line 830 "MediaMetadata.c" +#line 928 "MediaMetadata.c" } -MetadataDateTime* metadata_date_time_new_from_xmp (const gchar* label, GError** error) { +MetadataDateTime* +metadata_date_time_new_from_xmp (const gchar* label, + GError** error) +{ #line 65 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return metadata_date_time_construct_from_xmp (TYPE_METADATA_DATE_TIME, label, error); -#line 837 "MediaMetadata.c" +#line 938 "MediaMetadata.c" } -time_t metadata_date_time_get_timestamp (MetadataDateTime* self) { +time_t +metadata_date_time_get_timestamp (MetadataDateTime* self) +{ time_t result = 0; time_t _tmp0_; #line 73 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -848,11 +951,13 @@ time_t metadata_date_time_get_timestamp (MetadataDateTime* self) { result = _tmp0_; #line 74 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return result; -#line 852 "MediaMetadata.c" +#line 955 "MediaMetadata.c" } -gchar* metadata_date_time_get_exif_label (MetadataDateTime* self) { +gchar* +metadata_date_time_get_exif_label (MetadataDateTime* self) +{ gchar* result = NULL; time_t _tmp0_; gchar* _tmp1_; @@ -866,11 +971,13 @@ gchar* metadata_date_time_get_exif_label (MetadataDateTime* self) { result = _tmp1_; #line 78 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return result; -#line 870 "MediaMetadata.c" +#line 975 "MediaMetadata.c" } -gchar* metadata_date_time_get_xmp_label (MetadataDateTime* self) { +gchar* +metadata_date_time_get_xmp_label (MetadataDateTime* self) +{ gchar* result = NULL; GTimeVal time_val = {0}; time_t _tmp0_; @@ -891,26 +998,26 @@ gchar* metadata_date_time_get_xmp_label (MetadataDateTime* self) { result = _tmp1_; #line 88 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return result; -#line 895 "MediaMetadata.c" +#line 1002 "MediaMetadata.c" } -gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t* timestamp) { +gboolean +metadata_date_time_from_exif_date_time (const gchar* date_time, + time_t* timestamp) +{ time_t _vala_timestamp = 0; gboolean result = FALSE; struct tm tm = {0}; - const gchar* _tmp0_; - gint _tmp1_; + gboolean _tmp3_ = FALSE; + gboolean _tmp4_ = FALSE; + gboolean _tmp5_ = FALSE; + gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; - gboolean _tmp8_ = FALSE; - gboolean _tmp9_ = FALSE; - gboolean _tmp10_ = FALSE; - gboolean _tmp11_ = FALSE; - struct tm _tmp12_; - gint _tmp13_; - gint _tmp24_; - gint _tmp25_; - time_t _tmp26_; + struct tm _tmp8_; + gint _tmp9_; + gint _tmp20_; + gint _tmp21_; #line 91 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_val_if_fail (date_time != NULL, FALSE); #line 92 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -918,34 +1025,24 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t* #line 94 "/home/jens/Source/shotwell/src/MediaMetadata.vala" memset (&tm, 0, sizeof (struct tm)); #line 97 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp0_ = date_time; -#line 97 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp1_ = sscanf (_tmp0_, "%d:%d:%d %d:%d:%d", &tm.tm_year, &tm.tm_mon, &tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec); -#line 97 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - if (_tmp1_ != 6) { -#line 927 "MediaMetadata.c" + if (sscanf (date_time, "%d:%d:%d %d:%d:%d", &tm.tm_year, &tm.tm_mon, &tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) { +#line 1030 "MediaMetadata.c" gchar* tmp = NULL; + gchar* _tmp0_; + const gchar* _tmp1_; const gchar* _tmp2_; - gchar* _tmp3_; - const gchar* _tmp4_; - const gchar* _tmp5_; - gint _tmp6_; #line 100 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp2_ = date_time; + _tmp0_ = g_strdup (date_time); #line 100 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp3_ = g_strdup (_tmp2_); -#line 100 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - tmp = _tmp3_; + tmp = _tmp0_; #line 101 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp4_ = tmp; + _tmp1_ = tmp; #line 101 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - g_strcanon (_tmp4_, "0123456789", ' '); -#line 102 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp5_ = tmp; + g_strcanon (_tmp1_, "0123456789", ' '); #line 102 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp6_ = sscanf (_tmp5_, "%4d%2d%2d%2d%2d%2d", &tm.tm_year, &tm.tm_mon, &tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec); + _tmp2_ = tmp; #line 102 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - if (_tmp6_ != 6) { + if (sscanf (_tmp2_, "%4d%2d%2d%2d%2d%2d", &tm.tm_year, &tm.tm_mon, &tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) { #line 104 "/home/jens/Source/shotwell/src/MediaMetadata.vala" result = FALSE; #line 104 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -954,158 +1051,162 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t* if (timestamp) { #line 104 "/home/jens/Source/shotwell/src/MediaMetadata.vala" *timestamp = _vala_timestamp; -#line 958 "MediaMetadata.c" +#line 1055 "MediaMetadata.c" } #line 104 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return result; -#line 962 "MediaMetadata.c" +#line 1059 "MediaMetadata.c" } #line 97 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _g_free0 (tmp); -#line 966 "MediaMetadata.c" +#line 1063 "MediaMetadata.c" } #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp12_ = tm; + _tmp8_ = tm; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp13_ = _tmp12_.tm_year; + _tmp9_ = _tmp8_.tm_year; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - if (_tmp13_ <= 1900) { + if (_tmp9_ <= 1900) { #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp11_ = TRUE; -#line 976 "MediaMetadata.c" + _tmp7_ = TRUE; +#line 1073 "MediaMetadata.c" } else { - struct tm _tmp14_; - gint _tmp15_; + struct tm _tmp10_; + gint _tmp11_; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp14_ = tm; + _tmp10_ = tm; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp15_ = _tmp14_.tm_mon; + _tmp11_ = _tmp10_.tm_mon; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp11_ = _tmp15_ <= 0; -#line 986 "MediaMetadata.c" + _tmp7_ = _tmp11_ <= 0; +#line 1083 "MediaMetadata.c" } #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - if (_tmp11_) { + if (_tmp7_) { #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp10_ = TRUE; -#line 992 "MediaMetadata.c" + _tmp6_ = TRUE; +#line 1089 "MediaMetadata.c" } else { - struct tm _tmp16_; - gint _tmp17_; + struct tm _tmp12_; + gint _tmp13_; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp16_ = tm; + _tmp12_ = tm; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp17_ = _tmp16_.tm_mday; + _tmp13_ = _tmp12_.tm_mday; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp10_ = _tmp17_ < 0; -#line 1002 "MediaMetadata.c" + _tmp6_ = _tmp13_ < 0; +#line 1099 "MediaMetadata.c" } #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - if (_tmp10_) { + if (_tmp6_) { #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp9_ = TRUE; -#line 1008 "MediaMetadata.c" + _tmp5_ = TRUE; +#line 1105 "MediaMetadata.c" } else { - struct tm _tmp18_; - gint _tmp19_; + struct tm _tmp14_; + gint _tmp15_; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp18_ = tm; + _tmp14_ = tm; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp19_ = _tmp18_.tm_hour; + _tmp15_ = _tmp14_.tm_hour; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp9_ = _tmp19_ < 0; -#line 1018 "MediaMetadata.c" + _tmp5_ = _tmp15_ < 0; +#line 1115 "MediaMetadata.c" } #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - if (_tmp9_) { + if (_tmp5_) { #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp8_ = TRUE; -#line 1024 "MediaMetadata.c" + _tmp4_ = TRUE; +#line 1121 "MediaMetadata.c" } else { - struct tm _tmp20_; - gint _tmp21_; + struct tm _tmp16_; + gint _tmp17_; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp20_ = tm; + _tmp16_ = tm; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp21_ = _tmp20_.tm_min; + _tmp17_ = _tmp16_.tm_min; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp8_ = _tmp21_ < 0; -#line 1034 "MediaMetadata.c" + _tmp4_ = _tmp17_ < 0; +#line 1131 "MediaMetadata.c" } #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - if (_tmp8_) { + if (_tmp4_) { #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp7_ = TRUE; -#line 1040 "MediaMetadata.c" + _tmp3_ = TRUE; +#line 1137 "MediaMetadata.c" } else { - struct tm _tmp22_; - gint _tmp23_; + struct tm _tmp18_; + gint _tmp19_; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp22_ = tm; + _tmp18_ = tm; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp23_ = _tmp22_.tm_sec; + _tmp19_ = _tmp18_.tm_sec; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp7_ = _tmp23_ < 0; -#line 1050 "MediaMetadata.c" + _tmp3_ = _tmp19_ < 0; +#line 1147 "MediaMetadata.c" } #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - if (_tmp7_) { + if (_tmp3_) { #line 109 "/home/jens/Source/shotwell/src/MediaMetadata.vala" result = FALSE; #line 109 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (timestamp) { #line 109 "/home/jens/Source/shotwell/src/MediaMetadata.vala" *timestamp = _vala_timestamp; -#line 1060 "MediaMetadata.c" +#line 1157 "MediaMetadata.c" } #line 109 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return result; -#line 1064 "MediaMetadata.c" +#line 1161 "MediaMetadata.c" } #line 111 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp24_ = tm.tm_year; + _tmp20_ = tm.tm_year; #line 111 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - tm.tm_year = _tmp24_ - 1900; + tm.tm_year = _tmp20_ - 1900; #line 112 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp25_ = tm.tm_mon; + _tmp21_ = tm.tm_mon; #line 112 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - tm.tm_mon = _tmp25_ - 1; + tm.tm_mon = _tmp21_ - 1; #line 113 "/home/jens/Source/shotwell/src/MediaMetadata.vala" tm.tm_isdst = -1; #line 115 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp26_ = mktime (&tm); -#line 115 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _vala_timestamp = _tmp26_; + _vala_timestamp = mktime (&tm); #line 117 "/home/jens/Source/shotwell/src/MediaMetadata.vala" result = TRUE; #line 117 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (timestamp) { #line 117 "/home/jens/Source/shotwell/src/MediaMetadata.vala" *timestamp = _vala_timestamp; -#line 1086 "MediaMetadata.c" +#line 1181 "MediaMetadata.c" } #line 117 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return result; -#line 1090 "MediaMetadata.c" +#line 1185 "MediaMetadata.c" } -static void g_time_local (time_t time, struct tm* result) { +static void +g_time_local (time_t time, + struct tm* result) +{ struct tm _result_ = {0}; struct tm _tmp0_ = {0}; -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" localtime_r (&time, &_tmp0_); -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" *result = _result_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return; -#line 1105 "MediaMetadata.c" +#line 1203 "MediaMetadata.c" } -static gchar* g_time_format (struct tm *self, const gchar* format) { +static gchar* +g_time_format (struct tm *self, + const gchar* format) +{ gchar* result = NULL; gchar* buffer = NULL; gchar* _tmp0_; @@ -1113,64 +1214,62 @@ static gchar* g_time_format (struct tm *self, const gchar* format) { gint _buffer_size_; gchar* _tmp1_; gint _tmp1__length1; - const gchar* _tmp2_; + gchar* _tmp2_; + gint _tmp2__length1; gchar* _tmp3_; - gint _tmp3__length1; - gchar* _tmp4_; -#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2874 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (format != NULL, NULL); -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_new0 (gchar, 64); -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer = _tmp0_; -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer_length1 = 64; -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _buffer_size_ = buffer_length1; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = buffer; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1__length1 = buffer_length1; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = format; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self)); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = buffer; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3__length1 = buffer_length1; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = g_strdup ((const gchar*) _tmp3_); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + strftime (_tmp1_, _tmp1__length1, format, &(*self)); +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = buffer; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2__length1 = buffer_length1; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_strdup ((const gchar*) _tmp2_); +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp3_; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer = (g_free (buffer), NULL); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1151 "MediaMetadata.c" +#line 1249 "MediaMetadata.c" } -gchar* metadata_date_time_to_exif_date_time (time_t timestamp) { +gchar* +metadata_date_time_to_exif_date_time (time_t timestamp) +{ gchar* result = NULL; - time_t _tmp0_; - struct tm _tmp1_ = {0}; - gchar* _tmp2_; -#line 121 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp0_ = timestamp; + struct tm _tmp0_ = {0}; + gchar* _tmp1_; #line 121 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - g_time_local (_tmp0_, &_tmp1_); + g_time_local (timestamp, &_tmp0_); #line 121 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - _tmp2_ = g_time_format (&_tmp1_, "%Y:%m:%d %H:%M:%S"); + _tmp1_ = g_time_format (&_tmp0_, "%Y:%m:%d %H:%M:%S"); #line 121 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - result = _tmp2_; + result = _tmp1_; #line 121 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return result; -#line 1170 "MediaMetadata.c" +#line 1267 "MediaMetadata.c" } -gchar* metadata_date_time_to_string (MetadataDateTime* self) { +gchar* +metadata_date_time_to_string (MetadataDateTime* self) +{ gchar* result = NULL; time_t _tmp0_; gchar* _tmp1_; @@ -1184,108 +1283,133 @@ gchar* metadata_date_time_to_string (MetadataDateTime* self) { result = _tmp1_; #line 125 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return result; -#line 1188 "MediaMetadata.c" +#line 1287 "MediaMetadata.c" } -static void value_metadata_date_time_init (GValue* value) { +static void +value_metadata_date_time_init (GValue* value) +{ #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" value->data[0].v_pointer = NULL; -#line 1195 "MediaMetadata.c" +#line 1296 "MediaMetadata.c" } -static void value_metadata_date_time_free_value (GValue* value) { +static void +value_metadata_date_time_free_value (GValue* value) +{ #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (value->data[0].v_pointer) { #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" metadata_date_time_unref (value->data[0].v_pointer); -#line 1204 "MediaMetadata.c" +#line 1307 "MediaMetadata.c" } } -static void value_metadata_date_time_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_metadata_date_time_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (src_value->data[0].v_pointer) { #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" dest_value->data[0].v_pointer = metadata_date_time_ref (src_value->data[0].v_pointer); -#line 1214 "MediaMetadata.c" +#line 1320 "MediaMetadata.c" } else { #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 1218 "MediaMetadata.c" +#line 1324 "MediaMetadata.c" } } -static gpointer value_metadata_date_time_peek_pointer (const GValue* value) { +static gpointer +value_metadata_date_time_peek_pointer (const GValue* value) +{ #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return value->data[0].v_pointer; -#line 1226 "MediaMetadata.c" +#line 1334 "MediaMetadata.c" } -static gchar* value_metadata_date_time_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_metadata_date_time_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (collect_values[0].v_pointer) { -#line 1233 "MediaMetadata.c" +#line 1346 "MediaMetadata.c" MetadataDateTime * object; object = collect_values[0].v_pointer; #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (object->parent_instance.g_class == NULL) { #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1240 "MediaMetadata.c" +#line 1353 "MediaMetadata.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.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 1244 "MediaMetadata.c" +#line 1357 "MediaMetadata.c" } #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" value->data[0].v_pointer = metadata_date_time_ref (object); -#line 1248 "MediaMetadata.c" +#line 1361 "MediaMetadata.c" } else { #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" value->data[0].v_pointer = NULL; -#line 1252 "MediaMetadata.c" +#line 1365 "MediaMetadata.c" } #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return NULL; -#line 1256 "MediaMetadata.c" +#line 1369 "MediaMetadata.c" } -static gchar* value_metadata_date_time_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_metadata_date_time_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ MetadataDateTime ** object_p; object_p = collect_values[0].v_pointer; #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (!object_p) { #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1267 "MediaMetadata.c" +#line 1385 "MediaMetadata.c" } #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (!value->data[0].v_pointer) { #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" *object_p = NULL; -#line 1273 "MediaMetadata.c" +#line 1391 "MediaMetadata.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" *object_p = value->data[0].v_pointer; -#line 1277 "MediaMetadata.c" +#line 1395 "MediaMetadata.c" } else { #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" *object_p = metadata_date_time_ref (value->data[0].v_pointer); -#line 1281 "MediaMetadata.c" +#line 1399 "MediaMetadata.c" } #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return NULL; -#line 1285 "MediaMetadata.c" +#line 1403 "MediaMetadata.c" } -GParamSpec* param_spec_metadata_date_time (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_metadata_date_time (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecMetadataDateTime* spec; #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_METADATA_DATE_TIME), NULL); @@ -1295,20 +1419,25 @@ GParamSpec* param_spec_metadata_date_time (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return G_PARAM_SPEC (spec); -#line 1299 "MediaMetadata.c" +#line 1423 "MediaMetadata.c" } -gpointer value_get_metadata_date_time (const GValue* value) { +gpointer +value_get_metadata_date_time (const GValue* value) +{ #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_METADATA_DATE_TIME), NULL); #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return value->data[0].v_pointer; -#line 1308 "MediaMetadata.c" +#line 1434 "MediaMetadata.c" } -void value_set_metadata_date_time (GValue* value, gpointer v_object) { +void +value_set_metadata_date_time (GValue* value, + gpointer v_object) +{ MetadataDateTime * old; #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_METADATA_DATE_TIME)); @@ -1324,22 +1453,25 @@ void value_set_metadata_date_time (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" metadata_date_time_ref (value->data[0].v_pointer); -#line 1328 "MediaMetadata.c" +#line 1457 "MediaMetadata.c" } else { #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" value->data[0].v_pointer = NULL; -#line 1332 "MediaMetadata.c" +#line 1461 "MediaMetadata.c" } #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (old) { #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" metadata_date_time_unref (old); -#line 1338 "MediaMetadata.c" +#line 1467 "MediaMetadata.c" } } -void value_take_metadata_date_time (GValue* value, gpointer v_object) { +void +value_take_metadata_date_time (GValue* value, + gpointer v_object) +{ MetadataDateTime * old; #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_METADATA_DATE_TIME)); @@ -1353,52 +1485,60 @@ void value_take_metadata_date_time (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" value->data[0].v_pointer = v_object; -#line 1357 "MediaMetadata.c" +#line 1489 "MediaMetadata.c" } else { #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" value->data[0].v_pointer = NULL; -#line 1361 "MediaMetadata.c" +#line 1493 "MediaMetadata.c" } #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (old) { #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" metadata_date_time_unref (old); -#line 1367 "MediaMetadata.c" +#line 1499 "MediaMetadata.c" } } -static void metadata_date_time_class_init (MetadataDateTimeClass * klass) { +static void +metadata_date_time_class_init (MetadataDateTimeClass * klass) +{ #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" metadata_date_time_parent_class = g_type_class_peek_parent (klass); #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" ((MetadataDateTimeClass *) klass)->finalize = metadata_date_time_finalize; #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_type_class_add_private (klass, sizeof (MetadataDateTimePrivate)); -#line 1379 "MediaMetadata.c" +#line 1513 "MediaMetadata.c" } -static void metadata_date_time_instance_init (MetadataDateTime * self) { +static void +metadata_date_time_instance_init (MetadataDateTime * self) +{ #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" self->priv = METADATA_DATE_TIME_GET_PRIVATE (self); #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" self->ref_count = 1; -#line 1388 "MediaMetadata.c" +#line 1524 "MediaMetadata.c" } -static void metadata_date_time_finalize (MetadataDateTime * obj) { +static void +metadata_date_time_finalize (MetadataDateTime * obj) +{ MetadataDateTime * self; #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_METADATA_DATE_TIME, MetadataDateTime); #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_signal_handlers_destroy (self); -#line 1398 "MediaMetadata.c" +#line 1536 "MediaMetadata.c" } -GType metadata_date_time_get_type (void) { +GType +metadata_date_time_get_type (void) +{ static volatile gsize metadata_date_time_type_id__volatile = 0; if (g_once_init_enter (&metadata_date_time_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_metadata_date_time_init, value_metadata_date_time_free_value, value_metadata_date_time_copy_value, value_metadata_date_time_peek_pointer, "p", value_metadata_date_time_collect_value, "p", value_metadata_date_time_lcopy_value }; @@ -1412,18 +1552,22 @@ GType metadata_date_time_get_type (void) { } -gpointer metadata_date_time_ref (gpointer instance) { +gpointer +metadata_date_time_ref (gpointer instance) +{ MetadataDateTime * self; self = instance; #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_atomic_int_inc (&self->ref_count); #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" return instance; -#line 1423 "MediaMetadata.c" +#line 1565 "MediaMetadata.c" } -void metadata_date_time_unref (gpointer instance) { +void +metadata_date_time_unref (gpointer instance) +{ MetadataDateTime * self; self = instance; #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -1432,7 +1576,7 @@ void metadata_date_time_unref (gpointer instance) { METADATA_DATE_TIME_GET_CLASS (self)->finalize (self); #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1436 "MediaMetadata.c" +#line 1580 "MediaMetadata.c" } } diff --git a/src/MediaMonitor.c b/src/MediaMonitor.c index 91da70c..551e8f0 100644 --- a/src/MediaMonitor.c +++ b/src/MediaMonitor.c @@ -1,4 +1,4 @@ -/* MediaMonitor.c generated by valac 0.36.6, the Vala compiler +/* MediaMonitor.c generated by valac 0.40.4, the Vala compiler * generated from MediaMonitor.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -142,6 +143,11 @@ typedef struct _MediaSourceCollectionClass MediaSourceCollectionClass; typedef struct _TransactionController TransactionController; typedef struct _TransactionControllerClass TransactionControllerClass; +enum { + MEDIA_MONITOR_0_PROPERTY, + MEDIA_MONITOR_NUM_PROPERTIES +}; +static GParamSpec* media_monitor_properties[MEDIA_MONITOR_NUM_PROPERTIES]; #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) #define _monitorable_updates_unref0(var) ((var == NULL) ? NULL : (var = (monitorable_updates_unref (var), NULL))) @@ -279,9 +285,15 @@ static gpointer media_monitor_parent_class = NULL; gpointer monitorable_updates_ref (gpointer instance); void monitorable_updates_unref (gpointer instance); -GParamSpec* param_spec_monitorable_updates (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_monitorable_updates (GValue* value, gpointer v_object); -void value_take_monitorable_updates (GValue* value, gpointer v_object); +GParamSpec* param_spec_monitorable_updates (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_monitorable_updates (GValue* value, + gpointer v_object); +void value_take_monitorable_updates (GValue* value, + gpointer v_object); gpointer value_get_monitorable_updates (const GValue* value); GType monitorable_updates_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; @@ -290,28 +302,36 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; GType monitorable_get_type (void) G_GNUC_CONST; #define MONITORABLE_UPDATES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MONITORABLE_UPDATES, MonitorableUpdatesPrivate)) -enum { - MONITORABLE_UPDATES_DUMMY_PROPERTY -}; MonitorableUpdates* monitorable_updates_new (Monitorable* monitorable); -MonitorableUpdates* monitorable_updates_construct (GType object_type, Monitorable* monitorable); +MonitorableUpdates* monitorable_updates_construct (GType object_type, + Monitorable* monitorable); GFile* monitorable_updates_get_master_file (MonitorableUpdates* self); GFileInfo* monitorable_updates_get_master_file_info (MonitorableUpdates* self); gboolean monitorable_updates_is_in_alteration (MonitorableUpdates* self); static gboolean monitorable_updates_real_is_in_alteration (MonitorableUpdates* self); gboolean monitorable_updates_is_set_offline (MonitorableUpdates* self); gboolean monitorable_updates_is_set_online (MonitorableUpdates* self); -void monitorable_updates_set_master_file (MonitorableUpdates* self, GFile* file); -static void monitorable_updates_real_set_master_file (MonitorableUpdates* self, GFile* file); +void monitorable_updates_set_master_file (MonitorableUpdates* self, + GFile* file); +static void monitorable_updates_real_set_master_file (MonitorableUpdates* self, + GFile* file); void monitorable_updates_mark_online (MonitorableUpdates* self); -void monitorable_updates_set_master_file_info_altered (MonitorableUpdates* self, gboolean altered); -static void monitorable_updates_real_set_master_file_info_altered (MonitorableUpdates* self, gboolean altered); -void monitorable_updates_set_master_file_info (MonitorableUpdates* self, GFileInfo* info); -static void monitorable_updates_real_set_master_file_info (MonitorableUpdates* self, GFileInfo* info); -void monitorable_updates_set_master_in_alteration (MonitorableUpdates* self, gboolean in_alteration); -static void monitorable_updates_real_set_master_in_alteration (MonitorableUpdates* self, gboolean in_alteration); -void monitorable_updates_set_master_alterations_complete (MonitorableUpdates* self, GFileInfo* info); -static void monitorable_updates_real_set_master_alterations_complete (MonitorableUpdates* self, GFileInfo* info); +void monitorable_updates_set_master_file_info_altered (MonitorableUpdates* self, + gboolean altered); +static void monitorable_updates_real_set_master_file_info_altered (MonitorableUpdates* self, + gboolean altered); +void monitorable_updates_set_master_file_info (MonitorableUpdates* self, + GFileInfo* info); +static void monitorable_updates_real_set_master_file_info (MonitorableUpdates* self, + GFileInfo* info); +void monitorable_updates_set_master_in_alteration (MonitorableUpdates* self, + gboolean in_alteration); +static void monitorable_updates_real_set_master_in_alteration (MonitorableUpdates* self, + gboolean in_alteration); +void monitorable_updates_set_master_alterations_complete (MonitorableUpdates* self, + GFileInfo* info); +static void monitorable_updates_real_set_master_alterations_complete (MonitorableUpdates* self, + GFileInfo* info); void monitorable_updates_mark_offline (MonitorableUpdates* self); static void monitorable_updates_real_mark_offline (MonitorableUpdates* self); static void monitorable_updates_real_mark_online (MonitorableUpdates* self); @@ -323,9 +343,15 @@ static void monitorable_updates_finalize (MonitorableUpdates * obj); GType media_monitor_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -334,21 +360,31 @@ GType media_source_collection_get_type (void) G_GNUC_CONST; GType media_monitor_discovered_file_get_type (void) G_GNUC_CONST; gpointer transaction_controller_ref (gpointer instance); void transaction_controller_unref (gpointer instance); -GParamSpec* param_spec_transaction_controller (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_transaction_controller (GValue* value, gpointer v_object); -void value_take_transaction_controller (GValue* value, gpointer v_object); +GParamSpec* param_spec_transaction_controller (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_transaction_controller (GValue* value, + gpointer v_object); +void value_take_transaction_controller (GValue* value, + gpointer v_object); gpointer value_get_transaction_controller (const GValue* value); GType transaction_controller_get_type (void) G_GNUC_CONST; #define MEDIA_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MEDIA_MONITOR, MediaMonitorPrivate)) -enum { - MEDIA_MONITOR_DUMMY_PROPERTY -}; -void media_monitor_on_media_source_destroyed (MediaMonitor* self, DataSource* source); -static void _media_monitor_on_media_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); -static void _media_monitor_on_media_source_destroyed_source_collection_unlinked_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); +void media_monitor_on_media_source_destroyed (MediaMonitor* self, + DataSource* source); +static void _media_monitor_on_media_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); +static void _media_monitor_on_media_source_destroyed_source_collection_unlinked_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); #define MEDIA_MONITOR_MAX_OPERATIONS_PER_CYCLE 100 #define MEDIA_MONITOR_FLUSH_PENDING_UPDATES_MSEC 500 -MediaMonitor* media_monitor_construct (GType object_type, MediaSourceCollection* sources, GCancellable* cancellable); +MediaMonitor* media_monitor_construct (GType object_type, + MediaSourceCollection* sources, + GCancellable* cancellable); static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self); static gboolean _media_monitor_on_flush_pending_updates_gsource_func (gpointer self); MediaSourceCollection* media_monitor_get_media_source_collection (MediaMonitor* self); @@ -358,60 +394,137 @@ static void media_monitor_real_close (MediaMonitor* self); gchar* media_monitor_to_string (MediaMonitor* self); static gchar* media_monitor_real_to_string (MediaMonitor* self); gchar* data_collection_to_string (DataCollection* self); -MonitorableUpdates* media_monitor_create_updates (MediaMonitor* self, Monitorable* monitorable); -static MonitorableUpdates* media_monitor_real_create_updates (MediaMonitor* self, Monitorable* monitorable); -static void media_monitor_real_on_media_source_destroyed (MediaMonitor* self, DataSource* source); -void media_monitor_remove_updates (MediaMonitor* self, Monitorable* monitorable); +MonitorableUpdates* media_monitor_create_updates (MediaMonitor* self, + Monitorable* monitorable); +static MonitorableUpdates* media_monitor_real_create_updates (MediaMonitor* self, + Monitorable* monitorable); +static void media_monitor_real_on_media_source_destroyed (MediaMonitor* self, + DataSource* source); +void media_monitor_remove_updates (MediaMonitor* self, + Monitorable* monitorable); void media_monitor_notify_discovery_started (MediaMonitor* self); static void media_monitor_real_notify_discovery_started (MediaMonitor* self); -MediaMonitorDiscoveredFile media_monitor_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable); -static MediaMonitorDiscoveredFile media_monitor_real_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable); -GeeCollection* media_monitor_candidates_for_unknown_file (MediaMonitor* self, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_); -static GeeCollection* media_monitor_real_candidates_for_unknown_file (MediaMonitor* self, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_); -GFile** media_monitor_get_auxilliary_backing_files (MediaMonitor* self, Monitorable* monitorable, int* result_length1); -static GFile** media_monitor_real_get_auxilliary_backing_files (MediaMonitor* self, Monitorable* monitorable, int* result_length1); -void media_monitor_update_backing_file_info (MediaMonitor* self, Monitorable* monitorable, GFile* file, GFileInfo* info); -static void media_monitor_real_update_backing_file_info (MediaMonitor* self, Monitorable* monitorable, GFile* file, GFileInfo* info); +MediaMonitorDiscoveredFile media_monitor_notify_file_discovered (MediaMonitor* self, + GFile* file, + GFileInfo* info, + Monitorable* * monitorable); +static MediaMonitorDiscoveredFile media_monitor_real_notify_file_discovered (MediaMonitor* self, + GFile* file, + GFileInfo* info, + Monitorable* * monitorable); +GeeCollection* media_monitor_candidates_for_unknown_file (MediaMonitor* self, + GFile* file, + GFileInfo* info, + MediaMonitorDiscoveredFile* _result_); +static GeeCollection* media_monitor_real_candidates_for_unknown_file (MediaMonitor* self, + GFile* file, + GFileInfo* info, + MediaMonitorDiscoveredFile* _result_); +GFile** media_monitor_get_auxilliary_backing_files (MediaMonitor* self, + Monitorable* monitorable, + int* result_length1); +static GFile** media_monitor_real_get_auxilliary_backing_files (MediaMonitor* self, + Monitorable* monitorable, + int* result_length1); +void media_monitor_update_backing_file_info (MediaMonitor* self, + Monitorable* monitorable, + GFile* file, + GFileInfo* info); +static void media_monitor_real_update_backing_file_info (MediaMonitor* self, + Monitorable* monitorable, + GFile* file, + GFileInfo* info); void media_monitor_notify_discovery_completing (MediaMonitor* self); static void media_monitor_real_notify_discovery_completing (MediaMonitor* self); -gboolean media_monitor_is_file_represented (MediaMonitor* self, GFile* file); -static gboolean media_monitor_real_is_file_represented (MediaMonitor* self, GFile* file); -gboolean media_monitor_notify_file_created (MediaMonitor* self, GFile* file, GFileInfo* info); -static gboolean media_monitor_real_notify_file_created (MediaMonitor* self, GFile* file, GFileInfo* info); -gboolean media_monitor_notify_file_moved (MediaMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info); -static gboolean media_monitor_real_notify_file_moved (MediaMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info); -gboolean media_monitor_notify_file_altered (MediaMonitor* self, GFile* file); -static gboolean media_monitor_real_notify_file_altered (MediaMonitor* self, GFile* file); -gboolean media_monitor_notify_file_attributes_altered (MediaMonitor* self, GFile* file); -static gboolean media_monitor_real_notify_file_attributes_altered (MediaMonitor* self, GFile* file); -gboolean media_monitor_notify_file_alteration_completed (MediaMonitor* self, GFile* file, GFileInfo* info); -static gboolean media_monitor_real_notify_file_alteration_completed (MediaMonitor* self, GFile* file, GFileInfo* info); -gboolean media_monitor_notify_file_deleted (MediaMonitor* self, GFile* file); -static gboolean media_monitor_real_notify_file_deleted (MediaMonitor* self, GFile* file); +gboolean media_monitor_is_file_represented (MediaMonitor* self, + GFile* file); +static gboolean media_monitor_real_is_file_represented (MediaMonitor* self, + GFile* file); +gboolean media_monitor_notify_file_created (MediaMonitor* self, + GFile* file, + GFileInfo* info); +static gboolean media_monitor_real_notify_file_created (MediaMonitor* self, + GFile* file, + GFileInfo* info); +gboolean media_monitor_notify_file_moved (MediaMonitor* self, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info); +static gboolean media_monitor_real_notify_file_moved (MediaMonitor* self, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info); +gboolean media_monitor_notify_file_altered (MediaMonitor* self, + GFile* file); +static gboolean media_monitor_real_notify_file_altered (MediaMonitor* self, + GFile* file); +gboolean media_monitor_notify_file_attributes_altered (MediaMonitor* self, + GFile* file); +static gboolean media_monitor_real_notify_file_attributes_altered (MediaMonitor* self, + GFile* file); +gboolean media_monitor_notify_file_alteration_completed (MediaMonitor* self, + GFile* file, + GFileInfo* info); +static gboolean media_monitor_real_notify_file_alteration_completed (MediaMonitor* self, + GFile* file, + GFileInfo* info); +gboolean media_monitor_notify_file_deleted (MediaMonitor* self, + GFile* file); +static gboolean media_monitor_real_notify_file_deleted (MediaMonitor* self, + GFile* file); void media_monitor_mdbg (const gchar* msg); gboolean media_monitor_has_pending_updates (MediaMonitor* self); GeeCollection* media_monitor_get_monitorables (MediaMonitor* self); -MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, Monitorable* monitorable); -MonitorableUpdates* media_monitor_get_existing_updates (MediaMonitor* self, Monitorable* monitorable); -gboolean media_monitor_is_online (MediaMonitor* self, Monitorable* monitorable); +MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, + Monitorable* monitorable); +MonitorableUpdates* media_monitor_get_existing_updates (MediaMonitor* self, + Monitorable* monitorable); +gboolean media_monitor_is_online (MediaMonitor* self, + Monitorable* monitorable); gboolean monitorable_is_offline (Monitorable* self); -gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable); -GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorable); +gboolean media_monitor_is_offline (MediaMonitor* self, + Monitorable* monitorable); +GFile* media_monitor_get_master_file (MediaMonitor* self, + Monitorable* monitorable); GFile* media_source_get_master_file (MediaSource* self); -void media_monitor_update_master_file (MediaMonitor* self, Monitorable* monitorable, GFile* file); -void media_monitor_update_master_file_info_altered (MediaMonitor* self, Monitorable* monitorable); -void media_monitor_update_master_file_in_alteration (MediaMonitor* self, Monitorable* monitorable, gboolean in_alteration); -void media_monitor_update_master_file_alterations_completed (MediaMonitor* self, Monitorable* monitorable, GFileInfo* info); -void media_monitor_update_online (MediaMonitor* self, Monitorable* monitorable); -void media_monitor_update_offline (MediaMonitor* self, Monitorable* monitorable); -void media_monitor_process_updates (MediaMonitor* self, GeeCollection* all_updates, TransactionController* controller, gint* op_count, GError** error); -static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollection* all_updates, TransactionController* controller, gint* op_count, GError** error); +void media_monitor_update_master_file (MediaMonitor* self, + Monitorable* monitorable, + GFile* file); +void media_monitor_update_master_file_info_altered (MediaMonitor* self, + Monitorable* monitorable); +void media_monitor_update_master_file_in_alteration (MediaMonitor* self, + Monitorable* monitorable, + gboolean in_alteration); +void media_monitor_update_master_file_alterations_completed (MediaMonitor* self, + Monitorable* monitorable, + GFileInfo* info); +void media_monitor_update_online (MediaMonitor* self, + Monitorable* monitorable); +void media_monitor_update_offline (MediaMonitor* self, + Monitorable* monitorable); +void media_monitor_process_updates (MediaMonitor* self, + GeeCollection* all_updates, + TransactionController* controller, + gint* op_count, + GError** error); +static void media_monitor_real_process_updates (MediaMonitor* self, + GeeCollection* all_updates, + TransactionController* controller, + gint* op_count, + GError** error); GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; -void monitorable_set_many_master_file (GeeMap* map, TransactionController* controller, GError** error); -void monitorable_set_many_master_timestamp (GeeMap* map, TransactionController* controller, GError** error); -void monitorable_mark_many_online_offline (GeeCollection* online, GeeCollection* offline, TransactionController* controller, GError** error); +void monitorable_set_many_master_file (GeeMap* map, + TransactionController* controller, + GError** error); +void monitorable_set_many_master_timestamp (GeeMap* map, + TransactionController* controller, + GError** error); +void monitorable_mark_many_online_offline (GeeCollection* online, + GeeCollection* offline, + TransactionController* controller, + GError** error); TransactionController* media_source_collection_get_transaction_controller (MediaSourceCollection* self); void transaction_controller_begin (TransactionController* self); void transaction_controller_commit (TransactionController* self); @@ -421,43 +534,49 @@ void app_window_panic (const gchar* msg); static void media_monitor_finalize (GObject * obj); -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 18 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return self ? g_object_ref (self) : NULL; -#line 428 "MediaMonitor.c" +#line 543 "MediaMonitor.c" } -MonitorableUpdates* monitorable_updates_construct (GType object_type, Monitorable* monitorable) { +MonitorableUpdates* +monitorable_updates_construct (GType object_type, + Monitorable* monitorable) +{ MonitorableUpdates* self = NULL; Monitorable* _tmp0_; - Monitorable* _tmp1_; #line 17 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL); #line 17 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self = (MonitorableUpdates*) g_type_create_instance (object_type); #line 18 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; -#line 18 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (monitorable); #line 18 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (self->monitorable); #line 18 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - self->monitorable = _tmp1_; + self->monitorable = _tmp0_; #line 17 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return self; -#line 450 "MediaMonitor.c" +#line 565 "MediaMonitor.c" } -MonitorableUpdates* monitorable_updates_new (Monitorable* monitorable) { +MonitorableUpdates* +monitorable_updates_new (Monitorable* monitorable) +{ #line 17 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return monitorable_updates_construct (TYPE_MONITORABLE_UPDATES, monitorable); -#line 457 "MediaMonitor.c" +#line 574 "MediaMonitor.c" } -GFile* monitorable_updates_get_master_file (MonitorableUpdates* self) { +GFile* +monitorable_updates_get_master_file (MonitorableUpdates* self) +{ GFile* result = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -471,11 +590,13 @@ GFile* monitorable_updates_get_master_file (MonitorableUpdates* self) { result = _tmp1_; #line 22 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 475 "MediaMonitor.c" +#line 594 "MediaMonitor.c" } -GFileInfo* monitorable_updates_get_master_file_info (MonitorableUpdates* self) { +GFileInfo* +monitorable_updates_get_master_file_info (MonitorableUpdates* self) +{ GFileInfo* result = NULL; GFileInfo* _tmp0_; GFileInfo* _tmp1_; @@ -489,11 +610,13 @@ GFileInfo* monitorable_updates_get_master_file_info (MonitorableUpdates* self) { result = _tmp1_; #line 26 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 493 "MediaMonitor.c" +#line 614 "MediaMonitor.c" } -static gboolean monitorable_updates_real_is_in_alteration (MonitorableUpdates* self) { +static gboolean +monitorable_updates_real_is_in_alteration (MonitorableUpdates* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 30 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -502,20 +625,24 @@ static gboolean monitorable_updates_real_is_in_alteration (MonitorableUpdates* s result = _tmp0_; #line 30 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 506 "MediaMonitor.c" +#line 629 "MediaMonitor.c" } -gboolean monitorable_updates_is_in_alteration (MonitorableUpdates* self) { +gboolean +monitorable_updates_is_in_alteration (MonitorableUpdates* self) +{ #line 29 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE_UPDATES (self), FALSE); #line 29 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MONITORABLE_UPDATES_GET_CLASS (self)->is_in_alteration (self); -#line 515 "MediaMonitor.c" +#line 640 "MediaMonitor.c" } -gboolean monitorable_updates_is_set_offline (MonitorableUpdates* self) { +gboolean +monitorable_updates_is_set_offline (MonitorableUpdates* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 33 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -526,11 +653,13 @@ gboolean monitorable_updates_is_set_offline (MonitorableUpdates* self) { result = _tmp0_; #line 34 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 530 "MediaMonitor.c" +#line 657 "MediaMonitor.c" } -gboolean monitorable_updates_is_set_online (MonitorableUpdates* self) { +gboolean +monitorable_updates_is_set_online (MonitorableUpdates* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 37 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -541,150 +670,161 @@ gboolean monitorable_updates_is_set_online (MonitorableUpdates* self) { result = _tmp0_; #line 38 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 545 "MediaMonitor.c" +#line 674 "MediaMonitor.c" } -static void monitorable_updates_real_set_master_file (MonitorableUpdates* self, GFile* file) { +static void +monitorable_updates_real_set_master_file (MonitorableUpdates* self, + GFile* file) +{ GFile* _tmp0_; - GFile* _tmp1_; - GFile* _tmp2_; #line 41 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail ((file == NULL) || G_IS_FILE (file)); #line 42 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = file; -#line 42 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (file); #line 42 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (self->priv->master_file); #line 42 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - self->priv->master_file = _tmp1_; -#line 44 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = file; + self->priv->master_file = _tmp0_; #line 44 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp2_ != NULL) { + if (file != NULL) { #line 45 "/home/jens/Source/shotwell/src/MediaMonitor.vala" monitorable_updates_mark_online (self); -#line 569 "MediaMonitor.c" +#line 695 "MediaMonitor.c" } } -void monitorable_updates_set_master_file (MonitorableUpdates* self, GFile* file) { +void +monitorable_updates_set_master_file (MonitorableUpdates* self, + GFile* file) +{ #line 41 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE_UPDATES (self)); #line 41 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MONITORABLE_UPDATES_GET_CLASS (self)->set_master_file (self, file); -#line 579 "MediaMonitor.c" +#line 708 "MediaMonitor.c" } -static void monitorable_updates_real_set_master_file_info_altered (MonitorableUpdates* self, gboolean altered) { - gboolean _tmp0_; - gboolean _tmp1_; +static void +monitorable_updates_real_set_master_file_info_altered (MonitorableUpdates* self, + gboolean altered) +{ #line 49 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = altered; -#line 49 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - self->priv->master_file_info_altered = _tmp0_; -#line 51 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = altered; + self->priv->master_file_info_altered = altered; #line 51 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp1_) { + if (altered) { #line 52 "/home/jens/Source/shotwell/src/MediaMonitor.vala" monitorable_updates_mark_online (self); -#line 596 "MediaMonitor.c" +#line 722 "MediaMonitor.c" } } -void monitorable_updates_set_master_file_info_altered (MonitorableUpdates* self, gboolean altered) { +void +monitorable_updates_set_master_file_info_altered (MonitorableUpdates* self, + gboolean altered) +{ #line 48 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE_UPDATES (self)); #line 48 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MONITORABLE_UPDATES_GET_CLASS (self)->set_master_file_info_altered (self, altered); -#line 606 "MediaMonitor.c" +#line 735 "MediaMonitor.c" } -static void monitorable_updates_real_set_master_file_info (MonitorableUpdates* self, GFileInfo* info) { +static void +monitorable_updates_real_set_master_file_info (MonitorableUpdates* self, + GFileInfo* info) +{ GFileInfo* _tmp0_; GFileInfo* _tmp1_; - GFileInfo* _tmp2_; #line 55 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail ((info == NULL) || G_IS_FILE_INFO (info)); #line 56 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = info; -#line 56 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (info); #line 56 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (self->priv->master_file_info); #line 56 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - self->priv->master_file_info = _tmp1_; + self->priv->master_file_info = _tmp0_; #line 58 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = self->priv->master_file_info; + _tmp1_ = self->priv->master_file_info; #line 58 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 59 "/home/jens/Source/shotwell/src/MediaMonitor.vala" monitorable_updates_set_master_file_info_altered (self, FALSE); -#line 630 "MediaMonitor.c" +#line 759 "MediaMonitor.c" } } -void monitorable_updates_set_master_file_info (MonitorableUpdates* self, GFileInfo* info) { +void +monitorable_updates_set_master_file_info (MonitorableUpdates* self, + GFileInfo* info) +{ #line 55 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE_UPDATES (self)); #line 55 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MONITORABLE_UPDATES_GET_CLASS (self)->set_master_file_info (self, info); -#line 640 "MediaMonitor.c" +#line 772 "MediaMonitor.c" } -static void monitorable_updates_real_set_master_in_alteration (MonitorableUpdates* self, gboolean in_alteration) { - gboolean _tmp0_; -#line 63 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = in_alteration; +static void +monitorable_updates_real_set_master_in_alteration (MonitorableUpdates* self, + gboolean in_alteration) +{ #line 63 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - self->priv->master_in_alteration = _tmp0_; -#line 650 "MediaMonitor.c" + self->priv->master_in_alteration = in_alteration; +#line 782 "MediaMonitor.c" } -void monitorable_updates_set_master_in_alteration (MonitorableUpdates* self, gboolean in_alteration) { +void +monitorable_updates_set_master_in_alteration (MonitorableUpdates* self, + gboolean in_alteration) +{ #line 62 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE_UPDATES (self)); #line 62 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MONITORABLE_UPDATES_GET_CLASS (self)->set_master_in_alteration (self, in_alteration); -#line 659 "MediaMonitor.c" +#line 794 "MediaMonitor.c" } -static void monitorable_updates_real_set_master_alterations_complete (MonitorableUpdates* self, GFileInfo* info) { - GFileInfo* _tmp0_; +static void +monitorable_updates_real_set_master_alterations_complete (MonitorableUpdates* self, + GFileInfo* info) +{ #line 66 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 67 "/home/jens/Source/shotwell/src/MediaMonitor.vala" monitorable_updates_set_master_in_alteration (self, FALSE); #line 68 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = info; -#line 68 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_set_master_file_info (self, _tmp0_); + monitorable_updates_set_master_file_info (self, info); #line 69 "/home/jens/Source/shotwell/src/MediaMonitor.vala" monitorable_updates_mark_online (self); -#line 675 "MediaMonitor.c" +#line 810 "MediaMonitor.c" } -void monitorable_updates_set_master_alterations_complete (MonitorableUpdates* self, GFileInfo* info) { +void +monitorable_updates_set_master_alterations_complete (MonitorableUpdates* self, + GFileInfo* info) +{ #line 66 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE_UPDATES (self)); #line 66 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MONITORABLE_UPDATES_GET_CLASS (self)->set_master_alterations_complete (self, info); -#line 684 "MediaMonitor.c" +#line 822 "MediaMonitor.c" } -static void monitorable_updates_real_mark_offline (MonitorableUpdates* self) { +static void +monitorable_updates_real_mark_offline (MonitorableUpdates* self) +{ #line 73 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->priv->online = FALSE; #line 74 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -697,56 +837,68 @@ static void monitorable_updates_real_mark_offline (MonitorableUpdates* self) { self->priv->master_file_info = NULL; #line 78 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->priv->master_in_alteration = FALSE; -#line 701 "MediaMonitor.c" +#line 841 "MediaMonitor.c" } -void monitorable_updates_mark_offline (MonitorableUpdates* self) { +void +monitorable_updates_mark_offline (MonitorableUpdates* self) +{ #line 72 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE_UPDATES (self)); #line 72 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MONITORABLE_UPDATES_GET_CLASS (self)->mark_offline (self); -#line 710 "MediaMonitor.c" +#line 852 "MediaMonitor.c" } -static void monitorable_updates_real_mark_online (MonitorableUpdates* self) { +static void +monitorable_updates_real_mark_online (MonitorableUpdates* self) +{ #line 82 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->priv->online = TRUE; #line 83 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->priv->offline = FALSE; -#line 719 "MediaMonitor.c" +#line 863 "MediaMonitor.c" } -void monitorable_updates_mark_online (MonitorableUpdates* self) { +void +monitorable_updates_mark_online (MonitorableUpdates* self) +{ #line 81 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE_UPDATES (self)); #line 81 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MONITORABLE_UPDATES_GET_CLASS (self)->mark_online (self); -#line 728 "MediaMonitor.c" +#line 874 "MediaMonitor.c" } -static void monitorable_updates_real_reset_online_offline (MonitorableUpdates* self) { +static void +monitorable_updates_real_reset_online_offline (MonitorableUpdates* self) +{ #line 87 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->priv->online = FALSE; #line 88 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->priv->offline = FALSE; -#line 737 "MediaMonitor.c" +#line 885 "MediaMonitor.c" } -void monitorable_updates_reset_online_offline (MonitorableUpdates* self) { +void +monitorable_updates_reset_online_offline (MonitorableUpdates* self) +{ #line 86 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE_UPDATES (self)); #line 86 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MONITORABLE_UPDATES_GET_CLASS (self)->reset_online_offline (self); -#line 746 "MediaMonitor.c" +#line 896 "MediaMonitor.c" } -static gboolean monitorable_updates_real_is_all_updated (MonitorableUpdates* self) { +static gboolean +monitorable_updates_real_is_all_updated (MonitorableUpdates* self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; @@ -758,189 +910,216 @@ static gboolean monitorable_updates_real_is_all_updated (MonitorableUpdates* sel _tmp5_ = self->priv->master_file; #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp5_ == NULL) { -#line 762 "MediaMonitor.c" +#line 914 "MediaMonitor.c" gboolean _tmp6_; #line 93 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp6_ = self->priv->master_file_info_altered; #line 93 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp4_ = _tmp6_ == FALSE; -#line 768 "MediaMonitor.c" +#line 920 "MediaMonitor.c" } else { #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp4_ = FALSE; -#line 772 "MediaMonitor.c" +#line 924 "MediaMonitor.c" } #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp4_) { -#line 776 "MediaMonitor.c" +#line 928 "MediaMonitor.c" GFileInfo* _tmp7_; #line 94 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp7_ = self->priv->master_file_info; #line 94 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp3_ = _tmp7_ == NULL; -#line 782 "MediaMonitor.c" +#line 934 "MediaMonitor.c" } else { #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp3_ = FALSE; -#line 786 "MediaMonitor.c" +#line 938 "MediaMonitor.c" } #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp3_) { -#line 790 "MediaMonitor.c" +#line 942 "MediaMonitor.c" gboolean _tmp8_; #line 95 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp8_ = self->priv->master_in_alteration; #line 95 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp2_ = _tmp8_ == FALSE; -#line 796 "MediaMonitor.c" +#line 948 "MediaMonitor.c" } else { #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp2_ = FALSE; -#line 800 "MediaMonitor.c" +#line 952 "MediaMonitor.c" } #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp2_) { -#line 804 "MediaMonitor.c" +#line 956 "MediaMonitor.c" gboolean _tmp9_; #line 96 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp9_ = self->priv->online; #line 96 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp1_ = _tmp9_ == FALSE; -#line 810 "MediaMonitor.c" +#line 962 "MediaMonitor.c" } else { #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp1_ = FALSE; -#line 814 "MediaMonitor.c" +#line 966 "MediaMonitor.c" } #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp1_) { -#line 818 "MediaMonitor.c" +#line 970 "MediaMonitor.c" gboolean _tmp10_; #line 97 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp10_ = self->priv->offline; #line 97 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp0_ = _tmp10_ == FALSE; -#line 824 "MediaMonitor.c" +#line 976 "MediaMonitor.c" } else { #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp0_ = FALSE; -#line 828 "MediaMonitor.c" +#line 980 "MediaMonitor.c" } #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" result = _tmp0_; #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 834 "MediaMonitor.c" +#line 986 "MediaMonitor.c" } -gboolean monitorable_updates_is_all_updated (MonitorableUpdates* self) { +gboolean +monitorable_updates_is_all_updated (MonitorableUpdates* self) +{ #line 91 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE_UPDATES (self), FALSE); #line 91 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MONITORABLE_UPDATES_GET_CLASS (self)->is_all_updated (self); -#line 843 "MediaMonitor.c" +#line 997 "MediaMonitor.c" } -static void value_monitorable_updates_init (GValue* value) { +static void +value_monitorable_updates_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" value->data[0].v_pointer = NULL; -#line 850 "MediaMonitor.c" +#line 1006 "MediaMonitor.c" } -static void value_monitorable_updates_free_value (GValue* value) { +static void +value_monitorable_updates_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" monitorable_updates_unref (value->data[0].v_pointer); -#line 859 "MediaMonitor.c" +#line 1017 "MediaMonitor.c" } } -static void value_monitorable_updates_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_monitorable_updates_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" dest_value->data[0].v_pointer = monitorable_updates_ref (src_value->data[0].v_pointer); -#line 869 "MediaMonitor.c" +#line 1030 "MediaMonitor.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" dest_value->data[0].v_pointer = NULL; -#line 873 "MediaMonitor.c" +#line 1034 "MediaMonitor.c" } } -static gpointer value_monitorable_updates_peek_pointer (const GValue* value) { +static gpointer +value_monitorable_updates_peek_pointer (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return value->data[0].v_pointer; -#line 881 "MediaMonitor.c" +#line 1044 "MediaMonitor.c" } -static gchar* value_monitorable_updates_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_monitorable_updates_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (collect_values[0].v_pointer) { -#line 888 "MediaMonitor.c" +#line 1056 "MediaMonitor.c" MonitorableUpdates * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 895 "MediaMonitor.c" +#line 1063 "MediaMonitor.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.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 899 "MediaMonitor.c" +#line 1067 "MediaMonitor.c" } #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" value->data[0].v_pointer = monitorable_updates_ref (object); -#line 903 "MediaMonitor.c" +#line 1071 "MediaMonitor.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" value->data[0].v_pointer = NULL; -#line 907 "MediaMonitor.c" +#line 1075 "MediaMonitor.c" } #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return NULL; -#line 911 "MediaMonitor.c" +#line 1079 "MediaMonitor.c" } -static gchar* value_monitorable_updates_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_monitorable_updates_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ MonitorableUpdates ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 922 "MediaMonitor.c" +#line 1095 "MediaMonitor.c" } #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" *object_p = NULL; -#line 928 "MediaMonitor.c" +#line 1101 "MediaMonitor.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" *object_p = value->data[0].v_pointer; -#line 932 "MediaMonitor.c" +#line 1105 "MediaMonitor.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" *object_p = monitorable_updates_ref (value->data[0].v_pointer); -#line 936 "MediaMonitor.c" +#line 1109 "MediaMonitor.c" } #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return NULL; -#line 940 "MediaMonitor.c" +#line 1113 "MediaMonitor.c" } -GParamSpec* param_spec_monitorable_updates (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_monitorable_updates (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecMonitorableUpdates* spec; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_MONITORABLE_UPDATES), NULL); @@ -950,20 +1129,25 @@ GParamSpec* param_spec_monitorable_updates (const gchar* name, const gchar* nick G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return G_PARAM_SPEC (spec); -#line 954 "MediaMonitor.c" +#line 1133 "MediaMonitor.c" } -gpointer value_get_monitorable_updates (const GValue* value) { +gpointer +value_get_monitorable_updates (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MONITORABLE_UPDATES), NULL); #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return value->data[0].v_pointer; -#line 963 "MediaMonitor.c" +#line 1144 "MediaMonitor.c" } -void value_set_monitorable_updates (GValue* value, gpointer v_object) { +void +value_set_monitorable_updates (GValue* value, + gpointer v_object) +{ MonitorableUpdates * old; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MONITORABLE_UPDATES)); @@ -979,22 +1163,25 @@ void value_set_monitorable_updates (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" monitorable_updates_ref (value->data[0].v_pointer); -#line 983 "MediaMonitor.c" +#line 1167 "MediaMonitor.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" value->data[0].v_pointer = NULL; -#line 987 "MediaMonitor.c" +#line 1171 "MediaMonitor.c" } #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" monitorable_updates_unref (old); -#line 993 "MediaMonitor.c" +#line 1177 "MediaMonitor.c" } } -void value_take_monitorable_updates (GValue* value, gpointer v_object) { +void +value_take_monitorable_updates (GValue* value, + gpointer v_object) +{ MonitorableUpdates * old; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MONITORABLE_UPDATES)); @@ -1008,22 +1195,24 @@ void value_take_monitorable_updates (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" value->data[0].v_pointer = v_object; -#line 1012 "MediaMonitor.c" +#line 1199 "MediaMonitor.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" value->data[0].v_pointer = NULL; -#line 1016 "MediaMonitor.c" +#line 1203 "MediaMonitor.c" } #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" monitorable_updates_unref (old); -#line 1022 "MediaMonitor.c" +#line 1209 "MediaMonitor.c" } } -static void monitorable_updates_class_init (MonitorableUpdatesClass * klass) { +static void +monitorable_updates_class_init (MonitorableUpdatesClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" monitorable_updates_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1050,11 +1239,13 @@ static void monitorable_updates_class_init (MonitorableUpdatesClass * klass) { ((MonitorableUpdatesClass *) klass)->reset_online_offline = (void (*) (MonitorableUpdates *)) monitorable_updates_real_reset_online_offline; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" ((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*) (MonitorableUpdates *)) monitorable_updates_real_is_all_updated; -#line 1054 "MediaMonitor.c" +#line 1243 "MediaMonitor.c" } -static void monitorable_updates_instance_init (MonitorableUpdates * self) { +static void +monitorable_updates_instance_init (MonitorableUpdates * self) +{ #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->priv = MONITORABLE_UPDATES_GET_PRIVATE (self); #line 10 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1071,11 +1262,13 @@ static void monitorable_updates_instance_init (MonitorableUpdates * self) { self->priv->offline = FALSE; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->ref_count = 1; -#line 1075 "MediaMonitor.c" +#line 1266 "MediaMonitor.c" } -static void monitorable_updates_finalize (MonitorableUpdates * obj) { +static void +monitorable_updates_finalize (MonitorableUpdates * obj) +{ MonitorableUpdates * self; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MONITORABLE_UPDATES, MonitorableUpdates); @@ -1087,11 +1280,13 @@ static void monitorable_updates_finalize (MonitorableUpdates * obj) { _g_object_unref0 (self->priv->master_file); #line 12 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (self->priv->master_file_info); -#line 1091 "MediaMonitor.c" +#line 1284 "MediaMonitor.c" } -GType monitorable_updates_get_type (void) { +GType +monitorable_updates_get_type (void) +{ static volatile gsize monitorable_updates_type_id__volatile = 0; if (g_once_init_enter (&monitorable_updates_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_monitorable_updates_init, value_monitorable_updates_free_value, value_monitorable_updates_copy_value, value_monitorable_updates_peek_pointer, "p", value_monitorable_updates_collect_value, "p", value_monitorable_updates_lcopy_value }; @@ -1105,18 +1300,22 @@ GType monitorable_updates_get_type (void) { } -gpointer monitorable_updates_ref (gpointer instance) { +gpointer +monitorable_updates_ref (gpointer instance) +{ MonitorableUpdates * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return instance; -#line 1116 "MediaMonitor.c" +#line 1313 "MediaMonitor.c" } -void monitorable_updates_unref (gpointer instance) { +void +monitorable_updates_unref (gpointer instance) +{ MonitorableUpdates * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1125,26 +1324,36 @@ void monitorable_updates_unref (gpointer instance) { MONITORABLE_UPDATES_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1129 "MediaMonitor.c" +#line 1328 "MediaMonitor.c" } } -static void _media_monitor_on_media_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +static void +_media_monitor_on_media_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self) +{ #line 130 "/home/jens/Source/shotwell/src/MediaMonitor.vala" media_monitor_on_media_source_destroyed ((MediaMonitor*) self, source); -#line 1137 "MediaMonitor.c" +#line 1340 "MediaMonitor.c" } -static void _media_monitor_on_media_source_destroyed_source_collection_unlinked_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +static void +_media_monitor_on_media_source_destroyed_source_collection_unlinked_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self) +{ #line 131 "/home/jens/Source/shotwell/src/MediaMonitor.vala" media_monitor_on_media_source_destroyed ((MediaMonitor*) self, source); -#line 1144 "MediaMonitor.c" +#line 1351 "MediaMonitor.c" } -GType media_monitor_discovered_file_get_type (void) { +GType +media_monitor_discovered_file_get_type (void) +{ static volatile gsize media_monitor_discovered_file_type_id__volatile = 0; if (g_once_init_enter (&media_monitor_discovered_file_type_id__volatile)) { static const GEnumValue values[] = {{MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED, "MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED", "represented"}, {MEDIA_MONITOR_DISCOVERED_FILE_IGNORE, "MEDIA_MONITOR_DISCOVERED_FILE_IGNORE", "ignore"}, {MEDIA_MONITOR_DISCOVERED_FILE_UNKNOWN, "MEDIA_MONITOR_DISCOVERED_FILE_UNKNOWN", "unknown"}, {0, NULL, NULL}}; @@ -1156,31 +1365,34 @@ GType media_monitor_discovered_file_get_type (void) { } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 119 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return self ? data_collection_ref (self) : NULL; -#line 1163 "MediaMonitor.c" +#line 1374 "MediaMonitor.c" } -static gboolean _media_monitor_on_flush_pending_updates_gsource_func (gpointer self) { +static gboolean +_media_monitor_on_flush_pending_updates_gsource_func (gpointer self) +{ gboolean result; result = media_monitor_on_flush_pending_updates ((MediaMonitor*) self); #line 125 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1172 "MediaMonitor.c" +#line 1385 "MediaMonitor.c" } -MediaMonitor* media_monitor_construct (GType object_type, MediaSourceCollection* sources, GCancellable* cancellable) { +MediaMonitor* +media_monitor_construct (GType object_type, + MediaSourceCollection* sources, + GCancellable* cancellable) +{ MediaMonitor * self = NULL; MediaSourceCollection* _tmp0_; - MediaSourceCollection* _tmp1_; - GCancellable* _tmp2_; - GCancellable* _tmp3_; - MediaSourceCollection* _tmp4_; - MediaSourceCollection* _tmp5_; - guint _tmp6_; + GCancellable* _tmp1_; #line 118 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (sources), NULL); #line 118 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1188,71 +1400,71 @@ MediaMonitor* media_monitor_construct (GType object_type, MediaSourceCollection* #line 118 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self = (MediaMonitor*) g_object_new (object_type, NULL); #line 119 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = sources; -#line 119 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = _data_collection_ref0 (_tmp0_); + _tmp0_ = _data_collection_ref0 (sources); #line 119 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _data_collection_unref0 (self->priv->sources); #line 119 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - self->priv->sources = _tmp1_; -#line 120 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = cancellable; + self->priv->sources = _tmp0_; #line 120 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (cancellable); #line 120 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (self->priv->cancellable); #line 120 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - self->priv->cancellable = _tmp3_; + self->priv->cancellable = _tmp1_; #line 122 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp4_ = sources; -#line 122 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _media_monitor_on_media_source_destroyed_source_collection_item_destroyed, self, 0); -#line 123 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp5_ = sources; + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _media_monitor_on_media_source_destroyed_source_collection_item_destroyed, self, 0); #line 123 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_SOURCE_COLLECTION, SourceCollection), "unlinked-destroyed", (GCallback) _media_monitor_on_media_source_destroyed_source_collection_unlinked_destroyed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_SOURCE_COLLECTION, SourceCollection), "unlinked-destroyed", (GCallback) _media_monitor_on_media_source_destroyed_source_collection_unlinked_destroyed, self, 0); #line 125 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp6_ = g_timeout_add_full (G_PRIORITY_LOW, (guint) MEDIA_MONITOR_FLUSH_PENDING_UPDATES_MSEC, _media_monitor_on_flush_pending_updates_gsource_func, g_object_ref (self), g_object_unref); -#line 125 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - self->priv->pending_updates_timer_id = _tmp6_; + self->priv->pending_updates_timer_id = g_timeout_add_full (G_PRIORITY_LOW, (guint) MEDIA_MONITOR_FLUSH_PENDING_UPDATES_MSEC, _media_monitor_on_flush_pending_updates_gsource_func, g_object_ref (self), g_object_unref); #line 118 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return self; -#line 1221 "MediaMonitor.c" +#line 1423 "MediaMonitor.c" } -static MediaSourceCollection* media_monitor_real_get_media_source_collection (MediaMonitor* self) { +static MediaSourceCollection* +media_monitor_real_get_media_source_collection (MediaMonitor* self) +{ #line 134 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_get_media_source_collection'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 134 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return NULL; -#line 1230 "MediaMonitor.c" +#line 1434 "MediaMonitor.c" } -MediaSourceCollection* media_monitor_get_media_source_collection (MediaMonitor* self) { +MediaSourceCollection* +media_monitor_get_media_source_collection (MediaMonitor* self) +{ #line 134 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL); #line 134 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->get_media_source_collection (self); -#line 1239 "MediaMonitor.c" +#line 1445 "MediaMonitor.c" } -static void media_monitor_real_close (MediaMonitor* self) { +static void +media_monitor_real_close (MediaMonitor* self) +{ } -void media_monitor_close (MediaMonitor* self) { +void +media_monitor_close (MediaMonitor* self) +{ #line 136 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 136 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MEDIA_MONITOR_GET_CLASS (self)->close (self); -#line 1252 "MediaMonitor.c" +#line 1462 "MediaMonitor.c" } -static gchar* media_monitor_real_to_string (MediaMonitor* self) { +static gchar* +media_monitor_real_to_string (MediaMonitor* self) +{ gchar* result = NULL; MediaSourceCollection* _tmp0_; MediaSourceCollection* _tmp1_; @@ -1280,117 +1492,153 @@ static gchar* media_monitor_real_to_string (MediaMonitor* self) { result = _tmp5_; #line 140 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1284 "MediaMonitor.c" +#line 1496 "MediaMonitor.c" } -gchar* media_monitor_to_string (MediaMonitor* self) { +gchar* +media_monitor_to_string (MediaMonitor* self) +{ #line 139 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL); #line 139 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->to_string (self); -#line 1293 "MediaMonitor.c" +#line 1507 "MediaMonitor.c" } -static MonitorableUpdates* media_monitor_real_create_updates (MediaMonitor* self, Monitorable* monitorable) { +static MonitorableUpdates* +media_monitor_real_create_updates (MediaMonitor* self, + Monitorable* monitorable) +{ MonitorableUpdates* result = NULL; - Monitorable* _tmp0_; - MonitorableUpdates* _tmp1_; + MonitorableUpdates* _tmp0_; #line 143 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL); #line 144 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; -#line 144 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = monitorable_updates_new (_tmp0_); + _tmp0_ = monitorable_updates_new (monitorable); #line 144 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - result = _tmp1_; + result = _tmp0_; #line 144 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1311 "MediaMonitor.c" +#line 1525 "MediaMonitor.c" } -MonitorableUpdates* media_monitor_create_updates (MediaMonitor* self, Monitorable* monitorable) { +MonitorableUpdates* +media_monitor_create_updates (MediaMonitor* self, + Monitorable* monitorable) +{ #line 143 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL); #line 143 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->create_updates (self, monitorable); -#line 1320 "MediaMonitor.c" +#line 1537 "MediaMonitor.c" } -static void media_monitor_real_on_media_source_destroyed (MediaMonitor* self, DataSource* source) { - DataSource* _tmp0_; +static void +media_monitor_real_on_media_source_destroyed (MediaMonitor* self, + DataSource* source) +{ #line 147 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 148 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = source; -#line 148 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - media_monitor_remove_updates (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MONITORABLE, Monitorable)); -#line 1332 "MediaMonitor.c" + media_monitor_remove_updates (self, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MONITORABLE, Monitorable)); +#line 1549 "MediaMonitor.c" } -void media_monitor_on_media_source_destroyed (MediaMonitor* self, DataSource* source) { +void +media_monitor_on_media_source_destroyed (MediaMonitor* self, + DataSource* source) +{ #line 147 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 147 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MEDIA_MONITOR_GET_CLASS (self)->on_media_source_destroyed (self, source); -#line 1341 "MediaMonitor.c" +#line 1561 "MediaMonitor.c" } -static void media_monitor_real_notify_discovery_started (MediaMonitor* self) { +static void +media_monitor_real_notify_discovery_started (MediaMonitor* self) +{ } -void media_monitor_notify_discovery_started (MediaMonitor* self) { +void +media_monitor_notify_discovery_started (MediaMonitor* self) +{ #line 155 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 155 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MEDIA_MONITOR_GET_CLASS (self)->notify_discovery_started (self); -#line 1354 "MediaMonitor.c" +#line 1578 "MediaMonitor.c" } -static MediaMonitorDiscoveredFile media_monitor_real_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable) { +static MediaMonitorDiscoveredFile +media_monitor_real_notify_file_discovered (MediaMonitor* self, + GFile* file, + GFileInfo* info, + Monitorable* * monitorable) +{ #line 160 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_discovered'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 160 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return 0; -#line 1363 "MediaMonitor.c" +#line 1592 "MediaMonitor.c" } -MediaMonitorDiscoveredFile media_monitor_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable) { +MediaMonitorDiscoveredFile +media_monitor_notify_file_discovered (MediaMonitor* self, + GFile* file, + GFileInfo* info, + Monitorable* * monitorable) +{ #line 160 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), 0); #line 160 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->notify_file_discovered (self, file, info, monitorable); -#line 1372 "MediaMonitor.c" +#line 1606 "MediaMonitor.c" } -static GeeCollection* media_monitor_real_candidates_for_unknown_file (MediaMonitor* self, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_) { +static GeeCollection* +media_monitor_real_candidates_for_unknown_file (MediaMonitor* self, + GFile* file, + GFileInfo* info, + MediaMonitorDiscoveredFile* _result_) +{ #line 169 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_candidates_for_unknown_file'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 169 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return NULL; -#line 1381 "MediaMonitor.c" +#line 1620 "MediaMonitor.c" } -GeeCollection* media_monitor_candidates_for_unknown_file (MediaMonitor* self, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_) { +GeeCollection* +media_monitor_candidates_for_unknown_file (MediaMonitor* self, + GFile* file, + GFileInfo* info, + MediaMonitorDiscoveredFile* _result_) +{ #line 169 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL); #line 169 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->candidates_for_unknown_file (self, file, info, _result_); -#line 1390 "MediaMonitor.c" +#line 1634 "MediaMonitor.c" } -static GFile** media_monitor_real_get_auxilliary_backing_files (MediaMonitor* self, Monitorable* monitorable, int* result_length1) { +static GFile** +media_monitor_real_get_auxilliary_backing_files (MediaMonitor* self, + Monitorable* monitorable, + int* result_length1) +{ GFile** result = NULL; GFile** _tmp0_; gint _tmp0__length1; @@ -1404,199 +1652,271 @@ static GFile** media_monitor_real_get_auxilliary_backing_files (MediaMonitor* se if (result_length1) { #line 173 "/home/jens/Source/shotwell/src/MediaMonitor.vala" *result_length1 = _tmp0__length1; -#line 1408 "MediaMonitor.c" +#line 1656 "MediaMonitor.c" } #line 173 "/home/jens/Source/shotwell/src/MediaMonitor.vala" result = _tmp0_; #line 173 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1414 "MediaMonitor.c" +#line 1662 "MediaMonitor.c" } -GFile** media_monitor_get_auxilliary_backing_files (MediaMonitor* self, Monitorable* monitorable, int* result_length1) { +GFile** +media_monitor_get_auxilliary_backing_files (MediaMonitor* self, + Monitorable* monitorable, + int* result_length1) +{ #line 172 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL); #line 172 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->get_auxilliary_backing_files (self, monitorable, result_length1); -#line 1423 "MediaMonitor.c" +#line 1675 "MediaMonitor.c" } -static void media_monitor_real_update_backing_file_info (MediaMonitor* self, Monitorable* monitorable, GFile* file, GFileInfo* info) { +static void +media_monitor_real_update_backing_file_info (MediaMonitor* self, + Monitorable* monitorable, + GFile* file, + GFileInfo* info) +{ #line 178 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE (monitorable)); #line 178 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 178 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail ((info == NULL) || G_IS_FILE_INFO (info)); -#line 1434 "MediaMonitor.c" +#line 1691 "MediaMonitor.c" } -void media_monitor_update_backing_file_info (MediaMonitor* self, Monitorable* monitorable, GFile* file, GFileInfo* info) { +void +media_monitor_update_backing_file_info (MediaMonitor* self, + Monitorable* monitorable, + GFile* file, + GFileInfo* info) +{ #line 178 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 178 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MEDIA_MONITOR_GET_CLASS (self)->update_backing_file_info (self, monitorable, file, info); -#line 1443 "MediaMonitor.c" +#line 1705 "MediaMonitor.c" } -static void media_monitor_real_notify_discovery_completing (MediaMonitor* self) { +static void +media_monitor_real_notify_discovery_completing (MediaMonitor* self) +{ } -void media_monitor_notify_discovery_completing (MediaMonitor* self) { +void +media_monitor_notify_discovery_completing (MediaMonitor* self) +{ #line 182 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 182 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MEDIA_MONITOR_GET_CLASS (self)->notify_discovery_completing (self); -#line 1456 "MediaMonitor.c" +#line 1722 "MediaMonitor.c" } -static gboolean media_monitor_real_is_file_represented (MediaMonitor* self, GFile* file) { +static gboolean +media_monitor_real_is_file_represented (MediaMonitor* self, + GFile* file) +{ gboolean _tmp0_ = FALSE; #line 189 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_is_file_represented'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 189 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return _tmp0_; -#line 1466 "MediaMonitor.c" +#line 1735 "MediaMonitor.c" } -gboolean media_monitor_is_file_represented (MediaMonitor* self, GFile* file) { +gboolean +media_monitor_is_file_represented (MediaMonitor* self, + GFile* file) +{ #line 189 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 189 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->is_file_represented (self, file); -#line 1475 "MediaMonitor.c" +#line 1747 "MediaMonitor.c" } -static gboolean media_monitor_real_notify_file_created (MediaMonitor* self, GFile* file, GFileInfo* info) { +static gboolean +media_monitor_real_notify_file_created (MediaMonitor* self, + GFile* file, + GFileInfo* info) +{ gboolean _tmp0_ = FALSE; #line 191 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_created'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 191 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return _tmp0_; -#line 1485 "MediaMonitor.c" +#line 1761 "MediaMonitor.c" } -gboolean media_monitor_notify_file_created (MediaMonitor* self, GFile* file, GFileInfo* info) { +gboolean +media_monitor_notify_file_created (MediaMonitor* self, + GFile* file, + GFileInfo* info) +{ #line 191 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 191 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->notify_file_created (self, file, info); -#line 1494 "MediaMonitor.c" +#line 1774 "MediaMonitor.c" } -static gboolean media_monitor_real_notify_file_moved (MediaMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info) { +static gboolean +media_monitor_real_notify_file_moved (MediaMonitor* self, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info) +{ gboolean _tmp0_ = FALSE; #line 193 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_moved'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 193 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return _tmp0_; -#line 1504 "MediaMonitor.c" +#line 1789 "MediaMonitor.c" } -gboolean media_monitor_notify_file_moved (MediaMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info) { +gboolean +media_monitor_notify_file_moved (MediaMonitor* self, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info) +{ #line 193 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 193 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->notify_file_moved (self, old_file, new_file, new_file_info); -#line 1513 "MediaMonitor.c" +#line 1803 "MediaMonitor.c" } -static gboolean media_monitor_real_notify_file_altered (MediaMonitor* self, GFile* file) { +static gboolean +media_monitor_real_notify_file_altered (MediaMonitor* self, + GFile* file) +{ gboolean _tmp0_ = FALSE; #line 195 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_altered'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 195 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return _tmp0_; -#line 1523 "MediaMonitor.c" +#line 1816 "MediaMonitor.c" } -gboolean media_monitor_notify_file_altered (MediaMonitor* self, GFile* file) { +gboolean +media_monitor_notify_file_altered (MediaMonitor* self, + GFile* file) +{ #line 195 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 195 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->notify_file_altered (self, file); -#line 1532 "MediaMonitor.c" +#line 1828 "MediaMonitor.c" } -static gboolean media_monitor_real_notify_file_attributes_altered (MediaMonitor* self, GFile* file) { +static gboolean +media_monitor_real_notify_file_attributes_altered (MediaMonitor* self, + GFile* file) +{ gboolean _tmp0_ = FALSE; #line 197 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_attributes_altered'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 197 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return _tmp0_; -#line 1542 "MediaMonitor.c" +#line 1841 "MediaMonitor.c" } -gboolean media_monitor_notify_file_attributes_altered (MediaMonitor* self, GFile* file) { +gboolean +media_monitor_notify_file_attributes_altered (MediaMonitor* self, + GFile* file) +{ #line 197 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 197 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->notify_file_attributes_altered (self, file); -#line 1551 "MediaMonitor.c" +#line 1853 "MediaMonitor.c" } -static gboolean media_monitor_real_notify_file_alteration_completed (MediaMonitor* self, GFile* file, GFileInfo* info) { +static gboolean +media_monitor_real_notify_file_alteration_completed (MediaMonitor* self, + GFile* file, + GFileInfo* info) +{ gboolean _tmp0_ = FALSE; #line 199 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_alteration_completed'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 199 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return _tmp0_; -#line 1561 "MediaMonitor.c" +#line 1867 "MediaMonitor.c" } -gboolean media_monitor_notify_file_alteration_completed (MediaMonitor* self, GFile* file, GFileInfo* info) { +gboolean +media_monitor_notify_file_alteration_completed (MediaMonitor* self, + GFile* file, + GFileInfo* info) +{ #line 199 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 199 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->notify_file_alteration_completed (self, file, info); -#line 1570 "MediaMonitor.c" +#line 1880 "MediaMonitor.c" } -static gboolean media_monitor_real_notify_file_deleted (MediaMonitor* self, GFile* file) { +static gboolean +media_monitor_real_notify_file_deleted (MediaMonitor* self, + GFile* file) +{ gboolean _tmp0_ = FALSE; #line 201 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_deleted'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 201 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return _tmp0_; -#line 1580 "MediaMonitor.c" +#line 1893 "MediaMonitor.c" } -gboolean media_monitor_notify_file_deleted (MediaMonitor* self, GFile* file) { +gboolean +media_monitor_notify_file_deleted (MediaMonitor* self, + GFile* file) +{ #line 201 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 201 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return MEDIA_MONITOR_GET_CLASS (self)->notify_file_deleted (self, file); -#line 1589 "MediaMonitor.c" +#line 1905 "MediaMonitor.c" } -void media_monitor_mdbg (const gchar* msg) { +void +media_monitor_mdbg (const gchar* msg) +{ #line 203 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (msg != NULL); -#line 1596 "MediaMonitor.c" +#line 1914 "MediaMonitor.c" } -gboolean media_monitor_has_pending_updates (MediaMonitor* self) { +gboolean +media_monitor_has_pending_updates (MediaMonitor* self) +{ gboolean result = FALSE; GeeHashMap* _tmp0_; gint _tmp1_; @@ -1613,11 +1933,13 @@ gboolean media_monitor_has_pending_updates (MediaMonitor* self) { result = _tmp2_ > 0; #line 210 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1617 "MediaMonitor.c" +#line 1937 "MediaMonitor.c" } -GeeCollection* media_monitor_get_monitorables (MediaMonitor* self) { +GeeCollection* +media_monitor_get_monitorables (MediaMonitor* self) +{ GeeCollection* result = NULL; GeeHashMap* _tmp0_; GeeSet* _tmp1_; @@ -1634,22 +1956,22 @@ GeeCollection* media_monitor_get_monitorables (MediaMonitor* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 214 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1638 "MediaMonitor.c" +#line 1960 "MediaMonitor.c" } -MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, Monitorable* monitorable) { +MonitorableUpdates* +media_monitor_fetch_updates (MediaMonitor* self, + Monitorable* monitorable) +{ MonitorableUpdates* result = NULL; MonitorableUpdates* updates = NULL; GeeHashMap* _tmp0_; - Monitorable* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; + MonitorableUpdates* _tmp2_; MonitorableUpdates* _tmp3_; - Monitorable* _tmp4_; + GeeHashMap* _tmp4_; MonitorableUpdates* _tmp5_; - GeeHashMap* _tmp6_; - Monitorable* _tmp7_; - MonitorableUpdates* _tmp8_; #line 219 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL); #line 219 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1657,50 +1979,46 @@ MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, Monitorable #line 220 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp0_ = self->priv->pending_updates; #line 220 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = monitorable; -#line 220 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), monitorable); #line 220 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - updates = (MonitorableUpdates*) _tmp2_; + updates = (MonitorableUpdates*) _tmp1_; #line 221 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = updates; + _tmp2_ = updates; #line 221 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp3_ != NULL) { + if (_tmp2_ != NULL) { #line 222 "/home/jens/Source/shotwell/src/MediaMonitor.vala" result = updates; #line 222 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1674 "MediaMonitor.c" +#line 1994 "MediaMonitor.c" } #line 224 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp4_ = monitorable; -#line 224 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp5_ = media_monitor_create_updates (self, _tmp4_); + _tmp3_ = media_monitor_create_updates (self, monitorable); #line 224 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_updates_unref0 (updates); #line 224 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - updates = _tmp5_; -#line 225 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp6_ = self->priv->pending_updates; + updates = _tmp3_; #line 225 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp7_ = monitorable; + _tmp4_ = self->priv->pending_updates; #line 225 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp8_ = updates; + _tmp5_ = updates; #line 225 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, _tmp8_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), monitorable, _tmp5_); #line 227 "/home/jens/Source/shotwell/src/MediaMonitor.vala" result = updates; #line 227 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1696 "MediaMonitor.c" +#line 2012 "MediaMonitor.c" } -MonitorableUpdates* media_monitor_get_existing_updates (MediaMonitor* self, Monitorable* monitorable) { +MonitorableUpdates* +media_monitor_get_existing_updates (MediaMonitor* self, + Monitorable* monitorable) +{ MonitorableUpdates* result = NULL; GeeHashMap* _tmp0_; - Monitorable* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 230 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL); #line 230 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1708,20 +2026,20 @@ MonitorableUpdates* media_monitor_get_existing_updates (MediaMonitor* self, Moni #line 231 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp0_ = self->priv->pending_updates; #line 231 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = monitorable; + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), monitorable); #line 231 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 231 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - result = (MonitorableUpdates*) _tmp2_; + result = (MonitorableUpdates*) _tmp1_; #line 231 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1719 "MediaMonitor.c" +#line 2035 "MediaMonitor.c" } -void media_monitor_remove_updates (MediaMonitor* self, Monitorable* monitorable) { +void +media_monitor_remove_updates (MediaMonitor* self, + Monitorable* monitorable) +{ GeeHashMap* _tmp0_; - Monitorable* _tmp1_; #line 234 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 234 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1729,201 +2047,180 @@ void media_monitor_remove_updates (MediaMonitor* self, Monitorable* monitorable) #line 235 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp0_ = self->priv->pending_updates; #line 235 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = monitorable; -#line 235 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL); -#line 1736 "MediaMonitor.c" + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), monitorable, NULL); +#line 2052 "MediaMonitor.c" } -gboolean media_monitor_is_online (MediaMonitor* self, Monitorable* monitorable) { +gboolean +media_monitor_is_online (MediaMonitor* self, + Monitorable* monitorable) +{ gboolean result = FALSE; MonitorableUpdates* updates = NULL; - Monitorable* _tmp0_; - MonitorableUpdates* _tmp1_; - gboolean _tmp2_ = FALSE; - MonitorableUpdates* _tmp3_; + MonitorableUpdates* _tmp0_; + gboolean _tmp1_ = FALSE; + MonitorableUpdates* _tmp2_; #line 238 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 238 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), FALSE); #line 239 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; -#line 239 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = media_monitor_get_existing_updates (self, _tmp0_); + _tmp0_ = media_monitor_get_existing_updates (self, monitorable); #line 239 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - updates = _tmp1_; -#line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = updates; + updates = _tmp0_; #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp3_ != NULL) { -#line 1761 "MediaMonitor.c" - MonitorableUpdates* _tmp4_; - gboolean _tmp5_; + _tmp2_ = updates; #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp4_ = updates; + if (_tmp2_ != NULL) { +#line 2077 "MediaMonitor.c" + MonitorableUpdates* _tmp3_; #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp5_ = monitorable_updates_is_set_online (_tmp4_); + _tmp3_ = updates; #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp5_; -#line 1770 "MediaMonitor.c" + _tmp1_ = monitorable_updates_is_set_online (_tmp3_); +#line 2083 "MediaMonitor.c" } else { - Monitorable* _tmp6_; - gboolean _tmp7_; -#line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp6_ = monitorable; #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp7_ = monitorable_is_offline (_tmp6_); -#line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = !_tmp7_; -#line 1780 "MediaMonitor.c" + _tmp1_ = !monitorable_is_offline (monitorable); +#line 2087 "MediaMonitor.c" } #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - result = _tmp2_; + result = _tmp1_; #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_updates_unref0 (updates); #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1788 "MediaMonitor.c" +#line 2095 "MediaMonitor.c" } -gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable) { +gboolean +media_monitor_is_offline (MediaMonitor* self, + Monitorable* monitorable) +{ gboolean result = FALSE; MonitorableUpdates* updates = NULL; - Monitorable* _tmp0_; - MonitorableUpdates* _tmp1_; - gboolean _tmp2_ = FALSE; - MonitorableUpdates* _tmp3_; + MonitorableUpdates* _tmp0_; + gboolean _tmp1_ = FALSE; + MonitorableUpdates* _tmp2_; #line 244 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 244 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), FALSE); #line 245 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; -#line 245 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = media_monitor_get_existing_updates (self, _tmp0_); + _tmp0_ = media_monitor_get_existing_updates (self, monitorable); #line 245 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - updates = _tmp1_; + updates = _tmp0_; #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = updates; + _tmp2_ = updates; #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp3_ != NULL) { -#line 1813 "MediaMonitor.c" - MonitorableUpdates* _tmp4_; - gboolean _tmp5_; -#line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp4_ = updates; + if (_tmp2_ != NULL) { +#line 2120 "MediaMonitor.c" + MonitorableUpdates* _tmp3_; #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp5_ = monitorable_updates_is_set_offline (_tmp4_); + _tmp3_ = updates; #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp5_; -#line 1822 "MediaMonitor.c" + _tmp1_ = monitorable_updates_is_set_offline (_tmp3_); +#line 2126 "MediaMonitor.c" } else { - Monitorable* _tmp6_; - gboolean _tmp7_; -#line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp6_ = monitorable; #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp7_ = monitorable_is_offline (_tmp6_); -#line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp7_; -#line 1832 "MediaMonitor.c" + _tmp1_ = monitorable_is_offline (monitorable); +#line 2130 "MediaMonitor.c" } #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - result = _tmp2_; + result = _tmp1_; #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_updates_unref0 (updates); #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1840 "MediaMonitor.c" +#line 2138 "MediaMonitor.c" } -GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorable) { +GFile* +media_monitor_get_master_file (MediaMonitor* self, + Monitorable* monitorable) +{ GFile* result = NULL; MonitorableUpdates* updates = NULL; - Monitorable* _tmp0_; - MonitorableUpdates* _tmp1_; - GFile* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - MonitorableUpdates* _tmp4_; + MonitorableUpdates* _tmp0_; + GFile* _tmp1_ = NULL; + gboolean _tmp2_ = FALSE; + MonitorableUpdates* _tmp3_; #line 250 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL); #line 250 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL); #line 251 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; -#line 251 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = media_monitor_get_existing_updates (self, _tmp0_); + _tmp0_ = media_monitor_get_existing_updates (self, monitorable); #line 251 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - updates = _tmp1_; + updates = _tmp0_; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp4_ = updates; + _tmp3_ = updates; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp4_ != NULL) { -#line 1866 "MediaMonitor.c" - MonitorableUpdates* _tmp5_; + if (_tmp3_ != NULL) { +#line 2164 "MediaMonitor.c" + MonitorableUpdates* _tmp4_; + GFile* _tmp5_; GFile* _tmp6_; - GFile* _tmp7_; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp5_ = updates; + _tmp4_ = updates; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp6_ = monitorable_updates_get_master_file (_tmp5_); + _tmp5_ = monitorable_updates_get_master_file (_tmp4_); #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = _tmp7_ != NULL; + _tmp2_ = _tmp6_ != NULL; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_object_unref0 (_tmp7_); -#line 1880 "MediaMonitor.c" + _g_object_unref0 (_tmp6_); +#line 2178 "MediaMonitor.c" } else { #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = FALSE; -#line 1884 "MediaMonitor.c" + _tmp2_ = FALSE; +#line 2182 "MediaMonitor.c" } #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp3_) { -#line 1888 "MediaMonitor.c" - MonitorableUpdates* _tmp8_; - GFile* _tmp9_; + if (_tmp2_) { +#line 2186 "MediaMonitor.c" + MonitorableUpdates* _tmp7_; + GFile* _tmp8_; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp8_ = updates; + _tmp7_ = updates; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp9_ = monitorable_updates_get_master_file (_tmp8_); + _tmp8_ = monitorable_updates_get_master_file (_tmp7_); #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp9_; -#line 1899 "MediaMonitor.c" + _tmp1_ = _tmp8_; +#line 2197 "MediaMonitor.c" } else { - Monitorable* _tmp10_; - GFile* _tmp11_; -#line 254 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp10_ = monitorable; + GFile* _tmp9_; #line 254 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp11_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp9_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (monitorable, TYPE_MEDIA_SOURCE, MediaSource)); #line 254 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 254 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp11_; -#line 1911 "MediaMonitor.c" + _tmp1_ = _tmp9_; +#line 2206 "MediaMonitor.c" } #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - result = _tmp2_; + result = _tmp1_; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_updates_unref0 (updates); #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 1919 "MediaMonitor.c" +#line 2214 "MediaMonitor.c" } -void media_monitor_update_master_file (MediaMonitor* self, Monitorable* monitorable, GFile* file) { - Monitorable* _tmp0_; +void +media_monitor_update_master_file (MediaMonitor* self, + Monitorable* monitorable, + GFile* file) +{ + MonitorableUpdates* _tmp0_; MonitorableUpdates* _tmp1_; - MonitorableUpdates* _tmp2_; - GFile* _tmp3_; #line 257 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 257 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1931,73 +2228,69 @@ void media_monitor_update_master_file (MediaMonitor* self, Monitorable* monitora #line 257 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 258 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; + _tmp0_ = media_monitor_fetch_updates (self, monitorable); #line 258 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = media_monitor_fetch_updates (self, _tmp0_); -#line 258 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp1_; -#line 258 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = file; + _tmp1_ = _tmp0_; #line 258 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_set_master_file (_tmp2_, _tmp3_); + monitorable_updates_set_master_file (_tmp1_, file); #line 258 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 1946 "MediaMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 2239 "MediaMonitor.c" } -void media_monitor_update_master_file_info_altered (MediaMonitor* self, Monitorable* monitorable) { - Monitorable* _tmp0_; +void +media_monitor_update_master_file_info_altered (MediaMonitor* self, + Monitorable* monitorable) +{ + MonitorableUpdates* _tmp0_; MonitorableUpdates* _tmp1_; - MonitorableUpdates* _tmp2_; #line 261 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 261 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE (monitorable)); #line 262 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; -#line 262 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = media_monitor_fetch_updates (self, _tmp0_); + _tmp0_ = media_monitor_fetch_updates (self, monitorable); #line 262 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 262 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_set_master_file_info_altered (_tmp2_, TRUE); + monitorable_updates_set_master_file_info_altered (_tmp1_, TRUE); #line 262 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 1968 "MediaMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 2261 "MediaMonitor.c" } -void media_monitor_update_master_file_in_alteration (MediaMonitor* self, Monitorable* monitorable, gboolean in_alteration) { - Monitorable* _tmp0_; +void +media_monitor_update_master_file_in_alteration (MediaMonitor* self, + Monitorable* monitorable, + gboolean in_alteration) +{ + MonitorableUpdates* _tmp0_; MonitorableUpdates* _tmp1_; - MonitorableUpdates* _tmp2_; - gboolean _tmp3_; #line 265 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 265 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE (monitorable)); #line 266 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; -#line 266 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = media_monitor_fetch_updates (self, _tmp0_); -#line 266 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp1_; + _tmp0_ = media_monitor_fetch_updates (self, monitorable); #line 266 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = in_alteration; + _tmp1_ = _tmp0_; #line 266 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_set_master_in_alteration (_tmp2_, _tmp3_); + monitorable_updates_set_master_in_alteration (_tmp1_, in_alteration); #line 266 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 1993 "MediaMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 2284 "MediaMonitor.c" } -void media_monitor_update_master_file_alterations_completed (MediaMonitor* self, Monitorable* monitorable, GFileInfo* info) { - Monitorable* _tmp0_; +void +media_monitor_update_master_file_alterations_completed (MediaMonitor* self, + Monitorable* monitorable, + GFileInfo* info) +{ + MonitorableUpdates* _tmp0_; MonitorableUpdates* _tmp1_; - MonitorableUpdates* _tmp2_; - GFileInfo* _tmp3_; #line 269 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 269 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2005,74 +2298,76 @@ void media_monitor_update_master_file_alterations_completed (MediaMonitor* self, #line 269 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 270 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; -#line 270 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = media_monitor_fetch_updates (self, _tmp0_); + _tmp0_ = media_monitor_fetch_updates (self, monitorable); #line 270 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp1_; -#line 270 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = info; + _tmp1_ = _tmp0_; #line 270 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_set_master_alterations_complete (_tmp2_, _tmp3_); + monitorable_updates_set_master_alterations_complete (_tmp1_, info); #line 270 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 2020 "MediaMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 2309 "MediaMonitor.c" } -void media_monitor_update_online (MediaMonitor* self, Monitorable* monitorable) { - Monitorable* _tmp0_; +void +media_monitor_update_online (MediaMonitor* self, + Monitorable* monitorable) +{ + MonitorableUpdates* _tmp0_; MonitorableUpdates* _tmp1_; - MonitorableUpdates* _tmp2_; #line 273 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 273 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE (monitorable)); #line 274 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; + _tmp0_ = media_monitor_fetch_updates (self, monitorable); #line 274 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = media_monitor_fetch_updates (self, _tmp0_); -#line 274 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 274 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_mark_online (_tmp2_); + monitorable_updates_mark_online (_tmp1_); #line 274 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 2042 "MediaMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 2331 "MediaMonitor.c" } -void media_monitor_update_offline (MediaMonitor* self, Monitorable* monitorable) { - Monitorable* _tmp0_; +void +media_monitor_update_offline (MediaMonitor* self, + Monitorable* monitorable) +{ + MonitorableUpdates* _tmp0_; MonitorableUpdates* _tmp1_; - MonitorableUpdates* _tmp2_; #line 277 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 277 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MONITORABLE (monitorable)); #line 278 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = monitorable; + _tmp0_ = media_monitor_fetch_updates (self, monitorable); #line 278 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = media_monitor_fetch_updates (self, _tmp0_); -#line 278 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 278 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_mark_offline (_tmp2_); + monitorable_updates_mark_offline (_tmp1_); #line 278 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 2064 "MediaMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 2353 "MediaMonitor.c" } -static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollection* all_updates, TransactionController* controller, gint* op_count, GError** error) { +static void +media_monitor_real_process_updates (MediaMonitor* self, + GeeCollection* all_updates, + TransactionController* controller, + gint* op_count, + GError** error) +{ GeeMap* set_master_file = NULL; GeeMap* set_master_file_info = NULL; GeeArrayList* to_offline = NULL; GeeArrayList* to_online = NULL; - GeeMap* _tmp53_; - GeeMap* _tmp63_; - gboolean _tmp73_ = FALSE; - GeeArrayList* _tmp74_; + GeeMap* _tmp48_; + GeeMap* _tmp57_; + gboolean _tmp66_ = FALSE; + GeeArrayList* _tmp67_; GError * _inner_error_ = NULL; #line 285 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (GEE_IS_COLLECTION (all_updates)); @@ -2086,326 +2381,308 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio to_offline = NULL; #line 290 "/home/jens/Source/shotwell/src/MediaMonitor.vala" to_online = NULL; -#line 2090 "MediaMonitor.c" +#line 2385 "MediaMonitor.c" { GeeIterator* _updates_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; -#line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp0_ = all_updates; + GeeIterator* _tmp0_; #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (all_updates, GEE_TYPE_ITERABLE, GeeIterable)); #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _updates_it = _tmp1_; + _updates_it = _tmp0_; #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" while (TRUE) { -#line 2103 "MediaMonitor.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 2395 "MediaMonitor.c" + GeeIterator* _tmp1_; MonitorableUpdates* updates = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - gint _tmp6_; - MonitorableUpdates* _tmp7_; - GFile* _tmp8_; - GFile* _tmp9_; - gboolean _tmp10_; - MonitorableUpdates* _tmp21_; - GFileInfo* _tmp22_; - GFileInfo* _tmp23_; - gboolean _tmp24_; - MonitorableUpdates* _tmp35_; - gboolean _tmp36_; - MonitorableUpdates* _tmp44_; - gboolean _tmp45_; -#line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = _updates_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + MonitorableUpdates* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; + gboolean _tmp7_; + MonitorableUpdates* _tmp18_; + GFileInfo* _tmp19_; + GFileInfo* _tmp20_; + gboolean _tmp21_; + MonitorableUpdates* _tmp32_; + MonitorableUpdates* _tmp40_; #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _updates_it; #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" break; -#line 2130 "MediaMonitor.c" +#line 2416 "MediaMonitor.c" } #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp4_ = _updates_it; + _tmp2_ = _updates_it; #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - updates = (MonitorableUpdates*) _tmp5_; + updates = (MonitorableUpdates*) _tmp3_; #line 293 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp6_ = *op_count; -#line 293 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp6_ >= MEDIA_MONITOR_MAX_OPERATIONS_PER_CYCLE) { + if ((*op_count) >= MEDIA_MONITOR_MAX_OPERATIONS_PER_CYCLE) { #line 294 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_updates_unref0 (updates); #line 294 "/home/jens/Source/shotwell/src/MediaMonitor.vala" break; -#line 2146 "MediaMonitor.c" +#line 2430 "MediaMonitor.c" } #line 296 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp7_ = updates; + _tmp4_ = updates; #line 296 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp8_ = monitorable_updates_get_master_file (_tmp7_); + _tmp5_ = monitorable_updates_get_master_file (_tmp4_); #line 296 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 296 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp10_ = _tmp9_ != NULL; + _tmp7_ = _tmp6_ != NULL; #line 296 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp6_); #line 296 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp10_) { -#line 2160 "MediaMonitor.c" - GeeMap* _tmp11_; - GeeMap* _tmp13_; - MonitorableUpdates* _tmp14_; - Monitorable* _tmp15_; + if (_tmp7_) { +#line 2444 "MediaMonitor.c" + GeeMap* _tmp8_; + GeeMap* _tmp10_; + MonitorableUpdates* _tmp11_; + Monitorable* _tmp12_; + MonitorableUpdates* _tmp13_; + GFile* _tmp14_; + GFile* _tmp15_; MonitorableUpdates* _tmp16_; - GFile* _tmp17_; - GFile* _tmp18_; - MonitorableUpdates* _tmp19_; - gint _tmp20_; + gint _tmp17_; #line 297 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp11_ = set_master_file; + _tmp8_ = set_master_file; #line 297 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp11_ == NULL) { -#line 2174 "MediaMonitor.c" - GeeHashMap* _tmp12_; + if (_tmp8_ == NULL) { +#line 2458 "MediaMonitor.c" + GeeHashMap* _tmp9_; #line 298 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp12_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp9_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 298 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (set_master_file); #line 298 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - set_master_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_MAP, GeeMap); -#line 2182 "MediaMonitor.c" + set_master_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_MAP, GeeMap); +#line 2466 "MediaMonitor.c" } #line 300 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp13_ = set_master_file; + _tmp10_ = set_master_file; #line 300 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp14_ = updates; + _tmp11_ = updates; #line 300 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp15_ = _tmp14_->monitorable; + _tmp12_ = _tmp11_->monitorable; #line 300 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp16_ = updates; + _tmp13_ = updates; #line 300 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp17_ = monitorable_updates_get_master_file (_tmp16_); + _tmp14_ = monitorable_updates_get_master_file (_tmp13_); #line 300 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp18_ = _tmp17_; + _tmp15_ = _tmp14_; #line 300 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - gee_map_set (_tmp13_, _tmp15_, _tmp18_); + gee_map_set (_tmp10_, _tmp12_, _tmp15_); #line 300 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp15_); #line 301 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp19_ = updates; + _tmp16_ = updates; #line 301 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_set_master_file (_tmp19_, NULL); + monitorable_updates_set_master_file (_tmp16_, NULL); #line 302 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp20_ = *op_count; + _tmp17_ = *op_count; #line 302 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - *op_count = _tmp20_ + 1; -#line 2208 "MediaMonitor.c" + *op_count = _tmp17_ + 1; +#line 2492 "MediaMonitor.c" } #line 305 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp21_ = updates; + _tmp18_ = updates; #line 305 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp22_ = monitorable_updates_get_master_file_info (_tmp21_); + _tmp19_ = monitorable_updates_get_master_file_info (_tmp18_); #line 305 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp23_ = _tmp22_; + _tmp20_ = _tmp19_; #line 305 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp24_ = _tmp23_ != NULL; + _tmp21_ = _tmp20_ != NULL; #line 305 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp20_); #line 305 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp24_) { -#line 2222 "MediaMonitor.c" - GeeMap* _tmp25_; - GeeMap* _tmp27_; - MonitorableUpdates* _tmp28_; - Monitorable* _tmp29_; + if (_tmp21_) { +#line 2506 "MediaMonitor.c" + GeeMap* _tmp22_; + GeeMap* _tmp24_; + MonitorableUpdates* _tmp25_; + Monitorable* _tmp26_; + MonitorableUpdates* _tmp27_; + GFileInfo* _tmp28_; + GFileInfo* _tmp29_; MonitorableUpdates* _tmp30_; - GFileInfo* _tmp31_; - GFileInfo* _tmp32_; - MonitorableUpdates* _tmp33_; - gint _tmp34_; + gint _tmp31_; #line 306 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp25_ = set_master_file_info; + _tmp22_ = set_master_file_info; #line 306 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp25_ == NULL) { -#line 2236 "MediaMonitor.c" - GeeHashMap* _tmp26_; + if (_tmp22_ == NULL) { +#line 2520 "MediaMonitor.c" + GeeHashMap* _tmp23_; #line 307 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp26_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp23_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 307 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (set_master_file_info); #line 307 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - set_master_file_info = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_MAP, GeeMap); -#line 2244 "MediaMonitor.c" + set_master_file_info = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_MAP, GeeMap); +#line 2528 "MediaMonitor.c" } #line 309 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp27_ = set_master_file_info; + _tmp24_ = set_master_file_info; #line 309 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp28_ = updates; + _tmp25_ = updates; #line 309 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp29_ = _tmp28_->monitorable; + _tmp26_ = _tmp25_->monitorable; #line 309 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp30_ = updates; + _tmp27_ = updates; #line 309 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp31_ = monitorable_updates_get_master_file_info (_tmp30_); + _tmp28_ = monitorable_updates_get_master_file_info (_tmp27_); #line 309 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp32_ = _tmp31_; + _tmp29_ = _tmp28_; #line 309 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - gee_map_set (_tmp27_, _tmp29_, _tmp32_); + gee_map_set (_tmp24_, _tmp26_, _tmp29_); #line 309 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_object_unref0 (_tmp32_); + _g_object_unref0 (_tmp29_); #line 310 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp33_ = updates; + _tmp30_ = updates; #line 310 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_set_master_file_info (_tmp33_, NULL); + monitorable_updates_set_master_file_info (_tmp30_, NULL); #line 311 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp34_ = *op_count; + _tmp31_ = *op_count; #line 311 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - *op_count = _tmp34_ + 1; -#line 2270 "MediaMonitor.c" + *op_count = _tmp31_ + 1; +#line 2554 "MediaMonitor.c" } #line 314 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp35_ = updates; -#line 314 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp36_ = monitorable_updates_is_set_offline (_tmp35_); + _tmp32_ = updates; #line 314 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp36_) { -#line 2278 "MediaMonitor.c" - GeeArrayList* _tmp37_; - GeeArrayList* _tmp39_; - MonitorableUpdates* _tmp40_; - Monitorable* _tmp41_; - MonitorableUpdates* _tmp42_; - gint _tmp43_; + if (monitorable_updates_is_set_offline (_tmp32_)) { +#line 2560 "MediaMonitor.c" + GeeArrayList* _tmp33_; + GeeArrayList* _tmp35_; + MonitorableUpdates* _tmp36_; + Monitorable* _tmp37_; + MonitorableUpdates* _tmp38_; + gint _tmp39_; #line 315 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp37_ = to_offline; + _tmp33_ = to_offline; #line 315 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp37_ == NULL) { -#line 2289 "MediaMonitor.c" - GeeArrayList* _tmp38_; + if (_tmp33_ == NULL) { +#line 2571 "MediaMonitor.c" + GeeArrayList* _tmp34_; #line 316 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp38_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp34_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 316 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (to_offline); #line 316 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - to_offline = _tmp38_; -#line 2297 "MediaMonitor.c" + to_offline = _tmp34_; +#line 2579 "MediaMonitor.c" } #line 318 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp39_ = to_offline; + _tmp35_ = to_offline; #line 318 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp40_ = updates; + _tmp36_ = updates; #line 318 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp41_ = _tmp40_->monitorable; + _tmp37_ = _tmp36_->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), _tmp41_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp37_); #line 319 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp42_ = updates; + _tmp38_ = updates; #line 319 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_reset_online_offline (_tmp42_); + monitorable_updates_reset_online_offline (_tmp38_); #line 320 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp43_ = *op_count; + _tmp39_ = *op_count; #line 320 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - *op_count = _tmp43_ + 1; -#line 2315 "MediaMonitor.c" + *op_count = _tmp39_ + 1; +#line 2597 "MediaMonitor.c" } #line 323 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp44_ = updates; + _tmp40_ = updates; #line 323 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp45_ = monitorable_updates_is_set_online (_tmp44_); -#line 323 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp45_) { -#line 2323 "MediaMonitor.c" - GeeArrayList* _tmp46_; - GeeArrayList* _tmp48_; - MonitorableUpdates* _tmp49_; - Monitorable* _tmp50_; - MonitorableUpdates* _tmp51_; - gint _tmp52_; + if (monitorable_updates_is_set_online (_tmp40_)) { +#line 2603 "MediaMonitor.c" + GeeArrayList* _tmp41_; + GeeArrayList* _tmp43_; + MonitorableUpdates* _tmp44_; + Monitorable* _tmp45_; + MonitorableUpdates* _tmp46_; + gint _tmp47_; #line 324 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp46_ = to_online; + _tmp41_ = to_online; #line 324 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp46_ == NULL) { -#line 2334 "MediaMonitor.c" - GeeArrayList* _tmp47_; + if (_tmp41_ == NULL) { +#line 2614 "MediaMonitor.c" + GeeArrayList* _tmp42_; #line 325 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp47_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp42_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 325 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (to_online); #line 325 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - to_online = _tmp47_; -#line 2342 "MediaMonitor.c" + to_online = _tmp42_; +#line 2622 "MediaMonitor.c" } #line 327 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp48_ = to_online; + _tmp43_ = to_online; #line 327 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp49_ = updates; + _tmp44_ = updates; #line 327 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp50_ = _tmp49_->monitorable; + _tmp45_ = _tmp44_->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), _tmp50_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp45_); #line 328 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp51_ = updates; + _tmp46_ = updates; #line 328 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_updates_reset_online_offline (_tmp51_); + monitorable_updates_reset_online_offline (_tmp46_); #line 329 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp52_ = *op_count; + _tmp47_ = *op_count; #line 329 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - *op_count = _tmp52_ + 1; -#line 2360 "MediaMonitor.c" + *op_count = _tmp47_ + 1; +#line 2640 "MediaMonitor.c" } #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_updates_unref0 (updates); -#line 2364 "MediaMonitor.c" +#line 2644 "MediaMonitor.c" } #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (_updates_it); -#line 2368 "MediaMonitor.c" +#line 2648 "MediaMonitor.c" } #line 333 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp53_ = set_master_file; + _tmp48_ = set_master_file; #line 333 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp53_ != NULL) { -#line 2374 "MediaMonitor.c" - GeeMap* _tmp54_; - gint _tmp55_; - gint _tmp56_; - gchar* _tmp57_; - gchar* _tmp58_; - gchar* _tmp59_; - gchar* _tmp60_; - GeeMap* _tmp61_; - TransactionController* _tmp62_; + if (_tmp48_ != NULL) { +#line 2654 "MediaMonitor.c" + GeeMap* _tmp49_; + gint _tmp50_; + gint _tmp51_; + gchar* _tmp52_; + gchar* _tmp53_; + gchar* _tmp54_; + gchar* _tmp55_; + GeeMap* _tmp56_; #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp54_ = set_master_file; + _tmp49_ = set_master_file; #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp55_ = gee_map_get_size (_tmp54_); + _tmp50_ = gee_map_get_size (_tmp49_); #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp56_ = _tmp55_; + _tmp51_ = _tmp50_; #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp57_ = media_monitor_to_string (self); + _tmp52_ = media_monitor_to_string (self); #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp58_ = _tmp57_; + _tmp53_ = _tmp52_; #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp59_ = g_strdup_printf ("Changing master file of %d objects in %s", _tmp56_, _tmp58_); + _tmp54_ = g_strdup_printf ("Changing master file of %d objects in %s", _tmp51_, _tmp53_); #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp60_ = _tmp59_; + _tmp55_ = _tmp54_; #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - media_monitor_mdbg (_tmp60_); + media_monitor_mdbg (_tmp55_); #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_free0 (_tmp60_); + _g_free0 (_tmp55_); #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_free0 (_tmp58_); + _g_free0 (_tmp53_); #line 336 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp61_ = set_master_file; + _tmp56_ = set_master_file; #line 336 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp62_ = controller; -#line 336 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_set_many_master_file (_tmp61_, _tmp62_, &_inner_error_); + monitorable_set_many_master_file (_tmp56_, controller, &_inner_error_); #line 336 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 336 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2420,49 +2697,46 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio _g_object_unref0 (set_master_file); #line 336 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return; -#line 2424 "MediaMonitor.c" +#line 2701 "MediaMonitor.c" } } #line 339 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp63_ = set_master_file_info; + _tmp57_ = set_master_file_info; #line 339 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp63_ != NULL) { -#line 2431 "MediaMonitor.c" - GeeMap* _tmp64_; - gint _tmp65_; - gint _tmp66_; - gchar* _tmp67_; - gchar* _tmp68_; - gchar* _tmp69_; - gchar* _tmp70_; - GeeMap* _tmp71_; - TransactionController* _tmp72_; + if (_tmp57_ != NULL) { +#line 2708 "MediaMonitor.c" + GeeMap* _tmp58_; + gint _tmp59_; + gint _tmp60_; + gchar* _tmp61_; + gchar* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; + GeeMap* _tmp65_; #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp64_ = set_master_file_info; + _tmp58_ = set_master_file_info; #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp65_ = gee_map_get_size (_tmp64_); + _tmp59_ = gee_map_get_size (_tmp58_); #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp66_ = _tmp65_; + _tmp60_ = _tmp59_; #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp67_ = media_monitor_to_string (self); + _tmp61_ = media_monitor_to_string (self); #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp68_ = _tmp67_; + _tmp62_ = _tmp61_; #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp69_ = g_strdup_printf ("Updating %d master files timestamps in %s", _tmp66_, _tmp68_); + _tmp63_ = g_strdup_printf ("Updating %d master files timestamps in %s", _tmp60_, _tmp62_); #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp70_ = _tmp69_; + _tmp64_ = _tmp63_; #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - media_monitor_mdbg (_tmp70_); + media_monitor_mdbg (_tmp64_); #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_free0 (_tmp70_); + _g_free0 (_tmp64_); #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_free0 (_tmp68_); -#line 343 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp71_ = set_master_file_info; + _g_free0 (_tmp62_); #line 343 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp72_ = controller; + _tmp65_ = set_master_file_info; #line 343 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_set_many_master_timestamp (_tmp71_, _tmp72_, &_inner_error_); + monitorable_set_many_master_timestamp (_tmp65_, controller, &_inner_error_); #line 343 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 343 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2477,104 +2751,101 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio _g_object_unref0 (set_master_file); #line 343 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return; -#line 2481 "MediaMonitor.c" +#line 2755 "MediaMonitor.c" } } #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp74_ = to_offline; + _tmp67_ = to_offline; #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp74_ != NULL) { + if (_tmp67_ != NULL) { #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp73_ = TRUE; -#line 2490 "MediaMonitor.c" + _tmp66_ = TRUE; +#line 2764 "MediaMonitor.c" } else { - GeeArrayList* _tmp75_; + GeeArrayList* _tmp68_; #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp75_ = to_online; + _tmp68_ = to_online; #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp73_ = _tmp75_ != NULL; -#line 2497 "MediaMonitor.c" + _tmp66_ = _tmp68_ != NULL; +#line 2771 "MediaMonitor.c" } #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp73_) { -#line 2501 "MediaMonitor.c" - gint _tmp76_ = 0; - GeeArrayList* _tmp77_; - gint _tmp81_ = 0; - GeeArrayList* _tmp82_; - gchar* _tmp86_; - gchar* _tmp87_; - gchar* _tmp88_; - gchar* _tmp89_; - GeeArrayList* _tmp90_; - GeeArrayList* _tmp91_; - TransactionController* _tmp92_; + if (_tmp66_) { +#line 2775 "MediaMonitor.c" + gint _tmp69_ = 0; + GeeArrayList* _tmp70_; + gint _tmp74_ = 0; + GeeArrayList* _tmp75_; + gchar* _tmp79_; + gchar* _tmp80_; + gchar* _tmp81_; + gchar* _tmp82_; + GeeArrayList* _tmp83_; + GeeArrayList* _tmp84_; #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp77_ = to_online; + _tmp70_ = to_online; #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp77_ != NULL) { -#line 2517 "MediaMonitor.c" - GeeArrayList* _tmp78_; - gint _tmp79_; - gint _tmp80_; + if (_tmp70_ != NULL) { +#line 2790 "MediaMonitor.c" + GeeArrayList* _tmp71_; + gint _tmp72_; + gint _tmp73_; #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp78_ = to_online; + _tmp71_ = to_online; #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp79_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp72_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp80_ = _tmp79_; + _tmp73_ = _tmp72_; #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp76_ = _tmp80_; -#line 2529 "MediaMonitor.c" + _tmp69_ = _tmp73_; +#line 2802 "MediaMonitor.c" } else { #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp76_ = 0; -#line 2533 "MediaMonitor.c" + _tmp69_ = 0; +#line 2806 "MediaMonitor.c" } #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp82_ = to_offline; + _tmp75_ = to_offline; #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp82_ != NULL) { -#line 2539 "MediaMonitor.c" - GeeArrayList* _tmp83_; - gint _tmp84_; - gint _tmp85_; + if (_tmp75_ != NULL) { +#line 2812 "MediaMonitor.c" + GeeArrayList* _tmp76_; + gint _tmp77_; + gint _tmp78_; #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp83_ = to_offline; + _tmp76_ = to_offline; #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp84_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp77_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp85_ = _tmp84_; + _tmp78_ = _tmp77_; #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp81_ = _tmp85_; -#line 2551 "MediaMonitor.c" + _tmp74_ = _tmp78_; +#line 2824 "MediaMonitor.c" } else { #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp81_ = 0; -#line 2555 "MediaMonitor.c" + _tmp74_ = 0; +#line 2828 "MediaMonitor.c" } #line 347 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp86_ = media_monitor_to_string (self); + _tmp79_ = media_monitor_to_string (self); #line 347 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp87_ = _tmp86_; + _tmp80_ = _tmp79_; #line 347 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp88_ = g_strdup_printf ("Marking %d online, %d offline in %s", _tmp76_, _tmp81_, _tmp87_); + _tmp81_ = g_strdup_printf ("Marking %d online, %d offline in %s", _tmp69_, _tmp74_, _tmp80_); #line 347 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp89_ = _tmp88_; + _tmp82_ = _tmp81_; #line 347 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - media_monitor_mdbg (_tmp89_); + media_monitor_mdbg (_tmp82_); #line 347 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_free0 (_tmp89_); + _g_free0 (_tmp82_); #line 347 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_free0 (_tmp87_); + _g_free0 (_tmp80_); #line 352 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp90_ = to_online; + _tmp83_ = to_online; #line 352 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp91_ = to_offline; + _tmp84_ = to_offline; #line 352 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp92_ = controller; -#line 352 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable_mark_many_online_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, GEE_TYPE_COLLECTION, GeeCollection), _tmp92_, &_inner_error_); + monitorable_mark_many_online_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, GEE_TYPE_COLLECTION, GeeCollection), controller, &_inner_error_); #line 352 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 352 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2589,7 +2860,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio _g_object_unref0 (set_master_file); #line 352 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return; -#line 2593 "MediaMonitor.c" +#line 2864 "MediaMonitor.c" } } #line 285 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2600,322 +2871,320 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio _g_object_unref0 (set_master_file_info); #line 285 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (set_master_file); -#line 2604 "MediaMonitor.c" +#line 2875 "MediaMonitor.c" } -void media_monitor_process_updates (MediaMonitor* self, GeeCollection* all_updates, TransactionController* controller, gint* op_count, GError** error) { +void +media_monitor_process_updates (MediaMonitor* self, + GeeCollection* all_updates, + TransactionController* controller, + gint* op_count, + GError** error) +{ #line 285 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 285 "/home/jens/Source/shotwell/src/MediaMonitor.vala" MEDIA_MONITOR_GET_CLASS (self)->process_updates (self, all_updates, controller, op_count, error); -#line 2613 "MediaMonitor.c" +#line 2890 "MediaMonitor.c" } -static gpointer _transaction_controller_ref0 (gpointer self) { +static gpointer +_transaction_controller_ref0 (gpointer self) +{ #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return self ? transaction_controller_ref (self) : NULL; -#line 2620 "MediaMonitor.c" +#line 2899 "MediaMonitor.c" } -static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { +static gboolean +media_monitor_on_flush_pending_updates (MediaMonitor* self) +{ gboolean result = FALSE; GCancellable* _tmp0_; - gboolean _tmp1_; - GeeHashMap* _tmp2_; + GeeHashMap* _tmp1_; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; GTimer* timer = NULL; - GTimer* _tmp5_; + GTimer* _tmp4_; GeeArrayList* to_process = NULL; GeeArrayList* to_remove = NULL; gint op_count = 0; - GeeArrayList* _tmp29_; - GeeArrayList* _tmp47_; + GeeArrayList* _tmp25_; + GeeArrayList* _tmp43_; gdouble elapsed = 0.0; - GTimer* _tmp60_; - gdouble _tmp61_; - gboolean _tmp62_ = FALSE; - gdouble _tmp63_; + GTimer* _tmp56_; + gdouble _tmp57_; + gboolean _tmp58_ = FALSE; + gdouble _tmp59_; GError * _inner_error_ = NULL; #line 356 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 357 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp0_ = self->priv->cancellable; #line 357 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp1_ = g_cancellable_is_cancelled (_tmp0_); -#line 357 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp1_) { + if (g_cancellable_is_cancelled (_tmp0_)) { #line 358 "/home/jens/Source/shotwell/src/MediaMonitor.vala" result = FALSE; #line 358 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 2656 "MediaMonitor.c" +#line 2934 "MediaMonitor.c" } #line 360 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp2_ = self->priv->pending_updates; + _tmp1_ = self->priv->pending_updates; #line 360 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp3_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp2_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 360 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 360 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp4_ == 0) { + if (_tmp3_ == 0) { #line 361 "/home/jens/Source/shotwell/src/MediaMonitor.vala" result = TRUE; #line 361 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 2670 "MediaMonitor.c" +#line 2948 "MediaMonitor.c" } #line 363 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp5_ = g_timer_new (); + _tmp4_ = g_timer_new (); #line 363 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - timer = _tmp5_; + timer = _tmp4_; #line 368 "/home/jens/Source/shotwell/src/MediaMonitor.vala" to_process = NULL; #line 369 "/home/jens/Source/shotwell/src/MediaMonitor.vala" to_remove = NULL; -#line 2680 "MediaMonitor.c" +#line 2958 "MediaMonitor.c" { GeeIterator* _updates_it = NULL; - GeeHashMap* _tmp6_; + GeeHashMap* _tmp5_; + GeeCollection* _tmp6_; GeeCollection* _tmp7_; GeeCollection* _tmp8_; - GeeCollection* _tmp9_; + GeeIterator* _tmp9_; GeeIterator* _tmp10_; - GeeIterator* _tmp11_; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp6_ = self->priv->pending_updates; + _tmp5_ = self->priv->pending_updates; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp7_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp6_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _updates_it = _tmp11_; + _updates_it = _tmp10_; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" while (TRUE) { -#line 2707 "MediaMonitor.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 2985 "MediaMonitor.c" + GeeIterator* _tmp11_; MonitorableUpdates* updates = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; - MonitorableUpdates* _tmp16_; - gboolean _tmp17_; - MonitorableUpdates* _tmp18_; - gboolean _tmp19_; - GeeArrayList* _tmp25_; - GeeArrayList* _tmp27_; - MonitorableUpdates* _tmp28_; -#line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp12_ = _updates_it; + GeeIterator* _tmp12_; + gpointer _tmp13_; + MonitorableUpdates* _tmp14_; + MonitorableUpdates* _tmp15_; + GeeArrayList* _tmp21_; + GeeArrayList* _tmp23_; + MonitorableUpdates* _tmp24_; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp13_ = gee_iterator_next (_tmp12_); + _tmp11_ = _updates_it; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp11_)) { #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" break; -#line 2728 "MediaMonitor.c" +#line 3001 "MediaMonitor.c" } #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp14_ = _updates_it; + _tmp12_ = _updates_it; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - updates = (MonitorableUpdates*) _tmp15_; -#line 371 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp16_ = updates; + updates = (MonitorableUpdates*) _tmp13_; #line 371 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp17_ = monitorable_updates_is_in_alteration (_tmp16_); + _tmp14_ = updates; #line 371 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp17_) { + if (monitorable_updates_is_in_alteration (_tmp14_)) { #line 372 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_updates_unref0 (updates); #line 372 "/home/jens/Source/shotwell/src/MediaMonitor.vala" continue; -#line 2746 "MediaMonitor.c" +#line 3017 "MediaMonitor.c" } #line 374 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp18_ = updates; -#line 374 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp19_ = monitorable_updates_is_all_updated (_tmp18_); + _tmp15_ = updates; #line 374 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp19_) { -#line 2754 "MediaMonitor.c" - GeeArrayList* _tmp20_; - GeeArrayList* _tmp22_; - MonitorableUpdates* _tmp23_; - Monitorable* _tmp24_; + if (monitorable_updates_is_all_updated (_tmp15_)) { +#line 3023 "MediaMonitor.c" + GeeArrayList* _tmp16_; + GeeArrayList* _tmp18_; + MonitorableUpdates* _tmp19_; + Monitorable* _tmp20_; #line 375 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp20_ = to_remove; + _tmp16_ = to_remove; #line 375 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp20_ == NULL) { -#line 2763 "MediaMonitor.c" - GeeArrayList* _tmp21_; + if (_tmp16_ == NULL) { +#line 3032 "MediaMonitor.c" + GeeArrayList* _tmp17_; #line 376 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp21_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp17_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 376 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (to_remove); #line 376 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - to_remove = _tmp21_; -#line 2771 "MediaMonitor.c" + to_remove = _tmp17_; +#line 3040 "MediaMonitor.c" } #line 378 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp22_ = to_remove; + _tmp18_ = to_remove; #line 378 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp23_ = updates; + _tmp19_ = updates; #line 378 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp24_ = _tmp23_->monitorable; + _tmp20_ = _tmp19_->monitorable; #line 378 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_); #line 379 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_updates_unref0 (updates); #line 379 "/home/jens/Source/shotwell/src/MediaMonitor.vala" continue; -#line 2785 "MediaMonitor.c" +#line 3054 "MediaMonitor.c" } #line 382 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp25_ = to_process; + _tmp21_ = to_process; #line 382 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp25_ == NULL) { -#line 2791 "MediaMonitor.c" - GeeArrayList* _tmp26_; + if (_tmp21_ == NULL) { +#line 3060 "MediaMonitor.c" + GeeArrayList* _tmp22_; #line 383 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp26_ = gee_array_list_new (TYPE_MONITORABLE_UPDATES, (GBoxedCopyFunc) monitorable_updates_ref, (GDestroyNotify) monitorable_updates_unref, NULL, NULL, NULL); + _tmp22_ = gee_array_list_new (TYPE_MONITORABLE_UPDATES, (GBoxedCopyFunc) monitorable_updates_ref, (GDestroyNotify) monitorable_updates_unref, NULL, NULL, NULL); #line 383 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (to_process); #line 383 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - to_process = _tmp26_; -#line 2799 "MediaMonitor.c" + to_process = _tmp22_; +#line 3068 "MediaMonitor.c" } #line 385 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp27_ = to_process; + _tmp23_ = to_process; #line 385 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp28_ = updates; + _tmp24_ = updates; #line 385 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_); #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_updates_unref0 (updates); -#line 2809 "MediaMonitor.c" +#line 3078 "MediaMonitor.c" } #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (_updates_it); -#line 2813 "MediaMonitor.c" +#line 3082 "MediaMonitor.c" } #line 388 "/home/jens/Source/shotwell/src/MediaMonitor.vala" op_count = 0; #line 389 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp29_ = to_process; + _tmp25_ = to_process; #line 389 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp29_ != NULL) { -#line 2821 "MediaMonitor.c" + if (_tmp25_ != NULL) { +#line 3090 "MediaMonitor.c" TransactionController* controller = NULL; - MediaSourceCollection* _tmp30_; - MediaSourceCollection* _tmp31_; - TransactionController* _tmp32_; - TransactionController* _tmp33_; - TransactionController* _tmp34_; - TransactionController* _tmp35_; + MediaSourceCollection* _tmp26_; + MediaSourceCollection* _tmp27_; + TransactionController* _tmp28_; + TransactionController* _tmp29_; + TransactionController* _tmp30_; + TransactionController* _tmp31_; #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp30_ = media_monitor_get_media_source_collection (self); + _tmp26_ = media_monitor_get_media_source_collection (self); #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp31_ = _tmp30_; + _tmp27_ = _tmp26_; #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp32_ = media_source_collection_get_transaction_controller (_tmp31_); + _tmp28_ = media_source_collection_get_transaction_controller (_tmp27_); #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp33_ = _tmp32_; + _tmp29_ = _tmp28_; #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp34_ = _transaction_controller_ref0 (_tmp33_); + _tmp30_ = _transaction_controller_ref0 (_tmp29_); #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp35_ = _tmp34_; + _tmp31_ = _tmp30_; #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _data_collection_unref0 (_tmp31_); + _data_collection_unref0 (_tmp27_); #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - controller = _tmp35_; -#line 2845 "MediaMonitor.c" + controller = _tmp31_; +#line 3114 "MediaMonitor.c" { - TransactionController* _tmp36_; - GeeArrayList* _tmp37_; - TransactionController* _tmp38_; - TransactionController* _tmp39_; + TransactionController* _tmp32_; + GeeArrayList* _tmp33_; + TransactionController* _tmp34_; + TransactionController* _tmp35_; #line 393 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp36_ = controller; + _tmp32_ = controller; #line 393 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - transaction_controller_begin (_tmp36_); + transaction_controller_begin (_tmp32_); #line 394 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp37_ = to_process; + _tmp33_ = to_process; #line 394 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp38_ = controller; + _tmp34_ = controller; #line 394 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - media_monitor_process_updates (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection), _tmp38_, &op_count, &_inner_error_); + media_monitor_process_updates (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), _tmp34_, &op_count, &_inner_error_); #line 394 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2863 "MediaMonitor.c" +#line 3132 "MediaMonitor.c" goto __catch594_g_error; } #line 395 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp39_ = controller; + _tmp35_ = controller; #line 395 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - transaction_controller_commit (_tmp39_); -#line 2870 "MediaMonitor.c" + transaction_controller_commit (_tmp35_); +#line 3139 "MediaMonitor.c" } goto __finally594; __catch594_g_error: { GError* err = NULL; - GError* _tmp40_; + GError* _tmp36_; #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" err = _inner_error_; #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _inner_error_ = NULL; #line 397 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp40_ = err; + _tmp36_ = err; #line 397 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp40_->domain == DATABASE_ERROR) { -#line 2885 "MediaMonitor.c" - GError* _tmp41_; + if (_tmp36_->domain == DATABASE_ERROR) { +#line 3154 "MediaMonitor.c" + GError* _tmp37_; #line 398 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp41_ = err; + _tmp37_ = err; #line 398 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - app_window_database_error ((GError*) _tmp41_); -#line 2891 "MediaMonitor.c" + app_window_database_error ((GError*) _tmp37_); +#line 3160 "MediaMonitor.c" } else { - GError* _tmp42_; - const gchar* _tmp43_; - gchar* _tmp44_; - gchar* _tmp45_; + GError* _tmp38_; + const gchar* _tmp39_; + gchar* _tmp40_; + gchar* _tmp41_; #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp42_ = err; + _tmp38_ = err; #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp43_ = _tmp42_->message; + _tmp39_ = _tmp38_->message; #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp44_ = g_strdup_printf (_ ("Unable to process monitoring updates: %s"), _tmp43_); + _tmp40_ = g_strdup_printf (_ ("Unable to process monitoring updates: %s"), _tmp39_); #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp45_ = _tmp44_; + _tmp41_ = _tmp40_; #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - app_window_panic (_tmp45_); + app_window_panic (_tmp41_); #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_free0 (_tmp45_); -#line 2909 "MediaMonitor.c" + _g_free0 (_tmp41_); +#line 3178 "MediaMonitor.c" } #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_error_free0 (err); -#line 2913 "MediaMonitor.c" +#line 3182 "MediaMonitor.c" } __finally594: #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2918 "MediaMonitor.c" - gboolean _tmp46_ = FALSE; +#line 3187 "MediaMonitor.c" + gboolean _tmp42_ = FALSE; #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _transaction_controller_unref0 (controller); #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2929,138 +3198,138 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_clear_error (&_inner_error_); #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - return _tmp46_; -#line 2934 "MediaMonitor.c" + return _tmp42_; +#line 3203 "MediaMonitor.c" } #line 389 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _transaction_controller_unref0 (controller); -#line 2938 "MediaMonitor.c" +#line 3207 "MediaMonitor.c" } #line 404 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp47_ = to_remove; + _tmp43_ = to_remove; #line 404 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp47_ != NULL) { -#line 2944 "MediaMonitor.c" + if (_tmp43_ != NULL) { +#line 3213 "MediaMonitor.c" { GeeArrayList* _monitorable_list = NULL; - GeeArrayList* _tmp48_; - GeeArrayList* _tmp49_; + GeeArrayList* _tmp44_; + GeeArrayList* _tmp45_; gint _monitorable_size = 0; - GeeArrayList* _tmp50_; - gint _tmp51_; - gint _tmp52_; + GeeArrayList* _tmp46_; + gint _tmp47_; + gint _tmp48_; gint _monitorable_index = 0; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp48_ = to_remove; + _tmp44_ = to_remove; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp49_ = _g_object_ref0 (_tmp48_); + _tmp45_ = _g_object_ref0 (_tmp44_); #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_list = _tmp49_; + _monitorable_list = _tmp45_; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp50_ = _monitorable_list; + _tmp46_ = _monitorable_list; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp51_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp47_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp52_ = _tmp51_; + _tmp48_ = _tmp47_; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_size = _tmp52_; + _monitorable_size = _tmp48_; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_index = -1; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" while (TRUE) { -#line 2972 "MediaMonitor.c" - gint _tmp53_; - gint _tmp54_; - gint _tmp55_; +#line 3241 "MediaMonitor.c" + gint _tmp49_; + gint _tmp50_; + gint _tmp51_; Monitorable* monitorable = NULL; - GeeArrayList* _tmp56_; - gint _tmp57_; - gpointer _tmp58_; - Monitorable* _tmp59_; + GeeArrayList* _tmp52_; + gint _tmp53_; + gpointer _tmp54_; + Monitorable* _tmp55_; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp53_ = _monitorable_index; + _tmp49_ = _monitorable_index; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_index = _tmp53_ + 1; + _monitorable_index = _tmp49_ + 1; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp54_ = _monitorable_index; + _tmp50_ = _monitorable_index; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp55_ = _monitorable_size; + _tmp51_ = _monitorable_size; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (!(_tmp54_ < _tmp55_)) { + if (!(_tmp50_ < _tmp51_)) { #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" break; -#line 2993 "MediaMonitor.c" +#line 3262 "MediaMonitor.c" } #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp56_ = _monitorable_list; + _tmp52_ = _monitorable_list; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp57_ = _monitorable_index; + _tmp53_ = _monitorable_index; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp58_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp57_); + _tmp54_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp53_); #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable = (Monitorable*) _tmp58_; + monitorable = (Monitorable*) _tmp54_; #line 406 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp59_ = monitorable; + _tmp55_ = monitorable; #line 406 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - media_monitor_remove_updates (self, _tmp59_); + media_monitor_remove_updates (self, _tmp55_); #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (monitorable); -#line 3009 "MediaMonitor.c" +#line 3278 "MediaMonitor.c" } #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (_monitorable_list); -#line 3013 "MediaMonitor.c" +#line 3282 "MediaMonitor.c" } } #line 409 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp60_ = timer; + _tmp56_ = timer; #line 409 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp61_ = g_timer_elapsed (_tmp60_, NULL); + _tmp57_ = g_timer_elapsed (_tmp56_, NULL); #line 409 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - elapsed = _tmp61_; + elapsed = _tmp57_; #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp63_ = elapsed; + _tmp59_ = elapsed; #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp63_ > 0.01) { + if (_tmp59_ > 0.01) { #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp62_ = TRUE; -#line 3028 "MediaMonitor.c" + _tmp58_ = TRUE; +#line 3297 "MediaMonitor.c" } else { - gint _tmp64_; + gint _tmp60_; #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp64_ = op_count; + _tmp60_ = op_count; #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp62_ = _tmp64_ > 0; -#line 3035 "MediaMonitor.c" + _tmp58_ = _tmp60_ > 0; +#line 3304 "MediaMonitor.c" } #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp62_) { -#line 3039 "MediaMonitor.c" + if (_tmp58_) { +#line 3308 "MediaMonitor.c" + gchar* _tmp61_; + gchar* _tmp62_; + gdouble _tmp63_; + gint _tmp64_; gchar* _tmp65_; gchar* _tmp66_; - gdouble _tmp67_; - gint _tmp68_; - gchar* _tmp69_; - gchar* _tmp70_; -#line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp65_ = media_monitor_to_string (self); #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp66_ = _tmp65_; + _tmp61_ = media_monitor_to_string (self); #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp67_ = elapsed; + _tmp62_ = _tmp61_; #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp68_ = op_count; + _tmp63_ = elapsed; #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp69_ = g_strdup_printf ("Total pending queue time for %s: %lf (%d ops)", _tmp66_, _tmp67_, _tmp68_); + _tmp64_ = op_count; #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp70_ = _tmp69_; + _tmp65_ = g_strdup_printf ("Total pending queue time for %s: %lf (%d ops)", _tmp62_, _tmp63_, _tmp64_); #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - media_monitor_mdbg (_tmp70_); + _tmp66_ = _tmp65_; #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_free0 (_tmp70_); + media_monitor_mdbg (_tmp66_); #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_free0 (_tmp66_); -#line 3064 "MediaMonitor.c" +#line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" + _g_free0 (_tmp62_); +#line 3333 "MediaMonitor.c" } #line 415 "/home/jens/Source/shotwell/src/MediaMonitor.vala" result = TRUE; @@ -3072,11 +3341,13 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { _g_timer_destroy0 (timer); #line 415 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 3076 "MediaMonitor.c" +#line 3345 "MediaMonitor.c" } -static void media_monitor_class_init (MediaMonitorClass * klass) { +static void +media_monitor_class_init (MediaMonitorClass * klass) +{ #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" media_monitor_parent_class = g_type_class_peek_parent (klass); #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -3121,11 +3392,13 @@ static void media_monitor_class_init (MediaMonitorClass * klass) { ((MediaMonitorClass *) klass)->process_updates = (void (*) (MediaMonitor *, GeeCollection*, TransactionController*, gint*, GError**)) media_monitor_real_process_updates; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" G_OBJECT_CLASS (klass)->finalize = media_monitor_finalize; -#line 3125 "MediaMonitor.c" +#line 3396 "MediaMonitor.c" } -static void media_monitor_instance_init (MediaMonitor * self) { +static void +media_monitor_instance_init (MediaMonitor * self) +{ GeeHashMap* _tmp0_; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->priv = MEDIA_MONITOR_GET_PRIVATE (self); @@ -3135,11 +3408,13 @@ static void media_monitor_instance_init (MediaMonitor * self) { self->priv->pending_updates = _tmp0_; #line 116 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->priv->pending_updates_timer_id = (guint) 0; -#line 3139 "MediaMonitor.c" +#line 3412 "MediaMonitor.c" } -static void media_monitor_finalize (GObject * obj) { +static void +media_monitor_finalize (GObject * obj) +{ MediaMonitor * self; MediaSourceCollection* _tmp0_; guint _tmp1_; @@ -3167,11 +3442,13 @@ static void media_monitor_finalize (GObject * obj) { _g_object_unref0 (self->priv->pending_updates); #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" G_OBJECT_CLASS (media_monitor_parent_class)->finalize (obj); -#line 3171 "MediaMonitor.c" +#line 3446 "MediaMonitor.c" } -GType media_monitor_get_type (void) { +GType +media_monitor_get_type (void) +{ static volatile gsize media_monitor_type_id__volatile = 0; if (g_once_init_enter (&media_monitor_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MediaMonitorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) media_monitor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MediaMonitor), 0, (GInstanceInitFunc) media_monitor_instance_init, NULL }; diff --git a/src/MediaPage.c b/src/MediaPage.c index ae79f6f..ba4e472 100644 --- a/src/MediaPage.c +++ b/src/MediaPage.c @@ -1,4 +1,4 @@ -/* MediaPage.c generated by valac 0.36.6, the Vala compiler +/* MediaPage.c generated by valac 0.40.4, the Vala compiler * generated from MediaPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -110,6 +111,11 @@ typedef struct _Dimensions Dimensions; typedef struct _MediaSourceItem MediaSourceItem; typedef struct _MediaSourceItemClass MediaSourceItemClass; typedef struct _MediaSourceItemPrivate MediaSourceItemPrivate; +enum { + MEDIA_SOURCE_ITEM_0_PROPERTY, + MEDIA_SOURCE_ITEM_NUM_PROPERTIES +}; +static GParamSpec* media_source_item_properties[MEDIA_SOURCE_ITEM_NUM_PROPERTIES]; #define _g_free0(var) (var = (g_free (var), NULL)) #define TYPE_THUMBNAIL_SOURCE (thumbnail_source_get_type ()) @@ -266,6 +272,11 @@ typedef struct _DragAndDropHandlerClass DragAndDropHandlerClass; typedef struct _MediaViewTracker MediaViewTracker; typedef struct _MediaViewTrackerClass MediaViewTrackerClass; +enum { + MEDIA_PAGE_0_PROPERTY, + MEDIA_PAGE_NUM_PROPERTIES +}; +static GParamSpec* media_page_properties[MEDIA_PAGE_NUM_PROPERTIES]; #define MEDIA_PAGE_TYPE_SORT_BY (media_page_sort_by_get_type ()) #define _drag_and_drop_handler_unref0(var) ((var == NULL) ? NULL : (var = (drag_and_drop_handler_unref (var), NULL))) @@ -649,11 +660,16 @@ typedef struct _SetRawDeveloperCommandClass SetRawDeveloperCommandClass; typedef struct _CheckerboardLayout CheckerboardLayout; typedef struct _CheckerboardLayoutClass CheckerboardLayoutClass; typedef struct _MediaPageZoomSliderAssemblyPrivate MediaPageZoomSliderAssemblyPrivate; +enum { + MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_0_PROPERTY, + MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_NUM_PROPERTIES +}; +static GParamSpec* media_page_zoom_slider_assembly_properties[MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_NUM_PROPERTIES]; enum { MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_ZOOM_CHANGED_SIGNAL, - MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_LAST_SIGNAL + MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_NUM_SIGNALS }; -static guint media_page_zoom_slider_assembly_signals[MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_LAST_SIGNAL] = {0}; +static guint media_page_zoom_slider_assembly_signals[MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -954,16 +970,28 @@ static gpointer media_page_zoom_slider_assembly_parent_class = NULL; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_view_get_type (void) G_GNUC_CONST; @@ -975,25 +1003,60 @@ Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); GType media_source_item_get_type (void) G_GNUC_CONST; #define MEDIA_SOURCE_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MEDIA_SOURCE_ITEM, MediaSourceItemPrivate)) -enum { - MEDIA_SOURCE_ITEM_DUMMY_PROPERTY -}; GType thumbnail_source_get_type (void) G_GNUC_CONST; -MediaSourceItem* media_source_item_new (ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment); -MediaSourceItem* media_source_item_construct (GType object_type, ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment); -CheckerboardItem* checkerboard_item_construct (GType object_type, ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment); -GdkPixbuf* resources_load_icon (const gchar* name, gint scale); -static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin); -void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result); -void checkerboard_item_set_horizontal_trinket_offset (CheckerboardItem* self, gint horizontal_trinket_offset); +MediaSourceItem* media_source_item_new (ThumbnailSource* source, + Dimensions* initial_pixbuf_dim, + const gchar* title, + const gchar* comment, + gboolean marked_up, + PangoAlignment alignment); +MediaSourceItem* media_source_item_construct (GType object_type, + ThumbnailSource* source, + Dimensions* initial_pixbuf_dim, + const gchar* title, + const gchar* comment, + gboolean marked_up, + PangoAlignment alignment); +CheckerboardItem* checkerboard_item_construct (GType object_type, + ThumbnailSource* source, + Dimensions* initial_pixbuf_dim, + const gchar* title, + const gchar* comment, + gboolean marked_up, + PangoAlignment alignment); +GdkPixbuf* resources_load_icon (const gchar* name, + gint scale); +static void media_source_item_real_paint_image (CheckerboardItem* base, + cairo_t* ctx, + GdkPixbuf* pixbuf, + GdkPoint* origin); +void dimensions_for_pixbuf (GdkPixbuf* pixbuf, + Dimensions* result); +void checkerboard_item_set_horizontal_trinket_offset (CheckerboardItem* self, + gint horizontal_trinket_offset); gint dimensions_major_axis (Dimensions *self); GType thumbnail_cache_size_get_type (void) G_GNUC_CONST; -void checkerboard_item_paint_image (CheckerboardItem* self, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin); -void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, GdkPoint* item_origin, Dimensions* item_dimensions); -void media_source_item_paint_one_sprocket (MediaSourceItem* self, cairo_t* ctx, GdkPoint* origin); -void media_source_item_set_enable_sprockets (MediaSourceItem* self, gboolean enable_sprockets); -void media_source_item_set_title (MediaSourceItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment); -void checkerboard_item_set_title (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment); +void checkerboard_item_paint_image (CheckerboardItem* self, + cairo_t* ctx, + GdkPixbuf* pixbuf, + GdkPoint* origin); +void media_source_item_paint_sprockets (MediaSourceItem* self, + cairo_t* ctx, + GdkPoint* item_origin, + Dimensions* item_dimensions); +void media_source_item_paint_one_sprocket (MediaSourceItem* self, + cairo_t* ctx, + GdkPoint* origin); +void media_source_item_set_enable_sprockets (MediaSourceItem* self, + gboolean enable_sprockets); +void media_source_item_set_title (MediaSourceItem* self, + const gchar* text, + gboolean marked_up, + PangoAlignment alignment); +void checkerboard_item_set_title (CheckerboardItem* self, + const gchar* text, + gboolean marked_up, + PangoAlignment alignment); gchar* media_source_item_get_natural_collation_key (MediaSourceItem* self); gchar* natural_collate_collate_key (gchar* str); gchar* checkerboard_item_get_title (CheckerboardItem* self); @@ -1003,9 +1066,15 @@ GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType checkerboard_page_get_type (void) G_GNUC_CONST; @@ -1015,17 +1084,29 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self); gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType search_view_filter_get_type (void) G_GNUC_CONST; gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; @@ -1035,89 +1116,174 @@ GType raw_developer_get_type (void) G_GNUC_CONST; GType media_page_zoom_slider_assembly_get_type (void) G_GNUC_CONST; gpointer drag_and_drop_handler_ref (gpointer instance); void drag_and_drop_handler_unref (gpointer instance); -GParamSpec* param_spec_drag_and_drop_handler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_drag_and_drop_handler (GValue* value, gpointer v_object); -void value_take_drag_and_drop_handler (GValue* value, gpointer v_object); +GParamSpec* param_spec_drag_and_drop_handler (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_drag_and_drop_handler (GValue* value, + gpointer v_object); +void value_take_drag_and_drop_handler (GValue* value, + gpointer v_object); gpointer value_get_drag_and_drop_handler (const GValue* value); GType drag_and_drop_handler_get_type (void) G_GNUC_CONST; GType media_view_tracker_get_type (void) G_GNUC_CONST; #define MEDIA_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MEDIA_PAGE, MediaPagePrivate)) -enum { - MEDIA_PAGE_DUMMY_PROPERTY -}; GType media_page_sort_by_get_type (void) G_GNUC_CONST; #define MEDIA_PAGE_SORT_ORDER_ASCENDING 0 #define MEDIA_PAGE_SORT_ORDER_DESCENDING 1 #define MEDIA_PAGE_MANUAL_STEPPING 16 #define MEDIA_PAGE_SLIDER_STEPPING 4 void media_page_on_export (MediaPage* self); -static void _media_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void media_page_on_send_to (MediaPage* self); -static void _media_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void media_page_on_remove_from_library (MediaPage* self); -static void _media_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void media_page_on_move_to_trash (MediaPage* self); -static void _media_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void media_page_on_new_event (MediaPage* self); -static void _media_page_on_new_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_new_event_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void media_page_on_add_tags (MediaPage* self); -static void _media_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void media_page_on_modify_tags (MediaPage* self); -static void _media_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void media_page_on_increase_size (MediaPage* self); -static void _media_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void media_page_on_decrease_size (MediaPage* self); -static void _media_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void media_page_on_flag_unflag (MediaPage* self); -static void _media_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void media_page_on_increase_rating (MediaPage* self); -static void _media_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void media_page_on_decrease_rating (MediaPage* self); -static void _media_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void media_page_on_rate_rejected (MediaPage* self); -static void _media_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void media_page_on_rate_unrated (MediaPage* self); -static void _media_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void media_page_on_rate_one (MediaPage* self); -static void _media_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void media_page_on_rate_two (MediaPage* self); -static void _media_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void media_page_on_rate_three (MediaPage* self); -static void _media_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void media_page_on_rate_four (MediaPage* self); -static void _media_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void media_page_on_rate_five (MediaPage* self); -static void _media_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void media_page_on_edit_title (MediaPage* self); -static void _media_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void media_page_on_edit_comment (MediaPage* self); -static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void media_page_on_play_video (MediaPage* self); -static void _media_page_on_play_video_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -void page_on_action_toggle (Page* self, GAction* action, GVariant* value); -static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -void media_page_on_display_titles (MediaPage* self, GSimpleAction* action, GVariant* value); -static void _media_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); -void media_page_on_display_comments (MediaPage* self, GSimpleAction* action, GVariant* value); -static void _media_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); -void media_page_on_display_ratings (MediaPage* self, GSimpleAction* action, GVariant* value); -static void _media_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); -void media_page_on_display_tags (MediaPage* self, GSimpleAction* action, GVariant* value); -static void _media_page_on_display_tags_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); -void page_on_action_radio (Page* self, GAction* action, GVariant* value); -static void _page_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -void media_page_on_sort_changed (MediaPage* self, GSimpleAction* action, GVariant* value); -static void _media_page_on_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); -MediaPage* media_page_construct (GType object_type, const gchar* page_name); -CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name); +static void _media_page_on_play_video_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +void page_on_action_toggle (Page* self, + GAction* action, + GVariant* value); +static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +void media_page_on_display_titles (MediaPage* self, + GSimpleAction* action, + GVariant* value); +static void _media_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); +void media_page_on_display_comments (MediaPage* self, + GSimpleAction* action, + GVariant* value); +static void _media_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); +void media_page_on_display_ratings (MediaPage* self, + GSimpleAction* action, + GVariant* value); +static void _media_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); +void media_page_on_display_tags (MediaPage* self, + GSimpleAction* action, + GVariant* value); +static void _media_page_on_display_tags_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); +void page_on_action_radio (Page* self, + GAction* action, + GVariant* value); +static void _page_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +void media_page_on_sort_changed (MediaPage* self, + GSimpleAction* action, + GVariant* value); +static void _media_page_on_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); +MediaPage* media_page_construct (GType object_type, + const gchar* page_name); +CheckerboardPage* checkerboard_page_construct (GType object_type, + const gchar* page_name); GType view_collection_get_type (void) G_GNUC_CONST; ViewCollection* page_get_view (Page* self); MediaViewTracker* media_view_tracker_new (ViewCollection* collection); -MediaViewTracker* media_view_tracker_construct (GType object_type, ViewCollection* collection); -static void media_page_on_media_altered (MediaPage* self, GeeMap* altered); -static void _media_page_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +MediaViewTracker* media_view_tracker_construct (GType object_type, + ViewCollection* collection); +static void media_page_on_media_altered (MediaPage* self, + GeeMap* altered); +static void _media_page_on_media_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); void data_collection_freeze_notifications (DataCollection* self); -void data_collection_set_property (DataCollection* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target); +void data_collection_set_property (DataCollection* self, + const gchar* name, + GValue* val, + ValueEqualFunc value_equals, + void* value_equals_target); #define CHECKERBOARD_ITEM_PROP_SHOW_TITLES "show-titles" GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; @@ -1134,17 +1300,25 @@ gint media_page_get_thumb_size (MediaPage* self); gboolean configuration_facade_get_display_photo_ratings (ConfigurationFacade* self); void data_collection_thaw_notifications (DataCollection* self); DragAndDropHandler* drag_and_drop_handler_new (Page* page); -DragAndDropHandler* drag_and_drop_handler_construct (GType object_type, Page* page); +DragAndDropHandler* drag_and_drop_handler_construct (GType object_type, + Page* page); static gint media_page_compute_zoom_scale_increase (gint current_scale); gint thumbnail_get_MIN_SCALE (void); gint thumbnail_get_MAX_SCALE (void); static gint media_page_compute_zoom_scale_decrease (gint current_scale); -static void media_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); -void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static void media_page_real_add_actions (Page* base, GActionMap* map); -void page_add_actions (Page* self, GActionMap* map); -void media_page_get_config_photos_sort (MediaPage* self, gboolean* sort_order, gint* sort_by); -GAction* page_get_action (Page* self, const gchar* name); +static void media_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames); +void page_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames); +static void media_page_real_add_actions (Page* base, + GActionMap* map); +void page_add_actions (Page* self, + GActionMap* map); +void media_page_get_config_photos_sort (MediaPage* self, + gboolean* sort_order, + gint* sort_by); +GAction* page_get_action (Page* self, + const gchar* name); static GVariant* _variant_new23 (gboolean value); static GVariant* _variant_new24 (gboolean value); static GVariant* _variant_new25 (gboolean value); @@ -1153,24 +1327,41 @@ static GVariant* _variant_new27 (gchar* value); static GVariant* _variant_new28 (const gchar* value); RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self); static GVariant* _variant_new29 (const gchar* value); -static void media_page_on_raw_developer_changed (MediaPage* self, GSimpleAction* action, GVariant* value); -static void _media_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self); -static void media_page_real_remove_actions (Page* base, GActionMap* map); -void page_remove_actions (Page* self, GActionMap* map); -static void media_page_real_update_actions (Page* base, gint selected_count, gint count); -void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); +static void media_page_on_raw_developer_changed (MediaPage* self, + GSimpleAction* action, + GVariant* value); +static void _media_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, + GVariant* value, + gpointer self); +static void media_page_real_remove_actions (Page* base, + GActionMap* map); +void page_remove_actions (Page* self, + GActionMap* map); +static void media_page_real_update_actions (Page* base, + gint selected_count, + gint count); +void page_set_action_sensitive (Page* self, + const gchar* name, + gboolean sensitive); gboolean desktop_integration_is_send_to_installed (void); static void media_page_update_rating_sensitivities (MediaPage* self); static void media_page_update_development_menu_item_sensitivity (MediaPage* self); -DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index); +DataSource* view_collection_get_selected_source_at (ViewCollection* self, + gint index); GType media_source_get_type (void) G_GNUC_CONST; GType video_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; -static void media_page_update_flag_action (MediaPage* self, gint selected_count); -void page_update_actions (Page* self, gint selected_count, gint count); -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail); +static void media_page_update_flag_action (MediaPage* self, + gint selected_count); +void page_update_actions (Page* self, + gint selected_count, + gint count); +gboolean alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail); gint view_collection_get_selected_count (ViewCollection* self); -static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating); +static gboolean media_page_can_rate_selected (MediaPage* self, + Rating rating); static gboolean media_page_can_increase_selected_rating (MediaPage* self); static gboolean media_page_can_decrease_selected_rating (MediaPage* self); GeeList* view_collection_get_selected (ViewCollection* self); @@ -1181,118 +1372,184 @@ MediaSource* thumbnail_get_media_source (Thumbnail* self); GType photo_file_format_get_type (void) G_GNUC_CONST; PhotoFileFormat photo_get_master_file_format (Photo* self); static CoreViewTracker* media_page_real_get_view_tracker (CheckerboardPage* base); -void media_page_set_display_ratings (MediaPage* self, gboolean display); -void page_set_action_active (Page* self, const gchar* name, gboolean active); +void media_page_set_display_ratings (MediaPage* self, + gboolean display); +void page_set_action_active (Page* self, + const gchar* name, + gboolean active); Rating media_source_get_rating (MediaSource* self); gboolean rating_can_increase (Rating self); gboolean rating_can_decrease (Rating self); MediaPageZoomSliderAssembly* media_page_create_zoom_slider_assembly (MediaPage* self); MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_new (void); MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_construct (GType object_type); -static gboolean media_page_real_on_mousewheel_up (Page* base, GdkEventScroll* event); +static gboolean media_page_real_on_mousewheel_up (Page* base, + GdkEventScroll* event); void media_page_increase_zoom_level (MediaPage* self); -gboolean page_on_mousewheel_up (Page* self, GdkEventScroll* event); -static gboolean media_page_real_on_mousewheel_down (Page* base, GdkEventScroll* event); +gboolean page_on_mousewheel_up (Page* self, + GdkEventScroll* event); +static gboolean media_page_real_on_mousewheel_down (Page* base, + GdkEventScroll* event); void media_page_decrease_zoom_level (MediaPage* self); -gboolean page_on_mousewheel_down (Page* self, GdkEventScroll* event); +gboolean page_on_mousewheel_down (Page* self, + GdkEventScroll* event); void desktop_integration_send_to (GeeCollection* media); GeeList* view_collection_get_selected_sources (ViewCollection* self); -DataView* view_collection_get_selected_at (ViewCollection* self, gint index); +DataView* view_collection_get_selected_at (ViewCollection* self, + gint index); DataSource* data_view_get_source (DataView* self); GFile* media_source_get_file (MediaSource* self); -void app_window_error_message (const gchar* message, GtkWindow* parent); -static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* event); -void page_activate_action (Page* self, const gchar* name); -gboolean page_on_app_key_pressed (Page* self, GdkEventKey* event); +void app_window_error_message (const gchar* message, + GtkWindow* parent); +static gboolean media_page_real_on_app_key_pressed (Page* base, + GdkEventKey* event); +void page_activate_action (Page* self, + const gchar* name); +gboolean page_on_app_key_pressed (Page* self, + GdkEventKey* event); static void media_page_real_switched_to (Page* base); void page_switched_to (Page* self); -void checkerboard_page_set_display_titles (CheckerboardPage* self, gboolean display); -void checkerboard_page_set_display_comments (CheckerboardPage* self, gboolean display); -static void media_page_set_display_tags (MediaPage* self, gboolean display); -void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem* item); +void checkerboard_page_set_display_titles (CheckerboardPage* self, + gboolean display); +void checkerboard_page_set_display_comments (CheckerboardPage* self, + gboolean display); +static void media_page_set_display_tags (MediaPage* self, + gboolean display); +void checkerboard_page_cursor_to_item (CheckerboardPage* self, + CheckerboardItem* item); void media_page_sync_sort (MediaPage* self); static void media_page_real_switching_from (Page* base); void media_page_disconnect_slider (MediaPage* self); void page_switching_from (Page* self); -void media_page_connect_slider (MediaPage* self, MediaPageZoomSliderAssembly* slider); +void media_page_connect_slider (MediaPage* self, + MediaPageZoomSliderAssembly* slider); void media_page_on_zoom_changed (MediaPage* self); -static void _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed (MediaPageZoomSliderAssembly* _sender, gpointer self); +static void _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed (MediaPageZoomSliderAssembly* _sender, + gpointer self); static void media_page_load_persistent_thumbnail_scale (MediaPage* self); static void media_page_save_persistent_thumbnail_scale (MediaPage* self); -void configuration_facade_set_photo_thumbnail_scale (ConfigurationFacade* self, gint scale); +void configuration_facade_set_photo_thumbnail_scale (ConfigurationFacade* self, + gint scale); gint media_page_zoom_slider_assembly_get_scale (MediaPageZoomSliderAssembly* self); gint configuration_facade_get_photo_thumbnail_scale (ConfigurationFacade* self); -void media_page_zoom_slider_assembly_set_scale (MediaPageZoomSliderAssembly* self, gint scale); -void media_page_set_thumb_size (MediaPage* self, gint new_scale); +void media_page_zoom_slider_assembly_set_scale (MediaPageZoomSliderAssembly* self, + gint scale); +void media_page_set_thumb_size (MediaPage* self, + gint new_scale); static void media_page_real_on_zoom_changed (MediaPage* self); static void media_page_real_on_export (MediaPage* self); static void media_page_real_on_increase_size (MediaPage* self); static void media_page_real_on_decrease_size (MediaPage* self); gpointer text_entry_dialog_mediator_ref (gpointer instance); void text_entry_dialog_mediator_unref (gpointer instance); -GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_text_entry_dialog_mediator (GValue* value, gpointer v_object); -void value_take_text_entry_dialog_mediator (GValue* value, gpointer v_object); +GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_text_entry_dialog_mediator (GValue* value, + gpointer v_object); +void value_take_text_entry_dialog_mediator (GValue* value, + gpointer v_object); gpointer value_get_text_entry_dialog_mediator (const GValue* value); GType text_entry_dialog_mediator_get_type (void) G_GNUC_CONST; GType tags_dialog_get_type (void) G_GNUC_CONST; GType add_tags_dialog_get_type (void) G_GNUC_CONST; AddTagsDialog* add_tags_dialog_new (void); AddTagsDialog* add_tags_dialog_construct (GType object_type); -gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1); +gchar** add_tags_dialog_execute (AddTagsDialog* self, + int* result_length1); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* page_get_command_manager (Page* self); GType command_get_type (void) G_GNUC_CONST; -void command_manager_execute (CommandManager* self, Command* command); +void command_manager_execute (CommandManager* self, + Command* command); gpointer hierarchical_tag_index_ref (gpointer instance); void hierarchical_tag_index_unref (gpointer instance); -GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_hierarchical_tag_index (GValue* value, gpointer v_object); -void value_take_hierarchical_tag_index (GValue* value, gpointer v_object); +GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_hierarchical_tag_index (GValue* value, + gpointer v_object); +void value_take_hierarchical_tag_index (GValue* value, + gpointer v_object); gpointer value_get_hierarchical_tag_index (const GValue* value); GType hierarchical_tag_index_get_type (void) G_GNUC_CONST; HierarchicalTagIndex* hierarchical_tag_index_get_global_index (void); -gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, gchar** names, int names_length1, int* result_length1); -AddTagsCommand* add_tags_command_new (gchar** paths, int paths_length1, GeeCollection* sources); -AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, int paths_length1, GeeCollection* sources); +gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, + gchar** names, + int names_length1, + int* result_length1); +AddTagsCommand* add_tags_command_new (gchar** paths, + int paths_length1, + GeeCollection* sources); +AddTagsCommand* add_tags_command_construct (GType object_type, + gchar** paths, + int paths_length1, + GeeCollection* sources); GType page_command_get_type (void) G_GNUC_CONST; GType add_tags_command_get_type (void) G_GNUC_CONST; GType modify_tags_dialog_get_type (void) G_GNUC_CONST; ModifyTagsDialog* modify_tags_dialog_new (MediaSource* source); -ModifyTagsDialog* modify_tags_dialog_construct (GType object_type, MediaSource* source); +ModifyTagsDialog* modify_tags_dialog_construct (GType object_type, + MediaSource* source); GType tag_get_type (void) G_GNUC_CONST; GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self); -ModifyTagsCommand* modify_tags_command_new (MediaSource* media, GeeCollection* new_tag_list); -ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource* media, GeeCollection* new_tag_list); +ModifyTagsCommand* modify_tags_command_new (MediaSource* media, + GeeCollection* new_tag_list); +ModifyTagsCommand* modify_tags_command_construct (GType object_type, + MediaSource* media, + GeeCollection* new_tag_list); GType single_data_source_command_get_type (void) G_GNUC_CONST; GType modify_tags_command_get_type (void) G_GNUC_CONST; NewEventCommand* new_event_command_new (GeeIterable* iter); -NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* iter); +NewEventCommand* new_event_command_construct (GType object_type, + GeeIterable* iter); GType move_photos_command_get_type (void) G_GNUC_CONST; GType new_event_command_get_type (void) G_GNUC_CONST; -GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t); +GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, + GType t); GType flaggable_get_type (void) G_GNUC_CONST; gboolean flaggable_is_flagged (Flaggable* self); -FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources, gboolean flag); -FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollection* sources, gboolean flag); +FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources, + gboolean flag); +FlagUnflagCommand* flag_unflag_command_construct (GType object_type, + GeeCollection* sources, + gboolean flag); GType multiple_data_source_at_once_command_get_type (void) G_GNUC_CONST; GType flag_unflag_command_get_type (void) G_GNUC_CONST; static void media_page_real_on_increase_rating (MediaPage* self); GType multiple_data_source_command_get_type (void) G_GNUC_CONST; GType set_rating_command_get_type (void) G_GNUC_CONST; -SetRatingCommand* set_rating_command_new_inc_dec (GeeIterable* iter, gboolean is_incrementing); -SetRatingCommand* set_rating_command_construct_inc_dec (GType object_type, GeeIterable* iter, gboolean is_incrementing); +SetRatingCommand* set_rating_command_new_inc_dec (GeeIterable* iter, + gboolean is_incrementing); +SetRatingCommand* set_rating_command_construct_inc_dec (GType object_type, + GeeIterable* iter, + gboolean is_incrementing); static void media_page_real_on_decrease_rating (MediaPage* self); -void media_page_on_set_rating (MediaPage* self, Rating rating); -static void media_page_real_on_set_rating (MediaPage* self, Rating rating); -SetRatingCommand* set_rating_command_new (GeeIterable* iter, Rating rating); -SetRatingCommand* set_rating_command_construct (GType object_type, GeeIterable* iter, Rating rating); +void media_page_on_set_rating (MediaPage* self, + Rating rating); +static void media_page_real_on_set_rating (MediaPage* self, + Rating rating); +SetRatingCommand* set_rating_command_new (GeeIterable* iter, + Rating rating); +SetRatingCommand* set_rating_command_construct (GType object_type, + GeeIterable* iter, + Rating rating); static void media_page_real_on_rate_rejected (MediaPage* self); static void media_page_real_on_rate_unrated (MediaPage* self); static void media_page_real_on_rate_one (MediaPage* self); @@ -1303,139 +1560,250 @@ static void media_page_real_on_rate_five (MediaPage* self); GType library_photo_get_type (void) G_GNUC_CONST; void remove_photos_from_library (GeeCollection* photos); static void media_page_real_on_move_to_trash (MediaPage* self); -DataView* view_collection_get_next (ViewCollection* self, DataView* view); -gboolean data_collection_contains (DataCollection* self, DataObject* object); -void checkerboard_page_set_cursor (CheckerboardPage* self, CheckerboardItem* item); -TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, gboolean to_trash); -TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type, GeeCollection* sources, gboolean to_trash); +DataView* view_collection_get_next (ViewCollection* self, + DataView* view); +gboolean data_collection_contains (DataCollection* self, + DataObject* object); +void checkerboard_page_set_cursor (CheckerboardPage* self, + CheckerboardItem* item); +TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, + gboolean to_trash); +TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type, + GeeCollection* sources, + gboolean to_trash); GType trash_untrash_photos_command_get_type (void) G_GNUC_CONST; static void media_page_real_on_edit_title (MediaPage* self); GType edit_title_dialog_get_type (void) G_GNUC_CONST; gchar* media_source_get_title (MediaSource* self); EditTitleDialog* edit_title_dialog_new (const gchar* photo_title); -EditTitleDialog* edit_title_dialog_construct (GType object_type, const gchar* photo_title); +EditTitleDialog* edit_title_dialog_construct (GType object_type, + const gchar* photo_title); gchar* edit_title_dialog_execute (EditTitleDialog* self); -EditMultipleTitlesCommand* edit_multiple_titles_command_new (GeeCollection* media_sources, const gchar* new_title); -EditMultipleTitlesCommand* edit_multiple_titles_command_construct (GType object_type, GeeCollection* media_sources, const gchar* new_title); +EditMultipleTitlesCommand* edit_multiple_titles_command_new (GeeCollection* media_sources, + const gchar* new_title); +EditMultipleTitlesCommand* edit_multiple_titles_command_construct (GType object_type, + GeeCollection* media_sources, + const gchar* new_title); GType edit_multiple_titles_command_get_type (void) G_GNUC_CONST; static void media_page_real_on_edit_comment (MediaPage* self); gpointer multi_text_entry_dialog_mediator_ref (gpointer instance); void multi_text_entry_dialog_mediator_unref (gpointer instance); -GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object); -void value_take_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object); +GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_multi_text_entry_dialog_mediator (GValue* value, + gpointer v_object); +void value_take_multi_text_entry_dialog_mediator (GValue* value, + gpointer v_object); gpointer value_get_multi_text_entry_dialog_mediator (const GValue* value); GType multi_text_entry_dialog_mediator_get_type (void) G_GNUC_CONST; GType edit_comment_dialog_get_type (void) G_GNUC_CONST; gchar* media_source_get_comment (MediaSource* self); -EditCommentDialog* edit_comment_dialog_new (const gchar* comment, gboolean is_event); -EditCommentDialog* edit_comment_dialog_construct (GType object_type, const gchar* comment, gboolean is_event); +EditCommentDialog* edit_comment_dialog_new (const gchar* comment, + gboolean is_event); +EditCommentDialog* edit_comment_dialog_construct (GType object_type, + const gchar* comment, + gboolean is_event); gchar* edit_comment_dialog_execute (EditCommentDialog* self); -EditMultipleCommentsCommand* edit_multiple_comments_command_new (GeeCollection* media_sources, const gchar* new_comment); -EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType object_type, GeeCollection* media_sources, const gchar* new_comment); +EditMultipleCommentsCommand* edit_multiple_comments_command_new (GeeCollection* media_sources, + const gchar* new_comment); +EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType object_type, + GeeCollection* media_sources, + const gchar* new_comment); GType edit_multiple_comments_command_get_type (void) G_GNUC_CONST; -static void media_page_real_on_display_titles (MediaPage* self, GSimpleAction* action, GVariant* value); -void configuration_facade_set_display_photo_titles (ConfigurationFacade* self, gboolean display); -static void media_page_real_on_display_comments (MediaPage* self, GSimpleAction* action, GVariant* value); -void configuration_facade_set_display_photo_comments (ConfigurationFacade* self, gboolean display); -static void media_page_real_on_display_ratings (MediaPage* self, GSimpleAction* action, GVariant* value); -void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self, gboolean display); -static void media_page_real_on_display_tags (MediaPage* self, GSimpleAction* action, GVariant* value); -void configuration_facade_set_display_photo_tags (ConfigurationFacade* self, gboolean display); -static void media_page_real_get_config_photos_sort (MediaPage* self, gboolean* sort_order, gint* sort_by); -void media_page_set_config_photos_sort (MediaPage* self, gboolean sort_order, gint sort_by); -static void media_page_real_set_config_photos_sort (MediaPage* self, gboolean sort_order, gint sort_by); -static void media_page_real_on_sort_changed (MediaPage* self, GSimpleAction* action, GVariant* value); +static void media_page_real_on_display_titles (MediaPage* self, + GSimpleAction* action, + GVariant* value); +void configuration_facade_set_display_photo_titles (ConfigurationFacade* self, + gboolean display); +static void media_page_real_on_display_comments (MediaPage* self, + GSimpleAction* action, + GVariant* value); +void configuration_facade_set_display_photo_comments (ConfigurationFacade* self, + gboolean display); +static void media_page_real_on_display_ratings (MediaPage* self, + GSimpleAction* action, + GVariant* value); +void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self, + gboolean display); +static void media_page_real_on_display_tags (MediaPage* self, + GSimpleAction* action, + GVariant* value); +void configuration_facade_set_display_photo_tags (ConfigurationFacade* self, + gboolean display); +static void media_page_real_get_config_photos_sort (MediaPage* self, + gboolean* sort_order, + gint* sort_by); +void media_page_set_config_photos_sort (MediaPage* self, + gboolean sort_order, + gint sort_by); +static void media_page_real_set_config_photos_sort (MediaPage* self, + gboolean sort_order, + gint sort_by); +static void media_page_real_on_sort_changed (MediaPage* self, + GSimpleAction* action, + GVariant* value); gint media_page_get_menu_sort_by (MediaPage* self); gboolean media_page_get_menu_sort_order (MediaPage* self); -static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gboolean ascending); -void media_page_developer_changed (MediaPage* self, RawDeveloper rd); -static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd); -gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d); +static void media_page_set_view_comparator (MediaPage* self, + gint sort_by, + gboolean ascending); +void media_page_developer_changed (MediaPage* self, + RawDeveloper rd); +static void media_page_real_developer_changed (MediaPage* self, + RawDeveloper rd); +gboolean raw_developer_is_equivalent (RawDeveloper self, + RawDeveloper d); RawDeveloper photo_get_raw_developer (Photo* self); gboolean photo_has_transformations (Photo* self); gboolean dialogs_confirm_warn_developer_changed (gint number); GType set_raw_developer_command_get_type (void) G_GNUC_CONST; -SetRawDeveloperCommand* set_raw_developer_command_new (GeeIterable* iter, RawDeveloper developer); -SetRawDeveloperCommand* set_raw_developer_command_construct (GType object_type, GeeIterable* iter, RawDeveloper developer); -static void media_page_real_set_display_titles (CheckerboardPage* base, gboolean display); -static void media_page_real_set_display_comments (CheckerboardPage* base, gboolean display); +SetRawDeveloperCommand* set_raw_developer_command_new (GeeIterable* iter, + RawDeveloper developer); +SetRawDeveloperCommand* set_raw_developer_command_construct (GType object_type, + GeeIterable* iter, + RawDeveloper developer); +static void media_page_real_set_display_titles (CheckerboardPage* base, + gboolean display); +static void media_page_real_set_display_comments (CheckerboardPage* base, + gboolean display); static GAction* media_page_sort_by_title_action (MediaPage* self); static GAction* media_page_sort_ascending_action (MediaPage* self); -void media_page_set_menu_sort_by (MediaPage* self, gint val); +void media_page_set_menu_sort_by (MediaPage* self, + gint val); static GVariant* _variant_new30 (const gchar* value); -void media_page_set_menu_sort_order (MediaPage* self, gboolean ascending); +void media_page_set_menu_sort_order (MediaPage* self, + gboolean ascending); static GVariant* _variant_new31 (const gchar* value); -gint64 thumbnail_title_ascending_comparator (void* a, void* b); -static gint64 _thumbnail_title_ascending_comparator_comparator (void* a, void* b, gpointer self); -gint64 thumbnail_title_descending_comparator (void* a, void* b); -static gint64 _thumbnail_title_descending_comparator_comparator (void* a, void* b, gpointer self); -gboolean thumbnail_title_comparator_predicate (DataObject* object, Alteration* alteration); -static gboolean _thumbnail_title_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self); -gint64 thumbnail_exposure_time_ascending_comparator (void* a, void* b); -static gint64 _thumbnail_exposure_time_ascending_comparator_comparator (void* a, void* b, gpointer self); -gint64 thumbnail_exposure_time_desending_comparator (void* a, void* b); -static gint64 _thumbnail_exposure_time_desending_comparator_comparator (void* a, void* b, gpointer self); -gboolean thumbnail_exposure_time_comparator_predicate (DataObject* object, Alteration* alteration); -static gboolean _thumbnail_exposure_time_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self); -gint64 thumbnail_rating_ascending_comparator (void* a, void* b); -static gint64 _thumbnail_rating_ascending_comparator_comparator (void* a, void* b, gpointer self); -gint64 thumbnail_rating_descending_comparator (void* a, void* b); -static gint64 _thumbnail_rating_descending_comparator_comparator (void* a, void* b, gpointer self); -gboolean thumbnail_rating_comparator_predicate (DataObject* object, Alteration* alteration); -static gboolean _thumbnail_rating_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self); -gint64 thumbnail_filename_ascending_comparator (void* a, void* b); -static gint64 _thumbnail_filename_ascending_comparator_comparator (void* a, void* b, gpointer self); -gint64 thumbnail_filename_descending_comparator (void* a, void* b); -static gint64 _thumbnail_filename_descending_comparator_comparator (void* a, void* b, gpointer self); -gboolean thumbnail_filename_comparator_predicate (DataObject* object, Alteration* alteration); -static gboolean _thumbnail_filename_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self); -void data_collection_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target); +gint64 thumbnail_title_ascending_comparator (void* a, + void* b); +static gint64 _thumbnail_title_ascending_comparator_comparator (void* a, + void* b, + gpointer self); +gint64 thumbnail_title_descending_comparator (void* a, + void* b); +static gint64 _thumbnail_title_descending_comparator_comparator (void* a, + void* b, + gpointer self); +gboolean thumbnail_title_comparator_predicate (DataObject* object, + Alteration* alteration); +static gboolean _thumbnail_title_comparator_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self); +gint64 thumbnail_exposure_time_ascending_comparator (void* a, + void* b); +static gint64 _thumbnail_exposure_time_ascending_comparator_comparator (void* a, + void* b, + gpointer self); +gint64 thumbnail_exposure_time_desending_comparator (void* a, + void* b); +static gint64 _thumbnail_exposure_time_desending_comparator_comparator (void* a, + void* b, + gpointer self); +gboolean thumbnail_exposure_time_comparator_predicate (DataObject* object, + Alteration* alteration); +static gboolean _thumbnail_exposure_time_comparator_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self); +gint64 thumbnail_rating_ascending_comparator (void* a, + void* b); +static gint64 _thumbnail_rating_ascending_comparator_comparator (void* a, + void* b, + gpointer self); +gint64 thumbnail_rating_descending_comparator (void* a, + void* b); +static gint64 _thumbnail_rating_descending_comparator_comparator (void* a, + void* b, + gpointer self); +gboolean thumbnail_rating_comparator_predicate (DataObject* object, + Alteration* alteration); +static gboolean _thumbnail_rating_comparator_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self); +gint64 thumbnail_filename_ascending_comparator (void* a, + void* b); +static gint64 _thumbnail_filename_ascending_comparator_comparator (void* a, + void* b, + gpointer self); +gint64 thumbnail_filename_descending_comparator (void* a, + void* b); +static gint64 _thumbnail_filename_descending_comparator_comparator (void* a, + void* b, + gpointer self); +gboolean thumbnail_filename_comparator_predicate (DataObject* object, + Alteration* alteration); +static gboolean _thumbnail_filename_comparator_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self); +void data_collection_set_comparator (DataCollection* self, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target); static void media_page_real_destroy (GtkWidget* base); void media_page_zoom_slider_assembly_increase_step (MediaPageZoomSliderAssembly* self); void media_page_zoom_slider_assembly_decrease_step (MediaPageZoomSliderAssembly* self); -DataView* media_page_create_thumbnail (MediaPage* self, DataSource* source); -static DataView* media_page_real_create_thumbnail (MediaPage* self, DataSource* source); -Thumbnail* thumbnail_new (MediaSource* media, gint scale); -Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scale); +DataView* media_page_create_thumbnail (MediaPage* self, + DataSource* source); +static DataView* media_page_real_create_thumbnail (MediaPage* self, + DataSource* source); +Thumbnail* thumbnail_new (MediaSource* media, + gint scale); +Thumbnail* thumbnail_construct (GType object_type, + MediaSource* media, + gint scale); gboolean page_is_in_view (Page* self); GType checkerboard_layout_get_type (void) G_GNUC_CONST; CheckerboardLayout* checkerboard_page_get_checkerboard_layout (CheckerboardPage* self); -void checkerboard_layout_set_scale (CheckerboardLayout* self, gint scale); +void checkerboard_layout_set_scale (CheckerboardLayout* self, + gint scale); gint checkerboard_layout_get_scale (CheckerboardLayout* self); #define MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY, MediaPageZoomSliderAssemblyPrivate)) -enum { - MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_DUMMY_PROPERTY -}; #define RESOURCES_ICON_ZOOM_OUT "zoom-out.png" #define RESOURCES_ICON_ZOOM_SCALE 16 -static gboolean media_page_zoom_slider_assembly_on_zoom_out_pressed (MediaPageZoomSliderAssembly* self, GdkEventButton* event); -static gboolean _media_page_zoom_slider_assembly_on_zoom_out_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); +static gboolean media_page_zoom_slider_assembly_on_zoom_out_pressed (MediaPageZoomSliderAssembly* self, + GdkEventButton* event); +static gboolean _media_page_zoom_slider_assembly_on_zoom_out_pressed_gtk_widget_button_press_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self); gdouble media_page_zoom_slider_assembly_scale_to_slider (gint value); static void media_page_zoom_slider_assembly_on_slider_changed (MediaPageZoomSliderAssembly* self); -static void _media_page_zoom_slider_assembly_on_slider_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self); +static void _media_page_zoom_slider_assembly_on_slider_changed_gtk_range_value_changed (GtkRange* _sender, + gpointer self); #define RESOURCES_ICON_ZOOM_IN "zoom-in.png" -static gboolean media_page_zoom_slider_assembly_on_zoom_in_pressed (MediaPageZoomSliderAssembly* self, GdkEventButton* event); -static gboolean _media_page_zoom_slider_assembly_on_zoom_in_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); +static gboolean media_page_zoom_slider_assembly_on_zoom_in_pressed (MediaPageZoomSliderAssembly* self, + GdkEventButton* event); +static gboolean _media_page_zoom_slider_assembly_on_zoom_in_pressed_gtk_widget_button_press_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self); gint media_page_zoom_slider_assembly_slider_to_scale (gdouble value); void media_page_zoom_slider_assembly_snap_to_min (MediaPageZoomSliderAssembly* self); void media_page_zoom_slider_assembly_snap_to_max (MediaPageZoomSliderAssembly* self); static void media_page_zoom_slider_assembly_finalize (GObject * obj); static void media_page_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static const GActionEntry MEDIA_PAGE_entries[29] = {{"Export", _media_page_on_export_gsimple_action_activate_callback}, {"SendTo", _media_page_on_send_to_gsimple_action_activate_callback}, {"SendToContextMenu", _media_page_on_send_to_gsimple_action_activate_callback}, {"RemoveFromLibrary", _media_page_on_remove_from_library_gsimple_action_activate_callback}, {"MoveToTrash", _media_page_on_move_to_trash_gsimple_action_activate_callback}, {"NewEvent", _media_page_on_new_event_gsimple_action_activate_callback}, {"AddTags", _media_page_on_add_tags_gsimple_action_activate_callback}, {"ModifyTags", _media_page_on_modify_tags_gsimple_action_activate_callback}, {"IncreaseSize", _media_page_on_increase_size_gsimple_action_activate_callback}, {"DecreaseSize", _media_page_on_decrease_size_gsimple_action_activate_callback}, {"Flag", _media_page_on_flag_unflag_gsimple_action_activate_callback}, {"IncreaseRating", _media_page_on_increase_rating_gsimple_action_activate_callback}, {"DecreaseRating", _media_page_on_decrease_rating_gsimple_action_activate_callback}, {"RateRejected", _media_page_on_rate_rejected_gsimple_action_activate_callback}, {"RateUnrated", _media_page_on_rate_unrated_gsimple_action_activate_callback}, {"RateOne", _media_page_on_rate_one_gsimple_action_activate_callback}, {"RateTwo", _media_page_on_rate_two_gsimple_action_activate_callback}, {"RateThree", _media_page_on_rate_three_gsimple_action_activate_callback}, {"RateFour", _media_page_on_rate_four_gsimple_action_activate_callback}, {"RateFive", _media_page_on_rate_five_gsimple_action_activate_callback}, {"EditTitle", _media_page_on_edit_title_gsimple_action_activate_callback}, {"EditComment", _media_page_on_edit_comment_gsimple_action_activate_callback}, {"PlayVideo", _media_page_on_play_video_gsimple_action_activate_callback}, {"ViewTitle", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _media_page_on_display_titles_gsimple_action_change_state_callback}, {"ViewComment", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _media_page_on_display_comments_gsimple_action_change_state_callback}, {"ViewRatings", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _media_page_on_display_ratings_gsimple_action_change_state_callback}, {"ViewTags", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _media_page_on_display_tags_gsimple_action_change_state_callback}, {"SortBy", _page_on_action_radio_gsimple_action_activate_callback, "s", "'1'", _media_page_on_sort_changed_gsimple_action_change_state_callback}, {"Sort", _page_on_action_radio_gsimple_action_activate_callback, "s", "'ascending'", _media_page_on_sort_changed_gsimple_action_change_state_callback}}; -MediaSourceItem* media_source_item_construct (GType object_type, ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment) { +MediaSourceItem* +media_source_item_construct (GType object_type, + ThumbnailSource* source, + Dimensions* initial_pixbuf_dim, + const gchar* title, + const gchar* comment, + gboolean marked_up, + PangoAlignment alignment) +{ MediaSourceItem * self = NULL; - ThumbnailSource* _tmp0_; - Dimensions _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - gboolean _tmp4_; - PangoAlignment _tmp5_; - GdkPixbuf* _tmp6_; + Dimensions _tmp0_; + GdkPixbuf* _tmp1_; #line 16 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (IS_THUMBNAIL_SOURCE (source), NULL); #line 16 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -1443,56 +1811,55 @@ MediaSourceItem* media_source_item_construct (GType object_type, ThumbnailSource #line 16 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (title != NULL, NULL); #line 18 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = source; -#line 18 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = *initial_pixbuf_dim; -#line 18 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = title; -#line 18 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = comment; + _tmp0_ = *initial_pixbuf_dim; #line 18 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = marked_up; -#line 18 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = alignment; -#line 18 "/home/jens/Source/shotwell/src/MediaPage.vala" - self = (MediaSourceItem*) checkerboard_item_construct (object_type, _tmp0_, &_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_); + self = (MediaSourceItem*) checkerboard_item_construct (object_type, source, &_tmp0_, title, comment, marked_up, alignment); #line 19 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = media_source_item_basis_sprocket_pixbuf; + _tmp1_ = media_source_item_basis_sprocket_pixbuf; #line 19 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp6_ == NULL) { -#line 1464 "MediaPage.c" - GdkPixbuf* _tmp7_; + if (_tmp1_ == NULL) { +#line 1822 "MediaPage.c" + GdkPixbuf* _tmp2_; #line 20 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = resources_load_icon ("sprocket.png", 0); + _tmp2_ = resources_load_icon ("sprocket.png", 0); #line 20 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (media_source_item_basis_sprocket_pixbuf); #line 20 "/home/jens/Source/shotwell/src/MediaPage.vala" - media_source_item_basis_sprocket_pixbuf = _tmp7_; -#line 1472 "MediaPage.c" + media_source_item_basis_sprocket_pixbuf = _tmp2_; +#line 1830 "MediaPage.c" } #line 16 "/home/jens/Source/shotwell/src/MediaPage.vala" return self; -#line 1476 "MediaPage.c" +#line 1834 "MediaPage.c" } -MediaSourceItem* media_source_item_new (ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment) { +MediaSourceItem* +media_source_item_new (ThumbnailSource* source, + Dimensions* initial_pixbuf_dim, + const gchar* title, + const gchar* comment, + gboolean marked_up, + PangoAlignment alignment) +{ #line 16 "/home/jens/Source/shotwell/src/MediaPage.vala" return media_source_item_construct (TYPE_MEDIA_SOURCE_ITEM, source, initial_pixbuf_dim, title, comment, marked_up, alignment); -#line 1483 "MediaPage.c" +#line 1848 "MediaPage.c" } -static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin) { +static void +media_source_item_real_paint_image (CheckerboardItem* base, + cairo_t* ctx, + GdkPixbuf* pixbuf, + GdkPoint* origin) +{ MediaSourceItem * self; Dimensions pixbuf_dim = {0}; - GdkPixbuf* _tmp0_; - Dimensions _tmp1_ = {0}; - gboolean _tmp2_; - cairo_t* _tmp21_; - GdkPixbuf* _tmp22_; - GdkPoint _tmp23_; - gboolean _tmp24_; + Dimensions _tmp0_ = {0}; + gboolean _tmp1_; + GdkPoint _tmp19_; + gboolean _tmp20_; #line 23 "/home/jens/Source/shotwell/src/MediaPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem); #line 23 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -1502,139 +1869,127 @@ static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t* #line 23 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (origin != NULL); #line 25 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = pixbuf; + dimensions_for_pixbuf (pixbuf, &_tmp0_); #line 25 "/home/jens/Source/shotwell/src/MediaPage.vala" - dimensions_for_pixbuf (_tmp0_, &_tmp1_); -#line 25 "/home/jens/Source/shotwell/src/MediaPage.vala" - pixbuf_dim = _tmp1_; + pixbuf_dim = _tmp0_; #line 30 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = self->priv->enable_sprockets; + _tmp1_ = self->priv->enable_sprockets; #line 30 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (!_tmp2_) { + if (!_tmp1_) { #line 31 "/home/jens/Source/shotwell/src/MediaPage.vala" checkerboard_item_set_horizontal_trinket_offset (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), 0); -#line 1517 "MediaPage.c" +#line 1882 "MediaPage.c" } else { gdouble reduction_factor = 0.0; - gint _tmp3_; gint reduced_size = 0; - gdouble _tmp4_; - GdkPixbuf* _tmp5_; - gint _tmp6_; - gint _tmp7_; - gboolean _tmp8_ = FALSE; - GdkPixbuf* _tmp9_; - GdkPixbuf* _tmp18_; - gint _tmp19_; - gint _tmp20_; -#line 33 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = dimensions_major_axis (&pixbuf_dim); + gdouble _tmp2_; + GdkPixbuf* _tmp3_; + gint _tmp4_; + gint _tmp5_; + gboolean _tmp6_ = FALSE; + GdkPixbuf* _tmp7_; + GdkPixbuf* _tmp16_; + gint _tmp17_; + gint _tmp18_; #line 33 "/home/jens/Source/shotwell/src/MediaPage.vala" - reduction_factor = ((gdouble) _tmp3_) / ((gdouble) THUMBNAIL_CACHE_SIZE_LARGEST); + reduction_factor = ((gdouble) dimensions_major_axis (&pixbuf_dim)) / ((gdouble) THUMBNAIL_CACHE_SIZE_LARGEST); #line 35 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = reduction_factor; + _tmp2_ = reduction_factor; #line 35 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = media_source_item_basis_sprocket_pixbuf; + _tmp3_ = media_source_item_basis_sprocket_pixbuf; #line 35 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = gdk_pixbuf_get_width (_tmp5_); + _tmp4_ = gdk_pixbuf_get_width (_tmp3_); #line 35 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 35 "/home/jens/Source/shotwell/src/MediaPage.vala" - reduced_size = (gint) (_tmp4_ * _tmp7_); + reduced_size = (gint) (_tmp2_ * _tmp5_); #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = media_source_item_current_sprocket_pixbuf; + _tmp7_ = media_source_item_current_sprocket_pixbuf; #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp9_ == NULL) { + if (_tmp7_ == NULL) { #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = TRUE; -#line 1551 "MediaPage.c" + _tmp6_ = TRUE; +#line 1913 "MediaPage.c" } else { + gint _tmp8_; + GdkPixbuf* _tmp9_; gint _tmp10_; - GdkPixbuf* _tmp11_; - gint _tmp12_; - gint _tmp13_; + gint _tmp11_; #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = reduced_size; + _tmp8_ = reduced_size; #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = media_source_item_current_sprocket_pixbuf; + _tmp9_ = media_source_item_current_sprocket_pixbuf; #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp12_ = gdk_pixbuf_get_width (_tmp11_); + _tmp10_ = gdk_pixbuf_get_width (_tmp9_); #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = _tmp10_ != _tmp13_; -#line 1567 "MediaPage.c" + _tmp6_ = _tmp8_ != _tmp11_; +#line 1929 "MediaPage.c" } #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp8_) { -#line 1571 "MediaPage.c" - GdkPixbuf* _tmp14_; - gint _tmp15_; - gint _tmp16_; - GdkPixbuf* _tmp17_; + if (_tmp6_) { +#line 1933 "MediaPage.c" + GdkPixbuf* _tmp12_; + gint _tmp13_; + gint _tmp14_; + GdkPixbuf* _tmp15_; #line 38 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp14_ = media_source_item_basis_sprocket_pixbuf; + _tmp12_ = media_source_item_basis_sprocket_pixbuf; #line 38 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp15_ = reduced_size; + _tmp13_ = reduced_size; #line 38 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = reduced_size; + _tmp14_ = reduced_size; #line 38 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = gdk_pixbuf_scale_simple (_tmp14_, _tmp15_, _tmp16_, GDK_INTERP_HYPER); + _tmp15_ = gdk_pixbuf_scale_simple (_tmp12_, _tmp13_, _tmp14_, GDK_INTERP_HYPER); #line 38 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (media_source_item_current_sprocket_pixbuf); #line 38 "/home/jens/Source/shotwell/src/MediaPage.vala" - media_source_item_current_sprocket_pixbuf = _tmp17_; -#line 1588 "MediaPage.c" + media_source_item_current_sprocket_pixbuf = _tmp15_; +#line 1950 "MediaPage.c" } #line 42 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp18_ = media_source_item_current_sprocket_pixbuf; + _tmp16_ = media_source_item_current_sprocket_pixbuf; #line 42 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp19_ = gdk_pixbuf_get_width (_tmp18_); + _tmp17_ = gdk_pixbuf_get_width (_tmp16_); #line 42 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp20_ = _tmp19_; + _tmp18_ = _tmp17_; #line 42 "/home/jens/Source/shotwell/src/MediaPage.vala" - checkerboard_item_set_horizontal_trinket_offset (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp20_); -#line 1598 "MediaPage.c" + checkerboard_item_set_horizontal_trinket_offset (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp18_); +#line 1960 "MediaPage.c" } #line 45 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp21_ = ctx; -#line 45 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp22_ = pixbuf; -#line 45 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp23_ = *origin; + _tmp19_ = *origin; #line 45 "/home/jens/Source/shotwell/src/MediaPage.vala" - CHECKERBOARD_ITEM_CLASS (media_source_item_parent_class)->paint_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp21_, _tmp22_, &_tmp23_); + CHECKERBOARD_ITEM_CLASS (media_source_item_parent_class)->paint_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), ctx, pixbuf, &_tmp19_); #line 47 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp24_ = self->priv->enable_sprockets; + _tmp20_ = self->priv->enable_sprockets; #line 47 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp24_) { -#line 1612 "MediaPage.c" - cairo_t* _tmp25_; - GdkPoint _tmp26_; - Dimensions _tmp27_; -#line 48 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp25_ = ctx; + if (_tmp20_) { +#line 1970 "MediaPage.c" + GdkPoint _tmp21_; + Dimensions _tmp22_; #line 48 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp26_ = *origin; + _tmp21_ = *origin; #line 48 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp27_ = pixbuf_dim; + _tmp22_ = pixbuf_dim; #line 48 "/home/jens/Source/shotwell/src/MediaPage.vala" - media_source_item_paint_sprockets (self, _tmp25_, &_tmp26_, &_tmp27_); -#line 1624 "MediaPage.c" + media_source_item_paint_sprockets (self, ctx, &_tmp21_, &_tmp22_); +#line 1979 "MediaPage.c" } } -void media_source_item_paint_one_sprocket (MediaSourceItem* self, cairo_t* ctx, GdkPoint* origin) { - cairo_t* _tmp0_; - cairo_t* _tmp1_; - GdkPixbuf* _tmp2_; +void +media_source_item_paint_one_sprocket (MediaSourceItem* self, + cairo_t* ctx, + GdkPoint* origin) +{ + GdkPixbuf* _tmp0_; + GdkPoint _tmp1_; + gint _tmp2_; GdkPoint _tmp3_; gint _tmp4_; - GdkPoint _tmp5_; - gint _tmp6_; - cairo_t* _tmp7_; - cairo_t* _tmp8_; #line 52 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_SOURCE_ITEM (self)); #line 52 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -1642,36 +1997,33 @@ void media_source_item_paint_one_sprocket (MediaSourceItem* self, cairo_t* ctx, #line 52 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (origin != NULL); #line 53 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = ctx; -#line 53 "/home/jens/Source/shotwell/src/MediaPage.vala" - cairo_save (_tmp0_); + cairo_save (ctx); #line 54 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = ctx; + _tmp0_ = media_source_item_current_sprocket_pixbuf; #line 54 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = media_source_item_current_sprocket_pixbuf; -#line 54 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = *origin; + _tmp1_ = *origin; #line 54 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = _tmp3_.x; + _tmp2_ = _tmp1_.x; #line 54 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = *origin; + _tmp3_ = *origin; #line 54 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = _tmp5_.y; + _tmp4_ = _tmp3_.y; #line 54 "/home/jens/Source/shotwell/src/MediaPage.vala" - gdk_cairo_set_source_pixbuf (_tmp1_, _tmp2_, (gdouble) _tmp4_, (gdouble) _tmp6_); + gdk_cairo_set_source_pixbuf (ctx, _tmp0_, (gdouble) _tmp2_, (gdouble) _tmp4_); #line 55 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = ctx; -#line 55 "/home/jens/Source/shotwell/src/MediaPage.vala" - cairo_paint (_tmp7_); -#line 56 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = ctx; + cairo_paint (ctx); #line 56 "/home/jens/Source/shotwell/src/MediaPage.vala" - cairo_restore (_tmp8_); -#line 1671 "MediaPage.c" + cairo_restore (ctx); +#line 2018 "MediaPage.c" } -void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, GdkPoint* item_origin, Dimensions* item_dimensions) { +void +media_source_item_paint_sprockets (MediaSourceItem* self, + cairo_t* ctx, + GdkPoint* item_origin, + Dimensions* item_dimensions) +{ gint num_sprockets = 0; Dimensions _tmp0_; gint _tmp1_; @@ -1689,12 +2041,12 @@ void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, Gdk gint _tmp11_; gint _tmp12_; gint straggler_pixels = 0; - Dimensions _tmp29_; + Dimensions _tmp27_; + gint _tmp28_; + GdkPixbuf* _tmp29_; gint _tmp30_; - GdkPixbuf* _tmp31_; + gint _tmp31_; gint _tmp32_; - gint _tmp33_; - gint _tmp34_; #line 59 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_SOURCE_ITEM (self)); #line 59 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -1737,42 +2089,40 @@ void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, Gdk _tmp12_ = _tmp11_; #line 65 "/home/jens/Source/shotwell/src/MediaPage.vala" right_paint_location.x = _tmp7_ + (_tmp9_ - _tmp12_); -#line 1741 "MediaPage.c" +#line 2093 "MediaPage.c" { gint i = 0; #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala" i = 0; -#line 1746 "MediaPage.c" +#line 2098 "MediaPage.c" { gboolean _tmp13_ = FALSE; #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp13_ = TRUE; #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala" while (TRUE) { -#line 1753 "MediaPage.c" +#line 2105 "MediaPage.c" gint _tmp15_; gint _tmp16_; - cairo_t* _tmp17_; + GdkPoint _tmp17_; GdkPoint _tmp18_; - cairo_t* _tmp19_; - GdkPoint _tmp20_; + gint _tmp19_; + GdkPixbuf* _tmp20_; gint _tmp21_; - GdkPixbuf* _tmp22_; + gint _tmp22_; gint _tmp23_; - gint _tmp24_; + GdkPixbuf* _tmp24_; gint _tmp25_; - GdkPixbuf* _tmp26_; - gint _tmp27_; - gint _tmp28_; + gint _tmp26_; #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala" if (!_tmp13_) { -#line 1770 "MediaPage.c" +#line 2120 "MediaPage.c" gint _tmp14_; #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp14_ = i; #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala" i = _tmp14_ + 1; -#line 1776 "MediaPage.c" +#line 2126 "MediaPage.c" } #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp13_ = FALSE; @@ -1784,215 +2134,179 @@ void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, Gdk if (!(_tmp15_ < _tmp16_)) { #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 1788 "MediaPage.c" +#line 2138 "MediaPage.c" } #line 67 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = ctx; + _tmp17_ = left_paint_location; #line 67 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp18_ = left_paint_location; -#line 67 "/home/jens/Source/shotwell/src/MediaPage.vala" - media_source_item_paint_one_sprocket (self, _tmp17_, &_tmp18_); -#line 68 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp19_ = ctx; + media_source_item_paint_one_sprocket (self, ctx, &_tmp17_); #line 68 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp20_ = right_paint_location; + _tmp18_ = right_paint_location; #line 68 "/home/jens/Source/shotwell/src/MediaPage.vala" - media_source_item_paint_one_sprocket (self, _tmp19_, &_tmp20_); + media_source_item_paint_one_sprocket (self, ctx, &_tmp18_); #line 70 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp21_ = left_paint_location.y; + _tmp19_ = left_paint_location.y; #line 70 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp22_ = media_source_item_current_sprocket_pixbuf; + _tmp20_ = media_source_item_current_sprocket_pixbuf; #line 70 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp23_ = gdk_pixbuf_get_height (_tmp22_); + _tmp21_ = gdk_pixbuf_get_height (_tmp20_); #line 70 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp24_ = _tmp23_; + _tmp22_ = _tmp21_; #line 70 "/home/jens/Source/shotwell/src/MediaPage.vala" - left_paint_location.y = _tmp21_ + _tmp24_; + left_paint_location.y = _tmp19_ + _tmp22_; #line 71 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp25_ = right_paint_location.y; + _tmp23_ = right_paint_location.y; #line 71 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp26_ = media_source_item_current_sprocket_pixbuf; + _tmp24_ = media_source_item_current_sprocket_pixbuf; #line 71 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp27_ = gdk_pixbuf_get_height (_tmp26_); + _tmp25_ = gdk_pixbuf_get_height (_tmp24_); #line 71 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp28_ = _tmp27_; + _tmp26_ = _tmp25_; #line 71 "/home/jens/Source/shotwell/src/MediaPage.vala" - right_paint_location.y = _tmp25_ + _tmp28_; -#line 1822 "MediaPage.c" + right_paint_location.y = _tmp23_ + _tmp26_; +#line 2168 "MediaPage.c" } } } #line 74 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp29_ = *item_dimensions; + _tmp27_ = *item_dimensions; #line 74 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp30_ = _tmp29_.height; + _tmp28_ = _tmp27_.height; #line 74 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp31_ = media_source_item_current_sprocket_pixbuf; + _tmp29_ = media_source_item_current_sprocket_pixbuf; #line 74 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp32_ = gdk_pixbuf_get_height (_tmp31_); + _tmp30_ = gdk_pixbuf_get_height (_tmp29_); #line 74 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp33_ = _tmp32_; + _tmp31_ = _tmp30_; #line 74 "/home/jens/Source/shotwell/src/MediaPage.vala" - straggler_pixels = _tmp30_ % _tmp33_; + straggler_pixels = _tmp28_ % _tmp31_; #line 75 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp34_ = straggler_pixels; + _tmp32_ = straggler_pixels; #line 75 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp34_ > 0) { -#line 1842 "MediaPage.c" - cairo_t* _tmp35_; - cairo_t* _tmp36_; - GdkPixbuf* _tmp37_; + if (_tmp32_ > 0) { +#line 2188 "MediaPage.c" + GdkPixbuf* _tmp33_; + GdkPoint _tmp34_; + gint _tmp35_; + GdkPoint _tmp36_; + gint _tmp37_; GdkPoint _tmp38_; gint _tmp39_; GdkPoint _tmp40_; gint _tmp41_; - cairo_t* _tmp42_; - GdkPoint _tmp43_; - gint _tmp44_; + GdkPixbuf* _tmp42_; + gint _tmp43_; + GdkPixbuf* _tmp44_; GdkPoint _tmp45_; gint _tmp46_; - GdkPixbuf* _tmp47_; + GdkPoint _tmp47_; gint _tmp48_; - gint _tmp49_; - cairo_t* _tmp50_; - cairo_t* _tmp51_; - GdkPixbuf* _tmp52_; - GdkPoint _tmp53_; + GdkPoint _tmp49_; + gint _tmp50_; + GdkPoint _tmp51_; + gint _tmp52_; + GdkPixbuf* _tmp53_; gint _tmp54_; - GdkPoint _tmp55_; - gint _tmp56_; - cairo_t* _tmp57_; - GdkPoint _tmp58_; - gint _tmp59_; - GdkPoint _tmp60_; - gint _tmp61_; - GdkPixbuf* _tmp62_; - gint _tmp63_; - gint _tmp64_; - cairo_t* _tmp65_; - cairo_t* _tmp66_; -#line 76 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp35_ = ctx; #line 76 "/home/jens/Source/shotwell/src/MediaPage.vala" - cairo_save (_tmp35_); + cairo_save (ctx); #line 78 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp36_ = ctx; + _tmp33_ = media_source_item_current_sprocket_pixbuf; #line 78 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp37_ = media_source_item_current_sprocket_pixbuf; -#line 78 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp38_ = left_paint_location; + _tmp34_ = left_paint_location; #line 78 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp39_ = _tmp38_.x; + _tmp35_ = _tmp34_.x; #line 78 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp40_ = left_paint_location; + _tmp36_ = left_paint_location; #line 78 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp41_ = _tmp40_.y; + _tmp37_ = _tmp36_.y; #line 78 "/home/jens/Source/shotwell/src/MediaPage.vala" - gdk_cairo_set_source_pixbuf (_tmp36_, _tmp37_, (gdouble) _tmp39_, (gdouble) _tmp41_); -#line 80 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp42_ = ctx; + gdk_cairo_set_source_pixbuf (ctx, _tmp33_, (gdouble) _tmp35_, (gdouble) _tmp37_); #line 80 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp43_ = left_paint_location; -#line 80 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp44_ = _tmp43_.x; + _tmp38_ = left_paint_location; #line 80 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp45_ = left_paint_location; + _tmp39_ = _tmp38_.x; #line 80 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp46_ = _tmp45_.y; + _tmp40_ = left_paint_location; #line 80 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp47_ = media_source_item_current_sprocket_pixbuf; + _tmp41_ = _tmp40_.y; #line 80 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp48_ = gdk_pixbuf_get_width (_tmp47_); + _tmp42_ = media_source_item_current_sprocket_pixbuf; #line 80 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp49_ = straggler_pixels; + _tmp43_ = straggler_pixels; #line 80 "/home/jens/Source/shotwell/src/MediaPage.vala" - cairo_rectangle (_tmp42_, (gdouble) _tmp44_, (gdouble) _tmp46_, (gdouble) _tmp48_, (gdouble) _tmp49_); -#line 82 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp50_ = ctx; + cairo_rectangle (ctx, (gdouble) _tmp39_, (gdouble) _tmp41_, (gdouble) gdk_pixbuf_get_width (_tmp42_), (gdouble) _tmp43_); #line 82 "/home/jens/Source/shotwell/src/MediaPage.vala" - cairo_fill (_tmp50_); + cairo_fill (ctx); #line 84 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp51_ = ctx; + _tmp44_ = media_source_item_current_sprocket_pixbuf; #line 84 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp52_ = media_source_item_current_sprocket_pixbuf; + _tmp45_ = right_paint_location; #line 84 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp53_ = right_paint_location; + _tmp46_ = _tmp45_.x; #line 84 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp54_ = _tmp53_.x; + _tmp47_ = right_paint_location; #line 84 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp55_ = right_paint_location; + _tmp48_ = _tmp47_.y; #line 84 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp56_ = _tmp55_.y; -#line 84 "/home/jens/Source/shotwell/src/MediaPage.vala" - gdk_cairo_set_source_pixbuf (_tmp51_, _tmp52_, (gdouble) _tmp54_, (gdouble) _tmp56_); -#line 86 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp57_ = ctx; + gdk_cairo_set_source_pixbuf (ctx, _tmp44_, (gdouble) _tmp46_, (gdouble) _tmp48_); #line 86 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp58_ = right_paint_location; + _tmp49_ = right_paint_location; #line 86 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp59_ = _tmp58_.x; + _tmp50_ = _tmp49_.x; #line 86 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp60_ = right_paint_location; + _tmp51_ = right_paint_location; #line 86 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp61_ = _tmp60_.y; + _tmp52_ = _tmp51_.y; #line 86 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp62_ = media_source_item_current_sprocket_pixbuf; + _tmp53_ = media_source_item_current_sprocket_pixbuf; #line 86 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp63_ = gdk_pixbuf_get_width (_tmp62_); + _tmp54_ = straggler_pixels; #line 86 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp64_ = straggler_pixels; -#line 86 "/home/jens/Source/shotwell/src/MediaPage.vala" - cairo_rectangle (_tmp57_, (gdouble) _tmp59_, (gdouble) _tmp61_, (gdouble) _tmp63_, (gdouble) _tmp64_); -#line 88 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp65_ = ctx; + cairo_rectangle (ctx, (gdouble) _tmp50_, (gdouble) _tmp52_, (gdouble) gdk_pixbuf_get_width (_tmp53_), (gdouble) _tmp54_); #line 88 "/home/jens/Source/shotwell/src/MediaPage.vala" - cairo_fill (_tmp65_); + cairo_fill (ctx); #line 90 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp66_ = ctx; -#line 90 "/home/jens/Source/shotwell/src/MediaPage.vala" - cairo_restore (_tmp66_); -#line 1955 "MediaPage.c" + cairo_restore (ctx); +#line 2271 "MediaPage.c" } } -void media_source_item_set_enable_sprockets (MediaSourceItem* self, gboolean enable_sprockets) { - gboolean _tmp0_; +void +media_source_item_set_enable_sprockets (MediaSourceItem* self, + gboolean enable_sprockets) +{ #line 94 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_SOURCE_ITEM (self)); #line 95 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = enable_sprockets; -#line 95 "/home/jens/Source/shotwell/src/MediaPage.vala" - self->priv->enable_sprockets = _tmp0_; -#line 1968 "MediaPage.c" + self->priv->enable_sprockets = enable_sprockets; +#line 2284 "MediaPage.c" } -void media_source_item_set_title (MediaSourceItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment) { - const gchar* _tmp0_; - gboolean _tmp1_; - PangoAlignment _tmp2_; +void +media_source_item_set_title (MediaSourceItem* self, + const gchar* text, + gboolean marked_up, + PangoAlignment alignment) +{ #line 98 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_SOURCE_ITEM (self)); #line 98 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (text != NULL); #line 100 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = text; -#line 100 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = marked_up; -#line 100 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = alignment; -#line 100 "/home/jens/Source/shotwell/src/MediaPage.vala" - checkerboard_item_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp0_, _tmp1_, _tmp2_); + checkerboard_item_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), text, marked_up, alignment); #line 101 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_free0 (self->priv->natural_collation_key); #line 101 "/home/jens/Source/shotwell/src/MediaPage.vala" self->priv->natural_collation_key = NULL; -#line 1992 "MediaPage.c" +#line 2304 "MediaPage.c" } -gchar* media_source_item_get_natural_collation_key (MediaSourceItem* self) { +gchar* +media_source_item_get_natural_collation_key (MediaSourceItem* self) +{ gchar* result = NULL; const gchar* _tmp0_; const gchar* _tmp3_; @@ -2003,7 +2317,7 @@ gchar* media_source_item_get_natural_collation_key (MediaSourceItem* self) { _tmp0_ = self->priv->natural_collation_key; #line 105 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp0_ == NULL) { -#line 2007 "MediaPage.c" +#line 2321 "MediaPage.c" gchar* _tmp1_; gchar* _tmp2_; #line 106 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -2014,7 +2328,7 @@ gchar* media_source_item_get_natural_collation_key (MediaSourceItem* self) { _g_free0 (self->priv->natural_collation_key); #line 106 "/home/jens/Source/shotwell/src/MediaPage.vala" self->priv->natural_collation_key = _tmp2_; -#line 2018 "MediaPage.c" +#line 2332 "MediaPage.c" } #line 108 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp3_ = self->priv->natural_collation_key; @@ -2024,11 +2338,13 @@ gchar* media_source_item_get_natural_collation_key (MediaSourceItem* self) { result = _tmp4_; #line 108 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 2028 "MediaPage.c" +#line 2342 "MediaPage.c" } -static void media_source_item_class_init (MediaSourceItemClass * klass) { +static void +media_source_item_class_init (MediaSourceItemClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala" media_source_item_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -2037,22 +2353,26 @@ static void media_source_item_class_init (MediaSourceItemClass * klass) { ((CheckerboardItemClass *) klass)->paint_image = (void (*) (CheckerboardItem *, cairo_t*, GdkPixbuf*, GdkPoint*)) media_source_item_real_paint_image; #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala" G_OBJECT_CLASS (klass)->finalize = media_source_item_finalize; -#line 2041 "MediaPage.c" +#line 2357 "MediaPage.c" } -static void media_source_item_instance_init (MediaSourceItem * self) { +static void +media_source_item_instance_init (MediaSourceItem * self) +{ #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala" self->priv = MEDIA_SOURCE_ITEM_GET_PRIVATE (self); #line 11 "/home/jens/Source/shotwell/src/MediaPage.vala" self->priv->enable_sprockets = FALSE; #line 12 "/home/jens/Source/shotwell/src/MediaPage.vala" self->priv->natural_collation_key = NULL; -#line 2052 "MediaPage.c" +#line 2370 "MediaPage.c" } -static void media_source_item_finalize (GObject * obj) { +static void +media_source_item_finalize (GObject * obj) +{ MediaSourceItem * self; #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem); @@ -2060,11 +2380,13 @@ static void media_source_item_finalize (GObject * obj) { _g_free0 (self->priv->natural_collation_key); #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala" G_OBJECT_CLASS (media_source_item_parent_class)->finalize (obj); -#line 2064 "MediaPage.c" +#line 2384 "MediaPage.c" } -GType media_source_item_get_type (void) { +GType +media_source_item_get_type (void) +{ static volatile gsize media_source_item_type_id__volatile = 0; if (g_once_init_enter (&media_source_item_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MediaSourceItemClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) media_source_item_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MediaSourceItem), 0, (GInstanceInitFunc) media_source_item_instance_init, NULL }; @@ -2076,7 +2398,9 @@ GType media_source_item_get_type (void) { } -GType media_page_sort_by_get_type (void) { +GType +media_page_sort_by_get_type (void) +{ static volatile gsize media_page_sort_by_type_id__volatile = 0; if (g_once_init_enter (&media_page_sort_by_type_id__volatile)) { static const GEnumValue values[] = {{MEDIA_PAGE_SORT_BY_MIN, "MEDIA_PAGE_SORT_BY_MIN", "min"}, {MEDIA_PAGE_SORT_BY_TITLE, "MEDIA_PAGE_SORT_BY_TITLE", "title"}, {MEDIA_PAGE_SORT_BY_EXPOSURE_DATE, "MEDIA_PAGE_SORT_BY_EXPOSURE_DATE", "exposure-date"}, {MEDIA_PAGE_SORT_BY_RATING, "MEDIA_PAGE_SORT_BY_RATING", "rating"}, {MEDIA_PAGE_SORT_BY_FILENAME, "MEDIA_PAGE_SORT_BY_FILENAME", "filename"}, {MEDIA_PAGE_SORT_BY_MAX, "MEDIA_PAGE_SORT_BY_MAX", "max"}, {0, NULL, NULL}}; @@ -2088,813 +2412,904 @@ GType media_page_sort_by_get_type (void) { } -static void _media_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_export ((MediaPage*) self); -#line 2095 "MediaPage.c" +#line 2423 "MediaPage.c" } -static void _media_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_send_to ((MediaPage*) self); -#line 2102 "MediaPage.c" +#line 2434 "MediaPage.c" } -static void _media_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_remove_from_library ((MediaPage*) self); -#line 2109 "MediaPage.c" +#line 2445 "MediaPage.c" } -static void _media_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_move_to_trash ((MediaPage*) self); -#line 2116 "MediaPage.c" +#line 2456 "MediaPage.c" } -static void _media_page_on_new_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_new_event_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_new_event ((MediaPage*) self); -#line 2123 "MediaPage.c" +#line 2467 "MediaPage.c" } -static void _media_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_add_tags ((MediaPage*) self); -#line 2130 "MediaPage.c" +#line 2478 "MediaPage.c" } -static void _media_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_modify_tags ((MediaPage*) self); -#line 2137 "MediaPage.c" +#line 2489 "MediaPage.c" } -static void _media_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_increase_size ((MediaPage*) self); -#line 2144 "MediaPage.c" +#line 2500 "MediaPage.c" } -static void _media_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_decrease_size ((MediaPage*) self); -#line 2151 "MediaPage.c" +#line 2511 "MediaPage.c" } -static void _media_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_flag_unflag ((MediaPage*) self); -#line 2158 "MediaPage.c" +#line 2522 "MediaPage.c" } -static void _media_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_increase_rating ((MediaPage*) self); -#line 2165 "MediaPage.c" +#line 2533 "MediaPage.c" } -static void _media_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_decrease_rating ((MediaPage*) self); -#line 2172 "MediaPage.c" +#line 2544 "MediaPage.c" } -static void _media_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_rate_rejected ((MediaPage*) self); -#line 2179 "MediaPage.c" +#line 2555 "MediaPage.c" } -static void _media_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_rate_unrated ((MediaPage*) self); -#line 2186 "MediaPage.c" +#line 2566 "MediaPage.c" } -static void _media_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_rate_one ((MediaPage*) self); -#line 2193 "MediaPage.c" +#line 2577 "MediaPage.c" } -static void _media_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_rate_two ((MediaPage*) self); -#line 2200 "MediaPage.c" +#line 2588 "MediaPage.c" } -static void _media_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_rate_three ((MediaPage*) self); -#line 2207 "MediaPage.c" +#line 2599 "MediaPage.c" } -static void _media_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_rate_four ((MediaPage*) self); -#line 2214 "MediaPage.c" +#line 2610 "MediaPage.c" } -static void _media_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_rate_five ((MediaPage*) self); -#line 2221 "MediaPage.c" +#line 2621 "MediaPage.c" } -static void _media_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_edit_title ((MediaPage*) self); -#line 2228 "MediaPage.c" +#line 2632 "MediaPage.c" } -static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_edit_comment ((MediaPage*) self); -#line 2235 "MediaPage.c" +#line 2643 "MediaPage.c" } -static void _media_page_on_play_video_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_play_video_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_play_video ((MediaPage*) self); -#line 2242 "MediaPage.c" +#line 2654 "MediaPage.c" } -static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" page_on_action_toggle ((Page*) self, action, parameter); -#line 2249 "MediaPage.c" +#line 2665 "MediaPage.c" } -static void _media_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_media_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_display_titles ((MediaPage*) self, action, value); -#line 2256 "MediaPage.c" +#line 2676 "MediaPage.c" } -static void _media_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_media_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_display_comments ((MediaPage*) self, action, value); -#line 2263 "MediaPage.c" +#line 2687 "MediaPage.c" } -static void _media_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_media_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_display_ratings ((MediaPage*) self, action, value); -#line 2270 "MediaPage.c" +#line 2698 "MediaPage.c" } -static void _media_page_on_display_tags_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_media_page_on_display_tags_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_display_tags ((MediaPage*) self, action, value); -#line 2277 "MediaPage.c" +#line 2709 "MediaPage.c" } -static void _page_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_page_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" page_on_action_radio ((Page*) self, action, parameter); -#line 2284 "MediaPage.c" +#line 2720 "MediaPage.c" } -static void _media_page_on_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_media_page_on_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 286 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_sort_changed ((MediaPage*) self, action, value); -#line 2291 "MediaPage.c" +#line 2731 "MediaPage.c" } -static void _media_page_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_media_page_on_media_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 252 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_media_altered ((MediaPage*) self, items); -#line 2298 "MediaPage.c" +#line 2742 "MediaPage.c" } -MediaPage* media_page_construct (GType object_type, const gchar* page_name) { +MediaPage* +media_page_construct (GType object_type, + const gchar* page_name) +{ MediaPage * self = NULL; - const gchar* _tmp0_; + ViewCollection* _tmp0_; ViewCollection* _tmp1_; - ViewCollection* _tmp2_; - MediaViewTracker* _tmp3_; + MediaViewTracker* _tmp2_; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; ViewCollection* _tmp5_; ViewCollection* _tmp6_; ViewCollection* _tmp7_; ViewCollection* _tmp8_; - ViewCollection* _tmp9_; + ConfigFacade* _tmp9_; ConfigFacade* _tmp10_; - ConfigFacade* _tmp11_; - gboolean _tmp12_; - GValue _tmp13_ = {0}; - ViewCollection* _tmp14_; - ViewCollection* _tmp15_; - ConfigFacade* _tmp16_; - ConfigFacade* _tmp17_; - gboolean _tmp18_; - GValue _tmp19_ = {0}; - ViewCollection* _tmp20_; - ViewCollection* _tmp21_; - ConfigFacade* _tmp22_; - ConfigFacade* _tmp23_; - gboolean _tmp24_; - GValue _tmp25_ = {0}; + GValue _tmp11_ = {0}; + ViewCollection* _tmp12_; + ViewCollection* _tmp13_; + ConfigFacade* _tmp14_; + ConfigFacade* _tmp15_; + GValue _tmp16_ = {0}; + ViewCollection* _tmp17_; + ViewCollection* _tmp18_; + ConfigFacade* _tmp19_; + ConfigFacade* _tmp20_; + GValue _tmp21_ = {0}; + ViewCollection* _tmp22_; + ViewCollection* _tmp23_; + GValue _tmp24_ = {0}; + ViewCollection* _tmp25_; ViewCollection* _tmp26_; - ViewCollection* _tmp27_; - gint _tmp28_; + ConfigFacade* _tmp27_; + ConfigFacade* _tmp28_; GValue _tmp29_ = {0}; ViewCollection* _tmp30_; ViewCollection* _tmp31_; - ConfigFacade* _tmp32_; - ConfigFacade* _tmp33_; - gboolean _tmp34_; - GValue _tmp35_ = {0}; - ViewCollection* _tmp36_; - ViewCollection* _tmp37_; - DragAndDropHandler* _tmp38_; + DragAndDropHandler* _tmp32_; #line 247 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (page_name != NULL, NULL); #line 248 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = page_name; -#line 248 "/home/jens/Source/shotwell/src/MediaPage.vala" - self = (MediaPage*) checkerboard_page_construct (object_type, _tmp0_); + self = (MediaPage*) checkerboard_page_construct (object_type, page_name); #line 250 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 250 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 250 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = media_view_tracker_new (_tmp2_); + _tmp2_ = media_view_tracker_new (_tmp1_); #line 250 "/home/jens/Source/shotwell/src/MediaPage.vala" _core_tracker_unref0 (self->priv->tracker); #line 250 "/home/jens/Source/shotwell/src/MediaPage.vala" - self->priv->tracker = _tmp3_; + self->priv->tracker = _tmp2_; #line 250 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp2_); + _data_collection_unref0 (_tmp1_); #line 252 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 252 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 252 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _media_page_on_media_altered_data_collection_items_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _media_page_on_media_altered_data_collection_items_altered, self, 0); #line 252 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 254 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 254 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 254 "/home/jens/Source/shotwell/src/MediaPage.vala" - data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection)); #line 254 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp7_); -#line 255 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _data_collection_unref0 (_tmp6_); #line 255 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = _tmp8_; + _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 255 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = config_facade_get_instance (); + _tmp8_ = _tmp7_; #line 255 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = _tmp10_; + _tmp9_ = config_facade_get_instance (); #line 255 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp12_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp10_ = _tmp9_; #line 255 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_value_init (&_tmp13_, G_TYPE_BOOLEAN); + g_value_init (&_tmp11_, G_TYPE_BOOLEAN); #line 255 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_value_set_boolean (&_tmp13_, _tmp12_); + g_value_set_boolean (&_tmp11_, configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 255 "/home/jens/Source/shotwell/src/MediaPage.vala" - data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_TITLES, &_tmp13_, NULL, NULL); + data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_TITLES, &_tmp11_, NULL, NULL); #line 255 "/home/jens/Source/shotwell/src/MediaPage.vala" - G_IS_VALUE (&_tmp13_) ? (g_value_unset (&_tmp13_), NULL) : NULL; + G_IS_VALUE (&_tmp11_) ? (g_value_unset (&_tmp11_), NULL) : NULL; #line 255 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp10_); #line 255 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp9_); -#line 257 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _data_collection_unref0 (_tmp8_); #line 257 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp15_ = _tmp14_; + _tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 257 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = config_facade_get_instance (); + _tmp13_ = _tmp12_; #line 257 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = _tmp16_; + _tmp14_ = config_facade_get_instance (); #line 257 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp18_ = configuration_facade_get_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp15_ = _tmp14_; #line 257 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_value_init (&_tmp19_, G_TYPE_BOOLEAN); + g_value_init (&_tmp16_, G_TYPE_BOOLEAN); #line 257 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_value_set_boolean (&_tmp19_, _tmp18_); + g_value_set_boolean (&_tmp16_, configuration_facade_get_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 257 "/home/jens/Source/shotwell/src/MediaPage.vala" - data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_COMMENTS, &_tmp19_, NULL, NULL); + data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_COMMENTS, &_tmp16_, NULL, NULL); #line 257 "/home/jens/Source/shotwell/src/MediaPage.vala" - G_IS_VALUE (&_tmp19_) ? (g_value_unset (&_tmp19_), NULL) : NULL; + G_IS_VALUE (&_tmp16_) ? (g_value_unset (&_tmp16_), NULL) : NULL; #line 257 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp17_); + _g_object_unref0 (_tmp15_); #line 257 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp15_); + _data_collection_unref0 (_tmp13_); #line 259 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 259 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp21_ = _tmp20_; + _tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 259 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp22_ = config_facade_get_instance (); + _tmp18_ = _tmp17_; #line 259 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp23_ = _tmp22_; + _tmp19_ = config_facade_get_instance (); #line 259 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp24_ = configuration_facade_get_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp20_ = _tmp19_; #line 259 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_value_init (&_tmp25_, G_TYPE_BOOLEAN); + g_value_init (&_tmp21_, G_TYPE_BOOLEAN); #line 259 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_value_set_boolean (&_tmp25_, _tmp24_); + g_value_set_boolean (&_tmp21_, configuration_facade_get_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 259 "/home/jens/Source/shotwell/src/MediaPage.vala" - data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SHOW_TAGS, &_tmp25_, NULL, NULL); + data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SHOW_TAGS, &_tmp21_, NULL, NULL); #line 259 "/home/jens/Source/shotwell/src/MediaPage.vala" - G_IS_VALUE (&_tmp25_) ? (g_value_unset (&_tmp25_), NULL) : NULL; + G_IS_VALUE (&_tmp21_) ? (g_value_unset (&_tmp21_), NULL) : NULL; #line 259 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp20_); #line 259 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp21_); -#line 261 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp26_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _data_collection_unref0 (_tmp18_); #line 261 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp27_ = _tmp26_; + _tmp22_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 261 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp28_ = media_page_get_thumb_size (self); + _tmp23_ = _tmp22_; #line 261 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_value_init (&_tmp29_, G_TYPE_INT); + g_value_init (&_tmp24_, G_TYPE_INT); #line 261 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_value_set_int (&_tmp29_, _tmp28_); + g_value_set_int (&_tmp24_, media_page_get_thumb_size (self)); #line 261 "/home/jens/Source/shotwell/src/MediaPage.vala" - data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SIZE, &_tmp29_, NULL, NULL); + data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SIZE, &_tmp24_, NULL, NULL); #line 261 "/home/jens/Source/shotwell/src/MediaPage.vala" - G_IS_VALUE (&_tmp29_) ? (g_value_unset (&_tmp29_), NULL) : NULL; + G_IS_VALUE (&_tmp24_) ? (g_value_unset (&_tmp24_), NULL) : NULL; #line 261 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp27_); -#line 262 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp30_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _data_collection_unref0 (_tmp23_); #line 262 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp31_ = _tmp30_; + _tmp25_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 262 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp32_ = config_facade_get_instance (); + _tmp26_ = _tmp25_; #line 262 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp33_ = _tmp32_; + _tmp27_ = config_facade_get_instance (); #line 262 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp34_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp28_ = _tmp27_; #line 262 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_value_init (&_tmp35_, G_TYPE_BOOLEAN); + g_value_init (&_tmp29_, G_TYPE_BOOLEAN); #line 262 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_value_set_boolean (&_tmp35_, _tmp34_); + g_value_set_boolean (&_tmp29_, configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 262 "/home/jens/Source/shotwell/src/MediaPage.vala" - data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SHOW_RATINGS, &_tmp35_, NULL, NULL); + data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SHOW_RATINGS, &_tmp29_, NULL, NULL); #line 262 "/home/jens/Source/shotwell/src/MediaPage.vala" - G_IS_VALUE (&_tmp35_) ? (g_value_unset (&_tmp35_), NULL) : NULL; + G_IS_VALUE (&_tmp29_) ? (g_value_unset (&_tmp29_), NULL) : NULL; #line 262 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp33_); + _g_object_unref0 (_tmp28_); #line 262 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp31_); + _data_collection_unref0 (_tmp26_); #line 264 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp36_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp30_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 264 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp37_ = _tmp36_; + _tmp31_ = _tmp30_; #line 264 "/home/jens/Source/shotwell/src/MediaPage.vala" - data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_COLLECTION, DataCollection)); #line 264 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp37_); + _data_collection_unref0 (_tmp31_); #line 267 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp38_ = drag_and_drop_handler_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp32_ = drag_and_drop_handler_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 267 "/home/jens/Source/shotwell/src/MediaPage.vala" _drag_and_drop_handler_unref0 (self->priv->dnd_handler); #line 267 "/home/jens/Source/shotwell/src/MediaPage.vala" - self->priv->dnd_handler = _tmp38_; + self->priv->dnd_handler = _tmp32_; #line 247 "/home/jens/Source/shotwell/src/MediaPage.vala" return self; -#line 2497 "MediaPage.c" +#line 2926 "MediaPage.c" } -static gint media_page_compute_zoom_scale_increase (gint current_scale) { +static gint +media_page_compute_zoom_scale_increase (gint current_scale) +{ gint result = 0; gint new_scale = 0; gint _tmp0_; gint _tmp1_; gint _tmp2_; gint _tmp3_; - gint _tmp4_; - gint _tmp5_; #line 271 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = current_scale; -#line 271 "/home/jens/Source/shotwell/src/MediaPage.vala" - new_scale = _tmp0_ + MEDIA_PAGE_MANUAL_STEPPING; -#line 272 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = thumbnail_get_MIN_SCALE (); + new_scale = current_scale + MEDIA_PAGE_MANUAL_STEPPING; #line 272 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = _tmp1_; + _tmp0_ = thumbnail_get_MIN_SCALE (); #line 272 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = thumbnail_get_MAX_SCALE (); + _tmp1_ = _tmp0_; #line 272 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = _tmp3_; + _tmp2_ = thumbnail_get_MAX_SCALE (); #line 272 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = CLAMP (new_scale, _tmp2_, _tmp4_); + _tmp3_ = _tmp2_; #line 272 "/home/jens/Source/shotwell/src/MediaPage.vala" - result = _tmp5_; + result = CLAMP (new_scale, _tmp1_, _tmp3_); #line 272 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 2528 "MediaPage.c" +#line 2953 "MediaPage.c" } -static gint media_page_compute_zoom_scale_decrease (gint current_scale) { +static gint +media_page_compute_zoom_scale_decrease (gint current_scale) +{ gint result = 0; gint new_scale = 0; gint _tmp0_; gint _tmp1_; gint _tmp2_; gint _tmp3_; - gint _tmp4_; - gint _tmp5_; -#line 276 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = current_scale; #line 276 "/home/jens/Source/shotwell/src/MediaPage.vala" - new_scale = _tmp0_ - MEDIA_PAGE_MANUAL_STEPPING; -#line 277 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = thumbnail_get_MIN_SCALE (); + new_scale = current_scale - MEDIA_PAGE_MANUAL_STEPPING; #line 277 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = _tmp1_; + _tmp0_ = thumbnail_get_MIN_SCALE (); #line 277 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = thumbnail_get_MAX_SCALE (); + _tmp1_ = _tmp0_; #line 277 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = _tmp3_; + _tmp2_ = thumbnail_get_MAX_SCALE (); #line 277 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = CLAMP (new_scale, _tmp2_, _tmp4_); + _tmp3_ = _tmp2_; #line 277 "/home/jens/Source/shotwell/src/MediaPage.vala" - result = _tmp5_; + result = CLAMP (new_scale, _tmp1_, _tmp3_); #line 277 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 2559 "MediaPage.c" +#line 2980 "MediaPage.c" } -static void media_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { +static void +media_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames) +{ MediaPage * self; - GeeList* _tmp0_; - GeeList* _tmp1_; #line 280 "/home/jens/Source/shotwell/src/MediaPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage); #line 280 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); #line 281 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = ui_filenames; -#line 281 "/home/jens/Source/shotwell/src/MediaPage.vala" - PAGE_CLASS (media_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); -#line 283 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = ui_filenames; + PAGE_CLASS (media_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), ui_filenames); #line 283 "/home/jens/Source/shotwell/src/MediaPage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "media.ui"); -#line 2579 "MediaPage.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "media.ui"); +#line 2997 "MediaPage.c" } -static GVariant* _variant_new23 (gboolean value) { +static GVariant* +_variant_new23 (gboolean value) +{ #line 330 "/home/jens/Source/shotwell/src/MediaPage.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 2586 "MediaPage.c" +#line 3006 "MediaPage.c" } -static GVariant* _variant_new24 (gboolean value) { +static GVariant* +_variant_new24 (gboolean value) +{ #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 2593 "MediaPage.c" +#line 3015 "MediaPage.c" } -static GVariant* _variant_new25 (gboolean value) { +static GVariant* +_variant_new25 (gboolean value) +{ #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 2600 "MediaPage.c" +#line 3024 "MediaPage.c" } -static GVariant* _variant_new26 (gboolean value) { +static GVariant* +_variant_new26 (gboolean value) +{ #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 2607 "MediaPage.c" +#line 3033 "MediaPage.c" } -static GVariant* _variant_new27 (gchar* value) { +static GVariant* +_variant_new27 (gchar* value) +{ #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 2614 "MediaPage.c" +#line 3042 "MediaPage.c" } -static GVariant* _variant_new28 (const gchar* value) { +static GVariant* +_variant_new28 (const gchar* value) +{ #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 2621 "MediaPage.c" +#line 3051 "MediaPage.c" } -static GVariant* _variant_new29 (const gchar* value) { +static GVariant* +_variant_new29 (const gchar* value) +{ #line 338 "/home/jens/Source/shotwell/src/MediaPage.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 2628 "MediaPage.c" +#line 3060 "MediaPage.c" } -static void _media_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self) { +static void +_media_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, + GVariant* value, + gpointer self) +{ #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_raw_developer_changed ((MediaPage*) self, _sender, value); -#line 2635 "MediaPage.c" +#line 3071 "MediaPage.c" } -static void media_page_real_add_actions (Page* base, GActionMap* map) { +static void +media_page_real_add_actions (Page* base, + GActionMap* map) +{ MediaPage * self; - GActionMap* _tmp0_; gboolean sort_order = FALSE; gint sort_by = 0; - gboolean _tmp1_ = FALSE; - gint _tmp2_ = 0; - GActionMap* _tmp3_; - GAction* _tmp4_; - GAction* _tmp5_; - ConfigFacade* _tmp6_; - ConfigFacade* _tmp7_; - gboolean _tmp8_; - GVariant* _tmp9_; - GAction* _tmp10_; - GAction* _tmp11_; - ConfigFacade* _tmp12_; - ConfigFacade* _tmp13_; - gboolean _tmp14_; - GVariant* _tmp15_; - GAction* _tmp16_; + gboolean _tmp0_ = FALSE; + gint _tmp1_ = 0; + GAction* _tmp2_; + GAction* _tmp3_; + ConfigFacade* _tmp4_; + ConfigFacade* _tmp5_; + GVariant* _tmp6_; + GAction* _tmp7_; + GAction* _tmp8_; + ConfigFacade* _tmp9_; + ConfigFacade* _tmp10_; + GVariant* _tmp11_; + GAction* _tmp12_; + GAction* _tmp13_; + ConfigFacade* _tmp14_; + ConfigFacade* _tmp15_; + GVariant* _tmp16_; GAction* _tmp17_; - ConfigFacade* _tmp18_; + GAction* _tmp18_; ConfigFacade* _tmp19_; - gboolean _tmp20_; + ConfigFacade* _tmp20_; GVariant* _tmp21_; GAction* _tmp22_; GAction* _tmp23_; - ConfigFacade* _tmp24_; - ConfigFacade* _tmp25_; - gboolean _tmp26_; + gint _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; GVariant* _tmp27_; - GAction* _tmp28_; - GAction* _tmp29_; - gint _tmp30_; - gchar* _tmp31_; - gchar* _tmp32_; - GVariant* _tmp33_; - const gchar* _tmp34_ = NULL; - gboolean _tmp35_; - GAction* _tmp36_; - GAction* _tmp37_; - GVariant* _tmp38_; + const gchar* _tmp28_ = NULL; + gboolean _tmp29_; + GAction* _tmp30_; + GAction* _tmp31_; + GVariant* _tmp32_; RawDeveloper d = 0; - ConfigFacade* _tmp39_; - ConfigFacade* _tmp40_; - RawDeveloper _tmp41_; - RawDeveloper _tmp42_; - const gchar* _tmp43_ = NULL; - RawDeveloper _tmp44_; + ConfigFacade* _tmp33_; + ConfigFacade* _tmp34_; + RawDeveloper _tmp35_; + const gchar* _tmp36_ = NULL; + RawDeveloper _tmp37_; GSimpleAction* action = NULL; - const GVariantType* _tmp45_; - GVariant* _tmp46_; - GSimpleAction* _tmp47_; - GSimpleAction* _tmp48_; - GActionMap* _tmp49_; + const GVariantType* _tmp38_; + GVariant* _tmp39_; + GSimpleAction* _tmp40_; + GSimpleAction* _tmp41_; #line 322 "/home/jens/Source/shotwell/src/MediaPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage); #line 322 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 323 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = map; -#line 323 "/home/jens/Source/shotwell/src/MediaPage.vala" - PAGE_CLASS (media_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); + PAGE_CLASS (media_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map); #line 327 "/home/jens/Source/shotwell/src/MediaPage.vala" - media_page_get_config_photos_sort (self, &_tmp1_, &_tmp2_); + media_page_get_config_photos_sort (self, &_tmp0_, &_tmp1_); #line 327 "/home/jens/Source/shotwell/src/MediaPage.vala" - sort_order = _tmp1_; + sort_order = _tmp0_; #line 327 "/home/jens/Source/shotwell/src/MediaPage.vala" - sort_by = _tmp2_; -#line 329 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = map; + sort_by = _tmp1_; #line 329 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_action_map_add_action_entries (_tmp3_, MEDIA_PAGE_entries, G_N_ELEMENTS (MEDIA_PAGE_entries), self); -#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle"); -#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = _tmp4_; + g_action_map_add_action_entries (map, MEDIA_PAGE_entries, G_N_ELEMENTS (MEDIA_PAGE_entries), self); #line 330 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = config_facade_get_instance (); + _tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle"); #line 330 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = _tmp6_; + _tmp3_ = _tmp2_; #line 330 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp4_ = config_facade_get_instance (); #line 330 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = _variant_new23 (_tmp8_); + _tmp5_ = _tmp4_; #line 330 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_action_change_state (_tmp5_, _tmp9_); + _tmp6_ = _variant_new23 (configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 330 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_variant_unref0 (_tmp9_); + g_action_change_state (_tmp3_, _tmp6_); #line 330 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp7_); + _g_variant_unref0 (_tmp6_); #line 330 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp5_); +#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala" + _g_object_unref0 (_tmp3_); #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment"); -#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = _tmp10_; + _tmp7_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment"); #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp12_ = config_facade_get_instance (); + _tmp8_ = _tmp7_; #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp13_ = _tmp12_; + _tmp9_ = config_facade_get_instance (); #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp14_ = configuration_facade_get_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp10_ = _tmp9_; #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp15_ = _variant_new24 (_tmp14_); + _tmp11_ = _variant_new24 (configuration_facade_get_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_action_change_state (_tmp11_, _tmp15_); + g_action_change_state (_tmp8_, _tmp11_); #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_variant_unref0 (_tmp15_); + _g_variant_unref0 (_tmp11_); #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp10_); #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp8_); #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings"); -#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = _tmp16_; + _tmp12_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings"); #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp18_ = config_facade_get_instance (); + _tmp13_ = _tmp12_; #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp19_ = _tmp18_; + _tmp14_ = config_facade_get_instance (); #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp20_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp15_ = _tmp14_; #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp21_ = _variant_new25 (_tmp20_); + _tmp16_ = _variant_new25 (configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_action_change_state (_tmp17_, _tmp21_); + g_action_change_state (_tmp13_, _tmp16_); #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_variant_unref0 (_tmp21_); + _g_variant_unref0 (_tmp16_); #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp19_); + _g_object_unref0 (_tmp15_); #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp17_); -#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp22_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags"); + _g_object_unref0 (_tmp13_); #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp23_ = _tmp22_; + _tmp17_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags"); #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp24_ = config_facade_get_instance (); + _tmp18_ = _tmp17_; #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp25_ = _tmp24_; + _tmp19_ = config_facade_get_instance (); #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp26_ = configuration_facade_get_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp20_ = _tmp19_; #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp27_ = _variant_new26 (_tmp26_); + _tmp21_ = _variant_new26 (configuration_facade_get_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_action_change_state (_tmp23_, _tmp27_); + g_action_change_state (_tmp18_, _tmp21_); #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_variant_unref0 (_tmp27_); + _g_variant_unref0 (_tmp21_); #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp25_); + _g_object_unref0 (_tmp20_); #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp18_); #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp28_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SortBy"); + _tmp22_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SortBy"); #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp29_ = _tmp28_; + _tmp23_ = _tmp22_; #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp30_ = sort_by; + _tmp24_ = sort_by; #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp31_ = g_strdup_printf ("%d", _tmp30_); + _tmp25_ = g_strdup_printf ("%d", _tmp24_); #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp32_ = _tmp31_; + _tmp26_ = _tmp25_; #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp33_ = _variant_new27 (_tmp32_); + _tmp27_ = _variant_new27 (_tmp26_); #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_action_change_state (_tmp29_, _tmp33_); + g_action_change_state (_tmp23_, _tmp27_); #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_variant_unref0 (_tmp33_); + _g_variant_unref0 (_tmp27_); #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_free0 (_tmp32_); + _g_free0 (_tmp26_); #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp29_); + _g_object_unref0 (_tmp23_); #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp35_ = sort_order; + _tmp29_ = sort_order; #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp35_) { + if (_tmp29_) { #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp34_ = "ascending"; -#line 2819 "MediaPage.c" + _tmp28_ = "ascending"; +#line 3238 "MediaPage.c" } else { #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp34_ = "descending"; -#line 2823 "MediaPage.c" + _tmp28_ = "descending"; +#line 3242 "MediaPage.c" } #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp36_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Sort"); + _tmp30_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Sort"); #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp37_ = _tmp36_; + _tmp31_ = _tmp30_; #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp38_ = _variant_new28 (_tmp34_); + _tmp32_ = _variant_new28 (_tmp28_); #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_action_change_state (_tmp37_, _tmp38_); + g_action_change_state (_tmp31_, _tmp32_); #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_variant_unref0 (_tmp38_); + _g_variant_unref0 (_tmp32_); #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp37_); -#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp39_ = config_facade_get_instance (); + _g_object_unref0 (_tmp31_); #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp40_ = _tmp39_; + _tmp33_ = config_facade_get_instance (); #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp41_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp34_ = _tmp33_; #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp42_ = _tmp41_; + _tmp35_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp40_); + _g_object_unref0 (_tmp34_); #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala" - d = _tmp42_; + d = _tmp35_; #line 339 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp44_ = d; + _tmp37_ = d; #line 339 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp44_ == RAW_DEVELOPER_SHOTWELL) { + if (_tmp37_ == RAW_DEVELOPER_SHOTWELL) { #line 339 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp43_ = "Shotwell"; -#line 2855 "MediaPage.c" + _tmp36_ = "Shotwell"; +#line 3272 "MediaPage.c" } else { #line 339 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp43_ = "Camera"; -#line 2859 "MediaPage.c" + _tmp36_ = "Camera"; +#line 3276 "MediaPage.c" } #line 338 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp45_ = G_VARIANT_TYPE_STRING; + _tmp38_ = G_VARIANT_TYPE_STRING; #line 338 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp46_ = _variant_new29 (_tmp43_); + _tmp39_ = _variant_new29 (_tmp36_); #line 338 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp47_ = g_simple_action_new_stateful ("RawDeveloper", _tmp45_, _tmp46_); + _tmp40_ = g_simple_action_new_stateful ("RawDeveloper", _tmp38_, _tmp39_); #line 338 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp48_ = _tmp47_; + _tmp41_ = _tmp40_; #line 338 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_variant_unref0 (_tmp46_); + _g_variant_unref0 (_tmp39_); #line 338 "/home/jens/Source/shotwell/src/MediaPage.vala" - action = _tmp48_; + action = _tmp41_; #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala" g_signal_connect_object (action, "change-state", (GCallback) _media_page_on_raw_developer_changed_g_simple_action_change_state, self, 0); #line 341 "/home/jens/Source/shotwell/src/MediaPage.vala" g_simple_action_set_enabled (action, TRUE); #line 342 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp49_ = map; -#line 342 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_action_map_add_action (_tmp49_, G_TYPE_CHECK_INSTANCE_CAST (action, g_action_get_type (), GAction)); + g_action_map_add_action (map, G_TYPE_CHECK_INSTANCE_CAST (action, g_action_get_type (), GAction)); #line 322 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (action); -#line 2883 "MediaPage.c" +#line 3298 "MediaPage.c" } -static void media_page_real_remove_actions (Page* base, GActionMap* map) { +static void +media_page_real_remove_actions (Page* base, + GActionMap* map) +{ MediaPage * self; - GActionMap* _tmp0_; #line 345 "/home/jens/Source/shotwell/src/MediaPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage); #line 345 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 346 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = map; -#line 346 "/home/jens/Source/shotwell/src/MediaPage.vala" - PAGE_CLASS (media_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); -#line 2898 "MediaPage.c" + PAGE_CLASS (media_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map); +#line 3313 "MediaPage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -2906,317 +3321,240 @@ static void media_page_real_remove_actions (Page* base, GActionMap* map) { entry_collection_length1 = G_N_ELEMENTS (MEDIA_PAGE_entries); #line 347 "/home/jens/Source/shotwell/src/MediaPage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (MEDIA_PAGE_entries); entry_it = entry_it + 1) { -#line 2910 "MediaPage.c" +#line 3325 "MediaPage.c" GActionEntry entry = {0}; #line 347 "/home/jens/Source/shotwell/src/MediaPage.vala" entry = entry_collection[entry_it]; -#line 2914 "MediaPage.c" +#line 3329 "MediaPage.c" { - GActionMap* _tmp1_; - GActionEntry _tmp2_; - const gchar* _tmp3_; + GActionEntry _tmp0_; + const gchar* _tmp1_; #line 348 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = map; + _tmp0_ = entry; #line 348 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = entry; + _tmp1_ = _tmp0_.name; #line 348 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_.name; -#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_action_map_remove_action (_tmp1_, _tmp3_); -#line 2927 "MediaPage.c" + g_action_map_remove_action (map, _tmp1_); +#line 3339 "MediaPage.c" } } } } -static void media_page_real_update_actions (Page* base, gint selected_count, gint count) { +static void +media_page_real_update_actions (Page* base, + gint selected_count, + gint count) +{ MediaPage * self; gint _tmp0_; gint _tmp1_; gint _tmp2_; gint _tmp3_; - gint _tmp4_; - gint _tmp5_; - gint _tmp6_; - gint _tmp7_; - gint _tmp8_; - gint _tmp9_; - gint _tmp10_; - gboolean _tmp11_; - gint _tmp13_; - gboolean _tmp14_ = FALSE; - gint _tmp15_; - gint _tmp20_; - gint _tmp21_; - gint _tmp22_; + gboolean _tmp4_ = FALSE; #line 352 "/home/jens/Source/shotwell/src/MediaPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage); #line 353 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = selected_count; -#line 353 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Export", _tmp0_ > 0); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Export", selected_count > 0); #line 354 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = selected_count; -#line 354 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditTitle", _tmp1_ > 0); -#line 355 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = selected_count; + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditTitle", selected_count > 0); #line 355 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditComment", _tmp2_ > 0); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditComment", selected_count > 0); #line 356 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = media_page_get_thumb_size (self); + _tmp0_ = thumbnail_get_MAX_SCALE (); #line 356 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = thumbnail_get_MAX_SCALE (); -#line 356 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = _tmp4_; + _tmp1_ = _tmp0_; #line 356 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp3_ < _tmp5_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", media_page_get_thumb_size (self) < _tmp1_); #line 357 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = media_page_get_thumb_size (self); + _tmp2_ = thumbnail_get_MIN_SCALE (); #line 357 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = thumbnail_get_MIN_SCALE (); -#line 357 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = _tmp7_; + _tmp3_ = _tmp2_; #line 357 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp6_ > _tmp8_); -#line 358 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = selected_count; + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", media_page_get_thumb_size (self) > _tmp3_); #line 358 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveFromLibrary", _tmp9_ > 0); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveFromLibrary", selected_count > 0); #line 359 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = selected_count; -#line 359 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MoveToTrash", _tmp10_ > 0); -#line 361 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = desktop_integration_is_send_to_installed (); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MoveToTrash", selected_count > 0); #line 361 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp11_) { -#line 2996 "MediaPage.c" - gint _tmp12_; -#line 362 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp12_ = selected_count; + if (desktop_integration_is_send_to_installed ()) { #line 362 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", _tmp12_ > 0); -#line 3002 "MediaPage.c" + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", selected_count > 0); +#line 3385 "MediaPage.c" } else { #line 364 "/home/jens/Source/shotwell/src/MediaPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", FALSE); -#line 3006 "MediaPage.c" +#line 3389 "MediaPage.c" } #line 366 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp13_ = selected_count; -#line 366 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rate", _tmp13_ > 0); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rate", selected_count > 0); #line 367 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_update_rating_sensitivities (self); #line 369 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_update_development_menu_item_sensitivity (self); #line 371 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp15_ = selected_count; -#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp15_ == 1) { -#line 3020 "MediaPage.c" - ViewCollection* _tmp16_; - ViewCollection* _tmp17_; - DataSource* _tmp18_; - DataSource* _tmp19_; + if (selected_count == 1) { +#line 3399 "MediaPage.c" + ViewCollection* _tmp5_; + ViewCollection* _tmp6_; + DataSource* _tmp7_; + DataSource* _tmp8_; #line 372 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 372 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = _tmp16_; + _tmp6_ = _tmp5_; #line 372 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp18_ = view_collection_get_selected_source_at (_tmp17_, 0); + _tmp7_ = view_collection_get_selected_source_at (_tmp6_, 0); #line 372 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp19_ = _tmp18_; + _tmp8_ = _tmp7_; #line 372 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp14_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_VIDEO); + _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_VIDEO); #line 372 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp19_); + _g_object_unref0 (_tmp8_); #line 372 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp17_); -#line 3039 "MediaPage.c" + _data_collection_unref0 (_tmp6_); +#line 3418 "MediaPage.c" } else { #line 371 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp14_ = FALSE; -#line 3043 "MediaPage.c" + _tmp4_ = FALSE; +#line 3422 "MediaPage.c" } #line 371 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PlayVideo", _tmp14_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PlayVideo", _tmp4_); #line 374 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp20_ = selected_count; -#line 374 "/home/jens/Source/shotwell/src/MediaPage.vala" - media_page_update_flag_action (self, _tmp20_); -#line 376 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp21_ = selected_count; + media_page_update_flag_action (self, selected_count); #line 376 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp22_ = count; -#line 376 "/home/jens/Source/shotwell/src/MediaPage.vala" - PAGE_CLASS (media_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp21_, _tmp22_); -#line 3057 "MediaPage.c" + PAGE_CLASS (media_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), selected_count, count); +#line 3430 "MediaPage.c" } -static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) { +static void +media_page_on_media_altered (MediaPage* self, + GeeMap* altered) +{ #line 379 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 379 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (GEE_IS_MAP (altered)); -#line 3066 "MediaPage.c" +#line 3442 "MediaPage.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = altered; + _tmp0_ = gee_map_get_keys (altered); #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp2_ = _tmp1_; #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_; -#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala" while (TRUE) { -#line 3093 "MediaPage.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 3466 "MediaPage.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; + GeeIterator* _tmp6_; + gpointer _tmp7_; + DataObject* _tmp8_; gpointer _tmp9_; - GeeMap* _tmp10_; - DataObject* _tmp11_; - gpointer _tmp12_; - Alteration* _tmp13_; - gboolean _tmp14_; - gboolean _tmp15_; -#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = _object_it; + Alteration* _tmp10_; + gboolean _tmp11_; #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 3113 "MediaPage.c" +#line 3481 "MediaPage.c" } #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala" - object = (DataObject*) _tmp9_; -#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = altered; + object = (DataObject*) _tmp7_; #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = object; + _tmp8_ = object; #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp12_ = gee_map_get (_tmp10_, _tmp11_); + _tmp9_ = gee_map_get (altered, _tmp8_); #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp13_ = (Alteration*) _tmp12_; + _tmp10_ = (Alteration*) _tmp9_; #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp14_ = alteration_has_detail (_tmp13_, "metadata", "flagged"); -#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp15_ = _tmp14_; + _tmp11_ = alteration_has_detail (_tmp10_, "metadata", "flagged"); #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala" - _alteration_unref0 (_tmp13_); + _alteration_unref0 (_tmp10_); #line 381 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp15_) { -#line 3137 "MediaPage.c" - ViewCollection* _tmp16_; - ViewCollection* _tmp17_; - gint _tmp18_; + if (_tmp11_) { +#line 3501 "MediaPage.c" + ViewCollection* _tmp12_; + ViewCollection* _tmp13_; #line 382 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 382 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = _tmp16_; + _tmp13_ = _tmp12_; #line 382 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp18_ = view_collection_get_selected_count (_tmp17_); + media_page_update_flag_action (self, view_collection_get_selected_count (_tmp13_)); #line 382 "/home/jens/Source/shotwell/src/MediaPage.vala" - media_page_update_flag_action (self, _tmp18_); -#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp17_); + _data_collection_unref0 (_tmp13_); #line 384 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (object); #line 384 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 3155 "MediaPage.c" +#line 3516 "MediaPage.c" } #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (object); -#line 3159 "MediaPage.c" +#line 3520 "MediaPage.c" } #line 380 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_object_it); -#line 3163 "MediaPage.c" +#line 3524 "MediaPage.c" } } -static void media_page_update_rating_sensitivities (MediaPage* self) { - gboolean _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; - gboolean _tmp7_; - gboolean _tmp8_; +static void +media_page_update_rating_sensitivities (MediaPage* self) +{ #line 389 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 390 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = media_page_can_rate_selected (self, RATING_REJECTED); -#line 390 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected", _tmp0_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected", media_page_can_rate_selected (self, RATING_REJECTED)); #line 391 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = media_page_can_rate_selected (self, RATING_UNRATED); -#line 391 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated", _tmp1_); -#line 392 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = media_page_can_rate_selected (self, RATING_ONE); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated", media_page_can_rate_selected (self, RATING_UNRATED)); #line 392 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne", _tmp2_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne", media_page_can_rate_selected (self, RATING_ONE)); #line 393 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = media_page_can_rate_selected (self, RATING_TWO); -#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo", _tmp3_); -#line 394 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = media_page_can_rate_selected (self, RATING_THREE); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo", media_page_can_rate_selected (self, RATING_TWO)); #line 394 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree", _tmp4_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree", media_page_can_rate_selected (self, RATING_THREE)); #line 395 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = media_page_can_rate_selected (self, RATING_FOUR); -#line 395 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour", _tmp5_); -#line 396 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = media_page_can_rate_selected (self, RATING_FIVE); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour", media_page_can_rate_selected (self, RATING_FOUR)); #line 396 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive", _tmp6_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive", media_page_can_rate_selected (self, RATING_FIVE)); #line 397 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = media_page_can_increase_selected_rating (self); -#line 397 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating", _tmp7_); -#line 398 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = media_page_can_decrease_selected_rating (self); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating", media_page_can_increase_selected_rating (self)); #line 398 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", _tmp8_); -#line 3216 "MediaPage.c" + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", media_page_can_decrease_selected_rating (self)); +#line 3552 "MediaPage.c" } -static void media_page_update_development_menu_item_sensitivity (MediaPage* self) { +static void +media_page_update_development_menu_item_sensitivity (MediaPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; GeeList* _tmp2_; @@ -3225,7 +3563,7 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self gint _tmp5_; gboolean _tmp6_; gboolean is_raw = FALSE; - gboolean _tmp27_; + gboolean _tmp26_; #line 401 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 402 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -3252,11 +3590,11 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", FALSE); #line 404 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 3256 "MediaPage.c" +#line 3594 "MediaPage.c" } #line 408 "/home/jens/Source/shotwell/src/MediaPage.vala" is_raw = FALSE; -#line 3260 "MediaPage.c" +#line 3598 "MediaPage.c" { GeeList* _view_list = NULL; ViewCollection* _tmp7_; @@ -3292,7 +3630,7 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self _view_index = -1; #line 409 "/home/jens/Source/shotwell/src/MediaPage.vala" while (TRUE) { -#line 3296 "MediaPage.c" +#line 3634 "MediaPage.c" gint _tmp14_; gint _tmp15_; gint _tmp16_; @@ -3318,7 +3656,7 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self if (!(_tmp15_ < _tmp16_)) { #line 409 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 3322 "MediaPage.c" +#line 3660 "MediaPage.c" } #line 409 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp17_ = _view_list; @@ -3338,7 +3676,7 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self if (_tmp22_ == NULL) { #line 410 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp21_); -#line 3342 "MediaPage.c" +#line 3680 "MediaPage.c" } #line 410 "/home/jens/Source/shotwell/src/MediaPage.vala" photo = _tmp22_; @@ -3346,20 +3684,17 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self _tmp24_ = photo; #line 411 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp24_ != NULL) { -#line 3350 "MediaPage.c" +#line 3688 "MediaPage.c" Photo* _tmp25_; - PhotoFileFormat _tmp26_; #line 411 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp25_ = photo; #line 411 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp26_ = photo_get_master_file_format (_tmp25_); -#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp23_ = _tmp26_ == PHOTO_FILE_FORMAT_RAW; -#line 3359 "MediaPage.c" + _tmp23_ = photo_get_master_file_format (_tmp25_) == PHOTO_FILE_FORMAT_RAW; +#line 3694 "MediaPage.c" } else { #line 411 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp23_ = FALSE; -#line 3363 "MediaPage.c" +#line 3698 "MediaPage.c" } #line 411 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp23_) { @@ -3371,46 +3706,50 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self _g_object_unref0 (view); #line 414 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 3375 "MediaPage.c" +#line 3710 "MediaPage.c" } #line 409 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (photo); #line 409 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (view); -#line 3381 "MediaPage.c" +#line 3716 "MediaPage.c" } #line 409 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_view_list); -#line 3385 "MediaPage.c" +#line 3720 "MediaPage.c" } #line 419 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp27_ = is_raw; + _tmp26_ = is_raw; #line 419 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", _tmp27_); -#line 3391 "MediaPage.c" + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", _tmp26_); +#line 3726 "MediaPage.c" } -static void media_page_update_flag_action (MediaPage* self, gint selected_count) { - gint _tmp0_; +static void +media_page_update_flag_action (MediaPage* self, + gint selected_count) +{ #line 422 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 423 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = selected_count; -#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", _tmp0_ > 0); -#line 3403 "MediaPage.c" + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", selected_count > 0); +#line 3738 "MediaPage.c" } -static gpointer _core_tracker_ref0 (gpointer self) { +static gpointer +_core_tracker_ref0 (gpointer self) +{ #line 427 "/home/jens/Source/shotwell/src/MediaPage.vala" return self ? core_tracker_ref (self) : NULL; -#line 3410 "MediaPage.c" +#line 3747 "MediaPage.c" } -static CoreViewTracker* media_page_real_get_view_tracker (CheckerboardPage* base) { +static CoreViewTracker* +media_page_real_get_view_tracker (CheckerboardPage* base) +{ MediaPage * self; CoreViewTracker* result = NULL; MediaViewTracker* _tmp0_; @@ -3425,20 +3764,21 @@ static CoreViewTracker* media_page_real_get_view_tracker (CheckerboardPage* base result = _tmp1_; #line 427 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3429 "MediaPage.c" +#line 3768 "MediaPage.c" } -void media_page_set_display_ratings (MediaPage* self, gboolean display) { +void +media_page_set_display_ratings (MediaPage* self, + gboolean display) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; ViewCollection* _tmp2_; ViewCollection* _tmp3_; - gboolean _tmp4_; - GValue _tmp5_ = {0}; + GValue _tmp4_ = {0}; + ViewCollection* _tmp5_; ViewCollection* _tmp6_; - ViewCollection* _tmp7_; - gboolean _tmp8_; #line 430 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 431 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -3454,38 +3794,37 @@ void media_page_set_display_ratings (MediaPage* self, gboolean display) { #line 432 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp3_ = _tmp2_; #line 432 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = display; + g_value_init (&_tmp4_, G_TYPE_BOOLEAN); #line 432 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_value_init (&_tmp5_, G_TYPE_BOOLEAN); + g_value_set_boolean (&_tmp4_, display); #line 432 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_value_set_boolean (&_tmp5_, _tmp4_); + data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SHOW_RATINGS, &_tmp4_, NULL, NULL); #line 432 "/home/jens/Source/shotwell/src/MediaPage.vala" - data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SHOW_RATINGS, &_tmp5_, NULL, NULL); -#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala" - G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL; + G_IS_VALUE (&_tmp4_) ? (g_value_unset (&_tmp4_), NULL) : NULL; #line 432 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp3_); #line 433 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 433 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 433 "/home/jens/Source/shotwell/src/MediaPage.vala" - data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection)); #line 433 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp7_); -#line 435 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = display; + _data_collection_unref0 (_tmp6_); #line 435 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings", _tmp8_); -#line 3481 "MediaPage.c" + page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings", display); +#line 3817 "MediaPage.c" } -static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) { +static gboolean +media_page_can_rate_selected (MediaPage* self, + Rating rating) +{ gboolean result = FALSE; #line 438 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE); -#line 3489 "MediaPage.c" +#line 3828 "MediaPage.c" { GeeList* _view_list = NULL; ViewCollection* _tmp0_; @@ -3521,7 +3860,7 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) { _view_index = -1; #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala" while (TRUE) { -#line 3525 "MediaPage.c" +#line 3864 "MediaPage.c" gint _tmp7_; gint _tmp8_; gint _tmp9_; @@ -3532,9 +3871,7 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) { DataView* _tmp13_; MediaSource* _tmp14_; MediaSource* _tmp15_; - Rating _tmp16_; - Rating _tmp17_; - gboolean _tmp18_; + gboolean _tmp16_; #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp7_ = _view_index; #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -3547,7 +3884,7 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) { if (!(_tmp8_ < _tmp9_)) { #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 3551 "MediaPage.c" +#line 3888 "MediaPage.c" } #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp10_ = _view_list; @@ -3564,15 +3901,11 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) { #line 440 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp15_ = _tmp14_; #line 440 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = media_source_get_rating (_tmp15_); -#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = rating; -#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp18_ = _tmp16_ != _tmp17_; + _tmp16_ = media_source_get_rating (_tmp15_) != rating; #line 440 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp15_); #line 440 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp18_) { + if (_tmp16_) { #line 441 "/home/jens/Source/shotwell/src/MediaPage.vala" result = TRUE; #line 441 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -3581,29 +3914,31 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) { _g_object_unref0 (_view_list); #line 441 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3585 "MediaPage.c" +#line 3918 "MediaPage.c" } #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (view); -#line 3589 "MediaPage.c" +#line 3922 "MediaPage.c" } #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_view_list); -#line 3593 "MediaPage.c" +#line 3926 "MediaPage.c" } #line 444 "/home/jens/Source/shotwell/src/MediaPage.vala" result = FALSE; #line 444 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3599 "MediaPage.c" +#line 3932 "MediaPage.c" } -static gboolean media_page_can_increase_selected_rating (MediaPage* self) { +static gboolean +media_page_can_increase_selected_rating (MediaPage* self) +{ gboolean result = FALSE; #line 447 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE); -#line 3607 "MediaPage.c" +#line 3942 "MediaPage.c" { GeeList* _view_list = NULL; ViewCollection* _tmp0_; @@ -3639,7 +3974,7 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) { _view_index = -1; #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala" while (TRUE) { -#line 3643 "MediaPage.c" +#line 3978 "MediaPage.c" gint _tmp7_; gint _tmp8_; gint _tmp9_; @@ -3650,9 +3985,7 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) { DataView* _tmp13_; MediaSource* _tmp14_; MediaSource* _tmp15_; - Rating _tmp16_; - gboolean _tmp17_; - gboolean _tmp18_; + gboolean _tmp16_; #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp7_ = _view_index; #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -3665,7 +3998,7 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) { if (!(_tmp8_ < _tmp9_)) { #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 3669 "MediaPage.c" +#line 4002 "MediaPage.c" } #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp10_ = _view_list; @@ -3682,15 +4015,11 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) { #line 449 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp15_ = _tmp14_; #line 449 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = media_source_get_rating (_tmp15_); -#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = rating_can_increase (_tmp16_); -#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp18_ = _tmp17_; + _tmp16_ = rating_can_increase (media_source_get_rating (_tmp15_)); #line 449 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp15_); #line 449 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp18_) { + if (_tmp16_) { #line 450 "/home/jens/Source/shotwell/src/MediaPage.vala" result = TRUE; #line 450 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -3699,29 +4028,31 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) { _g_object_unref0 (_view_list); #line 450 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3703 "MediaPage.c" +#line 4032 "MediaPage.c" } #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (view); -#line 3707 "MediaPage.c" +#line 4036 "MediaPage.c" } #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_view_list); -#line 3711 "MediaPage.c" +#line 4040 "MediaPage.c" } #line 453 "/home/jens/Source/shotwell/src/MediaPage.vala" result = FALSE; #line 453 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3717 "MediaPage.c" +#line 4046 "MediaPage.c" } -static gboolean media_page_can_decrease_selected_rating (MediaPage* self) { +static gboolean +media_page_can_decrease_selected_rating (MediaPage* self) +{ gboolean result = FALSE; #line 456 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE); -#line 3725 "MediaPage.c" +#line 4056 "MediaPage.c" { GeeList* _view_list = NULL; ViewCollection* _tmp0_; @@ -3757,7 +4088,7 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) { _view_index = -1; #line 457 "/home/jens/Source/shotwell/src/MediaPage.vala" while (TRUE) { -#line 3761 "MediaPage.c" +#line 4092 "MediaPage.c" gint _tmp7_; gint _tmp8_; gint _tmp9_; @@ -3768,9 +4099,7 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) { DataView* _tmp13_; MediaSource* _tmp14_; MediaSource* _tmp15_; - Rating _tmp16_; - gboolean _tmp17_; - gboolean _tmp18_; + gboolean _tmp16_; #line 457 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp7_ = _view_index; #line 457 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -3783,7 +4112,7 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) { if (!(_tmp8_ < _tmp9_)) { #line 457 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 3787 "MediaPage.c" +#line 4116 "MediaPage.c" } #line 457 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp10_ = _view_list; @@ -3800,15 +4129,11 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) { #line 458 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp15_ = _tmp14_; #line 458 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = media_source_get_rating (_tmp15_); -#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = rating_can_decrease (_tmp16_); -#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp18_ = _tmp17_; + _tmp16_ = rating_can_decrease (media_source_get_rating (_tmp15_)); #line 458 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp15_); #line 458 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp18_) { + if (_tmp16_) { #line 459 "/home/jens/Source/shotwell/src/MediaPage.vala" result = TRUE; #line 459 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -3817,25 +4142,27 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) { _g_object_unref0 (_view_list); #line 459 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3821 "MediaPage.c" +#line 4146 "MediaPage.c" } #line 457 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (view); -#line 3825 "MediaPage.c" +#line 4150 "MediaPage.c" } #line 457 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_view_list); -#line 3829 "MediaPage.c" +#line 4154 "MediaPage.c" } #line 462 "/home/jens/Source/shotwell/src/MediaPage.vala" result = FALSE; #line 462 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3835 "MediaPage.c" +#line 4160 "MediaPage.c" } -MediaPageZoomSliderAssembly* media_page_create_zoom_slider_assembly (MediaPage* self) { +MediaPageZoomSliderAssembly* +media_page_create_zoom_slider_assembly (MediaPage* self) +{ MediaPageZoomSliderAssembly* result = NULL; MediaPageZoomSliderAssembly* _tmp0_; #line 465 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -3848,87 +4175,77 @@ MediaPageZoomSliderAssembly* media_page_create_zoom_slider_assembly (MediaPage* result = _tmp0_; #line 466 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3852 "MediaPage.c" +#line 4179 "MediaPage.c" } -static gboolean media_page_real_on_mousewheel_up (Page* base, GdkEventScroll* event) { +static gboolean +media_page_real_on_mousewheel_up (Page* base, + GdkEventScroll* event) +{ MediaPage * self; gboolean result = FALSE; - GdkEventScroll* _tmp0_; - GdkModifierType _tmp1_; + GdkModifierType _tmp0_; #line 469 "/home/jens/Source/shotwell/src/MediaPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage); #line 469 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (event != NULL, FALSE); #line 470 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = event; + _tmp0_ = event->state; #line 470 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = _tmp0_->state; -#line 470 "/home/jens/Source/shotwell/src/MediaPage.vala" - if ((_tmp1_ & GDK_CONTROL_MASK) != 0) { + if ((_tmp0_ & GDK_CONTROL_MASK) != 0) { #line 471 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_increase_zoom_level (self); #line 472 "/home/jens/Source/shotwell/src/MediaPage.vala" result = TRUE; #line 472 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3877 "MediaPage.c" +#line 4204 "MediaPage.c" } else { - GdkEventScroll* _tmp2_; - gboolean _tmp3_; #line 474 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = event; -#line 474 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = PAGE_CLASS (media_page_parent_class)->on_mousewheel_up (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp2_); -#line 474 "/home/jens/Source/shotwell/src/MediaPage.vala" - result = _tmp3_; + result = PAGE_CLASS (media_page_parent_class)->on_mousewheel_up (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), event); #line 474 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3889 "MediaPage.c" +#line 4210 "MediaPage.c" } } -static gboolean media_page_real_on_mousewheel_down (Page* base, GdkEventScroll* event) { +static gboolean +media_page_real_on_mousewheel_down (Page* base, + GdkEventScroll* event) +{ MediaPage * self; gboolean result = FALSE; - GdkEventScroll* _tmp0_; - GdkModifierType _tmp1_; + GdkModifierType _tmp0_; #line 478 "/home/jens/Source/shotwell/src/MediaPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage); #line 478 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (event != NULL, FALSE); #line 479 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = event; + _tmp0_ = event->state; #line 479 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = _tmp0_->state; -#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala" - if ((_tmp1_ & GDK_CONTROL_MASK) != 0) { + if ((_tmp0_ & GDK_CONTROL_MASK) != 0) { #line 480 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_decrease_zoom_level (self); #line 481 "/home/jens/Source/shotwell/src/MediaPage.vala" result = TRUE; #line 481 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3915 "MediaPage.c" +#line 4236 "MediaPage.c" } else { - GdkEventScroll* _tmp2_; - gboolean _tmp3_; -#line 483 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = event; #line 483 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = PAGE_CLASS (media_page_parent_class)->on_mousewheel_down (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp2_); -#line 483 "/home/jens/Source/shotwell/src/MediaPage.vala" - result = _tmp3_; + result = PAGE_CLASS (media_page_parent_class)->on_mousewheel_down (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), event); #line 483 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3927 "MediaPage.c" +#line 4242 "MediaPage.c" } } -static void media_page_on_send_to (MediaPage* self) { +static void +media_page_on_send_to (MediaPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; GeeList* _tmp2_; @@ -3949,24 +4266,25 @@ static void media_page_on_send_to (MediaPage* self) { _g_object_unref0 (_tmp3_); #line 488 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp1_); -#line 3953 "MediaPage.c" +#line 4270 "MediaPage.c" } -void media_page_on_play_video (MediaPage* self) { +void +media_page_on_play_video (MediaPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; Video* video = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + DataView* _tmp5_; DataView* _tmp6_; - DataView* _tmp7_; - DataSource* _tmp8_; + DataSource* _tmp7_; + Video* _tmp8_; Video* _tmp9_; Video* _tmp10_; - Video* _tmp11_; GError * _inner_error_ = NULL; #line 491 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); @@ -3975,78 +4293,76 @@ void media_page_on_play_video (MediaPage* self) { #line 492 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = _tmp0_; #line 492 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 492 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_ != 1; + _tmp2_ = view_collection_get_selected_count (_tmp1_) != 1; #line 492 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp1_); #line 492 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 493 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 3988 "MediaPage.c" +#line 4304 "MediaPage.c" } #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = view_collection_get_selected_at (_tmp5_, 0); + _tmp5_ = view_collection_get_selected_at (_tmp4_, 0); #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = data_view_get_source (_tmp7_); + _tmp7_ = data_view_get_source (_tmp6_); #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_VIDEO) ? ((Video*) _tmp8_) : NULL; + _tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_VIDEO) ? ((Video*) _tmp7_) : NULL; #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp9_ == NULL) { + if (_tmp8_ == NULL) { #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp8_); -#line 4006 "MediaPage.c" + _g_object_unref0 (_tmp7_); +#line 4322 "MediaPage.c" } #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 495 "/home/jens/Source/shotwell/src/MediaPage.vala" - video = _tmp10_; + video = _tmp9_; #line 496 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = video; + _tmp10_ = video; #line 496 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp11_ == NULL) { + if (_tmp10_ == NULL) { #line 497 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (video); #line 497 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 4024 "MediaPage.c" +#line 4340 "MediaPage.c" } { - Video* _tmp12_; + Video* _tmp11_; + GFile* _tmp12_; GFile* _tmp13_; - GFile* _tmp14_; + gchar* _tmp14_; gchar* _tmp15_; - gchar* _tmp16_; #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp12_ = video; + _tmp11_ = video; #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp13_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp12_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource)); #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp15_ = g_file_get_uri (_tmp14_); + _tmp14_ = g_file_get_uri (_tmp13_); #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_app_info_launch_default_for_uri (_tmp16_, NULL, &_inner_error_); + g_app_info_launch_default_for_uri (_tmp15_, NULL, &_inner_error_); #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp15_); #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp13_); #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4050 "MediaPage.c" +#line 4366 "MediaPage.c" goto __catch570_g_error; } } @@ -4054,29 +4370,29 @@ void media_page_on_play_video (MediaPage* self) { __catch570_g_error: { GError* e = NULL; - GError* _tmp17_; - const gchar* _tmp18_; + GError* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; gchar* _tmp19_; - gchar* _tmp20_; #line 499 "/home/jens/Source/shotwell/src/MediaPage.vala" e = _inner_error_; #line 499 "/home/jens/Source/shotwell/src/MediaPage.vala" _inner_error_ = NULL; #line 502 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = e; + _tmp16_ = e; #line 502 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp18_ = _tmp17_->message; + _tmp17_ = _tmp16_->message; #line 502 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp19_ = g_strdup_printf (_ ("Shotwell was unable to play the selected video:\n%s"), _tmp18_); + _tmp18_ = g_strdup_printf (_ ("Shotwell was unable to play the selected video:\n%s"), _tmp17_); #line 502 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 502 "/home/jens/Source/shotwell/src/MediaPage.vala" - app_window_error_message (_tmp20_, NULL); + app_window_error_message (_tmp19_, NULL); #line 502 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp19_); #line 499 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_error_free0 (e); -#line 4080 "MediaPage.c" +#line 4396 "MediaPage.c" } __finally570: #line 499 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -4089,58 +4405,60 @@ void media_page_on_play_video (MediaPage* self) { g_clear_error (&_inner_error_); #line 499 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 4093 "MediaPage.c" +#line 4409 "MediaPage.c" } #line 491 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (video); -#line 4097 "MediaPage.c" +#line 4413 "MediaPage.c" } -static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* event) { +static gboolean +media_page_real_on_app_key_pressed (Page* base, + GdkEventKey* event) +{ MediaPage * self; gboolean result = FALSE; gboolean handled = FALSE; - GdkEventKey* _tmp0_; - guint _tmp1_; + guint _tmp0_; + const gchar* _tmp1_; const gchar* _tmp2_; - const gchar* _tmp3_; - GQuark _tmp5_ = 0U; + GQuark _tmp4_ = 0U; #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - static GQuark _tmp4_label0 = 0; + static GQuark _tmp3_label0 = 0; #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - static GQuark _tmp4_label1 = 0; + static GQuark _tmp3_label1 = 0; #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - static GQuark _tmp4_label2 = 0; + static GQuark _tmp3_label2 = 0; #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - static GQuark _tmp4_label3 = 0; + static GQuark _tmp3_label3 = 0; #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - static GQuark _tmp4_label4 = 0; + static GQuark _tmp3_label4 = 0; #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - static GQuark _tmp4_label5 = 0; + static GQuark _tmp3_label5 = 0; #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - static GQuark _tmp4_label6 = 0; + static GQuark _tmp3_label6 = 0; #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - static GQuark _tmp4_label7 = 0; + static GQuark _tmp3_label7 = 0; #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - static GQuark _tmp4_label8 = 0; + static GQuark _tmp3_label8 = 0; #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - static GQuark _tmp4_label9 = 0; + static GQuark _tmp3_label9 = 0; #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - static GQuark _tmp4_label10 = 0; + static GQuark _tmp3_label10 = 0; #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - static GQuark _tmp4_label11 = 0; + static GQuark _tmp3_label11 = 0; #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - static GQuark _tmp4_label12 = 0; + static GQuark _tmp3_label12 = 0; #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - static GQuark _tmp4_label13 = 0; + static GQuark _tmp3_label13 = 0; #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - static GQuark _tmp4_label14 = 0; + static GQuark _tmp3_label14 = 0; #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - static GQuark _tmp4_label15 = 0; -#line 4142 "MediaPage.c" - gboolean _tmp6_ = FALSE; - gboolean _tmp7_; + static GQuark _tmp3_label15 = 0; +#line 4460 "MediaPage.c" + gboolean _tmp5_ = FALSE; + gboolean _tmp6_; #line 507 "/home/jens/Source/shotwell/src/MediaPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage); #line 507 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -4148,234 +4466,223 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve #line 508 "/home/jens/Source/shotwell/src/MediaPage.vala" handled = TRUE; #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = event; + _tmp0_ = event->keyval; #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = _tmp0_->keyval; + _tmp1_ = gdk_keyval_name (_tmp0_); #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = gdk_keyval_name (_tmp1_); -#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_); + _tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_); #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("equal")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("plus"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("KP_Add"))))) { + if (((_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("equal")))) || (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("plus"))))) || (_tmp4_ == ((0 != _tmp3_label2) ? _tmp3_label2 : (_tmp3_label2 = g_quark_from_static_string ("KP_Add"))))) { #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4165 "MediaPage.c" +#line 4481 "MediaPage.c" default: { #line 513 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize"); #line 514 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4172 "MediaPage.c" +#line 4488 "MediaPage.c" } } - } else if (((_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("minus")))) || (_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("underscore"))))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Subtract"))))) { + } else if (((_tmp4_ == ((0 != _tmp3_label3) ? _tmp3_label3 : (_tmp3_label3 = g_quark_from_static_string ("minus")))) || (_tmp4_ == ((0 != _tmp3_label4) ? _tmp3_label4 : (_tmp3_label4 = g_quark_from_static_string ("underscore"))))) || (_tmp4_ == ((0 != _tmp3_label5) ? _tmp3_label5 : (_tmp3_label5 = g_quark_from_static_string ("KP_Subtract"))))) { #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4178 "MediaPage.c" +#line 4494 "MediaPage.c" default: { #line 519 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize"); #line 520 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4185 "MediaPage.c" +#line 4501 "MediaPage.c" } } - } else if (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("period")))) { + } else if (_tmp4_ == ((0 != _tmp3_label6) ? _tmp3_label6 : (_tmp3_label6 = g_quark_from_static_string ("period")))) { #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4191 "MediaPage.c" +#line 4507 "MediaPage.c" default: { #line 523 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating"); #line 524 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4198 "MediaPage.c" +#line 4514 "MediaPage.c" } } - } else if (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("comma")))) { + } else if (_tmp4_ == ((0 != _tmp3_label7) ? _tmp3_label7 : (_tmp3_label7 = g_quark_from_static_string ("comma")))) { #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4204 "MediaPage.c" +#line 4520 "MediaPage.c" default: { #line 527 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating"); #line 528 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4211 "MediaPage.c" +#line 4527 "MediaPage.c" } } - } else if (_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("KP_1")))) { + } else if (_tmp4_ == ((0 != _tmp3_label8) ? _tmp3_label8 : (_tmp3_label8 = g_quark_from_static_string ("KP_1")))) { #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4217 "MediaPage.c" +#line 4533 "MediaPage.c" default: { #line 531 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne"); #line 532 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4224 "MediaPage.c" +#line 4540 "MediaPage.c" } } - } else if (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("KP_2")))) { + } else if (_tmp4_ == ((0 != _tmp3_label9) ? _tmp3_label9 : (_tmp3_label9 = g_quark_from_static_string ("KP_2")))) { #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4230 "MediaPage.c" +#line 4546 "MediaPage.c" default: { #line 535 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo"); #line 536 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4237 "MediaPage.c" +#line 4553 "MediaPage.c" } } - } else if (_tmp5_ == ((0 != _tmp4_label10) ? _tmp4_label10 : (_tmp4_label10 = g_quark_from_static_string ("KP_3")))) { + } else if (_tmp4_ == ((0 != _tmp3_label10) ? _tmp3_label10 : (_tmp3_label10 = g_quark_from_static_string ("KP_3")))) { #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4243 "MediaPage.c" +#line 4559 "MediaPage.c" default: { #line 539 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree"); #line 540 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4250 "MediaPage.c" +#line 4566 "MediaPage.c" } } - } else if (_tmp5_ == ((0 != _tmp4_label11) ? _tmp4_label11 : (_tmp4_label11 = g_quark_from_static_string ("KP_4")))) { + } else if (_tmp4_ == ((0 != _tmp3_label11) ? _tmp3_label11 : (_tmp3_label11 = g_quark_from_static_string ("KP_4")))) { #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4256 "MediaPage.c" +#line 4572 "MediaPage.c" default: { #line 543 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour"); #line 544 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4263 "MediaPage.c" +#line 4579 "MediaPage.c" } } - } else if (_tmp5_ == ((0 != _tmp4_label12) ? _tmp4_label12 : (_tmp4_label12 = g_quark_from_static_string ("KP_5")))) { + } else if (_tmp4_ == ((0 != _tmp3_label12) ? _tmp3_label12 : (_tmp3_label12 = g_quark_from_static_string ("KP_5")))) { #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4269 "MediaPage.c" +#line 4585 "MediaPage.c" default: { #line 547 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive"); #line 548 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4276 "MediaPage.c" +#line 4592 "MediaPage.c" } } - } else if (_tmp5_ == ((0 != _tmp4_label13) ? _tmp4_label13 : (_tmp4_label13 = g_quark_from_static_string ("KP_0")))) { + } else if (_tmp4_ == ((0 != _tmp3_label13) ? _tmp3_label13 : (_tmp3_label13 = g_quark_from_static_string ("KP_0")))) { #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4282 "MediaPage.c" +#line 4598 "MediaPage.c" default: { #line 551 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated"); #line 552 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4289 "MediaPage.c" +#line 4605 "MediaPage.c" } } - } else if (_tmp5_ == ((0 != _tmp4_label14) ? _tmp4_label14 : (_tmp4_label14 = g_quark_from_static_string ("KP_9")))) { + } else if (_tmp4_ == ((0 != _tmp3_label14) ? _tmp3_label14 : (_tmp3_label14 = g_quark_from_static_string ("KP_9")))) { #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4295 "MediaPage.c" +#line 4611 "MediaPage.c" default: { #line 555 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected"); #line 556 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4302 "MediaPage.c" +#line 4618 "MediaPage.c" } } - } else if (_tmp5_ == ((0 != _tmp4_label15) ? _tmp4_label15 : (_tmp4_label15 = g_quark_from_static_string ("slash")))) { + } else if (_tmp4_ == ((0 != _tmp3_label15) ? _tmp3_label15 : (_tmp3_label15 = g_quark_from_static_string ("slash")))) { #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4308 "MediaPage.c" +#line 4624 "MediaPage.c" default: { #line 559 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag"); #line 560 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4315 "MediaPage.c" +#line 4631 "MediaPage.c" } } } else { #line 509 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4321 "MediaPage.c" +#line 4637 "MediaPage.c" default: { #line 563 "/home/jens/Source/shotwell/src/MediaPage.vala" handled = FALSE; #line 564 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4328 "MediaPage.c" +#line 4644 "MediaPage.c" } } } #line 567 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = handled; + _tmp6_ = handled; #line 567 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp7_) { + if (_tmp6_) { #line 567 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = TRUE; -#line 4338 "MediaPage.c" + _tmp5_ = TRUE; +#line 4654 "MediaPage.c" } else { - GdkEventKey* _tmp8_; - gboolean _tmp9_; -#line 567 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = event; #line 567 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = PAGE_CLASS (media_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp8_); -#line 567 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = _tmp9_; -#line 4348 "MediaPage.c" + _tmp5_ = PAGE_CLASS (media_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), event); +#line 4658 "MediaPage.c" } #line 567 "/home/jens/Source/shotwell/src/MediaPage.vala" - result = _tmp6_; + result = _tmp5_; #line 567 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 4354 "MediaPage.c" +#line 4664 "MediaPage.c" } -static void media_page_real_switched_to (Page* base) { +static void +media_page_real_switched_to (Page* base) +{ MediaPage * self; ViewCollection* _tmp0_; ViewCollection* _tmp1_; ConfigFacade* _tmp2_; ConfigFacade* _tmp3_; - gboolean _tmp4_; + ConfigFacade* _tmp4_; ConfigFacade* _tmp5_; ConfigFacade* _tmp6_; - gboolean _tmp7_; + ConfigFacade* _tmp7_; ConfigFacade* _tmp8_; ConfigFacade* _tmp9_; - gboolean _tmp10_; - ConfigFacade* _tmp11_; - ConfigFacade* _tmp12_; - gboolean _tmp13_; - ViewCollection* _tmp14_; - ViewCollection* _tmp15_; - ViewCollection* _tmp16_; - ViewCollection* _tmp17_; - gint _tmp18_; - gboolean _tmp19_; + ViewCollection* _tmp10_; + ViewCollection* _tmp11_; + ViewCollection* _tmp12_; + ViewCollection* _tmp13_; + gboolean _tmp14_; #line 570 "/home/jens/Source/shotwell/src/MediaPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage); #line 571 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -4393,103 +4700,95 @@ static void media_page_real_switched_to (Page* base) { #line 575 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp3_ = _tmp2_; #line 575 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 575 "/home/jens/Source/shotwell/src/MediaPage.vala" - checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp4_); + checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 575 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp3_); #line 576 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = config_facade_get_instance (); + _tmp4_ = config_facade_get_instance (); #line 576 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = _tmp5_; -#line 576 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = configuration_facade_get_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp5_ = _tmp4_; #line 576 "/home/jens/Source/shotwell/src/MediaPage.vala" - checkerboard_page_set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp7_); + checkerboard_page_set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), configuration_facade_get_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 576 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp6_); -#line 577 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = config_facade_get_instance (); + _g_object_unref0 (_tmp5_); #line 577 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = _tmp8_; + _tmp6_ = config_facade_get_instance (); #line 577 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp7_ = _tmp6_; #line 577 "/home/jens/Source/shotwell/src/MediaPage.vala" - media_page_set_display_ratings (self, _tmp10_); + media_page_set_display_ratings (self, configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 577 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp9_); -#line 578 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = config_facade_get_instance (); + _g_object_unref0 (_tmp7_); #line 578 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp12_ = _tmp11_; + _tmp8_ = config_facade_get_instance (); #line 578 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp13_ = configuration_facade_get_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp9_ = _tmp8_; #line 578 "/home/jens/Source/shotwell/src/MediaPage.vala" - media_page_set_display_tags (self, _tmp13_); + media_page_set_display_tags (self, configuration_facade_get_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 578 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp9_); #line 579 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 579 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp15_ = _tmp14_; + _tmp11_ = _tmp10_; #line 579 "/home/jens/Source/shotwell/src/MediaPage.vala" - data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection)); #line 579 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp15_); -#line 583 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _data_collection_unref0 (_tmp11_); #line 583 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = _tmp16_; + _tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 583 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp18_ = view_collection_get_selected_count (_tmp17_); + _tmp13_ = _tmp12_; #line 583 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp19_ = _tmp18_ > 0; + _tmp14_ = view_collection_get_selected_count (_tmp13_) > 0; #line 583 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp17_); + _data_collection_unref0 (_tmp13_); #line 583 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp19_) { -#line 4452 "MediaPage.c" + if (_tmp14_) { +#line 4749 "MediaPage.c" CheckerboardItem* selected = NULL; - ViewCollection* _tmp20_; - ViewCollection* _tmp21_; - DataView* _tmp22_; - CheckerboardItem* _tmp23_; - CheckerboardItem* _tmp24_; + ViewCollection* _tmp15_; + ViewCollection* _tmp16_; + DataView* _tmp17_; + CheckerboardItem* _tmp18_; + CheckerboardItem* _tmp19_; #line 584 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 584 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp21_ = _tmp20_; + _tmp16_ = _tmp15_; #line 584 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp22_ = view_collection_get_selected_at (_tmp21_, 0); + _tmp17_ = view_collection_get_selected_at (_tmp16_, 0); #line 584 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); + _tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); #line 584 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp21_); + _data_collection_unref0 (_tmp16_); #line 584 "/home/jens/Source/shotwell/src/MediaPage.vala" - selected = _tmp23_; + selected = _tmp18_; #line 585 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp24_ = selected; + _tmp19_ = selected; #line 585 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp24_ != NULL) { -#line 4475 "MediaPage.c" - CheckerboardItem* _tmp25_; + if (_tmp19_ != NULL) { +#line 4772 "MediaPage.c" + CheckerboardItem* _tmp20_; #line 586 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp25_ = selected; + _tmp20_ = selected; #line 586 "/home/jens/Source/shotwell/src/MediaPage.vala" - checkerboard_page_cursor_to_item (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp25_); -#line 4481 "MediaPage.c" + checkerboard_page_cursor_to_item (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp20_); +#line 4778 "MediaPage.c" } #line 583 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (selected); -#line 4485 "MediaPage.c" +#line 4782 "MediaPage.c" } #line 589 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_sync_sort (self); -#line 4489 "MediaPage.c" +#line 4786 "MediaPage.c" } -static void media_page_real_switching_from (Page* base) { +static void +media_page_real_switching_from (Page* base) +{ MediaPage * self; #line 592 "/home/jens/Source/shotwell/src/MediaPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage); @@ -4497,56 +4796,62 @@ static void media_page_real_switching_from (Page* base) { media_page_disconnect_slider (self); #line 595 "/home/jens/Source/shotwell/src/MediaPage.vala" PAGE_CLASS (media_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page)); -#line 4501 "MediaPage.c" +#line 4800 "MediaPage.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 599 "/home/jens/Source/shotwell/src/MediaPage.vala" return self ? g_object_ref (self) : NULL; -#line 4508 "MediaPage.c" +#line 4809 "MediaPage.c" } -static void _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed (MediaPageZoomSliderAssembly* _sender, gpointer self) { +static void +_media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed (MediaPageZoomSliderAssembly* _sender, + gpointer self) +{ #line 600 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_zoom_changed ((MediaPage*) self); -#line 4515 "MediaPage.c" +#line 4819 "MediaPage.c" } -void media_page_connect_slider (MediaPage* self, MediaPageZoomSliderAssembly* slider) { +void +media_page_connect_slider (MediaPage* self, + MediaPageZoomSliderAssembly* slider) +{ MediaPageZoomSliderAssembly* _tmp0_; MediaPageZoomSliderAssembly* _tmp1_; - MediaPageZoomSliderAssembly* _tmp2_; #line 598 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 598 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (slider)); #line 599 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = slider; -#line 599 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (slider); #line 599 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (self->priv->connected_slider); #line 599 "/home/jens/Source/shotwell/src/MediaPage.vala" - self->priv->connected_slider = _tmp1_; + self->priv->connected_slider = _tmp0_; #line 600 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = self->priv->connected_slider; + _tmp1_ = self->priv->connected_slider; #line 600 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_signal_connect_object (_tmp2_, "zoom-changed", (GCallback) _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed, self, 0); + g_signal_connect_object (_tmp1_, "zoom-changed", (GCallback) _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed, self, 0); #line 601 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_load_persistent_thumbnail_scale (self); -#line 4541 "MediaPage.c" +#line 4845 "MediaPage.c" } -static void media_page_save_persistent_thumbnail_scale (MediaPage* self) { +static void +media_page_save_persistent_thumbnail_scale (MediaPage* self) +{ MediaPageZoomSliderAssembly* _tmp0_; ConfigFacade* _tmp1_; ConfigFacade* _tmp2_; MediaPageZoomSliderAssembly* _tmp3_; - gint _tmp4_; #line 604 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 605 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -4555,7 +4860,7 @@ static void media_page_save_persistent_thumbnail_scale (MediaPage* self) { if (_tmp0_ == NULL) { #line 606 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 4559 "MediaPage.c" +#line 4864 "MediaPage.c" } #line 608 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = config_facade_get_instance (); @@ -4564,25 +4869,24 @@ static void media_page_save_persistent_thumbnail_scale (MediaPage* self) { #line 608 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp3_ = self->priv->connected_slider; #line 608 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = media_page_zoom_slider_assembly_get_scale (_tmp3_); -#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala" - configuration_facade_set_photo_thumbnail_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_); + configuration_facade_set_photo_thumbnail_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), media_page_zoom_slider_assembly_get_scale (_tmp3_)); #line 608 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp2_); -#line 4573 "MediaPage.c" +#line 4876 "MediaPage.c" } -static void media_page_load_persistent_thumbnail_scale (MediaPage* self) { +static void +media_page_load_persistent_thumbnail_scale (MediaPage* self) +{ MediaPageZoomSliderAssembly* _tmp0_; gint persistent_scale = 0; ConfigFacade* _tmp1_; ConfigFacade* _tmp2_; gint _tmp3_; - gint _tmp4_; - MediaPageZoomSliderAssembly* _tmp5_; + MediaPageZoomSliderAssembly* _tmp4_; + gint _tmp5_; gint _tmp6_; - gint _tmp7_; #line 611 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 612 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -4591,7 +4895,7 @@ static void media_page_load_persistent_thumbnail_scale (MediaPage* self) { if (_tmp0_ == NULL) { #line 613 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 4595 "MediaPage.c" +#line 4899 "MediaPage.c" } #line 615 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = config_facade_get_instance (); @@ -4599,27 +4903,27 @@ static void media_page_load_persistent_thumbnail_scale (MediaPage* self) { _tmp2_ = _tmp1_; #line 615 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp3_ = configuration_facade_get_photo_thumbnail_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = _tmp3_; #line 615 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp2_); #line 615 "/home/jens/Source/shotwell/src/MediaPage.vala" - persistent_scale = _tmp4_; + persistent_scale = _tmp3_; #line 617 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = self->priv->connected_slider; + _tmp4_ = self->priv->connected_slider; #line 617 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = persistent_scale; + _tmp5_ = persistent_scale; #line 617 "/home/jens/Source/shotwell/src/MediaPage.vala" - media_page_zoom_slider_assembly_set_scale (_tmp5_, _tmp6_); + media_page_zoom_slider_assembly_set_scale (_tmp4_, _tmp5_); #line 618 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = persistent_scale; + _tmp6_ = persistent_scale; #line 618 "/home/jens/Source/shotwell/src/MediaPage.vala" - media_page_set_thumb_size (self, _tmp7_); -#line 4619 "MediaPage.c" + media_page_set_thumb_size (self, _tmp6_); +#line 4921 "MediaPage.c" } -void media_page_disconnect_slider (MediaPage* self) { +void +media_page_disconnect_slider (MediaPage* self) +{ MediaPageZoomSliderAssembly* _tmp0_; MediaPageZoomSliderAssembly* _tmp1_; guint _tmp2_; @@ -4631,7 +4935,7 @@ void media_page_disconnect_slider (MediaPage* self) { if (_tmp0_ == NULL) { #line 623 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 4635 "MediaPage.c" +#line 4939 "MediaPage.c" } #line 625 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = self->priv->connected_slider; @@ -4643,107 +4947,121 @@ void media_page_disconnect_slider (MediaPage* self) { _g_object_unref0 (self->priv->connected_slider); #line 626 "/home/jens/Source/shotwell/src/MediaPage.vala" self->priv->connected_slider = NULL; -#line 4647 "MediaPage.c" +#line 4951 "MediaPage.c" } -static void media_page_real_on_zoom_changed (MediaPage* self) { +static void +media_page_real_on_zoom_changed (MediaPage* self) +{ MediaPageZoomSliderAssembly* _tmp0_; #line 630 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp0_ = self->priv->connected_slider; #line 630 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp0_ != NULL) { -#line 4657 "MediaPage.c" +#line 4963 "MediaPage.c" MediaPageZoomSliderAssembly* _tmp1_; - gint _tmp2_; #line 631 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = self->priv->connected_slider; #line 631 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = media_page_zoom_slider_assembly_get_scale (_tmp1_); -#line 631 "/home/jens/Source/shotwell/src/MediaPage.vala" - media_page_set_thumb_size (self, _tmp2_); -#line 4666 "MediaPage.c" + media_page_set_thumb_size (self, media_page_zoom_slider_assembly_get_scale (_tmp1_)); +#line 4969 "MediaPage.c" } #line 633 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_save_persistent_thumbnail_scale (self); -#line 4670 "MediaPage.c" +#line 4973 "MediaPage.c" } -void media_page_on_zoom_changed (MediaPage* self) { +void +media_page_on_zoom_changed (MediaPage* self) +{ #line 629 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 629 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_zoom_changed (self); -#line 4679 "MediaPage.c" +#line 4984 "MediaPage.c" } -static void media_page_real_on_export (MediaPage* self) { +static void +media_page_real_on_export (MediaPage* self) +{ #line 636 "/home/jens/Source/shotwell/src/MediaPage.vala" g_critical ("Type `%s' does not implement abstract method `media_page_on_export'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 636 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 4688 "MediaPage.c" +#line 4995 "MediaPage.c" } -void media_page_on_export (MediaPage* self) { +void +media_page_on_export (MediaPage* self) +{ #line 636 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 636 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_export (self); -#line 4697 "MediaPage.c" +#line 5006 "MediaPage.c" } -static void media_page_real_on_increase_size (MediaPage* self) { +static void +media_page_real_on_increase_size (MediaPage* self) +{ #line 639 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_increase_zoom_level (self); -#line 4704 "MediaPage.c" +#line 5015 "MediaPage.c" } -void media_page_on_increase_size (MediaPage* self) { +void +media_page_on_increase_size (MediaPage* self) +{ #line 638 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 638 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_increase_size (self); -#line 4713 "MediaPage.c" +#line 5026 "MediaPage.c" } -static void media_page_real_on_decrease_size (MediaPage* self) { +static void +media_page_real_on_decrease_size (MediaPage* self) +{ #line 643 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_decrease_zoom_level (self); -#line 4720 "MediaPage.c" +#line 5035 "MediaPage.c" } -void media_page_on_decrease_size (MediaPage* self) { +void +media_page_on_decrease_size (MediaPage* self) +{ #line 642 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 642 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_decrease_size (self); -#line 4729 "MediaPage.c" +#line 5046 "MediaPage.c" } -static void media_page_on_add_tags (MediaPage* self) { +static void +media_page_on_add_tags (MediaPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; AddTagsDialog* dialog = NULL; - AddTagsDialog* _tmp4_; + AddTagsDialog* _tmp3_; gchar** names = NULL; - AddTagsDialog* _tmp5_; - gint _tmp6_; - gchar** _tmp7_; + AddTagsDialog* _tmp4_; + gint _tmp5_; + gchar** _tmp6_; gint names_length1; gint _names_size_; - gchar** _tmp8_; - gint _tmp8__length1; + gchar** _tmp7_; + gint _tmp7__length1; #line 646 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 647 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -4751,133 +5069,132 @@ static void media_page_on_add_tags (MediaPage* self) { #line 647 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = _tmp0_; #line 647 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 647 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0; #line 647 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp1_); #line 647 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 648 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 4764 "MediaPage.c" +#line 5080 "MediaPage.c" } #line 650 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = add_tags_dialog_new (); + _tmp3_ = add_tags_dialog_new (); #line 650 "/home/jens/Source/shotwell/src/MediaPage.vala" - dialog = _tmp4_; + dialog = _tmp3_; #line 651 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = dialog; + _tmp4_ = dialog; #line 651 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = add_tags_dialog_execute (_tmp5_, &_tmp6_); + _tmp6_ = add_tags_dialog_execute (_tmp4_, &_tmp5_); #line 651 "/home/jens/Source/shotwell/src/MediaPage.vala" - names = _tmp7_; + names = _tmp6_; #line 651 "/home/jens/Source/shotwell/src/MediaPage.vala" - names_length1 = _tmp6_; + names_length1 = _tmp5_; #line 651 "/home/jens/Source/shotwell/src/MediaPage.vala" _names_size_ = names_length1; #line 653 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = names; + _tmp7_ = names; #line 653 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8__length1 = names_length1; + _tmp7__length1 = names_length1; #line 653 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp8_ != NULL) { -#line 4786 "MediaPage.c" + if (_tmp7_ != NULL) { +#line 5102 "MediaPage.c" + CommandManager* _tmp8_; CommandManager* _tmp9_; - CommandManager* _tmp10_; + HierarchicalTagIndex* _tmp10_; HierarchicalTagIndex* _tmp11_; - HierarchicalTagIndex* _tmp12_; - gchar** _tmp13_; - gint _tmp13__length1; - gint _tmp14_; + gchar** _tmp12_; + gint _tmp12__length1; + gint _tmp13_; + gchar** _tmp14_; gchar** _tmp15_; - gchar** _tmp16_; - gint _tmp16__length1; + gint _tmp15__length1; + ViewCollection* _tmp16_; ViewCollection* _tmp17_; - ViewCollection* _tmp18_; - GeeList* _tmp19_; - GeeCollection* _tmp20_; + GeeList* _tmp18_; + GeeCollection* _tmp19_; + AddTagsCommand* _tmp20_; AddTagsCommand* _tmp21_; - AddTagsCommand* _tmp22_; #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp8_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = hierarchical_tag_index_get_global_index (); + _tmp10_ = hierarchical_tag_index_get_global_index (); #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp13_ = names; + _tmp12_ = names; #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp13__length1 = names_length1; + _tmp12__length1 = names_length1; #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp15_ = hierarchical_tag_index_get_paths_for_names_array (_tmp12_, _tmp13_, _tmp13__length1, &_tmp14_); + _tmp14_ = hierarchical_tag_index_get_paths_for_names_array (_tmp11_, _tmp12_, _tmp12__length1, &_tmp13_); #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16__length1 = _tmp14_; + _tmp15__length1 = _tmp13_; #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp19_ = view_collection_get_selected_sources (_tmp18_); + _tmp18_ = view_collection_get_selected_sources (_tmp17_); #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection); #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp21_ = add_tags_command_new (_tmp16_, _tmp14_, _tmp20_); + _tmp20_ = add_tags_command_new (_tmp15_, _tmp13_, _tmp19_); #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_COMMAND, Command)); #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp22_); + _g_object_unref0 (_tmp21_); #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp19_); #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp18_); + _data_collection_unref0 (_tmp17_); #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = (_vala_array_free (_tmp16_, _tmp16__length1, (GDestroyNotify) g_free), NULL); + _tmp15_ = (_vala_array_free (_tmp15_, _tmp15__length1, (GDestroyNotify) g_free), NULL); #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _hierarchical_tag_index_unref0 (_tmp12_); + _hierarchical_tag_index_unref0 (_tmp11_); #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" - _command_manager_unref0 (_tmp10_); -#line 4847 "MediaPage.c" + _command_manager_unref0 (_tmp9_); +#line 5163 "MediaPage.c" } #line 646 "/home/jens/Source/shotwell/src/MediaPage.vala" names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL); #line 646 "/home/jens/Source/shotwell/src/MediaPage.vala" _text_entry_dialog_mediator_unref0 (dialog); -#line 4853 "MediaPage.c" +#line 5169 "MediaPage.c" } -static void media_page_on_modify_tags (MediaPage* self) { +static void +media_page_on_modify_tags (MediaPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; MediaSource* media = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + DataView* _tmp5_; DataView* _tmp6_; - DataView* _tmp7_; - DataSource* _tmp8_; - MediaSource* _tmp9_; + DataSource* _tmp7_; + MediaSource* _tmp8_; ModifyTagsDialog* dialog = NULL; - MediaSource* _tmp10_; - ModifyTagsDialog* _tmp11_; + MediaSource* _tmp9_; + ModifyTagsDialog* _tmp10_; GeeArrayList* new_tags = NULL; - ModifyTagsDialog* _tmp12_; + ModifyTagsDialog* _tmp11_; + GeeArrayList* _tmp12_; GeeArrayList* _tmp13_; - GeeArrayList* _tmp14_; + CommandManager* _tmp14_; CommandManager* _tmp15_; - CommandManager* _tmp16_; - MediaSource* _tmp17_; - GeeArrayList* _tmp18_; + MediaSource* _tmp16_; + GeeArrayList* _tmp17_; + ModifyTagsCommand* _tmp18_; ModifyTagsCommand* _tmp19_; - ModifyTagsCommand* _tmp20_; #line 660 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 661 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -4885,51 +5202,49 @@ static void media_page_on_modify_tags (MediaPage* self) { #line 661 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = _tmp0_; #line 661 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 661 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_ != 1; + _tmp2_ = view_collection_get_selected_count (_tmp1_) != 1; #line 661 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp1_); #line 661 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 662 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 4898 "MediaPage.c" +#line 5213 "MediaPage.c" } #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = view_collection_get_selected_at (_tmp5_, 0); + _tmp5_ = view_collection_get_selected_at (_tmp4_, 0); #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = data_view_get_source (_tmp7_); + _tmp7_ = data_view_get_source (_tmp6_); #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource); #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala" - media = _tmp9_; + media = _tmp8_; #line 666 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = media; + _tmp9_ = media; #line 666 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = modify_tags_dialog_new (_tmp10_); + _tmp10_ = modify_tags_dialog_new (_tmp9_); #line 666 "/home/jens/Source/shotwell/src/MediaPage.vala" - dialog = _tmp11_; + dialog = _tmp10_; #line 667 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp12_ = dialog; + _tmp11_ = dialog; #line 667 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp13_ = modify_tags_dialog_execute (_tmp12_); + _tmp12_ = modify_tags_dialog_execute (_tmp11_); #line 667 "/home/jens/Source/shotwell/src/MediaPage.vala" - new_tags = _tmp13_; + new_tags = _tmp12_; #line 669 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp14_ = new_tags; + _tmp13_ = new_tags; #line 669 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp14_ == NULL) { + if (_tmp13_ == NULL) { #line 670 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (new_tags); #line 670 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -4938,46 +5253,47 @@ static void media_page_on_modify_tags (MediaPage* self) { _g_object_unref0 (media); #line 670 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 4942 "MediaPage.c" +#line 5257 "MediaPage.c" } #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp15_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp14_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = media; + _tmp16_ = media; #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp18_ = new_tags; + _tmp17_ = new_tags; #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp19_ = modify_tags_command_new (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp18_ = modify_tags_command_new (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection)); #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala" - command_manager_execute (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_COMMAND, Command)); #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp19_); #line 672 "/home/jens/Source/shotwell/src/MediaPage.vala" - _command_manager_unref0 (_tmp16_); + _command_manager_unref0 (_tmp15_); #line 660 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (new_tags); #line 660 "/home/jens/Source/shotwell/src/MediaPage.vala" _text_entry_dialog_mediator_unref0 (dialog); #line 660 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (media); -#line 4968 "MediaPage.c" +#line 5283 "MediaPage.c" } -static void media_page_set_display_tags (MediaPage* self, gboolean display) { +static void +media_page_set_display_tags (MediaPage* self, + gboolean display) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; ViewCollection* _tmp2_; ViewCollection* _tmp3_; - gboolean _tmp4_; - GValue _tmp5_ = {0}; + GValue _tmp4_ = {0}; + ViewCollection* _tmp5_; ViewCollection* _tmp6_; - ViewCollection* _tmp7_; - gboolean _tmp8_; #line 675 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 676 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -4993,38 +5309,35 @@ static void media_page_set_display_tags (MediaPage* self, gboolean display) { #line 677 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp3_ = _tmp2_; #line 677 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = display; -#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_value_init (&_tmp5_, G_TYPE_BOOLEAN); + g_value_init (&_tmp4_, G_TYPE_BOOLEAN); #line 677 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_value_set_boolean (&_tmp5_, _tmp4_); + g_value_set_boolean (&_tmp4_, display); #line 677 "/home/jens/Source/shotwell/src/MediaPage.vala" - data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SHOW_TAGS, &_tmp5_, NULL, NULL); + data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SHOW_TAGS, &_tmp4_, NULL, NULL); #line 677 "/home/jens/Source/shotwell/src/MediaPage.vala" - G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL; + G_IS_VALUE (&_tmp4_) ? (g_value_unset (&_tmp4_), NULL) : NULL; #line 677 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp3_); #line 678 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 678 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 678 "/home/jens/Source/shotwell/src/MediaPage.vala" - data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection)); #line 678 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp7_); + _data_collection_unref0 (_tmp6_); #line 680 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = display; -#line 680 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags", _tmp8_); -#line 5020 "MediaPage.c" + page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags", display); +#line 5332 "MediaPage.c" } -static void media_page_on_new_event (MediaPage* self) { +static void +media_page_on_new_event (MediaPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; #line 683 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 684 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -5032,70 +5345,69 @@ static void media_page_on_new_event (MediaPage* self) { #line 684 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = _tmp0_; #line 684 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 684 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_ > 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) > 0; #line 684 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp1_); #line 684 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp3_) { -#line 5043 "MediaPage.c" + if (_tmp2_) { +#line 5354 "MediaPage.c" + CommandManager* _tmp3_; CommandManager* _tmp4_; - CommandManager* _tmp5_; + ViewCollection* _tmp5_; ViewCollection* _tmp6_; - ViewCollection* _tmp7_; + GeeList* _tmp7_; GeeList* _tmp8_; - GeeList* _tmp9_; + NewEventCommand* _tmp9_; NewEventCommand* _tmp10_; - NewEventCommand* _tmp11_; #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = view_collection_get_selected (_tmp7_); + _tmp7_ = view_collection_get_selected (_tmp6_); #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = new_event_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp9_ = new_event_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala" - command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command)); #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp10_); #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp7_); + _data_collection_unref0 (_tmp6_); #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala" - _command_manager_unref0 (_tmp5_); -#line 5078 "MediaPage.c" + _command_manager_unref0 (_tmp4_); +#line 5389 "MediaPage.c" } } -static void media_page_on_flag_unflag (MediaPage* self) { +static void +media_page_on_flag_unflag (MediaPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; GeeCollection* sources = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; - GeeList* _tmp6_; - GeeCollection* _tmp7_; + GeeList* _tmp5_; + GeeCollection* _tmp6_; gboolean flag = FALSE; - CommandManager* _tmp20_; - CommandManager* _tmp21_; - GeeCollection* _tmp22_; - gboolean _tmp23_; - FlagUnflagCommand* _tmp24_; - FlagUnflagCommand* _tmp25_; + CommandManager* _tmp17_; + CommandManager* _tmp18_; + GeeCollection* _tmp19_; + gboolean _tmp20_; + FlagUnflagCommand* _tmp21_; + FlagUnflagCommand* _tmp22_; #line 688 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 689 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -5103,98 +5415,90 @@ static void media_page_on_flag_unflag (MediaPage* self) { #line 689 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = _tmp0_; #line 689 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 689 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0; #line 689 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp1_); #line 689 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 690 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 5116 "MediaPage.c" +#line 5426 "MediaPage.c" } #line 692 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 692 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 692 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = view_collection_get_selected_sources_of_type (_tmp5_, TYPE_MEDIA_SOURCE); + _tmp5_ = view_collection_get_selected_sources_of_type (_tmp4_, TYPE_MEDIA_SOURCE); #line 692 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection); #line 692 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 692 "/home/jens/Source/shotwell/src/MediaPage.vala" - sources = _tmp7_; + sources = _tmp6_; #line 696 "/home/jens/Source/shotwell/src/MediaPage.vala" flag = FALSE; -#line 5132 "MediaPage.c" +#line 5442 "MediaPage.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp8_; - GeeIterator* _tmp9_; + GeeCollection* _tmp7_; + GeeIterator* _tmp8_; #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = sources; + _tmp7_ = sources; #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala" - _source_it = _tmp9_; + _source_it = _tmp8_; #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala" while (TRUE) { -#line 5145 "MediaPage.c" - GeeIterator* _tmp10_; - gboolean _tmp11_; +#line 5455 "MediaPage.c" + GeeIterator* _tmp9_; MediaSource* source = NULL; - GeeIterator* _tmp12_; - gpointer _tmp13_; + GeeIterator* _tmp10_; + gpointer _tmp11_; Flaggable* flaggable = NULL; - MediaSource* _tmp14_; + MediaSource* _tmp12_; + Flaggable* _tmp13_; + gboolean _tmp14_ = FALSE; Flaggable* _tmp15_; - gboolean _tmp16_ = FALSE; - Flaggable* _tmp17_; -#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = _source_it; #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = gee_iterator_next (_tmp10_); + _tmp9_ = _source_it; #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (!_tmp11_) { + if (!gee_iterator_next (_tmp9_)) { #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 5164 "MediaPage.c" +#line 5471 "MediaPage.c" } #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp12_ = _source_it; + _tmp10_ = _source_it; #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp13_ = gee_iterator_get (_tmp12_); + _tmp11_ = gee_iterator_get (_tmp10_); #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala" - source = (MediaSource*) _tmp13_; + source = (MediaSource*) _tmp11_; #line 698 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp14_ = source; + _tmp12_ = source; #line 698 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp14_) : NULL); + _tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp12_) : NULL); #line 698 "/home/jens/Source/shotwell/src/MediaPage.vala" - flaggable = _tmp15_; + flaggable = _tmp13_; #line 699 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = flaggable; + _tmp15_ = flaggable; #line 699 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp17_ != NULL) { -#line 5182 "MediaPage.c" - Flaggable* _tmp18_; - gboolean _tmp19_; + if (_tmp15_ != NULL) { +#line 5489 "MediaPage.c" + Flaggable* _tmp16_; #line 699 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp18_ = flaggable; + _tmp16_ = flaggable; #line 699 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp19_ = flaggable_is_flagged (_tmp18_); -#line 699 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = !_tmp19_; -#line 5191 "MediaPage.c" + _tmp14_ = !flaggable_is_flagged (_tmp16_); +#line 5495 "MediaPage.c" } else { #line 699 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = FALSE; -#line 5195 "MediaPage.c" + _tmp14_ = FALSE; +#line 5499 "MediaPage.c" } #line 699 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp16_) { + if (_tmp14_) { #line 700 "/home/jens/Source/shotwell/src/MediaPage.vala" flag = TRUE; #line 702 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -5203,386 +5507,418 @@ static void media_page_on_flag_unflag (MediaPage* self) { _g_object_unref0 (source); #line 702 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 5207 "MediaPage.c" +#line 5511 "MediaPage.c" } #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (flaggable); #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (source); -#line 5213 "MediaPage.c" +#line 5517 "MediaPage.c" } #line 697 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_source_it); -#line 5217 "MediaPage.c" +#line 5521 "MediaPage.c" } #line 706 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp17_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 706 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp21_ = _tmp20_; + _tmp18_ = _tmp17_; #line 706 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp22_ = sources; + _tmp19_ = sources; #line 706 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp23_ = flag; + _tmp20_ = flag; #line 706 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp24_ = flag_unflag_command_new (_tmp22_, _tmp23_); + _tmp21_ = flag_unflag_command_new (_tmp19_, _tmp20_); #line 706 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp25_ = _tmp24_; + _tmp22_ = _tmp21_; #line 706 "/home/jens/Source/shotwell/src/MediaPage.vala" - command_manager_execute (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command)); #line 706 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp25_); + _g_object_unref0 (_tmp22_); #line 706 "/home/jens/Source/shotwell/src/MediaPage.vala" - _command_manager_unref0 (_tmp21_); + _command_manager_unref0 (_tmp18_); #line 688 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (sources); -#line 5239 "MediaPage.c" +#line 5543 "MediaPage.c" } -static void media_page_real_on_increase_rating (MediaPage* self) { +static void +media_page_real_on_increase_rating (MediaPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; SetRatingCommand* command = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + GeeList* _tmp5_; GeeList* _tmp6_; - GeeList* _tmp7_; + SetRatingCommand* _tmp7_; SetRatingCommand* _tmp8_; - SetRatingCommand* _tmp9_; + CommandManager* _tmp9_; CommandManager* _tmp10_; - CommandManager* _tmp11_; - SetRatingCommand* _tmp12_; + SetRatingCommand* _tmp11_; #line 710 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 710 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = _tmp0_; #line 710 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 710 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0; #line 710 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp1_); #line 710 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 711 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 5272 "MediaPage.c" +#line 5575 "MediaPage.c" } #line 713 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 713 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 713 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = view_collection_get_selected (_tmp5_); + _tmp5_ = view_collection_get_selected (_tmp4_); #line 713 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 713 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = set_rating_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), TRUE); + _tmp7_ = set_rating_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable), TRUE); #line 713 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 713 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 713 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 713 "/home/jens/Source/shotwell/src/MediaPage.vala" - command = _tmp9_; + command = _tmp8_; #line 714 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 714 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 714 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp12_ = command; + _tmp11_ = command; #line 714 "/home/jens/Source/shotwell/src/MediaPage.vala" - command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); #line 714 "/home/jens/Source/shotwell/src/MediaPage.vala" - _command_manager_unref0 (_tmp11_); + _command_manager_unref0 (_tmp10_); #line 716 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_update_rating_sensitivities (self); #line 709 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (command); -#line 5306 "MediaPage.c" +#line 5609 "MediaPage.c" } -void media_page_on_increase_rating (MediaPage* self) { +void +media_page_on_increase_rating (MediaPage* self) +{ #line 709 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 709 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_increase_rating (self); -#line 5315 "MediaPage.c" +#line 5620 "MediaPage.c" } -static void media_page_real_on_decrease_rating (MediaPage* self) { +static void +media_page_real_on_decrease_rating (MediaPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; SetRatingCommand* command = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + GeeList* _tmp5_; GeeList* _tmp6_; - GeeList* _tmp7_; + SetRatingCommand* _tmp7_; SetRatingCommand* _tmp8_; - SetRatingCommand* _tmp9_; + CommandManager* _tmp9_; CommandManager* _tmp10_; - CommandManager* _tmp11_; - SetRatingCommand* _tmp12_; + SetRatingCommand* _tmp11_; #line 720 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 720 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = _tmp0_; #line 720 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0; #line 720 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp1_); #line 720 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 721 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 5348 "MediaPage.c" +#line 5652 "MediaPage.c" } #line 723 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 723 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 723 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = view_collection_get_selected (_tmp5_); + _tmp5_ = view_collection_get_selected (_tmp4_); #line 723 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 723 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = set_rating_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), FALSE); + _tmp7_ = set_rating_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable), FALSE); #line 723 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 723 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 723 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 723 "/home/jens/Source/shotwell/src/MediaPage.vala" - command = _tmp9_; + command = _tmp8_; #line 724 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 724 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 724 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp12_ = command; + _tmp11_ = command; #line 724 "/home/jens/Source/shotwell/src/MediaPage.vala" - command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); #line 724 "/home/jens/Source/shotwell/src/MediaPage.vala" - _command_manager_unref0 (_tmp11_); + _command_manager_unref0 (_tmp10_); #line 726 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_update_rating_sensitivities (self); #line 719 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (command); -#line 5382 "MediaPage.c" +#line 5686 "MediaPage.c" } -void media_page_on_decrease_rating (MediaPage* self) { +void +media_page_on_decrease_rating (MediaPage* self) +{ #line 719 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 719 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_decrease_rating (self); -#line 5391 "MediaPage.c" +#line 5697 "MediaPage.c" } -static void media_page_real_on_set_rating (MediaPage* self, Rating rating) { +static void +media_page_real_on_set_rating (MediaPage* self, + Rating rating) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; SetRatingCommand* command = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + GeeList* _tmp5_; GeeList* _tmp6_; - GeeList* _tmp7_; - Rating _tmp8_; - SetRatingCommand* _tmp9_; - SetRatingCommand* _tmp10_; - CommandManager* _tmp11_; - CommandManager* _tmp12_; - SetRatingCommand* _tmp13_; + SetRatingCommand* _tmp7_; + SetRatingCommand* _tmp8_; + CommandManager* _tmp9_; + CommandManager* _tmp10_; + SetRatingCommand* _tmp11_; #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = _tmp0_; #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0; #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp1_); #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 731 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 5425 "MediaPage.c" +#line 5730 "MediaPage.c" } #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = _tmp4_; -#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = view_collection_get_selected (_tmp5_); + _tmp4_ = _tmp3_; #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = _tmp6_; + _tmp5_ = view_collection_get_selected (_tmp4_); #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = rating; + _tmp6_ = _tmp5_; #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = set_rating_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), _tmp8_); + _tmp7_ = set_rating_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable), rating); #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala" - command = _tmp10_; + command = _tmp8_; #line 734 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 734 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 734 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp13_ = command; + _tmp11_ = command; #line 734 "/home/jens/Source/shotwell/src/MediaPage.vala" - command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); #line 734 "/home/jens/Source/shotwell/src/MediaPage.vala" - _command_manager_unref0 (_tmp12_); + _command_manager_unref0 (_tmp10_); #line 736 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_update_rating_sensitivities (self); #line 729 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (command); -#line 5461 "MediaPage.c" +#line 5764 "MediaPage.c" } -void media_page_on_set_rating (MediaPage* self, Rating rating) { +void +media_page_on_set_rating (MediaPage* self, + Rating rating) +{ #line 729 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 729 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_set_rating (self, rating); -#line 5470 "MediaPage.c" +#line 5776 "MediaPage.c" } -static void media_page_real_on_rate_rejected (MediaPage* self) { +static void +media_page_real_on_rate_rejected (MediaPage* self) +{ #line 740 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_set_rating (self, RATING_REJECTED); -#line 5477 "MediaPage.c" +#line 5785 "MediaPage.c" } -void media_page_on_rate_rejected (MediaPage* self) { +void +media_page_on_rate_rejected (MediaPage* self) +{ #line 739 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 739 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_rate_rejected (self); -#line 5486 "MediaPage.c" +#line 5796 "MediaPage.c" } -static void media_page_real_on_rate_unrated (MediaPage* self) { +static void +media_page_real_on_rate_unrated (MediaPage* self) +{ #line 744 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_set_rating (self, RATING_UNRATED); -#line 5493 "MediaPage.c" +#line 5805 "MediaPage.c" } -void media_page_on_rate_unrated (MediaPage* self) { +void +media_page_on_rate_unrated (MediaPage* self) +{ #line 743 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 743 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_rate_unrated (self); -#line 5502 "MediaPage.c" +#line 5816 "MediaPage.c" } -static void media_page_real_on_rate_one (MediaPage* self) { +static void +media_page_real_on_rate_one (MediaPage* self) +{ #line 748 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_set_rating (self, RATING_ONE); -#line 5509 "MediaPage.c" +#line 5825 "MediaPage.c" } -void media_page_on_rate_one (MediaPage* self) { +void +media_page_on_rate_one (MediaPage* self) +{ #line 747 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 747 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_rate_one (self); -#line 5518 "MediaPage.c" +#line 5836 "MediaPage.c" } -static void media_page_real_on_rate_two (MediaPage* self) { +static void +media_page_real_on_rate_two (MediaPage* self) +{ #line 752 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_set_rating (self, RATING_TWO); -#line 5525 "MediaPage.c" +#line 5845 "MediaPage.c" } -void media_page_on_rate_two (MediaPage* self) { +void +media_page_on_rate_two (MediaPage* self) +{ #line 751 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 751 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_rate_two (self); -#line 5534 "MediaPage.c" +#line 5856 "MediaPage.c" } -static void media_page_real_on_rate_three (MediaPage* self) { +static void +media_page_real_on_rate_three (MediaPage* self) +{ #line 756 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_set_rating (self, RATING_THREE); -#line 5541 "MediaPage.c" +#line 5865 "MediaPage.c" } -void media_page_on_rate_three (MediaPage* self) { +void +media_page_on_rate_three (MediaPage* self) +{ #line 755 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 755 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_rate_three (self); -#line 5550 "MediaPage.c" +#line 5876 "MediaPage.c" } -static void media_page_real_on_rate_four (MediaPage* self) { +static void +media_page_real_on_rate_four (MediaPage* self) +{ #line 760 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_set_rating (self, RATING_FOUR); -#line 5557 "MediaPage.c" +#line 5885 "MediaPage.c" } -void media_page_on_rate_four (MediaPage* self) { +void +media_page_on_rate_four (MediaPage* self) +{ #line 759 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 759 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_rate_four (self); -#line 5566 "MediaPage.c" +#line 5896 "MediaPage.c" } -static void media_page_real_on_rate_five (MediaPage* self) { +static void +media_page_real_on_rate_five (MediaPage* self) +{ #line 764 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_set_rating (self, RATING_FIVE); -#line 5573 "MediaPage.c" +#line 5905 "MediaPage.c" } -void media_page_on_rate_five (MediaPage* self) { +void +media_page_on_rate_five (MediaPage* self) +{ #line 763 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 763 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_rate_five (self); -#line 5582 "MediaPage.c" +#line 5916 "MediaPage.c" } -static void media_page_on_remove_from_library (MediaPage* self) { +static void +media_page_on_remove_from_library (MediaPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; GeeList* _tmp2_; @@ -5603,11 +5939,13 @@ static void media_page_on_remove_from_library (MediaPage* self) { _g_object_unref0 (_tmp3_); #line 768 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp1_); -#line 5607 "MediaPage.c" +#line 5943 "MediaPage.c" } -static void media_page_real_on_move_to_trash (MediaPage* self) { +static void +media_page_real_on_move_to_trash (MediaPage* self) +{ CheckerboardItem* restore_point = NULL; CheckerboardItem* _tmp0_; GeeList* sources = NULL; @@ -5617,17 +5955,16 @@ static void media_page_real_on_move_to_trash (MediaPage* self) { GeeList* _tmp9_; gboolean _tmp10_ = FALSE; CheckerboardItem* _tmp11_; + ViewCollection* _tmp16_; ViewCollection* _tmp17_; - ViewCollection* _tmp18_; - gint _tmp19_; - gboolean _tmp20_; + gboolean _tmp18_; #line 772 "/home/jens/Source/shotwell/src/MediaPage.vala" restore_point = NULL; #line 774 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)->cursor; #line 774 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp0_ != NULL) { -#line 5631 "MediaPage.c" +#line 5968 "MediaPage.c" ViewCollection* _tmp1_; ViewCollection* _tmp2_; CheckerboardItem* _tmp3_; @@ -5647,7 +5984,7 @@ static void media_page_real_on_move_to_trash (MediaPage* self) { if (_tmp5_ == NULL) { #line 775 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp4_); -#line 5651 "MediaPage.c" +#line 5988 "MediaPage.c" } #line 775 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (restore_point); @@ -5655,7 +5992,7 @@ static void media_page_real_on_move_to_trash (MediaPage* self) { restore_point = _tmp5_; #line 775 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp2_); -#line 5659 "MediaPage.c" +#line 5996 "MediaPage.c" } #line 778 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -5673,11 +6010,10 @@ static void media_page_real_on_move_to_trash (MediaPage* self) { _tmp11_ = restore_point; #line 780 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp11_ != NULL) { -#line 5677 "MediaPage.c" +#line 6014 "MediaPage.c" ViewCollection* _tmp12_; ViewCollection* _tmp13_; CheckerboardItem* _tmp14_; - gboolean _tmp15_; #line 780 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 780 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -5685,186 +6021,183 @@ static void media_page_real_on_move_to_trash (MediaPage* self) { #line 780 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp14_ = restore_point; #line 780 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp15_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); -#line 780 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = _tmp15_; + _tmp10_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); #line 780 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp13_); -#line 5694 "MediaPage.c" +#line 6028 "MediaPage.c" } else { #line 780 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp10_ = FALSE; -#line 5698 "MediaPage.c" +#line 6032 "MediaPage.c" } #line 780 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp10_) { -#line 5702 "MediaPage.c" - CheckerboardItem* _tmp16_; +#line 6036 "MediaPage.c" + CheckerboardItem* _tmp15_; #line 781 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = restore_point; + _tmp15_ = restore_point; #line 781 "/home/jens/Source/shotwell/src/MediaPage.vala" - checkerboard_page_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp16_); -#line 5708 "MediaPage.c" + checkerboard_page_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp15_); +#line 6042 "MediaPage.c" } #line 784 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 784 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp18_ = _tmp17_; + _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 784 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp19_ = view_collection_get_selected_count (_tmp18_); + _tmp17_ = _tmp16_; #line 784 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp20_ = _tmp19_ > 0; + _tmp18_ = view_collection_get_selected_count (_tmp17_) > 0; #line 784 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp18_); + _data_collection_unref0 (_tmp17_); #line 784 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp20_) { -#line 5722 "MediaPage.c" - CommandManager* _tmp21_; - CommandManager* _tmp22_; - GeeList* _tmp23_; - TrashUntrashPhotosCommand* _tmp24_; - TrashUntrashPhotosCommand* _tmp25_; + if (_tmp18_) { +#line 6054 "MediaPage.c" + CommandManager* _tmp19_; + CommandManager* _tmp20_; + GeeList* _tmp21_; + TrashUntrashPhotosCommand* _tmp22_; + TrashUntrashPhotosCommand* _tmp23_; #line 785 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp19_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 785 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp22_ = _tmp21_; + _tmp20_ = _tmp19_; #line 785 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp23_ = sources; + _tmp21_ = sources; #line 785 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp24_ = trash_untrash_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection), TRUE); + _tmp22_ = trash_untrash_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), TRUE); #line 785 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp25_ = _tmp24_; + _tmp23_ = _tmp22_; #line 785 "/home/jens/Source/shotwell/src/MediaPage.vala" - command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command)); #line 785 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp25_); + _g_object_unref0 (_tmp23_); #line 785 "/home/jens/Source/shotwell/src/MediaPage.vala" - _command_manager_unref0 (_tmp22_); -#line 5744 "MediaPage.c" + _command_manager_unref0 (_tmp20_); +#line 6076 "MediaPage.c" } #line 771 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (sources); #line 771 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (restore_point); -#line 5750 "MediaPage.c" +#line 6082 "MediaPage.c" } -void media_page_on_move_to_trash (MediaPage* self) { +void +media_page_on_move_to_trash (MediaPage* self) +{ #line 771 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 771 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_move_to_trash (self); -#line 5759 "MediaPage.c" +#line 6093 "MediaPage.c" } -static void media_page_real_on_edit_title (MediaPage* self) { +static void +media_page_real_on_edit_title (MediaPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; GeeList* media_sources = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + GeeList* _tmp5_; GeeList* _tmp6_; - GeeList* _tmp7_; EditTitleDialog* edit_title_dialog = NULL; - GeeList* _tmp8_; - gpointer _tmp9_; - MediaSource* _tmp10_; + GeeList* _tmp7_; + gpointer _tmp8_; + MediaSource* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; + EditTitleDialog* _tmp12_; EditTitleDialog* _tmp13_; - EditTitleDialog* _tmp14_; gchar* new_title = NULL; - EditTitleDialog* _tmp15_; - gchar* _tmp16_; - const gchar* _tmp17_; + EditTitleDialog* _tmp14_; + gchar* _tmp15_; + const gchar* _tmp16_; #line 792 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 792 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = _tmp0_; #line 792 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 792 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0; #line 792 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp1_); #line 792 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 793 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 5799 "MediaPage.c" +#line 6132 "MediaPage.c" } #line 795 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 795 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 795 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = view_collection_get_selected_sources (_tmp5_); + _tmp5_ = view_collection_get_selected_sources (_tmp4_); #line 795 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList); + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_LIST, GeeList); #line 795 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 795 "/home/jens/Source/shotwell/src/MediaPage.vala" - media_sources = _tmp7_; + media_sources = _tmp6_; #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = media_sources; + _tmp7_ = media_sources; #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = gee_list_get (_tmp8_, 0); + _tmp8_ = gee_list_get (_tmp7_, 0); #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = (MediaSource*) _tmp9_; + _tmp9_ = (MediaSource*) _tmp8_; #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = media_source_get_title (_tmp10_); + _tmp10_ = media_source_get_title (_tmp9_); #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp13_ = edit_title_dialog_new (_tmp12_); + _tmp12_ = edit_title_dialog_new (_tmp11_); #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp11_); #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp9_); #line 797 "/home/jens/Source/shotwell/src/MediaPage.vala" - edit_title_dialog = _tmp14_; + edit_title_dialog = _tmp13_; #line 798 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp15_ = edit_title_dialog; + _tmp14_ = edit_title_dialog; #line 798 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = edit_title_dialog_execute (_tmp15_); + _tmp15_ = edit_title_dialog_execute (_tmp14_); #line 798 "/home/jens/Source/shotwell/src/MediaPage.vala" - new_title = _tmp16_; + new_title = _tmp15_; #line 799 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = new_title; + _tmp16_ = new_title; #line 799 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp17_ != NULL) { -#line 5843 "MediaPage.c" + if (_tmp16_ != NULL) { +#line 6176 "MediaPage.c" + CommandManager* _tmp17_; CommandManager* _tmp18_; - CommandManager* _tmp19_; - GeeList* _tmp20_; - const gchar* _tmp21_; + GeeList* _tmp19_; + const gchar* _tmp20_; + EditMultipleTitlesCommand* _tmp21_; EditMultipleTitlesCommand* _tmp22_; - EditMultipleTitlesCommand* _tmp23_; #line 800 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp18_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp17_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 800 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 800 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp20_ = media_sources; + _tmp19_ = media_sources; #line 800 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp21_ = new_title; + _tmp20_ = new_title; #line 800 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp22_ = edit_multiple_titles_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_); + _tmp21_ = edit_multiple_titles_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_); #line 800 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp23_ = _tmp22_; + _tmp22_ = _tmp21_; #line 800 "/home/jens/Source/shotwell/src/MediaPage.vala" - command_manager_execute (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command)); #line 800 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp22_); #line 800 "/home/jens/Source/shotwell/src/MediaPage.vala" - _command_manager_unref0 (_tmp19_); -#line 5868 "MediaPage.c" + _command_manager_unref0 (_tmp18_); +#line 6201 "MediaPage.c" } #line 791 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_free0 (new_title); @@ -5872,125 +6205,126 @@ static void media_page_real_on_edit_title (MediaPage* self) { _text_entry_dialog_mediator_unref0 (edit_title_dialog); #line 791 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (media_sources); -#line 5876 "MediaPage.c" +#line 6209 "MediaPage.c" } -void media_page_on_edit_title (MediaPage* self) { +void +media_page_on_edit_title (MediaPage* self) +{ #line 791 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 791 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_edit_title (self); -#line 5885 "MediaPage.c" +#line 6220 "MediaPage.c" } -static void media_page_real_on_edit_comment (MediaPage* self) { +static void +media_page_real_on_edit_comment (MediaPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; GeeList* media_sources = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + GeeList* _tmp5_; GeeList* _tmp6_; - GeeList* _tmp7_; EditCommentDialog* edit_comment_dialog = NULL; - GeeList* _tmp8_; - gpointer _tmp9_; - MediaSource* _tmp10_; + GeeList* _tmp7_; + gpointer _tmp8_; + MediaSource* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; + EditCommentDialog* _tmp12_; EditCommentDialog* _tmp13_; - EditCommentDialog* _tmp14_; gchar* new_comment = NULL; - EditCommentDialog* _tmp15_; - gchar* _tmp16_; - const gchar* _tmp17_; + EditCommentDialog* _tmp14_; + gchar* _tmp15_; + const gchar* _tmp16_; #line 804 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 804 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = _tmp0_; #line 804 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 804 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0; #line 804 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp1_); #line 804 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 805 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 5925 "MediaPage.c" +#line 6259 "MediaPage.c" } #line 807 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 807 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 807 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = view_collection_get_selected_sources (_tmp5_); + _tmp5_ = view_collection_get_selected_sources (_tmp4_); #line 807 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList); + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_LIST, GeeList); #line 807 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 807 "/home/jens/Source/shotwell/src/MediaPage.vala" - media_sources = _tmp7_; + media_sources = _tmp6_; #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = media_sources; + _tmp7_ = media_sources; #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = gee_list_get (_tmp8_, 0); + _tmp8_ = gee_list_get (_tmp7_, 0); #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = (MediaSource*) _tmp9_; + _tmp9_ = (MediaSource*) _tmp8_; #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = media_source_get_comment (_tmp10_); + _tmp10_ = media_source_get_comment (_tmp9_); #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp13_ = edit_comment_dialog_new (_tmp12_, FALSE); + _tmp12_ = edit_comment_dialog_new (_tmp11_, FALSE); #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp11_); #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp9_); #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala" - edit_comment_dialog = _tmp14_; + edit_comment_dialog = _tmp13_; #line 810 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp15_ = edit_comment_dialog; + _tmp14_ = edit_comment_dialog; #line 810 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = edit_comment_dialog_execute (_tmp15_); + _tmp15_ = edit_comment_dialog_execute (_tmp14_); #line 810 "/home/jens/Source/shotwell/src/MediaPage.vala" - new_comment = _tmp16_; + new_comment = _tmp15_; #line 811 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = new_comment; + _tmp16_ = new_comment; #line 811 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp17_ != NULL) { -#line 5969 "MediaPage.c" + if (_tmp16_ != NULL) { +#line 6303 "MediaPage.c" + CommandManager* _tmp17_; CommandManager* _tmp18_; - CommandManager* _tmp19_; - GeeList* _tmp20_; - const gchar* _tmp21_; + GeeList* _tmp19_; + const gchar* _tmp20_; + EditMultipleCommentsCommand* _tmp21_; EditMultipleCommentsCommand* _tmp22_; - EditMultipleCommentsCommand* _tmp23_; #line 812 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp18_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp17_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 812 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 812 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp20_ = media_sources; + _tmp19_ = media_sources; #line 812 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp21_ = new_comment; + _tmp20_ = new_comment; #line 812 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp22_ = edit_multiple_comments_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_); + _tmp21_ = edit_multiple_comments_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_); #line 812 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp23_ = _tmp22_; + _tmp22_ = _tmp21_; #line 812 "/home/jens/Source/shotwell/src/MediaPage.vala" - command_manager_execute (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command)); #line 812 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp22_); #line 812 "/home/jens/Source/shotwell/src/MediaPage.vala" - _command_manager_unref0 (_tmp19_); -#line 5994 "MediaPage.c" + _command_manager_unref0 (_tmp18_); +#line 6328 "MediaPage.c" } #line 803 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_free0 (new_comment); @@ -5998,289 +6332,288 @@ static void media_page_real_on_edit_comment (MediaPage* self) { _multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog); #line 803 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (media_sources); -#line 6002 "MediaPage.c" +#line 6336 "MediaPage.c" } -void media_page_on_edit_comment (MediaPage* self) { +void +media_page_on_edit_comment (MediaPage* self) +{ #line 803 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 803 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_edit_comment (self); -#line 6011 "MediaPage.c" +#line 6347 "MediaPage.c" } -static void media_page_real_on_display_titles (MediaPage* self, GSimpleAction* action, GVariant* value) { +static void +media_page_real_on_display_titles (MediaPage* self, + GSimpleAction* action, + GVariant* value) +{ gboolean display = FALSE; - GVariant* _tmp0_; - gboolean _tmp1_; - ConfigFacade* _tmp2_; - ConfigFacade* _tmp3_; - GSimpleAction* _tmp4_; - GVariant* _tmp5_; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; #line 815 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); #line 816 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = value; -#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala" - display = _tmp1_; + display = g_variant_get_boolean (value); #line 818 "/home/jens/Source/shotwell/src/MediaPage.vala" checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display); #line 820 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = config_facade_get_instance (); + _tmp0_ = config_facade_get_instance (); #line 820 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 820 "/home/jens/Source/shotwell/src/MediaPage.vala" - configuration_facade_set_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display); + configuration_facade_set_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display); #line 820 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp3_); -#line 821 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = action; -#line 821 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = value; + _g_object_unref0 (_tmp1_); #line 821 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_simple_action_set_state (_tmp4_, _tmp5_); -#line 6047 "MediaPage.c" + g_simple_action_set_state (action, value); +#line 6375 "MediaPage.c" } -void media_page_on_display_titles (MediaPage* self, GSimpleAction* action, GVariant* value) { +void +media_page_on_display_titles (MediaPage* self, + GSimpleAction* action, + GVariant* value) +{ #line 815 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 815 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_display_titles (self, action, value); -#line 6056 "MediaPage.c" +#line 6388 "MediaPage.c" } -static void media_page_real_on_display_comments (MediaPage* self, GSimpleAction* action, GVariant* value) { +static void +media_page_real_on_display_comments (MediaPage* self, + GSimpleAction* action, + GVariant* value) +{ gboolean display = FALSE; - GVariant* _tmp0_; - gboolean _tmp1_; - ConfigFacade* _tmp2_; - ConfigFacade* _tmp3_; - GSimpleAction* _tmp4_; - GVariant* _tmp5_; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; #line 824 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); #line 825 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = value; -#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala" - display = _tmp1_; + display = g_variant_get_boolean (value); #line 827 "/home/jens/Source/shotwell/src/MediaPage.vala" checkerboard_page_set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display); #line 829 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = config_facade_get_instance (); + _tmp0_ = config_facade_get_instance (); #line 829 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 829 "/home/jens/Source/shotwell/src/MediaPage.vala" - configuration_facade_set_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display); + configuration_facade_set_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display); #line 829 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp3_); -#line 830 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = action; -#line 830 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = value; + _g_object_unref0 (_tmp1_); #line 830 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_simple_action_set_state (_tmp4_, _tmp5_); -#line 6092 "MediaPage.c" + g_simple_action_set_state (action, value); +#line 6416 "MediaPage.c" } -void media_page_on_display_comments (MediaPage* self, GSimpleAction* action, GVariant* value) { +void +media_page_on_display_comments (MediaPage* self, + GSimpleAction* action, + GVariant* value) +{ #line 824 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 824 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_display_comments (self, action, value); -#line 6101 "MediaPage.c" +#line 6429 "MediaPage.c" } -static void media_page_real_on_display_ratings (MediaPage* self, GSimpleAction* action, GVariant* value) { +static void +media_page_real_on_display_ratings (MediaPage* self, + GSimpleAction* action, + GVariant* value) +{ gboolean display = FALSE; - GVariant* _tmp0_; - gboolean _tmp1_; - ConfigFacade* _tmp2_; - ConfigFacade* _tmp3_; - GSimpleAction* _tmp4_; - GVariant* _tmp5_; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; #line 833 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); #line 834 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = value; -#line 834 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 834 "/home/jens/Source/shotwell/src/MediaPage.vala" - display = _tmp1_; + display = g_variant_get_boolean (value); #line 836 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_set_display_ratings (self, display); #line 838 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = config_facade_get_instance (); + _tmp0_ = config_facade_get_instance (); #line 838 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 838 "/home/jens/Source/shotwell/src/MediaPage.vala" - configuration_facade_set_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display); + configuration_facade_set_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display); #line 838 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp3_); -#line 839 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = action; -#line 839 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = value; + _g_object_unref0 (_tmp1_); #line 839 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_simple_action_set_state (_tmp4_, _tmp5_); -#line 6137 "MediaPage.c" + g_simple_action_set_state (action, value); +#line 6457 "MediaPage.c" } -void media_page_on_display_ratings (MediaPage* self, GSimpleAction* action, GVariant* value) { +void +media_page_on_display_ratings (MediaPage* self, + GSimpleAction* action, + GVariant* value) +{ #line 833 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 833 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_display_ratings (self, action, value); -#line 6146 "MediaPage.c" +#line 6470 "MediaPage.c" } -static void media_page_real_on_display_tags (MediaPage* self, GSimpleAction* action, GVariant* value) { +static void +media_page_real_on_display_tags (MediaPage* self, + GSimpleAction* action, + GVariant* value) +{ gboolean display = FALSE; - GVariant* _tmp0_; - gboolean _tmp1_; - ConfigFacade* _tmp2_; - ConfigFacade* _tmp3_; - GSimpleAction* _tmp4_; - GVariant* _tmp5_; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; #line 842 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); #line 843 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = value; -#line 843 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 843 "/home/jens/Source/shotwell/src/MediaPage.vala" - display = _tmp1_; + display = g_variant_get_boolean (value); #line 845 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_set_display_tags (self, display); #line 847 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = config_facade_get_instance (); + _tmp0_ = config_facade_get_instance (); #line 847 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 847 "/home/jens/Source/shotwell/src/MediaPage.vala" - configuration_facade_set_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display); + configuration_facade_set_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display); #line 847 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp3_); -#line 848 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = action; -#line 848 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = value; + _g_object_unref0 (_tmp1_); #line 848 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_simple_action_set_state (_tmp4_, _tmp5_); -#line 6182 "MediaPage.c" + g_simple_action_set_state (action, value); +#line 6498 "MediaPage.c" } -void media_page_on_display_tags (MediaPage* self, GSimpleAction* action, GVariant* value) { +void +media_page_on_display_tags (MediaPage* self, + GSimpleAction* action, + GVariant* value) +{ #line 842 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 842 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_display_tags (self, action, value); -#line 6191 "MediaPage.c" +#line 6511 "MediaPage.c" } -static void media_page_real_get_config_photos_sort (MediaPage* self, gboolean* sort_order, gint* sort_by) { +static void +media_page_real_get_config_photos_sort (MediaPage* self, + gboolean* sort_order, + gint* sort_by) +{ #line 851 "/home/jens/Source/shotwell/src/MediaPage.vala" g_critical ("Type `%s' does not implement abstract method `media_page_get_config_photos_sort'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 851 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 6200 "MediaPage.c" +#line 6524 "MediaPage.c" } -void media_page_get_config_photos_sort (MediaPage* self, gboolean* sort_order, gint* sort_by) { +void +media_page_get_config_photos_sort (MediaPage* self, + gboolean* sort_order, + gint* sort_by) +{ #line 851 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 851 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->get_config_photos_sort (self, sort_order, sort_by); -#line 6209 "MediaPage.c" +#line 6537 "MediaPage.c" } -static void media_page_real_set_config_photos_sort (MediaPage* self, gboolean sort_order, gint sort_by) { +static void +media_page_real_set_config_photos_sort (MediaPage* self, + gboolean sort_order, + gint sort_by) +{ #line 853 "/home/jens/Source/shotwell/src/MediaPage.vala" g_critical ("Type `%s' does not implement abstract method `media_page_set_config_photos_sort'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 853 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 6218 "MediaPage.c" +#line 6550 "MediaPage.c" } -void media_page_set_config_photos_sort (MediaPage* self, gboolean sort_order, gint sort_by) { +void +media_page_set_config_photos_sort (MediaPage* self, + gboolean sort_order, + gint sort_by) +{ #line 853 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 853 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->set_config_photos_sort (self, sort_order, sort_by); -#line 6227 "MediaPage.c" +#line 6563 "MediaPage.c" } -static void media_page_real_on_sort_changed (MediaPage* self, GSimpleAction* action, GVariant* value) { - GSimpleAction* _tmp0_; - GVariant* _tmp1_; +static void +media_page_real_on_sort_changed (MediaPage* self, + GSimpleAction* action, + GVariant* value) +{ gint sort_by = 0; - gint _tmp2_; gboolean sort_order = FALSE; - gboolean _tmp3_; #line 855 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); #line 856 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = action; -#line 856 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = value; -#line 856 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_simple_action_set_state (_tmp0_, _tmp1_); + g_simple_action_set_state (action, value); #line 858 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = media_page_get_menu_sort_by (self); -#line 858 "/home/jens/Source/shotwell/src/MediaPage.vala" - sort_by = _tmp2_; -#line 859 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = media_page_get_menu_sort_order (self); + sort_by = media_page_get_menu_sort_by (self); #line 859 "/home/jens/Source/shotwell/src/MediaPage.vala" - sort_order = _tmp3_; + sort_order = media_page_get_menu_sort_order (self); #line 861 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_set_view_comparator (self, sort_by, sort_order); #line 862 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_set_config_photos_sort (self, sort_order, sort_by); -#line 6258 "MediaPage.c" +#line 6586 "MediaPage.c" } -void media_page_on_sort_changed (MediaPage* self, GSimpleAction* action, GVariant* value) { +void +media_page_on_sort_changed (MediaPage* self, + GSimpleAction* action, + GVariant* value) +{ #line 855 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 855 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_sort_changed (self, action, value); -#line 6267 "MediaPage.c" +#line 6599 "MediaPage.c" } -static void media_page_on_raw_developer_changed (MediaPage* self, GSimpleAction* action, GVariant* value) { +static void +media_page_on_raw_developer_changed (MediaPage* self, + GSimpleAction* action, + GVariant* value) +{ RawDeveloper developer = 0; - GVariant* _tmp0_; + const gchar* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; - GQuark _tmp4_ = 0U; + GQuark _tmp3_ = 0U; #line 869 "/home/jens/Source/shotwell/src/MediaPage.vala" - static GQuark _tmp3_label0 = 0; + static GQuark _tmp2_label0 = 0; #line 869 "/home/jens/Source/shotwell/src/MediaPage.vala" - static GQuark _tmp3_label1 = 0; -#line 6281 "MediaPage.c" - RawDeveloper _tmp5_; - GSimpleAction* _tmp6_; - GVariant* _tmp7_; + static GQuark _tmp2_label1 = 0; +#line 6616 "MediaPage.c" + RawDeveloper _tmp4_; #line 865 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 865 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -6288,353 +6621,328 @@ static void media_page_on_raw_developer_changed (MediaPage* self, GSimpleAction* #line 867 "/home/jens/Source/shotwell/src/MediaPage.vala" developer = RAW_DEVELOPER_SHOTWELL; #line 869 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = value; + _tmp0_ = g_variant_get_string (value, NULL); #line 869 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = g_variant_get_string (_tmp0_, NULL); + _tmp1_ = _tmp0_; #line 869 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = _tmp1_; + _tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_); #line 869 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_); -#line 869 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("Shotwell")))) { + if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("Shotwell")))) { #line 869 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 6303 "MediaPage.c" +#line 6634 "MediaPage.c" default: { #line 871 "/home/jens/Source/shotwell/src/MediaPage.vala" developer = RAW_DEVELOPER_SHOTWELL; #line 872 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 6310 "MediaPage.c" +#line 6641 "MediaPage.c" } } - } else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("Camera")))) { + } else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("Camera")))) { #line 869 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 6316 "MediaPage.c" +#line 6647 "MediaPage.c" default: { #line 874 "/home/jens/Source/shotwell/src/MediaPage.vala" developer = RAW_DEVELOPER_CAMERA; #line 875 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 6323 "MediaPage.c" +#line 6654 "MediaPage.c" } } } else { #line 869 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 6329 "MediaPage.c" +#line 6660 "MediaPage.c" default: { #line 877 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 6334 "MediaPage.c" +#line 6665 "MediaPage.c" } } } #line 880 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = developer; + _tmp4_ = developer; #line 880 "/home/jens/Source/shotwell/src/MediaPage.vala" - media_page_developer_changed (self, _tmp5_); -#line 882 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = action; + media_page_developer_changed (self, _tmp4_); #line 882 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = value; -#line 882 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_simple_action_set_state (_tmp6_, _tmp7_); -#line 6348 "MediaPage.c" + g_simple_action_set_state (action, value); +#line 6675 "MediaPage.c" } -static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd) { +static void +media_page_real_developer_changed (MediaPage* self, + RawDeveloper rd) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; gboolean need_warn = FALSE; GeeArrayList* to_set = NULL; - GeeArrayList* _tmp4_; - gboolean _tmp31_ = FALSE; - gboolean _tmp32_; + GeeArrayList* _tmp3_; + gboolean _tmp26_ = FALSE; + gboolean _tmp27_; #line 886 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 886 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = _tmp0_; #line 886 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0; #line 886 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp1_); #line 886 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 887 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 6376 "MediaPage.c" +#line 6703 "MediaPage.c" } #line 892 "/home/jens/Source/shotwell/src/MediaPage.vala" need_warn = FALSE; #line 895 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp3_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 895 "/home/jens/Source/shotwell/src/MediaPage.vala" - to_set = _tmp4_; -#line 6384 "MediaPage.c" + to_set = _tmp3_; +#line 6711 "MediaPage.c" { GeeList* _view_list = NULL; + ViewCollection* _tmp4_; ViewCollection* _tmp5_; - ViewCollection* _tmp6_; + GeeList* _tmp6_; GeeList* _tmp7_; - GeeList* _tmp8_; gint _view_size = 0; - GeeList* _tmp9_; + GeeList* _tmp8_; + gint _tmp9_; gint _tmp10_; - gint _tmp11_; gint _view_index = 0; #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = view_collection_get_selected (_tmp6_); + _tmp6_ = view_collection_get_selected (_tmp5_); #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp6_); + _data_collection_unref0 (_tmp5_); #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" - _view_list = _tmp8_; + _view_list = _tmp7_; #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = _view_list; + _tmp8_ = _view_list; #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" - _view_size = _tmp11_; + _view_size = _tmp10_; #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" _view_index = -1; #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" while (TRUE) { -#line 6420 "MediaPage.c" +#line 6747 "MediaPage.c" + gint _tmp11_; gint _tmp12_; gint _tmp13_; - gint _tmp14_; DataView* view = NULL; - GeeList* _tmp15_; - gint _tmp16_; - gpointer _tmp17_; + GeeList* _tmp14_; + gint _tmp15_; + gpointer _tmp16_; Photo* p = NULL; - DataView* _tmp18_; - DataSource* _tmp19_; - Photo* _tmp20_; - gboolean _tmp21_ = FALSE; - Photo* _tmp22_; + DataView* _tmp17_; + DataSource* _tmp18_; + Photo* _tmp19_; + gboolean _tmp20_ = FALSE; + Photo* _tmp21_; #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp12_ = _view_index; + _tmp11_ = _view_index; #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" - _view_index = _tmp12_ + 1; + _view_index = _tmp11_ + 1; #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp13_ = _view_index; + _tmp12_ = _view_index; #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp14_ = _view_size; + _tmp13_ = _view_size; #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (!(_tmp13_ < _tmp14_)) { + if (!(_tmp12_ < _tmp13_)) { #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 6446 "MediaPage.c" +#line 6773 "MediaPage.c" } #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp15_ = _view_list; + _tmp14_ = _view_list; #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = _view_index; + _tmp15_ = _view_index; #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = gee_list_get (_tmp15_, _tmp16_); + _tmp16_ = gee_list_get (_tmp14_, _tmp15_); #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" - view = (DataView*) _tmp17_; + view = (DataView*) _tmp16_; #line 897 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp18_ = view; + _tmp17_ = view; #line 897 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp19_ = data_view_get_source (_tmp18_); + _tmp18_ = data_view_get_source (_tmp17_); #line 897 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_PHOTO) ? ((Photo*) _tmp19_) : NULL; + _tmp19_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_PHOTO) ? ((Photo*) _tmp18_) : NULL; #line 897 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp20_ == NULL) { + if (_tmp19_ == NULL) { #line 897 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp19_); -#line 6466 "MediaPage.c" + _g_object_unref0 (_tmp18_); +#line 6793 "MediaPage.c" } #line 897 "/home/jens/Source/shotwell/src/MediaPage.vala" - p = _tmp20_; -#line 898 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp22_ = p; -#line 898 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp22_ != NULL) { -#line 6474 "MediaPage.c" - RawDeveloper _tmp23_; - Photo* _tmp24_; - RawDeveloper _tmp25_; - gboolean _tmp26_; + p = _tmp19_; #line 898 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp23_ = rd; + _tmp21_ = p; #line 898 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp24_ = p; + if (_tmp21_ != NULL) { +#line 6801 "MediaPage.c" + Photo* _tmp22_; #line 898 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp25_ = photo_get_raw_developer (_tmp24_); + _tmp22_ = p; #line 898 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp26_ = raw_developer_is_equivalent (_tmp23_, _tmp25_); -#line 898 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp21_ = !_tmp26_; -#line 6489 "MediaPage.c" + _tmp20_ = !raw_developer_is_equivalent (rd, photo_get_raw_developer (_tmp22_)); +#line 6807 "MediaPage.c" } else { #line 898 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp21_ = FALSE; -#line 6493 "MediaPage.c" + _tmp20_ = FALSE; +#line 6811 "MediaPage.c" } #line 898 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp21_) { -#line 6497 "MediaPage.c" - GeeArrayList* _tmp27_; - DataView* _tmp28_; - Photo* _tmp29_; - gboolean _tmp30_; + if (_tmp20_) { +#line 6815 "MediaPage.c" + GeeArrayList* _tmp23_; + DataView* _tmp24_; + Photo* _tmp25_; #line 899 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp27_ = to_set; + _tmp23_ = to_set; #line 899 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp28_ = view; + _tmp24_ = view; #line 899 "/home/jens/Source/shotwell/src/MediaPage.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_); -#line 901 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp29_ = p; + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_); #line 901 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp30_ = photo_has_transformations (_tmp29_); + _tmp25_ = p; #line 901 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp30_) { + if (photo_has_transformations (_tmp25_)) { #line 902 "/home/jens/Source/shotwell/src/MediaPage.vala" need_warn = TRUE; -#line 6516 "MediaPage.c" +#line 6831 "MediaPage.c" } } #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (p); #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (view); -#line 6523 "MediaPage.c" +#line 6838 "MediaPage.c" } #line 896 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_view_list); -#line 6527 "MediaPage.c" +#line 6842 "MediaPage.c" } #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp32_ = need_warn; + _tmp27_ = need_warn; #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (!_tmp32_) { + if (!_tmp27_) { #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp31_ = TRUE; -#line 6535 "MediaPage.c" + _tmp26_ = TRUE; +#line 6850 "MediaPage.c" } else { - GeeArrayList* _tmp33_; - gint _tmp34_; - gint _tmp35_; - gboolean _tmp36_; -#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp33_ = to_set; + GeeArrayList* _tmp28_; + gint _tmp29_; + gint _tmp30_; #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp28_ = to_set; #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp35_ = _tmp34_; + _tmp29_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp36_ = dialogs_confirm_warn_developer_changed (_tmp35_); + _tmp30_ = _tmp29_; #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp31_ = _tmp36_; -#line 6551 "MediaPage.c" + _tmp26_ = dialogs_confirm_warn_developer_changed (_tmp30_); +#line 6863 "MediaPage.c" } #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp31_) { -#line 6555 "MediaPage.c" + if (_tmp26_) { +#line 6867 "MediaPage.c" SetRawDeveloperCommand* command = NULL; - GeeArrayList* _tmp37_; - RawDeveloper _tmp38_; - SetRawDeveloperCommand* _tmp39_; - CommandManager* _tmp40_; - CommandManager* _tmp41_; - SetRawDeveloperCommand* _tmp42_; + GeeArrayList* _tmp31_; + SetRawDeveloperCommand* _tmp32_; + CommandManager* _tmp33_; + CommandManager* _tmp34_; + SetRawDeveloperCommand* _tmp35_; #line 908 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp37_ = to_set; + _tmp31_ = to_set; #line 908 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp38_ = rd; + _tmp32_ = set_raw_developer_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ITERABLE, GeeIterable), rd); #line 908 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp39_ = set_raw_developer_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ITERABLE, GeeIterable), _tmp38_); -#line 908 "/home/jens/Source/shotwell/src/MediaPage.vala" - command = _tmp39_; + command = _tmp32_; #line 909 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp40_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp33_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 909 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp41_ = _tmp40_; + _tmp34_ = _tmp33_; #line 909 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp42_ = command; + _tmp35_ = command; #line 909 "/home/jens/Source/shotwell/src/MediaPage.vala" - command_manager_execute (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_COMMAND, Command)); #line 909 "/home/jens/Source/shotwell/src/MediaPage.vala" - _command_manager_unref0 (_tmp41_); + _command_manager_unref0 (_tmp34_); #line 911 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_update_development_menu_item_sensitivity (self); #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (command); -#line 6585 "MediaPage.c" +#line 6894 "MediaPage.c" } #line 885 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (to_set); -#line 6589 "MediaPage.c" +#line 6898 "MediaPage.c" } -void media_page_developer_changed (MediaPage* self, RawDeveloper rd) { +void +media_page_developer_changed (MediaPage* self, + RawDeveloper rd) +{ #line 885 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 885 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->developer_changed (self, rd); -#line 6598 "MediaPage.c" +#line 6910 "MediaPage.c" } -static void media_page_real_set_display_titles (CheckerboardPage* base, gboolean display) { +static void +media_page_real_set_display_titles (CheckerboardPage* base, + gboolean display) +{ MediaPage * self; - gboolean _tmp0_; - gboolean _tmp1_; #line 915 "/home/jens/Source/shotwell/src/MediaPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage); #line 916 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = display; -#line 916 "/home/jens/Source/shotwell/src/MediaPage.vala" - CHECKERBOARD_PAGE_CLASS (media_page_parent_class)->set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp0_); -#line 918 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = display; + CHECKERBOARD_PAGE_CLASS (media_page_parent_class)->set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display); #line 918 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", _tmp1_); -#line 6616 "MediaPage.c" + page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", display); +#line 6925 "MediaPage.c" } -static void media_page_real_set_display_comments (CheckerboardPage* base, gboolean display) { +static void +media_page_real_set_display_comments (CheckerboardPage* base, + gboolean display) +{ MediaPage * self; - gboolean _tmp0_; - gboolean _tmp1_; #line 921 "/home/jens/Source/shotwell/src/MediaPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage); #line 922 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = display; -#line 922 "/home/jens/Source/shotwell/src/MediaPage.vala" - CHECKERBOARD_PAGE_CLASS (media_page_parent_class)->set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp0_); + CHECKERBOARD_PAGE_CLASS (media_page_parent_class)->set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display); #line 924 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = display; -#line 924 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment", _tmp1_); -#line 6634 "MediaPage.c" + page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment", display); +#line 6940 "MediaPage.c" } -static GAction* media_page_sort_by_title_action (MediaPage* self) { +static GAction* +media_page_sort_by_title_action (MediaPage* self) +{ GAction* result = NULL; GAction* action = NULL; GAction* _tmp0_; @@ -6650,11 +6958,13 @@ static GAction* media_page_sort_by_title_action (MediaPage* self) { result = action; #line 930 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 6654 "MediaPage.c" +#line 6962 "MediaPage.c" } -static GAction* media_page_sort_ascending_action (MediaPage* self) { +static GAction* +media_page_sort_ascending_action (MediaPage* self) +{ GAction* result = NULL; GAction* action = NULL; GAction* _tmp0_; @@ -6670,11 +6980,13 @@ static GAction* media_page_sort_ascending_action (MediaPage* self) { result = action; #line 936 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 6674 "MediaPage.c" +#line 6984 "MediaPage.c" } -gint media_page_get_menu_sort_by (MediaPage* self) { +gint +media_page_get_menu_sort_by (MediaPage* self) +{ gint result = 0; GAction* _tmp0_; GAction* _tmp1_; @@ -6682,7 +6994,6 @@ gint media_page_get_menu_sort_by (MediaPage* self) { GVariant* _tmp3_; const gchar* _tmp4_; gint _tmp5_; - gint _tmp6_; #line 939 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (IS_MEDIA_PAGE (self), 0); #line 941 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -6697,61 +7008,63 @@ gint media_page_get_menu_sort_by (MediaPage* self) { _tmp4_ = g_variant_get_string (_tmp3_, NULL); #line 941 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp5_ = atoi (_tmp4_); -#line 941 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = _tmp5_; #line 941 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_variant_unref0 (_tmp3_); #line 941 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp1_); #line 941 "/home/jens/Source/shotwell/src/MediaPage.vala" - result = _tmp6_; + result = _tmp5_; #line 941 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 6711 "MediaPage.c" +#line 7020 "MediaPage.c" } -static GVariant* _variant_new30 (const gchar* value) { +static GVariant* +_variant_new30 (const gchar* value) +{ #line 946 "/home/jens/Source/shotwell/src/MediaPage.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 6718 "MediaPage.c" +#line 7029 "MediaPage.c" } -void media_page_set_menu_sort_by (MediaPage* self, gint val) { +void +media_page_set_menu_sort_by (MediaPage* self, + gint val) +{ gchar* sort = NULL; - gint _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; + GAction* _tmp1_; GAction* _tmp2_; - GAction* _tmp3_; - GVariant* _tmp4_; + GVariant* _tmp3_; #line 944 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 945 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = val; -#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = g_strdup_printf ("%d", _tmp0_); + _tmp0_ = g_strdup_printf ("%d", val); #line 945 "/home/jens/Source/shotwell/src/MediaPage.vala" - sort = _tmp1_; + sort = _tmp0_; #line 946 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = media_page_sort_by_title_action (self); + _tmp1_ = media_page_sort_by_title_action (self); #line 946 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 946 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = _variant_new30 (sort); + _tmp3_ = _variant_new30 (sort); #line 946 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_action_change_state (_tmp3_, _tmp4_); + g_action_change_state (_tmp2_, _tmp3_); #line 946 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_variant_unref0 (_tmp4_); + _g_variant_unref0 (_tmp3_); #line 946 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 944 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_free0 (sort); -#line 6751 "MediaPage.c" +#line 7062 "MediaPage.c" } -gboolean media_page_get_menu_sort_order (MediaPage* self) { +gboolean +media_page_get_menu_sort_order (MediaPage* self) +{ gboolean result = FALSE; GAction* _tmp0_; GAction* _tmp1_; @@ -6781,190 +7094,238 @@ gboolean media_page_get_menu_sort_order (MediaPage* self) { result = _tmp5_; #line 951 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 6785 "MediaPage.c" +#line 7098 "MediaPage.c" } -static GVariant* _variant_new31 (const gchar* value) { +static GVariant* +_variant_new31 (const gchar* value) +{ #line 955 "/home/jens/Source/shotwell/src/MediaPage.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 6792 "MediaPage.c" +#line 7107 "MediaPage.c" } -void media_page_set_menu_sort_order (MediaPage* self, gboolean ascending) { +void +media_page_set_menu_sort_order (MediaPage* self, + gboolean ascending) +{ const gchar* _tmp0_ = NULL; - gboolean _tmp1_; + GAction* _tmp1_; GAction* _tmp2_; - GAction* _tmp3_; - GVariant* _tmp4_; + GVariant* _tmp3_; #line 954 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 955 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = ascending; -#line 955 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp1_) { + if (ascending) { #line 955 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp0_ = "ascending"; -#line 6810 "MediaPage.c" +#line 7125 "MediaPage.c" } else { #line 955 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp0_ = "descending"; -#line 6814 "MediaPage.c" +#line 7129 "MediaPage.c" } #line 955 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = media_page_sort_ascending_action (self); + _tmp1_ = media_page_sort_ascending_action (self); #line 955 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 955 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = _variant_new31 (_tmp0_); + _tmp3_ = _variant_new31 (_tmp0_); #line 955 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_action_change_state (_tmp3_, _tmp4_); + g_action_change_state (_tmp2_, _tmp3_); #line 955 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_variant_unref0 (_tmp4_); + _g_variant_unref0 (_tmp3_); #line 955 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp3_); -#line 6828 "MediaPage.c" + _g_object_unref0 (_tmp2_); +#line 7143 "MediaPage.c" } -static gint64 _thumbnail_title_ascending_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_thumbnail_title_ascending_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = thumbnail_title_ascending_comparator (a, b); #line 965 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 6837 "MediaPage.c" +#line 7156 "MediaPage.c" } -static gint64 _thumbnail_title_descending_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_thumbnail_title_descending_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = thumbnail_title_descending_comparator (a, b); #line 966 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 6846 "MediaPage.c" +#line 7169 "MediaPage.c" } -static gboolean _thumbnail_title_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) { +static gboolean +_thumbnail_title_comparator_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self) +{ gboolean result; result = thumbnail_title_comparator_predicate (object, alteration); #line 967 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 6855 "MediaPage.c" +#line 7182 "MediaPage.c" } -static gint64 _thumbnail_exposure_time_ascending_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_thumbnail_exposure_time_ascending_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = thumbnail_exposure_time_ascending_comparator (a, b); #line 972 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 6864 "MediaPage.c" +#line 7195 "MediaPage.c" } -static gint64 _thumbnail_exposure_time_desending_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_thumbnail_exposure_time_desending_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = thumbnail_exposure_time_desending_comparator (a, b); #line 973 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 6873 "MediaPage.c" +#line 7208 "MediaPage.c" } -static gboolean _thumbnail_exposure_time_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) { +static gboolean +_thumbnail_exposure_time_comparator_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self) +{ gboolean result; result = thumbnail_exposure_time_comparator_predicate (object, alteration); #line 974 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 6882 "MediaPage.c" +#line 7221 "MediaPage.c" } -static gint64 _thumbnail_rating_ascending_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_thumbnail_rating_ascending_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = thumbnail_rating_ascending_comparator (a, b); #line 979 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 6891 "MediaPage.c" +#line 7234 "MediaPage.c" } -static gint64 _thumbnail_rating_descending_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_thumbnail_rating_descending_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = thumbnail_rating_descending_comparator (a, b); #line 980 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 6900 "MediaPage.c" +#line 7247 "MediaPage.c" } -static gboolean _thumbnail_rating_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) { +static gboolean +_thumbnail_rating_comparator_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self) +{ gboolean result; result = thumbnail_rating_comparator_predicate (object, alteration); #line 981 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 6909 "MediaPage.c" +#line 7260 "MediaPage.c" } -static gint64 _thumbnail_filename_ascending_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_thumbnail_filename_ascending_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = thumbnail_filename_ascending_comparator (a, b); #line 986 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 6918 "MediaPage.c" +#line 7273 "MediaPage.c" } -static gint64 _thumbnail_filename_descending_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_thumbnail_filename_descending_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = thumbnail_filename_descending_comparator (a, b); #line 987 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 6927 "MediaPage.c" +#line 7286 "MediaPage.c" } -static gboolean _thumbnail_filename_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) { +static gboolean +_thumbnail_filename_comparator_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self) +{ gboolean result; result = thumbnail_filename_comparator_predicate (object, alteration); #line 988 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 6936 "MediaPage.c" +#line 7299 "MediaPage.c" } -static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gboolean ascending) { +static void +media_page_set_view_comparator (MediaPage* self, + gint sort_by, + gboolean ascending) +{ Comparator comparator = NULL; void* comparator_target = NULL; GDestroyNotify comparator_target_destroy_notify = NULL; ComparatorPredicate predicate = NULL; void* predicate_target = NULL; GDestroyNotify predicate_target_destroy_notify = NULL; - gint _tmp0_; - ViewCollection* _tmp8_; - ViewCollection* _tmp9_; - Comparator _tmp10_; - void* _tmp10__target; - ComparatorPredicate _tmp11_; - void* _tmp11__target; + ViewCollection* _tmp2_; + ViewCollection* _tmp3_; + Comparator _tmp4_; + void* _tmp4__target; + ComparatorPredicate _tmp5_; + void* _tmp5__target; #line 958 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 962 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = sort_by; -#line 962 "/home/jens/Source/shotwell/src/MediaPage.vala" - switch (_tmp0_) { + switch (sort_by) { #line 962 "/home/jens/Source/shotwell/src/MediaPage.vala" case MEDIA_PAGE_SORT_BY_TITLE: -#line 6962 "MediaPage.c" +#line 7326 "MediaPage.c" { - gboolean _tmp1_; #line 964 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = ascending; -#line 964 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp1_) { + if (ascending) { #line 965 "/home/jens/Source/shotwell/src/MediaPage.vala" (comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL); #line 965 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -6979,7 +7340,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool comparator_target = NULL; #line 965 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 6983 "MediaPage.c" +#line 7344 "MediaPage.c" } else { #line 966 "/home/jens/Source/shotwell/src/MediaPage.vala" (comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL); @@ -6995,7 +7356,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool comparator_target = NULL; #line 966 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 6999 "MediaPage.c" +#line 7360 "MediaPage.c" } #line 967 "/home/jens/Source/shotwell/src/MediaPage.vala" (predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL); @@ -7013,17 +7374,14 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool predicate_target_destroy_notify = NULL; #line 968 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 7017 "MediaPage.c" +#line 7378 "MediaPage.c" } #line 962 "/home/jens/Source/shotwell/src/MediaPage.vala" case MEDIA_PAGE_SORT_BY_EXPOSURE_DATE: -#line 7021 "MediaPage.c" +#line 7382 "MediaPage.c" { - gboolean _tmp2_; -#line 971 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = ascending; #line 971 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp2_) { + if (ascending) { #line 972 "/home/jens/Source/shotwell/src/MediaPage.vala" (comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL); #line 972 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -7038,7 +7396,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool comparator_target = NULL; #line 972 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 7042 "MediaPage.c" +#line 7400 "MediaPage.c" } else { #line 973 "/home/jens/Source/shotwell/src/MediaPage.vala" (comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL); @@ -7054,7 +7412,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool comparator_target = NULL; #line 973 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 7058 "MediaPage.c" +#line 7416 "MediaPage.c" } #line 974 "/home/jens/Source/shotwell/src/MediaPage.vala" (predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL); @@ -7072,17 +7430,14 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool predicate_target_destroy_notify = NULL; #line 975 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 7076 "MediaPage.c" +#line 7434 "MediaPage.c" } #line 962 "/home/jens/Source/shotwell/src/MediaPage.vala" case MEDIA_PAGE_SORT_BY_RATING: -#line 7080 "MediaPage.c" +#line 7438 "MediaPage.c" { - gboolean _tmp3_; #line 978 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = ascending; -#line 978 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp3_) { + if (ascending) { #line 979 "/home/jens/Source/shotwell/src/MediaPage.vala" (comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL); #line 979 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -7097,7 +7452,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool comparator_target = NULL; #line 979 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 7101 "MediaPage.c" +#line 7456 "MediaPage.c" } else { #line 980 "/home/jens/Source/shotwell/src/MediaPage.vala" (comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL); @@ -7113,7 +7468,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool comparator_target = NULL; #line 980 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 7117 "MediaPage.c" +#line 7472 "MediaPage.c" } #line 981 "/home/jens/Source/shotwell/src/MediaPage.vala" (predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL); @@ -7131,17 +7486,14 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool predicate_target_destroy_notify = NULL; #line 982 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 7135 "MediaPage.c" +#line 7490 "MediaPage.c" } #line 962 "/home/jens/Source/shotwell/src/MediaPage.vala" case MEDIA_PAGE_SORT_BY_FILENAME: -#line 7139 "MediaPage.c" +#line 7494 "MediaPage.c" { - gboolean _tmp4_; #line 985 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = ascending; -#line 985 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp4_) { + if (ascending) { #line 986 "/home/jens/Source/shotwell/src/MediaPage.vala" (comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL); #line 986 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -7156,7 +7508,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool comparator_target = NULL; #line 986 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 7160 "MediaPage.c" +#line 7512 "MediaPage.c" } else { #line 987 "/home/jens/Source/shotwell/src/MediaPage.vala" (comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL); @@ -7172,7 +7524,7 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool comparator_target = NULL; #line 987 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 7176 "MediaPage.c" +#line 7528 "MediaPage.c" } #line 988 "/home/jens/Source/shotwell/src/MediaPage.vala" (predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL); @@ -7190,23 +7542,20 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool predicate_target_destroy_notify = NULL; #line 989 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 7194 "MediaPage.c" +#line 7546 "MediaPage.c" } default: { - gint _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; -#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = media_page_get_menu_sort_by (self); + gchar* _tmp0_; + gchar* _tmp1_; #line 992 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = g_strdup_printf ("%i", _tmp5_); + _tmp0_ = g_strdup_printf ("%i", media_page_get_menu_sort_by (self)); #line 992 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = _tmp6_; + _tmp1_ = _tmp0_; #line 992 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_debug ("MediaPage.vala:992: Unknown sort criteria: %s", _tmp7_); + g_debug ("MediaPage.vala:992: Unknown sort criteria: %s", _tmp1_); #line 992 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp1_); #line 993 "/home/jens/Source/shotwell/src/MediaPage.vala" (comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL); #line 993 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -7237,25 +7586,25 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool predicate_target_destroy_notify = NULL; #line 995 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 7241 "MediaPage.c" +#line 7590 "MediaPage.c" } } #line 998 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 998 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = _tmp8_; + _tmp3_ = _tmp2_; #line 998 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = comparator; + _tmp4_ = comparator; #line 998 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10__target = comparator_target; + _tmp4__target = comparator_target; #line 998 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = predicate; + _tmp5_ = predicate; #line 998 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11__target = predicate_target; + _tmp5__target = predicate_target; #line 998 "/home/jens/Source/shotwell/src/MediaPage.vala" - data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection), _tmp10_, _tmp10__target, _tmp11_, _tmp11__target); + data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), _tmp4_, _tmp4__target, _tmp5_, _tmp5__target); #line 998 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp9_); + _data_collection_unref0 (_tmp3_); #line 958 "/home/jens/Source/shotwell/src/MediaPage.vala" (predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL); #line 958 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -7272,11 +7621,13 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool comparator_target = NULL; #line 958 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 7276 "MediaPage.c" +#line 7625 "MediaPage.c" } -void media_page_sync_sort (MediaPage* self) { +void +media_page_sync_sort (MediaPage* self) +{ gboolean sort_ascending = FALSE; gint sort_by = 0; gboolean _tmp0_ = FALSE; @@ -7295,11 +7646,13 @@ void media_page_sync_sort (MediaPage* self) { media_page_set_menu_sort_order (self, sort_ascending); #line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_set_view_comparator (self, sort_by, sort_ascending); -#line 7299 "MediaPage.c" +#line 7650 "MediaPage.c" } -static void media_page_real_destroy (GtkWidget* base) { +static void +media_page_real_destroy (GtkWidget* base) +{ MediaPage * self; #line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage); @@ -7307,11 +7660,13 @@ static void media_page_real_destroy (GtkWidget* base) { media_page_disconnect_slider (self); #line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala" GTK_WIDGET_CLASS (media_page_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), gtk_widget_get_type (), GtkWidget)); -#line 7311 "MediaPage.c" +#line 7664 "MediaPage.c" } -void media_page_increase_zoom_level (MediaPage* self) { +void +media_page_increase_zoom_level (MediaPage* self) +{ MediaPageZoomSliderAssembly* _tmp0_; #line 1032 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); @@ -7319,36 +7674,32 @@ void media_page_increase_zoom_level (MediaPage* self) { _tmp0_ = self->priv->connected_slider; #line 1033 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp0_ != NULL) { -#line 7323 "MediaPage.c" +#line 7678 "MediaPage.c" MediaPageZoomSliderAssembly* _tmp1_; #line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = self->priv->connected_slider; #line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_zoom_slider_assembly_increase_step (_tmp1_); -#line 7329 "MediaPage.c" +#line 7684 "MediaPage.c" } else { gint new_scale = 0; gint _tmp2_; - gint _tmp3_; - gint _tmp4_; #line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = media_page_get_thumb_size (self); -#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = media_page_compute_zoom_scale_increase (_tmp2_); -#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala" - new_scale = _tmp3_; + new_scale = media_page_compute_zoom_scale_increase (media_page_get_thumb_size (self)); #line 1037 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_save_persistent_thumbnail_scale (self); #line 1038 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = new_scale; + _tmp2_ = new_scale; #line 1038 "/home/jens/Source/shotwell/src/MediaPage.vala" - media_page_set_thumb_size (self, _tmp4_); -#line 7347 "MediaPage.c" + media_page_set_thumb_size (self, _tmp2_); +#line 7696 "MediaPage.c" } } -void media_page_decrease_zoom_level (MediaPage* self) { +void +media_page_decrease_zoom_level (MediaPage* self) +{ MediaPageZoomSliderAssembly* _tmp0_; #line 1042 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); @@ -7356,203 +7707,173 @@ void media_page_decrease_zoom_level (MediaPage* self) { _tmp0_ = self->priv->connected_slider; #line 1043 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp0_ != NULL) { -#line 7360 "MediaPage.c" +#line 7711 "MediaPage.c" MediaPageZoomSliderAssembly* _tmp1_; #line 1044 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = self->priv->connected_slider; #line 1044 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_zoom_slider_assembly_decrease_step (_tmp1_); -#line 7366 "MediaPage.c" +#line 7717 "MediaPage.c" } else { gint new_scale = 0; gint _tmp2_; - gint _tmp3_; - gint _tmp4_; -#line 1046 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = media_page_get_thumb_size (self); -#line 1046 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = media_page_compute_zoom_scale_decrease (_tmp2_); #line 1046 "/home/jens/Source/shotwell/src/MediaPage.vala" - new_scale = _tmp3_; + new_scale = media_page_compute_zoom_scale_decrease (media_page_get_thumb_size (self)); #line 1047 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_save_persistent_thumbnail_scale (self); #line 1048 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = new_scale; + _tmp2_ = new_scale; #line 1048 "/home/jens/Source/shotwell/src/MediaPage.vala" - media_page_set_thumb_size (self, _tmp4_); -#line 7384 "MediaPage.c" + media_page_set_thumb_size (self, _tmp2_); +#line 7729 "MediaPage.c" } } -static DataView* media_page_real_create_thumbnail (MediaPage* self, DataSource* source) { +static DataView* +media_page_real_create_thumbnail (MediaPage* self, + DataSource* source) +{ DataView* result = NULL; - DataSource* _tmp0_; - gint _tmp1_; - Thumbnail* _tmp2_; + Thumbnail* _tmp0_; #line 1052 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 1053 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = source; -#line 1053 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = media_page_get_thumb_size (self); + _tmp0_ = thumbnail_new (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource), media_page_get_thumb_size (self)); #line 1053 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = thumbnail_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_); -#line 1053 "/home/jens/Source/shotwell/src/MediaPage.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView); #line 1053 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7406 "MediaPage.c" +#line 7748 "MediaPage.c" } -DataView* media_page_create_thumbnail (MediaPage* self, DataSource* source) { +DataView* +media_page_create_thumbnail (MediaPage* self, + DataSource* source) +{ #line 1052 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL); #line 1052 "/home/jens/Source/shotwell/src/MediaPage.vala" return MEDIA_PAGE_GET_CLASS (self)->create_thumbnail (self, source); -#line 7415 "MediaPage.c" +#line 7760 "MediaPage.c" } -void media_page_set_thumb_size (MediaPage* self, gint new_scale) { +void +media_page_set_thumb_size (MediaPage* self, + gint new_scale) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; gint _tmp2_; + gint _tmp3_; gint _tmp4_; - gint _tmp5_; - gint _tmp6_; - gint _tmp7_; - gint _tmp8_; - gint _tmp9_; - CheckerboardLayout* _tmp10_; - CheckerboardLayout* _tmp11_; - gint _tmp12_; + CheckerboardLayout* _tmp5_; + CheckerboardLayout* _tmp6_; + ViewCollection* _tmp7_; + ViewCollection* _tmp8_; + ViewCollection* _tmp9_; + ViewCollection* _tmp10_; + GValue _tmp11_ = {0}; + ViewCollection* _tmp12_; ViewCollection* _tmp13_; - ViewCollection* _tmp14_; - ViewCollection* _tmp15_; - ViewCollection* _tmp16_; + gint _tmp14_; + gint _tmp15_; + gint _tmp16_; gint _tmp17_; - GValue _tmp18_ = {0}; - ViewCollection* _tmp19_; - ViewCollection* _tmp20_; - gint _tmp21_; - gint _tmp22_; - gint _tmp23_; - gint _tmp24_; - gint _tmp25_; - gint _tmp26_; #line 1058 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = media_page_get_thumb_size (self); -#line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = new_scale; -#line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp1_ == _tmp2_) { + if (media_page_get_thumb_size (self) == new_scale) { #line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp0_ = TRUE; -#line 7456 "MediaPage.c" +#line 7792 "MediaPage.c" } else { - gboolean _tmp3_; #line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = !_tmp3_; -#line 7463 "MediaPage.c" + _tmp0_ = !page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); +#line 7796 "MediaPage.c" } #line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp0_) { #line 1060 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 7469 "MediaPage.c" +#line 7802 "MediaPage.c" } #line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = new_scale; -#line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = thumbnail_get_MIN_SCALE (); -#line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = _tmp5_; + _tmp1_ = thumbnail_get_MIN_SCALE (); #line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = thumbnail_get_MAX_SCALE (); + _tmp2_ = _tmp1_; #line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = _tmp7_; + _tmp3_ = thumbnail_get_MAX_SCALE (); #line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = CLAMP (_tmp4_, _tmp6_, _tmp8_); + _tmp4_ = _tmp3_; #line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala" - new_scale = _tmp9_; -#line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)); + new_scale = CLAMP (new_scale, _tmp2_, _tmp4_); #line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = _tmp10_; + _tmp5_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)); #line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp12_ = new_scale; + _tmp6_ = _tmp5_; #line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala" - checkerboard_layout_set_scale (_tmp11_, _tmp12_); + checkerboard_layout_set_scale (_tmp6_, new_scale); #line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp6_); #line 1066 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1066 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp14_ = _tmp13_; + _tmp8_ = _tmp7_; #line 1066 "/home/jens/Source/shotwell/src/MediaPage.vala" - data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection)); #line 1066 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp14_); + _data_collection_unref0 (_tmp8_); #line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = _tmp15_; -#line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = new_scale; + _tmp10_ = _tmp9_; #line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_value_init (&_tmp18_, G_TYPE_INT); + g_value_init (&_tmp11_, G_TYPE_INT); #line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_value_set_int (&_tmp18_, _tmp17_); + g_value_set_int (&_tmp11_, new_scale); #line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala" - data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SIZE, &_tmp18_, NULL, NULL); + data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SIZE, &_tmp11_, NULL, NULL); #line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala" - G_IS_VALUE (&_tmp18_) ? (g_value_unset (&_tmp18_), NULL) : NULL; + G_IS_VALUE (&_tmp11_) ? (g_value_unset (&_tmp11_), NULL) : NULL; #line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp16_); + _data_collection_unref0 (_tmp10_); #line 1068 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1068 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp20_ = _tmp19_; + _tmp13_ = _tmp12_; #line 1068 "/home/jens/Source/shotwell/src/MediaPage.vala" - data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection)); #line 1068 "/home/jens/Source/shotwell/src/MediaPage.vala" - _data_collection_unref0 (_tmp20_); -#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp21_ = new_scale; + _data_collection_unref0 (_tmp13_); #line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp22_ = thumbnail_get_MAX_SCALE (); + _tmp14_ = thumbnail_get_MAX_SCALE (); #line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp23_ = _tmp22_; + _tmp15_ = _tmp14_; #line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp21_ < _tmp23_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", new_scale < _tmp15_); #line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp24_ = new_scale; + _tmp16_ = thumbnail_get_MIN_SCALE (); #line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp25_ = thumbnail_get_MIN_SCALE (); -#line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp26_ = _tmp25_; + _tmp17_ = _tmp16_; #line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp24_ > _tmp26_); -#line 7543 "MediaPage.c" + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", new_scale > _tmp17_); +#line 7864 "MediaPage.c" } -gint media_page_get_thumb_size (MediaPage* self) { +gint +media_page_get_thumb_size (MediaPage* self) +{ gint result = 0; CheckerboardLayout* _tmp0_; CheckerboardLayout* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; - CheckerboardLayout* _tmp9_; - CheckerboardLayout* _tmp10_; - gint _tmp11_; - gint _tmp12_; + gboolean _tmp2_; + CheckerboardLayout* _tmp7_; + CheckerboardLayout* _tmp8_; + gint _tmp9_; #line 1074 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (IS_MEDIA_PAGE (self), 0); #line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -7560,81 +7881,87 @@ gint media_page_get_thumb_size (MediaPage* self) { #line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = _tmp0_; #line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = checkerboard_layout_get_scale (_tmp1_); -#line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = _tmp2_ <= 0; + _tmp2_ = checkerboard_layout_get_scale (_tmp1_) <= 0; #line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp1_); #line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp3_) { -#line 7571 "MediaPage.c" + if (_tmp2_) { +#line 7890 "MediaPage.c" + CheckerboardLayout* _tmp3_; CheckerboardLayout* _tmp4_; - CheckerboardLayout* _tmp5_; + ConfigFacade* _tmp5_; ConfigFacade* _tmp6_; - ConfigFacade* _tmp7_; - gint _tmp8_; -#line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)); #line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = _tmp4_; + _tmp3_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)); #line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = config_facade_get_instance (); + _tmp4_ = _tmp3_; #line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = _tmp6_; + _tmp5_ = config_facade_get_instance (); #line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = configuration_facade_get_photo_thumbnail_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp6_ = _tmp5_; #line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala" - checkerboard_layout_set_scale (_tmp5_, _tmp8_); + checkerboard_layout_set_scale (_tmp4_, configuration_facade_get_photo_thumbnail_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp5_); -#line 7593 "MediaPage.c" + _g_object_unref0 (_tmp4_); +#line 7909 "MediaPage.c" } #line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)); + _tmp7_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)); #line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = _tmp9_; -#line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = checkerboard_layout_get_scale (_tmp10_); + _tmp8_ = _tmp7_; #line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp12_ = _tmp11_; + _tmp9_ = checkerboard_layout_get_scale (_tmp8_); #line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala" - result = _tmp12_; + result = _tmp9_; #line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7609 "MediaPage.c" +#line 7923 "MediaPage.c" } -static gboolean _media_page_zoom_slider_assembly_on_zoom_out_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { +static gboolean +_media_page_zoom_slider_assembly_on_zoom_out_pressed_gtk_widget_button_press_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self) +{ gboolean result; result = media_page_zoom_slider_assembly_on_zoom_out_pressed ((MediaPageZoomSliderAssembly*) self, event); #line 144 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7618 "MediaPage.c" +#line 7936 "MediaPage.c" } -static void _media_page_zoom_slider_assembly_on_slider_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) { +static void +_media_page_zoom_slider_assembly_on_slider_changed_gtk_range_value_changed (GtkRange* _sender, + gpointer self) +{ #line 155 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_zoom_slider_assembly_on_slider_changed ((MediaPageZoomSliderAssembly*) self); -#line 7625 "MediaPage.c" +#line 7946 "MediaPage.c" } -static gboolean _media_page_zoom_slider_assembly_on_zoom_in_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { +static gboolean +_media_page_zoom_slider_assembly_on_zoom_in_pressed_gtk_widget_button_press_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self) +{ gboolean result; result = media_page_zoom_slider_assembly_on_zoom_in_pressed ((MediaPageZoomSliderAssembly*) self, event); #line 168 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7634 "MediaPage.c" +#line 7959 "MediaPage.c" } -MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_construct (GType object_type) { +MediaPageZoomSliderAssembly* +media_page_zoom_slider_assembly_construct (GType object_type) +{ MediaPageZoomSliderAssembly * self = NULL; GtkBox* zoom_group = NULL; GtkBox* _tmp0_; @@ -7650,25 +7977,22 @@ MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_construct (GType ob ConfigFacade* _tmp7_; gint _tmp8_; gint _tmp9_; - gdouble _tmp10_; - gint _tmp11_; - gint _tmp12_; - gdouble _tmp13_; - GtkAdjustment* _tmp14_; - GtkAdjustment* _tmp15_; + gint _tmp10_; + GtkAdjustment* _tmp11_; + GtkAdjustment* _tmp12_; + GtkScale* _tmp13_; + GtkScale* _tmp14_; + GtkScale* _tmp15_; GtkScale* _tmp16_; GtkScale* _tmp17_; GtkScale* _tmp18_; - GtkScale* _tmp19_; - GtkScale* _tmp20_; - GtkScale* _tmp21_; GtkImage* zoom_in = NULL; - GdkPixbuf* _tmp22_; - GdkPixbuf* _tmp23_; - GtkImage* _tmp24_; - GtkImage* _tmp25_; + GdkPixbuf* _tmp19_; + GdkPixbuf* _tmp20_; + GtkImage* _tmp21_; + GtkImage* _tmp22_; GtkEventBox* zoom_in_box = NULL; - GtkEventBox* _tmp26_; + GtkEventBox* _tmp23_; #line 135 "/home/jens/Source/shotwell/src/MediaPage.vala" self = (MediaPageZoomSliderAssembly*) g_object_new (object_type, NULL); #line 136 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -7713,78 +8037,72 @@ MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_construct (GType ob _tmp7_ = _tmp6_; #line 150 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp8_ = configuration_facade_get_photo_thumbnail_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 150 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = _tmp8_; #line 150 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp7_); #line 150 "/home/jens/Source/shotwell/src/MediaPage.vala" - persisted_scale = _tmp9_; -#line 151 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = media_page_zoom_slider_assembly_scale_to_slider (persisted_scale); + persisted_scale = _tmp8_; #line 151 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = thumbnail_get_MAX_SCALE (); -#line 151 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp12_ = _tmp11_; + _tmp9_ = thumbnail_get_MAX_SCALE (); #line 151 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp13_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp12_); + _tmp10_ = _tmp9_; #line 151 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp14_ = gtk_adjustment_new (_tmp10_, (gdouble) 0, _tmp13_, (gdouble) 1, (gdouble) 10, (gdouble) 0); + _tmp11_ = gtk_adjustment_new (media_page_zoom_slider_assembly_scale_to_slider (persisted_scale), (gdouble) 0, media_page_zoom_slider_assembly_scale_to_slider (_tmp10_), (gdouble) 1, (gdouble) 10, (gdouble) 0); #line 151 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_object_ref_sink (_tmp14_); + g_object_ref_sink (_tmp11_); #line 151 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (self->priv->adjustment); #line 151 "/home/jens/Source/shotwell/src/MediaPage.vala" - self->priv->adjustment = _tmp14_; + self->priv->adjustment = _tmp11_; #line 154 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp15_ = self->priv->adjustment; + _tmp12_ = self->priv->adjustment; #line 154 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = (GtkScale*) gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, _tmp15_); + _tmp13_ = (GtkScale*) gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, _tmp12_); #line 154 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_object_ref_sink (_tmp16_); + g_object_ref_sink (_tmp13_); #line 154 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (self->priv->slider); #line 154 "/home/jens/Source/shotwell/src/MediaPage.vala" - self->priv->slider = _tmp16_; + self->priv->slider = _tmp13_; #line 155 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = self->priv->slider; + _tmp14_ = self->priv->slider; #line 155 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _media_page_zoom_slider_assembly_on_slider_changed_gtk_range_value_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _media_page_zoom_slider_assembly_on_slider_changed_gtk_range_value_changed, self, 0); #line 156 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp18_ = self->priv->slider; + _tmp15_ = self->priv->slider; #line 156 "/home/jens/Source/shotwell/src/MediaPage.vala" - gtk_scale_set_draw_value (_tmp18_, FALSE); + gtk_scale_set_draw_value (_tmp15_, FALSE); #line 157 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp19_ = self->priv->slider; + _tmp16_ = self->priv->slider; #line 157 "/home/jens/Source/shotwell/src/MediaPage.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), 200, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), 200, -1); #line 158 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp20_ = self->priv->slider; + _tmp17_ = self->priv->slider; #line 158 "/home/jens/Source/shotwell/src/MediaPage.vala" - gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), _ ("Adjust the size of the thumbnails")); + gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), _ ("Adjust the size of the thumbnails")); #line 160 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp21_ = self->priv->slider; + _tmp18_ = self->priv->slider; #line 160 "/home/jens/Source/shotwell/src/MediaPage.vala" - gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp22_ = resources_load_icon (RESOURCES_ICON_ZOOM_IN, RESOURCES_ICON_ZOOM_SCALE); + _tmp19_ = resources_load_icon (RESOURCES_ICON_ZOOM_IN, RESOURCES_ICON_ZOOM_SCALE); #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp23_ = _tmp22_; + _tmp20_ = _tmp19_; #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp24_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp23_); + _tmp21_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp20_); #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_object_ref_sink (_tmp24_); + g_object_ref_sink (_tmp21_); #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp25_ = _tmp24_; + _tmp22_ = _tmp21_; #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp20_); #line 162 "/home/jens/Source/shotwell/src/MediaPage.vala" - zoom_in = _tmp25_; + zoom_in = _tmp22_; #line 164 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp26_ = (GtkEventBox*) gtk_event_box_new (); + _tmp23_ = (GtkEventBox*) gtk_event_box_new (); #line 164 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_object_ref_sink (_tmp26_); + g_object_ref_sink (_tmp23_); #line 164 "/home/jens/Source/shotwell/src/MediaPage.vala" - zoom_in_box = _tmp26_; + zoom_in_box = _tmp23_; #line 165 "/home/jens/Source/shotwell/src/MediaPage.vala" gtk_event_box_set_above_child (zoom_in_box, TRUE); #line 166 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -7809,18 +8127,22 @@ MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_construct (GType ob _g_object_unref0 (zoom_group); #line 135 "/home/jens/Source/shotwell/src/MediaPage.vala" return self; -#line 7813 "MediaPage.c" +#line 8131 "MediaPage.c" } -MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_new (void) { +MediaPageZoomSliderAssembly* +media_page_zoom_slider_assembly_new (void) +{ #line 135 "/home/jens/Source/shotwell/src/MediaPage.vala" return media_page_zoom_slider_assembly_construct (MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY); -#line 7820 "MediaPage.c" +#line 8140 "MediaPage.c" } -gdouble media_page_zoom_slider_assembly_scale_to_slider (gint value) { +gdouble +media_page_zoom_slider_assembly_scale_to_slider (gint value) +{ gdouble result = 0.0; gint _tmp0_; gint _tmp1_; @@ -7828,78 +8150,71 @@ gdouble media_page_zoom_slider_assembly_scale_to_slider (gint value) { gint _tmp3_; gint _tmp4_; gint _tmp5_; - gint _tmp6_; - gint _tmp7_; - gint _tmp8_; #line 176 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = value; + _tmp0_ = thumbnail_get_MIN_SCALE (); #line 176 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = thumbnail_get_MIN_SCALE (); -#line 176 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 176 "/home/jens/Source/shotwell/src/MediaPage.vala" - _vala_assert (_tmp0_ >= _tmp2_, "value >= Thumbnail.MIN_SCALE"); + _vala_assert (value >= _tmp1_, "value >= Thumbnail.MIN_SCALE"); #line 177 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = value; + _tmp2_ = thumbnail_get_MAX_SCALE (); #line 177 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = thumbnail_get_MAX_SCALE (); -#line 177 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 177 "/home/jens/Source/shotwell/src/MediaPage.vala" - _vala_assert (_tmp3_ <= _tmp5_, "value <= Thumbnail.MAX_SCALE"); + _vala_assert (value <= _tmp3_, "value <= Thumbnail.MAX_SCALE"); #line 179 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = value; + _tmp4_ = thumbnail_get_MIN_SCALE (); #line 179 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = thumbnail_get_MIN_SCALE (); -#line 179 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = _tmp7_; + _tmp5_ = _tmp4_; #line 179 "/home/jens/Source/shotwell/src/MediaPage.vala" - result = (gdouble) ((_tmp6_ - _tmp8_) / MEDIA_PAGE_SLIDER_STEPPING); + result = (gdouble) ((value - _tmp5_) / MEDIA_PAGE_SLIDER_STEPPING); #line 179 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7861 "MediaPage.c" +#line 8174 "MediaPage.c" } -gint media_page_zoom_slider_assembly_slider_to_scale (gdouble value) { +gint +media_page_zoom_slider_assembly_slider_to_scale (gdouble value) +{ gint result = 0; gint res = 0; - gdouble _tmp0_; + gint _tmp0_; gint _tmp1_; gint _tmp2_; gint _tmp3_; gint _tmp4_; gint _tmp5_; - gint _tmp6_; #line 183 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = value; -#line 183 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = thumbnail_get_MIN_SCALE (); + _tmp0_ = thumbnail_get_MIN_SCALE (); #line 183 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 183 "/home/jens/Source/shotwell/src/MediaPage.vala" - res = ((gint) (_tmp0_ * MEDIA_PAGE_SLIDER_STEPPING)) + _tmp2_; + res = ((gint) (value * MEDIA_PAGE_SLIDER_STEPPING)) + _tmp1_; #line 185 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = thumbnail_get_MIN_SCALE (); + _tmp2_ = thumbnail_get_MIN_SCALE (); #line 185 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 185 "/home/jens/Source/shotwell/src/MediaPage.vala" - _vala_assert (res >= _tmp4_, "res >= Thumbnail.MIN_SCALE"); + _vala_assert (res >= _tmp3_, "res >= Thumbnail.MIN_SCALE"); #line 186 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = thumbnail_get_MAX_SCALE (); + _tmp4_ = thumbnail_get_MAX_SCALE (); #line 186 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 186 "/home/jens/Source/shotwell/src/MediaPage.vala" - _vala_assert (res <= _tmp6_, "res <= Thumbnail.MAX_SCALE"); + _vala_assert (res <= _tmp5_, "res <= Thumbnail.MAX_SCALE"); #line 188 "/home/jens/Source/shotwell/src/MediaPage.vala" result = res; #line 188 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7899 "MediaPage.c" +#line 8211 "MediaPage.c" } -static gboolean media_page_zoom_slider_assembly_on_zoom_out_pressed (MediaPageZoomSliderAssembly* self, GdkEventButton* event) { +static gboolean +media_page_zoom_slider_assembly_on_zoom_out_pressed (MediaPageZoomSliderAssembly* self, + GdkEventButton* event) +{ gboolean result = FALSE; #line 191 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self), FALSE); @@ -7911,11 +8226,14 @@ static gboolean media_page_zoom_slider_assembly_on_zoom_out_pressed (MediaPageZo result = TRUE; #line 193 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7915 "MediaPage.c" +#line 8230 "MediaPage.c" } -static gboolean media_page_zoom_slider_assembly_on_zoom_in_pressed (MediaPageZoomSliderAssembly* self, GdkEventButton* event) { +static gboolean +media_page_zoom_slider_assembly_on_zoom_in_pressed (MediaPageZoomSliderAssembly* self, + GdkEventButton* event) +{ gboolean result = FALSE; #line 196 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self), FALSE); @@ -7927,24 +8245,27 @@ static gboolean media_page_zoom_slider_assembly_on_zoom_in_pressed (MediaPageZoo result = TRUE; #line 198 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7931 "MediaPage.c" +#line 8249 "MediaPage.c" } -static void media_page_zoom_slider_assembly_on_slider_changed (MediaPageZoomSliderAssembly* self) { +static void +media_page_zoom_slider_assembly_on_slider_changed (MediaPageZoomSliderAssembly* self) +{ #line 201 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self)); #line 202 "/home/jens/Source/shotwell/src/MediaPage.vala" g_signal_emit (self, media_page_zoom_slider_assembly_signals[MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_ZOOM_CHANGED_SIGNAL], 0); -#line 7940 "MediaPage.c" +#line 8260 "MediaPage.c" } -void media_page_zoom_slider_assembly_snap_to_min (MediaPageZoomSliderAssembly* self) { +void +media_page_zoom_slider_assembly_snap_to_min (MediaPageZoomSliderAssembly* self) +{ GtkScale* _tmp0_; gint _tmp1_; gint _tmp2_; - gdouble _tmp3_; #line 205 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self)); #line 206 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -7954,18 +8275,17 @@ void media_page_zoom_slider_assembly_snap_to_min (MediaPageZoomSliderAssembly* s #line 206 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp2_ = _tmp1_; #line 206 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp2_); -#line 206 "/home/jens/Source/shotwell/src/MediaPage.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp3_); -#line 7961 "MediaPage.c" + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), media_page_zoom_slider_assembly_scale_to_slider (_tmp2_)); +#line 8280 "MediaPage.c" } -void media_page_zoom_slider_assembly_snap_to_max (MediaPageZoomSliderAssembly* self) { +void +media_page_zoom_slider_assembly_snap_to_max (MediaPageZoomSliderAssembly* self) +{ GtkScale* _tmp0_; gint _tmp1_; gint _tmp2_; - gdouble _tmp3_; #line 209 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self)); #line 210 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -7975,143 +8295,110 @@ void media_page_zoom_slider_assembly_snap_to_max (MediaPageZoomSliderAssembly* s #line 210 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp2_ = _tmp1_; #line 210 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp2_); -#line 210 "/home/jens/Source/shotwell/src/MediaPage.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp3_); -#line 7982 "MediaPage.c" + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), media_page_zoom_slider_assembly_scale_to_slider (_tmp2_)); +#line 8300 "MediaPage.c" } -void media_page_zoom_slider_assembly_increase_step (MediaPageZoomSliderAssembly* self) { +void +media_page_zoom_slider_assembly_increase_step (MediaPageZoomSliderAssembly* self) +{ gint new_scale = 0; gint _tmp0_; - gint _tmp1_; + GtkScale* _tmp1_; gint _tmp2_; - gint _tmp3_; - GtkScale* _tmp4_; - gint _tmp5_; - gdouble _tmp6_; #line 213 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self)); #line 214 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = media_page_zoom_slider_assembly_get_scale (self); -#line 214 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = media_page_compute_zoom_scale_increase (_tmp0_); -#line 214 "/home/jens/Source/shotwell/src/MediaPage.vala" - new_scale = _tmp1_; + new_scale = media_page_compute_zoom_scale_increase (media_page_zoom_slider_assembly_get_scale (self)); #line 216 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = media_page_zoom_slider_assembly_get_scale (self); + _tmp0_ = new_scale; #line 216 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = new_scale; -#line 216 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp2_ == _tmp3_) { + if (media_page_zoom_slider_assembly_get_scale (self) == _tmp0_) { #line 217 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 8011 "MediaPage.c" +#line 8321 "MediaPage.c" } #line 219 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = self->priv->slider; -#line 219 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = new_scale; + _tmp1_ = self->priv->slider; #line 219 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp5_); + _tmp2_ = new_scale; #line 219 "/home/jens/Source/shotwell/src/MediaPage.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange), _tmp6_); -#line 8021 "MediaPage.c" + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange), media_page_zoom_slider_assembly_scale_to_slider (_tmp2_)); +#line 8329 "MediaPage.c" } -void media_page_zoom_slider_assembly_decrease_step (MediaPageZoomSliderAssembly* self) { +void +media_page_zoom_slider_assembly_decrease_step (MediaPageZoomSliderAssembly* self) +{ gint new_scale = 0; gint _tmp0_; - gint _tmp1_; + GtkScale* _tmp1_; gint _tmp2_; - gint _tmp3_; - GtkScale* _tmp4_; - gint _tmp5_; - gdouble _tmp6_; #line 222 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self)); #line 223 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = media_page_zoom_slider_assembly_get_scale (self); -#line 223 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = media_page_compute_zoom_scale_decrease (_tmp0_); -#line 223 "/home/jens/Source/shotwell/src/MediaPage.vala" - new_scale = _tmp1_; -#line 225 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = media_page_zoom_slider_assembly_get_scale (self); + new_scale = media_page_compute_zoom_scale_decrease (media_page_zoom_slider_assembly_get_scale (self)); #line 225 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = new_scale; + _tmp0_ = new_scale; #line 225 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp2_ == _tmp3_) { + if (media_page_zoom_slider_assembly_get_scale (self) == _tmp0_) { #line 226 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 8050 "MediaPage.c" +#line 8350 "MediaPage.c" } #line 228 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = self->priv->slider; -#line 228 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = new_scale; + _tmp1_ = self->priv->slider; #line 228 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp5_); + _tmp2_ = new_scale; #line 228 "/home/jens/Source/shotwell/src/MediaPage.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange), _tmp6_); -#line 8060 "MediaPage.c" + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange), media_page_zoom_slider_assembly_scale_to_slider (_tmp2_)); +#line 8358 "MediaPage.c" } -gint media_page_zoom_slider_assembly_get_scale (MediaPageZoomSliderAssembly* self) { +gint +media_page_zoom_slider_assembly_get_scale (MediaPageZoomSliderAssembly* self) +{ gint result = 0; GtkScale* _tmp0_; - gdouble _tmp1_; - gint _tmp2_; #line 231 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self), 0); #line 232 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp0_ = self->priv->slider; #line 232 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange)); -#line 232 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = media_page_zoom_slider_assembly_slider_to_scale (_tmp1_); -#line 232 "/home/jens/Source/shotwell/src/MediaPage.vala" - result = _tmp2_; + result = media_page_zoom_slider_assembly_slider_to_scale (gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange))); #line 232 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 8081 "MediaPage.c" +#line 8375 "MediaPage.c" } -void media_page_zoom_slider_assembly_set_scale (MediaPageZoomSliderAssembly* self, gint scale) { - gint _tmp0_; - gint _tmp1_; - GtkScale* _tmp2_; - gint _tmp3_; - gdouble _tmp4_; +void +media_page_zoom_slider_assembly_set_scale (MediaPageZoomSliderAssembly* self, + gint scale) +{ + GtkScale* _tmp0_; #line 235 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self)); #line 236 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = media_page_zoom_slider_assembly_get_scale (self); -#line 236 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = scale; -#line 236 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp0_ == _tmp1_) { + if (media_page_zoom_slider_assembly_get_scale (self) == scale) { #line 237 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 8101 "MediaPage.c" +#line 8390 "MediaPage.c" } #line 239 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = self->priv->slider; -#line 239 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = scale; -#line 239 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp3_); + _tmp0_ = self->priv->slider; #line 239 "/home/jens/Source/shotwell/src/MediaPage.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), _tmp4_); -#line 8111 "MediaPage.c" + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), media_page_zoom_slider_assembly_scale_to_slider (scale)); +#line 8396 "MediaPage.c" } -static void media_page_zoom_slider_assembly_class_init (MediaPageZoomSliderAssemblyClass * klass) { +static void +media_page_zoom_slider_assembly_class_init (MediaPageZoomSliderAssemblyClass * klass) +{ #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_zoom_slider_assembly_parent_class = g_type_class_peek_parent (klass); #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -8120,18 +8407,22 @@ static void media_page_zoom_slider_assembly_class_init (MediaPageZoomSliderAssem G_OBJECT_CLASS (klass)->finalize = media_page_zoom_slider_assembly_finalize; #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_zoom_slider_assembly_signals[MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_ZOOM_CHANGED_SIGNAL] = g_signal_new ("zoom-changed", MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 8124 "MediaPage.c" +#line 8411 "MediaPage.c" } -static void media_page_zoom_slider_assembly_instance_init (MediaPageZoomSliderAssembly * self) { +static void +media_page_zoom_slider_assembly_instance_init (MediaPageZoomSliderAssembly * self) +{ #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala" self->priv = MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_GET_PRIVATE (self); -#line 8131 "MediaPage.c" +#line 8420 "MediaPage.c" } -static void media_page_zoom_slider_assembly_finalize (GObject * obj) { +static void +media_page_zoom_slider_assembly_finalize (GObject * obj) +{ MediaPageZoomSliderAssembly * self; #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY, MediaPageZoomSliderAssembly); @@ -8141,11 +8432,13 @@ static void media_page_zoom_slider_assembly_finalize (GObject * obj) { _g_object_unref0 (self->priv->adjustment); #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala" G_OBJECT_CLASS (media_page_zoom_slider_assembly_parent_class)->finalize (obj); -#line 8145 "MediaPage.c" +#line 8436 "MediaPage.c" } -GType media_page_zoom_slider_assembly_get_type (void) { +GType +media_page_zoom_slider_assembly_get_type (void) +{ static volatile gsize media_page_zoom_slider_assembly_type_id__volatile = 0; if (g_once_init_enter (&media_page_zoom_slider_assembly_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MediaPageZoomSliderAssemblyClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) media_page_zoom_slider_assembly_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MediaPageZoomSliderAssembly), 0, (GInstanceInitFunc) media_page_zoom_slider_assembly_instance_init, NULL }; @@ -8157,7 +8450,9 @@ GType media_page_zoom_slider_assembly_get_type (void) { } -static void media_page_class_init (MediaPageClass * klass) { +static void +media_page_class_init (MediaPageClass * klass) +{ #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_parent_class = g_type_class_peek_parent (klass); #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -8242,22 +8537,26 @@ static void media_page_class_init (MediaPageClass * klass) { ((MediaPageClass *) klass)->create_thumbnail = (DataView* (*) (MediaPage *, DataSource*)) media_page_real_create_thumbnail; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" G_OBJECT_CLASS (klass)->finalize = media_page_finalize; -#line 8246 "MediaPage.c" +#line 8541 "MediaPage.c" } -static void media_page_instance_init (MediaPage * self) { +static void +media_page_instance_init (MediaPage * self) +{ #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" self->priv = MEDIA_PAGE_GET_PRIVATE (self); #line 243 "/home/jens/Source/shotwell/src/MediaPage.vala" self->priv->connected_slider = NULL; #line 244 "/home/jens/Source/shotwell/src/MediaPage.vala" self->priv->dnd_handler = NULL; -#line 8257 "MediaPage.c" +#line 8554 "MediaPage.c" } -static void media_page_finalize (GObject * obj) { +static void +media_page_finalize (GObject * obj) +{ MediaPage * self; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_PAGE, MediaPage); @@ -8269,11 +8568,13 @@ static void media_page_finalize (GObject * obj) { _core_tracker_unref0 (self->priv->tracker); #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" G_OBJECT_CLASS (media_page_parent_class)->finalize (obj); -#line 8273 "MediaPage.c" +#line 8572 "MediaPage.c" } -GType media_page_get_type (void) { +GType +media_page_get_type (void) +{ static volatile gsize media_page_type_id__volatile = 0; if (g_once_init_enter (&media_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MediaPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) media_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MediaPage), 0, (GInstanceInitFunc) media_page_instance_init, NULL }; @@ -8285,7 +8586,11 @@ GType media_page_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -8297,7 +8602,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/MediaViewTracker.c b/src/MediaViewTracker.c index e9756dd..92cab3d 100644 --- a/src/MediaViewTracker.c +++ b/src/MediaViewTracker.c @@ -1,4 +1,4 @@ -/* MediaViewTracker.c generated by valac 0.36.6, the Vala compiler +/* MediaViewTracker.c generated by valac 0.40.4, the Vala compiler * generated from MediaViewTracker.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -105,6 +106,11 @@ typedef struct _DataObjectClass DataObjectClass; typedef struct _Alteration Alteration; typedef struct _AlterationClass AlterationClass; typedef struct _MediaAccumulatorPrivate MediaAccumulatorPrivate; +enum { + MEDIA_ACCUMULATOR_0_PROPERTY, + MEDIA_ACCUMULATOR_NUM_PROPERTIES +}; +static GParamSpec* media_accumulator_properties[MEDIA_ACCUMULATOR_NUM_PROPERTIES]; #define TYPE_DATA_SOURCE (data_source_get_type ()) #define DATA_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_SOURCE, DataSource)) @@ -278,46 +284,64 @@ static CoreTrackerAccumulatorIface * media_accumulator_core_tracker_accumulator_ gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; GType media_view_tracker_get_type (void) G_GNUC_CONST; GType media_accumulator_get_type (void) G_GNUC_CONST; -enum { - MEDIA_VIEW_TRACKER_DUMMY_PROPERTY -}; MediaAccumulator* media_accumulator_new (void); MediaAccumulator* media_accumulator_construct (GType object_type); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; MediaViewTracker* media_view_tracker_new (ViewCollection* collection); -MediaViewTracker* media_view_tracker_construct (GType object_type, ViewCollection* collection); +MediaViewTracker* media_view_tracker_construct (GType object_type, + ViewCollection* collection); CoreViewTracker* core_view_tracker_new (ViewCollection* collection); -CoreViewTracker* core_view_tracker_construct (GType object_type, ViewCollection* collection); +CoreViewTracker* core_view_tracker_construct (GType object_type, + ViewCollection* collection); GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType core_tracker_accumulator_get_type (void) G_GNUC_CONST; -void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected); +void core_view_tracker_start (CoreViewTracker* self, + CoreTrackerAccumulator* all, + CoreTrackerAccumulator* visible, + CoreTrackerAccumulator* selected); static void media_view_tracker_finalize (CoreTracker * obj); -enum { - MEDIA_ACCUMULATOR_DUMMY_PROPERTY -}; -static gboolean media_accumulator_real_include (CoreTrackerAccumulator* base, DataObject* object); +static gboolean media_accumulator_real_include (CoreTrackerAccumulator* base, + DataObject* object); GType data_source_get_type (void) G_GNUC_CONST; GType data_view_get_type (void) G_GNUC_CONST; DataSource* data_view_get_source (DataView* self); @@ -330,58 +354,69 @@ PhotoFileFormat photo_get_master_file_format (Photo* self); GType video_source_get_type (void) G_GNUC_CONST; GType flaggable_get_type (void) G_GNUC_CONST; gboolean flaggable_is_flagged (Flaggable* self); -static gboolean media_accumulator_real_uninclude (CoreTrackerAccumulator* base, DataObject* object); +static gboolean media_accumulator_real_uninclude (CoreTrackerAccumulator* base, + DataObject* object); gchar* data_object_to_string (DataObject* self); gchar* media_accumulator_to_string (MediaAccumulator* self); GType video_get_type (void) G_GNUC_CONST; -static gboolean media_accumulator_real_altered (CoreTrackerAccumulator* base, DataObject* object, Alteration* alteration); -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail); +static gboolean media_accumulator_real_altered (CoreTrackerAccumulator* base, + DataObject* object, + Alteration* alteration); +gboolean alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail); static void media_accumulator_finalize (GObject * obj); -MediaViewTracker* media_view_tracker_construct (GType object_type, ViewCollection* collection) { +MediaViewTracker* +media_view_tracker_construct (GType object_type, + ViewCollection* collection) +{ MediaViewTracker* self = NULL; - ViewCollection* _tmp0_; + MediaAccumulator* _tmp0_; MediaAccumulator* _tmp1_; MediaAccumulator* _tmp2_; - MediaAccumulator* _tmp3_; #line 12 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (collection), NULL); #line 13 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp0_ = collection; -#line 13 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - self = (MediaViewTracker*) core_view_tracker_construct (object_type, _tmp0_); + self = (MediaViewTracker*) core_view_tracker_construct (object_type, collection); #line 15 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp1_ = self->all; + _tmp0_ = self->all; #line 15 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp2_ = self->visible; + _tmp1_ = self->visible; #line 15 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp3_ = self->selected; + _tmp2_ = self->selected; #line 15 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - core_view_tracker_start (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_VIEW_TRACKER, CoreViewTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator)); + core_view_tracker_start (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_VIEW_TRACKER, CoreViewTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator)); #line 12 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" return self; -#line 365 "MediaViewTracker.c" +#line 394 "MediaViewTracker.c" } -MediaViewTracker* media_view_tracker_new (ViewCollection* collection) { +MediaViewTracker* +media_view_tracker_new (ViewCollection* collection) +{ #line 12 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" return media_view_tracker_construct (TYPE_MEDIA_VIEW_TRACKER, collection); -#line 372 "MediaViewTracker.c" +#line 403 "MediaViewTracker.c" } -static void media_view_tracker_class_init (MediaViewTrackerClass * klass) { +static void +media_view_tracker_class_init (MediaViewTrackerClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" media_view_tracker_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" ((CoreTrackerClass *) klass)->finalize = media_view_tracker_finalize; -#line 381 "MediaViewTracker.c" +#line 414 "MediaViewTracker.c" } -static void media_view_tracker_instance_init (MediaViewTracker * self) { +static void +media_view_tracker_instance_init (MediaViewTracker * self) +{ MediaAccumulator* _tmp0_; MediaAccumulator* _tmp1_; MediaAccumulator* _tmp2_; @@ -397,11 +432,13 @@ static void media_view_tracker_instance_init (MediaViewTracker * self) { _tmp2_ = media_accumulator_new (); #line 10 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" self->selected = _tmp2_; -#line 401 "MediaViewTracker.c" +#line 436 "MediaViewTracker.c" } -static void media_view_tracker_finalize (CoreTracker * obj) { +static void +media_view_tracker_finalize (CoreTracker * obj) +{ MediaViewTracker * self; #line 7 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_VIEW_TRACKER, MediaViewTracker); @@ -413,11 +450,13 @@ static void media_view_tracker_finalize (CoreTracker * obj) { _g_object_unref0 (self->selected); #line 7 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" CORE_TRACKER_CLASS (media_view_tracker_parent_class)->finalize (obj); -#line 417 "MediaViewTracker.c" +#line 454 "MediaViewTracker.c" } -GType media_view_tracker_get_type (void) { +GType +media_view_tracker_get_type (void) +{ static volatile gsize media_view_tracker_type_id__volatile = 0; if (g_once_init_enter (&media_view_tracker_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MediaViewTrackerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) media_view_tracker_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MediaViewTracker), 0, (GInstanceInitFunc) media_view_tracker_instance_init, NULL }; @@ -429,135 +468,128 @@ GType media_view_tracker_get_type (void) { } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 31 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" return self ? g_object_ref (self) : NULL; -#line 436 "MediaViewTracker.c" +#line 477 "MediaViewTracker.c" } -static gboolean media_accumulator_real_include (CoreTrackerAccumulator* base, DataObject* object) { +static gboolean +media_accumulator_real_include (CoreTrackerAccumulator* base, + DataObject* object) +{ MediaAccumulator * self; gboolean result = FALSE; DataSource* source = NULL; - DataObject* _tmp0_; - DataSource* _tmp1_; - gint _tmp2_; + DataSource* _tmp0_; + gint _tmp1_; Photo* photo = NULL; - DataSource* _tmp3_; + DataSource* _tmp2_; + Photo* _tmp3_; Photo* _tmp4_; - Photo* _tmp5_; Flaggable* flaggable = NULL; - DataSource* _tmp14_; - Flaggable* _tmp15_; - gboolean _tmp16_ = FALSE; - Flaggable* _tmp17_; + DataSource* _tmp11_; + Flaggable* _tmp12_; + gboolean _tmp13_ = FALSE; + Flaggable* _tmp14_; #line 26 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_ACCUMULATOR, MediaAccumulator); #line 26 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 27 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp0_ = object; + _tmp0_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView)); #line 27 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp1_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView)); -#line 27 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - source = _tmp1_; + source = _tmp0_; #line 29 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp2_ = self->total; + _tmp1_ = self->total; #line 29 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - self->total = _tmp2_ + 1; + self->total = _tmp1_ + 1; #line 31 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp3_ = source; + _tmp2_ = source; #line 31 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_PHOTO) ? ((Photo*) _tmp3_) : NULL); + _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_PHOTO) ? ((Photo*) _tmp2_) : NULL); #line 31 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - photo = _tmp4_; + photo = _tmp3_; #line 32 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp5_ = photo; + _tmp4_ = photo; #line 32 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - if (_tmp5_ != NULL) { -#line 480 "MediaViewTracker.c" - Photo* _tmp6_; - PhotoFileFormat _tmp7_; - Photo* _tmp9_; - PhotoFileFormat _tmp10_; -#line 33 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp6_ = photo; + if (_tmp4_ != NULL) { +#line 521 "MediaViewTracker.c" + Photo* _tmp5_; + Photo* _tmp7_; #line 33 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp7_ = photo_get_master_file_format (_tmp6_); + _tmp5_ = photo; #line 33 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - if (_tmp7_ == PHOTO_FILE_FORMAT_RAW) { -#line 491 "MediaViewTracker.c" - gint _tmp8_; + if (photo_get_master_file_format (_tmp5_) == PHOTO_FILE_FORMAT_RAW) { +#line 528 "MediaViewTracker.c" + gint _tmp6_; #line 34 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp8_ = self->raw; + _tmp6_ = self->raw; #line 34 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - self->raw = _tmp8_ + 1; -#line 497 "MediaViewTracker.c" + self->raw = _tmp6_ + 1; +#line 534 "MediaViewTracker.c" } #line 37 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp9_ = photo; -#line 37 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp10_ = photo_get_master_file_format (_tmp9_); + _tmp7_ = photo; #line 37 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - if (_tmp10_ != PHOTO_FILE_FORMAT_RAW) { -#line 505 "MediaViewTracker.c" - gint _tmp11_; + if (photo_get_master_file_format (_tmp7_) != PHOTO_FILE_FORMAT_RAW) { +#line 540 "MediaViewTracker.c" + gint _tmp8_; #line 38 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp11_ = self->photos; + _tmp8_ = self->photos; #line 38 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - self->photos = _tmp11_ + 1; -#line 511 "MediaViewTracker.c" + self->photos = _tmp8_ + 1; +#line 546 "MediaViewTracker.c" } } else { - DataSource* _tmp12_; + DataSource* _tmp9_; #line 40 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp12_ = source; + _tmp9_ = source; #line 40 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_VIDEO_SOURCE)) { -#line 519 "MediaViewTracker.c" - gint _tmp13_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_VIDEO_SOURCE)) { +#line 554 "MediaViewTracker.c" + gint _tmp10_; #line 41 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp13_ = self->videos; + _tmp10_ = self->videos; #line 41 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - self->videos = _tmp13_ + 1; -#line 525 "MediaViewTracker.c" + self->videos = _tmp10_ + 1; +#line 560 "MediaViewTracker.c" } } #line 44 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp14_ = source; + _tmp11_ = source; #line 44 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp14_) : NULL); + _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp11_) : NULL); #line 44 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - flaggable = _tmp15_; -#line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp17_ = flaggable; + flaggable = _tmp12_; #line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - if (_tmp17_ != NULL) { -#line 538 "MediaViewTracker.c" - Flaggable* _tmp18_; - gboolean _tmp19_; + _tmp14_ = flaggable; #line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp18_ = flaggable; + if (_tmp14_ != NULL) { +#line 573 "MediaViewTracker.c" + Flaggable* _tmp15_; #line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp19_ = flaggable_is_flagged (_tmp18_); + _tmp15_ = flaggable; #line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp16_ = _tmp19_; -#line 547 "MediaViewTracker.c" + _tmp13_ = flaggable_is_flagged (_tmp15_); +#line 579 "MediaViewTracker.c" } else { #line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp16_ = FALSE; -#line 551 "MediaViewTracker.c" + _tmp13_ = FALSE; +#line 583 "MediaViewTracker.c" } #line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - if (_tmp16_) { -#line 555 "MediaViewTracker.c" - gint _tmp20_; + if (_tmp13_) { +#line 587 "MediaViewTracker.c" + gint _tmp16_; #line 46 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp20_ = self->flagged; + _tmp16_ = self->flagged; #line 46 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - self->flagged = _tmp20_ + 1; -#line 561 "MediaViewTracker.c" + self->flagged = _tmp16_ + 1; +#line 593 "MediaViewTracker.c" } #line 49 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" result = TRUE; @@ -569,201 +601,186 @@ static gboolean media_accumulator_real_include (CoreTrackerAccumulator* base, Da _g_object_unref0 (source); #line 49 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" return result; -#line 573 "MediaViewTracker.c" +#line 605 "MediaViewTracker.c" } -static gboolean media_accumulator_real_uninclude (CoreTrackerAccumulator* base, DataObject* object) { +static gboolean +media_accumulator_real_uninclude (CoreTrackerAccumulator* base, + DataObject* object) +{ MediaAccumulator * self; gboolean result = FALSE; DataSource* source = NULL; - DataObject* _tmp0_; - DataSource* _tmp1_; - gint _tmp2_; - gint _tmp12_; + DataSource* _tmp0_; + gint _tmp1_; + gint _tmp9_; Photo* photo = NULL; - DataSource* _tmp13_; - Photo* _tmp14_; - Photo* _tmp15_; + DataSource* _tmp10_; + Photo* _tmp11_; + Photo* _tmp12_; Flaggable* flaggable = NULL; - DataSource* _tmp27_; - Flaggable* _tmp28_; - gboolean _tmp29_ = FALSE; - Flaggable* _tmp30_; + DataSource* _tmp22_; + Flaggable* _tmp23_; + gboolean _tmp24_ = FALSE; + Flaggable* _tmp25_; #line 52 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_ACCUMULATOR, MediaAccumulator); #line 52 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 53 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp0_ = object; -#line 53 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp1_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView)); + _tmp0_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView)); #line 53 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - source = _tmp1_; + source = _tmp0_; #line 55 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp2_ = self->total; + _tmp1_ = self->total; #line 55 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - if (_tmp2_ < 1) { -#line 608 "MediaViewTracker.c" - DataObject* _tmp3_; - gchar* _tmp4_; + if (_tmp1_ < 1) { +#line 640 "MediaViewTracker.c" + gchar* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; gchar* _tmp5_; - GType _tmp6_; - const gchar* _tmp7_; + gchar* _tmp6_; + gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp3_ = object; + _tmp2_ = data_object_to_string (object); #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp4_ = data_object_to_string (_tmp3_); + _tmp3_ = _tmp2_; #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp5_ = _tmp4_; + _tmp4_ = g_type_name (G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject))); #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp6_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject)); + _tmp5_ = media_accumulator_to_string (self); #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp7_ = g_type_name (_tmp6_); + _tmp6_ = _tmp5_; #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp8_ = media_accumulator_to_string (self); + _tmp7_ = g_strdup_printf ("Tried to remove DataObject %s from empty %s (%s)", _tmp3_, _tmp4_, _tmp6_); #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp10_ = g_strdup_printf ("Tried to remove DataObject %s from empty %s (%s)", _tmp5_, _tmp7_, _tmp9_); + g_warning ("MediaViewTracker.vala:56: %s", _tmp8_); #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp11_ = _tmp10_; + _g_free0 (_tmp8_); #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - g_warning ("MediaViewTracker.vala:56: %s", _tmp11_); + _g_free0 (_tmp6_); #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _g_free0 (_tmp11_); -#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _g_free0 (_tmp9_); -#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp3_); #line 58 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" result = FALSE; #line 58 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" _g_object_unref0 (source); #line 58 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" return result; -#line 650 "MediaViewTracker.c" +#line 676 "MediaViewTracker.c" } #line 60 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp12_ = self->total; + _tmp9_ = self->total; #line 60 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - self->total = _tmp12_ - 1; + self->total = _tmp9_ - 1; #line 62 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp13_ = source; + _tmp10_ = source; #line 62 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_PHOTO) ? ((Photo*) _tmp13_) : NULL); + _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_PHOTO) ? ((Photo*) _tmp10_) : NULL); #line 62 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - photo = _tmp14_; + photo = _tmp11_; #line 63 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp15_ = photo; + _tmp12_ = photo; #line 63 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - if (_tmp15_ != NULL) { -#line 666 "MediaViewTracker.c" + if (_tmp12_ != NULL) { +#line 692 "MediaViewTracker.c" + Photo* _tmp13_; Photo* _tmp16_; - PhotoFileFormat _tmp17_; - Photo* _tmp20_; - PhotoFileFormat _tmp21_; -#line 64 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp16_ = photo; #line 64 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp17_ = photo_get_master_file_format (_tmp16_); + _tmp13_ = photo; #line 64 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - if (_tmp17_ == PHOTO_FILE_FORMAT_RAW) { -#line 677 "MediaViewTracker.c" - gint _tmp18_; - gint _tmp19_; + if (photo_get_master_file_format (_tmp13_) == PHOTO_FILE_FORMAT_RAW) { +#line 699 "MediaViewTracker.c" + gint _tmp14_; + gint _tmp15_; #line 65 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp18_ = self->raw; + _tmp14_ = self->raw; #line 65 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _vala_assert (_tmp18_ > 0, "raw > 0"); + _vala_assert (_tmp14_ > 0, "raw > 0"); #line 66 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp19_ = self->raw; + _tmp15_ = self->raw; #line 66 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - self->raw = _tmp19_ - 1; -#line 688 "MediaViewTracker.c" + self->raw = _tmp15_ - 1; +#line 710 "MediaViewTracker.c" } #line 69 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp20_ = photo; -#line 69 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp21_ = photo_get_master_file_format (_tmp20_); + _tmp16_ = photo; #line 69 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - if (_tmp21_ != PHOTO_FILE_FORMAT_RAW) { -#line 696 "MediaViewTracker.c" - gint _tmp22_; - gint _tmp23_; + if (photo_get_master_file_format (_tmp16_) != PHOTO_FILE_FORMAT_RAW) { +#line 716 "MediaViewTracker.c" + gint _tmp17_; + gint _tmp18_; #line 70 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp22_ = self->photos; + _tmp17_ = self->photos; #line 70 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _vala_assert (_tmp22_ > 0, "photos > 0"); + _vala_assert (_tmp17_ > 0, "photos > 0"); #line 71 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp23_ = self->photos; + _tmp18_ = self->photos; #line 71 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - self->photos = _tmp23_ - 1; -#line 707 "MediaViewTracker.c" + self->photos = _tmp18_ - 1; +#line 727 "MediaViewTracker.c" } } else { - DataSource* _tmp24_; + DataSource* _tmp19_; #line 73 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp24_ = source; + _tmp19_ = source; #line 73 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, TYPE_VIDEO)) { -#line 715 "MediaViewTracker.c" - gint _tmp25_; - gint _tmp26_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_VIDEO)) { +#line 735 "MediaViewTracker.c" + gint _tmp20_; + gint _tmp21_; #line 74 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp25_ = self->videos; + _tmp20_ = self->videos; #line 74 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _vala_assert (_tmp25_ > 0, "videos > 0"); + _vala_assert (_tmp20_ > 0, "videos > 0"); #line 75 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp26_ = self->videos; + _tmp21_ = self->videos; #line 75 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - self->videos = _tmp26_ - 1; -#line 726 "MediaViewTracker.c" + self->videos = _tmp21_ - 1; +#line 746 "MediaViewTracker.c" } } #line 78 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp27_ = source; + _tmp22_ = source; #line 78 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp27_) : NULL); + _tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp22_) : NULL); #line 78 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - flaggable = _tmp28_; -#line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp30_ = flaggable; + flaggable = _tmp23_; #line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - if (_tmp30_ != NULL) { -#line 739 "MediaViewTracker.c" - Flaggable* _tmp31_; - gboolean _tmp32_; + _tmp25_ = flaggable; #line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp31_ = flaggable; + if (_tmp25_ != NULL) { +#line 759 "MediaViewTracker.c" + Flaggable* _tmp26_; #line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp32_ = flaggable_is_flagged (_tmp31_); + _tmp26_ = flaggable; #line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp29_ = _tmp32_; -#line 748 "MediaViewTracker.c" + _tmp24_ = flaggable_is_flagged (_tmp26_); +#line 765 "MediaViewTracker.c" } else { #line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp29_ = FALSE; -#line 752 "MediaViewTracker.c" + _tmp24_ = FALSE; +#line 769 "MediaViewTracker.c" } #line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - if (_tmp29_) { -#line 756 "MediaViewTracker.c" - gint _tmp33_; - gint _tmp34_; + if (_tmp24_) { +#line 773 "MediaViewTracker.c" + gint _tmp27_; + gint _tmp28_; #line 80 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp33_ = self->flagged; + _tmp27_ = self->flagged; #line 80 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _vala_assert (_tmp33_ > 0, "flagged > 0"); + _vala_assert (_tmp27_ > 0, "flagged > 0"); #line 81 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp34_ = self->flagged; + _tmp28_ = self->flagged; #line 81 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - self->flagged = _tmp34_ - 1; -#line 767 "MediaViewTracker.c" + self->flagged = _tmp28_ - 1; +#line 784 "MediaViewTracker.c" } #line 85 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" result = TRUE; @@ -775,22 +792,22 @@ static gboolean media_accumulator_real_uninclude (CoreTrackerAccumulator* base, _g_object_unref0 (source); #line 85 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" return result; -#line 779 "MediaViewTracker.c" +#line 796 "MediaViewTracker.c" } -static gboolean media_accumulator_real_altered (CoreTrackerAccumulator* base, DataObject* object, Alteration* alteration) { +static gboolean +media_accumulator_real_altered (CoreTrackerAccumulator* base, + DataObject* object, + Alteration* alteration) +{ MediaAccumulator * self; gboolean result = FALSE; - Alteration* _tmp0_; - gboolean _tmp1_; Flaggable* flaggable = NULL; - DataObject* _tmp2_; - DataSource* _tmp3_; - Flaggable* _tmp4_; - Flaggable* _tmp5_; - Flaggable* _tmp6_; - gboolean _tmp7_; + DataSource* _tmp0_; + Flaggable* _tmp1_; + Flaggable* _tmp2_; + Flaggable* _tmp3_; #line 88 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_ACCUMULATOR, MediaAccumulator); #line 88 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" @@ -798,68 +815,60 @@ static gboolean media_accumulator_real_altered (CoreTrackerAccumulator* base, Da #line 88 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 91 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp0_ = alteration; -#line 91 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "flagged"); -#line 91 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - if (!_tmp1_) { + if (!alteration_has_detail (alteration, "metadata", "flagged")) { #line 92 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" result = FALSE; #line 92 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" return result; -#line 811 "MediaViewTracker.c" +#line 824 "MediaViewTracker.c" } #line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp2_ = object; + _tmp0_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView)); #line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp3_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView)); + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp0_) : NULL; #line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp3_) : NULL; + if (_tmp1_ == NULL) { #line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - if (_tmp4_ == NULL) { -#line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _g_object_unref0 (_tmp3_); -#line 823 "MediaViewTracker.c" + _g_object_unref0 (_tmp0_); +#line 834 "MediaViewTracker.c" } #line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - flaggable = _tmp4_; + flaggable = _tmp1_; #line 95 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp5_ = flaggable; + _tmp2_ = flaggable; #line 95 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - if (_tmp5_ == NULL) { + if (_tmp2_ == NULL) { #line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" result = FALSE; #line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" _g_object_unref0 (flaggable); #line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" return result; -#line 837 "MediaViewTracker.c" +#line 848 "MediaViewTracker.c" } #line 98 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp6_ = flaggable; -#line 98 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp7_ = flaggable_is_flagged (_tmp6_); + _tmp3_ = flaggable; #line 98 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - if (_tmp7_) { -#line 845 "MediaViewTracker.c" - gint _tmp8_; + if (flaggable_is_flagged (_tmp3_)) { +#line 854 "MediaViewTracker.c" + gint _tmp4_; #line 99 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp8_ = self->flagged; + _tmp4_ = self->flagged; #line 99 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - self->flagged = _tmp8_ + 1; -#line 851 "MediaViewTracker.c" + self->flagged = _tmp4_ + 1; +#line 860 "MediaViewTracker.c" } else { - gint _tmp9_; - gint _tmp10_; + gint _tmp5_; + gint _tmp6_; #line 101 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp9_ = self->flagged; + _tmp5_ = self->flagged; #line 101 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _vala_assert (_tmp9_ > 0, "flagged > 0"); + _vala_assert (_tmp5_ > 0, "flagged > 0"); #line 102 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - _tmp10_ = self->flagged; + _tmp6_ = self->flagged; #line 102 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" - self->flagged = _tmp10_ - 1; -#line 863 "MediaViewTracker.c" + self->flagged = _tmp6_ - 1; +#line 872 "MediaViewTracker.c" } #line 105 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" result = TRUE; @@ -867,11 +876,13 @@ static gboolean media_accumulator_real_altered (CoreTrackerAccumulator* base, Da _g_object_unref0 (flaggable); #line 105 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" return result; -#line 871 "MediaViewTracker.c" +#line 880 "MediaViewTracker.c" } -gchar* media_accumulator_to_string (MediaAccumulator* self) { +gchar* +media_accumulator_to_string (MediaAccumulator* self) +{ gchar* result = NULL; gint _tmp0_; gint _tmp1_; @@ -894,37 +905,45 @@ gchar* media_accumulator_to_string (MediaAccumulator* self) { result = _tmp4_; #line 109 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" return result; -#line 898 "MediaViewTracker.c" +#line 909 "MediaViewTracker.c" } -MediaAccumulator* media_accumulator_construct (GType object_type) { +MediaAccumulator* +media_accumulator_construct (GType object_type) +{ MediaAccumulator * self = NULL; #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" self = (MediaAccumulator*) g_object_new (object_type, NULL); #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" return self; -#line 908 "MediaViewTracker.c" +#line 921 "MediaViewTracker.c" } -MediaAccumulator* media_accumulator_new (void) { +MediaAccumulator* +media_accumulator_new (void) +{ #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" return media_accumulator_construct (TYPE_MEDIA_ACCUMULATOR); -#line 915 "MediaViewTracker.c" +#line 930 "MediaViewTracker.c" } -static void media_accumulator_class_init (MediaAccumulatorClass * klass) { +static void +media_accumulator_class_init (MediaAccumulatorClass * klass) +{ #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" media_accumulator_parent_class = g_type_class_peek_parent (klass); #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" G_OBJECT_CLASS (klass)->finalize = media_accumulator_finalize; -#line 924 "MediaViewTracker.c" +#line 941 "MediaViewTracker.c" } -static void media_accumulator_core_tracker_accumulator_interface_init (CoreTrackerAccumulatorIface * iface) { +static void +media_accumulator_core_tracker_accumulator_interface_init (CoreTrackerAccumulatorIface * iface) +{ #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" media_accumulator_core_tracker_accumulator_parent_iface = g_type_interface_peek_parent (iface); #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" @@ -933,11 +952,13 @@ static void media_accumulator_core_tracker_accumulator_interface_init (CoreTrack iface->uninclude = (gboolean (*) (CoreTrackerAccumulator *, DataObject*)) media_accumulator_real_uninclude; #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" iface->altered = (gboolean (*) (CoreTrackerAccumulator *, DataObject*, Alteration*)) media_accumulator_real_altered; -#line 937 "MediaViewTracker.c" +#line 956 "MediaViewTracker.c" } -static void media_accumulator_instance_init (MediaAccumulator * self) { +static void +media_accumulator_instance_init (MediaAccumulator * self) +{ #line 20 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" self->total = 0; #line 21 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" @@ -948,21 +969,25 @@ static void media_accumulator_instance_init (MediaAccumulator * self) { self->raw = 0; #line 24 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" self->flagged = 0; -#line 952 "MediaViewTracker.c" +#line 973 "MediaViewTracker.c" } -static void media_accumulator_finalize (GObject * obj) { +static void +media_accumulator_finalize (GObject * obj) +{ MediaAccumulator * self; #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_ACCUMULATOR, MediaAccumulator); #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala" G_OBJECT_CLASS (media_accumulator_parent_class)->finalize (obj); -#line 962 "MediaViewTracker.c" +#line 985 "MediaViewTracker.c" } -GType media_accumulator_get_type (void) { +GType +media_accumulator_get_type (void) +{ static volatile gsize media_accumulator_type_id__volatile = 0; if (g_once_init_enter (&media_accumulator_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MediaAccumulatorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) media_accumulator_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MediaAccumulator), 0, (GInstanceInitFunc) media_accumulator_instance_init, NULL }; diff --git a/src/MetadataWriter.c b/src/MetadataWriter.c index 9dd784c..cad0c6b 100644 --- a/src/MetadataWriter.c +++ b/src/MetadataWriter.c @@ -1,4 +1,4 @@ -/* MetadataWriter.c generated by valac 0.36.6, the Vala compiler +/* MetadataWriter.c generated by valac 0.40.4, the Vala compiler * generated from MetadataWriter.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -13,6 +13,7 @@ /* the feature, so if they turn it on MetadataWriter can properly go out and update the backing*/ /* files.*/ + #include #include #include @@ -152,6 +153,11 @@ typedef struct _BackgroundJobClass BackgroundJobClass; typedef struct _MetadataWriterCommitJob MetadataWriterCommitJob; typedef struct _MetadataWriterCommitJobClass MetadataWriterCommitJobClass; +enum { + METADATA_WRITER_0_PROPERTY, + METADATA_WRITER_NUM_PROPERTIES +}; +static GParamSpec* metadata_writer_properties[METADATA_WRITER_NUM_PROPERTIES]; #define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ()) #define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade)) @@ -417,9 +423,9 @@ typedef struct _MetadataDateTimeClass MetadataDateTimeClass; #define TYPE_ORIENTATION (orientation_get_type ()) enum { METADATA_WRITER_PROGRESS_SIGNAL, - METADATA_WRITER_LAST_SIGNAL + METADATA_WRITER_NUM_SIGNALS }; -static guint metadata_writer_signals[METADATA_WRITER_LAST_SIGNAL] = {0}; +static guint metadata_writer_signals[METADATA_WRITER_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -557,16 +563,28 @@ static gpointer metadata_writer_commit_job_parent_class = NULL; GType metadata_writer_get_type (void) G_GNUC_CONST; gpointer workers_ref (gpointer instance); void workers_unref (gpointer instance); -GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_workers (GValue* value, gpointer v_object); -void value_take_workers (GValue* value, gpointer v_object); +GParamSpec* param_spec_workers (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_workers (GValue* value, + gpointer v_object); +void value_take_workers (GValue* value, + gpointer v_object); gpointer value_get_workers (const GValue* value); GType workers_get_type (void) G_GNUC_CONST; gpointer timed_queue_ref (gpointer instance); void timed_queue_unref (gpointer instance); -GParamSpec* param_spec_timed_queue (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_timed_queue (GValue* value, gpointer v_object); -void value_take_timed_queue (GValue* value, gpointer v_object); +GParamSpec* param_spec_timed_queue (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_timed_queue (GValue* value, + gpointer v_object); +void value_take_timed_queue (GValue* value, + gpointer v_object); gpointer value_get_timed_queue (const GValue* value); GType timed_queue_get_type (void) G_GNUC_CONST; GType hash_timed_queue_get_type (void) G_GNUC_CONST; @@ -579,104 +597,215 @@ GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; gpointer background_job_ref (gpointer instance); void background_job_unref (gpointer instance); -GParamSpec* param_spec_background_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_background_job (GValue* value, gpointer v_object); -void value_take_background_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_background_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_background_job (GValue* value, + gpointer v_object); +void value_take_background_job (GValue* value, + gpointer v_object); gpointer value_get_background_job (const GValue* value); GType background_job_get_type (void) G_GNUC_CONST; static GType metadata_writer_commit_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define METADATA_WRITER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_METADATA_WRITER, MetadataWriterPrivate)) -enum { - METADATA_WRITER_DUMMY_PROPERTY -}; GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); static void metadata_writer_on_config_changed (MetadataWriter* self); -static void _metadata_writer_on_config_changed_configuration_facade_commit_metadata_to_masters_changed (ConfigurationFacade* _sender, gpointer self); +static void _metadata_writer_on_config_changed_configuration_facade_commit_metadata_to_masters_changed (ConfigurationFacade* _sender, + gpointer self); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; GType library_photo_source_collection_get_type (void) G_GNUC_CONST; -static void metadata_writer_on_importing_photos (MetadataWriter* self, GeeCollection* media_sources); -static void _metadata_writer_on_importing_photos_media_source_collection_media_import_starting (MediaSourceCollection* _sender, GeeCollection* media, gpointer self); -static void metadata_writer_on_photos_imported (MetadataWriter* self, GeeCollection* media_sources); -static void _metadata_writer_on_photos_imported_media_source_collection_media_import_completed (MediaSourceCollection* _sender, GeeCollection* media, gpointer self); -static void metadata_writer_on_photos_added_removed (MetadataWriter* self, GeeIterable* added, GeeIterable* removed); -static void _metadata_writer_on_photos_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self); +static void metadata_writer_on_importing_photos (MetadataWriter* self, + GeeCollection* media_sources); +static void _metadata_writer_on_importing_photos_media_source_collection_media_import_starting (MediaSourceCollection* _sender, + GeeCollection* media, + gpointer self); +static void metadata_writer_on_photos_imported (MetadataWriter* self, + GeeCollection* media_sources); +static void _metadata_writer_on_photos_imported_media_source_collection_media_import_completed (MediaSourceCollection* _sender, + GeeCollection* media, + gpointer self); +static void metadata_writer_on_photos_added_removed (MetadataWriter* self, + GeeIterable* added, + GeeIterable* removed); +static void _metadata_writer_on_photos_added_removed_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self); gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; -static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* items); -static void _metadata_writer_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void metadata_writer_on_photos_altered (MetadataWriter* self, + GeeMap* items); +static void _metadata_writer_on_photos_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); static void metadata_writer_on_collection_frozen (MetadataWriter* self); -static void _metadata_writer_on_collection_frozen_data_collection_frozen (DataCollection* _sender, gpointer self); +static void _metadata_writer_on_collection_frozen_data_collection_frozen (DataCollection* _sender, + gpointer self); static void metadata_writer_on_collection_thawed (MetadataWriter* self); -static void _metadata_writer_on_collection_thawed_data_collection_thawed (DataCollection* _sender, gpointer self); -static void metadata_writer_on_photos_destroyed (MetadataWriter* self, GeeCollection* destroyed); -static void _metadata_writer_on_photos_destroyed_source_collection_items_destroyed (SourceCollection* _sender, GeeCollection* destroyed, gpointer self); +static void _metadata_writer_on_collection_thawed_data_collection_thawed (DataCollection* _sender, + gpointer self); +static void metadata_writer_on_photos_destroyed (MetadataWriter* self, + GeeCollection* destroyed); +static void _metadata_writer_on_photos_destroyed_source_collection_items_destroyed (SourceCollection* _sender, + GeeCollection* destroyed, + gpointer self); GType container_source_collection_get_type (void) G_GNUC_CONST; GType tag_source_collection_get_type (void) G_GNUC_CONST; -static void metadata_writer_on_tags_altered (MetadataWriter* self, GeeMap* map); -static void _metadata_writer_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void metadata_writer_on_tags_altered (MetadataWriter* self, + GeeMap* map); +static void _metadata_writer_on_tags_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; GType container_source_get_type (void) G_GNUC_CONST; -static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, ContainerSource* container, GeeCollection* added, gboolean relinking, GeeCollection* removed, gboolean unlinking); -static void _metadata_writer_on_tag_contents_altered_container_source_collection_container_contents_altered (ContainerSourceCollection* _sender, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked, gpointer self); -static void metadata_writer_on_tag_backlink_removed (MetadataWriter* self, ContainerSource* container, GeeCollection* sources); -static void _metadata_writer_on_tag_backlink_removed_container_source_collection_backlink_to_container_removed (ContainerSourceCollection* _sender, ContainerSource* container, GeeCollection* sources, gpointer self); +static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinking, + GeeCollection* removed, + gboolean unlinking); +static void _metadata_writer_on_tag_contents_altered_container_source_collection_container_contents_altered (ContainerSourceCollection* _sender, + ContainerSource* container, + GeeCollection* added, + gboolean relinked, + GeeCollection* removed, + gboolean unlinked, + gpointer self); +static void metadata_writer_on_tag_backlink_removed (MetadataWriter* self, + ContainerSource* container, + GeeCollection* sources); +static void _metadata_writer_on_tag_backlink_removed_container_source_collection_backlink_to_container_removed (ContainerSourceCollection* _sender, + ContainerSource* container, + GeeCollection* sources, + gpointer self); gpointer application_ref (gpointer instance); void application_unref (gpointer instance); -GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_application (GValue* value, gpointer v_object); -void value_take_application (GValue* value, gpointer v_object); +GParamSpec* param_spec_application (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_application (GValue* value, + gpointer v_object); +void value_take_application (GValue* value, + gpointer v_object); gpointer value_get_application (const GValue* value); GType application_get_type (void) G_GNUC_CONST; Application* application_get_instance (void); static void metadata_writer_on_application_exiting (MetadataWriter* self); -static void _metadata_writer_on_application_exiting_application_exiting (Application* _sender, gboolean panicked, gpointer self); +static void _metadata_writer_on_application_exiting_application_exiting (Application* _sender, + gboolean panicked, + gpointer self); gpointer library_monitor_pool_ref (gpointer instance); void library_monitor_pool_unref (gpointer instance); -GParamSpec* param_spec_library_monitor_pool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_library_monitor_pool (GValue* value, gpointer v_object); -void value_take_library_monitor_pool (GValue* value, gpointer v_object); +GParamSpec* param_spec_library_monitor_pool (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_library_monitor_pool (GValue* value, + gpointer v_object); +void value_take_library_monitor_pool (GValue* value, + gpointer v_object); gpointer value_get_library_monitor_pool (const GValue* value); GType library_monitor_pool_get_type (void) G_GNUC_CONST; LibraryMonitorPool* library_monitor_pool_get_instance (void); GType directory_monitor_get_type (void) G_GNUC_CONST; GType library_monitor_get_type (void) G_GNUC_CONST; -static void metadata_writer_on_monitor_installed (MetadataWriter* self, LibraryMonitor* monitor); -static void _metadata_writer_on_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self); -static void metadata_writer_on_monitor_destroyed (MetadataWriter* self, LibraryMonitor* monitor); -static void _metadata_writer_on_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self); -Workers* workers_new (guint max_threads, gboolean exclusive); -Workers* workers_construct (GType object_type, guint max_threads, gboolean exclusive); +static void metadata_writer_on_monitor_installed (MetadataWriter* self, + LibraryMonitor* monitor); +static void _metadata_writer_on_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, + LibraryMonitor* monitor, + gpointer self); +static void metadata_writer_on_monitor_destroyed (MetadataWriter* self, + LibraryMonitor* monitor); +static void _metadata_writer_on_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, + LibraryMonitor* monitor, + gpointer self); +Workers* workers_new (guint max_threads, + gboolean exclusive); +Workers* workers_construct (GType object_type, + guint max_threads, + gboolean exclusive); #define METADATA_WRITER_COMMIT_DELAY_MSEC ((guint) 3000) #define METADATA_WRITER_COMMIT_SPACING_MSEC ((guint) 50) static MetadataWriter* metadata_writer_new (void); static MetadataWriter* metadata_writer_construct (GType object_type); -static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhoto* photo); -static void _metadata_writer_on_photo_dequeued_dequeued_callback (gconstpointer item, gpointer self); -HashTimedQueue* hash_timed_queue_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeHashDataFunc hash_func, void* hash_func_target, GDestroyNotify hash_func_target_destroy_notify, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority); -HashTimedQueue* hash_timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeHashDataFunc hash_func, void* hash_func_target, GDestroyNotify hash_func_target_destroy_notify, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority); -void timed_queue_set_dequeue_spacing_msec (TimedQueue* self, guint msec); +static void metadata_writer_on_photo_dequeued (MetadataWriter* self, + LibraryPhoto* photo); +static void _metadata_writer_on_photo_dequeued_dequeued_callback (gconstpointer item, + gpointer self); +HashTimedQueue* hash_timed_queue_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + guint hold_msec, + DequeuedCallback callback, + void* callback_target, + GeeHashDataFunc hash_func, + void* hash_func_target, + GDestroyNotify hash_func_target_destroy_notify, + GeeEqualDataFunc equal_func, + void* equal_func_target, + GDestroyNotify equal_func_target_destroy_notify, + gint priority); +HashTimedQueue* hash_timed_queue_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + guint hold_msec, + DequeuedCallback callback, + void* callback_target, + GeeHashDataFunc hash_func, + void* hash_func_target, + GDestroyNotify hash_func_target_destroy_notify, + GeeEqualDataFunc equal_func, + void* equal_func_target, + GDestroyNotify equal_func_target_destroy_notify, + gint priority); +void timed_queue_set_dequeue_spacing_msec (TimedQueue* self, + guint msec); void metadata_writer_pause (MetadataWriter* self); gboolean configuration_facade_get_commit_metadata_to_masters (ConfigurationFacade* self); void metadata_writer_force_rescan (MetadataWriter* self); @@ -684,141 +813,253 @@ void metadata_writer_init (void); void metadata_writer_terminate (void); void metadata_writer_close (MetadataWriter* self); MetadataWriter* metadata_writer_get_instance (void); -static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable* media_sources, const gchar* reason); +static void metadata_writer_schedule_if_dirty (MetadataWriter* self, + GeeIterable* media_sources, + const gchar* reason); GeeCollection* data_collection_get_all (DataCollection* self); void timed_queue_pause (TimedQueue* self); void metadata_writer_unpause (MetadataWriter* self); void timed_queue_unpause (TimedQueue* self); -static void metadata_writer_cancel_all (MetadataWriter* self, gboolean wait); +static void metadata_writer_cancel_all (MetadataWriter* self, + gboolean wait); static void metadata_writer_on_discovery_completed (MetadataWriter* self); -static void _metadata_writer_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self); -static gboolean metadata_writer_cancel_job (MetadataWriter* self, LibraryPhoto* photo); -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail); -GeeCollection* alteration_get_details (Alteration* self, const gchar* subject); -static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollection* photos, const gchar* reason, gboolean already_marked); +static void _metadata_writer_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, + gpointer self); +static gboolean metadata_writer_cancel_job (MetadataWriter* self, + LibraryPhoto* photo); +gboolean alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail); +GeeCollection* alteration_get_details (Alteration* self, + const gchar* subject); +static void metadata_writer_photos_are_dirty (MetadataWriter* self, + GeeCollection* photos, + const gchar* reason, + gboolean already_marked); GType tag_get_type (void) G_GNUC_CONST; GeeCollection* tag_get_sources (Tag* self); gchar* data_object_to_string (DataObject* self); -static void metadata_writer_count_enqueued_work (MetadataWriter* self, gint count, gboolean report); -static void metadata_writer_count_cancelled_work (MetadataWriter* self, gint count, gboolean report); -static void metadata_writer_count_completed_work (MetadataWriter* self, gint count, gboolean report); +static void metadata_writer_count_enqueued_work (MetadataWriter* self, + gint count, + gboolean report); +static void metadata_writer_count_cancelled_work (MetadataWriter* self, + gint count, + gboolean report); +static void metadata_writer_count_completed_work (MetadataWriter* self, + gint count, + gboolean report); gboolean photo_is_master_metadata_dirty (Photo* self); gpointer transaction_controller_ref (gpointer instance); void transaction_controller_unref (gpointer instance); -GParamSpec* param_spec_transaction_controller (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_transaction_controller (GValue* value, gpointer v_object); -void value_take_transaction_controller (GValue* value, gpointer v_object); +GParamSpec* param_spec_transaction_controller (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_transaction_controller (GValue* value, + gpointer v_object); +void value_take_transaction_controller (GValue* value, + gpointer v_object); gpointer value_get_transaction_controller (const GValue* value); GType transaction_controller_get_type (void) G_GNUC_CONST; TransactionController* media_source_collection_get_transaction_controller (MediaSourceCollection* self); void transaction_controller_begin (TransactionController* self); GQuark database_error_quark (void); -void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** error); +void photo_set_master_metadata_dirty (Photo* self, + gboolean dirty, + GError** error); void transaction_controller_commit (TransactionController* self); void app_window_database_error (GError* err); -gboolean timed_queue_enqueue (TimedQueue* self, gconstpointer item); +gboolean timed_queue_enqueue (TimedQueue* self, + gconstpointer item); void timed_queue_clear (TimedQueue* self); void background_job_cancel (BackgroundJob* self); void workers_wait_for_empty_queue (Workers* self); -gboolean timed_queue_contains (TimedQueue* self, gconstpointer item); -gboolean timed_queue_remove_first (TimedQueue* self, gconstpointer item); -GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, MediaSource* source); +gboolean timed_queue_contains (TimedQueue* self, + gconstpointer item); +gboolean timed_queue_remove_first (TimedQueue* self, + gconstpointer item); +GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, + MediaSource* source); gchar* data_object_get_name (DataObject* self); -static MetadataWriterCommitJob* metadata_writer_commit_job_new (MetadataWriter* owner, LibraryPhoto* photo, GeeSet* keywords); -static MetadataWriterCommitJob* metadata_writer_commit_job_construct (GType object_type, MetadataWriter* owner, LibraryPhoto* photo, GeeSet* keywords); -void workers_enqueue (Workers* self, BackgroundJob* job); -static void metadata_writer_on_update_completed (MetadataWriter* self, BackgroundJob* j); +static MetadataWriterCommitJob* metadata_writer_commit_job_new (MetadataWriter* owner, + LibraryPhoto* photo, + GeeSet* keywords); +static MetadataWriterCommitJob* metadata_writer_commit_job_construct (GType object_type, + MetadataWriter* owner, + LibraryPhoto* photo, + GeeSet* keywords); +void workers_enqueue (Workers* self, + BackgroundJob* job); +static void metadata_writer_on_update_completed (MetadataWriter* self, + BackgroundJob* j); GType background_job_job_priority_get_type (void) G_GNUC_CONST; gpointer photo_reimport_master_state_ref (gpointer instance); void photo_reimport_master_state_unref (gpointer instance); -GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void photo_value_set_reimport_master_state (GValue* value, gpointer v_object); -void photo_value_take_reimport_master_state (GValue* value, gpointer v_object); +GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void photo_value_set_reimport_master_state (GValue* value, + gpointer v_object); +void photo_value_take_reimport_master_state (GValue* value, + gpointer v_object); gpointer photo_value_get_reimport_master_state (const GValue* value); GType photo_reimport_master_state_get_type (void) G_GNUC_CONST; gpointer photo_reimport_editable_state_ref (gpointer instance); void photo_reimport_editable_state_unref (gpointer instance); -GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object); -void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object); +GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void photo_value_set_reimport_editable_state (GValue* value, + gpointer v_object); +void photo_value_take_reimport_editable_state (GValue* value, + gpointer v_object); gpointer photo_value_get_reimport_editable_state (const GValue* value); GType photo_reimport_editable_state_get_type (void) G_GNUC_CONST; GFile* media_source_get_master_file (MediaSource* self); GFile* photo_get_editable_file (Photo* self); -void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState* state, GError** error); -void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableState* state, GError** error); -static void metadata_writer_on_update_cancelled (MetadataWriter* self, BackgroundJob* j); -static void g_cclosure_user_marshal_VOID__UINT_UINT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -enum { - METADATA_WRITER_COMMIT_JOB_DUMMY_PROPERTY -}; -static void _metadata_writer_on_update_completed_completion_callback (BackgroundJob* job, gpointer self); -static void _metadata_writer_on_update_cancelled_cancellation_callback (BackgroundJob* job, gpointer self); +void photo_finish_update_master_metadata (Photo* self, + PhotoReimportMasterState* state, + GError** error); +void photo_finish_update_editable_metadata (Photo* self, + PhotoReimportEditableState* state, + GError** error); +static void metadata_writer_on_update_cancelled (MetadataWriter* self, + BackgroundJob* j); +static void g_cclosure_user_marshal_VOID__UINT_UINT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void _metadata_writer_on_update_completed_completion_callback (BackgroundJob* job, + gpointer self); +static void _metadata_writer_on_update_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self); gpointer abstract_semaphore_ref (gpointer instance); void abstract_semaphore_unref (gpointer instance); -GParamSpec* param_spec_abstract_semaphore (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_abstract_semaphore (GValue* value, gpointer v_object); -void value_take_abstract_semaphore (GValue* value, gpointer v_object); +GParamSpec* param_spec_abstract_semaphore (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_abstract_semaphore (GValue* value, + gpointer v_object); +void value_take_abstract_semaphore (GValue* value, + gpointer v_object); gpointer value_get_abstract_semaphore (const GValue* value); GType abstract_semaphore_get_type (void) G_GNUC_CONST; -BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore); +BackgroundJob* background_job_construct (GType object_type, + GObject* owner, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target, + AbstractSemaphore* completion_semaphore); static void metadata_writer_commit_job_real_execute (BackgroundJob* base); -static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* self, GError** error); -static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob* self, GError** error); +static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* self, + GError** error); +static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob* self, + GError** error); gboolean photo_has_editable (Photo* self); GType photo_file_format_get_type (void) G_GNUC_CONST; PhotoFileFormat photo_get_master_file_format (Photo* self); gboolean photo_file_format_can_write_metadata (PhotoFileFormat self); gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; -PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error); -static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommitJob* self, PhotoMetadata* metadata, gboolean skip_orientation); -void library_monitor_blacklist_file (GFile* file, const gchar* reason); -gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportMasterState* * state, GError** error); +PhotoMetadata* photo_get_master_metadata (Photo* self, + GError** error); +static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommitJob* self, + PhotoMetadata* metadata, + gboolean skip_orientation); +void library_monitor_blacklist_file (GFile* file, + const gchar* reason); +gboolean photo_persist_master_metadata (Photo* self, + PhotoMetadata* metadata, + PhotoReimportMasterState* * state, + GError** error); void library_monitor_unblacklist_file (GFile* file); PhotoFileFormat* photo_get_editable_file_format (Photo* self); -PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error); -gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportEditableState* * state, GError** error); +PhotoMetadata* photo_get_editable_metadata (Photo* self, + GError** error); +gboolean photo_persist_editable_metadata (Photo* self, + PhotoMetadata* metadata, + PhotoReimportEditableState* * state, + GError** error); gchar* media_source_get_title (MediaSource* self); gchar* media_metadata_get_title (MediaMetadata* self); GType photo_metadata_set_option_get_type (void) G_GNUC_CONST; -void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMetadataSetOption option); +void photo_metadata_set_title (PhotoMetadata* self, + const gchar* title, + PhotoMetadataSetOption option); gchar* media_source_get_comment (MediaSource* self); gchar* media_metadata_get_comment (MediaMetadata* self); -void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, PhotoMetadataSetOption option); +void photo_metadata_set_comment (PhotoMetadata* self, + const gchar* comment, + PhotoMetadataSetOption option); GType rating_get_type (void) G_GNUC_CONST; Rating media_source_get_rating (MediaSource* self); Rating photo_metadata_get_rating (PhotoMetadata* self); -void photo_metadata_set_rating (PhotoMetadata* self, Rating rating); +void photo_metadata_set_rating (PhotoMetadata* self, + Rating rating); time_t media_source_get_exposure_time (MediaSource* self); gpointer metadata_date_time_ref (gpointer instance); void metadata_date_time_unref (gpointer instance); -GParamSpec* param_spec_metadata_date_time (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_metadata_date_time (GValue* value, gpointer v_object); -void value_take_metadata_date_time (GValue* value, gpointer v_object); +GParamSpec* param_spec_metadata_date_time (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_metadata_date_time (GValue* value, + gpointer v_object); +void value_take_metadata_date_time (GValue* value, + gpointer v_object); gpointer value_get_metadata_date_time (const GValue* value); GType metadata_date_time_get_type (void) G_GNUC_CONST; MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self); time_t metadata_date_time_get_timestamp (MetadataDateTime* self); MetadataDateTime* metadata_date_time_new (time_t timestamp); -MetadataDateTime* metadata_date_time_construct (GType object_type, time_t timestamp); -void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option); +MetadataDateTime* metadata_date_time_construct (GType object_type, + time_t timestamp); +void photo_metadata_set_exposure_date_time (PhotoMetadata* self, + MetadataDateTime* date_time, + PhotoMetadataSetOption option); Tag* tag_for_path (const gchar* name); gchar* tag_get_user_visible_name (Tag* self); -gboolean equal_sets (GeeSet* a, GeeSet* b); -GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify); -void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, PhotoMetadataSetOption option); +gboolean equal_sets (GeeSet* a, + GeeSet* b); +GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify); +void photo_metadata_set_keywords (PhotoMetadata* self, + GeeCollection* keywords, + PhotoMetadataSetOption option); GType orientation_get_type (void) G_GNUC_CONST; Orientation photo_get_orientation (Photo* self); Orientation photo_metadata_get_orientation (PhotoMetadata* self); -void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientation); -void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, const gchar* version); +void photo_metadata_set_orientation (PhotoMetadata* self, + Orientation orientation); +void photo_metadata_set_software (PhotoMetadata* self, + const gchar* software, + const gchar* version); #define RESOURCES_APP_TITLE "Shotwell" #define RESOURCES_APP_VERSION _VERSION static void metadata_writer_commit_job_finalize (BackgroundJob * obj); @@ -826,138 +1067,201 @@ static void metadata_writer_finalize (GObject * obj); static const gchar* METADATA_WRITER_INTERESTED_PHOTO_METADATA_DETAILS[4] = {"name", "comment", "rating", "exposure-time"}; -static void _metadata_writer_on_config_changed_configuration_facade_commit_metadata_to_masters_changed (ConfigurationFacade* _sender, gpointer self) { +static void +_metadata_writer_on_config_changed_configuration_facade_commit_metadata_to_masters_changed (ConfigurationFacade* _sender, + gpointer self) +{ #line 220 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_config_changed ((MetadataWriter*) self); -#line 833 "MetadataWriter.c" +#line 1077 "MetadataWriter.c" } -static void _metadata_writer_on_importing_photos_media_source_collection_media_import_starting (MediaSourceCollection* _sender, GeeCollection* media, gpointer self) { +static void +_metadata_writer_on_importing_photos_media_source_collection_media_import_starting (MediaSourceCollection* _sender, + GeeCollection* media, + gpointer self) +{ #line 222 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_importing_photos ((MetadataWriter*) self, media); -#line 840 "MetadataWriter.c" +#line 1088 "MetadataWriter.c" } -static void _metadata_writer_on_photos_imported_media_source_collection_media_import_completed (MediaSourceCollection* _sender, GeeCollection* media, gpointer self) { +static void +_metadata_writer_on_photos_imported_media_source_collection_media_import_completed (MediaSourceCollection* _sender, + GeeCollection* media, + gpointer self) +{ #line 223 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_photos_imported ((MetadataWriter*) self, media); -#line 847 "MetadataWriter.c" +#line 1099 "MetadataWriter.c" } -static void _metadata_writer_on_photos_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { +static void +_metadata_writer_on_photos_added_removed_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self) +{ #line 224 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_photos_added_removed ((MetadataWriter*) self, added, removed); -#line 854 "MetadataWriter.c" +#line 1111 "MetadataWriter.c" } -static void _metadata_writer_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_metadata_writer_on_photos_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 225 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_photos_altered ((MetadataWriter*) self, items); -#line 861 "MetadataWriter.c" +#line 1122 "MetadataWriter.c" } -static void _metadata_writer_on_collection_frozen_data_collection_frozen (DataCollection* _sender, gpointer self) { +static void +_metadata_writer_on_collection_frozen_data_collection_frozen (DataCollection* _sender, + gpointer self) +{ #line 226 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_collection_frozen ((MetadataWriter*) self); -#line 868 "MetadataWriter.c" +#line 1132 "MetadataWriter.c" } -static void _metadata_writer_on_collection_thawed_data_collection_thawed (DataCollection* _sender, gpointer self) { +static void +_metadata_writer_on_collection_thawed_data_collection_thawed (DataCollection* _sender, + gpointer self) +{ #line 227 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_collection_thawed ((MetadataWriter*) self); -#line 875 "MetadataWriter.c" +#line 1142 "MetadataWriter.c" } -static void _metadata_writer_on_photos_destroyed_source_collection_items_destroyed (SourceCollection* _sender, GeeCollection* destroyed, gpointer self) { +static void +_metadata_writer_on_photos_destroyed_source_collection_items_destroyed (SourceCollection* _sender, + GeeCollection* destroyed, + gpointer self) +{ #line 228 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_photos_destroyed ((MetadataWriter*) self, destroyed); -#line 882 "MetadataWriter.c" +#line 1153 "MetadataWriter.c" } -static void _metadata_writer_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_metadata_writer_on_tags_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 230 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_tags_altered ((MetadataWriter*) self, items); -#line 889 "MetadataWriter.c" +#line 1164 "MetadataWriter.c" } -static void _metadata_writer_on_tag_contents_altered_container_source_collection_container_contents_altered (ContainerSourceCollection* _sender, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked, gpointer self) { +static void +_metadata_writer_on_tag_contents_altered_container_source_collection_container_contents_altered (ContainerSourceCollection* _sender, + ContainerSource* container, + GeeCollection* added, + gboolean relinked, + GeeCollection* removed, + gboolean unlinked, + gpointer self) +{ #line 231 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_tag_contents_altered ((MetadataWriter*) self, container, added, relinked, removed, unlinked); -#line 896 "MetadataWriter.c" +#line 1179 "MetadataWriter.c" } -static void _metadata_writer_on_tag_backlink_removed_container_source_collection_backlink_to_container_removed (ContainerSourceCollection* _sender, ContainerSource* container, GeeCollection* sources, gpointer self) { +static void +_metadata_writer_on_tag_backlink_removed_container_source_collection_backlink_to_container_removed (ContainerSourceCollection* _sender, + ContainerSource* container, + GeeCollection* sources, + gpointer self) +{ #line 232 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_tag_backlink_removed ((MetadataWriter*) self, container, sources); -#line 903 "MetadataWriter.c" +#line 1191 "MetadataWriter.c" } -static void _metadata_writer_on_application_exiting_application_exiting (Application* _sender, gboolean panicked, gpointer self) { +static void +_metadata_writer_on_application_exiting_application_exiting (Application* _sender, + gboolean panicked, + gpointer self) +{ #line 236 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_application_exiting ((MetadataWriter*) self); -#line 910 "MetadataWriter.c" +#line 1202 "MetadataWriter.c" } -static void _metadata_writer_on_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) { +static void +_metadata_writer_on_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, + LibraryMonitor* monitor, + gpointer self) +{ #line 238 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_monitor_installed ((MetadataWriter*) self, monitor); -#line 917 "MetadataWriter.c" +#line 1213 "MetadataWriter.c" } -static void _metadata_writer_on_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) { +static void +_metadata_writer_on_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, + LibraryMonitor* monitor, + gpointer self) +{ #line 239 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_monitor_destroyed ((MetadataWriter*) self, monitor); -#line 924 "MetadataWriter.c" +#line 1224 "MetadataWriter.c" } -static void _metadata_writer_on_photo_dequeued_dequeued_callback (gconstpointer item, gpointer self) { +static void +_metadata_writer_on_photo_dequeued_dequeued_callback (gconstpointer item, + gpointer self) +{ #line 180 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_photo_dequeued ((MetadataWriter*) self, (LibraryPhoto*) item); -#line 931 "MetadataWriter.c" +#line 1234 "MetadataWriter.c" } -static MetadataWriter* metadata_writer_construct (GType object_type) { +static MetadataWriter* +metadata_writer_construct (GType object_type) +{ MetadataWriter * self = NULL; HashTimedQueue* _tmp0_; HashTimedQueue* _tmp1_; ConfigFacade* _tmp5_; ConfigFacade* _tmp6_; - gboolean _tmp7_; + ConfigFacade* _tmp7_; ConfigFacade* _tmp8_; - ConfigFacade* _tmp9_; + LibraryPhotoSourceCollection* _tmp9_; LibraryPhotoSourceCollection* _tmp10_; LibraryPhotoSourceCollection* _tmp11_; LibraryPhotoSourceCollection* _tmp12_; LibraryPhotoSourceCollection* _tmp13_; LibraryPhotoSourceCollection* _tmp14_; LibraryPhotoSourceCollection* _tmp15_; - LibraryPhotoSourceCollection* _tmp16_; + TagSourceCollection* _tmp16_; TagSourceCollection* _tmp17_; TagSourceCollection* _tmp18_; TagSourceCollection* _tmp19_; TagSourceCollection* _tmp20_; - TagSourceCollection* _tmp21_; + Application* _tmp21_; Application* _tmp22_; - Application* _tmp23_; + LibraryMonitorPool* _tmp23_; LibraryMonitorPool* _tmp24_; LibraryMonitorPool* _tmp25_; LibraryMonitorPool* _tmp26_; - LibraryMonitorPool* _tmp27_; #line 179 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self = (MetadataWriter*) g_object_new (object_type, NULL); #line 180 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -972,7 +1276,7 @@ static MetadataWriter* metadata_writer_construct (GType object_type) { timed_queue_set_dequeue_spacing_msec (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TIMED_QUEUE, TimedQueue), METADATA_WRITER_COMMIT_SPACING_MSEC); #line 186 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_pause (self); -#line 976 "MetadataWriter.c" +#line 1280 "MetadataWriter.c" { const gchar** detail_collection = NULL; gint detail_collection_length1 = 0; @@ -984,14 +1288,14 @@ static MetadataWriter* metadata_writer_construct (GType object_type) { detail_collection_length1 = G_N_ELEMENTS (METADATA_WRITER_INTERESTED_PHOTO_METADATA_DETAILS); #line 189 "/home/jens/Source/shotwell/src/MetadataWriter.vala" for (detail_it = 0; detail_it < G_N_ELEMENTS (METADATA_WRITER_INTERESTED_PHOTO_METADATA_DETAILS); detail_it = detail_it + 1) { -#line 988 "MetadataWriter.c" +#line 1292 "MetadataWriter.c" gchar* _tmp2_; gchar* detail = NULL; #line 189 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp2_ = g_strdup (detail_collection[detail_it]); #line 189 "/home/jens/Source/shotwell/src/MetadataWriter.vala" detail = _tmp2_; -#line 995 "MetadataWriter.c" +#line 1299 "MetadataWriter.c" { GeeHashSet* _tmp3_; const gchar* _tmp4_; @@ -1003,7 +1307,7 @@ static MetadataWriter* metadata_writer_construct (GType object_type) { gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); #line 189 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_free0 (detail); -#line 1007 "MetadataWriter.c" +#line 1311 "MetadataWriter.c" } } } @@ -1012,107 +1316,109 @@ static MetadataWriter* metadata_writer_construct (GType object_type) { #line 193 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp6_ = _tmp5_; #line 193 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp7_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 193 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - self->priv->enabled = _tmp7_; + self->priv->enabled = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 193 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_tmp6_); #line 194 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp8_ = config_facade_get_instance (); + _tmp7_ = config_facade_get_instance (); #line 194 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 194 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "commit-metadata-to-masters-changed", (GCallback) _metadata_writer_on_config_changed_configuration_facade_commit_metadata_to_masters_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "commit-metadata-to-masters-changed", (GCallback) _metadata_writer_on_config_changed_configuration_facade_commit_metadata_to_masters_changed, self, 0); #line 194 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 197 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_force_rescan (self); #line 199 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp10_ = library_photo_global; + _tmp9_ = library_photo_global; #line 199 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "media-import-starting", (GCallback) _metadata_writer_on_importing_photos_media_source_collection_media_import_starting, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "media-import-starting", (GCallback) _metadata_writer_on_importing_photos_media_source_collection_media_import_starting, self, 0); #line 200 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp11_ = library_photo_global; + _tmp10_ = library_photo_global; #line 200 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "media-import-completed", (GCallback) _metadata_writer_on_photos_imported_media_source_collection_media_import_completed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "media-import-completed", (GCallback) _metadata_writer_on_photos_imported_media_source_collection_media_import_completed, self, 0); #line 201 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp12_ = library_photo_global; + _tmp11_ = library_photo_global; #line 201 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _metadata_writer_on_photos_added_removed_data_collection_contents_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _metadata_writer_on_photos_added_removed_data_collection_contents_altered, self, 0); #line 202 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp13_ = library_photo_global; + _tmp12_ = library_photo_global; #line 202 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _metadata_writer_on_photos_altered_data_collection_items_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _metadata_writer_on_photos_altered_data_collection_items_altered, self, 0); #line 203 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp14_ = library_photo_global; + _tmp13_ = library_photo_global; #line 203 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), "frozen", (GCallback) _metadata_writer_on_collection_frozen_data_collection_frozen, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), "frozen", (GCallback) _metadata_writer_on_collection_frozen_data_collection_frozen, self, 0); #line 204 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp15_ = library_photo_global; + _tmp14_ = library_photo_global; #line 204 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_COLLECTION, DataCollection), "thawed", (GCallback) _metadata_writer_on_collection_thawed_data_collection_thawed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), "thawed", (GCallback) _metadata_writer_on_collection_thawed_data_collection_thawed, self, 0); #line 205 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp16_ = library_photo_global; + _tmp15_ = library_photo_global; #line 205 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-destroyed", (GCallback) _metadata_writer_on_photos_destroyed_source_collection_items_destroyed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-destroyed", (GCallback) _metadata_writer_on_photos_destroyed_source_collection_items_destroyed, self, 0); #line 207 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp17_ = tag_global; + _tmp16_ = tag_global; #line 207 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _metadata_writer_on_tags_altered_data_collection_items_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _metadata_writer_on_tags_altered_data_collection_items_altered, self, 0); #line 208 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp18_ = tag_global; + _tmp17_ = tag_global; #line 208 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), "container-contents-altered", (GCallback) _metadata_writer_on_tag_contents_altered_container_source_collection_container_contents_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), "container-contents-altered", (GCallback) _metadata_writer_on_tag_contents_altered_container_source_collection_container_contents_altered, self, 0); #line 209 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp19_ = tag_global; + _tmp18_ = tag_global; #line 209 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), "backlink-to-container-removed", (GCallback) _metadata_writer_on_tag_backlink_removed_container_source_collection_backlink_to_container_removed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), "backlink-to-container-removed", (GCallback) _metadata_writer_on_tag_backlink_removed_container_source_collection_backlink_to_container_removed, self, 0); #line 210 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp20_ = tag_global; + _tmp19_ = tag_global; #line 210 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), "frozen", (GCallback) _metadata_writer_on_collection_frozen_data_collection_frozen, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_COLLECTION, DataCollection), "frozen", (GCallback) _metadata_writer_on_collection_frozen_data_collection_frozen, self, 0); #line 211 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp21_ = tag_global; + _tmp20_ = tag_global; #line 211 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection), "thawed", (GCallback) _metadata_writer_on_collection_thawed_data_collection_thawed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), "thawed", (GCallback) _metadata_writer_on_collection_thawed_data_collection_thawed, self, 0); #line 213 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp22_ = application_get_instance (); + _tmp21_ = application_get_instance (); #line 213 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp23_ = _tmp22_; + _tmp22_ = _tmp21_; #line 213 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_connect_object (_tmp23_, "exiting", (GCallback) _metadata_writer_on_application_exiting_application_exiting, self, 0); + g_signal_connect_object (_tmp22_, "exiting", (GCallback) _metadata_writer_on_application_exiting_application_exiting, self, 0); #line 213 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _application_unref0 (_tmp23_); + _application_unref0 (_tmp22_); #line 215 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp24_ = library_monitor_pool_get_instance (); + _tmp23_ = library_monitor_pool_get_instance (); #line 215 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp25_ = _tmp24_; + _tmp24_ = _tmp23_; #line 215 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_connect_object (_tmp25_, "monitor-installed", (GCallback) _metadata_writer_on_monitor_installed_library_monitor_pool_monitor_installed, self, 0); + g_signal_connect_object (_tmp24_, "monitor-installed", (GCallback) _metadata_writer_on_monitor_installed_library_monitor_pool_monitor_installed, self, 0); #line 215 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _library_monitor_pool_unref0 (_tmp25_); + _library_monitor_pool_unref0 (_tmp24_); #line 216 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp26_ = library_monitor_pool_get_instance (); + _tmp25_ = library_monitor_pool_get_instance (); #line 216 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp27_ = _tmp26_; + _tmp26_ = _tmp25_; #line 216 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_connect_object (_tmp27_, "monitor-destroyed", (GCallback) _metadata_writer_on_monitor_destroyed_library_monitor_pool_monitor_destroyed, self, 0); + g_signal_connect_object (_tmp26_, "monitor-destroyed", (GCallback) _metadata_writer_on_monitor_destroyed_library_monitor_pool_monitor_destroyed, self, 0); #line 216 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _library_monitor_pool_unref0 (_tmp27_); + _library_monitor_pool_unref0 (_tmp26_); #line 179 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return self; -#line 1105 "MetadataWriter.c" +#line 1407 "MetadataWriter.c" } -static MetadataWriter* metadata_writer_new (void) { +static MetadataWriter* +metadata_writer_new (void) +{ #line 179 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return metadata_writer_construct (TYPE_METADATA_WRITER); -#line 1112 "MetadataWriter.c" +#line 1416 "MetadataWriter.c" } -void metadata_writer_init (void) { +void +metadata_writer_init (void) +{ MetadataWriter* _tmp0_; #line 243 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = metadata_writer_new (); @@ -1120,40 +1426,46 @@ void metadata_writer_init (void) { _g_object_unref0 (metadata_writer_instance); #line 243 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_instance = _tmp0_; -#line 1124 "MetadataWriter.c" +#line 1430 "MetadataWriter.c" } -void metadata_writer_terminate (void) { +void +metadata_writer_terminate (void) +{ MetadataWriter* _tmp0_; #line 247 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = metadata_writer_instance; #line 247 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp0_ != NULL) { -#line 1134 "MetadataWriter.c" +#line 1442 "MetadataWriter.c" MetadataWriter* _tmp1_; #line 248 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp1_ = metadata_writer_instance; #line 248 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_close (_tmp1_); -#line 1140 "MetadataWriter.c" +#line 1448 "MetadataWriter.c" } #line 250 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (metadata_writer_instance); #line 250 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_instance = NULL; -#line 1146 "MetadataWriter.c" +#line 1454 "MetadataWriter.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 254 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return self ? g_object_ref (self) : NULL; -#line 1153 "MetadataWriter.c" +#line 1463 "MetadataWriter.c" } -MetadataWriter* metadata_writer_get_instance (void) { +MetadataWriter* +metadata_writer_get_instance (void) +{ MetadataWriter* result = NULL; MetadataWriter* _tmp0_; MetadataWriter* _tmp1_; @@ -1165,11 +1477,13 @@ MetadataWriter* metadata_writer_get_instance (void) { result = _tmp1_; #line 254 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return result; -#line 1169 "MetadataWriter.c" +#line 1481 "MetadataWriter.c" } -void metadata_writer_force_rescan (MetadataWriter* self) { +void +metadata_writer_force_rescan (MetadataWriter* self) +{ LibraryPhotoSourceCollection* _tmp0_; GeeCollection* _tmp1_; GeeCollection* _tmp2_; @@ -1185,11 +1499,13 @@ void metadata_writer_force_rescan (MetadataWriter* self) { metadata_writer_schedule_if_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable), "force rescan"); #line 259 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_tmp2_); -#line 1189 "MetadataWriter.c" +#line 1503 "MetadataWriter.c" } -void metadata_writer_pause (MetadataWriter* self) { +void +metadata_writer_pause (MetadataWriter* self) +{ gint _tmp0_; HashTimedQueue* _tmp1_; #line 262 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1202,7 +1518,7 @@ void metadata_writer_pause (MetadataWriter* self) { if (_tmp0_ != 0) { #line 264 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 1206 "MetadataWriter.c" +#line 1522 "MetadataWriter.c" } #line 266 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp1_ = self->priv->dirty; @@ -1210,11 +1526,13 @@ void metadata_writer_pause (MetadataWriter* self) { timed_queue_pause (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TIMED_QUEUE, TimedQueue)); #line 268 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_signal_emit (self, metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL], 0, (guint) 0, (guint) 0); -#line 1214 "MetadataWriter.c" +#line 1530 "MetadataWriter.c" } -void metadata_writer_unpause (MetadataWriter* self) { +void +metadata_writer_unpause (MetadataWriter* self) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; HashTimedQueue* _tmp4_; @@ -1226,7 +1544,7 @@ void metadata_writer_unpause (MetadataWriter* self) { if (_tmp1_ == 0) { #line 272 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = TRUE; -#line 1230 "MetadataWriter.c" +#line 1548 "MetadataWriter.c" } else { gint _tmp2_; gint _tmp3_; @@ -1238,23 +1556,25 @@ void metadata_writer_unpause (MetadataWriter* self) { _tmp3_ = self->priv->pause_count; #line 272 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = _tmp3_ != 0; -#line 1242 "MetadataWriter.c" +#line 1560 "MetadataWriter.c" } #line 272 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp0_) { #line 273 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 1248 "MetadataWriter.c" +#line 1566 "MetadataWriter.c" } #line 275 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp4_ = self->priv->dirty; #line 275 "/home/jens/Source/shotwell/src/MetadataWriter.vala" timed_queue_unpause (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_TIMED_QUEUE, TimedQueue)); -#line 1254 "MetadataWriter.c" +#line 1572 "MetadataWriter.c" } -void metadata_writer_close (MetadataWriter* self) { +void +metadata_writer_close (MetadataWriter* self) +{ gboolean _tmp0_; #line 278 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); @@ -1264,17 +1584,19 @@ void metadata_writer_close (MetadataWriter* self) { if (_tmp0_) { #line 280 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 1268 "MetadataWriter.c" +#line 1588 "MetadataWriter.c" } #line 282 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_cancel_all (self, TRUE); #line 284 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->priv->closed = TRUE; -#line 1274 "MetadataWriter.c" +#line 1594 "MetadataWriter.c" } -static void metadata_writer_on_config_changed (MetadataWriter* self) { +static void +metadata_writer_on_config_changed (MetadataWriter* self) +{ gboolean value = FALSE; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; @@ -1283,7 +1605,6 @@ static void metadata_writer_on_config_changed (MetadataWriter* self) { gboolean _tmp4_; gboolean _tmp5_; gboolean _tmp6_; - gboolean _tmp7_; #line 287 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 288 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1292,118 +1613,129 @@ static void metadata_writer_on_config_changed (MetadataWriter* self) { _tmp1_ = _tmp0_; #line 288 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp2_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 288 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp3_ = _tmp2_; #line 288 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_tmp1_); #line 288 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - value = _tmp3_; + value = _tmp2_; #line 290 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp4_ = self->priv->enabled; + _tmp3_ = self->priv->enabled; #line 290 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp5_ = value; + _tmp4_ = value; #line 290 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp4_ == _tmp5_) { + if (_tmp3_ == _tmp4_) { #line 291 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 1310 "MetadataWriter.c" +#line 1629 "MetadataWriter.c" } #line 293 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp6_ = value; + _tmp5_ = value; #line 293 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - self->priv->enabled = _tmp6_; + self->priv->enabled = _tmp5_; #line 294 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp7_ = self->priv->enabled; + _tmp6_ = self->priv->enabled; #line 294 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp7_) { + if (_tmp6_) { #line 295 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_force_rescan (self); -#line 1322 "MetadataWriter.c" +#line 1641 "MetadataWriter.c" } else { #line 297 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_cancel_all (self, FALSE); -#line 1326 "MetadataWriter.c" +#line 1645 "MetadataWriter.c" } } -static void metadata_writer_on_application_exiting (MetadataWriter* self) { +static void +metadata_writer_on_application_exiting (MetadataWriter* self) +{ #line 300 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 301 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_close (self); -#line 1336 "MetadataWriter.c" +#line 1657 "MetadataWriter.c" } -static void _metadata_writer_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) { +static void +_metadata_writer_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, + gpointer self) +{ #line 305 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_discovery_completed ((MetadataWriter*) self); -#line 1343 "MetadataWriter.c" +#line 1667 "MetadataWriter.c" } -static void metadata_writer_on_monitor_installed (MetadataWriter* self, LibraryMonitor* monitor) { - LibraryMonitor* _tmp0_; +static void +metadata_writer_on_monitor_installed (MetadataWriter* self, + LibraryMonitor* monitor) +{ #line 304 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 304 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_LIBRARY_MONITOR (monitor)); #line 305 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp0_ = monitor; -#line 305 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-completed", (GCallback) _metadata_writer_on_discovery_completed_directory_monitor_discovery_completed, self, 0); -#line 1357 "MetadataWriter.c" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-completed", (GCallback) _metadata_writer_on_discovery_completed_directory_monitor_discovery_completed, self, 0); +#line 1681 "MetadataWriter.c" } -static void metadata_writer_on_monitor_destroyed (MetadataWriter* self, LibraryMonitor* monitor) { - LibraryMonitor* _tmp0_; - guint _tmp1_; +static void +metadata_writer_on_monitor_destroyed (MetadataWriter* self, + LibraryMonitor* monitor) +{ + guint _tmp0_; #line 308 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 308 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_LIBRARY_MONITOR (monitor)); #line 309 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp0_ = monitor; + g_signal_parse_name ("discovery-completed", TYPE_DIRECTORY_MONITOR, &_tmp0_, NULL, FALSE); #line 309 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_parse_name ("discovery-completed", TYPE_DIRECTORY_MONITOR, &_tmp1_, NULL, FALSE); -#line 309 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _metadata_writer_on_discovery_completed_directory_monitor_discovery_completed, self); -#line 1374 "MetadataWriter.c" + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _metadata_writer_on_discovery_completed_directory_monitor_discovery_completed, self); +#line 1698 "MetadataWriter.c" } -static void metadata_writer_on_discovery_completed (MetadataWriter* self) { +static void +metadata_writer_on_discovery_completed (MetadataWriter* self) +{ #line 312 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 313 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_unpause (self); -#line 1383 "MetadataWriter.c" +#line 1709 "MetadataWriter.c" } -static void metadata_writer_on_collection_frozen (MetadataWriter* self) { +static void +metadata_writer_on_collection_frozen (MetadataWriter* self) +{ #line 316 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 317 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_pause (self); -#line 1392 "MetadataWriter.c" +#line 1720 "MetadataWriter.c" } -static void metadata_writer_on_collection_thawed (MetadataWriter* self) { +static void +metadata_writer_on_collection_thawed (MetadataWriter* self) +{ #line 320 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 321 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_unpause (self); -#line 1401 "MetadataWriter.c" +#line 1731 "MetadataWriter.c" } -static void metadata_writer_on_importing_photos (MetadataWriter* self, GeeCollection* media_sources) { +static void +metadata_writer_on_importing_photos (MetadataWriter* self, + GeeCollection* media_sources) +{ GeeHashSet* _tmp0_; - GeeCollection* _tmp1_; #line 324 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 324 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1411,16 +1743,16 @@ static void metadata_writer_on_importing_photos (MetadataWriter* self, GeeCollec #line 325 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = self->priv->importing_photos; #line 325 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp1_ = media_sources; -#line 325 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1418 "MetadataWriter.c" + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (media_sources, GEE_TYPE_COLLECTION, GeeCollection)); +#line 1748 "MetadataWriter.c" } -static void metadata_writer_on_photos_imported (MetadataWriter* self, GeeCollection* media_sources) { +static void +metadata_writer_on_photos_imported (MetadataWriter* self, + GeeCollection* media_sources) +{ GeeHashSet* _tmp0_; - GeeCollection* _tmp1_; #line 328 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 328 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1428,17 +1760,17 @@ static void metadata_writer_on_photos_imported (MetadataWriter* self, GeeCollect #line 329 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = self->priv->importing_photos; #line 329 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp1_ = media_sources; -#line 329 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1435 "MetadataWriter.c" + gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (media_sources, GEE_TYPE_COLLECTION, GeeCollection)); +#line 1765 "MetadataWriter.c" } -static void metadata_writer_on_photos_added_removed (MetadataWriter* self, GeeIterable* added, GeeIterable* removed) { +static void +metadata_writer_on_photos_added_removed (MetadataWriter* self, + GeeIterable* added, + GeeIterable* removed) +{ gboolean _tmp0_ = FALSE; - GeeIterable* _tmp1_; - GeeIterable* _tmp4_; #line 332 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 332 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1446,255 +1778,229 @@ static void metadata_writer_on_photos_added_removed (MetadataWriter* self, GeeIt #line 332 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); #line 335 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp1_ = added; -#line 335 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp1_ != NULL) { -#line 1453 "MetadataWriter.c" - gboolean _tmp2_; + if (added != NULL) { +#line 1783 "MetadataWriter.c" + gboolean _tmp1_; #line 335 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp2_ = self->priv->enabled; + _tmp1_ = self->priv->enabled; #line 335 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp0_ = _tmp2_; -#line 1459 "MetadataWriter.c" + _tmp0_ = _tmp1_; +#line 1789 "MetadataWriter.c" } else { #line 335 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = FALSE; -#line 1463 "MetadataWriter.c" +#line 1793 "MetadataWriter.c" } #line 335 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp0_) { -#line 1467 "MetadataWriter.c" - GeeIterable* _tmp3_; #line 336 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp3_ = added; -#line 336 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - metadata_writer_schedule_if_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable), "added to LibraryPhoto.global"); -#line 1473 "MetadataWriter.c" + metadata_writer_schedule_if_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_ITERABLE, GeeIterable), "added to LibraryPhoto.global"); +#line 1799 "MetadataWriter.c" } #line 339 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp4_ = removed; -#line 339 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp4_ != NULL) { -#line 1479 "MetadataWriter.c" + if (removed != NULL) { +#line 1803 "MetadataWriter.c" gboolean cancelled = FALSE; - gboolean _tmp15_; + gboolean _tmp9_; #line 340 "/home/jens/Source/shotwell/src/MetadataWriter.vala" cancelled = FALSE; -#line 1484 "MetadataWriter.c" +#line 1808 "MetadataWriter.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp5_; - GeeIterator* _tmp6_; -#line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp5_ = removed; + GeeIterator* _tmp2_; #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp6_ = gee_iterable_iterator (_tmp5_); + _tmp2_ = gee_iterable_iterator (removed); #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _object_it = _tmp6_; + _object_it = _tmp2_; #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 1497 "MetadataWriter.c" - GeeIterator* _tmp7_; - gboolean _tmp8_; +#line 1818 "MetadataWriter.c" + GeeIterator* _tmp3_; DataObject* object = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; - gboolean _tmp11_ = FALSE; - DataObject* _tmp12_; - gboolean _tmp13_; + GeeIterator* _tmp4_; + gpointer _tmp5_; + gboolean _tmp6_ = FALSE; + DataObject* _tmp7_; #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp7_ = _object_it; + _tmp3_ = _object_it; #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp8_ = gee_iterator_next (_tmp7_); -#line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp3_)) { #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 1514 "MetadataWriter.c" +#line 1831 "MetadataWriter.c" } #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp9_ = _object_it; + _tmp4_ = _object_it; #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - object = (DataObject*) _tmp10_; -#line 342 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp12_ = object; + object = (DataObject*) _tmp5_; #line 342 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp13_ = metadata_writer_cancel_job (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp7_ = object; #line 342 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp13_) { + if (metadata_writer_cancel_job (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto))) { #line 342 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp11_ = TRUE; -#line 1530 "MetadataWriter.c" + _tmp6_ = TRUE; +#line 1845 "MetadataWriter.c" } else { - gboolean _tmp14_; + gboolean _tmp8_; #line 342 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp14_ = cancelled; + _tmp8_ = cancelled; #line 342 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp11_ = _tmp14_; -#line 1537 "MetadataWriter.c" + _tmp6_ = _tmp8_; +#line 1852 "MetadataWriter.c" } #line 342 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - cancelled = _tmp11_; + cancelled = _tmp6_; #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (object); -#line 1543 "MetadataWriter.c" +#line 1858 "MetadataWriter.c" } #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_object_it); -#line 1547 "MetadataWriter.c" +#line 1862 "MetadataWriter.c" } #line 344 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp15_ = cancelled; + _tmp9_ = cancelled; #line 344 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp15_) { -#line 1553 "MetadataWriter.c" - guint _tmp16_; - guint _tmp17_; + if (_tmp9_) { +#line 1868 "MetadataWriter.c" + guint _tmp10_; + guint _tmp11_; #line 345 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp16_ = self->priv->outstanding_completed; + _tmp10_ = self->priv->outstanding_completed; #line 345 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp17_ = self->priv->outstanding_total; + _tmp11_ = self->priv->outstanding_total; #line 345 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_emit (self, metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL], 0, _tmp16_, _tmp17_); -#line 1562 "MetadataWriter.c" + g_signal_emit (self, metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL], 0, _tmp10_, _tmp11_); +#line 1877 "MetadataWriter.c" } } } -static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* items) { +static void +metadata_writer_on_photos_altered (MetadataWriter* self, + GeeMap* items) +{ GeeHashSet* photos = NULL; - GeeHashSet* _tmp39_; + GeeHashSet* _tmp33_; #line 349 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 349 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (GEE_IS_MAP (items)); #line 350 "/home/jens/Source/shotwell/src/MetadataWriter.vala" photos = NULL; -#line 1577 "MetadataWriter.c" +#line 1895 "MetadataWriter.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp0_ = items; + _tmp0_ = gee_map_get_keys (items); #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp2_ = _tmp1_; #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp3_ = _tmp2_; -#line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 1604 "MetadataWriter.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 1919 "MetadataWriter.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp6_; + gpointer _tmp7_; LibraryPhoto* photo = NULL; - DataObject* _tmp10_; + DataObject* _tmp8_; + LibraryPhoto* _tmp9_; + LibraryPhoto* _tmp10_; LibraryPhoto* _tmp11_; - LibraryPhoto* _tmp12_; - LibraryPhoto* _tmp13_; Alteration* alteration = NULL; - GeeMap* _tmp14_; - DataObject* _tmp15_; - gpointer _tmp16_; - Alteration* _tmp17_; - gboolean _tmp18_; + DataObject* _tmp12_; + gpointer _tmp13_; + Alteration* _tmp14_; GeeCollection* details = NULL; - Alteration* _tmp23_; - GeeCollection* _tmp24_; - GeeCollection* _tmp25_; -#line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp6_ = _object_it; + Alteration* _tmp19_; + GeeCollection* _tmp20_; + GeeCollection* _tmp21_; #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 1633 "MetadataWriter.c" +#line 1943 "MetadataWriter.c" } #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - object = (DataObject*) _tmp9_; + object = (DataObject*) _tmp7_; #line 352 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp10_ = object; + _tmp8_ = object; #line 352 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 352 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo = _tmp11_; + photo = _tmp9_; #line 356 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp12_ = photo; + _tmp10_ = photo; #line 356 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp13_ = self->priv->ignore_photo_alteration; + _tmp11_ = self->priv->ignore_photo_alteration; #line 356 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp12_ == _tmp13_) { + if (_tmp10_ == _tmp11_) { #line 357 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); #line 357 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (object); #line 357 "/home/jens/Source/shotwell/src/MetadataWriter.vala" continue; -#line 1659 "MetadataWriter.c" +#line 1969 "MetadataWriter.c" } #line 359 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp14_ = items; -#line 359 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp15_ = object; + _tmp12_ = object; #line 359 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp16_ = gee_map_get (_tmp14_, _tmp15_); + _tmp13_ = gee_map_get (items, _tmp12_); #line 359 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - alteration = (Alteration*) _tmp16_; + alteration = (Alteration*) _tmp13_; #line 362 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp17_ = alteration; + _tmp14_ = alteration; #line 362 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp18_ = alteration_has_detail (_tmp17_, "image", "orientation"); -#line 362 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp18_) { -#line 1675 "MetadataWriter.c" - GeeHashSet* _tmp19_; - GeeHashSet* _tmp21_; - LibraryPhoto* _tmp22_; + if (alteration_has_detail (_tmp14_, "image", "orientation")) { +#line 1981 "MetadataWriter.c" + GeeHashSet* _tmp15_; + GeeHashSet* _tmp17_; + LibraryPhoto* _tmp18_; #line 363 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp19_ = photos; + _tmp15_ = photos; #line 363 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp19_ == NULL) { -#line 1683 "MetadataWriter.c" - GeeHashSet* _tmp20_; + if (_tmp15_ == NULL) { +#line 1989 "MetadataWriter.c" + GeeHashSet* _tmp16_; #line 364 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp20_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp16_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 364 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photos); #line 364 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photos = _tmp20_; -#line 1691 "MetadataWriter.c" + photos = _tmp16_; +#line 1997 "MetadataWriter.c" } #line 366 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp21_ = photos; + _tmp17_ = photos; #line 366 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp22_ = photo; + _tmp18_ = photo; #line 366 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_); #line 368 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _alteration_unref0 (alteration); #line 368 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1703,18 +2009,18 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite _g_object_unref0 (object); #line 368 "/home/jens/Source/shotwell/src/MetadataWriter.vala" continue; -#line 1707 "MetadataWriter.c" +#line 2013 "MetadataWriter.c" } #line 372 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp23_ = alteration; + _tmp19_ = alteration; #line 372 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp24_ = alteration_get_details (_tmp23_, "metadata"); + _tmp20_ = alteration_get_details (_tmp19_, "metadata"); #line 372 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - details = _tmp24_; + details = _tmp20_; #line 373 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp25_ = details; + _tmp21_ = details; #line 373 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp25_ == NULL) { + if (_tmp21_ == NULL) { #line 374 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (details); #line 374 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1725,90 +2031,84 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite _g_object_unref0 (object); #line 374 "/home/jens/Source/shotwell/src/MetadataWriter.vala" continue; -#line 1729 "MetadataWriter.c" +#line 2035 "MetadataWriter.c" } { GeeIterator* _detail_it = NULL; - GeeCollection* _tmp26_; - GeeIterator* _tmp27_; + GeeCollection* _tmp22_; + GeeIterator* _tmp23_; #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp26_ = details; + _tmp22_ = details; #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp27_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp23_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ITERABLE, GeeIterable)); #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _detail_it = _tmp27_; + _detail_it = _tmp23_; #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 1743 "MetadataWriter.c" - GeeIterator* _tmp28_; - gboolean _tmp29_; +#line 2049 "MetadataWriter.c" + GeeIterator* _tmp24_; gchar* detail = NULL; - GeeIterator* _tmp30_; - gpointer _tmp31_; - GeeHashSet* _tmp32_; - const gchar* _tmp33_; - gboolean _tmp34_; -#line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp28_ = _detail_it; + GeeIterator* _tmp25_; + gpointer _tmp26_; + GeeHashSet* _tmp27_; + const gchar* _tmp28_; #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp29_ = gee_iterator_next (_tmp28_); + _tmp24_ = _detail_it; #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (!_tmp29_) { + if (!gee_iterator_next (_tmp24_)) { #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 1760 "MetadataWriter.c" +#line 2062 "MetadataWriter.c" } #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp30_ = _detail_it; + _tmp25_ = _detail_it; #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp31_ = gee_iterator_get (_tmp30_); + _tmp26_ = gee_iterator_get (_tmp25_); #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - detail = (gchar*) _tmp31_; + detail = (gchar*) _tmp26_; #line 378 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp32_ = self->priv->interested_photo_details; + _tmp27_ = self->priv->interested_photo_details; #line 378 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp33_ = detail; + _tmp28_ = detail; #line 378 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp34_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp33_); -#line 378 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp34_) { -#line 1776 "MetadataWriter.c" - GeeHashSet* _tmp35_; - GeeHashSet* _tmp37_; - LibraryPhoto* _tmp38_; + if (gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_)) { +#line 2076 "MetadataWriter.c" + GeeHashSet* _tmp29_; + GeeHashSet* _tmp31_; + LibraryPhoto* _tmp32_; #line 379 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp35_ = photos; + _tmp29_ = photos; #line 379 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp35_ == NULL) { -#line 1784 "MetadataWriter.c" - GeeHashSet* _tmp36_; + if (_tmp29_ == NULL) { +#line 2084 "MetadataWriter.c" + GeeHashSet* _tmp30_; #line 380 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp36_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp30_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 380 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photos); #line 380 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photos = _tmp36_; -#line 1792 "MetadataWriter.c" + photos = _tmp30_; +#line 2092 "MetadataWriter.c" } #line 382 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp37_ = photos; + _tmp31_ = photos; #line 382 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp38_ = photo; + _tmp32_ = photo; #line 382 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp38_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp32_); #line 384 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_free0 (detail); #line 384 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 1804 "MetadataWriter.c" +#line 2104 "MetadataWriter.c" } #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_free0 (detail); -#line 1808 "MetadataWriter.c" +#line 2108 "MetadataWriter.c" } #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_detail_it); -#line 1812 "MetadataWriter.c" +#line 2112 "MetadataWriter.c" } #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (details); @@ -1818,320 +2118,309 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite _g_object_unref0 (photo); #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (object); -#line 1822 "MetadataWriter.c" +#line 2122 "MetadataWriter.c" } #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_object_it); -#line 1826 "MetadataWriter.c" +#line 2126 "MetadataWriter.c" } #line 389 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp39_ = photos; + _tmp33_ = photos; #line 389 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp39_ != NULL) { -#line 1832 "MetadataWriter.c" - GeeHashSet* _tmp40_; + if (_tmp33_ != NULL) { +#line 2132 "MetadataWriter.c" + GeeHashSet* _tmp34_; #line 390 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp40_ = photos; + _tmp34_ = photos; #line 390 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - metadata_writer_photos_are_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_COLLECTION, GeeCollection), "alteration", FALSE); -#line 1838 "MetadataWriter.c" + metadata_writer_photos_are_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection), "alteration", FALSE); +#line 2138 "MetadataWriter.c" } #line 349 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photos); -#line 1842 "MetadataWriter.c" +#line 2142 "MetadataWriter.c" } -static void metadata_writer_on_photos_destroyed (MetadataWriter* self, GeeCollection* destroyed) { +static void +metadata_writer_on_photos_destroyed (MetadataWriter* self, + GeeCollection* destroyed) +{ #line 393 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 393 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (GEE_IS_COLLECTION (destroyed)); -#line 1851 "MetadataWriter.c" +#line 2154 "MetadataWriter.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; -#line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp0_ = destroyed; + GeeIterator* _tmp0_; #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (destroyed, GEE_TYPE_ITERABLE, GeeIterable)); #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _source_it = _tmp1_; + _source_it = _tmp0_; #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 1864 "MetadataWriter.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 2164 "MetadataWriter.c" + GeeIterator* _tmp1_; DataSource* source = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; LibraryPhoto* photo = NULL; - DataSource* _tmp6_; - LibraryPhoto* _tmp7_; + DataSource* _tmp4_; + LibraryPhoto* _tmp5_; + LibraryPhoto* _tmp6_; + GeeHashSet* _tmp7_; LibraryPhoto* _tmp8_; - GeeHashSet* _tmp9_; - LibraryPhoto* _tmp10_; -#line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp2_ = _source_it; #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _source_it; #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 1884 "MetadataWriter.c" +#line 2181 "MetadataWriter.c" } #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp4_ = _source_it; + _tmp2_ = _source_it; #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - source = (DataSource*) _tmp5_; + source = (DataSource*) _tmp3_; #line 395 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp6_ = source; + _tmp4_ = source; #line 395 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 395 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo = _tmp7_; + photo = _tmp5_; #line 396 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp8_ = photo; + _tmp6_ = photo; #line 396 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - metadata_writer_cancel_job (self, _tmp8_); + metadata_writer_cancel_job (self, _tmp6_); #line 397 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp9_ = self->priv->importing_photos; + _tmp7_ = self->priv->importing_photos; #line 397 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp10_ = photo; + _tmp8_ = photo; #line 397 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_); #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (source); -#line 1912 "MetadataWriter.c" +#line 2209 "MetadataWriter.c" } #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_source_it); -#line 1916 "MetadataWriter.c" +#line 2213 "MetadataWriter.c" } } -static void metadata_writer_on_tags_altered (MetadataWriter* self, GeeMap* map) { +static void +metadata_writer_on_tags_altered (MetadataWriter* self, + GeeMap* map) +{ GeeHashSet* photos = NULL; - GeeHashSet* _tmp32_; + GeeHashSet* _tmp27_; #line 401 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 401 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (GEE_IS_MAP (map)); #line 402 "/home/jens/Source/shotwell/src/MetadataWriter.vala" photos = NULL; -#line 1930 "MetadataWriter.c" +#line 2230 "MetadataWriter.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp0_ = map; + _tmp0_ = gee_map_get_keys (map); #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp2_ = _tmp1_; #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp3_ = _tmp2_; -#line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 1957 "MetadataWriter.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 2254 "MetadataWriter.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; + GeeIterator* _tmp6_; + gpointer _tmp7_; + DataObject* _tmp8_; gpointer _tmp9_; - GeeMap* _tmp10_; - DataObject* _tmp11_; - gpointer _tmp12_; - Alteration* _tmp13_; - gboolean _tmp14_; - gboolean _tmp15_; - GeeHashSet* _tmp16_; -#line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp6_ = _object_it; + Alteration* _tmp10_; + gboolean _tmp11_; + GeeHashSet* _tmp12_; #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 1978 "MetadataWriter.c" +#line 2270 "MetadataWriter.c" } #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - object = (DataObject*) _tmp9_; -#line 404 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp10_ = map; -#line 404 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp11_ = object; + object = (DataObject*) _tmp7_; #line 404 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp12_ = gee_map_get (_tmp10_, _tmp11_); + _tmp8_ = object; #line 404 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp13_ = (Alteration*) _tmp12_; + _tmp9_ = gee_map_get (map, _tmp8_); #line 404 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp14_ = alteration_has_detail (_tmp13_, "metadata", "name"); + _tmp10_ = (Alteration*) _tmp9_; #line 404 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp15_ = !_tmp14_; + _tmp11_ = !alteration_has_detail (_tmp10_, "metadata", "name"); #line 404 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _alteration_unref0 (_tmp13_); + _alteration_unref0 (_tmp10_); #line 404 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp15_) { + if (_tmp11_) { #line 405 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (object); #line 405 "/home/jens/Source/shotwell/src/MetadataWriter.vala" continue; -#line 2006 "MetadataWriter.c" +#line 2294 "MetadataWriter.c" } #line 407 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp16_ = photos; + _tmp12_ = photos; #line 407 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp16_ == NULL) { -#line 2012 "MetadataWriter.c" - GeeHashSet* _tmp17_; + if (_tmp12_ == NULL) { +#line 2300 "MetadataWriter.c" + GeeHashSet* _tmp13_; #line 408 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp17_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp13_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 408 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photos); #line 408 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photos = _tmp17_; -#line 2020 "MetadataWriter.c" + photos = _tmp13_; +#line 2308 "MetadataWriter.c" } { GeeIterator* _media_it = NULL; - DataObject* _tmp18_; - GeeCollection* _tmp19_; - GeeCollection* _tmp20_; - GeeIterator* _tmp21_; - GeeIterator* _tmp22_; + DataObject* _tmp14_; + GeeCollection* _tmp15_; + GeeCollection* _tmp16_; + GeeIterator* _tmp17_; + GeeIterator* _tmp18_; #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp18_ = object; + _tmp14_ = object; #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp19_ = tag_get_sources (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_TAG, Tag)); + _tmp15_ = tag_get_sources (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_TAG, Tag)); #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp20_ = _tmp19_; + _tmp16_ = _tmp15_; #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp21_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp17_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ITERABLE, GeeIterable)); #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp22_ = _tmp21_; + _tmp18_ = _tmp17_; #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp16_); #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _media_it = _tmp22_; + _media_it = _tmp18_; #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 2045 "MetadataWriter.c" - GeeIterator* _tmp23_; - gboolean _tmp24_; +#line 2333 "MetadataWriter.c" + GeeIterator* _tmp19_; MediaSource* media = NULL; - GeeIterator* _tmp25_; - gpointer _tmp26_; + GeeIterator* _tmp20_; + gpointer _tmp21_; LibraryPhoto* photo = NULL; - MediaSource* _tmp27_; - LibraryPhoto* _tmp28_; - LibraryPhoto* _tmp29_; + MediaSource* _tmp22_; + LibraryPhoto* _tmp23_; + LibraryPhoto* _tmp24_; #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp23_ = _media_it; + _tmp19_ = _media_it; #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp24_ = gee_iterator_next (_tmp23_); -#line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (!_tmp24_) { + if (!gee_iterator_next (_tmp19_)) { #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 2063 "MetadataWriter.c" +#line 2348 "MetadataWriter.c" } #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp25_ = _media_it; + _tmp20_ = _media_it; #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp26_ = gee_iterator_get (_tmp25_); + _tmp21_ = gee_iterator_get (_tmp20_); #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - media = (MediaSource*) _tmp26_; + media = (MediaSource*) _tmp21_; #line 411 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp27_ = media; + _tmp22_ = media; #line 411 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp27_) : NULL); + _tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp22_) : NULL); #line 411 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo = _tmp28_; + photo = _tmp23_; #line 412 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp29_ = photo; + _tmp24_ = photo; #line 412 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp29_ != NULL) { -#line 2081 "MetadataWriter.c" - GeeHashSet* _tmp30_; - LibraryPhoto* _tmp31_; + if (_tmp24_ != NULL) { +#line 2366 "MetadataWriter.c" + GeeHashSet* _tmp25_; + LibraryPhoto* _tmp26_; #line 413 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp30_ = photos; + _tmp25_ = photos; #line 413 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp31_ = photo; + _tmp26_ = photo; #line 413 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp31_); -#line 2090 "MetadataWriter.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_); +#line 2375 "MetadataWriter.c" } #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (media); -#line 2096 "MetadataWriter.c" +#line 2381 "MetadataWriter.c" } #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_media_it); -#line 2100 "MetadataWriter.c" +#line 2385 "MetadataWriter.c" } #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (object); -#line 2104 "MetadataWriter.c" +#line 2389 "MetadataWriter.c" } #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_object_it); -#line 2108 "MetadataWriter.c" +#line 2393 "MetadataWriter.c" } #line 417 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp32_ = photos; + _tmp27_ = photos; #line 417 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp32_ != NULL) { -#line 2114 "MetadataWriter.c" - GeeHashSet* _tmp33_; + if (_tmp27_ != NULL) { +#line 2399 "MetadataWriter.c" + GeeHashSet* _tmp28_; #line 418 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp33_ = photos; + _tmp28_ = photos; #line 418 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - metadata_writer_photos_are_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), "tag renamed", FALSE); -#line 2120 "MetadataWriter.c" + metadata_writer_photos_are_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection), "tag renamed", FALSE); +#line 2405 "MetadataWriter.c" } #line 401 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photos); -#line 2124 "MetadataWriter.c" +#line 2409 "MetadataWriter.c" } -static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, ContainerSource* container, GeeCollection* added, gboolean relinking, GeeCollection* removed, gboolean unlinking) { +static void +metadata_writer_on_tag_contents_altered (MetadataWriter* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinking, + GeeCollection* removed, + gboolean unlinking) +{ Tag* tag = NULL; - ContainerSource* _tmp0_; - Tag* _tmp1_; - gboolean _tmp2_ = FALSE; - GeeCollection* _tmp3_; - gboolean _tmp27_ = FALSE; - GeeCollection* _tmp28_; + Tag* _tmp0_; + gboolean _tmp1_ = FALSE; + gboolean _tmp21_ = FALSE; #line 421 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 421 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2141,293 +2430,267 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta #line 421 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 423 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp0_ = container; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (container, TYPE_TAG, Tag)); #line 423 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TAG, Tag)); -#line 423 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - tag = _tmp1_; -#line 425 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp3_ = added; -#line 425 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp3_ != NULL) { -#line 2154 "MetadataWriter.c" - gboolean _tmp4_; + tag = _tmp0_; #line 425 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp4_ = relinking; + if (added != NULL) { #line 425 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp2_ = !_tmp4_; -#line 2160 "MetadataWriter.c" + _tmp1_ = !relinking; +#line 2441 "MetadataWriter.c" } else { #line 425 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp2_ = FALSE; -#line 2164 "MetadataWriter.c" + _tmp1_ = FALSE; +#line 2445 "MetadataWriter.c" } #line 425 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp2_) { -#line 2168 "MetadataWriter.c" + if (_tmp1_) { +#line 2449 "MetadataWriter.c" GeeArrayList* added_photos = NULL; - GeeArrayList* _tmp5_; - GeeArrayList* _tmp21_; - Tag* _tmp22_; - gchar* _tmp23_; - gchar* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; + GeeArrayList* _tmp2_; + GeeArrayList* _tmp15_; + Tag* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; #line 426 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp2_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 426 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - added_photos = _tmp5_; -#line 2181 "MetadataWriter.c" + added_photos = _tmp2_; +#line 2462 "MetadataWriter.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp6_; - GeeIterator* _tmp7_; -#line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp6_ = added; + GeeIterator* _tmp3_; #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_ITERABLE, GeeIterable)); #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _source_it = _tmp7_; + _source_it = _tmp3_; #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 2194 "MetadataWriter.c" - GeeIterator* _tmp8_; - gboolean _tmp9_; +#line 2472 "MetadataWriter.c" + GeeIterator* _tmp4_; DataSource* source = NULL; - GeeIterator* _tmp10_; - gpointer _tmp11_; + GeeIterator* _tmp5_; + gpointer _tmp6_; LibraryPhoto* photo = NULL; - DataSource* _tmp12_; - LibraryPhoto* _tmp13_; - gboolean _tmp14_ = FALSE; - LibraryPhoto* _tmp15_; -#line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp8_ = _source_it; + DataSource* _tmp7_; + LibraryPhoto* _tmp8_; + gboolean _tmp9_ = FALSE; + LibraryPhoto* _tmp10_; #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp9_ = gee_iterator_next (_tmp8_); + _tmp4_ = _source_it; #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (!_tmp9_) { + if (!gee_iterator_next (_tmp4_)) { #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 2213 "MetadataWriter.c" +#line 2488 "MetadataWriter.c" } #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp10_ = _source_it; + _tmp5_ = _source_it; #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp11_ = gee_iterator_get (_tmp10_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - source = (DataSource*) _tmp11_; + source = (DataSource*) _tmp6_; #line 428 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp12_ = source; + _tmp7_ = source; #line 428 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp12_) : NULL); + _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp7_) : NULL); #line 428 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo = _tmp13_; + photo = _tmp8_; #line 429 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp15_ = photo; + _tmp10_ = photo; #line 429 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp15_ != NULL) { -#line 2231 "MetadataWriter.c" - GeeHashSet* _tmp16_; - LibraryPhoto* _tmp17_; - gboolean _tmp18_; -#line 429 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp16_ = self->priv->importing_photos; + if (_tmp10_ != NULL) { +#line 2506 "MetadataWriter.c" + GeeHashSet* _tmp11_; + LibraryPhoto* _tmp12_; #line 429 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp17_ = photo; + _tmp11_ = self->priv->importing_photos; #line 429 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp18_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); + _tmp12_ = photo; #line 429 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp14_ = !_tmp18_; -#line 2243 "MetadataWriter.c" + _tmp9_ = !gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp12_); +#line 2515 "MetadataWriter.c" } else { #line 429 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp14_ = FALSE; -#line 2247 "MetadataWriter.c" + _tmp9_ = FALSE; +#line 2519 "MetadataWriter.c" } #line 429 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp14_) { -#line 2251 "MetadataWriter.c" - GeeArrayList* _tmp19_; - LibraryPhoto* _tmp20_; + if (_tmp9_) { +#line 2523 "MetadataWriter.c" + GeeArrayList* _tmp13_; + LibraryPhoto* _tmp14_; #line 430 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp19_ = added_photos; + _tmp13_ = added_photos; #line 430 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp20_ = photo; + _tmp14_ = photo; #line 430 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_); -#line 2260 "MetadataWriter.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_); +#line 2532 "MetadataWriter.c" } #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (source); -#line 2266 "MetadataWriter.c" +#line 2538 "MetadataWriter.c" } #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_source_it); -#line 2270 "MetadataWriter.c" +#line 2542 "MetadataWriter.c" } #line 433 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp21_ = added_photos; + _tmp15_ = added_photos; #line 433 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp22_ = tag; + _tmp16_ = tag; #line 433 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp23_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject)); + _tmp17_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject)); #line 433 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp24_ = _tmp23_; + _tmp18_ = _tmp17_; #line 433 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp25_ = g_strdup_printf ("added to %s", _tmp24_); + _tmp19_ = g_strdup_printf ("added to %s", _tmp18_); #line 433 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp26_ = _tmp25_; + _tmp20_ = _tmp19_; #line 433 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - metadata_writer_photos_are_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), _tmp26_, FALSE); + metadata_writer_photos_are_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_, FALSE); #line 433 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp20_); #line 433 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_free0 (_tmp24_); + _g_free0 (_tmp18_); #line 425 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (added_photos); -#line 2292 "MetadataWriter.c" +#line 2564 "MetadataWriter.c" } #line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp28_ = removed; -#line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp28_ != NULL) { -#line 2298 "MetadataWriter.c" - gboolean _tmp29_; -#line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp29_ = unlinking; + if (removed != NULL) { #line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp27_ = !_tmp29_; -#line 2304 "MetadataWriter.c" + _tmp21_ = !unlinking; +#line 2570 "MetadataWriter.c" } else { #line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp27_ = FALSE; -#line 2308 "MetadataWriter.c" + _tmp21_ = FALSE; +#line 2574 "MetadataWriter.c" } #line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp27_) { -#line 2312 "MetadataWriter.c" + if (_tmp21_) { +#line 2578 "MetadataWriter.c" GeeArrayList* removed_photos = NULL; - GeeArrayList* _tmp30_; - GeeArrayList* _tmp42_; - Tag* _tmp43_; - gchar* _tmp44_; - gchar* _tmp45_; - gchar* _tmp46_; - gchar* _tmp47_; + GeeArrayList* _tmp22_; + GeeArrayList* _tmp32_; + Tag* _tmp33_; + gchar* _tmp34_; + gchar* _tmp35_; + gchar* _tmp36_; + gchar* _tmp37_; #line 437 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp30_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp22_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 437 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - removed_photos = _tmp30_; -#line 2325 "MetadataWriter.c" + removed_photos = _tmp22_; +#line 2591 "MetadataWriter.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp31_; - GeeIterator* _tmp32_; -#line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp31_ = removed; + GeeIterator* _tmp23_; #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp32_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp23_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_ITERABLE, GeeIterable)); #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _source_it = _tmp32_; + _source_it = _tmp23_; #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 2338 "MetadataWriter.c" - GeeIterator* _tmp33_; - gboolean _tmp34_; +#line 2601 "MetadataWriter.c" + GeeIterator* _tmp24_; DataSource* source = NULL; - GeeIterator* _tmp35_; - gpointer _tmp36_; + GeeIterator* _tmp25_; + gpointer _tmp26_; LibraryPhoto* photo = NULL; - DataSource* _tmp37_; - LibraryPhoto* _tmp38_; - LibraryPhoto* _tmp39_; + DataSource* _tmp27_; + LibraryPhoto* _tmp28_; + LibraryPhoto* _tmp29_; #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp33_ = _source_it; + _tmp24_ = _source_it; #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp34_ = gee_iterator_next (_tmp33_); -#line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (!_tmp34_) { + if (!gee_iterator_next (_tmp24_)) { #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 2356 "MetadataWriter.c" +#line 2616 "MetadataWriter.c" } #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp35_ = _source_it; + _tmp25_ = _source_it; #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp36_ = gee_iterator_get (_tmp35_); + _tmp26_ = gee_iterator_get (_tmp25_); #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - source = (DataSource*) _tmp36_; + source = (DataSource*) _tmp26_; #line 439 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp37_ = source; + _tmp27_ = source; #line 439 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp38_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp37_) : NULL); + _tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp27_) : NULL); #line 439 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo = _tmp38_; + photo = _tmp28_; #line 440 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp39_ = photo; + _tmp29_ = photo; #line 440 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp39_ != NULL) { -#line 2374 "MetadataWriter.c" - GeeArrayList* _tmp40_; - LibraryPhoto* _tmp41_; + if (_tmp29_ != NULL) { +#line 2634 "MetadataWriter.c" + GeeArrayList* _tmp30_; + LibraryPhoto* _tmp31_; #line 441 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp40_ = removed_photos; + _tmp30_ = removed_photos; #line 441 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp41_ = photo; + _tmp31_ = photo; #line 441 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp41_); -#line 2383 "MetadataWriter.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp31_); +#line 2643 "MetadataWriter.c" } #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (source); -#line 2389 "MetadataWriter.c" +#line 2649 "MetadataWriter.c" } #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_source_it); -#line 2393 "MetadataWriter.c" +#line 2653 "MetadataWriter.c" } #line 444 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp42_ = removed_photos; + _tmp32_ = removed_photos; #line 444 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp43_ = tag; + _tmp33_ = tag; #line 444 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp44_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_DATA_OBJECT, DataObject)); + _tmp34_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_OBJECT, DataObject)); #line 444 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp45_ = _tmp44_; + _tmp35_ = _tmp34_; #line 444 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp46_ = g_strdup_printf ("removed from %s", _tmp45_); + _tmp36_ = g_strdup_printf ("removed from %s", _tmp35_); #line 444 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp47_ = _tmp46_; + _tmp37_ = _tmp36_; #line 444 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - metadata_writer_photos_are_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection), _tmp47_, FALSE); + metadata_writer_photos_are_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_, FALSE); #line 444 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_free0 (_tmp47_); + _g_free0 (_tmp37_); #line 444 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_free0 (_tmp45_); + _g_free0 (_tmp35_); #line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (removed_photos); -#line 2415 "MetadataWriter.c" +#line 2675 "MetadataWriter.c" } #line 421 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (tag); -#line 2419 "MetadataWriter.c" +#line 2679 "MetadataWriter.c" } -static void metadata_writer_on_tag_backlink_removed (MetadataWriter* self, ContainerSource* container, GeeCollection* sources) { +static void +metadata_writer_on_tag_backlink_removed (MetadataWriter* self, + ContainerSource* container, + GeeCollection* sources) +{ GeeArrayList* photos = NULL; GeeArrayList* _tmp0_; - GeeArrayList* _tmp12_; - ContainerSource* _tmp13_; + GeeArrayList* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; gchar* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; #line 448 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 448 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2438,239 +2701,226 @@ static void metadata_writer_on_tag_backlink_removed (MetadataWriter* self, Conta _tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 449 "/home/jens/Source/shotwell/src/MetadataWriter.vala" photos = _tmp0_; -#line 2442 "MetadataWriter.c" +#line 2705 "MetadataWriter.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; -#line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp1_ = sources; + GeeIterator* _tmp1_; #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _source_it = _tmp2_; + _source_it = _tmp1_; #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 2455 "MetadataWriter.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 2715 "MetadataWriter.c" + GeeIterator* _tmp2_; DataSource* source = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; LibraryPhoto* photo = NULL; - DataSource* _tmp7_; - LibraryPhoto* _tmp8_; - LibraryPhoto* _tmp9_; -#line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp3_ = _source_it; + DataSource* _tmp5_; + LibraryPhoto* _tmp6_; + LibraryPhoto* _tmp7_; #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _source_it; #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 2473 "MetadataWriter.c" +#line 2730 "MetadataWriter.c" } #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp5_ = _source_it; + _tmp3_ = _source_it; #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - source = (DataSource*) _tmp6_; + source = (DataSource*) _tmp4_; #line 451 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp7_ = source; + _tmp5_ = source; #line 451 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp7_) : NULL); + _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp5_) : NULL); #line 451 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo = _tmp8_; + photo = _tmp6_; #line 452 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp9_ = photo; + _tmp7_ = photo; #line 452 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp9_ != NULL) { -#line 2491 "MetadataWriter.c" - GeeArrayList* _tmp10_; - LibraryPhoto* _tmp11_; + if (_tmp7_ != NULL) { +#line 2748 "MetadataWriter.c" + GeeArrayList* _tmp8_; + LibraryPhoto* _tmp9_; #line 453 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp10_ = photos; + _tmp8_ = photos; #line 453 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp11_ = photo; + _tmp9_ = photo; #line 453 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_); -#line 2500 "MetadataWriter.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_); +#line 2757 "MetadataWriter.c" } #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (source); -#line 2506 "MetadataWriter.c" +#line 2763 "MetadataWriter.c" } #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_source_it); -#line 2510 "MetadataWriter.c" +#line 2767 "MetadataWriter.c" } #line 456 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp12_ = photos; -#line 456 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp13_ = container; + _tmp10_ = photos; #line 456 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp14_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject)); + _tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (container, TYPE_DATA_OBJECT, DataObject)); #line 456 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp15_ = _tmp14_; + _tmp12_ = _tmp11_; #line 456 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp16_ = g_strdup_printf ("backlink removed from %s", _tmp15_); + _tmp13_ = g_strdup_printf ("backlink removed from %s", _tmp12_); #line 456 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp17_ = _tmp16_; + _tmp14_ = _tmp13_; #line 456 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - metadata_writer_photos_are_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_, FALSE); + metadata_writer_photos_are_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_, FALSE); #line 456 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp14_); #line 456 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp12_); #line 448 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photos); -#line 2532 "MetadataWriter.c" +#line 2787 "MetadataWriter.c" } -static void metadata_writer_count_enqueued_work (MetadataWriter* self, gint count, gboolean report) { +static void +metadata_writer_count_enqueued_work (MetadataWriter* self, + gint count, + gboolean report) +{ guint _tmp0_; - gint _tmp1_; - gboolean _tmp2_; #line 459 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 460 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = self->priv->outstanding_total; #line 460 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp1_ = count; -#line 460 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - self->priv->outstanding_total = _tmp0_ + _tmp1_; -#line 466 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp2_ = report; + self->priv->outstanding_total = _tmp0_ + count; #line 466 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp2_) { -#line 2552 "MetadataWriter.c" - guint _tmp3_; - guint _tmp4_; + if (report) { +#line 2805 "MetadataWriter.c" + guint _tmp1_; + guint _tmp2_; #line 467 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp3_ = self->priv->outstanding_completed; + _tmp1_ = self->priv->outstanding_completed; #line 467 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp4_ = self->priv->outstanding_total; + _tmp2_ = self->priv->outstanding_total; #line 467 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_emit (self, metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL], 0, _tmp3_, _tmp4_); -#line 2561 "MetadataWriter.c" + g_signal_emit (self, metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL], 0, _tmp1_, _tmp2_); +#line 2814 "MetadataWriter.c" } } -static void metadata_writer_count_cancelled_work (MetadataWriter* self, gint count, gboolean report) { +static void +metadata_writer_count_cancelled_work (MetadataWriter* self, + gint count, + gboolean report) +{ guint _tmp0_ = 0U; guint _tmp1_; - gint _tmp2_; - guint _tmp5_; - guint _tmp6_; - gboolean _tmp7_; + guint _tmp3_; + guint _tmp4_; #line 470 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp1_ = self->priv->outstanding_total; #line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp2_ = count; -#line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp1_ >= ((guint) _tmp2_)) { -#line 2581 "MetadataWriter.c" - guint _tmp3_; - gint _tmp4_; -#line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp3_ = self->priv->outstanding_total; + if (_tmp1_ >= ((guint) count)) { +#line 2834 "MetadataWriter.c" + guint _tmp2_; #line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp4_ = count; + _tmp2_ = self->priv->outstanding_total; #line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp0_ = _tmp3_ - _tmp4_; -#line 2590 "MetadataWriter.c" + _tmp0_ = _tmp2_ - count; +#line 2840 "MetadataWriter.c" } else { #line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = (guint) 0; -#line 2594 "MetadataWriter.c" +#line 2844 "MetadataWriter.c" } #line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->priv->outstanding_total = _tmp0_; #line 472 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp5_ = self->priv->outstanding_completed; + _tmp3_ = self->priv->outstanding_completed; #line 472 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp6_ = self->priv->outstanding_total; + _tmp4_ = self->priv->outstanding_total; #line 472 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp5_ >= _tmp6_) { + if (_tmp3_ >= _tmp4_) { #line 473 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->priv->outstanding_completed = (guint) 0; #line 474 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->priv->outstanding_total = (guint) 0; -#line 2608 "MetadataWriter.c" +#line 2858 "MetadataWriter.c" } #line 481 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp7_ = report; -#line 481 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp7_) { -#line 2614 "MetadataWriter.c" - guint _tmp8_; - guint _tmp9_; + if (report) { +#line 2862 "MetadataWriter.c" + guint _tmp5_; + guint _tmp6_; #line 482 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp8_ = self->priv->outstanding_completed; + _tmp5_ = self->priv->outstanding_completed; #line 482 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp9_ = self->priv->outstanding_total; + _tmp6_ = self->priv->outstanding_total; #line 482 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_emit (self, metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL], 0, _tmp8_, _tmp9_); -#line 2623 "MetadataWriter.c" + g_signal_emit (self, metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL], 0, _tmp5_, _tmp6_); +#line 2871 "MetadataWriter.c" } } -static void metadata_writer_count_completed_work (MetadataWriter* self, gint count, gboolean report) { +static void +metadata_writer_count_completed_work (MetadataWriter* self, + gint count, + gboolean report) +{ guint _tmp0_; - gint _tmp1_; + guint _tmp1_; guint _tmp2_; - guint _tmp3_; - gboolean _tmp4_; #line 485 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 486 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = self->priv->outstanding_completed; #line 486 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp1_ = count; -#line 486 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - self->priv->outstanding_completed = _tmp0_ + _tmp1_; + self->priv->outstanding_completed = _tmp0_ + count; #line 487 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp2_ = self->priv->outstanding_completed; + _tmp1_ = self->priv->outstanding_completed; #line 487 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp3_ = self->priv->outstanding_total; + _tmp2_ = self->priv->outstanding_total; #line 487 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp2_ >= _tmp3_) { + if (_tmp1_ >= _tmp2_) { #line 488 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->priv->outstanding_completed = (guint) 0; #line 489 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->priv->outstanding_total = (guint) 0; -#line 2652 "MetadataWriter.c" +#line 2900 "MetadataWriter.c" } #line 496 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp4_ = report; -#line 496 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp4_) { -#line 2658 "MetadataWriter.c" - guint _tmp5_; - guint _tmp6_; + if (report) { +#line 2904 "MetadataWriter.c" + guint _tmp3_; + guint _tmp4_; #line 497 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp5_ = self->priv->outstanding_completed; + _tmp3_ = self->priv->outstanding_completed; #line 497 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp6_ = self->priv->outstanding_total; + _tmp4_ = self->priv->outstanding_total; #line 497 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_emit (self, metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL], 0, _tmp5_, _tmp6_); -#line 2667 "MetadataWriter.c" + g_signal_emit (self, metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL], 0, _tmp3_, _tmp4_); +#line 2913 "MetadataWriter.c" } } -static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable* media_sources, const gchar* reason) { +static void +metadata_writer_schedule_if_dirty (MetadataWriter* self, + GeeIterable* media_sources, + const gchar* reason) +{ GeeArrayList* photos = NULL; - GeeArrayList* _tmp18_; + GeeArrayList* _tmp14_; #line 500 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 500 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2679,157 +2929,144 @@ static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable g_return_if_fail (reason != NULL); #line 501 "/home/jens/Source/shotwell/src/MetadataWriter.vala" photos = NULL; -#line 2683 "MetadataWriter.c" +#line 2933 "MetadataWriter.c" { GeeIterator* _media_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; -#line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp0_ = media_sources; + GeeIterator* _tmp0_; #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); + _tmp0_ = gee_iterable_iterator (media_sources); #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _media_it = _tmp1_; + _media_it = _tmp0_; #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 2696 "MetadataWriter.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 2943 "MetadataWriter.c" + GeeIterator* _tmp1_; MediaSource* media = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; LibraryPhoto* photo = NULL; - MediaSource* _tmp6_; - LibraryPhoto* _tmp7_; + MediaSource* _tmp4_; + LibraryPhoto* _tmp5_; + LibraryPhoto* _tmp6_; + GeeHashSet* _tmp7_; LibraryPhoto* _tmp8_; - GeeHashSet* _tmp9_; - LibraryPhoto* _tmp10_; - gboolean _tmp11_; - LibraryPhoto* _tmp12_; - gboolean _tmp13_; -#line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp2_ = _media_it; + LibraryPhoto* _tmp9_; #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _media_it; #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 2719 "MetadataWriter.c" +#line 2961 "MetadataWriter.c" } #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp4_ = _media_it; + _tmp2_ = _media_it; #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - media = (MediaSource*) _tmp5_; + media = (MediaSource*) _tmp3_; #line 503 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp6_ = media; + _tmp4_ = media; #line 503 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp6_) : NULL); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp4_) : NULL); #line 503 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo = _tmp7_; + photo = _tmp5_; #line 504 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp8_ = photo; + _tmp6_ = photo; #line 504 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp8_ == NULL) { + if (_tmp6_ == NULL) { #line 505 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); #line 505 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (media); #line 505 "/home/jens/Source/shotwell/src/MetadataWriter.vala" continue; -#line 2743 "MetadataWriter.c" +#line 2985 "MetadataWriter.c" } #line 508 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp9_ = self->priv->importing_photos; -#line 508 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp10_ = photo; + _tmp7_ = self->priv->importing_photos; #line 508 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp11_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); + _tmp8_ = photo; #line 508 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp11_) { + if (gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_)) { #line 509 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); #line 509 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (media); #line 509 "/home/jens/Source/shotwell/src/MetadataWriter.vala" continue; -#line 2759 "MetadataWriter.c" +#line 2999 "MetadataWriter.c" } #line 511 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp12_ = photo; -#line 511 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp13_ = photo_is_master_metadata_dirty (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO, Photo)); + _tmp9_ = photo; #line 511 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp13_) { -#line 2767 "MetadataWriter.c" - GeeArrayList* _tmp14_; - GeeArrayList* _tmp16_; - LibraryPhoto* _tmp17_; + if (photo_is_master_metadata_dirty (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo))) { +#line 3005 "MetadataWriter.c" + GeeArrayList* _tmp10_; + GeeArrayList* _tmp12_; + LibraryPhoto* _tmp13_; #line 512 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp14_ = photos; + _tmp10_ = photos; #line 512 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp14_ == NULL) { -#line 2775 "MetadataWriter.c" - GeeArrayList* _tmp15_; + if (_tmp10_ == NULL) { +#line 3013 "MetadataWriter.c" + GeeArrayList* _tmp11_; #line 513 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp15_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp11_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 513 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photos); #line 513 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photos = _tmp15_; -#line 2783 "MetadataWriter.c" + photos = _tmp11_; +#line 3021 "MetadataWriter.c" } #line 515 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp16_ = photos; + _tmp12_ = photos; #line 515 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp17_ = photo; + _tmp13_ = photo; #line 515 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); -#line 2791 "MetadataWriter.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_); +#line 3029 "MetadataWriter.c" } #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (media); -#line 2797 "MetadataWriter.c" +#line 3035 "MetadataWriter.c" } #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_media_it); -#line 2801 "MetadataWriter.c" +#line 3039 "MetadataWriter.c" } #line 519 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp18_ = photos; + _tmp14_ = photos; #line 519 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp18_ != NULL) { -#line 2807 "MetadataWriter.c" - GeeArrayList* _tmp19_; - const gchar* _tmp20_; + if (_tmp14_ != NULL) { +#line 3045 "MetadataWriter.c" + GeeArrayList* _tmp15_; #line 520 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp19_ = photos; + _tmp15_ = photos; #line 520 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp20_ = reason; -#line 520 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - metadata_writer_photos_are_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_, TRUE); -#line 2816 "MetadataWriter.c" + metadata_writer_photos_are_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection), reason, TRUE); +#line 3051 "MetadataWriter.c" } #line 500 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photos); -#line 2820 "MetadataWriter.c" +#line 3055 "MetadataWriter.c" } -static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollection* photos, const gchar* reason, gboolean already_marked) { - GeeCollection* _tmp0_; +static void +metadata_writer_photos_are_dirty (MetadataWriter* self, + GeeCollection* photos, + const gchar* reason, + gboolean already_marked) +{ + gint _tmp0_; gint _tmp1_; - gint _tmp2_; - gboolean _tmp10_; - gboolean _tmp28_ = FALSE; - gboolean _tmp29_; - GeeCollection* _tmp41_; - gint _tmp42_; - gint _tmp43_; + gboolean _tmp22_ = FALSE; + gboolean _tmp23_; + gint _tmp32_; + gint _tmp33_; GError * _inner_error_ = NULL; #line 524 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); @@ -2838,185 +3075,169 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio #line 524 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (reason != NULL); #line 525 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp0_ = photos; + _tmp0_ = gee_collection_get_size (photos); #line 525 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); -#line 525 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 525 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 526 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 2851 "MetadataWriter.c" +#line 3086 "MetadataWriter.c" } { GeeIterator* _photo_it = NULL; - GeeCollection* _tmp3_; - GeeIterator* _tmp4_; -#line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp3_ = photos; + GeeIterator* _tmp2_; #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_ITERABLE, GeeIterable)); #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _photo_it = _tmp4_; + _photo_it = _tmp2_; #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 2865 "MetadataWriter.c" - GeeIterator* _tmp5_; - gboolean _tmp6_; +#line 3097 "MetadataWriter.c" + GeeIterator* _tmp3_; LibraryPhoto* photo = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; - LibraryPhoto* _tmp9_; -#line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp5_ = _photo_it; + GeeIterator* _tmp4_; + gpointer _tmp5_; + LibraryPhoto* _tmp6_; #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp6_ = gee_iterator_next (_tmp5_); + _tmp3_ = _photo_it; #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp3_)) { #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 2880 "MetadataWriter.c" +#line 3109 "MetadataWriter.c" } #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp7_ = _photo_it; + _tmp4_ = _photo_it; #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo = (LibraryPhoto*) _tmp8_; + photo = (LibraryPhoto*) _tmp5_; #line 530 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp9_ = photo; + _tmp6_ = photo; #line 530 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - metadata_writer_cancel_job (self, _tmp9_); + metadata_writer_cancel_job (self, _tmp6_); #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); -#line 2894 "MetadataWriter.c" +#line 3123 "MetadataWriter.c" } #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_photo_it); -#line 2898 "MetadataWriter.c" +#line 3127 "MetadataWriter.c" } #line 533 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp10_ = already_marked; -#line 533 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (!_tmp10_) { -#line 2904 "MetadataWriter.c" + if (!already_marked) { +#line 3131 "MetadataWriter.c" { - LibraryPhotoSourceCollection* _tmp11_; - TransactionController* _tmp12_; - TransactionController* _tmp13_; - LibraryPhotoSourceCollection* _tmp21_; - TransactionController* _tmp22_; - TransactionController* _tmp23_; + LibraryPhotoSourceCollection* _tmp7_; + TransactionController* _tmp8_; + TransactionController* _tmp9_; + LibraryPhotoSourceCollection* _tmp15_; + TransactionController* _tmp16_; + TransactionController* _tmp17_; #line 535 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp11_ = library_photo_global; + _tmp7_ = library_photo_global; #line 535 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp12_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _tmp8_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 535 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp13_ = _tmp12_; + _tmp9_ = _tmp8_; #line 535 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - transaction_controller_begin (_tmp13_); -#line 2920 "MetadataWriter.c" + transaction_controller_begin (_tmp9_); +#line 3147 "MetadataWriter.c" { GeeIterator* _photo_it = NULL; - GeeCollection* _tmp14_; - GeeIterator* _tmp15_; -#line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp14_ = photos; + GeeIterator* _tmp10_; #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_ITERABLE, GeeIterable)); #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _photo_it = _tmp15_; + _photo_it = _tmp10_; #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 2933 "MetadataWriter.c" - GeeIterator* _tmp16_; - gboolean _tmp17_; +#line 3157 "MetadataWriter.c" + GeeIterator* _tmp11_; LibraryPhoto* photo = NULL; - GeeIterator* _tmp18_; - gpointer _tmp19_; - LibraryPhoto* _tmp20_; -#line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp16_ = _photo_it; + GeeIterator* _tmp12_; + gpointer _tmp13_; + LibraryPhoto* _tmp14_; #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp17_ = gee_iterator_next (_tmp16_); + _tmp11_ = _photo_it; #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (!_tmp17_) { + if (!gee_iterator_next (_tmp11_)) { #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 2948 "MetadataWriter.c" +#line 3169 "MetadataWriter.c" } #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp18_ = _photo_it; + _tmp12_ = _photo_it; #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp19_ = gee_iterator_get (_tmp18_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo = (LibraryPhoto*) _tmp19_; + photo = (LibraryPhoto*) _tmp13_; #line 538 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp20_ = photo; + _tmp14_ = photo; #line 538 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo_set_master_metadata_dirty (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo), TRUE, &_inner_error_); + photo_set_master_metadata_dirty (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo), TRUE, &_inner_error_); #line 538 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 538 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); #line 538 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_photo_it); -#line 2966 "MetadataWriter.c" +#line 3187 "MetadataWriter.c" goto __catch563_g_error; } #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); -#line 2971 "MetadataWriter.c" +#line 3192 "MetadataWriter.c" } #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_photo_it); -#line 2975 "MetadataWriter.c" +#line 3196 "MetadataWriter.c" } #line 540 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp21_ = library_photo_global; + _tmp15_ = library_photo_global; #line 540 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp22_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _tmp16_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 540 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp23_ = _tmp22_; + _tmp17_ = _tmp16_; #line 540 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - transaction_controller_commit (_tmp23_); -#line 2985 "MetadataWriter.c" + transaction_controller_commit (_tmp17_); +#line 3206 "MetadataWriter.c" } goto __finally563; __catch563_g_error: { GError* err = NULL; - GError* _tmp24_; + GError* _tmp18_; #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala" err = _inner_error_; #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _inner_error_ = NULL; #line 542 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp24_ = err; + _tmp18_ = err; #line 542 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp24_->domain == DATABASE_ERROR) { -#line 3000 "MetadataWriter.c" - GError* _tmp25_; + if (_tmp18_->domain == DATABASE_ERROR) { +#line 3221 "MetadataWriter.c" + GError* _tmp19_; #line 543 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp25_ = err; + _tmp19_ = err; #line 543 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - app_window_database_error ((GError*) _tmp25_); -#line 3006 "MetadataWriter.c" + app_window_database_error ((GError*) _tmp19_); +#line 3227 "MetadataWriter.c" } else { - GError* _tmp26_; - const gchar* _tmp27_; + GError* _tmp20_; + const gchar* _tmp21_; #line 545 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp26_ = err; + _tmp20_ = err; #line 545 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp27_ = _tmp26_->message; + _tmp21_ = _tmp20_->message; #line 545 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_error ("MetadataWriter.vala:545: Unable to mark metadata as dirty: %s", _tmp27_); -#line 3016 "MetadataWriter.c" + g_error ("MetadataWriter.vala:545: Unable to mark metadata as dirty: %s", _tmp21_); +#line 3237 "MetadataWriter.c" } #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_error_free0 (err); -#line 3020 "MetadataWriter.c" +#line 3241 "MetadataWriter.c" } __finally563: #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3027,111 +3248,102 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio g_clear_error (&_inner_error_); #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 3031 "MetadataWriter.c" +#line 3252 "MetadataWriter.c" } } #line 551 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp29_ = self->priv->closed; + _tmp23_ = self->priv->closed; #line 551 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp29_) { + if (_tmp23_) { #line 551 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp28_ = TRUE; -#line 3040 "MetadataWriter.c" + _tmp22_ = TRUE; +#line 3261 "MetadataWriter.c" } else { - gboolean _tmp30_; + gboolean _tmp24_; #line 551 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp30_ = self->priv->enabled; + _tmp24_ = self->priv->enabled; #line 551 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp28_ = !_tmp30_; -#line 3047 "MetadataWriter.c" + _tmp22_ = !_tmp24_; +#line 3268 "MetadataWriter.c" } #line 551 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp28_) { + if (_tmp22_) { #line 552 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 3053 "MetadataWriter.c" +#line 3274 "MetadataWriter.c" } { GeeIterator* _photo_it = NULL; - GeeCollection* _tmp31_; - GeeIterator* _tmp32_; -#line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp31_ = photos; + GeeIterator* _tmp25_; #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp32_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp25_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_ITERABLE, GeeIterable)); #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _photo_it = _tmp32_; + _photo_it = _tmp25_; #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 3067 "MetadataWriter.c" - GeeIterator* _tmp33_; - gboolean _tmp34_; +#line 3285 "MetadataWriter.c" + GeeIterator* _tmp26_; LibraryPhoto* photo = NULL; - GeeIterator* _tmp35_; - gpointer _tmp36_; + GeeIterator* _tmp27_; + gpointer _tmp28_; gboolean enqueued = FALSE; - HashTimedQueue* _tmp37_; - LibraryPhoto* _tmp38_; - gboolean _tmp39_; - gboolean _tmp40_; -#line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp33_ = _photo_it; + HashTimedQueue* _tmp29_; + LibraryPhoto* _tmp30_; + gboolean _tmp31_; #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp34_ = gee_iterator_next (_tmp33_); + _tmp26_ = _photo_it; #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (!_tmp34_) { + if (!gee_iterator_next (_tmp26_)) { #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 3086 "MetadataWriter.c" +#line 3300 "MetadataWriter.c" } #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp35_ = _photo_it; + _tmp27_ = _photo_it; #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp36_ = gee_iterator_get (_tmp35_); + _tmp28_ = gee_iterator_get (_tmp27_); #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo = (LibraryPhoto*) _tmp36_; -#line 559 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp37_ = self->priv->dirty; + photo = (LibraryPhoto*) _tmp28_; #line 559 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp38_ = photo; + _tmp29_ = self->priv->dirty; #line 559 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp39_ = timed_queue_enqueue (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_TIMED_QUEUE, TimedQueue), _tmp38_); + _tmp30_ = photo; #line 559 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - enqueued = _tmp39_; + enqueued = timed_queue_enqueue (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_TIMED_QUEUE, TimedQueue), _tmp30_); #line 560 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp40_ = enqueued; + _tmp31_ = enqueued; #line 560 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _vala_assert (_tmp40_, "enqueued"); + _vala_assert (_tmp31_, "enqueued"); #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); -#line 3108 "MetadataWriter.c" +#line 3320 "MetadataWriter.c" } #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_photo_it); -#line 3112 "MetadataWriter.c" +#line 3324 "MetadataWriter.c" } #line 563 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp41_ = photos; + _tmp32_ = gee_collection_get_size (photos); #line 563 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp42_ = gee_collection_get_size (_tmp41_); + _tmp33_ = _tmp32_; #line 563 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp43_ = _tmp42_; -#line 563 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - metadata_writer_count_enqueued_work (self, _tmp43_, TRUE); -#line 3122 "MetadataWriter.c" + metadata_writer_count_enqueued_work (self, _tmp33_, TRUE); +#line 3332 "MetadataWriter.c" } -static void metadata_writer_cancel_all (MetadataWriter* self, gboolean wait) { +static void +metadata_writer_cancel_all (MetadataWriter* self, + gboolean wait) +{ HashTimedQueue* _tmp0_; - gboolean _tmp12_; #line 566 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 567 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = self->priv->dirty; #line 567 "/home/jens/Source/shotwell/src/MetadataWriter.vala" timed_queue_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TIMED_QUEUE, TimedQueue)); -#line 3135 "MetadataWriter.c" +#line 3347 "MetadataWriter.c" { GeeIterator* _job_it = NULL; GeeHashMap* _tmp1_; @@ -3158,68 +3370,62 @@ static void metadata_writer_cancel_all (MetadataWriter* self, gboolean wait) { _job_it = _tmp6_; #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 3162 "MetadataWriter.c" +#line 3374 "MetadataWriter.c" GeeIterator* _tmp7_; - gboolean _tmp8_; MetadataWriterCommitJob* job = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; - MetadataWriterCommitJob* _tmp11_; + GeeIterator* _tmp8_; + gpointer _tmp9_; + MetadataWriterCommitJob* _tmp10_; #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp7_ = _job_it; #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp8_ = gee_iterator_next (_tmp7_); -#line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp7_)) { #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 3177 "MetadataWriter.c" +#line 3386 "MetadataWriter.c" } #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp9_ = _job_it; + _tmp8_ = _job_it; #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp9_ = gee_iterator_get (_tmp8_); #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - job = (MetadataWriterCommitJob*) _tmp10_; + job = (MetadataWriterCommitJob*) _tmp9_; #line 570 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp11_ = job; + _tmp10_ = job; #line 570 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_BACKGROUND_JOB, BackgroundJob)); + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _background_job_unref0 (job); -#line 3191 "MetadataWriter.c" +#line 3400 "MetadataWriter.c" } #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_job_it); -#line 3195 "MetadataWriter.c" +#line 3404 "MetadataWriter.c" } #line 572 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp12_ = wait; -#line 572 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp12_) { -#line 3201 "MetadataWriter.c" - Workers* _tmp13_; + if (wait) { +#line 3408 "MetadataWriter.c" + Workers* _tmp11_; #line 573 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp13_ = self->priv->workers; + _tmp11_ = self->priv->workers; #line 573 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - workers_wait_for_empty_queue (_tmp13_); -#line 3207 "MetadataWriter.c" + workers_wait_for_empty_queue (_tmp11_); +#line 3414 "MetadataWriter.c" } #line 575 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_count_cancelled_work (self, G_MAXINT, TRUE); -#line 3211 "MetadataWriter.c" +#line 3418 "MetadataWriter.c" } -static gboolean metadata_writer_cancel_job (MetadataWriter* self, LibraryPhoto* photo) { +static gboolean +metadata_writer_cancel_job (MetadataWriter* self, + LibraryPhoto* photo) +{ gboolean result = FALSE; gboolean cancelled = FALSE; GeeHashMap* _tmp0_; - LibraryPhoto* _tmp1_; - gboolean _tmp2_; - HashTimedQueue* _tmp11_; - LibraryPhoto* _tmp12_; - gboolean _tmp13_; + HashTimedQueue* _tmp7_; #line 578 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_val_if_fail (IS_METADATA_WRITER (self), FALSE); #line 578 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3229,122 +3435,94 @@ static gboolean metadata_writer_cancel_job (MetadataWriter* self, LibraryPhoto* #line 581 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = self->priv->pending; #line 581 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp1_ = photo; -#line 581 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 581 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp2_) { -#line 3238 "MetadataWriter.c" + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo)) { +#line 3440 "MetadataWriter.c" MetadataWriterCommitJob* j = NULL; - GeeHashMap* _tmp3_; - LibraryPhoto* _tmp4_; - gpointer _tmp5_; - GeeHashSet* _tmp6_; - MetadataWriterCommitJob* _tmp7_; - MetadataWriterCommitJob* _tmp8_; - GeeHashMap* _tmp9_; - LibraryPhoto* _tmp10_; -#line 582 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp3_ = self->priv->pending; + GeeHashMap* _tmp1_; + gpointer _tmp2_; + GeeHashSet* _tmp3_; + MetadataWriterCommitJob* _tmp4_; + MetadataWriterCommitJob* _tmp5_; + GeeHashMap* _tmp6_; #line 582 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp4_ = photo; + _tmp1_ = self->priv->pending; #line 582 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo); #line 582 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - j = G_TYPE_CHECK_INSTANCE_CAST ((MetadataWriterCommitJob*) _tmp5_, METADATA_WRITER_TYPE_COMMIT_JOB, MetadataWriterCommitJob); + j = G_TYPE_CHECK_INSTANCE_CAST ((MetadataWriterCommitJob*) _tmp2_, METADATA_WRITER_TYPE_COMMIT_JOB, MetadataWriterCommitJob); #line 583 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp6_ = self->priv->pending_cancel; + _tmp3_ = self->priv->pending_cancel; #line 583 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp7_ = j; + _tmp4_ = j; #line 583 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); #line 584 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp8_ = j; + _tmp5_ = j; #line 584 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_BACKGROUND_JOB, BackgroundJob)); + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 585 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp9_ = self->priv->pending; + _tmp6_ = self->priv->pending; #line 585 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp10_ = photo; -#line 585 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo, NULL); #line 586 "/home/jens/Source/shotwell/src/MetadataWriter.vala" cancelled = TRUE; #line 581 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _background_job_unref0 (j); -#line 3276 "MetadataWriter.c" +#line 3472 "MetadataWriter.c" } #line 589 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp11_ = self->priv->dirty; -#line 589 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp12_ = photo; + _tmp7_ = self->priv->dirty; #line 589 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp13_ = timed_queue_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_TIMED_QUEUE, TimedQueue), _tmp12_); -#line 589 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp13_) { -#line 3286 "MetadataWriter.c" + if (timed_queue_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_TIMED_QUEUE, TimedQueue), photo)) { +#line 3478 "MetadataWriter.c" gboolean removed = FALSE; - HashTimedQueue* _tmp14_; - LibraryPhoto* _tmp15_; - gboolean _tmp16_; - gboolean _tmp17_; - HashTimedQueue* _tmp18_; - LibraryPhoto* _tmp19_; - gboolean _tmp20_; -#line 590 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp14_ = self->priv->dirty; -#line 590 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp15_ = photo; + HashTimedQueue* _tmp8_; + gboolean _tmp9_; + HashTimedQueue* _tmp10_; #line 590 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp16_ = timed_queue_remove_first (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_TIMED_QUEUE, TimedQueue), _tmp15_); + _tmp8_ = self->priv->dirty; #line 590 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - removed = _tmp16_; + removed = timed_queue_remove_first (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_TIMED_QUEUE, TimedQueue), photo); #line 591 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp17_ = removed; + _tmp9_ = removed; #line 591 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _vala_assert (_tmp17_, "removed"); + _vala_assert (_tmp9_, "removed"); #line 593 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp18_ = self->priv->dirty; + _tmp10_ = self->priv->dirty; #line 593 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp19_ = photo; -#line 593 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp20_ = timed_queue_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_TIMED_QUEUE, TimedQueue), _tmp19_); -#line 593 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _vala_assert (!_tmp20_, "!dirty.contains(photo)"); + _vala_assert (!timed_queue_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_TIMED_QUEUE, TimedQueue), photo), "!dirty.contains(photo)"); #line 595 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_count_cancelled_work (self, 1, FALSE); #line 596 "/home/jens/Source/shotwell/src/MetadataWriter.vala" cancelled = TRUE; -#line 3319 "MetadataWriter.c" +#line 3499 "MetadataWriter.c" } #line 599 "/home/jens/Source/shotwell/src/MetadataWriter.vala" result = cancelled; #line 599 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return result; -#line 3325 "MetadataWriter.c" +#line 3505 "MetadataWriter.c" } -static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhoto* photo) { +static void +metadata_writer_on_photo_dequeued (MetadataWriter* self, + LibraryPhoto* photo) +{ gboolean _tmp0_; GeeSet* keywords = NULL; GeeCollection* tags = NULL; TagSourceCollection* _tmp1_; - LibraryPhoto* _tmp2_; - GeeList* _tmp3_; - GeeCollection* _tmp4_; - GeeHashMap* _tmp16_; - LibraryPhoto* _tmp17_; - gboolean _tmp18_; + GeeList* _tmp2_; + GeeCollection* _tmp3_; + GeeHashMap* _tmp14_; MetadataWriterCommitJob* job = NULL; - LibraryPhoto* _tmp20_; - GeeSet* _tmp21_; - MetadataWriterCommitJob* _tmp22_; - GeeHashMap* _tmp23_; - LibraryPhoto* _tmp24_; - MetadataWriterCommitJob* _tmp25_; - Workers* _tmp26_; - MetadataWriterCommitJob* _tmp27_; + GeeSet* _tmp15_; + MetadataWriterCommitJob* _tmp16_; + GeeHashMap* _tmp17_; + MetadataWriterCommitJob* _tmp18_; + Workers* _tmp19_; + MetadataWriterCommitJob* _tmp20_; #line 602 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 602 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3357,469 +3535,454 @@ static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhot metadata_writer_count_cancelled_work (self, 1, TRUE); #line 606 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 3361 "MetadataWriter.c" +#line 3539 "MetadataWriter.c" } #line 609 "/home/jens/Source/shotwell/src/MetadataWriter.vala" keywords = NULL; #line 610 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp1_ = tag_global; #line 610 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp2_ = photo; -#line 610 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp3_ = tag_source_collection_fetch_for_source (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp2_ = tag_source_collection_fetch_for_source (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MEDIA_SOURCE, MediaSource)); #line 610 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); + tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 611 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp4_ = tags; + _tmp3_ = tags; #line 611 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp4_ != NULL) { -#line 3377 "MetadataWriter.c" - GeeHashSet* _tmp5_; + if (_tmp3_ != NULL) { +#line 3553 "MetadataWriter.c" + GeeHashSet* _tmp4_; #line 612 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp5_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp4_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 612 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (keywords); #line 612 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_SET, GeeSet); -#line 3385 "MetadataWriter.c" + keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_SET, GeeSet); +#line 3561 "MetadataWriter.c" { GeeIterator* _tag_it = NULL; - GeeCollection* _tmp6_; - GeeIterator* _tmp7_; + GeeCollection* _tmp5_; + GeeIterator* _tmp6_; #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp6_ = tags; + _tmp5_ = tags; #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tag_it = _tmp7_; + _tag_it = _tmp6_; #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 3398 "MetadataWriter.c" - GeeIterator* _tmp8_; - gboolean _tmp9_; +#line 3574 "MetadataWriter.c" + GeeIterator* _tmp7_; Tag* tag = NULL; - GeeIterator* _tmp10_; - gpointer _tmp11_; - GeeSet* _tmp12_; - Tag* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; -#line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp8_ = _tag_it; + GeeIterator* _tmp8_; + gpointer _tmp9_; + GeeSet* _tmp10_; + Tag* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp9_ = gee_iterator_next (_tmp8_); + _tmp7_ = _tag_it; #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (!_tmp9_) { + if (!gee_iterator_next (_tmp7_)) { #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 3416 "MetadataWriter.c" +#line 3589 "MetadataWriter.c" } #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp10_ = _tag_it; + _tmp8_ = _tag_it; #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp11_ = gee_iterator_get (_tmp10_); + _tmp9_ = gee_iterator_get (_tmp8_); #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - tag = (Tag*) _tmp11_; + tag = (Tag*) _tmp9_; #line 614 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp12_ = keywords; + _tmp10_ = keywords; #line 614 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp13_ = tag; + _tmp11_ = tag; #line 614 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp14_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject)); + _tmp12_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject)); #line 614 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp15_ = _tmp14_; + _tmp13_ = _tmp12_; #line 614 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_); #line 614 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp13_); #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (tag); -#line 3438 "MetadataWriter.c" +#line 3611 "MetadataWriter.c" } #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_tag_it); -#line 3442 "MetadataWriter.c" +#line 3615 "MetadataWriter.c" } } #line 618 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp16_ = self->priv->pending; -#line 618 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp17_ = photo; -#line 618 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp18_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_); + _tmp14_ = self->priv->pending; #line 618 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp18_) { -#line 3453 "MetadataWriter.c" - LibraryPhoto* _tmp19_; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo)) { #line 619 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp19_ = photo; -#line 619 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - metadata_writer_cancel_job (self, _tmp19_); -#line 3459 "MetadataWriter.c" + metadata_writer_cancel_job (self, photo); +#line 3624 "MetadataWriter.c" } #line 621 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp20_ = photo; -#line 621 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp21_ = keywords; + _tmp15_ = keywords; #line 621 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp22_ = metadata_writer_commit_job_new (self, _tmp20_, _tmp21_); + _tmp16_ = metadata_writer_commit_job_new (self, photo, _tmp15_); #line 621 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - job = _tmp22_; -#line 622 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp23_ = self->priv->pending; + job = _tmp16_; #line 622 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp24_ = photo; + _tmp17_ = self->priv->pending; #line 622 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp25_ = job; + _tmp18_ = job; #line 622 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_, _tmp25_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo, _tmp18_); #line 628 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp26_ = self->priv->workers; + _tmp19_ = self->priv->workers; #line 628 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp27_ = job; + _tmp20_ = job; #line 628 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - workers_enqueue (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_BACKGROUND_JOB, BackgroundJob)); + workers_enqueue (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 602 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _background_job_unref0 (job); #line 602 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (tags); #line 602 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (keywords); -#line 3489 "MetadataWriter.c" +#line 3650 "MetadataWriter.c" } -static gpointer _background_job_ref0 (gpointer self) { +static gpointer +_background_job_ref0 (gpointer self) +{ #line 632 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return self ? background_job_ref (self) : NULL; -#line 3496 "MetadataWriter.c" +#line 3659 "MetadataWriter.c" } -static void metadata_writer_on_update_completed (MetadataWriter* self, BackgroundJob* j) { +static void +metadata_writer_on_update_completed (MetadataWriter* self, + BackgroundJob* j) +{ MetadataWriterCommitJob* job = NULL; - BackgroundJob* _tmp0_; + MetadataWriterCommitJob* _tmp0_; MetadataWriterCommitJob* _tmp1_; - MetadataWriterCommitJob* _tmp2_; - GError* _tmp3_; + GError* _tmp2_; gboolean removed = FALSE; - GeeHashMap* _tmp44_; - MetadataWriterCommitJob* _tmp45_; - LibraryPhoto* _tmp46_; + GeeHashMap* _tmp43_; + MetadataWriterCommitJob* _tmp44_; + LibraryPhoto* _tmp45_; + gboolean _tmp46_; gboolean _tmp47_; - gboolean _tmp48_; - LibraryPhotoSourceCollection* _tmp49_; + LibraryPhotoSourceCollection* _tmp48_; + TransactionController* _tmp49_; TransactionController* _tmp50_; - TransactionController* _tmp51_; - gboolean _tmp52_ = FALSE; - MetadataWriterCommitJob* _tmp53_; - PhotoReimportMasterState* _tmp54_; - LibraryPhotoSourceCollection* _tmp86_; + gboolean _tmp51_ = FALSE; + MetadataWriterCommitJob* _tmp52_; + PhotoReimportMasterState* _tmp53_; + LibraryPhotoSourceCollection* _tmp85_; + TransactionController* _tmp86_; TransactionController* _tmp87_; - TransactionController* _tmp88_; GError * _inner_error_ = NULL; #line 631 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 631 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_BACKGROUND_JOB (j)); #line 632 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp0_ = j; -#line 632 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, METADATA_WRITER_TYPE_COMMIT_JOB, MetadataWriterCommitJob)); + _tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, METADATA_WRITER_TYPE_COMMIT_JOB, MetadataWriterCommitJob)); #line 632 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - job = _tmp1_; + job = _tmp0_; #line 634 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp2_ = job; + _tmp1_ = job; #line 634 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp3_ = _tmp2_->err; + _tmp2_ = _tmp1_->err; #line 634 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp3_ != NULL) { -#line 3538 "MetadataWriter.c" - MetadataWriterCommitJob* _tmp4_; - LibraryPhoto* _tmp5_; + if (_tmp2_ != NULL) { +#line 3701 "MetadataWriter.c" + MetadataWriterCommitJob* _tmp3_; + LibraryPhoto* _tmp4_; + gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; - MetadataWriterCommitJob* _tmp8_; - GError* _tmp9_; - const gchar* _tmp10_; + MetadataWriterCommitJob* _tmp7_; + GError* _tmp8_; + const gchar* _tmp9_; #line 635 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp4_ = job; + _tmp3_ = job; #line 635 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp5_ = _tmp4_->photo; + _tmp4_ = _tmp3_->photo; #line 635 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); + _tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject)); #line 635 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 635 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp8_ = job; + _tmp7_ = job; #line 635 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp9_ = _tmp8_->err; + _tmp8_ = _tmp7_->err; #line 635 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp10_ = _tmp9_->message; + _tmp9_ = _tmp8_->message; #line 635 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_warning ("MetadataWriter.vala:635: Unable to write metadata to %s: %s", _tmp7_, _tmp10_); + g_warning ("MetadataWriter.vala:635: Unable to write metadata to %s: %s", _tmp6_, _tmp9_); #line 635 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_free0 (_tmp7_); -#line 3564 "MetadataWriter.c" + _g_free0 (_tmp6_); +#line 3727 "MetadataWriter.c" } else { - MetadataWriterCommitJob* _tmp11_; - gboolean _tmp12_; - MetadataWriterCommitJob* _tmp25_; - LibraryPhoto* _tmp26_; + MetadataWriterCommitJob* _tmp10_; + gboolean _tmp11_; + MetadataWriterCommitJob* _tmp24_; + LibraryPhoto* _tmp25_; + GFile* _tmp26_; GFile* _tmp27_; - GFile* _tmp28_; - gboolean _tmp29_; + gboolean _tmp28_; #line 637 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp11_ = job; + _tmp10_ = job; #line 637 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp12_ = _tmp11_->wrote_master; + _tmp11_ = _tmp10_->wrote_master; #line 637 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp12_) { -#line 3579 "MetadataWriter.c" - MetadataWriterCommitJob* _tmp13_; - LibraryPhoto* _tmp14_; + if (_tmp11_) { +#line 3742 "MetadataWriter.c" + MetadataWriterCommitJob* _tmp12_; + LibraryPhoto* _tmp13_; + GFile* _tmp14_; GFile* _tmp15_; - GFile* _tmp16_; + gchar* _tmp16_; gchar* _tmp17_; - gchar* _tmp18_; #line 638 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp13_ = job; + _tmp12_ = job; #line 638 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp14_ = _tmp13_->photo; + _tmp13_ = _tmp12_->photo; #line 638 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp15_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp14_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource)); #line 638 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 638 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp17_ = g_file_get_path (_tmp16_); + _tmp16_ = g_file_get_path (_tmp15_); #line 638 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 638 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_message ("MetadataWriter.vala:638: Completed writing metadata to %s", _tmp18_); + g_message ("MetadataWriter.vala:638: Completed writing metadata to %s", _tmp17_); #line 638 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp17_); #line 638 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_object_unref0 (_tmp16_); -#line 3604 "MetadataWriter.c" + _g_object_unref0 (_tmp15_); +#line 3767 "MetadataWriter.c" } else { - MetadataWriterCommitJob* _tmp19_; - LibraryPhoto* _tmp20_; + MetadataWriterCommitJob* _tmp18_; + LibraryPhoto* _tmp19_; + GFile* _tmp20_; GFile* _tmp21_; - GFile* _tmp22_; + gchar* _tmp22_; gchar* _tmp23_; - gchar* _tmp24_; #line 640 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp19_ = job; + _tmp18_ = job; #line 640 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp20_ = _tmp19_->photo; + _tmp19_ = _tmp18_->photo; #line 640 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp21_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp20_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_MEDIA_SOURCE, MediaSource)); #line 640 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 640 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp23_ = g_file_get_path (_tmp22_); + _tmp22_ = g_file_get_path (_tmp21_); #line 640 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 640 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_message ("MetadataWriter.vala:640: Unable to write metadata to %s", _tmp24_); + g_message ("MetadataWriter.vala:640: Unable to write metadata to %s", _tmp23_); #line 640 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_free0 (_tmp24_); + _g_free0 (_tmp23_); #line 640 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_object_unref0 (_tmp22_); -#line 3630 "MetadataWriter.c" + _g_object_unref0 (_tmp21_); +#line 3793 "MetadataWriter.c" } #line 642 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp25_ = job; + _tmp24_ = job; #line 642 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp26_ = _tmp25_->photo; + _tmp25_ = _tmp24_->photo; #line 642 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp27_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_PHOTO, Photo)); + _tmp26_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO, Photo)); #line 642 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp28_ = _tmp27_; + _tmp27_ = _tmp26_; #line 642 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp29_ = _tmp28_ != NULL; + _tmp28_ = _tmp27_ != NULL; #line 642 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_object_unref0 (_tmp28_); + _g_object_unref0 (_tmp27_); #line 642 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp29_) { -#line 3646 "MetadataWriter.c" - MetadataWriterCommitJob* _tmp30_; - gboolean _tmp31_; + if (_tmp28_) { +#line 3809 "MetadataWriter.c" + MetadataWriterCommitJob* _tmp29_; + gboolean _tmp30_; #line 643 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp30_ = job; + _tmp29_ = job; #line 643 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp31_ = _tmp30_->wrote_editable; + _tmp30_ = _tmp29_->wrote_editable; #line 643 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp31_) { -#line 3655 "MetadataWriter.c" - MetadataWriterCommitJob* _tmp32_; - LibraryPhoto* _tmp33_; + if (_tmp30_) { +#line 3818 "MetadataWriter.c" + MetadataWriterCommitJob* _tmp31_; + LibraryPhoto* _tmp32_; + GFile* _tmp33_; GFile* _tmp34_; - GFile* _tmp35_; + gchar* _tmp35_; gchar* _tmp36_; - gchar* _tmp37_; #line 644 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp32_ = job; + _tmp31_ = job; #line 644 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp33_ = _tmp32_->photo; + _tmp32_ = _tmp31_->photo; #line 644 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp34_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PHOTO, Photo)); + _tmp33_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_PHOTO, Photo)); #line 644 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp35_ = _tmp34_; + _tmp34_ = _tmp33_; #line 644 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp36_ = g_file_get_path (_tmp35_); + _tmp35_ = g_file_get_path (_tmp34_); #line 644 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp37_ = _tmp36_; + _tmp36_ = _tmp35_; #line 644 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_message ("MetadataWriter.vala:644: Completed writing metadata to %s", _tmp37_); + g_message ("MetadataWriter.vala:644: Completed writing metadata to %s", _tmp36_); #line 644 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_free0 (_tmp37_); + _g_free0 (_tmp36_); #line 644 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_object_unref0 (_tmp35_); -#line 3680 "MetadataWriter.c" + _g_object_unref0 (_tmp34_); +#line 3843 "MetadataWriter.c" } else { - MetadataWriterCommitJob* _tmp38_; - LibraryPhoto* _tmp39_; + MetadataWriterCommitJob* _tmp37_; + LibraryPhoto* _tmp38_; + GFile* _tmp39_; GFile* _tmp40_; - GFile* _tmp41_; + gchar* _tmp41_; gchar* _tmp42_; - gchar* _tmp43_; #line 646 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp38_ = job; + _tmp37_ = job; #line 646 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp39_ = _tmp38_->photo; + _tmp38_ = _tmp37_->photo; #line 646 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp40_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PHOTO, Photo)); + _tmp39_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PHOTO, Photo)); #line 646 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp41_ = _tmp40_; + _tmp40_ = _tmp39_; #line 646 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp42_ = g_file_get_path (_tmp41_); + _tmp41_ = g_file_get_path (_tmp40_); #line 646 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp43_ = _tmp42_; + _tmp42_ = _tmp41_; #line 646 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_message ("MetadataWriter.vala:646: Unable to write metadata to %s", _tmp43_); + g_message ("MetadataWriter.vala:646: Unable to write metadata to %s", _tmp42_); #line 646 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_free0 (_tmp43_); + _g_free0 (_tmp42_); #line 646 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_object_unref0 (_tmp41_); -#line 3706 "MetadataWriter.c" + _g_object_unref0 (_tmp40_); +#line 3869 "MetadataWriter.c" } } } #line 650 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp44_ = self->priv->pending; + _tmp43_ = self->priv->pending; #line 650 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp45_ = job; + _tmp44_ = job; #line 650 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp46_ = _tmp45_->photo; + _tmp45_ = _tmp44_->photo; #line 650 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp47_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp46_, NULL); + _tmp46_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp45_, NULL); #line 650 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - removed = _tmp47_; + removed = _tmp46_; #line 651 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp48_ = removed; + _tmp47_ = removed; #line 651 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _vala_assert (_tmp48_, "removed"); + _vala_assert (_tmp47_, "removed"); #line 655 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp49_ = library_photo_global; + _tmp48_ = library_photo_global; #line 655 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp50_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _tmp49_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 655 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp51_ = _tmp50_; + _tmp50_ = _tmp49_; #line 655 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - transaction_controller_begin (_tmp51_); + transaction_controller_begin (_tmp50_); #line 657 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp53_ = job; + _tmp52_ = job; #line 657 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp54_ = _tmp53_->reimport_master_state; + _tmp53_ = _tmp52_->reimport_master_state; #line 657 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp54_ != NULL) { + if (_tmp53_ != NULL) { #line 657 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp52_ = TRUE; -#line 3740 "MetadataWriter.c" + _tmp51_ = TRUE; +#line 3903 "MetadataWriter.c" } else { - MetadataWriterCommitJob* _tmp55_; - PhotoReimportEditableState* _tmp56_; + MetadataWriterCommitJob* _tmp54_; + PhotoReimportEditableState* _tmp55_; #line 657 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp55_ = job; + _tmp54_ = job; #line 657 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp56_ = _tmp55_->reimport_editable_state; + _tmp55_ = _tmp54_->reimport_editable_state; #line 657 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp52_ = _tmp56_ != NULL; -#line 3750 "MetadataWriter.c" + _tmp51_ = _tmp55_ != NULL; +#line 3913 "MetadataWriter.c" } #line 657 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp52_) { -#line 3754 "MetadataWriter.c" - LibraryPhoto* _tmp57_; - MetadataWriterCommitJob* _tmp58_; + if (_tmp51_) { +#line 3917 "MetadataWriter.c" + LibraryPhoto* _tmp56_; + MetadataWriterCommitJob* _tmp57_; + LibraryPhoto* _tmp58_; LibraryPhoto* _tmp59_; - LibraryPhoto* _tmp60_; #line 660 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp57_ = self->priv->ignore_photo_alteration; + _tmp56_ = self->priv->ignore_photo_alteration; #line 660 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _vala_assert (_tmp57_ == NULL, "ignore_photo_alteration == null"); + _vala_assert (_tmp56_ == NULL, "ignore_photo_alteration == null"); #line 661 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp58_ = job; + _tmp57_ = job; #line 661 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp59_ = _tmp58_->photo; + _tmp58_ = _tmp57_->photo; #line 661 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp60_ = _g_object_ref0 (_tmp59_); + _tmp59_ = _g_object_ref0 (_tmp58_); #line 661 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (self->priv->ignore_photo_alteration); #line 661 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - self->priv->ignore_photo_alteration = _tmp60_; -#line 3773 "MetadataWriter.c" + self->priv->ignore_photo_alteration = _tmp59_; +#line 3936 "MetadataWriter.c" { - MetadataWriterCommitJob* _tmp61_; - PhotoReimportMasterState* _tmp62_; - MetadataWriterCommitJob* _tmp70_; - PhotoReimportEditableState* _tmp71_; + MetadataWriterCommitJob* _tmp60_; + PhotoReimportMasterState* _tmp61_; + MetadataWriterCommitJob* _tmp69_; + PhotoReimportEditableState* _tmp70_; #line 663 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp61_ = job; + _tmp60_ = job; #line 663 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp62_ = _tmp61_->reimport_master_state; + _tmp61_ = _tmp60_->reimport_master_state; #line 663 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp62_ != NULL) { -#line 3785 "MetadataWriter.c" - MetadataWriterCommitJob* _tmp63_; - LibraryPhoto* _tmp64_; - MetadataWriterCommitJob* _tmp65_; - PhotoReimportMasterState* _tmp66_; + if (_tmp61_ != NULL) { +#line 3948 "MetadataWriter.c" + MetadataWriterCommitJob* _tmp62_; + LibraryPhoto* _tmp63_; + MetadataWriterCommitJob* _tmp64_; + PhotoReimportMasterState* _tmp65_; #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp63_ = job; + _tmp62_ = job; #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp64_ = _tmp63_->photo; + _tmp63_ = _tmp62_->photo; #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp65_ = job; + _tmp64_ = job; #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp66_ = _tmp65_->reimport_master_state; + _tmp65_ = _tmp64_->reimport_master_state; #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo_finish_update_master_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_PHOTO, Photo), _tmp66_, &_inner_error_); + photo_finish_update_master_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_PHOTO, Photo), _tmp65_, &_inner_error_); #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 3804 "MetadataWriter.c" +#line 3967 "MetadataWriter.c" goto __catch564_database_error; } { - LibraryPhoto* _tmp67_; - MetadataWriterCommitJob* _tmp68_; - LibraryPhoto* _tmp69_; + LibraryPhoto* _tmp66_; + MetadataWriterCommitJob* _tmp67_; + LibraryPhoto* _tmp68_; #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp67_ = self->priv->ignore_photo_alteration; + _tmp66_ = self->priv->ignore_photo_alteration; #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp68_ = job; + _tmp67_ = job; #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp69_ = _tmp68_->photo; + _tmp68_ = _tmp67_->photo; #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _vala_assert (_tmp67_ == _tmp69_, "ignore_photo_alteration == job.photo"); + _vala_assert (_tmp66_ == _tmp68_, "ignore_photo_alteration == job.photo"); #line 673 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (self->priv->ignore_photo_alteration); #line 673 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->priv->ignore_photo_alteration = NULL; -#line 3823 "MetadataWriter.c" +#line 3986 "MetadataWriter.c" } #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _background_job_unref0 (job); @@ -3829,54 +3992,54 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun g_clear_error (&_inner_error_); #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 3833 "MetadataWriter.c" +#line 3996 "MetadataWriter.c" } } #line 666 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp70_ = job; + _tmp69_ = job; #line 666 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp71_ = _tmp70_->reimport_editable_state; + _tmp70_ = _tmp69_->reimport_editable_state; #line 666 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp71_ != NULL) { -#line 3842 "MetadataWriter.c" - MetadataWriterCommitJob* _tmp72_; - LibraryPhoto* _tmp73_; - MetadataWriterCommitJob* _tmp74_; - PhotoReimportEditableState* _tmp75_; + if (_tmp70_ != NULL) { +#line 4005 "MetadataWriter.c" + MetadataWriterCommitJob* _tmp71_; + LibraryPhoto* _tmp72_; + MetadataWriterCommitJob* _tmp73_; + PhotoReimportEditableState* _tmp74_; #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp72_ = job; + _tmp71_ = job; #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp73_ = _tmp72_->photo; + _tmp72_ = _tmp71_->photo; #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp74_ = job; + _tmp73_ = job; #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp75_ = _tmp74_->reimport_editable_state; + _tmp74_ = _tmp73_->reimport_editable_state; #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo_finish_update_editable_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_PHOTO, Photo), _tmp75_, &_inner_error_); + photo_finish_update_editable_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_PHOTO, Photo), _tmp74_, &_inner_error_); #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 3861 "MetadataWriter.c" +#line 4024 "MetadataWriter.c" goto __catch564_database_error; } { - LibraryPhoto* _tmp76_; - MetadataWriterCommitJob* _tmp77_; - LibraryPhoto* _tmp78_; + LibraryPhoto* _tmp75_; + MetadataWriterCommitJob* _tmp76_; + LibraryPhoto* _tmp77_; #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp76_ = self->priv->ignore_photo_alteration; + _tmp75_ = self->priv->ignore_photo_alteration; #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp77_ = job; + _tmp76_ = job; #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp78_ = _tmp77_->photo; + _tmp77_ = _tmp76_->photo; #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _vala_assert (_tmp76_ == _tmp78_, "ignore_photo_alteration == job.photo"); + _vala_assert (_tmp75_ == _tmp77_, "ignore_photo_alteration == job.photo"); #line 673 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (self->priv->ignore_photo_alteration); #line 673 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->priv->ignore_photo_alteration = NULL; -#line 3880 "MetadataWriter.c" +#line 4043 "MetadataWriter.c" } #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _background_job_unref0 (job); @@ -3886,7 +4049,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun g_clear_error (&_inner_error_); #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 3890 "MetadataWriter.c" +#line 4053 "MetadataWriter.c" } } } @@ -3894,37 +4057,37 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun __catch564_database_error: { GError* err = NULL; - GError* _tmp79_; + GError* _tmp78_; #line 662 "/home/jens/Source/shotwell/src/MetadataWriter.vala" err = _inner_error_; #line 662 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _inner_error_ = NULL; #line 669 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp79_ = err; + _tmp78_ = err; #line 669 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - app_window_database_error (_tmp79_); + app_window_database_error (_tmp78_); #line 662 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_error_free0 (err); -#line 3909 "MetadataWriter.c" +#line 4072 "MetadataWriter.c" } __finally564: { - LibraryPhoto* _tmp80_; - MetadataWriterCommitJob* _tmp81_; - LibraryPhoto* _tmp82_; + LibraryPhoto* _tmp79_; + MetadataWriterCommitJob* _tmp80_; + LibraryPhoto* _tmp81_; #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp80_ = self->priv->ignore_photo_alteration; + _tmp79_ = self->priv->ignore_photo_alteration; #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp81_ = job; + _tmp80_ = job; #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp82_ = _tmp81_->photo; + _tmp81_ = _tmp80_->photo; #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _vala_assert (_tmp80_ == _tmp82_, "ignore_photo_alteration == job.photo"); + _vala_assert (_tmp79_ == _tmp81_, "ignore_photo_alteration == job.photo"); #line 673 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (self->priv->ignore_photo_alteration); #line 673 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->priv->ignore_photo_alteration = NULL; -#line 3928 "MetadataWriter.c" +#line 4091 "MetadataWriter.c" } #line 662 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -3936,24 +4099,24 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun g_clear_error (&_inner_error_); #line 662 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 3940 "MetadataWriter.c" +#line 4103 "MetadataWriter.c" } } else { } { - MetadataWriterCommitJob* _tmp83_; - LibraryPhoto* _tmp84_; + MetadataWriterCommitJob* _tmp82_; + LibraryPhoto* _tmp83_; #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp83_ = job; + _tmp82_ = job; #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp84_ = _tmp83_->photo; + _tmp83_ = _tmp82_->photo; #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo_set_master_metadata_dirty (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, TYPE_PHOTO, Photo), FALSE, &_inner_error_); + photo_set_master_metadata_dirty (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, TYPE_PHOTO, Photo), FALSE, &_inner_error_); #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 3957 "MetadataWriter.c" +#line 4120 "MetadataWriter.c" goto __catch565_database_error; } #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3964,25 +4127,25 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun g_clear_error (&_inner_error_); #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 3968 "MetadataWriter.c" +#line 4131 "MetadataWriter.c" } } goto __finally565; __catch565_database_error: { GError* err = NULL; - GError* _tmp85_; + GError* _tmp84_; #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala" err = _inner_error_; #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _inner_error_ = NULL; #line 685 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp85_ = err; + _tmp84_ = err; #line 685 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - app_window_database_error (_tmp85_); + app_window_database_error (_tmp84_); #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_error_free0 (err); -#line 3986 "MetadataWriter.c" +#line 4149 "MetadataWriter.c" } __finally565: #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3995,29 +4158,30 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun g_clear_error (&_inner_error_); #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 3999 "MetadataWriter.c" +#line 4162 "MetadataWriter.c" } #line 688 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp86_ = library_photo_global; + _tmp85_ = library_photo_global; #line 688 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp87_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _tmp86_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 688 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp88_ = _tmp87_; + _tmp87_ = _tmp86_; #line 688 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - transaction_controller_commit (_tmp88_); + transaction_controller_commit (_tmp87_); #line 690 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_count_completed_work (self, 1, TRUE); #line 631 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _background_job_unref0 (job); -#line 4013 "MetadataWriter.c" +#line 4176 "MetadataWriter.c" } -static void metadata_writer_on_update_cancelled (MetadataWriter* self, BackgroundJob* j) { +static void +metadata_writer_on_update_cancelled (MetadataWriter* self, + BackgroundJob* j) +{ gboolean removed = FALSE; GeeHashSet* _tmp0_; - BackgroundJob* _tmp1_; - gboolean _tmp2_; #line 693 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 693 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4025,20 +4189,23 @@ static void metadata_writer_on_update_cancelled (MetadataWriter* self, Backgroun #line 694 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = self->priv->pending_cancel; #line 694 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp1_ = j; -#line 694 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp2_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, METADATA_WRITER_TYPE_COMMIT_JOB, MetadataWriterCommitJob)); -#line 694 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - removed = _tmp2_; + removed = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (j, METADATA_WRITER_TYPE_COMMIT_JOB, MetadataWriterCommitJob)); #line 695 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _vala_assert (removed, "removed"); #line 697 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_count_cancelled_work (self, 1, TRUE); -#line 4038 "MetadataWriter.c" +#line 4198 "MetadataWriter.c" } -static void g_cclosure_user_marshal_VOID__UINT_UINT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__UINT_UINT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__UINT_UINT) (gpointer data1, guint arg_1, guint arg_2, gpointer data2); register GMarshalFunc_VOID__UINT_UINT callback; register GCClosure * cc; @@ -4053,47 +4220,53 @@ static void g_cclosure_user_marshal_VOID__UINT_UINT (GClosure * closure, GValue data1 = closure->data; #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala" data2 = param_values->data[0].v_pointer; -#line 4057 "MetadataWriter.c" +#line 4224 "MetadataWriter.c" } else { #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala" data1 = param_values->data[0].v_pointer; #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala" data2 = closure->data; -#line 4063 "MetadataWriter.c" +#line 4230 "MetadataWriter.c" } #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala" callback = (GMarshalFunc_VOID__UINT_UINT) (marshal_data ? marshal_data : cc->callback); #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala" callback (data1, g_value_get_uint (param_values + 1), g_value_get_uint (param_values + 2), data2); -#line 4069 "MetadataWriter.c" +#line 4236 "MetadataWriter.c" } -static void _metadata_writer_on_update_completed_completion_callback (BackgroundJob* job, gpointer self) { +static void +_metadata_writer_on_update_completed_completion_callback (BackgroundJob* job, + gpointer self) +{ #line 30 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_update_completed ((MetadataWriter*) self, job); -#line 4076 "MetadataWriter.c" +#line 4246 "MetadataWriter.c" } -static void _metadata_writer_on_update_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { +static void +_metadata_writer_on_update_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self) +{ #line 30 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_update_cancelled ((MetadataWriter*) self, job); -#line 4083 "MetadataWriter.c" +#line 4256 "MetadataWriter.c" } -static MetadataWriterCommitJob* metadata_writer_commit_job_construct (GType object_type, MetadataWriter* owner, LibraryPhoto* photo, GeeSet* keywords) { +static MetadataWriterCommitJob* +metadata_writer_commit_job_construct (GType object_type, + MetadataWriter* owner, + LibraryPhoto* photo, + GeeSet* keywords) +{ MetadataWriterCommitJob* self = NULL; - MetadataWriter* _tmp0_; - MetadataWriter* _tmp1_; - GCancellable* _tmp2_; - GCancellable* _tmp3_; - MetadataWriter* _tmp4_; - LibraryPhoto* _tmp5_; - LibraryPhoto* _tmp6_; - GeeSet* _tmp7_; - GeeSet* _tmp8_; + GCancellable* _tmp0_; + GCancellable* _tmp1_; + LibraryPhoto* _tmp2_; + GeeSet* _tmp3_; #line 29 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_val_if_fail (IS_METADATA_WRITER (owner), NULL); #line 29 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4101,74 +4274,72 @@ static MetadataWriterCommitJob* metadata_writer_commit_job_construct (GType obje #line 29 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_val_if_fail ((keywords == NULL) || GEE_IS_SET (keywords), NULL); #line 30 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp0_ = owner; + _tmp0_ = g_cancellable_new (); #line 30 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp1_ = owner; -#line 30 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp2_ = g_cancellable_new (); -#line 30 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp3_ = _tmp2_; -#line 30 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp4_ = owner; + _tmp1_ = _tmp0_; #line 30 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - self = (MetadataWriterCommitJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _metadata_writer_on_update_completed_completion_callback, _tmp1_, _tmp3_, _metadata_writer_on_update_cancelled_cancellation_callback, _tmp4_, NULL); + self = (MetadataWriterCommitJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), _metadata_writer_on_update_completed_completion_callback, owner, _tmp1_, _metadata_writer_on_update_cancelled_cancellation_callback, owner, NULL); #line 30 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_object_unref0 (_tmp3_); -#line 32 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp5_ = photo; + _g_object_unref0 (_tmp1_); #line 32 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp2_ = _g_object_ref0 (photo); #line 32 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (self->photo); #line 32 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - self->photo = _tmp6_; -#line 33 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp7_ = keywords; + self->photo = _tmp2_; #line 33 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp8_ = _g_object_ref0 (_tmp7_); + _tmp3_ = _g_object_ref0 (keywords); #line 33 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (self->current_keywords); #line 33 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - self->current_keywords = _tmp8_; + self->current_keywords = _tmp3_; #line 29 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return self; -#line 4136 "MetadataWriter.c" +#line 4299 "MetadataWriter.c" } -static MetadataWriterCommitJob* metadata_writer_commit_job_new (MetadataWriter* owner, LibraryPhoto* photo, GeeSet* keywords) { +static MetadataWriterCommitJob* +metadata_writer_commit_job_new (MetadataWriter* owner, + LibraryPhoto* photo, + GeeSet* keywords) +{ #line 29 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return metadata_writer_commit_job_construct (METADATA_WRITER_TYPE_COMMIT_JOB, owner, photo, keywords); -#line 4143 "MetadataWriter.c" +#line 4310 "MetadataWriter.c" } -static gpointer _g_error_copy0 (gpointer self) { +static gpointer +_g_error_copy0 (gpointer self) +{ #line 41 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return self ? g_error_copy (self) : NULL; -#line 4150 "MetadataWriter.c" +#line 4319 "MetadataWriter.c" } -static void metadata_writer_commit_job_real_execute (BackgroundJob* base) { +static void +metadata_writer_commit_job_real_execute (BackgroundJob* base) +{ MetadataWriterCommitJob * self; GError * _inner_error_ = NULL; #line 36 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, METADATA_WRITER_TYPE_COMMIT_JOB, MetadataWriterCommitJob); -#line 4159 "MetadataWriter.c" +#line 4330 "MetadataWriter.c" { #line 38 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_commit_job_commit_master (self, &_inner_error_); #line 38 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4165 "MetadataWriter.c" +#line 4336 "MetadataWriter.c" goto __catch566_g_error; } #line 39 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_commit_job_commit_editable (self, &_inner_error_); #line 39 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4172 "MetadataWriter.c" +#line 4343 "MetadataWriter.c" goto __catch566_g_error; } } @@ -4192,7 +4363,7 @@ static void metadata_writer_commit_job_real_execute (BackgroundJob* base) { self->err = _tmp1_; #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_error_free0 (err); -#line 4196 "MetadataWriter.c" +#line 4367 "MetadataWriter.c" } __finally566: #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4203,118 +4374,109 @@ static void metadata_writer_commit_job_real_execute (BackgroundJob* base) { g_clear_error (&_inner_error_); #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 4207 "MetadataWriter.c" +#line 4378 "MetadataWriter.c" } } -static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* self, GError** error) { +static void +metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* self, + GError** error) +{ gboolean skip_orientation = FALSE; LibraryPhoto* _tmp0_; - gboolean _tmp1_; - LibraryPhoto* _tmp2_; - PhotoFileFormat _tmp3_; - gboolean _tmp4_; + LibraryPhoto* _tmp1_; PhotoMetadata* metadata = NULL; - LibraryPhoto* _tmp5_; - PhotoMetadata* _tmp6_; - PhotoMetadata* _tmp7_; - gboolean _tmp8_; - gboolean _tmp9_; + LibraryPhoto* _tmp2_; + PhotoMetadata* _tmp3_; + PhotoMetadata* _tmp4_; + gboolean _tmp5_; GError * _inner_error_ = NULL; #line 45 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (METADATA_WRITER_IS_COMMIT_JOB (self)); #line 49 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = self->photo; #line 49 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp1_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo)); -#line 49 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - skip_orientation = _tmp1_; -#line 51 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp2_ = self->photo; + skip_orientation = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo)); #line 51 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp3_ = photo_get_master_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO, Photo)); -#line 51 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp4_ = photo_file_format_can_write_metadata (_tmp3_); + _tmp1_ = self->photo; #line 51 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (!_tmp4_) { + if (!photo_file_format_can_write_metadata (photo_get_master_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO, Photo)))) { #line 52 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 4244 "MetadataWriter.c" +#line 4408 "MetadataWriter.c" } #line 54 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp5_ = self->photo; + _tmp2_ = self->photo; #line 54 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp6_ = photo_get_master_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO, Photo), &_inner_error_); + _tmp3_ = photo_get_master_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO, Photo), &_inner_error_); #line 54 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - metadata = _tmp6_; + metadata = _tmp3_; #line 54 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 54 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_propagate_error (error, _inner_error_); #line 54 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 4258 "MetadataWriter.c" +#line 4422 "MetadataWriter.c" } #line 55 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp7_ = metadata; -#line 55 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp8_ = skip_orientation; + _tmp4_ = metadata; #line 55 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp9_ = metadata_writer_commit_job_update_metadata (self, _tmp7_, _tmp8_); + _tmp5_ = skip_orientation; #line 55 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp9_) { -#line 4268 "MetadataWriter.c" - LibraryPhoto* _tmp10_; - GFile* _tmp11_; - GFile* _tmp12_; + if (metadata_writer_commit_job_update_metadata (self, _tmp4_, _tmp5_)) { +#line 4430 "MetadataWriter.c" + LibraryPhoto* _tmp6_; + GFile* _tmp7_; + GFile* _tmp8_; #line 56 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp10_ = self->photo; + _tmp6_ = self->photo; #line 56 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp11_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp7_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource)); #line 56 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 56 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - library_monitor_blacklist_file (_tmp12_, "MetadataWriter.commit_master"); + library_monitor_blacklist_file (_tmp8_, "MetadataWriter.commit_master"); #line 56 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_object_unref0 (_tmp12_); -#line 4282 "MetadataWriter.c" + _g_object_unref0 (_tmp8_); +#line 4444 "MetadataWriter.c" { - LibraryPhoto* _tmp13_; - PhotoMetadata* _tmp14_; - PhotoReimportMasterState* _tmp15_ = NULL; + LibraryPhoto* _tmp9_; + PhotoMetadata* _tmp10_; + PhotoReimportMasterState* _tmp11_ = NULL; #line 58 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp13_ = self->photo; + _tmp9_ = self->photo; #line 58 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp14_ = metadata; + _tmp10_ = metadata; #line 58 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo_persist_master_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO, Photo), _tmp14_, &_tmp15_, &_inner_error_); + photo_persist_master_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo), _tmp10_, &_tmp11_, &_inner_error_); #line 58 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _photo_reimport_master_state_unref0 (self->reimport_master_state); #line 58 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - self->reimport_master_state = _tmp15_; + self->reimport_master_state = _tmp11_; #line 58 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4299 "MetadataWriter.c" +#line 4461 "MetadataWriter.c" goto __finally567; } } __finally567: { - LibraryPhoto* _tmp16_; - GFile* _tmp17_; - GFile* _tmp18_; + LibraryPhoto* _tmp12_; + GFile* _tmp13_; + GFile* _tmp14_; #line 60 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp16_ = self->photo; + _tmp12_ = self->photo; #line 60 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp17_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp13_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MEDIA_SOURCE, MediaSource)); #line 60 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp18_ = _tmp17_; + _tmp14_ = _tmp13_; #line 60 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - library_monitor_unblacklist_file (_tmp18_); + library_monitor_unblacklist_file (_tmp14_); #line 60 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_object_unref0 (_tmp18_); -#line 4318 "MetadataWriter.c" + _g_object_unref0 (_tmp14_); +#line 4480 "MetadataWriter.c" } #line 57 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -4324,139 +4486,133 @@ static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* s _media_metadata_unref0 (metadata); #line 57 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 4328 "MetadataWriter.c" +#line 4490 "MetadataWriter.c" } } #line 64 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->wrote_master = TRUE; #line 45 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _media_metadata_unref0 (metadata); -#line 4335 "MetadataWriter.c" +#line 4497 "MetadataWriter.c" } -static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob* self, GError** error) { +static void +metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob* self, + GError** error) +{ gboolean _tmp0_ = FALSE; LibraryPhoto* _tmp1_; - gboolean _tmp2_; PhotoMetadata* metadata = NULL; - LibraryPhoto* _tmp7_; + LibraryPhoto* _tmp5_; + PhotoMetadata* _tmp6_; + PhotoMetadata* _tmp7_; PhotoMetadata* _tmp8_; - PhotoMetadata* _tmp9_; - PhotoMetadata* _tmp10_; - gboolean _tmp11_; GError * _inner_error_ = NULL; #line 67 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (METADATA_WRITER_IS_COMMIT_JOB (self)); #line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp1_ = self->photo; #line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp2_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO, Photo)); -#line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (!_tmp2_) { + if (!photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO, Photo))) { #line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = TRUE; -#line 4360 "MetadataWriter.c" +#line 4521 "MetadataWriter.c" } else { - LibraryPhoto* _tmp3_; + LibraryPhoto* _tmp2_; + PhotoFileFormat* _tmp3_; PhotoFileFormat* _tmp4_; - PhotoFileFormat* _tmp5_; - gboolean _tmp6_; -#line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp3_ = self->photo; #line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp4_ = photo_get_editable_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO, Photo)); + _tmp2_ = self->photo; #line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp5_ = _tmp4_; + _tmp3_ = photo_get_editable_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO, Photo)); #line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp6_ = photo_file_format_can_write_metadata (*_tmp5_); + _tmp4_ = _tmp3_; #line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp0_ = !_tmp6_; + _tmp0_ = !photo_file_format_can_write_metadata (*_tmp4_); #line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_free0 (_tmp5_); -#line 4378 "MetadataWriter.c" + _g_free0 (_tmp4_); +#line 4536 "MetadataWriter.c" } #line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp0_) { #line 69 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 4384 "MetadataWriter.c" +#line 4542 "MetadataWriter.c" } #line 71 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp7_ = self->photo; + _tmp5_ = self->photo; #line 71 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp8_ = photo_get_editable_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO, Photo), &_inner_error_); + _tmp6_ = photo_get_editable_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO, Photo), &_inner_error_); #line 71 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - metadata = _tmp8_; + metadata = _tmp6_; #line 71 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 71 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_propagate_error (error, _inner_error_); #line 71 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 4398 "MetadataWriter.c" +#line 4556 "MetadataWriter.c" } #line 72 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp9_ = metadata; + _tmp7_ = metadata; #line 72 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _vala_assert (_tmp9_ != NULL, "metadata != null"); -#line 74 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp10_ = metadata; + _vala_assert (_tmp7_ != NULL, "metadata != null"); #line 74 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp11_ = metadata_writer_commit_job_update_metadata (self, _tmp10_, FALSE); + _tmp8_ = metadata; #line 74 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp11_) { -#line 4410 "MetadataWriter.c" - LibraryPhoto* _tmp12_; - GFile* _tmp13_; - GFile* _tmp14_; + if (metadata_writer_commit_job_update_metadata (self, _tmp8_, FALSE)) { +#line 4566 "MetadataWriter.c" + LibraryPhoto* _tmp9_; + GFile* _tmp10_; + GFile* _tmp11_; #line 75 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp12_ = self->photo; + _tmp9_ = self->photo; #line 75 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp13_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO, Photo)); + _tmp10_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo)); #line 75 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp14_ = _tmp13_; + _tmp11_ = _tmp10_; #line 75 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - library_monitor_blacklist_file (_tmp14_, "MetadataWriter.commit_editable"); + library_monitor_blacklist_file (_tmp11_, "MetadataWriter.commit_editable"); #line 75 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_object_unref0 (_tmp14_); -#line 4424 "MetadataWriter.c" + _g_object_unref0 (_tmp11_); +#line 4580 "MetadataWriter.c" { - LibraryPhoto* _tmp15_; - PhotoMetadata* _tmp16_; - PhotoReimportEditableState* _tmp17_ = NULL; + LibraryPhoto* _tmp12_; + PhotoMetadata* _tmp13_; + PhotoReimportEditableState* _tmp14_ = NULL; #line 77 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp15_ = self->photo; + _tmp12_ = self->photo; #line 77 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp16_ = metadata; + _tmp13_ = metadata; #line 77 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo_persist_editable_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO, Photo), _tmp16_, &_tmp17_, &_inner_error_); + photo_persist_editable_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO, Photo), _tmp13_, &_tmp14_, &_inner_error_); #line 77 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _photo_reimport_editable_state_unref0 (self->reimport_editable_state); #line 77 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - self->reimport_editable_state = _tmp17_; + self->reimport_editable_state = _tmp14_; #line 77 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4441 "MetadataWriter.c" +#line 4597 "MetadataWriter.c" goto __finally568; } } __finally568: { - LibraryPhoto* _tmp18_; - GFile* _tmp19_; - GFile* _tmp20_; + LibraryPhoto* _tmp15_; + GFile* _tmp16_; + GFile* _tmp17_; #line 79 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp18_ = self->photo; + _tmp15_ = self->photo; #line 79 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp19_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo)); + _tmp16_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO, Photo)); #line 79 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp20_ = _tmp19_; + _tmp17_ = _tmp16_; #line 79 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - library_monitor_unblacklist_file (_tmp20_); + library_monitor_unblacklist_file (_tmp17_); #line 79 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_object_unref0 (_tmp20_); -#line 4460 "MetadataWriter.c" + _g_object_unref0 (_tmp17_); +#line 4616 "MetadataWriter.c" } #line 76 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -4466,63 +4622,57 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob* _media_metadata_unref0 (metadata); #line 76 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 4470 "MetadataWriter.c" +#line 4626 "MetadataWriter.c" } } #line 83 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->wrote_editable = TRUE; #line 67 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _media_metadata_unref0 (metadata); -#line 4477 "MetadataWriter.c" +#line 4633 "MetadataWriter.c" } -static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommitJob* self, PhotoMetadata* metadata, gboolean skip_orientation) { +static gboolean +metadata_writer_commit_job_update_metadata (MetadataWriterCommitJob* self, + PhotoMetadata* metadata, + gboolean skip_orientation) +{ gboolean result = FALSE; gboolean changed = FALSE; gchar* current_title = NULL; LibraryPhoto* _tmp0_; gchar* _tmp1_; const gchar* _tmp2_; - PhotoMetadata* _tmp3_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; - gboolean _tmp6_; + gboolean _tmp5_; gchar* current_comment = NULL; - LibraryPhoto* _tmp9_; + LibraryPhoto* _tmp7_; + gchar* _tmp8_; + const gchar* _tmp9_; gchar* _tmp10_; - const gchar* _tmp11_; - PhotoMetadata* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; - gboolean _tmp15_; + gchar* _tmp11_; + gboolean _tmp12_; Rating current_rating = 0; - LibraryPhoto* _tmp18_; - Rating _tmp19_; - Rating _tmp20_; - PhotoMetadata* _tmp21_; - Rating _tmp22_; + LibraryPhoto* _tmp14_; + Rating _tmp15_; time_t current_exposure_time = 0; - LibraryPhoto* _tmp25_; - time_t _tmp26_; + LibraryPhoto* _tmp17_; time_t metadata_exposure_time = 0; MetadataDateTime* metadata_exposure_date_time = NULL; - PhotoMetadata* _tmp27_; - MetadataDateTime* _tmp28_; - MetadataDateTime* _tmp29_; - time_t _tmp32_; - time_t _tmp33_; + MetadataDateTime* _tmp18_; + MetadataDateTime* _tmp19_; + time_t _tmp21_; + time_t _tmp22_; GeeSet* safe_keywords = NULL; - GeeHashSet* _tmp39_; + GeeHashSet* _tmp27_; + GeeSet* _tmp28_; GeeSet* _tmp40_; - GeeSet* _tmp53_; - PhotoMetadata* _tmp54_; - GeeSet* _tmp55_; - GeeSet* _tmp56_; - gboolean _tmp57_; - gboolean _tmp58_; - gboolean _tmp61_; - gboolean _tmp69_; + GeeSet* _tmp41_; + GeeSet* _tmp42_; + gboolean _tmp43_; + gboolean _tmp48_; #line 86 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_val_if_fail (METADATA_WRITER_IS_COMMIT_JOB (self), FALSE); #line 86 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4538,320 +4688,263 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit #line 91 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp2_ = current_title; #line 91 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp3_ = metadata; + _tmp3_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (metadata, TYPE_MEDIA_METADATA, MediaMetadata)); #line 91 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp4_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp4_ = _tmp3_; #line 91 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp5_ = _tmp4_; + _tmp5_ = g_strcmp0 (_tmp2_, _tmp4_) != 0; #line 91 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp6_ = g_strcmp0 (_tmp2_, _tmp5_) != 0; + _g_free0 (_tmp4_); #line 91 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_free0 (_tmp5_); -#line 91 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp6_) { -#line 4553 "MetadataWriter.c" - PhotoMetadata* _tmp7_; - const gchar* _tmp8_; -#line 92 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp7_ = metadata; + if (_tmp5_) { +#line 4701 "MetadataWriter.c" + const gchar* _tmp6_; #line 92 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp8_ = current_title; + _tmp6_ = current_title; #line 92 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo_metadata_set_title (_tmp7_, _tmp8_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_title (metadata, _tmp6_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 93 "/home/jens/Source/shotwell/src/MetadataWriter.vala" changed = TRUE; -#line 4564 "MetadataWriter.c" +#line 4709 "MetadataWriter.c" } #line 97 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp9_ = self->photo; + _tmp7_ = self->photo; #line 97 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp10_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp8_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource)); #line 97 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - current_comment = _tmp10_; -#line 98 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp11_ = current_comment; + current_comment = _tmp8_; #line 98 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp12_ = metadata; + _tmp9_ = current_comment; #line 98 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp13_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp10_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (metadata, TYPE_MEDIA_METADATA, MediaMetadata)); #line 98 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp14_ = _tmp13_; + _tmp11_ = _tmp10_; #line 98 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp15_ = g_strcmp0 (_tmp11_, _tmp14_) != 0; + _tmp12_ = g_strcmp0 (_tmp9_, _tmp11_) != 0; #line 98 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_free0 (_tmp14_); + _g_free0 (_tmp11_); #line 98 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp15_) { -#line 4586 "MetadataWriter.c" - PhotoMetadata* _tmp16_; - const gchar* _tmp17_; -#line 99 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp16_ = metadata; + if (_tmp12_) { +#line 4729 "MetadataWriter.c" + const gchar* _tmp13_; #line 99 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp17_ = current_comment; + _tmp13_ = current_comment; #line 99 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo_metadata_set_comment (_tmp16_, _tmp17_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_comment (metadata, _tmp13_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 100 "/home/jens/Source/shotwell/src/MetadataWriter.vala" changed = TRUE; -#line 4597 "MetadataWriter.c" +#line 4737 "MetadataWriter.c" } #line 104 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp18_ = self->photo; + _tmp14_ = self->photo; #line 104 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp19_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 104 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - current_rating = _tmp19_; -#line 105 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp20_ = current_rating; + current_rating = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_MEDIA_SOURCE, MediaSource)); #line 105 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp21_ = metadata; + _tmp15_ = current_rating; #line 105 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp22_ = photo_metadata_get_rating (_tmp21_); -#line 105 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp20_ != _tmp22_) { -#line 4613 "MetadataWriter.c" - PhotoMetadata* _tmp23_; - Rating _tmp24_; -#line 106 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp23_ = metadata; + if (_tmp15_ != photo_metadata_get_rating (metadata)) { +#line 4747 "MetadataWriter.c" + Rating _tmp16_; #line 106 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp24_ = current_rating; + _tmp16_ = current_rating; #line 106 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo_metadata_set_rating (_tmp23_, _tmp24_); + photo_metadata_set_rating (metadata, _tmp16_); #line 107 "/home/jens/Source/shotwell/src/MetadataWriter.vala" changed = TRUE; -#line 4624 "MetadataWriter.c" +#line 4755 "MetadataWriter.c" } #line 111 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp25_ = self->photo; + _tmp17_ = self->photo; #line 111 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp26_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 111 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - current_exposure_time = _tmp26_; + current_exposure_time = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MEDIA_SOURCE, MediaSource)); #line 112 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_exposure_time = (time_t) 0; #line 113 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp27_ = metadata; -#line 113 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp28_ = photo_metadata_get_exposure_date_time (_tmp27_); + _tmp18_ = photo_metadata_get_exposure_date_time (metadata); #line 113 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - metadata_exposure_date_time = _tmp28_; + metadata_exposure_date_time = _tmp18_; #line 114 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp29_ = metadata_exposure_date_time; + _tmp19_ = metadata_exposure_date_time; #line 114 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp29_ != NULL) { -#line 4644 "MetadataWriter.c" - MetadataDateTime* _tmp30_; - time_t _tmp31_; -#line 115 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp30_ = metadata_exposure_date_time; + if (_tmp19_ != NULL) { +#line 4771 "MetadataWriter.c" + MetadataDateTime* _tmp20_; #line 115 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp31_ = metadata_date_time_get_timestamp (_tmp30_); + _tmp20_ = metadata_exposure_date_time; #line 115 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - metadata_exposure_time = _tmp31_; -#line 4653 "MetadataWriter.c" + metadata_exposure_time = metadata_date_time_get_timestamp (_tmp20_); +#line 4777 "MetadataWriter.c" } #line 116 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp32_ = current_exposure_time; + _tmp21_ = current_exposure_time; #line 116 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp33_ = metadata_exposure_time; + _tmp22_ = metadata_exposure_time; #line 116 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp32_ != _tmp33_) { -#line 4661 "MetadataWriter.c" - MetadataDateTime* _tmp34_ = NULL; - time_t _tmp35_; - PhotoMetadata* _tmp38_; + if (_tmp21_ != _tmp22_) { +#line 4785 "MetadataWriter.c" + MetadataDateTime* _tmp23_ = NULL; + time_t _tmp24_; #line 117 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp35_ = current_exposure_time; + _tmp24_ = current_exposure_time; #line 117 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp35_ != ((time_t) 0)) { -#line 4669 "MetadataWriter.c" - time_t _tmp36_; - MetadataDateTime* _tmp37_; + if (_tmp24_ != ((time_t) 0)) { +#line 4792 "MetadataWriter.c" + time_t _tmp25_; + MetadataDateTime* _tmp26_; #line 118 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp36_ = current_exposure_time; + _tmp25_ = current_exposure_time; #line 118 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp37_ = metadata_date_time_new (_tmp36_); + _tmp26_ = metadata_date_time_new (_tmp25_); #line 118 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _metadata_date_time_unref0 (_tmp34_); + _metadata_date_time_unref0 (_tmp23_); #line 118 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp34_ = _tmp37_; -#line 4680 "MetadataWriter.c" + _tmp23_ = _tmp26_; +#line 4803 "MetadataWriter.c" } else { #line 119 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _metadata_date_time_unref0 (_tmp34_); + _metadata_date_time_unref0 (_tmp23_); #line 119 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp34_ = NULL; -#line 4686 "MetadataWriter.c" + _tmp23_ = NULL; +#line 4809 "MetadataWriter.c" } #line 117 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp38_ = metadata; -#line 117 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo_metadata_set_exposure_date_time (_tmp38_, _tmp34_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_exposure_date_time (metadata, _tmp23_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 120 "/home/jens/Source/shotwell/src/MetadataWriter.vala" changed = TRUE; #line 116 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _metadata_date_time_unref0 (_tmp34_); -#line 4696 "MetadataWriter.c" + _metadata_date_time_unref0 (_tmp23_); +#line 4817 "MetadataWriter.c" } #line 124 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp39_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp27_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 124 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - safe_keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_SET, GeeSet); + safe_keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_SET, GeeSet); #line 133 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp40_ = self->current_keywords; + _tmp28_ = self->current_keywords; #line 133 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp40_ != NULL) { -#line 4706 "MetadataWriter.c" + if (_tmp28_ != NULL) { +#line 4827 "MetadataWriter.c" { GeeIterator* _tmp_it = NULL; - GeeSet* _tmp41_; - GeeIterator* _tmp42_; + GeeSet* _tmp29_; + GeeIterator* _tmp30_; #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp41_ = self->current_keywords; + _tmp29_ = self->current_keywords; #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp42_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp30_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ITERABLE, GeeIterable)); #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp_it = _tmp42_; + _tmp_it = _tmp30_; #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 4719 "MetadataWriter.c" - GeeIterator* _tmp43_; - gboolean _tmp44_; +#line 4840 "MetadataWriter.c" + GeeIterator* _tmp31_; gchar* tmp = NULL; - GeeIterator* _tmp45_; - gpointer _tmp46_; + GeeIterator* _tmp32_; + gpointer _tmp33_; Tag* tag = NULL; - const gchar* _tmp47_; - Tag* _tmp48_; - GeeSet* _tmp49_; - Tag* _tmp50_; - gchar* _tmp51_; - gchar* _tmp52_; + const gchar* _tmp34_; + Tag* _tmp35_; + GeeSet* _tmp36_; + Tag* _tmp37_; + gchar* _tmp38_; + gchar* _tmp39_; #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp43_ = _tmp_it; + _tmp31_ = _tmp_it; #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp44_ = gee_iterator_next (_tmp43_); -#line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (!_tmp44_) { + if (!gee_iterator_next (_tmp31_)) { #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 4740 "MetadataWriter.c" +#line 4858 "MetadataWriter.c" } #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp45_ = _tmp_it; + _tmp32_ = _tmp_it; #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp46_ = gee_iterator_get (_tmp45_); + _tmp33_ = gee_iterator_get (_tmp32_); #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - tmp = (gchar*) _tmp46_; + tmp = (gchar*) _tmp33_; #line 135 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp47_ = tmp; + _tmp34_ = tmp; #line 135 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp48_ = tag_for_path (_tmp47_); + _tmp35_ = tag_for_path (_tmp34_); #line 135 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - tag = _tmp48_; + tag = _tmp35_; #line 136 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp49_ = safe_keywords; + _tmp36_ = safe_keywords; #line 136 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp50_ = tag; + _tmp37_ = tag; #line 136 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp51_ = tag_get_user_visible_name (_tmp50_); + _tmp38_ = tag_get_user_visible_name (_tmp37_); #line 136 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp52_ = _tmp51_; + _tmp39_ = _tmp38_; #line 136 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection), _tmp52_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), _tmp39_); #line 136 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_free0 (_tmp52_); + _g_free0 (_tmp39_); #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (tag); #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_free0 (tmp); -#line 4770 "MetadataWriter.c" +#line 4888 "MetadataWriter.c" } #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_tmp_it); -#line 4774 "MetadataWriter.c" +#line 4892 "MetadataWriter.c" } } #line 140 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp53_ = safe_keywords; -#line 140 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp54_ = metadata; + _tmp40_ = safe_keywords; #line 140 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp55_ = photo_metadata_get_keywords (_tmp54_, NULL, NULL, NULL); + _tmp41_ = photo_metadata_get_keywords (metadata, NULL, NULL, NULL); #line 140 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp56_ = _tmp55_; + _tmp42_ = _tmp41_; #line 140 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp57_ = equal_sets (_tmp53_, _tmp56_); + _tmp43_ = !equal_sets (_tmp40_, _tmp42_); #line 140 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp58_ = !_tmp57_; + _g_object_unref0 (_tmp42_); #line 140 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _g_object_unref0 (_tmp56_); -#line 140 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp58_) { -#line 4793 "MetadataWriter.c" - PhotoMetadata* _tmp59_; - GeeSet* _tmp60_; -#line 141 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp59_ = metadata; + if (_tmp43_) { +#line 4907 "MetadataWriter.c" + GeeSet* _tmp44_; #line 141 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp60_ = self->current_keywords; + _tmp44_ = self->current_keywords; #line 141 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo_metadata_set_keywords (_tmp59_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_COLLECTION, GeeCollection), PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_keywords (metadata, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection), PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 142 "/home/jens/Source/shotwell/src/MetadataWriter.vala" changed = TRUE; -#line 4804 "MetadataWriter.c" +#line 4915 "MetadataWriter.c" } #line 146 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp61_ = skip_orientation; -#line 146 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (!_tmp61_) { -#line 4810 "MetadataWriter.c" + if (!skip_orientation) { +#line 4919 "MetadataWriter.c" Orientation current_orientation = 0; - LibraryPhoto* _tmp62_; - Orientation _tmp63_; - Orientation _tmp64_; - PhotoMetadata* _tmp65_; - Orientation _tmp66_; -#line 147 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp62_ = self->photo; + LibraryPhoto* _tmp45_; + Orientation _tmp46_; #line 147 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp63_ = photo_get_orientation (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_PHOTO, Photo)); + _tmp45_ = self->photo; #line 147 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - current_orientation = _tmp63_; -#line 148 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp64_ = current_orientation; -#line 148 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp65_ = metadata; + current_orientation = photo_get_orientation (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO, Photo)); #line 148 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp66_ = photo_metadata_get_orientation (_tmp65_); + _tmp46_ = current_orientation; #line 148 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp64_ != _tmp66_) { -#line 4831 "MetadataWriter.c" - PhotoMetadata* _tmp67_; - Orientation _tmp68_; + if (_tmp46_ != photo_metadata_get_orientation (metadata)) { +#line 4931 "MetadataWriter.c" + Orientation _tmp47_; #line 149 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp67_ = metadata; + _tmp47_ = current_orientation; #line 149 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp68_ = current_orientation; -#line 149 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo_metadata_set_orientation (_tmp67_, _tmp68_); + photo_metadata_set_orientation (metadata, _tmp47_); #line 150 "/home/jens/Source/shotwell/src/MetadataWriter.vala" changed = TRUE; -#line 4842 "MetadataWriter.c" +#line 4939 "MetadataWriter.c" } } #line 155 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp69_ = changed; + _tmp48_ = changed; #line 155 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - if (_tmp69_) { -#line 4849 "MetadataWriter.c" - PhotoMetadata* _tmp70_; -#line 156 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - _tmp70_ = metadata; + if (_tmp48_) { #line 156 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - photo_metadata_set_software (_tmp70_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); -#line 4855 "MetadataWriter.c" + photo_metadata_set_software (metadata, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); +#line 4948 "MetadataWriter.c" } #line 158 "/home/jens/Source/shotwell/src/MetadataWriter.vala" result = changed; @@ -4865,22 +4958,26 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit _g_free0 (current_title); #line 158 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return result; -#line 4869 "MetadataWriter.c" +#line 4962 "MetadataWriter.c" } -static void metadata_writer_commit_job_class_init (MetadataWriterCommitJobClass * klass) { +static void +metadata_writer_commit_job_class_init (MetadataWriterCommitJobClass * klass) +{ #line 20 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_commit_job_parent_class = g_type_class_peek_parent (klass); #line 20 "/home/jens/Source/shotwell/src/MetadataWriter.vala" ((BackgroundJobClass *) klass)->finalize = metadata_writer_commit_job_finalize; #line 20 "/home/jens/Source/shotwell/src/MetadataWriter.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) metadata_writer_commit_job_real_execute; -#line 4880 "MetadataWriter.c" +#line 4975 "MetadataWriter.c" } -static void metadata_writer_commit_job_instance_init (MetadataWriterCommitJob * self) { +static void +metadata_writer_commit_job_instance_init (MetadataWriterCommitJob * self) +{ #line 23 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->reimport_master_state = NULL; #line 24 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4891,11 +4988,13 @@ static void metadata_writer_commit_job_instance_init (MetadataWriterCommitJob * self->wrote_master = FALSE; #line 27 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->wrote_editable = FALSE; -#line 4895 "MetadataWriter.c" +#line 4992 "MetadataWriter.c" } -static void metadata_writer_commit_job_finalize (BackgroundJob * obj) { +static void +metadata_writer_commit_job_finalize (BackgroundJob * obj) +{ MetadataWriterCommitJob * self; #line 20 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, METADATA_WRITER_TYPE_COMMIT_JOB, MetadataWriterCommitJob); @@ -4911,11 +5010,13 @@ static void metadata_writer_commit_job_finalize (BackgroundJob * obj) { _g_error_free0 (self->err); #line 20 "/home/jens/Source/shotwell/src/MetadataWriter.vala" BACKGROUND_JOB_CLASS (metadata_writer_commit_job_parent_class)->finalize (obj); -#line 4915 "MetadataWriter.c" +#line 5014 "MetadataWriter.c" } -static GType metadata_writer_commit_job_get_type (void) { +static GType +metadata_writer_commit_job_get_type (void) +{ static volatile gsize metadata_writer_commit_job_type_id__volatile = 0; if (g_once_init_enter (&metadata_writer_commit_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MetadataWriterCommitJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) metadata_writer_commit_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MetadataWriterCommitJob), 0, (GInstanceInitFunc) metadata_writer_commit_job_instance_init, NULL }; @@ -4927,7 +5028,9 @@ static GType metadata_writer_commit_job_get_type (void) { } -static void metadata_writer_class_init (MetadataWriterClass * klass) { +static void +metadata_writer_class_init (MetadataWriterClass * klass) +{ #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_parent_class = g_type_class_peek_parent (klass); #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4936,11 +5039,13 @@ static void metadata_writer_class_init (MetadataWriterClass * klass) { G_OBJECT_CLASS (klass)->finalize = metadata_writer_finalize; #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL] = g_signal_new ("progress", TYPE_METADATA_WRITER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__UINT_UINT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); -#line 4940 "MetadataWriter.c" +#line 5043 "MetadataWriter.c" } -static void metadata_writer_instance_init (MetadataWriter * self) { +static void +metadata_writer_instance_init (MetadataWriter * self) +{ Workers* _tmp0_; GeeHashMap* _tmp1_; GeeHashSet* _tmp2_; @@ -4980,11 +5085,13 @@ static void metadata_writer_instance_init (MetadataWriter * self) { _tmp4_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 175 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->priv->importing_photos = _tmp4_; -#line 4984 "MetadataWriter.c" +#line 5089 "MetadataWriter.c" } -static void metadata_writer_finalize (GObject * obj) { +static void +metadata_writer_finalize (GObject * obj) +{ MetadataWriter * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; @@ -5152,11 +5259,13 @@ static void metadata_writer_finalize (GObject * obj) { _g_object_unref0 (self->priv->importing_photos); #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala" G_OBJECT_CLASS (metadata_writer_parent_class)->finalize (obj); -#line 5156 "MetadataWriter.c" +#line 5263 "MetadataWriter.c" } -GType metadata_writer_get_type (void) { +GType +metadata_writer_get_type (void) +{ static volatile gsize metadata_writer_type_id__volatile = 0; if (g_once_init_enter (&metadata_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MetadataWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) metadata_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MetadataWriter), 0, (GInstanceInitFunc) metadata_writer_instance_init, NULL }; diff --git a/src/NaturalCollate.c b/src/NaturalCollate.c index cc78916..b5c4fdb 100644 --- a/src/NaturalCollate.c +++ b/src/NaturalCollate.c @@ -1,7 +1,8 @@ -/* NaturalCollate.c generated by valac 0.36.6, the Vala compiler +/* NaturalCollate.c generated by valac 0.40.4, the Vala compiler * generated from NaturalCollate.vala, do not modify */ + #include #include #include @@ -18,216 +19,165 @@ #define NATURAL_COLLATE_SUPERDIGIT ((gunichar) ':') #define NATURAL_COLLATE_NUM_SENTINEL ((gunichar) 0x2) #define NATURAL_COLLATE_COLLATION_SENTINEL "\x01\x01\x01" -gint natural_collate_read_number (gchar* s, gint* byte_index); -gint natural_collate_compare (const gchar* str1, const gchar* str2); +gint natural_collate_read_number (gchar* s, + gint* byte_index); +gint natural_collate_compare (const gchar* str1, + const gchar* str2); gchar* natural_collate_collate_key (gchar* str); -static gunichar string_get_char (const gchar* self, glong index) { +static gunichar +string_get_char (const gchar* self, + glong index) +{ gunichar result = 0U; - glong _tmp0_; - gunichar _tmp1_; -#line 1140 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1154 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0U); -#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = index; -#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_); -#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_; -#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1155 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = g_utf8_get_char (((gchar*) self) + index); +#line 1155 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; #line 41 "NaturalCollate.c" } -static gint string_index_of_nth_char (const gchar* self, glong c) { +static gint +string_index_of_nth_char (const gchar* self, + glong c) +{ gint result = 0; - glong _tmp0_; - gchar* _tmp1_; -#line 1160 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; +#line 1174 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1161 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = c; -#line 1161 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = g_utf8_offset_to_pointer (self, _tmp0_); -#line 1161 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (gint) (_tmp1_ - ((gchar*) self)); -#line 1161 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1175 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_utf8_offset_to_pointer (self, c); +#line 1175 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (gint) (_tmp0_ - ((gchar*) self)); +#line 1175 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; #line 59 "NaturalCollate.c" } -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, + glong maxlen) +{ glong result = 0L; gchar* end = NULL; gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 82 "NaturalCollate.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 90 "NaturalCollate.c" +#line 83 "NaturalCollate.c" } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 102 "NaturalCollate.c" +#line 92 "NaturalCollate.c" } } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, + glong offset, + glong len) +{ gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + glong _tmp6_; + gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#line 126 "NaturalCollate.c" - glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = _tmp2_ >= ((glong) 0); -#line 132 "NaturalCollate.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = len >= ((glong) 0); +#line 113 "NaturalCollate.c" } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 136 "NaturalCollate.c" +#line 117 "NaturalCollate.c" } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 140 "NaturalCollate.c" - glong _tmp3_; - glong _tmp4_; - glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 152 "NaturalCollate.c" +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = string_strnlen ((gchar*) self, offset + len); +#line 123 "NaturalCollate.c" } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#line 162 "NaturalCollate.c" + gint _tmp1_; + gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = (glong) _tmp2_; +#line 133 "NaturalCollate.c" } -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp8_ < ((glong) 0)) { -#line 168 "NaturalCollate.c" - glong _tmp9_; - glong _tmp10_; - glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 182 "NaturalCollate.c" +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset < ((glong) 0)) { +#line 137 "NaturalCollate.c" + glong _tmp3_; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 145 "NaturalCollate.c" } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 192 "NaturalCollate.c" + glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 152 "NaturalCollate.c" } -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp14_ < ((glong) 0)) { -#line 198 "NaturalCollate.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 207 "NaturalCollate.c" +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (len < ((glong) 0)) { +#line 156 "NaturalCollate.c" + glong _tmp5_; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp5_ - offset; +#line 162 "NaturalCollate.c" } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 227 "NaturalCollate.c" +#line 174 "NaturalCollate.c" } -gint natural_collate_read_number (gchar* s, gint* byte_index) { +gint +natural_collate_read_number (gchar* s, + gint* byte_index) +{ gint result = 0; gint number = 0; #line 23 "/home/jens/Source/shotwell/src/NaturalCollate.vala" @@ -236,93 +186,59 @@ gint natural_collate_read_number (gchar* s, gint* byte_index) { number = 0; #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala" while (TRUE) { -#line 240 "NaturalCollate.c" +#line 190 "NaturalCollate.c" gboolean _tmp0_ = FALSE; - const gchar* _tmp1_; + gint _tmp1_; gint _tmp2_; gint _tmp3_; - gint _tmp7_; - gint _tmp8_; - const gchar* _tmp9_; - gunichar _tmp10_; - gint _tmp11_; + gint _tmp4_; gint second_char = 0; - const gchar* _tmp12_; - gint _tmp13_; - const gchar* _tmp14_; - gint _tmp15_; - gchar* _tmp16_; - gint _tmp17_; - gint _tmp18_; -#line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp1_ = s; -#line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp2_ = strlen (_tmp1_); -#line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp3_ = _tmp2_; -#line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - if (_tmp3_ != 0) { -#line 266 "NaturalCollate.c" - const gchar* _tmp4_; - gunichar _tmp5_; - gboolean _tmp6_; + gint _tmp5_; + gchar* _tmp6_; + gint _tmp7_; #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp4_ = s; + _tmp1_ = strlen (s); #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp5_ = string_get_char (_tmp4_, (glong) 0); + _tmp2_ = _tmp1_; #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp6_ = g_unichar_isdigit (_tmp5_); + if (_tmp2_ != 0) { #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp0_ = _tmp6_; -#line 278 "NaturalCollate.c" + _tmp0_ = g_unichar_isdigit (string_get_char (s, (glong) 0)); +#line 208 "NaturalCollate.c" } else { #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala" _tmp0_ = FALSE; -#line 282 "NaturalCollate.c" +#line 212 "NaturalCollate.c" } #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala" if (!_tmp0_) { #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala" break; -#line 288 "NaturalCollate.c" +#line 218 "NaturalCollate.c" } #line 34 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp7_ = number; + _tmp3_ = number; #line 34 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - number = _tmp7_ * 10; -#line 35 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp8_ = number; + number = _tmp3_ * 10; #line 35 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp9_ = s; + _tmp4_ = number; #line 35 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp10_ = string_get_char (_tmp9_, (glong) 0); -#line 35 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp11_ = g_unichar_digit_value (_tmp10_); -#line 35 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - number = _tmp8_ + _tmp11_; -#line 36 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp12_ = s; -#line 36 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp13_ = string_index_of_nth_char (_tmp12_, (glong) 1); + number = _tmp4_ + g_unichar_digit_value (string_get_char (s, (glong) 0)); #line 36 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - second_char = _tmp13_; + second_char = string_index_of_nth_char (s, (glong) 1); #line 37 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp14_ = s; + _tmp5_ = second_char; #line 37 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp15_ = second_char; -#line 37 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp16_ = string_substring (_tmp14_, (glong) _tmp15_, (glong) -1); + _tmp6_ = string_substring (s, (glong) _tmp5_, (glong) -1); #line 37 "/home/jens/Source/shotwell/src/NaturalCollate.vala" _g_free0 (s); #line 37 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - s = _tmp16_; -#line 38 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp17_ = *byte_index; + s = _tmp6_; #line 38 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp18_ = second_char; + _tmp7_ = second_char; #line 38 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - *byte_index = _tmp17_ + _tmp18_; -#line 326 "NaturalCollate.c" + *byte_index = (*byte_index) + _tmp7_; +#line 242 "NaturalCollate.c" } #line 40 "/home/jens/Source/shotwell/src/NaturalCollate.vala" result = number; @@ -330,23 +246,23 @@ gint natural_collate_read_number (gchar* s, gint* byte_index) { _g_free0 (s); #line 40 "/home/jens/Source/shotwell/src/NaturalCollate.vala" return result; -#line 334 "NaturalCollate.c" +#line 250 "NaturalCollate.c" } -gint natural_collate_compare (const gchar* str1, const gchar* str2) { +gint +natural_collate_compare (const gchar* str1, + const gchar* str2) +{ gint result = 0; GCompareFunc _tmp0_; - const gchar* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; gchar* _tmp4_; - const gchar* _tmp5_; + gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - gint _tmp9_; - gint _tmp10_; + gint _tmp7_; #line 43 "/home/jens/Source/shotwell/src/NaturalCollate.vala" g_return_val_if_fail (str1 != NULL, 0); #line 43 "/home/jens/Source/shotwell/src/NaturalCollate.vala" @@ -354,447 +270,409 @@ gint natural_collate_compare (const gchar* str1, const gchar* str2) { #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala" _tmp0_ = g_strcmp0; #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp1_ = str1; + _tmp1_ = g_strdup (str1); #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp2_ = natural_collate_collate_key (_tmp1_); #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp3_ = natural_collate_collate_key (_tmp2_); + _tmp3_ = _tmp2_; #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp4_ = _tmp3_; + _tmp4_ = g_strdup (str2); #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp5_ = str2; + _tmp5_ = natural_collate_collate_key (_tmp4_); #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp6_ = g_strdup (_tmp5_); + _tmp6_ = _tmp5_; #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp7_ = natural_collate_collate_key (_tmp6_); + _tmp7_ = _tmp0_ (_tmp3_, _tmp6_); #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp8_ = _tmp7_; + _g_free0 (_tmp6_); #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp9_ = _tmp0_ (_tmp4_, _tmp8_); + _g_free0 (_tmp3_); #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp10_ = _tmp9_; -#line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _g_free0 (_tmp8_); -#line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _g_free0 (_tmp4_); -#line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - result = _tmp10_; + result = _tmp7_; #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala" return result; -#line 385 "NaturalCollate.c" +#line 295 "NaturalCollate.c" } -static gboolean string_contains (const gchar* self, const gchar* needle) { +static gboolean +string_contains (const gchar* self, + const gchar* needle) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gchar* _tmp1_; -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = needle; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_ != NULL; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = strstr ((gchar*) self, (gchar*) needle); +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_ != NULL; +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 405 "NaturalCollate.c" +#line 315 "NaturalCollate.c" } -static gchar* g_unichar_to_string (gunichar self) { +static gchar* +g_unichar_to_string (gunichar self) +{ gchar* result = NULL; gchar* str = NULL; gchar* _tmp0_; const gchar* _tmp1_; -#line 949 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 963 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_new0 (gchar, 7); -#line 949 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 963 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" str = (gchar*) _tmp0_; -#line 950 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 964 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = str; -#line 950 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 964 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_unichar_to_utf8 (self, _tmp1_); -#line 951 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 965 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = str; -#line 951 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 965 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 426 "NaturalCollate.c" +#line 338 "NaturalCollate.c" } -gchar* natural_collate_collate_key (gchar* str) { +gchar* +natural_collate_collate_key (gchar* str) +{ gchar* result = NULL; - const gchar* _tmp0_; - gboolean _tmp1_; + gboolean _tmp0_; gchar* _result_ = NULL; - gchar* _tmp2_; + gchar* _tmp1_; gboolean eos = FALSE; - const gchar* _tmp3_; - gint _tmp4_; - gint _tmp5_; - const gchar* _tmp70_; - gchar* _tmp71_; - gchar* _tmp72_; - gchar* _tmp73_; + gint _tmp2_; + gint _tmp3_; + const gchar* _tmp58_; + gchar* _tmp59_; + gchar* _tmp60_; + gchar* _tmp61_; #line 47 "/home/jens/Source/shotwell/src/NaturalCollate.vala" g_return_val_if_fail (str != NULL, NULL); #line 53 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp0_ = str; -#line 53 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp1_ = g_utf8_validate (_tmp0_, (gssize) -1, NULL); + _tmp0_ = g_utf8_validate (str, (gssize) -1, NULL); #line 53 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _vala_assert (_tmp1_, "str.validate()"); + _vala_assert (_tmp0_, "str.validate()"); #line 54 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp2_ = g_strdup (""); + _tmp1_ = g_strdup (""); #line 54 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _result_ = _tmp2_; + _result_ = _tmp1_; #line 55 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp3_ = str; + _tmp2_ = strlen (str); #line 55 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp4_ = strlen (_tmp3_); + _tmp3_ = _tmp2_; #line 55 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp5_ = _tmp4_; -#line 55 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - eos = _tmp5_ == 0; + eos = _tmp3_ == 0; #line 57 "/home/jens/Source/shotwell/src/NaturalCollate.vala" while (TRUE) { -#line 466 "NaturalCollate.c" - gboolean _tmp6_; - const gchar* _tmp7_; - gboolean _tmp8_; +#line 374 "NaturalCollate.c" + gboolean _tmp4_; + gboolean _tmp5_; gint position = 0; - const gchar* _tmp17_; - const gchar* _tmp18_; - gint _tmp19_; - gchar* _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; - gchar* _tmp23_; - gchar* _tmp24_; - const gchar* _tmp25_; - gint _tmp26_; - gchar* _tmp27_; - const gchar* _tmp28_; - gint _tmp29_; - gint _tmp30_; - gboolean _tmp31_; - const gchar* _tmp67_; - gint _tmp68_; - gint _tmp69_; + const gchar* _tmp11_; + gint _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gint _tmp18_; + gchar* _tmp19_; + gint _tmp20_; + gint _tmp21_; + gboolean _tmp22_; + gint _tmp56_; + gint _tmp57_; #line 57 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp6_ = eos; + _tmp4_ = eos; #line 57 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - if (!(!_tmp6_)) { + if (!(!_tmp4_)) { #line 57 "/home/jens/Source/shotwell/src/NaturalCollate.vala" break; -#line 495 "NaturalCollate.c" +#line 398 "NaturalCollate.c" } #line 58 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp7_ = str; -#line 58 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp8_ = g_utf8_validate (_tmp7_, (gssize) -1, NULL); + _tmp5_ = g_utf8_validate (str, (gssize) -1, NULL); #line 58 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _vala_assert (_tmp8_, "str.validate()"); + _vala_assert (_tmp5_, "str.validate()"); #line 59 "/home/jens/Source/shotwell/src/NaturalCollate.vala" position = 0; #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala" while (TRUE) { -#line 507 "NaturalCollate.c" - const gchar* _tmp9_; +#line 408 "NaturalCollate.c" + gint _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gboolean _tmp9_; gint _tmp10_; - gunichar _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; - gboolean _tmp14_; - gboolean _tmp15_; - gint _tmp16_; #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp9_ = str; + _tmp6_ = position; #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp10_ = position; -#line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp11_ = string_get_char (_tmp9_, (glong) _tmp10_); -#line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp12_ = g_unichar_to_string (_tmp11_); + _tmp7_ = g_unichar_to_string (string_get_char (str, (glong) _tmp6_)); #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp13_ = _tmp12_; + _tmp8_ = _tmp7_; #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp14_ = string_contains ("0123456789", _tmp13_); + _tmp9_ = !(!string_contains ("0123456789", _tmp8_)); #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp15_ = !(!_tmp14_); + _g_free0 (_tmp8_); #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _g_free0 (_tmp13_); -#line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - if (_tmp15_) { + if (_tmp9_) { #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala" break; -#line 536 "NaturalCollate.c" +#line 428 "NaturalCollate.c" } #line 62 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp16_ = position; + _tmp10_ = position; #line 62 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - position = _tmp16_ + 1; -#line 542 "NaturalCollate.c" + position = _tmp10_ + 1; +#line 434 "NaturalCollate.c" } #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp17_ = _result_; + _tmp11_ = _result_; #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp18_ = str; + _tmp12_ = position; #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp19_ = position; + _tmp13_ = string_substring (str, (glong) 0, (glong) _tmp12_); #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp20_ = string_substring (_tmp18_, (glong) 0, (glong) _tmp19_); + _tmp14_ = _tmp13_; #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp21_ = _tmp20_; -#line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp22_ = g_utf8_collate_key (_tmp21_, (gssize) -1); + _tmp15_ = g_utf8_collate_key (_tmp14_, (gssize) -1); #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp23_ = _tmp22_; + _tmp16_ = _tmp15_; #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp24_ = g_strconcat (_tmp17_, _tmp23_, NULL); + _tmp17_ = g_strconcat (_tmp11_, _tmp16_, NULL); #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala" _g_free0 (_result_); #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _result_ = _tmp24_; + _result_ = _tmp17_; #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _g_free0 (_tmp23_); + _g_free0 (_tmp16_); #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _g_free0 (_tmp21_); + _g_free0 (_tmp14_); #line 69 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp25_ = str; + _tmp18_ = position; #line 69 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp26_ = position; -#line 69 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp27_ = string_substring (_tmp25_, (glong) _tmp26_, (glong) -1); + _tmp19_ = string_substring (str, (glong) _tmp18_, (glong) -1); #line 69 "/home/jens/Source/shotwell/src/NaturalCollate.vala" _g_free0 (str); #line 69 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - str = _tmp27_; -#line 71 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp28_ = str; + str = _tmp19_; #line 71 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp29_ = strlen (_tmp28_); + _tmp20_ = strlen (str); #line 71 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp30_ = _tmp29_; + _tmp21_ = _tmp20_; #line 71 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - eos = _tmp30_ == 0; + eos = _tmp21_ == 0; #line 72 "/home/jens/Source/shotwell/src/NaturalCollate.vala" position = 0; #line 74 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp31_ = eos; + _tmp22_ = eos; #line 74 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - if (!_tmp31_) { -#line 592 "NaturalCollate.c" + if (!_tmp22_) { +#line 478 "NaturalCollate.c" gint number = 0; - const gchar* _tmp32_; - gchar* _tmp33_; - gint _tmp34_; - const gchar* _tmp35_; - gint _tmp36_; - gchar* _tmp37_; + gchar* _tmp23_; + gint _tmp24_; + gint _tmp25_; + gchar* _tmp26_; gint number_of_superdigits = 0; - gint _tmp38_; - gchar* _tmp39_; - gchar* _tmp40_; - gint _tmp41_; - gint _tmp42_; - gint _tmp43_; + gint _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; + gint _tmp30_; + gint _tmp31_; + gint _tmp32_; gchar* to_append = NULL; + gchar* _tmp33_; + const gchar* _tmp42_; + gint _tmp43_; gchar* _tmp44_; - const gchar* _tmp53_; - gint _tmp54_; + gchar* _tmp45_; + gchar* _tmp46_; + const gchar* _tmp47_; + gchar* _tmp48_; + gchar* _tmp49_; + gchar* _tmp50_; + gchar* _tmp51_; + gchar* _tmp52_; + gchar* _tmp53_; + const gchar* _tmp54_; gchar* _tmp55_; - gchar* _tmp56_; - gchar* _tmp57_; - const gchar* _tmp58_; - gchar* _tmp59_; - gchar* _tmp60_; - gchar* _tmp61_; - gchar* _tmp62_; - gchar* _tmp63_; - gchar* _tmp64_; - const gchar* _tmp65_; - gchar* _tmp66_; -#line 76 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp32_ = str; #line 76 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp33_ = g_strdup (_tmp32_); + _tmp23_ = g_strdup (str); #line 76 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp34_ = natural_collate_read_number (_tmp33_, &position); + _tmp24_ = natural_collate_read_number (_tmp23_, &position); #line 76 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - number = _tmp34_; + number = _tmp24_; #line 77 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp35_ = str; + _tmp25_ = position; #line 77 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp36_ = position; -#line 77 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp37_ = string_substring (_tmp35_, (glong) _tmp36_, (glong) -1); + _tmp26_ = string_substring (str, (glong) _tmp25_, (glong) -1); #line 77 "/home/jens/Source/shotwell/src/NaturalCollate.vala" _g_free0 (str); #line 77 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - str = _tmp37_; + str = _tmp26_; #line 78 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp38_ = number; + _tmp27_ = number; #line 78 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp39_ = g_strdup_printf ("%i", _tmp38_); + _tmp28_ = g_strdup_printf ("%i", _tmp27_); #line 78 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp40_ = _tmp39_; + _tmp29_ = _tmp28_; #line 78 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp41_ = strlen (_tmp40_); + _tmp30_ = strlen (_tmp29_); #line 78 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp42_ = _tmp41_; + _tmp31_ = _tmp30_; #line 78 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp43_ = _tmp42_; + _tmp32_ = _tmp31_; #line 78 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _g_free0 (_tmp40_); + _g_free0 (_tmp29_); #line 78 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - number_of_superdigits = _tmp43_; + number_of_superdigits = _tmp32_; #line 79 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp44_ = g_strdup (""); + _tmp33_ = g_strdup (""); #line 79 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - to_append = _tmp44_; -#line 661 "NaturalCollate.c" + to_append = _tmp33_; +#line 541 "NaturalCollate.c" { gint i = 0; #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala" i = 1; -#line 666 "NaturalCollate.c" +#line 546 "NaturalCollate.c" { - gboolean _tmp45_ = FALSE; + gboolean _tmp34_ = FALSE; #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp45_ = TRUE; + _tmp34_ = TRUE; #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala" while (TRUE) { -#line 673 "NaturalCollate.c" - gint _tmp47_; - gint _tmp48_; - const gchar* _tmp49_; - gchar* _tmp50_; - gchar* _tmp51_; - gchar* _tmp52_; +#line 553 "NaturalCollate.c" + gint _tmp36_; + gint _tmp37_; + const gchar* _tmp38_; + gchar* _tmp39_; + gchar* _tmp40_; + gchar* _tmp41_; #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - if (!_tmp45_) { -#line 682 "NaturalCollate.c" - gint _tmp46_; + if (!_tmp34_) { +#line 562 "NaturalCollate.c" + gint _tmp35_; #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp46_ = i; + _tmp35_ = i; #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - i = _tmp46_ + 1; -#line 688 "NaturalCollate.c" + i = _tmp35_ + 1; +#line 568 "NaturalCollate.c" } #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp45_ = FALSE; + _tmp34_ = FALSE; #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp47_ = i; + _tmp36_ = i; #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp48_ = number_of_superdigits; + _tmp37_ = number_of_superdigits; #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - if (!(_tmp47_ < _tmp48_)) { + if (!(_tmp36_ < _tmp37_)) { #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala" break; -#line 700 "NaturalCollate.c" +#line 580 "NaturalCollate.c" } #line 82 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp49_ = to_append; + _tmp38_ = to_append; #line 82 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp50_ = g_unichar_to_string (NATURAL_COLLATE_SUPERDIGIT); + _tmp39_ = g_unichar_to_string (NATURAL_COLLATE_SUPERDIGIT); #line 82 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp51_ = _tmp50_; + _tmp40_ = _tmp39_; #line 82 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp52_ = g_strconcat (_tmp49_, _tmp51_, NULL); + _tmp41_ = g_strconcat (_tmp38_, _tmp40_, NULL); #line 82 "/home/jens/Source/shotwell/src/NaturalCollate.vala" _g_free0 (to_append); #line 82 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - to_append = _tmp52_; + to_append = _tmp41_; #line 82 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _g_free0 (_tmp51_); -#line 716 "NaturalCollate.c" + _g_free0 (_tmp40_); +#line 596 "NaturalCollate.c" } } } #line 84 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp53_ = to_append; + _tmp42_ = to_append; #line 84 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp54_ = number; + _tmp43_ = number; #line 84 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp55_ = g_strdup_printf ("%i", _tmp54_); + _tmp44_ = g_strdup_printf ("%i", _tmp43_); #line 84 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp56_ = _tmp55_; + _tmp45_ = _tmp44_; #line 84 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp57_ = g_strconcat (_tmp53_, _tmp56_, NULL); + _tmp46_ = g_strconcat (_tmp42_, _tmp45_, NULL); #line 84 "/home/jens/Source/shotwell/src/NaturalCollate.vala" _g_free0 (to_append); #line 84 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - to_append = _tmp57_; + to_append = _tmp46_; #line 84 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _g_free0 (_tmp56_); + _g_free0 (_tmp45_); #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp58_ = _result_; + _tmp47_ = _result_; #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp59_ = g_strconcat (_tmp58_, NATURAL_COLLATE_COLLATION_SENTINEL, NULL); + _tmp48_ = g_strconcat (_tmp47_, NATURAL_COLLATE_COLLATION_SENTINEL, NULL); #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp60_ = _tmp59_; + _tmp49_ = _tmp48_; #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp61_ = g_unichar_to_string (NATURAL_COLLATE_NUM_SENTINEL); + _tmp50_ = g_unichar_to_string (NATURAL_COLLATE_NUM_SENTINEL); #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp62_ = _tmp61_; + _tmp51_ = _tmp50_; #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp63_ = g_strconcat (_tmp60_, _tmp62_, NULL); + _tmp52_ = g_strconcat (_tmp49_, _tmp51_, NULL); #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp64_ = _tmp63_; + _tmp53_ = _tmp52_; #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp65_ = to_append; + _tmp54_ = to_append; #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp66_ = g_strconcat (_tmp64_, _tmp65_, NULL); + _tmp55_ = g_strconcat (_tmp53_, _tmp54_, NULL); #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala" _g_free0 (_result_); #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _result_ = _tmp66_; + _result_ = _tmp55_; #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _g_free0 (_tmp64_); + _g_free0 (_tmp53_); #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _g_free0 (_tmp62_); + _g_free0 (_tmp51_); #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _g_free0 (_tmp60_); + _g_free0 (_tmp49_); #line 74 "/home/jens/Source/shotwell/src/NaturalCollate.vala" _g_free0 (to_append); -#line 766 "NaturalCollate.c" +#line 646 "NaturalCollate.c" } #line 90 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp67_ = str; -#line 90 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp68_ = strlen (_tmp67_); + _tmp56_ = strlen (str); #line 90 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp69_ = _tmp68_; + _tmp57_ = _tmp56_; #line 90 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - eos = _tmp69_ == 0; -#line 776 "NaturalCollate.c" + eos = _tmp57_ == 0; +#line 654 "NaturalCollate.c" } #line 93 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp70_ = _result_; + _tmp58_ = _result_; #line 93 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp71_ = g_unichar_to_string (NATURAL_COLLATE_NUM_SENTINEL); + _tmp59_ = g_unichar_to_string (NATURAL_COLLATE_NUM_SENTINEL); #line 93 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp72_ = _tmp71_; + _tmp60_ = _tmp59_; #line 93 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _tmp73_ = g_strconcat (_tmp70_, _tmp72_, NULL); + _tmp61_ = g_strconcat (_tmp58_, _tmp60_, NULL); #line 93 "/home/jens/Source/shotwell/src/NaturalCollate.vala" _g_free0 (_result_); #line 93 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _result_ = _tmp73_; + _result_ = _tmp61_; #line 93 "/home/jens/Source/shotwell/src/NaturalCollate.vala" - _g_free0 (_tmp72_); + _g_free0 (_tmp60_); #line 96 "/home/jens/Source/shotwell/src/NaturalCollate.vala" result = _result_; #line 96 "/home/jens/Source/shotwell/src/NaturalCollate.vala" _g_free0 (str); #line 96 "/home/jens/Source/shotwell/src/NaturalCollate.vala" return result; -#line 798 "NaturalCollate.c" +#line 676 "NaturalCollate.c" } diff --git a/src/Orientation.c b/src/Orientation.c index 87ca64c..181ee59 100644 --- a/src/Orientation.c +++ b/src/Orientation.c @@ -1,4 +1,4 @@ -/* Orientation.c generated by valac 0.36.6, the Vala compiler +/* Orientation.c generated by valac 0.40.4, the Vala compiler * generated from Orientation.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -71,36 +72,64 @@ Orientation orientation_rotate_counterclockwise (Orientation self); Orientation orientation_flip_top_to_bottom (Orientation self); Orientation orientation_flip_left_to_right (Orientation self); GType rotation_get_type (void) G_GNUC_CONST; -Orientation orientation_perform (Orientation self, Rotation rotation); -Rotation* orientation_to_rotations (Orientation self, int* result_length1); +Orientation orientation_perform (Orientation self, + Rotation rotation); +Rotation* orientation_to_rotations (Orientation self, + int* result_length1); GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); -void orientation_rotate_dimensions (Orientation self, Dimensions* dim, Dimensions* result); -void dimensions_init (Dimensions *self, gint width, gint height); -void orientation_derotate_dimensions (Orientation self, Dimensions* dim, Dimensions* result); -GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf); -void orientation_rotate_point (Orientation self, Dimensions* space, GdkPoint* point, GdkPoint* result); +void orientation_rotate_dimensions (Orientation self, + Dimensions* dim, + Dimensions* result); +void dimensions_init (Dimensions *self, + gint width, + gint height); +void orientation_derotate_dimensions (Orientation self, + Dimensions* dim, + Dimensions* result); +GdkPixbuf* orientation_rotate_pixbuf (Orientation self, + GdkPixbuf* pixbuf); +void orientation_rotate_point (Orientation self, + Dimensions* space, + GdkPoint* point, + GdkPoint* result); gboolean dimensions_has_area (Dimensions *self); -void orientation_derotate_point (Orientation self, Dimensions* space, GdkPoint* point, GdkPoint* result); +void orientation_derotate_point (Orientation self, + Dimensions* space, + GdkPoint* point, + GdkPoint* result); GType box_get_type (void) G_GNUC_CONST; Box* box_dup (const Box* self); void box_free (Box* self); -void orientation_rotate_box (Orientation self, Dimensions* space, Box* box, Box* result); -void box_get_points (Box *self, GdkPoint* top_left, GdkPoint* bottom_right); -void box_from_points (GdkPoint* corner1, GdkPoint* corner2, Box* result); -void orientation_derotate_box (Orientation self, Dimensions* space, Box* box, Box* result); -GdkPixbuf* rotation_perform (Rotation self, GdkPixbuf* pixbuf); +void orientation_rotate_box (Orientation self, + Dimensions* space, + Box* box, + Box* result); +void box_get_points (Box *self, + GdkPoint* top_left, + GdkPoint* bottom_right); +void box_from_points (GdkPoint* corner1, + GdkPoint* corner2, + Box* result); +void orientation_derotate_box (Orientation self, + Dimensions* space, + Box* box, + Box* result); +GdkPixbuf* rotation_perform (Rotation self, + GdkPixbuf* pixbuf); Rotation rotation_opposite (Rotation self); -gchar* orientation_to_string (Orientation self) { +gchar* +orientation_to_string (Orientation self) +{ gchar* result = NULL; #line 20 "/home/jens/Source/shotwell/src/Orientation.vala" switch (self) { #line 20 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_TOP_LEFT: -#line 104 "Orientation.c" +#line 133 "Orientation.c" { gchar* _tmp0_; #line 22 "/home/jens/Source/shotwell/src/Orientation.vala" @@ -109,11 +138,11 @@ gchar* orientation_to_string (Orientation self) { result = _tmp0_; #line 22 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 113 "Orientation.c" +#line 142 "Orientation.c" } #line 20 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_TOP_RIGHT: -#line 117 "Orientation.c" +#line 146 "Orientation.c" { gchar* _tmp1_; #line 25 "/home/jens/Source/shotwell/src/Orientation.vala" @@ -122,11 +151,11 @@ gchar* orientation_to_string (Orientation self) { result = _tmp1_; #line 25 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 126 "Orientation.c" +#line 155 "Orientation.c" } #line 20 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_BOTTOM_RIGHT: -#line 130 "Orientation.c" +#line 159 "Orientation.c" { gchar* _tmp2_; #line 28 "/home/jens/Source/shotwell/src/Orientation.vala" @@ -135,11 +164,11 @@ gchar* orientation_to_string (Orientation self) { result = _tmp2_; #line 28 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 139 "Orientation.c" +#line 168 "Orientation.c" } #line 20 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_BOTTOM_LEFT: -#line 143 "Orientation.c" +#line 172 "Orientation.c" { gchar* _tmp3_; #line 31 "/home/jens/Source/shotwell/src/Orientation.vala" @@ -148,11 +177,11 @@ gchar* orientation_to_string (Orientation self) { result = _tmp3_; #line 31 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 152 "Orientation.c" +#line 181 "Orientation.c" } #line 20 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_LEFT_TOP: -#line 156 "Orientation.c" +#line 185 "Orientation.c" { gchar* _tmp4_; #line 34 "/home/jens/Source/shotwell/src/Orientation.vala" @@ -161,11 +190,11 @@ gchar* orientation_to_string (Orientation self) { result = _tmp4_; #line 34 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 165 "Orientation.c" +#line 194 "Orientation.c" } #line 20 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_RIGHT_TOP: -#line 169 "Orientation.c" +#line 198 "Orientation.c" { gchar* _tmp5_; #line 37 "/home/jens/Source/shotwell/src/Orientation.vala" @@ -174,11 +203,11 @@ gchar* orientation_to_string (Orientation self) { result = _tmp5_; #line 37 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 178 "Orientation.c" +#line 207 "Orientation.c" } #line 20 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_RIGHT_BOTTOM: -#line 182 "Orientation.c" +#line 211 "Orientation.c" { gchar* _tmp6_; #line 40 "/home/jens/Source/shotwell/src/Orientation.vala" @@ -187,11 +216,11 @@ gchar* orientation_to_string (Orientation self) { result = _tmp6_; #line 40 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 191 "Orientation.c" +#line 220 "Orientation.c" } #line 20 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_LEFT_BOTTOM: -#line 195 "Orientation.c" +#line 224 "Orientation.c" { gchar* _tmp7_; #line 43 "/home/jens/Source/shotwell/src/Orientation.vala" @@ -200,7 +229,7 @@ gchar* orientation_to_string (Orientation self) { result = _tmp7_; #line 43 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 204 "Orientation.c" +#line 233 "Orientation.c" } default: { @@ -211,467 +240,463 @@ gchar* orientation_to_string (Orientation self) { result = _tmp8_; #line 46 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 215 "Orientation.c" +#line 244 "Orientation.c" } } } -Orientation orientation_rotate_clockwise (Orientation self) { +Orientation +orientation_rotate_clockwise (Orientation self) +{ Orientation result = 0; #line 51 "/home/jens/Source/shotwell/src/Orientation.vala" switch (self) { #line 51 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_TOP_LEFT: -#line 227 "Orientation.c" +#line 258 "Orientation.c" { #line 53 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_RIGHT_TOP; #line 53 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 233 "Orientation.c" +#line 264 "Orientation.c" } #line 51 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_TOP_RIGHT: -#line 237 "Orientation.c" +#line 268 "Orientation.c" { #line 56 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_RIGHT_BOTTOM; #line 56 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 243 "Orientation.c" +#line 274 "Orientation.c" } #line 51 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_BOTTOM_RIGHT: -#line 247 "Orientation.c" +#line 278 "Orientation.c" { #line 59 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_LEFT_BOTTOM; #line 59 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 253 "Orientation.c" +#line 284 "Orientation.c" } #line 51 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_BOTTOM_LEFT: -#line 257 "Orientation.c" +#line 288 "Orientation.c" { #line 62 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_LEFT_TOP; #line 62 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 263 "Orientation.c" +#line 294 "Orientation.c" } #line 51 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_LEFT_TOP: -#line 267 "Orientation.c" +#line 298 "Orientation.c" { #line 65 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_TOP_RIGHT; #line 65 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 273 "Orientation.c" +#line 304 "Orientation.c" } #line 51 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_RIGHT_TOP: -#line 277 "Orientation.c" +#line 308 "Orientation.c" { #line 68 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_BOTTOM_RIGHT; #line 68 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 283 "Orientation.c" +#line 314 "Orientation.c" } #line 51 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_RIGHT_BOTTOM: -#line 287 "Orientation.c" +#line 318 "Orientation.c" { #line 71 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_BOTTOM_LEFT; #line 71 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 293 "Orientation.c" +#line 324 "Orientation.c" } #line 51 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_LEFT_BOTTOM: -#line 297 "Orientation.c" +#line 328 "Orientation.c" { #line 74 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_TOP_LEFT; #line 74 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 303 "Orientation.c" +#line 334 "Orientation.c" } default: { #line 77 "/home/jens/Source/shotwell/src/Orientation.vala" g_error ("Orientation.vala:77: rotate_clockwise: %d", (gint) self); -#line 309 "Orientation.c" +#line 340 "Orientation.c" } } } -Orientation orientation_rotate_counterclockwise (Orientation self) { +Orientation +orientation_rotate_counterclockwise (Orientation self) +{ Orientation result = 0; #line 82 "/home/jens/Source/shotwell/src/Orientation.vala" switch (self) { #line 82 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_TOP_LEFT: -#line 321 "Orientation.c" +#line 354 "Orientation.c" { #line 84 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_LEFT_BOTTOM; #line 84 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 327 "Orientation.c" +#line 360 "Orientation.c" } #line 82 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_TOP_RIGHT: -#line 331 "Orientation.c" +#line 364 "Orientation.c" { #line 87 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_LEFT_TOP; #line 87 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 337 "Orientation.c" +#line 370 "Orientation.c" } #line 82 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_BOTTOM_RIGHT: -#line 341 "Orientation.c" +#line 374 "Orientation.c" { #line 90 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_RIGHT_TOP; #line 90 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 347 "Orientation.c" +#line 380 "Orientation.c" } #line 82 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_BOTTOM_LEFT: -#line 351 "Orientation.c" +#line 384 "Orientation.c" { #line 93 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_RIGHT_BOTTOM; #line 93 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 357 "Orientation.c" +#line 390 "Orientation.c" } #line 82 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_LEFT_TOP: -#line 361 "Orientation.c" +#line 394 "Orientation.c" { #line 96 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_BOTTOM_LEFT; #line 96 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 367 "Orientation.c" +#line 400 "Orientation.c" } #line 82 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_RIGHT_TOP: -#line 371 "Orientation.c" +#line 404 "Orientation.c" { #line 99 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_TOP_LEFT; #line 99 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 377 "Orientation.c" +#line 410 "Orientation.c" } #line 82 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_RIGHT_BOTTOM: -#line 381 "Orientation.c" +#line 414 "Orientation.c" { #line 102 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_TOP_RIGHT; #line 102 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 387 "Orientation.c" +#line 420 "Orientation.c" } #line 82 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_LEFT_BOTTOM: -#line 391 "Orientation.c" +#line 424 "Orientation.c" { #line 105 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_BOTTOM_RIGHT; #line 105 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 397 "Orientation.c" +#line 430 "Orientation.c" } default: { #line 108 "/home/jens/Source/shotwell/src/Orientation.vala" g_error ("Orientation.vala:108: rotate_counterclockwise: %d", (gint) self); -#line 403 "Orientation.c" +#line 436 "Orientation.c" } } } -Orientation orientation_flip_top_to_bottom (Orientation self) { +Orientation +orientation_flip_top_to_bottom (Orientation self) +{ Orientation result = 0; #line 113 "/home/jens/Source/shotwell/src/Orientation.vala" switch (self) { #line 113 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_TOP_LEFT: -#line 415 "Orientation.c" +#line 450 "Orientation.c" { #line 115 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_BOTTOM_LEFT; #line 115 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 421 "Orientation.c" +#line 456 "Orientation.c" } #line 113 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_TOP_RIGHT: -#line 425 "Orientation.c" +#line 460 "Orientation.c" { #line 118 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_BOTTOM_RIGHT; #line 118 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 431 "Orientation.c" +#line 466 "Orientation.c" } #line 113 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_BOTTOM_RIGHT: -#line 435 "Orientation.c" +#line 470 "Orientation.c" { #line 121 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_TOP_RIGHT; #line 121 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 441 "Orientation.c" +#line 476 "Orientation.c" } #line 113 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_BOTTOM_LEFT: -#line 445 "Orientation.c" +#line 480 "Orientation.c" { #line 124 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_TOP_LEFT; #line 124 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 451 "Orientation.c" +#line 486 "Orientation.c" } #line 113 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_LEFT_TOP: -#line 455 "Orientation.c" +#line 490 "Orientation.c" { #line 127 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_LEFT_BOTTOM; #line 127 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 461 "Orientation.c" +#line 496 "Orientation.c" } #line 113 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_RIGHT_TOP: -#line 465 "Orientation.c" +#line 500 "Orientation.c" { #line 130 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_RIGHT_BOTTOM; #line 130 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 471 "Orientation.c" +#line 506 "Orientation.c" } #line 113 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_RIGHT_BOTTOM: -#line 475 "Orientation.c" +#line 510 "Orientation.c" { #line 133 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_RIGHT_TOP; #line 133 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 481 "Orientation.c" +#line 516 "Orientation.c" } #line 113 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_LEFT_BOTTOM: -#line 485 "Orientation.c" +#line 520 "Orientation.c" { #line 136 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_LEFT_TOP; #line 136 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 491 "Orientation.c" +#line 526 "Orientation.c" } default: { #line 139 "/home/jens/Source/shotwell/src/Orientation.vala" g_error ("Orientation.vala:139: flip_top_to_bottom: %d", (gint) self); -#line 497 "Orientation.c" +#line 532 "Orientation.c" } } } -Orientation orientation_flip_left_to_right (Orientation self) { +Orientation +orientation_flip_left_to_right (Orientation self) +{ Orientation result = 0; #line 144 "/home/jens/Source/shotwell/src/Orientation.vala" switch (self) { #line 144 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_TOP_LEFT: -#line 509 "Orientation.c" +#line 546 "Orientation.c" { #line 146 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_TOP_RIGHT; #line 146 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 515 "Orientation.c" +#line 552 "Orientation.c" } #line 144 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_TOP_RIGHT: -#line 519 "Orientation.c" +#line 556 "Orientation.c" { #line 149 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_TOP_LEFT; #line 149 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 525 "Orientation.c" +#line 562 "Orientation.c" } #line 144 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_BOTTOM_RIGHT: -#line 529 "Orientation.c" +#line 566 "Orientation.c" { #line 152 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_BOTTOM_LEFT; #line 152 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 535 "Orientation.c" +#line 572 "Orientation.c" } #line 144 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_BOTTOM_LEFT: -#line 539 "Orientation.c" +#line 576 "Orientation.c" { #line 155 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_BOTTOM_RIGHT; #line 155 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 545 "Orientation.c" +#line 582 "Orientation.c" } #line 144 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_LEFT_TOP: -#line 549 "Orientation.c" +#line 586 "Orientation.c" { #line 158 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_RIGHT_TOP; #line 158 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 555 "Orientation.c" +#line 592 "Orientation.c" } #line 144 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_RIGHT_TOP: -#line 559 "Orientation.c" +#line 596 "Orientation.c" { #line 161 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_LEFT_TOP; #line 161 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 565 "Orientation.c" +#line 602 "Orientation.c" } #line 144 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_RIGHT_BOTTOM: -#line 569 "Orientation.c" +#line 606 "Orientation.c" { #line 164 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_LEFT_BOTTOM; #line 164 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 575 "Orientation.c" +#line 612 "Orientation.c" } #line 144 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_LEFT_BOTTOM: -#line 579 "Orientation.c" +#line 616 "Orientation.c" { #line 167 "/home/jens/Source/shotwell/src/Orientation.vala" result = ORIENTATION_RIGHT_BOTTOM; #line 167 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 585 "Orientation.c" +#line 622 "Orientation.c" } default: { #line 170 "/home/jens/Source/shotwell/src/Orientation.vala" g_error ("Orientation.vala:170: flip_left_to_right: %d", (gint) self); -#line 591 "Orientation.c" +#line 628 "Orientation.c" } } } -Orientation orientation_perform (Orientation self, Rotation rotation) { +Orientation +orientation_perform (Orientation self, + Rotation rotation) +{ Orientation result = 0; - Rotation _tmp0_; -#line 175 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp0_ = rotation; #line 175 "/home/jens/Source/shotwell/src/Orientation.vala" - switch (_tmp0_) { + switch (rotation) { #line 175 "/home/jens/Source/shotwell/src/Orientation.vala" case ROTATION_CLOCKWISE: -#line 606 "Orientation.c" +#line 643 "Orientation.c" { - Orientation _tmp1_; -#line 177 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp1_ = orientation_rotate_clockwise (self); #line 177 "/home/jens/Source/shotwell/src/Orientation.vala" - result = _tmp1_; + result = orientation_rotate_clockwise (self); #line 177 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 615 "Orientation.c" +#line 649 "Orientation.c" } #line 175 "/home/jens/Source/shotwell/src/Orientation.vala" case ROTATION_COUNTERCLOCKWISE: -#line 619 "Orientation.c" +#line 653 "Orientation.c" { - Orientation _tmp2_; -#line 180 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp2_ = orientation_rotate_counterclockwise (self); #line 180 "/home/jens/Source/shotwell/src/Orientation.vala" - result = _tmp2_; + result = orientation_rotate_counterclockwise (self); #line 180 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 628 "Orientation.c" +#line 659 "Orientation.c" } #line 175 "/home/jens/Source/shotwell/src/Orientation.vala" case ROTATION_MIRROR: -#line 632 "Orientation.c" +#line 663 "Orientation.c" { - Orientation _tmp3_; -#line 183 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp3_ = orientation_flip_left_to_right (self); #line 183 "/home/jens/Source/shotwell/src/Orientation.vala" - result = _tmp3_; + result = orientation_flip_left_to_right (self); #line 183 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 641 "Orientation.c" +#line 669 "Orientation.c" } #line 175 "/home/jens/Source/shotwell/src/Orientation.vala" case ROTATION_UPSIDE_DOWN: -#line 645 "Orientation.c" +#line 673 "Orientation.c" { - Orientation _tmp4_; -#line 186 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp4_ = orientation_flip_top_to_bottom (self); #line 186 "/home/jens/Source/shotwell/src/Orientation.vala" - result = _tmp4_; + result = orientation_flip_top_to_bottom (self); #line 186 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 654 "Orientation.c" +#line 679 "Orientation.c" } default: { - Rotation _tmp5_; -#line 189 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp5_ = rotation; #line 189 "/home/jens/Source/shotwell/src/Orientation.vala" - g_error ("Orientation.vala:189: perform: %d", (gint) _tmp5_); -#line 663 "Orientation.c" + g_error ("Orientation.vala:189: perform: %d", (gint) rotation); +#line 685 "Orientation.c" } } } -Rotation* orientation_to_rotations (Orientation self, int* result_length1) { +Rotation* +orientation_to_rotations (Orientation self, + int* result_length1) +{ Rotation* result = NULL; #line 194 "/home/jens/Source/shotwell/src/Orientation.vala" switch (self) { #line 194 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_TOP_LEFT: -#line 675 "Orientation.c" +#line 700 "Orientation.c" { Rotation* _tmp0_; Rotation* _tmp1_; @@ -686,17 +711,17 @@ Rotation* orientation_to_rotations (Orientation self, int* result_length1) { if (result_length1) { #line 197 "/home/jens/Source/shotwell/src/Orientation.vala" *result_length1 = _tmp1__length1; -#line 690 "Orientation.c" +#line 715 "Orientation.c" } #line 197 "/home/jens/Source/shotwell/src/Orientation.vala" result = _tmp1_; #line 197 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 696 "Orientation.c" +#line 721 "Orientation.c" } #line 194 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_TOP_RIGHT: -#line 700 "Orientation.c" +#line 725 "Orientation.c" { Rotation* _tmp2_; Rotation* _tmp3_; @@ -713,17 +738,17 @@ Rotation* orientation_to_rotations (Orientation self, int* result_length1) { if (result_length1) { #line 200 "/home/jens/Source/shotwell/src/Orientation.vala" *result_length1 = _tmp3__length1; -#line 717 "Orientation.c" +#line 742 "Orientation.c" } #line 200 "/home/jens/Source/shotwell/src/Orientation.vala" result = _tmp3_; #line 200 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 723 "Orientation.c" +#line 748 "Orientation.c" } #line 194 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_BOTTOM_RIGHT: -#line 727 "Orientation.c" +#line 752 "Orientation.c" { Rotation* _tmp4_; Rotation* _tmp5_; @@ -740,17 +765,17 @@ Rotation* orientation_to_rotations (Orientation self, int* result_length1) { if (result_length1) { #line 203 "/home/jens/Source/shotwell/src/Orientation.vala" *result_length1 = _tmp5__length1; -#line 744 "Orientation.c" +#line 769 "Orientation.c" } #line 203 "/home/jens/Source/shotwell/src/Orientation.vala" result = _tmp5_; #line 203 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 750 "Orientation.c" +#line 775 "Orientation.c" } #line 194 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_BOTTOM_LEFT: -#line 754 "Orientation.c" +#line 779 "Orientation.c" { Rotation* _tmp6_; Rotation* _tmp7_; @@ -769,17 +794,17 @@ Rotation* orientation_to_rotations (Orientation self, int* result_length1) { if (result_length1) { #line 207 "/home/jens/Source/shotwell/src/Orientation.vala" *result_length1 = _tmp7__length1; -#line 773 "Orientation.c" +#line 798 "Orientation.c" } #line 207 "/home/jens/Source/shotwell/src/Orientation.vala" result = _tmp7_; #line 207 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 779 "Orientation.c" +#line 804 "Orientation.c" } #line 194 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_LEFT_TOP: -#line 783 "Orientation.c" +#line 808 "Orientation.c" { Rotation* _tmp8_; Rotation* _tmp9_; @@ -798,17 +823,17 @@ Rotation* orientation_to_rotations (Orientation self, int* result_length1) { if (result_length1) { #line 210 "/home/jens/Source/shotwell/src/Orientation.vala" *result_length1 = _tmp9__length1; -#line 802 "Orientation.c" +#line 827 "Orientation.c" } #line 210 "/home/jens/Source/shotwell/src/Orientation.vala" result = _tmp9_; #line 210 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 808 "Orientation.c" +#line 833 "Orientation.c" } #line 194 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_RIGHT_TOP: -#line 812 "Orientation.c" +#line 837 "Orientation.c" { Rotation* _tmp10_; Rotation* _tmp11_; @@ -825,17 +850,17 @@ Rotation* orientation_to_rotations (Orientation self, int* result_length1) { if (result_length1) { #line 213 "/home/jens/Source/shotwell/src/Orientation.vala" *result_length1 = _tmp11__length1; -#line 829 "Orientation.c" +#line 854 "Orientation.c" } #line 213 "/home/jens/Source/shotwell/src/Orientation.vala" result = _tmp11_; #line 213 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 835 "Orientation.c" +#line 860 "Orientation.c" } #line 194 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_RIGHT_BOTTOM: -#line 839 "Orientation.c" +#line 864 "Orientation.c" { Rotation* _tmp12_; Rotation* _tmp13_; @@ -854,17 +879,17 @@ Rotation* orientation_to_rotations (Orientation self, int* result_length1) { if (result_length1) { #line 216 "/home/jens/Source/shotwell/src/Orientation.vala" *result_length1 = _tmp13__length1; -#line 858 "Orientation.c" +#line 883 "Orientation.c" } #line 216 "/home/jens/Source/shotwell/src/Orientation.vala" result = _tmp13_; #line 216 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 864 "Orientation.c" +#line 889 "Orientation.c" } #line 194 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_LEFT_BOTTOM: -#line 868 "Orientation.c" +#line 893 "Orientation.c" { Rotation* _tmp14_; Rotation* _tmp15_; @@ -881,25 +906,29 @@ Rotation* orientation_to_rotations (Orientation self, int* result_length1) { if (result_length1) { #line 219 "/home/jens/Source/shotwell/src/Orientation.vala" *result_length1 = _tmp15__length1; -#line 885 "Orientation.c" +#line 910 "Orientation.c" } #line 219 "/home/jens/Source/shotwell/src/Orientation.vala" result = _tmp15_; #line 219 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 891 "Orientation.c" +#line 916 "Orientation.c" } default: { #line 222 "/home/jens/Source/shotwell/src/Orientation.vala" g_error ("Orientation.vala:222: to_rotations: %d", (gint) self); -#line 897 "Orientation.c" +#line 922 "Orientation.c" } } } -void orientation_rotate_dimensions (Orientation self, Dimensions* dim, Dimensions* result) { +void +orientation_rotate_dimensions (Orientation self, + Dimensions* dim, + Dimensions* result) +{ #line 226 "/home/jens/Source/shotwell/src/Orientation.vala" g_return_if_fail (dim != NULL); #line 227 "/home/jens/Source/shotwell/src/Orientation.vala" @@ -912,7 +941,7 @@ void orientation_rotate_dimensions (Orientation self, Dimensions* dim, Dimension case ORIENTATION_BOTTOM_RIGHT: #line 227 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_BOTTOM_LEFT: -#line 916 "Orientation.c" +#line 945 "Orientation.c" { Dimensions _tmp0_; #line 233 "/home/jens/Source/shotwell/src/Orientation.vala" @@ -921,7 +950,7 @@ void orientation_rotate_dimensions (Orientation self, Dimensions* dim, Dimension *result = _tmp0_; #line 233 "/home/jens/Source/shotwell/src/Orientation.vala" return; -#line 925 "Orientation.c" +#line 954 "Orientation.c" } #line 227 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_LEFT_TOP: @@ -931,7 +960,7 @@ void orientation_rotate_dimensions (Orientation self, Dimensions* dim, Dimension case ORIENTATION_RIGHT_BOTTOM: #line 227 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_LEFT_BOTTOM: -#line 935 "Orientation.c" +#line 964 "Orientation.c" { Dimensions _tmp1_; gint _tmp2_; @@ -952,19 +981,23 @@ void orientation_rotate_dimensions (Orientation self, Dimensions* dim, Dimension *result = _tmp5_; #line 240 "/home/jens/Source/shotwell/src/Orientation.vala" return; -#line 956 "Orientation.c" +#line 985 "Orientation.c" } default: { #line 243 "/home/jens/Source/shotwell/src/Orientation.vala" g_error ("Orientation.vala:243: rotate_dimensions: %d", (gint) self); -#line 962 "Orientation.c" +#line 991 "Orientation.c" } } } -void orientation_derotate_dimensions (Orientation self, Dimensions* dim, Dimensions* result) { +void +orientation_derotate_dimensions (Orientation self, + Dimensions* dim, + Dimensions* result) +{ Dimensions _tmp0_; Dimensions _tmp1_ = {0}; #line 247 "/home/jens/Source/shotwell/src/Orientation.vala" @@ -977,18 +1010,23 @@ void orientation_derotate_dimensions (Orientation self, Dimensions* dim, Dimensi *result = _tmp1_; #line 248 "/home/jens/Source/shotwell/src/Orientation.vala" return; -#line 981 "Orientation.c" +#line 1014 "Orientation.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 256 "/home/jens/Source/shotwell/src/Orientation.vala" return self ? g_object_ref (self) : NULL; -#line 988 "Orientation.c" +#line 1023 "Orientation.c" } -GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf) { +GdkPixbuf* +orientation_rotate_pixbuf (Orientation self, + GdkPixbuf* pixbuf) +{ GdkPixbuf* result = NULL; GdkPixbuf* rotated = NULL; #line 251 "/home/jens/Source/shotwell/src/Orientation.vala" @@ -997,742 +1035,727 @@ GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf) { switch (self) { #line 253 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_TOP_LEFT: -#line 1001 "Orientation.c" +#line 1039 "Orientation.c" { GdkPixbuf* _tmp0_; - GdkPixbuf* _tmp1_; #line 256 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp0_ = pixbuf; -#line 256 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (pixbuf); #line 256 "/home/jens/Source/shotwell/src/Orientation.vala" _g_object_unref0 (rotated); #line 256 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated = _tmp1_; + rotated = _tmp0_; #line 257 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1015 "Orientation.c" +#line 1050 "Orientation.c" } #line 253 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_TOP_RIGHT: -#line 1019 "Orientation.c" +#line 1054 "Orientation.c" { - GdkPixbuf* _tmp2_; - GdkPixbuf* _tmp3_; -#line 261 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp2_ = pixbuf; + GdkPixbuf* _tmp1_; #line 261 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp3_ = gdk_pixbuf_flip (_tmp2_, TRUE); + _tmp1_ = gdk_pixbuf_flip (pixbuf, TRUE); #line 261 "/home/jens/Source/shotwell/src/Orientation.vala" _g_object_unref0 (rotated); #line 261 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated = _tmp3_; + rotated = _tmp1_; #line 262 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1033 "Orientation.c" +#line 1065 "Orientation.c" } #line 253 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_BOTTOM_RIGHT: -#line 1037 "Orientation.c" +#line 1069 "Orientation.c" { - GdkPixbuf* _tmp4_; - GdkPixbuf* _tmp5_; -#line 265 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp4_ = pixbuf; + GdkPixbuf* _tmp2_; #line 265 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp5_ = gdk_pixbuf_rotate_simple (_tmp4_, GDK_PIXBUF_ROTATE_UPSIDEDOWN); + _tmp2_ = gdk_pixbuf_rotate_simple (pixbuf, GDK_PIXBUF_ROTATE_UPSIDEDOWN); #line 265 "/home/jens/Source/shotwell/src/Orientation.vala" _g_object_unref0 (rotated); #line 265 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated = _tmp5_; + rotated = _tmp2_; #line 266 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1051 "Orientation.c" +#line 1080 "Orientation.c" } #line 253 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_BOTTOM_LEFT: -#line 1055 "Orientation.c" +#line 1084 "Orientation.c" { - GdkPixbuf* _tmp6_; - GdkPixbuf* _tmp7_; -#line 270 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp6_ = pixbuf; + GdkPixbuf* _tmp3_; #line 270 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp7_ = gdk_pixbuf_flip (_tmp6_, FALSE); + _tmp3_ = gdk_pixbuf_flip (pixbuf, FALSE); #line 270 "/home/jens/Source/shotwell/src/Orientation.vala" _g_object_unref0 (rotated); #line 270 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated = _tmp7_; + rotated = _tmp3_; #line 271 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1069 "Orientation.c" +#line 1095 "Orientation.c" } #line 253 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_LEFT_TOP: -#line 1073 "Orientation.c" +#line 1099 "Orientation.c" { - GdkPixbuf* _tmp8_; - GdkPixbuf* _tmp9_; - GdkPixbuf* _tmp10_; - GdkPixbuf* _tmp11_; -#line 274 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp8_ = pixbuf; + GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp5_; + GdkPixbuf* _tmp6_; #line 274 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp9_ = gdk_pixbuf_rotate_simple (_tmp8_, GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE); + _tmp4_ = gdk_pixbuf_rotate_simple (pixbuf, GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE); #line 274 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp10_ = _tmp9_; + _tmp5_ = _tmp4_; #line 274 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp11_ = gdk_pixbuf_flip (_tmp10_, FALSE); + _tmp6_ = gdk_pixbuf_flip (_tmp5_, FALSE); #line 274 "/home/jens/Source/shotwell/src/Orientation.vala" _g_object_unref0 (rotated); #line 274 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated = _tmp11_; + rotated = _tmp6_; #line 274 "/home/jens/Source/shotwell/src/Orientation.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp5_); #line 275 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1095 "Orientation.c" +#line 1118 "Orientation.c" } #line 253 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_RIGHT_TOP: -#line 1099 "Orientation.c" +#line 1122 "Orientation.c" { - GdkPixbuf* _tmp12_; - GdkPixbuf* _tmp13_; -#line 278 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp12_ = pixbuf; + GdkPixbuf* _tmp7_; #line 278 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp13_ = gdk_pixbuf_rotate_simple (_tmp12_, GDK_PIXBUF_ROTATE_CLOCKWISE); + _tmp7_ = gdk_pixbuf_rotate_simple (pixbuf, GDK_PIXBUF_ROTATE_CLOCKWISE); #line 278 "/home/jens/Source/shotwell/src/Orientation.vala" _g_object_unref0 (rotated); #line 278 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated = _tmp13_; + rotated = _tmp7_; #line 279 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1113 "Orientation.c" +#line 1133 "Orientation.c" } #line 253 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_RIGHT_BOTTOM: -#line 1117 "Orientation.c" +#line 1137 "Orientation.c" { - GdkPixbuf* _tmp14_; - GdkPixbuf* _tmp15_; - GdkPixbuf* _tmp16_; - GdkPixbuf* _tmp17_; -#line 282 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp14_ = pixbuf; + GdkPixbuf* _tmp8_; + GdkPixbuf* _tmp9_; + GdkPixbuf* _tmp10_; #line 282 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp15_ = gdk_pixbuf_rotate_simple (_tmp14_, GDK_PIXBUF_ROTATE_CLOCKWISE); + _tmp8_ = gdk_pixbuf_rotate_simple (pixbuf, GDK_PIXBUF_ROTATE_CLOCKWISE); #line 282 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp16_ = _tmp15_; + _tmp9_ = _tmp8_; #line 282 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp17_ = gdk_pixbuf_flip (_tmp16_, FALSE); + _tmp10_ = gdk_pixbuf_flip (_tmp9_, FALSE); #line 282 "/home/jens/Source/shotwell/src/Orientation.vala" _g_object_unref0 (rotated); #line 282 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated = _tmp17_; + rotated = _tmp10_; #line 282 "/home/jens/Source/shotwell/src/Orientation.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp9_); #line 283 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1139 "Orientation.c" +#line 1156 "Orientation.c" } #line 253 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_LEFT_BOTTOM: -#line 1143 "Orientation.c" +#line 1160 "Orientation.c" { - GdkPixbuf* _tmp18_; - GdkPixbuf* _tmp19_; -#line 286 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp18_ = pixbuf; + GdkPixbuf* _tmp11_; #line 286 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp19_ = gdk_pixbuf_rotate_simple (_tmp18_, GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE); + _tmp11_ = gdk_pixbuf_rotate_simple (pixbuf, GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE); #line 286 "/home/jens/Source/shotwell/src/Orientation.vala" _g_object_unref0 (rotated); #line 286 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated = _tmp19_; + rotated = _tmp11_; #line 287 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1157 "Orientation.c" +#line 1171 "Orientation.c" } default: { #line 290 "/home/jens/Source/shotwell/src/Orientation.vala" g_error ("Orientation.vala:290: rotate_pixbuf: %d", (gint) self); -#line 1163 "Orientation.c" +#line 1177 "Orientation.c" } } #line 293 "/home/jens/Source/shotwell/src/Orientation.vala" result = rotated; #line 293 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 1170 "Orientation.c" +#line 1184 "Orientation.c" } -void orientation_rotate_point (Orientation self, Dimensions* space, GdkPoint* point, GdkPoint* result) { - gboolean _tmp0_; - GdkPoint _tmp1_; - gint _tmp2_; - GdkPoint _tmp3_; - gint _tmp4_; - Dimensions _tmp5_; - gint _tmp6_; - GdkPoint _tmp7_; - gint _tmp8_; - GdkPoint _tmp9_; - gint _tmp10_; - Dimensions _tmp11_; - gint _tmp12_; +void +orientation_rotate_point (Orientation self, + Dimensions* space, + GdkPoint* point, + GdkPoint* result) +{ + GdkPoint _tmp0_; + gint _tmp1_; + GdkPoint _tmp2_; + gint _tmp3_; + Dimensions _tmp4_; + gint _tmp5_; + GdkPoint _tmp6_; + gint _tmp7_; + GdkPoint _tmp8_; + gint _tmp9_; + Dimensions _tmp10_; + gint _tmp11_; GdkPoint rotated = {0}; #line 297 "/home/jens/Source/shotwell/src/Orientation.vala" g_return_if_fail (space != NULL); #line 297 "/home/jens/Source/shotwell/src/Orientation.vala" g_return_if_fail (point != NULL); #line 298 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp0_ = dimensions_has_area (space); -#line 298 "/home/jens/Source/shotwell/src/Orientation.vala" - _vala_assert (_tmp0_, "space.has_area()"); + _vala_assert (dimensions_has_area (space), "space.has_area()"); #line 299 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp1_ = *point; + _tmp0_ = *point; #line 299 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp2_ = _tmp1_.x; + _tmp1_ = _tmp0_.x; #line 299 "/home/jens/Source/shotwell/src/Orientation.vala" - _vala_assert (_tmp2_ >= 0, "point.x >= 0"); + _vala_assert (_tmp1_ >= 0, "point.x >= 0"); #line 300 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp3_ = *point; + _tmp2_ = *point; #line 300 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp4_ = _tmp3_.x; + _tmp3_ = _tmp2_.x; #line 300 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp5_ = *space; + _tmp4_ = *space; #line 300 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp6_ = _tmp5_.width; + _tmp5_ = _tmp4_.width; #line 300 "/home/jens/Source/shotwell/src/Orientation.vala" - _vala_assert (_tmp4_ < _tmp6_, "point.x < space.width"); + _vala_assert (_tmp3_ < _tmp5_, "point.x < space.width"); #line 301 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp7_ = *point; + _tmp6_ = *point; #line 301 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp8_ = _tmp7_.y; + _tmp7_ = _tmp6_.y; #line 301 "/home/jens/Source/shotwell/src/Orientation.vala" - _vala_assert (_tmp8_ >= 0, "point.y >= 0"); + _vala_assert (_tmp7_ >= 0, "point.y >= 0"); #line 302 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp9_ = *point; + _tmp8_ = *point; #line 302 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp10_ = _tmp9_.y; + _tmp9_ = _tmp8_.y; #line 302 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp11_ = *space; + _tmp10_ = *space; #line 302 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp12_ = _tmp11_.height; + _tmp11_ = _tmp10_.height; #line 302 "/home/jens/Source/shotwell/src/Orientation.vala" - _vala_assert (_tmp10_ < _tmp12_, "point.y < space.height"); + _vala_assert (_tmp9_ < _tmp11_, "point.y < space.height"); #line 304 "/home/jens/Source/shotwell/src/Orientation.vala" memset (&rotated, 0, sizeof (GdkPoint)); #line 306 "/home/jens/Source/shotwell/src/Orientation.vala" switch (self) { #line 306 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_TOP_LEFT: -#line 1235 "Orientation.c" +#line 1251 "Orientation.c" { - GdkPoint _tmp13_; + GdkPoint _tmp12_; #line 309 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp13_ = *point; + _tmp12_ = *point; #line 309 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated = _tmp13_; + rotated = _tmp12_; #line 310 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1244 "Orientation.c" +#line 1260 "Orientation.c" } #line 306 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_TOP_RIGHT: -#line 1248 "Orientation.c" - { - Dimensions _tmp14_; - gint _tmp15_; - GdkPoint _tmp16_; - gint _tmp17_; - GdkPoint _tmp18_; - gint _tmp19_; +#line 1264 "Orientation.c" + { + Dimensions _tmp13_; + gint _tmp14_; + GdkPoint _tmp15_; + gint _tmp16_; + GdkPoint _tmp17_; + gint _tmp18_; #line 314 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp14_ = *space; + _tmp13_ = *space; #line 314 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp15_ = _tmp14_.width; + _tmp14_ = _tmp13_.width; #line 314 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp16_ = *point; + _tmp15_ = *point; #line 314 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp17_ = _tmp16_.x; + _tmp16_ = _tmp15_.x; #line 314 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated.x = (_tmp15_ - _tmp17_) - 1; + rotated.x = (_tmp14_ - _tmp16_) - 1; #line 315 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp18_ = *point; + _tmp17_ = *point; #line 315 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp19_ = _tmp18_.y; + _tmp18_ = _tmp17_.y; #line 315 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated.y = _tmp19_; + rotated.y = _tmp18_; #line 316 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1274 "Orientation.c" +#line 1290 "Orientation.c" } #line 306 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_BOTTOM_RIGHT: -#line 1278 "Orientation.c" - { - Dimensions _tmp20_; - gint _tmp21_; - GdkPoint _tmp22_; - gint _tmp23_; - Dimensions _tmp24_; - gint _tmp25_; - GdkPoint _tmp26_; - gint _tmp27_; +#line 1294 "Orientation.c" + { + Dimensions _tmp19_; + gint _tmp20_; + GdkPoint _tmp21_; + gint _tmp22_; + Dimensions _tmp23_; + gint _tmp24_; + GdkPoint _tmp25_; + gint _tmp26_; #line 320 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp20_ = *space; + _tmp19_ = *space; #line 320 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp21_ = _tmp20_.width; + _tmp20_ = _tmp19_.width; #line 320 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp22_ = *point; + _tmp21_ = *point; #line 320 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp23_ = _tmp22_.x; + _tmp22_ = _tmp21_.x; #line 320 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated.x = (_tmp21_ - _tmp23_) - 1; + rotated.x = (_tmp20_ - _tmp22_) - 1; #line 321 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp24_ = *space; + _tmp23_ = *space; #line 321 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp25_ = _tmp24_.height; + _tmp24_ = _tmp23_.height; #line 321 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp26_ = *point; + _tmp25_ = *point; #line 321 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp27_ = _tmp26_.y; + _tmp26_ = _tmp25_.y; #line 321 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated.y = (_tmp25_ - _tmp27_) - 1; + rotated.y = (_tmp24_ - _tmp26_) - 1; #line 322 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1310 "Orientation.c" +#line 1326 "Orientation.c" } #line 306 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_BOTTOM_LEFT: -#line 1314 "Orientation.c" - { - GdkPoint _tmp28_; - gint _tmp29_; - Dimensions _tmp30_; - gint _tmp31_; - GdkPoint _tmp32_; - gint _tmp33_; +#line 1330 "Orientation.c" + { + GdkPoint _tmp27_; + gint _tmp28_; + Dimensions _tmp29_; + gint _tmp30_; + GdkPoint _tmp31_; + gint _tmp32_; #line 326 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp28_ = *point; + _tmp27_ = *point; #line 326 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp29_ = _tmp28_.x; + _tmp28_ = _tmp27_.x; #line 326 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated.x = _tmp29_; + rotated.x = _tmp28_; #line 327 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp30_ = *space; + _tmp29_ = *space; #line 327 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp31_ = _tmp30_.height; + _tmp30_ = _tmp29_.height; #line 327 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp32_ = *point; + _tmp31_ = *point; #line 327 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp33_ = _tmp32_.y; + _tmp32_ = _tmp31_.y; #line 327 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated.y = (_tmp31_ - _tmp33_) - 1; + rotated.y = (_tmp30_ - _tmp32_) - 1; #line 328 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1340 "Orientation.c" +#line 1356 "Orientation.c" } #line 306 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_LEFT_TOP: -#line 1344 "Orientation.c" +#line 1360 "Orientation.c" { - GdkPoint _tmp34_; - gint _tmp35_; - GdkPoint _tmp36_; - gint _tmp37_; + GdkPoint _tmp33_; + gint _tmp34_; + GdkPoint _tmp35_; + gint _tmp36_; #line 332 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp34_ = *point; + _tmp33_ = *point; #line 332 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp35_ = _tmp34_.y; + _tmp34_ = _tmp33_.y; #line 332 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated.x = _tmp35_; + rotated.x = _tmp34_; #line 333 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp36_ = *point; + _tmp35_ = *point; #line 333 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp37_ = _tmp36_.x; + _tmp36_ = _tmp35_.x; #line 333 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated.y = _tmp37_; + rotated.y = _tmp36_; #line 334 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1364 "Orientation.c" +#line 1380 "Orientation.c" } #line 306 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_RIGHT_TOP: -#line 1368 "Orientation.c" - { - Dimensions _tmp38_; - gint _tmp39_; - GdkPoint _tmp40_; - gint _tmp41_; - GdkPoint _tmp42_; - gint _tmp43_; +#line 1384 "Orientation.c" + { + Dimensions _tmp37_; + gint _tmp38_; + GdkPoint _tmp39_; + gint _tmp40_; + GdkPoint _tmp41_; + gint _tmp42_; #line 338 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp38_ = *space; + _tmp37_ = *space; #line 338 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp39_ = _tmp38_.height; + _tmp38_ = _tmp37_.height; #line 338 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp40_ = *point; + _tmp39_ = *point; #line 338 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp41_ = _tmp40_.y; + _tmp40_ = _tmp39_.y; #line 338 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated.x = (_tmp39_ - _tmp41_) - 1; + rotated.x = (_tmp38_ - _tmp40_) - 1; #line 339 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp42_ = *point; + _tmp41_ = *point; #line 339 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp43_ = _tmp42_.x; + _tmp42_ = _tmp41_.x; #line 339 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated.y = _tmp43_; + rotated.y = _tmp42_; #line 340 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1394 "Orientation.c" +#line 1410 "Orientation.c" } #line 306 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_RIGHT_BOTTOM: -#line 1398 "Orientation.c" - { - Dimensions _tmp44_; - gint _tmp45_; - GdkPoint _tmp46_; - gint _tmp47_; - Dimensions _tmp48_; - gint _tmp49_; - GdkPoint _tmp50_; - gint _tmp51_; +#line 1414 "Orientation.c" + { + Dimensions _tmp43_; + gint _tmp44_; + GdkPoint _tmp45_; + gint _tmp46_; + Dimensions _tmp47_; + gint _tmp48_; + GdkPoint _tmp49_; + gint _tmp50_; #line 344 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp44_ = *space; + _tmp43_ = *space; #line 344 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp45_ = _tmp44_.height; + _tmp44_ = _tmp43_.height; #line 344 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp46_ = *point; + _tmp45_ = *point; #line 344 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp47_ = _tmp46_.y; + _tmp46_ = _tmp45_.y; #line 344 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated.x = (_tmp45_ - _tmp47_) - 1; + rotated.x = (_tmp44_ - _tmp46_) - 1; #line 345 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp48_ = *space; + _tmp47_ = *space; #line 345 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp49_ = _tmp48_.width; + _tmp48_ = _tmp47_.width; #line 345 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp50_ = *point; + _tmp49_ = *point; #line 345 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp51_ = _tmp50_.x; + _tmp50_ = _tmp49_.x; #line 345 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated.y = (_tmp49_ - _tmp51_) - 1; + rotated.y = (_tmp48_ - _tmp50_) - 1; #line 346 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1430 "Orientation.c" +#line 1446 "Orientation.c" } #line 306 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_LEFT_BOTTOM: -#line 1434 "Orientation.c" - { - GdkPoint _tmp52_; - gint _tmp53_; - Dimensions _tmp54_; - gint _tmp55_; - GdkPoint _tmp56_; - gint _tmp57_; +#line 1450 "Orientation.c" + { + GdkPoint _tmp51_; + gint _tmp52_; + Dimensions _tmp53_; + gint _tmp54_; + GdkPoint _tmp55_; + gint _tmp56_; #line 350 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp52_ = *point; + _tmp51_ = *point; #line 350 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp53_ = _tmp52_.y; + _tmp52_ = _tmp51_.y; #line 350 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated.x = _tmp53_; + rotated.x = _tmp52_; #line 351 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp54_ = *space; + _tmp53_ = *space; #line 351 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp55_ = _tmp54_.width; + _tmp54_ = _tmp53_.width; #line 351 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp56_ = *point; + _tmp55_ = *point; #line 351 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp57_ = _tmp56_.x; + _tmp56_ = _tmp55_.x; #line 351 "/home/jens/Source/shotwell/src/Orientation.vala" - rotated.y = (_tmp55_ - _tmp57_) - 1; + rotated.y = (_tmp54_ - _tmp56_) - 1; #line 352 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1460 "Orientation.c" +#line 1476 "Orientation.c" } default: { #line 355 "/home/jens/Source/shotwell/src/Orientation.vala" g_error ("Orientation.vala:355: rotate_point: %d", (gint) self); -#line 1466 "Orientation.c" +#line 1482 "Orientation.c" } } #line 358 "/home/jens/Source/shotwell/src/Orientation.vala" *result = rotated; #line 358 "/home/jens/Source/shotwell/src/Orientation.vala" return; -#line 1473 "Orientation.c" +#line 1489 "Orientation.c" } -void orientation_derotate_point (Orientation self, Dimensions* space, GdkPoint* point, GdkPoint* result) { - gboolean _tmp0_; +void +orientation_derotate_point (Orientation self, + Dimensions* space, + GdkPoint* point, + GdkPoint* result) +{ GdkPoint derotated = {0}; #line 362 "/home/jens/Source/shotwell/src/Orientation.vala" g_return_if_fail (space != NULL); #line 362 "/home/jens/Source/shotwell/src/Orientation.vala" g_return_if_fail (point != NULL); #line 363 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp0_ = dimensions_has_area (space); -#line 363 "/home/jens/Source/shotwell/src/Orientation.vala" - _vala_assert (_tmp0_, "space.has_area()"); + _vala_assert (dimensions_has_area (space), "space.has_area()"); #line 365 "/home/jens/Source/shotwell/src/Orientation.vala" memset (&derotated, 0, sizeof (GdkPoint)); #line 367 "/home/jens/Source/shotwell/src/Orientation.vala" switch (self) { #line 367 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_TOP_LEFT: -#line 1494 "Orientation.c" +#line 1512 "Orientation.c" { - GdkPoint _tmp1_; + GdkPoint _tmp0_; #line 370 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp1_ = *point; + _tmp0_ = *point; #line 370 "/home/jens/Source/shotwell/src/Orientation.vala" - derotated = _tmp1_; + derotated = _tmp0_; #line 371 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1503 "Orientation.c" +#line 1521 "Orientation.c" } #line 367 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_TOP_RIGHT: -#line 1507 "Orientation.c" - { - Dimensions _tmp2_; - gint _tmp3_; - GdkPoint _tmp4_; - gint _tmp5_; - GdkPoint _tmp6_; - gint _tmp7_; +#line 1525 "Orientation.c" + { + Dimensions _tmp1_; + gint _tmp2_; + GdkPoint _tmp3_; + gint _tmp4_; + GdkPoint _tmp5_; + gint _tmp6_; #line 375 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp2_ = *space; + _tmp1_ = *space; #line 375 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp3_ = _tmp2_.width; + _tmp2_ = _tmp1_.width; #line 375 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp4_ = *point; + _tmp3_ = *point; #line 375 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp5_ = _tmp4_.x; + _tmp4_ = _tmp3_.x; #line 375 "/home/jens/Source/shotwell/src/Orientation.vala" - derotated.x = (_tmp3_ - _tmp5_) - 1; + derotated.x = (_tmp2_ - _tmp4_) - 1; #line 376 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp6_ = *point; + _tmp5_ = *point; #line 376 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp7_ = _tmp6_.y; + _tmp6_ = _tmp5_.y; #line 376 "/home/jens/Source/shotwell/src/Orientation.vala" - derotated.y = _tmp7_; + derotated.y = _tmp6_; #line 377 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1533 "Orientation.c" +#line 1551 "Orientation.c" } #line 367 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_BOTTOM_RIGHT: -#line 1537 "Orientation.c" - { - Dimensions _tmp8_; - gint _tmp9_; - GdkPoint _tmp10_; - gint _tmp11_; - Dimensions _tmp12_; - gint _tmp13_; - GdkPoint _tmp14_; - gint _tmp15_; +#line 1555 "Orientation.c" + { + Dimensions _tmp7_; + gint _tmp8_; + GdkPoint _tmp9_; + gint _tmp10_; + Dimensions _tmp11_; + gint _tmp12_; + GdkPoint _tmp13_; + gint _tmp14_; #line 381 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp8_ = *space; + _tmp7_ = *space; #line 381 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp9_ = _tmp8_.width; + _tmp8_ = _tmp7_.width; #line 381 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp10_ = *point; + _tmp9_ = *point; #line 381 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp11_ = _tmp10_.x; + _tmp10_ = _tmp9_.x; #line 381 "/home/jens/Source/shotwell/src/Orientation.vala" - derotated.x = (_tmp9_ - _tmp11_) - 1; + derotated.x = (_tmp8_ - _tmp10_) - 1; #line 382 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp12_ = *space; + _tmp11_ = *space; #line 382 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp13_ = _tmp12_.height; + _tmp12_ = _tmp11_.height; #line 382 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp14_ = *point; + _tmp13_ = *point; #line 382 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp15_ = _tmp14_.y; + _tmp14_ = _tmp13_.y; #line 382 "/home/jens/Source/shotwell/src/Orientation.vala" - derotated.y = (_tmp13_ - _tmp15_) - 1; + derotated.y = (_tmp12_ - _tmp14_) - 1; #line 383 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1569 "Orientation.c" +#line 1587 "Orientation.c" } #line 367 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_BOTTOM_LEFT: -#line 1573 "Orientation.c" - { - GdkPoint _tmp16_; - gint _tmp17_; - Dimensions _tmp18_; - gint _tmp19_; - GdkPoint _tmp20_; - gint _tmp21_; +#line 1591 "Orientation.c" + { + GdkPoint _tmp15_; + gint _tmp16_; + Dimensions _tmp17_; + gint _tmp18_; + GdkPoint _tmp19_; + gint _tmp20_; #line 387 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp16_ = *point; + _tmp15_ = *point; #line 387 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp17_ = _tmp16_.x; + _tmp16_ = _tmp15_.x; #line 387 "/home/jens/Source/shotwell/src/Orientation.vala" - derotated.x = _tmp17_; + derotated.x = _tmp16_; #line 388 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp18_ = *space; + _tmp17_ = *space; #line 388 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp19_ = _tmp18_.height; + _tmp18_ = _tmp17_.height; #line 388 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp20_ = *point; + _tmp19_ = *point; #line 388 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp21_ = _tmp20_.y; + _tmp20_ = _tmp19_.y; #line 388 "/home/jens/Source/shotwell/src/Orientation.vala" - derotated.y = (_tmp19_ - _tmp21_) - 1; + derotated.y = (_tmp18_ - _tmp20_) - 1; #line 389 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1599 "Orientation.c" +#line 1617 "Orientation.c" } #line 367 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_LEFT_TOP: -#line 1603 "Orientation.c" +#line 1621 "Orientation.c" { - GdkPoint _tmp22_; - gint _tmp23_; - GdkPoint _tmp24_; - gint _tmp25_; + GdkPoint _tmp21_; + gint _tmp22_; + GdkPoint _tmp23_; + gint _tmp24_; #line 393 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp22_ = *point; + _tmp21_ = *point; #line 393 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp23_ = _tmp22_.y; + _tmp22_ = _tmp21_.y; #line 393 "/home/jens/Source/shotwell/src/Orientation.vala" - derotated.x = _tmp23_; + derotated.x = _tmp22_; #line 394 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp24_ = *point; + _tmp23_ = *point; #line 394 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp25_ = _tmp24_.x; + _tmp24_ = _tmp23_.x; #line 394 "/home/jens/Source/shotwell/src/Orientation.vala" - derotated.y = _tmp25_; + derotated.y = _tmp24_; #line 395 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1623 "Orientation.c" +#line 1641 "Orientation.c" } #line 367 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_RIGHT_TOP: -#line 1627 "Orientation.c" - { - GdkPoint _tmp26_; - gint _tmp27_; - Dimensions _tmp28_; - gint _tmp29_; - GdkPoint _tmp30_; - gint _tmp31_; +#line 1645 "Orientation.c" + { + GdkPoint _tmp25_; + gint _tmp26_; + Dimensions _tmp27_; + gint _tmp28_; + GdkPoint _tmp29_; + gint _tmp30_; #line 399 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp26_ = *point; + _tmp25_ = *point; #line 399 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp27_ = _tmp26_.y; + _tmp26_ = _tmp25_.y; #line 399 "/home/jens/Source/shotwell/src/Orientation.vala" - derotated.x = _tmp27_; + derotated.x = _tmp26_; #line 400 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp28_ = *space; + _tmp27_ = *space; #line 400 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp29_ = _tmp28_.height; + _tmp28_ = _tmp27_.height; #line 400 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp30_ = *point; + _tmp29_ = *point; #line 400 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp31_ = _tmp30_.x; + _tmp30_ = _tmp29_.x; #line 400 "/home/jens/Source/shotwell/src/Orientation.vala" - derotated.y = (_tmp29_ - _tmp31_) - 1; + derotated.y = (_tmp28_ - _tmp30_) - 1; #line 401 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1653 "Orientation.c" +#line 1671 "Orientation.c" } #line 367 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_RIGHT_BOTTOM: -#line 1657 "Orientation.c" - { - Dimensions _tmp32_; - gint _tmp33_; - GdkPoint _tmp34_; - gint _tmp35_; - Dimensions _tmp36_; - gint _tmp37_; - GdkPoint _tmp38_; - gint _tmp39_; +#line 1675 "Orientation.c" + { + Dimensions _tmp31_; + gint _tmp32_; + GdkPoint _tmp33_; + gint _tmp34_; + Dimensions _tmp35_; + gint _tmp36_; + GdkPoint _tmp37_; + gint _tmp38_; #line 405 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp32_ = *space; + _tmp31_ = *space; #line 405 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp33_ = _tmp32_.width; + _tmp32_ = _tmp31_.width; #line 405 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp34_ = *point; + _tmp33_ = *point; #line 405 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp35_ = _tmp34_.y; + _tmp34_ = _tmp33_.y; #line 405 "/home/jens/Source/shotwell/src/Orientation.vala" - derotated.x = (_tmp33_ - _tmp35_) - 1; + derotated.x = (_tmp32_ - _tmp34_) - 1; #line 406 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp36_ = *space; + _tmp35_ = *space; #line 406 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp37_ = _tmp36_.height; + _tmp36_ = _tmp35_.height; #line 406 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp38_ = *point; + _tmp37_ = *point; #line 406 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp39_ = _tmp38_.x; + _tmp38_ = _tmp37_.x; #line 406 "/home/jens/Source/shotwell/src/Orientation.vala" - derotated.y = (_tmp37_ - _tmp39_) - 1; + derotated.y = (_tmp36_ - _tmp38_) - 1; #line 407 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1689 "Orientation.c" +#line 1707 "Orientation.c" } #line 367 "/home/jens/Source/shotwell/src/Orientation.vala" case ORIENTATION_LEFT_BOTTOM: -#line 1693 "Orientation.c" - { - Dimensions _tmp40_; - gint _tmp41_; - GdkPoint _tmp42_; - gint _tmp43_; - GdkPoint _tmp44_; - gint _tmp45_; +#line 1711 "Orientation.c" + { + Dimensions _tmp39_; + gint _tmp40_; + GdkPoint _tmp41_; + gint _tmp42_; + GdkPoint _tmp43_; + gint _tmp44_; #line 411 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp40_ = *space; + _tmp39_ = *space; #line 411 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp41_ = _tmp40_.width; + _tmp40_ = _tmp39_.width; #line 411 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp42_ = *point; + _tmp41_ = *point; #line 411 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp43_ = _tmp42_.y; + _tmp42_ = _tmp41_.y; #line 411 "/home/jens/Source/shotwell/src/Orientation.vala" - derotated.x = (_tmp41_ - _tmp43_) - 1; + derotated.x = (_tmp40_ - _tmp42_) - 1; #line 412 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp44_ = *point; + _tmp43_ = *point; #line 412 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp45_ = _tmp44_.x; + _tmp44_ = _tmp43_.x; #line 412 "/home/jens/Source/shotwell/src/Orientation.vala" - derotated.y = _tmp45_; + derotated.y = _tmp44_; #line 413 "/home/jens/Source/shotwell/src/Orientation.vala" break; -#line 1719 "Orientation.c" +#line 1737 "Orientation.c" } default: { #line 416 "/home/jens/Source/shotwell/src/Orientation.vala" g_error ("Orientation.vala:416: rotate_point: %d", (gint) self); -#line 1725 "Orientation.c" +#line 1743 "Orientation.c" } } #line 419 "/home/jens/Source/shotwell/src/Orientation.vala" *result = derotated; #line 419 "/home/jens/Source/shotwell/src/Orientation.vala" return; -#line 1732 "Orientation.c" +#line 1750 "Orientation.c" } -void orientation_rotate_box (Orientation self, Dimensions* space, Box* box, Box* result) { +void +orientation_rotate_box (Orientation self, + Dimensions* space, + Box* box, + Box* result) +{ GdkPoint top_left = {0}; GdkPoint bottom_right = {0}; GdkPoint _tmp0_ = {0}; @@ -1741,31 +1764,27 @@ void orientation_rotate_box (Orientation self, Dimensions* space, Box* box, Box* gint _tmp3_; Dimensions _tmp4_; gint _tmp5_; - gint _tmp6_; - GdkPoint _tmp7_; - gint _tmp8_; - Dimensions _tmp9_; - gint _tmp10_; + GdkPoint _tmp6_; + gint _tmp7_; + Dimensions _tmp8_; + gint _tmp9_; + GdkPoint _tmp10_; gint _tmp11_; - GdkPoint _tmp12_; + Dimensions _tmp12_; gint _tmp13_; - Dimensions _tmp14_; + GdkPoint _tmp14_; gint _tmp15_; - gint _tmp16_; - GdkPoint _tmp17_; - gint _tmp18_; - Dimensions _tmp19_; - gint _tmp20_; - gint _tmp21_; - Dimensions _tmp22_; - GdkPoint _tmp23_; - GdkPoint _tmp24_ = {0}; - Dimensions _tmp25_; - GdkPoint _tmp26_; - GdkPoint _tmp27_ = {0}; - GdkPoint _tmp28_; - GdkPoint _tmp29_; - Box _tmp30_ = {0}; + Dimensions _tmp16_; + gint _tmp17_; + Dimensions _tmp18_; + GdkPoint _tmp19_; + GdkPoint _tmp20_ = {0}; + Dimensions _tmp21_; + GdkPoint _tmp22_; + GdkPoint _tmp23_ = {0}; + GdkPoint _tmp24_; + GdkPoint _tmp25_; + Box _tmp26_ = {0}; #line 423 "/home/jens/Source/shotwell/src/Orientation.vala" g_return_if_fail (space != NULL); #line 423 "/home/jens/Source/shotwell/src/Orientation.vala" @@ -1785,76 +1804,73 @@ void orientation_rotate_box (Orientation self, Dimensions* space, Box* box, Box* #line 427 "/home/jens/Source/shotwell/src/Orientation.vala" _tmp5_ = _tmp4_.width; #line 427 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp6_ = CLAMP (_tmp3_, 0, _tmp5_ - 1); -#line 427 "/home/jens/Source/shotwell/src/Orientation.vala" - top_left.x = _tmp6_; -#line 428 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp7_ = top_left; + top_left.x = CLAMP (_tmp3_, 0, _tmp5_ - 1); #line 428 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp8_ = _tmp7_.y; + _tmp6_ = top_left; #line 428 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp9_ = *space; + _tmp7_ = _tmp6_.y; #line 428 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp10_ = _tmp9_.height; + _tmp8_ = *space; #line 428 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp11_ = CLAMP (_tmp8_, 0, _tmp10_ - 1); + _tmp9_ = _tmp8_.height; #line 428 "/home/jens/Source/shotwell/src/Orientation.vala" - top_left.y = _tmp11_; + top_left.y = CLAMP (_tmp7_, 0, _tmp9_ - 1); #line 430 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp12_ = bottom_right; + _tmp10_ = bottom_right; #line 430 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp13_ = _tmp12_.x; + _tmp11_ = _tmp10_.x; #line 430 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp14_ = *space; + _tmp12_ = *space; #line 430 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp15_ = _tmp14_.width; + _tmp13_ = _tmp12_.width; #line 430 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp16_ = CLAMP (_tmp13_, 0, _tmp15_ - 1); -#line 430 "/home/jens/Source/shotwell/src/Orientation.vala" - bottom_right.x = _tmp16_; -#line 431 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp17_ = bottom_right; + bottom_right.x = CLAMP (_tmp11_, 0, _tmp13_ - 1); #line 431 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp18_ = _tmp17_.y; + _tmp14_ = bottom_right; #line 431 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp19_ = *space; + _tmp15_ = _tmp14_.y; #line 431 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp20_ = _tmp19_.height; + _tmp16_ = *space; #line 431 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp21_ = CLAMP (_tmp18_, 0, _tmp20_ - 1); + _tmp17_ = _tmp16_.height; #line 431 "/home/jens/Source/shotwell/src/Orientation.vala" - bottom_right.y = _tmp21_; + bottom_right.y = CLAMP (_tmp15_, 0, _tmp17_ - 1); #line 433 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp22_ = *space; + _tmp18_ = *space; #line 433 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp23_ = top_left; + _tmp19_ = top_left; #line 433 "/home/jens/Source/shotwell/src/Orientation.vala" - orientation_rotate_point (self, &_tmp22_, &_tmp23_, &_tmp24_); + orientation_rotate_point (self, &_tmp18_, &_tmp19_, &_tmp20_); #line 433 "/home/jens/Source/shotwell/src/Orientation.vala" - top_left = _tmp24_; + top_left = _tmp20_; #line 434 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp25_ = *space; + _tmp21_ = *space; #line 434 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp26_ = bottom_right; + _tmp22_ = bottom_right; #line 434 "/home/jens/Source/shotwell/src/Orientation.vala" - orientation_rotate_point (self, &_tmp25_, &_tmp26_, &_tmp27_); + orientation_rotate_point (self, &_tmp21_, &_tmp22_, &_tmp23_); #line 434 "/home/jens/Source/shotwell/src/Orientation.vala" - bottom_right = _tmp27_; + bottom_right = _tmp23_; #line 436 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp28_ = top_left; + _tmp24_ = top_left; #line 436 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp29_ = bottom_right; + _tmp25_ = bottom_right; #line 436 "/home/jens/Source/shotwell/src/Orientation.vala" - box_from_points (&_tmp28_, &_tmp29_, &_tmp30_); + box_from_points (&_tmp24_, &_tmp25_, &_tmp26_); #line 436 "/home/jens/Source/shotwell/src/Orientation.vala" - *result = _tmp30_; + *result = _tmp26_; #line 436 "/home/jens/Source/shotwell/src/Orientation.vala" return; -#line 1854 "Orientation.c" +#line 1865 "Orientation.c" } -void orientation_derotate_box (Orientation self, Dimensions* space, Box* box, Box* result) { +void +orientation_derotate_box (Orientation self, + Dimensions* space, + Box* box, + Box* result) +{ GdkPoint top_left = {0}; GdkPoint bottom_right = {0}; GdkPoint _tmp0_ = {0}; @@ -1904,11 +1920,13 @@ void orientation_derotate_box (Orientation self, Dimensions* space, Box* box, Bo *result = _tmp10_; #line 447 "/home/jens/Source/shotwell/src/Orientation.vala" return; -#line 1908 "Orientation.c" +#line 1924 "Orientation.c" } -GType orientation_get_type (void) { +GType +orientation_get_type (void) +{ static volatile gsize orientation_type_id__volatile = 0; if (g_once_init_enter (&orientation_type_id__volatile)) { static const GEnumValue values[] = {{ORIENTATION_MIN, "ORIENTATION_MIN", "min"}, {ORIENTATION_TOP_LEFT, "ORIENTATION_TOP_LEFT", "top-left"}, {ORIENTATION_TOP_RIGHT, "ORIENTATION_TOP_RIGHT", "top-right"}, {ORIENTATION_BOTTOM_RIGHT, "ORIENTATION_BOTTOM_RIGHT", "bottom-right"}, {ORIENTATION_BOTTOM_LEFT, "ORIENTATION_BOTTOM_LEFT", "bottom-left"}, {ORIENTATION_LEFT_TOP, "ORIENTATION_LEFT_TOP", "left-top"}, {ORIENTATION_RIGHT_TOP, "ORIENTATION_RIGHT_TOP", "right-top"}, {ORIENTATION_RIGHT_BOTTOM, "ORIENTATION_RIGHT_BOTTOM", "right-bottom"}, {ORIENTATION_LEFT_BOTTOM, "ORIENTATION_LEFT_BOTTOM", "left-bottom"}, {ORIENTATION_MAX, "ORIENTATION_MAX", "max"}, {0, NULL, NULL}}; @@ -1920,7 +1938,10 @@ GType orientation_get_type (void) { } -GdkPixbuf* rotation_perform (Rotation self, GdkPixbuf* pixbuf) { +GdkPixbuf* +rotation_perform (Rotation self, + GdkPixbuf* pixbuf) +{ GdkPixbuf* result = NULL; #line 457 "/home/jens/Source/shotwell/src/Orientation.vala" g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL); @@ -1928,125 +1949,117 @@ GdkPixbuf* rotation_perform (Rotation self, GdkPixbuf* pixbuf) { switch (self) { #line 458 "/home/jens/Source/shotwell/src/Orientation.vala" case ROTATION_CLOCKWISE: -#line 1932 "Orientation.c" +#line 1953 "Orientation.c" { GdkPixbuf* _tmp0_; - GdkPixbuf* _tmp1_; -#line 460 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp0_ = pixbuf; #line 460 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp1_ = gdk_pixbuf_rotate_simple (_tmp0_, GDK_PIXBUF_ROTATE_CLOCKWISE); + _tmp0_ = gdk_pixbuf_rotate_simple (pixbuf, GDK_PIXBUF_ROTATE_CLOCKWISE); #line 460 "/home/jens/Source/shotwell/src/Orientation.vala" - result = _tmp1_; + result = _tmp0_; #line 460 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 1944 "Orientation.c" +#line 1962 "Orientation.c" } #line 458 "/home/jens/Source/shotwell/src/Orientation.vala" case ROTATION_COUNTERCLOCKWISE: -#line 1948 "Orientation.c" +#line 1966 "Orientation.c" { - GdkPixbuf* _tmp2_; - GdkPixbuf* _tmp3_; -#line 463 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp2_ = pixbuf; + GdkPixbuf* _tmp1_; #line 463 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp3_ = gdk_pixbuf_rotate_simple (_tmp2_, GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE); + _tmp1_ = gdk_pixbuf_rotate_simple (pixbuf, GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE); #line 463 "/home/jens/Source/shotwell/src/Orientation.vala" - result = _tmp3_; + result = _tmp1_; #line 463 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 1960 "Orientation.c" +#line 1975 "Orientation.c" } #line 458 "/home/jens/Source/shotwell/src/Orientation.vala" case ROTATION_MIRROR: -#line 1964 "Orientation.c" +#line 1979 "Orientation.c" { - GdkPixbuf* _tmp4_; - GdkPixbuf* _tmp5_; -#line 466 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp4_ = pixbuf; + GdkPixbuf* _tmp2_; #line 466 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp5_ = gdk_pixbuf_flip (_tmp4_, TRUE); + _tmp2_ = gdk_pixbuf_flip (pixbuf, TRUE); #line 466 "/home/jens/Source/shotwell/src/Orientation.vala" - result = _tmp5_; + result = _tmp2_; #line 466 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 1976 "Orientation.c" +#line 1988 "Orientation.c" } #line 458 "/home/jens/Source/shotwell/src/Orientation.vala" case ROTATION_UPSIDE_DOWN: -#line 1980 "Orientation.c" +#line 1992 "Orientation.c" { - GdkPixbuf* _tmp6_; - GdkPixbuf* _tmp7_; -#line 469 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp6_ = pixbuf; + GdkPixbuf* _tmp3_; #line 469 "/home/jens/Source/shotwell/src/Orientation.vala" - _tmp7_ = gdk_pixbuf_flip (_tmp6_, FALSE); + _tmp3_ = gdk_pixbuf_flip (pixbuf, FALSE); #line 469 "/home/jens/Source/shotwell/src/Orientation.vala" - result = _tmp7_; + result = _tmp3_; #line 469 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 1992 "Orientation.c" +#line 2001 "Orientation.c" } default: { #line 472 "/home/jens/Source/shotwell/src/Orientation.vala" g_error ("Orientation.vala:472: Unknown rotation: %d", (gint) self); -#line 1998 "Orientation.c" +#line 2007 "Orientation.c" } } } -Rotation rotation_opposite (Rotation self) { +Rotation +rotation_opposite (Rotation self) +{ Rotation result = 0; #line 477 "/home/jens/Source/shotwell/src/Orientation.vala" switch (self) { #line 477 "/home/jens/Source/shotwell/src/Orientation.vala" case ROTATION_CLOCKWISE: -#line 2010 "Orientation.c" +#line 2021 "Orientation.c" { #line 479 "/home/jens/Source/shotwell/src/Orientation.vala" result = ROTATION_COUNTERCLOCKWISE; #line 479 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 2016 "Orientation.c" +#line 2027 "Orientation.c" } #line 477 "/home/jens/Source/shotwell/src/Orientation.vala" case ROTATION_COUNTERCLOCKWISE: -#line 2020 "Orientation.c" +#line 2031 "Orientation.c" { #line 482 "/home/jens/Source/shotwell/src/Orientation.vala" result = ROTATION_CLOCKWISE; #line 482 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 2026 "Orientation.c" +#line 2037 "Orientation.c" } #line 477 "/home/jens/Source/shotwell/src/Orientation.vala" case ROTATION_MIRROR: #line 477 "/home/jens/Source/shotwell/src/Orientation.vala" case ROTATION_UPSIDE_DOWN: -#line 2032 "Orientation.c" +#line 2043 "Orientation.c" { #line 486 "/home/jens/Source/shotwell/src/Orientation.vala" result = self; #line 486 "/home/jens/Source/shotwell/src/Orientation.vala" return result; -#line 2038 "Orientation.c" +#line 2049 "Orientation.c" } default: { #line 489 "/home/jens/Source/shotwell/src/Orientation.vala" g_error ("Orientation.vala:489: Unknown rotation: %d", (gint) self); -#line 2044 "Orientation.c" +#line 2055 "Orientation.c" } } } -GType rotation_get_type (void) { +GType +rotation_get_type (void) +{ static volatile gsize rotation_type_id__volatile = 0; if (g_once_init_enter (&rotation_type_id__volatile)) { static const GEnumValue values[] = {{ROTATION_CLOCKWISE, "ROTATION_CLOCKWISE", "clockwise"}, {ROTATION_COUNTERCLOCKWISE, "ROTATION_COUNTERCLOCKWISE", "counterclockwise"}, {ROTATION_MIRROR, "ROTATION_MIRROR", "mirror"}, {ROTATION_UPSIDE_DOWN, "ROTATION_UPSIDE_DOWN", "upside-down"}, {0, NULL, NULL}}; diff --git a/src/Page.c b/src/Page.c index ab4f478..aa71fce 100644 --- a/src/Page.c +++ b/src/Page.c @@ -1,4 +1,4 @@ -/* Page.c generated by valac 0.36.6, the Vala compiler +/* Page.c generated by valac 0.40.4, the Vala compiler * generated from Page.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -115,6 +116,11 @@ typedef struct _ViewCollectionClass ViewCollectionClass; typedef struct _OneShotScheduler OneShotScheduler; typedef struct _OneShotSchedulerClass OneShotSchedulerClass; +enum { + PAGE_0_PROPERTY, + PAGE_NUM_PROPERTIES +}; +static GParamSpec* page_properties[PAGE_NUM_PROPERTIES]; #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL))) #define _one_shot_scheduler_unref0(var) ((var == NULL) ? NULL : (var = (one_shot_scheduler_unref (var), NULL))) #define _injection_group_unref0(var) ((var == NULL) ? NULL : (var = (injection_group_unref (var), NULL))) @@ -257,6 +263,11 @@ typedef struct _CoreViewTrackerClass CoreViewTrackerClass; typedef struct _CheckerboardLayout CheckerboardLayout; typedef struct _CheckerboardLayoutClass CheckerboardLayoutClass; +enum { + CHECKERBOARD_PAGE_0_PROPERTY, + CHECKERBOARD_PAGE_NUM_PROPERTIES +}; +static GParamSpec* checkerboard_page_properties[CHECKERBOARD_PAGE_NUM_PROPERTIES]; #define _view_filter_unref0(var) ((var == NULL) ? NULL : (var = (view_filter_unref (var), NULL))) #define TYPE_ADJUSTMENT_RELATION (adjustment_relation_get_type ()) @@ -333,6 +344,11 @@ typedef struct _TransitionClockClass TransitionClockClass; #define TYPE_ZOOM_STATE (zoom_state_get_type ()) typedef struct _ZoomState ZoomState; +enum { + SINGLE_PHOTO_PAGE_0_PROPERTY, + SINGLE_PHOTO_PAGE_NUM_PROPERTIES +}; +static GParamSpec* single_photo_page_properties[SINGLE_PHOTO_PAGE_NUM_PROPERTIES]; #define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ()) #define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade)) @@ -894,35 +910,54 @@ static gint _drag_and_drop_handler_XDS_FAKE_TARGET_size_ = 0; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; gpointer injection_group_element_ref (gpointer instance); void injection_group_element_unref (gpointer instance); -GParamSpec* injection_group_param_spec_element (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void injection_group_value_set_element (GValue* value, gpointer v_object); -void injection_group_value_take_element (GValue* value, gpointer v_object); +GParamSpec* injection_group_param_spec_element (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void injection_group_value_set_element (GValue* value, + gpointer v_object); +void injection_group_value_take_element (GValue* value, + gpointer v_object); gpointer injection_group_value_get_element (const GValue* value); GType injection_group_element_get_type (void) G_GNUC_CONST; #define INJECTION_GROUP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_INJECTION_GROUP, InjectionGroupPrivate)) -enum { - INJECTION_GROUP_DUMMY_PROPERTY -}; InjectionGroup* injection_group_new (const gchar* path); -InjectionGroup* injection_group_construct (GType object_type, const gchar* path); +InjectionGroup* injection_group_construct (GType object_type, + const gchar* path); gchar* injection_group_get_path (InjectionGroup* self); GeeList* injection_group_get_elements (InjectionGroup* self); -void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator); +void injection_group_add_menu_item (InjectionGroup* self, + const gchar* name, + const gchar* action, + const gchar* accellerator); GType injection_group_element_item_type_get_type (void) G_GNUC_CONST; -InjectionGroupElement* injection_group_element_new (const gchar* name, const gchar* action, const gchar* accellerator, InjectionGroupElementItemType kind); -InjectionGroupElement* injection_group_element_construct (GType object_type, const gchar* name, const gchar* action, const gchar* accellerator, InjectionGroupElementItemType kind); -void injection_group_add_menu (InjectionGroup* self, const gchar* name, const gchar* action); +InjectionGroupElement* injection_group_element_new (const gchar* name, + const gchar* action, + const gchar* accellerator, + InjectionGroupElementItemType kind); +InjectionGroupElement* injection_group_element_construct (GType object_type, + const gchar* name, + const gchar* action, + const gchar* accellerator, + InjectionGroupElementItemType kind); +void injection_group_add_menu (InjectionGroup* self, + const gchar* name, + const gchar* action); void injection_group_add_separator (InjectionGroup* self); -enum { - INJECTION_GROUP_ELEMENT_DUMMY_PROPERTY -}; static void injection_group_element_finalize (InjectionGroupElement * obj); static void injection_group_finalize (InjectionGroup * obj); GType page_get_type (void) G_GNUC_CONST; @@ -930,31 +965,44 @@ GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; gpointer one_shot_scheduler_ref (gpointer instance); void one_shot_scheduler_unref (gpointer instance); -GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_one_shot_scheduler (GValue* value, gpointer v_object); -void value_take_one_shot_scheduler (GValue* value, gpointer v_object); +GParamSpec* param_spec_one_shot_scheduler (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_one_shot_scheduler (GValue* value, + gpointer v_object); +void value_take_one_shot_scheduler (GValue* value, + gpointer v_object); gpointer value_get_one_shot_scheduler (const GValue* value); GType one_shot_scheduler_get_type (void) G_GNUC_CONST; #define PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PAGE, PagePrivate)) -enum { - PAGE_DUMMY_PROPERTY -}; #define PAGE_CONSIDER_CONFIGURE_HALTED_MSEC 400 -Page* page_construct (GType object_type, const gchar* page_name); +Page* page_construct (GType object_type, + const gchar* page_name); ViewCollection* view_collection_new (const gchar* name); -ViewCollection* view_collection_construct (GType object_type, const gchar* name); +ViewCollection* view_collection_construct (GType object_type, + const gchar* name); gboolean page_on_context_keypress (Page* self); -static gboolean _page_on_context_keypress_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self); +static gboolean _page_on_context_keypress_gtk_widget_popup_menu (GtkWidget* _sender, + gpointer self); static void page_attach_view_signals (Page* self); -static void _page_attach_view_signals_gtk_widget_realize (GtkWidget* _sender, gpointer self); +static void _page_attach_view_signals_gtk_widget_realize (GtkWidget* _sender, + gpointer self); static void page_real_destroy (GtkWidget* base); static void page_detach_event_source (Page* self); static void page_detach_view_signals (Page* self); @@ -962,217 +1010,428 @@ void data_collection_close (DataCollection* self); void page_clear_container (Page* self); void one_shot_scheduler_cancel (OneShotScheduler* self); gchar* page_get_page_name (Page* self); -void page_set_page_name (Page* self, const gchar* page_name); -static void page_real_set_page_name (Page* self, const gchar* page_name); +void page_set_page_name (Page* self, + const gchar* page_name); +static void page_real_set_page_name (Page* self, + const gchar* page_name); gchar* page_to_string (Page* self); ViewCollection* page_get_view (Page* self); GtkWindow* page_get_container (Page* self); -void page_set_container (Page* self, GtkWindow* container); -static void page_real_set_container (Page* self, GtkWindow* container); +void page_set_container (Page* self, + GtkWindow* container); +static void page_real_set_container (Page* self, + GtkWindow* container); static void page_real_clear_container (Page* self); -void page_set_event_source (Page* self, GtkWidget* event_source); -static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* event); -static gboolean _page_on_button_pressed_internal_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); -static gboolean page_on_button_released_internal (Page* self, GdkEventButton* event); -static gboolean _page_on_button_released_internal_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); -static gboolean page_on_motion_internal (Page* self, GdkEventMotion* event); -static gboolean _page_on_motion_internal_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self); +void page_set_event_source (Page* self, + GtkWidget* event_source); +static gboolean page_on_button_pressed_internal (Page* self, + GdkEventButton* event); +static gboolean _page_on_button_pressed_internal_gtk_widget_button_press_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self); +static gboolean page_on_button_released_internal (Page* self, + GdkEventButton* event); +static gboolean _page_on_button_released_internal_gtk_widget_button_release_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self); +static gboolean page_on_motion_internal (Page* self, + GdkEventMotion* event); +static gboolean _page_on_motion_internal_gtk_widget_motion_notify_event (GtkWidget* _sender, + GdkEventMotion* event, + gpointer self); gboolean page_on_leave_notify_event (Page* self); -static gboolean _page_on_leave_notify_event_gtk_widget_leave_notify_event (GtkWidget* _sender, GdkEventCrossing* event, gpointer self); -static gboolean page_on_mousewheel_internal (Page* self, GdkEventScroll* event); -static gboolean _page_on_mousewheel_internal_gtk_widget_scroll_event (GtkWidget* _sender, GdkEventScroll* event, gpointer self); +static gboolean _page_on_leave_notify_event_gtk_widget_leave_notify_event (GtkWidget* _sender, + GdkEventCrossing* event, + gpointer self); +static gboolean page_on_mousewheel_internal (Page* self, + GdkEventScroll* event); +static gboolean _page_on_mousewheel_internal_gtk_widget_scroll_event (GtkWidget* _sender, + GdkEventScroll* event, + gpointer self); void page_on_event_source_realize (Page* self); -static void _page_on_event_source_realize_gtk_widget_realize (GtkWidget* _sender, gpointer self); +static void _page_on_event_source_realize_gtk_widget_realize (GtkWidget* _sender, + gpointer self); void page_disable_drag_source (Page* self); GtkWidget* page_get_event_source (Page* self); GMenuModel* page_get_menubar (Page* self); -InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1); -GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gchar* extension_point); +InjectionGroup** page_init_collect_injection_groups (Page* self, + int* result_length1); +GMenuModel* page_find_extension_point (Page* self, + GMenuModel* model, + const gchar* extension_point); GtkToolbar* page_get_toolbar (Page* self); static GtkToolbar* page_real_get_toolbar (Page* self); GtkMenu* page_get_page_context_menu (Page* self); static GtkMenu* page_real_get_page_context_menu (Page* self); void page_switching_from (Page* self); static void page_real_switching_from (Page* self); -void page_remove_actions (Page* self, GActionMap* map); +void page_remove_actions (Page* self, + GActionMap* map); void page_switched_to (Page* self); static void page_real_switched_to (Page* self); static void page_add_ui (Page* self); -void page_add_actions (Page* self, GActionMap* map); +void page_add_actions (Page* self, + GActionMap* map); gint view_collection_get_selected_count (ViewCollection* self); gint data_collection_get_count (DataCollection* self); -void page_init_actions (Page* self, gint selected_count, gint count); -void page_update_actions (Page* self, gint selected_count, gint count); +void page_init_actions (Page* self, + gint selected_count, + gint count); +void page_update_actions (Page* self, + gint selected_count, + gint count); static void page_update_modifiers (Page* self); void page_ready (Page* self); static void page_real_ready (Page* self); gboolean page_is_in_view (Page* self); -void page_switching_to_fullscreen (Page* self, FullscreenWindow* fsw); -static void page_real_switching_to_fullscreen (Page* self, FullscreenWindow* fsw); -void page_returning_from_fullscreen (Page* self, FullscreenWindow* fsw); -static void page_real_returning_from_fullscreen (Page* self, FullscreenWindow* fsw); -GAction* page_get_action (Page* self, const gchar* name); +void page_switching_to_fullscreen (Page* self, + FullscreenWindow* fsw); +static void page_real_switching_to_fullscreen (Page* self, + FullscreenWindow* fsw); +void page_returning_from_fullscreen (Page* self, + FullscreenWindow* fsw); +static void page_real_returning_from_fullscreen (Page* self, + FullscreenWindow* fsw); +GAction* page_get_action (Page* self, + const gchar* name); GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); -void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); -void page_set_action_details (Page* self, const gchar* name, const gchar* label, const gchar* tooltip, gboolean sensitive); -void page_update_menu_item_label (Page* self, const gchar* id, const gchar* new_label); -void page_activate_action (Page* self, const gchar* name); -GAction* page_get_common_action (Page* self, const gchar* name, gboolean log_warning); -void page_set_common_action_sensitive (Page* self, const gchar* name, gboolean sensitive); -void page_set_common_action_label (Page* self, const gchar* name, const gchar* label); -void page_set_common_action_important (Page* self, const gchar* name, gboolean important); -void page_activate_common_action (Page* self, const gchar* name); +void page_set_action_sensitive (Page* self, + const gchar* name, + gboolean sensitive); +void page_set_action_details (Page* self, + const gchar* name, + const gchar* label, + const gchar* tooltip, + gboolean sensitive); +void page_update_menu_item_label (Page* self, + const gchar* id, + const gchar* new_label); +void page_activate_action (Page* self, + const gchar* name); +GAction* page_get_common_action (Page* self, + const gchar* name, + gboolean log_warning); +void page_set_common_action_sensitive (Page* self, + const gchar* name, + gboolean sensitive); +void page_set_common_action_label (Page* self, + const gchar* name, + const gchar* label); +void page_set_common_action_important (Page* self, + const gchar* name, + gboolean important); +void page_activate_common_action (Page* self, + const gchar* name); gboolean page_get_ctrl_pressed (Page* self); gboolean page_get_alt_pressed (Page* self); gboolean page_get_shift_pressed (Page* self); gboolean page_get_super_pressed (Page* self); -void page_set_action_active (Page* self, const gchar* name, gboolean active); +void page_set_action_active (Page* self, + const gchar* name, + gboolean active); static GVariant* _variant_new20 (gboolean value); -static gboolean page_get_modifiers (Page* self, gboolean* ctrl, gboolean* alt, gboolean* shift, gboolean* super); -gboolean page_on_ctrl_released (Page* self, GdkEventKey* event); -gboolean page_on_ctrl_pressed (Page* self, GdkEventKey* event); -gboolean page_on_alt_released (Page* self, GdkEventKey* event); -gboolean page_on_alt_pressed (Page* self, GdkEventKey* event); -gboolean page_on_shift_released (Page* self, GdkEventKey* event); -gboolean page_on_shift_pressed (Page* self, GdkEventKey* event); -gboolean page_on_super_released (Page* self, GdkEventKey* event); -gboolean page_on_super_pressed (Page* self, GdkEventKey* event); +static gboolean page_get_modifiers (Page* self, + gboolean* ctrl, + gboolean* alt, + gboolean* shift, + gboolean* super); +gboolean page_on_ctrl_released (Page* self, + GdkEventKey* event); +gboolean page_on_ctrl_pressed (Page* self, + GdkEventKey* event); +gboolean page_on_alt_released (Page* self, + GdkEventKey* event); +gboolean page_on_alt_pressed (Page* self, + GdkEventKey* event); +gboolean page_on_shift_released (Page* self, + GdkEventKey* event); +gboolean page_on_shift_pressed (Page* self, + GdkEventKey* event); +gboolean page_on_super_released (Page* self, + GdkEventKey* event); +gboolean page_on_super_pressed (Page* self, + GdkEventKey* event); PageWindow* page_get_page_window (Page* self); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* page_get_command_manager (Page* self); CommandManager* app_window_get_command_manager (void); -static void page_real_add_actions (Page* self, GActionMap* map); -static void page_real_remove_actions (Page* self, GActionMap* map); -void page_on_action_toggle (Page* self, GAction* action, GVariant* value); +static void page_real_add_actions (Page* self, + GActionMap* map); +static void page_real_remove_actions (Page* self, + GActionMap* map); +void page_on_action_toggle (Page* self, + GAction* action, + GVariant* value); static gboolean _variant_get21 (GVariant* value); static GVariant* _variant_new22 (gboolean value); -void page_on_action_radio (Page* self, GAction* action, GVariant* value); -void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static void page_init_load_ui (Page* self, const gchar* ui_filename); -void page_init_toolbar (Page* self, const gchar* path); +void page_on_action_radio (Page* self, + GAction* action, + GVariant* value); +void page_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames); +static void page_init_load_ui (Page* self, + const gchar* ui_filename); +void page_init_toolbar (Page* self, + const gchar* path); static void page_on_update_actions (Page* self); GType data_object_get_type (void) G_GNUC_CONST; GType data_view_get_type (void) G_GNUC_CONST; -static void _page_on_update_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self); -static void _page_on_update_actions_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self); -static void _page_on_update_actions_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self); -static void _page_on_update_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self); +static void _page_on_update_actions_view_collection_items_state_changed (ViewCollection* _sender, + GeeIterable* changed, + gpointer self); +static void _page_on_update_actions_view_collection_selection_group_altered (ViewCollection* _sender, + gpointer self); +static void _page_on_update_actions_view_collection_items_visibility_changed (ViewCollection* _sender, + GeeCollection* changed, + gpointer self); +static void _page_on_update_actions_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self); static void page_on_update_actions_on_idle (Page* self); static void _page_on_update_actions_on_idle_one_shot_callback (gpointer self); -OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target); -OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target); -void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority); +OneShotScheduler* one_shot_scheduler_new (const gchar* name, + OneShotCallback callback, + void* callback_target); +OneShotScheduler* one_shot_scheduler_construct (GType object_type, + const gchar* name, + OneShotCallback callback, + void* callback_target); +void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, + gint priority); gchar* resources_get_ui (const gchar* filename); -void app_window_error_message (const gchar* message, GtkWindow* parent); +void app_window_error_message (const gchar* message, + GtkWindow* parent); gpointer application_ref (gpointer instance); void application_unref (gpointer instance); -GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_application (GValue* value, gpointer v_object); -void value_take_application (GValue* value, gpointer v_object); +GParamSpec* param_spec_application (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_application (GValue* value, + gpointer v_object); +void value_take_application (GValue* value, + gpointer v_object); gpointer value_get_application (const GValue* value); GType application_get_type (void) G_GNUC_CONST; Application* application_get_instance (void); void application_panic (Application* self); -static void page_real_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static InjectionGroup** page_real_init_collect_injection_groups (Page* self, int* result_length1); -static void page_real_init_actions (Page* self, gint selected_count, gint count); -static void page_real_update_actions (Page* self, gint selected_count, gint count); -void page_enable_drag_source (Page* self, GdkDragAction actions, GtkTargetEntry* source_target_entries, int source_target_entries_length1); -static void page_on_drag_begin (Page* self, GdkDragContext* context); -static void _page_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self); -static void page_on_drag_data_get (Page* self, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint time); -static void _page_on_drag_data_get_gtk_widget_drag_data_get (GtkWidget* _sender, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint time_, gpointer self); -static void page_on_drag_data_delete (Page* self, GdkDragContext* context); -static void _page_on_drag_data_delete_gtk_widget_drag_data_delete (GtkWidget* _sender, GdkDragContext* context, gpointer self); -static void page_on_drag_end (Page* self, GdkDragContext* context); -static void _page_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self); -static gboolean page_on_drag_failed (Page* self, GdkDragContext* context, GtkDragResult drag_result); -static gboolean _page_on_drag_failed_gtk_widget_drag_failed (GtkWidget* _sender, GdkDragContext* context, GtkDragResult _result_, gpointer self); +static void page_real_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames); +static InjectionGroup** page_real_init_collect_injection_groups (Page* self, + int* result_length1); +static void page_real_init_actions (Page* self, + gint selected_count, + gint count); +static void page_real_update_actions (Page* self, + gint selected_count, + gint count); +void page_enable_drag_source (Page* self, + GdkDragAction actions, + GtkTargetEntry* source_target_entries, + int source_target_entries_length1); +static void page_on_drag_begin (Page* self, + GdkDragContext* context); +static void _page_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, + GdkDragContext* context, + gpointer self); +static void page_on_drag_data_get (Page* self, + GdkDragContext* context, + GtkSelectionData* selection_data, + guint info, + guint time); +static void _page_on_drag_data_get_gtk_widget_drag_data_get (GtkWidget* _sender, + GdkDragContext* context, + GtkSelectionData* selection_data, + guint info, + guint time_, + gpointer self); +static void page_on_drag_data_delete (Page* self, + GdkDragContext* context); +static void _page_on_drag_data_delete_gtk_widget_drag_data_delete (GtkWidget* _sender, + GdkDragContext* context, + gpointer self); +static void page_on_drag_end (Page* self, + GdkDragContext* context); +static void _page_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, + GdkDragContext* context, + gpointer self); +static gboolean page_on_drag_failed (Page* self, + GdkDragContext* context, + GtkDragResult drag_result); +static gboolean _page_on_drag_failed_gtk_widget_drag_failed (GtkWidget* _sender, + GdkDragContext* context, + GtkDragResult _result_, + gpointer self); gboolean page_is_dnd_enabled (Page* self); -gboolean page_source_drag_failed (Page* self, GdkDragContext* context, GtkDragResult drag_result); -static gboolean page_real_source_drag_failed (Page* self, GdkDragContext* context, GtkDragResult drag_result); -gboolean page_get_event_source_pointer (Page* self, gint* x, gint* y, GdkModifierType* mask); -gboolean page_on_left_click (Page* self, GdkEventButton* event); -static gboolean page_real_on_left_click (Page* self, GdkEventButton* event); -gboolean page_on_middle_click (Page* self, GdkEventButton* event); -static gboolean page_real_on_middle_click (Page* self, GdkEventButton* event); -gboolean page_on_right_click (Page* self, GdkEventButton* event); -static gboolean page_real_on_right_click (Page* self, GdkEventButton* event); -gboolean page_on_left_released (Page* self, GdkEventButton* event); -static gboolean page_real_on_left_released (Page* self, GdkEventButton* event); -gboolean page_on_middle_released (Page* self, GdkEventButton* event); -static gboolean page_real_on_middle_released (Page* self, GdkEventButton* event); -gboolean page_on_right_released (Page* self, GdkEventButton* event); -static gboolean page_real_on_right_released (Page* self, GdkEventButton* event); -static gboolean page_real_on_ctrl_pressed (Page* self, GdkEventKey* event); -static gboolean page_real_on_ctrl_released (Page* self, GdkEventKey* event); -static gboolean page_real_on_alt_pressed (Page* self, GdkEventKey* event); -static gboolean page_real_on_alt_released (Page* self, GdkEventKey* event); -static gboolean page_real_on_shift_pressed (Page* self, GdkEventKey* event); -static gboolean page_real_on_shift_released (Page* self, GdkEventKey* event); -static gboolean page_real_on_super_pressed (Page* self, GdkEventKey* event); -static gboolean page_real_on_super_released (Page* self, GdkEventKey* event); -gboolean page_on_app_key_pressed (Page* self, GdkEventKey* event); -static gboolean page_real_on_app_key_pressed (Page* self, GdkEventKey* event); -gboolean page_on_app_key_released (Page* self, GdkEventKey* event); -static gboolean page_real_on_app_key_released (Page* self, GdkEventKey* event); -gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event); -gboolean page_notify_app_key_released (Page* self, GdkEventKey* event); -gboolean page_notify_app_focus_in (Page* self, GdkEventFocus* event); -gboolean page_notify_app_focus_out (Page* self, GdkEventFocus* event); -void page_on_move (Page* self, GdkRectangle* rect); -static void page_real_on_move (Page* self, GdkRectangle* rect); -void page_on_move_start (Page* self, GdkRectangle* rect); -static void page_real_on_move_start (Page* self, GdkRectangle* rect); -void page_on_move_finished (Page* self, GdkRectangle* rect); -static void page_real_on_move_finished (Page* self, GdkRectangle* rect); -void page_on_resize (Page* self, GdkRectangle* rect); -static void page_real_on_resize (Page* self, GdkRectangle* rect); -void page_on_resize_start (Page* self, GdkRectangle* rect); -static void page_real_on_resize_start (Page* self, GdkRectangle* rect); -void page_on_resize_finished (Page* self, GdkRectangle* rect); -static void page_real_on_resize_finished (Page* self, GdkRectangle* rect); -gboolean page_on_configure (Page* self, GdkEventConfigure* event, GdkRectangle* rect); -static gboolean page_real_on_configure (Page* self, GdkEventConfigure* event, GdkRectangle* rect); -gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event); +gboolean page_source_drag_failed (Page* self, + GdkDragContext* context, + GtkDragResult drag_result); +static gboolean page_real_source_drag_failed (Page* self, + GdkDragContext* context, + GtkDragResult drag_result); +gboolean page_get_event_source_pointer (Page* self, + gint* x, + gint* y, + GdkModifierType* mask); +gboolean page_on_left_click (Page* self, + GdkEventButton* event); +static gboolean page_real_on_left_click (Page* self, + GdkEventButton* event); +gboolean page_on_middle_click (Page* self, + GdkEventButton* event); +static gboolean page_real_on_middle_click (Page* self, + GdkEventButton* event); +gboolean page_on_right_click (Page* self, + GdkEventButton* event); +static gboolean page_real_on_right_click (Page* self, + GdkEventButton* event); +gboolean page_on_left_released (Page* self, + GdkEventButton* event); +static gboolean page_real_on_left_released (Page* self, + GdkEventButton* event); +gboolean page_on_middle_released (Page* self, + GdkEventButton* event); +static gboolean page_real_on_middle_released (Page* self, + GdkEventButton* event); +gboolean page_on_right_released (Page* self, + GdkEventButton* event); +static gboolean page_real_on_right_released (Page* self, + GdkEventButton* event); +static gboolean page_real_on_ctrl_pressed (Page* self, + GdkEventKey* event); +static gboolean page_real_on_ctrl_released (Page* self, + GdkEventKey* event); +static gboolean page_real_on_alt_pressed (Page* self, + GdkEventKey* event); +static gboolean page_real_on_alt_released (Page* self, + GdkEventKey* event); +static gboolean page_real_on_shift_pressed (Page* self, + GdkEventKey* event); +static gboolean page_real_on_shift_released (Page* self, + GdkEventKey* event); +static gboolean page_real_on_super_pressed (Page* self, + GdkEventKey* event); +static gboolean page_real_on_super_released (Page* self, + GdkEventKey* event); +gboolean page_on_app_key_pressed (Page* self, + GdkEventKey* event); +static gboolean page_real_on_app_key_pressed (Page* self, + GdkEventKey* event); +gboolean page_on_app_key_released (Page* self, + GdkEventKey* event); +static gboolean page_real_on_app_key_released (Page* self, + GdkEventKey* event); +gboolean page_notify_app_key_pressed (Page* self, + GdkEventKey* event); +gboolean page_notify_app_key_released (Page* self, + GdkEventKey* event); +gboolean page_notify_app_focus_in (Page* self, + GdkEventFocus* event); +gboolean page_notify_app_focus_out (Page* self, + GdkEventFocus* event); +void page_on_move (Page* self, + GdkRectangle* rect); +static void page_real_on_move (Page* self, + GdkRectangle* rect); +void page_on_move_start (Page* self, + GdkRectangle* rect); +static void page_real_on_move_start (Page* self, + GdkRectangle* rect); +void page_on_move_finished (Page* self, + GdkRectangle* rect); +static void page_real_on_move_finished (Page* self, + GdkRectangle* rect); +void page_on_resize (Page* self, + GdkRectangle* rect); +static void page_real_on_resize (Page* self, + GdkRectangle* rect); +void page_on_resize_start (Page* self, + GdkRectangle* rect); +static void page_real_on_resize_start (Page* self, + GdkRectangle* rect); +void page_on_resize_finished (Page* self, + GdkRectangle* rect); +static void page_real_on_resize_finished (Page* self, + GdkRectangle* rect); +gboolean page_on_configure (Page* self, + GdkEventConfigure* event, + GdkRectangle* rect); +static gboolean page_real_on_configure (Page* self, + GdkEventConfigure* event, + GdkRectangle* rect); +gboolean page_notify_configure_event (Page* self, + GdkEventConfigure* event); static gboolean page_check_configure_halted (Page* self); static gboolean _page_check_configure_halted_gsource_func (gpointer self); gulong now_ms (void); -gboolean page_on_motion (Page* self, GdkEventMotion* event, gint x, gint y, GdkModifierType mask); -static gboolean page_real_on_motion (Page* self, GdkEventMotion* event, gint x, gint y, GdkModifierType mask); +gboolean page_on_motion (Page* self, + GdkEventMotion* event, + gint x, + gint y, + GdkModifierType mask); +static gboolean page_real_on_motion (Page* self, + GdkEventMotion* event, + gint x, + gint y, + GdkModifierType mask); static void page_check_cursor_hiding (Page* self); static gboolean page_real_on_leave_notify_event (Page* self); -gboolean page_on_mousewheel_up (Page* self, GdkEventScroll* event); -gboolean page_on_mousewheel_down (Page* self, GdkEventScroll* event); -gboolean page_on_mousewheel_left (Page* self, GdkEventScroll* event); -gboolean page_on_mousewheel_right (Page* self, GdkEventScroll* event); -static gboolean page_real_on_mousewheel_up (Page* self, GdkEventScroll* event); -static gboolean page_real_on_mousewheel_down (Page* self, GdkEventScroll* event); -static gboolean page_real_on_mousewheel_left (Page* self, GdkEventScroll* event); -static gboolean page_real_on_mousewheel_right (Page* self, GdkEventScroll* event); +gboolean page_on_mousewheel_up (Page* self, + GdkEventScroll* event); +gboolean page_on_mousewheel_down (Page* self, + GdkEventScroll* event); +gboolean page_on_mousewheel_left (Page* self, + GdkEventScroll* event); +gboolean page_on_mousewheel_right (Page* self, + GdkEventScroll* event); +static gboolean page_real_on_mousewheel_up (Page* self, + GdkEventScroll* event); +static gboolean page_real_on_mousewheel_down (Page* self, + GdkEventScroll* event); +static gboolean page_real_on_mousewheel_left (Page* self, + GdkEventScroll* event); +static gboolean page_real_on_mousewheel_right (Page* self, + GdkEventScroll* event); static gboolean page_real_on_context_keypress (Page* self); -gboolean page_on_context_buttonpress (Page* self, GdkEventButton* event); -static gboolean page_real_on_context_buttonpress (Page* self, GdkEventButton* event); +gboolean page_on_context_buttonpress (Page* self, + GdkEventButton* event); +static gboolean page_real_on_context_buttonpress (Page* self, + GdkEventButton* event); gboolean page_on_context_invoked (Page* self); static gboolean page_real_on_context_invoked (Page* self); -gboolean page_popup_context_menu (Page* self, GtkMenu* context_menu, GdkEventButton* event); -void page_set_cursor_hide_time (Page* self, gint hide_time); +gboolean page_popup_context_menu (Page* self, + GtkMenu* context_menu, + GdkEventButton* event); +void page_set_cursor_hide_time (Page* self, + gint hide_time); void page_start_cursor_hiding (Page* self); void page_stop_cursor_hiding (Page* self); void page_suspend_cursor_hiding (Page* self); void page_restore_cursor_hiding (Page* self); -void page_set_page_cursor (Page* self, GdkCursorType cursor_type); -static void page_real_set_page_cursor (Page* self, GdkCursorType cursor_type); +void page_set_page_cursor (Page* self, + GdkCursorType cursor_type); +static void page_real_set_page_cursor (Page* self, + GdkCursorType cursor_type); static gboolean page_on_hide_cursor (Page* self); static gboolean _page_on_hide_cursor_gsource_func (gpointer self); -void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const gchar* new_label); +void app_window_update_menu_item_label (AppWindow* self, + const gchar* id, + const gchar* new_label); static void page_finalize (GObject * obj); GType checkerboard_page_get_type (void) G_GNUC_CONST; GType thumbnail_view_get_type (void) G_GNUC_CONST; @@ -1183,42 +1442,72 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self); gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType search_view_filter_get_type (void) G_GNUC_CONST; gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; GType checkerboard_layout_get_type (void) G_GNUC_CONST; #define CHECKERBOARD_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CHECKERBOARD_PAGE, CheckerboardPagePrivate)) -enum { - CHECKERBOARD_PAGE_DUMMY_PROPERTY -}; #define CHECKERBOARD_PAGE_AUTOSCROLL_PIXELS 50 #define CHECKERBOARD_PAGE_AUTOSCROLL_TICKS_MSEC 50 -CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name); +CheckerboardPage* checkerboard_page_construct (GType object_type, + const gchar* page_name); CheckerboardLayout* checkerboard_layout_new (ViewCollection* view); -CheckerboardLayout* checkerboard_layout_construct (GType object_type, ViewCollection* view); -void checkerboard_layout_set_name (CheckerboardLayout* self, const gchar* name); -void checkerboard_layout_set_adjustments (CheckerboardLayout* self, GtkAdjustment* hadjustment, GtkAdjustment* vadjustment); -static void checkerboard_page_on_items_hidden (CheckerboardPage* self, GeeIterable* hidden); -static void _checkerboard_page_on_items_hidden_view_collection_items_hidden (ViewCollection* _sender, GeeCollection* hidden, gpointer self); -static void checkerboard_page_on_contents_altered (CheckerboardPage* self, GeeIterable* added, GeeIterable* removed); -static void _checkerboard_page_on_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self); -static void checkerboard_page_on_items_state_changed (CheckerboardPage* self, GeeIterable* changed); -static void _checkerboard_page_on_items_state_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self); -static void checkerboard_page_on_items_visibility_changed (CheckerboardPage* self, GeeCollection* changed); -static void _checkerboard_page_on_items_visibility_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self); -void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path); -void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path); +CheckerboardLayout* checkerboard_layout_construct (GType object_type, + ViewCollection* view); +void checkerboard_layout_set_name (CheckerboardLayout* self, + const gchar* name); +void checkerboard_layout_set_adjustments (CheckerboardLayout* self, + GtkAdjustment* hadjustment, + GtkAdjustment* vadjustment); +static void checkerboard_page_on_items_hidden (CheckerboardPage* self, + GeeIterable* hidden); +static void _checkerboard_page_on_items_hidden_view_collection_items_hidden (ViewCollection* _sender, + GeeCollection* hidden, + gpointer self); +static void checkerboard_page_on_contents_altered (CheckerboardPage* self, + GeeIterable* added, + GeeIterable* removed); +static void _checkerboard_page_on_contents_altered_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self); +static void checkerboard_page_on_items_state_changed (CheckerboardPage* self, + GeeIterable* changed); +static void _checkerboard_page_on_items_state_changed_view_collection_items_state_changed (ViewCollection* _sender, + GeeIterable* changed, + gpointer self); +static void checkerboard_page_on_items_visibility_changed (CheckerboardPage* self, + GeeCollection* changed); +static void _checkerboard_page_on_items_visibility_changed_view_collection_items_visibility_changed (ViewCollection* _sender, + GeeCollection* changed, + gpointer self); +void checkerboard_page_init_item_context_menu (CheckerboardPage* self, + const gchar* path); +void checkerboard_page_init_page_context_menu (CheckerboardPage* self, + const gchar* path); GtkMenu* checkerboard_page_get_context_menu (CheckerboardPage* self); GtkMenu* checkerboard_page_get_item_context_menu (CheckerboardPage* self); static GtkMenu* checkerboard_page_real_get_item_context_menu (CheckerboardPage* self); @@ -1228,27 +1517,43 @@ gchar* checkerboard_page_get_view_empty_message (CheckerboardPage* self); static gchar* checkerboard_page_real_get_view_empty_message (CheckerboardPage* self); gchar* checkerboard_page_get_filter_no_match_message (CheckerboardPage* self); static gchar* checkerboard_page_real_get_filter_no_match_message (CheckerboardPage* self); -void checkerboard_page_on_item_activated (CheckerboardPage* self, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers); -static void checkerboard_page_real_on_item_activated (CheckerboardPage* self, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers); +void checkerboard_page_on_item_activated (CheckerboardPage* self, + CheckerboardItem* item, + CheckerboardPageActivator activator, + CheckerboardPageKeyboardModifiers* modifiers); +static void checkerboard_page_real_on_item_activated (CheckerboardPage* self, + CheckerboardItem* item, + CheckerboardPageActivator activator, + CheckerboardPageKeyboardModifiers* modifiers); CheckerboardLayout* checkerboard_page_get_checkerboard_layout (CheckerboardPage* self); SearchViewFilter* checkerboard_page_get_search_view_filter (CheckerboardPage* self); static SearchViewFilter* checkerboard_page_real_get_search_view_filter (CheckerboardPage* self); CoreViewTracker* checkerboard_page_get_view_tracker (CheckerboardPage* self); static CoreViewTracker* checkerboard_page_real_get_view_tracker (CheckerboardPage* self); static void checkerboard_page_real_switching_from (Page* base); -void checkerboard_layout_set_in_view (CheckerboardLayout* self, gboolean in_view); +void checkerboard_layout_set_in_view (CheckerboardLayout* self, + gboolean in_view); static void checkerboard_page_on_view_filter_refresh (CheckerboardPage* self); -static void _checkerboard_page_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, gpointer self); +static void _checkerboard_page_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, + gpointer self); void view_collection_unselect_all (ViewCollection* self); static void checkerboard_page_real_switched_to (Page* base); -DataView* view_collection_get_selected_at (ViewCollection* self, gint index); +DataView* view_collection_get_selected_at (ViewCollection* self, + gint index); GType adjustment_relation_get_type (void) G_GNUC_CONST; -AdjustmentRelation get_adjustment_relation (GtkAdjustment* adjustment, gint value); +AdjustmentRelation get_adjustment_relation (GtkAdjustment* adjustment, + gint value); gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; @@ -1258,70 +1563,138 @@ void dimensions_free (Dimensions* self); #define CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING 24 static void checkerboard_page_update_view_filter_message (CheckerboardPage* self); gboolean view_collection_are_items_filtered_out (ViewCollection* self); -void checkerboard_page_set_page_message (CheckerboardPage* self, const gchar* message); +void checkerboard_page_set_page_message (CheckerboardPage* self, + const gchar* message); void checkerboard_page_unset_page_message (CheckerboardPage* self); -void checkerboard_layout_set_message (CheckerboardLayout* self, const gchar* text); +void checkerboard_layout_set_message (CheckerboardLayout* self, + const gchar* text); void checkerboard_layout_unset_message (CheckerboardLayout* self); -static void checkerboard_page_real_set_page_name (Page* base, const gchar* name); -CheckerboardItem* checkerboard_page_get_item_at_pixel (CheckerboardPage* self, gdouble x, gdouble y); -CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* self, gdouble xd, gdouble yd); -static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEventKey* event); +static void checkerboard_page_real_set_page_name (Page* base, + const gchar* name); +CheckerboardItem* checkerboard_page_get_item_at_pixel (CheckerboardPage* self, + gdouble x, + gdouble y); +CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* self, + gdouble xd, + gdouble yd); +static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, + GdkEventKey* event); GType compass_point_get_type (void) G_GNUC_CONST; -void checkerboard_page_move_cursor (CheckerboardPage* self, CompassPoint point); -void checkerboard_page_select_anchor_to_cursor (CheckerboardPage* self, guint state); +void checkerboard_page_move_cursor (CheckerboardPage* self, + CompassPoint point); +void checkerboard_page_select_anchor_to_cursor (CheckerboardPage* self, + guint state); DataView* view_collection_get_first (ViewCollection* self); -void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem* item); +void checkerboard_page_cursor_to_item (CheckerboardPage* self, + CheckerboardItem* item); DataView* view_collection_get_last (ViewCollection* self); -void checkerboard_page_keyboard_modifiers_init (CheckerboardPageKeyboardModifiers *self, Page* page); +void checkerboard_page_keyboard_modifiers_init (CheckerboardPageKeyboardModifiers *self, + Page* page); GType marker_get_type (void) G_GNUC_CONST; -Marker* data_collection_mark (DataCollection* self, DataObject* object); +Marker* data_collection_mark (DataCollection* self, + DataObject* object); CheckerboardItem* checkerboard_layout_get_cursor (CheckerboardLayout* self); -void view_collection_toggle_marked (ViewCollection* self, Marker* marker); -static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton* event); -gboolean checkerboard_layout_handle_left_click (CheckerboardLayout* self, CheckerboardItem* item, gdouble xd, gdouble yd, GdkModifierType mask); +void view_collection_toggle_marked (ViewCollection* self, + Marker* marker); +static gboolean checkerboard_page_real_on_left_click (Page* base, + GdkEventButton* event); +gboolean checkerboard_layout_handle_left_click (CheckerboardLayout* self, + CheckerboardItem* item, + gdouble xd, + gdouble yd, + GdkModifierType mask); gboolean data_view_is_selected (DataView* self); -void checkerboard_page_select_between_items (CheckerboardPage* self, CheckerboardItem* item_start, CheckerboardItem* item_end); +void checkerboard_page_select_between_items (CheckerboardPage* self, + CheckerboardItem* item_start, + CheckerboardItem* item_end); Marker* data_collection_start_marking (DataCollection* self); -void marker_mark_many (Marker* self, GeeCollection* list); +void marker_mark_many (Marker* self, + GeeCollection* list); GeeList* view_collection_get_selected (ViewCollection* self); -void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* unselect, Marker* select); -void checkerboard_layout_set_cursor (CheckerboardLayout* self, CheckerboardItem* item); -void checkerboard_layout_set_drag_select_origin (CheckerboardLayout* self, gint x, gint y); -static gboolean checkerboard_page_real_on_left_released (Page* base, GdkEventButton* event); +void view_collection_unselect_and_select_marked (ViewCollection* self, + Marker* unselect, + Marker* select); +void checkerboard_layout_set_cursor (CheckerboardLayout* self, + CheckerboardItem* item); +void checkerboard_layout_set_drag_select_origin (CheckerboardLayout* self, + gint x, + gint y); +static gboolean checkerboard_page_real_on_left_released (Page* base, + GdkEventButton* event); gboolean checkerboard_layout_is_drag_select_active (CheckerboardLayout* self); void checkerboard_layout_clear_drag_select (CheckerboardLayout* self); -void view_collection_unselect_all_but (ViewCollection* self, DataView* exception); -static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButton* event); -gboolean checkerboard_page_on_mouse_over (CheckerboardPage* self, CheckerboardItem* item, gint x, gint y, GdkModifierType mask); -static gboolean checkerboard_page_real_on_mouse_over (CheckerboardPage* self, CheckerboardItem* item, gint x, gint y, GdkModifierType mask); -gboolean checkerboard_layout_handle_mouse_motion (CheckerboardLayout* self, CheckerboardItem* item, gint x, gint y, GdkModifierType mask); +void view_collection_unselect_all_but (ViewCollection* self, + DataView* exception); +static gboolean checkerboard_page_real_on_right_click (Page* base, + GdkEventButton* event); +gboolean checkerboard_page_on_mouse_over (CheckerboardPage* self, + CheckerboardItem* item, + gint x, + gint y, + GdkModifierType mask); +static gboolean checkerboard_page_real_on_mouse_over (CheckerboardPage* self, + CheckerboardItem* item, + gint x, + gint y, + GdkModifierType mask); +gboolean checkerboard_layout_handle_mouse_motion (CheckerboardLayout* self, + CheckerboardItem* item, + gint x, + gint y, + GdkModifierType mask); void checkerboard_item_unbrighten (CheckerboardItem* self); void checkerboard_item_brighten (CheckerboardItem* self); -static gboolean checkerboard_page_real_on_motion (Page* base, GdkEventMotion* event, gint x, gint y, GdkModifierType mask); -void checkerboard_layout_set_drag_select_endpoint (CheckerboardLayout* self, gint x, gint y); +static gboolean checkerboard_page_real_on_motion (Page* base, + GdkEventMotion* event, + gint x, + gint y, + GdkModifierType mask); +void checkerboard_layout_set_drag_select_endpoint (CheckerboardLayout* self, + gint x, + gint y); static void checkerboard_page_updated_selection_band (CheckerboardPage* self); static gboolean checkerboard_page_selection_autoscroll (CheckerboardPage* self); static gboolean _checkerboard_page_selection_autoscroll_gsource_func (gpointer self); GeeList* checkerboard_layout_items_in_selection_band (CheckerboardLayout* self); -void marker_unmark_many (Marker* self, GeeCollection* list); -gboolean marker_toggle (Marker* self, DataObject* object); -void marker_unmark (Marker* self, DataObject* object); -void marker_mark (Marker* self, DataObject* object); -void view_collection_select_marked (ViewCollection* self, Marker* marker); -void view_collection_unselect_marked (ViewCollection* self, Marker* marker); -gboolean data_collection_contains (DataCollection* self, DataObject* object); -CheckerboardItem* checkerboard_layout_get_item_at_coordinate (CheckerboardLayout* self, gint col, gint row); -CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout* self, CheckerboardItem* item, CompassPoint point); -void checkerboard_page_set_cursor (CheckerboardPage* self, CheckerboardItem* item); +void marker_unmark_many (Marker* self, + GeeCollection* list); +gboolean marker_toggle (Marker* self, + DataObject* object); +void marker_unmark (Marker* self, + DataObject* object); +void marker_mark (Marker* self, + DataObject* object); +void view_collection_select_marked (ViewCollection* self, + Marker* marker); +void view_collection_unselect_marked (ViewCollection* self, + Marker* marker); +gboolean data_collection_contains (DataCollection* self, + DataObject* object); +CheckerboardItem* checkerboard_layout_get_item_at_coordinate (CheckerboardLayout* self, + gint col, + gint row); +CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout* self, + CheckerboardItem* item, + CompassPoint point); +void checkerboard_page_set_cursor (CheckerboardPage* self, + CheckerboardItem* item); GeeCollection* data_collection_get_all (DataCollection* self); -void checkerboard_page_set_display_titles (CheckerboardPage* self, gboolean display); -static void checkerboard_page_real_set_display_titles (CheckerboardPage* self, gboolean display); +void checkerboard_page_set_display_titles (CheckerboardPage* self, + gboolean display); +static void checkerboard_page_real_set_display_titles (CheckerboardPage* self, + gboolean display); void data_collection_freeze_notifications (DataCollection* self); -void data_collection_set_property (DataCollection* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target); +void data_collection_set_property (DataCollection* self, + const gchar* name, + GValue* val, + ValueEqualFunc value_equals, + void* value_equals_target); #define CHECKERBOARD_ITEM_PROP_SHOW_TITLES "show-titles" void data_collection_thaw_notifications (DataCollection* self); -void checkerboard_page_set_display_comments (CheckerboardPage* self, gboolean display); -static void checkerboard_page_real_set_display_comments (CheckerboardPage* self, gboolean display); +void checkerboard_page_set_display_comments (CheckerboardPage* self, + gboolean display); +static void checkerboard_page_real_set_display_comments (CheckerboardPage* self, + gboolean display); #define CHECKERBOARD_ITEM_PROP_SHOW_COMMENTS "show-comments" static void checkerboard_page_finalize (GObject * obj); GType single_photo_page_get_type (void) G_GNUC_CONST; @@ -1329,58 +1702,92 @@ GType zoom_buffer_get_type (void) G_GNUC_CONST; GType single_photo_page_update_reason_get_type (void) G_GNUC_CONST; gpointer transition_clock_ref (gpointer instance); void transition_clock_unref (gpointer instance); -GParamSpec* param_spec_transition_clock (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_transition_clock (GValue* value, gpointer v_object); -void value_take_transition_clock (GValue* value, gpointer v_object); +GParamSpec* param_spec_transition_clock (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_transition_clock (GValue* value, + gpointer v_object); +void value_take_transition_clock (GValue* value, + gpointer v_object); gpointer value_get_transition_clock (const GValue* value); GType transition_clock_get_type (void) G_GNUC_CONST; GType zoom_state_get_type (void) G_GNUC_CONST; ZoomState* zoom_state_dup (const ZoomState* self); void zoom_state_free (ZoomState* self); #define SINGLE_PHOTO_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPagePrivate)) -enum { - SINGLE_PHOTO_PAGE_DUMMY_PROPERTY -}; GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); static void single_photo_page_on_colors_changed (SinglePhotoPage* self); -static void _single_photo_page_on_colors_changed_config_facade_colors_changed (ConfigFacade* _sender, gpointer self); -void dimensions_init (Dimensions *self, gint width, gint height); +static void _single_photo_page_on_colors_changed_config_facade_colors_changed (ConfigFacade* _sender, + gpointer self); +void dimensions_init (Dimensions *self, + gint width, + gint height); #define SINGLE_PHOTO_PAGE_FAST_INTERP GDK_INTERP_NEAREST #define SINGLE_PHOTO_PAGE_QUALITY_INTERP GDK_INTERP_BILINEAR #define SINGLE_PHOTO_PAGE_KEY_REPEAT_INTERVAL_MSEC 200 -SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* page_name, gboolean scale_up_to_viewport); +SinglePhotoPage* single_photo_page_construct (GType object_type, + const gchar* page_name, + gboolean scale_up_to_viewport); gpointer transition_effects_manager_ref (gpointer instance); void transition_effects_manager_unref (gpointer instance); -GParamSpec* param_spec_transition_effects_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_transition_effects_manager (GValue* value, gpointer v_object); -void value_take_transition_effects_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_transition_effects_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_transition_effects_manager (GValue* value, + gpointer v_object); +void value_take_transition_effects_manager (GValue* value, + gpointer v_object); gpointer value_get_transition_effects_manager (const GValue* value); GType transition_effects_manager_get_type (void) G_GNUC_CONST; TransitionEffectsManager* transition_effects_manager_get_instance (void); TransitionClock* transition_effects_manager_create_null_transition_clock (TransitionEffectsManager* self); static void single_photo_page_on_viewport_resize (SinglePhotoPage* self); -static void _single_photo_page_on_viewport_resize_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self); -static gboolean single_photo_page_on_canvas_exposed (SinglePhotoPage* self, cairo_t* exposed_ctx); -static gboolean _single_photo_page_on_canvas_exposed_gtk_widget_draw (GtkWidget* _sender, cairo_t* cr, gpointer self); +static void _single_photo_page_on_viewport_resize_gtk_widget_size_allocate (GtkWidget* _sender, + GtkAllocation* allocation, + gpointer self); +static gboolean single_photo_page_on_canvas_exposed (SinglePhotoPage* self, + cairo_t* exposed_ctx); +static gboolean _single_photo_page_on_canvas_exposed_gtk_widget_draw (GtkWidget* _sender, + cairo_t* cr, + gpointer self); gboolean single_photo_page_is_transition_in_progress (SinglePhotoPage* self); gboolean transition_clock_is_in_progress (TransitionClock* self); void single_photo_page_cancel_transition (SinglePhotoPage* self); void transition_clock_cancel (TransitionClock* self); -void single_photo_page_set_transition (SinglePhotoPage* self, const gchar* effect_id, gint duration_msec); -TransitionClock* transition_effects_manager_create_transition_clock (TransitionEffectsManager* self, const gchar* effect_id); -static void single_photo_page_render_zoomed_to_pixmap (SinglePhotoPage* self, ZoomState* zoom_state); +void single_photo_page_set_transition (SinglePhotoPage* self, + const gchar* effect_id, + gint duration_msec); +TransitionClock* transition_effects_manager_create_transition_clock (TransitionEffectsManager* self, + const gchar* effect_id); +static void single_photo_page_render_zoomed_to_pixmap (SinglePhotoPage* self, + ZoomState* zoom_state); gboolean single_photo_page_is_zoom_supported (SinglePhotoPage* self); -void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle* result); +void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, + GdkRectangle* result); ZoomBuffer* single_photo_page_get_zoom_buffer (SinglePhotoPage* self); -GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state); -GdkPixbuf* zoom_buffer_get_zoom_preview_image (ZoomBuffer* self, ZoomState* zoom_state); -void zoom_state_get_viewing_rectangle_projection (ZoomState *self, GdkPixbuf* for_pixbuf, GdkRectangle* result); -void paint_pixmap_with_background (cairo_t* ctx, GdkPixbuf* pixbuf, gint x, gint y); -void single_photo_page_on_interactive_zoom (SinglePhotoPage* self, ZoomState* interactive_zoom_state); -void set_source_color_from_string (cairo_t* ctx, const gchar* spec); -void single_photo_page_on_interactive_pan (SinglePhotoPage* self, ZoomState* interactive_zoom_state); +GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, + ZoomState* zoom_state); +GdkPixbuf* zoom_buffer_get_zoom_preview_image (ZoomBuffer* self, + ZoomState* zoom_state); +void zoom_state_get_viewing_rectangle_projection (ZoomState *self, + GdkPixbuf* for_pixbuf, + GdkRectangle* result); +void paint_pixmap_with_background (cairo_t* ctx, + GdkPixbuf* pixbuf, + gint x, + gint y); +void single_photo_page_on_interactive_zoom (SinglePhotoPage* self, + ZoomState* interactive_zoom_state); +void set_source_color_from_string (cairo_t* ctx, + const gchar* spec); +void single_photo_page_on_interactive_pan (SinglePhotoPage* self, + ZoomState* interactive_zoom_state); static gboolean single_photo_page_real_is_zoom_supported (SinglePhotoPage* self); void single_photo_page_cancel_zoom (SinglePhotoPage* self); static void single_photo_page_real_cancel_zoom (SinglePhotoPage* self); @@ -1389,55 +1796,117 @@ static void single_photo_page_real_save_zoom_state (SinglePhotoPage* self); void single_photo_page_restore_zoom_state (SinglePhotoPage* self); static void single_photo_page_real_restore_zoom_state (SinglePhotoPage* self); GType direction_get_type (void) G_GNUC_CONST; -void single_photo_page_repaint (SinglePhotoPage* self, Direction* direction); +void single_photo_page_repaint (SinglePhotoPage* self, + Direction* direction); static ZoomBuffer* single_photo_page_real_get_zoom_buffer (SinglePhotoPage* self); -void single_photo_page_get_saved_zoom_state (SinglePhotoPage* self, ZoomState* result); -void single_photo_page_set_zoom_state (SinglePhotoPage* self, ZoomState* zoom_state); -void single_photo_page_get_zoom_state (SinglePhotoPage* self, ZoomState* result); +void single_photo_page_get_saved_zoom_state (SinglePhotoPage* self, + ZoomState* result); +void single_photo_page_set_zoom_state (SinglePhotoPage* self, + ZoomState* zoom_state); +void single_photo_page_get_zoom_state (SinglePhotoPage* self, + ZoomState* result); static void single_photo_page_real_switched_to (Page* base); -static void single_photo_page_real_set_container (Page* base, GtkWindow* container); -void single_photo_page_set_pixbuf (SinglePhotoPage* self, GdkPixbuf* unscaled, Dimensions* max_dim, Direction* direction); +static void single_photo_page_real_set_container (Page* base, + GtkWindow* container); +void single_photo_page_set_pixbuf (SinglePhotoPage* self, + GdkPixbuf* unscaled, + Dimensions* max_dim, + Direction* direction); gdouble zoom_state_get_interpolation_factor (ZoomState *self); -void zoom_state_get_viewport_center (ZoomState *self, GdkPoint* result); -void zoom_state_init (ZoomState *self, Dimensions* content_dimensions, Dimensions* viewport_dimensions, gdouble slider_val, GdkPoint* viewport_center); +void zoom_state_get_viewport_center (ZoomState *self, + GdkPoint* result); +void zoom_state_init (ZoomState *self, + Dimensions* content_dimensions, + Dimensions* viewport_dimensions, + gdouble slider_val, + GdkPoint* viewport_center); void single_photo_page_blank_display (SinglePhotoPage* self); void single_photo_page_invalidate_all (SinglePhotoPage* self); cairo_surface_t* single_photo_page_get_surface (SinglePhotoPage* self); -void single_photo_page_get_surface_dim (SinglePhotoPage* self, Dimensions* result); +void single_photo_page_get_surface_dim (SinglePhotoPage* self, + Dimensions* result); cairo_t* single_photo_page_get_cairo_context (SinglePhotoPage* self); -void single_photo_page_paint_text (SinglePhotoPage* self, PangoLayout* pango_layout, gint x, gint y); +void single_photo_page_paint_text (SinglePhotoPage* self, + PangoLayout* pango_layout, + gint x, + gint y); GType scaling_get_type (void) G_GNUC_CONST; GType scale_constraint_get_type (void) G_GNUC_CONST; Scaling* scaling_dup (const Scaling* self); void scaling_free (Scaling* self); -void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, Scaling* result); -void scaling_for_screen (GtkWindow* window, gboolean scale_up, Scaling* result); -void scaling_for_widget (GtkWidget* widget, gboolean scale_up, Scaling* result); +void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, + Scaling* result); +void scaling_for_screen (GtkWindow* window, + gboolean scale_up, + Scaling* result); +void scaling_for_widget (GtkWidget* widget, + gboolean scale_up, + Scaling* result); GdkPixbuf* single_photo_page_get_unscaled_pixbuf (SinglePhotoPage* self); GdkPixbuf* single_photo_page_get_scaled_pixbuf (SinglePhotoPage* self); -void single_photo_page_get_scaled_pixbuf_position (SinglePhotoPage* self, GdkRectangle* result); -gboolean single_photo_page_is_inside_pixbuf (SinglePhotoPage* self, gint x, gint y); -gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect); -void single_photo_page_invalidate (SinglePhotoPage* self, GdkRectangle* rect); -static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean fast, Direction* direction); -static void single_photo_page_real_on_resize_finished (Page* base, GdkRectangle* rect); -void single_photo_page_new_surface (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim); -static void single_photo_page_real_new_surface (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim); -void single_photo_page_updated_pixbuf (SinglePhotoPage* self, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim); -static void single_photo_page_real_updated_pixbuf (SinglePhotoPage* self, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim); -void single_photo_page_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim); -static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim); +void single_photo_page_get_scaled_pixbuf_position (SinglePhotoPage* self, + GdkRectangle* result); +gboolean single_photo_page_is_inside_pixbuf (SinglePhotoPage* self, + gint x, + gint y); +gboolean coord_in_rectangle (gint x, + gint y, + GdkRectangle* rect); +void single_photo_page_invalidate (SinglePhotoPage* self, + GdkRectangle* rect); +static void single_photo_page_internal_repaint (SinglePhotoPage* self, + gboolean fast, + Direction* direction); +static void single_photo_page_real_on_resize_finished (Page* base, + GdkRectangle* rect); +void single_photo_page_new_surface (SinglePhotoPage* self, + cairo_t* ctx, + Dimensions* ctx_dim); +static void single_photo_page_real_new_surface (SinglePhotoPage* self, + cairo_t* ctx, + Dimensions* ctx_dim); +void single_photo_page_updated_pixbuf (SinglePhotoPage* self, + GdkPixbuf* pixbuf, + SinglePhotoPageUpdateReason reason, + Dimensions* old_dim); +static void single_photo_page_real_updated_pixbuf (SinglePhotoPage* self, + GdkPixbuf* pixbuf, + SinglePhotoPageUpdateReason reason, + Dimensions* old_dim); +void single_photo_page_paint (SinglePhotoPage* self, + cairo_t* ctx, + Dimensions* ctx_dim); +static void single_photo_page_real_paint (SinglePhotoPage* self, + cairo_t* ctx, + Dimensions* ctx_dim); gboolean zoom_state_is_default (ZoomState *self); -gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width, gint height); +gboolean transition_clock_paint (TransitionClock* self, + cairo_t* ctx, + gint width, + gint height); static void single_photo_page_repaint_pixmap (SinglePhotoPage* self); -void dimensions_for_rectangle (GdkRectangle* rect, Dimensions* result); -static void single_photo_page_init_pixmap (SinglePhotoPage* self, gint width, gint height); -void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result); +void dimensions_for_rectangle (GdkRectangle* rect, + Dimensions* result); +static void single_photo_page_init_pixmap (SinglePhotoPage* self, + gint width, + gint height); +void dimensions_for_pixbuf (GdkPixbuf* pixbuf, + Dimensions* result); gboolean dimensions_has_area (Dimensions *self); -void dimensions_get_scaled_proportional (Dimensions *self, Dimensions* viewport, Dimensions* result); -GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp); -void parse_color (const gchar* spec, GdkRGBA* result); -void transition_clock_start (TransitionClock* self, SpitTransitionsVisuals* visuals, SpitTransitionsDirection direction, gint duration_msec, TransitionClockRepaintCallback repaint, void* repaint_target); +void dimensions_get_scaled_proportional (Dimensions *self, + Dimensions* viewport, + Dimensions* result); +GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, + Dimensions* resized, + GdkInterpType interp); +void parse_color (const gchar* spec, + GdkRGBA* result); +void transition_clock_start (TransitionClock* self, + SpitTransitionsVisuals* visuals, + SpitTransitionsDirection direction, + gint duration_msec, + TransitionClockRepaintCallback repaint, + void* repaint_target); SpitTransitionsDirection direction_to_transition_direction (Direction self); static void _single_photo_page_repaint_pixmap_transition_clock_repaint_callback (gpointer self); static gboolean single_photo_page_real_on_context_keypress (Page* base); @@ -1445,49 +1914,85 @@ void single_photo_page_on_previous_photo (SinglePhotoPage* self); static void single_photo_page_real_on_previous_photo (SinglePhotoPage* self); void single_photo_page_on_next_photo (SinglePhotoPage* self); static void single_photo_page_real_on_next_photo (SinglePhotoPage* self); -static gboolean single_photo_page_real_key_press_event (GtkWidget* base, GdkEventKey* event); +static gboolean single_photo_page_real_key_press_event (GtkWidget* base, + GdkEventKey* event); void invalidate_transparent_background (void); static void single_photo_page_finalize (GObject * obj); gpointer drag_and_drop_handler_ref (gpointer instance); void drag_and_drop_handler_unref (gpointer instance); -GParamSpec* param_spec_drag_and_drop_handler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_drag_and_drop_handler (GValue* value, gpointer v_object); -void value_take_drag_and_drop_handler (GValue* value, gpointer v_object); +GParamSpec* param_spec_drag_and_drop_handler (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_drag_and_drop_handler (GValue* value, + gpointer v_object); +void value_take_drag_and_drop_handler (GValue* value, + gpointer v_object); gpointer value_get_drag_and_drop_handler (const GValue* value); GType drag_and_drop_handler_get_type (void) G_GNUC_CONST; gpointer exporter_ui_ref (gpointer instance); void exporter_ui_unref (gpointer instance); -GParamSpec* param_spec_exporter_ui (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_exporter_ui (GValue* value, gpointer v_object); -void value_take_exporter_ui (GValue* value, gpointer v_object); +GParamSpec* param_spec_exporter_ui (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_exporter_ui (GValue* value, + gpointer v_object); +void value_take_exporter_ui (GValue* value, + gpointer v_object); gpointer value_get_exporter_ui (const GValue* value); GType exporter_ui_get_type (void) G_GNUC_CONST; #define DRAG_AND_DROP_HANDLER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DRAG_AND_DROP_HANDLER, DragAndDropHandlerPrivate)) -enum { - DRAG_AND_DROP_HANDLER_DUMMY_PROPERTY -}; -static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDragContext* context); -static void _drag_and_drop_handler_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self); -static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, GdkDragContext* context, GtkSelectionData* selection_data, guint target_type, guint time); -static void _drag_and_drop_handler_on_drag_data_get_gtk_widget_drag_data_get (GtkWidget* _sender, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint time_, gpointer self); +static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, + GdkDragContext* context); +static void _drag_and_drop_handler_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, + GdkDragContext* context, + gpointer self); +static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, + GdkDragContext* context, + GtkSelectionData* selection_data, + guint target_type, + guint time); +static void _drag_and_drop_handler_on_drag_data_get_gtk_widget_drag_data_get (GtkWidget* _sender, + GdkDragContext* context, + GtkSelectionData* selection_data, + guint info, + guint time_, + gpointer self); static void drag_and_drop_handler_on_drag_end (DragAndDropHandler* self); -static void _drag_and_drop_handler_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self); -static gboolean drag_and_drop_handler_on_drag_failed (DragAndDropHandler* self, GdkDragContext* context, GtkDragResult drag_result); -static gboolean _drag_and_drop_handler_on_drag_failed_gtk_widget_drag_failed (GtkWidget* _sender, GdkDragContext* context, GtkDragResult _result_, gpointer self); +static void _drag_and_drop_handler_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, + GdkDragContext* context, + gpointer self); +static gboolean drag_and_drop_handler_on_drag_failed (DragAndDropHandler* self, + GdkDragContext* context, + GtkDragResult drag_result); +static gboolean _drag_and_drop_handler_on_drag_failed_gtk_widget_drag_failed (GtkWidget* _sender, + GdkDragContext* context, + GtkDragResult _result_, + gpointer self); static GType drag_and_drop_handler_target_type_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; DragAndDropHandler* drag_and_drop_handler_new (Page* page); -DragAndDropHandler* drag_and_drop_handler_construct (GType object_type, Page* page); +DragAndDropHandler* drag_and_drop_handler_construct (GType object_type, + Page* page); static GdkAtom* _gdk_atom_dup (GdkAtom* self); -guchar* string_to_uchar_array (const gchar* str, int* result_length1); +guchar* string_to_uchar_array (const gchar* str, + int* result_length1); GType thumbnail_source_get_type (void) G_GNUC_CONST; DataSource* data_view_get_source (DataView* self); -GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GError** error); +GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); #define APP_WINDOW_DND_ICON_SCALE 128 gchar* data_object_to_string (DataObject* self); -gchar* uchar_array_to_string (guchar* data, int data_length1, gint length); +gchar* uchar_array_to_string (guchar* data, + int data_length1, + gint length); GType media_source_get_type (void) G_GNUC_CONST; GeeList* view_collection_get_selected_sources (ViewCollection* self); -guchar* serialize_media_sources (GeeCollection* media, int* result_length1); +guchar* serialize_media_sources (GeeCollection* media, + int* result_length1); GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; void scaling_for_original (Scaling* result); @@ -1498,50 +2003,72 @@ GType jpeg_quality_get_type (void) G_GNUC_CONST; ExportFormatParameters* export_format_parameters_dup (const ExportFormatParameters* self); void export_format_parameters_free (ExportFormatParameters* self); void export_format_parameters_current (ExportFormatParameters* result); -Exporter* exporter_new (GeeCollection* to_export, GFile* dir, Scaling* scaling, ExportFormatParameters* export_params, gboolean auto_replace_all); -Exporter* exporter_construct (GType object_type, GeeCollection* to_export, GFile* dir, Scaling* scaling, ExportFormatParameters* export_params, gboolean auto_replace_all); +Exporter* exporter_new (GeeCollection* to_export, + GFile* dir, + Scaling* scaling, + ExportFormatParameters* export_params, + gboolean auto_replace_all); +Exporter* exporter_construct (GType object_type, + GeeCollection* to_export, + GFile* dir, + Scaling* scaling, + ExportFormatParameters* export_params, + gboolean auto_replace_all); GType exporter_get_type (void) G_GNUC_CONST; ExporterUI* exporter_ui_new (Exporter* exporter); -ExporterUI* exporter_ui_construct (GType object_type, Exporter* exporter); -void exporter_ui_export (ExporterUI* self, ExporterCompletionCallback completion_callback, void* completion_callback_target); +ExporterUI* exporter_ui_construct (GType object_type, + Exporter* exporter); +void exporter_ui_export (ExporterUI* self, + ExporterCompletionCallback completion_callback, + void* completion_callback_target); static void drag_and_drop_handler_on_export_completed (DragAndDropHandler* self); -static void _drag_and_drop_handler_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self); +static void _drag_and_drop_handler_on_export_completed_exporter_completion_callback (Exporter* exporter, + gboolean is_cancelled, + gpointer self); static void drag_and_drop_handler_finalize (DragAndDropHandler * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static const GtkTargetEntry DRAG_AND_DROP_HANDLER_SOURCE_TARGET_ENTRIES[2] = {{"XdndDirectSave0", (guint) GTK_TARGET_OTHER_APP, (guint) DRAG_AND_DROP_HANDLER_TARGET_TYPE_XDS}, {"shotwell/media-id-atom", (guint) GTK_TARGET_SAME_APP, (guint) DRAG_AND_DROP_HANDLER_TARGET_TYPE_MEDIA_LIST}}; -InjectionGroup* injection_group_construct (GType object_type, const gchar* path) { +InjectionGroup* +injection_group_construct (GType object_type, + const gchar* path) +{ InjectionGroup* self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; #line 31 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (path != NULL, NULL); #line 31 "/home/jens/Source/shotwell/src/Page.vala" self = (InjectionGroup*) g_type_create_instance (object_type); #line 32 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = path; -#line 32 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (path); #line 32 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (self->priv->path); #line 32 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->path = _tmp1_; + self->priv->path = _tmp0_; #line 31 "/home/jens/Source/shotwell/src/Page.vala" return self; -#line 1534 "Page.c" +#line 2057 "Page.c" } -InjectionGroup* injection_group_new (const gchar* path) { +InjectionGroup* +injection_group_new (const gchar* path) +{ #line 31 "/home/jens/Source/shotwell/src/Page.vala" return injection_group_construct (TYPE_INJECTION_GROUP, path); -#line 1541 "Page.c" +#line 2066 "Page.c" } -gchar* injection_group_get_path (InjectionGroup* self) { +gchar* +injection_group_get_path (InjectionGroup* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -1555,18 +2082,22 @@ gchar* injection_group_get_path (InjectionGroup* self) { result = _tmp1_; #line 36 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 1559 "Page.c" +#line 2086 "Page.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 40 "/home/jens/Source/shotwell/src/Page.vala" return self ? g_object_ref (self) : NULL; -#line 1566 "Page.c" +#line 2095 "Page.c" } -GeeList* injection_group_get_elements (InjectionGroup* self) { +GeeList* +injection_group_get_elements (InjectionGroup* self) +{ GeeList* result = NULL; GeeArrayList* _tmp0_; GeeList* _tmp1_; @@ -1580,17 +2111,19 @@ GeeList* injection_group_get_elements (InjectionGroup* self) { result = _tmp1_; #line 40 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 1584 "Page.c" +#line 2115 "Page.c" } -void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator) { +void +injection_group_add_menu_item (InjectionGroup* self, + const gchar* name, + const gchar* action, + const gchar* accellerator) +{ GeeArrayList* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - InjectionGroupElement* _tmp4_; - InjectionGroupElement* _tmp5_; + InjectionGroupElement* _tmp1_; + InjectionGroupElement* _tmp2_; #line 43 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_INJECTION_GROUP (self)); #line 43 "/home/jens/Source/shotwell/src/Page.vala" @@ -1598,29 +2131,25 @@ void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, con #line 44 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = self->priv->elements; #line 44 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = name; -#line 44 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = action; -#line 44 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = accellerator; -#line 44 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = injection_group_element_new (_tmp1_, _tmp2_, _tmp3_, INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENUITEM); + _tmp1_ = injection_group_element_new (name, action, accellerator, INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENUITEM); #line 44 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 44 "/home/jens/Source/shotwell/src/Page.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); #line 44 "/home/jens/Source/shotwell/src/Page.vala" - _injection_group_element_unref0 (_tmp5_); -#line 1615 "Page.c" + _injection_group_element_unref0 (_tmp2_); +#line 2142 "Page.c" } -void injection_group_add_menu (InjectionGroup* self, const gchar* name, const gchar* action) { +void +injection_group_add_menu (InjectionGroup* self, + const gchar* name, + const gchar* action) +{ GeeArrayList* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - InjectionGroupElement* _tmp3_; - InjectionGroupElement* _tmp4_; + InjectionGroupElement* _tmp1_; + InjectionGroupElement* _tmp2_; #line 47 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_INJECTION_GROUP (self)); #line 47 "/home/jens/Source/shotwell/src/Page.vala" @@ -1628,22 +2157,20 @@ void injection_group_add_menu (InjectionGroup* self, const gchar* name, const gc #line 48 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = self->priv->elements; #line 48 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = name; -#line 48 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = action; -#line 48 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = injection_group_element_new (_tmp1_, _tmp2_, NULL, INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENU); + _tmp1_ = injection_group_element_new (name, action, NULL, INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENU); #line 48 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 48 "/home/jens/Source/shotwell/src/Page.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); #line 48 "/home/jens/Source/shotwell/src/Page.vala" - _injection_group_element_unref0 (_tmp4_); -#line 1643 "Page.c" + _injection_group_element_unref0 (_tmp2_); +#line 2168 "Page.c" } -void injection_group_add_separator (InjectionGroup* self) { +void +injection_group_add_separator (InjectionGroup* self) +{ GeeArrayList* _tmp0_; gint _tmp1_; gchar* _tmp2_; @@ -1672,11 +2199,13 @@ void injection_group_add_separator (InjectionGroup* self) { _injection_group_element_unref0 (_tmp5_); #line 52 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (_tmp3_); -#line 1676 "Page.c" +#line 2203 "Page.c" } -GType injection_group_element_item_type_get_type (void) { +GType +injection_group_element_item_type_get_type (void) +{ static volatile gsize injection_group_element_item_type_type_id__volatile = 0; if (g_once_init_enter (&injection_group_element_item_type_type_id__volatile)) { static const GEnumValue values[] = {{INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENUITEM, "INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENUITEM", "menuitem"}, {INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENU, "INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENU", "menu"}, {INJECTION_GROUP_ELEMENT_ITEM_TYPE_SEPARATOR, "INJECTION_GROUP_ELEMENT_ITEM_TYPE_SEPARATOR", "separator"}, {0, NULL, NULL}}; @@ -1688,176 +2217,193 @@ GType injection_group_element_item_type_get_type (void) { } -InjectionGroupElement* injection_group_element_construct (GType object_type, const gchar* name, const gchar* action, const gchar* accellerator, InjectionGroupElementItemType kind) { +InjectionGroupElement* +injection_group_element_construct (GType object_type, + const gchar* name, + const gchar* action, + const gchar* accellerator, + InjectionGroupElementItemType kind) +{ InjectionGroupElement* self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_; - gchar* _tmp6_; - const gchar* _tmp7_; - gchar* _tmp8_; - InjectionGroupElementItemType _tmp9_; + gchar* _tmp0_; + const gchar* _tmp1_ = NULL; + gchar* _tmp2_; + gchar* _tmp3_; #line 19 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (name != NULL, NULL); #line 19 "/home/jens/Source/shotwell/src/Page.vala" self = (InjectionGroupElement*) g_type_create_instance (object_type); #line 20 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = name; -#line 20 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (name); #line 20 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (self->name); #line 20 "/home/jens/Source/shotwell/src/Page.vala" - self->name = _tmp1_; + self->name = _tmp0_; #line 21 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = action; -#line 21 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp3_ != NULL) { -#line 1718 "Page.c" - const gchar* _tmp4_; + if (action != NULL) { #line 21 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = action; -#line 21 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = _tmp4_; -#line 1724 "Page.c" + _tmp1_ = action; +#line 2247 "Page.c" } else { - const gchar* _tmp5_; -#line 21 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = name; #line 21 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = _tmp5_; -#line 1731 "Page.c" + _tmp1_ = name; +#line 2251 "Page.c" } #line 21 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = g_strdup (_tmp2_); + _tmp2_ = g_strdup (_tmp1_); #line 21 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (self->action); #line 21 "/home/jens/Source/shotwell/src/Page.vala" - self->action = _tmp6_; + self->action = _tmp2_; #line 22 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = accellerator; -#line 22 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = g_strdup (_tmp7_); + _tmp3_ = g_strdup (accellerator); #line 22 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (self->accellerator); #line 22 "/home/jens/Source/shotwell/src/Page.vala" - self->accellerator = _tmp8_; -#line 23 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = kind; + self->accellerator = _tmp3_; #line 23 "/home/jens/Source/shotwell/src/Page.vala" - self->kind = _tmp9_; + self->kind = kind; #line 19 "/home/jens/Source/shotwell/src/Page.vala" return self; -#line 1753 "Page.c" +#line 2269 "Page.c" } -InjectionGroupElement* injection_group_element_new (const gchar* name, const gchar* action, const gchar* accellerator, InjectionGroupElementItemType kind) { +InjectionGroupElement* +injection_group_element_new (const gchar* name, + const gchar* action, + const gchar* accellerator, + InjectionGroupElementItemType kind) +{ #line 19 "/home/jens/Source/shotwell/src/Page.vala" return injection_group_element_construct (INJECTION_GROUP_TYPE_ELEMENT, name, action, accellerator, kind); -#line 1760 "Page.c" +#line 2281 "Page.c" } -static void injection_group_value_element_init (GValue* value) { +static void +injection_group_value_element_init (GValue* value) +{ #line 8 "/home/jens/Source/shotwell/src/Page.vala" value->data[0].v_pointer = NULL; -#line 1767 "Page.c" +#line 2290 "Page.c" } -static void injection_group_value_element_free_value (GValue* value) { +static void +injection_group_value_element_free_value (GValue* value) +{ #line 8 "/home/jens/Source/shotwell/src/Page.vala" if (value->data[0].v_pointer) { #line 8 "/home/jens/Source/shotwell/src/Page.vala" injection_group_element_unref (value->data[0].v_pointer); -#line 1776 "Page.c" +#line 2301 "Page.c" } } -static void injection_group_value_element_copy_value (const GValue* src_value, GValue* dest_value) { +static void +injection_group_value_element_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 8 "/home/jens/Source/shotwell/src/Page.vala" if (src_value->data[0].v_pointer) { #line 8 "/home/jens/Source/shotwell/src/Page.vala" dest_value->data[0].v_pointer = injection_group_element_ref (src_value->data[0].v_pointer); -#line 1786 "Page.c" +#line 2314 "Page.c" } else { #line 8 "/home/jens/Source/shotwell/src/Page.vala" dest_value->data[0].v_pointer = NULL; -#line 1790 "Page.c" +#line 2318 "Page.c" } } -static gpointer injection_group_value_element_peek_pointer (const GValue* value) { +static gpointer +injection_group_value_element_peek_pointer (const GValue* value) +{ #line 8 "/home/jens/Source/shotwell/src/Page.vala" return value->data[0].v_pointer; -#line 1798 "Page.c" +#line 2328 "Page.c" } -static gchar* injection_group_value_element_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +injection_group_value_element_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 8 "/home/jens/Source/shotwell/src/Page.vala" if (collect_values[0].v_pointer) { -#line 1805 "Page.c" +#line 2340 "Page.c" InjectionGroupElement * object; object = collect_values[0].v_pointer; #line 8 "/home/jens/Source/shotwell/src/Page.vala" if (object->parent_instance.g_class == NULL) { #line 8 "/home/jens/Source/shotwell/src/Page.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1812 "Page.c" +#line 2347 "Page.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 8 "/home/jens/Source/shotwell/src/Page.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1816 "Page.c" +#line 2351 "Page.c" } #line 8 "/home/jens/Source/shotwell/src/Page.vala" value->data[0].v_pointer = injection_group_element_ref (object); -#line 1820 "Page.c" +#line 2355 "Page.c" } else { #line 8 "/home/jens/Source/shotwell/src/Page.vala" value->data[0].v_pointer = NULL; -#line 1824 "Page.c" +#line 2359 "Page.c" } #line 8 "/home/jens/Source/shotwell/src/Page.vala" return NULL; -#line 1828 "Page.c" +#line 2363 "Page.c" } -static gchar* injection_group_value_element_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +injection_group_value_element_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ InjectionGroupElement ** object_p; object_p = collect_values[0].v_pointer; #line 8 "/home/jens/Source/shotwell/src/Page.vala" if (!object_p) { #line 8 "/home/jens/Source/shotwell/src/Page.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1839 "Page.c" +#line 2379 "Page.c" } #line 8 "/home/jens/Source/shotwell/src/Page.vala" if (!value->data[0].v_pointer) { #line 8 "/home/jens/Source/shotwell/src/Page.vala" *object_p = NULL; -#line 1845 "Page.c" +#line 2385 "Page.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 8 "/home/jens/Source/shotwell/src/Page.vala" *object_p = value->data[0].v_pointer; -#line 1849 "Page.c" +#line 2389 "Page.c" } else { #line 8 "/home/jens/Source/shotwell/src/Page.vala" *object_p = injection_group_element_ref (value->data[0].v_pointer); -#line 1853 "Page.c" +#line 2393 "Page.c" } #line 8 "/home/jens/Source/shotwell/src/Page.vala" return NULL; -#line 1857 "Page.c" +#line 2397 "Page.c" } -GParamSpec* injection_group_param_spec_element (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +injection_group_param_spec_element (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ InjectionGroupParamSpecElement* spec; #line 8 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (g_type_is_a (object_type, INJECTION_GROUP_TYPE_ELEMENT), NULL); @@ -1867,20 +2413,25 @@ GParamSpec* injection_group_param_spec_element (const gchar* name, const gchar* G_PARAM_SPEC (spec)->value_type = object_type; #line 8 "/home/jens/Source/shotwell/src/Page.vala" return G_PARAM_SPEC (spec); -#line 1871 "Page.c" +#line 2417 "Page.c" } -gpointer injection_group_value_get_element (const GValue* value) { +gpointer +injection_group_value_get_element (const GValue* value) +{ #line 8 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, INJECTION_GROUP_TYPE_ELEMENT), NULL); #line 8 "/home/jens/Source/shotwell/src/Page.vala" return value->data[0].v_pointer; -#line 1880 "Page.c" +#line 2428 "Page.c" } -void injection_group_value_set_element (GValue* value, gpointer v_object) { +void +injection_group_value_set_element (GValue* value, + gpointer v_object) +{ InjectionGroupElement * old; #line 8 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, INJECTION_GROUP_TYPE_ELEMENT)); @@ -1896,22 +2447,25 @@ void injection_group_value_set_element (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 8 "/home/jens/Source/shotwell/src/Page.vala" injection_group_element_ref (value->data[0].v_pointer); -#line 1900 "Page.c" +#line 2451 "Page.c" } else { #line 8 "/home/jens/Source/shotwell/src/Page.vala" value->data[0].v_pointer = NULL; -#line 1904 "Page.c" +#line 2455 "Page.c" } #line 8 "/home/jens/Source/shotwell/src/Page.vala" if (old) { #line 8 "/home/jens/Source/shotwell/src/Page.vala" injection_group_element_unref (old); -#line 1910 "Page.c" +#line 2461 "Page.c" } } -void injection_group_value_take_element (GValue* value, gpointer v_object) { +void +injection_group_value_take_element (GValue* value, + gpointer v_object) +{ InjectionGroupElement * old; #line 8 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, INJECTION_GROUP_TYPE_ELEMENT)); @@ -1925,38 +2479,44 @@ void injection_group_value_take_element (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 8 "/home/jens/Source/shotwell/src/Page.vala" value->data[0].v_pointer = v_object; -#line 1929 "Page.c" +#line 2483 "Page.c" } else { #line 8 "/home/jens/Source/shotwell/src/Page.vala" value->data[0].v_pointer = NULL; -#line 1933 "Page.c" +#line 2487 "Page.c" } #line 8 "/home/jens/Source/shotwell/src/Page.vala" if (old) { #line 8 "/home/jens/Source/shotwell/src/Page.vala" injection_group_element_unref (old); -#line 1939 "Page.c" +#line 2493 "Page.c" } } -static void injection_group_element_class_init (InjectionGroupElementClass * klass) { +static void +injection_group_element_class_init (InjectionGroupElementClass * klass) +{ #line 8 "/home/jens/Source/shotwell/src/Page.vala" injection_group_element_parent_class = g_type_class_peek_parent (klass); #line 8 "/home/jens/Source/shotwell/src/Page.vala" ((InjectionGroupElementClass *) klass)->finalize = injection_group_element_finalize; -#line 1949 "Page.c" +#line 2505 "Page.c" } -static void injection_group_element_instance_init (InjectionGroupElement * self) { +static void +injection_group_element_instance_init (InjectionGroupElement * self) +{ #line 8 "/home/jens/Source/shotwell/src/Page.vala" self->ref_count = 1; -#line 1956 "Page.c" +#line 2514 "Page.c" } -static void injection_group_element_finalize (InjectionGroupElement * obj) { +static void +injection_group_element_finalize (InjectionGroupElement * obj) +{ InjectionGroupElement * self; #line 8 "/home/jens/Source/shotwell/src/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, INJECTION_GROUP_TYPE_ELEMENT, InjectionGroupElement); @@ -1968,11 +2528,13 @@ static void injection_group_element_finalize (InjectionGroupElement * obj) { _g_free0 (self->action); #line 16 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (self->accellerator); -#line 1972 "Page.c" +#line 2532 "Page.c" } -GType injection_group_element_get_type (void) { +GType +injection_group_element_get_type (void) +{ static volatile gsize injection_group_element_type_id__volatile = 0; if (g_once_init_enter (&injection_group_element_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { injection_group_value_element_init, injection_group_value_element_free_value, injection_group_value_element_copy_value, injection_group_value_element_peek_pointer, "p", injection_group_value_element_collect_value, "p", injection_group_value_element_lcopy_value }; @@ -1986,18 +2548,22 @@ GType injection_group_element_get_type (void) { } -gpointer injection_group_element_ref (gpointer instance) { +gpointer +injection_group_element_ref (gpointer instance) +{ InjectionGroupElement * self; self = instance; #line 8 "/home/jens/Source/shotwell/src/Page.vala" g_atomic_int_inc (&self->ref_count); #line 8 "/home/jens/Source/shotwell/src/Page.vala" return instance; -#line 1997 "Page.c" +#line 2561 "Page.c" } -void injection_group_element_unref (gpointer instance) { +void +injection_group_element_unref (gpointer instance) +{ InjectionGroupElement * self; self = instance; #line 8 "/home/jens/Source/shotwell/src/Page.vala" @@ -2006,109 +2572,134 @@ void injection_group_element_unref (gpointer instance) { INJECTION_GROUP_ELEMENT_GET_CLASS (self)->finalize (self); #line 8 "/home/jens/Source/shotwell/src/Page.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2010 "Page.c" +#line 2576 "Page.c" } } -static void value_injection_group_init (GValue* value) { +static void +value_injection_group_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/Page.vala" value->data[0].v_pointer = NULL; -#line 2018 "Page.c" +#line 2586 "Page.c" } -static void value_injection_group_free_value (GValue* value) { +static void +value_injection_group_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/Page.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/Page.vala" injection_group_unref (value->data[0].v_pointer); -#line 2027 "Page.c" +#line 2597 "Page.c" } } -static void value_injection_group_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_injection_group_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/Page.vala" if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/Page.vala" dest_value->data[0].v_pointer = injection_group_ref (src_value->data[0].v_pointer); -#line 2037 "Page.c" +#line 2610 "Page.c" } else { #line 7 "/home/jens/Source/shotwell/src/Page.vala" dest_value->data[0].v_pointer = NULL; -#line 2041 "Page.c" +#line 2614 "Page.c" } } -static gpointer value_injection_group_peek_pointer (const GValue* value) { +static gpointer +value_injection_group_peek_pointer (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/Page.vala" return value->data[0].v_pointer; -#line 2049 "Page.c" +#line 2624 "Page.c" } -static gchar* value_injection_group_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_injection_group_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 7 "/home/jens/Source/shotwell/src/Page.vala" if (collect_values[0].v_pointer) { -#line 2056 "Page.c" +#line 2636 "Page.c" InjectionGroup * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/Page.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/Page.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2063 "Page.c" +#line 2643 "Page.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/Page.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2067 "Page.c" +#line 2647 "Page.c" } #line 7 "/home/jens/Source/shotwell/src/Page.vala" value->data[0].v_pointer = injection_group_ref (object); -#line 2071 "Page.c" +#line 2651 "Page.c" } else { #line 7 "/home/jens/Source/shotwell/src/Page.vala" value->data[0].v_pointer = NULL; -#line 2075 "Page.c" +#line 2655 "Page.c" } #line 7 "/home/jens/Source/shotwell/src/Page.vala" return NULL; -#line 2079 "Page.c" +#line 2659 "Page.c" } -static gchar* value_injection_group_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_injection_group_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ InjectionGroup ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/Page.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/Page.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2090 "Page.c" +#line 2675 "Page.c" } #line 7 "/home/jens/Source/shotwell/src/Page.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/Page.vala" *object_p = NULL; -#line 2096 "Page.c" +#line 2681 "Page.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/Page.vala" *object_p = value->data[0].v_pointer; -#line 2100 "Page.c" +#line 2685 "Page.c" } else { #line 7 "/home/jens/Source/shotwell/src/Page.vala" *object_p = injection_group_ref (value->data[0].v_pointer); -#line 2104 "Page.c" +#line 2689 "Page.c" } #line 7 "/home/jens/Source/shotwell/src/Page.vala" return NULL; -#line 2108 "Page.c" +#line 2693 "Page.c" } -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecInjectionGroup* spec; #line 7 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_INJECTION_GROUP), NULL); @@ -2118,20 +2709,25 @@ GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, co G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/Page.vala" return G_PARAM_SPEC (spec); -#line 2122 "Page.c" +#line 2713 "Page.c" } -gpointer value_get_injection_group (const GValue* value) { +gpointer +value_get_injection_group (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_INJECTION_GROUP), NULL); #line 7 "/home/jens/Source/shotwell/src/Page.vala" return value->data[0].v_pointer; -#line 2131 "Page.c" +#line 2724 "Page.c" } -void value_set_injection_group (GValue* value, gpointer v_object) { +void +value_set_injection_group (GValue* value, + gpointer v_object) +{ InjectionGroup * old; #line 7 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_INJECTION_GROUP)); @@ -2147,22 +2743,25 @@ void value_set_injection_group (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/Page.vala" injection_group_ref (value->data[0].v_pointer); -#line 2151 "Page.c" +#line 2747 "Page.c" } else { #line 7 "/home/jens/Source/shotwell/src/Page.vala" value->data[0].v_pointer = NULL; -#line 2155 "Page.c" +#line 2751 "Page.c" } #line 7 "/home/jens/Source/shotwell/src/Page.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/Page.vala" injection_group_unref (old); -#line 2161 "Page.c" +#line 2757 "Page.c" } } -void value_take_injection_group (GValue* value, gpointer v_object) { +void +value_take_injection_group (GValue* value, + gpointer v_object) +{ InjectionGroup * old; #line 7 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_INJECTION_GROUP)); @@ -2176,33 +2775,37 @@ void value_take_injection_group (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/Page.vala" value->data[0].v_pointer = v_object; -#line 2180 "Page.c" +#line 2779 "Page.c" } else { #line 7 "/home/jens/Source/shotwell/src/Page.vala" value->data[0].v_pointer = NULL; -#line 2184 "Page.c" +#line 2783 "Page.c" } #line 7 "/home/jens/Source/shotwell/src/Page.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/Page.vala" injection_group_unref (old); -#line 2190 "Page.c" +#line 2789 "Page.c" } } -static void injection_group_class_init (InjectionGroupClass * klass) { +static void +injection_group_class_init (InjectionGroupClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/Page.vala" injection_group_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/Page.vala" ((InjectionGroupClass *) klass)->finalize = injection_group_finalize; #line 7 "/home/jens/Source/shotwell/src/Page.vala" g_type_class_add_private (klass, sizeof (InjectionGroupPrivate)); -#line 2202 "Page.c" +#line 2803 "Page.c" } -static void injection_group_instance_init (InjectionGroup * self) { +static void +injection_group_instance_init (InjectionGroup * self) +{ GeeArrayList* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/Page.vala" self->priv = INJECTION_GROUP_GET_PRIVATE (self); @@ -2214,11 +2817,13 @@ static void injection_group_instance_init (InjectionGroup * self) { self->priv->separator_id = 0; #line 7 "/home/jens/Source/shotwell/src/Page.vala" self->ref_count = 1; -#line 2218 "Page.c" +#line 2821 "Page.c" } -static void injection_group_finalize (InjectionGroup * obj) { +static void +injection_group_finalize (InjectionGroup * obj) +{ InjectionGroup * self; #line 7 "/home/jens/Source/shotwell/src/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_INJECTION_GROUP, InjectionGroup); @@ -2228,11 +2833,13 @@ static void injection_group_finalize (InjectionGroup * obj) { _g_free0 (self->priv->path); #line 28 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->elements); -#line 2232 "Page.c" +#line 2837 "Page.c" } -GType injection_group_get_type (void) { +GType +injection_group_get_type (void) +{ static volatile gsize injection_group_type_id__volatile = 0; if (g_once_init_enter (&injection_group_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_injection_group_init, value_injection_group_free_value, value_injection_group_copy_value, value_injection_group_peek_pointer, "p", value_injection_group_collect_value, "p", value_injection_group_lcopy_value }; @@ -2246,18 +2853,22 @@ GType injection_group_get_type (void) { } -gpointer injection_group_ref (gpointer instance) { +gpointer +injection_group_ref (gpointer instance) +{ InjectionGroup * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/Page.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/Page.vala" return instance; -#line 2257 "Page.c" +#line 2866 "Page.c" } -void injection_group_unref (gpointer instance) { +void +injection_group_unref (gpointer instance) +{ InjectionGroup * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/Page.vala" @@ -2266,68 +2877,71 @@ void injection_group_unref (gpointer instance) { INJECTION_GROUP_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/Page.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2270 "Page.c" +#line 2881 "Page.c" } } -static gboolean _page_on_context_keypress_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self) { +static gboolean +_page_on_context_keypress_gtk_widget_popup_menu (GtkWidget* _sender, + gpointer self) +{ gboolean result; result = page_on_context_keypress ((Page*) self); #line 98 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 2280 "Page.c" +#line 2894 "Page.c" } -static void _page_attach_view_signals_gtk_widget_realize (GtkWidget* _sender, gpointer self) { +static void +_page_attach_view_signals_gtk_widget_realize (GtkWidget* _sender, + gpointer self) +{ #line 100 "/home/jens/Source/shotwell/src/Page.vala" page_attach_view_signals ((Page*) self); -#line 2287 "Page.c" +#line 2904 "Page.c" } -Page* page_construct (GType object_type, const gchar* page_name) { +Page* +page_construct (GType object_type, + const gchar* page_name) +{ Page * self = NULL; - const gchar* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_; - gchar* _tmp4_; - ViewCollection* _tmp5_; - GdkPoint _tmp6_ = {0}; + gchar* _tmp2_; + ViewCollection* _tmp3_; + GdkPoint _tmp4_ = {0}; #line 89 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (page_name != NULL, NULL); #line 89 "/home/jens/Source/shotwell/src/Page.vala" self = (Page*) g_object_new (object_type, NULL); #line 90 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = page_name; -#line 90 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (page_name); #line 90 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (self->priv->page_name); #line 90 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->page_name = _tmp1_; + self->priv->page_name = _tmp0_; #line 92 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = page_name; + _tmp1_ = g_strdup_printf ("ViewCollection for Page %s", page_name); #line 92 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = g_strdup_printf ("ViewCollection for Page %s", _tmp2_); -#line 92 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 92 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = view_collection_new (_tmp4_); + _tmp3_ = view_collection_new (_tmp2_); #line 92 "/home/jens/Source/shotwell/src/Page.vala" _data_collection_unref0 (self->priv->view); #line 92 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->view = _tmp5_; + self->priv->view = _tmp3_; #line 92 "/home/jens/Source/shotwell/src/Page.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp2_); #line 94 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_.x = -1; + _tmp4_.x = -1; #line 94 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_.y = -1; + _tmp4_.y = -1; #line 94 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->last_down = _tmp6_; + self->priv->last_down = _tmp4_; #line 96 "/home/jens/Source/shotwell/src/Page.vala" gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), TRUE); #line 98 "/home/jens/Source/shotwell/src/Page.vala" @@ -2336,11 +2950,13 @@ Page* page_construct (GType object_type, const gchar* page_name) { g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "realize", (GCallback) _page_attach_view_signals_gtk_widget_realize, self, 0); #line 89 "/home/jens/Source/shotwell/src/Page.vala" return self; -#line 2340 "Page.c" +#line 2954 "Page.c" } -static void page_real_destroy (GtkWidget* base) { +static void +page_real_destroy (GtkWidget* base) +{ Page * self; gboolean _tmp0_; ViewCollection* _tmp1_; @@ -2356,7 +2972,7 @@ static void page_real_destroy (GtkWidget* base) { if (_tmp0_) { #line 113 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 2360 "Page.c" +#line 2976 "Page.c" } #line 116 "/home/jens/Source/shotwell/src/Page.vala" page_detach_event_source (self); @@ -2372,25 +2988,25 @@ static void page_real_destroy (GtkWidget* base) { _tmp2_ = self->toolbar; #line 123 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp2_ != NULL) { -#line 2376 "Page.c" +#line 2992 "Page.c" GtkToolbar* _tmp3_; #line 124 "/home/jens/Source/shotwell/src/Page.vala" _tmp3_ = self->toolbar; #line 124 "/home/jens/Source/shotwell/src/Page.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); -#line 2382 "Page.c" +#line 2998 "Page.c" } #line 127 "/home/jens/Source/shotwell/src/Page.vala" _tmp4_ = self->priv->update_actions_scheduler; #line 127 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp4_ != NULL) { -#line 2388 "Page.c" +#line 3004 "Page.c" OneShotScheduler* _tmp5_; #line 128 "/home/jens/Source/shotwell/src/Page.vala" _tmp5_ = self->priv->update_actions_scheduler; #line 128 "/home/jens/Source/shotwell/src/Page.vala" one_shot_scheduler_cancel (_tmp5_); -#line 2394 "Page.c" +#line 3010 "Page.c" } #line 130 "/home/jens/Source/shotwell/src/Page.vala" self->priv->is_destroyed = TRUE; @@ -2404,11 +3020,13 @@ static void page_real_destroy (GtkWidget* base) { g_debug ("Page.vala:134: Page %s Destroyed", _tmp7_); #line 134 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (_tmp7_); -#line 2408 "Page.c" +#line 3024 "Page.c" } -gchar* page_get_page_name (Page* self) { +gchar* +page_get_page_name (Page* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -2422,37 +3040,42 @@ gchar* page_get_page_name (Page* self) { result = _tmp1_; #line 138 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 2426 "Page.c" +#line 3044 "Page.c" } -static void page_real_set_page_name (Page* self, const gchar* page_name) { - const gchar* _tmp0_; - gchar* _tmp1_; +static void +page_real_set_page_name (Page* self, + const gchar* page_name) +{ + gchar* _tmp0_; #line 141 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (page_name != NULL); #line 142 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = page_name; -#line 142 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (page_name); #line 142 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (self->priv->page_name); #line 142 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->page_name = _tmp1_; -#line 2443 "Page.c" + self->priv->page_name = _tmp0_; +#line 3061 "Page.c" } -void page_set_page_name (Page* self, const gchar* page_name) { +void +page_set_page_name (Page* self, + const gchar* page_name) +{ #line 141 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 141 "/home/jens/Source/shotwell/src/Page.vala" PAGE_GET_CLASS (self)->set_page_name (self, page_name); -#line 2452 "Page.c" +#line 3073 "Page.c" } -gchar* page_to_string (Page* self) { +gchar* +page_to_string (Page* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -2466,18 +3089,22 @@ gchar* page_to_string (Page* self) { result = _tmp1_; #line 146 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 2470 "Page.c" +#line 3093 "Page.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 150 "/home/jens/Source/shotwell/src/Page.vala" return self ? data_collection_ref (self) : NULL; -#line 2477 "Page.c" +#line 3102 "Page.c" } -ViewCollection* page_get_view (Page* self) { +ViewCollection* +page_get_view (Page* self) +{ ViewCollection* result = NULL; ViewCollection* _tmp0_; ViewCollection* _tmp1_; @@ -2491,11 +3118,13 @@ ViewCollection* page_get_view (Page* self) { result = _tmp1_; #line 150 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 2495 "Page.c" +#line 3122 "Page.c" } -GtkWindow* page_get_container (Page* self) { +GtkWindow* +page_get_container (Page* self) +{ GtkWindow* result = NULL; GtkWindow* _tmp0_; GtkWindow* _tmp1_; @@ -2509,14 +3138,16 @@ GtkWindow* page_get_container (Page* self) { result = _tmp1_; #line 154 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 2513 "Page.c" +#line 3142 "Page.c" } -static void page_real_set_container (Page* self, GtkWindow* container) { +static void +page_real_set_container (Page* self, + GtkWindow* container) +{ GtkWindow* _tmp0_; GtkWindow* _tmp1_; - GtkWindow* _tmp2_; #line 157 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (GTK_IS_WINDOW (container)); #line 158 "/home/jens/Source/shotwell/src/Page.vala" @@ -2524,108 +3155,130 @@ static void page_real_set_container (Page* self, GtkWindow* container) { #line 158 "/home/jens/Source/shotwell/src/Page.vala" _vala_assert (_tmp0_ == NULL, "this.container == null"); #line 160 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = container; -#line 160 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (container); #line 160 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->container); #line 160 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->container = _tmp2_; -#line 2535 "Page.c" + self->priv->container = _tmp1_; +#line 3164 "Page.c" } -void page_set_container (Page* self, GtkWindow* container) { +void +page_set_container (Page* self, + GtkWindow* container) +{ #line 157 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 157 "/home/jens/Source/shotwell/src/Page.vala" PAGE_GET_CLASS (self)->set_container (self, container); -#line 2544 "Page.c" +#line 3176 "Page.c" } -static void page_real_clear_container (Page* self) { +static void +page_real_clear_container (Page* self) +{ #line 164 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->container); #line 164 "/home/jens/Source/shotwell/src/Page.vala" self->priv->container = NULL; -#line 2553 "Page.c" +#line 3187 "Page.c" } -void page_clear_container (Page* self) { +void +page_clear_container (Page* self) +{ #line 163 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 163 "/home/jens/Source/shotwell/src/Page.vala" PAGE_GET_CLASS (self)->clear_container (self); -#line 2562 "Page.c" +#line 3198 "Page.c" } -static gboolean _page_on_button_pressed_internal_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { +static gboolean +_page_on_button_pressed_internal_gtk_widget_button_press_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self) +{ gboolean result; result = page_on_button_pressed_internal ((Page*) self, event); #line 178 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 2571 "Page.c" +#line 3211 "Page.c" } -static gboolean _page_on_button_released_internal_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { +static gboolean +_page_on_button_released_internal_gtk_widget_button_release_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self) +{ gboolean result; result = page_on_button_released_internal ((Page*) self, event); #line 179 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 2580 "Page.c" +#line 3224 "Page.c" } -static gboolean _page_on_motion_internal_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self) { +static gboolean +_page_on_motion_internal_gtk_widget_motion_notify_event (GtkWidget* _sender, + GdkEventMotion* event, + gpointer self) +{ gboolean result; result = page_on_motion_internal ((Page*) self, event); #line 180 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 2589 "Page.c" +#line 3237 "Page.c" } -static gboolean _page_on_leave_notify_event_gtk_widget_leave_notify_event (GtkWidget* _sender, GdkEventCrossing* event, gpointer self) { +static gboolean +_page_on_leave_notify_event_gtk_widget_leave_notify_event (GtkWidget* _sender, + GdkEventCrossing* event, + gpointer self) +{ gboolean result; result = page_on_leave_notify_event ((Page*) self); #line 181 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 2598 "Page.c" +#line 3250 "Page.c" } -static gboolean _page_on_mousewheel_internal_gtk_widget_scroll_event (GtkWidget* _sender, GdkEventScroll* event, gpointer self) { +static gboolean +_page_on_mousewheel_internal_gtk_widget_scroll_event (GtkWidget* _sender, + GdkEventScroll* event, + gpointer self) +{ gboolean result; result = page_on_mousewheel_internal ((Page*) self, event); #line 182 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 2607 "Page.c" +#line 3263 "Page.c" } -static void _page_on_event_source_realize_gtk_widget_realize (GtkWidget* _sender, gpointer self) { +static void +_page_on_event_source_realize_gtk_widget_realize (GtkWidget* _sender, + gpointer self) +{ #line 183 "/home/jens/Source/shotwell/src/Page.vala" page_on_event_source_realize ((Page*) self); -#line 2614 "Page.c" +#line 3273 "Page.c" } -void page_set_event_source (Page* self, GtkWidget* event_source) { +void +page_set_event_source (Page* self, + GtkWidget* event_source) +{ GtkWidget* _tmp0_; GtkWidget* _tmp1_; - GtkWidget* _tmp2_; - GtkWidget* _tmp3_; - GtkWidget* _tmp4_; - GtkWidget* _tmp5_; - GtkWidget* _tmp6_; - GtkWidget* _tmp7_; - GtkWidget* _tmp8_; - GtkWidget* _tmp9_; - GtkWidget* _tmp10_; #line 167 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 167 "/home/jens/Source/shotwell/src/Page.vala" @@ -2635,50 +3288,34 @@ void page_set_event_source (Page* self, GtkWidget* event_source) { #line 168 "/home/jens/Source/shotwell/src/Page.vala" _vala_assert (_tmp0_ == NULL, "this.event_source == null"); #line 170 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = event_source; -#line 170 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (event_source); #line 170 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->event_source); #line 170 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->event_source = _tmp2_; + self->priv->event_source = _tmp1_; #line 171 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = event_source; -#line 171 "/home/jens/Source/shotwell/src/Page.vala" - gtk_widget_set_can_focus (_tmp3_, TRUE); -#line 174 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = event_source; + gtk_widget_set_can_focus (event_source, TRUE); #line 174 "/home/jens/Source/shotwell/src/Page.vala" - gtk_widget_add_events (_tmp4_, (gint) (((((((GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK) | GDK_POINTER_MOTION_MASK) | GDK_POINTER_MOTION_HINT_MASK) | GDK_BUTTON_MOTION_MASK) | GDK_LEAVE_NOTIFY_MASK) | GDK_SCROLL_MASK) | GDK_SMOOTH_SCROLL_MASK)); + gtk_widget_add_events (event_source, (gint) (((((((GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK) | GDK_POINTER_MOTION_MASK) | GDK_POINTER_MOTION_HINT_MASK) | GDK_BUTTON_MOTION_MASK) | GDK_LEAVE_NOTIFY_MASK) | GDK_SCROLL_MASK) | GDK_SMOOTH_SCROLL_MASK)); #line 178 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = event_source; -#line 178 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (_tmp5_, "button-press-event", (GCallback) _page_on_button_pressed_internal_gtk_widget_button_press_event, self, 0); -#line 179 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = event_source; + g_signal_connect_object (event_source, "button-press-event", (GCallback) _page_on_button_pressed_internal_gtk_widget_button_press_event, self, 0); #line 179 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (_tmp6_, "button-release-event", (GCallback) _page_on_button_released_internal_gtk_widget_button_release_event, self, 0); + g_signal_connect_object (event_source, "button-release-event", (GCallback) _page_on_button_released_internal_gtk_widget_button_release_event, self, 0); #line 180 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = event_source; -#line 180 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (_tmp7_, "motion-notify-event", (GCallback) _page_on_motion_internal_gtk_widget_motion_notify_event, self, 0); -#line 181 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = event_source; + g_signal_connect_object (event_source, "motion-notify-event", (GCallback) _page_on_motion_internal_gtk_widget_motion_notify_event, self, 0); #line 181 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (_tmp8_, "leave-notify-event", (GCallback) _page_on_leave_notify_event_gtk_widget_leave_notify_event, self, 0); + g_signal_connect_object (event_source, "leave-notify-event", (GCallback) _page_on_leave_notify_event_gtk_widget_leave_notify_event, self, 0); #line 182 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = event_source; -#line 182 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (_tmp9_, "scroll-event", (GCallback) _page_on_mousewheel_internal_gtk_widget_scroll_event, self, 0); -#line 183 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = event_source; + g_signal_connect_object (event_source, "scroll-event", (GCallback) _page_on_mousewheel_internal_gtk_widget_scroll_event, self, 0); #line 183 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (_tmp10_, "realize", (GCallback) _page_on_event_source_realize_gtk_widget_realize, self, 0); -#line 2678 "Page.c" + g_signal_connect_object (event_source, "realize", (GCallback) _page_on_event_source_realize_gtk_widget_realize, self, 0); +#line 3313 "Page.c" } -static void page_detach_event_source (Page* self) { +static void +page_detach_event_source (Page* self) +{ GtkWidget* _tmp0_; GtkWidget* _tmp1_; guint _tmp2_; @@ -2698,7 +3335,7 @@ static void page_detach_event_source (Page* self) { if (_tmp0_ == NULL) { #line 188 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 2702 "Page.c" +#line 3339 "Page.c" } #line 190 "/home/jens/Source/shotwell/src/Page.vala" _tmp1_ = self->priv->event_source; @@ -2736,11 +3373,13 @@ static void page_detach_event_source (Page* self) { _g_object_unref0 (self->priv->event_source); #line 198 "/home/jens/Source/shotwell/src/Page.vala" self->priv->event_source = NULL; -#line 2740 "Page.c" +#line 3377 "Page.c" } -GtkWidget* page_get_event_source (Page* self) { +GtkWidget* +page_get_event_source (Page* self) +{ GtkWidget* result = NULL; GtkWidget* _tmp0_; GtkWidget* _tmp1_; @@ -2754,18 +3393,22 @@ GtkWidget* page_get_event_source (Page* self) { result = _tmp1_; #line 202 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 2758 "Page.c" +#line 3397 "Page.c" } -static gpointer _injection_group_ref0 (gpointer self) { +static gpointer +_injection_group_ref0 (gpointer self) +{ #line 215 "/home/jens/Source/shotwell/src/Page.vala" return self ? injection_group_ref (self) : NULL; -#line 2765 "Page.c" +#line 3406 "Page.c" } -GMenuModel* page_get_menubar (Page* self) { +GMenuModel* +page_get_menubar (Page* self) +{ GMenuModel* result = NULL; GMenu* model = NULL; GtkBuilder* _tmp0_; @@ -2787,7 +3430,7 @@ GMenuModel* page_get_menubar (Page* self) { _tmp3_ = model; #line 208 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp3_ == NULL) { -#line 2791 "Page.c" +#line 3434 "Page.c" GMenu* _tmp4_; #line 209 "/home/jens/Source/shotwell/src/Page.vala" _tmp4_ = g_menu_new (); @@ -2797,13 +3440,13 @@ GMenuModel* page_get_menubar (Page* self) { _g_object_unref0 (model); #line 209 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 2801 "Page.c" +#line 3444 "Page.c" } #line 212 "/home/jens/Source/shotwell/src/Page.vala" _tmp5_ = self->priv->menubar_injected; #line 212 "/home/jens/Source/shotwell/src/Page.vala" if (!_tmp5_) { -#line 2807 "Page.c" +#line 3450 "Page.c" InjectionGroup** injection_groups = NULL; gint _tmp6_; InjectionGroup** _tmp7_; @@ -2823,7 +3466,7 @@ GMenuModel* page_get_menubar (Page* self) { _tmp8_ = injection_groups; #line 215 "/home/jens/Source/shotwell/src/Page.vala" _tmp8__length1 = injection_groups_length1; -#line 2827 "Page.c" +#line 3470 "Page.c" { InjectionGroup** group_collection = NULL; gint group_collection_length1 = 0; @@ -2835,280 +3478,277 @@ GMenuModel* page_get_menubar (Page* self) { group_collection_length1 = _tmp8__length1; #line 215 "/home/jens/Source/shotwell/src/Page.vala" for (group_it = 0; group_it < _tmp8__length1; group_it = group_it + 1) { -#line 2839 "Page.c" +#line 3482 "Page.c" InjectionGroup* _tmp9_; InjectionGroup* group = NULL; #line 215 "/home/jens/Source/shotwell/src/Page.vala" _tmp9_ = _injection_group_ref0 (group_collection[group_it]); #line 215 "/home/jens/Source/shotwell/src/Page.vala" group = _tmp9_; -#line 2846 "Page.c" +#line 3489 "Page.c" { gint items = 0; GMenu* _tmp10_; - gint _tmp11_; #line 216 "/home/jens/Source/shotwell/src/Page.vala" _tmp10_ = model; #line 216 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = g_menu_model_get_n_items (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_menu_model_get_type (), GMenuModel)); -#line 216 "/home/jens/Source/shotwell/src/Page.vala" - items = _tmp11_; -#line 2857 "Page.c" + items = g_menu_model_get_n_items (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_menu_model_get_type (), GMenuModel)); +#line 3497 "Page.c" { gint i = 0; #line 217 "/home/jens/Source/shotwell/src/Page.vala" i = 0; -#line 2862 "Page.c" +#line 3502 "Page.c" { - gboolean _tmp12_ = FALSE; + gboolean _tmp11_ = FALSE; #line 217 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = TRUE; + _tmp11_ = TRUE; #line 217 "/home/jens/Source/shotwell/src/Page.vala" while (TRUE) { -#line 2869 "Page.c" +#line 3509 "Page.c" + gint _tmp13_; gint _tmp14_; - gint _tmp15_; GMenuModel* submenu = NULL; - GMenu* _tmp16_; - gint _tmp17_; - GMenuModel* _tmp18_; + GMenu* _tmp15_; + gint _tmp16_; + GMenuModel* _tmp17_; GMenuModel* section = NULL; - GMenuModel* _tmp19_; - InjectionGroup* _tmp20_; + GMenuModel* _tmp18_; + InjectionGroup* _tmp19_; + gchar* _tmp20_; gchar* _tmp21_; - gchar* _tmp22_; + GMenuModel* _tmp22_; GMenuModel* _tmp23_; GMenuModel* _tmp24_; - GMenuModel* _tmp25_; #line 217 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp12_) { -#line 2886 "Page.c" - gint _tmp13_; + if (!_tmp11_) { +#line 3526 "Page.c" + gint _tmp12_; #line 217 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = i; + _tmp12_ = i; #line 217 "/home/jens/Source/shotwell/src/Page.vala" - i = _tmp13_ + 1; -#line 2892 "Page.c" + i = _tmp12_ + 1; +#line 3532 "Page.c" } #line 217 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = FALSE; + _tmp11_ = FALSE; #line 217 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = i; + _tmp13_ = i; #line 217 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = items; + _tmp14_ = items; #line 217 "/home/jens/Source/shotwell/src/Page.vala" - if (!(_tmp14_ < _tmp15_)) { + if (!(_tmp13_ < _tmp14_)) { #line 217 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 2904 "Page.c" +#line 3544 "Page.c" } #line 218 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = model; + _tmp15_ = model; #line 218 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = i; + _tmp16_ = i; #line 218 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = g_menu_model_get_item_link (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, g_menu_model_get_type (), GMenuModel), _tmp17_, G_MENU_LINK_SUBMENU); + _tmp17_ = g_menu_model_get_item_link (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, g_menu_model_get_type (), GMenuModel), _tmp16_, G_MENU_LINK_SUBMENU); #line 218 "/home/jens/Source/shotwell/src/Page.vala" - submenu = _tmp18_; + submenu = _tmp17_; #line 220 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = submenu; + _tmp18_ = submenu; #line 220 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = group; + _tmp19_ = group; #line 220 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = injection_group_get_path (_tmp20_); + _tmp20_ = injection_group_get_path (_tmp19_); #line 220 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 220 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = page_find_extension_point (self, _tmp19_, _tmp22_); + _tmp22_ = page_find_extension_point (self, _tmp18_, _tmp21_); #line 220 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 220 "/home/jens/Source/shotwell/src/Page.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp21_); #line 220 "/home/jens/Source/shotwell/src/Page.vala" - section = _tmp24_; + section = _tmp23_; #line 223 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = section; + _tmp24_ = section; #line 223 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp25_ == NULL) { + if (_tmp24_ == NULL) { #line 224 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (section); #line 224 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (submenu); #line 224 "/home/jens/Source/shotwell/src/Page.vala" continue; -#line 2940 "Page.c" +#line 3580 "Page.c" } { GeeList* _element_list = NULL; - InjectionGroup* _tmp26_; - GeeList* _tmp27_; + InjectionGroup* _tmp25_; + GeeList* _tmp26_; gint _element_size = 0; - GeeList* _tmp28_; + GeeList* _tmp27_; + gint _tmp28_; gint _tmp29_; - gint _tmp30_; gint _element_index = 0; #line 227 "/home/jens/Source/shotwell/src/Page.vala" - _tmp26_ = group; + _tmp25_ = group; #line 227 "/home/jens/Source/shotwell/src/Page.vala" - _tmp27_ = injection_group_get_elements (_tmp26_); + _tmp26_ = injection_group_get_elements (_tmp25_); #line 227 "/home/jens/Source/shotwell/src/Page.vala" - _element_list = _tmp27_; + _element_list = _tmp26_; #line 227 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = _element_list; + _tmp27_ = _element_list; #line 227 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp28_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection)); #line 227 "/home/jens/Source/shotwell/src/Page.vala" - _tmp30_ = _tmp29_; + _tmp29_ = _tmp28_; #line 227 "/home/jens/Source/shotwell/src/Page.vala" - _element_size = _tmp30_; + _element_size = _tmp29_; #line 227 "/home/jens/Source/shotwell/src/Page.vala" _element_index = -1; #line 227 "/home/jens/Source/shotwell/src/Page.vala" while (TRUE) { -#line 2969 "Page.c" +#line 3609 "Page.c" + gint _tmp30_; gint _tmp31_; gint _tmp32_; - gint _tmp33_; InjectionGroupElement* element = NULL; - GeeList* _tmp34_; - gint _tmp35_; - gpointer _tmp36_; + GeeList* _tmp33_; + gint _tmp34_; + gpointer _tmp35_; GMenu* menu = NULL; - GMenuModel* _tmp37_; - GMenu* _tmp38_; - InjectionGroupElement* _tmp39_; - InjectionGroupElementItemType _tmp40_; + GMenuModel* _tmp36_; + GMenu* _tmp37_; + InjectionGroupElement* _tmp38_; + InjectionGroupElementItemType _tmp39_; #line 227 "/home/jens/Source/shotwell/src/Page.vala" - _tmp31_ = _element_index; + _tmp30_ = _element_index; #line 227 "/home/jens/Source/shotwell/src/Page.vala" - _element_index = _tmp31_ + 1; + _element_index = _tmp30_ + 1; #line 227 "/home/jens/Source/shotwell/src/Page.vala" - _tmp32_ = _element_index; + _tmp31_ = _element_index; #line 227 "/home/jens/Source/shotwell/src/Page.vala" - _tmp33_ = _element_size; + _tmp32_ = _element_size; #line 227 "/home/jens/Source/shotwell/src/Page.vala" - if (!(_tmp32_ < _tmp33_)) { + if (!(_tmp31_ < _tmp32_)) { #line 227 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 2994 "Page.c" +#line 3634 "Page.c" } #line 227 "/home/jens/Source/shotwell/src/Page.vala" - _tmp34_ = _element_list; + _tmp33_ = _element_list; #line 227 "/home/jens/Source/shotwell/src/Page.vala" - _tmp35_ = _element_index; + _tmp34_ = _element_index; #line 227 "/home/jens/Source/shotwell/src/Page.vala" - _tmp36_ = gee_list_get (_tmp34_, _tmp35_); + _tmp35_ = gee_list_get (_tmp33_, _tmp34_); #line 227 "/home/jens/Source/shotwell/src/Page.vala" - element = (InjectionGroupElement*) _tmp36_; + element = (InjectionGroupElement*) _tmp35_; #line 228 "/home/jens/Source/shotwell/src/Page.vala" - _tmp37_ = section; + _tmp36_ = section; #line 228 "/home/jens/Source/shotwell/src/Page.vala" - _tmp38_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, g_menu_get_type ()) ? ((GMenu*) _tmp37_) : NULL); + _tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp36_, g_menu_get_type ()) ? ((GMenu*) _tmp36_) : NULL); #line 228 "/home/jens/Source/shotwell/src/Page.vala" - menu = _tmp38_; + menu = _tmp37_; #line 229 "/home/jens/Source/shotwell/src/Page.vala" - _tmp39_ = element; + _tmp38_ = element; #line 229 "/home/jens/Source/shotwell/src/Page.vala" - _tmp40_ = _tmp39_->kind; + _tmp39_ = _tmp38_->kind; #line 229 "/home/jens/Source/shotwell/src/Page.vala" - switch (_tmp40_) { + switch (_tmp39_) { #line 229 "/home/jens/Source/shotwell/src/Page.vala" case INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENUITEM: -#line 3018 "Page.c" +#line 3658 "Page.c" { GMenuItem* item = NULL; - InjectionGroupElement* _tmp41_; - const gchar* _tmp42_; - InjectionGroupElement* _tmp43_; - const gchar* _tmp44_; + InjectionGroupElement* _tmp40_; + const gchar* _tmp41_; + InjectionGroupElement* _tmp42_; + const gchar* _tmp43_; + gchar* _tmp44_; gchar* _tmp45_; - gchar* _tmp46_; + GMenuItem* _tmp46_; GMenuItem* _tmp47_; - GMenuItem* _tmp48_; - InjectionGroupElement* _tmp49_; - const gchar* _tmp50_; - GMenu* _tmp54_; - GMenuItem* _tmp55_; + InjectionGroupElement* _tmp48_; + const gchar* _tmp49_; + GMenu* _tmp53_; + GMenuItem* _tmp54_; #line 231 "/home/jens/Source/shotwell/src/Page.vala" - _tmp41_ = element; + _tmp40_ = element; #line 231 "/home/jens/Source/shotwell/src/Page.vala" - _tmp42_ = _tmp41_->name; + _tmp41_ = _tmp40_->name; #line 231 "/home/jens/Source/shotwell/src/Page.vala" - _tmp43_ = element; + _tmp42_ = element; #line 231 "/home/jens/Source/shotwell/src/Page.vala" - _tmp44_ = _tmp43_->action; + _tmp43_ = _tmp42_->action; #line 231 "/home/jens/Source/shotwell/src/Page.vala" - _tmp45_ = g_strconcat ("win.", _tmp44_, NULL); + _tmp44_ = g_strconcat ("win.", _tmp43_, NULL); #line 231 "/home/jens/Source/shotwell/src/Page.vala" - _tmp46_ = _tmp45_; + _tmp45_ = _tmp44_; #line 231 "/home/jens/Source/shotwell/src/Page.vala" - _tmp47_ = g_menu_item_new (_tmp42_, _tmp46_); + _tmp46_ = g_menu_item_new (_tmp41_, _tmp45_); #line 231 "/home/jens/Source/shotwell/src/Page.vala" - _tmp48_ = _tmp47_; + _tmp47_ = _tmp46_; #line 231 "/home/jens/Source/shotwell/src/Page.vala" - _g_free0 (_tmp46_); + _g_free0 (_tmp45_); #line 231 "/home/jens/Source/shotwell/src/Page.vala" - item = _tmp48_; + item = _tmp47_; #line 233 "/home/jens/Source/shotwell/src/Page.vala" - _tmp49_ = element; + _tmp48_ = element; #line 233 "/home/jens/Source/shotwell/src/Page.vala" - _tmp50_ = _tmp49_->accellerator; + _tmp49_ = _tmp48_->accellerator; #line 233 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp50_ != NULL) { -#line 3059 "Page.c" - GMenuItem* _tmp51_; - InjectionGroupElement* _tmp52_; - const gchar* _tmp53_; + if (_tmp49_ != NULL) { +#line 3699 "Page.c" + GMenuItem* _tmp50_; + InjectionGroupElement* _tmp51_; + const gchar* _tmp52_; #line 234 "/home/jens/Source/shotwell/src/Page.vala" - _tmp51_ = item; + _tmp50_ = item; #line 234 "/home/jens/Source/shotwell/src/Page.vala" - _tmp52_ = element; + _tmp51_ = element; #line 234 "/home/jens/Source/shotwell/src/Page.vala" - _tmp53_ = _tmp52_->accellerator; + _tmp52_ = _tmp51_->accellerator; #line 234 "/home/jens/Source/shotwell/src/Page.vala" - g_menu_item_set_attribute (_tmp51_, "accel", "s", _tmp53_, NULL); -#line 3071 "Page.c" + g_menu_item_set_attribute (_tmp50_, "accel", "s", _tmp52_, NULL); +#line 3711 "Page.c" } #line 239 "/home/jens/Source/shotwell/src/Page.vala" - _tmp54_ = menu; + _tmp53_ = menu; #line 239 "/home/jens/Source/shotwell/src/Page.vala" - _tmp55_ = item; + _tmp54_ = item; #line 239 "/home/jens/Source/shotwell/src/Page.vala" - g_menu_append_item (_tmp54_, _tmp55_); + g_menu_append_item (_tmp53_, _tmp54_); #line 240 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (item); #line 240 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 3083 "Page.c" +#line 3723 "Page.c" } default: { #line 242 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 3089 "Page.c" +#line 3729 "Page.c" } } #line 227 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (menu); #line 227 "/home/jens/Source/shotwell/src/Page.vala" _injection_group_element_unref0 (element); -#line 3096 "Page.c" +#line 3736 "Page.c" } #line 227 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (_element_list); -#line 3100 "Page.c" +#line 3740 "Page.c" } #line 217 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (section); #line 217 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (submenu); -#line 3106 "Page.c" +#line 3746 "Page.c" } } } #line 215 "/home/jens/Source/shotwell/src/Page.vala" _injection_group_unref0 (group); -#line 3112 "Page.c" +#line 3752 "Page.c" } } } @@ -3116,17 +3756,19 @@ GMenuModel* page_get_menubar (Page* self) { self->priv->menubar_injected = TRUE; #line 212 "/home/jens/Source/shotwell/src/Page.vala" injection_groups = (_vala_array_free (injection_groups, injection_groups_length1, (GDestroyNotify) injection_group_unref), NULL); -#line 3120 "Page.c" +#line 3760 "Page.c" } #line 251 "/home/jens/Source/shotwell/src/Page.vala" result = G_TYPE_CHECK_INSTANCE_CAST (model, g_menu_model_get_type (), GMenuModel); #line 251 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 3126 "Page.c" +#line 3766 "Page.c" } -static GtkToolbar* page_real_get_toolbar (Page* self) { +static GtkToolbar* +page_real_get_toolbar (Page* self) +{ GtkToolbar* result = NULL; GtkToolbar* _tmp0_; GtkToolbar* _tmp12_; @@ -3135,7 +3777,7 @@ static GtkToolbar* page_real_get_toolbar (Page* self) { _tmp0_ = self->toolbar; #line 255 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp0_ == NULL) { -#line 3139 "Page.c" +#line 3781 "Page.c" GtkToolbar* _tmp1_ = NULL; const gchar* _tmp2_; GtkToolbar* _tmp8_; @@ -3146,7 +3788,7 @@ static GtkToolbar* page_real_get_toolbar (Page* self) { _tmp2_ = self->priv->toolbar_path; #line 256 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp2_ == NULL) { -#line 3150 "Page.c" +#line 3792 "Page.c" GtkToolbar* _tmp3_; #line 256 "/home/jens/Source/shotwell/src/Page.vala" _tmp3_ = (GtkToolbar*) gtk_toolbar_new (); @@ -3156,7 +3798,7 @@ static GtkToolbar* page_real_get_toolbar (Page* self) { _g_object_unref0 (_tmp1_); #line 256 "/home/jens/Source/shotwell/src/Page.vala" _tmp1_ = _tmp3_; -#line 3160 "Page.c" +#line 3802 "Page.c" } else { GtkBuilder* _tmp4_; const gchar* _tmp5_; @@ -3174,7 +3816,7 @@ static GtkToolbar* page_real_get_toolbar (Page* self) { _g_object_unref0 (_tmp1_); #line 257 "/home/jens/Source/shotwell/src/Page.vala" _tmp1_ = _tmp7_; -#line 3178 "Page.c" +#line 3820 "Page.c" } #line 256 "/home/jens/Source/shotwell/src/Page.vala" _tmp8_ = _g_object_ref0 (_tmp1_); @@ -3194,7 +3836,7 @@ static GtkToolbar* page_real_get_toolbar (Page* self) { gtk_toolbar_set_icon_size (_tmp11_, GTK_ICON_SIZE_SMALL_TOOLBAR); #line 255 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (_tmp1_); -#line 3198 "Page.c" +#line 3840 "Page.c" } #line 262 "/home/jens/Source/shotwell/src/Page.vala" _tmp12_ = self->toolbar; @@ -3204,39 +3846,47 @@ static GtkToolbar* page_real_get_toolbar (Page* self) { result = _tmp13_; #line 262 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 3208 "Page.c" +#line 3850 "Page.c" } -GtkToolbar* page_get_toolbar (Page* self) { +GtkToolbar* +page_get_toolbar (Page* self) +{ #line 254 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), NULL); #line 254 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->get_toolbar (self); -#line 3217 "Page.c" +#line 3861 "Page.c" } -static GtkMenu* page_real_get_page_context_menu (Page* self) { +static GtkMenu* +page_real_get_page_context_menu (Page* self) +{ GtkMenu* result = NULL; #line 266 "/home/jens/Source/shotwell/src/Page.vala" result = NULL; #line 266 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 3227 "Page.c" +#line 3873 "Page.c" } -GtkMenu* page_get_page_context_menu (Page* self) { +GtkMenu* +page_get_page_context_menu (Page* self) +{ #line 265 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), NULL); #line 265 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->get_page_context_menu (self); -#line 3236 "Page.c" +#line 3884 "Page.c" } -static void page_real_switching_from (Page* self) { +static void +page_real_switching_from (Page* self) +{ GActionMap* map = NULL; GtkWindow* _tmp0_; GActionMap* _tmp1_; @@ -3252,7 +3902,7 @@ static void page_real_switching_from (Page* self) { if (_tmp1_ == NULL) { #line 272 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (_tmp0_); -#line 3256 "Page.c" +#line 3906 "Page.c" } #line 272 "/home/jens/Source/shotwell/src/Page.vala" map = _tmp1_; @@ -3260,13 +3910,13 @@ static void page_real_switching_from (Page* self) { _tmp2_ = map; #line 273 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp2_ != NULL) { -#line 3264 "Page.c" +#line 3914 "Page.c" GActionMap* _tmp3_; #line 274 "/home/jens/Source/shotwell/src/Page.vala" _tmp3_ = map; #line 274 "/home/jens/Source/shotwell/src/Page.vala" page_remove_actions (self, _tmp3_); -#line 3270 "Page.c" +#line 3920 "Page.c" } #line 276 "/home/jens/Source/shotwell/src/Page.vala" _tmp4_ = self->priv->toolbar_path; @@ -3276,24 +3926,28 @@ static void page_real_switching_from (Page* self) { _g_object_unref0 (self->toolbar); #line 277 "/home/jens/Source/shotwell/src/Page.vala" self->toolbar = NULL; -#line 3280 "Page.c" +#line 3930 "Page.c" } #line 269 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (map); -#line 3284 "Page.c" +#line 3934 "Page.c" } -void page_switching_from (Page* self) { +void +page_switching_from (Page* self) +{ #line 269 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 269 "/home/jens/Source/shotwell/src/Page.vala" PAGE_GET_CLASS (self)->switching_from (self); -#line 3293 "Page.c" +#line 3945 "Page.c" } -static void page_real_switched_to (Page* self) { +static void +page_real_switched_to (Page* self) +{ GActionMap* map = NULL; GtkWindow* _tmp0_; GActionMap* _tmp1_; @@ -3302,12 +3956,10 @@ static void page_real_switched_to (Page* self) { ViewCollection* _tmp4_; ViewCollection* _tmp5_; gint _tmp6_; - gint _tmp7_; gint count = 0; + ViewCollection* _tmp7_; ViewCollection* _tmp8_; - ViewCollection* _tmp9_; - gint _tmp10_; - gint _tmp11_; + gint _tmp9_; #line 281 "/home/jens/Source/shotwell/src/Page.vala" self->in_view = TRUE; #line 282 "/home/jens/Source/shotwell/src/Page.vala" @@ -3320,7 +3972,7 @@ static void page_real_switched_to (Page* self) { if (_tmp1_ == NULL) { #line 283 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (_tmp0_); -#line 3324 "Page.c" +#line 3976 "Page.c" } #line 283 "/home/jens/Source/shotwell/src/Page.vala" map = _tmp1_; @@ -3328,13 +3980,13 @@ static void page_real_switched_to (Page* self) { _tmp2_ = map; #line 284 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp2_ != NULL) { -#line 3332 "Page.c" +#line 3984 "Page.c" GActionMap* _tmp3_; #line 285 "/home/jens/Source/shotwell/src/Page.vala" _tmp3_ = map; #line 285 "/home/jens/Source/shotwell/src/Page.vala" page_add_actions (self, _tmp3_); -#line 3338 "Page.c" +#line 3990 "Page.c" } #line 287 "/home/jens/Source/shotwell/src/Page.vala" _tmp4_ = page_get_view (self); @@ -3342,24 +3994,20 @@ static void page_real_switched_to (Page* self) { _tmp5_ = _tmp4_; #line 287 "/home/jens/Source/shotwell/src/Page.vala" _tmp6_ = view_collection_get_selected_count (_tmp5_); -#line 287 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = _tmp6_; #line 287 "/home/jens/Source/shotwell/src/Page.vala" _data_collection_unref0 (_tmp5_); #line 287 "/home/jens/Source/shotwell/src/Page.vala" - selected_count = _tmp7_; -#line 288 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = page_get_view (self); + selected_count = _tmp6_; #line 288 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = _tmp8_; + _tmp7_ = page_get_view (self); #line 288 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp8_ = _tmp7_; #line 288 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = _tmp10_; + _tmp9_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection)); #line 288 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp9_); + _data_collection_unref0 (_tmp8_); #line 288 "/home/jens/Source/shotwell/src/Page.vala" - count = _tmp11_; + count = _tmp9_; #line 289 "/home/jens/Source/shotwell/src/Page.vala" page_init_actions (self, selected_count, count); #line 290 "/home/jens/Source/shotwell/src/Page.vala" @@ -3368,33 +4016,41 @@ static void page_real_switched_to (Page* self) { page_update_modifiers (self); #line 280 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (map); -#line 3372 "Page.c" +#line 4020 "Page.c" } -void page_switched_to (Page* self) { +void +page_switched_to (Page* self) +{ #line 280 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 280 "/home/jens/Source/shotwell/src/Page.vala" PAGE_GET_CLASS (self)->switched_to (self); -#line 3381 "Page.c" +#line 4031 "Page.c" } -static void page_real_ready (Page* self) { +static void +page_real_ready (Page* self) +{ } -void page_ready (Page* self) { +void +page_ready (Page* self) +{ #line 294 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 294 "/home/jens/Source/shotwell/src/Page.vala" PAGE_GET_CLASS (self)->ready (self); -#line 3394 "Page.c" +#line 4048 "Page.c" } -gboolean page_is_in_view (Page* self) { +gboolean +page_is_in_view (Page* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 297 "/home/jens/Source/shotwell/src/Page.vala" @@ -3405,55 +4061,64 @@ gboolean page_is_in_view (Page* self) { result = _tmp0_; #line 298 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 3409 "Page.c" +#line 4065 "Page.c" } -static void page_real_switching_to_fullscreen (Page* self, FullscreenWindow* fsw) { - FullscreenWindow* _tmp0_; +static void +page_real_switching_to_fullscreen (Page* self, + FullscreenWindow* fsw) +{ #line 301 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw)); #line 302 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = fsw; -#line 302 "/home/jens/Source/shotwell/src/Page.vala" - page_add_actions (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_action_map_get_type (), GActionMap)); -#line 3421 "Page.c" + page_add_actions (self, G_TYPE_CHECK_INSTANCE_CAST (fsw, g_action_map_get_type (), GActionMap)); +#line 4077 "Page.c" } -void page_switching_to_fullscreen (Page* self, FullscreenWindow* fsw) { +void +page_switching_to_fullscreen (Page* self, + FullscreenWindow* fsw) +{ #line 301 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 301 "/home/jens/Source/shotwell/src/Page.vala" PAGE_GET_CLASS (self)->switching_to_fullscreen (self, fsw); -#line 3430 "Page.c" +#line 4089 "Page.c" } -static void page_real_returning_from_fullscreen (Page* self, FullscreenWindow* fsw) { - FullscreenWindow* _tmp0_; +static void +page_real_returning_from_fullscreen (Page* self, + FullscreenWindow* fsw) +{ #line 305 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw)); #line 306 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = fsw; -#line 306 "/home/jens/Source/shotwell/src/Page.vala" - page_remove_actions (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_action_map_get_type (), GActionMap)); + page_remove_actions (self, G_TYPE_CHECK_INSTANCE_CAST (fsw, g_action_map_get_type (), GActionMap)); #line 307 "/home/jens/Source/shotwell/src/Page.vala" page_switched_to (self); -#line 3444 "Page.c" +#line 4103 "Page.c" } -void page_returning_from_fullscreen (Page* self, FullscreenWindow* fsw) { +void +page_returning_from_fullscreen (Page* self, + FullscreenWindow* fsw) +{ #line 305 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 305 "/home/jens/Source/shotwell/src/Page.vala" PAGE_GET_CLASS (self)->returning_from_fullscreen (self, fsw); -#line 3453 "Page.c" +#line 4115 "Page.c" } -GAction* page_get_action (Page* self, const gchar* name) { +GAction* +page_get_action (Page* self, + const gchar* name) +{ GAction* result = NULL; GActionMap* map = NULL; GtkWindow* _tmp0_; @@ -3468,7 +4133,7 @@ GAction* page_get_action (Page* self, const gchar* name) { _tmp0_ = self->priv->container; #line 312 "/home/jens/Source/shotwell/src/Page.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FULLSCREEN_WINDOW)) { -#line 3472 "Page.c" +#line 4137 "Page.c" GtkWindow* _tmp1_; GActionMap* _tmp2_; #line 313 "/home/jens/Source/shotwell/src/Page.vala" @@ -3479,7 +4144,7 @@ GAction* page_get_action (Page* self, const gchar* name) { _g_object_unref0 (map); #line 313 "/home/jens/Source/shotwell/src/Page.vala" map = _tmp2_; -#line 3483 "Page.c" +#line 4148 "Page.c" } else { AppWindow* _tmp3_; GActionMap* _tmp4_; @@ -3491,38 +4156,35 @@ GAction* page_get_action (Page* self, const gchar* name) { if (_tmp4_ == NULL) { #line 315 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (_tmp3_); -#line 3495 "Page.c" +#line 4160 "Page.c" } #line 315 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (map); #line 315 "/home/jens/Source/shotwell/src/Page.vala" map = _tmp4_; -#line 3501 "Page.c" +#line 4166 "Page.c" } #line 318 "/home/jens/Source/shotwell/src/Page.vala" _tmp5_ = map; #line 318 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp5_ != NULL) { -#line 3507 "Page.c" +#line 4172 "Page.c" GActionMap* _tmp6_; - const gchar* _tmp7_; + GAction* _tmp7_; GAction* _tmp8_; - GAction* _tmp9_; #line 319 "/home/jens/Source/shotwell/src/Page.vala" _tmp6_ = map; #line 319 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = name; -#line 319 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = g_action_map_lookup_action (_tmp6_, _tmp7_); + _tmp7_ = g_action_map_lookup_action (_tmp6_, name); #line 319 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = _g_object_ref0 (_tmp8_); + _tmp8_ = _g_object_ref0 (_tmp7_); #line 319 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp9_; + result = _tmp8_; #line 319 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (map); #line 319 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 3526 "Page.c" +#line 4188 "Page.c" } #line 322 "/home/jens/Source/shotwell/src/Page.vala" result = NULL; @@ -3530,198 +4192,181 @@ GAction* page_get_action (Page* self, const gchar* name) { _g_object_unref0 (map); #line 322 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 3534 "Page.c" +#line 4196 "Page.c" } -void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive) { +void +page_set_action_sensitive (Page* self, + const gchar* name, + gboolean sensitive) +{ GSimpleAction* action = NULL; - const gchar* _tmp0_; - GAction* _tmp1_; + GAction* _tmp0_; + GSimpleAction* _tmp1_; GSimpleAction* _tmp2_; - GSimpleAction* _tmp3_; #line 325 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 325 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (name != NULL); #line 326 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = name; + _tmp0_ = page_get_action (self, name); #line 326 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = page_get_action (self, _tmp0_); + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL; #line 326 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL; -#line 326 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 326 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp1_); -#line 3558 "Page.c" + _g_object_unref0 (_tmp0_); +#line 4221 "Page.c" } #line 326 "/home/jens/Source/shotwell/src/Page.vala" - action = _tmp2_; + action = _tmp1_; #line 327 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = action; + _tmp2_ = action; #line 327 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp3_ != NULL) { -#line 3566 "Page.c" - GSimpleAction* _tmp4_; - gboolean _tmp5_; -#line 328 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = action; + if (_tmp2_ != NULL) { +#line 4229 "Page.c" + GSimpleAction* _tmp3_; #line 328 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = sensitive; + _tmp3_ = action; #line 328 "/home/jens/Source/shotwell/src/Page.vala" - g_simple_action_set_enabled (_tmp4_, _tmp5_); -#line 3575 "Page.c" + g_simple_action_set_enabled (_tmp3_, sensitive); +#line 4235 "Page.c" } #line 325 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (action); -#line 3579 "Page.c" +#line 4239 "Page.c" } -void page_set_action_details (Page* self, const gchar* name, const gchar* label, const gchar* tooltip, gboolean sensitive) { +void +page_set_action_details (Page* self, + const gchar* name, + const gchar* label, + const gchar* tooltip, + gboolean sensitive) +{ GSimpleAction* action = NULL; - const gchar* _tmp0_; - GAction* _tmp1_; + GAction* _tmp0_; + GSimpleAction* _tmp1_; GSimpleAction* _tmp2_; GSimpleAction* _tmp3_; - const gchar* _tmp4_; - GSimpleAction* _tmp7_; - gboolean _tmp8_; #line 331 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 331 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (name != NULL); #line 332 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = name; + _tmp0_ = page_get_action (self, name); #line 332 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = page_get_action (self, _tmp0_); + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL; #line 332 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL; -#line 332 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 332 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp1_); -#line 3606 "Page.c" + _g_object_unref0 (_tmp0_); +#line 4267 "Page.c" } #line 332 "/home/jens/Source/shotwell/src/Page.vala" - action = _tmp2_; + action = _tmp1_; #line 334 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = action; + _tmp2_ = action; #line 334 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 335 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (action); #line 335 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 3618 "Page.c" +#line 4279 "Page.c" } #line 337 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = label; -#line 337 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp4_ != NULL) { -#line 3624 "Page.c" - const gchar* _tmp5_; - const gchar* _tmp6_; -#line 338 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = name; + if (label != NULL) { #line 338 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = label; -#line 338 "/home/jens/Source/shotwell/src/Page.vala" - page_update_menu_item_label (self, _tmp5_, _tmp6_); -#line 3633 "Page.c" + page_update_menu_item_label (self, name, label); +#line 4285 "Page.c" } #line 340 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = action; -#line 340 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = sensitive; + _tmp3_ = action; #line 340 "/home/jens/Source/shotwell/src/Page.vala" - g_simple_action_set_enabled (_tmp7_, _tmp8_); + g_simple_action_set_enabled (_tmp3_, sensitive); #line 331 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (action); -#line 3643 "Page.c" +#line 4293 "Page.c" } -void page_activate_action (Page* self, const gchar* name) { +void +page_activate_action (Page* self, + const gchar* name) +{ GAction* action = NULL; - const gchar* _tmp0_; + GAction* _tmp0_; GAction* _tmp1_; - GAction* _tmp2_; #line 343 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 343 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (name != NULL); #line 344 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = name; -#line 344 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = page_get_action (self, _tmp0_); + _tmp0_ = page_get_action (self, name); #line 344 "/home/jens/Source/shotwell/src/Page.vala" - action = _tmp1_; + action = _tmp0_; #line 346 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = action; + _tmp1_ = action; #line 346 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp2_ != NULL) { -#line 3666 "Page.c" - GAction* _tmp3_; + if (_tmp1_ != NULL) { +#line 4316 "Page.c" + GAction* _tmp2_; #line 347 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = action; + _tmp2_ = action; #line 347 "/home/jens/Source/shotwell/src/Page.vala" - g_action_activate (_tmp3_, NULL); -#line 3672 "Page.c" + g_action_activate (_tmp2_, NULL); +#line 4322 "Page.c" } #line 343 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (action); -#line 3676 "Page.c" +#line 4326 "Page.c" } -GAction* page_get_common_action (Page* self, const gchar* name, gboolean log_warning) { +GAction* +page_get_common_action (Page* self, + const gchar* name, + gboolean log_warning) +{ GAction* result = NULL; GAction* action = NULL; - const gchar* _tmp0_; + GAction* _tmp0_; GAction* _tmp1_; - GAction* _tmp2_; - gboolean _tmp3_; #line 350 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), NULL); #line 350 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (name != NULL, NULL); #line 351 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = name; + _tmp0_ = page_get_action (self, name); #line 351 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = page_get_action (self, _tmp0_); -#line 351 "/home/jens/Source/shotwell/src/Page.vala" - action = _tmp1_; + action = _tmp0_; #line 353 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = action; + _tmp1_ = action; #line 353 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp2_ != NULL) { + if (_tmp1_ != NULL) { #line 354 "/home/jens/Source/shotwell/src/Page.vala" result = action; #line 354 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 3705 "Page.c" +#line 4355 "Page.c" } #line 356 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = log_warning; -#line 356 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp3_) { -#line 3711 "Page.c" - gchar* _tmp4_; - gchar* _tmp5_; - const gchar* _tmp6_; -#line 357 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = page_get_page_name (self); + if (log_warning) { +#line 4359 "Page.c" + gchar* _tmp2_; + gchar* _tmp3_; #line 357 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = _tmp4_; + _tmp2_ = page_get_page_name (self); #line 357 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = name; + _tmp3_ = _tmp2_; #line 357 "/home/jens/Source/shotwell/src/Page.vala" - g_warning ("Page.vala:357: Page %s: Unable to locate common action %s", _tmp5_, _tmp6_); + g_warning ("Page.vala:357: Page %s: Unable to locate common action %s", _tmp3_, name); #line 357 "/home/jens/Source/shotwell/src/Page.vala" - _g_free0 (_tmp5_); -#line 3725 "Page.c" + _g_free0 (_tmp3_); +#line 4370 "Page.c" } #line 359 "/home/jens/Source/shotwell/src/Page.vala" result = NULL; @@ -3729,57 +4374,58 @@ GAction* page_get_common_action (Page* self, const gchar* name, gboolean log_war _g_object_unref0 (action); #line 359 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 3733 "Page.c" +#line 4378 "Page.c" } -void page_set_common_action_sensitive (Page* self, const gchar* name, gboolean sensitive) { +void +page_set_common_action_sensitive (Page* self, + const gchar* name, + gboolean sensitive) +{ GSimpleAction* action = NULL; - const gchar* _tmp0_; - GAction* _tmp1_; + GAction* _tmp0_; + GSimpleAction* _tmp1_; GSimpleAction* _tmp2_; - GSimpleAction* _tmp3_; #line 362 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 362 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (name != NULL); #line 363 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = name; -#line 363 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = page_get_common_action (self, _tmp0_, TRUE); + _tmp0_ = page_get_common_action (self, name, TRUE); #line 363 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL; + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL; #line 363 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 363 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp1_); -#line 3757 "Page.c" + _g_object_unref0 (_tmp0_); +#line 4403 "Page.c" } #line 363 "/home/jens/Source/shotwell/src/Page.vala" - action = _tmp2_; + action = _tmp1_; #line 364 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = action; + _tmp2_ = action; #line 364 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp3_ != NULL) { -#line 3765 "Page.c" - GSimpleAction* _tmp4_; - gboolean _tmp5_; -#line 365 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = action; + if (_tmp2_ != NULL) { +#line 4411 "Page.c" + GSimpleAction* _tmp3_; #line 365 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = sensitive; + _tmp3_ = action; #line 365 "/home/jens/Source/shotwell/src/Page.vala" - g_simple_action_set_enabled (_tmp4_, _tmp5_); -#line 3774 "Page.c" + g_simple_action_set_enabled (_tmp3_, sensitive); +#line 4417 "Page.c" } #line 362 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (action); -#line 3778 "Page.c" +#line 4421 "Page.c" } -void page_set_common_action_label (Page* self, const gchar* name, const gchar* label) { - const gchar* _tmp0_; +void +page_set_common_action_label (Page* self, + const gchar* name, + const gchar* label) +{ #line 368 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 368 "/home/jens/Source/shotwell/src/Page.vala" @@ -3787,70 +4433,71 @@ void page_set_common_action_label (Page* self, const gchar* name, const gchar* l #line 368 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (label != NULL); #line 369 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = name; -#line 369 "/home/jens/Source/shotwell/src/Page.vala" - g_debug ("Page.vala:369: Trying to set common action label for %s", _tmp0_); -#line 3794 "Page.c" + g_debug ("Page.vala:369: Trying to set common action label for %s", name); +#line 4438 "Page.c" } -void page_set_common_action_important (Page* self, const gchar* name, gboolean important) { - const gchar* _tmp0_; +void +page_set_common_action_important (Page* self, + const gchar* name, + gboolean important) +{ #line 372 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 372 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (name != NULL); #line 373 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = name; -#line 373 "/home/jens/Source/shotwell/src/Page.vala" - g_debug ("Page.vala:373: Setting action to important: %s", _tmp0_); -#line 3808 "Page.c" + g_debug ("Page.vala:373: Setting action to important: %s", name); +#line 4453 "Page.c" } -void page_activate_common_action (Page* self, const gchar* name) { +void +page_activate_common_action (Page* self, + const gchar* name) +{ GSimpleAction* action = NULL; - const gchar* _tmp0_; - GAction* _tmp1_; + GAction* _tmp0_; + GSimpleAction* _tmp1_; GSimpleAction* _tmp2_; - GSimpleAction* _tmp3_; #line 376 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 376 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (name != NULL); #line 377 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = name; + _tmp0_ = page_get_common_action (self, name, TRUE); #line 377 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = page_get_common_action (self, _tmp0_, TRUE); + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL; #line 377 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL; -#line 377 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 377 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp1_); -#line 3832 "Page.c" + _g_object_unref0 (_tmp0_); +#line 4477 "Page.c" } #line 377 "/home/jens/Source/shotwell/src/Page.vala" - action = _tmp2_; + action = _tmp1_; #line 378 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = action; + _tmp2_ = action; #line 378 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp3_ != NULL) { -#line 3840 "Page.c" - GSimpleAction* _tmp4_; + if (_tmp2_ != NULL) { +#line 4485 "Page.c" + GSimpleAction* _tmp3_; #line 379 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = action; + _tmp3_ = action; #line 379 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_emit_by_name (_tmp4_, "activate", NULL); -#line 3846 "Page.c" + g_signal_emit_by_name (_tmp3_, "activate", NULL); +#line 4491 "Page.c" } #line 376 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (action); -#line 3850 "Page.c" +#line 4495 "Page.c" } -gboolean page_get_ctrl_pressed (Page* self) { +gboolean +page_get_ctrl_pressed (Page* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 382 "/home/jens/Source/shotwell/src/Page.vala" @@ -3861,11 +4508,13 @@ gboolean page_get_ctrl_pressed (Page* self) { result = _tmp0_; #line 383 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 3865 "Page.c" +#line 4512 "Page.c" } -gboolean page_get_alt_pressed (Page* self) { +gboolean +page_get_alt_pressed (Page* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 386 "/home/jens/Source/shotwell/src/Page.vala" @@ -3876,11 +4525,13 @@ gboolean page_get_alt_pressed (Page* self) { result = _tmp0_; #line 387 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 3880 "Page.c" +#line 4529 "Page.c" } -gboolean page_get_shift_pressed (Page* self) { +gboolean +page_get_shift_pressed (Page* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 390 "/home/jens/Source/shotwell/src/Page.vala" @@ -3891,11 +4542,13 @@ gboolean page_get_shift_pressed (Page* self) { result = _tmp0_; #line 391 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 3895 "Page.c" +#line 4546 "Page.c" } -gboolean page_get_super_pressed (Page* self) { +gboolean +page_get_super_pressed (Page* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 394 "/home/jens/Source/shotwell/src/Page.vala" @@ -3906,68 +4559,74 @@ gboolean page_get_super_pressed (Page* self) { result = _tmp0_; #line 395 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 3910 "Page.c" +#line 4563 "Page.c" } -static GVariant* _variant_new20 (gboolean value) { +static GVariant* +_variant_new20 (gboolean value) +{ #line 401 "/home/jens/Source/shotwell/src/Page.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 3917 "Page.c" +#line 4572 "Page.c" } -void page_set_action_active (Page* self, const gchar* name, gboolean active) { +void +page_set_action_active (Page* self, + const gchar* name, + gboolean active) +{ GSimpleAction* action = NULL; - const gchar* _tmp0_; - GAction* _tmp1_; + GAction* _tmp0_; + GSimpleAction* _tmp1_; GSimpleAction* _tmp2_; - GSimpleAction* _tmp3_; #line 398 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 398 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (name != NULL); #line 399 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = name; -#line 399 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = page_get_action (self, _tmp0_); + _tmp0_ = page_get_action (self, name); #line 399 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL; + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL; #line 399 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 399 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp1_); -#line 3941 "Page.c" + _g_object_unref0 (_tmp0_); +#line 4597 "Page.c" } #line 399 "/home/jens/Source/shotwell/src/Page.vala" - action = _tmp2_; + action = _tmp1_; #line 400 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = action; + _tmp2_ = action; #line 400 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp3_ != NULL) { -#line 3949 "Page.c" - GSimpleAction* _tmp4_; - gboolean _tmp5_; - GVariant* _tmp6_; -#line 401 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = action; + if (_tmp2_ != NULL) { +#line 4605 "Page.c" + GSimpleAction* _tmp3_; + GVariant* _tmp4_; #line 401 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = active; + _tmp3_ = action; #line 401 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = _variant_new20 (_tmp5_); + _tmp4_ = _variant_new20 (active); #line 401 "/home/jens/Source/shotwell/src/Page.vala" - g_simple_action_set_state (_tmp4_, _tmp6_); + g_simple_action_set_state (_tmp3_, _tmp4_); #line 401 "/home/jens/Source/shotwell/src/Page.vala" - _g_variant_unref0 (_tmp6_); -#line 3963 "Page.c" + _g_variant_unref0 (_tmp4_); +#line 4616 "Page.c" } #line 398 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (action); -#line 3967 "Page.c" +#line 4620 "Page.c" } -static gboolean page_get_modifiers (Page* self, gboolean* ctrl, gboolean* alt, gboolean* shift, gboolean* super) { +static gboolean +page_get_modifiers (Page* self, + gboolean* ctrl, + gboolean* alt, + gboolean* shift, + gboolean* super) +{ gboolean _vala_ctrl = FALSE; gboolean _vala_alt = FALSE; gboolean _vala_shift = FALSE; @@ -4021,29 +4680,29 @@ static gboolean page_get_modifiers (Page* self, gboolean* ctrl, gboolean* alt, g if (ctrl) { #line 412 "/home/jens/Source/shotwell/src/Page.vala" *ctrl = _vala_ctrl; -#line 4025 "Page.c" +#line 4684 "Page.c" } #line 412 "/home/jens/Source/shotwell/src/Page.vala" if (alt) { #line 412 "/home/jens/Source/shotwell/src/Page.vala" *alt = _vala_alt; -#line 4031 "Page.c" +#line 4690 "Page.c" } #line 412 "/home/jens/Source/shotwell/src/Page.vala" if (shift) { #line 412 "/home/jens/Source/shotwell/src/Page.vala" *shift = _vala_shift; -#line 4037 "Page.c" +#line 4696 "Page.c" } #line 412 "/home/jens/Source/shotwell/src/Page.vala" if (super) { #line 412 "/home/jens/Source/shotwell/src/Page.vala" *super = _vala_super; -#line 4043 "Page.c" +#line 4702 "Page.c" } #line 412 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 4047 "Page.c" +#line 4706 "Page.c" } #line 417 "/home/jens/Source/shotwell/src/Page.vala" _tmp4_ = app_window_get_instance (); @@ -4089,33 +4748,35 @@ static gboolean page_get_modifiers (Page* self, gboolean* ctrl, gboolean* alt, g if (ctrl) { #line 425 "/home/jens/Source/shotwell/src/Page.vala" *ctrl = _vala_ctrl; -#line 4093 "Page.c" +#line 4752 "Page.c" } #line 425 "/home/jens/Source/shotwell/src/Page.vala" if (alt) { #line 425 "/home/jens/Source/shotwell/src/Page.vala" *alt = _vala_alt; -#line 4099 "Page.c" +#line 4758 "Page.c" } #line 425 "/home/jens/Source/shotwell/src/Page.vala" if (shift) { #line 425 "/home/jens/Source/shotwell/src/Page.vala" *shift = _vala_shift; -#line 4105 "Page.c" +#line 4764 "Page.c" } #line 425 "/home/jens/Source/shotwell/src/Page.vala" if (super) { #line 425 "/home/jens/Source/shotwell/src/Page.vala" *super = _vala_super; -#line 4111 "Page.c" +#line 4770 "Page.c" } #line 425 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 4115 "Page.c" +#line 4774 "Page.c" } -static void page_update_modifiers (Page* self) { +static void +page_update_modifiers (Page* self) +{ gboolean ctrl_currently_pressed = FALSE; gboolean alt_currently_pressed = FALSE; gboolean shift_currently_pressed = FALSE; @@ -4153,29 +4814,29 @@ static void page_update_modifiers (Page* self) { if (!_tmp4_) { #line 433 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 4157 "Page.c" +#line 4818 "Page.c" } #line 436 "/home/jens/Source/shotwell/src/Page.vala" _tmp6_ = self->priv->ctrl_pressed; #line 436 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp6_) { -#line 4163 "Page.c" +#line 4824 "Page.c" gboolean _tmp7_; #line 436 "/home/jens/Source/shotwell/src/Page.vala" _tmp7_ = ctrl_currently_pressed; #line 436 "/home/jens/Source/shotwell/src/Page.vala" _tmp5_ = !_tmp7_; -#line 4169 "Page.c" +#line 4830 "Page.c" } else { #line 436 "/home/jens/Source/shotwell/src/Page.vala" _tmp5_ = FALSE; -#line 4173 "Page.c" +#line 4834 "Page.c" } #line 436 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp5_) { #line 437 "/home/jens/Source/shotwell/src/Page.vala" page_on_ctrl_released (self, NULL); -#line 4179 "Page.c" +#line 4840 "Page.c" } else { gboolean _tmp8_ = FALSE; gboolean _tmp9_; @@ -4183,46 +4844,46 @@ static void page_update_modifiers (Page* self) { _tmp9_ = self->priv->ctrl_pressed; #line 438 "/home/jens/Source/shotwell/src/Page.vala" if (!_tmp9_) { -#line 4187 "Page.c" +#line 4848 "Page.c" gboolean _tmp10_; #line 438 "/home/jens/Source/shotwell/src/Page.vala" _tmp10_ = ctrl_currently_pressed; #line 438 "/home/jens/Source/shotwell/src/Page.vala" _tmp8_ = _tmp10_; -#line 4193 "Page.c" +#line 4854 "Page.c" } else { #line 438 "/home/jens/Source/shotwell/src/Page.vala" _tmp8_ = FALSE; -#line 4197 "Page.c" +#line 4858 "Page.c" } #line 438 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp8_) { #line 439 "/home/jens/Source/shotwell/src/Page.vala" page_on_ctrl_pressed (self, NULL); -#line 4203 "Page.c" +#line 4864 "Page.c" } } #line 441 "/home/jens/Source/shotwell/src/Page.vala" _tmp12_ = self->priv->alt_pressed; #line 441 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp12_) { -#line 4210 "Page.c" +#line 4871 "Page.c" gboolean _tmp13_; #line 441 "/home/jens/Source/shotwell/src/Page.vala" _tmp13_ = alt_currently_pressed; #line 441 "/home/jens/Source/shotwell/src/Page.vala" _tmp11_ = !_tmp13_; -#line 4216 "Page.c" +#line 4877 "Page.c" } else { #line 441 "/home/jens/Source/shotwell/src/Page.vala" _tmp11_ = FALSE; -#line 4220 "Page.c" +#line 4881 "Page.c" } #line 441 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp11_) { #line 442 "/home/jens/Source/shotwell/src/Page.vala" page_on_alt_released (self, NULL); -#line 4226 "Page.c" +#line 4887 "Page.c" } else { gboolean _tmp14_ = FALSE; gboolean _tmp15_; @@ -4230,46 +4891,46 @@ static void page_update_modifiers (Page* self) { _tmp15_ = self->priv->alt_pressed; #line 443 "/home/jens/Source/shotwell/src/Page.vala" if (!_tmp15_) { -#line 4234 "Page.c" +#line 4895 "Page.c" gboolean _tmp16_; #line 443 "/home/jens/Source/shotwell/src/Page.vala" _tmp16_ = alt_currently_pressed; #line 443 "/home/jens/Source/shotwell/src/Page.vala" _tmp14_ = _tmp16_; -#line 4240 "Page.c" +#line 4901 "Page.c" } else { #line 443 "/home/jens/Source/shotwell/src/Page.vala" _tmp14_ = FALSE; -#line 4244 "Page.c" +#line 4905 "Page.c" } #line 443 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp14_) { #line 444 "/home/jens/Source/shotwell/src/Page.vala" page_on_alt_pressed (self, NULL); -#line 4250 "Page.c" +#line 4911 "Page.c" } } #line 446 "/home/jens/Source/shotwell/src/Page.vala" _tmp18_ = self->priv->shift_pressed; #line 446 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp18_) { -#line 4257 "Page.c" +#line 4918 "Page.c" gboolean _tmp19_; #line 446 "/home/jens/Source/shotwell/src/Page.vala" _tmp19_ = shift_currently_pressed; #line 446 "/home/jens/Source/shotwell/src/Page.vala" _tmp17_ = !_tmp19_; -#line 4263 "Page.c" +#line 4924 "Page.c" } else { #line 446 "/home/jens/Source/shotwell/src/Page.vala" _tmp17_ = FALSE; -#line 4267 "Page.c" +#line 4928 "Page.c" } #line 446 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp17_) { #line 447 "/home/jens/Source/shotwell/src/Page.vala" page_on_shift_released (self, NULL); -#line 4273 "Page.c" +#line 4934 "Page.c" } else { gboolean _tmp20_ = FALSE; gboolean _tmp21_; @@ -4277,46 +4938,46 @@ static void page_update_modifiers (Page* self) { _tmp21_ = self->priv->shift_pressed; #line 448 "/home/jens/Source/shotwell/src/Page.vala" if (!_tmp21_) { -#line 4281 "Page.c" +#line 4942 "Page.c" gboolean _tmp22_; #line 448 "/home/jens/Source/shotwell/src/Page.vala" _tmp22_ = shift_currently_pressed; #line 448 "/home/jens/Source/shotwell/src/Page.vala" _tmp20_ = _tmp22_; -#line 4287 "Page.c" +#line 4948 "Page.c" } else { #line 448 "/home/jens/Source/shotwell/src/Page.vala" _tmp20_ = FALSE; -#line 4291 "Page.c" +#line 4952 "Page.c" } #line 448 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp20_) { #line 449 "/home/jens/Source/shotwell/src/Page.vala" page_on_shift_pressed (self, NULL); -#line 4297 "Page.c" +#line 4958 "Page.c" } } #line 451 "/home/jens/Source/shotwell/src/Page.vala" _tmp24_ = self->priv->super_pressed; #line 451 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp24_) { -#line 4304 "Page.c" +#line 4965 "Page.c" gboolean _tmp25_; #line 451 "/home/jens/Source/shotwell/src/Page.vala" _tmp25_ = super_currently_pressed; #line 451 "/home/jens/Source/shotwell/src/Page.vala" _tmp23_ = !_tmp25_; -#line 4310 "Page.c" +#line 4971 "Page.c" } else { #line 451 "/home/jens/Source/shotwell/src/Page.vala" _tmp23_ = FALSE; -#line 4314 "Page.c" +#line 4975 "Page.c" } #line 451 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp23_) { #line 452 "/home/jens/Source/shotwell/src/Page.vala" page_on_super_released (self, NULL); -#line 4320 "Page.c" +#line 4981 "Page.c" } else { gboolean _tmp26_ = FALSE; gboolean _tmp27_; @@ -4324,23 +4985,23 @@ static void page_update_modifiers (Page* self) { _tmp27_ = self->priv->super_pressed; #line 453 "/home/jens/Source/shotwell/src/Page.vala" if (!_tmp27_) { -#line 4328 "Page.c" +#line 4989 "Page.c" gboolean _tmp28_; #line 453 "/home/jens/Source/shotwell/src/Page.vala" _tmp28_ = super_currently_pressed; #line 453 "/home/jens/Source/shotwell/src/Page.vala" _tmp26_ = _tmp28_; -#line 4334 "Page.c" +#line 4995 "Page.c" } else { #line 453 "/home/jens/Source/shotwell/src/Page.vala" _tmp26_ = FALSE; -#line 4338 "Page.c" +#line 4999 "Page.c" } #line 453 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp26_) { #line 454 "/home/jens/Source/shotwell/src/Page.vala" page_on_super_pressed (self, NULL); -#line 4344 "Page.c" +#line 5005 "Page.c" } } #line 456 "/home/jens/Source/shotwell/src/Page.vala" @@ -4359,11 +5020,13 @@ static void page_update_modifiers (Page* self) { _tmp32_ = super_currently_pressed; #line 459 "/home/jens/Source/shotwell/src/Page.vala" self->priv->super_pressed = _tmp32_; -#line 4363 "Page.c" +#line 5024 "Page.c" } -PageWindow* page_get_page_window (Page* self) { +PageWindow* +page_get_page_window (Page* self) +{ PageWindow* result = NULL; GtkWidget* p = NULL; GtkContainer* _tmp0_; @@ -4381,7 +5044,7 @@ PageWindow* page_get_page_window (Page* self) { p = _tmp2_; #line 464 "/home/jens/Source/shotwell/src/Page.vala" while (TRUE) { -#line 4385 "Page.c" +#line 5048 "Page.c" GtkWidget* _tmp3_; GtkWidget* _tmp4_; GtkWidget* _tmp7_; @@ -4394,13 +5057,13 @@ PageWindow* page_get_page_window (Page* self) { if (!(_tmp3_ != NULL)) { #line 464 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 4398 "Page.c" +#line 5061 "Page.c" } #line 465 "/home/jens/Source/shotwell/src/Page.vala" _tmp4_ = p; #line 465 "/home/jens/Source/shotwell/src/Page.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_PAGE_WINDOW)) { -#line 4404 "Page.c" +#line 5067 "Page.c" GtkWidget* _tmp5_; PageWindow* _tmp6_; #line 466 "/home/jens/Source/shotwell/src/Page.vala" @@ -4413,7 +5076,7 @@ PageWindow* page_get_page_window (Page* self) { _g_object_unref0 (p); #line 466 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 4417 "Page.c" +#line 5080 "Page.c" } #line 468 "/home/jens/Source/shotwell/src/Page.vala" _tmp7_ = p; @@ -4427,7 +5090,7 @@ PageWindow* page_get_page_window (Page* self) { _g_object_unref0 (p); #line 468 "/home/jens/Source/shotwell/src/Page.vala" p = _tmp10_; -#line 4431 "Page.c" +#line 5094 "Page.c" } #line 471 "/home/jens/Source/shotwell/src/Page.vala" result = NULL; @@ -4435,11 +5098,13 @@ PageWindow* page_get_page_window (Page* self) { _g_object_unref0 (p); #line 471 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 4439 "Page.c" +#line 5102 "Page.c" } -CommandManager* page_get_command_manager (Page* self) { +CommandManager* +page_get_command_manager (Page* self) +{ CommandManager* result = NULL; CommandManager* _tmp0_; #line 474 "/home/jens/Source/shotwell/src/Page.vala" @@ -4450,113 +5115,127 @@ CommandManager* page_get_command_manager (Page* self) { result = _tmp0_; #line 475 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 4454 "Page.c" +#line 5119 "Page.c" } -static void page_real_add_actions (Page* self, GActionMap* map) { +static void +page_real_add_actions (Page* self, + GActionMap* map) +{ #line 478 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); -#line 4461 "Page.c" +#line 5129 "Page.c" } -void page_add_actions (Page* self, GActionMap* map) { +void +page_add_actions (Page* self, + GActionMap* map) +{ #line 478 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 478 "/home/jens/Source/shotwell/src/Page.vala" PAGE_GET_CLASS (self)->add_actions (self, map); -#line 4470 "Page.c" +#line 5141 "Page.c" } -static void page_real_remove_actions (Page* self, GActionMap* map) { +static void +page_real_remove_actions (Page* self, + GActionMap* map) +{ #line 479 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); -#line 4477 "Page.c" +#line 5151 "Page.c" } -void page_remove_actions (Page* self, GActionMap* map) { +void +page_remove_actions (Page* self, + GActionMap* map) +{ #line 479 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 479 "/home/jens/Source/shotwell/src/Page.vala" PAGE_GET_CLASS (self)->remove_actions (self, map); -#line 4486 "Page.c" +#line 5163 "Page.c" } -static gboolean _variant_get21 (GVariant* value) { +static gboolean +_variant_get21 (GVariant* value) +{ #line 482 "/home/jens/Source/shotwell/src/Page.vala" return g_variant_get_boolean (value); -#line 4493 "Page.c" +#line 5172 "Page.c" } -static GVariant* _variant_new22 (gboolean value) { +static GVariant* +_variant_new22 (gboolean value) +{ #line 482 "/home/jens/Source/shotwell/src/Page.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 4500 "Page.c" +#line 5181 "Page.c" } -void page_on_action_toggle (Page* self, GAction* action, GVariant* value) { +void +page_on_action_toggle (Page* self, + GAction* action, + GVariant* value) +{ GVariant* new_state = NULL; - GAction* _tmp0_; + GVariant* _tmp0_; GVariant* _tmp1_; - GVariant* _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; + GVariant* _tmp3_; GVariant* _tmp4_; - GVariant* _tmp5_; - GAction* _tmp6_; #line 481 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 481 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (G_IS_ACTION (action)); #line 482 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = action; + _tmp0_ = g_action_get_state (action); #line 482 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = g_action_get_state (_tmp0_); -#line 482 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 482 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = _variant_get21 (_tmp2_); + _tmp2_ = _variant_get21 (_tmp1_); #line 482 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = _variant_new22 (!_tmp3_); + _tmp3_ = _variant_new22 (!_tmp2_); #line 482 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 482 "/home/jens/Source/shotwell/src/Page.vala" - _g_variant_unref0 (_tmp2_); + _g_variant_unref0 (_tmp1_); #line 482 "/home/jens/Source/shotwell/src/Page.vala" - new_state = _tmp5_; -#line 483 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = action; + new_state = _tmp4_; #line 483 "/home/jens/Source/shotwell/src/Page.vala" - g_action_change_state (_tmp6_, new_state); + g_action_change_state (action, new_state); #line 481 "/home/jens/Source/shotwell/src/Page.vala" _g_variant_unref0 (new_state); -#line 4539 "Page.c" +#line 5218 "Page.c" } -void page_on_action_radio (Page* self, GAction* action, GVariant* value) { - GAction* _tmp0_; - GVariant* _tmp1_; +void +page_on_action_radio (Page* self, + GAction* action, + GVariant* value) +{ #line 486 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 486 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (G_IS_ACTION (action)); #line 487 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = action; -#line 487 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = value; -#line 487 "/home/jens/Source/shotwell/src/Page.vala" - g_action_change_state (_tmp0_, _tmp1_); -#line 4556 "Page.c" + g_action_change_state (action, value); +#line 5233 "Page.c" } -static void page_add_ui (Page* self) { +static void +page_add_ui (Page* self) +{ GeeList* ui_filenames = NULL; GeeArrayList* _tmp0_; GeeList* _tmp1_; @@ -4581,7 +5260,7 @@ static void page_add_ui (Page* self) { _tmp4_ = _tmp3_; #line 494 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp4_ == 0) { -#line 4585 "Page.c" +#line 5264 "Page.c" gchar* _tmp5_; gchar* _tmp6_; #line 495 "/home/jens/Source/shotwell/src/Page.vala" @@ -4592,7 +5271,7 @@ static void page_add_ui (Page* self) { g_message ("Page.vala:495: No UI file specified for %s", _tmp6_); #line 495 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (_tmp6_); -#line 4596 "Page.c" +#line 5275 "Page.c" } { GeeList* _ui_filename_list = NULL; @@ -4621,7 +5300,7 @@ static void page_add_ui (Page* self) { _ui_filename_index = -1; #line 497 "/home/jens/Source/shotwell/src/Page.vala" while (TRUE) { -#line 4625 "Page.c" +#line 5304 "Page.c" gint _tmp12_; gint _tmp13_; gint _tmp14_; @@ -4642,7 +5321,7 @@ static void page_add_ui (Page* self) { if (!(_tmp13_ < _tmp14_)) { #line 497 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 4646 "Page.c" +#line 5325 "Page.c" } #line 497 "/home/jens/Source/shotwell/src/Page.vala" _tmp15_ = _ui_filename_list; @@ -4658,89 +5337,105 @@ static void page_add_ui (Page* self) { page_init_load_ui (self, _tmp18_); #line 497 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (ui_filename); -#line 4662 "Page.c" +#line 5341 "Page.c" } #line 497 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (_ui_filename_list); -#line 4666 "Page.c" +#line 5345 "Page.c" } #line 490 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (ui_filenames); -#line 4670 "Page.c" +#line 5349 "Page.c" } -void page_init_toolbar (Page* self, const gchar* path) { - const gchar* _tmp0_; - gchar* _tmp1_; +void +page_init_toolbar (Page* self, + const gchar* path) +{ + gchar* _tmp0_; #line 503 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 503 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (path != NULL); #line 504 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = path; -#line 504 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (path); #line 504 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (self->priv->toolbar_path); #line 504 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->toolbar_path = _tmp1_; -#line 4689 "Page.c" + self->priv->toolbar_path = _tmp0_; +#line 5368 "Page.c" } -static void _page_on_update_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) { +static void +_page_on_update_actions_view_collection_items_state_changed (ViewCollection* _sender, + GeeIterable* changed, + gpointer self) +{ #line 519 "/home/jens/Source/shotwell/src/Page.vala" page_on_update_actions ((Page*) self); -#line 4696 "Page.c" +#line 5379 "Page.c" } -static void _page_on_update_actions_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) { +static void +_page_on_update_actions_view_collection_selection_group_altered (ViewCollection* _sender, + gpointer self) +{ #line 520 "/home/jens/Source/shotwell/src/Page.vala" page_on_update_actions ((Page*) self); -#line 4703 "Page.c" +#line 5389 "Page.c" } -static void _page_on_update_actions_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) { +static void +_page_on_update_actions_view_collection_items_visibility_changed (ViewCollection* _sender, + GeeCollection* changed, + gpointer self) +{ #line 521 "/home/jens/Source/shotwell/src/Page.vala" page_on_update_actions ((Page*) self); -#line 4710 "Page.c" +#line 5400 "Page.c" } -static void _page_on_update_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { +static void +_page_on_update_actions_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self) +{ #line 522 "/home/jens/Source/shotwell/src/Page.vala" page_on_update_actions ((Page*) self); -#line 4717 "Page.c" +#line 5412 "Page.c" } -static void page_attach_view_signals (Page* self) { +static void +page_attach_view_signals (Page* self) +{ gboolean _tmp0_; gint selected_count = 0; ViewCollection* _tmp1_; ViewCollection* _tmp2_; gint _tmp3_; - gint _tmp4_; gint count = 0; + ViewCollection* _tmp4_; ViewCollection* _tmp5_; - ViewCollection* _tmp6_; + gint _tmp6_; gint _tmp7_; gint _tmp8_; gint _tmp9_; gint _tmp10_; - gint _tmp11_; - gint _tmp12_; + ViewCollection* _tmp11_; + ViewCollection* _tmp12_; ViewCollection* _tmp13_; ViewCollection* _tmp14_; ViewCollection* _tmp15_; ViewCollection* _tmp16_; ViewCollection* _tmp17_; ViewCollection* _tmp18_; - ViewCollection* _tmp19_; - ViewCollection* _tmp20_; #line 508 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 509 "/home/jens/Source/shotwell/src/Page.vala" @@ -4749,7 +5444,7 @@ static void page_attach_view_signals (Page* self) { if (_tmp0_) { #line 510 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 4753 "Page.c" +#line 5448 "Page.c" } #line 513 "/home/jens/Source/shotwell/src/Page.vala" _tmp1_ = page_get_view (self); @@ -4757,75 +5452,73 @@ static void page_attach_view_signals (Page* self) { _tmp2_ = _tmp1_; #line 513 "/home/jens/Source/shotwell/src/Page.vala" _tmp3_ = view_collection_get_selected_count (_tmp2_); -#line 513 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = _tmp3_; #line 513 "/home/jens/Source/shotwell/src/Page.vala" _data_collection_unref0 (_tmp2_); #line 513 "/home/jens/Source/shotwell/src/Page.vala" - selected_count = _tmp4_; -#line 514 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = page_get_view (self); + selected_count = _tmp3_; #line 514 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = _tmp5_; + _tmp4_ = page_get_view (self); #line 514 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp5_ = _tmp4_; #line 514 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = _tmp7_; + _tmp6_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection)); #line 514 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp6_); + _data_collection_unref0 (_tmp5_); #line 514 "/home/jens/Source/shotwell/src/Page.vala" - count = _tmp8_; + count = _tmp6_; #line 515 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = selected_count; + _tmp7_ = selected_count; #line 515 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = count; + _tmp8_ = count; #line 515 "/home/jens/Source/shotwell/src/Page.vala" - page_init_actions (self, _tmp9_, _tmp10_); + page_init_actions (self, _tmp7_, _tmp8_); #line 516 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = selected_count; + _tmp9_ = selected_count; #line 516 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = count; + _tmp10_ = count; #line 516 "/home/jens/Source/shotwell/src/Page.vala" - page_update_actions (self, _tmp11_, _tmp12_); + page_update_actions (self, _tmp9_, _tmp10_); #line 519 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = page_get_view (self); + _tmp11_ = page_get_view (self); #line 519 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 519 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (_tmp14_, "items-state-changed", (GCallback) _page_on_update_actions_view_collection_items_state_changed, self, 0); + g_signal_connect_object (_tmp12_, "items-state-changed", (GCallback) _page_on_update_actions_view_collection_items_state_changed, self, 0); #line 519 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp14_); + _data_collection_unref0 (_tmp12_); #line 520 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = page_get_view (self); + _tmp13_ = page_get_view (self); #line 520 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = _tmp15_; + _tmp14_ = _tmp13_; #line 520 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (_tmp16_, "selection-group-altered", (GCallback) _page_on_update_actions_view_collection_selection_group_altered, self, 0); + g_signal_connect_object (_tmp14_, "selection-group-altered", (GCallback) _page_on_update_actions_view_collection_selection_group_altered, self, 0); #line 520 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp16_); + _data_collection_unref0 (_tmp14_); #line 521 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = page_get_view (self); + _tmp15_ = page_get_view (self); #line 521 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = _tmp17_; + _tmp16_ = _tmp15_; #line 521 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (_tmp18_, "items-visibility-changed", (GCallback) _page_on_update_actions_view_collection_items_visibility_changed, self, 0); + g_signal_connect_object (_tmp16_, "items-visibility-changed", (GCallback) _page_on_update_actions_view_collection_items_visibility_changed, self, 0); #line 521 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp18_); + _data_collection_unref0 (_tmp16_); #line 522 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = page_get_view (self); + _tmp17_ = page_get_view (self); #line 522 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = _tmp19_; + _tmp18_ = _tmp17_; #line 522 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _page_on_update_actions_data_collection_contents_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _page_on_update_actions_data_collection_contents_altered, self, 0); #line 522 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp20_); + _data_collection_unref0 (_tmp18_); #line 524 "/home/jens/Source/shotwell/src/Page.vala" self->priv->are_actions_attached = TRUE; -#line 4825 "Page.c" +#line 5516 "Page.c" } -static void page_detach_view_signals (Page* self) { +static void +page_detach_view_signals (Page* self) +{ gboolean _tmp0_; ViewCollection* _tmp1_; ViewCollection* _tmp2_; @@ -4847,7 +5540,7 @@ static void page_detach_view_signals (Page* self) { if (!_tmp0_) { #line 530 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 4851 "Page.c" +#line 5544 "Page.c" } #line 532 "/home/jens/Source/shotwell/src/Page.vala" _tmp1_ = page_get_view (self); @@ -4891,18 +5584,22 @@ static void page_detach_view_signals (Page* self) { _data_collection_unref0 (_tmp11_); #line 537 "/home/jens/Source/shotwell/src/Page.vala" self->priv->are_actions_attached = FALSE; -#line 4895 "Page.c" +#line 5588 "Page.c" } -static void _page_on_update_actions_on_idle_one_shot_callback (gpointer self) { +static void +_page_on_update_actions_on_idle_one_shot_callback (gpointer self) +{ #line 542 "/home/jens/Source/shotwell/src/Page.vala" page_on_update_actions_on_idle ((Page*) self); -#line 4902 "Page.c" +#line 5597 "Page.c" } -static void page_on_update_actions (Page* self) { +static void +page_on_update_actions (Page* self) +{ OneShotScheduler* _tmp0_; OneShotScheduler* _tmp6_; #line 540 "/home/jens/Source/shotwell/src/Page.vala" @@ -4911,7 +5608,7 @@ static void page_on_update_actions (Page* self) { _tmp0_ = self->priv->update_actions_scheduler; #line 541 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp0_ == NULL) { -#line 4915 "Page.c" +#line 5612 "Page.c" gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; @@ -4935,25 +5632,25 @@ static void page_on_update_actions (Page* self) { _g_free0 (_tmp4_); #line 542 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (_tmp2_); -#line 4939 "Page.c" +#line 5636 "Page.c" } #line 547 "/home/jens/Source/shotwell/src/Page.vala" _tmp6_ = self->priv->update_actions_scheduler; #line 547 "/home/jens/Source/shotwell/src/Page.vala" one_shot_scheduler_at_priority_idle (_tmp6_, G_PRIORITY_LOW); -#line 4945 "Page.c" +#line 5642 "Page.c" } -static void page_on_update_actions_on_idle (Page* self) { +static void +page_on_update_actions_on_idle (Page* self) +{ gboolean _tmp0_; gboolean _tmp1_; ViewCollection* _tmp2_; ViewCollection* _tmp3_; - gint _tmp4_; + ViewCollection* _tmp4_; ViewCollection* _tmp5_; - ViewCollection* _tmp6_; - gint _tmp7_; #line 550 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 551 "/home/jens/Source/shotwell/src/Page.vala" @@ -4962,7 +5659,7 @@ static void page_on_update_actions_on_idle (Page* self) { if (_tmp0_) { #line 552 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 4966 "Page.c" +#line 5663 "Page.c" } #line 554 "/home/jens/Source/shotwell/src/Page.vala" _tmp1_ = self->in_view; @@ -4970,98 +5667,94 @@ static void page_on_update_actions_on_idle (Page* self) { if (!_tmp1_) { #line 555 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 4974 "Page.c" +#line 5671 "Page.c" } #line 557 "/home/jens/Source/shotwell/src/Page.vala" _tmp2_ = page_get_view (self); #line 557 "/home/jens/Source/shotwell/src/Page.vala" _tmp3_ = _tmp2_; #line 557 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = view_collection_get_selected_count (_tmp3_); -#line 557 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = page_get_view (self); -#line 557 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = _tmp5_; + _tmp4_ = page_get_view (self); #line 557 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp5_ = _tmp4_; #line 557 "/home/jens/Source/shotwell/src/Page.vala" - page_update_actions (self, _tmp4_, _tmp7_); + page_update_actions (self, view_collection_get_selected_count (_tmp3_), data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection))); #line 557 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp6_); + _data_collection_unref0 (_tmp5_); #line 557 "/home/jens/Source/shotwell/src/Page.vala" _data_collection_unref0 (_tmp3_); -#line 4994 "Page.c" +#line 5687 "Page.c" } -static void page_init_load_ui (Page* self, const gchar* ui_filename) { +static void +page_init_load_ui (Page* self, + const gchar* ui_filename) +{ gchar* ui_resource = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; GError * _inner_error_ = NULL; #line 560 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 560 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (ui_filename != NULL); #line 561 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = ui_filename; -#line 561 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = resources_get_ui (_tmp0_); + _tmp0_ = resources_get_ui (ui_filename); #line 561 "/home/jens/Source/shotwell/src/Page.vala" - ui_resource = _tmp1_; -#line 5013 "Page.c" + ui_resource = _tmp0_; +#line 5706 "Page.c" { - GtkBuilder* _tmp2_; + GtkBuilder* _tmp1_; #line 563 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = self->builder; + _tmp1_ = self->builder; #line 563 "/home/jens/Source/shotwell/src/Page.vala" - gtk_builder_add_from_resource (_tmp2_, ui_resource, &_inner_error_); + gtk_builder_add_from_resource (_tmp1_, ui_resource, &_inner_error_); #line 563 "/home/jens/Source/shotwell/src/Page.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5022 "Page.c" +#line 5715 "Page.c" goto __catch266_g_error; } #line 564 "/home/jens/Source/shotwell/src/Page.vala" self->priv->menubar_injected = FALSE; -#line 5027 "Page.c" +#line 5720 "Page.c" } goto __finally266; __catch266_g_error: { GError* err = NULL; - GError* _tmp3_; - const gchar* _tmp4_; + GError* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; + Application* _tmp6_; Application* _tmp7_; - Application* _tmp8_; #line 562 "/home/jens/Source/shotwell/src/Page.vala" err = _inner_error_; #line 562 "/home/jens/Source/shotwell/src/Page.vala" _inner_error_ = NULL; #line 566 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = err; + _tmp2_ = err; #line 566 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = _tmp3_->message; + _tmp3_ = _tmp2_->message; #line 566 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = g_strdup_printf ("Error loading UI resource %s: %s", ui_resource, _tmp4_); + _tmp4_ = g_strdup_printf ("Error loading UI resource %s: %s", ui_resource, _tmp3_); #line 566 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 566 "/home/jens/Source/shotwell/src/Page.vala" - app_window_error_message (_tmp6_, NULL); + app_window_error_message (_tmp5_, NULL); #line 566 "/home/jens/Source/shotwell/src/Page.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 568 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = application_get_instance (); + _tmp6_ = application_get_instance (); #line 568 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 568 "/home/jens/Source/shotwell/src/Page.vala" - application_panic (_tmp8_); + application_panic (_tmp7_); #line 568 "/home/jens/Source/shotwell/src/Page.vala" - _application_unref0 (_tmp8_); + _application_unref0 (_tmp7_); #line 562 "/home/jens/Source/shotwell/src/Page.vala" _g_error_free0 (err); -#line 5065 "Page.c" +#line 5758 "Page.c" } __finally266: #line 562 "/home/jens/Source/shotwell/src/Page.vala" @@ -5074,31 +5767,40 @@ static void page_init_load_ui (Page* self, const gchar* ui_filename) { g_clear_error (&_inner_error_); #line 562 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 5078 "Page.c" +#line 5771 "Page.c" } #line 560 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (ui_resource); -#line 5082 "Page.c" +#line 5775 "Page.c" } -static void page_real_init_collect_ui_filenames (Page* self, GeeList* ui_filenames) { +static void +page_real_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames) +{ #line 575 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); -#line 5089 "Page.c" +#line 5785 "Page.c" } -void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames) { +void +page_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames) +{ #line 575 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 575 "/home/jens/Source/shotwell/src/Page.vala" PAGE_GET_CLASS (self)->init_collect_ui_filenames (self, ui_filenames); -#line 5098 "Page.c" +#line 5797 "Page.c" } -static InjectionGroup** page_real_init_collect_injection_groups (Page* self, int* result_length1) { +static InjectionGroup** +page_real_init_collect_injection_groups (Page* self, + int* result_length1) +{ InjectionGroup** result = NULL; InjectionGroup** _tmp0_; InjectionGroup** _tmp1_; @@ -5113,100 +5815,145 @@ static InjectionGroup** page_real_init_collect_injection_groups (Page* self, int if (result_length1) { #line 581 "/home/jens/Source/shotwell/src/Page.vala" *result_length1 = _tmp1__length1; -#line 5117 "Page.c" +#line 5819 "Page.c" } #line 581 "/home/jens/Source/shotwell/src/Page.vala" result = _tmp1_; #line 581 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5123 "Page.c" +#line 5825 "Page.c" } -InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1) { +InjectionGroup** +page_init_collect_injection_groups (Page* self, + int* result_length1) +{ #line 580 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), NULL); #line 580 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->init_collect_injection_groups (self, result_length1); -#line 5132 "Page.c" +#line 5837 "Page.c" } -static void page_real_init_actions (Page* self, gint selected_count, gint count) { +static void +page_real_init_actions (Page* self, + gint selected_count, + gint count) +{ } -void page_init_actions (Page* self, gint selected_count, gint count) { +void +page_init_actions (Page* self, + gint selected_count, + gint count) +{ #line 586 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 586 "/home/jens/Source/shotwell/src/Page.vala" PAGE_GET_CLASS (self)->init_actions (self, selected_count, count); -#line 5145 "Page.c" +#line 5858 "Page.c" } -static void page_real_update_actions (Page* self, gint selected_count, gint count) { +static void +page_real_update_actions (Page* self, + gint selected_count, + gint count) +{ } -void page_update_actions (Page* self, gint selected_count, gint count) { +void +page_update_actions (Page* self, + gint selected_count, + gint count) +{ #line 592 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 592 "/home/jens/Source/shotwell/src/Page.vala" PAGE_GET_CLASS (self)->update_actions (self, selected_count, count); -#line 5158 "Page.c" +#line 5879 "Page.c" } -static void _page_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self) { +static void +_page_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, + GdkDragContext* context, + gpointer self) +{ #line 607 "/home/jens/Source/shotwell/src/Page.vala" page_on_drag_begin ((Page*) self, context); -#line 5165 "Page.c" +#line 5890 "Page.c" } -static void _page_on_drag_data_get_gtk_widget_drag_data_get (GtkWidget* _sender, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint time_, gpointer self) { +static void +_page_on_drag_data_get_gtk_widget_drag_data_get (GtkWidget* _sender, + GdkDragContext* context, + GtkSelectionData* selection_data, + guint info, + guint time_, + gpointer self) +{ #line 608 "/home/jens/Source/shotwell/src/Page.vala" page_on_drag_data_get ((Page*) self, context, selection_data, info, time_); -#line 5172 "Page.c" +#line 5904 "Page.c" } -static void _page_on_drag_data_delete_gtk_widget_drag_data_delete (GtkWidget* _sender, GdkDragContext* context, gpointer self) { +static void +_page_on_drag_data_delete_gtk_widget_drag_data_delete (GtkWidget* _sender, + GdkDragContext* context, + gpointer self) +{ #line 609 "/home/jens/Source/shotwell/src/Page.vala" page_on_drag_data_delete ((Page*) self, context); -#line 5179 "Page.c" +#line 5915 "Page.c" } -static void _page_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) { +static void +_page_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, + GdkDragContext* context, + gpointer self) +{ #line 610 "/home/jens/Source/shotwell/src/Page.vala" page_on_drag_end ((Page*) self, context); -#line 5186 "Page.c" +#line 5926 "Page.c" } -static gboolean _page_on_drag_failed_gtk_widget_drag_failed (GtkWidget* _sender, GdkDragContext* context, GtkDragResult _result_, gpointer self) { +static gboolean +_page_on_drag_failed_gtk_widget_drag_failed (GtkWidget* _sender, + GdkDragContext* context, + GtkDragResult _result_, + gpointer self) +{ gboolean result; result = page_on_drag_failed ((Page*) self, context, _result_); #line 611 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5195 "Page.c" +#line 5940 "Page.c" } -void page_enable_drag_source (Page* self, GdkDragAction actions, GtkTargetEntry* source_target_entries, int source_target_entries_length1) { +void +page_enable_drag_source (Page* self, + GdkDragAction actions, + GtkTargetEntry* source_target_entries, + int source_target_entries_length1) +{ gboolean _tmp0_; GtkWidget* _tmp1_; GtkWidget* _tmp2_; - GtkTargetEntry* _tmp3_; - gint _tmp3__length1; - GdkDragAction _tmp4_; + GtkWidget* _tmp3_; + GtkWidget* _tmp4_; GtkWidget* _tmp5_; GtkWidget* _tmp6_; GtkWidget* _tmp7_; - GtkWidget* _tmp8_; - GtkWidget* _tmp9_; #line 597 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 598 "/home/jens/Source/shotwell/src/Page.vala" @@ -5215,7 +5962,7 @@ void page_enable_drag_source (Page* self, GdkDragAction actions, GtkTargetEntry* if (_tmp0_) { #line 599 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 5219 "Page.c" +#line 5966 "Page.c" } #line 601 "/home/jens/Source/shotwell/src/Page.vala" _tmp1_ = self->priv->event_source; @@ -5224,40 +5971,36 @@ void page_enable_drag_source (Page* self, GdkDragAction actions, GtkTargetEntry* #line 603 "/home/jens/Source/shotwell/src/Page.vala" _tmp2_ = self->priv->event_source; #line 603 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = source_target_entries; -#line 603 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3__length1 = source_target_entries_length1; -#line 603 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = actions; -#line 603 "/home/jens/Source/shotwell/src/Page.vala" - gtk_drag_source_set (_tmp2_, GDK_BUTTON1_MASK, _tmp3_, _tmp3__length1, _tmp4_); + gtk_drag_source_set (_tmp2_, GDK_BUTTON1_MASK, source_target_entries, source_target_entries_length1, actions); #line 607 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = self->priv->event_source; + _tmp3_ = self->priv->event_source; #line 607 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (_tmp5_, "drag-begin", (GCallback) _page_on_drag_begin_gtk_widget_drag_begin, self, 0); + g_signal_connect_object (_tmp3_, "drag-begin", (GCallback) _page_on_drag_begin_gtk_widget_drag_begin, self, 0); #line 608 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = self->priv->event_source; + _tmp4_ = self->priv->event_source; #line 608 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (_tmp6_, "drag-data-get", (GCallback) _page_on_drag_data_get_gtk_widget_drag_data_get, self, 0); + g_signal_connect_object (_tmp4_, "drag-data-get", (GCallback) _page_on_drag_data_get_gtk_widget_drag_data_get, self, 0); #line 609 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = self->priv->event_source; + _tmp5_ = self->priv->event_source; #line 609 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (_tmp7_, "drag-data-delete", (GCallback) _page_on_drag_data_delete_gtk_widget_drag_data_delete, self, 0); + g_signal_connect_object (_tmp5_, "drag-data-delete", (GCallback) _page_on_drag_data_delete_gtk_widget_drag_data_delete, self, 0); #line 610 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = self->priv->event_source; + _tmp6_ = self->priv->event_source; #line 610 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (_tmp8_, "drag-end", (GCallback) _page_on_drag_end_gtk_widget_drag_end, self, 0); + g_signal_connect_object (_tmp6_, "drag-end", (GCallback) _page_on_drag_end_gtk_widget_drag_end, self, 0); #line 611 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = self->priv->event_source; + _tmp7_ = self->priv->event_source; #line 611 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (_tmp9_, "drag-failed", (GCallback) _page_on_drag_failed_gtk_widget_drag_failed, self, 0); + g_signal_connect_object (_tmp7_, "drag-failed", (GCallback) _page_on_drag_failed_gtk_widget_drag_failed, self, 0); #line 613 "/home/jens/Source/shotwell/src/Page.vala" self->priv->dnd_enabled = TRUE; -#line 5257 "Page.c" +#line 5998 "Page.c" } -void page_disable_drag_source (Page* self) { +void +page_disable_drag_source (Page* self) +{ gboolean _tmp0_; GtkWidget* _tmp1_; GtkWidget* _tmp2_; @@ -5279,7 +6022,7 @@ void page_disable_drag_source (Page* self) { if (!_tmp0_) { #line 618 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 5283 "Page.c" +#line 6026 "Page.c" } #line 620 "/home/jens/Source/shotwell/src/Page.vala" _tmp1_ = self->priv->event_source; @@ -5321,11 +6064,13 @@ void page_disable_drag_source (Page* self) { gtk_drag_source_unset (_tmp12_); #line 629 "/home/jens/Source/shotwell/src/Page.vala" self->priv->dnd_enabled = FALSE; -#line 5325 "Page.c" +#line 6068 "Page.c" } -gboolean page_is_dnd_enabled (Page* self) { +gboolean +page_is_dnd_enabled (Page* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 632 "/home/jens/Source/shotwell/src/Page.vala" @@ -5336,29 +6081,31 @@ gboolean page_is_dnd_enabled (Page* self) { result = _tmp0_; #line 633 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5340 "Page.c" +#line 6085 "Page.c" } -static void page_on_drag_begin (Page* self, GdkDragContext* context) { - GdkDragContext* _tmp0_; +static void +page_on_drag_begin (Page* self, + GdkDragContext* context) +{ #line 636 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 636 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (GDK_IS_DRAG_CONTEXT (context)); #line 637 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = context; -#line 637 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-begin", _tmp0_); -#line 5354 "Page.c" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-begin", context); +#line 6099 "Page.c" } -static void page_on_drag_data_get (Page* self, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint time) { - GdkDragContext* _tmp0_; - GtkSelectionData* _tmp1_; - guint _tmp2_; - guint _tmp3_; +static void +page_on_drag_data_get (Page* self, + GdkDragContext* context, + GtkSelectionData* selection_data, + guint info, + guint time) +{ #line 640 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 640 "/home/jens/Source/shotwell/src/Page.vala" @@ -5366,48 +6113,44 @@ static void page_on_drag_data_get (Page* self, GdkDragContext* context, GtkSelec #line 640 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (selection_data != NULL); #line 642 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = context; -#line 642 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = selection_data; -#line 642 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = info; -#line 642 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = time; -#line 642 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-data-get", _tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 5379 "Page.c" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-data-get", context, selection_data, info, time); +#line 6118 "Page.c" } -static void page_on_drag_data_delete (Page* self, GdkDragContext* context) { - GdkDragContext* _tmp0_; +static void +page_on_drag_data_delete (Page* self, + GdkDragContext* context) +{ #line 645 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 645 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (GDK_IS_DRAG_CONTEXT (context)); #line 646 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = context; -#line 646 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-data-delete", _tmp0_); -#line 5393 "Page.c" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-data-delete", context); +#line 6132 "Page.c" } -static void page_on_drag_end (Page* self, GdkDragContext* context) { - GdkDragContext* _tmp0_; +static void +page_on_drag_end (Page* self, + GdkDragContext* context) +{ #line 649 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 649 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (GDK_IS_DRAG_CONTEXT (context)); #line 650 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = context; -#line 650 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-end", _tmp0_); -#line 5407 "Page.c" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-end", context); +#line 6146 "Page.c" } -static gboolean page_real_source_drag_failed (Page* self, GdkDragContext* context, GtkDragResult drag_result) { +static gboolean +page_real_source_drag_failed (Page* self, + GdkDragContext* context, + GtkDragResult drag_result) +{ gboolean result = FALSE; #line 657 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE); @@ -5415,43 +6158,47 @@ static gboolean page_real_source_drag_failed (Page* self, GdkDragContext* contex result = FALSE; #line 658 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5419 "Page.c" +#line 6162 "Page.c" } -gboolean page_source_drag_failed (Page* self, GdkDragContext* context, GtkDragResult drag_result) { +gboolean +page_source_drag_failed (Page* self, + GdkDragContext* context, + GtkDragResult drag_result) +{ #line 657 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 657 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->source_drag_failed (self, context, drag_result); -#line 5428 "Page.c" +#line 6175 "Page.c" } -static gboolean page_on_drag_failed (Page* self, GdkDragContext* context, GtkDragResult drag_result) { +static gboolean +page_on_drag_failed (Page* self, + GdkDragContext* context, + GtkDragResult drag_result) +{ gboolean result = FALSE; - GdkDragContext* _tmp0_; - GtkDragResult _tmp1_; - gboolean _tmp2_; #line 661 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 661 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE); #line 662 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = context; -#line 662 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = drag_result; -#line 662 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = page_source_drag_failed (self, _tmp0_, _tmp1_); -#line 662 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp2_; + result = page_source_drag_failed (self, context, drag_result); #line 662 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5451 "Page.c" +#line 6193 "Page.c" } -gboolean page_get_event_source_pointer (Page* self, gint* x, gint* y, GdkModifierType* mask) { +gboolean +page_get_event_source_pointer (Page* self, + gint* x, + gint* y, + GdkModifierType* mask) +{ gint _vala_x = 0; gint _vala_y = 0; GdkModifierType _vala_mask = 0; @@ -5471,11 +6218,9 @@ gboolean page_get_event_source_pointer (Page* self, gint* x, gint* y, GdkModifie gint _tmp14_; GdkPoint _tmp15_; gint _tmp16_; - gint _tmp17_; - gint _tmp19_; - GdkPoint _tmp20_; - gint _tmp21_; - gint _tmp22_; + gint _tmp18_; + GdkPoint _tmp19_; + gint _tmp20_; #line 669 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 670 "/home/jens/Source/shotwell/src/Page.vala" @@ -5494,23 +6239,23 @@ gboolean page_get_event_source_pointer (Page* self, gint* x, gint* y, GdkModifie if (x) { #line 675 "/home/jens/Source/shotwell/src/Page.vala" *x = _vala_x; -#line 5498 "Page.c" +#line 6243 "Page.c" } #line 675 "/home/jens/Source/shotwell/src/Page.vala" if (y) { #line 675 "/home/jens/Source/shotwell/src/Page.vala" *y = _vala_y; -#line 5504 "Page.c" +#line 6249 "Page.c" } #line 675 "/home/jens/Source/shotwell/src/Page.vala" if (mask) { #line 675 "/home/jens/Source/shotwell/src/Page.vala" *mask = _vala_mask; -#line 5510 "Page.c" +#line 6255 "Page.c" } #line 675 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5514 "Page.c" +#line 6259 "Page.c" } #line 678 "/home/jens/Source/shotwell/src/Page.vala" _tmp1_ = self->priv->event_source; @@ -5538,7 +6283,7 @@ gboolean page_get_event_source_pointer (Page* self, gint* x, gint* y, GdkModifie if (_tmp11_ < 0) { #line 681 "/home/jens/Source/shotwell/src/Page.vala" _tmp9_ = TRUE; -#line 5542 "Page.c" +#line 6287 "Page.c" } else { GdkPoint _tmp12_; gint _tmp13_; @@ -5548,7 +6293,7 @@ gboolean page_get_event_source_pointer (Page* self, gint* x, gint* y, GdkModifie _tmp13_ = _tmp12_.y; #line 681 "/home/jens/Source/shotwell/src/Page.vala" _tmp9_ = _tmp13_ < 0; -#line 5552 "Page.c" +#line 6297 "Page.c" } #line 681 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp9_) { @@ -5558,23 +6303,23 @@ gboolean page_get_event_source_pointer (Page* self, gint* x, gint* y, GdkModifie if (x) { #line 682 "/home/jens/Source/shotwell/src/Page.vala" *x = _vala_x; -#line 5562 "Page.c" +#line 6307 "Page.c" } #line 682 "/home/jens/Source/shotwell/src/Page.vala" if (y) { #line 682 "/home/jens/Source/shotwell/src/Page.vala" *y = _vala_y; -#line 5568 "Page.c" +#line 6313 "Page.c" } #line 682 "/home/jens/Source/shotwell/src/Page.vala" if (mask) { #line 682 "/home/jens/Source/shotwell/src/Page.vala" *mask = _vala_mask; -#line 5574 "Page.c" +#line 6319 "Page.c" } #line 682 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5578 "Page.c" +#line 6323 "Page.c" } #line 688 "/home/jens/Source/shotwell/src/Page.vala" _tmp14_ = _vala_x; @@ -5583,34 +6328,30 @@ gboolean page_get_event_source_pointer (Page* self, gint* x, gint* y, GdkModifie #line 688 "/home/jens/Source/shotwell/src/Page.vala" _tmp16_ = _tmp15_.x; #line 688 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = abs (_tmp14_ - _tmp16_); -#line 688 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp17_ >= 0x7FFF) { -#line 5590 "Page.c" - gint _tmp18_; + if (abs (_tmp14_ - _tmp16_) >= 0x7FFF) { +#line 6333 "Page.c" + gint _tmp17_; #line 689 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = _vala_x; + _tmp17_ = _vala_x; #line 689 "/home/jens/Source/shotwell/src/Page.vala" - _vala_x = _tmp18_ + 0xFFFF; -#line 5596 "Page.c" + _vala_x = _tmp17_ + 0xFFFF; +#line 6339 "Page.c" } #line 691 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = _vala_y; + _tmp18_ = _vala_y; #line 691 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = self->priv->last_down; + _tmp19_ = self->priv->last_down; #line 691 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = _tmp20_.y; + _tmp20_ = _tmp19_.y; #line 691 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = abs (_tmp19_ - _tmp21_); -#line 691 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp22_ >= 0x7FFF) { -#line 5608 "Page.c" - gint _tmp23_; + if (abs (_tmp18_ - _tmp20_) >= 0x7FFF) { +#line 6349 "Page.c" + gint _tmp21_; #line 692 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = _vala_y; + _tmp21_ = _vala_y; #line 692 "/home/jens/Source/shotwell/src/Page.vala" - _vala_y = _tmp23_ + 0xFFFF; -#line 5614 "Page.c" + _vala_y = _tmp21_ + 0xFFFF; +#line 6355 "Page.c" } #line 694 "/home/jens/Source/shotwell/src/Page.vala" result = TRUE; @@ -5618,27 +6359,30 @@ gboolean page_get_event_source_pointer (Page* self, gint* x, gint* y, GdkModifie if (x) { #line 694 "/home/jens/Source/shotwell/src/Page.vala" *x = _vala_x; -#line 5622 "Page.c" +#line 6363 "Page.c" } #line 694 "/home/jens/Source/shotwell/src/Page.vala" if (y) { #line 694 "/home/jens/Source/shotwell/src/Page.vala" *y = _vala_y; -#line 5628 "Page.c" +#line 6369 "Page.c" } #line 694 "/home/jens/Source/shotwell/src/Page.vala" if (mask) { #line 694 "/home/jens/Source/shotwell/src/Page.vala" *mask = _vala_mask; -#line 5634 "Page.c" +#line 6375 "Page.c" } #line 694 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5638 "Page.c" +#line 6379 "Page.c" } -static gboolean page_real_on_left_click (Page* self, GdkEventButton* event) { +static gboolean +page_real_on_left_click (Page* self, + GdkEventButton* event) +{ gboolean result = FALSE; #line 697 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); @@ -5646,20 +6390,26 @@ static gboolean page_real_on_left_click (Page* self, GdkEventButton* event) { result = FALSE; #line 698 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5650 "Page.c" +#line 6394 "Page.c" } -gboolean page_on_left_click (Page* self, GdkEventButton* event) { +gboolean +page_on_left_click (Page* self, + GdkEventButton* event) +{ #line 697 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 697 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_left_click (self, event); -#line 5659 "Page.c" +#line 6406 "Page.c" } -static gboolean page_real_on_middle_click (Page* self, GdkEventButton* event) { +static gboolean +page_real_on_middle_click (Page* self, + GdkEventButton* event) +{ gboolean result = FALSE; #line 701 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); @@ -5667,20 +6417,26 @@ static gboolean page_real_on_middle_click (Page* self, GdkEventButton* event) { result = FALSE; #line 702 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5671 "Page.c" +#line 6421 "Page.c" } -gboolean page_on_middle_click (Page* self, GdkEventButton* event) { +gboolean +page_on_middle_click (Page* self, + GdkEventButton* event) +{ #line 701 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 701 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_middle_click (self, event); -#line 5680 "Page.c" +#line 6433 "Page.c" } -static gboolean page_real_on_right_click (Page* self, GdkEventButton* event) { +static gboolean +page_real_on_right_click (Page* self, + GdkEventButton* event) +{ gboolean result = FALSE; #line 705 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); @@ -5688,20 +6444,26 @@ static gboolean page_real_on_right_click (Page* self, GdkEventButton* event) { result = FALSE; #line 706 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5692 "Page.c" +#line 6448 "Page.c" } -gboolean page_on_right_click (Page* self, GdkEventButton* event) { +gboolean +page_on_right_click (Page* self, + GdkEventButton* event) +{ #line 705 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 705 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_right_click (self, event); -#line 5701 "Page.c" +#line 6460 "Page.c" } -static gboolean page_real_on_left_released (Page* self, GdkEventButton* event) { +static gboolean +page_real_on_left_released (Page* self, + GdkEventButton* event) +{ gboolean result = FALSE; #line 709 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); @@ -5709,20 +6471,26 @@ static gboolean page_real_on_left_released (Page* self, GdkEventButton* event) { result = FALSE; #line 710 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5713 "Page.c" +#line 6475 "Page.c" } -gboolean page_on_left_released (Page* self, GdkEventButton* event) { +gboolean +page_on_left_released (Page* self, + GdkEventButton* event) +{ #line 709 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 709 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_left_released (self, event); -#line 5722 "Page.c" +#line 6487 "Page.c" } -static gboolean page_real_on_middle_released (Page* self, GdkEventButton* event) { +static gboolean +page_real_on_middle_released (Page* self, + GdkEventButton* event) +{ gboolean result = FALSE; #line 713 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); @@ -5730,20 +6498,26 @@ static gboolean page_real_on_middle_released (Page* self, GdkEventButton* event) result = FALSE; #line 714 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5734 "Page.c" +#line 6502 "Page.c" } -gboolean page_on_middle_released (Page* self, GdkEventButton* event) { +gboolean +page_on_middle_released (Page* self, + GdkEventButton* event) +{ #line 713 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 713 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_middle_released (self, event); -#line 5743 "Page.c" +#line 6514 "Page.c" } -static gboolean page_real_on_right_released (Page* self, GdkEventButton* event) { +static gboolean +page_real_on_right_released (Page* self, + GdkEventButton* event) +{ gboolean result = FALSE; #line 717 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); @@ -5751,109 +6525,88 @@ static gboolean page_real_on_right_released (Page* self, GdkEventButton* event) result = FALSE; #line 718 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5755 "Page.c" +#line 6529 "Page.c" } -gboolean page_on_right_released (Page* self, GdkEventButton* event) { +gboolean +page_on_right_released (Page* self, + GdkEventButton* event) +{ #line 717 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 717 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_right_released (self, event); -#line 5764 "Page.c" +#line 6541 "Page.c" } -static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* event) { +static gboolean +page_on_button_pressed_internal (Page* self, + GdkEventButton* event) +{ gboolean result = FALSE; - GdkEventButton* _tmp0_; - guint _tmp1_; + guint _tmp0_; #line 721 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 721 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); #line 722 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = event; -#line 722 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = _tmp0_->button; + _tmp0_ = event->button; #line 722 "/home/jens/Source/shotwell/src/Page.vala" - switch (_tmp1_) { + switch (_tmp0_) { #line 722 "/home/jens/Source/shotwell/src/Page.vala" case 1: -#line 5784 "Page.c" +#line 6561 "Page.c" { - GtkWidget* _tmp2_; - GdkEventButton* _tmp4_; - gdouble _tmp5_; - GdkEventButton* _tmp6_; - gdouble _tmp7_; - GdkEventButton* _tmp8_; - gboolean _tmp9_; + GtkWidget* _tmp1_; + gdouble _tmp3_; + gdouble _tmp4_; #line 724 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = self->priv->event_source; + _tmp1_ = self->priv->event_source; #line 724 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp2_ != NULL) { -#line 5797 "Page.c" - GtkWidget* _tmp3_; + if (_tmp1_ != NULL) { +#line 6570 "Page.c" + GtkWidget* _tmp2_; #line 725 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = self->priv->event_source; + _tmp2_ = self->priv->event_source; #line 725 "/home/jens/Source/shotwell/src/Page.vala" - gtk_widget_grab_focus (_tmp3_); -#line 5803 "Page.c" + gtk_widget_grab_focus (_tmp2_); +#line 6576 "Page.c" } #line 728 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = event; -#line 728 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = _tmp4_->x; + _tmp3_ = event->x; #line 728 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->last_down.x = (gint) _tmp5_; + self->priv->last_down.x = (gint) _tmp3_; #line 729 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = event; + _tmp4_ = event->y; #line 729 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = _tmp6_->y; -#line 729 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->last_down.y = (gint) _tmp7_; -#line 731 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = event; + self->priv->last_down.y = (gint) _tmp4_; #line 731 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = page_on_left_click (self, _tmp8_); -#line 731 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp9_; + result = page_on_left_click (self, event); #line 731 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5825 "Page.c" +#line 6590 "Page.c" } #line 722 "/home/jens/Source/shotwell/src/Page.vala" case 2: -#line 5829 "Page.c" +#line 6594 "Page.c" { - GdkEventButton* _tmp10_; - gboolean _tmp11_; -#line 734 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = event; -#line 734 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = page_on_middle_click (self, _tmp10_); #line 734 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp11_; + result = page_on_middle_click (self, event); #line 734 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5841 "Page.c" +#line 6600 "Page.c" } #line 722 "/home/jens/Source/shotwell/src/Page.vala" case 3: -#line 5845 "Page.c" +#line 6604 "Page.c" { - GdkEventButton* _tmp12_; - gboolean _tmp13_; -#line 737 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = event; #line 737 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = page_on_right_click (self, _tmp12_); -#line 737 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp13_; + result = page_on_right_click (self, event); #line 737 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5857 "Page.c" +#line 6610 "Page.c" } default: { @@ -5861,80 +6614,62 @@ static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* eve result = FALSE; #line 740 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5865 "Page.c" +#line 6618 "Page.c" } } } -static gboolean page_on_button_released_internal (Page* self, GdkEventButton* event) { +static gboolean +page_on_button_released_internal (Page* self, + GdkEventButton* event) +{ gboolean result = FALSE; - GdkEventButton* _tmp0_; - guint _tmp1_; + guint _tmp0_; #line 744 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 744 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); #line 745 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = event; + _tmp0_ = event->button; #line 745 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = _tmp0_->button; -#line 745 "/home/jens/Source/shotwell/src/Page.vala" - switch (_tmp1_) { + switch (_tmp0_) { #line 745 "/home/jens/Source/shotwell/src/Page.vala" case 1: -#line 5887 "Page.c" +#line 6640 "Page.c" { - GdkPoint _tmp2_ = {0}; - GdkEventButton* _tmp3_; - gboolean _tmp4_; + GdkPoint _tmp1_ = {0}; #line 748 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_.x = -1; + _tmp1_.x = -1; #line 748 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_.y = -1; + _tmp1_.y = -1; #line 748 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->last_down = _tmp2_; -#line 750 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = event; + self->priv->last_down = _tmp1_; #line 750 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = page_on_left_released (self, _tmp3_); -#line 750 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp4_; + result = page_on_left_released (self, event); #line 750 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5906 "Page.c" +#line 6653 "Page.c" } #line 745 "/home/jens/Source/shotwell/src/Page.vala" case 2: -#line 5910 "Page.c" +#line 6657 "Page.c" { - GdkEventButton* _tmp5_; - gboolean _tmp6_; -#line 753 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = event; #line 753 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = page_on_middle_released (self, _tmp5_); -#line 753 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp6_; + result = page_on_middle_released (self, event); #line 753 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5922 "Page.c" +#line 6663 "Page.c" } #line 745 "/home/jens/Source/shotwell/src/Page.vala" case 3: -#line 5926 "Page.c" +#line 6667 "Page.c" { - GdkEventButton* _tmp7_; - gboolean _tmp8_; -#line 756 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = event; #line 756 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = page_on_right_released (self, _tmp7_); -#line 756 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp8_; + result = page_on_right_released (self, event); #line 756 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5938 "Page.c" +#line 6673 "Page.c" } default: { @@ -5942,165 +6677,216 @@ static gboolean page_on_button_released_internal (Page* self, GdkEventButton* ev result = FALSE; #line 759 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5946 "Page.c" +#line 6681 "Page.c" } } } -static gboolean page_real_on_ctrl_pressed (Page* self, GdkEventKey* event) { +static gboolean +page_real_on_ctrl_pressed (Page* self, + GdkEventKey* event) +{ gboolean result = FALSE; #line 764 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 764 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5958 "Page.c" +#line 6696 "Page.c" } -gboolean page_on_ctrl_pressed (Page* self, GdkEventKey* event) { +gboolean +page_on_ctrl_pressed (Page* self, + GdkEventKey* event) +{ #line 763 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 763 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_ctrl_pressed (self, event); -#line 5967 "Page.c" +#line 6708 "Page.c" } -static gboolean page_real_on_ctrl_released (Page* self, GdkEventKey* event) { +static gboolean +page_real_on_ctrl_released (Page* self, + GdkEventKey* event) +{ gboolean result = FALSE; #line 768 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 768 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5977 "Page.c" +#line 6721 "Page.c" } -gboolean page_on_ctrl_released (Page* self, GdkEventKey* event) { +gboolean +page_on_ctrl_released (Page* self, + GdkEventKey* event) +{ #line 767 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 767 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_ctrl_released (self, event); -#line 5986 "Page.c" +#line 6733 "Page.c" } -static gboolean page_real_on_alt_pressed (Page* self, GdkEventKey* event) { +static gboolean +page_real_on_alt_pressed (Page* self, + GdkEventKey* event) +{ gboolean result = FALSE; #line 772 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 772 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 5996 "Page.c" +#line 6746 "Page.c" } -gboolean page_on_alt_pressed (Page* self, GdkEventKey* event) { +gboolean +page_on_alt_pressed (Page* self, + GdkEventKey* event) +{ #line 771 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 771 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_alt_pressed (self, event); -#line 6005 "Page.c" +#line 6758 "Page.c" } -static gboolean page_real_on_alt_released (Page* self, GdkEventKey* event) { +static gboolean +page_real_on_alt_released (Page* self, + GdkEventKey* event) +{ gboolean result = FALSE; #line 776 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 776 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6015 "Page.c" +#line 6771 "Page.c" } -gboolean page_on_alt_released (Page* self, GdkEventKey* event) { +gboolean +page_on_alt_released (Page* self, + GdkEventKey* event) +{ #line 775 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 775 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_alt_released (self, event); -#line 6024 "Page.c" +#line 6783 "Page.c" } -static gboolean page_real_on_shift_pressed (Page* self, GdkEventKey* event) { +static gboolean +page_real_on_shift_pressed (Page* self, + GdkEventKey* event) +{ gboolean result = FALSE; #line 780 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 780 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6034 "Page.c" +#line 6796 "Page.c" } -gboolean page_on_shift_pressed (Page* self, GdkEventKey* event) { +gboolean +page_on_shift_pressed (Page* self, + GdkEventKey* event) +{ #line 779 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 779 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_shift_pressed (self, event); -#line 6043 "Page.c" +#line 6808 "Page.c" } -static gboolean page_real_on_shift_released (Page* self, GdkEventKey* event) { +static gboolean +page_real_on_shift_released (Page* self, + GdkEventKey* event) +{ gboolean result = FALSE; #line 784 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 784 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6053 "Page.c" +#line 6821 "Page.c" } -gboolean page_on_shift_released (Page* self, GdkEventKey* event) { +gboolean +page_on_shift_released (Page* self, + GdkEventKey* event) +{ #line 783 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 783 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_shift_released (self, event); -#line 6062 "Page.c" +#line 6833 "Page.c" } -static gboolean page_real_on_super_pressed (Page* self, GdkEventKey* event) { +static gboolean +page_real_on_super_pressed (Page* self, + GdkEventKey* event) +{ gboolean result = FALSE; #line 788 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 788 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6072 "Page.c" +#line 6846 "Page.c" } -gboolean page_on_super_pressed (Page* self, GdkEventKey* event) { +gboolean +page_on_super_pressed (Page* self, + GdkEventKey* event) +{ #line 787 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 787 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_super_pressed (self, event); -#line 6081 "Page.c" +#line 6858 "Page.c" } -static gboolean page_real_on_super_released (Page* self, GdkEventKey* event) { +static gboolean +page_real_on_super_released (Page* self, + GdkEventKey* event) +{ gboolean result = FALSE; #line 792 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 792 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6091 "Page.c" +#line 6871 "Page.c" } -gboolean page_on_super_released (Page* self, GdkEventKey* event) { +gboolean +page_on_super_released (Page* self, + GdkEventKey* event) +{ #line 791 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 791 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_super_released (self, event); -#line 6100 "Page.c" +#line 6883 "Page.c" } -static gboolean page_real_on_app_key_pressed (Page* self, GdkEventKey* event) { +static gboolean +page_real_on_app_key_pressed (Page* self, + GdkEventKey* event) +{ gboolean result = FALSE; #line 795 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); @@ -6108,20 +6894,26 @@ static gboolean page_real_on_app_key_pressed (Page* self, GdkEventKey* event) { result = FALSE; #line 796 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6112 "Page.c" +#line 6898 "Page.c" } -gboolean page_on_app_key_pressed (Page* self, GdkEventKey* event) { +gboolean +page_on_app_key_pressed (Page* self, + GdkEventKey* event) +{ #line 795 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 795 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_app_key_pressed (self, event); -#line 6121 "Page.c" +#line 6910 "Page.c" } -static gboolean page_real_on_app_key_released (Page* self, GdkEventKey* event) { +static gboolean +page_real_on_app_key_released (Page* self, + GdkEventKey* event) +{ gboolean result = FALSE; #line 799 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); @@ -6129,20 +6921,26 @@ static gboolean page_real_on_app_key_released (Page* self, GdkEventKey* event) { result = FALSE; #line 800 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6133 "Page.c" +#line 6925 "Page.c" } -gboolean page_on_app_key_released (Page* self, GdkEventKey* event) { +gboolean +page_on_app_key_released (Page* self, + GdkEventKey* event) +{ #line 799 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 799 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_app_key_released (self, event); -#line 6142 "Page.c" +#line 6937 "Page.c" } -gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event) { +gboolean +page_notify_app_key_pressed (Page* self, + GdkEventKey* event) +{ gboolean result = FALSE; gboolean ctrl_currently_pressed = FALSE; gboolean alt_currently_pressed = FALSE; @@ -6152,34 +6950,30 @@ gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event) { gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; - GdkEventKey* _tmp4_; - guint _tmp5_; + guint _tmp4_; + const gchar* _tmp5_; const gchar* _tmp6_; - const gchar* _tmp7_; - GQuark _tmp9_ = 0U; + GQuark _tmp8_ = 0U; #line 809 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp8_label0 = 0; + static GQuark _tmp7_label0 = 0; #line 809 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp8_label1 = 0; + static GQuark _tmp7_label1 = 0; #line 809 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp8_label2 = 0; + static GQuark _tmp7_label2 = 0; #line 809 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp8_label3 = 0; + static GQuark _tmp7_label3 = 0; #line 809 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp8_label4 = 0; + static GQuark _tmp7_label4 = 0; #line 809 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp8_label5 = 0; + static GQuark _tmp7_label5 = 0; #line 809 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp8_label6 = 0; + static GQuark _tmp7_label6 = 0; #line 809 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp8_label7 = 0; + static GQuark _tmp7_label7 = 0; #line 809 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp8_label8 = 0; + static GQuark _tmp7_label8 = 0; #line 809 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp8_label9 = 0; -#line 6181 "Page.c" - GdkEventKey* _tmp30_; - gboolean _tmp31_; + static GQuark _tmp7_label9 = 0; #line 803 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 803 "/home/jens/Source/shotwell/src/Page.vala" @@ -6195,214 +6989,187 @@ gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event) { #line 806 "/home/jens/Source/shotwell/src/Page.vala" super_currently_pressed = _tmp3_; #line 809 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = event; -#line 809 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = _tmp4_->keyval; + _tmp4_ = event->keyval; #line 809 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = gdk_keyval_name (_tmp5_); + _tmp5_ = gdk_keyval_name (_tmp4_); #line 809 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 809 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = (NULL == _tmp7_) ? 0 : g_quark_from_string (_tmp7_); + _tmp8_ = (NULL == _tmp6_) ? 0 : g_quark_from_string (_tmp6_); #line 809 "/home/jens/Source/shotwell/src/Page.vala" - if ((_tmp9_ == ((0 != _tmp8_label0) ? _tmp8_label0 : (_tmp8_label0 = g_quark_from_static_string ("Control_L")))) || (_tmp9_ == ((0 != _tmp8_label1) ? _tmp8_label1 : (_tmp8_label1 = g_quark_from_static_string ("Control_R"))))) { + if ((_tmp8_ == ((0 != _tmp7_label0) ? _tmp7_label0 : (_tmp7_label0 = g_quark_from_static_string ("Control_L")))) || (_tmp8_ == ((0 != _tmp7_label1) ? _tmp7_label1 : (_tmp7_label1 = g_quark_from_static_string ("Control_R"))))) { #line 809 "/home/jens/Source/shotwell/src/Page.vala" switch (0) { -#line 6212 "Page.c" +#line 7004 "Page.c" default: { - gboolean _tmp10_ = FALSE; - gboolean _tmp11_; - GdkEventKey* _tmp13_; - gboolean _tmp14_; + gboolean _tmp9_ = FALSE; + gboolean _tmp10_; #line 812 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = ctrl_currently_pressed; + _tmp10_ = ctrl_currently_pressed; #line 812 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp11_) { + if (!_tmp10_) { #line 812 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = TRUE; -#line 6225 "Page.c" + _tmp9_ = TRUE; +#line 7015 "Page.c" } else { - gboolean _tmp12_; + gboolean _tmp11_; #line 812 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = self->priv->ctrl_pressed; + _tmp11_ = self->priv->ctrl_pressed; #line 812 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = _tmp12_; -#line 6232 "Page.c" + _tmp9_ = _tmp11_; +#line 7022 "Page.c" } #line 812 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp10_) { + if (_tmp9_) { #line 813 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 813 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6240 "Page.c" +#line 7030 "Page.c" } #line 815 "/home/jens/Source/shotwell/src/Page.vala" self->priv->ctrl_pressed = TRUE; #line 817 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = event; -#line 817 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = page_on_ctrl_pressed (self, _tmp13_); -#line 817 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp14_; + result = page_on_ctrl_pressed (self, event); #line 817 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6252 "Page.c" +#line 7038 "Page.c" } } - } else if ((((_tmp9_ == ((0 != _tmp8_label2) ? _tmp8_label2 : (_tmp8_label2 = g_quark_from_static_string ("Meta_L")))) || (_tmp9_ == ((0 != _tmp8_label3) ? _tmp8_label3 : (_tmp8_label3 = g_quark_from_static_string ("Meta_R"))))) || (_tmp9_ == ((0 != _tmp8_label4) ? _tmp8_label4 : (_tmp8_label4 = g_quark_from_static_string ("Alt_L"))))) || (_tmp9_ == ((0 != _tmp8_label5) ? _tmp8_label5 : (_tmp8_label5 = g_quark_from_static_string ("Alt_R"))))) { + } else if ((((_tmp8_ == ((0 != _tmp7_label2) ? _tmp7_label2 : (_tmp7_label2 = g_quark_from_static_string ("Meta_L")))) || (_tmp8_ == ((0 != _tmp7_label3) ? _tmp7_label3 : (_tmp7_label3 = g_quark_from_static_string ("Meta_R"))))) || (_tmp8_ == ((0 != _tmp7_label4) ? _tmp7_label4 : (_tmp7_label4 = g_quark_from_static_string ("Alt_L"))))) || (_tmp8_ == ((0 != _tmp7_label5) ? _tmp7_label5 : (_tmp7_label5 = g_quark_from_static_string ("Alt_R"))))) { #line 809 "/home/jens/Source/shotwell/src/Page.vala" switch (0) { -#line 6258 "Page.c" +#line 7044 "Page.c" default: { - gboolean _tmp15_ = FALSE; - gboolean _tmp16_; - GdkEventKey* _tmp18_; - gboolean _tmp19_; + gboolean _tmp12_ = FALSE; + gboolean _tmp13_; #line 823 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = alt_currently_pressed; + _tmp13_ = alt_currently_pressed; #line 823 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp16_) { + if (!_tmp13_) { #line 823 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = TRUE; -#line 6271 "Page.c" + _tmp12_ = TRUE; +#line 7055 "Page.c" } else { - gboolean _tmp17_; + gboolean _tmp14_; #line 823 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = self->priv->alt_pressed; + _tmp14_ = self->priv->alt_pressed; #line 823 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = _tmp17_; -#line 6278 "Page.c" + _tmp12_ = _tmp14_; +#line 7062 "Page.c" } #line 823 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp15_) { + if (_tmp12_) { #line 824 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 824 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6286 "Page.c" +#line 7070 "Page.c" } #line 826 "/home/jens/Source/shotwell/src/Page.vala" self->priv->alt_pressed = TRUE; #line 828 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = event; -#line 828 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = page_on_alt_pressed (self, _tmp18_); -#line 828 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp19_; + result = page_on_alt_pressed (self, event); #line 828 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6298 "Page.c" +#line 7078 "Page.c" } } - } else if ((_tmp9_ == ((0 != _tmp8_label6) ? _tmp8_label6 : (_tmp8_label6 = g_quark_from_static_string ("Shift_L")))) || (_tmp9_ == ((0 != _tmp8_label7) ? _tmp8_label7 : (_tmp8_label7 = g_quark_from_static_string ("Shift_R"))))) { + } else if ((_tmp8_ == ((0 != _tmp7_label6) ? _tmp7_label6 : (_tmp7_label6 = g_quark_from_static_string ("Shift_L")))) || (_tmp8_ == ((0 != _tmp7_label7) ? _tmp7_label7 : (_tmp7_label7 = g_quark_from_static_string ("Shift_R"))))) { #line 809 "/home/jens/Source/shotwell/src/Page.vala" switch (0) { -#line 6304 "Page.c" +#line 7084 "Page.c" default: { - gboolean _tmp20_ = FALSE; - gboolean _tmp21_; - GdkEventKey* _tmp23_; - gboolean _tmp24_; + gboolean _tmp15_ = FALSE; + gboolean _tmp16_; #line 832 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = shift_currently_pressed; + _tmp16_ = shift_currently_pressed; #line 832 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp21_) { + if (!_tmp16_) { #line 832 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = TRUE; -#line 6317 "Page.c" + _tmp15_ = TRUE; +#line 7095 "Page.c" } else { - gboolean _tmp22_; + gboolean _tmp17_; #line 832 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = self->priv->shift_pressed; + _tmp17_ = self->priv->shift_pressed; #line 832 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = _tmp22_; -#line 6324 "Page.c" + _tmp15_ = _tmp17_; +#line 7102 "Page.c" } #line 832 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp20_) { + if (_tmp15_) { #line 833 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 833 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6332 "Page.c" +#line 7110 "Page.c" } #line 835 "/home/jens/Source/shotwell/src/Page.vala" self->priv->shift_pressed = TRUE; #line 837 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = event; -#line 837 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = page_on_shift_pressed (self, _tmp23_); -#line 837 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp24_; + result = page_on_shift_pressed (self, event); #line 837 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6344 "Page.c" +#line 7118 "Page.c" } } - } else if ((_tmp9_ == ((0 != _tmp8_label8) ? _tmp8_label8 : (_tmp8_label8 = g_quark_from_static_string ("Super_L")))) || (_tmp9_ == ((0 != _tmp8_label9) ? _tmp8_label9 : (_tmp8_label9 = g_quark_from_static_string ("Super_R"))))) { + } else if ((_tmp8_ == ((0 != _tmp7_label8) ? _tmp7_label8 : (_tmp7_label8 = g_quark_from_static_string ("Super_L")))) || (_tmp8_ == ((0 != _tmp7_label9) ? _tmp7_label9 : (_tmp7_label9 = g_quark_from_static_string ("Super_R"))))) { #line 809 "/home/jens/Source/shotwell/src/Page.vala" switch (0) { -#line 6350 "Page.c" +#line 7124 "Page.c" default: { - gboolean _tmp25_ = FALSE; - gboolean _tmp26_; - GdkEventKey* _tmp28_; - gboolean _tmp29_; + gboolean _tmp18_ = FALSE; + gboolean _tmp19_; #line 841 "/home/jens/Source/shotwell/src/Page.vala" - _tmp26_ = super_currently_pressed; + _tmp19_ = super_currently_pressed; #line 841 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp26_) { + if (!_tmp19_) { #line 841 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = TRUE; -#line 6363 "Page.c" + _tmp18_ = TRUE; +#line 7135 "Page.c" } else { - gboolean _tmp27_; + gboolean _tmp20_; #line 841 "/home/jens/Source/shotwell/src/Page.vala" - _tmp27_ = self->priv->super_pressed; + _tmp20_ = self->priv->super_pressed; #line 841 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = _tmp27_; -#line 6370 "Page.c" + _tmp18_ = _tmp20_; +#line 7142 "Page.c" } #line 841 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp25_) { + if (_tmp18_) { #line 842 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 842 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6378 "Page.c" +#line 7150 "Page.c" } #line 844 "/home/jens/Source/shotwell/src/Page.vala" self->priv->super_pressed = TRUE; #line 846 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = event; -#line 846 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = page_on_super_pressed (self, _tmp28_); -#line 846 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp29_; + result = page_on_super_pressed (self, event); #line 846 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6390 "Page.c" +#line 7158 "Page.c" } } } #line 849 "/home/jens/Source/shotwell/src/Page.vala" - _tmp30_ = event; -#line 849 "/home/jens/Source/shotwell/src/Page.vala" - _tmp31_ = page_on_app_key_pressed (self, _tmp30_); -#line 849 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp31_; + result = page_on_app_key_pressed (self, event); #line 849 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6402 "Page.c" +#line 7166 "Page.c" } -gboolean page_notify_app_key_released (Page* self, GdkEventKey* event) { +gboolean +page_notify_app_key_released (Page* self, + GdkEventKey* event) +{ gboolean result = FALSE; gboolean ctrl_currently_pressed = FALSE; gboolean alt_currently_pressed = FALSE; @@ -6412,34 +7179,30 @@ gboolean page_notify_app_key_released (Page* self, GdkEventKey* event) { gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; - GdkEventKey* _tmp4_; - guint _tmp5_; + guint _tmp4_; + const gchar* _tmp5_; const gchar* _tmp6_; - const gchar* _tmp7_; - GQuark _tmp9_ = 0U; + GQuark _tmp8_ = 0U; #line 858 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp8_label0 = 0; + static GQuark _tmp7_label0 = 0; #line 858 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp8_label1 = 0; + static GQuark _tmp7_label1 = 0; #line 858 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp8_label2 = 0; + static GQuark _tmp7_label2 = 0; #line 858 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp8_label3 = 0; + static GQuark _tmp7_label3 = 0; #line 858 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp8_label4 = 0; + static GQuark _tmp7_label4 = 0; #line 858 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp8_label5 = 0; + static GQuark _tmp7_label5 = 0; #line 858 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp8_label6 = 0; + static GQuark _tmp7_label6 = 0; #line 858 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp8_label7 = 0; + static GQuark _tmp7_label7 = 0; #line 858 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp8_label8 = 0; + static GQuark _tmp7_label8 = 0; #line 858 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp8_label9 = 0; -#line 6441 "Page.c" - GdkEventKey* _tmp30_; - gboolean _tmp31_; + static GQuark _tmp7_label9 = 0; #line 852 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 852 "/home/jens/Source/shotwell/src/Page.vala" @@ -6455,214 +7218,187 @@ gboolean page_notify_app_key_released (Page* self, GdkEventKey* event) { #line 855 "/home/jens/Source/shotwell/src/Page.vala" super_currently_pressed = _tmp3_; #line 858 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = event; + _tmp4_ = event->keyval; #line 858 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = _tmp4_->keyval; -#line 858 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = gdk_keyval_name (_tmp5_); + _tmp5_ = gdk_keyval_name (_tmp4_); #line 858 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 858 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = (NULL == _tmp7_) ? 0 : g_quark_from_string (_tmp7_); + _tmp8_ = (NULL == _tmp6_) ? 0 : g_quark_from_string (_tmp6_); #line 858 "/home/jens/Source/shotwell/src/Page.vala" - if ((_tmp9_ == ((0 != _tmp8_label0) ? _tmp8_label0 : (_tmp8_label0 = g_quark_from_static_string ("Control_L")))) || (_tmp9_ == ((0 != _tmp8_label1) ? _tmp8_label1 : (_tmp8_label1 = g_quark_from_static_string ("Control_R"))))) { + if ((_tmp8_ == ((0 != _tmp7_label0) ? _tmp7_label0 : (_tmp7_label0 = g_quark_from_static_string ("Control_L")))) || (_tmp8_ == ((0 != _tmp7_label1) ? _tmp7_label1 : (_tmp7_label1 = g_quark_from_static_string ("Control_R"))))) { #line 858 "/home/jens/Source/shotwell/src/Page.vala" switch (0) { -#line 6472 "Page.c" +#line 7233 "Page.c" default: { - gboolean _tmp10_ = FALSE; - gboolean _tmp11_; - GdkEventKey* _tmp13_; - gboolean _tmp14_; + gboolean _tmp9_ = FALSE; + gboolean _tmp10_; #line 861 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = ctrl_currently_pressed; + _tmp10_ = ctrl_currently_pressed; #line 861 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp11_) { + if (_tmp10_) { #line 861 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = TRUE; -#line 6485 "Page.c" + _tmp9_ = TRUE; +#line 7244 "Page.c" } else { - gboolean _tmp12_; + gboolean _tmp11_; #line 861 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = self->priv->ctrl_pressed; + _tmp11_ = self->priv->ctrl_pressed; #line 861 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = !_tmp12_; -#line 6492 "Page.c" + _tmp9_ = !_tmp11_; +#line 7251 "Page.c" } #line 861 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp10_) { + if (_tmp9_) { #line 862 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 862 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6500 "Page.c" +#line 7259 "Page.c" } #line 864 "/home/jens/Source/shotwell/src/Page.vala" self->priv->ctrl_pressed = FALSE; #line 866 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = event; -#line 866 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = page_on_ctrl_released (self, _tmp13_); -#line 866 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp14_; + result = page_on_ctrl_released (self, event); #line 866 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6512 "Page.c" +#line 7267 "Page.c" } } - } else if ((((_tmp9_ == ((0 != _tmp8_label2) ? _tmp8_label2 : (_tmp8_label2 = g_quark_from_static_string ("Meta_L")))) || (_tmp9_ == ((0 != _tmp8_label3) ? _tmp8_label3 : (_tmp8_label3 = g_quark_from_static_string ("Meta_R"))))) || (_tmp9_ == ((0 != _tmp8_label4) ? _tmp8_label4 : (_tmp8_label4 = g_quark_from_static_string ("Alt_L"))))) || (_tmp9_ == ((0 != _tmp8_label5) ? _tmp8_label5 : (_tmp8_label5 = g_quark_from_static_string ("Alt_R"))))) { + } else if ((((_tmp8_ == ((0 != _tmp7_label2) ? _tmp7_label2 : (_tmp7_label2 = g_quark_from_static_string ("Meta_L")))) || (_tmp8_ == ((0 != _tmp7_label3) ? _tmp7_label3 : (_tmp7_label3 = g_quark_from_static_string ("Meta_R"))))) || (_tmp8_ == ((0 != _tmp7_label4) ? _tmp7_label4 : (_tmp7_label4 = g_quark_from_static_string ("Alt_L"))))) || (_tmp8_ == ((0 != _tmp7_label5) ? _tmp7_label5 : (_tmp7_label5 = g_quark_from_static_string ("Alt_R"))))) { #line 858 "/home/jens/Source/shotwell/src/Page.vala" switch (0) { -#line 6518 "Page.c" +#line 7273 "Page.c" default: { - gboolean _tmp15_ = FALSE; - gboolean _tmp16_; - GdkEventKey* _tmp18_; - gboolean _tmp19_; + gboolean _tmp12_ = FALSE; + gboolean _tmp13_; #line 872 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = alt_currently_pressed; + _tmp13_ = alt_currently_pressed; #line 872 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp16_) { + if (_tmp13_) { #line 872 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = TRUE; -#line 6531 "Page.c" + _tmp12_ = TRUE; +#line 7284 "Page.c" } else { - gboolean _tmp17_; + gboolean _tmp14_; #line 872 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = self->priv->alt_pressed; + _tmp14_ = self->priv->alt_pressed; #line 872 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = !_tmp17_; -#line 6538 "Page.c" + _tmp12_ = !_tmp14_; +#line 7291 "Page.c" } #line 872 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp15_) { + if (_tmp12_) { #line 873 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 873 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6546 "Page.c" +#line 7299 "Page.c" } #line 875 "/home/jens/Source/shotwell/src/Page.vala" self->priv->alt_pressed = FALSE; #line 877 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = event; -#line 877 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = page_on_alt_released (self, _tmp18_); -#line 877 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp19_; + result = page_on_alt_released (self, event); #line 877 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6558 "Page.c" +#line 7307 "Page.c" } } - } else if ((_tmp9_ == ((0 != _tmp8_label6) ? _tmp8_label6 : (_tmp8_label6 = g_quark_from_static_string ("Shift_L")))) || (_tmp9_ == ((0 != _tmp8_label7) ? _tmp8_label7 : (_tmp8_label7 = g_quark_from_static_string ("Shift_R"))))) { + } else if ((_tmp8_ == ((0 != _tmp7_label6) ? _tmp7_label6 : (_tmp7_label6 = g_quark_from_static_string ("Shift_L")))) || (_tmp8_ == ((0 != _tmp7_label7) ? _tmp7_label7 : (_tmp7_label7 = g_quark_from_static_string ("Shift_R"))))) { #line 858 "/home/jens/Source/shotwell/src/Page.vala" switch (0) { -#line 6564 "Page.c" +#line 7313 "Page.c" default: { - gboolean _tmp20_ = FALSE; - gboolean _tmp21_; - GdkEventKey* _tmp23_; - gboolean _tmp24_; + gboolean _tmp15_ = FALSE; + gboolean _tmp16_; #line 881 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = shift_currently_pressed; + _tmp16_ = shift_currently_pressed; #line 881 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp21_) { + if (_tmp16_) { #line 881 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = TRUE; -#line 6577 "Page.c" + _tmp15_ = TRUE; +#line 7324 "Page.c" } else { - gboolean _tmp22_; + gboolean _tmp17_; #line 881 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = self->priv->shift_pressed; + _tmp17_ = self->priv->shift_pressed; #line 881 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = !_tmp22_; -#line 6584 "Page.c" + _tmp15_ = !_tmp17_; +#line 7331 "Page.c" } #line 881 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp20_) { + if (_tmp15_) { #line 882 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 882 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6592 "Page.c" +#line 7339 "Page.c" } #line 884 "/home/jens/Source/shotwell/src/Page.vala" self->priv->shift_pressed = FALSE; #line 886 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = event; -#line 886 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = page_on_shift_released (self, _tmp23_); -#line 886 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp24_; + result = page_on_shift_released (self, event); #line 886 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6604 "Page.c" +#line 7347 "Page.c" } } - } else if ((_tmp9_ == ((0 != _tmp8_label8) ? _tmp8_label8 : (_tmp8_label8 = g_quark_from_static_string ("Super_L")))) || (_tmp9_ == ((0 != _tmp8_label9) ? _tmp8_label9 : (_tmp8_label9 = g_quark_from_static_string ("Super_R"))))) { + } else if ((_tmp8_ == ((0 != _tmp7_label8) ? _tmp7_label8 : (_tmp7_label8 = g_quark_from_static_string ("Super_L")))) || (_tmp8_ == ((0 != _tmp7_label9) ? _tmp7_label9 : (_tmp7_label9 = g_quark_from_static_string ("Super_R"))))) { #line 858 "/home/jens/Source/shotwell/src/Page.vala" switch (0) { -#line 6610 "Page.c" +#line 7353 "Page.c" default: { - gboolean _tmp25_ = FALSE; - gboolean _tmp26_; - GdkEventKey* _tmp28_; - gboolean _tmp29_; + gboolean _tmp18_ = FALSE; + gboolean _tmp19_; #line 890 "/home/jens/Source/shotwell/src/Page.vala" - _tmp26_ = super_currently_pressed; + _tmp19_ = super_currently_pressed; #line 890 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp26_) { + if (_tmp19_) { #line 890 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = TRUE; -#line 6623 "Page.c" + _tmp18_ = TRUE; +#line 7364 "Page.c" } else { - gboolean _tmp27_; + gboolean _tmp20_; #line 890 "/home/jens/Source/shotwell/src/Page.vala" - _tmp27_ = self->priv->super_pressed; + _tmp20_ = self->priv->super_pressed; #line 890 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = !_tmp27_; -#line 6630 "Page.c" + _tmp18_ = !_tmp20_; +#line 7371 "Page.c" } #line 890 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp25_) { + if (_tmp18_) { #line 891 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 891 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6638 "Page.c" +#line 7379 "Page.c" } #line 893 "/home/jens/Source/shotwell/src/Page.vala" self->priv->super_pressed = FALSE; #line 895 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = event; -#line 895 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = page_on_super_released (self, _tmp28_); -#line 895 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp29_; + result = page_on_super_released (self, event); #line 895 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6650 "Page.c" +#line 7387 "Page.c" } } } #line 898 "/home/jens/Source/shotwell/src/Page.vala" - _tmp30_ = event; -#line 898 "/home/jens/Source/shotwell/src/Page.vala" - _tmp31_ = page_on_app_key_released (self, _tmp30_); -#line 898 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp31_; + result = page_on_app_key_released (self, event); #line 898 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6662 "Page.c" +#line 7395 "Page.c" } -gboolean page_notify_app_focus_in (Page* self, GdkEventFocus* event) { +gboolean +page_notify_app_focus_in (Page* self, + GdkEventFocus* event) +{ gboolean result = FALSE; #line 901 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); @@ -6674,11 +7410,14 @@ gboolean page_notify_app_focus_in (Page* self, GdkEventFocus* event) { result = FALSE; #line 904 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6678 "Page.c" +#line 7414 "Page.c" } -gboolean page_notify_app_focus_out (Page* self, GdkEventFocus* event) { +gboolean +page_notify_app_focus_out (Page* self, + GdkEventFocus* event) +{ gboolean result = FALSE; #line 907 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); @@ -6688,107 +7427,147 @@ gboolean page_notify_app_focus_out (Page* self, GdkEventFocus* event) { result = FALSE; #line 908 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6692 "Page.c" +#line 7431 "Page.c" } -static void page_real_on_move (Page* self, GdkRectangle* rect) { +static void +page_real_on_move (Page* self, + GdkRectangle* rect) +{ #line 911 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (rect != NULL); -#line 6699 "Page.c" +#line 7441 "Page.c" } -void page_on_move (Page* self, GdkRectangle* rect) { +void +page_on_move (Page* self, + GdkRectangle* rect) +{ #line 911 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 911 "/home/jens/Source/shotwell/src/Page.vala" PAGE_GET_CLASS (self)->on_move (self, rect); -#line 6708 "Page.c" +#line 7453 "Page.c" } -static void page_real_on_move_start (Page* self, GdkRectangle* rect) { +static void +page_real_on_move_start (Page* self, + GdkRectangle* rect) +{ #line 914 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (rect != NULL); -#line 6715 "Page.c" +#line 7463 "Page.c" } -void page_on_move_start (Page* self, GdkRectangle* rect) { +void +page_on_move_start (Page* self, + GdkRectangle* rect) +{ #line 914 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 914 "/home/jens/Source/shotwell/src/Page.vala" PAGE_GET_CLASS (self)->on_move_start (self, rect); -#line 6724 "Page.c" +#line 7475 "Page.c" } -static void page_real_on_move_finished (Page* self, GdkRectangle* rect) { +static void +page_real_on_move_finished (Page* self, + GdkRectangle* rect) +{ #line 917 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (rect != NULL); -#line 6731 "Page.c" +#line 7485 "Page.c" } -void page_on_move_finished (Page* self, GdkRectangle* rect) { +void +page_on_move_finished (Page* self, + GdkRectangle* rect) +{ #line 917 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 917 "/home/jens/Source/shotwell/src/Page.vala" PAGE_GET_CLASS (self)->on_move_finished (self, rect); -#line 6740 "Page.c" +#line 7497 "Page.c" } -static void page_real_on_resize (Page* self, GdkRectangle* rect) { +static void +page_real_on_resize (Page* self, + GdkRectangle* rect) +{ #line 920 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (rect != NULL); -#line 6747 "Page.c" +#line 7507 "Page.c" } -void page_on_resize (Page* self, GdkRectangle* rect) { +void +page_on_resize (Page* self, + GdkRectangle* rect) +{ #line 920 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 920 "/home/jens/Source/shotwell/src/Page.vala" PAGE_GET_CLASS (self)->on_resize (self, rect); -#line 6756 "Page.c" +#line 7519 "Page.c" } -static void page_real_on_resize_start (Page* self, GdkRectangle* rect) { +static void +page_real_on_resize_start (Page* self, + GdkRectangle* rect) +{ #line 923 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (rect != NULL); -#line 6763 "Page.c" +#line 7529 "Page.c" } -void page_on_resize_start (Page* self, GdkRectangle* rect) { +void +page_on_resize_start (Page* self, + GdkRectangle* rect) +{ #line 923 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 923 "/home/jens/Source/shotwell/src/Page.vala" PAGE_GET_CLASS (self)->on_resize_start (self, rect); -#line 6772 "Page.c" +#line 7541 "Page.c" } -static void page_real_on_resize_finished (Page* self, GdkRectangle* rect) { +static void +page_real_on_resize_finished (Page* self, + GdkRectangle* rect) +{ #line 926 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (rect != NULL); -#line 6779 "Page.c" +#line 7551 "Page.c" } -void page_on_resize_finished (Page* self, GdkRectangle* rect) { +void +page_on_resize_finished (Page* self, + GdkRectangle* rect) +{ #line 926 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 926 "/home/jens/Source/shotwell/src/Page.vala" PAGE_GET_CLASS (self)->on_resize_finished (self, rect); -#line 6788 "Page.c" +#line 7563 "Page.c" } -static gboolean page_real_on_configure (Page* self, GdkEventConfigure* event, GdkRectangle* rect) { +static gboolean +page_real_on_configure (Page* self, + GdkEventConfigure* event, + GdkRectangle* rect) +{ gboolean result = FALSE; #line 929 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); @@ -6798,55 +7577,57 @@ static gboolean page_real_on_configure (Page* self, GdkEventConfigure* event, Gd result = FALSE; #line 930 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6802 "Page.c" +#line 7581 "Page.c" } -gboolean page_on_configure (Page* self, GdkEventConfigure* event, GdkRectangle* rect) { +gboolean +page_on_configure (Page* self, + GdkEventConfigure* event, + GdkRectangle* rect) +{ #line 929 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 929 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_configure (self, event, rect); -#line 6811 "Page.c" +#line 7594 "Page.c" } -static gboolean _page_check_configure_halted_gsource_func (gpointer self) { +static gboolean +_page_check_configure_halted_gsource_func (gpointer self) +{ gboolean result; result = page_check_configure_halted ((Page*) self); #line 954 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 6820 "Page.c" +#line 7605 "Page.c" } -gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) { +gboolean +page_notify_configure_event (Page* self, + GdkEventConfigure* event) +{ gboolean result = FALSE; GdkRectangle rect = {0}; - GdkEventConfigure* _tmp0_; + gint _tmp0_; gint _tmp1_; - GdkEventConfigure* _tmp2_; + gint _tmp2_; gint _tmp3_; - GdkEventConfigure* _tmp4_; - gint _tmp5_; - GdkEventConfigure* _tmp6_; - gint _tmp7_; - gulong _tmp8_; - gboolean _tmp29_ = FALSE; - GdkRectangle _tmp30_; - gint _tmp31_; - GdkRectangle _tmp32_; - gint _tmp33_; - gboolean _tmp39_ = FALSE; - GdkRectangle _tmp40_; - gint _tmp41_; - GdkRectangle _tmp42_; - gint _tmp43_; - GdkRectangle _tmp49_; - gulong _tmp50_; - GdkEventConfigure* _tmp51_; - GdkRectangle _tmp52_; - gboolean _tmp53_; + gulong _tmp4_; + gboolean _tmp25_ = FALSE; + GdkRectangle _tmp26_; + gint _tmp27_; + GdkRectangle _tmp28_; + gint _tmp29_; + gboolean _tmp35_ = FALSE; + GdkRectangle _tmp36_; + gint _tmp37_; + GdkRectangle _tmp38_; + gint _tmp39_; + GdkRectangle _tmp45_; + GdkRectangle _tmp46_; #line 933 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 933 "/home/jens/Source/shotwell/src/Page.vala" @@ -6854,243 +7635,230 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) { #line 934 "/home/jens/Source/shotwell/src/Page.vala" memset (&rect, 0, sizeof (GdkRectangle)); #line 935 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = event; -#line 935 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = _tmp0_->x; + _tmp0_ = event->x; #line 935 "/home/jens/Source/shotwell/src/Page.vala" - rect.x = _tmp1_; + rect.x = _tmp0_; #line 936 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = event; + _tmp1_ = event->y; #line 936 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = _tmp2_->y; -#line 936 "/home/jens/Source/shotwell/src/Page.vala" - rect.y = _tmp3_; -#line 937 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = event; + rect.y = _tmp1_; #line 937 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = _tmp4_->width; + _tmp2_ = event->width; #line 937 "/home/jens/Source/shotwell/src/Page.vala" - rect.width = _tmp5_; + rect.width = _tmp2_; #line 938 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = event; + _tmp3_ = event->height; #line 938 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = _tmp6_->height; -#line 938 "/home/jens/Source/shotwell/src/Page.vala" - rect.height = _tmp7_; + rect.height = _tmp3_; #line 941 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = self->priv->last_configure_ms; + _tmp4_ = self->priv->last_configure_ms; #line 941 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp8_ == ((gulong) 0)) { -#line 6885 "Page.c" - gboolean _tmp9_ = FALSE; - GdkRectangle _tmp10_; - gint _tmp11_; - GdkRectangle _tmp12_; - gint _tmp13_; - gboolean _tmp19_ = FALSE; - GdkRectangle _tmp20_; - gint _tmp21_; - GdkRectangle _tmp22_; - gint _tmp23_; + if (_tmp4_ == ((gulong) 0)) { +#line 7658 "Page.c" + gboolean _tmp5_ = FALSE; + GdkRectangle _tmp6_; + gint _tmp7_; + GdkRectangle _tmp8_; + gint _tmp9_; + gboolean _tmp15_ = FALSE; + GdkRectangle _tmp16_; + gint _tmp17_; + GdkRectangle _tmp18_; + gint _tmp19_; #line 942 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = self->priv->last_position; + _tmp6_ = self->priv->last_position; #line 942 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = _tmp10_.x; + _tmp7_ = _tmp6_.x; #line 942 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = rect; + _tmp8_ = rect; #line 942 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = _tmp12_.x; + _tmp9_ = _tmp8_.x; #line 942 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp11_ != _tmp13_) { + if (_tmp7_ != _tmp9_) { #line 942 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = TRUE; -#line 6908 "Page.c" + _tmp5_ = TRUE; +#line 7681 "Page.c" } else { - GdkRectangle _tmp14_; - gint _tmp15_; - GdkRectangle _tmp16_; - gint _tmp17_; + GdkRectangle _tmp10_; + gint _tmp11_; + GdkRectangle _tmp12_; + gint _tmp13_; #line 942 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = self->priv->last_position; + _tmp10_ = self->priv->last_position; #line 942 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = _tmp14_.y; + _tmp11_ = _tmp10_.y; #line 942 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = rect; + _tmp12_ = rect; #line 942 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = _tmp16_.y; + _tmp13_ = _tmp12_.y; #line 942 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = _tmp15_ != _tmp17_; -#line 6924 "Page.c" + _tmp5_ = _tmp11_ != _tmp13_; +#line 7697 "Page.c" } #line 942 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp9_) { -#line 6928 "Page.c" - GdkRectangle _tmp18_; + if (_tmp5_) { +#line 7701 "Page.c" + GdkRectangle _tmp14_; #line 943 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = rect; + _tmp14_ = rect; #line 943 "/home/jens/Source/shotwell/src/Page.vala" - page_on_move_start (self, &_tmp18_); + page_on_move_start (self, &_tmp14_); #line 944 "/home/jens/Source/shotwell/src/Page.vala" self->priv->report_move_finished = TRUE; -#line 6936 "Page.c" +#line 7709 "Page.c" } #line 947 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = self->priv->last_position; + _tmp16_ = self->priv->last_position; #line 947 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = _tmp20_.width; + _tmp17_ = _tmp16_.width; #line 947 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = rect; + _tmp18_ = rect; #line 947 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = _tmp22_.width; + _tmp19_ = _tmp18_.width; #line 947 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp21_ != _tmp23_) { + if (_tmp17_ != _tmp19_) { #line 947 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = TRUE; -#line 6950 "Page.c" + _tmp15_ = TRUE; +#line 7723 "Page.c" } else { - GdkRectangle _tmp24_; - gint _tmp25_; - GdkRectangle _tmp26_; - gint _tmp27_; + GdkRectangle _tmp20_; + gint _tmp21_; + GdkRectangle _tmp22_; + gint _tmp23_; #line 947 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = self->priv->last_position; + _tmp20_ = self->priv->last_position; #line 947 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = _tmp24_.height; + _tmp21_ = _tmp20_.height; #line 947 "/home/jens/Source/shotwell/src/Page.vala" - _tmp26_ = rect; + _tmp22_ = rect; #line 947 "/home/jens/Source/shotwell/src/Page.vala" - _tmp27_ = _tmp26_.height; + _tmp23_ = _tmp22_.height; #line 947 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = _tmp25_ != _tmp27_; -#line 6966 "Page.c" + _tmp15_ = _tmp21_ != _tmp23_; +#line 7739 "Page.c" } #line 947 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp19_) { -#line 6970 "Page.c" - GdkRectangle _tmp28_; + if (_tmp15_) { +#line 7743 "Page.c" + GdkRectangle _tmp24_; #line 948 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = rect; + _tmp24_ = rect; #line 948 "/home/jens/Source/shotwell/src/Page.vala" - page_on_resize_start (self, &_tmp28_); + page_on_resize_start (self, &_tmp24_); #line 949 "/home/jens/Source/shotwell/src/Page.vala" self->priv->report_resize_finished = TRUE; -#line 6978 "Page.c" +#line 7751 "Page.c" } #line 954 "/home/jens/Source/shotwell/src/Page.vala" g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) (PAGE_CONSIDER_CONFIGURE_HALTED_MSEC / 8), _page_check_configure_halted_gsource_func, g_object_ref (self), g_object_unref); -#line 6982 "Page.c" +#line 7755 "Page.c" } #line 957 "/home/jens/Source/shotwell/src/Page.vala" - _tmp30_ = self->priv->last_position; + _tmp26_ = self->priv->last_position; #line 957 "/home/jens/Source/shotwell/src/Page.vala" - _tmp31_ = _tmp30_.x; + _tmp27_ = _tmp26_.x; #line 957 "/home/jens/Source/shotwell/src/Page.vala" - _tmp32_ = rect; + _tmp28_ = rect; #line 957 "/home/jens/Source/shotwell/src/Page.vala" - _tmp33_ = _tmp32_.x; + _tmp29_ = _tmp28_.x; #line 957 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp31_ != _tmp33_) { + if (_tmp27_ != _tmp29_) { #line 957 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = TRUE; -#line 6996 "Page.c" + _tmp25_ = TRUE; +#line 7769 "Page.c" } else { - GdkRectangle _tmp34_; - gint _tmp35_; - GdkRectangle _tmp36_; - gint _tmp37_; + GdkRectangle _tmp30_; + gint _tmp31_; + GdkRectangle _tmp32_; + gint _tmp33_; #line 957 "/home/jens/Source/shotwell/src/Page.vala" - _tmp34_ = self->priv->last_position; + _tmp30_ = self->priv->last_position; #line 957 "/home/jens/Source/shotwell/src/Page.vala" - _tmp35_ = _tmp34_.y; + _tmp31_ = _tmp30_.y; #line 957 "/home/jens/Source/shotwell/src/Page.vala" - _tmp36_ = rect; + _tmp32_ = rect; #line 957 "/home/jens/Source/shotwell/src/Page.vala" - _tmp37_ = _tmp36_.y; + _tmp33_ = _tmp32_.y; #line 957 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = _tmp35_ != _tmp37_; -#line 7012 "Page.c" + _tmp25_ = _tmp31_ != _tmp33_; +#line 7785 "Page.c" } #line 957 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp29_) { -#line 7016 "Page.c" - GdkRectangle _tmp38_; + if (_tmp25_) { +#line 7789 "Page.c" + GdkRectangle _tmp34_; #line 958 "/home/jens/Source/shotwell/src/Page.vala" - _tmp38_ = rect; + _tmp34_ = rect; #line 958 "/home/jens/Source/shotwell/src/Page.vala" - page_on_move (self, &_tmp38_); -#line 7022 "Page.c" + page_on_move (self, &_tmp34_); +#line 7795 "Page.c" } #line 960 "/home/jens/Source/shotwell/src/Page.vala" - _tmp40_ = self->priv->last_position; + _tmp36_ = self->priv->last_position; #line 960 "/home/jens/Source/shotwell/src/Page.vala" - _tmp41_ = _tmp40_.width; + _tmp37_ = _tmp36_.width; #line 960 "/home/jens/Source/shotwell/src/Page.vala" - _tmp42_ = rect; + _tmp38_ = rect; #line 960 "/home/jens/Source/shotwell/src/Page.vala" - _tmp43_ = _tmp42_.width; + _tmp39_ = _tmp38_.width; #line 960 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp41_ != _tmp43_) { + if (_tmp37_ != _tmp39_) { #line 960 "/home/jens/Source/shotwell/src/Page.vala" - _tmp39_ = TRUE; -#line 7036 "Page.c" + _tmp35_ = TRUE; +#line 7809 "Page.c" } else { - GdkRectangle _tmp44_; - gint _tmp45_; - GdkRectangle _tmp46_; - gint _tmp47_; + GdkRectangle _tmp40_; + gint _tmp41_; + GdkRectangle _tmp42_; + gint _tmp43_; #line 960 "/home/jens/Source/shotwell/src/Page.vala" - _tmp44_ = self->priv->last_position; + _tmp40_ = self->priv->last_position; #line 960 "/home/jens/Source/shotwell/src/Page.vala" - _tmp45_ = _tmp44_.height; + _tmp41_ = _tmp40_.height; #line 960 "/home/jens/Source/shotwell/src/Page.vala" - _tmp46_ = rect; + _tmp42_ = rect; #line 960 "/home/jens/Source/shotwell/src/Page.vala" - _tmp47_ = _tmp46_.height; + _tmp43_ = _tmp42_.height; #line 960 "/home/jens/Source/shotwell/src/Page.vala" - _tmp39_ = _tmp45_ != _tmp47_; -#line 7052 "Page.c" + _tmp35_ = _tmp41_ != _tmp43_; +#line 7825 "Page.c" } #line 960 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp39_) { -#line 7056 "Page.c" - GdkRectangle _tmp48_; + if (_tmp35_) { +#line 7829 "Page.c" + GdkRectangle _tmp44_; #line 961 "/home/jens/Source/shotwell/src/Page.vala" - _tmp48_ = rect; + _tmp44_ = rect; #line 961 "/home/jens/Source/shotwell/src/Page.vala" - page_on_resize (self, &_tmp48_); -#line 7062 "Page.c" + page_on_resize (self, &_tmp44_); +#line 7835 "Page.c" } #line 963 "/home/jens/Source/shotwell/src/Page.vala" - _tmp49_ = rect; + _tmp45_ = rect; #line 963 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->last_position = _tmp49_; + self->priv->last_position = _tmp45_; #line 964 "/home/jens/Source/shotwell/src/Page.vala" - _tmp50_ = now_ms (); -#line 964 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->last_configure_ms = _tmp50_; -#line 966 "/home/jens/Source/shotwell/src/Page.vala" - _tmp51_ = event; + self->priv->last_configure_ms = now_ms (); #line 966 "/home/jens/Source/shotwell/src/Page.vala" - _tmp52_ = rect; + _tmp46_ = rect; #line 966 "/home/jens/Source/shotwell/src/Page.vala" - _tmp53_ = page_on_configure (self, _tmp51_, &_tmp52_); -#line 966 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp53_; + result = page_on_configure (self, event, &_tmp46_); #line 966 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7082 "Page.c" +#line 7849 "Page.c" } -static gboolean page_check_configure_halted (Page* self) { +static gboolean +page_check_configure_halted (Page* self) +{ gboolean result = FALSE; gboolean _tmp0_; gulong _tmp1_; - gulong _tmp2_; GtkAllocation allocation = {0}; - GtkAllocation _tmp3_ = {0}; - gboolean _tmp4_; - gboolean _tmp7_; + GtkAllocation _tmp2_ = {0}; + gboolean _tmp3_; + gboolean _tmp6_; #line 969 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 970 "/home/jens/Source/shotwell/src/Page.vala" @@ -7101,53 +7869,51 @@ static gboolean page_check_configure_halted (Page* self) { result = FALSE; #line 971 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7105 "Page.c" +#line 7873 "Page.c" } #line 973 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = now_ms (); -#line 973 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = self->priv->last_configure_ms; + _tmp1_ = self->priv->last_configure_ms; #line 973 "/home/jens/Source/shotwell/src/Page.vala" - if ((_tmp1_ - _tmp2_) < ((gulong) PAGE_CONSIDER_CONFIGURE_HALTED_MSEC)) { + if ((now_ms () - _tmp1_) < ((gulong) PAGE_CONSIDER_CONFIGURE_HALTED_MSEC)) { #line 974 "/home/jens/Source/shotwell/src/Page.vala" result = TRUE; #line 974 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7117 "Page.c" +#line 7883 "Page.c" } #line 977 "/home/jens/Source/shotwell/src/Page.vala" - gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp3_); + gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp2_); #line 977 "/home/jens/Source/shotwell/src/Page.vala" - allocation = _tmp3_; + allocation = _tmp2_; #line 979 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = self->priv->report_move_finished; + _tmp3_ = self->priv->report_move_finished; #line 979 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp4_) { -#line 7127 "Page.c" - GtkAllocation _tmp5_; - GdkRectangle _tmp6_; + if (_tmp3_) { +#line 7893 "Page.c" + GtkAllocation _tmp4_; + GdkRectangle _tmp5_; #line 980 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = allocation; + _tmp4_ = allocation; #line 980 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = (GdkRectangle) _tmp5_; + _tmp5_ = (GdkRectangle) _tmp4_; #line 980 "/home/jens/Source/shotwell/src/Page.vala" - page_on_move_finished (self, &_tmp6_); -#line 7136 "Page.c" + page_on_move_finished (self, &_tmp5_); +#line 7902 "Page.c" } #line 982 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = self->priv->report_resize_finished; + _tmp6_ = self->priv->report_resize_finished; #line 982 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp7_) { -#line 7142 "Page.c" - GtkAllocation _tmp8_; - GdkRectangle _tmp9_; + if (_tmp6_) { +#line 7908 "Page.c" + GtkAllocation _tmp7_; + GdkRectangle _tmp8_; #line 983 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = allocation; + _tmp7_ = allocation; #line 983 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = (GdkRectangle) _tmp8_; + _tmp8_ = (GdkRectangle) _tmp7_; #line 983 "/home/jens/Source/shotwell/src/Page.vala" - page_on_resize_finished (self, &_tmp9_); -#line 7151 "Page.c" + page_on_resize_finished (self, &_tmp8_); +#line 7917 "Page.c" } #line 985 "/home/jens/Source/shotwell/src/Page.vala" self->priv->last_configure_ms = (gulong) 0; @@ -7159,11 +7925,17 @@ static gboolean page_check_configure_halted (Page* self) { result = FALSE; #line 989 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7163 "Page.c" +#line 7929 "Page.c" } -static gboolean page_real_on_motion (Page* self, GdkEventMotion* event, gint x, gint y, GdkModifierType mask) { +static gboolean +page_real_on_motion (Page* self, + GdkEventMotion* event, + gint x, + gint y, + GdkModifierType mask) +{ gboolean result = FALSE; #line 992 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); @@ -7173,291 +7945,231 @@ static gboolean page_real_on_motion (Page* self, GdkEventMotion* event, gint x, result = FALSE; #line 995 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7177 "Page.c" +#line 7949 "Page.c" } -gboolean page_on_motion (Page* self, GdkEventMotion* event, gint x, gint y, GdkModifierType mask) { +gboolean +page_on_motion (Page* self, + GdkEventMotion* event, + gint x, + gint y, + GdkModifierType mask) +{ #line 992 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 992 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_motion (self, event, x, y, mask); -#line 7186 "Page.c" +#line 7964 "Page.c" } -static gboolean page_real_on_leave_notify_event (Page* self) { +static gboolean +page_real_on_leave_notify_event (Page* self) +{ gboolean result = FALSE; #line 999 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 999 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7196 "Page.c" +#line 7976 "Page.c" } -gboolean page_on_leave_notify_event (Page* self) { +gboolean +page_on_leave_notify_event (Page* self) +{ #line 998 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 998 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_leave_notify_event (self); -#line 7205 "Page.c" +#line 7987 "Page.c" } -static gboolean page_on_motion_internal (Page* self, GdkEventMotion* event) { +static gboolean +page_on_motion_internal (Page* self, + GdkEventMotion* event) +{ gboolean result = FALSE; gint x = 0; gint y = 0; GdkModifierType mask = 0; - GdkEventMotion* _tmp0_; - gint16 _tmp1_; - GdkEventMotion* _tmp11_; - gint _tmp12_; - gint _tmp13_; - GdkModifierType _tmp14_; - gboolean _tmp15_; + gint16 _tmp0_; + gint _tmp7_; + gint _tmp8_; + GdkModifierType _tmp9_; #line 1002 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 1002 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); #line 1005 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = event; + _tmp0_ = event->is_hint; #line 1005 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = _tmp0_->is_hint; -#line 1005 "/home/jens/Source/shotwell/src/Page.vala" - if (((gint) _tmp1_) == 1) { -#line 7231 "Page.c" + if (((gint) _tmp0_) == 1) { +#line 8011 "Page.c" + gint _tmp1_ = 0; gint _tmp2_ = 0; - gint _tmp3_ = 0; - GdkModifierType _tmp4_ = 0; + GdkModifierType _tmp3_ = 0; #line 1006 "/home/jens/Source/shotwell/src/Page.vala" - page_get_event_source_pointer (self, &_tmp2_, &_tmp3_, &_tmp4_); + page_get_event_source_pointer (self, &_tmp1_, &_tmp2_, &_tmp3_); #line 1006 "/home/jens/Source/shotwell/src/Page.vala" - x = _tmp2_; + x = _tmp1_; #line 1006 "/home/jens/Source/shotwell/src/Page.vala" - y = _tmp3_; + y = _tmp2_; #line 1006 "/home/jens/Source/shotwell/src/Page.vala" - mask = _tmp4_; -#line 7243 "Page.c" + mask = _tmp3_; +#line 8023 "Page.c" } else { - GdkEventMotion* _tmp5_; - gdouble _tmp6_; - GdkEventMotion* _tmp7_; - gdouble _tmp8_; - GdkEventMotion* _tmp9_; - GdkModifierType _tmp10_; + gdouble _tmp4_; + gdouble _tmp5_; + GdkModifierType _tmp6_; #line 1008 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = event; + _tmp4_ = event->x; #line 1008 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = _tmp5_->x; -#line 1008 "/home/jens/Source/shotwell/src/Page.vala" - x = (gint) _tmp6_; -#line 1009 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = event; + x = (gint) _tmp4_; #line 1009 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = _tmp7_->y; + _tmp5_ = event->y; #line 1009 "/home/jens/Source/shotwell/src/Page.vala" - y = (gint) _tmp8_; + y = (gint) _tmp5_; #line 1010 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = event; + _tmp6_ = event->state; #line 1010 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = _tmp9_->state; -#line 1010 "/home/jens/Source/shotwell/src/Page.vala" - mask = _tmp10_; -#line 7269 "Page.c" + mask = _tmp6_; +#line 8040 "Page.c" } #line 1013 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = event; -#line 1013 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = x; + _tmp7_ = x; #line 1013 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = y; + _tmp8_ = y; #line 1013 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = mask; -#line 1013 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = page_on_motion (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_); + _tmp9_ = mask; #line 1013 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp15_; + result = page_on_motion (self, event, _tmp7_, _tmp8_, _tmp9_); #line 1013 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7285 "Page.c" +#line 8052 "Page.c" } -static gboolean page_on_mousewheel_internal (Page* self, GdkEventScroll* event) { +static gboolean +page_on_mousewheel_internal (Page* self, + GdkEventScroll* event) +{ gboolean result = FALSE; - GdkEventScroll* _tmp0_; - GdkScrollDirection _tmp1_; + GdkScrollDirection _tmp0_; #line 1016 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 1016 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); #line 1017 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = event; + _tmp0_ = event->direction; #line 1017 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = _tmp0_->direction; -#line 1017 "/home/jens/Source/shotwell/src/Page.vala" - switch (_tmp1_) { + switch (_tmp0_) { #line 1017 "/home/jens/Source/shotwell/src/Page.vala" case GDK_SCROLL_UP: -#line 7305 "Page.c" +#line 8072 "Page.c" { - GdkEventScroll* _tmp2_; - gboolean _tmp3_; -#line 1019 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = event; #line 1019 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = page_on_mousewheel_up (self, _tmp2_); -#line 1019 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp3_; + result = page_on_mousewheel_up (self, event); #line 1019 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7317 "Page.c" +#line 8078 "Page.c" } #line 1017 "/home/jens/Source/shotwell/src/Page.vala" case GDK_SCROLL_DOWN: -#line 7321 "Page.c" +#line 8082 "Page.c" { - GdkEventScroll* _tmp4_; - gboolean _tmp5_; -#line 1022 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = event; #line 1022 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = page_on_mousewheel_down (self, _tmp4_); -#line 1022 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp5_; + result = page_on_mousewheel_down (self, event); #line 1022 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7333 "Page.c" +#line 8088 "Page.c" } #line 1017 "/home/jens/Source/shotwell/src/Page.vala" case GDK_SCROLL_LEFT: -#line 7337 "Page.c" +#line 8092 "Page.c" { - GdkEventScroll* _tmp6_; - gboolean _tmp7_; -#line 1025 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = event; #line 1025 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = page_on_mousewheel_left (self, _tmp6_); -#line 1025 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp7_; + result = page_on_mousewheel_left (self, event); #line 1025 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7349 "Page.c" +#line 8098 "Page.c" } #line 1017 "/home/jens/Source/shotwell/src/Page.vala" case GDK_SCROLL_RIGHT: -#line 7353 "Page.c" +#line 8102 "Page.c" { - GdkEventScroll* _tmp8_; - gboolean _tmp9_; -#line 1028 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = event; -#line 1028 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = page_on_mousewheel_right (self, _tmp8_); #line 1028 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp9_; + result = page_on_mousewheel_right (self, event); #line 1028 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7365 "Page.c" +#line 8108 "Page.c" } #line 1017 "/home/jens/Source/shotwell/src/Page.vala" case GDK_SCROLL_SMOOTH: -#line 7369 "Page.c" +#line 8112 "Page.c" { { gdouble dx = 0.0; gdouble dy = 0.0; - GdkEventScroll* _tmp10_; - gdouble _tmp11_ = 0.0; - gdouble _tmp12_ = 0.0; - gdouble _tmp13_; -#line 1033 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = event; + gdouble _tmp1_ = 0.0; + gdouble _tmp2_ = 0.0; + gdouble _tmp3_; #line 1033 "/home/jens/Source/shotwell/src/Page.vala" - gdk_event_get_scroll_deltas ((GdkEvent*) _tmp10_, &_tmp11_, &_tmp12_); + gdk_event_get_scroll_deltas ((GdkEvent*) event, &_tmp1_, &_tmp2_); #line 1033 "/home/jens/Source/shotwell/src/Page.vala" - dx = _tmp11_; + dx = _tmp1_; #line 1033 "/home/jens/Source/shotwell/src/Page.vala" - dy = _tmp12_; + dy = _tmp2_; #line 1035 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = dy; + _tmp3_ = dy; #line 1035 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp13_ < ((gdouble) 0)) { -#line 7390 "Page.c" - GdkEventScroll* _tmp14_; - gboolean _tmp15_; -#line 1036 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = event; -#line 1036 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = page_on_mousewheel_up (self, _tmp14_); + if (_tmp3_ < ((gdouble) 0)) { #line 1036 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp15_; + result = page_on_mousewheel_up (self, event); #line 1036 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7401 "Page.c" +#line 8134 "Page.c" } else { - gdouble _tmp16_; + gdouble _tmp4_; #line 1037 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = dy; + _tmp4_ = dy; #line 1037 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp16_ > ((gdouble) 0)) { -#line 7408 "Page.c" - GdkEventScroll* _tmp17_; - gboolean _tmp18_; + if (_tmp4_ > ((gdouble) 0)) { #line 1038 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = event; -#line 1038 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = page_on_mousewheel_down (self, _tmp17_); -#line 1038 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp18_; + result = page_on_mousewheel_down (self, event); #line 1038 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7419 "Page.c" +#line 8145 "Page.c" } else { - gdouble _tmp19_; + gdouble _tmp5_; #line 1039 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = dx; + _tmp5_ = dx; #line 1039 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp19_ < ((gdouble) 0)) { -#line 7426 "Page.c" - GdkEventScroll* _tmp20_; - gboolean _tmp21_; -#line 1040 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = event; -#line 1040 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = page_on_mousewheel_left (self, _tmp20_); + if (_tmp5_ < ((gdouble) 0)) { #line 1040 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp21_; + result = page_on_mousewheel_left (self, event); #line 1040 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7437 "Page.c" +#line 8156 "Page.c" } else { - gdouble _tmp22_; + gdouble _tmp6_; #line 1041 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = dx; + _tmp6_ = dx; #line 1041 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp22_ > ((gdouble) 0)) { -#line 7444 "Page.c" - GdkEventScroll* _tmp23_; - gboolean _tmp24_; + if (_tmp6_ > ((gdouble) 0)) { #line 1042 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = event; -#line 1042 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = page_on_mousewheel_right (self, _tmp23_); -#line 1042 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp24_; + result = page_on_mousewheel_right (self, event); #line 1042 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7455 "Page.c" +#line 8167 "Page.c" } else { #line 1044 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 1044 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7461 "Page.c" +#line 8173 "Page.c" } } } @@ -7470,13 +8182,16 @@ static gboolean page_on_mousewheel_internal (Page* self, GdkEventScroll* event) result = FALSE; #line 1048 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7474 "Page.c" +#line 8186 "Page.c" } } } -static gboolean page_real_on_mousewheel_up (Page* self, GdkEventScroll* event) { +static gboolean +page_real_on_mousewheel_up (Page* self, + GdkEventScroll* event) +{ gboolean result = FALSE; #line 1052 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); @@ -7484,20 +8199,26 @@ static gboolean page_real_on_mousewheel_up (Page* self, GdkEventScroll* event) { result = FALSE; #line 1053 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7488 "Page.c" +#line 8203 "Page.c" } -gboolean page_on_mousewheel_up (Page* self, GdkEventScroll* event) { +gboolean +page_on_mousewheel_up (Page* self, + GdkEventScroll* event) +{ #line 1052 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 1052 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_mousewheel_up (self, event); -#line 7497 "Page.c" +#line 8215 "Page.c" } -static gboolean page_real_on_mousewheel_down (Page* self, GdkEventScroll* event) { +static gboolean +page_real_on_mousewheel_down (Page* self, + GdkEventScroll* event) +{ gboolean result = FALSE; #line 1056 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); @@ -7505,20 +8226,26 @@ static gboolean page_real_on_mousewheel_down (Page* self, GdkEventScroll* event) result = FALSE; #line 1057 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7509 "Page.c" +#line 8230 "Page.c" } -gboolean page_on_mousewheel_down (Page* self, GdkEventScroll* event) { +gboolean +page_on_mousewheel_down (Page* self, + GdkEventScroll* event) +{ #line 1056 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 1056 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_mousewheel_down (self, event); -#line 7518 "Page.c" +#line 8242 "Page.c" } -static gboolean page_real_on_mousewheel_left (Page* self, GdkEventScroll* event) { +static gboolean +page_real_on_mousewheel_left (Page* self, + GdkEventScroll* event) +{ gboolean result = FALSE; #line 1060 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); @@ -7526,20 +8253,26 @@ static gboolean page_real_on_mousewheel_left (Page* self, GdkEventScroll* event) result = FALSE; #line 1061 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7530 "Page.c" +#line 8257 "Page.c" } -gboolean page_on_mousewheel_left (Page* self, GdkEventScroll* event) { +gboolean +page_on_mousewheel_left (Page* self, + GdkEventScroll* event) +{ #line 1060 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 1060 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_mousewheel_left (self, event); -#line 7539 "Page.c" +#line 8269 "Page.c" } -static gboolean page_real_on_mousewheel_right (Page* self, GdkEventScroll* event) { +static gboolean +page_real_on_mousewheel_right (Page* self, + GdkEventScroll* event) +{ gboolean result = FALSE; #line 1064 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); @@ -7547,39 +8280,49 @@ static gboolean page_real_on_mousewheel_right (Page* self, GdkEventScroll* event result = FALSE; #line 1065 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7551 "Page.c" +#line 8284 "Page.c" } -gboolean page_on_mousewheel_right (Page* self, GdkEventScroll* event) { +gboolean +page_on_mousewheel_right (Page* self, + GdkEventScroll* event) +{ #line 1064 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 1064 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_mousewheel_right (self, event); -#line 7560 "Page.c" +#line 8296 "Page.c" } -static gboolean page_real_on_context_keypress (Page* self) { +static gboolean +page_real_on_context_keypress (Page* self) +{ gboolean result = FALSE; #line 1069 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 1069 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7570 "Page.c" +#line 8308 "Page.c" } -gboolean page_on_context_keypress (Page* self) { +gboolean +page_on_context_keypress (Page* self) +{ #line 1068 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 1068 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_context_keypress (self); -#line 7579 "Page.c" +#line 8319 "Page.c" } -static gboolean page_real_on_context_buttonpress (Page* self, GdkEventButton* event) { +static gboolean +page_real_on_context_buttonpress (Page* self, + GdkEventButton* event) +{ gboolean result = FALSE; #line 1072 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); @@ -7587,61 +8330,65 @@ static gboolean page_real_on_context_buttonpress (Page* self, GdkEventButton* ev result = FALSE; #line 1073 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7591 "Page.c" +#line 8334 "Page.c" } -gboolean page_on_context_buttonpress (Page* self, GdkEventButton* event) { +gboolean +page_on_context_buttonpress (Page* self, + GdkEventButton* event) +{ #line 1072 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 1072 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_context_buttonpress (self, event); -#line 7600 "Page.c" +#line 8346 "Page.c" } -static gboolean page_real_on_context_invoked (Page* self) { +static gboolean +page_real_on_context_invoked (Page* self) +{ gboolean result = FALSE; #line 1077 "/home/jens/Source/shotwell/src/Page.vala" result = TRUE; #line 1077 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7610 "Page.c" +#line 8358 "Page.c" } -gboolean page_on_context_invoked (Page* self) { +gboolean +page_on_context_invoked (Page* self) +{ #line 1076 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 1076 "/home/jens/Source/shotwell/src/Page.vala" return PAGE_GET_CLASS (self)->on_context_invoked (self); -#line 7619 "Page.c" +#line 8369 "Page.c" } -gboolean page_popup_context_menu (Page* self, GtkMenu* context_menu, GdkEventButton* event) { +gboolean +page_popup_context_menu (Page* self, + GtkMenu* context_menu, + GdkEventButton* event) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; - GtkMenu* _tmp1_; - GdkEventButton* _tmp3_; #line 1080 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), FALSE); #line 1080 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail ((context_menu == NULL) || GTK_IS_MENU (context_menu), FALSE); #line 1083 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = context_menu; -#line 1083 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp1_ == NULL) { + if (context_menu == NULL) { #line 1083 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = TRUE; -#line 7638 "Page.c" +#line 8388 "Page.c" } else { - gboolean _tmp2_; -#line 1083 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = page_on_context_invoked (self); #line 1083 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = !_tmp2_; -#line 7645 "Page.c" + _tmp0_ = !page_on_context_invoked (self); +#line 8392 "Page.c" } #line 1083 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp0_) { @@ -7649,61 +8396,45 @@ gboolean page_popup_context_menu (Page* self, GtkMenu* context_menu, GdkEventBut result = FALSE; #line 1084 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7653 "Page.c" +#line 8400 "Page.c" } #line 1086 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = event; -#line 1086 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp3_ == NULL) { -#line 7659 "Page.c" - GtkMenu* _tmp4_; - guint32 _tmp5_; -#line 1087 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = context_menu; + if (event == NULL) { #line 1087 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = gtk_get_current_event_time (); -#line 1087 "/home/jens/Source/shotwell/src/Page.vala" - gtk_menu_popup (_tmp4_, NULL, NULL, NULL, NULL, (guint) 0, _tmp5_); -#line 7668 "Page.c" + gtk_menu_popup (context_menu, NULL, NULL, NULL, NULL, (guint) 0, gtk_get_current_event_time ()); +#line 8406 "Page.c" } else { - GtkMenu* _tmp6_; - GdkEventButton* _tmp7_; - guint _tmp8_; - GdkEventButton* _tmp9_; - guint32 _tmp10_; -#line 1089 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = context_menu; -#line 1089 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = event; -#line 1089 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = _tmp7_->button; + guint _tmp1_; + guint32 _tmp2_; #line 1089 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = event; + _tmp1_ = event->button; #line 1089 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = _tmp9_->time; + _tmp2_ = event->time; #line 1089 "/home/jens/Source/shotwell/src/Page.vala" - gtk_menu_popup (_tmp6_, NULL, NULL, NULL, NULL, _tmp8_, _tmp10_); -#line 7687 "Page.c" + gtk_menu_popup (context_menu, NULL, NULL, NULL, NULL, _tmp1_, _tmp2_); +#line 8416 "Page.c" } #line 1091 "/home/jens/Source/shotwell/src/Page.vala" result = TRUE; #line 1091 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7693 "Page.c" +#line 8422 "Page.c" } -void page_on_event_source_realize (Page* self) { +void +page_on_event_source_realize (Page* self) +{ GtkWidget* _tmp0_; GdkWindow* _tmp1_; GtkWidget* _tmp2_; GdkWindow* _tmp3_; GdkCursor* _tmp4_; GdkWindow* parent_window = NULL; - GtkWidget* _tmp9_; + GtkWidget* _tmp8_; + GdkWindow* _tmp9_; GdkWindow* _tmp10_; - GdkWindow* _tmp11_; - GdkWindow* _tmp20_; + GdkWindow* _tmp19_; #line 1094 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 1095 "/home/jens/Source/shotwell/src/Page.vala" @@ -7720,11 +8451,10 @@ void page_on_event_source_realize (Page* self) { _tmp4_ = gdk_window_get_cursor (_tmp3_); #line 1097 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp4_ != NULL) { -#line 7724 "Page.c" +#line 8455 "Page.c" GtkWidget* _tmp5_; GdkWindow* _tmp6_; GdkCursor* _tmp7_; - GdkCursorType _tmp8_; #line 1098 "/home/jens/Source/shotwell/src/Page.vala" _tmp5_ = self->priv->event_source; #line 1098 "/home/jens/Source/shotwell/src/Page.vala" @@ -7732,124 +8462,123 @@ void page_on_event_source_realize (Page* self) { #line 1098 "/home/jens/Source/shotwell/src/Page.vala" _tmp7_ = gdk_window_get_cursor (_tmp6_); #line 1098 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = gdk_cursor_get_cursor_type (_tmp7_); -#line 1098 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->last_cursor = _tmp8_; + self->priv->last_cursor = gdk_cursor_get_cursor_type (_tmp7_); #line 1099 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 7741 "Page.c" +#line 8469 "Page.c" } #line 1103 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = self->priv->event_source; + _tmp8_ = self->priv->event_source; #line 1103 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = gtk_widget_get_window (_tmp9_); + _tmp9_ = gtk_widget_get_window (_tmp8_); #line 1103 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = _g_object_ref0 (_tmp10_); + _tmp10_ = _g_object_ref0 (_tmp9_); #line 1103 "/home/jens/Source/shotwell/src/Page.vala" - parent_window = _tmp11_; -#line 7751 "Page.c" + parent_window = _tmp10_; +#line 8479 "Page.c" { - gboolean _tmp12_ = FALSE; + gboolean _tmp11_ = FALSE; #line 1104 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = TRUE; + _tmp11_ = TRUE; #line 1104 "/home/jens/Source/shotwell/src/Page.vala" while (TRUE) { -#line 7758 "Page.c" +#line 8486 "Page.c" + GdkWindow* _tmp16_; GdkWindow* _tmp17_; GdkWindow* _tmp18_; - GdkWindow* _tmp19_; #line 1104 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp12_) { -#line 7764 "Page.c" - gboolean _tmp13_ = FALSE; - GdkWindow* _tmp14_; + if (!_tmp11_) { +#line 8492 "Page.c" + gboolean _tmp12_ = FALSE; + GdkWindow* _tmp13_; #line 1106 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = parent_window; + _tmp13_ = parent_window; #line 1106 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp14_ != NULL) { -#line 7771 "Page.c" - GdkWindow* _tmp15_; - GdkCursor* _tmp16_; + if (_tmp13_ != NULL) { +#line 8499 "Page.c" + GdkWindow* _tmp14_; + GdkCursor* _tmp15_; #line 1106 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = parent_window; + _tmp14_ = parent_window; #line 1106 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = gdk_window_get_cursor (_tmp15_); + _tmp15_ = gdk_window_get_cursor (_tmp14_); #line 1106 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = _tmp16_ == NULL; -#line 7780 "Page.c" + _tmp12_ = _tmp15_ == NULL; +#line 8508 "Page.c" } else { #line 1106 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = FALSE; -#line 7784 "Page.c" + _tmp12_ = FALSE; +#line 8512 "Page.c" } #line 1106 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp13_) { + if (!_tmp12_) { #line 1106 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 7790 "Page.c" +#line 8518 "Page.c" } } #line 1104 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = FALSE; + _tmp11_ = FALSE; #line 1105 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = parent_window; + _tmp16_ = parent_window; #line 1105 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = gdk_window_get_parent (_tmp17_); + _tmp17_ = gdk_window_get_parent (_tmp16_); #line 1105 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = _g_object_ref0 (_tmp18_); + _tmp18_ = _g_object_ref0 (_tmp17_); #line 1105 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (parent_window); #line 1105 "/home/jens/Source/shotwell/src/Page.vala" - parent_window = _tmp19_; -#line 7805 "Page.c" + parent_window = _tmp18_; +#line 8533 "Page.c" } } #line 1108 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = parent_window; + _tmp19_ = parent_window; #line 1108 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp20_ != NULL) { -#line 7812 "Page.c" - GdkWindow* _tmp21_; - GdkCursor* _tmp22_; - GdkCursorType _tmp23_; -#line 1109 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = parent_window; + if (_tmp19_ != NULL) { +#line 8540 "Page.c" + GdkWindow* _tmp20_; + GdkCursor* _tmp21_; #line 1109 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = gdk_window_get_cursor (_tmp21_); + _tmp20_ = parent_window; #line 1109 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = gdk_cursor_get_cursor_type (_tmp22_); + _tmp21_ = gdk_window_get_cursor (_tmp20_); #line 1109 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->last_cursor = _tmp23_; -#line 7824 "Page.c" + self->priv->last_cursor = gdk_cursor_get_cursor_type (_tmp21_); +#line 8549 "Page.c" } #line 1094 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (parent_window); -#line 7828 "Page.c" +#line 8553 "Page.c" } -void page_set_cursor_hide_time (Page* self, gint hide_time) { - gint _tmp0_; +void +page_set_cursor_hide_time (Page* self, + gint hide_time) +{ #line 1112 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 1113 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = hide_time; -#line 1113 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->cursor_hide_msec = _tmp0_; -#line 7840 "Page.c" + self->priv->cursor_hide_msec = hide_time; +#line 8565 "Page.c" } -void page_start_cursor_hiding (Page* self) { +void +page_start_cursor_hiding (Page* self) +{ #line 1116 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 1117 "/home/jens/Source/shotwell/src/Page.vala" page_check_cursor_hiding (self); -#line 7849 "Page.c" +#line 8576 "Page.c" } -void page_stop_cursor_hiding (Page* self) { +void +page_stop_cursor_hiding (Page* self) +{ guint _tmp0_; #line 1120 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); @@ -7857,18 +8586,20 @@ void page_stop_cursor_hiding (Page* self) { _tmp0_ = self->priv->last_timeout_id; #line 1121 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp0_ != ((guint) 0)) { -#line 7861 "Page.c" +#line 8590 "Page.c" guint _tmp1_; #line 1122 "/home/jens/Source/shotwell/src/Page.vala" _tmp1_ = self->priv->last_timeout_id; #line 1122 "/home/jens/Source/shotwell/src/Page.vala" g_source_remove (_tmp1_); -#line 7867 "Page.c" +#line 8596 "Page.c" } } -void page_suspend_cursor_hiding (Page* self) { +void +page_suspend_cursor_hiding (Page* self) +{ gint _tmp0_; guint _tmp1_; #line 1125 "/home/jens/Source/shotwell/src/Page.vala" @@ -7881,21 +8612,23 @@ void page_suspend_cursor_hiding (Page* self) { _tmp1_ = self->priv->last_timeout_id; #line 1128 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp1_ != ((guint) 0)) { -#line 7885 "Page.c" +#line 8616 "Page.c" guint _tmp2_; #line 1129 "/home/jens/Source/shotwell/src/Page.vala" _tmp2_ = self->priv->last_timeout_id; #line 1129 "/home/jens/Source/shotwell/src/Page.vala" g_source_remove (_tmp2_); -#line 7891 "Page.c" +#line 8622 "Page.c" } #line 1131 "/home/jens/Source/shotwell/src/Page.vala" self->priv->cursor_hide_msec = 0; -#line 7895 "Page.c" +#line 8626 "Page.c" } -void page_restore_cursor_hiding (Page* self) { +void +page_restore_cursor_hiding (Page* self) +{ gint _tmp0_; #line 1134 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); @@ -7905,100 +8638,104 @@ void page_restore_cursor_hiding (Page* self) { self->priv->cursor_hide_msec = _tmp0_; #line 1136 "/home/jens/Source/shotwell/src/Page.vala" page_check_cursor_hiding (self); -#line 7909 "Page.c" +#line 8642 "Page.c" } -static void page_real_set_page_cursor (Page* self, GdkCursorType cursor_type) { - GdkCursorType _tmp0_; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_; -#line 1141 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = cursor_type; +static void +page_real_set_page_cursor (Page* self, + GdkCursorType cursor_type) +{ + gboolean _tmp0_ = FALSE; + gboolean _tmp1_; #line 1141 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->last_cursor = _tmp0_; + self->priv->last_cursor = cursor_type; #line 1143 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = self->priv->cursor_hidden; + _tmp1_ = self->priv->cursor_hidden; #line 1143 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp2_) { -#line 7925 "Page.c" - GtkWidget* _tmp3_; + if (!_tmp1_) { +#line 8658 "Page.c" + GtkWidget* _tmp2_; #line 1143 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = self->priv->event_source; + _tmp2_ = self->priv->event_source; #line 1143 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = _tmp3_ != NULL; -#line 7931 "Page.c" + _tmp0_ = _tmp2_ != NULL; +#line 8664 "Page.c" } else { #line 1143 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = FALSE; -#line 7935 "Page.c" + _tmp0_ = FALSE; +#line 8668 "Page.c" } #line 1143 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp1_) { -#line 7939 "Page.c" + if (_tmp0_) { +#line 8672 "Page.c" GdkDisplay* display = NULL; - GtkWidget* _tmp4_; - GdkWindow* _tmp5_; + GtkWidget* _tmp3_; + GdkWindow* _tmp4_; + GdkDisplay* _tmp5_; GdkDisplay* _tmp6_; - GdkDisplay* _tmp7_; - GtkWidget* _tmp8_; - GdkWindow* _tmp9_; - GdkDisplay* _tmp10_; - GdkCursorType _tmp11_; - GdkCursor* _tmp12_; - GdkCursor* _tmp13_; + GtkWidget* _tmp7_; + GdkWindow* _tmp8_; + GdkDisplay* _tmp9_; + GdkCursor* _tmp10_; + GdkCursor* _tmp11_; #line 1144 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = self->priv->event_source; + _tmp3_ = self->priv->event_source; #line 1144 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = gtk_widget_get_window (_tmp4_); + _tmp4_ = gtk_widget_get_window (_tmp3_); #line 1144 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = gdk_window_get_display (_tmp5_); + _tmp5_ = gdk_window_get_display (_tmp4_); #line 1144 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = _g_object_ref0 (_tmp6_); + _tmp6_ = _g_object_ref0 (_tmp5_); #line 1144 "/home/jens/Source/shotwell/src/Page.vala" - display = _tmp7_; + display = _tmp6_; #line 1145 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = self->priv->event_source; -#line 1145 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = gtk_widget_get_window (_tmp8_); + _tmp7_ = self->priv->event_source; #line 1145 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = display; + _tmp8_ = gtk_widget_get_window (_tmp7_); #line 1145 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = cursor_type; + _tmp9_ = display; #line 1145 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = gdk_cursor_new_for_display (_tmp10_, _tmp11_); + _tmp10_ = gdk_cursor_new_for_display (_tmp9_, cursor_type); #line 1145 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 1145 "/home/jens/Source/shotwell/src/Page.vala" - gdk_window_set_cursor (_tmp9_, _tmp13_); + gdk_window_set_cursor (_tmp8_, _tmp11_); #line 1145 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp11_); #line 1143 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (display); -#line 7979 "Page.c" +#line 8709 "Page.c" } } -void page_set_page_cursor (Page* self, GdkCursorType cursor_type) { +void +page_set_page_cursor (Page* self, + GdkCursorType cursor_type) +{ #line 1140 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 1140 "/home/jens/Source/shotwell/src/Page.vala" PAGE_GET_CLASS (self)->set_page_cursor (self, cursor_type); -#line 7989 "Page.c" +#line 8722 "Page.c" } -static gboolean _page_on_hide_cursor_gsource_func (gpointer self) { +static gboolean +_page_on_hide_cursor_gsource_func (gpointer self) +{ gboolean result; result = page_on_hide_cursor ((Page*) self); #line 1158 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 7998 "Page.c" +#line 8733 "Page.c" } -static void page_check_cursor_hiding (Page* self) { +static void +page_check_cursor_hiding (Page* self) +{ gboolean _tmp0_; gint _tmp2_; #line 1149 "/home/jens/Source/shotwell/src/Page.vala" @@ -8007,7 +8744,7 @@ static void page_check_cursor_hiding (Page* self) { _tmp0_ = self->priv->cursor_hidden; #line 1150 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp0_) { -#line 8011 "Page.c" +#line 8748 "Page.c" GdkCursorType _tmp1_; #line 1151 "/home/jens/Source/shotwell/src/Page.vala" self->priv->cursor_hidden = FALSE; @@ -8015,40 +8752,39 @@ static void page_check_cursor_hiding (Page* self) { _tmp1_ = self->priv->last_cursor; #line 1152 "/home/jens/Source/shotwell/src/Page.vala" page_set_page_cursor (self, _tmp1_); -#line 8019 "Page.c" +#line 8756 "Page.c" } #line 1155 "/home/jens/Source/shotwell/src/Page.vala" _tmp2_ = self->priv->cursor_hide_msec; #line 1155 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp2_ != 0) { -#line 8025 "Page.c" +#line 8762 "Page.c" guint _tmp3_; gint _tmp5_; - guint _tmp6_; #line 1156 "/home/jens/Source/shotwell/src/Page.vala" _tmp3_ = self->priv->last_timeout_id; #line 1156 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp3_ != ((guint) 0)) { -#line 8033 "Page.c" +#line 8769 "Page.c" guint _tmp4_; #line 1157 "/home/jens/Source/shotwell/src/Page.vala" _tmp4_ = self->priv->last_timeout_id; #line 1157 "/home/jens/Source/shotwell/src/Page.vala" g_source_remove (_tmp4_); -#line 8039 "Page.c" +#line 8775 "Page.c" } #line 1158 "/home/jens/Source/shotwell/src/Page.vala" _tmp5_ = self->priv->cursor_hide_msec; #line 1158 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) _tmp5_, _page_on_hide_cursor_gsource_func, g_object_ref (self), g_object_unref); -#line 1158 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->last_timeout_id = _tmp6_; -#line 8047 "Page.c" + self->priv->last_timeout_id = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) _tmp5_, _page_on_hide_cursor_gsource_func, g_object_ref (self), g_object_unref); +#line 8781 "Page.c" } } -static gboolean page_on_hide_cursor (Page* self) { +static gboolean +page_on_hide_cursor (Page* self) +{ gboolean result = FALSE; GtkWidget* _tmp0_; #line 1162 "/home/jens/Source/shotwell/src/Page.vala" @@ -8059,7 +8795,7 @@ static gboolean page_on_hide_cursor (Page* self) { _tmp0_ = self->priv->event_source; #line 1165 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp0_ != NULL) { -#line 8063 "Page.c" +#line 8799 "Page.c" GdkDisplay* display = NULL; GtkWidget* _tmp1_; GdkWindow* _tmp2_; @@ -8096,7 +8832,7 @@ static gboolean page_on_hide_cursor (Page* self) { _g_object_unref0 (_tmp9_); #line 1165 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (display); -#line 8100 "Page.c" +#line 8836 "Page.c" } #line 1171 "/home/jens/Source/shotwell/src/Page.vala" self->priv->last_timeout_id = (guint) 0; @@ -8104,15 +8840,17 @@ static gboolean page_on_hide_cursor (Page* self) { result = FALSE; #line 1173 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 8108 "Page.c" +#line 8844 "Page.c" } -void page_update_menu_item_label (Page* self, const gchar* id, const gchar* new_label) { +void +page_update_menu_item_label (Page* self, + const gchar* id, + const gchar* new_label) +{ AppWindow* _tmp0_; AppWindow* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; #line 1176 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (self)); #line 1176 "/home/jens/Source/shotwell/src/Page.vala" @@ -8124,22 +8862,20 @@ void page_update_menu_item_label (Page* self, const gchar* id, const gchar* new_ #line 1178 "/home/jens/Source/shotwell/src/Page.vala" _tmp1_ = _tmp0_; #line 1178 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = id; -#line 1178 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = new_label; -#line 1178 "/home/jens/Source/shotwell/src/Page.vala" - app_window_update_menu_item_label (_tmp1_, _tmp2_, _tmp3_); + app_window_update_menu_item_label (_tmp1_, id, new_label); #line 1178 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (_tmp1_); -#line 8135 "Page.c" +#line 8869 "Page.c" } -GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gchar* extension_point) { +GMenuModel* +page_find_extension_point (Page* self, + GMenuModel* model, + const gchar* extension_point) +{ GMenuModel* result = NULL; gint items = 0; - GMenuModel* _tmp0_; - gint _tmp1_; GMenuModel* section = NULL; #line 1181 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (self), NULL); @@ -8148,232 +8884,210 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha #line 1181 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (extension_point != NULL, NULL); #line 1183 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = model; -#line 1183 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = g_menu_model_get_n_items (_tmp0_); -#line 1183 "/home/jens/Source/shotwell/src/Page.vala" - items = _tmp1_; + items = g_menu_model_get_n_items (model); #line 1184 "/home/jens/Source/shotwell/src/Page.vala" section = NULL; -#line 8159 "Page.c" +#line 8891 "Page.c" { gint i = 0; #line 1186 "/home/jens/Source/shotwell/src/Page.vala" i = 0; -#line 8164 "Page.c" +#line 8896 "Page.c" { - gboolean _tmp2_ = FALSE; + gboolean _tmp0_ = FALSE; #line 1186 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = TRUE; + _tmp0_ = TRUE; #line 1186 "/home/jens/Source/shotwell/src/Page.vala" while (TRUE) { -#line 8171 "Page.c" - gboolean _tmp4_ = FALSE; - gint _tmp5_; - gint _tmp6_; +#line 8903 "Page.c" + gboolean _tmp2_ = FALSE; + gint _tmp3_; + gint _tmp4_; gchar* name = NULL; - GMenuModel* _tmp8_; - gint _tmp9_; - const gchar* _tmp10_; - const gchar* _tmp11_; + gint _tmp6_; + const gchar* _tmp7_; #line 1186 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp2_) { -#line 8182 "Page.c" - gint _tmp3_; + if (!_tmp0_) { +#line 8912 "Page.c" + gint _tmp1_; #line 1186 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = i; + _tmp1_ = i; #line 1186 "/home/jens/Source/shotwell/src/Page.vala" - i = _tmp3_ + 1; -#line 8188 "Page.c" + i = _tmp1_ + 1; +#line 8918 "Page.c" } #line 1186 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = FALSE; + _tmp0_ = FALSE; #line 1186 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = i; + _tmp3_ = i; #line 1186 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = items; + _tmp4_ = items; #line 1186 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp5_ < _tmp6_) { -#line 8198 "Page.c" - GMenuModel* _tmp7_; + if (_tmp3_ < _tmp4_) { +#line 8928 "Page.c" + GMenuModel* _tmp5_; #line 1186 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = section; + _tmp5_ = section; #line 1186 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = _tmp7_ == NULL; -#line 8204 "Page.c" + _tmp2_ = _tmp5_ == NULL; +#line 8934 "Page.c" } else { #line 1186 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = FALSE; -#line 8208 "Page.c" + _tmp2_ = FALSE; +#line 8938 "Page.c" } #line 1186 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp4_) { + if (!_tmp2_) { #line 1186 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 8214 "Page.c" +#line 8944 "Page.c" } #line 1187 "/home/jens/Source/shotwell/src/Page.vala" name = NULL; #line 1188 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = model; + _tmp6_ = i; #line 1188 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = i; -#line 1188 "/home/jens/Source/shotwell/src/Page.vala" - g_menu_model_get_item_attribute (_tmp8_, _tmp9_, "id", "s", &name, NULL); -#line 1189 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = name; + g_menu_model_get_item_attribute (model, _tmp6_, "id", "s", &name, NULL); #line 1189 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = extension_point; + _tmp7_ = name; #line 1189 "/home/jens/Source/shotwell/src/Page.vala" - if (g_strcmp0 (_tmp10_, _tmp11_) == 0) { -#line 8230 "Page.c" - GMenuModel* _tmp12_; - gint _tmp13_; - GMenuModel* _tmp14_; + if (g_strcmp0 (_tmp7_, extension_point) == 0) { +#line 8956 "Page.c" + gint _tmp8_; + GMenuModel* _tmp9_; #line 1190 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = model; + _tmp8_ = i; #line 1190 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = i; -#line 1190 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = g_menu_model_get_item_link (_tmp12_, _tmp13_, G_MENU_LINK_SECTION); + _tmp9_ = g_menu_model_get_item_link (model, _tmp8_, G_MENU_LINK_SECTION); #line 1190 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (section); #line 1190 "/home/jens/Source/shotwell/src/Page.vala" - section = _tmp14_; -#line 8244 "Page.c" + section = _tmp9_; +#line 8967 "Page.c" } else { GMenuModel* subsection = NULL; - GMenuModel* _tmp15_; - gint _tmp16_; - GMenuModel* _tmp17_; - GMenuModel* _tmp18_; + gint _tmp10_; + GMenuModel* _tmp11_; + GMenuModel* _tmp12_; gint sub_items = 0; - GMenuModel* _tmp19_; - gint _tmp20_; + GMenuModel* _tmp13_; #line 1192 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = model; + _tmp10_ = i; #line 1192 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = i; + _tmp11_ = g_menu_model_get_item_link (model, _tmp10_, G_MENU_LINK_SECTION); #line 1192 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = g_menu_model_get_item_link (_tmp15_, _tmp16_, G_MENU_LINK_SECTION); -#line 1192 "/home/jens/Source/shotwell/src/Page.vala" - subsection = _tmp17_; + subsection = _tmp11_; #line 1194 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = subsection; + _tmp12_ = subsection; #line 1194 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp18_ == NULL) { + if (_tmp12_ == NULL) { #line 1195 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (subsection); #line 1195 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (name); #line 1195 "/home/jens/Source/shotwell/src/Page.vala" continue; -#line 8272 "Page.c" +#line 8991 "Page.c" } #line 1198 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = subsection; -#line 1198 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = g_menu_model_get_n_items (_tmp19_); + _tmp13_ = subsection; #line 1198 "/home/jens/Source/shotwell/src/Page.vala" - sub_items = _tmp20_; -#line 8280 "Page.c" + sub_items = g_menu_model_get_n_items (_tmp13_); +#line 8997 "Page.c" { gint j = 0; #line 1199 "/home/jens/Source/shotwell/src/Page.vala" j = 0; -#line 8285 "Page.c" +#line 9002 "Page.c" { - gboolean _tmp21_ = FALSE; + gboolean _tmp14_ = FALSE; #line 1199 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = TRUE; + _tmp14_ = TRUE; #line 1199 "/home/jens/Source/shotwell/src/Page.vala" while (TRUE) { -#line 8292 "Page.c" - gboolean _tmp23_ = FALSE; - gint _tmp24_; - gint _tmp25_; +#line 9009 "Page.c" + gboolean _tmp16_ = FALSE; + gint _tmp17_; + gint _tmp18_; GMenuModel* submenu = NULL; - GMenuModel* _tmp27_; - gint _tmp28_; - GMenuModel* _tmp29_; - GMenuModel* _tmp30_; + GMenuModel* _tmp20_; + gint _tmp21_; + GMenuModel* _tmp22_; + GMenuModel* _tmp23_; #line 1199 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp21_) { -#line 8303 "Page.c" - gint _tmp22_; + if (!_tmp14_) { +#line 9020 "Page.c" + gint _tmp15_; #line 1199 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = j; + _tmp15_ = j; #line 1199 "/home/jens/Source/shotwell/src/Page.vala" - j = _tmp22_ + 1; -#line 8309 "Page.c" + j = _tmp15_ + 1; +#line 9026 "Page.c" } #line 1199 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = FALSE; + _tmp14_ = FALSE; #line 1199 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = j; + _tmp17_ = j; #line 1199 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = sub_items; + _tmp18_ = sub_items; #line 1199 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp24_ < _tmp25_) { -#line 8319 "Page.c" - GMenuModel* _tmp26_; + if (_tmp17_ < _tmp18_) { +#line 9036 "Page.c" + GMenuModel* _tmp19_; #line 1199 "/home/jens/Source/shotwell/src/Page.vala" - _tmp26_ = section; + _tmp19_ = section; #line 1199 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = _tmp26_ == NULL; -#line 8325 "Page.c" + _tmp16_ = _tmp19_ == NULL; +#line 9042 "Page.c" } else { #line 1199 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = FALSE; -#line 8329 "Page.c" + _tmp16_ = FALSE; +#line 9046 "Page.c" } #line 1199 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp23_) { + if (!_tmp16_) { #line 1199 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 8335 "Page.c" +#line 9052 "Page.c" } #line 1200 "/home/jens/Source/shotwell/src/Page.vala" - _tmp27_ = subsection; + _tmp20_ = subsection; #line 1200 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = j; + _tmp21_ = j; #line 1200 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = g_menu_model_get_item_link (_tmp27_, _tmp28_, G_MENU_LINK_SUBMENU); + _tmp22_ = g_menu_model_get_item_link (_tmp20_, _tmp21_, G_MENU_LINK_SUBMENU); #line 1200 "/home/jens/Source/shotwell/src/Page.vala" - submenu = _tmp29_; + submenu = _tmp22_; #line 1202 "/home/jens/Source/shotwell/src/Page.vala" - _tmp30_ = submenu; + _tmp23_ = submenu; #line 1202 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp30_ != NULL) { -#line 8349 "Page.c" - GMenuModel* _tmp31_; - const gchar* _tmp32_; - GMenuModel* _tmp33_; + if (_tmp23_ != NULL) { +#line 9066 "Page.c" + GMenuModel* _tmp24_; + GMenuModel* _tmp25_; #line 1203 "/home/jens/Source/shotwell/src/Page.vala" - _tmp31_ = submenu; + _tmp24_ = submenu; #line 1203 "/home/jens/Source/shotwell/src/Page.vala" - _tmp32_ = extension_point; -#line 1203 "/home/jens/Source/shotwell/src/Page.vala" - _tmp33_ = page_find_extension_point (self, _tmp31_, _tmp32_); + _tmp25_ = page_find_extension_point (self, _tmp24_, extension_point); #line 1203 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (section); #line 1203 "/home/jens/Source/shotwell/src/Page.vala" - section = _tmp33_; -#line 8363 "Page.c" + section = _tmp25_; +#line 9077 "Page.c" } #line 1199 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (submenu); -#line 8367 "Page.c" +#line 9081 "Page.c" } } } #line 1189 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (subsection); -#line 8373 "Page.c" +#line 9087 "Page.c" } #line 1186 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (name); -#line 8377 "Page.c" +#line 9091 "Page.c" } } } @@ -8381,11 +9095,13 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha result = section; #line 1210 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 8385 "Page.c" +#line 9099 "Page.c" } -static void page_class_init (PageClass * klass) { +static void +page_class_init (PageClass * klass) +{ #line 58 "/home/jens/Source/shotwell/src/Page.vala" page_parent_class = g_type_class_peek_parent (klass); #line 58 "/home/jens/Source/shotwell/src/Page.vala" @@ -8494,11 +9210,13 @@ static void page_class_init (PageClass * klass) { ((PageClass *) klass)->set_page_cursor = (void (*) (Page *, GdkCursorType)) page_real_set_page_cursor; #line 58 "/home/jens/Source/shotwell/src/Page.vala" G_OBJECT_CLASS (klass)->finalize = page_finalize; -#line 8498 "Page.c" +#line 9214 "Page.c" } -static void page_instance_init (Page * self) { +static void +page_instance_init (Page * self) +{ GtkBuilder* _tmp0_; #line 58 "/home/jens/Source/shotwell/src/Page.vala" self->priv = PAGE_GET_PRIVATE (self); @@ -8552,11 +9270,13 @@ static void page_instance_init (Page * self) { self->priv->update_actions_scheduler = NULL; #line 205 "/home/jens/Source/shotwell/src/Page.vala" self->priv->menubar_injected = FALSE; -#line 8556 "Page.c" +#line 9274 "Page.c" } -static void page_finalize (GObject * obj) { +static void +page_finalize (GObject * obj) +{ Page * self; #line 58 "/home/jens/Source/shotwell/src/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE, Page); @@ -8578,11 +9298,13 @@ static void page_finalize (GObject * obj) { _one_shot_scheduler_unref0 (self->priv->update_actions_scheduler); #line 58 "/home/jens/Source/shotwell/src/Page.vala" G_OBJECT_CLASS (page_parent_class)->finalize (obj); -#line 8582 "Page.c" +#line 9302 "Page.c" } -GType page_get_type (void) { +GType +page_get_type (void) +{ static volatile gsize page_type_id__volatile = 0; if (g_once_init_enter (&page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Page), 0, (GInstanceInitFunc) page_instance_init, NULL }; @@ -8594,7 +9316,9 @@ GType page_get_type (void) { } -GType checkerboard_page_activator_get_type (void) { +GType +checkerboard_page_activator_get_type (void) +{ static volatile gsize checkerboard_page_activator_type_id__volatile = 0; if (g_once_init_enter (&checkerboard_page_activator_type_id__volatile)) { static const GEnumValue values[] = {{CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD, "CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD", "keyboard"}, {CHECKERBOARD_PAGE_ACTIVATOR_MOUSE, "CHECKERBOARD_PAGE_ACTIVATOR_MOUSE", "mouse"}, {0, NULL, NULL}}; @@ -8606,204 +9330,219 @@ GType checkerboard_page_activator_get_type (void) { } -static void _checkerboard_page_on_items_hidden_view_collection_items_hidden (ViewCollection* _sender, GeeCollection* hidden, gpointer self) { +static void +_checkerboard_page_on_items_hidden_view_collection_items_hidden (ViewCollection* _sender, + GeeCollection* hidden, + gpointer self) +{ #line 1272 "/home/jens/Source/shotwell/src/Page.vala" checkerboard_page_on_items_hidden ((CheckerboardPage*) self, hidden); -#line 8613 "Page.c" +#line 9341 "Page.c" } -static void _checkerboard_page_on_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { +static void +_checkerboard_page_on_contents_altered_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self) +{ #line 1273 "/home/jens/Source/shotwell/src/Page.vala" checkerboard_page_on_contents_altered ((CheckerboardPage*) self, added, removed); -#line 8620 "Page.c" +#line 9353 "Page.c" } -static void _checkerboard_page_on_items_state_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) { +static void +_checkerboard_page_on_items_state_changed_view_collection_items_state_changed (ViewCollection* _sender, + GeeIterable* changed, + gpointer self) +{ #line 1274 "/home/jens/Source/shotwell/src/Page.vala" checkerboard_page_on_items_state_changed ((CheckerboardPage*) self, changed); -#line 8627 "Page.c" +#line 9364 "Page.c" } -static void _checkerboard_page_on_items_visibility_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) { +static void +_checkerboard_page_on_items_visibility_changed_view_collection_items_visibility_changed (ViewCollection* _sender, + GeeCollection* changed, + gpointer self) +{ #line 1275 "/home/jens/Source/shotwell/src/Page.vala" checkerboard_page_on_items_visibility_changed ((CheckerboardPage*) self, changed); -#line 8634 "Page.c" +#line 9375 "Page.c" } -CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name) { +CheckerboardPage* +checkerboard_page_construct (GType object_type, + const gchar* page_name) +{ CheckerboardPage * self = NULL; - const gchar* _tmp0_; + ViewCollection* _tmp0_; ViewCollection* _tmp1_; - ViewCollection* _tmp2_; + CheckerboardLayout* _tmp2_; CheckerboardLayout* _tmp3_; CheckerboardLayout* _tmp4_; - const gchar* _tmp5_; - CheckerboardLayout* _tmp6_; + GtkViewport* _tmp5_; + GtkViewport* _tmp6_; GtkViewport* _tmp7_; - GtkViewport* _tmp8_; - GtkViewport* _tmp9_; - CheckerboardLayout* _tmp10_; - CheckerboardLayout* _tmp11_; - GtkAdjustment* _tmp12_; - GtkAdjustment* _tmp13_; - GtkViewport* _tmp14_; + CheckerboardLayout* _tmp8_; + CheckerboardLayout* _tmp9_; + GtkAdjustment* _tmp10_; + GtkAdjustment* _tmp11_; + GtkViewport* _tmp12_; + ViewCollection* _tmp13_; + ViewCollection* _tmp14_; ViewCollection* _tmp15_; ViewCollection* _tmp16_; ViewCollection* _tmp17_; ViewCollection* _tmp18_; ViewCollection* _tmp19_; ViewCollection* _tmp20_; - ViewCollection* _tmp21_; - ViewCollection* _tmp22_; #line 1249 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (page_name != NULL, NULL); #line 1250 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = page_name; -#line 1250 "/home/jens/Source/shotwell/src/Page.vala" - self = (CheckerboardPage*) page_construct (object_type, _tmp0_); + self = (CheckerboardPage*) page_construct (object_type, page_name); #line 1252 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1252 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 1252 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = checkerboard_layout_new (_tmp2_); + _tmp2_ = checkerboard_layout_new (_tmp1_); #line 1252 "/home/jens/Source/shotwell/src/Page.vala" - g_object_ref_sink (_tmp3_); + g_object_ref_sink (_tmp2_); #line 1252 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->layout); #line 1252 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->layout = _tmp3_; + self->priv->layout = _tmp2_; #line 1252 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp2_); -#line 1253 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = self->priv->layout; + _data_collection_unref0 (_tmp1_); #line 1253 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = page_name; + _tmp3_ = self->priv->layout; #line 1253 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_layout_set_name (_tmp4_, _tmp5_); + checkerboard_layout_set_name (_tmp3_, page_name); #line 1255 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = self->priv->layout; + _tmp4_ = self->priv->layout; #line 1255 "/home/jens/Source/shotwell/src/Page.vala" - page_set_event_source (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); + page_set_event_source (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); #line 1257 "/home/jens/Source/shotwell/src/Page.vala" gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), (guint) 0); #line 1258 "/home/jens/Source/shotwell/src/Page.vala" gtk_scrolled_window_set_shadow_type (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), GTK_SHADOW_NONE); #line 1260 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = self->priv->viewport; + _tmp5_ = self->priv->viewport; #line 1260 "/home/jens/Source/shotwell/src/Page.vala" - gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_container_get_type (), GtkContainer), (guint) 0); + gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_container_get_type (), GtkContainer), (guint) 0); #line 1261 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = self->priv->viewport; + _tmp6_ = self->priv->viewport; #line 1261 "/home/jens/Source/shotwell/src/Page.vala" - gtk_viewport_set_shadow_type (_tmp8_, GTK_SHADOW_NONE); + gtk_viewport_set_shadow_type (_tmp6_, GTK_SHADOW_NONE); #line 1263 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = self->priv->viewport; + _tmp7_ = self->priv->viewport; #line 1263 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = self->priv->layout; + _tmp8_ = self->priv->layout; #line 1263 "/home/jens/Source/shotwell/src/Page.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget)); #line 1267 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = self->priv->layout; + _tmp9_ = self->priv->layout; #line 1267 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = gtk_scrolled_window_get_hadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow)); + _tmp10_ = gtk_scrolled_window_get_hadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow)); #line 1267 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow)); + _tmp11_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow)); #line 1267 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_layout_set_adjustments (_tmp11_, _tmp12_, _tmp13_); + checkerboard_layout_set_adjustments (_tmp9_, _tmp10_, _tmp11_); #line 1269 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = self->priv->viewport; + _tmp12_ = self->priv->viewport; #line 1269 "/home/jens/Source/shotwell/src/Page.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget)); #line 1272 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1272 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = _tmp15_; + _tmp14_ = _tmp13_; #line 1272 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (_tmp16_, "items-hidden", (GCallback) _checkerboard_page_on_items_hidden_view_collection_items_hidden, self, 0); + g_signal_connect_object (_tmp14_, "items-hidden", (GCallback) _checkerboard_page_on_items_hidden_view_collection_items_hidden, self, 0); #line 1272 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp16_); + _data_collection_unref0 (_tmp14_); #line 1273 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1273 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = _tmp17_; + _tmp16_ = _tmp15_; #line 1273 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _checkerboard_page_on_contents_altered_data_collection_contents_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _checkerboard_page_on_contents_altered_data_collection_contents_altered, self, 0); #line 1273 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp18_); + _data_collection_unref0 (_tmp16_); #line 1274 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1274 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = _tmp19_; + _tmp18_ = _tmp17_; #line 1274 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (_tmp20_, "items-state-changed", (GCallback) _checkerboard_page_on_items_state_changed_view_collection_items_state_changed, self, 0); + g_signal_connect_object (_tmp18_, "items-state-changed", (GCallback) _checkerboard_page_on_items_state_changed_view_collection_items_state_changed, self, 0); #line 1274 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp20_); + _data_collection_unref0 (_tmp18_); #line 1275 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1275 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = _tmp21_; + _tmp20_ = _tmp19_; #line 1275 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (_tmp22_, "items-visibility-changed", (GCallback) _checkerboard_page_on_items_visibility_changed_view_collection_items_visibility_changed, self, 0); + g_signal_connect_object (_tmp20_, "items-visibility-changed", (GCallback) _checkerboard_page_on_items_visibility_changed_view_collection_items_visibility_changed, self, 0); #line 1275 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp22_); + _data_collection_unref0 (_tmp20_); #line 1278 "/home/jens/Source/shotwell/src/Page.vala" gtk_scrolled_window_set_policy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); #line 1249 "/home/jens/Source/shotwell/src/Page.vala" return self; -#line 8759 "Page.c" +#line 9497 "Page.c" } -void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path) { - const gchar* _tmp0_; - gchar* _tmp1_; +void +checkerboard_page_init_item_context_menu (CheckerboardPage* self, + const gchar* path) +{ + gchar* _tmp0_; #line 1281 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (self)); #line 1281 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (path != NULL); #line 1282 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = path; -#line 1282 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (path); #line 1282 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (self->priv->item_context_menu_path); #line 1282 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->item_context_menu_path = _tmp1_; -#line 8778 "Page.c" + self->priv->item_context_menu_path = _tmp0_; +#line 9516 "Page.c" } -void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path) { - const gchar* _tmp0_; - gchar* _tmp1_; +void +checkerboard_page_init_page_context_menu (CheckerboardPage* self, + const gchar* path) +{ + gchar* _tmp0_; #line 1285 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (self)); #line 1285 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (path != NULL); #line 1286 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = path; -#line 1286 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (path); #line 1286 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (self->priv->page_context_menu_path); #line 1286 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->page_context_menu_path = _tmp1_; -#line 8797 "Page.c" + self->priv->page_context_menu_path = _tmp0_; +#line 9535 "Page.c" } -GtkMenu* checkerboard_page_get_context_menu (CheckerboardPage* self) { +GtkMenu* +checkerboard_page_get_context_menu (CheckerboardPage* self) +{ GtkMenu* result = NULL; GtkMenu* _tmp0_ = NULL; ViewCollection* _tmp1_; ViewCollection* _tmp2_; - gint _tmp3_; - gboolean _tmp4_; + gboolean _tmp3_; #line 1289 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL); #line 1291 "/home/jens/Source/shotwell/src/Page.vala" @@ -8811,41 +9550,41 @@ GtkMenu* checkerboard_page_get_context_menu (CheckerboardPage* self) { #line 1291 "/home/jens/Source/shotwell/src/Page.vala" _tmp2_ = _tmp1_; #line 1291 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = view_collection_get_selected_count (_tmp2_); -#line 1291 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = _tmp3_ != 0; + _tmp3_ = view_collection_get_selected_count (_tmp2_) != 0; #line 1291 "/home/jens/Source/shotwell/src/Page.vala" _data_collection_unref0 (_tmp2_); #line 1291 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp4_) { -#line 8822 "Page.c" - GtkMenu* _tmp5_; + if (_tmp3_) { +#line 9559 "Page.c" + GtkMenu* _tmp4_; #line 1291 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = checkerboard_page_get_item_context_menu (self); + _tmp4_ = checkerboard_page_get_item_context_menu (self); #line 1291 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (_tmp0_); #line 1291 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = _tmp5_; -#line 8830 "Page.c" + _tmp0_ = _tmp4_; +#line 9567 "Page.c" } else { - GtkMenu* _tmp6_; + GtkMenu* _tmp5_; #line 1292 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = page_get_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp5_ = page_get_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1292 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (_tmp0_); #line 1292 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = _tmp6_; -#line 8839 "Page.c" + _tmp0_ = _tmp5_; +#line 9576 "Page.c" } #line 1291 "/home/jens/Source/shotwell/src/Page.vala" result = _tmp0_; #line 1291 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 8845 "Page.c" +#line 9582 "Page.c" } -static GtkMenu* checkerboard_page_real_get_item_context_menu (CheckerboardPage* self) { +static GtkMenu* +checkerboard_page_real_get_item_context_menu (CheckerboardPage* self) +{ GtkMenu* result = NULL; GtkMenu* _tmp0_; GtkMenu* _tmp8_; @@ -8854,7 +9593,7 @@ static GtkMenu* checkerboard_page_real_get_item_context_menu (CheckerboardPage* _tmp0_ = self->priv->item_context_menu; #line 1297 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp0_ == NULL) { -#line 8858 "Page.c" +#line 9597 "Page.c" GMenuModel* model = NULL; GtkBuilder* _tmp1_; const gchar* _tmp2_; @@ -8889,7 +9628,7 @@ static GtkMenu* checkerboard_page_real_get_item_context_menu (CheckerboardPage* gtk_menu_attach_to_widget (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL); #line 1297 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (model); -#line 8893 "Page.c" +#line 9632 "Page.c" } #line 1304 "/home/jens/Source/shotwell/src/Page.vala" _tmp8_ = self->priv->item_context_menu; @@ -8899,20 +9638,24 @@ static GtkMenu* checkerboard_page_real_get_item_context_menu (CheckerboardPage* result = _tmp9_; #line 1304 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 8903 "Page.c" +#line 9642 "Page.c" } -GtkMenu* checkerboard_page_get_item_context_menu (CheckerboardPage* self) { +GtkMenu* +checkerboard_page_get_item_context_menu (CheckerboardPage* self) +{ #line 1296 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL); #line 1296 "/home/jens/Source/shotwell/src/Page.vala" return CHECKERBOARD_PAGE_GET_CLASS (self)->get_item_context_menu (self); -#line 8912 "Page.c" +#line 9653 "Page.c" } -static GtkMenu* checkerboard_page_real_get_page_context_menu (Page* base) { +static GtkMenu* +checkerboard_page_real_get_page_context_menu (Page* base) +{ CheckerboardPage * self; GtkMenu* result = NULL; const gchar* _tmp0_; @@ -8929,13 +9672,13 @@ static GtkMenu* checkerboard_page_real_get_page_context_menu (Page* base) { result = NULL; #line 1310 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 8933 "Page.c" +#line 9676 "Page.c" } #line 1312 "/home/jens/Source/shotwell/src/Page.vala" _tmp1_ = self->priv->page_context_menu; #line 1312 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp1_ == NULL) { -#line 8939 "Page.c" +#line 9682 "Page.c" GMenuModel* model = NULL; GtkBuilder* _tmp2_; const gchar* _tmp3_; @@ -8970,7 +9713,7 @@ static GtkMenu* checkerboard_page_real_get_page_context_menu (Page* base) { gtk_menu_attach_to_widget (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL); #line 1312 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (model); -#line 8974 "Page.c" +#line 9717 "Page.c" } #line 1319 "/home/jens/Source/shotwell/src/Page.vala" _tmp9_ = self->priv->page_context_menu; @@ -8980,17 +9723,18 @@ static GtkMenu* checkerboard_page_real_get_page_context_menu (Page* base) { result = _tmp10_; #line 1319 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 8984 "Page.c" +#line 9727 "Page.c" } -static gboolean checkerboard_page_real_on_context_keypress (Page* base) { +static gboolean +checkerboard_page_real_on_context_keypress (Page* base) +{ CheckerboardPage * self; gboolean result = FALSE; GtkMenu* _tmp0_; GtkMenu* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; #line 1322 "/home/jens/Source/shotwell/src/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage); #line 1323 "/home/jens/Source/shotwell/src/Page.vala" @@ -8999,19 +9743,19 @@ static gboolean checkerboard_page_real_on_context_keypress (Page* base) { _tmp1_ = _tmp0_; #line 1323 "/home/jens/Source/shotwell/src/Page.vala" _tmp2_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL); -#line 1323 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = _tmp2_; #line 1323 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (_tmp1_); #line 1323 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp3_; + result = _tmp2_; #line 1323 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 9011 "Page.c" +#line 9753 "Page.c" } -static gchar* checkerboard_page_real_get_view_empty_message (CheckerboardPage* self) { +static gchar* +checkerboard_page_real_get_view_empty_message (CheckerboardPage* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 1327 "/home/jens/Source/shotwell/src/Page.vala" @@ -9020,20 +9764,24 @@ static gchar* checkerboard_page_real_get_view_empty_message (CheckerboardPage* s result = _tmp0_; #line 1327 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 9024 "Page.c" +#line 9768 "Page.c" } -gchar* checkerboard_page_get_view_empty_message (CheckerboardPage* self) { +gchar* +checkerboard_page_get_view_empty_message (CheckerboardPage* self) +{ #line 1326 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL); #line 1326 "/home/jens/Source/shotwell/src/Page.vala" return CHECKERBOARD_PAGE_GET_CLASS (self)->get_view_empty_message (self); -#line 9033 "Page.c" +#line 9779 "Page.c" } -static gchar* checkerboard_page_real_get_filter_no_match_message (CheckerboardPage* self) { +static gchar* +checkerboard_page_real_get_filter_no_match_message (CheckerboardPage* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 1331 "/home/jens/Source/shotwell/src/Page.vala" @@ -9042,38 +9790,52 @@ static gchar* checkerboard_page_real_get_filter_no_match_message (CheckerboardPa result = _tmp0_; #line 1331 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 9046 "Page.c" +#line 9794 "Page.c" } -gchar* checkerboard_page_get_filter_no_match_message (CheckerboardPage* self) { +gchar* +checkerboard_page_get_filter_no_match_message (CheckerboardPage* self) +{ #line 1330 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL); #line 1330 "/home/jens/Source/shotwell/src/Page.vala" return CHECKERBOARD_PAGE_GET_CLASS (self)->get_filter_no_match_message (self); -#line 9055 "Page.c" +#line 9805 "Page.c" } -static void checkerboard_page_real_on_item_activated (CheckerboardPage* self, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) { +static void +checkerboard_page_real_on_item_activated (CheckerboardPage* self, + CheckerboardItem* item, + CheckerboardPageActivator activator, + CheckerboardPageKeyboardModifiers* modifiers) +{ #line 1334 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_CHECKERBOARD_ITEM (item)); #line 1334 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (modifiers != NULL); -#line 9064 "Page.c" +#line 9819 "Page.c" } -void checkerboard_page_on_item_activated (CheckerboardPage* self, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) { +void +checkerboard_page_on_item_activated (CheckerboardPage* self, + CheckerboardItem* item, + CheckerboardPageActivator activator, + CheckerboardPageKeyboardModifiers* modifiers) +{ #line 1334 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (self)); #line 1334 "/home/jens/Source/shotwell/src/Page.vala" CHECKERBOARD_PAGE_GET_CLASS (self)->on_item_activated (self, item, activator, modifiers); -#line 9073 "Page.c" +#line 9833 "Page.c" } -CheckerboardLayout* checkerboard_page_get_checkerboard_layout (CheckerboardPage* self) { +CheckerboardLayout* +checkerboard_page_get_checkerboard_layout (CheckerboardPage* self) +{ CheckerboardLayout* result = NULL; CheckerboardLayout* _tmp0_; CheckerboardLayout* _tmp1_; @@ -9087,55 +9849,68 @@ CheckerboardLayout* checkerboard_page_get_checkerboard_layout (CheckerboardPage* result = _tmp1_; #line 1339 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 9091 "Page.c" +#line 9853 "Page.c" } -static SearchViewFilter* checkerboard_page_real_get_search_view_filter (CheckerboardPage* self) { +static SearchViewFilter* +checkerboard_page_real_get_search_view_filter (CheckerboardPage* self) +{ #line 1343 "/home/jens/Source/shotwell/src/Page.vala" g_critical ("Type `%s' does not implement abstract method `checkerboard_page_get_search_view_filter'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 1343 "/home/jens/Source/shotwell/src/Page.vala" return NULL; -#line 9100 "Page.c" +#line 9864 "Page.c" } -SearchViewFilter* checkerboard_page_get_search_view_filter (CheckerboardPage* self) { +SearchViewFilter* +checkerboard_page_get_search_view_filter (CheckerboardPage* self) +{ #line 1343 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL); #line 1343 "/home/jens/Source/shotwell/src/Page.vala" return CHECKERBOARD_PAGE_GET_CLASS (self)->get_search_view_filter (self); -#line 9109 "Page.c" +#line 9875 "Page.c" } -static CoreViewTracker* checkerboard_page_real_get_view_tracker (CheckerboardPage* self) { +static CoreViewTracker* +checkerboard_page_real_get_view_tracker (CheckerboardPage* self) +{ CoreViewTracker* result = NULL; #line 1346 "/home/jens/Source/shotwell/src/Page.vala" result = NULL; #line 1346 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 9119 "Page.c" +#line 9887 "Page.c" } -CoreViewTracker* checkerboard_page_get_view_tracker (CheckerboardPage* self) { +CoreViewTracker* +checkerboard_page_get_view_tracker (CheckerboardPage* self) +{ #line 1345 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL); #line 1345 "/home/jens/Source/shotwell/src/Page.vala" return CHECKERBOARD_PAGE_GET_CLASS (self)->get_view_tracker (self); -#line 9128 "Page.c" +#line 9898 "Page.c" } -static void _checkerboard_page_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, gpointer self) { +static void +_checkerboard_page_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, + gpointer self) +{ #line 1351 "/home/jens/Source/shotwell/src/Page.vala" checkerboard_page_on_view_filter_refresh ((CheckerboardPage*) self); -#line 9135 "Page.c" +#line 9908 "Page.c" } -static void checkerboard_page_real_switching_from (Page* base) { +static void +checkerboard_page_real_switching_from (Page* base) +{ CheckerboardPage * self; CheckerboardLayout* _tmp0_; SearchViewFilter* _tmp1_; @@ -9169,19 +9944,20 @@ static void checkerboard_page_real_switching_from (Page* base) { _data_collection_unref0 (_tmp5_); #line 1356 "/home/jens/Source/shotwell/src/Page.vala" PAGE_CLASS (checkerboard_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 9173 "Page.c" +#line 9948 "Page.c" } -static void checkerboard_page_real_switched_to (Page* base) { +static void +checkerboard_page_real_switched_to (Page* base) +{ CheckerboardPage * self; CheckerboardLayout* _tmp0_; SearchViewFilter* _tmp1_; SearchViewFilter* _tmp2_; ViewCollection* _tmp3_; ViewCollection* _tmp4_; - gint _tmp5_; - gboolean _tmp6_; + gboolean _tmp5_; #line 1359 "/home/jens/Source/shotwell/src/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage); #line 1360 "/home/jens/Source/shotwell/src/Page.vala" @@ -9203,198 +9979,190 @@ static void checkerboard_page_real_switched_to (Page* base) { #line 1364 "/home/jens/Source/shotwell/src/Page.vala" _tmp4_ = _tmp3_; #line 1364 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = view_collection_get_selected_count (_tmp4_); -#line 1364 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = _tmp5_ > 0; + _tmp5_ = view_collection_get_selected_count (_tmp4_) > 0; #line 1364 "/home/jens/Source/shotwell/src/Page.vala" _data_collection_unref0 (_tmp4_); #line 1364 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp6_) { -#line 9214 "Page.c" + if (_tmp5_) { +#line 9988 "Page.c" CheckerboardItem* item = NULL; + ViewCollection* _tmp6_; ViewCollection* _tmp7_; - ViewCollection* _tmp8_; - DataView* _tmp9_; - CheckerboardItem* _tmp10_; + DataView* _tmp8_; + CheckerboardItem* _tmp9_; GtkAdjustment* vadj = NULL; + GtkAdjustment* _tmp10_; GtkAdjustment* _tmp11_; - GtkAdjustment* _tmp12_; - gboolean _tmp13_ = FALSE; - GtkAdjustment* _tmp14_; - CheckerboardItem* _tmp15_; - GdkRectangle _tmp16_; - gint _tmp17_; - AdjustmentRelation _tmp18_; + gboolean _tmp12_ = FALSE; + GtkAdjustment* _tmp13_; + CheckerboardItem* _tmp14_; + GdkRectangle _tmp15_; + gint _tmp16_; #line 1365 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1365 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 1365 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = view_collection_get_selected_at (_tmp8_, 0); + _tmp8_ = view_collection_get_selected_at (_tmp7_, 0); #line 1365 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); + _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); #line 1365 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp8_); + _data_collection_unref0 (_tmp7_); #line 1365 "/home/jens/Source/shotwell/src/Page.vala" - item = _tmp10_; + item = _tmp9_; #line 1368 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow)); + _tmp10_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow)); #line 1368 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = _g_object_ref0 (_tmp11_); + _tmp11_ = _g_object_ref0 (_tmp10_); #line 1368 "/home/jens/Source/shotwell/src/Page.vala" - vadj = _tmp12_; -#line 1369 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = vadj; + vadj = _tmp11_; #line 1369 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = item; + _tmp13_ = vadj; #line 1369 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = _tmp15_->allocation; + _tmp14_ = item; #line 1369 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = _tmp16_.y; + _tmp15_ = _tmp14_->allocation; #line 1369 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = get_adjustment_relation (_tmp14_, _tmp17_); + _tmp16_ = _tmp15_.y; #line 1369 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp18_ == ADJUSTMENT_RELATION_IN_RANGE) { -#line 9259 "Page.c" - GtkAdjustment* _tmp19_; - CheckerboardItem* _tmp20_; - GdkRectangle _tmp21_; - gint _tmp22_; - CheckerboardItem* _tmp23_; - GdkRectangle _tmp24_; - gint _tmp25_; - AdjustmentRelation _tmp26_; -#line 1370 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = vadj; + if (get_adjustment_relation (_tmp13_, _tmp16_) == ADJUSTMENT_RELATION_IN_RANGE) { +#line 10030 "Page.c" + GtkAdjustment* _tmp17_; + CheckerboardItem* _tmp18_; + GdkRectangle _tmp19_; + gint _tmp20_; + CheckerboardItem* _tmp21_; + GdkRectangle _tmp22_; + gint _tmp23_; #line 1370 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = item; + _tmp17_ = vadj; #line 1370 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = _tmp20_->allocation; + _tmp18_ = item; #line 1370 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = _tmp21_.y; + _tmp19_ = _tmp18_->allocation; #line 1370 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = item; + _tmp20_ = _tmp19_.y; #line 1370 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = _tmp23_->allocation; + _tmp21_ = item; #line 1370 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = _tmp24_.height; + _tmp22_ = _tmp21_->allocation; #line 1370 "/home/jens/Source/shotwell/src/Page.vala" - _tmp26_ = get_adjustment_relation (_tmp19_, _tmp22_ + _tmp25_); + _tmp23_ = _tmp22_.height; #line 1370 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = _tmp26_ == ADJUSTMENT_RELATION_IN_RANGE; -#line 9286 "Page.c" + _tmp12_ = get_adjustment_relation (_tmp17_, _tmp20_ + _tmp23_) == ADJUSTMENT_RELATION_IN_RANGE; +#line 10054 "Page.c" } else { #line 1369 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = FALSE; -#line 9290 "Page.c" + _tmp12_ = FALSE; +#line 10058 "Page.c" } #line 1369 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp13_) { -#line 9294 "Page.c" + if (!_tmp12_) { +#line 10062 "Page.c" gint top = 0; - CheckerboardItem* _tmp27_; - GdkRectangle _tmp28_; - gint _tmp29_; - GtkAdjustment* _tmp30_; - gdouble _tmp31_; - GtkAdjustment* _tmp45_; - gint _tmp46_; + CheckerboardItem* _tmp24_; + GdkRectangle _tmp25_; + gint _tmp26_; + GtkAdjustment* _tmp27_; + GtkAdjustment* _tmp40_; + gint _tmp41_; #line 1373 "/home/jens/Source/shotwell/src/Page.vala" top = 0; #line 1374 "/home/jens/Source/shotwell/src/Page.vala" - _tmp27_ = item; -#line 1374 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = _tmp27_->allocation; + _tmp24_ = item; #line 1374 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = _tmp28_.y; + _tmp25_ = _tmp24_->allocation; #line 1374 "/home/jens/Source/shotwell/src/Page.vala" - _tmp30_ = vadj; + _tmp26_ = _tmp25_.y; #line 1374 "/home/jens/Source/shotwell/src/Page.vala" - _tmp31_ = gtk_adjustment_get_value (_tmp30_); + _tmp27_ = vadj; #line 1374 "/home/jens/Source/shotwell/src/Page.vala" - if (((gdouble) _tmp29_) < _tmp31_) { -#line 9317 "Page.c" - CheckerboardItem* _tmp32_; - GdkRectangle _tmp33_; - gint _tmp34_; - gint _tmp35_; + if (((gdouble) _tmp26_) < gtk_adjustment_get_value (_tmp27_)) { +#line 10082 "Page.c" + CheckerboardItem* _tmp28_; + GdkRectangle _tmp29_; + gint _tmp30_; + gint _tmp31_; #line 1375 "/home/jens/Source/shotwell/src/Page.vala" - _tmp32_ = item; + _tmp28_ = item; #line 1375 "/home/jens/Source/shotwell/src/Page.vala" - _tmp33_ = _tmp32_->allocation; + _tmp29_ = _tmp28_->allocation; #line 1375 "/home/jens/Source/shotwell/src/Page.vala" - _tmp34_ = _tmp33_.y; + _tmp30_ = _tmp29_.y; #line 1375 "/home/jens/Source/shotwell/src/Page.vala" - top = _tmp34_; + top = _tmp30_; #line 1376 "/home/jens/Source/shotwell/src/Page.vala" - _tmp35_ = top; + _tmp31_ = top; #line 1376 "/home/jens/Source/shotwell/src/Page.vala" - top = _tmp35_ - (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2); -#line 9334 "Page.c" + top = _tmp31_ - (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2); +#line 10099 "Page.c" } else { - CheckerboardItem* _tmp36_; - GdkRectangle _tmp37_; - gint _tmp38_; - CheckerboardItem* _tmp39_; - GdkRectangle _tmp40_; - gint _tmp41_; - GtkAdjustment* _tmp42_; - gdouble _tmp43_; - gint _tmp44_; -#line 1378 "/home/jens/Source/shotwell/src/Page.vala" - _tmp36_ = item; + CheckerboardItem* _tmp32_; + GdkRectangle _tmp33_; + gint _tmp34_; + CheckerboardItem* _tmp35_; + GdkRectangle _tmp36_; + gint _tmp37_; + GtkAdjustment* _tmp38_; + gint _tmp39_; #line 1378 "/home/jens/Source/shotwell/src/Page.vala" - _tmp37_ = _tmp36_->allocation; + _tmp32_ = item; #line 1378 "/home/jens/Source/shotwell/src/Page.vala" - _tmp38_ = _tmp37_.y; + _tmp33_ = _tmp32_->allocation; #line 1378 "/home/jens/Source/shotwell/src/Page.vala" - _tmp39_ = item; + _tmp34_ = _tmp33_.y; #line 1378 "/home/jens/Source/shotwell/src/Page.vala" - _tmp40_ = _tmp39_->allocation; + _tmp35_ = item; #line 1378 "/home/jens/Source/shotwell/src/Page.vala" - _tmp41_ = _tmp40_.height; + _tmp36_ = _tmp35_->allocation; #line 1378 "/home/jens/Source/shotwell/src/Page.vala" - _tmp42_ = vadj; + _tmp37_ = _tmp36_.height; #line 1378 "/home/jens/Source/shotwell/src/Page.vala" - _tmp43_ = gtk_adjustment_get_page_size (_tmp42_); + _tmp38_ = vadj; #line 1378 "/home/jens/Source/shotwell/src/Page.vala" - top = (_tmp38_ + _tmp41_) - ((gint) _tmp43_); + top = (_tmp34_ + _tmp37_) - ((gint) gtk_adjustment_get_page_size (_tmp38_)); #line 1379 "/home/jens/Source/shotwell/src/Page.vala" - _tmp44_ = top; + _tmp39_ = top; #line 1379 "/home/jens/Source/shotwell/src/Page.vala" - top = _tmp44_ + (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2); -#line 9367 "Page.c" + top = _tmp39_ + (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2); +#line 10129 "Page.c" } #line 1382 "/home/jens/Source/shotwell/src/Page.vala" - _tmp45_ = vadj; + _tmp40_ = vadj; #line 1382 "/home/jens/Source/shotwell/src/Page.vala" - _tmp46_ = top; + _tmp41_ = top; #line 1382 "/home/jens/Source/shotwell/src/Page.vala" - gtk_adjustment_set_value (_tmp45_, (gdouble) _tmp46_); -#line 9375 "Page.c" + gtk_adjustment_set_value (_tmp40_, (gdouble) _tmp41_); +#line 10137 "Page.c" } #line 1364 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (vadj); #line 1364 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (item); -#line 9381 "Page.c" +#line 10143 "Page.c" } #line 1387 "/home/jens/Source/shotwell/src/Page.vala" PAGE_CLASS (checkerboard_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 9385 "Page.c" +#line 10147 "Page.c" } -static void checkerboard_page_on_view_filter_refresh (CheckerboardPage* self) { +static void +checkerboard_page_on_view_filter_refresh (CheckerboardPage* self) +{ #line 1390 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (self)); #line 1391 "/home/jens/Source/shotwell/src/Page.vala" checkerboard_page_update_view_filter_message (self); -#line 9394 "Page.c" +#line 10158 "Page.c" } -static void checkerboard_page_on_contents_altered (CheckerboardPage* self, GeeIterable* added, GeeIterable* removed) { +static void +checkerboard_page_on_contents_altered (CheckerboardPage* self, + GeeIterable* added, + GeeIterable* removed) +{ #line 1394 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (self)); #line 1394 "/home/jens/Source/shotwell/src/Page.vala" @@ -9403,38 +10171,45 @@ static void checkerboard_page_on_contents_altered (CheckerboardPage* self, GeeIt g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); #line 1396 "/home/jens/Source/shotwell/src/Page.vala" checkerboard_page_update_view_filter_message (self); -#line 9407 "Page.c" +#line 10175 "Page.c" } -static void checkerboard_page_on_items_state_changed (CheckerboardPage* self, GeeIterable* changed) { +static void +checkerboard_page_on_items_state_changed (CheckerboardPage* self, + GeeIterable* changed) +{ #line 1399 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (self)); #line 1399 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (GEE_IS_ITERABLE (changed)); #line 1400 "/home/jens/Source/shotwell/src/Page.vala" checkerboard_page_update_view_filter_message (self); -#line 9418 "Page.c" +#line 10189 "Page.c" } -static void checkerboard_page_on_items_visibility_changed (CheckerboardPage* self, GeeCollection* changed) { +static void +checkerboard_page_on_items_visibility_changed (CheckerboardPage* self, + GeeCollection* changed) +{ #line 1403 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (self)); #line 1403 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (GEE_IS_COLLECTION (changed)); #line 1404 "/home/jens/Source/shotwell/src/Page.vala" checkerboard_page_update_view_filter_message (self); -#line 9429 "Page.c" +#line 10203 "Page.c" } -static void checkerboard_page_update_view_filter_message (CheckerboardPage* self) { +static void +checkerboard_page_update_view_filter_message (CheckerboardPage* self) +{ gboolean _tmp0_ = FALSE; ViewCollection* _tmp1_; ViewCollection* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 1407 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (self)); #line 1408 "/home/jens/Source/shotwell/src/Page.vala" @@ -9443,88 +10218,81 @@ static void checkerboard_page_update_view_filter_message (CheckerboardPage* self _tmp2_ = _tmp1_; #line 1408 "/home/jens/Source/shotwell/src/Page.vala" _tmp3_ = view_collection_are_items_filtered_out (_tmp2_); -#line 1408 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = _tmp3_; #line 1408 "/home/jens/Source/shotwell/src/Page.vala" _data_collection_unref0 (_tmp2_); #line 1408 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp4_) { -#line 9453 "Page.c" + if (_tmp3_) { +#line 10226 "Page.c" + ViewCollection* _tmp4_; ViewCollection* _tmp5_; - ViewCollection* _tmp6_; - gint _tmp7_; -#line 1408 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1408 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = _tmp5_; + _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1408 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp5_ = _tmp4_; #line 1408 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = _tmp7_ == 0; + _tmp0_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection)) == 0; #line 1408 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp6_); -#line 9467 "Page.c" + _data_collection_unref0 (_tmp5_); +#line 10237 "Page.c" } else { #line 1408 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = FALSE; -#line 9471 "Page.c" +#line 10241 "Page.c" } #line 1408 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp0_) { -#line 9475 "Page.c" - gchar* _tmp8_; - gchar* _tmp9_; +#line 10245 "Page.c" + gchar* _tmp6_; + gchar* _tmp7_; #line 1409 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = checkerboard_page_get_filter_no_match_message (self); + _tmp6_ = checkerboard_page_get_filter_no_match_message (self); #line 1409 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 1409 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_page_set_page_message (self, _tmp9_); + checkerboard_page_set_page_message (self, _tmp7_); #line 1409 "/home/jens/Source/shotwell/src/Page.vala" - _g_free0 (_tmp9_); -#line 9486 "Page.c" + _g_free0 (_tmp7_); +#line 10256 "Page.c" } else { - ViewCollection* _tmp10_; - ViewCollection* _tmp11_; - gint _tmp12_; - gboolean _tmp13_; -#line 1410 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + ViewCollection* _tmp8_; + ViewCollection* _tmp9_; + gboolean _tmp10_; #line 1410 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = _tmp10_; + _tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1410 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp9_ = _tmp8_; #line 1410 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = _tmp12_ == 0; + _tmp10_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection)) == 0; #line 1410 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp11_); + _data_collection_unref0 (_tmp9_); #line 1410 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp13_) { -#line 9504 "Page.c" - gchar* _tmp14_; - gchar* _tmp15_; + if (_tmp10_) { +#line 10271 "Page.c" + gchar* _tmp11_; + gchar* _tmp12_; #line 1411 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = checkerboard_page_get_view_empty_message (self); + _tmp11_ = checkerboard_page_get_view_empty_message (self); #line 1411 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = _tmp14_; + _tmp12_ = _tmp11_; #line 1411 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_page_set_page_message (self, _tmp15_); + checkerboard_page_set_page_message (self, _tmp12_); #line 1411 "/home/jens/Source/shotwell/src/Page.vala" - _g_free0 (_tmp15_); -#line 9515 "Page.c" + _g_free0 (_tmp12_); +#line 10282 "Page.c" } else { #line 1413 "/home/jens/Source/shotwell/src/Page.vala" checkerboard_page_unset_page_message (self); -#line 9519 "Page.c" +#line 10286 "Page.c" } } } -void checkerboard_page_set_page_message (CheckerboardPage* self, const gchar* message) { +void +checkerboard_page_set_page_message (CheckerboardPage* self, + const gchar* message) +{ CheckerboardLayout* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; #line 1417 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (self)); #line 1417 "/home/jens/Source/shotwell/src/Page.vala" @@ -9532,27 +10300,24 @@ void checkerboard_page_set_page_message (CheckerboardPage* self, const gchar* me #line 1418 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = self->priv->layout; #line 1418 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = message; -#line 1418 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_layout_set_message (_tmp0_, _tmp1_); + checkerboard_layout_set_message (_tmp0_, message); #line 1419 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1419 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp2_) { -#line 9543 "Page.c" - CheckerboardLayout* _tmp3_; + if (page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page))) { +#line 10307 "Page.c" + CheckerboardLayout* _tmp1_; #line 1420 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = self->priv->layout; + _tmp1_ = self->priv->layout; #line 1420 "/home/jens/Source/shotwell/src/Page.vala" - gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); -#line 9549 "Page.c" + gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); +#line 10313 "Page.c" } } -void checkerboard_page_unset_page_message (CheckerboardPage* self) { +void +checkerboard_page_unset_page_message (CheckerboardPage* self) +{ CheckerboardLayout* _tmp0_; - gboolean _tmp1_; #line 1423 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (self)); #line 1424 "/home/jens/Source/shotwell/src/Page.vala" @@ -9560,216 +10325,207 @@ void checkerboard_page_unset_page_message (CheckerboardPage* self) { #line 1424 "/home/jens/Source/shotwell/src/Page.vala" checkerboard_layout_unset_message (_tmp0_); #line 1425 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1425 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp1_) { -#line 9567 "Page.c" - CheckerboardLayout* _tmp2_; + if (page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page))) { +#line 10330 "Page.c" + CheckerboardLayout* _tmp1_; #line 1426 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = self->priv->layout; + _tmp1_ = self->priv->layout; #line 1426 "/home/jens/Source/shotwell/src/Page.vala" - gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); -#line 9573 "Page.c" + gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); +#line 10336 "Page.c" } } -static void checkerboard_page_real_set_page_name (Page* base, const gchar* name) { +static void +checkerboard_page_real_set_page_name (Page* base, + const gchar* name) +{ CheckerboardPage * self; - const gchar* _tmp0_; - CheckerboardLayout* _tmp1_; - const gchar* _tmp2_; + CheckerboardLayout* _tmp0_; #line 1429 "/home/jens/Source/shotwell/src/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage); #line 1429 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (name != NULL); #line 1430 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = name; -#line 1430 "/home/jens/Source/shotwell/src/Page.vala" - PAGE_CLASS (checkerboard_page_parent_class)->set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp0_); + PAGE_CLASS (checkerboard_page_parent_class)->set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), name); #line 1432 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = self->priv->layout; -#line 1432 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = name; + _tmp0_ = self->priv->layout; #line 1432 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_layout_set_name (_tmp1_, _tmp2_); -#line 9597 "Page.c" + checkerboard_layout_set_name (_tmp0_, name); +#line 10357 "Page.c" } -CheckerboardItem* checkerboard_page_get_item_at_pixel (CheckerboardPage* self, gdouble x, gdouble y) { +CheckerboardItem* +checkerboard_page_get_item_at_pixel (CheckerboardPage* self, + gdouble x, + gdouble y) +{ CheckerboardItem* result = NULL; CheckerboardLayout* _tmp0_; - gdouble _tmp1_; - gdouble _tmp2_; - CheckerboardItem* _tmp3_; + CheckerboardItem* _tmp1_; #line 1435 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL); #line 1436 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = self->priv->layout; #line 1436 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = x; + _tmp1_ = checkerboard_layout_get_item_at_pixel (_tmp0_, x, y); #line 1436 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = y; -#line 1436 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = checkerboard_layout_get_item_at_pixel (_tmp0_, _tmp1_, _tmp2_); -#line 1436 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp3_; + result = _tmp1_; #line 1436 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 9621 "Page.c" +#line 10379 "Page.c" } -static void checkerboard_page_on_items_hidden (CheckerboardPage* self, GeeIterable* hidden) { +static void +checkerboard_page_on_items_hidden (CheckerboardPage* self, + GeeIterable* hidden) +{ #line 1439 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (self)); #line 1439 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (GEE_IS_ITERABLE (hidden)); -#line 9630 "Page.c" +#line 10391 "Page.c" { GeeIterator* _view_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; -#line 1440 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = hidden; + GeeIterator* _tmp0_; #line 1440 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); + _tmp0_ = gee_iterable_iterator (hidden); #line 1440 "/home/jens/Source/shotwell/src/Page.vala" - _view_it = _tmp1_; + _view_it = _tmp0_; #line 1440 "/home/jens/Source/shotwell/src/Page.vala" while (TRUE) { -#line 9643 "Page.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 10401 "Page.c" + GeeIterator* _tmp1_; DataView* view = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; CheckerboardItem* item = NULL; - DataView* _tmp6_; + DataView* _tmp4_; + CheckerboardItem* _tmp5_; + CheckerboardItem* _tmp6_; CheckerboardItem* _tmp7_; CheckerboardItem* _tmp8_; CheckerboardItem* _tmp9_; CheckerboardItem* _tmp10_; CheckerboardItem* _tmp11_; - CheckerboardItem* _tmp12_; - CheckerboardItem* _tmp13_; -#line 1440 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = _view_it; #line 1440 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _view_it; #line 1440 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 1440 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 9666 "Page.c" +#line 10421 "Page.c" } #line 1440 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = _view_it; + _tmp2_ = _view_it; #line 1440 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 1440 "/home/jens/Source/shotwell/src/Page.vala" - view = (DataView*) _tmp5_; + view = (DataView*) _tmp3_; #line 1441 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = view; + _tmp4_ = view; #line 1441 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); #line 1441 "/home/jens/Source/shotwell/src/Page.vala" - item = _tmp7_; + item = _tmp5_; #line 1443 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = self->anchor; + _tmp6_ = self->anchor; #line 1443 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = item; + _tmp7_ = item; #line 1443 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp8_ == _tmp9_) { + if (_tmp6_ == _tmp7_) { #line 1444 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->anchor); #line 1444 "/home/jens/Source/shotwell/src/Page.vala" self->anchor = NULL; -#line 9690 "Page.c" +#line 10445 "Page.c" } #line 1446 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = self->cursor; + _tmp8_ = self->cursor; #line 1446 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = item; + _tmp9_ = item; #line 1446 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp10_ == _tmp11_) { + if (_tmp8_ == _tmp9_) { #line 1447 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->cursor); #line 1447 "/home/jens/Source/shotwell/src/Page.vala" self->cursor = NULL; -#line 9702 "Page.c" +#line 10457 "Page.c" } #line 1449 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = self->priv->highlighted; + _tmp10_ = self->priv->highlighted; #line 1449 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = item; + _tmp11_ = item; #line 1449 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp12_ == _tmp13_) { + if (_tmp10_ == _tmp11_) { #line 1450 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->highlighted); #line 1450 "/home/jens/Source/shotwell/src/Page.vala" self->priv->highlighted = NULL; -#line 9714 "Page.c" +#line 10469 "Page.c" } #line 1440 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (item); #line 1440 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (view); -#line 9720 "Page.c" +#line 10475 "Page.c" } #line 1440 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (_view_it); -#line 9724 "Page.c" +#line 10479 "Page.c" } } -static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEventKey* event) { +static gboolean +checkerboard_page_real_key_press_event (GtkWidget* base, + GdkEventKey* event) +{ CheckerboardPage * self; gboolean result = FALSE; gboolean handled = FALSE; guint state = 0U; - GdkEventKey* _tmp0_; - GdkModifierType _tmp1_; - GdkEventKey* _tmp2_; - guint _tmp3_; - const gchar* _tmp4_; - const gchar* _tmp5_; - GQuark _tmp7_ = 0U; + GdkModifierType _tmp0_; + guint _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + GQuark _tmp5_ = 0U; #line 1460 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp6_label0 = 0; + static GQuark _tmp4_label0 = 0; #line 1460 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp6_label1 = 0; + static GQuark _tmp4_label1 = 0; #line 1460 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp6_label2 = 0; + static GQuark _tmp4_label2 = 0; #line 1460 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp6_label3 = 0; + static GQuark _tmp4_label3 = 0; #line 1460 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp6_label4 = 0; + static GQuark _tmp4_label4 = 0; #line 1460 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp6_label5 = 0; + static GQuark _tmp4_label5 = 0; #line 1460 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp6_label6 = 0; + static GQuark _tmp4_label6 = 0; #line 1460 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp6_label7 = 0; + static GQuark _tmp4_label7 = 0; #line 1460 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp6_label8 = 0; + static GQuark _tmp4_label8 = 0; #line 1460 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp6_label9 = 0; + static GQuark _tmp4_label9 = 0; #line 1460 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp6_label10 = 0; + static GQuark _tmp4_label10 = 0; #line 1460 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp6_label11 = 0; + static GQuark _tmp4_label11 = 0; #line 1460 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp6_label12 = 0; + static GQuark _tmp4_label12 = 0; #line 1460 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp6_label13 = 0; + static GQuark _tmp4_label13 = 0; #line 1460 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp6_label14 = 0; -#line 9771 "Page.c" - gboolean _tmp45_; - gboolean _tmp46_ = FALSE; + static GQuark _tmp4_label14 = 0; +#line 10527 "Page.c" + gboolean _tmp42_; + gboolean _tmp43_ = FALSE; #line 1454 "/home/jens/Source/shotwell/src/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage); #line 1454 "/home/jens/Source/shotwell/src/Page.vala" @@ -9777,392 +10533,371 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven #line 1455 "/home/jens/Source/shotwell/src/Page.vala" handled = TRUE; #line 1458 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = event; -#line 1458 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = _tmp0_->state; + _tmp0_ = event->state; #line 1458 "/home/jens/Source/shotwell/src/Page.vala" - state = (guint) (_tmp1_ & GDK_SHIFT_MASK); + state = (guint) (_tmp0_ & GDK_SHIFT_MASK); #line 1460 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = event; + _tmp1_ = event->keyval; #line 1460 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = _tmp2_->keyval; + _tmp2_ = gdk_keyval_name (_tmp1_); #line 1460 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = gdk_keyval_name (_tmp3_); -#line 1460 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 1460 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = (NULL == _tmp5_) ? 0 : g_quark_from_string (_tmp5_); + _tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_); #line 1460 "/home/jens/Source/shotwell/src/Page.vala" - if ((_tmp7_ == ((0 != _tmp6_label0) ? _tmp6_label0 : (_tmp6_label0 = g_quark_from_static_string ("Up")))) || (_tmp7_ == ((0 != _tmp6_label1) ? _tmp6_label1 : (_tmp6_label1 = g_quark_from_static_string ("KP_Up"))))) { + if ((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("Up")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("KP_Up"))))) { #line 1460 "/home/jens/Source/shotwell/src/Page.vala" switch (0) { -#line 9800 "Page.c" +#line 10552 "Page.c" default: { - guint _tmp8_; + guint _tmp6_; #line 1463 "/home/jens/Source/shotwell/src/Page.vala" checkerboard_page_move_cursor (self, COMPASS_POINT_NORTH); #line 1464 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = state; + _tmp6_ = state; #line 1464 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_page_select_anchor_to_cursor (self, _tmp8_); + checkerboard_page_select_anchor_to_cursor (self, _tmp6_); #line 1465 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 9812 "Page.c" +#line 10564 "Page.c" } } - } else if ((_tmp7_ == ((0 != _tmp6_label2) ? _tmp6_label2 : (_tmp6_label2 = g_quark_from_static_string ("Down")))) || (_tmp7_ == ((0 != _tmp6_label3) ? _tmp6_label3 : (_tmp6_label3 = g_quark_from_static_string ("KP_Down"))))) { + } else if ((_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("Down")))) || (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("KP_Down"))))) { #line 1460 "/home/jens/Source/shotwell/src/Page.vala" switch (0) { -#line 9818 "Page.c" +#line 10570 "Page.c" default: { - guint _tmp9_; + guint _tmp7_; #line 1469 "/home/jens/Source/shotwell/src/Page.vala" checkerboard_page_move_cursor (self, COMPASS_POINT_SOUTH); #line 1470 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = state; + _tmp7_ = state; #line 1470 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_page_select_anchor_to_cursor (self, _tmp9_); + checkerboard_page_select_anchor_to_cursor (self, _tmp7_); #line 1471 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 9830 "Page.c" +#line 10582 "Page.c" } } - } else if ((_tmp7_ == ((0 != _tmp6_label4) ? _tmp6_label4 : (_tmp6_label4 = g_quark_from_static_string ("Left")))) || (_tmp7_ == ((0 != _tmp6_label5) ? _tmp6_label5 : (_tmp6_label5 = g_quark_from_static_string ("KP_Left"))))) { + } else if ((_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("Left")))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Left"))))) { #line 1460 "/home/jens/Source/shotwell/src/Page.vala" switch (0) { -#line 9836 "Page.c" +#line 10588 "Page.c" default: { - guint _tmp10_; + guint _tmp8_; #line 1475 "/home/jens/Source/shotwell/src/Page.vala" checkerboard_page_move_cursor (self, COMPASS_POINT_WEST); #line 1476 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = state; + _tmp8_ = state; #line 1476 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_page_select_anchor_to_cursor (self, _tmp10_); + checkerboard_page_select_anchor_to_cursor (self, _tmp8_); #line 1477 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 9848 "Page.c" +#line 10600 "Page.c" } } - } else if ((_tmp7_ == ((0 != _tmp6_label6) ? _tmp6_label6 : (_tmp6_label6 = g_quark_from_static_string ("Right")))) || (_tmp7_ == ((0 != _tmp6_label7) ? _tmp6_label7 : (_tmp6_label7 = g_quark_from_static_string ("KP_Right"))))) { + } else if ((_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("Right")))) || (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("KP_Right"))))) { #line 1460 "/home/jens/Source/shotwell/src/Page.vala" switch (0) { -#line 9854 "Page.c" +#line 10606 "Page.c" default: { - guint _tmp11_; + guint _tmp9_; #line 1481 "/home/jens/Source/shotwell/src/Page.vala" checkerboard_page_move_cursor (self, COMPASS_POINT_EAST); #line 1482 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = state; + _tmp9_ = state; #line 1482 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_page_select_anchor_to_cursor (self, _tmp11_); + checkerboard_page_select_anchor_to_cursor (self, _tmp9_); #line 1483 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 9866 "Page.c" +#line 10618 "Page.c" } } - } else if ((_tmp7_ == ((0 != _tmp6_label8) ? _tmp6_label8 : (_tmp6_label8 = g_quark_from_static_string ("Home")))) || (_tmp7_ == ((0 != _tmp6_label9) ? _tmp6_label9 : (_tmp6_label9 = g_quark_from_static_string ("KP_Home"))))) { + } else if ((_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("Home")))) || (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("KP_Home"))))) { #line 1460 "/home/jens/Source/shotwell/src/Page.vala" switch (0) { -#line 9872 "Page.c" +#line 10624 "Page.c" default: { CheckerboardItem* first = NULL; - ViewCollection* _tmp12_; - ViewCollection* _tmp13_; - DataView* _tmp14_; - CheckerboardItem* _tmp15_; - CheckerboardItem* _tmp16_; - guint _tmp18_; + ViewCollection* _tmp10_; + ViewCollection* _tmp11_; + DataView* _tmp12_; + CheckerboardItem* _tmp13_; + CheckerboardItem* _tmp14_; + guint _tmp16_; #line 1487 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1487 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 1487 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = view_collection_get_first (_tmp13_); + _tmp12_ = view_collection_get_first (_tmp11_); #line 1487 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); + _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); #line 1487 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp13_); + _data_collection_unref0 (_tmp11_); #line 1487 "/home/jens/Source/shotwell/src/Page.vala" - first = _tmp15_; + first = _tmp13_; #line 1488 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = first; + _tmp14_ = first; #line 1488 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp16_ != NULL) { -#line 9898 "Page.c" - CheckerboardItem* _tmp17_; + if (_tmp14_ != NULL) { +#line 10650 "Page.c" + CheckerboardItem* _tmp15_; #line 1489 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = first; + _tmp15_ = first; #line 1489 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_page_cursor_to_item (self, _tmp17_); -#line 9904 "Page.c" + checkerboard_page_cursor_to_item (self, _tmp15_); +#line 10656 "Page.c" } #line 1490 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = state; + _tmp16_ = state; #line 1490 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_page_select_anchor_to_cursor (self, _tmp18_); + checkerboard_page_select_anchor_to_cursor (self, _tmp16_); #line 1491 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (first); #line 1491 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 9914 "Page.c" +#line 10666 "Page.c" } } - } else if ((_tmp7_ == ((0 != _tmp6_label10) ? _tmp6_label10 : (_tmp6_label10 = g_quark_from_static_string ("End")))) || (_tmp7_ == ((0 != _tmp6_label11) ? _tmp6_label11 : (_tmp6_label11 = g_quark_from_static_string ("KP_End"))))) { + } else if ((_tmp5_ == ((0 != _tmp4_label10) ? _tmp4_label10 : (_tmp4_label10 = g_quark_from_static_string ("End")))) || (_tmp5_ == ((0 != _tmp4_label11) ? _tmp4_label11 : (_tmp4_label11 = g_quark_from_static_string ("KP_End"))))) { #line 1460 "/home/jens/Source/shotwell/src/Page.vala" switch (0) { -#line 9920 "Page.c" +#line 10672 "Page.c" default: { CheckerboardItem* last = NULL; - ViewCollection* _tmp19_; - ViewCollection* _tmp20_; - DataView* _tmp21_; - CheckerboardItem* _tmp22_; - CheckerboardItem* _tmp23_; - guint _tmp25_; + ViewCollection* _tmp17_; + ViewCollection* _tmp18_; + DataView* _tmp19_; + CheckerboardItem* _tmp20_; + CheckerboardItem* _tmp21_; + guint _tmp23_; #line 1495 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1495 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = _tmp19_; + _tmp18_ = _tmp17_; #line 1495 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = view_collection_get_last (_tmp20_); + _tmp19_ = view_collection_get_last (_tmp18_); #line 1495 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); + _tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); #line 1495 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp20_); + _data_collection_unref0 (_tmp18_); #line 1495 "/home/jens/Source/shotwell/src/Page.vala" - last = _tmp22_; + last = _tmp20_; #line 1496 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = last; + _tmp21_ = last; #line 1496 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp23_ != NULL) { -#line 9946 "Page.c" - CheckerboardItem* _tmp24_; + if (_tmp21_ != NULL) { +#line 10698 "Page.c" + CheckerboardItem* _tmp22_; #line 1497 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = last; + _tmp22_ = last; #line 1497 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_page_cursor_to_item (self, _tmp24_); -#line 9952 "Page.c" + checkerboard_page_cursor_to_item (self, _tmp22_); +#line 10704 "Page.c" } #line 1498 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = state; + _tmp23_ = state; #line 1498 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_page_select_anchor_to_cursor (self, _tmp25_); + checkerboard_page_select_anchor_to_cursor (self, _tmp23_); #line 1499 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (last); #line 1499 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 9962 "Page.c" +#line 10714 "Page.c" } } - } else if ((_tmp7_ == ((0 != _tmp6_label12) ? _tmp6_label12 : (_tmp6_label12 = g_quark_from_static_string ("Return")))) || (_tmp7_ == ((0 != _tmp6_label13) ? _tmp6_label13 : (_tmp6_label13 = g_quark_from_static_string ("KP_Enter"))))) { + } else if ((_tmp5_ == ((0 != _tmp4_label12) ? _tmp4_label12 : (_tmp4_label12 = g_quark_from_static_string ("Return")))) || (_tmp5_ == ((0 != _tmp4_label13) ? _tmp4_label13 : (_tmp4_label13 = g_quark_from_static_string ("KP_Enter"))))) { #line 1460 "/home/jens/Source/shotwell/src/Page.vala" switch (0) { -#line 9968 "Page.c" +#line 10720 "Page.c" default: { - ViewCollection* _tmp26_; - ViewCollection* _tmp27_; - gint _tmp28_; - gboolean _tmp29_; -#line 1503 "/home/jens/Source/shotwell/src/Page.vala" - _tmp26_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + ViewCollection* _tmp24_; + ViewCollection* _tmp25_; + gboolean _tmp26_; #line 1503 "/home/jens/Source/shotwell/src/Page.vala" - _tmp27_ = _tmp26_; + _tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1503 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = view_collection_get_selected_count (_tmp27_); + _tmp25_ = _tmp24_; #line 1503 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = _tmp28_ == 1; + _tmp26_ = view_collection_get_selected_count (_tmp25_) == 1; #line 1503 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp27_); + _data_collection_unref0 (_tmp25_); #line 1503 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp29_) { -#line 9987 "Page.c" - ViewCollection* _tmp30_; - ViewCollection* _tmp31_; - DataView* _tmp32_; - CheckerboardItem* _tmp33_; - CheckerboardPageKeyboardModifiers _tmp34_ = {0}; + if (_tmp26_) { +#line 10736 "Page.c" + ViewCollection* _tmp27_; + ViewCollection* _tmp28_; + DataView* _tmp29_; + CheckerboardItem* _tmp30_; + CheckerboardPageKeyboardModifiers _tmp31_ = {0}; #line 1504 "/home/jens/Source/shotwell/src/Page.vala" - _tmp30_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp27_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1504 "/home/jens/Source/shotwell/src/Page.vala" - _tmp31_ = _tmp30_; + _tmp28_ = _tmp27_; #line 1504 "/home/jens/Source/shotwell/src/Page.vala" - _tmp32_ = view_collection_get_selected_at (_tmp31_, 0); + _tmp29_ = view_collection_get_selected_at (_tmp28_, 0); #line 1504 "/home/jens/Source/shotwell/src/Page.vala" - _tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); + _tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem); #line 1504 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_page_keyboard_modifiers_init (&_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + checkerboard_page_keyboard_modifiers_init (&_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1504 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_page_on_item_activated (self, _tmp33_, CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD, &_tmp34_); + checkerboard_page_on_item_activated (self, _tmp30_, CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD, &_tmp31_); #line 1504 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp33_); + _g_object_unref0 (_tmp30_); #line 1504 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp31_); -#line 10009 "Page.c" + _data_collection_unref0 (_tmp28_); +#line 10758 "Page.c" } else { #line 1507 "/home/jens/Source/shotwell/src/Page.vala" handled = FALSE; -#line 10013 "Page.c" +#line 10762 "Page.c" } #line 1508 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 10017 "Page.c" +#line 10766 "Page.c" } } - } else if (_tmp7_ == ((0 != _tmp6_label14) ? _tmp6_label14 : (_tmp6_label14 = g_quark_from_static_string ("space")))) { + } else if (_tmp5_ == ((0 != _tmp4_label14) ? _tmp4_label14 : (_tmp4_label14 = g_quark_from_static_string ("space")))) { #line 1460 "/home/jens/Source/shotwell/src/Page.vala" switch (0) { -#line 10023 "Page.c" +#line 10772 "Page.c" default: { Marker* marker = NULL; - ViewCollection* _tmp35_; - ViewCollection* _tmp36_; - CheckerboardLayout* _tmp37_; - CheckerboardItem* _tmp38_; - CheckerboardItem* _tmp39_; - Marker* _tmp40_; + ViewCollection* _tmp32_; + ViewCollection* _tmp33_; + CheckerboardLayout* _tmp34_; + CheckerboardItem* _tmp35_; + CheckerboardItem* _tmp36_; + Marker* _tmp37_; + Marker* _tmp38_; + ViewCollection* _tmp39_; + ViewCollection* _tmp40_; Marker* _tmp41_; - ViewCollection* _tmp42_; - ViewCollection* _tmp43_; - Marker* _tmp44_; #line 1511 "/home/jens/Source/shotwell/src/Page.vala" - _tmp35_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp32_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1511 "/home/jens/Source/shotwell/src/Page.vala" - _tmp36_ = _tmp35_; + _tmp33_ = _tmp32_; #line 1511 "/home/jens/Source/shotwell/src/Page.vala" - _tmp37_ = self->priv->layout; + _tmp34_ = self->priv->layout; #line 1511 "/home/jens/Source/shotwell/src/Page.vala" - _tmp38_ = checkerboard_layout_get_cursor (_tmp37_); + _tmp35_ = checkerboard_layout_get_cursor (_tmp34_); #line 1511 "/home/jens/Source/shotwell/src/Page.vala" - _tmp39_ = _tmp38_; + _tmp36_ = _tmp35_; #line 1511 "/home/jens/Source/shotwell/src/Page.vala" - _tmp40_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_DATA_OBJECT, DataObject)); + _tmp37_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_DATA_OBJECT, DataObject)); #line 1511 "/home/jens/Source/shotwell/src/Page.vala" - _tmp41_ = _tmp40_; + _tmp38_ = _tmp37_; #line 1511 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp39_); + _g_object_unref0 (_tmp36_); #line 1511 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp36_); + _data_collection_unref0 (_tmp33_); #line 1511 "/home/jens/Source/shotwell/src/Page.vala" - marker = _tmp41_; + marker = _tmp38_; #line 1512 "/home/jens/Source/shotwell/src/Page.vala" - _tmp42_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp39_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1512 "/home/jens/Source/shotwell/src/Page.vala" - _tmp43_ = _tmp42_; + _tmp40_ = _tmp39_; #line 1512 "/home/jens/Source/shotwell/src/Page.vala" - _tmp44_ = marker; + _tmp41_ = marker; #line 1512 "/home/jens/Source/shotwell/src/Page.vala" - view_collection_toggle_marked (_tmp43_, _tmp44_); + view_collection_toggle_marked (_tmp40_, _tmp41_); #line 1512 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp43_); + _data_collection_unref0 (_tmp40_); #line 1513 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (marker); #line 1513 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 10071 "Page.c" +#line 10820 "Page.c" } } } else { #line 1460 "/home/jens/Source/shotwell/src/Page.vala" switch (0) { -#line 10077 "Page.c" +#line 10826 "Page.c" default: { #line 1516 "/home/jens/Source/shotwell/src/Page.vala" handled = FALSE; #line 1517 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 10084 "Page.c" +#line 10833 "Page.c" } } } #line 1520 "/home/jens/Source/shotwell/src/Page.vala" - _tmp45_ = handled; + _tmp42_ = handled; #line 1520 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp45_) { + if (_tmp42_) { #line 1521 "/home/jens/Source/shotwell/src/Page.vala" result = TRUE; #line 1521 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 10096 "Page.c" +#line 10845 "Page.c" } #line 1523 "/home/jens/Source/shotwell/src/Page.vala" if (GTK_WIDGET_CLASS (checkerboard_page_parent_class)->key_press_event != NULL) { -#line 10100 "Page.c" - GdkEventKey* _tmp47_; - gboolean _tmp48_; -#line 1523 "/home/jens/Source/shotwell/src/Page.vala" - _tmp47_ = event; #line 1523 "/home/jens/Source/shotwell/src/Page.vala" - _tmp48_ = GTK_WIDGET_CLASS (checkerboard_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), gtk_widget_get_type (), GtkWidget), _tmp47_); -#line 1523 "/home/jens/Source/shotwell/src/Page.vala" - _tmp46_ = _tmp48_; -#line 10109 "Page.c" + _tmp43_ = GTK_WIDGET_CLASS (checkerboard_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), gtk_widget_get_type (), GtkWidget), event); +#line 10851 "Page.c" } else { #line 1523 "/home/jens/Source/shotwell/src/Page.vala" - _tmp46_ = TRUE; -#line 10113 "Page.c" + _tmp43_ = TRUE; +#line 10855 "Page.c" } #line 1523 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp46_; + result = _tmp43_; #line 1523 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 10119 "Page.c" +#line 10861 "Page.c" } -static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton* event) { +static gboolean +checkerboard_page_real_on_left_click (Page* base, + GdkEventButton* event) +{ CheckerboardPage * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; - GdkEventButton* _tmp1_; - GdkEventType _tmp2_; + GdkEventType _tmp1_; guint state = 0U; - GdkEventButton* _tmp5_; - GdkModifierType _tmp6_; + GdkModifierType _tmp3_; CheckerboardItem* item = NULL; - GdkEventButton* _tmp7_; - gdouble _tmp8_; - GdkEventButton* _tmp9_; - gdouble _tmp10_; - CheckerboardItem* _tmp11_; - CheckerboardItem* _tmp12_; - ViewCollection* _tmp106_; - ViewCollection* _tmp107_; - gint _tmp108_; - gboolean _tmp109_; + gdouble _tmp4_; + gdouble _tmp5_; + CheckerboardItem* _tmp6_; + CheckerboardItem* _tmp7_; + ViewCollection* _tmp92_; + ViewCollection* _tmp93_; + gboolean _tmp94_; #line 1526 "/home/jens/Source/shotwell/src/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage); #line 1526 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); #line 1528 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = event; -#line 1528 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = _tmp1_->type; -#line 1528 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp2_ != GDK_BUTTON_PRESS) { -#line 10153 "Page.c" - GdkEventButton* _tmp3_; - GdkEventType _tmp4_; + _tmp1_ = event->type; #line 1528 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = event; + if (_tmp1_ != GDK_BUTTON_PRESS) { +#line 10891 "Page.c" + GdkEventType _tmp2_; #line 1528 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = _tmp3_->type; + _tmp2_ = event->type; #line 1528 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = _tmp4_ != GDK_2BUTTON_PRESS; -#line 10162 "Page.c" + _tmp0_ = _tmp2_ != GDK_2BUTTON_PRESS; +#line 10897 "Page.c" } else { #line 1528 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = FALSE; -#line 10166 "Page.c" +#line 10901 "Page.c" } #line 1528 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp0_) { @@ -10170,556 +10905,520 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton result = FALSE; #line 1529 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 10174 "Page.c" +#line 10909 "Page.c" } #line 1532 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = event; -#line 1532 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = _tmp5_->state; + _tmp3_ = event->state; #line 1532 "/home/jens/Source/shotwell/src/Page.vala" - state = (guint) (_tmp6_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)); -#line 1536 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = event; -#line 1536 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = _tmp7_->x; + state = (guint) (_tmp3_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)); #line 1536 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = event; + _tmp4_ = event->x; #line 1536 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = _tmp9_->y; + _tmp5_ = event->y; #line 1536 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = checkerboard_page_get_item_at_pixel (self, _tmp8_, _tmp10_); + _tmp6_ = checkerboard_page_get_item_at_pixel (self, _tmp4_, _tmp5_); #line 1536 "/home/jens/Source/shotwell/src/Page.vala" - item = _tmp11_; + item = _tmp6_; #line 1537 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = item; + _tmp7_ = item; #line 1537 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp12_ != NULL) { -#line 10198 "Page.c" - CheckerboardLayout* _tmp13_; - CheckerboardItem* _tmp14_; - GdkEventButton* _tmp15_; - gdouble _tmp16_; - GdkEventButton* _tmp17_; - gdouble _tmp18_; - GdkEventButton* _tmp19_; - GdkModifierType _tmp20_; - gboolean _tmp21_; - guint _tmp22_; - CheckerboardLayout* _tmp80_; - CheckerboardItem* _tmp81_; -#line 1540 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = self->priv->layout; -#line 1540 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = item; -#line 1540 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = event; -#line 1540 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = _tmp15_->x; + if (_tmp7_ != NULL) { +#line 10927 "Page.c" + CheckerboardLayout* _tmp8_; + CheckerboardItem* _tmp9_; + gdouble _tmp10_; + gdouble _tmp11_; + GdkModifierType _tmp12_; + guint _tmp13_; + CheckerboardLayout* _tmp68_; + CheckerboardItem* _tmp69_; #line 1540 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = event; + _tmp8_ = self->priv->layout; #line 1540 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = _tmp17_->y; + _tmp9_ = item; #line 1540 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = event; + _tmp10_ = event->x; #line 1540 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = _tmp19_->state; + _tmp11_ = event->y; #line 1540 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = checkerboard_layout_handle_left_click (_tmp13_, _tmp14_, _tmp16_, _tmp18_, _tmp20_); + _tmp12_ = event->state; #line 1540 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp21_) { + if (checkerboard_layout_handle_left_click (_tmp8_, _tmp9_, _tmp10_, _tmp11_, _tmp12_)) { #line 1541 "/home/jens/Source/shotwell/src/Page.vala" result = TRUE; #line 1541 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (item); #line 1541 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 10237 "Page.c" +#line 10954 "Page.c" } #line 1543 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = state; + _tmp13_ = state; #line 1543 "/home/jens/Source/shotwell/src/Page.vala" - switch (_tmp22_) { + switch (_tmp13_) { #line 1543 "/home/jens/Source/shotwell/src/Page.vala" case GDK_CONTROL_MASK: -#line 10245 "Page.c" +#line 10962 "Page.c" { Marker* marker = NULL; - ViewCollection* _tmp23_; - ViewCollection* _tmp24_; - CheckerboardItem* _tmp25_; - Marker* _tmp26_; - Marker* _tmp27_; - ViewCollection* _tmp28_; - ViewCollection* _tmp29_; - Marker* _tmp30_; - CheckerboardItem* _tmp31_; - gboolean _tmp32_; + ViewCollection* _tmp14_; + ViewCollection* _tmp15_; + CheckerboardItem* _tmp16_; + Marker* _tmp17_; + Marker* _tmp18_; + ViewCollection* _tmp19_; + ViewCollection* _tmp20_; + Marker* _tmp21_; + CheckerboardItem* _tmp22_; #line 1547 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1547 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = _tmp23_; + _tmp15_ = _tmp14_; #line 1547 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = item; + _tmp16_ = item; #line 1547 "/home/jens/Source/shotwell/src/Page.vala" - _tmp26_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject)); + _tmp17_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject)); #line 1547 "/home/jens/Source/shotwell/src/Page.vala" - _tmp27_ = _tmp26_; + _tmp18_ = _tmp17_; #line 1547 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp24_); + _data_collection_unref0 (_tmp15_); #line 1547 "/home/jens/Source/shotwell/src/Page.vala" - marker = _tmp27_; + marker = _tmp18_; #line 1548 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1548 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = _tmp28_; + _tmp20_ = _tmp19_; #line 1548 "/home/jens/Source/shotwell/src/Page.vala" - _tmp30_ = marker; + _tmp21_ = marker; #line 1548 "/home/jens/Source/shotwell/src/Page.vala" - view_collection_toggle_marked (_tmp29_, _tmp30_); + view_collection_toggle_marked (_tmp20_, _tmp21_); #line 1548 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp29_); -#line 1550 "/home/jens/Source/shotwell/src/Page.vala" - _tmp31_ = item; + _data_collection_unref0 (_tmp20_); #line 1550 "/home/jens/Source/shotwell/src/Page.vala" - _tmp32_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_VIEW, DataView)); + _tmp22_ = item; #line 1550 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp32_) { -#line 10288 "Page.c" - CheckerboardItem* _tmp33_; - CheckerboardItem* _tmp34_; - CheckerboardItem* _tmp35_; - CheckerboardItem* _tmp36_; + if (data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_VIEW, DataView))) { +#line 11002 "Page.c" + CheckerboardItem* _tmp23_; + CheckerboardItem* _tmp24_; + CheckerboardItem* _tmp25_; + CheckerboardItem* _tmp26_; #line 1551 "/home/jens/Source/shotwell/src/Page.vala" - _tmp33_ = item; + _tmp23_ = item; #line 1551 "/home/jens/Source/shotwell/src/Page.vala" - _tmp34_ = _g_object_ref0 (_tmp33_); + _tmp24_ = _g_object_ref0 (_tmp23_); #line 1551 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->anchor); #line 1551 "/home/jens/Source/shotwell/src/Page.vala" - self->anchor = _tmp34_; + self->anchor = _tmp24_; #line 1552 "/home/jens/Source/shotwell/src/Page.vala" - _tmp35_ = item; + _tmp25_ = item; #line 1552 "/home/jens/Source/shotwell/src/Page.vala" - _tmp36_ = _g_object_ref0 (_tmp35_); + _tmp26_ = _g_object_ref0 (_tmp25_); #line 1552 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->cursor); #line 1552 "/home/jens/Source/shotwell/src/Page.vala" - self->cursor = _tmp36_; -#line 10309 "Page.c" + self->cursor = _tmp26_; +#line 11023 "Page.c" } #line 1554 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (marker); #line 1554 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 10315 "Page.c" +#line 11029 "Page.c" } #line 1543 "/home/jens/Source/shotwell/src/Page.vala" case GDK_SHIFT_MASK: -#line 10319 "Page.c" +#line 11033 "Page.c" { - ViewCollection* _tmp37_; - ViewCollection* _tmp38_; - CheckerboardItem* _tmp39_; - CheckerboardItem* _tmp42_; - CheckerboardItem* _tmp43_; - CheckerboardItem* _tmp44_; - CheckerboardItem* _tmp45_; + ViewCollection* _tmp27_; + ViewCollection* _tmp28_; + CheckerboardItem* _tmp29_; + CheckerboardItem* _tmp32_; + CheckerboardItem* _tmp33_; + CheckerboardItem* _tmp34_; + CheckerboardItem* _tmp35_; #line 1557 "/home/jens/Source/shotwell/src/Page.vala" - _tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp27_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1557 "/home/jens/Source/shotwell/src/Page.vala" - _tmp38_ = _tmp37_; + _tmp28_ = _tmp27_; #line 1557 "/home/jens/Source/shotwell/src/Page.vala" - view_collection_unselect_all (_tmp38_); + view_collection_unselect_all (_tmp28_); #line 1557 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp38_); + _data_collection_unref0 (_tmp28_); #line 1559 "/home/jens/Source/shotwell/src/Page.vala" - _tmp39_ = self->anchor; + _tmp29_ = self->anchor; #line 1559 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp39_ == NULL) { -#line 10340 "Page.c" - CheckerboardItem* _tmp40_; - CheckerboardItem* _tmp41_; + if (_tmp29_ == NULL) { +#line 11054 "Page.c" + CheckerboardItem* _tmp30_; + CheckerboardItem* _tmp31_; #line 1560 "/home/jens/Source/shotwell/src/Page.vala" - _tmp40_ = item; + _tmp30_ = item; #line 1560 "/home/jens/Source/shotwell/src/Page.vala" - _tmp41_ = _g_object_ref0 (_tmp40_); + _tmp31_ = _g_object_ref0 (_tmp30_); #line 1560 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->anchor); #line 1560 "/home/jens/Source/shotwell/src/Page.vala" - self->anchor = _tmp41_; -#line 10351 "Page.c" + self->anchor = _tmp31_; +#line 11065 "Page.c" } #line 1562 "/home/jens/Source/shotwell/src/Page.vala" - _tmp42_ = self->anchor; + _tmp32_ = self->anchor; #line 1562 "/home/jens/Source/shotwell/src/Page.vala" - _tmp43_ = item; + _tmp33_ = item; #line 1562 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_page_select_between_items (self, _tmp42_, _tmp43_); + checkerboard_page_select_between_items (self, _tmp32_, _tmp33_); #line 1564 "/home/jens/Source/shotwell/src/Page.vala" - _tmp44_ = item; + _tmp34_ = item; #line 1564 "/home/jens/Source/shotwell/src/Page.vala" - _tmp45_ = _g_object_ref0 (_tmp44_); + _tmp35_ = _g_object_ref0 (_tmp34_); #line 1564 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->cursor); #line 1564 "/home/jens/Source/shotwell/src/Page.vala" - self->cursor = _tmp45_; + self->cursor = _tmp35_; #line 1565 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 10369 "Page.c" +#line 11083 "Page.c" } #line 1543 "/home/jens/Source/shotwell/src/Page.vala" case GDK_CONTROL_MASK | GDK_SHIFT_MASK: -#line 10373 "Page.c" +#line 11087 "Page.c" { - CheckerboardItem* _tmp46_; - CheckerboardItem* _tmp49_; - CheckerboardItem* _tmp50_; - CheckerboardItem* _tmp51_; - CheckerboardItem* _tmp52_; + CheckerboardItem* _tmp36_; + CheckerboardItem* _tmp39_; + CheckerboardItem* _tmp40_; + CheckerboardItem* _tmp41_; + CheckerboardItem* _tmp42_; #line 1572 "/home/jens/Source/shotwell/src/Page.vala" - _tmp46_ = self->anchor; + _tmp36_ = self->anchor; #line 1572 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp46_ == NULL) { -#line 10384 "Page.c" - CheckerboardItem* _tmp47_; - CheckerboardItem* _tmp48_; + if (_tmp36_ == NULL) { +#line 11098 "Page.c" + CheckerboardItem* _tmp37_; + CheckerboardItem* _tmp38_; #line 1573 "/home/jens/Source/shotwell/src/Page.vala" - _tmp47_ = item; + _tmp37_ = item; #line 1573 "/home/jens/Source/shotwell/src/Page.vala" - _tmp48_ = _g_object_ref0 (_tmp47_); + _tmp38_ = _g_object_ref0 (_tmp37_); #line 1573 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->anchor); #line 1573 "/home/jens/Source/shotwell/src/Page.vala" - self->anchor = _tmp48_; -#line 10395 "Page.c" + self->anchor = _tmp38_; +#line 11109 "Page.c" } #line 1575 "/home/jens/Source/shotwell/src/Page.vala" - _tmp49_ = self->anchor; + _tmp39_ = self->anchor; #line 1575 "/home/jens/Source/shotwell/src/Page.vala" - _tmp50_ = item; + _tmp40_ = item; #line 1575 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_page_select_between_items (self, _tmp49_, _tmp50_); + checkerboard_page_select_between_items (self, _tmp39_, _tmp40_); #line 1577 "/home/jens/Source/shotwell/src/Page.vala" - _tmp51_ = item; + _tmp41_ = item; #line 1577 "/home/jens/Source/shotwell/src/Page.vala" - _tmp52_ = _g_object_ref0 (_tmp51_); + _tmp42_ = _g_object_ref0 (_tmp41_); #line 1577 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->cursor); #line 1577 "/home/jens/Source/shotwell/src/Page.vala" - self->cursor = _tmp52_; + self->cursor = _tmp42_; #line 1578 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 10413 "Page.c" +#line 11127 "Page.c" } default: { - GdkEventButton* _tmp53_; - GdkEventType _tmp54_; - CheckerboardItem* _tmp76_; - CheckerboardItem* _tmp77_; - CheckerboardItem* _tmp78_; - CheckerboardItem* _tmp79_; + GdkEventType _tmp43_; + CheckerboardItem* _tmp64_; + CheckerboardItem* _tmp65_; + CheckerboardItem* _tmp66_; + CheckerboardItem* _tmp67_; #line 1581 "/home/jens/Source/shotwell/src/Page.vala" - _tmp53_ = event; + _tmp43_ = event->type; #line 1581 "/home/jens/Source/shotwell/src/Page.vala" - _tmp54_ = _tmp53_->type; -#line 1581 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp54_ == GDK_2BUTTON_PRESS) { -#line 10429 "Page.c" - CheckerboardItem* _tmp55_; - CheckerboardItem* _tmp56_; + if (_tmp43_ == GDK_2BUTTON_PRESS) { +#line 11140 "Page.c" + CheckerboardItem* _tmp44_; + CheckerboardItem* _tmp45_; #line 1582 "/home/jens/Source/shotwell/src/Page.vala" - _tmp55_ = item; + _tmp44_ = item; #line 1582 "/home/jens/Source/shotwell/src/Page.vala" - _tmp56_ = _g_object_ref0 (_tmp55_); + _tmp45_ = _g_object_ref0 (_tmp44_); #line 1582 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->activated_item); #line 1582 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->activated_item = _tmp56_; -#line 10440 "Page.c" + self->priv->activated_item = _tmp45_; +#line 11151 "Page.c" } else { - CheckerboardItem* _tmp57_; - gboolean _tmp58_; -#line 1588 "/home/jens/Source/shotwell/src/Page.vala" - _tmp57_ = item; + CheckerboardItem* _tmp46_; #line 1588 "/home/jens/Source/shotwell/src/Page.vala" - _tmp58_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_DATA_VIEW, DataView)); + _tmp46_ = item; #line 1588 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp58_) { -#line 10450 "Page.c" + if (!data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_DATA_VIEW, DataView))) { +#line 11158 "Page.c" Marker* all = NULL; + ViewCollection* _tmp47_; + ViewCollection* _tmp48_; + Marker* _tmp49_; + Marker* _tmp50_; + Marker* _tmp51_; + ViewCollection* _tmp52_; + ViewCollection* _tmp53_; + GeeList* _tmp54_; + GeeList* _tmp55_; + ViewCollection* _tmp56_; + ViewCollection* _tmp57_; + Marker* _tmp58_; ViewCollection* _tmp59_; ViewCollection* _tmp60_; - Marker* _tmp61_; + CheckerboardItem* _tmp61_; Marker* _tmp62_; Marker* _tmp63_; - ViewCollection* _tmp64_; - ViewCollection* _tmp65_; - GeeList* _tmp66_; - GeeList* _tmp67_; - ViewCollection* _tmp68_; - ViewCollection* _tmp69_; - Marker* _tmp70_; - ViewCollection* _tmp71_; - ViewCollection* _tmp72_; - CheckerboardItem* _tmp73_; - Marker* _tmp74_; - Marker* _tmp75_; #line 1589 "/home/jens/Source/shotwell/src/Page.vala" - _tmp59_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp47_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1589 "/home/jens/Source/shotwell/src/Page.vala" - _tmp60_ = _tmp59_; + _tmp48_ = _tmp47_; #line 1589 "/home/jens/Source/shotwell/src/Page.vala" - _tmp61_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp49_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_DATA_COLLECTION, DataCollection)); #line 1589 "/home/jens/Source/shotwell/src/Page.vala" - _tmp62_ = _tmp61_; + _tmp50_ = _tmp49_; #line 1589 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp60_); + _data_collection_unref0 (_tmp48_); #line 1589 "/home/jens/Source/shotwell/src/Page.vala" - all = _tmp62_; + all = _tmp50_; #line 1590 "/home/jens/Source/shotwell/src/Page.vala" - _tmp63_ = all; + _tmp51_ = all; #line 1590 "/home/jens/Source/shotwell/src/Page.vala" - _tmp64_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp52_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1590 "/home/jens/Source/shotwell/src/Page.vala" - _tmp65_ = _tmp64_; + _tmp53_ = _tmp52_; #line 1590 "/home/jens/Source/shotwell/src/Page.vala" - _tmp66_ = view_collection_get_selected (_tmp65_); + _tmp54_ = view_collection_get_selected (_tmp53_); #line 1590 "/home/jens/Source/shotwell/src/Page.vala" - _tmp67_ = _tmp66_; + _tmp55_ = _tmp54_; #line 1590 "/home/jens/Source/shotwell/src/Page.vala" - marker_mark_many (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_COLLECTION, GeeCollection)); + marker_mark_many (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1590 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp67_); + _g_object_unref0 (_tmp55_); #line 1590 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp65_); + _data_collection_unref0 (_tmp53_); #line 1592 "/home/jens/Source/shotwell/src/Page.vala" - _tmp68_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp56_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1592 "/home/jens/Source/shotwell/src/Page.vala" - _tmp69_ = _tmp68_; + _tmp57_ = _tmp56_; #line 1592 "/home/jens/Source/shotwell/src/Page.vala" - _tmp70_ = all; + _tmp58_ = all; #line 1592 "/home/jens/Source/shotwell/src/Page.vala" - _tmp71_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp59_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1592 "/home/jens/Source/shotwell/src/Page.vala" - _tmp72_ = _tmp71_; + _tmp60_ = _tmp59_; #line 1592 "/home/jens/Source/shotwell/src/Page.vala" - _tmp73_ = item; + _tmp61_ = item; #line 1592 "/home/jens/Source/shotwell/src/Page.vala" - _tmp74_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_DATA_OBJECT, DataObject)); + _tmp62_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_DATA_OBJECT, DataObject)); #line 1592 "/home/jens/Source/shotwell/src/Page.vala" - _tmp75_ = _tmp74_; + _tmp63_ = _tmp62_; #line 1592 "/home/jens/Source/shotwell/src/Page.vala" - view_collection_unselect_and_select_marked (_tmp69_, _tmp70_, _tmp75_); + view_collection_unselect_and_select_marked (_tmp57_, _tmp58_, _tmp63_); #line 1592 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp75_); + _g_object_unref0 (_tmp63_); #line 1592 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp72_); + _data_collection_unref0 (_tmp60_); #line 1592 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp69_); + _data_collection_unref0 (_tmp57_); #line 1588 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (all); -#line 10523 "Page.c" +#line 11231 "Page.c" } } #line 1596 "/home/jens/Source/shotwell/src/Page.vala" - _tmp76_ = item; + _tmp64_ = item; #line 1596 "/home/jens/Source/shotwell/src/Page.vala" - _tmp77_ = _g_object_ref0 (_tmp76_); + _tmp65_ = _g_object_ref0 (_tmp64_); #line 1596 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->anchor); #line 1596 "/home/jens/Source/shotwell/src/Page.vala" - self->anchor = _tmp77_; + self->anchor = _tmp65_; #line 1597 "/home/jens/Source/shotwell/src/Page.vala" - _tmp78_ = item; + _tmp66_ = item; #line 1597 "/home/jens/Source/shotwell/src/Page.vala" - _tmp79_ = _g_object_ref0 (_tmp78_); + _tmp67_ = _g_object_ref0 (_tmp66_); #line 1597 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->cursor); #line 1597 "/home/jens/Source/shotwell/src/Page.vala" - self->cursor = _tmp79_; + self->cursor = _tmp67_; #line 1598 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 10544 "Page.c" +#line 11252 "Page.c" } } #line 1600 "/home/jens/Source/shotwell/src/Page.vala" - _tmp80_ = self->priv->layout; + _tmp68_ = self->priv->layout; #line 1600 "/home/jens/Source/shotwell/src/Page.vala" - _tmp81_ = item; + _tmp69_ = item; #line 1600 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_layout_set_cursor (_tmp80_, _tmp81_); -#line 10553 "Page.c" + checkerboard_layout_set_cursor (_tmp68_, _tmp69_); +#line 11261 "Page.c" } else { - guint _tmp82_; - GeeArrayList* _tmp85_; - CheckerboardLayout* _tmp101_; - GdkEventButton* _tmp102_; - gdouble _tmp103_; - GdkEventButton* _tmp104_; - gdouble _tmp105_; + guint _tmp70_; + GeeArrayList* _tmp73_; + CheckerboardLayout* _tmp89_; + gdouble _tmp90_; + gdouble _tmp91_; #line 1604 "/home/jens/Source/shotwell/src/Page.vala" - _tmp82_ = state; + _tmp70_ = state; #line 1604 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp82_ != ((guint) GDK_CONTROL_MASK)) { -#line 10566 "Page.c" - ViewCollection* _tmp83_; - ViewCollection* _tmp84_; + if (_tmp70_ != ((guint) GDK_CONTROL_MASK)) { +#line 11272 "Page.c" + ViewCollection* _tmp71_; + ViewCollection* _tmp72_; #line 1605 "/home/jens/Source/shotwell/src/Page.vala" - _tmp83_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp71_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1605 "/home/jens/Source/shotwell/src/Page.vala" - _tmp84_ = _tmp83_; + _tmp72_ = _tmp71_; #line 1605 "/home/jens/Source/shotwell/src/Page.vala" - view_collection_unselect_all (_tmp84_); + view_collection_unselect_all (_tmp72_); #line 1605 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp84_); -#line 10577 "Page.c" + _data_collection_unref0 (_tmp72_); +#line 11283 "Page.c" } #line 1608 "/home/jens/Source/shotwell/src/Page.vala" - _tmp85_ = gee_array_list_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp73_ = gee_array_list_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1608 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->previously_selected); #line 1608 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->previously_selected = _tmp85_; -#line 10585 "Page.c" + self->priv->previously_selected = _tmp73_; +#line 11291 "Page.c" { GeeList* _view_list = NULL; - ViewCollection* _tmp86_; - ViewCollection* _tmp87_; - GeeList* _tmp88_; - GeeList* _tmp89_; + ViewCollection* _tmp74_; + ViewCollection* _tmp75_; + GeeList* _tmp76_; + GeeList* _tmp77_; gint _view_size = 0; - GeeList* _tmp90_; - gint _tmp91_; - gint _tmp92_; + GeeList* _tmp78_; + gint _tmp79_; + gint _tmp80_; gint _view_index = 0; #line 1609 "/home/jens/Source/shotwell/src/Page.vala" - _tmp86_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp74_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1609 "/home/jens/Source/shotwell/src/Page.vala" - _tmp87_ = _tmp86_; + _tmp75_ = _tmp74_; #line 1609 "/home/jens/Source/shotwell/src/Page.vala" - _tmp88_ = view_collection_get_selected (_tmp87_); + _tmp76_ = view_collection_get_selected (_tmp75_); #line 1609 "/home/jens/Source/shotwell/src/Page.vala" - _tmp89_ = _tmp88_; + _tmp77_ = _tmp76_; #line 1609 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp87_); + _data_collection_unref0 (_tmp75_); #line 1609 "/home/jens/Source/shotwell/src/Page.vala" - _view_list = _tmp89_; + _view_list = _tmp77_; #line 1609 "/home/jens/Source/shotwell/src/Page.vala" - _tmp90_ = _view_list; + _tmp78_ = _view_list; #line 1609 "/home/jens/Source/shotwell/src/Page.vala" - _tmp91_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp79_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1609 "/home/jens/Source/shotwell/src/Page.vala" - _tmp92_ = _tmp91_; + _tmp80_ = _tmp79_; #line 1609 "/home/jens/Source/shotwell/src/Page.vala" - _view_size = _tmp92_; + _view_size = _tmp80_; #line 1609 "/home/jens/Source/shotwell/src/Page.vala" _view_index = -1; #line 1609 "/home/jens/Source/shotwell/src/Page.vala" while (TRUE) { -#line 10621 "Page.c" - gint _tmp93_; - gint _tmp94_; - gint _tmp95_; +#line 11327 "Page.c" + gint _tmp81_; + gint _tmp82_; + gint _tmp83_; DataView* view = NULL; - GeeList* _tmp96_; - gint _tmp97_; - gpointer _tmp98_; - GeeArrayList* _tmp99_; - DataView* _tmp100_; + GeeList* _tmp84_; + gint _tmp85_; + gpointer _tmp86_; + GeeArrayList* _tmp87_; + DataView* _tmp88_; #line 1609 "/home/jens/Source/shotwell/src/Page.vala" - _tmp93_ = _view_index; + _tmp81_ = _view_index; #line 1609 "/home/jens/Source/shotwell/src/Page.vala" - _view_index = _tmp93_ + 1; + _view_index = _tmp81_ + 1; #line 1609 "/home/jens/Source/shotwell/src/Page.vala" - _tmp94_ = _view_index; + _tmp82_ = _view_index; #line 1609 "/home/jens/Source/shotwell/src/Page.vala" - _tmp95_ = _view_size; + _tmp83_ = _view_size; #line 1609 "/home/jens/Source/shotwell/src/Page.vala" - if (!(_tmp94_ < _tmp95_)) { + if (!(_tmp82_ < _tmp83_)) { #line 1609 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 10643 "Page.c" +#line 11349 "Page.c" } #line 1609 "/home/jens/Source/shotwell/src/Page.vala" - _tmp96_ = _view_list; + _tmp84_ = _view_list; #line 1609 "/home/jens/Source/shotwell/src/Page.vala" - _tmp97_ = _view_index; + _tmp85_ = _view_index; #line 1609 "/home/jens/Source/shotwell/src/Page.vala" - _tmp98_ = gee_list_get (_tmp96_, _tmp97_); + _tmp86_ = gee_list_get (_tmp84_, _tmp85_); #line 1609 "/home/jens/Source/shotwell/src/Page.vala" - view = (DataView*) _tmp98_; + view = (DataView*) _tmp86_; #line 1610 "/home/jens/Source/shotwell/src/Page.vala" - _tmp99_ = self->priv->previously_selected; + _tmp87_ = self->priv->previously_selected; #line 1610 "/home/jens/Source/shotwell/src/Page.vala" - _tmp100_ = view; + _tmp88_ = view; #line 1610 "/home/jens/Source/shotwell/src/Page.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); #line 1609 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (view); -#line 10661 "Page.c" +#line 11367 "Page.c" } #line 1609 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (_view_list); -#line 10665 "Page.c" +#line 11371 "Page.c" } #line 1612 "/home/jens/Source/shotwell/src/Page.vala" - _tmp101_ = self->priv->layout; -#line 1612 "/home/jens/Source/shotwell/src/Page.vala" - _tmp102_ = event; -#line 1612 "/home/jens/Source/shotwell/src/Page.vala" - _tmp103_ = _tmp102_->x; + _tmp89_ = self->priv->layout; #line 1612 "/home/jens/Source/shotwell/src/Page.vala" - _tmp104_ = event; + _tmp90_ = event->x; #line 1612 "/home/jens/Source/shotwell/src/Page.vala" - _tmp105_ = _tmp104_->y; + _tmp91_ = event->y; #line 1612 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_layout_set_drag_select_origin (_tmp101_, (gint) _tmp103_, (gint) _tmp105_); + checkerboard_layout_set_drag_select_origin (_tmp89_, (gint) _tmp90_, (gint) _tmp91_); #line 1614 "/home/jens/Source/shotwell/src/Page.vala" result = TRUE; #line 1614 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (item); #line 1614 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 10685 "Page.c" +#line 11387 "Page.c" } #line 1620 "/home/jens/Source/shotwell/src/Page.vala" - _tmp106_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp92_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1620 "/home/jens/Source/shotwell/src/Page.vala" - _tmp107_ = _tmp106_; + _tmp93_ = _tmp92_; #line 1620 "/home/jens/Source/shotwell/src/Page.vala" - _tmp108_ = view_collection_get_selected_count (_tmp107_); + _tmp94_ = view_collection_get_selected_count (_tmp93_) == 0; #line 1620 "/home/jens/Source/shotwell/src/Page.vala" - _tmp109_ = _tmp108_ == 0; + _data_collection_unref0 (_tmp93_); #line 1620 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp107_); -#line 1620 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp109_; + result = _tmp94_; #line 1620 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (item); #line 1620 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 10703 "Page.c" +#line 11403 "Page.c" } -static gboolean checkerboard_page_real_on_left_released (Page* base, GdkEventButton* event) { +static gboolean +checkerboard_page_real_on_left_released (Page* base, + GdkEventButton* event) +{ CheckerboardPage * self; gboolean result = FALSE; CheckerboardLayout* _tmp0_; - gboolean _tmp1_; - GdkEventButton* _tmp5_; - GdkModifierType _tmp6_; - CheckerboardItem* _tmp7_; + GdkModifierType _tmp4_; + CheckerboardItem* _tmp5_; CheckerboardItem* item = NULL; - GdkEventButton* _tmp10_; - gdouble _tmp11_; - GdkEventButton* _tmp12_; - gdouble _tmp13_; - CheckerboardItem* _tmp14_; - CheckerboardItem* _tmp15_; - CheckerboardItem* _tmp16_; - CheckerboardItem* _tmp17_; + gdouble _tmp8_; + gdouble _tmp9_; + CheckerboardItem* _tmp10_; + CheckerboardItem* _tmp11_; + CheckerboardItem* _tmp12_; + CheckerboardItem* _tmp13_; #line 1623 "/home/jens/Source/shotwell/src/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage); #line 1623 "/home/jens/Source/shotwell/src/Page.vala" @@ -10731,56 +11430,52 @@ static gboolean checkerboard_page_real_on_left_released (Page* base, GdkEventBut #line 1627 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = self->priv->layout; #line 1627 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_); -#line 1627 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp1_) { -#line 10738 "Page.c" - CheckerboardLayout* _tmp2_; + if (checkerboard_layout_is_drag_select_active (_tmp0_)) { +#line 11435 "Page.c" + CheckerboardLayout* _tmp1_; + CheckerboardItem* _tmp2_; CheckerboardItem* _tmp3_; - CheckerboardItem* _tmp4_; #line 1628 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = self->priv->layout; + _tmp1_ = self->priv->layout; #line 1628 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_layout_clear_drag_select (_tmp2_); + checkerboard_layout_clear_drag_select (_tmp1_); #line 1629 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = self->cursor; + _tmp2_ = self->cursor; #line 1629 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp3_ = _g_object_ref0 (_tmp2_); #line 1629 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->anchor); #line 1629 "/home/jens/Source/shotwell/src/Page.vala" - self->anchor = _tmp4_; + self->anchor = _tmp3_; #line 1631 "/home/jens/Source/shotwell/src/Page.vala" result = TRUE; #line 1631 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 10758 "Page.c" +#line 11455 "Page.c" } #line 1635 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = event; + _tmp4_ = event->state; #line 1635 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = _tmp5_->state; -#line 1635 "/home/jens/Source/shotwell/src/Page.vala" - if ((_tmp6_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) != 0) { + if ((_tmp4_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) != 0) { #line 1636 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 1636 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 10770 "Page.c" +#line 11465 "Page.c" } #line 1639 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = self->priv->activated_item; + _tmp5_ = self->priv->activated_item; #line 1639 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp7_ != NULL) { -#line 10776 "Page.c" - CheckerboardItem* _tmp8_; - CheckerboardPageKeyboardModifiers _tmp9_ = {0}; + if (_tmp5_ != NULL) { +#line 11471 "Page.c" + CheckerboardItem* _tmp6_; + CheckerboardPageKeyboardModifiers _tmp7_ = {0}; #line 1640 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = self->priv->activated_item; + _tmp6_ = self->priv->activated_item; #line 1640 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_page_keyboard_modifiers_init (&_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + checkerboard_page_keyboard_modifiers_init (&_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1640 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_page_on_item_activated (self, _tmp8_, CHECKERBOARD_PAGE_ACTIVATOR_MOUSE, &_tmp9_); + checkerboard_page_on_item_activated (self, _tmp6_, CHECKERBOARD_PAGE_ACTIVATOR_MOUSE, &_tmp7_); #line 1641 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->activated_item); #line 1641 "/home/jens/Source/shotwell/src/Page.vala" @@ -10789,74 +11484,67 @@ static gboolean checkerboard_page_real_on_left_released (Page* base, GdkEventBut result = TRUE; #line 1643 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 10793 "Page.c" +#line 11488 "Page.c" } #line 1646 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = event; + _tmp8_ = event->x; #line 1646 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = _tmp10_->x; + _tmp9_ = event->y; #line 1646 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = event; + _tmp10_ = checkerboard_page_get_item_at_pixel (self, _tmp8_, _tmp9_); #line 1646 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = _tmp12_->y; -#line 1646 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = checkerboard_page_get_item_at_pixel (self, _tmp11_, _tmp13_); -#line 1646 "/home/jens/Source/shotwell/src/Page.vala" - item = _tmp14_; + item = _tmp10_; #line 1647 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = item; + _tmp11_ = item; #line 1647 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp15_ == NULL) { + if (_tmp11_ == NULL) { #line 1649 "/home/jens/Source/shotwell/src/Page.vala" result = TRUE; #line 1649 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (item); #line 1649 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 10817 "Page.c" +#line 11508 "Page.c" } #line 1652 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = self->cursor; + _tmp12_ = self->cursor; #line 1652 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = item; + _tmp13_ = item; #line 1652 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp16_ != _tmp17_) { -#line 10825 "Page.c" - ViewCollection* _tmp18_; - ViewCollection* _tmp19_; + if (_tmp12_ != _tmp13_) { +#line 11516 "Page.c" + ViewCollection* _tmp14_; + ViewCollection* _tmp15_; #line 1655 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1655 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = _tmp18_; + _tmp15_ = _tmp14_; #line 1655 "/home/jens/Source/shotwell/src/Page.vala" - view_collection_unselect_all (_tmp19_); + view_collection_unselect_all (_tmp15_); #line 1655 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp19_); -#line 10836 "Page.c" + _data_collection_unref0 (_tmp15_); +#line 11527 "Page.c" } else { - CheckerboardItem* _tmp20_; - gboolean _tmp21_; -#line 1661 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = item; + CheckerboardItem* _tmp16_; #line 1661 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_VIEW, DataView)); + _tmp16_ = item; #line 1661 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp21_) { -#line 10846 "Page.c" - ViewCollection* _tmp22_; - ViewCollection* _tmp23_; - CheckerboardItem* _tmp24_; + if (data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_VIEW, DataView))) { +#line 11534 "Page.c" + ViewCollection* _tmp17_; + ViewCollection* _tmp18_; + CheckerboardItem* _tmp19_; #line 1662 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1662 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = _tmp22_; + _tmp18_ = _tmp17_; #line 1662 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = item; + _tmp19_ = item; #line 1662 "/home/jens/Source/shotwell/src/Page.vala" - view_collection_unselect_all_but (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_VIEW, DataView)); + view_collection_unselect_all_but (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_VIEW, DataView)); #line 1662 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp23_); -#line 10860 "Page.c" + _data_collection_unref0 (_tmp18_); +#line 11548 "Page.c" } } #line 1665 "/home/jens/Source/shotwell/src/Page.vala" @@ -10865,867 +11553,791 @@ static gboolean checkerboard_page_real_on_left_released (Page* base, GdkEventBut _g_object_unref0 (item); #line 1665 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 10869 "Page.c" +#line 11557 "Page.c" } -static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButton* event) { +static gboolean +checkerboard_page_real_on_right_click (Page* base, + GdkEventButton* event) +{ CheckerboardPage * self; gboolean result = FALSE; - GdkEventButton* _tmp0_; - GdkEventType _tmp1_; + GdkEventType _tmp0_; CheckerboardItem* item = NULL; - GdkEventButton* _tmp2_; - gdouble _tmp3_; - GdkEventButton* _tmp4_; - gdouble _tmp5_; - CheckerboardItem* _tmp6_; - CheckerboardItem* _tmp7_; + gdouble _tmp1_; + gdouble _tmp2_; + CheckerboardItem* _tmp3_; + CheckerboardItem* _tmp4_; GtkMenu* context_menu = NULL; - GtkMenu* _tmp39_; - GtkMenu* _tmp40_; - GdkEventButton* _tmp41_; - gboolean _tmp42_; + GtkMenu* _tmp34_; + GtkMenu* _tmp35_; #line 1668 "/home/jens/Source/shotwell/src/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage); #line 1668 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); #line 1670 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = event; -#line 1670 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = _tmp0_->type; + _tmp0_ = event->type; #line 1670 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp1_ != GDK_BUTTON_PRESS) { + if (_tmp0_ != GDK_BUTTON_PRESS) { #line 1671 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 1671 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 10904 "Page.c" +#line 11588 "Page.c" } #line 1674 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = event; -#line 1674 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = _tmp2_->x; -#line 1674 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = event; + _tmp1_ = event->x; #line 1674 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = _tmp4_->y; + _tmp2_ = event->y; #line 1674 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = checkerboard_page_get_item_at_pixel (self, _tmp3_, _tmp5_); + _tmp3_ = checkerboard_page_get_item_at_pixel (self, _tmp1_, _tmp2_); #line 1674 "/home/jens/Source/shotwell/src/Page.vala" - item = _tmp6_; + item = _tmp3_; #line 1675 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = item; + _tmp4_ = item; #line 1675 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp7_ != NULL) { -#line 10922 "Page.c" - GdkEventButton* _tmp8_; - GdkModifierType _tmp9_; -#line 1677 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = event; + if (_tmp4_ != NULL) { +#line 11602 "Page.c" + GdkModifierType _tmp5_; #line 1677 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = _tmp8_->state; + _tmp5_ = event->state; #line 1677 "/home/jens/Source/shotwell/src/Page.vala" - switch (_tmp9_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) { + switch (_tmp5_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) { #line 1677 "/home/jens/Source/shotwell/src/Page.vala" case GDK_CONTROL_MASK: -#line 10933 "Page.c" +#line 11610 "Page.c" { Marker* marker = NULL; - ViewCollection* _tmp10_; + ViewCollection* _tmp6_; + ViewCollection* _tmp7_; + CheckerboardItem* _tmp8_; + Marker* _tmp9_; + Marker* _tmp10_; ViewCollection* _tmp11_; - CheckerboardItem* _tmp12_; + ViewCollection* _tmp12_; Marker* _tmp13_; - Marker* _tmp14_; - ViewCollection* _tmp15_; - ViewCollection* _tmp16_; - Marker* _tmp17_; #line 1680 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1680 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = _tmp10_; + _tmp7_ = _tmp6_; #line 1680 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = item; + _tmp8_ = item; #line 1680 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject)); + _tmp9_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); #line 1680 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = _tmp13_; + _tmp10_ = _tmp9_; #line 1680 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp11_); + _data_collection_unref0 (_tmp7_); #line 1680 "/home/jens/Source/shotwell/src/Page.vala" - marker = _tmp14_; + marker = _tmp10_; #line 1681 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1681 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = _tmp15_; + _tmp12_ = _tmp11_; #line 1681 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = marker; + _tmp13_ = marker; #line 1681 "/home/jens/Source/shotwell/src/Page.vala" - view_collection_toggle_marked (_tmp16_, _tmp17_); + view_collection_toggle_marked (_tmp12_, _tmp13_); #line 1681 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp16_); + _data_collection_unref0 (_tmp12_); #line 1682 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (marker); #line 1682 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 10972 "Page.c" +#line 11649 "Page.c" } #line 1677 "/home/jens/Source/shotwell/src/Page.vala" case GDK_SHIFT_MASK: -#line 10976 "Page.c" +#line 11653 "Page.c" { #line 1686 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 10980 "Page.c" +#line 11657 "Page.c" } #line 1677 "/home/jens/Source/shotwell/src/Page.vala" case GDK_CONTROL_MASK | GDK_SHIFT_MASK: -#line 10984 "Page.c" +#line 11661 "Page.c" { #line 1690 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 10988 "Page.c" +#line 11665 "Page.c" } default: { - CheckerboardItem* _tmp18_; - gboolean _tmp19_; -#line 1695 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = item; + CheckerboardItem* _tmp14_; #line 1695 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_VIEW, DataView)); + _tmp14_ = item; #line 1695 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp19_) { -#line 11000 "Page.c" + if (!data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_VIEW, DataView))) { +#line 11674 "Page.c" Marker* all = NULL; + ViewCollection* _tmp15_; + ViewCollection* _tmp16_; + Marker* _tmp17_; + Marker* _tmp18_; + Marker* _tmp19_; ViewCollection* _tmp20_; ViewCollection* _tmp21_; - Marker* _tmp22_; - Marker* _tmp23_; - Marker* _tmp24_; + GeeList* _tmp22_; + GeeList* _tmp23_; + ViewCollection* _tmp24_; ViewCollection* _tmp25_; - ViewCollection* _tmp26_; - GeeList* _tmp27_; - GeeList* _tmp28_; - ViewCollection* _tmp29_; - ViewCollection* _tmp30_; + Marker* _tmp26_; + ViewCollection* _tmp27_; + ViewCollection* _tmp28_; + CheckerboardItem* _tmp29_; + Marker* _tmp30_; Marker* _tmp31_; - ViewCollection* _tmp32_; - ViewCollection* _tmp33_; - CheckerboardItem* _tmp34_; - Marker* _tmp35_; - Marker* _tmp36_; #line 1696 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1696 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = _tmp20_; + _tmp16_ = _tmp15_; #line 1696 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp17_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_COLLECTION, DataCollection)); #line 1696 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = _tmp22_; + _tmp18_ = _tmp17_; #line 1696 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp21_); + _data_collection_unref0 (_tmp16_); #line 1696 "/home/jens/Source/shotwell/src/Page.vala" - all = _tmp23_; + all = _tmp18_; #line 1697 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = all; + _tmp19_ = all; #line 1697 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1697 "/home/jens/Source/shotwell/src/Page.vala" - _tmp26_ = _tmp25_; + _tmp21_ = _tmp20_; #line 1697 "/home/jens/Source/shotwell/src/Page.vala" - _tmp27_ = view_collection_get_selected (_tmp26_); + _tmp22_ = view_collection_get_selected (_tmp21_); #line 1697 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = _tmp27_; + _tmp23_ = _tmp22_; #line 1697 "/home/jens/Source/shotwell/src/Page.vala" - marker_mark_many (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection)); + marker_mark_many (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1697 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp28_); + _g_object_unref0 (_tmp23_); #line 1697 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp26_); + _data_collection_unref0 (_tmp21_); #line 1699 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1699 "/home/jens/Source/shotwell/src/Page.vala" - _tmp30_ = _tmp29_; + _tmp25_ = _tmp24_; #line 1699 "/home/jens/Source/shotwell/src/Page.vala" - _tmp31_ = all; + _tmp26_ = all; #line 1699 "/home/jens/Source/shotwell/src/Page.vala" - _tmp32_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp27_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1699 "/home/jens/Source/shotwell/src/Page.vala" - _tmp33_ = _tmp32_; + _tmp28_ = _tmp27_; #line 1699 "/home/jens/Source/shotwell/src/Page.vala" - _tmp34_ = item; + _tmp29_ = item; #line 1699 "/home/jens/Source/shotwell/src/Page.vala" - _tmp35_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_DATA_OBJECT, DataObject)); + _tmp30_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject)); #line 1699 "/home/jens/Source/shotwell/src/Page.vala" - _tmp36_ = _tmp35_; + _tmp31_ = _tmp30_; #line 1699 "/home/jens/Source/shotwell/src/Page.vala" - view_collection_unselect_and_select_marked (_tmp30_, _tmp31_, _tmp36_); + view_collection_unselect_and_select_marked (_tmp25_, _tmp26_, _tmp31_); #line 1699 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp36_); + _g_object_unref0 (_tmp31_); #line 1699 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp33_); + _data_collection_unref0 (_tmp28_); #line 1699 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp30_); + _data_collection_unref0 (_tmp25_); #line 1695 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (all); -#line 11073 "Page.c" +#line 11747 "Page.c" } #line 1701 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 11077 "Page.c" +#line 11751 "Page.c" } } } else { - ViewCollection* _tmp37_; - ViewCollection* _tmp38_; + ViewCollection* _tmp32_; + ViewCollection* _tmp33_; #line 1705 "/home/jens/Source/shotwell/src/Page.vala" - _tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp32_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1705 "/home/jens/Source/shotwell/src/Page.vala" - _tmp38_ = _tmp37_; + _tmp33_ = _tmp32_; #line 1705 "/home/jens/Source/shotwell/src/Page.vala" - view_collection_unselect_all (_tmp38_); + view_collection_unselect_all (_tmp33_); #line 1705 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp38_); -#line 11091 "Page.c" + _data_collection_unref0 (_tmp33_); +#line 11765 "Page.c" } #line 1708 "/home/jens/Source/shotwell/src/Page.vala" - _tmp39_ = checkerboard_page_get_context_menu (self); + _tmp34_ = checkerboard_page_get_context_menu (self); #line 1708 "/home/jens/Source/shotwell/src/Page.vala" - context_menu = _tmp39_; -#line 1709 "/home/jens/Source/shotwell/src/Page.vala" - _tmp40_ = context_menu; -#line 1709 "/home/jens/Source/shotwell/src/Page.vala" - _tmp41_ = event; + context_menu = _tmp34_; #line 1709 "/home/jens/Source/shotwell/src/Page.vala" - _tmp42_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp40_, _tmp41_); + _tmp35_ = context_menu; #line 1709 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp42_; + result = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp35_, event); #line 1709 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (context_menu); #line 1709 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (item); #line 1709 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 11111 "Page.c" +#line 11781 "Page.c" } -static gboolean checkerboard_page_real_on_mouse_over (CheckerboardPage* self, CheckerboardItem* item, gint x, gint y, GdkModifierType mask) { +static gboolean +checkerboard_page_real_on_mouse_over (CheckerboardPage* self, + CheckerboardItem* item, + gint x, + gint y, + GdkModifierType mask) +{ gboolean result = FALSE; - CheckerboardItem* _tmp0_; - CheckerboardItem* _tmp6_; - CheckerboardItem* _tmp7_; - CheckerboardItem* _tmp8_; - CheckerboardItem* _tmp10_; - CheckerboardItem* _tmp11_; - CheckerboardItem* _tmp12_; - CheckerboardItem* _tmp13_; + CheckerboardItem* _tmp1_; + CheckerboardItem* _tmp2_; + CheckerboardItem* _tmp4_; #line 1712 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail ((item == NULL) || IS_CHECKERBOARD_ITEM (item), FALSE); #line 1713 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = item; -#line 1713 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp0_ != NULL) { -#line 11131 "Page.c" - CheckerboardLayout* _tmp1_; - CheckerboardItem* _tmp2_; - gint _tmp3_; - gint _tmp4_; - GdkModifierType _tmp5_; -#line 1714 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = self->priv->layout; -#line 1714 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = item; + if (item != NULL) { +#line 11800 "Page.c" + CheckerboardLayout* _tmp0_; #line 1714 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = x; + _tmp0_ = self->priv->layout; #line 1714 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = y; -#line 1714 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = mask; -#line 1714 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_layout_handle_mouse_motion (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_); -#line 11149 "Page.c" + checkerboard_layout_handle_mouse_motion (_tmp0_, item, x, y, mask); +#line 11806 "Page.c" } #line 1718 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = item; -#line 1718 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = self->priv->highlighted; + _tmp1_ = self->priv->highlighted; #line 1718 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp6_ == _tmp7_) { + if (item == _tmp1_) { #line 1719 "/home/jens/Source/shotwell/src/Page.vala" result = TRUE; #line 1719 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 11161 "Page.c" +#line 11816 "Page.c" } #line 1722 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = self->priv->highlighted; + _tmp2_ = self->priv->highlighted; #line 1722 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp8_ != NULL) { -#line 11167 "Page.c" - CheckerboardItem* _tmp9_; + if (_tmp2_ != NULL) { +#line 11822 "Page.c" + CheckerboardItem* _tmp3_; #line 1723 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = self->priv->highlighted; + _tmp3_ = self->priv->highlighted; #line 1723 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_item_unbrighten (_tmp9_); + checkerboard_item_unbrighten (_tmp3_); #line 1724 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->highlighted); #line 1724 "/home/jens/Source/shotwell/src/Page.vala" self->priv->highlighted = NULL; -#line 11177 "Page.c" +#line 11832 "Page.c" } #line 1728 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = item; -#line 1728 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp10_ == NULL) { + if (item == NULL) { #line 1729 "/home/jens/Source/shotwell/src/Page.vala" result = TRUE; #line 1729 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 11187 "Page.c" +#line 11840 "Page.c" } #line 1732 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = item; -#line 1732 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_item_brighten (_tmp11_); + checkerboard_item_brighten (item); #line 1733 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = item; -#line 1733 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = _g_object_ref0 (_tmp12_); + _tmp4_ = _g_object_ref0 (item); #line 1733 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->highlighted); #line 1733 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->highlighted = _tmp13_; + self->priv->highlighted = _tmp4_; #line 1735 "/home/jens/Source/shotwell/src/Page.vala" result = TRUE; #line 1735 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 11205 "Page.c" +#line 11854 "Page.c" } -gboolean checkerboard_page_on_mouse_over (CheckerboardPage* self, CheckerboardItem* item, gint x, gint y, GdkModifierType mask) { +gboolean +checkerboard_page_on_mouse_over (CheckerboardPage* self, + CheckerboardItem* item, + gint x, + gint y, + GdkModifierType mask) +{ #line 1712 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), FALSE); #line 1712 "/home/jens/Source/shotwell/src/Page.vala" return CHECKERBOARD_PAGE_GET_CLASS (self)->on_mouse_over (self, item, x, y, mask); -#line 11214 "Page.c" +#line 11869 "Page.c" } -static gboolean _checkerboard_page_selection_autoscroll_gsource_func (gpointer self) { +static gboolean +_checkerboard_page_selection_autoscroll_gsource_func (gpointer self) +{ gboolean result; result = checkerboard_page_selection_autoscroll ((CheckerboardPage*) self); #line 1755 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 11223 "Page.c" +#line 11880 "Page.c" } -static gboolean checkerboard_page_real_on_motion (Page* base, GdkEventMotion* event, gint x, gint y, GdkModifierType mask) { +static gboolean +checkerboard_page_real_on_motion (Page* base, + GdkEventMotion* event, + gint x, + gint y, + GdkModifierType mask) +{ CheckerboardPage * self; gboolean result = FALSE; - gint _tmp0_; - gint _tmp1_; - CheckerboardItem* _tmp2_; - CheckerboardItem* _tmp3_; - gint _tmp4_; - gint _tmp5_; - GdkModifierType _tmp6_; - gboolean _tmp7_; - gboolean _tmp8_; - CheckerboardLayout* _tmp9_; - gboolean _tmp10_; - CheckerboardLayout* _tmp11_; - gint _tmp12_; - gint _tmp13_; - gboolean _tmp14_ = FALSE; - gboolean _tmp15_; + CheckerboardItem* _tmp0_; + CheckerboardItem* _tmp1_; + gboolean _tmp2_; + CheckerboardLayout* _tmp3_; + CheckerboardLayout* _tmp4_; + gboolean _tmp5_ = FALSE; + gboolean _tmp6_; #line 1738 "/home/jens/Source/shotwell/src/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage); #line 1738 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); #line 1740 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = x; + _tmp0_ = checkerboard_page_get_item_at_pixel (self, (gdouble) x, (gdouble) y); #line 1740 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = y; -#line 1740 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = checkerboard_page_get_item_at_pixel (self, (gdouble) _tmp0_, (gdouble) _tmp1_); -#line 1740 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = _tmp2_; -#line 1740 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = x; -#line 1740 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = y; -#line 1740 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = mask; -#line 1740 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = checkerboard_page_on_mouse_over (self, _tmp3_, _tmp4_, _tmp5_, _tmp6_); + _tmp1_ = _tmp0_; #line 1740 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = !_tmp7_; + _tmp2_ = !checkerboard_page_on_mouse_over (self, _tmp1_, x, y, mask); #line 1740 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 1740 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp8_) { + if (_tmp2_) { #line 1741 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 1741 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 11276 "Page.c" +#line 11918 "Page.c" } #line 1744 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = self->priv->layout; -#line 1744 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = checkerboard_layout_is_drag_select_active (_tmp9_); + _tmp3_ = self->priv->layout; #line 1744 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp10_) { + if (!checkerboard_layout_is_drag_select_active (_tmp3_)) { #line 1745 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 1745 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 11288 "Page.c" +#line 11928 "Page.c" } #line 1748 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = self->priv->layout; -#line 1748 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = x; -#line 1748 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = y; + _tmp4_ = self->priv->layout; #line 1748 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_layout_set_drag_select_endpoint (_tmp11_, _tmp12_, _tmp13_); + checkerboard_layout_set_drag_select_endpoint (_tmp4_, x, y); #line 1750 "/home/jens/Source/shotwell/src/Page.vala" checkerboard_page_updated_selection_band (self); #line 1753 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = self->priv->autoscroll_scheduled; + _tmp6_ = self->priv->autoscroll_scheduled; #line 1753 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp15_) { -#line 11304 "Page.c" - GtkAdjustment* _tmp16_; - gint _tmp17_; - AdjustmentRelation _tmp18_; -#line 1754 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow)); -#line 1754 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = y; + if (!_tmp6_) { +#line 11940 "Page.c" + GtkAdjustment* _tmp7_; #line 1754 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = get_adjustment_relation (_tmp16_, _tmp17_); + _tmp7_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow)); #line 1754 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = _tmp18_ != ADJUSTMENT_RELATION_IN_RANGE; -#line 11316 "Page.c" + _tmp5_ = get_adjustment_relation (_tmp7_, y) != ADJUSTMENT_RELATION_IN_RANGE; +#line 11946 "Page.c" } else { #line 1753 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = FALSE; -#line 11320 "Page.c" + _tmp5_ = FALSE; +#line 11950 "Page.c" } #line 1753 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp14_) { + if (_tmp5_) { #line 1755 "/home/jens/Source/shotwell/src/Page.vala" g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) CHECKERBOARD_PAGE_AUTOSCROLL_TICKS_MSEC, _checkerboard_page_selection_autoscroll_gsource_func, g_object_ref (self), g_object_unref); #line 1756 "/home/jens/Source/shotwell/src/Page.vala" self->priv->autoscroll_scheduled = TRUE; -#line 11328 "Page.c" +#line 11958 "Page.c" } #line 1760 "/home/jens/Source/shotwell/src/Page.vala" result = TRUE; #line 1760 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 11334 "Page.c" +#line 11964 "Page.c" } -static void checkerboard_page_updated_selection_band (CheckerboardPage* self) { +static void +checkerboard_page_updated_selection_band (CheckerboardPage* self) +{ CheckerboardLayout* _tmp0_; - gboolean _tmp1_; GeeList* intersection = NULL; - CheckerboardLayout* _tmp2_; + CheckerboardLayout* _tmp1_; + GeeList* _tmp2_; GeeList* _tmp3_; - GeeList* _tmp4_; Marker* to_unselect = NULL; + ViewCollection* _tmp4_; ViewCollection* _tmp5_; - ViewCollection* _tmp6_; + Marker* _tmp6_; Marker* _tmp7_; - Marker* _tmp8_; Marker* to_select = NULL; + ViewCollection* _tmp8_; ViewCollection* _tmp9_; - ViewCollection* _tmp10_; + Marker* _tmp10_; Marker* _tmp11_; Marker* _tmp12_; - Marker* _tmp13_; + ViewCollection* _tmp13_; ViewCollection* _tmp14_; - ViewCollection* _tmp15_; + GeeList* _tmp15_; GeeList* _tmp16_; - GeeList* _tmp17_; - GeeArrayList* _tmp18_; - Marker* _tmp19_; - GeeArrayList* _tmp20_; - Marker* _tmp21_; - GeeArrayList* _tmp22_; - ViewCollection* _tmp44_; + GeeArrayList* _tmp17_; + Marker* _tmp18_; + GeeArrayList* _tmp19_; + Marker* _tmp20_; + GeeArrayList* _tmp21_; + ViewCollection* _tmp42_; + ViewCollection* _tmp43_; + Marker* _tmp44_; ViewCollection* _tmp45_; - Marker* _tmp46_; - ViewCollection* _tmp47_; - ViewCollection* _tmp48_; - Marker* _tmp49_; + ViewCollection* _tmp46_; + Marker* _tmp47_; #line 1763 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (self)); #line 1764 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = self->priv->layout; #line 1764 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_); -#line 1764 "/home/jens/Source/shotwell/src/Page.vala" - _vala_assert (_tmp1_, "layout.is_drag_select_active()"); + _vala_assert (checkerboard_layout_is_drag_select_active (_tmp0_), "layout.is_drag_select_active()"); #line 1767 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = self->priv->layout; + _tmp1_ = self->priv->layout; #line 1767 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = checkerboard_layout_items_in_selection_band (_tmp2_); + _tmp2_ = checkerboard_layout_items_in_selection_band (_tmp1_); #line 1767 "/home/jens/Source/shotwell/src/Page.vala" - intersection = _tmp3_; + intersection = _tmp2_; #line 1768 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = intersection; + _tmp3_ = intersection; #line 1768 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp4_ == NULL) { + if (_tmp3_ == NULL) { #line 1769 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (intersection); #line 1769 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 11393 "Page.c" +#line 12022 "Page.c" } #line 1771 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1771 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 1771 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp6_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection)); #line 1771 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 1771 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp6_); + _data_collection_unref0 (_tmp5_); #line 1771 "/home/jens/Source/shotwell/src/Page.vala" - to_unselect = _tmp8_; + to_unselect = _tmp7_; #line 1772 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1772 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 1772 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp10_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection)); #line 1772 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 1772 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp10_); + _data_collection_unref0 (_tmp9_); #line 1772 "/home/jens/Source/shotwell/src/Page.vala" - to_select = _tmp12_; + to_select = _tmp11_; #line 1775 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = to_unselect; + _tmp12_ = to_unselect; #line 1775 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1775 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 1775 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = view_collection_get_selected (_tmp15_); + _tmp15_ = view_collection_get_selected (_tmp14_); #line 1775 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 1775 "/home/jens/Source/shotwell/src/Page.vala" - marker_mark_many (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection)); + marker_mark_many (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1775 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp17_); + _g_object_unref0 (_tmp16_); #line 1775 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp15_); + _data_collection_unref0 (_tmp14_); #line 1778 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = self->priv->previously_selected; + _tmp17_ = self->priv->previously_selected; #line 1778 "/home/jens/Source/shotwell/src/Page.vala" - _vala_assert (_tmp18_ != NULL, "previously_selected != null"); + _vala_assert (_tmp17_ != NULL, "previously_selected != null"); #line 1779 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = to_unselect; + _tmp18_ = to_unselect; #line 1779 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = self->priv->previously_selected; + _tmp19_ = self->priv->previously_selected; #line 1779 "/home/jens/Source/shotwell/src/Page.vala" - marker_unmark_many (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); + marker_unmark_many (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1780 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = to_select; + _tmp20_ = to_select; #line 1780 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = self->priv->previously_selected; + _tmp21_ = self->priv->previously_selected; #line 1780 "/home/jens/Source/shotwell/src/Page.vala" - marker_mark_many (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection)); + marker_mark_many (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1783 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->cursor); #line 1783 "/home/jens/Source/shotwell/src/Page.vala" self->cursor = NULL; -#line 11455 "Page.c" +#line 12084 "Page.c" { GeeList* _item_list = NULL; + GeeList* _tmp22_; GeeList* _tmp23_; - GeeList* _tmp24_; gint _item_size = 0; - GeeList* _tmp25_; + GeeList* _tmp24_; + gint _tmp25_; gint _tmp26_; - gint _tmp27_; gint _item_index = 0; #line 1785 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = intersection; + _tmp22_ = intersection; #line 1785 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = _g_object_ref0 (_tmp23_); + _tmp23_ = _g_object_ref0 (_tmp22_); #line 1785 "/home/jens/Source/shotwell/src/Page.vala" - _item_list = _tmp24_; + _item_list = _tmp23_; #line 1785 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = _item_list; + _tmp24_ = _item_list; #line 1785 "/home/jens/Source/shotwell/src/Page.vala" - _tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp25_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1785 "/home/jens/Source/shotwell/src/Page.vala" - _tmp27_ = _tmp26_; + _tmp26_ = _tmp25_; #line 1785 "/home/jens/Source/shotwell/src/Page.vala" - _item_size = _tmp27_; + _item_size = _tmp26_; #line 1785 "/home/jens/Source/shotwell/src/Page.vala" _item_index = -1; #line 1785 "/home/jens/Source/shotwell/src/Page.vala" while (TRUE) { -#line 11483 "Page.c" +#line 12112 "Page.c" + gint _tmp27_; gint _tmp28_; gint _tmp29_; - gint _tmp30_; CheckerboardItem* item = NULL; - GeeList* _tmp31_; - gint _tmp32_; - gpointer _tmp33_; - Marker* _tmp34_; - CheckerboardItem* _tmp35_; - gboolean _tmp36_; - CheckerboardItem* _tmp41_; + GeeList* _tmp30_; + gint _tmp31_; + gpointer _tmp32_; + Marker* _tmp33_; + CheckerboardItem* _tmp34_; + CheckerboardItem* _tmp39_; #line 1785 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = _item_index; + _tmp27_ = _item_index; #line 1785 "/home/jens/Source/shotwell/src/Page.vala" - _item_index = _tmp28_ + 1; + _item_index = _tmp27_ + 1; #line 1785 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = _item_index; + _tmp28_ = _item_index; #line 1785 "/home/jens/Source/shotwell/src/Page.vala" - _tmp30_ = _item_size; + _tmp29_ = _item_size; #line 1785 "/home/jens/Source/shotwell/src/Page.vala" - if (!(_tmp29_ < _tmp30_)) { + if (!(_tmp28_ < _tmp29_)) { #line 1785 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 11507 "Page.c" +#line 12135 "Page.c" } #line 1785 "/home/jens/Source/shotwell/src/Page.vala" - _tmp31_ = _item_list; + _tmp30_ = _item_list; #line 1785 "/home/jens/Source/shotwell/src/Page.vala" - _tmp32_ = _item_index; + _tmp31_ = _item_index; #line 1785 "/home/jens/Source/shotwell/src/Page.vala" - _tmp33_ = gee_list_get (_tmp31_, _tmp32_); + _tmp32_ = gee_list_get (_tmp30_, _tmp31_); #line 1785 "/home/jens/Source/shotwell/src/Page.vala" - item = (CheckerboardItem*) _tmp33_; -#line 1786 "/home/jens/Source/shotwell/src/Page.vala" - _tmp34_ = to_select; + item = (CheckerboardItem*) _tmp32_; #line 1786 "/home/jens/Source/shotwell/src/Page.vala" - _tmp35_ = item; + _tmp33_ = to_select; #line 1786 "/home/jens/Source/shotwell/src/Page.vala" - _tmp36_ = marker_toggle (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_DATA_OBJECT, DataObject)); + _tmp34_ = item; #line 1786 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp36_) { -#line 11525 "Page.c" - Marker* _tmp37_; - CheckerboardItem* _tmp38_; + if (marker_toggle (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_DATA_OBJECT, DataObject))) { +#line 12151 "Page.c" + Marker* _tmp35_; + CheckerboardItem* _tmp36_; #line 1787 "/home/jens/Source/shotwell/src/Page.vala" - _tmp37_ = to_unselect; + _tmp35_ = to_unselect; #line 1787 "/home/jens/Source/shotwell/src/Page.vala" - _tmp38_ = item; + _tmp36_ = item; #line 1787 "/home/jens/Source/shotwell/src/Page.vala" - marker_unmark (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_OBJECT, DataObject)); -#line 11534 "Page.c" + marker_unmark (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_DATA_OBJECT, DataObject)); +#line 12160 "Page.c" } else { - Marker* _tmp39_; - CheckerboardItem* _tmp40_; + Marker* _tmp37_; + CheckerboardItem* _tmp38_; #line 1789 "/home/jens/Source/shotwell/src/Page.vala" - _tmp39_ = to_unselect; + _tmp37_ = to_unselect; #line 1789 "/home/jens/Source/shotwell/src/Page.vala" - _tmp40_ = item; + _tmp38_ = item; #line 1789 "/home/jens/Source/shotwell/src/Page.vala" - marker_mark (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_OBJECT, DataObject)); -#line 11544 "Page.c" + marker_mark (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_OBJECT, DataObject)); +#line 12170 "Page.c" } #line 1791 "/home/jens/Source/shotwell/src/Page.vala" - _tmp41_ = self->cursor; + _tmp39_ = self->cursor; #line 1791 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp41_ == NULL) { -#line 11550 "Page.c" - CheckerboardItem* _tmp42_; - CheckerboardItem* _tmp43_; + if (_tmp39_ == NULL) { +#line 12176 "Page.c" + CheckerboardItem* _tmp40_; + CheckerboardItem* _tmp41_; #line 1792 "/home/jens/Source/shotwell/src/Page.vala" - _tmp42_ = item; + _tmp40_ = item; #line 1792 "/home/jens/Source/shotwell/src/Page.vala" - _tmp43_ = _g_object_ref0 (_tmp42_); + _tmp41_ = _g_object_ref0 (_tmp40_); #line 1792 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->cursor); #line 1792 "/home/jens/Source/shotwell/src/Page.vala" - self->cursor = _tmp43_; -#line 11561 "Page.c" + self->cursor = _tmp41_; +#line 12187 "Page.c" } #line 1785 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (item); -#line 11565 "Page.c" +#line 12191 "Page.c" } #line 1785 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (_item_list); -#line 11569 "Page.c" +#line 12195 "Page.c" } #line 1795 "/home/jens/Source/shotwell/src/Page.vala" - _tmp44_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp42_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1795 "/home/jens/Source/shotwell/src/Page.vala" - _tmp45_ = _tmp44_; + _tmp43_ = _tmp42_; #line 1795 "/home/jens/Source/shotwell/src/Page.vala" - _tmp46_ = to_select; + _tmp44_ = to_select; #line 1795 "/home/jens/Source/shotwell/src/Page.vala" - view_collection_select_marked (_tmp45_, _tmp46_); + view_collection_select_marked (_tmp43_, _tmp44_); #line 1795 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp45_); + _data_collection_unref0 (_tmp43_); #line 1796 "/home/jens/Source/shotwell/src/Page.vala" - _tmp47_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp45_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1796 "/home/jens/Source/shotwell/src/Page.vala" - _tmp48_ = _tmp47_; + _tmp46_ = _tmp45_; #line 1796 "/home/jens/Source/shotwell/src/Page.vala" - _tmp49_ = to_unselect; + _tmp47_ = to_unselect; #line 1796 "/home/jens/Source/shotwell/src/Page.vala" - view_collection_unselect_marked (_tmp48_, _tmp49_); + view_collection_unselect_marked (_tmp46_, _tmp47_); #line 1796 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp48_); + _data_collection_unref0 (_tmp46_); #line 1763 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (to_select); #line 1763 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (to_unselect); #line 1763 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (intersection); -#line 11597 "Page.c" +#line 12223 "Page.c" } -static gboolean checkerboard_page_selection_autoscroll (CheckerboardPage* self) { +static gboolean +checkerboard_page_selection_autoscroll (CheckerboardPage* self) +{ gboolean result = FALSE; CheckerboardLayout* _tmp0_; - gboolean _tmp1_; GtkAdjustment* vadj = NULL; + GtkAdjustment* _tmp1_; GtkAdjustment* _tmp2_; - GtkAdjustment* _tmp3_; gint x = 0; gint y = 0; GdkModifierType mask = 0; + gint _tmp3_ = 0; gint _tmp4_ = 0; - gint _tmp5_ = 0; - GdkModifierType _tmp6_ = 0; + GdkModifierType _tmp5_ = 0; gint new_value = 0; + GtkAdjustment* _tmp6_; GtkAdjustment* _tmp7_; - gdouble _tmp8_; - GtkAdjustment* _tmp9_; - gint _tmp10_; - AdjustmentRelation _tmp11_; + gint _tmp8_; + GtkAdjustment* _tmp18_; + gint _tmp19_; + GtkAdjustment* _tmp20_; + GtkAdjustment* _tmp21_; GtkAdjustment* _tmp22_; - gint _tmp23_; - GtkAdjustment* _tmp24_; - gdouble _tmp25_; - GtkAdjustment* _tmp26_; - gdouble _tmp27_; - GtkAdjustment* _tmp28_; - gdouble _tmp29_; - gint _tmp30_; #line 1799 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), FALSE); #line 1800 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = self->priv->layout; #line 1800 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_); -#line 1800 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp1_) { + if (!checkerboard_layout_is_drag_select_active (_tmp0_)) { #line 1801 "/home/jens/Source/shotwell/src/Page.vala" self->priv->autoscroll_scheduled = FALSE; #line 1803 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 1803 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 11643 "Page.c" +#line 12262 "Page.c" } #line 1807 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow)); + _tmp1_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow)); #line 1807 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp2_ = _g_object_ref0 (_tmp1_); #line 1807 "/home/jens/Source/shotwell/src/Page.vala" - vadj = _tmp3_; + vadj = _tmp2_; #line 1811 "/home/jens/Source/shotwell/src/Page.vala" - page_get_event_source_pointer (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), &_tmp4_, &_tmp5_, &_tmp6_); + page_get_event_source_pointer (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), &_tmp3_, &_tmp4_, &_tmp5_); #line 1811 "/home/jens/Source/shotwell/src/Page.vala" - x = _tmp4_; + x = _tmp3_; #line 1811 "/home/jens/Source/shotwell/src/Page.vala" - y = _tmp5_; + y = _tmp4_; #line 1811 "/home/jens/Source/shotwell/src/Page.vala" - mask = _tmp6_; + mask = _tmp5_; #line 1813 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = vadj; + _tmp6_ = vadj; #line 1813 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = gtk_adjustment_get_value (_tmp7_); -#line 1813 "/home/jens/Source/shotwell/src/Page.vala" - new_value = (gint) _tmp8_; -#line 1814 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = vadj; + new_value = (gint) gtk_adjustment_get_value (_tmp6_); #line 1814 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = y; + _tmp7_ = vadj; #line 1814 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = get_adjustment_relation (_tmp9_, _tmp10_); + _tmp8_ = y; #line 1814 "/home/jens/Source/shotwell/src/Page.vala" - switch (_tmp11_) { + switch (get_adjustment_relation (_tmp7_, _tmp8_)) { #line 1814 "/home/jens/Source/shotwell/src/Page.vala" case ADJUSTMENT_RELATION_BELOW: -#line 11675 "Page.c" +#line 12290 "Page.c" { + gint _tmp9_; + CheckerboardLayout* _tmp10_; + gint _tmp11_; gint _tmp12_; - CheckerboardLayout* _tmp13_; - gint _tmp14_; - gint _tmp15_; #line 1817 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = new_value; + _tmp9_ = new_value; #line 1817 "/home/jens/Source/shotwell/src/Page.vala" - new_value = _tmp12_ - CHECKERBOARD_PAGE_AUTOSCROLL_PIXELS; + new_value = _tmp9_ - CHECKERBOARD_PAGE_AUTOSCROLL_PIXELS; #line 1818 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = self->priv->layout; + _tmp10_ = self->priv->layout; #line 1818 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = x; + _tmp11_ = x; #line 1818 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = new_value; + _tmp12_ = new_value; #line 1818 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_layout_set_drag_select_endpoint (_tmp13_, _tmp14_, _tmp15_); + checkerboard_layout_set_drag_select_endpoint (_tmp10_, _tmp11_, _tmp12_); #line 1819 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 11695 "Page.c" +#line 12310 "Page.c" } #line 1814 "/home/jens/Source/shotwell/src/Page.vala" case ADJUSTMENT_RELATION_ABOVE: -#line 11699 "Page.c" +#line 12314 "Page.c" { + gint _tmp13_; + CheckerboardLayout* _tmp14_; + gint _tmp15_; gint _tmp16_; - CheckerboardLayout* _tmp17_; - gint _tmp18_; - gint _tmp19_; - GtkAdjustment* _tmp20_; - gdouble _tmp21_; + GtkAdjustment* _tmp17_; #line 1823 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = new_value; + _tmp13_ = new_value; #line 1823 "/home/jens/Source/shotwell/src/Page.vala" - new_value = _tmp16_ + CHECKERBOARD_PAGE_AUTOSCROLL_PIXELS; -#line 1824 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = self->priv->layout; + new_value = _tmp13_ + CHECKERBOARD_PAGE_AUTOSCROLL_PIXELS; #line 1824 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = x; + _tmp14_ = self->priv->layout; #line 1824 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = new_value; + _tmp15_ = x; #line 1824 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = vadj; + _tmp16_ = new_value; #line 1824 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = gtk_adjustment_get_page_size (_tmp20_); + _tmp17_ = vadj; #line 1824 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_layout_set_drag_select_endpoint (_tmp17_, _tmp18_, _tmp19_ + ((gint) _tmp21_)); + checkerboard_layout_set_drag_select_endpoint (_tmp14_, _tmp15_, _tmp16_ + ((gint) gtk_adjustment_get_page_size (_tmp17_))); #line 1825 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 11725 "Page.c" +#line 12337 "Page.c" } #line 1814 "/home/jens/Source/shotwell/src/Page.vala" case ADJUSTMENT_RELATION_IN_RANGE: -#line 11729 "Page.c" +#line 12341 "Page.c" { #line 1828 "/home/jens/Source/shotwell/src/Page.vala" self->priv->autoscroll_scheduled = FALSE; @@ -11735,7 +12347,7 @@ static gboolean checkerboard_page_selection_autoscroll (CheckerboardPage* self) _g_object_unref0 (vadj); #line 1830 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 11739 "Page.c" +#line 12351 "Page.c" } default: { @@ -11743,29 +12355,21 @@ static gboolean checkerboard_page_selection_autoscroll (CheckerboardPage* self) g_warn_if_reached (); #line 1834 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 11747 "Page.c" +#line 12359 "Page.c" } } #line 1840 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = vadj; -#line 1840 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = new_value; -#line 1840 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = vadj; + _tmp18_ = vadj; #line 1840 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = gtk_adjustment_get_lower (_tmp24_); -#line 1840 "/home/jens/Source/shotwell/src/Page.vala" - _tmp26_ = vadj; + _tmp19_ = new_value; #line 1840 "/home/jens/Source/shotwell/src/Page.vala" - _tmp27_ = gtk_adjustment_get_upper (_tmp26_); + _tmp20_ = vadj; #line 1840 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = vadj; + _tmp21_ = vadj; #line 1840 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = gtk_adjustment_get_page_size (_tmp28_); -#line 1840 "/home/jens/Source/shotwell/src/Page.vala" - _tmp30_ = CLAMP (_tmp23_, (gint) _tmp25_, ((gint) _tmp27_) - ((gint) _tmp29_)); + _tmp22_ = vadj; #line 1840 "/home/jens/Source/shotwell/src/Page.vala" - gtk_adjustment_set_value (_tmp22_, (gdouble) _tmp30_); + gtk_adjustment_set_value (_tmp18_, (gdouble) CLAMP (_tmp19_, (gint) gtk_adjustment_get_lower (_tmp20_), ((gint) gtk_adjustment_get_upper (_tmp21_)) - ((gint) gtk_adjustment_get_page_size (_tmp22_)))); #line 1843 "/home/jens/Source/shotwell/src/Page.vala" checkerboard_page_updated_selection_band (self); #line 1845 "/home/jens/Source/shotwell/src/Page.vala" @@ -11774,37 +12378,31 @@ static gboolean checkerboard_page_selection_autoscroll (CheckerboardPage* self) _g_object_unref0 (vadj); #line 1845 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 11778 "Page.c" +#line 12382 "Page.c" } -void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem* item) { +void +checkerboard_page_cursor_to_item (CheckerboardPage* self, + CheckerboardItem* item) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; CheckerboardItem* _tmp2_; - gboolean _tmp3_; - CheckerboardItem* _tmp4_; - CheckerboardItem* _tmp5_; - gboolean _tmp6_; - CheckerboardLayout* _tmp17_; - CheckerboardItem* _tmp18_; + CheckerboardLayout* _tmp12_; GtkAdjustment* vadj = NULL; - GtkAdjustment* _tmp19_; - GtkAdjustment* _tmp20_; - gboolean _tmp21_ = FALSE; - GtkAdjustment* _tmp22_; - CheckerboardItem* _tmp23_; + GtkAdjustment* _tmp13_; + GtkAdjustment* _tmp14_; + gboolean _tmp15_ = FALSE; + GtkAdjustment* _tmp16_; + GdkRectangle _tmp17_; + gint _tmp18_; + gint top = 0; GdkRectangle _tmp24_; gint _tmp25_; - AdjustmentRelation _tmp26_; - gint top = 0; - CheckerboardItem* _tmp35_; - GdkRectangle _tmp36_; + GtkAdjustment* _tmp26_; + GtkAdjustment* _tmp36_; gint _tmp37_; - GtkAdjustment* _tmp38_; - gdouble _tmp39_; - GtkAdjustment* _tmp53_; - gint _tmp54_; #line 1848 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (self)); #line 1848 "/home/jens/Source/shotwell/src/Page.vala" @@ -11814,231 +12412,190 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem* #line 1849 "/home/jens/Source/shotwell/src/Page.vala" _tmp1_ = _tmp0_; #line 1849 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = item; -#line 1849 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject)); -#line 1849 "/home/jens/Source/shotwell/src/Page.vala" - _vala_assert (_tmp3_, "get_view().contains(item)"); + _vala_assert (data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (item, TYPE_DATA_OBJECT, DataObject)), "get_view().contains(item)"); #line 1849 "/home/jens/Source/shotwell/src/Page.vala" _data_collection_unref0 (_tmp1_); #line 1851 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = item; -#line 1851 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp2_ = _g_object_ref0 (item); #line 1851 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->cursor); #line 1851 "/home/jens/Source/shotwell/src/Page.vala" - self->cursor = _tmp5_; -#line 1853 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + self->cursor = _tmp2_; #line 1853 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp6_) { -#line 11837 "Page.c" - ViewCollection* _tmp7_; - ViewCollection* _tmp8_; + if (!page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page))) { +#line 12427 "Page.c" + ViewCollection* _tmp3_; + ViewCollection* _tmp4_; Marker* marker = NULL; + ViewCollection* _tmp5_; + ViewCollection* _tmp6_; + Marker* _tmp7_; + Marker* _tmp8_; ViewCollection* _tmp9_; ViewCollection* _tmp10_; - CheckerboardItem* _tmp11_; - Marker* _tmp12_; - Marker* _tmp13_; - ViewCollection* _tmp14_; - ViewCollection* _tmp15_; - Marker* _tmp16_; + Marker* _tmp11_; #line 1854 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1854 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = _tmp7_; + _tmp4_ = _tmp3_; #line 1854 "/home/jens/Source/shotwell/src/Page.vala" - view_collection_unselect_all (_tmp8_); + view_collection_unselect_all (_tmp4_); #line 1854 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp8_); -#line 1855 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _data_collection_unref0 (_tmp4_); #line 1855 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = _tmp9_; + _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1855 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = item; + _tmp6_ = _tmp5_; #line 1855 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject)); + _tmp7_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (item, TYPE_DATA_OBJECT, DataObject)); #line 1855 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = _tmp12_; + _tmp8_ = _tmp7_; #line 1855 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp10_); + _data_collection_unref0 (_tmp6_); #line 1855 "/home/jens/Source/shotwell/src/Page.vala" - marker = _tmp13_; + marker = _tmp8_; #line 1856 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1856 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = _tmp14_; + _tmp10_ = _tmp9_; #line 1856 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = marker; + _tmp11_ = marker; #line 1856 "/home/jens/Source/shotwell/src/Page.vala" - view_collection_select_marked (_tmp15_, _tmp16_); + view_collection_select_marked (_tmp10_, _tmp11_); #line 1856 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp15_); + _data_collection_unref0 (_tmp10_); #line 1853 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (marker); -#line 11883 "Page.c" +#line 12470 "Page.c" } #line 1858 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = self->priv->layout; -#line 1858 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = item; + _tmp12_ = self->priv->layout; #line 1858 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_layout_set_cursor (_tmp17_, _tmp18_); + checkerboard_layout_set_cursor (_tmp12_, item); #line 1861 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow)); + _tmp13_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow)); #line 1861 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = _g_object_ref0 (_tmp19_); + _tmp14_ = _g_object_ref0 (_tmp13_); #line 1861 "/home/jens/Source/shotwell/src/Page.vala" - vadj = _tmp20_; -#line 1862 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = vadj; + vadj = _tmp14_; #line 1862 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = item; + _tmp16_ = vadj; #line 1862 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = _tmp23_->allocation; -#line 1862 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = _tmp24_.y; -#line 1862 "/home/jens/Source/shotwell/src/Page.vala" - _tmp26_ = get_adjustment_relation (_tmp22_, _tmp25_); -#line 1862 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp26_ == ADJUSTMENT_RELATION_IN_RANGE) { -#line 11909 "Page.c" - GtkAdjustment* _tmp27_; - CheckerboardItem* _tmp28_; - GdkRectangle _tmp29_; - gint _tmp30_; - CheckerboardItem* _tmp31_; - GdkRectangle _tmp32_; - gint _tmp33_; - AdjustmentRelation _tmp34_; -#line 1863 "/home/jens/Source/shotwell/src/Page.vala" - _tmp27_ = vadj; -#line 1863 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = item; -#line 1863 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = _tmp28_->allocation; + _tmp17_ = item->allocation; +#line 1862 "/home/jens/Source/shotwell/src/Page.vala" + _tmp18_ = _tmp17_.y; +#line 1862 "/home/jens/Source/shotwell/src/Page.vala" + if (get_adjustment_relation (_tmp16_, _tmp18_) == ADJUSTMENT_RELATION_IN_RANGE) { +#line 12490 "Page.c" + GtkAdjustment* _tmp19_; + GdkRectangle _tmp20_; + gint _tmp21_; + GdkRectangle _tmp22_; + gint _tmp23_; #line 1863 "/home/jens/Source/shotwell/src/Page.vala" - _tmp30_ = _tmp29_.y; + _tmp19_ = vadj; #line 1863 "/home/jens/Source/shotwell/src/Page.vala" - _tmp31_ = item; + _tmp20_ = item->allocation; #line 1863 "/home/jens/Source/shotwell/src/Page.vala" - _tmp32_ = _tmp31_->allocation; + _tmp21_ = _tmp20_.y; #line 1863 "/home/jens/Source/shotwell/src/Page.vala" - _tmp33_ = _tmp32_.height; + _tmp22_ = item->allocation; #line 1863 "/home/jens/Source/shotwell/src/Page.vala" - _tmp34_ = get_adjustment_relation (_tmp27_, _tmp30_ + _tmp33_); + _tmp23_ = _tmp22_.height; #line 1863 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = _tmp34_ == ADJUSTMENT_RELATION_IN_RANGE; -#line 11936 "Page.c" + _tmp15_ = get_adjustment_relation (_tmp19_, _tmp21_ + _tmp23_) == ADJUSTMENT_RELATION_IN_RANGE; +#line 12508 "Page.c" } else { #line 1862 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = FALSE; -#line 11940 "Page.c" + _tmp15_ = FALSE; +#line 12512 "Page.c" } #line 1862 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp21_) { + if (_tmp15_) { #line 1864 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (vadj); #line 1864 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 11948 "Page.c" +#line 12520 "Page.c" } #line 1867 "/home/jens/Source/shotwell/src/Page.vala" top = 0; #line 1868 "/home/jens/Source/shotwell/src/Page.vala" - _tmp35_ = item; -#line 1868 "/home/jens/Source/shotwell/src/Page.vala" - _tmp36_ = _tmp35_->allocation; -#line 1868 "/home/jens/Source/shotwell/src/Page.vala" - _tmp37_ = _tmp36_.y; + _tmp24_ = item->allocation; #line 1868 "/home/jens/Source/shotwell/src/Page.vala" - _tmp38_ = vadj; + _tmp25_ = _tmp24_.y; #line 1868 "/home/jens/Source/shotwell/src/Page.vala" - _tmp39_ = gtk_adjustment_get_value (_tmp38_); + _tmp26_ = vadj; #line 1868 "/home/jens/Source/shotwell/src/Page.vala" - if (((gdouble) _tmp37_) < _tmp39_) { -#line 11964 "Page.c" - CheckerboardItem* _tmp40_; - GdkRectangle _tmp41_; - gint _tmp42_; - gint _tmp43_; + if (((gdouble) _tmp25_) < gtk_adjustment_get_value (_tmp26_)) { +#line 12532 "Page.c" + GdkRectangle _tmp27_; + gint _tmp28_; + gint _tmp29_; #line 1869 "/home/jens/Source/shotwell/src/Page.vala" - _tmp40_ = item; + _tmp27_ = item->allocation; #line 1869 "/home/jens/Source/shotwell/src/Page.vala" - _tmp41_ = _tmp40_->allocation; + _tmp28_ = _tmp27_.y; #line 1869 "/home/jens/Source/shotwell/src/Page.vala" - _tmp42_ = _tmp41_.y; -#line 1869 "/home/jens/Source/shotwell/src/Page.vala" - top = _tmp42_; + top = _tmp28_; #line 1870 "/home/jens/Source/shotwell/src/Page.vala" - _tmp43_ = top; + _tmp29_ = top; #line 1870 "/home/jens/Source/shotwell/src/Page.vala" - top = _tmp43_ - (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2); -#line 11981 "Page.c" + top = _tmp29_ - (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2); +#line 12546 "Page.c" } else { - CheckerboardItem* _tmp44_; - GdkRectangle _tmp45_; - gint _tmp46_; - CheckerboardItem* _tmp47_; - GdkRectangle _tmp48_; - gint _tmp49_; - GtkAdjustment* _tmp50_; - gdouble _tmp51_; - gint _tmp52_; -#line 1872 "/home/jens/Source/shotwell/src/Page.vala" - _tmp44_ = item; -#line 1872 "/home/jens/Source/shotwell/src/Page.vala" - _tmp45_ = _tmp44_->allocation; -#line 1872 "/home/jens/Source/shotwell/src/Page.vala" - _tmp46_ = _tmp45_.y; + GdkRectangle _tmp30_; + gint _tmp31_; + GdkRectangle _tmp32_; + gint _tmp33_; + GtkAdjustment* _tmp34_; + gint _tmp35_; #line 1872 "/home/jens/Source/shotwell/src/Page.vala" - _tmp47_ = item; + _tmp30_ = item->allocation; #line 1872 "/home/jens/Source/shotwell/src/Page.vala" - _tmp48_ = _tmp47_->allocation; + _tmp31_ = _tmp30_.y; #line 1872 "/home/jens/Source/shotwell/src/Page.vala" - _tmp49_ = _tmp48_.height; + _tmp32_ = item->allocation; #line 1872 "/home/jens/Source/shotwell/src/Page.vala" - _tmp50_ = vadj; + _tmp33_ = _tmp32_.height; #line 1872 "/home/jens/Source/shotwell/src/Page.vala" - _tmp51_ = gtk_adjustment_get_page_size (_tmp50_); + _tmp34_ = vadj; #line 1872 "/home/jens/Source/shotwell/src/Page.vala" - top = (_tmp46_ + _tmp49_) - ((gint) _tmp51_); + top = (_tmp31_ + _tmp33_) - ((gint) gtk_adjustment_get_page_size (_tmp34_)); #line 1873 "/home/jens/Source/shotwell/src/Page.vala" - _tmp52_ = top; + _tmp35_ = top; #line 1873 "/home/jens/Source/shotwell/src/Page.vala" - top = _tmp52_ + (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2); -#line 12014 "Page.c" + top = _tmp35_ + (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2); +#line 12570 "Page.c" } #line 1876 "/home/jens/Source/shotwell/src/Page.vala" - _tmp53_ = vadj; + _tmp36_ = vadj; #line 1876 "/home/jens/Source/shotwell/src/Page.vala" - _tmp54_ = top; + _tmp37_ = top; #line 1876 "/home/jens/Source/shotwell/src/Page.vala" - gtk_adjustment_set_value (_tmp53_, (gdouble) _tmp54_); + gtk_adjustment_set_value (_tmp36_, (gdouble) _tmp37_); #line 1848 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (vadj); -#line 12024 "Page.c" +#line 12580 "Page.c" } -void checkerboard_page_move_cursor (CheckerboardPage* self, CompassPoint point) { +void +checkerboard_page_move_cursor (CheckerboardPage* self, + CompassPoint point) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; + gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; - CheckerboardItem* _tmp6_; - CheckerboardItem* _tmp21_; + CheckerboardItem* _tmp5_; + CheckerboardItem* _tmp19_; CheckerboardItem* item = NULL; - CheckerboardLayout* _tmp25_; + CheckerboardLayout* _tmp23_; + CheckerboardItem* _tmp24_; + CheckerboardItem* _tmp25_; CheckerboardItem* _tmp26_; - CompassPoint _tmp27_; - CheckerboardItem* _tmp28_; - CheckerboardItem* _tmp29_; #line 1879 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (self)); #line 1881 "/home/jens/Source/shotwell/src/Page.vala" @@ -12046,180 +12603,173 @@ void checkerboard_page_move_cursor (CheckerboardPage* self, CompassPoint point) #line 1881 "/home/jens/Source/shotwell/src/Page.vala" _tmp1_ = _tmp0_; #line 1881 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)); -#line 1881 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)) == 0; #line 1881 "/home/jens/Source/shotwell/src/Page.vala" _data_collection_unref0 (_tmp1_); #line 1881 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp3_) { + if (_tmp2_) { #line 1882 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 12059 "Page.c" +#line 12614 "Page.c" } #line 1887 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = self->cursor; + _tmp5_ = self->cursor; #line 1887 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp6_ == NULL) { -#line 12065 "Page.c" - CheckerboardLayout* _tmp7_; + if (_tmp5_ == NULL) { +#line 12620 "Page.c" + CheckerboardLayout* _tmp6_; + CheckerboardItem* _tmp7_; CheckerboardItem* _tmp8_; - CheckerboardItem* _tmp9_; #line 1887 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = self->priv->layout; + _tmp6_ = self->priv->layout; #line 1887 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = checkerboard_layout_get_cursor (_tmp7_); + _tmp7_ = checkerboard_layout_get_cursor (_tmp6_); #line 1887 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 1887 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = _tmp9_ == NULL; + _tmp4_ = _tmp8_ == NULL; #line 1887 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp9_); -#line 12079 "Page.c" + _g_object_unref0 (_tmp8_); +#line 12634 "Page.c" } else { #line 1887 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = FALSE; -#line 12083 "Page.c" + _tmp4_ = FALSE; +#line 12638 "Page.c" } #line 1887 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp5_) { + if (_tmp4_) { #line 1887 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = TRUE; -#line 12089 "Page.c" + _tmp3_ = TRUE; +#line 12644 "Page.c" } else { - gboolean _tmp10_ = FALSE; - CheckerboardItem* _tmp11_; + gboolean _tmp9_ = FALSE; + CheckerboardItem* _tmp10_; #line 1887 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = self->cursor; + _tmp10_ = self->cursor; #line 1887 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp11_ != NULL) { -#line 12097 "Page.c" + if (_tmp10_ != NULL) { +#line 12652 "Page.c" + ViewCollection* _tmp11_; ViewCollection* _tmp12_; - ViewCollection* _tmp13_; - CheckerboardItem* _tmp14_; - gboolean _tmp15_; -#line 1887 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + CheckerboardItem* _tmp13_; #line 1887 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = _tmp12_; + _tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1887 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = self->cursor; + _tmp12_ = _tmp11_; #line 1887 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); + _tmp13_ = self->cursor; #line 1887 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = !_tmp15_; + _tmp9_ = !data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject)); #line 1887 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp13_); -#line 12114 "Page.c" + _data_collection_unref0 (_tmp12_); +#line 12666 "Page.c" } else { #line 1887 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = FALSE; -#line 12118 "Page.c" + _tmp9_ = FALSE; +#line 12670 "Page.c" } #line 1887 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = _tmp10_; -#line 12122 "Page.c" + _tmp3_ = _tmp9_; +#line 12674 "Page.c" } #line 1887 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp4_) { -#line 12126 "Page.c" + if (_tmp3_) { +#line 12678 "Page.c" CheckerboardItem* item = NULL; - CheckerboardLayout* _tmp16_; + CheckerboardLayout* _tmp14_; + CheckerboardItem* _tmp15_; + CheckerboardItem* _tmp16_; CheckerboardItem* _tmp17_; CheckerboardItem* _tmp18_; - CheckerboardItem* _tmp19_; - CheckerboardItem* _tmp20_; #line 1888 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = self->priv->layout; + _tmp14_ = self->priv->layout; #line 1888 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = checkerboard_layout_get_item_at_coordinate (_tmp16_, 0, 0); + _tmp15_ = checkerboard_layout_get_item_at_coordinate (_tmp14_, 0, 0); #line 1888 "/home/jens/Source/shotwell/src/Page.vala" - item = _tmp17_; + item = _tmp15_; #line 1889 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = item; + _tmp16_ = item; #line 1889 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_page_cursor_to_item (self, _tmp18_); + checkerboard_page_cursor_to_item (self, _tmp16_); #line 1890 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = item; + _tmp17_ = item; #line 1890 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = _g_object_ref0 (_tmp19_); + _tmp18_ = _g_object_ref0 (_tmp17_); #line 1890 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->anchor); #line 1890 "/home/jens/Source/shotwell/src/Page.vala" - self->anchor = _tmp20_; + self->anchor = _tmp18_; #line 1892 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (item); #line 1892 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 12155 "Page.c" +#line 12707 "Page.c" } #line 1895 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = self->cursor; + _tmp19_ = self->cursor; #line 1895 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp21_ == NULL) { -#line 12161 "Page.c" - CheckerboardLayout* _tmp22_; - CheckerboardItem* _tmp23_; - CheckerboardItem* _tmp24_; + if (_tmp19_ == NULL) { +#line 12713 "Page.c" + CheckerboardLayout* _tmp20_; + CheckerboardItem* _tmp21_; + CheckerboardItem* _tmp22_; #line 1896 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = self->priv->layout; + _tmp20_ = self->priv->layout; #line 1896 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = checkerboard_layout_get_cursor (_tmp22_); + _tmp21_ = checkerboard_layout_get_cursor (_tmp20_); #line 1896 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, TYPE_CHECKERBOARD_ITEM) ? ((CheckerboardItem*) _tmp23_) : NULL; + _tmp22_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_CHECKERBOARD_ITEM) ? ((CheckerboardItem*) _tmp21_) : NULL; #line 1896 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp24_ == NULL) { + if (_tmp22_ == NULL) { #line 1896 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp23_); -#line 12175 "Page.c" + _g_object_unref0 (_tmp21_); +#line 12727 "Page.c" } #line 1896 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->cursor); #line 1896 "/home/jens/Source/shotwell/src/Page.vala" - self->cursor = _tmp24_; -#line 12181 "Page.c" + self->cursor = _tmp22_; +#line 12733 "Page.c" } #line 1900 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = self->priv->layout; + _tmp23_ = self->priv->layout; #line 1900 "/home/jens/Source/shotwell/src/Page.vala" - _tmp26_ = self->cursor; + _tmp24_ = self->cursor; #line 1900 "/home/jens/Source/shotwell/src/Page.vala" - _tmp27_ = point; + _tmp25_ = checkerboard_layout_get_item_relative_to (_tmp23_, _tmp24_, point); #line 1900 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = checkerboard_layout_get_item_relative_to (_tmp25_, _tmp26_, _tmp27_); -#line 1900 "/home/jens/Source/shotwell/src/Page.vala" - item = _tmp28_; + item = _tmp25_; #line 1901 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = item; + _tmp26_ = item; #line 1901 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp29_ != NULL) { -#line 12197 "Page.c" - CheckerboardItem* _tmp30_; + if (_tmp26_ != NULL) { +#line 12747 "Page.c" + CheckerboardItem* _tmp27_; #line 1902 "/home/jens/Source/shotwell/src/Page.vala" - _tmp30_ = item; + _tmp27_ = item; #line 1902 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_page_cursor_to_item (self, _tmp30_); -#line 12203 "Page.c" + checkerboard_page_cursor_to_item (self, _tmp27_); +#line 12753 "Page.c" } #line 1879 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (item); -#line 12207 "Page.c" +#line 12757 "Page.c" } -void checkerboard_page_set_cursor (CheckerboardPage* self, CheckerboardItem* item) { +void +checkerboard_page_set_cursor (CheckerboardPage* self, + CheckerboardItem* item) +{ Marker* marker = NULL; ViewCollection* _tmp0_; ViewCollection* _tmp1_; - CheckerboardItem* _tmp2_; + Marker* _tmp2_; Marker* _tmp3_; - Marker* _tmp4_; + ViewCollection* _tmp4_; ViewCollection* _tmp5_; - ViewCollection* _tmp6_; + CheckerboardItem* _tmp6_; CheckerboardItem* _tmp7_; - CheckerboardItem* _tmp8_; - CheckerboardItem* _tmp9_; - CheckerboardItem* _tmp10_; #line 1905 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (self)); #line 1905 "/home/jens/Source/shotwell/src/Page.vala" @@ -12229,46 +12779,44 @@ void checkerboard_page_set_cursor (CheckerboardPage* self, CheckerboardItem* ite #line 1906 "/home/jens/Source/shotwell/src/Page.vala" _tmp1_ = _tmp0_; #line 1906 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = item; -#line 1906 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject)); + _tmp2_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (item, TYPE_DATA_OBJECT, DataObject)); #line 1906 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 1906 "/home/jens/Source/shotwell/src/Page.vala" _data_collection_unref0 (_tmp1_); #line 1906 "/home/jens/Source/shotwell/src/Page.vala" - marker = _tmp4_; + marker = _tmp3_; #line 1907 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1907 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 1907 "/home/jens/Source/shotwell/src/Page.vala" - view_collection_select_marked (_tmp6_, marker); + view_collection_select_marked (_tmp5_, marker); #line 1907 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp6_); -#line 1909 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = item; + _data_collection_unref0 (_tmp5_); #line 1909 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = _g_object_ref0 (_tmp7_); + _tmp6_ = _g_object_ref0 (item); #line 1909 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->cursor); #line 1909 "/home/jens/Source/shotwell/src/Page.vala" - self->cursor = _tmp8_; -#line 1910 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = item; + self->cursor = _tmp6_; #line 1910 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = _g_object_ref0 (_tmp9_); + _tmp7_ = _g_object_ref0 (item); #line 1910 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->anchor); #line 1910 "/home/jens/Source/shotwell/src/Page.vala" - self->anchor = _tmp10_; + self->anchor = _tmp7_; #line 1905 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (marker); -#line 12268 "Page.c" +#line 12812 "Page.c" } -void checkerboard_page_select_between_items (CheckerboardPage* self, CheckerboardItem* item_start, CheckerboardItem* item_end) { +void +checkerboard_page_select_between_items (CheckerboardPage* self, + CheckerboardItem* item_start, + CheckerboardItem* item_end) +{ Marker* marker = NULL; ViewCollection* _tmp0_; ViewCollection* _tmp1_; @@ -12276,9 +12824,9 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar Marker* _tmp3_; gboolean passed_start = FALSE; gboolean passed_end = FALSE; - ViewCollection* _tmp28_; - ViewCollection* _tmp29_; - Marker* _tmp30_; + ViewCollection* _tmp25_; + ViewCollection* _tmp26_; + Marker* _tmp27_; #line 1913 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (self)); #line 1913 "/home/jens/Source/shotwell/src/Page.vala" @@ -12301,7 +12849,7 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar passed_start = FALSE; #line 1917 "/home/jens/Source/shotwell/src/Page.vala" passed_end = FALSE; -#line 12305 "Page.c" +#line 12853 "Page.c" { GeeIterator* _object_it = NULL; ViewCollection* _tmp4_; @@ -12330,149 +12878,142 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar _object_it = _tmp9_; #line 1919 "/home/jens/Source/shotwell/src/Page.vala" while (TRUE) { -#line 12334 "Page.c" +#line 12882 "Page.c" GeeIterator* _tmp10_; - gboolean _tmp11_; DataObject* object = NULL; - GeeIterator* _tmp12_; - gpointer _tmp13_; + GeeIterator* _tmp11_; + gpointer _tmp12_; CheckerboardItem* item = NULL; - DataObject* _tmp14_; + DataObject* _tmp13_; + CheckerboardItem* _tmp14_; CheckerboardItem* _tmp15_; CheckerboardItem* _tmp16_; - CheckerboardItem* _tmp17_; - CheckerboardItem* _tmp18_; - CheckerboardItem* _tmp19_; - gboolean _tmp20_ = FALSE; - gboolean _tmp21_; - gboolean _tmp25_ = FALSE; - gboolean _tmp26_; + gboolean _tmp17_ = FALSE; + gboolean _tmp18_; + gboolean _tmp22_ = FALSE; + gboolean _tmp23_; #line 1919 "/home/jens/Source/shotwell/src/Page.vala" _tmp10_ = _object_it; #line 1919 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = gee_iterator_next (_tmp10_); -#line 1919 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp11_) { + if (!gee_iterator_next (_tmp10_)) { #line 1919 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 12359 "Page.c" +#line 12902 "Page.c" } #line 1919 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = _object_it; + _tmp11_ = _object_it; #line 1919 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = gee_iterator_get (_tmp12_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 1919 "/home/jens/Source/shotwell/src/Page.vala" - object = (DataObject*) _tmp13_; + object = (DataObject*) _tmp12_; #line 1920 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = object; + _tmp13_ = object; #line 1920 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); + _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); #line 1920 "/home/jens/Source/shotwell/src/Page.vala" - item = _tmp15_; -#line 1922 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = item_start; + item = _tmp14_; #line 1922 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = item; + _tmp15_ = item; #line 1922 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp16_ == _tmp17_) { + if (item_start == _tmp15_) { #line 1923 "/home/jens/Source/shotwell/src/Page.vala" passed_start = TRUE; -#line 12381 "Page.c" +#line 12922 "Page.c" } #line 1925 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = item_end; -#line 1925 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = item; + _tmp16_ = item; #line 1925 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp18_ == _tmp19_) { + if (item_end == _tmp16_) { #line 1926 "/home/jens/Source/shotwell/src/Page.vala" passed_end = TRUE; -#line 12391 "Page.c" +#line 12930 "Page.c" } #line 1928 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = passed_start; + _tmp18_ = passed_start; #line 1928 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp21_) { + if (_tmp18_) { #line 1928 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = TRUE; -#line 12399 "Page.c" + _tmp17_ = TRUE; +#line 12938 "Page.c" } else { - gboolean _tmp22_; + gboolean _tmp19_; #line 1928 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = passed_end; + _tmp19_ = passed_end; #line 1928 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = _tmp22_; -#line 12406 "Page.c" + _tmp17_ = _tmp19_; +#line 12945 "Page.c" } #line 1928 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp20_) { -#line 12410 "Page.c" - Marker* _tmp23_; - DataObject* _tmp24_; + if (_tmp17_) { +#line 12949 "Page.c" + Marker* _tmp20_; + DataObject* _tmp21_; #line 1929 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = marker; + _tmp20_ = marker; #line 1929 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = object; + _tmp21_ = object; #line 1929 "/home/jens/Source/shotwell/src/Page.vala" - marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_VIEW, DataView), TYPE_DATA_OBJECT, DataObject)); -#line 12419 "Page.c" + marker_mark (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_VIEW, DataView), TYPE_DATA_OBJECT, DataObject)); +#line 12958 "Page.c" } #line 1931 "/home/jens/Source/shotwell/src/Page.vala" - _tmp26_ = passed_start; + _tmp23_ = passed_start; #line 1931 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp26_) { -#line 12425 "Page.c" - gboolean _tmp27_; + if (_tmp23_) { +#line 12964 "Page.c" + gboolean _tmp24_; #line 1931 "/home/jens/Source/shotwell/src/Page.vala" - _tmp27_ = passed_end; + _tmp24_ = passed_end; #line 1931 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = _tmp27_; -#line 12431 "Page.c" + _tmp22_ = _tmp24_; +#line 12970 "Page.c" } else { #line 1931 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = FALSE; -#line 12435 "Page.c" + _tmp22_ = FALSE; +#line 12974 "Page.c" } #line 1931 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp25_) { + if (_tmp22_) { #line 1932 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (item); #line 1932 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (object); #line 1932 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 12445 "Page.c" +#line 12984 "Page.c" } #line 1919 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (item); #line 1919 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (object); -#line 12451 "Page.c" +#line 12990 "Page.c" } #line 1919 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (_object_it); -#line 12455 "Page.c" +#line 12994 "Page.c" } #line 1935 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp25_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1935 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = _tmp28_; + _tmp26_ = _tmp25_; #line 1935 "/home/jens/Source/shotwell/src/Page.vala" - _tmp30_ = marker; + _tmp27_ = marker; #line 1935 "/home/jens/Source/shotwell/src/Page.vala" - view_collection_select_marked (_tmp29_, _tmp30_); + view_collection_select_marked (_tmp26_, _tmp27_); #line 1935 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp29_); + _data_collection_unref0 (_tmp26_); #line 1913 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (marker); -#line 12469 "Page.c" +#line 13008 "Page.c" } -void checkerboard_page_select_anchor_to_cursor (CheckerboardPage* self, guint state) { +void +checkerboard_page_select_anchor_to_cursor (CheckerboardPage* self, + guint state) +{ gboolean _tmp0_ = FALSE; CheckerboardItem* _tmp1_; - guint _tmp3_; #line 1938 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (self)); #line 1939 "/home/jens/Source/shotwell/src/Page.vala" @@ -12481,70 +13022,70 @@ void checkerboard_page_select_anchor_to_cursor (CheckerboardPage* self, guint st if (_tmp1_ == NULL) { #line 1939 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = TRUE; -#line 12485 "Page.c" +#line 13026 "Page.c" } else { CheckerboardItem* _tmp2_; #line 1939 "/home/jens/Source/shotwell/src/Page.vala" _tmp2_ = self->anchor; #line 1939 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = _tmp2_ == NULL; -#line 12492 "Page.c" +#line 13033 "Page.c" } #line 1939 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp0_) { #line 1940 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 12498 "Page.c" +#line 13039 "Page.c" } #line 1942 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = state; -#line 1942 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp3_ == ((guint) GDK_SHIFT_MASK)) { -#line 12504 "Page.c" + if (state == ((guint) GDK_SHIFT_MASK)) { +#line 13043 "Page.c" + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + CheckerboardItem* _tmp5_; CheckerboardItem* _tmp6_; - CheckerboardItem* _tmp7_; #line 1943 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1943 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 1943 "/home/jens/Source/shotwell/src/Page.vala" - view_collection_unselect_all (_tmp5_); + view_collection_unselect_all (_tmp4_); #line 1943 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 1944 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = self->anchor; + _tmp5_ = self->anchor; #line 1944 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = self->cursor; + _tmp6_ = self->cursor; #line 1944 "/home/jens/Source/shotwell/src/Page.vala" - checkerboard_page_select_between_items (self, _tmp6_, _tmp7_); -#line 12523 "Page.c" + checkerboard_page_select_between_items (self, _tmp5_, _tmp6_); +#line 13062 "Page.c" } else { + CheckerboardItem* _tmp7_; CheckerboardItem* _tmp8_; - CheckerboardItem* _tmp9_; #line 1946 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = self->cursor; + _tmp7_ = self->cursor; #line 1946 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = _g_object_ref0 (_tmp8_); + _tmp8_ = _g_object_ref0 (_tmp7_); #line 1946 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->anchor); #line 1946 "/home/jens/Source/shotwell/src/Page.vala" - self->anchor = _tmp9_; -#line 12535 "Page.c" + self->anchor = _tmp8_; +#line 13074 "Page.c" } } -static void checkerboard_page_real_set_display_titles (CheckerboardPage* self, gboolean display) { +static void +checkerboard_page_real_set_display_titles (CheckerboardPage* self, + gboolean display) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; ViewCollection* _tmp2_; ViewCollection* _tmp3_; - gboolean _tmp4_; - GValue _tmp5_ = {0}; + GValue _tmp4_ = {0}; + ViewCollection* _tmp5_; ViewCollection* _tmp6_; - ViewCollection* _tmp7_; #line 1951 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1951 "/home/jens/Source/shotwell/src/Page.vala" @@ -12558,47 +13099,50 @@ static void checkerboard_page_real_set_display_titles (CheckerboardPage* self, g #line 1952 "/home/jens/Source/shotwell/src/Page.vala" _tmp3_ = _tmp2_; #line 1952 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = display; + g_value_init (&_tmp4_, G_TYPE_BOOLEAN); #line 1952 "/home/jens/Source/shotwell/src/Page.vala" - g_value_init (&_tmp5_, G_TYPE_BOOLEAN); + g_value_set_boolean (&_tmp4_, display); #line 1952 "/home/jens/Source/shotwell/src/Page.vala" - g_value_set_boolean (&_tmp5_, _tmp4_); + data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_TITLES, &_tmp4_, NULL, NULL); #line 1952 "/home/jens/Source/shotwell/src/Page.vala" - data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_TITLES, &_tmp5_, NULL, NULL); -#line 1952 "/home/jens/Source/shotwell/src/Page.vala" - G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL; + G_IS_VALUE (&_tmp4_) ? (g_value_unset (&_tmp4_), NULL) : NULL; #line 1952 "/home/jens/Source/shotwell/src/Page.vala" _data_collection_unref0 (_tmp3_); #line 1953 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1953 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 1953 "/home/jens/Source/shotwell/src/Page.vala" - data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection)); #line 1953 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp7_); -#line 12581 "Page.c" + _data_collection_unref0 (_tmp6_); +#line 13120 "Page.c" } -void checkerboard_page_set_display_titles (CheckerboardPage* self, gboolean display) { +void +checkerboard_page_set_display_titles (CheckerboardPage* self, + gboolean display) +{ #line 1950 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (self)); #line 1950 "/home/jens/Source/shotwell/src/Page.vala" CHECKERBOARD_PAGE_GET_CLASS (self)->set_display_titles (self, display); -#line 12590 "Page.c" +#line 13132 "Page.c" } -static void checkerboard_page_real_set_display_comments (CheckerboardPage* self, gboolean display) { +static void +checkerboard_page_real_set_display_comments (CheckerboardPage* self, + gboolean display) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; ViewCollection* _tmp2_; ViewCollection* _tmp3_; - gboolean _tmp4_; - GValue _tmp5_ = {0}; + GValue _tmp4_ = {0}; + ViewCollection* _tmp5_; ViewCollection* _tmp6_; - ViewCollection* _tmp7_; #line 1957 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1957 "/home/jens/Source/shotwell/src/Page.vala" @@ -12612,80 +13156,62 @@ static void checkerboard_page_real_set_display_comments (CheckerboardPage* self, #line 1958 "/home/jens/Source/shotwell/src/Page.vala" _tmp3_ = _tmp2_; #line 1958 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = display; + g_value_init (&_tmp4_, G_TYPE_BOOLEAN); #line 1958 "/home/jens/Source/shotwell/src/Page.vala" - g_value_init (&_tmp5_, G_TYPE_BOOLEAN); + g_value_set_boolean (&_tmp4_, display); #line 1958 "/home/jens/Source/shotwell/src/Page.vala" - g_value_set_boolean (&_tmp5_, _tmp4_); + data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_COMMENTS, &_tmp4_, NULL, NULL); #line 1958 "/home/jens/Source/shotwell/src/Page.vala" - data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_COMMENTS, &_tmp5_, NULL, NULL); -#line 1958 "/home/jens/Source/shotwell/src/Page.vala" - G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL; + G_IS_VALUE (&_tmp4_) ? (g_value_unset (&_tmp4_), NULL) : NULL; #line 1958 "/home/jens/Source/shotwell/src/Page.vala" _data_collection_unref0 (_tmp3_); #line 1959 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1959 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 1959 "/home/jens/Source/shotwell/src/Page.vala" - data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection)); #line 1959 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp7_); -#line 12635 "Page.c" + _data_collection_unref0 (_tmp6_); +#line 13177 "Page.c" } -void checkerboard_page_set_display_comments (CheckerboardPage* self, gboolean display) { +void +checkerboard_page_set_display_comments (CheckerboardPage* self, + gboolean display) +{ #line 1956 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (self)); #line 1956 "/home/jens/Source/shotwell/src/Page.vala" CHECKERBOARD_PAGE_GET_CLASS (self)->set_display_comments (self, display); -#line 12644 "Page.c" +#line 13189 "Page.c" } -void checkerboard_page_keyboard_modifiers_init (CheckerboardPageKeyboardModifiers *self, Page* page) { - Page* _tmp0_; - gboolean _tmp1_; - Page* _tmp2_; - gboolean _tmp3_; - Page* _tmp4_; - gboolean _tmp5_; - Page* _tmp6_; - gboolean _tmp7_; +void +checkerboard_page_keyboard_modifiers_init (CheckerboardPageKeyboardModifiers *self, + Page* page) +{ #line 1236 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_PAGE (page)); #line 1236 "/home/jens/Source/shotwell/src/Page.vala" memset (self, 0, sizeof (CheckerboardPageKeyboardModifiers)); #line 1237 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = page; -#line 1237 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = page_get_ctrl_pressed (_tmp0_); -#line 1237 "/home/jens/Source/shotwell/src/Page.vala" - (*self).ctrl_pressed = _tmp1_; + (*self).ctrl_pressed = page_get_ctrl_pressed (page); #line 1238 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = page; -#line 1238 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = page_get_alt_pressed (_tmp2_); -#line 1238 "/home/jens/Source/shotwell/src/Page.vala" - (*self).alt_pressed = _tmp3_; -#line 1239 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = page; -#line 1239 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = page_get_shift_pressed (_tmp4_); + (*self).alt_pressed = page_get_alt_pressed (page); #line 1239 "/home/jens/Source/shotwell/src/Page.vala" - (*self).shift_pressed = _tmp5_; + (*self).shift_pressed = page_get_shift_pressed (page); #line 1240 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = page; -#line 1240 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = page_get_super_pressed (_tmp6_); -#line 1240 "/home/jens/Source/shotwell/src/Page.vala" - (*self).super_pressed = _tmp7_; -#line 12685 "Page.c" + (*self).super_pressed = page_get_super_pressed (page); +#line 13209 "Page.c" } -CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (const CheckerboardPageKeyboardModifiers* self) { +CheckerboardPageKeyboardModifiers* +checkerboard_page_keyboard_modifiers_dup (const CheckerboardPageKeyboardModifiers* self) +{ CheckerboardPageKeyboardModifiers* dup; #line 1235 "/home/jens/Source/shotwell/src/Page.vala" dup = g_new0 (CheckerboardPageKeyboardModifiers, 1); @@ -12693,18 +13219,22 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con memcpy (dup, self, sizeof (CheckerboardPageKeyboardModifiers)); #line 1235 "/home/jens/Source/shotwell/src/Page.vala" return dup; -#line 12697 "Page.c" +#line 13223 "Page.c" } -void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self) { +void +checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self) +{ #line 1235 "/home/jens/Source/shotwell/src/Page.vala" g_free (self); -#line 12704 "Page.c" +#line 13232 "Page.c" } -GType checkerboard_page_keyboard_modifiers_get_type (void) { +GType +checkerboard_page_keyboard_modifiers_get_type (void) +{ static volatile gsize checkerboard_page_keyboard_modifiers_type_id__volatile = 0; if (g_once_init_enter (&checkerboard_page_keyboard_modifiers_type_id__volatile)) { GType checkerboard_page_keyboard_modifiers_type_id; @@ -12715,7 +13245,9 @@ GType checkerboard_page_keyboard_modifiers_get_type (void) { } -static void checkerboard_page_class_init (CheckerboardPageClass * klass) { +static void +checkerboard_page_class_init (CheckerboardPageClass * klass) +{ #line 1215 "/home/jens/Source/shotwell/src/Page.vala" checkerboard_page_parent_class = g_type_class_peek_parent (klass); #line 1215 "/home/jens/Source/shotwell/src/Page.vala" @@ -12760,11 +13292,13 @@ static void checkerboard_page_class_init (CheckerboardPageClass * klass) { ((CheckerboardPageClass *) klass)->set_display_comments = (void (*) (CheckerboardPage *, gboolean)) checkerboard_page_real_set_display_comments; #line 1215 "/home/jens/Source/shotwell/src/Page.vala" G_OBJECT_CLASS (klass)->finalize = checkerboard_page_finalize; -#line 12764 "Page.c" +#line 13296 "Page.c" } -static void checkerboard_page_instance_init (CheckerboardPage * self) { +static void +checkerboard_page_instance_init (CheckerboardPage * self) +{ GtkViewport* _tmp0_; #line 1215 "/home/jens/Source/shotwell/src/Page.vala" self->priv = CHECKERBOARD_PAGE_GET_PRIVATE (self); @@ -12790,11 +13324,13 @@ static void checkerboard_page_instance_init (CheckerboardPage * self) { self->priv->activated_item = NULL; #line 1228 "/home/jens/Source/shotwell/src/Page.vala" self->priv->previously_selected = NULL; -#line 12794 "Page.c" +#line 13328 "Page.c" } -static void checkerboard_page_finalize (GObject * obj) { +static void +checkerboard_page_finalize (GObject * obj) +{ CheckerboardPage * self; #line 1215 "/home/jens/Source/shotwell/src/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CHECKERBOARD_PAGE, CheckerboardPage); @@ -12822,11 +13358,13 @@ static void checkerboard_page_finalize (GObject * obj) { _g_object_unref0 (self->priv->page_context_menu); #line 1215 "/home/jens/Source/shotwell/src/Page.vala" G_OBJECT_CLASS (checkerboard_page_parent_class)->finalize (obj); -#line 12826 "Page.c" +#line 13362 "Page.c" } -GType checkerboard_page_get_type (void) { +GType +checkerboard_page_get_type (void) +{ static volatile gsize checkerboard_page_type_id__volatile = 0; if (g_once_init_enter (&checkerboard_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CheckerboardPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) checkerboard_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CheckerboardPage), 0, (GInstanceInitFunc) checkerboard_page_instance_init, NULL }; @@ -12838,14 +13376,19 @@ GType checkerboard_page_get_type (void) { } -static void _single_photo_page_on_colors_changed_config_facade_colors_changed (ConfigFacade* _sender, gpointer self) { +static void +_single_photo_page_on_colors_changed_config_facade_colors_changed (ConfigFacade* _sender, + gpointer self) +{ #line 2026 "/home/jens/Source/shotwell/src/Page.vala" single_photo_page_on_colors_changed ((SinglePhotoPage*) self); -#line 12845 "Page.c" +#line 13386 "Page.c" } -GType single_photo_page_update_reason_get_type (void) { +GType +single_photo_page_update_reason_get_type (void) +{ static volatile gsize single_photo_page_update_reason_type_id__volatile = 0; if (g_once_init_enter (&single_photo_page_update_reason_type_id__volatile)) { static const GEnumValue values[] = {{SINGLE_PHOTO_PAGE_UPDATE_REASON_NEW_PIXBUF, "SINGLE_PHOTO_PAGE_UPDATE_REASON_NEW_PIXBUF", "new-pixbuf"}, {SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT, "SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT", "quality-improvement"}, {SINGLE_PHOTO_PAGE_UPDATE_REASON_RESIZED_CANVAS, "SINGLE_PHOTO_PAGE_UPDATE_REASON_RESIZED_CANVAS", "resized-canvas"}, {0, NULL, NULL}}; @@ -12857,62 +13400,68 @@ GType single_photo_page_update_reason_get_type (void) { } -static void _single_photo_page_on_viewport_resize_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) { +static void +_single_photo_page_on_viewport_resize_gtk_widget_size_allocate (GtkWidget* _sender, + GtkAllocation* allocation, + gpointer self) +{ #line 2018 "/home/jens/Source/shotwell/src/Page.vala" single_photo_page_on_viewport_resize ((SinglePhotoPage*) self); -#line 12864 "Page.c" +#line 13411 "Page.c" } -static gboolean _single_photo_page_on_canvas_exposed_gtk_widget_draw (GtkWidget* _sender, cairo_t* cr, gpointer self) { +static gboolean +_single_photo_page_on_canvas_exposed_gtk_widget_draw (GtkWidget* _sender, + cairo_t* cr, + gpointer self) +{ gboolean result; result = single_photo_page_on_canvas_exposed ((SinglePhotoPage*) self, cr); #line 2019 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 12873 "Page.c" +#line 13424 "Page.c" } -SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* page_name, gboolean scale_up_to_viewport) { +SinglePhotoPage* +single_photo_page_construct (GType object_type, + const gchar* page_name, + gboolean scale_up_to_viewport) +{ SinglePhotoPage * self = NULL; - const gchar* _tmp0_; - gboolean _tmp1_; - TransitionEffectsManager* _tmp2_; - TransitionEffectsManager* _tmp3_; - TransitionClock* _tmp4_; + TransitionEffectsManager* _tmp0_; + TransitionEffectsManager* _tmp1_; + TransitionClock* _tmp2_; + GtkViewport* _tmp3_; + GtkViewport* _tmp4_; GtkViewport* _tmp5_; - GtkViewport* _tmp6_; + GtkDrawingArea* _tmp6_; GtkViewport* _tmp7_; GtkDrawingArea* _tmp8_; GtkViewport* _tmp9_; GtkDrawingArea* _tmp10_; - GtkViewport* _tmp11_; - GtkDrawingArea* _tmp12_; - GtkDrawingArea* _tmp13_; - ConfigFacade* _tmp14_; - ConfigFacade* _tmp15_; + GtkDrawingArea* _tmp11_; + ConfigFacade* _tmp12_; + ConfigFacade* _tmp13_; #line 1995 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (page_name != NULL, NULL); #line 1996 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = page_name; -#line 1996 "/home/jens/Source/shotwell/src/Page.vala" - self = (SinglePhotoPage*) page_construct (object_type, _tmp0_); -#line 1998 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = scale_up_to_viewport; + self = (SinglePhotoPage*) page_construct (object_type, page_name); #line 1998 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->scale_up_to_viewport = _tmp1_; + self->priv->scale_up_to_viewport = scale_up_to_viewport; #line 2000 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = transition_effects_manager_get_instance (); + _tmp0_ = transition_effects_manager_get_instance (); #line 2000 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 2000 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = transition_effects_manager_create_null_transition_clock (_tmp3_); + _tmp2_ = transition_effects_manager_create_null_transition_clock (_tmp1_); #line 2000 "/home/jens/Source/shotwell/src/Page.vala" _transition_clock_unref0 (self->priv->transition_clock); #line 2000 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->transition_clock = _tmp4_; + self->priv->transition_clock = _tmp2_; #line 2000 "/home/jens/Source/shotwell/src/Page.vala" - _transition_effects_manager_unref0 (_tmp3_); + _transition_effects_manager_unref0 (_tmp1_); #line 2004 "/home/jens/Source/shotwell/src/Page.vala" gtk_scrolled_window_set_policy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); #line 2006 "/home/jens/Source/shotwell/src/Page.vala" @@ -12920,100 +13469,100 @@ SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* pa #line 2007 "/home/jens/Source/shotwell/src/Page.vala" gtk_scrolled_window_set_shadow_type (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), GTK_SHADOW_NONE); #line 2009 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = self->viewport; + _tmp3_ = self->viewport; #line 2009 "/home/jens/Source/shotwell/src/Page.vala" - gtk_viewport_set_shadow_type (_tmp5_, GTK_SHADOW_NONE); + gtk_viewport_set_shadow_type (_tmp3_, GTK_SHADOW_NONE); #line 2010 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = self->viewport; + _tmp4_ = self->viewport; #line 2010 "/home/jens/Source/shotwell/src/Page.vala" - gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), (guint) 0); + gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_container_get_type (), GtkContainer), (guint) 0); #line 2011 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = self->viewport; + _tmp5_ = self->viewport; #line 2011 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = self->canvas; + _tmp6_ = self->canvas; #line 2011 "/home/jens/Source/shotwell/src/Page.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); #line 2013 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = self->viewport; + _tmp7_ = self->viewport; #line 2013 "/home/jens/Source/shotwell/src/Page.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget)); #line 2015 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = self->canvas; + _tmp8_ = self->canvas; #line 2015 "/home/jens/Source/shotwell/src/Page.vala" - gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), (gint) ((GDK_EXPOSURE_MASK | GDK_STRUCTURE_MASK) | GDK_SUBSTRUCTURE_MASK)); + gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), (gint) ((GDK_EXPOSURE_MASK | GDK_STRUCTURE_MASK) | GDK_SUBSTRUCTURE_MASK)); #line 2018 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = self->viewport; + _tmp9_ = self->viewport; #line 2018 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), "size-allocate", (GCallback) _single_photo_page_on_viewport_resize_gtk_widget_size_allocate, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), "size-allocate", (GCallback) _single_photo_page_on_viewport_resize_gtk_widget_size_allocate, self, 0); #line 2019 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = self->canvas; + _tmp10_ = self->canvas; #line 2019 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), "draw", (GCallback) _single_photo_page_on_canvas_exposed_gtk_widget_draw, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), "draw", (GCallback) _single_photo_page_on_canvas_exposed_gtk_widget_draw, self, 0); #line 2021 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = self->canvas; + _tmp11_ = self->canvas; #line 2021 "/home/jens/Source/shotwell/src/Page.vala" - page_set_event_source (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget)); + page_set_event_source (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget)); #line 2022 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = config_facade_get_instance (); + _tmp12_ = config_facade_get_instance (); #line 2022 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = _tmp14_; + _tmp13_ = _tmp12_; #line 2022 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect_object (_tmp15_, "colors-changed", (GCallback) _single_photo_page_on_colors_changed_config_facade_colors_changed, self, 0); + g_signal_connect_object (_tmp13_, "colors-changed", (GCallback) _single_photo_page_on_colors_changed_config_facade_colors_changed, self, 0); #line 2022 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp13_); #line 1995 "/home/jens/Source/shotwell/src/Page.vala" return self; -#line 12967 "Page.c" +#line 13516 "Page.c" } -gboolean single_photo_page_is_transition_in_progress (SinglePhotoPage* self) { +gboolean +single_photo_page_is_transition_in_progress (SinglePhotoPage* self) +{ gboolean result = FALSE; TransitionClock* _tmp0_; - gboolean _tmp1_; #line 2029 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE); #line 2030 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = self->priv->transition_clock; #line 2030 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = transition_clock_is_in_progress (_tmp0_); -#line 2030 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp1_; + result = transition_clock_is_in_progress (_tmp0_); #line 2030 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 12985 "Page.c" +#line 13533 "Page.c" } -void single_photo_page_cancel_transition (SinglePhotoPage* self) { +void +single_photo_page_cancel_transition (SinglePhotoPage* self) +{ TransitionClock* _tmp0_; - gboolean _tmp1_; #line 2033 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2034 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = self->priv->transition_clock; #line 2034 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = transition_clock_is_in_progress (_tmp0_); -#line 2034 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp1_) { -#line 13000 "Page.c" - TransitionClock* _tmp2_; + if (transition_clock_is_in_progress (_tmp0_)) { +#line 13547 "Page.c" + TransitionClock* _tmp1_; #line 2035 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = self->priv->transition_clock; + _tmp1_ = self->priv->transition_clock; #line 2035 "/home/jens/Source/shotwell/src/Page.vala" - transition_clock_cancel (_tmp2_); -#line 13006 "Page.c" + transition_clock_cancel (_tmp1_); +#line 13553 "Page.c" } } -void single_photo_page_set_transition (SinglePhotoPage* self, const gchar* effect_id, gint duration_msec) { +void +single_photo_page_set_transition (SinglePhotoPage* self, + const gchar* effect_id, + gint duration_msec) +{ TransitionEffectsManager* _tmp0_; TransitionEffectsManager* _tmp1_; - const gchar* _tmp2_; + TransitionClock* _tmp2_; TransitionClock* _tmp3_; - TransitionClock* _tmp4_; - gint _tmp8_; #line 2038 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2038 "/home/jens/Source/shotwell/src/Page.vala" @@ -13025,393 +13574,389 @@ void single_photo_page_set_transition (SinglePhotoPage* self, const gchar* effec #line 2041 "/home/jens/Source/shotwell/src/Page.vala" _tmp1_ = _tmp0_; #line 2041 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = effect_id; -#line 2041 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = transition_effects_manager_create_transition_clock (_tmp1_, _tmp2_); + _tmp2_ = transition_effects_manager_create_transition_clock (_tmp1_, effect_id); #line 2041 "/home/jens/Source/shotwell/src/Page.vala" _transition_clock_unref0 (self->priv->transition_clock); #line 2041 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->transition_clock = _tmp3_; + self->priv->transition_clock = _tmp2_; #line 2041 "/home/jens/Source/shotwell/src/Page.vala" _transition_effects_manager_unref0 (_tmp1_); #line 2042 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = self->priv->transition_clock; + _tmp3_ = self->priv->transition_clock; #line 2042 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp4_ == NULL) { -#line 13042 "Page.c" + if (_tmp3_ == NULL) { +#line 13589 "Page.c" + TransitionEffectsManager* _tmp4_; TransitionEffectsManager* _tmp5_; - TransitionEffectsManager* _tmp6_; - TransitionClock* _tmp7_; + TransitionClock* _tmp6_; #line 2043 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = transition_effects_manager_get_instance (); + _tmp4_ = transition_effects_manager_get_instance (); #line 2043 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 2043 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = transition_effects_manager_create_null_transition_clock (_tmp6_); + _tmp6_ = transition_effects_manager_create_null_transition_clock (_tmp5_); #line 2043 "/home/jens/Source/shotwell/src/Page.vala" _transition_clock_unref0 (self->priv->transition_clock); #line 2043 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->transition_clock = _tmp7_; + self->priv->transition_clock = _tmp6_; #line 2043 "/home/jens/Source/shotwell/src/Page.vala" - _transition_effects_manager_unref0 (_tmp6_); -#line 13058 "Page.c" + _transition_effects_manager_unref0 (_tmp5_); +#line 13605 "Page.c" } #line 2045 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = duration_msec; -#line 2045 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->transition_duration_msec = _tmp8_; -#line 13064 "Page.c" + self->priv->transition_duration_msec = duration_msec; +#line 13609 "Page.c" } -static void single_photo_page_render_zoomed_to_pixmap (SinglePhotoPage* self, ZoomState* zoom_state) { - gboolean _tmp0_; +static void +single_photo_page_render_zoomed_to_pixmap (SinglePhotoPage* self, + ZoomState* zoom_state) +{ GdkRectangle view_rect = {0}; - GdkRectangle _tmp1_ = {0}; + GdkRectangle _tmp0_ = {0}; GdkPixbuf* zoomed = NULL; + ZoomBuffer* _tmp1_; ZoomBuffer* _tmp2_; - ZoomBuffer* _tmp3_; - gboolean _tmp4_; - GdkPixbuf* _tmp34_; + gboolean _tmp3_; + GdkPixbuf* _tmp33_; gint draw_x = 0; - Dimensions _tmp35_; - gint _tmp36_; - GdkRectangle _tmp37_; + Dimensions _tmp34_; + gint _tmp35_; + GdkRectangle _tmp36_; + gint _tmp37_; gint _tmp38_; - gint _tmp39_; - gint _tmp40_; gint draw_y = 0; - Dimensions _tmp41_; + Dimensions _tmp39_; + gint _tmp40_; + GdkRectangle _tmp41_; gint _tmp42_; - GdkRectangle _tmp43_; - gint _tmp44_; - gint _tmp45_; + gint _tmp43_; + cairo_t* _tmp44_; + GdkPixbuf* _tmp45_; gint _tmp46_; - cairo_t* _tmp47_; - GdkPixbuf* _tmp48_; - gint _tmp49_; - gint _tmp50_; + gint _tmp47_; #line 2049 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2049 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (zoom_state != NULL); #line 2050 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = single_photo_page_is_zoom_supported (self); -#line 2050 "/home/jens/Source/shotwell/src/Page.vala" - _vala_assert (_tmp0_, "is_zoom_supported()"); + _vala_assert (single_photo_page_is_zoom_supported (self), "is_zoom_supported()"); #line 2052 "/home/jens/Source/shotwell/src/Page.vala" - zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp1_); + zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp0_); #line 2052 "/home/jens/Source/shotwell/src/Page.vala" - view_rect = _tmp1_; + view_rect = _tmp0_; #line 2055 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = single_photo_page_get_zoom_buffer (self); + _tmp1_ = single_photo_page_get_zoom_buffer (self); #line 2055 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 2055 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = _tmp3_ != NULL; + _tmp3_ = _tmp2_ != NULL; #line 2055 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 2055 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp4_) { -#line 13117 "Page.c" - GdkPixbuf* _tmp5_ = NULL; - gboolean _tmp6_; - GdkPixbuf* _tmp15_; + if (_tmp3_) { +#line 13660 "Page.c" + GdkPixbuf* _tmp4_ = NULL; + gboolean _tmp5_; + GdkPixbuf* _tmp14_; #line 2056 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = self->priv->zoom_high_quality; + _tmp5_ = self->priv->zoom_high_quality; #line 2056 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp6_) { -#line 13125 "Page.c" + if (_tmp5_) { +#line 13668 "Page.c" + ZoomBuffer* _tmp6_; ZoomBuffer* _tmp7_; - ZoomBuffer* _tmp8_; - ZoomState _tmp9_; - GdkPixbuf* _tmp10_; + ZoomState _tmp8_; + GdkPixbuf* _tmp9_; #line 2056 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = single_photo_page_get_zoom_buffer (self); + _tmp6_ = single_photo_page_get_zoom_buffer (self); #line 2056 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 2056 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = *zoom_state; + _tmp8_ = *zoom_state; #line 2056 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = zoom_buffer_get_zoomed_image (_tmp8_, &_tmp9_); + _tmp9_ = zoom_buffer_get_zoomed_image (_tmp7_, &_tmp8_); #line 2056 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 2056 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = _tmp10_; + _tmp4_ = _tmp9_; #line 2056 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp8_); -#line 13144 "Page.c" + _g_object_unref0 (_tmp7_); +#line 13687 "Page.c" } else { + ZoomBuffer* _tmp10_; ZoomBuffer* _tmp11_; - ZoomBuffer* _tmp12_; - ZoomState _tmp13_; - GdkPixbuf* _tmp14_; + ZoomState _tmp12_; + GdkPixbuf* _tmp13_; #line 2057 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = single_photo_page_get_zoom_buffer (self); + _tmp10_ = single_photo_page_get_zoom_buffer (self); #line 2057 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 2057 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = *zoom_state; + _tmp12_ = *zoom_state; #line 2057 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = zoom_buffer_get_zoom_preview_image (_tmp12_, &_tmp13_); + _tmp13_ = zoom_buffer_get_zoom_preview_image (_tmp11_, &_tmp12_); #line 2057 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 2057 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = _tmp14_; + _tmp4_ = _tmp13_; #line 2057 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp12_); -#line 13164 "Page.c" + _g_object_unref0 (_tmp11_); +#line 13707 "Page.c" } #line 2056 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = _g_object_ref0 (_tmp5_); + _tmp14_ = _g_object_ref0 (_tmp4_); #line 2056 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (zoomed); #line 2056 "/home/jens/Source/shotwell/src/Page.vala" - zoomed = _tmp15_; + zoomed = _tmp14_; #line 2055 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp5_); -#line 13174 "Page.c" + _g_object_unref0 (_tmp4_); +#line 13717 "Page.c" } else { GdkRectangle view_rect_proj = {0}; - GdkPixbuf* _tmp16_; - GdkRectangle _tmp17_ = {0}; + GdkPixbuf* _tmp15_; + GdkRectangle _tmp16_ = {0}; GdkPixbuf* proj_subpixbuf = NULL; - GdkPixbuf* _tmp18_; - GdkRectangle _tmp19_; - gint _tmp20_; - GdkRectangle _tmp21_; - gint _tmp22_; - GdkRectangle _tmp23_; - gint _tmp24_; - GdkRectangle _tmp25_; - gint _tmp26_; + GdkPixbuf* _tmp17_; + GdkRectangle _tmp18_; + gint _tmp19_; + GdkRectangle _tmp20_; + gint _tmp21_; + GdkRectangle _tmp22_; + gint _tmp23_; + GdkRectangle _tmp24_; + gint _tmp25_; + GdkPixbuf* _tmp26_; GdkPixbuf* _tmp27_; - GdkPixbuf* _tmp28_; - GdkRectangle _tmp29_; - gint _tmp30_; - GdkRectangle _tmp31_; - gint _tmp32_; - GdkPixbuf* _tmp33_; + GdkRectangle _tmp28_; + gint _tmp29_; + GdkRectangle _tmp30_; + gint _tmp31_; + GdkPixbuf* _tmp32_; #line 2059 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = self->priv->unscaled; + _tmp15_ = self->priv->unscaled; #line 2059 "/home/jens/Source/shotwell/src/Page.vala" - zoom_state_get_viewing_rectangle_projection (zoom_state, _tmp16_, &_tmp17_); + zoom_state_get_viewing_rectangle_projection (zoom_state, _tmp15_, &_tmp16_); #line 2059 "/home/jens/Source/shotwell/src/Page.vala" - view_rect_proj = _tmp17_; + view_rect_proj = _tmp16_; #line 2061 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = self->priv->unscaled; + _tmp17_ = self->priv->unscaled; #line 2061 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = view_rect_proj; + _tmp18_ = view_rect_proj; #line 2061 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = _tmp19_.x; + _tmp19_ = _tmp18_.x; #line 2061 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = view_rect_proj; + _tmp20_ = view_rect_proj; #line 2061 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = _tmp21_.y; + _tmp21_ = _tmp20_.y; #line 2061 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = view_rect_proj; + _tmp22_ = view_rect_proj; #line 2061 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = _tmp23_.width; + _tmp23_ = _tmp22_.width; #line 2061 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = view_rect_proj; + _tmp24_ = view_rect_proj; #line 2061 "/home/jens/Source/shotwell/src/Page.vala" - _tmp26_ = _tmp25_.height; + _tmp25_ = _tmp24_.height; #line 2061 "/home/jens/Source/shotwell/src/Page.vala" - _tmp27_ = gdk_pixbuf_new_subpixbuf (_tmp18_, _tmp20_, _tmp22_, _tmp24_, _tmp26_); + _tmp26_ = gdk_pixbuf_new_subpixbuf (_tmp17_, _tmp19_, _tmp21_, _tmp23_, _tmp25_); #line 2061 "/home/jens/Source/shotwell/src/Page.vala" - proj_subpixbuf = _tmp27_; + proj_subpixbuf = _tmp26_; #line 2064 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = proj_subpixbuf; + _tmp27_ = proj_subpixbuf; #line 2064 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = view_rect; + _tmp28_ = view_rect; #line 2064 "/home/jens/Source/shotwell/src/Page.vala" - _tmp30_ = _tmp29_.width; + _tmp29_ = _tmp28_.width; #line 2064 "/home/jens/Source/shotwell/src/Page.vala" - _tmp31_ = view_rect; + _tmp30_ = view_rect; #line 2064 "/home/jens/Source/shotwell/src/Page.vala" - _tmp32_ = _tmp31_.height; + _tmp31_ = _tmp30_.height; #line 2064 "/home/jens/Source/shotwell/src/Page.vala" - _tmp33_ = gdk_pixbuf_scale_simple (_tmp28_, _tmp30_, _tmp32_, GDK_INTERP_BILINEAR); + _tmp32_ = gdk_pixbuf_scale_simple (_tmp27_, _tmp29_, _tmp31_, GDK_INTERP_BILINEAR); #line 2064 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (zoomed); #line 2064 "/home/jens/Source/shotwell/src/Page.vala" - zoomed = _tmp33_; + zoomed = _tmp32_; #line 2055 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (proj_subpixbuf); -#line 13242 "Page.c" +#line 13785 "Page.c" } #line 2068 "/home/jens/Source/shotwell/src/Page.vala" - _tmp34_ = zoomed; + _tmp33_ = zoomed; #line 2068 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp34_ == NULL) { + if (_tmp33_ == NULL) { #line 2069 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (zoomed); #line 2069 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 13252 "Page.c" +#line 13795 "Page.c" } #line 2072 "/home/jens/Source/shotwell/src/Page.vala" - _tmp35_ = self->priv->pixmap_dim; + _tmp34_ = self->priv->pixmap_dim; #line 2072 "/home/jens/Source/shotwell/src/Page.vala" - _tmp36_ = _tmp35_.width; + _tmp35_ = _tmp34_.width; #line 2072 "/home/jens/Source/shotwell/src/Page.vala" - _tmp37_ = view_rect; + _tmp36_ = view_rect; #line 2072 "/home/jens/Source/shotwell/src/Page.vala" - _tmp38_ = _tmp37_.width; + _tmp37_ = _tmp36_.width; #line 2072 "/home/jens/Source/shotwell/src/Page.vala" - draw_x = (_tmp36_ - _tmp38_) / 2; + draw_x = (_tmp35_ - _tmp37_) / 2; #line 2073 "/home/jens/Source/shotwell/src/Page.vala" - _tmp39_ = draw_x; + _tmp38_ = draw_x; #line 2073 "/home/jens/Source/shotwell/src/Page.vala" - _tmp40_ = CLAMP (_tmp39_, 0, G_MAXINT); -#line 2073 "/home/jens/Source/shotwell/src/Page.vala" - draw_x = _tmp40_; + draw_x = CLAMP (_tmp38_, 0, G_MAXINT); #line 2075 "/home/jens/Source/shotwell/src/Page.vala" - _tmp41_ = self->priv->pixmap_dim; + _tmp39_ = self->priv->pixmap_dim; #line 2075 "/home/jens/Source/shotwell/src/Page.vala" - _tmp42_ = _tmp41_.height; + _tmp40_ = _tmp39_.height; #line 2075 "/home/jens/Source/shotwell/src/Page.vala" - _tmp43_ = view_rect; + _tmp41_ = view_rect; #line 2075 "/home/jens/Source/shotwell/src/Page.vala" - _tmp44_ = _tmp43_.height; + _tmp42_ = _tmp41_.height; #line 2075 "/home/jens/Source/shotwell/src/Page.vala" - draw_y = (_tmp42_ - _tmp44_) / 2; -#line 2076 "/home/jens/Source/shotwell/src/Page.vala" - _tmp45_ = draw_y; + draw_y = (_tmp40_ - _tmp42_) / 2; #line 2076 "/home/jens/Source/shotwell/src/Page.vala" - _tmp46_ = CLAMP (_tmp45_, 0, G_MAXINT); + _tmp43_ = draw_y; #line 2076 "/home/jens/Source/shotwell/src/Page.vala" - draw_y = _tmp46_; + draw_y = CLAMP (_tmp43_, 0, G_MAXINT); #line 2077 "/home/jens/Source/shotwell/src/Page.vala" - _tmp47_ = self->priv->pixmap_ctx; + _tmp44_ = self->priv->pixmap_ctx; #line 2077 "/home/jens/Source/shotwell/src/Page.vala" - _tmp48_ = zoomed; + _tmp45_ = zoomed; #line 2077 "/home/jens/Source/shotwell/src/Page.vala" - _tmp49_ = draw_x; + _tmp46_ = draw_x; #line 2077 "/home/jens/Source/shotwell/src/Page.vala" - _tmp50_ = draw_y; + _tmp47_ = draw_y; #line 2077 "/home/jens/Source/shotwell/src/Page.vala" - paint_pixmap_with_background (_tmp47_, _tmp48_, _tmp49_, _tmp50_); + paint_pixmap_with_background (_tmp44_, _tmp45_, _tmp46_, _tmp47_); #line 2049 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (zoomed); -#line 13298 "Page.c" +#line 13837 "Page.c" } -void single_photo_page_on_interactive_zoom (SinglePhotoPage* self, ZoomState* interactive_zoom_state) { - gboolean _tmp0_; +void +single_photo_page_on_interactive_zoom (SinglePhotoPage* self, + ZoomState* interactive_zoom_state) +{ + cairo_t* _tmp0_; cairo_t* _tmp1_; - cairo_t* _tmp2_; gboolean old_quality_setting = FALSE; - gboolean _tmp3_; - ZoomState _tmp4_; - GtkDrawingArea* _tmp5_; + gboolean _tmp2_; + ZoomState _tmp3_; + GtkDrawingArea* _tmp4_; #line 2080 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2080 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (interactive_zoom_state != NULL); #line 2081 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = single_photo_page_is_zoom_supported (self); -#line 2081 "/home/jens/Source/shotwell/src/Page.vala" - _vala_assert (_tmp0_, "is_zoom_supported()"); + _vala_assert (single_photo_page_is_zoom_supported (self), "is_zoom_supported()"); #line 2083 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = self->priv->pixmap_ctx; + _tmp0_ = self->priv->pixmap_ctx; #line 2083 "/home/jens/Source/shotwell/src/Page.vala" - set_source_color_from_string (_tmp1_, "#000"); + set_source_color_from_string (_tmp0_, "#000"); #line 2084 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = self->priv->pixmap_ctx; + _tmp1_ = self->priv->pixmap_ctx; #line 2084 "/home/jens/Source/shotwell/src/Page.vala" - cairo_paint (_tmp2_); + cairo_paint (_tmp1_); #line 2086 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = self->priv->zoom_high_quality; + _tmp2_ = self->priv->zoom_high_quality; #line 2086 "/home/jens/Source/shotwell/src/Page.vala" - old_quality_setting = _tmp3_; + old_quality_setting = _tmp2_; #line 2087 "/home/jens/Source/shotwell/src/Page.vala" self->priv->zoom_high_quality = FALSE; #line 2088 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = *interactive_zoom_state; + _tmp3_ = *interactive_zoom_state; #line 2088 "/home/jens/Source/shotwell/src/Page.vala" - single_photo_page_render_zoomed_to_pixmap (self, &_tmp4_); + single_photo_page_render_zoomed_to_pixmap (self, &_tmp3_); #line 2089 "/home/jens/Source/shotwell/src/Page.vala" self->priv->zoom_high_quality = old_quality_setting; #line 2091 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = self->canvas; + _tmp4_ = self->canvas; #line 2091 "/home/jens/Source/shotwell/src/Page.vala" - gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget)); -#line 13342 "Page.c" + gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); +#line 13881 "Page.c" } -void single_photo_page_on_interactive_pan (SinglePhotoPage* self, ZoomState* interactive_zoom_state) { - gboolean _tmp0_; +void +single_photo_page_on_interactive_pan (SinglePhotoPage* self, + ZoomState* interactive_zoom_state) +{ + cairo_t* _tmp0_; cairo_t* _tmp1_; - cairo_t* _tmp2_; gboolean old_quality_setting = FALSE; - gboolean _tmp3_; - ZoomState _tmp4_; - GtkDrawingArea* _tmp5_; + gboolean _tmp2_; + ZoomState _tmp3_; + GtkDrawingArea* _tmp4_; #line 2094 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2094 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (interactive_zoom_state != NULL); #line 2095 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = single_photo_page_is_zoom_supported (self); -#line 2095 "/home/jens/Source/shotwell/src/Page.vala" - _vala_assert (_tmp0_, "is_zoom_supported()"); + _vala_assert (single_photo_page_is_zoom_supported (self), "is_zoom_supported()"); #line 2097 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = self->priv->pixmap_ctx; + _tmp0_ = self->priv->pixmap_ctx; #line 2097 "/home/jens/Source/shotwell/src/Page.vala" - set_source_color_from_string (_tmp1_, "#000"); + set_source_color_from_string (_tmp0_, "#000"); #line 2098 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = self->priv->pixmap_ctx; + _tmp1_ = self->priv->pixmap_ctx; #line 2098 "/home/jens/Source/shotwell/src/Page.vala" - cairo_paint (_tmp2_); + cairo_paint (_tmp1_); #line 2100 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = self->priv->zoom_high_quality; + _tmp2_ = self->priv->zoom_high_quality; #line 2100 "/home/jens/Source/shotwell/src/Page.vala" - old_quality_setting = _tmp3_; + old_quality_setting = _tmp2_; #line 2101 "/home/jens/Source/shotwell/src/Page.vala" self->priv->zoom_high_quality = TRUE; #line 2102 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = *interactive_zoom_state; + _tmp3_ = *interactive_zoom_state; #line 2102 "/home/jens/Source/shotwell/src/Page.vala" - single_photo_page_render_zoomed_to_pixmap (self, &_tmp4_); + single_photo_page_render_zoomed_to_pixmap (self, &_tmp3_); #line 2103 "/home/jens/Source/shotwell/src/Page.vala" self->priv->zoom_high_quality = old_quality_setting; #line 2105 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = self->canvas; + _tmp4_ = self->canvas; #line 2105 "/home/jens/Source/shotwell/src/Page.vala" - gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget)); -#line 13386 "Page.c" + gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); +#line 13925 "Page.c" } -static gboolean single_photo_page_real_is_zoom_supported (SinglePhotoPage* self) { +static gboolean +single_photo_page_real_is_zoom_supported (SinglePhotoPage* self) +{ gboolean result = FALSE; #line 2109 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 2109 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 13396 "Page.c" +#line 13937 "Page.c" } -gboolean single_photo_page_is_zoom_supported (SinglePhotoPage* self) { +gboolean +single_photo_page_is_zoom_supported (SinglePhotoPage* self) +{ #line 2108 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE); #line 2108 "/home/jens/Source/shotwell/src/Page.vala" return SINGLE_PHOTO_PAGE_GET_CLASS (self)->is_zoom_supported (self); -#line 13405 "Page.c" +#line 13948 "Page.c" } -static void single_photo_page_real_cancel_zoom (SinglePhotoPage* self) { +static void +single_photo_page_real_cancel_zoom (SinglePhotoPage* self) +{ cairo_surface_t* _tmp0_; #line 2113 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = self->priv->pixmap; #line 2113 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp0_ != NULL) { -#line 13415 "Page.c" +#line 13960 "Page.c" cairo_t* _tmp1_; cairo_t* _tmp2_; #line 2114 "/home/jens/Source/shotwell/src/Page.vala" @@ -13422,21 +13967,25 @@ static void single_photo_page_real_cancel_zoom (SinglePhotoPage* self) { _tmp2_ = self->priv->pixmap_ctx; #line 2115 "/home/jens/Source/shotwell/src/Page.vala" cairo_paint (_tmp2_); -#line 13426 "Page.c" +#line 13971 "Page.c" } } -void single_photo_page_cancel_zoom (SinglePhotoPage* self) { +void +single_photo_page_cancel_zoom (SinglePhotoPage* self) +{ #line 2112 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2112 "/home/jens/Source/shotwell/src/Page.vala" SINGLE_PHOTO_PAGE_GET_CLASS (self)->cancel_zoom (self); -#line 13436 "Page.c" +#line 13983 "Page.c" } -static void single_photo_page_real_save_zoom_state (SinglePhotoPage* self) { +static void +single_photo_page_real_save_zoom_state (SinglePhotoPage* self) +{ ZoomState _tmp0_; #line 2120 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = self->priv->static_zoom_state; @@ -13444,20 +13993,24 @@ static void single_photo_page_real_save_zoom_state (SinglePhotoPage* self) { self->priv->saved_zoom_state = _tmp0_; #line 2121 "/home/jens/Source/shotwell/src/Page.vala" self->priv->has_saved_zoom_state = TRUE; -#line 13448 "Page.c" +#line 13997 "Page.c" } -void single_photo_page_save_zoom_state (SinglePhotoPage* self) { +void +single_photo_page_save_zoom_state (SinglePhotoPage* self) +{ #line 2119 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2119 "/home/jens/Source/shotwell/src/Page.vala" SINGLE_PHOTO_PAGE_GET_CLASS (self)->save_zoom_state (self); -#line 13457 "Page.c" +#line 14008 "Page.c" } -static void single_photo_page_real_restore_zoom_state (SinglePhotoPage* self) { +static void +single_photo_page_real_restore_zoom_state (SinglePhotoPage* self) +{ gboolean _tmp0_; ZoomState _tmp1_; #line 2125 "/home/jens/Source/shotwell/src/Page.vala" @@ -13466,7 +14019,7 @@ static void single_photo_page_real_restore_zoom_state (SinglePhotoPage* self) { if (!_tmp0_) { #line 2126 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 13470 "Page.c" +#line 14023 "Page.c" } #line 2128 "/home/jens/Source/shotwell/src/Page.vala" _tmp1_ = self->priv->saved_zoom_state; @@ -13476,39 +14029,48 @@ static void single_photo_page_real_restore_zoom_state (SinglePhotoPage* self) { single_photo_page_repaint (self, NULL); #line 2130 "/home/jens/Source/shotwell/src/Page.vala" self->priv->has_saved_zoom_state = FALSE; -#line 13480 "Page.c" +#line 14033 "Page.c" } -void single_photo_page_restore_zoom_state (SinglePhotoPage* self) { +void +single_photo_page_restore_zoom_state (SinglePhotoPage* self) +{ #line 2124 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2124 "/home/jens/Source/shotwell/src/Page.vala" SINGLE_PHOTO_PAGE_GET_CLASS (self)->restore_zoom_state (self); -#line 13489 "Page.c" +#line 14044 "Page.c" } -static ZoomBuffer* single_photo_page_real_get_zoom_buffer (SinglePhotoPage* self) { +static ZoomBuffer* +single_photo_page_real_get_zoom_buffer (SinglePhotoPage* self) +{ ZoomBuffer* result = NULL; #line 2134 "/home/jens/Source/shotwell/src/Page.vala" result = NULL; #line 2134 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 13499 "Page.c" +#line 14056 "Page.c" } -ZoomBuffer* single_photo_page_get_zoom_buffer (SinglePhotoPage* self) { +ZoomBuffer* +single_photo_page_get_zoom_buffer (SinglePhotoPage* self) +{ #line 2133 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL); #line 2133 "/home/jens/Source/shotwell/src/Page.vala" return SINGLE_PHOTO_PAGE_GET_CLASS (self)->get_zoom_buffer (self); -#line 13508 "Page.c" +#line 14067 "Page.c" } -void single_photo_page_get_saved_zoom_state (SinglePhotoPage* self, ZoomState* result) { +void +single_photo_page_get_saved_zoom_state (SinglePhotoPage* self, + ZoomState* result) +{ ZoomState _tmp0_; #line 2137 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); @@ -13518,49 +14080,51 @@ void single_photo_page_get_saved_zoom_state (SinglePhotoPage* self, ZoomState* r *result = _tmp0_; #line 2138 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 13522 "Page.c" +#line 14084 "Page.c" } -void single_photo_page_set_zoom_state (SinglePhotoPage* self, ZoomState* zoom_state) { - gboolean _tmp0_; - ZoomState _tmp1_; +void +single_photo_page_set_zoom_state (SinglePhotoPage* self, + ZoomState* zoom_state) +{ + ZoomState _tmp0_; #line 2141 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2141 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (zoom_state != NULL); #line 2142 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = single_photo_page_is_zoom_supported (self); -#line 2142 "/home/jens/Source/shotwell/src/Page.vala" - _vala_assert (_tmp0_, "is_zoom_supported()"); + _vala_assert (single_photo_page_is_zoom_supported (self), "is_zoom_supported()"); #line 2144 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = *zoom_state; + _tmp0_ = *zoom_state; #line 2144 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->static_zoom_state = _tmp1_; -#line 13541 "Page.c" + self->priv->static_zoom_state = _tmp0_; +#line 14103 "Page.c" } -void single_photo_page_get_zoom_state (SinglePhotoPage* self, ZoomState* result) { - gboolean _tmp0_; - ZoomState _tmp1_; +void +single_photo_page_get_zoom_state (SinglePhotoPage* self, + ZoomState* result) +{ + ZoomState _tmp0_; #line 2147 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2148 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = single_photo_page_is_zoom_supported (self); -#line 2148 "/home/jens/Source/shotwell/src/Page.vala" - _vala_assert (_tmp0_, "is_zoom_supported()"); + _vala_assert (single_photo_page_is_zoom_supported (self), "is_zoom_supported()"); #line 2150 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = self->priv->static_zoom_state; + _tmp0_ = self->priv->static_zoom_state; #line 2150 "/home/jens/Source/shotwell/src/Page.vala" - *result = _tmp1_; + *result = _tmp0_; #line 2150 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 13560 "Page.c" +#line 14122 "Page.c" } -static void single_photo_page_real_switched_to (Page* base) { +static void +single_photo_page_real_switched_to (Page* base) +{ SinglePhotoPage * self; GdkPixbuf* _tmp0_; #line 2153 "/home/jens/Source/shotwell/src/Page.vala" @@ -13573,46 +14137,45 @@ static void single_photo_page_real_switched_to (Page* base) { if (_tmp0_ != NULL) { #line 2157 "/home/jens/Source/shotwell/src/Page.vala" single_photo_page_repaint (self, NULL); -#line 13577 "Page.c" +#line 14141 "Page.c" } } -static void single_photo_page_real_set_container (Page* base, GtkWindow* container) { +static void +single_photo_page_real_set_container (Page* base, + GtkWindow* container) +{ SinglePhotoPage * self; - GtkWindow* _tmp0_; - GtkWindow* _tmp1_; #line 2160 "/home/jens/Source/shotwell/src/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage); #line 2160 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (GTK_IS_WINDOW (container)); #line 2161 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = container; -#line 2161 "/home/jens/Source/shotwell/src/Page.vala" - PAGE_CLASS (single_photo_page_parent_class)->set_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp0_); + PAGE_CLASS (single_photo_page_parent_class)->set_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), container); #line 2165 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = container; -#line 2165 "/home/jens/Source/shotwell/src/Page.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (container, TYPE_FULLSCREEN_WINDOW)) { #line 2166 "/home/jens/Source/shotwell/src/Page.vala" gtk_scrolled_window_set_policy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); -#line 13600 "Page.c" +#line 14161 "Page.c" } } -void single_photo_page_set_pixbuf (SinglePhotoPage* self, GdkPixbuf* unscaled, Dimensions* max_dim, Direction* direction) { +void +single_photo_page_set_pixbuf (SinglePhotoPage* self, + GdkPixbuf* unscaled, + Dimensions* max_dim, + Direction* direction) +{ Dimensions _tmp0_; Dimensions _tmp1_; - gdouble _tmp2_; - GdkPoint _tmp3_ = {0}; - GdkPixbuf* _tmp4_; + GdkPoint _tmp2_ = {0}; + GdkPixbuf* _tmp3_; + Dimensions _tmp4_; GdkPixbuf* _tmp5_; - Dimensions _tmp6_; - GdkPixbuf* _tmp7_; - GdkPixbuf* _tmp8_; - GtkDrawingArea* _tmp9_; - Direction* _tmp10_; + GdkPixbuf* _tmp6_; + GtkDrawingArea* _tmp7_; #line 2173 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2173 "/home/jens/Source/shotwell/src/Page.vala" @@ -13624,50 +14187,46 @@ void single_photo_page_set_pixbuf (SinglePhotoPage* self, GdkPixbuf* unscaled, D #line 2174 "/home/jens/Source/shotwell/src/Page.vala" _tmp1_ = self->priv->pixmap_dim; #line 2174 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = zoom_state_get_interpolation_factor (&self->priv->static_zoom_state); + zoom_state_get_viewport_center (&self->priv->static_zoom_state, &_tmp2_); #line 2174 "/home/jens/Source/shotwell/src/Page.vala" - zoom_state_get_viewport_center (&self->priv->static_zoom_state, &_tmp3_); -#line 2174 "/home/jens/Source/shotwell/src/Page.vala" - zoom_state_init (&self->priv->static_zoom_state, &_tmp0_, &_tmp1_, _tmp2_, &_tmp3_); + zoom_state_init (&self->priv->static_zoom_state, &_tmp0_, &_tmp1_, zoom_state_get_interpolation_factor (&self->priv->static_zoom_state), &_tmp2_); #line 2178 "/home/jens/Source/shotwell/src/Page.vala" single_photo_page_cancel_transition (self); #line 2180 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = unscaled; -#line 2180 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp3_ = _g_object_ref0 (unscaled); #line 2180 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->unscaled); #line 2180 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->unscaled = _tmp5_; + self->priv->unscaled = _tmp3_; #line 2181 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = *max_dim; + _tmp4_ = *max_dim; #line 2181 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->max_dim = _tmp6_; + self->priv->max_dim = _tmp4_; #line 2182 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = self->priv->scaled; + _tmp5_ = self->priv->scaled; #line 2182 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = _g_object_ref0 (_tmp7_); + _tmp6_ = _g_object_ref0 (_tmp5_); #line 2182 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->old_scaled); #line 2182 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->old_scaled = _tmp8_; + self->priv->old_scaled = _tmp6_; #line 2183 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->scaled); #line 2183 "/home/jens/Source/shotwell/src/Page.vala" self->priv->scaled = NULL; #line 2186 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = self->canvas; + _tmp7_ = self->canvas; #line 2186 "/home/jens/Source/shotwell/src/Page.vala" - gtk_widget_realize (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_realize (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget)); #line 2188 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = direction; -#line 2188 "/home/jens/Source/shotwell/src/Page.vala" - single_photo_page_repaint (self, _tmp10_); -#line 13667 "Page.c" + single_photo_page_repaint (self, direction); +#line 14224 "Page.c" } -void single_photo_page_blank_display (SinglePhotoPage* self) { +void +single_photo_page_blank_display (SinglePhotoPage* self) +{ GtkDrawingArea* _tmp0_; #line 2191 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); @@ -13691,18 +14250,22 @@ void single_photo_page_blank_display (SinglePhotoPage* self) { gtk_widget_realize (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); #line 2201 "/home/jens/Source/shotwell/src/Page.vala" single_photo_page_invalidate_all (self); -#line 13695 "Page.c" +#line 14254 "Page.c" } -static gpointer _cairo_surface_reference0 (gpointer self) { +static gpointer +_cairo_surface_reference0 (gpointer self) +{ #line 2205 "/home/jens/Source/shotwell/src/Page.vala" return self ? cairo_surface_reference (self) : NULL; -#line 13702 "Page.c" +#line 14263 "Page.c" } -cairo_surface_t* single_photo_page_get_surface (SinglePhotoPage* self) { +cairo_surface_t* +single_photo_page_get_surface (SinglePhotoPage* self) +{ cairo_surface_t* result = NULL; cairo_surface_t* _tmp0_; cairo_surface_t* _tmp1_; @@ -13716,11 +14279,14 @@ cairo_surface_t* single_photo_page_get_surface (SinglePhotoPage* self) { result = _tmp1_; #line 2205 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 13720 "Page.c" +#line 14283 "Page.c" } -void single_photo_page_get_surface_dim (SinglePhotoPage* self, Dimensions* result) { +void +single_photo_page_get_surface_dim (SinglePhotoPage* self, + Dimensions* result) +{ Dimensions _tmp0_; #line 2208 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); @@ -13730,18 +14296,22 @@ void single_photo_page_get_surface_dim (SinglePhotoPage* self, Dimensions* resul *result = _tmp0_; #line 2209 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 13734 "Page.c" +#line 14300 "Page.c" } -static gpointer _cairo_reference0 (gpointer self) { +static gpointer +_cairo_reference0 (gpointer self) +{ #line 2213 "/home/jens/Source/shotwell/src/Page.vala" return self ? cairo_reference (self) : NULL; -#line 13741 "Page.c" +#line 14309 "Page.c" } -cairo_t* single_photo_page_get_cairo_context (SinglePhotoPage* self) { +cairo_t* +single_photo_page_get_cairo_context (SinglePhotoPage* self) +{ cairo_t* result = NULL; cairo_t* _tmp0_; cairo_t* _tmp1_; @@ -13755,16 +14325,18 @@ cairo_t* single_photo_page_get_cairo_context (SinglePhotoPage* self) { result = _tmp1_; #line 2213 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 13759 "Page.c" +#line 14329 "Page.c" } -void single_photo_page_paint_text (SinglePhotoPage* self, PangoLayout* pango_layout, gint x, gint y) { +void +single_photo_page_paint_text (SinglePhotoPage* self, + PangoLayout* pango_layout, + gint x, + gint y) +{ cairo_t* _tmp0_; - gint _tmp1_; - gint _tmp2_; - cairo_t* _tmp3_; - PangoLayout* _tmp4_; + cairo_t* _tmp1_; #line 2216 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2216 "/home/jens/Source/shotwell/src/Page.vala" @@ -13772,22 +14344,19 @@ void single_photo_page_paint_text (SinglePhotoPage* self, PangoLayout* pango_lay #line 2217 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = self->priv->text_ctx; #line 2217 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = x; -#line 2217 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = y; -#line 2217 "/home/jens/Source/shotwell/src/Page.vala" - cairo_move_to (_tmp0_, (gdouble) _tmp1_, (gdouble) _tmp2_); + cairo_move_to (_tmp0_, (gdouble) x, (gdouble) y); #line 2218 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = self->priv->text_ctx; + _tmp1_ = self->priv->text_ctx; #line 2218 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = pango_layout; -#line 2218 "/home/jens/Source/shotwell/src/Page.vala" - pango_cairo_show_layout (_tmp3_, _tmp4_); -#line 13787 "Page.c" + pango_cairo_show_layout (_tmp1_, pango_layout); +#line 14353 "Page.c" } -void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, Scaling* result) { +void +single_photo_page_get_canvas_scaling (SinglePhotoPage* self, + Scaling* result) +{ Scaling _tmp0_ = {0}; GtkWindow* _tmp1_; GtkWindow* _tmp2_; @@ -13804,7 +14373,7 @@ void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, Scaling* resul _g_object_unref0 (_tmp2_); #line 2222 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp3_) { -#line 13808 "Page.c" +#line 14377 "Page.c" GtkWindow* _tmp4_; GtkWindow* _tmp5_; gboolean _tmp6_; @@ -13821,7 +14390,7 @@ void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, Scaling* resul _tmp0_ = _tmp7_; #line 2222 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (_tmp5_); -#line 13825 "Page.c" +#line 14394 "Page.c" } else { GtkViewport* _tmp8_; gboolean _tmp9_; @@ -13834,17 +14403,19 @@ void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, Scaling* resul scaling_for_widget (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp9_, &_tmp10_); #line 2223 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = _tmp10_; -#line 13838 "Page.c" +#line 14407 "Page.c" } #line 2222 "/home/jens/Source/shotwell/src/Page.vala" *result = _tmp0_; #line 2222 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 13844 "Page.c" +#line 14413 "Page.c" } -GdkPixbuf* single_photo_page_get_unscaled_pixbuf (SinglePhotoPage* self) { +GdkPixbuf* +single_photo_page_get_unscaled_pixbuf (SinglePhotoPage* self) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_; GdkPixbuf* _tmp1_; @@ -13858,11 +14429,13 @@ GdkPixbuf* single_photo_page_get_unscaled_pixbuf (SinglePhotoPage* self) { result = _tmp1_; #line 2227 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 13862 "Page.c" +#line 14433 "Page.c" } -GdkPixbuf* single_photo_page_get_scaled_pixbuf (SinglePhotoPage* self) { +GdkPixbuf* +single_photo_page_get_scaled_pixbuf (SinglePhotoPage* self) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_; GdkPixbuf* _tmp1_; @@ -13876,11 +14449,14 @@ GdkPixbuf* single_photo_page_get_scaled_pixbuf (SinglePhotoPage* self) { result = _tmp1_; #line 2231 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 13880 "Page.c" +#line 14453 "Page.c" } -void single_photo_page_get_scaled_pixbuf_position (SinglePhotoPage* self, GdkRectangle* result) { +void +single_photo_page_get_scaled_pixbuf_position (SinglePhotoPage* self, + GdkRectangle* result) +{ GdkRectangle _tmp0_; #line 2235 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); @@ -13890,35 +14466,33 @@ void single_photo_page_get_scaled_pixbuf_position (SinglePhotoPage* self, GdkRec *result = _tmp0_; #line 2236 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 13894 "Page.c" +#line 14470 "Page.c" } - -gboolean single_photo_page_is_inside_pixbuf (SinglePhotoPage* self, gint x, gint y) { - gboolean result = FALSE; - gint _tmp0_; - gint _tmp1_; - GdkRectangle _tmp2_; - gboolean _tmp3_; + +gboolean +single_photo_page_is_inside_pixbuf (SinglePhotoPage* self, + gint x, + gint y) +{ + gboolean result = FALSE; + GdkRectangle _tmp0_; #line 2239 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE); #line 2240 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = x; -#line 2240 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = y; -#line 2240 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = self->priv->scaled_pos; -#line 2240 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = coord_in_rectangle (_tmp0_, _tmp1_, &_tmp2_); + _tmp0_ = self->priv->scaled_pos; #line 2240 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp3_; + result = coord_in_rectangle (x, y, &_tmp0_); #line 2240 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 13918 "Page.c" +#line 14489 "Page.c" } -void single_photo_page_invalidate (SinglePhotoPage* self, GdkRectangle* rect) { +void +single_photo_page_invalidate (SinglePhotoPage* self, + GdkRectangle* rect) +{ GtkDrawingArea* _tmp0_; GdkWindow* _tmp1_; #line 2243 "/home/jens/Source/shotwell/src/Page.vala" @@ -13931,7 +14505,7 @@ void single_photo_page_invalidate (SinglePhotoPage* self, GdkRectangle* rect) { _tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); #line 2244 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp1_ != NULL) { -#line 13935 "Page.c" +#line 14509 "Page.c" GtkDrawingArea* _tmp2_; GdkWindow* _tmp3_; GdkRectangle _tmp4_; @@ -13943,12 +14517,14 @@ void single_photo_page_invalidate (SinglePhotoPage* self, GdkRectangle* rect) { _tmp4_ = *rect; #line 2245 "/home/jens/Source/shotwell/src/Page.vala" gdk_window_invalidate_rect (_tmp3_, &_tmp4_, FALSE); -#line 13947 "Page.c" +#line 14521 "Page.c" } } -void single_photo_page_invalidate_all (SinglePhotoPage* self) { +void +single_photo_page_invalidate_all (SinglePhotoPage* self) +{ GtkDrawingArea* _tmp0_; GdkWindow* _tmp1_; #line 2248 "/home/jens/Source/shotwell/src/Page.vala" @@ -13959,7 +14535,7 @@ void single_photo_page_invalidate_all (SinglePhotoPage* self) { _tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); #line 2249 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp1_ != NULL) { -#line 13963 "Page.c" +#line 14539 "Page.c" GtkDrawingArea* _tmp2_; GdkWindow* _tmp3_; #line 2250 "/home/jens/Source/shotwell/src/Page.vala" @@ -13968,21 +14544,26 @@ void single_photo_page_invalidate_all (SinglePhotoPage* self) { _tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); #line 2250 "/home/jens/Source/shotwell/src/Page.vala" gdk_window_invalidate_rect (_tmp3_, NULL, FALSE); -#line 13972 "Page.c" +#line 14548 "Page.c" } } -static void single_photo_page_on_viewport_resize (SinglePhotoPage* self) { +static void +single_photo_page_on_viewport_resize (SinglePhotoPage* self) +{ #line 2253 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2255 "/home/jens/Source/shotwell/src/Page.vala" single_photo_page_internal_repaint (self, TRUE, NULL); -#line 13982 "Page.c" +#line 14560 "Page.c" } -static void single_photo_page_real_on_resize_finished (Page* base, GdkRectangle* rect) { +static void +single_photo_page_real_on_resize_finished (Page* base, + GdkRectangle* rect) +{ SinglePhotoPage * self; GdkRectangle _tmp0_; #line 2258 "/home/jens/Source/shotwell/src/Page.vala" @@ -13995,17 +14576,16 @@ static void single_photo_page_real_on_resize_finished (Page* base, GdkRectangle* PAGE_CLASS (single_photo_page_parent_class)->on_resize_finished (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), &_tmp0_); #line 2262 "/home/jens/Source/shotwell/src/Page.vala" single_photo_page_repaint (self, NULL); -#line 13999 "Page.c" +#line 14580 "Page.c" } -static gboolean single_photo_page_on_canvas_exposed (SinglePhotoPage* self, cairo_t* exposed_ctx) { +static gboolean +single_photo_page_on_canvas_exposed (SinglePhotoPage* self, + cairo_t* exposed_ctx) +{ gboolean result = FALSE; cairo_surface_t* _tmp0_; - cairo_t* _tmp4_; - gint _tmp5_; - gint _tmp6_; - cairo_t* _tmp7_; #line 2265 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE); #line 2265 "/home/jens/Source/shotwell/src/Page.vala" @@ -14014,227 +14594,207 @@ static gboolean single_photo_page_on_canvas_exposed (SinglePhotoPage* self, cair _tmp0_ = self->priv->pixmap; #line 2268 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp0_ != NULL) { -#line 14018 "Page.c" - cairo_t* _tmp1_; - cairo_surface_t* _tmp2_; +#line 14598 "Page.c" + cairo_surface_t* _tmp1_; #line 2269 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = exposed_ctx; + _tmp1_ = self->priv->pixmap; #line 2269 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = self->priv->pixmap; -#line 2269 "/home/jens/Source/shotwell/src/Page.vala" - cairo_set_source_surface (_tmp1_, _tmp2_, (gdouble) 0, (gdouble) 0); -#line 14027 "Page.c" + cairo_set_source_surface (exposed_ctx, _tmp1_, (gdouble) 0, (gdouble) 0); +#line 14604 "Page.c" } else { - cairo_t* _tmp3_; -#line 2271 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = exposed_ctx; #line 2271 "/home/jens/Source/shotwell/src/Page.vala" - set_source_color_from_string (_tmp3_, "#000"); -#line 14034 "Page.c" + set_source_color_from_string (exposed_ctx, "#000"); +#line 14608 "Page.c" } #line 2273 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = exposed_ctx; -#line 2273 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = gtk_widget_get_allocated_width (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 2273 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = gtk_widget_get_allocated_height (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 2273 "/home/jens/Source/shotwell/src/Page.vala" - cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp5_, (gdouble) _tmp6_); -#line 2274 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = exposed_ctx; + cairo_rectangle (exposed_ctx, (gdouble) 0, (gdouble) 0, (gdouble) gtk_widget_get_allocated_width (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)), (gdouble) gtk_widget_get_allocated_height (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget))); #line 2274 "/home/jens/Source/shotwell/src/Page.vala" - cairo_paint (_tmp7_); + cairo_paint (exposed_ctx); #line 2276 "/home/jens/Source/shotwell/src/Page.vala" result = TRUE; #line 2276 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 14052 "Page.c" +#line 14618 "Page.c" } -static void single_photo_page_real_new_surface (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) { +static void +single_photo_page_real_new_surface (SinglePhotoPage* self, + cairo_t* ctx, + Dimensions* ctx_dim) +{ #line 2279 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (ctx != NULL); #line 2279 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (ctx_dim != NULL); -#line 14061 "Page.c" +#line 14631 "Page.c" } -void single_photo_page_new_surface (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) { +void +single_photo_page_new_surface (SinglePhotoPage* self, + cairo_t* ctx, + Dimensions* ctx_dim) +{ #line 2279 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2279 "/home/jens/Source/shotwell/src/Page.vala" SINGLE_PHOTO_PAGE_GET_CLASS (self)->new_surface (self, ctx, ctx_dim); -#line 14070 "Page.c" +#line 14644 "Page.c" } -static void single_photo_page_real_updated_pixbuf (SinglePhotoPage* self, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim) { +static void +single_photo_page_real_updated_pixbuf (SinglePhotoPage* self, + GdkPixbuf* pixbuf, + SinglePhotoPageUpdateReason reason, + Dimensions* old_dim) +{ #line 2282 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); #line 2282 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (old_dim != NULL); -#line 14079 "Page.c" +#line 14658 "Page.c" } -void single_photo_page_updated_pixbuf (SinglePhotoPage* self, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim) { +void +single_photo_page_updated_pixbuf (SinglePhotoPage* self, + GdkPixbuf* pixbuf, + SinglePhotoPageUpdateReason reason, + Dimensions* old_dim) +{ #line 2282 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2282 "/home/jens/Source/shotwell/src/Page.vala" SINGLE_PHOTO_PAGE_GET_CLASS (self)->updated_pixbuf (self, pixbuf, reason, old_dim); -#line 14088 "Page.c" +#line 14672 "Page.c" } -static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) { +static void +single_photo_page_real_paint (SinglePhotoPage* self, + cairo_t* ctx, + Dimensions* ctx_dim) +{ gboolean _tmp0_ = FALSE; - gboolean _tmp1_; #line 2285 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (ctx != NULL); #line 2285 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (ctx_dim != NULL); #line 2286 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = single_photo_page_is_zoom_supported (self); -#line 2286 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp1_) { -#line 14103 "Page.c" - gboolean _tmp2_; -#line 2286 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = zoom_state_is_default (&self->priv->static_zoom_state); + if (single_photo_page_is_zoom_supported (self)) { #line 2286 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = !_tmp2_; -#line 14109 "Page.c" + _tmp0_ = !zoom_state_is_default (&self->priv->static_zoom_state); +#line 14690 "Page.c" } else { #line 2286 "/home/jens/Source/shotwell/src/Page.vala" _tmp0_ = FALSE; -#line 14113 "Page.c" +#line 14694 "Page.c" } #line 2286 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp0_) { -#line 14117 "Page.c" - cairo_t* _tmp3_; - cairo_t* _tmp4_; - Dimensions _tmp5_; - gint _tmp6_; - Dimensions _tmp7_; - gint _tmp8_; - cairo_t* _tmp9_; - ZoomState _tmp10_; -#line 2287 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = ctx; +#line 14698 "Page.c" + Dimensions _tmp1_; + gint _tmp2_; + Dimensions _tmp3_; + gint _tmp4_; + ZoomState _tmp5_; #line 2287 "/home/jens/Source/shotwell/src/Page.vala" - set_source_color_from_string (_tmp3_, "#000"); -#line 2288 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = ctx; + set_source_color_from_string (ctx, "#000"); #line 2288 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = self->priv->pixmap_dim; + _tmp1_ = self->priv->pixmap_dim; #line 2288 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = _tmp5_.width; + _tmp2_ = _tmp1_.width; #line 2288 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = self->priv->pixmap_dim; + _tmp3_ = self->priv->pixmap_dim; #line 2288 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = _tmp7_.height; + _tmp4_ = _tmp3_.height; #line 2288 "/home/jens/Source/shotwell/src/Page.vala" - cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp6_, (gdouble) _tmp8_); + cairo_rectangle (ctx, (gdouble) 0, (gdouble) 0, (gdouble) _tmp2_, (gdouble) _tmp4_); #line 2289 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = ctx; -#line 2289 "/home/jens/Source/shotwell/src/Page.vala" - cairo_fill (_tmp9_); + cairo_fill (ctx); #line 2291 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = self->priv->static_zoom_state; + _tmp5_ = self->priv->static_zoom_state; #line 2291 "/home/jens/Source/shotwell/src/Page.vala" - single_photo_page_render_zoomed_to_pixmap (self, &_tmp10_); -#line 14150 "Page.c" + single_photo_page_render_zoomed_to_pixmap (self, &_tmp5_); +#line 14722 "Page.c" } else { - TransitionClock* _tmp11_; - cairo_t* _tmp12_; - Dimensions _tmp13_; - gint _tmp14_; - Dimensions _tmp15_; - gint _tmp16_; - gboolean _tmp17_; -#line 2292 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = self->priv->transition_clock; -#line 2292 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = ctx; + TransitionClock* _tmp6_; + Dimensions _tmp7_; + gint _tmp8_; + Dimensions _tmp9_; + gint _tmp10_; #line 2292 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = *ctx_dim; + _tmp6_ = self->priv->transition_clock; #line 2292 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = _tmp13_.width; + _tmp7_ = *ctx_dim; #line 2292 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = *ctx_dim; + _tmp8_ = _tmp7_.width; #line 2292 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = _tmp15_.height; + _tmp9_ = *ctx_dim; #line 2292 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = transition_clock_paint (_tmp11_, _tmp12_, _tmp14_, _tmp16_); + _tmp10_ = _tmp9_.height; #line 2292 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp17_) { -#line 14175 "Page.c" - cairo_t* _tmp18_; - cairo_t* _tmp19_; - Dimensions _tmp20_; - gint _tmp21_; - Dimensions _tmp22_; - gint _tmp23_; - cairo_t* _tmp24_; - cairo_t* _tmp25_; - GdkPixbuf* _tmp26_; - GdkRectangle _tmp27_; - gint _tmp28_; - GdkRectangle _tmp29_; - gint _tmp30_; -#line 2294 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = ctx; + if (!transition_clock_paint (_tmp6_, ctx, _tmp8_, _tmp10_)) { +#line 14741 "Page.c" + Dimensions _tmp11_; + gint _tmp12_; + Dimensions _tmp13_; + gint _tmp14_; + GdkPixbuf* _tmp15_; + GdkRectangle _tmp16_; + gint _tmp17_; + GdkRectangle _tmp18_; + gint _tmp19_; #line 2294 "/home/jens/Source/shotwell/src/Page.vala" - set_source_color_from_string (_tmp18_, "#000"); + set_source_color_from_string (ctx, "#000"); #line 2296 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = ctx; + _tmp11_ = self->priv->pixmap_dim; #line 2296 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = self->priv->pixmap_dim; + _tmp12_ = _tmp11_.width; #line 2296 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = _tmp20_.width; + _tmp13_ = self->priv->pixmap_dim; #line 2296 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = self->priv->pixmap_dim; + _tmp14_ = _tmp13_.height; #line 2296 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = _tmp22_.height; -#line 2296 "/home/jens/Source/shotwell/src/Page.vala" - cairo_rectangle (_tmp19_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp21_, (gdouble) _tmp23_); + cairo_rectangle (ctx, (gdouble) 0, (gdouble) 0, (gdouble) _tmp12_, (gdouble) _tmp14_); #line 2297 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = ctx; -#line 2297 "/home/jens/Source/shotwell/src/Page.vala" - cairo_fill (_tmp24_); -#line 2299 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = ctx; + cairo_fill (ctx); #line 2299 "/home/jens/Source/shotwell/src/Page.vala" - _tmp26_ = self->priv->scaled; + _tmp15_ = self->priv->scaled; #line 2299 "/home/jens/Source/shotwell/src/Page.vala" - _tmp27_ = self->priv->scaled_pos; + _tmp16_ = self->priv->scaled_pos; #line 2299 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = _tmp27_.x; + _tmp17_ = _tmp16_.x; #line 2299 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = self->priv->scaled_pos; + _tmp18_ = self->priv->scaled_pos; #line 2299 "/home/jens/Source/shotwell/src/Page.vala" - _tmp30_ = _tmp29_.y; + _tmp19_ = _tmp18_.y; #line 2299 "/home/jens/Source/shotwell/src/Page.vala" - paint_pixmap_with_background (_tmp25_, _tmp26_, _tmp28_, _tmp30_); -#line 14223 "Page.c" + paint_pixmap_with_background (ctx, _tmp15_, _tmp17_, _tmp19_); +#line 14777 "Page.c" } } } -void single_photo_page_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) { +void +single_photo_page_paint (SinglePhotoPage* self, + cairo_t* ctx, + Dimensions* ctx_dim) +{ #line 2285 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2285 "/home/jens/Source/shotwell/src/Page.vala" SINGLE_PHOTO_PAGE_GET_CLASS (self)->paint (self, ctx, ctx_dim); -#line 14234 "Page.c" +#line 14792 "Page.c" } -static void single_photo_page_repaint_pixmap (SinglePhotoPage* self) { +static void +single_photo_page_repaint_pixmap (SinglePhotoPage* self) +{ cairo_t* _tmp0_; cairo_t* _tmp1_; Dimensions _tmp2_; @@ -14246,7 +14806,7 @@ static void single_photo_page_repaint_pixmap (SinglePhotoPage* self) { if (_tmp0_ == NULL) { #line 2305 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 14250 "Page.c" +#line 14810 "Page.c" } #line 2307 "/home/jens/Source/shotwell/src/Page.vala" _tmp1_ = self->priv->pixmap_ctx; @@ -14256,74 +14816,73 @@ static void single_photo_page_repaint_pixmap (SinglePhotoPage* self) { single_photo_page_paint (self, _tmp1_, &_tmp2_); #line 2308 "/home/jens/Source/shotwell/src/Page.vala" single_photo_page_invalidate_all (self); -#line 14260 "Page.c" +#line 14820 "Page.c" } -void single_photo_page_repaint (SinglePhotoPage* self, Direction* direction) { - Direction* _tmp0_; +void +single_photo_page_repaint (SinglePhotoPage* self, + Direction* direction) +{ #line 2311 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2312 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = direction; -#line 2312 "/home/jens/Source/shotwell/src/Page.vala" - single_photo_page_internal_repaint (self, FALSE, _tmp0_); -#line 14272 "Page.c" + single_photo_page_internal_repaint (self, FALSE, direction); +#line 14832 "Page.c" } -static void _single_photo_page_repaint_pixmap_transition_clock_repaint_callback (gpointer self) { +static void +_single_photo_page_repaint_pixmap_transition_clock_repaint_callback (gpointer self) +{ #line 2400 "/home/jens/Source/shotwell/src/Page.vala" single_photo_page_repaint_pixmap ((SinglePhotoPage*) self); -#line 14279 "Page.c" +#line 14841 "Page.c" } -static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean fast, Direction* direction) { - gboolean _tmp0_; - gboolean _tmp1_ = FALSE; - GdkPixbuf* _tmp2_; +static void +single_photo_page_internal_repaint (SinglePhotoPage* self, + gboolean fast, + Direction* direction) +{ + gboolean _tmp0_ = FALSE; + GdkPixbuf* _tmp1_; GtkAllocation allocation = {0}; - GtkViewport* _tmp5_; - GtkAllocation _tmp6_ = {0}; + GtkViewport* _tmp4_; + GtkAllocation _tmp5_ = {0}; gint width = 0; - GtkAllocation _tmp7_; - gint _tmp8_; + GtkAllocation _tmp6_; + gint _tmp7_; gint height = 0; - GtkAllocation _tmp9_; - gint _tmp10_; - gboolean _tmp11_ = FALSE; - gint _tmp12_; + GtkAllocation _tmp8_; + gint _tmp9_; + gboolean _tmp10_ = FALSE; + gint _tmp11_; gboolean new_pixbuf = FALSE; - GdkPixbuf* _tmp14_; + GdkPixbuf* _tmp13_; Dimensions old_scaled_dim = {0}; - GdkRectangle _tmp15_; - Dimensions _tmp16_ = {0}; + GdkRectangle _tmp14_; + Dimensions _tmp15_ = {0}; GdkRectangle old_scaled_pos = {0}; - GdkRectangle _tmp17_; - gboolean _tmp18_ = FALSE; - Dimensions _tmp19_; + GdkRectangle _tmp16_; + gboolean _tmp17_ = FALSE; + Dimensions _tmp18_; + gint _tmp19_; gint _tmp20_; - gint _tmp21_; gboolean new_pixmap = FALSE; - cairo_surface_t* _tmp25_; - gboolean _tmp28_ = FALSE; - gboolean _tmp29_; - GdkInterpType _tmp63_ = 0; - gboolean _tmp64_; + cairo_surface_t* _tmp24_; + gboolean _tmp27_ = FALSE; + gboolean _tmp28_; + GdkInterpType _tmp61_ = 0; GdkInterpType interp = 0; - GdkPixbuf* _tmp65_; - gboolean _tmp82_; - gboolean _tmp83_ = FALSE; - Direction* _tmp84_; - TransitionClock* _tmp98_; - gboolean _tmp99_; + GdkPixbuf* _tmp62_; + gboolean _tmp78_ = FALSE; + TransitionClock* _tmp89_; #line 2315 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2317 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 2317 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp0_) { + if (!page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page))) { #line 2318 "/home/jens/Source/shotwell/src/Page.vala" _cairo_surface_destroy0 (self->priv->pixmap); #line 2318 "/home/jens/Source/shotwell/src/Page.vala" @@ -14334,508 +14893,484 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean self->priv->scaled = NULL; #line 2321 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 14338 "Page.c" +#line 14897 "Page.c" } #line 2325 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = self->priv->unscaled; + _tmp1_ = self->priv->unscaled; #line 2325 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 2325 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = TRUE; -#line 14346 "Page.c" + _tmp0_ = TRUE; +#line 14905 "Page.c" } else { - GtkDrawingArea* _tmp3_; - GdkWindow* _tmp4_; + GtkDrawingArea* _tmp2_; + GdkWindow* _tmp3_; #line 2325 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = self->canvas; + _tmp2_ = self->canvas; #line 2325 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); + _tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); #line 2325 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = _tmp4_ == NULL; -#line 14356 "Page.c" + _tmp0_ = _tmp3_ == NULL; +#line 14915 "Page.c" } #line 2325 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp1_) { + if (_tmp0_) { #line 2326 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 14362 "Page.c" +#line 14921 "Page.c" } #line 2329 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = self->viewport; + _tmp4_ = self->viewport; #line 2329 "/home/jens/Source/shotwell/src/Page.vala" - gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), &_tmp6_); + gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), &_tmp5_); #line 2329 "/home/jens/Source/shotwell/src/Page.vala" - allocation = _tmp6_; + allocation = _tmp5_; #line 2331 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = allocation; + _tmp6_ = allocation; #line 2331 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = _tmp7_.width; + _tmp7_ = _tmp6_.width; #line 2331 "/home/jens/Source/shotwell/src/Page.vala" - width = _tmp8_; + width = _tmp7_; #line 2332 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = allocation; + _tmp8_ = allocation; #line 2332 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = _tmp9_.height; + _tmp9_ = _tmp8_.height; #line 2332 "/home/jens/Source/shotwell/src/Page.vala" - height = _tmp10_; + height = _tmp9_; #line 2334 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = width; + _tmp11_ = width; #line 2334 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp12_ <= 0) { + if (_tmp11_ <= 0) { #line 2334 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = TRUE; -#line 14388 "Page.c" + _tmp10_ = TRUE; +#line 14947 "Page.c" } else { - gint _tmp13_; + gint _tmp12_; #line 2334 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = height; + _tmp12_ = height; #line 2334 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = _tmp13_ <= 0; -#line 14395 "Page.c" + _tmp10_ = _tmp12_ <= 0; +#line 14954 "Page.c" } #line 2334 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp11_) { + if (_tmp10_) { #line 2335 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 14401 "Page.c" +#line 14960 "Page.c" } #line 2337 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = self->priv->scaled; + _tmp13_ = self->priv->scaled; #line 2337 "/home/jens/Source/shotwell/src/Page.vala" - new_pixbuf = _tmp14_ == NULL; + new_pixbuf = _tmp13_ == NULL; #line 2340 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = self->priv->scaled_pos; + _tmp14_ = self->priv->scaled_pos; #line 2340 "/home/jens/Source/shotwell/src/Page.vala" - dimensions_for_rectangle (&_tmp15_, &_tmp16_); + dimensions_for_rectangle (&_tmp14_, &_tmp15_); #line 2340 "/home/jens/Source/shotwell/src/Page.vala" - old_scaled_dim = _tmp16_; + old_scaled_dim = _tmp15_; #line 2341 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = self->priv->scaled_pos; + _tmp16_ = self->priv->scaled_pos; #line 2341 "/home/jens/Source/shotwell/src/Page.vala" - old_scaled_pos = _tmp17_; + old_scaled_pos = _tmp16_; #line 2344 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = self->priv->pixmap_dim; + _tmp18_ = self->priv->pixmap_dim; #line 2344 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = _tmp19_.width; + _tmp19_ = _tmp18_.width; #line 2344 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = width; + _tmp20_ = width; #line 2344 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp20_ != _tmp21_) { + if (_tmp19_ != _tmp20_) { #line 2344 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = TRUE; -#line 14427 "Page.c" + _tmp17_ = TRUE; +#line 14986 "Page.c" } else { - Dimensions _tmp22_; + Dimensions _tmp21_; + gint _tmp22_; gint _tmp23_; - gint _tmp24_; #line 2344 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = self->priv->pixmap_dim; + _tmp21_ = self->priv->pixmap_dim; #line 2344 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = _tmp22_.height; + _tmp22_ = _tmp21_.height; #line 2344 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = height; + _tmp23_ = height; #line 2344 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = _tmp23_ != _tmp24_; -#line 14440 "Page.c" + _tmp17_ = _tmp22_ != _tmp23_; +#line 14999 "Page.c" } #line 2344 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp18_) { + if (_tmp17_) { #line 2345 "/home/jens/Source/shotwell/src/Page.vala" _cairo_surface_destroy0 (self->priv->pixmap); #line 2345 "/home/jens/Source/shotwell/src/Page.vala" self->priv->pixmap = NULL; -#line 14448 "Page.c" +#line 15007 "Page.c" } #line 2348 "/home/jens/Source/shotwell/src/Page.vala" new_pixmap = FALSE; #line 2349 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = self->priv->pixmap; + _tmp24_ = self->priv->pixmap; #line 2349 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp25_ == NULL) { -#line 14456 "Page.c" + if (_tmp24_ == NULL) { +#line 15015 "Page.c" + gint _tmp25_; gint _tmp26_; - gint _tmp27_; #line 2350 "/home/jens/Source/shotwell/src/Page.vala" - _tmp26_ = width; + _tmp25_ = width; #line 2350 "/home/jens/Source/shotwell/src/Page.vala" - _tmp27_ = height; + _tmp26_ = height; #line 2350 "/home/jens/Source/shotwell/src/Page.vala" - single_photo_page_init_pixmap (self, _tmp26_, _tmp27_); + single_photo_page_init_pixmap (self, _tmp25_, _tmp26_); #line 2351 "/home/jens/Source/shotwell/src/Page.vala" new_pixmap = TRUE; -#line 14467 "Page.c" +#line 15026 "Page.c" } #line 2354 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = new_pixbuf; + _tmp28_ = new_pixbuf; #line 2354 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp29_) { + if (_tmp28_) { #line 2354 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = TRUE; -#line 14475 "Page.c" + _tmp27_ = TRUE; +#line 15034 "Page.c" } else { - gboolean _tmp30_; + gboolean _tmp29_; #line 2354 "/home/jens/Source/shotwell/src/Page.vala" - _tmp30_ = new_pixmap; + _tmp29_ = new_pixmap; #line 2354 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = _tmp30_; -#line 14482 "Page.c" + _tmp27_ = _tmp29_; +#line 15041 "Page.c" } #line 2354 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp28_) { -#line 14486 "Page.c" + if (_tmp27_) { +#line 15045 "Page.c" Dimensions unscaled_dim = {0}; - GdkPixbuf* _tmp31_; - Dimensions _tmp32_ = {0}; + GdkPixbuf* _tmp30_; + Dimensions _tmp31_ = {0}; Dimensions scaled_dim = {0}; + gboolean _tmp32_ = FALSE; gboolean _tmp33_ = FALSE; gboolean _tmp34_ = FALSE; - gboolean _tmp35_ = FALSE; - gboolean _tmp36_; + gboolean _tmp35_; + gint _tmp45_; + Dimensions _tmp46_; gint _tmp47_; - Dimensions _tmp48_; - gint _tmp49_; + gint _tmp48_; + Dimensions _tmp49_; gint _tmp50_; - Dimensions _tmp51_; - gint _tmp52_; + gint _tmp51_; + Dimensions _tmp52_; gint _tmp53_; - Dimensions _tmp54_; - gint _tmp55_; + gint _tmp54_; + Dimensions _tmp55_; gint _tmp56_; Dimensions _tmp57_; gint _tmp58_; Dimensions _tmp59_; gint _tmp60_; - Dimensions _tmp61_; - gint _tmp62_; #line 2355 "/home/jens/Source/shotwell/src/Page.vala" - _tmp31_ = self->priv->unscaled; + _tmp30_ = self->priv->unscaled; #line 2355 "/home/jens/Source/shotwell/src/Page.vala" - dimensions_for_pixbuf (_tmp31_, &_tmp32_); + dimensions_for_pixbuf (_tmp30_, &_tmp31_); #line 2355 "/home/jens/Source/shotwell/src/Page.vala" - unscaled_dim = _tmp32_; + unscaled_dim = _tmp31_; #line 2359 "/home/jens/Source/shotwell/src/Page.vala" dimensions_init (&scaled_dim, 0, 0); #line 2360 "/home/jens/Source/shotwell/src/Page.vala" - _tmp36_ = self->priv->scale_up_to_viewport; + _tmp35_ = self->priv->scale_up_to_viewport; #line 2360 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp36_) { -#line 14523 "Page.c" - gboolean _tmp37_; + if (!_tmp35_) { #line 2360 "/home/jens/Source/shotwell/src/Page.vala" - _tmp37_ = dimensions_has_area (&self->priv->max_dim); -#line 2360 "/home/jens/Source/shotwell/src/Page.vala" - _tmp35_ = _tmp37_; -#line 14529 "Page.c" + _tmp34_ = dimensions_has_area (&self->priv->max_dim); +#line 15084 "Page.c" } else { #line 2360 "/home/jens/Source/shotwell/src/Page.vala" - _tmp35_ = FALSE; -#line 14533 "Page.c" + _tmp34_ = FALSE; +#line 15088 "Page.c" } #line 2360 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp35_) { -#line 14537 "Page.c" - Dimensions _tmp38_; - gint _tmp39_; - gint _tmp40_; + if (_tmp34_) { +#line 15092 "Page.c" + Dimensions _tmp36_; + gint _tmp37_; + gint _tmp38_; #line 2360 "/home/jens/Source/shotwell/src/Page.vala" - _tmp38_ = self->priv->max_dim; + _tmp36_ = self->priv->max_dim; #line 2360 "/home/jens/Source/shotwell/src/Page.vala" - _tmp39_ = _tmp38_.width; + _tmp37_ = _tmp36_.width; #line 2360 "/home/jens/Source/shotwell/src/Page.vala" - _tmp40_ = width; + _tmp38_ = width; #line 2360 "/home/jens/Source/shotwell/src/Page.vala" - _tmp34_ = _tmp39_ < _tmp40_; -#line 14549 "Page.c" + _tmp33_ = _tmp37_ < _tmp38_; +#line 15104 "Page.c" } else { #line 2360 "/home/jens/Source/shotwell/src/Page.vala" - _tmp34_ = FALSE; -#line 14553 "Page.c" + _tmp33_ = FALSE; +#line 15108 "Page.c" } #line 2360 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp34_) { -#line 14557 "Page.c" - Dimensions _tmp41_; - gint _tmp42_; - gint _tmp43_; + if (_tmp33_) { +#line 15112 "Page.c" + Dimensions _tmp39_; + gint _tmp40_; + gint _tmp41_; #line 2360 "/home/jens/Source/shotwell/src/Page.vala" - _tmp41_ = self->priv->max_dim; + _tmp39_ = self->priv->max_dim; #line 2360 "/home/jens/Source/shotwell/src/Page.vala" - _tmp42_ = _tmp41_.height; + _tmp40_ = _tmp39_.height; #line 2360 "/home/jens/Source/shotwell/src/Page.vala" - _tmp43_ = height; + _tmp41_ = height; #line 2360 "/home/jens/Source/shotwell/src/Page.vala" - _tmp33_ = _tmp42_ < _tmp43_; -#line 14569 "Page.c" + _tmp32_ = _tmp40_ < _tmp41_; +#line 15124 "Page.c" } else { #line 2360 "/home/jens/Source/shotwell/src/Page.vala" - _tmp33_ = FALSE; -#line 14573 "Page.c" + _tmp32_ = FALSE; +#line 15128 "Page.c" } #line 2360 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp33_) { -#line 14577 "Page.c" - Dimensions _tmp44_; + if (_tmp32_) { +#line 15132 "Page.c" + Dimensions _tmp42_; #line 2361 "/home/jens/Source/shotwell/src/Page.vala" - _tmp44_ = self->priv->max_dim; + _tmp42_ = self->priv->max_dim; #line 2361 "/home/jens/Source/shotwell/src/Page.vala" - scaled_dim = _tmp44_; -#line 14583 "Page.c" + scaled_dim = _tmp42_; +#line 15138 "Page.c" } else { - Dimensions _tmp45_; - Dimensions _tmp46_ = {0}; + Dimensions _tmp43_; + Dimensions _tmp44_ = {0}; #line 2363 "/home/jens/Source/shotwell/src/Page.vala" - _tmp45_ = self->priv->pixmap_dim; + _tmp43_ = self->priv->pixmap_dim; #line 2363 "/home/jens/Source/shotwell/src/Page.vala" - dimensions_get_scaled_proportional (&unscaled_dim, &_tmp45_, &_tmp46_); + dimensions_get_scaled_proportional (&unscaled_dim, &_tmp43_, &_tmp44_); #line 2363 "/home/jens/Source/shotwell/src/Page.vala" - scaled_dim = _tmp46_; -#line 14593 "Page.c" + scaled_dim = _tmp44_; +#line 15148 "Page.c" } #line 2365 "/home/jens/Source/shotwell/src/Page.vala" - _tmp47_ = width; + _tmp45_ = width; #line 2365 "/home/jens/Source/shotwell/src/Page.vala" - _tmp48_ = scaled_dim; + _tmp46_ = scaled_dim; #line 2365 "/home/jens/Source/shotwell/src/Page.vala" - _tmp49_ = _tmp48_.width; + _tmp47_ = _tmp46_.width; #line 2365 "/home/jens/Source/shotwell/src/Page.vala" - _vala_assert (_tmp47_ >= _tmp49_, "width >= scaled_dim.width"); + _vala_assert (_tmp45_ >= _tmp47_, "width >= scaled_dim.width"); #line 2366 "/home/jens/Source/shotwell/src/Page.vala" - _tmp50_ = height; + _tmp48_ = height; #line 2366 "/home/jens/Source/shotwell/src/Page.vala" - _tmp51_ = scaled_dim; + _tmp49_ = scaled_dim; #line 2366 "/home/jens/Source/shotwell/src/Page.vala" - _tmp52_ = _tmp51_.height; + _tmp50_ = _tmp49_.height; #line 2366 "/home/jens/Source/shotwell/src/Page.vala" - _vala_assert (_tmp50_ >= _tmp52_, "height >= scaled_dim.height"); + _vala_assert (_tmp48_ >= _tmp50_, "height >= scaled_dim.height"); #line 2369 "/home/jens/Source/shotwell/src/Page.vala" - _tmp53_ = width; + _tmp51_ = width; #line 2369 "/home/jens/Source/shotwell/src/Page.vala" - _tmp54_ = scaled_dim; + _tmp52_ = scaled_dim; #line 2369 "/home/jens/Source/shotwell/src/Page.vala" - _tmp55_ = _tmp54_.width; + _tmp53_ = _tmp52_.width; #line 2369 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->scaled_pos.x = (_tmp53_ - _tmp55_) / 2; + self->priv->scaled_pos.x = (_tmp51_ - _tmp53_) / 2; #line 2370 "/home/jens/Source/shotwell/src/Page.vala" - _tmp56_ = height; + _tmp54_ = height; #line 2370 "/home/jens/Source/shotwell/src/Page.vala" - _tmp57_ = scaled_dim; + _tmp55_ = scaled_dim; #line 2370 "/home/jens/Source/shotwell/src/Page.vala" - _tmp58_ = _tmp57_.height; + _tmp56_ = _tmp55_.height; #line 2370 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->scaled_pos.y = (_tmp56_ - _tmp58_) / 2; + self->priv->scaled_pos.y = (_tmp54_ - _tmp56_) / 2; #line 2371 "/home/jens/Source/shotwell/src/Page.vala" - _tmp59_ = scaled_dim; + _tmp57_ = scaled_dim; #line 2371 "/home/jens/Source/shotwell/src/Page.vala" - _tmp60_ = _tmp59_.width; + _tmp58_ = _tmp57_.width; #line 2371 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->scaled_pos.width = _tmp60_; + self->priv->scaled_pos.width = _tmp58_; #line 2372 "/home/jens/Source/shotwell/src/Page.vala" - _tmp61_ = scaled_dim; + _tmp59_ = scaled_dim; #line 2372 "/home/jens/Source/shotwell/src/Page.vala" - _tmp62_ = _tmp61_.height; + _tmp60_ = _tmp59_.height; #line 2372 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->scaled_pos.height = _tmp62_; -#line 14639 "Page.c" + self->priv->scaled_pos.height = _tmp60_; +#line 15194 "Page.c" } #line 2375 "/home/jens/Source/shotwell/src/Page.vala" - _tmp64_ = fast; -#line 2375 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp64_) { + if (fast) { #line 2375 "/home/jens/Source/shotwell/src/Page.vala" - _tmp63_ = SINGLE_PHOTO_PAGE_FAST_INTERP; -#line 14647 "Page.c" + _tmp61_ = SINGLE_PHOTO_PAGE_FAST_INTERP; +#line 15200 "Page.c" } else { #line 2375 "/home/jens/Source/shotwell/src/Page.vala" - _tmp63_ = SINGLE_PHOTO_PAGE_QUALITY_INTERP; -#line 14651 "Page.c" + _tmp61_ = SINGLE_PHOTO_PAGE_QUALITY_INTERP; +#line 15204 "Page.c" } #line 2375 "/home/jens/Source/shotwell/src/Page.vala" - interp = _tmp63_; + interp = _tmp61_; #line 2378 "/home/jens/Source/shotwell/src/Page.vala" - _tmp65_ = self->priv->scaled; + _tmp62_ = self->priv->scaled; #line 2378 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp65_ == NULL) { -#line 14659 "Page.c" - GdkPixbuf* _tmp66_; - GdkRectangle _tmp67_; - Dimensions _tmp68_ = {0}; - GdkInterpType _tmp69_; - GdkPixbuf* _tmp70_; + if (_tmp62_ == NULL) { +#line 15212 "Page.c" + GdkPixbuf* _tmp63_; + GdkRectangle _tmp64_; + Dimensions _tmp65_ = {0}; + GdkInterpType _tmp66_; + GdkPixbuf* _tmp67_; SinglePhotoPageUpdateReason reason = 0; - gboolean _tmp71_; - Dimensions _tmp75_; - Dimensions _tmp76_; - gdouble _tmp77_; - GdkPoint _tmp78_ = {0}; - GdkPixbuf* _tmp79_; - SinglePhotoPageUpdateReason _tmp80_; - Dimensions _tmp81_; + gboolean _tmp68_; + Dimensions _tmp72_; + Dimensions _tmp73_; + GdkPoint _tmp74_ = {0}; + GdkPixbuf* _tmp75_; + SinglePhotoPageUpdateReason _tmp76_; + Dimensions _tmp77_; #line 2379 "/home/jens/Source/shotwell/src/Page.vala" - _tmp66_ = self->priv->unscaled; + _tmp63_ = self->priv->unscaled; #line 2379 "/home/jens/Source/shotwell/src/Page.vala" - _tmp67_ = self->priv->scaled_pos; + _tmp64_ = self->priv->scaled_pos; #line 2379 "/home/jens/Source/shotwell/src/Page.vala" - dimensions_for_rectangle (&_tmp67_, &_tmp68_); + dimensions_for_rectangle (&_tmp64_, &_tmp65_); #line 2379 "/home/jens/Source/shotwell/src/Page.vala" - _tmp69_ = interp; + _tmp66_ = interp; #line 2379 "/home/jens/Source/shotwell/src/Page.vala" - _tmp70_ = resize_pixbuf (_tmp66_, &_tmp68_, _tmp69_); + _tmp67_ = resize_pixbuf (_tmp63_, &_tmp65_, _tmp66_); #line 2379 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->scaled); #line 2379 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->scaled = _tmp70_; + self->priv->scaled = _tmp67_; #line 2381 "/home/jens/Source/shotwell/src/Page.vala" reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_RESIZED_CANVAS; #line 2382 "/home/jens/Source/shotwell/src/Page.vala" - _tmp71_ = new_pixbuf; + _tmp68_ = new_pixbuf; #line 2382 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp71_) { + if (_tmp68_) { #line 2383 "/home/jens/Source/shotwell/src/Page.vala" reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_NEW_PIXBUF; -#line 14696 "Page.c" +#line 15248 "Page.c" } else { - gboolean _tmp72_ = FALSE; - gboolean _tmp73_; + gboolean _tmp69_ = FALSE; + gboolean _tmp70_; #line 2384 "/home/jens/Source/shotwell/src/Page.vala" - _tmp73_ = new_pixmap; + _tmp70_ = new_pixmap; #line 2384 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp73_) { -#line 14704 "Page.c" - GdkInterpType _tmp74_; + if (!_tmp70_) { +#line 15256 "Page.c" + GdkInterpType _tmp71_; #line 2384 "/home/jens/Source/shotwell/src/Page.vala" - _tmp74_ = interp; + _tmp71_ = interp; #line 2384 "/home/jens/Source/shotwell/src/Page.vala" - _tmp72_ = _tmp74_ == SINGLE_PHOTO_PAGE_QUALITY_INTERP; -#line 14710 "Page.c" + _tmp69_ = _tmp71_ == SINGLE_PHOTO_PAGE_QUALITY_INTERP; +#line 15262 "Page.c" } else { #line 2384 "/home/jens/Source/shotwell/src/Page.vala" - _tmp72_ = FALSE; -#line 14714 "Page.c" + _tmp69_ = FALSE; +#line 15266 "Page.c" } #line 2384 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp72_) { + if (_tmp69_) { #line 2385 "/home/jens/Source/shotwell/src/Page.vala" reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT; -#line 14720 "Page.c" +#line 15272 "Page.c" } } #line 2387 "/home/jens/Source/shotwell/src/Page.vala" - _tmp75_ = self->priv->max_dim; + _tmp72_ = self->priv->max_dim; #line 2387 "/home/jens/Source/shotwell/src/Page.vala" - _tmp76_ = self->priv->pixmap_dim; + _tmp73_ = self->priv->pixmap_dim; #line 2387 "/home/jens/Source/shotwell/src/Page.vala" - _tmp77_ = zoom_state_get_interpolation_factor (&self->priv->static_zoom_state); + zoom_state_get_viewport_center (&self->priv->static_zoom_state, &_tmp74_); #line 2387 "/home/jens/Source/shotwell/src/Page.vala" - zoom_state_get_viewport_center (&self->priv->static_zoom_state, &_tmp78_); -#line 2387 "/home/jens/Source/shotwell/src/Page.vala" - zoom_state_init (&self->priv->static_zoom_state, &_tmp75_, &_tmp76_, _tmp77_, &_tmp78_); + zoom_state_init (&self->priv->static_zoom_state, &_tmp72_, &_tmp73_, zoom_state_get_interpolation_factor (&self->priv->static_zoom_state), &_tmp74_); #line 2391 "/home/jens/Source/shotwell/src/Page.vala" - _tmp79_ = self->priv->scaled; + _tmp75_ = self->priv->scaled; #line 2391 "/home/jens/Source/shotwell/src/Page.vala" - _tmp80_ = reason; + _tmp76_ = reason; #line 2391 "/home/jens/Source/shotwell/src/Page.vala" - _tmp81_ = old_scaled_dim; + _tmp77_ = old_scaled_dim; #line 2391 "/home/jens/Source/shotwell/src/Page.vala" - single_photo_page_updated_pixbuf (self, _tmp79_, _tmp80_, &_tmp81_); -#line 14741 "Page.c" + single_photo_page_updated_pixbuf (self, _tmp75_, _tmp76_, &_tmp77_); +#line 15291 "Page.c" } #line 2394 "/home/jens/Source/shotwell/src/Page.vala" - _tmp82_ = fast; -#line 2394 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->zoom_high_quality = !_tmp82_; -#line 2396 "/home/jens/Source/shotwell/src/Page.vala" - _tmp84_ = direction; + self->priv->zoom_high_quality = !fast; #line 2396 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp84_ != NULL) { -#line 14751 "Page.c" - TransitionClock* _tmp85_; - gboolean _tmp86_; + if (direction != NULL) { +#line 15297 "Page.c" + TransitionClock* _tmp79_; #line 2396 "/home/jens/Source/shotwell/src/Page.vala" - _tmp85_ = self->priv->transition_clock; + _tmp79_ = self->priv->transition_clock; #line 2396 "/home/jens/Source/shotwell/src/Page.vala" - _tmp86_ = transition_clock_is_in_progress (_tmp85_); -#line 2396 "/home/jens/Source/shotwell/src/Page.vala" - _tmp83_ = !_tmp86_; -#line 14760 "Page.c" + _tmp78_ = !transition_clock_is_in_progress (_tmp79_); +#line 15303 "Page.c" } else { #line 2396 "/home/jens/Source/shotwell/src/Page.vala" - _tmp83_ = FALSE; -#line 14764 "Page.c" + _tmp78_ = FALSE; +#line 15307 "Page.c" } #line 2396 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp83_) { -#line 14768 "Page.c" + if (_tmp78_) { +#line 15311 "Page.c" SpitTransitionsVisuals* visuals = NULL; - GdkPixbuf* _tmp87_; - GdkRectangle _tmp88_; - GdkPixbuf* _tmp89_; - GdkRectangle _tmp90_; - GdkRGBA _tmp91_ = {0}; - SpitTransitionsVisuals* _tmp92_; - TransitionClock* _tmp93_; - SpitTransitionsVisuals* _tmp94_; - Direction* _tmp95_; - SpitTransitionsDirection _tmp96_; - gint _tmp97_; + GdkPixbuf* _tmp80_; + GdkRectangle _tmp81_; + GdkPixbuf* _tmp82_; + GdkRectangle _tmp83_; + GdkRGBA _tmp84_ = {0}; + SpitTransitionsVisuals* _tmp85_; + TransitionClock* _tmp86_; + SpitTransitionsVisuals* _tmp87_; + gint _tmp88_; #line 2397 "/home/jens/Source/shotwell/src/Page.vala" - _tmp87_ = self->priv->old_scaled; + _tmp80_ = self->priv->old_scaled; #line 2397 "/home/jens/Source/shotwell/src/Page.vala" - _tmp88_ = old_scaled_pos; + _tmp81_ = old_scaled_pos; #line 2397 "/home/jens/Source/shotwell/src/Page.vala" - _tmp89_ = self->priv->scaled; + _tmp82_ = self->priv->scaled; #line 2397 "/home/jens/Source/shotwell/src/Page.vala" - _tmp90_ = self->priv->scaled_pos; + _tmp83_ = self->priv->scaled_pos; #line 2397 "/home/jens/Source/shotwell/src/Page.vala" - parse_color ("#000", &_tmp91_); + parse_color ("#000", &_tmp84_); #line 2397 "/home/jens/Source/shotwell/src/Page.vala" - _tmp92_ = spit_transitions_visuals_new (_tmp87_, &_tmp88_, _tmp89_, &_tmp90_, &_tmp91_); + _tmp85_ = spit_transitions_visuals_new (_tmp80_, &_tmp81_, _tmp82_, &_tmp83_, &_tmp84_); #line 2397 "/home/jens/Source/shotwell/src/Page.vala" - visuals = _tmp92_; -#line 2400 "/home/jens/Source/shotwell/src/Page.vala" - _tmp93_ = self->priv->transition_clock; + visuals = _tmp85_; #line 2400 "/home/jens/Source/shotwell/src/Page.vala" - _tmp94_ = visuals; + _tmp86_ = self->priv->transition_clock; #line 2400 "/home/jens/Source/shotwell/src/Page.vala" - _tmp95_ = direction; + _tmp87_ = visuals; #line 2400 "/home/jens/Source/shotwell/src/Page.vala" - _tmp96_ = direction_to_transition_direction (*_tmp95_); + _tmp88_ = self->priv->transition_duration_msec; #line 2400 "/home/jens/Source/shotwell/src/Page.vala" - _tmp97_ = self->priv->transition_duration_msec; -#line 2400 "/home/jens/Source/shotwell/src/Page.vala" - transition_clock_start (_tmp93_, _tmp94_, _tmp96_, _tmp97_, _single_photo_page_repaint_pixmap_transition_clock_repaint_callback, self); + transition_clock_start (_tmp86_, _tmp87_, direction_to_transition_direction (*direction), _tmp88_, _single_photo_page_repaint_pixmap_transition_clock_repaint_callback, self); #line 2396 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (visuals); -#line 14809 "Page.c" +#line 15346 "Page.c" } #line 2404 "/home/jens/Source/shotwell/src/Page.vala" - _tmp98_ = self->priv->transition_clock; -#line 2404 "/home/jens/Source/shotwell/src/Page.vala" - _tmp99_ = transition_clock_is_in_progress (_tmp98_); + _tmp89_ = self->priv->transition_clock; #line 2404 "/home/jens/Source/shotwell/src/Page.vala" - if (!_tmp99_) { + if (!transition_clock_is_in_progress (_tmp89_)) { #line 2405 "/home/jens/Source/shotwell/src/Page.vala" single_photo_page_repaint_pixmap (self); -#line 14819 "Page.c" +#line 15354 "Page.c" } } -static void single_photo_page_init_pixmap (SinglePhotoPage* self, gint width, gint height) { +static void +single_photo_page_init_pixmap (SinglePhotoPage* self, + gint width, + gint height) +{ GdkPixbuf* _tmp0_; GtkDrawingArea* _tmp1_; GdkWindow* _tmp2_; - gint _tmp3_; - gint _tmp4_; - cairo_surface_t* _tmp5_; - gint _tmp6_; - gint _tmp7_; - cairo_surface_t* _tmp8_; + cairo_surface_t* _tmp3_; + cairo_surface_t* _tmp4_; + cairo_t* _tmp5_; + cairo_surface_t* _tmp6_; + cairo_t* _tmp7_; + cairo_t* _tmp8_; cairo_t* _tmp9_; - cairo_surface_t* _tmp10_; - cairo_t* _tmp11_; - cairo_t* _tmp12_; - cairo_t* _tmp13_; - Dimensions _tmp14_; + Dimensions _tmp10_; #line 2408 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2409 "/home/jens/Source/shotwell/src/Page.vala" @@ -14849,62 +15384,55 @@ static void single_photo_page_init_pixmap (SinglePhotoPage* self, gint width, gi #line 2410 "/home/jens/Source/shotwell/src/Page.vala" _vala_assert (_tmp2_ != NULL, "canvas.get_window() != null"); #line 2413 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = width; -#line 2413 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = height; -#line 2413 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp3_, _tmp4_); + _tmp3_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height); #line 2413 "/home/jens/Source/shotwell/src/Page.vala" _cairo_surface_destroy0 (self->priv->pixmap); #line 2413 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->pixmap = _tmp5_; -#line 2414 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = width; + self->priv->pixmap = _tmp3_; #line 2414 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = height; -#line 2414 "/home/jens/Source/shotwell/src/Page.vala" - dimensions_init (&self->priv->pixmap_dim, _tmp6_, _tmp7_); + dimensions_init (&self->priv->pixmap_dim, width, height); #line 2417 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = self->priv->pixmap; + _tmp4_ = self->priv->pixmap; #line 2417 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = cairo_create (_tmp8_); + _tmp5_ = cairo_create (_tmp4_); #line 2417 "/home/jens/Source/shotwell/src/Page.vala" _cairo_destroy0 (self->priv->pixmap_ctx); #line 2417 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->pixmap_ctx = _tmp9_; + self->priv->pixmap_ctx = _tmp5_; #line 2420 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->scaled); #line 2420 "/home/jens/Source/shotwell/src/Page.vala" self->priv->scaled = NULL; #line 2423 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = self->priv->pixmap; + _tmp6_ = self->priv->pixmap; #line 2423 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = cairo_create (_tmp10_); + _tmp7_ = cairo_create (_tmp6_); #line 2423 "/home/jens/Source/shotwell/src/Page.vala" _cairo_destroy0 (self->priv->text_ctx); #line 2423 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->text_ctx = _tmp11_; + self->priv->text_ctx = _tmp7_; #line 2424 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = self->priv->text_ctx; + _tmp8_ = self->priv->text_ctx; #line 2424 "/home/jens/Source/shotwell/src/Page.vala" - set_source_color_from_string (_tmp12_, "#fff"); + set_source_color_from_string (_tmp8_, "#fff"); #line 2429 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = self->priv->pixmap_ctx; + _tmp9_ = self->priv->pixmap_ctx; #line 2429 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = self->priv->pixmap_dim; + _tmp10_ = self->priv->pixmap_dim; #line 2429 "/home/jens/Source/shotwell/src/Page.vala" - single_photo_page_new_surface (self, _tmp13_, &_tmp14_); -#line 14898 "Page.c" + single_photo_page_new_surface (self, _tmp9_, &_tmp10_); +#line 15425 "Page.c" } -static gboolean single_photo_page_real_on_context_keypress (Page* base) { +static gboolean +single_photo_page_real_on_context_keypress (Page* base) +{ SinglePhotoPage * self; gboolean result = FALSE; GtkMenu* _tmp0_; GtkMenu* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; #line 2432 "/home/jens/Source/shotwell/src/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage); #line 2433 "/home/jens/Source/shotwell/src/Page.vala" @@ -14913,216 +15441,210 @@ static gboolean single_photo_page_real_on_context_keypress (Page* base) { _tmp1_ = _tmp0_; #line 2433 "/home/jens/Source/shotwell/src/Page.vala" _tmp2_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL); -#line 2433 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = _tmp2_; #line 2433 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (_tmp1_); #line 2433 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp3_; + result = _tmp2_; #line 2433 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 14925 "Page.c" +#line 15451 "Page.c" } -static void single_photo_page_real_on_previous_photo (SinglePhotoPage* self) { +static void +single_photo_page_real_on_previous_photo (SinglePhotoPage* self) +{ } -void single_photo_page_on_previous_photo (SinglePhotoPage* self) { +void +single_photo_page_on_previous_photo (SinglePhotoPage* self) +{ #line 2436 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2436 "/home/jens/Source/shotwell/src/Page.vala" SINGLE_PHOTO_PAGE_GET_CLASS (self)->on_previous_photo (self); -#line 14938 "Page.c" +#line 15468 "Page.c" } -static void single_photo_page_real_on_next_photo (SinglePhotoPage* self) { +static void +single_photo_page_real_on_next_photo (SinglePhotoPage* self) +{ } -void single_photo_page_on_next_photo (SinglePhotoPage* self) { +void +single_photo_page_on_next_photo (SinglePhotoPage* self) +{ #line 2439 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2439 "/home/jens/Source/shotwell/src/Page.vala" SINGLE_PHOTO_PAGE_GET_CLASS (self)->on_next_photo (self); -#line 14951 "Page.c" +#line 15485 "Page.c" } -static gboolean single_photo_page_real_key_press_event (GtkWidget* base, GdkEventKey* event) { +static gboolean +single_photo_page_real_key_press_event (GtkWidget* base, + GdkEventKey* event) +{ SinglePhotoPage * self; gboolean result = FALSE; gboolean nav_ok = FALSE; - GdkEventKey* _tmp0_; + guint32 _tmp0_; guint32 _tmp1_; - guint32 _tmp2_; gboolean handled = FALSE; - GdkEventKey* _tmp3_; - guint _tmp4_; - const gchar* _tmp5_; - const gchar* _tmp6_; - GQuark _tmp8_ = 0U; + guint _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + GQuark _tmp6_ = 0U; #line 2449 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp7_label0 = 0; + static GQuark _tmp5_label0 = 0; #line 2449 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp7_label1 = 0; + static GQuark _tmp5_label1 = 0; #line 2449 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp7_label2 = 0; + static GQuark _tmp5_label2 = 0; #line 2449 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp7_label3 = 0; + static GQuark _tmp5_label3 = 0; #line 2449 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp7_label4 = 0; + static GQuark _tmp5_label4 = 0; #line 2449 "/home/jens/Source/shotwell/src/Page.vala" - static GQuark _tmp7_label5 = 0; -#line 14980 "Page.c" - gboolean _tmp15_; - gboolean _tmp16_ = FALSE; + static GQuark _tmp5_label5 = 0; +#line 15515 "Page.c" + gboolean _tmp11_; + gboolean _tmp12_ = FALSE; #line 2442 "/home/jens/Source/shotwell/src/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage); #line 2442 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (event != NULL, FALSE); #line 2446 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = event; + _tmp0_ = event->time; #line 2446 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = _tmp0_->time; + _tmp1_ = self->priv->last_nav_key; #line 2446 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = self->priv->last_nav_key; -#line 2446 "/home/jens/Source/shotwell/src/Page.vala" - nav_ok = (_tmp1_ - _tmp2_) > ((guint32) SINGLE_PHOTO_PAGE_KEY_REPEAT_INTERVAL_MSEC); + nav_ok = (_tmp0_ - _tmp1_) > ((guint32) SINGLE_PHOTO_PAGE_KEY_REPEAT_INTERVAL_MSEC); #line 2448 "/home/jens/Source/shotwell/src/Page.vala" handled = TRUE; #line 2449 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = event; -#line 2449 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = _tmp3_->keyval; + _tmp2_ = event->keyval; #line 2449 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = gdk_keyval_name (_tmp4_); + _tmp3_ = gdk_keyval_name (_tmp2_); #line 2449 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 2449 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = (NULL == _tmp6_) ? 0 : g_quark_from_string (_tmp6_); + _tmp6_ = (NULL == _tmp4_) ? 0 : g_quark_from_string (_tmp4_); #line 2449 "/home/jens/Source/shotwell/src/Page.vala" - if (((_tmp8_ == ((0 != _tmp7_label0) ? _tmp7_label0 : (_tmp7_label0 = g_quark_from_static_string ("Left")))) || (_tmp8_ == ((0 != _tmp7_label1) ? _tmp7_label1 : (_tmp7_label1 = g_quark_from_static_string ("KP_Left"))))) || (_tmp8_ == ((0 != _tmp7_label2) ? _tmp7_label2 : (_tmp7_label2 = g_quark_from_static_string ("BackSpace"))))) { + if (((_tmp6_ == ((0 != _tmp5_label0) ? _tmp5_label0 : (_tmp5_label0 = g_quark_from_static_string ("Left")))) || (_tmp6_ == ((0 != _tmp5_label1) ? _tmp5_label1 : (_tmp5_label1 = g_quark_from_static_string ("KP_Left"))))) || (_tmp6_ == ((0 != _tmp5_label2) ? _tmp5_label2 : (_tmp5_label2 = g_quark_from_static_string ("BackSpace"))))) { #line 2449 "/home/jens/Source/shotwell/src/Page.vala" switch (0) { -#line 15011 "Page.c" +#line 15542 "Page.c" default: { - gboolean _tmp9_; + gboolean _tmp7_; #line 2453 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = nav_ok; + _tmp7_ = nav_ok; #line 2453 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp9_) { -#line 15019 "Page.c" - GdkEventKey* _tmp10_; - guint32 _tmp11_; + if (_tmp7_) { +#line 15550 "Page.c" + guint32 _tmp8_; #line 2454 "/home/jens/Source/shotwell/src/Page.vala" single_photo_page_on_previous_photo (self); #line 2455 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = event; -#line 2455 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = _tmp10_->time; + _tmp8_ = event->time; #line 2455 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->last_nav_key = _tmp11_; -#line 15030 "Page.c" + self->priv->last_nav_key = _tmp8_; +#line 15558 "Page.c" } #line 2457 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 15034 "Page.c" +#line 15562 "Page.c" } } - } else if (((_tmp8_ == ((0 != _tmp7_label3) ? _tmp7_label3 : (_tmp7_label3 = g_quark_from_static_string ("Right")))) || (_tmp8_ == ((0 != _tmp7_label4) ? _tmp7_label4 : (_tmp7_label4 = g_quark_from_static_string ("KP_Right"))))) || (_tmp8_ == ((0 != _tmp7_label5) ? _tmp7_label5 : (_tmp7_label5 = g_quark_from_static_string ("space"))))) { + } else if (((_tmp6_ == ((0 != _tmp5_label3) ? _tmp5_label3 : (_tmp5_label3 = g_quark_from_static_string ("Right")))) || (_tmp6_ == ((0 != _tmp5_label4) ? _tmp5_label4 : (_tmp5_label4 = g_quark_from_static_string ("KP_Right"))))) || (_tmp6_ == ((0 != _tmp5_label5) ? _tmp5_label5 : (_tmp5_label5 = g_quark_from_static_string ("space"))))) { #line 2449 "/home/jens/Source/shotwell/src/Page.vala" switch (0) { -#line 15040 "Page.c" +#line 15568 "Page.c" default: { - gboolean _tmp12_; + gboolean _tmp9_; #line 2462 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = nav_ok; + _tmp9_ = nav_ok; #line 2462 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp12_) { -#line 15048 "Page.c" - GdkEventKey* _tmp13_; - guint32 _tmp14_; + if (_tmp9_) { +#line 15576 "Page.c" + guint32 _tmp10_; #line 2463 "/home/jens/Source/shotwell/src/Page.vala" single_photo_page_on_next_photo (self); #line 2464 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = event; -#line 2464 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = _tmp13_->time; + _tmp10_ = event->time; #line 2464 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->last_nav_key = _tmp14_; -#line 15059 "Page.c" + self->priv->last_nav_key = _tmp10_; +#line 15584 "Page.c" } #line 2466 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 15063 "Page.c" +#line 15588 "Page.c" } } } else { #line 2449 "/home/jens/Source/shotwell/src/Page.vala" switch (0) { -#line 15069 "Page.c" +#line 15594 "Page.c" default: { #line 2469 "/home/jens/Source/shotwell/src/Page.vala" handled = FALSE; #line 2470 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 15076 "Page.c" +#line 15601 "Page.c" } } } #line 2473 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = handled; + _tmp11_ = handled; #line 2473 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp15_) { + if (_tmp11_) { #line 2474 "/home/jens/Source/shotwell/src/Page.vala" result = TRUE; #line 2474 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 15088 "Page.c" +#line 15613 "Page.c" } #line 2476 "/home/jens/Source/shotwell/src/Page.vala" if (GTK_WIDGET_CLASS (single_photo_page_parent_class)->key_press_event != NULL) { -#line 15092 "Page.c" - GdkEventKey* _tmp17_; - gboolean _tmp18_; -#line 2476 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = event; -#line 2476 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = GTK_WIDGET_CLASS (single_photo_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), gtk_widget_get_type (), GtkWidget), _tmp17_); #line 2476 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = _tmp18_; -#line 15101 "Page.c" + _tmp12_ = GTK_WIDGET_CLASS (single_photo_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), gtk_widget_get_type (), GtkWidget), event); +#line 15619 "Page.c" } else { #line 2476 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = TRUE; -#line 15105 "Page.c" + _tmp12_ = TRUE; +#line 15623 "Page.c" } #line 2476 "/home/jens/Source/shotwell/src/Page.vala" - result = _tmp16_; + result = _tmp12_; #line 2476 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 15111 "Page.c" +#line 15629 "Page.c" } -static void single_photo_page_on_colors_changed (SinglePhotoPage* self) { +static void +single_photo_page_on_colors_changed (SinglePhotoPage* self) +{ #line 2479 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self)); #line 2480 "/home/jens/Source/shotwell/src/Page.vala" invalidate_transparent_background (); #line 2481 "/home/jens/Source/shotwell/src/Page.vala" single_photo_page_repaint (self, NULL); -#line 15122 "Page.c" +#line 15642 "Page.c" } -static void single_photo_page_class_init (SinglePhotoPageClass * klass) { +static void +single_photo_page_class_init (SinglePhotoPageClass * klass) +{ #line 1963 "/home/jens/Source/shotwell/src/Page.vala" single_photo_page_parent_class = g_type_class_peek_parent (klass); #line 1963 "/home/jens/Source/shotwell/src/Page.vala" @@ -15159,11 +15681,13 @@ static void single_photo_page_class_init (SinglePhotoPageClass * klass) { ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) single_photo_page_real_key_press_event; #line 1963 "/home/jens/Source/shotwell/src/Page.vala" G_OBJECT_CLASS (klass)->finalize = single_photo_page_finalize; -#line 15163 "Page.c" +#line 15685 "Page.c" } -static void single_photo_page_instance_init (SinglePhotoPage * self) { +static void +single_photo_page_instance_init (SinglePhotoPage * self) +{ GtkDrawingArea* _tmp0_; GtkViewport* _tmp1_; #line 1963 "/home/jens/Source/shotwell/src/Page.vala" @@ -15206,11 +15730,13 @@ static void single_photo_page_instance_init (SinglePhotoPage * self) { self->priv->has_saved_zoom_state = FALSE; #line 1993 "/home/jens/Source/shotwell/src/Page.vala" self->priv->last_nav_key = (guint32) 0; -#line 15210 "Page.c" +#line 15734 "Page.c" } -static void single_photo_page_finalize (GObject * obj) { +static void +single_photo_page_finalize (GObject * obj) +{ SinglePhotoPage * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; @@ -15247,11 +15773,13 @@ static void single_photo_page_finalize (GObject * obj) { _g_object_unref0 (self->priv->old_scaled); #line 1963 "/home/jens/Source/shotwell/src/Page.vala" G_OBJECT_CLASS (single_photo_page_parent_class)->finalize (obj); -#line 15251 "Page.c" +#line 15777 "Page.c" } -GType single_photo_page_get_type (void) { +GType +single_photo_page_get_type (void) +{ static volatile gsize single_photo_page_type_id__volatile = 0; if (g_once_init_enter (&single_photo_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SinglePhotoPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) single_photo_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SinglePhotoPage), 0, (GInstanceInitFunc) single_photo_page_instance_init, NULL }; @@ -15263,37 +15791,59 @@ GType single_photo_page_get_type (void) { } -static void _drag_and_drop_handler_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self) { +static void +_drag_and_drop_handler_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, + GdkDragContext* context, + gpointer self) +{ #line 2540 "/home/jens/Source/shotwell/src/Page.vala" drag_and_drop_handler_on_drag_begin ((DragAndDropHandler*) self, context); -#line 15270 "Page.c" +#line 15802 "Page.c" } -static void _drag_and_drop_handler_on_drag_data_get_gtk_widget_drag_data_get (GtkWidget* _sender, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint time_, gpointer self) { +static void +_drag_and_drop_handler_on_drag_data_get_gtk_widget_drag_data_get (GtkWidget* _sender, + GdkDragContext* context, + GtkSelectionData* selection_data, + guint info, + guint time_, + gpointer self) +{ #line 2541 "/home/jens/Source/shotwell/src/Page.vala" drag_and_drop_handler_on_drag_data_get ((DragAndDropHandler*) self, context, selection_data, info, time_); -#line 15277 "Page.c" +#line 15816 "Page.c" } -static void _drag_and_drop_handler_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) { +static void +_drag_and_drop_handler_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, + GdkDragContext* context, + gpointer self) +{ #line 2542 "/home/jens/Source/shotwell/src/Page.vala" drag_and_drop_handler_on_drag_end ((DragAndDropHandler*) self); -#line 15284 "Page.c" +#line 15827 "Page.c" } -static gboolean _drag_and_drop_handler_on_drag_failed_gtk_widget_drag_failed (GtkWidget* _sender, GdkDragContext* context, GtkDragResult _result_, gpointer self) { +static gboolean +_drag_and_drop_handler_on_drag_failed_gtk_widget_drag_failed (GtkWidget* _sender, + GdkDragContext* context, + GtkDragResult _result_, + gpointer self) +{ gboolean result; result = drag_and_drop_handler_on_drag_failed ((DragAndDropHandler*) self, context, _result_); #line 2543 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 15293 "Page.c" +#line 15841 "Page.c" } -static GType drag_and_drop_handler_target_type_get_type (void) { +static GType +drag_and_drop_handler_target_type_get_type (void) +{ static volatile gsize drag_and_drop_handler_target_type_type_id__volatile = 0; if (g_once_init_enter (&drag_and_drop_handler_target_type_type_id__volatile)) { static const GEnumValue values[] = {{DRAG_AND_DROP_HANDLER_TARGET_TYPE_XDS, "DRAG_AND_DROP_HANDLER_TARGET_TYPE_XDS", "xds"}, {DRAG_AND_DROP_HANDLER_TARGET_TYPE_MEDIA_LIST, "DRAG_AND_DROP_HANDLER_TARGET_TYPE_MEDIA_LIST", "media-list"}, {0, NULL, NULL}}; @@ -15305,7 +15855,9 @@ static GType drag_and_drop_handler_target_type_get_type (void) { } -static GdkAtom* _gdk_atom_dup (GdkAtom* self) { +static GdkAtom* +_gdk_atom_dup (GdkAtom* self) +{ GdkAtom* dup; #line 2518 "/home/jens/Source/shotwell/src/Page.vala" dup = g_new0 (GdkAtom, 1); @@ -15313,149 +15865,150 @@ static GdkAtom* _gdk_atom_dup (GdkAtom* self) { memcpy (dup, self, sizeof (GdkAtom)); #line 2518 "/home/jens/Source/shotwell/src/Page.vala" return dup; -#line 15317 "Page.c" +#line 15869 "Page.c" } -static gpointer __gdk_atom_dup0 (gpointer self) { +static gpointer +__gdk_atom_dup0 (gpointer self) +{ #line 2518 "/home/jens/Source/shotwell/src/Page.vala" return self ? _gdk_atom_dup (self) : NULL; -#line 15324 "Page.c" +#line 15878 "Page.c" } -DragAndDropHandler* drag_and_drop_handler_construct (GType object_type, Page* page) { +DragAndDropHandler* +drag_and_drop_handler_construct (GType object_type, + Page* page) +{ DragAndDropHandler* self = NULL; - Page* _tmp0_; - Page* _tmp1_; + GtkWidget* _tmp0_; + GtkWidget* _tmp1_; GtkWidget* _tmp2_; - GtkWidget* _tmp3_; - GtkWidget* _tmp4_; - gboolean _tmp5_; + GdkAtom* _tmp3_; GdkAtom* _tmp6_; - GdkAtom* _tmp9_; - guint8* _tmp12_; - gint _tmp12__length1; + guint8* _tmp9_; + gint _tmp9__length1; + GtkWidget* _tmp12_; + GtkWidget* _tmp13_; + GtkWidget* _tmp14_; GtkWidget* _tmp15_; GtkWidget* _tmp16_; - GtkWidget* _tmp17_; - GtkWidget* _tmp18_; - GtkWidget* _tmp19_; #line 2510 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_PAGE (page), NULL); #line 2510 "/home/jens/Source/shotwell/src/Page.vala" self = (DragAndDropHandler*) g_type_create_instance (object_type); #line 2511 "/home/jens/Source/shotwell/src/Page.vala" - _tmp0_ = page; -#line 2511 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->page = _tmp0_; + self->priv->page = page; #line 2512 "/home/jens/Source/shotwell/src/Page.vala" - _tmp1_ = page; -#line 2512 "/home/jens/Source/shotwell/src/Page.vala" - _tmp2_ = page_get_event_source (_tmp1_); + _tmp0_ = page_get_event_source (page); #line 2512 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->event_source); #line 2512 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->event_source = _tmp2_; + self->priv->event_source = _tmp0_; #line 2513 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = self->priv->event_source; + _tmp1_ = self->priv->event_source; #line 2513 "/home/jens/Source/shotwell/src/Page.vala" - _vala_assert (_tmp3_ != NULL, "event_source != null"); -#line 2514 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = self->priv->event_source; + _vala_assert (_tmp1_ != NULL, "event_source != null"); #line 2514 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = gtk_widget_get_has_window (_tmp4_); + _tmp2_ = self->priv->event_source; #line 2514 "/home/jens/Source/shotwell/src/Page.vala" - _vala_assert (_tmp5_, "event_source.get_has_window()"); + _vala_assert (gtk_widget_get_has_window (_tmp2_), "event_source.get_has_window()"); #line 2517 "/home/jens/Source/shotwell/src/Page.vala" - _tmp6_ = drag_and_drop_handler_XDS_ATOM; + _tmp3_ = drag_and_drop_handler_XDS_ATOM; #line 2517 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp6_ == NULL) { -#line 15375 "Page.c" - GdkAtom _tmp7_; - GdkAtom* _tmp8_; + if (_tmp3_ == NULL) { +#line 15923 "Page.c" + GdkAtom _tmp4_; + GdkAtom* _tmp5_; #line 2518 "/home/jens/Source/shotwell/src/Page.vala" - _tmp7_ = gdk_atom_intern_static_string ("XdndDirectSave0"); + _tmp4_ = gdk_atom_intern_static_string ("XdndDirectSave0"); #line 2518 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = __gdk_atom_dup0 (&_tmp7_); + _tmp5_ = __gdk_atom_dup0 (&_tmp4_); #line 2518 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (drag_and_drop_handler_XDS_ATOM); #line 2518 "/home/jens/Source/shotwell/src/Page.vala" - drag_and_drop_handler_XDS_ATOM = _tmp8_; -#line 15386 "Page.c" + drag_and_drop_handler_XDS_ATOM = _tmp5_; +#line 15934 "Page.c" } #line 2520 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = drag_and_drop_handler_TEXT_ATOM; + _tmp6_ = drag_and_drop_handler_TEXT_ATOM; #line 2520 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp9_ == NULL) { -#line 15392 "Page.c" - GdkAtom _tmp10_; - GdkAtom* _tmp11_; + if (_tmp6_ == NULL) { +#line 15940 "Page.c" + GdkAtom _tmp7_; + GdkAtom* _tmp8_; #line 2521 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = gdk_atom_intern_static_string ("text/plain"); + _tmp7_ = gdk_atom_intern_static_string ("text/plain"); #line 2521 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = __gdk_atom_dup0 (&_tmp10_); + _tmp8_ = __gdk_atom_dup0 (&_tmp7_); #line 2521 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (drag_and_drop_handler_TEXT_ATOM); #line 2521 "/home/jens/Source/shotwell/src/Page.vala" - drag_and_drop_handler_TEXT_ATOM = _tmp11_; -#line 15403 "Page.c" + drag_and_drop_handler_TEXT_ATOM = _tmp8_; +#line 15951 "Page.c" } #line 2523 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = drag_and_drop_handler_XDS_FAKE_TARGET; + _tmp9_ = drag_and_drop_handler_XDS_FAKE_TARGET; #line 2523 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12__length1 = drag_and_drop_handler_XDS_FAKE_TARGET_length1; + _tmp9__length1 = drag_and_drop_handler_XDS_FAKE_TARGET_length1; #line 2523 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp12_ == NULL) { -#line 15411 "Page.c" - gint _tmp13_; - guchar* _tmp14_; + if (_tmp9_ == NULL) { +#line 15959 "Page.c" + gint _tmp10_; + guchar* _tmp11_; #line 2524 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = string_to_uchar_array ("shotwell.txt", &_tmp13_); + _tmp11_ = string_to_uchar_array ("shotwell.txt", &_tmp10_); #line 2524 "/home/jens/Source/shotwell/src/Page.vala" drag_and_drop_handler_XDS_FAKE_TARGET = (g_free (drag_and_drop_handler_XDS_FAKE_TARGET), NULL); #line 2524 "/home/jens/Source/shotwell/src/Page.vala" - drag_and_drop_handler_XDS_FAKE_TARGET = _tmp14_; + drag_and_drop_handler_XDS_FAKE_TARGET = _tmp11_; #line 2524 "/home/jens/Source/shotwell/src/Page.vala" - drag_and_drop_handler_XDS_FAKE_TARGET_length1 = _tmp13_; + drag_and_drop_handler_XDS_FAKE_TARGET_length1 = _tmp10_; #line 2524 "/home/jens/Source/shotwell/src/Page.vala" _drag_and_drop_handler_XDS_FAKE_TARGET_size_ = drag_and_drop_handler_XDS_FAKE_TARGET_length1; -#line 15424 "Page.c" +#line 15972 "Page.c" } #line 2527 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = self->priv->event_source; + _tmp12_ = self->priv->event_source; #line 2527 "/home/jens/Source/shotwell/src/Page.vala" - gtk_drag_source_set (_tmp15_, GDK_BUTTON1_MASK, DRAG_AND_DROP_HANDLER_SOURCE_TARGET_ENTRIES, G_N_ELEMENTS (DRAG_AND_DROP_HANDLER_SOURCE_TARGET_ENTRIES), GDK_ACTION_COPY); + gtk_drag_source_set (_tmp12_, GDK_BUTTON1_MASK, DRAG_AND_DROP_HANDLER_SOURCE_TARGET_ENTRIES, G_N_ELEMENTS (DRAG_AND_DROP_HANDLER_SOURCE_TARGET_ENTRIES), GDK_ACTION_COPY); #line 2532 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = self->priv->event_source; + _tmp13_ = self->priv->event_source; #line 2532 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect (_tmp16_, "drag-begin", (GCallback) _drag_and_drop_handler_on_drag_begin_gtk_widget_drag_begin, self); + g_signal_connect (_tmp13_, "drag-begin", (GCallback) _drag_and_drop_handler_on_drag_begin_gtk_widget_drag_begin, self); #line 2533 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = self->priv->event_source; + _tmp14_ = self->priv->event_source; #line 2533 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect (_tmp17_, "drag-data-get", (GCallback) _drag_and_drop_handler_on_drag_data_get_gtk_widget_drag_data_get, self); + g_signal_connect (_tmp14_, "drag-data-get", (GCallback) _drag_and_drop_handler_on_drag_data_get_gtk_widget_drag_data_get, self); #line 2534 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = self->priv->event_source; + _tmp15_ = self->priv->event_source; #line 2534 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect (_tmp18_, "drag-end", (GCallback) _drag_and_drop_handler_on_drag_end_gtk_widget_drag_end, self); + g_signal_connect (_tmp15_, "drag-end", (GCallback) _drag_and_drop_handler_on_drag_end_gtk_widget_drag_end, self); #line 2535 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = self->priv->event_source; + _tmp16_ = self->priv->event_source; #line 2535 "/home/jens/Source/shotwell/src/Page.vala" - g_signal_connect (_tmp19_, "drag-failed", (GCallback) _drag_and_drop_handler_on_drag_failed_gtk_widget_drag_failed, self); + g_signal_connect (_tmp16_, "drag-failed", (GCallback) _drag_and_drop_handler_on_drag_failed_gtk_widget_drag_failed, self); #line 2510 "/home/jens/Source/shotwell/src/Page.vala" return self; -#line 15448 "Page.c" +#line 15996 "Page.c" } -DragAndDropHandler* drag_and_drop_handler_new (Page* page) { +DragAndDropHandler* +drag_and_drop_handler_new (Page* page) +{ #line 2510 "/home/jens/Source/shotwell/src/Page.vala" return drag_and_drop_handler_construct (TYPE_DRAG_AND_DROP_HANDLER, page); -#line 15455 "Page.c" +#line 16005 "Page.c" } -static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDragContext* context) { +static void +drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, + GdkDragContext* context) +{ Page* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; @@ -15463,19 +16016,18 @@ static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDr gboolean _tmp4_ = FALSE; Page* _tmp5_; ThumbnailSource* thumb = NULL; - Page* _tmp11_; + Page* _tmp10_; + ViewCollection* _tmp11_; ViewCollection* _tmp12_; - ViewCollection* _tmp13_; + DataView* _tmp13_; DataView* _tmp14_; - DataView* _tmp15_; - DataSource* _tmp16_; - ThumbnailSource* _tmp17_; - GdkDragContext* _tmp27_; - GdkWindow* _tmp28_; - GdkAtom* _tmp29_; - GdkAtom* _tmp30_; - guint8* _tmp31_; - gint _tmp31__length1; + DataSource* _tmp15_; + ThumbnailSource* _tmp16_; + GdkWindow* _tmp26_; + GdkAtom* _tmp27_; + GdkAtom* _tmp28_; + guint8* _tmp29_; + gint _tmp29__length1; GError * _inner_error_ = NULL; #line 2550 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self)); @@ -15497,12 +16049,11 @@ static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDr if (_tmp5_ == NULL) { #line 2553 "/home/jens/Source/shotwell/src/Page.vala" _tmp4_ = TRUE; -#line 15501 "Page.c" +#line 16053 "Page.c" } else { Page* _tmp6_; ViewCollection* _tmp7_; ViewCollection* _tmp8_; - gint _tmp9_; #line 2553 "/home/jens/Source/shotwell/src/Page.vala" _tmp6_ = self->priv->page; #line 2553 "/home/jens/Source/shotwell/src/Page.vala" @@ -15510,114 +16061,112 @@ static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDr #line 2553 "/home/jens/Source/shotwell/src/Page.vala" _tmp8_ = _tmp7_; #line 2553 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = view_collection_get_selected_count (_tmp8_); -#line 2553 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = _tmp9_ == 0; + _tmp4_ = view_collection_get_selected_count (_tmp8_) == 0; #line 2553 "/home/jens/Source/shotwell/src/Page.vala" _data_collection_unref0 (_tmp8_); -#line 15519 "Page.c" +#line 16068 "Page.c" } #line 2553 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp4_) { #line 2553 "/home/jens/Source/shotwell/src/Page.vala" _tmp3_ = TRUE; -#line 15525 "Page.c" +#line 16074 "Page.c" } else { - ExporterUI* _tmp10_; + ExporterUI* _tmp9_; #line 2553 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = self->priv->exporter; + _tmp9_ = self->priv->exporter; #line 2553 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = _tmp10_ != NULL; -#line 15532 "Page.c" + _tmp3_ = _tmp9_ != NULL; +#line 16081 "Page.c" } #line 2553 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp3_) { #line 2554 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 15538 "Page.c" +#line 16087 "Page.c" } #line 2556 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->drag_destination); #line 2556 "/home/jens/Source/shotwell/src/Page.vala" self->priv->drag_destination = NULL; #line 2559 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = self->priv->page; + _tmp10_ = self->priv->page; #line 2559 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = page_get_view (_tmp11_); + _tmp11_ = page_get_view (_tmp10_); #line 2559 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 2559 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = view_collection_get_selected_at (_tmp13_, 0); + _tmp13_ = view_collection_get_selected_at (_tmp12_, 0); #line 2559 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 2559 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = data_view_get_source (_tmp15_); + _tmp15_ = data_view_get_source (_tmp14_); #line 2559 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource); + _tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource); #line 2559 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp14_); #line 2559 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp13_); + _data_collection_unref0 (_tmp12_); #line 2559 "/home/jens/Source/shotwell/src/Page.vala" - thumb = _tmp17_; -#line 15564 "Page.c" + thumb = _tmp16_; +#line 16113 "Page.c" { GdkPixbuf* icon = NULL; - ThumbnailSource* _tmp18_; - GdkPixbuf* _tmp19_; - GtkWidget* _tmp20_; - GdkPixbuf* _tmp21_; + ThumbnailSource* _tmp17_; + GdkPixbuf* _tmp18_; + GtkWidget* _tmp19_; + GdkPixbuf* _tmp20_; #line 2562 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = thumb; + _tmp17_ = thumb; #line 2562 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = thumbnail_source_get_thumbnail (_tmp18_, APP_WINDOW_DND_ICON_SCALE, &_inner_error_); + _tmp18_ = thumbnail_source_get_thumbnail (_tmp17_, APP_WINDOW_DND_ICON_SCALE, &_inner_error_); #line 2562 "/home/jens/Source/shotwell/src/Page.vala" - icon = _tmp19_; + icon = _tmp18_; #line 2562 "/home/jens/Source/shotwell/src/Page.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 15579 "Page.c" +#line 16128 "Page.c" goto __catch267_g_error; } #line 2563 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = self->priv->event_source; + _tmp19_ = self->priv->event_source; #line 2563 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = icon; + _tmp20_ = icon; #line 2563 "/home/jens/Source/shotwell/src/Page.vala" - gtk_drag_source_set_icon_pixbuf (_tmp20_, _tmp21_); + gtk_drag_source_set_icon_pixbuf (_tmp19_, _tmp20_); #line 2561 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (icon); -#line 15590 "Page.c" +#line 16139 "Page.c" } goto __finally267; __catch267_g_error: { GError* err = NULL; - ThumbnailSource* _tmp22_; + ThumbnailSource* _tmp21_; + gchar* _tmp22_; gchar* _tmp23_; - gchar* _tmp24_; - GError* _tmp25_; - const gchar* _tmp26_; + GError* _tmp24_; + const gchar* _tmp25_; #line 2561 "/home/jens/Source/shotwell/src/Page.vala" err = _inner_error_; #line 2561 "/home/jens/Source/shotwell/src/Page.vala" _inner_error_ = NULL; #line 2565 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = thumb; + _tmp21_ = thumb; #line 2565 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject)); + _tmp22_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_OBJECT, DataObject)); #line 2565 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 2565 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = err; + _tmp24_ = err; #line 2565 "/home/jens/Source/shotwell/src/Page.vala" - _tmp26_ = _tmp25_->message; + _tmp25_ = _tmp24_->message; #line 2565 "/home/jens/Source/shotwell/src/Page.vala" - g_warning ("Page.vala:2565: Unable to fetch icon for drag-and-drop from %s: %s", _tmp24_, _tmp26_); + g_warning ("Page.vala:2565: Unable to fetch icon for drag-and-drop from %s: %s", _tmp23_, _tmp25_); #line 2565 "/home/jens/Source/shotwell/src/Page.vala" - _g_free0 (_tmp24_); + _g_free0 (_tmp23_); #line 2561 "/home/jens/Source/shotwell/src/Page.vala" _g_error_free0 (err); -#line 15621 "Page.c" +#line 16170 "Page.c" } __finally267: #line 2561 "/home/jens/Source/shotwell/src/Page.vala" @@ -15630,35 +16179,38 @@ static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDr g_clear_error (&_inner_error_); #line 2561 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 15634 "Page.c" +#line 16183 "Page.c" } #line 2571 "/home/jens/Source/shotwell/src/Page.vala" - _tmp27_ = context; + _tmp26_ = gdk_drag_context_get_source_window (context); #line 2571 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = gdk_drag_context_get_source_window (_tmp27_); + _tmp27_ = drag_and_drop_handler_XDS_ATOM; #line 2571 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = drag_and_drop_handler_XDS_ATOM; + _tmp28_ = drag_and_drop_handler_TEXT_ATOM; #line 2571 "/home/jens/Source/shotwell/src/Page.vala" - _tmp30_ = drag_and_drop_handler_TEXT_ATOM; + _tmp29_ = drag_and_drop_handler_XDS_FAKE_TARGET; #line 2571 "/home/jens/Source/shotwell/src/Page.vala" - _tmp31_ = drag_and_drop_handler_XDS_FAKE_TARGET; + _tmp29__length1 = drag_and_drop_handler_XDS_FAKE_TARGET_length1; #line 2571 "/home/jens/Source/shotwell/src/Page.vala" - _tmp31__length1 = drag_and_drop_handler_XDS_FAKE_TARGET_length1; -#line 2571 "/home/jens/Source/shotwell/src/Page.vala" - gdk_property_change (_tmp28_, *_tmp29_, *_tmp30_, 8, GDK_PROP_MODE_REPLACE, (const guchar*) _tmp31_, 1); + gdk_property_change (_tmp26_, *_tmp27_, *_tmp28_, 8, GDK_PROP_MODE_REPLACE, (const guchar*) _tmp29_, 1); #line 2550 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (thumb); -#line 15652 "Page.c" +#line 16199 "Page.c" } -static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, GdkDragContext* context, GtkSelectionData* selection_data, guint target_type, guint time) { +static void +drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, + GdkDragContext* context, + GtkSelectionData* selection_data, + guint target_type, + guint time) +{ Page* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gboolean _tmp3_ = FALSE; Page* _tmp4_; - guint _tmp9_; #line 2579 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self)); #line 2579 "/home/jens/Source/shotwell/src/Page.vala" @@ -15681,12 +16233,11 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd if (_tmp4_ == NULL) { #line 2583 "/home/jens/Source/shotwell/src/Page.vala" _tmp3_ = TRUE; -#line 15685 "Page.c" +#line 16237 "Page.c" } else { Page* _tmp5_; ViewCollection* _tmp6_; ViewCollection* _tmp7_; - gint _tmp8_; #line 2583 "/home/jens/Source/shotwell/src/Page.vala" _tmp5_ = self->priv->page; #line 2583 "/home/jens/Source/shotwell/src/Page.vala" @@ -15694,65 +16245,59 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd #line 2583 "/home/jens/Source/shotwell/src/Page.vala" _tmp7_ = _tmp6_; #line 2583 "/home/jens/Source/shotwell/src/Page.vala" - _tmp8_ = view_collection_get_selected_count (_tmp7_); -#line 2583 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = _tmp8_ == 0; + _tmp3_ = view_collection_get_selected_count (_tmp7_) == 0; #line 2583 "/home/jens/Source/shotwell/src/Page.vala" _data_collection_unref0 (_tmp7_); -#line 15703 "Page.c" +#line 16252 "Page.c" } #line 2583 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp3_) { #line 2584 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 15709 "Page.c" +#line 16258 "Page.c" } #line 2586 "/home/jens/Source/shotwell/src/Page.vala" - _tmp9_ = target_type; -#line 2586 "/home/jens/Source/shotwell/src/Page.vala" - switch (_tmp9_) { + switch (target_type) { #line 2586 "/home/jens/Source/shotwell/src/Page.vala" case DRAG_AND_DROP_HANDLER_TARGET_TYPE_XDS: -#line 15717 "Page.c" +#line 16264 "Page.c" { guchar* data = NULL; - guchar* _tmp10_; + guchar* _tmp8_; gint data_length1; gint _data_size_; GdkAtom actual_type = 0U; gint actual_format = 0; gboolean fetched = FALSE; - GdkDragContext* _tmp11_; - GdkWindow* _tmp12_; - GdkAtom* _tmp13_; - GdkAtom* _tmp14_; - guchar* _tmp15_; - gint _tmp15__length1; - GdkAtom _tmp16_ = 0U; - gint _tmp17_ = 0; - guint8* _tmp18_ = NULL; - gint _tmp19_; + GdkWindow* _tmp9_; + GdkAtom* _tmp10_; + GdkAtom* _tmp11_; + guchar* _tmp12_; + gint _tmp12__length1; + GdkAtom _tmp13_ = 0U; + gint _tmp14_ = 0; + guint8* _tmp15_ = NULL; + gint _tmp16_; + gboolean _tmp17_; + gboolean _tmp18_ = FALSE; + gboolean _tmp19_ = FALSE; gboolean _tmp20_; - gboolean _tmp21_ = FALSE; - gboolean _tmp22_ = FALSE; - gboolean _tmp23_; - gchar* _tmp32_ = NULL; - GFile* _tmp33_; - Page* _tmp37_; - gchar* _tmp38_; - gchar* _tmp39_; - const gchar* _tmp40_ = NULL; - GFile* _tmp41_; - GtkSelectionData* _tmp42_; - GdkAtom* _tmp43_; - gint _tmp44_; - guchar* _tmp45_; - guchar* _tmp46_; - gint _tmp46__length1; + gchar* _tmp29_ = NULL; + GFile* _tmp30_; + Page* _tmp34_; + gchar* _tmp35_; + gchar* _tmp36_; + const gchar* _tmp37_ = NULL; + GFile* _tmp38_; + GdkAtom* _tmp39_; + gint _tmp40_; + guchar* _tmp41_; + guchar* _tmp42_; + gint _tmp42__length1; #line 2589 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = g_new0 (guchar, 4096); + _tmp8_ = g_new0 (guchar, 4096); #line 2589 "/home/jens/Source/shotwell/src/Page.vala" - data = _tmp10_; + data = _tmp8_; #line 2589 "/home/jens/Source/shotwell/src/Page.vala" data_length1 = 4096; #line 2589 "/home/jens/Source/shotwell/src/Page.vala" @@ -15760,260 +16305,253 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd #line 2591 "/home/jens/Source/shotwell/src/Page.vala" actual_format = 0; #line 2592 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = context; -#line 2592 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = gdk_drag_context_get_source_window (_tmp11_); + _tmp9_ = gdk_drag_context_get_source_window (context); #line 2592 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = drag_and_drop_handler_XDS_ATOM; + _tmp10_ = drag_and_drop_handler_XDS_ATOM; #line 2592 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = drag_and_drop_handler_TEXT_ATOM; + _tmp11_ = drag_and_drop_handler_TEXT_ATOM; #line 2592 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = data; + _tmp12_ = data; #line 2592 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15__length1 = data_length1; + _tmp12__length1 = data_length1; #line 2592 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = gdk_property_get (_tmp12_, *_tmp13_, *_tmp14_, (gulong) 0, (gulong) _tmp15__length1, 0, &_tmp16_, &_tmp17_, &_tmp19_, &_tmp18_); + _tmp17_ = gdk_property_get (_tmp9_, *_tmp10_, *_tmp11_, (gulong) 0, (gulong) _tmp12__length1, 0, &_tmp13_, &_tmp14_, &_tmp16_, &_tmp15_); #line 2592 "/home/jens/Source/shotwell/src/Page.vala" - actual_type = _tmp16_; + actual_type = _tmp13_; #line 2592 "/home/jens/Source/shotwell/src/Page.vala" - actual_format = _tmp17_; + actual_format = _tmp14_; #line 2592 "/home/jens/Source/shotwell/src/Page.vala" data = (g_free (data), NULL); #line 2592 "/home/jens/Source/shotwell/src/Page.vala" - data = _tmp18_; + data = _tmp15_; #line 2592 "/home/jens/Source/shotwell/src/Page.vala" - data_length1 = _tmp19_; + data_length1 = _tmp16_; #line 2592 "/home/jens/Source/shotwell/src/Page.vala" _data_size_ = data_length1; #line 2592 "/home/jens/Source/shotwell/src/Page.vala" - fetched = _tmp20_; + fetched = _tmp17_; #line 2597 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = fetched; + _tmp20_ = fetched; #line 2597 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp23_) { -#line 15795 "Page.c" - guchar* _tmp24_; - gint _tmp24__length1; + if (_tmp20_) { +#line 16338 "Page.c" + guchar* _tmp21_; + gint _tmp21__length1; #line 2597 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = data; + _tmp21_ = data; #line 2597 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24__length1 = data_length1; + _tmp21__length1 = data_length1; #line 2597 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = _tmp24_ != NULL; -#line 15804 "Page.c" + _tmp19_ = _tmp21_ != NULL; +#line 16347 "Page.c" } else { #line 2597 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = FALSE; -#line 15808 "Page.c" + _tmp19_ = FALSE; +#line 16351 "Page.c" } #line 2597 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp22_) { -#line 15812 "Page.c" - guchar* _tmp25_; - gint _tmp25__length1; + if (_tmp19_) { +#line 16355 "Page.c" + guchar* _tmp22_; + gint _tmp22__length1; #line 2597 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = data; + _tmp22_ = data; #line 2597 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25__length1 = data_length1; + _tmp22__length1 = data_length1; #line 2597 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = _tmp25__length1 > 0; -#line 15821 "Page.c" + _tmp18_ = _tmp22__length1 > 0; +#line 16364 "Page.c" } else { #line 2597 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = FALSE; -#line 15825 "Page.c" + _tmp18_ = FALSE; +#line 16368 "Page.c" } #line 2597 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp21_) { -#line 15829 "Page.c" - guchar* _tmp26_; - gint _tmp26__length1; - gchar* _tmp27_; - gchar* _tmp28_; - GFile* _tmp29_; - GFile* _tmp30_; - GFile* _tmp31_; + if (_tmp18_) { +#line 16372 "Page.c" + guchar* _tmp23_; + gint _tmp23__length1; + gchar* _tmp24_; + gchar* _tmp25_; + GFile* _tmp26_; + GFile* _tmp27_; + GFile* _tmp28_; #line 2598 "/home/jens/Source/shotwell/src/Page.vala" - _tmp26_ = data; + _tmp23_ = data; #line 2598 "/home/jens/Source/shotwell/src/Page.vala" - _tmp26__length1 = data_length1; + _tmp23__length1 = data_length1; #line 2598 "/home/jens/Source/shotwell/src/Page.vala" - _tmp27_ = uchar_array_to_string (_tmp26_, _tmp26__length1, -1); + _tmp24_ = uchar_array_to_string (_tmp23_, _tmp23__length1, -1); #line 2598 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = _tmp27_; + _tmp25_ = _tmp24_; #line 2598 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = g_file_new_for_uri (_tmp28_); + _tmp26_ = g_file_new_for_uri (_tmp25_); #line 2598 "/home/jens/Source/shotwell/src/Page.vala" - _tmp30_ = _tmp29_; + _tmp27_ = _tmp26_; #line 2598 "/home/jens/Source/shotwell/src/Page.vala" - _tmp31_ = g_file_get_parent (_tmp30_); + _tmp28_ = g_file_get_parent (_tmp27_); #line 2598 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->drag_destination); #line 2598 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->drag_destination = _tmp31_; + self->priv->drag_destination = _tmp28_; #line 2598 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp30_); + _g_object_unref0 (_tmp27_); #line 2598 "/home/jens/Source/shotwell/src/Page.vala" - _g_free0 (_tmp28_); -#line 15859 "Page.c" + _g_free0 (_tmp25_); +#line 16402 "Page.c" } #line 2601 "/home/jens/Source/shotwell/src/Page.vala" - _tmp33_ = self->priv->drag_destination; + _tmp30_ = self->priv->drag_destination; #line 2601 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp33_ != NULL) { -#line 15865 "Page.c" - GFile* _tmp34_; - gchar* _tmp35_; + if (_tmp30_ != NULL) { +#line 16408 "Page.c" + GFile* _tmp31_; + gchar* _tmp32_; #line 2601 "/home/jens/Source/shotwell/src/Page.vala" - _tmp34_ = self->priv->drag_destination; + _tmp31_ = self->priv->drag_destination; #line 2601 "/home/jens/Source/shotwell/src/Page.vala" - _tmp35_ = g_file_get_path (_tmp34_); + _tmp32_ = g_file_get_path (_tmp31_); #line 2601 "/home/jens/Source/shotwell/src/Page.vala" - _g_free0 (_tmp32_); + _g_free0 (_tmp29_); #line 2601 "/home/jens/Source/shotwell/src/Page.vala" - _tmp32_ = _tmp35_; -#line 15876 "Page.c" + _tmp29_ = _tmp32_; +#line 16419 "Page.c" } else { - gchar* _tmp36_; + gchar* _tmp33_; #line 2601 "/home/jens/Source/shotwell/src/Page.vala" - _tmp36_ = g_strdup ("(no path)"); + _tmp33_ = g_strdup ("(no path)"); #line 2601 "/home/jens/Source/shotwell/src/Page.vala" - _g_free0 (_tmp32_); + _g_free0 (_tmp29_); #line 2601 "/home/jens/Source/shotwell/src/Page.vala" - _tmp32_ = _tmp36_; -#line 15885 "Page.c" + _tmp29_ = _tmp33_; +#line 16428 "Page.c" } #line 2600 "/home/jens/Source/shotwell/src/Page.vala" - _tmp37_ = self->priv->page; + _tmp34_ = self->priv->page; #line 2600 "/home/jens/Source/shotwell/src/Page.vala" - _tmp38_ = page_get_page_name (_tmp37_); + _tmp35_ = page_get_page_name (_tmp34_); #line 2600 "/home/jens/Source/shotwell/src/Page.vala" - _tmp39_ = _tmp38_; + _tmp36_ = _tmp35_; #line 2600 "/home/jens/Source/shotwell/src/Page.vala" - g_debug ("Page.vala:2600: on_drag_data_get (%s): %s", _tmp39_, _tmp32_); + g_debug ("Page.vala:2600: on_drag_data_get (%s): %s", _tmp36_, _tmp29_); #line 2600 "/home/jens/Source/shotwell/src/Page.vala" - _g_free0 (_tmp39_); + _g_free0 (_tmp36_); #line 2605 "/home/jens/Source/shotwell/src/Page.vala" - _tmp41_ = self->priv->drag_destination; + _tmp38_ = self->priv->drag_destination; #line 2605 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp41_ != NULL) { + if (_tmp38_ != NULL) { #line 2605 "/home/jens/Source/shotwell/src/Page.vala" - _tmp40_ = "S"; -#line 15903 "Page.c" + _tmp37_ = "S"; +#line 16446 "Page.c" } else { #line 2605 "/home/jens/Source/shotwell/src/Page.vala" - _tmp40_ = "E"; -#line 15907 "Page.c" + _tmp37_ = "E"; +#line 16450 "Page.c" } #line 2604 "/home/jens/Source/shotwell/src/Page.vala" - _tmp42_ = selection_data; -#line 2604 "/home/jens/Source/shotwell/src/Page.vala" - _tmp43_ = drag_and_drop_handler_XDS_ATOM; + _tmp39_ = drag_and_drop_handler_XDS_ATOM; #line 2604 "/home/jens/Source/shotwell/src/Page.vala" - _tmp45_ = string_to_uchar_array (_tmp40_, &_tmp44_); + _tmp41_ = string_to_uchar_array (_tmp37_, &_tmp40_); #line 2604 "/home/jens/Source/shotwell/src/Page.vala" - _tmp46_ = _tmp45_; + _tmp42_ = _tmp41_; #line 2604 "/home/jens/Source/shotwell/src/Page.vala" - _tmp46__length1 = _tmp44_; + _tmp42__length1 = _tmp40_; #line 2604 "/home/jens/Source/shotwell/src/Page.vala" - gtk_selection_data_set (_tmp42_, *_tmp43_, 8, _tmp46_, _tmp44_); + gtk_selection_data_set (selection_data, *_tmp39_, 8, _tmp42_, _tmp40_); #line 2604 "/home/jens/Source/shotwell/src/Page.vala" - _tmp46_ = (g_free (_tmp46_), NULL); + _tmp42_ = (g_free (_tmp42_), NULL); #line 2606 "/home/jens/Source/shotwell/src/Page.vala" - _g_free0 (_tmp32_); + _g_free0 (_tmp29_); #line 2606 "/home/jens/Source/shotwell/src/Page.vala" data = (g_free (data), NULL); #line 2606 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 15929 "Page.c" +#line 16470 "Page.c" } #line 2586 "/home/jens/Source/shotwell/src/Page.vala" case DRAG_AND_DROP_HANDLER_TARGET_TYPE_MEDIA_LIST: -#line 15933 "Page.c" +#line 16474 "Page.c" { GeeCollection* sources = NULL; - Page* _tmp47_; - ViewCollection* _tmp48_; - ViewCollection* _tmp49_; - GeeList* _tmp50_; - GeeCollection* _tmp51_; - GtkSelectionData* _tmp52_; - GdkAtom _tmp53_; - GeeCollection* _tmp54_; - gint _tmp55_; - guchar* _tmp56_; - guchar* _tmp57_; - gint _tmp57__length1; + Page* _tmp43_; + ViewCollection* _tmp44_; + ViewCollection* _tmp45_; + GeeList* _tmp46_; + GeeCollection* _tmp47_; + GeeCollection* _tmp48_; + gint _tmp49_; + guchar* _tmp50_; + guchar* _tmp51_; + gint _tmp51__length1; #line 2609 "/home/jens/Source/shotwell/src/Page.vala" - _tmp47_ = self->priv->page; + _tmp43_ = self->priv->page; #line 2609 "/home/jens/Source/shotwell/src/Page.vala" - _tmp48_ = page_get_view (_tmp47_); + _tmp44_ = page_get_view (_tmp43_); #line 2609 "/home/jens/Source/shotwell/src/Page.vala" - _tmp49_ = _tmp48_; + _tmp45_ = _tmp44_; #line 2609 "/home/jens/Source/shotwell/src/Page.vala" - _tmp50_ = view_collection_get_selected_sources (_tmp49_); + _tmp46_ = view_collection_get_selected_sources (_tmp45_); #line 2609 "/home/jens/Source/shotwell/src/Page.vala" - _tmp51_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp47_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_COLLECTION, GeeCollection); #line 2609 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp49_); + _data_collection_unref0 (_tmp45_); #line 2609 "/home/jens/Source/shotwell/src/Page.vala" - sources = _tmp51_; -#line 2614 "/home/jens/Source/shotwell/src/Page.vala" - _tmp52_ = selection_data; -#line 2614 "/home/jens/Source/shotwell/src/Page.vala" - _tmp53_ = gdk_atom_intern_static_string ("SourceIDAtom"); + sources = _tmp47_; #line 2614 "/home/jens/Source/shotwell/src/Page.vala" - _tmp54_ = sources; + _tmp48_ = sources; #line 2614 "/home/jens/Source/shotwell/src/Page.vala" - _tmp56_ = serialize_media_sources (_tmp54_, &_tmp55_); + _tmp50_ = serialize_media_sources (_tmp48_, &_tmp49_); #line 2614 "/home/jens/Source/shotwell/src/Page.vala" - _tmp57_ = _tmp56_; + _tmp51_ = _tmp50_; #line 2614 "/home/jens/Source/shotwell/src/Page.vala" - _tmp57__length1 = _tmp55_; + _tmp51__length1 = _tmp49_; #line 2614 "/home/jens/Source/shotwell/src/Page.vala" - gtk_selection_data_set (_tmp52_, _tmp53_, (gint) sizeof (GdkAtom), _tmp57_, _tmp55_); + gtk_selection_data_set (selection_data, gdk_atom_intern_static_string ("SourceIDAtom"), (gint) sizeof (GdkAtom), _tmp51_, _tmp49_); #line 2614 "/home/jens/Source/shotwell/src/Page.vala" - _tmp57_ = (g_free (_tmp57_), NULL); + _tmp51_ = (g_free (_tmp51_), NULL); #line 2616 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (sources); #line 2616 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 15982 "Page.c" +#line 16517 "Page.c" } default: { - Page* _tmp58_; - gchar* _tmp59_; - gchar* _tmp60_; - guint _tmp61_; + Page* _tmp52_; + gchar* _tmp53_; + gchar* _tmp54_; #line 2619 "/home/jens/Source/shotwell/src/Page.vala" - _tmp58_ = self->priv->page; + _tmp52_ = self->priv->page; #line 2619 "/home/jens/Source/shotwell/src/Page.vala" - _tmp59_ = page_get_page_name (_tmp58_); + _tmp53_ = page_get_page_name (_tmp52_); #line 2619 "/home/jens/Source/shotwell/src/Page.vala" - _tmp60_ = _tmp59_; + _tmp54_ = _tmp53_; #line 2619 "/home/jens/Source/shotwell/src/Page.vala" - _tmp61_ = target_type; + g_warning ("Page.vala:2619: on_drag_data_get (%s): unknown target type %u", _tmp54_, target_type); #line 2619 "/home/jens/Source/shotwell/src/Page.vala" - g_warning ("Page.vala:2619: on_drag_data_get (%s): unknown target type %u", _tmp60_, _tmp61_); -#line 2619 "/home/jens/Source/shotwell/src/Page.vala" - _g_free0 (_tmp60_); + _g_free0 (_tmp54_); #line 2621 "/home/jens/Source/shotwell/src/Page.vala" break; -#line 16004 "Page.c" +#line 16536 "Page.c" } } } -static void _drag_and_drop_handler_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) { +static void +_drag_and_drop_handler_on_export_completed_exporter_completion_callback (Exporter* exporter, + gboolean is_cancelled, + gpointer self) +{ #line 2642 "/home/jens/Source/shotwell/src/Page.vala" drag_and_drop_handler_on_export_completed ((DragAndDropHandler*) self); -#line 16013 "Page.c" +#line 16549 "Page.c" } -static void drag_and_drop_handler_on_drag_end (DragAndDropHandler* self) { +static void +drag_and_drop_handler_on_drag_end (DragAndDropHandler* self) +{ Page* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; @@ -16021,13 +16559,13 @@ static void drag_and_drop_handler_on_drag_end (DragAndDropHandler* self) { gboolean _tmp4_ = FALSE; gboolean _tmp5_ = FALSE; Page* _tmp6_; - GFile* _tmp13_; + GFile* _tmp12_; + gchar* _tmp13_; gchar* _tmp14_; - gchar* _tmp15_; - GFile* _tmp16_; + GFile* _tmp15_; + gchar* _tmp16_; gchar* _tmp17_; - gchar* _tmp18_; - gboolean _tmp19_; + gboolean _tmp18_; #line 2625 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self)); #line 2626 "/home/jens/Source/shotwell/src/Page.vala" @@ -16046,12 +16584,11 @@ static void drag_and_drop_handler_on_drag_end (DragAndDropHandler* self) { if (_tmp6_ == NULL) { #line 2628 "/home/jens/Source/shotwell/src/Page.vala" _tmp5_ = TRUE; -#line 16050 "Page.c" +#line 16588 "Page.c" } else { Page* _tmp7_; ViewCollection* _tmp8_; ViewCollection* _tmp9_; - gint _tmp10_; #line 2628 "/home/jens/Source/shotwell/src/Page.vala" _tmp7_ = self->priv->page; #line 2628 "/home/jens/Source/shotwell/src/Page.vala" @@ -16059,137 +16596,138 @@ static void drag_and_drop_handler_on_drag_end (DragAndDropHandler* self) { #line 2628 "/home/jens/Source/shotwell/src/Page.vala" _tmp9_ = _tmp8_; #line 2628 "/home/jens/Source/shotwell/src/Page.vala" - _tmp10_ = view_collection_get_selected_count (_tmp9_); -#line 2628 "/home/jens/Source/shotwell/src/Page.vala" - _tmp5_ = _tmp10_ == 0; + _tmp5_ = view_collection_get_selected_count (_tmp9_) == 0; #line 2628 "/home/jens/Source/shotwell/src/Page.vala" _data_collection_unref0 (_tmp9_); -#line 16068 "Page.c" +#line 16603 "Page.c" } #line 2628 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp5_) { #line 2628 "/home/jens/Source/shotwell/src/Page.vala" _tmp4_ = TRUE; -#line 16074 "Page.c" +#line 16609 "Page.c" } else { - GFile* _tmp11_; + GFile* _tmp10_; #line 2628 "/home/jens/Source/shotwell/src/Page.vala" - _tmp11_ = self->priv->drag_destination; + _tmp10_ = self->priv->drag_destination; #line 2628 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = _tmp11_ == NULL; -#line 16081 "Page.c" + _tmp4_ = _tmp10_ == NULL; +#line 16616 "Page.c" } #line 2628 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp4_) { #line 2628 "/home/jens/Source/shotwell/src/Page.vala" _tmp3_ = TRUE; -#line 16087 "Page.c" +#line 16622 "Page.c" } else { - ExporterUI* _tmp12_; + ExporterUI* _tmp11_; #line 2629 "/home/jens/Source/shotwell/src/Page.vala" - _tmp12_ = self->priv->exporter; + _tmp11_ = self->priv->exporter; #line 2629 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = _tmp12_ != NULL; -#line 16094 "Page.c" + _tmp3_ = _tmp11_ != NULL; +#line 16629 "Page.c" } #line 2628 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp3_) { #line 2630 "/home/jens/Source/shotwell/src/Page.vala" return; -#line 16100 "Page.c" +#line 16635 "Page.c" } #line 2633 "/home/jens/Source/shotwell/src/Page.vala" - _tmp13_ = self->priv->drag_destination; + _tmp12_ = self->priv->drag_destination; #line 2633 "/home/jens/Source/shotwell/src/Page.vala" - _tmp14_ = g_file_get_path (_tmp13_); + _tmp13_ = g_file_get_path (_tmp12_); #line 2633 "/home/jens/Source/shotwell/src/Page.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 2633 "/home/jens/Source/shotwell/src/Page.vala" - g_debug ("Page.vala:2633: Exporting to %s", _tmp15_); + g_debug ("Page.vala:2633: Exporting to %s", _tmp14_); #line 2633 "/home/jens/Source/shotwell/src/Page.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp14_); #line 2638 "/home/jens/Source/shotwell/src/Page.vala" - _tmp16_ = self->priv->drag_destination; + _tmp15_ = self->priv->drag_destination; #line 2638 "/home/jens/Source/shotwell/src/Page.vala" - _tmp17_ = g_file_get_path (_tmp16_); + _tmp16_ = g_file_get_path (_tmp15_); #line 2638 "/home/jens/Source/shotwell/src/Page.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 2638 "/home/jens/Source/shotwell/src/Page.vala" - _tmp19_ = _tmp18_ != NULL; + _tmp18_ = _tmp17_ != NULL; #line 2638 "/home/jens/Source/shotwell/src/Page.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp17_); #line 2638 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp19_) { -#line 16124 "Page.c" - Page* _tmp20_; + if (_tmp18_) { +#line 16659 "Page.c" + Page* _tmp19_; + ViewCollection* _tmp20_; ViewCollection* _tmp21_; - ViewCollection* _tmp22_; - GeeList* _tmp23_; - GeeCollection* _tmp24_; - GFile* _tmp25_; - Scaling _tmp26_ = {0}; - ExportFormatParameters _tmp27_ = {0}; + GeeList* _tmp22_; + GeeCollection* _tmp23_; + GFile* _tmp24_; + Scaling _tmp25_ = {0}; + ExportFormatParameters _tmp26_ = {0}; + Exporter* _tmp27_; Exporter* _tmp28_; - Exporter* _tmp29_; + ExporterUI* _tmp29_; ExporterUI* _tmp30_; - ExporterUI* _tmp31_; #line 2639 "/home/jens/Source/shotwell/src/Page.vala" - _tmp20_ = self->priv->page; + _tmp19_ = self->priv->page; #line 2639 "/home/jens/Source/shotwell/src/Page.vala" - _tmp21_ = page_get_view (_tmp20_); + _tmp20_ = page_get_view (_tmp19_); #line 2639 "/home/jens/Source/shotwell/src/Page.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 2639 "/home/jens/Source/shotwell/src/Page.vala" - _tmp23_ = view_collection_get_selected_sources (_tmp22_); + _tmp22_ = view_collection_get_selected_sources (_tmp21_); #line 2639 "/home/jens/Source/shotwell/src/Page.vala" - _tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection); #line 2639 "/home/jens/Source/shotwell/src/Page.vala" - _tmp25_ = self->priv->drag_destination; + _tmp24_ = self->priv->drag_destination; #line 2639 "/home/jens/Source/shotwell/src/Page.vala" - scaling_for_original (&_tmp26_); + scaling_for_original (&_tmp25_); #line 2639 "/home/jens/Source/shotwell/src/Page.vala" - export_format_parameters_current (&_tmp27_); + export_format_parameters_current (&_tmp26_); #line 2639 "/home/jens/Source/shotwell/src/Page.vala" - _tmp28_ = exporter_new (_tmp24_, _tmp25_, &_tmp26_, &_tmp27_, FALSE); + _tmp27_ = exporter_new (_tmp23_, _tmp24_, &_tmp25_, &_tmp26_, FALSE); #line 2639 "/home/jens/Source/shotwell/src/Page.vala" - _tmp29_ = _tmp28_; + _tmp28_ = _tmp27_; #line 2639 "/home/jens/Source/shotwell/src/Page.vala" - _tmp30_ = exporter_ui_new (_tmp29_); + _tmp29_ = exporter_ui_new (_tmp28_); #line 2639 "/home/jens/Source/shotwell/src/Page.vala" _exporter_ui_unref0 (self->priv->exporter); #line 2639 "/home/jens/Source/shotwell/src/Page.vala" - self->priv->exporter = _tmp30_; + self->priv->exporter = _tmp29_; #line 2639 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp29_); + _g_object_unref0 (_tmp28_); #line 2639 "/home/jens/Source/shotwell/src/Page.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp23_); #line 2639 "/home/jens/Source/shotwell/src/Page.vala" - _data_collection_unref0 (_tmp22_); + _data_collection_unref0 (_tmp21_); #line 2642 "/home/jens/Source/shotwell/src/Page.vala" - _tmp31_ = self->priv->exporter; + _tmp30_ = self->priv->exporter; #line 2642 "/home/jens/Source/shotwell/src/Page.vala" - exporter_ui_export (_tmp31_, _drag_and_drop_handler_on_export_completed_exporter_completion_callback, self); -#line 16173 "Page.c" + exporter_ui_export (_tmp30_, _drag_and_drop_handler_on_export_completed_exporter_completion_callback, self); +#line 16708 "Page.c" } else { #line 2644 "/home/jens/Source/shotwell/src/Page.vala" app_window_error_message (_ ("Photos cannot be exported to this directory."), NULL); -#line 16177 "Page.c" +#line 16712 "Page.c" } #line 2647 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->drag_destination); #line 2647 "/home/jens/Source/shotwell/src/Page.vala" self->priv->drag_destination = NULL; -#line 16183 "Page.c" +#line 16718 "Page.c" } -static gboolean drag_and_drop_handler_on_drag_failed (DragAndDropHandler* self, GdkDragContext* context, GtkDragResult drag_result) { +static gboolean +drag_and_drop_handler_on_drag_failed (DragAndDropHandler* self, + GdkDragContext* context, + GtkDragResult drag_result) +{ gboolean result = FALSE; Page* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; - GtkDragResult _tmp3_; - Page* _tmp4_; + Page* _tmp3_; #line 2650 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (IS_DRAG_AND_DROP_HANDLER (self), FALSE); #line 2650 "/home/jens/Source/shotwell/src/Page.vala" @@ -16201,20 +16739,18 @@ static gboolean drag_and_drop_handler_on_drag_failed (DragAndDropHandler* self, #line 2651 "/home/jens/Source/shotwell/src/Page.vala" _tmp2_ = _tmp1_; #line 2651 "/home/jens/Source/shotwell/src/Page.vala" - _tmp3_ = drag_result; -#line 2651 "/home/jens/Source/shotwell/src/Page.vala" - g_debug ("Page.vala:2651: on_drag_failed (%s): %d", _tmp2_, (gint) _tmp3_); + g_debug ("Page.vala:2651: on_drag_failed (%s): %d", _tmp2_, (gint) drag_result); #line 2651 "/home/jens/Source/shotwell/src/Page.vala" _g_free0 (_tmp2_); #line 2653 "/home/jens/Source/shotwell/src/Page.vala" - _tmp4_ = self->priv->page; + _tmp3_ = self->priv->page; #line 2653 "/home/jens/Source/shotwell/src/Page.vala" - if (_tmp4_ == NULL) { + if (_tmp3_ == NULL) { #line 2654 "/home/jens/Source/shotwell/src/Page.vala" result = FALSE; #line 2654 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 16218 "Page.c" +#line 16754 "Page.c" } #line 2656 "/home/jens/Source/shotwell/src/Page.vala" _g_object_unref0 (self->priv->drag_destination); @@ -16224,119 +16760,146 @@ static gboolean drag_and_drop_handler_on_drag_failed (DragAndDropHandler* self, result = FALSE; #line 2658 "/home/jens/Source/shotwell/src/Page.vala" return result; -#line 16228 "Page.c" +#line 16764 "Page.c" } -static void drag_and_drop_handler_on_export_completed (DragAndDropHandler* self) { +static void +drag_and_drop_handler_on_export_completed (DragAndDropHandler* self) +{ #line 2661 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self)); #line 2662 "/home/jens/Source/shotwell/src/Page.vala" _exporter_ui_unref0 (self->priv->exporter); #line 2662 "/home/jens/Source/shotwell/src/Page.vala" self->priv->exporter = NULL; -#line 16239 "Page.c" +#line 16777 "Page.c" } -static void value_drag_and_drop_handler_init (GValue* value) { +static void +value_drag_and_drop_handler_init (GValue* value) +{ #line 2490 "/home/jens/Source/shotwell/src/Page.vala" value->data[0].v_pointer = NULL; -#line 16246 "Page.c" +#line 16786 "Page.c" } -static void value_drag_and_drop_handler_free_value (GValue* value) { +static void +value_drag_and_drop_handler_free_value (GValue* value) +{ #line 2490 "/home/jens/Source/shotwell/src/Page.vala" if (value->data[0].v_pointer) { #line 2490 "/home/jens/Source/shotwell/src/Page.vala" drag_and_drop_handler_unref (value->data[0].v_pointer); -#line 16255 "Page.c" +#line 16797 "Page.c" } } -static void value_drag_and_drop_handler_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_drag_and_drop_handler_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 2490 "/home/jens/Source/shotwell/src/Page.vala" if (src_value->data[0].v_pointer) { #line 2490 "/home/jens/Source/shotwell/src/Page.vala" dest_value->data[0].v_pointer = drag_and_drop_handler_ref (src_value->data[0].v_pointer); -#line 16265 "Page.c" +#line 16810 "Page.c" } else { #line 2490 "/home/jens/Source/shotwell/src/Page.vala" dest_value->data[0].v_pointer = NULL; -#line 16269 "Page.c" +#line 16814 "Page.c" } } -static gpointer value_drag_and_drop_handler_peek_pointer (const GValue* value) { +static gpointer +value_drag_and_drop_handler_peek_pointer (const GValue* value) +{ #line 2490 "/home/jens/Source/shotwell/src/Page.vala" return value->data[0].v_pointer; -#line 16277 "Page.c" +#line 16824 "Page.c" } -static gchar* value_drag_and_drop_handler_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_drag_and_drop_handler_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 2490 "/home/jens/Source/shotwell/src/Page.vala" if (collect_values[0].v_pointer) { -#line 16284 "Page.c" +#line 16836 "Page.c" DragAndDropHandler * object; object = collect_values[0].v_pointer; #line 2490 "/home/jens/Source/shotwell/src/Page.vala" if (object->parent_instance.g_class == NULL) { #line 2490 "/home/jens/Source/shotwell/src/Page.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 16291 "Page.c" +#line 16843 "Page.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 2490 "/home/jens/Source/shotwell/src/Page.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 16295 "Page.c" +#line 16847 "Page.c" } #line 2490 "/home/jens/Source/shotwell/src/Page.vala" value->data[0].v_pointer = drag_and_drop_handler_ref (object); -#line 16299 "Page.c" +#line 16851 "Page.c" } else { #line 2490 "/home/jens/Source/shotwell/src/Page.vala" value->data[0].v_pointer = NULL; -#line 16303 "Page.c" +#line 16855 "Page.c" } #line 2490 "/home/jens/Source/shotwell/src/Page.vala" return NULL; -#line 16307 "Page.c" +#line 16859 "Page.c" } -static gchar* value_drag_and_drop_handler_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_drag_and_drop_handler_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ DragAndDropHandler ** object_p; object_p = collect_values[0].v_pointer; #line 2490 "/home/jens/Source/shotwell/src/Page.vala" if (!object_p) { #line 2490 "/home/jens/Source/shotwell/src/Page.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 16318 "Page.c" +#line 16875 "Page.c" } #line 2490 "/home/jens/Source/shotwell/src/Page.vala" if (!value->data[0].v_pointer) { #line 2490 "/home/jens/Source/shotwell/src/Page.vala" *object_p = NULL; -#line 16324 "Page.c" +#line 16881 "Page.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 2490 "/home/jens/Source/shotwell/src/Page.vala" *object_p = value->data[0].v_pointer; -#line 16328 "Page.c" +#line 16885 "Page.c" } else { #line 2490 "/home/jens/Source/shotwell/src/Page.vala" *object_p = drag_and_drop_handler_ref (value->data[0].v_pointer); -#line 16332 "Page.c" +#line 16889 "Page.c" } #line 2490 "/home/jens/Source/shotwell/src/Page.vala" return NULL; -#line 16336 "Page.c" +#line 16893 "Page.c" } -GParamSpec* param_spec_drag_and_drop_handler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_drag_and_drop_handler (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecDragAndDropHandler* spec; #line 2490 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_DRAG_AND_DROP_HANDLER), NULL); @@ -16346,20 +16909,25 @@ GParamSpec* param_spec_drag_and_drop_handler (const gchar* name, const gchar* ni G_PARAM_SPEC (spec)->value_type = object_type; #line 2490 "/home/jens/Source/shotwell/src/Page.vala" return G_PARAM_SPEC (spec); -#line 16350 "Page.c" +#line 16913 "Page.c" } -gpointer value_get_drag_and_drop_handler (const GValue* value) { +gpointer +value_get_drag_and_drop_handler (const GValue* value) +{ #line 2490 "/home/jens/Source/shotwell/src/Page.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DRAG_AND_DROP_HANDLER), NULL); #line 2490 "/home/jens/Source/shotwell/src/Page.vala" return value->data[0].v_pointer; -#line 16359 "Page.c" +#line 16924 "Page.c" } -void value_set_drag_and_drop_handler (GValue* value, gpointer v_object) { +void +value_set_drag_and_drop_handler (GValue* value, + gpointer v_object) +{ DragAndDropHandler * old; #line 2490 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DRAG_AND_DROP_HANDLER)); @@ -16375,22 +16943,25 @@ void value_set_drag_and_drop_handler (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 2490 "/home/jens/Source/shotwell/src/Page.vala" drag_and_drop_handler_ref (value->data[0].v_pointer); -#line 16379 "Page.c" +#line 16947 "Page.c" } else { #line 2490 "/home/jens/Source/shotwell/src/Page.vala" value->data[0].v_pointer = NULL; -#line 16383 "Page.c" +#line 16951 "Page.c" } #line 2490 "/home/jens/Source/shotwell/src/Page.vala" if (old) { #line 2490 "/home/jens/Source/shotwell/src/Page.vala" drag_and_drop_handler_unref (old); -#line 16389 "Page.c" +#line 16957 "Page.c" } } -void value_take_drag_and_drop_handler (GValue* value, gpointer v_object) { +void +value_take_drag_and_drop_handler (GValue* value, + gpointer v_object) +{ DragAndDropHandler * old; #line 2490 "/home/jens/Source/shotwell/src/Page.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DRAG_AND_DROP_HANDLER)); @@ -16404,33 +16975,37 @@ void value_take_drag_and_drop_handler (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 2490 "/home/jens/Source/shotwell/src/Page.vala" value->data[0].v_pointer = v_object; -#line 16408 "Page.c" +#line 16979 "Page.c" } else { #line 2490 "/home/jens/Source/shotwell/src/Page.vala" value->data[0].v_pointer = NULL; -#line 16412 "Page.c" +#line 16983 "Page.c" } #line 2490 "/home/jens/Source/shotwell/src/Page.vala" if (old) { #line 2490 "/home/jens/Source/shotwell/src/Page.vala" drag_and_drop_handler_unref (old); -#line 16418 "Page.c" +#line 16989 "Page.c" } } -static void drag_and_drop_handler_class_init (DragAndDropHandlerClass * klass) { +static void +drag_and_drop_handler_class_init (DragAndDropHandlerClass * klass) +{ #line 2490 "/home/jens/Source/shotwell/src/Page.vala" drag_and_drop_handler_parent_class = g_type_class_peek_parent (klass); #line 2490 "/home/jens/Source/shotwell/src/Page.vala" ((DragAndDropHandlerClass *) klass)->finalize = drag_and_drop_handler_finalize; #line 2490 "/home/jens/Source/shotwell/src/Page.vala" g_type_class_add_private (klass, sizeof (DragAndDropHandlerPrivate)); -#line 16430 "Page.c" +#line 17003 "Page.c" } -static void drag_and_drop_handler_instance_init (DragAndDropHandler * self) { +static void +drag_and_drop_handler_instance_init (DragAndDropHandler * self) +{ #line 2490 "/home/jens/Source/shotwell/src/Page.vala" self->priv = DRAG_AND_DROP_HANDLER_GET_PRIVATE (self); #line 2507 "/home/jens/Source/shotwell/src/Page.vala" @@ -16439,11 +17014,13 @@ static void drag_and_drop_handler_instance_init (DragAndDropHandler * self) { self->priv->exporter = NULL; #line 2490 "/home/jens/Source/shotwell/src/Page.vala" self->ref_count = 1; -#line 16443 "Page.c" +#line 17018 "Page.c" } -static void drag_and_drop_handler_finalize (DragAndDropHandler * obj) { +static void +drag_and_drop_handler_finalize (DragAndDropHandler * obj) +{ DragAndDropHandler * self; GtkWidget* _tmp0_; #line 2490 "/home/jens/Source/shotwell/src/Page.vala" @@ -16454,7 +17031,7 @@ static void drag_and_drop_handler_finalize (DragAndDropHandler * obj) { _tmp0_ = self->priv->event_source; #line 2539 "/home/jens/Source/shotwell/src/Page.vala" if (_tmp0_ != NULL) { -#line 16458 "Page.c" +#line 17035 "Page.c" GtkWidget* _tmp1_; guint _tmp2_; GtkWidget* _tmp3_; @@ -16487,7 +17064,7 @@ static void drag_and_drop_handler_finalize (DragAndDropHandler * obj) { g_signal_parse_name ("drag-failed", gtk_widget_get_type (), &_tmp8_, NULL, FALSE); #line 2543 "/home/jens/Source/shotwell/src/Page.vala" g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _drag_and_drop_handler_on_drag_failed_gtk_widget_drag_failed, self); -#line 16491 "Page.c" +#line 17068 "Page.c" } #line 2546 "/home/jens/Source/shotwell/src/Page.vala" self->priv->page = NULL; @@ -16501,11 +17078,13 @@ static void drag_and_drop_handler_finalize (DragAndDropHandler * obj) { _g_object_unref0 (self->priv->drag_destination); #line 2508 "/home/jens/Source/shotwell/src/Page.vala" _exporter_ui_unref0 (self->priv->exporter); -#line 16505 "Page.c" +#line 17082 "Page.c" } -GType drag_and_drop_handler_get_type (void) { +GType +drag_and_drop_handler_get_type (void) +{ static volatile gsize drag_and_drop_handler_type_id__volatile = 0; if (g_once_init_enter (&drag_and_drop_handler_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_drag_and_drop_handler_init, value_drag_and_drop_handler_free_value, value_drag_and_drop_handler_copy_value, value_drag_and_drop_handler_peek_pointer, "p", value_drag_and_drop_handler_collect_value, "p", value_drag_and_drop_handler_lcopy_value }; @@ -16519,18 +17098,22 @@ GType drag_and_drop_handler_get_type (void) { } -gpointer drag_and_drop_handler_ref (gpointer instance) { +gpointer +drag_and_drop_handler_ref (gpointer instance) +{ DragAndDropHandler * self; self = instance; #line 2490 "/home/jens/Source/shotwell/src/Page.vala" g_atomic_int_inc (&self->ref_count); #line 2490 "/home/jens/Source/shotwell/src/Page.vala" return instance; -#line 16530 "Page.c" +#line 17111 "Page.c" } -void drag_and_drop_handler_unref (gpointer instance) { +void +drag_and_drop_handler_unref (gpointer instance) +{ DragAndDropHandler * self; self = instance; #line 2490 "/home/jens/Source/shotwell/src/Page.vala" @@ -16539,12 +17122,16 @@ void drag_and_drop_handler_unref (gpointer instance) { DRAG_AND_DROP_HANDLER_GET_CLASS (self)->finalize (self); #line 2490 "/home/jens/Source/shotwell/src/Page.vala" g_type_free_instance ((GTypeInstance *) self); -#line 16543 "Page.c" +#line 17126 "Page.c" } } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -16556,7 +17143,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/Photo.c b/src/Photo.c index c802450..3509b5d 100644 --- a/src/Photo.c +++ b/src/Photo.c @@ -1,4 +1,4 @@ -/* Photo.c generated by valac 0.36.6, the Vala compiler +/* Photo.c generated by valac 0.40.4, the Vala compiler * generated from Photo.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -14,6 +14,7 @@ /**/ /* In general, callers want to use the BASELINE unless requirements are specific.*/ + #include #include #include @@ -85,11 +86,16 @@ typedef struct _ParamSpecPhotoImportParams ParamSpecPhotoImportParams; typedef struct _PhotoTransformationState PhotoTransformationState; typedef struct _PhotoTransformationStateClass PhotoTransformationStateClass; typedef struct _PhotoTransformationStatePrivate PhotoTransformationStatePrivate; +enum { + PHOTO_TRANSFORMATION_STATE_0_PROPERTY, + PHOTO_TRANSFORMATION_STATE_NUM_PROPERTIES +}; +static GParamSpec* photo_transformation_state_properties[PHOTO_TRANSFORMATION_STATE_NUM_PROPERTIES]; enum { PHOTO_TRANSFORMATION_STATE_BROKEN_SIGNAL, - PHOTO_TRANSFORMATION_STATE_LAST_SIGNAL + PHOTO_TRANSFORMATION_STATE_NUM_SIGNALS }; -static guint photo_transformation_state_signals[PHOTO_TRANSFORMATION_STATE_LAST_SIGNAL] = {0}; +static guint photo_transformation_state_signals[PHOTO_TRANSFORMATION_STATE_NUM_SIGNALS] = {0}; #define TYPE_RATING (rating_get_type ()) @@ -303,6 +309,11 @@ typedef struct _OneShotScheduler OneShotScheduler; typedef struct _OneShotSchedulerClass OneShotSchedulerClass; #define TYPE_RAW_DEVELOPER (raw_developer_get_type ()) +enum { + PHOTO_0_PROPERTY, + PHOTO_NUM_PROPERTIES +}; +static GParamSpec* photo_properties[PHOTO_NUM_PROPERTIES]; #define PHOTO_TYPE_CACHED_PIXBUF (photo_cached_pixbuf_get_type ()) #define PHOTO_CACHED_PIXBUF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PHOTO_TYPE_CACHED_PIXBUF, PhotoCachedPixbuf)) @@ -607,6 +618,11 @@ typedef struct _ConfigFacade ConfigFacade; typedef struct _ConfigFacadeClass ConfigFacadeClass; #define __g_list_free__g_object_unref0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__g_object_unref0_ (var), NULL))) typedef struct _PhotoPhotoTransformationStateImplPrivate PhotoPhotoTransformationStateImplPrivate; +enum { + PHOTO_PHOTO_TRANSFORMATION_STATE_IMPL_0_PROPERTY, + PHOTO_PHOTO_TRANSFORMATION_STATE_IMPL_NUM_PROPERTIES +}; +static GParamSpec* photo_photo_transformation_state_impl_properties[PHOTO_PHOTO_TRANSFORMATION_STATE_IMPL_NUM_PROPERTIES]; typedef struct _PhotoParamSpecBackingReaders PhotoParamSpecBackingReaders; #define _g_timer_destroy0(var) ((var == NULL) ? NULL : (var = (g_timer_destroy (var), NULL))) typedef struct _PhotoParamSpecCachedPixbuf PhotoParamSpecCachedPixbuf; @@ -622,9 +638,9 @@ enum { PHOTO_EDITABLE_REIMPORTED_SIGNAL, PHOTO_BASELINE_REIMPORTED_SIGNAL, PHOTO_SOURCE_REIMPORTED_SIGNAL, - PHOTO_LAST_SIGNAL + PHOTO_NUM_SIGNALS }; -static guint photo_signals[PHOTO_LAST_SIGNAL] = {0}; +static guint photo_signals[PHOTO_NUM_SIGNALS] = {0}; typedef struct _DataCollectionPrivate DataCollectionPrivate; #define TYPE_MARKER (marker_get_type ()) @@ -788,9 +804,9 @@ enum { LIBRARY_PHOTO_SOURCE_COLLECTION_EDITABLE_REIMPORTED_SIGNAL, LIBRARY_PHOTO_SOURCE_COLLECTION_BASELINE_REIMPORTED_SIGNAL, LIBRARY_PHOTO_SOURCE_COLLECTION_SOURCE_REIMPORTED_SIGNAL, - LIBRARY_PHOTO_SOURCE_COLLECTION_LAST_SIGNAL + LIBRARY_PHOTO_SOURCE_COLLECTION_NUM_SIGNALS }; -static guint library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_LAST_SIGNAL] = {0}; +static guint library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_NUM_SIGNALS] = {0}; #define TYPE_FLAGGABLE (flaggable_get_type ()) #define FLAGGABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FLAGGABLE, Flaggable)) @@ -808,6 +824,11 @@ typedef struct _FlaggableIface FlaggableIface; typedef struct _Monitorable Monitorable; typedef struct _MonitorableIface MonitorableIface; typedef struct _LibraryPhotoPrivate LibraryPhotoPrivate; +enum { + LIBRARY_PHOTO_0_PROPERTY, + LIBRARY_PHOTO_NUM_PROPERTIES +}; +static GParamSpec* library_photo_properties[LIBRARY_PHOTO_NUM_PROPERTIES]; #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL))) #define THUMBNAIL_CACHE_TYPE_SIZE (thumbnail_cache_size_get_type ()) @@ -1745,9 +1766,15 @@ static gpointer library_photo_source_holding_tank_parent_class = NULL; GType backing_fetch_mode_get_type (void) G_GNUC_CONST; gpointer photo_import_params_ref (gpointer instance); void photo_import_params_unref (gpointer instance); -GParamSpec* param_spec_photo_import_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_import_params (GValue* value, gpointer v_object); -void value_take_photo_import_params (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_import_params (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_import_params (GValue* value, + gpointer v_object); +void value_take_photo_import_params (GValue* value, + gpointer v_object); gpointer value_get_photo_import_params (const GValue* value); GType photo_import_params_get_type (void) G_GNUC_CONST; GType import_id_get_type (void) G_GNUC_CONST; @@ -1756,33 +1783,57 @@ void import_id_free (ImportID* self); GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; gpointer thumbnails_ref (gpointer instance); void thumbnails_unref (gpointer instance); -GParamSpec* param_spec_thumbnails (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_thumbnails (GValue* value, gpointer v_object); -void value_take_thumbnails (GValue* value, gpointer v_object); +GParamSpec* param_spec_thumbnails (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_thumbnails (GValue* value, + gpointer v_object); +void value_take_thumbnails (GValue* value, + gpointer v_object); gpointer value_get_thumbnails (const GValue* value); GType thumbnails_get_type (void) G_GNUC_CONST; gpointer photo_row_ref (gpointer instance); void photo_row_unref (gpointer instance); -GParamSpec* param_spec_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_row (GValue* value, gpointer v_object); -void value_take_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_row (GValue* value, + gpointer v_object); +void value_take_photo_row (GValue* value, + gpointer v_object); gpointer value_get_photo_row (const GValue* value); GType photo_row_get_type (void) G_GNUC_CONST; -enum { - PHOTO_IMPORT_PARAMS_DUMMY_PROPERTY -}; PhotoRow* photo_row_new (void); PhotoRow* photo_row_construct (GType object_type); -PhotoImportParams* photo_import_params_new (GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails); -PhotoImportParams* photo_import_params_construct (GType object_type, GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails); -PhotoImportParams* photo_import_params_new_create_placeholder (GFile* file, ImportID* import_id); -PhotoImportParams* photo_import_params_construct_create_placeholder (GType object_type, GFile* file, ImportID* import_id); +PhotoImportParams* photo_import_params_new (GFile* file, + GFile* final_associated_file, + ImportID* import_id, + PhotoFileSnifferOptions sniffer_options, + const gchar* exif_md5, + const gchar* thumbnail_md5, + const gchar* full_md5, + Thumbnails* thumbnails); +PhotoImportParams* photo_import_params_construct (GType object_type, + GFile* file, + GFile* final_associated_file, + ImportID* import_id, + PhotoFileSnifferOptions sniffer_options, + const gchar* exif_md5, + const gchar* thumbnail_md5, + const gchar* full_md5, + Thumbnails* thumbnails); +PhotoImportParams* photo_import_params_new_create_placeholder (GFile* file, + ImportID* import_id); +PhotoImportParams* photo_import_params_construct_create_placeholder (GType object_type, + GFile* file, + ImportID* import_id); static void photo_import_params_finalize (PhotoImportParams * obj); GType photo_transformation_state_get_type (void) G_GNUC_CONST; #define PHOTO_TRANSFORMATION_STATE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationStatePrivate)) -enum { - PHOTO_TRANSFORMATION_STATE_DUMMY_PROPERTY -}; PhotoTransformationState* photo_transformation_state_construct (GType object_type); gboolean photo_transformation_state_is_broken (PhotoTransformationState* self); static void photo_transformation_state_real_broken (PhotoTransformationState* self); @@ -1798,32 +1849,56 @@ Rating rating_unserialize (gint value); GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; gpointer source_snapshot_ref (gpointer instance); void source_snapshot_unref (gpointer instance); -GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_snapshot (GValue* value, gpointer v_object); -void value_take_source_snapshot (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_snapshot (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_snapshot (GValue* value, + gpointer v_object); +void value_take_source_snapshot (GValue* value, + gpointer v_object); gpointer value_get_source_snapshot (const GValue* value); GType source_snapshot_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; @@ -1835,9 +1910,15 @@ EventID* event_id_dup (const EventID* self); void event_id_free (EventID* self); gpointer backing_file_state_ref (gpointer instance); void backing_file_state_unref (gpointer instance); -GParamSpec* param_spec_backing_file_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_file_state (GValue* value, gpointer v_object); -void value_take_backing_file_state (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_file_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_file_state (GValue* value, + gpointer v_object); +void value_take_backing_file_state (GValue* value, + gpointer v_object); gpointer value_get_backing_file_state (const GValue* value); GType backing_file_state_get_type (void) G_GNUC_CONST; GType photo_exception_get_type (void) G_GNUC_CONST; @@ -1851,9 +1932,15 @@ void scaling_free (Scaling* self); GType photo_source_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -1862,37 +1949,60 @@ GType photo_get_type (void) G_GNUC_CONST; GType rotation_get_type (void) G_GNUC_CONST; gpointer backing_photo_row_ref (gpointer instance); void backing_photo_row_unref (gpointer instance); -GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_photo_row (GValue* value, gpointer v_object); -void value_take_backing_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_photo_row (GValue* value, + gpointer v_object); +void value_take_backing_photo_row (GValue* value, + gpointer v_object); gpointer value_get_backing_photo_row (const GValue* value); GType backing_photo_row_get_type (void) G_GNUC_CONST; static gpointer photo_backing_readers_ref (gpointer instance); static void photo_backing_readers_unref (gpointer instance); -static GParamSpec* photo_param_spec_backing_readers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; -static void photo_value_set_backing_readers (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void photo_value_take_backing_readers (GValue* value, gpointer v_object) G_GNUC_UNUSED; +static GParamSpec* photo_param_spec_backing_readers (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) G_GNUC_UNUSED; +static void photo_value_set_backing_readers (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void photo_value_take_backing_readers (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer photo_value_get_backing_readers (const GValue* value) G_GNUC_UNUSED; static GType photo_backing_readers_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; gpointer one_shot_scheduler_ref (gpointer instance); void one_shot_scheduler_unref (gpointer instance); -GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_one_shot_scheduler (GValue* value, gpointer v_object); -void value_take_one_shot_scheduler (GValue* value, gpointer v_object); +GParamSpec* param_spec_one_shot_scheduler (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_one_shot_scheduler (GValue* value, + gpointer v_object); +void value_take_one_shot_scheduler (GValue* value, + gpointer v_object); gpointer value_get_one_shot_scheduler (const GValue* value); GType one_shot_scheduler_get_type (void) G_GNUC_CONST; GType raw_developer_get_type (void) G_GNUC_CONST; #define PHOTO_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO, PhotoPrivate)) -enum { - PHOTO_DUMMY_PROPERTY -}; -gboolean photo_exception_prohibits (PhotoException self, PhotoException exception); -gboolean photo_exception_allows (PhotoException self, PhotoException exception); +gboolean photo_exception_prohibits (PhotoException self, + PhotoException exception); +gboolean photo_exception_allows (PhotoException self, + PhotoException exception); static gpointer photo_cached_pixbuf_ref (gpointer instance); static void photo_cached_pixbuf_unref (gpointer instance); -static GParamSpec* photo_param_spec_cached_pixbuf (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; -static void photo_value_set_cached_pixbuf (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void photo_value_take_cached_pixbuf (GValue* value, gpointer v_object) G_GNUC_UNUSED; +static GParamSpec* photo_param_spec_cached_pixbuf (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) G_GNUC_UNUSED; +static void photo_value_set_cached_pixbuf (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void photo_value_take_cached_pixbuf (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer photo_value_get_cached_pixbuf (const GValue* value) G_GNUC_UNUSED; static GType photo_cached_pixbuf_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; BackingPhotoRow* backing_photo_row_new (void); @@ -1905,9 +2015,11 @@ static PhotoBackingReaders* photo_backing_readers_construct (GType object_type); #define PHOTO_SOURCE_PIXBUF_MIN_LRU_COUNT 1 #define PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT 3 #define PHOTO_MIN_EMBEDDED_SIZE 1024 -Photo* photo_construct (GType object_type, PhotoRow* row); +Photo* photo_construct (GType object_type, + PhotoRow* row); #define DATA_OBJECT_INVALID_OBJECT_ID ((gint64) -1) -PhotoSource* photo_source_construct (GType object_type, gint64 object_id); +PhotoSource* photo_source_construct (GType object_type, + gint64 object_id); gchar* media_source_prep_title (const gchar* title); GType photo_id_get_type (void) G_GNUC_CONST; PhotoID* photo_id_dup (const PhotoID* self); @@ -1919,135 +2031,265 @@ void backing_photo_id_free (BackingPhotoID* self); gchar* media_source_prep_comment (const gchar* comment); gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; -PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gchar* filepath); -gchar* string_sliced_at_last_char (const gchar* haystack, gunichar ch, gint start_index); -gchar* string_sliced_at (const gchar* str, gint index); +PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, + const gchar* filepath); +gchar* string_sliced_at_last_char (const gchar* haystack, + gunichar ch, + gint start_index); +gchar* string_sliced_at (const gchar* str, + gint index); gboolean is_string_empty (const gchar* s); #define BACKING_PHOTO_ID_INVALID ((gint64) -1) -static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id); +static BackingPhotoRow* photo_get_backing_row (Photo* self, + BackingPhotoID* id); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType photo_table_get_type (void) G_GNUC_CONST; PhotoTable* photo_table_get_instance (void); GQuark database_error_quark (void); -void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** error); -static void photo_internal_remove_all_transformations (Photo* self, gboolean notify); +void photo_table_detach_editable (PhotoTable* self, + PhotoRow* row, + GError** error); +static void photo_internal_remove_all_transformations (Photo* self, + gboolean notify); RawDeveloper* raw_developer_as_array (int* result_length1); void photo_init_photo (void); void photo_terminate_photo (void); -void photo_notify_editable_replaced (Photo* self, GFile* old_file, GFile* new_file); -static void photo_real_notify_editable_replaced (Photo* self, GFile* old_file, GFile* new_file); +void photo_notify_editable_replaced (Photo* self, + GFile* old_file, + GFile* new_file); +static void photo_real_notify_editable_replaced (Photo* self, + GFile* old_file, + GFile* new_file); void photo_notify_raw_development_modified (Photo* self); static void photo_real_notify_raw_development_modified (Photo* self); void photo_notify_baseline_replaced (Photo* self); static void photo_real_notify_baseline_replaced (Photo* self); -void photo_notify_master_reimported (Photo* self, PhotoMetadata* metadata); -static void photo_real_notify_master_reimported (Photo* self, PhotoMetadata* metadata); -void photo_notify_editable_reimported (Photo* self, PhotoMetadata* metadata); -static void photo_real_notify_editable_reimported (Photo* self, PhotoMetadata* metadata); -void photo_notify_source_reimported (Photo* self, PhotoMetadata* metadata); -static void photo_real_notify_source_reimported (Photo* self, PhotoMetadata* metadata); -void photo_notify_baseline_reimported (Photo* self, PhotoMetadata* metadata); -static void photo_real_notify_baseline_reimported (Photo* self, PhotoMetadata* metadata); -static gboolean photo_real_internal_delete_backing (DataSource* base, GError** error); +void photo_notify_master_reimported (Photo* self, + PhotoMetadata* metadata); +static void photo_real_notify_master_reimported (Photo* self, + PhotoMetadata* metadata); +void photo_notify_editable_reimported (Photo* self, + PhotoMetadata* metadata); +static void photo_real_notify_editable_reimported (Photo* self, + PhotoMetadata* metadata); +void photo_notify_source_reimported (Photo* self, + PhotoMetadata* metadata); +static void photo_real_notify_source_reimported (Photo* self, + PhotoMetadata* metadata); +void photo_notify_baseline_reimported (Photo* self, + PhotoMetadata* metadata); +static void photo_real_notify_baseline_reimported (Photo* self, + PhotoMetadata* metadata); +static gboolean photo_real_internal_delete_backing (DataSource* base, + GError** error); GFile* photo_file_adapter_get_file (PhotoFileAdapter* self); -static void photo_detach_editable (Photo* self, gboolean delete_editable, gboolean remove_transformations, gboolean notify); +static void photo_detach_editable (Photo* self, + gboolean delete_editable, + gboolean remove_transformations, + gboolean notify); PhotoFileFormat photo_get_master_file_format (Photo* self); -static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d); +static gboolean photo_delete_raw_development (Photo* self, + RawDeveloper d); gchar* data_object_to_string (DataObject* self); -gboolean data_source_internal_delete_backing (DataSource* self, GError** error); +gboolean data_source_internal_delete_backing (DataSource* self, + GError** error); GType backing_photo_table_get_type (void) G_GNUC_CONST; BackingPhotoTable* backing_photo_table_get_instance (void); -BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhotoID* id, GError** error); -void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backing_id, GError** error); -gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d); -gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d); -PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error); +BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, + BackingPhotoID* id, + GError** error); +void backing_photo_table_remove (BackingPhotoTable* self, + BackingPhotoID* backing_id, + GError** error); +gboolean photo_is_raw_developer_complete (Photo* self, + RawDeveloper d); +gboolean photo_is_raw_developer_available (Photo* self, + RawDeveloper d); +PhotoMetadata* photo_get_master_metadata (Photo* self, + GError** error); guint photo_metadata_get_preview_count (PhotoMetadata* self); gpointer photo_preview_ref (gpointer instance); void photo_preview_unref (gpointer instance); -GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_preview (GValue* value, gpointer v_object); -void value_take_photo_preview (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_preview (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_preview (GValue* value, + gpointer v_object); +void value_take_photo_preview (GValue* value, + gpointer v_object); gpointer value_get_photo_preview (const GValue* value); GType photo_preview_get_type (void) G_GNUC_CONST; -PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number); -void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result); -void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, gboolean notify, GError** error); -void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, BackingPhotoRow* bpr, GError** error); -void data_object_notify_altered (DataObject* self, Alteration* alteration); -Alteration* alteration_new (const gchar* subject, const gchar* detail); -Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail); +PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, + guint number); +void photo_preview_get_pixel_dimensions (PhotoPreview* self, + Dimensions* result); +void photo_add_backing_photo_for_development (Photo* self, + RawDeveloper d, + BackingPhotoRow* bpr, + gboolean notify, + GError** error); +void photo_import_developed_backing_photo (PhotoRow* row, + RawDeveloper d, + BackingPhotoRow* bpr, + GError** error); +void data_object_notify_altered (DataObject* self, + Alteration* alteration); +Alteration* alteration_new (const gchar* subject, + const gchar* detail); +Alteration* alteration_construct (GType object_type, + const gchar* subject, + const gchar* detail); #define UTIL_FILE_ATTRIBUTES "standard::*,time::*,id::file,id::filesystem,etag::value" #define DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES UTIL_FILE_ATTRIBUTES gpointer photo_file_interrogator_ref (gpointer instance); void photo_file_interrogator_unref (gpointer instance); -GParamSpec* param_spec_photo_file_interrogator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_interrogator (GValue* value, gpointer v_object); -void value_take_photo_file_interrogator (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_interrogator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_interrogator (GValue* value, + gpointer v_object); +void value_take_photo_file_interrogator (GValue* value, + gpointer v_object); gpointer value_get_photo_file_interrogator (const GValue* value); GType photo_file_interrogator_get_type (void) G_GNUC_CONST; -PhotoFileInterrogator* photo_file_interrogator_new (GFile* file, PhotoFileSnifferOptions options); -PhotoFileInterrogator* photo_file_interrogator_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** error); +PhotoFileInterrogator* photo_file_interrogator_new (GFile* file, + PhotoFileSnifferOptions options); +PhotoFileInterrogator* photo_file_interrogator_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, + GError** error); gpointer detected_photo_information_ref (gpointer instance); void detected_photo_information_unref (gpointer instance); -GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_detected_photo_information (GValue* value, gpointer v_object); -void value_take_detected_photo_information (GValue* value, gpointer v_object); +GParamSpec* param_spec_detected_photo_information (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_detected_photo_information (GValue* value, + gpointer v_object); +void value_take_detected_photo_information (GValue* value, + gpointer v_object); gpointer value_get_detected_photo_information (const GValue* value); GType detected_photo_information_get_type (void) G_GNUC_CONST; DetectedPhotoInformation* photo_file_interrogator_get_detected_photo_information (PhotoFileInterrogator* self); gboolean photo_file_interrogator_get_is_photo_corrupted (PhotoFileInterrogator* self); Orientation photo_metadata_get_orientation (PhotoMetadata* self); -void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, GError** error); -void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, BackingPhotoID* backing_photo_id, GError** error); -static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify); -BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, const gchar* raw_filepath, const gchar* camera_development_filename, GError** error); -GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, GError** error); +void backing_photo_table_add (BackingPhotoTable* self, + BackingPhotoRow* state, + GError** error); +void photo_table_update_raw_development (PhotoTable* self, + PhotoRow* row, + RawDeveloper rd, + BackingPhotoID* backing_photo_id, + GError** error); +static void photo_develop_photo (Photo* self, + RawDeveloper d, + gboolean notify); +BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, + const gchar* raw_filepath, + const gchar* camera_development_filename, + GError** error); +GdkPixbuf* photo_get_master_pixbuf (Photo* self, + Scaling* scaling, + gboolean rotate, + GError** error); void scaling_for_original (Scaling* result); GType photo_file_writer_get_type (void) G_GNUC_CONST; GQuark photo_format_error_quark (void); -PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gchar* filepath, GError** error); +PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, + const gchar* filepath, + GError** error); GType jpeg_quality_get_type (void) G_GNUC_CONST; -void photo_file_writer_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error); +void photo_file_writer_write (PhotoFileWriter* self, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error); GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST; -PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self, const gchar* filepath, GError** error); -void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error); -GBytes* photo_preview_flatten (PhotoPreview* self, GError** error); -gboolean jpeg_is_jpeg_bytes (GBytes* bytes, GError** error); -GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error); -void photo_set_default_raw_developer (Photo* self, RawDeveloper d); -void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify); -void photo_revert_to_master (Photo* self, gboolean notify); -GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error); -gboolean photo_set_orientation (Photo* self, Orientation orientation); +PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self, + const gchar* filepath, + GError** error); +void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, + PhotoMetadata* metadata, + GError** error); +GBytes* photo_preview_flatten (PhotoPreview* self, + GError** error); +gboolean jpeg_is_jpeg_bytes (GBytes* bytes, + GError** error); +GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, + GError** error); +void photo_set_default_raw_developer (Photo* self, + RawDeveloper d); +void photo_set_raw_developer (Photo* self, + RawDeveloper d, + gboolean notify); +void photo_revert_to_master (Photo* self, + gboolean notify); +GdkPixbuf* photo_get_prefetched_copy (Photo* self, + GError** error); +gboolean photo_set_orientation (Photo* self, + Orientation orientation); void photo_discard_prefetched (Photo* self); RawDeveloper photo_get_raw_developer (Photo* self); gchar* raw_developer_to_string (RawDeveloper self); -void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, GError** error); -void photo_redevelop_raw (Photo* self, RawDeveloper d); -static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, int* result_length1); -BackingFileState* backing_file_state_new_from_photo_row (BackingPhotoRow* photo_row, const gchar* md5); -BackingFileState* backing_file_state_construct_from_photo_row (GType object_type, BackingPhotoRow* photo_row, const gchar* md5); -static void _vala_array_add89 (BackingFileState** * array, int* length, int* size, BackingFileState* value); +void photo_table_remove_development (PhotoTable* self, + PhotoRow* row, + RawDeveloper rd, + GError** error); +void photo_redevelop_raw (Photo* self, + RawDeveloper d); +static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, + int* result_length1); +BackingFileState* backing_file_state_new_from_photo_row (BackingPhotoRow* photo_row, + const gchar* md5); +BackingFileState* backing_file_state_construct_from_photo_row (GType object_type, + BackingPhotoRow* photo_row, + const gchar* md5); +static void _vala_array_add89 (BackingFileState** * array, + int* length, + int* size, + BackingFileState* value); gboolean photo_has_editable (Photo* self); -static void _vala_array_add90 (BackingFileState** * array, int* length, int* size, BackingFileState* value); +static void _vala_array_add90 (BackingFileState** * array, + int* length, + int* size, + BackingFileState* value); gboolean photo_is_developed (Photo* self); GeeCollection* photo_get_raw_development_photo_rows (Photo* self); -static void _vala_array_add91 (BackingFileState** * array, int* length, int* size, BackingFileState* value); -static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode mode); +static void _vala_array_add91 (BackingFileState** * array, + int* length, + int* size, + BackingFileState* value); +static PhotoFileReader* photo_get_backing_reader (Photo* self, + BackingFetchMode mode); static PhotoFileReader* photo_get_master_reader (Photo* self); static PhotoFileReader* photo_get_baseline_reader (Photo* self); static PhotoFileReader* photo_get_source_reader (Photo* self); @@ -2064,7 +2306,8 @@ gboolean photo_is_editable_source (Photo* self); BackingPhotoRow* photo_get_master_photo_row (Photo* self); BackingPhotoRow* photo_get_editable_photo_row (Photo* self); gboolean backing_photo_id_is_valid (BackingPhotoID *self); -BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper d); +BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, + RawDeveloper d); PhotoFileFormat* photo_get_editable_file_format (Photo* self); PhotoFileFormat photo_file_adapter_get_file_format (PhotoFileAdapter* self); static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self); @@ -2072,194 +2315,432 @@ GType export_format_parameters_get_type (void) G_GNUC_CONST; GType export_format_mode_get_type (void) G_GNUC_CONST; ExportFormatParameters* export_format_parameters_dup (const ExportFormatParameters* self); void export_format_parameters_free (ExportFormatParameters* self); -PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportFormatParameters* params); +PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, + ExportFormatParameters* params); PhotoFileFormat photo_file_format_get_system_default_format (void); PhotoFileFormat photo_get_best_export_file_format (Photo* self); -gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParameters* params); +gchar* photo_get_export_basename_for_parameters (Photo* self, + ExportFormatParameters* params); GFile* media_source_get_master_file (MediaSource* self); -gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format); +gchar* photo_get_export_basename (Photo* self, + PhotoFileFormat* file_format); GType import_result_get_type (void) G_GNUC_CONST; ImportResult photo_prepare_for_import (PhotoImportParams* params); gboolean photo_is_file_image (GFile* file); gboolean photo_file_format_is_file_supported (GFile* file); gpointer metadata_date_time_ref (gpointer instance); void metadata_date_time_unref (gpointer instance); -GParamSpec* param_spec_metadata_date_time (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_metadata_date_time (GValue* value, gpointer v_object); -void value_take_metadata_date_time (GValue* value, gpointer v_object); +GParamSpec* param_spec_metadata_date_time (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_metadata_date_time (GValue* value, + gpointer v_object); +void value_take_metadata_date_time (GValue* value, + gpointer v_object); gpointer value_get_metadata_date_time (const GValue* value); GType metadata_date_time_get_type (void) G_GNUC_CONST; MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self); time_t metadata_date_time_get_timestamp (MetadataDateTime* self); gchar* media_metadata_get_title (MediaMetadata* self); gchar* media_metadata_get_comment (MediaMetadata* self); -GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify); +GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify); Rating photo_metadata_get_rating (PhotoMetadata* self); #define PHOTO_ID_INVALID ((gint64) -1) -void photo_id_init (PhotoID *self, gint64 id); +void photo_id_init (PhotoID *self, + gint64 id); #define EVENT_ID_INVALID ((gint64) -1) -void event_id_init (EventID *self, gint64 id); +void event_id_init (EventID *self, + gint64 id); GType photo_file_reader_role_get_type (void) G_GNUC_CONST; -void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role); -void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader* reader, Orientation orientation, Dimensions* original_dim, GError** error); -ImportResult import_result_convert_error (GError* err, ImportResult default_result); +void photo_file_reader_set_role (PhotoFileReader* self, + PhotoFileReaderRole role); +void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, + PhotoFileReader* reader, + Orientation orientation, + Dimensions* original_dim, + GError** error); +ImportResult import_result_convert_error (GError* err, + ImportResult default_result); void photo_create_pre_import (PhotoImportParams* params); -void dimensions_init (Dimensions *self, gint width, gint height); -BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoFileSnifferOptions options, DetectedPhotoInformation* * detected, GError** error); +void dimensions_init (Dimensions *self, + gint width, + gint height); +BackingPhotoRow* photo_query_backing_photo_row (Photo* self, + GFile* file, + PhotoFileSnifferOptions options, + DetectedPhotoInformation* * detected, + GError** error); gpointer photo_reimport_master_state_ref (gpointer instance); void photo_reimport_master_state_unref (gpointer instance); -GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void photo_value_set_reimport_master_state (GValue* value, gpointer v_object); -void photo_value_take_reimport_master_state (GValue* value, gpointer v_object); +GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void photo_value_set_reimport_master_state (GValue* value, + gpointer v_object); +void photo_value_take_reimport_master_state (GValue* value, + gpointer v_object); gpointer photo_value_get_reimport_master_state (const GValue* value); GType photo_reimport_master_state_get_type (void) G_GNUC_CONST; -gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState* * reimport_state, GError** error); -static void _vala_array_add92 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add93 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add94 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add95 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add96 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add97 (gchar** * array, int* length, int* size, gchar* value); -static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1); -static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct (GType object_type, PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1); +gboolean photo_prepare_for_reimport_master (Photo* self, + PhotoReimportMasterState* * reimport_state, + GError** error); +static void _vala_array_add92 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add93 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add94 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add95 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add96 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add97 (gchar** * array, + int* length, + int* size, + gchar* value); +static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row, + PhotoMetadata* metadata, + gchar** alterations, + int alterations_length1); +static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct (GType object_type, + PhotoRow* row, + PhotoMetadata* metadata, + gchar** alterations, + int alterations_length1); static GType photo_reimport_master_state_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -void photo_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadata); -static void photo_real_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadata); -void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, GError** error); -void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error); -void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from); -static void _vala_array_add98 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add99 (gchar** * array, int* length, int* size, gchar* value); -Alteration* alteration_new_from_array (gchar** array, int array_length1); -Alteration* alteration_construct_from_array (GType object_type, gchar** array, int array_length1); -static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, BackingPhotoRow* * backing, DetectedPhotoInformation* * detected, GError** error); +void photo_apply_user_metadata_for_reimport (Photo* self, + PhotoMetadata* metadata); +static void photo_real_apply_user_metadata_for_reimport (Photo* self, + PhotoMetadata* metadata); +void photo_finish_reimport_master (Photo* self, + PhotoReimportMasterState* state, + GError** error); +void photo_table_reimport (PhotoTable* self, + PhotoRow* row, + GError** error); +void backing_photo_row_copy_from (BackingPhotoRow* self, + BackingPhotoRow* from); +static void _vala_array_add98 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add99 (gchar** * array, + int* length, + int* size, + gchar* value); +Alteration* alteration_new_from_array (gchar** array, + int array_length1); +Alteration* alteration_construct_from_array (GType object_type, + gchar** array, + int array_length1); +static gboolean photo_verify_file_for_reimport (Photo* self, + GFile* file, + BackingPhotoRow* * backing, + DetectedPhotoInformation* * detected, + GError** error); gpointer photo_reimport_editable_state_ref (gpointer instance); void photo_reimport_editable_state_unref (gpointer instance); -GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object); -void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object); +GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void photo_value_set_reimport_editable_state (GValue* value, + gpointer v_object); +void photo_value_take_reimport_editable_state (GValue* value, + gpointer v_object); gpointer photo_value_get_reimport_editable_state (const GValue* value); GType photo_reimport_editable_state_get_type (void) G_GNUC_CONST; -gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditableState* * state, GError** error); +gboolean photo_prepare_for_reimport_editable (Photo* self, + PhotoReimportEditableState* * state, + GError** error); GFile* photo_get_editable_file (Photo* self); -static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_new (BackingPhotoRow* backing_state, PhotoMetadata* metadata); -static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_construct (GType object_type, BackingPhotoRow* backing_state, PhotoMetadata* metadata); +static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_new (BackingPhotoRow* backing_state, + PhotoMetadata* metadata); +static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_construct (GType object_type, + BackingPhotoRow* backing_state, + PhotoMetadata* metadata); static GType photo_reimport_editable_state_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* state, GError** error); -void photo_get_editable_id (Photo* self, BackingPhotoID* result); +void photo_finish_reimport_editable (Photo* self, + PhotoReimportEditableState* state, + GError** error); +void photo_get_editable_id (Photo* self, + BackingPhotoID* result); gboolean backing_photo_id_is_invalid (BackingPhotoID *self); -void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, GError** error); -void media_source_set_title (MediaSource* self, const gchar* title); -gboolean media_source_set_comment (MediaSource* self, const gchar* comment); -void media_source_set_rating (MediaSource* self, Rating rating); +void backing_photo_table_update (BackingPhotoTable* self, + BackingPhotoRow* row, + GError** error); +void media_source_set_title (MediaSource* self, + const gchar* title); +gboolean media_source_set_comment (MediaSource* self, + const gchar* comment); +void media_source_set_rating (MediaSource* self, + Rating rating); Alteration* alteration_new_from_list (const gchar* list); -Alteration* alteration_construct_from_list (GType object_type, const gchar* list); +Alteration* alteration_construct_from_list (GType object_type, + const gchar* list); gpointer photo_reimport_raw_development_state_ref (gpointer instance); void photo_reimport_raw_development_state_unref (gpointer instance); -GParamSpec* photo_param_spec_reimport_raw_development_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void photo_value_set_reimport_raw_development_state (GValue* value, gpointer v_object); -void photo_value_take_reimport_raw_development_state (GValue* value, gpointer v_object); +GParamSpec* photo_param_spec_reimport_raw_development_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void photo_value_set_reimport_raw_development_state (GValue* value, + gpointer v_object); +void photo_value_take_reimport_raw_development_state (GValue* value, + gpointer v_object); gpointer photo_value_get_reimport_raw_development_state (const GValue* value); GType photo_reimport_raw_development_state_get_type (void) G_GNUC_CONST; -gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState* * state, GError** error); +gboolean photo_prepare_for_reimport_raw_development (Photo* self, + PhotoReimportRawDevelopmentState* * state, + GError** error); GeeCollection* photo_get_raw_developer_files (Photo* self); static GType photo_reimport_raw_development_state_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_new (void); static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_construct (GType object_type); -static void photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevelopmentStateImpl* self, BackingPhotoRow* backing, PhotoMetadata* metadata); +static void photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevelopmentStateImpl* self, + BackingPhotoRow* backing, + PhotoMetadata* metadata); static gint photo_reimport_raw_development_state_impl_get_size (PhotoReimportRawDevelopmentStateImpl* self); -void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState* state, GError** error); +void photo_finish_reimport_raw_development (Photo* self, + PhotoReimportRawDevelopmentState* state, + GError** error); static gpointer photo_reimport_raw_development_state_impl_dev_to_reimport_ref (gpointer instance); static void photo_reimport_raw_development_state_impl_dev_to_reimport_unref (gpointer instance); -static GParamSpec* photo_reimport_raw_development_state_impl_param_spec_dev_to_reimport (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; -static void photo_reimport_raw_development_state_impl_value_set_dev_to_reimport (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void photo_reimport_raw_development_state_impl_value_take_dev_to_reimport (GValue* value, gpointer v_object) G_GNUC_UNUSED; +static GParamSpec* photo_reimport_raw_development_state_impl_param_spec_dev_to_reimport (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) G_GNUC_UNUSED; +static void photo_reimport_raw_development_state_impl_value_set_dev_to_reimport (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void photo_reimport_raw_development_state_impl_value_take_dev_to_reimport (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer photo_reimport_raw_development_state_impl_value_get_dev_to_reimport (const GValue* value) G_GNUC_UNUSED; GType photo_reimport_raw_development_state_impl_dev_to_reimport_get_type (void) G_GNUC_CONST; static gchar* photo_real_get_typename (DataSource* base); static gint64 photo_real_get_instance_id (DataSource* base); -void photo_get_photo_id (Photo* self, PhotoID* result); +void photo_get_photo_id (Photo* self, + PhotoID* result); static gchar* photo_real_get_source_id (DataSource* base); gchar* data_source_get_typename (DataSource* self); gint64 data_source_get_instance_id (DataSource* self); -void photo_set_master_timestamp (Photo* self, GFileInfo* info); -void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t timestamp, GError** error); +void photo_set_master_timestamp (Photo* self, + GFileInfo* info); +void photo_table_update_timestamp (PhotoTable* self, + PhotoID* photo_id, + time_t timestamp, + GError** error); void app_window_database_error (GError* err); -void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GError** error); -void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, GError** error); -void photo_update_many_editable_timestamps (GeeMap* map, GError** error); +void photo_update_editable_modification_time (Photo* self, + GFileInfo* info, + GError** error); +void backing_photo_table_update_timestamp (BackingPhotoTable* self, + BackingPhotoID* id, + time_t timestamp, + GError** error); +void photo_update_many_editable_timestamps (GeeMap* map, + GError** error); void database_table_begin_transaction (void); void database_table_commit_transaction (GError** error); static PhotoFileFormat photo_real_get_preferred_thumbnail_format (ThumbnailSource* base); PhotoFileFormat photo_get_file_format (Photo* self); gboolean photo_file_format_can_write_image (PhotoFileFormat self); -static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error); -GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error); -void scaling_for_best_fit (gint pixels, gboolean scale_up, Scaling* result); -static gboolean photo_is_extension_found (const gchar* basename, gchar** extensions, int extensions_length1); -void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext); -gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format); -gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format); -PhotoID* photo_get_duplicate_ids (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, int* result_length1); -PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format, int* result_length1); +static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, + gint scale, + GError** error); +GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, + Scaling* scaling, + GError** error); +void scaling_for_best_fit (gint pixels, + gboolean scale_up, + Scaling* result); +static gboolean photo_is_extension_found (const gchar* basename, + gchar** extensions, + int extensions_length1); +void disassemble_filename (const gchar* basename, + gchar* * name, + gchar* * ext); +gboolean photo_is_duplicate (GFile* file, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format); +gboolean photo_table_has_duplicate (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format); +PhotoID* photo_get_duplicate_ids (GFile* file, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format, + int* result_length1); +PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format, + int* result_length1); gint64 photo_get_photo_key (DataSource* source); GType library_photo_get_type (void) G_GNUC_CONST; static GFile* photo_real_get_file (MediaSource* base); -void photo_set_master_file (Photo* self, GFile* file); -void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* filepath, GError** error); -void media_source_notify_master_replaced (MediaSource* self, GFile* old_file, GFile* new_file); -static void _vala_array_add100 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add101 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add102 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add103 (gchar** * array, int* length, int* size, gchar* value); -void photo_set_editable_file (Photo* self, GFile* file); -void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error); -static void _vala_array_add104 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add105 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add106 (gchar** * array, int* length, int* size, gchar* value); -void photo_set_many_editable_file (GeeMap* map, GError** error); +void photo_set_master_file (Photo* self, + GFile* file); +void photo_table_set_filepath (PhotoTable* self, + PhotoID* photo_id, + const gchar* filepath, + GError** error); +void media_source_notify_master_replaced (MediaSource* self, + GFile* old_file, + GFile* new_file); +static void _vala_array_add100 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add101 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add102 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add103 (gchar** * array, + int* length, + int* size, + gchar* value); +void photo_set_editable_file (Photo* self, + GFile* file); +void backing_photo_table_set_filepath (BackingPhotoTable* self, + BackingPhotoID* id, + const gchar* filepath, + GError** error); +static void _vala_array_add104 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add105 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add106 (gchar** * array, + int* length, + int* size, + gchar* value); +void photo_set_many_editable_file (GeeMap* map, + GError** error); GFile* photo_get_actual_file (Photo* self); static GFile* photo_real_get_master_file (MediaSource* base); GFile* photo_get_source_file (Photo* self); gboolean photo_file_format_can_write (PhotoFileFormat self); static time_t photo_real_get_timestamp (MediaSource* base); -static inline void photo_real_get_event_id (MediaSource* base, EventID* result); +static inline void photo_real_get_event_id (MediaSource* base, + EventID* result); gint64 photo_get_raw_event_id (Photo* self); -static void photo_real_get_import_id (MediaSource* base, ImportID* result); +static void photo_real_get_import_id (MediaSource* base, + ImportID* result); static gchar* photo_real_get_master_md5 (MediaSource* base); guint64 photo_get_flags (Photo* self); -static void photo_notify_flags_altered (Photo* self, Alteration* additional_alteration); -Alteration* alteration_compress (Alteration* self, Alteration* other); -guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_alteration); -gboolean photo_table_replace_flags (PhotoTable* self, PhotoID* photo_id, guint64 flags); -gboolean photo_is_flag_set (Photo* self, guint64 mask); -gboolean media_source_internal_is_flag_set (guint64 flags, guint64 selector); -guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alteration); -guint64 media_source_internal_add_flags (guint64 flags, guint64 selector); -guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_alteration); -guint64 media_source_internal_remove_flags (guint64 flags, guint64 selector); -guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Alteration* additional_alteration); -void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alteration* additional_add_alteration, GeeCollection* remove, guint64 remove_mask, Alteration* additional_remove_alteration, GError** error); -guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_alteration); +static void photo_notify_flags_altered (Photo* self, + Alteration* additional_alteration); +Alteration* alteration_compress (Alteration* self, + Alteration* other); +guint64 photo_replace_flags (Photo* self, + guint64 flags, + Alteration* additional_alteration); +gboolean photo_table_replace_flags (PhotoTable* self, + PhotoID* photo_id, + guint64 flags); +gboolean photo_is_flag_set (Photo* self, + guint64 mask); +gboolean media_source_internal_is_flag_set (guint64 flags, + guint64 selector); +guint64 photo_add_flags (Photo* self, + guint64 mask, + Alteration* additional_alteration); +guint64 media_source_internal_add_flags (guint64 flags, + guint64 selector); +guint64 photo_remove_flags (Photo* self, + guint64 mask, + Alteration* additional_alteration); +guint64 media_source_internal_remove_flags (guint64 flags, + guint64 selector); +guint64 photo_add_remove_flags (Photo* self, + guint64 add, + guint64 remove, + Alteration* additional_alteration); +void photo_add_remove_many_flags (GeeCollection* add, + guint64 add_mask, + Alteration* additional_add_alteration, + GeeCollection* remove, + guint64 remove_mask, + Alteration* additional_remove_alteration, + GError** error); +guint64 photo_toggle_flags (Photo* self, + guint64 mask, + Alteration* additional_alteration); gboolean photo_is_master_metadata_dirty (Photo* self); -void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** error); -void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboolean dirty, GError** error); +void photo_set_master_metadata_dirty (Photo* self, + gboolean dirty, + GError** error); +void photo_table_set_metadata_dirty (PhotoTable* self, + PhotoID* photo_id, + gboolean dirty, + GError** error); static Rating photo_real_get_rating (MediaSource* base); -static void photo_real_set_rating (MediaSource* base, Rating rating); -gboolean photo_table_set_rating (PhotoTable* self, PhotoID* photo_id, Rating rating); +static void photo_real_set_rating (MediaSource* base, + Rating rating); +gboolean photo_table_set_rating (PhotoTable* self, + PhotoID* photo_id, + Rating rating); static void photo_real_increase_rating (MediaSource* base); static void photo_real_decrease_rating (MediaSource* base); -static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sources, const gchar* backlinks); -void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gchar* backlinks, GError** error); -static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id); -gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* event_id); +static void photo_real_commit_backlinks (DataSource* base, + SourceCollection* sources, + const gchar* backlinks); +void photo_table_update_backlinks (PhotoTable* self, + PhotoID* photo_id, + const gchar* backlinks, + GError** error); +static gboolean photo_real_set_event_id (MediaSource* base, + EventID* event_id); +gboolean photo_table_set_event (PhotoTable* self, + PhotoID* photo_id, + EventID* event_id); static gchar* photo_real_to_string (DataObject* base); gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self); -static gboolean photo_real_equals (DataSource* base, DataSource* source); -gboolean data_source_equals (DataSource* self, DataSource* source); +static gboolean photo_real_equals (DataSource* base, + DataSource* source); +gboolean data_source_equals (DataSource* self, + DataSource* source); static void photo_file_exif_updated (Photo* self); GFile* media_source_get_file (MediaSource* self); -gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gint64 filesize, glong timestamp, const gchar* md5, const gchar* exif_md5, const gchar* thumbnail_md5, PhotoRow* row); +gboolean photo_table_master_exif_updated (PhotoTable* self, + PhotoID* photoID, + gint64 filesize, + glong timestamp, + const gchar* md5, + const gchar* exif_md5, + const gchar* thumbnail_md5, + PhotoRow* row); static guint64 photo_real_get_filesize (MediaSource* base); static guint64 photo_real_get_master_filesize (MediaSource* base); guint64 photo_get_editable_filesize (Photo* self); @@ -2267,55 +2748,113 @@ static time_t photo_real_get_exposure_time (Dateable* base); static gchar* photo_real_get_basename (MediaSource* base); static gchar* photo_real_get_title (MediaSource* base); static gchar* photo_real_get_comment (MediaSource* base); -static void photo_real_set_title (MediaSource* base, const gchar* title); -gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar* new_title); -static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment); -gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gchar* new_comment); -void photo_set_import_id (Photo* self, ImportID* import_id); -void photo_table_set_import_id (PhotoTable* self, PhotoID* photo_id, ImportID* import_id, GError** error); -void photo_set_title_persistent (Photo* self, const gchar* title, GError** error); +static void photo_real_set_title (MediaSource* base, + const gchar* title); +gboolean photo_table_set_title (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_title); +static gboolean photo_real_set_comment (MediaSource* base, + const gchar* comment); +gboolean photo_table_set_comment (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_comment); +void photo_set_import_id (Photo* self, + ImportID* import_id); +void photo_table_set_import_id (PhotoTable* self, + PhotoID* photo_id, + ImportID* import_id, + GError** error); +void photo_set_title_persistent (Photo* self, + const gchar* title, + GError** error); gboolean photo_file_format_can_write_metadata (PhotoFileFormat self); -PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error); +PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, + GError** error); GType photo_metadata_set_option_get_type (void) G_GNUC_CONST; -void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMetadataSetOption option); -PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileReader* self, GError** error); -void library_monitor_blacklist_file (GFile* file, const gchar* reason); +void photo_metadata_set_title (PhotoMetadata* self, + const gchar* title, + PhotoMetadataSetOption option); +PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileReader* self, + GError** error); +void library_monitor_blacklist_file (GFile* file, + const gchar* reason); void library_monitor_unblacklist_file (GFile* file); -void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** error); -void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, PhotoMetadataSetOption option); -static void photo_real_set_exposure_time (Dateable* base, time_t time); -gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, time_t time); -void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** error); -void dateable_set_exposure_time (Dateable* self, time_t target_time); -void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option); +void photo_set_comment_persistent (Photo* self, + const gchar* comment, + GError** error); +void photo_metadata_set_comment (PhotoMetadata* self, + const gchar* comment, + PhotoMetadataSetOption option); +static void photo_real_set_exposure_time (Dateable* base, + time_t time); +gboolean photo_table_set_exposure_time (PhotoTable* self, + PhotoID* photo_id, + time_t time); +void photo_set_exposure_time_persistent (Photo* self, + time_t time, + GError** error); +void dateable_set_exposure_time (Dateable* self, + time_t target_time); +void photo_metadata_set_exposure_date_time (PhotoMetadata* self, + MetadataDateTime* date_time, + PhotoMetadataSetOption option); MetadataDateTime* metadata_date_time_new (time_t timestamp); -MetadataDateTime* metadata_date_time_construct (GType object_type, time_t timestamp); -static void photo_real_get_dimensions (MediaSource* base, PhotoException disallowed_steps, Dimensions* result); -void photo_get_raw_dimensions (Photo* self, Dimensions* result); +MetadataDateTime* metadata_date_time_construct (GType object_type, + time_t timestamp); +static void photo_real_get_dimensions (MediaSource* base, + PhotoException disallowed_steps, + Dimensions* result); +void photo_get_raw_dimensions (Photo* self, + Dimensions* result); Orientation photo_get_orientation (Photo* self); -gboolean photo_get_straighten (Photo* self, gdouble* theta); -void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble angle, gdouble* dest_width, gdouble* dest_height); +gboolean photo_get_straighten (Photo* self, + gdouble* theta); +void compute_arb_rotated_size (gdouble src_width, + gdouble src_height, + gdouble angle, + gdouble* dest_width, + gdouble* dest_height); GType box_get_type (void) G_GNUC_CONST; Box* box_dup (const Box* self); void box_free (Box* self); -gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions); -void box_get_dimensions (Box *self, Dimensions* result); +gboolean photo_get_crop (Photo* self, + Box* crop, + PhotoException exceptions); +void box_get_dimensions (Box *self, + Dimensions* result); static void photo_locked_create_adjustments_from_data (Photo* self); -static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name); +static KeyValueMap* photo_get_transformation (Photo* self, + const gchar* name); PixelTransformationBundle* photo_get_color_adjustments (Photo* self); PixelTransformer* photo_get_pixel_transformer (Photo* self); gboolean photo_has_color_adjustments (Photo* self); -static gboolean photo_has_transformation (Photo* self, const gchar* name); -PixelTransformation* photo_get_color_adjustment (Photo* self, PixelTransformationType type); -void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_adjustments); -static gboolean photo_remove_transformation (Photo* self, const gchar* name); -static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans); +static gboolean photo_has_transformation (Photo* self, + const gchar* name); +PixelTransformation* photo_get_color_adjustment (Photo* self, + PixelTransformationType type); +void photo_set_color_adjustments (Photo* self, + PixelTransformationBundle* new_adjustments); +static gboolean photo_remove_transformation (Photo* self, + const gchar* name); +static gboolean photo_set_transformation (Photo* self, + KeyValueMap* trans); static PhotoMetadata* photo_real_get_metadata (PhotoSource* base); -PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error); -gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportMasterState* * state, GError** error); -void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState* state, GError** error); -gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportEditableState* * state, GError** error); -void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableState* state, GError** error); +PhotoMetadata* photo_get_editable_metadata (Photo* self, + GError** error); +gboolean photo_persist_master_metadata (Photo* self, + PhotoMetadata* metadata, + PhotoReimportMasterState* * state, + GError** error); +void photo_finish_update_master_metadata (Photo* self, + PhotoReimportMasterState* state, + GError** error); +gboolean photo_persist_editable_metadata (Photo* self, + PhotoMetadata* metadata, + PhotoReimportEditableState* * state, + GError** error); +void photo_finish_update_editable_metadata (Photo* self, + PhotoReimportEditableState* state, + GError** error); gboolean photo_has_transformations (Photo* self); gboolean photo_only_metadata_changed (Photo* self); PhotoMetadata* photo_source_get_metadata (PhotoSource* self); @@ -2323,217 +2862,415 @@ gboolean photo_has_alterations (Photo* self); gchar* media_source_get_comment (MediaSource* self); gchar* media_source_get_title (MediaSource* self); PhotoTransformationState* photo_save_transformation_state (Photo* self); -static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_new (Photo* photo, Orientation orientation, GeeHashMap* transformations, PixelTransformer* transformer, PixelTransformationBundle* adjustments); -static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_construct (GType object_type, Photo* photo, Orientation orientation, GeeHashMap* transformations, PixelTransformer* transformer, PixelTransformationBundle* adjustments); +static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_new (Photo* photo, + Orientation orientation, + GeeHashMap* transformations, + PixelTransformer* transformer, + PixelTransformationBundle* adjustments); +static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_construct (GType object_type, + Photo* photo, + Orientation orientation, + GeeHashMap* transformations, + PixelTransformer* transformer, + PixelTransformationBundle* adjustments); static GType photo_photo_transformation_state_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* state); +gboolean photo_load_transformation_state (Photo* self, + PhotoTransformationState* state); static Orientation photo_photo_transformation_state_impl_get_orientation (PhotoPhotoTransformationStateImpl* self); static GeeHashMap* photo_photo_transformation_state_impl_get_transformations (PhotoPhotoTransformationStateImpl* self); static PixelTransformer* photo_photo_transformation_state_impl_get_transformer (PhotoPhotoTransformationStateImpl* self); static PixelTransformationBundle* photo_photo_transformation_state_impl_get_color_adjustments (PhotoPhotoTransformationStateImpl* self); -gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_id, Orientation orientation, GeeHashMap* transformations); +gboolean photo_table_set_transformation_state (PhotoTable* self, + PhotoID* photo_id, + Orientation orientation, + GeeHashMap* transformations); void photo_remove_all_transformations (Photo* self); -gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* photo_id); -gboolean photo_table_set_orientation (PhotoTable* self, PhotoID* photo_id, Orientation orientation); +gboolean photo_table_remove_all_transformations (PhotoTable* self, + PhotoID* photo_id); +gboolean photo_table_set_orientation (PhotoTable* self, + PhotoID* photo_id, + Orientation orientation); Orientation photo_get_original_orientation (Photo* self); gboolean photo_check_can_rotate (Photo* self); -void photo_rotate (Photo* self, Rotation rotation); -static void photo_real_rotate (Photo* self, Rotation rotation); -Orientation orientation_perform (Orientation self, Rotation rotation); -gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, KeyValueMap* map); -gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, const gchar* object); +void photo_rotate (Photo* self, + Rotation rotation); +static void photo_real_rotate (Photo* self, + Rotation rotation); +Orientation orientation_perform (Orientation self, + Rotation rotation); +gboolean photo_table_set_transformation (PhotoTable* self, + PhotoID* photo_id, + KeyValueMap* map); +gboolean photo_table_remove_transformation (PhotoTable* self, + PhotoID* photo_id, + const gchar* object); gboolean photo_has_crop (Photo* self); -gboolean photo_get_raw_crop (Photo* self, Box* crop); -void box_init (Box *self, gint left, gint top, gint right, gint bottom); -static void photo_set_raw_crop (Photo* self, Box* crop); -static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle); -static void photo_set_raw_straighten (Photo* self, gdouble theta); +gboolean photo_get_raw_crop (Photo* self, + Box* crop); +void box_init (Box *self, + gint left, + gint top, + gint right, + gint bottom); +static void photo_set_raw_crop (Photo* self, + Box* crop); +static gboolean photo_get_raw_straighten (Photo* self, + gdouble* angle); +static void photo_set_raw_straighten (Photo* self, + gdouble theta); GType editing_tools_redeye_instance_get_type (void) G_GNUC_CONST; EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingToolsRedeyeInstance* self); void editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self); -static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, int* result_length1); +static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, + int* result_length1); gboolean photo_has_redeye_transformations (Photo* self); -void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye); -static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling, PhotoException exceptions, Dimensions* scaled_image, Dimensions* scaled_to_viewport); -static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling, PhotoException exceptions, Dimensions* scaled_image, Dimensions* scaled_to_viewport); +void photo_add_redeye_instance (Photo* self, + EditingToolsRedeyeInstance* redeye); +static gboolean photo_calculate_pixbuf_dimensions (Photo* self, + Scaling* scaling, + PhotoException exceptions, + Dimensions* scaled_image, + Dimensions* scaled_to_viewport); +static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, + Scaling* scaling, + PhotoException exceptions, + Dimensions* scaled_image, + Dimensions* scaled_to_viewport); gboolean scaling_is_unscaled (Scaling *self); -void orientation_rotate_box (Orientation self, Dimensions* space, Box* box, Box* result); -void orientation_rotate_dimensions (Orientation self, Dimensions* dim, Dimensions* result); -void box_get_scaled (Box *self, Dimensions* scaled, Box* result); -void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensions* result); +void orientation_rotate_box (Orientation self, + Dimensions* space, + Box* box, + Box* result); +void orientation_rotate_dimensions (Orientation self, + Dimensions* dim, + Dimensions* result); +void box_get_scaled (Box *self, + Dimensions* scaled, + Box* result); +void scaling_get_scaled_dimensions (Scaling *self, + Dimensions* original, + Dimensions* result); gint box_get_width (Box *self); gint box_get_height (Box *self); -void dimensions_get_scaled_similar (Dimensions *self, Dimensions* original, Dimensions* scaled, Dimensions* result); -void orientation_derotate_dimensions (Orientation self, Dimensions* dim, Dimensions* result); +void dimensions_get_scaled_similar (Dimensions *self, + Dimensions* original, + Dimensions* scaled, + Dimensions* result); +void orientation_derotate_dimensions (Orientation self, + Dimensions* dim, + Dimensions* result); gboolean dimensions_has_area (Dimensions *self); -static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error); -GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self, GError** error); -GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error); -gboolean dimensions_approx_equals (Dimensions *self, Dimensions* dim, gint fudge); -void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result); -static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, BackingFetchMode fetch_mode, GError** error); -GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, GError** error); -GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf); -static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GError** error); -GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error); -static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, GError** error); -static PhotoCachedPixbuf* photo_cached_pixbuf_new (Photo* photo, GdkPixbuf* pixbuf); -static PhotoCachedPixbuf* photo_cached_pixbuf_construct (GType object_type, Photo* photo, GdkPixbuf* pixbuf); +static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, + Scaling* scaling, + PhotoException exceptions, + BackingFetchMode fetch_mode, + GError** error); +GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self, + GError** error); +GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, + Dimensions* full, + Dimensions* scaled, + GError** error); +gboolean dimensions_approx_equals (Dimensions *self, + Dimensions* dim, + gint fudge); +void dimensions_for_pixbuf (GdkPixbuf* pixbuf, + Dimensions* result); +static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, + Scaling* scaling, + gboolean rotate, + BackingFetchMode fetch_mode, + GError** error); +GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, + Scaling* scaling, + gboolean rotate, + GError** error); +GdkPixbuf* orientation_rotate_pixbuf (Orientation self, + GdkPixbuf* pixbuf); +static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, + Scaling* scaling, + GError** error); +GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, + Scaling* scaling, + PhotoException exceptions, + BackingFetchMode fetch_mode, + GError** error); +static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, + gboolean keep, + GError** error); +static PhotoCachedPixbuf* photo_cached_pixbuf_new (Photo* photo, + GdkPixbuf* pixbuf); +static PhotoCachedPixbuf* photo_cached_pixbuf_construct (GType object_type, + Photo* photo, + GdkPixbuf* pixbuf); static gboolean photo_trim_source_pixbuf_cache (void); static gboolean _photo_trim_source_pixbuf_cache_gsource_func (gpointer self); gboolean photo_get_develop_raw_photos_to_files (void); -void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result); -gboolean dimensions_equals (Dimensions *self, Dimensions* dim); -static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsRedeyeInstance* inst); -GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle); +void media_source_get_dimensions (MediaSource* self, + PhotoException disallowed_steps, + Dimensions* result); +gboolean dimensions_equals (Dimensions *self, + Dimensions* dim); +static GdkPixbuf* photo_do_redeye (Photo* self, + GdkPixbuf* pixbuf, + EditingToolsRedeyeInstance* inst); +GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, + gdouble angle); gboolean photo_has_user_generated_metadata (Photo* self); static gboolean photo_real_has_user_generated_metadata (Photo* self); -void photo_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata); -static void photo_real_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata); +void photo_set_user_metadata_for_export (Photo* self, + PhotoMetadata* metadata); +static void photo_real_set_user_metadata_for_export (Photo* self, + PhotoMetadata* metadata); gpointer photo_file_format_properties_ref (gpointer instance); void photo_file_format_properties_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_properties (GValue* value, gpointer v_object); -void value_take_photo_file_format_properties (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_properties (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_properties (GValue* value, + gpointer v_object); +void value_take_photo_file_format_properties (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_properties (const GValue* value); GType photo_file_format_properties_get_type (void) G_GNUC_CONST; PhotoFileFormatProperties* photo_file_format_get_properties (PhotoFileFormat self); -GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatProperties* self, GFile* file); -static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboolean export_metadata, GError** error); +GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatProperties* self, + GFile* file); +static gboolean photo_export_fullsized_backing (Photo* self, + GFile* file, + gboolean export_metadata, + GError** error); PhotoMetadata* photo_file_format_create_metadata (PhotoFileFormat self); time_t media_source_get_exposure_time (MediaSource* self); -void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim, PhotoMetadataSetOption option); -void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientation); -void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, const gchar* version); +void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, + Dimensions* dim, + PhotoMetadataSetOption option); +void photo_metadata_set_orientation (PhotoMetadata* self, + Orientation orientation); +void photo_metadata_set_software (PhotoMetadata* self, + const gchar* software, + const gchar* version); #define RESOURCES_APP_TITLE "Shotwell" #define RESOURCES_APP_VERSION _VERSION void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self); void photo_metadata_clear (PhotoMetadata* self); -gboolean photo_is_export_required (Photo* self, Scaling* scaling, PhotoFileFormat export_format); -void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error); +gboolean photo_is_export_required (Photo* self, + Scaling* scaling, + PhotoFileFormat export_format); +void photo_export (Photo* self, + GFile* dest_file, + Scaling* scaling, + JpegQuality quality, + PhotoFileFormat export_format, + gboolean direct_copy_unmodified, + gboolean export_metadata, + GError** error); const gchar* photo_file_format_to_string (PhotoFileFormat self); -void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag); -static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* file_format, GError** error); -gboolean photo_file_format_properties_is_recognized_extension (PhotoFileFormatProperties* self, const gchar* ext); +void photo_metadata_remove_tag (PhotoMetadata* self, + const gchar* tag); +static GFile* photo_generate_new_editable_file (Photo* self, + PhotoFileFormat* file_format, + GError** error); +gboolean photo_file_format_properties_is_recognized_extension (PhotoFileFormatProperties* self, + const gchar* ext); gchar* photo_file_format_properties_get_default_extension (PhotoFileFormatProperties* self); -GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error); -static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, GError** error); +GFile* generate_unique_file (GFile* dir, + const gchar* basename, + gboolean* collision, + GError** error); +static gboolean photo_launch_editor (GFile* file, + PhotoFileFormat file_format, + GError** error); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self); gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self); static void _g_object_unref0_ (gpointer var); -static void _g_list_free__g_object_unref0_ (GList* self); -void photo_open_with_raw_external_editor (Photo* self, GError** error); -void photo_open_with_external_editor (Photo* self, GError** error); +static inline void _g_list_free__g_object_unref0_ (GList* self); +void photo_open_with_raw_external_editor (Photo* self, + GError** error); +void photo_open_with_external_editor (Photo* self, + GError** error); static void photo_halt_monitoring_editable (Photo* self); -static void photo_attach_editable (Photo* self, PhotoFileFormat file_format, GFile* file, GError** error); -static void photo_start_monitoring_editable (Photo* self, GFile* file, GError** error); -static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* other_file, GFileMonitorEvent event); -static void _photo_on_editable_file_changed_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self); -static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoFileReader* new_reader, GError** error); -static void photo_update_editable_attributes (Photo* self, GError** error); -void photo_reimport_editable (Photo* self, GError** error); -void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoID* editable_id, GError** error); -void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, gint64 filesize, GError** error); -static void _vala_array_add107 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add108 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add109 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add110 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add111 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add112 (gchar** * array, int* length, int* size, gchar* value); -void backing_photo_id_init (BackingPhotoID *self, gint64 id); +static void photo_attach_editable (Photo* self, + PhotoFileFormat file_format, + GFile* file, + GError** error); +static void photo_start_monitoring_editable (Photo* self, + GFile* file, + GError** error); +static void photo_on_editable_file_changed (Photo* self, + GFile* file, + GFile* other_file, + GFileMonitorEvent event); +static void _photo_on_editable_file_changed_g_file_monitor_changed (GFileMonitor* _sender, + GFile* file, + GFile* other_file, + GFileMonitorEvent event_type, + gpointer self); +static void photo_update_editable (Photo* self, + gboolean only_attributes, + PhotoFileReader* new_reader, + GError** error); +static void photo_update_editable_attributes (Photo* self, + GError** error); +void photo_reimport_editable (Photo* self, + GError** error); +void photo_table_attach_editable (PhotoTable* self, + PhotoRow* row, + BackingPhotoID* editable_id, + GError** error); +void backing_photo_table_update_attributes (BackingPhotoTable* self, + BackingPhotoID* id, + time_t timestamp, + gint64 filesize, + GError** error); +static void _vala_array_add107 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add108 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add109 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add110 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add111 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add112 (gchar** * array, + int* length, + int* size, + gchar* value); +void backing_photo_id_init (BackingPhotoID *self, + gint64 id); const gchar* g_file_monitor_event_to_string (GFileMonitorEvent self); static void photo_on_reimport_editable (Photo* self); static void _photo_on_reimport_editable_one_shot_callback (gpointer self); -OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target); -OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target); -void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule); +OneShotScheduler* one_shot_scheduler_new (const gchar* name, + OneShotCallback callback, + void* callback_target); +OneShotScheduler* one_shot_scheduler_construct (GType object_type, + const gchar* name, + OneShotCallback callback, + void* callback_target); +void one_shot_scheduler_after_timeout (OneShotScheduler* self, + guint msec, + gboolean reschedule); static void photo_on_update_editable_attributes (Photo* self); static void _photo_on_update_editable_attributes_one_shot_callback (gpointer self); static void photo_on_remove_editable (Photo* self); static void _photo_on_remove_editable_one_shot_callback (gpointer self); -void photo_get_original_dimensions (Photo* self, Dimensions* result); -void photo_get_master_dimensions (Photo* self, Dimensions* result); -void photo_set_crop (Photo* self, Box* crop); -void orientation_derotate_box (Orientation self, Dimensions* space, Box* box, Box* result); -void photo_set_straighten (Photo* self, gdouble theta); -static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x, gint y); -void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoint* result); -void orientation_derotate_point (Orientation self, Dimensions* space, GdkPoint* point, GdkPoint* result); -void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRectangle* result); +void photo_get_original_dimensions (Photo* self, + Dimensions* result); +void photo_get_master_dimensions (Photo* self, + Dimensions* result); +void photo_set_crop (Photo* self, + Box* crop); +void orientation_derotate_box (Orientation self, + Dimensions* space, + Box* box, + Box* result); +void photo_set_straighten (Photo* self, + gdouble theta); +static GdkPixbuf* photo_red_reduce_pixel (Photo* self, + GdkPixbuf* pixbuf, + gint x, + gint y); +void photo_unscaled_to_raw_point (Photo* self, + GdkPoint* unscaled_point, + GdkPoint* result); +void orientation_derotate_point (Orientation self, + Dimensions* space, + GdkPoint* point, + GdkPoint* result); +void photo_unscaled_to_raw_rect (Photo* self, + GdkRectangle* unscaled_rect, + GdkRectangle* result); PixelTransformationBundle* photo_get_enhance_transformations (Photo* self); gboolean photo_enhance (Photo* self); void photo_set_develop_raw_photos_to_files (gboolean value); -static void photo_real_editable_replaced (Photo* self, GFile* old_file, GFile* new_file); -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); +static void photo_real_editable_replaced (Photo* self, + GFile* old_file, + GFile* new_file); +static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); static void photo_real_raw_development_modified (Photo* self); static void photo_real_baseline_replaced (Photo* self); -static void photo_real_master_reimported (Photo* self, PhotoMetadata* metadata); -static void g_cclosure_user_marshal_VOID__MEDIA_METADATA (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void photo_real_editable_reimported (Photo* self, PhotoMetadata* metadata); -static void photo_real_baseline_reimported (Photo* self, PhotoMetadata* metadata); -static void photo_real_source_reimported (Photo* self, PhotoMetadata* metadata); +static void photo_real_master_reimported (Photo* self, + PhotoMetadata* metadata); +static void g_cclosure_user_marshal_VOID__MEDIA_METADATA (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void photo_real_editable_reimported (Photo* self, + PhotoMetadata* metadata); +static void photo_real_baseline_reimported (Photo* self, + PhotoMetadata* metadata); +static void photo_real_source_reimported (Photo* self, + PhotoMetadata* metadata); #define PHOTO_PHOTO_TRANSFORMATION_STATE_IMPL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PHOTO_TYPE_PHOTO_TRANSFORMATION_STATE_IMPL, PhotoPhotoTransformationStateImplPrivate)) -enum { - PHOTO_PHOTO_TRANSFORMATION_STATE_IMPL_DUMMY_PROPERTY -}; static void photo_photo_transformation_state_impl_on_photo_baseline_replaced (PhotoPhotoTransformationStateImpl* self); -static void _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced (Photo* _sender, gpointer self); +static void _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced (Photo* _sender, + gpointer self); static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (GeeHashMap* original); static void photo_photo_transformation_state_impl_finalize (GObject * obj); -enum { - PHOTO_BACKING_READERS_DUMMY_PROPERTY -}; static void photo_backing_readers_finalize (PhotoBackingReaders * obj); -enum { - PHOTO_CACHED_PIXBUF_DUMMY_PROPERTY -}; static void photo_cached_pixbuf_finalize (PhotoCachedPixbuf * obj); -enum { - PHOTO_REIMPORT_MASTER_STATE_DUMMY_PROPERTY -}; PhotoReimportMasterState* photo_reimport_master_state_construct (GType object_type); static void photo_reimport_master_state_finalize (PhotoReimportMasterState * obj); -enum { - PHOTO_REIMPORT_MASTER_STATE_IMPL_DUMMY_PROPERTY -}; -static gchar** _vala_array_dup24 (gchar** self, int length); +static gchar** _vala_array_dup24 (gchar** self, + int length); static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState * obj); -enum { - PHOTO_REIMPORT_EDITABLE_STATE_DUMMY_PROPERTY -}; PhotoReimportEditableState* photo_reimport_editable_state_construct (GType object_type); static void photo_reimport_editable_state_finalize (PhotoReimportEditableState * obj); -enum { - PHOTO_REIMPORT_EDITABLE_STATE_IMPL_DUMMY_PROPERTY -}; static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableState * obj); -enum { - PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_DUMMY_PROPERTY -}; PhotoReimportRawDevelopmentState* photo_reimport_raw_development_state_construct (GType object_type); static void photo_reimport_raw_development_state_finalize (PhotoReimportRawDevelopmentState * obj); -enum { - PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_DUMMY_PROPERTY -}; -static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_new (BackingPhotoRow* backing, PhotoMetadata* metadata); -static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_construct (GType object_type, BackingPhotoRow* backing, PhotoMetadata* metadata); -enum { - PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_DEV_TO_REIMPORT_DUMMY_PROPERTY -}; +static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_new (BackingPhotoRow* backing, + PhotoMetadata* metadata); +static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_construct (GType object_type, + BackingPhotoRow* backing, + PhotoMetadata* metadata); static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (PhotoReimportRawDevelopmentStateImplDevToReimport * obj); static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRawDevelopmentState * obj); static void photo_finalize (GObject * obj); -static void _vala_photo_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void _vala_photo_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); +static void _vala_photo_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); +static void _vala_photo_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec); GType marker_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; @@ -2542,75 +3279,154 @@ GType database_source_holding_tank_get_type (void) G_GNUC_CONST; GType media_source_holding_tank_get_type (void) G_GNUC_CONST; gpointer workers_ref (gpointer instance); void workers_unref (gpointer instance); -GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_workers (GValue* value, gpointer v_object); -void value_take_workers (GValue* value, gpointer v_object); +GParamSpec* param_spec_workers (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_workers (GValue* value, + gpointer v_object); +void value_take_workers (GValue* value, + gpointer v_object); gpointer value_get_workers (const GValue* value); GType workers_get_type (void) G_GNUC_CONST; GType media_monitor_get_type (void) G_GNUC_CONST; gpointer transaction_controller_ref (gpointer instance); void transaction_controller_unref (gpointer instance); -GParamSpec* param_spec_transaction_controller (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_transaction_controller (GValue* value, gpointer v_object); -void value_take_transaction_controller (GValue* value, gpointer v_object); +GParamSpec* param_spec_transaction_controller (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_transaction_controller (GValue* value, + gpointer v_object); +void value_take_transaction_controller (GValue* value, + gpointer v_object); gpointer value_get_transaction_controller (const GValue* value); GType transaction_controller_get_type (void) G_GNUC_CONST; GType library_photo_source_collection_get_type (void) G_GNUC_CONST; #define LIBRARY_PHOTO_SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollectionPrivate)) -enum { - LIBRARY_PHOTO_SOURCE_COLLECTION_DUMMY_PROPERTY -}; GType library_photo_source_collection_state_get_type (void) G_GNUC_CONST; guint file_hash (GFile* file); -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self); -gboolean file_equal (GFile* a, GFile* b); -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); -gint int64_compare (gint64* a, gint64* b); -static gint _int64_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); +static guint _file_hash_gee_hash_data_func (gconstpointer v, + gpointer self); +gboolean file_equal (GFile* a, + GFile* b); +static gboolean _file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); +gint int64_compare (gint64* a, + gint64* b); +static gint _int64_compare_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self); static gint64* _int64_dup (gint64* self); -gboolean int64_equal (gint64* a, gint64* b); -static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); +gboolean int64_equal (gint64* a, + gint64* b); +static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); LibraryPhotoSourceCollection* library_photo_source_collection_new (void); LibraryPhotoSourceCollection* library_photo_source_collection_construct (GType object_type); -static gint64 _photo_get_photo_key_get_source_database_key (DataSource* source, gpointer self); -MediaSourceCollection* media_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target); +static gint64 _photo_get_photo_key_get_source_database_key (DataSource* source, + gpointer self); +MediaSourceCollection* media_source_collection_construct (GType object_type, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target); MediaSourceHoldingTank* media_source_collection_get_trashcan (MediaSourceCollection* self); -static void library_photo_source_collection_on_trashcan_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed); -static void _library_photo_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self); +static void library_photo_source_collection_on_trashcan_contents_altered (LibraryPhotoSourceCollection* self, + GeeCollection* added, + GeeCollection* removed); +static void _library_photo_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self); MediaSourceHoldingTank* media_source_collection_get_offline_bin (MediaSourceCollection* self); -static void library_photo_source_collection_on_offline_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed); -static void _library_photo_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self); +static void library_photo_source_collection_on_offline_contents_altered (LibraryPhotoSourceCollection* self, + GeeCollection* added, + GeeCollection* removed); +static void _library_photo_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self); static MediaSourceHoldingTank* library_photo_source_collection_real_create_trashcan (MediaSourceCollection* base); -static gboolean library_photo_source_collection_check_if_trashed_photo (LibraryPhotoSourceCollection* self, DataSource* source, Alteration* alteration); -static gboolean _library_photo_source_collection_check_if_trashed_photo_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self); -LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_new (LibraryPhotoSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target); -LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_construct (GType object_type, LibraryPhotoSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target); +static gboolean library_photo_source_collection_check_if_trashed_photo (LibraryPhotoSourceCollection* self, + DataSource* source, + Alteration* alteration); +static gboolean _library_photo_source_collection_check_if_trashed_photo_source_holding_tank_check_to_keep (DataSource* source, + Alteration* alteration, + gpointer self); +LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_new (LibraryPhotoSourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target); +LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_construct (GType object_type, + LibraryPhotoSourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target); GType library_photo_source_holding_tank_get_type (void) G_GNUC_CONST; static MediaSourceHoldingTank* library_photo_source_collection_real_create_offline_bin (MediaSourceCollection* base); -static gboolean library_photo_source_collection_check_if_offline_photo (LibraryPhotoSourceCollection* self, DataSource* source, Alteration* alteration); -static gboolean _library_photo_source_collection_check_if_offline_photo_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self); -static MediaMonitor* library_photo_source_collection_real_create_media_monitor (MediaSourceCollection* base, Workers* workers, GCancellable* cancellable); -PhotoMonitor* photo_monitor_new (Workers* workers, GCancellable* cancellable); -PhotoMonitor* photo_monitor_construct (GType object_type, Workers* workers, GCancellable* cancellable); +static gboolean library_photo_source_collection_check_if_offline_photo (LibraryPhotoSourceCollection* self, + DataSource* source, + Alteration* alteration); +static gboolean _library_photo_source_collection_check_if_offline_photo_source_holding_tank_check_to_keep (DataSource* source, + Alteration* alteration, + gpointer self); +static MediaMonitor* library_photo_source_collection_real_create_media_monitor (MediaSourceCollection* base, + Workers* workers, + GCancellable* cancellable); +PhotoMonitor* photo_monitor_new (Workers* workers, + GCancellable* cancellable); +PhotoMonitor* photo_monitor_construct (GType object_type, + Workers* workers, + GCancellable* cancellable); GType photo_monitor_get_type (void) G_GNUC_CONST; -static gboolean library_photo_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source); +static gboolean library_photo_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source); static gchar* library_photo_source_collection_real_get_typename (MediaSourceCollection* base); -static gboolean library_photo_source_collection_real_is_file_recognized (MediaSourceCollection* base, GFile* file); -static void library_photo_source_collection_real_notify_contents_altered (DataCollection* base, GeeIterable* added, GeeIterable* removed); -static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSourceCollection* self, Photo* photo, GFile* old_file, GFile* new_file); -static void _library_photo_source_collection_on_editable_replaced_photo_editable_replaced (Photo* _sender, GFile* old_file, GFile* new_file, gpointer self); -static void library_photo_source_collection_on_raw_development_modified (LibraryPhotoSourceCollection* self, Photo* _photo); -static void _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self); -void data_collection_notify_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed); -static void library_photo_source_collection_real_items_altered (DataCollection* base, GeeMap* items); -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail); -static void library_photo_source_collection_real_postprocess_imported_media (MediaSourceCollection* base, GeeCollection* media_sources); +static gboolean library_photo_source_collection_real_is_file_recognized (MediaSourceCollection* base, + GFile* file); +static void library_photo_source_collection_real_notify_contents_altered (DataCollection* base, + GeeIterable* added, + GeeIterable* removed); +static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSourceCollection* self, + Photo* photo, + GFile* old_file, + GFile* new_file); +static void _library_photo_source_collection_on_editable_replaced_photo_editable_replaced (Photo* _sender, + GFile* old_file, + GFile* new_file, + gpointer self); +static void library_photo_source_collection_on_raw_development_modified (LibraryPhotoSourceCollection* self, + Photo* _photo); +static void _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, + gpointer self); +void data_collection_notify_contents_altered (DataCollection* self, + GeeIterable* added, + GeeIterable* removed); +static void library_photo_source_collection_real_items_altered (DataCollection* base, + GeeMap* items); +gboolean alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail); +static void library_photo_source_collection_real_postprocess_imported_media (MediaSourceCollection* base, + GeeCollection* media_sources); GType tag_get_type (void) G_GNUC_CONST; gpointer hierarchical_tag_index_ref (gpointer instance); void hierarchical_tag_index_unref (gpointer instance); -GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_hierarchical_tag_index (GValue* value, gpointer v_object); -void value_take_hierarchical_tag_index (GValue* value, gpointer v_object); +GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_hierarchical_tag_index (GValue* value, + gpointer v_object); +void value_take_hierarchical_tag_index (GValue* value, + gpointer v_object); gpointer value_get_hierarchical_tag_index (const GValue* value); GType hierarchical_tag_index_get_type (void) G_GNUC_CONST; HierarchicalTagIndex* hierarchical_tag_index_get_global_index (void); @@ -2618,132 +3434,269 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self); HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_keywords (GeeCollection* h_keywords); GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self); GeeCollection* library_photo_get_import_keywords (LibraryPhoto* self); -gboolean hierarchical_tag_index_is_tag_in_index (HierarchicalTagIndex* self, const gchar* tag); +gboolean hierarchical_tag_index_is_tag_in_index (HierarchicalTagIndex* self, + const gchar* tag); gchar* tag_prep_tag_name (const gchar* name); -gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, const gchar* name); +gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, + const gchar* name); Tag* tag_for_path (const gchar* name); GeeCollection* hierarchical_tag_index_get_all_paths (HierarchicalTagIndex* self); void library_photo_clear_import_keywords (LibraryPhoto* self); -void tag_attach_many (Tag* self, GeeCollection* sources); -void media_source_collection_postprocess_imported_media (MediaSourceCollection* self, GeeCollection* media); -void library_photo_source_collection_notify_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -static void library_photo_source_collection_real_notify_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -void library_photo_source_collection_notify_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -static void library_photo_source_collection_real_notify_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -void library_photo_source_collection_notify_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -static void library_photo_source_collection_real_notify_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -void library_photo_source_collection_notify_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -static void library_photo_source_collection_real_notify_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -static MediaSource* library_photo_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* base, gint64 numeric_id); -LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, PhotoID* photo_id); +void tag_attach_many (Tag* self, + GeeCollection* sources); +void media_source_collection_postprocess_imported_media (MediaSourceCollection* self, + GeeCollection* media); +void library_photo_source_collection_notify_master_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +static void library_photo_source_collection_real_notify_master_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +void library_photo_source_collection_notify_editable_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +static void library_photo_source_collection_real_notify_editable_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +void library_photo_source_collection_notify_source_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +static void library_photo_source_collection_real_notify_source_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +void library_photo_source_collection_notify_baseline_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +static void library_photo_source_collection_real_notify_baseline_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +static MediaSource* library_photo_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* base, + gint64 numeric_id); +LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, + PhotoID* photo_id); gboolean media_source_is_trashed (MediaSource* self); gboolean media_source_is_offline (MediaSource* self); -static MediaSource* library_photo_source_collection_real_fetch_by_source_id (MediaSourceCollection* base, const gchar* source_id); -MediaSource* media_source_collection_fetch_by_numeric_id (MediaSourceCollection* self, gint64 numeric_id); -gint64 parse_int64 (const gchar* str, gint num_base); -static GeeCollection* library_photo_source_collection_real_get_event_source_ids (MediaSourceCollection* base, EventID* event_id); -GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event_id); -DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, gint64 key); -LibraryPhoto* library_photo_source_collection_fetch_by_editable_file (LibraryPhotoSourceCollection* self, GFile* file); -LibraryPhoto* library_photo_source_collection_fetch_by_raw_development_file (LibraryPhotoSourceCollection* self, GFile* file); -static void library_photo_source_collection_compare_backing (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, GFileInfo* info, GeeCollection* matches_master, GeeCollection* matches_editable, GeeCollection* matches_development); -gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* info); -void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSourceCollection* self, GFileInfo* info, GeeCollection* matches_master, GeeCollection* matches_editable, GeeCollection* matched_development); +static MediaSource* library_photo_source_collection_real_fetch_by_source_id (MediaSourceCollection* base, + const gchar* source_id); +MediaSource* media_source_collection_fetch_by_numeric_id (MediaSourceCollection* self, + gint64 numeric_id); +gint64 parse_int64 (const gchar* str, + gint num_base); +static GeeCollection* library_photo_source_collection_real_get_event_source_ids (MediaSourceCollection* base, + EventID* event_id); +GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, + EventID* event_id); +DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, + gint64 key); +LibraryPhoto* library_photo_source_collection_fetch_by_editable_file (LibraryPhotoSourceCollection* self, + GFile* file); +LibraryPhoto* library_photo_source_collection_fetch_by_raw_development_file (LibraryPhotoSourceCollection* self, + GFile* file); +static void library_photo_source_collection_compare_backing (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + GFileInfo* info, + GeeCollection* matches_master, + GeeCollection* matches_editable, + GeeCollection* matches_development); +gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, + GFileInfo* info); +void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSourceCollection* self, + GFileInfo* info, + GeeCollection* matches_master, + GeeCollection* matches_editable, + GeeCollection* matched_development); GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceCollection* self); -void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize, PhotoID* result); -gint utf8_ci_compare (void* a, void* b); -gboolean library_photo_source_collection_has_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize); +void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, + const gchar* basename, + gint64 filesize, + PhotoID* result); +gint utf8_ci_compare (void* a, + void* b); +gboolean library_photo_source_collection_has_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, + const gchar* basename, + gint64 filesize); gboolean photo_id_is_valid (PhotoID *self); -LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoSourceCollection* self, GFile* file); -MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingTank* self, GFile* file); -LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPhotoSourceHoldingTank* self, GFile* file); -LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSourceCollection* self, const gchar* md5); -MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* self, const gchar* md5); -LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoSourceCollection* self, GFile* file); -LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSourceCollection* self, const gchar* md5); +LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoSourceCollection* self, + GFile* file); +MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingTank* self, + GFile* file); +LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPhotoSourceHoldingTank* self, + GFile* file); +LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSourceCollection* self, + const gchar* md5); +MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* self, + const gchar* md5); +LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoSourceCollection* self, + GFile* file); +LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSourceCollection* self, + const gchar* md5); gint library_photo_source_collection_get_offline_count (LibraryPhotoSourceCollection* self); gint source_holding_tank_get_count (SourceHoldingTank* self); -LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSourceCollection* self, GFile* file, LibraryPhotoSourceCollectionState* state); -MediaSource* media_source_collection_fetch_by_master_file (MediaSourceCollection* self, GFile* file); -static gboolean library_photo_source_collection_real_has_backlink (SourceCollection* base, SourceBacklink* backlink); -gboolean source_collection_has_backlink (SourceCollection* self, SourceBacklink* backlink); -gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBacklink* backlink); -static void library_photo_source_collection_real_remove_backlink (SourceCollection* base, SourceBacklink* backlink); -void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklink* backlink); -void source_collection_remove_backlink (SourceCollection* self, SourceBacklink* backlink); +LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSourceCollection* self, + GFile* file, + LibraryPhotoSourceCollectionState* state); +MediaSource* media_source_collection_fetch_by_master_file (MediaSourceCollection* self, + GFile* file); +static gboolean library_photo_source_collection_real_has_backlink (SourceCollection* base, + SourceBacklink* backlink); +gboolean source_collection_has_backlink (SourceCollection* self, + SourceBacklink* backlink); +gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, + SourceBacklink* backlink); +static void library_photo_source_collection_real_remove_backlink (SourceCollection* base, + SourceBacklink* backlink); +void source_holding_tank_remove_backlink (SourceHoldingTank* self, + SourceBacklink* backlink); +void source_collection_remove_backlink (SourceCollection* self, + SourceBacklink* backlink); MediaSourceTransactionController* media_source_transaction_controller_new (MediaSourceCollection* sources); -MediaSourceTransactionController* media_source_transaction_controller_construct (GType object_type, MediaSourceCollection* sources); +MediaSourceTransactionController* media_source_transaction_controller_construct (GType object_type, + MediaSourceCollection* sources); GType media_source_transaction_controller_get_type (void) G_GNUC_CONST; -static void library_photo_source_collection_real_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -static void g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void library_photo_source_collection_real_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -static void library_photo_source_collection_real_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -static void library_photo_source_collection_real_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); +static void library_photo_source_collection_real_master_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +static void g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void library_photo_source_collection_real_editable_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +static void library_photo_source_collection_real_baseline_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +static void library_photo_source_collection_real_source_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); static void library_photo_source_collection_finalize (DataCollection * obj); GType flaggable_get_type (void) G_GNUC_CONST; GType monitorable_get_type (void) G_GNUC_CONST; #define LIBRARY_PHOTO_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LIBRARY_PHOTO, LibraryPhotoPrivate)) -enum { - LIBRARY_PHOTO_DUMMY_PROPERTY -}; #define LIBRARY_PHOTO_FLAG_HIDDEN ((guint64) 0x0000000000000001) #define LIBRARY_PHOTO_FLAG_FAVORITE ((guint64) 0x0000000000000002) #define LIBRARY_PHOTO_FLAG_TRASH ((guint64) 0x0000000000000004) #define LIBRARY_PHOTO_FLAG_OFFLINE ((guint64) 0x0000000000000008) #define LIBRARY_PHOTO_FLAG_FLAGGED ((guint64) 0x0000000000000010) static LibraryPhoto* library_photo_new (PhotoRow* row); -static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row); +static LibraryPhoto* library_photo_construct (GType object_type, + PhotoRow* row); static void library_photo_generate_thumbnails (LibraryPhoto* self); static void _library_photo_generate_thumbnails_one_shot_callback (gpointer self); -void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlinked_from, const gchar* dehydrated); -static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flags); +void data_source_rehydrate_backlinks (DataSource* self, + SourceCollection* unlinked_from, + const gchar* dehydrated); +static void library_photo_upgrade_rating_flags (LibraryPhoto* self, + guint64 flags); static LibraryPhoto* library_photo_new_from_import_params (PhotoImportParams* import_params); -static LibraryPhoto* library_photo_construct_from_import_params (GType object_type, PhotoImportParams* import_params); -void library_photo_init (ProgressMonitor monitor, void* monitor_target); +static LibraryPhoto* library_photo_construct_from_import_params (GType object_type, + PhotoImportParams* import_params); +void library_photo_init (ProgressMonitor monitor, + void* monitor_target); GeeArrayList* photo_table_get_all (PhotoTable* self); -GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); -void media_source_collection_add_many_to_trash (MediaSourceCollection* self, GeeCollection* sources); -void media_source_collection_add_many_to_offline (MediaSourceCollection* self, GeeCollection* sources); +GeeCollection* data_collection_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); +void media_source_collection_add_many_to_trash (MediaSourceCollection* self, + GeeCollection* sources); +void media_source_collection_add_many_to_offline (MediaSourceCollection* self, + GeeCollection* sources); void library_photo_terminate (void); -ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhoto* * photo); -void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result); +ImportResult library_photo_import_create (PhotoImportParams* params, + LibraryPhoto* * photo); +void photo_table_add (PhotoTable* self, + PhotoRow* photo_row, + PhotoID* result); gboolean photo_id_is_invalid (PhotoID *self); void library_photo_import_failed (LibraryPhoto* photo); -void photo_table_remove (PhotoTable* self, PhotoID* photo_id, GError** error); -static void library_photo_real_notify_master_reimported (Photo* base, PhotoMetadata* metadata); -static void library_photo_real_notify_editable_reimported (Photo* base, PhotoMetadata* metadata); -static void library_photo_real_notify_source_reimported (Photo* base, PhotoMetadata* metadata); -static void library_photo_real_notify_baseline_reimported (Photo* base, PhotoMetadata* metadata); -void thumbnail_cache_import_from_source (ThumbnailSource* source, gboolean force, GError** error); +void photo_table_remove (PhotoTable* self, + PhotoID* photo_id, + GError** error); +static void library_photo_real_notify_master_reimported (Photo* base, + PhotoMetadata* metadata); +static void library_photo_real_notify_editable_reimported (Photo* base, + PhotoMetadata* metadata); +static void library_photo_real_notify_source_reimported (Photo* base, + PhotoMetadata* metadata); +static void library_photo_real_notify_baseline_reimported (Photo* base, + PhotoMetadata* metadata); +void thumbnail_cache_import_from_source (ThumbnailSource* source, + gboolean force, + GError** error); void thumbnail_source_notify_thumbnail_altered (ThumbnailSource* self); -static void library_photo_real_notify_altered (DataObject* base, Alteration* alteration); -gboolean alteration_has_subject (Alteration* self, const gchar* subject); -void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority); -static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scaling* scaling, GError** error); -GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GError** error); +static void library_photo_real_notify_altered (DataObject* base, + Alteration* alteration); +gboolean alteration_has_subject (Alteration* self, + const gchar* subject); +void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, + gint priority); +static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, + Scaling* scaling, + GError** error); +GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); GType thumbnail_cache_size_get_type (void) G_GNUC_CONST; -GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInterpType interp, gboolean scale_up); -static void library_photo_real_rotate (Photo* base, Rotation rotation); -void thumbnail_cache_rotate (ThumbnailSource* source, Rotation rotation, GError** error); -static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error); -GdkPixbuf* thumbnail_cache_fetch (ThumbnailSource* source, gint scale, GError** error); -static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPhotoRow* backing, BackingPhotoID* result, GError** error); -GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callback, void* progress_callback_target, gboolean blacklist, GError** error); -static void library_photo_on_duplicate_progress (LibraryPhoto* self, gint64 current, gint64 total); -static void _library_photo_on_duplicate_progress_gfile_progress_callback (gint64 current_num_bytes, gint64 total_num_bytes, gpointer self); -LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error); -void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* new_filename, BackingPhotoID* editable_id, BackingPhotoID* develop_shotwell, BackingPhotoID* develop_camera_id, BackingPhotoID* develop_embedded_id, PhotoID* result); -PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id); -void thumbnail_cache_duplicate (ThumbnailSource* src_source, ThumbnailSource* dest_source); -gboolean data_collection_add (DataCollection* self, DataObject* object); +GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, + GdkPixbuf* pixbuf, + GdkInterpType interp, + gboolean scale_up); +static void library_photo_real_rotate (Photo* base, + Rotation rotation); +void thumbnail_cache_rotate (ThumbnailSource* source, + Rotation rotation, + GError** error); +static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, + gint scale, + GError** error); +GdkPixbuf* thumbnail_cache_fetch (ThumbnailSource* source, + gint scale, + GError** error); +static void library_photo_duplicate_backing_photo (LibraryPhoto* self, + BackingPhotoRow* backing, + BackingPhotoID* result, + GError** error); +GFile* library_files_duplicate (GFile* src, + GFileProgressCallback progress_callback, + void* progress_callback_target, + gboolean blacklist, + GError** error); +static void library_photo_on_duplicate_progress (LibraryPhoto* self, + gint64 current, + gint64 total); +static void _library_photo_on_duplicate_progress_gfile_progress_callback (gint64 current_num_bytes, + gint64 total_num_bytes, + gpointer self); +LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, + GError** error); +void photo_table_duplicate (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_filename, + BackingPhotoID* editable_id, + BackingPhotoID* develop_shotwell, + BackingPhotoID* develop_camera_id, + BackingPhotoID* develop_embedded_id, + PhotoID* result); +PhotoRow* photo_table_get_row (PhotoTable* self, + PhotoID* photo_id); +void thumbnail_cache_duplicate (ThumbnailSource* src_source, + ThumbnailSource* dest_source); +gboolean data_collection_add (DataCollection* self, + DataObject* object); GType event_source_get_type (void) G_GNUC_CONST; GType event_get_type (void) G_GNUC_CONST; Event* media_source_get_event (MediaSource* self); -void event_attach (Event* self, MediaSource* source); +void event_attach (Event* self, + MediaSource* source); GType container_source_collection_get_type (void) G_GNUC_CONST; GType tag_source_collection_get_type (void) G_GNUC_CONST; -GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, MediaSource* source); -void tag_attach (Tag* self, MediaSource* source); +GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, + MediaSource* source); +void tag_attach (Tag* self, + MediaSource* source); void spin_event_loop (void); static gboolean library_photo_real_is_trashed (MediaSource* base); static void library_photo_real_trash (MediaSource* base); @@ -2754,43 +3707,82 @@ static void library_photo_real_mark_online (Monitorable* base); static gboolean library_photo_real_is_flagged (Flaggable* base); static void library_photo_real_mark_flagged (Flaggable* base); static void library_photo_real_mark_unflagged (Flaggable* base); -static gboolean library_photo_real_internal_delete_backing (DataSource* base, GError** error); +static gboolean library_photo_real_internal_delete_backing (DataSource* base, + GError** error); gboolean media_source_delete_original_file (MediaSource* self); static void library_photo_real_destroy (DataSource* base); void thumbnail_cache_remove (ThumbnailSource* source); void data_source_destroy (DataSource* self); -gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format); -void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, PhotoID* result); +gboolean library_photo_has_nontrash_duplicate (GFile* file, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format); +void library_photo_get_nontrash_duplicate (GFile* file, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format, + PhotoID* result); static gboolean library_photo_real_has_user_generated_metadata (Photo* base); Rating media_source_get_rating (MediaSource* self); gchar* data_object_get_name (DataObject* self); -static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoMetadata* metadata); -void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, PhotoMetadataSetOption option); -void photo_metadata_set_rating (PhotoMetadata* self, Rating rating); -static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, PhotoMetadata* metadata); +static void library_photo_real_set_user_metadata_for_export (Photo* base, + PhotoMetadata* metadata); +void photo_metadata_set_keywords (PhotoMetadata* self, + GeeCollection* keywords, + PhotoMetadataSetOption option); +void photo_metadata_set_rating (PhotoMetadata* self, + Rating rating); +static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, + PhotoMetadata* metadata); gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag); gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name); -gboolean tag_source_collection_exists (TagSourceCollection* self, const gchar* name, gboolean treat_htags_as_root); +gboolean tag_source_collection_exists (TagSourceCollection* self, + const gchar* name, + gboolean treat_htags_as_root); static void library_photo_finalize (GObject * obj); #define LIBRARY_PHOTO_SOURCE_HOLDING_TANK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTankPrivate)) -enum { - LIBRARY_PHOTO_SOURCE_HOLDING_TANK_DUMMY_PROPERTY -}; -MediaSourceHoldingTank* media_source_holding_tank_new (MediaSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target); -MediaSourceHoldingTank* media_source_holding_tank_construct (GType object_type, MediaSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target); -static void library_photo_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed); -static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhotoSourceHoldingTank* self, Photo* _photo, GFile* old_file, GFile* new_file); -static void _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced (Photo* _sender, GFile* old_file, GFile* new_file, gpointer self); -static void library_photo_source_holding_tank_on_raw_development_modified (LibraryPhotoSourceHoldingTank* self, Photo* _photo); -static void _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self); -void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed); +MediaSourceHoldingTank* media_source_holding_tank_new (MediaSourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target); +MediaSourceHoldingTank* media_source_holding_tank_construct (GType object_type, + MediaSourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target); +static void library_photo_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, + GeeCollection* added, + GeeCollection* removed); +static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhotoSourceHoldingTank* self, + Photo* _photo, + GFile* old_file, + GFile* new_file); +static void _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced (Photo* _sender, + GFile* old_file, + GFile* new_file, + gpointer self); +static void library_photo_source_holding_tank_on_raw_development_modified (LibraryPhotoSourceHoldingTank* self, + Photo* _photo); +static void _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, + gpointer self); +void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, + GeeCollection* added, + GeeCollection* removed); static void library_photo_source_holding_tank_finalize (SourceHoldingTank * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static const gchar* PHOTO_IMAGE_EXTENSIONS[69] = {"jpg", "jpeg", "jpe", "tiff", "tif", "png", "gif", "bmp", "ppm", "pgm", "pbm", "pnm", "thm", "tga", "ilbm", "pcx", "ecw", "img", "sid", "cd5", "fits", "pgf", "cgm", "svg", "odg", "eps", "pdf", "swf", "wmf", "emf", "xps", "pns", "jps", "mpo", "3fr", "arw", "srf", "sr2", "bay", "crw", "cr2", "cap", "iiq", "eip", "dcs", "dcr", "drf", "k25", "kdc", "dng", "erf", "fff", "mef", "mos", "mrw", "nef", "nrw", "orf", "ptx", "pef", "pxn", "r3d", "raf", "raw", "rw2", "rwl", "rwz", "x3f", "srw"}; -GType backing_fetch_mode_get_type (void) { +GType +backing_fetch_mode_get_type (void) +{ static volatile gsize backing_fetch_mode_type_id__volatile = 0; if (g_once_init_enter (&backing_fetch_mode_type_id__volatile)) { static const GEnumValue values[] = {{BACKING_FETCH_MODE_SOURCE, "BACKING_FETCH_MODE_SOURCE", "source"}, {BACKING_FETCH_MODE_BASELINE, "BACKING_FETCH_MODE_BASELINE", "baseline"}, {BACKING_FETCH_MODE_MASTER, "BACKING_FETCH_MODE_MASTER", "master"}, {BACKING_FETCH_MODE_UNMODIFIED, "BACKING_FETCH_MODE_UNMODIFIED", "unmodified"}, {0, NULL, NULL}}; @@ -2802,36 +3794,43 @@ GType backing_fetch_mode_get_type (void) { } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 41 "/home/jens/Source/shotwell/src/Photo.vala" return self ? g_object_ref (self) : NULL; -#line 2809 "Photo.c" +#line 3803 "Photo.c" } -static gpointer _thumbnails_ref0 (gpointer self) { +static gpointer +_thumbnails_ref0 (gpointer self) +{ #line 48 "/home/jens/Source/shotwell/src/Photo.vala" return self ? thumbnails_ref (self) : NULL; -#line 2816 "Photo.c" +#line 3812 "Photo.c" } -PhotoImportParams* photo_import_params_construct (GType object_type, GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails) { +PhotoImportParams* +photo_import_params_construct (GType object_type, + GFile* file, + GFile* final_associated_file, + ImportID* import_id, + PhotoFileSnifferOptions sniffer_options, + const gchar* exif_md5, + const gchar* thumbnail_md5, + const gchar* full_md5, + Thumbnails* thumbnails) +{ PhotoImportParams* self = NULL; GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; - GFile* _tmp3_; - ImportID _tmp4_; - PhotoFileSnifferOptions _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; - const gchar* _tmp8_; - gchar* _tmp9_; - const gchar* _tmp10_; - gchar* _tmp11_; - Thumbnails* _tmp12_; - Thumbnails* _tmp13_; + ImportID _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + Thumbnails* _tmp6_; #line 38 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 38 "/home/jens/Source/shotwell/src/Photo.vala" @@ -2843,79 +3842,77 @@ PhotoImportParams* photo_import_params_construct (GType object_type, GFile* file #line 38 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoImportParams*) g_type_create_instance (object_type); #line 41 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file; -#line 41 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (file); #line 41 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->file); #line 41 "/home/jens/Source/shotwell/src/Photo.vala" - self->file = _tmp1_; + self->file = _tmp0_; #line 42 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = final_associated_file; -#line 42 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (final_associated_file); #line 42 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->final_associated_file); #line 42 "/home/jens/Source/shotwell/src/Photo.vala" - self->final_associated_file = _tmp3_; + self->final_associated_file = _tmp1_; #line 43 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = *import_id; + _tmp2_ = *import_id; #line 43 "/home/jens/Source/shotwell/src/Photo.vala" - self->import_id = _tmp4_; -#line 44 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = sniffer_options; + self->import_id = _tmp2_; #line 44 "/home/jens/Source/shotwell/src/Photo.vala" - self->sniffer_options = _tmp5_; + self->sniffer_options = sniffer_options; #line 45 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = exif_md5; -#line 45 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp3_ = g_strdup (exif_md5); #line 45 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (self->exif_md5); #line 45 "/home/jens/Source/shotwell/src/Photo.vala" - self->exif_md5 = _tmp7_; -#line 46 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = thumbnail_md5; + self->exif_md5 = _tmp3_; #line 46 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = g_strdup (_tmp8_); + _tmp4_ = g_strdup (thumbnail_md5); #line 46 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (self->thumbnail_md5); #line 46 "/home/jens/Source/shotwell/src/Photo.vala" - self->thumbnail_md5 = _tmp9_; + self->thumbnail_md5 = _tmp4_; #line 47 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = full_md5; -#line 47 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = g_strdup (_tmp10_); + _tmp5_ = g_strdup (full_md5); #line 47 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (self->full_md5); #line 47 "/home/jens/Source/shotwell/src/Photo.vala" - self->full_md5 = _tmp11_; -#line 48 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = thumbnails; + self->full_md5 = _tmp5_; #line 48 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _thumbnails_ref0 (_tmp12_); + _tmp6_ = _thumbnails_ref0 (thumbnails); #line 48 "/home/jens/Source/shotwell/src/Photo.vala" _thumbnails_unref0 (self->thumbnails); #line 48 "/home/jens/Source/shotwell/src/Photo.vala" - self->thumbnails = _tmp13_; + self->thumbnails = _tmp6_; #line 38 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 2904 "Photo.c" +#line 3889 "Photo.c" } -PhotoImportParams* photo_import_params_new (GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails) { +PhotoImportParams* +photo_import_params_new (GFile* file, + GFile* final_associated_file, + ImportID* import_id, + PhotoFileSnifferOptions sniffer_options, + const gchar* exif_md5, + const gchar* thumbnail_md5, + const gchar* full_md5, + Thumbnails* thumbnails) +{ #line 38 "/home/jens/Source/shotwell/src/Photo.vala" return photo_import_params_construct (TYPE_PHOTO_IMPORT_PARAMS, file, final_associated_file, import_id, sniffer_options, exif_md5, thumbnail_md5, full_md5, thumbnails); -#line 2911 "Photo.c" +#line 3905 "Photo.c" } -PhotoImportParams* photo_import_params_construct_create_placeholder (GType object_type, GFile* file, ImportID* import_id) { +PhotoImportParams* +photo_import_params_construct_create_placeholder (GType object_type, + GFile* file, + ImportID* import_id) +{ PhotoImportParams* self = NULL; GFile* _tmp0_; - GFile* _tmp1_; - ImportID _tmp2_; + ImportID _tmp1_; #line 52 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 52 "/home/jens/Source/shotwell/src/Photo.vala" @@ -2923,17 +3920,15 @@ PhotoImportParams* photo_import_params_construct_create_placeholder (GType objec #line 52 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoImportParams*) g_type_create_instance (object_type); #line 53 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file; -#line 53 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (file); #line 53 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->file); #line 53 "/home/jens/Source/shotwell/src/Photo.vala" - self->file = _tmp1_; + self->file = _tmp0_; #line 54 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = *import_id; + _tmp1_ = *import_id; #line 54 "/home/jens/Source/shotwell/src/Photo.vala" - self->import_id = _tmp2_; + self->import_id = _tmp1_; #line 55 "/home/jens/Source/shotwell/src/Photo.vala" self->sniffer_options = PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5; #line 56 "/home/jens/Source/shotwell/src/Photo.vala" @@ -2954,115 +3949,143 @@ PhotoImportParams* photo_import_params_construct_create_placeholder (GType objec self->thumbnails = NULL; #line 52 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 2958 "Photo.c" +#line 3953 "Photo.c" } -PhotoImportParams* photo_import_params_new_create_placeholder (GFile* file, ImportID* import_id) { +PhotoImportParams* +photo_import_params_new_create_placeholder (GFile* file, + ImportID* import_id) +{ #line 52 "/home/jens/Source/shotwell/src/Photo.vala" return photo_import_params_construct_create_placeholder (TYPE_PHOTO_IMPORT_PARAMS, file, import_id); -#line 2965 "Photo.c" +#line 3963 "Photo.c" } -static void value_photo_import_params_init (GValue* value) { +static void +value_photo_import_params_init (GValue* value) +{ #line 21 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 2972 "Photo.c" +#line 3972 "Photo.c" } -static void value_photo_import_params_free_value (GValue* value) { +static void +value_photo_import_params_free_value (GValue* value) +{ #line 21 "/home/jens/Source/shotwell/src/Photo.vala" if (value->data[0].v_pointer) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" photo_import_params_unref (value->data[0].v_pointer); -#line 2981 "Photo.c" +#line 3983 "Photo.c" } } -static void value_photo_import_params_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_photo_import_params_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 21 "/home/jens/Source/shotwell/src/Photo.vala" if (src_value->data[0].v_pointer) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_import_params_ref (src_value->data[0].v_pointer); -#line 2991 "Photo.c" +#line 3996 "Photo.c" } else { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 2995 "Photo.c" +#line 4000 "Photo.c" } } -static gpointer value_photo_import_params_peek_pointer (const GValue* value) { +static gpointer +value_photo_import_params_peek_pointer (const GValue* value) +{ #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 3003 "Photo.c" +#line 4010 "Photo.c" } -static gchar* value_photo_import_params_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_import_params_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 21 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 3010 "Photo.c" +#line 4022 "Photo.c" PhotoImportParams * object; object = collect_values[0].v_pointer; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3017 "Photo.c" +#line 4029 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3021 "Photo.c" +#line 4033 "Photo.c" } #line 21 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_import_params_ref (object); -#line 3025 "Photo.c" +#line 4037 "Photo.c" } else { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 3029 "Photo.c" +#line 4041 "Photo.c" } #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 3033 "Photo.c" +#line 4045 "Photo.c" } -static gchar* value_photo_import_params_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_import_params_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoImportParams ** object_p; object_p = collect_values[0].v_pointer; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" if (!object_p) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3044 "Photo.c" +#line 4061 "Photo.c" } #line 21 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 3050 "Photo.c" +#line 4067 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 3054 "Photo.c" +#line 4071 "Photo.c" } else { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_import_params_ref (value->data[0].v_pointer); -#line 3058 "Photo.c" +#line 4075 "Photo.c" } #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 3062 "Photo.c" +#line 4079 "Photo.c" } -GParamSpec* param_spec_photo_import_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_photo_import_params (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPhotoImportParams* spec; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PHOTO_IMPORT_PARAMS), NULL); @@ -3072,20 +4095,25 @@ GParamSpec* param_spec_photo_import_params (const gchar* name, const gchar* nick G_PARAM_SPEC (spec)->value_type = object_type; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 3076 "Photo.c" +#line 4099 "Photo.c" } -gpointer value_get_photo_import_params (const GValue* value) { +gpointer +value_get_photo_import_params (const GValue* value) +{ #line 21 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_IMPORT_PARAMS), NULL); #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 3085 "Photo.c" +#line 4110 "Photo.c" } -void value_set_photo_import_params (GValue* value, gpointer v_object) { +void +value_set_photo_import_params (GValue* value, + gpointer v_object) +{ PhotoImportParams * old; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_IMPORT_PARAMS)); @@ -3101,22 +4129,25 @@ void value_set_photo_import_params (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" photo_import_params_ref (value->data[0].v_pointer); -#line 3105 "Photo.c" +#line 4133 "Photo.c" } else { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 3109 "Photo.c" +#line 4137 "Photo.c" } #line 21 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" photo_import_params_unref (old); -#line 3115 "Photo.c" +#line 4143 "Photo.c" } } -void value_take_photo_import_params (GValue* value, gpointer v_object) { +void +value_take_photo_import_params (GValue* value, + gpointer v_object) +{ PhotoImportParams * old; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_IMPORT_PARAMS)); @@ -3130,31 +4161,35 @@ void value_take_photo_import_params (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 21 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 3134 "Photo.c" +#line 4165 "Photo.c" } else { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 3138 "Photo.c" +#line 4169 "Photo.c" } #line 21 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" photo_import_params_unref (old); -#line 3144 "Photo.c" +#line 4175 "Photo.c" } } -static void photo_import_params_class_init (PhotoImportParamsClass * klass) { +static void +photo_import_params_class_init (PhotoImportParamsClass * klass) +{ #line 21 "/home/jens/Source/shotwell/src/Photo.vala" photo_import_params_parent_class = g_type_class_peek_parent (klass); #line 21 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoImportParamsClass *) klass)->finalize = photo_import_params_finalize; -#line 3154 "Photo.c" +#line 4187 "Photo.c" } -static void photo_import_params_instance_init (PhotoImportParams * self) { +static void +photo_import_params_instance_init (PhotoImportParams * self) +{ PhotoRow* _tmp0_; #line 24 "/home/jens/Source/shotwell/src/Photo.vala" self->final_associated_file = NULL; @@ -3166,11 +4201,13 @@ static void photo_import_params_instance_init (PhotoImportParams * self) { self->keywords = NULL; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 3170 "Photo.c" +#line 4205 "Photo.c" } -static void photo_import_params_finalize (PhotoImportParams * obj) { +static void +photo_import_params_finalize (PhotoImportParams * obj) +{ PhotoImportParams * self; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_IMPORT_PARAMS, PhotoImportParams); @@ -3192,11 +4229,13 @@ static void photo_import_params_finalize (PhotoImportParams * obj) { _photo_row_unref0 (self->row); #line 36 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->keywords); -#line 3196 "Photo.c" +#line 4233 "Photo.c" } -GType photo_import_params_get_type (void) { +GType +photo_import_params_get_type (void) +{ static volatile gsize photo_import_params_type_id__volatile = 0; if (g_once_init_enter (&photo_import_params_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_photo_import_params_init, value_photo_import_params_free_value, value_photo_import_params_copy_value, value_photo_import_params_peek_pointer, "p", value_photo_import_params_collect_value, "p", value_photo_import_params_lcopy_value }; @@ -3210,18 +4249,22 @@ GType photo_import_params_get_type (void) { } -gpointer photo_import_params_ref (gpointer instance) { +gpointer +photo_import_params_ref (gpointer instance) +{ PhotoImportParams * self; self = instance; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 3221 "Photo.c" +#line 4262 "Photo.c" } -void photo_import_params_unref (gpointer instance) { +void +photo_import_params_unref (gpointer instance) +{ PhotoImportParams * self; self = instance; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" @@ -3230,22 +4273,26 @@ void photo_import_params_unref (gpointer instance) { PHOTO_IMPORT_PARAMS_GET_CLASS (self)->finalize (self); #line 21 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3234 "Photo.c" +#line 4277 "Photo.c" } } -PhotoTransformationState* photo_transformation_state_construct (GType object_type) { +PhotoTransformationState* +photo_transformation_state_construct (GType object_type) +{ PhotoTransformationState * self = NULL; #line 72 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoTransformationState*) g_object_new (object_type, NULL); #line 72 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 3245 "Photo.c" +#line 4290 "Photo.c" } -gboolean photo_transformation_state_is_broken (PhotoTransformationState* self) { +gboolean +photo_transformation_state_is_broken (PhotoTransformationState* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 75 "/home/jens/Source/shotwell/src/Photo.vala" @@ -3256,18 +4303,22 @@ gboolean photo_transformation_state_is_broken (PhotoTransformationState* self) { result = _tmp0_; #line 76 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3260 "Photo.c" +#line 4307 "Photo.c" } -static void photo_transformation_state_real_broken (PhotoTransformationState* self) { +static void +photo_transformation_state_real_broken (PhotoTransformationState* self) +{ #line 69 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->is_broke = TRUE; -#line 3267 "Photo.c" +#line 4316 "Photo.c" } -static void photo_transformation_state_class_init (PhotoTransformationStateClass * klass) { +static void +photo_transformation_state_class_init (PhotoTransformationStateClass * klass) +{ #line 63 "/home/jens/Source/shotwell/src/Photo.vala" photo_transformation_state_parent_class = g_type_class_peek_parent (klass); #line 63 "/home/jens/Source/shotwell/src/Photo.vala" @@ -3278,30 +4329,36 @@ static void photo_transformation_state_class_init (PhotoTransformationStateClass G_OBJECT_CLASS (klass)->finalize = photo_transformation_state_finalize; #line 63 "/home/jens/Source/shotwell/src/Photo.vala" photo_transformation_state_signals[PHOTO_TRANSFORMATION_STATE_BROKEN_SIGNAL] = g_signal_new ("broken", TYPE_PHOTO_TRANSFORMATION_STATE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoTransformationStateClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 3282 "Photo.c" +#line 4333 "Photo.c" } -static void photo_transformation_state_instance_init (PhotoTransformationState * self) { +static void +photo_transformation_state_instance_init (PhotoTransformationState * self) +{ #line 63 "/home/jens/Source/shotwell/src/Photo.vala" self->priv = PHOTO_TRANSFORMATION_STATE_GET_PRIVATE (self); #line 64 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->is_broke = FALSE; -#line 3291 "Photo.c" +#line 4344 "Photo.c" } -static void photo_transformation_state_finalize (GObject * obj) { +static void +photo_transformation_state_finalize (GObject * obj) +{ PhotoTransformationState * self; #line 63 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState); #line 63 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (photo_transformation_state_parent_class)->finalize (obj); -#line 3301 "Photo.c" +#line 4356 "Photo.c" } -GType photo_transformation_state_get_type (void) { +GType +photo_transformation_state_get_type (void) +{ static volatile gsize photo_transformation_state_type_id__volatile = 0; if (g_once_init_enter (&photo_transformation_state_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoTransformationStateClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_transformation_state_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoTransformationState), 0, (GInstanceInitFunc) photo_transformation_state_instance_init, NULL }; @@ -3313,168 +4370,174 @@ GType photo_transformation_state_get_type (void) { } -gboolean rating_can_increase (Rating self) { +gboolean +rating_can_increase (Rating self) +{ gboolean result = FALSE; #line 90 "/home/jens/Source/shotwell/src/Photo.vala" result = self < RATING_FIVE; #line 90 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3323 "Photo.c" +#line 4382 "Photo.c" } -gboolean rating_can_decrease (Rating self) { +gboolean +rating_can_decrease (Rating self) +{ gboolean result = FALSE; #line 94 "/home/jens/Source/shotwell/src/Photo.vala" result = self > RATING_REJECTED; #line 94 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3333 "Photo.c" +#line 4394 "Photo.c" } -gboolean rating_is_valid (Rating self) { +gboolean +rating_is_valid (Rating self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; #line 98 "/home/jens/Source/shotwell/src/Photo.vala" if (self >= RATING_REJECTED) { #line 98 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self <= RATING_FIVE; -#line 3344 "Photo.c" +#line 4407 "Photo.c" } else { #line 98 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = FALSE; -#line 3348 "Photo.c" +#line 4411 "Photo.c" } #line 98 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 98 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3354 "Photo.c" +#line 4417 "Photo.c" } -Rating rating_increase (Rating self) { +Rating +rating_increase (Rating self) +{ Rating result = 0; Rating _tmp0_ = 0; - gboolean _tmp1_; #line 102 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = rating_can_increase (self); -#line 102 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_) { + if (rating_can_increase (self)) { #line 102 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self + 1; -#line 3368 "Photo.c" +#line 4430 "Photo.c" } else { #line 102 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self; -#line 3372 "Photo.c" +#line 4434 "Photo.c" } #line 102 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 102 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3378 "Photo.c" +#line 4440 "Photo.c" } -Rating rating_decrease (Rating self) { +Rating +rating_decrease (Rating self) +{ Rating result = 0; Rating _tmp0_ = 0; - gboolean _tmp1_; #line 106 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = rating_can_decrease (self); -#line 106 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_) { + if (rating_can_decrease (self)) { #line 106 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self - 1; -#line 3392 "Photo.c" +#line 4453 "Photo.c" } else { #line 106 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self; -#line 3396 "Photo.c" +#line 4457 "Photo.c" } #line 106 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 106 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3402 "Photo.c" +#line 4463 "Photo.c" } -gint rating_serialize (Rating self) { +gint +rating_serialize (Rating self) +{ gint result = 0; #line 110 "/home/jens/Source/shotwell/src/Photo.vala" switch (self) { #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_REJECTED: -#line 3412 "Photo.c" +#line 4475 "Photo.c" { #line 112 "/home/jens/Source/shotwell/src/Photo.vala" result = -1; #line 112 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3418 "Photo.c" +#line 4481 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_UNRATED: -#line 3422 "Photo.c" +#line 4485 "Photo.c" { #line 114 "/home/jens/Source/shotwell/src/Photo.vala" result = 0; #line 114 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3428 "Photo.c" +#line 4491 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_ONE: -#line 3432 "Photo.c" +#line 4495 "Photo.c" { #line 116 "/home/jens/Source/shotwell/src/Photo.vala" result = 1; #line 116 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3438 "Photo.c" +#line 4501 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_TWO: -#line 3442 "Photo.c" +#line 4505 "Photo.c" { #line 118 "/home/jens/Source/shotwell/src/Photo.vala" result = 2; #line 118 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3448 "Photo.c" +#line 4511 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_THREE: -#line 3452 "Photo.c" +#line 4515 "Photo.c" { #line 120 "/home/jens/Source/shotwell/src/Photo.vala" result = 3; #line 120 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3458 "Photo.c" +#line 4521 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_FOUR: -#line 3462 "Photo.c" +#line 4525 "Photo.c" { #line 122 "/home/jens/Source/shotwell/src/Photo.vala" result = 4; #line 122 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3468 "Photo.c" +#line 4531 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_FIVE: -#line 3472 "Photo.c" +#line 4535 "Photo.c" { #line 124 "/home/jens/Source/shotwell/src/Photo.vala" result = 5; #line 124 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3478 "Photo.c" +#line 4541 "Photo.c" } default: { @@ -3482,111 +4545,104 @@ gint rating_serialize (Rating self) { result = 0; #line 126 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3486 "Photo.c" +#line 4549 "Photo.c" } } } -Rating rating_unserialize (gint value) { +Rating +rating_unserialize (gint value) +{ Rating result = 0; - gint _tmp0_; - gint _tmp2_; #line 131 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = value; -#line 131 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_ > ((gint) RATING_FIVE)) { + if (value > ((gint) RATING_FIVE)) { #line 132 "/home/jens/Source/shotwell/src/Photo.vala" result = RATING_FIVE; #line 132 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3504 "Photo.c" +#line 4565 "Photo.c" } else { - gint _tmp1_; #line 133 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = value; -#line 133 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_ < ((gint) RATING_REJECTED)) { + if (value < ((gint) RATING_REJECTED)) { #line 134 "/home/jens/Source/shotwell/src/Photo.vala" result = RATING_REJECTED; #line 134 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3515 "Photo.c" +#line 4573 "Photo.c" } } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = value; -#line 136 "/home/jens/Source/shotwell/src/Photo.vala" - switch (_tmp2_) { + switch (value) { #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case -1: -#line 3524 "Photo.c" +#line 4580 "Photo.c" { #line 138 "/home/jens/Source/shotwell/src/Photo.vala" result = RATING_REJECTED; #line 138 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3530 "Photo.c" +#line 4586 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 0: -#line 3534 "Photo.c" +#line 4590 "Photo.c" { #line 140 "/home/jens/Source/shotwell/src/Photo.vala" result = RATING_UNRATED; #line 140 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3540 "Photo.c" +#line 4596 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 1: -#line 3544 "Photo.c" +#line 4600 "Photo.c" { #line 142 "/home/jens/Source/shotwell/src/Photo.vala" result = RATING_ONE; #line 142 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3550 "Photo.c" +#line 4606 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 2: -#line 3554 "Photo.c" +#line 4610 "Photo.c" { #line 144 "/home/jens/Source/shotwell/src/Photo.vala" result = RATING_TWO; #line 144 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3560 "Photo.c" +#line 4616 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 3: -#line 3564 "Photo.c" +#line 4620 "Photo.c" { #line 146 "/home/jens/Source/shotwell/src/Photo.vala" result = RATING_THREE; #line 146 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3570 "Photo.c" +#line 4626 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 4: -#line 3574 "Photo.c" +#line 4630 "Photo.c" { #line 148 "/home/jens/Source/shotwell/src/Photo.vala" result = RATING_FOUR; #line 148 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3580 "Photo.c" +#line 4636 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 5: -#line 3584 "Photo.c" +#line 4640 "Photo.c" { #line 150 "/home/jens/Source/shotwell/src/Photo.vala" result = RATING_FIVE; #line 150 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3590 "Photo.c" +#line 4646 "Photo.c" } default: { @@ -3594,13 +4650,15 @@ Rating rating_unserialize (gint value) { result = RATING_UNRATED; #line 152 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3598 "Photo.c" +#line 4654 "Photo.c" } } } -GType rating_get_type (void) { +GType +rating_get_type (void) +{ static volatile gsize rating_type_id__volatile = 0; if (g_once_init_enter (&rating_type_id__volatile)) { static const GEnumValue values[] = {{RATING_REJECTED, "RATING_REJECTED", "rejected"}, {RATING_UNRATED, "RATING_UNRATED", "unrated"}, {RATING_ONE, "RATING_ONE", "one"}, {RATING_TWO, "RATING_TWO", "two"}, {RATING_THREE, "RATING_THREE", "three"}, {RATING_FOUR, "RATING_FOUR", "four"}, {RATING_FIVE, "RATING_FIVE", "five"}, {0, NULL, NULL}}; @@ -3612,33 +4670,35 @@ GType rating_get_type (void) { } -gboolean photo_exception_prohibits (PhotoException self, PhotoException exception) { +gboolean +photo_exception_prohibits (PhotoException self, + PhotoException exception) +{ gboolean result = FALSE; - PhotoException _tmp0_; -#line 228 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = exception; #line 228 "/home/jens/Source/shotwell/src/Photo.vala" - result = (self & _tmp0_) != 0; + result = (self & exception) != 0; #line 228 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3625 "Photo.c" +#line 4683 "Photo.c" } -gboolean photo_exception_allows (PhotoException self, PhotoException exception) { +gboolean +photo_exception_allows (PhotoException self, + PhotoException exception) +{ gboolean result = FALSE; - PhotoException _tmp0_; #line 232 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = exception; -#line 232 "/home/jens/Source/shotwell/src/Photo.vala" - result = (self & _tmp0_) == 0; + result = (self & exception) == 0; #line 232 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3638 "Photo.c" +#line 4696 "Photo.c" } -GType photo_exception_get_type (void) { +GType +photo_exception_get_type (void) +{ static volatile gsize photo_exception_type_id__volatile = 0; if (g_once_init_enter (&photo_exception_type_id__volatile)) { static const GEnumValue values[] = {{PHOTO_EXCEPTION_NONE, "PHOTO_EXCEPTION_NONE", "none"}, {PHOTO_EXCEPTION_ORIENTATION, "PHOTO_EXCEPTION_ORIENTATION", "orientation"}, {PHOTO_EXCEPTION_CROP, "PHOTO_EXCEPTION_CROP", "crop"}, {PHOTO_EXCEPTION_REDEYE, "PHOTO_EXCEPTION_REDEYE", "redeye"}, {PHOTO_EXCEPTION_ADJUST, "PHOTO_EXCEPTION_ADJUST", "adjust"}, {PHOTO_EXCEPTION_STRAIGHTEN, "PHOTO_EXCEPTION_STRAIGHTEN", "straighten"}, {PHOTO_EXCEPTION_ALL, "PHOTO_EXCEPTION_ALL", "all"}, {0, NULL, NULL}}; @@ -3650,251 +4710,232 @@ GType photo_exception_get_type (void) { } -static gpointer _photo_row_ref0 (gpointer self) { +static gpointer +_photo_row_ref0 (gpointer self) +{ #line 400 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_row_ref (self) : NULL; -#line 3657 "Photo.c" +#line 4719 "Photo.c" } -static gpointer _backing_photo_row_ref0 (gpointer self) { +static gpointer +_backing_photo_row_ref0 (gpointer self) +{ #line 421 "/home/jens/Source/shotwell/src/Photo.vala" return self ? backing_photo_row_ref (self) : NULL; -#line 3664 "Photo.c" +#line 4728 "Photo.c" } -Photo* photo_construct (GType object_type, PhotoRow* row) { +Photo* +photo_construct (GType object_type, + PhotoRow* row) +{ Photo * self = NULL; PhotoRow* _tmp0_; PhotoRow* _tmp1_; PhotoRow* _tmp2_; - PhotoRow* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; + const gchar* _tmp3_; + gchar* _tmp4_; + PhotoRow* _tmp5_; PhotoRow* _tmp6_; - PhotoRow* _tmp7_; - const gchar* _tmp8_; - gchar* _tmp9_; - PhotoBackingReaders* _tmp10_; - PhotoRow* _tmp11_; + const gchar* _tmp7_; + gchar* _tmp8_; + PhotoBackingReaders* _tmp9_; + BackingPhotoRow* _tmp10_; + PhotoFileFormat _tmp11_; BackingPhotoRow* _tmp12_; - PhotoFileFormat _tmp13_; - PhotoRow* _tmp14_; + const gchar* _tmp13_; + PhotoFileReader* _tmp14_; + gchar* basename = NULL; BackingPhotoRow* _tmp15_; const gchar* _tmp16_; - PhotoFileReader* _tmp17_; - gchar* basename = NULL; - PhotoRow* _tmp18_; - BackingPhotoRow* _tmp19_; - const gchar* _tmp20_; - gchar* _tmp21_; - const gchar* _tmp22_; - const gchar* _tmp25_; - gboolean _tmp26_; - PhotoRow* _tmp31_; - BackingPhotoID _tmp32_; - gint64 _tmp33_; - PhotoRow* _tmp49_; - BackingPhotoRow* _tmp50_; - PhotoFileFormat _tmp51_; - gboolean _tmp67_ = FALSE; - PhotoRow* _tmp68_; - BackingPhotoRow* _tmp69_; - PhotoFileFormat _tmp70_; - PhotoBackingReaders* _tmp85_; - PhotoFileReader* _tmp86_; - PhotoRow* _tmp106_; - time_t _tmp107_; + gchar* _tmp17_; + const gchar* _tmp18_; + const gchar* _tmp21_; + BackingPhotoID _tmp25_; + gint64 _tmp26_; + BackingPhotoRow* _tmp41_; + PhotoFileFormat _tmp42_; + gboolean _tmp57_ = FALSE; + BackingPhotoRow* _tmp58_; + PhotoFileFormat _tmp59_; + PhotoBackingReaders* _tmp71_; + PhotoFileReader* _tmp72_; + PhotoRow* _tmp88_; + time_t _tmp89_; GError * _inner_error_ = NULL; #line 399 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_ROW (row), NULL); #line 399 "/home/jens/Source/shotwell/src/Photo.vala" self = (Photo*) photo_source_construct (object_type, DATA_OBJECT_INVALID_OBJECT_ID); #line 400 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = row; -#line 400 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _photo_row_ref0 (_tmp0_); + _tmp0_ = _photo_row_ref0 (row); #line 400 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (self->row); #line 400 "/home/jens/Source/shotwell/src/Photo.vala" - self->row = _tmp1_; + self->row = _tmp0_; #line 403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = self->row; + _tmp1_ = self->row; #line 403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->row; + _tmp2_ = self->row; #line 403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_->title; + _tmp3_ = _tmp2_->title; #line 403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = media_source_prep_title (_tmp4_); + _tmp4_ = media_source_prep_title (_tmp3_); #line 403 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp2_->title); + _g_free0 (_tmp1_->title); #line 403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_->title = _tmp5_; + _tmp1_->title = _tmp4_; #line 404 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; + _tmp5_ = self->row; #line 404 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->row; + _tmp6_ = self->row; #line 404 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_->comment; + _tmp7_ = _tmp6_->comment; #line 404 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = media_source_prep_comment (_tmp8_); + _tmp8_ = media_source_prep_comment (_tmp7_); #line 404 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp6_->comment); + _g_free0 (_tmp5_->comment); #line 404 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_->comment = _tmp9_; -#line 408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = self->priv->readers; + _tmp5_->comment = _tmp8_; #line 408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = row; + _tmp9_ = self->priv->readers; #line 408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_->master; + _tmp10_ = row->master; #line 408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_->file_format; + _tmp11_ = _tmp10_->file_format; #line 408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = row; + _tmp12_ = row->master; #line 408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_->master; -#line 408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_->filepath; + _tmp13_ = _tmp12_->filepath; #line 408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo_file_format_create_reader (_tmp13_, _tmp16_); + _tmp14_ = photo_file_format_create_reader (_tmp11_, _tmp13_); #line 408 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp10_->master); + _photo_file_adapter_unref0 (_tmp9_->master); #line 408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_->master = _tmp17_; -#line 411 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = row; + _tmp9_->master = _tmp14_; #line 411 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_->master; + _tmp15_ = row->master; #line 411 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_->filepath; + _tmp16_ = _tmp15_->filepath; #line 411 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = string_sliced_at_last_char (_tmp20_, (gunichar) G_DIR_SEPARATOR, 0); + _tmp17_ = string_sliced_at_last_char (_tmp16_, (gunichar) G_DIR_SEPARATOR, 0); #line 411 "/home/jens/Source/shotwell/src/Photo.vala" - basename = _tmp21_; + basename = _tmp17_; #line 412 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = basename; + _tmp18_ = basename; #line 412 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp22_ != NULL) { -#line 3781 "Photo.c" - const gchar* _tmp23_; - gchar* _tmp24_; + if (_tmp18_ != NULL) { +#line 4832 "Photo.c" + const gchar* _tmp19_; + gchar* _tmp20_; #line 413 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = basename; + _tmp19_ = basename; #line 413 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = string_sliced_at (_tmp23_, 1); + _tmp20_ = string_sliced_at (_tmp19_, 1); #line 413 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (self->priv->file_title); #line 413 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->file_title = _tmp24_; -#line 3792 "Photo.c" + self->priv->file_title = _tmp20_; +#line 4843 "Photo.c" } #line 415 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = self->priv->file_title; + _tmp21_ = self->priv->file_title; #line 415 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = is_string_empty (_tmp25_); -#line 415 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp26_) { -#line 3800 "Photo.c" - PhotoRow* _tmp27_; - BackingPhotoRow* _tmp28_; - const gchar* _tmp29_; - gchar* _tmp30_; -#line 416 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = row; + if (is_string_empty (_tmp21_)) { +#line 4849 "Photo.c" + BackingPhotoRow* _tmp22_; + const gchar* _tmp23_; + gchar* _tmp24_; #line 416 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp27_->master; + _tmp22_ = row->master; #line 416 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _tmp28_->filepath; + _tmp23_ = _tmp22_->filepath; #line 416 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = g_strdup (_tmp29_); + _tmp24_ = g_strdup (_tmp23_); #line 416 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (self->priv->file_title); #line 416 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->file_title = _tmp30_; -#line 3817 "Photo.c" + self->priv->file_title = _tmp24_; +#line 4863 "Photo.c" } #line 418 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = row; -#line 418 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _tmp31_->editable_id; + _tmp25_ = row->editable_id; #line 418 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp32_.id; + _tmp26_ = _tmp25_.id; #line 418 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp33_ != BACKING_PHOTO_ID_INVALID) { -#line 3827 "Photo.c" + if (_tmp26_ != BACKING_PHOTO_ID_INVALID) { +#line 4871 "Photo.c" BackingPhotoRow* e = NULL; - PhotoRow* _tmp34_; - BackingPhotoID _tmp35_; - BackingPhotoRow* _tmp36_; - BackingPhotoRow* _tmp37_; -#line 419 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = row; + BackingPhotoID _tmp27_; + BackingPhotoRow* _tmp28_; + BackingPhotoRow* _tmp29_; #line 419 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = _tmp34_->editable_id; + _tmp27_ = row->editable_id; #line 419 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = photo_get_backing_row (self, &_tmp35_); + _tmp28_ = photo_get_backing_row (self, &_tmp27_); #line 419 "/home/jens/Source/shotwell/src/Photo.vala" - e = _tmp36_; + e = _tmp28_; #line 420 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = e; + _tmp29_ = e; #line 420 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp37_ != NULL) { -#line 3845 "Photo.c" - BackingPhotoRow* _tmp38_; - BackingPhotoRow* _tmp39_; - PhotoBackingReaders* _tmp40_; - BackingPhotoRow* _tmp41_; - PhotoFileFormat _tmp42_; - BackingPhotoRow* _tmp43_; - const gchar* _tmp44_; - PhotoFileReader* _tmp45_; + if (_tmp29_ != NULL) { +#line 4886 "Photo.c" + BackingPhotoRow* _tmp30_; + BackingPhotoRow* _tmp31_; + PhotoBackingReaders* _tmp32_; + BackingPhotoRow* _tmp33_; + PhotoFileFormat _tmp34_; + BackingPhotoRow* _tmp35_; + const gchar* _tmp36_; + PhotoFileReader* _tmp37_; #line 421 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = e; + _tmp30_ = e; #line 421 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = _backing_photo_row_ref0 (_tmp38_); + _tmp31_ = _backing_photo_row_ref0 (_tmp30_); #line 421 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->priv->editable); #line 421 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->editable = _tmp39_; + self->priv->editable = _tmp31_; #line 422 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = self->priv->readers; + _tmp32_ = self->priv->readers; #line 422 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = self->priv->editable; + _tmp33_ = self->priv->editable; #line 422 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _tmp41_->file_format; + _tmp34_ = _tmp33_->file_format; #line 422 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = self->priv->editable; + _tmp35_ = self->priv->editable; #line 422 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = _tmp43_->filepath; + _tmp36_ = _tmp35_->filepath; #line 422 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = photo_file_format_create_reader (_tmp42_, _tmp44_); + _tmp37_ = photo_file_format_create_reader (_tmp34_, _tmp36_); #line 422 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp40_->editable); + _photo_file_adapter_unref0 (_tmp32_->editable); #line 422 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_->editable = _tmp45_; -#line 3878 "Photo.c" + _tmp32_->editable = _tmp37_; +#line 4919 "Photo.c" } else { { - PhotoTable* _tmp46_; - PhotoTable* _tmp47_; - PhotoRow* _tmp48_; + PhotoTable* _tmp38_; + PhotoTable* _tmp39_; + PhotoRow* _tmp40_; #line 425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = photo_table_get_instance (); + _tmp38_ = photo_table_get_instance (); #line 425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = _tmp46_; + _tmp39_ = _tmp38_; #line 425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = self->row; + _tmp40_ = self->row; #line 425 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_detach_editable (_tmp47_, _tmp48_, &_inner_error_); + photo_table_detach_editable (_tmp39_, _tmp40_, &_inner_error_); #line 425 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp47_); + _database_table_unref0 (_tmp39_); #line 425 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 425 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 3898 "Photo.c" +#line 4939 "Photo.c" goto __catch268_database_error; } #line 425 "/home/jens/Source/shotwell/src/Photo.vala" @@ -3907,7 +4948,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { g_clear_error (&_inner_error_); #line 425 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 3911 "Photo.c" +#line 4952 "Photo.c" } } goto __finally268; @@ -3920,7 +4961,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _inner_error_ = NULL; #line 424 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 3924 "Photo.c" +#line 4965 "Photo.c" } __finally268: #line 424 "/home/jens/Source/shotwell/src/Photo.vala" @@ -3935,304 +4976,278 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { g_clear_error (&_inner_error_); #line 424 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 3939 "Photo.c" +#line 4980 "Photo.c" } #line 432 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 3943 "Photo.c" +#line 4984 "Photo.c" } #line 418 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (e); -#line 3947 "Photo.c" +#line 4988 "Photo.c" } #line 436 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = row; + _tmp41_ = row->master; #line 436 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = _tmp49_->master; + _tmp42_ = _tmp41_->file_format; #line 436 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = _tmp50_->file_format; -#line 436 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp51_ == PHOTO_FILE_FORMAT_RAW) { -#line 3957 "Photo.c" - GeeHashMap* _tmp52_; - gint _tmp53_; - RawDeveloper* _tmp54_; + if (_tmp42_ == PHOTO_FILE_FORMAT_RAW) { +#line 4996 "Photo.c" + GeeHashMap* _tmp43_; + gint _tmp44_; + RawDeveloper* _tmp45_; #line 438 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = gee_hash_map_new (TYPE_RAW_DEVELOPER, NULL, NULL, TYPE_BACKING_PHOTO_ROW, (GBoxedCopyFunc) backing_photo_row_ref, (GDestroyNotify) backing_photo_row_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp43_ = gee_hash_map_new (TYPE_RAW_DEVELOPER, NULL, NULL, TYPE_BACKING_PHOTO_ROW, (GBoxedCopyFunc) backing_photo_row_ref, (GDestroyNotify) backing_photo_row_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 438 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->developments); #line 438 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->developments = _tmp52_; + self->priv->developments = _tmp43_; #line 439 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = raw_developer_as_array (&_tmp53_); -#line 3969 "Photo.c" + _tmp45_ = raw_developer_as_array (&_tmp44_); +#line 5008 "Photo.c" { RawDeveloper* d_collection = NULL; gint d_collection_length1 = 0; gint _d_collection_size_ = 0; gint d_it = 0; #line 439 "/home/jens/Source/shotwell/src/Photo.vala" - d_collection = _tmp54_; + d_collection = _tmp45_; #line 439 "/home/jens/Source/shotwell/src/Photo.vala" - d_collection_length1 = _tmp53_; + d_collection_length1 = _tmp44_; #line 439 "/home/jens/Source/shotwell/src/Photo.vala" - for (d_it = 0; d_it < _tmp53_; d_it = d_it + 1) { -#line 3981 "Photo.c" + for (d_it = 0; d_it < _tmp44_; d_it = d_it + 1) { +#line 5020 "Photo.c" RawDeveloper d = 0; #line 439 "/home/jens/Source/shotwell/src/Photo.vala" d = d_collection[d_it]; -#line 3985 "Photo.c" +#line 5024 "Photo.c" { BackingPhotoID id = {0}; - PhotoRow* _tmp55_; - BackingPhotoID* _tmp56_; - gint _tmp56__length1; - RawDeveloper _tmp57_; - BackingPhotoID _tmp58_; - BackingPhotoID _tmp59_; - gint64 _tmp60_; -#line 440 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = row; + BackingPhotoID* _tmp46_; + gint _tmp46__length1; + RawDeveloper _tmp47_; + BackingPhotoID _tmp48_; + BackingPhotoID _tmp49_; + gint64 _tmp50_; #line 440 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = _tmp55_->development_ids; + _tmp46_ = row->development_ids; #line 440 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56__length1 = _tmp55_->development_ids_length1; + _tmp46__length1 = row->development_ids_length1; #line 440 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = d; + _tmp47_ = d; #line 440 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = _tmp56_[_tmp57_]; + _tmp48_ = _tmp46_[_tmp47_]; #line 440 "/home/jens/Source/shotwell/src/Photo.vala" - id = _tmp58_; + id = _tmp48_; #line 441 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = id; + _tmp49_ = id; #line 441 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = _tmp59_.id; + _tmp50_ = _tmp49_.id; #line 441 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp60_ != BACKING_PHOTO_ID_INVALID) { -#line 4013 "Photo.c" + if (_tmp50_ != BACKING_PHOTO_ID_INVALID) { +#line 5049 "Photo.c" BackingPhotoRow* bpr = NULL; - BackingPhotoID _tmp61_; - BackingPhotoRow* _tmp62_; - BackingPhotoRow* _tmp63_; + BackingPhotoID _tmp51_; + BackingPhotoRow* _tmp52_; + BackingPhotoRow* _tmp53_; #line 442 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = id; + _tmp51_ = id; #line 442 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = photo_get_backing_row (self, &_tmp61_); + _tmp52_ = photo_get_backing_row (self, &_tmp51_); #line 442 "/home/jens/Source/shotwell/src/Photo.vala" - bpr = _tmp62_; + bpr = _tmp52_; #line 443 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = bpr; + _tmp53_ = bpr; #line 443 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp63_ != NULL) { -#line 4028 "Photo.c" - GeeHashMap* _tmp64_; - RawDeveloper _tmp65_; - BackingPhotoRow* _tmp66_; + if (_tmp53_ != NULL) { +#line 5064 "Photo.c" + GeeHashMap* _tmp54_; + RawDeveloper _tmp55_; + BackingPhotoRow* _tmp56_; #line 444 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = self->priv->developments; + _tmp54_ = self->priv->developments; #line 444 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = d; + _tmp55_ = d; #line 444 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = bpr; + _tmp56_ = bpr; #line 444 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp65_), _tmp66_); -#line 4040 "Photo.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp55_), _tmp56_); +#line 5076 "Photo.c" } #line 441 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 4044 "Photo.c" +#line 5080 "Photo.c" } } } #line 439 "/home/jens/Source/shotwell/src/Photo.vala" d_collection = (g_free (d_collection), NULL); -#line 4050 "Photo.c" +#line 5086 "Photo.c" } } #line 450 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = row; + _tmp58_ = row->master; #line 450 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = _tmp68_->master; + _tmp59_ = _tmp58_->file_format; #line 450 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = _tmp69_->file_format; + if (_tmp59_ == PHOTO_FILE_FORMAT_RAW) { +#line 5095 "Photo.c" + GeeHashMap* _tmp60_; + RawDeveloper _tmp61_; #line 450 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp70_ == PHOTO_FILE_FORMAT_RAW) { -#line 4061 "Photo.c" - GeeHashMap* _tmp71_; - PhotoRow* _tmp72_; - RawDeveloper _tmp73_; - gboolean _tmp74_; -#line 450 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = self->priv->developments; -#line 450 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = row; + _tmp60_ = self->priv->developments; #line 450 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = _tmp72_->developer; + _tmp61_ = row->developer; #line 450 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp73_)); -#line 450 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = _tmp74_; -#line 4076 "Photo.c" + _tmp57_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp61_)); +#line 5104 "Photo.c" } else { #line 450 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = FALSE; -#line 4080 "Photo.c" + _tmp57_ = FALSE; +#line 5108 "Photo.c" } #line 450 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp67_) { -#line 4084 "Photo.c" + if (_tmp57_) { +#line 5112 "Photo.c" BackingPhotoRow* r = NULL; - GeeHashMap* _tmp75_; - PhotoRow* _tmp76_; - RawDeveloper _tmp77_; - gpointer _tmp78_; - PhotoBackingReaders* _tmp79_; - BackingPhotoRow* _tmp80_; - PhotoFileFormat _tmp81_; - BackingPhotoRow* _tmp82_; - const gchar* _tmp83_; - PhotoFileReader* _tmp84_; -#line 451 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = self->priv->developments; + GeeHashMap* _tmp62_; + RawDeveloper _tmp63_; + gpointer _tmp64_; + PhotoBackingReaders* _tmp65_; + BackingPhotoRow* _tmp66_; + PhotoFileFormat _tmp67_; + BackingPhotoRow* _tmp68_; + const gchar* _tmp69_; + PhotoFileReader* _tmp70_; #line 451 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = row; + _tmp62_ = self->priv->developments; #line 451 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = _tmp76_->developer; + _tmp63_ = row->developer; #line 451 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp77_)); + _tmp64_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp63_)); #line 451 "/home/jens/Source/shotwell/src/Photo.vala" - r = (BackingPhotoRow*) _tmp78_; + r = (BackingPhotoRow*) _tmp64_; #line 452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = self->priv->readers; + _tmp65_ = self->priv->readers; #line 452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = r; + _tmp66_ = r; #line 452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = _tmp80_->file_format; + _tmp67_ = _tmp66_->file_format; #line 452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = r; + _tmp68_ = r; #line 452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = _tmp82_->filepath; + _tmp69_ = _tmp68_->filepath; #line 452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = photo_file_format_create_reader (_tmp81_, _tmp83_); + _tmp70_ = photo_file_format_create_reader (_tmp67_, _tmp69_); #line 452 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp79_->developer); + _photo_file_adapter_unref0 (_tmp65_->developer); #line 452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_->developer = _tmp84_; + _tmp65_->developer = _tmp70_; #line 450 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (r); -#line 4124 "Photo.c" +#line 5149 "Photo.c" } #line 456 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = self->priv->readers; + _tmp71_ = self->priv->readers; #line 456 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = _tmp85_->editable; + _tmp72_ = _tmp71_->editable; #line 456 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp86_ != NULL) { -#line 4132 "Photo.c" - BackingPhotoRow* _tmp87_; - BackingPhotoRow* _tmp88_; + if (_tmp72_ != NULL) { +#line 5157 "Photo.c" + BackingPhotoRow* _tmp73_; + BackingPhotoRow* _tmp74_; #line 457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = self->priv->editable; + _tmp73_ = self->priv->editable; #line 457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = _backing_photo_row_ref0 (_tmp87_); + _tmp74_ = _backing_photo_row_ref0 (_tmp73_); #line 457 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); #line 457 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_photo_row = _tmp88_; -#line 4143 "Photo.c" + self->backing_photo_row = _tmp74_; +#line 5168 "Photo.c" } else { - PhotoRow* _tmp89_; - BackingPhotoRow* _tmp90_; - PhotoFileFormat _tmp91_; -#line 458 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = row; + BackingPhotoRow* _tmp75_; + PhotoFileFormat _tmp76_; #line 458 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = _tmp89_->master; + _tmp75_ = row->master; #line 458 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = _tmp90_->file_format; + _tmp76_ = _tmp75_->file_format; #line 458 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp91_ != PHOTO_FILE_FORMAT_RAW) { -#line 4156 "Photo.c" - PhotoRow* _tmp92_; - BackingPhotoRow* _tmp93_; - BackingPhotoRow* _tmp94_; + if (_tmp76_ != PHOTO_FILE_FORMAT_RAW) { +#line 5178 "Photo.c" + PhotoRow* _tmp77_; + BackingPhotoRow* _tmp78_; + BackingPhotoRow* _tmp79_; #line 459 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = self->row; + _tmp77_ = self->row; #line 459 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = _tmp92_->master; + _tmp78_ = _tmp77_->master; #line 459 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = _backing_photo_row_ref0 (_tmp93_); + _tmp79_ = _backing_photo_row_ref0 (_tmp78_); #line 459 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); #line 459 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_photo_row = _tmp94_; -#line 4170 "Photo.c" + self->backing_photo_row = _tmp79_; +#line 5192 "Photo.c" } else { - GeeHashMap* _tmp95_; - PhotoRow* _tmp96_; - RawDeveloper _tmp97_; - gboolean _tmp98_; -#line 463 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp95_ = self->priv->developments; + GeeHashMap* _tmp80_; + RawDeveloper _tmp81_; #line 463 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = row; + _tmp80_ = self->priv->developments; #line 463 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = _tmp96_->developer; + _tmp81_ = row->developer; #line 463 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp97_)); -#line 463 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp98_) { -#line 4186 "Photo.c" - GeeHashMap* _tmp99_; - PhotoRow* _tmp100_; - RawDeveloper _tmp101_; - gpointer _tmp102_; -#line 464 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp99_ = self->priv->developments; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp81_))) { +#line 5202 "Photo.c" + GeeHashMap* _tmp82_; + RawDeveloper _tmp83_; + gpointer _tmp84_; #line 464 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = row; + _tmp82_ = self->priv->developments; #line 464 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = _tmp100_->developer; + _tmp83_ = row->developer; #line 464 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp102_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp101_)); + _tmp84_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp83_)); #line 464 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); #line 464 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_photo_row = (BackingPhotoRow*) _tmp102_; -#line 4203 "Photo.c" + self->backing_photo_row = (BackingPhotoRow*) _tmp84_; +#line 5216 "Photo.c" } else { - PhotoRow* _tmp103_; - BackingPhotoRow* _tmp104_; - BackingPhotoRow* _tmp105_; + PhotoRow* _tmp85_; + BackingPhotoRow* _tmp86_; + BackingPhotoRow* _tmp87_; #line 467 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp103_ = self->row; + _tmp85_ = self->row; #line 467 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp104_ = _tmp103_->master; + _tmp86_ = _tmp85_->master; #line 467 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp105_ = _backing_photo_row_ref0 (_tmp104_); + _tmp87_ = _backing_photo_row_ref0 (_tmp86_); #line 467 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); #line 467 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_photo_row = _tmp105_; -#line 4218 "Photo.c" + self->backing_photo_row = _tmp87_; +#line 5231 "Photo.c" } } } #line 471 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp106_ = self->row; + _tmp88_ = self->row; #line 471 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp107_ = _tmp106_->exposure_time; + _tmp89_ = _tmp88_->exposure_time; #line 471 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->cached_exposure_time = _tmp107_; + self->priv->cached_exposure_time = _tmp89_; #line 399 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (basename); #line 399 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 4232 "Photo.c" +#line 5245 "Photo.c" } -void photo_init_photo (void) { +void +photo_init_photo (void) +{ GeeLinkedList* _tmp0_; #line 475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = gee_linked_list_new (PHOTO_TYPE_CACHED_PIXBUF, (GBoxedCopyFunc) photo_cached_pixbuf_ref, (GDestroyNotify) photo_cached_pixbuf_unref, NULL, NULL, NULL); @@ -4240,11 +5255,13 @@ void photo_init_photo (void) { _g_object_unref0 (photo_source_pixbuf_cache); #line 475 "/home/jens/Source/shotwell/src/Photo.vala" photo_source_pixbuf_cache = _tmp0_; -#line 4244 "Photo.c" +#line 5259 "Photo.c" } -void photo_terminate_photo (void) { +void +photo_terminate_photo (void) +{ guint _tmp0_; #line 479 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo_source_pixbuf_cache); @@ -4254,7 +5271,7 @@ void photo_terminate_photo (void) { _tmp0_ = photo_discard_source_id; #line 481 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != ((guint) 0)) { -#line 4258 "Photo.c" +#line 5275 "Photo.c" guint _tmp1_; #line 482 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_discard_source_id; @@ -4262,163 +5279,186 @@ void photo_terminate_photo (void) { g_source_remove (_tmp1_); #line 483 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_source_id = (guint) 0; -#line 4266 "Photo.c" +#line 5283 "Photo.c" } } -static void photo_real_notify_editable_replaced (Photo* self, GFile* old_file, GFile* new_file) { - GFile* _tmp0_; - GFile* _tmp1_; +static void +photo_real_notify_editable_replaced (Photo* self, + GFile* old_file, + GFile* new_file) +{ #line 487 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file)); #line 487 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file)); #line 488 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = old_file; -#line 488 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = new_file; -#line 488 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit (self, photo_signals[PHOTO_EDITABLE_REPLACED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 4284 "Photo.c" + g_signal_emit (self, photo_signals[PHOTO_EDITABLE_REPLACED_SIGNAL], 0, old_file, new_file); +#line 5299 "Photo.c" } -void photo_notify_editable_replaced (Photo* self, GFile* old_file, GFile* new_file) { +void +photo_notify_editable_replaced (Photo* self, + GFile* old_file, + GFile* new_file) +{ #line 487 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 487 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->notify_editable_replaced (self, old_file, new_file); -#line 4293 "Photo.c" +#line 5312 "Photo.c" } -static void photo_real_notify_raw_development_modified (Photo* self) { +static void +photo_real_notify_raw_development_modified (Photo* self) +{ #line 492 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit (self, photo_signals[PHOTO_RAW_DEVELOPMENT_MODIFIED_SIGNAL], 0); -#line 4300 "Photo.c" +#line 5321 "Photo.c" } -void photo_notify_raw_development_modified (Photo* self) { +void +photo_notify_raw_development_modified (Photo* self) +{ #line 491 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 491 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->notify_raw_development_modified (self); -#line 4309 "Photo.c" +#line 5332 "Photo.c" } -static void photo_real_notify_baseline_replaced (Photo* self) { +static void +photo_real_notify_baseline_replaced (Photo* self) +{ #line 496 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit (self, photo_signals[PHOTO_BASELINE_REPLACED_SIGNAL], 0); -#line 4316 "Photo.c" +#line 5341 "Photo.c" } -void photo_notify_baseline_replaced (Photo* self) { +void +photo_notify_baseline_replaced (Photo* self) +{ #line 495 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 495 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->notify_baseline_replaced (self); -#line 4325 "Photo.c" +#line 5352 "Photo.c" } -static void photo_real_notify_master_reimported (Photo* self, PhotoMetadata* metadata) { - PhotoMetadata* _tmp0_; +static void +photo_real_notify_master_reimported (Photo* self, + PhotoMetadata* metadata) +{ #line 499 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 500 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = metadata; -#line 500 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit (self, photo_signals[PHOTO_MASTER_REIMPORTED_SIGNAL], 0, _tmp0_); -#line 4337 "Photo.c" + g_signal_emit (self, photo_signals[PHOTO_MASTER_REIMPORTED_SIGNAL], 0, metadata); +#line 5364 "Photo.c" } -void photo_notify_master_reimported (Photo* self, PhotoMetadata* metadata) { +void +photo_notify_master_reimported (Photo* self, + PhotoMetadata* metadata) +{ #line 499 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 499 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->notify_master_reimported (self, metadata); -#line 4346 "Photo.c" +#line 5376 "Photo.c" } -static void photo_real_notify_editable_reimported (Photo* self, PhotoMetadata* metadata) { - PhotoMetadata* _tmp0_; +static void +photo_real_notify_editable_reimported (Photo* self, + PhotoMetadata* metadata) +{ #line 503 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 504 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = metadata; -#line 504 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit (self, photo_signals[PHOTO_EDITABLE_REIMPORTED_SIGNAL], 0, _tmp0_); -#line 4358 "Photo.c" + g_signal_emit (self, photo_signals[PHOTO_EDITABLE_REIMPORTED_SIGNAL], 0, metadata); +#line 5388 "Photo.c" } -void photo_notify_editable_reimported (Photo* self, PhotoMetadata* metadata) { +void +photo_notify_editable_reimported (Photo* self, + PhotoMetadata* metadata) +{ #line 503 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 503 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->notify_editable_reimported (self, metadata); -#line 4367 "Photo.c" +#line 5400 "Photo.c" } -static void photo_real_notify_source_reimported (Photo* self, PhotoMetadata* metadata) { - PhotoMetadata* _tmp0_; +static void +photo_real_notify_source_reimported (Photo* self, + PhotoMetadata* metadata) +{ #line 507 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 508 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = metadata; -#line 508 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit (self, photo_signals[PHOTO_SOURCE_REIMPORTED_SIGNAL], 0, _tmp0_); -#line 4379 "Photo.c" + g_signal_emit (self, photo_signals[PHOTO_SOURCE_REIMPORTED_SIGNAL], 0, metadata); +#line 5412 "Photo.c" } -void photo_notify_source_reimported (Photo* self, PhotoMetadata* metadata) { +void +photo_notify_source_reimported (Photo* self, + PhotoMetadata* metadata) +{ #line 507 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 507 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->notify_source_reimported (self, metadata); -#line 4388 "Photo.c" +#line 5424 "Photo.c" } -static void photo_real_notify_baseline_reimported (Photo* self, PhotoMetadata* metadata) { - PhotoMetadata* _tmp0_; +static void +photo_real_notify_baseline_reimported (Photo* self, + PhotoMetadata* metadata) +{ #line 511 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 512 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = metadata; -#line 512 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit (self, photo_signals[PHOTO_BASELINE_REIMPORTED_SIGNAL], 0, _tmp0_); -#line 4400 "Photo.c" + g_signal_emit (self, photo_signals[PHOTO_BASELINE_REIMPORTED_SIGNAL], 0, metadata); +#line 5436 "Photo.c" } -void photo_notify_baseline_reimported (Photo* self, PhotoMetadata* metadata) { +void +photo_notify_baseline_reimported (Photo* self, + PhotoMetadata* metadata) +{ #line 511 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 511 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->notify_baseline_reimported (self, metadata); -#line 4409 "Photo.c" +#line 5448 "Photo.c" } -static gboolean photo_real_internal_delete_backing (DataSource* base, GError** error) { +static gboolean +photo_real_internal_delete_backing (DataSource* base, + GError** error) +{ Photo * self; gboolean result = FALSE; gboolean ret = FALSE; GFile* file = NULL; - PhotoFileFormat _tmp8_; - GFile* _tmp12_; - gboolean _tmp24_ = FALSE; - gboolean _tmp25_ = FALSE; - gboolean _tmp26_; + GFile* _tmp11_; + gboolean _tmp22_ = FALSE; + gboolean _tmp23_ = FALSE; GError * _inner_error_ = NULL; #line 515 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); @@ -4426,14 +5466,14 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e ret = TRUE; #line 517 "/home/jens/Source/shotwell/src/Photo.vala" file = NULL; -#line 4430 "Photo.c" +#line 5470 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 518 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 518 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 4437 "Photo.c" +#line 5477 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -4443,7 +5483,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e _tmp2_ = _tmp1_->editable; #line 519 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 4447 "Photo.c" +#line 5487 "Photo.c" PhotoBackingReaders* _tmp3_; PhotoFileReader* _tmp4_; GFile* _tmp5_; @@ -4457,7 +5497,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e _g_object_unref0 (file); #line 520 "/home/jens/Source/shotwell/src/Photo.vala" file = _tmp5_; -#line 4461 "Photo.c" +#line 5501 "Photo.c" } } __finally269: @@ -4467,11 +5507,11 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e _tmp6_ = self->priv->readers; #line 518 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 4471 "Photo.c" +#line 5511 "Photo.c" } #line 518 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4475 "Photo.c" +#line 5515 "Photo.c" gboolean _tmp7_ = FALSE; #line 518 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); @@ -4479,86 +5519,81 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e _g_object_unref0 (file); #line 518 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp7_; -#line 4483 "Photo.c" +#line 5523 "Photo.c" } } #line 523 "/home/jens/Source/shotwell/src/Photo.vala" photo_detach_editable (self, TRUE, FALSE, TRUE); #line 525 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_get_master_file_format (self); -#line 525 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_ == PHOTO_FILE_FORMAT_RAW) { -#line 4492 "Photo.c" - gint _tmp9_; - RawDeveloper* _tmp10_; + if (photo_get_master_file_format (self) == PHOTO_FILE_FORMAT_RAW) { +#line 5530 "Photo.c" + gint _tmp8_; + RawDeveloper* _tmp9_; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = raw_developer_as_array (&_tmp9_); -#line 4497 "Photo.c" + _tmp9_ = raw_developer_as_array (&_tmp8_); +#line 5535 "Photo.c" { RawDeveloper* d_collection = NULL; gint d_collection_length1 = 0; gint _d_collection_size_ = 0; gint d_it = 0; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" - d_collection = _tmp10_; + d_collection = _tmp9_; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" - d_collection_length1 = _tmp9_; + d_collection_length1 = _tmp8_; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" - for (d_it = 0; d_it < _tmp9_; d_it = d_it + 1) { -#line 4509 "Photo.c" + for (d_it = 0; d_it < _tmp8_; d_it = d_it + 1) { +#line 5547 "Photo.c" RawDeveloper d = 0; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" d = d_collection[d_it]; -#line 4513 "Photo.c" +#line 5551 "Photo.c" { - RawDeveloper _tmp11_; + RawDeveloper _tmp10_; #line 527 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = d; + _tmp10_ = d; #line 527 "/home/jens/Source/shotwell/src/Photo.vala" - photo_delete_raw_development (self, _tmp11_); -#line 4520 "Photo.c" + photo_delete_raw_development (self, _tmp10_); +#line 5558 "Photo.c" } } #line 526 "/home/jens/Source/shotwell/src/Photo.vala" d_collection = (g_free (d_collection), NULL); -#line 4525 "Photo.c" +#line 5563 "Photo.c" } } #line 531 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = file; + _tmp11_ = file; #line 531 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_ != NULL) { -#line 4532 "Photo.c" + if (_tmp11_ != NULL) { +#line 5570 "Photo.c" { - gboolean _tmp13_ = FALSE; - GFile* _tmp14_; - gboolean _tmp15_; + gboolean _tmp12_ = FALSE; + GFile* _tmp13_; #line 533 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = file; -#line 533 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = g_file_trash (_tmp14_, NULL, &_inner_error_); + _tmp13_ = file; #line 533 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp15_; + _tmp12_ = g_file_trash (_tmp13_, NULL, &_inner_error_); #line 533 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4545 "Photo.c" +#line 5580 "Photo.c" goto __catch270_g_error; } #line 533 "/home/jens/Source/shotwell/src/Photo.vala" - ret = _tmp13_; -#line 4550 "Photo.c" + ret = _tmp12_; +#line 5585 "Photo.c" } goto __finally270; __catch270_g_error: { GError* err = NULL; - GFile* _tmp16_; + GFile* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; gchar* _tmp17_; gchar* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; - GError* _tmp21_; - const gchar* _tmp22_; + GError* _tmp19_; + const gchar* _tmp20_; #line 532 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 532 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4566,84 +5601,85 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e #line 535 "/home/jens/Source/shotwell/src/Photo.vala" ret = FALSE; #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = file; -#line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = g_file_get_path (_tmp16_); + _tmp14_ = file; #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_; + _tmp15_ = g_file_get_path (_tmp14_); #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp16_ = _tmp15_; #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_; + _tmp17_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = err; + _tmp18_ = _tmp17_; #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_->message; + _tmp19_ = err; #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - g_message ("Photo.vala:536: Unable to move editable %s for %s to trash: %s", _tmp18_, _tmp20_, _tmp22_); + _tmp20_ = _tmp19_->message; #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp20_); + g_message ("Photo.vala:536: Unable to move editable %s for %s to trash: %s", _tmp16_, _tmp18_, _tmp20_); #line 536 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp18_); +#line 536 "/home/jens/Source/shotwell/src/Photo.vala" + _g_free0 (_tmp16_); #line 532 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 4591 "Photo.c" +#line 5626 "Photo.c" } __finally270: #line 532 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4596 "Photo.c" - gboolean _tmp23_ = FALSE; +#line 5631 "Photo.c" + gboolean _tmp21_ = FALSE; #line 532 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 532 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); #line 532 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp23_; -#line 4604 "Photo.c" + return _tmp21_; +#line 5639 "Photo.c" } } #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = DATA_SOURCE_CLASS (photo_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_); -#line 542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp26_; + _tmp23_ = DATA_SOURCE_CLASS (photo_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_); #line 542 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4613 "Photo.c" - gboolean _tmp27_ = FALSE; +#line 5646 "Photo.c" + gboolean _tmp24_ = FALSE; #line 542 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 542 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp27_; -#line 4621 "Photo.c" + return _tmp24_; +#line 5654 "Photo.c" } #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp25_) { -#line 4625 "Photo.c" - gboolean _tmp28_; + if (_tmp23_) { +#line 5658 "Photo.c" + gboolean _tmp25_; #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = ret; + _tmp25_ = ret; #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp28_; -#line 4631 "Photo.c" + _tmp22_ = _tmp25_; +#line 5664 "Photo.c" } else { #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = FALSE; -#line 4635 "Photo.c" + _tmp22_ = FALSE; +#line 5668 "Photo.c" } #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp24_; + result = _tmp22_; #line 542 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); #line 542 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 4643 "Photo.c" +#line 5676 "Photo.c" } -static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) { +static BackingPhotoRow* +photo_get_backing_row (Photo* self, + BackingPhotoID* id) +{ BackingPhotoRow* result = NULL; BackingPhotoID _tmp0_; gint64 _tmp1_; @@ -4664,11 +5700,11 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) result = NULL; #line 549 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 4668 "Photo.c" +#line 5704 "Photo.c" } #line 551 "/home/jens/Source/shotwell/src/Photo.vala" backing_row = NULL; -#line 4672 "Photo.c" +#line 5708 "Photo.c" { BackingPhotoRow* _tmp2_ = NULL; BackingPhotoTable* _tmp3_; @@ -4695,7 +5731,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) if (G_UNLIKELY (_inner_error_ != NULL)) { #line 553 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 4699 "Photo.c" +#line 5735 "Photo.c" goto __catch271_database_error; } #line 553 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4706,7 +5742,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) g_clear_error (&_inner_error_); #line 553 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 4710 "Photo.c" +#line 5746 "Photo.c" } #line 553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp2_; @@ -4718,7 +5754,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) backing_row = _tmp8_; #line 552 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp2_); -#line 4722 "Photo.c" +#line 5758 "Photo.c" } goto __finally271; __catch271_database_error: @@ -4746,7 +5782,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) _g_free0 (_tmp10_); #line 552 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 4750 "Photo.c" +#line 5786 "Photo.c" } __finally271: #line 552 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4759,13 +5795,13 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) g_clear_error (&_inner_error_); #line 552 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 4763 "Photo.c" +#line 5799 "Photo.c" } #line 558 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = backing_row; #line 558 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_ == NULL) { -#line 4769 "Photo.c" +#line 5805 "Photo.c" { BackingPhotoTable* _tmp14_; BackingPhotoTable* _tmp15_; @@ -4784,7 +5820,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) if (G_UNLIKELY (_inner_error_ != NULL)) { #line 560 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 4788 "Photo.c" +#line 5824 "Photo.c" goto __catch272_database_error; } #line 560 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4795,7 +5831,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) g_clear_error (&_inner_error_); #line 560 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 4799 "Photo.c" +#line 5835 "Photo.c" } } goto __finally272; @@ -4808,7 +5844,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) _inner_error_ = NULL; #line 559 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 4812 "Photo.c" +#line 5848 "Photo.c" } __finally272: #line 559 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4821,7 +5857,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) g_clear_error (&_inner_error_); #line 559 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 4825 "Photo.c" +#line 5861 "Photo.c" } #line 564 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; @@ -4829,253 +5865,235 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) _backing_photo_row_unref0 (backing_row); #line 564 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 4833 "Photo.c" +#line 5869 "Photo.c" } #line 567 "/home/jens/Source/shotwell/src/Photo.vala" result = backing_row; #line 567 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 4839 "Photo.c" +#line 5875 "Photo.c" } -gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) { +gboolean +photo_is_raw_developer_complete (Photo* self, + RawDeveloper d) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 572 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 4848 "Photo.c" +#line 5887 "Photo.c" { GeeHashMap* _tmp0_; - gboolean _tmp13_ = FALSE; + gboolean _tmp9_ = FALSE; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->developments; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 4856 "Photo.c" +#line 5895 "Photo.c" { gboolean _tmp1_ = FALSE; GeeHashMap* _tmp2_; - RawDeveloper _tmp3_; - gboolean _tmp4_; #line 574 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->developments; #line 574 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = d; -#line 574 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp3_)); -#line 574 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp4_) { -#line 4870 "Photo.c" - GeeHashMap* _tmp5_; - RawDeveloper _tmp6_; - gpointer _tmp7_; - BackingPhotoRow* _tmp8_; - const gchar* _tmp9_; - gboolean _tmp10_; -#line 575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->priv->developments; -#line 575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = d; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) d))) { +#line 5903 "Photo.c" + GeeHashMap* _tmp3_; + gpointer _tmp4_; + BackingPhotoRow* _tmp5_; + const gchar* _tmp6_; #line 575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp6_)); + _tmp3_ = self->priv->developments; #line 575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = (BackingPhotoRow*) _tmp7_; + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) d)); #line 575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_->filepath; + _tmp5_ = (BackingPhotoRow*) _tmp4_; #line 575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = g_file_test (_tmp9_, G_FILE_TEST_EXISTS); + _tmp6_ = _tmp5_->filepath; #line 575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp10_; + _tmp1_ = g_file_test (_tmp6_, G_FILE_TEST_EXISTS); #line 575 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp8_); -#line 4893 "Photo.c" + _backing_photo_row_unref0 (_tmp5_); +#line 5920 "Photo.c" } else { #line 574 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 4897 "Photo.c" +#line 5924 "Photo.c" } #line 574 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 4901 "Photo.c" +#line 5928 "Photo.c" { - GeeHashMap* _tmp11_; + GeeHashMap* _tmp7_; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = self->priv->developments; + _tmp7_ = self->priv->developments; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 4908 "Photo.c" +#line 5935 "Photo.c" } #line 574 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 4912 "Photo.c" +#line 5939 "Photo.c" } __finally273: { - GeeHashMap* _tmp12_; + GeeHashMap* _tmp8_; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = self->priv->developments; + _tmp8_ = self->priv->developments; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 4921 "Photo.c" +#line 5948 "Photo.c" } #line 573 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 573 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 573 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp13_; -#line 4929 "Photo.c" + return _tmp9_; +#line 5956 "Photo.c" } } -gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { +gboolean +photo_is_raw_developer_available (Photo* self, + RawDeveloper d) +{ gboolean result = FALSE; - RawDeveloper _tmp7_; GError * _inner_error_ = NULL; #line 580 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 4940 "Photo.c" +#line 5969 "Photo.c" { GeeHashMap* _tmp0_; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->developments; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 4947 "Photo.c" +#line 5976 "Photo.c" { GeeHashMap* _tmp1_; - RawDeveloper _tmp2_; - gboolean _tmp3_; #line 582 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->developments; #line 582 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = d; -#line 582 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp2_)); -#line 582 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp3_) { + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) d))) { #line 583 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 4962 "Photo.c" +#line 5985 "Photo.c" { - GeeHashMap* _tmp4_; + GeeHashMap* _tmp2_; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->priv->developments; + _tmp2_ = self->priv->developments; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 4969 "Photo.c" +#line 5992 "Photo.c" } #line 583 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 4973 "Photo.c" +#line 5996 "Photo.c" } } __finally274: { - GeeHashMap* _tmp5_; + GeeHashMap* _tmp3_; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->priv->developments; + _tmp3_ = self->priv->developments; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 4983 "Photo.c" +#line 6006 "Photo.c" } #line 581 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4987 "Photo.c" - gboolean _tmp6_ = FALSE; +#line 6010 "Photo.c" + gboolean _tmp4_ = FALSE; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 581 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 581 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp6_; -#line 4995 "Photo.c" + return _tmp4_; +#line 6018 "Photo.c" } } #line 586 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = d; -#line 586 "/home/jens/Source/shotwell/src/Photo.vala" - switch (_tmp7_) { + switch (d) { #line 586 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_SHOTWELL: -#line 5004 "Photo.c" +#line 6025 "Photo.c" { #line 588 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 588 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5010 "Photo.c" +#line 6031 "Photo.c" } #line 586 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_CAMERA: -#line 5014 "Photo.c" +#line 6035 "Photo.c" { #line 591 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 591 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5020 "Photo.c" +#line 6041 "Photo.c" } #line 586 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_EMBEDDED: -#line 5024 "Photo.c" +#line 6045 "Photo.c" { { PhotoMetadata* meta = NULL; - PhotoMetadata* _tmp8_; + PhotoMetadata* _tmp5_; guint num_previews = 0U; - PhotoMetadata* _tmp9_; - guint _tmp10_; - guint _tmp11_; + PhotoMetadata* _tmp6_; + guint _tmp7_; #line 595 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_get_master_metadata (self, &_inner_error_); + _tmp5_ = photo_get_master_metadata (self, &_inner_error_); #line 595 "/home/jens/Source/shotwell/src/Photo.vala" - meta = _tmp8_; + meta = _tmp5_; #line 595 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5039 "Photo.c" +#line 6059 "Photo.c" goto __catch275_g_error; } #line 596 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = meta; -#line 596 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_metadata_get_preview_count (_tmp9_); + _tmp6_ = meta; #line 596 "/home/jens/Source/shotwell/src/Photo.vala" - num_previews = _tmp10_; + num_previews = photo_metadata_get_preview_count (_tmp6_); #line 598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = num_previews; + _tmp7_ = num_previews; #line 598 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_ > ((guint) 0)) { -#line 5052 "Photo.c" + if (_tmp7_ > ((guint) 0)) { +#line 6070 "Photo.c" PhotoPreview* prev = NULL; - PhotoMetadata* _tmp12_; - guint _tmp13_; - PhotoPreview* _tmp14_; - PhotoPreview* _tmp15_; + PhotoMetadata* _tmp8_; + guint _tmp9_; + PhotoPreview* _tmp10_; + PhotoPreview* _tmp11_; Dimensions dims = {0}; - PhotoPreview* _tmp16_; - Dimensions _tmp17_ = {0}; - gint _tmp18_ = 0; - Dimensions _tmp19_; - gint _tmp20_; - Dimensions _tmp21_; - gint _tmp22_; + PhotoPreview* _tmp12_; + Dimensions _tmp13_ = {0}; + gint _tmp14_ = 0; + Dimensions _tmp15_; + gint _tmp16_; + Dimensions _tmp17_; + gint _tmp18_; gint preview_major_axis = 0; - gint _tmp27_; + gint _tmp23_; #line 599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = meta; + _tmp8_ = meta; #line 599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = num_previews; + _tmp9_ = num_previews; #line 599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = photo_metadata_get_preview (_tmp12_, _tmp13_ - 1); + _tmp10_ = photo_metadata_get_preview (_tmp8_, _tmp9_ - 1); #line 599 "/home/jens/Source/shotwell/src/Photo.vala" - prev = _tmp14_; + prev = _tmp10_; #line 602 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = prev; + _tmp11_ = prev; #line 602 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp15_ == NULL) { + if (_tmp11_ == NULL) { #line 603 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 603 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5084,51 +6102,51 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _media_metadata_unref0 (meta); #line 603 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5088 "Photo.c" +#line 6106 "Photo.c" } #line 605 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = prev; + _tmp12_ = prev; #line 605 "/home/jens/Source/shotwell/src/Photo.vala" - photo_preview_get_pixel_dimensions (_tmp16_, &_tmp17_); + photo_preview_get_pixel_dimensions (_tmp12_, &_tmp13_); #line 605 "/home/jens/Source/shotwell/src/Photo.vala" - dims = _tmp17_; + dims = _tmp13_; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = dims; + _tmp15_ = dims; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_.width; + _tmp16_ = _tmp15_.width; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = dims; + _tmp17_ = dims; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_.height; + _tmp18_ = _tmp17_.height; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp20_ > _tmp22_) { -#line 5106 "Photo.c" - Dimensions _tmp23_; - gint _tmp24_; + if (_tmp16_ > _tmp18_) { +#line 6124 "Photo.c" + Dimensions _tmp19_; + gint _tmp20_; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = dims; + _tmp19_ = dims; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_.width; + _tmp20_ = _tmp19_.width; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp24_; -#line 5115 "Photo.c" + _tmp14_ = _tmp20_; +#line 6133 "Photo.c" } else { - Dimensions _tmp25_; - gint _tmp26_; + Dimensions _tmp21_; + gint _tmp22_; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = dims; + _tmp21_ = dims; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp25_.height; + _tmp22_ = _tmp21_.height; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp26_; -#line 5125 "Photo.c" + _tmp14_ = _tmp22_; +#line 6143 "Photo.c" } #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - preview_major_axis = _tmp18_; + preview_major_axis = _tmp14_; #line 609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = preview_major_axis; + _tmp23_ = preview_major_axis; #line 609 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp27_ < PHOTO_MIN_EMBEDDED_SIZE) { + if (_tmp23_ < PHOTO_MIN_EMBEDDED_SIZE) { #line 610 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 610 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5137,7 +6155,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _media_metadata_unref0 (meta); #line 610 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5141 "Photo.c" +#line 6159 "Photo.c" } #line 613 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; @@ -5147,7 +6165,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _media_metadata_unref0 (meta); #line 613 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5151 "Photo.c" +#line 6169 "Photo.c" } #line 617 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; @@ -5155,62 +6173,65 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _media_metadata_unref0 (meta); #line 617 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5159 "Photo.c" +#line 6177 "Photo.c" } goto __finally275; __catch275_g_error: { GError* e = NULL; - GError* _tmp28_; - const gchar* _tmp29_; + GError* _tmp24_; + const gchar* _tmp25_; #line 594 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 594 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 619 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = e; + _tmp24_ = e; #line 619 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _tmp28_->message; + _tmp25_ = _tmp24_->message; #line 619 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:619: Error accessing embedded preview. Message: %s", _tmp29_); + g_debug ("Photo.vala:619: Error accessing embedded preview. Message: %s", _tmp25_); #line 594 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 5179 "Photo.c" +#line 6197 "Photo.c" } __finally275: #line 594 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5184 "Photo.c" - gboolean _tmp30_ = FALSE; +#line 6202 "Photo.c" + gboolean _tmp26_ = FALSE; #line 594 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 594 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 594 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp30_; -#line 5192 "Photo.c" + return _tmp26_; +#line 6210 "Photo.c" } #line 621 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 621 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5198 "Photo.c" +#line 6216 "Photo.c" } default: { #line 624 "/home/jens/Source/shotwell/src/Photo.vala" g_assert_not_reached (); -#line 5204 "Photo.c" +#line 6222 "Photo.c" } } } -void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, gboolean notify, GError** error) { +void +photo_add_backing_photo_for_development (Photo* self, + RawDeveloper d, + BackingPhotoRow* bpr, + gboolean notify, + GError** error) +{ PhotoRow* _tmp0_; - RawDeveloper _tmp1_; - BackingPhotoRow* _tmp2_; - gboolean _tmp8_; GError * _inner_error_ = NULL; #line 631 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -5219,48 +6240,38 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi #line 632 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 632 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = d; -#line 632 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = bpr; -#line 632 "/home/jens/Source/shotwell/src/Photo.vala" - photo_import_developed_backing_photo (_tmp0_, _tmp1_, _tmp2_, &_inner_error_); + photo_import_developed_backing_photo (_tmp0_, d, bpr, &_inner_error_); #line 632 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 632 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 632 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5234 "Photo.c" +#line 6251 "Photo.c" } { - GeeHashMap* _tmp3_; + GeeHashMap* _tmp1_; #line 633 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->priv->developments; + _tmp1_ = self->priv->developments; #line 633 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 5242 "Photo.c" +#line 6259 "Photo.c" { - GeeHashMap* _tmp4_; - RawDeveloper _tmp5_; - BackingPhotoRow* _tmp6_; -#line 634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->priv->developments; -#line 634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = d; + GeeHashMap* _tmp2_; #line 634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = bpr; + _tmp2_ = self->priv->developments; #line 634 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp5_), _tmp6_); -#line 5255 "Photo.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) d), bpr); +#line 6266 "Photo.c" } __finally276: { - GeeHashMap* _tmp7_; + GeeHashMap* _tmp3_; #line 633 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->priv->developments; + _tmp3_ = self->priv->developments; #line 633 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 5264 "Photo.c" +#line 6275 "Photo.c" } #line 633 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5268,90 +6279,81 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi g_propagate_error (error, _inner_error_); #line 633 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5272 "Photo.c" +#line 6283 "Photo.c" } } #line 637 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = notify; -#line 637 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_) { -#line 5279 "Photo.c" - Alteration* _tmp9_; - Alteration* _tmp10_; + if (notify) { +#line 6288 "Photo.c" + Alteration* _tmp4_; + Alteration* _tmp5_; #line 638 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = alteration_new ("image", "developer"); + _tmp4_ = alteration_new ("image", "developer"); #line 638 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_; + _tmp5_ = _tmp4_; #line 638 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp10_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_); #line 638 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp10_); -#line 5290 "Photo.c" + _alteration_unref0 (_tmp5_); +#line 6299 "Photo.c" } } -void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, BackingPhotoRow* bpr, GError** error) { +void +photo_import_developed_backing_photo (PhotoRow* row, + RawDeveloper d, + BackingPhotoRow* bpr, + GError** error) +{ GFile* file = NULL; - BackingPhotoRow* _tmp0_; - const gchar* _tmp1_; - GFile* _tmp2_; + const gchar* _tmp0_; + GFile* _tmp1_; GFileInfo* info = NULL; - GFile* _tmp3_; - GFileInfo* _tmp4_; + GFile* _tmp2_; + GFileInfo* _tmp3_; GTimeVal timestamp = {0}; - GFileInfo* _tmp5_; - GTimeVal _tmp6_ = {0}; + GFileInfo* _tmp4_; + GTimeVal _tmp5_ = {0}; PhotoFileInterrogator* interrogator = NULL; - GFile* _tmp7_; + GFile* _tmp6_; + PhotoFileInterrogator* _tmp7_; PhotoFileInterrogator* _tmp8_; - PhotoFileInterrogator* _tmp9_; DetectedPhotoInformation* detected = NULL; - PhotoFileInterrogator* _tmp10_; - DetectedPhotoInformation* _tmp11_; - gboolean _tmp12_ = FALSE; - DetectedPhotoInformation* _tmp13_; - BackingPhotoRow* _tmp16_; - DetectedPhotoInformation* _tmp17_; - Dimensions _tmp18_; - BackingPhotoRow* _tmp19_; - GFileInfo* _tmp20_; - gint64 _tmp21_; - BackingPhotoRow* _tmp22_; - GTimeVal _tmp23_; - glong _tmp24_; - Orientation _tmp25_ = 0; - DetectedPhotoInformation* _tmp26_; - PhotoMetadata* _tmp27_; - BackingPhotoRow* _tmp31_; - BackingPhotoTable* _tmp32_; - BackingPhotoTable* _tmp33_; - BackingPhotoRow* _tmp34_; - PhotoTable* _tmp35_; - PhotoTable* _tmp36_; - PhotoRow* _tmp37_; - RawDeveloper _tmp38_; - BackingPhotoRow* _tmp39_; - BackingPhotoID _tmp40_; + PhotoFileInterrogator* _tmp9_; + DetectedPhotoInformation* _tmp10_; + gboolean _tmp11_ = FALSE; + DetectedPhotoInformation* _tmp12_; + DetectedPhotoInformation* _tmp14_; + Dimensions _tmp15_; + GFileInfo* _tmp16_; + GTimeVal _tmp17_; + glong _tmp18_; + Orientation _tmp19_ = 0; + DetectedPhotoInformation* _tmp20_; + PhotoMetadata* _tmp21_; + BackingPhotoTable* _tmp24_; + BackingPhotoTable* _tmp25_; + PhotoTable* _tmp26_; + PhotoTable* _tmp27_; + BackingPhotoID _tmp28_; GError * _inner_error_ = NULL; #line 641 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO_ROW (row)); #line 641 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_BACKING_PHOTO_ROW (bpr)); #line 643 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = bpr; -#line 643 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp0_->filepath; + _tmp0_ = bpr->filepath; #line 643 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = g_file_new_for_path (_tmp1_); + _tmp1_ = g_file_new_for_path (_tmp0_); #line 643 "/home/jens/Source/shotwell/src/Photo.vala" - file = _tmp2_; + file = _tmp1_; #line 644 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = file; + _tmp2_ = file; #line 644 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = g_file_query_info (_tmp3_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); + _tmp3_ = g_file_query_info (_tmp2_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); #line 644 "/home/jens/Source/shotwell/src/Photo.vala" - info = _tmp4_; + info = _tmp3_; #line 644 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 644 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5360,24 +6362,24 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (file); #line 644 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5364 "Photo.c" +#line 6366 "Photo.c" } #line 646 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = info; + _tmp4_ = info; #line 646 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_info_get_modification_time (_tmp5_, &_tmp6_); + g_file_info_get_modification_time (_tmp4_, &_tmp5_); #line 646 "/home/jens/Source/shotwell/src/Photo.vala" - timestamp = _tmp6_; + timestamp = _tmp5_; #line 648 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = file; + _tmp6_ = file; #line 648 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_file_interrogator_new (_tmp7_, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL); + _tmp7_ = photo_file_interrogator_new (_tmp6_, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL); #line 648 "/home/jens/Source/shotwell/src/Photo.vala" - interrogator = _tmp8_; + interrogator = _tmp7_; #line 650 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = interrogator; + _tmp8_ = interrogator; #line 650 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_interrogator_interrogate (_tmp9_, &_inner_error_); + photo_file_interrogator_interrogate (_tmp8_, &_inner_error_); #line 650 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 650 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5390,34 +6392,31 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (file); #line 650 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5394 "Photo.c" +#line 6396 "Photo.c" } #line 652 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = interrogator; + _tmp9_ = interrogator; #line 652 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_file_interrogator_get_detected_photo_information (_tmp10_); + _tmp10_ = photo_file_interrogator_get_detected_photo_information (_tmp9_); #line 652 "/home/jens/Source/shotwell/src/Photo.vala" - detected = _tmp11_; + detected = _tmp10_; #line 653 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = detected; + _tmp12_ = detected; #line 653 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp13_ == NULL) { + if (_tmp12_ == NULL) { #line 653 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = TRUE; -#line 5408 "Photo.c" + _tmp11_ = TRUE; +#line 6410 "Photo.c" } else { - PhotoFileInterrogator* _tmp14_; - gboolean _tmp15_; + PhotoFileInterrogator* _tmp13_; #line 653 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = interrogator; -#line 653 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo_file_interrogator_get_is_photo_corrupted (_tmp14_); + _tmp13_ = interrogator; #line 653 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp15_; -#line 5418 "Photo.c" + _tmp11_ = photo_file_interrogator_get_is_photo_corrupted (_tmp13_); +#line 6417 "Photo.c" } #line 653 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_) { + if (_tmp11_) { #line 656 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); #line 656 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5428,70 +6427,55 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (file); #line 656 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5432 "Photo.c" +#line 6431 "Photo.c" } #line 659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = bpr; -#line 659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = detected; + _tmp14_ = detected; #line 659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_->image_dim; + _tmp15_ = _tmp14_->image_dim; #line 659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_->dim = _tmp18_; -#line 660 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = bpr; -#line 660 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = info; + bpr->dim = _tmp15_; #line 660 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = g_file_info_get_size (_tmp20_); + _tmp16_ = info; #line 660 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_->filesize = _tmp21_; + bpr->filesize = g_file_info_get_size (_tmp16_); #line 661 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = bpr; + _tmp17_ = timestamp; #line 661 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = timestamp; + _tmp18_ = _tmp17_.tv_sec; #line 661 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_.tv_sec; -#line 661 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_->timestamp = (time_t) _tmp24_; -#line 662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = detected; + bpr->timestamp = (time_t) _tmp18_; #line 662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_->metadata; + _tmp20_ = detected; #line 662 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp27_ != NULL) { -#line 5464 "Photo.c" - DetectedPhotoInformation* _tmp28_; - PhotoMetadata* _tmp29_; - Orientation _tmp30_; + _tmp21_ = _tmp20_->metadata; #line 662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = detected; + if (_tmp21_ != NULL) { +#line 6455 "Photo.c" + DetectedPhotoInformation* _tmp22_; + PhotoMetadata* _tmp23_; #line 662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _tmp28_->metadata; + _tmp22_ = detected; #line 662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = photo_metadata_get_orientation (_tmp29_); + _tmp23_ = _tmp22_->metadata; #line 662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp30_; -#line 5476 "Photo.c" + _tmp19_ = photo_metadata_get_orientation (_tmp23_); +#line 6464 "Photo.c" } else { #line 663 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = ORIENTATION_TOP_LEFT; -#line 5480 "Photo.c" + _tmp19_ = ORIENTATION_TOP_LEFT; +#line 6468 "Photo.c" } #line 662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = bpr; -#line 662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_->original_orientation = _tmp25_; -#line 666 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = backing_photo_table_get_instance (); + bpr->original_orientation = _tmp19_; #line 666 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp32_; + _tmp24_ = backing_photo_table_get_instance (); #line 666 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = bpr; + _tmp25_ = _tmp24_; #line 666 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_add (_tmp33_, _tmp34_, &_inner_error_); + backing_photo_table_add (_tmp25_, bpr, &_inner_error_); #line 666 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp33_); + _database_table_unref0 (_tmp25_); #line 666 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 666 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5506,24 +6490,18 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (file); #line 666 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5510 "Photo.c" +#line 6494 "Photo.c" } #line 667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = photo_table_get_instance (); -#line 667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = _tmp35_; -#line 667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = row; + _tmp26_ = photo_table_get_instance (); #line 667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = d; -#line 667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = bpr; + _tmp27_ = _tmp26_; #line 667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = _tmp39_->id; + _tmp28_ = bpr->id; #line 667 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_update_raw_development (_tmp36_, _tmp37_, _tmp38_, &_tmp40_, &_inner_error_); + photo_table_update_raw_development (_tmp27_, row, d, &_tmp28_, &_inner_error_); #line 667 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp36_); + _database_table_unref0 (_tmp27_); #line 667 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 667 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5538,7 +6516,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (file); #line 667 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5542 "Photo.c" +#line 6520 "Photo.c" } #line 641 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); @@ -5548,14 +6526,17 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (info); #line 641 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 5552 "Photo.c" +#line 6530 "Photo.c" } -static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { +static void +photo_develop_photo (Photo* self, + RawDeveloper d, + gboolean notify) +{ gboolean wrote_img_to_disk = FALSE; BackingPhotoRow* bps = NULL; - RawDeveloper _tmp0_; GError * _inner_error_ = NULL; #line 672 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -5564,182 +6545,171 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { #line 674 "/home/jens/Source/shotwell/src/Photo.vala" bps = NULL; #line 676 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = d; -#line 676 "/home/jens/Source/shotwell/src/Photo.vala" - switch (_tmp0_) { + switch (d) { #line 676 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_SHOTWELL: -#line 5573 "Photo.c" +#line 6552 "Photo.c" { { - BackingPhotoRow* _tmp1_ = NULL; - RawDeveloper _tmp2_; - PhotoRow* _tmp3_; + BackingPhotoRow* _tmp0_ = NULL; + PhotoRow* _tmp1_; + BackingPhotoRow* _tmp2_; + const gchar* _tmp3_; BackingPhotoRow* _tmp4_; - const gchar* _tmp5_; - BackingPhotoRow* _tmp6_; - BackingPhotoRow* _tmp7_; + BackingPhotoRow* _tmp5_; GdkPixbuf* pix = NULL; - GdkPixbuf* _tmp14_; + GdkPixbuf* _tmp12_; PhotoFileWriter* writer = NULL; - BackingPhotoRow* _tmp21_; - const gchar* _tmp22_; - PhotoFileWriter* _tmp23_; - PhotoFileWriter* _tmp24_; - GdkPixbuf* _tmp25_; + BackingPhotoRow* _tmp17_; + const gchar* _tmp18_; + PhotoFileWriter* _tmp19_; + PhotoFileWriter* _tmp20_; + GdkPixbuf* _tmp21_; PhotoMetadata* meta = NULL; - PhotoMetadata* _tmp26_; + PhotoMetadata* _tmp22_; PhotoFileMetadataWriter* mwriter = NULL; - BackingPhotoRow* _tmp27_; - const gchar* _tmp28_; - PhotoFileMetadataWriter* _tmp29_; - PhotoFileMetadataWriter* _tmp30_; - PhotoMetadata* _tmp31_; + BackingPhotoRow* _tmp23_; + const gchar* _tmp24_; + PhotoFileMetadataWriter* _tmp25_; + PhotoFileMetadataWriter* _tmp26_; + PhotoMetadata* _tmp27_; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = d; + _tmp1_ = self->row; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->row; -#line 680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_->master; + _tmp2_ = _tmp1_->master; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_->filepath; + _tmp3_ = _tmp2_->filepath; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = raw_developer_create_backing_row_for_development (_tmp2_, _tmp5_, NULL, &_inner_error_); + _tmp4_ = raw_developer_create_backing_row_for_development (d, _tmp3_, NULL, &_inner_error_); #line 680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp6_; + _tmp0_ = _tmp4_; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5613 "Photo.c" +#line 6589 "Photo.c" goto __catch277_g_error; } #line 680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp1_; + _tmp5_ = _tmp0_; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = NULL; + _tmp0_ = NULL; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); #line 680 "/home/jens/Source/shotwell/src/Photo.vala" - bps = _tmp7_; + bps = _tmp5_; #line 681 "/home/jens/Source/shotwell/src/Photo.vala" pix = NULL; -#line 5626 "Photo.c" +#line 6602 "Photo.c" { - PhotoBackingReaders* _tmp8_; + PhotoBackingReaders* _tmp6_; #line 682 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = self->priv->readers; + _tmp6_ = self->priv->readers; #line 682 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 5633 "Photo.c" +#line 6609 "Photo.c" { - GdkPixbuf* _tmp9_ = NULL; - Scaling _tmp10_ = {0}; - GdkPixbuf* _tmp11_; - GdkPixbuf* _tmp12_; + GdkPixbuf* _tmp7_ = NULL; + Scaling _tmp8_ = {0}; + GdkPixbuf* _tmp9_; + GdkPixbuf* _tmp10_; #line 687 "/home/jens/Source/shotwell/src/Photo.vala" - scaling_for_original (&_tmp10_); + scaling_for_original (&_tmp8_); #line 687 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_get_master_pixbuf (self, &_tmp10_, FALSE, &_inner_error_); + _tmp9_ = photo_get_master_pixbuf (self, &_tmp8_, FALSE, &_inner_error_); #line 687 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp11_; + _tmp7_ = _tmp9_; #line 687 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5647 "Photo.c" +#line 6623 "Photo.c" goto __finally278; } #line 687 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp9_; + _tmp10_ = _tmp7_; #line 687 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = NULL; + _tmp7_ = NULL; #line 687 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); #line 687 "/home/jens/Source/shotwell/src/Photo.vala" - pix = _tmp12_; + pix = _tmp10_; #line 682 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp9_); -#line 5660 "Photo.c" + _g_object_unref0 (_tmp7_); +#line 6636 "Photo.c" } __finally278: { - PhotoBackingReaders* _tmp13_; + PhotoBackingReaders* _tmp11_; #line 682 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = self->priv->readers; + _tmp11_ = self->priv->readers; #line 682 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 5669 "Photo.c" +#line 6645 "Photo.c" } #line 682 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 682 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); #line 682 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp1_); -#line 5677 "Photo.c" + _backing_photo_row_unref0 (_tmp0_); +#line 6653 "Photo.c" goto __catch277_g_error; } } #line 690 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = pix; + _tmp12_ = pix; #line 690 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp14_ == NULL) { + if (_tmp12_ == NULL) { #line 691 "/home/jens/Source/shotwell/src/Photo.vala" g_debug ("Photo.vala:691: Could not get preview pixbuf"); #line 692 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); #line 692 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp1_); -#line 5691 "Photo.c" + _backing_photo_row_unref0 (_tmp0_); +#line 6667 "Photo.c" { - gboolean _tmp15_; + gboolean _tmp13_; #line 716 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = wrote_img_to_disk; + _tmp13_ = wrote_img_to_disk; #line 716 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp15_) { -#line 5698 "Photo.c" + if (_tmp13_) { +#line 6674 "Photo.c" { - RawDeveloper _tmp16_; - BackingPhotoRow* _tmp17_; - gboolean _tmp18_; -#line 719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = d; + BackingPhotoRow* _tmp14_; #line 719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = bps; + _tmp14_ = bps; #line 719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = notify; -#line 719 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp16_, _tmp17_, _tmp18_, &_inner_error_); + photo_add_backing_photo_for_development (self, d, _tmp14_, notify, &_inner_error_); #line 719 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5713 "Photo.c" +#line 6683 "Photo.c" goto __catch279_g_error; } #line 721 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 5718 "Photo.c" +#line 6688 "Photo.c" } goto __finally279; __catch279_g_error: { GError* e = NULL; - GError* _tmp19_; - const gchar* _tmp20_; + GError* _tmp15_; + const gchar* _tmp16_; #line 717 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 717 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 723 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = e; + _tmp15_ = e; #line 723 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_->message; + _tmp16_ = _tmp15_->message; #line 723 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:723: Error adding backing photo as development. Message: %s", _tmp20_); + g_debug ("Photo.vala:723: Error adding backing photo as development. Message: %s", _tmp16_); #line 717 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 5738 "Photo.c" +#line 6708 "Photo.c" } __finally279: #line 717 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5743 "Photo.c" +#line 6713 "Photo.c" goto __catch277_g_error; } } @@ -5748,31 +6718,31 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { _backing_photo_row_unref0 (bps); #line 692 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5752 "Photo.c" +#line 6722 "Photo.c" } #line 696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = bps; + _tmp17_ = bps; #line 696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_->filepath; + _tmp18_ = _tmp17_->filepath; #line 696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = photo_file_format_create_writer (PHOTO_FILE_FORMAT_JFIF, _tmp22_, &_inner_error_); + _tmp19_ = photo_file_format_create_writer (PHOTO_FILE_FORMAT_JFIF, _tmp18_, &_inner_error_); #line 696 "/home/jens/Source/shotwell/src/Photo.vala" - writer = _tmp23_; + writer = _tmp19_; #line 696 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 696 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); #line 696 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp1_); -#line 5768 "Photo.c" + _backing_photo_row_unref0 (_tmp0_); +#line 6738 "Photo.c" goto __catch277_g_error; } #line 697 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = writer; + _tmp20_ = writer; #line 697 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = pix; + _tmp21_ = pix; #line 697 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_writer_write (_tmp24_, _tmp25_, JPEG_QUALITY_HIGH, &_inner_error_); + photo_file_writer_write (_tmp20_, _tmp21_, JPEG_QUALITY_HIGH, &_inner_error_); #line 697 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 697 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5780,16 +6750,16 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { #line 697 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); #line 697 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp1_); -#line 5785 "Photo.c" + _backing_photo_row_unref0 (_tmp0_); +#line 6755 "Photo.c" goto __catch277_g_error; } #line 705 "/home/jens/Source/shotwell/src/Photo.vala" wrote_img_to_disk = TRUE; #line 710 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = photo_get_master_metadata (self, &_inner_error_); + _tmp22_ = photo_get_master_metadata (self, &_inner_error_); #line 710 "/home/jens/Source/shotwell/src/Photo.vala" - meta = _tmp26_; + meta = _tmp22_; #line 710 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 710 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5797,18 +6767,18 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { #line 710 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); #line 710 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp1_); -#line 5802 "Photo.c" + _backing_photo_row_unref0 (_tmp0_); +#line 6772 "Photo.c" goto __catch277_g_error; } #line 711 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = bps; + _tmp23_ = bps; #line 711 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp27_->filepath; + _tmp24_ = _tmp23_->filepath; #line 711 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = photo_file_format_create_metadata_writer (PHOTO_FILE_FORMAT_JFIF, _tmp28_, &_inner_error_); + _tmp25_ = photo_file_format_create_metadata_writer (PHOTO_FILE_FORMAT_JFIF, _tmp24_, &_inner_error_); #line 711 "/home/jens/Source/shotwell/src/Photo.vala" - mwriter = _tmp29_; + mwriter = _tmp25_; #line 711 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 711 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5818,16 +6788,16 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { #line 711 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); #line 711 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp1_); -#line 5823 "Photo.c" + _backing_photo_row_unref0 (_tmp0_); +#line 6793 "Photo.c" goto __catch277_g_error; } #line 712 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = mwriter; + _tmp26_ = mwriter; #line 712 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = meta; + _tmp27_ = meta; #line 712 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp30_, _tmp31_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp26_, _tmp27_, &_inner_error_); #line 712 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 712 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5839,8 +6809,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { #line 712 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); #line 712 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp1_); -#line 5844 "Photo.c" + _backing_photo_row_unref0 (_tmp0_); +#line 6814 "Photo.c" goto __catch277_g_error; } #line 678 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5852,77 +6822,71 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { #line 678 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); #line 678 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp1_); -#line 5857 "Photo.c" + _backing_photo_row_unref0 (_tmp0_); +#line 6827 "Photo.c" } goto __finally277; __catch277_g_error: { GError* err = NULL; - GError* _tmp32_; - const gchar* _tmp33_; + GError* _tmp28_; + const gchar* _tmp29_; #line 678 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 678 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 714 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = err; + _tmp28_ = err; #line 714 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp32_->message; + _tmp29_ = _tmp28_->message; #line 714 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:714: Error developing photo: %s", _tmp33_); + g_debug ("Photo.vala:714: Error developing photo: %s", _tmp29_); #line 678 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 5877 "Photo.c" +#line 6847 "Photo.c" } __finally277: { - gboolean _tmp34_; + gboolean _tmp30_; #line 716 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = wrote_img_to_disk; + _tmp30_ = wrote_img_to_disk; #line 716 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp34_) { -#line 5886 "Photo.c" + if (_tmp30_) { +#line 6856 "Photo.c" { - RawDeveloper _tmp35_; - BackingPhotoRow* _tmp36_; - gboolean _tmp37_; -#line 719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = d; + BackingPhotoRow* _tmp31_; #line 719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = bps; + _tmp31_ = bps; #line 719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = notify; -#line 719 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp35_, _tmp36_, _tmp37_, &_inner_error_); + photo_add_backing_photo_for_development (self, d, _tmp31_, notify, &_inner_error_); #line 719 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5901 "Photo.c" +#line 6865 "Photo.c" goto __catch280_g_error; } #line 721 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 5906 "Photo.c" +#line 6870 "Photo.c" } goto __finally280; __catch280_g_error: { GError* e = NULL; - GError* _tmp38_; - const gchar* _tmp39_; + GError* _tmp32_; + const gchar* _tmp33_; #line 717 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 717 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 723 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = e; + _tmp32_ = e; #line 723 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = _tmp38_->message; + _tmp33_ = _tmp32_->message; #line 723 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:723: Error adding backing photo as development. Message: %s", _tmp39_); + g_debug ("Photo.vala:723: Error adding backing photo as development. Message: %s", _tmp33_); #line 717 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 5926 "Photo.c" +#line 6890 "Photo.c" } __finally280: #line 717 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5935,7 +6899,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { g_clear_error (&_inner_error_); #line 717 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5939 "Photo.c" +#line 6903 "Photo.c" } } } @@ -5949,130 +6913,119 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { g_clear_error (&_inner_error_); #line 678 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5953 "Photo.c" +#line 6917 "Photo.c" } #line 729 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 5957 "Photo.c" +#line 6921 "Photo.c" } #line 676 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_CAMERA: -#line 5961 "Photo.c" +#line 6925 "Photo.c" { #line 733 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 5965 "Photo.c" +#line 6929 "Photo.c" } #line 676 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_EMBEDDED: -#line 5969 "Photo.c" +#line 6933 "Photo.c" { { PhotoMetadata* meta = NULL; - PhotoMetadata* _tmp40_; + PhotoMetadata* _tmp34_; guint c = 0U; + PhotoMetadata* _tmp35_; + guint _tmp36_; + PhotoPreview* prev = NULL; PhotoMetadata* _tmp41_; guint _tmp42_; - guint _tmp43_; - PhotoPreview* prev = NULL; - PhotoMetadata* _tmp50_; - guint _tmp51_; - PhotoPreview* _tmp52_; - PhotoPreview* _tmp53_; + PhotoPreview* _tmp43_; + PhotoPreview* _tmp44_; GBytes* pix = NULL; - PhotoPreview* _tmp60_; - GBytes* _tmp61_; - GBytes* _tmp62_; - BackingPhotoRow* _tmp69_ = NULL; - RawDeveloper _tmp70_; - PhotoRow* _tmp71_; - BackingPhotoRow* _tmp72_; - const gchar* _tmp73_; - BackingPhotoRow* _tmp74_; - BackingPhotoRow* _tmp75_; - gboolean _tmp76_ = FALSE; - GBytes* _tmp77_; - gboolean _tmp78_; + PhotoPreview* _tmp49_; + GBytes* _tmp50_; + GBytes* _tmp51_; + BackingPhotoRow* _tmp56_ = NULL; + PhotoRow* _tmp57_; + BackingPhotoRow* _tmp58_; + const gchar* _tmp59_; + BackingPhotoRow* _tmp60_; + BackingPhotoRow* _tmp61_; + gboolean _tmp62_ = FALSE; + GBytes* _tmp63_; PhotoFileMetadataWriter* mwriter = NULL; - BackingPhotoRow* _tmp100_; - const gchar* _tmp101_; - PhotoFileMetadataWriter* _tmp102_; - PhotoFileMetadataWriter* _tmp103_; - PhotoMetadata* _tmp104_; + BackingPhotoRow* _tmp83_; + const gchar* _tmp84_; + PhotoFileMetadataWriter* _tmp85_; + PhotoFileMetadataWriter* _tmp86_; + PhotoMetadata* _tmp87_; #line 738 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = photo_get_master_metadata (self, &_inner_error_); + _tmp34_ = photo_get_master_metadata (self, &_inner_error_); #line 738 "/home/jens/Source/shotwell/src/Photo.vala" - meta = _tmp40_; + meta = _tmp34_; #line 738 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6009 "Photo.c" +#line 6970 "Photo.c" goto __catch281_g_error; } #line 739 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = meta; -#line 739 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = photo_metadata_get_preview_count (_tmp41_); + _tmp35_ = meta; #line 739 "/home/jens/Source/shotwell/src/Photo.vala" - c = _tmp42_; + c = photo_metadata_get_preview_count (_tmp35_); #line 740 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = c; + _tmp36_ = c; #line 740 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp43_ <= ((guint) 0)) { + if (_tmp36_ <= ((guint) 0)) { #line 741 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6024 "Photo.c" +#line 6983 "Photo.c" { - gboolean _tmp44_; + gboolean _tmp37_; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = wrote_img_to_disk; + _tmp37_ = wrote_img_to_disk; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp44_) { -#line 6031 "Photo.c" + if (_tmp37_) { +#line 6990 "Photo.c" { - RawDeveloper _tmp45_; - BackingPhotoRow* _tmp46_; - gboolean _tmp47_; + BackingPhotoRow* _tmp38_; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = d; + _tmp38_ = bps; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = bps; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = notify; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp45_, _tmp46_, _tmp47_, &_inner_error_); + photo_add_backing_photo_for_development (self, d, _tmp38_, notify, &_inner_error_); #line 789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6046 "Photo.c" +#line 6999 "Photo.c" goto __catch282_g_error; } #line 791 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6051 "Photo.c" +#line 7004 "Photo.c" } goto __finally282; __catch282_g_error: { GError* e = NULL; - GError* _tmp48_; - const gchar* _tmp49_; + GError* _tmp39_; + const gchar* _tmp40_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = e; + _tmp39_ = e; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = _tmp48_->message; + _tmp40_ = _tmp39_->message; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp49_); + g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp40_); #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6071 "Photo.c" +#line 7024 "Photo.c" } __finally282: #line 787 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6076 "Photo.c" +#line 7029 "Photo.c" goto __catch281_g_error; } } @@ -6081,79 +7034,73 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { _backing_photo_row_unref0 (bps); #line 741 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6085 "Photo.c" +#line 7038 "Photo.c" } #line 742 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = meta; + _tmp41_ = meta; #line 742 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = c; + _tmp42_ = c; #line 742 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = photo_metadata_get_preview (_tmp50_, _tmp51_ - 1); + _tmp43_ = photo_metadata_get_preview (_tmp41_, _tmp42_ - 1); #line 742 "/home/jens/Source/shotwell/src/Photo.vala" - prev = _tmp52_; + prev = _tmp43_; #line 743 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = prev; + _tmp44_ = prev; #line 743 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp53_ == NULL) { + if (_tmp44_ == NULL) { #line 744 "/home/jens/Source/shotwell/src/Photo.vala" g_debug ("Photo.vala:744: Could not get preview from metadata"); #line 745 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 745 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6105 "Photo.c" +#line 7058 "Photo.c" { - gboolean _tmp54_; + gboolean _tmp45_; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = wrote_img_to_disk; + _tmp45_ = wrote_img_to_disk; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp54_) { -#line 6112 "Photo.c" + if (_tmp45_) { +#line 7065 "Photo.c" { - RawDeveloper _tmp55_; - BackingPhotoRow* _tmp56_; - gboolean _tmp57_; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = d; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = bps; + BackingPhotoRow* _tmp46_; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = notify; + _tmp46_ = bps; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp55_, _tmp56_, _tmp57_, &_inner_error_); + photo_add_backing_photo_for_development (self, d, _tmp46_, notify, &_inner_error_); #line 789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6127 "Photo.c" +#line 7074 "Photo.c" goto __catch283_g_error; } #line 791 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6132 "Photo.c" +#line 7079 "Photo.c" } goto __finally283; __catch283_g_error: { GError* e = NULL; - GError* _tmp58_; - const gchar* _tmp59_; + GError* _tmp47_; + const gchar* _tmp48_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = e; + _tmp47_ = e; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = _tmp58_->message; + _tmp48_ = _tmp47_->message; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp59_); + g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp48_); #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6152 "Photo.c" +#line 7099 "Photo.c" } __finally283: #line 787 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6157 "Photo.c" +#line 7104 "Photo.c" goto __catch281_g_error; } } @@ -6162,27 +7109,27 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { _backing_photo_row_unref0 (bps); #line 745 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6166 "Photo.c" +#line 7113 "Photo.c" } #line 748 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = prev; + _tmp49_ = prev; #line 748 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = photo_preview_flatten (_tmp60_, &_inner_error_); + _tmp50_ = photo_preview_flatten (_tmp49_, &_inner_error_); #line 748 "/home/jens/Source/shotwell/src/Photo.vala" - pix = _tmp61_; + pix = _tmp50_; #line 748 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 748 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 748 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6180 "Photo.c" +#line 7127 "Photo.c" goto __catch281_g_error; } #line 749 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = pix; + _tmp51_ = pix; #line 749 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp62_ == NULL) { + if (_tmp51_ == NULL) { #line 750 "/home/jens/Source/shotwell/src/Photo.vala" g_debug ("Photo.vala:750: Could not get preview pixbuf"); #line 751 "/home/jens/Source/shotwell/src/Photo.vala" @@ -6191,59 +7138,53 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { _photo_preview_unref0 (prev); #line 751 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6195 "Photo.c" +#line 7142 "Photo.c" { - gboolean _tmp63_; + gboolean _tmp52_; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = wrote_img_to_disk; + _tmp52_ = wrote_img_to_disk; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp63_) { -#line 6202 "Photo.c" + if (_tmp52_) { +#line 7149 "Photo.c" { - RawDeveloper _tmp64_; - BackingPhotoRow* _tmp65_; - gboolean _tmp66_; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = d; + BackingPhotoRow* _tmp53_; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = bps; + _tmp53_ = bps; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = notify; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp64_, _tmp65_, _tmp66_, &_inner_error_); + photo_add_backing_photo_for_development (self, d, _tmp53_, notify, &_inner_error_); #line 789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6217 "Photo.c" +#line 7158 "Photo.c" goto __catch284_g_error; } #line 791 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6222 "Photo.c" +#line 7163 "Photo.c" } goto __finally284; __catch284_g_error: { GError* e = NULL; - GError* _tmp67_; - const gchar* _tmp68_; + GError* _tmp54_; + const gchar* _tmp55_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = e; + _tmp54_ = e; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = _tmp67_->message; + _tmp55_ = _tmp54_->message; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp68_); + g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp55_); #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6242 "Photo.c" +#line 7183 "Photo.c" } __finally284: #line 787 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6247 "Photo.c" +#line 7188 "Photo.c" goto __catch281_g_error; } } @@ -6252,20 +7193,18 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { _backing_photo_row_unref0 (bps); #line 751 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6256 "Photo.c" +#line 7197 "Photo.c" } #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = d; + _tmp57_ = self->row; #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = self->row; + _tmp58_ = _tmp57_->master; #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = _tmp71_->master; + _tmp59_ = _tmp58_->filepath; #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = _tmp72_->filepath; + _tmp60_ = raw_developer_create_backing_row_for_development (d, _tmp59_, NULL, &_inner_error_); #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = raw_developer_create_backing_row_for_development (_tmp70_, _tmp73_, NULL, &_inner_error_); -#line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = _tmp74_; + _tmp56_ = _tmp60_; #line 755 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 755 "/home/jens/Source/shotwell/src/Photo.vala" @@ -6274,180 +7213,172 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { _photo_preview_unref0 (prev); #line 755 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6278 "Photo.c" +#line 7217 "Photo.c" goto __catch281_g_error; } #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = _tmp69_; + _tmp61_ = _tmp56_; #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = NULL; + _tmp56_ = NULL; #line 755 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - bps = _tmp75_; -#line 759 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = pix; + bps = _tmp61_; #line 759 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = jpeg_is_jpeg_bytes (_tmp77_, &_inner_error_); + _tmp63_ = pix; #line 759 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = _tmp78_; + _tmp62_ = jpeg_is_jpeg_bytes (_tmp63_, &_inner_error_); #line 759 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 759 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp69_); + _backing_photo_row_unref0 (_tmp56_); #line 759 "/home/jens/Source/shotwell/src/Photo.vala" _g_bytes_unref0 (pix); #line 759 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 759 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6305 "Photo.c" +#line 7242 "Photo.c" goto __catch281_g_error; } #line 759 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp76_) { -#line 6310 "Photo.c" + if (_tmp62_) { +#line 7247 "Photo.c" GFile* outfile = NULL; - BackingPhotoRow* _tmp79_; - const gchar* _tmp80_; - GFile* _tmp81_; - GFile* _tmp82_; - GBytes* _tmp83_; - gsize _tmp84_; - guint8* _tmp85_; + BackingPhotoRow* _tmp64_; + const gchar* _tmp65_; + GFile* _tmp66_; + GFile* _tmp67_; + GBytes* _tmp68_; + gsize _tmp69_; + guint8* _tmp70_; #line 760 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = bps; + _tmp64_ = bps; #line 760 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = _tmp79_->filepath; + _tmp65_ = _tmp64_->filepath; #line 760 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = g_file_new_for_path (_tmp80_); + _tmp66_ = g_file_new_for_path (_tmp65_); #line 760 "/home/jens/Source/shotwell/src/Photo.vala" - outfile = _tmp81_; + outfile = _tmp66_; #line 761 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = outfile; + _tmp67_ = outfile; #line 761 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = pix; + _tmp68_ = pix; #line 761 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = g_bytes_get_data (_tmp83_, &_tmp84_); + _tmp70_ = g_bytes_get_data (_tmp68_, &_tmp69_); #line 761 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_replace_contents (_tmp82_, _tmp85_, (gsize) _tmp84_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, NULL, &_inner_error_); + g_file_replace_contents (_tmp67_, _tmp70_, (gsize) _tmp69_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, NULL, &_inner_error_); #line 761 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 761 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (outfile); #line 761 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp69_); + _backing_photo_row_unref0 (_tmp56_); #line 761 "/home/jens/Source/shotwell/src/Photo.vala" _g_bytes_unref0 (pix); #line 761 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 761 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6347 "Photo.c" +#line 7284 "Photo.c" goto __catch281_g_error; } #line 759 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (outfile); -#line 6352 "Photo.c" +#line 7289 "Photo.c" } else { GdkPixbuf* pixbuf = NULL; - PhotoPreview* _tmp86_; - GdkPixbuf* _tmp87_; - GdkPixbuf* _tmp88_; + PhotoPreview* _tmp71_; + GdkPixbuf* _tmp72_; + GdkPixbuf* _tmp73_; PhotoFileWriter* writer = NULL; - BackingPhotoRow* _tmp95_; - const gchar* _tmp96_; - PhotoFileWriter* _tmp97_; - PhotoFileWriter* _tmp98_; - GdkPixbuf* _tmp99_; + BackingPhotoRow* _tmp78_; + const gchar* _tmp79_; + PhotoFileWriter* _tmp80_; + PhotoFileWriter* _tmp81_; + GdkPixbuf* _tmp82_; #line 764 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = prev; + _tmp71_ = prev; #line 764 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = photo_preview_get_pixbuf (_tmp86_, &_inner_error_); + _tmp72_ = photo_preview_get_pixbuf (_tmp71_, &_inner_error_); #line 764 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp87_; + pixbuf = _tmp72_; #line 764 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 764 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp69_); + _backing_photo_row_unref0 (_tmp56_); #line 764 "/home/jens/Source/shotwell/src/Photo.vala" _g_bytes_unref0 (pix); #line 764 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 764 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6380 "Photo.c" +#line 7317 "Photo.c" goto __catch281_g_error; } #line 765 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = pixbuf; + _tmp73_ = pixbuf; #line 765 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp88_ == NULL) { + if (_tmp73_ == NULL) { #line 766 "/home/jens/Source/shotwell/src/Photo.vala" g_debug ("Photo.vala:766: Could not get preview pixbuf"); #line 767 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 767 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp69_); + _backing_photo_row_unref0 (_tmp56_); #line 767 "/home/jens/Source/shotwell/src/Photo.vala" _g_bytes_unref0 (pix); #line 767 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 767 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6399 "Photo.c" +#line 7336 "Photo.c" { - gboolean _tmp89_; + gboolean _tmp74_; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = wrote_img_to_disk; + _tmp74_ = wrote_img_to_disk; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp89_) { -#line 6406 "Photo.c" + if (_tmp74_) { +#line 7343 "Photo.c" { - RawDeveloper _tmp90_; - BackingPhotoRow* _tmp91_; - gboolean _tmp92_; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = d; + BackingPhotoRow* _tmp75_; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = bps; + _tmp75_ = bps; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = notify; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp90_, _tmp91_, _tmp92_, &_inner_error_); + photo_add_backing_photo_for_development (self, d, _tmp75_, notify, &_inner_error_); #line 789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6421 "Photo.c" +#line 7352 "Photo.c" goto __catch285_g_error; } #line 791 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6426 "Photo.c" +#line 7357 "Photo.c" } goto __finally285; __catch285_g_error: { GError* e = NULL; - GError* _tmp93_; - const gchar* _tmp94_; + GError* _tmp76_; + const gchar* _tmp77_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = e; + _tmp76_ = e; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = _tmp93_->message; + _tmp77_ = _tmp76_->message; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp94_); + g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp77_); #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6446 "Photo.c" +#line 7377 "Photo.c" } __finally285: #line 787 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6451 "Photo.c" +#line 7382 "Photo.c" goto __catch281_g_error; } } @@ -6456,37 +7387,37 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { _backing_photo_row_unref0 (bps); #line 767 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6460 "Photo.c" +#line 7391 "Photo.c" } #line 770 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp95_ = bps; + _tmp78_ = bps; #line 770 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = _tmp95_->filepath; + _tmp79_ = _tmp78_->filepath; #line 770 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = photo_file_format_create_writer (PHOTO_FILE_FORMAT_JFIF, _tmp96_, &_inner_error_); + _tmp80_ = photo_file_format_create_writer (PHOTO_FILE_FORMAT_JFIF, _tmp79_, &_inner_error_); #line 770 "/home/jens/Source/shotwell/src/Photo.vala" - writer = _tmp97_; + writer = _tmp80_; #line 770 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 770 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 770 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp69_); + _backing_photo_row_unref0 (_tmp56_); #line 770 "/home/jens/Source/shotwell/src/Photo.vala" _g_bytes_unref0 (pix); #line 770 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 770 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6482 "Photo.c" +#line 7413 "Photo.c" goto __catch281_g_error; } #line 771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = writer; + _tmp81_ = writer; #line 771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp99_ = pixbuf; + _tmp82_ = pixbuf; #line 771 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_writer_write (_tmp98_, _tmp99_, JPEG_QUALITY_HIGH, &_inner_error_); + photo_file_writer_write (_tmp81_, _tmp82_, JPEG_QUALITY_HIGH, &_inner_error_); #line 771 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 771 "/home/jens/Source/shotwell/src/Photo.vala" @@ -6494,151 +7425,145 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { #line 771 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 771 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp69_); + _backing_photo_row_unref0 (_tmp56_); #line 771 "/home/jens/Source/shotwell/src/Photo.vala" _g_bytes_unref0 (pix); #line 771 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 771 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6505 "Photo.c" +#line 7436 "Photo.c" goto __catch281_g_error; } #line 759 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); #line 759 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 6512 "Photo.c" +#line 7443 "Photo.c" } #line 777 "/home/jens/Source/shotwell/src/Photo.vala" wrote_img_to_disk = TRUE; #line 780 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = bps; + _tmp83_ = bps; #line 780 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = _tmp100_->filepath; + _tmp84_ = _tmp83_->filepath; #line 780 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp102_ = photo_file_format_create_metadata_writer (PHOTO_FILE_FORMAT_JFIF, _tmp101_, &_inner_error_); + _tmp85_ = photo_file_format_create_metadata_writer (PHOTO_FILE_FORMAT_JFIF, _tmp84_, &_inner_error_); #line 780 "/home/jens/Source/shotwell/src/Photo.vala" - mwriter = _tmp102_; + mwriter = _tmp85_; #line 780 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 780 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp69_); + _backing_photo_row_unref0 (_tmp56_); #line 780 "/home/jens/Source/shotwell/src/Photo.vala" _g_bytes_unref0 (pix); #line 780 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 780 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6534 "Photo.c" +#line 7465 "Photo.c" goto __catch281_g_error; } #line 781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp103_ = mwriter; + _tmp86_ = mwriter; #line 781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp104_ = meta; + _tmp87_ = meta; #line 781 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp103_, _tmp104_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp86_, _tmp87_, &_inner_error_); #line 781 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 781 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (mwriter); #line 781 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp69_); + _backing_photo_row_unref0 (_tmp56_); #line 781 "/home/jens/Source/shotwell/src/Photo.vala" _g_bytes_unref0 (pix); #line 781 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 781 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6555 "Photo.c" +#line 7486 "Photo.c" goto __catch281_g_error; } #line 736 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (mwriter); #line 736 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp69_); + _backing_photo_row_unref0 (_tmp56_); #line 736 "/home/jens/Source/shotwell/src/Photo.vala" _g_bytes_unref0 (pix); #line 736 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 736 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6568 "Photo.c" +#line 7499 "Photo.c" } goto __finally281; __catch281_g_error: { GError* e = NULL; - GError* _tmp105_; - const gchar* _tmp106_; + GError* _tmp88_; + const gchar* _tmp89_; #line 736 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 736 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 783 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp105_ = e; + _tmp88_ = e; #line 783 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp106_ = _tmp105_->message; + _tmp89_ = _tmp88_->message; #line 783 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:783: Error accessing embedded preview. Message: %s", _tmp106_); + g_debug ("Photo.vala:783: Error accessing embedded preview. Message: %s", _tmp89_); #line 784 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6588 "Photo.c" +#line 7519 "Photo.c" { - gboolean _tmp107_; + gboolean _tmp90_; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp107_ = wrote_img_to_disk; + _tmp90_ = wrote_img_to_disk; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp107_) { -#line 6595 "Photo.c" + if (_tmp90_) { +#line 7526 "Photo.c" { - RawDeveloper _tmp108_; - BackingPhotoRow* _tmp109_; - gboolean _tmp110_; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp108_ = d; + BackingPhotoRow* _tmp91_; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp109_ = bps; + _tmp91_ = bps; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp110_ = notify; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp108_, _tmp109_, _tmp110_, &_inner_error_); + photo_add_backing_photo_for_development (self, d, _tmp91_, notify, &_inner_error_); #line 789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6610 "Photo.c" +#line 7535 "Photo.c" goto __catch286_g_error; } #line 791 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6615 "Photo.c" +#line 7540 "Photo.c" } goto __finally286; __catch286_g_error: { GError* e = NULL; - GError* _tmp111_; - const gchar* _tmp112_; + GError* _tmp92_; + const gchar* _tmp93_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp111_ = e; + _tmp92_ = e; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp112_ = _tmp111_->message; + _tmp93_ = _tmp92_->message; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp112_); + g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp93_); #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6635 "Photo.c" +#line 7560 "Photo.c" } __finally286: #line 787 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); -#line 6642 "Photo.c" +#line 7567 "Photo.c" } } } @@ -6646,56 +7571,50 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { _backing_photo_row_unref0 (bps); #line 784 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6650 "Photo.c" +#line 7575 "Photo.c" } __finally281: { - gboolean _tmp113_; + gboolean _tmp94_; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp113_ = wrote_img_to_disk; + _tmp94_ = wrote_img_to_disk; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp113_) { -#line 6659 "Photo.c" + if (_tmp94_) { +#line 7584 "Photo.c" { - RawDeveloper _tmp114_; - BackingPhotoRow* _tmp115_; - gboolean _tmp116_; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp114_ = d; + BackingPhotoRow* _tmp95_; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp115_ = bps; + _tmp95_ = bps; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp116_ = notify; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp114_, _tmp115_, _tmp116_, &_inner_error_); + photo_add_backing_photo_for_development (self, d, _tmp95_, notify, &_inner_error_); #line 789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6674 "Photo.c" +#line 7593 "Photo.c" goto __catch287_g_error; } #line 791 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6679 "Photo.c" +#line 7598 "Photo.c" } goto __finally287; __catch287_g_error: { GError* e = NULL; - GError* _tmp117_; - const gchar* _tmp118_; + GError* _tmp96_; + const gchar* _tmp97_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp117_ = e; + _tmp96_ = e; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp118_ = _tmp117_->message; + _tmp97_ = _tmp96_->message; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp118_); + g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp97_); #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6699 "Photo.c" +#line 7618 "Photo.c" } __finally287: #line 787 "/home/jens/Source/shotwell/src/Photo.vala" @@ -6708,7 +7627,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { g_clear_error (&_inner_error_); #line 787 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6712 "Photo.c" +#line 7631 "Photo.c" } } } @@ -6722,56 +7641,56 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { g_clear_error (&_inner_error_); #line 736 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6726 "Photo.c" +#line 7645 "Photo.c" } #line 798 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 6730 "Photo.c" +#line 7649 "Photo.c" } default: { #line 801 "/home/jens/Source/shotwell/src/Photo.vala" g_assert_not_reached (); -#line 6736 "Photo.c" +#line 7655 "Photo.c" } } #line 672 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); -#line 6741 "Photo.c" +#line 7660 "Photo.c" } -void photo_set_default_raw_developer (Photo* self, RawDeveloper d) { +void +photo_set_default_raw_developer (Photo* self, + RawDeveloper d) +{ GError * _inner_error_ = NULL; #line 806 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 6749 "Photo.c" +#line 7671 "Photo.c" { PhotoRow* _tmp0_; #line 807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 807 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 6756 "Photo.c" +#line 7678 "Photo.c" { PhotoRow* _tmp1_; - RawDeveloper _tmp2_; #line 808 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 808 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = d; -#line 808 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_->developer = _tmp2_; -#line 6766 "Photo.c" + _tmp1_->developer = d; +#line 7685 "Photo.c" } __finally288: { - PhotoRow* _tmp3_; + PhotoRow* _tmp2_; #line 807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->row; + _tmp2_ = self->row; #line 807 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 6775 "Photo.c" +#line 7694 "Photo.c" } #line 807 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -6781,196 +7700,157 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 807 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6785 "Photo.c" +#line 7704 "Photo.c" } } } -void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify) { - PhotoFileFormat _tmp0_; +void +photo_set_raw_developer (Photo* self, + RawDeveloper d, + gboolean notify) +{ + gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - gboolean _tmp2_; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_; - gboolean _tmp51_; GError * _inner_error_ = NULL; #line 813 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 814 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_get_master_file_format (self); -#line 814 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) { + if (photo_get_master_file_format (self) != PHOTO_FILE_FORMAT_RAW) { #line 815 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6807 "Photo.c" +#line 7724 "Photo.c" } #line 820 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_CAMERA); + if (photo_is_raw_developer_available (self, RAW_DEVELOPER_CAMERA)) { #line 820 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_) { -#line 6813 "Photo.c" - RawDeveloper _tmp3_; -#line 820 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = d; -#line 820 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED; -#line 6819 "Photo.c" + _tmp0_ = d == RAW_DEVELOPER_EMBEDDED; +#line 7730 "Photo.c" } else { #line 820 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = FALSE; -#line 6823 "Photo.c" + _tmp0_ = FALSE; +#line 7734 "Photo.c" } #line 820 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_) { + if (_tmp0_) { #line 821 "/home/jens/Source/shotwell/src/Photo.vala" d = RAW_DEVELOPER_CAMERA; -#line 6829 "Photo.c" +#line 7740 "Photo.c" } #line 825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_EMBEDDED); + if (!photo_is_raw_developer_available (self, RAW_DEVELOPER_EMBEDDED)) { #line 825 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp5_) { -#line 6835 "Photo.c" - RawDeveloper _tmp6_; -#line 825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = d; -#line 825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp6_ != RAW_DEVELOPER_CAMERA; -#line 6841 "Photo.c" + _tmp1_ = d != RAW_DEVELOPER_CAMERA; +#line 7746 "Photo.c" } else { #line 825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = FALSE; -#line 6845 "Photo.c" + _tmp1_ = FALSE; +#line 7750 "Photo.c" } #line 825 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp4_) { + if (_tmp1_) { #line 826 "/home/jens/Source/shotwell/src/Photo.vala" d = RAW_DEVELOPER_SHOTWELL; -#line 6851 "Photo.c" +#line 7756 "Photo.c" } { - GeeHashMap* _tmp7_; + GeeHashMap* _tmp2_; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->priv->developments; + _tmp2_ = self->priv->developments; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 6859 "Photo.c" +#line 7764 "Photo.c" { RawDeveloper stale_raw_developer = 0; - PhotoRow* _tmp8_; - RawDeveloper _tmp9_; - RawDeveloper _tmp10_; - gboolean _tmp11_; - GeeHashMap* _tmp14_; - RawDeveloper _tmp15_; - gboolean _tmp16_; - PhotoRow* _tmp18_; - RawDeveloper _tmp19_; - GeeHashMap* _tmp20_; - RawDeveloper _tmp21_; - gpointer _tmp22_; - PhotoBackingReaders* _tmp23_; - BackingPhotoRow* _tmp24_; - PhotoFileFormat _tmp25_; - BackingPhotoRow* _tmp26_; - const gchar* _tmp27_; - PhotoFileReader* _tmp28_; - BackingPhotoRow* _tmp33_; - Orientation _tmp34_; - gboolean _tmp44_ = FALSE; - RawDeveloper _tmp45_; + PhotoRow* _tmp3_; + RawDeveloper _tmp4_; + GeeHashMap* _tmp5_; + PhotoRow* _tmp7_; + GeeHashMap* _tmp8_; + gpointer _tmp9_; + PhotoBackingReaders* _tmp10_; + BackingPhotoRow* _tmp11_; + PhotoFileFormat _tmp12_; + BackingPhotoRow* _tmp13_; + const gchar* _tmp14_; + PhotoFileReader* _tmp15_; + BackingPhotoRow* _tmp20_; + Orientation _tmp21_; + gboolean _tmp30_ = FALSE; + RawDeveloper _tmp31_; #line 829 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = self->row; + _tmp3_ = self->row; #line 829 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_->developer; + _tmp4_ = _tmp3_->developer; #line 829 "/home/jens/Source/shotwell/src/Photo.vala" - stale_raw_developer = _tmp9_; -#line 832 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = d; + stale_raw_developer = _tmp4_; #line 832 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_is_raw_developer_complete (self, _tmp10_); -#line 832 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp11_) { -#line 6896 "Photo.c" - RawDeveloper _tmp12_; - gboolean _tmp13_; -#line 833 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = d; + if (!photo_is_raw_developer_complete (self, d)) { #line 833 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = notify; -#line 833 "/home/jens/Source/shotwell/src/Photo.vala" - photo_develop_photo (self, _tmp12_, _tmp13_); -#line 6905 "Photo.c" + photo_develop_photo (self, d, notify); +#line 7793 "Photo.c" } #line 835 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->priv->developments; -#line 835 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = d; -#line 835 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp15_)); + _tmp5_ = self->priv->developments; #line 835 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp16_) { -#line 6915 "Photo.c" + if (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) d))) { +#line 7799 "Photo.c" { - GeeHashMap* _tmp17_; + GeeHashMap* _tmp6_; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = self->priv->developments; + _tmp6_ = self->priv->developments; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 6922 "Photo.c" +#line 7806 "Photo.c" } #line 836 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6926 "Photo.c" +#line 7810 "Photo.c" } #line 839 "/home/jens/Source/shotwell/src/Photo.vala" photo_revert_to_master (self, FALSE); #line 842 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->row; -#line 842 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = d; + _tmp7_ = self->row; #line 842 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_->developer = _tmp19_; + _tmp7_->developer = d; #line 843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = self->priv->developments; + _tmp8_ = self->priv->developments; #line 843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = d; -#line 843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp21_)); + _tmp9_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) d)); #line 843 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); #line 843 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_photo_row = (BackingPhotoRow*) _tmp22_; + self->backing_photo_row = (BackingPhotoRow*) _tmp9_; #line 844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = self->priv->readers; + _tmp10_ = self->priv->readers; #line 844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = self->backing_photo_row; + _tmp11_ = self->backing_photo_row; #line 844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp24_->file_format; + _tmp12_ = _tmp11_->file_format; #line 844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = self->backing_photo_row; + _tmp13_ = self->backing_photo_row; #line 844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_->filepath; + _tmp14_ = _tmp13_->filepath; #line 844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = photo_file_format_create_reader (_tmp25_, _tmp27_); + _tmp15_ = photo_file_format_create_reader (_tmp12_, _tmp14_); #line 844 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp23_->developer); + _photo_file_adapter_unref0 (_tmp10_->developer); #line 844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_->developer = _tmp28_; -#line 6962 "Photo.c" + _tmp10_->developer = _tmp15_; +#line 7842 "Photo.c" { - GdkPixbuf* _tmp29_; - GdkPixbuf* _tmp30_; + GdkPixbuf* _tmp16_; + GdkPixbuf* _tmp17_; #line 847 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = photo_get_prefetched_copy (self, &_inner_error_); + _tmp16_ = photo_get_prefetched_copy (self, &_inner_error_); #line 847 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _tmp29_; + _tmp17_ = _tmp16_; #line 847 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp30_); + _g_object_unref0 (_tmp17_); #line 847 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6974 "Photo.c" +#line 7854 "Photo.c" goto __catch290_g_error; } } @@ -6984,30 +7864,30 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify) { _inner_error_ = NULL; #line 850 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6988 "Photo.c" +#line 7868 "Photo.c" { - GeeHashMap* _tmp31_; + GeeHashMap* _tmp18_; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = self->priv->developments; + _tmp18_ = self->priv->developments; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 6995 "Photo.c" +#line 7875 "Photo.c" } #line 850 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6999 "Photo.c" +#line 7879 "Photo.c" } __finally290: #line 846 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7004 "Photo.c" +#line 7884 "Photo.c" { - GeeHashMap* _tmp32_; + GeeHashMap* _tmp19_; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = self->priv->developments; + _tmp19_ = self->priv->developments; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7011 "Photo.c" +#line 7891 "Photo.c" } #line 846 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7015,41 +7895,38 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify) { g_clear_error (&_inner_error_); #line 846 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 7019 "Photo.c" +#line 7899 "Photo.c" } #line 853 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = self->backing_photo_row; + _tmp20_ = self->backing_photo_row; #line 853 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp33_->original_orientation; + _tmp21_ = _tmp20_->original_orientation; #line 853 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_orientation (self, _tmp34_); -#line 7027 "Photo.c" + photo_set_orientation (self, _tmp21_); +#line 7907 "Photo.c" { - PhotoTable* _tmp35_; - PhotoTable* _tmp36_; - PhotoRow* _tmp37_; - RawDeveloper _tmp38_; - BackingPhotoRow* _tmp39_; - BackingPhotoID _tmp40_; -#line 856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = photo_table_get_instance (); + PhotoTable* _tmp22_; + PhotoTable* _tmp23_; + PhotoRow* _tmp24_; + BackingPhotoRow* _tmp25_; + BackingPhotoID _tmp26_; #line 856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = _tmp35_; + _tmp22_ = photo_table_get_instance (); #line 856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = self->row; + _tmp23_ = _tmp22_; #line 856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = d; + _tmp24_ = self->row; #line 856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = self->backing_photo_row; + _tmp25_ = self->backing_photo_row; #line 856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = _tmp39_->id; + _tmp26_ = _tmp25_->id; #line 856 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_update_raw_development (_tmp36_, _tmp37_, _tmp38_, &_tmp40_, &_inner_error_); + photo_table_update_raw_development (_tmp23_, _tmp24_, d, &_tmp26_, &_inner_error_); #line 856 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp36_); + _database_table_unref0 (_tmp23_); #line 856 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7053 "Photo.c" +#line 7930 "Photo.c" goto __catch291_g_error; } } @@ -7057,33 +7934,33 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify) { __catch291_g_error: { GError* e = NULL; - GError* _tmp41_; - const gchar* _tmp42_; + GError* _tmp27_; + const gchar* _tmp28_; #line 855 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 855 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 858 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = e; + _tmp27_ = e; #line 858 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _tmp41_->message; + _tmp28_ = _tmp27_->message; #line 858 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:858: Error updating database: %s", _tmp42_); + g_warning ("Photo.vala:858: Error updating database: %s", _tmp28_); #line 855 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 7075 "Photo.c" +#line 7952 "Photo.c" } __finally291: #line 855 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7080 "Photo.c" +#line 7957 "Photo.c" { - GeeHashMap* _tmp43_; + GeeHashMap* _tmp29_; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = self->priv->developments; + _tmp29_ = self->priv->developments; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7087 "Photo.c" +#line 7964 "Photo.c" } #line 855 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7091,49 +7968,49 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify) { g_clear_error (&_inner_error_); #line 855 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 7095 "Photo.c" +#line 7972 "Photo.c" } #line 865 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = stale_raw_developer; + _tmp31_ = stale_raw_developer; #line 865 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp45_ != RAW_DEVELOPER_CAMERA) { -#line 7101 "Photo.c" - RawDeveloper _tmp46_; - PhotoRow* _tmp47_; - RawDeveloper _tmp48_; + if (_tmp31_ != RAW_DEVELOPER_CAMERA) { +#line 7978 "Photo.c" + RawDeveloper _tmp32_; + PhotoRow* _tmp33_; + RawDeveloper _tmp34_; #line 866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = stale_raw_developer; + _tmp32_ = stale_raw_developer; #line 866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = self->row; + _tmp33_ = self->row; #line 866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = _tmp47_->developer; + _tmp34_ = _tmp33_->developer; #line 866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = _tmp46_ != _tmp48_; -#line 7113 "Photo.c" + _tmp30_ = _tmp32_ != _tmp34_; +#line 7990 "Photo.c" } else { #line 865 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = FALSE; -#line 7117 "Photo.c" + _tmp30_ = FALSE; +#line 7994 "Photo.c" } #line 865 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp44_) { -#line 7121 "Photo.c" - RawDeveloper _tmp49_; + if (_tmp30_) { +#line 7998 "Photo.c" + RawDeveloper _tmp35_; #line 869 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = stale_raw_developer; + _tmp35_ = stale_raw_developer; #line 869 "/home/jens/Source/shotwell/src/Photo.vala" - photo_delete_raw_development (self, _tmp49_); -#line 7127 "Photo.c" + photo_delete_raw_development (self, _tmp35_); +#line 8004 "Photo.c" } } __finally289: { - GeeHashMap* _tmp50_; + GeeHashMap* _tmp36_; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = self->priv->developments; + _tmp36_ = self->priv->developments; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7137 "Photo.c" +#line 8014 "Photo.c" } #line 828 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -7143,33 +8020,33 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify) { g_clear_error (&_inner_error_); #line 828 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 7147 "Photo.c" +#line 8024 "Photo.c" } } #line 876 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = notify; -#line 876 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp51_) { -#line 7154 "Photo.c" - Alteration* _tmp52_; - Alteration* _tmp53_; + if (notify) { +#line 8029 "Photo.c" + Alteration* _tmp37_; + Alteration* _tmp38_; #line 877 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = alteration_new ("image", "developer"); + _tmp37_ = alteration_new ("image", "developer"); #line 877 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = _tmp52_; + _tmp38_ = _tmp37_; #line 877 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp53_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp38_); #line 877 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp53_); -#line 7165 "Photo.c" + _alteration_unref0 (_tmp38_); +#line 8040 "Photo.c" } #line 878 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_prefetched (self); -#line 7169 "Photo.c" +#line 8044 "Photo.c" } -RawDeveloper photo_get_raw_developer (Photo* self) { +RawDeveloper +photo_get_raw_developer (Photo* self) +{ RawDeveloper result = 0; PhotoRow* _tmp0_; RawDeveloper _tmp1_; @@ -7183,11 +8060,14 @@ RawDeveloper photo_get_raw_developer (Photo* self) { result = _tmp1_; #line 882 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7187 "Photo.c" +#line 8064 "Photo.c" } -static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { +static gboolean +photo_delete_raw_development (Photo* self, + RawDeveloper d) +{ gboolean result = FALSE; gboolean ret = FALSE; GError * _inner_error_ = NULL; @@ -7195,125 +8075,109 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 888 "/home/jens/Source/shotwell/src/Photo.vala" ret = FALSE; -#line 7199 "Photo.c" +#line 8079 "Photo.c" { GeeHashMap* _tmp0_; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->developments; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 7206 "Photo.c" +#line 8086 "Photo.c" { GeeHashMap* _tmp1_; - RawDeveloper _tmp2_; - gboolean _tmp3_; + gchar* _tmp3_; + gchar* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; - RawDeveloper _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; BackingPhotoRow* bpr = NULL; - GeeHashMap* _tmp10_; - RawDeveloper _tmp11_; - gpointer _tmp12_; - BackingPhotoRow* _tmp13_; - const gchar* _tmp14_; - GeeHashMap* _tmp39_; - RawDeveloper _tmp40_; - gboolean _tmp41_; + GeeHashMap* _tmp7_; + gpointer _tmp8_; + BackingPhotoRow* _tmp9_; + const gchar* _tmp10_; + GeeHashMap* _tmp33_; + gboolean _tmp34_; #line 891 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->developments; #line 891 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = d; -#line 891 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp2_)); -#line 891 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp3_) { + if (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) d))) { #line 892 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 7235 "Photo.c" +#line 8106 "Photo.c" { - GeeHashMap* _tmp4_; + GeeHashMap* _tmp2_; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->priv->developments; + _tmp2_ = self->priv->developments; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7242 "Photo.c" +#line 8113 "Photo.c" } #line 892 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7246 "Photo.c" +#line 8117 "Photo.c" } #line 896 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 896 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_; -#line 896 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = d; + _tmp3_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 896 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = raw_developer_to_string (_tmp7_); + _tmp4_ = _tmp3_; #line 896 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; + _tmp5_ = raw_developer_to_string (d); #line 896 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:896: Delete raw development: %s %s", _tmp6_, _tmp9_); + _tmp6_ = _tmp5_; #line 896 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp9_); + g_debug ("Photo.vala:896: Delete raw development: %s %s", _tmp4_, _tmp6_); #line 896 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp6_); +#line 896 "/home/jens/Source/shotwell/src/Photo.vala" + _g_free0 (_tmp4_); #line 897 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = self->priv->developments; -#line 897 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = d; + _tmp7_ = self->priv->developments; #line 897 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp11_)); + _tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) d)); #line 897 "/home/jens/Source/shotwell/src/Photo.vala" - bpr = (BackingPhotoRow*) _tmp12_; + bpr = (BackingPhotoRow*) _tmp8_; #line 898 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = bpr; + _tmp9_ = bpr; #line 898 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_->filepath; + _tmp10_ = _tmp9_->filepath; #line 898 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp14_ != NULL) { -#line 7278 "Photo.c" + if (_tmp10_ != NULL) { +#line 8145 "Photo.c" GFile* f = NULL; - BackingPhotoRow* _tmp15_; - const gchar* _tmp16_; - GFile* _tmp17_; + BackingPhotoRow* _tmp11_; + const gchar* _tmp12_; + GFile* _tmp13_; #line 899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = bpr; + _tmp11_ = bpr; #line 899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_->filepath; + _tmp12_ = _tmp11_->filepath; #line 899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = g_file_new_for_path (_tmp16_); + _tmp13_ = g_file_new_for_path (_tmp12_); #line 899 "/home/jens/Source/shotwell/src/Photo.vala" - f = _tmp17_; -#line 7291 "Photo.c" + f = _tmp13_; +#line 8158 "Photo.c" { - RawDeveloper _tmp18_; #line 901 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = d; -#line 901 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp18_ == RAW_DEVELOPER_CAMERA) { -#line 7298 "Photo.c" - GFile* _tmp19_; + if (d == RAW_DEVELOPER_CAMERA) { +#line 8162 "Photo.c" + GFile* _tmp14_; #line 902 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = f; + _tmp14_ = f; #line 902 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_trash (_tmp19_, NULL, &_inner_error_); + g_file_trash (_tmp14_, NULL, &_inner_error_); #line 902 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7306 "Photo.c" +#line 8170 "Photo.c" goto __catch293_g_error; } } else { - GFile* _tmp20_; + GFile* _tmp15_; #line 904 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = f; + _tmp15_ = f; #line 904 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_delete (_tmp20_, NULL, &_inner_error_); + g_file_delete (_tmp15_, NULL, &_inner_error_); #line 904 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7317 "Photo.c" +#line 8181 "Photo.c" goto __catch293_g_error; } } @@ -7322,33 +8186,33 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { __catch293_g_error: { GError* e = NULL; - BackingPhotoRow* _tmp21_; - const gchar* _tmp22_; - GError* _tmp23_; - const gchar* _tmp24_; + BackingPhotoRow* _tmp16_; + const gchar* _tmp17_; + GError* _tmp18_; + const gchar* _tmp19_; #line 900 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 900 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 906 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = bpr; + _tmp16_ = bpr; #line 906 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_->filepath; + _tmp17_ = _tmp16_->filepath; #line 906 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = e; + _tmp18_ = e; #line 906 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_->message; + _tmp19_ = _tmp18_->message; #line 906 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:906: Unable to delete RAW development: %s error: %s", _tmp22_, _tmp24_); + g_warning ("Photo.vala:906: Unable to delete RAW development: %s error: %s", _tmp17_, _tmp19_); #line 900 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 7346 "Photo.c" +#line 8210 "Photo.c" } __finally293: #line 900 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7351 "Photo.c" - gboolean _tmp26_ = FALSE; +#line 8215 "Photo.c" + gboolean _tmp21_ = FALSE; #line 900 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); #line 900 "/home/jens/Source/shotwell/src/Photo.vala" @@ -7357,68 +8221,65 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { _g_object_unref0 (f); #line 900 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 7361 "Photo.c" +#line 8225 "Photo.c" { - GeeHashMap* _tmp25_; + GeeHashMap* _tmp20_; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = self->priv->developments; + _tmp20_ = self->priv->developments; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7368 "Photo.c" +#line 8232 "Photo.c" } #line 900 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 900 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 900 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp26_; -#line 7376 "Photo.c" + return _tmp21_; +#line 8240 "Photo.c" } #line 898 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 7380 "Photo.c" +#line 8244 "Photo.c" } { - PhotoTable* _tmp27_; - PhotoTable* _tmp28_; - PhotoRow* _tmp29_; - RawDeveloper _tmp30_; - BackingPhotoTable* _tmp31_; - BackingPhotoTable* _tmp32_; - BackingPhotoRow* _tmp33_; - BackingPhotoID _tmp34_; + PhotoTable* _tmp22_; + PhotoTable* _tmp23_; + PhotoRow* _tmp24_; + BackingPhotoTable* _tmp25_; + BackingPhotoTable* _tmp26_; + BackingPhotoRow* _tmp27_; + BackingPhotoID _tmp28_; #line 912 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = photo_table_get_instance (); + _tmp22_ = photo_table_get_instance (); #line 912 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp27_; + _tmp23_ = _tmp22_; #line 912 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = self->row; -#line 912 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = d; + _tmp24_ = self->row; #line 912 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_remove_development (_tmp28_, _tmp29_, _tmp30_, &_inner_error_); + photo_table_remove_development (_tmp23_, _tmp24_, d, &_inner_error_); #line 912 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp28_); + _database_table_unref0 (_tmp23_); #line 912 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7405 "Photo.c" +#line 8266 "Photo.c" goto __catch294_g_error; } #line 913 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = backing_photo_table_get_instance (); + _tmp25_ = backing_photo_table_get_instance (); #line 913 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _tmp31_; + _tmp26_ = _tmp25_; #line 913 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = bpr; + _tmp27_ = bpr; #line 913 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp33_->id; + _tmp28_ = _tmp27_->id; #line 913 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_remove (_tmp32_, &_tmp34_, &_inner_error_); + backing_photo_table_remove (_tmp26_, &_tmp28_, &_inner_error_); #line 913 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp32_); + _database_table_unref0 (_tmp26_); #line 913 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7422 "Photo.c" +#line 8283 "Photo.c" goto __catch294_g_error; } } @@ -7426,80 +8287,78 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { __catch294_g_error: { GError* e = NULL; - GError* _tmp35_; - const gchar* _tmp36_; + GError* _tmp29_; + const gchar* _tmp30_; #line 911 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 911 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = e; + _tmp29_ = e; #line 915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = _tmp35_->message; + _tmp30_ = _tmp29_->message; #line 915 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:915: Database error while deleting RAW development: %s", _tmp36_); + g_warning ("Photo.vala:915: Database error while deleting RAW development: %s", _tmp30_); #line 911 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 7444 "Photo.c" +#line 8305 "Photo.c" } __finally294: #line 911 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7449 "Photo.c" - gboolean _tmp38_ = FALSE; +#line 8310 "Photo.c" + gboolean _tmp32_ = FALSE; #line 911 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); #line 911 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 7455 "Photo.c" +#line 8316 "Photo.c" { - GeeHashMap* _tmp37_; + GeeHashMap* _tmp31_; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = self->priv->developments; + _tmp31_ = self->priv->developments; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7462 "Photo.c" +#line 8323 "Photo.c" } #line 911 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 911 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 911 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp38_; -#line 7470 "Photo.c" + return _tmp32_; +#line 8331 "Photo.c" } #line 918 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = self->priv->developments; -#line 918 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = d; + _tmp33_ = self->priv->developments; #line 918 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp40_), NULL); + _tmp34_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) d), NULL); #line 918 "/home/jens/Source/shotwell/src/Photo.vala" - ret = _tmp41_; + ret = _tmp34_; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 7482 "Photo.c" +#line 8341 "Photo.c" } __finally292: { - GeeHashMap* _tmp42_; + GeeHashMap* _tmp35_; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = self->priv->developments; + _tmp35_ = self->priv->developments; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7491 "Photo.c" +#line 8350 "Photo.c" } #line 890 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7495 "Photo.c" - gboolean _tmp43_ = FALSE; +#line 8354 "Photo.c" + gboolean _tmp36_ = FALSE; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 890 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 890 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp43_; -#line 7503 "Photo.c" + return _tmp36_; +#line 8362 "Photo.c" } } #line 921 "/home/jens/Source/shotwell/src/Photo.vala" @@ -7508,58 +8367,55 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { result = ret; #line 922 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7512 "Photo.c" +#line 8371 "Photo.c" } -void photo_redevelop_raw (Photo* self, RawDeveloper d) { +void +photo_redevelop_raw (Photo* self, + RawDeveloper d) +{ GError * _inner_error_ = NULL; #line 926 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 7520 "Photo.c" +#line 8382 "Photo.c" { GeeHashMap* _tmp0_; #line 927 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->developments; #line 927 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 7527 "Photo.c" +#line 8389 "Photo.c" { - RawDeveloper _tmp1_; RawDeveloper dev = 0; + RawDeveloper _tmp1_; RawDeveloper _tmp2_; - RawDeveloper _tmp3_; - RawDeveloper _tmp4_; #line 928 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = d; -#line 928 "/home/jens/Source/shotwell/src/Photo.vala" - photo_delete_raw_development (self, _tmp1_); -#line 929 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = d; + photo_delete_raw_development (self, d); #line 929 "/home/jens/Source/shotwell/src/Photo.vala" - dev = _tmp2_; + dev = d; #line 930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = dev; + _tmp1_ = dev; #line 930 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp3_ == RAW_DEVELOPER_CAMERA) { + if (_tmp1_ == RAW_DEVELOPER_CAMERA) { #line 931 "/home/jens/Source/shotwell/src/Photo.vala" dev = RAW_DEVELOPER_EMBEDDED; -#line 7548 "Photo.c" +#line 8404 "Photo.c" } #line 933 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = dev; + _tmp2_ = dev; #line 933 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_raw_developer (self, _tmp4_, TRUE); -#line 7554 "Photo.c" + photo_set_raw_developer (self, _tmp2_, TRUE); +#line 8410 "Photo.c" } __finally295: { - GeeHashMap* _tmp5_; + GeeHashMap* _tmp3_; #line 927 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->priv->developments; + _tmp3_ = self->priv->developments; #line 927 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7563 "Photo.c" +#line 8419 "Photo.c" } #line 927 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -7569,72 +8425,90 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 927 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 7573 "Photo.c" +#line 8429 "Photo.c" } } } -static void _vala_array_add89 (BackingFileState** * array, int* length, int* size, BackingFileState* value) { +static void +_vala_array_add89 (BackingFileState** * array, + int* length, + int* size, + BackingFileState* value) +{ #line 940 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 940 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 940 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (BackingFileState*, *array, (*size) + 1); -#line 7586 "Photo.c" +#line 8447 "Photo.c" } #line 940 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 940 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 7592 "Photo.c" +#line 8453 "Photo.c" } -static void _vala_array_add90 (BackingFileState** * array, int* length, int* size, BackingFileState* value) { +static void +_vala_array_add90 (BackingFileState** * array, + int* length, + int* size, + BackingFileState* value) +{ #line 942 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 942 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 942 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (BackingFileState*, *array, (*size) + 1); -#line 7603 "Photo.c" +#line 8469 "Photo.c" } #line 942 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 942 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 7609 "Photo.c" +#line 8475 "Photo.c" } -static void _vala_array_add91 (BackingFileState** * array, int* length, int* size, BackingFileState* value) { +static void +_vala_array_add91 (BackingFileState** * array, + int* length, + int* size, + BackingFileState* value) +{ #line 949 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 949 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 949 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (BackingFileState*, *array, (*size) + 1); -#line 7620 "Photo.c" +#line 8491 "Photo.c" } #line 949 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 949 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 7626 "Photo.c" +#line 8497 "Photo.c" } -static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, int* result_length1) { +static BackingFileState** +photo_real_get_backing_files_state (MediaSource* base, + int* result_length1) +{ Photo * self; BackingFileState** result = NULL; BackingFileState** backing = NULL; BackingFileState** _tmp0_; gint backing_length1; gint _backing_size_; - BackingFileState** _tmp27_; - gint _tmp27__length1; + BackingFileState** _tmp24_; + gint _tmp24__length1; GError * _inner_error_ = NULL; #line 937 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); @@ -7646,14 +8520,14 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, backing_length1 = 0; #line 938 "/home/jens/Source/shotwell/src/Photo.vala" _backing_size_ = backing_length1; -#line 7650 "Photo.c" +#line 8524 "Photo.c" { PhotoRow* _tmp1_; #line 939 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 939 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 7657 "Photo.c" +#line 8531 "Photo.c" { BackingFileState** _tmp2_; gint _tmp2__length1; @@ -7662,8 +8536,6 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, PhotoRow* _tmp5_; const gchar* _tmp6_; BackingFileState* _tmp7_; - gboolean _tmp8_; - gboolean _tmp12_; #line 940 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = backing; #line 940 "/home/jens/Source/shotwell/src/Photo.vala" @@ -7681,121 +8553,114 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, #line 940 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add89 (&backing, &backing_length1, &_backing_size_, _tmp7_); #line 941 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_has_editable (self); -#line 941 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_) { -#line 7688 "Photo.c" - BackingFileState** _tmp9_; - gint _tmp9__length1; - BackingPhotoRow* _tmp10_; - BackingFileState* _tmp11_; + if (photo_has_editable (self)) { +#line 8558 "Photo.c" + BackingFileState** _tmp8_; + gint _tmp8__length1; + BackingPhotoRow* _tmp9_; + BackingFileState* _tmp10_; #line 942 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = backing; + _tmp8_ = backing; #line 942 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9__length1 = backing_length1; + _tmp8__length1 = backing_length1; #line 942 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = self->priv->editable; + _tmp9_ = self->priv->editable; #line 942 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = backing_file_state_new_from_photo_row (_tmp10_, NULL); + _tmp10_ = backing_file_state_new_from_photo_row (_tmp9_, NULL); #line 942 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add90 (&backing, &backing_length1, &_backing_size_, _tmp11_); -#line 7703 "Photo.c" + _vala_array_add90 (&backing, &backing_length1, &_backing_size_, _tmp10_); +#line 8573 "Photo.c" } #line 944 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_is_developed (self); -#line 944 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_) { -#line 7709 "Photo.c" + if (photo_is_developed (self)) { +#line 8577 "Photo.c" GeeCollection* dev_rows = NULL; - GeeCollection* _tmp13_; - GeeCollection* _tmp14_; + GeeCollection* _tmp11_; + GeeCollection* _tmp12_; #line 945 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_get_raw_development_photo_rows (self); + _tmp11_ = photo_get_raw_development_photo_rows (self); #line 945 "/home/jens/Source/shotwell/src/Photo.vala" - dev_rows = _tmp13_; + dev_rows = _tmp11_; #line 946 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = dev_rows; + _tmp12_ = dev_rows; #line 946 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp14_ != NULL) { -#line 7721 "Photo.c" + if (_tmp12_ != NULL) { +#line 8589 "Photo.c" { GeeIterator* _r_it = NULL; - GeeCollection* _tmp15_; - GeeIterator* _tmp16_; + GeeCollection* _tmp13_; + GeeIterator* _tmp14_; #line 947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = dev_rows; + _tmp13_ = dev_rows; #line 947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); #line 947 "/home/jens/Source/shotwell/src/Photo.vala" - _r_it = _tmp16_; + _r_it = _tmp14_; #line 947 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 7734 "Photo.c" - GeeIterator* _tmp17_; - gboolean _tmp18_; +#line 8602 "Photo.c" + GeeIterator* _tmp15_; BackingPhotoRow* r = NULL; - GeeIterator* _tmp19_; - gpointer _tmp20_; + GeeIterator* _tmp16_; + gpointer _tmp17_; + BackingPhotoRow* _tmp18_; + const gchar* _tmp19_; + BackingFileState** _tmp20_; + gint _tmp20__length1; BackingPhotoRow* _tmp21_; - const gchar* _tmp22_; - BackingFileState** _tmp23_; - gint _tmp23__length1; - BackingPhotoRow* _tmp24_; - BackingFileState* _tmp25_; -#line 947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _r_it; + BackingFileState* _tmp22_; #line 947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = gee_iterator_next (_tmp17_); + _tmp15_ = _r_it; #line 947 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp18_) { + if (!gee_iterator_next (_tmp15_)) { #line 947 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 7754 "Photo.c" +#line 8619 "Photo.c" } #line 947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _r_it; + _tmp16_ = _r_it; #line 947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = gee_iterator_get (_tmp19_); + _tmp17_ = gee_iterator_get (_tmp16_); #line 947 "/home/jens/Source/shotwell/src/Photo.vala" - r = (BackingPhotoRow*) _tmp20_; + r = (BackingPhotoRow*) _tmp17_; #line 948 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = r; + _tmp18_ = r; #line 948 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_->filepath; + _tmp19_ = _tmp18_->filepath; #line 948 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:948: adding: %s", _tmp22_); + g_debug ("Photo.vala:948: adding: %s", _tmp19_); #line 949 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = backing; + _tmp20_ = backing; #line 949 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23__length1 = backing_length1; + _tmp20__length1 = backing_length1; #line 949 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = r; + _tmp21_ = r; #line 949 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = backing_file_state_new_from_photo_row (_tmp24_, NULL); + _tmp22_ = backing_file_state_new_from_photo_row (_tmp21_, NULL); #line 949 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add91 (&backing, &backing_length1, &_backing_size_, _tmp25_); + _vala_array_add91 (&backing, &backing_length1, &_backing_size_, _tmp22_); #line 947 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (r); -#line 7780 "Photo.c" +#line 8645 "Photo.c" } #line 947 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_r_it); -#line 7784 "Photo.c" +#line 8649 "Photo.c" } } #line 944 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dev_rows); -#line 7789 "Photo.c" +#line 8654 "Photo.c" } } __finally296: { - PhotoRow* _tmp26_; + PhotoRow* _tmp23_; #line 939 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = self->row; + _tmp23_ = self->row; #line 939 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 7799 "Photo.c" +#line 8664 "Photo.c" } #line 939 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -7807,140 +8672,138 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, g_clear_error (&_inner_error_); #line 939 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 7811 "Photo.c" +#line 8676 "Photo.c" } } #line 955 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = backing; + _tmp24_ = backing; #line 955 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27__length1 = backing_length1; + _tmp24__length1 = backing_length1; #line 955 "/home/jens/Source/shotwell/src/Photo.vala" if (result_length1) { #line 955 "/home/jens/Source/shotwell/src/Photo.vala" - *result_length1 = _tmp27__length1; -#line 7822 "Photo.c" + *result_length1 = _tmp24__length1; +#line 8687 "Photo.c" } #line 955 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp27_; + result = _tmp24_; #line 955 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7828 "Photo.c" +#line 8693 "Photo.c" } -static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode mode) { +static PhotoFileReader* +photo_get_backing_reader (Photo* self, + BackingFetchMode mode) +{ PhotoFileReader* result = NULL; - BackingFetchMode _tmp0_; #line 958 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); #line 959 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = mode; -#line 959 "/home/jens/Source/shotwell/src/Photo.vala" - switch (_tmp0_) { + switch (mode) { #line 959 "/home/jens/Source/shotwell/src/Photo.vala" case BACKING_FETCH_MODE_MASTER: -#line 7843 "Photo.c" +#line 8708 "Photo.c" { - PhotoFileReader* _tmp1_; + PhotoFileReader* _tmp0_; #line 961 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_get_master_reader (self); + _tmp0_ = photo_get_master_reader (self); #line 961 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp1_; + result = _tmp0_; #line 961 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7852 "Photo.c" +#line 8717 "Photo.c" } #line 959 "/home/jens/Source/shotwell/src/Photo.vala" case BACKING_FETCH_MODE_BASELINE: -#line 7856 "Photo.c" +#line 8721 "Photo.c" { - PhotoFileReader* _tmp2_; + PhotoFileReader* _tmp1_; #line 964 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_get_baseline_reader (self); + _tmp1_ = photo_get_baseline_reader (self); #line 964 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp2_; + result = _tmp1_; #line 964 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7865 "Photo.c" +#line 8730 "Photo.c" } #line 959 "/home/jens/Source/shotwell/src/Photo.vala" case BACKING_FETCH_MODE_SOURCE: -#line 7869 "Photo.c" +#line 8734 "Photo.c" { - PhotoFileReader* _tmp3_; + PhotoFileReader* _tmp2_; #line 967 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_get_source_reader (self); + _tmp2_ = photo_get_source_reader (self); #line 967 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp3_; + result = _tmp2_; #line 967 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7878 "Photo.c" +#line 8743 "Photo.c" } #line 959 "/home/jens/Source/shotwell/src/Photo.vala" case BACKING_FETCH_MODE_UNMODIFIED: -#line 7882 "Photo.c" +#line 8747 "Photo.c" { - PhotoFileFormat _tmp4_; -#line 970 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_get_master_file_format (self); #line 970 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp4_ == PHOTO_FILE_FORMAT_RAW) { -#line 7889 "Photo.c" - PhotoFileReader* _tmp5_; + if (photo_get_master_file_format (self) == PHOTO_FILE_FORMAT_RAW) { +#line 8751 "Photo.c" + PhotoFileReader* _tmp3_; #line 971 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_get_raw_developer_reader (self); + _tmp3_ = photo_get_raw_developer_reader (self); #line 971 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp5_; + result = _tmp3_; #line 971 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7897 "Photo.c" +#line 8759 "Photo.c" } else { - PhotoFileReader* _tmp6_; + PhotoFileReader* _tmp4_; #line 973 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_get_master_reader (self); + _tmp4_ = photo_get_master_reader (self); #line 973 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp6_; + result = _tmp4_; #line 973 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7906 "Photo.c" +#line 8768 "Photo.c" } } default: { - BackingFetchMode _tmp7_; - GEnumValue* _tmp8_; + GEnumValue* _tmp5_; #line 976 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = mode; + _tmp5_ = g_enum_get_value (g_type_class_ref (TYPE_BACKING_FETCH_MODE), mode); #line 976 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = g_enum_get_value (g_type_class_ref (TYPE_BACKING_FETCH_MODE), _tmp7_); -#line 976 "/home/jens/Source/shotwell/src/Photo.vala" - g_error ("Photo.vala:976: Unknown backing fetch mode %s", (_tmp8_ != NULL) ? _tmp8_->value_name : NULL); -#line 7919 "Photo.c" + g_error ("Photo.vala:976: Unknown backing fetch mode %s", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL); +#line 8778 "Photo.c" } } } -static gpointer _photo_file_adapter_ref0 (gpointer self) { +static gpointer +_photo_file_adapter_ref0 (gpointer self) +{ #line 982 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_file_adapter_ref (self) : NULL; -#line 7928 "Photo.c" +#line 8789 "Photo.c" } -static PhotoFileReader* photo_get_master_reader (Photo* self) { +static PhotoFileReader* +photo_get_master_reader (Photo* self) +{ PhotoFileReader* result = NULL; GError * _inner_error_ = NULL; #line 980 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 7937 "Photo.c" +#line 8800 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 981 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 981 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 7944 "Photo.c" +#line 8807 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -7953,18 +8816,18 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) { _tmp3_ = _photo_file_adapter_ref0 (_tmp2_); #line 982 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 7957 "Photo.c" +#line 8820 "Photo.c" { PhotoBackingReaders* _tmp4_; #line 981 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; #line 981 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7964 "Photo.c" +#line 8827 "Photo.c" } #line 982 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7968 "Photo.c" +#line 8831 "Photo.c" } __finally297: { @@ -7973,7 +8836,7 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) { _tmp5_ = self->priv->readers; #line 981 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7977 "Photo.c" +#line 8840 "Photo.c" } #line 981 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7981,24 +8844,26 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) { g_clear_error (&_inner_error_); #line 981 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 7985 "Photo.c" +#line 8848 "Photo.c" } } -PhotoFileReader* photo_get_editable_reader (Photo* self) { +PhotoFileReader* +photo_get_editable_reader (Photo* self) +{ PhotoFileReader* result = NULL; GError * _inner_error_ = NULL; #line 986 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 7995 "Photo.c" +#line 8860 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 987 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 987 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8002 "Photo.c" +#line 8867 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -8011,18 +8876,18 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) { _tmp3_ = _photo_file_adapter_ref0 (_tmp2_); #line 988 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 8015 "Photo.c" +#line 8880 "Photo.c" { PhotoBackingReaders* _tmp4_; #line 987 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; #line 987 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8022 "Photo.c" +#line 8887 "Photo.c" } #line 988 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8026 "Photo.c" +#line 8891 "Photo.c" } __finally298: { @@ -8031,7 +8896,7 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) { _tmp5_ = self->priv->readers; #line 987 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8035 "Photo.c" +#line 8900 "Photo.c" } #line 987 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8039,24 +8904,26 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) { g_clear_error (&_inner_error_); #line 987 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8043 "Photo.c" +#line 8908 "Photo.c" } } -static PhotoFileReader* photo_get_baseline_reader (Photo* self) { +static PhotoFileReader* +photo_get_baseline_reader (Photo* self) +{ PhotoFileReader* result = NULL; GError * _inner_error_ = NULL; #line 993 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8053 "Photo.c" +#line 8920 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8060 "Photo.c" +#line 8927 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -8071,7 +8938,7 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { _tmp2_ = _tmp1_->editable; #line 995 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 8075 "Photo.c" +#line 8942 "Photo.c" PhotoBackingReaders* _tmp3_; PhotoFileReader* _tmp4_; PhotoFileReader* _tmp5_; @@ -8083,18 +8950,18 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { _tmp5_ = _photo_file_adapter_ref0 (_tmp4_); #line 996 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 8087 "Photo.c" +#line 8954 "Photo.c" { PhotoBackingReaders* _tmp6_; #line 994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->readers; #line 994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8094 "Photo.c" +#line 8961 "Photo.c" } #line 996 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8098 "Photo.c" +#line 8965 "Photo.c" } #line 998 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->priv->readers; @@ -8102,7 +8969,7 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { _tmp8_ = _tmp7_->developer; #line 998 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ != NULL) { -#line 8106 "Photo.c" +#line 8973 "Photo.c" PhotoBackingReaders* _tmp9_; PhotoFileReader* _tmp10_; PhotoFileReader* _tmp11_; @@ -8114,18 +8981,18 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { _tmp11_ = _photo_file_adapter_ref0 (_tmp10_); #line 999 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp11_; -#line 8118 "Photo.c" +#line 8985 "Photo.c" { PhotoBackingReaders* _tmp12_; #line 994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->priv->readers; #line 994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8125 "Photo.c" +#line 8992 "Photo.c" } #line 999 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8129 "Photo.c" +#line 8996 "Photo.c" } #line 1001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->priv->readers; @@ -8135,18 +9002,18 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { _tmp15_ = _photo_file_adapter_ref0 (_tmp14_); #line 1001 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp15_; -#line 8139 "Photo.c" +#line 9006 "Photo.c" { PhotoBackingReaders* _tmp16_; #line 994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->priv->readers; #line 994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8146 "Photo.c" +#line 9013 "Photo.c" } #line 1001 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8150 "Photo.c" +#line 9017 "Photo.c" } __finally299: { @@ -8155,7 +9022,7 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { _tmp17_ = self->priv->readers; #line 994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8159 "Photo.c" +#line 9026 "Photo.c" } #line 994 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8163,24 +9030,26 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { g_clear_error (&_inner_error_); #line 994 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8167 "Photo.c" +#line 9034 "Photo.c" } } -static PhotoFileReader* photo_get_source_reader (Photo* self) { +static PhotoFileReader* +photo_get_source_reader (Photo* self) +{ PhotoFileReader* result = NULL; GError * _inner_error_ = NULL; #line 1006 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8177 "Photo.c" +#line 9046 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8184 "Photo.c" +#line 9053 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -8195,7 +9064,7 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { _tmp2_ = _tmp1_->editable; #line 1008 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 8199 "Photo.c" +#line 9068 "Photo.c" PhotoBackingReaders* _tmp3_; PhotoFileReader* _tmp4_; PhotoFileReader* _tmp5_; @@ -8207,18 +9076,18 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { _tmp5_ = _photo_file_adapter_ref0 (_tmp4_); #line 1009 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 8211 "Photo.c" +#line 9080 "Photo.c" { PhotoBackingReaders* _tmp6_; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->readers; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8218 "Photo.c" +#line 9087 "Photo.c" } #line 1009 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8222 "Photo.c" +#line 9091 "Photo.c" } #line 1011 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->priv->readers; @@ -8226,7 +9095,7 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { _tmp8_ = _tmp7_->developer; #line 1011 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ != NULL) { -#line 8230 "Photo.c" +#line 9099 "Photo.c" PhotoBackingReaders* _tmp9_; PhotoFileReader* _tmp10_; PhotoFileReader* _tmp11_; @@ -8238,18 +9107,18 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { _tmp11_ = _photo_file_adapter_ref0 (_tmp10_); #line 1012 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp11_; -#line 8242 "Photo.c" +#line 9111 "Photo.c" { PhotoBackingReaders* _tmp12_; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->priv->readers; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8249 "Photo.c" +#line 9118 "Photo.c" } #line 1012 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8253 "Photo.c" +#line 9122 "Photo.c" } #line 1014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->priv->readers; @@ -8259,18 +9128,18 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { _tmp15_ = _photo_file_adapter_ref0 (_tmp14_); #line 1014 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp15_; -#line 8263 "Photo.c" +#line 9132 "Photo.c" { PhotoBackingReaders* _tmp16_; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->priv->readers; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8270 "Photo.c" +#line 9139 "Photo.c" } #line 1014 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8274 "Photo.c" +#line 9143 "Photo.c" } __finally300: { @@ -8279,7 +9148,7 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { _tmp17_ = self->priv->readers; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8283 "Photo.c" +#line 9152 "Photo.c" } #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8287,24 +9156,26 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { g_clear_error (&_inner_error_); #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8291 "Photo.c" +#line 9160 "Photo.c" } } -static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) { +static PhotoFileReader* +photo_get_raw_developer_reader (Photo* self) +{ PhotoFileReader* result = NULL; GError * _inner_error_ = NULL; #line 1019 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8301 "Photo.c" +#line 9172 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 1020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 1020 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8308 "Photo.c" +#line 9179 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -8317,18 +9188,18 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) { _tmp3_ = _photo_file_adapter_ref0 (_tmp2_); #line 1021 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 8321 "Photo.c" +#line 9192 "Photo.c" { PhotoBackingReaders* _tmp4_; #line 1020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; #line 1020 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8328 "Photo.c" +#line 9199 "Photo.c" } #line 1021 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8332 "Photo.c" +#line 9203 "Photo.c" } __finally301: { @@ -8337,7 +9208,7 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) { _tmp5_ = self->priv->readers; #line 1020 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8341 "Photo.c" +#line 9212 "Photo.c" } #line 1020 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8345,17 +9216,19 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) { g_clear_error (&_inner_error_); #line 1020 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8349 "Photo.c" +#line 9220 "Photo.c" } } -gboolean photo_is_developed (Photo* self) { +gboolean +photo_is_developed (Photo* self) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 1025 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8359 "Photo.c" +#line 9232 "Photo.c" { PhotoBackingReaders* _tmp0_; gboolean _tmp5_ = FALSE; @@ -8363,7 +9236,7 @@ gboolean photo_is_developed (Photo* self) { _tmp0_ = self->priv->readers; #line 1026 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8367 "Photo.c" +#line 9240 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -8373,18 +9246,18 @@ gboolean photo_is_developed (Photo* self) { _tmp2_ = _tmp1_->developer; #line 1027 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_ != NULL; -#line 8377 "Photo.c" +#line 9250 "Photo.c" { PhotoBackingReaders* _tmp3_; #line 1026 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; #line 1026 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8384 "Photo.c" +#line 9257 "Photo.c" } #line 1027 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8388 "Photo.c" +#line 9261 "Photo.c" } __finally302: { @@ -8393,7 +9266,7 @@ gboolean photo_is_developed (Photo* self) { _tmp4_ = self->priv->readers; #line 1026 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8397 "Photo.c" +#line 9270 "Photo.c" } #line 1026 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8401,17 +9274,19 @@ gboolean photo_is_developed (Photo* self) { g_clear_error (&_inner_error_); #line 1026 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 8405 "Photo.c" +#line 9278 "Photo.c" } } -gboolean photo_has_editable (Photo* self) { +gboolean +photo_has_editable (Photo* self) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 1031 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8415 "Photo.c" +#line 9290 "Photo.c" { PhotoBackingReaders* _tmp0_; gboolean _tmp5_ = FALSE; @@ -8419,7 +9294,7 @@ gboolean photo_has_editable (Photo* self) { _tmp0_ = self->priv->readers; #line 1032 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8423 "Photo.c" +#line 9298 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -8429,18 +9304,18 @@ gboolean photo_has_editable (Photo* self) { _tmp2_ = _tmp1_->editable; #line 1033 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_ != NULL; -#line 8433 "Photo.c" +#line 9308 "Photo.c" { PhotoBackingReaders* _tmp3_; #line 1032 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; #line 1032 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8440 "Photo.c" +#line 9315 "Photo.c" } #line 1033 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8444 "Photo.c" +#line 9319 "Photo.c" } __finally303: { @@ -8449,7 +9324,7 @@ gboolean photo_has_editable (Photo* self) { _tmp4_ = self->priv->readers; #line 1032 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8453 "Photo.c" +#line 9328 "Photo.c" } #line 1032 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8457,84 +9332,85 @@ gboolean photo_has_editable (Photo* self) { g_clear_error (&_inner_error_); #line 1032 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 8461 "Photo.c" +#line 9336 "Photo.c" } } -gboolean photo_does_master_exist (Photo* self) { +gboolean +photo_does_master_exist (Photo* self) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 1037 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8471 "Photo.c" +#line 9348 "Photo.c" { PhotoBackingReaders* _tmp0_; - gboolean _tmp6_ = FALSE; + gboolean _tmp5_ = FALSE; #line 1038 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 1038 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8479 "Photo.c" +#line 9356 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; - gboolean _tmp3_; #line 1039 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; #line 1039 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->master; #line 1039 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 1039 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp3_; -#line 8492 "Photo.c" + result = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); +#line 9366 "Photo.c" { - PhotoBackingReaders* _tmp4_; + PhotoBackingReaders* _tmp3_; #line 1038 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->priv->readers; + _tmp3_ = self->priv->readers; #line 1038 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8499 "Photo.c" +#line 9373 "Photo.c" } #line 1039 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8503 "Photo.c" +#line 9377 "Photo.c" } __finally304: { - PhotoBackingReaders* _tmp5_; + PhotoBackingReaders* _tmp4_; #line 1038 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->priv->readers; + _tmp4_ = self->priv->readers; #line 1038 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8512 "Photo.c" +#line 9386 "Photo.c" } #line 1038 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 1038 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 1038 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp6_; -#line 8520 "Photo.c" + return _tmp5_; +#line 9394 "Photo.c" } } -gboolean photo_does_editable_exist (Photo* self) { +gboolean +photo_does_editable_exist (Photo* self) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 1044 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8530 "Photo.c" +#line 9406 "Photo.c" { PhotoBackingReaders* _tmp0_; - gboolean _tmp9_ = FALSE; + gboolean _tmp8_ = FALSE; #line 1045 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 1045 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8538 "Photo.c" +#line 9414 "Photo.c" { gboolean _tmp1_ = FALSE; PhotoBackingReaders* _tmp2_; @@ -8545,65 +9421,64 @@ gboolean photo_does_editable_exist (Photo* self) { _tmp3_ = _tmp2_->editable; #line 1046 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != NULL) { -#line 8549 "Photo.c" +#line 9425 "Photo.c" PhotoBackingReaders* _tmp4_; PhotoFileReader* _tmp5_; - gboolean _tmp6_; #line 1046 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; #line 1046 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->editable; #line 1046 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 1046 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp6_; -#line 8561 "Photo.c" + _tmp1_ = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); +#line 9434 "Photo.c" } else { #line 1046 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 8565 "Photo.c" +#line 9438 "Photo.c" } #line 1046 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 8569 "Photo.c" +#line 9442 "Photo.c" { - PhotoBackingReaders* _tmp7_; + PhotoBackingReaders* _tmp6_; #line 1045 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->priv->readers; + _tmp6_ = self->priv->readers; #line 1045 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8576 "Photo.c" +#line 9449 "Photo.c" } #line 1046 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8580 "Photo.c" +#line 9453 "Photo.c" } __finally305: { - PhotoBackingReaders* _tmp8_; + PhotoBackingReaders* _tmp7_; #line 1045 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = self->priv->readers; + _tmp7_ = self->priv->readers; #line 1045 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8589 "Photo.c" +#line 9462 "Photo.c" } #line 1045 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 1045 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 1045 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp9_; -#line 8597 "Photo.c" + return _tmp8_; +#line 9470 "Photo.c" } } -gboolean photo_is_master_baseline (Photo* self) { +gboolean +photo_is_master_baseline (Photo* self) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 1050 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8607 "Photo.c" +#line 9482 "Photo.c" { PhotoBackingReaders* _tmp0_; gboolean _tmp5_ = FALSE; @@ -8611,7 +9486,7 @@ gboolean photo_is_master_baseline (Photo* self) { _tmp0_ = self->priv->readers; #line 1051 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8615 "Photo.c" +#line 9490 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -8621,18 +9496,18 @@ gboolean photo_is_master_baseline (Photo* self) { _tmp2_ = _tmp1_->editable; #line 1052 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_ == NULL; -#line 8625 "Photo.c" +#line 9500 "Photo.c" { PhotoBackingReaders* _tmp3_; #line 1051 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; #line 1051 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8632 "Photo.c" +#line 9507 "Photo.c" } #line 1052 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8636 "Photo.c" +#line 9511 "Photo.c" } __finally306: { @@ -8641,7 +9516,7 @@ gboolean photo_is_master_baseline (Photo* self) { _tmp4_ = self->priv->readers; #line 1051 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8645 "Photo.c" +#line 9520 "Photo.c" } #line 1051 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8649,32 +9524,33 @@ gboolean photo_is_master_baseline (Photo* self) { g_clear_error (&_inner_error_); #line 1051 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 8653 "Photo.c" +#line 9528 "Photo.c" } } -gboolean photo_is_master_source (Photo* self) { +gboolean +photo_is_master_source (Photo* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 1056 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 1057 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_has_editable (self); -#line 1057 "/home/jens/Source/shotwell/src/Photo.vala" - result = !_tmp0_; + result = !photo_has_editable (self); #line 1057 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8669 "Photo.c" +#line 9543 "Photo.c" } -gboolean photo_is_editable_baseline (Photo* self) { +gboolean +photo_is_editable_baseline (Photo* self) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 1060 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8678 "Photo.c" +#line 9554 "Photo.c" { PhotoBackingReaders* _tmp0_; gboolean _tmp5_ = FALSE; @@ -8682,7 +9558,7 @@ gboolean photo_is_editable_baseline (Photo* self) { _tmp0_ = self->priv->readers; #line 1061 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8686 "Photo.c" +#line 9562 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -8692,18 +9568,18 @@ gboolean photo_is_editable_baseline (Photo* self) { _tmp2_ = _tmp1_->editable; #line 1062 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_ != NULL; -#line 8696 "Photo.c" +#line 9572 "Photo.c" { PhotoBackingReaders* _tmp3_; #line 1061 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; #line 1061 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8703 "Photo.c" +#line 9579 "Photo.c" } #line 1062 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8707 "Photo.c" +#line 9583 "Photo.c" } __finally307: { @@ -8712,7 +9588,7 @@ gboolean photo_is_editable_baseline (Photo* self) { _tmp4_ = self->priv->readers; #line 1061 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8716 "Photo.c" +#line 9592 "Photo.c" } #line 1061 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8720,39 +9596,40 @@ gboolean photo_is_editable_baseline (Photo* self) { g_clear_error (&_inner_error_); #line 1061 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 8724 "Photo.c" +#line 9600 "Photo.c" } } -gboolean photo_is_editable_source (Photo* self) { +gboolean +photo_is_editable_source (Photo* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 1066 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 1067 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_has_editable (self); -#line 1067 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp0_; + result = photo_has_editable (self); #line 1067 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8740 "Photo.c" +#line 9615 "Photo.c" } -BackingPhotoRow* photo_get_master_photo_row (Photo* self) { +BackingPhotoRow* +photo_get_master_photo_row (Photo* self) +{ BackingPhotoRow* result = NULL; GError * _inner_error_ = NULL; #line 1070 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8749 "Photo.c" +#line 9626 "Photo.c" { PhotoRow* _tmp0_; #line 1071 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 1071 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 8756 "Photo.c" +#line 9633 "Photo.c" { PhotoRow* _tmp1_; BackingPhotoRow* _tmp2_; @@ -8765,18 +9642,18 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) { _tmp3_ = _backing_photo_row_ref0 (_tmp2_); #line 1072 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 8769 "Photo.c" +#line 9646 "Photo.c" { PhotoRow* _tmp4_; #line 1071 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 1071 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8776 "Photo.c" +#line 9653 "Photo.c" } #line 1072 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8780 "Photo.c" +#line 9657 "Photo.c" } __finally308: { @@ -8785,7 +9662,7 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) { _tmp5_ = self->row; #line 1071 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8789 "Photo.c" +#line 9666 "Photo.c" } #line 1071 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8793,79 +9670,78 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) { g_clear_error (&_inner_error_); #line 1071 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8797 "Photo.c" +#line 9674 "Photo.c" } } -BackingPhotoRow* photo_get_editable_photo_row (Photo* self) { +BackingPhotoRow* +photo_get_editable_photo_row (Photo* self) +{ BackingPhotoRow* result = NULL; GError * _inner_error_ = NULL; #line 1076 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8807 "Photo.c" +#line 9686 "Photo.c" { PhotoRow* _tmp0_; #line 1077 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 1077 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 8814 "Photo.c" +#line 9693 "Photo.c" { PhotoRow* _tmp1_; - gboolean _tmp2_; #line 1079 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 1079 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = backing_photo_id_is_valid (&_tmp1_->editable_id); -#line 1079 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_) { -#line 8824 "Photo.c" + if (backing_photo_id_is_valid (&_tmp1_->editable_id)) { +#line 9700 "Photo.c" + BackingPhotoRow* _tmp2_; BackingPhotoRow* _tmp3_; - BackingPhotoRow* _tmp4_; #line 1080 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->priv->editable; + _tmp2_ = self->priv->editable; #line 1080 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _backing_photo_row_ref0 (_tmp3_); + _tmp3_ = _backing_photo_row_ref0 (_tmp2_); #line 1080 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp4_; -#line 8833 "Photo.c" + result = _tmp3_; +#line 9709 "Photo.c" { - PhotoRow* _tmp5_; + PhotoRow* _tmp4_; #line 1077 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->row; + _tmp4_ = self->row; #line 1077 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8840 "Photo.c" +#line 9716 "Photo.c" } #line 1080 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8844 "Photo.c" +#line 9720 "Photo.c" } else { #line 1082 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; -#line 8848 "Photo.c" +#line 9724 "Photo.c" { - PhotoRow* _tmp6_; + PhotoRow* _tmp5_; #line 1077 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; + _tmp5_ = self->row; #line 1077 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8855 "Photo.c" +#line 9731 "Photo.c" } #line 1082 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8859 "Photo.c" +#line 9735 "Photo.c" } } __finally309: { - PhotoRow* _tmp7_; + PhotoRow* _tmp6_; #line 1077 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->row; + _tmp6_ = self->row; #line 1077 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8869 "Photo.c" +#line 9745 "Photo.c" } #line 1077 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8873,24 +9749,26 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) { g_clear_error (&_inner_error_); #line 1077 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8877 "Photo.c" +#line 9753 "Photo.c" } } -GeeCollection* photo_get_raw_development_photo_rows (Photo* self) { +GeeCollection* +photo_get_raw_development_photo_rows (Photo* self) +{ GeeCollection* result = NULL; GError * _inner_error_ = NULL; #line 1086 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8887 "Photo.c" +#line 9765 "Photo.c" { PhotoRow* _tmp0_; #line 1087 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 1087 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 8894 "Photo.c" +#line 9772 "Photo.c" { GeeCollection* _tmp1_ = NULL; GeeHashMap* _tmp2_; @@ -8898,7 +9776,7 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) { _tmp2_ = self->priv->developments; #line 1088 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 8902 "Photo.c" +#line 9780 "Photo.c" GeeHashMap* _tmp3_; GeeCollection* _tmp4_; GeeCollection* _tmp5_; @@ -8912,28 +9790,28 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) { _g_object_unref0 (_tmp1_); #line 1088 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp5_; -#line 8916 "Photo.c" +#line 9794 "Photo.c" } else { #line 1088 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); #line 1088 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 8922 "Photo.c" +#line 9800 "Photo.c" } #line 1088 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 8926 "Photo.c" +#line 9804 "Photo.c" { PhotoRow* _tmp6_; #line 1087 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; #line 1087 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8933 "Photo.c" +#line 9811 "Photo.c" } #line 1088 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8937 "Photo.c" +#line 9815 "Photo.c" } __finally310: { @@ -8942,7 +9820,7 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) { _tmp7_ = self->row; #line 1087 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8946 "Photo.c" +#line 9824 "Photo.c" } #line 1087 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8950,24 +9828,27 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) { g_clear_error (&_inner_error_); #line 1087 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8954 "Photo.c" +#line 9832 "Photo.c" } } -BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper d) { +BackingPhotoRow* +photo_get_raw_development_photo_row (Photo* self, + RawDeveloper d) +{ BackingPhotoRow* result = NULL; GError * _inner_error_ = NULL; #line 1092 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8964 "Photo.c" +#line 9845 "Photo.c" { PhotoRow* _tmp0_; #line 1093 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 1093 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 8971 "Photo.c" +#line 9852 "Photo.c" { BackingPhotoRow* _tmp1_ = NULL; GeeHashMap* _tmp2_; @@ -8975,51 +9856,48 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper _tmp2_ = self->priv->developments; #line 1094 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 8979 "Photo.c" +#line 9860 "Photo.c" GeeHashMap* _tmp3_; - RawDeveloper _tmp4_; - gpointer _tmp5_; + gpointer _tmp4_; #line 1094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->developments; #line 1094 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = d; -#line 1094 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp4_)); + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) d)); #line 1094 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); #line 1094 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = (BackingPhotoRow*) _tmp5_; -#line 8993 "Photo.c" + _tmp1_ = (BackingPhotoRow*) _tmp4_; +#line 9871 "Photo.c" } else { #line 1094 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); #line 1094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 8999 "Photo.c" +#line 9877 "Photo.c" } #line 1094 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 9003 "Photo.c" +#line 9881 "Photo.c" { - PhotoRow* _tmp6_; + PhotoRow* _tmp5_; #line 1093 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; + _tmp5_ = self->row; #line 1093 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 9010 "Photo.c" +#line 9888 "Photo.c" } #line 1094 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9014 "Photo.c" +#line 9892 "Photo.c" } __finally311: { - PhotoRow* _tmp7_; + PhotoRow* _tmp6_; #line 1093 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->row; + _tmp6_ = self->row; #line 1093 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 9023 "Photo.c" +#line 9901 "Photo.c" } #line 1093 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -9027,12 +9905,14 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper g_clear_error (&_inner_error_); #line 1093 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 9031 "Photo.c" +#line 9909 "Photo.c" } } -static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self) { +static PhotoFileFormat* +_photo_file_format_dup (PhotoFileFormat* self) +{ PhotoFileFormat* dup; #line 1104 "/home/jens/Source/shotwell/src/Photo.vala" dup = g_new0 (PhotoFileFormat, 1); @@ -9040,18 +9920,22 @@ static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self) { memcpy (dup, self, sizeof (PhotoFileFormat)); #line 1104 "/home/jens/Source/shotwell/src/Photo.vala" return dup; -#line 9044 "Photo.c" +#line 9924 "Photo.c" } -static gpointer __photo_file_format_dup0 (gpointer self) { +static gpointer +__photo_file_format_dup0 (gpointer self) +{ #line 1104 "/home/jens/Source/shotwell/src/Photo.vala" return self ? _photo_file_format_dup (self) : NULL; -#line 9051 "Photo.c" +#line 9933 "Photo.c" } -PhotoFileFormat* photo_get_editable_file_format (Photo* self) { +PhotoFileFormat* +photo_get_editable_file_format (Photo* self) +{ PhotoFileFormat* result = NULL; PhotoFileReader* reader = NULL; PhotoFileReader* _tmp0_; @@ -9075,7 +9959,7 @@ PhotoFileFormat* photo_get_editable_file_format (Photo* self) { _photo_file_adapter_unref0 (reader); #line 1101 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9079 "Photo.c" +#line 9963 "Photo.c" } #line 1104 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = reader; @@ -9089,89 +9973,86 @@ PhotoFileFormat* photo_get_editable_file_format (Photo* self) { _photo_file_adapter_unref0 (reader); #line 1104 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9093 "Photo.c" +#line 9977 "Photo.c" } -PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportFormatParameters* params) { +PhotoFileFormat +photo_get_export_format_for_parameters (Photo* self, + ExportFormatParameters* params) +{ PhotoFileFormat result = 0; PhotoFileFormat _result_ = 0; - PhotoFileFormat _tmp0_; - ExportFormatParameters _tmp1_; - ExportFormatMode _tmp2_; + ExportFormatParameters _tmp0_; + ExportFormatMode _tmp1_; #line 1107 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); #line 1107 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (params != NULL, 0); #line 1108 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_file_format_get_system_default_format (); -#line 1108 "/home/jens/Source/shotwell/src/Photo.vala" - _result_ = _tmp0_; + _result_ = photo_file_format_get_system_default_format (); #line 1110 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = *params; + _tmp0_ = *params; #line 1110 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = _tmp1_.mode; + _tmp1_ = _tmp0_.mode; #line 1110 "/home/jens/Source/shotwell/src/Photo.vala" - switch (_tmp2_) { + switch (_tmp1_) { #line 1110 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_UNMODIFIED: -#line 9119 "Photo.c" +#line 10003 "Photo.c" { - PhotoFileFormat _tmp3_; -#line 1112 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_get_master_file_format (self); #line 1112 "/home/jens/Source/shotwell/src/Photo.vala" - _result_ = _tmp3_; + _result_ = photo_get_master_file_format (self); #line 1113 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 9128 "Photo.c" +#line 10009 "Photo.c" } #line 1110 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_CURRENT: -#line 9132 "Photo.c" +#line 10013 "Photo.c" { - PhotoFileFormat _tmp4_; #line 1116 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_get_best_export_file_format (self); -#line 1116 "/home/jens/Source/shotwell/src/Photo.vala" - _result_ = _tmp4_; + _result_ = photo_get_best_export_file_format (self); #line 1117 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 9141 "Photo.c" +#line 10019 "Photo.c" } #line 1110 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_SPECIFIED: -#line 9145 "Photo.c" +#line 10023 "Photo.c" { - ExportFormatParameters _tmp5_; - PhotoFileFormat _tmp6_; + ExportFormatParameters _tmp2_; + PhotoFileFormat _tmp3_; #line 1120 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = *params; + _tmp2_ = *params; #line 1120 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_.specified_format; + _tmp3_ = _tmp2_.specified_format; #line 1120 "/home/jens/Source/shotwell/src/Photo.vala" - _result_ = _tmp6_; + _result_ = _tmp3_; #line 1121 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 9157 "Photo.c" +#line 10035 "Photo.c" } default: { #line 1124 "/home/jens/Source/shotwell/src/Photo.vala" g_error ("Photo.vala:1124: get_export_format_for_parameters: unsupported export " \ "format mode"); -#line 9163 "Photo.c" +#line 10041 "Photo.c" } } #line 1127 "/home/jens/Source/shotwell/src/Photo.vala" result = _result_; #line 1127 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9170 "Photo.c" +#line 10048 "Photo.c" } -gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParameters* params) { +gchar* +photo_get_export_basename_for_parameters (Photo* self, + ExportFormatParameters* params) +{ gchar* result = NULL; gchar* _result_ = NULL; ExportFormatParameters _tmp0_; @@ -9191,7 +10072,7 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame switch (_tmp1_) { #line 1133 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_UNMODIFIED: -#line 9194 "Photo.c" +#line 10075 "Photo.c" { GFile* _tmp2_; GFile* _tmp3_; @@ -9210,13 +10091,13 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame _g_object_unref0 (_tmp3_); #line 1136 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 9213 "Photo.c" +#line 10094 "Photo.c" } #line 1133 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_CURRENT: #line 1133 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_SPECIFIED: -#line 9219 "Photo.c" +#line 10100 "Photo.c" { ExportFormatParameters _tmp5_; PhotoFileFormat _tmp6_; @@ -9233,14 +10114,14 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame _g_free0 (_result_); #line 1140 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9236 "Photo.c" +#line 10117 "Photo.c" } default: { #line 1143 "/home/jens/Source/shotwell/src/Photo.vala" g_error ("Photo.vala:1143: get_export_basename_for_parameters: unsupported expor" \ "t format mode"); -#line 9242 "Photo.c" +#line 10123 "Photo.c" } } #line 1146 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9251,175 +10132,144 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame result = _result_; #line 1147 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9253 "Photo.c" +#line 10134 "Photo.c" } -ImportResult photo_prepare_for_import (PhotoImportParams* params) { +ImportResult +photo_prepare_for_import (PhotoImportParams* params) +{ ImportResult result = 0; GFile* file = NULL; - PhotoImportParams* _tmp0_; + GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; GFileInfo* info = NULL; - GFileInfo* _tmp7_; - GFileType _tmp8_; - GFile* _tmp9_; - gboolean _tmp10_; - GFile* _tmp14_; - gboolean _tmp15_; + GFileInfo* _tmp6_; + GFile* _tmp7_; + GFile* _tmp11_; GTimeVal timestamp = {0}; - GFileInfo* _tmp19_; - GTimeVal _tmp20_ = {0}; - gboolean _tmp21_ = FALSE; - gboolean _tmp22_ = FALSE; - PhotoImportParams* _tmp23_; - const gchar* _tmp24_; + GFileInfo* _tmp15_; + GTimeVal _tmp16_ = {0}; + gboolean _tmp17_ = FALSE; + gboolean _tmp18_ = FALSE; + const gchar* _tmp19_; PhotoFileInterrogator* interrogator = NULL; - GFile* _tmp32_; - PhotoImportParams* _tmp33_; - PhotoFileSnifferOptions _tmp34_; - PhotoFileInterrogator* _tmp35_; - PhotoFileInterrogator* _tmp42_; - gboolean _tmp43_; + GFile* _tmp23_; + PhotoFileSnifferOptions _tmp24_; + PhotoFileInterrogator* _tmp25_; + PhotoFileInterrogator* _tmp32_; DetectedPhotoInformation* detected = NULL; - PhotoFileInterrogator* _tmp44_; - DetectedPhotoInformation* _tmp45_; - gboolean _tmp46_ = FALSE; - DetectedPhotoInformation* _tmp47_; - PhotoImportParams* _tmp50_; - PhotoFileSnifferOptions _tmp51_; + PhotoFileInterrogator* _tmp33_; + DetectedPhotoInformation* _tmp34_; + gboolean _tmp35_ = FALSE; + DetectedPhotoInformation* _tmp36_; + PhotoFileSnifferOptions _tmp39_; Orientation orientation = 0; time_t exposure_time = 0; gchar* title = NULL; - gchar* _tmp64_; + gchar* _tmp49_; gchar* comment = NULL; - gchar* _tmp65_; + gchar* _tmp50_; Rating rating = 0; - DetectedPhotoInformation* _tmp66_; - PhotoMetadata* _tmp67_; - gboolean _tmp90_ = FALSE; - gboolean _tmp91_ = FALSE; - DetectedPhotoInformation* _tmp92_; - GdkColorspace _tmp93_; - PhotoImportParams* _tmp101_; + DetectedPhotoInformation* _tmp51_; + PhotoMetadata* _tmp52_; + gboolean _tmp71_ = FALSE; + gboolean _tmp72_ = FALSE; + DetectedPhotoInformation* _tmp73_; + GdkColorspace _tmp74_; + PhotoRow* _tmp82_; + PhotoRow* _tmp83_; + BackingPhotoRow* _tmp84_; + GFile* _tmp85_; + gchar* _tmp86_; + PhotoRow* _tmp87_; + BackingPhotoRow* _tmp88_; + DetectedPhotoInformation* _tmp89_; + Dimensions _tmp90_; + PhotoRow* _tmp91_; + BackingPhotoRow* _tmp92_; + GFileInfo* _tmp93_; + PhotoRow* _tmp94_; + BackingPhotoRow* _tmp95_; + GTimeVal _tmp96_; + glong _tmp97_; + PhotoRow* _tmp98_; + time_t _tmp99_; + PhotoRow* _tmp100_; + Orientation _tmp101_; PhotoRow* _tmp102_; - PhotoImportParams* _tmp103_; - PhotoRow* _tmp104_; - BackingPhotoRow* _tmp105_; - GFile* _tmp106_; - gchar* _tmp107_; - PhotoImportParams* _tmp108_; + BackingPhotoRow* _tmp103_; + Orientation _tmp104_; + PhotoRow* _tmp105_; + ImportID _tmp106_; + PhotoRow* _tmp107_; + PhotoRow* _tmp108_; PhotoRow* _tmp109_; - BackingPhotoRow* _tmp110_; - DetectedPhotoInformation* _tmp111_; - Dimensions _tmp112_; - PhotoImportParams* _tmp113_; - PhotoRow* _tmp114_; - BackingPhotoRow* _tmp115_; - GFileInfo* _tmp116_; - gint64 _tmp117_; - PhotoImportParams* _tmp118_; - PhotoRow* _tmp119_; - BackingPhotoRow* _tmp120_; - GTimeVal _tmp121_; - glong _tmp122_; - PhotoImportParams* _tmp123_; - PhotoRow* _tmp124_; - time_t _tmp125_; - PhotoImportParams* _tmp126_; + DetectedPhotoInformation* _tmp110_; + const gchar* _tmp111_; + gchar* _tmp112_; + PhotoRow* _tmp113_; + DetectedPhotoInformation* _tmp114_; + const gchar* _tmp115_; + gchar* _tmp116_; + PhotoRow* _tmp117_; + DetectedPhotoInformation* _tmp118_; + const gchar* _tmp119_; + gchar* _tmp120_; + PhotoRow* _tmp121_; + PhotoRow* _tmp122_; + PhotoRow* _tmp123_; + BackingPhotoRow* _tmp124_; + DetectedPhotoInformation* _tmp125_; + PhotoFileFormat _tmp126_; PhotoRow* _tmp127_; - Orientation _tmp128_; - PhotoImportParams* _tmp129_; + const gchar* _tmp128_; + gchar* _tmp129_; PhotoRow* _tmp130_; - BackingPhotoRow* _tmp131_; - Orientation _tmp132_; - PhotoImportParams* _tmp133_; - PhotoRow* _tmp134_; - PhotoImportParams* _tmp135_; - ImportID _tmp136_; - PhotoImportParams* _tmp137_; - PhotoRow* _tmp138_; - PhotoImportParams* _tmp139_; - PhotoRow* _tmp140_; - PhotoImportParams* _tmp141_; - PhotoRow* _tmp142_; - DetectedPhotoInformation* _tmp143_; - const gchar* _tmp144_; - gchar* _tmp145_; - PhotoImportParams* _tmp146_; - PhotoRow* _tmp147_; - DetectedPhotoInformation* _tmp148_; - const gchar* _tmp149_; - gchar* _tmp150_; - PhotoImportParams* _tmp151_; - PhotoRow* _tmp152_; - DetectedPhotoInformation* _tmp153_; - const gchar* _tmp154_; - gchar* _tmp155_; - PhotoImportParams* _tmp156_; - PhotoRow* _tmp157_; - PhotoImportParams* _tmp158_; - PhotoRow* _tmp159_; - PhotoImportParams* _tmp160_; - PhotoRow* _tmp161_; - BackingPhotoRow* _tmp162_; - DetectedPhotoInformation* _tmp163_; - PhotoFileFormat _tmp164_; - PhotoImportParams* _tmp165_; - PhotoRow* _tmp166_; - const gchar* _tmp167_; - gchar* _tmp168_; - PhotoImportParams* _tmp169_; - PhotoRow* _tmp170_; - const gchar* _tmp171_; - gchar* _tmp172_; - PhotoImportParams* _tmp173_; - PhotoRow* _tmp174_; - Rating _tmp175_; - PhotoImportParams* _tmp176_; - Thumbnails* _tmp177_; + const gchar* _tmp131_; + gchar* _tmp132_; + PhotoRow* _tmp133_; + Rating _tmp134_; + Thumbnails* _tmp135_; GError * _inner_error_ = NULL; #line 1162 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (params), 0); #line 1166 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = params; -#line 1166 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp0_->file; + _tmp0_ = params->file; #line 1166 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 1166 "/home/jens/Source/shotwell/src/Photo.vala" - file = _tmp2_; + file = _tmp1_; #line 1168 "/home/jens/Source/shotwell/src/Photo.vala" info = NULL; -#line 9394 "Photo.c" +#line 10244 "Photo.c" { - GFileInfo* _tmp3_ = NULL; - GFile* _tmp4_; + GFileInfo* _tmp2_ = NULL; + GFile* _tmp3_; + GFileInfo* _tmp4_; GFileInfo* _tmp5_; - GFileInfo* _tmp6_; #line 1170 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = file; + _tmp3_ = file; #line 1170 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = g_file_query_info (_tmp4_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); + _tmp4_ = g_file_query_info (_tmp3_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); #line 1170 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp5_; + _tmp2_ = _tmp4_; #line 1170 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9408 "Photo.c" +#line 10258 "Photo.c" goto __catch312_g_error; } #line 1170 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp3_; + _tmp5_ = _tmp2_; #line 1170 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = NULL; + _tmp2_ = NULL; #line 1170 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); #line 1170 "/home/jens/Source/shotwell/src/Photo.vala" - info = _tmp6_; + info = _tmp5_; #line 1169 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp3_); -#line 9421 "Photo.c" + _g_object_unref0 (_tmp2_); +#line 10271 "Photo.c" } goto __finally312; __catch312_g_error: @@ -9439,7 +10289,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1173 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9441 "Photo.c" +#line 10291 "Photo.c" } __finally312: #line 1169 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9454,14 +10304,12 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { g_clear_error (&_inner_error_); #line 1169 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 9456 "Photo.c" +#line 10306 "Photo.c" } #line 1176 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = info; -#line 1176 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = g_file_info_get_file_type (_tmp7_); + _tmp6_ = info; #line 1176 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_ != G_FILE_TYPE_REGULAR) { + if (g_file_info_get_file_type (_tmp6_) != G_FILE_TYPE_REGULAR) { #line 1177 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_NOT_A_FILE; #line 1177 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9470,28 +10318,26 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1177 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9472 "Photo.c" +#line 10320 "Photo.c" } #line 1179 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = file; -#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_is_file_image (_tmp9_); + _tmp7_ = file; #line 1179 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp10_) { -#line 9480 "Photo.c" - GFile* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; + if (!photo_is_file_image (_tmp7_)) { +#line 10326 "Photo.c" + GFile* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; #line 1180 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = file; + _tmp8_ = file; #line 1180 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = g_file_get_path (_tmp11_); + _tmp9_ = g_file_get_path (_tmp8_); #line 1180 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_; + _tmp10_ = _tmp9_; #line 1180 "/home/jens/Source/shotwell/src/Photo.vala" - g_message ("Photo.vala:1180: Not importing %s: Not an image file", _tmp13_); + g_message ("Photo.vala:1180: Not importing %s: Not an image file", _tmp10_); #line 1180 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp10_); #line 1182 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_NOT_AN_IMAGE; #line 1182 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9500,28 +10346,26 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1182 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9502 "Photo.c" +#line 10348 "Photo.c" } #line 1185 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = file; -#line 1185 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo_file_format_is_file_supported (_tmp14_); + _tmp11_ = file; #line 1185 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp15_) { -#line 9510 "Photo.c" - GFile* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; + if (!photo_file_format_is_file_supported (_tmp11_)) { +#line 10354 "Photo.c" + GFile* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; #line 1186 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = file; + _tmp12_ = file; #line 1186 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = g_file_get_path (_tmp16_); + _tmp13_ = g_file_get_path (_tmp12_); #line 1186 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_; + _tmp14_ = _tmp13_; #line 1186 "/home/jens/Source/shotwell/src/Photo.vala" - g_message ("Photo.vala:1186: Not importing %s: Unsupported extension", _tmp18_); + g_message ("Photo.vala:1186: Not importing %s: Unsupported extension", _tmp14_); #line 1186 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp14_); #line 1188 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_UNSUPPORTED_FORMAT; #line 1188 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9530,88 +10374,72 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1188 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9532 "Photo.c" +#line 10376 "Photo.c" } #line 1191 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = info; + _tmp15_ = info; #line 1191 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_info_get_modification_time (_tmp19_, &_tmp20_); + g_file_info_get_modification_time (_tmp15_, &_tmp16_); #line 1191 "/home/jens/Source/shotwell/src/Photo.vala" - timestamp = _tmp20_; -#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = params; + timestamp = _tmp16_; #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_->exif_md5; + _tmp19_ = params->exif_md5; #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp24_ != NULL) { -#line 9546 "Photo.c" - PhotoImportParams* _tmp25_; - const gchar* _tmp26_; -#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = params; + if (_tmp19_ != NULL) { +#line 10388 "Photo.c" + const gchar* _tmp20_; #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp25_->thumbnail_md5; + _tmp20_ = params->thumbnail_md5; #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp26_ != NULL; -#line 9555 "Photo.c" + _tmp18_ = _tmp20_ != NULL; +#line 10394 "Photo.c" } else { #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = FALSE; -#line 9559 "Photo.c" + _tmp18_ = FALSE; +#line 10398 "Photo.c" } #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp22_) { -#line 9563 "Photo.c" - PhotoImportParams* _tmp27_; - const gchar* _tmp28_; -#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = params; + if (_tmp18_) { +#line 10402 "Photo.c" + const gchar* _tmp21_; #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp27_->full_md5; + _tmp21_ = params->full_md5; #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp28_ != NULL; -#line 9572 "Photo.c" + _tmp17_ = _tmp21_ != NULL; +#line 10408 "Photo.c" } else { #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = FALSE; -#line 9576 "Photo.c" + _tmp17_ = FALSE; +#line 10412 "Photo.c" } #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp21_) { -#line 9580 "Photo.c" - PhotoImportParams* _tmp29_; - PhotoImportParams* _tmp30_; - PhotoFileSnifferOptions _tmp31_; -#line 1195 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = params; -#line 1195 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = params; + if (_tmp17_) { +#line 10416 "Photo.c" + PhotoFileSnifferOptions _tmp22_; #line 1195 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _tmp30_->sniffer_options; + _tmp22_ = params->sniffer_options; #line 1195 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_->sniffer_options = _tmp31_ | PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5; -#line 9592 "Photo.c" + params->sniffer_options = _tmp22_ | PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5; +#line 10422 "Photo.c" } #line 1198 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = file; + _tmp23_ = file; #line 1198 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = params; + _tmp24_ = params->sniffer_options; #line 1198 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp33_->sniffer_options; + _tmp25_ = photo_file_interrogator_new (_tmp23_, _tmp24_); #line 1198 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = photo_file_interrogator_new (_tmp32_, _tmp34_); -#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" - interrogator = _tmp35_; -#line 9604 "Photo.c" + interrogator = _tmp25_; +#line 10432 "Photo.c" { - PhotoFileInterrogator* _tmp36_; + PhotoFileInterrogator* _tmp26_; #line 1200 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = interrogator; + _tmp26_ = interrogator; #line 1200 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_interrogator_interrogate (_tmp36_, &_inner_error_); + photo_file_interrogator_interrogate (_tmp26_, &_inner_error_); #line 1200 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9613 "Photo.c" +#line 10441 "Photo.c" goto __catch313_g_error; } } @@ -9619,29 +10447,29 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { __catch313_g_error: { GError* err = NULL; - GFile* _tmp37_; - gchar* _tmp38_; - gchar* _tmp39_; - GError* _tmp40_; - const gchar* _tmp41_; + GFile* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; + GError* _tmp30_; + const gchar* _tmp31_; #line 1199 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 1199 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 1202 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = file; + _tmp27_ = file; #line 1202 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = g_file_get_path (_tmp37_); + _tmp28_ = g_file_get_path (_tmp27_); #line 1202 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = _tmp38_; + _tmp29_ = _tmp28_; #line 1202 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = err; + _tmp30_ = err; #line 1202 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = _tmp40_->message; + _tmp31_ = _tmp30_->message; #line 1202 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:1202: Unable to interrogate photo file %s: %s", _tmp39_, _tmp41_); + g_warning ("Photo.vala:1202: Unable to interrogate photo file %s: %s", _tmp29_, _tmp31_); #line 1202 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp39_); + _g_free0 (_tmp29_); #line 1204 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_DECODE_ERROR; #line 1204 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9654,7 +10482,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1204 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9656 "Photo.c" +#line 10484 "Photo.c" } __finally313: #line 1199 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9671,14 +10499,12 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { g_clear_error (&_inner_error_); #line 1199 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 9673 "Photo.c" +#line 10501 "Photo.c" } #line 1207 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = interrogator; + _tmp32_ = interrogator; #line 1207 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = photo_file_interrogator_get_is_photo_corrupted (_tmp42_); -#line 1207 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp43_) { + if (photo_file_interrogator_get_is_photo_corrupted (_tmp32_)) { #line 1208 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_NOT_AN_IMAGE; #line 1208 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9689,34 +10515,34 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1208 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9691 "Photo.c" +#line 10517 "Photo.c" } #line 1211 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = interrogator; + _tmp33_ = interrogator; #line 1211 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = photo_file_interrogator_get_detected_photo_information (_tmp44_); + _tmp34_ = photo_file_interrogator_get_detected_photo_information (_tmp33_); #line 1211 "/home/jens/Source/shotwell/src/Photo.vala" - detected = _tmp45_; + detected = _tmp34_; #line 1212 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = detected; + _tmp36_ = detected; #line 1212 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp47_ == NULL) { + if (_tmp36_ == NULL) { #line 1212 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = TRUE; -#line 9705 "Photo.c" + _tmp35_ = TRUE; +#line 10531 "Photo.c" } else { - DetectedPhotoInformation* _tmp48_; - PhotoFileFormat _tmp49_; + DetectedPhotoInformation* _tmp37_; + PhotoFileFormat _tmp38_; #line 1212 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = detected; + _tmp37_ = detected; #line 1212 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = _tmp48_->file_format; + _tmp38_ = _tmp37_->file_format; #line 1212 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = _tmp49_ == PHOTO_FILE_FORMAT_UNKNOWN; -#line 9715 "Photo.c" + _tmp35_ = _tmp38_ == PHOTO_FILE_FORMAT_UNKNOWN; +#line 10541 "Photo.c" } #line 1212 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp46_) { + if (_tmp35_) { #line 1213 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_UNSUPPORTED_FORMAT; #line 1213 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9729,234 +10555,211 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1213 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9731 "Photo.c" +#line 10557 "Photo.c" } #line 1216 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = params; -#line 1216 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = _tmp50_->sniffer_options; + _tmp39_ = params->sniffer_options; #line 1216 "/home/jens/Source/shotwell/src/Photo.vala" - if ((_tmp51_ & PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5) != 0) { -#line 9739 "Photo.c" - DetectedPhotoInformation* _tmp52_; - PhotoImportParams* _tmp53_; - const gchar* _tmp54_; - gchar* _tmp55_; - DetectedPhotoInformation* _tmp56_; - PhotoImportParams* _tmp57_; - const gchar* _tmp58_; - gchar* _tmp59_; - DetectedPhotoInformation* _tmp60_; - PhotoImportParams* _tmp61_; - const gchar* _tmp62_; - gchar* _tmp63_; -#line 1217 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = detected; + if ((_tmp39_ & PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5) != 0) { +#line 10563 "Photo.c" + DetectedPhotoInformation* _tmp40_; + const gchar* _tmp41_; + gchar* _tmp42_; + DetectedPhotoInformation* _tmp43_; + const gchar* _tmp44_; + gchar* _tmp45_; + DetectedPhotoInformation* _tmp46_; + const gchar* _tmp47_; + gchar* _tmp48_; #line 1217 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = params; + _tmp40_ = detected; #line 1217 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = _tmp53_->exif_md5; + _tmp41_ = params->exif_md5; #line 1217 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = g_strdup (_tmp54_); + _tmp42_ = g_strdup (_tmp41_); #line 1217 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp52_->exif_md5); + _g_free0 (_tmp40_->exif_md5); #line 1217 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_->exif_md5 = _tmp55_; + _tmp40_->exif_md5 = _tmp42_; #line 1218 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = detected; + _tmp43_ = detected; #line 1218 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = params; + _tmp44_ = params->thumbnail_md5; #line 1218 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = _tmp57_->thumbnail_md5; + _tmp45_ = g_strdup (_tmp44_); #line 1218 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = g_strdup (_tmp58_); + _g_free0 (_tmp43_->thumbnail_md5); #line 1218 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp56_->thumbnail_md5); -#line 1218 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_->thumbnail_md5 = _tmp59_; -#line 1219 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = detected; + _tmp43_->thumbnail_md5 = _tmp45_; #line 1219 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = params; + _tmp46_ = detected; #line 1219 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = _tmp61_->full_md5; + _tmp47_ = params->full_md5; #line 1219 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = g_strdup (_tmp62_); + _tmp48_ = g_strdup (_tmp47_); #line 1219 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp60_->md5); + _g_free0 (_tmp46_->md5); #line 1219 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_->md5 = _tmp63_; -#line 9788 "Photo.c" + _tmp46_->md5 = _tmp48_; +#line 10603 "Photo.c" } #line 1222 "/home/jens/Source/shotwell/src/Photo.vala" orientation = ORIENTATION_TOP_LEFT; #line 1223 "/home/jens/Source/shotwell/src/Photo.vala" exposure_time = (time_t) 0; #line 1224 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = g_strdup (""); + _tmp49_ = g_strdup (""); #line 1224 "/home/jens/Source/shotwell/src/Photo.vala" - title = _tmp64_; + title = _tmp49_; #line 1225 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = g_strdup (""); + _tmp50_ = g_strdup (""); #line 1225 "/home/jens/Source/shotwell/src/Photo.vala" - comment = _tmp65_; + comment = _tmp50_; #line 1226 "/home/jens/Source/shotwell/src/Photo.vala" rating = RATING_UNRATED; #line 1233 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = detected; + _tmp51_ = detected; #line 1233 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = _tmp66_->metadata; + _tmp52_ = _tmp51_->metadata; #line 1233 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp67_ != NULL) { -#line 9810 "Photo.c" + if (_tmp52_ != NULL) { +#line 10625 "Photo.c" MetadataDateTime* date_time = NULL; - DetectedPhotoInformation* _tmp68_; - PhotoMetadata* _tmp69_; - MetadataDateTime* _tmp70_; - MetadataDateTime* _tmp71_; - DetectedPhotoInformation* _tmp74_; - PhotoMetadata* _tmp75_; - Orientation _tmp76_; - DetectedPhotoInformation* _tmp77_; - PhotoMetadata* _tmp78_; - gchar* _tmp79_; - DetectedPhotoInformation* _tmp80_; - PhotoMetadata* _tmp81_; - gchar* _tmp82_; - PhotoImportParams* _tmp83_; - DetectedPhotoInformation* _tmp84_; - PhotoMetadata* _tmp85_; - GeeSet* _tmp86_; - DetectedPhotoInformation* _tmp87_; - PhotoMetadata* _tmp88_; - Rating _tmp89_; + DetectedPhotoInformation* _tmp53_; + PhotoMetadata* _tmp54_; + MetadataDateTime* _tmp55_; + MetadataDateTime* _tmp56_; + DetectedPhotoInformation* _tmp58_; + PhotoMetadata* _tmp59_; + DetectedPhotoInformation* _tmp60_; + PhotoMetadata* _tmp61_; + gchar* _tmp62_; + DetectedPhotoInformation* _tmp63_; + PhotoMetadata* _tmp64_; + gchar* _tmp65_; + DetectedPhotoInformation* _tmp66_; + PhotoMetadata* _tmp67_; + GeeSet* _tmp68_; + DetectedPhotoInformation* _tmp69_; + PhotoMetadata* _tmp70_; #line 1234 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = detected; + _tmp53_ = detected; #line 1234 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = _tmp68_->metadata; + _tmp54_ = _tmp53_->metadata; #line 1234 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = photo_metadata_get_exposure_date_time (_tmp69_); + _tmp55_ = photo_metadata_get_exposure_date_time (_tmp54_); #line 1234 "/home/jens/Source/shotwell/src/Photo.vala" - date_time = _tmp70_; + date_time = _tmp55_; #line 1235 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = date_time; + _tmp56_ = date_time; #line 1235 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp71_ != NULL) { -#line 9844 "Photo.c" - MetadataDateTime* _tmp72_; - time_t _tmp73_; + if (_tmp56_ != NULL) { +#line 10656 "Photo.c" + MetadataDateTime* _tmp57_; #line 1236 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = date_time; + _tmp57_ = date_time; #line 1236 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = metadata_date_time_get_timestamp (_tmp72_); -#line 1236 "/home/jens/Source/shotwell/src/Photo.vala" - exposure_time = _tmp73_; -#line 9853 "Photo.c" + exposure_time = metadata_date_time_get_timestamp (_tmp57_); +#line 10662 "Photo.c" } #line 1238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = detected; -#line 1238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = _tmp74_->metadata; + _tmp58_ = detected; #line 1238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = photo_metadata_get_orientation (_tmp75_); + _tmp59_ = _tmp58_->metadata; #line 1238 "/home/jens/Source/shotwell/src/Photo.vala" - orientation = _tmp76_; + orientation = photo_metadata_get_orientation (_tmp59_); #line 1239 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = detected; + _tmp60_ = detected; #line 1239 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = _tmp77_->metadata; + _tmp61_ = _tmp60_->metadata; #line 1239 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp62_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 1239 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); #line 1239 "/home/jens/Source/shotwell/src/Photo.vala" - title = _tmp79_; + title = _tmp62_; #line 1240 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = detected; + _tmp63_ = detected; #line 1240 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = _tmp80_->metadata; + _tmp64_ = _tmp63_->metadata; #line 1240 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp65_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 1240 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); #line 1240 "/home/jens/Source/shotwell/src/Photo.vala" - comment = _tmp82_; + comment = _tmp65_; #line 1241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = params; + _tmp66_ = detected; #line 1241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = detected; + _tmp67_ = _tmp66_->metadata; #line 1241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = _tmp84_->metadata; + _tmp68_ = photo_metadata_get_keywords (_tmp67_, NULL, NULL, NULL); #line 1241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = photo_metadata_get_keywords (_tmp85_, NULL, NULL, NULL); + _g_object_unref0 (params->keywords); #line 1241 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp83_->keywords); -#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_->keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, GEE_TYPE_COLLECTION, GeeCollection); -#line 1242 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = detected; + params->keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_COLLECTION, GeeCollection); #line 1242 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = _tmp87_->metadata; + _tmp69_ = detected; #line 1242 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = photo_metadata_get_rating (_tmp88_); + _tmp70_ = _tmp69_->metadata; #line 1242 "/home/jens/Source/shotwell/src/Photo.vala" - rating = _tmp89_; + rating = photo_metadata_get_rating (_tmp70_); #line 1233 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 9905 "Photo.c" +#line 10708 "Photo.c" } #line 1246 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = detected; + _tmp73_ = detected; #line 1246 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = _tmp92_->colorspace; + _tmp74_ = _tmp73_->colorspace; #line 1246 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp93_ != GDK_COLORSPACE_RGB) { + if (_tmp74_ != GDK_COLORSPACE_RGB) { #line 1246 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = TRUE; -#line 9915 "Photo.c" + _tmp72_ = TRUE; +#line 10718 "Photo.c" } else { - DetectedPhotoInformation* _tmp94_; - gint _tmp95_; + DetectedPhotoInformation* _tmp75_; + gint _tmp76_; #line 1247 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = detected; + _tmp75_ = detected; #line 1247 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp95_ = _tmp94_->channels; + _tmp76_ = _tmp75_->channels; #line 1247 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = _tmp95_ < 3; -#line 9925 "Photo.c" + _tmp72_ = _tmp76_ < 3; +#line 10728 "Photo.c" } #line 1246 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp91_) { + if (_tmp72_) { #line 1246 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = TRUE; -#line 9931 "Photo.c" + _tmp71_ = TRUE; +#line 10734 "Photo.c" } else { - DetectedPhotoInformation* _tmp96_; - gint _tmp97_; + DetectedPhotoInformation* _tmp77_; + gint _tmp78_; #line 1248 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = detected; + _tmp77_ = detected; #line 1248 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = _tmp96_->bits_per_channel; + _tmp78_ = _tmp77_->bits_per_channel; #line 1248 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = _tmp97_ != 8; -#line 9941 "Photo.c" + _tmp71_ = _tmp78_ != 8; +#line 10744 "Photo.c" } #line 1246 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp90_) { -#line 9945 "Photo.c" - GFile* _tmp98_; - gchar* _tmp99_; - gchar* _tmp100_; + if (_tmp71_) { +#line 10748 "Photo.c" + GFile* _tmp79_; + gchar* _tmp80_; + gchar* _tmp81_; #line 1249 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = file; + _tmp79_ = file; #line 1249 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp99_ = g_file_get_path (_tmp98_); + _tmp80_ = g_file_get_path (_tmp79_); #line 1249 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = _tmp99_; + _tmp81_ = _tmp80_; #line 1249 "/home/jens/Source/shotwell/src/Photo.vala" - g_message ("Photo.vala:1249: Not importing %s: Unsupported color format", _tmp100_); + g_message ("Photo.vala:1249: Not importing %s: Unsupported color format", _tmp81_); #line 1249 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp100_); + _g_free0 (_tmp81_); #line 1251 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_UNSUPPORTED_FORMAT; #line 1251 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9973,291 +10776,230 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1251 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9975 "Photo.c" +#line 10778 "Photo.c" } #line 1257 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = params; -#line 1257 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp102_ = _tmp101_->row; + _tmp82_ = params->row; #line 1257 "/home/jens/Source/shotwell/src/Photo.vala" - photo_id_init (&_tmp102_->photo_id, PHOTO_ID_INVALID); + photo_id_init (&_tmp82_->photo_id, PHOTO_ID_INVALID); #line 1258 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp103_ = params; + _tmp83_ = params->row; #line 1258 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp104_ = _tmp103_->row; + _tmp84_ = _tmp83_->master; #line 1258 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp105_ = _tmp104_->master; + _tmp85_ = file; #line 1258 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp106_ = file; + _tmp86_ = g_file_get_path (_tmp85_); #line 1258 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp107_ = g_file_get_path (_tmp106_); + _g_free0 (_tmp84_->filepath); #line 1258 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp105_->filepath); -#line 1258 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp105_->filepath = _tmp107_; -#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp108_ = params; + _tmp84_->filepath = _tmp86_; #line 1259 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp109_ = _tmp108_->row; + _tmp87_ = params->row; #line 1259 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp110_ = _tmp109_->master; + _tmp88_ = _tmp87_->master; #line 1259 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp111_ = detected; + _tmp89_ = detected; #line 1259 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp112_ = _tmp111_->image_dim; + _tmp90_ = _tmp89_->image_dim; #line 1259 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp110_->dim = _tmp112_; -#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp113_ = params; + _tmp88_->dim = _tmp90_; #line 1260 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp114_ = _tmp113_->row; + _tmp91_ = params->row; #line 1260 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp115_ = _tmp114_->master; + _tmp92_ = _tmp91_->master; #line 1260 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp116_ = info; + _tmp93_ = info; #line 1260 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp117_ = g_file_info_get_size (_tmp116_); -#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp115_->filesize = _tmp117_; -#line 1261 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp118_ = params; + _tmp92_->filesize = g_file_info_get_size (_tmp93_); #line 1261 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp119_ = _tmp118_->row; + _tmp94_ = params->row; #line 1261 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp120_ = _tmp119_->master; + _tmp95_ = _tmp94_->master; #line 1261 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp121_ = timestamp; + _tmp96_ = timestamp; #line 1261 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp122_ = _tmp121_.tv_sec; + _tmp97_ = _tmp96_.tv_sec; #line 1261 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp120_->timestamp = (time_t) _tmp122_; + _tmp95_->timestamp = (time_t) _tmp97_; #line 1262 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp123_ = params; + _tmp98_ = params->row; #line 1262 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp124_ = _tmp123_->row; + _tmp99_ = exposure_time; #line 1262 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp125_ = exposure_time; -#line 1262 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp124_->exposure_time = _tmp125_; -#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp126_ = params; + _tmp98_->exposure_time = _tmp99_; #line 1263 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp127_ = _tmp126_->row; + _tmp100_ = params->row; #line 1263 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp128_ = orientation; + _tmp101_ = orientation; #line 1263 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp127_->orientation = _tmp128_; + _tmp100_->orientation = _tmp101_; #line 1264 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp129_ = params; + _tmp102_ = params->row; #line 1264 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp130_ = _tmp129_->row; + _tmp103_ = _tmp102_->master; #line 1264 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp131_ = _tmp130_->master; + _tmp104_ = orientation; #line 1264 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp132_ = orientation; -#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp131_->original_orientation = _tmp132_; -#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp133_ = params; + _tmp103_->original_orientation = _tmp104_; #line 1265 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp134_ = _tmp133_->row; + _tmp105_ = params->row; #line 1265 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp135_ = params; + _tmp106_ = params->import_id; #line 1265 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp136_ = _tmp135_->import_id; -#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp134_->import_id = _tmp136_; -#line 1266 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp137_ = params; + _tmp105_->import_id = _tmp106_; #line 1266 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp138_ = _tmp137_->row; + _tmp107_ = params->row; #line 1266 "/home/jens/Source/shotwell/src/Photo.vala" - event_id_init (&_tmp138_->event_id, EVENT_ID_INVALID); + event_id_init (&_tmp107_->event_id, EVENT_ID_INVALID); #line 1267 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp139_ = params; + _tmp108_ = params->row; #line 1267 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp140_ = _tmp139_->row; + _g_object_unref0 (_tmp108_->transformations); #line 1267 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp140_->transformations); -#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp140_->transformations = NULL; -#line 1268 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp141_ = params; + _tmp108_->transformations = NULL; #line 1268 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp142_ = _tmp141_->row; + _tmp109_ = params->row; #line 1268 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp143_ = detected; + _tmp110_ = detected; #line 1268 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp144_ = _tmp143_->md5; + _tmp111_ = _tmp110_->md5; #line 1268 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp145_ = g_strdup (_tmp144_); + _tmp112_ = g_strdup (_tmp111_); #line 1268 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp142_->md5); + _g_free0 (_tmp109_->md5); #line 1268 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp142_->md5 = _tmp145_; + _tmp109_->md5 = _tmp112_; #line 1269 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp146_ = params; + _tmp113_ = params->row; #line 1269 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp147_ = _tmp146_->row; + _tmp114_ = detected; #line 1269 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp148_ = detected; + _tmp115_ = _tmp114_->thumbnail_md5; #line 1269 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp149_ = _tmp148_->thumbnail_md5; + _tmp116_ = g_strdup (_tmp115_); #line 1269 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp150_ = g_strdup (_tmp149_); + _g_free0 (_tmp113_->thumbnail_md5); #line 1269 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp147_->thumbnail_md5); -#line 1269 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp147_->thumbnail_md5 = _tmp150_; -#line 1270 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp151_ = params; + _tmp113_->thumbnail_md5 = _tmp116_; #line 1270 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp152_ = _tmp151_->row; + _tmp117_ = params->row; #line 1270 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp153_ = detected; + _tmp118_ = detected; #line 1270 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp154_ = _tmp153_->exif_md5; + _tmp119_ = _tmp118_->exif_md5; #line 1270 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp155_ = g_strdup (_tmp154_); + _tmp120_ = g_strdup (_tmp119_); #line 1270 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp152_->exif_md5); + _g_free0 (_tmp117_->exif_md5); #line 1270 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp152_->exif_md5 = _tmp155_; + _tmp117_->exif_md5 = _tmp120_; #line 1271 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp156_ = params; + _tmp121_ = params->row; #line 1271 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp157_ = _tmp156_->row; -#line 1271 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp157_->time_created = (time_t) 0; -#line 1272 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp158_ = params; + _tmp121_->time_created = (time_t) 0; #line 1272 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp159_ = _tmp158_->row; + _tmp122_ = params->row; #line 1272 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp159_->flags = (guint64) 0; + _tmp122_->flags = (guint64) 0; #line 1273 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp160_ = params; + _tmp123_ = params->row; #line 1273 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp161_ = _tmp160_->row; + _tmp124_ = _tmp123_->master; #line 1273 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp162_ = _tmp161_->master; + _tmp125_ = detected; #line 1273 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp163_ = detected; + _tmp126_ = _tmp125_->file_format; #line 1273 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp164_ = _tmp163_->file_format; -#line 1273 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp162_->file_format = _tmp164_; -#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp165_ = params; + _tmp124_->file_format = _tmp126_; #line 1274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp166_ = _tmp165_->row; + _tmp127_ = params->row; #line 1274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp167_ = title; + _tmp128_ = title; #line 1274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp168_ = g_strdup (_tmp167_); + _tmp129_ = g_strdup (_tmp128_); #line 1274 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp166_->title); + _g_free0 (_tmp127_->title); #line 1274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp166_->title = _tmp168_; + _tmp127_->title = _tmp129_; #line 1275 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp169_ = params; + _tmp130_ = params->row; #line 1275 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp170_ = _tmp169_->row; + _tmp131_ = comment; #line 1275 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp171_ = comment; + _tmp132_ = g_strdup (_tmp131_); #line 1275 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp172_ = g_strdup (_tmp171_); + _g_free0 (_tmp130_->comment); #line 1275 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp170_->comment); -#line 1275 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp170_->comment = _tmp172_; -#line 1276 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp173_ = params; + _tmp130_->comment = _tmp132_; #line 1276 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp174_ = _tmp173_->row; + _tmp133_ = params->row; #line 1276 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp175_ = rating; + _tmp134_ = rating; #line 1276 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp174_->rating = _tmp175_; + _tmp133_->rating = _tmp134_; #line 1278 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp176_ = params; + _tmp135_ = params->thumbnails; #line 1278 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp177_ = _tmp176_->thumbnails; -#line 1278 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp177_ != NULL) { -#line 10187 "Photo.c" + if (_tmp135_ != NULL) { +#line 10944 "Photo.c" PhotoFileReader* reader = NULL; - PhotoImportParams* _tmp178_; - PhotoRow* _tmp179_; - BackingPhotoRow* _tmp180_; - PhotoFileFormat _tmp181_; - PhotoImportParams* _tmp182_; - PhotoRow* _tmp183_; - BackingPhotoRow* _tmp184_; - const gchar* _tmp185_; - PhotoFileReader* _tmp186_; - PhotoFileReader* _tmp187_; -#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp178_ = params; + PhotoRow* _tmp136_; + BackingPhotoRow* _tmp137_; + PhotoFileFormat _tmp138_; + PhotoRow* _tmp139_; + BackingPhotoRow* _tmp140_; + const gchar* _tmp141_; + PhotoFileReader* _tmp142_; + PhotoFileReader* _tmp143_; #line 1279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp179_ = _tmp178_->row; + _tmp136_ = params->row; #line 1279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp180_ = _tmp179_->master; + _tmp137_ = _tmp136_->master; #line 1279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp181_ = _tmp180_->file_format; + _tmp138_ = _tmp137_->file_format; #line 1279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp182_ = params; + _tmp139_ = params->row; #line 1279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp183_ = _tmp182_->row; + _tmp140_ = _tmp139_->master; #line 1279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp184_ = _tmp183_->master; + _tmp141_ = _tmp140_->filepath; #line 1279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp185_ = _tmp184_->filepath; + _tmp142_ = photo_file_format_create_reader (_tmp138_, _tmp141_); #line 1279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp186_ = photo_file_format_create_reader (_tmp181_, _tmp185_); -#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" - reader = _tmp186_; + reader = _tmp142_; #line 1281 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp187_ = reader; + _tmp143_ = reader; #line 1281 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_reader_set_role (_tmp187_, PHOTO_FILE_READER_ROLE_THUMBNAIL); -#line 10223 "Photo.c" - { - PhotoImportParams* _tmp188_; - Thumbnails* _tmp189_; - PhotoFileReader* _tmp190_; - PhotoImportParams* _tmp191_; - PhotoRow* _tmp192_; - Orientation _tmp193_; - PhotoImportParams* _tmp194_; - PhotoRow* _tmp195_; - BackingPhotoRow* _tmp196_; - Dimensions _tmp197_; -#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp188_ = params; + photo_file_reader_set_role (_tmp143_, PHOTO_FILE_READER_ROLE_THUMBNAIL); +#line 10974 "Photo.c" + { + Thumbnails* _tmp144_; + PhotoFileReader* _tmp145_; + PhotoRow* _tmp146_; + Orientation _tmp147_; + PhotoRow* _tmp148_; + BackingPhotoRow* _tmp149_; + Dimensions _tmp150_; #line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp189_ = _tmp188_->thumbnails; + _tmp144_ = params->thumbnails; #line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp190_ = reader; + _tmp145_ = reader; #line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp191_ = params; + _tmp146_ = params->row; #line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp192_ = _tmp191_->row; + _tmp147_ = _tmp146_->orientation; #line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp193_ = _tmp192_->orientation; + _tmp148_ = params->row; #line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp194_ = params; + _tmp149_ = _tmp148_->master; #line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp195_ = _tmp194_->row; + _tmp150_ = _tmp149_->dim; #line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp196_ = _tmp195_->master; -#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp197_ = _tmp196_->dim; -#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - thumbnail_cache_generate_for_photo (_tmp189_, _tmp190_, _tmp193_, &_tmp197_, &_inner_error_); + thumbnail_cache_generate_for_photo (_tmp144_, _tmp145_, _tmp147_, &_tmp150_, &_inner_error_); #line 1283 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10259 "Photo.c" +#line 11001 "Photo.c" goto __catch314_g_error; } } @@ -10265,18 +11007,15 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { __catch314_g_error: { GError* err = NULL; - GError* _tmp198_; - ImportResult _tmp199_; + GError* _tmp151_; #line 1282 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 1282 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 1286 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp198_ = err; + _tmp151_ = err; #line 1286 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp199_ = import_result_convert_error (_tmp198_, IMPORT_RESULT_FILE_ERROR); -#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp199_; + result = import_result_convert_error (_tmp151_, IMPORT_RESULT_FILE_ERROR); #line 1286 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); #line 1286 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10295,7 +11034,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1286 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10297 "Photo.c" +#line 11036 "Photo.c" } __finally314: #line 1282 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10320,11 +11059,11 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { g_clear_error (&_inner_error_); #line 1282 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 10322 "Photo.c" +#line 11061 "Photo.c" } #line 1278 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 10326 "Photo.c" +#line 11065 "Photo.c" } #line 1293 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_SUCCESS; @@ -10342,349 +11081,272 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1293 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10344 "Photo.c" +#line 11083 "Photo.c" } -void photo_create_pre_import (PhotoImportParams* params) { +void +photo_create_pre_import (PhotoImportParams* params) +{ GFile* file = NULL; - PhotoImportParams* _tmp0_; + GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; - PhotoImportParams* _tmp3_; - PhotoRow* _tmp4_; - PhotoImportParams* _tmp5_; + PhotoRow* _tmp2_; + PhotoRow* _tmp3_; + BackingPhotoRow* _tmp4_; + gchar* _tmp5_; PhotoRow* _tmp6_; BackingPhotoRow* _tmp7_; - gchar* _tmp8_; - PhotoImportParams* _tmp9_; + PhotoRow* _tmp8_; + BackingPhotoRow* _tmp9_; PhotoRow* _tmp10_; BackingPhotoRow* _tmp11_; - PhotoImportParams* _tmp12_; + PhotoRow* _tmp12_; PhotoRow* _tmp13_; - BackingPhotoRow* _tmp14_; - PhotoImportParams* _tmp15_; + PhotoRow* _tmp14_; + BackingPhotoRow* _tmp15_; PhotoRow* _tmp16_; - BackingPhotoRow* _tmp17_; - PhotoImportParams* _tmp18_; + ImportID _tmp17_; + PhotoRow* _tmp18_; PhotoRow* _tmp19_; - PhotoImportParams* _tmp20_; + PhotoRow* _tmp20_; PhotoRow* _tmp21_; - PhotoImportParams* _tmp22_; + PhotoRow* _tmp22_; PhotoRow* _tmp23_; - BackingPhotoRow* _tmp24_; - PhotoImportParams* _tmp25_; - PhotoRow* _tmp26_; - PhotoImportParams* _tmp27_; - ImportID _tmp28_; - PhotoImportParams* _tmp29_; - PhotoRow* _tmp30_; - PhotoImportParams* _tmp31_; - PhotoRow* _tmp32_; - PhotoImportParams* _tmp33_; - PhotoRow* _tmp34_; - PhotoImportParams* _tmp35_; - PhotoRow* _tmp36_; - PhotoImportParams* _tmp37_; - PhotoRow* _tmp38_; - PhotoImportParams* _tmp39_; - PhotoRow* _tmp40_; - PhotoImportParams* _tmp41_; - PhotoRow* _tmp42_; - PhotoImportParams* _tmp43_; - PhotoRow* _tmp44_; - BackingPhotoRow* _tmp45_; - PhotoImportParams* _tmp46_; - PhotoRow* _tmp47_; - PhotoImportParams* _tmp48_; - PhotoRow* _tmp49_; - PhotoImportParams* _tmp50_; - PhotoRow* _tmp51_; + PhotoRow* _tmp24_; + PhotoRow* _tmp25_; + BackingPhotoRow* _tmp26_; + PhotoRow* _tmp27_; + PhotoRow* _tmp28_; + PhotoRow* _tmp29_; PhotoFileInterrogator* interrogator = NULL; - PhotoImportParams* _tmp52_; - GFile* _tmp53_; - PhotoImportParams* _tmp54_; - PhotoFileSnifferOptions _tmp55_; - PhotoFileInterrogator* _tmp56_; + GFile* _tmp30_; + PhotoFileSnifferOptions _tmp31_; + PhotoFileInterrogator* _tmp32_; GError * _inner_error_ = NULL; #line 1296 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO_IMPORT_PARAMS (params)); #line 1297 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = params; -#line 1297 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp0_->file; + _tmp0_ = params->file; #line 1297 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 1297 "/home/jens/Source/shotwell/src/Photo.vala" - file = _tmp2_; -#line 1298 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = params; + file = _tmp1_; #line 1298 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_->row; + _tmp2_ = params->row; #line 1298 "/home/jens/Source/shotwell/src/Photo.vala" - photo_id_init (&_tmp4_->photo_id, PHOTO_ID_INVALID); + photo_id_init (&_tmp2_->photo_id, PHOTO_ID_INVALID); #line 1299 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = params; + _tmp3_ = params->row; #line 1299 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_->row; -#line 1299 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_->master; + _tmp4_ = _tmp3_->master; #line 1299 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = g_file_get_path (file); + _tmp5_ = g_file_get_path (file); #line 1299 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp7_->filepath); + _g_free0 (_tmp4_->filepath); #line 1299 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_->filepath = _tmp8_; + _tmp4_->filepath = _tmp5_; #line 1300 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = params; + _tmp6_ = params->row; #line 1300 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_->row; -#line 1300 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_->master; + _tmp7_ = _tmp6_->master; #line 1300 "/home/jens/Source/shotwell/src/Photo.vala" - dimensions_init (&_tmp11_->dim, 0, 0); -#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = params; + dimensions_init (&_tmp7_->dim, 0, 0); #line 1301 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_->row; + _tmp8_ = params->row; #line 1301 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_->master; + _tmp9_ = _tmp8_->master; #line 1301 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_->filesize = (gint64) 0; + _tmp9_->filesize = (gint64) 0; #line 1302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = params; + _tmp10_ = params->row; #line 1302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_->row; -#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_->master; + _tmp11_ = _tmp10_->master; #line 1302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_->timestamp = (time_t) 0; + _tmp11_->timestamp = (time_t) 0; #line 1303 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = params; + _tmp12_ = params->row; #line 1303 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_->row; -#line 1303 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_->exposure_time = (time_t) 0; -#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = params; + _tmp12_->exposure_time = (time_t) 0; #line 1304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp20_->row; + _tmp13_ = params->row; #line 1304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_->orientation = ORIENTATION_TOP_LEFT; + _tmp13_->orientation = ORIENTATION_TOP_LEFT; #line 1305 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = params; + _tmp14_ = params->row; #line 1305 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _tmp22_->row; -#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_->master; + _tmp15_ = _tmp14_->master; #line 1305 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_->original_orientation = ORIENTATION_TOP_LEFT; -#line 1306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = params; -#line 1306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp25_->row; + _tmp15_->original_orientation = ORIENTATION_TOP_LEFT; #line 1306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = params; + _tmp16_ = params->row; #line 1306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp27_->import_id; + _tmp17_ = params->import_id; #line 1306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_->import_id = _tmp28_; + _tmp16_->import_id = _tmp17_; #line 1307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = params; + _tmp18_ = params->row; #line 1307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _tmp29_->row; -#line 1307 "/home/jens/Source/shotwell/src/Photo.vala" - event_id_init (&_tmp30_->event_id, EVENT_ID_INVALID); -#line 1308 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = params; + event_id_init (&_tmp18_->event_id, EVENT_ID_INVALID); #line 1308 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _tmp31_->row; + _tmp19_ = params->row; #line 1308 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp32_->transformations); + _g_object_unref0 (_tmp19_->transformations); #line 1308 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_->transformations = NULL; + _tmp19_->transformations = NULL; #line 1309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = params; + _tmp20_ = params->row; #line 1309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp33_->row; + _g_free0 (_tmp20_->md5); #line 1309 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp34_->md5); -#line 1309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_->md5 = NULL; -#line 1310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = params; + _tmp20_->md5 = NULL; #line 1310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = _tmp35_->row; + _tmp21_ = params->row; #line 1310 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp36_->thumbnail_md5); + _g_free0 (_tmp21_->thumbnail_md5); #line 1310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_->thumbnail_md5 = NULL; + _tmp21_->thumbnail_md5 = NULL; #line 1311 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = params; + _tmp22_ = params->row; #line 1311 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = _tmp37_->row; + _g_free0 (_tmp22_->exif_md5); #line 1311 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp38_->exif_md5); -#line 1311 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_->exif_md5 = NULL; -#line 1312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = params; + _tmp22_->exif_md5 = NULL; #line 1312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = _tmp39_->row; + _tmp23_ = params->row; #line 1312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_->time_created = (time_t) 0; + _tmp23_->time_created = (time_t) 0; #line 1313 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = params; + _tmp24_ = params->row; #line 1313 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _tmp41_->row; -#line 1313 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_->flags = (guint64) 0; -#line 1314 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = params; + _tmp24_->flags = (guint64) 0; #line 1314 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = _tmp43_->row; + _tmp25_ = params->row; #line 1314 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = _tmp44_->master; + _tmp26_ = _tmp25_->master; #line 1314 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_->file_format = PHOTO_FILE_FORMAT_JFIF; + _tmp26_->file_format = PHOTO_FILE_FORMAT_JFIF; #line 1315 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = params; + _tmp27_ = params->row; #line 1315 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = _tmp46_->row; + _g_free0 (_tmp27_->title); #line 1315 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp47_->title); -#line 1315 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_->title = NULL; -#line 1316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = params; + _tmp27_->title = NULL; #line 1316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = _tmp48_->row; + _tmp28_ = params->row; #line 1316 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp49_->comment); + _g_free0 (_tmp28_->comment); #line 1316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_->comment = NULL; + _tmp28_->comment = NULL; #line 1317 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = params; + _tmp29_ = params->row; #line 1317 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = _tmp50_->row; -#line 1317 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_->rating = RATING_UNRATED; -#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = params; + _tmp29_->rating = RATING_UNRATED; #line 1319 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = _tmp52_->file; + _tmp30_ = params->file; #line 1319 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = params; + _tmp31_ = params->sniffer_options; #line 1319 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = _tmp54_->sniffer_options; + _tmp32_ = photo_file_interrogator_new (_tmp30_, _tmp31_); #line 1319 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = photo_file_interrogator_new (_tmp53_, _tmp55_); -#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" - interrogator = _tmp56_; -#line 10583 "Photo.c" + interrogator = _tmp32_; +#line 11252 "Photo.c" { DetectedPhotoInformation* detected = NULL; - DetectedPhotoInformation* _tmp57_; - gboolean _tmp58_ = FALSE; - gboolean _tmp59_ = FALSE; - DetectedPhotoInformation* _tmp60_; + DetectedPhotoInformation* _tmp33_; + gboolean _tmp34_ = FALSE; + gboolean _tmp35_ = FALSE; + DetectedPhotoInformation* _tmp36_; #line 1321 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_interrogator_interrogate (interrogator, &_inner_error_); #line 1321 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10594 "Photo.c" +#line 11263 "Photo.c" goto __catch315_g_error; } #line 1322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = photo_file_interrogator_get_detected_photo_information (interrogator); + _tmp33_ = photo_file_interrogator_get_detected_photo_information (interrogator); #line 1322 "/home/jens/Source/shotwell/src/Photo.vala" - detected = _tmp57_; -#line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = detected; + detected = _tmp33_; #line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp60_ != NULL) { -#line 10605 "Photo.c" - gboolean _tmp61_; + _tmp36_ = detected; #line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = photo_file_interrogator_get_is_photo_corrupted (interrogator); + if (_tmp36_ != NULL) { #line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = !_tmp61_; -#line 10611 "Photo.c" + _tmp35_ = !photo_file_interrogator_get_is_photo_corrupted (interrogator); +#line 11276 "Photo.c" } else { #line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = FALSE; -#line 10615 "Photo.c" + _tmp35_ = FALSE; +#line 11280 "Photo.c" } #line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp59_) { -#line 10619 "Photo.c" - DetectedPhotoInformation* _tmp62_; - PhotoFileFormat _tmp63_; + if (_tmp35_) { +#line 11284 "Photo.c" + DetectedPhotoInformation* _tmp37_; + PhotoFileFormat _tmp38_; #line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = detected; + _tmp37_ = detected; #line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = _tmp62_->file_format; + _tmp38_ = _tmp37_->file_format; #line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = _tmp63_ != PHOTO_FILE_FORMAT_UNKNOWN; -#line 10628 "Photo.c" + _tmp34_ = _tmp38_ != PHOTO_FILE_FORMAT_UNKNOWN; +#line 11293 "Photo.c" } else { #line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = FALSE; -#line 10632 "Photo.c" + _tmp34_ = FALSE; +#line 11297 "Photo.c" } #line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp58_) { -#line 10636 "Photo.c" - PhotoImportParams* _tmp64_; - PhotoRow* _tmp65_; - BackingPhotoRow* _tmp66_; - DetectedPhotoInformation* _tmp67_; - PhotoFileFormat _tmp68_; -#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = params; + if (_tmp34_) { +#line 11301 "Photo.c" + PhotoRow* _tmp39_; + BackingPhotoRow* _tmp40_; + DetectedPhotoInformation* _tmp41_; + PhotoFileFormat _tmp42_; #line 1324 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = _tmp64_->row; + _tmp39_ = params->row; #line 1324 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = _tmp65_->master; + _tmp40_ = _tmp39_->master; #line 1324 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = detected; + _tmp41_ = detected; #line 1324 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = _tmp67_->file_format; + _tmp42_ = _tmp41_->file_format; #line 1324 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_->file_format = _tmp68_; -#line 10654 "Photo.c" + _tmp40_->file_format = _tmp42_; +#line 11316 "Photo.c" } #line 1320 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 10658 "Photo.c" +#line 11320 "Photo.c" } goto __finally315; __catch315_g_error: { GError* err = NULL; - gchar* _tmp69_; - gchar* _tmp70_; - GError* _tmp71_; - const gchar* _tmp72_; + gchar* _tmp43_; + gchar* _tmp44_; + GError* _tmp45_; + const gchar* _tmp46_; #line 1320 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 1320 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 1326 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = g_file_get_path (file); + _tmp43_ = g_file_get_path (file); #line 1326 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = _tmp69_; + _tmp44_ = _tmp43_; #line 1326 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = err; + _tmp45_ = err; #line 1326 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = _tmp71_->message; + _tmp46_ = _tmp45_->message; #line 1326 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:1326: Unable to interrogate photo file %s: %s", _tmp70_, _tmp72_); + g_debug ("Photo.vala:1326: Unable to interrogate photo file %s: %s", _tmp44_, _tmp46_); #line 1326 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp70_); + _g_free0 (_tmp44_); #line 1320 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 10686 "Photo.c" +#line 11348 "Photo.c" } __finally315: #line 1320 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10699,53 +11361,55 @@ void photo_create_pre_import (PhotoImportParams* params) { g_clear_error (&_inner_error_); #line 1320 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 10701 "Photo.c" +#line 11363 "Photo.c" } #line 1296 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); #line 1296 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 10707 "Photo.c" +#line 11369 "Photo.c" } -BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoFileSnifferOptions options, DetectedPhotoInformation* * detected, GError** error) { +BackingPhotoRow* +photo_query_backing_photo_row (Photo* self, + GFile* file, + PhotoFileSnifferOptions options, + DetectedPhotoInformation* * detected, + GError** error) +{ DetectedPhotoInformation* _vala_detected = NULL; BackingPhotoRow* result = NULL; BackingPhotoRow* backing = NULL; BackingPhotoRow* _tmp0_; GFileInfo* info = NULL; PhotoFileInterrogator* interrogator = NULL; - GFile* _tmp10_; - PhotoFileSnifferOptions _tmp11_; - PhotoFileInterrogator* _tmp12_; - PhotoFileInterrogator* _tmp13_; - PhotoFileInterrogator* _tmp14_; - DetectedPhotoInformation* _tmp15_; - gboolean _tmp16_ = FALSE; - DetectedPhotoInformation* _tmp17_; + PhotoFileInterrogator* _tmp8_; + PhotoFileInterrogator* _tmp9_; + PhotoFileInterrogator* _tmp10_; + DetectedPhotoInformation* _tmp11_; + gboolean _tmp12_ = FALSE; + DetectedPhotoInformation* _tmp13_; GTimeVal modification_time = {0}; - GFileInfo* _tmp22_; - GTimeVal _tmp23_ = {0}; + GFileInfo* _tmp17_; + GTimeVal _tmp18_ = {0}; + BackingPhotoRow* _tmp19_; + gchar* _tmp20_; + BackingPhotoRow* _tmp21_; + GTimeVal _tmp22_; + glong _tmp23_; BackingPhotoRow* _tmp24_; - GFile* _tmp25_; - gchar* _tmp26_; - BackingPhotoRow* _tmp27_; - GTimeVal _tmp28_; - glong _tmp29_; - BackingPhotoRow* _tmp30_; - GFileInfo* _tmp31_; - gint64 _tmp32_; - BackingPhotoRow* _tmp33_; - DetectedPhotoInformation* _tmp34_; - PhotoFileFormat _tmp35_; - BackingPhotoRow* _tmp36_; - DetectedPhotoInformation* _tmp37_; - Dimensions _tmp38_; - Orientation _tmp39_ = 0; - DetectedPhotoInformation* _tmp40_; - PhotoMetadata* _tmp41_; - BackingPhotoRow* _tmp45_; + GFileInfo* _tmp25_; + BackingPhotoRow* _tmp26_; + DetectedPhotoInformation* _tmp27_; + PhotoFileFormat _tmp28_; + BackingPhotoRow* _tmp29_; + DetectedPhotoInformation* _tmp30_; + Dimensions _tmp31_; + Orientation _tmp32_ = 0; + DetectedPhotoInformation* _tmp33_; + PhotoMetadata* _tmp34_; + BackingPhotoRow* _tmp37_; GError * _inner_error_ = NULL; #line 1330 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); @@ -10761,62 +11425,56 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF backing = _tmp0_; #line 1336 "/home/jens/Source/shotwell/src/Photo.vala" info = NULL; -#line 10763 "Photo.c" +#line 11427 "Photo.c" { GFileInfo* _tmp1_ = NULL; - GFile* _tmp2_; + GFileInfo* _tmp2_; GFileInfo* _tmp3_; - GFileInfo* _tmp4_; -#line 1338 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = file; #line 1338 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = g_file_query_info (_tmp2_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); + _tmp2_ = g_file_query_info (file, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); #line 1338 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp3_; + _tmp1_ = _tmp2_; #line 1338 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10777 "Photo.c" +#line 11438 "Photo.c" goto __catch316_g_error; } #line 1338 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp1_; + _tmp3_ = _tmp1_; #line 1338 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; #line 1338 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); #line 1338 "/home/jens/Source/shotwell/src/Photo.vala" - info = _tmp4_; + info = _tmp3_; #line 1337 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 10790 "Photo.c" +#line 11451 "Photo.c" } goto __finally316; __catch316_g_error: { GError* err = NULL; - GFile* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - GError* _tmp8_; - const gchar* _tmp9_; + gchar* _tmp4_; + gchar* _tmp5_; + GError* _tmp6_; + const gchar* _tmp7_; #line 1337 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 1337 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 1341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = file; -#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = g_file_get_path (_tmp5_); + _tmp4_ = g_file_get_path (file); #line 1341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 1341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = err; + _tmp6_ = err; #line 1341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_->message; + _tmp7_ = _tmp6_->message; #line 1341 "/home/jens/Source/shotwell/src/Photo.vala" - g_critical ("Photo.vala:1341: Unable to read file information for %s: %s", _tmp7_, _tmp9_); + g_critical ("Photo.vala:1341: Unable to read file information for %s: %s", _tmp5_, _tmp7_); #line 1341 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp5_); #line 1343 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; #line 1343 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10829,15 +11487,15 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF if (detected) { #line 1343 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 10831 "Photo.c" +#line 11489 "Photo.c" } else { #line 1343 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 10835 "Photo.c" +#line 11493 "Photo.c" } #line 1343 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10839 "Photo.c" +#line 11497 "Photo.c" } __finally316: #line 1337 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10850,20 +11508,16 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF _backing_photo_row_unref0 (backing); #line 1337 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 10852 "Photo.c" +#line 11510 "Photo.c" } #line 1347 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = file; -#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = options; + _tmp8_ = photo_file_interrogator_new (file, options); #line 1347 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_file_interrogator_new (_tmp10_, _tmp11_); -#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" - interrogator = _tmp12_; + interrogator = _tmp8_; #line 1348 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = interrogator; + _tmp9_ = interrogator; #line 1348 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_interrogator_interrogate (_tmp13_, &_inner_error_); + photo_file_interrogator_interrogate (_tmp9_, &_inner_error_); #line 1348 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1348 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10876,47 +11530,44 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF _backing_photo_row_unref0 (backing); #line 1348 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 10878 "Photo.c" +#line 11532 "Photo.c" } #line 1349 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = interrogator; + _tmp10_ = interrogator; #line 1349 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo_file_interrogator_get_detected_photo_information (_tmp14_); + _tmp11_ = photo_file_interrogator_get_detected_photo_information (_tmp10_); #line 1349 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); #line 1349 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_detected = _tmp15_; + _vala_detected = _tmp11_; #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _vala_detected; + _tmp13_ = _vala_detected; #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp17_ == NULL) { + if (_tmp13_ == NULL) { #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = TRUE; -#line 10894 "Photo.c" + _tmp12_ = TRUE; +#line 11548 "Photo.c" } else { - PhotoFileInterrogator* _tmp18_; - gboolean _tmp19_; -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = interrogator; + PhotoFileInterrogator* _tmp14_; #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = photo_file_interrogator_get_is_photo_corrupted (_tmp18_); + _tmp14_ = interrogator; #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp19_; -#line 10904 "Photo.c" + _tmp12_ = photo_file_interrogator_get_is_photo_corrupted (_tmp14_); +#line 11555 "Photo.c" } #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp16_) { -#line 10908 "Photo.c" - gchar* _tmp20_; - gchar* _tmp21_; + if (_tmp12_) { +#line 11559 "Photo.c" + gchar* _tmp15_; + gchar* _tmp16_; #line 1351 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp15_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 1351 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp20_; + _tmp16_ = _tmp15_; #line 1351 "/home/jens/Source/shotwell/src/Photo.vala" - g_critical ("Photo.vala:1351: Photo update: %s no longer a recognized image", _tmp21_); + g_critical ("Photo.vala:1351: Photo update: %s no longer a recognized image", _tmp16_); #line 1351 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp21_); + _g_free0 (_tmp16_); #line 1353 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; #line 1353 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10929,92 +11580,85 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF if (detected) { #line 1353 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 10931 "Photo.c" +#line 11582 "Photo.c" } else { #line 1353 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 10935 "Photo.c" +#line 11586 "Photo.c" } #line 1353 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10939 "Photo.c" +#line 11590 "Photo.c" } #line 1356 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = info; + _tmp17_ = info; #line 1356 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_info_get_modification_time (_tmp22_, &_tmp23_); + g_file_info_get_modification_time (_tmp17_, &_tmp18_); #line 1356 "/home/jens/Source/shotwell/src/Photo.vala" - modification_time = _tmp23_; -#line 1358 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = backing; + modification_time = _tmp18_; #line 1358 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = file; + _tmp19_ = backing; #line 1358 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = g_file_get_path (_tmp25_); + _tmp20_ = g_file_get_path (file); #line 1358 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp24_->filepath); + _g_free0 (_tmp19_->filepath); #line 1358 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_->filepath = _tmp26_; + _tmp19_->filepath = _tmp20_; #line 1359 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = backing; + _tmp21_ = backing; #line 1359 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = modification_time; + _tmp22_ = modification_time; #line 1359 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _tmp28_.tv_sec; + _tmp23_ = _tmp22_.tv_sec; #line 1359 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_->timestamp = (time_t) _tmp29_; + _tmp21_->timestamp = (time_t) _tmp23_; #line 1360 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = backing; -#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = info; + _tmp24_ = backing; #line 1360 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = g_file_info_get_size (_tmp31_); + _tmp25_ = info; #line 1360 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_->filesize = _tmp32_; + _tmp24_->filesize = g_file_info_get_size (_tmp25_); #line 1361 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = backing; + _tmp26_ = backing; #line 1361 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _vala_detected; + _tmp27_ = _vala_detected; #line 1361 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = _tmp34_->file_format; + _tmp28_ = _tmp27_->file_format; #line 1361 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_->file_format = _tmp35_; + _tmp26_->file_format = _tmp28_; #line 1362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = backing; + _tmp29_ = backing; #line 1362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _vala_detected; + _tmp30_ = _vala_detected; #line 1362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = _tmp37_->image_dim; + _tmp31_ = _tmp30_->image_dim; #line 1362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_->dim = _tmp38_; + _tmp29_->dim = _tmp31_; #line 1363 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = _vala_detected; + _tmp33_ = _vala_detected; #line 1363 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = _tmp40_->metadata; + _tmp34_ = _tmp33_->metadata; #line 1363 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp41_ != NULL) { -#line 10995 "Photo.c" - DetectedPhotoInformation* _tmp42_; - PhotoMetadata* _tmp43_; - Orientation _tmp44_; -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _vala_detected; + if (_tmp34_ != NULL) { +#line 11642 "Photo.c" + DetectedPhotoInformation* _tmp35_; + PhotoMetadata* _tmp36_; #line 1364 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = _tmp42_->metadata; + _tmp35_ = _vala_detected; #line 1364 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = photo_metadata_get_orientation (_tmp43_); + _tmp36_ = _tmp35_->metadata; #line 1364 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = _tmp44_; -#line 11007 "Photo.c" + _tmp32_ = photo_metadata_get_orientation (_tmp36_); +#line 11651 "Photo.c" } else { #line 1364 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = ORIENTATION_TOP_LEFT; -#line 11011 "Photo.c" + _tmp32_ = ORIENTATION_TOP_LEFT; +#line 11655 "Photo.c" } #line 1363 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = backing; + _tmp37_ = backing; #line 1363 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_->original_orientation = _tmp39_; + _tmp37_->original_orientation = _tmp32_; #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" result = backing; #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" @@ -11025,128 +11669,164 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF if (detected) { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 11027 "Photo.c" +#line 11671 "Photo.c" } else { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 11031 "Photo.c" +#line 11675 "Photo.c" } #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 11035 "Photo.c" +#line 11679 "Photo.c" } -static void _vala_array_add92 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add92 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11046 "Photo.c" +#line 11695 "Photo.c" } #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11052 "Photo.c" +#line 11701 "Photo.c" } -static void _vala_array_add93 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add93 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1465 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1465 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1465 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11063 "Photo.c" +#line 11717 "Photo.c" } #line 1465 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1465 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11069 "Photo.c" +#line 11723 "Photo.c" } -static void _vala_array_add94 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add94 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11080 "Photo.c" +#line 11739 "Photo.c" } #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11086 "Photo.c" +#line 11745 "Photo.c" } -static void _vala_array_add95 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add95 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11097 "Photo.c" +#line 11761 "Photo.c" } #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11103 "Photo.c" +#line 11767 "Photo.c" } -static void _vala_array_add96 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add96 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11114 "Photo.c" +#line 11783 "Photo.c" } #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11120 "Photo.c" +#line 11789 "Photo.c" } -static void _vala_array_add97 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add97 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1481 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1481 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1481 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11131 "Photo.c" +#line 11805 "Photo.c" } #line 1481 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1481 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11137 "Photo.c" +#line 11811 "Photo.c" } -static gpointer _media_metadata_ref0 (gpointer self) { +static gpointer +_media_metadata_ref0 (gpointer self) +{ #line 1491 "/home/jens/Source/shotwell/src/Photo.vala" return self ? media_metadata_ref (self) : NULL; -#line 11144 "Photo.c" +#line 11820 "Photo.c" } -gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState* * reimport_state, GError** error) { +gboolean +photo_prepare_for_reimport_master (Photo* self, + PhotoReimportMasterState* * reimport_state, + GError** error) +{ PhotoReimportMasterState* _vala_reimport_state = NULL; gboolean result = FALSE; GFile* file = NULL; @@ -11181,29 +11861,29 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat Orientation _tmp40_; DetectedPhotoInformation* _tmp47_; PhotoMetadata* _tmp48_; - PhotoRow* _tmp85_; - BackingPhotoRow* _tmp86_; - BackingPhotoRow* _tmp87_; - PhotoRow* _tmp88_; - DetectedPhotoInformation* _tmp89_; - const gchar* _tmp90_; - gchar* _tmp91_; - PhotoRow* _tmp92_; - DetectedPhotoInformation* _tmp93_; - const gchar* _tmp94_; - gchar* _tmp95_; - PhotoRow* _tmp96_; - DetectedPhotoInformation* _tmp97_; - const gchar* _tmp98_; - gchar* _tmp99_; + PhotoRow* _tmp83_; + BackingPhotoRow* _tmp84_; + BackingPhotoRow* _tmp85_; + PhotoRow* _tmp86_; + DetectedPhotoInformation* _tmp87_; + const gchar* _tmp88_; + gchar* _tmp89_; + PhotoRow* _tmp90_; + DetectedPhotoInformation* _tmp91_; + const gchar* _tmp92_; + gchar* _tmp93_; + PhotoRow* _tmp94_; + DetectedPhotoInformation* _tmp95_; + const gchar* _tmp96_; + gchar* _tmp97_; PhotoMetadata* metadata = NULL; - DetectedPhotoInformation* _tmp100_; - PhotoMetadata* _tmp101_; - PhotoRow* _tmp124_; - PhotoMetadata* _tmp125_; - gchar** _tmp126_; - gint _tmp126__length1; - PhotoReimportMasterStateImpl* _tmp127_; + DetectedPhotoInformation* _tmp98_; + PhotoMetadata* _tmp99_; + PhotoRow* _tmp120_; + PhotoMetadata* _tmp121_; + gchar** _tmp122_; + gint _tmp122__length1; + PhotoReimportMasterStateImpl* _tmp123_; GError * _inner_error_ = NULL; #line 1430 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); @@ -11235,7 +11915,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat backing = _tmp6_; #line 1436 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 11237 "Photo.c" +#line 11917 "Photo.c" gboolean _tmp7_ = FALSE; #line 1436 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); @@ -11245,13 +11925,13 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _g_object_unref0 (file); #line 1436 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp7_; -#line 11247 "Photo.c" +#line 11927 "Photo.c" } #line 1438 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = backing; #line 1438 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ == NULL) { -#line 11253 "Photo.c" +#line 11933 "Photo.c" GFile* _tmp9_; gchar* _tmp10_; gchar* _tmp11_; @@ -11277,15 +11957,15 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat if (reimport_state) { #line 1440 "/home/jens/Source/shotwell/src/Photo.vala" *reimport_state = _vala_reimport_state; -#line 11279 "Photo.c" +#line 11959 "Photo.c" } else { #line 1440 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); -#line 11283 "Photo.c" +#line 11963 "Photo.c" } #line 1440 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 11287 "Photo.c" +#line 11967 "Photo.c" } #line 1444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = detected; @@ -11295,7 +11975,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat if (_tmp15_ != GDK_COLORSPACE_RGB) { #line 1444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = TRUE; -#line 11297 "Photo.c" +#line 11977 "Photo.c" } else { DetectedPhotoInformation* _tmp16_; gint _tmp17_; @@ -11305,13 +11985,13 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _tmp17_ = _tmp16_->channels; #line 1445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp17_ < 3; -#line 11307 "Photo.c" +#line 11987 "Photo.c" } #line 1444 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { #line 1444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = TRUE; -#line 11313 "Photo.c" +#line 11993 "Photo.c" } else { DetectedPhotoInformation* _tmp18_; gint _tmp19_; @@ -11321,11 +12001,11 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _tmp19_ = _tmp18_->bits_per_channel; #line 1446 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp19_ != 8; -#line 11323 "Photo.c" +#line 12003 "Photo.c" } #line 1444 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 11327 "Photo.c" +#line 12007 "Photo.c" GFile* _tmp20_; gchar* _tmp21_; gchar* _tmp22_; @@ -11351,28 +12031,28 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat if (reimport_state) { #line 1449 "/home/jens/Source/shotwell/src/Photo.vala" *reimport_state = _vala_reimport_state; -#line 11353 "Photo.c" +#line 12033 "Photo.c" } else { #line 1449 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); -#line 11357 "Photo.c" +#line 12037 "Photo.c" } #line 1449 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 11361 "Photo.c" +#line 12041 "Photo.c" } #line 1453 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = photo_row_new (); #line 1453 "/home/jens/Source/shotwell/src/Photo.vala" updated_row = _tmp23_; -#line 11367 "Photo.c" +#line 12047 "Photo.c" { PhotoRow* _tmp24_; #line 1454 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = self->row; #line 1454 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 11374 "Photo.c" +#line 12054 "Photo.c" { PhotoRow* _tmp25_; PhotoRow* _tmp26_; @@ -11384,7 +12064,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _photo_row_unref0 (updated_row); #line 1455 "/home/jens/Source/shotwell/src/Photo.vala" updated_row = _tmp26_; -#line 11386 "Photo.c" +#line 12066 "Photo.c" } __finally317: { @@ -11393,11 +12073,11 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _tmp27_ = self->row; #line 1454 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 11395 "Photo.c" +#line 12075 "Photo.c" } #line 1454 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 11399 "Photo.c" +#line 12079 "Photo.c" gboolean _tmp28_ = FALSE; #line 1454 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); @@ -11411,7 +12091,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _g_object_unref0 (file); #line 1454 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp28_; -#line 11413 "Photo.c" +#line 12093 "Photo.c" } } #line 1459 "/home/jens/Source/shotwell/src/Photo.vala" @@ -11432,7 +12112,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _tmp33_ = _tmp32_->md5; #line 1461 "/home/jens/Source/shotwell/src/Photo.vala" if (g_strcmp0 (_tmp31_, _tmp33_) != 0) { -#line 11434 "Photo.c" +#line 12114 "Photo.c" gchar** _tmp34_; gint _tmp34__length1; gchar* _tmp35_; @@ -11444,7 +12124,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _tmp35_ = g_strdup ("metadata:md5"); #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add92 (&list, &list_length1, &_list_size_, _tmp35_); -#line 11446 "Photo.c" +#line 12126 "Photo.c" } #line 1464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = updated_row; @@ -11458,7 +12138,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _tmp40_ = _tmp39_->original_orientation; #line 1464 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp38_ != _tmp40_) { -#line 11460 "Photo.c" +#line 12140 "Photo.c" gchar** _tmp41_; gint _tmp41__length1; gchar* _tmp42_; @@ -11484,7 +12164,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _tmp46_ = _tmp45_->original_orientation; #line 1466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_->original_orientation = _tmp46_; -#line 11486 "Photo.c" +#line 12166 "Photo.c" } #line 1469 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = detected; @@ -11492,32 +12172,31 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _tmp48_ = _tmp47_->metadata; #line 1469 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp48_ != NULL) { -#line 11494 "Photo.c" +#line 12174 "Photo.c" MetadataDateTime* date_time = NULL; DetectedPhotoInformation* _tmp49_; PhotoMetadata* _tmp50_; MetadataDateTime* _tmp51_; gboolean _tmp52_ = FALSE; MetadataDateTime* _tmp53_; - PhotoRow* _tmp60_; - const gchar* _tmp61_; - DetectedPhotoInformation* _tmp62_; - PhotoMetadata* _tmp63_; + PhotoRow* _tmp59_; + const gchar* _tmp60_; + DetectedPhotoInformation* _tmp61_; + PhotoMetadata* _tmp62_; + gchar* _tmp63_; gchar* _tmp64_; - gchar* _tmp65_; - gboolean _tmp66_; - PhotoRow* _tmp69_; - const gchar* _tmp70_; - DetectedPhotoInformation* _tmp71_; - PhotoMetadata* _tmp72_; + gboolean _tmp65_; + PhotoRow* _tmp68_; + const gchar* _tmp69_; + DetectedPhotoInformation* _tmp70_; + PhotoMetadata* _tmp71_; + gchar* _tmp72_; gchar* _tmp73_; - gchar* _tmp74_; - gboolean _tmp75_; - PhotoRow* _tmp78_; - Rating _tmp79_; - DetectedPhotoInformation* _tmp80_; - PhotoMetadata* _tmp81_; - Rating _tmp82_; + gboolean _tmp74_; + PhotoRow* _tmp77_; + Rating _tmp78_; + DetectedPhotoInformation* _tmp79_; + PhotoMetadata* _tmp80_; #line 1470 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = detected; #line 1470 "/home/jens/Source/shotwell/src/Photo.vala" @@ -11530,11 +12209,10 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _tmp53_ = date_time; #line 1471 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp53_ != NULL) { -#line 11532 "Photo.c" +#line 12211 "Photo.c" PhotoRow* _tmp54_; time_t _tmp55_; MetadataDateTime* _tmp56_; - time_t _tmp57_; #line 1471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = updated_row; #line 1471 "/home/jens/Source/shotwell/src/Photo.vala" @@ -11542,288 +12220,278 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat #line 1471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = date_time; #line 1471 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = metadata_date_time_get_timestamp (_tmp56_); -#line 1471 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = _tmp55_ != _tmp57_; -#line 11547 "Photo.c" + _tmp52_ = _tmp55_ != metadata_date_time_get_timestamp (_tmp56_); +#line 12223 "Photo.c" } else { #line 1471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = FALSE; -#line 11551 "Photo.c" +#line 12227 "Photo.c" } #line 1471 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp52_) { -#line 11555 "Photo.c" - gchar** _tmp58_; - gint _tmp58__length1; - gchar* _tmp59_; +#line 12231 "Photo.c" + gchar** _tmp57_; + gint _tmp57__length1; + gchar* _tmp58_; #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = list; + _tmp57_ = list; #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58__length1 = list_length1; + _tmp57__length1 = list_length1; #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = g_strdup ("metadata:exposure-time"); + _tmp58_ = g_strdup ("metadata:exposure-time"); #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add94 (&list, &list_length1, &_list_size_, _tmp59_); -#line 11567 "Photo.c" + _vala_array_add94 (&list, &list_length1, &_list_size_, _tmp58_); +#line 12243 "Photo.c" } #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = updated_row; + _tmp59_ = updated_row; #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = _tmp60_->title; + _tmp60_ = _tmp59_->title; #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = detected; + _tmp61_ = detected; #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = _tmp62_->metadata; + _tmp62_ = _tmp61_->metadata; #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp63_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = _tmp64_; + _tmp64_ = _tmp63_; #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = g_strcmp0 (_tmp61_, _tmp65_) != 0; + _tmp65_ = g_strcmp0 (_tmp60_, _tmp64_) != 0; #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp65_); + _g_free0 (_tmp64_); #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp66_) { -#line 11587 "Photo.c" - gchar** _tmp67_; - gint _tmp67__length1; - gchar* _tmp68_; + if (_tmp65_) { +#line 12263 "Photo.c" + gchar** _tmp66_; + gint _tmp66__length1; + gchar* _tmp67_; #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = list; + _tmp66_ = list; #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67__length1 = list_length1; + _tmp66__length1 = list_length1; #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = g_strdup ("metadata:name"); + _tmp67_ = g_strdup ("metadata:name"); #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add95 (&list, &list_length1, &_list_size_, _tmp68_); -#line 11599 "Photo.c" + _vala_array_add95 (&list, &list_length1, &_list_size_, _tmp67_); +#line 12275 "Photo.c" } #line 1477 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = updated_row; + _tmp68_ = updated_row; #line 1477 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = _tmp69_->comment; + _tmp69_ = _tmp68_->comment; #line 1477 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = detected; + _tmp70_ = detected; #line 1477 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = _tmp71_->metadata; + _tmp71_ = _tmp70_->metadata; #line 1477 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp72_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 1477 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = _tmp73_; + _tmp73_ = _tmp72_; #line 1477 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = g_strcmp0 (_tmp70_, _tmp74_) != 0; + _tmp74_ = g_strcmp0 (_tmp69_, _tmp73_) != 0; #line 1477 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp74_); + _g_free0 (_tmp73_); #line 1477 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp75_) { -#line 11619 "Photo.c" - gchar** _tmp76_; - gint _tmp76__length1; - gchar* _tmp77_; + if (_tmp74_) { +#line 12295 "Photo.c" + gchar** _tmp75_; + gint _tmp75__length1; + gchar* _tmp76_; #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = list; + _tmp75_ = list; #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76__length1 = list_length1; + _tmp75__length1 = list_length1; #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = g_strdup ("metadata:comment"); + _tmp76_ = g_strdup ("metadata:comment"); #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add96 (&list, &list_length1, &_list_size_, _tmp77_); -#line 11631 "Photo.c" + _vala_array_add96 (&list, &list_length1, &_list_size_, _tmp76_); +#line 12307 "Photo.c" } #line 1480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = updated_row; -#line 1480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = _tmp78_->rating; + _tmp77_ = updated_row; #line 1480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = detected; + _tmp78_ = _tmp77_->rating; #line 1480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = _tmp80_->metadata; + _tmp79_ = detected; #line 1480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = photo_metadata_get_rating (_tmp81_); + _tmp80_ = _tmp79_->metadata; #line 1480 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp79_ != _tmp82_) { -#line 11645 "Photo.c" - gchar** _tmp83_; - gint _tmp83__length1; - gchar* _tmp84_; + if (_tmp78_ != photo_metadata_get_rating (_tmp80_)) { +#line 12319 "Photo.c" + gchar** _tmp81_; + gint _tmp81__length1; + gchar* _tmp82_; #line 1481 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = list; + _tmp81_ = list; #line 1481 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83__length1 = list_length1; + _tmp81__length1 = list_length1; #line 1481 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = g_strdup ("metadata:rating"); + _tmp82_ = g_strdup ("metadata:rating"); #line 1481 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add97 (&list, &list_length1, &_list_size_, _tmp84_); -#line 11657 "Photo.c" + _vala_array_add97 (&list, &list_length1, &_list_size_, _tmp82_); +#line 12331 "Photo.c" } #line 1469 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 11661 "Photo.c" +#line 12335 "Photo.c" } #line 1484 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = updated_row; + _tmp83_ = updated_row; #line 1484 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = backing; + _tmp84_ = backing; #line 1484 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = _backing_photo_row_ref0 (_tmp86_); + _tmp85_ = _backing_photo_row_ref0 (_tmp84_); #line 1484 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp85_->master); + _backing_photo_row_unref0 (_tmp83_->master); #line 1484 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_->master = _tmp87_; + _tmp83_->master = _tmp85_; #line 1485 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = updated_row; + _tmp86_ = updated_row; #line 1485 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = detected; + _tmp87_ = detected; #line 1485 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = _tmp89_->md5; + _tmp88_ = _tmp87_->md5; #line 1485 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = g_strdup (_tmp90_); + _tmp89_ = g_strdup (_tmp88_); #line 1485 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp88_->md5); + _g_free0 (_tmp86_->md5); #line 1485 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_->md5 = _tmp91_; + _tmp86_->md5 = _tmp89_; #line 1486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = updated_row; + _tmp90_ = updated_row; #line 1486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = detected; + _tmp91_ = detected; #line 1486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = _tmp93_->exif_md5; + _tmp92_ = _tmp91_->exif_md5; #line 1486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp95_ = g_strdup (_tmp94_); + _tmp93_ = g_strdup (_tmp92_); #line 1486 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp92_->exif_md5); + _g_free0 (_tmp90_->exif_md5); #line 1486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_->exif_md5 = _tmp95_; + _tmp90_->exif_md5 = _tmp93_; #line 1487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = updated_row; + _tmp94_ = updated_row; #line 1487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = detected; + _tmp95_ = detected; #line 1487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = _tmp97_->thumbnail_md5; + _tmp96_ = _tmp95_->thumbnail_md5; #line 1487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp99_ = g_strdup (_tmp98_); + _tmp97_ = g_strdup (_tmp96_); #line 1487 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp96_->thumbnail_md5); + _g_free0 (_tmp94_->thumbnail_md5); #line 1487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_->thumbnail_md5 = _tmp99_; + _tmp94_->thumbnail_md5 = _tmp97_; #line 1489 "/home/jens/Source/shotwell/src/Photo.vala" metadata = NULL; #line 1490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = detected; + _tmp98_ = detected; #line 1490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = _tmp100_->metadata; + _tmp99_ = _tmp98_->metadata; #line 1490 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp101_ != NULL) { -#line 11717 "Photo.c" - DetectedPhotoInformation* _tmp102_; - PhotoMetadata* _tmp103_; - PhotoMetadata* _tmp104_; + if (_tmp99_ != NULL) { +#line 12391 "Photo.c" + DetectedPhotoInformation* _tmp100_; + PhotoMetadata* _tmp101_; + PhotoMetadata* _tmp102_; MetadataDateTime* date_time = NULL; - DetectedPhotoInformation* _tmp105_; - PhotoMetadata* _tmp106_; - MetadataDateTime* _tmp107_; - MetadataDateTime* _tmp108_; - PhotoRow* _tmp112_; - DetectedPhotoInformation* _tmp113_; - PhotoMetadata* _tmp114_; - gchar* _tmp115_; - PhotoRow* _tmp116_; - DetectedPhotoInformation* _tmp117_; - PhotoMetadata* _tmp118_; - gchar* _tmp119_; - PhotoRow* _tmp120_; - DetectedPhotoInformation* _tmp121_; - PhotoMetadata* _tmp122_; - Rating _tmp123_; + DetectedPhotoInformation* _tmp103_; + PhotoMetadata* _tmp104_; + MetadataDateTime* _tmp105_; + MetadataDateTime* _tmp106_; + PhotoRow* _tmp109_; + DetectedPhotoInformation* _tmp110_; + PhotoMetadata* _tmp111_; + gchar* _tmp112_; + PhotoRow* _tmp113_; + DetectedPhotoInformation* _tmp114_; + PhotoMetadata* _tmp115_; + gchar* _tmp116_; + PhotoRow* _tmp117_; + DetectedPhotoInformation* _tmp118_; + PhotoMetadata* _tmp119_; #line 1491 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp102_ = detected; + _tmp100_ = detected; #line 1491 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp103_ = _tmp102_->metadata; + _tmp101_ = _tmp100_->metadata; #line 1491 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp104_ = _media_metadata_ref0 (_tmp103_); + _tmp102_ = _media_metadata_ref0 (_tmp101_); #line 1491 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); #line 1491 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp104_; + metadata = _tmp102_; #line 1493 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp105_ = detected; + _tmp103_ = detected; #line 1493 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp106_ = _tmp105_->metadata; + _tmp104_ = _tmp103_->metadata; #line 1493 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp107_ = photo_metadata_get_exposure_date_time (_tmp106_); + _tmp105_ = photo_metadata_get_exposure_date_time (_tmp104_); #line 1493 "/home/jens/Source/shotwell/src/Photo.vala" - date_time = _tmp107_; + date_time = _tmp105_; #line 1494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp108_ = date_time; + _tmp106_ = date_time; #line 1494 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp108_ != NULL) { -#line 11760 "Photo.c" - PhotoRow* _tmp109_; - MetadataDateTime* _tmp110_; - time_t _tmp111_; + if (_tmp106_ != NULL) { +#line 12433 "Photo.c" + PhotoRow* _tmp107_; + MetadataDateTime* _tmp108_; #line 1495 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp109_ = updated_row; + _tmp107_ = updated_row; #line 1495 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp110_ = date_time; + _tmp108_ = date_time; #line 1495 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp111_ = metadata_date_time_get_timestamp (_tmp110_); -#line 1495 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp109_->exposure_time = _tmp111_; -#line 11772 "Photo.c" + _tmp107_->exposure_time = metadata_date_time_get_timestamp (_tmp108_); +#line 12442 "Photo.c" } #line 1497 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp112_ = updated_row; + _tmp109_ = updated_row; #line 1497 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp113_ = detected; + _tmp110_ = detected; #line 1497 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp114_ = _tmp113_->metadata; + _tmp111_ = _tmp110_->metadata; #line 1497 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp115_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp112_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 1497 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp112_->title); + _g_free0 (_tmp109_->title); #line 1497 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp112_->title = _tmp115_; + _tmp109_->title = _tmp112_; #line 1498 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp116_ = updated_row; + _tmp113_ = updated_row; #line 1498 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp117_ = detected; + _tmp114_ = detected; #line 1498 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp118_ = _tmp117_->metadata; + _tmp115_ = _tmp114_->metadata; #line 1498 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp119_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp116_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 1498 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp116_->comment); + _g_free0 (_tmp113_->comment); #line 1498 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp116_->comment = _tmp119_; -#line 1499 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp120_ = updated_row; + _tmp113_->comment = _tmp116_; #line 1499 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp121_ = detected; + _tmp117_ = updated_row; #line 1499 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp122_ = _tmp121_->metadata; + _tmp118_ = detected; #line 1499 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp123_ = photo_metadata_get_rating (_tmp122_); + _tmp119_ = _tmp118_->metadata; #line 1499 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp120_->rating = _tmp123_; + _tmp117_->rating = photo_metadata_get_rating (_tmp119_); #line 1490 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 11810 "Photo.c" +#line 12478 "Photo.c" } #line 1502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp124_ = updated_row; + _tmp120_ = updated_row; #line 1502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp125_ = metadata; + _tmp121_ = metadata; #line 1502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp126_ = list; + _tmp122_ = list; #line 1502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp126__length1 = list_length1; + _tmp122__length1 = list_length1; #line 1502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp127_ = photo_reimport_master_state_impl_new (_tmp124_, _tmp125_, _tmp126_, _tmp126__length1); + _tmp123_ = photo_reimport_master_state_impl_new (_tmp120_, _tmp121_, _tmp122_, _tmp122__length1); #line 1502 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); #line 1502 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_reimport_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState); + _vala_reimport_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState); #line 1504 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 1504 "/home/jens/Source/shotwell/src/Photo.vala" @@ -11842,112 +12510,129 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat if (reimport_state) { #line 1504 "/home/jens/Source/shotwell/src/Photo.vala" *reimport_state = _vala_reimport_state; -#line 11844 "Photo.c" +#line 12512 "Photo.c" } else { #line 1504 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); -#line 11848 "Photo.c" +#line 12516 "Photo.c" } #line 1504 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 11852 "Photo.c" +#line 12520 "Photo.c" } -static void photo_real_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadata) { +static void +photo_real_apply_user_metadata_for_reimport (Photo* self, + PhotoMetadata* metadata) +{ #line 1507 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("Type `%s' does not implement abstract method `photo_apply_user_metadata_for_reimport'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 1507 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11861 "Photo.c" +#line 12532 "Photo.c" } -void photo_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadata) { +void +photo_apply_user_metadata_for_reimport (Photo* self, + PhotoMetadata* metadata) +{ #line 1507 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 1507 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->apply_user_metadata_for_reimport (self, metadata); -#line 11870 "Photo.c" +#line 12544 "Photo.c" } -static gpointer _photo_reimport_master_state_ref0 (gpointer self) { +static gpointer +_photo_reimport_master_state_ref0 (gpointer self) +{ #line 1511 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_reimport_master_state_ref (self) : NULL; -#line 11877 "Photo.c" +#line 12553 "Photo.c" } -static void _vala_array_add98 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add98 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1529 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1529 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1529 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11888 "Photo.c" +#line 12569 "Photo.c" } #line 1529 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1529 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11894 "Photo.c" +#line 12575 "Photo.c" } -static void _vala_array_add99 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add99 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1531 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1531 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1531 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11905 "Photo.c" +#line 12591 "Photo.c" } #line 1531 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1531 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11911 "Photo.c" +#line 12597 "Photo.c" } -void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, GError** error) { +void +photo_finish_reimport_master (Photo* self, + PhotoReimportMasterState* state, + GError** error) +{ PhotoReimportMasterStateImpl* reimport_state = NULL; - PhotoReimportMasterState* _tmp0_; - PhotoReimportMasterStateImpl* _tmp1_; + PhotoReimportMasterStateImpl* _tmp0_; + PhotoTable* _tmp1_; PhotoTable* _tmp2_; - PhotoTable* _tmp3_; - PhotoRow* _tmp4_; - PhotoMetadata* _tmp20_; - gboolean _tmp22_; - gchar** _tmp28_; - gint _tmp28__length1; - PhotoMetadata* _tmp32_; - gboolean _tmp33_; - gboolean _tmp35_; + PhotoRow* _tmp3_; + PhotoMetadata* _tmp19_; + gboolean _tmp21_; + gchar** _tmp26_; + gint _tmp26__length1; + PhotoMetadata* _tmp30_; GError * _inner_error_ = NULL; #line 1510 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 1510 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_MASTER_STATE (state)); #line 1511 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = state; -#line 1511 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _photo_reimport_master_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)); + _tmp0_ = _photo_reimport_master_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (state, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)); #line 1511 "/home/jens/Source/shotwell/src/Photo.vala" - reimport_state = _tmp1_; + reimport_state = _tmp0_; #line 1513 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_table_get_instance (); + _tmp1_ = photo_table_get_instance (); #line 1513 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 1513 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = reimport_state->row; + _tmp3_ = reimport_state->row; #line 1513 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_reimport (_tmp3_, _tmp4_, &_inner_error_); + photo_table_reimport (_tmp2_, _tmp3_, &_inner_error_); #line 1513 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp3_); + _database_table_unref0 (_tmp2_); #line 1513 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1513 "/home/jens/Source/shotwell/src/Photo.vala" @@ -11958,7 +12643,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, _photo_reimport_master_state_unref0 (reimport_state); #line 1513 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11960 "Photo.c" +#line 12645 "Photo.c" } else { #line 1513 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (reimport_state); @@ -11968,87 +12653,87 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, g_clear_error (&_inner_error_); #line 1513 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11970 "Photo.c" +#line 12655 "Photo.c" } } { - PhotoRow* _tmp5_; + PhotoRow* _tmp4_; #line 1515 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->row; + _tmp4_ = self->row; #line 1515 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 11979 "Photo.c" +#line 12664 "Photo.c" { BackingPhotoRow* original_master = NULL; - PhotoRow* _tmp6_; + PhotoRow* _tmp5_; + BackingPhotoRow* _tmp6_; BackingPhotoRow* _tmp7_; - BackingPhotoRow* _tmp8_; + PhotoRow* _tmp8_; PhotoRow* _tmp9_; PhotoRow* _tmp10_; - PhotoRow* _tmp11_; + BackingPhotoRow* _tmp11_; BackingPhotoRow* _tmp12_; - BackingPhotoRow* _tmp13_; - PhotoRow* _tmp14_; - BackingPhotoRow* _tmp15_; - PhotoRow* _tmp16_; - BackingPhotoRow* _tmp17_; - gboolean _tmp18_; + PhotoRow* _tmp13_; + BackingPhotoRow* _tmp14_; + PhotoRow* _tmp15_; + BackingPhotoRow* _tmp16_; + gboolean _tmp17_; #line 1517 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; + _tmp5_ = self->row; #line 1517 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_->master; + _tmp6_ = _tmp5_->master; #line 1517 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _backing_photo_row_ref0 (_tmp7_); + _tmp7_ = _backing_photo_row_ref0 (_tmp6_); #line 1517 "/home/jens/Source/shotwell/src/Photo.vala" - original_master = _tmp8_; + original_master = _tmp7_; #line 1518 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = reimport_state->row; + _tmp8_ = reimport_state->row; #line 1518 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _photo_row_ref0 (_tmp9_); + _tmp9_ = _photo_row_ref0 (_tmp8_); #line 1518 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (self->row); #line 1518 "/home/jens/Source/shotwell/src/Photo.vala" - self->row = _tmp10_; + self->row = _tmp9_; #line 1519 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = self->row; + _tmp10_ = self->row; #line 1519 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = original_master; + _tmp11_ = original_master; #line 1519 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _backing_photo_row_ref0 (_tmp12_); + _tmp12_ = _backing_photo_row_ref0 (_tmp11_); #line 1519 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp11_->master); + _backing_photo_row_unref0 (_tmp10_->master); #line 1519 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_->master = _tmp13_; + _tmp10_->master = _tmp12_; #line 1520 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->row; + _tmp13_ = self->row; #line 1520 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_->master; + _tmp14_ = _tmp13_->master; #line 1520 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = reimport_state->row; + _tmp15_ = reimport_state->row; #line 1520 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_->master; + _tmp16_ = _tmp15_->master; #line 1520 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_row_copy_from (_tmp15_, _tmp17_); + backing_photo_row_copy_from (_tmp14_, _tmp16_); #line 1521 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = reimport_state->metadata_only; + _tmp17_ = reimport_state->metadata_only; #line 1521 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp18_) { + if (!_tmp17_) { #line 1522 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 12037 "Photo.c" +#line 12722 "Photo.c" } #line 1515 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (original_master); -#line 12041 "Photo.c" +#line 12726 "Photo.c" } __finally318: { - PhotoRow* _tmp19_; + PhotoRow* _tmp18_; #line 1515 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = self->row; + _tmp18_ = self->row; #line 1515 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 12050 "Photo.c" +#line 12735 "Photo.c" } #line 1515 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -12060,7 +12745,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, _photo_reimport_master_state_unref0 (reimport_state); #line 1515 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12062 "Photo.c" +#line 12747 "Photo.c" } else { #line 1515 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (reimport_state); @@ -12070,168 +12755,164 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, g_clear_error (&_inner_error_); #line 1515 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12072 "Photo.c" +#line 12757 "Photo.c" } } } #line 1525 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = reimport_state->metadata; + _tmp19_ = reimport_state->metadata; #line 1525 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp20_ != NULL) { -#line 12080 "Photo.c" - PhotoMetadata* _tmp21_; + if (_tmp19_ != NULL) { +#line 12765 "Photo.c" + PhotoMetadata* _tmp20_; #line 1526 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = reimport_state->metadata; + _tmp20_ = reimport_state->metadata; #line 1526 "/home/jens/Source/shotwell/src/Photo.vala" - photo_apply_user_metadata_for_reimport (self, _tmp21_); -#line 12086 "Photo.c" + photo_apply_user_metadata_for_reimport (self, _tmp20_); +#line 12771 "Photo.c" } #line 1528 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = reimport_state->metadata_only; + _tmp21_ = reimport_state->metadata_only; #line 1528 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp22_) { -#line 12092 "Photo.c" - gchar** _tmp23_; - gint _tmp23__length1; - gchar* _tmp24_; - gboolean _tmp25_; + if (!_tmp21_) { +#line 12777 "Photo.c" + gchar** _tmp22_; + gint _tmp22__length1; + gchar* _tmp23_; #line 1529 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = reimport_state->alterations; + _tmp22_ = reimport_state->alterations; #line 1529 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23__length1 = reimport_state->alterations_length1; + _tmp22__length1 = reimport_state->alterations_length1; #line 1529 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = g_strdup ("image:master"); + _tmp23_ = g_strdup ("image:master"); #line 1529 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add98 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp24_); -#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = photo_is_master_baseline (self); + _vala_array_add98 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp23_); #line 1530 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp25_) { -#line 12109 "Photo.c" - gchar** _tmp26_; - gint _tmp26__length1; - gchar* _tmp27_; + if (photo_is_master_baseline (self)) { +#line 12791 "Photo.c" + gchar** _tmp24_; + gint _tmp24__length1; + gchar* _tmp25_; #line 1531 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = reimport_state->alterations; + _tmp24_ = reimport_state->alterations; #line 1531 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26__length1 = reimport_state->alterations_length1; + _tmp24__length1 = reimport_state->alterations_length1; #line 1531 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = g_strdup ("image:baseline"); + _tmp25_ = g_strdup ("image:baseline"); #line 1531 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add99 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp27_); -#line 12121 "Photo.c" + _vala_array_add99 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp25_); +#line 12803 "Photo.c" } } #line 1534 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = reimport_state->alterations; + _tmp26_ = reimport_state->alterations; #line 1534 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28__length1 = reimport_state->alterations_length1; + _tmp26__length1 = reimport_state->alterations_length1; #line 1534 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp28__length1 > 0) { -#line 12130 "Photo.c" - gchar** _tmp29_; - gint _tmp29__length1; - Alteration* _tmp30_; - Alteration* _tmp31_; + if (_tmp26__length1 > 0) { +#line 12812 "Photo.c" + gchar** _tmp27_; + gint _tmp27__length1; + Alteration* _tmp28_; + Alteration* _tmp29_; #line 1535 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = reimport_state->alterations; + _tmp27_ = reimport_state->alterations; #line 1535 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29__length1 = reimport_state->alterations_length1; + _tmp27__length1 = reimport_state->alterations_length1; #line 1535 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = alteration_new_from_array (_tmp29_, _tmp29__length1); + _tmp28_ = alteration_new_from_array (_tmp27_, _tmp27__length1); #line 1535 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _tmp30_; + _tmp29_ = _tmp28_; #line 1535 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp31_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp29_); #line 1535 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp31_); -#line 12147 "Photo.c" + _alteration_unref0 (_tmp29_); +#line 12829 "Photo.c" } #line 1537 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = reimport_state->metadata; + _tmp30_ = reimport_state->metadata; #line 1537 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_master_reimported (self, _tmp32_); -#line 1539 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = photo_is_master_baseline (self); + photo_notify_master_reimported (self, _tmp30_); #line 1539 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp33_) { -#line 12157 "Photo.c" - PhotoMetadata* _tmp34_; + if (photo_is_master_baseline (self)) { +#line 12837 "Photo.c" + PhotoMetadata* _tmp31_; #line 1540 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = reimport_state->metadata; + _tmp31_ = reimport_state->metadata; #line 1540 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_baseline_reimported (self, _tmp34_); -#line 12163 "Photo.c" + photo_notify_baseline_reimported (self, _tmp31_); +#line 12843 "Photo.c" } #line 1542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = photo_is_master_source (self); -#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp35_) { -#line 12169 "Photo.c" - PhotoMetadata* _tmp36_; + if (photo_is_master_source (self)) { +#line 12847 "Photo.c" + PhotoMetadata* _tmp32_; #line 1543 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = reimport_state->metadata; + _tmp32_ = reimport_state->metadata; #line 1543 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_source_reimported (self, _tmp36_); -#line 12175 "Photo.c" + photo_notify_source_reimported (self, _tmp32_); +#line 12853 "Photo.c" } #line 1510 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 12179 "Photo.c" +#line 12857 "Photo.c" } -static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, BackingPhotoRow* * backing, DetectedPhotoInformation* * detected, GError** error) { +static gboolean +photo_verify_file_for_reimport (Photo* self, + GFile* file, + BackingPhotoRow* * backing, + DetectedPhotoInformation* * detected, + GError** error) +{ BackingPhotoRow* _vala_backing = NULL; DetectedPhotoInformation* _vala_detected = NULL; gboolean result = FALSE; BackingPhotoRow* _tmp0_ = NULL; - GFile* _tmp1_; - DetectedPhotoInformation* _tmp2_ = NULL; - BackingPhotoRow* _tmp3_; + DetectedPhotoInformation* _tmp1_ = NULL; + BackingPhotoRow* _tmp2_; + BackingPhotoRow* _tmp4_; BackingPhotoRow* _tmp5_; - BackingPhotoRow* _tmp6_; + gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; - gboolean _tmp8_ = FALSE; - DetectedPhotoInformation* _tmp9_; - GdkColorspace _tmp10_; + DetectedPhotoInformation* _tmp8_; + GdkColorspace _tmp9_; GError * _inner_error_ = NULL; #line 1547 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 1547 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = file; -#line 1549 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_query_backing_photo_row (self, _tmp1_, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp2_, &_inner_error_); + _tmp2_ = photo_query_backing_photo_row (self, file, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp1_, &_inner_error_); #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_detected = _tmp2_; + _vala_detected = _tmp1_; #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp3_; + _tmp0_ = _tmp2_; #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12214 "Photo.c" - gboolean _tmp4_ = FALSE; +#line 12895 "Photo.c" + gboolean _tmp3_ = FALSE; #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp4_; -#line 12220 "Photo.c" + return _tmp3_; +#line 12901 "Photo.c" } #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp0_; + _tmp4_ = _tmp0_; #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_vala_backing); #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_backing = _tmp5_; + _vala_backing = _tmp4_; #line 1551 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _vala_backing; + _tmp5_ = _vala_backing; #line 1551 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_ == NULL) { + if (_tmp5_ == NULL) { #line 1552 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 1552 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12240,78 +12921,75 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin if (backing) { #line 1552 "/home/jens/Source/shotwell/src/Photo.vala" *backing = _vala_backing; -#line 12242 "Photo.c" +#line 12923 "Photo.c" } else { #line 1552 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_vala_backing); -#line 12246 "Photo.c" +#line 12927 "Photo.c" } #line 1552 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { #line 1552 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 12252 "Photo.c" +#line 12933 "Photo.c" } else { #line 1552 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 12256 "Photo.c" +#line 12937 "Photo.c" } #line 1552 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12260 "Photo.c" +#line 12941 "Photo.c" } #line 1556 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _vala_detected; + _tmp8_ = _vala_detected; #line 1556 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_->colorspace; + _tmp9_ = _tmp8_->colorspace; #line 1556 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp10_ != GDK_COLORSPACE_RGB) { + if (_tmp9_ != GDK_COLORSPACE_RGB) { #line 1556 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = TRUE; -#line 12270 "Photo.c" + _tmp7_ = TRUE; +#line 12951 "Photo.c" } else { - DetectedPhotoInformation* _tmp11_; - gint _tmp12_; + DetectedPhotoInformation* _tmp10_; + gint _tmp11_; #line 1557 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _vala_detected; + _tmp10_ = _vala_detected; #line 1557 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_->channels; + _tmp11_ = _tmp10_->channels; #line 1557 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp12_ < 3; -#line 12280 "Photo.c" + _tmp7_ = _tmp11_ < 3; +#line 12961 "Photo.c" } #line 1556 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_) { + if (_tmp7_) { #line 1556 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = TRUE; -#line 12286 "Photo.c" + _tmp6_ = TRUE; +#line 12967 "Photo.c" } else { - DetectedPhotoInformation* _tmp13_; - gint _tmp14_; + DetectedPhotoInformation* _tmp12_; + gint _tmp13_; #line 1558 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _vala_detected; + _tmp12_ = _vala_detected; #line 1558 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_->bits_per_channel; + _tmp13_ = _tmp12_->bits_per_channel; #line 1558 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp14_ != 8; -#line 12296 "Photo.c" + _tmp6_ = _tmp13_ != 8; +#line 12977 "Photo.c" } #line 1556 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp7_) { -#line 12300 "Photo.c" - GFile* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; -#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = file; + if (_tmp6_) { +#line 12981 "Photo.c" + gchar* _tmp14_; + gchar* _tmp15_; #line 1559 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = g_file_get_path (_tmp15_); + _tmp14_ = g_file_get_path (file); #line 1559 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_; + _tmp15_ = _tmp14_; #line 1559 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:1559: Not re-importing %s: Unsupported color format", _tmp17_); + g_warning ("Photo.vala:1559: Not re-importing %s: Unsupported color format", _tmp15_); #line 1559 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp15_); #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12320,25 +12998,25 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin if (backing) { #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" *backing = _vala_backing; -#line 12322 "Photo.c" +#line 13000 "Photo.c" } else { #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_vala_backing); -#line 12326 "Photo.c" +#line 13004 "Photo.c" } #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 12332 "Photo.c" +#line 13010 "Photo.c" } else { #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 12336 "Photo.c" +#line 13014 "Photo.c" } #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12340 "Photo.c" +#line 13018 "Photo.c" } #line 1564 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; @@ -12348,29 +13026,33 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin if (backing) { #line 1564 "/home/jens/Source/shotwell/src/Photo.vala" *backing = _vala_backing; -#line 12350 "Photo.c" +#line 13028 "Photo.c" } else { #line 1564 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_vala_backing); -#line 12354 "Photo.c" +#line 13032 "Photo.c" } #line 1564 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { #line 1564 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 12360 "Photo.c" +#line 13038 "Photo.c" } else { #line 1564 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 12364 "Photo.c" +#line 13042 "Photo.c" } #line 1564 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12368 "Photo.c" +#line 13046 "Photo.c" } -gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditableState* * state, GError** error) { +gboolean +photo_prepare_for_reimport_editable (Photo* self, + PhotoReimportEditableState* * state, + GError** error) +{ PhotoReimportEditableState* _vala_state = NULL; gboolean result = FALSE; GFile* file = NULL; @@ -12410,15 +13092,15 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable if (state) { #line 1573 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12412 "Photo.c" +#line 13094 "Photo.c" } else { #line 1573 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 12416 "Photo.c" +#line 13098 "Photo.c" } #line 1573 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12420 "Photo.c" +#line 13102 "Photo.c" } #line 1577 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file; @@ -12436,7 +13118,7 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable _tmp2_ = _tmp6_; #line 1577 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12438 "Photo.c" +#line 13120 "Photo.c" gboolean _tmp7_ = FALSE; #line 1577 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); @@ -12448,7 +13130,7 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable _g_object_unref0 (file); #line 1577 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp7_; -#line 12450 "Photo.c" +#line 13132 "Photo.c" } #line 1577 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp2_) { @@ -12464,15 +13146,15 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable if (state) { #line 1578 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12466 "Photo.c" +#line 13148 "Photo.c" } else { #line 1578 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 12470 "Photo.c" +#line 13152 "Photo.c" } #line 1578 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12474 "Photo.c" +#line 13156 "Photo.c" } #line 1580 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = backing; @@ -12498,47 +13180,49 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable if (state) { #line 1582 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12500 "Photo.c" +#line 13182 "Photo.c" } else { #line 1582 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 12504 "Photo.c" +#line 13186 "Photo.c" } #line 1582 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12508 "Photo.c" +#line 13190 "Photo.c" } -static gpointer _photo_reimport_editable_state_ref0 (gpointer self) { +static gpointer +_photo_reimport_editable_state_ref0 (gpointer self) +{ #line 1591 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_reimport_editable_state_ref (self) : NULL; -#line 12515 "Photo.c" +#line 13199 "Photo.c" } -void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* state, GError** error) { +void +photo_finish_reimport_editable (Photo* self, + PhotoReimportEditableState* state, + GError** error) +{ BackingPhotoID editable_id = {0}; BackingPhotoID _tmp0_ = {0}; - gboolean _tmp1_; PhotoReimportEditableStateImpl* reimport_state = NULL; - PhotoReimportEditableState* _tmp2_; - PhotoReimportEditableStateImpl* _tmp3_; - PhotoReimportEditableStateImpl* _tmp4_; - gboolean _tmp5_; - PhotoReimportEditableStateImpl* _tmp21_; - PhotoMetadata* _tmp22_; + PhotoReimportEditableStateImpl* _tmp1_; + PhotoReimportEditableStateImpl* _tmp2_; + gboolean _tmp3_; + PhotoReimportEditableStateImpl* _tmp19_; + PhotoMetadata* _tmp20_; gchar* list = NULL; - gchar* _tmp36_; - PhotoReimportEditableStateImpl* _tmp37_; - gboolean _tmp38_; - const gchar* _tmp41_; - Alteration* _tmp42_; - Alteration* _tmp43_; - PhotoReimportEditableStateImpl* _tmp44_; - PhotoMetadata* _tmp45_; - gboolean _tmp46_; - gboolean _tmp49_; + gchar* _tmp33_; + PhotoReimportEditableStateImpl* _tmp34_; + gboolean _tmp35_; + const gchar* _tmp38_; + Alteration* _tmp39_; + Alteration* _tmp40_; + PhotoReimportEditableStateImpl* _tmp41_; + PhotoMetadata* _tmp42_; GError * _inner_error_ = NULL; #line 1586 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -12549,42 +13233,38 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st #line 1587 "/home/jens/Source/shotwell/src/Photo.vala" editable_id = _tmp0_; #line 1588 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = backing_photo_id_is_invalid (&editable_id); -#line 1588 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_) { + if (backing_photo_id_is_invalid (&editable_id)) { #line 1589 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12556 "Photo.c" +#line 13238 "Photo.c" } #line 1591 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = state; -#line 1591 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _photo_reimport_editable_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)); + _tmp1_ = _photo_reimport_editable_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (state, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)); #line 1591 "/home/jens/Source/shotwell/src/Photo.vala" - reimport_state = _tmp3_; + reimport_state = _tmp1_; #line 1593 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = reimport_state; + _tmp2_ = reimport_state; #line 1593 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_->metadata_only; + _tmp3_ = _tmp2_->metadata_only; #line 1593 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp5_) { -#line 12570 "Photo.c" - BackingPhotoTable* _tmp6_; - BackingPhotoTable* _tmp7_; - PhotoReimportEditableStateImpl* _tmp8_; - BackingPhotoRow* _tmp9_; + if (!_tmp3_) { +#line 13250 "Photo.c" + BackingPhotoTable* _tmp4_; + BackingPhotoTable* _tmp5_; + PhotoReimportEditableStateImpl* _tmp6_; + BackingPhotoRow* _tmp7_; #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = backing_photo_table_get_instance (); + _tmp4_ = backing_photo_table_get_instance (); #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = reimport_state; + _tmp6_ = reimport_state; #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_->backing_state; + _tmp7_ = _tmp6_->backing_state; #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_update (_tmp7_, _tmp9_, &_inner_error_); + backing_photo_table_update (_tmp5_, _tmp7_, &_inner_error_); #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp7_); + _database_table_unref0 (_tmp5_); #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12595,7 +13275,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st _photo_reimport_editable_state_unref0 (reimport_state); #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12597 "Photo.c" +#line 13277 "Photo.c" } else { #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (reimport_state); @@ -12605,53 +13285,53 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st g_clear_error (&_inner_error_); #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12607 "Photo.c" +#line 13287 "Photo.c" } } { - PhotoRow* _tmp10_; + PhotoRow* _tmp8_; #line 1596 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = self->row; + _tmp8_ = self->row; #line 1596 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 12616 "Photo.c" +#line 13296 "Photo.c" { - PhotoReimportEditableStateImpl* _tmp11_; - BackingPhotoRow* _tmp12_; + PhotoReimportEditableStateImpl* _tmp9_; + BackingPhotoRow* _tmp10_; + BackingPhotoRow* _tmp11_; + PhotoReimportEditableStateImpl* _tmp12_; BackingPhotoRow* _tmp13_; - PhotoReimportEditableStateImpl* _tmp14_; - BackingPhotoRow* _tmp15_; - Orientation _tmp16_; + Orientation _tmp14_; #line 1597 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = reimport_state; + _tmp9_ = reimport_state; #line 1597 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_->backing_state; + _tmp10_ = _tmp9_->backing_state; #line 1597 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _backing_photo_row_ref0 (_tmp12_); + _tmp11_ = _backing_photo_row_ref0 (_tmp10_); #line 1597 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->priv->editable); #line 1597 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->editable = _tmp13_; + self->priv->editable = _tmp11_; #line 1598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = reimport_state; + _tmp12_ = reimport_state; #line 1598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_->backing_state; + _tmp13_ = _tmp12_->backing_state; #line 1598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_->original_orientation; + _tmp14_ = _tmp13_->original_orientation; #line 1598 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_orientation (self, _tmp16_); + photo_set_orientation (self, _tmp14_); #line 1599 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 12644 "Photo.c" +#line 13324 "Photo.c" } __finally319: { - PhotoRow* _tmp17_; + PhotoRow* _tmp15_; #line 1596 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = self->row; + _tmp15_ = self->row; #line 1596 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 12653 "Photo.c" +#line 13333 "Photo.c" } #line 1596 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -12663,7 +13343,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st _photo_reimport_editable_state_unref0 (reimport_state); #line 1596 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12665 "Photo.c" +#line 13345 "Photo.c" } else { #line 1596 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (reimport_state); @@ -12673,169 +13353,168 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st g_clear_error (&_inner_error_); #line 1596 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12675 "Photo.c" +#line 13355 "Photo.c" } } } } else { - PhotoReimportEditableStateImpl* _tmp18_; - BackingPhotoRow* _tmp19_; - Orientation _tmp20_; + PhotoReimportEditableStateImpl* _tmp16_; + BackingPhotoRow* _tmp17_; + Orientation _tmp18_; #line 1602 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = reimport_state; + _tmp16_ = reimport_state; #line 1602 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_->backing_state; + _tmp17_ = _tmp16_->backing_state; #line 1602 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_->original_orientation; + _tmp18_ = _tmp17_->original_orientation; #line 1602 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_orientation (self, _tmp20_); -#line 12691 "Photo.c" + photo_set_orientation (self, _tmp18_); +#line 13371 "Photo.c" } #line 1605 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = reimport_state; + _tmp19_ = reimport_state; #line 1605 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_->metadata; + _tmp20_ = _tmp19_->metadata; #line 1605 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp22_ != NULL) { -#line 12699 "Photo.c" - PhotoReimportEditableStateImpl* _tmp23_; - PhotoMetadata* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; - PhotoReimportEditableStateImpl* _tmp27_; - PhotoMetadata* _tmp28_; - gchar* _tmp29_; - gchar* _tmp30_; + if (_tmp20_ != NULL) { +#line 13379 "Photo.c" + PhotoReimportEditableStateImpl* _tmp21_; + PhotoMetadata* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + PhotoReimportEditableStateImpl* _tmp25_; + PhotoMetadata* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + PhotoReimportEditableStateImpl* _tmp29_; + PhotoMetadata* _tmp30_; PhotoReimportEditableStateImpl* _tmp31_; PhotoMetadata* _tmp32_; - Rating _tmp33_; - PhotoReimportEditableStateImpl* _tmp34_; - PhotoMetadata* _tmp35_; #line 1606 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = reimport_state; + _tmp21_ = reimport_state; #line 1606 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_->metadata; + _tmp22_ = _tmp21_->metadata; #line 1606 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp23_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 1606 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp25_; + _tmp24_ = _tmp23_; #line 1606 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp26_); + media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp24_); #line 1606 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp24_); #line 1607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = reimport_state; + _tmp25_ = reimport_state; #line 1607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp27_->metadata; + _tmp26_ = _tmp25_->metadata; #line 1607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp27_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 1607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _tmp29_; + _tmp28_ = _tmp27_; #line 1607 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp30_); + media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp28_); #line 1607 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp30_); + _g_free0 (_tmp28_); #line 1608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = reimport_state; -#line 1608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _tmp31_->metadata; + _tmp29_ = reimport_state; #line 1608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = photo_metadata_get_rating (_tmp32_); + _tmp30_ = _tmp29_->metadata; #line 1608 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp33_); + media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), photo_metadata_get_rating (_tmp30_)); #line 1609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = reimport_state; + _tmp31_ = reimport_state; #line 1609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = _tmp34_->metadata; + _tmp32_ = _tmp31_->metadata; #line 1609 "/home/jens/Source/shotwell/src/Photo.vala" - photo_apply_user_metadata_for_reimport (self, _tmp35_); -#line 12751 "Photo.c" + photo_apply_user_metadata_for_reimport (self, _tmp32_); +#line 13428 "Photo.c" } #line 1612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time"); + _tmp33_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time"); #line 1612 "/home/jens/Source/shotwell/src/Photo.vala" - list = _tmp36_; + list = _tmp33_; #line 1613 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = reimport_state; + _tmp34_ = reimport_state; #line 1613 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = _tmp37_->metadata_only; + _tmp35_ = _tmp34_->metadata_only; #line 1613 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp38_) { -#line 12763 "Photo.c" - const gchar* _tmp39_; - gchar* _tmp40_; + if (!_tmp35_) { +#line 13440 "Photo.c" + const gchar* _tmp36_; + gchar* _tmp37_; #line 1614 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = list; + _tmp36_ = list; #line 1614 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = g_strconcat (_tmp39_, "image:editable,image:baseline", NULL); + _tmp37_ = g_strconcat (_tmp36_, "image:editable,image:baseline", NULL); #line 1614 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (list); #line 1614 "/home/jens/Source/shotwell/src/Photo.vala" - list = _tmp40_; -#line 12774 "Photo.c" + list = _tmp37_; +#line 13451 "Photo.c" } #line 1616 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = list; + _tmp38_ = list; #line 1616 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = alteration_new_from_list (_tmp41_); + _tmp39_ = alteration_new_from_list (_tmp38_); #line 1616 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = _tmp42_; + _tmp40_ = _tmp39_; #line 1616 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp43_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp40_); #line 1616 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp43_); + _alteration_unref0 (_tmp40_); #line 1618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = reimport_state; + _tmp41_ = reimport_state; #line 1618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = _tmp44_->metadata; + _tmp42_ = _tmp41_->metadata; #line 1618 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_editable_reimported (self, _tmp45_); + photo_notify_editable_reimported (self, _tmp42_); #line 1620 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = photo_is_editable_baseline (self); -#line 1620 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp46_) { -#line 12796 "Photo.c" - PhotoReimportEditableStateImpl* _tmp47_; - PhotoMetadata* _tmp48_; + if (photo_is_editable_baseline (self)) { +#line 13471 "Photo.c" + PhotoReimportEditableStateImpl* _tmp43_; + PhotoMetadata* _tmp44_; #line 1621 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = reimport_state; + _tmp43_ = reimport_state; #line 1621 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = _tmp47_->metadata; + _tmp44_ = _tmp43_->metadata; #line 1621 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_baseline_reimported (self, _tmp48_); -#line 12805 "Photo.c" + photo_notify_baseline_reimported (self, _tmp44_); +#line 13480 "Photo.c" } #line 1623 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = photo_is_editable_source (self); -#line 1623 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp49_) { -#line 12811 "Photo.c" - PhotoReimportEditableStateImpl* _tmp50_; - PhotoMetadata* _tmp51_; + if (photo_is_editable_source (self)) { +#line 13484 "Photo.c" + PhotoReimportEditableStateImpl* _tmp45_; + PhotoMetadata* _tmp46_; #line 1624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = reimport_state; + _tmp45_ = reimport_state; #line 1624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = _tmp50_->metadata; + _tmp46_ = _tmp45_->metadata; #line 1624 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_source_reimported (self, _tmp51_); -#line 12820 "Photo.c" + photo_notify_source_reimported (self, _tmp46_); +#line 13493 "Photo.c" } #line 1586 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (list); #line 1586 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (reimport_state); -#line 12826 "Photo.c" +#line 13499 "Photo.c" } -static gpointer _photo_reimport_raw_development_state_ref0 (gpointer self) { +static gpointer +_photo_reimport_raw_development_state_ref0 (gpointer self) +{ #line 1646 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_reimport_raw_development_state_ref (self) : NULL; -#line 12833 "Photo.c" +#line 13508 "Photo.c" } -gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState* * state, GError** error) { +gboolean +photo_prepare_for_reimport_raw_development (Photo* self, + PhotoReimportRawDevelopmentState* * state, + GError** error) +{ PhotoReimportRawDevelopmentState* _vala_state = NULL; gboolean result = FALSE; GeeCollection* files = NULL; @@ -12843,10 +13522,9 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR GeeCollection* _tmp1_; PhotoReimportRawDevelopmentStateImpl* reimport_state = NULL; PhotoReimportRawDevelopmentStateImpl* _tmp2_; - PhotoReimportRawDevelopmentStateImpl* _tmp19_; - PhotoReimportRawDevelopmentState* _tmp20_; - PhotoReimportRawDevelopmentStateImpl* _tmp21_; - gint _tmp22_; + PhotoReimportRawDevelopmentStateImpl* _tmp18_; + PhotoReimportRawDevelopmentState* _tmp19_; + PhotoReimportRawDevelopmentStateImpl* _tmp20_; GError * _inner_error_ = NULL; #line 1628 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); @@ -12870,21 +13548,21 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR if (state) { #line 1633 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12872 "Photo.c" +#line 13550 "Photo.c" } else { #line 1633 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (_vala_state); -#line 12876 "Photo.c" +#line 13554 "Photo.c" } #line 1633 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12880 "Photo.c" +#line 13558 "Photo.c" } #line 1635 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_reimport_raw_development_state_impl_new (); #line 1635 "/home/jens/Source/shotwell/src/Photo.vala" reimport_state = _tmp2_; -#line 12886 "Photo.c" +#line 13564 "Photo.c" { GeeIterator* _file_it = NULL; GeeCollection* _tmp3_; @@ -12897,57 +13575,54 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR _file_it = _tmp4_; #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 12899 "Photo.c" +#line 13577 "Photo.c" GeeIterator* _tmp5_; - gboolean _tmp6_; GFile* file = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; + GeeIterator* _tmp6_; + gpointer _tmp7_; DetectedPhotoInformation* detected = NULL; BackingPhotoRow* backing = NULL; - gboolean _tmp9_ = FALSE; - GFile* _tmp10_; - BackingPhotoRow* _tmp11_ = NULL; - DetectedPhotoInformation* _tmp12_ = NULL; - gboolean _tmp13_; - PhotoReimportRawDevelopmentStateImpl* _tmp15_; - BackingPhotoRow* _tmp16_; - DetectedPhotoInformation* _tmp17_; - PhotoMetadata* _tmp18_; + gboolean _tmp8_ = FALSE; + GFile* _tmp9_; + BackingPhotoRow* _tmp10_ = NULL; + DetectedPhotoInformation* _tmp11_ = NULL; + gboolean _tmp12_; + PhotoReimportRawDevelopmentStateImpl* _tmp14_; + BackingPhotoRow* _tmp15_; + DetectedPhotoInformation* _tmp16_; + PhotoMetadata* _tmp17_; #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _file_it; #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_iterator_next (_tmp5_); -#line 1637 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp5_)) { #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 12924 "Photo.c" +#line 13599 "Photo.c" } #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _file_it; + _tmp6_ = _file_it; #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" - file = (GFile*) _tmp8_; + file = (GFile*) _tmp7_; #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = file; + _tmp9_ = file; #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_verify_file_for_reimport (self, _tmp10_, &_tmp11_, &_tmp12_, &_inner_error_); + _tmp12_ = photo_verify_file_for_reimport (self, _tmp9_, &_tmp10_, &_tmp11_, &_inner_error_); #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" - backing = _tmp11_; + backing = _tmp10_; #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" - detected = _tmp12_; + detected = _tmp11_; #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp13_; + _tmp8_ = _tmp12_; #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12948 "Photo.c" - gboolean _tmp14_ = FALSE; +#line 13623 "Photo.c" + gboolean _tmp13_ = FALSE; #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12963,11 +13638,11 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (files); #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp14_; -#line 12966 "Photo.c" + return _tmp13_; +#line 13641 "Photo.c" } #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp9_) { + if (!_tmp8_) { #line 1641 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); #line 1641 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12976,44 +13651,42 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR _g_object_unref0 (file); #line 1641 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 12978 "Photo.c" +#line 13653 "Photo.c" } #line 1643 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = reimport_state; + _tmp14_ = reimport_state; #line 1643 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = backing; + _tmp15_ = backing; #line 1643 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = detected; + _tmp16_ = detected; #line 1643 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_->metadata; + _tmp17_ = _tmp16_->metadata; #line 1643 "/home/jens/Source/shotwell/src/Photo.vala" - photo_reimport_raw_development_state_impl_add (_tmp15_, _tmp16_, _tmp18_); + photo_reimport_raw_development_state_impl_add (_tmp14_, _tmp15_, _tmp17_); #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 12996 "Photo.c" +#line 13671 "Photo.c" } #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_file_it); -#line 13000 "Photo.c" +#line 13675 "Photo.c" } #line 1646 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = reimport_state; + _tmp18_ = reimport_state; #line 1646 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState)); + _tmp19_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState)); #line 1646 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (_vala_state); #line 1646 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = _tmp20_; -#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = reimport_state; + _vala_state = _tmp19_; #line 1647 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = photo_reimport_raw_development_state_impl_get_size (_tmp21_); + _tmp20_ = reimport_state; #line 1647 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp22_ > 0; + result = photo_reimport_raw_development_state_impl_get_size (_tmp20_) > 0; #line 1647 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (reimport_state); #line 1647 "/home/jens/Source/shotwell/src/Photo.vala" @@ -13022,112 +13695,107 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR if (state) { #line 1647 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 13024 "Photo.c" +#line 13697 "Photo.c" } else { #line 1647 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (_vala_state); -#line 13028 "Photo.c" +#line 13701 "Photo.c" } #line 1647 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13032 "Photo.c" +#line 13705 "Photo.c" } -void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState* state, GError** error) { - PhotoFileFormat _tmp0_; +void +photo_finish_reimport_raw_development (Photo* self, + PhotoReimportRawDevelopmentState* state, + GError** error) +{ PhotoReimportRawDevelopmentStateImpl* reimport_state = NULL; - PhotoReimportRawDevelopmentState* _tmp1_; - PhotoReimportRawDevelopmentStateImpl* _tmp2_; + PhotoReimportRawDevelopmentStateImpl* _tmp0_; gchar* list = NULL; - gchar* _tmp32_; - PhotoReimportRawDevelopmentStateImpl* _tmp33_; - gboolean _tmp34_; - const gchar* _tmp37_; - Alteration* _tmp38_; - Alteration* _tmp39_; + gchar* _tmp29_; + PhotoReimportRawDevelopmentStateImpl* _tmp30_; + gboolean _tmp31_; + const gchar* _tmp34_; + Alteration* _tmp35_; + Alteration* _tmp36_; GError * _inner_error_ = NULL; #line 1651 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 1651 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE (state)); #line 1652 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_get_master_file_format (self); -#line 1652 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) { + if (photo_get_master_file_format (self) != PHOTO_FILE_FORMAT_RAW) { #line 1653 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13059 "Photo.c" +#line 13732 "Photo.c" } #line 1655 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = state; -#line 1655 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL, PhotoReimportRawDevelopmentStateImpl)); + _tmp0_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (state, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL, PhotoReimportRawDevelopmentStateImpl)); #line 1655 "/home/jens/Source/shotwell/src/Photo.vala" - reimport_state = _tmp2_; -#line 13067 "Photo.c" + reimport_state = _tmp0_; +#line 13738 "Photo.c" { GeeIterator* _dev_it = NULL; - PhotoReimportRawDevelopmentStateImpl* _tmp3_; - GeeCollection* _tmp4_; - GeeIterator* _tmp5_; + PhotoReimportRawDevelopmentStateImpl* _tmp1_; + GeeCollection* _tmp2_; + GeeIterator* _tmp3_; #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = reimport_state; + _tmp1_ = reimport_state; #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_->list; + _tmp2_ = _tmp1_->list; #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" - _dev_it = _tmp5_; + _dev_it = _tmp3_; #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 13083 "Photo.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 13754 "Photo.c" + GeeIterator* _tmp4_; PhotoReimportRawDevelopmentStateImplDevToReimport* dev = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - PhotoReimportRawDevelopmentStateImpl* _tmp10_; - gboolean _tmp11_; -#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _dev_it; + GeeIterator* _tmp5_; + gpointer _tmp6_; + PhotoReimportRawDevelopmentStateImpl* _tmp7_; + gboolean _tmp8_; #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp4_ = _dev_it; #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp4_)) { #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 13099 "Photo.c" +#line 13767 "Photo.c" } #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _dev_it; + _tmp5_ = _dev_it; #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" - dev = (PhotoReimportRawDevelopmentStateImplDevToReimport*) _tmp9_; + dev = (PhotoReimportRawDevelopmentStateImplDevToReimport*) _tmp6_; #line 1658 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = reimport_state; + _tmp7_ = reimport_state; #line 1658 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_->metadata_only; + _tmp8_ = _tmp7_->metadata_only; #line 1658 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp11_) { -#line 13113 "Photo.c" - BackingPhotoTable* _tmp12_; - BackingPhotoTable* _tmp13_; - PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp14_; - BackingPhotoRow* _tmp15_; + if (!_tmp8_) { +#line 13781 "Photo.c" + BackingPhotoTable* _tmp9_; + BackingPhotoTable* _tmp10_; + PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp11_; + BackingPhotoRow* _tmp12_; #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = backing_photo_table_get_instance (); + _tmp9_ = backing_photo_table_get_instance (); #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_; + _tmp10_ = _tmp9_; #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = dev; + _tmp11_ = dev; #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_->backing; + _tmp12_ = _tmp11_->backing; #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_update (_tmp13_, _tmp15_, &_inner_error_); + backing_photo_table_update (_tmp10_, _tmp12_, &_inner_error_); #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp13_); + _database_table_unref0 (_tmp10_); #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" @@ -13142,7 +13810,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop _photo_reimport_raw_development_state_unref0 (reimport_state); #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13144 "Photo.c" +#line 13812 "Photo.c" } else { #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev); @@ -13156,113 +13824,113 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop g_clear_error (&_inner_error_); #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13158 "Photo.c" +#line 13826 "Photo.c" } } { - PhotoRow* _tmp16_; + PhotoRow* _tmp13_; #line 1661 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = self->row; + _tmp13_ = self->row; #line 1661 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 13167 "Photo.c" +#line 13835 "Photo.c" { - gint _tmp17_; - RawDeveloper* _tmp18_; + gint _tmp14_; + RawDeveloper* _tmp15_; #line 1663 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = raw_developer_as_array (&_tmp17_); -#line 13173 "Photo.c" + _tmp15_ = raw_developer_as_array (&_tmp14_); +#line 13841 "Photo.c" { RawDeveloper* d_collection = NULL; gint d_collection_length1 = 0; gint _d_collection_size_ = 0; gint d_it = 0; #line 1663 "/home/jens/Source/shotwell/src/Photo.vala" - d_collection = _tmp18_; + d_collection = _tmp15_; #line 1663 "/home/jens/Source/shotwell/src/Photo.vala" - d_collection_length1 = _tmp17_; + d_collection_length1 = _tmp14_; #line 1663 "/home/jens/Source/shotwell/src/Photo.vala" - for (d_it = 0; d_it < _tmp17_; d_it = d_it + 1) { -#line 13185 "Photo.c" + for (d_it = 0; d_it < _tmp14_; d_it = d_it + 1) { +#line 13853 "Photo.c" RawDeveloper d = 0; #line 1663 "/home/jens/Source/shotwell/src/Photo.vala" d = d_collection[d_it]; -#line 13189 "Photo.c" +#line 13857 "Photo.c" { BackingPhotoID id = {0}; - PhotoRow* _tmp19_; - BackingPhotoID* _tmp20_; - gint _tmp20__length1; - RawDeveloper _tmp21_; - BackingPhotoID _tmp22_; - BackingPhotoID _tmp23_; - gint64 _tmp24_; + PhotoRow* _tmp16_; + BackingPhotoID* _tmp17_; + gint _tmp17__length1; + RawDeveloper _tmp18_; + BackingPhotoID _tmp19_; + BackingPhotoID _tmp20_; + gint64 _tmp21_; #line 1664 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = self->row; + _tmp16_ = self->row; #line 1664 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_->development_ids; + _tmp17_ = _tmp16_->development_ids; #line 1664 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20__length1 = _tmp19_->development_ids_length1; + _tmp17__length1 = _tmp16_->development_ids_length1; #line 1664 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = d; + _tmp18_ = d; #line 1664 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp20_[_tmp21_]; + _tmp19_ = _tmp17_[_tmp18_]; #line 1664 "/home/jens/Source/shotwell/src/Photo.vala" - id = _tmp22_; + id = _tmp19_; #line 1665 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = id; + _tmp20_ = id; #line 1665 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_.id; + _tmp21_ = _tmp20_.id; #line 1665 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp24_ != BACKING_PHOTO_ID_INVALID) { -#line 13217 "Photo.c" + if (_tmp21_ != BACKING_PHOTO_ID_INVALID) { +#line 13885 "Photo.c" BackingPhotoRow* bpr = NULL; - BackingPhotoID _tmp25_; - BackingPhotoRow* _tmp26_; - BackingPhotoRow* _tmp27_; + BackingPhotoID _tmp22_; + BackingPhotoRow* _tmp23_; + BackingPhotoRow* _tmp24_; #line 1666 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = id; + _tmp22_ = id; #line 1666 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = photo_get_backing_row (self, &_tmp25_); + _tmp23_ = photo_get_backing_row (self, &_tmp22_); #line 1666 "/home/jens/Source/shotwell/src/Photo.vala" - bpr = _tmp26_; + bpr = _tmp23_; #line 1667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = bpr; + _tmp24_ = bpr; #line 1667 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp27_ != NULL) { -#line 13232 "Photo.c" - GeeHashMap* _tmp28_; - RawDeveloper _tmp29_; - BackingPhotoRow* _tmp30_; + if (_tmp24_ != NULL) { +#line 13900 "Photo.c" + GeeHashMap* _tmp25_; + RawDeveloper _tmp26_; + BackingPhotoRow* _tmp27_; #line 1668 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = self->priv->developments; + _tmp25_ = self->priv->developments; #line 1668 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = d; + _tmp26_ = d; #line 1668 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = bpr; + _tmp27_ = bpr; #line 1668 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp29_), _tmp30_); -#line 13244 "Photo.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp26_), _tmp27_); +#line 13912 "Photo.c" } #line 1665 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 13248 "Photo.c" +#line 13916 "Photo.c" } } } #line 1663 "/home/jens/Source/shotwell/src/Photo.vala" d_collection = (g_free (d_collection), NULL); -#line 13254 "Photo.c" +#line 13922 "Photo.c" } } __finally320: { - PhotoRow* _tmp31_; + PhotoRow* _tmp28_; #line 1661 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = self->row; + _tmp28_ = self->row; #line 1661 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 13264 "Photo.c" +#line 13932 "Photo.c" } #line 1661 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -13278,7 +13946,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop _photo_reimport_raw_development_state_unref0 (reimport_state); #line 1661 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13280 "Photo.c" +#line 13948 "Photo.c" } else { #line 1661 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev); @@ -13292,63 +13960,65 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop g_clear_error (&_inner_error_); #line 1661 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13294 "Photo.c" +#line 13962 "Photo.c" } } } } #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev); -#line 13301 "Photo.c" +#line 13969 "Photo.c" } #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_dev_it); -#line 13305 "Photo.c" +#line 13973 "Photo.c" } #line 1675 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time"); + _tmp29_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time"); #line 1675 "/home/jens/Source/shotwell/src/Photo.vala" - list = _tmp32_; + list = _tmp29_; #line 1676 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = reimport_state; + _tmp30_ = reimport_state; #line 1676 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp33_->metadata_only; + _tmp31_ = _tmp30_->metadata_only; #line 1676 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp34_) { -#line 13317 "Photo.c" - const gchar* _tmp35_; - gchar* _tmp36_; + if (!_tmp31_) { +#line 13985 "Photo.c" + const gchar* _tmp32_; + gchar* _tmp33_; #line 1677 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = list; + _tmp32_ = list; #line 1677 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = g_strconcat (_tmp35_, "image:editable,image:baseline", NULL); + _tmp33_ = g_strconcat (_tmp32_, "image:editable,image:baseline", NULL); #line 1677 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (list); #line 1677 "/home/jens/Source/shotwell/src/Photo.vala" - list = _tmp36_; -#line 13328 "Photo.c" + list = _tmp33_; +#line 13996 "Photo.c" } #line 1679 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = list; + _tmp34_ = list; #line 1679 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = alteration_new_from_list (_tmp37_); + _tmp35_ = alteration_new_from_list (_tmp34_); #line 1679 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = _tmp38_; + _tmp36_ = _tmp35_; #line 1679 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp39_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp36_); #line 1679 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp39_); + _alteration_unref0 (_tmp36_); #line 1681 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); #line 1651 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (list); #line 1651 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (reimport_state); -#line 13346 "Photo.c" +#line 14014 "Photo.c" } -static gchar* photo_real_get_typename (DataSource* base) { +static gchar* +photo_real_get_typename (DataSource* base) +{ Photo * self; gchar* result = NULL; gchar* _tmp0_; @@ -13360,11 +14030,13 @@ static gchar* photo_real_get_typename (DataSource* base) { result = _tmp0_; #line 1685 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13362 "Photo.c" +#line 14032 "Photo.c" } -static gint64 photo_real_get_instance_id (DataSource* base) { +static gint64 +photo_real_get_instance_id (DataSource* base) +{ Photo * self; gint64 result = 0LL; PhotoID _tmp0_ = {0}; @@ -13379,18 +14051,19 @@ static gint64 photo_real_get_instance_id (DataSource* base) { result = _tmp1_; #line 1689 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13381 "Photo.c" +#line 14053 "Photo.c" } -static gchar* photo_real_get_source_id (DataSource* base) { +static gchar* +photo_real_get_source_id (DataSource* base) +{ Photo * self; gchar* result = NULL; gchar* _tmp0_; gchar* _tmp1_; - gint64 _tmp2_; + gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; #line 1692 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 1696 "/home/jens/Source/shotwell/src/Photo.vala" @@ -13398,134 +14071,131 @@ static gchar* photo_real_get_source_id (DataSource* base) { #line 1696 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 1696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource)); -#line 1696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = g_strdup_printf ("%s%016" G_GINT64_MODIFIER "x", _tmp1_, _tmp2_); + _tmp2_ = g_strdup_printf ("%s%016" G_GINT64_MODIFIER "x", _tmp1_, data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource))); #line 1696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 1696 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp1_); #line 1696 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp4_; + result = _tmp3_; #line 1696 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13411 "Photo.c" +#line 14082 "Photo.c" } -void photo_set_master_timestamp (Photo* self, GFileInfo* info) { +void +photo_set_master_timestamp (Photo* self, + GFileInfo* info) +{ GTimeVal modification = {0}; - GFileInfo* _tmp0_; - GTimeVal _tmp1_ = {0}; - gboolean _tmp21_; + GTimeVal _tmp0_ = {0}; GError * _inner_error_ = NULL; #line 1700 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 1700 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 1701 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = info; -#line 1701 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_info_get_modification_time (_tmp0_, &_tmp1_); + g_file_info_get_modification_time (info, &_tmp0_); #line 1701 "/home/jens/Source/shotwell/src/Photo.vala" - modification = _tmp1_; -#line 13431 "Photo.c" + modification = _tmp0_; +#line 14101 "Photo.c" { { - PhotoRow* _tmp2_; + PhotoRow* _tmp1_; #line 1704 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = self->row; + _tmp1_ = self->row; #line 1704 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 13439 "Photo.c" +#line 14109 "Photo.c" { - PhotoRow* _tmp3_; - BackingPhotoRow* _tmp4_; - time_t _tmp5_; - GTimeVal _tmp6_; - glong _tmp7_; + PhotoRow* _tmp2_; + BackingPhotoRow* _tmp3_; + time_t _tmp4_; + GTimeVal _tmp5_; + glong _tmp6_; + PhotoTable* _tmp8_; PhotoTable* _tmp9_; - PhotoTable* _tmp10_; - PhotoRow* _tmp11_; - PhotoID _tmp12_; - GTimeVal _tmp13_; - glong _tmp14_; - PhotoRow* _tmp15_; - BackingPhotoRow* _tmp16_; - GTimeVal _tmp17_; - glong _tmp18_; + PhotoRow* _tmp10_; + PhotoID _tmp11_; + GTimeVal _tmp12_; + glong _tmp13_; + PhotoRow* _tmp14_; + BackingPhotoRow* _tmp15_; + GTimeVal _tmp16_; + glong _tmp17_; #line 1705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->row; + _tmp2_ = self->row; #line 1705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_->master; + _tmp3_ = _tmp2_->master; #line 1705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_->timestamp; + _tmp4_ = _tmp3_->timestamp; #line 1705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = modification; + _tmp5_ = modification; #line 1705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_.tv_sec; + _tmp6_ = _tmp5_.tv_sec; #line 1705 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_ == ((time_t) _tmp7_)) { -#line 13468 "Photo.c" + if (_tmp4_ == ((time_t) _tmp6_)) { +#line 14138 "Photo.c" { - PhotoRow* _tmp8_; + PhotoRow* _tmp7_; #line 1704 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = self->row; + _tmp7_ = self->row; #line 1704 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 13475 "Photo.c" +#line 14145 "Photo.c" } #line 1706 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13479 "Photo.c" +#line 14149 "Photo.c" } #line 1708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo_table_get_instance (); + _tmp8_ = photo_table_get_instance (); #line 1708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 1708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = self->row; + _tmp10_ = self->row; #line 1708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_->photo_id; + _tmp11_ = _tmp10_->photo_id; #line 1708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = modification; + _tmp12_ = modification; #line 1708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_.tv_sec; + _tmp13_ = _tmp12_.tv_sec; #line 1708 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_update_timestamp (_tmp10_, &_tmp12_, (time_t) _tmp14_, &_inner_error_); + photo_table_update_timestamp (_tmp9_, &_tmp11_, (time_t) _tmp13_, &_inner_error_); #line 1708 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp10_); + _database_table_unref0 (_tmp9_); #line 1708 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 13499 "Photo.c" +#line 14169 "Photo.c" goto __finally322; } #line 1709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = self->row; + _tmp14_ = self->row; #line 1709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_->master; + _tmp15_ = _tmp14_->master; #line 1709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = modification; + _tmp16_ = modification; #line 1709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_.tv_sec; + _tmp17_ = _tmp16_.tv_sec; #line 1709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_->timestamp = (time_t) _tmp18_; -#line 13512 "Photo.c" + _tmp15_->timestamp = (time_t) _tmp17_; +#line 14182 "Photo.c" } __finally322: { - PhotoRow* _tmp19_; + PhotoRow* _tmp18_; #line 1704 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = self->row; + _tmp18_ = self->row; #line 1704 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 13521 "Photo.c" +#line 14191 "Photo.c" } #line 1704 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1704 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 13527 "Photo.c" +#line 14197 "Photo.c" goto __catch321_database_error; } #line 1704 "/home/jens/Source/shotwell/src/Photo.vala" @@ -13534,7 +14204,7 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { g_clear_error (&_inner_error_); #line 1704 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13536 "Photo.c" +#line 14206 "Photo.c" } } } @@ -13542,20 +14212,20 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { __catch321_database_error: { GError* err = NULL; - GError* _tmp20_; + GError* _tmp19_; #line 1703 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 1703 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 1712 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = err; + _tmp19_ = err; #line 1712 "/home/jens/Source/shotwell/src/Photo.vala" - app_window_database_error (_tmp20_); + app_window_database_error (_tmp19_); #line 1714 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); #line 1714 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13557 "Photo.c" +#line 14227 "Photo.c" } __finally321: #line 1703 "/home/jens/Source/shotwell/src/Photo.vala" @@ -13566,152 +14236,148 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { g_clear_error (&_inner_error_); #line 1703 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13568 "Photo.c" +#line 14238 "Photo.c" } #line 1717 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = photo_is_master_baseline (self); -#line 1717 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp21_) { -#line 13574 "Photo.c" - Alteration* _tmp22_; - Alteration* _tmp23_; + if (photo_is_master_baseline (self)) { +#line 14242 "Photo.c" + Alteration* _tmp20_; + Alteration* _tmp21_; #line 1718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = alteration_new_from_list ("metadata:master-timestamp,metadata:baseline-timestamp"); + _tmp20_ = alteration_new_from_list ("metadata:master-timestamp,metadata:baseline-timestamp"); #line 1718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _tmp22_; + _tmp21_ = _tmp20_; #line 1718 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp23_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_); #line 1718 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp23_); -#line 13585 "Photo.c" + _alteration_unref0 (_tmp21_); +#line 14253 "Photo.c" } else { - Alteration* _tmp24_; - Alteration* _tmp25_; + Alteration* _tmp22_; + Alteration* _tmp23_; #line 1720 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = alteration_new ("metadata", "master-timestamp"); + _tmp22_ = alteration_new ("metadata", "master-timestamp"); #line 1720 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp24_; + _tmp23_ = _tmp22_; #line 1720 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp23_); #line 1720 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp25_); -#line 13597 "Photo.c" + _alteration_unref0 (_tmp23_); +#line 14265 "Photo.c" } } -void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GError** error) { +void +photo_update_editable_modification_time (Photo* self, + GFileInfo* info, + GError** error) +{ GTimeVal modification = {0}; - GFileInfo* _tmp0_; - GTimeVal _tmp1_ = {0}; + GTimeVal _tmp0_ = {0}; gboolean altered = FALSE; - gboolean _tmp20_; + gboolean _tmp18_; GError * _inner_error_ = NULL; #line 1724 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 1724 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 1725 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = info; -#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_info_get_modification_time (_tmp0_, &_tmp1_); + g_file_info_get_modification_time (info, &_tmp0_); #line 1725 "/home/jens/Source/shotwell/src/Photo.vala" - modification = _tmp1_; + modification = _tmp0_; #line 1727 "/home/jens/Source/shotwell/src/Photo.vala" altered = FALSE; -#line 13621 "Photo.c" +#line 14290 "Photo.c" { - PhotoRow* _tmp2_; + PhotoRow* _tmp1_; #line 1728 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = self->row; + _tmp1_ = self->row; #line 1728 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 13628 "Photo.c" +#line 14297 "Photo.c" { - gboolean _tmp3_ = FALSE; - PhotoRow* _tmp4_; - gboolean _tmp5_; -#line 1729 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->row; + gboolean _tmp2_ = FALSE; + PhotoRow* _tmp3_; #line 1729 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = backing_photo_id_is_valid (&_tmp4_->editable_id); + _tmp3_ = self->row; #line 1729 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_) { -#line 13639 "Photo.c" - BackingPhotoRow* _tmp6_; - time_t _tmp7_; - GTimeVal _tmp8_; - glong _tmp9_; + if (backing_photo_id_is_valid (&_tmp3_->editable_id)) { +#line 14305 "Photo.c" + BackingPhotoRow* _tmp4_; + time_t _tmp5_; + GTimeVal _tmp6_; + glong _tmp7_; #line 1729 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->priv->editable; + _tmp4_ = self->priv->editable; #line 1729 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_->timestamp; + _tmp5_ = _tmp4_->timestamp; #line 1729 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = modification; + _tmp6_ = modification; #line 1729 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_.tv_sec; + _tmp7_ = _tmp6_.tv_sec; #line 1729 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp7_ != ((time_t) _tmp9_); -#line 13654 "Photo.c" + _tmp2_ = _tmp5_ != ((time_t) _tmp7_); +#line 14320 "Photo.c" } else { #line 1729 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = FALSE; -#line 13658 "Photo.c" + _tmp2_ = FALSE; +#line 14324 "Photo.c" } #line 1729 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp3_) { -#line 13662 "Photo.c" - BackingPhotoTable* _tmp10_; - BackingPhotoTable* _tmp11_; - PhotoRow* _tmp12_; - BackingPhotoID _tmp13_; - GTimeVal _tmp14_; - glong _tmp15_; - BackingPhotoRow* _tmp16_; - GTimeVal _tmp17_; - glong _tmp18_; + if (_tmp2_) { +#line 14328 "Photo.c" + BackingPhotoTable* _tmp8_; + BackingPhotoTable* _tmp9_; + PhotoRow* _tmp10_; + BackingPhotoID _tmp11_; + GTimeVal _tmp12_; + glong _tmp13_; + BackingPhotoRow* _tmp14_; + GTimeVal _tmp15_; + glong _tmp16_; #line 1730 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = backing_photo_table_get_instance (); + _tmp8_ = backing_photo_table_get_instance (); #line 1730 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 1730 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = self->row; + _tmp10_ = self->row; #line 1730 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_->editable_id; + _tmp11_ = _tmp10_->editable_id; #line 1730 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = modification; + _tmp12_ = modification; #line 1730 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_.tv_sec; + _tmp13_ = _tmp12_.tv_sec; #line 1730 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_update_timestamp (_tmp11_, &_tmp13_, (time_t) _tmp15_, &_inner_error_); + backing_photo_table_update_timestamp (_tmp9_, &_tmp11_, (time_t) _tmp13_, &_inner_error_); #line 1730 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp11_); + _database_table_unref0 (_tmp9_); #line 1730 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 13690 "Photo.c" +#line 14356 "Photo.c" goto __finally323; } #line 1732 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = self->priv->editable; + _tmp14_ = self->priv->editable; #line 1732 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = modification; + _tmp15_ = modification; #line 1732 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_.tv_sec; + _tmp16_ = _tmp15_.tv_sec; #line 1732 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_->timestamp = (time_t) _tmp18_; + _tmp14_->timestamp = (time_t) _tmp16_; #line 1733 "/home/jens/Source/shotwell/src/Photo.vala" altered = TRUE; -#line 13703 "Photo.c" +#line 14369 "Photo.c" } } __finally323: { - PhotoRow* _tmp19_; + PhotoRow* _tmp17_; #line 1728 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = self->row; + _tmp17_ = self->row; #line 1728 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 13713 "Photo.c" +#line 14379 "Photo.c" } #line 1728 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -13721,7 +14387,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr g_propagate_error (error, _inner_error_); #line 1728 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13723 "Photo.c" +#line 14389 "Photo.c" } else { #line 1728 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -13729,104 +14395,98 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr g_clear_error (&_inner_error_); #line 1728 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13731 "Photo.c" +#line 14397 "Photo.c" } } } #line 1737 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = altered; + _tmp18_ = altered; #line 1737 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp20_) { -#line 13739 "Photo.c" - Alteration* _tmp21_; - Alteration* _tmp22_; + if (_tmp18_) { +#line 14405 "Photo.c" + Alteration* _tmp19_; + Alteration* _tmp20_; #line 1738 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = alteration_new_from_list ("metadata:editable-timestamp,metadata:baseline-timestamp"); + _tmp19_ = alteration_new_from_list ("metadata:editable-timestamp,metadata:baseline-timestamp"); #line 1738 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_; + _tmp20_ = _tmp19_; #line 1738 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp22_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_); #line 1738 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp22_); -#line 13750 "Photo.c" + _alteration_unref0 (_tmp20_); +#line 14416 "Photo.c" } } -void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { +void +photo_update_many_editable_timestamps (GeeMap* map, + GError** error) +{ GError * _inner_error_ = NULL; #line 1742 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_MAP (map)); #line 1744 "/home/jens/Source/shotwell/src/Photo.vala" database_table_begin_transaction (); -#line 13761 "Photo.c" +#line 14430 "Photo.c" { GeeIterator* _photo_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = map; + _tmp0_ = gee_map_get_keys (map); #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_; -#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_it = _tmp5_; + _photo_it = _tmp4_; #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 13788 "Photo.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 14454 "Photo.c" + GeeIterator* _tmp5_; Photo* photo = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - Photo* _tmp10_; - GeeMap* _tmp11_; - Photo* _tmp12_; - gpointer _tmp13_; - GFileInfo* _tmp14_; -#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _photo_it; + GeeIterator* _tmp6_; + gpointer _tmp7_; + Photo* _tmp8_; + Photo* _tmp9_; + gpointer _tmp10_; + GFileInfo* _tmp11_; #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _photo_it; #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 13807 "Photo.c" +#line 14469 "Photo.c" } #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _photo_it; + _tmp6_ = _photo_it; #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - photo = (Photo*) _tmp9_; -#line 1746 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo; + photo = (Photo*) _tmp7_; #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = map; + _tmp8_ = photo; #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo; + _tmp9_ = photo; #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = gee_map_get (_tmp11_, _tmp12_); + _tmp10_ = gee_map_get (map, _tmp9_); #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = (GFileInfo*) _tmp13_; + _tmp11_ = (GFileInfo*) _tmp10_; #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" - photo_update_editable_modification_time (_tmp10_, _tmp14_, &_inner_error_); + photo_update_editable_modification_time (_tmp8_, _tmp11_, &_inner_error_); #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp11_); #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" @@ -13839,7 +14499,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { _g_object_unref0 (_photo_it); #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13841 "Photo.c" +#line 14501 "Photo.c" } else { #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); @@ -13851,16 +14511,16 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { g_clear_error (&_inner_error_); #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13853 "Photo.c" +#line 14513 "Photo.c" } } #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 13858 "Photo.c" +#line 14518 "Photo.c" } #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 13862 "Photo.c" +#line 14522 "Photo.c" } #line 1747 "/home/jens/Source/shotwell/src/Photo.vala" database_table_commit_transaction (&_inner_error_); @@ -13872,7 +14532,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { g_propagate_error (error, _inner_error_); #line 1747 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13874 "Photo.c" +#line 14534 "Photo.c" } else { #line 1747 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -13880,163 +14540,142 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { g_clear_error (&_inner_error_); #line 1747 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13882 "Photo.c" +#line 14542 "Photo.c" } } } -static PhotoFileFormat photo_real_get_preferred_thumbnail_format (ThumbnailSource* base) { +static PhotoFileFormat +photo_real_get_preferred_thumbnail_format (ThumbnailSource* base) +{ Photo * self; PhotoFileFormat result = 0; PhotoFileFormat _tmp0_ = 0; - PhotoFileFormat _tmp1_; - gboolean _tmp2_; #line 1750 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 1751 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_get_file_format (self); -#line 1751 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_file_format_can_write_image (_tmp1_); -#line 1751 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_) { -#line 13902 "Photo.c" - PhotoFileFormat _tmp3_; -#line 1751 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_get_file_format (self); + if (photo_file_format_can_write_image (photo_get_file_format (self))) { #line 1751 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp3_; -#line 13908 "Photo.c" + _tmp0_ = photo_get_file_format (self); +#line 14560 "Photo.c" } else { - PhotoFileFormat _tmp4_; -#line 1752 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_file_format_get_system_default_format (); #line 1752 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp4_; -#line 13915 "Photo.c" + _tmp0_ = photo_file_format_get_system_default_format (); +#line 14564 "Photo.c" } #line 1751 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 1751 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13921 "Photo.c" +#line 14570 "Photo.c" } -static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error) { +static GdkPixbuf* +photo_real_create_thumbnail (ThumbnailSource* base, + gint scale, + GError** error) +{ Photo * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; - gint _tmp1_; - Scaling _tmp2_ = {0}; + Scaling _tmp1_ = {0}; + GdkPixbuf* _tmp2_; GdkPixbuf* _tmp3_; - GdkPixbuf* _tmp4_; GError * _inner_error_ = NULL; #line 1755 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = scale; + scaling_for_best_fit (scale, TRUE, &_tmp1_); #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" - scaling_for_best_fit (_tmp1_, TRUE, &_tmp2_); + _tmp2_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp1_, &_inner_error_); #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp2_, &_inner_error_); -#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp3_; + _tmp0_ = _tmp2_; #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 13950 "Photo.c" +#line 14600 "Photo.c" } #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp0_; + _tmp3_ = _tmp0_; #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp4_; + result = _tmp3_; #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13962 "Photo.c" +#line 14612 "Photo.c" } -gboolean photo_is_file_image (GFile* file) { +gboolean +photo_is_file_image (GFile* file) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; - GFile* _tmp1_; - gboolean _tmp2_; #line 1759 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 1763 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = file; -#line 1763 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_file_format_is_file_supported (_tmp1_); -#line 1763 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_) { + if (photo_file_format_is_file_supported (file)) { #line 1764 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = TRUE; -#line 13981 "Photo.c" +#line 14627 "Photo.c" } else { - GFile* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - gboolean _tmp6_; -#line 1764 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = file; -#line 1764 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = g_file_get_basename (_tmp3_); + gchar* _tmp1_; + gchar* _tmp2_; #line 1764 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + _tmp1_ = g_file_get_basename (file); #line 1764 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_is_extension_found (_tmp5_, PHOTO_IMAGE_EXTENSIONS, G_N_ELEMENTS (PHOTO_IMAGE_EXTENSIONS)); + _tmp2_ = _tmp1_; #line 1764 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp6_; + _tmp0_ = photo_is_extension_found (_tmp2_, PHOTO_IMAGE_EXTENSIONS, G_N_ELEMENTS (PHOTO_IMAGE_EXTENSIONS)); #line 1764 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp5_); -#line 13999 "Photo.c" + _g_free0 (_tmp2_); +#line 14639 "Photo.c" } #line 1763 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 1763 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14005 "Photo.c" +#line 14645 "Photo.c" } -static gboolean photo_is_extension_found (const gchar* basename, gchar** extensions, int extensions_length1) { +static gboolean +photo_is_extension_found (const gchar* basename, + gchar** extensions, + int extensions_length1) +{ gboolean result = FALSE; gchar* name = NULL; gchar* ext = NULL; - const gchar* _tmp0_; + gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; - gchar** _tmp6_; - gint _tmp6__length1; + gchar* _tmp4_; #line 1767 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (basename != NULL, FALSE); #line 1769 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = basename; -#line 1769 "/home/jens/Source/shotwell/src/Photo.vala" - disassemble_filename (_tmp0_, &_tmp1_, &_tmp2_); + disassemble_filename (basename, &_tmp0_, &_tmp1_); #line 1769 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); #line 1769 "/home/jens/Source/shotwell/src/Photo.vala" - name = _tmp1_; + name = _tmp0_; #line 1769 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); #line 1769 "/home/jens/Source/shotwell/src/Photo.vala" - ext = _tmp2_; + ext = _tmp1_; #line 1770 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = ext; + _tmp2_ = ext; #line 1770 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 1771 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 1771 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14045,49 +14684,45 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi _g_free0 (name); #line 1771 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14047 "Photo.c" +#line 14686 "Photo.c" } #line 1774 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = ext; + _tmp3_ = ext; #line 1774 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = g_utf8_strdown (_tmp4_, (gssize) -1); + _tmp4_ = g_utf8_strdown (_tmp3_, (gssize) -1); #line 1774 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); #line 1774 "/home/jens/Source/shotwell/src/Photo.vala" - ext = _tmp5_; -#line 1777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = extensions; -#line 1777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6__length1 = extensions_length1; -#line 14061 "Photo.c" + ext = _tmp4_; +#line 14696 "Photo.c" { gchar** extension_collection = NULL; gint extension_collection_length1 = 0; gint _extension_collection_size_ = 0; gint extension_it = 0; #line 1777 "/home/jens/Source/shotwell/src/Photo.vala" - extension_collection = _tmp6_; + extension_collection = extensions; #line 1777 "/home/jens/Source/shotwell/src/Photo.vala" - extension_collection_length1 = _tmp6__length1; + extension_collection_length1 = extensions_length1; #line 1777 "/home/jens/Source/shotwell/src/Photo.vala" - for (extension_it = 0; extension_it < _tmp6__length1; extension_it = extension_it + 1) { -#line 14073 "Photo.c" - gchar* _tmp7_; + for (extension_it = 0; extension_it < extensions_length1; extension_it = extension_it + 1) { +#line 14708 "Photo.c" + gchar* _tmp5_; gchar* extension = NULL; #line 1777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = g_strdup (extension_collection[extension_it]); + _tmp5_ = g_strdup (extension_collection[extension_it]); #line 1777 "/home/jens/Source/shotwell/src/Photo.vala" - extension = _tmp7_; -#line 14080 "Photo.c" + extension = _tmp5_; +#line 14715 "Photo.c" { - const gchar* _tmp8_; - const gchar* _tmp9_; + const gchar* _tmp6_; + const gchar* _tmp7_; #line 1778 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = ext; + _tmp6_ = ext; #line 1778 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = extension; + _tmp7_ = extension; #line 1778 "/home/jens/Source/shotwell/src/Photo.vala" - if (g_strcmp0 (_tmp8_, _tmp9_) == 0) { + if (g_strcmp0 (_tmp6_, _tmp7_) == 0) { #line 1779 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 1779 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14098,11 +14733,11 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi _g_free0 (name); #line 1779 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14100 "Photo.c" +#line 14735 "Photo.c" } #line 1777 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (extension); -#line 14104 "Photo.c" +#line 14739 "Photo.c" } } } @@ -14114,20 +14749,20 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi _g_free0 (name); #line 1782 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14116 "Photo.c" +#line 14751 "Photo.c" } -gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format) { +gboolean +photo_is_duplicate (GFile* file, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format) +{ gboolean result = FALSE; PhotoTable* _tmp0_; PhotoTable* _tmp1_; - GFile* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - PhotoFileFormat _tmp5_; - gboolean _tmp6_; - gboolean _tmp7_; + gboolean _tmp2_; #line 1788 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE); #line 1791 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14135,41 +14770,33 @@ gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gcha #line 1791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 1791 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = file; -#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = thumbnail_md5; -#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = full_md5; -#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = file_format; -#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_table_has_duplicate (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_); -#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_; + _tmp2_ = photo_table_has_duplicate (_tmp1_, file, thumbnail_md5, full_md5, file_format); #line 1791 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); #line 1791 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp7_; + result = _tmp2_; #line 1791 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14154 "Photo.c" +#line 14779 "Photo.c" } -PhotoID* photo_get_duplicate_ids (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, int* result_length1) { +PhotoID* +photo_get_duplicate_ids (GFile* file, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format, + int* result_length1) +{ PhotoID* result = NULL; PhotoTable* _tmp0_; PhotoTable* _tmp1_; - GFile* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - PhotoFileFormat _tmp5_; - gint _tmp6_; - PhotoID* _tmp7_; - PhotoID* _tmp8_; - gint _tmp8__length1; - PhotoID* _tmp9_; - gint _tmp9__length1; + gint _tmp2_; + PhotoID* _tmp3_; + PhotoID* _tmp4_; + gint _tmp4__length1; + PhotoID* _tmp5_; + gint _tmp5__length1; #line 1797 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL); #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14177,61 +14804,54 @@ PhotoID* photo_get_duplicate_ids (GFile* file, const gchar* thumbnail_md5, const #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = file; -#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = thumbnail_md5; + _tmp3_ = photo_table_get_duplicate_ids (_tmp1_, file, thumbnail_md5, full_md5, file_format, &_tmp2_); #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = full_md5; -#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = file_format; -#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo_table_get_duplicate_ids (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_, &_tmp6_); -#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_; + _tmp4_ = _tmp3_; #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8__length1 = _tmp6_; + _tmp4__length1 = _tmp2_; #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; + _tmp5_ = _tmp4_; #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9__length1 = _tmp8__length1; + _tmp5__length1 = _tmp4__length1; #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" if (result_length1) { #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - *result_length1 = _tmp9__length1; -#line 14202 "Photo.c" + *result_length1 = _tmp5__length1; +#line 14821 "Photo.c" } #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp9_; + result = _tmp5_; #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14208 "Photo.c" +#line 14827 "Photo.c" } -gint64 photo_get_photo_key (DataSource* source) { +gint64 +photo_get_photo_key (DataSource* source) +{ gint64 result = 0LL; - DataSource* _tmp0_; - PhotoID _tmp1_ = {0}; - gint64 _tmp2_; + PhotoID _tmp0_ = {0}; + gint64 _tmp1_; #line 1807 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL); #line 1808 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = source; + photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_PHOTO, Photo), &_tmp0_); #line 1808 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_PHOTO, Photo), &_tmp1_); -#line 1808 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = _tmp1_.id; + _tmp1_ = _tmp0_.id; #line 1808 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp2_; + result = _tmp1_; #line 1808 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14229 "Photo.c" +#line 14847 "Photo.c" } -static GFile* photo_real_get_file (MediaSource* base) { +static GFile* +photo_real_get_file (MediaSource* base) +{ Photo * self; GFile* result = NULL; PhotoFileReader* _tmp0_; @@ -14254,99 +14874,119 @@ static GFile* photo_real_get_file (MediaSource* base) { result = _tmp3_; #line 1827 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14256 "Photo.c" +#line 14876 "Photo.c" } -static void _vala_array_add100 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add100 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14267 "Photo.c" +#line 14892 "Photo.c" } #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14273 "Photo.c" +#line 14898 "Photo.c" } -static void _vala_array_add101 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add101 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1875 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1875 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1875 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14284 "Photo.c" +#line 14914 "Photo.c" } #line 1875 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1875 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14290 "Photo.c" +#line 14920 "Photo.c" } -static void _vala_array_add102 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add102 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14301 "Photo.c" +#line 14936 "Photo.c" } #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14307 "Photo.c" +#line 14942 "Photo.c" } -static void _vala_array_add103 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add103 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14318 "Photo.c" +#line 14958 "Photo.c" } #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14324 "Photo.c" +#line 14964 "Photo.c" } -void photo_set_master_file (Photo* self, GFile* file) { +void +photo_set_master_file (Photo* self, + GFile* file) +{ gchar* filepath = NULL; - GFile* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; gboolean altered = FALSE; gboolean is_baseline = FALSE; gboolean is_source = FALSE; gboolean name_changed = FALSE; GFile* old_file = NULL; - gboolean _tmp41_; + gboolean _tmp33_; GError * _inner_error_ = NULL; #line 1832 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 1832 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE (file)); #line 1833 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file; + _tmp0_ = g_file_get_path (file); #line 1833 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = g_file_get_path (_tmp0_); -#line 1833 "/home/jens/Source/shotwell/src/Photo.vala" - filepath = _tmp1_; + filepath = _tmp0_; #line 1835 "/home/jens/Source/shotwell/src/Photo.vala" altered = FALSE; #line 1836 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14357,208 +14997,187 @@ void photo_set_master_file (Photo* self, GFile* file) { name_changed = FALSE; #line 1839 "/home/jens/Source/shotwell/src/Photo.vala" old_file = NULL; -#line 14359 "Photo.c" +#line 14999 "Photo.c" { { - PhotoRow* _tmp2_; + PhotoRow* _tmp1_; #line 1841 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = self->row; + _tmp1_ = self->row; #line 1841 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 14367 "Photo.c" +#line 15007 "Photo.c" { { - PhotoBackingReaders* _tmp3_; + PhotoBackingReaders* _tmp2_; #line 1842 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->priv->readers; + _tmp2_ = self->priv->readers; #line 1842 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 14375 "Photo.c" +#line 15015 "Photo.c" { - PhotoBackingReaders* _tmp4_; - PhotoFileReader* _tmp5_; + PhotoBackingReaders* _tmp3_; + PhotoFileReader* _tmp4_; + GFile* _tmp5_; GFile* _tmp6_; - GFile* _tmp7_; - GFile* _tmp8_; - gboolean _tmp9_; #line 1843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->priv->readers; + _tmp3_ = self->priv->readers; #line 1843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_->master; + _tmp4_ = _tmp3_->master; #line 1843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp5_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 1843 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); #line 1843 "/home/jens/Source/shotwell/src/Photo.vala" - old_file = _tmp6_; + old_file = _tmp5_; #line 1844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = file; + _tmp6_ = old_file; #line 1844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = old_file; -#line 1844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = g_file_equal (_tmp7_, _tmp8_); -#line 1844 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp9_) { -#line 14401 "Photo.c" - PhotoTable* _tmp10_; - PhotoTable* _tmp11_; - PhotoID _tmp12_ = {0}; + if (!g_file_equal (file, _tmp6_)) { +#line 15035 "Photo.c" + PhotoTable* _tmp7_; + PhotoTable* _tmp8_; + PhotoID _tmp9_ = {0}; + const gchar* _tmp10_; + PhotoRow* _tmp11_; + BackingPhotoRow* _tmp12_; const gchar* _tmp13_; - PhotoRow* _tmp14_; - BackingPhotoRow* _tmp15_; - const gchar* _tmp16_; - gchar* _tmp17_; - GFile* _tmp18_; - gchar* _tmp19_; - PhotoBackingReaders* _tmp20_; - PhotoRow* _tmp21_; - BackingPhotoRow* _tmp22_; - PhotoFileFormat _tmp23_; + gchar* _tmp14_; + gchar* _tmp15_; + PhotoBackingReaders* _tmp16_; + PhotoRow* _tmp17_; + BackingPhotoRow* _tmp18_; + PhotoFileFormat _tmp19_; + const gchar* _tmp20_; + PhotoFileReader* _tmp21_; + gboolean _tmp22_ = FALSE; + PhotoRow* _tmp23_; const gchar* _tmp24_; - PhotoFileReader* _tmp25_; - gboolean _tmp26_; - gboolean _tmp27_; - gboolean _tmp28_ = FALSE; - PhotoRow* _tmp29_; - const gchar* _tmp30_; - gboolean _tmp31_; #line 1845 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_table_get_instance (); + _tmp7_ = photo_table_get_instance (); #line 1845 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 1845 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (self, &_tmp12_); + photo_get_photo_id (self, &_tmp9_); #line 1845 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = filepath; + _tmp10_ = filepath; #line 1845 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_set_filepath (_tmp11_, &_tmp12_, _tmp13_, &_inner_error_); + photo_table_set_filepath (_tmp8_, &_tmp9_, _tmp10_, &_inner_error_); #line 1845 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp11_); + _database_table_unref0 (_tmp8_); #line 1845 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14438 "Photo.c" +#line 15068 "Photo.c" goto __finally326; } #line 1847 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->row; + _tmp11_ = self->row; #line 1847 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_->master; + _tmp12_ = _tmp11_->master; #line 1847 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = filepath; + _tmp13_ = filepath; #line 1847 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = g_strdup (_tmp16_); + _tmp14_ = g_strdup (_tmp13_); #line 1847 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp15_->filepath); + _g_free0 (_tmp12_->filepath); #line 1847 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_->filepath = _tmp17_; -#line 1848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = file; + _tmp12_->filepath = _tmp14_; #line 1848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = g_file_get_basename (_tmp18_); + _tmp15_ = g_file_get_basename (file); #line 1848 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (self->priv->file_title); #line 1848 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->file_title = _tmp19_; + self->priv->file_title = _tmp15_; #line 1849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = self->priv->readers; + _tmp16_ = self->priv->readers; #line 1849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = self->row; + _tmp17_ = self->row; #line 1849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_->master; + _tmp18_ = _tmp17_->master; #line 1849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _tmp22_->file_format; + _tmp19_ = _tmp18_->file_format; #line 1849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = filepath; + _tmp20_ = filepath; #line 1849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = photo_file_format_create_reader (_tmp23_, _tmp24_); + _tmp21_ = photo_file_format_create_reader (_tmp19_, _tmp20_); #line 1849 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp20_->master); + _photo_file_adapter_unref0 (_tmp16_->master); #line 1849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_->master = _tmp25_; + _tmp16_->master = _tmp21_; #line 1851 "/home/jens/Source/shotwell/src/Photo.vala" altered = TRUE; #line 1852 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = photo_is_master_baseline (self); -#line 1852 "/home/jens/Source/shotwell/src/Photo.vala" - is_baseline = _tmp26_; -#line 1853 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = photo_is_master_source (self); + is_baseline = photo_is_master_baseline (self); #line 1853 "/home/jens/Source/shotwell/src/Photo.vala" - is_source = _tmp27_; + is_source = photo_is_master_source (self); #line 1854 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = self->row; + _tmp23_ = self->row; #line 1854 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _tmp29_->title; + _tmp24_ = _tmp23_->title; #line 1854 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = is_string_empty (_tmp30_); -#line 1854 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp31_) { -#line 14495 "Photo.c" - GFile* _tmp32_; - gchar* _tmp33_; - gchar* _tmp34_; - GFile* _tmp35_; - gchar* _tmp36_; - gchar* _tmp37_; -#line 1855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = old_file; + if (is_string_empty (_tmp24_)) { +#line 15117 "Photo.c" + GFile* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; #line 1855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = g_file_get_basename (_tmp32_); + _tmp25_ = old_file; #line 1855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp33_; + _tmp26_ = g_file_get_basename (_tmp25_); #line 1855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = file; + _tmp27_ = _tmp26_; #line 1855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = g_file_get_basename (_tmp35_); + _tmp28_ = g_file_get_basename (file); #line 1855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tmp36_; + _tmp29_ = _tmp28_; #line 1855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = g_strcmp0 (_tmp34_, _tmp37_) != 0; + _tmp22_ = g_strcmp0 (_tmp27_, _tmp29_) != 0; #line 1855 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp37_); + _g_free0 (_tmp29_); #line 1855 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp34_); -#line 14520 "Photo.c" + _g_free0 (_tmp27_); +#line 15139 "Photo.c" } else { #line 1854 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = FALSE; -#line 14524 "Photo.c" + _tmp22_ = FALSE; +#line 15143 "Photo.c" } #line 1854 "/home/jens/Source/shotwell/src/Photo.vala" - name_changed = _tmp28_; -#line 14528 "Photo.c" + name_changed = _tmp22_; +#line 15147 "Photo.c" } } __finally326: { - PhotoBackingReaders* _tmp38_; + PhotoBackingReaders* _tmp30_; #line 1842 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = self->priv->readers; + _tmp30_ = self->priv->readers; #line 1842 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 14538 "Photo.c" +#line 15157 "Photo.c" } #line 1842 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14542 "Photo.c" +#line 15161 "Photo.c" goto __finally325; } } } __finally325: { - PhotoRow* _tmp39_; + PhotoRow* _tmp31_; #line 1841 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = self->row; + _tmp31_ = self->row; #line 1841 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 14554 "Photo.c" +#line 15173 "Photo.c" } #line 1841 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1841 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 14560 "Photo.c" +#line 15179 "Photo.c" goto __catch324_database_error; } #line 1841 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14571,7 +15190,7 @@ void photo_set_master_file (Photo* self, GFile* file) { g_clear_error (&_inner_error_); #line 1841 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 14573 "Photo.c" +#line 15192 "Photo.c" } } } @@ -14579,18 +15198,18 @@ void photo_set_master_file (Photo* self, GFile* file) { __catch324_database_error: { GError* err = NULL; - GError* _tmp40_; + GError* _tmp32_; #line 1840 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 1840 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 1860 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = err; + _tmp32_ = err; #line 1860 "/home/jens/Source/shotwell/src/Photo.vala" - app_window_database_error (_tmp40_); + app_window_database_error (_tmp32_); #line 1840 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 14592 "Photo.c" +#line 15211 "Photo.c" } __finally324: #line 1840 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14605,209 +15224,221 @@ void photo_set_master_file (Photo* self, GFile* file) { g_clear_error (&_inner_error_); #line 1840 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 14607 "Photo.c" +#line 15226 "Photo.c" } #line 1863 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = altered; + _tmp33_ = altered; #line 1863 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp41_) { -#line 14613 "Photo.c" - GFile* _tmp42_; - GFile* _tmp43_; - gboolean _tmp44_; + if (_tmp33_) { +#line 15232 "Photo.c" + GFile* _tmp34_; + gboolean _tmp35_; gchar** alteration_list = NULL; - gchar** _tmp45_; + gchar** _tmp36_; gint alteration_list_length1; gint _alteration_list_size_; - gchar** _tmp46_; - gint _tmp46__length1; - gchar* _tmp47_; - gboolean _tmp48_; - gboolean _tmp51_; - gboolean _tmp54_; - gchar** _tmp57_; - gint _tmp57__length1; - Alteration* _tmp58_; - Alteration* _tmp59_; -#line 1864 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = old_file; + gchar** _tmp37_; + gint _tmp37__length1; + gchar* _tmp38_; + gboolean _tmp39_; + gboolean _tmp42_; + gboolean _tmp45_; + gchar** _tmp48_; + gint _tmp48__length1; + Alteration* _tmp49_; + Alteration* _tmp50_; #line 1864 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = file; + _tmp34_ = old_file; #line 1864 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_notify_master_replaced (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp42_, _tmp43_); + media_source_notify_master_replaced (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp34_, file); #line 1866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = is_baseline; + _tmp35_ = is_baseline; #line 1866 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp44_) { + if (_tmp35_) { #line 1867 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_replaced (self); -#line 14643 "Photo.c" +#line 15259 "Photo.c" } #line 1869 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = g_new0 (gchar*, 0 + 1); + _tmp36_ = g_new0 (gchar*, 0 + 1); #line 1869 "/home/jens/Source/shotwell/src/Photo.vala" - alteration_list = _tmp45_; + alteration_list = _tmp36_; #line 1869 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list_length1 = 0; #line 1869 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_list_size_ = alteration_list_length1; #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = alteration_list; + _tmp37_ = alteration_list; #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46__length1 = alteration_list_length1; + _tmp37__length1 = alteration_list_length1; #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = g_strdup ("backing:master"); + _tmp38_ = g_strdup ("backing:master"); #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add100 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp47_); + _vala_array_add100 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp38_); #line 1874 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = name_changed; + _tmp39_ = name_changed; #line 1874 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp48_) { -#line 14665 "Photo.c" - gchar** _tmp49_; - gint _tmp49__length1; - gchar* _tmp50_; + if (_tmp39_) { +#line 15281 "Photo.c" + gchar** _tmp40_; + gint _tmp40__length1; + gchar* _tmp41_; #line 1875 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = alteration_list; + _tmp40_ = alteration_list; #line 1875 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49__length1 = alteration_list_length1; + _tmp40__length1 = alteration_list_length1; #line 1875 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = g_strdup ("metadata:name"); + _tmp41_ = g_strdup ("metadata:name"); #line 1875 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add101 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp50_); -#line 14677 "Photo.c" + _vala_array_add101 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp41_); +#line 15293 "Photo.c" } #line 1877 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = is_source; + _tmp42_ = is_source; #line 1877 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp51_) { -#line 14683 "Photo.c" - gchar** _tmp52_; - gint _tmp52__length1; - gchar* _tmp53_; + if (_tmp42_) { +#line 15299 "Photo.c" + gchar** _tmp43_; + gint _tmp43__length1; + gchar* _tmp44_; #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = alteration_list; + _tmp43_ = alteration_list; #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52__length1 = alteration_list_length1; + _tmp43__length1 = alteration_list_length1; #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = g_strdup ("backing:source"); + _tmp44_ = g_strdup ("backing:source"); #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add102 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp53_); -#line 14695 "Photo.c" + _vala_array_add102 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp44_); +#line 15311 "Photo.c" } #line 1880 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = is_baseline; + _tmp45_ = is_baseline; #line 1880 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp54_) { -#line 14701 "Photo.c" - gchar** _tmp55_; - gint _tmp55__length1; - gchar* _tmp56_; + if (_tmp45_) { +#line 15317 "Photo.c" + gchar** _tmp46_; + gint _tmp46__length1; + gchar* _tmp47_; #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = alteration_list; + _tmp46_ = alteration_list; #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55__length1 = alteration_list_length1; + _tmp46__length1 = alteration_list_length1; #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = g_strdup ("backing:baseline"); + _tmp47_ = g_strdup ("backing:baseline"); #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add103 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp56_); -#line 14713 "Photo.c" + _vala_array_add103 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp47_); +#line 15329 "Photo.c" } #line 1883 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = alteration_list; + _tmp48_ = alteration_list; #line 1883 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57__length1 = alteration_list_length1; + _tmp48__length1 = alteration_list_length1; #line 1883 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = alteration_new_from_array (_tmp57_, _tmp57__length1); + _tmp49_ = alteration_new_from_array (_tmp48_, _tmp48__length1); #line 1883 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = _tmp58_; + _tmp50_ = _tmp49_; #line 1883 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp59_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp50_); #line 1883 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp59_); + _alteration_unref0 (_tmp50_); #line 1863 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL); -#line 14729 "Photo.c" +#line 15345 "Photo.c" } #line 1832 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); #line 1832 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (filepath); -#line 14735 "Photo.c" +#line 15351 "Photo.c" } -static void _vala_array_add104 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add104 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1923 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1923 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1923 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14746 "Photo.c" +#line 15367 "Photo.c" } #line 1923 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1923 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14752 "Photo.c" +#line 15373 "Photo.c" } -static void _vala_array_add105 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add105 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1926 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1926 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1926 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14763 "Photo.c" +#line 15389 "Photo.c" } #line 1926 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1926 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14769 "Photo.c" +#line 15395 "Photo.c" } -static void _vala_array_add106 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add106 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1929 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1929 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1929 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14780 "Photo.c" +#line 15411 "Photo.c" } #line 1929 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1929 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14786 "Photo.c" +#line 15417 "Photo.c" } -void photo_set_editable_file (Photo* self, GFile* file) { +void +photo_set_editable_file (Photo* self, + GFile* file) +{ gchar* filepath = NULL; - GFile* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; gboolean altered = FALSE; gboolean is_baseline = FALSE; gboolean is_source = FALSE; GFile* old_file = NULL; - gboolean _tmp34_; + gboolean _tmp29_; GError * _inner_error_ = NULL; #line 1889 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 1889 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE (file)); #line 1890 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file; -#line 1890 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = g_file_get_path (_tmp0_); + _tmp0_ = g_file_get_path (file); #line 1890 "/home/jens/Source/shotwell/src/Photo.vala" - filepath = _tmp1_; + filepath = _tmp0_; #line 1892 "/home/jens/Source/shotwell/src/Photo.vala" altered = FALSE; #line 1893 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14816,195 +15447,183 @@ void photo_set_editable_file (Photo* self, GFile* file) { is_source = FALSE; #line 1895 "/home/jens/Source/shotwell/src/Photo.vala" old_file = NULL; -#line 14818 "Photo.c" +#line 15449 "Photo.c" { { - PhotoRow* _tmp2_; + PhotoRow* _tmp1_; #line 1897 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = self->row; + _tmp1_ = self->row; #line 1897 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 14826 "Photo.c" +#line 15457 "Photo.c" { { - PhotoBackingReaders* _tmp3_; + PhotoBackingReaders* _tmp2_; #line 1898 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->priv->readers; + _tmp2_ = self->priv->readers; #line 1898 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 14834 "Photo.c" +#line 15465 "Photo.c" { - GFile* _tmp4_ = NULL; - PhotoBackingReaders* _tmp5_; - PhotoFileReader* _tmp6_; - GFile* _tmp10_; - gboolean _tmp11_ = FALSE; - GFile* _tmp12_; + GFile* _tmp3_ = NULL; + PhotoBackingReaders* _tmp4_; + PhotoFileReader* _tmp5_; + GFile* _tmp9_; + gboolean _tmp10_ = FALSE; + GFile* _tmp11_; #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->priv->readers; + _tmp4_ = self->priv->readers; #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_->editable; + _tmp5_ = _tmp4_->editable; #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_ != NULL) { -#line 14848 "Photo.c" - PhotoBackingReaders* _tmp7_; - PhotoFileReader* _tmp8_; - GFile* _tmp9_; + if (_tmp5_ != NULL) { +#line 15479 "Photo.c" + PhotoBackingReaders* _tmp6_; + PhotoFileReader* _tmp7_; + GFile* _tmp8_; #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->priv->readers; + _tmp6_ = self->priv->readers; #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_->editable; + _tmp7_ = _tmp6_->editable; #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp8_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp9_; -#line 14862 "Photo.c" + _tmp3_ = _tmp8_; +#line 15493 "Photo.c" } else { #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = NULL; -#line 14868 "Photo.c" + _tmp3_ = NULL; +#line 15499 "Photo.c" } #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _g_object_ref0 (_tmp4_); + _tmp9_ = _g_object_ref0 (_tmp3_); #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - old_file = _tmp10_; -#line 1900 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = old_file; -#line 1900 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_ != NULL) { -#line 14880 "Photo.c" - GFile* _tmp13_; - GFile* _tmp14_; - gboolean _tmp15_; + old_file = _tmp9_; #line 1900 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = old_file; + _tmp11_ = old_file; #line 1900 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = file; + if (_tmp11_ != NULL) { +#line 15511 "Photo.c" + GFile* _tmp12_; #line 1900 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = g_file_equal (_tmp13_, _tmp14_); + _tmp12_ = old_file; #line 1900 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = !_tmp15_; -#line 14892 "Photo.c" + _tmp10_ = !g_file_equal (_tmp12_, file); +#line 15517 "Photo.c" } else { #line 1900 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = FALSE; -#line 14896 "Photo.c" + _tmp10_ = FALSE; +#line 15521 "Photo.c" } #line 1900 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 14900 "Photo.c" - BackingPhotoTable* _tmp16_; - BackingPhotoTable* _tmp17_; - PhotoRow* _tmp18_; - BackingPhotoID _tmp19_; - const gchar* _tmp20_; - BackingPhotoRow* _tmp21_; - const gchar* _tmp22_; - gchar* _tmp23_; - PhotoBackingReaders* _tmp24_; - BackingPhotoRow* _tmp25_; - PhotoFileFormat _tmp26_; - const gchar* _tmp27_; - PhotoFileReader* _tmp28_; - gboolean _tmp29_; - gboolean _tmp30_; + if (_tmp10_) { +#line 15525 "Photo.c" + BackingPhotoTable* _tmp13_; + BackingPhotoTable* _tmp14_; + PhotoRow* _tmp15_; + BackingPhotoID _tmp16_; + const gchar* _tmp17_; + BackingPhotoRow* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_; + PhotoBackingReaders* _tmp21_; + BackingPhotoRow* _tmp22_; + PhotoFileFormat _tmp23_; + const gchar* _tmp24_; + PhotoFileReader* _tmp25_; #line 1901 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = backing_photo_table_get_instance (); + _tmp13_ = backing_photo_table_get_instance (); #line 1901 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_; + _tmp14_ = _tmp13_; #line 1901 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->row; + _tmp15_ = self->row; #line 1901 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_->editable_id; + _tmp16_ = _tmp15_->editable_id; #line 1901 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = filepath; + _tmp17_ = filepath; #line 1901 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_set_filepath (_tmp17_, &_tmp19_, _tmp20_, &_inner_error_); + backing_photo_table_set_filepath (_tmp14_, &_tmp16_, _tmp17_, &_inner_error_); #line 1901 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp17_); + _database_table_unref0 (_tmp14_); #line 1901 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1901 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp4_); -#line 14934 "Photo.c" + _g_object_unref0 (_tmp3_); +#line 15557 "Photo.c" goto __finally329; } #line 1903 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = self->priv->editable; + _tmp18_ = self->priv->editable; #line 1903 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = filepath; + _tmp19_ = filepath; #line 1903 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = g_strdup (_tmp22_); + _tmp20_ = g_strdup (_tmp19_); #line 1903 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp21_->filepath); + _g_free0 (_tmp18_->filepath); #line 1903 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_->filepath = _tmp23_; + _tmp18_->filepath = _tmp20_; #line 1904 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = self->priv->readers; + _tmp21_ = self->priv->readers; #line 1904 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = self->priv->editable; + _tmp22_ = self->priv->editable; #line 1904 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp25_->file_format; + _tmp23_ = _tmp22_->file_format; #line 1904 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = filepath; + _tmp24_ = filepath; #line 1904 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = photo_file_format_create_reader (_tmp26_, _tmp27_); + _tmp25_ = photo_file_format_create_reader (_tmp23_, _tmp24_); #line 1904 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp24_->editable); + _photo_file_adapter_unref0 (_tmp21_->editable); #line 1904 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_->editable = _tmp28_; + _tmp21_->editable = _tmp25_; #line 1906 "/home/jens/Source/shotwell/src/Photo.vala" altered = TRUE; #line 1907 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = photo_is_editable_baseline (self); -#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" - is_baseline = _tmp29_; + is_baseline = photo_is_editable_baseline (self); #line 1908 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = photo_is_editable_source (self); -#line 1908 "/home/jens/Source/shotwell/src/Photo.vala" - is_source = _tmp30_; -#line 14971 "Photo.c" + is_source = photo_is_editable_source (self); +#line 15590 "Photo.c" } #line 1898 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp4_); -#line 14975 "Photo.c" + _g_object_unref0 (_tmp3_); +#line 15594 "Photo.c" } __finally329: { - PhotoBackingReaders* _tmp31_; + PhotoBackingReaders* _tmp26_; #line 1898 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = self->priv->readers; + _tmp26_ = self->priv->readers; #line 1898 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 14984 "Photo.c" +#line 15603 "Photo.c" } #line 1898 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14988 "Photo.c" +#line 15607 "Photo.c" goto __finally328; } } } __finally328: { - PhotoRow* _tmp32_; + PhotoRow* _tmp27_; #line 1897 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = self->row; + _tmp27_ = self->row; #line 1897 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15000 "Photo.c" +#line 15619 "Photo.c" } #line 1897 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1897 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 15006 "Photo.c" +#line 15625 "Photo.c" goto __catch327_database_error; } #line 1897 "/home/jens/Source/shotwell/src/Photo.vala" @@ -15017,7 +15636,7 @@ void photo_set_editable_file (Photo* self, GFile* file) { g_clear_error (&_inner_error_); #line 1897 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15019 "Photo.c" +#line 15638 "Photo.c" } } } @@ -15025,18 +15644,18 @@ void photo_set_editable_file (Photo* self, GFile* file) { __catch327_database_error: { GError* err = NULL; - GError* _tmp33_; + GError* _tmp28_; #line 1896 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 1896 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 1913 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = err; + _tmp28_ = err; #line 1913 "/home/jens/Source/shotwell/src/Photo.vala" - app_window_database_error (_tmp33_); + app_window_database_error (_tmp28_); #line 1896 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 15038 "Photo.c" +#line 15657 "Photo.c" } __finally327: #line 1896 "/home/jens/Source/shotwell/src/Photo.vala" @@ -15051,174 +15670,168 @@ void photo_set_editable_file (Photo* self, GFile* file) { g_clear_error (&_inner_error_); #line 1896 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15053 "Photo.c" +#line 15672 "Photo.c" } #line 1916 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = altered; + _tmp29_ = altered; #line 1916 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp34_) { -#line 15059 "Photo.c" - GFile* _tmp35_; - GFile* _tmp36_; - gboolean _tmp37_; + if (_tmp29_) { +#line 15678 "Photo.c" + GFile* _tmp30_; + gboolean _tmp31_; gchar** alteration_list = NULL; - gchar** _tmp38_; + gchar** _tmp32_; gint alteration_list_length1; gint _alteration_list_size_; - gchar** _tmp39_; - gint _tmp39__length1; - gchar* _tmp40_; - gboolean _tmp41_; - gboolean _tmp44_; - gchar** _tmp47_; - gint _tmp47__length1; - Alteration* _tmp48_; - Alteration* _tmp49_; -#line 1917 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = old_file; + gchar** _tmp33_; + gint _tmp33__length1; + gchar* _tmp34_; + gboolean _tmp35_; + gboolean _tmp38_; + gchar** _tmp41_; + gint _tmp41__length1; + Alteration* _tmp42_; + Alteration* _tmp43_; #line 1917 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = file; + _tmp30_ = old_file; #line 1917 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_editable_replaced (self, _tmp35_, _tmp36_); + photo_notify_editable_replaced (self, _tmp30_, file); #line 1919 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = is_baseline; + _tmp31_ = is_baseline; #line 1919 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp37_) { + if (_tmp31_) { #line 1920 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_replaced (self); -#line 15088 "Photo.c" +#line 15704 "Photo.c" } #line 1922 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = g_new0 (gchar*, 0 + 1); + _tmp32_ = g_new0 (gchar*, 0 + 1); #line 1922 "/home/jens/Source/shotwell/src/Photo.vala" - alteration_list = _tmp38_; + alteration_list = _tmp32_; #line 1922 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list_length1 = 0; #line 1922 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_list_size_ = alteration_list_length1; #line 1923 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = alteration_list; + _tmp33_ = alteration_list; #line 1923 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39__length1 = alteration_list_length1; + _tmp33__length1 = alteration_list_length1; #line 1923 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = g_strdup ("backing:editable"); + _tmp34_ = g_strdup ("backing:editable"); #line 1923 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add104 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp40_); + _vala_array_add104 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp34_); #line 1925 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = is_baseline; + _tmp35_ = is_baseline; #line 1925 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp41_) { -#line 15110 "Photo.c" - gchar** _tmp42_; - gint _tmp42__length1; - gchar* _tmp43_; + if (_tmp35_) { +#line 15726 "Photo.c" + gchar** _tmp36_; + gint _tmp36__length1; + gchar* _tmp37_; #line 1926 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = alteration_list; + _tmp36_ = alteration_list; #line 1926 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42__length1 = alteration_list_length1; + _tmp36__length1 = alteration_list_length1; #line 1926 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = g_strdup ("backing:baseline"); + _tmp37_ = g_strdup ("backing:baseline"); #line 1926 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add105 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp43_); -#line 15122 "Photo.c" + _vala_array_add105 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp37_); +#line 15738 "Photo.c" } #line 1928 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = is_source; + _tmp38_ = is_source; #line 1928 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp44_) { -#line 15128 "Photo.c" - gchar** _tmp45_; - gint _tmp45__length1; - gchar* _tmp46_; + if (_tmp38_) { +#line 15744 "Photo.c" + gchar** _tmp39_; + gint _tmp39__length1; + gchar* _tmp40_; #line 1929 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = alteration_list; + _tmp39_ = alteration_list; #line 1929 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45__length1 = alteration_list_length1; + _tmp39__length1 = alteration_list_length1; #line 1929 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = g_strdup ("backing:source"); + _tmp40_ = g_strdup ("backing:source"); #line 1929 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add106 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp46_); -#line 15140 "Photo.c" + _vala_array_add106 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp40_); +#line 15756 "Photo.c" } #line 1931 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = alteration_list; + _tmp41_ = alteration_list; #line 1931 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47__length1 = alteration_list_length1; + _tmp41__length1 = alteration_list_length1; #line 1931 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = alteration_new_from_array (_tmp47_, _tmp47__length1); + _tmp42_ = alteration_new_from_array (_tmp41_, _tmp41__length1); #line 1931 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = _tmp48_; + _tmp43_ = _tmp42_; #line 1931 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp49_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp43_); #line 1931 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp49_); + _alteration_unref0 (_tmp43_); #line 1916 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL); -#line 15156 "Photo.c" +#line 15772 "Photo.c" } #line 1889 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); #line 1889 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (filepath); -#line 15162 "Photo.c" +#line 15778 "Photo.c" } -void photo_set_many_editable_file (GeeMap* map, GError** error) { +void +photo_set_many_editable_file (GeeMap* map, + GError** error) +{ GeeMapIterator* map_iter = NULL; - GeeMap* _tmp0_; - GeeMapIterator* _tmp1_; + GeeMapIterator* _tmp0_; GError * _inner_error_ = NULL; #line 1936 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_MAP (map)); #line 1937 "/home/jens/Source/shotwell/src/Photo.vala" database_table_begin_transaction (); #line 1939 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = map; -#line 1939 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = gee_map_map_iterator (_tmp0_); + _tmp0_ = gee_map_map_iterator (map); #line 1939 "/home/jens/Source/shotwell/src/Photo.vala" - map_iter = _tmp1_; + map_iter = _tmp0_; #line 1940 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 15183 "Photo.c" +#line 15799 "Photo.c" + GeeMapIterator* _tmp1_; GeeMapIterator* _tmp2_; - gboolean _tmp3_; - GeeMapIterator* _tmp4_; - gpointer _tmp5_; - Photo* _tmp6_; - GeeMapIterator* _tmp7_; - gpointer _tmp8_; - GFile* _tmp9_; -#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = map_iter; + gpointer _tmp3_; + Photo* _tmp4_; + GeeMapIterator* _tmp5_; + gpointer _tmp6_; + GFile* _tmp7_; #line 1940 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = gee_map_iterator_next (_tmp2_); + _tmp1_ = map_iter; #line 1940 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp3_) { + if (!gee_map_iterator_next (_tmp1_)) { #line 1940 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 15200 "Photo.c" +#line 15813 "Photo.c" } #line 1941 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = map_iter; + _tmp2_ = map_iter; #line 1941 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = gee_map_iterator_get_key (_tmp4_); + _tmp3_ = gee_map_iterator_get_key (_tmp2_); #line 1941 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = (Photo*) _tmp5_; + _tmp4_ = (Photo*) _tmp3_; #line 1941 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = map_iter; + _tmp5_ = map_iter; #line 1941 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = gee_map_iterator_get_value (_tmp7_); + _tmp6_ = gee_map_iterator_get_value (_tmp5_); #line 1941 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = (GFile*) _tmp8_; + _tmp7_ = (GFile*) _tmp6_; #line 1941 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_editable_file (_tmp6_, _tmp9_); + photo_set_editable_file (_tmp4_, _tmp7_); #line 1941 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp7_); #line 1941 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp6_); -#line 15220 "Photo.c" + _g_object_unref0 (_tmp4_); +#line 15833 "Photo.c" } #line 1943 "/home/jens/Source/shotwell/src/Photo.vala" database_table_commit_transaction (&_inner_error_); @@ -15232,7 +15845,7 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) { _g_object_unref0 (map_iter); #line 1943 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15234 "Photo.c" +#line 15847 "Photo.c" } else { #line 1943 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (map_iter); @@ -15242,16 +15855,18 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) { g_clear_error (&_inner_error_); #line 1943 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15244 "Photo.c" +#line 15857 "Photo.c" } } #line 1936 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (map_iter); -#line 15249 "Photo.c" +#line 15862 "Photo.c" } -GFile* photo_get_actual_file (Photo* self) { +GFile* +photo_get_actual_file (Photo* self) +{ GFile* result = NULL; PhotoFileReader* _tmp0_; PhotoFileReader* _tmp1_; @@ -15273,11 +15888,13 @@ GFile* photo_get_actual_file (Photo* self) { result = _tmp3_; #line 1949 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15275 "Photo.c" +#line 15890 "Photo.c" } -static GFile* photo_real_get_master_file (MediaSource* base) { +static GFile* +photo_real_get_master_file (MediaSource* base) +{ Photo * self; GFile* result = NULL; PhotoFileReader* _tmp0_; @@ -15300,11 +15917,13 @@ static GFile* photo_real_get_master_file (MediaSource* base) { result = _tmp3_; #line 1953 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15302 "Photo.c" +#line 15919 "Photo.c" } -GFile* photo_get_editable_file (Photo* self) { +GFile* +photo_get_editable_file (Photo* self) +{ GFile* result = NULL; PhotoFileReader* reader = NULL; PhotoFileReader* _tmp0_; @@ -15320,7 +15939,7 @@ GFile* photo_get_editable_file (Photo* self) { _tmp2_ = reader; #line 1959 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 15322 "Photo.c" +#line 15941 "Photo.c" PhotoFileReader* _tmp3_; GFile* _tmp4_; #line 1959 "/home/jens/Source/shotwell/src/Photo.vala" @@ -15331,13 +15950,13 @@ GFile* photo_get_editable_file (Photo* self) { _g_object_unref0 (_tmp1_); #line 1959 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp4_; -#line 15333 "Photo.c" +#line 15952 "Photo.c" } else { #line 1959 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); #line 1959 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 15339 "Photo.c" +#line 15958 "Photo.c" } #line 1959 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; @@ -15345,125 +15964,121 @@ GFile* photo_get_editable_file (Photo* self) { _photo_file_adapter_unref0 (reader); #line 1959 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15347 "Photo.c" +#line 15966 "Photo.c" } -GeeCollection* photo_get_raw_developer_files (Photo* self) { +GeeCollection* +photo_get_raw_developer_files (Photo* self) +{ GeeCollection* result = NULL; - PhotoFileFormat _tmp0_; GeeArrayList* ret = NULL; - GeeArrayList* _tmp1_; + GeeArrayList* _tmp0_; GError * _inner_error_ = NULL; #line 1962 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); #line 1963 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_get_master_file_format (self); -#line 1963 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) { + if (photo_get_master_file_format (self) != PHOTO_FILE_FORMAT_RAW) { #line 1964 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; #line 1964 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15367 "Photo.c" +#line 15985 "Photo.c" } #line 1966 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1966 "/home/jens/Source/shotwell/src/Photo.vala" - ret = _tmp1_; -#line 15373 "Photo.c" + ret = _tmp0_; +#line 15991 "Photo.c" { - PhotoRow* _tmp2_; + PhotoRow* _tmp1_; #line 1967 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = self->row; + _tmp1_ = self->row; #line 1967 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15380 "Photo.c" +#line 15998 "Photo.c" { { GeeIterator* _row_it = NULL; - GeeHashMap* _tmp3_; + GeeHashMap* _tmp2_; + GeeCollection* _tmp3_; GeeCollection* _tmp4_; GeeCollection* _tmp5_; - GeeCollection* _tmp6_; + GeeIterator* _tmp6_; GeeIterator* _tmp7_; - GeeIterator* _tmp8_; #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->priv->developments; + _tmp2_ = self->priv->developments; #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp3_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp5_); #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _row_it = _tmp8_; + _row_it = _tmp7_; #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 15408 "Photo.c" - GeeIterator* _tmp9_; - gboolean _tmp10_; +#line 16026 "Photo.c" + GeeIterator* _tmp8_; BackingPhotoRow* row = NULL; - GeeIterator* _tmp11_; - gpointer _tmp12_; - GeeArrayList* _tmp13_; - BackingPhotoRow* _tmp14_; - const gchar* _tmp15_; - GFile* _tmp16_; - GFile* _tmp17_; -#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _row_it; + GeeIterator* _tmp9_; + gpointer _tmp10_; + GeeArrayList* _tmp11_; + BackingPhotoRow* _tmp12_; + const gchar* _tmp13_; + GFile* _tmp14_; + GFile* _tmp15_; #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = gee_iterator_next (_tmp9_); + _tmp8_ = _row_it; #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp10_) { + if (!gee_iterator_next (_tmp8_)) { #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 15427 "Photo.c" +#line 16042 "Photo.c" } #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _row_it; + _tmp9_ = _row_it; #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = gee_iterator_get (_tmp11_); + _tmp10_ = gee_iterator_get (_tmp9_); #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - row = (BackingPhotoRow*) _tmp12_; + row = (BackingPhotoRow*) _tmp10_; #line 1969 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = ret; + _tmp11_ = ret; #line 1969 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = row; + _tmp12_ = row; #line 1969 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_->filepath; + _tmp13_ = _tmp12_->filepath; #line 1969 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = g_file_new_for_path (_tmp15_); + _tmp14_ = g_file_new_for_path (_tmp13_); #line 1969 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_; + _tmp15_ = _tmp14_; #line 1969 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); #line 1969 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp17_); + _g_object_unref0 (_tmp15_); #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 15451 "Photo.c" +#line 16066 "Photo.c" } #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 15455 "Photo.c" +#line 16070 "Photo.c" } } __finally330: { - PhotoRow* _tmp18_; + PhotoRow* _tmp16_; #line 1967 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->row; + _tmp16_ = self->row; #line 1967 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15465 "Photo.c" +#line 16080 "Photo.c" } #line 1967 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -15475,18 +16090,20 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) { g_clear_error (&_inner_error_); #line 1967 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 15477 "Photo.c" +#line 16092 "Photo.c" } } #line 1972 "/home/jens/Source/shotwell/src/Photo.vala" result = G_TYPE_CHECK_INSTANCE_CAST (ret, GEE_TYPE_COLLECTION, GeeCollection); #line 1972 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15484 "Photo.c" +#line 16099 "Photo.c" } -GFile* photo_get_source_file (Photo* self) { +GFile* +photo_get_source_file (Photo* self) +{ GFile* result = NULL; PhotoFileReader* _tmp0_; PhotoFileReader* _tmp1_; @@ -15508,23 +16125,25 @@ GFile* photo_get_source_file (Photo* self) { result = _tmp3_; #line 1976 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15510 "Photo.c" +#line 16127 "Photo.c" } -PhotoFileFormat photo_get_file_format (Photo* self) { +PhotoFileFormat +photo_get_file_format (Photo* self) +{ PhotoFileFormat result = 0; GError * _inner_error_ = NULL; #line 1979 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 15519 "Photo.c" +#line 16138 "Photo.c" { PhotoRow* _tmp0_; #line 1980 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 1980 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15526 "Photo.c" +#line 16145 "Photo.c" { BackingPhotoRow* _tmp1_; PhotoFileFormat _tmp2_; @@ -15534,18 +16153,18 @@ PhotoFileFormat photo_get_file_format (Photo* self) { _tmp2_ = _tmp1_->file_format; #line 1981 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 15536 "Photo.c" +#line 16155 "Photo.c" { PhotoRow* _tmp3_; #line 1980 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 1980 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15543 "Photo.c" +#line 16162 "Photo.c" } #line 1981 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15547 "Photo.c" +#line 16166 "Photo.c" } __finally331: { @@ -15554,7 +16173,7 @@ PhotoFileFormat photo_get_file_format (Photo* self) { _tmp4_ = self->row; #line 1980 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15556 "Photo.c" +#line 16175 "Photo.c" } #line 1980 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -15562,91 +16181,82 @@ PhotoFileFormat photo_get_file_format (Photo* self) { g_clear_error (&_inner_error_); #line 1980 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 15564 "Photo.c" +#line 16183 "Photo.c" } } -PhotoFileFormat photo_get_best_export_file_format (Photo* self) { +PhotoFileFormat +photo_get_best_export_file_format (Photo* self) +{ PhotoFileFormat result = 0; PhotoFileFormat file_format = 0; PhotoFileFormat _tmp0_; - PhotoFileFormat _tmp1_; - gboolean _tmp2_; #line 1985 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); #line 1986 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_get_file_format (self); -#line 1986 "/home/jens/Source/shotwell/src/Photo.vala" - file_format = _tmp0_; -#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = file_format; + file_format = photo_get_file_format (self); #line 1987 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_file_format_can_write (_tmp1_); + _tmp0_ = file_format; #line 1987 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp2_) { -#line 15587 "Photo.c" - PhotoFileFormat _tmp3_; + if (!photo_file_format_can_write (_tmp0_)) { #line 1988 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_file_format_get_system_default_format (); -#line 1988 "/home/jens/Source/shotwell/src/Photo.vala" - file_format = _tmp3_; -#line 15593 "Photo.c" + file_format = photo_file_format_get_system_default_format (); +#line 16204 "Photo.c" } #line 1990 "/home/jens/Source/shotwell/src/Photo.vala" result = file_format; #line 1990 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15599 "Photo.c" +#line 16210 "Photo.c" } -PhotoFileFormat photo_get_master_file_format (Photo* self) { +PhotoFileFormat +photo_get_master_file_format (Photo* self) +{ PhotoFileFormat result = 0; GError * _inner_error_ = NULL; #line 1993 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 15608 "Photo.c" +#line 16221 "Photo.c" { PhotoRow* _tmp0_; #line 1994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 1994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15615 "Photo.c" +#line 16228 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; - PhotoFileFormat _tmp3_; #line 1995 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; #line 1995 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->master; #line 1995 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 1995 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp3_; -#line 15628 "Photo.c" + result = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); +#line 16238 "Photo.c" { - PhotoRow* _tmp4_; + PhotoRow* _tmp3_; #line 1994 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->row; + _tmp3_ = self->row; #line 1994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15635 "Photo.c" +#line 16245 "Photo.c" } #line 1995 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15639 "Photo.c" +#line 16249 "Photo.c" } __finally332: { - PhotoRow* _tmp5_; + PhotoRow* _tmp4_; #line 1994 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->row; + _tmp4_ = self->row; #line 1994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15648 "Photo.c" +#line 16258 "Photo.c" } #line 1994 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -15654,18 +16264,20 @@ PhotoFileFormat photo_get_master_file_format (Photo* self) { g_clear_error (&_inner_error_); #line 1994 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 15656 "Photo.c" +#line 16266 "Photo.c" } } -static time_t photo_real_get_timestamp (MediaSource* base) { +static time_t +photo_real_get_timestamp (MediaSource* base) +{ Photo * self; time_t result = 0; GError * _inner_error_ = NULL; #line 1999 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 15667 "Photo.c" +#line 16279 "Photo.c" { PhotoRow* _tmp0_; time_t _tmp5_ = 0; @@ -15673,7 +16285,7 @@ static time_t photo_real_get_timestamp (MediaSource* base) { _tmp0_ = self->row; #line 2000 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15675 "Photo.c" +#line 16287 "Photo.c" { BackingPhotoRow* _tmp1_; time_t _tmp2_; @@ -15683,18 +16295,18 @@ static time_t photo_real_get_timestamp (MediaSource* base) { _tmp2_ = _tmp1_->timestamp; #line 2001 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 15685 "Photo.c" +#line 16297 "Photo.c" { PhotoRow* _tmp3_; #line 2000 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2000 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15692 "Photo.c" +#line 16304 "Photo.c" } #line 2001 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15696 "Photo.c" +#line 16308 "Photo.c" } __finally333: { @@ -15703,7 +16315,7 @@ static time_t photo_real_get_timestamp (MediaSource* base) { _tmp4_ = self->row; #line 2000 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15705 "Photo.c" +#line 16317 "Photo.c" } #line 2000 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -15711,23 +16323,26 @@ static time_t photo_real_get_timestamp (MediaSource* base) { g_clear_error (&_inner_error_); #line 2000 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 15713 "Photo.c" +#line 16325 "Photo.c" } } -void photo_get_photo_id (Photo* self, PhotoID* result) { +void +photo_get_photo_id (Photo* self, + PhotoID* result) +{ GError * _inner_error_ = NULL; #line 2005 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 15722 "Photo.c" +#line 16337 "Photo.c" { PhotoRow* _tmp0_; #line 2006 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2006 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15729 "Photo.c" +#line 16344 "Photo.c" { PhotoRow* _tmp1_; PhotoID _tmp2_; @@ -15737,18 +16352,18 @@ void photo_get_photo_id (Photo* self, PhotoID* result) { _tmp2_ = _tmp1_->photo_id; #line 2007 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 15739 "Photo.c" +#line 16354 "Photo.c" { PhotoRow* _tmp3_; #line 2006 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2006 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15746 "Photo.c" +#line 16361 "Photo.c" } #line 2007 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15750 "Photo.c" +#line 16365 "Photo.c" } __finally334: { @@ -15757,7 +16372,7 @@ void photo_get_photo_id (Photo* self, PhotoID* result) { _tmp4_ = self->row; #line 2006 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15759 "Photo.c" +#line 16374 "Photo.c" } #line 2006 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -15765,12 +16380,15 @@ void photo_get_photo_id (Photo* self, PhotoID* result) { g_clear_error (&_inner_error_); #line 2006 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15767 "Photo.c" +#line 16382 "Photo.c" } } -static inline void photo_real_get_event_id (MediaSource* base, EventID* result) { +static inline void +photo_real_get_event_id (MediaSource* base, + EventID* result) +{ Photo * self; PhotoRow* _tmp0_; EventID _tmp1_; @@ -15784,11 +16402,13 @@ static inline void photo_real_get_event_id (MediaSource* base, EventID* result) *result = _tmp1_; #line 2013 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15786 "Photo.c" +#line 16404 "Photo.c" } -inline gint64 photo_get_raw_event_id (Photo* self) { +inline gint64 +photo_get_raw_event_id (Photo* self) +{ gint64 result = 0LL; PhotoRow* _tmp0_; EventID _tmp1_; @@ -15805,23 +16425,26 @@ inline gint64 photo_get_raw_event_id (Photo* self) { result = _tmp2_; #line 2018 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15807 "Photo.c" +#line 16427 "Photo.c" } -static void photo_real_get_import_id (MediaSource* base, ImportID* result) { +static void +photo_real_get_import_id (MediaSource* base, + ImportID* result) +{ Photo * self; GError * _inner_error_ = NULL; #line 2021 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 15816 "Photo.c" +#line 16439 "Photo.c" { PhotoRow* _tmp0_; #line 2022 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2022 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15823 "Photo.c" +#line 16446 "Photo.c" { PhotoRow* _tmp1_; ImportID _tmp2_; @@ -15831,18 +16454,18 @@ static void photo_real_get_import_id (MediaSource* base, ImportID* result) { _tmp2_ = _tmp1_->import_id; #line 2023 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 15833 "Photo.c" +#line 16456 "Photo.c" { PhotoRow* _tmp3_; #line 2022 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2022 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15840 "Photo.c" +#line 16463 "Photo.c" } #line 2023 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15844 "Photo.c" +#line 16467 "Photo.c" } __finally335: { @@ -15851,7 +16474,7 @@ static void photo_real_get_import_id (MediaSource* base, ImportID* result) { _tmp4_ = self->row; #line 2022 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15853 "Photo.c" +#line 16476 "Photo.c" } #line 2022 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -15859,23 +16482,26 @@ static void photo_real_get_import_id (MediaSource* base, ImportID* result) { g_clear_error (&_inner_error_); #line 2022 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15861 "Photo.c" +#line 16484 "Photo.c" } } -void photo_get_editable_id (Photo* self, BackingPhotoID* result) { +void +photo_get_editable_id (Photo* self, + BackingPhotoID* result) +{ GError * _inner_error_ = NULL; #line 2027 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 15870 "Photo.c" +#line 16496 "Photo.c" { PhotoRow* _tmp0_; #line 2028 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2028 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15877 "Photo.c" +#line 16503 "Photo.c" { PhotoRow* _tmp1_; BackingPhotoID _tmp2_; @@ -15885,18 +16511,18 @@ void photo_get_editable_id (Photo* self, BackingPhotoID* result) { _tmp2_ = _tmp1_->editable_id; #line 2029 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 15887 "Photo.c" +#line 16513 "Photo.c" { PhotoRow* _tmp3_; #line 2028 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2028 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15894 "Photo.c" +#line 16520 "Photo.c" } #line 2029 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15898 "Photo.c" +#line 16524 "Photo.c" } __finally336: { @@ -15905,7 +16531,7 @@ void photo_get_editable_id (Photo* self, BackingPhotoID* result) { _tmp4_ = self->row; #line 2028 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15907 "Photo.c" +#line 16533 "Photo.c" } #line 2028 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -15913,25 +16539,27 @@ void photo_get_editable_id (Photo* self, BackingPhotoID* result) { g_clear_error (&_inner_error_); #line 2028 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15915 "Photo.c" +#line 16541 "Photo.c" } } -static gchar* photo_real_get_master_md5 (MediaSource* base) { +static gchar* +photo_real_get_master_md5 (MediaSource* base) +{ Photo * self; gchar* result = NULL; GError * _inner_error_ = NULL; #line 2033 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 15926 "Photo.c" +#line 16554 "Photo.c" { PhotoRow* _tmp0_; #line 2034 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2034 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15933 "Photo.c" +#line 16561 "Photo.c" { PhotoRow* _tmp1_; const gchar* _tmp2_; @@ -15944,18 +16572,18 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) { _tmp3_ = g_strdup (_tmp2_); #line 2035 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 15946 "Photo.c" +#line 16574 "Photo.c" { PhotoRow* _tmp4_; #line 2034 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2034 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15953 "Photo.c" +#line 16581 "Photo.c" } #line 2035 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15957 "Photo.c" +#line 16585 "Photo.c" } __finally337: { @@ -15964,7 +16592,7 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) { _tmp5_ = self->row; #line 2034 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15966 "Photo.c" +#line 16594 "Photo.c" } #line 2034 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -15972,17 +16600,19 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) { g_clear_error (&_inner_error_); #line 2034 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 15974 "Photo.c" +#line 16602 "Photo.c" } } -guint64 photo_get_flags (Photo* self) { +guint64 +photo_get_flags (Photo* self) +{ guint64 result = 0ULL; GError * _inner_error_ = NULL; #line 2041 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); -#line 15984 "Photo.c" +#line 16614 "Photo.c" { PhotoRow* _tmp0_; guint64 _tmp5_ = 0ULL; @@ -15990,7 +16620,7 @@ guint64 photo_get_flags (Photo* self) { _tmp0_ = self->row; #line 2042 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15992 "Photo.c" +#line 16622 "Photo.c" { PhotoRow* _tmp1_; guint64 _tmp2_; @@ -16000,18 +16630,18 @@ guint64 photo_get_flags (Photo* self) { _tmp2_ = _tmp1_->flags; #line 2043 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 16002 "Photo.c" +#line 16632 "Photo.c" { PhotoRow* _tmp3_; #line 2042 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2042 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16009 "Photo.c" +#line 16639 "Photo.c" } #line 2043 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16013 "Photo.c" +#line 16643 "Photo.c" } __finally338: { @@ -16020,7 +16650,7 @@ guint64 photo_get_flags (Photo* self) { _tmp4_ = self->row; #line 2042 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16022 "Photo.c" +#line 16652 "Photo.c" } #line 2042 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -16028,16 +16658,18 @@ guint64 photo_get_flags (Photo* self) { g_clear_error (&_inner_error_); #line 2042 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 16030 "Photo.c" +#line 16660 "Photo.c" } } -static void photo_notify_flags_altered (Photo* self, Alteration* additional_alteration) { +static void +photo_notify_flags_altered (Photo* self, + Alteration* additional_alteration) +{ Alteration* alteration = NULL; Alteration* _tmp0_; - Alteration* _tmp1_; - Alteration* _tmp5_; + Alteration* _tmp3_; #line 2047 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 2047 "/home/jens/Source/shotwell/src/Photo.vala" @@ -16047,60 +16679,56 @@ static void photo_notify_flags_altered (Photo* self, Alteration* additional_alte #line 2048 "/home/jens/Source/shotwell/src/Photo.vala" alteration = _tmp0_; #line 2049 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = additional_alteration; -#line 2049 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_ != NULL) { -#line 16052 "Photo.c" + if (additional_alteration != NULL) { +#line 16682 "Photo.c" + Alteration* _tmp1_; Alteration* _tmp2_; - Alteration* _tmp3_; - Alteration* _tmp4_; -#line 2050 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = alteration; #line 2050 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = additional_alteration; + _tmp1_ = alteration; #line 2050 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = alteration_compress (_tmp2_, _tmp3_); + _tmp2_ = alteration_compress (_tmp1_, additional_alteration); #line 2050 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (alteration); #line 2050 "/home/jens/Source/shotwell/src/Photo.vala" - alteration = _tmp4_; -#line 16066 "Photo.c" + alteration = _tmp2_; +#line 16693 "Photo.c" } #line 2052 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = alteration; + _tmp3_ = alteration; #line 2052 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp3_); #line 2047 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (alteration); -#line 16074 "Photo.c" +#line 16701 "Photo.c" } -guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_alteration) { +guint64 +photo_replace_flags (Photo* self, + guint64 flags, + Alteration* additional_alteration) +{ guint64 result = 0ULL; gboolean committed = FALSE; - gboolean _tmp11_; - guint64 _tmp13_; + gboolean _tmp8_; GError * _inner_error_ = NULL; #line 2055 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); #line 2055 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL); -#line 16088 "Photo.c" +#line 16718 "Photo.c" { PhotoRow* _tmp0_; #line 2057 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2057 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16095 "Photo.c" +#line 16725 "Photo.c" { PhotoTable* _tmp1_; PhotoTable* _tmp2_; PhotoID _tmp3_ = {0}; - guint64 _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; + gboolean _tmp4_; #line 2058 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); #line 2058 "/home/jens/Source/shotwell/src/Photo.vala" @@ -16108,140 +16736,128 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_ #line 2058 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp3_); #line 2058 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = flags; -#line 2058 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_table_replace_flags (_tmp2_, &_tmp3_, _tmp4_); -#line 2058 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp5_; + committed = photo_table_replace_flags (_tmp2_, &_tmp3_, flags); #line 2058 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); #line 2059 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = committed; + _tmp4_ = committed; #line 2059 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_) { -#line 16121 "Photo.c" - PhotoRow* _tmp7_; - guint64 _tmp8_; -#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->row; + if (_tmp4_) { +#line 16745 "Photo.c" + PhotoRow* _tmp5_; #line 2060 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = flags; + _tmp5_ = self->row; #line 2060 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_->flags = _tmp8_; -#line 16130 "Photo.c" + _tmp5_->flags = flags; +#line 16751 "Photo.c" } } __finally339: { - PhotoRow* _tmp9_; + PhotoRow* _tmp6_; #line 2057 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = self->row; + _tmp6_ = self->row; #line 2057 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16140 "Photo.c" +#line 16761 "Photo.c" } #line 2057 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16144 "Photo.c" - guint64 _tmp10_ = 0ULL; +#line 16765 "Photo.c" + guint64 _tmp7_ = 0ULL; #line 2057 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2057 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2057 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp10_; -#line 16152 "Photo.c" + return _tmp7_; +#line 16773 "Photo.c" } } #line 2063 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = committed; + _tmp8_ = committed; #line 2063 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 16159 "Photo.c" - Alteration* _tmp12_; -#line 2064 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = additional_alteration; + if (_tmp8_) { #line 2064 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_flags_altered (self, _tmp12_); -#line 16165 "Photo.c" + photo_notify_flags_altered (self, additional_alteration); +#line 16782 "Photo.c" } #line 2066 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = flags; -#line 2066 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp13_; + result = flags; #line 2066 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16173 "Photo.c" +#line 16788 "Photo.c" } -gboolean photo_is_flag_set (Photo* self, guint64 mask) { +gboolean +photo_is_flag_set (Photo* self, + guint64 mask) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 2069 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 16182 "Photo.c" +#line 16800 "Photo.c" { PhotoRow* _tmp0_; - gboolean _tmp7_ = FALSE; + gboolean _tmp5_ = FALSE; #line 2070 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2070 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16190 "Photo.c" +#line 16808 "Photo.c" { PhotoRow* _tmp1_; guint64 _tmp2_; - guint64 _tmp3_; - gboolean _tmp4_; #line 2071 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2071 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; #line 2071 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = mask; -#line 2071 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = media_source_internal_is_flag_set (_tmp2_, _tmp3_); -#line 2071 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp4_; -#line 16206 "Photo.c" + result = media_source_internal_is_flag_set (_tmp2_, mask); +#line 16818 "Photo.c" { - PhotoRow* _tmp5_; + PhotoRow* _tmp3_; #line 2070 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->row; + _tmp3_ = self->row; #line 2070 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16213 "Photo.c" +#line 16825 "Photo.c" } #line 2071 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16217 "Photo.c" +#line 16829 "Photo.c" } __finally340: { - PhotoRow* _tmp6_; + PhotoRow* _tmp4_; #line 2070 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; + _tmp4_ = self->row; #line 2070 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16226 "Photo.c" +#line 16838 "Photo.c" } #line 2070 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2070 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2070 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp7_; -#line 16234 "Photo.c" + return _tmp5_; +#line 16846 "Photo.c" } } -guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alteration) { +guint64 +photo_add_flags (Photo* self, + guint64 mask, + Alteration* additional_alteration) +{ guint64 result = 0ULL; guint64 flags = 0ULL; gboolean committed = FALSE; - gboolean _tmp18_; + gboolean _tmp15_; GError * _inner_error_ = NULL; #line 2075 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); @@ -16251,125 +16867,116 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter flags = (guint64) 0; #line 2078 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16253 "Photo.c" +#line 16869 "Photo.c" { PhotoRow* _tmp0_; #line 2079 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2079 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16260 "Photo.c" +#line 16876 "Photo.c" { PhotoRow* _tmp1_; guint64 _tmp2_; - guint64 _tmp3_; + PhotoRow* _tmp3_; guint64 _tmp4_; - PhotoRow* _tmp5_; - guint64 _tmp6_; - guint64 _tmp7_; + guint64 _tmp5_; #line 2080 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2080 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; #line 2080 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = mask; -#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = media_source_internal_add_flags (_tmp2_, _tmp3_); -#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" - flags = _tmp4_; + flags = media_source_internal_add_flags (_tmp2_, mask); #line 2081 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->row; + _tmp3_ = self->row; #line 2081 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_->flags; + _tmp4_ = _tmp3_->flags; #line 2081 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = flags; + _tmp5_ = flags; #line 2081 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_ != _tmp7_) { -#line 16287 "Photo.c" - PhotoTable* _tmp8_; - PhotoTable* _tmp9_; - PhotoID _tmp10_ = {0}; - guint64 _tmp11_; - gboolean _tmp12_; - gboolean _tmp13_; -#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_table_get_instance (); + if (_tmp4_ != _tmp5_) { +#line 16897 "Photo.c" + PhotoTable* _tmp6_; + PhotoTable* _tmp7_; + PhotoID _tmp8_ = {0}; + guint64 _tmp9_; + gboolean _tmp10_; #line 2082 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; + _tmp6_ = photo_table_get_instance (); #line 2082 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (self, &_tmp10_); + _tmp7_ = _tmp6_; #line 2082 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = flags; + photo_get_photo_id (self, &_tmp8_); #line 2082 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_table_replace_flags (_tmp9_, &_tmp10_, _tmp11_); + _tmp9_ = flags; #line 2082 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp12_; + committed = photo_table_replace_flags (_tmp7_, &_tmp8_, _tmp9_); #line 2082 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp9_); + _database_table_unref0 (_tmp7_); #line 2083 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = committed; + _tmp10_ = committed; #line 2083 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp13_) { -#line 16312 "Photo.c" - PhotoRow* _tmp14_; - guint64 _tmp15_; + if (_tmp10_) { +#line 16919 "Photo.c" + PhotoRow* _tmp11_; + guint64 _tmp12_; #line 2084 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->row; + _tmp11_ = self->row; #line 2084 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = flags; + _tmp12_ = flags; #line 2084 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_->flags = _tmp15_; -#line 16321 "Photo.c" + _tmp11_->flags = _tmp12_; +#line 16928 "Photo.c" } } } __finally341: { - PhotoRow* _tmp16_; + PhotoRow* _tmp13_; #line 2079 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = self->row; + _tmp13_ = self->row; #line 2079 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16332 "Photo.c" +#line 16939 "Photo.c" } #line 2079 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16336 "Photo.c" - guint64 _tmp17_ = 0ULL; +#line 16943 "Photo.c" + guint64 _tmp14_ = 0ULL; #line 2079 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2079 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2079 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp17_; -#line 16344 "Photo.c" + return _tmp14_; +#line 16951 "Photo.c" } } #line 2088 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = committed; + _tmp15_ = committed; #line 2088 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp18_) { -#line 16351 "Photo.c" - Alteration* _tmp19_; -#line 2089 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = additional_alteration; + if (_tmp15_) { #line 2089 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_flags_altered (self, _tmp19_); -#line 16357 "Photo.c" + photo_notify_flags_altered (self, additional_alteration); +#line 16960 "Photo.c" } #line 2091 "/home/jens/Source/shotwell/src/Photo.vala" result = flags; #line 2091 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16363 "Photo.c" +#line 16966 "Photo.c" } -guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_alteration) { +guint64 +photo_remove_flags (Photo* self, + guint64 mask, + Alteration* additional_alteration) +{ guint64 result = 0ULL; guint64 flags = 0ULL; gboolean committed = FALSE; - gboolean _tmp18_; + gboolean _tmp15_; GError * _inner_error_ = NULL; #line 2094 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); @@ -16379,125 +16986,117 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al flags = (guint64) 0; #line 2097 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16381 "Photo.c" +#line 16988 "Photo.c" { PhotoRow* _tmp0_; #line 2098 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2098 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16388 "Photo.c" +#line 16995 "Photo.c" { PhotoRow* _tmp1_; guint64 _tmp2_; - guint64 _tmp3_; + PhotoRow* _tmp3_; guint64 _tmp4_; - PhotoRow* _tmp5_; - guint64 _tmp6_; - guint64 _tmp7_; + guint64 _tmp5_; #line 2099 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2099 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; #line 2099 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = mask; -#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = media_source_internal_remove_flags (_tmp2_, _tmp3_); -#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" - flags = _tmp4_; + flags = media_source_internal_remove_flags (_tmp2_, mask); #line 2100 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->row; + _tmp3_ = self->row; #line 2100 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_->flags; + _tmp4_ = _tmp3_->flags; #line 2100 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = flags; + _tmp5_ = flags; #line 2100 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_ != _tmp7_) { -#line 16415 "Photo.c" - PhotoTable* _tmp8_; - PhotoTable* _tmp9_; - PhotoID _tmp10_ = {0}; - guint64 _tmp11_; - gboolean _tmp12_; - gboolean _tmp13_; -#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_table_get_instance (); + if (_tmp4_ != _tmp5_) { +#line 17016 "Photo.c" + PhotoTable* _tmp6_; + PhotoTable* _tmp7_; + PhotoID _tmp8_ = {0}; + guint64 _tmp9_; + gboolean _tmp10_; #line 2101 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; + _tmp6_ = photo_table_get_instance (); #line 2101 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (self, &_tmp10_); + _tmp7_ = _tmp6_; #line 2101 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = flags; + photo_get_photo_id (self, &_tmp8_); #line 2101 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_table_replace_flags (_tmp9_, &_tmp10_, _tmp11_); + _tmp9_ = flags; #line 2101 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp12_; + committed = photo_table_replace_flags (_tmp7_, &_tmp8_, _tmp9_); #line 2101 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp9_); + _database_table_unref0 (_tmp7_); #line 2102 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = committed; + _tmp10_ = committed; #line 2102 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp13_) { -#line 16440 "Photo.c" - PhotoRow* _tmp14_; - guint64 _tmp15_; + if (_tmp10_) { +#line 17038 "Photo.c" + PhotoRow* _tmp11_; + guint64 _tmp12_; #line 2103 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->row; + _tmp11_ = self->row; #line 2103 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = flags; + _tmp12_ = flags; #line 2103 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_->flags = _tmp15_; -#line 16449 "Photo.c" + _tmp11_->flags = _tmp12_; +#line 17047 "Photo.c" } } } __finally342: { - PhotoRow* _tmp16_; + PhotoRow* _tmp13_; #line 2098 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = self->row; + _tmp13_ = self->row; #line 2098 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16460 "Photo.c" +#line 17058 "Photo.c" } #line 2098 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16464 "Photo.c" - guint64 _tmp17_ = 0ULL; +#line 17062 "Photo.c" + guint64 _tmp14_ = 0ULL; #line 2098 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2098 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2098 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp17_; -#line 16472 "Photo.c" + return _tmp14_; +#line 17070 "Photo.c" } } #line 2107 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = committed; + _tmp15_ = committed; #line 2107 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp18_) { -#line 16479 "Photo.c" - Alteration* _tmp19_; -#line 2108 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = additional_alteration; + if (_tmp15_) { #line 2108 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_flags_altered (self, _tmp19_); -#line 16485 "Photo.c" + photo_notify_flags_altered (self, additional_alteration); +#line 17079 "Photo.c" } #line 2110 "/home/jens/Source/shotwell/src/Photo.vala" result = flags; #line 2110 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16491 "Photo.c" +#line 17085 "Photo.c" } -guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Alteration* additional_alteration) { +guint64 +photo_add_remove_flags (Photo* self, + guint64 add, + guint64 remove, + Alteration* additional_alteration) +{ guint64 result = 0ULL; guint64 flags = 0ULL; gboolean committed = FALSE; - gboolean _tmp18_; + gboolean _tmp15_; GError * _inner_error_ = NULL; #line 2113 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); @@ -16507,123 +17106,116 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera flags = (guint64) 0; #line 2116 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16509 "Photo.c" +#line 17108 "Photo.c" { PhotoRow* _tmp0_; #line 2117 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2117 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16516 "Photo.c" +#line 17115 "Photo.c" { PhotoRow* _tmp1_; guint64 _tmp2_; - guint64 _tmp3_; + PhotoRow* _tmp3_; guint64 _tmp4_; - PhotoRow* _tmp5_; - guint64 _tmp6_; - guint64 _tmp7_; + guint64 _tmp5_; #line 2118 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2118 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; #line 2118 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = add; -#line 2118 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = remove; -#line 2118 "/home/jens/Source/shotwell/src/Photo.vala" - flags = (_tmp2_ | _tmp3_) & (~_tmp4_); + flags = (_tmp2_ | add) & (~remove); #line 2119 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->row; + _tmp3_ = self->row; #line 2119 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_->flags; + _tmp4_ = _tmp3_->flags; #line 2119 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = flags; + _tmp5_ = flags; #line 2119 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_ != _tmp7_) { -#line 16543 "Photo.c" - PhotoTable* _tmp8_; - PhotoTable* _tmp9_; - PhotoID _tmp10_ = {0}; - guint64 _tmp11_; - gboolean _tmp12_; - gboolean _tmp13_; -#line 2120 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_table_get_instance (); + if (_tmp4_ != _tmp5_) { +#line 17136 "Photo.c" + PhotoTable* _tmp6_; + PhotoTable* _tmp7_; + PhotoID _tmp8_ = {0}; + guint64 _tmp9_; + gboolean _tmp10_; #line 2120 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; + _tmp6_ = photo_table_get_instance (); #line 2120 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (self, &_tmp10_); + _tmp7_ = _tmp6_; #line 2120 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = flags; + photo_get_photo_id (self, &_tmp8_); #line 2120 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_table_replace_flags (_tmp9_, &_tmp10_, _tmp11_); + _tmp9_ = flags; #line 2120 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp12_; + committed = photo_table_replace_flags (_tmp7_, &_tmp8_, _tmp9_); #line 2120 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp9_); + _database_table_unref0 (_tmp7_); #line 2121 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = committed; + _tmp10_ = committed; #line 2121 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp13_) { -#line 16568 "Photo.c" - PhotoRow* _tmp14_; - guint64 _tmp15_; + if (_tmp10_) { +#line 17158 "Photo.c" + PhotoRow* _tmp11_; + guint64 _tmp12_; #line 2122 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->row; + _tmp11_ = self->row; #line 2122 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = flags; + _tmp12_ = flags; #line 2122 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_->flags = _tmp15_; -#line 16577 "Photo.c" + _tmp11_->flags = _tmp12_; +#line 17167 "Photo.c" } } } __finally343: { - PhotoRow* _tmp16_; + PhotoRow* _tmp13_; #line 2117 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = self->row; + _tmp13_ = self->row; #line 2117 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16588 "Photo.c" +#line 17178 "Photo.c" } #line 2117 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16592 "Photo.c" - guint64 _tmp17_ = 0ULL; +#line 17182 "Photo.c" + guint64 _tmp14_ = 0ULL; #line 2117 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2117 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2117 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp17_; -#line 16600 "Photo.c" + return _tmp14_; +#line 17190 "Photo.c" } } #line 2126 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = committed; + _tmp15_ = committed; #line 2126 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp18_) { -#line 16607 "Photo.c" - Alteration* _tmp19_; -#line 2127 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = additional_alteration; + if (_tmp15_) { #line 2127 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_flags_altered (self, _tmp19_); -#line 16613 "Photo.c" + photo_notify_flags_altered (self, additional_alteration); +#line 17199 "Photo.c" } #line 2129 "/home/jens/Source/shotwell/src/Photo.vala" result = flags; #line 2129 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16619 "Photo.c" +#line 17205 "Photo.c" } -void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alteration* additional_add_alteration, GeeCollection* remove, guint64 remove_mask, Alteration* additional_remove_alteration, GError** error) { - GeeCollection* _tmp0_; - GeeCollection* _tmp10_; +void +photo_add_remove_many_flags (GeeCollection* add, + guint64 add_mask, + Alteration* additional_add_alteration, + GeeCollection* remove, + guint64 remove_mask, + Alteration* additional_remove_alteration, + GError** error) +{ GError * _inner_error_ = NULL; #line 2132 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((add == NULL) || GEE_IS_COLLECTION (add)); @@ -16636,121 +17228,93 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati #line 2135 "/home/jens/Source/shotwell/src/Photo.vala" database_table_begin_transaction (); #line 2137 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = add; -#line 2137 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_ != NULL) { -#line 16641 "Photo.c" + if (add != NULL) { +#line 17231 "Photo.c" { GeeIterator* _photo_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp0_; #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = add; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (add, GEE_TYPE_ITERABLE, GeeIterable)); #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_it = _tmp2_; + _photo_it = _tmp0_; #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 16654 "Photo.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 17241 "Photo.c" + GeeIterator* _tmp1_; Photo* photo = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - Photo* _tmp7_; - guint64 _tmp8_; - Alteration* _tmp9_; + GeeIterator* _tmp2_; + gpointer _tmp3_; + Photo* _tmp4_; #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _photo_it; + _tmp1_ = _photo_it; #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_iterator_next (_tmp3_); -#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 16671 "Photo.c" +#line 17253 "Photo.c" } #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _photo_it; + _tmp2_ = _photo_it; #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" - photo = (Photo*) _tmp6_; -#line 2139 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo; + photo = (Photo*) _tmp3_; #line 2139 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = add_mask; + _tmp4_ = photo; #line 2139 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = additional_add_alteration; -#line 2139 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_flags (_tmp7_, _tmp8_, _tmp9_); + photo_add_flags (_tmp4_, add_mask, additional_add_alteration); #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 16689 "Photo.c" +#line 17267 "Photo.c" } #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 16693 "Photo.c" +#line 17271 "Photo.c" } } #line 2142 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = remove; -#line 2142 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp10_ != NULL) { -#line 16700 "Photo.c" + if (remove != NULL) { +#line 17276 "Photo.c" { GeeIterator* _photo_it = NULL; - GeeCollection* _tmp11_; - GeeIterator* _tmp12_; -#line 2143 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = remove; + GeeIterator* _tmp5_; #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (remove, GEE_TYPE_ITERABLE, GeeIterable)); #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_it = _tmp12_; + _photo_it = _tmp5_; #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 16713 "Photo.c" - GeeIterator* _tmp13_; - gboolean _tmp14_; +#line 17286 "Photo.c" + GeeIterator* _tmp6_; Photo* photo = NULL; - GeeIterator* _tmp15_; - gpointer _tmp16_; - Photo* _tmp17_; - guint64 _tmp18_; - Alteration* _tmp19_; -#line 2143 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _photo_it; + GeeIterator* _tmp7_; + gpointer _tmp8_; + Photo* _tmp9_; #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = gee_iterator_next (_tmp13_); + _tmp6_ = _photo_it; #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp14_) { + if (!gee_iterator_next (_tmp6_)) { #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 16730 "Photo.c" +#line 17298 "Photo.c" } #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _photo_it; + _tmp7_ = _photo_it; #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = gee_iterator_get (_tmp15_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" - photo = (Photo*) _tmp16_; -#line 2144 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo; -#line 2144 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = remove_mask; + photo = (Photo*) _tmp8_; #line 2144 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = additional_remove_alteration; + _tmp9_ = photo; #line 2144 "/home/jens/Source/shotwell/src/Photo.vala" - photo_remove_flags (_tmp17_, _tmp18_, _tmp19_); + photo_remove_flags (_tmp9_, remove_mask, additional_remove_alteration); #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 16748 "Photo.c" +#line 17312 "Photo.c" } #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 16752 "Photo.c" +#line 17316 "Photo.c" } } #line 2147 "/home/jens/Source/shotwell/src/Photo.vala" @@ -16763,7 +17327,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati g_propagate_error (error, _inner_error_); #line 2147 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 16765 "Photo.c" +#line 17329 "Photo.c" } else { #line 2147 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -16771,17 +17335,21 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati g_clear_error (&_inner_error_); #line 2147 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 16773 "Photo.c" +#line 17337 "Photo.c" } } } -guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_alteration) { +guint64 +photo_toggle_flags (Photo* self, + guint64 mask, + Alteration* additional_alteration) +{ guint64 result = 0ULL; guint64 flags = 0ULL; gboolean committed = FALSE; - gboolean _tmp17_; + gboolean _tmp15_; GError * _inner_error_ = NULL; #line 2150 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); @@ -16791,123 +17359,115 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al flags = (guint64) 0; #line 2153 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16793 "Photo.c" +#line 17361 "Photo.c" { PhotoRow* _tmp0_; #line 2154 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2154 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16800 "Photo.c" +#line 17368 "Photo.c" { PhotoRow* _tmp1_; guint64 _tmp2_; - guint64 _tmp3_; - PhotoRow* _tmp4_; + PhotoRow* _tmp3_; + guint64 _tmp4_; guint64 _tmp5_; - guint64 _tmp6_; #line 2155 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2155 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; #line 2155 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = mask; -#line 2155 "/home/jens/Source/shotwell/src/Photo.vala" - flags = _tmp2_ ^ _tmp3_; + flags = _tmp2_ ^ mask; #line 2156 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->row; + _tmp3_ = self->row; #line 2156 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_->flags; + _tmp4_ = _tmp3_->flags; #line 2156 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = flags; + _tmp5_ = flags; #line 2156 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_ != _tmp6_) { -#line 16824 "Photo.c" + if (_tmp4_ != _tmp5_) { +#line 17389 "Photo.c" + PhotoTable* _tmp6_; PhotoTable* _tmp7_; - PhotoTable* _tmp8_; - PhotoID _tmp9_ = {0}; - guint64 _tmp10_; - gboolean _tmp11_; - gboolean _tmp12_; -#line 2157 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo_table_get_instance (); + PhotoID _tmp8_ = {0}; + guint64 _tmp9_; + gboolean _tmp10_; #line 2157 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_; + _tmp6_ = photo_table_get_instance (); #line 2157 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (self, &_tmp9_); + _tmp7_ = _tmp6_; #line 2157 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = flags; + photo_get_photo_id (self, &_tmp8_); #line 2157 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_table_replace_flags (_tmp8_, &_tmp9_, _tmp10_); + _tmp9_ = flags; #line 2157 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp11_; + committed = photo_table_replace_flags (_tmp7_, &_tmp8_, _tmp9_); #line 2157 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp8_); + _database_table_unref0 (_tmp7_); #line 2158 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = committed; + _tmp10_ = committed; #line 2158 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_) { -#line 16849 "Photo.c" - PhotoRow* _tmp13_; - guint64 _tmp14_; + if (_tmp10_) { +#line 17411 "Photo.c" + PhotoRow* _tmp11_; + guint64 _tmp12_; #line 2159 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = self->row; + _tmp11_ = self->row; #line 2159 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = flags; + _tmp12_ = flags; #line 2159 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_->flags = _tmp14_; -#line 16858 "Photo.c" + _tmp11_->flags = _tmp12_; +#line 17420 "Photo.c" } } } __finally344: { - PhotoRow* _tmp15_; + PhotoRow* _tmp13_; #line 2154 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = self->row; + _tmp13_ = self->row; #line 2154 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16869 "Photo.c" +#line 17431 "Photo.c" } #line 2154 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16873 "Photo.c" - guint64 _tmp16_ = 0ULL; +#line 17435 "Photo.c" + guint64 _tmp14_ = 0ULL; #line 2154 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2154 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2154 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp16_; -#line 16881 "Photo.c" + return _tmp14_; +#line 17443 "Photo.c" } } #line 2163 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = committed; + _tmp15_ = committed; #line 2163 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp17_) { -#line 16888 "Photo.c" - Alteration* _tmp18_; -#line 2164 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = additional_alteration; + if (_tmp15_) { #line 2164 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_flags_altered (self, _tmp18_); -#line 16894 "Photo.c" + photo_notify_flags_altered (self, additional_alteration); +#line 17452 "Photo.c" } #line 2166 "/home/jens/Source/shotwell/src/Photo.vala" result = flags; #line 2166 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16900 "Photo.c" +#line 17458 "Photo.c" } -gboolean photo_is_master_metadata_dirty (Photo* self) { +gboolean +photo_is_master_metadata_dirty (Photo* self) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 2169 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 16909 "Photo.c" +#line 17469 "Photo.c" { PhotoRow* _tmp0_; gboolean _tmp5_ = FALSE; @@ -16915,7 +17475,7 @@ gboolean photo_is_master_metadata_dirty (Photo* self) { _tmp0_ = self->row; #line 2170 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16917 "Photo.c" +#line 17477 "Photo.c" { PhotoRow* _tmp1_; gboolean _tmp2_; @@ -16925,18 +17485,18 @@ gboolean photo_is_master_metadata_dirty (Photo* self) { _tmp2_ = _tmp1_->metadata_dirty; #line 2171 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 16927 "Photo.c" +#line 17487 "Photo.c" { PhotoRow* _tmp3_; #line 2170 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2170 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16934 "Photo.c" +#line 17494 "Photo.c" } #line 2171 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16938 "Photo.c" +#line 17498 "Photo.c" } __finally345: { @@ -16945,7 +17505,7 @@ gboolean photo_is_master_metadata_dirty (Photo* self) { _tmp4_ = self->row; #line 2170 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16947 "Photo.c" +#line 17507 "Photo.c" } #line 2170 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -16953,82 +17513,77 @@ gboolean photo_is_master_metadata_dirty (Photo* self) { g_clear_error (&_inner_error_); #line 2170 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 16955 "Photo.c" +#line 17515 "Photo.c" } } -void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** error) { +void +photo_set_master_metadata_dirty (Photo* self, + gboolean dirty, + GError** error) +{ gboolean committed = FALSE; - gboolean _tmp11_; + gboolean _tmp8_; GError * _inner_error_ = NULL; #line 2175 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 2176 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16968 "Photo.c" +#line 17532 "Photo.c" { PhotoRow* _tmp0_; #line 2177 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2177 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16975 "Photo.c" +#line 17539 "Photo.c" { PhotoRow* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; #line 2178 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2178 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->metadata_dirty; #line 2178 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = dirty; -#line 2178 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_ != _tmp3_) { -#line 16988 "Photo.c" + if (_tmp2_ != dirty) { +#line 17549 "Photo.c" + PhotoTable* _tmp3_; PhotoTable* _tmp4_; - PhotoTable* _tmp5_; - PhotoID _tmp6_ = {0}; - gboolean _tmp7_; - PhotoRow* _tmp8_; - gboolean _tmp9_; -#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_table_get_instance (); + PhotoID _tmp5_ = {0}; + PhotoRow* _tmp6_; #line 2179 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + _tmp3_ = photo_table_get_instance (); #line 2179 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (self, &_tmp6_); + _tmp4_ = _tmp3_; #line 2179 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = dirty; + photo_get_photo_id (self, &_tmp5_); #line 2179 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_set_metadata_dirty (_tmp5_, &_tmp6_, _tmp7_, &_inner_error_); + photo_table_set_metadata_dirty (_tmp4_, &_tmp5_, dirty, &_inner_error_); #line 2179 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp5_); + _database_table_unref0 (_tmp4_); #line 2179 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 17009 "Photo.c" +#line 17566 "Photo.c" goto __finally346; } #line 2180 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = self->row; -#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = dirty; + _tmp6_ = self->row; #line 2180 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_->metadata_dirty = _tmp9_; + _tmp6_->metadata_dirty = dirty; #line 2181 "/home/jens/Source/shotwell/src/Photo.vala" committed = TRUE; -#line 17020 "Photo.c" +#line 17575 "Photo.c" } } __finally346: { - PhotoRow* _tmp10_; + PhotoRow* _tmp7_; #line 2177 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = self->row; + _tmp7_ = self->row; #line 2177 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17030 "Photo.c" +#line 17585 "Photo.c" } #line 2177 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -17038,7 +17593,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro g_propagate_error (error, _inner_error_); #line 2177 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17040 "Photo.c" +#line 17595 "Photo.c" } else { #line 2177 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -17046,44 +17601,46 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro g_clear_error (&_inner_error_); #line 2177 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17048 "Photo.c" +#line 17603 "Photo.c" } } } #line 2185 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = committed; + _tmp8_ = committed; #line 2185 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 17056 "Photo.c" - Alteration* _tmp12_; - Alteration* _tmp13_; + if (_tmp8_) { +#line 17611 "Photo.c" + Alteration* _tmp9_; + Alteration* _tmp10_; #line 2186 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = alteration_new ("metadata", "master-dirty"); + _tmp9_ = alteration_new ("metadata", "master-dirty"); #line 2186 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_; + _tmp10_ = _tmp9_; #line 2186 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp10_); #line 2186 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp13_); -#line 17067 "Photo.c" + _alteration_unref0 (_tmp10_); +#line 17622 "Photo.c" } } -static Rating photo_real_get_rating (MediaSource* base) { +static Rating +photo_real_get_rating (MediaSource* base) +{ Photo * self; Rating result = 0; GError * _inner_error_ = NULL; #line 2189 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 17078 "Photo.c" +#line 17635 "Photo.c" { PhotoRow* _tmp0_; #line 2190 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2190 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17085 "Photo.c" +#line 17642 "Photo.c" { PhotoRow* _tmp1_; Rating _tmp2_; @@ -17093,18 +17650,18 @@ static Rating photo_real_get_rating (MediaSource* base) { _tmp2_ = _tmp1_->rating; #line 2191 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 17095 "Photo.c" +#line 17652 "Photo.c" { PhotoRow* _tmp3_; #line 2190 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2190 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17102 "Photo.c" +#line 17659 "Photo.c" } #line 2191 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17106 "Photo.c" +#line 17663 "Photo.c" } __finally347: { @@ -17113,7 +17670,7 @@ static Rating photo_real_get_rating (MediaSource* base) { _tmp4_ = self->row; #line 2190 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17115 "Photo.c" +#line 17672 "Photo.c" } #line 2190 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -17121,104 +17678,88 @@ static Rating photo_real_get_rating (MediaSource* base) { g_clear_error (&_inner_error_); #line 2190 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 17123 "Photo.c" +#line 17680 "Photo.c" } } -static void photo_real_set_rating (MediaSource* base, Rating rating) { +static void +photo_real_set_rating (MediaSource* base, + Rating rating) +{ Photo * self; gboolean committed = FALSE; - gboolean _tmp16_; + gboolean _tmp10_; GError * _inner_error_ = NULL; #line 2195 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2196 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 17137 "Photo.c" +#line 17697 "Photo.c" { PhotoRow* _tmp0_; #line 2198 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2198 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17144 "Photo.c" +#line 17704 "Photo.c" { gboolean _tmp1_ = FALSE; - Rating _tmp2_; - PhotoRow* _tmp3_; - Rating _tmp4_; -#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = rating; -#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->row; -#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_->rating; + PhotoRow* _tmp2_; + Rating _tmp3_; #line 2199 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_ != _tmp4_) { -#line 17158 "Photo.c" - Rating _tmp5_; - gboolean _tmp6_; + _tmp2_ = self->row; #line 2199 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = rating; + _tmp3_ = _tmp2_->rating; #line 2199 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = rating_is_valid (_tmp5_); + if (rating != _tmp3_) { #line 2199 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp6_; -#line 17167 "Photo.c" + _tmp1_ = rating_is_valid (rating); +#line 17717 "Photo.c" } else { #line 2199 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 17171 "Photo.c" +#line 17721 "Photo.c" } #line 2199 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 17175 "Photo.c" - PhotoTable* _tmp7_; - PhotoTable* _tmp8_; - PhotoID _tmp9_ = {0}; - Rating _tmp10_; - gboolean _tmp11_; - gboolean _tmp12_; +#line 17725 "Photo.c" + PhotoTable* _tmp4_; + PhotoTable* _tmp5_; + PhotoID _tmp6_ = {0}; + gboolean _tmp7_; #line 2200 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo_table_get_instance (); + _tmp4_ = photo_table_get_instance (); #line 2200 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_; + _tmp5_ = _tmp4_; #line 2200 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (self, &_tmp9_); -#line 2200 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = rating; -#line 2200 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_table_set_rating (_tmp8_, &_tmp9_, _tmp10_); + photo_get_photo_id (self, &_tmp6_); #line 2200 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp11_; + committed = photo_table_set_rating (_tmp5_, &_tmp6_, rating); #line 2200 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp8_); + _database_table_unref0 (_tmp5_); #line 2201 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = committed; + _tmp7_ = committed; #line 2201 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_) { -#line 17200 "Photo.c" - PhotoRow* _tmp13_; - Rating _tmp14_; -#line 2202 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = self->row; + if (_tmp7_) { +#line 17744 "Photo.c" + PhotoRow* _tmp8_; #line 2202 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = rating; + _tmp8_ = self->row; #line 2202 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_->rating = _tmp14_; -#line 17209 "Photo.c" + _tmp8_->rating = rating; +#line 17750 "Photo.c" } } } __finally348: { - PhotoRow* _tmp15_; + PhotoRow* _tmp9_; #line 2198 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = self->row; + _tmp9_ = self->row; #line 2198 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17220 "Photo.c" +#line 17761 "Photo.c" } #line 2198 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -17228,64 +17769,63 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) { g_clear_error (&_inner_error_); #line 2198 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17230 "Photo.c" +#line 17771 "Photo.c" } } #line 2206 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = committed; + _tmp10_ = committed; #line 2206 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp16_) { -#line 17237 "Photo.c" - Alteration* _tmp17_; - Alteration* _tmp18_; + if (_tmp10_) { +#line 17778 "Photo.c" + Alteration* _tmp11_; + Alteration* _tmp12_; #line 2207 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = alteration_new ("metadata", "rating"); + _tmp11_ = alteration_new ("metadata", "rating"); #line 2207 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_; + _tmp12_ = _tmp11_; #line 2207 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp12_); #line 2207 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp18_); -#line 17248 "Photo.c" + _alteration_unref0 (_tmp12_); +#line 17789 "Photo.c" } } -static void photo_real_increase_rating (MediaSource* base) { +static void +photo_real_increase_rating (MediaSource* base) +{ Photo * self; GError * _inner_error_ = NULL; #line 2210 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 17258 "Photo.c" +#line 17801 "Photo.c" { PhotoRow* _tmp0_; #line 2211 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2211 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17265 "Photo.c" +#line 17808 "Photo.c" { PhotoRow* _tmp1_; Rating _tmp2_; - Rating _tmp3_; #line 2212 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2212 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->rating; #line 2212 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = rating_increase (_tmp2_); -#line 2212 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_); -#line 17278 "Photo.c" + media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), rating_increase (_tmp2_)); +#line 17818 "Photo.c" } __finally349: { - PhotoRow* _tmp4_; + PhotoRow* _tmp3_; #line 2211 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->row; + _tmp3_ = self->row; #line 2211 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17287 "Photo.c" +#line 17827 "Photo.c" } #line 2211 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -17295,47 +17835,46 @@ static void photo_real_increase_rating (MediaSource* base) { g_clear_error (&_inner_error_); #line 2211 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17297 "Photo.c" +#line 17837 "Photo.c" } } } -static void photo_real_decrease_rating (MediaSource* base) { +static void +photo_real_decrease_rating (MediaSource* base) +{ Photo * self; GError * _inner_error_ = NULL; #line 2216 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 17308 "Photo.c" +#line 17850 "Photo.c" { PhotoRow* _tmp0_; #line 2217 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2217 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17315 "Photo.c" +#line 17857 "Photo.c" { PhotoRow* _tmp1_; Rating _tmp2_; - Rating _tmp3_; #line 2218 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2218 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->rating; #line 2218 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = rating_decrease (_tmp2_); -#line 2218 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_); -#line 17328 "Photo.c" + media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), rating_decrease (_tmp2_)); +#line 17867 "Photo.c" } __finally350: { - PhotoRow* _tmp4_; + PhotoRow* _tmp3_; #line 2217 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->row; + _tmp3_ = self->row; #line 2217 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17337 "Photo.c" +#line 17876 "Photo.c" } #line 2217 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -17345,25 +17884,28 @@ static void photo_real_decrease_rating (MediaSource* base) { g_clear_error (&_inner_error_); #line 2217 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17347 "Photo.c" +#line 17886 "Photo.c" } } } -static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sources, const gchar* backlinks) { +static void +photo_real_commit_backlinks (DataSource* base, + SourceCollection* sources, + const gchar* backlinks) +{ Photo * self; GError * _inner_error_ = NULL; #line 2222 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2222 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources)); -#line 17360 "Photo.c" +#line 17903 "Photo.c" { PhotoTable* _tmp0_; PhotoTable* _tmp1_; PhotoID _tmp2_ = {0}; - const gchar* _tmp3_; #line 2227 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_table_get_instance (); #line 2227 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17371,16 +17913,14 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou #line 2227 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp2_); #line 2227 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = backlinks; -#line 2227 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_update_backlinks (_tmp1_, &_tmp2_, _tmp3_, &_inner_error_); + photo_table_update_backlinks (_tmp1_, &_tmp2_, backlinks, &_inner_error_); #line 2227 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); #line 2227 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2227 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 17382 "Photo.c" +#line 17922 "Photo.c" goto __catch351_database_error; } #line 2227 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17389,45 +17929,42 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou g_clear_error (&_inner_error_); #line 2227 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17391 "Photo.c" +#line 17931 "Photo.c" } { - PhotoRow* _tmp4_; + PhotoRow* _tmp3_; #line 2228 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->row; + _tmp3_ = self->row; #line 2228 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17399 "Photo.c" +#line 17939 "Photo.c" { - PhotoRow* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; -#line 2229 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->row; + PhotoRow* _tmp4_; + gchar* _tmp5_; #line 2229 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = backlinks; + _tmp4_ = self->row; #line 2229 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp5_ = g_strdup (backlinks); #line 2229 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp5_->backlinks); + _g_free0 (_tmp4_->backlinks); #line 2229 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_->backlinks = _tmp7_; -#line 17414 "Photo.c" + _tmp4_->backlinks = _tmp5_; +#line 17951 "Photo.c" } __finally352: { - PhotoRow* _tmp8_; + PhotoRow* _tmp6_; #line 2228 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = self->row; + _tmp6_ = self->row; #line 2228 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17423 "Photo.c" +#line 17960 "Photo.c" } #line 2228 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2228 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 17429 "Photo.c" +#line 17966 "Photo.c" goto __catch351_database_error; } #line 2228 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17436,7 +17973,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou g_clear_error (&_inner_error_); #line 2228 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17438 "Photo.c" +#line 17975 "Photo.c" } } } @@ -17444,29 +17981,29 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou __catch351_database_error: { GError* err = NULL; - gchar* _tmp9_; - gchar* _tmp10_; - GError* _tmp11_; - const gchar* _tmp12_; + gchar* _tmp7_; + gchar* _tmp8_; + GError* _tmp9_; + const gchar* _tmp10_; #line 2226 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 2226 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 2232 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp7_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 2232 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 2232 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = err; + _tmp9_ = err; #line 2232 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_->message; + _tmp10_ = _tmp9_->message; #line 2232 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2232: Unable to update link state for %s: %s", _tmp10_, _tmp12_); + g_warning ("Photo.vala:2232: Unable to update link state for %s: %s", _tmp8_, _tmp10_); #line 2232 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp8_); #line 2226 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 17468 "Photo.c" +#line 18005 "Photo.c" } __finally351: #line 2226 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17477,12 +18014,15 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou g_clear_error (&_inner_error_); #line 2226 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17479 "Photo.c" +#line 18016 "Photo.c" } } -static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) { +static gboolean +photo_real_set_event_id (MediaSource* base, + EventID* event_id) +{ Photo * self; gboolean result = FALSE; GError * _inner_error_ = NULL; @@ -17490,15 +18030,15 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) { self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2240 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (event_id != NULL, FALSE); -#line 17492 "Photo.c" +#line 18032 "Photo.c" { PhotoRow* _tmp0_; - gboolean _tmp13_ = FALSE; + gboolean _tmp12_ = FALSE; #line 2241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2241 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17500 "Photo.c" +#line 18040 "Photo.c" { gboolean committed = FALSE; PhotoTable* _tmp1_; @@ -17508,7 +18048,6 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) { EventID _tmp5_; gboolean _tmp6_; gboolean _tmp7_; - gboolean _tmp8_; #line 2242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); #line 2242 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17521,257 +18060,250 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) { _tmp5_ = *event_id; #line 2242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_table_set_event (_tmp2_, &_tmp4_, &_tmp5_); -#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_; #line 2242 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); #line 2242 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp7_; + committed = _tmp6_; #line 2244 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = committed; + _tmp7_ = committed; #line 2244 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_) { -#line 17533 "Photo.c" - PhotoRow* _tmp9_; - EventID _tmp10_; + if (_tmp7_) { +#line 18070 "Photo.c" + PhotoRow* _tmp8_; + EventID _tmp9_; #line 2245 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = self->row; + _tmp8_ = self->row; #line 2245 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = *event_id; + _tmp9_ = *event_id; #line 2245 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_->event_id = _tmp10_; -#line 17542 "Photo.c" + _tmp8_->event_id = _tmp9_; +#line 18079 "Photo.c" } #line 2247 "/home/jens/Source/shotwell/src/Photo.vala" result = committed; -#line 17546 "Photo.c" +#line 18083 "Photo.c" { - PhotoRow* _tmp11_; + PhotoRow* _tmp10_; #line 2241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = self->row; + _tmp10_ = self->row; #line 2241 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17553 "Photo.c" +#line 18090 "Photo.c" } #line 2247 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17557 "Photo.c" +#line 18094 "Photo.c" } __finally353: { - PhotoRow* _tmp12_; + PhotoRow* _tmp11_; #line 2241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = self->row; + _tmp11_ = self->row; #line 2241 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17566 "Photo.c" +#line 18103 "Photo.c" } #line 2241 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2241 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2241 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp13_; -#line 17574 "Photo.c" + return _tmp12_; +#line 18111 "Photo.c" } } -static gchar* photo_real_to_string (DataObject* base) { +static gchar* +photo_real_to_string (DataObject* base) +{ Photo * self; gchar* result = NULL; gchar* _tmp0_ = NULL; - gboolean _tmp1_; - PhotoID _tmp10_ = {0}; - gint64 _tmp11_; + PhotoID _tmp9_ = {0}; + gint64 _tmp10_; + gchar* _tmp11_; gchar* _tmp12_; - gchar* _tmp13_; + PhotoFileReader* _tmp13_; PhotoFileReader* _tmp14_; - PhotoFileReader* _tmp15_; + gchar* _tmp15_; gchar* _tmp16_; gchar* _tmp17_; gchar* _tmp18_; - gchar* _tmp19_; #line 2251 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_is_master_baseline (self); -#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp1_) { -#line 17600 "Photo.c" + if (!photo_is_master_baseline (self)) { +#line 18136 "Photo.c" + GFile* _tmp1_; GFile* _tmp2_; - GFile* _tmp3_; + gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; - gchar* _tmp8_; #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_get_actual_file (self); + _tmp1_ = photo_get_actual_file (self); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = g_file_get_path (_tmp3_); + _tmp3_ = g_file_get_path (_tmp2_); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = g_strconcat (" (", _tmp5_, NULL); + _tmp5_ = g_strconcat (" (", _tmp4_, NULL); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = g_strconcat (_tmp7_, ")", NULL); + _tmp7_ = g_strconcat (_tmp6_, ")", NULL); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp8_; + _tmp0_ = _tmp7_; #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp4_); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp3_); -#line 17632 "Photo.c" + _g_object_unref0 (_tmp2_); +#line 18168 "Photo.c" } else { - gchar* _tmp9_; + gchar* _tmp8_; #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = g_strdup (""); + _tmp8_ = g_strdup (""); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp9_; -#line 17641 "Photo.c" + _tmp0_ = _tmp8_; +#line 18177 "Photo.c" } #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (self, &_tmp10_); + photo_get_photo_id (self, &_tmp9_); #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_.id; + _tmp10_ = _tmp9_.id; #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp11_); + _tmp11_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp10_); #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = photo_get_master_reader (self); + _tmp13_ = photo_get_master_reader (self); #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp15_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = g_strdup_printf ("[%s] %s%s", _tmp13_, _tmp17_, _tmp0_); + _tmp17_ = g_strdup_printf ("[%s] %s%s", _tmp12_, _tmp16_, _tmp0_); #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp16_); #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp15_); + _photo_file_adapter_unref0 (_tmp14_); #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp12_); #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp19_; + result = _tmp18_; #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17675 "Photo.c" +#line 18211 "Photo.c" } -static gboolean photo_real_equals (DataSource* base, DataSource* source) { +static gboolean +photo_real_equals (DataSource* base, + DataSource* source) +{ Photo * self; gboolean result = FALSE; Photo* photo = NULL; - DataSource* _tmp0_; + Photo* _tmp0_; Photo* _tmp1_; - Photo* _tmp2_; - DataSource* _tmp14_; - gboolean _tmp15_; #line 2256 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2256 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((source == NULL) || IS_DATA_SOURCE (source), FALSE); #line 2258 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = source; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_PHOTO) ? ((Photo*) source) : NULL); #line 2258 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO) ? ((Photo*) _tmp0_) : NULL); -#line 2258 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp1_; + photo = _tmp0_; #line 2259 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo; + _tmp1_ = photo; #line 2259 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_ != NULL) { -#line 17702 "Photo.c" + if (_tmp1_ != NULL) { +#line 18236 "Photo.c" PhotoID photo_id = {0}; - PhotoID _tmp3_ = {0}; + PhotoID _tmp2_ = {0}; PhotoID other_photo_id = {0}; - Photo* _tmp4_; - PhotoID _tmp5_ = {0}; - gboolean _tmp6_ = FALSE; - Photo* _tmp7_; + Photo* _tmp3_; + PhotoID _tmp4_ = {0}; + gboolean _tmp5_ = FALSE; + Photo* _tmp6_; #line 2260 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (self, &_tmp3_); + photo_get_photo_id (self, &_tmp2_); #line 2260 "/home/jens/Source/shotwell/src/Photo.vala" - photo_id = _tmp3_; + photo_id = _tmp2_; #line 2261 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo; + _tmp3_ = photo; #line 2261 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (_tmp4_, &_tmp5_); + photo_get_photo_id (_tmp3_, &_tmp4_); #line 2261 "/home/jens/Source/shotwell/src/Photo.vala" - other_photo_id = _tmp5_; + other_photo_id = _tmp4_; #line 2263 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo; + _tmp6_ = photo; #line 2263 "/home/jens/Source/shotwell/src/Photo.vala" - if (self != _tmp7_) { -#line 17724 "Photo.c" - PhotoID _tmp8_; - gint64 _tmp9_; + if (self != _tmp6_) { +#line 18258 "Photo.c" + PhotoID _tmp7_; + gint64 _tmp8_; #line 2263 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_id; + _tmp7_ = photo_id; #line 2263 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_.id; + _tmp8_ = _tmp7_.id; #line 2263 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp9_ != PHOTO_ID_INVALID; -#line 17733 "Photo.c" + _tmp5_ = _tmp8_ != PHOTO_ID_INVALID; +#line 18267 "Photo.c" } else { #line 2263 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = FALSE; -#line 17737 "Photo.c" + _tmp5_ = FALSE; +#line 18271 "Photo.c" } #line 2263 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_) { -#line 17741 "Photo.c" - PhotoID _tmp10_; - gint64 _tmp11_; - PhotoID _tmp12_; - gint64 _tmp13_; + if (_tmp5_) { +#line 18275 "Photo.c" + PhotoID _tmp9_; + gint64 _tmp10_; + PhotoID _tmp11_; + gint64 _tmp12_; #line 2264 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_id; + _tmp9_ = photo_id; #line 2264 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_.id; + _tmp10_ = _tmp9_.id; #line 2264 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = other_photo_id; + _tmp11_ = other_photo_id; #line 2264 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_.id; + _tmp12_ = _tmp11_.id; #line 2264 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp11_ != _tmp13_, "photo_id.id != other_photo_id.id"); -#line 17756 "Photo.c" + _vala_assert (_tmp10_ != _tmp12_, "photo_id.id != other_photo_id.id"); +#line 18290 "Photo.c" } } #line 2268 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = source; -#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = DATA_SOURCE_CLASS (photo_parent_class)->equals (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_DATA_SOURCE, DataSource), _tmp14_); -#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp15_; + result = DATA_SOURCE_CLASS (photo_parent_class)->equals (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_DATA_SOURCE, DataSource), source); #line 2268 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 2268 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17769 "Photo.c" +#line 18299 "Photo.c" } -static void photo_file_exif_updated (Photo* self) { +static void +photo_file_exif_updated (Photo* self) +{ GFile* file = NULL; GFile* _tmp0_; GFileInfo* info = NULL; @@ -17785,7 +18317,7 @@ static void photo_file_exif_updated (Photo* self) { gboolean _tmp15_ = FALSE; DetectedPhotoInformation* _tmp16_; gboolean success = FALSE; - gboolean _tmp37_; + gboolean _tmp34_; GError * _inner_error_ = NULL; #line 2272 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -17795,7 +18327,7 @@ static void photo_file_exif_updated (Photo* self) { file = _tmp0_; #line 2275 "/home/jens/Source/shotwell/src/Photo.vala" info = NULL; -#line 17797 "Photo.c" +#line 18329 "Photo.c" { GFileInfo* _tmp1_ = NULL; GFileInfo* _tmp2_; @@ -17806,7 +18338,7 @@ static void photo_file_exif_updated (Photo* self) { _tmp1_ = _tmp2_; #line 2277 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 17808 "Photo.c" +#line 18340 "Photo.c" goto __catch354_g_error; } #line 2277 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17819,7 +18351,7 @@ static void photo_file_exif_updated (Photo* self) { info = _tmp3_; #line 2276 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 17821 "Photo.c" +#line 18353 "Photo.c" } goto __finally354; __catch354_g_error: @@ -17844,7 +18376,7 @@ static void photo_file_exif_updated (Photo* self) { _g_free0 (_tmp5_); #line 2276 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 17846 "Photo.c" +#line 18378 "Photo.c" } __finally354: #line 2276 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17859,7 +18391,7 @@ static void photo_file_exif_updated (Photo* self) { g_clear_error (&_inner_error_); #line 2276 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17861 "Photo.c" +#line 18393 "Photo.c" } #line 2283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = info; @@ -17871,13 +18403,13 @@ static void photo_file_exif_updated (Photo* self) { _tmp9_ = photo_file_interrogator_new (file, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL); #line 2286 "/home/jens/Source/shotwell/src/Photo.vala" interrogator = _tmp9_; -#line 17873 "Photo.c" +#line 18405 "Photo.c" { #line 2288 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_interrogator_interrogate (interrogator, &_inner_error_); #line 2288 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 17879 "Photo.c" +#line 18411 "Photo.c" goto __catch355_g_error; } } @@ -17907,7 +18439,7 @@ static void photo_file_exif_updated (Photo* self) { _g_free0 (_tmp11_); #line 2287 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 17909 "Photo.c" +#line 18441 "Photo.c" } __finally355: #line 2287 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17924,7 +18456,7 @@ static void photo_file_exif_updated (Photo* self) { g_clear_error (&_inner_error_); #line 2287 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17926 "Photo.c" +#line 18458 "Photo.c" } #line 2293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = photo_file_interrogator_get_detected_photo_information (interrogator); @@ -17936,28 +18468,25 @@ static void photo_file_exif_updated (Photo* self) { if (_tmp16_ == NULL) { #line 2294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = TRUE; -#line 17938 "Photo.c" +#line 18470 "Photo.c" } else { - gboolean _tmp17_; #line 2294 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo_file_interrogator_get_is_photo_corrupted (interrogator); -#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp17_; -#line 17945 "Photo.c" + _tmp15_ = photo_file_interrogator_get_is_photo_corrupted (interrogator); +#line 18474 "Photo.c" } #line 2294 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_) { -#line 17949 "Photo.c" +#line 18478 "Photo.c" + gchar* _tmp17_; gchar* _tmp18_; - gchar* _tmp19_; #line 2295 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp17_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 2295 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 2295 "/home/jens/Source/shotwell/src/Photo.vala" - g_critical ("Photo.vala:2295: file_exif_updated: %s no longer an image", _tmp19_); + g_critical ("Photo.vala:2295: file_exif_updated: %s no longer an image", _tmp18_); #line 2295 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp19_); + _g_free0 (_tmp18_); #line 2297 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); #line 2297 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17968,75 +18497,69 @@ static void photo_file_exif_updated (Photo* self) { _g_object_unref0 (file); #line 2297 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17970 "Photo.c" +#line 18499 "Photo.c" } { - PhotoRow* _tmp20_; + PhotoRow* _tmp19_; #line 2301 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = self->row; + _tmp19_ = self->row; #line 2301 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17978 "Photo.c" +#line 18507 "Photo.c" { + PhotoTable* _tmp20_; PhotoTable* _tmp21_; - PhotoTable* _tmp22_; - PhotoID _tmp23_ = {0}; - GFileInfo* _tmp24_; - gint64 _tmp25_; - GTimeVal _tmp26_; - glong _tmp27_; + PhotoID _tmp22_ = {0}; + GFileInfo* _tmp23_; + GTimeVal _tmp24_; + glong _tmp25_; + DetectedPhotoInformation* _tmp26_; + const gchar* _tmp27_; DetectedPhotoInformation* _tmp28_; const gchar* _tmp29_; DetectedPhotoInformation* _tmp30_; const gchar* _tmp31_; - DetectedPhotoInformation* _tmp32_; - const gchar* _tmp33_; - PhotoRow* _tmp34_; - gboolean _tmp35_; + PhotoRow* _tmp32_; +#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp20_ = photo_table_get_instance (); #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = photo_table_get_instance (); + _tmp21_ = _tmp20_; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_; + photo_get_photo_id (self, &_tmp22_); #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (self, &_tmp23_); + _tmp23_ = info; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = info; + _tmp24_ = timestamp; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = g_file_info_get_size (_tmp24_); + _tmp25_ = _tmp24_.tv_sec; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = timestamp; + _tmp26_ = detected; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_.tv_sec; + _tmp27_ = _tmp26_->md5; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = detected; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _tmp28_->md5; + _tmp29_ = _tmp28_->exif_md5; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = detected; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _tmp30_->exif_md5; + _tmp31_ = _tmp30_->thumbnail_md5; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = detected; -#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp32_->thumbnail_md5; -#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = self->row; -#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = photo_table_master_exif_updated (_tmp22_, &_tmp23_, _tmp25_, _tmp27_, _tmp29_, _tmp31_, _tmp33_, _tmp34_); + _tmp32_ = self->row; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - success = _tmp35_; + success = photo_table_master_exif_updated (_tmp21_, &_tmp22_, g_file_info_get_size (_tmp23_), _tmp25_, _tmp27_, _tmp29_, _tmp31_, _tmp32_); #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp22_); -#line 18029 "Photo.c" + _database_table_unref0 (_tmp21_); +#line 18552 "Photo.c" } __finally356: { - PhotoRow* _tmp36_; + PhotoRow* _tmp33_; #line 2301 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = self->row; + _tmp33_ = self->row; #line 2301 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18038 "Photo.c" +#line 18561 "Photo.c" } #line 2301 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -18054,25 +18577,25 @@ static void photo_file_exif_updated (Photo* self) { g_clear_error (&_inner_error_); #line 2301 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18056 "Photo.c" +#line 18579 "Photo.c" } } #line 2306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = success; + _tmp34_ = success; #line 2306 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp37_) { -#line 18063 "Photo.c" - Alteration* _tmp38_; - Alteration* _tmp39_; + if (_tmp34_) { +#line 18586 "Photo.c" + Alteration* _tmp35_; + Alteration* _tmp36_; #line 2307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = alteration_new_from_list ("metadata:exif,metadata:md5"); + _tmp35_ = alteration_new_from_list ("metadata:exif,metadata:md5"); #line 2307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = _tmp38_; + _tmp36_ = _tmp35_; #line 2307 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp39_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp36_); #line 2307 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp39_); -#line 18074 "Photo.c" + _alteration_unref0 (_tmp36_); +#line 18597 "Photo.c" } #line 2272 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); @@ -18082,17 +18605,19 @@ static void photo_file_exif_updated (Photo* self) { _g_object_unref0 (info); #line 2272 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 18084 "Photo.c" +#line 18607 "Photo.c" } -static guint64 photo_real_get_filesize (MediaSource* base) { +static guint64 +photo_real_get_filesize (MediaSource* base) +{ Photo * self; guint64 result = 0ULL; GError * _inner_error_ = NULL; #line 2312 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 18094 "Photo.c" +#line 18619 "Photo.c" { PhotoRow* _tmp0_; guint64 _tmp5_ = 0ULL; @@ -18100,7 +18625,7 @@ static guint64 photo_real_get_filesize (MediaSource* base) { _tmp0_ = self->row; #line 2313 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18102 "Photo.c" +#line 18627 "Photo.c" { BackingPhotoRow* _tmp1_; gint64 _tmp2_; @@ -18110,18 +18635,18 @@ static guint64 photo_real_get_filesize (MediaSource* base) { _tmp2_ = _tmp1_->filesize; #line 2314 "/home/jens/Source/shotwell/src/Photo.vala" result = (guint64) _tmp2_; -#line 18112 "Photo.c" +#line 18637 "Photo.c" { PhotoRow* _tmp3_; #line 2313 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2313 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18119 "Photo.c" +#line 18644 "Photo.c" } #line 2314 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18123 "Photo.c" +#line 18648 "Photo.c" } __finally357: { @@ -18130,7 +18655,7 @@ static guint64 photo_real_get_filesize (MediaSource* base) { _tmp4_ = self->row; #line 2313 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18132 "Photo.c" +#line 18657 "Photo.c" } #line 2313 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -18138,18 +18663,20 @@ static guint64 photo_real_get_filesize (MediaSource* base) { g_clear_error (&_inner_error_); #line 2313 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 18140 "Photo.c" +#line 18665 "Photo.c" } } -static guint64 photo_real_get_master_filesize (MediaSource* base) { +static guint64 +photo_real_get_master_filesize (MediaSource* base) +{ Photo * self; guint64 result = 0ULL; GError * _inner_error_ = NULL; #line 2318 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 18151 "Photo.c" +#line 18678 "Photo.c" { PhotoRow* _tmp0_; guint64 _tmp6_ = 0ULL; @@ -18157,7 +18684,7 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) { _tmp0_ = self->row; #line 2319 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18159 "Photo.c" +#line 18686 "Photo.c" { PhotoRow* _tmp1_; BackingPhotoRow* _tmp2_; @@ -18170,18 +18697,18 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) { _tmp3_ = _tmp2_->filesize; #line 2320 "/home/jens/Source/shotwell/src/Photo.vala" result = (guint64) _tmp3_; -#line 18172 "Photo.c" +#line 18699 "Photo.c" { PhotoRow* _tmp4_; #line 2319 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2319 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18179 "Photo.c" +#line 18706 "Photo.c" } #line 2320 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18183 "Photo.c" +#line 18710 "Photo.c" } __finally358: { @@ -18190,7 +18717,7 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) { _tmp5_ = self->row; #line 2319 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18192 "Photo.c" +#line 18719 "Photo.c" } #line 2319 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -18198,17 +18725,19 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) { g_clear_error (&_inner_error_); #line 2319 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp6_; -#line 18200 "Photo.c" +#line 18727 "Photo.c" } } -guint64 photo_get_editable_filesize (Photo* self) { +guint64 +photo_get_editable_filesize (Photo* self) +{ guint64 result = 0ULL; GError * _inner_error_ = NULL; #line 2324 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); -#line 18210 "Photo.c" +#line 18739 "Photo.c" { PhotoRow* _tmp0_; guint64 _tmp5_ = 0ULL; @@ -18216,7 +18745,7 @@ guint64 photo_get_editable_filesize (Photo* self) { _tmp0_ = self->row; #line 2325 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18218 "Photo.c" +#line 18747 "Photo.c" { BackingPhotoRow* _tmp1_; gint64 _tmp2_; @@ -18226,18 +18755,18 @@ guint64 photo_get_editable_filesize (Photo* self) { _tmp2_ = _tmp1_->filesize; #line 2326 "/home/jens/Source/shotwell/src/Photo.vala" result = (guint64) _tmp2_; -#line 18228 "Photo.c" +#line 18757 "Photo.c" { PhotoRow* _tmp3_; #line 2325 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2325 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18235 "Photo.c" +#line 18764 "Photo.c" } #line 2326 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18239 "Photo.c" +#line 18768 "Photo.c" } __finally359: { @@ -18246,7 +18775,7 @@ guint64 photo_get_editable_filesize (Photo* self) { _tmp4_ = self->row; #line 2325 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18248 "Photo.c" +#line 18777 "Photo.c" } #line 2325 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -18254,12 +18783,14 @@ guint64 photo_get_editable_filesize (Photo* self) { g_clear_error (&_inner_error_); #line 2325 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 18256 "Photo.c" +#line 18785 "Photo.c" } } -static time_t photo_real_get_exposure_time (Dateable* base) { +static time_t +photo_real_get_exposure_time (Dateable* base) +{ Photo * self; time_t result = 0; time_t _tmp0_; @@ -18271,24 +18802,26 @@ static time_t photo_real_get_exposure_time (Dateable* base) { result = _tmp0_; #line 2331 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18273 "Photo.c" +#line 18804 "Photo.c" } -static gchar* photo_real_get_basename (MediaSource* base) { +static gchar* +photo_real_get_basename (MediaSource* base) +{ Photo * self; gchar* result = NULL; GError * _inner_error_ = NULL; #line 2334 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 18283 "Photo.c" +#line 18816 "Photo.c" { PhotoRow* _tmp0_; #line 2335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2335 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18290 "Photo.c" +#line 18823 "Photo.c" { const gchar* _tmp1_; gchar* _tmp2_; @@ -18298,18 +18831,18 @@ static gchar* photo_real_get_basename (MediaSource* base) { _tmp2_ = g_strdup (_tmp1_); #line 2336 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 18300 "Photo.c" +#line 18833 "Photo.c" { PhotoRow* _tmp3_; #line 2335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2335 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18307 "Photo.c" +#line 18840 "Photo.c" } #line 2336 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18311 "Photo.c" +#line 18844 "Photo.c" } __finally360: { @@ -18318,7 +18851,7 @@ static gchar* photo_real_get_basename (MediaSource* base) { _tmp4_ = self->row; #line 2335 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18320 "Photo.c" +#line 18853 "Photo.c" } #line 2335 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -18326,25 +18859,27 @@ static gchar* photo_real_get_basename (MediaSource* base) { g_clear_error (&_inner_error_); #line 2335 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 18328 "Photo.c" +#line 18861 "Photo.c" } } -static gchar* photo_real_get_title (MediaSource* base) { +static gchar* +photo_real_get_title (MediaSource* base) +{ Photo * self; gchar* result = NULL; GError * _inner_error_ = NULL; #line 2340 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 18339 "Photo.c" +#line 18874 "Photo.c" { PhotoRow* _tmp0_; #line 2341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2341 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18346 "Photo.c" +#line 18881 "Photo.c" { PhotoRow* _tmp1_; const gchar* _tmp2_; @@ -18357,18 +18892,18 @@ static gchar* photo_real_get_title (MediaSource* base) { _tmp3_ = g_strdup (_tmp2_); #line 2342 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 18359 "Photo.c" +#line 18894 "Photo.c" { PhotoRow* _tmp4_; #line 2341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2341 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18366 "Photo.c" +#line 18901 "Photo.c" } #line 2342 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18370 "Photo.c" +#line 18905 "Photo.c" } __finally361: { @@ -18377,7 +18912,7 @@ static gchar* photo_real_get_title (MediaSource* base) { _tmp5_ = self->row; #line 2341 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18379 "Photo.c" +#line 18914 "Photo.c" } #line 2341 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -18385,25 +18920,27 @@ static gchar* photo_real_get_title (MediaSource* base) { g_clear_error (&_inner_error_); #line 2341 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 18387 "Photo.c" +#line 18922 "Photo.c" } } -static gchar* photo_real_get_comment (MediaSource* base) { +static gchar* +photo_real_get_comment (MediaSource* base) +{ Photo * self; gchar* result = NULL; GError * _inner_error_ = NULL; #line 2346 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 18398 "Photo.c" +#line 18935 "Photo.c" { PhotoRow* _tmp0_; #line 2347 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2347 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18405 "Photo.c" +#line 18942 "Photo.c" { PhotoRow* _tmp1_; const gchar* _tmp2_; @@ -18416,18 +18953,18 @@ static gchar* photo_real_get_comment (MediaSource* base) { _tmp3_ = g_strdup (_tmp2_); #line 2348 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 18418 "Photo.c" +#line 18955 "Photo.c" { PhotoRow* _tmp4_; #line 2347 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2347 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18425 "Photo.c" +#line 18962 "Photo.c" } #line 2348 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18429 "Photo.c" +#line 18966 "Photo.c" } __finally362: { @@ -18436,7 +18973,7 @@ static gchar* photo_real_get_comment (MediaSource* base) { _tmp5_ = self->row; #line 2347 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18438 "Photo.c" +#line 18975 "Photo.c" } #line 2347 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -18444,116 +18981,113 @@ static gchar* photo_real_get_comment (MediaSource* base) { g_clear_error (&_inner_error_); #line 2347 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 18446 "Photo.c" +#line 18983 "Photo.c" } } -static void photo_real_set_title (MediaSource* base, const gchar* title) { +static void +photo_real_set_title (MediaSource* base, + const gchar* title) +{ Photo * self; gchar* new_title = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; gboolean committed = FALSE; - gboolean _tmp18_; + gboolean _tmp16_; GError * _inner_error_ = NULL; #line 2352 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2353 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = title; -#line 2353 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = media_source_prep_title (_tmp0_); + _tmp0_ = media_source_prep_title (title); #line 2353 "/home/jens/Source/shotwell/src/Photo.vala" - new_title = _tmp1_; + new_title = _tmp0_; #line 2355 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 18469 "Photo.c" +#line 19006 "Photo.c" { - PhotoRow* _tmp2_; + PhotoRow* _tmp1_; #line 2356 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = self->row; + _tmp1_ = self->row; #line 2356 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18476 "Photo.c" +#line 19013 "Photo.c" { - const gchar* _tmp3_; - PhotoRow* _tmp4_; - const gchar* _tmp5_; + const gchar* _tmp2_; + PhotoRow* _tmp3_; + const gchar* _tmp4_; + PhotoTable* _tmp6_; PhotoTable* _tmp7_; - PhotoTable* _tmp8_; - PhotoRow* _tmp9_; - PhotoID _tmp10_; - const gchar* _tmp11_; - gboolean _tmp12_; - gboolean _tmp13_; + PhotoRow* _tmp8_; + PhotoID _tmp9_; + const gchar* _tmp10_; + gboolean _tmp11_; #line 2357 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = new_title; + _tmp2_ = new_title; #line 2357 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->row; + _tmp3_ = self->row; #line 2357 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_->title; + _tmp4_ = _tmp3_->title; #line 2357 "/home/jens/Source/shotwell/src/Photo.vala" - if (g_strcmp0 (_tmp3_, _tmp5_) == 0) { -#line 18496 "Photo.c" + if (g_strcmp0 (_tmp2_, _tmp4_) == 0) { +#line 19032 "Photo.c" { - PhotoRow* _tmp6_; + PhotoRow* _tmp5_; #line 2356 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; + _tmp5_ = self->row; #line 2356 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18503 "Photo.c" +#line 19039 "Photo.c" } #line 2358 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_title); #line 2358 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18509 "Photo.c" +#line 19045 "Photo.c" } #line 2360 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo_table_get_instance (); -#line 2360 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_; + _tmp6_ = photo_table_get_instance (); #line 2360 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = self->row; + _tmp7_ = _tmp6_; #line 2360 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_->photo_id; + _tmp8_ = self->row; #line 2360 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = new_title; + _tmp9_ = _tmp8_->photo_id; #line 2360 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_table_set_title (_tmp8_, &_tmp10_, _tmp11_); + _tmp10_ = new_title; #line 2360 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp12_; + committed = photo_table_set_title (_tmp7_, &_tmp9_, _tmp10_); #line 2360 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp8_); + _database_table_unref0 (_tmp7_); #line 2361 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = committed; + _tmp11_ = committed; #line 2361 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp13_) { -#line 18531 "Photo.c" - PhotoRow* _tmp14_; - const gchar* _tmp15_; - gchar* _tmp16_; + if (_tmp11_) { +#line 19065 "Photo.c" + PhotoRow* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; #line 2362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->row; + _tmp12_ = self->row; #line 2362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = new_title; + _tmp13_ = new_title; #line 2362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = g_strdup (_tmp15_); + _tmp14_ = g_strdup (_tmp13_); #line 2362 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp14_->title); + _g_free0 (_tmp12_->title); #line 2362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_->title = _tmp16_; -#line 18545 "Photo.c" + _tmp12_->title = _tmp14_; +#line 19079 "Photo.c" } } __finally363: { - PhotoRow* _tmp17_; + PhotoRow* _tmp15_; #line 2356 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = self->row; + _tmp15_ = self->row; #line 2356 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18555 "Photo.c" +#line 19089 "Photo.c" } #line 2356 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -18565,145 +19099,142 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) { g_clear_error (&_inner_error_); #line 2356 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18567 "Photo.c" +#line 19101 "Photo.c" } } #line 2365 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = committed; + _tmp16_ = committed; #line 2365 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp18_) { -#line 18574 "Photo.c" - Alteration* _tmp19_; - Alteration* _tmp20_; + if (_tmp16_) { +#line 19108 "Photo.c" + Alteration* _tmp17_; + Alteration* _tmp18_; #line 2366 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = alteration_new ("metadata", "name"); + _tmp17_ = alteration_new ("metadata", "name"); #line 2366 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_; + _tmp18_ = _tmp17_; #line 2366 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_); #line 2366 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp20_); -#line 18585 "Photo.c" + _alteration_unref0 (_tmp18_); +#line 19119 "Photo.c" } #line 2352 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_title); -#line 18589 "Photo.c" +#line 19123 "Photo.c" } -static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment) { +static gboolean +photo_real_set_comment (MediaSource* base, + const gchar* comment) +{ Photo * self; gboolean result = FALSE; gchar* new_comment = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; gboolean committed = FALSE; - gboolean _tmp19_; + gboolean _tmp17_; GError * _inner_error_ = NULL; #line 2369 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2370 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = comment; -#line 2370 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = media_source_prep_comment (_tmp0_); + _tmp0_ = media_source_prep_comment (comment); #line 2370 "/home/jens/Source/shotwell/src/Photo.vala" - new_comment = _tmp1_; + new_comment = _tmp0_; #line 2372 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 18612 "Photo.c" +#line 19146 "Photo.c" { - PhotoRow* _tmp2_; + PhotoRow* _tmp1_; #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = self->row; + _tmp1_ = self->row; #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18619 "Photo.c" +#line 19153 "Photo.c" { - const gchar* _tmp3_; - PhotoRow* _tmp4_; - const gchar* _tmp5_; + const gchar* _tmp2_; + PhotoRow* _tmp3_; + const gchar* _tmp4_; + PhotoTable* _tmp6_; PhotoTable* _tmp7_; - PhotoTable* _tmp8_; - PhotoRow* _tmp9_; - PhotoID _tmp10_; - const gchar* _tmp11_; - gboolean _tmp12_; - gboolean _tmp13_; + PhotoRow* _tmp8_; + PhotoID _tmp9_; + const gchar* _tmp10_; + gboolean _tmp11_; #line 2374 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = new_comment; + _tmp2_ = new_comment; #line 2374 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->row; + _tmp3_ = self->row; #line 2374 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_->comment; + _tmp4_ = _tmp3_->comment; #line 2374 "/home/jens/Source/shotwell/src/Photo.vala" - if (g_strcmp0 (_tmp3_, _tmp5_) == 0) { + if (g_strcmp0 (_tmp2_, _tmp4_) == 0) { #line 2375 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 18641 "Photo.c" +#line 19174 "Photo.c" { - PhotoRow* _tmp6_; + PhotoRow* _tmp5_; #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; + _tmp5_ = self->row; #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18648 "Photo.c" +#line 19181 "Photo.c" } #line 2375 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_comment); #line 2375 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18654 "Photo.c" +#line 19187 "Photo.c" } #line 2377 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo_table_get_instance (); -#line 2377 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_; + _tmp6_ = photo_table_get_instance (); #line 2377 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = self->row; + _tmp7_ = _tmp6_; #line 2377 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_->photo_id; + _tmp8_ = self->row; #line 2377 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = new_comment; + _tmp9_ = _tmp8_->photo_id; #line 2377 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_table_set_comment (_tmp8_, &_tmp10_, _tmp11_); + _tmp10_ = new_comment; #line 2377 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp12_; + committed = photo_table_set_comment (_tmp7_, &_tmp9_, _tmp10_); #line 2377 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp8_); + _database_table_unref0 (_tmp7_); #line 2378 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = committed; + _tmp11_ = committed; #line 2378 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp13_) { -#line 18676 "Photo.c" - PhotoRow* _tmp14_; - const gchar* _tmp15_; - gchar* _tmp16_; + if (_tmp11_) { +#line 19207 "Photo.c" + PhotoRow* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; #line 2379 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->row; + _tmp12_ = self->row; #line 2379 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = new_comment; + _tmp13_ = new_comment; #line 2379 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = g_strdup (_tmp15_); + _tmp14_ = g_strdup (_tmp13_); #line 2379 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp14_->comment); + _g_free0 (_tmp12_->comment); #line 2379 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_->comment = _tmp16_; -#line 18690 "Photo.c" + _tmp12_->comment = _tmp14_; +#line 19221 "Photo.c" } } __finally364: { - PhotoRow* _tmp17_; + PhotoRow* _tmp15_; #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = self->row; + _tmp15_ = self->row; #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18700 "Photo.c" +#line 19231 "Photo.c" } #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18704 "Photo.c" - gboolean _tmp18_ = FALSE; +#line 19235 "Photo.c" + gboolean _tmp16_ = FALSE; #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_comment); #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" @@ -18711,26 +19242,26 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment) #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp18_; -#line 18714 "Photo.c" + return _tmp16_; +#line 19245 "Photo.c" } } #line 2382 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = committed; + _tmp17_ = committed; #line 2382 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp19_) { -#line 18721 "Photo.c" - Alteration* _tmp20_; - Alteration* _tmp21_; + if (_tmp17_) { +#line 19252 "Photo.c" + Alteration* _tmp18_; + Alteration* _tmp19_; #line 2383 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = alteration_new ("metadata", "comment"); + _tmp18_ = alteration_new ("metadata", "comment"); #line 2383 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp20_; + _tmp19_ = _tmp18_; #line 2383 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp19_); #line 2383 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp21_); -#line 18732 "Photo.c" + _alteration_unref0 (_tmp19_); +#line 19263 "Photo.c" } #line 2385 "/home/jens/Source/shotwell/src/Photo.vala" result = committed; @@ -18738,18 +19269,23 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment) _g_free0 (new_comment); #line 2385 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18740 "Photo.c" +#line 19271 "Photo.c" } -static gpointer _g_error_copy0 (gpointer self) { +static gpointer +_g_error_copy0 (gpointer self) +{ #line 2395 "/home/jens/Source/shotwell/src/Photo.vala" return self ? g_error_copy (self) : NULL; -#line 18747 "Photo.c" +#line 19280 "Photo.c" } -void photo_set_import_id (Photo* self, ImportID* import_id) { +void +photo_set_import_id (Photo* self, + ImportID* import_id) +{ GError* dberr = NULL; GError* _tmp13_; GError * _inner_error_ = NULL; @@ -18759,14 +19295,14 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { g_return_if_fail (import_id != NULL); #line 2389 "/home/jens/Source/shotwell/src/Photo.vala" dberr = NULL; -#line 18761 "Photo.c" +#line 19297 "Photo.c" { PhotoRow* _tmp0_; #line 2390 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2390 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18768 "Photo.c" +#line 19304 "Photo.c" { { PhotoTable* _tmp1_; @@ -18794,7 +19330,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2392 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 18796 "Photo.c" +#line 19332 "Photo.c" goto __catch366_database_error; } { @@ -18803,7 +19339,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { _tmp6_ = self->row; #line 2390 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18805 "Photo.c" +#line 19341 "Photo.c" } #line 2392 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (dberr); @@ -18813,7 +19349,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { g_clear_error (&_inner_error_); #line 2392 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18815 "Photo.c" +#line 19351 "Photo.c" } #line 2393 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->row; @@ -18821,7 +19357,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { _tmp8_ = *import_id; #line 2393 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_->import_id = _tmp8_; -#line 18823 "Photo.c" +#line 19359 "Photo.c" } goto __finally366; __catch366_database_error: @@ -18843,19 +19379,19 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { dberr = _tmp10_; #line 2391 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 18845 "Photo.c" +#line 19381 "Photo.c" } __finally366: #line 2391 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18850 "Photo.c" +#line 19386 "Photo.c" { PhotoRow* _tmp11_; #line 2390 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; #line 2390 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18857 "Photo.c" +#line 19393 "Photo.c" } #line 2391 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (dberr); @@ -18865,7 +19401,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { g_clear_error (&_inner_error_); #line 2391 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18867 "Photo.c" +#line 19403 "Photo.c" } } __finally365: @@ -18875,7 +19411,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { _tmp12_ = self->row; #line 2390 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18877 "Photo.c" +#line 19413 "Photo.c" } #line 2390 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -18887,14 +19423,14 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { g_clear_error (&_inner_error_); #line 2390 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18889 "Photo.c" +#line 19425 "Photo.c" } } #line 2399 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = dberr; #line 2399 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_ == NULL) { -#line 18896 "Photo.c" +#line 19432 "Photo.c" Alteration* _tmp14_; Alteration* _tmp15_; #line 2400 "/home/jens/Source/shotwell/src/Photo.vala" @@ -18905,7 +19441,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_); #line 2400 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp15_); -#line 18907 "Photo.c" +#line 19443 "Photo.c" } else { gchar* _tmp16_; gchar* _tmp17_; @@ -18923,32 +19459,32 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { g_warning ("Photo.vala:2402: Unable to write import ID for %s: %s", _tmp17_, _tmp19_); #line 2402 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp17_); -#line 18925 "Photo.c" +#line 19461 "Photo.c" } #line 2388 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (dberr); -#line 18929 "Photo.c" +#line 19465 "Photo.c" } -void photo_set_title_persistent (Photo* self, const gchar* title, GError** error) { +void +photo_set_title_persistent (Photo* self, + const gchar* title, + GError** error) +{ PhotoFileReader* source = NULL; PhotoFileReader* _tmp0_; PhotoFileReader* _tmp1_; - PhotoFileFormat _tmp2_; - gboolean _tmp3_; PhotoMetadata* metadata = NULL; - PhotoFileReader* _tmp8_; - PhotoMetadata* _tmp9_; - PhotoMetadata* _tmp10_; - const gchar* _tmp11_; + PhotoFileReader* _tmp5_; + PhotoMetadata* _tmp6_; + PhotoMetadata* _tmp7_; PhotoFileMetadataWriter* writer = NULL; - PhotoFileReader* _tmp12_; - PhotoFileMetadataWriter* _tmp13_; - PhotoFileReader* _tmp14_; - GFile* _tmp15_; - GFile* _tmp16_; - const gchar* _tmp22_; + PhotoFileReader* _tmp8_; + PhotoFileMetadataWriter* _tmp9_; + PhotoFileReader* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; GError * _inner_error_ = NULL; #line 2405 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -18959,42 +19495,35 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error #line 2409 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = source; #line 2409 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2409 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_file_format_can_write_metadata (_tmp2_); -#line 2409 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp3_) { -#line 18966 "Photo.c" - PhotoFileReader* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - const gchar* _tmp7_; + if (!photo_file_format_can_write_metadata (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)))) { +#line 19498 "Photo.c" + PhotoFileReader* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 2410 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = source; + _tmp2_ = source; #line 2410 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp3_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 2410 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 2410 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2410: No photo file writer available for %s", _tmp6_); + g_warning ("Photo.vala:2410: No photo file writer available for %s", _tmp4_); #line 2410 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp4_); #line 2412 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = title; -#line 2412 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_); + media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), title); #line 2414 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); #line 2414 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18989 "Photo.c" +#line 19518 "Photo.c" } #line 2417 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = source; + _tmp5_ = source; #line 2417 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_); + _tmp6_ = photo_file_reader_read_metadata (_tmp5_, &_inner_error_); #line 2417 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp9_; + metadata = _tmp6_; #line 2417 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2417 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19003,20 +19532,18 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error _photo_file_adapter_unref0 (source); #line 2417 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19005 "Photo.c" +#line 19534 "Photo.c" } #line 2418 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = metadata; -#line 2418 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = title; + _tmp7_ = metadata; #line 2418 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_title (_tmp10_, _tmp11_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_title (_tmp7_, title, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 2420 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = source; + _tmp8_ = source; #line 2420 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_file_reader_create_metadata_writer (_tmp12_, &_inner_error_); + _tmp9_ = photo_file_reader_create_metadata_writer (_tmp8_, &_inner_error_); #line 2420 "/home/jens/Source/shotwell/src/Photo.vala" - writer = _tmp13_; + writer = _tmp9_; #line 2420 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2420 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19027,50 +19554,50 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error _photo_file_adapter_unref0 (source); #line 2420 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19029 "Photo.c" +#line 19556 "Photo.c" } #line 2421 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = source; + _tmp10_ = source; #line 2421 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp11_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 2421 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_; + _tmp12_ = _tmp11_; #line 2421 "/home/jens/Source/shotwell/src/Photo.vala" - library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_title"); + library_monitor_blacklist_file (_tmp12_, "Photo.set_persistent_title"); #line 2421 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp16_); -#line 19041 "Photo.c" + _g_object_unref0 (_tmp12_); +#line 19568 "Photo.c" { - PhotoFileMetadataWriter* _tmp17_; - PhotoMetadata* _tmp18_; + PhotoFileMetadataWriter* _tmp13_; + PhotoMetadata* _tmp14_; #line 2423 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = writer; + _tmp13_ = writer; #line 2423 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = metadata; + _tmp14_ = metadata; #line 2423 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp13_, _tmp14_, &_inner_error_); #line 2423 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 19053 "Photo.c" +#line 19580 "Photo.c" goto __finally367; } } __finally367: { - PhotoFileReader* _tmp19_; - GFile* _tmp20_; - GFile* _tmp21_; + PhotoFileReader* _tmp15_; + GFile* _tmp16_; + GFile* _tmp17_; #line 2425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = source; + _tmp15_ = source; #line 2425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp16_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 2425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp20_; + _tmp17_ = _tmp16_; #line 2425 "/home/jens/Source/shotwell/src/Photo.vala" - library_monitor_unblacklist_file (_tmp21_); + library_monitor_unblacklist_file (_tmp17_); #line 2425 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp21_); -#line 19072 "Photo.c" + _g_object_unref0 (_tmp17_); +#line 19599 "Photo.c" } #line 2422 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -19084,12 +19611,10 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error _photo_file_adapter_unref0 (source); #line 2422 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19086 "Photo.c" +#line 19613 "Photo.c" } #line 2428 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = title; -#line 2428 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp22_); + media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), title); #line 2430 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_exif_updated (self); #line 2405 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19098,28 +19623,28 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error _media_metadata_unref0 (metadata); #line 2405 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 19100 "Photo.c" +#line 19625 "Photo.c" } -void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** error) { +void +photo_set_comment_persistent (Photo* self, + const gchar* comment, + GError** error) +{ PhotoFileReader* source = NULL; PhotoFileReader* _tmp0_; PhotoFileReader* _tmp1_; - PhotoFileFormat _tmp2_; - gboolean _tmp3_; PhotoMetadata* metadata = NULL; - PhotoFileReader* _tmp8_; - PhotoMetadata* _tmp9_; - PhotoMetadata* _tmp10_; - const gchar* _tmp11_; + PhotoFileReader* _tmp5_; + PhotoMetadata* _tmp6_; + PhotoMetadata* _tmp7_; PhotoFileMetadataWriter* writer = NULL; - PhotoFileReader* _tmp12_; - PhotoFileMetadataWriter* _tmp13_; - PhotoFileReader* _tmp14_; - GFile* _tmp15_; - GFile* _tmp16_; - const gchar* _tmp22_; + PhotoFileReader* _tmp8_; + PhotoFileMetadataWriter* _tmp9_; + PhotoFileReader* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; GError * _inner_error_ = NULL; #line 2433 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -19130,42 +19655,35 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e #line 2437 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = source; #line 2437 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2437 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_file_format_can_write_metadata (_tmp2_); -#line 2437 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp3_) { -#line 19137 "Photo.c" - PhotoFileReader* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - const gchar* _tmp7_; + if (!photo_file_format_can_write_metadata (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)))) { +#line 19658 "Photo.c" + PhotoFileReader* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 2438 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = source; + _tmp2_ = source; #line 2438 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp3_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 2438 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 2438 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2438: No photo file writer available for %s", _tmp6_); + g_warning ("Photo.vala:2438: No photo file writer available for %s", _tmp4_); #line 2438 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp6_); -#line 2440 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = comment; + _g_free0 (_tmp4_); #line 2440 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_); + media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), comment); #line 2442 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); #line 2442 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19160 "Photo.c" +#line 19678 "Photo.c" } #line 2445 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = source; + _tmp5_ = source; #line 2445 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_); + _tmp6_ = photo_file_reader_read_metadata (_tmp5_, &_inner_error_); #line 2445 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp9_; + metadata = _tmp6_; #line 2445 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2445 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19174,20 +19692,18 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e _photo_file_adapter_unref0 (source); #line 2445 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19176 "Photo.c" +#line 19694 "Photo.c" } #line 2446 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = metadata; -#line 2446 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = comment; + _tmp7_ = metadata; #line 2446 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_comment (_tmp10_, _tmp11_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_comment (_tmp7_, comment, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 2448 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = source; + _tmp8_ = source; #line 2448 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_file_reader_create_metadata_writer (_tmp12_, &_inner_error_); + _tmp9_ = photo_file_reader_create_metadata_writer (_tmp8_, &_inner_error_); #line 2448 "/home/jens/Source/shotwell/src/Photo.vala" - writer = _tmp13_; + writer = _tmp9_; #line 2448 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2448 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19198,50 +19714,50 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e _photo_file_adapter_unref0 (source); #line 2448 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19200 "Photo.c" +#line 19716 "Photo.c" } #line 2449 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = source; + _tmp10_ = source; #line 2449 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp11_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 2449 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_; + _tmp12_ = _tmp11_; #line 2449 "/home/jens/Source/shotwell/src/Photo.vala" - library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_comment"); + library_monitor_blacklist_file (_tmp12_, "Photo.set_persistent_comment"); #line 2449 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp16_); -#line 19212 "Photo.c" + _g_object_unref0 (_tmp12_); +#line 19728 "Photo.c" { - PhotoFileMetadataWriter* _tmp17_; - PhotoMetadata* _tmp18_; + PhotoFileMetadataWriter* _tmp13_; + PhotoMetadata* _tmp14_; #line 2451 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = writer; + _tmp13_ = writer; #line 2451 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = metadata; + _tmp14_ = metadata; #line 2451 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp13_, _tmp14_, &_inner_error_); #line 2451 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 19224 "Photo.c" +#line 19740 "Photo.c" goto __finally368; } } __finally368: { - PhotoFileReader* _tmp19_; - GFile* _tmp20_; - GFile* _tmp21_; + PhotoFileReader* _tmp15_; + GFile* _tmp16_; + GFile* _tmp17_; #line 2453 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = source; + _tmp15_ = source; #line 2453 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp16_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 2453 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp20_; + _tmp17_ = _tmp16_; #line 2453 "/home/jens/Source/shotwell/src/Photo.vala" - library_monitor_unblacklist_file (_tmp21_); + library_monitor_unblacklist_file (_tmp17_); #line 2453 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp21_); -#line 19243 "Photo.c" + _g_object_unref0 (_tmp17_); +#line 19759 "Photo.c" } #line 2450 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -19255,12 +19771,10 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e _photo_file_adapter_unref0 (source); #line 2450 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19257 "Photo.c" +#line 19773 "Photo.c" } #line 2456 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = comment; -#line 2456 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp22_); + media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), comment); #line 2458 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_exif_updated (self); #line 2433 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19269,33 +19783,34 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e _media_metadata_unref0 (metadata); #line 2433 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 19271 "Photo.c" +#line 19785 "Photo.c" } -static void photo_real_set_exposure_time (Dateable* base, time_t time) { +static void +photo_real_set_exposure_time (Dateable* base, + time_t time) +{ Photo * self; gboolean committed = FALSE; - gboolean _tmp12_; + gboolean _tmp8_; GError * _inner_error_ = NULL; #line 2461 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 19282 "Photo.c" +#line 19799 "Photo.c" { PhotoRow* _tmp0_; #line 2463 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2463 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19289 "Photo.c" +#line 19806 "Photo.c" { PhotoTable* _tmp1_; PhotoTable* _tmp2_; PhotoRow* _tmp3_; PhotoID _tmp4_; - time_t _tmp5_; - gboolean _tmp6_; - gboolean _tmp7_; + gboolean _tmp5_; #line 2464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); #line 2464 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19305,42 +19820,32 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) { #line 2464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->photo_id; #line 2464 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = time; -#line 2464 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_table_set_exposure_time (_tmp2_, &_tmp4_, _tmp5_); -#line 2464 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp6_; + committed = photo_table_set_exposure_time (_tmp2_, &_tmp4_, time); #line 2464 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); #line 2465 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = committed; + _tmp5_ = committed; #line 2465 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp7_) { -#line 19318 "Photo.c" - PhotoRow* _tmp8_; - time_t _tmp9_; - time_t _tmp10_; -#line 2466 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = self->row; + if (_tmp5_) { +#line 19829 "Photo.c" + PhotoRow* _tmp6_; #line 2466 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = time; + _tmp6_ = self->row; #line 2466 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_->exposure_time = _tmp9_; + _tmp6_->exposure_time = time; #line 2467 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = time; -#line 2467 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->cached_exposure_time = _tmp10_; -#line 19332 "Photo.c" + self->priv->cached_exposure_time = time; +#line 19837 "Photo.c" } } __finally369: { - PhotoRow* _tmp11_; + PhotoRow* _tmp7_; #line 2463 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = self->row; + _tmp7_ = self->row; #line 2463 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19342 "Photo.c" +#line 19847 "Photo.c" } #line 2463 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -19350,49 +19855,49 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) { g_clear_error (&_inner_error_); #line 2463 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19352 "Photo.c" +#line 19857 "Photo.c" } } #line 2471 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = committed; + _tmp8_ = committed; #line 2471 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_) { -#line 19359 "Photo.c" - Alteration* _tmp13_; - Alteration* _tmp14_; + if (_tmp8_) { +#line 19864 "Photo.c" + Alteration* _tmp9_; + Alteration* _tmp10_; #line 2472 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = alteration_new ("metadata", "exposure-time"); + _tmp9_ = alteration_new ("metadata", "exposure-time"); #line 2472 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_; + _tmp10_ = _tmp9_; #line 2472 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp14_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp10_); #line 2472 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp14_); -#line 19370 "Photo.c" + _alteration_unref0 (_tmp10_); +#line 19875 "Photo.c" } } -void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** error) { +void +photo_set_exposure_time_persistent (Photo* self, + time_t time, + GError** error) +{ PhotoFileReader* source = NULL; PhotoFileReader* _tmp0_; PhotoFileReader* _tmp1_; - PhotoFileFormat _tmp2_; - gboolean _tmp3_; PhotoMetadata* metadata = NULL; - PhotoFileReader* _tmp8_; - PhotoMetadata* _tmp9_; - PhotoMetadata* _tmp10_; - time_t _tmp11_; - MetadataDateTime* _tmp12_; - MetadataDateTime* _tmp13_; + PhotoFileReader* _tmp5_; + PhotoMetadata* _tmp6_; + PhotoMetadata* _tmp7_; + MetadataDateTime* _tmp8_; + MetadataDateTime* _tmp9_; PhotoFileMetadataWriter* writer = NULL; - PhotoFileReader* _tmp14_; - PhotoFileMetadataWriter* _tmp15_; - PhotoFileReader* _tmp16_; - GFile* _tmp17_; - GFile* _tmp18_; - time_t _tmp24_; + PhotoFileReader* _tmp10_; + PhotoFileMetadataWriter* _tmp11_; + PhotoFileReader* _tmp12_; + GFile* _tmp13_; + GFile* _tmp14_; GError * _inner_error_ = NULL; #line 2475 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -19403,42 +19908,35 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro #line 2479 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = source; #line 2479 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2479 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_file_format_can_write_metadata (_tmp2_); -#line 2479 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp3_) { -#line 19410 "Photo.c" - PhotoFileReader* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - time_t _tmp7_; + if (!photo_file_format_can_write_metadata (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)))) { +#line 19911 "Photo.c" + PhotoFileReader* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 2480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = source; + _tmp2_ = source; #line 2480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp3_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 2480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 2480 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2480: No photo file writer available for %s", _tmp6_); + g_warning ("Photo.vala:2480: No photo file writer available for %s", _tmp4_); #line 2480 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp6_); -#line 2482 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = time; + _g_free0 (_tmp4_); #line 2482 "/home/jens/Source/shotwell/src/Photo.vala" - dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATEABLE, Dateable), _tmp7_); + dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATEABLE, Dateable), time); #line 2484 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); #line 2484 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19433 "Photo.c" +#line 19931 "Photo.c" } #line 2487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = source; + _tmp5_ = source; #line 2487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_); + _tmp6_ = photo_file_reader_read_metadata (_tmp5_, &_inner_error_); #line 2487 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp9_; + metadata = _tmp6_; #line 2487 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2487 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19447,26 +19945,24 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro _photo_file_adapter_unref0 (source); #line 2487 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19449 "Photo.c" +#line 19947 "Photo.c" } #line 2488 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = metadata; -#line 2488 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = time; + _tmp7_ = metadata; #line 2488 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = metadata_date_time_new (_tmp11_); + _tmp8_ = metadata_date_time_new (time); #line 2488 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_; + _tmp9_ = _tmp8_; #line 2488 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_exposure_date_time (_tmp10_, _tmp13_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_exposure_date_time (_tmp7_, _tmp9_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 2488 "/home/jens/Source/shotwell/src/Photo.vala" - _metadata_date_time_unref0 (_tmp13_); + _metadata_date_time_unref0 (_tmp9_); #line 2490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = source; + _tmp10_ = source; #line 2490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo_file_reader_create_metadata_writer (_tmp14_, &_inner_error_); + _tmp11_ = photo_file_reader_create_metadata_writer (_tmp10_, &_inner_error_); #line 2490 "/home/jens/Source/shotwell/src/Photo.vala" - writer = _tmp15_; + writer = _tmp11_; #line 2490 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2490 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19477,50 +19973,50 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro _photo_file_adapter_unref0 (source); #line 2490 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19479 "Photo.c" +#line 19975 "Photo.c" } #line 2491 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = source; + _tmp12_ = source; #line 2491 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp13_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 2491 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_; + _tmp14_ = _tmp13_; #line 2491 "/home/jens/Source/shotwell/src/Photo.vala" - library_monitor_blacklist_file (_tmp18_, "Photo.set_exposure_time_persistent"); + library_monitor_blacklist_file (_tmp14_, "Photo.set_exposure_time_persistent"); #line 2491 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp18_); -#line 19491 "Photo.c" + _g_object_unref0 (_tmp14_); +#line 19987 "Photo.c" { - PhotoFileMetadataWriter* _tmp19_; - PhotoMetadata* _tmp20_; + PhotoFileMetadataWriter* _tmp15_; + PhotoMetadata* _tmp16_; #line 2493 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = writer; + _tmp15_ = writer; #line 2493 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = metadata; + _tmp16_ = metadata; #line 2493 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp19_, _tmp20_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp15_, _tmp16_, &_inner_error_); #line 2493 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 19503 "Photo.c" +#line 19999 "Photo.c" goto __finally370; } } __finally370: { - PhotoFileReader* _tmp21_; - GFile* _tmp22_; - GFile* _tmp23_; + PhotoFileReader* _tmp17_; + GFile* _tmp18_; + GFile* _tmp19_; #line 2495 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = source; + _tmp17_ = source; #line 2495 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp18_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 2495 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _tmp22_; + _tmp19_ = _tmp18_; #line 2495 "/home/jens/Source/shotwell/src/Photo.vala" - library_monitor_unblacklist_file (_tmp23_); + library_monitor_unblacklist_file (_tmp19_); #line 2495 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp23_); -#line 19522 "Photo.c" + _g_object_unref0 (_tmp19_); +#line 20018 "Photo.c" } #line 2492 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -19534,12 +20030,10 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro _photo_file_adapter_unref0 (source); #line 2492 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19536 "Photo.c" +#line 20032 "Photo.c" } #line 2498 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = time; -#line 2498 "/home/jens/Source/shotwell/src/Photo.vala" - dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATEABLE, Dateable), _tmp24_); + dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATEABLE, Dateable), time); #line 2500 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_exif_updated (self); #line 2475 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19548,7 +20042,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro _media_metadata_unref0 (metadata); #line 2475 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 19550 "Photo.c" +#line 20044 "Photo.c" } @@ -19565,16 +20059,14 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro * Pipeline steps that do not affect the image geometry are * ignored. */ -static void photo_real_get_dimensions (MediaSource* base, PhotoException disallowed_steps, Dimensions* result) { +static void +photo_real_get_dimensions (MediaSource* base, + PhotoException disallowed_steps, + Dimensions* result) +{ Photo * self; Dimensions returned_dims = {0}; Dimensions _tmp0_ = {0}; - PhotoException _tmp1_; - gboolean _tmp2_; - PhotoException _tmp10_; - gboolean _tmp11_; - PhotoException _tmp22_; - gboolean _tmp23_; #line 2516 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2518 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19582,23 +20074,16 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo #line 2518 "/home/jens/Source/shotwell/src/Photo.vala" returned_dims = _tmp0_; #line 2521 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = disallowed_steps; -#line 2521 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_exception_allows (_tmp1_, PHOTO_EXCEPTION_ORIENTATION); -#line 2521 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_) { -#line 19589 "Photo.c" + if (photo_exception_allows (disallowed_steps, PHOTO_EXCEPTION_ORIENTATION)) { +#line 20077 "Photo.c" Orientation ori_tmp = 0; - Orientation _tmp3_; - Orientation _tmp4_; + Orientation _tmp1_; #line 2522 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_get_orientation (self); -#line 2522 "/home/jens/Source/shotwell/src/Photo.vala" - ori_tmp = _tmp3_; + ori_tmp = photo_get_orientation (self); #line 2525 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = ori_tmp; + _tmp1_ = ori_tmp; #line 2525 "/home/jens/Source/shotwell/src/Photo.vala" - switch (_tmp4_) { + switch (_tmp1_) { #line 2525 "/home/jens/Source/shotwell/src/Photo.vala" case ORIENTATION_LEFT_TOP: #line 2525 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19607,131 +20092,122 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo case ORIENTATION_LEFT_BOTTOM: #line 2525 "/home/jens/Source/shotwell/src/Photo.vala" case ORIENTATION_RIGHT_BOTTOM: -#line 19609 "Photo.c" +#line 20094 "Photo.c" { gint width_tmp = 0; - Dimensions _tmp5_; + Dimensions _tmp2_; + gint _tmp3_; + Dimensions _tmp4_; + gint _tmp5_; gint _tmp6_; - Dimensions _tmp7_; - gint _tmp8_; - gint _tmp9_; #line 2531 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = returned_dims; + _tmp2_ = returned_dims; #line 2531 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_.width; + _tmp3_ = _tmp2_.width; #line 2531 "/home/jens/Source/shotwell/src/Photo.vala" - width_tmp = _tmp6_; + width_tmp = _tmp3_; #line 2533 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = returned_dims; + _tmp4_ = returned_dims; #line 2533 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_.height; + _tmp5_ = _tmp4_.height; #line 2533 "/home/jens/Source/shotwell/src/Photo.vala" - returned_dims.width = _tmp8_; + returned_dims.width = _tmp5_; #line 2534 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = width_tmp; + _tmp6_ = width_tmp; #line 2534 "/home/jens/Source/shotwell/src/Photo.vala" - returned_dims.height = _tmp9_; + returned_dims.height = _tmp6_; #line 2535 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 19635 "Photo.c" +#line 20120 "Photo.c" } default: { #line 2539 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 19641 "Photo.c" +#line 20126 "Photo.c" } } } #line 2544 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = disallowed_steps; -#line 2544 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_STRAIGHTEN); -#line 2544 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 19651 "Photo.c" + if (photo_exception_allows (disallowed_steps, PHOTO_EXCEPTION_STRAIGHTEN)) { +#line 20132 "Photo.c" gdouble x_size = 0.0; gdouble y_size = 0.0; gdouble angle = 0.0; - gdouble _tmp12_ = 0.0; - Dimensions _tmp13_; - gint _tmp14_; - Dimensions _tmp15_; - gint _tmp16_; - gdouble _tmp17_; - gdouble _tmp18_ = 0.0; - gdouble _tmp19_ = 0.0; - gdouble _tmp20_; - gdouble _tmp21_; + gdouble _tmp7_ = 0.0; + Dimensions _tmp8_; + gint _tmp9_; + Dimensions _tmp10_; + gint _tmp11_; + gdouble _tmp12_; + gdouble _tmp13_ = 0.0; + gdouble _tmp14_ = 0.0; + gdouble _tmp15_; + gdouble _tmp16_; #line 2546 "/home/jens/Source/shotwell/src/Photo.vala" angle = 0.0; #line 2548 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_straighten (self, &_tmp12_); + photo_get_straighten (self, &_tmp7_); #line 2548 "/home/jens/Source/shotwell/src/Photo.vala" - angle = _tmp12_; + angle = _tmp7_; #line 2550 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = returned_dims; + _tmp8_ = returned_dims; #line 2550 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_.width; + _tmp9_ = _tmp8_.width; #line 2550 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = returned_dims; + _tmp10_ = returned_dims; #line 2550 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_.height; + _tmp11_ = _tmp10_.height; #line 2550 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = angle; + _tmp12_ = angle; #line 2550 "/home/jens/Source/shotwell/src/Photo.vala" - compute_arb_rotated_size ((gdouble) _tmp14_, (gdouble) _tmp16_, _tmp17_, &_tmp18_, &_tmp19_); + compute_arb_rotated_size ((gdouble) _tmp9_, (gdouble) _tmp11_, _tmp12_, &_tmp13_, &_tmp14_); #line 2550 "/home/jens/Source/shotwell/src/Photo.vala" - x_size = _tmp18_; + x_size = _tmp13_; #line 2550 "/home/jens/Source/shotwell/src/Photo.vala" - y_size = _tmp19_; + y_size = _tmp14_; #line 2552 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = x_size; + _tmp15_ = x_size; #line 2552 "/home/jens/Source/shotwell/src/Photo.vala" - returned_dims.width = (gint) _tmp20_; + returned_dims.width = (gint) _tmp15_; #line 2553 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = y_size; + _tmp16_ = y_size; #line 2553 "/home/jens/Source/shotwell/src/Photo.vala" - returned_dims.height = (gint) _tmp21_; -#line 19695 "Photo.c" + returned_dims.height = (gint) _tmp16_; +#line 20176 "Photo.c" } #line 2557 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = disallowed_steps; -#line 2557 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = photo_exception_allows (_tmp22_, PHOTO_EXCEPTION_CROP); -#line 2557 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp23_) { -#line 19703 "Photo.c" + if (photo_exception_allows (disallowed_steps, PHOTO_EXCEPTION_CROP)) { +#line 20180 "Photo.c" Box crop = {0}; - PhotoException _tmp24_; - Box _tmp25_ = {0}; - gboolean _tmp26_; -#line 2559 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = disallowed_steps; + Box _tmp17_ = {0}; + gboolean _tmp18_; #line 2559 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = photo_get_crop (self, &_tmp25_, _tmp24_); + _tmp18_ = photo_get_crop (self, &_tmp17_, disallowed_steps); #line 2559 "/home/jens/Source/shotwell/src/Photo.vala" - crop = _tmp25_; + crop = _tmp17_; #line 2559 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp26_) { -#line 19716 "Photo.c" - Dimensions _tmp27_ = {0}; + if (_tmp18_) { +#line 20190 "Photo.c" + Dimensions _tmp19_ = {0}; #line 2560 "/home/jens/Source/shotwell/src/Photo.vala" - box_get_dimensions (&crop, &_tmp27_); + box_get_dimensions (&crop, &_tmp19_); #line 2560 "/home/jens/Source/shotwell/src/Photo.vala" - returned_dims = _tmp27_; -#line 19722 "Photo.c" + returned_dims = _tmp19_; +#line 20196 "Photo.c" } } #line 2563 "/home/jens/Source/shotwell/src/Photo.vala" *result = returned_dims; #line 2563 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19729 "Photo.c" +#line 20203 "Photo.c" } -static void photo_locked_create_adjustments_from_data (Photo* self) { +static void +photo_locked_create_adjustments_from_data (Photo* self) +{ PixelTransformationBundle* _tmp0_; KeyValueMap* map = NULL; KeyValueMap* _tmp1_; @@ -19754,13 +20230,13 @@ static void photo_locked_create_adjustments_from_data (Photo* self) { _tmp2_ = map; #line 2571 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ == NULL) { -#line 19756 "Photo.c" +#line 20232 "Photo.c" PixelTransformationBundle* _tmp3_; #line 2572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->adjustments; #line 2572 "/home/jens/Source/shotwell/src/Photo.vala" pixel_transformation_bundle_set_to_identity (_tmp3_); -#line 19762 "Photo.c" +#line 20238 "Photo.c" } else { PixelTransformationBundle* _tmp4_; KeyValueMap* _tmp5_; @@ -19770,7 +20246,7 @@ static void photo_locked_create_adjustments_from_data (Photo* self) { _tmp5_ = map; #line 2574 "/home/jens/Source/shotwell/src/Photo.vala" pixel_transformation_bundle_load (_tmp4_, _tmp5_); -#line 19772 "Photo.c" +#line 20248 "Photo.c" } #line 2576 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->adjustments; @@ -19782,23 +20258,25 @@ static void photo_locked_create_adjustments_from_data (Photo* self) { self->priv->transformer = _tmp7_; #line 2567 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 19784 "Photo.c" +#line 20260 "Photo.c" } -PixelTransformationBundle* photo_get_color_adjustments (Photo* self) { +PixelTransformationBundle* +photo_get_color_adjustments (Photo* self) +{ PixelTransformationBundle* result = NULL; GError * _inner_error_ = NULL; #line 2580 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 19793 "Photo.c" +#line 20271 "Photo.c" { PhotoRow* _tmp0_; #line 2581 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19800 "Photo.c" +#line 20278 "Photo.c" { PixelTransformationBundle* _tmp1_; PixelTransformationBundle* _tmp2_; @@ -19809,7 +20287,7 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) { if (_tmp1_ == NULL) { #line 2583 "/home/jens/Source/shotwell/src/Photo.vala" photo_locked_create_adjustments_from_data (self); -#line 19811 "Photo.c" +#line 20289 "Photo.c" } #line 2585 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->adjustments; @@ -19817,18 +20295,18 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) { _tmp3_ = pixel_transformation_bundle_copy (_tmp2_); #line 2585 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 19819 "Photo.c" +#line 20297 "Photo.c" { PhotoRow* _tmp4_; #line 2581 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19826 "Photo.c" +#line 20304 "Photo.c" } #line 2585 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 19830 "Photo.c" +#line 20308 "Photo.c" } __finally371: { @@ -19837,7 +20315,7 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) { _tmp5_ = self->row; #line 2581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19839 "Photo.c" +#line 20317 "Photo.c" } #line 2581 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -19845,24 +20323,26 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) { g_clear_error (&_inner_error_); #line 2581 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 19847 "Photo.c" +#line 20325 "Photo.c" } } -PixelTransformer* photo_get_pixel_transformer (Photo* self) { +PixelTransformer* +photo_get_pixel_transformer (Photo* self) +{ PixelTransformer* result = NULL; GError * _inner_error_ = NULL; #line 2589 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 19857 "Photo.c" +#line 20337 "Photo.c" { PhotoRow* _tmp0_; #line 2590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2590 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19864 "Photo.c" +#line 20344 "Photo.c" { PixelTransformer* _tmp1_; PixelTransformer* _tmp2_; @@ -19873,7 +20353,7 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) { if (_tmp1_ == NULL) { #line 2592 "/home/jens/Source/shotwell/src/Photo.vala" photo_locked_create_adjustments_from_data (self); -#line 19875 "Photo.c" +#line 20355 "Photo.c" } #line 2594 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->transformer; @@ -19881,18 +20361,18 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) { _tmp3_ = pixel_transformer_copy (_tmp2_); #line 2594 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 19883 "Photo.c" +#line 20363 "Photo.c" { PhotoRow* _tmp4_; #line 2590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2590 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19890 "Photo.c" +#line 20370 "Photo.c" } #line 2594 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 19894 "Photo.c" +#line 20374 "Photo.c" } __finally372: { @@ -19901,7 +20381,7 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) { _tmp5_ = self->row; #line 2590 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19903 "Photo.c" +#line 20383 "Photo.c" } #line 2590 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -19909,33 +20389,34 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) { g_clear_error (&_inner_error_); #line 2590 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 19911 "Photo.c" +#line 20391 "Photo.c" } } -gboolean photo_has_color_adjustments (Photo* self) { +gboolean +photo_has_color_adjustments (Photo* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 2598 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_has_transformation (self, "adjustments"); -#line 2599 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp0_; + result = photo_has_transformation (self, "adjustments"); #line 2599 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 19927 "Photo.c" +#line 20406 "Photo.c" } -PixelTransformation* photo_get_color_adjustment (Photo* self, PixelTransformationType type) { +PixelTransformation* +photo_get_color_adjustment (Photo* self, + PixelTransformationType type) +{ PixelTransformation* result = NULL; PixelTransformationBundle* _tmp0_; PixelTransformationBundle* _tmp1_; - PixelTransformationType _tmp2_; + PixelTransformation* _tmp2_; PixelTransformation* _tmp3_; - PixelTransformation* _tmp4_; #line 2602 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); #line 2603 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19943,56 +20424,47 @@ PixelTransformation* photo_get_color_adjustment (Photo* self, PixelTransformatio #line 2603 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 2603 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = type; -#line 2603 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = pixel_transformation_bundle_get_transformation (_tmp1_, _tmp2_); + _tmp2_ = pixel_transformation_bundle_get_transformation (_tmp1_, type); #line 2603 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 2603 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (_tmp1_); #line 2603 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp4_; + result = _tmp3_; #line 2603 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 19956 "Photo.c" +#line 20435 "Photo.c" } -void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_adjustments) { - PixelTransformationBundle* _tmp0_; - gboolean _tmp1_; +void +photo_set_color_adjustments (Photo* self, + PixelTransformationBundle* new_adjustments) +{ KeyValueMap* map = NULL; - PixelTransformationBundle* _tmp8_; - KeyValueMap* _tmp9_; + KeyValueMap* _tmp5_; gboolean committed = FALSE; - gboolean _tmp39_; + gboolean _tmp28_; GError * _inner_error_ = NULL; #line 2606 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 2606 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_adjustments)); #line 2609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = new_adjustments; -#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = pixel_transformation_bundle_is_identity (_tmp0_); -#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_) { -#line 19979 "Photo.c" + if (pixel_transformation_bundle_is_identity (new_adjustments)) { +#line 20454 "Photo.c" gboolean _result_ = FALSE; - gboolean _tmp5_; + gboolean _tmp2_; { - PhotoRow* _tmp2_; + PhotoRow* _tmp0_; #line 2611 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = self->row; + _tmp0_ = self->row; #line 2611 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19988 "Photo.c" +#line 20463 "Photo.c" { - gboolean _tmp3_; -#line 2612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_remove_transformation (self, "adjustments"); #line 2612 "/home/jens/Source/shotwell/src/Photo.vala" - _result_ = _tmp3_; + _result_ = photo_remove_transformation (self, "adjustments"); #line 2613 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); #line 2613 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20001,16 +20473,16 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad _pixel_transformer_unref0 (self->priv->transformer); #line 2614 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->transformer = NULL; -#line 20003 "Photo.c" +#line 20475 "Photo.c" } __finally373: { - PhotoRow* _tmp4_; + PhotoRow* _tmp1_; #line 2611 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->row; + _tmp1_ = self->row; #line 2611 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20012 "Photo.c" +#line 20484 "Photo.c" } #line 2611 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -20020,195 +20492,172 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad g_clear_error (&_inner_error_); #line 2611 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20022 "Photo.c" +#line 20494 "Photo.c" } } #line 2617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _result_; + _tmp2_ = _result_; #line 2617 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_) { -#line 20029 "Photo.c" - Alteration* _tmp6_; - Alteration* _tmp7_; + if (_tmp2_) { +#line 20501 "Photo.c" + Alteration* _tmp3_; + Alteration* _tmp4_; #line 2618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = alteration_new ("image", "color-adjustments"); + _tmp3_ = alteration_new ("image", "color-adjustments"); #line 2618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 2618 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp7_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp4_); #line 2618 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp7_); -#line 20040 "Photo.c" + _alteration_unref0 (_tmp4_); +#line 20512 "Photo.c" } #line 2620 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20044 "Photo.c" +#line 20516 "Photo.c" } #line 2624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = new_adjustments; -#line 2624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = pixel_transformation_bundle_save (_tmp8_, "adjustments"); + _tmp5_ = pixel_transformation_bundle_save (new_adjustments, "adjustments"); #line 2624 "/home/jens/Source/shotwell/src/Photo.vala" - map = _tmp9_; -#line 20052 "Photo.c" + map = _tmp5_; +#line 20522 "Photo.c" { - PhotoRow* _tmp10_; + PhotoRow* _tmp6_; #line 2627 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = self->row; + _tmp6_ = self->row; #line 2627 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 20059 "Photo.c" +#line 20529 "Photo.c" { - gboolean _tmp11_ = FALSE; - PixelTransformer* _tmp12_; - KeyValueMap* _tmp36_; - gboolean _tmp37_; + gboolean _tmp7_ = FALSE; + PixelTransformer* _tmp8_; + KeyValueMap* _tmp26_; #line 2628 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = self->priv->transformer; + _tmp8_ = self->priv->transformer; #line 2628 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_ == NULL) { + if (_tmp8_ == NULL) { #line 2628 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = TRUE; -#line 20071 "Photo.c" + _tmp7_ = TRUE; +#line 20540 "Photo.c" } else { - PixelTransformationBundle* _tmp13_; + PixelTransformationBundle* _tmp9_; #line 2628 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = self->priv->adjustments; + _tmp9_ = self->priv->adjustments; #line 2628 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp13_ == NULL; -#line 20078 "Photo.c" + _tmp7_ = _tmp9_ == NULL; +#line 20547 "Photo.c" } #line 2628 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 20082 "Photo.c" - PixelTransformationBundle* _tmp14_; - PixelTransformationBundle* _tmp15_; - PixelTransformationBundle* _tmp16_; - PixelTransformer* _tmp17_; -#line 2630 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = new_adjustments; + if (_tmp7_) { +#line 20551 "Photo.c" + PixelTransformationBundle* _tmp10_; + PixelTransformer* _tmp11_; #line 2630 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = pixel_transformation_bundle_copy (_tmp14_); + _tmp10_ = pixel_transformation_bundle_copy (new_adjustments); #line 2630 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); #line 2630 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->adjustments = _tmp15_; + self->priv->adjustments = _tmp10_; #line 2631 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = new_adjustments; -#line 2631 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = pixel_transformation_bundle_generate_transformer (_tmp16_); + _tmp11_ = pixel_transformation_bundle_generate_transformer (new_adjustments); #line 2631 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (self->priv->transformer); #line 2631 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->transformer = _tmp17_; -#line 20103 "Photo.c" + self->priv->transformer = _tmp11_; +#line 20566 "Photo.c" } else { - PixelTransformationBundle* _tmp34_; - PixelTransformationBundle* _tmp35_; + PixelTransformationBundle* _tmp25_; { GeeIterator* _transformation_it = NULL; - PixelTransformationBundle* _tmp18_; - GeeIterable* _tmp19_; - GeeIterable* _tmp20_; - GeeIterator* _tmp21_; - GeeIterator* _tmp22_; + GeeIterable* _tmp12_; + GeeIterable* _tmp13_; + GeeIterator* _tmp14_; + GeeIterator* _tmp15_; #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = new_adjustments; + _tmp12_ = pixel_transformation_bundle_get_transformations (new_adjustments); #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = pixel_transformation_bundle_get_transformations (_tmp18_); + _tmp13_ = _tmp12_; #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_; + _tmp14_ = gee_iterable_iterator (_tmp13_); #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = gee_iterable_iterator (_tmp20_); -#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_; + _tmp15_ = _tmp14_; #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp13_); #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _transformation_it = _tmp22_; + _transformation_it = _tmp15_; #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 20130 "Photo.c" - GeeIterator* _tmp23_; - gboolean _tmp24_; +#line 20589 "Photo.c" + GeeIterator* _tmp16_; PixelTransformation* transformation = NULL; - GeeIterator* _tmp25_; - gpointer _tmp26_; - PixelTransformer* _tmp27_; - PixelTransformationBundle* _tmp28_; - PixelTransformation* _tmp29_; - PixelTransformationType _tmp30_; - PixelTransformation* _tmp31_; - PixelTransformation* _tmp32_; - PixelTransformation* _tmp33_; -#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _transformation_it; + GeeIterator* _tmp17_; + gpointer _tmp18_; + PixelTransformer* _tmp19_; + PixelTransformationBundle* _tmp20_; + PixelTransformation* _tmp21_; + PixelTransformation* _tmp22_; + PixelTransformation* _tmp23_; + PixelTransformation* _tmp24_; #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = gee_iterator_next (_tmp23_); + _tmp16_ = _transformation_it; #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp24_) { + if (!gee_iterator_next (_tmp16_)) { #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 20151 "Photo.c" +#line 20606 "Photo.c" } #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _transformation_it; + _tmp17_ = _transformation_it; #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = gee_iterator_get (_tmp25_); + _tmp18_ = gee_iterator_get (_tmp17_); #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - transformation = (PixelTransformation*) _tmp26_; -#line 2635 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = self->priv->transformer; + transformation = (PixelTransformation*) _tmp18_; #line 2635 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = self->priv->adjustments; + _tmp19_ = self->priv->transformer; #line 2635 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = transformation; + _tmp20_ = self->priv->adjustments; #line 2635 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = pixel_transformation_get_transformation_type (_tmp29_); + _tmp21_ = transformation; #line 2635 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = pixel_transformation_bundle_get_transformation (_tmp28_, _tmp30_); + _tmp22_ = pixel_transformation_bundle_get_transformation (_tmp20_, pixel_transformation_get_transformation_type (_tmp21_)); #line 2635 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _tmp31_; + _tmp23_ = _tmp22_; #line 2635 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = transformation; + _tmp24_ = transformation; #line 2635 "/home/jens/Source/shotwell/src/Photo.vala" - pixel_transformer_replace_transformation (_tmp27_, _tmp32_, _tmp33_); + pixel_transformer_replace_transformation (_tmp19_, _tmp23_, _tmp24_); #line 2635 "/home/jens/Source/shotwell/src/Photo.vala" - _pixel_transformation_unref0 (_tmp32_); + _pixel_transformation_unref0 (_tmp23_); #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_unref0 (transformation); -#line 20179 "Photo.c" +#line 20632 "Photo.c" } #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_transformation_it); -#line 20183 "Photo.c" +#line 20636 "Photo.c" } #line 2640 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = new_adjustments; -#line 2640 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = pixel_transformation_bundle_copy (_tmp34_); + _tmp25_ = pixel_transformation_bundle_copy (new_adjustments); #line 2640 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); #line 2640 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->adjustments = _tmp35_; -#line 20193 "Photo.c" + self->priv->adjustments = _tmp25_; +#line 20644 "Photo.c" } #line 2643 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = map; -#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = photo_set_transformation (self, _tmp36_); + _tmp26_ = map; #line 2643 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp37_; -#line 20201 "Photo.c" + committed = photo_set_transformation (self, _tmp26_); +#line 20650 "Photo.c" } __finally374: { - PhotoRow* _tmp38_; + PhotoRow* _tmp27_; #line 2627 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = self->row; + _tmp27_ = self->row; #line 2627 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20210 "Photo.c" +#line 20659 "Photo.c" } #line 2627 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -20220,39 +20669,41 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad g_clear_error (&_inner_error_); #line 2627 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20222 "Photo.c" +#line 20671 "Photo.c" } } #line 2646 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = committed; + _tmp28_ = committed; #line 2646 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp39_) { -#line 20229 "Photo.c" - Alteration* _tmp40_; - Alteration* _tmp41_; + if (_tmp28_) { +#line 20678 "Photo.c" + Alteration* _tmp29_; + Alteration* _tmp30_; #line 2647 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = alteration_new ("image", "color-adjustments"); + _tmp29_ = alteration_new ("image", "color-adjustments"); #line 2647 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = _tmp40_; + _tmp30_ = _tmp29_; #line 2647 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp41_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp30_); #line 2647 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp41_); -#line 20240 "Photo.c" + _alteration_unref0 (_tmp30_); +#line 20689 "Photo.c" } #line 2606 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 20244 "Photo.c" +#line 20693 "Photo.c" } -static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) { +static PhotoMetadata* +photo_real_get_metadata (PhotoSource* base) +{ Photo * self; PhotoMetadata* result = NULL; GError * _inner_error_ = NULL; #line 2651 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 20254 "Photo.c" +#line 20705 "Photo.c" { PhotoMetadata* _tmp0_ = NULL; PhotoFileReader* _tmp1_; @@ -20274,7 +20725,7 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) { _tmp0_ = _tmp4_; #line 2653 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20276 "Photo.c" +#line 20727 "Photo.c" goto __catch375_g_error; } #line 2653 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20287,7 +20738,7 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) { _media_metadata_unref0 (_tmp0_); #line 2653 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20289 "Photo.c" +#line 20740 "Photo.c" } goto __finally375; __catch375_g_error: @@ -20311,7 +20762,7 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) { _g_error_free0 (err); #line 2657 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20313 "Photo.c" +#line 20764 "Photo.c" } __finally375: #line 2652 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20320,11 +20771,14 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) { g_clear_error (&_inner_error_); #line 2652 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 20322 "Photo.c" +#line 20773 "Photo.c" } -PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) { +PhotoMetadata* +photo_get_master_metadata (Photo* self, + GError** error) +{ PhotoMetadata* result = NULL; PhotoMetadata* _tmp0_ = NULL; PhotoFileReader* _tmp1_; @@ -20353,7 +20807,7 @@ PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) { g_propagate_error (error, _inner_error_); #line 2662 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 20355 "Photo.c" +#line 20809 "Photo.c" } #line 2662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp0_; @@ -20365,11 +20819,14 @@ PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) { _media_metadata_unref0 (_tmp0_); #line 2662 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20367 "Photo.c" +#line 20821 "Photo.c" } -PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) { +PhotoMetadata* +photo_get_editable_metadata (Photo* self, + GError** error) +{ PhotoMetadata* result = NULL; PhotoFileReader* reader = NULL; PhotoFileReader* _tmp0_; @@ -20386,7 +20843,7 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) { _tmp2_ = reader; #line 2668 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 20388 "Photo.c" +#line 20845 "Photo.c" PhotoFileReader* _tmp3_; PhotoMetadata* _tmp4_; #line 2668 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20407,14 +20864,14 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) { _photo_file_adapter_unref0 (reader); #line 2668 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 20409 "Photo.c" +#line 20866 "Photo.c" } } else { #line 2668 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (_tmp1_); #line 2668 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 20416 "Photo.c" +#line 20873 "Photo.c" } #line 2668 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; @@ -20422,26 +20879,28 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) { _photo_file_adapter_unref0 (reader); #line 2668 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20424 "Photo.c" +#line 20881 "Photo.c" } -gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportMasterState* * state, GError** error) { +gboolean +photo_persist_master_metadata (Photo* self, + PhotoMetadata* metadata, + PhotoReimportMasterState* * state, + GError** error) +{ PhotoReimportMasterState* _vala_state = NULL; gboolean result = FALSE; PhotoFileReader* master_reader = NULL; PhotoFileReader* _tmp0_; PhotoFileReader* _tmp1_; - PhotoFileFormat _tmp2_; - gboolean _tmp3_; - PhotoFileMetadataWriter* _tmp4_ = NULL; - PhotoFileReader* _tmp5_; - PhotoFileMetadataWriter* _tmp6_; - PhotoMetadata* _tmp8_; - gboolean _tmp10_ = FALSE; - PhotoReimportMasterState* _tmp11_ = NULL; - gboolean _tmp12_; - PhotoReimportMasterState* _tmp14_; + PhotoFileMetadataWriter* _tmp2_ = NULL; + PhotoFileReader* _tmp3_; + PhotoFileMetadataWriter* _tmp4_; + gboolean _tmp7_ = FALSE; + PhotoReimportMasterState* _tmp8_ = NULL; + gboolean _tmp9_; + PhotoReimportMasterState* _tmp11_; GError * _inner_error_ = NULL; #line 2674 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); @@ -20458,11 +20917,7 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph #line 2680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = master_reader; #line 2680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_file_format_can_write_metadata (_tmp2_); -#line 2680 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp3_) { + if (!photo_file_format_can_write_metadata (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)))) { #line 2681 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 2681 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20471,133 +20926,132 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph if (state) { #line 2681 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20473 "Photo.c" +#line 20928 "Photo.c" } else { #line 2681 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); -#line 20477 "Photo.c" +#line 20932 "Photo.c" } #line 2681 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20481 "Photo.c" +#line 20936 "Photo.c" } #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = master_reader; + _tmp3_ = master_reader; #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_file_reader_create_metadata_writer (_tmp5_, &_inner_error_); + _tmp4_ = photo_file_reader_create_metadata_writer (_tmp3_, &_inner_error_); #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp6_; + _tmp2_ = _tmp4_; #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20491 "Photo.c" - gboolean _tmp7_ = FALSE; +#line 20946 "Photo.c" + gboolean _tmp5_ = FALSE; #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp7_; -#line 20499 "Photo.c" + return _tmp5_; +#line 20954 "Photo.c" } #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = metadata; -#line 2683 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp4_, _tmp8_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp2_, metadata, &_inner_error_); #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20507 "Photo.c" - gboolean _tmp9_ = FALSE; +#line 20960 "Photo.c" + gboolean _tmp6_ = FALSE; #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp4_); + _photo_file_adapter_unref0 (_tmp2_); #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp9_; -#line 20517 "Photo.c" + return _tmp6_; +#line 20970 "Photo.c" } #line 2685 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_prepare_for_reimport_master (self, &_tmp11_, &_inner_error_); + _tmp9_ = photo_prepare_for_reimport_master (self, &_tmp8_, &_inner_error_); #line 2685 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); #line 2685 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = _tmp11_; + _vala_state = _tmp8_; #line 2685 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp12_; + _tmp7_ = _tmp9_; #line 2685 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20529 "Photo.c" - gboolean _tmp13_ = FALSE; +#line 20982 "Photo.c" + gboolean _tmp10_ = FALSE; #line 2685 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 2685 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp4_); + _photo_file_adapter_unref0 (_tmp2_); #line 2685 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); #line 2685 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp13_; -#line 20539 "Photo.c" + return _tmp10_; +#line 20992 "Photo.c" } #line 2685 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp10_) { + if (!_tmp7_) { #line 2686 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 2686 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp4_); + _photo_file_adapter_unref0 (_tmp2_); #line 2686 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); #line 2686 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { #line 2686 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20553 "Photo.c" +#line 21006 "Photo.c" } else { #line 2686 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); -#line 20557 "Photo.c" +#line 21010 "Photo.c" } #line 2686 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20561 "Photo.c" +#line 21014 "Photo.c" } #line 2688 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _vala_state; + _tmp11_ = _vala_state; #line 2688 "/home/jens/Source/shotwell/src/Photo.vala" - G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)->metadata_only = TRUE; + G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)->metadata_only = TRUE; #line 2690 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 2690 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp4_); + _photo_file_adapter_unref0 (_tmp2_); #line 2690 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); #line 2690 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { #line 2690 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20577 "Photo.c" +#line 21030 "Photo.c" } else { #line 2690 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); -#line 20581 "Photo.c" +#line 21034 "Photo.c" } #line 2690 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20585 "Photo.c" +#line 21038 "Photo.c" } -void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState* state, GError** error) { - PhotoReimportMasterState* _tmp0_; +void +photo_finish_update_master_metadata (Photo* self, + PhotoReimportMasterState* state, + GError** error) +{ GError * _inner_error_ = NULL; #line 2693 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 2693 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_MASTER_STATE (state)); #line 2694 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = state; -#line 2694 "/home/jens/Source/shotwell/src/Photo.vala" - photo_finish_reimport_master (self, _tmp0_, &_inner_error_); + photo_finish_reimport_master (self, state, &_inner_error_); #line 2694 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2694 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20606,7 +21060,7 @@ void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState* g_propagate_error (error, _inner_error_); #line 2694 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20608 "Photo.c" +#line 21062 "Photo.c" } else { #line 2694 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -20614,29 +21068,31 @@ void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState* g_clear_error (&_inner_error_); #line 2694 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20616 "Photo.c" +#line 21070 "Photo.c" } } } -gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportEditableState* * state, GError** error) { +gboolean +photo_persist_editable_metadata (Photo* self, + PhotoMetadata* metadata, + PhotoReimportEditableState* * state, + GError** error) +{ PhotoReimportEditableState* _vala_state = NULL; gboolean result = FALSE; PhotoFileReader* editable_reader = NULL; PhotoFileReader* _tmp0_; PhotoFileReader* _tmp1_; PhotoFileReader* _tmp2_; - PhotoFileFormat _tmp3_; - gboolean _tmp4_; - PhotoFileMetadataWriter* _tmp5_ = NULL; - PhotoFileReader* _tmp6_; - PhotoFileMetadataWriter* _tmp7_; - PhotoMetadata* _tmp9_; - gboolean _tmp11_ = FALSE; - PhotoReimportEditableState* _tmp12_ = NULL; - gboolean _tmp13_; - PhotoReimportEditableState* _tmp15_; + PhotoFileMetadataWriter* _tmp3_ = NULL; + PhotoFileReader* _tmp4_; + PhotoFileMetadataWriter* _tmp5_; + gboolean _tmp8_ = FALSE; + PhotoReimportEditableState* _tmp9_ = NULL; + gboolean _tmp10_; + PhotoReimportEditableState* _tmp12_; GError * _inner_error_ = NULL; #line 2697 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); @@ -20662,24 +21118,20 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, if (state) { #line 2703 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20664 "Photo.c" +#line 21120 "Photo.c" } else { #line 2703 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 20668 "Photo.c" +#line 21124 "Photo.c" } #line 2703 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20672 "Photo.c" +#line 21128 "Photo.c" } #line 2705 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = editable_reader; #line 2705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_file_format_can_write_metadata (_tmp3_); -#line 2705 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp4_) { + if (!photo_file_format_can_write_metadata (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)))) { #line 2706 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 2706 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20688,133 +21140,132 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, if (state) { #line 2706 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20690 "Photo.c" +#line 21142 "Photo.c" } else { #line 2706 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 20694 "Photo.c" +#line 21146 "Photo.c" } #line 2706 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20698 "Photo.c" +#line 21150 "Photo.c" } #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = editable_reader; + _tmp4_ = editable_reader; #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo_file_reader_create_metadata_writer (_tmp6_, &_inner_error_); + _tmp5_ = photo_file_reader_create_metadata_writer (_tmp4_, &_inner_error_); #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp7_; + _tmp3_ = _tmp5_; #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20708 "Photo.c" - gboolean _tmp8_ = FALSE; +#line 21160 "Photo.c" + gboolean _tmp6_ = FALSE; #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp8_; -#line 20716 "Photo.c" + return _tmp6_; +#line 21168 "Photo.c" } #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = metadata; -#line 2708 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp5_, _tmp9_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp3_, metadata, &_inner_error_); #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20724 "Photo.c" - gboolean _tmp10_ = FALSE; +#line 21174 "Photo.c" + gboolean _tmp7_ = FALSE; #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp5_); + _photo_file_adapter_unref0 (_tmp3_); #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp10_; -#line 20734 "Photo.c" + return _tmp7_; +#line 21184 "Photo.c" } #line 2710 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_prepare_for_reimport_editable (self, &_tmp12_, &_inner_error_); + _tmp10_ = photo_prepare_for_reimport_editable (self, &_tmp9_, &_inner_error_); #line 2710 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); #line 2710 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = _tmp12_; + _vala_state = _tmp9_; #line 2710 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp13_; + _tmp8_ = _tmp10_; #line 2710 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20746 "Photo.c" - gboolean _tmp14_ = FALSE; +#line 21196 "Photo.c" + gboolean _tmp11_ = FALSE; #line 2710 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 2710 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp5_); + _photo_file_adapter_unref0 (_tmp3_); #line 2710 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); #line 2710 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp14_; -#line 20756 "Photo.c" + return _tmp11_; +#line 21206 "Photo.c" } #line 2710 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp11_) { + if (!_tmp8_) { #line 2711 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 2711 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp5_); + _photo_file_adapter_unref0 (_tmp3_); #line 2711 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); #line 2711 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { #line 2711 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20770 "Photo.c" +#line 21220 "Photo.c" } else { #line 2711 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 20774 "Photo.c" +#line 21224 "Photo.c" } #line 2711 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20778 "Photo.c" +#line 21228 "Photo.c" } #line 2713 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _vala_state; + _tmp12_ = _vala_state; #line 2713 "/home/jens/Source/shotwell/src/Photo.vala" - G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)->metadata_only = TRUE; + G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)->metadata_only = TRUE; #line 2715 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 2715 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp5_); + _photo_file_adapter_unref0 (_tmp3_); #line 2715 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); #line 2715 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { #line 2715 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20794 "Photo.c" +#line 21244 "Photo.c" } else { #line 2715 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 20798 "Photo.c" +#line 21248 "Photo.c" } #line 2715 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20802 "Photo.c" +#line 21252 "Photo.c" } -void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableState* state, GError** error) { - PhotoReimportEditableState* _tmp0_; +void +photo_finish_update_editable_metadata (Photo* self, + PhotoReimportEditableState* state, + GError** error) +{ GError * _inner_error_ = NULL; #line 2718 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 2718 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_EDITABLE_STATE (state)); #line 2719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = state; -#line 2719 "/home/jens/Source/shotwell/src/Photo.vala" - photo_finish_reimport_editable (self, _tmp0_, &_inner_error_); + photo_finish_reimport_editable (self, state, &_inner_error_); #line 2719 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2719 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20823,7 +21274,7 @@ void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableSt g_propagate_error (error, _inner_error_); #line 2719 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20825 "Photo.c" +#line 21276 "Photo.c" } else { #line 2719 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -20831,24 +21282,27 @@ void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableSt g_clear_error (&_inner_error_); #line 2719 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20833 "Photo.c" +#line 21284 "Photo.c" } } } -void photo_get_raw_dimensions (Photo* self, Dimensions* result) { +void +photo_get_raw_dimensions (Photo* self, + Dimensions* result) +{ GError * _inner_error_ = NULL; #line 2724 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 20843 "Photo.c" +#line 21297 "Photo.c" { PhotoRow* _tmp0_; #line 2725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2725 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 20850 "Photo.c" +#line 21304 "Photo.c" { BackingPhotoRow* _tmp1_; Dimensions _tmp2_; @@ -20858,18 +21312,18 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) { _tmp2_ = _tmp1_->dim; #line 2726 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 20860 "Photo.c" +#line 21314 "Photo.c" { PhotoRow* _tmp3_; #line 2725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2725 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20867 "Photo.c" +#line 21321 "Photo.c" } #line 2726 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20871 "Photo.c" +#line 21325 "Photo.c" } __finally376: { @@ -20878,7 +21332,7 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) { _tmp4_ = self->row; #line 2725 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20880 "Photo.c" +#line 21334 "Photo.c" } #line 2725 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -20886,17 +21340,19 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) { g_clear_error (&_inner_error_); #line 2725 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20888 "Photo.c" +#line 21342 "Photo.c" } } -gboolean photo_has_transformations (Photo* self) { +gboolean +photo_has_transformations (Photo* self) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 2730 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 20898 "Photo.c" +#line 21354 "Photo.c" { PhotoRow* _tmp0_; gboolean _tmp10_ = FALSE; @@ -20904,7 +21360,7 @@ gboolean photo_has_transformations (Photo* self) { _tmp0_ = self->row; #line 2731 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 20906 "Photo.c" +#line 21362 "Photo.c" { gboolean _tmp1_ = FALSE; PhotoRow* _tmp2_; @@ -20923,7 +21379,7 @@ gboolean photo_has_transformations (Photo* self) { if (_tmp3_ != _tmp5_) { #line 2733 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = TRUE; -#line 20925 "Photo.c" +#line 21381 "Photo.c" } else { PhotoRow* _tmp6_; GeeHashMap* _tmp7_; @@ -20933,22 +21389,22 @@ gboolean photo_has_transformations (Photo* self) { _tmp7_ = _tmp6_->transformations; #line 2734 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp7_ != NULL; -#line 20935 "Photo.c" +#line 21391 "Photo.c" } #line 2732 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 20939 "Photo.c" +#line 21395 "Photo.c" { PhotoRow* _tmp8_; #line 2731 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->row; #line 2731 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20946 "Photo.c" +#line 21402 "Photo.c" } #line 2732 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20950 "Photo.c" +#line 21406 "Photo.c" } __finally377: { @@ -20957,7 +21413,7 @@ gboolean photo_has_transformations (Photo* self) { _tmp9_ = self->row; #line 2731 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20959 "Photo.c" +#line 21415 "Photo.c" } #line 2731 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -20965,12 +21421,14 @@ gboolean photo_has_transformations (Photo* self) { g_clear_error (&_inner_error_); #line 2731 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp10_; -#line 20967 "Photo.c" +#line 21423 "Photo.c" } } -gboolean photo_only_metadata_changed (Photo* self) { +gboolean +photo_only_metadata_changed (Photo* self) +{ gboolean result = FALSE; MetadataDateTime* date_time = NULL; PhotoMetadata* metadata = NULL; @@ -20989,7 +21447,7 @@ gboolean photo_only_metadata_changed (Photo* self) { _tmp1_ = metadata; #line 2742 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ != NULL) { -#line 20991 "Photo.c" +#line 21449 "Photo.c" PhotoMetadata* _tmp2_; MetadataDateTime* _tmp3_; #line 2743 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21000,16 +21458,16 @@ gboolean photo_only_metadata_changed (Photo* self) { _metadata_date_time_unref0 (date_time); #line 2743 "/home/jens/Source/shotwell/src/Photo.vala" date_time = _tmp3_; -#line 21002 "Photo.c" +#line 21460 "Photo.c" } { PhotoRow* _tmp4_; - gboolean _tmp21_ = FALSE; + gboolean _tmp20_ = FALSE; #line 2745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2745 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21011 "Photo.c" +#line 21469 "Photo.c" { gboolean _tmp5_ = FALSE; PhotoRow* _tmp6_; @@ -21020,7 +21478,7 @@ gboolean photo_only_metadata_changed (Photo* self) { _tmp7_ = _tmp6_->transformations; #line 2746 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_ == NULL) { -#line 21022 "Photo.c" +#line 21480 "Photo.c" gboolean _tmp8_ = FALSE; PhotoRow* _tmp9_; Orientation _tmp10_; @@ -21038,7 +21496,7 @@ gboolean photo_only_metadata_changed (Photo* self) { if (_tmp10_ != _tmp12_) { #line 2747 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = TRUE; -#line 21040 "Photo.c" +#line 21498 "Photo.c" } else { gboolean _tmp13_ = FALSE; MetadataDateTime* _tmp14_; @@ -21046,11 +21504,10 @@ gboolean photo_only_metadata_changed (Photo* self) { _tmp14_ = date_time; #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_ != NULL) { -#line 21048 "Photo.c" +#line 21506 "Photo.c" PhotoRow* _tmp15_; time_t _tmp16_; MetadataDateTime* _tmp17_; - time_t _tmp18_; #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = self->row; #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21058,37 +21515,35 @@ gboolean photo_only_metadata_changed (Photo* self) { #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = date_time; #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = metadata_date_time_get_timestamp (_tmp17_); -#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp16_ != _tmp18_; -#line 21063 "Photo.c" + _tmp13_ = _tmp16_ != metadata_date_time_get_timestamp (_tmp17_); +#line 21518 "Photo.c" } else { #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = FALSE; -#line 21067 "Photo.c" +#line 21522 "Photo.c" } #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp13_; -#line 21071 "Photo.c" +#line 21526 "Photo.c" } #line 2747 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp8_; -#line 21075 "Photo.c" +#line 21530 "Photo.c" } else { #line 2746 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = FALSE; -#line 21079 "Photo.c" +#line 21534 "Photo.c" } #line 2746 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 21083 "Photo.c" +#line 21538 "Photo.c" { - PhotoRow* _tmp19_; + PhotoRow* _tmp18_; #line 2745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = self->row; + _tmp18_ = self->row; #line 2745 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21090 "Photo.c" +#line 21545 "Photo.c" } #line 2746 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); @@ -21096,16 +21551,16 @@ gboolean photo_only_metadata_changed (Photo* self) { _metadata_date_time_unref0 (date_time); #line 2746 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21098 "Photo.c" +#line 21553 "Photo.c" } __finally378: { - PhotoRow* _tmp20_; + PhotoRow* _tmp19_; #line 2745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = self->row; + _tmp19_ = self->row; #line 2745 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21107 "Photo.c" +#line 21562 "Photo.c" } #line 2745 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); @@ -21116,18 +21571,20 @@ gboolean photo_only_metadata_changed (Photo* self) { #line 2745 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2745 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp21_; -#line 21119 "Photo.c" + return _tmp20_; +#line 21574 "Photo.c" } #line 2738 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); #line 2738 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 21125 "Photo.c" +#line 21580 "Photo.c" } -gboolean photo_has_alterations (Photo* self) { +gboolean +photo_has_alterations (Photo* self) +{ gboolean result = FALSE; MetadataDateTime* date_time = NULL; gchar* title = NULL; @@ -21153,7 +21610,7 @@ gboolean photo_has_alterations (Photo* self) { _tmp1_ = metadata; #line 2758 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ != NULL) { -#line 21155 "Photo.c" +#line 21612 "Photo.c" PhotoMetadata* _tmp2_; MetadataDateTime* _tmp3_; PhotoMetadata* _tmp4_; @@ -21184,20 +21641,20 @@ gboolean photo_has_alterations (Photo* self) { _g_free0 (comment); #line 2761 "/home/jens/Source/shotwell/src/Photo.vala" comment = _tmp7_; -#line 21186 "Photo.c" +#line 21643 "Photo.c" } #line 2765 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = date_time; #line 2765 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ == NULL) { -#line 21192 "Photo.c" +#line 21649 "Photo.c" { PhotoRow* _tmp9_; #line 2767 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; #line 2767 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21199 "Photo.c" +#line 21656 "Photo.c" { BackingPhotoRow* _tmp10_; time_t _tmp11_; @@ -21215,14 +21672,14 @@ gboolean photo_has_alterations (Photo* self) { if (_tmp11_ != _tmp13_) { #line 2771 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 21217 "Photo.c" +#line 21674 "Photo.c" { PhotoRow* _tmp14_; #line 2767 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; #line 2767 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21224 "Photo.c" +#line 21681 "Photo.c" } #line 2771 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); @@ -21234,7 +21691,7 @@ gboolean photo_has_alterations (Photo* self) { _metadata_date_time_unref0 (date_time); #line 2771 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21236 "Photo.c" +#line 21693 "Photo.c" } } __finally379: @@ -21244,11 +21701,11 @@ gboolean photo_has_alterations (Photo* self) { _tmp15_ = self->row; #line 2767 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21246 "Photo.c" +#line 21703 "Photo.c" } #line 2767 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 21250 "Photo.c" +#line 21707 "Photo.c" gboolean _tmp16_ = FALSE; #line 2767 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); @@ -21264,18 +21721,18 @@ gboolean photo_has_alterations (Photo* self) { g_clear_error (&_inner_error_); #line 2767 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp16_; -#line 21266 "Photo.c" +#line 21723 "Photo.c" } } } { PhotoRow* _tmp17_; - gboolean _tmp42_ = FALSE; + gboolean _tmp41_ = FALSE; #line 2776 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = self->row; #line 2776 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21277 "Photo.c" +#line 21734 "Photo.c" { gboolean _tmp18_ = FALSE; gboolean _tmp19_ = FALSE; @@ -21291,7 +21748,7 @@ gboolean photo_has_alterations (Photo* self) { if (_tmp23_ != NULL) { #line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = TRUE; -#line 21293 "Photo.c" +#line 21750 "Photo.c" } else { PhotoRow* _tmp24_; Orientation _tmp25_; @@ -21307,13 +21764,13 @@ gboolean photo_has_alterations (Photo* self) { _tmp27_ = _tmp26_->original_orientation; #line 2778 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp25_ != _tmp27_; -#line 21309 "Photo.c" +#line 21766 "Photo.c" } #line 2777 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_) { #line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = TRUE; -#line 21315 "Photo.c" +#line 21772 "Photo.c" } else { gboolean _tmp28_ = FALSE; MetadataDateTime* _tmp29_; @@ -21321,11 +21778,10 @@ gboolean photo_has_alterations (Photo* self) { _tmp29_ = date_time; #line 2779 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp29_ != NULL) { -#line 21323 "Photo.c" +#line 21780 "Photo.c" PhotoRow* _tmp30_; time_t _tmp31_; MetadataDateTime* _tmp32_; - time_t _tmp33_; #line 2779 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = self->row; #line 2779 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21333,71 +21789,69 @@ gboolean photo_has_alterations (Photo* self) { #line 2779 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = date_time; #line 2779 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = metadata_date_time_get_timestamp (_tmp32_); -#line 2779 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp31_ != _tmp33_; -#line 21338 "Photo.c" + _tmp28_ = _tmp31_ != metadata_date_time_get_timestamp (_tmp32_); +#line 21792 "Photo.c" } else { #line 2779 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = FALSE; -#line 21342 "Photo.c" +#line 21796 "Photo.c" } #line 2779 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp28_; -#line 21346 "Photo.c" +#line 21800 "Photo.c" } #line 2777 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp20_) { #line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = TRUE; -#line 21352 "Photo.c" +#line 21806 "Photo.c" } else { + gchar* _tmp33_; gchar* _tmp34_; - gchar* _tmp35_; - const gchar* _tmp36_; + const gchar* _tmp35_; #line 2780 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp33_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 2780 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = _tmp34_; + _tmp34_ = _tmp33_; #line 2780 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = comment; + _tmp35_ = comment; #line 2780 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = g_strcmp0 (_tmp35_, _tmp36_) != 0; + _tmp19_ = g_strcmp0 (_tmp34_, _tmp35_) != 0; #line 2780 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp35_); -#line 21367 "Photo.c" + _g_free0 (_tmp34_); +#line 21821 "Photo.c" } #line 2777 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp19_) { #line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = TRUE; -#line 21373 "Photo.c" +#line 21827 "Photo.c" } else { + gchar* _tmp36_; gchar* _tmp37_; - gchar* _tmp38_; - const gchar* _tmp39_; + const gchar* _tmp38_; #line 2781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp36_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 2781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = _tmp37_; + _tmp37_ = _tmp36_; #line 2781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = title; + _tmp38_ = title; #line 2781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = g_strcmp0 (_tmp38_, _tmp39_) != 0; + _tmp18_ = g_strcmp0 (_tmp37_, _tmp38_) != 0; #line 2781 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp38_); -#line 21388 "Photo.c" + _g_free0 (_tmp37_); +#line 21842 "Photo.c" } #line 2777 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp18_; -#line 21392 "Photo.c" +#line 21846 "Photo.c" { - PhotoRow* _tmp40_; + PhotoRow* _tmp39_; #line 2776 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = self->row; + _tmp39_ = self->row; #line 2776 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21399 "Photo.c" +#line 21853 "Photo.c" } #line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); @@ -21409,16 +21863,16 @@ gboolean photo_has_alterations (Photo* self) { _metadata_date_time_unref0 (date_time); #line 2777 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21411 "Photo.c" +#line 21865 "Photo.c" } __finally380: { - PhotoRow* _tmp41_; + PhotoRow* _tmp40_; #line 2776 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = self->row; + _tmp40_ = self->row; #line 2776 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21420 "Photo.c" +#line 21874 "Photo.c" } #line 2776 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); @@ -21433,8 +21887,8 @@ gboolean photo_has_alterations (Photo* self) { #line 2776 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2776 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp42_; -#line 21436 "Photo.c" + return _tmp41_; +#line 21890 "Photo.c" } #line 2752 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); @@ -21444,23 +21898,25 @@ gboolean photo_has_alterations (Photo* self) { _g_free0 (title); #line 2752 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 21446 "Photo.c" +#line 21900 "Photo.c" } -PhotoTransformationState* photo_save_transformation_state (Photo* self) { +PhotoTransformationState* +photo_save_transformation_state (Photo* self) +{ PhotoTransformationState* result = NULL; GError * _inner_error_ = NULL; #line 2786 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 21455 "Photo.c" +#line 21911 "Photo.c" { PhotoRow* _tmp0_; #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21462 "Photo.c" +#line 21918 "Photo.c" { PixelTransformer* _tmp1_ = NULL; PixelTransformer* _tmp2_; @@ -21475,7 +21931,7 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { _tmp2_ = self->priv->transformer; #line 2790 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 21477 "Photo.c" +#line 21933 "Photo.c" PixelTransformer* _tmp3_; PixelTransformer* _tmp4_; #line 2790 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21486,19 +21942,19 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { _pixel_transformer_unref0 (_tmp1_); #line 2790 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp4_; -#line 21488 "Photo.c" +#line 21944 "Photo.c" } else { #line 2790 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (_tmp1_); #line 2790 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 21494 "Photo.c" +#line 21950 "Photo.c" } #line 2791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->adjustments; #line 2791 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ != NULL) { -#line 21500 "Photo.c" +#line 21956 "Photo.c" PixelTransformationBundle* _tmp7_; PixelTransformationBundle* _tmp8_; #line 2791 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21509,13 +21965,13 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { _pixel_transformation_bundle_unref0 (_tmp5_); #line 2791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp8_; -#line 21511 "Photo.c" +#line 21967 "Photo.c" } else { #line 2791 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (_tmp5_); #line 2791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = NULL; -#line 21517 "Photo.c" +#line 21973 "Photo.c" } #line 2788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; @@ -21533,18 +21989,18 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { _pixel_transformation_bundle_unref0 (_tmp5_); #line 2788 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (_tmp1_); -#line 21535 "Photo.c" +#line 21991 "Photo.c" { PhotoRow* _tmp14_; #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21542 "Photo.c" +#line 21998 "Photo.c" } #line 2788 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21546 "Photo.c" +#line 22002 "Photo.c" } __finally381: { @@ -21553,7 +22009,7 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { _tmp15_ = self->row; #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21555 "Photo.c" +#line 22011 "Photo.c" } #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -21561,189 +22017,187 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { g_clear_error (&_inner_error_); #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 21563 "Photo.c" +#line 22019 "Photo.c" } } -static gpointer _pixel_transformer_ref0 (gpointer self) { +static gpointer +_pixel_transformer_ref0 (gpointer self) +{ #line 2812 "/home/jens/Source/shotwell/src/Photo.vala" return self ? pixel_transformer_ref (self) : NULL; -#line 21571 "Photo.c" +#line 22029 "Photo.c" } -static gpointer _pixel_transformation_bundle_ref0 (gpointer self) { +static gpointer +_pixel_transformation_bundle_ref0 (gpointer self) +{ #line 2813 "/home/jens/Source/shotwell/src/Photo.vala" return self ? pixel_transformation_bundle_ref (self) : NULL; -#line 21578 "Photo.c" +#line 22038 "Photo.c" } -gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* state) { +gboolean +photo_load_transformation_state (Photo* self, + PhotoTransformationState* state) +{ gboolean result = FALSE; PhotoPhotoTransformationStateImpl* state_impl = NULL; - PhotoTransformationState* _tmp0_; + PhotoPhotoTransformationStateImpl* _tmp0_; PhotoPhotoTransformationStateImpl* _tmp1_; - PhotoPhotoTransformationStateImpl* _tmp2_; Orientation saved_orientation = 0; - PhotoPhotoTransformationStateImpl* _tmp3_; - Orientation _tmp4_; + PhotoPhotoTransformationStateImpl* _tmp2_; GeeHashMap* saved_transformations = NULL; - PhotoPhotoTransformationStateImpl* _tmp5_; - GeeHashMap* _tmp6_; + PhotoPhotoTransformationStateImpl* _tmp3_; + GeeHashMap* _tmp4_; PixelTransformer* saved_transformer = NULL; - PhotoPhotoTransformationStateImpl* _tmp7_; - PixelTransformer* _tmp8_; + PhotoPhotoTransformationStateImpl* _tmp5_; + PixelTransformer* _tmp6_; PixelTransformationBundle* saved_adjustments = NULL; - PhotoPhotoTransformationStateImpl* _tmp9_; - PixelTransformationBundle* _tmp10_; + PhotoPhotoTransformationStateImpl* _tmp7_; + PixelTransformationBundle* _tmp8_; gboolean committed = FALSE; - gboolean _tmp31_; + gboolean _tmp28_; GError * _inner_error_ = NULL; #line 2795 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2795 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_TRANSFORMATION_STATE (state), FALSE); #line 2796 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = state; -#line 2796 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, PHOTO_TYPE_PHOTO_TRANSFORMATION_STATE_IMPL) ? ((PhotoPhotoTransformationStateImpl*) _tmp0_) : NULL); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (state, PHOTO_TYPE_PHOTO_TRANSFORMATION_STATE_IMPL) ? ((PhotoPhotoTransformationStateImpl*) state) : NULL); #line 2796 "/home/jens/Source/shotwell/src/Photo.vala" - state_impl = _tmp1_; + state_impl = _tmp0_; #line 2797 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = state_impl; + _tmp1_ = state_impl; #line 2797 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 2798 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 2798 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (state_impl); #line 2798 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21623 "Photo.c" +#line 22082 "Photo.c" } #line 2800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = state_impl; -#line 2800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_photo_transformation_state_impl_get_orientation (_tmp3_); + _tmp2_ = state_impl; #line 2800 "/home/jens/Source/shotwell/src/Photo.vala" - saved_orientation = _tmp4_; + saved_orientation = photo_photo_transformation_state_impl_get_orientation (_tmp2_); #line 2801 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = state_impl; + _tmp3_ = state_impl; #line 2801 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_photo_transformation_state_impl_get_transformations (_tmp5_); + _tmp4_ = photo_photo_transformation_state_impl_get_transformations (_tmp3_); #line 2801 "/home/jens/Source/shotwell/src/Photo.vala" - saved_transformations = _tmp6_; + saved_transformations = _tmp4_; #line 2802 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = state_impl; + _tmp5_ = state_impl; #line 2802 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_photo_transformation_state_impl_get_transformer (_tmp7_); + _tmp6_ = photo_photo_transformation_state_impl_get_transformer (_tmp5_); #line 2802 "/home/jens/Source/shotwell/src/Photo.vala" - saved_transformer = _tmp8_; + saved_transformer = _tmp6_; #line 2803 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = state_impl; + _tmp7_ = state_impl; #line 2803 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_photo_transformation_state_impl_get_color_adjustments (_tmp9_); + _tmp8_ = photo_photo_transformation_state_impl_get_color_adjustments (_tmp7_); #line 2803 "/home/jens/Source/shotwell/src/Photo.vala" - saved_adjustments = _tmp10_; -#line 21649 "Photo.c" + saved_adjustments = _tmp8_; +#line 22106 "Photo.c" { - PhotoRow* _tmp11_; + PhotoRow* _tmp9_; #line 2806 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = self->row; + _tmp9_ = self->row; #line 2806 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21656 "Photo.c" +#line 22113 "Photo.c" { - PhotoTable* _tmp12_; - PhotoTable* _tmp13_; - PhotoRow* _tmp14_; - PhotoID _tmp15_; - Orientation _tmp16_; - GeeHashMap* _tmp17_; - gboolean _tmp18_; - gboolean _tmp19_; -#line 2807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_table_get_instance (); + PhotoTable* _tmp10_; + PhotoTable* _tmp11_; + PhotoRow* _tmp12_; + PhotoID _tmp13_; + Orientation _tmp14_; + GeeHashMap* _tmp15_; + gboolean _tmp16_; #line 2807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_; + _tmp10_ = photo_table_get_instance (); #line 2807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->row; + _tmp11_ = _tmp10_; #line 2807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_->photo_id; + _tmp12_ = self->row; #line 2807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = saved_orientation; + _tmp13_ = _tmp12_->photo_id; #line 2807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = saved_transformations; + _tmp14_ = saved_orientation; #line 2807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = photo_table_set_transformation_state (_tmp13_, &_tmp15_, _tmp16_, _tmp17_); + _tmp15_ = saved_transformations; #line 2807 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp18_; + committed = photo_table_set_transformation_state (_tmp11_, &_tmp13_, _tmp14_, _tmp15_); #line 2807 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp13_); + _database_table_unref0 (_tmp11_); #line 2809 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = committed; + _tmp16_ = committed; #line 2809 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp19_) { -#line 21688 "Photo.c" - PhotoRow* _tmp20_; - Orientation _tmp21_; - PhotoRow* _tmp22_; - GeeHashMap* _tmp23_; - GeeHashMap* _tmp24_; - PixelTransformer* _tmp25_; - PixelTransformer* _tmp26_; - PixelTransformationBundle* _tmp27_; - PixelTransformationBundle* _tmp28_; + if (_tmp16_) { +#line 22142 "Photo.c" + PhotoRow* _tmp17_; + Orientation _tmp18_; + PhotoRow* _tmp19_; + GeeHashMap* _tmp20_; + GeeHashMap* _tmp21_; + PixelTransformer* _tmp22_; + PixelTransformer* _tmp23_; + PixelTransformationBundle* _tmp24_; + PixelTransformationBundle* _tmp25_; #line 2810 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = self->row; + _tmp17_ = self->row; #line 2810 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = saved_orientation; + _tmp18_ = saved_orientation; #line 2810 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_->orientation = _tmp21_; + _tmp17_->orientation = _tmp18_; #line 2811 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = self->row; + _tmp19_ = self->row; #line 2811 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = saved_transformations; + _tmp20_ = saved_transformations; #line 2811 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _g_object_ref0 (_tmp23_); + _tmp21_ = _g_object_ref0 (_tmp20_); #line 2811 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp22_->transformations); + _g_object_unref0 (_tmp19_->transformations); #line 2811 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_->transformations = _tmp24_; + _tmp19_->transformations = _tmp21_; #line 2812 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = saved_transformer; + _tmp22_ = saved_transformer; #line 2812 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _pixel_transformer_ref0 (_tmp25_); + _tmp23_ = _pixel_transformer_ref0 (_tmp22_); #line 2812 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (self->priv->transformer); #line 2812 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->transformer = _tmp26_; + self->priv->transformer = _tmp23_; #line 2813 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = saved_adjustments; + _tmp24_ = saved_adjustments; #line 2813 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _pixel_transformation_bundle_ref0 (_tmp27_); + _tmp25_ = _pixel_transformation_bundle_ref0 (_tmp24_); #line 2813 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); #line 2813 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->adjustments = _tmp28_; -#line 21730 "Photo.c" + self->priv->adjustments = _tmp25_; +#line 22184 "Photo.c" } } __finally382: { - PhotoRow* _tmp29_; + PhotoRow* _tmp26_; #line 2806 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = self->row; + _tmp26_ = self->row; #line 2806 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21740 "Photo.c" +#line 22194 "Photo.c" } #line 2806 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 21744 "Photo.c" - gboolean _tmp30_ = FALSE; +#line 22198 "Photo.c" + gboolean _tmp27_ = FALSE; #line 2806 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (saved_adjustments); #line 2806 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21757,26 +22211,26 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* #line 2806 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2806 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp30_; -#line 21760 "Photo.c" + return _tmp27_; +#line 22214 "Photo.c" } } #line 2817 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = committed; + _tmp28_ = committed; #line 2817 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp31_) { -#line 21767 "Photo.c" - Alteration* _tmp32_; - Alteration* _tmp33_; + if (_tmp28_) { +#line 22221 "Photo.c" + Alteration* _tmp29_; + Alteration* _tmp30_; #line 2818 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = alteration_new ("image", "transformation-state"); + _tmp29_ = alteration_new ("image", "transformation-state"); #line 2818 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp32_; + _tmp30_ = _tmp29_; #line 2818 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp33_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp30_); #line 2818 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp33_); -#line 21778 "Photo.c" + _alteration_unref0 (_tmp30_); +#line 22232 "Photo.c" } #line 2820 "/home/jens/Source/shotwell/src/Photo.vala" result = committed; @@ -21790,47 +22244,51 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* _g_object_unref0 (state_impl); #line 2820 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21792 "Photo.c" +#line 22246 "Photo.c" } -void photo_remove_all_transformations (Photo* self) { +void +photo_remove_all_transformations (Photo* self) +{ #line 2823 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 2824 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, TRUE); -#line 21801 "Photo.c" +#line 22257 "Photo.c" } -static void photo_internal_remove_all_transformations (Photo* self, gboolean notify) { +static void +photo_internal_remove_all_transformations (Photo* self, + gboolean notify) +{ gboolean is_altered = FALSE; - gboolean _tmp21_ = FALSE; - gboolean _tmp22_; + gboolean _tmp20_ = FALSE; + gboolean _tmp21_; GError * _inner_error_ = NULL; #line 2827 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 2828 "/home/jens/Source/shotwell/src/Photo.vala" is_altered = FALSE; -#line 21814 "Photo.c" +#line 22273 "Photo.c" { PhotoRow* _tmp0_; #line 2829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2829 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21821 "Photo.c" +#line 22280 "Photo.c" { PhotoTable* _tmp1_; PhotoTable* _tmp2_; PhotoRow* _tmp3_; PhotoID _tmp4_; - gboolean _tmp5_; + PhotoRow* _tmp5_; PhotoRow* _tmp6_; - PhotoRow* _tmp7_; - Orientation _tmp8_; - BackingPhotoRow* _tmp9_; - Orientation _tmp10_; + Orientation _tmp7_; + BackingPhotoRow* _tmp8_; + Orientation _tmp9_; #line 2830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); #line 2830 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21840,17 +22298,15 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not #line 2830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->photo_id; #line 2830 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_table_remove_all_transformations (_tmp2_, &_tmp4_); -#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" - is_altered = _tmp5_; + is_altered = photo_table_remove_all_transformations (_tmp2_, &_tmp4_); #line 2830 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); #line 2831 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; + _tmp5_ = self->row; #line 2831 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp6_->transformations); + _g_object_unref0 (_tmp5_->transformations); #line 2831 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_->transformations = NULL; + _tmp5_->transformations = NULL; #line 2833 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (self->priv->transformer); #line 2833 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21860,62 +22316,62 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not #line 2834 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->adjustments = NULL; #line 2836 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->row; + _tmp6_ = self->row; #line 2836 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_->orientation; + _tmp7_ = _tmp6_->orientation; #line 2836 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = self->backing_photo_row; + _tmp8_ = self->backing_photo_row; #line 2836 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_->original_orientation; + _tmp9_ = _tmp8_->original_orientation; #line 2836 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_ != _tmp10_) { -#line 21871 "Photo.c" + if (_tmp7_ != _tmp9_) { +#line 22327 "Photo.c" + PhotoTable* _tmp10_; PhotoTable* _tmp11_; - PhotoTable* _tmp12_; - PhotoRow* _tmp13_; - PhotoID _tmp14_; - BackingPhotoRow* _tmp15_; - Orientation _tmp16_; - PhotoRow* _tmp17_; - BackingPhotoRow* _tmp18_; - Orientation _tmp19_; + PhotoRow* _tmp12_; + PhotoID _tmp13_; + BackingPhotoRow* _tmp14_; + Orientation _tmp15_; + PhotoRow* _tmp16_; + BackingPhotoRow* _tmp17_; + Orientation _tmp18_; #line 2837 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_table_get_instance (); + _tmp10_ = photo_table_get_instance (); #line 2837 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 2837 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = self->row; + _tmp12_ = self->row; #line 2837 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_->photo_id; + _tmp13_ = _tmp12_->photo_id; #line 2837 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = self->backing_photo_row; + _tmp14_ = self->backing_photo_row; #line 2837 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_->original_orientation; + _tmp15_ = _tmp14_->original_orientation; #line 2837 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_set_orientation (_tmp12_, &_tmp14_, _tmp16_); + photo_table_set_orientation (_tmp11_, &_tmp13_, _tmp15_); #line 2837 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp12_); + _database_table_unref0 (_tmp11_); #line 2839 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = self->row; + _tmp16_ = self->row; #line 2839 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->backing_photo_row; + _tmp17_ = self->backing_photo_row; #line 2839 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_->original_orientation; + _tmp18_ = _tmp17_->original_orientation; #line 2839 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_->orientation = _tmp19_; + _tmp16_->orientation = _tmp18_; #line 2840 "/home/jens/Source/shotwell/src/Photo.vala" is_altered = TRUE; -#line 21907 "Photo.c" +#line 22363 "Photo.c" } } __finally383: { - PhotoRow* _tmp20_; + PhotoRow* _tmp19_; #line 2829 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = self->row; + _tmp19_ = self->row; #line 2829 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21917 "Photo.c" +#line 22373 "Photo.c" } #line 2829 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -21925,56 +22381,54 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not g_clear_error (&_inner_error_); #line 2829 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 21927 "Photo.c" +#line 22383 "Photo.c" } } #line 2844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = is_altered; -#line 2844 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp22_) { -#line 21934 "Photo.c" - gboolean _tmp23_; + _tmp21_ = is_altered; #line 2844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = notify; + if (_tmp21_) { #line 2844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp23_; -#line 21940 "Photo.c" + _tmp20_ = notify; +#line 22392 "Photo.c" } else { #line 2844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = FALSE; -#line 21944 "Photo.c" + _tmp20_ = FALSE; +#line 22396 "Photo.c" } #line 2844 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp21_) { -#line 21948 "Photo.c" - Alteration* _tmp24_; - Alteration* _tmp25_; + if (_tmp20_) { +#line 22400 "Photo.c" + Alteration* _tmp22_; + Alteration* _tmp23_; #line 2845 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = alteration_new ("image", "revert"); + _tmp22_ = alteration_new ("image", "revert"); #line 2845 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp24_; + _tmp23_ = _tmp22_; #line 2845 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp23_); #line 2845 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp25_); -#line 21959 "Photo.c" + _alteration_unref0 (_tmp23_); +#line 22411 "Photo.c" } } -Orientation photo_get_original_orientation (Photo* self) { +Orientation +photo_get_original_orientation (Photo* self) +{ Orientation result = 0; GError * _inner_error_ = NULL; #line 2848 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 21969 "Photo.c" +#line 22423 "Photo.c" { PhotoRow* _tmp0_; #line 2849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2849 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21976 "Photo.c" +#line 22430 "Photo.c" { BackingPhotoRow* _tmp1_; Orientation _tmp2_; @@ -21984,18 +22438,18 @@ Orientation photo_get_original_orientation (Photo* self) { _tmp2_ = _tmp1_->original_orientation; #line 2850 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 21986 "Photo.c" +#line 22440 "Photo.c" { PhotoRow* _tmp3_; #line 2849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2849 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21993 "Photo.c" +#line 22447 "Photo.c" } #line 2850 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21997 "Photo.c" +#line 22451 "Photo.c" } __finally384: { @@ -22004,7 +22458,7 @@ Orientation photo_get_original_orientation (Photo* self) { _tmp4_ = self->row; #line 2849 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22006 "Photo.c" +#line 22460 "Photo.c" } #line 2849 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -22012,24 +22466,26 @@ Orientation photo_get_original_orientation (Photo* self) { g_clear_error (&_inner_error_); #line 2849 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 22014 "Photo.c" +#line 22468 "Photo.c" } } -Orientation photo_get_orientation (Photo* self) { +Orientation +photo_get_orientation (Photo* self) +{ Orientation result = 0; GError * _inner_error_ = NULL; #line 2854 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 22024 "Photo.c" +#line 22480 "Photo.c" { PhotoRow* _tmp0_; #line 2855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2855 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22031 "Photo.c" +#line 22487 "Photo.c" { PhotoRow* _tmp1_; Orientation _tmp2_; @@ -22039,18 +22495,18 @@ Orientation photo_get_orientation (Photo* self) { _tmp2_ = _tmp1_->orientation; #line 2856 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 22041 "Photo.c" +#line 22497 "Photo.c" { PhotoRow* _tmp3_; #line 2855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2855 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22048 "Photo.c" +#line 22504 "Photo.c" } #line 2856 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22052 "Photo.c" +#line 22508 "Photo.c" } __finally385: { @@ -22059,7 +22515,7 @@ Orientation photo_get_orientation (Photo* self) { _tmp4_ = self->row; #line 2855 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22061 "Photo.c" +#line 22517 "Photo.c" } #line 2855 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -22067,129 +22523,122 @@ Orientation photo_get_orientation (Photo* self) { g_clear_error (&_inner_error_); #line 2855 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 22069 "Photo.c" +#line 22525 "Photo.c" } } -gboolean photo_set_orientation (Photo* self, Orientation orientation) { +gboolean +photo_set_orientation (Photo* self, + Orientation orientation) +{ gboolean result = FALSE; gboolean committed = FALSE; - gboolean _tmp15_; + gboolean _tmp11_; GError * _inner_error_ = NULL; #line 2860 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2861 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 22083 "Photo.c" +#line 22542 "Photo.c" { PhotoRow* _tmp0_; #line 2862 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2862 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22090 "Photo.c" +#line 22549 "Photo.c" { PhotoRow* _tmp1_; Orientation _tmp2_; - Orientation _tmp3_; #line 2863 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2863 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->orientation; #line 2863 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = orientation; -#line 2863 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_ != _tmp3_) { -#line 22103 "Photo.c" + if (_tmp2_ != orientation) { +#line 22559 "Photo.c" + PhotoTable* _tmp3_; PhotoTable* _tmp4_; - PhotoTable* _tmp5_; - PhotoRow* _tmp6_; - PhotoID _tmp7_; - Orientation _tmp8_; - gboolean _tmp9_; - gboolean _tmp10_; -#line 2864 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_table_get_instance (); -#line 2864 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + PhotoRow* _tmp5_; + PhotoID _tmp6_; + gboolean _tmp7_; #line 2864 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; + _tmp3_ = photo_table_get_instance (); #line 2864 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_->photo_id; + _tmp4_ = _tmp3_; #line 2864 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = orientation; + _tmp5_ = self->row; #line 2864 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo_table_set_orientation (_tmp5_, &_tmp7_, _tmp8_); + _tmp6_ = _tmp5_->photo_id; #line 2864 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp9_; + committed = photo_table_set_orientation (_tmp4_, &_tmp6_, orientation); #line 2864 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp5_); + _database_table_unref0 (_tmp4_); #line 2865 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = committed; + _tmp7_ = committed; #line 2865 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp10_) { -#line 22131 "Photo.c" - PhotoRow* _tmp11_; - Orientation _tmp12_; -#line 2866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = self->row; + if (_tmp7_) { +#line 22581 "Photo.c" + PhotoRow* _tmp8_; #line 2866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = orientation; + _tmp8_ = self->row; #line 2866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_->orientation = _tmp12_; -#line 22140 "Photo.c" + _tmp8_->orientation = orientation; +#line 22587 "Photo.c" } } } __finally386: { - PhotoRow* _tmp13_; + PhotoRow* _tmp9_; #line 2862 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = self->row; + _tmp9_ = self->row; #line 2862 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22151 "Photo.c" +#line 22598 "Photo.c" } #line 2862 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 22155 "Photo.c" - gboolean _tmp14_ = FALSE; +#line 22602 "Photo.c" + gboolean _tmp10_ = FALSE; #line 2862 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2862 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2862 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp14_; -#line 22163 "Photo.c" + return _tmp10_; +#line 22610 "Photo.c" } } #line 2870 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = committed; + _tmp11_ = committed; #line 2870 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp15_) { -#line 22170 "Photo.c" - Alteration* _tmp16_; - Alteration* _tmp17_; + if (_tmp11_) { +#line 22617 "Photo.c" + Alteration* _tmp12_; + Alteration* _tmp13_; #line 2871 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = alteration_new ("image", "orientation"); + _tmp12_ = alteration_new ("image", "orientation"); #line 2871 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_; + _tmp13_ = _tmp12_; #line 2871 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp17_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_); #line 2871 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp17_); -#line 22181 "Photo.c" + _alteration_unref0 (_tmp13_); +#line 22628 "Photo.c" } #line 2873 "/home/jens/Source/shotwell/src/Photo.vala" result = committed; #line 2873 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22187 "Photo.c" +#line 22634 "Photo.c" } -gboolean photo_check_can_rotate (Photo* self) { +gboolean +photo_check_can_rotate (Photo* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 2876 "/home/jens/Source/shotwell/src/Photo.vala" @@ -22200,11 +22649,14 @@ gboolean photo_check_can_rotate (Photo* self) { result = _tmp0_; #line 2877 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22202 "Photo.c" +#line 22651 "Photo.c" } -static void photo_real_rotate (Photo* self, Rotation rotation) { +static void +photo_real_rotate (Photo* self, + Rotation rotation) +{ GError * _inner_error_ = NULL; { PhotoRow* _tmp0_; @@ -22212,29 +22664,20 @@ static void photo_real_rotate (Photo* self, Rotation rotation) { _tmp0_ = self->row; #line 2881 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22214 "Photo.c" +#line 22666 "Photo.c" { - Orientation _tmp1_; - Rotation _tmp2_; - Orientation _tmp3_; -#line 2882 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_get_orientation (self); -#line 2882 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = rotation; -#line 2882 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = orientation_perform (_tmp1_, _tmp2_); #line 2882 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_orientation (self, _tmp3_); -#line 22227 "Photo.c" + photo_set_orientation (self, orientation_perform (photo_get_orientation (self), rotation)); +#line 22670 "Photo.c" } __finally387: { - PhotoRow* _tmp4_; + PhotoRow* _tmp1_; #line 2881 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->row; + _tmp1_ = self->row; #line 2881 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22236 "Photo.c" +#line 22679 "Photo.c" } #line 2881 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -22244,37 +22687,43 @@ static void photo_real_rotate (Photo* self, Rotation rotation) { g_clear_error (&_inner_error_); #line 2881 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 22246 "Photo.c" +#line 22689 "Photo.c" } } } -void photo_rotate (Photo* self, Rotation rotation) { +void +photo_rotate (Photo* self, + Rotation rotation) +{ #line 2880 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 2880 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->rotate (self, rotation); -#line 22257 "Photo.c" +#line 22703 "Photo.c" } -static gboolean photo_has_transformation (Photo* self, const gchar* name) { +static gboolean +photo_has_transformation (Photo* self, + const gchar* name) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 2886 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2886 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (name != NULL, FALSE); -#line 22268 "Photo.c" +#line 22717 "Photo.c" { PhotoRow* _tmp0_; - gboolean _tmp10_ = FALSE; + gboolean _tmp8_ = FALSE; #line 2887 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2887 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22276 "Photo.c" +#line 22725 "Photo.c" { gboolean _tmp1_ = FALSE; PhotoRow* _tmp2_; @@ -22285,63 +22734,60 @@ static gboolean photo_has_transformation (Photo* self, const gchar* name) { _tmp3_ = _tmp2_->transformations; #line 2888 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != NULL) { -#line 22287 "Photo.c" +#line 22736 "Photo.c" PhotoRow* _tmp4_; GeeHashMap* _tmp5_; - const gchar* _tmp6_; - gboolean _tmp7_; #line 2888 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2888 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->transformations; #line 2888 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = name; -#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_); -#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp7_; -#line 22302 "Photo.c" + _tmp1_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name); +#line 22745 "Photo.c" } else { #line 2888 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 22306 "Photo.c" +#line 22749 "Photo.c" } #line 2888 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 22310 "Photo.c" +#line 22753 "Photo.c" { - PhotoRow* _tmp8_; + PhotoRow* _tmp6_; #line 2887 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = self->row; + _tmp6_ = self->row; #line 2887 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22317 "Photo.c" +#line 22760 "Photo.c" } #line 2888 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22321 "Photo.c" +#line 22764 "Photo.c" } __finally388: { - PhotoRow* _tmp9_; + PhotoRow* _tmp7_; #line 2887 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = self->row; + _tmp7_ = self->row; #line 2887 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22330 "Photo.c" +#line 22773 "Photo.c" } #line 2887 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2887 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2887 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp10_; -#line 22338 "Photo.c" + return _tmp8_; +#line 22781 "Photo.c" } } -static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) { +static KeyValueMap* +photo_get_transformation (Photo* self, + const gchar* name) +{ KeyValueMap* result = NULL; KeyValueMap* map = NULL; GError * _inner_error_ = NULL; @@ -22351,14 +22797,14 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) { g_return_val_if_fail (name != NULL, NULL); #line 2896 "/home/jens/Source/shotwell/src/Photo.vala" map = NULL; -#line 22353 "Photo.c" +#line 22799 "Photo.c" { PhotoRow* _tmp0_; #line 2897 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2897 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22360 "Photo.c" +#line 22806 "Photo.c" { PhotoRow* _tmp1_; GeeHashMap* _tmp2_; @@ -22368,51 +22814,48 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) { _tmp2_ = _tmp1_->transformations; #line 2898 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 22370 "Photo.c" +#line 22816 "Photo.c" PhotoRow* _tmp3_; GeeHashMap* _tmp4_; - const gchar* _tmp5_; - gpointer _tmp6_; - KeyValueMap* _tmp7_; + gpointer _tmp5_; + KeyValueMap* _tmp6_; #line 2899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->transformations; #line 2899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = name; -#line 2899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_); + _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name); #line 2899 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); #line 2899 "/home/jens/Source/shotwell/src/Photo.vala" - map = (KeyValueMap*) _tmp6_; + map = (KeyValueMap*) _tmp5_; #line 2900 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = map; + _tmp6_ = map; #line 2900 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp7_ != NULL) { -#line 22392 "Photo.c" + if (_tmp6_ != NULL) { +#line 22835 "Photo.c" + KeyValueMap* _tmp7_; KeyValueMap* _tmp8_; - KeyValueMap* _tmp9_; #line 2901 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = map; + _tmp7_ = map; #line 2901 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = key_value_map_copy (_tmp8_); + _tmp8_ = key_value_map_copy (_tmp7_); #line 2901 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); #line 2901 "/home/jens/Source/shotwell/src/Photo.vala" - map = _tmp9_; -#line 22403 "Photo.c" + map = _tmp8_; +#line 22846 "Photo.c" } } } __finally389: { - PhotoRow* _tmp10_; + PhotoRow* _tmp9_; #line 2897 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = self->row; + _tmp9_ = self->row; #line 2897 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22414 "Photo.c" +#line 22857 "Photo.c" } #line 2897 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -22424,56 +22867,55 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) { g_clear_error (&_inner_error_); #line 2897 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 22426 "Photo.c" +#line 22869 "Photo.c" } } #line 2905 "/home/jens/Source/shotwell/src/Photo.vala" result = map; #line 2905 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22433 "Photo.c" +#line 22876 "Photo.c" } -static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) { +static gboolean +photo_set_transformation (Photo* self, + KeyValueMap* trans) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 2908 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2908 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_KEY_VALUE_MAP (trans), FALSE); -#line 22444 "Photo.c" +#line 22890 "Photo.c" { PhotoRow* _tmp0_; - gboolean _tmp20_ = FALSE; + gboolean _tmp16_ = FALSE; #line 2909 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2909 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22452 "Photo.c" +#line 22898 "Photo.c" { PhotoRow* _tmp1_; GeeHashMap* _tmp2_; PhotoRow* _tmp5_; GeeHashMap* _tmp6_; - KeyValueMap* _tmp7_; + gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; - KeyValueMap* _tmp10_; - PhotoTable* _tmp11_; - PhotoTable* _tmp12_; - PhotoRow* _tmp13_; - PhotoID _tmp14_; - KeyValueMap* _tmp15_; - gboolean _tmp16_; - gboolean _tmp17_; + PhotoTable* _tmp9_; + PhotoTable* _tmp10_; + PhotoRow* _tmp11_; + PhotoID _tmp12_; + gboolean _tmp13_; #line 2910 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2910 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->transformations; #line 2910 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ == NULL) { -#line 22475 "Photo.c" +#line 22917 "Photo.c" PhotoRow* _tmp3_; GeeHashMap* _tmp4_; #line 2911 "/home/jens/Source/shotwell/src/Photo.vala" @@ -22484,229 +22926,217 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) { _g_object_unref0 (_tmp3_->transformations); #line 2911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_->transformations = _tmp4_; -#line 22486 "Photo.c" +#line 22928 "Photo.c" } #line 2913 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; #line 2913 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_->transformations; #line 2913 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = trans; + _tmp7_ = key_value_map_get_group (trans); #line 2913 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = key_value_map_get_group (_tmp7_); + _tmp8_ = _tmp7_; #line 2913 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_, trans); #line 2913 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = trans; -#line 2913 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, _tmp10_); -#line 2913 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp9_); -#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_table_get_instance (); + _g_free0 (_tmp8_); #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_; -#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = self->row; + _tmp9_ = photo_table_get_instance (); #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_->photo_id; + _tmp10_ = _tmp9_; #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = trans; + _tmp11_ = self->row; #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = photo_table_set_transformation (_tmp12_, &_tmp14_, _tmp15_); + _tmp12_ = _tmp11_->photo_id; #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_; + _tmp13_ = photo_table_set_transformation (_tmp10_, &_tmp12_, trans); #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp12_); + _database_table_unref0 (_tmp10_); #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp17_; -#line 22522 "Photo.c" + result = _tmp13_; +#line 22956 "Photo.c" { - PhotoRow* _tmp18_; + PhotoRow* _tmp14_; #line 2909 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->row; + _tmp14_ = self->row; #line 2909 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22529 "Photo.c" +#line 22963 "Photo.c" } #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22533 "Photo.c" +#line 22967 "Photo.c" } __finally390: { - PhotoRow* _tmp19_; + PhotoRow* _tmp15_; #line 2909 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = self->row; + _tmp15_ = self->row; #line 2909 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22542 "Photo.c" +#line 22976 "Photo.c" } #line 2909 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2909 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2909 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp20_; -#line 22550 "Photo.c" + return _tmp16_; +#line 22984 "Photo.c" } } -static gboolean photo_remove_transformation (Photo* self, const gchar* name) { +static gboolean +photo_remove_transformation (Photo* self, + const gchar* name) +{ gboolean result = FALSE; gboolean altered_cache = FALSE; gboolean altered_persistent = FALSE; - gboolean _tmp20_ = FALSE; - gboolean _tmp21_; + gboolean _tmp17_ = FALSE; + gboolean _tmp18_; GError * _inner_error_ = NULL; #line 2919 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2919 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (name != NULL, FALSE); -#line 22566 "Photo.c" +#line 23003 "Photo.c" { PhotoRow* _tmp0_; #line 2921 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2921 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22573 "Photo.c" +#line 23010 "Photo.c" { PhotoRow* _tmp1_; GeeHashMap* _tmp2_; + PhotoTable* _tmp11_; PhotoTable* _tmp12_; - PhotoTable* _tmp13_; - PhotoRow* _tmp14_; - PhotoID _tmp15_; - const gchar* _tmp16_; - gboolean _tmp17_; + PhotoRow* _tmp13_; + PhotoID _tmp14_; #line 2922 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2922 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->transformations; #line 2922 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 22589 "Photo.c" +#line 23024 "Photo.c" PhotoRow* _tmp3_; GeeHashMap* _tmp4_; - const gchar* _tmp5_; - gboolean _tmp6_; - PhotoRow* _tmp7_; - GeeHashMap* _tmp8_; + gboolean _tmp5_; + PhotoRow* _tmp6_; + GeeHashMap* _tmp7_; + gint _tmp8_; gint _tmp9_; - gint _tmp10_; #line 2923 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2923 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->transformations; #line 2923 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = name; -#line 2923 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, NULL); + _tmp5_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name, NULL); #line 2923 "/home/jens/Source/shotwell/src/Photo.vala" - altered_cache = _tmp6_; + altered_cache = _tmp5_; #line 2924 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->row; + _tmp6_ = self->row; #line 2924 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_->transformations; + _tmp7_ = _tmp6_->transformations; #line 2924 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp8_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 2924 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 2924 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp10_ == 0) { -#line 22618 "Photo.c" - PhotoRow* _tmp11_; + if (_tmp9_ == 0) { +#line 23050 "Photo.c" + PhotoRow* _tmp10_; #line 2925 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = self->row; + _tmp10_ = self->row; #line 2925 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp11_->transformations); + _g_object_unref0 (_tmp10_->transformations); #line 2925 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_->transformations = NULL; -#line 22626 "Photo.c" + _tmp10_->transformations = NULL; +#line 23058 "Photo.c" } } else { #line 2927 "/home/jens/Source/shotwell/src/Photo.vala" altered_cache = FALSE; -#line 22631 "Photo.c" +#line 23063 "Photo.c" } #line 2930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_table_get_instance (); -#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_; -#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->row; + _tmp11_ = photo_table_get_instance (); #line 2930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_->photo_id; + _tmp12_ = _tmp11_; #line 2930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = name; + _tmp13_ = self->row; #line 2930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo_table_remove_transformation (_tmp13_, &_tmp15_, _tmp16_); + _tmp14_ = _tmp13_->photo_id; #line 2930 "/home/jens/Source/shotwell/src/Photo.vala" - altered_persistent = _tmp17_; + altered_persistent = photo_table_remove_transformation (_tmp12_, &_tmp14_, name); #line 2930 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp13_); -#line 22649 "Photo.c" + _database_table_unref0 (_tmp12_); +#line 23077 "Photo.c" } __finally391: { - PhotoRow* _tmp18_; + PhotoRow* _tmp15_; #line 2921 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->row; + _tmp15_ = self->row; #line 2921 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22658 "Photo.c" +#line 23086 "Photo.c" } #line 2921 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 22662 "Photo.c" - gboolean _tmp19_ = FALSE; +#line 23090 "Photo.c" + gboolean _tmp16_ = FALSE; #line 2921 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2921 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2921 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp19_; -#line 22670 "Photo.c" + return _tmp16_; +#line 23098 "Photo.c" } } #line 2934 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = altered_cache; + _tmp18_ = altered_cache; #line 2934 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp21_) { + if (_tmp18_) { #line 2934 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = TRUE; -#line 22679 "Photo.c" + _tmp17_ = TRUE; +#line 23107 "Photo.c" } else { #line 2934 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = altered_persistent; -#line 22683 "Photo.c" + _tmp17_ = altered_persistent; +#line 23111 "Photo.c" } #line 2934 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp20_; + result = _tmp17_; #line 2934 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22689 "Photo.c" +#line 23117 "Photo.c" } -gboolean photo_has_crop (Photo* self) { +gboolean +photo_has_crop (Photo* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 2937 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2938 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_has_transformation (self, "crop"); -#line 2938 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp0_; + result = photo_has_transformation (self, "crop"); #line 2938 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22704 "Photo.c" +#line 23131 "Photo.c" } -gboolean photo_get_raw_crop (Photo* self, Box* crop) { +gboolean +photo_get_raw_crop (Photo* self, + Box* crop) +{ Box _vala_crop = {0}; gboolean result = FALSE; KeyValueMap* map = NULL; @@ -22714,24 +23144,20 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) { KeyValueMap* _tmp1_; gint left = 0; KeyValueMap* _tmp2_; - gint _tmp3_; gint top = 0; - KeyValueMap* _tmp4_; - gint _tmp5_; + KeyValueMap* _tmp3_; gint right = 0; - KeyValueMap* _tmp6_; - gint _tmp7_; + KeyValueMap* _tmp4_; gint bottom = 0; - KeyValueMap* _tmp8_; + KeyValueMap* _tmp5_; + gboolean _tmp6_ = FALSE; + gboolean _tmp7_ = FALSE; + gboolean _tmp8_ = FALSE; gint _tmp9_; - gboolean _tmp10_ = FALSE; - gboolean _tmp11_ = FALSE; - gboolean _tmp12_ = FALSE; gint _tmp13_; - gint _tmp17_; - gint _tmp18_; - gint _tmp19_; - gint _tmp20_; + gint _tmp14_; + gint _tmp15_; + gint _tmp16_; #line 2942 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2943 "/home/jens/Source/shotwell/src/Photo.vala" @@ -22752,79 +23178,71 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) { if (crop) { #line 2947 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 22754 "Photo.c" +#line 23180 "Photo.c" } #line 2947 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22758 "Photo.c" +#line 23184 "Photo.c" } #line 2949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = map; #line 2949 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = key_value_map_get_int (_tmp2_, "left", -1); -#line 2949 "/home/jens/Source/shotwell/src/Photo.vala" - left = _tmp3_; -#line 2950 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = map; + left = key_value_map_get_int (_tmp2_, "left", -1); #line 2950 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = key_value_map_get_int (_tmp4_, "top", -1); + _tmp3_ = map; #line 2950 "/home/jens/Source/shotwell/src/Photo.vala" - top = _tmp5_; + top = key_value_map_get_int (_tmp3_, "top", -1); #line 2951 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = map; -#line 2951 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = key_value_map_get_int (_tmp6_, "right", -1); + _tmp4_ = map; #line 2951 "/home/jens/Source/shotwell/src/Photo.vala" - right = _tmp7_; + right = key_value_map_get_int (_tmp4_, "right", -1); #line 2952 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = map; + _tmp5_ = map; #line 2952 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = key_value_map_get_int (_tmp8_, "bottom", -1); -#line 2952 "/home/jens/Source/shotwell/src/Photo.vala" - bottom = _tmp9_; + bottom = key_value_map_get_int (_tmp5_, "bottom", -1); #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = left; + _tmp9_ = left; #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp13_ == -1) { + if (_tmp9_ == -1) { #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = TRUE; -#line 22790 "Photo.c" + _tmp8_ = TRUE; +#line 23208 "Photo.c" } else { - gint _tmp14_; + gint _tmp10_; #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = top; + _tmp10_ = top; #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp14_ == -1; -#line 22797 "Photo.c" + _tmp8_ = _tmp10_ == -1; +#line 23215 "Photo.c" } #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_) { + if (_tmp8_) { #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = TRUE; -#line 22803 "Photo.c" + _tmp7_ = TRUE; +#line 23221 "Photo.c" } else { - gint _tmp15_; + gint _tmp11_; #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = right; + _tmp11_ = right; #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp15_ == -1; -#line 22810 "Photo.c" + _tmp7_ = _tmp11_ == -1; +#line 23228 "Photo.c" } #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { + if (_tmp7_) { #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = TRUE; -#line 22816 "Photo.c" + _tmp6_ = TRUE; +#line 23234 "Photo.c" } else { - gint _tmp16_; + gint _tmp12_; #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = bottom; + _tmp12_ = bottom; #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp16_ == -1; -#line 22823 "Photo.c" + _tmp6_ = _tmp12_ == -1; +#line 23241 "Photo.c" } #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp10_) { + if (_tmp6_) { #line 2955 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 2955 "/home/jens/Source/shotwell/src/Photo.vala" @@ -22833,22 +23251,22 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) { if (crop) { #line 2955 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 22835 "Photo.c" +#line 23253 "Photo.c" } #line 2955 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22839 "Photo.c" +#line 23257 "Photo.c" } #line 2957 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = left; + _tmp13_ = left; #line 2957 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = top; + _tmp14_ = top; #line 2957 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = right; + _tmp15_ = right; #line 2957 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = bottom; + _tmp16_ = bottom; #line 2957 "/home/jens/Source/shotwell/src/Photo.vala" - box_init (&_vala_crop, _tmp17_, _tmp18_, _tmp19_, _tmp20_); + box_init (&_vala_crop, _tmp13_, _tmp14_, _tmp15_, _tmp16_); #line 2959 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 2959 "/home/jens/Source/shotwell/src/Photo.vala" @@ -22857,15 +23275,18 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) { if (crop) { #line 2959 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 22859 "Photo.c" +#line 23277 "Photo.c" } #line 2959 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22863 "Photo.c" +#line 23281 "Photo.c" } -static void photo_set_raw_crop (Photo* self, Box* crop) { +static void +photo_set_raw_crop (Photo* self, + Box* crop) +{ KeyValueMap* map = NULL; KeyValueMap* _tmp0_; KeyValueMap* _tmp1_; @@ -22881,7 +23302,6 @@ static void photo_set_raw_crop (Photo* self, Box* crop) { Box _tmp11_; gint _tmp12_; KeyValueMap* _tmp13_; - gboolean _tmp14_; #line 2963 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 2963 "/home/jens/Source/shotwell/src/Photo.vala" @@ -22925,36 +23345,36 @@ static void photo_set_raw_crop (Photo* self, Box* crop) { #line 2970 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = map; #line 2970 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = photo_set_transformation (self, _tmp13_); -#line 2970 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp14_) { -#line 22930 "Photo.c" + if (photo_set_transformation (self, _tmp13_)) { +#line 23348 "Photo.c" + Alteration* _tmp14_; Alteration* _tmp15_; - Alteration* _tmp16_; #line 2971 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = alteration_new ("image", "crop"); + _tmp14_ = alteration_new ("image", "crop"); #line 2971 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 2971 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp16_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_); #line 2971 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp16_); -#line 22941 "Photo.c" + _alteration_unref0 (_tmp15_); +#line 23359 "Photo.c" } #line 2963 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 22945 "Photo.c" +#line 23363 "Photo.c" } -static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) { +static gboolean +photo_get_raw_straighten (Photo* self, + gdouble* angle) +{ gdouble _vala_angle = 0.0; gboolean result = FALSE; KeyValueMap* map = NULL; KeyValueMap* _tmp0_; KeyValueMap* _tmp1_; KeyValueMap* _tmp2_; - gdouble _tmp3_; #line 2974 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2975 "/home/jens/Source/shotwell/src/Photo.vala" @@ -22975,18 +23395,16 @@ static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) { if (angle) { #line 2979 "/home/jens/Source/shotwell/src/Photo.vala" *angle = _vala_angle; -#line 22977 "Photo.c" +#line 23397 "Photo.c" } #line 2979 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22981 "Photo.c" +#line 23401 "Photo.c" } #line 2982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = map; #line 2982 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = key_value_map_get_double (_tmp2_, "angle", 0.0); -#line 2982 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_angle = _tmp3_; + _vala_angle = key_value_map_get_double (_tmp2_, "angle", 0.0); #line 2984 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 2984 "/home/jens/Source/shotwell/src/Photo.vala" @@ -22995,21 +23413,22 @@ static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) { if (angle) { #line 2984 "/home/jens/Source/shotwell/src/Photo.vala" *angle = _vala_angle; -#line 22997 "Photo.c" +#line 23415 "Photo.c" } #line 2984 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23001 "Photo.c" +#line 23419 "Photo.c" } -static void photo_set_raw_straighten (Photo* self, gdouble theta) { +static void +photo_set_raw_straighten (Photo* self, + gdouble theta) +{ KeyValueMap* map = NULL; KeyValueMap* _tmp0_; KeyValueMap* _tmp1_; - gdouble _tmp2_; - KeyValueMap* _tmp3_; - gboolean _tmp4_; + KeyValueMap* _tmp2_; #line 2987 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 2988 "/home/jens/Source/shotwell/src/Photo.vala" @@ -23019,35 +23438,34 @@ static void photo_set_raw_straighten (Photo* self, gdouble theta) { #line 2989 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = map; #line 2989 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = theta; -#line 2989 "/home/jens/Source/shotwell/src/Photo.vala" - key_value_map_set_double (_tmp1_, "angle", _tmp2_); + key_value_map_set_double (_tmp1_, "angle", theta); #line 2991 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = map; -#line 2991 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_set_transformation (self, _tmp3_); + _tmp2_ = map; #line 2991 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp4_) { -#line 23030 "Photo.c" - Alteration* _tmp5_; - Alteration* _tmp6_; + if (photo_set_transformation (self, _tmp2_)) { +#line 23445 "Photo.c" + Alteration* _tmp3_; + Alteration* _tmp4_; #line 2992 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = alteration_new ("image", "straighten"); + _tmp3_ = alteration_new ("image", "straighten"); #line 2992 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 2992 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp6_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp4_); #line 2992 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp6_); -#line 23041 "Photo.c" + _alteration_unref0 (_tmp4_); +#line 23456 "Photo.c" } #line 2987 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 23045 "Photo.c" +#line 23460 "Photo.c" } -static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, int* result_length1) { +static EditingToolsRedeyeInstance* +photo_get_raw_redeye_instances (Photo* self, + int* result_length1) +{ EditingToolsRedeyeInstance* result = NULL; KeyValueMap* map = NULL; KeyValueMap* _tmp0_; @@ -23055,16 +23473,15 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, gint num_points = 0; KeyValueMap* _tmp4_; gint _tmp5_; - gint _tmp6_; EditingToolsRedeyeInstance* res = NULL; - gint _tmp7_; - EditingToolsRedeyeInstance* _tmp8_; + gint _tmp6_; + EditingToolsRedeyeInstance* _tmp7_; gint res_length1; gint _res_size_; GdkPoint default_point = {0}; - GdkPoint _tmp9_ = {0}; - EditingToolsRedeyeInstance* _tmp47_; - gint _tmp47__length1; + GdkPoint _tmp8_ = {0}; + EditingToolsRedeyeInstance* _tmp45_; + gint _tmp45__length1; #line 2997 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); #line 2998 "/home/jens/Source/shotwell/src/Photo.vala" @@ -23075,7 +23492,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, _tmp1_ = map; #line 2999 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 23077 "Photo.c" +#line 23494 "Photo.c" EditingToolsRedeyeInstance* _tmp2_; EditingToolsRedeyeInstance* _tmp3_; gint _tmp3__length1; @@ -23089,7 +23506,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, if (result_length1) { #line 3000 "/home/jens/Source/shotwell/src/Photo.vala" *result_length1 = _tmp3__length1; -#line 23091 "Photo.c" +#line 23508 "Photo.c" } #line 3000 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; @@ -23097,247 +23514,244 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, _key_value_map_unref0 (map); #line 3000 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23099 "Photo.c" +#line 23516 "Photo.c" } #line 3002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = map; #line 3002 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = key_value_map_get_int (_tmp4_, "num_points", -1); -#line 3002 "/home/jens/Source/shotwell/src/Photo.vala" - num_points = _tmp5_; + num_points = key_value_map_get_int (_tmp4_, "num_points", -1); #line 3003 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = num_points; + _tmp5_ = num_points; #line 3003 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp6_ > 0, "num_points > 0"); + _vala_assert (_tmp5_ > 0, "num_points > 0"); #line 3005 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = num_points; + _tmp6_ = num_points; #line 3005 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = g_new0 (EditingToolsRedeyeInstance, _tmp7_); + _tmp7_ = g_new0 (EditingToolsRedeyeInstance, _tmp6_); #line 3005 "/home/jens/Source/shotwell/src/Photo.vala" - res = _tmp8_; + res = _tmp7_; #line 3005 "/home/jens/Source/shotwell/src/Photo.vala" - res_length1 = _tmp7_; + res_length1 = _tmp6_; #line 3005 "/home/jens/Source/shotwell/src/Photo.vala" _res_size_ = res_length1; #line 3007 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_.x = 0; + _tmp8_.x = 0; #line 3007 "/home/jens/Source/shotwell/src/Photo.vala" - default_point = _tmp9_; + default_point = _tmp8_; #line 3008 "/home/jens/Source/shotwell/src/Photo.vala" default_point.x = -1; #line 3009 "/home/jens/Source/shotwell/src/Photo.vala" default_point.y = -1; -#line 23129 "Photo.c" +#line 23544 "Photo.c" { gint i = 0; #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" i = 0; -#line 23134 "Photo.c" +#line 23549 "Photo.c" { - gboolean _tmp10_ = FALSE; + gboolean _tmp9_ = FALSE; #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = TRUE; + _tmp9_ = TRUE; #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 23141 "Photo.c" +#line 23556 "Photo.c" + gint _tmp11_; gint _tmp12_; - gint _tmp13_; gchar* center_key = NULL; - gint _tmp14_; - gchar* _tmp15_; + gint _tmp13_; + gchar* _tmp14_; gchar* radius_key = NULL; - gint _tmp16_; - gchar* _tmp17_; - EditingToolsRedeyeInstance* _tmp18_; - gint _tmp18__length1; - gint _tmp19_; - KeyValueMap* _tmp20_; - const gchar* _tmp21_; - GdkPoint _tmp22_; - GdkPoint _tmp23_ = {0}; - EditingToolsRedeyeInstance* _tmp24_; - gint _tmp24__length1; - gint _tmp25_; - EditingToolsRedeyeInstance _tmp26_; - GdkPoint _tmp27_; - gint _tmp28_; - GdkPoint _tmp29_; - gint _tmp30_; - EditingToolsRedeyeInstance* _tmp31_; - gint _tmp31__length1; - gint _tmp32_; - EditingToolsRedeyeInstance _tmp33_; - GdkPoint _tmp34_; - gint _tmp35_; - GdkPoint _tmp36_; - gint _tmp37_; - EditingToolsRedeyeInstance* _tmp38_; - gint _tmp38__length1; - gint _tmp39_; - KeyValueMap* _tmp40_; - const gchar* _tmp41_; + gint _tmp15_; + gchar* _tmp16_; + EditingToolsRedeyeInstance* _tmp17_; + gint _tmp17__length1; + gint _tmp18_; + KeyValueMap* _tmp19_; + const gchar* _tmp20_; + GdkPoint _tmp21_; + GdkPoint _tmp22_ = {0}; + EditingToolsRedeyeInstance* _tmp23_; + gint _tmp23__length1; + gint _tmp24_; + EditingToolsRedeyeInstance _tmp25_; + GdkPoint _tmp26_; + gint _tmp27_; + GdkPoint _tmp28_; + gint _tmp29_; + EditingToolsRedeyeInstance* _tmp30_; + gint _tmp30__length1; + gint _tmp31_; + EditingToolsRedeyeInstance _tmp32_; + GdkPoint _tmp33_; + gint _tmp34_; + GdkPoint _tmp35_; + gint _tmp36_; + EditingToolsRedeyeInstance* _tmp37_; + gint _tmp37__length1; + gint _tmp38_; + KeyValueMap* _tmp39_; + const gchar* _tmp40_; + EditingToolsRedeyeInstance* _tmp41_; + gint _tmp41__length1; gint _tmp42_; - EditingToolsRedeyeInstance* _tmp43_; - gint _tmp43__length1; + EditingToolsRedeyeInstance _tmp43_; gint _tmp44_; - EditingToolsRedeyeInstance _tmp45_; - gint _tmp46_; #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp10_) { -#line 23186 "Photo.c" - gint _tmp11_; + if (!_tmp9_) { +#line 23600 "Photo.c" + gint _tmp10_; #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = i; + _tmp10_ = i; #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" - i = _tmp11_ + 1; -#line 23192 "Photo.c" + i = _tmp10_ + 1; +#line 23606 "Photo.c" } #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = FALSE; + _tmp9_ = FALSE; #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = i; + _tmp11_ = i; #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = num_points; + _tmp12_ = num_points; #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" - if (!(_tmp12_ < _tmp13_)) { + if (!(_tmp11_ < _tmp12_)) { #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 23204 "Photo.c" +#line 23618 "Photo.c" } #line 3012 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = i; + _tmp13_ = i; #line 3012 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = g_strdup_printf ("center%d", _tmp14_); + _tmp14_ = g_strdup_printf ("center%d", _tmp13_); #line 3012 "/home/jens/Source/shotwell/src/Photo.vala" - center_key = _tmp15_; + center_key = _tmp14_; #line 3013 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = i; + _tmp15_ = i; #line 3013 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = g_strdup_printf ("radius%d", _tmp16_); + _tmp16_ = g_strdup_printf ("radius%d", _tmp15_); #line 3013 "/home/jens/Source/shotwell/src/Photo.vala" - radius_key = _tmp17_; + radius_key = _tmp16_; #line 3015 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = res; + _tmp17_ = res; #line 3015 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18__length1 = res_length1; + _tmp17__length1 = res_length1; #line 3015 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = i; + _tmp18_ = i; #line 3015 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = map; + _tmp19_ = map; #line 3015 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = center_key; + _tmp20_ = center_key; #line 3015 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = default_point; + _tmp21_ = default_point; #line 3015 "/home/jens/Source/shotwell/src/Photo.vala" - key_value_map_get_point (_tmp20_, _tmp21_, &_tmp22_, &_tmp23_); + key_value_map_get_point (_tmp19_, _tmp20_, &_tmp21_, &_tmp22_); #line 3015 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_[_tmp19_].center = _tmp23_; + _tmp17_[_tmp18_].center = _tmp22_; #line 3016 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = res; + _tmp23_ = res; #line 3016 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24__length1 = res_length1; + _tmp23__length1 = res_length1; #line 3016 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = i; + _tmp24_ = i; #line 3016 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp24_[_tmp25_]; + _tmp25_ = _tmp23_[_tmp24_]; #line 3016 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_.center; + _tmp26_ = _tmp25_.center; #line 3016 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp27_.x; + _tmp27_ = _tmp26_.x; #line 3016 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = default_point; + _tmp28_ = default_point; #line 3016 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _tmp29_.x; + _tmp29_ = _tmp28_.x; #line 3016 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp28_ != _tmp30_, "res[i].center.x != default_point.x"); + _vala_assert (_tmp27_ != _tmp29_, "res[i].center.x != default_point.x"); #line 3017 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = res; + _tmp30_ = res; #line 3017 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31__length1 = res_length1; + _tmp30__length1 = res_length1; #line 3017 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = i; + _tmp31_ = i; #line 3017 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp31_[_tmp32_]; + _tmp32_ = _tmp30_[_tmp31_]; #line 3017 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp33_.center; + _tmp33_ = _tmp32_.center; #line 3017 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = _tmp34_.y; + _tmp34_ = _tmp33_.y; #line 3017 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = default_point; + _tmp35_ = default_point; #line 3017 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tmp36_.y; + _tmp36_ = _tmp35_.y; #line 3017 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp35_ != _tmp37_, "res[i].center.y != default_point.y"); + _vala_assert (_tmp34_ != _tmp36_, "res[i].center.y != default_point.y"); #line 3019 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = res; + _tmp37_ = res; #line 3019 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38__length1 = res_length1; + _tmp37__length1 = res_length1; #line 3019 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = i; + _tmp38_ = i; #line 3019 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = map; + _tmp39_ = map; #line 3019 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = radius_key; + _tmp40_ = radius_key; #line 3019 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = key_value_map_get_int (_tmp40_, _tmp41_, -1); -#line 3019 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_[_tmp39_].radius = _tmp42_; + _tmp37_[_tmp38_].radius = key_value_map_get_int (_tmp39_, _tmp40_, -1); #line 3020 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = res; + _tmp41_ = res; #line 3020 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43__length1 = res_length1; + _tmp41__length1 = res_length1; #line 3020 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = i; + _tmp42_ = i; #line 3020 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = _tmp43_[_tmp44_]; + _tmp43_ = _tmp41_[_tmp42_]; #line 3020 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = _tmp45_.radius; + _tmp44_ = _tmp43_.radius; #line 3020 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp46_ != -1, "res[i].radius != -1"); + _vala_assert (_tmp44_ != -1, "res[i].radius != -1"); #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (radius_key); #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (center_key); -#line 23300 "Photo.c" +#line 23712 "Photo.c" } } } #line 3023 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = res; + _tmp45_ = res; #line 3023 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47__length1 = res_length1; + _tmp45__length1 = res_length1; #line 3023 "/home/jens/Source/shotwell/src/Photo.vala" if (result_length1) { #line 3023 "/home/jens/Source/shotwell/src/Photo.vala" - *result_length1 = _tmp47__length1; -#line 23312 "Photo.c" + *result_length1 = _tmp45__length1; +#line 23724 "Photo.c" } #line 3023 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp47_; + result = _tmp45_; #line 3023 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); #line 3023 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23320 "Photo.c" +#line 23732 "Photo.c" } -gboolean photo_has_redeye_transformations (Photo* self) { +gboolean +photo_has_redeye_transformations (Photo* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 3026 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 3027 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_has_transformation (self, "redeye"); -#line 3027 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp0_; + result = photo_has_transformation (self, "redeye"); #line 3027 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23335 "Photo.c" +#line 23746 "Photo.c" } -void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye) { +void +photo_add_redeye_instance (Photo* self, + EditingToolsRedeyeInstance* redeye) +{ KeyValueMap* map = NULL; KeyValueMap* _tmp0_; KeyValueMap* _tmp1_; @@ -23345,25 +23759,23 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye) KeyValueMap* _tmp4_; gint _tmp5_; gint _tmp6_; - gint _tmp7_; gchar* radius_key = NULL; - gint _tmp8_; - gchar* _tmp9_; + gint _tmp7_; + gchar* _tmp8_; gchar* center_key = NULL; - gint _tmp10_; - gchar* _tmp11_; - KeyValueMap* _tmp12_; - const gchar* _tmp13_; - EditingToolsRedeyeInstance _tmp14_; - gint _tmp15_; - KeyValueMap* _tmp16_; - const gchar* _tmp17_; - EditingToolsRedeyeInstance _tmp18_; - GdkPoint _tmp19_; - KeyValueMap* _tmp20_; - gint _tmp21_; - KeyValueMap* _tmp22_; - gboolean _tmp23_; + gint _tmp9_; + gchar* _tmp10_; + KeyValueMap* _tmp11_; + const gchar* _tmp12_; + EditingToolsRedeyeInstance _tmp13_; + gint _tmp14_; + KeyValueMap* _tmp15_; + const gchar* _tmp16_; + EditingToolsRedeyeInstance _tmp17_; + GdkPoint _tmp18_; + KeyValueMap* _tmp19_; + gint _tmp20_; + KeyValueMap* _tmp21_; #line 3031 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 3031 "/home/jens/Source/shotwell/src/Photo.vala" @@ -23376,7 +23788,7 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye) _tmp1_ = map; #line 3033 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 23378 "Photo.c" +#line 23790 "Photo.c" KeyValueMap* _tmp2_; KeyValueMap* _tmp3_; #line 3034 "/home/jens/Source/shotwell/src/Photo.vala" @@ -23389,78 +23801,74 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye) _tmp3_ = map; #line 3035 "/home/jens/Source/shotwell/src/Photo.vala" key_value_map_set_int (_tmp3_, "num_points", 0); -#line 23391 "Photo.c" +#line 23803 "Photo.c" } #line 3038 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = map; #line 3038 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = key_value_map_get_int (_tmp4_, "num_points", -1); -#line 3038 "/home/jens/Source/shotwell/src/Photo.vala" - num_points = _tmp5_; + num_points = key_value_map_get_int (_tmp4_, "num_points", -1); #line 3039 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = num_points; + _tmp5_ = num_points; #line 3039 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp6_ >= 0, "num_points >= 0"); + _vala_assert (_tmp5_ >= 0, "num_points >= 0"); #line 3041 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = num_points; + _tmp6_ = num_points; #line 3041 "/home/jens/Source/shotwell/src/Photo.vala" - num_points = _tmp7_ + 1; + num_points = _tmp6_ + 1; #line 3043 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = num_points; + _tmp7_ = num_points; #line 3043 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = g_strdup_printf ("radius%d", _tmp8_ - 1); + _tmp8_ = g_strdup_printf ("radius%d", _tmp7_ - 1); #line 3043 "/home/jens/Source/shotwell/src/Photo.vala" - radius_key = _tmp9_; + radius_key = _tmp8_; #line 3044 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = num_points; + _tmp9_ = num_points; #line 3044 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = g_strdup_printf ("center%d", _tmp10_ - 1); + _tmp10_ = g_strdup_printf ("center%d", _tmp9_ - 1); #line 3044 "/home/jens/Source/shotwell/src/Photo.vala" - center_key = _tmp11_; + center_key = _tmp10_; #line 3046 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = map; + _tmp11_ = map; #line 3046 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = radius_key; + _tmp12_ = radius_key; #line 3046 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = *redeye; + _tmp13_ = *redeye; #line 3046 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_.radius; + _tmp14_ = _tmp13_.radius; #line 3046 "/home/jens/Source/shotwell/src/Photo.vala" - key_value_map_set_int (_tmp12_, _tmp13_, _tmp15_); + key_value_map_set_int (_tmp11_, _tmp12_, _tmp14_); #line 3047 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = map; + _tmp15_ = map; #line 3047 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = center_key; + _tmp16_ = center_key; #line 3047 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = *redeye; + _tmp17_ = *redeye; #line 3047 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_.center; + _tmp18_ = _tmp17_.center; #line 3047 "/home/jens/Source/shotwell/src/Photo.vala" - key_value_map_set_point (_tmp16_, _tmp17_, &_tmp19_); + key_value_map_set_point (_tmp15_, _tmp16_, &_tmp18_); #line 3049 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = map; + _tmp19_ = map; #line 3049 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = num_points; + _tmp20_ = num_points; #line 3049 "/home/jens/Source/shotwell/src/Photo.vala" - key_value_map_set_int (_tmp20_, "num_points", _tmp21_); -#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = map; + key_value_map_set_int (_tmp19_, "num_points", _tmp20_); #line 3051 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = photo_set_transformation (self, _tmp22_); + _tmp21_ = map; #line 3051 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp23_) { -#line 23451 "Photo.c" - Alteration* _tmp24_; - Alteration* _tmp25_; + if (photo_set_transformation (self, _tmp21_)) { +#line 23859 "Photo.c" + Alteration* _tmp22_; + Alteration* _tmp23_; #line 3052 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = alteration_new ("image", "redeye"); + _tmp22_ = alteration_new ("image", "redeye"); #line 3052 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp24_; + _tmp23_ = _tmp22_; #line 3052 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp23_); #line 3052 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp25_); -#line 23462 "Photo.c" + _alteration_unref0 (_tmp23_); +#line 23870 "Photo.c" } #line 3031 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (center_key); @@ -23468,11 +23876,17 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye) _g_free0 (radius_key); #line 3031 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 23470 "Photo.c" +#line 23878 "Photo.c" } -static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling, PhotoException exceptions, Dimensions* scaled_image, Dimensions* scaled_to_viewport) { +static gboolean +photo_calculate_pixbuf_dimensions (Photo* self, + Scaling* scaling, + PhotoException exceptions, + Dimensions* scaled_image, + Dimensions* scaled_to_viewport) +{ Dimensions _vala_scaled_image = {0}; Dimensions _vala_scaled_to_viewport = {0}; gboolean result = FALSE; @@ -23481,109 +23895,105 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 3066 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, FALSE); -#line 23483 "Photo.c" +#line 23897 "Photo.c" { PhotoRow* _tmp0_; - gboolean _tmp8_ = FALSE; + gboolean _tmp7_ = FALSE; #line 3068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 3068 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 23491 "Photo.c" +#line 23905 "Photo.c" { Scaling _tmp1_; - PhotoException _tmp2_; + Dimensions _tmp2_ = {0}; Dimensions _tmp3_ = {0}; - Dimensions _tmp4_ = {0}; - gboolean _tmp5_; + gboolean _tmp4_; #line 3070 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = *scaling; #line 3070 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = exceptions; -#line 3070 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_locked_calculate_pixbuf_dimensions (self, &_tmp1_, _tmp2_, &_tmp3_, &_tmp4_); + _tmp4_ = photo_locked_calculate_pixbuf_dimensions (self, &_tmp1_, exceptions, &_tmp2_, &_tmp3_); #line 3070 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_image = _tmp3_; + _vala_scaled_image = _tmp2_; #line 3070 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_to_viewport = _tmp4_; + _vala_scaled_to_viewport = _tmp3_; #line 3070 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp5_; -#line 23510 "Photo.c" + result = _tmp4_; +#line 23921 "Photo.c" { - PhotoRow* _tmp6_; + PhotoRow* _tmp5_; #line 3068 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; + _tmp5_ = self->row; #line 3068 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 23517 "Photo.c" +#line 23928 "Photo.c" } #line 3070 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { #line 3070 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23523 "Photo.c" +#line 23934 "Photo.c" } #line 3070 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { #line 3070 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23529 "Photo.c" +#line 23940 "Photo.c" } #line 3070 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23533 "Photo.c" +#line 23944 "Photo.c" } __finally392: { - PhotoRow* _tmp7_; + PhotoRow* _tmp6_; #line 3068 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->row; + _tmp6_ = self->row; #line 3068 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 23542 "Photo.c" +#line 23953 "Photo.c" } #line 3068 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 3068 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 3068 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp8_; -#line 23550 "Photo.c" + return _tmp7_; +#line 23961 "Photo.c" } #line 3066 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { #line 3066 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23556 "Photo.c" +#line 23967 "Photo.c" } #line 3066 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { #line 3066 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23562 "Photo.c" +#line 23973 "Photo.c" } } -static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling, PhotoException exceptions, Dimensions* scaled_image, Dimensions* scaled_to_viewport) { +static gboolean +photo_locked_calculate_pixbuf_dimensions (Photo* self, + Scaling* scaling, + PhotoException exceptions, + Dimensions* scaled_image, + Dimensions* scaled_to_viewport) +{ Dimensions _vala_scaled_image = {0}; Dimensions _vala_scaled_to_viewport = {0}; gboolean result = FALSE; Dimensions raw = {0}; Dimensions _tmp0_ = {0}; - gboolean _tmp1_; Orientation orientation = 0; - Orientation _tmp4_; - PhotoException _tmp5_; - gboolean _tmp6_; - gboolean _tmp38_; - gboolean _tmp53_ = FALSE; - Dimensions _tmp54_; - gint _tmp55_; - Dimensions _tmp56_; - gint _tmp57_; - gboolean _tmp63_; - gboolean _tmp64_; + gboolean _tmp36_ = FALSE; + Dimensions _tmp37_; + gint _tmp38_; + Dimensions _tmp39_; + gint _tmp40_; #line 3076 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 3076 "/home/jens/Source/shotwell/src/Photo.vala" @@ -23593,415 +24003,362 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* #line 3078 "/home/jens/Source/shotwell/src/Photo.vala" raw = _tmp0_; #line 3080 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = scaling_is_unscaled (scaling); -#line 3080 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_) { -#line 23598 "Photo.c" + if (scaling_is_unscaled (scaling)) { +#line 24006 "Photo.c" + Dimensions _tmp1_; Dimensions _tmp2_; - Dimensions _tmp3_; #line 3081 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = raw; + _tmp1_ = raw; #line 3081 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_image = _tmp2_; + _vala_scaled_image = _tmp1_; #line 3082 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = raw; + _tmp2_ = raw; #line 3082 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_to_viewport = _tmp3_; + _vala_scaled_to_viewport = _tmp2_; #line 3084 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 3084 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { #line 3084 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23615 "Photo.c" +#line 24023 "Photo.c" } #line 3084 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { #line 3084 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23621 "Photo.c" +#line 24029 "Photo.c" } #line 3084 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23625 "Photo.c" +#line 24033 "Photo.c" } #line 3087 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_get_orientation (self); -#line 3087 "/home/jens/Source/shotwell/src/Photo.vala" - orientation = _tmp4_; + orientation = photo_get_orientation (self); #line 3092 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_init (&_vala_scaled_image, 0, 0); #line 3093 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_init (&_vala_scaled_to_viewport, 0, 0); #line 3095 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = exceptions; -#line 3095 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_exception_allows (_tmp5_, PHOTO_EXCEPTION_CROP); -#line 3095 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_) { -#line 23641 "Photo.c" + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_CROP)) { +#line 24043 "Photo.c" Box crop = {0}; - Box _tmp7_ = {0}; - gboolean _tmp8_; + Box _tmp3_ = {0}; + gboolean _tmp4_; #line 3097 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_get_raw_crop (self, &_tmp7_); + _tmp4_ = photo_get_raw_crop (self, &_tmp3_); #line 3097 "/home/jens/Source/shotwell/src/Photo.vala" - crop = _tmp7_; + crop = _tmp3_; #line 3097 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_) { -#line 23651 "Photo.c" + if (_tmp4_) { +#line 24053 "Photo.c" Dimensions rotated_raw = {0}; - Dimensions _tmp9_; - PhotoException _tmp10_; - gboolean _tmp11_; + Dimensions _tmp5_; Box scaled_crop = {0}; - Dimensions _tmp19_ = {0}; + Dimensions _tmp13_ = {0}; + Dimensions _tmp14_ = {0}; + Box _tmp15_ = {0}; + Dimensions _tmp16_ = {0}; + gboolean _tmp17_ = FALSE; Dimensions _tmp20_ = {0}; - Box _tmp21_ = {0}; + Dimensions _tmp21_ = {0}; Dimensions _tmp22_ = {0}; - gboolean _tmp23_ = FALSE; - gint _tmp24_; - gint _tmp25_; - Dimensions _tmp30_ = {0}; - Dimensions _tmp31_ = {0}; - Dimensions _tmp32_ = {0}; - PhotoException _tmp33_; - gboolean _tmp34_; #line 3100 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = raw; + _tmp5_ = raw; #line 3100 "/home/jens/Source/shotwell/src/Photo.vala" - rotated_raw = _tmp9_; -#line 3101 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = exceptions; + rotated_raw = _tmp5_; #line 3101 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_ORIENTATION); -#line 3101 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 23679 "Photo.c" - Orientation _tmp12_; - Dimensions _tmp13_; - Box _tmp14_; - Box _tmp15_ = {0}; - Orientation _tmp16_; - Dimensions _tmp17_; - Dimensions _tmp18_ = {0}; + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_ORIENTATION)) { +#line 24071 "Photo.c" + Orientation _tmp6_; + Dimensions _tmp7_; + Box _tmp8_; + Box _tmp9_ = {0}; + Orientation _tmp10_; + Dimensions _tmp11_; + Dimensions _tmp12_ = {0}; #line 3102 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = orientation; + _tmp6_ = orientation; #line 3102 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = raw; + _tmp7_ = raw; #line 3102 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = crop; + _tmp8_ = crop; #line 3102 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_rotate_box (_tmp12_, &_tmp13_, &_tmp14_, &_tmp15_); + orientation_rotate_box (_tmp6_, &_tmp7_, &_tmp8_, &_tmp9_); #line 3102 "/home/jens/Source/shotwell/src/Photo.vala" - crop = _tmp15_; + crop = _tmp9_; #line 3103 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = orientation; + _tmp10_ = orientation; #line 3103 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = raw; + _tmp11_ = raw; #line 3103 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_rotate_dimensions (_tmp16_, &_tmp17_, &_tmp18_); + orientation_rotate_dimensions (_tmp10_, &_tmp11_, &_tmp12_); #line 3103 "/home/jens/Source/shotwell/src/Photo.vala" - rotated_raw = _tmp18_; -#line 23705 "Photo.c" + rotated_raw = _tmp12_; +#line 24097 "Photo.c" } #line 3107 "/home/jens/Source/shotwell/src/Photo.vala" - box_get_dimensions (&crop, &_tmp19_); + box_get_dimensions (&crop, &_tmp13_); #line 3107 "/home/jens/Source/shotwell/src/Photo.vala" - scaling_get_scaled_dimensions (scaling, &_tmp19_, &_tmp20_); + scaling_get_scaled_dimensions (scaling, &_tmp13_, &_tmp14_); #line 3107 "/home/jens/Source/shotwell/src/Photo.vala" - box_get_scaled (&crop, &_tmp20_, &_tmp21_); + box_get_scaled (&crop, &_tmp14_, &_tmp15_); #line 3107 "/home/jens/Source/shotwell/src/Photo.vala" - scaled_crop = _tmp21_; + scaled_crop = _tmp15_; #line 3110 "/home/jens/Source/shotwell/src/Photo.vala" - box_get_dimensions (&scaled_crop, &_tmp22_); + box_get_dimensions (&scaled_crop, &_tmp16_); #line 3110 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_to_viewport = _tmp22_; -#line 3113 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = box_get_width (&crop); + _vala_scaled_to_viewport = _tmp16_; #line 3113 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = box_get_width (&scaled_crop); -#line 3113 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp24_ <= _tmp25_) { -#line 23725 "Photo.c" - gint _tmp26_; - gint _tmp27_; + if (box_get_width (&crop) <= box_get_width (&scaled_crop)) { #line 3114 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = box_get_height (&crop); -#line 3114 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = box_get_height (&scaled_crop); -#line 3114 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _tmp26_ <= _tmp27_; -#line 23734 "Photo.c" + _tmp17_ = box_get_height (&crop) <= box_get_height (&scaled_crop); +#line 24115 "Photo.c" } else { #line 3113 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = FALSE; -#line 23738 "Photo.c" + _tmp17_ = FALSE; +#line 24119 "Photo.c" } #line 3113 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp23_) { -#line 23742 "Photo.c" - Dimensions _tmp28_; - Dimensions _tmp29_ = {0}; + if (_tmp17_) { +#line 24123 "Photo.c" + Dimensions _tmp18_; + Dimensions _tmp19_ = {0}; #line 3115 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = raw; + _tmp18_ = raw; #line 3115 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_image = _tmp28_; + _vala_scaled_image = _tmp18_; #line 3116 "/home/jens/Source/shotwell/src/Photo.vala" - box_get_dimensions (&crop, &_tmp29_); + box_get_dimensions (&crop, &_tmp19_); #line 3116 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_to_viewport = _tmp29_; + _vala_scaled_to_viewport = _tmp19_; #line 3118 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 3118 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { #line 3118 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23759 "Photo.c" +#line 24140 "Photo.c" } #line 3118 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { #line 3118 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23765 "Photo.c" +#line 24146 "Photo.c" } #line 3118 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23769 "Photo.c" +#line 24150 "Photo.c" } #line 3123 "/home/jens/Source/shotwell/src/Photo.vala" - box_get_dimensions (&crop, &_tmp30_); + box_get_dimensions (&crop, &_tmp20_); #line 3123 "/home/jens/Source/shotwell/src/Photo.vala" - box_get_dimensions (&scaled_crop, &_tmp31_); + box_get_dimensions (&scaled_crop, &_tmp21_); #line 3123 "/home/jens/Source/shotwell/src/Photo.vala" - dimensions_get_scaled_similar (&rotated_raw, &_tmp30_, &_tmp31_, &_tmp32_); + dimensions_get_scaled_similar (&rotated_raw, &_tmp20_, &_tmp21_, &_tmp22_); #line 3123 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_image = _tmp32_; -#line 3127 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = exceptions; + _vala_scaled_image = _tmp22_; #line 3127 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = photo_exception_allows (_tmp33_, PHOTO_EXCEPTION_ORIENTATION); -#line 3127 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp34_) { -#line 23785 "Photo.c" - Orientation _tmp35_; - Dimensions _tmp36_; - Dimensions _tmp37_ = {0}; + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_ORIENTATION)) { +#line 24162 "Photo.c" + Orientation _tmp23_; + Dimensions _tmp24_; + Dimensions _tmp25_ = {0}; #line 3128 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = orientation; + _tmp23_ = orientation; #line 3128 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = _vala_scaled_image; + _tmp24_ = _vala_scaled_image; #line 3128 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_derotate_dimensions (_tmp35_, &_tmp36_, &_tmp37_); + orientation_derotate_dimensions (_tmp23_, &_tmp24_, &_tmp25_); #line 3128 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_image = _tmp37_; -#line 23797 "Photo.c" + _vala_scaled_image = _tmp25_; +#line 24174 "Photo.c" } } } #line 3133 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = dimensions_has_area (&_vala_scaled_image); -#line 3133 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp38_) { -#line 23805 "Photo.c" + if (!dimensions_has_area (&_vala_scaled_image)) { +#line 24180 "Photo.c" Dimensions rotated_raw = {0}; - Dimensions _tmp39_; - PhotoException _tmp40_; - gboolean _tmp41_; - Dimensions _tmp45_; - Dimensions _tmp46_ = {0}; - Dimensions _tmp47_; - PhotoException _tmp48_; - gboolean _tmp49_; + Dimensions _tmp26_; + Dimensions _tmp30_; + Dimensions _tmp31_ = {0}; + Dimensions _tmp32_; #line 3135 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = raw; + _tmp26_ = raw; #line 3135 "/home/jens/Source/shotwell/src/Photo.vala" - rotated_raw = _tmp39_; -#line 3136 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = exceptions; + rotated_raw = _tmp26_; #line 3136 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_ORIENTATION); -#line 3136 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp41_) { -#line 23825 "Photo.c" - Orientation _tmp42_; - Dimensions _tmp43_; - Dimensions _tmp44_ = {0}; + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_ORIENTATION)) { +#line 24192 "Photo.c" + Orientation _tmp27_; + Dimensions _tmp28_; + Dimensions _tmp29_ = {0}; #line 3137 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = orientation; + _tmp27_ = orientation; #line 3137 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = raw; + _tmp28_ = raw; #line 3137 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_rotate_dimensions (_tmp42_, &_tmp43_, &_tmp44_); + orientation_rotate_dimensions (_tmp27_, &_tmp28_, &_tmp29_); #line 3137 "/home/jens/Source/shotwell/src/Photo.vala" - rotated_raw = _tmp44_; -#line 23837 "Photo.c" + rotated_raw = _tmp29_; +#line 24204 "Photo.c" } #line 3139 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = rotated_raw; + _tmp30_ = rotated_raw; #line 3139 "/home/jens/Source/shotwell/src/Photo.vala" - scaling_get_scaled_dimensions (scaling, &_tmp45_, &_tmp46_); + scaling_get_scaled_dimensions (scaling, &_tmp30_, &_tmp31_); #line 3139 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_image = _tmp46_; + _vala_scaled_image = _tmp31_; #line 3140 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = _vala_scaled_image; + _tmp32_ = _vala_scaled_image; #line 3140 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_to_viewport = _tmp47_; -#line 3143 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = exceptions; + _vala_scaled_to_viewport = _tmp32_; #line 3143 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = photo_exception_allows (_tmp48_, PHOTO_EXCEPTION_ORIENTATION); -#line 3143 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp49_) { -#line 23855 "Photo.c" - Orientation _tmp50_; - Dimensions _tmp51_; - Dimensions _tmp52_ = {0}; + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_ORIENTATION)) { +#line 24218 "Photo.c" + Orientation _tmp33_; + Dimensions _tmp34_; + Dimensions _tmp35_ = {0}; #line 3144 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = orientation; + _tmp33_ = orientation; #line 3144 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = _vala_scaled_image; + _tmp34_ = _vala_scaled_image; #line 3144 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_derotate_dimensions (_tmp50_, &_tmp51_, &_tmp52_); + orientation_derotate_dimensions (_tmp33_, &_tmp34_, &_tmp35_); #line 3144 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_image = _tmp52_; -#line 23867 "Photo.c" + _vala_scaled_image = _tmp35_; +#line 24230 "Photo.c" } } #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = _vala_scaled_image; + _tmp37_ = _vala_scaled_image; #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = _tmp54_.width; + _tmp38_ = _tmp37_.width; #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = raw; + _tmp39_ = raw; #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = _tmp56_.width; + _tmp40_ = _tmp39_.width; #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp55_ >= _tmp57_) { -#line 23880 "Photo.c" - Dimensions _tmp58_; - gint _tmp59_; - Dimensions _tmp60_; - gint _tmp61_; + if (_tmp38_ >= _tmp40_) { +#line 24243 "Photo.c" + Dimensions _tmp41_; + gint _tmp42_; + Dimensions _tmp43_; + gint _tmp44_; #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = _vala_scaled_image; + _tmp41_ = _vala_scaled_image; #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = _tmp58_.height; + _tmp42_ = _tmp41_.height; #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = raw; + _tmp43_ = raw; #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = _tmp60_.height; + _tmp44_ = _tmp43_.height; #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = _tmp59_ >= _tmp61_; -#line 23895 "Photo.c" + _tmp36_ = _tmp42_ >= _tmp44_; +#line 24258 "Photo.c" } else { #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = FALSE; -#line 23899 "Photo.c" + _tmp36_ = FALSE; +#line 24262 "Photo.c" } #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp53_) { -#line 23903 "Photo.c" - Dimensions _tmp62_; + if (_tmp36_) { +#line 24266 "Photo.c" + Dimensions _tmp45_; #line 3149 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = raw; + _tmp45_ = raw; #line 3149 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_image = _tmp62_; + _vala_scaled_image = _tmp45_; #line 3151 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 3151 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { #line 3151 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23915 "Photo.c" +#line 24278 "Photo.c" } #line 3151 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { #line 3151 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23921 "Photo.c" +#line 24284 "Photo.c" } #line 3151 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23925 "Photo.c" +#line 24288 "Photo.c" } #line 3154 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = dimensions_has_area (&_vala_scaled_image); -#line 3154 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp63_, "scaled_image.has_area()"); -#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = dimensions_has_area (&_vala_scaled_to_viewport); + _vala_assert (dimensions_has_area (&_vala_scaled_image), "scaled_image.has_area()"); #line 3155 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp64_, "scaled_to_viewport.has_area()"); + _vala_assert (dimensions_has_area (&_vala_scaled_to_viewport), "scaled_to_viewport.has_area()"); #line 3157 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 3157 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { #line 3157 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23941 "Photo.c" +#line 24300 "Photo.c" } #line 3157 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { #line 3157 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23947 "Photo.c" +#line 24306 "Photo.c" } #line 3157 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23951 "Photo.c" +#line 24310 "Photo.c" } -static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error) { +static GdkPixbuf* +photo_load_raw_pixbuf (Photo* self, + Scaling* scaling, + PhotoException exceptions, + BackingFetchMode fetch_mode, + GError** error) +{ GdkPixbuf* result = NULL; PhotoFileReader* loader = NULL; - BackingFetchMode _tmp0_; - PhotoFileReader* _tmp1_; - gboolean _tmp2_; + PhotoFileReader* _tmp0_; Dimensions scaled_image = {0}; Dimensions scaled_to_viewport = {0}; gboolean is_scaled = FALSE; - Scaling _tmp7_; - PhotoException _tmp8_; - Dimensions _tmp9_ = {0}; - Dimensions _tmp10_ = {0}; - gboolean _tmp11_; - gboolean _tmp12_; + Scaling _tmp5_; + Dimensions _tmp6_ = {0}; + Dimensions _tmp7_ = {0}; + gboolean _tmp8_; + gboolean _tmp9_; GdkPixbuf* pixbuf = NULL; - PhotoFileReader* _tmp17_; - Dimensions _tmp18_ = {0}; - Dimensions _tmp19_; - GdkPixbuf* _tmp20_; - GdkPixbuf* _tmp21_; - Dimensions _tmp22_ = {0}; - gboolean _tmp23_; + PhotoFileReader* _tmp14_; + Dimensions _tmp15_ = {0}; + Dimensions _tmp16_; + GdkPixbuf* _tmp17_; + GdkPixbuf* _tmp18_; + Dimensions _tmp19_ = {0}; GError * _inner_error_ = NULL; #line 3163 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); #line 3163 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, NULL); #line 3166 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = fetch_mode; + _tmp0_ = photo_get_backing_reader (self, fetch_mode); #line 3166 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_get_backing_reader (self, _tmp0_); -#line 3166 "/home/jens/Source/shotwell/src/Photo.vala" - loader = _tmp1_; -#line 3169 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = scaling_is_unscaled (scaling); + loader = _tmp0_; #line 3169 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_) { -#line 23993 "Photo.c" - GdkPixbuf* _tmp3_ = NULL; - PhotoFileReader* _tmp4_; - GdkPixbuf* _tmp5_; - GdkPixbuf* _tmp6_; + if (scaling_is_unscaled (scaling)) { +#line 24350 "Photo.c" + GdkPixbuf* _tmp1_ = NULL; + PhotoFileReader* _tmp2_; + GdkPixbuf* _tmp3_; + GdkPixbuf* _tmp4_; #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = loader; + _tmp2_ = loader; #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_file_reader_unscaled_read (_tmp4_, &_inner_error_); + _tmp3_ = photo_file_reader_unscaled_read (_tmp2_, &_inner_error_); #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp5_; + _tmp1_ = _tmp3_; #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" @@ -24010,49 +24367,47 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc _photo_file_adapter_unref0 (loader); #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24012 "Photo.c" +#line 24369 "Photo.c" } #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp3_; + _tmp4_ = _tmp1_; #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = NULL; + _tmp1_ = NULL; #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp6_; + result = _tmp4_; #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (loader); #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24026 "Photo.c" +#line 24383 "Photo.c" } #line 3179 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = *scaling; -#line 3179 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = exceptions; + _tmp5_ = *scaling; #line 3179 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_calculate_pixbuf_dimensions (self, &_tmp7_, _tmp8_, &_tmp9_, &_tmp10_); + _tmp8_ = photo_calculate_pixbuf_dimensions (self, &_tmp5_, exceptions, &_tmp6_, &_tmp7_); #line 3179 "/home/jens/Source/shotwell/src/Photo.vala" - scaled_image = _tmp9_; + scaled_image = _tmp6_; #line 3179 "/home/jens/Source/shotwell/src/Photo.vala" - scaled_to_viewport = _tmp10_; + scaled_to_viewport = _tmp7_; #line 3179 "/home/jens/Source/shotwell/src/Photo.vala" - is_scaled = _tmp11_; + is_scaled = _tmp8_; #line 3181 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = is_scaled; + _tmp9_ = is_scaled; #line 3181 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp12_) { -#line 24044 "Photo.c" - GdkPixbuf* _tmp13_ = NULL; - PhotoFileReader* _tmp14_; - GdkPixbuf* _tmp15_; - GdkPixbuf* _tmp16_; + if (!_tmp9_) { +#line 24399 "Photo.c" + GdkPixbuf* _tmp10_ = NULL; + PhotoFileReader* _tmp11_; + GdkPixbuf* _tmp12_; + GdkPixbuf* _tmp13_; #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = loader; + _tmp11_ = loader; #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo_file_reader_unscaled_read (_tmp14_, &_inner_error_); + _tmp12_ = photo_file_reader_unscaled_read (_tmp11_, &_inner_error_); #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp15_; + _tmp10_ = _tmp12_; #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" @@ -24061,32 +24416,32 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc _photo_file_adapter_unref0 (loader); #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24063 "Photo.c" +#line 24418 "Photo.c" } #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp13_; + _tmp13_ = _tmp10_; #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = NULL; + _tmp10_ = NULL; #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp16_; + result = _tmp13_; #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp10_); #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (loader); #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24077 "Photo.c" +#line 24432 "Photo.c" } #line 3189 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = loader; + _tmp14_ = loader; #line 3189 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_raw_dimensions (self, &_tmp18_); + photo_get_raw_dimensions (self, &_tmp15_); #line 3189 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = scaled_image; + _tmp16_ = scaled_image; #line 3189 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = photo_file_reader_scaled_read (_tmp17_, &_tmp18_, &_tmp19_, &_inner_error_); + _tmp17_ = photo_file_reader_scaled_read (_tmp14_, &_tmp15_, &_tmp16_, &_inner_error_); #line 3189 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp20_; + pixbuf = _tmp17_; #line 3189 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3189 "/home/jens/Source/shotwell/src/Photo.vala" @@ -24095,33 +24450,35 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc _photo_file_adapter_unref0 (loader); #line 3189 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24097 "Photo.c" +#line 24452 "Photo.c" } #line 3197 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = pixbuf; + _tmp18_ = pixbuf; #line 3197 "/home/jens/Source/shotwell/src/Photo.vala" - dimensions_for_pixbuf (_tmp21_, &_tmp22_); + dimensions_for_pixbuf (_tmp18_, &_tmp19_); #line 3197 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = dimensions_approx_equals (&scaled_image, &_tmp22_, PHOTO_SCALING_FUDGE); -#line 3197 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp23_, "scaled_image.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)"); + _vala_assert (dimensions_approx_equals (&scaled_image, &_tmp19_, PHOTO_SCALING_FUDGE), "scaled_image.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)"); #line 3199 "/home/jens/Source/shotwell/src/Photo.vala" result = pixbuf; #line 3199 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (loader); #line 3199 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24113 "Photo.c" +#line 24466 "Photo.c" } -GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, GError** error) { +GdkPixbuf* +photo_get_master_pixbuf (Photo* self, + Scaling* scaling, + gboolean rotate, + GError** error) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; Scaling _tmp1_; - gboolean _tmp2_; + GdkPixbuf* _tmp2_; GdkPixbuf* _tmp3_; - GdkPixbuf* _tmp4_; GError * _inner_error_ = NULL; #line 3204 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); @@ -24130,40 +24487,42 @@ GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rota #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = *scaling; #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = rotate; + _tmp2_ = photo_get_untransformed_pixbuf (self, &_tmp1_, rotate, BACKING_FETCH_MODE_MASTER, &_inner_error_); #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_get_untransformed_pixbuf (self, &_tmp1_, _tmp2_, BACKING_FETCH_MODE_MASTER, &_inner_error_); -#line 3205 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp3_; + _tmp0_ = _tmp2_; #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24143 "Photo.c" +#line 24498 "Photo.c" } #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp0_; + _tmp3_ = _tmp0_; #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp4_; + result = _tmp3_; #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24155 "Photo.c" +#line 24510 "Photo.c" } -GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, GError** error) { +GdkPixbuf* +photo_get_unmodified_pixbuf (Photo* self, + Scaling* scaling, + gboolean rotate, + GError** error) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; Scaling _tmp1_; - gboolean _tmp2_; + GdkPixbuf* _tmp2_; GdkPixbuf* _tmp3_; - GdkPixbuf* _tmp4_; GError * _inner_error_ = NULL; #line 3209 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); @@ -24172,61 +24531,62 @@ GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = *scaling; #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = rotate; -#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_get_untransformed_pixbuf (self, &_tmp1_, _tmp2_, BACKING_FETCH_MODE_UNMODIFIED, &_inner_error_); + _tmp2_ = photo_get_untransformed_pixbuf (self, &_tmp1_, rotate, BACKING_FETCH_MODE_UNMODIFIED, &_inner_error_); #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp3_; + _tmp0_ = _tmp2_; #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24185 "Photo.c" +#line 24542 "Photo.c" } #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp0_; + _tmp3_ = _tmp0_; #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp4_; + result = _tmp3_; #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24197 "Photo.c" +#line 24554 "Photo.c" } -static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, BackingFetchMode fetch_mode, GError** error) { +static GdkPixbuf* +photo_get_untransformed_pixbuf (Photo* self, + Scaling* scaling, + gboolean rotate, + BackingFetchMode fetch_mode, + GError** error) +{ GdkPixbuf* result = NULL; Dimensions scaled_image = {0}; Dimensions scaled_to_viewport = {0}; Orientation original_orientation = 0; GdkPixbuf* pixbuf = NULL; - Scaling _tmp6_; - BackingFetchMode _tmp7_; - GdkPixbuf* _tmp8_; - gboolean _tmp9_; + Scaling _tmp5_; + GdkPixbuf* _tmp6_; GError * _inner_error_ = NULL; #line 3214 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); #line 3214 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 24216 "Photo.c" +#line 24577 "Photo.c" { PhotoRow* _tmp0_; #line 3228 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 3228 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 24223 "Photo.c" +#line 24584 "Photo.c" { Scaling _tmp1_; Dimensions _tmp2_ = {0}; Dimensions _tmp3_ = {0}; - Orientation _tmp4_; #line 3229 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = *scaling; #line 3229 "/home/jens/Source/shotwell/src/Photo.vala" @@ -24236,19 +24596,17 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling, #line 3229 "/home/jens/Source/shotwell/src/Photo.vala" scaled_to_viewport = _tmp3_; #line 3231 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_get_original_orientation (self); -#line 3231 "/home/jens/Source/shotwell/src/Photo.vala" - original_orientation = _tmp4_; -#line 24241 "Photo.c" + original_orientation = photo_get_original_orientation (self); +#line 24599 "Photo.c" } __finally393: { - PhotoRow* _tmp5_; + PhotoRow* _tmp4_; #line 3228 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->row; + _tmp4_ = self->row; #line 3228 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 24250 "Photo.c" +#line 24608 "Photo.c" } #line 3228 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -24256,51 +24614,51 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling, g_propagate_error (error, _inner_error_); #line 3228 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24258 "Photo.c" +#line 24616 "Photo.c" } } #line 3235 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = *scaling; + _tmp5_ = *scaling; #line 3235 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = fetch_mode; + _tmp6_ = photo_load_raw_pixbuf (self, &_tmp5_, PHOTO_EXCEPTION_NONE, fetch_mode, &_inner_error_); #line 3235 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_load_raw_pixbuf (self, &_tmp6_, PHOTO_EXCEPTION_NONE, _tmp7_, &_inner_error_); -#line 3235 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp8_; + pixbuf = _tmp6_; #line 3235 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3235 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3235 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24275 "Photo.c" +#line 24631 "Photo.c" } #line 3241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = rotate; -#line 3241 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp9_) { -#line 24281 "Photo.c" - GdkPixbuf* _tmp10_; - GdkPixbuf* _tmp11_; + if (rotate) { +#line 24635 "Photo.c" + GdkPixbuf* _tmp7_; + GdkPixbuf* _tmp8_; #line 3242 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = pixbuf; + _tmp7_ = pixbuf; #line 3242 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = orientation_rotate_pixbuf (original_orientation, _tmp10_); + _tmp8_ = orientation_rotate_pixbuf (original_orientation, _tmp7_); #line 3242 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 3242 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp11_; -#line 24292 "Photo.c" + pixbuf = _tmp8_; +#line 24646 "Photo.c" } #line 3251 "/home/jens/Source/shotwell/src/Photo.vala" result = pixbuf; #line 3251 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24298 "Photo.c" +#line 24652 "Photo.c" } -static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GError** error) { +static GdkPixbuf* +photo_real_get_pixbuf (PhotoSource* base, + Scaling* scaling, + GError** error) +{ Photo * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; @@ -24324,7 +24682,7 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE g_propagate_error (error, _inner_error_); #line 3255 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24326 "Photo.c" +#line 24684 "Photo.c" } #line 3255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp0_; @@ -24336,7 +24694,7 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE _g_object_unref0 (_tmp0_); #line 3255 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24338 "Photo.c" +#line 24696 "Photo.c" } @@ -24355,35 +24713,43 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE * and dropping excessive pixbufs from the LRU. Locating a Photo "touches" the pixbuf, i.e. * it moves to the head of the LRU. */ -static gpointer _photo_cached_pixbuf_ref0 (gpointer self) { +static gpointer +_photo_cached_pixbuf_ref0 (gpointer self) +{ #line 3290 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_cached_pixbuf_ref (self) : NULL; -#line 24360 "Photo.c" +#line 24720 "Photo.c" } -static gboolean _photo_trim_source_pixbuf_cache_gsource_func (gpointer self) { +static gboolean +_photo_trim_source_pixbuf_cache_gsource_func (gpointer self) +{ gboolean result; result = photo_trim_source_pixbuf_cache (); #line 3342 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24369 "Photo.c" +#line 24731 "Photo.c" } -static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, GError** error) { +static GdkPixbuf* +photo_run_source_pixbuf_cache (Photo* locate, + gboolean keep, + GError** error) +{ GdkPixbuf* result = NULL; GError * _inner_error_ = NULL; #line 3273 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((locate == NULL) || IS_PHOTO (locate), NULL); -#line 24378 "Photo.c" +#line 24744 "Photo.c" { GeeLinkedList* _tmp0_; #line 3274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_source_pixbuf_cache; #line 3274 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&__lock_photo_source_pixbuf_cache); -#line 24385 "Photo.c" +#line 24751 "Photo.c" { PhotoCachedPixbuf* found = NULL; gdouble min_elapsed = 0.0; @@ -24391,18 +24757,18 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G GeeIterator* iter = NULL; GeeLinkedList* _tmp1_; GeeIterator* _tmp2_; - gboolean _tmp29_ = FALSE; - gboolean _tmp30_ = FALSE; - PhotoCachedPixbuf* _tmp31_; - gboolean _tmp43_ = FALSE; - PhotoCachedPixbuf* _tmp44_; - guint _tmp59_; - GeeLinkedList* _tmp61_; - gint _tmp62_; - gint _tmp63_; - GdkPixbuf* _tmp69_ = NULL; - PhotoCachedPixbuf* _tmp70_; - GdkPixbuf* _tmp73_; + gboolean _tmp23_ = FALSE; + gboolean _tmp24_ = FALSE; + PhotoCachedPixbuf* _tmp25_; + gboolean _tmp33_ = FALSE; + PhotoCachedPixbuf* _tmp34_; + guint _tmp47_; + GeeLinkedList* _tmp49_; + gint _tmp50_; + gint _tmp51_; + GdkPixbuf* _tmp55_ = NULL; + PhotoCachedPixbuf* _tmp56_; + GdkPixbuf* _tmp59_; #line 3275 "/home/jens/Source/shotwell/src/Photo.vala" found = NULL; #line 3279 "/home/jens/Source/shotwell/src/Photo.vala" @@ -24417,412 +24783,369 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G iter = _tmp2_; #line 3282 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 24419 "Photo.c" +#line 24785 "Photo.c" GeeIterator* _tmp3_; - gboolean _tmp4_; PhotoCachedPixbuf* cached_pixbuf = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp4_; + gpointer _tmp5_; gdouble elapsed = 0.0; - PhotoCachedPixbuf* _tmp7_; - GTimer* _tmp8_; - gdouble _tmp9_; - gdouble _tmp10_; - gboolean _tmp11_ = FALSE; - Photo* _tmp12_; + PhotoCachedPixbuf* _tmp6_; + GTimer* _tmp7_; + gdouble _tmp8_; + gboolean _tmp9_ = FALSE; #line 3282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = iter; #line 3282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_iterator_next (_tmp3_); -#line 3282 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp3_)) { #line 3282 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 24440 "Photo.c" +#line 24801 "Photo.c" } #line 3283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = iter; + _tmp4_ = iter; #line 3283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 3283 "/home/jens/Source/shotwell/src/Photo.vala" - cached_pixbuf = (PhotoCachedPixbuf*) _tmp6_; -#line 3285 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = cached_pixbuf; + cached_pixbuf = (PhotoCachedPixbuf*) _tmp5_; #line 3285 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_->last_touched; + _tmp6_ = cached_pixbuf; #line 3285 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = g_timer_elapsed (_tmp8_, NULL); + _tmp7_ = _tmp6_->last_touched; #line 3285 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = trunc (_tmp9_); + _tmp8_ = g_timer_elapsed (_tmp7_, NULL); #line 3285 "/home/jens/Source/shotwell/src/Photo.vala" - elapsed = _tmp10_ + 1; -#line 3287 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = locate; -#line 3287 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_ != NULL) { -#line 24462 "Photo.c" - PhotoCachedPixbuf* _tmp13_; - Photo* _tmp14_; - Photo* _tmp15_; - gboolean _tmp16_; -#line 3287 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = cached_pixbuf; + elapsed = trunc (_tmp8_) + 1; #line 3287 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_->photo; + if (locate != NULL) { +#line 24819 "Photo.c" + PhotoCachedPixbuf* _tmp10_; + Photo* _tmp11_; #line 3287 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = locate; + _tmp10_ = cached_pixbuf; #line 3287 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_SOURCE, DataSource)); + _tmp11_ = _tmp10_->photo; #line 3287 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp16_; -#line 24477 "Photo.c" + _tmp9_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (locate, TYPE_DATA_SOURCE, DataSource)); +#line 24828 "Photo.c" } else { #line 3287 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = FALSE; -#line 24481 "Photo.c" + _tmp9_ = FALSE; +#line 24832 "Photo.c" } #line 3287 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 24485 "Photo.c" - GeeIterator* _tmp17_; - PhotoCachedPixbuf* _tmp18_; - PhotoCachedPixbuf* _tmp19_; - gint _tmp20_; + if (_tmp9_) { +#line 24836 "Photo.c" + GeeIterator* _tmp12_; + PhotoCachedPixbuf* _tmp13_; + PhotoCachedPixbuf* _tmp14_; + gint _tmp15_; #line 3289 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = iter; + _tmp12_ = iter; #line 3289 "/home/jens/Source/shotwell/src/Photo.vala" - gee_iterator_remove (_tmp17_); + gee_iterator_remove (_tmp12_); #line 3290 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = cached_pixbuf; + _tmp13_ = cached_pixbuf; #line 3290 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _photo_cached_pixbuf_ref0 (_tmp18_); + _tmp14_ = _photo_cached_pixbuf_ref0 (_tmp13_); #line 3290 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (found); #line 3290 "/home/jens/Source/shotwell/src/Photo.vala" - found = _tmp19_; + found = _tmp14_; #line 3293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = count; + _tmp15_ = count; #line 3293 "/home/jens/Source/shotwell/src/Photo.vala" - count = _tmp20_ + 1; -#line 24506 "Photo.c" + count = _tmp15_ + 1; +#line 24857 "Photo.c" } else { - gdouble _tmp21_; + gdouble _tmp16_; #line 3294 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = elapsed; + _tmp16_ = elapsed; #line 3294 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp21_ >= ((gdouble) PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC)) { -#line 24513 "Photo.c" - GeeIterator* _tmp22_; + if (_tmp16_ >= ((gdouble) PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC)) { +#line 24864 "Photo.c" + GeeIterator* _tmp17_; #line 3295 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = iter; + _tmp17_ = iter; #line 3295 "/home/jens/Source/shotwell/src/Photo.vala" - gee_iterator_remove (_tmp22_); -#line 24519 "Photo.c" + gee_iterator_remove (_tmp17_); +#line 24870 "Photo.c" } else { - gint _tmp23_; + gint _tmp18_; #line 3296 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = count; + _tmp18_ = count; #line 3296 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp23_ >= PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT) { -#line 24526 "Photo.c" - GeeIterator* _tmp24_; + if (_tmp18_ >= PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT) { +#line 24877 "Photo.c" + GeeIterator* _tmp19_; #line 3297 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = iter; + _tmp19_ = iter; #line 3297 "/home/jens/Source/shotwell/src/Photo.vala" - gee_iterator_remove (_tmp24_); -#line 24532 "Photo.c" + gee_iterator_remove (_tmp19_); +#line 24883 "Photo.c" } else { - gdouble _tmp25_; - gdouble _tmp26_; - gdouble _tmp27_; - gint _tmp28_; -#line 3301 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = elapsed; + gdouble _tmp20_; + gdouble _tmp21_; + gint _tmp22_; #line 3301 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = min_elapsed; + _tmp20_ = elapsed; #line 3301 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = MIN (_tmp25_, _tmp26_); + _tmp21_ = min_elapsed; #line 3301 "/home/jens/Source/shotwell/src/Photo.vala" - min_elapsed = _tmp27_; + min_elapsed = MIN (_tmp20_, _tmp21_); #line 3302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = count; + _tmp22_ = count; #line 3302 "/home/jens/Source/shotwell/src/Photo.vala" - count = _tmp28_ + 1; -#line 24550 "Photo.c" + count = _tmp22_ + 1; +#line 24898 "Photo.c" } } } #line 3282 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (cached_pixbuf); -#line 24556 "Photo.c" +#line 24904 "Photo.c" } #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = found; -#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp31_ == NULL) { -#line 24562 "Photo.c" - Photo* _tmp32_; + _tmp25_ = found; #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = locate; + if (_tmp25_ == NULL) { #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _tmp32_ != NULL; -#line 24568 "Photo.c" + _tmp24_ = locate != NULL; +#line 24912 "Photo.c" } else { #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = FALSE; -#line 24572 "Photo.c" + _tmp24_ = FALSE; +#line 24916 "Photo.c" } #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp30_) { -#line 24576 "Photo.c" - gboolean _tmp33_; -#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = keep; + if (_tmp24_) { #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _tmp33_; -#line 24582 "Photo.c" + _tmp23_ = keep; +#line 24922 "Photo.c" } else { #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = FALSE; -#line 24586 "Photo.c" + _tmp23_ = FALSE; +#line 24926 "Photo.c" } #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp29_) { -#line 24590 "Photo.c" - GdkPixbuf* _tmp34_ = NULL; - Photo* _tmp35_; - Scaling _tmp36_ = {0}; - GdkPixbuf* _tmp37_; - Photo* _tmp38_; - PhotoCachedPixbuf* _tmp39_; -#line 3309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = locate; + if (_tmp23_) { +#line 24930 "Photo.c" + GdkPixbuf* _tmp26_ = NULL; + Scaling _tmp27_ = {0}; + GdkPixbuf* _tmp28_; + PhotoCachedPixbuf* _tmp29_; #line 3309 "/home/jens/Source/shotwell/src/Photo.vala" - scaling_for_original (&_tmp36_); + scaling_for_original (&_tmp27_); #line 3309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = photo_load_raw_pixbuf (_tmp35_, &_tmp36_, PHOTO_EXCEPTION_ALL, BACKING_FETCH_MODE_SOURCE, &_inner_error_); + _tmp28_ = photo_load_raw_pixbuf (locate, &_tmp27_, PHOTO_EXCEPTION_ALL, BACKING_FETCH_MODE_SOURCE, &_inner_error_); #line 3309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp37_; + _tmp26_ = _tmp28_; #line 3309 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3309 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (iter); #line 3309 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (found); -#line 24611 "Photo.c" +#line 24947 "Photo.c" goto __finally394; } #line 3308 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = locate; -#line 3308 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = photo_cached_pixbuf_new (_tmp38_, _tmp34_); + _tmp29_ = photo_cached_pixbuf_new (locate, _tmp26_); #line 3308 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (found); #line 3308 "/home/jens/Source/shotwell/src/Photo.vala" - found = _tmp39_; + found = _tmp29_; #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp34_); -#line 24624 "Photo.c" + _g_object_unref0 (_tmp26_); +#line 24958 "Photo.c" } else { - PhotoCachedPixbuf* _tmp40_; + PhotoCachedPixbuf* _tmp30_; #line 3310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = found; + _tmp30_ = found; #line 3310 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp40_ != NULL) { -#line 24631 "Photo.c" - PhotoCachedPixbuf* _tmp41_; - GTimer* _tmp42_; + if (_tmp30_ != NULL) { +#line 24965 "Photo.c" + PhotoCachedPixbuf* _tmp31_; + GTimer* _tmp32_; #line 3312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = found; + _tmp31_ = found; #line 3312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _tmp41_->last_touched; + _tmp32_ = _tmp31_->last_touched; #line 3312 "/home/jens/Source/shotwell/src/Photo.vala" - g_timer_start (_tmp42_); -#line 24640 "Photo.c" + g_timer_start (_tmp32_); +#line 24974 "Photo.c" } } #line 3316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = found; -#line 3316 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp44_ != NULL) { -#line 24647 "Photo.c" - gboolean _tmp45_; + _tmp34_ = found; #line 3316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = keep; + if (_tmp34_ != NULL) { #line 3316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = _tmp45_; -#line 24653 "Photo.c" + _tmp33_ = keep; +#line 24983 "Photo.c" } else { #line 3316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = FALSE; -#line 24657 "Photo.c" + _tmp33_ = FALSE; +#line 24987 "Photo.c" } #line 3316 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp43_) { -#line 24661 "Photo.c" - GeeLinkedList* _tmp46_; - PhotoCachedPixbuf* _tmp47_; - PhotoCachedPixbuf* _tmp48_; - GTimer* _tmp49_; - gdouble _tmp50_; - gdouble _tmp51_; - gdouble _tmp52_; + if (_tmp33_) { +#line 24991 "Photo.c" + GeeLinkedList* _tmp35_; + PhotoCachedPixbuf* _tmp36_; + PhotoCachedPixbuf* _tmp37_; + GTimer* _tmp38_; + gdouble _tmp39_; + gdouble _tmp40_; #line 3317 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = photo_source_pixbuf_cache; + _tmp35_ = photo_source_pixbuf_cache; #line 3317 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = found; + _tmp36_ = found; #line 3317 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp47_); + gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp36_); #line 3322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = found; + _tmp37_ = found; #line 3322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = _tmp48_->last_touched; + _tmp38_ = _tmp37_->last_touched; #line 3322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = g_timer_elapsed (_tmp49_, NULL); + _tmp39_ = g_timer_elapsed (_tmp38_, NULL); #line 3322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = min_elapsed; + _tmp40_ = min_elapsed; #line 3322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = MIN (_tmp50_, _tmp51_); -#line 3322 "/home/jens/Source/shotwell/src/Photo.vala" - min_elapsed = _tmp52_; + min_elapsed = MIN (_tmp39_, _tmp40_); #line 3326 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 24689 "Photo.c" - GeeLinkedList* _tmp53_; - gint _tmp54_; - gint _tmp55_; - GeeLinkedList* _tmp56_; - gpointer _tmp57_; - PhotoCachedPixbuf* _tmp58_; +#line 25016 "Photo.c" + GeeLinkedList* _tmp41_; + gint _tmp42_; + gint _tmp43_; + GeeLinkedList* _tmp44_; + gpointer _tmp45_; + PhotoCachedPixbuf* _tmp46_; #line 3326 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = photo_source_pixbuf_cache; + _tmp41_ = photo_source_pixbuf_cache; #line 3326 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp42_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 3326 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = _tmp54_; + _tmp43_ = _tmp42_; #line 3326 "/home/jens/Source/shotwell/src/Photo.vala" - if (!(_tmp55_ > PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT)) { + if (!(_tmp43_ > PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT)) { #line 3326 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 24706 "Photo.c" +#line 25033 "Photo.c" } #line 3327 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = photo_source_pixbuf_cache; + _tmp44_ = photo_source_pixbuf_cache; #line 3327 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = gee_deque_poll_tail (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_DEQUE, GeeDeque)); + _tmp45_ = gee_deque_poll_tail (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_DEQUE, GeeDeque)); #line 3327 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = (PhotoCachedPixbuf*) _tmp57_; + _tmp46_ = (PhotoCachedPixbuf*) _tmp45_; #line 3327 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_cached_pixbuf_unref0 (_tmp58_); -#line 24716 "Photo.c" + _photo_cached_pixbuf_unref0 (_tmp46_); +#line 25043 "Photo.c" } } #line 3331 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = photo_discard_source_id; + _tmp47_ = photo_discard_source_id; #line 3331 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp59_ != ((guint) 0)) { -#line 24723 "Photo.c" - guint _tmp60_; + if (_tmp47_ != ((guint) 0)) { +#line 25050 "Photo.c" + guint _tmp48_; #line 3332 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = photo_discard_source_id; + _tmp48_ = photo_discard_source_id; #line 3332 "/home/jens/Source/shotwell/src/Photo.vala" - g_source_remove (_tmp60_); + g_source_remove (_tmp48_); #line 3333 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_source_id = (guint) 0; -#line 24731 "Photo.c" +#line 25058 "Photo.c" } #line 3337 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = photo_source_pixbuf_cache; + _tmp49_ = photo_source_pixbuf_cache; #line 3337 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp50_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 3337 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = _tmp62_; + _tmp51_ = _tmp50_; #line 3337 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp63_ > PHOTO_SOURCE_PIXBUF_MIN_LRU_COUNT) { -#line 24741 "Photo.c" - gdouble _tmp64_; + if (_tmp51_ > PHOTO_SOURCE_PIXBUF_MIN_LRU_COUNT) { +#line 25068 "Photo.c" + gdouble _tmp52_; guint retry_sec = 0U; - gdouble _tmp65_; - gdouble _tmp66_; - guint _tmp67_; - guint _tmp68_; + gdouble _tmp53_; + guint _tmp54_; #line 3338 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = min_elapsed; + _tmp52_ = min_elapsed; #line 3338 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp64_ >= 0.0, "min_elapsed >= 0.0"); + _vala_assert (_tmp52_ >= 0.0, "min_elapsed >= 0.0"); #line 3341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = min_elapsed; + _tmp53_ = min_elapsed; #line 3341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = trunc (_tmp65_); -#line 3341 "/home/jens/Source/shotwell/src/Photo.vala" - retry_sec = PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC - ((guint) _tmp66_); -#line 3342 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = retry_sec; + retry_sec = PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC - ((guint) trunc (_tmp53_)); #line 3342 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = g_timeout_add_seconds_full (G_PRIORITY_LOW, _tmp67_, _photo_trim_source_pixbuf_cache_gsource_func, NULL, NULL); + _tmp54_ = retry_sec; #line 3342 "/home/jens/Source/shotwell/src/Photo.vala" - photo_discard_source_id = _tmp68_; -#line 24764 "Photo.c" + photo_discard_source_id = g_timeout_add_seconds_full (G_PRIORITY_LOW, _tmp54_, _photo_trim_source_pixbuf_cache_gsource_func, NULL, NULL); +#line 25085 "Photo.c" } #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = found; + _tmp56_ = found; #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp70_ != NULL) { -#line 24770 "Photo.c" - PhotoCachedPixbuf* _tmp71_; - GdkPixbuf* _tmp72_; + if (_tmp56_ != NULL) { +#line 25091 "Photo.c" + PhotoCachedPixbuf* _tmp57_; + GdkPixbuf* _tmp58_; #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = found; + _tmp57_ = found; #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = _tmp71_->pixbuf; + _tmp58_ = _tmp57_->pixbuf; #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = _tmp72_; -#line 24779 "Photo.c" + _tmp55_ = _tmp58_; +#line 25100 "Photo.c" } else { #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = NULL; -#line 24783 "Photo.c" + _tmp55_ = NULL; +#line 25104 "Photo.c" } #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = _g_object_ref0 (_tmp69_); + _tmp59_ = _g_object_ref0 (_tmp55_); #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp73_; + result = _tmp59_; #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (iter); #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (found); -#line 24793 "Photo.c" +#line 25114 "Photo.c" { - GeeLinkedList* _tmp74_; + GeeLinkedList* _tmp60_; #line 3274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = photo_source_pixbuf_cache; + _tmp60_ = photo_source_pixbuf_cache; #line 3274 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache); -#line 24800 "Photo.c" +#line 25121 "Photo.c" } #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24804 "Photo.c" +#line 25125 "Photo.c" } __finally394: { - GeeLinkedList* _tmp75_; + GeeLinkedList* _tmp61_; #line 3274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = photo_source_pixbuf_cache; + _tmp61_ = photo_source_pixbuf_cache; #line 3274 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache); -#line 24813 "Photo.c" +#line 25134 "Photo.c" } #line 3274 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3274 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24819 "Photo.c" +#line 25140 "Photo.c" } } -static gboolean photo_trim_source_pixbuf_cache (void) { +static gboolean +photo_trim_source_pixbuf_cache (void) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; { @@ -24836,7 +25159,7 @@ static gboolean photo_trim_source_pixbuf_cache (void) { _g_object_unref0 (_tmp1_); #line 3351 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 24838 "Photo.c" +#line 25161 "Photo.c" goto __catch395_g_error; } } @@ -24850,12 +25173,12 @@ static gboolean photo_trim_source_pixbuf_cache (void) { _inner_error_ = NULL; #line 3350 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 24852 "Photo.c" +#line 25175 "Photo.c" } __finally395: #line 3350 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 24857 "Photo.c" +#line 25180 "Photo.c" gboolean _tmp2_ = FALSE; #line 3350 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -24863,13 +25186,13 @@ static gboolean photo_trim_source_pixbuf_cache (void) { g_clear_error (&_inner_error_); #line 3350 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp2_; -#line 24865 "Photo.c" +#line 25188 "Photo.c" } #line 3355 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 3355 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24871 "Photo.c" +#line 25194 "Photo.c" } @@ -24878,7 +25201,10 @@ static gboolean photo_trim_source_pixbuf_cache (void) { * * @return A copy of the Pixbuf with the image data from unmodified_precached. */ -GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) { +GdkPixbuf* +photo_get_prefetched_copy (Photo* self, + GError** error) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; GdkPixbuf* _tmp1_; @@ -24896,7 +25222,7 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) { g_propagate_error (error, _inner_error_); #line 3364 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24898 "Photo.c" +#line 25224 "Photo.c" } #line 3364 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gdk_pixbuf_copy (_tmp0_); @@ -24906,18 +25232,20 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) { _g_object_unref0 (_tmp0_); #line 3364 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24908 "Photo.c" +#line 25234 "Photo.c" } /** * @brief Discards the cached version of the unmodified image. */ -void photo_discard_prefetched (Photo* self) { +void +photo_discard_prefetched (Photo* self) +{ GError * _inner_error_ = NULL; #line 3370 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 24919 "Photo.c" +#line 25247 "Photo.c" { GdkPixbuf* _tmp0_; GdkPixbuf* _tmp1_; @@ -24929,7 +25257,7 @@ void photo_discard_prefetched (Photo* self) { _g_object_unref0 (_tmp1_); #line 3372 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 24931 "Photo.c" +#line 25259 "Photo.c" goto __catch396_g_error; } } @@ -24943,7 +25271,7 @@ void photo_discard_prefetched (Photo* self) { _inner_error_ = NULL; #line 3371 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 24945 "Photo.c" +#line 25273 "Photo.c" } __finally396: #line 3371 "/home/jens/Source/shotwell/src/Photo.vala" @@ -24954,7 +25282,7 @@ void photo_discard_prefetched (Photo* self) { g_clear_error (&_inner_error_); #line 3371 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 24956 "Photo.c" +#line 25284 "Photo.c" } } @@ -24970,7 +25298,13 @@ void photo_discard_prefetched (Photo* self) { * @param fetch_mode The fetch mode; if left unset, defaults to BASELINE so that * we get the image exactly as it is in the file. */ -GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error) { +GdkPixbuf* +photo_get_pixbuf_with_options (Photo* self, + Scaling* scaling, + PhotoException exceptions, + BackingFetchMode fetch_mode, + GError** error) +{ GdkPixbuf* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; @@ -24991,20 +25325,10 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx PixelTransformer* transformer = NULL; Orientation orientation = 0; GdkPixbuf* pixbuf = NULL; - GdkPixbuf* _tmp33_; - PhotoException _tmp34_; - gboolean _tmp35_; - PhotoException _tmp40_; - gboolean _tmp41_; - PhotoException _tmp46_; - gboolean _tmp47_; - PhotoException _tmp85_; - gboolean _tmp86_; - gboolean _tmp89_; - PhotoException _tmp96_; - gboolean _tmp97_; - gboolean _tmp101_ = FALSE; - gboolean _tmp102_; + GdkPixbuf* _tmp22_; + gboolean _tmp64_; + gboolean _tmp74_ = FALSE; + gboolean _tmp75_; GError * _inner_error_ = NULL; #line 3388 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); @@ -25016,86 +25340,62 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _tmp4_ = _tmp3_; #line 3401 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp4_) { -#line 25018 "Photo.c" - PhotoFileFormat _tmp5_; -#line 3402 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_get_master_file_format (self); #line 3402 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = _tmp5_ == PHOTO_FILE_FORMAT_RAW; -#line 25024 "Photo.c" + _tmp2_ = photo_get_master_file_format (self) == PHOTO_FILE_FORMAT_RAW; +#line 25344 "Photo.c" } else { #line 3401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = FALSE; -#line 25028 "Photo.c" +#line 25348 "Photo.c" } #line 3401 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 25032 "Photo.c" +#line 25352 "Photo.c" + gboolean _tmp5_ = FALSE; gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; - BackingFetchMode _tmp8_; #line 3403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = fetch_mode; + if (fetch_mode == BACKING_FETCH_MODE_BASELINE) { #line 3403 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_ == BACKING_FETCH_MODE_BASELINE) { -#line 3403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = TRUE; -#line 25042 "Photo.c" + _tmp6_ = TRUE; +#line 25359 "Photo.c" } else { - BackingFetchMode _tmp9_; #line 3403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = fetch_mode; -#line 3403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp9_ == BACKING_FETCH_MODE_UNMODIFIED; -#line 25049 "Photo.c" + _tmp6_ = fetch_mode == BACKING_FETCH_MODE_UNMODIFIED; +#line 25363 "Photo.c" } #line 3403 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp7_) { + if (_tmp6_) { #line 3403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = TRUE; -#line 25055 "Photo.c" + _tmp5_ = TRUE; +#line 25369 "Photo.c" } else { - BackingFetchMode _tmp10_; #line 3404 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = fetch_mode; -#line 3404 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp10_ == BACKING_FETCH_MODE_SOURCE; -#line 25062 "Photo.c" + _tmp5_ = fetch_mode == BACKING_FETCH_MODE_SOURCE; +#line 25373 "Photo.c" } #line 3403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp6_; -#line 25066 "Photo.c" + _tmp1_ = _tmp5_; +#line 25377 "Photo.c" } else { #line 3401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 25070 "Photo.c" +#line 25381 "Photo.c" } #line 3401 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 25074 "Photo.c" - RawDeveloper _tmp11_; - gboolean _tmp12_; -#line 3405 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_get_raw_developer (self); -#line 3405 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_is_raw_developer_complete (self, _tmp11_); #line 3405 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = !_tmp12_; -#line 25083 "Photo.c" + _tmp0_ = !photo_is_raw_developer_complete (self, photo_get_raw_developer (self)); +#line 25387 "Photo.c" } else { #line 3401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = FALSE; -#line 25087 "Photo.c" +#line 25391 "Photo.c" } #line 3401 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_) { -#line 25091 "Photo.c" - RawDeveloper _tmp13_; -#line 3406 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_get_raw_developer (self); #line 3406 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_raw_developer (self, _tmp13_, TRUE); -#line 25097 "Photo.c" + photo_set_raw_developer (self, photo_get_raw_developer (self), TRUE); +#line 25397 "Photo.c" } #line 3411 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_init (&original, 0, 0); @@ -25109,105 +25409,93 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _redeye_instances_size_ = redeye_instances_length1; #line 3416 "/home/jens/Source/shotwell/src/Photo.vala" transformer = NULL; -#line 25111 "Photo.c" +#line 25411 "Photo.c" { - PhotoRow* _tmp14_; + PhotoRow* _tmp7_; #line 3419 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->row; + _tmp7_ = self->row; #line 3419 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 25118 "Photo.c" - { - Dimensions _tmp15_ = {0}; - PhotoException _tmp16_; - Dimensions _tmp17_ = {0}; - Dimensions _tmp18_ = {0}; - Dimensions _tmp19_; - Dimensions _tmp20_ = {0}; - Dimensions _tmp21_; - gboolean _tmp22_; - gint _tmp23_; - EditingToolsRedeyeInstance* _tmp24_; - Box _tmp25_ = {0}; - gboolean _tmp26_; - gdouble _tmp27_ = 0.0; - gboolean _tmp28_; - gboolean _tmp29_; - Orientation _tmp31_; +#line 25418 "Photo.c" + { + Dimensions _tmp8_ = {0}; + Dimensions _tmp9_ = {0}; + Dimensions _tmp10_ = {0}; + Dimensions _tmp11_; + Dimensions _tmp12_ = {0}; + Dimensions _tmp13_; + gint _tmp14_; + EditingToolsRedeyeInstance* _tmp15_; + Box _tmp16_ = {0}; + gboolean _tmp17_; + gdouble _tmp18_ = 0.0; + gboolean _tmp19_; #line 3420 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_ALL, &_tmp15_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_ALL, &_tmp8_); #line 3420 "/home/jens/Source/shotwell/src/Photo.vala" - original = _tmp15_; + original = _tmp8_; #line 3421 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = exceptions; + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), exceptions, &_tmp9_); #line 3421 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp16_, &_tmp17_); + scaling_get_scaled_dimensions (scaling, &_tmp9_, &_tmp10_); #line 3421 "/home/jens/Source/shotwell/src/Photo.vala" - scaling_get_scaled_dimensions (scaling, &_tmp17_, &_tmp18_); -#line 3421 "/home/jens/Source/shotwell/src/Photo.vala" - scaled = _tmp18_; + scaled = _tmp10_; #line 3422 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = scaled; + _tmp11_ = scaled; #line 3422 "/home/jens/Source/shotwell/src/Photo.vala" - scaled_to_viewport = _tmp19_; -#line 3424 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp20_); + scaled_to_viewport = _tmp11_; #line 3424 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = scaled; + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp12_); #line 3424 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = dimensions_equals (&_tmp20_, &_tmp21_); + _tmp13_ = scaled; #line 3424 "/home/jens/Source/shotwell/src/Photo.vala" - is_scaled = !_tmp22_; + is_scaled = !dimensions_equals (&_tmp12_, &_tmp13_); #line 3426 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = photo_get_raw_redeye_instances (self, &_tmp23_); + _tmp15_ = photo_get_raw_redeye_instances (self, &_tmp14_); #line 3426 "/home/jens/Source/shotwell/src/Photo.vala" redeye_instances = (g_free (redeye_instances), NULL); #line 3426 "/home/jens/Source/shotwell/src/Photo.vala" - redeye_instances = _tmp24_; + redeye_instances = _tmp15_; #line 3426 "/home/jens/Source/shotwell/src/Photo.vala" - redeye_instances_length1 = _tmp23_; + redeye_instances_length1 = _tmp14_; #line 3426 "/home/jens/Source/shotwell/src/Photo.vala" _redeye_instances_size_ = redeye_instances_length1; #line 3428 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = photo_get_raw_crop (self, &_tmp25_); + _tmp17_ = photo_get_raw_crop (self, &_tmp16_); #line 3428 "/home/jens/Source/shotwell/src/Photo.vala" - crop = _tmp25_; + crop = _tmp16_; #line 3428 "/home/jens/Source/shotwell/src/Photo.vala" - is_cropped = _tmp26_; + is_cropped = _tmp17_; #line 3430 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = photo_get_raw_straighten (self, &_tmp27_); + _tmp19_ = photo_get_raw_straighten (self, &_tmp18_); #line 3430 "/home/jens/Source/shotwell/src/Photo.vala" - straightening_angle = _tmp27_; + straightening_angle = _tmp18_; #line 3430 "/home/jens/Source/shotwell/src/Photo.vala" - is_straightened = _tmp28_; + is_straightened = _tmp19_; #line 3432 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = photo_has_color_adjustments (self); -#line 3432 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp29_) { -#line 25186 "Photo.c" - PixelTransformer* _tmp30_; + if (photo_has_color_adjustments (self)) { +#line 25476 "Photo.c" + PixelTransformer* _tmp20_; #line 3433 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = photo_get_pixel_transformer (self); + _tmp20_ = photo_get_pixel_transformer (self); #line 3433 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (transformer); #line 3433 "/home/jens/Source/shotwell/src/Photo.vala" - transformer = _tmp30_; -#line 25194 "Photo.c" + transformer = _tmp20_; +#line 25484 "Photo.c" } #line 3435 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = photo_get_orientation (self); -#line 3435 "/home/jens/Source/shotwell/src/Photo.vala" - orientation = _tmp31_; -#line 25200 "Photo.c" + orientation = photo_get_orientation (self); +#line 25488 "Photo.c" } __finally397: { - PhotoRow* _tmp32_; + PhotoRow* _tmp21_; #line 3419 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = self->row; + _tmp21_ = self->row; #line 3419 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 25209 "Photo.c" +#line 25497 "Photo.c" } #line 3419 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -25219,13 +25507,13 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx redeye_instances = (g_free (redeye_instances), NULL); #line 3419 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 25221 "Photo.c" +#line 25509 "Photo.c" } } #line 3442 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = photo_get_prefetched_copy (self, &_inner_error_); + _tmp22_ = photo_get_prefetched_copy (self, &_inner_error_); #line 3442 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp33_; + pixbuf = _tmp22_; #line 3442 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3442 "/home/jens/Source/shotwell/src/Photo.vala" @@ -25236,325 +25524,284 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx redeye_instances = (g_free (redeye_instances), NULL); #line 3442 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 25238 "Photo.c" +#line 25526 "Photo.c" } #line 3449 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = exceptions; -#line 3449 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = photo_exception_allows (_tmp34_, PHOTO_EXCEPTION_REDEYE); -#line 3449 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp35_) { -#line 25246 "Photo.c" - EditingToolsRedeyeInstance* _tmp36_; - gint _tmp36__length1; + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_REDEYE)) { +#line 25530 "Photo.c" + EditingToolsRedeyeInstance* _tmp23_; + gint _tmp23__length1; #line 3454 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = redeye_instances; + _tmp23_ = redeye_instances; #line 3454 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36__length1 = redeye_instances_length1; -#line 25253 "Photo.c" + _tmp23__length1 = redeye_instances_length1; +#line 25537 "Photo.c" { EditingToolsRedeyeInstance* instance_collection = NULL; gint instance_collection_length1 = 0; gint _instance_collection_size_ = 0; gint instance_it = 0; #line 3454 "/home/jens/Source/shotwell/src/Photo.vala" - instance_collection = _tmp36_; + instance_collection = _tmp23_; #line 3454 "/home/jens/Source/shotwell/src/Photo.vala" - instance_collection_length1 = _tmp36__length1; + instance_collection_length1 = _tmp23__length1; #line 3454 "/home/jens/Source/shotwell/src/Photo.vala" - for (instance_it = 0; instance_it < _tmp36__length1; instance_it = instance_it + 1) { -#line 25265 "Photo.c" + for (instance_it = 0; instance_it < _tmp23__length1; instance_it = instance_it + 1) { +#line 25549 "Photo.c" EditingToolsRedeyeInstance instance = {0}; #line 3454 "/home/jens/Source/shotwell/src/Photo.vala" instance = instance_collection[instance_it]; -#line 25269 "Photo.c" +#line 25553 "Photo.c" { - GdkPixbuf* _tmp37_; - EditingToolsRedeyeInstance _tmp38_; - GdkPixbuf* _tmp39_; + GdkPixbuf* _tmp24_; + EditingToolsRedeyeInstance _tmp25_; + GdkPixbuf* _tmp26_; #line 3455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = pixbuf; + _tmp24_ = pixbuf; #line 3455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = instance; + _tmp25_ = instance; #line 3455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = photo_do_redeye (self, _tmp37_, &_tmp38_); + _tmp26_ = photo_do_redeye (self, _tmp24_, &_tmp25_); #line 3455 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 3455 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp39_; -#line 25284 "Photo.c" + pixbuf = _tmp26_; +#line 25568 "Photo.c" } } } } #line 3463 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = exceptions; -#line 3463 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_STRAIGHTEN); -#line 3463 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp41_) { -#line 25295 "Photo.c" - gboolean _tmp42_; + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_STRAIGHTEN)) { +#line 25575 "Photo.c" + gboolean _tmp27_; #line 3467 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = is_straightened; + _tmp27_ = is_straightened; #line 3467 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp42_) { -#line 25301 "Photo.c" - GdkPixbuf* _tmp43_; - gdouble _tmp44_; - GdkPixbuf* _tmp45_; + if (_tmp27_) { +#line 25581 "Photo.c" + GdkPixbuf* _tmp28_; + gdouble _tmp29_; + GdkPixbuf* _tmp30_; #line 3468 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = pixbuf; + _tmp28_ = pixbuf; #line 3468 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = straightening_angle; + _tmp29_ = straightening_angle; #line 3468 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = rotate_arb (_tmp43_, _tmp44_); + _tmp30_ = rotate_arb (_tmp28_, _tmp29_); #line 3468 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 3468 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp45_; -#line 25315 "Photo.c" + pixbuf = _tmp30_; +#line 25595 "Photo.c" } } #line 3477 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = exceptions; -#line 3477 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = photo_exception_allows (_tmp46_, PHOTO_EXCEPTION_CROP); -#line 3477 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp47_) { -#line 25324 "Photo.c" - gboolean _tmp48_; + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_CROP)) { +#line 25600 "Photo.c" + gboolean _tmp31_; #line 3481 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = is_cropped; + _tmp31_ = is_cropped; #line 3481 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp48_) { -#line 25330 "Photo.c" + if (_tmp31_) { +#line 25606 "Photo.c" + Box _tmp32_; + gint _tmp33_; + GdkPixbuf* _tmp34_; + gint _tmp35_; + gint _tmp36_; + Box _tmp37_; + gint _tmp38_; + GdkPixbuf* _tmp39_; + gint _tmp40_; + gint _tmp41_; + Box _tmp42_; + gint _tmp43_; + Box _tmp44_; + gint _tmp45_; + GdkPixbuf* _tmp46_; + gint _tmp47_; + gint _tmp48_; Box _tmp49_; gint _tmp50_; - GdkPixbuf* _tmp51_; + Box _tmp51_; gint _tmp52_; - gint _tmp53_; + GdkPixbuf* _tmp53_; gint _tmp54_; - Box _tmp55_; - gint _tmp56_; - GdkPixbuf* _tmp57_; + gint _tmp55_; + GdkPixbuf* _tmp56_; + Box _tmp57_; gint _tmp58_; - gint _tmp59_; + Box _tmp59_; gint _tmp60_; - Box _tmp61_; - gint _tmp62_; - Box _tmp63_; - gint _tmp64_; - GdkPixbuf* _tmp65_; - gint _tmp66_; - gint _tmp67_; - gint _tmp68_; - Box _tmp69_; - gint _tmp70_; - Box _tmp71_; - gint _tmp72_; - GdkPixbuf* _tmp73_; - gint _tmp74_; - gint _tmp75_; - gint _tmp76_; - GdkPixbuf* _tmp77_; - Box _tmp78_; - gint _tmp79_; - Box _tmp80_; - gint _tmp81_; - gint _tmp82_; - gint _tmp83_; - GdkPixbuf* _tmp84_; + GdkPixbuf* _tmp61_; #line 3486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = crop; -#line 3486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = _tmp49_.left; + _tmp32_ = crop; #line 3486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = pixbuf; + _tmp33_ = _tmp32_.left; #line 3486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = gdk_pixbuf_get_width (_tmp51_); + _tmp34_ = pixbuf; #line 3486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = _tmp52_; + _tmp35_ = gdk_pixbuf_get_width (_tmp34_); #line 3486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = CLAMP (_tmp50_, 0, _tmp53_ - 2); + _tmp36_ = _tmp35_; #line 3486 "/home/jens/Source/shotwell/src/Photo.vala" - crop.left = _tmp54_; + crop.left = CLAMP (_tmp33_, 0, _tmp36_ - 2); #line 3487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = crop; + _tmp37_ = crop; #line 3487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = _tmp55_.top; + _tmp38_ = _tmp37_.top; #line 3487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = pixbuf; + _tmp39_ = pixbuf; #line 3487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = gdk_pixbuf_get_height (_tmp57_); + _tmp40_ = gdk_pixbuf_get_height (_tmp39_); #line 3487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = _tmp58_; + _tmp41_ = _tmp40_; #line 3487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = CLAMP (_tmp56_, 0, _tmp59_ - 2); -#line 3487 "/home/jens/Source/shotwell/src/Photo.vala" - crop.top = _tmp60_; -#line 3489 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = crop; + crop.top = CLAMP (_tmp38_, 0, _tmp41_ - 2); #line 3489 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = _tmp61_.right; + _tmp42_ = crop; #line 3489 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = crop; + _tmp43_ = _tmp42_.right; #line 3489 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = _tmp63_.left; + _tmp44_ = crop; #line 3489 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = pixbuf; + _tmp45_ = _tmp44_.left; #line 3489 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = gdk_pixbuf_get_width (_tmp65_); + _tmp46_ = pixbuf; #line 3489 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = _tmp66_; + _tmp47_ = gdk_pixbuf_get_width (_tmp46_); #line 3489 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = CLAMP (_tmp62_, _tmp64_ + 1, _tmp67_ - 1); + _tmp48_ = _tmp47_; #line 3489 "/home/jens/Source/shotwell/src/Photo.vala" - crop.right = _tmp68_; + crop.right = CLAMP (_tmp43_, _tmp45_ + 1, _tmp48_ - 1); #line 3490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = crop; -#line 3490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = _tmp69_.bottom; + _tmp49_ = crop; #line 3490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = crop; + _tmp50_ = _tmp49_.bottom; #line 3490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = _tmp71_.top; + _tmp51_ = crop; #line 3490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = pixbuf; + _tmp52_ = _tmp51_.top; #line 3490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = gdk_pixbuf_get_height (_tmp73_); + _tmp53_ = pixbuf; #line 3490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = _tmp74_; + _tmp54_ = gdk_pixbuf_get_height (_tmp53_); #line 3490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = CLAMP (_tmp70_, _tmp72_ + 1, _tmp75_ - 1); + _tmp55_ = _tmp54_; #line 3490 "/home/jens/Source/shotwell/src/Photo.vala" - crop.bottom = _tmp76_; -#line 3492 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = pixbuf; + crop.bottom = CLAMP (_tmp50_, _tmp52_ + 1, _tmp55_ - 1); #line 3492 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = crop; + _tmp56_ = pixbuf; #line 3492 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = _tmp78_.left; + _tmp57_ = crop; #line 3492 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = crop; + _tmp58_ = _tmp57_.left; #line 3492 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = _tmp80_.top; + _tmp59_ = crop; #line 3492 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = box_get_width (&crop); + _tmp60_ = _tmp59_.top; #line 3492 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = box_get_height (&crop); -#line 3492 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = gdk_pixbuf_new_subpixbuf (_tmp77_, _tmp79_, _tmp81_, _tmp82_, _tmp83_); + _tmp61_ = gdk_pixbuf_new_subpixbuf (_tmp56_, _tmp58_, _tmp60_, box_get_width (&crop), box_get_height (&crop)); #line 3492 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 3492 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp84_; -#line 25451 "Photo.c" + pixbuf = _tmp61_; +#line 25709 "Photo.c" } } #line 3502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = exceptions; -#line 3502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = photo_exception_allows (_tmp85_, PHOTO_EXCEPTION_ORIENTATION); -#line 3502 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp86_) { -#line 25460 "Photo.c" - GdkPixbuf* _tmp87_; - GdkPixbuf* _tmp88_; + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_ORIENTATION)) { +#line 25714 "Photo.c" + GdkPixbuf* _tmp62_; + GdkPixbuf* _tmp63_; #line 3506 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = pixbuf; + _tmp62_ = pixbuf; #line 3506 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = orientation_rotate_pixbuf (orientation, _tmp87_); + _tmp63_ = orientation_rotate_pixbuf (orientation, _tmp62_); #line 3506 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 3506 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp88_; -#line 25471 "Photo.c" + pixbuf = _tmp63_; +#line 25725 "Photo.c" } #line 3513 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = is_scaled; + _tmp64_ = is_scaled; #line 3513 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp89_) { -#line 25477 "Photo.c" - GdkPixbuf* _tmp90_; - Dimensions _tmp91_; - gint _tmp92_; - Dimensions _tmp93_; - gint _tmp94_; - GdkPixbuf* _tmp95_; + if (_tmp64_) { +#line 25731 "Photo.c" + GdkPixbuf* _tmp65_; + Dimensions _tmp66_; + gint _tmp67_; + Dimensions _tmp68_; + gint _tmp69_; + GdkPixbuf* _tmp70_; #line 3517 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = pixbuf; + _tmp65_ = pixbuf; #line 3517 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = scaled_to_viewport; + _tmp66_ = scaled_to_viewport; #line 3517 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = _tmp91_.width; + _tmp67_ = _tmp66_.width; #line 3517 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = scaled_to_viewport; + _tmp68_ = scaled_to_viewport; #line 3517 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = _tmp93_.height; + _tmp69_ = _tmp68_.height; #line 3517 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp95_ = gdk_pixbuf_scale_simple (_tmp90_, _tmp92_, _tmp94_, GDK_INTERP_BILINEAR); + _tmp70_ = gdk_pixbuf_scale_simple (_tmp65_, _tmp67_, _tmp69_, GDK_INTERP_BILINEAR); #line 3517 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 3517 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp95_; -#line 25500 "Photo.c" + pixbuf = _tmp70_; +#line 25754 "Photo.c" } #line 3525 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = exceptions; -#line 3525 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = photo_exception_allows (_tmp96_, PHOTO_EXCEPTION_ADJUST); -#line 3525 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp97_) { -#line 25508 "Photo.c" - PixelTransformer* _tmp98_; + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_ADJUST)) { +#line 25758 "Photo.c" + PixelTransformer* _tmp71_; #line 3529 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = transformer; + _tmp71_ = transformer; #line 3529 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp98_ != NULL) { -#line 25514 "Photo.c" - PixelTransformer* _tmp99_; - GdkPixbuf* _tmp100_; + if (_tmp71_ != NULL) { +#line 25764 "Photo.c" + PixelTransformer* _tmp72_; + GdkPixbuf* _tmp73_; #line 3530 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp99_ = transformer; + _tmp72_ = transformer; #line 3530 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = pixbuf; + _tmp73_ = pixbuf; #line 3530 "/home/jens/Source/shotwell/src/Photo.vala" - pixel_transformer_transform_pixbuf (_tmp99_, _tmp100_, NULL); -#line 25523 "Photo.c" + pixel_transformer_transform_pixbuf (_tmp72_, _tmp73_, NULL); +#line 25773 "Photo.c" } } #line 3539 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp102_ = is_scaled; + _tmp75_ = is_scaled; #line 3539 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp102_) { -#line 25530 "Photo.c" - gboolean _tmp103_; + if (_tmp75_) { +#line 25780 "Photo.c" + gboolean _tmp76_; #line 3539 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp103_ = is_straightened; + _tmp76_ = is_straightened; #line 3539 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = !_tmp103_; -#line 25536 "Photo.c" + _tmp74_ = !_tmp76_; +#line 25786 "Photo.c" } else { #line 3539 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = FALSE; -#line 25540 "Photo.c" + _tmp74_ = FALSE; +#line 25790 "Photo.c" } #line 3539 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp101_) { -#line 25544 "Photo.c" - GdkPixbuf* _tmp104_; - Dimensions _tmp105_ = {0}; - gboolean _tmp106_; -#line 3540 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp104_ = pixbuf; + if (_tmp74_) { +#line 25794 "Photo.c" + GdkPixbuf* _tmp77_; + Dimensions _tmp78_ = {0}; #line 3540 "/home/jens/Source/shotwell/src/Photo.vala" - dimensions_for_pixbuf (_tmp104_, &_tmp105_); + _tmp77_ = pixbuf; #line 3540 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp106_ = dimensions_approx_equals (&scaled_to_viewport, &_tmp105_, PHOTO_SCALING_FUDGE); + dimensions_for_pixbuf (_tmp77_, &_tmp78_); #line 3540 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp106_, "scaled_to_viewport.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)"); -#line 25556 "Photo.c" + _vala_assert (dimensions_approx_equals (&scaled_to_viewport, &_tmp78_, PHOTO_SCALING_FUDGE), "scaled_to_viewport.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)"); +#line 25803 "Photo.c" } #line 3548 "/home/jens/Source/shotwell/src/Photo.vala" result = pixbuf; @@ -25564,234 +25811,228 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx redeye_instances = (g_free (redeye_instances), NULL); #line 3548 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25566 "Photo.c" +#line 25813 "Photo.c" } -static gboolean photo_real_has_user_generated_metadata (Photo* self) { +static gboolean +photo_real_has_user_generated_metadata (Photo* self) +{ gboolean _tmp0_ = FALSE; #line 3556 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("Type `%s' does not implement abstract method `photo_has_user_generated_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 3556 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp0_; -#line 25576 "Photo.c" +#line 25825 "Photo.c" } -gboolean photo_has_user_generated_metadata (Photo* self) { +gboolean +photo_has_user_generated_metadata (Photo* self) +{ #line 3556 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 3556 "/home/jens/Source/shotwell/src/Photo.vala" return PHOTO_GET_CLASS (self)->has_user_generated_metadata (self); -#line 25585 "Photo.c" +#line 25836 "Photo.c" } -static void photo_real_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata) { +static void +photo_real_set_user_metadata_for_export (Photo* self, + PhotoMetadata* metadata) +{ #line 3560 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("Type `%s' does not implement abstract method `photo_set_user_metadata_for_export'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 3560 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 25594 "Photo.c" +#line 25848 "Photo.c" } -void photo_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata) { +void +photo_set_user_metadata_for_export (Photo* self, + PhotoMetadata* metadata) +{ #line 3560 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 3560 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->set_user_metadata_for_export (self, metadata); -#line 25603 "Photo.c" +#line 25860 "Photo.c" } -gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) { +gchar* +photo_get_export_basename (Photo* self, + PhotoFileFormat* file_format) +{ gchar* result = NULL; - PhotoFileFormat* _tmp0_; #line 3567 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); #line 3568 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file_format; -#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_ != NULL) { -#line 25616 "Photo.c" - PhotoFileFormat* _tmp1_; - PhotoFileFormatProperties* _tmp2_; - PhotoFileFormatProperties* _tmp3_; + if (file_format != NULL) { +#line 25873 "Photo.c" + PhotoFileFormatProperties* _tmp0_; + PhotoFileFormatProperties* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; GFile* _tmp4_; GFile* _tmp5_; - GFile* _tmp6_; - GFile* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; + gchar* _tmp6_; + gchar* _tmp7_; +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp0_ = photo_file_format_get_properties (*file_format); #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = file_format; + _tmp1_ = _tmp0_; #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_file_format_get_properties (*_tmp1_); + _tmp2_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp4_ = photo_file_format_properties_convert_file_extension (_tmp1_, _tmp3_); #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_file_format_properties_convert_file_extension (_tmp3_, _tmp5_); + _tmp6_ = g_file_get_basename (_tmp5_); #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = g_file_get_basename (_tmp7_); -#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; -#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp7_); #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp5_); #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_format_properties_unref0 (_tmp3_); + _g_object_unref0 (_tmp3_); +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" + _photo_file_format_properties_unref0 (_tmp1_); #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp9_; + result = _tmp7_; #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25654 "Photo.c" +#line 25908 "Photo.c" } else { - PhotoFileFormat _tmp10_; - gboolean _tmp11_; -#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_get_file_format (self); -#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_file_format_can_write (_tmp10_); #line 3571 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 25664 "Photo.c" - PhotoFileFormat _tmp12_; - PhotoFileFormatProperties* _tmp13_; - PhotoFileFormatProperties* _tmp14_; - GFile* _tmp15_; - GFile* _tmp16_; - GFile* _tmp17_; - GFile* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; -#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_get_file_format (self); + if (photo_file_format_can_write (photo_get_file_format (self))) { +#line 25912 "Photo.c" + PhotoFileFormatProperties* _tmp8_; + PhotoFileFormatProperties* _tmp9_; + GFile* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; + GFile* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_file_format_get_properties (_tmp12_); + _tmp8_ = photo_file_format_get_properties (photo_get_file_format (self)); #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_; + _tmp9_ = _tmp8_; #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp10_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_; + _tmp11_ = _tmp10_; #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo_file_format_properties_convert_file_extension (_tmp14_, _tmp16_); + _tmp12_ = photo_file_format_properties_convert_file_extension (_tmp9_, _tmp11_); #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_; + _tmp13_ = _tmp12_; #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = g_file_get_basename (_tmp18_); + _tmp14_ = g_file_get_basename (_tmp13_); #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_; + _tmp15_ = _tmp14_; #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp13_); #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp11_); #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_format_properties_unref0 (_tmp14_); + _photo_file_format_properties_unref0 (_tmp9_); #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp20_; + result = _tmp15_; #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25702 "Photo.c" +#line 25947 "Photo.c" } else { - PhotoFileFormat _tmp21_; - PhotoFileFormatProperties* _tmp22_; - PhotoFileFormatProperties* _tmp23_; - GFile* _tmp24_; - GFile* _tmp25_; - GFile* _tmp26_; - GFile* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; -#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = photo_file_format_get_system_default_format (); + PhotoFileFormatProperties* _tmp16_; + PhotoFileFormatProperties* _tmp17_; + GFile* _tmp18_; + GFile* _tmp19_; + GFile* _tmp20_; + GFile* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = photo_file_format_get_properties (_tmp21_); + _tmp16_ = photo_file_format_get_properties (photo_file_format_get_system_default_format ()); #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _tmp22_; + _tmp17_ = _tmp16_; #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp18_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp24_; + _tmp19_ = _tmp18_; #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = photo_file_format_properties_convert_file_extension (_tmp23_, _tmp25_); + _tmp20_ = photo_file_format_properties_convert_file_extension (_tmp17_, _tmp19_); #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_; + _tmp21_ = _tmp20_; #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = g_file_get_basename (_tmp27_); + _tmp22_ = g_file_get_basename (_tmp21_); #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _tmp28_; + _tmp23_ = _tmp22_; #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp27_); + _g_object_unref0 (_tmp21_); #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp25_); + _g_object_unref0 (_tmp19_); #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_format_properties_unref0 (_tmp23_); + _photo_file_format_properties_unref0 (_tmp17_); #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp29_; + result = _tmp23_; #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25741 "Photo.c" +#line 25983 "Photo.c" } } } -static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboolean export_metadata, GError** error) { +static gboolean +photo_export_fullsized_backing (Photo* self, + GFile* file, + gboolean export_metadata, + GError** error) +{ gboolean result = FALSE; PhotoFileReader* export_reader = NULL; gboolean is_master = FALSE; - PhotoFileReader* _tmp30_; + PhotoFileReader* _tmp24_; PhotoFileFormatProperties* format_properties = NULL; - PhotoFileReader* _tmp31_; - PhotoFileFormat _tmp32_; - PhotoFileFormatProperties* _tmp33_; + PhotoFileReader* _tmp25_; + PhotoFileFormatProperties* _tmp26_; GFile* dest_file = NULL; - PhotoFileFormatProperties* _tmp34_; - GFile* _tmp35_; - GFile* _tmp36_; + PhotoFileFormatProperties* _tmp27_; + GFile* _tmp28_; PhotoFileMetadataWriter* writer = NULL; - PhotoFileReader* _tmp37_; - PhotoFileFormat _tmp38_; - GFile* _tmp39_; + PhotoFileReader* _tmp29_; + GFile* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + PhotoFileMetadataWriter* _tmp33_; + PhotoFileMetadataWriter* _tmp34_; + gchar* _tmp36_; + gchar* _tmp37_; + PhotoFileMetadataWriter* _tmp38_; + gchar* _tmp39_; gchar* _tmp40_; - gchar* _tmp41_; - PhotoFileMetadataWriter* _tmp42_; - PhotoFileMetadataWriter* _tmp43_; - gchar* _tmp45_; - gchar* _tmp46_; - PhotoFileMetadataWriter* _tmp47_; - gchar* _tmp48_; - gchar* _tmp49_; - PhotoFileReader* _tmp50_; - GFile* _tmp51_; - GFile* _tmp52_; - GFile* _tmp53_; - gboolean _tmp55_ = FALSE; - gboolean _tmp56_ = FALSE; - gboolean _tmp57_ = FALSE; - gboolean _tmp58_ = FALSE; - gboolean _tmp59_ = FALSE; - gboolean _tmp60_; + PhotoFileReader* _tmp41_; + GFile* _tmp42_; + GFile* _tmp43_; + GFile* _tmp44_; + gboolean _tmp46_ = FALSE; + gboolean _tmp47_ = FALSE; + gboolean _tmp48_ = FALSE; + gboolean _tmp49_ = FALSE; + gboolean _tmp50_ = FALSE; PhotoMetadata* metadata = NULL; - PhotoFileReader* _tmp68_; - PhotoMetadata* _tmp69_; - PhotoMetadata* _tmp71_; - PhotoFileMetadataWriter* _tmp75_; - gchar* _tmp76_; - gchar* _tmp77_; - time_t _tmp78_; - gboolean _tmp84_; - PhotoFileMetadataWriter* _tmp101_; - PhotoMetadata* _tmp102_; + PhotoFileReader* _tmp56_; + PhotoMetadata* _tmp57_; + PhotoMetadata* _tmp59_; + PhotoFileMetadataWriter* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; + PhotoFileMetadataWriter* _tmp82_; + PhotoMetadata* _tmp83_; GError * _inner_error_ = NULL; #line 3581 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); @@ -25801,14 +26042,14 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole export_reader = NULL; #line 3585 "/home/jens/Source/shotwell/src/Photo.vala" is_master = TRUE; -#line 25803 "Photo.c" +#line 26044 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 3586 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 3586 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 25810 "Photo.c" +#line 26051 "Photo.c" { gboolean _tmp1_ = FALSE; PhotoBackingReaders* _tmp2_; @@ -25819,202 +26060,178 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole _tmp3_ = _tmp2_->editable; #line 3587 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != NULL) { -#line 25821 "Photo.c" +#line 26062 "Photo.c" PhotoBackingReaders* _tmp4_; PhotoFileReader* _tmp5_; - PhotoFileFormat _tmp6_; - gboolean _tmp7_; #line 3587 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; #line 3587 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->editable; #line 3587 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3587 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo_file_format_can_write_metadata (_tmp6_); -#line 3587 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp7_; -#line 25836 "Photo.c" + _tmp1_ = photo_file_format_can_write_metadata (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter))); +#line 26071 "Photo.c" } else { #line 3587 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 25840 "Photo.c" +#line 26075 "Photo.c" } #line 3587 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 25844 "Photo.c" - PhotoBackingReaders* _tmp8_; - PhotoFileReader* _tmp9_; - PhotoFileReader* _tmp10_; +#line 26079 "Photo.c" + PhotoBackingReaders* _tmp6_; + PhotoFileReader* _tmp7_; + PhotoFileReader* _tmp8_; #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = self->priv->readers; + _tmp6_ = self->priv->readers; #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_->editable; + _tmp7_ = _tmp6_->editable; #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _photo_file_adapter_ref0 (_tmp9_); + _tmp8_ = _photo_file_adapter_ref0 (_tmp7_); #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" - export_reader = _tmp10_; + export_reader = _tmp8_; #line 3589 "/home/jens/Source/shotwell/src/Photo.vala" is_master = FALSE; -#line 25860 "Photo.c" +#line 26095 "Photo.c" } else { - gboolean _tmp11_ = FALSE; - PhotoBackingReaders* _tmp12_; - PhotoFileReader* _tmp13_; -#line 3590 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = self->priv->readers; -#line 3590 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_->developer; + gboolean _tmp9_ = FALSE; + PhotoBackingReaders* _tmp10_; + PhotoFileReader* _tmp11_; #line 3590 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp13_ != NULL) { -#line 25871 "Photo.c" - PhotoBackingReaders* _tmp14_; - PhotoFileReader* _tmp15_; - PhotoFileFormat _tmp16_; - gboolean _tmp17_; + _tmp10_ = self->priv->readers; #line 3590 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->priv->readers; + _tmp11_ = _tmp10_->developer; #line 3590 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_->developer; + if (_tmp11_ != NULL) { +#line 26106 "Photo.c" + PhotoBackingReaders* _tmp12_; + PhotoFileReader* _tmp13_; #line 3590 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp12_ = self->priv->readers; #line 3590 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo_file_format_can_write_metadata (_tmp16_); + _tmp13_ = _tmp12_->developer; #line 3590 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp17_; -#line 25886 "Photo.c" + _tmp9_ = photo_file_format_can_write_metadata (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter))); +#line 26115 "Photo.c" } else { #line 3590 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = FALSE; -#line 25890 "Photo.c" + _tmp9_ = FALSE; +#line 26119 "Photo.c" } #line 3590 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 25894 "Photo.c" - PhotoBackingReaders* _tmp18_; - PhotoFileReader* _tmp19_; - PhotoFileReader* _tmp20_; + if (_tmp9_) { +#line 26123 "Photo.c" + PhotoBackingReaders* _tmp14_; + PhotoFileReader* _tmp15_; + PhotoFileReader* _tmp16_; #line 3591 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->priv->readers; + _tmp14_ = self->priv->readers; #line 3591 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_->developer; + _tmp15_ = _tmp14_->developer; #line 3591 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _photo_file_adapter_ref0 (_tmp19_); + _tmp16_ = _photo_file_adapter_ref0 (_tmp15_); #line 3591 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3591 "/home/jens/Source/shotwell/src/Photo.vala" - export_reader = _tmp20_; + export_reader = _tmp16_; #line 3592 "/home/jens/Source/shotwell/src/Photo.vala" is_master = FALSE; -#line 25910 "Photo.c" +#line 26139 "Photo.c" } else { - PhotoBackingReaders* _tmp21_; - PhotoFileReader* _tmp22_; - PhotoFileFormat _tmp23_; - gboolean _tmp24_; -#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = self->priv->readers; + PhotoBackingReaders* _tmp17_; + PhotoFileReader* _tmp18_; #line 3593 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_->master; + _tmp17_ = self->priv->readers; #line 3593 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp18_ = _tmp17_->master; #line 3593 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = photo_file_format_can_write_metadata (_tmp23_); -#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp24_) { -#line 25926 "Photo.c" - PhotoBackingReaders* _tmp25_; - PhotoFileReader* _tmp26_; - PhotoFileReader* _tmp27_; + if (photo_file_format_can_write_metadata (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)))) { +#line 26149 "Photo.c" + PhotoBackingReaders* _tmp19_; + PhotoFileReader* _tmp20_; + PhotoFileReader* _tmp21_; #line 3594 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = self->priv->readers; + _tmp19_ = self->priv->readers; #line 3594 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp25_->master; + _tmp20_ = _tmp19_->master; #line 3594 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _photo_file_adapter_ref0 (_tmp26_); + _tmp21_ = _photo_file_adapter_ref0 (_tmp20_); #line 3594 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3594 "/home/jens/Source/shotwell/src/Photo.vala" - export_reader = _tmp27_; -#line 25940 "Photo.c" + export_reader = _tmp21_; +#line 26163 "Photo.c" } } } } __finally398: { - PhotoBackingReaders* _tmp28_; + PhotoBackingReaders* _tmp22_; #line 3586 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = self->priv->readers; + _tmp22_ = self->priv->readers; #line 3586 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 25952 "Photo.c" +#line 26175 "Photo.c" } #line 3586 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 25956 "Photo.c" - gboolean _tmp29_ = FALSE; +#line 26179 "Photo.c" + gboolean _tmp23_ = FALSE; #line 3586 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3586 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3586 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp29_; -#line 25964 "Photo.c" + return _tmp23_; +#line 26187 "Photo.c" } } #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = export_reader; + _tmp24_ = export_reader; #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp30_ == NULL) { + if (_tmp24_ == NULL) { #line 3599 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 3599 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3599 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25977 "Photo.c" +#line 26200 "Photo.c" } #line 3601 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = export_reader; -#line 3601 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp25_ = export_reader; #line 3601 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = photo_file_format_get_properties (_tmp32_); + _tmp26_ = photo_file_format_get_properties (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter))); #line 3601 "/home/jens/Source/shotwell/src/Photo.vala" - format_properties = _tmp33_; + format_properties = _tmp26_; #line 3604 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = format_properties; + _tmp27_ = format_properties; #line 3604 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = file; + _tmp28_ = photo_file_format_properties_convert_file_extension (_tmp27_, file); #line 3604 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = photo_file_format_properties_convert_file_extension (_tmp34_, _tmp35_); -#line 3604 "/home/jens/Source/shotwell/src/Photo.vala" - dest_file = _tmp36_; -#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = export_reader; + dest_file = _tmp28_; #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp29_ = export_reader; #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = dest_file; + _tmp30_ = dest_file; #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = g_file_get_path (_tmp39_); + _tmp31_ = g_file_get_path (_tmp30_); #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = _tmp40_; + _tmp32_ = _tmp31_; #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = photo_file_format_create_metadata_writer (_tmp38_, _tmp41_, &_inner_error_); + _tmp33_ = photo_file_format_create_metadata_writer (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)), _tmp32_, &_inner_error_); #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = _tmp42_; + _tmp34_ = _tmp33_; #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp41_); + _g_free0 (_tmp32_); #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - writer = _tmp43_; + writer = _tmp34_; #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 26015 "Photo.c" - gboolean _tmp44_ = FALSE; +#line 26232 "Photo.c" + gboolean _tmp35_ = FALSE; #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26024,41 +26241,41 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp44_; -#line 26027 "Photo.c" + return _tmp35_; +#line 26244 "Photo.c" } #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp36_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = _tmp45_; + _tmp37_ = _tmp36_; #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = writer; + _tmp38_ = writer; #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp39_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = _tmp48_; + _tmp40_ = _tmp39_; #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:3610: Exporting full-sized copy of %s to %s", _tmp46_, _tmp49_); + g_debug ("Photo.vala:3610: Exporting full-sized copy of %s to %s", _tmp37_, _tmp40_); #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp49_); + _g_free0 (_tmp40_); #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp46_); + _g_free0 (_tmp37_); #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = export_reader; + _tmp41_ = export_reader; #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp42_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = _tmp51_; + _tmp43_ = _tmp42_; #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = dest_file; + _tmp44_ = dest_file; #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_copy (_tmp52_, _tmp53_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_); + g_file_copy (_tmp43_, _tmp44_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_); #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp52_); + _g_object_unref0 (_tmp43_); #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 26059 "Photo.c" - gboolean _tmp54_ = FALSE; +#line 26276 "Photo.c" + gboolean _tmp45_ = FALSE; #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26070,93 +26287,83 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp54_; -#line 26073 "Photo.c" + return _tmp45_; +#line 26290 "Photo.c" } #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = photo_has_alterations (self); -#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp60_) { -#line 26079 "Photo.c" - gboolean _tmp61_; + if (!photo_has_alterations (self)) { +#line 26294 "Photo.c" + gboolean _tmp51_; #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = is_master; + _tmp51_ = is_master; #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = _tmp61_; -#line 26085 "Photo.c" + _tmp50_ = _tmp51_; +#line 26300 "Photo.c" } else { #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = FALSE; -#line 26089 "Photo.c" + _tmp50_ = FALSE; +#line 26304 "Photo.c" } #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp59_) { -#line 26093 "Photo.c" - gboolean _tmp62_; -#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = photo_has_user_generated_metadata (self); + if (_tmp50_) { #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = !_tmp62_; -#line 26099 "Photo.c" + _tmp49_ = !photo_has_user_generated_metadata (self); +#line 26310 "Photo.c" } else { #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = FALSE; -#line 26103 "Photo.c" + _tmp49_ = FALSE; +#line 26314 "Photo.c" } #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp58_) { -#line 26107 "Photo.c" - gchar* _tmp63_; - gchar* _tmp64_; + if (_tmp49_) { +#line 26318 "Photo.c" + gchar* _tmp52_; + gchar* _tmp53_; #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp52_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = _tmp63_; + _tmp53_ = _tmp52_; #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = _tmp64_ == NULL; + _tmp48_ = _tmp53_ == NULL; #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp64_); -#line 26118 "Photo.c" + _g_free0 (_tmp53_); +#line 26329 "Photo.c" } else { #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = FALSE; -#line 26122 "Photo.c" + _tmp48_ = FALSE; +#line 26333 "Photo.c" } #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp57_) { -#line 26126 "Photo.c" - gchar* _tmp65_; - gchar* _tmp66_; + if (_tmp48_) { +#line 26337 "Photo.c" + gchar* _tmp54_; + gchar* _tmp55_; #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp54_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = _tmp65_; + _tmp55_ = _tmp54_; #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = _tmp66_ == NULL; + _tmp47_ = _tmp55_ == NULL; #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp66_); -#line 26137 "Photo.c" + _g_free0 (_tmp55_); +#line 26348 "Photo.c" } else { #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = FALSE; -#line 26141 "Photo.c" + _tmp47_ = FALSE; +#line 26352 "Photo.c" } #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp56_) { -#line 26145 "Photo.c" - gboolean _tmp67_; -#line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = export_metadata; + if (_tmp47_) { #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = _tmp67_; -#line 26151 "Photo.c" + _tmp46_ = export_metadata; +#line 26358 "Photo.c" } else { #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = FALSE; -#line 26155 "Photo.c" + _tmp46_ = FALSE; +#line 26362 "Photo.c" } #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp55_) { + if (_tmp46_) { #line 3619 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 3619 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26169,18 +26376,18 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole _photo_file_adapter_unref0 (export_reader); #line 3619 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 26171 "Photo.c" +#line 26378 "Photo.c" } #line 3622 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = export_reader; + _tmp56_ = export_reader; #line 3622 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = photo_file_reader_read_metadata (_tmp68_, &_inner_error_); + _tmp57_ = photo_file_reader_read_metadata (_tmp56_, &_inner_error_); #line 3622 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp69_; + metadata = _tmp57_; #line 3622 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 26181 "Photo.c" - gboolean _tmp70_ = FALSE; +#line 26388 "Photo.c" + gboolean _tmp58_ = FALSE; #line 3622 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3622 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26192,161 +26399,142 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole #line 3622 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3622 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp70_; -#line 26195 "Photo.c" + return _tmp58_; +#line 26402 "Photo.c" } #line 3623 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = metadata; + _tmp59_ = metadata; #line 3623 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp71_ == NULL) { -#line 26201 "Photo.c" - PhotoFileReader* _tmp72_; - PhotoFileFormat _tmp73_; - PhotoMetadata* _tmp74_; + if (_tmp59_ == NULL) { +#line 26408 "Photo.c" + PhotoFileReader* _tmp60_; + PhotoMetadata* _tmp61_; #line 3624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = export_reader; + _tmp60_ = export_reader; #line 3624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = photo_file_format_create_metadata (_tmp73_); + _tmp61_ = photo_file_format_create_metadata (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter))); #line 3624 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); #line 3624 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp74_; -#line 26215 "Photo.c" + metadata = _tmp61_; +#line 26419 "Photo.c" } #line 3626 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = writer; + _tmp62_ = writer; #line 3626 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp63_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 3626 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = _tmp76_; + _tmp64_ = _tmp63_; #line 3626 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:3626: Updating metadata of %s", _tmp77_); + g_debug ("Photo.vala:3626: Updating metadata of %s", _tmp64_); #line 3626 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp77_); + _g_free0 (_tmp64_); #line 3628 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3628 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp78_ != ((time_t) 0)) { -#line 26231 "Photo.c" - PhotoMetadata* _tmp79_; - time_t _tmp80_; - MetadataDateTime* _tmp81_; - MetadataDateTime* _tmp82_; -#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = metadata; + if (media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)) != ((time_t) 0)) { +#line 26433 "Photo.c" + PhotoMetadata* _tmp65_; + MetadataDateTime* _tmp66_; + MetadataDateTime* _tmp67_; #line 3629 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp65_ = metadata; #line 3629 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = metadata_date_time_new (_tmp80_); + _tmp66_ = metadata_date_time_new (media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource))); #line 3629 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = _tmp81_; + _tmp67_ = _tmp66_; #line 3629 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_exposure_date_time (_tmp79_, _tmp82_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_exposure_date_time (_tmp65_, _tmp67_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3629 "/home/jens/Source/shotwell/src/Photo.vala" - _metadata_date_time_unref0 (_tmp82_); -#line 26248 "Photo.c" + _metadata_date_time_unref0 (_tmp67_); +#line 26447 "Photo.c" } else { - PhotoMetadata* _tmp83_; + PhotoMetadata* _tmp68_; #line 3631 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = metadata; + _tmp68_ = metadata; #line 3631 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_exposure_date_time (_tmp83_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 26255 "Photo.c" + photo_metadata_set_exposure_date_time (_tmp68_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); +#line 26454 "Photo.c" } #line 3633 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = export_metadata; -#line 3633 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp84_) { -#line 26261 "Photo.c" - PhotoMetadata* _tmp85_; - gchar* _tmp86_; - gchar* _tmp87_; - PhotoMetadata* _tmp88_; - gchar* _tmp89_; - gchar* _tmp90_; - PhotoMetadata* _tmp91_; - Dimensions _tmp92_ = {0}; - PhotoMetadata* _tmp93_; - Orientation _tmp94_; - PhotoMetadata* _tmp95_; - Orientation _tmp96_; - Orientation _tmp97_; - PhotoMetadata* _tmp99_; + if (export_metadata) { +#line 26458 "Photo.c" + PhotoMetadata* _tmp69_; + gchar* _tmp70_; + gchar* _tmp71_; + PhotoMetadata* _tmp72_; + gchar* _tmp73_; + gchar* _tmp74_; + PhotoMetadata* _tmp75_; + Dimensions _tmp76_ = {0}; + PhotoMetadata* _tmp77_; + PhotoMetadata* _tmp78_; + PhotoMetadata* _tmp80_; #line 3635 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = metadata; + _tmp69_ = metadata; #line 3635 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp70_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3635 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = _tmp86_; + _tmp71_ = _tmp70_; #line 3635 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_title (_tmp85_, _tmp87_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_title (_tmp69_, _tmp71_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3635 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp87_); + _g_free0 (_tmp71_); #line 3636 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = metadata; + _tmp72_ = metadata; #line 3636 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp73_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3636 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = _tmp89_; + _tmp74_ = _tmp73_; #line 3636 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_comment (_tmp88_, _tmp90_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_comment (_tmp72_, _tmp74_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3636 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp90_); + _g_free0 (_tmp74_); #line 3637 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = metadata; + _tmp75_ = metadata; #line 3637 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp92_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp76_); #line 3637 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_pixel_dimensions (_tmp91_, &_tmp92_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_pixel_dimensions (_tmp75_, &_tmp76_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3638 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = metadata; + _tmp77_ = metadata; #line 3638 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = photo_get_orientation (self); -#line 3638 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_orientation (_tmp93_, _tmp94_); + photo_metadata_set_orientation (_tmp77_, photo_get_orientation (self)); #line 3639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp95_ = metadata; + _tmp78_ = metadata; #line 3639 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_software (_tmp95_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); + photo_metadata_set_software (_tmp78_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); #line 3641 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = photo_get_orientation (self); -#line 3641 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = photo_get_original_orientation (self); -#line 3641 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp96_ != _tmp97_) { -#line 26318 "Photo.c" - PhotoMetadata* _tmp98_; + if (photo_get_orientation (self) != photo_get_original_orientation (self)) { +#line 26506 "Photo.c" + PhotoMetadata* _tmp79_; #line 3642 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = metadata; + _tmp79_ = metadata; #line 3642 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_remove_exif_thumbnail (_tmp98_); -#line 26324 "Photo.c" + photo_metadata_remove_exif_thumbnail (_tmp79_); +#line 26512 "Photo.c" } #line 3644 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp99_ = metadata; + _tmp80_ = metadata; #line 3644 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_user_metadata_for_export (self, _tmp99_); -#line 26330 "Photo.c" + photo_set_user_metadata_for_export (self, _tmp80_); +#line 26518 "Photo.c" } else { - PhotoMetadata* _tmp100_; + PhotoMetadata* _tmp81_; #line 3648 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = metadata; + _tmp81_ = metadata; #line 3648 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_clear (_tmp100_); -#line 26337 "Photo.c" + photo_metadata_clear (_tmp81_); +#line 26525 "Photo.c" } #line 3650 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = writer; + _tmp82_ = writer; #line 3650 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp102_ = metadata; + _tmp83_ = metadata; #line 3650 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp101_, _tmp102_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp82_, _tmp83_, &_inner_error_); #line 3650 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 26347 "Photo.c" - gboolean _tmp103_ = FALSE; +#line 26535 "Photo.c" + gboolean _tmp84_ = FALSE; #line 3650 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3650 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26360,8 +26548,8 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole #line 3650 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3650 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp103_; -#line 26363 "Photo.c" + return _tmp84_; +#line 26551 "Photo.c" } #line 3652 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; @@ -26377,117 +26565,102 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole _photo_file_adapter_unref0 (export_reader); #line 3652 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 26379 "Photo.c" +#line 26567 "Photo.c" } -gboolean photo_is_export_required (Photo* self, Scaling* scaling, PhotoFileFormat export_format) { +gboolean +photo_is_export_required (Photo* self, + Scaling* scaling, + PhotoFileFormat export_format) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gboolean _tmp3_; #line 3658 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 3658 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, FALSE); #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = scaling_is_unscaled (scaling); -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp3_) { + if (!scaling_is_unscaled (scaling)) { #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = TRUE; -#line 26399 "Photo.c" +#line 26588 "Photo.c" } else { - gboolean _tmp4_; #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_has_alterations (self); -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = _tmp4_; -#line 26406 "Photo.c" + _tmp2_ = photo_has_alterations (self); +#line 26592 "Photo.c" } #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = TRUE; -#line 26412 "Photo.c" +#line 26598 "Photo.c" } else { - gboolean _tmp5_; #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_has_user_generated_metadata (self); -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp5_; -#line 26419 "Photo.c" + _tmp1_ = photo_has_user_generated_metadata (self); +#line 26602 "Photo.c" } #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = TRUE; -#line 26425 "Photo.c" +#line 26608 "Photo.c" } else { - PhotoFileFormat _tmp6_; - PhotoFileFormat _tmp7_; -#line 3660 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = export_format; #line 3660 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo_get_file_format (self); -#line 3660 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp6_ != _tmp7_; -#line 26435 "Photo.c" + _tmp0_ = export_format != photo_get_file_format (self); +#line 26612 "Photo.c" } #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 26441 "Photo.c" +#line 26618 "Photo.c" } -void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error) { - gboolean _tmp0_; +void +photo_export (Photo* self, + GFile* dest_file, + Scaling* scaling, + JpegQuality quality, + PhotoFileFormat export_format, + gboolean direct_copy_unmodified, + gboolean export_metadata, + GError** error) +{ + gboolean _tmp2_ = FALSE; + gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; - gboolean _tmp6_ = FALSE; - gboolean _tmp7_; PhotoMetadata* metadata = NULL; - PhotoMetadata* _tmp18_; - PhotoMetadata* _tmp19_; - PhotoFileFormat _tmp22_; - gboolean _tmp23_; + PhotoMetadata* _tmp7_; + PhotoMetadata* _tmp8_; PhotoFileWriter* writer = NULL; - PhotoFileFormat _tmp25_; - GFile* _tmp26_; - gchar* _tmp27_; - gchar* _tmp28_; + gchar* _tmp10_; + gchar* _tmp11_; + PhotoFileWriter* _tmp12_; + PhotoFileWriter* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + PhotoFileWriter* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + GEnumValue* _tmp19_; + GdkPixbuf* pixbuf = NULL; + gboolean _tmp20_ = FALSE; PhotoFileWriter* _tmp29_; - PhotoFileWriter* _tmp30_; - gchar* _tmp31_; + GdkPixbuf* _tmp30_; + PhotoFileWriter* _tmp31_; gchar* _tmp32_; - PhotoFileWriter* _tmp33_; - gchar* _tmp34_; - gchar* _tmp35_; - PhotoFileFormat _tmp36_; - GEnumValue* _tmp37_; - GdkPixbuf* pixbuf = NULL; - gboolean _tmp38_ = FALSE; - PhotoFileFormat _tmp39_; - PhotoFileWriter* _tmp49_; - GdkPixbuf* _tmp50_; - JpegQuality _tmp51_; - PhotoFileWriter* _tmp52_; - gchar* _tmp53_; - gchar* _tmp54_; - gboolean _tmp55_; - gboolean _tmp75_ = FALSE; - PhotoFileFormat _tmp76_; - PhotoFileMetadataWriter* _tmp86_ = NULL; - PhotoFileFormat _tmp87_; - GFile* _tmp88_; - gchar* _tmp89_; - gchar* _tmp90_; - PhotoFileMetadataWriter* _tmp91_; - PhotoFileMetadataWriter* _tmp92_; - PhotoMetadata* _tmp93_; + gchar* _tmp33_; + gboolean _tmp50_ = FALSE; + PhotoFileMetadataWriter* _tmp58_ = NULL; + gchar* _tmp59_; + gchar* _tmp60_; + PhotoFileMetadataWriter* _tmp61_; + PhotoFileMetadataWriter* _tmp62_; + PhotoMetadata* _tmp63_; GError * _inner_error_ = NULL; #line 3666 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -26496,177 +26669,129 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality #line 3666 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (scaling != NULL); #line 3668 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = direct_copy_unmodified; -#line 3668 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_) { -#line 26501 "Photo.c" + if (direct_copy_unmodified) { +#line 26672 "Photo.c" + GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; - GFile* _tmp3_; #line 3669 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp0_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3669 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = _tmp1_; -#line 3669 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = dest_file; + _tmp1_ = _tmp0_; #line 3669 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_copy (_tmp2_, _tmp3_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_); + g_file_copy (_tmp1_, dest_file, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_); #line 3669 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 3669 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3669 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3669 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26521 "Photo.c" +#line 26689 "Photo.c" } #line 3671 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26525 "Photo.c" +#line 26693 "Photo.c" } #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = scaling_is_unscaled (scaling); -#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp7_) { -#line 26531 "Photo.c" - gboolean _tmp8_ = FALSE; - gboolean _tmp9_; -#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo_has_alterations (self); + if (scaling_is_unscaled (scaling)) { +#line 26697 "Photo.c" + gboolean _tmp5_ = FALSE; #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp9_) { + if (!photo_has_alterations (self)) { #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = TRUE; -#line 26540 "Photo.c" + _tmp5_ = TRUE; +#line 26703 "Photo.c" } else { - gboolean _tmp10_; #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_only_metadata_changed (self); -#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp10_; -#line 26547 "Photo.c" + _tmp5_ = photo_only_metadata_changed (self); +#line 26707 "Photo.c" } #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp8_; -#line 26551 "Photo.c" + _tmp4_ = _tmp5_; +#line 26711 "Photo.c" } else { #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = FALSE; -#line 26555 "Photo.c" + _tmp4_ = FALSE; +#line 26715 "Photo.c" } #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_) { -#line 26559 "Photo.c" - PhotoFileFormat _tmp11_; - PhotoFileFormat _tmp12_; -#line 3679 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = export_format; -#line 3679 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_get_file_format (self); + if (_tmp4_) { #line 3679 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp11_ == _tmp12_; -#line 26568 "Photo.c" + _tmp3_ = export_format == photo_get_file_format (self); +#line 26721 "Photo.c" } else { #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = FALSE; -#line 26572 "Photo.c" + _tmp3_ = FALSE; +#line 26725 "Photo.c" } #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_) { -#line 26576 "Photo.c" - PhotoFileFormat _tmp13_; + if (_tmp3_) { #line 3679 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_get_file_format (self); -#line 3679 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp13_ == PHOTO_FILE_FORMAT_JFIF; -#line 26582 "Photo.c" + _tmp2_ = photo_get_file_format (self) == PHOTO_FILE_FORMAT_JFIF; +#line 26731 "Photo.c" } else { #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = FALSE; -#line 26586 "Photo.c" + _tmp2_ = FALSE; +#line 26735 "Photo.c" } #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp4_) { -#line 26590 "Photo.c" - gboolean _tmp14_ = FALSE; - GFile* _tmp15_; - gboolean _tmp16_; - gboolean _tmp17_; -#line 3680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = dest_file; -#line 3680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = export_metadata; -#line 3680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo_export_fullsized_backing (self, _tmp15_, _tmp16_, &_inner_error_); + if (_tmp2_) { +#line 26739 "Photo.c" + gboolean _tmp6_ = FALSE; #line 3680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp17_; + _tmp6_ = photo_export_fullsized_backing (self, dest_file, export_metadata, &_inner_error_); #line 3680 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3680 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3680 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26609 "Photo.c" +#line 26749 "Photo.c" } #line 3680 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp14_) { + if (_tmp6_) { #line 3681 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26615 "Photo.c" +#line 26755 "Photo.c" } } #line 3687 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource)); + _tmp7_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource)); #line 3687 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp18_; + metadata = _tmp7_; #line 3688 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = metadata; + _tmp8_ = metadata; #line 3688 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp19_ == NULL) { -#line 26626 "Photo.c" - PhotoFileFormat _tmp20_; - PhotoMetadata* _tmp21_; -#line 3689 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = export_format; + if (_tmp8_ == NULL) { +#line 26766 "Photo.c" + PhotoMetadata* _tmp9_; #line 3689 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = photo_file_format_create_metadata (_tmp20_); + _tmp9_ = photo_file_format_create_metadata (export_format); #line 3689 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); #line 3689 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp21_; -#line 26637 "Photo.c" + metadata = _tmp9_; +#line 26774 "Photo.c" } #line 3691 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = export_format; -#line 3691 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = photo_file_format_can_write (_tmp22_); -#line 3691 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp23_) { -#line 26645 "Photo.c" - PhotoFileFormat _tmp24_; -#line 3692 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = photo_file_format_get_system_default_format (); + if (!photo_file_format_can_write (export_format)) { #line 3692 "/home/jens/Source/shotwell/src/Photo.vala" - export_format = _tmp24_; -#line 26651 "Photo.c" + export_format = photo_file_format_get_system_default_format (); +#line 26780 "Photo.c" } #line 3694 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = export_format; -#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = dest_file; -#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = g_file_get_path (_tmp26_); + _tmp10_ = g_file_get_path (dest_file); #line 3694 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp27_; + _tmp11_ = _tmp10_; #line 3694 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = photo_file_format_create_writer (_tmp25_, _tmp28_, &_inner_error_); + _tmp12_ = photo_file_format_create_writer (export_format, _tmp11_, &_inner_error_); #line 3694 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _tmp29_; + _tmp13_ = _tmp12_; #line 3694 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp28_); + _g_free0 (_tmp11_); #line 3694 "/home/jens/Source/shotwell/src/Photo.vala" - writer = _tmp30_; + writer = _tmp13_; #line 3694 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3694 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26675,57 +26800,50 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _media_metadata_unref0 (metadata); #line 3694 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26677 "Photo.c" +#line 26802 "Photo.c" } #line 3696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 3696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _tmp31_; + _tmp14_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 3696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = writer; + _tmp15_ = _tmp14_; #line 3696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp16_ = writer; #line 3696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = _tmp34_; + _tmp17_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 3696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = export_format; + _tmp18_ = _tmp17_; #line 3697 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), _tmp36_); + _tmp19_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), export_format); #line 3696 "/home/jens/Source/shotwell/src/Photo.vala" g_debug ("Photo.vala:3696: Saving transformed version of %s to %s in file format" \ -" %s", _tmp32_, _tmp35_, (_tmp37_ != NULL) ? _tmp37_->value_name : NULL); +" %s", _tmp15_, _tmp18_, (_tmp19_ != NULL) ? _tmp19_->value_name : NULL); #line 3696 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp35_); + _g_free0 (_tmp18_); #line 3696 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp32_); -#line 3703 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = photo_get_file_format (self); + _g_free0 (_tmp15_); #line 3703 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp39_ == PHOTO_FILE_FORMAT_JFIF) { + if (photo_get_file_format (self) == PHOTO_FILE_FORMAT_JFIF) { #line 3703 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = TRUE; -#line 26705 "Photo.c" + _tmp20_ = TRUE; +#line 26826 "Photo.c" } else { - PhotoFileFormat _tmp40_; -#line 3704 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = photo_get_file_format (self); #line 3704 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = _tmp40_ == PHOTO_FILE_FORMAT_RAW; -#line 26712 "Photo.c" + _tmp20_ = photo_get_file_format (self) == PHOTO_FILE_FORMAT_RAW; +#line 26830 "Photo.c" } #line 3703 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp38_) { -#line 26716 "Photo.c" - GdkPixbuf* _tmp41_ = NULL; - Scaling _tmp42_; - GdkPixbuf* _tmp43_; - GdkPixbuf* _tmp44_; + if (_tmp20_) { +#line 26834 "Photo.c" + GdkPixbuf* _tmp21_ = NULL; + Scaling _tmp22_; + GdkPixbuf* _tmp23_; + GdkPixbuf* _tmp24_; #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = *scaling; + _tmp22_ = *scaling; #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = photo_get_pixbuf_with_options (self, &_tmp42_, PHOTO_EXCEPTION_ORIENTATION, BACKING_FETCH_MODE_SOURCE, &_inner_error_); + _tmp23_ = photo_get_pixbuf_with_options (self, &_tmp22_, PHOTO_EXCEPTION_ORIENTATION, BACKING_FETCH_MODE_SOURCE, &_inner_error_); #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = _tmp43_; + _tmp21_ = _tmp23_; #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26738,30 +26856,30 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _media_metadata_unref0 (metadata); #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26739 "Photo.c" +#line 26857 "Photo.c" } #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = _tmp41_; + _tmp24_ = _tmp21_; #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = NULL; + _tmp21_ = NULL; #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp44_; + pixbuf = _tmp24_; #line 3703 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp41_); -#line 26751 "Photo.c" + _g_object_unref0 (_tmp21_); +#line 26869 "Photo.c" } else { - GdkPixbuf* _tmp45_ = NULL; - Scaling _tmp46_; - GdkPixbuf* _tmp47_; - GdkPixbuf* _tmp48_; + GdkPixbuf* _tmp25_ = NULL; + Scaling _tmp26_; + GdkPixbuf* _tmp27_; + GdkPixbuf* _tmp28_; #line 3709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = *scaling; + _tmp26_ = *scaling; #line 3709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = photo_get_pixbuf_with_options (self, &_tmp46_, PHOTO_EXCEPTION_NONE, BACKING_FETCH_MODE_SOURCE, &_inner_error_); + _tmp27_ = photo_get_pixbuf_with_options (self, &_tmp26_, PHOTO_EXCEPTION_NONE, BACKING_FETCH_MODE_SOURCE, &_inner_error_); #line 3709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = _tmp47_; + _tmp25_ = _tmp27_; #line 3709 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3709 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26774,28 +26892,26 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _media_metadata_unref0 (metadata); #line 3709 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26775 "Photo.c" +#line 26893 "Photo.c" } #line 3709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = _tmp45_; + _tmp28_ = _tmp25_; #line 3709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = NULL; + _tmp25_ = NULL; #line 3709 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 3709 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp48_; + pixbuf = _tmp28_; #line 3703 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp45_); -#line 26787 "Photo.c" + _g_object_unref0 (_tmp25_); +#line 26905 "Photo.c" } #line 3713 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = writer; -#line 3713 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = pixbuf; + _tmp29_ = writer; #line 3713 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = quality; + _tmp30_ = pixbuf; #line 3713 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_writer_write (_tmp49_, _tmp50_, _tmp51_, &_inner_error_); + photo_file_writer_write (_tmp29_, _tmp30_, quality, &_inner_error_); #line 3713 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3713 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26808,191 +26924,168 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _media_metadata_unref0 (metadata); #line 3713 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26809 "Photo.c" +#line 26925 "Photo.c" } #line 3715 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = writer; + _tmp31_ = writer; #line 3715 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp32_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 3715 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = _tmp53_; + _tmp33_ = _tmp32_; #line 3715 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:3715: Setting EXIF for %s", _tmp54_); + g_debug ("Photo.vala:3715: Setting EXIF for %s", _tmp33_); #line 3715 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp54_); -#line 3718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = export_metadata; + _g_free0 (_tmp33_); #line 3718 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp55_) { -#line 26825 "Photo.c" - PhotoMetadata* _tmp56_; - gchar* _tmp57_; - gchar* _tmp58_; - PhotoMetadata* _tmp59_; - gchar* _tmp60_; - gchar* _tmp61_; - PhotoMetadata* _tmp62_; - time_t _tmp63_; - PhotoMetadata* _tmp69_; - PhotoMetadata* _tmp70_; - PhotoMetadata* _tmp71_; - gboolean _tmp72_; + if (export_metadata) { +#line 26939 "Photo.c" + PhotoMetadata* _tmp34_; + gchar* _tmp35_; + gchar* _tmp36_; + PhotoMetadata* _tmp37_; + gchar* _tmp38_; + gchar* _tmp39_; + PhotoMetadata* _tmp40_; + PhotoMetadata* _tmp45_; + PhotoMetadata* _tmp46_; + PhotoMetadata* _tmp47_; #line 3720 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = metadata; + _tmp34_ = metadata; #line 3720 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp35_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3720 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = _tmp57_; + _tmp36_ = _tmp35_; #line 3720 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_title (_tmp56_, _tmp58_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_title (_tmp34_, _tmp36_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3720 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp58_); + _g_free0 (_tmp36_); #line 3721 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = metadata; + _tmp37_ = metadata; #line 3721 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp38_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3721 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = _tmp60_; + _tmp39_ = _tmp38_; #line 3721 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_comment (_tmp59_, _tmp61_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_comment (_tmp37_, _tmp39_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3721 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp61_); + _g_free0 (_tmp39_); #line 3722 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = metadata; + _tmp40_ = metadata; #line 3722 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_software (_tmp62_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); + photo_metadata_set_software (_tmp40_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); #line 3724 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3724 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp63_ != ((time_t) 0)) { -#line 26866 "Photo.c" - PhotoMetadata* _tmp64_; - time_t _tmp65_; - MetadataDateTime* _tmp66_; - MetadataDateTime* _tmp67_; -#line 3725 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = metadata; + if (media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)) != ((time_t) 0)) { +#line 26976 "Photo.c" + PhotoMetadata* _tmp41_; + MetadataDateTime* _tmp42_; + MetadataDateTime* _tmp43_; #line 3725 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp41_ = metadata; #line 3725 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = metadata_date_time_new (_tmp65_); + _tmp42_ = metadata_date_time_new (media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource))); #line 3725 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = _tmp66_; + _tmp43_ = _tmp42_; #line 3725 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_exposure_date_time (_tmp64_, _tmp67_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_exposure_date_time (_tmp41_, _tmp43_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3725 "/home/jens/Source/shotwell/src/Photo.vala" - _metadata_date_time_unref0 (_tmp67_); -#line 26883 "Photo.c" + _metadata_date_time_unref0 (_tmp43_); +#line 26990 "Photo.c" } else { - PhotoMetadata* _tmp68_; + PhotoMetadata* _tmp44_; #line 3727 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = metadata; + _tmp44_ = metadata; #line 3727 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_exposure_date_time (_tmp68_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 26890 "Photo.c" + photo_metadata_set_exposure_date_time (_tmp44_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); +#line 26997 "Photo.c" } #line 3729 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = metadata; + _tmp45_ = metadata; #line 3729 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_remove_tag (_tmp69_, "Exif.Iop.RelatedImageWidth"); + photo_metadata_remove_tag (_tmp45_, "Exif.Iop.RelatedImageWidth"); #line 3730 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = metadata; + _tmp46_ = metadata; #line 3730 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_remove_tag (_tmp70_, "Exif.Iop.RelatedImageHeight"); + photo_metadata_remove_tag (_tmp46_, "Exif.Iop.RelatedImageHeight"); #line 3731 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = metadata; + _tmp47_ = metadata; #line 3731 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_remove_exif_thumbnail (_tmp71_); + photo_metadata_remove_exif_thumbnail (_tmp47_); #line 3733 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = photo_has_user_generated_metadata (self); -#line 3733 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp72_) { -#line 26908 "Photo.c" - PhotoMetadata* _tmp73_; + if (photo_has_user_generated_metadata (self)) { +#line 27013 "Photo.c" + PhotoMetadata* _tmp48_; #line 3734 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = metadata; + _tmp48_ = metadata; #line 3734 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_user_metadata_for_export (self, _tmp73_); -#line 26914 "Photo.c" + photo_set_user_metadata_for_export (self, _tmp48_); +#line 27019 "Photo.c" } } else { - PhotoMetadata* _tmp74_; + PhotoMetadata* _tmp49_; #line 3738 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = metadata; + _tmp49_ = metadata; #line 3738 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_clear (_tmp74_); -#line 26922 "Photo.c" + photo_metadata_clear (_tmp49_); +#line 27027 "Photo.c" } #line 3745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = photo_get_file_format (self); -#line 3745 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp76_ == PHOTO_FILE_FORMAT_JFIF) { + if (photo_get_file_format (self) == PHOTO_FILE_FORMAT_JFIF) { #line 3745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = TRUE; -#line 26930 "Photo.c" + _tmp50_ = TRUE; +#line 27033 "Photo.c" } else { - PhotoFileFormat _tmp77_; #line 3746 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = photo_get_file_format (self); -#line 3746 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = _tmp77_ == PHOTO_FILE_FORMAT_RAW; -#line 26937 "Photo.c" + _tmp50_ = photo_get_file_format (self) == PHOTO_FILE_FORMAT_RAW; +#line 27037 "Photo.c" } #line 3745 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp75_) { -#line 26941 "Photo.c" - PhotoMetadata* _tmp78_; - Dimensions _tmp79_ = {0}; - PhotoMetadata* _tmp80_; - Orientation _tmp81_; + if (_tmp50_) { +#line 27041 "Photo.c" + PhotoMetadata* _tmp51_; + Dimensions _tmp52_ = {0}; + PhotoMetadata* _tmp53_; #line 3747 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = metadata; + _tmp51_ = metadata; #line 3747 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_ORIENTATION, &_tmp79_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_ORIENTATION, &_tmp52_); #line 3747 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_pixel_dimensions (_tmp78_, &_tmp79_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_pixel_dimensions (_tmp51_, &_tmp52_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3748 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = metadata; -#line 3748 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = photo_get_orientation (self); + _tmp53_ = metadata; #line 3748 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_orientation (_tmp80_, _tmp81_); -#line 26958 "Photo.c" + photo_metadata_set_orientation (_tmp53_, photo_get_orientation (self)); +#line 27055 "Photo.c" } else { - PhotoMetadata* _tmp82_; - GdkPixbuf* _tmp83_; - Dimensions _tmp84_ = {0}; - PhotoMetadata* _tmp85_; + PhotoMetadata* _tmp54_; + GdkPixbuf* _tmp55_; + Dimensions _tmp56_ = {0}; + PhotoMetadata* _tmp57_; #line 3751 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = metadata; + _tmp54_ = metadata; #line 3751 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = pixbuf; + _tmp55_ = pixbuf; #line 3751 "/home/jens/Source/shotwell/src/Photo.vala" - dimensions_for_pixbuf (_tmp83_, &_tmp84_); + dimensions_for_pixbuf (_tmp55_, &_tmp56_); #line 3751 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_pixel_dimensions (_tmp82_, &_tmp84_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_pixel_dimensions (_tmp54_, &_tmp56_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3752 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = metadata; + _tmp57_ = metadata; #line 3752 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_orientation (_tmp85_, ORIENTATION_TOP_LEFT); -#line 26976 "Photo.c" + photo_metadata_set_orientation (_tmp57_, ORIENTATION_TOP_LEFT); +#line 27073 "Photo.c" } #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = export_format; -#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = dest_file; + _tmp59_ = g_file_get_path (dest_file); #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = g_file_get_path (_tmp88_); + _tmp60_ = _tmp59_; #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = _tmp89_; + _tmp61_ = photo_file_format_create_metadata_writer (export_format, _tmp60_, &_inner_error_); #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = photo_file_format_create_metadata_writer (_tmp87_, _tmp90_, &_inner_error_); + _tmp62_ = _tmp61_; #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = _tmp91_; + _g_free0 (_tmp60_); #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp90_); -#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = _tmp92_; + _tmp58_ = _tmp62_; #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27005,18 +27098,18 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _media_metadata_unref0 (metadata); #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27006 "Photo.c" +#line 27099 "Photo.c" } #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = metadata; + _tmp63_ = metadata; #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp86_, _tmp93_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp58_, _tmp63_, &_inner_error_); #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp86_); + _photo_file_adapter_unref0 (_tmp58_); #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27025,80 +27118,80 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _media_metadata_unref0 (metadata); #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27026 "Photo.c" +#line 27119 "Photo.c" } #line 3666 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp86_); + _photo_file_adapter_unref0 (_tmp58_); #line 3666 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 3666 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); #line 3666 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 27036 "Photo.c" +#line 27129 "Photo.c" } -static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* file_format, GError** error) { +static GFile* +photo_generate_new_editable_file (Photo* self, + PhotoFileFormat* file_format, + GError** error) +{ PhotoFileFormat _vala_file_format = 0; GFile* result = NULL; GFile* backing = NULL; - PhotoFileFormat _tmp4_; - gboolean _tmp5_; + PhotoFileFormat _tmp3_; gchar* name = NULL; gchar* ext = NULL; - gchar* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; - const gchar* _tmp12_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_ = NULL; + gchar* _tmp7_ = NULL; + gboolean _tmp8_ = FALSE; + const gchar* _tmp9_; gchar* editable_basename = NULL; - const gchar* _tmp22_; - const gchar* _tmp23_; - gchar* _tmp24_; + const gchar* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_; gboolean collision = FALSE; - GFile* _tmp25_ = NULL; + GFile* _tmp21_ = NULL; + GFile* _tmp22_; + GFile* _tmp23_; + gboolean _tmp24_ = FALSE; + GFile* _tmp25_; GFile* _tmp26_; GFile* _tmp27_; - gboolean _tmp28_ = FALSE; - GFile* _tmp29_; - GFile* _tmp30_; - GFile* _tmp31_; GError * _inner_error_ = NULL; #line 3758 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 27069 "Photo.c" +#line 27165 "Photo.c" { PhotoRow* _tmp0_; #line 3760 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 3760 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 27076 "Photo.c" +#line 27172 "Photo.c" { - PhotoFileFormat _tmp1_; - GFile* _tmp2_; + GFile* _tmp1_; #line 3761 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_get_file_format (self); -#line 3761 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_file_format = _tmp1_; + _vala_file_format = photo_get_file_format (self); #line 3762 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp1_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3762 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (backing); #line 3762 "/home/jens/Source/shotwell/src/Photo.vala" - backing = _tmp2_; -#line 27090 "Photo.c" + backing = _tmp1_; +#line 27183 "Photo.c" } __finally399: { - PhotoRow* _tmp3_; + PhotoRow* _tmp2_; #line 3760 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->row; + _tmp2_ = self->row; #line 3760 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 27099 "Photo.c" +#line 27192 "Photo.c" } #line 3760 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -27108,113 +27201,104 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi _g_object_unref0 (backing); #line 3760 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 27109 "Photo.c" +#line 27202 "Photo.c" } } #line 3765 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _vala_file_format; -#line 3765 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_file_format_can_write (_tmp4_); + _tmp3_ = _vala_file_format; #line 3765 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp5_) { -#line 27118 "Photo.c" - PhotoFileFormat _tmp6_; + if (!photo_file_format_can_write (_tmp3_)) { #line 3766 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_file_format_get_system_default_format (); -#line 3766 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_file_format = _tmp6_; -#line 27124 "Photo.c" + _vala_file_format = photo_file_format_get_system_default_format (); +#line 27211 "Photo.c" } #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = g_file_get_basename (backing); + _tmp4_ = g_file_get_basename (backing); #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_; + _tmp5_ = _tmp4_; #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" - disassemble_filename (_tmp8_, &_tmp9_, &_tmp10_); + disassemble_filename (_tmp5_, &_tmp6_, &_tmp7_); #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" - name = _tmp9_; + name = _tmp6_; #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" - ext = _tmp10_; + ext = _tmp7_; #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp5_); #line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = ext; + _tmp9_ = ext; #line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_ == NULL) { + if (_tmp9_ == NULL) { #line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = TRUE; -#line 27148 "Photo.c" + _tmp8_ = TRUE; +#line 27235 "Photo.c" } else { - PhotoFileFormat _tmp13_; - PhotoFileFormatProperties* _tmp14_; - PhotoFileFormatProperties* _tmp15_; - const gchar* _tmp16_; - gboolean _tmp17_; -#line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _vala_file_format; + PhotoFileFormat _tmp10_; + PhotoFileFormatProperties* _tmp11_; + PhotoFileFormatProperties* _tmp12_; + const gchar* _tmp13_; #line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = photo_file_format_get_properties (_tmp13_); + _tmp10_ = _vala_file_format; #line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_; + _tmp11_ = photo_file_format_get_properties (_tmp10_); #line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = ext; + _tmp12_ = _tmp11_; #line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo_file_format_properties_is_recognized_extension (_tmp15_, _tmp16_); + _tmp13_ = ext; #line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = !_tmp17_; + _tmp8_ = !photo_file_format_properties_is_recognized_extension (_tmp12_, _tmp13_); #line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_format_properties_unref0 (_tmp15_); -#line 27169 "Photo.c" + _photo_file_format_properties_unref0 (_tmp12_); +#line 27253 "Photo.c" } #line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 27173 "Photo.c" - PhotoFileFormat _tmp18_; - PhotoFileFormatProperties* _tmp19_; - PhotoFileFormatProperties* _tmp20_; - gchar* _tmp21_; + if (_tmp8_) { +#line 27257 "Photo.c" + PhotoFileFormat _tmp14_; + PhotoFileFormatProperties* _tmp15_; + PhotoFileFormatProperties* _tmp16_; + gchar* _tmp17_; #line 3772 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _vala_file_format; + _tmp14_ = _vala_file_format; #line 3772 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = photo_file_format_get_properties (_tmp18_); + _tmp15_ = photo_file_format_get_properties (_tmp14_); #line 3772 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_; + _tmp16_ = _tmp15_; #line 3772 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = photo_file_format_properties_get_default_extension (_tmp20_); + _tmp17_ = photo_file_format_properties_get_default_extension (_tmp16_); #line 3772 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); #line 3772 "/home/jens/Source/shotwell/src/Photo.vala" - ext = _tmp21_; + ext = _tmp17_; #line 3772 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_format_properties_unref0 (_tmp20_); -#line 27192 "Photo.c" + _photo_file_format_properties_unref0 (_tmp16_); +#line 27276 "Photo.c" } #line 3774 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = name; + _tmp18_ = name; #line 3774 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = ext; + _tmp19_ = ext; #line 3774 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = g_strdup_printf ("%s_%s.%s", _tmp22_, _ ("modified"), _tmp23_); + _tmp20_ = g_strdup_printf ("%s_%s.%s", _tmp18_, _ ("modified"), _tmp19_); #line 3774 "/home/jens/Source/shotwell/src/Photo.vala" - editable_basename = _tmp24_; + editable_basename = _tmp20_; #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = g_file_get_parent (backing); + _tmp22_ = g_file_get_parent (backing); #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_; + _tmp23_ = _tmp22_; #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = generate_unique_file (_tmp27_, editable_basename, &_tmp28_, &_inner_error_); + _tmp25_ = generate_unique_file (_tmp23_, editable_basename, &_tmp24_, &_inner_error_); #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - collision = _tmp28_; + collision = _tmp24_; #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _tmp29_; + _tmp26_ = _tmp25_; #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp27_); + _g_object_unref0 (_tmp23_); #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp30_; + _tmp21_ = _tmp26_; #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27229,16 +27313,16 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi _g_object_unref0 (backing); #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 27230 "Photo.c" +#line 27314 "Photo.c" } #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _tmp25_; + _tmp27_ = _tmp21_; #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = NULL; + _tmp21_ = NULL; #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp31_; + result = _tmp27_; #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp25_); + _g_object_unref0 (_tmp21_); #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (editable_basename); #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27251,115 +27335,113 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi if (file_format) { #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" *file_format = _vala_file_format; -#line 27252 "Photo.c" +#line 27336 "Photo.c" } #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 27256 "Photo.c" +#line 27340 "Photo.c" } -static void _g_object_unref0_ (gpointer var) { +static void +_g_object_unref0_ (gpointer var) +{ #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); -#line 27263 "Photo.c" +#line 27349 "Photo.c" } -static void _g_list_free__g_object_unref0_ (GList* self) { -#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" - g_list_foreach (self, (GFunc) _g_object_unref0_, NULL); +static inline void +_g_list_free__g_object_unref0_ (GList* self) +{ #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" - g_list_free (self); -#line 27272 "Photo.c" + g_list_free_full (self, (GDestroyNotify) _g_object_unref0_); +#line 27358 "Photo.c" } -static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, GError** error) { +static gboolean +photo_launch_editor (GFile* file, + PhotoFileFormat file_format, + GError** error) +{ gboolean result = FALSE; gchar* _tmp0_ = NULL; - PhotoFileFormat _tmp1_; gchar* commandline = NULL; - gchar* _tmp8_; - const gchar* _tmp9_; - gboolean _tmp10_; + gchar* _tmp7_; + const gchar* _tmp8_; GAppInfo* app = NULL; GList* files = NULL; - GFile* _tmp16_; - GFile* _tmp17_; - GAppInfo* _tmp18_; + GFile* _tmp14_; + GAppInfo* _tmp15_; gchar** argv = NULL; - gchar** _tmp24_; + gchar** _tmp20_; gint argv_length1; gint _argv_size_; + gchar** _tmp21_; + gint _tmp21__length1; + const gchar* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; gchar** _tmp25_; gint _tmp25__length1; - const gchar* _tmp26_; + gchar* _tmp26_; gchar* _tmp27_; - gchar* _tmp28_; + GPid child_pid = 0; + gboolean _tmp28_ = FALSE; gchar** _tmp29_; gint _tmp29__length1; - GFile* _tmp30_; - gchar* _tmp31_; - gchar* _tmp32_; - GPid child_pid = 0; - gboolean _tmp33_ = FALSE; - gchar** _tmp34_; - gint _tmp34__length1; - GPid _tmp35_ = 0; - gboolean _tmp36_; + GPid _tmp30_ = 0; + gboolean _tmp31_; GError * _inner_error_ = NULL; #line 3780 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 3781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = file_format; -#line 3781 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) { -#line 27316 "Photo.c" + if (file_format == PHOTO_FILE_FORMAT_RAW) { +#line 27400 "Photo.c" + ConfigFacade* _tmp1_; ConfigFacade* _tmp2_; - ConfigFacade* _tmp3_; - gchar* _tmp4_; + gchar* _tmp3_; #line 3781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = config_facade_get_instance (); + _tmp1_ = config_facade_get_instance (); #line 3781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 3781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp3_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 3781 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); #line 3781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 3781 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp3_); -#line 27332 "Photo.c" + _g_object_unref0 (_tmp2_); +#line 27416 "Photo.c" } else { + ConfigFacade* _tmp4_; ConfigFacade* _tmp5_; - ConfigFacade* _tmp6_; - gchar* _tmp7_; + gchar* _tmp6_; #line 3782 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = config_facade_get_instance (); + _tmp4_ = config_facade_get_instance (); #line 3782 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 3782 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp6_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 3782 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); #line 3782 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp7_; + _tmp0_ = _tmp6_; #line 3782 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp6_); -#line 27349 "Photo.c" + _g_object_unref0 (_tmp5_); +#line 27433 "Photo.c" } #line 3781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = g_strdup (_tmp0_); + _tmp7_ = g_strdup (_tmp0_); #line 3781 "/home/jens/Source/shotwell/src/Photo.vala" - commandline = _tmp8_; -#line 3784 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = commandline; + commandline = _tmp7_; #line 3784 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = is_string_empty (_tmp9_); + _tmp8_ = commandline; #line 3784 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp10_) { + if (is_string_empty (_tmp8_)) { #line 3785 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 3785 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27368,35 +27450,35 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G _g_free0 (_tmp0_); #line 3785 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 27369 "Photo.c" +#line 27451 "Photo.c" } { - GAppInfo* _tmp11_ = NULL; - const gchar* _tmp12_; - GAppInfo* _tmp13_; - GAppInfo* _tmp14_; + GAppInfo* _tmp9_ = NULL; + const gchar* _tmp10_; + GAppInfo* _tmp11_; + GAppInfo* _tmp12_; #line 3789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = commandline; + _tmp10_ = commandline; #line 3789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = g_app_info_create_from_commandline (_tmp12_, "", G_APP_INFO_CREATE_NONE, &_inner_error_); + _tmp11_ = g_app_info_create_from_commandline (_tmp10_, "", G_APP_INFO_CREATE_NONE, &_inner_error_); #line 3789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp13_; + _tmp9_ = _tmp11_; #line 3789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27384 "Photo.c" +#line 27466 "Photo.c" goto __catch400_g_error; } #line 3789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp11_; + _tmp12_ = _tmp9_; #line 3789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = NULL; + _tmp9_ = NULL; #line 3789 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (app); #line 3789 "/home/jens/Source/shotwell/src/Photo.vala" - app = _tmp14_; + app = _tmp12_; #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp11_); -#line 27397 "Photo.c" + _g_object_unref0 (_tmp9_); +#line 27479 "Photo.c" } goto __finally400; __catch400_g_error: @@ -27412,13 +27494,13 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G app = NULL; #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (er); -#line 27413 "Photo.c" +#line 27495 "Photo.c" } __finally400: #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27418 "Photo.c" - gboolean _tmp15_ = FALSE; +#line 27500 "Photo.c" + gboolean _tmp13_ = FALSE; #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27428,38 +27510,33 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp15_; -#line 27430 "Photo.c" + return _tmp13_; +#line 27512 "Photo.c" } #line 3795 "/home/jens/Source/shotwell/src/Photo.vala" files = NULL; #line 3796 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = file; + _tmp14_ = _g_object_ref0 (file); #line 3796 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _g_object_ref0 (_tmp16_); -#line 3796 "/home/jens/Source/shotwell/src/Photo.vala" - files = g_list_insert (files, _tmp17_, -1); + files = g_list_insert (files, _tmp14_, -1); #line 3798 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = app; + _tmp15_ = app; #line 3798 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp18_ != NULL) { -#line 27444 "Photo.c" - gboolean _tmp19_ = FALSE; - GAppInfo* _tmp20_; - GList* _tmp21_; - gboolean _tmp22_; + if (_tmp15_ != NULL) { +#line 27524 "Photo.c" + gboolean _tmp16_ = FALSE; + GAppInfo* _tmp17_; + GList* _tmp18_; #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = app; + _tmp17_ = app; #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = files; + _tmp18_ = files; #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = g_app_info_launch (_tmp20_, _tmp21_, NULL, &_inner_error_); -#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp22_; + _tmp16_ = g_app_info_launch (_tmp17_, _tmp18_, NULL, &_inner_error_); #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27459 "Photo.c" - gboolean _tmp23_ = FALSE; +#line 27536 "Photo.c" + gboolean _tmp19_ = FALSE; #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27471,11 +27548,11 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp23_; -#line 27473 "Photo.c" + return _tmp19_; +#line 27550 "Photo.c" } #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp19_; + result = _tmp16_; #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" __g_list_free__g_object_unref0_0 (files); #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27486,58 +27563,56 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G _g_free0 (_tmp0_); #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 27487 "Photo.c" +#line 27564 "Photo.c" } #line 3801 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = g_new0 (gchar*, 2 + 1); + _tmp20_ = g_new0 (gchar*, 2 + 1); #line 3801 "/home/jens/Source/shotwell/src/Photo.vala" - argv = _tmp24_; + argv = _tmp20_; #line 3801 "/home/jens/Source/shotwell/src/Photo.vala" argv_length1 = 2; #line 3801 "/home/jens/Source/shotwell/src/Photo.vala" _argv_size_ = argv_length1; #line 3802 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = argv; + _tmp21_ = argv; #line 3802 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25__length1 = argv_length1; + _tmp21__length1 = argv_length1; #line 3802 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = commandline; + _tmp22_ = commandline; #line 3802 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = g_strdup (_tmp26_); + _tmp23_ = g_strdup (_tmp22_); #line 3802 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp25_[0]); + _g_free0 (_tmp21_[0]); #line 3802 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_[0] = _tmp27_; + _tmp21_[0] = _tmp23_; #line 3802 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp25_[0]; + _tmp24_ = _tmp21_[0]; #line 3803 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = argv; -#line 3803 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29__length1 = argv_length1; + _tmp25_ = argv; #line 3803 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = file; + _tmp25__length1 = argv_length1; #line 3803 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = g_file_get_path (_tmp30_); + _tmp26_ = g_file_get_path (file); #line 3803 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp29_[1]); + _g_free0 (_tmp25_[1]); #line 3803 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_[1] = _tmp31_; + _tmp25_[1] = _tmp26_; #line 3803 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _tmp29_[1]; + _tmp27_ = _tmp25_[1]; #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = argv; + _tmp29_ = argv; #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34__length1 = argv_length1; + _tmp29__length1 = argv_length1; #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = g_spawn_async ("/", _tmp34_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &_tmp35_, &_inner_error_); + _tmp31_ = g_spawn_async ("/", _tmp29_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &_tmp30_, &_inner_error_); #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" - child_pid = _tmp35_; + child_pid = _tmp30_; #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp36_; + _tmp28_ = _tmp31_; #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27537 "Photo.c" - gboolean _tmp37_ = FALSE; +#line 27612 "Photo.c" + gboolean _tmp32_ = FALSE; #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27551,11 +27626,11 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp37_; -#line 27553 "Photo.c" + return _tmp32_; +#line 27628 "Photo.c" } #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp33_; + result = _tmp28_; #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL); #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27568,14 +27643,16 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G _g_free0 (_tmp0_); #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 27569 "Photo.c" +#line 27644 "Photo.c" } -void photo_open_with_raw_external_editor (Photo* self, GError** error) { +void +photo_open_with_raw_external_editor (Photo* self, + GError** error) +{ GFile* _tmp0_; GFile* _tmp1_; - PhotoFileFormat _tmp2_; GError * _inner_error_ = NULL; #line 3817 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -27584,9 +27661,7 @@ void photo_open_with_raw_external_editor (Photo* self, GError** error) { #line 3818 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 3818 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_get_master_file_format (self); -#line 3818 "/home/jens/Source/shotwell/src/Photo.vala" - photo_launch_editor (_tmp1_, _tmp2_, &_inner_error_); + photo_launch_editor (_tmp1_, photo_get_master_file_format (self), &_inner_error_); #line 3818 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); #line 3818 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27595,24 +27670,26 @@ void photo_open_with_raw_external_editor (Photo* self, GError** error) { g_propagate_error (error, _inner_error_); #line 3818 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27596 "Photo.c" +#line 27671 "Photo.c" } } -void photo_open_with_external_editor (Photo* self, GError** error) { +void +photo_open_with_external_editor (Photo* self, + GError** error) +{ GFile* current_editable_file = NULL; GFile* create_editable_file = NULL; PhotoFileFormat editable_file_format = 0; + gboolean _tmp14_ = FALSE; gboolean _tmp15_ = FALSE; - gboolean _tmp16_ = FALSE; - GFile* _tmp17_; - gboolean _tmp25_ = FALSE; - GFile* _tmp26_; - GFile* _tmp44_; - GFileMonitor* _tmp45_; - GFile* _tmp47_; - PhotoFileFormat _tmp48_; + GFile* _tmp16_; + gboolean _tmp22_ = FALSE; + GFile* _tmp23_; + GFile* _tmp40_; + GFileMonitor* _tmp41_; + GFile* _tmp43_; GError * _inner_error_ = NULL; #line 3822 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -27620,14 +27697,14 @@ void photo_open_with_external_editor (Photo* self, GError** error) { current_editable_file = NULL; #line 3824 "/home/jens/Source/shotwell/src/Photo.vala" create_editable_file = NULL; -#line 27621 "Photo.c" +#line 27698 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 3826 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 3826 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 27628 "Photo.c" +#line 27705 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -27638,7 +27715,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _tmp2_ = _tmp1_->editable; #line 3827 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 27639 "Photo.c" +#line 27716 "Photo.c" PhotoBackingReaders* _tmp3_; PhotoFileReader* _tmp4_; GFile* _tmp5_; @@ -27652,13 +27729,13 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_object_unref0 (current_editable_file); #line 3828 "/home/jens/Source/shotwell/src/Photo.vala" current_editable_file = _tmp5_; -#line 27653 "Photo.c" +#line 27730 "Photo.c" } #line 3830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = current_editable_file; #line 3830 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ == NULL) { -#line 27659 "Photo.c" +#line 27736 "Photo.c" GFile* _tmp7_ = NULL; PhotoFileFormat _tmp8_ = 0; GFile* _tmp9_; @@ -27671,7 +27748,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _tmp7_ = _tmp9_; #line 3831 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27672 "Photo.c" +#line 27749 "Photo.c" goto __finally401; } #line 3831 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27684,30 +27761,27 @@ void photo_open_with_external_editor (Photo* self, GError** error) { create_editable_file = _tmp10_; #line 3830 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp7_); -#line 27685 "Photo.c" +#line 27762 "Photo.c" } else { PhotoBackingReaders* _tmp11_; PhotoFileReader* _tmp12_; - PhotoFileFormat _tmp13_; #line 3833 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->priv->readers; #line 3833 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_->editable; #line 3833 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3833 "/home/jens/Source/shotwell/src/Photo.vala" - editable_file_format = _tmp13_; -#line 27698 "Photo.c" + editable_file_format = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); +#line 27772 "Photo.c" } } __finally401: { - PhotoBackingReaders* _tmp14_; + PhotoBackingReaders* _tmp13_; #line 3826 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->priv->readers; + _tmp13_ = self->priv->readers; #line 3826 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 27708 "Photo.c" +#line 27782 "Photo.c" } #line 3826 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -27719,115 +27793,106 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_object_unref0 (current_editable_file); #line 3826 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27720 "Photo.c" +#line 27794 "Photo.c" } } #line 3838 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = create_editable_file; + _tmp16_ = create_editable_file; #line 3838 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp17_ == NULL) { -#line 27727 "Photo.c" - GFile* _tmp18_; + if (_tmp16_ == NULL) { +#line 27801 "Photo.c" + GFile* _tmp17_; #line 3838 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = current_editable_file; + _tmp17_ = current_editable_file; #line 3838 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp18_ != NULL; -#line 27733 "Photo.c" + _tmp15_ = _tmp17_ != NULL; +#line 27807 "Photo.c" } else { #line 3838 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = FALSE; -#line 27737 "Photo.c" + _tmp15_ = FALSE; +#line 27811 "Photo.c" } #line 3838 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp16_) { -#line 27741 "Photo.c" - gboolean _tmp19_ = FALSE; - GFile* _tmp20_; - gboolean _tmp21_; -#line 3839 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = current_editable_file; + if (_tmp15_) { +#line 27815 "Photo.c" + gboolean _tmp18_ = FALSE; + GFile* _tmp19_; #line 3839 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = g_file_query_exists (_tmp20_, NULL); + _tmp19_ = current_editable_file; #line 3839 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp21_) { + if (!g_file_query_exists (_tmp19_, NULL)) { #line 3839 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = TRUE; -#line 27753 "Photo.c" + _tmp18_ = TRUE; +#line 27824 "Photo.c" } else { - gboolean _tmp22_; -#line 3839 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = photo_has_transformations (self); #line 3839 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp22_; -#line 27760 "Photo.c" + _tmp18_ = photo_has_transformations (self); +#line 27828 "Photo.c" } #line 3839 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp19_; -#line 27764 "Photo.c" + _tmp14_ = _tmp18_; +#line 27832 "Photo.c" } else { #line 3838 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = FALSE; -#line 27768 "Photo.c" + _tmp14_ = FALSE; +#line 27836 "Photo.c" } #line 3838 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp15_) { -#line 27772 "Photo.c" - GFile* _tmp23_; - GFile* _tmp24_; + if (_tmp14_) { +#line 27840 "Photo.c" + GFile* _tmp20_; + GFile* _tmp21_; #line 3840 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = current_editable_file; + _tmp20_ = current_editable_file; #line 3840 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _g_object_ref0 (_tmp23_); + _tmp21_ = _g_object_ref0 (_tmp20_); #line 3840 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); #line 3840 "/home/jens/Source/shotwell/src/Photo.vala" - create_editable_file = _tmp24_; -#line 27783 "Photo.c" + create_editable_file = _tmp21_; +#line 27851 "Photo.c" } #line 3843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = create_editable_file; -#line 3843 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp26_ != NULL) { -#line 27789 "Photo.c" - PhotoFileFormat _tmp27_; - gboolean _tmp28_; + _tmp23_ = create_editable_file; #line 3843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = editable_file_format; + if (_tmp23_ != NULL) { +#line 27857 "Photo.c" + PhotoFileFormat _tmp24_; #line 3843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = photo_file_format_can_write (_tmp27_); + _tmp24_ = editable_file_format; #line 3843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp28_; -#line 27798 "Photo.c" + _tmp22_ = photo_file_format_can_write (_tmp24_); +#line 27863 "Photo.c" } else { #line 3843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = FALSE; -#line 27802 "Photo.c" + _tmp22_ = FALSE; +#line 27867 "Photo.c" } #line 3843 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp25_) { -#line 27806 "Photo.c" - PhotoFileFormat _tmp40_; - GFile* _tmp41_; - GFile* _tmp42_; - GFile* _tmp43_; + if (_tmp22_) { +#line 27871 "Photo.c" + PhotoFileFormat _tmp36_; + GFile* _tmp37_; + GFile* _tmp38_; + GFile* _tmp39_; #line 3844 "/home/jens/Source/shotwell/src/Photo.vala" photo_halt_monitoring_editable (self); -#line 27813 "Photo.c" +#line 27878 "Photo.c" { - GFile* _tmp29_; - Scaling _tmp30_ = {0}; - PhotoFileFormat _tmp31_; + GFile* _tmp25_; + Scaling _tmp26_ = {0}; + PhotoFileFormat _tmp27_; #line 3847 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = create_editable_file; + _tmp25_ = create_editable_file; #line 3847 "/home/jens/Source/shotwell/src/Photo.vala" - scaling_for_original (&_tmp30_); + scaling_for_original (&_tmp26_); #line 3847 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = editable_file_format; + _tmp27_ = editable_file_format; #line 3847 "/home/jens/Source/shotwell/src/Photo.vala" - photo_export (self, _tmp29_, &_tmp30_, JPEG_QUALITY_MAXIMUM, _tmp31_, FALSE, TRUE, &_inner_error_); + photo_export (self, _tmp25_, &_tmp26_, JPEG_QUALITY_MAXIMUM, _tmp27_, FALSE, TRUE, &_inner_error_); #line 3847 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27828 "Photo.c" +#line 27893 "Photo.c" goto __catch402_g_error; } } @@ -27835,22 +27900,22 @@ void photo_open_with_external_editor (Photo* self, GError** error) { __catch402_g_error: { GError* err = NULL; - GError* _tmp38_; - GError* _tmp39_; + GError* _tmp34_; + GError* _tmp35_; #line 3846 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 3846 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 27842 "Photo.c" +#line 27907 "Photo.c" { - GFile* _tmp32_; + GFile* _tmp28_; #line 3852 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = create_editable_file; + _tmp28_ = create_editable_file; #line 3852 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_delete (_tmp32_, NULL, &_inner_error_); + g_file_delete (_tmp28_, NULL, &_inner_error_); #line 3852 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27851 "Photo.c" +#line 27916 "Photo.c" goto __catch403_g_error; } } @@ -27858,33 +27923,33 @@ void photo_open_with_external_editor (Photo* self, GError** error) { __catch403_g_error: { GError* delete_err = NULL; - GFile* _tmp33_; - gchar* _tmp34_; - gchar* _tmp35_; - GError* _tmp36_; - const gchar* _tmp37_; + GFile* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + GError* _tmp32_; + const gchar* _tmp33_; #line 3851 "/home/jens/Source/shotwell/src/Photo.vala" delete_err = _inner_error_; #line 3851 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 3855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = create_editable_file; + _tmp29_ = create_editable_file; #line 3855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = g_file_get_path (_tmp33_); + _tmp30_ = g_file_get_path (_tmp29_); #line 3855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = _tmp34_; + _tmp31_ = _tmp30_; #line 3855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = delete_err; + _tmp32_ = delete_err; #line 3855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tmp36_->message; + _tmp33_ = _tmp32_->message; #line 3855 "/home/jens/Source/shotwell/src/Photo.vala" g_warning ("Photo.vala:3855: Unable to delete editable file %s after export error:" \ -" %s", _tmp35_, _tmp37_); +" %s", _tmp31_, _tmp33_); #line 3855 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp35_); + _g_free0 (_tmp31_); #line 3851 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (delete_err); -#line 27884 "Photo.c" +#line 27949 "Photo.c" } __finally403: #line 3851 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27903,17 +27968,17 @@ void photo_open_with_external_editor (Photo* self, GError** error) { g_clear_error (&_inner_error_); #line 3851 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27903 "Photo.c" +#line 27968 "Photo.c" } #line 3859 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = err; + _tmp34_ = err; #line 3859 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = _g_error_copy0 (_tmp38_); + _tmp35_ = _g_error_copy0 (_tmp34_); #line 3859 "/home/jens/Source/shotwell/src/Photo.vala" - _inner_error_ = _tmp39_; + _inner_error_ = _tmp35_; #line 3859 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 27913 "Photo.c" +#line 27978 "Photo.c" goto __finally402; } __finally402: @@ -27927,14 +27992,14 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_object_unref0 (current_editable_file); #line 3846 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27927 "Photo.c" +#line 27992 "Photo.c" } #line 3863 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = editable_file_format; + _tmp36_ = editable_file_format; #line 3863 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = create_editable_file; + _tmp37_ = create_editable_file; #line 3863 "/home/jens/Source/shotwell/src/Photo.vala" - photo_attach_editable (self, _tmp40_, _tmp41_, &_inner_error_); + photo_attach_editable (self, _tmp36_, _tmp37_, &_inner_error_); #line 3863 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3863 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27945,32 +28010,32 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_object_unref0 (current_editable_file); #line 3863 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27945 "Photo.c" +#line 28010 "Photo.c" } #line 3865 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = create_editable_file; + _tmp38_ = create_editable_file; #line 3865 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = _g_object_ref0 (_tmp42_); + _tmp39_ = _g_object_ref0 (_tmp38_); #line 3865 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); #line 3865 "/home/jens/Source/shotwell/src/Photo.vala" - current_editable_file = _tmp43_; -#line 27955 "Photo.c" + current_editable_file = _tmp39_; +#line 28020 "Photo.c" } #line 3868 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = current_editable_file; + _tmp40_ = current_editable_file; #line 3868 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp44_ != NULL, "current_editable_file != null"); + _vala_assert (_tmp40_ != NULL, "current_editable_file != null"); #line 3871 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = self->priv->editable_monitor; + _tmp41_ = self->priv->editable_monitor; #line 3871 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp45_ == NULL) { -#line 27965 "Photo.c" - GFile* _tmp46_; + if (_tmp41_ == NULL) { +#line 28030 "Photo.c" + GFile* _tmp42_; #line 3872 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = current_editable_file; + _tmp42_ = current_editable_file; #line 3872 "/home/jens/Source/shotwell/src/Photo.vala" - photo_start_monitoring_editable (self, _tmp46_, &_inner_error_); + photo_start_monitoring_editable (self, _tmp42_, &_inner_error_); #line 3872 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3872 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27981,15 +28046,13 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_object_unref0 (current_editable_file); #line 3872 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27981 "Photo.c" +#line 28046 "Photo.c" } } #line 3874 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = current_editable_file; -#line 3874 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = photo_get_file_format (self); + _tmp43_ = current_editable_file; #line 3874 "/home/jens/Source/shotwell/src/Photo.vala" - photo_launch_editor (_tmp47_, _tmp48_, &_inner_error_); + photo_launch_editor (_tmp43_, photo_get_file_format (self), &_inner_error_); #line 3874 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3874 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28000,42 +28063,50 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_object_unref0 (current_editable_file); #line 3874 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28000 "Photo.c" +#line 28063 "Photo.c" } #line 3822 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); #line 3822 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 28006 "Photo.c" +#line 28069 "Photo.c" } -void photo_revert_to_master (Photo* self, gboolean notify) { - gboolean _tmp0_; +void +photo_revert_to_master (Photo* self, + gboolean notify) +{ #line 3877 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 3878 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = notify; -#line 3878 "/home/jens/Source/shotwell/src/Photo.vala" - photo_detach_editable (self, TRUE, TRUE, _tmp0_); -#line 28018 "Photo.c" + photo_detach_editable (self, TRUE, TRUE, notify); +#line 28081 "Photo.c" } -static void _photo_on_editable_file_changed_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self) { +static void +_photo_on_editable_file_changed_g_file_monitor_changed (GFileMonitor* _sender, + GFile* file, + GFile* other_file, + GFileMonitorEvent event_type, + gpointer self) +{ #line 3888 "/home/jens/Source/shotwell/src/Photo.vala" photo_on_editable_file_changed ((Photo*) self, file, other_file, event_type); -#line 28025 "Photo.c" +#line 28094 "Photo.c" } -static void photo_start_monitoring_editable (Photo* self, GFile* file, GError** error) { - GFile* _tmp0_; - GFileMonitor* _tmp1_ = NULL; - GFile* _tmp2_; +static void +photo_start_monitoring_editable (Photo* self, + GFile* file, + GError** error) +{ + GFileMonitor* _tmp0_ = NULL; + GFileMonitor* _tmp1_; + GFileMonitor* _tmp2_; GFileMonitor* _tmp3_; - GFileMonitor* _tmp4_; - GFileMonitor* _tmp5_; GError * _inner_error_ = NULL; #line 3881 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -28044,42 +28115,40 @@ static void photo_start_monitoring_editable (Photo* self, GFile* file, GError** #line 3882 "/home/jens/Source/shotwell/src/Photo.vala" photo_halt_monitoring_editable (self); #line 3885 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file; -#line 3885 "/home/jens/Source/shotwell/src/Photo.vala" - library_monitor_blacklist_file (_tmp0_, "Photo.start_monitoring_editable"); -#line 3887 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = file; + library_monitor_blacklist_file (file, "Photo.start_monitoring_editable"); #line 3887 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = g_file_monitor (_tmp2_, G_FILE_MONITOR_NONE, NULL, &_inner_error_); + _tmp1_ = g_file_monitor (file, G_FILE_MONITOR_NONE, NULL, &_inner_error_); #line 3887 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp3_; + _tmp0_ = _tmp1_; #line 3887 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3887 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3887 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28059 "Photo.c" +#line 28126 "Photo.c" } #line 3887 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp1_; + _tmp2_ = _tmp0_; #line 3887 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = NULL; + _tmp0_ = NULL; #line 3887 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->editable_monitor); #line 3887 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->editable_monitor = _tmp4_; + self->priv->editable_monitor = _tmp2_; #line 3888 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->priv->editable_monitor; + _tmp3_ = self->priv->editable_monitor; #line 3888 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_connect_object (_tmp5_, "changed", (GCallback) _photo_on_editable_file_changed_g_file_monitor_changed, self, 0); + g_signal_connect_object (_tmp3_, "changed", (GCallback) _photo_on_editable_file_changed_g_file_monitor_changed, self, 0); #line 3881 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp1_); -#line 28075 "Photo.c" + _g_object_unref0 (_tmp0_); +#line 28142 "Photo.c" } -static void photo_halt_monitoring_editable (Photo* self) { +static void +photo_halt_monitoring_editable (Photo* self) +{ GFileMonitor* _tmp0_; GFile* file = NULL; GFile* _tmp1_; @@ -28095,7 +28164,7 @@ static void photo_halt_monitoring_editable (Photo* self) { if (_tmp0_ == NULL) { #line 3893 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28095 "Photo.c" +#line 28164 "Photo.c" } #line 3896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_editable_file (self); @@ -28105,13 +28174,13 @@ static void photo_halt_monitoring_editable (Photo* self) { _tmp2_ = file; #line 3897 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 28105 "Photo.c" +#line 28174 "Photo.c" GFile* _tmp3_; #line 3898 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file; #line 3898 "/home/jens/Source/shotwell/src/Photo.vala" library_monitor_unblacklist_file (_tmp3_); -#line 28111 "Photo.c" +#line 28180 "Photo.c" } #line 3900 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->editable_monitor; @@ -28129,17 +28198,20 @@ static void photo_halt_monitoring_editable (Photo* self) { self->priv->editable_monitor = NULL; #line 3891 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 28129 "Photo.c" +#line 28198 "Photo.c" } -static void photo_attach_editable (Photo* self, PhotoFileFormat file_format, GFile* file, GError** error) { - PhotoFileFormat _tmp0_; - GFile* _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; - PhotoFileReader* _tmp4_; - PhotoFileReader* _tmp5_; +static void +photo_attach_editable (Photo* self, + PhotoFileFormat file_format, + GFile* file, + GError** error) +{ + gchar* _tmp0_; + gchar* _tmp1_; + PhotoFileReader* _tmp2_; + PhotoFileReader* _tmp3_; GError * _inner_error_ = NULL; #line 3905 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -28148,35 +28220,34 @@ static void photo_attach_editable (Photo* self, PhotoFileFormat file_format, GFi #line 3910 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file_format; + _tmp0_ = g_file_get_path (file); #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = file; + _tmp1_ = _tmp0_; #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = g_file_get_path (_tmp1_); + _tmp2_ = photo_file_format_create_reader (file_format, _tmp1_); #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_file_format_create_reader (_tmp0_, _tmp3_); + photo_update_editable (self, FALSE, _tmp3_, &_inner_error_); #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; -#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" - photo_update_editable (self, FALSE, _tmp5_, &_inner_error_); + _photo_file_adapter_unref0 (_tmp3_); #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp5_); -#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp1_); #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28171 "Photo.c" +#line 28239 "Photo.c" } } -static void photo_update_editable_attributes (Photo* self, GError** error) { +static void +photo_update_editable_attributes (Photo* self, + GError** error) +{ GError * _inner_error_ = NULL; #line 3914 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -28188,12 +28259,15 @@ static void photo_update_editable_attributes (Photo* self, GError** error) { g_propagate_error (error, _inner_error_); #line 3915 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28188 "Photo.c" +#line 28259 "Photo.c" } } -void photo_reimport_editable (Photo* self, GError** error) { +void +photo_reimport_editable (Photo* self, + GError** error) +{ GError * _inner_error_ = NULL; #line 3918 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -28205,213 +28279,231 @@ void photo_reimport_editable (Photo* self, GError** error) { g_propagate_error (error, _inner_error_); #line 3919 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28205 "Photo.c" +#line 28279 "Photo.c" } } -static void _vala_array_add107 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add107 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28217 "Photo.c" +#line 28296 "Photo.c" } #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28223 "Photo.c" +#line 28302 "Photo.c" } -static void _vala_array_add108 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add108 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28234 "Photo.c" +#line 28318 "Photo.c" } #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28240 "Photo.c" +#line 28324 "Photo.c" } -static void _vala_array_add109 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add109 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28251 "Photo.c" +#line 28340 "Photo.c" } #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28257 "Photo.c" +#line 28346 "Photo.c" } -static void _vala_array_add110 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add110 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 4034 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 4034 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 4034 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28268 "Photo.c" +#line 28362 "Photo.c" } #line 4034 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 4034 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28274 "Photo.c" +#line 28368 "Photo.c" } -static void _vala_array_add111 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add111 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28285 "Photo.c" +#line 28384 "Photo.c" } #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28291 "Photo.c" +#line 28390 "Photo.c" } -static void _vala_array_add112 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add112 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 4038 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 4038 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 4038 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28302 "Photo.c" +#line 28406 "Photo.c" } #line 4038 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 4038 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28308 "Photo.c" +#line 28412 "Photo.c" } -static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoFileReader* new_reader, GError** error) { +static void +photo_update_editable (Photo* self, + gboolean only_attributes, + PhotoFileReader* new_reader, + GError** error) +{ gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - gboolean _tmp2_; PhotoFileReader* old_reader = NULL; - PhotoFileReader* _tmp5_; - PhotoFileReader* _tmp6_ = NULL; - PhotoFileReader* _tmp7_; + PhotoFileReader* _tmp2_; + PhotoFileReader* _tmp3_ = NULL; PhotoFileReader* reader = NULL; - PhotoFileReader* _tmp9_; - PhotoFileReader* _tmp10_; + PhotoFileReader* _tmp5_; + PhotoFileReader* _tmp6_; gboolean timestamp_changed = FALSE; gboolean filesize_changed = FALSE; gboolean is_new_editable = FALSE; BackingPhotoID editable_id = {0}; - BackingPhotoID _tmp11_ = {0}; + BackingPhotoID _tmp7_ = {0}; GFile* file = NULL; - PhotoFileReader* _tmp12_; - GFile* _tmp13_; + PhotoFileReader* _tmp8_; + GFile* _tmp9_; DetectedPhotoInformation* detected = NULL; BackingPhotoRow* backing = NULL; - GFile* _tmp14_; - DetectedPhotoInformation* _tmp15_ = NULL; - BackingPhotoRow* _tmp16_; - gboolean _tmp17_; - gboolean _tmp35_; - PhotoFileReader* _tmp94_; - gboolean _tmp100_ = FALSE; - gboolean _tmp101_; + GFile* _tmp10_; + DetectedPhotoInformation* _tmp11_ = NULL; + BackingPhotoRow* _tmp12_; + gboolean _tmp87_ = FALSE; gchar** alteration_list = NULL; - gchar** _tmp112_; + gchar** _tmp96_; gint alteration_list_length1; gint _alteration_list_size_; - gboolean _tmp113_; - gboolean _tmp121_ = FALSE; - gboolean _tmp122_; - gchar** _tmp131_; - gint _tmp131__length1; + gboolean _tmp97_; + gboolean _tmp104_ = FALSE; + gboolean _tmp105_; + gchar** _tmp112_; + gint _tmp112__length1; GError * _inner_error_ = NULL; #line 3924 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 3924 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((new_reader == NULL) || IS_PHOTO_FILE_READER (new_reader)); #line 3926 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = only_attributes; -#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_) { -#line 28359 "Photo.c" - PhotoFileReader* _tmp3_; -#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = new_reader; + if (only_attributes) { #line 3926 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp3_ == NULL; -#line 28365 "Photo.c" + _tmp1_ = new_reader == NULL; +#line 28462 "Photo.c" } else { #line 3926 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 28369 "Photo.c" +#line 28466 "Photo.c" } #line 3926 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { #line 3926 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = TRUE; -#line 28375 "Photo.c" +#line 28472 "Photo.c" } else { - gboolean _tmp4_; -#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = only_attributes; #line 3926 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = !_tmp4_; -#line 28382 "Photo.c" + _tmp0_ = !only_attributes; +#line 28476 "Photo.c" } #line 3926 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp0_, "(only_attributes && new_reader == null) || (!only_attributes)"); #line 3928 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_get_editable_reader (self); + _tmp2_ = photo_get_editable_reader (self); #line 3928 "/home/jens/Source/shotwell/src/Photo.vala" - old_reader = _tmp5_; + old_reader = _tmp2_; #line 3930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = new_reader; + _tmp3_ = new_reader; #line 3930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp7_; -#line 3930 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_ == NULL) { -#line 28396 "Photo.c" - PhotoFileReader* _tmp8_; + if (_tmp3_ == NULL) { +#line 28488 "Photo.c" + PhotoFileReader* _tmp4_; #line 3930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = old_reader; + _tmp4_ = old_reader; #line 3930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp8_; -#line 28402 "Photo.c" + _tmp3_ = _tmp4_; +#line 28494 "Photo.c" } #line 3930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _photo_file_adapter_ref0 (_tmp6_); + _tmp5_ = _photo_file_adapter_ref0 (_tmp3_); #line 3930 "/home/jens/Source/shotwell/src/Photo.vala" - reader = _tmp9_; + reader = _tmp5_; #line 3931 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = reader; + _tmp6_ = reader; #line 3931 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp10_ == NULL) { + if (_tmp6_ == NULL) { #line 3932 "/home/jens/Source/shotwell/src/Photo.vala" photo_detach_editable (self, FALSE, TRUE, TRUE); #line 3934 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28420,7 +28512,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3934 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28420 "Photo.c" +#line 28512 "Photo.c" } #line 3937 "/home/jens/Source/shotwell/src/Photo.vala" timestamp_changed = FALSE; @@ -28429,25 +28521,25 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF #line 3939 "/home/jens/Source/shotwell/src/Photo.vala" is_new_editable = FALSE; #line 3941 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_editable_id (self, &_tmp11_); + photo_get_editable_id (self, &_tmp7_); #line 3941 "/home/jens/Source/shotwell/src/Photo.vala" - editable_id = _tmp11_; + editable_id = _tmp7_; #line 3942 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = reader; + _tmp8_ = reader; #line 3942 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp9_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 3942 "/home/jens/Source/shotwell/src/Photo.vala" - file = _tmp13_; + file = _tmp9_; #line 3945 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = file; + _tmp10_ = file; #line 3945 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = photo_query_backing_photo_row (self, _tmp14_, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp15_, &_inner_error_); + _tmp12_ = photo_query_backing_photo_row (self, _tmp10_, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp11_, &_inner_error_); #line 3945 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); #line 3945 "/home/jens/Source/shotwell/src/Photo.vala" - detected = _tmp15_; + detected = _tmp11_; #line 3945 "/home/jens/Source/shotwell/src/Photo.vala" - backing = _tmp16_; + backing = _tmp12_; #line 3945 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3945 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28462,32 +28554,30 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3945 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28462 "Photo.c" +#line 28554 "Photo.c" } #line 3949 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = backing_photo_id_is_invalid (&editable_id); -#line 3949 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp17_) { -#line 28468 "Photo.c" - BackingPhotoRow* _tmp18_; + if (backing_photo_id_is_invalid (&editable_id)) { +#line 28558 "Photo.c" + BackingPhotoRow* _tmp13_; #line 3951 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = backing; + _tmp13_ = backing; #line 3951 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp18_ != NULL) { -#line 28474 "Photo.c" - BackingPhotoTable* _tmp19_; - BackingPhotoTable* _tmp20_; - BackingPhotoRow* _tmp21_; + if (_tmp13_ != NULL) { +#line 28564 "Photo.c" + BackingPhotoTable* _tmp14_; + BackingPhotoTable* _tmp15_; + BackingPhotoRow* _tmp16_; #line 3952 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = backing_photo_table_get_instance (); + _tmp14_ = backing_photo_table_get_instance (); #line 3952 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_; + _tmp15_ = _tmp14_; #line 3952 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = backing; + _tmp16_ = backing; #line 3952 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_add (_tmp20_, _tmp21_, &_inner_error_); + backing_photo_table_add (_tmp15_, _tmp16_, &_inner_error_); #line 3952 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp20_); + _database_table_unref0 (_tmp15_); #line 3952 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3952 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28504,82 +28594,82 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3952 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28504 "Photo.c" +#line 28594 "Photo.c" } { - PhotoRow* _tmp22_; + PhotoRow* _tmp17_; #line 3953 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = self->row; + _tmp17_ = self->row; #line 3953 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 28512 "Photo.c" +#line 28602 "Photo.c" { - PhotoTable* _tmp23_; - PhotoTable* _tmp24_; - PhotoRow* _tmp25_; + PhotoTable* _tmp18_; + PhotoTable* _tmp19_; + PhotoRow* _tmp20_; + BackingPhotoRow* _tmp21_; + BackingPhotoID _tmp22_; + BackingPhotoRow* _tmp23_; + BackingPhotoRow* _tmp24_; + BackingPhotoRow* _tmp25_; BackingPhotoRow* _tmp26_; - BackingPhotoID _tmp27_; - BackingPhotoRow* _tmp28_; - BackingPhotoRow* _tmp29_; - BackingPhotoRow* _tmp30_; - BackingPhotoRow* _tmp31_; - BackingPhotoRow* _tmp32_; - Orientation _tmp33_; + BackingPhotoRow* _tmp27_; + Orientation _tmp28_; #line 3954 "/home/jens/Source/shotwell/src/Photo.vala" timestamp_changed = TRUE; #line 3955 "/home/jens/Source/shotwell/src/Photo.vala" filesize_changed = TRUE; #line 3957 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = photo_table_get_instance (); + _tmp18_ = photo_table_get_instance (); #line 3957 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_; + _tmp19_ = _tmp18_; #line 3957 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = self->row; + _tmp20_ = self->row; #line 3957 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = backing; + _tmp21_ = backing; #line 3957 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_->id; + _tmp22_ = _tmp21_->id; #line 3957 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_attach_editable (_tmp24_, _tmp25_, &_tmp27_, &_inner_error_); + photo_table_attach_editable (_tmp19_, _tmp20_, &_tmp22_, &_inner_error_); #line 3957 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp24_); + _database_table_unref0 (_tmp19_); #line 3957 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 28545 "Photo.c" +#line 28635 "Photo.c" goto __finally404; } #line 3958 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = backing; + _tmp23_ = backing; #line 3958 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _backing_photo_row_ref0 (_tmp28_); + _tmp24_ = _backing_photo_row_ref0 (_tmp23_); #line 3958 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->priv->editable); #line 3958 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->editable = _tmp29_; + self->priv->editable = _tmp24_; #line 3959 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = self->priv->editable; + _tmp25_ = self->priv->editable; #line 3959 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _backing_photo_row_ref0 (_tmp30_); + _tmp26_ = _backing_photo_row_ref0 (_tmp25_); #line 3959 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); #line 3959 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_photo_row = _tmp31_; + self->backing_photo_row = _tmp26_; #line 3960 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = self->backing_photo_row; + _tmp27_ = self->backing_photo_row; #line 3960 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp32_->original_orientation; + _tmp28_ = _tmp27_->original_orientation; #line 3960 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_orientation (self, _tmp33_); -#line 28570 "Photo.c" + photo_set_orientation (self, _tmp28_); +#line 28660 "Photo.c" } __finally404: { - PhotoRow* _tmp34_; + PhotoRow* _tmp29_; #line 3953 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = self->row; + _tmp29_ = self->row; #line 3953 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 28579 "Photo.c" +#line 28669 "Photo.c" } #line 3953 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -28597,88 +28687,82 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3953 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28597 "Photo.c" +#line 28687 "Photo.c" } } } #line 3963 "/home/jens/Source/shotwell/src/Photo.vala" is_new_editable = TRUE; -#line 28603 "Photo.c" +#line 28693 "Photo.c" } #line 3966 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = only_attributes; -#line 3966 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp35_) { -#line 28609 "Photo.c" - gboolean _tmp36_; + if (only_attributes) { +#line 28697 "Photo.c" GFileInfo* info = NULL; GTimeVal timestamp = {0}; + GFileInfo* _tmp38_; + GTimeVal _tmp39_ = {0}; + BackingPhotoTable* _tmp40_; + BackingPhotoTable* _tmp41_; + BackingPhotoID _tmp42_; + GTimeVal _tmp43_; + glong _tmp44_; GFileInfo* _tmp45_; - GTimeVal _tmp46_ = {0}; - BackingPhotoTable* _tmp47_; - BackingPhotoTable* _tmp48_; - BackingPhotoID _tmp49_; - GTimeVal _tmp50_; - glong _tmp51_; - GFileInfo* _tmp52_; - gint64 _tmp53_; #line 3968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = backing_photo_id_is_valid (&editable_id); -#line 3968 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp36_, "editable_id.is_valid()"); -#line 28626 "Photo.c" + _vala_assert (backing_photo_id_is_valid (&editable_id), "editable_id.is_valid()"); +#line 28710 "Photo.c" { - GFileInfo* _tmp37_ = NULL; - GFile* _tmp38_; - GFileInfo* _tmp39_; - GFileInfo* _tmp40_; + GFileInfo* _tmp30_ = NULL; + GFile* _tmp31_; + GFileInfo* _tmp32_; + GFileInfo* _tmp33_; #line 3972 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = file; + _tmp31_ = file; #line 3972 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = g_file_query_filesystem_info (_tmp38_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, NULL, &_inner_error_); + _tmp32_ = g_file_query_filesystem_info (_tmp31_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, NULL, &_inner_error_); #line 3972 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tmp39_; + _tmp30_ = _tmp32_; #line 3972 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 28640 "Photo.c" +#line 28724 "Photo.c" goto __catch405_g_error; } #line 3972 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = _tmp37_; + _tmp33_ = _tmp30_; #line 3972 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = NULL; + _tmp30_ = NULL; #line 3972 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); #line 3972 "/home/jens/Source/shotwell/src/Photo.vala" - info = _tmp40_; + info = _tmp33_; #line 3971 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp37_); -#line 28653 "Photo.c" + _g_object_unref0 (_tmp30_); +#line 28737 "Photo.c" } goto __finally405; __catch405_g_error: { GError* err = NULL; - gchar* _tmp41_; - gchar* _tmp42_; - GError* _tmp43_; - const gchar* _tmp44_; + gchar* _tmp34_; + gchar* _tmp35_; + GError* _tmp36_; + const gchar* _tmp37_; #line 3971 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 3971 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 3974 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp34_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 3974 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _tmp41_; + _tmp35_ = _tmp34_; #line 3974 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = err; + _tmp36_ = err; #line 3974 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = _tmp43_->message; + _tmp37_ = _tmp36_->message; #line 3974 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:3974: Unable to read editable filesystem info for %s: %s", _tmp42_, _tmp44_); + g_warning ("Photo.vala:3974: Unable to read editable filesystem info for %s: %s", _tmp35_, _tmp37_); #line 3974 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp42_); + _g_free0 (_tmp35_); #line 3975 "/home/jens/Source/shotwell/src/Photo.vala" photo_detach_editable (self, FALSE, TRUE, TRUE); #line 3977 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28697,7 +28781,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3977 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28697 "Photo.c" +#line 28781 "Photo.c" } __finally405: #line 3971 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28718,32 +28802,30 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3971 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28718 "Photo.c" +#line 28802 "Photo.c" } #line 3980 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = info; + _tmp38_ = info; #line 3980 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_info_get_modification_time (_tmp45_, &_tmp46_); + g_file_info_get_modification_time (_tmp38_, &_tmp39_); #line 3980 "/home/jens/Source/shotwell/src/Photo.vala" - timestamp = _tmp46_; -#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = backing_photo_table_get_instance (); + timestamp = _tmp39_; #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = _tmp47_; + _tmp40_ = backing_photo_table_get_instance (); #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = editable_id; + _tmp41_ = _tmp40_; #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = timestamp; + _tmp42_ = editable_id; #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = _tmp50_.tv_sec; + _tmp43_ = timestamp; #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = info; + _tmp44_ = _tmp43_.tv_sec; #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = g_file_info_get_size (_tmp52_); + _tmp45_ = info; #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_update_attributes (_tmp48_, &_tmp49_, (time_t) _tmp51_, _tmp53_, &_inner_error_); + backing_photo_table_update_attributes (_tmp41_, &_tmp42_, (time_t) _tmp44_, g_file_info_get_size (_tmp45_), &_inner_error_); #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp48_); + _database_table_unref0 (_tmp41_); #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28762,76 +28844,70 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28762 "Photo.c" +#line 28844 "Photo.c" } { - PhotoRow* _tmp54_; + PhotoRow* _tmp46_; #line 3984 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = self->row; + _tmp46_ = self->row; #line 3984 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 28770 "Photo.c" +#line 28852 "Photo.c" { - BackingPhotoRow* _tmp55_; - time_t _tmp56_; - GTimeVal _tmp57_; - glong _tmp58_; - BackingPhotoRow* _tmp59_; - gint64 _tmp60_; - GFileInfo* _tmp61_; - gint64 _tmp62_; - BackingPhotoRow* _tmp63_; - GTimeVal _tmp64_; - glong _tmp65_; - BackingPhotoRow* _tmp66_; - GFileInfo* _tmp67_; - gint64 _tmp68_; + BackingPhotoRow* _tmp47_; + time_t _tmp48_; + GTimeVal _tmp49_; + glong _tmp50_; + BackingPhotoRow* _tmp51_; + gint64 _tmp52_; + GFileInfo* _tmp53_; + BackingPhotoRow* _tmp54_; + GTimeVal _tmp55_; + glong _tmp56_; + BackingPhotoRow* _tmp57_; + GFileInfo* _tmp58_; #line 3985 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = self->priv->editable; + _tmp47_ = self->priv->editable; #line 3985 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = _tmp55_->timestamp; + _tmp48_ = _tmp47_->timestamp; #line 3985 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = timestamp; + _tmp49_ = timestamp; #line 3985 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = _tmp57_.tv_sec; + _tmp50_ = _tmp49_.tv_sec; #line 3985 "/home/jens/Source/shotwell/src/Photo.vala" - timestamp_changed = _tmp56_ != ((time_t) _tmp58_); -#line 3986 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = self->priv->editable; + timestamp_changed = _tmp48_ != ((time_t) _tmp50_); #line 3986 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = _tmp59_->filesize; + _tmp51_ = self->priv->editable; #line 3986 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = info; + _tmp52_ = _tmp51_->filesize; #line 3986 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = g_file_info_get_size (_tmp61_); + _tmp53_ = info; #line 3986 "/home/jens/Source/shotwell/src/Photo.vala" - filesize_changed = _tmp60_ != _tmp62_; + filesize_changed = _tmp52_ != g_file_info_get_size (_tmp53_); #line 3988 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = self->priv->editable; + _tmp54_ = self->priv->editable; #line 3988 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = timestamp; + _tmp55_ = timestamp; #line 3988 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = _tmp64_.tv_sec; + _tmp56_ = _tmp55_.tv_sec; #line 3988 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_->timestamp = (time_t) _tmp65_; + _tmp54_->timestamp = (time_t) _tmp56_; #line 3989 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = self->priv->editable; + _tmp57_ = self->priv->editable; #line 3989 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = info; + _tmp58_ = info; #line 3989 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = g_file_info_get_size (_tmp67_); -#line 3989 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_->filesize = _tmp68_; -#line 28822 "Photo.c" + _tmp57_->filesize = g_file_info_get_size (_tmp58_); +#line 28898 "Photo.c" } __finally406: { - PhotoRow* _tmp69_; + PhotoRow* _tmp59_; #line 3984 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = self->row; + _tmp59_ = self->row; #line 3984 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 28831 "Photo.c" +#line 28907 "Photo.c" } #line 3984 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -28851,55 +28927,52 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3984 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28851 "Photo.c" +#line 28927 "Photo.c" } } #line 3966 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 28856 "Photo.c" +#line 28932 "Photo.c" } else { - gboolean _tmp70_ = FALSE; - gboolean _tmp71_; -#line 3993 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = backing_photo_id_is_valid (&editable_id); + gboolean _tmp60_ = FALSE; #line 3993 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp71_) { -#line 28864 "Photo.c" - gboolean _tmp72_; + if (backing_photo_id_is_valid (&editable_id)) { +#line 28937 "Photo.c" + gboolean _tmp61_; #line 3993 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = is_new_editable; + _tmp61_ = is_new_editable; #line 3993 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = !_tmp72_; -#line 28870 "Photo.c" + _tmp60_ = !_tmp61_; +#line 28943 "Photo.c" } else { #line 3993 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = FALSE; -#line 28874 "Photo.c" + _tmp60_ = FALSE; +#line 28947 "Photo.c" } #line 3993 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp70_) { -#line 28878 "Photo.c" - BackingPhotoRow* _tmp73_; - BackingPhotoID _tmp74_; - BackingPhotoTable* _tmp75_; - BackingPhotoTable* _tmp76_; - BackingPhotoRow* _tmp77_; + if (_tmp60_) { +#line 28951 "Photo.c" + BackingPhotoRow* _tmp62_; + BackingPhotoID _tmp63_; + BackingPhotoTable* _tmp64_; + BackingPhotoTable* _tmp65_; + BackingPhotoRow* _tmp66_; #line 3998 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = backing; + _tmp62_ = backing; #line 3998 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = editable_id; + _tmp63_ = editable_id; #line 3998 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_->id = _tmp74_; + _tmp62_->id = _tmp63_; #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = backing_photo_table_get_instance (); + _tmp64_ = backing_photo_table_get_instance (); #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = _tmp75_; + _tmp65_ = _tmp64_; #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = backing; + _tmp66_ = backing; #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_update (_tmp76_, _tmp77_, &_inner_error_); + backing_photo_table_update (_tmp65_, _tmp66_, &_inner_error_); #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp76_); + _database_table_unref0 (_tmp65_); #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28916,82 +28989,82 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28916 "Photo.c" +#line 28989 "Photo.c" } { - PhotoRow* _tmp78_; + PhotoRow* _tmp67_; #line 4000 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = self->row; + _tmp67_ = self->row; #line 4000 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 28924 "Photo.c" +#line 28997 "Photo.c" { + BackingPhotoRow* _tmp68_; + time_t _tmp69_; + BackingPhotoRow* _tmp70_; + time_t _tmp71_; + BackingPhotoRow* _tmp72_; + gint64 _tmp73_; + BackingPhotoRow* _tmp74_; + gint64 _tmp75_; + BackingPhotoRow* _tmp76_; + BackingPhotoRow* _tmp77_; + BackingPhotoRow* _tmp78_; BackingPhotoRow* _tmp79_; - time_t _tmp80_; - BackingPhotoRow* _tmp81_; - time_t _tmp82_; - BackingPhotoRow* _tmp83_; - gint64 _tmp84_; - BackingPhotoRow* _tmp85_; - gint64 _tmp86_; - BackingPhotoRow* _tmp87_; - BackingPhotoRow* _tmp88_; - BackingPhotoRow* _tmp89_; - BackingPhotoRow* _tmp90_; - BackingPhotoRow* _tmp91_; - Orientation _tmp92_; + BackingPhotoRow* _tmp80_; + Orientation _tmp81_; #line 4001 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = self->priv->editable; + _tmp68_ = self->priv->editable; #line 4001 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = _tmp79_->timestamp; + _tmp69_ = _tmp68_->timestamp; #line 4001 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = backing; + _tmp70_ = backing; #line 4001 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = _tmp81_->timestamp; + _tmp71_ = _tmp70_->timestamp; #line 4001 "/home/jens/Source/shotwell/src/Photo.vala" - timestamp_changed = _tmp80_ != _tmp82_; + timestamp_changed = _tmp69_ != _tmp71_; #line 4002 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = self->priv->editable; + _tmp72_ = self->priv->editable; #line 4002 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = _tmp83_->filesize; + _tmp73_ = _tmp72_->filesize; #line 4002 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = backing; + _tmp74_ = backing; #line 4002 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = _tmp85_->filesize; + _tmp75_ = _tmp74_->filesize; #line 4002 "/home/jens/Source/shotwell/src/Photo.vala" - filesize_changed = _tmp84_ != _tmp86_; + filesize_changed = _tmp73_ != _tmp75_; #line 4004 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = backing; + _tmp76_ = backing; #line 4004 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = _backing_photo_row_ref0 (_tmp87_); + _tmp77_ = _backing_photo_row_ref0 (_tmp76_); #line 4004 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->priv->editable); #line 4004 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->editable = _tmp88_; + self->priv->editable = _tmp77_; #line 4005 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = self->priv->editable; + _tmp78_ = self->priv->editable; #line 4005 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = _backing_photo_row_ref0 (_tmp89_); + _tmp79_ = _backing_photo_row_ref0 (_tmp78_); #line 4005 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); #line 4005 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_photo_row = _tmp90_; + self->backing_photo_row = _tmp79_; #line 4006 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = self->backing_photo_row; + _tmp80_ = self->backing_photo_row; #line 4006 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = _tmp91_->original_orientation; + _tmp81_ = _tmp80_->original_orientation; #line 4006 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_orientation (self, _tmp92_); -#line 28982 "Photo.c" + photo_set_orientation (self, _tmp81_); +#line 29055 "Photo.c" } __finally407: { - PhotoRow* _tmp93_; + PhotoRow* _tmp82_; #line 4000 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = self->row; + _tmp82_ = self->row; #line 4000 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 28991 "Photo.c" +#line 29064 "Photo.c" } #line 4000 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -29009,47 +29082,42 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 4000 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29009 "Photo.c" +#line 29082 "Photo.c" } } } } #line 4012 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = new_reader; -#line 4012 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp94_ != NULL) { -#line 29018 "Photo.c" + if (new_reader != NULL) { +#line 29089 "Photo.c" { - PhotoBackingReaders* _tmp95_; + PhotoBackingReaders* _tmp83_; #line 4013 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp95_ = self->priv->readers; + _tmp83_ = self->priv->readers; #line 4013 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 29025 "Photo.c" +#line 29096 "Photo.c" { - PhotoBackingReaders* _tmp96_; - PhotoFileReader* _tmp97_; - PhotoFileReader* _tmp98_; -#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = self->priv->readers; + PhotoBackingReaders* _tmp84_; + PhotoFileReader* _tmp85_; #line 4014 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = new_reader; + _tmp84_ = self->priv->readers; #line 4014 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = _photo_file_adapter_ref0 (_tmp97_); + _tmp85_ = _photo_file_adapter_ref0 (new_reader); #line 4014 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp96_->editable); + _photo_file_adapter_unref0 (_tmp84_->editable); #line 4014 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_->editable = _tmp98_; -#line 29040 "Photo.c" + _tmp84_->editable = _tmp85_; +#line 29108 "Photo.c" } __finally408: { - PhotoBackingReaders* _tmp99_; + PhotoBackingReaders* _tmp86_; #line 4013 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp99_ = self->priv->readers; + _tmp86_ = self->priv->readers; #line 4013 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 29049 "Photo.c" +#line 29117 "Photo.c" } #line 4013 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -29067,231 +29135,214 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 4013 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29067 "Photo.c" +#line 29135 "Photo.c" } } } #line 4018 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = only_attributes; + if (!only_attributes) { +#line 29141 "Photo.c" + PhotoFileReader* _tmp88_; + PhotoFileReader* _tmp89_; #line 4018 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp101_) { -#line 29075 "Photo.c" - PhotoFileReader* _tmp102_; - PhotoFileReader* _tmp103_; + _tmp88_ = reader; #line 4018 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp102_ = reader; + _tmp89_ = old_reader; #line 4018 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp103_ = old_reader; -#line 4018 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = _tmp102_ != _tmp103_; -#line 29084 "Photo.c" + _tmp87_ = _tmp88_ != _tmp89_; +#line 29150 "Photo.c" } else { #line 4018 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = FALSE; -#line 29088 "Photo.c" + _tmp87_ = FALSE; +#line 29154 "Photo.c" } #line 4018 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp100_) { -#line 29092 "Photo.c" - GFile* _tmp104_ = NULL; - PhotoFileReader* _tmp105_; - GFile* _tmp108_ = NULL; - PhotoFileReader* _tmp109_; + if (_tmp87_) { +#line 29158 "Photo.c" + GFile* _tmp90_ = NULL; + PhotoFileReader* _tmp91_; + GFile* _tmp94_ = NULL; #line 4019 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_replaced (self); #line 4020 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp105_ = old_reader; + _tmp91_ = old_reader; #line 4020 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp105_ != NULL) { -#line 29103 "Photo.c" - PhotoFileReader* _tmp106_; - GFile* _tmp107_; + if (_tmp91_ != NULL) { +#line 29168 "Photo.c" + PhotoFileReader* _tmp92_; + GFile* _tmp93_; #line 4020 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp106_ = old_reader; + _tmp92_ = old_reader; #line 4020 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp107_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp93_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 4020 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp104_); + _g_object_unref0 (_tmp90_); #line 4020 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp104_ = _tmp107_; -#line 29114 "Photo.c" + _tmp90_ = _tmp93_; +#line 29179 "Photo.c" } else { #line 4020 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp104_); + _g_object_unref0 (_tmp90_); #line 4020 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp104_ = NULL; -#line 29120 "Photo.c" + _tmp90_ = NULL; +#line 29185 "Photo.c" } #line 4021 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp109_ = new_reader; -#line 4021 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp109_ != NULL) { -#line 29126 "Photo.c" - PhotoFileReader* _tmp110_; - GFile* _tmp111_; + if (new_reader != NULL) { +#line 29189 "Photo.c" + GFile* _tmp95_; #line 4021 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp110_ = new_reader; + _tmp95_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (new_reader, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 4021 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp111_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _g_object_unref0 (_tmp94_); #line 4021 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp108_); -#line 4021 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp108_ = _tmp111_; -#line 29137 "Photo.c" + _tmp94_ = _tmp95_; +#line 29197 "Photo.c" } else { #line 4021 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp108_); + _g_object_unref0 (_tmp94_); #line 4021 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp108_ = NULL; -#line 29143 "Photo.c" + _tmp94_ = NULL; +#line 29203 "Photo.c" } #line 4020 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_editable_replaced (self, _tmp104_, _tmp108_); + photo_notify_editable_replaced (self, _tmp90_, _tmp94_); #line 4018 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp108_); + _g_object_unref0 (_tmp94_); #line 4018 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp104_); -#line 29151 "Photo.c" + _g_object_unref0 (_tmp90_); +#line 29211 "Photo.c" } #line 4024 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp112_ = g_new0 (gchar*, 0 + 1); + _tmp96_ = g_new0 (gchar*, 0 + 1); #line 4024 "/home/jens/Source/shotwell/src/Photo.vala" - alteration_list = _tmp112_; + alteration_list = _tmp96_; #line 4024 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list_length1 = 0; #line 4024 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_list_size_ = alteration_list_length1; #line 4025 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp113_ = timestamp_changed; + _tmp97_ = timestamp_changed; #line 4025 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp113_) { -#line 29165 "Photo.c" - gchar** _tmp114_; - gint _tmp114__length1; - gchar* _tmp115_; - gchar** _tmp116_; - gint _tmp116__length1; - gchar* _tmp117_; - gboolean _tmp118_; + if (_tmp97_) { +#line 29225 "Photo.c" + gchar** _tmp98_; + gint _tmp98__length1; + gchar* _tmp99_; + gchar** _tmp100_; + gint _tmp100__length1; + gchar* _tmp101_; #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp114_ = alteration_list; + _tmp98_ = alteration_list; #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp114__length1 = alteration_list_length1; + _tmp98__length1 = alteration_list_length1; #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp115_ = g_strdup ("metadata:editable-timestamp"); + _tmp99_ = g_strdup ("metadata:editable-timestamp"); #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add107 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp115_); + _vala_array_add107 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp99_); #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp116_ = alteration_list; + _tmp100_ = alteration_list; #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp116__length1 = alteration_list_length1; + _tmp100__length1 = alteration_list_length1; #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp117_ = g_strdup ("metadata:baseline-timestamp"); + _tmp101_ = g_strdup ("metadata:baseline-timestamp"); #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add108 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp117_); + _vala_array_add108 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp101_); #line 4029 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp118_ = photo_is_editable_source (self); -#line 4029 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp118_) { -#line 29193 "Photo.c" - gchar** _tmp119_; - gint _tmp119__length1; - gchar* _tmp120_; + if (photo_is_editable_source (self)) { +#line 29250 "Photo.c" + gchar** _tmp102_; + gint _tmp102__length1; + gchar* _tmp103_; #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp119_ = alteration_list; + _tmp102_ = alteration_list; #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp119__length1 = alteration_list_length1; + _tmp102__length1 = alteration_list_length1; #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp120_ = g_strdup ("metadata:source-timestamp"); + _tmp103_ = g_strdup ("metadata:source-timestamp"); #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add109 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp120_); -#line 29205 "Photo.c" + _vala_array_add109 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp103_); +#line 29262 "Photo.c" } } #line 4033 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp122_ = filesize_changed; + _tmp105_ = filesize_changed; #line 4033 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp122_) { + if (_tmp105_) { #line 4033 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp121_ = TRUE; -#line 29214 "Photo.c" + _tmp104_ = TRUE; +#line 29271 "Photo.c" } else { - PhotoFileReader* _tmp123_; -#line 4033 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp123_ = new_reader; #line 4033 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp121_ = _tmp123_ != NULL; -#line 29221 "Photo.c" + _tmp104_ = new_reader != NULL; +#line 29275 "Photo.c" } #line 4033 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp121_) { -#line 29225 "Photo.c" - gchar** _tmp124_; - gint _tmp124__length1; - gchar* _tmp125_; - gchar** _tmp126_; - gint _tmp126__length1; - gchar* _tmp127_; - gboolean _tmp128_; + if (_tmp104_) { +#line 29279 "Photo.c" + gchar** _tmp106_; + gint _tmp106__length1; + gchar* _tmp107_; + gchar** _tmp108_; + gint _tmp108__length1; + gchar* _tmp109_; #line 4034 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp124_ = alteration_list; + _tmp106_ = alteration_list; #line 4034 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp124__length1 = alteration_list_length1; + _tmp106__length1 = alteration_list_length1; #line 4034 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp125_ = g_strdup ("image:editable"); + _tmp107_ = g_strdup ("image:editable"); #line 4034 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add110 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp125_); + _vala_array_add110 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp107_); #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp126_ = alteration_list; + _tmp108_ = alteration_list; #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp126__length1 = alteration_list_length1; + _tmp108__length1 = alteration_list_length1; #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp127_ = g_strdup ("image:baseline"); + _tmp109_ = g_strdup ("image:baseline"); #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add111 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp127_); -#line 4037 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp128_ = photo_is_editable_source (self); + _vala_array_add111 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp109_); #line 4037 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp128_) { -#line 29253 "Photo.c" - gchar** _tmp129_; - gint _tmp129__length1; - gchar* _tmp130_; + if (photo_is_editable_source (self)) { +#line 29304 "Photo.c" + gchar** _tmp110_; + gint _tmp110__length1; + gchar* _tmp111_; #line 4038 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp129_ = alteration_list; + _tmp110_ = alteration_list; #line 4038 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp129__length1 = alteration_list_length1; + _tmp110__length1 = alteration_list_length1; #line 4038 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp130_ = g_strdup ("image:source"); + _tmp111_ = g_strdup ("image:source"); #line 4038 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add112 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp130_); -#line 29265 "Photo.c" + _vala_array_add112 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp111_); +#line 29316 "Photo.c" } } #line 4041 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp131_ = alteration_list; + _tmp112_ = alteration_list; #line 4041 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp131__length1 = alteration_list_length1; + _tmp112__length1 = alteration_list_length1; #line 4041 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp131__length1 > 0) { -#line 29274 "Photo.c" - gchar** _tmp132_; - gint _tmp132__length1; - Alteration* _tmp133_; - Alteration* _tmp134_; + if (_tmp112__length1 > 0) { +#line 29325 "Photo.c" + gchar** _tmp113_; + gint _tmp113__length1; + Alteration* _tmp114_; + Alteration* _tmp115_; #line 4042 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp132_ = alteration_list; + _tmp113_ = alteration_list; #line 4042 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp132__length1 = alteration_list_length1; + _tmp113__length1 = alteration_list_length1; #line 4042 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp133_ = alteration_new_from_array (_tmp132_, _tmp132__length1); + _tmp114_ = alteration_new_from_array (_tmp113_, _tmp113__length1); #line 4042 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp134_ = _tmp133_; + _tmp115_ = _tmp114_; #line 4042 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp134_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp115_); #line 4042 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp134_); -#line 29291 "Photo.c" + _alteration_unref0 (_tmp115_); +#line 29342 "Photo.c" } #line 3924 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL); @@ -29305,21 +29356,24 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (reader); #line 3924 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 29305 "Photo.c" +#line 29356 "Photo.c" } -static void photo_detach_editable (Photo* self, gboolean delete_editable, gboolean remove_transformations, gboolean notify) { +static void +photo_detach_editable (Photo* self, + gboolean delete_editable, + gboolean remove_transformations, + gboolean notify) +{ gboolean has_editable = FALSE; GFile* editable_file = NULL; gboolean _tmp8_; - gboolean _tmp28_; - gboolean _tmp29_; - gboolean _tmp31_ = FALSE; - gboolean _tmp32_; - gboolean _tmp42_ = FALSE; - gboolean _tmp43_ = FALSE; - gboolean _tmp44_; + gboolean _tmp26_; + gboolean _tmp28_ = FALSE; + gboolean _tmp38_ = FALSE; + gboolean _tmp39_ = FALSE; + gboolean _tmp40_; GError * _inner_error_ = NULL; #line 4045 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -29329,14 +29383,14 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole has_editable = FALSE; #line 4049 "/home/jens/Source/shotwell/src/Photo.vala" editable_file = NULL; -#line 29329 "Photo.c" +#line 29383 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 4050 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 4050 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 29336 "Photo.c" +#line 29390 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -29346,7 +29400,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole _tmp2_ = _tmp1_->editable; #line 4051 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 29346 "Photo.c" +#line 29400 "Photo.c" PhotoBackingReaders* _tmp3_; PhotoFileReader* _tmp4_; GFile* _tmp5_; @@ -29369,7 +29423,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole _tmp6_->editable = NULL; #line 4054 "/home/jens/Source/shotwell/src/Photo.vala" has_editable = TRUE; -#line 29369 "Photo.c" +#line 29423 "Photo.c" } } __finally409: @@ -29379,7 +29433,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole _tmp7_ = self->priv->readers; #line 4050 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 29379 "Photo.c" +#line 29433 "Photo.c" } #line 4050 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -29391,18 +29445,18 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_clear_error (&_inner_error_); #line 4050 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29391 "Photo.c" +#line 29445 "Photo.c" } } #line 4058 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = has_editable; #line 4058 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 29398 "Photo.c" +#line 29452 "Photo.c" BackingPhotoID editable_id = {0}; #line 4059 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_id_init (&editable_id, BACKING_PHOTO_ID_INVALID); -#line 29402 "Photo.c" +#line 29456 "Photo.c" { { PhotoRow* _tmp9_; @@ -29410,14 +29464,13 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole _tmp9_ = self->row; #line 4061 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 29410 "Photo.c" +#line 29464 "Photo.c" { PhotoRow* _tmp10_; BackingPhotoID _tmp11_; - gboolean _tmp12_; - PhotoRow* _tmp16_; + PhotoRow* _tmp15_; + BackingPhotoRow* _tmp16_; BackingPhotoRow* _tmp17_; - BackingPhotoRow* _tmp18_; #line 4062 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->row; #line 4062 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29425,55 +29478,53 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole #line 4062 "/home/jens/Source/shotwell/src/Photo.vala" editable_id = _tmp11_; #line 4063 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = backing_photo_id_is_valid (&editable_id); -#line 4063 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_) { -#line 29428 "Photo.c" + if (backing_photo_id_is_valid (&editable_id)) { +#line 29479 "Photo.c" + PhotoTable* _tmp12_; PhotoTable* _tmp13_; - PhotoTable* _tmp14_; - PhotoRow* _tmp15_; + PhotoRow* _tmp14_; #line 4064 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_table_get_instance (); + _tmp12_ = photo_table_get_instance (); #line 4064 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 4064 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = self->row; + _tmp14_ = self->row; #line 4064 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_detach_editable (_tmp14_, _tmp15_, &_inner_error_); + photo_table_detach_editable (_tmp13_, _tmp14_, &_inner_error_); #line 4064 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp14_); + _database_table_unref0 (_tmp13_); #line 4064 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 29444 "Photo.c" +#line 29495 "Photo.c" goto __finally411; } } #line 4065 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = self->row; + _tmp15_ = self->row; #line 4065 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_->master; + _tmp16_ = _tmp15_->master; #line 4065 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _backing_photo_row_ref0 (_tmp17_); + _tmp17_ = _backing_photo_row_ref0 (_tmp16_); #line 4065 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); #line 4065 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_photo_row = _tmp18_; -#line 29458 "Photo.c" + self->backing_photo_row = _tmp17_; +#line 29509 "Photo.c" } __finally411: { - PhotoRow* _tmp19_; + PhotoRow* _tmp18_; #line 4061 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = self->row; + _tmp18_ = self->row; #line 4061 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 29467 "Photo.c" +#line 29518 "Photo.c" } #line 4061 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 4061 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 29473 "Photo.c" +#line 29524 "Photo.c" goto __catch410_database_error; } #line 4061 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29484,7 +29535,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_clear_error (&_inner_error_); #line 4061 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29484 "Photo.c" +#line 29535 "Photo.c" } } } @@ -29492,21 +29543,21 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole __catch410_database_error: { GError* err = NULL; - GError* _tmp20_; - const gchar* _tmp21_; + GError* _tmp19_; + const gchar* _tmp20_; #line 4060 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 4060 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 4068 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = err; + _tmp19_ = err; #line 4068 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp20_->message; + _tmp20_ = _tmp19_->message; #line 4068 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:4068: Unable to remove editable from PhotoTable: %s", _tmp21_); + g_warning ("Photo.vala:4068: Unable to remove editable from PhotoTable: %s", _tmp20_); #line 4060 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 29506 "Photo.c" +#line 29557 "Photo.c" } __finally410: #line 4060 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29519,33 +29570,30 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_clear_error (&_inner_error_); #line 4060 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29519 "Photo.c" +#line 29570 "Photo.c" } { - gboolean _tmp22_; #line 4072 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = backing_photo_id_is_valid (&editable_id); -#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp22_) { -#line 29527 "Photo.c" - BackingPhotoTable* _tmp23_; - BackingPhotoTable* _tmp24_; - BackingPhotoID _tmp25_; + if (backing_photo_id_is_valid (&editable_id)) { +#line 29575 "Photo.c" + BackingPhotoTable* _tmp21_; + BackingPhotoTable* _tmp22_; + BackingPhotoID _tmp23_; #line 4073 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = backing_photo_table_get_instance (); + _tmp21_ = backing_photo_table_get_instance (); #line 4073 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_; + _tmp22_ = _tmp21_; #line 4073 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = editable_id; + _tmp23_ = editable_id; #line 4073 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_remove (_tmp24_, &_tmp25_, &_inner_error_); + backing_photo_table_remove (_tmp22_, &_tmp23_, &_inner_error_); #line 4073 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp24_); + _database_table_unref0 (_tmp22_); #line 4073 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 4073 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 29545 "Photo.c" +#line 29593 "Photo.c" goto __catch412_database_error; } #line 4073 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29556,7 +29604,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_clear_error (&_inner_error_); #line 4073 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29556 "Photo.c" +#line 29604 "Photo.c" } } } @@ -29564,21 +29612,21 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole __catch412_database_error: { GError* err = NULL; - GError* _tmp26_; - const gchar* _tmp27_; + GError* _tmp24_; + const gchar* _tmp25_; #line 4071 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 4071 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 4075 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = err; + _tmp24_ = err; #line 4075 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_->message; + _tmp25_ = _tmp24_->message; #line 4075 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:4075: Unable to remove editable from BackingPhotoTable: %s", _tmp27_); + g_warning ("Photo.vala:4075: Unable to remove editable from BackingPhotoTable: %s", _tmp25_); #line 4071 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 29578 "Photo.c" +#line 29626 "Photo.c" } __finally412: #line 4071 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29591,59 +29639,55 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_clear_error (&_inner_error_); #line 4071 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29591 "Photo.c" +#line 29639 "Photo.c" } } #line 4079 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = remove_transformations; -#line 4079 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp28_) { + if (remove_transformations) { #line 4080 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 29600 "Photo.c" +#line 29646 "Photo.c" } #line 4082 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = has_editable; + _tmp26_ = has_editable; #line 4082 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp29_) { -#line 29606 "Photo.c" - GFile* _tmp30_; + if (_tmp26_) { +#line 29652 "Photo.c" + GFile* _tmp27_; #line 4083 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_replaced (self); #line 4084 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = editable_file; + _tmp27_ = editable_file; #line 4084 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_editable_replaced (self, _tmp30_, NULL); -#line 29614 "Photo.c" + photo_notify_editable_replaced (self, _tmp27_, NULL); +#line 29660 "Photo.c" } #line 4087 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = delete_editable; + if (delete_editable) { +#line 29664 "Photo.c" + GFile* _tmp29_; #line 4087 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp32_) { -#line 29620 "Photo.c" - GFile* _tmp33_; + _tmp29_ = editable_file; #line 4087 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = editable_file; -#line 4087 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _tmp33_ != NULL; -#line 29626 "Photo.c" + _tmp28_ = _tmp29_ != NULL; +#line 29670 "Photo.c" } else { #line 4087 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = FALSE; -#line 29630 "Photo.c" + _tmp28_ = FALSE; +#line 29674 "Photo.c" } #line 4087 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp31_) { -#line 29634 "Photo.c" + if (_tmp28_) { +#line 29678 "Photo.c" { - GFile* _tmp34_; + GFile* _tmp30_; #line 4089 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = editable_file; + _tmp30_ = editable_file; #line 4089 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_trash (_tmp34_, NULL, &_inner_error_); + g_file_trash (_tmp30_, NULL, &_inner_error_); #line 4089 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 29643 "Photo.c" +#line 29687 "Photo.c" goto __catch413_g_error; } } @@ -29651,40 +29695,40 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole __catch413_g_error: { GError* err = NULL; - GFile* _tmp35_; - gchar* _tmp36_; - gchar* _tmp37_; - gchar* _tmp38_; - gchar* _tmp39_; - GError* _tmp40_; - const gchar* _tmp41_; + GFile* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; + gchar* _tmp34_; + gchar* _tmp35_; + GError* _tmp36_; + const gchar* _tmp37_; #line 4088 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 4088 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 4091 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = editable_file; + _tmp31_ = editable_file; #line 4091 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = g_file_get_path (_tmp35_); + _tmp32_ = g_file_get_path (_tmp31_); #line 4091 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tmp36_; + _tmp33_ = _tmp32_; #line 4091 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp34_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 4091 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = _tmp38_; + _tmp35_ = _tmp34_; #line 4091 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = err; + _tmp36_ = err; #line 4091 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = _tmp40_->message; + _tmp37_ = _tmp36_->message; #line 4091 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:4091: Unable to trash editable %s for %s: %s", _tmp37_, _tmp39_, _tmp41_); + g_warning ("Photo.vala:4091: Unable to trash editable %s for %s: %s", _tmp33_, _tmp35_, _tmp37_); #line 4091 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp39_); + _g_free0 (_tmp35_); #line 4091 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp37_); + _g_free0 (_tmp33_); #line 4088 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 29684 "Photo.c" +#line 29728 "Photo.c" } __finally413: #line 4088 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29697,87 +29741,88 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_clear_error (&_inner_error_); #line 4088 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29697 "Photo.c" +#line 29741 "Photo.c" } } #line 4096 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = has_editable; + _tmp40_ = has_editable; #line 4096 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp44_) { + if (_tmp40_) { #line 4096 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = TRUE; -#line 29706 "Photo.c" + _tmp39_ = TRUE; +#line 29750 "Photo.c" } else { - gboolean _tmp45_; -#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = remove_transformations; #line 4096 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = _tmp45_; -#line 29713 "Photo.c" + _tmp39_ = remove_transformations; +#line 29754 "Photo.c" } #line 4096 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp43_) { -#line 29717 "Photo.c" - gboolean _tmp46_; -#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = notify; + if (_tmp39_) { #line 4096 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _tmp46_; -#line 29723 "Photo.c" + _tmp38_ = notify; +#line 29760 "Photo.c" } else { #line 4096 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = FALSE; -#line 29727 "Photo.c" + _tmp38_ = FALSE; +#line 29764 "Photo.c" } #line 4096 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp42_) { -#line 29731 "Photo.c" - Alteration* _tmp47_; - Alteration* _tmp48_; + if (_tmp38_) { +#line 29768 "Photo.c" + Alteration* _tmp41_; + Alteration* _tmp42_; #line 4097 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = alteration_new ("image", "revert"); + _tmp41_ = alteration_new ("image", "revert"); #line 4097 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = _tmp47_; + _tmp42_ = _tmp41_; #line 4097 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp48_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp42_); #line 4097 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp48_); -#line 29742 "Photo.c" + _alteration_unref0 (_tmp42_); +#line 29779 "Photo.c" } #line 4045 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable_file); -#line 29746 "Photo.c" +#line 29783 "Photo.c" } -static void _photo_on_reimport_editable_one_shot_callback (gpointer self) { +static void +_photo_on_reimport_editable_one_shot_callback (gpointer self) +{ #line 4119 "/home/jens/Source/shotwell/src/Photo.vala" photo_on_reimport_editable ((Photo*) self); -#line 29753 "Photo.c" +#line 29792 "Photo.c" } -static void _photo_on_update_editable_attributes_one_shot_callback (gpointer self) { +static void +_photo_on_update_editable_attributes_one_shot_callback (gpointer self) +{ #line 4128 "/home/jens/Source/shotwell/src/Photo.vala" photo_on_update_editable_attributes ((Photo*) self); -#line 29760 "Photo.c" +#line 29801 "Photo.c" } -static void _photo_on_remove_editable_one_shot_callback (gpointer self) { +static void +_photo_on_remove_editable_one_shot_callback (gpointer self) +{ #line 4137 "/home/jens/Source/shotwell/src/Photo.vala" photo_on_remove_editable ((Photo*) self); -#line 29767 "Photo.c" +#line 29810 "Photo.c" } -static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* other_file, GFileMonitorEvent event) { - GFileMonitorEvent _tmp12_; - GEnumValue* _tmp13_; - GFile* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; - GFileMonitorEvent _tmp17_; +static void +photo_on_editable_file_changed (Photo* self, + GFile* file, + GFile* other_file, + GFileMonitorEvent event) +{ + GEnumValue* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; GError * _inner_error_ = NULL; #line 4100 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -29785,24 +29830,22 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth g_return_if_fail (G_IS_FILE (file)); #line 4100 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((other_file == NULL) || G_IS_FILE (other_file)); -#line 29785 "Photo.c" +#line 29830 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 4102 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 4102 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 29792 "Photo.c" +#line 29837 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; - GFile* _tmp3_; - PhotoBackingReaders* _tmp4_; - PhotoFileReader* _tmp5_; + PhotoBackingReaders* _tmp3_; + PhotoFileReader* _tmp4_; + GFile* _tmp5_; GFile* _tmp6_; - GFile* _tmp7_; - gboolean _tmp8_; - gboolean _tmp9_; + gboolean _tmp7_; #line 4103 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; #line 4103 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29810,45 +29853,41 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth #line 4103 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp2_ != NULL, "readers.editable != null"); #line 4105 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = file; + _tmp3_ = self->priv->readers; #line 4105 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->priv->readers; -#line 4105 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_->editable; + _tmp4_ = _tmp3_->editable; #line 4105 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 4105 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_; + _tmp5_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 4105 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = g_file_equal (_tmp3_, _tmp7_); + _tmp6_ = _tmp5_; #line 4105 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = !_tmp8_; + _tmp7_ = !g_file_equal (file, _tmp6_); #line 4105 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 4105 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp9_) { -#line 29827 "Photo.c" + if (_tmp7_) { +#line 29866 "Photo.c" { - PhotoBackingReaders* _tmp10_; + PhotoBackingReaders* _tmp8_; #line 4102 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = self->priv->readers; + _tmp8_ = self->priv->readers; #line 4102 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 29834 "Photo.c" +#line 29873 "Photo.c" } #line 4109 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29838 "Photo.c" +#line 29877 "Photo.c" } } __finally414: { - PhotoBackingReaders* _tmp11_; + PhotoBackingReaders* _tmp9_; #line 4102 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = self->priv->readers; + _tmp9_ = self->priv->readers; #line 4102 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 29848 "Photo.c" +#line 29887 "Photo.c" } #line 4102 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -29858,130 +29897,126 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth g_clear_error (&_inner_error_); #line 4102 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29858 "Photo.c" +#line 29897 "Photo.c" } } #line 4113 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = event; -#line 4113 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp12_); + _tmp10_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), event); #line 4113 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = file; + _tmp11_ = g_file_get_path (file); #line 4113 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = g_file_get_path (_tmp14_); -#line 4113 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_; + _tmp12_ = _tmp11_; #line 4113 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:4113: EDITABLE %s: %s", (_tmp13_ != NULL) ? _tmp13_->value_name : NULL, _tmp16_); + g_debug ("Photo.vala:4113: EDITABLE %s: %s", (_tmp10_ != NULL) ? _tmp10_->value_name : NULL, _tmp12_); #line 4113 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp16_); -#line 4115 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = event; + _g_free0 (_tmp12_); #line 4115 "/home/jens/Source/shotwell/src/Photo.vala" - switch (_tmp17_) { + switch (event) { #line 4115 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_CHANGED: #line 4115 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_CREATED: -#line 29883 "Photo.c" +#line 29916 "Photo.c" { - OneShotScheduler* _tmp18_; - OneShotScheduler* _tmp20_; + OneShotScheduler* _tmp13_; + OneShotScheduler* _tmp15_; #line 4118 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->priv->reimport_editable_scheduler; + _tmp13_ = self->priv->reimport_editable_scheduler; #line 4118 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp18_ == NULL) { -#line 29891 "Photo.c" - OneShotScheduler* _tmp19_; + if (_tmp13_ == NULL) { +#line 29924 "Photo.c" + OneShotScheduler* _tmp14_; #line 4119 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = one_shot_scheduler_new ("Photo.reimport_editable", _photo_on_reimport_editable_one_shot_callback, self); + _tmp14_ = one_shot_scheduler_new ("Photo.reimport_editable", _photo_on_reimport_editable_one_shot_callback, self); #line 4119 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->reimport_editable_scheduler); #line 4119 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->reimport_editable_scheduler = _tmp19_; -#line 29899 "Photo.c" + self->priv->reimport_editable_scheduler = _tmp14_; +#line 29932 "Photo.c" } #line 4123 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = self->priv->reimport_editable_scheduler; + _tmp15_ = self->priv->reimport_editable_scheduler; #line 4123 "/home/jens/Source/shotwell/src/Photo.vala" - one_shot_scheduler_after_timeout (_tmp20_, (guint) 1000, TRUE); + one_shot_scheduler_after_timeout (_tmp15_, (guint) 1000, TRUE); #line 4124 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 29907 "Photo.c" +#line 29940 "Photo.c" } #line 4115 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED: -#line 29911 "Photo.c" +#line 29944 "Photo.c" { - OneShotScheduler* _tmp21_; - OneShotScheduler* _tmp23_; + OneShotScheduler* _tmp16_; + OneShotScheduler* _tmp18_; #line 4127 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = self->priv->update_editable_attributes_scheduler; + _tmp16_ = self->priv->update_editable_attributes_scheduler; #line 4127 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp21_ == NULL) { -#line 29919 "Photo.c" - OneShotScheduler* _tmp22_; + if (_tmp16_ == NULL) { +#line 29952 "Photo.c" + OneShotScheduler* _tmp17_; #line 4128 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = one_shot_scheduler_new ("Photo.update_editable_attributes", _photo_on_update_editable_attributes_one_shot_callback, self); + _tmp17_ = one_shot_scheduler_new ("Photo.update_editable_attributes", _photo_on_update_editable_attributes_one_shot_callback, self); #line 4128 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->update_editable_attributes_scheduler); #line 4128 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->update_editable_attributes_scheduler = _tmp22_; -#line 29927 "Photo.c" + self->priv->update_editable_attributes_scheduler = _tmp17_; +#line 29960 "Photo.c" } #line 4132 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = self->priv->update_editable_attributes_scheduler; + _tmp18_ = self->priv->update_editable_attributes_scheduler; #line 4132 "/home/jens/Source/shotwell/src/Photo.vala" - one_shot_scheduler_after_timeout (_tmp23_, (guint) 1000, TRUE); + one_shot_scheduler_after_timeout (_tmp18_, (guint) 1000, TRUE); #line 4133 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 29935 "Photo.c" +#line 29968 "Photo.c" } #line 4115 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_DELETED: -#line 29939 "Photo.c" +#line 29972 "Photo.c" { - OneShotScheduler* _tmp24_; - OneShotScheduler* _tmp26_; + OneShotScheduler* _tmp19_; + OneShotScheduler* _tmp21_; #line 4136 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = self->priv->remove_editable_scheduler; + _tmp19_ = self->priv->remove_editable_scheduler; #line 4136 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp24_ == NULL) { -#line 29947 "Photo.c" - OneShotScheduler* _tmp25_; + if (_tmp19_ == NULL) { +#line 29980 "Photo.c" + OneShotScheduler* _tmp20_; #line 4137 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = one_shot_scheduler_new ("Photo.remove_editable", _photo_on_remove_editable_one_shot_callback, self); + _tmp20_ = one_shot_scheduler_new ("Photo.remove_editable", _photo_on_remove_editable_one_shot_callback, self); #line 4137 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->remove_editable_scheduler); #line 4137 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->remove_editable_scheduler = _tmp25_; -#line 29955 "Photo.c" + self->priv->remove_editable_scheduler = _tmp20_; +#line 29988 "Photo.c" } #line 4141 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = self->priv->remove_editable_scheduler; + _tmp21_ = self->priv->remove_editable_scheduler; #line 4141 "/home/jens/Source/shotwell/src/Photo.vala" - one_shot_scheduler_after_timeout (_tmp26_, (guint) 3000, TRUE); + one_shot_scheduler_after_timeout (_tmp21_, (guint) 3000, TRUE); #line 4142 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 29963 "Photo.c" +#line 29996 "Photo.c" } default: #line 4115 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: -#line 29968 "Photo.c" +#line 30001 "Photo.c" { #line 4147 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 29972 "Photo.c" +#line 30005 "Photo.c" } } #line 4152 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_prefetched (self); -#line 29977 "Photo.c" +#line 30010 "Photo.c" } -static void photo_on_reimport_editable (Photo* self) { +static void +photo_on_reimport_editable (Photo* self) +{ gchar* _tmp0_; gchar* _tmp1_; GError * _inner_error_ = NULL; @@ -29997,13 +30032,13 @@ static void photo_on_reimport_editable (Photo* self) { g_debug ("Photo.vala:4159: Reimporting editable for %s", _tmp1_); #line 4159 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp1_); -#line 29997 "Photo.c" +#line 30032 "Photo.c" { #line 4161 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable (self, &_inner_error_); #line 4161 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 30003 "Photo.c" +#line 30038 "Photo.c" goto __catch415_g_error; } } @@ -30034,7 +30069,7 @@ static void photo_on_reimport_editable (Photo* self) { _g_free0 (_tmp3_); #line 4160 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 30033 "Photo.c" +#line 30068 "Photo.c" } __finally415: #line 4160 "/home/jens/Source/shotwell/src/Photo.vala" @@ -30045,12 +30080,14 @@ static void photo_on_reimport_editable (Photo* self) { g_clear_error (&_inner_error_); #line 4160 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 30044 "Photo.c" +#line 30079 "Photo.c" } } -static void photo_on_update_editable_attributes (Photo* self) { +static void +photo_on_update_editable_attributes (Photo* self) +{ gchar* _tmp0_; gchar* _tmp1_; GError * _inner_error_ = NULL; @@ -30064,13 +30101,13 @@ static void photo_on_update_editable_attributes (Photo* self) { g_debug ("Photo.vala:4169: Updating editable attributes for %s", _tmp1_); #line 4169 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp1_); -#line 30063 "Photo.c" +#line 30100 "Photo.c" { #line 4171 "/home/jens/Source/shotwell/src/Photo.vala" photo_update_editable_attributes (self, &_inner_error_); #line 4171 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 30069 "Photo.c" +#line 30106 "Photo.c" goto __catch416_g_error; } } @@ -30092,7 +30129,7 @@ static void photo_on_update_editable_attributes (Photo* self) { g_warning ("Photo.vala:4173: Unable to update editable attributes: %s", _tmp3_); #line 4170 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 30091 "Photo.c" +#line 30128 "Photo.c" } __finally416: #line 4170 "/home/jens/Source/shotwell/src/Photo.vala" @@ -30103,12 +30140,14 @@ static void photo_on_update_editable_attributes (Photo* self) { g_clear_error (&_inner_error_); #line 4170 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 30102 "Photo.c" +#line 30139 "Photo.c" } } -static void photo_on_remove_editable (Photo* self) { +static void +photo_on_remove_editable (Photo* self) +{ PhotoFileReader* reader = NULL; PhotoFileReader* _tmp0_; PhotoFileReader* _tmp1_; @@ -30116,9 +30155,8 @@ static void photo_on_remove_editable (Photo* self) { PhotoFileReader* _tmp2_; GFile* _tmp3_; GFile* _tmp4_; - gboolean _tmp5_; + gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; #line 4177 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 4178 "/home/jens/Source/shotwell/src/Photo.vala" @@ -30133,7 +30171,7 @@ static void photo_on_remove_editable (Photo* self) { _photo_file_adapter_unref0 (reader); #line 4180 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 30132 "Photo.c" +#line 30170 "Photo.c" } #line 4182 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = reader; @@ -30144,53 +30182,53 @@ static void photo_on_remove_editable (Photo* self) { #line 4183 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = file; #line 4183 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = g_file_query_exists (_tmp4_, NULL); -#line 4183 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_) { -#line 30146 "Photo.c" + if (g_file_query_exists (_tmp4_, NULL)) { +#line 30182 "Photo.c" + gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; #line 4184 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 4184 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 4184 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:4184: Not removing editable for %s: file exists", _tmp7_); + g_debug ("Photo.vala:4184: Not removing editable for %s: file exists", _tmp6_); #line 4184 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 4186 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); #line 4186 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); #line 4186 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 30163 "Photo.c" +#line 30199 "Photo.c" } #line 4189 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp7_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 4189 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 4189 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:4189: Removing editable for %s: file no longer exists", _tmp9_); + g_debug ("Photo.vala:4189: Removing editable for %s: file no longer exists", _tmp8_); #line 4189 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp8_); #line 4190 "/home/jens/Source/shotwell/src/Photo.vala" photo_detach_editable (self, FALSE, TRUE, TRUE); #line 4177 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); #line 4177 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 30179 "Photo.c" +#line 30215 "Photo.c" } -void photo_get_original_dimensions (Photo* self, Dimensions* result) { +void +photo_get_original_dimensions (Photo* self, + Dimensions* result) +{ Dimensions dim = {0}; Dimensions _tmp0_ = {0}; Orientation orientation = 0; - Orientation _tmp1_; - Dimensions _tmp2_; - Dimensions _tmp3_ = {0}; + Dimensions _tmp1_; + Dimensions _tmp2_ = {0}; #line 4198 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 4199 "/home/jens/Source/shotwell/src/Photo.vala" @@ -30198,42 +30236,44 @@ void photo_get_original_dimensions (Photo* self, Dimensions* result) { #line 4199 "/home/jens/Source/shotwell/src/Photo.vala" dim = _tmp0_; #line 4200 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_get_orientation (self); -#line 4200 "/home/jens/Source/shotwell/src/Photo.vala" - orientation = _tmp1_; + orientation = photo_get_orientation (self); #line 4202 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = dim; + _tmp1_ = dim; #line 4202 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_rotate_dimensions (orientation, &_tmp2_, &_tmp3_); + orientation_rotate_dimensions (orientation, &_tmp1_, &_tmp2_); #line 4202 "/home/jens/Source/shotwell/src/Photo.vala" - *result = _tmp3_; + *result = _tmp2_; #line 4202 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 30208 "Photo.c" +#line 30244 "Photo.c" } -void photo_get_master_dimensions (Photo* self, Dimensions* result) { - Orientation _tmp0_; +void +photo_get_master_dimensions (Photo* self, + Dimensions* result) +{ + Dimensions _tmp0_ = {0}; Dimensions _tmp1_ = {0}; - Dimensions _tmp2_ = {0}; #line 4206 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 4207 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_get_original_orientation (self); -#line 4207 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_raw_dimensions (self, &_tmp1_); + photo_get_raw_dimensions (self, &_tmp0_); #line 4207 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_rotate_dimensions (_tmp0_, &_tmp1_, &_tmp2_); + orientation_rotate_dimensions (photo_get_original_orientation (self), &_tmp0_, &_tmp1_); #line 4207 "/home/jens/Source/shotwell/src/Photo.vala" - *result = _tmp2_; + *result = _tmp1_; #line 4207 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 30228 "Photo.c" +#line 30264 "Photo.c" } -gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) { +gboolean +photo_get_crop (Photo* self, + Box* crop, + PhotoException exceptions) +{ Box _vala_crop = {0}; gboolean result = FALSE; Box raw = {0}; @@ -30242,9 +30282,6 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) { Dimensions dim = {0}; Dimensions _tmp2_ = {0}; Orientation orientation = 0; - Orientation _tmp3_; - PhotoException _tmp4_; - gboolean _tmp5_; #line 4211 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 4213 "/home/jens/Source/shotwell/src/Photo.vala" @@ -30261,49 +30298,43 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) { if (crop) { #line 4216 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 30260 "Photo.c" +#line 30297 "Photo.c" } #line 4216 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30264 "Photo.c" +#line 30301 "Photo.c" } #line 4219 "/home/jens/Source/shotwell/src/Photo.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP | PHOTO_EXCEPTION_ORIENTATION, &_tmp2_); #line 4219 "/home/jens/Source/shotwell/src/Photo.vala" dim = _tmp2_; #line 4220 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_get_orientation (self); -#line 4220 "/home/jens/Source/shotwell/src/Photo.vala" - orientation = _tmp3_; -#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = exceptions; + orientation = photo_get_orientation (self); #line 4222 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_exception_allows (_tmp4_, PHOTO_EXCEPTION_ORIENTATION); -#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_) { -#line 30280 "Photo.c" - Orientation _tmp6_; - Dimensions _tmp7_; - Box _tmp8_; - Box _tmp9_ = {0}; + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_ORIENTATION)) { +#line 30311 "Photo.c" + Orientation _tmp3_; + Dimensions _tmp4_; + Box _tmp5_; + Box _tmp6_ = {0}; #line 4223 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = orientation; + _tmp3_ = orientation; #line 4223 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = dim; + _tmp4_ = dim; #line 4223 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = raw; + _tmp5_ = raw; #line 4223 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_rotate_box (_tmp6_, &_tmp7_, &_tmp8_, &_tmp9_); + orientation_rotate_box (_tmp3_, &_tmp4_, &_tmp5_, &_tmp6_); #line 4223 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_crop = _tmp9_; -#line 30295 "Photo.c" + _vala_crop = _tmp6_; +#line 30326 "Photo.c" } else { - Box _tmp10_; + Box _tmp7_; #line 4225 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = raw; + _tmp7_ = raw; #line 4225 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_crop = _tmp10_; -#line 30302 "Photo.c" + _vala_crop = _tmp7_; +#line 30333 "Photo.c" } #line 4227 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; @@ -30311,48 +30342,46 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) { if (crop) { #line 4227 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 30310 "Photo.c" +#line 30341 "Photo.c" } #line 4227 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30314 "Photo.c" +#line 30345 "Photo.c" } -void photo_set_crop (Photo* self, Box* crop) { +void +photo_set_crop (Photo* self, + Box* crop) +{ Dimensions dim = {0}; Dimensions _tmp0_ = {0}; Orientation orientation = 0; - Orientation _tmp1_; Box derotated = {0}; - Dimensions _tmp2_; - Box _tmp3_; - Box _tmp4_ = {0}; - Box _tmp5_; - gint _tmp6_; - Dimensions _tmp7_; - gint _tmp8_; + Dimensions _tmp1_; + Box _tmp2_; + Box _tmp3_ = {0}; + Box _tmp4_; + gint _tmp5_; + Dimensions _tmp6_; + gint _tmp7_; + Box _tmp8_; gint _tmp9_; Box _tmp10_; gint _tmp11_; - Box _tmp12_; + Dimensions _tmp12_; gint _tmp13_; - Dimensions _tmp14_; + Box _tmp14_; gint _tmp15_; - gint _tmp16_; - Box _tmp17_; - gint _tmp18_; - Dimensions _tmp19_; - gint _tmp20_; + Dimensions _tmp16_; + gint _tmp17_; + Box _tmp18_; + gint _tmp19_; + Box _tmp20_; gint _tmp21_; - Box _tmp22_; + Dimensions _tmp22_; gint _tmp23_; Box _tmp24_; - gint _tmp25_; - Dimensions _tmp26_; - gint _tmp27_; - gint _tmp28_; - Box _tmp29_; #line 4231 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 4231 "/home/jens/Source/shotwell/src/Photo.vala" @@ -30362,82 +30391,75 @@ void photo_set_crop (Photo* self, Box* crop) { #line 4232 "/home/jens/Source/shotwell/src/Photo.vala" dim = _tmp0_; #line 4233 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_get_orientation (self); -#line 4233 "/home/jens/Source/shotwell/src/Photo.vala" - orientation = _tmp1_; + orientation = photo_get_orientation (self); #line 4235 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = dim; + _tmp1_ = dim; #line 4235 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = *crop; + _tmp2_ = *crop; #line 4235 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_derotate_box (orientation, &_tmp2_, &_tmp3_, &_tmp4_); + orientation_derotate_box (orientation, &_tmp1_, &_tmp2_, &_tmp3_); #line 4235 "/home/jens/Source/shotwell/src/Photo.vala" - derotated = _tmp4_; -#line 4237 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = derotated; + derotated = _tmp3_; #line 4237 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_.left; + _tmp4_ = derotated; #line 4237 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = dim; + _tmp5_ = _tmp4_.left; #line 4237 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_.width; + _tmp6_ = dim; #line 4237 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = CLAMP (_tmp6_, 0, _tmp8_ - 2); + _tmp7_ = _tmp6_.width; #line 4237 "/home/jens/Source/shotwell/src/Photo.vala" - derotated.left = _tmp9_; + derotated.left = CLAMP (_tmp5_, 0, _tmp7_ - 2); #line 4238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = derotated; -#line 4238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_.right; + _tmp8_ = derotated; #line 4238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = derotated; + _tmp9_ = _tmp8_.right; #line 4238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_.left; + _tmp10_ = derotated; #line 4238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = dim; + _tmp11_ = _tmp10_.left; #line 4238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_.width; + _tmp12_ = dim; #line 4238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = CLAMP (_tmp11_, _tmp13_, _tmp15_ - 1); + _tmp13_ = _tmp12_.width; #line 4238 "/home/jens/Source/shotwell/src/Photo.vala" - derotated.right = _tmp16_; + derotated.right = CLAMP (_tmp9_, _tmp11_, _tmp13_ - 1); #line 4240 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = derotated; + _tmp14_ = derotated; #line 4240 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_.top; + _tmp15_ = _tmp14_.top; #line 4240 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = dim; + _tmp16_ = dim; #line 4240 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_.height; + _tmp17_ = _tmp16_.height; #line 4240 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = CLAMP (_tmp18_, 0, _tmp20_ - 2); -#line 4240 "/home/jens/Source/shotwell/src/Photo.vala" - derotated.top = _tmp21_; -#line 4241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = derotated; + derotated.top = CLAMP (_tmp15_, 0, _tmp17_ - 2); #line 4241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _tmp22_.bottom; + _tmp18_ = derotated; #line 4241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = derotated; + _tmp19_ = _tmp18_.bottom; #line 4241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp24_.top; + _tmp20_ = derotated; #line 4241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = dim; + _tmp21_ = _tmp20_.top; #line 4241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_.height; + _tmp22_ = dim; #line 4241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = CLAMP (_tmp23_, _tmp25_, _tmp27_ - 1); + _tmp23_ = _tmp22_.height; #line 4241 "/home/jens/Source/shotwell/src/Photo.vala" - derotated.bottom = _tmp28_; + derotated.bottom = CLAMP (_tmp19_, _tmp21_, _tmp23_ - 1); #line 4243 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = derotated; + _tmp24_ = derotated; #line 4243 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_raw_crop (self, &_tmp29_); -#line 30432 "Photo.c" + photo_set_raw_crop (self, &_tmp24_); +#line 30451 "Photo.c" } -gboolean photo_get_straighten (Photo* self, gdouble* theta) { +gboolean +photo_get_straighten (Photo* self, + gdouble* theta) +{ gdouble _vala_theta = 0.0; gboolean result = FALSE; gdouble _tmp0_ = 0.0; @@ -30456,11 +30478,11 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) { if (theta) { #line 4248 "/home/jens/Source/shotwell/src/Photo.vala" *theta = _vala_theta; -#line 30455 "Photo.c" +#line 30477 "Photo.c" } #line 4248 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30459 "Photo.c" +#line 30481 "Photo.c" } #line 4250 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; @@ -30468,27 +30490,31 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) { if (theta) { #line 4250 "/home/jens/Source/shotwell/src/Photo.vala" *theta = _vala_theta; -#line 30467 "Photo.c" +#line 30489 "Photo.c" } #line 4250 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30471 "Photo.c" +#line 30493 "Photo.c" } -void photo_set_straighten (Photo* self, gdouble theta) { - gdouble _tmp0_; +void +photo_set_straighten (Photo* self, + gdouble theta) +{ #line 4253 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 4254 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = theta; -#line 4254 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_raw_straighten (self, _tmp0_); -#line 30483 "Photo.c" + photo_set_raw_straighten (self, theta); +#line 30505 "Photo.c" } -static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsRedeyeInstance* inst) { +static GdkPixbuf* +photo_do_redeye (Photo* self, + GdkPixbuf* pixbuf, + EditingToolsRedeyeInstance* inst) +{ GdkPixbuf* result = NULL; gdouble r = 0.0; EditingToolsRedeyeInstance _tmp0_; @@ -30501,47 +30527,45 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR gint _x_insets_first_quadrant_size_; gint i = 0; gint x_bounds_min = 0; - EditingToolsRedeyeInstance _tmp22_; - GdkPoint _tmp23_; + EditingToolsRedeyeInstance _tmp20_; + GdkPoint _tmp21_; + gint _tmp22_; + EditingToolsRedeyeInstance _tmp23_; gint _tmp24_; - EditingToolsRedeyeInstance _tmp25_; - gint _tmp26_; gint x_bounds_max = 0; - EditingToolsRedeyeInstance _tmp27_; - GdkPoint _tmp28_; + EditingToolsRedeyeInstance _tmp25_; + GdkPoint _tmp26_; + gint _tmp27_; + EditingToolsRedeyeInstance _tmp28_; gint _tmp29_; - EditingToolsRedeyeInstance _tmp30_; - gint _tmp31_; gint ymin = 0; - EditingToolsRedeyeInstance _tmp32_; - GdkPoint _tmp33_; + EditingToolsRedeyeInstance _tmp30_; + GdkPoint _tmp31_; + gint _tmp32_; + EditingToolsRedeyeInstance _tmp33_; gint _tmp34_; - EditingToolsRedeyeInstance _tmp35_; + gint _tmp35_ = 0; gint _tmp36_; - gint _tmp37_ = 0; - gint _tmp38_; gint ymax = 0; - EditingToolsRedeyeInstance _tmp40_; - GdkPoint _tmp41_; + EditingToolsRedeyeInstance _tmp38_; + GdkPoint _tmp39_; + gint _tmp40_; + gint _tmp41_ = 0; gint _tmp42_; - gint _tmp43_ = 0; + gint _tmp43_; gint _tmp44_; - GdkPixbuf* _tmp45_; - gint _tmp46_; - gint _tmp47_; gint inset_index = 0; - EditingToolsRedeyeInstance _tmp88_; - GdkPoint _tmp89_; - gint _tmp90_; - EditingToolsRedeyeInstance _tmp91_; - GdkPoint _tmp92_; - gint _tmp93_; - EditingToolsRedeyeInstance _tmp94_; - gint _tmp95_; - gint* _tmp96_; - gint _tmp96__length1; - GdkPixbuf* _tmp133_; - GdkPixbuf* _tmp134_; + EditingToolsRedeyeInstance _tmp81_; + GdkPoint _tmp82_; + gint _tmp83_; + EditingToolsRedeyeInstance _tmp84_; + GdkPoint _tmp85_; + gint _tmp86_; + EditingToolsRedeyeInstance _tmp87_; + gint _tmp88_; + gint* _tmp89_; + gint _tmp89__length1; + GdkPixbuf* _tmp123_; #line 4257 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); #line 4257 "/home/jens/Source/shotwell/src/Photo.vala" @@ -30568,7 +30592,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _x_insets_first_quadrant_size_ = x_insets_first_quadrant_length1; #line 4270 "/home/jens/Source/shotwell/src/Photo.vala" i = 0; -#line 30567 "Photo.c" +#line 30591 "Photo.c" { gdouble y = 0.0; gdouble _tmp5_; @@ -30576,40 +30600,38 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _tmp5_ = r; #line 4271 "/home/jens/Source/shotwell/src/Photo.vala" y = _tmp5_; -#line 30575 "Photo.c" +#line 30599 "Photo.c" { gboolean _tmp6_ = FALSE; #line 4271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = TRUE; #line 4271 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 30582 "Photo.c" +#line 30606 "Photo.c" gdouble _tmp8_; gdouble theta = 0.0; gdouble _tmp9_; gdouble _tmp10_; - gdouble _tmp11_; gint x = 0; + gdouble _tmp11_; gdouble _tmp12_; - gdouble _tmp13_; - gdouble _tmp14_; - gint* _tmp15_; - gint _tmp15__length1; + gint* _tmp13_; + gint _tmp13__length1; + gint _tmp14_; + EditingToolsRedeyeInstance _tmp15_; gint _tmp16_; - EditingToolsRedeyeInstance _tmp17_; + gint _tmp17_; gint _tmp18_; gint _tmp19_; - gint _tmp20_; - gint _tmp21_; #line 4271 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp6_) { -#line 30602 "Photo.c" +#line 30624 "Photo.c" gdouble _tmp7_; #line 4271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = y; #line 4271 "/home/jens/Source/shotwell/src/Photo.vala" y = _tmp7_ - 1.0; -#line 30608 "Photo.c" +#line 30630 "Photo.c" } #line 4271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = FALSE; @@ -30619,392 +30641,382 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR if (!(_tmp8_ >= 0.0)) { #line 4271 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 30618 "Photo.c" +#line 30640 "Photo.c" } #line 4272 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = y; #line 4272 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = r; #line 4272 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = asin (_tmp9_ / _tmp10_); -#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" - theta = _tmp11_; + theta = asin (_tmp9_ / _tmp10_); #line 4273 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = r; + _tmp11_ = r; #line 4273 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = theta; + _tmp12_ = theta; #line 4273 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = cos (_tmp13_); -#line 4273 "/home/jens/Source/shotwell/src/Photo.vala" - x = (gint) ((_tmp12_ * _tmp14_) + 0.5); + x = (gint) ((_tmp11_ * cos (_tmp12_)) + 0.5); #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = x_insets_first_quadrant; + _tmp13_ = x_insets_first_quadrant; #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15__length1 = x_insets_first_quadrant_length1; + _tmp13__length1 = x_insets_first_quadrant_length1; #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = i; + _tmp14_ = i; #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = *inst; + _tmp15_ = *inst; #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_.radius; + _tmp16_ = _tmp15_.radius; #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = x; + _tmp17_ = x; #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_[_tmp16_] = _tmp18_ - _tmp19_; + _tmp13_[_tmp14_] = _tmp16_ - _tmp17_; #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp15_[_tmp16_]; + _tmp18_ = _tmp13_[_tmp14_]; #line 4276 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = i; + _tmp19_ = i; #line 4276 "/home/jens/Source/shotwell/src/Photo.vala" - i = _tmp21_ + 1; -#line 30656 "Photo.c" + i = _tmp19_ + 1; +#line 30674 "Photo.c" } } } #line 4279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = *inst; + _tmp20_ = *inst; #line 4279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _tmp22_.center; + _tmp21_ = _tmp20_.center; #line 4279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_.x; + _tmp22_ = _tmp21_.x; #line 4279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = *inst; + _tmp23_ = *inst; #line 4279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp25_.radius; + _tmp24_ = _tmp23_.radius; #line 4279 "/home/jens/Source/shotwell/src/Photo.vala" - x_bounds_min = _tmp24_ - _tmp26_; + x_bounds_min = _tmp22_ - _tmp24_; #line 4280 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = *inst; + _tmp25_ = *inst; #line 4280 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp27_.center; + _tmp26_ = _tmp25_.center; #line 4280 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _tmp28_.x; + _tmp27_ = _tmp26_.x; #line 4280 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = *inst; + _tmp28_ = *inst; #line 4280 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _tmp30_.radius; + _tmp29_ = _tmp28_.radius; #line 4280 "/home/jens/Source/shotwell/src/Photo.vala" - x_bounds_max = _tmp29_ + _tmp31_; + x_bounds_max = _tmp27_ + _tmp29_; #line 4281 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = *inst; + _tmp30_ = *inst; #line 4281 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp32_.center; + _tmp31_ = _tmp30_.center; #line 4281 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp33_.y; + _tmp32_ = _tmp31_.y; #line 4281 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = *inst; + _tmp33_ = *inst; #line 4281 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = _tmp35_.radius; + _tmp34_ = _tmp33_.radius; #line 4281 "/home/jens/Source/shotwell/src/Photo.vala" - ymin = _tmp34_ - _tmp36_; + ymin = _tmp32_ - _tmp34_; #line 4282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = ymin; + _tmp36_ = ymin; #line 4282 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp38_ < 0) { + if (_tmp36_ < 0) { #line 4282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = 0; -#line 30702 "Photo.c" + _tmp35_ = 0; +#line 30720 "Photo.c" } else { - gint _tmp39_; + gint _tmp37_; #line 4282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = ymin; + _tmp37_ = ymin; #line 4282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tmp39_; -#line 30709 "Photo.c" + _tmp35_ = _tmp37_; +#line 30727 "Photo.c" } #line 4282 "/home/jens/Source/shotwell/src/Photo.vala" - ymin = _tmp37_; + ymin = _tmp35_; #line 4283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = *inst; + _tmp38_ = *inst; #line 4283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = _tmp40_.center; + _tmp39_ = _tmp38_.center; #line 4283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _tmp41_.y; + _tmp40_ = _tmp39_.y; #line 4283 "/home/jens/Source/shotwell/src/Photo.vala" - ymax = _tmp42_; -#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = ymax; + ymax = _tmp40_; #line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = pixbuf; + _tmp42_ = ymax; #line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = gdk_pixbuf_get_height (_tmp45_); + _tmp43_ = gdk_pixbuf_get_height (pixbuf); #line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = _tmp46_; -#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp44_ > (_tmp47_ - 1)) { -#line 30731 "Photo.c" - GdkPixbuf* _tmp48_; - gint _tmp49_; - gint _tmp50_; + _tmp44_ = _tmp43_; #line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = pixbuf; + if (_tmp42_ > (_tmp44_ - 1)) { +#line 30747 "Photo.c" + gint _tmp45_; + gint _tmp46_; #line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = gdk_pixbuf_get_height (_tmp48_); + _tmp45_ = gdk_pixbuf_get_height (pixbuf); #line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = _tmp49_; + _tmp46_ = _tmp45_; #line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = _tmp50_ - 1; -#line 30743 "Photo.c" + _tmp41_ = _tmp46_ - 1; +#line 30756 "Photo.c" } else { - gint _tmp51_; + gint _tmp47_; #line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = ymax; + _tmp47_ = ymax; #line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = _tmp51_; -#line 30750 "Photo.c" + _tmp41_ = _tmp47_; +#line 30763 "Photo.c" } #line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - ymax = _tmp43_; + ymax = _tmp41_; #line 4288 "/home/jens/Source/shotwell/src/Photo.vala" inset_index = 0; -#line 30756 "Photo.c" +#line 30769 "Photo.c" { gint y_it = 0; - gint _tmp52_; + gint _tmp48_; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = ymin; + _tmp48_ = ymin; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" - y_it = _tmp52_; -#line 30764 "Photo.c" + y_it = _tmp48_; +#line 30777 "Photo.c" { - gboolean _tmp53_ = FALSE; + gboolean _tmp49_ = FALSE; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = TRUE; + _tmp49_ = TRUE; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 30771 "Photo.c" +#line 30784 "Photo.c" + gint _tmp51_; + gint _tmp52_; + gint xmin = 0; + gint _tmp53_; + gint* _tmp54_; + gint _tmp54__length1; gint _tmp55_; gint _tmp56_; - gint xmin = 0; - gint _tmp57_; - gint* _tmp58_; - gint _tmp58__length1; - gint _tmp59_; + gint _tmp57_ = 0; + gint _tmp58_; + gint xmax = 0; gint _tmp60_; - gint _tmp61_ = 0; + gint* _tmp61_; + gint _tmp61__length1; gint _tmp62_; - gint xmax = 0; - gint _tmp64_; - gint* _tmp65_; - gint _tmp65__length1; + gint _tmp63_; + gint _tmp64_ = 0; + gint _tmp65_; gint _tmp66_; gint _tmp67_; - gint _tmp68_ = 0; - gint _tmp69_; - GdkPixbuf* _tmp70_; - gint _tmp71_; - gint _tmp72_; - gint _tmp87_; + gint _tmp80_; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp53_) { -#line 30796 "Photo.c" - gint _tmp54_; + if (!_tmp49_) { +#line 30808 "Photo.c" + gint _tmp50_; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = y_it; + _tmp50_ = y_it; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" - y_it = _tmp54_ + 1; -#line 30802 "Photo.c" + y_it = _tmp50_ + 1; +#line 30814 "Photo.c" } #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = FALSE; + _tmp49_ = FALSE; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = y_it; + _tmp51_ = y_it; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = ymax; + _tmp52_ = ymax; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" - if (!(_tmp55_ <= _tmp56_)) { + if (!(_tmp51_ <= _tmp52_)) { #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 30814 "Photo.c" +#line 30826 "Photo.c" } #line 4290 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = x_bounds_min; + _tmp53_ = x_bounds_min; #line 4290 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = x_insets_first_quadrant; + _tmp54_ = x_insets_first_quadrant; #line 4290 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58__length1 = x_insets_first_quadrant_length1; + _tmp54__length1 = x_insets_first_quadrant_length1; #line 4290 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = inset_index; + _tmp55_ = inset_index; #line 4290 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = _tmp58_[_tmp59_]; + _tmp56_ = _tmp54_[_tmp55_]; #line 4290 "/home/jens/Source/shotwell/src/Photo.vala" - xmin = _tmp57_ + _tmp60_; + xmin = _tmp53_ + _tmp56_; #line 4291 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = xmin; + _tmp58_ = xmin; #line 4291 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp62_ < 0) { + if (_tmp58_ < 0) { #line 4291 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = 0; -#line 30834 "Photo.c" + _tmp57_ = 0; +#line 30846 "Photo.c" } else { - gint _tmp63_; + gint _tmp59_; #line 4291 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = xmin; + _tmp59_ = xmin; #line 4291 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = _tmp63_; -#line 30841 "Photo.c" + _tmp57_ = _tmp59_; +#line 30853 "Photo.c" } #line 4291 "/home/jens/Source/shotwell/src/Photo.vala" - xmin = _tmp61_; + xmin = _tmp57_; #line 4292 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = x_bounds_max; + _tmp60_ = x_bounds_max; #line 4292 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = x_insets_first_quadrant; + _tmp61_ = x_insets_first_quadrant; #line 4292 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65__length1 = x_insets_first_quadrant_length1; + _tmp61__length1 = x_insets_first_quadrant_length1; #line 4292 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = inset_index; + _tmp62_ = inset_index; #line 4292 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = _tmp65_[_tmp66_]; + _tmp63_ = _tmp61_[_tmp62_]; #line 4292 "/home/jens/Source/shotwell/src/Photo.vala" - xmax = _tmp64_ - _tmp67_; -#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = xmax; + xmax = _tmp60_ - _tmp63_; #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = pixbuf; + _tmp65_ = xmax; #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = gdk_pixbuf_get_width (_tmp70_); + _tmp66_ = gdk_pixbuf_get_width (pixbuf); #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = _tmp71_; -#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp69_ > (_tmp72_ - 1)) { -#line 30867 "Photo.c" - GdkPixbuf* _tmp73_; - gint _tmp74_; - gint _tmp75_; + _tmp67_ = _tmp66_; #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = pixbuf; + if (_tmp65_ > (_tmp67_ - 1)) { +#line 30877 "Photo.c" + gint _tmp68_; + gint _tmp69_; #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = gdk_pixbuf_get_width (_tmp73_); + _tmp68_ = gdk_pixbuf_get_width (pixbuf); #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = _tmp74_; + _tmp69_ = _tmp68_; #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = _tmp75_ - 1; -#line 30879 "Photo.c" + _tmp64_ = _tmp69_ - 1; +#line 30886 "Photo.c" } else { - gint _tmp76_; + gint _tmp70_; #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = xmax; + _tmp70_ = xmax; #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = _tmp76_; -#line 30886 "Photo.c" + _tmp64_ = _tmp70_; +#line 30893 "Photo.c" } #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - xmax = _tmp68_; -#line 30890 "Photo.c" + xmax = _tmp64_; +#line 30897 "Photo.c" { gint x_it = 0; - gint _tmp77_; + gint _tmp71_; #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = xmin; + _tmp71_ = xmin; #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" - x_it = _tmp77_; -#line 30898 "Photo.c" + x_it = _tmp71_; +#line 30905 "Photo.c" { - gboolean _tmp78_ = FALSE; + gboolean _tmp72_ = FALSE; #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = TRUE; + _tmp72_ = TRUE; #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 30905 "Photo.c" - gint _tmp80_; - gint _tmp81_; - GdkPixbuf* _tmp82_; - gint _tmp83_; - gint _tmp84_; - GdkPixbuf* _tmp85_; - GdkPixbuf* _tmp86_; +#line 30912 "Photo.c" + gint _tmp74_; + gint _tmp75_; + gint _tmp76_; + gint _tmp77_; + GdkPixbuf* _tmp78_; + GdkPixbuf* _tmp79_; #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp78_) { -#line 30915 "Photo.c" - gint _tmp79_; + if (!_tmp72_) { +#line 30921 "Photo.c" + gint _tmp73_; #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = x_it; + _tmp73_ = x_it; #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" - x_it = _tmp79_ + 1; -#line 30921 "Photo.c" + x_it = _tmp73_ + 1; +#line 30927 "Photo.c" } #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = FALSE; + _tmp72_ = FALSE; #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = x_it; + _tmp74_ = x_it; #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = xmax; + _tmp75_ = xmax; #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" - if (!(_tmp80_ <= _tmp81_)) { + if (!(_tmp74_ <= _tmp75_)) { #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 30933 "Photo.c" +#line 30939 "Photo.c" } #line 4296 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = pixbuf; -#line 4296 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = x_it; + _tmp76_ = x_it; #line 4296 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = y_it; + _tmp77_ = y_it; #line 4296 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = photo_red_reduce_pixel (self, _tmp82_, _tmp83_, _tmp84_); + _tmp78_ = photo_red_reduce_pixel (self, pixbuf, _tmp76_, _tmp77_); #line 4296 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = _tmp85_; + _tmp79_ = _tmp78_; #line 4296 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp86_); -#line 30947 "Photo.c" + _g_object_unref0 (_tmp79_); +#line 30951 "Photo.c" } } } #line 4298 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = inset_index; + _tmp80_ = inset_index; #line 4298 "/home/jens/Source/shotwell/src/Photo.vala" - inset_index = _tmp87_ + 1; -#line 30955 "Photo.c" + inset_index = _tmp80_ + 1; +#line 30959 "Photo.c" } } } #line 4303 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = *inst; + _tmp81_ = *inst; #line 4303 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = _tmp88_.center; + _tmp82_ = _tmp81_.center; #line 4303 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = _tmp89_.y; + _tmp83_ = _tmp82_.y; #line 4303 "/home/jens/Source/shotwell/src/Photo.vala" - ymin = _tmp90_; + ymin = _tmp83_; #line 4304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = *inst; + _tmp84_ = *inst; #line 4304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = _tmp91_.center; + _tmp85_ = _tmp84_.center; #line 4304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = _tmp92_.y; + _tmp86_ = _tmp85_.y; #line 4304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = *inst; + _tmp87_ = *inst; #line 4304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp95_ = _tmp94_.radius; + _tmp88_ = _tmp87_.radius; #line 4304 "/home/jens/Source/shotwell/src/Photo.vala" - ymax = _tmp93_ + _tmp95_; + ymax = _tmp86_ + _tmp88_; #line 4305 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = x_insets_first_quadrant; + _tmp89_ = x_insets_first_quadrant; #line 4305 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96__length1 = x_insets_first_quadrant_length1; + _tmp89__length1 = x_insets_first_quadrant_length1; #line 4305 "/home/jens/Source/shotwell/src/Photo.vala" - inset_index = _tmp96__length1 - 1; -#line 30985 "Photo.c" + inset_index = _tmp89__length1 - 1; +#line 30989 "Photo.c" { gint y_it = 0; - gint _tmp97_; + gint _tmp90_; #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = ymin; + _tmp90_ = ymin; #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" - y_it = _tmp97_; -#line 30993 "Photo.c" + y_it = _tmp90_; +#line 30997 "Photo.c" { - gboolean _tmp98_ = FALSE; + gboolean _tmp91_ = FALSE; #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = TRUE; + _tmp91_ = TRUE; #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 31000 "Photo.c" - gint _tmp100_; - gint _tmp101_; +#line 31004 "Photo.c" + gint _tmp93_; + gint _tmp94_; gint xmin = 0; + gint _tmp95_; + gint* _tmp96_; + gint _tmp96__length1; + gint _tmp97_; + gint _tmp98_; + gint _tmp99_ = 0; + gint _tmp100_; + gint xmax = 0; gint _tmp102_; gint* _tmp103_; gint _tmp103__length1; @@ -31012,477 +31024,425 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR gint _tmp105_; gint _tmp106_ = 0; gint _tmp107_; - gint xmax = 0; + gint _tmp108_; gint _tmp109_; - gint* _tmp110_; - gint _tmp110__length1; - gint _tmp111_; - gint _tmp112_; - gint _tmp113_ = 0; - gint _tmp114_; - GdkPixbuf* _tmp115_; - gint _tmp116_; - gint _tmp117_; - gint _tmp132_; + gint _tmp122_; #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp98_) { -#line 31025 "Photo.c" - gint _tmp99_; + if (!_tmp91_) { +#line 31028 "Photo.c" + gint _tmp92_; #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp99_ = y_it; + _tmp92_ = y_it; #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" - y_it = _tmp99_ + 1; -#line 31031 "Photo.c" + y_it = _tmp92_ + 1; +#line 31034 "Photo.c" } #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = FALSE; + _tmp91_ = FALSE; #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = y_it; + _tmp93_ = y_it; #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = ymax; + _tmp94_ = ymax; #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" - if (!(_tmp100_ <= _tmp101_)) { + if (!(_tmp93_ <= _tmp94_)) { #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 31043 "Photo.c" +#line 31046 "Photo.c" } #line 4307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp102_ = x_bounds_min; + _tmp95_ = x_bounds_min; #line 4307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp103_ = x_insets_first_quadrant; + _tmp96_ = x_insets_first_quadrant; #line 4307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp103__length1 = x_insets_first_quadrant_length1; + _tmp96__length1 = x_insets_first_quadrant_length1; #line 4307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp104_ = inset_index; + _tmp97_ = inset_index; #line 4307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp105_ = _tmp103_[_tmp104_]; + _tmp98_ = _tmp96_[_tmp97_]; #line 4307 "/home/jens/Source/shotwell/src/Photo.vala" - xmin = _tmp102_ + _tmp105_; + xmin = _tmp95_ + _tmp98_; #line 4308 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp107_ = xmin; + _tmp100_ = xmin; #line 4308 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp107_ < 0) { + if (_tmp100_ < 0) { #line 4308 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp106_ = 0; -#line 31063 "Photo.c" + _tmp99_ = 0; +#line 31066 "Photo.c" } else { - gint _tmp108_; + gint _tmp101_; #line 4308 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp108_ = xmin; + _tmp101_ = xmin; #line 4308 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp106_ = _tmp108_; -#line 31070 "Photo.c" + _tmp99_ = _tmp101_; +#line 31073 "Photo.c" } #line 4308 "/home/jens/Source/shotwell/src/Photo.vala" - xmin = _tmp106_; + xmin = _tmp99_; #line 4309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp109_ = x_bounds_max; + _tmp102_ = x_bounds_max; #line 4309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp110_ = x_insets_first_quadrant; + _tmp103_ = x_insets_first_quadrant; #line 4309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp110__length1 = x_insets_first_quadrant_length1; + _tmp103__length1 = x_insets_first_quadrant_length1; #line 4309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp111_ = inset_index; + _tmp104_ = inset_index; #line 4309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp112_ = _tmp110_[_tmp111_]; + _tmp105_ = _tmp103_[_tmp104_]; #line 4309 "/home/jens/Source/shotwell/src/Photo.vala" - xmax = _tmp109_ - _tmp112_; + xmax = _tmp102_ - _tmp105_; #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp114_ = xmax; + _tmp107_ = xmax; #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp115_ = pixbuf; + _tmp108_ = gdk_pixbuf_get_width (pixbuf); #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp116_ = gdk_pixbuf_get_width (_tmp115_); + _tmp109_ = _tmp108_; #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp117_ = _tmp116_; + if (_tmp107_ > (_tmp109_ - 1)) { +#line 31097 "Photo.c" + gint _tmp110_; + gint _tmp111_; #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp114_ > (_tmp117_ - 1)) { -#line 31096 "Photo.c" - GdkPixbuf* _tmp118_; - gint _tmp119_; - gint _tmp120_; + _tmp110_ = gdk_pixbuf_get_width (pixbuf); #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp118_ = pixbuf; + _tmp111_ = _tmp110_; #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp119_ = gdk_pixbuf_get_width (_tmp118_); -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp120_ = _tmp119_; -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp113_ = _tmp120_ - 1; -#line 31108 "Photo.c" + _tmp106_ = _tmp111_ - 1; +#line 31106 "Photo.c" } else { - gint _tmp121_; + gint _tmp112_; #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp121_ = xmax; + _tmp112_ = xmax; #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp113_ = _tmp121_; -#line 31115 "Photo.c" + _tmp106_ = _tmp112_; +#line 31113 "Photo.c" } #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - xmax = _tmp113_; -#line 31119 "Photo.c" + xmax = _tmp106_; +#line 31117 "Photo.c" { gint x_it = 0; - gint _tmp122_; + gint _tmp113_; #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp122_ = xmin; + _tmp113_ = xmin; #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" - x_it = _tmp122_; -#line 31127 "Photo.c" + x_it = _tmp113_; +#line 31125 "Photo.c" { - gboolean _tmp123_ = FALSE; + gboolean _tmp114_ = FALSE; #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp123_ = TRUE; + _tmp114_ = TRUE; #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 31134 "Photo.c" - gint _tmp125_; - gint _tmp126_; - GdkPixbuf* _tmp127_; - gint _tmp128_; - gint _tmp129_; - GdkPixbuf* _tmp130_; - GdkPixbuf* _tmp131_; +#line 31132 "Photo.c" + gint _tmp116_; + gint _tmp117_; + gint _tmp118_; + gint _tmp119_; + GdkPixbuf* _tmp120_; + GdkPixbuf* _tmp121_; #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp123_) { -#line 31144 "Photo.c" - gint _tmp124_; + if (!_tmp114_) { +#line 31141 "Photo.c" + gint _tmp115_; #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp124_ = x_it; + _tmp115_ = x_it; #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" - x_it = _tmp124_ + 1; -#line 31150 "Photo.c" + x_it = _tmp115_ + 1; +#line 31147 "Photo.c" } #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp123_ = FALSE; + _tmp114_ = FALSE; #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp125_ = x_it; + _tmp116_ = x_it; #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp126_ = xmax; + _tmp117_ = xmax; #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" - if (!(_tmp125_ <= _tmp126_)) { + if (!(_tmp116_ <= _tmp117_)) { #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 31162 "Photo.c" +#line 31159 "Photo.c" } #line 4313 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp127_ = pixbuf; + _tmp118_ = x_it; #line 4313 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp128_ = x_it; + _tmp119_ = y_it; #line 4313 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp129_ = y_it; + _tmp120_ = photo_red_reduce_pixel (self, pixbuf, _tmp118_, _tmp119_); #line 4313 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp130_ = photo_red_reduce_pixel (self, _tmp127_, _tmp128_, _tmp129_); + _tmp121_ = _tmp120_; #line 4313 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp131_ = _tmp130_; -#line 4313 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp131_); -#line 31176 "Photo.c" + _g_object_unref0 (_tmp121_); +#line 31171 "Photo.c" } } } #line 4315 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp132_ = inset_index; + _tmp122_ = inset_index; #line 4315 "/home/jens/Source/shotwell/src/Photo.vala" - inset_index = _tmp132_ - 1; -#line 31184 "Photo.c" + inset_index = _tmp122_ - 1; +#line 31179 "Photo.c" } } } #line 4318 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp133_ = pixbuf; -#line 4318 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp134_ = _g_object_ref0 (_tmp133_); + _tmp123_ = _g_object_ref0 (pixbuf); #line 4318 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp134_; + result = _tmp123_; #line 4318 "/home/jens/Source/shotwell/src/Photo.vala" x_insets_first_quadrant = (g_free (x_insets_first_quadrant), NULL); #line 4318 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31198 "Photo.c" +#line 31191 "Photo.c" } -static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x, gint y) { +static GdkPixbuf* +photo_red_reduce_pixel (Photo* self, + GdkPixbuf* pixbuf, + gint x, + gint y) +{ GdkPixbuf* result = NULL; gint px_start_byte_offset = 0; - gint _tmp0_; - GdkPixbuf* _tmp1_; - gint _tmp2_; - gint _tmp3_; - GdkPixbuf* _tmp4_; - gint _tmp5_; - gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; - gboolean _tmp8_ = FALSE; - gint _tmp9_; - GdkPixbuf* _tmp33_; - GdkPixbuf* _tmp34_; + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; + gboolean _tmp2_ = FALSE; + GdkPixbuf* _tmp20_; #line 4321 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); #line 4321 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL); #line 4322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = y; -#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = pixbuf; -#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gdk_pixbuf_get_rowstride (_tmp1_); -#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = x; -#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = pixbuf; -#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = gdk_pixbuf_get_n_channels (_tmp4_); -#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" - px_start_byte_offset = (_tmp0_ * _tmp2_) + (_tmp3_ * _tmp5_); -#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = x; -#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp9_ >= 0) { -#line 31239 "Photo.c" - gint _tmp10_; + px_start_byte_offset = (y * gdk_pixbuf_get_rowstride (pixbuf)) + (x * gdk_pixbuf_get_n_channels (pixbuf)); #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = y; + if (x >= 0) { #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp10_ >= 0; -#line 31245 "Photo.c" + _tmp2_ = y >= 0; +#line 31217 "Photo.c" } else { #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = FALSE; -#line 31249 "Photo.c" + _tmp2_ = FALSE; +#line 31221 "Photo.c" } #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_) { -#line 31253 "Photo.c" - gint _tmp11_; - GdkPixbuf* _tmp12_; - gint _tmp13_; - gint _tmp14_; -#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = x; -#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = pixbuf; + if (_tmp2_) { +#line 31225 "Photo.c" + gint _tmp3_; + gint _tmp4_; #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = gdk_pixbuf_get_width (_tmp12_); + _tmp3_ = gdk_pixbuf_get_width (pixbuf); #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_; + _tmp4_ = _tmp3_; #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp11_ < _tmp14_; -#line 31268 "Photo.c" + _tmp1_ = x < _tmp4_; +#line 31234 "Photo.c" } else { #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = FALSE; -#line 31272 "Photo.c" + _tmp1_ = FALSE; +#line 31238 "Photo.c" } #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp7_) { -#line 31276 "Photo.c" - gint _tmp15_; - GdkPixbuf* _tmp16_; - gint _tmp17_; - gint _tmp18_; -#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = y; -#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = pixbuf; + if (_tmp1_) { +#line 31242 "Photo.c" + gint _tmp5_; + gint _tmp6_; #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = gdk_pixbuf_get_height (_tmp16_); + _tmp5_ = gdk_pixbuf_get_height (pixbuf); #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_; + _tmp6_ = _tmp5_; #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp15_ < _tmp18_; -#line 31291 "Photo.c" + _tmp0_ = y < _tmp6_; +#line 31251 "Photo.c" } else { #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = FALSE; -#line 31295 "Photo.c" + _tmp0_ = FALSE; +#line 31255 "Photo.c" } #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_) { -#line 31299 "Photo.c" + if (_tmp0_) { +#line 31259 "Photo.c" guchar* pixel_data = NULL; - GdkPixbuf* _tmp19_; - guint8* _tmp20_; + guint8* _tmp7_; gint pixel_data_length1; gint _pixel_data_size_; guchar g = '\0'; - guchar* _tmp21_; - gint _tmp21__length1; - gint _tmp22_; - guchar _tmp23_; + guchar* _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + guchar _tmp10_; guchar b = '\0'; - guchar* _tmp24_; - gint _tmp24__length1; - gint _tmp25_; - guchar _tmp26_; + guchar* _tmp11_; + gint _tmp11__length1; + gint _tmp12_; + guchar _tmp13_; guchar r = '\0'; - guchar _tmp27_; - guchar _tmp28_; - guchar* _tmp29_; - gint _tmp29__length1; - gint _tmp30_; - guchar _tmp31_; - guchar _tmp32_; -#line 4330 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = pixbuf; + guchar _tmp14_; + guchar _tmp15_; + guchar* _tmp16_; + gint _tmp16__length1; + gint _tmp17_; + guchar _tmp18_; + guchar _tmp19_; #line 4330 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = gdk_pixbuf_get_pixels (_tmp19_); + _tmp7_ = gdk_pixbuf_get_pixels (pixbuf); #line 4330 "/home/jens/Source/shotwell/src/Photo.vala" - pixel_data = _tmp20_; + pixel_data = _tmp7_; #line 4330 "/home/jens/Source/shotwell/src/Photo.vala" pixel_data_length1 = -1; #line 4330 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_data_size_ = pixel_data_length1; #line 4340 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = pixel_data; + _tmp8_ = pixel_data; #line 4340 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21__length1 = pixel_data_length1; + _tmp8__length1 = pixel_data_length1; #line 4340 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = px_start_byte_offset; + _tmp9_ = px_start_byte_offset; #line 4340 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _tmp21_[_tmp22_ + 1]; + _tmp10_ = _tmp8_[_tmp9_ + 1]; #line 4340 "/home/jens/Source/shotwell/src/Photo.vala" - g = _tmp23_; + g = _tmp10_; #line 4341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = pixel_data; + _tmp11_ = pixel_data; #line 4341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24__length1 = pixel_data_length1; + _tmp11__length1 = pixel_data_length1; #line 4341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = px_start_byte_offset; + _tmp12_ = px_start_byte_offset; #line 4341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp24_[_tmp25_ + 2]; + _tmp13_ = _tmp11_[_tmp12_ + 2]; #line 4341 "/home/jens/Source/shotwell/src/Photo.vala" - b = _tmp26_; + b = _tmp13_; #line 4343 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = g; + _tmp14_ = g; #line 4343 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = b; + _tmp15_ = b; #line 4343 "/home/jens/Source/shotwell/src/Photo.vala" - r = (guchar) ((_tmp27_ + _tmp28_) / 2); + r = (guchar) ((_tmp14_ + _tmp15_) / 2); #line 4345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = pixel_data; + _tmp16_ = pixel_data; #line 4345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29__length1 = pixel_data_length1; + _tmp16__length1 = pixel_data_length1; #line 4345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = px_start_byte_offset; + _tmp17_ = px_start_byte_offset; #line 4345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = r; + _tmp18_ = r; #line 4345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_[_tmp30_] = _tmp31_; + _tmp16_[_tmp17_] = _tmp18_; #line 4345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _tmp29_[_tmp30_]; -#line 31371 "Photo.c" + _tmp19_ = _tmp16_[_tmp17_]; +#line 31328 "Photo.c" } #line 4348 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = pixbuf; -#line 4348 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _g_object_ref0 (_tmp33_); + _tmp20_ = _g_object_ref0 (pixbuf); #line 4348 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp34_; + result = _tmp20_; #line 4348 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31381 "Photo.c" +#line 31336 "Photo.c" } -void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoint* result) { +void +photo_unscaled_to_raw_point (Photo* self, + GdkPoint* unscaled_point, + GdkPoint* result) +{ Orientation unscaled_orientation = 0; - Orientation _tmp0_; Dimensions unscaled_dims = {0}; - Orientation _tmp1_; + Orientation _tmp0_; + Dimensions _tmp1_ = {0}; Dimensions _tmp2_ = {0}; - Dimensions _tmp3_ = {0}; gint unscaled_x_offset_raw = 0; gint unscaled_y_offset_raw = 0; Box crop_box = {0}; - Box _tmp4_ = {0}; - gboolean _tmp5_; + Box _tmp3_ = {0}; + gboolean _tmp4_; GdkPoint derotated_point = {0}; - Orientation _tmp10_; - Dimensions _tmp11_; - GdkPoint _tmp12_; - GdkPoint _tmp13_ = {0}; + Orientation _tmp9_; + Dimensions _tmp10_; + GdkPoint _tmp11_; + GdkPoint _tmp12_ = {0}; + gint _tmp13_; gint _tmp14_; gint _tmp15_; gint _tmp16_; - gint _tmp17_; #line 4351 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 4351 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (unscaled_point != NULL); #line 4352 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_get_orientation (self); -#line 4352 "/home/jens/Source/shotwell/src/Photo.vala" - unscaled_orientation = _tmp0_; + unscaled_orientation = photo_get_orientation (self); #line 4354 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = unscaled_orientation; + _tmp0_ = unscaled_orientation; #line 4354 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp2_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp1_); #line 4354 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_rotate_dimensions (_tmp1_, &_tmp2_, &_tmp3_); + orientation_rotate_dimensions (_tmp0_, &_tmp1_, &_tmp2_); #line 4354 "/home/jens/Source/shotwell/src/Photo.vala" - unscaled_dims = _tmp3_; + unscaled_dims = _tmp2_; #line 4357 "/home/jens/Source/shotwell/src/Photo.vala" unscaled_x_offset_raw = 0; #line 4358 "/home/jens/Source/shotwell/src/Photo.vala" unscaled_y_offset_raw = 0; #line 4361 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_get_raw_crop (self, &_tmp4_); + _tmp4_ = photo_get_raw_crop (self, &_tmp3_); #line 4361 "/home/jens/Source/shotwell/src/Photo.vala" - crop_box = _tmp4_; + crop_box = _tmp3_; #line 4361 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_) { -#line 31432 "Photo.c" - Box _tmp6_; - gint _tmp7_; - Box _tmp8_; - gint _tmp9_; + if (_tmp4_) { +#line 31388 "Photo.c" + Box _tmp5_; + gint _tmp6_; + Box _tmp7_; + gint _tmp8_; #line 4362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = crop_box; + _tmp5_ = crop_box; #line 4362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_.left; + _tmp6_ = _tmp5_.left; #line 4362 "/home/jens/Source/shotwell/src/Photo.vala" - unscaled_x_offset_raw = _tmp7_; + unscaled_x_offset_raw = _tmp6_; #line 4363 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = crop_box; + _tmp7_ = crop_box; #line 4363 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_.top; + _tmp8_ = _tmp7_.top; #line 4363 "/home/jens/Source/shotwell/src/Photo.vala" - unscaled_y_offset_raw = _tmp9_; -#line 31449 "Photo.c" + unscaled_y_offset_raw = _tmp8_; +#line 31405 "Photo.c" } #line 4366 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = unscaled_orientation; + _tmp9_ = unscaled_orientation; #line 4366 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = unscaled_dims; + _tmp10_ = unscaled_dims; #line 4366 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = *unscaled_point; + _tmp11_ = *unscaled_point; #line 4366 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_derotate_point (_tmp10_, &_tmp11_, &_tmp12_, &_tmp13_); + orientation_derotate_point (_tmp9_, &_tmp10_, &_tmp11_, &_tmp12_); #line 4366 "/home/jens/Source/shotwell/src/Photo.vala" - derotated_point = _tmp13_; + derotated_point = _tmp12_; #line 4370 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = derotated_point.x; + _tmp13_ = derotated_point.x; #line 4370 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = unscaled_x_offset_raw; + _tmp14_ = unscaled_x_offset_raw; #line 4370 "/home/jens/Source/shotwell/src/Photo.vala" - derotated_point.x = _tmp14_ + _tmp15_; + derotated_point.x = _tmp13_ + _tmp14_; #line 4371 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = derotated_point.y; + _tmp15_ = derotated_point.y; #line 4371 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = unscaled_y_offset_raw; + _tmp16_ = unscaled_y_offset_raw; #line 4371 "/home/jens/Source/shotwell/src/Photo.vala" - derotated_point.y = _tmp16_ + _tmp17_; + derotated_point.y = _tmp15_ + _tmp16_; #line 4373 "/home/jens/Source/shotwell/src/Photo.vala" *result = derotated_point; #line 4373 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 31477 "Photo.c" +#line 31433 "Photo.c" } -void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRectangle* result) { +void +photo_unscaled_to_raw_rect (Photo* self, + GdkRectangle* unscaled_rect, + GdkRectangle* result) +{ GdkPoint upper_left = {0}; GdkPoint _tmp0_ = {0}; GdkPoint lower_right = {0}; @@ -31590,7 +31550,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe _tmp21_ = _tmp20_.x; #line 4387 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp19_ > _tmp21_) { -#line 31589 "Photo.c" +#line 31549 "Photo.c" gint temp = 0; GdkPoint _tmp22_; gint _tmp23_; @@ -31613,7 +31573,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe _tmp26_ = temp; #line 4390 "/home/jens/Source/shotwell/src/Photo.vala" lower_right.x = _tmp26_; -#line 31612 "Photo.c" +#line 31572 "Photo.c" } #line 4392 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = upper_left; @@ -31625,7 +31585,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe _tmp30_ = _tmp29_.y; #line 4392 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp28_ > _tmp30_) { -#line 31624 "Photo.c" +#line 31584 "Photo.c" gint temp = 0; GdkPoint _tmp31_; gint _tmp32_; @@ -31648,7 +31608,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe _tmp35_ = temp; #line 4395 "/home/jens/Source/shotwell/src/Photo.vala" lower_right.y = _tmp35_; -#line 31647 "Photo.c" +#line 31607 "Photo.c" } #line 4398 "/home/jens/Source/shotwell/src/Photo.vala" memset (&raw_rect, 0, sizeof (GdkRectangle)); @@ -31688,11 +31648,13 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe *result = raw_rect; #line 4404 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 31687 "Photo.c" +#line 31647 "Photo.c" } -PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { +PixelTransformationBundle* +photo_get_enhance_transformations (Photo* self) +{ PixelTransformationBundle* result = NULL; GdkPixbuf* pixbuf = NULL; PixelTransformationBundle* transformations = NULL; @@ -31703,7 +31665,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { g_return_val_if_fail (IS_PHOTO (self), NULL); #line 4408 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = NULL; -#line 31702 "Photo.c" +#line 31664 "Photo.c" { GdkPixbuf* _tmp0_ = NULL; Scaling _tmp1_ = {0}; @@ -31717,7 +31679,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { _tmp0_ = _tmp2_; #line 4415 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 31716 "Photo.c" +#line 31678 "Photo.c" goto __catch417_g_error; } #line 4415 "/home/jens/Source/shotwell/src/Photo.vala" @@ -31730,7 +31692,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { pixbuf = _tmp3_; #line 4414 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); -#line 31729 "Photo.c" +#line 31691 "Photo.c" } goto __finally417; __catch417_g_error: @@ -31750,7 +31712,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { _g_object_unref0 (pixbuf); #line 4424 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31749 "Photo.c" +#line 31711 "Photo.c" } __finally417: #line 4414 "/home/jens/Source/shotwell/src/Photo.vala" @@ -31763,7 +31725,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { g_clear_error (&_inner_error_); #line 4414 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 31762 "Photo.c" +#line 31724 "Photo.c" } #line 4431 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = pixbuf; @@ -31777,11 +31739,13 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { _g_object_unref0 (pixbuf); #line 4439 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31776 "Photo.c" +#line 31738 "Photo.c" } -gboolean photo_enhance (Photo* self) { +gboolean +photo_enhance (Photo* self) +{ gboolean result = FALSE; PixelTransformationBundle* transformations = NULL; PixelTransformationBundle* _tmp0_; @@ -31803,7 +31767,7 @@ gboolean photo_enhance (Photo* self) { _pixel_transformation_bundle_unref0 (transformations); #line 4446 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31802 "Photo.c" +#line 31766 "Photo.c" } { PhotoRow* _tmp2_; @@ -31811,14 +31775,14 @@ gboolean photo_enhance (Photo* self) { _tmp2_ = self->row; #line 4451 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 31810 "Photo.c" +#line 31774 "Photo.c" { PixelTransformationBundle* _tmp3_; #line 4452 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = transformations; #line 4452 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_color_adjustments (self, _tmp3_); -#line 31817 "Photo.c" +#line 31781 "Photo.c" } __finally418: { @@ -31827,11 +31791,11 @@ gboolean photo_enhance (Photo* self) { _tmp4_ = self->row; #line 4451 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 31826 "Photo.c" +#line 31790 "Photo.c" } #line 4451 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 31830 "Photo.c" +#line 31794 "Photo.c" gboolean _tmp5_ = FALSE; #line 4451 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (transformations); @@ -31841,7 +31805,7 @@ gboolean photo_enhance (Photo* self) { g_clear_error (&_inner_error_); #line 4451 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 31840 "Photo.c" +#line 31804 "Photo.c" } } #line 4459 "/home/jens/Source/shotwell/src/Photo.vala" @@ -31850,11 +31814,13 @@ gboolean photo_enhance (Photo* self) { _pixel_transformation_bundle_unref0 (transformations); #line 4459 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31849 "Photo.c" +#line 31813 "Photo.c" } -gboolean photo_get_develop_raw_photos_to_files (void) { +gboolean +photo_get_develop_raw_photos_to_files (void) +{ gboolean result; gboolean _tmp0_; #line 349 "/home/jens/Source/shotwell/src/Photo.vala" @@ -31863,30 +31829,40 @@ gboolean photo_get_develop_raw_photos_to_files (void) { result = _tmp0_; #line 349 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31862 "Photo.c" +#line 31828 "Photo.c" } -void photo_set_develop_raw_photos_to_files (gboolean value) { - gboolean _tmp0_; -#line 349 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = value; +void +photo_set_develop_raw_photos_to_files (gboolean value) +{ #line 349 "/home/jens/Source/shotwell/src/Photo.vala" - photo__develop_raw_photos_to_files = _tmp0_; -#line 31872 "Photo.c" + photo__develop_raw_photos_to_files = value; +#line 31837 "Photo.c" } -static void photo_real_editable_replaced (Photo* self, GFile* old_file, GFile* new_file) { +static void +photo_real_editable_replaced (Photo* self, + GFile* old_file, + GFile* new_file) +{ #line 358 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file)); #line 358 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file)); -#line 31881 "Photo.c" +#line 31850 "Photo.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2); register GMarshalFunc_VOID__OBJECT_OBJECT callback; register GCClosure * cc; @@ -31901,38 +31877,52 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa data1 = closure->data; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" data2 = param_values->data[0].v_pointer; -#line 31900 "Photo.c" +#line 31876 "Photo.c" } else { #line 161 "/home/jens/Source/shotwell/src/Photo.vala" data1 = param_values->data[0].v_pointer; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" data2 = closure->data; -#line 31906 "Photo.c" +#line 31882 "Photo.c" } #line 161 "/home/jens/Source/shotwell/src/Photo.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 31912 "Photo.c" +#line 31888 "Photo.c" } -static void photo_real_raw_development_modified (Photo* self) { +static void +photo_real_raw_development_modified (Photo* self) +{ } -static void photo_real_baseline_replaced (Photo* self) { +static void +photo_real_baseline_replaced (Photo* self) +{ } -static void photo_real_master_reimported (Photo* self, PhotoMetadata* metadata) { +static void +photo_real_master_reimported (Photo* self, + PhotoMetadata* metadata) +{ #line 376 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 31927 "Photo.c" +#line 31910 "Photo.c" } -static void g_cclosure_user_marshal_VOID__MEDIA_METADATA (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__MEDIA_METADATA (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__MEDIA_METADATA) (gpointer data1, gpointer arg_1, gpointer data2); register GMarshalFunc_VOID__MEDIA_METADATA callback; register GCClosure * cc; @@ -31947,62 +31937,75 @@ static void g_cclosure_user_marshal_VOID__MEDIA_METADATA (GClosure * closure, GV data1 = closure->data; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" data2 = param_values->data[0].v_pointer; -#line 31946 "Photo.c" +#line 31936 "Photo.c" } else { #line 161 "/home/jens/Source/shotwell/src/Photo.vala" data1 = param_values->data[0].v_pointer; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" data2 = closure->data; -#line 31952 "Photo.c" +#line 31942 "Photo.c" } #line 161 "/home/jens/Source/shotwell/src/Photo.vala" callback = (GMarshalFunc_VOID__MEDIA_METADATA) (marshal_data ? marshal_data : cc->callback); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" callback (data1, value_get_media_metadata (param_values + 1), data2); -#line 31958 "Photo.c" +#line 31948 "Photo.c" } -static void photo_real_editable_reimported (Photo* self, PhotoMetadata* metadata) { +static void +photo_real_editable_reimported (Photo* self, + PhotoMetadata* metadata) +{ #line 380 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 31965 "Photo.c" +#line 31958 "Photo.c" } -static void photo_real_baseline_reimported (Photo* self, PhotoMetadata* metadata) { +static void +photo_real_baseline_reimported (Photo* self, + PhotoMetadata* metadata) +{ #line 387 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 31972 "Photo.c" +#line 31968 "Photo.c" } -static void photo_real_source_reimported (Photo* self, PhotoMetadata* metadata) { +static void +photo_real_source_reimported (Photo* self, + PhotoMetadata* metadata) +{ #line 394 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 31979 "Photo.c" +#line 31978 "Photo.c" } -static void _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced (Photo* _sender, gpointer self) { +static void +_photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced (Photo* _sender, + gpointer self) +{ #line 257 "/home/jens/Source/shotwell/src/Photo.vala" photo_photo_transformation_state_impl_on_photo_baseline_replaced ((PhotoPhotoTransformationStateImpl*) self); -#line 31986 "Photo.c" +#line 31988 "Photo.c" } -static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_construct (GType object_type, Photo* photo, Orientation orientation, GeeHashMap* transformations, PixelTransformer* transformer, PixelTransformationBundle* adjustments) { +static PhotoPhotoTransformationStateImpl* +photo_photo_transformation_state_impl_construct (GType object_type, + Photo* photo, + Orientation orientation, + GeeHashMap* transformations, + PixelTransformer* transformer, + PixelTransformationBundle* adjustments) +{ PhotoPhotoTransformationStateImpl * self = NULL; Photo* _tmp0_; - Photo* _tmp1_; - Orientation _tmp2_; - GeeHashMap* _tmp3_; - GeeHashMap* _tmp4_; - PixelTransformer* _tmp5_; - PixelTransformer* _tmp6_; - PixelTransformationBundle* _tmp7_; - PixelTransformationBundle* _tmp8_; - Photo* _tmp9_; + GeeHashMap* _tmp1_; + PixelTransformer* _tmp2_; + PixelTransformationBundle* _tmp3_; #line 244 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); #line 244 "/home/jens/Source/shotwell/src/Photo.vala" @@ -32014,59 +32017,55 @@ static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_ #line 244 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoPhotoTransformationStateImpl*) photo_transformation_state_construct (object_type); #line 247 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo; -#line 247 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (photo); #line 247 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->photo); #line 247 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->photo = _tmp1_; + self->priv->photo = _tmp0_; #line 248 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = orientation; -#line 248 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->orientation = _tmp2_; -#line 249 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = transformations; + self->priv->orientation = orientation; #line 249 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_photo_transformation_state_impl_copy_transformations (_tmp3_); + _tmp1_ = photo_photo_transformation_state_impl_copy_transformations (transformations); #line 249 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->transformations); #line 249 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->transformations = _tmp4_; + self->priv->transformations = _tmp1_; #line 250 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = transformer; -#line 250 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _pixel_transformer_ref0 (_tmp5_); + _tmp2_ = _pixel_transformer_ref0 (transformer); #line 250 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (self->priv->transformer); #line 250 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->transformer = _tmp6_; -#line 251 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = adjustments; + self->priv->transformer = _tmp2_; #line 251 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _pixel_transformation_bundle_ref0 (_tmp7_); + _tmp3_ = _pixel_transformation_bundle_ref0 (adjustments); #line 251 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); #line 251 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->adjustments = _tmp8_; + self->priv->adjustments = _tmp3_; #line 253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo; -#line 253 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_connect_object (_tmp9_, "baseline-replaced", (GCallback) _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced, self, 0); + g_signal_connect_object (photo, "baseline-replaced", (GCallback) _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced, self, 0); #line 244 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 32054 "Photo.c" +#line 32045 "Photo.c" } -static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_new (Photo* photo, Orientation orientation, GeeHashMap* transformations, PixelTransformer* transformer, PixelTransformationBundle* adjustments) { +static PhotoPhotoTransformationStateImpl* +photo_photo_transformation_state_impl_new (Photo* photo, + Orientation orientation, + GeeHashMap* transformations, + PixelTransformer* transformer, + PixelTransformationBundle* adjustments) +{ #line 244 "/home/jens/Source/shotwell/src/Photo.vala" return photo_photo_transformation_state_impl_construct (PHOTO_TYPE_PHOTO_TRANSFORMATION_STATE_IMPL, photo, orientation, transformations, transformer, adjustments); -#line 32061 "Photo.c" +#line 32058 "Photo.c" } -static Orientation photo_photo_transformation_state_impl_get_orientation (PhotoPhotoTransformationStateImpl* self) { +static Orientation +photo_photo_transformation_state_impl_get_orientation (PhotoPhotoTransformationStateImpl* self) +{ Orientation result = 0; Orientation _tmp0_; #line 260 "/home/jens/Source/shotwell/src/Photo.vala" @@ -32077,11 +32076,13 @@ static Orientation photo_photo_transformation_state_impl_get_orientation (PhotoP result = _tmp0_; #line 261 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 32076 "Photo.c" +#line 32075 "Photo.c" } -static GeeHashMap* photo_photo_transformation_state_impl_get_transformations (PhotoPhotoTransformationStateImpl* self) { +static GeeHashMap* +photo_photo_transformation_state_impl_get_transformations (PhotoPhotoTransformationStateImpl* self) +{ GeeHashMap* result = NULL; GeeHashMap* _tmp0_; GeeHashMap* _tmp1_; @@ -32095,11 +32096,13 @@ static GeeHashMap* photo_photo_transformation_state_impl_get_transformations (Ph result = _tmp1_; #line 265 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 32094 "Photo.c" +#line 32095 "Photo.c" } -static PixelTransformer* photo_photo_transformation_state_impl_get_transformer (PhotoPhotoTransformationStateImpl* self) { +static PixelTransformer* +photo_photo_transformation_state_impl_get_transformer (PhotoPhotoTransformationStateImpl* self) +{ PixelTransformer* result = NULL; PixelTransformer* _tmp0_ = NULL; PixelTransformer* _tmp1_; @@ -32109,7 +32112,7 @@ static PixelTransformer* photo_photo_transformation_state_impl_get_transformer ( _tmp1_ = self->priv->transformer; #line 269 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ != NULL) { -#line 32108 "Photo.c" +#line 32111 "Photo.c" PixelTransformer* _tmp2_; PixelTransformer* _tmp3_; #line 269 "/home/jens/Source/shotwell/src/Photo.vala" @@ -32120,23 +32123,25 @@ static PixelTransformer* photo_photo_transformation_state_impl_get_transformer ( _pixel_transformer_unref0 (_tmp0_); #line 269 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_; -#line 32119 "Photo.c" +#line 32122 "Photo.c" } else { #line 269 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (_tmp0_); #line 269 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 32125 "Photo.c" +#line 32128 "Photo.c" } #line 269 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 269 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 32131 "Photo.c" +#line 32134 "Photo.c" } -static PixelTransformationBundle* photo_photo_transformation_state_impl_get_color_adjustments (PhotoPhotoTransformationStateImpl* self) { +static PixelTransformationBundle* +photo_photo_transformation_state_impl_get_color_adjustments (PhotoPhotoTransformationStateImpl* self) +{ PixelTransformationBundle* result = NULL; PixelTransformationBundle* _tmp0_ = NULL; PixelTransformationBundle* _tmp1_; @@ -32146,7 +32151,7 @@ static PixelTransformationBundle* photo_photo_transformation_state_impl_get_colo _tmp1_ = self->priv->adjustments; #line 273 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ != NULL) { -#line 32145 "Photo.c" +#line 32150 "Photo.c" PixelTransformationBundle* _tmp2_; PixelTransformationBundle* _tmp3_; #line 273 "/home/jens/Source/shotwell/src/Photo.vala" @@ -32157,172 +32162,167 @@ static PixelTransformationBundle* photo_photo_transformation_state_impl_get_colo _pixel_transformation_bundle_unref0 (_tmp0_); #line 273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_; -#line 32156 "Photo.c" +#line 32161 "Photo.c" } else { #line 273 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (_tmp0_); #line 273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 32162 "Photo.c" +#line 32167 "Photo.c" } #line 273 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 273 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 32168 "Photo.c" +#line 32173 "Photo.c" } -static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (GeeHashMap* original) { +static GeeHashMap* +photo_photo_transformation_state_impl_copy_transformations (GeeHashMap* original) +{ GeeHashMap* result = NULL; - GeeHashMap* _tmp0_; GeeHashMap* clone = NULL; - GeeHashMap* _tmp1_; + GeeHashMap* _tmp0_; #line 276 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((original == NULL) || GEE_IS_HASH_MAP (original), NULL); #line 278 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = original; -#line 278 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_ == NULL) { + if (original == NULL) { #line 279 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; #line 279 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 32187 "Photo.c" +#line 32191 "Photo.c" } #line 281 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 281 "/home/jens/Source/shotwell/src/Photo.vala" - clone = _tmp1_; -#line 32193 "Photo.c" + clone = _tmp0_; +#line 32197 "Photo.c" { GeeIterator* _object_it = NULL; - GeeHashMap* _tmp2_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; GeeSet* _tmp3_; - GeeSet* _tmp4_; - GeeSet* _tmp5_; - GeeIterator* _tmp6_; - GeeIterator* _tmp7_; -#line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = original; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (original, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp3_); #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _object_it = _tmp7_; + _object_it = _tmp5_; #line 282 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 32220 "Photo.c" - GeeIterator* _tmp8_; - gboolean _tmp9_; +#line 32221 "Photo.c" + GeeIterator* _tmp6_; gchar* object = NULL; - GeeIterator* _tmp10_; - gpointer _tmp11_; - GeeHashMap* _tmp12_; - const gchar* _tmp13_; - GeeHashMap* _tmp14_; - const gchar* _tmp15_; - gpointer _tmp16_; - KeyValueMap* _tmp17_; - KeyValueMap* _tmp18_; - KeyValueMap* _tmp19_; -#line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _object_it; + GeeIterator* _tmp7_; + gpointer _tmp8_; + GeeHashMap* _tmp9_; + const gchar* _tmp10_; + const gchar* _tmp11_; + gpointer _tmp12_; + KeyValueMap* _tmp13_; + KeyValueMap* _tmp14_; + KeyValueMap* _tmp15_; #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = gee_iterator_next (_tmp8_); + _tmp6_ = _object_it; #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp9_) { + if (!gee_iterator_next (_tmp6_)) { #line 282 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 32242 "Photo.c" +#line 32239 "Photo.c" } #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _object_it; + _tmp7_ = _object_it; #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = gee_iterator_get (_tmp10_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - object = (gchar*) _tmp11_; -#line 283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = clone; + object = (gchar*) _tmp8_; #line 283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = object; + _tmp9_ = clone; #line 283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = original; + _tmp10_ = object; #line 283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = object; + _tmp11_ = object; #line 283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_); + _tmp12_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (original, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_); #line 283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = (KeyValueMap*) _tmp16_; + _tmp13_ = (KeyValueMap*) _tmp12_; #line 283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = key_value_map_copy (_tmp17_); + _tmp14_ = key_value_map_copy (_tmp13_); #line 283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_; + _tmp15_ = _tmp14_; #line 283 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, _tmp19_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_, _tmp15_); #line 283 "/home/jens/Source/shotwell/src/Photo.vala" - _key_value_map_unref0 (_tmp19_); + _key_value_map_unref0 (_tmp15_); #line 283 "/home/jens/Source/shotwell/src/Photo.vala" - _key_value_map_unref0 (_tmp17_); + _key_value_map_unref0 (_tmp13_); #line 282 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (object); -#line 32274 "Photo.c" +#line 32269 "Photo.c" } #line 282 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_object_it); -#line 32278 "Photo.c" +#line 32273 "Photo.c" } #line 285 "/home/jens/Source/shotwell/src/Photo.vala" result = clone; #line 285 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 32284 "Photo.c" +#line 32279 "Photo.c" } -static void photo_photo_transformation_state_impl_on_photo_baseline_replaced (PhotoPhotoTransformationStateImpl* self) { - gboolean _tmp0_; +static void +photo_photo_transformation_state_impl_on_photo_baseline_replaced (PhotoPhotoTransformationStateImpl* self) +{ #line 288 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_PHOTO_TRANSFORMATION_STATE_IMPL (self)); #line 289 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_transformation_state_is_broken (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState)); -#line 289 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp0_) { + if (!photo_transformation_state_is_broken (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState))) { #line 290 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState), photo_transformation_state_signals[PHOTO_TRANSFORMATION_STATE_BROKEN_SIGNAL], 0); -#line 32298 "Photo.c" +#line 32292 "Photo.c" } } -static void photo_photo_transformation_state_impl_class_init (PhotoPhotoTransformationStateImplClass * klass) { +static void +photo_photo_transformation_state_impl_class_init (PhotoPhotoTransformationStateImplClass * klass) +{ #line 237 "/home/jens/Source/shotwell/src/Photo.vala" photo_photo_transformation_state_impl_parent_class = g_type_class_peek_parent (klass); #line 237 "/home/jens/Source/shotwell/src/Photo.vala" g_type_class_add_private (klass, sizeof (PhotoPhotoTransformationStateImplPrivate)); #line 237 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (klass)->finalize = photo_photo_transformation_state_impl_finalize; -#line 32310 "Photo.c" +#line 32306 "Photo.c" } -static void photo_photo_transformation_state_impl_instance_init (PhotoPhotoTransformationStateImpl * self) { +static void +photo_photo_transformation_state_impl_instance_init (PhotoPhotoTransformationStateImpl * self) +{ #line 237 "/home/jens/Source/shotwell/src/Photo.vala" self->priv = PHOTO_PHOTO_TRANSFORMATION_STATE_IMPL_GET_PRIVATE (self); -#line 32317 "Photo.c" +#line 32315 "Photo.c" } -static void photo_photo_transformation_state_impl_finalize (GObject * obj) { +static void +photo_photo_transformation_state_impl_finalize (GObject * obj) +{ PhotoPhotoTransformationStateImpl * self; Photo* _tmp0_; guint _tmp1_; @@ -32348,7 +32348,9 @@ static void photo_photo_transformation_state_impl_finalize (GObject * obj) { } -static GType photo_photo_transformation_state_impl_get_type (void) { +static GType +photo_photo_transformation_state_impl_get_type (void) +{ static volatile gsize photo_photo_transformation_state_impl_type_id__volatile = 0; if (g_once_init_enter (&photo_photo_transformation_state_impl_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoPhotoTransformationStateImplClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_photo_transformation_state_impl_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoPhotoTransformationStateImpl), 0, (GInstanceInitFunc) photo_photo_transformation_state_impl_instance_init, NULL }; @@ -32360,121 +32362,150 @@ static GType photo_photo_transformation_state_impl_get_type (void) { } -static PhotoBackingReaders* photo_backing_readers_construct (GType object_type) { +static PhotoBackingReaders* +photo_backing_readers_construct (GType object_type) +{ PhotoBackingReaders* self = NULL; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoBackingReaders*) g_type_create_instance (object_type); #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 32365 "Photo.c" +#line 32369 "Photo.c" } -static PhotoBackingReaders* photo_backing_readers_new (void) { +static PhotoBackingReaders* +photo_backing_readers_new (void) +{ #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return photo_backing_readers_construct (PHOTO_TYPE_BACKING_READERS); -#line 32372 "Photo.c" +#line 32378 "Photo.c" } -static void photo_value_backing_readers_init (GValue* value) { +static void +photo_value_backing_readers_init (GValue* value) +{ #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32379 "Photo.c" +#line 32387 "Photo.c" } -static void photo_value_backing_readers_free_value (GValue* value) { +static void +photo_value_backing_readers_free_value (GValue* value) +{ #line 294 "/home/jens/Source/shotwell/src/Photo.vala" if (value->data[0].v_pointer) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" photo_backing_readers_unref (value->data[0].v_pointer); -#line 32388 "Photo.c" +#line 32398 "Photo.c" } } -static void photo_value_backing_readers_copy_value (const GValue* src_value, GValue* dest_value) { +static void +photo_value_backing_readers_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 294 "/home/jens/Source/shotwell/src/Photo.vala" if (src_value->data[0].v_pointer) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_backing_readers_ref (src_value->data[0].v_pointer); -#line 32398 "Photo.c" +#line 32411 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 32402 "Photo.c" +#line 32415 "Photo.c" } } -static gpointer photo_value_backing_readers_peek_pointer (const GValue* value) { +static gpointer +photo_value_backing_readers_peek_pointer (const GValue* value) +{ #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 32410 "Photo.c" +#line 32425 "Photo.c" } -static gchar* photo_value_backing_readers_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +photo_value_backing_readers_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 294 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 32417 "Photo.c" +#line 32437 "Photo.c" PhotoBackingReaders * object; object = collect_values[0].v_pointer; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32424 "Photo.c" +#line 32444 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32428 "Photo.c" +#line 32448 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_backing_readers_ref (object); -#line 32432 "Photo.c" +#line 32452 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32436 "Photo.c" +#line 32456 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32440 "Photo.c" +#line 32460 "Photo.c" } -static gchar* photo_value_backing_readers_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +photo_value_backing_readers_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoBackingReaders ** object_p; object_p = collect_values[0].v_pointer; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" if (!object_p) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 32451 "Photo.c" +#line 32476 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 32457 "Photo.c" +#line 32482 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 32461 "Photo.c" +#line 32486 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_backing_readers_ref (value->data[0].v_pointer); -#line 32465 "Photo.c" +#line 32490 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32469 "Photo.c" +#line 32494 "Photo.c" } -static GParamSpec* photo_param_spec_backing_readers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +static GParamSpec* +photo_param_spec_backing_readers (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ PhotoParamSpecBackingReaders* spec; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (g_type_is_a (object_type, PHOTO_TYPE_BACKING_READERS), NULL); @@ -32484,20 +32515,25 @@ static GParamSpec* photo_param_spec_backing_readers (const gchar* name, const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 32483 "Photo.c" +#line 32514 "Photo.c" } -static gpointer photo_value_get_backing_readers (const GValue* value) { +static gpointer +photo_value_get_backing_readers (const GValue* value) +{ #line 294 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_BACKING_READERS), NULL); #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 32492 "Photo.c" +#line 32525 "Photo.c" } -static void photo_value_set_backing_readers (GValue* value, gpointer v_object) { +static void +photo_value_set_backing_readers (GValue* value, + gpointer v_object) +{ PhotoBackingReaders * old; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_BACKING_READERS)); @@ -32513,22 +32549,25 @@ static void photo_value_set_backing_readers (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" photo_backing_readers_ref (value->data[0].v_pointer); -#line 32512 "Photo.c" +#line 32548 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32516 "Photo.c" +#line 32552 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" photo_backing_readers_unref (old); -#line 32522 "Photo.c" +#line 32558 "Photo.c" } } -static void photo_value_take_backing_readers (GValue* value, gpointer v_object) { +static void +photo_value_take_backing_readers (GValue* value, + gpointer v_object) +{ PhotoBackingReaders * old; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_BACKING_READERS)); @@ -32542,38 +32581,44 @@ static void photo_value_take_backing_readers (GValue* value, gpointer v_object) g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 32541 "Photo.c" +#line 32580 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32545 "Photo.c" +#line 32584 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" photo_backing_readers_unref (old); -#line 32551 "Photo.c" +#line 32590 "Photo.c" } } -static void photo_backing_readers_class_init (PhotoBackingReadersClass * klass) { +static void +photo_backing_readers_class_init (PhotoBackingReadersClass * klass) +{ #line 294 "/home/jens/Source/shotwell/src/Photo.vala" photo_backing_readers_parent_class = g_type_class_peek_parent (klass); #line 294 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoBackingReadersClass *) klass)->finalize = photo_backing_readers_finalize; -#line 32561 "Photo.c" +#line 32602 "Photo.c" } -static void photo_backing_readers_instance_init (PhotoBackingReaders * self) { +static void +photo_backing_readers_instance_init (PhotoBackingReaders * self) +{ #line 294 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 32568 "Photo.c" +#line 32611 "Photo.c" } -static void photo_backing_readers_finalize (PhotoBackingReaders * obj) { +static void +photo_backing_readers_finalize (PhotoBackingReaders * obj) +{ PhotoBackingReaders * self; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_BACKING_READERS, PhotoBackingReaders); @@ -32585,11 +32630,13 @@ static void photo_backing_readers_finalize (PhotoBackingReaders * obj) { _photo_file_adapter_unref0 (self->developer); #line 297 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (self->editable); -#line 32584 "Photo.c" +#line 32629 "Photo.c" } -static GType photo_backing_readers_get_type (void) { +static GType +photo_backing_readers_get_type (void) +{ static volatile gsize photo_backing_readers_type_id__volatile = 0; if (g_once_init_enter (&photo_backing_readers_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { photo_value_backing_readers_init, photo_value_backing_readers_free_value, photo_value_backing_readers_copy_value, photo_value_backing_readers_peek_pointer, "p", photo_value_backing_readers_collect_value, "p", photo_value_backing_readers_lcopy_value }; @@ -32603,18 +32650,22 @@ static GType photo_backing_readers_get_type (void) { } -static gpointer photo_backing_readers_ref (gpointer instance) { +static gpointer +photo_backing_readers_ref (gpointer instance) +{ PhotoBackingReaders * self; self = instance; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 32609 "Photo.c" +#line 32658 "Photo.c" } -static void photo_backing_readers_unref (gpointer instance) { +static void +photo_backing_readers_unref (gpointer instance) +{ PhotoBackingReaders * self; self = instance; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" @@ -32623,17 +32674,19 @@ static void photo_backing_readers_unref (gpointer instance) { PHOTO_BACKING_READERS_GET_CLASS (self)->finalize (self); #line 294 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 32622 "Photo.c" +#line 32673 "Photo.c" } } -static PhotoCachedPixbuf* photo_cached_pixbuf_construct (GType object_type, Photo* photo, GdkPixbuf* pixbuf) { +static PhotoCachedPixbuf* +photo_cached_pixbuf_construct (GType object_type, + Photo* photo, + GdkPixbuf* pixbuf) +{ PhotoCachedPixbuf* self = NULL; Photo* _tmp0_; - Photo* _tmp1_; - GdkPixbuf* _tmp2_; - GdkPixbuf* _tmp3_; + GdkPixbuf* _tmp1_; #line 305 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); #line 305 "/home/jens/Source/shotwell/src/Photo.vala" @@ -32641,132 +32694,156 @@ static PhotoCachedPixbuf* photo_cached_pixbuf_construct (GType object_type, Phot #line 305 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoCachedPixbuf*) g_type_create_instance (object_type); #line 306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo; -#line 306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (photo); #line 306 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->photo); #line 306 "/home/jens/Source/shotwell/src/Photo.vala" - self->photo = _tmp1_; + self->photo = _tmp0_; #line 307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = pixbuf; -#line 307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (pixbuf); #line 307 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->pixbuf); #line 307 "/home/jens/Source/shotwell/src/Photo.vala" - self->pixbuf = _tmp3_; + self->pixbuf = _tmp1_; #line 305 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 32657 "Photo.c" +#line 32706 "Photo.c" } -static PhotoCachedPixbuf* photo_cached_pixbuf_new (Photo* photo, GdkPixbuf* pixbuf) { +static PhotoCachedPixbuf* +photo_cached_pixbuf_new (Photo* photo, + GdkPixbuf* pixbuf) +{ #line 305 "/home/jens/Source/shotwell/src/Photo.vala" return photo_cached_pixbuf_construct (PHOTO_TYPE_CACHED_PIXBUF, photo, pixbuf); -#line 32664 "Photo.c" +#line 32716 "Photo.c" } -static void photo_value_cached_pixbuf_init (GValue* value) { +static void +photo_value_cached_pixbuf_init (GValue* value) +{ #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32671 "Photo.c" +#line 32725 "Photo.c" } -static void photo_value_cached_pixbuf_free_value (GValue* value) { +static void +photo_value_cached_pixbuf_free_value (GValue* value) +{ #line 300 "/home/jens/Source/shotwell/src/Photo.vala" if (value->data[0].v_pointer) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" photo_cached_pixbuf_unref (value->data[0].v_pointer); -#line 32680 "Photo.c" +#line 32736 "Photo.c" } } -static void photo_value_cached_pixbuf_copy_value (const GValue* src_value, GValue* dest_value) { +static void +photo_value_cached_pixbuf_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 300 "/home/jens/Source/shotwell/src/Photo.vala" if (src_value->data[0].v_pointer) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_cached_pixbuf_ref (src_value->data[0].v_pointer); -#line 32690 "Photo.c" +#line 32749 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 32694 "Photo.c" +#line 32753 "Photo.c" } } -static gpointer photo_value_cached_pixbuf_peek_pointer (const GValue* value) { +static gpointer +photo_value_cached_pixbuf_peek_pointer (const GValue* value) +{ #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 32702 "Photo.c" +#line 32763 "Photo.c" } -static gchar* photo_value_cached_pixbuf_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +photo_value_cached_pixbuf_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 300 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 32709 "Photo.c" +#line 32775 "Photo.c" PhotoCachedPixbuf * object; object = collect_values[0].v_pointer; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32716 "Photo.c" +#line 32782 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32720 "Photo.c" +#line 32786 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_cached_pixbuf_ref (object); -#line 32724 "Photo.c" +#line 32790 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32728 "Photo.c" +#line 32794 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32732 "Photo.c" +#line 32798 "Photo.c" } -static gchar* photo_value_cached_pixbuf_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +photo_value_cached_pixbuf_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoCachedPixbuf ** object_p; object_p = collect_values[0].v_pointer; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" if (!object_p) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 32743 "Photo.c" +#line 32814 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 32749 "Photo.c" +#line 32820 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 32753 "Photo.c" +#line 32824 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_cached_pixbuf_ref (value->data[0].v_pointer); -#line 32757 "Photo.c" +#line 32828 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32761 "Photo.c" +#line 32832 "Photo.c" } -static GParamSpec* photo_param_spec_cached_pixbuf (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +static GParamSpec* +photo_param_spec_cached_pixbuf (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ PhotoParamSpecCachedPixbuf* spec; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (g_type_is_a (object_type, PHOTO_TYPE_CACHED_PIXBUF), NULL); @@ -32776,20 +32853,25 @@ static GParamSpec* photo_param_spec_cached_pixbuf (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 32775 "Photo.c" +#line 32852 "Photo.c" } -static gpointer photo_value_get_cached_pixbuf (const GValue* value) { +static gpointer +photo_value_get_cached_pixbuf (const GValue* value) +{ #line 300 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_CACHED_PIXBUF), NULL); #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 32784 "Photo.c" +#line 32863 "Photo.c" } -static void photo_value_set_cached_pixbuf (GValue* value, gpointer v_object) { +static void +photo_value_set_cached_pixbuf (GValue* value, + gpointer v_object) +{ PhotoCachedPixbuf * old; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_CACHED_PIXBUF)); @@ -32805,22 +32887,25 @@ static void photo_value_set_cached_pixbuf (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" photo_cached_pixbuf_ref (value->data[0].v_pointer); -#line 32804 "Photo.c" +#line 32886 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32808 "Photo.c" +#line 32890 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" photo_cached_pixbuf_unref (old); -#line 32814 "Photo.c" +#line 32896 "Photo.c" } } -static void photo_value_take_cached_pixbuf (GValue* value, gpointer v_object) { +static void +photo_value_take_cached_pixbuf (GValue* value, + gpointer v_object) +{ PhotoCachedPixbuf * old; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_CACHED_PIXBUF)); @@ -32834,31 +32919,35 @@ static void photo_value_take_cached_pixbuf (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 32833 "Photo.c" +#line 32918 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32837 "Photo.c" +#line 32922 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" photo_cached_pixbuf_unref (old); -#line 32843 "Photo.c" +#line 32928 "Photo.c" } } -static void photo_cached_pixbuf_class_init (PhotoCachedPixbufClass * klass) { +static void +photo_cached_pixbuf_class_init (PhotoCachedPixbufClass * klass) +{ #line 300 "/home/jens/Source/shotwell/src/Photo.vala" photo_cached_pixbuf_parent_class = g_type_class_peek_parent (klass); #line 300 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoCachedPixbufClass *) klass)->finalize = photo_cached_pixbuf_finalize; -#line 32853 "Photo.c" +#line 32940 "Photo.c" } -static void photo_cached_pixbuf_instance_init (PhotoCachedPixbuf * self) { +static void +photo_cached_pixbuf_instance_init (PhotoCachedPixbuf * self) +{ GTimer* _tmp0_; #line 303 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = g_timer_new (); @@ -32866,11 +32955,13 @@ static void photo_cached_pixbuf_instance_init (PhotoCachedPixbuf * self) { self->last_touched = _tmp0_; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 32865 "Photo.c" +#line 32954 "Photo.c" } -static void photo_cached_pixbuf_finalize (PhotoCachedPixbuf * obj) { +static void +photo_cached_pixbuf_finalize (PhotoCachedPixbuf * obj) +{ PhotoCachedPixbuf * self; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_CACHED_PIXBUF, PhotoCachedPixbuf); @@ -32882,11 +32973,13 @@ static void photo_cached_pixbuf_finalize (PhotoCachedPixbuf * obj) { _g_object_unref0 (self->pixbuf); #line 303 "/home/jens/Source/shotwell/src/Photo.vala" _g_timer_destroy0 (self->last_touched); -#line 32881 "Photo.c" +#line 32972 "Photo.c" } -static GType photo_cached_pixbuf_get_type (void) { +static GType +photo_cached_pixbuf_get_type (void) +{ static volatile gsize photo_cached_pixbuf_type_id__volatile = 0; if (g_once_init_enter (&photo_cached_pixbuf_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { photo_value_cached_pixbuf_init, photo_value_cached_pixbuf_free_value, photo_value_cached_pixbuf_copy_value, photo_value_cached_pixbuf_peek_pointer, "p", photo_value_cached_pixbuf_collect_value, "p", photo_value_cached_pixbuf_lcopy_value }; @@ -32900,18 +32993,22 @@ static GType photo_cached_pixbuf_get_type (void) { } -static gpointer photo_cached_pixbuf_ref (gpointer instance) { +static gpointer +photo_cached_pixbuf_ref (gpointer instance) +{ PhotoCachedPixbuf * self; self = instance; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 32906 "Photo.c" +#line 33001 "Photo.c" } -static void photo_cached_pixbuf_unref (gpointer instance) { +static void +photo_cached_pixbuf_unref (gpointer instance) +{ PhotoCachedPixbuf * self; self = instance; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" @@ -32920,119 +33017,146 @@ static void photo_cached_pixbuf_unref (gpointer instance) { PHOTO_CACHED_PIXBUF_GET_CLASS (self)->finalize (self); #line 300 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 32919 "Photo.c" +#line 33016 "Photo.c" } } -PhotoReimportMasterState* photo_reimport_master_state_construct (GType object_type) { +PhotoReimportMasterState* +photo_reimport_master_state_construct (GType object_type) +{ PhotoReimportMasterState* self = NULL; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportMasterState*) g_type_create_instance (object_type); #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 32930 "Photo.c" +#line 33029 "Photo.c" } -static void photo_value_reimport_master_state_init (GValue* value) { +static void +photo_value_reimport_master_state_init (GValue* value) +{ #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32937 "Photo.c" +#line 33038 "Photo.c" } -static void photo_value_reimport_master_state_free_value (GValue* value) { +static void +photo_value_reimport_master_state_free_value (GValue* value) +{ #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (value->data[0].v_pointer) { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_unref (value->data[0].v_pointer); -#line 32946 "Photo.c" +#line 33049 "Photo.c" } } -static void photo_value_reimport_master_state_copy_value (const GValue* src_value, GValue* dest_value) { +static void +photo_value_reimport_master_state_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (src_value->data[0].v_pointer) { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_reimport_master_state_ref (src_value->data[0].v_pointer); -#line 32956 "Photo.c" +#line 33062 "Photo.c" } else { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 32960 "Photo.c" +#line 33066 "Photo.c" } } -static gpointer photo_value_reimport_master_state_peek_pointer (const GValue* value) { +static gpointer +photo_value_reimport_master_state_peek_pointer (const GValue* value) +{ #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 32968 "Photo.c" +#line 33076 "Photo.c" } -static gchar* photo_value_reimport_master_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +photo_value_reimport_master_state_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 32975 "Photo.c" +#line 33088 "Photo.c" PhotoReimportMasterState * object; object = collect_values[0].v_pointer; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32982 "Photo.c" +#line 33095 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32986 "Photo.c" +#line 33099 "Photo.c" } #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_reimport_master_state_ref (object); -#line 32990 "Photo.c" +#line 33103 "Photo.c" } else { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32994 "Photo.c" +#line 33107 "Photo.c" } #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32998 "Photo.c" +#line 33111 "Photo.c" } -static gchar* photo_value_reimport_master_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +photo_value_reimport_master_state_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoReimportMasterState ** object_p; object_p = collect_values[0].v_pointer; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (!object_p) { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 33009 "Photo.c" +#line 33127 "Photo.c" } #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 33015 "Photo.c" +#line 33133 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 33019 "Photo.c" +#line 33137 "Photo.c" } else { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_reimport_master_state_ref (value->data[0].v_pointer); -#line 33023 "Photo.c" +#line 33141 "Photo.c" } #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33027 "Photo.c" +#line 33145 "Photo.c" } -GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +photo_param_spec_reimport_master_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ PhotoParamSpecReimportMasterState* spec; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (g_type_is_a (object_type, PHOTO_TYPE_REIMPORT_MASTER_STATE), NULL); @@ -33042,20 +33166,25 @@ GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, const gch G_PARAM_SPEC (spec)->value_type = object_type; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 33041 "Photo.c" +#line 33165 "Photo.c" } -gpointer photo_value_get_reimport_master_state (const GValue* value) { +gpointer +photo_value_get_reimport_master_state (const GValue* value) +{ #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE), NULL); #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33050 "Photo.c" +#line 33176 "Photo.c" } -void photo_value_set_reimport_master_state (GValue* value, gpointer v_object) { +void +photo_value_set_reimport_master_state (GValue* value, + gpointer v_object) +{ PhotoReimportMasterState * old; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE)); @@ -33071,22 +33200,25 @@ void photo_value_set_reimport_master_state (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_ref (value->data[0].v_pointer); -#line 33070 "Photo.c" +#line 33199 "Photo.c" } else { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33074 "Photo.c" +#line 33203 "Photo.c" } #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_unref (old); -#line 33080 "Photo.c" +#line 33209 "Photo.c" } } -void photo_value_take_reimport_master_state (GValue* value, gpointer v_object) { +void +photo_value_take_reimport_master_state (GValue* value, + gpointer v_object) +{ PhotoReimportMasterState * old; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE)); @@ -33100,48 +33232,56 @@ void photo_value_take_reimport_master_state (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 33099 "Photo.c" +#line 33231 "Photo.c" } else { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33103 "Photo.c" +#line 33235 "Photo.c" } #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_unref (old); -#line 33109 "Photo.c" +#line 33241 "Photo.c" } } -static void photo_reimport_master_state_class_init (PhotoReimportMasterStateClass * klass) { +static void +photo_reimport_master_state_class_init (PhotoReimportMasterStateClass * klass) +{ #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_parent_class = g_type_class_peek_parent (klass); #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_finalize; -#line 33119 "Photo.c" +#line 33253 "Photo.c" } -static void photo_reimport_master_state_instance_init (PhotoReimportMasterState * self) { +static void +photo_reimport_master_state_instance_init (PhotoReimportMasterState * self) +{ #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 33126 "Photo.c" +#line 33262 "Photo.c" } -static void photo_reimport_master_state_finalize (PhotoReimportMasterState * obj) { +static void +photo_reimport_master_state_finalize (PhotoReimportMasterState * obj) +{ PhotoReimportMasterState * self; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState); #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_destroy (self); -#line 33136 "Photo.c" +#line 33274 "Photo.c" } -GType photo_reimport_master_state_get_type (void) { +GType +photo_reimport_master_state_get_type (void) +{ static volatile gsize photo_reimport_master_state_type_id__volatile = 0; if (g_once_init_enter (&photo_reimport_master_state_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { photo_value_reimport_master_state_init, photo_value_reimport_master_state_free_value, photo_value_reimport_master_state_copy_value, photo_value_reimport_master_state_peek_pointer, "p", photo_value_reimport_master_state_collect_value, "p", photo_value_reimport_master_state_lcopy_value }; @@ -33155,18 +33295,22 @@ GType photo_reimport_master_state_get_type (void) { } -gpointer photo_reimport_master_state_ref (gpointer instance) { +gpointer +photo_reimport_master_state_ref (gpointer instance) +{ PhotoReimportMasterState * self; self = instance; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 33161 "Photo.c" +#line 33303 "Photo.c" } -void photo_reimport_master_state_unref (gpointer instance) { +void +photo_reimport_master_state_unref (gpointer instance) +{ PhotoReimportMasterState * self; self = instance; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" @@ -33175,42 +33319,47 @@ void photo_reimport_master_state_unref (gpointer instance) { PHOTO_REIMPORT_MASTER_STATE_GET_CLASS (self)->finalize (self); #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 33174 "Photo.c" +#line 33318 "Photo.c" } } -static gchar** _vala_array_dup24 (gchar** self, int length) { +static gchar** +_vala_array_dup24 (gchar** self, + int length) +{ gchar** result; int i; #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" result = g_new0 (gchar*, length + 1); #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" for (i = 0; i < length; i++) { -#line 33186 "Photo.c" +#line 33333 "Photo.c" gchar* _tmp0_; #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = g_strdup (self[i]); #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" result[i] = _tmp0_; -#line 33192 "Photo.c" +#line 33339 "Photo.c" } #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 33196 "Photo.c" +#line 33343 "Photo.c" } -static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct (GType object_type, PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1) { +static PhotoReimportMasterStateImpl* +photo_reimport_master_state_impl_construct (GType object_type, + PhotoRow* row, + PhotoMetadata* metadata, + gchar** alterations, + int alterations_length1) +{ PhotoReimportMasterStateImpl* self = NULL; PhotoRow* _tmp0_; - PhotoRow* _tmp1_; - PhotoMetadata* _tmp2_; - PhotoMetadata* _tmp3_; - gchar** _tmp4_; - gint _tmp4__length1; - gchar** _tmp5_; - gint _tmp5__length1; + PhotoMetadata* _tmp1_; + gchar** _tmp2_; + gint _tmp2__length1; #line 1378 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_ROW (row), NULL); #line 1378 "/home/jens/Source/shotwell/src/Photo.vala" @@ -33218,60 +33367,61 @@ static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct #line 1378 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportMasterStateImpl*) photo_reimport_master_state_construct (object_type); #line 1379 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = row; -#line 1379 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _photo_row_ref0 (_tmp0_); + _tmp0_ = _photo_row_ref0 (row); #line 1379 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (self->row); #line 1379 "/home/jens/Source/shotwell/src/Photo.vala" - self->row = _tmp1_; -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = metadata; + self->row = _tmp0_; #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _media_metadata_ref0 (_tmp2_); + _tmp1_ = _media_metadata_ref0 (metadata); #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" - self->metadata = _tmp3_; -#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = alterations; -#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4__length1 = alterations_length1; + self->metadata = _tmp1_; #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = (_tmp4_ != NULL) ? _vala_array_dup24 (_tmp4_, _tmp4__length1) : ((gpointer) _tmp4_); + _tmp2_ = (alterations != NULL) ? _vala_array_dup24 (alterations, alterations_length1) : ((gpointer) alterations); #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5__length1 = _tmp4__length1; + _tmp2__length1 = alterations_length1; #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" self->alterations = (_vala_array_free (self->alterations, self->alterations_length1, (GDestroyNotify) g_free), NULL); #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" - self->alterations = _tmp5_; + self->alterations = _tmp2_; #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" - self->alterations_length1 = _tmp5__length1; + self->alterations_length1 = _tmp2__length1; #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" self->_alterations_size_ = self->alterations_length1; #line 1378 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33250 "Photo.c" +#line 33391 "Photo.c" } -static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1) { +static PhotoReimportMasterStateImpl* +photo_reimport_master_state_impl_new (PhotoRow* row, + PhotoMetadata* metadata, + gchar** alterations, + int alterations_length1) +{ #line 1378 "/home/jens/Source/shotwell/src/Photo.vala" return photo_reimport_master_state_impl_construct (PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, row, metadata, alterations, alterations_length1); -#line 33257 "Photo.c" +#line 33403 "Photo.c" } -static void photo_reimport_master_state_impl_class_init (PhotoReimportMasterStateImplClass * klass) { +static void +photo_reimport_master_state_impl_class_init (PhotoReimportMasterStateImplClass * klass) +{ #line 1372 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_impl_parent_class = g_type_class_peek_parent (klass); #line 1372 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_impl_finalize; -#line 33266 "Photo.c" +#line 33414 "Photo.c" } -static void photo_reimport_master_state_impl_instance_init (PhotoReimportMasterStateImpl * self) { +static void +photo_reimport_master_state_impl_instance_init (PhotoReimportMasterStateImpl * self) +{ PhotoRow* _tmp0_; #line 1373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_row_new (); @@ -33279,11 +33429,13 @@ static void photo_reimport_master_state_impl_instance_init (PhotoReimportMasterS self->row = _tmp0_; #line 1376 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata_only = FALSE; -#line 33278 "Photo.c" +#line 33428 "Photo.c" } -static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState * obj) { +static void +photo_reimport_master_state_impl_finalize (PhotoReimportMasterState * obj) +{ PhotoReimportMasterStateImpl * self; #line 1372 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl); @@ -33295,11 +33447,13 @@ static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState self->alterations = (_vala_array_free (self->alterations, self->alterations_length1, (GDestroyNotify) g_free), NULL); #line 1372 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_MASTER_STATE_CLASS (photo_reimport_master_state_impl_parent_class)->finalize (obj); -#line 33294 "Photo.c" +#line 33446 "Photo.c" } -static GType photo_reimport_master_state_impl_get_type (void) { +static GType +photo_reimport_master_state_impl_get_type (void) +{ static volatile gsize photo_reimport_master_state_impl_type_id__volatile = 0; if (g_once_init_enter (&photo_reimport_master_state_impl_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoReimportMasterStateImplClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_reimport_master_state_impl_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoReimportMasterStateImpl), 0, (GInstanceInitFunc) photo_reimport_master_state_impl_instance_init, NULL }; @@ -33311,114 +33465,141 @@ static GType photo_reimport_master_state_impl_get_type (void) { } -PhotoReimportEditableState* photo_reimport_editable_state_construct (GType object_type) { +PhotoReimportEditableState* +photo_reimport_editable_state_construct (GType object_type) +{ PhotoReimportEditableState* self = NULL; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportEditableState*) g_type_create_instance (object_type); #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33316 "Photo.c" +#line 33472 "Photo.c" } -static void photo_value_reimport_editable_state_init (GValue* value) { +static void +photo_value_reimport_editable_state_init (GValue* value) +{ #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33323 "Photo.c" +#line 33481 "Photo.c" } -static void photo_value_reimport_editable_state_free_value (GValue* value) { +static void +photo_value_reimport_editable_state_free_value (GValue* value) +{ #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (value->data[0].v_pointer) { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_unref (value->data[0].v_pointer); -#line 33332 "Photo.c" +#line 33492 "Photo.c" } } -static void photo_value_reimport_editable_state_copy_value (const GValue* src_value, GValue* dest_value) { +static void +photo_value_reimport_editable_state_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (src_value->data[0].v_pointer) { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_reimport_editable_state_ref (src_value->data[0].v_pointer); -#line 33342 "Photo.c" +#line 33505 "Photo.c" } else { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 33346 "Photo.c" +#line 33509 "Photo.c" } } -static gpointer photo_value_reimport_editable_state_peek_pointer (const GValue* value) { +static gpointer +photo_value_reimport_editable_state_peek_pointer (const GValue* value) +{ #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33354 "Photo.c" +#line 33519 "Photo.c" } -static gchar* photo_value_reimport_editable_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +photo_value_reimport_editable_state_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 33361 "Photo.c" +#line 33531 "Photo.c" PhotoReimportEditableState * object; object = collect_values[0].v_pointer; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33368 "Photo.c" +#line 33538 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33372 "Photo.c" +#line 33542 "Photo.c" } #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_reimport_editable_state_ref (object); -#line 33376 "Photo.c" +#line 33546 "Photo.c" } else { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33380 "Photo.c" +#line 33550 "Photo.c" } #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33384 "Photo.c" +#line 33554 "Photo.c" } -static gchar* photo_value_reimport_editable_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +photo_value_reimport_editable_state_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoReimportEditableState ** object_p; object_p = collect_values[0].v_pointer; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (!object_p) { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 33395 "Photo.c" +#line 33570 "Photo.c" } #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 33401 "Photo.c" +#line 33576 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 33405 "Photo.c" +#line 33580 "Photo.c" } else { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_reimport_editable_state_ref (value->data[0].v_pointer); -#line 33409 "Photo.c" +#line 33584 "Photo.c" } #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33413 "Photo.c" +#line 33588 "Photo.c" } -GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +photo_param_spec_reimport_editable_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ PhotoParamSpecReimportEditableState* spec; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (g_type_is_a (object_type, PHOTO_TYPE_REIMPORT_EDITABLE_STATE), NULL); @@ -33428,20 +33609,25 @@ GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, const g G_PARAM_SPEC (spec)->value_type = object_type; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 33427 "Photo.c" +#line 33608 "Photo.c" } -gpointer photo_value_get_reimport_editable_state (const GValue* value) { +gpointer +photo_value_get_reimport_editable_state (const GValue* value) +{ #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE), NULL); #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33436 "Photo.c" +#line 33619 "Photo.c" } -void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object) { +void +photo_value_set_reimport_editable_state (GValue* value, + gpointer v_object) +{ PhotoReimportEditableState * old; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE)); @@ -33457,22 +33643,25 @@ void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object) value->data[0].v_pointer = v_object; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_ref (value->data[0].v_pointer); -#line 33456 "Photo.c" +#line 33642 "Photo.c" } else { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33460 "Photo.c" +#line 33646 "Photo.c" } #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_unref (old); -#line 33466 "Photo.c" +#line 33652 "Photo.c" } } -void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object) { +void +photo_value_take_reimport_editable_state (GValue* value, + gpointer v_object) +{ PhotoReimportEditableState * old; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE)); @@ -33486,48 +33675,56 @@ void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object) g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 33485 "Photo.c" +#line 33674 "Photo.c" } else { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33489 "Photo.c" +#line 33678 "Photo.c" } #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_unref (old); -#line 33495 "Photo.c" +#line 33684 "Photo.c" } } -static void photo_reimport_editable_state_class_init (PhotoReimportEditableStateClass * klass) { +static void +photo_reimport_editable_state_class_init (PhotoReimportEditableStateClass * klass) +{ #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_parent_class = g_type_class_peek_parent (klass); #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_finalize; -#line 33505 "Photo.c" +#line 33696 "Photo.c" } -static void photo_reimport_editable_state_instance_init (PhotoReimportEditableState * self) { +static void +photo_reimport_editable_state_instance_init (PhotoReimportEditableState * self) +{ #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 33512 "Photo.c" +#line 33705 "Photo.c" } -static void photo_reimport_editable_state_finalize (PhotoReimportEditableState * obj) { +static void +photo_reimport_editable_state_finalize (PhotoReimportEditableState * obj) +{ PhotoReimportEditableState * self; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState); #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_destroy (self); -#line 33522 "Photo.c" +#line 33717 "Photo.c" } -GType photo_reimport_editable_state_get_type (void) { +GType +photo_reimport_editable_state_get_type (void) +{ static volatile gsize photo_reimport_editable_state_type_id__volatile = 0; if (g_once_init_enter (&photo_reimport_editable_state_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { photo_value_reimport_editable_state_init, photo_value_reimport_editable_state_free_value, photo_value_reimport_editable_state_copy_value, photo_value_reimport_editable_state_peek_pointer, "p", photo_value_reimport_editable_state_collect_value, "p", photo_value_reimport_editable_state_lcopy_value }; @@ -33541,18 +33738,22 @@ GType photo_reimport_editable_state_get_type (void) { } -gpointer photo_reimport_editable_state_ref (gpointer instance) { +gpointer +photo_reimport_editable_state_ref (gpointer instance) +{ PhotoReimportEditableState * self; self = instance; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 33547 "Photo.c" +#line 33746 "Photo.c" } -void photo_reimport_editable_state_unref (gpointer instance) { +void +photo_reimport_editable_state_unref (gpointer instance) +{ PhotoReimportEditableState * self; self = instance; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" @@ -33561,17 +33762,19 @@ void photo_reimport_editable_state_unref (gpointer instance) { PHOTO_REIMPORT_EDITABLE_STATE_GET_CLASS (self)->finalize (self); #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 33560 "Photo.c" +#line 33761 "Photo.c" } } -static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_construct (GType object_type, BackingPhotoRow* backing_state, PhotoMetadata* metadata) { +static PhotoReimportEditableStateImpl* +photo_reimport_editable_state_impl_construct (GType object_type, + BackingPhotoRow* backing_state, + PhotoMetadata* metadata) +{ PhotoReimportEditableStateImpl* self = NULL; BackingPhotoRow* _tmp0_; - BackingPhotoRow* _tmp1_; - PhotoMetadata* _tmp2_; - PhotoMetadata* _tmp3_; + PhotoMetadata* _tmp1_; #line 1393 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_BACKING_PHOTO_ROW (backing_state), NULL); #line 1393 "/home/jens/Source/shotwell/src/Photo.vala" @@ -33579,44 +33782,47 @@ static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_constr #line 1393 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportEditableStateImpl*) photo_reimport_editable_state_construct (object_type); #line 1394 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = backing_state; -#line 1394 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _backing_photo_row_ref0 (_tmp0_); + _tmp0_ = _backing_photo_row_ref0 (backing_state); #line 1394 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_state); #line 1394 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_state = _tmp1_; -#line 1395 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = metadata; + self->backing_state = _tmp0_; #line 1395 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _media_metadata_ref0 (_tmp2_); + _tmp1_ = _media_metadata_ref0 (metadata); #line 1395 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); #line 1395 "/home/jens/Source/shotwell/src/Photo.vala" - self->metadata = _tmp3_; + self->metadata = _tmp1_; #line 1393 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33595 "Photo.c" +#line 33794 "Photo.c" } -static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_new (BackingPhotoRow* backing_state, PhotoMetadata* metadata) { +static PhotoReimportEditableStateImpl* +photo_reimport_editable_state_impl_new (BackingPhotoRow* backing_state, + PhotoMetadata* metadata) +{ #line 1393 "/home/jens/Source/shotwell/src/Photo.vala" return photo_reimport_editable_state_impl_construct (PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, backing_state, metadata); -#line 33602 "Photo.c" +#line 33804 "Photo.c" } -static void photo_reimport_editable_state_impl_class_init (PhotoReimportEditableStateImplClass * klass) { +static void +photo_reimport_editable_state_impl_class_init (PhotoReimportEditableStateImplClass * klass) +{ #line 1388 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_impl_parent_class = g_type_class_peek_parent (klass); #line 1388 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_impl_finalize; -#line 33611 "Photo.c" +#line 33815 "Photo.c" } -static void photo_reimport_editable_state_impl_instance_init (PhotoReimportEditableStateImpl * self) { +static void +photo_reimport_editable_state_impl_instance_init (PhotoReimportEditableStateImpl * self) +{ BackingPhotoRow* _tmp0_; #line 1389 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = backing_photo_row_new (); @@ -33624,11 +33830,13 @@ static void photo_reimport_editable_state_impl_instance_init (PhotoReimportEdita self->backing_state = _tmp0_; #line 1391 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata_only = FALSE; -#line 33623 "Photo.c" +#line 33829 "Photo.c" } -static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableState * obj) { +static void +photo_reimport_editable_state_impl_finalize (PhotoReimportEditableState * obj) +{ PhotoReimportEditableStateImpl * self; #line 1388 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl); @@ -33638,11 +33846,13 @@ static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableSt _media_metadata_unref0 (self->metadata); #line 1388 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_EDITABLE_STATE_CLASS (photo_reimport_editable_state_impl_parent_class)->finalize (obj); -#line 33637 "Photo.c" +#line 33845 "Photo.c" } -static GType photo_reimport_editable_state_impl_get_type (void) { +static GType +photo_reimport_editable_state_impl_get_type (void) +{ static volatile gsize photo_reimport_editable_state_impl_type_id__volatile = 0; if (g_once_init_enter (&photo_reimport_editable_state_impl_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoReimportEditableStateImplClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_reimport_editable_state_impl_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoReimportEditableStateImpl), 0, (GInstanceInitFunc) photo_reimport_editable_state_impl_instance_init, NULL }; @@ -33654,114 +33864,141 @@ static GType photo_reimport_editable_state_impl_get_type (void) { } -PhotoReimportRawDevelopmentState* photo_reimport_raw_development_state_construct (GType object_type) { +PhotoReimportRawDevelopmentState* +photo_reimport_raw_development_state_construct (GType object_type) +{ PhotoReimportRawDevelopmentState* self = NULL; #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportRawDevelopmentState*) g_type_create_instance (object_type); #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33659 "Photo.c" +#line 33871 "Photo.c" } -static void photo_value_reimport_raw_development_state_init (GValue* value) { +static void +photo_value_reimport_raw_development_state_init (GValue* value) +{ #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33666 "Photo.c" +#line 33880 "Photo.c" } -static void photo_value_reimport_raw_development_state_free_value (GValue* value) { +static void +photo_value_reimport_raw_development_state_free_value (GValue* value) +{ #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (value->data[0].v_pointer) { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_unref (value->data[0].v_pointer); -#line 33675 "Photo.c" +#line 33891 "Photo.c" } } -static void photo_value_reimport_raw_development_state_copy_value (const GValue* src_value, GValue* dest_value) { +static void +photo_value_reimport_raw_development_state_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (src_value->data[0].v_pointer) { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_reimport_raw_development_state_ref (src_value->data[0].v_pointer); -#line 33685 "Photo.c" +#line 33904 "Photo.c" } else { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 33689 "Photo.c" +#line 33908 "Photo.c" } } -static gpointer photo_value_reimport_raw_development_state_peek_pointer (const GValue* value) { +static gpointer +photo_value_reimport_raw_development_state_peek_pointer (const GValue* value) +{ #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33697 "Photo.c" +#line 33918 "Photo.c" } -static gchar* photo_value_reimport_raw_development_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +photo_value_reimport_raw_development_state_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 33704 "Photo.c" +#line 33930 "Photo.c" PhotoReimportRawDevelopmentState * object; object = collect_values[0].v_pointer; #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33711 "Photo.c" +#line 33937 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33715 "Photo.c" +#line 33941 "Photo.c" } #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_reimport_raw_development_state_ref (object); -#line 33719 "Photo.c" +#line 33945 "Photo.c" } else { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33723 "Photo.c" +#line 33949 "Photo.c" } #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33727 "Photo.c" +#line 33953 "Photo.c" } -static gchar* photo_value_reimport_raw_development_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +photo_value_reimport_raw_development_state_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoReimportRawDevelopmentState ** object_p; object_p = collect_values[0].v_pointer; #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (!object_p) { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 33738 "Photo.c" +#line 33969 "Photo.c" } #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 33744 "Photo.c" +#line 33975 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 33748 "Photo.c" +#line 33979 "Photo.c" } else { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_reimport_raw_development_state_ref (value->data[0].v_pointer); -#line 33752 "Photo.c" +#line 33983 "Photo.c" } #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33756 "Photo.c" +#line 33987 "Photo.c" } -GParamSpec* photo_param_spec_reimport_raw_development_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +photo_param_spec_reimport_raw_development_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ PhotoParamSpecReimportRawDevelopmentState* spec; #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (g_type_is_a (object_type, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE), NULL); @@ -33771,20 +34008,25 @@ GParamSpec* photo_param_spec_reimport_raw_development_state (const gchar* name, G_PARAM_SPEC (spec)->value_type = object_type; #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 33770 "Photo.c" +#line 34007 "Photo.c" } -gpointer photo_value_get_reimport_raw_development_state (const GValue* value) { +gpointer +photo_value_get_reimport_raw_development_state (const GValue* value) +{ #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE), NULL); #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33779 "Photo.c" +#line 34018 "Photo.c" } -void photo_value_set_reimport_raw_development_state (GValue* value, gpointer v_object) { +void +photo_value_set_reimport_raw_development_state (GValue* value, + gpointer v_object) +{ PhotoReimportRawDevelopmentState * old; #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE)); @@ -33800,22 +34042,25 @@ void photo_value_set_reimport_raw_development_state (GValue* value, gpointer v_o value->data[0].v_pointer = v_object; #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_ref (value->data[0].v_pointer); -#line 33799 "Photo.c" +#line 34041 "Photo.c" } else { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33803 "Photo.c" +#line 34045 "Photo.c" } #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_unref (old); -#line 33809 "Photo.c" +#line 34051 "Photo.c" } } -void photo_value_take_reimport_raw_development_state (GValue* value, gpointer v_object) { +void +photo_value_take_reimport_raw_development_state (GValue* value, + gpointer v_object) +{ PhotoReimportRawDevelopmentState * old; #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE)); @@ -33829,48 +34074,56 @@ void photo_value_take_reimport_raw_development_state (GValue* value, gpointer v_ g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 33828 "Photo.c" +#line 34073 "Photo.c" } else { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33832 "Photo.c" +#line 34077 "Photo.c" } #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_unref (old); -#line 33838 "Photo.c" +#line 34083 "Photo.c" } } -static void photo_reimport_raw_development_state_class_init (PhotoReimportRawDevelopmentStateClass * klass) { +static void +photo_reimport_raw_development_state_class_init (PhotoReimportRawDevelopmentStateClass * klass) +{ #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_parent_class = g_type_class_peek_parent (klass); #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_finalize; -#line 33848 "Photo.c" +#line 34095 "Photo.c" } -static void photo_reimport_raw_development_state_instance_init (PhotoReimportRawDevelopmentState * self) { +static void +photo_reimport_raw_development_state_instance_init (PhotoReimportRawDevelopmentState * self) +{ #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 33855 "Photo.c" +#line 34104 "Photo.c" } -static void photo_reimport_raw_development_state_finalize (PhotoReimportRawDevelopmentState * obj) { +static void +photo_reimport_raw_development_state_finalize (PhotoReimportRawDevelopmentState * obj) +{ PhotoReimportRawDevelopmentState * self; #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState); #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_destroy (self); -#line 33865 "Photo.c" +#line 34116 "Photo.c" } -GType photo_reimport_raw_development_state_get_type (void) { +GType +photo_reimport_raw_development_state_get_type (void) +{ static volatile gsize photo_reimport_raw_development_state_type_id__volatile = 0; if (g_once_init_enter (&photo_reimport_raw_development_state_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { photo_value_reimport_raw_development_state_init, photo_value_reimport_raw_development_state_free_value, photo_value_reimport_raw_development_state_copy_value, photo_value_reimport_raw_development_state_peek_pointer, "p", photo_value_reimport_raw_development_state_collect_value, "p", photo_value_reimport_raw_development_state_lcopy_value }; @@ -33884,18 +34137,22 @@ GType photo_reimport_raw_development_state_get_type (void) { } -gpointer photo_reimport_raw_development_state_ref (gpointer instance) { +gpointer +photo_reimport_raw_development_state_ref (gpointer instance) +{ PhotoReimportRawDevelopmentState * self; self = instance; #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 33890 "Photo.c" +#line 34145 "Photo.c" } -void photo_reimport_raw_development_state_unref (gpointer instance) { +void +photo_reimport_raw_development_state_unref (gpointer instance) +{ PhotoReimportRawDevelopmentState * self; self = instance; #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" @@ -33904,34 +34161,40 @@ void photo_reimport_raw_development_state_unref (gpointer instance) { PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_GET_CLASS (self)->finalize (self); #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 33903 "Photo.c" +#line 34160 "Photo.c" } } -static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_construct (GType object_type) { +static PhotoReimportRawDevelopmentStateImpl* +photo_reimport_raw_development_state_impl_construct (GType object_type) +{ PhotoReimportRawDevelopmentStateImpl* self = NULL; #line 1416 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportRawDevelopmentStateImpl*) photo_reimport_raw_development_state_construct (object_type); #line 1416 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33914 "Photo.c" +#line 34173 "Photo.c" } -static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_new (void) { +static PhotoReimportRawDevelopmentStateImpl* +photo_reimport_raw_development_state_impl_new (void) +{ #line 1416 "/home/jens/Source/shotwell/src/Photo.vala" return photo_reimport_raw_development_state_impl_construct (PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL); -#line 33921 "Photo.c" +#line 34182 "Photo.c" } -static void photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevelopmentStateImpl* self, BackingPhotoRow* backing, PhotoMetadata* metadata) { +static void +photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevelopmentStateImpl* self, + BackingPhotoRow* backing, + PhotoMetadata* metadata) +{ GeeCollection* _tmp0_; - BackingPhotoRow* _tmp1_; - PhotoMetadata* _tmp2_; - PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp3_; - PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp4_; + PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp1_; + PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp2_; #line 1419 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL (self)); #line 1419 "/home/jens/Source/shotwell/src/Photo.vala" @@ -33941,22 +34204,20 @@ static void photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevel #line 1420 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->list; #line 1420 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = backing; + _tmp1_ = photo_reimport_raw_development_state_impl_dev_to_reimport_new (backing, metadata); #line 1420 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = metadata; -#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_reimport_raw_development_state_impl_dev_to_reimport_new (_tmp1_, _tmp2_); -#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 1420 "/home/jens/Source/shotwell/src/Photo.vala" - gee_collection_add (_tmp0_, _tmp4_); + gee_collection_add (_tmp0_, _tmp2_); #line 1420 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (_tmp4_); -#line 33951 "Photo.c" + _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (_tmp2_); +#line 34210 "Photo.c" } -static gint photo_reimport_raw_development_state_impl_get_size (PhotoReimportRawDevelopmentStateImpl* self) { +static gint +photo_reimport_raw_development_state_impl_get_size (PhotoReimportRawDevelopmentStateImpl* self) +{ gint result = 0; GeeCollection* _tmp0_; gint _tmp1_; @@ -33973,16 +34234,18 @@ static gint photo_reimport_raw_development_state_impl_get_size (PhotoReimportRaw result = _tmp2_; #line 1424 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 33972 "Photo.c" +#line 34233 "Photo.c" } -static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_construct (GType object_type, BackingPhotoRow* backing, PhotoMetadata* metadata) { +static PhotoReimportRawDevelopmentStateImplDevToReimport* +photo_reimport_raw_development_state_impl_dev_to_reimport_construct (GType object_type, + BackingPhotoRow* backing, + PhotoMetadata* metadata) +{ PhotoReimportRawDevelopmentStateImplDevToReimport* self = NULL; BackingPhotoRow* _tmp0_; - BackingPhotoRow* _tmp1_; - PhotoMetadata* _tmp2_; - PhotoMetadata* _tmp3_; + PhotoMetadata* _tmp1_; #line 1407 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_BACKING_PHOTO_ROW (backing), NULL); #line 1407 "/home/jens/Source/shotwell/src/Photo.vala" @@ -33990,132 +34253,156 @@ static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_dev #line 1407 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportRawDevelopmentStateImplDevToReimport*) g_type_create_instance (object_type); #line 1408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = backing; -#line 1408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _backing_photo_row_ref0 (_tmp0_); + _tmp0_ = _backing_photo_row_ref0 (backing); #line 1408 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing); #line 1408 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing = _tmp1_; -#line 1409 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = metadata; + self->backing = _tmp0_; #line 1409 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _media_metadata_ref0 (_tmp2_); + _tmp1_ = _media_metadata_ref0 (metadata); #line 1409 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); #line 1409 "/home/jens/Source/shotwell/src/Photo.vala" - self->metadata = _tmp3_; + self->metadata = _tmp1_; #line 1407 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 34006 "Photo.c" +#line 34265 "Photo.c" } -static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_new (BackingPhotoRow* backing, PhotoMetadata* metadata) { +static PhotoReimportRawDevelopmentStateImplDevToReimport* +photo_reimport_raw_development_state_impl_dev_to_reimport_new (BackingPhotoRow* backing, + PhotoMetadata* metadata) +{ #line 1407 "/home/jens/Source/shotwell/src/Photo.vala" return photo_reimport_raw_development_state_impl_dev_to_reimport_construct (PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, backing, metadata); -#line 34013 "Photo.c" +#line 34275 "Photo.c" } -static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_init (GValue* value) { +static void +photo_reimport_raw_development_state_impl_value_dev_to_reimport_init (GValue* value) +{ #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 34020 "Photo.c" +#line 34284 "Photo.c" } -static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_free_value (GValue* value) { +static void +photo_reimport_raw_development_state_impl_value_dev_to_reimport_free_value (GValue* value) +{ #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (value->data[0].v_pointer) { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_unref (value->data[0].v_pointer); -#line 34029 "Photo.c" +#line 34295 "Photo.c" } } -static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_copy_value (const GValue* src_value, GValue* dest_value) { +static void +photo_reimport_raw_development_state_impl_value_dev_to_reimport_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (src_value->data[0].v_pointer) { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (src_value->data[0].v_pointer); -#line 34039 "Photo.c" +#line 34308 "Photo.c" } else { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 34043 "Photo.c" +#line 34312 "Photo.c" } } -static gpointer photo_reimport_raw_development_state_impl_value_dev_to_reimport_peek_pointer (const GValue* value) { +static gpointer +photo_reimport_raw_development_state_impl_value_dev_to_reimport_peek_pointer (const GValue* value) +{ #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 34051 "Photo.c" +#line 34322 "Photo.c" } -static gchar* photo_reimport_raw_development_state_impl_value_dev_to_reimport_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +photo_reimport_raw_development_state_impl_value_dev_to_reimport_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 34058 "Photo.c" +#line 34334 "Photo.c" PhotoReimportRawDevelopmentStateImplDevToReimport * object; object = collect_values[0].v_pointer; #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 34065 "Photo.c" +#line 34341 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 34069 "Photo.c" +#line 34345 "Photo.c" } #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (object); -#line 34073 "Photo.c" +#line 34349 "Photo.c" } else { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 34077 "Photo.c" +#line 34353 "Photo.c" } #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 34081 "Photo.c" +#line 34357 "Photo.c" } -static gchar* photo_reimport_raw_development_state_impl_value_dev_to_reimport_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +photo_reimport_raw_development_state_impl_value_dev_to_reimport_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoReimportRawDevelopmentStateImplDevToReimport ** object_p; object_p = collect_values[0].v_pointer; #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (!object_p) { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 34092 "Photo.c" +#line 34373 "Photo.c" } #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 34098 "Photo.c" +#line 34379 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 34102 "Photo.c" +#line 34383 "Photo.c" } else { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (value->data[0].v_pointer); -#line 34106 "Photo.c" +#line 34387 "Photo.c" } #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 34110 "Photo.c" +#line 34391 "Photo.c" } -static GParamSpec* photo_reimport_raw_development_state_impl_param_spec_dev_to_reimport (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +static GParamSpec* +photo_reimport_raw_development_state_impl_param_spec_dev_to_reimport (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ PhotoReimportRawDevelopmentStateImplParamSpecDevToReimport* spec; #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (g_type_is_a (object_type, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT), NULL); @@ -34125,20 +34412,25 @@ static GParamSpec* photo_reimport_raw_development_state_impl_param_spec_dev_to_r G_PARAM_SPEC (spec)->value_type = object_type; #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 34124 "Photo.c" +#line 34411 "Photo.c" } -static gpointer photo_reimport_raw_development_state_impl_value_get_dev_to_reimport (const GValue* value) { +static gpointer +photo_reimport_raw_development_state_impl_value_get_dev_to_reimport (const GValue* value) +{ #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT), NULL); #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 34133 "Photo.c" +#line 34422 "Photo.c" } -static void photo_reimport_raw_development_state_impl_value_set_dev_to_reimport (GValue* value, gpointer v_object) { +static void +photo_reimport_raw_development_state_impl_value_set_dev_to_reimport (GValue* value, + gpointer v_object) +{ PhotoReimportRawDevelopmentStateImplDevToReimport * old; #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT)); @@ -34154,22 +34446,25 @@ static void photo_reimport_raw_development_state_impl_value_set_dev_to_reimport value->data[0].v_pointer = v_object; #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_ref (value->data[0].v_pointer); -#line 34153 "Photo.c" +#line 34445 "Photo.c" } else { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 34157 "Photo.c" +#line 34449 "Photo.c" } #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old); -#line 34163 "Photo.c" +#line 34455 "Photo.c" } } -static void photo_reimport_raw_development_state_impl_value_take_dev_to_reimport (GValue* value, gpointer v_object) { +static void +photo_reimport_raw_development_state_impl_value_take_dev_to_reimport (GValue* value, + gpointer v_object) +{ PhotoReimportRawDevelopmentStateImplDevToReimport * old; #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT)); @@ -34183,31 +34478,35 @@ static void photo_reimport_raw_development_state_impl_value_take_dev_to_reimport g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 34182 "Photo.c" +#line 34477 "Photo.c" } else { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 34186 "Photo.c" +#line 34481 "Photo.c" } #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old); -#line 34192 "Photo.c" +#line 34487 "Photo.c" } } -static void photo_reimport_raw_development_state_impl_dev_to_reimport_class_init (PhotoReimportRawDevelopmentStateImplDevToReimportClass * klass) { +static void +photo_reimport_raw_development_state_impl_dev_to_reimport_class_init (PhotoReimportRawDevelopmentStateImplDevToReimportClass * klass) +{ #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_parent_class = g_type_class_peek_parent (klass); #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportRawDevelopmentStateImplDevToReimportClass *) klass)->finalize = photo_reimport_raw_development_state_impl_dev_to_reimport_finalize; -#line 34202 "Photo.c" +#line 34499 "Photo.c" } -static void photo_reimport_raw_development_state_impl_dev_to_reimport_instance_init (PhotoReimportRawDevelopmentStateImplDevToReimport * self) { +static void +photo_reimport_raw_development_state_impl_dev_to_reimport_instance_init (PhotoReimportRawDevelopmentStateImplDevToReimport * self) +{ BackingPhotoRow* _tmp0_; #line 1404 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = backing_photo_row_new (); @@ -34215,11 +34514,13 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_instance_i self->backing = _tmp0_; #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 34214 "Photo.c" +#line 34513 "Photo.c" } -static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (PhotoReimportRawDevelopmentStateImplDevToReimport * obj) { +static void +photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (PhotoReimportRawDevelopmentStateImplDevToReimport * obj) +{ PhotoReimportRawDevelopmentStateImplDevToReimport * self; #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, PhotoReimportRawDevelopmentStateImplDevToReimport); @@ -34229,11 +34530,13 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize ( _backing_photo_row_unref0 (self->backing); #line 1405 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); -#line 34228 "Photo.c" +#line 34529 "Photo.c" } -GType photo_reimport_raw_development_state_impl_dev_to_reimport_get_type (void) { +GType +photo_reimport_raw_development_state_impl_dev_to_reimport_get_type (void) +{ static volatile gsize photo_reimport_raw_development_state_impl_dev_to_reimport_type_id__volatile = 0; if (g_once_init_enter (&photo_reimport_raw_development_state_impl_dev_to_reimport_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { photo_reimport_raw_development_state_impl_value_dev_to_reimport_init, photo_reimport_raw_development_state_impl_value_dev_to_reimport_free_value, photo_reimport_raw_development_state_impl_value_dev_to_reimport_copy_value, photo_reimport_raw_development_state_impl_value_dev_to_reimport_peek_pointer, "p", photo_reimport_raw_development_state_impl_value_dev_to_reimport_collect_value, "p", photo_reimport_raw_development_state_impl_value_dev_to_reimport_lcopy_value }; @@ -34247,18 +34550,22 @@ GType photo_reimport_raw_development_state_impl_dev_to_reimport_get_type (void) } -static gpointer photo_reimport_raw_development_state_impl_dev_to_reimport_ref (gpointer instance) { +static gpointer +photo_reimport_raw_development_state_impl_dev_to_reimport_ref (gpointer instance) +{ PhotoReimportRawDevelopmentStateImplDevToReimport * self; self = instance; #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 34253 "Photo.c" +#line 34558 "Photo.c" } -static void photo_reimport_raw_development_state_impl_dev_to_reimport_unref (gpointer instance) { +static void +photo_reimport_raw_development_state_impl_dev_to_reimport_unref (gpointer instance) +{ PhotoReimportRawDevelopmentStateImplDevToReimport * self; self = instance; #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" @@ -34267,21 +34574,25 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_unref (gpo PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_DEV_TO_REIMPORT_GET_CLASS (self)->finalize (self); #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 34266 "Photo.c" +#line 34573 "Photo.c" } } -static void photo_reimport_raw_development_state_impl_class_init (PhotoReimportRawDevelopmentStateImplClass * klass) { +static void +photo_reimport_raw_development_state_impl_class_init (PhotoReimportRawDevelopmentStateImplClass * klass) +{ #line 1402 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_parent_class = g_type_class_peek_parent (klass); #line 1402 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_impl_finalize; -#line 34276 "Photo.c" +#line 34585 "Photo.c" } -static void photo_reimport_raw_development_state_impl_instance_init (PhotoReimportRawDevelopmentStateImpl * self) { +static void +photo_reimport_raw_development_state_impl_instance_init (PhotoReimportRawDevelopmentStateImpl * self) +{ GeeArrayList* _tmp0_; #line 1413 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = gee_array_list_new (PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, (GBoxedCopyFunc) photo_reimport_raw_development_state_impl_dev_to_reimport_ref, (GDestroyNotify) photo_reimport_raw_development_state_impl_dev_to_reimport_unref, NULL, NULL, NULL); @@ -34289,11 +34600,13 @@ static void photo_reimport_raw_development_state_impl_instance_init (PhotoReimpo self->list = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 1414 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata_only = FALSE; -#line 34288 "Photo.c" +#line 34599 "Photo.c" } -static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRawDevelopmentState * obj) { +static void +photo_reimport_raw_development_state_impl_finalize (PhotoReimportRawDevelopmentState * obj) +{ PhotoReimportRawDevelopmentStateImpl * self; #line 1402 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL, PhotoReimportRawDevelopmentStateImpl); @@ -34301,11 +34614,13 @@ static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRaw _g_object_unref0 (self->list); #line 1402 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_CLASS (photo_reimport_raw_development_state_impl_parent_class)->finalize (obj); -#line 34300 "Photo.c" +#line 34613 "Photo.c" } -static GType photo_reimport_raw_development_state_impl_get_type (void) { +static GType +photo_reimport_raw_development_state_impl_get_type (void) +{ static volatile gsize photo_reimport_raw_development_state_impl_type_id__volatile = 0; if (g_once_init_enter (&photo_reimport_raw_development_state_impl_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoReimportRawDevelopmentStateImplClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_reimport_raw_development_state_impl_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoReimportRawDevelopmentStateImpl), 0, (GInstanceInitFunc) photo_reimport_raw_development_state_impl_instance_init, NULL }; @@ -34317,7 +34632,9 @@ static GType photo_reimport_raw_development_state_impl_get_type (void) { } -static void photo_class_init (PhotoClass * klass) { +static void +photo_class_init (PhotoClass * klass) +{ #line 161 "/home/jens/Source/shotwell/src/Photo.vala" photo_parent_class = g_type_class_peek_parent (klass); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" @@ -34444,22 +34761,26 @@ static void photo_class_init (PhotoClass * klass) { photo_signals[PHOTO_SOURCE_REIMPORTED_SIGNAL] = g_signal_new ("source-reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, source_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA); #line 326 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_init (&__lock_photo_source_pixbuf_cache); -#line 34443 "Photo.c" +#line 34760 "Photo.c" } -static void photo_dateable_interface_init (DateableIface * iface) { +static void +photo_dateable_interface_init (DateableIface * iface) +{ #line 161 "/home/jens/Source/shotwell/src/Photo.vala" photo_dateable_parent_iface = g_type_interface_peek_parent (iface); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" iface->get_exposure_time = (time_t (*) (Dateable *)) photo_real_get_exposure_time; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" iface->set_exposure_time = (void (*) (Dateable *, time_t)) photo_real_set_exposure_time; -#line 34454 "Photo.c" +#line 34773 "Photo.c" } -static void photo_instance_init (Photo * self) { +static void +photo_instance_init (Photo * self) +{ BackingPhotoRow* _tmp0_; PhotoBackingReaders* _tmp1_; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" @@ -34498,11 +34819,13 @@ static void photo_instance_init (Photo * self) { self->priv->developments = NULL; #line 353 "/home/jens/Source/shotwell/src/Photo.vala" self->backing_photo_row = NULL; -#line 34497 "Photo.c" +#line 34818 "Photo.c" } -static void photo_finalize (GObject * obj) { +static void +photo_finalize (GObject * obj) +{ Photo * self; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO, Photo); @@ -34538,11 +34861,13 @@ static void photo_finalize (GObject * obj) { _backing_photo_row_unref0 (self->backing_photo_row); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (photo_parent_class)->finalize (obj); -#line 34537 "Photo.c" +#line 34860 "Photo.c" } -GType photo_get_type (void) { +GType +photo_get_type (void) +{ static volatile gsize photo_type_id__volatile = 0; if (g_once_init_enter (&photo_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Photo), 0, (GInstanceInitFunc) photo_instance_init, NULL }; @@ -34556,39 +34881,51 @@ GType photo_get_type (void) { } -static void _vala_photo_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_photo_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ Photo * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PHOTO, Photo); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" switch (property_id) { -#line 34560 "Photo.c" +#line 34890 "Photo.c" default: #line 161 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 34566 "Photo.c" +#line 34896 "Photo.c" } } -static void _vala_photo_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { +static void +_vala_photo_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec) +{ Photo * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PHOTO, Photo); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" switch (property_id) { -#line 34576 "Photo.c" +#line 34911 "Photo.c" default: #line 161 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 34582 "Photo.c" +#line 34917 "Photo.c" } } -GType library_photo_source_collection_state_get_type (void) { +GType +library_photo_source_collection_state_get_type (void) +{ static volatile gsize library_photo_source_collection_state_type_id__volatile = 0; if (g_once_init_enter (&library_photo_source_collection_state_type_id__volatile)) { static const GEnumValue values[] = {{LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_UNKNOWN, "LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_UNKNOWN", "unknown"}, {LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE, "LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE", "online"}, {LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE, "LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE", "offline"}, {LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH, "LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH", "trash"}, {LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE, "LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE", "editable"}, {LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER, "LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER", "developer"}, {0, NULL, NULL}}; @@ -34600,34 +34937,47 @@ GType library_photo_source_collection_state_get_type (void) { } -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { +static guint +_file_hash_gee_hash_data_func (gconstpointer v, + gpointer self) +{ guint result; result = file_hash ((GFile*) v); #line 4483 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34604 "Photo.c" +#line 34944 "Photo.c" } -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = file_equal ((GFile*) a, (GFile*) b); #line 4483 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34613 "Photo.c" +#line 34957 "Photo.c" } -static gint _int64_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gint +_int64_compare_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gint result; result = int64_compare ((gint64*) a, (gint64*) b); #line 4487 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34622 "Photo.c" +#line 34970 "Photo.c" } -static gint64* _int64_dup (gint64* self) { +static gint64* +_int64_dup (gint64* self) +{ gint64* dup; #line 4487 "/home/jens/Source/shotwell/src/Photo.vala" dup = g_new0 (gint64, 1); @@ -34635,43 +34985,62 @@ static gint64* _int64_dup (gint64* self) { memcpy (dup, self, sizeof (gint64)); #line 4487 "/home/jens/Source/shotwell/src/Photo.vala" return dup; -#line 34634 "Photo.c" +#line 34984 "Photo.c" } -static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_int64_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = int64_equal ((gint64*) a, (gint64*) b); #line 4489 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34643 "Photo.c" +#line 34997 "Photo.c" } -static gint64 _photo_get_photo_key_get_source_database_key (DataSource* source, gpointer self) { +static gint64 +_photo_get_photo_key_get_source_database_key (DataSource* source, + gpointer self) +{ gint64 result; result = photo_get_photo_key (source); #line 4509 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34652 "Photo.c" +#line 35009 "Photo.c" } -static void _library_photo_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { +static void +_library_photo_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self) +{ #line 4511 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_on_trashcan_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed); -#line 34659 "Photo.c" +#line 35021 "Photo.c" } -static void _library_photo_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { +static void +_library_photo_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self) +{ #line 4512 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_on_offline_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed); -#line 34666 "Photo.c" +#line 35033 "Photo.c" } -LibraryPhotoSourceCollection* library_photo_source_collection_construct (GType object_type) { +LibraryPhotoSourceCollection* +library_photo_source_collection_construct (GType object_type) +{ LibraryPhotoSourceCollection* self = NULL; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; @@ -34697,27 +35066,35 @@ LibraryPhotoSourceCollection* library_photo_source_collection_construct (GType o _source_holding_tank_unref0 (_tmp3_); #line 4508 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 34696 "Photo.c" +#line 35065 "Photo.c" } -LibraryPhotoSourceCollection* library_photo_source_collection_new (void) { +LibraryPhotoSourceCollection* +library_photo_source_collection_new (void) +{ #line 4508 "/home/jens/Source/shotwell/src/Photo.vala" return library_photo_source_collection_construct (TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION); -#line 34703 "Photo.c" +#line 35074 "Photo.c" } -static gboolean _library_photo_source_collection_check_if_trashed_photo_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) { +static gboolean +_library_photo_source_collection_check_if_trashed_photo_source_holding_tank_check_to_keep (DataSource* source, + Alteration* alteration, + gpointer self) +{ gboolean result; result = library_photo_source_collection_check_if_trashed_photo ((LibraryPhotoSourceCollection*) self, source, alteration); #line 4516 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34712 "Photo.c" +#line 35087 "Photo.c" } -static MediaSourceHoldingTank* library_photo_source_collection_real_create_trashcan (MediaSourceCollection* base) { +static MediaSourceHoldingTank* +library_photo_source_collection_real_create_trashcan (MediaSourceCollection* base) +{ LibraryPhotoSourceCollection * self; MediaSourceHoldingTank* result = NULL; LibraryPhotoSourceHoldingTank* _tmp0_; @@ -34729,20 +35106,26 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_trash result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank); #line 4516 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34728 "Photo.c" +#line 35105 "Photo.c" } -static gboolean _library_photo_source_collection_check_if_offline_photo_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) { +static gboolean +_library_photo_source_collection_check_if_offline_photo_source_holding_tank_check_to_keep (DataSource* source, + Alteration* alteration, + gpointer self) +{ gboolean result; result = library_photo_source_collection_check_if_offline_photo ((LibraryPhotoSourceCollection*) self, source, alteration); #line 4520 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34737 "Photo.c" +#line 35118 "Photo.c" } -static MediaSourceHoldingTank* library_photo_source_collection_real_create_offline_bin (MediaSourceCollection* base) { +static MediaSourceHoldingTank* +library_photo_source_collection_real_create_offline_bin (MediaSourceCollection* base) +{ LibraryPhotoSourceCollection * self; MediaSourceHoldingTank* result = NULL; LibraryPhotoSourceHoldingTank* _tmp0_; @@ -34754,16 +35137,18 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_offli result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank); #line 4520 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34753 "Photo.c" +#line 35136 "Photo.c" } -static MediaMonitor* library_photo_source_collection_real_create_media_monitor (MediaSourceCollection* base, Workers* workers, GCancellable* cancellable) { +static MediaMonitor* +library_photo_source_collection_real_create_media_monitor (MediaSourceCollection* base, + Workers* workers, + GCancellable* cancellable) +{ LibraryPhotoSourceCollection * self; MediaMonitor* result = NULL; - Workers* _tmp0_; - GCancellable* _tmp1_; - PhotoMonitor* _tmp2_; + PhotoMonitor* _tmp0_; #line 4523 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4523 "/home/jens/Source/shotwell/src/Photo.vala" @@ -34771,38 +35156,36 @@ static MediaMonitor* library_photo_source_collection_real_create_media_monitor ( #line 4523 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL); #line 4524 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = workers; -#line 4524 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = cancellable; -#line 4524 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_monitor_new (_tmp0_, _tmp1_); + _tmp0_ = photo_monitor_new (workers, cancellable); #line 4524 "/home/jens/Source/shotwell/src/Photo.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_MONITOR, MediaMonitor); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_MONITOR, MediaMonitor); #line 4524 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34779 "Photo.c" +#line 35160 "Photo.c" } -static gboolean library_photo_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) { +static gboolean +library_photo_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source) +{ LibraryPhotoSourceCollection * self; gboolean result = FALSE; - DataSource* _tmp0_; #line 4527 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4527 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 4528 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = source; -#line 4528 "/home/jens/Source/shotwell/src/Photo.vala" - result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO); + result = G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_LIBRARY_PHOTO); #line 4528 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34797 "Photo.c" +#line 35178 "Photo.c" } -static gchar* library_photo_source_collection_real_get_typename (MediaSourceCollection* base) { +static gchar* +library_photo_source_collection_real_get_typename (MediaSourceCollection* base) +{ LibraryPhotoSourceCollection * self; gchar* result = NULL; gchar* _tmp0_; @@ -34814,51 +35197,56 @@ static gchar* library_photo_source_collection_real_get_typename (MediaSourceColl result = _tmp0_; #line 4532 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34813 "Photo.c" +#line 35196 "Photo.c" } -static gboolean library_photo_source_collection_real_is_file_recognized (MediaSourceCollection* base, GFile* file) { +static gboolean +library_photo_source_collection_real_is_file_recognized (MediaSourceCollection* base, + GFile* file) +{ LibraryPhotoSourceCollection * self; gboolean result = FALSE; - GFile* _tmp0_; - gboolean _tmp1_; #line 4535 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4535 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 4536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file; -#line 4536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_file_format_is_file_supported (_tmp0_); -#line 4536 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp1_; + result = photo_file_format_is_file_supported (file); #line 4536 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34834 "Photo.c" +#line 35214 "Photo.c" } -static void _library_photo_source_collection_on_editable_replaced_photo_editable_replaced (Photo* _sender, GFile* old_file, GFile* new_file, gpointer self) { +static void +_library_photo_source_collection_on_editable_replaced_photo_editable_replaced (Photo* _sender, + GFile* old_file, + GFile* new_file, + gpointer self) +{ #line 4548 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_on_editable_replaced ((LibraryPhotoSourceCollection*) self, _sender, old_file, new_file); -#line 34841 "Photo.c" +#line 35226 "Photo.c" } -static void _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self) { +static void +_library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, + gpointer self) +{ #line 4554 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_on_raw_development_modified ((LibraryPhotoSourceCollection*) self, _sender); -#line 34848 "Photo.c" +#line 35236 "Photo.c" } -static void library_photo_source_collection_real_notify_contents_altered (DataCollection* base, GeeIterable* added, GeeIterable* removed) { +static void +library_photo_source_collection_real_notify_contents_altered (DataCollection* base, + GeeIterable* added, + GeeIterable* removed) +{ LibraryPhotoSourceCollection * self; - GeeIterable* _tmp0_; - GeeIterable* _tmp75_; - GeeIterable* _tmp153_; - GeeIterable* _tmp154_; #line 4539 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4539 "/home/jens/Source/shotwell/src/Photo.vala" @@ -34866,370 +35254,356 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo #line 4539 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); #line 4541 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = added; -#line 4541 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_ != NULL) { -#line 34868 "Photo.c" + if (added != NULL) { +#line 35254 "Photo.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp0_; #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = added; + _tmp0_ = gee_iterable_iterator (added); #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gee_iterable_iterator (_tmp1_); -#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" - _object_it = _tmp2_; + _object_it = _tmp0_; #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 34881 "Photo.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 35264 "Photo.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp2_; + gpointer _tmp3_; LibraryPhoto* photo = NULL; - DataObject* _tmp7_; - LibraryPhoto* _tmp8_; + DataObject* _tmp4_; + LibraryPhoto* _tmp5_; GFile* editable = NULL; - LibraryPhoto* _tmp9_; - GFile* _tmp10_; - GFile* _tmp11_; - LibraryPhoto* _tmp15_; + LibraryPhoto* _tmp6_; + GFile* _tmp7_; + GFile* _tmp8_; + LibraryPhoto* _tmp12_; GeeCollection* raw_list = NULL; - LibraryPhoto* _tmp16_; - GeeCollection* _tmp17_; - GeeCollection* _tmp18_; - LibraryPhoto* _tmp28_; + LibraryPhoto* _tmp13_; + GeeCollection* _tmp14_; + GeeCollection* _tmp15_; + LibraryPhoto* _tmp24_; gint64 master_filesize = 0LL; - LibraryPhoto* _tmp29_; - BackingPhotoRow* _tmp30_; - BackingPhotoRow* _tmp31_; - gint64 _tmp32_; - gint64 _tmp33_; - gint64 _tmp34_ = 0LL; - LibraryPhoto* _tmp35_; - BackingPhotoRow* _tmp36_; - BackingPhotoRow* _tmp37_; - gboolean _tmp38_; + LibraryPhoto* _tmp25_; + BackingPhotoRow* _tmp26_; + BackingPhotoRow* _tmp27_; + gint64 _tmp28_; + gint64 _tmp29_; + gint64 _tmp30_ = 0LL; + LibraryPhoto* _tmp31_; + BackingPhotoRow* _tmp32_; + BackingPhotoRow* _tmp33_; + gboolean _tmp34_; gint64 editable_filesize = 0LL; - GeeMultiMap* _tmp43_; + GeeMultiMap* _tmp39_; + gint64 _tmp40_; + LibraryPhoto* _tmp41_; + GeeHashMap* _tmp42_; + LibraryPhoto* _tmp43_; gint64 _tmp44_; - LibraryPhoto* _tmp45_; - GeeHashMap* _tmp46_; - LibraryPhoto* _tmp47_; - gint64 _tmp48_; - gint64 _tmp49_; + gint64 _tmp45_; GeeCollection* raw_rows = NULL; - LibraryPhoto* _tmp56_; - GeeCollection* _tmp57_; - GeeCollection* _tmp58_; + LibraryPhoto* _tmp52_; + GeeCollection* _tmp53_; + GeeCollection* _tmp54_; #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _object_it; + _tmp1_ = _object_it; #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_iterator_next (_tmp3_); -#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 34931 "Photo.c" +#line 35311 "Photo.c" } #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _object_it; + _tmp2_ = _object_it; #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" - object = (DataObject*) _tmp6_; + object = (DataObject*) _tmp3_; #line 4543 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = object; + _tmp4_ = object; #line 4543 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 4543 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp8_; + photo = _tmp5_; #line 4545 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo; + _tmp6_ = photo; #line 4545 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo)); + _tmp7_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo)); #line 4545 "/home/jens/Source/shotwell/src/Photo.vala" - editable = _tmp10_; + editable = _tmp7_; #line 4546 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = editable; + _tmp8_ = editable; #line 4546 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_ != NULL) { -#line 34955 "Photo.c" - GeeHashMap* _tmp12_; - GFile* _tmp13_; - LibraryPhoto* _tmp14_; + if (_tmp8_ != NULL) { +#line 35335 "Photo.c" + GeeHashMap* _tmp9_; + GFile* _tmp10_; + LibraryPhoto* _tmp11_; #line 4547 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = self->priv->by_editable_file; + _tmp9_ = self->priv->by_editable_file; #line 4547 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = editable; + _tmp10_ = editable; #line 4547 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = photo; + _tmp11_ = photo; #line 4547 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, _tmp14_); -#line 34967 "Photo.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_, _tmp11_); +#line 35347 "Photo.c" } #line 4548 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo; + _tmp12_ = photo; #line 4548 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO, Photo), "editable-replaced", (GCallback) _library_photo_source_collection_on_editable_replaced_photo_editable_replaced, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO, Photo), "editable-replaced", (GCallback) _library_photo_source_collection_on_editable_replaced_photo_editable_replaced, self); #line 4550 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = photo; + _tmp13_ = photo; #line 4550 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO, Photo)); + _tmp14_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO, Photo)); #line 4550 "/home/jens/Source/shotwell/src/Photo.vala" - raw_list = _tmp17_; + raw_list = _tmp14_; #line 4551 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = raw_list; + _tmp15_ = raw_list; #line 4551 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp18_ != NULL) { -#line 34983 "Photo.c" + if (_tmp15_ != NULL) { +#line 35363 "Photo.c" { GeeIterator* _f_it = NULL; - GeeCollection* _tmp19_; - GeeIterator* _tmp20_; + GeeCollection* _tmp16_; + GeeIterator* _tmp17_; #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = raw_list; + _tmp16_ = raw_list; #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp17_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" - _f_it = _tmp20_; + _f_it = _tmp17_; #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 34996 "Photo.c" - GeeIterator* _tmp21_; - gboolean _tmp22_; +#line 35376 "Photo.c" + GeeIterator* _tmp18_; GFile* f = NULL; - GeeIterator* _tmp23_; - gpointer _tmp24_; - GeeHashMap* _tmp25_; - GFile* _tmp26_; - LibraryPhoto* _tmp27_; -#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _f_it; + GeeIterator* _tmp19_; + gpointer _tmp20_; + GeeHashMap* _tmp21_; + GFile* _tmp22_; + LibraryPhoto* _tmp23_; #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = gee_iterator_next (_tmp21_); + _tmp18_ = _f_it; #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp22_) { + if (!gee_iterator_next (_tmp18_)) { #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35013 "Photo.c" +#line 35390 "Photo.c" } #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _f_it; + _tmp19_ = _f_it; #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = gee_iterator_get (_tmp23_); + _tmp20_ = gee_iterator_get (_tmp19_); #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" - f = (GFile*) _tmp24_; + f = (GFile*) _tmp20_; #line 4553 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = self->priv->by_raw_development_file; + _tmp21_ = self->priv->by_raw_development_file; #line 4553 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = f; + _tmp22_ = f; #line 4553 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = photo; + _tmp23_ = photo; #line 4553 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp26_, _tmp27_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, _tmp23_); #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 35031 "Photo.c" +#line 35408 "Photo.c" } #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 35035 "Photo.c" +#line 35412 "Photo.c" } } #line 4554 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = photo; + _tmp24_ = photo; #line 4554 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_PHOTO, Photo), "raw-development-modified", (GCallback) _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PHOTO, Photo), "raw-development-modified", (GCallback) _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified, self); #line 4556 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = photo; + _tmp25_ = photo; #line 4556 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_PHOTO, Photo)); + _tmp26_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO, Photo)); #line 4556 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _tmp30_; + _tmp27_ = _tmp26_; #line 4556 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _tmp31_->filesize; + _tmp28_ = _tmp27_->filesize; #line 4556 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp32_; + _tmp29_ = _tmp28_; #line 4556 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp31_); + _backing_photo_row_unref0 (_tmp27_); #line 4556 "/home/jens/Source/shotwell/src/Photo.vala" - master_filesize = _tmp33_; + master_filesize = _tmp29_; #line 4557 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = photo; + _tmp31_ = photo; #line 4557 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo)); + _tmp32_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PHOTO, Photo)); #line 4557 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tmp36_; + _tmp33_ = _tmp32_; #line 4557 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = _tmp37_ != NULL; + _tmp34_ = _tmp33_ != NULL; #line 4557 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp37_); + _backing_photo_row_unref0 (_tmp33_); #line 4557 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp38_) { -#line 35068 "Photo.c" - LibraryPhoto* _tmp39_; - BackingPhotoRow* _tmp40_; - BackingPhotoRow* _tmp41_; - gint64 _tmp42_; + if (_tmp34_) { +#line 35445 "Photo.c" + LibraryPhoto* _tmp35_; + BackingPhotoRow* _tmp36_; + BackingPhotoRow* _tmp37_; + gint64 _tmp38_; #line 4558 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = photo; + _tmp35_ = photo; #line 4558 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PHOTO, Photo)); + _tmp36_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo)); #line 4558 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = _tmp40_; + _tmp37_ = _tmp36_; #line 4558 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _tmp41_->filesize; + _tmp38_ = _tmp37_->filesize; #line 4558 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp42_; + _tmp30_ = _tmp38_; #line 4558 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp41_); -#line 35085 "Photo.c" + _backing_photo_row_unref0 (_tmp37_); +#line 35462 "Photo.c" } else { #line 4559 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = (gint64) -1; -#line 35089 "Photo.c" + _tmp30_ = (gint64) -1; +#line 35466 "Photo.c" } #line 4557 "/home/jens/Source/shotwell/src/Photo.vala" - editable_filesize = _tmp34_; + editable_filesize = _tmp30_; #line 4560 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = self->priv->filesize_to_photo; + _tmp39_ = self->priv->filesize_to_photo; #line 4560 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = master_filesize; + _tmp40_ = master_filesize; #line 4560 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = photo; + _tmp41_ = photo; #line 4560 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp43_, &_tmp44_, _tmp45_); + gee_multi_map_set (_tmp39_, &_tmp40_, _tmp41_); #line 4561 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = self->priv->photo_to_master_filesize; + _tmp42_ = self->priv->photo_to_master_filesize; #line 4561 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = photo; + _tmp43_ = photo; #line 4561 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = master_filesize; + _tmp44_ = master_filesize; #line 4561 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp47_, &_tmp48_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp43_, &_tmp44_); #line 4562 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = editable_filesize; + _tmp45_ = editable_filesize; #line 4562 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp49_ >= ((gint64) 0)) { -#line 35113 "Photo.c" - GeeMultiMap* _tmp50_; + if (_tmp45_ >= ((gint64) 0)) { +#line 35490 "Photo.c" + GeeMultiMap* _tmp46_; + gint64 _tmp47_; + LibraryPhoto* _tmp48_; + GeeHashMap* _tmp49_; + LibraryPhoto* _tmp50_; gint64 _tmp51_; - LibraryPhoto* _tmp52_; - GeeHashMap* _tmp53_; - LibraryPhoto* _tmp54_; - gint64 _tmp55_; #line 4563 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = self->priv->filesize_to_photo; + _tmp46_ = self->priv->filesize_to_photo; #line 4563 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = editable_filesize; + _tmp47_ = editable_filesize; #line 4563 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = photo; + _tmp48_ = photo; #line 4563 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp50_, &_tmp51_, _tmp52_); + gee_multi_map_set (_tmp46_, &_tmp47_, _tmp48_); #line 4564 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = self->priv->photo_to_editable_filesize; + _tmp49_ = self->priv->photo_to_editable_filesize; #line 4564 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = photo; + _tmp50_ = photo; #line 4564 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = editable_filesize; + _tmp51_ = editable_filesize; #line 4564 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp54_, &_tmp55_); -#line 35136 "Photo.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp50_, &_tmp51_); +#line 35513 "Photo.c" } #line 4567 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = photo; + _tmp52_ = photo; #line 4567 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PHOTO, Photo)); + _tmp53_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_PHOTO, Photo)); #line 4567 "/home/jens/Source/shotwell/src/Photo.vala" - raw_rows = _tmp57_; + raw_rows = _tmp53_; #line 4568 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = raw_rows; + _tmp54_ = raw_rows; #line 4568 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp58_ != NULL) { -#line 35148 "Photo.c" + if (_tmp54_ != NULL) { +#line 35525 "Photo.c" { GeeIterator* _row_it = NULL; - GeeCollection* _tmp59_; - GeeIterator* _tmp60_; + GeeCollection* _tmp55_; + GeeIterator* _tmp56_; #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = raw_rows; + _tmp55_ = raw_rows; #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp56_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" - _row_it = _tmp60_; + _row_it = _tmp56_; #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35161 "Photo.c" - GeeIterator* _tmp61_; - gboolean _tmp62_; +#line 35538 "Photo.c" + GeeIterator* _tmp57_; BackingPhotoRow* row = NULL; - GeeIterator* _tmp63_; - gpointer _tmp64_; - BackingPhotoRow* _tmp65_; - gint64 _tmp66_; -#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = _row_it; + GeeIterator* _tmp58_; + gpointer _tmp59_; + BackingPhotoRow* _tmp60_; + gint64 _tmp61_; #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = gee_iterator_next (_tmp61_); + _tmp57_ = _row_it; #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp62_) { + if (!gee_iterator_next (_tmp57_)) { #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35177 "Photo.c" +#line 35551 "Photo.c" } #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = _row_it; + _tmp58_ = _row_it; #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = gee_iterator_get (_tmp63_); + _tmp59_ = gee_iterator_get (_tmp58_); #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" - row = (BackingPhotoRow*) _tmp64_; + row = (BackingPhotoRow*) _tmp59_; #line 4570 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = row; + _tmp60_ = row; #line 4570 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = _tmp65_->filesize; + _tmp61_ = _tmp60_->filesize; #line 4570 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp66_ >= ((gint64) 0)) { -#line 35191 "Photo.c" - GeeMultiMap* _tmp67_; + if (_tmp61_ >= ((gint64) 0)) { +#line 35565 "Photo.c" + GeeMultiMap* _tmp62_; + BackingPhotoRow* _tmp63_; + gint64 _tmp64_; + LibraryPhoto* _tmp65_; + GeeMultiMap* _tmp66_; + LibraryPhoto* _tmp67_; BackingPhotoRow* _tmp68_; gint64 _tmp69_; - LibraryPhoto* _tmp70_; - GeeMultiMap* _tmp71_; - LibraryPhoto* _tmp72_; - BackingPhotoRow* _tmp73_; - gint64 _tmp74_; #line 4571 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = self->priv->filesize_to_photo; + _tmp62_ = self->priv->filesize_to_photo; #line 4571 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = row; + _tmp63_ = row; #line 4571 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = _tmp68_->filesize; + _tmp64_ = _tmp63_->filesize; #line 4571 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = photo; + _tmp65_ = photo; #line 4571 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp67_, &_tmp69_, _tmp70_); + gee_multi_map_set (_tmp62_, &_tmp64_, _tmp65_); #line 4572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = self->priv->photo_to_raw_development_filesize; + _tmp66_ = self->priv->photo_to_raw_development_filesize; #line 4572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = photo; + _tmp67_ = photo; #line 4572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = row; + _tmp68_ = row; #line 4572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = _tmp73_->filesize; + _tmp69_ = _tmp68_->filesize; #line 4572 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp71_, _tmp72_, &_tmp74_); -#line 35220 "Photo.c" + gee_multi_map_set (_tmp66_, _tmp67_, &_tmp69_); +#line 35594 "Photo.c" } #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 35224 "Photo.c" +#line 35598 "Photo.c" } #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 35228 "Photo.c" +#line 35602 "Photo.c" } } #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" @@ -35242,392 +35616,378 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _g_object_unref0 (photo); #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (object); -#line 35241 "Photo.c" +#line 35615 "Photo.c" } #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_object_it); -#line 35245 "Photo.c" +#line 35619 "Photo.c" } } #line 4579 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = removed; -#line 4579 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp75_ != NULL) { -#line 35252 "Photo.c" + if (removed != NULL) { +#line 35624 "Photo.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp76_; - GeeIterator* _tmp77_; -#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = removed; + GeeIterator* _tmp70_; #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = gee_iterable_iterator (_tmp76_); + _tmp70_ = gee_iterable_iterator (removed); #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" - _object_it = _tmp77_; + _object_it = _tmp70_; #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35265 "Photo.c" - GeeIterator* _tmp78_; - gboolean _tmp79_; +#line 35634 "Photo.c" + GeeIterator* _tmp71_; DataObject* object = NULL; - GeeIterator* _tmp80_; - gpointer _tmp81_; + GeeIterator* _tmp72_; + gpointer _tmp73_; LibraryPhoto* photo = NULL; - DataObject* _tmp82_; - LibraryPhoto* _tmp83_; + DataObject* _tmp74_; + LibraryPhoto* _tmp75_; GFile* editable = NULL; - LibraryPhoto* _tmp84_; - GFile* _tmp85_; - GFile* _tmp86_; - LibraryPhoto* _tmp94_; - guint _tmp95_; + LibraryPhoto* _tmp76_; + GFile* _tmp77_; + GFile* _tmp78_; + LibraryPhoto* _tmp86_; + guint _tmp87_; GeeCollection* raw_list = NULL; - LibraryPhoto* _tmp96_; - GeeCollection* _tmp97_; - GeeCollection* _tmp98_; - LibraryPhoto* _tmp107_; - guint _tmp108_; + LibraryPhoto* _tmp88_; + GeeCollection* _tmp89_; + GeeCollection* _tmp90_; + LibraryPhoto* _tmp98_; + guint _tmp99_; gint64 master_filesize = 0LL; - LibraryPhoto* _tmp109_; - BackingPhotoRow* _tmp110_; - BackingPhotoRow* _tmp111_; - gint64 _tmp112_; - gint64 _tmp113_; - gint64 _tmp114_ = 0LL; - LibraryPhoto* _tmp115_; - BackingPhotoRow* _tmp116_; - BackingPhotoRow* _tmp117_; - gboolean _tmp118_; + LibraryPhoto* _tmp100_; + BackingPhotoRow* _tmp101_; + BackingPhotoRow* _tmp102_; + gint64 _tmp103_; + gint64 _tmp104_; + gint64 _tmp105_ = 0LL; + LibraryPhoto* _tmp106_; + BackingPhotoRow* _tmp107_; + BackingPhotoRow* _tmp108_; + gboolean _tmp109_; gint64 editable_filesize = 0LL; - GeeMultiMap* _tmp123_; - gint64 _tmp124_; - LibraryPhoto* _tmp125_; - GeeHashMap* _tmp126_; - LibraryPhoto* _tmp127_; - gint64 _tmp128_; + GeeMultiMap* _tmp114_; + gint64 _tmp115_; + LibraryPhoto* _tmp116_; + GeeHashMap* _tmp117_; + LibraryPhoto* _tmp118_; + gint64 _tmp119_; GeeCollection* raw_rows = NULL; - LibraryPhoto* _tmp134_; - GeeCollection* _tmp135_; - GeeCollection* _tmp136_; -#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = _object_it; + LibraryPhoto* _tmp125_; + GeeCollection* _tmp126_; + GeeCollection* _tmp127_; #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = gee_iterator_next (_tmp78_); + _tmp71_ = _object_it; #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp79_) { + if (!gee_iterator_next (_tmp71_)) { #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35316 "Photo.c" +#line 35682 "Photo.c" } #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = _object_it; + _tmp72_ = _object_it; #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = gee_iterator_get (_tmp80_); + _tmp73_ = gee_iterator_get (_tmp72_); #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" - object = (DataObject*) _tmp81_; + object = (DataObject*) _tmp73_; #line 4581 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = object; + _tmp74_ = object; #line 4581 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp75_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 4581 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp83_; + photo = _tmp75_; #line 4583 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = photo; + _tmp76_ = photo; #line 4583 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, TYPE_PHOTO, Photo)); + _tmp77_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, TYPE_PHOTO, Photo)); #line 4583 "/home/jens/Source/shotwell/src/Photo.vala" - editable = _tmp85_; + editable = _tmp77_; #line 4584 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = editable; + _tmp78_ = editable; #line 4584 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp86_ != NULL) { -#line 35340 "Photo.c" + if (_tmp78_ != NULL) { +#line 35706 "Photo.c" gboolean is_removed = FALSE; - GeeHashMap* _tmp87_; - LibraryPhoto* _tmp88_; - GFile* _tmp89_; - GFile* _tmp90_; - gboolean _tmp91_; - gboolean _tmp92_; - gboolean _tmp93_; + GeeHashMap* _tmp79_; + LibraryPhoto* _tmp80_; + GFile* _tmp81_; + GFile* _tmp82_; + gboolean _tmp83_; + gboolean _tmp84_; + gboolean _tmp85_; #line 4585 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = self->priv->by_editable_file; + _tmp79_ = self->priv->by_editable_file; #line 4585 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = photo; + _tmp80_ = photo; #line 4585 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_PHOTO, Photo)); + _tmp81_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_PHOTO, Photo)); #line 4585 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = _tmp89_; + _tmp82_ = _tmp81_; #line 4585 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp90_, NULL); + _tmp83_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp82_, NULL); #line 4585 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = _tmp91_; + _tmp84_ = _tmp83_; #line 4585 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp90_); + _g_object_unref0 (_tmp82_); #line 4585 "/home/jens/Source/shotwell/src/Photo.vala" - is_removed = _tmp92_; + is_removed = _tmp84_; #line 4586 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = is_removed; + _tmp85_ = is_removed; #line 4586 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp93_, "is_removed"); -#line 35369 "Photo.c" + _vala_assert (_tmp85_, "is_removed"); +#line 35735 "Photo.c" } #line 4588 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = photo; + _tmp86_ = photo; #line 4588 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_parse_name ("editable-replaced", TYPE_PHOTO, &_tmp95_, NULL, FALSE); + g_signal_parse_name ("editable-replaced", TYPE_PHOTO, &_tmp87_, NULL, FALSE); #line 4588 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp95_, 0, NULL, (GCallback) _library_photo_source_collection_on_editable_replaced_photo_editable_replaced, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp87_, 0, NULL, (GCallback) _library_photo_source_collection_on_editable_replaced_photo_editable_replaced, self); #line 4590 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = photo; + _tmp88_ = photo; #line 4590 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, TYPE_PHOTO, Photo)); + _tmp89_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_PHOTO, Photo)); #line 4590 "/home/jens/Source/shotwell/src/Photo.vala" - raw_list = _tmp97_; + raw_list = _tmp89_; #line 4591 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = raw_list; + _tmp90_ = raw_list; #line 4591 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp98_ != NULL) { -#line 35387 "Photo.c" + if (_tmp90_ != NULL) { +#line 35753 "Photo.c" { GeeIterator* _f_it = NULL; - GeeCollection* _tmp99_; - GeeIterator* _tmp100_; + GeeCollection* _tmp91_; + GeeIterator* _tmp92_; #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp99_ = raw_list; + _tmp91_ = raw_list; #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp92_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" - _f_it = _tmp100_; + _f_it = _tmp92_; #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35400 "Photo.c" - GeeIterator* _tmp101_; - gboolean _tmp102_; +#line 35766 "Photo.c" + GeeIterator* _tmp93_; GFile* f = NULL; - GeeIterator* _tmp103_; - gpointer _tmp104_; - GeeHashMap* _tmp105_; - GFile* _tmp106_; -#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = _f_it; + GeeIterator* _tmp94_; + gpointer _tmp95_; + GeeHashMap* _tmp96_; + GFile* _tmp97_; #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp102_ = gee_iterator_next (_tmp101_); + _tmp93_ = _f_it; #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp102_) { + if (!gee_iterator_next (_tmp93_)) { #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35416 "Photo.c" +#line 35779 "Photo.c" } #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp103_ = _f_it; + _tmp94_ = _f_it; #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp104_ = gee_iterator_get (_tmp103_); + _tmp95_ = gee_iterator_get (_tmp94_); #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" - f = (GFile*) _tmp104_; + f = (GFile*) _tmp95_; #line 4593 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp105_ = self->priv->by_raw_development_file; + _tmp96_ = self->priv->by_raw_development_file; #line 4593 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp106_ = f; + _tmp97_ = f; #line 4593 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp106_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp97_, NULL); #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 35432 "Photo.c" +#line 35795 "Photo.c" } #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 35436 "Photo.c" +#line 35799 "Photo.c" } } #line 4594 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp107_ = photo; + _tmp98_ = photo; #line 4594 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_parse_name ("raw-development-modified", TYPE_PHOTO, &_tmp108_, NULL, FALSE); + g_signal_parse_name ("raw-development-modified", TYPE_PHOTO, &_tmp99_, NULL, FALSE); #line 4594 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp108_, 0, NULL, (GCallback) _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp99_, 0, NULL, (GCallback) _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified, self); #line 4596 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp109_ = photo; + _tmp100_ = photo; #line 4596 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp110_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, TYPE_PHOTO, Photo)); + _tmp101_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, TYPE_PHOTO, Photo)); #line 4596 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp111_ = _tmp110_; + _tmp102_ = _tmp101_; #line 4596 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp112_ = _tmp111_->filesize; + _tmp103_ = _tmp102_->filesize; #line 4596 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp113_ = _tmp112_; + _tmp104_ = _tmp103_; #line 4596 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp111_); + _backing_photo_row_unref0 (_tmp102_); #line 4596 "/home/jens/Source/shotwell/src/Photo.vala" - master_filesize = _tmp113_; + master_filesize = _tmp104_; #line 4597 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp115_ = photo; + _tmp106_ = photo; #line 4597 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp116_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, TYPE_PHOTO, Photo)); + _tmp107_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, TYPE_PHOTO, Photo)); #line 4597 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp117_ = _tmp116_; + _tmp108_ = _tmp107_; #line 4597 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp118_ = _tmp117_ != NULL; + _tmp109_ = _tmp108_ != NULL; #line 4597 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp117_); + _backing_photo_row_unref0 (_tmp108_); #line 4597 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp118_) { -#line 35471 "Photo.c" - LibraryPhoto* _tmp119_; - BackingPhotoRow* _tmp120_; - BackingPhotoRow* _tmp121_; - gint64 _tmp122_; + if (_tmp109_) { +#line 35834 "Photo.c" + LibraryPhoto* _tmp110_; + BackingPhotoRow* _tmp111_; + BackingPhotoRow* _tmp112_; + gint64 _tmp113_; #line 4598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp119_ = photo; + _tmp110_ = photo; #line 4598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp120_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, TYPE_PHOTO, Photo)); + _tmp111_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, TYPE_PHOTO, Photo)); #line 4598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp121_ = _tmp120_; + _tmp112_ = _tmp111_; #line 4598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp122_ = _tmp121_->filesize; + _tmp113_ = _tmp112_->filesize; #line 4598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp114_ = _tmp122_; + _tmp105_ = _tmp113_; #line 4598 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp121_); -#line 35488 "Photo.c" + _backing_photo_row_unref0 (_tmp112_); +#line 35851 "Photo.c" } else { #line 4599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp114_ = (gint64) -1; -#line 35492 "Photo.c" + _tmp105_ = (gint64) -1; +#line 35855 "Photo.c" } #line 4597 "/home/jens/Source/shotwell/src/Photo.vala" - editable_filesize = _tmp114_; + editable_filesize = _tmp105_; #line 4600 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp123_ = self->priv->filesize_to_photo; + _tmp114_ = self->priv->filesize_to_photo; #line 4600 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp124_ = master_filesize; + _tmp115_ = master_filesize; #line 4600 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp125_ = photo; + _tmp116_ = photo; #line 4600 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove (_tmp123_, &_tmp124_, _tmp125_); + gee_multi_map_remove (_tmp114_, &_tmp115_, _tmp116_); #line 4601 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp126_ = self->priv->photo_to_master_filesize; + _tmp117_ = self->priv->photo_to_master_filesize; #line 4601 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp127_ = photo; + _tmp118_ = photo; #line 4601 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp127_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp118_, NULL); #line 4602 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp128_ = editable_filesize; + _tmp119_ = editable_filesize; #line 4602 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp128_ >= ((gint64) 0)) { -#line 35514 "Photo.c" - GeeMultiMap* _tmp129_; - gint64 _tmp130_; - LibraryPhoto* _tmp131_; - GeeHashMap* _tmp132_; - LibraryPhoto* _tmp133_; + if (_tmp119_ >= ((gint64) 0)) { +#line 35877 "Photo.c" + GeeMultiMap* _tmp120_; + gint64 _tmp121_; + LibraryPhoto* _tmp122_; + GeeHashMap* _tmp123_; + LibraryPhoto* _tmp124_; #line 4603 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp129_ = self->priv->filesize_to_photo; + _tmp120_ = self->priv->filesize_to_photo; #line 4603 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp130_ = editable_filesize; + _tmp121_ = editable_filesize; #line 4603 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp131_ = photo; + _tmp122_ = photo; #line 4603 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove (_tmp129_, &_tmp130_, _tmp131_); + gee_multi_map_remove (_tmp120_, &_tmp121_, _tmp122_); #line 4604 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp132_ = self->priv->photo_to_editable_filesize; + _tmp123_ = self->priv->photo_to_editable_filesize; #line 4604 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp133_ = photo; + _tmp124_ = photo; #line 4604 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp133_, NULL); -#line 35534 "Photo.c" + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp124_, NULL); +#line 35897 "Photo.c" } #line 4607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp134_ = photo; + _tmp125_ = photo; #line 4607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp135_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, TYPE_PHOTO, Photo)); + _tmp126_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, TYPE_PHOTO, Photo)); #line 4607 "/home/jens/Source/shotwell/src/Photo.vala" - raw_rows = _tmp135_; + raw_rows = _tmp126_; #line 4608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp136_ = raw_rows; + _tmp127_ = raw_rows; #line 4608 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp136_ != NULL) { -#line 35546 "Photo.c" + if (_tmp127_ != NULL) { +#line 35909 "Photo.c" { GeeIterator* _row_it = NULL; - GeeCollection* _tmp137_; - GeeIterator* _tmp138_; + GeeCollection* _tmp128_; + GeeIterator* _tmp129_; #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp137_ = raw_rows; + _tmp128_ = raw_rows; #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp138_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp129_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp128_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" - _row_it = _tmp138_; + _row_it = _tmp129_; #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35559 "Photo.c" - GeeIterator* _tmp139_; - gboolean _tmp140_; +#line 35922 "Photo.c" + GeeIterator* _tmp130_; BackingPhotoRow* row = NULL; - GeeIterator* _tmp141_; - gpointer _tmp142_; - BackingPhotoRow* _tmp143_; - gint64 _tmp144_; + GeeIterator* _tmp131_; + gpointer _tmp132_; + BackingPhotoRow* _tmp133_; + gint64 _tmp134_; #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp139_ = _row_it; + _tmp130_ = _row_it; #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp140_ = gee_iterator_next (_tmp139_); -#line 4609 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp140_) { + if (!gee_iterator_next (_tmp130_)) { #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35575 "Photo.c" +#line 35935 "Photo.c" } #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp141_ = _row_it; + _tmp131_ = _row_it; #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp142_ = gee_iterator_get (_tmp141_); + _tmp132_ = gee_iterator_get (_tmp131_); #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" - row = (BackingPhotoRow*) _tmp142_; + row = (BackingPhotoRow*) _tmp132_; #line 4610 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp143_ = row; + _tmp133_ = row; #line 4610 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp144_ = _tmp143_->filesize; + _tmp134_ = _tmp133_->filesize; #line 4610 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp144_ >= ((gint64) 0)) { -#line 35589 "Photo.c" - GeeMultiMap* _tmp145_; - BackingPhotoRow* _tmp146_; - gint64 _tmp147_; - LibraryPhoto* _tmp148_; - GeeMultiMap* _tmp149_; - LibraryPhoto* _tmp150_; - BackingPhotoRow* _tmp151_; - gint64 _tmp152_; + if (_tmp134_ >= ((gint64) 0)) { +#line 35949 "Photo.c" + GeeMultiMap* _tmp135_; + BackingPhotoRow* _tmp136_; + gint64 _tmp137_; + LibraryPhoto* _tmp138_; + GeeMultiMap* _tmp139_; + LibraryPhoto* _tmp140_; + BackingPhotoRow* _tmp141_; + gint64 _tmp142_; #line 4611 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp145_ = self->priv->filesize_to_photo; + _tmp135_ = self->priv->filesize_to_photo; #line 4611 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp146_ = row; + _tmp136_ = row; #line 4611 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp147_ = _tmp146_->filesize; + _tmp137_ = _tmp136_->filesize; #line 4611 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp148_ = photo; + _tmp138_ = photo; #line 4611 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove (_tmp145_, &_tmp147_, _tmp148_); + gee_multi_map_remove (_tmp135_, &_tmp137_, _tmp138_); #line 4612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp149_ = self->priv->photo_to_raw_development_filesize; + _tmp139_ = self->priv->photo_to_raw_development_filesize; #line 4612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp150_ = photo; + _tmp140_ = photo; #line 4612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp151_ = row; + _tmp141_ = row; #line 4612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp152_ = _tmp151_->filesize; + _tmp142_ = _tmp141_->filesize; #line 4612 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove (_tmp149_, _tmp150_, &_tmp152_); -#line 35618 "Photo.c" + gee_multi_map_remove (_tmp139_, _tmp140_, &_tmp142_); +#line 35978 "Photo.c" } #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 35622 "Photo.c" +#line 35982 "Photo.c" } #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 35626 "Photo.c" +#line 35986 "Photo.c" } } #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" @@ -35640,26 +36000,25 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _g_object_unref0 (photo); #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (object); -#line 35639 "Photo.c" +#line 35999 "Photo.c" } #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_object_it); -#line 35643 "Photo.c" +#line 36003 "Photo.c" } } #line 4619 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp153_ = added; -#line 4619 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp154_ = removed; -#line 4619 "/home/jens/Source/shotwell/src/Photo.vala" - DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp153_, _tmp154_); -#line 35652 "Photo.c" + DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), added, removed); +#line 36008 "Photo.c" } -static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSourceCollection* self, Photo* photo, GFile* old_file, GFile* new_file) { - GFile* _tmp0_; - GFile* _tmp5_; +static void +library_photo_source_collection_on_editable_replaced (LibraryPhotoSourceCollection* self, + Photo* photo, + GFile* old_file, + GFile* new_file) +{ #line 4622 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4622 "/home/jens/Source/shotwell/src/Photo.vala" @@ -35669,334 +36028,309 @@ static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSo #line 4622 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file)); #line 4623 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = old_file; -#line 4623 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_ != NULL) { -#line 35671 "Photo.c" + if (old_file != NULL) { +#line 36028 "Photo.c" gboolean is_removed = FALSE; - GeeHashMap* _tmp1_; - GFile* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; -#line 4624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = self->priv->by_editable_file; + GeeHashMap* _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; #line 4624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = old_file; + _tmp0_ = self->priv->by_editable_file; #line 4624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, NULL); + _tmp1_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), old_file, NULL); #line 4624 "/home/jens/Source/shotwell/src/Photo.vala" - is_removed = _tmp3_; + is_removed = _tmp1_; #line 4625 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = is_removed; + _tmp2_ = is_removed; #line 4625 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp4_, "is_removed"); -#line 35689 "Photo.c" + _vala_assert (_tmp2_, "is_removed"); +#line 36043 "Photo.c" } #line 4628 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = new_file; -#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_ != NULL) { -#line 35695 "Photo.c" - GeeHashMap* _tmp6_; - GFile* _tmp7_; - Photo* _tmp8_; -#line 4629 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->priv->by_editable_file; -#line 4629 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = new_file; + if (new_file != NULL) { +#line 36047 "Photo.c" + GeeHashMap* _tmp3_; #line 4629 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo; + _tmp3_ = self->priv->by_editable_file; #line 4629 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 35707 "Photo.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), new_file, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_LIBRARY_PHOTO, LibraryPhoto)); +#line 36053 "Photo.c" } } -static void library_photo_source_collection_on_raw_development_modified (LibraryPhotoSourceCollection* self, Photo* _photo) { +static void +library_photo_source_collection_on_raw_development_modified (LibraryPhotoSourceCollection* self, + Photo* _photo) +{ LibraryPhoto* photo = NULL; - Photo* _tmp0_; + LibraryPhoto* _tmp0_; LibraryPhoto* _tmp1_; - LibraryPhoto* _tmp2_; - GeeMultiMap* _tmp3_; - LibraryPhoto* _tmp4_; - gboolean _tmp5_; + GeeMultiMap* _tmp2_; + LibraryPhoto* _tmp3_; GeeCollection* raw_list = NULL; - LibraryPhoto* _tmp23_; - GeeCollection* _tmp24_; - GeeCollection* _tmp25_; + LibraryPhoto* _tmp20_; + GeeCollection* _tmp21_; + GeeCollection* _tmp22_; GeeCollection* raw_rows = NULL; - LibraryPhoto* _tmp35_; - GeeCollection* _tmp36_; - GeeCollection* _tmp37_; + LibraryPhoto* _tmp31_; + GeeCollection* _tmp32_; + GeeCollection* _tmp33_; #line 4632 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4632 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (_photo)); #line 4633 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _photo; -#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_photo, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _photo) : NULL); #line 4633 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp1_; + photo = _tmp0_; #line 4634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo; + _tmp1_ = photo; #line 4634 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 4635 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 4635 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 35746 "Photo.c" +#line 36091 "Photo.c" } #line 4638 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->priv->photo_to_raw_development_filesize; + _tmp2_ = self->priv->photo_to_raw_development_filesize; #line 4638 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo; -#line 4638 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_); + _tmp3_ = photo; #line 4638 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_) { -#line 35756 "Photo.c" - GeeMultiMap* _tmp21_; - LibraryPhoto* _tmp22_; + if (gee_multi_map_contains (_tmp2_, _tmp3_)) { +#line 36099 "Photo.c" + GeeMultiMap* _tmp18_; + LibraryPhoto* _tmp19_; { GeeIterator* _s_it = NULL; - GeeMultiMap* _tmp6_; - LibraryPhoto* _tmp7_; - GeeCollection* _tmp8_; - GeeCollection* _tmp9_; - GeeIterator* _tmp10_; - GeeIterator* _tmp11_; + GeeMultiMap* _tmp4_; + LibraryPhoto* _tmp5_; + GeeCollection* _tmp6_; + GeeCollection* _tmp7_; + GeeIterator* _tmp8_; + GeeIterator* _tmp9_; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->priv->photo_to_raw_development_filesize; + _tmp4_ = self->priv->photo_to_raw_development_filesize; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo; + _tmp5_ = photo; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = gee_multi_map_get (_tmp6_, _tmp7_); + _tmp6_ = gee_multi_map_get (_tmp4_, _tmp5_); #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp7_); #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _s_it = _tmp11_; + _s_it = _tmp9_; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35785 "Photo.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 36128 "Photo.c" + GeeIterator* _tmp10_; gint64 s = 0LL; - GeeIterator* _tmp14_; - gpointer _tmp15_; - gint64* _tmp16_; - gint64 _tmp17_; - GeeMultiMap* _tmp18_; - gint64 _tmp19_; - LibraryPhoto* _tmp20_; -#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _s_it; + GeeIterator* _tmp11_; + gpointer _tmp12_; + gint64* _tmp13_; + gint64 _tmp14_; + GeeMultiMap* _tmp15_; + gint64 _tmp16_; + LibraryPhoto* _tmp17_; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = gee_iterator_next (_tmp12_); + _tmp10_ = _s_it; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp10_)) { #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35804 "Photo.c" +#line 36144 "Photo.c" } #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _s_it; + _tmp11_ = _s_it; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = (gint64*) _tmp15_; + _tmp13_ = (gint64*) _tmp12_; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = *_tmp16_; + _tmp14_ = *_tmp13_; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp13_); #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - s = _tmp17_; + s = _tmp14_; #line 4640 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->priv->filesize_to_photo; + _tmp15_ = self->priv->filesize_to_photo; #line 4640 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = s; + _tmp16_ = s; #line 4640 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = photo; + _tmp17_ = photo; #line 4640 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove (_tmp18_, &_tmp19_, _tmp20_); -#line 35826 "Photo.c" + gee_multi_map_remove (_tmp15_, &_tmp16_, _tmp17_); +#line 36166 "Photo.c" } #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_s_it); -#line 35830 "Photo.c" +#line 36170 "Photo.c" } #line 4641 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = self->priv->photo_to_raw_development_filesize; + _tmp18_ = self->priv->photo_to_raw_development_filesize; #line 4641 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = photo; + _tmp19_ = photo; #line 4641 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove_all (_tmp21_, _tmp22_); -#line 35838 "Photo.c" + gee_multi_map_remove_all (_tmp18_, _tmp19_); +#line 36178 "Photo.c" } #line 4645 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = photo; + _tmp20_ = photo; #line 4645 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO, Photo)); + _tmp21_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo)); #line 4645 "/home/jens/Source/shotwell/src/Photo.vala" - raw_list = _tmp24_; + raw_list = _tmp21_; #line 4646 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = raw_list; + _tmp22_ = raw_list; #line 4646 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp25_ != NULL) { -#line 35850 "Photo.c" + if (_tmp22_ != NULL) { +#line 36190 "Photo.c" { GeeIterator* _f_it = NULL; - GeeCollection* _tmp26_; - GeeIterator* _tmp27_; + GeeCollection* _tmp23_; + GeeIterator* _tmp24_; #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = raw_list; + _tmp23_ = raw_list; #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp24_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" - _f_it = _tmp27_; + _f_it = _tmp24_; #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35863 "Photo.c" - GeeIterator* _tmp28_; - gboolean _tmp29_; +#line 36203 "Photo.c" + GeeIterator* _tmp25_; GFile* f = NULL; - GeeIterator* _tmp30_; - gpointer _tmp31_; - GeeHashMap* _tmp32_; - GFile* _tmp33_; - LibraryPhoto* _tmp34_; + GeeIterator* _tmp26_; + gpointer _tmp27_; + GeeHashMap* _tmp28_; + GFile* _tmp29_; + LibraryPhoto* _tmp30_; #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _f_it; -#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = gee_iterator_next (_tmp28_); + _tmp25_ = _f_it; #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp29_) { + if (!gee_iterator_next (_tmp25_)) { #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35880 "Photo.c" +#line 36217 "Photo.c" } #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _f_it; + _tmp26_ = _f_it; #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = gee_iterator_get (_tmp30_); + _tmp27_ = gee_iterator_get (_tmp26_); #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" - f = (GFile*) _tmp31_; + f = (GFile*) _tmp27_; #line 4648 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = self->priv->by_raw_development_file; + _tmp28_ = self->priv->by_raw_development_file; #line 4648 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = f; + _tmp29_ = f; #line 4648 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = photo; + _tmp30_ = photo; #line 4648 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp33_, _tmp34_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp29_, _tmp30_); #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 35898 "Photo.c" +#line 36235 "Photo.c" } #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 35902 "Photo.c" +#line 36239 "Photo.c" } } #line 4650 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = photo; + _tmp31_ = photo; #line 4650 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo)); + _tmp32_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PHOTO, Photo)); #line 4650 "/home/jens/Source/shotwell/src/Photo.vala" - raw_rows = _tmp36_; + raw_rows = _tmp32_; #line 4651 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = raw_rows; + _tmp33_ = raw_rows; #line 4651 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp37_ != NULL) { -#line 35915 "Photo.c" + if (_tmp33_ != NULL) { +#line 36252 "Photo.c" { GeeIterator* _row_it = NULL; - GeeCollection* _tmp38_; - GeeIterator* _tmp39_; + GeeCollection* _tmp34_; + GeeIterator* _tmp35_; #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = raw_rows; + _tmp34_ = raw_rows; #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp35_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" - _row_it = _tmp39_; + _row_it = _tmp35_; #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35928 "Photo.c" - GeeIterator* _tmp40_; - gboolean _tmp41_; +#line 36265 "Photo.c" + GeeIterator* _tmp36_; BackingPhotoRow* row = NULL; - GeeIterator* _tmp42_; - gpointer _tmp43_; - BackingPhotoRow* _tmp44_; - gint64 _tmp45_; -#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = _row_it; + GeeIterator* _tmp37_; + gpointer _tmp38_; + BackingPhotoRow* _tmp39_; + gint64 _tmp40_; #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = gee_iterator_next (_tmp40_); + _tmp36_ = _row_it; #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp41_) { + if (!gee_iterator_next (_tmp36_)) { #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35944 "Photo.c" +#line 36278 "Photo.c" } #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _row_it; + _tmp37_ = _row_it; #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = gee_iterator_get (_tmp42_); + _tmp38_ = gee_iterator_get (_tmp37_); #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" - row = (BackingPhotoRow*) _tmp43_; + row = (BackingPhotoRow*) _tmp38_; #line 4653 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = row; + _tmp39_ = row; #line 4653 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = _tmp44_->filesize; + _tmp40_ = _tmp39_->filesize; #line 4653 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp45_ > ((gint64) 0)) { -#line 35958 "Photo.c" - GeeMultiMap* _tmp46_; + if (_tmp40_ > ((gint64) 0)) { +#line 36292 "Photo.c" + GeeMultiMap* _tmp41_; + BackingPhotoRow* _tmp42_; + gint64 _tmp43_; + LibraryPhoto* _tmp44_; + GeeMultiMap* _tmp45_; + LibraryPhoto* _tmp46_; BackingPhotoRow* _tmp47_; gint64 _tmp48_; - LibraryPhoto* _tmp49_; - GeeMultiMap* _tmp50_; - LibraryPhoto* _tmp51_; - BackingPhotoRow* _tmp52_; - gint64 _tmp53_; #line 4654 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = self->priv->filesize_to_photo; + _tmp41_ = self->priv->filesize_to_photo; #line 4654 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = row; + _tmp42_ = row; #line 4654 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = _tmp47_->filesize; + _tmp43_ = _tmp42_->filesize; #line 4654 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = photo; + _tmp44_ = photo; #line 4654 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp46_, &_tmp48_, _tmp49_); + gee_multi_map_set (_tmp41_, &_tmp43_, _tmp44_); #line 4655 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = self->priv->photo_to_raw_development_filesize; + _tmp45_ = self->priv->photo_to_raw_development_filesize; #line 4655 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = photo; + _tmp46_ = photo; #line 4655 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = row; + _tmp47_ = row; #line 4655 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = _tmp52_->filesize; + _tmp48_ = _tmp47_->filesize; #line 4655 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp50_, _tmp51_, &_tmp53_); -#line 35987 "Photo.c" + gee_multi_map_set (_tmp45_, _tmp46_, &_tmp48_); +#line 36321 "Photo.c" } #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 35991 "Photo.c" +#line 36325 "Photo.c" } #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 35995 "Photo.c" +#line 36329 "Photo.c" } } #line 4632 "/home/jens/Source/shotwell/src/Photo.vala" @@ -36005,347 +36339,333 @@ static void library_photo_source_collection_on_raw_development_modified (Library _g_object_unref0 (raw_list); #line 4632 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 36004 "Photo.c" +#line 36338 "Photo.c" } -static gpointer __int64_dup0 (gpointer self) { +static gpointer +__int64_dup0 (gpointer self) +{ #line 4671 "/home/jens/Source/shotwell/src/Photo.vala" return self ? _int64_dup (self) : NULL; -#line 36011 "Photo.c" +#line 36347 "Photo.c" } -static void library_photo_source_collection_real_items_altered (DataCollection* base, GeeMap* items) { +static void +library_photo_source_collection_real_items_altered (DataCollection* base, + GeeMap* items) +{ LibraryPhotoSourceCollection * self; - GeeMap* _tmp72_; #line 4661 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4661 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_MAP (items)); -#line 36022 "Photo.c" +#line 36360 "Photo.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = items; + _tmp0_ = gee_map_get_keys (items); #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_; -#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36049 "Photo.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 36384 "Photo.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp6_; + gpointer _tmp7_; Alteration* alteration = NULL; - GeeMap* _tmp10_; - DataObject* _tmp11_; - gpointer _tmp12_; + DataObject* _tmp8_; + gpointer _tmp9_; LibraryPhoto* photo = NULL; - DataObject* _tmp13_; - LibraryPhoto* _tmp14_; - gboolean _tmp15_ = FALSE; - Alteration* _tmp16_; - gboolean _tmp17_; -#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _object_it; + DataObject* _tmp10_; + LibraryPhoto* _tmp11_; + gboolean _tmp12_ = FALSE; + Alteration* _tmp13_; #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36073 "Photo.c" +#line 36403 "Photo.c" } #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - object = (DataObject*) _tmp9_; -#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = items; + object = (DataObject*) _tmp7_; #line 4663 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = object; + _tmp8_ = object; #line 4663 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = gee_map_get (_tmp10_, _tmp11_); + _tmp9_ = gee_map_get (items, _tmp8_); #line 4663 "/home/jens/Source/shotwell/src/Photo.vala" - alteration = (Alteration*) _tmp12_; + alteration = (Alteration*) _tmp9_; #line 4665 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = object; + _tmp10_ = object; #line 4665 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 4665 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp14_; -#line 4667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = alteration; + photo = _tmp11_; #line 4667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = alteration_has_detail (_tmp16_, "image", "master"); + _tmp13_ = alteration; #line 4667 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp17_) { + if (alteration_has_detail (_tmp13_, "image", "master")) { #line 4667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = TRUE; -#line 36103 "Photo.c" + _tmp12_ = TRUE; +#line 36429 "Photo.c" } else { - Alteration* _tmp18_; - gboolean _tmp19_; -#line 4667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = alteration; + Alteration* _tmp14_; #line 4667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = alteration_has_detail (_tmp18_, "image", "editable"); + _tmp14_ = alteration; #line 4667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp19_; -#line 36113 "Photo.c" + _tmp12_ = alteration_has_detail (_tmp14_, "image", "editable"); +#line 36436 "Photo.c" } #line 4667 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp15_) { -#line 36117 "Photo.c" + if (_tmp12_) { +#line 36440 "Photo.c" gint64 old_master_filesize = 0LL; - GeeHashMap* _tmp20_; - LibraryPhoto* _tmp21_; - gpointer _tmp22_; - gint64* _tmp23_; - gint64 _tmp24_; - gint64* _tmp25_ = NULL; - GeeHashMap* _tmp26_; - LibraryPhoto* _tmp27_; - gboolean _tmp28_; + GeeHashMap* _tmp15_; + LibraryPhoto* _tmp16_; + gpointer _tmp17_; + gint64* _tmp18_; + gint64 _tmp19_; + gint64* _tmp20_ = NULL; + GeeHashMap* _tmp21_; + LibraryPhoto* _tmp22_; gint64 old_editable_filesize = 0LL; - GeeHashMap* _tmp34_; - LibraryPhoto* _tmp35_; - GeeMultiMap* _tmp36_; - gint64 _tmp37_; - LibraryPhoto* _tmp38_; - gint64 _tmp39_; + GeeHashMap* _tmp28_; + LibraryPhoto* _tmp29_; + GeeMultiMap* _tmp30_; + gint64 _tmp31_; + LibraryPhoto* _tmp32_; + gint64 _tmp33_; gint64 master_filesize = 0LL; + LibraryPhoto* _tmp39_; + BackingPhotoRow* _tmp40_; + BackingPhotoRow* _tmp41_; + gint64 _tmp42_; + gint64 _tmp43_; + gint64 _tmp44_ = 0LL; LibraryPhoto* _tmp45_; BackingPhotoRow* _tmp46_; BackingPhotoRow* _tmp47_; - gint64 _tmp48_; - gint64 _tmp49_; - gint64 _tmp50_ = 0LL; - LibraryPhoto* _tmp51_; - BackingPhotoRow* _tmp52_; - BackingPhotoRow* _tmp53_; - gboolean _tmp54_; + gboolean _tmp48_; gint64 editable_filesize = 0LL; - GeeHashMap* _tmp59_; - LibraryPhoto* _tmp60_; - gint64 _tmp61_; - GeeMultiMap* _tmp62_; - gint64 _tmp63_; - LibraryPhoto* _tmp64_; - gint64 _tmp65_; + GeeHashMap* _tmp53_; + LibraryPhoto* _tmp54_; + gint64 _tmp55_; + GeeMultiMap* _tmp56_; + gint64 _tmp57_; + LibraryPhoto* _tmp58_; + gint64 _tmp59_; #line 4668 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = self->priv->photo_to_master_filesize; + _tmp15_ = self->priv->photo_to_master_filesize; #line 4668 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = photo; + _tmp16_ = photo; #line 4668 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp21_); + _tmp17_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_); #line 4668 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = (gint64*) _tmp22_; + _tmp18_ = (gint64*) _tmp17_; #line 4668 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = *_tmp23_; + _tmp19_ = *_tmp18_; #line 4668 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp23_); + _g_free0 (_tmp18_); #line 4668 "/home/jens/Source/shotwell/src/Photo.vala" - old_master_filesize = _tmp24_; + old_master_filesize = _tmp19_; #line 4669 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = self->priv->photo_to_editable_filesize; + _tmp21_ = self->priv->photo_to_editable_filesize; #line 4669 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = photo; + _tmp22_ = photo; #line 4669 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_); -#line 4669 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp28_) { -#line 36176 "Photo.c" - GeeHashMap* _tmp29_; - LibraryPhoto* _tmp30_; - gpointer _tmp31_; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_)) { +#line 36496 "Photo.c" + GeeHashMap* _tmp23_; + LibraryPhoto* _tmp24_; + gpointer _tmp25_; #line 4670 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = self->priv->photo_to_editable_filesize; + _tmp23_ = self->priv->photo_to_editable_filesize; #line 4670 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = photo; + _tmp24_ = photo; #line 4670 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp30_); + _tmp25_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_); #line 4670 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp25_); + _g_free0 (_tmp20_); #line 4670 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = (gint64*) _tmp31_; -#line 36190 "Photo.c" + _tmp20_ = (gint64*) _tmp25_; +#line 36510 "Photo.c" } else { - gint64 _tmp32_; - gint64* _tmp33_; + gint64 _tmp26_; + gint64* _tmp27_; #line 4671 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = (gint64) -1; + _tmp26_ = (gint64) -1; #line 4671 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = __int64_dup0 (&_tmp32_); + _tmp27_ = __int64_dup0 (&_tmp26_); #line 4671 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp25_); + _g_free0 (_tmp20_); #line 4671 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp33_; -#line 36202 "Photo.c" + _tmp20_ = _tmp27_; +#line 36522 "Photo.c" } #line 4669 "/home/jens/Source/shotwell/src/Photo.vala" - old_editable_filesize = *_tmp25_; + old_editable_filesize = *_tmp20_; #line 4673 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = self->priv->photo_to_master_filesize; + _tmp28_ = self->priv->photo_to_master_filesize; #line 4673 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = photo; + _tmp29_ = photo; #line 4673 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp35_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp29_, NULL); #line 4674 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = self->priv->filesize_to_photo; + _tmp30_ = self->priv->filesize_to_photo; #line 4674 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = old_master_filesize; + _tmp31_ = old_master_filesize; #line 4674 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = photo; + _tmp32_ = photo; #line 4674 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove (_tmp36_, &_tmp37_, _tmp38_); + gee_multi_map_remove (_tmp30_, &_tmp31_, _tmp32_); #line 4675 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = old_editable_filesize; + _tmp33_ = old_editable_filesize; #line 4675 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp39_ >= ((gint64) 0)) { -#line 36224 "Photo.c" - GeeHashMap* _tmp40_; - LibraryPhoto* _tmp41_; - GeeMultiMap* _tmp42_; - gint64 _tmp43_; - LibraryPhoto* _tmp44_; + if (_tmp33_ >= ((gint64) 0)) { +#line 36544 "Photo.c" + GeeHashMap* _tmp34_; + LibraryPhoto* _tmp35_; + GeeMultiMap* _tmp36_; + gint64 _tmp37_; + LibraryPhoto* _tmp38_; #line 4676 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = self->priv->photo_to_editable_filesize; + _tmp34_ = self->priv->photo_to_editable_filesize; #line 4676 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = photo; + _tmp35_ = photo; #line 4676 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp41_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp35_, NULL); #line 4677 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = self->priv->filesize_to_photo; + _tmp36_ = self->priv->filesize_to_photo; #line 4677 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = old_editable_filesize; + _tmp37_ = old_editable_filesize; #line 4677 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = photo; + _tmp38_ = photo; #line 4677 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove (_tmp42_, &_tmp43_, _tmp44_); -#line 36244 "Photo.c" + gee_multi_map_remove (_tmp36_, &_tmp37_, _tmp38_); +#line 36564 "Photo.c" } #line 4680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = photo; + _tmp39_ = photo; #line 4680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO, Photo)); + _tmp40_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PHOTO, Photo)); #line 4680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = _tmp46_; + _tmp41_ = _tmp40_; #line 4680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = _tmp47_->filesize; + _tmp42_ = _tmp41_->filesize; #line 4680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = _tmp48_; + _tmp43_ = _tmp42_; #line 4680 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp47_); + _backing_photo_row_unref0 (_tmp41_); #line 4680 "/home/jens/Source/shotwell/src/Photo.vala" - master_filesize = _tmp49_; + master_filesize = _tmp43_; #line 4681 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = photo; + _tmp45_ = photo; #line 4681 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_PHOTO, Photo)); + _tmp46_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO, Photo)); #line 4681 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = _tmp52_; + _tmp47_ = _tmp46_; #line 4681 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = _tmp53_ != NULL; + _tmp48_ = _tmp47_ != NULL; #line 4681 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp53_); + _backing_photo_row_unref0 (_tmp47_); #line 4681 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp54_) { -#line 36272 "Photo.c" - LibraryPhoto* _tmp55_; - BackingPhotoRow* _tmp56_; - BackingPhotoRow* _tmp57_; - gint64 _tmp58_; + if (_tmp48_) { +#line 36592 "Photo.c" + LibraryPhoto* _tmp49_; + BackingPhotoRow* _tmp50_; + BackingPhotoRow* _tmp51_; + gint64 _tmp52_; #line 4682 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = photo; + _tmp49_ = photo; #line 4682 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_PHOTO, Photo)); + _tmp50_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_PHOTO, Photo)); #line 4682 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = _tmp56_; + _tmp51_ = _tmp50_; #line 4682 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = _tmp57_->filesize; + _tmp52_ = _tmp51_->filesize; #line 4682 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = _tmp58_; + _tmp44_ = _tmp52_; #line 4682 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp57_); -#line 36289 "Photo.c" + _backing_photo_row_unref0 (_tmp51_); +#line 36609 "Photo.c" } else { #line 4683 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = (gint64) -1; -#line 36293 "Photo.c" + _tmp44_ = (gint64) -1; +#line 36613 "Photo.c" } #line 4681 "/home/jens/Source/shotwell/src/Photo.vala" - editable_filesize = _tmp50_; + editable_filesize = _tmp44_; #line 4684 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = self->priv->photo_to_master_filesize; + _tmp53_ = self->priv->photo_to_master_filesize; #line 4684 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = photo; + _tmp54_ = photo; #line 4684 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = master_filesize; + _tmp55_ = master_filesize; #line 4684 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp60_, &_tmp61_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp54_, &_tmp55_); #line 4685 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = self->priv->filesize_to_photo; + _tmp56_ = self->priv->filesize_to_photo; #line 4685 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = master_filesize; + _tmp57_ = master_filesize; #line 4685 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = photo; + _tmp58_ = photo; #line 4685 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp62_, &_tmp63_, _tmp64_); + gee_multi_map_set (_tmp56_, &_tmp57_, _tmp58_); #line 4686 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = editable_filesize; + _tmp59_ = editable_filesize; #line 4686 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp65_ >= ((gint64) 0)) { -#line 36317 "Photo.c" - GeeHashMap* _tmp66_; - LibraryPhoto* _tmp67_; - gint64 _tmp68_; - GeeMultiMap* _tmp69_; - gint64 _tmp70_; - LibraryPhoto* _tmp71_; + if (_tmp59_ >= ((gint64) 0)) { +#line 36637 "Photo.c" + GeeHashMap* _tmp60_; + LibraryPhoto* _tmp61_; + gint64 _tmp62_; + GeeMultiMap* _tmp63_; + gint64 _tmp64_; + LibraryPhoto* _tmp65_; #line 4687 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = self->priv->photo_to_editable_filesize; + _tmp60_ = self->priv->photo_to_editable_filesize; #line 4687 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = photo; + _tmp61_ = photo; #line 4687 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = editable_filesize; + _tmp62_ = editable_filesize; #line 4687 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp67_, &_tmp68_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp61_, &_tmp62_); #line 4688 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = self->priv->filesize_to_photo; + _tmp63_ = self->priv->filesize_to_photo; #line 4688 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = editable_filesize; + _tmp64_ = editable_filesize; #line 4688 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = photo; + _tmp65_ = photo; #line 4688 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp69_, &_tmp70_, _tmp71_); -#line 36340 "Photo.c" + gee_multi_map_set (_tmp63_, &_tmp64_, _tmp65_); +#line 36660 "Photo.c" } #line 4667 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp25_); -#line 36344 "Photo.c" + _g_free0 (_tmp20_); +#line 36664 "Photo.c" } #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); @@ -36353,25 +36673,25 @@ static void library_photo_source_collection_real_items_altered (DataCollection* _alteration_unref0 (alteration); #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (object); -#line 36352 "Photo.c" +#line 36672 "Photo.c" } #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_object_it); -#line 36356 "Photo.c" +#line 36676 "Photo.c" } #line 4693 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = items; -#line 4693 "/home/jens/Source/shotwell/src/Photo.vala" - DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp72_); -#line 36362 "Photo.c" + DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), items); +#line 36680 "Photo.c" } -static void library_photo_source_collection_real_postprocess_imported_media (MediaSourceCollection* base, GeeCollection* media_sources) { +static void +library_photo_source_collection_real_postprocess_imported_media (MediaSourceCollection* base, + GeeCollection* media_sources) +{ LibraryPhotoSourceCollection * self; GeeHashMultiMap* map = NULL; GeeHashMultiMap* _tmp0_; - GeeCollection* _tmp97_; #line 4697 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4697 "/home/jens/Source/shotwell/src/Photo.vala" @@ -36380,246 +36700,227 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _tmp0_ = gee_hash_multi_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 4698 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp0_; -#line 36379 "Photo.c" +#line 36699 "Photo.c" { GeeIterator* _media_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp1_; #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = media_sources; + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (media_sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" - _media_it = _tmp2_; + _media_it = _tmp1_; #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36392 "Photo.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 36709 "Photo.c" + GeeIterator* _tmp2_; MediaSource* media = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; LibraryPhoto* photo = NULL; - MediaSource* _tmp7_; - LibraryPhoto* _tmp8_; + MediaSource* _tmp5_; + LibraryPhoto* _tmp6_; PhotoMetadata* metadata = NULL; - LibraryPhoto* _tmp9_; - PhotoMetadata* _tmp10_; + LibraryPhoto* _tmp7_; + PhotoMetadata* _tmp8_; HierarchicalTagIndex* global_index = NULL; - HierarchicalTagIndex* _tmp11_; + HierarchicalTagIndex* _tmp9_; HierarchicalTagIndex* htag_index = NULL; - PhotoMetadata* _tmp12_; - gboolean _tmp13_; - LibraryPhoto* _tmp18_; - GeeCollection* _tmp19_; - GeeCollection* _tmp20_; - gboolean _tmp21_; - PhotoMetadata* _tmp55_; - gboolean _tmp56_; -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _media_it; + PhotoMetadata* _tmp10_; + LibraryPhoto* _tmp15_; + GeeCollection* _tmp16_; + GeeCollection* _tmp17_; + gboolean _tmp18_; + PhotoMetadata* _tmp49_; #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _media_it; #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36423 "Photo.c" +#line 36735 "Photo.c" } #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _media_it; + _tmp3_ = _media_it; #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" - media = (MediaSource*) _tmp6_; + media = (MediaSource*) _tmp4_; #line 4700 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = media; + _tmp5_ = media; #line 4700 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 4700 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp8_; + photo = _tmp6_; #line 4701 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo; + _tmp7_ = photo; #line 4701 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO_SOURCE, PhotoSource)); + _tmp8_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO_SOURCE, PhotoSource)); #line 4701 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp10_; + metadata = _tmp8_; #line 4704 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = hierarchical_tag_index_get_global_index (); + _tmp9_ = hierarchical_tag_index_get_global_index (); #line 4704 "/home/jens/Source/shotwell/src/Photo.vala" - global_index = _tmp11_; + global_index = _tmp9_; #line 4711 "/home/jens/Source/shotwell/src/Photo.vala" htag_index = NULL; #line 4712 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = metadata; -#line 4712 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_metadata_has_hierarchical_keywords (_tmp12_); + _tmp10_ = metadata; #line 4712 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp13_) { -#line 36455 "Photo.c" - PhotoMetadata* _tmp14_; - GeeSet* _tmp15_; - GeeSet* _tmp16_; - HierarchicalTagIndex* _tmp17_; + if (photo_metadata_has_hierarchical_keywords (_tmp10_)) { +#line 36765 "Photo.c" + PhotoMetadata* _tmp11_; + GeeSet* _tmp12_; + GeeSet* _tmp13_; + HierarchicalTagIndex* _tmp14_; #line 4713 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = metadata; + _tmp11_ = metadata; #line 4713 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo_metadata_get_hierarchical_keywords (_tmp14_); + _tmp12_ = photo_metadata_get_hierarchical_keywords (_tmp11_); #line 4713 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_; + _tmp13_ = _tmp12_; #line 4713 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = hierarchical_tag_utilities_process_hierarchical_import_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp14_ = hierarchical_tag_utilities_process_hierarchical_import_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection)); #line 4713 "/home/jens/Source/shotwell/src/Photo.vala" _hierarchical_tag_index_unref0 (htag_index); #line 4713 "/home/jens/Source/shotwell/src/Photo.vala" - htag_index = _tmp17_; + htag_index = _tmp14_; #line 4713 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp16_); -#line 36474 "Photo.c" + _g_object_unref0 (_tmp13_); +#line 36784 "Photo.c" } #line 4717 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = photo; + _tmp15_ = photo; #line 4717 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = library_photo_get_import_keywords (_tmp18_); + _tmp16_ = library_photo_get_import_keywords (_tmp15_); #line 4717 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_; + _tmp17_ = _tmp16_; #line 4717 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp20_ != NULL; + _tmp18_ = _tmp17_ != NULL; #line 4717 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp17_); #line 4717 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp21_) { -#line 36488 "Photo.c" + if (_tmp18_) { +#line 36798 "Photo.c" { GeeIterator* _keyword_it = NULL; - LibraryPhoto* _tmp22_; - GeeCollection* _tmp23_; - GeeCollection* _tmp24_; - GeeIterator* _tmp25_; - GeeIterator* _tmp26_; + LibraryPhoto* _tmp19_; + GeeCollection* _tmp20_; + GeeCollection* _tmp21_; + GeeIterator* _tmp22_; + GeeIterator* _tmp23_; #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = photo; + _tmp19_ = photo; #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = library_photo_get_import_keywords (_tmp22_); + _tmp20_ = library_photo_get_import_keywords (_tmp19_); #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_; + _tmp21_ = _tmp20_; #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp22_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp25_; + _tmp23_ = _tmp22_; #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp21_); #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _keyword_it = _tmp26_; + _keyword_it = _tmp23_; #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36512 "Photo.c" - GeeIterator* _tmp27_; - gboolean _tmp28_; +#line 36822 "Photo.c" + GeeIterator* _tmp24_; gchar* keyword = NULL; - GeeIterator* _tmp29_; - gpointer _tmp30_; - gboolean _tmp31_ = FALSE; - HierarchicalTagIndex* _tmp32_; + GeeIterator* _tmp25_; + gpointer _tmp26_; + gboolean _tmp27_ = FALSE; + HierarchicalTagIndex* _tmp28_; gchar* name = NULL; - const gchar* _tmp36_; - gchar* _tmp37_; - HierarchicalTagIndex* _tmp38_; - const gchar* _tmp39_; - gboolean _tmp40_; - const gchar* _tmp49_; -#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _keyword_it; + const gchar* _tmp31_; + gchar* _tmp32_; + HierarchicalTagIndex* _tmp33_; + const gchar* _tmp34_; + const gchar* _tmp43_; #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = gee_iterator_next (_tmp27_); + _tmp24_ = _keyword_it; #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp28_) { + if (!gee_iterator_next (_tmp24_)) { #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36535 "Photo.c" +#line 36841 "Photo.c" } #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _keyword_it; + _tmp25_ = _keyword_it; #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = gee_iterator_get (_tmp29_); + _tmp26_ = gee_iterator_get (_tmp25_); #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - keyword = (gchar*) _tmp30_; -#line 4719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = htag_index; + keyword = (gchar*) _tmp26_; #line 4719 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp32_ != NULL) { -#line 36547 "Photo.c" - HierarchicalTagIndex* _tmp33_; - const gchar* _tmp34_; - gboolean _tmp35_; + _tmp28_ = htag_index; #line 4719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = htag_index; + if (_tmp28_ != NULL) { +#line 36853 "Photo.c" + HierarchicalTagIndex* _tmp29_; + const gchar* _tmp30_; #line 4719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = keyword; + _tmp29_ = htag_index; #line 4719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = hierarchical_tag_index_is_tag_in_index (_tmp33_, _tmp34_); + _tmp30_ = keyword; #line 4719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _tmp35_; -#line 36559 "Photo.c" + _tmp27_ = hierarchical_tag_index_is_tag_in_index (_tmp29_, _tmp30_); +#line 36862 "Photo.c" } else { #line 4719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = FALSE; -#line 36563 "Photo.c" + _tmp27_ = FALSE; +#line 36866 "Photo.c" } #line 4719 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp31_) { + if (_tmp27_) { #line 4720 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); #line 4720 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 36571 "Photo.c" +#line 36874 "Photo.c" } #line 4722 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = keyword; + _tmp31_ = keyword; #line 4722 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = tag_prep_tag_name (_tmp36_); + _tmp32_ = tag_prep_tag_name (_tmp31_); #line 4722 "/home/jens/Source/shotwell/src/Photo.vala" - name = _tmp37_; + name = _tmp32_; #line 4724 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = global_index; + _tmp33_ = global_index; #line 4724 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = name; + _tmp34_ = name; #line 4724 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = hierarchical_tag_index_is_tag_in_index (_tmp38_, _tmp39_); -#line 4724 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp40_) { -#line 36587 "Photo.c" + if (hierarchical_tag_index_is_tag_in_index (_tmp33_, _tmp34_)) { +#line 36888 "Photo.c" gchar* most_derived_path = NULL; - HierarchicalTagIndex* _tmp41_; - const gchar* _tmp42_; - gchar* _tmp43_; - GeeHashMultiMap* _tmp44_; - const gchar* _tmp45_; - Tag* _tmp46_; - Tag* _tmp47_; - LibraryPhoto* _tmp48_; + HierarchicalTagIndex* _tmp35_; + const gchar* _tmp36_; + gchar* _tmp37_; + GeeHashMultiMap* _tmp38_; + const gchar* _tmp39_; + Tag* _tmp40_; + Tag* _tmp41_; + LibraryPhoto* _tmp42_; #line 4725 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = global_index; + _tmp35_ = global_index; #line 4725 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = name; + _tmp36_ = name; #line 4725 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = hierarchical_tag_index_get_path_for_name (_tmp41_, _tmp42_); + _tmp37_ = hierarchical_tag_index_get_path_for_name (_tmp35_, _tmp36_); #line 4725 "/home/jens/Source/shotwell/src/Photo.vala" - most_derived_path = _tmp43_; + most_derived_path = _tmp37_; #line 4726 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = map; + _tmp38_ = map; #line 4726 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = most_derived_path; + _tmp39_ = most_derived_path; #line 4726 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = tag_for_path (_tmp45_); + _tmp40_ = tag_for_path (_tmp39_); #line 4726 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = _tmp46_; + _tmp41_ = _tmp40_; #line 4726 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = photo; + _tmp42_ = photo; #line 4726 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp47_, _tmp48_); + gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp41_, _tmp42_); #line 4726 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp47_); + _g_object_unref0 (_tmp41_); #line 4727 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (most_derived_path); #line 4727 "/home/jens/Source/shotwell/src/Photo.vala" @@ -36628,142 +36929,137 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _g_free0 (keyword); #line 4727 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 36627 "Photo.c" +#line 36928 "Photo.c" } #line 4730 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = name; + _tmp43_ = name; #line 4730 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp49_ != NULL) { -#line 36633 "Photo.c" - GeeHashMultiMap* _tmp50_; - const gchar* _tmp51_; - Tag* _tmp52_; - Tag* _tmp53_; - LibraryPhoto* _tmp54_; + if (_tmp43_ != NULL) { +#line 36934 "Photo.c" + GeeHashMultiMap* _tmp44_; + const gchar* _tmp45_; + Tag* _tmp46_; + Tag* _tmp47_; + LibraryPhoto* _tmp48_; #line 4731 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = map; + _tmp44_ = map; #line 4731 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = name; + _tmp45_ = name; #line 4731 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = tag_for_path (_tmp51_); + _tmp46_ = tag_for_path (_tmp45_); #line 4731 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = _tmp52_; + _tmp47_ = _tmp46_; #line 4731 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = photo; + _tmp48_ = photo; #line 4731 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp53_, _tmp54_); + gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp47_, _tmp48_); #line 4731 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp53_); -#line 36653 "Photo.c" + _g_object_unref0 (_tmp47_); +#line 36954 "Photo.c" } #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); -#line 36659 "Photo.c" +#line 36960 "Photo.c" } #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_keyword_it); -#line 36663 "Photo.c" +#line 36964 "Photo.c" } } #line 4735 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = metadata; + _tmp49_ = metadata; #line 4735 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = photo_metadata_has_hierarchical_keywords (_tmp55_); -#line 4735 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp56_) { -#line 36672 "Photo.c" + if (photo_metadata_has_hierarchical_keywords (_tmp49_)) { +#line 36971 "Photo.c" { GeeIterator* _path_it = NULL; - HierarchicalTagIndex* _tmp57_; - GeeCollection* _tmp58_; - GeeCollection* _tmp59_; - GeeIterator* _tmp60_; - GeeIterator* _tmp61_; + HierarchicalTagIndex* _tmp50_; + GeeCollection* _tmp51_; + GeeCollection* _tmp52_; + GeeIterator* _tmp53_; + GeeIterator* _tmp54_; #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = htag_index; + _tmp50_ = htag_index; #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = hierarchical_tag_index_get_all_paths (_tmp57_); + _tmp51_ = hierarchical_tag_index_get_all_paths (_tmp50_); #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = _tmp58_; + _tmp52_ = _tmp51_; #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp53_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = _tmp60_; + _tmp54_ = _tmp53_; #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp59_); + _g_object_unref0 (_tmp52_); #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _path_it = _tmp61_; + _path_it = _tmp54_; #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36696 "Photo.c" - GeeIterator* _tmp62_; - gboolean _tmp63_; +#line 36995 "Photo.c" + GeeIterator* _tmp55_; gchar* path = NULL; - GeeIterator* _tmp64_; - gpointer _tmp65_; + GeeIterator* _tmp56_; + gpointer _tmp57_; gchar* name = NULL; - const gchar* _tmp66_; - gchar* _tmp67_; - const gchar* _tmp68_; -#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = _path_it; + const gchar* _tmp58_; + gchar* _tmp59_; + const gchar* _tmp60_; #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = gee_iterator_next (_tmp62_); + _tmp55_ = _path_it; #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp63_) { + if (!gee_iterator_next (_tmp55_)) { #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36714 "Photo.c" +#line 37010 "Photo.c" } #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = _path_it; + _tmp56_ = _path_it; #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = gee_iterator_get (_tmp64_); + _tmp57_ = gee_iterator_get (_tmp56_); #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - path = (gchar*) _tmp65_; + path = (gchar*) _tmp57_; #line 4737 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = path; + _tmp58_ = path; #line 4737 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = tag_prep_tag_name (_tmp66_); + _tmp59_ = tag_prep_tag_name (_tmp58_); #line 4737 "/home/jens/Source/shotwell/src/Photo.vala" - name = _tmp67_; + name = _tmp59_; #line 4738 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = name; + _tmp60_ = name; #line 4738 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp68_ != NULL) { -#line 36732 "Photo.c" - GeeHashMultiMap* _tmp69_; - const gchar* _tmp70_; - Tag* _tmp71_; - Tag* _tmp72_; - LibraryPhoto* _tmp73_; + if (_tmp60_ != NULL) { +#line 37028 "Photo.c" + GeeHashMultiMap* _tmp61_; + const gchar* _tmp62_; + Tag* _tmp63_; + Tag* _tmp64_; + LibraryPhoto* _tmp65_; #line 4739 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = map; + _tmp61_ = map; #line 4739 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = name; + _tmp62_ = name; #line 4739 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = tag_for_path (_tmp70_); + _tmp63_ = tag_for_path (_tmp62_); #line 4739 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = _tmp71_; + _tmp64_ = _tmp63_; #line 4739 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = photo; + _tmp65_ = photo; #line 4739 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp72_, _tmp73_); + gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp64_, _tmp65_); #line 4739 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp72_); -#line 36752 "Photo.c" + _g_object_unref0 (_tmp64_); +#line 37048 "Photo.c" } #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (path); -#line 36758 "Photo.c" +#line 37054 "Photo.c" } #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_path_it); -#line 36762 "Photo.c" +#line 37058 "Photo.c" } } #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" @@ -36776,281 +37072,280 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _g_object_unref0 (photo); #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (media); -#line 36775 "Photo.c" +#line 37071 "Photo.c" } #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_media_it); -#line 36779 "Photo.c" +#line 37075 "Photo.c" } { GeeIterator* _media_it = NULL; - GeeCollection* _tmp74_; - GeeIterator* _tmp75_; -#line 4744 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = media_sources; + GeeIterator* _tmp66_; #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp66_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (media_sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" - _media_it = _tmp75_; + _media_it = _tmp66_; #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36793 "Photo.c" - GeeIterator* _tmp76_; - gboolean _tmp77_; +#line 37086 "Photo.c" + GeeIterator* _tmp67_; MediaSource* media = NULL; - GeeIterator* _tmp78_; - gpointer _tmp79_; + GeeIterator* _tmp68_; + gpointer _tmp69_; LibraryPhoto* photo = NULL; - MediaSource* _tmp80_; - LibraryPhoto* _tmp81_; - LibraryPhoto* _tmp82_; -#line 4744 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = _media_it; + MediaSource* _tmp70_; + LibraryPhoto* _tmp71_; + LibraryPhoto* _tmp72_; #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = gee_iterator_next (_tmp76_); + _tmp67_ = _media_it; #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp77_) { + if (!gee_iterator_next (_tmp67_)) { #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36811 "Photo.c" +#line 37101 "Photo.c" } #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = _media_it; + _tmp68_ = _media_it; #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = gee_iterator_get (_tmp78_); + _tmp69_ = gee_iterator_get (_tmp68_); #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" - media = (MediaSource*) _tmp79_; + media = (MediaSource*) _tmp69_; #line 4745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = media; + _tmp70_ = media; #line 4745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp71_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 4745 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp81_; + photo = _tmp71_; #line 4746 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = photo; + _tmp72_ = photo; #line 4746 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_clear_import_keywords (_tmp82_); + library_photo_clear_import_keywords (_tmp72_); #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (media); -#line 36833 "Photo.c" +#line 37123 "Photo.c" } #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_media_it); -#line 36837 "Photo.c" +#line 37127 "Photo.c" } { GeeIterator* _tag_it = NULL; - GeeHashMultiMap* _tmp83_; - GeeSet* _tmp84_; - GeeSet* _tmp85_; - GeeIterator* _tmp86_; - GeeIterator* _tmp87_; + GeeHashMultiMap* _tmp73_; + GeeSet* _tmp74_; + GeeSet* _tmp75_; + GeeIterator* _tmp76_; + GeeIterator* _tmp77_; #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = map; + _tmp73_ = map; #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_MULTI_MAP, GeeMultiMap)); + _tmp74_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GEE_TYPE_MULTI_MAP, GeeMultiMap)); #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = _tmp84_; + _tmp75_ = _tmp74_; #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp76_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = _tmp86_; + _tmp77_ = _tmp76_; #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp85_); + _g_object_unref0 (_tmp75_); #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _tag_it = _tmp87_; + _tag_it = _tmp77_; #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36862 "Photo.c" - GeeIterator* _tmp88_; - gboolean _tmp89_; +#line 37152 "Photo.c" + GeeIterator* _tmp78_; Tag* tag = NULL; - GeeIterator* _tmp90_; - gpointer _tmp91_; - Tag* _tmp92_; - GeeHashMultiMap* _tmp93_; - Tag* _tmp94_; - GeeCollection* _tmp95_; - GeeCollection* _tmp96_; + GeeIterator* _tmp79_; + gpointer _tmp80_; + Tag* _tmp81_; + GeeHashMultiMap* _tmp82_; + Tag* _tmp83_; + GeeCollection* _tmp84_; + GeeCollection* _tmp85_; #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = _tag_it; + _tmp78_ = _tag_it; #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = gee_iterator_next (_tmp88_); -#line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp89_) { + if (!gee_iterator_next (_tmp78_)) { #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36881 "Photo.c" +#line 37168 "Photo.c" } #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = _tag_it; + _tmp79_ = _tag_it; #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = gee_iterator_get (_tmp90_); + _tmp80_ = gee_iterator_get (_tmp79_); #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - tag = (Tag*) _tmp91_; + tag = (Tag*) _tmp80_; #line 4750 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = tag; + _tmp81_ = tag; #line 4750 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = map; + _tmp82_ = map; #line 4750 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = tag; + _tmp83_ = tag; #line 4750 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp95_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp94_); + _tmp84_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp83_); #line 4750 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = _tmp95_; + _tmp85_ = _tmp84_; #line 4750 "/home/jens/Source/shotwell/src/Photo.vala" - tag_attach_many (_tmp92_, _tmp96_); + tag_attach_many (_tmp81_, _tmp85_); #line 4750 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp96_); + _g_object_unref0 (_tmp85_); #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 36905 "Photo.c" +#line 37192 "Photo.c" } #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_it); -#line 36909 "Photo.c" +#line 37196 "Photo.c" } #line 4752 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = media_sources; -#line 4752 "/home/jens/Source/shotwell/src/Photo.vala" - MEDIA_SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->postprocess_imported_media (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp97_); + MEDIA_SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->postprocess_imported_media (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), media_sources); #line 4697 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (map); -#line 36917 "Photo.c" +#line 37202 "Photo.c" } -static void library_photo_source_collection_real_notify_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { - LibraryPhoto* _tmp0_; - PhotoMetadata* _tmp1_; +static void +library_photo_source_collection_real_notify_master_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4756 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 4756 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 4757 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo; -#line 4757 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = metadata; -#line 4757 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_MASTER_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 36934 "Photo.c" + g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_MASTER_REIMPORTED_SIGNAL], 0, photo, metadata); +#line 37217 "Photo.c" } -void library_photo_source_collection_notify_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { +void +library_photo_source_collection_notify_master_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4756 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4756 "/home/jens/Source/shotwell/src/Photo.vala" LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_master_reimported (self, photo, metadata); -#line 36943 "Photo.c" +#line 37230 "Photo.c" } -static void library_photo_source_collection_real_notify_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { - LibraryPhoto* _tmp0_; - PhotoMetadata* _tmp1_; +static void +library_photo_source_collection_real_notify_editable_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4761 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 4761 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 4762 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo; -#line 4762 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = metadata; -#line 4762 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_EDITABLE_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 36960 "Photo.c" + g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_EDITABLE_REIMPORTED_SIGNAL], 0, photo, metadata); +#line 37245 "Photo.c" } -void library_photo_source_collection_notify_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { +void +library_photo_source_collection_notify_editable_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4761 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4761 "/home/jens/Source/shotwell/src/Photo.vala" LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_editable_reimported (self, photo, metadata); -#line 36969 "Photo.c" +#line 37258 "Photo.c" } -static void library_photo_source_collection_real_notify_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { - LibraryPhoto* _tmp0_; - PhotoMetadata* _tmp1_; +static void +library_photo_source_collection_real_notify_source_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4766 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 4766 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 4767 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo; -#line 4767 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = metadata; -#line 4767 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_SOURCE_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 36986 "Photo.c" + g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_SOURCE_REIMPORTED_SIGNAL], 0, photo, metadata); +#line 37273 "Photo.c" } -void library_photo_source_collection_notify_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { +void +library_photo_source_collection_notify_source_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4766 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4766 "/home/jens/Source/shotwell/src/Photo.vala" LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_source_reimported (self, photo, metadata); -#line 36995 "Photo.c" +#line 37286 "Photo.c" } -static void library_photo_source_collection_real_notify_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { - LibraryPhoto* _tmp0_; - PhotoMetadata* _tmp1_; +static void +library_photo_source_collection_real_notify_baseline_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4771 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 4771 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 4772 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo; -#line 4772 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = metadata; -#line 4772 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_BASELINE_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 37012 "Photo.c" + g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_BASELINE_REIMPORTED_SIGNAL], 0, photo, metadata); +#line 37301 "Photo.c" } -void library_photo_source_collection_notify_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { +void +library_photo_source_collection_notify_baseline_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4771 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4771 "/home/jens/Source/shotwell/src/Photo.vala" LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_baseline_reimported (self, photo, metadata); -#line 37021 "Photo.c" +#line 37314 "Photo.c" } -static MediaSource* library_photo_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* base, gint64 numeric_id) { +static MediaSource* +library_photo_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* base, + gint64 numeric_id) +{ LibraryPhotoSourceCollection * self; MediaSource* result = NULL; - gint64 _tmp0_; - PhotoID _tmp1_ = {0}; - LibraryPhoto* _tmp2_; + PhotoID _tmp0_ = {0}; + LibraryPhoto* _tmp1_; #line 4775 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4776 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = numeric_id; -#line 4776 "/home/jens/Source/shotwell/src/Photo.vala" - photo_id_init (&_tmp1_, _tmp0_); + photo_id_init (&_tmp0_, numeric_id); #line 4776 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = library_photo_source_collection_fetch (self, &_tmp1_); + _tmp1_ = library_photo_source_collection_fetch (self, &_tmp0_); #line 4776 "/home/jens/Source/shotwell/src/Photo.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource); #line 4776 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37043 "Photo.c" +#line 37336 "Photo.c" } -static void library_photo_source_collection_on_trashcan_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed) { - GeeCollection* _tmp0_; - GeeCollection* _tmp1_; +static void +library_photo_source_collection_on_trashcan_contents_altered (LibraryPhotoSourceCollection* self, + GeeCollection* added, + GeeCollection* removed) +{ #line 4779 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4779 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37058,19 +37353,17 @@ static void library_photo_source_collection_on_trashcan_contents_altered (Librar #line 4779 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 4781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = added; -#line 4781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = removed; -#line 4781 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "trashcan-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 37062 "Photo.c" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "trashcan-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_COLLECTION, GeeCollection)); +#line 37353 "Photo.c" } -static gboolean library_photo_source_collection_check_if_trashed_photo (LibraryPhotoSourceCollection* self, DataSource* source, Alteration* alteration) { +static gboolean +library_photo_source_collection_check_if_trashed_photo (LibraryPhotoSourceCollection* self, + DataSource* source, + Alteration* alteration) +{ gboolean result = FALSE; - DataSource* _tmp0_; - gboolean _tmp1_; #line 4785 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE); #line 4785 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37078,20 +37371,18 @@ static gboolean library_photo_source_collection_check_if_trashed_photo (LibraryP #line 4785 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 4786 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = source; -#line 4786 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); -#line 4786 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp1_; + result = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); #line 4786 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37084 "Photo.c" +#line 37373 "Photo.c" } -static void library_photo_source_collection_on_offline_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed) { - GeeCollection* _tmp0_; - GeeCollection* _tmp1_; +static void +library_photo_source_collection_on_offline_contents_altered (LibraryPhotoSourceCollection* self, + GeeCollection* added, + GeeCollection* removed) +{ #line 4789 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4789 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37099,19 +37390,17 @@ static void library_photo_source_collection_on_offline_contents_altered (Library #line 4789 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 4791 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = added; -#line 4791 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = removed; -#line 4791 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "offline-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 37103 "Photo.c" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "offline-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_COLLECTION, GeeCollection)); +#line 37390 "Photo.c" } -static gboolean library_photo_source_collection_check_if_offline_photo (LibraryPhotoSourceCollection* self, DataSource* source, Alteration* alteration) { +static gboolean +library_photo_source_collection_check_if_offline_photo (LibraryPhotoSourceCollection* self, + DataSource* source, + Alteration* alteration) +{ gboolean result = FALSE; - DataSource* _tmp0_; - gboolean _tmp1_; #line 4795 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE); #line 4795 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37119,232 +37408,169 @@ static gboolean library_photo_source_collection_check_if_offline_photo (LibraryP #line 4795 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 4796 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = source; -#line 4796 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); -#line 4796 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp1_; + result = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); #line 4796 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37125 "Photo.c" +#line 37410 "Photo.c" } -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, + glong maxlen) +{ glong result = 0L; gchar* end = NULL; gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 37148 "Photo.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 37156 "Photo.c" +#line 37434 "Photo.c" } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 37168 "Photo.c" +#line 37443 "Photo.c" } } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, + glong offset, + glong len) +{ gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + glong _tmp6_; + gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#line 37192 "Photo.c" - glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = _tmp2_ >= ((glong) 0); -#line 37198 "Photo.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = len >= ((glong) 0); +#line 37464 "Photo.c" } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 37202 "Photo.c" +#line 37468 "Photo.c" } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 37206 "Photo.c" +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = string_strnlen ((gchar*) self, offset + len); +#line 37474 "Photo.c" + } else { + gint _tmp1_; + gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = (glong) _tmp2_; +#line 37484 "Photo.c" + } +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset < ((glong) 0)) { +#line 37488 "Photo.c" glong _tmp3_; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 37496 "Photo.c" + } else { glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 37503 "Photo.c" + } +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (len < ((glong) 0)) { +#line 37507 "Photo.c" glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 37218 "Photo.c" - } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#line 37228 "Photo.c" - } -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp8_ < ((glong) 0)) { -#line 37234 "Photo.c" - glong _tmp9_; - glong _tmp10_; - glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 37248 "Photo.c" - } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 37258 "Photo.c" - } -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp14_ < ((glong) 0)) { -#line 37264 "Photo.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 37273 "Photo.c" - } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp5_ - offset; +#line 37513 "Photo.c" + } +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 37293 "Photo.c" +#line 37525 "Photo.c" } -static MediaSource* library_photo_source_collection_real_fetch_by_source_id (MediaSourceCollection* base, const gchar* source_id) { +static MediaSource* +library_photo_source_collection_real_fetch_by_source_id (MediaSourceCollection* base, + const gchar* source_id) +{ LibraryPhotoSourceCollection * self; MediaSource* result = NULL; - const gchar* _tmp0_; - gboolean _tmp1_; gchar* numeric_only = NULL; - const gchar* _tmp2_; - gint _tmp3_; - gint _tmp4_; - gchar* _tmp5_; - gint64 _tmp6_; - MediaSource* _tmp7_; + gint _tmp0_; + gint _tmp1_; + gchar* _tmp2_; + MediaSource* _tmp3_; #line 4799 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4799 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (source_id != NULL, NULL); #line 4800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = source_id; -#line 4800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = g_str_has_prefix (_tmp0_, PHOTO_TYPENAME); -#line 4800 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp1_, "source_id.has_prefix(Photo.TYPENAME)"); -#line 4801 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = source_id; + _vala_assert (g_str_has_prefix (source_id, PHOTO_TYPENAME), "source_id.has_prefix(Photo.TYPENAME)"); #line 4801 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = strlen (PHOTO_TYPENAME); + _tmp0_ = strlen (PHOTO_TYPENAME); #line 4801 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_; + _tmp1_ = _tmp0_; #line 4801 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = string_substring (_tmp2_, (glong) _tmp4_, (glong) -1); + _tmp2_ = string_substring (source_id, (glong) _tmp1_, (glong) -1); #line 4801 "/home/jens/Source/shotwell/src/Photo.vala" - numeric_only = _tmp5_; -#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = parse_int64 (numeric_only, 16); + numeric_only = _tmp2_; #line 4803 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = media_source_collection_fetch_by_numeric_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp6_); + _tmp3_ = media_source_collection_fetch_by_numeric_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), parse_int64 (numeric_only, 16)); #line 4803 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp7_; + result = _tmp3_; #line 4803 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (numeric_only); #line 4803 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37339 "Photo.c" +#line 37562 "Photo.c" } -static GeeCollection* library_photo_source_collection_real_get_event_source_ids (MediaSourceCollection* base, EventID* event_id) { +static GeeCollection* +library_photo_source_collection_real_get_event_source_ids (MediaSourceCollection* base, + EventID* event_id) +{ LibraryPhotoSourceCollection * self; GeeCollection* result = NULL; PhotoTable* _tmp0_; @@ -37372,11 +37598,14 @@ static GeeCollection* library_photo_source_collection_real_get_event_source_ids result = _tmp4_; #line 4807 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37371 "Photo.c" +#line 37597 "Photo.c" } -LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, PhotoID* photo_id) { +LibraryPhoto* +library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, + PhotoID* photo_id) +{ LibraryPhoto* result = NULL; PhotoID _tmp0_; gint64 _tmp1_; @@ -37395,15 +37624,17 @@ LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollectio result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 4811 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37394 "Photo.c" +#line 37623 "Photo.c" } -LibraryPhoto* library_photo_source_collection_fetch_by_editable_file (LibraryPhotoSourceCollection* self, GFile* file) { +LibraryPhoto* +library_photo_source_collection_fetch_by_editable_file (LibraryPhotoSourceCollection* self, + GFile* file) +{ LibraryPhoto* result = NULL; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 4814 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); #line 4814 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37411,22 +37642,22 @@ LibraryPhoto* library_photo_source_collection_fetch_by_editable_file (LibraryPho #line 4815 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->by_editable_file; #line 4815 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = file; + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 4815 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" - result = (LibraryPhoto*) _tmp2_; + result = (LibraryPhoto*) _tmp1_; #line 4815 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37417 "Photo.c" +#line 37646 "Photo.c" } -LibraryPhoto* library_photo_source_collection_fetch_by_raw_development_file (LibraryPhotoSourceCollection* self, GFile* file) { +LibraryPhoto* +library_photo_source_collection_fetch_by_raw_development_file (LibraryPhotoSourceCollection* self, + GFile* file) +{ LibraryPhoto* result = NULL; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 4818 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); #line 4818 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37434,33 +37665,33 @@ LibraryPhoto* library_photo_source_collection_fetch_by_raw_development_file (Lib #line 4819 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->by_raw_development_file; #line 4819 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = file; -#line 4819 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 4819 "/home/jens/Source/shotwell/src/Photo.vala" - result = (LibraryPhoto*) _tmp2_; + result = (LibraryPhoto*) _tmp1_; #line 4819 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37440 "Photo.c" +#line 37669 "Photo.c" } -static void library_photo_source_collection_compare_backing (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, GFileInfo* info, GeeCollection* matches_master, GeeCollection* matches_editable, GeeCollection* matches_development) { - LibraryPhoto* _tmp0_; +static void +library_photo_source_collection_compare_backing (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + GFileInfo* info, + GeeCollection* matches_master, + GeeCollection* matches_editable, + GeeCollection* matches_development) +{ + BackingPhotoRow* _tmp0_; BackingPhotoRow* _tmp1_; - BackingPhotoRow* _tmp2_; - GFileInfo* _tmp3_; - gboolean _tmp4_; - gboolean _tmp5_; + gboolean _tmp2_; BackingPhotoRow* editable = NULL; - LibraryPhoto* _tmp8_; - BackingPhotoRow* _tmp9_; - gboolean _tmp10_ = FALSE; - BackingPhotoRow* _tmp11_; + BackingPhotoRow* _tmp3_; + gboolean _tmp4_ = FALSE; + BackingPhotoRow* _tmp5_; GeeCollection* development = NULL; - LibraryPhoto* _tmp17_; - GeeCollection* _tmp18_; - GeeCollection* _tmp19_; + GeeCollection* _tmp7_; + GeeCollection* _tmp8_; #line 4822 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4822 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37474,162 +37705,122 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC #line 4822 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_COLLECTION (matches_development)); #line 4825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo; -#line 4825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo)); -#line 4825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = _tmp1_; + _tmp0_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo)); #line 4825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = info; -#line 4825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = backing_photo_row_matches_file_info (_tmp2_, _tmp3_); + _tmp1_ = _tmp0_; #line 4825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + _tmp2_ = backing_photo_row_matches_file_info (_tmp1_, info); #line 4825 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp2_); + _backing_photo_row_unref0 (_tmp1_); #line 4825 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_) { -#line 37488 "Photo.c" - GeeCollection* _tmp6_; - LibraryPhoto* _tmp7_; -#line 4826 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = matches_master; -#line 4826 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo; + if (_tmp2_) { #line 4826 "/home/jens/Source/shotwell/src/Photo.vala" - gee_collection_add (_tmp6_, _tmp7_); -#line 37497 "Photo.c" + gee_collection_add (matches_master, photo); +#line 37715 "Photo.c" } #line 4828 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo; -#line 4828 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo)); + _tmp3_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo)); #line 4828 "/home/jens/Source/shotwell/src/Photo.vala" - editable = _tmp9_; -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = editable; -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_ != NULL) { -#line 37509 "Photo.c" - BackingPhotoRow* _tmp12_; - GFileInfo* _tmp13_; - gboolean _tmp14_; + editable = _tmp3_; #line 4829 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = editable; + _tmp5_ = editable; #line 4829 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = info; + if (_tmp5_ != NULL) { +#line 37725 "Photo.c" + BackingPhotoRow* _tmp6_; #line 4829 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = backing_photo_row_matches_file_info (_tmp12_, _tmp13_); + _tmp6_ = editable; #line 4829 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp14_; -#line 37521 "Photo.c" + _tmp4_ = backing_photo_row_matches_file_info (_tmp6_, info); +#line 37731 "Photo.c" } else { #line 4829 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = FALSE; -#line 37525 "Photo.c" + _tmp4_ = FALSE; +#line 37735 "Photo.c" } #line 4829 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp10_) { -#line 37529 "Photo.c" - GeeCollection* _tmp15_; - LibraryPhoto* _tmp16_; -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = matches_editable; -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = photo; + if (_tmp4_) { #line 4830 "/home/jens/Source/shotwell/src/Photo.vala" - gee_collection_add (_tmp15_, _tmp16_); -#line 37538 "Photo.c" + gee_collection_add (matches_editable, photo); +#line 37741 "Photo.c" } #line 4832 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo; -#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo)); + _tmp7_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo)); #line 4832 "/home/jens/Source/shotwell/src/Photo.vala" - development = _tmp18_; + development = _tmp7_; #line 4833 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = development; + _tmp8_ = development; #line 4833 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp19_ != NULL) { -#line 37550 "Photo.c" + if (_tmp8_ != NULL) { +#line 37751 "Photo.c" { GeeIterator* _row_it = NULL; - GeeCollection* _tmp20_; - GeeIterator* _tmp21_; + GeeCollection* _tmp9_; + GeeIterator* _tmp10_; #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = development; + _tmp9_ = development; #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" - _row_it = _tmp21_; + _row_it = _tmp10_; #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 37563 "Photo.c" - GeeIterator* _tmp22_; - gboolean _tmp23_; +#line 37764 "Photo.c" + GeeIterator* _tmp11_; BackingPhotoRow* row = NULL; - GeeIterator* _tmp24_; - gpointer _tmp25_; - BackingPhotoRow* _tmp26_; - GFileInfo* _tmp27_; - gboolean _tmp28_; -#line 4834 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _row_it; + GeeIterator* _tmp12_; + gpointer _tmp13_; + BackingPhotoRow* _tmp14_; #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = gee_iterator_next (_tmp22_); + _tmp11_ = _row_it; #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp23_) { + if (!gee_iterator_next (_tmp11_)) { #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37580 "Photo.c" +#line 37776 "Photo.c" } #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _row_it; + _tmp12_ = _row_it; #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = gee_iterator_get (_tmp24_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" - row = (BackingPhotoRow*) _tmp25_; -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = row; + row = (BackingPhotoRow*) _tmp13_; #line 4835 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = info; + _tmp14_ = row; #line 4835 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = backing_photo_row_matches_file_info (_tmp26_, _tmp27_); -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp28_) { -#line 37596 "Photo.c" - GeeCollection* _tmp29_; - LibraryPhoto* _tmp30_; -#line 4836 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = matches_development; -#line 4836 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = photo; + if (backing_photo_row_matches_file_info (_tmp14_, info)) { #line 4836 "/home/jens/Source/shotwell/src/Photo.vala" - gee_collection_add (_tmp29_, _tmp30_); + gee_collection_add (matches_development, photo); #line 4838 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); #line 4838 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37609 "Photo.c" +#line 37794 "Photo.c" } #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 37613 "Photo.c" +#line 37798 "Photo.c" } #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 37617 "Photo.c" +#line 37802 "Photo.c" } } #line 4822 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (development); #line 4822 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (editable); -#line 37624 "Photo.c" +#line 37809 "Photo.c" } -void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSourceCollection* self, GFileInfo* info, GeeCollection* matches_master, GeeCollection* matches_editable, GeeCollection* matched_development) { +void +library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSourceCollection* self, + GFileInfo* info, + GeeCollection* matches_master, + GeeCollection* matches_editable, + GeeCollection* matched_development) +{ #line 4846 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4846 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37640,303 +37831,260 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour g_return_if_fail (GEE_IS_COLLECTION (matches_editable)); #line 4846 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_COLLECTION (matched_development)); -#line 37639 "Photo.c" +#line 37830 "Photo.c" { GeeIterator* _photo_it = NULL; GeeMultiMap* _tmp0_; - GFileInfo* _tmp1_; - gint64 _tmp2_; + gint64 _tmp1_; + GeeCollection* _tmp2_; GeeCollection* _tmp3_; - GeeCollection* _tmp4_; + GeeIterator* _tmp4_; GeeIterator* _tmp5_; - GeeIterator* _tmp6_; #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->filesize_to_photo; #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = info; -#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = g_file_info_get_size (_tmp1_); + _tmp1_ = g_file_info_get_size (info); #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = gee_multi_map_get (_tmp0_, &_tmp2_); + _tmp2_ = gee_multi_map_get (_tmp0_, &_tmp1_); #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_it = _tmp6_; + _photo_it = _tmp5_; #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 37669 "Photo.c" - GeeIterator* _tmp7_; - gboolean _tmp8_; +#line 37857 "Photo.c" + GeeIterator* _tmp6_; LibraryPhoto* photo = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; - LibraryPhoto* _tmp11_; - GFileInfo* _tmp12_; - GeeCollection* _tmp13_; - GeeCollection* _tmp14_; - GeeCollection* _tmp15_; -#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _photo_it; + GeeIterator* _tmp7_; + gpointer _tmp8_; + LibraryPhoto* _tmp9_; #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = gee_iterator_next (_tmp7_); + _tmp6_ = _photo_it; #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp6_)) { #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37688 "Photo.c" +#line 37869 "Photo.c" } #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _photo_it; + _tmp7_ = _photo_it; #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - photo = (LibraryPhoto*) _tmp10_; + photo = (LibraryPhoto*) _tmp8_; #line 4849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo; -#line 4849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = info; -#line 4849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = matches_master; -#line 4849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = matches_editable; -#line 4849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = matched_development; + _tmp9_ = photo; #line 4849 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_source_collection_compare_backing (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_, _tmp15_); + library_photo_source_collection_compare_backing (self, _tmp9_, info, matches_master, matches_editable, matched_development); #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 37710 "Photo.c" +#line 37883 "Photo.c" } #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 37714 "Photo.c" +#line 37887 "Photo.c" } { GeeIterator* _media_it = NULL; - GeeCollection* _tmp16_; - GeeCollection* _tmp17_; - GeeIterator* _tmp18_; - GeeIterator* _tmp19_; + GeeCollection* _tmp10_; + GeeCollection* _tmp11_; + GeeIterator* _tmp12_; + GeeIterator* _tmp13_; #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = media_source_collection_get_offline_bin_contents (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _tmp10_ = media_source_collection_get_offline_bin_contents (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_; + _tmp11_ = _tmp10_; #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_; + _tmp13_ = _tmp12_; #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp17_); + _g_object_unref0 (_tmp11_); #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - _media_it = _tmp19_; + _media_it = _tmp13_; #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 37736 "Photo.c" - GeeIterator* _tmp20_; - gboolean _tmp21_; +#line 37909 "Photo.c" + GeeIterator* _tmp14_; MediaSource* media = NULL; - GeeIterator* _tmp22_; - gpointer _tmp23_; - MediaSource* _tmp24_; - GFileInfo* _tmp25_; - GeeCollection* _tmp26_; - GeeCollection* _tmp27_; - GeeCollection* _tmp28_; -#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _media_it; + GeeIterator* _tmp15_; + gpointer _tmp16_; + MediaSource* _tmp17_; #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = gee_iterator_next (_tmp20_); + _tmp14_ = _media_it; #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp21_) { + if (!gee_iterator_next (_tmp14_)) { #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37755 "Photo.c" +#line 37921 "Photo.c" } #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _media_it; + _tmp15_ = _media_it; #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = gee_iterator_get (_tmp22_); + _tmp16_ = gee_iterator_get (_tmp15_); #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - media = (MediaSource*) _tmp23_; -#line 4852 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = media; -#line 4852 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = info; + media = (MediaSource*) _tmp16_; #line 4852 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = matches_master; + _tmp17_ = media; #line 4852 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = matches_editable; -#line 4852 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = matched_development; -#line 4852 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_LIBRARY_PHOTO, LibraryPhoto), _tmp25_, _tmp26_, _tmp27_, _tmp28_); + library_photo_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_LIBRARY_PHOTO, LibraryPhoto), info, matches_master, matches_editable, matched_development); #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (media); -#line 37777 "Photo.c" +#line 37935 "Photo.c" } #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_media_it); -#line 37781 "Photo.c" +#line 37939 "Photo.c" } } -void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize, PhotoID* result) { - PhotoID _tmp19_ = {0}; +void +library_photo_source_collection_get_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, + const gchar* basename, + gint64 filesize, + PhotoID* result) +{ + PhotoID _tmp15_ = {0}; #line 4855 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4855 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (basename != NULL); -#line 37792 "Photo.c" +#line 37955 "Photo.c" { GeeIterator* _photo_it = NULL; GeeMultiMap* _tmp0_; - gint64 _tmp1_; + GeeCollection* _tmp1_; GeeCollection* _tmp2_; - GeeCollection* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->filesize_to_photo; #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = filesize; + _tmp1_ = gee_multi_map_get (_tmp0_, &filesize); #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gee_multi_map_get (_tmp0_, &_tmp1_); -#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_it = _tmp5_; + _photo_it = _tmp4_; #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 37819 "Photo.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 37979 "Photo.c" + GeeIterator* _tmp5_; LibraryPhoto* photo = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - LibraryPhoto* _tmp10_; - GFile* _tmp11_; - GFile* _tmp12_; - gchar* _tmp13_; - const gchar* _tmp14_; - gint _tmp15_; - gboolean _tmp16_; -#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _photo_it; + GeeIterator* _tmp6_; + gpointer _tmp7_; + LibraryPhoto* _tmp8_; + GFile* _tmp9_; + GFile* _tmp10_; + gchar* _tmp11_; + gboolean _tmp12_; #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _photo_it; #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37840 "Photo.c" +#line 37995 "Photo.c" } #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _photo_it; + _tmp6_ = _photo_it; #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - photo = (LibraryPhoto*) _tmp9_; + photo = (LibraryPhoto*) _tmp7_; #line 4857 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo; + _tmp8_ = photo; #line 4857 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp9_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource)); #line 4857 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 4857 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = g_file_get_basename (_tmp12_); + _tmp11_ = g_file_get_basename (_tmp10_); #line 4857 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = basename; + _tmp12_ = utf8_ci_compare (_tmp11_, basename) == 0; #line 4857 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = utf8_ci_compare (_tmp13_, _tmp14_); + _g_object_unref0 (_tmp10_); #line 4857 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_ == 0; -#line 4857 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp12_); -#line 4857 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp16_) { -#line 37866 "Photo.c" - LibraryPhoto* _tmp17_; - PhotoID _tmp18_ = {0}; + if (_tmp12_) { +#line 38017 "Photo.c" + LibraryPhoto* _tmp13_; + PhotoID _tmp14_ = {0}; #line 4858 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo; + _tmp13_ = photo; #line 4858 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo), &_tmp18_); + photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO, Photo), &_tmp14_); #line 4858 "/home/jens/Source/shotwell/src/Photo.vala" - *result = _tmp18_; + *result = _tmp14_; #line 4858 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 4858 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); #line 4858 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 37881 "Photo.c" +#line 38032 "Photo.c" } #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 37885 "Photo.c" +#line 38036 "Photo.c" } #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 37889 "Photo.c" +#line 38040 "Photo.c" } #line 4861 "/home/jens/Source/shotwell/src/Photo.vala" - photo_id_init (&_tmp19_, PHOTO_ID_INVALID); + photo_id_init (&_tmp15_, PHOTO_ID_INVALID); #line 4861 "/home/jens/Source/shotwell/src/Photo.vala" - *result = _tmp19_; + *result = _tmp15_; #line 4861 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 37897 "Photo.c" +#line 38048 "Photo.c" } -gboolean library_photo_source_collection_has_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize) { +gboolean +library_photo_source_collection_has_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, + const gchar* basename, + gint64 filesize) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gint64 _tmp1_; - PhotoID _tmp2_ = {0}; - gboolean _tmp3_; + PhotoID _tmp0_ = {0}; #line 4865 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE); #line 4865 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (basename != NULL, FALSE); #line 4866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = basename; -#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = filesize; + library_photo_source_collection_get_basename_filesize_duplicate (self, basename, filesize, &_tmp0_); #line 4866 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_source_collection_get_basename_filesize_duplicate (self, _tmp0_, _tmp1_, &_tmp2_); -#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_id_is_valid (&_tmp2_); -#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp3_; + result = photo_id_is_valid (&_tmp0_); #line 4866 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37923 "Photo.c" +#line 38069 "Photo.c" } -LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoSourceCollection* self, GFile* file) { +LibraryPhoto* +library_photo_source_collection_get_trashed_by_file (LibraryPhotoSourceCollection* self, + GFile* file) +{ LibraryPhoto* result = NULL; LibraryPhoto* photo = NULL; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; - GFile* _tmp2_; - MediaSource* _tmp3_; + MediaSource* _tmp2_; + LibraryPhoto* _tmp3_; LibraryPhoto* _tmp4_; - LibraryPhoto* _tmp5_; #line 4869 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); #line 4869 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37946,55 +38094,52 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoS #line 4870 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 4870 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = file; -#line 4870 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = media_source_holding_tank_fetch_by_master_file (_tmp1_, _tmp2_); + _tmp2_ = media_source_holding_tank_fetch_by_master_file (_tmp1_, file); #line 4870 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto); + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 4870 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); #line 4870 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp4_; + photo = _tmp3_; #line 4871 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo; + _tmp4_ = photo; #line 4871 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_ == NULL) { -#line 37958 "Photo.c" - MediaSourceHoldingTank* _tmp6_; - LibraryPhotoSourceHoldingTank* _tmp7_; - GFile* _tmp8_; - LibraryPhoto* _tmp9_; -#line 4872 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + if (_tmp4_ == NULL) { +#line 38104 "Photo.c" + MediaSourceHoldingTank* _tmp5_; + LibraryPhotoSourceHoldingTank* _tmp6_; + LibraryPhoto* _tmp7_; #line 4872 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank); + _tmp5_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 4872 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = file; + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank); #line 4872 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = library_photo_source_holding_tank_fetch_by_backing_file (_tmp7_, _tmp8_); + _tmp7_ = library_photo_source_holding_tank_fetch_by_backing_file (_tmp6_, file); #line 4872 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 4872 "/home/jens/Source/shotwell/src/Photo.vala" - photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto); + photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 4872 "/home/jens/Source/shotwell/src/Photo.vala" - _source_holding_tank_unref0 (_tmp7_); -#line 37977 "Photo.c" + _source_holding_tank_unref0 (_tmp6_); +#line 38120 "Photo.c" } #line 4875 "/home/jens/Source/shotwell/src/Photo.vala" result = photo; #line 4875 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37983 "Photo.c" +#line 38126 "Photo.c" } -LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSourceCollection* self, const gchar* md5) { +LibraryPhoto* +library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSourceCollection* self, + const gchar* md5) +{ LibraryPhoto* result = NULL; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; - const gchar* _tmp2_; - MediaSource* _tmp3_; - LibraryPhoto* _tmp4_; + MediaSource* _tmp2_; + LibraryPhoto* _tmp3_; #line 4878 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); #line 4878 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38004,30 +38149,30 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSo #line 4879 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 4879 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = md5; -#line 4879 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = media_source_holding_tank_fetch_by_md5 (_tmp1_, _tmp2_); + _tmp2_ = media_source_holding_tank_fetch_by_md5 (_tmp1_, md5); #line 4879 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto); + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 4879 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); #line 4879 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp4_; + result = _tmp3_; #line 4879 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38014 "Photo.c" +#line 38157 "Photo.c" } -LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoSourceCollection* self, GFile* file) { +LibraryPhoto* +library_photo_source_collection_get_offline_by_file (LibraryPhotoSourceCollection* self, + GFile* file) +{ LibraryPhoto* result = NULL; LibraryPhoto* photo = NULL; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; - GFile* _tmp2_; - MediaSource* _tmp3_; + MediaSource* _tmp2_; + LibraryPhoto* _tmp3_; LibraryPhoto* _tmp4_; - LibraryPhoto* _tmp5_; #line 4882 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); #line 4882 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38037,55 +38182,52 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoS #line 4883 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 4883 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = file; -#line 4883 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = media_source_holding_tank_fetch_by_master_file (_tmp1_, _tmp2_); + _tmp2_ = media_source_holding_tank_fetch_by_master_file (_tmp1_, file); #line 4883 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto); + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 4883 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); #line 4883 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp4_; + photo = _tmp3_; #line 4884 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo; + _tmp4_ = photo; #line 4884 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_ == NULL) { -#line 38049 "Photo.c" - MediaSourceHoldingTank* _tmp6_; - LibraryPhotoSourceHoldingTank* _tmp7_; - GFile* _tmp8_; - LibraryPhoto* _tmp9_; -#line 4885 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + if (_tmp4_ == NULL) { +#line 38192 "Photo.c" + MediaSourceHoldingTank* _tmp5_; + LibraryPhotoSourceHoldingTank* _tmp6_; + LibraryPhoto* _tmp7_; #line 4885 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank); + _tmp5_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 4885 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = file; + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank); #line 4885 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = library_photo_source_holding_tank_fetch_by_backing_file (_tmp7_, _tmp8_); + _tmp7_ = library_photo_source_holding_tank_fetch_by_backing_file (_tmp6_, file); #line 4885 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 4885 "/home/jens/Source/shotwell/src/Photo.vala" - photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto); + photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 4885 "/home/jens/Source/shotwell/src/Photo.vala" - _source_holding_tank_unref0 (_tmp7_); -#line 38068 "Photo.c" + _source_holding_tank_unref0 (_tmp6_); +#line 38208 "Photo.c" } #line 4888 "/home/jens/Source/shotwell/src/Photo.vala" result = photo; #line 4888 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38074 "Photo.c" +#line 38214 "Photo.c" } -LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSourceCollection* self, const gchar* md5) { +LibraryPhoto* +library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSourceCollection* self, + const gchar* md5) +{ LibraryPhoto* result = NULL; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; - const gchar* _tmp2_; - MediaSource* _tmp3_; - LibraryPhoto* _tmp4_; + MediaSource* _tmp2_; + LibraryPhoto* _tmp3_; #line 4891 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); #line 4891 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38095,27 +38237,26 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSo #line 4892 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 4892 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = md5; -#line 4892 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = media_source_holding_tank_fetch_by_md5 (_tmp1_, _tmp2_); + _tmp2_ = media_source_holding_tank_fetch_by_md5 (_tmp1_, md5); #line 4892 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto); + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 4892 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); #line 4892 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp4_; + result = _tmp3_; #line 4892 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38105 "Photo.c" +#line 38245 "Photo.c" } -gint library_photo_source_collection_get_offline_count (LibraryPhotoSourceCollection* self) { +gint +library_photo_source_collection_get_offline_count (LibraryPhotoSourceCollection* self) +{ gint result = 0; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; gint _tmp2_; - gint _tmp3_; #line 4895 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), 0); #line 4896 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38124,53 +38265,48 @@ gint library_photo_source_collection_get_offline_count (LibraryPhotoSourceCollec _tmp1_ = _tmp0_; #line 4896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = source_holding_tank_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank)); -#line 4896 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_; #line 4896 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); #line 4896 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp3_; + result = _tmp2_; #line 4896 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38131 "Photo.c" +#line 38270 "Photo.c" } -LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSourceCollection* self, GFile* file, LibraryPhotoSourceCollectionState* state) { +LibraryPhoto* +library_photo_source_collection_get_state_by_file (LibraryPhotoSourceCollection* self, + GFile* file, + LibraryPhotoSourceCollectionState* state) +{ LibraryPhotoSourceCollectionState _vala_state = 0; LibraryPhoto* result = NULL; LibraryPhoto* photo = NULL; - GFile* _tmp0_; - MediaSource* _tmp1_; + MediaSource* _tmp0_; + LibraryPhoto* _tmp1_; LibraryPhoto* _tmp2_; - GFile* _tmp3_; + LibraryPhoto* _tmp3_; LibraryPhoto* _tmp4_; LibraryPhoto* _tmp5_; - GFile* _tmp6_; + LibraryPhoto* _tmp6_; LibraryPhoto* _tmp7_; LibraryPhoto* _tmp8_; - GFile* _tmp9_; + LibraryPhoto* _tmp9_; LibraryPhoto* _tmp10_; LibraryPhoto* _tmp11_; - LibraryPhoto* _tmp12_; - GFile* _tmp13_; - LibraryPhoto* _tmp14_; - LibraryPhoto* _tmp15_; - LibraryPhoto* _tmp16_; #line 4899 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); #line 4899 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 4900 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file; + _tmp0_ = media_source_collection_fetch_by_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), file); #line 4900 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = media_source_collection_fetch_by_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp0_); -#line 4900 "/home/jens/Source/shotwell/src/Photo.vala" - photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_PHOTO, LibraryPhoto); + photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 4901 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo; + _tmp1_ = photo; #line 4901 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_ != NULL) { + if (_tmp1_ != NULL) { #line 4902 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE; #line 4904 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38179,24 +38315,22 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou if (state) { #line 4904 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38178 "Photo.c" +#line 38314 "Photo.c" } #line 4904 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38182 "Photo.c" +#line 38318 "Photo.c" } #line 4907 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = file; -#line 4907 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = library_photo_source_collection_fetch_by_editable_file (self, _tmp3_); + _tmp2_ = library_photo_source_collection_fetch_by_editable_file (self, file); #line 4907 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 4907 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp4_; + photo = _tmp2_; #line 4908 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo; + _tmp3_ = photo; #line 4908 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_ != NULL) { + if (_tmp3_ != NULL) { #line 4909 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE; #line 4911 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38205,24 +38339,22 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou if (state) { #line 4911 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38204 "Photo.c" +#line 38338 "Photo.c" } #line 4911 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38208 "Photo.c" +#line 38342 "Photo.c" } #line 4914 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = file; -#line 4914 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = library_photo_source_collection_fetch_by_raw_development_file (self, _tmp6_); + _tmp4_ = library_photo_source_collection_fetch_by_raw_development_file (self, file); #line 4914 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 4914 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp7_; + photo = _tmp4_; #line 4915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo; + _tmp5_ = photo; #line 4915 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_ != NULL) { + if (_tmp5_ != NULL) { #line 4916 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER; #line 4918 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38231,32 +38363,30 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou if (state) { #line 4918 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38230 "Photo.c" +#line 38362 "Photo.c" } #line 4918 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38234 "Photo.c" +#line 38366 "Photo.c" } #line 4921 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = file; -#line 4921 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = library_photo_source_collection_get_trashed_by_file (self, _tmp9_); + _tmp6_ = library_photo_source_collection_get_trashed_by_file (self, file); #line 4921 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp10_) : NULL; + _tmp7_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp6_) : NULL; #line 4921 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_ == NULL) { + if (_tmp7_ == NULL) { #line 4921 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp10_); -#line 38246 "Photo.c" + _g_object_unref0 (_tmp6_); +#line 38376 "Photo.c" } #line 4921 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 4921 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp11_; + photo = _tmp7_; #line 4922 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo; + _tmp8_ = photo; #line 4922 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_ != NULL) { + if (_tmp8_ != NULL) { #line 4923 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH; #line 4925 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38265,32 +38395,30 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou if (state) { #line 4925 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38264 "Photo.c" +#line 38394 "Photo.c" } #line 4925 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38268 "Photo.c" +#line 38398 "Photo.c" } #line 4928 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = file; -#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = library_photo_source_collection_get_offline_by_file (self, _tmp13_); + _tmp9_ = library_photo_source_collection_get_offline_by_file (self, file); #line 4928 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp14_) : NULL; + _tmp10_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp9_) : NULL; #line 4928 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp15_ == NULL) { + if (_tmp10_ == NULL) { #line 4928 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp14_); -#line 38280 "Photo.c" + _g_object_unref0 (_tmp9_); +#line 38408 "Photo.c" } #line 4928 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 4928 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp15_; + photo = _tmp10_; #line 4929 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = photo; + _tmp11_ = photo; #line 4929 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp16_ != NULL) { + if (_tmp11_ != NULL) { #line 4930 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE; #line 4932 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38299,11 +38427,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou if (state) { #line 4932 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38298 "Photo.c" +#line 38426 "Photo.c" } #line 4932 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38302 "Photo.c" +#line 38430 "Photo.c" } #line 4935 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_UNKNOWN; @@ -38315,102 +38443,87 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou if (state) { #line 4937 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38314 "Photo.c" +#line 38442 "Photo.c" } #line 4937 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38318 "Photo.c" +#line 38446 "Photo.c" } -static gboolean library_photo_source_collection_real_has_backlink (SourceCollection* base, SourceBacklink* backlink) { +static gboolean +library_photo_source_collection_real_has_backlink (SourceCollection* base, + SourceBacklink* backlink) +{ LibraryPhotoSourceCollection * self; gboolean result = FALSE; - SourceBacklink* _tmp0_; - gboolean _tmp1_; - MediaSourceHoldingTank* _tmp2_; + MediaSourceHoldingTank* _tmp0_; + MediaSourceHoldingTank* _tmp1_; + gboolean _tmp2_; MediaSourceHoldingTank* _tmp3_; - SourceBacklink* _tmp4_; + MediaSourceHoldingTank* _tmp4_; gboolean _tmp5_; - gboolean _tmp6_; - MediaSourceHoldingTank* _tmp7_; - MediaSourceHoldingTank* _tmp8_; - SourceBacklink* _tmp9_; - gboolean _tmp10_; - gboolean _tmp11_; #line 4940 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4940 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_SOURCE_BACKLINK (backlink), FALSE); #line 4941 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = backlink; -#line 4941 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->has_backlink (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp0_); -#line 4941 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_) { + if (SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->has_backlink (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), backlink)) { #line 4942 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 4942 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38351 "Photo.c" +#line 38472 "Photo.c" } #line 4944 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = backlink; + _tmp0_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 4944 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = source_holding_tank_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp4_); + _tmp1_ = _tmp0_; #line 4944 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_; + _tmp2_ = source_holding_tank_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), backlink); #line 4944 "/home/jens/Source/shotwell/src/Photo.vala" - _source_holding_tank_unref0 (_tmp3_); + _source_holding_tank_unref0 (_tmp1_); #line 4944 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_) { + if (_tmp2_) { #line 4945 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 4945 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38371 "Photo.c" +#line 38488 "Photo.c" } #line 4947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_; -#line 4947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = backlink; + _tmp3_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 4947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = source_holding_tank_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp9_); + _tmp4_ = _tmp3_; #line 4947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_; + _tmp5_ = source_holding_tank_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), backlink); #line 4947 "/home/jens/Source/shotwell/src/Photo.vala" - _source_holding_tank_unref0 (_tmp8_); + _source_holding_tank_unref0 (_tmp4_); #line 4947 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { + if (_tmp5_) { #line 4948 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 4948 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38391 "Photo.c" +#line 38504 "Photo.c" } #line 4950 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 4950 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38397 "Photo.c" +#line 38510 "Photo.c" } -static void library_photo_source_collection_real_remove_backlink (SourceCollection* base, SourceBacklink* backlink) { +static void +library_photo_source_collection_real_remove_backlink (SourceCollection* base, + SourceBacklink* backlink) +{ LibraryPhotoSourceCollection * self; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; - SourceBacklink* _tmp2_; + MediaSourceHoldingTank* _tmp2_; MediaSourceHoldingTank* _tmp3_; - MediaSourceHoldingTank* _tmp4_; - SourceBacklink* _tmp5_; - SourceBacklink* _tmp6_; #line 4953 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4953 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38420,30 +38533,26 @@ static void library_photo_source_collection_real_remove_backlink (SourceCollecti #line 4954 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 4954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = backlink; -#line 4954 "/home/jens/Source/shotwell/src/Photo.vala" - source_holding_tank_remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp2_); + source_holding_tank_remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), backlink); #line 4954 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); #line 4955 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4955 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_; + _tmp2_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 4955 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = backlink; + _tmp3_ = _tmp2_; #line 4955 "/home/jens/Source/shotwell/src/Photo.vala" - source_holding_tank_remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp5_); + source_holding_tank_remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), backlink); #line 4955 "/home/jens/Source/shotwell/src/Photo.vala" - _source_holding_tank_unref0 (_tmp4_); -#line 4957 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = backlink; + _source_holding_tank_unref0 (_tmp3_); #line 4957 "/home/jens/Source/shotwell/src/Photo.vala" - SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp6_); -#line 38438 "Photo.c" + SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), backlink); +#line 38545 "Photo.c" } -static TransactionController* library_photo_source_collection_real_get_transaction_controller (MediaSourceCollection* base) { +static TransactionController* +library_photo_source_collection_real_get_transaction_controller (MediaSourceCollection* base) +{ TransactionController* result; LibraryPhotoSourceCollection* self; TransactionController* _tmp0_; @@ -38454,7 +38563,7 @@ static TransactionController* library_photo_source_collection_real_get_transacti _tmp0_ = self->priv->_transaction_controller; #line 4475 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ == NULL) { -#line 38453 "Photo.c" +#line 38562 "Photo.c" MediaSourceTransactionController* _tmp1_; #line 4476 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = media_source_transaction_controller_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); @@ -38462,7 +38571,7 @@ static TransactionController* library_photo_source_collection_real_get_transacti _transaction_controller_unref0 (self->priv->_transaction_controller); #line 4476 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->_transaction_controller = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TRANSACTION_CONTROLLER, TransactionController); -#line 38461 "Photo.c" +#line 38570 "Photo.c" } #line 4478 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->_transaction_controller; @@ -38470,20 +38579,31 @@ static TransactionController* library_photo_source_collection_real_get_transacti result = _tmp2_; #line 4478 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38469 "Photo.c" +#line 38578 "Photo.c" } -static void library_photo_source_collection_real_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { +static void +library_photo_source_collection_real_master_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4496 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 4496 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 38478 "Photo.c" +#line 38591 "Photo.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_MEDIA_METADATA) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2); register GMarshalFunc_VOID__OBJECT_MEDIA_METADATA callback; register GCClosure * cc; @@ -38498,50 +38618,64 @@ static void g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * clos data1 = closure->data; #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" data2 = param_values->data[0].v_pointer; -#line 38497 "Photo.c" +#line 38617 "Photo.c" } else { #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" data1 = param_values->data[0].v_pointer; #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" data2 = closure->data; -#line 38503 "Photo.c" +#line 38623 "Photo.c" } #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" callback = (GMarshalFunc_VOID__OBJECT_MEDIA_METADATA) (marshal_data ? marshal_data : cc->callback); #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" callback (data1, g_value_get_object (param_values + 1), value_get_media_metadata (param_values + 2), data2); -#line 38509 "Photo.c" +#line 38629 "Photo.c" } -static void library_photo_source_collection_real_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { +static void +library_photo_source_collection_real_editable_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4499 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 4499 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 38518 "Photo.c" +#line 38642 "Photo.c" } -static void library_photo_source_collection_real_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { +static void +library_photo_source_collection_real_baseline_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4502 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 4502 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 38527 "Photo.c" +#line 38655 "Photo.c" } -static void library_photo_source_collection_real_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { +static void +library_photo_source_collection_real_source_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4505 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 4505 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 38536 "Photo.c" +#line 38668 "Photo.c" } -static void library_photo_source_collection_class_init (LibraryPhotoSourceCollectionClass * klass) { +static void +library_photo_source_collection_class_init (LibraryPhotoSourceCollectionClass * klass) +{ #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_parent_class = g_type_class_peek_parent (klass); #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38602,11 +38736,13 @@ static void library_photo_source_collection_class_init (LibraryPhotoSourceCollec library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_BASELINE_REIMPORTED_SIGNAL] = g_signal_new ("baseline-reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, baseline_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA); #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_SOURCE_REIMPORTED_SIGNAL] = g_signal_new ("source-reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, source_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA); -#line 38601 "Photo.c" +#line 38735 "Photo.c" } -static void library_photo_source_collection_instance_init (LibraryPhotoSourceCollection * self) { +static void +library_photo_source_collection_instance_init (LibraryPhotoSourceCollection * self) +{ GeeHashMap* _tmp0_; GeeHashMap* _tmp1_; GeeTreeMultiMap* _tmp2_; @@ -38641,11 +38777,13 @@ static void library_photo_source_collection_instance_init (LibraryPhotoSourceCol _tmp5_ = gee_tree_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 4493 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->photo_to_raw_development_filesize = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_MULTI_MAP, GeeMultiMap); -#line 38640 "Photo.c" +#line 38776 "Photo.c" } -static void library_photo_source_collection_finalize (DataCollection * obj) { +static void +library_photo_source_collection_finalize (DataCollection * obj) +{ LibraryPhotoSourceCollection * self; #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); @@ -38665,11 +38803,13 @@ static void library_photo_source_collection_finalize (DataCollection * obj) { _g_object_unref0 (self->priv->photo_to_raw_development_filesize); #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->finalize (obj); -#line 38664 "Photo.c" +#line 38802 "Photo.c" } -GType library_photo_source_collection_get_type (void) { +GType +library_photo_source_collection_get_type (void) +{ static volatile gsize library_photo_source_collection_type_id__volatile = 0; if (g_once_init_enter (&library_photo_source_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryPhotoSourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_photo_source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryPhotoSourceCollection), 0, (GInstanceInitFunc) library_photo_source_collection_instance_init, NULL }; @@ -38681,186 +38821,168 @@ GType library_photo_source_collection_get_type (void) { } -static void _library_photo_generate_thumbnails_one_shot_callback (gpointer self) { +static void +_library_photo_generate_thumbnails_one_shot_callback (gpointer self) +{ #line 4985 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_generate_thumbnails ((LibraryPhoto*) self); -#line 38683 "Photo.c" +#line 38825 "Photo.c" } -static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row) { +static LibraryPhoto* +library_photo_construct (GType object_type, + PhotoRow* row) +{ LibraryPhoto * self = NULL; - PhotoRow* _tmp0_; - OneShotScheduler* _tmp1_; - PhotoRow* _tmp2_; - guint64 _tmp3_; - PhotoRow* _tmp7_; - guint64 _tmp8_; + OneShotScheduler* _tmp0_; + guint64 _tmp1_; + guint64 _tmp4_; #line 4980 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_ROW (row), NULL); #line 4981 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = row; -#line 4981 "/home/jens/Source/shotwell/src/Photo.vala" - self = (LibraryPhoto*) photo_construct (object_type, _tmp0_); + self = (LibraryPhoto*) photo_construct (object_type, row); #line 4983 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->import_keywords); #line 4983 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->import_keywords = NULL; #line 4985 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = one_shot_scheduler_new ("LibraryPhoto", _library_photo_generate_thumbnails_one_shot_callback, self); + _tmp0_ = one_shot_scheduler_new ("LibraryPhoto", _library_photo_generate_thumbnails_one_shot_callback, self); #line 4985 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->thumbnail_scheduler); #line 4985 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->thumbnail_scheduler = _tmp1_; + self->priv->thumbnail_scheduler = _tmp0_; #line 4988 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = row; + _tmp1_ = row->flags; #line 4988 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_->flags; -#line 4988 "/home/jens/Source/shotwell/src/Photo.vala" - if ((_tmp3_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) { -#line 38717 "Photo.c" - LibraryPhotoSourceCollection* _tmp4_; - PhotoRow* _tmp5_; - const gchar* _tmp6_; -#line 4989 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = library_photo_global; + if ((_tmp1_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) { +#line 38855 "Photo.c" + LibraryPhotoSourceCollection* _tmp2_; + const gchar* _tmp3_; #line 4989 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = row; + _tmp2_ = library_photo_global; #line 4989 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_->backlinks; + _tmp3_ = row->backlinks; #line 4989 "/home/jens/Source/shotwell/src/Photo.vala" - data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp6_); -#line 38729 "Photo.c" + data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp3_); +#line 38864 "Photo.c" } #line 4991 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = row; -#line 4991 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_->flags; + _tmp4_ = row->flags; #line 4991 "/home/jens/Source/shotwell/src/Photo.vala" - if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) { -#line 38737 "Photo.c" - PhotoRow* _tmp9_; - guint64 _tmp10_; -#line 4992 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = row; + if ((_tmp4_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) { +#line 38870 "Photo.c" + guint64 _tmp5_; #line 4992 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_->flags; + _tmp5_ = row->flags; #line 4992 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_upgrade_rating_flags (self, _tmp10_); -#line 38746 "Photo.c" + library_photo_upgrade_rating_flags (self, _tmp5_); +#line 38876 "Photo.c" } #line 4980 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 38750 "Photo.c" +#line 38880 "Photo.c" } -static LibraryPhoto* library_photo_new (PhotoRow* row) { +static LibraryPhoto* +library_photo_new (PhotoRow* row) +{ #line 4980 "/home/jens/Source/shotwell/src/Photo.vala" return library_photo_construct (TYPE_LIBRARY_PHOTO, row); -#line 38757 "Photo.c" +#line 38889 "Photo.c" } -static LibraryPhoto* library_photo_construct_from_import_params (GType object_type, PhotoImportParams* import_params) { +static LibraryPhoto* +library_photo_construct_from_import_params (GType object_type, + PhotoImportParams* import_params) +{ LibraryPhoto * self = NULL; - PhotoImportParams* _tmp0_; - PhotoRow* _tmp1_; - PhotoImportParams* _tmp2_; - GeeCollection* _tmp3_; - GeeCollection* _tmp4_; - OneShotScheduler* _tmp5_; - PhotoImportParams* _tmp6_; - PhotoRow* _tmp7_; - guint64 _tmp8_; - PhotoImportParams* _tmp13_; - PhotoRow* _tmp14_; - guint64 _tmp15_; + PhotoRow* _tmp0_; + GeeCollection* _tmp1_; + GeeCollection* _tmp2_; + OneShotScheduler* _tmp3_; + PhotoRow* _tmp4_; + guint64 _tmp5_; + PhotoRow* _tmp9_; + guint64 _tmp10_; #line 4995 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (import_params), NULL); #line 4996 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = import_params; + _tmp0_ = import_params->row; #line 4996 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp0_->row; -#line 4996 "/home/jens/Source/shotwell/src/Photo.vala" - self = (LibraryPhoto*) photo_construct (object_type, _tmp1_); -#line 4998 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = import_params; + self = (LibraryPhoto*) photo_construct (object_type, _tmp0_); #line 4998 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_->keywords; + _tmp1_ = import_params->keywords; #line 4998 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp2_ = _g_object_ref0 (_tmp1_); #line 4998 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->import_keywords); #line 4998 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->import_keywords = _tmp4_; + self->priv->import_keywords = _tmp2_; #line 4999 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = one_shot_scheduler_new ("LibraryPhoto", _library_photo_generate_thumbnails_one_shot_callback, self); + _tmp3_ = one_shot_scheduler_new ("LibraryPhoto", _library_photo_generate_thumbnails_one_shot_callback, self); #line 4999 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->thumbnail_scheduler); #line 4999 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->thumbnail_scheduler = _tmp5_; + self->priv->thumbnail_scheduler = _tmp3_; #line 5002 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = import_params; + _tmp4_ = import_params->row; #line 5002 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_->row; + _tmp5_ = _tmp4_->flags; #line 5002 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_->flags; -#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" - if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) { -#line 38807 "Photo.c" - LibraryPhotoSourceCollection* _tmp9_; - PhotoImportParams* _tmp10_; - PhotoRow* _tmp11_; - const gchar* _tmp12_; -#line 5003 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = library_photo_global; + if ((_tmp5_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) { +#line 38932 "Photo.c" + LibraryPhotoSourceCollection* _tmp6_; + PhotoRow* _tmp7_; + const gchar* _tmp8_; #line 5003 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = import_params; + _tmp6_ = library_photo_global; #line 5003 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_->row; + _tmp7_ = import_params->row; #line 5003 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_->backlinks; + _tmp8_ = _tmp7_->backlinks; #line 5003 "/home/jens/Source/shotwell/src/Photo.vala" - data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp12_); -#line 38822 "Photo.c" + data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp8_); +#line 38944 "Photo.c" } #line 5005 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = import_params; + _tmp9_ = import_params->row; #line 5005 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_->row; + _tmp10_ = _tmp9_->flags; #line 5005 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_->flags; -#line 5005 "/home/jens/Source/shotwell/src/Photo.vala" - if ((_tmp15_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) { -#line 38832 "Photo.c" - PhotoImportParams* _tmp16_; - PhotoRow* _tmp17_; - guint64 _tmp18_; -#line 5006 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = import_params; + if ((_tmp10_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) { +#line 38952 "Photo.c" + PhotoRow* _tmp11_; + guint64 _tmp12_; #line 5006 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_->row; + _tmp11_ = import_params->row; #line 5006 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_->flags; + _tmp12_ = _tmp11_->flags; #line 5006 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_upgrade_rating_flags (self, _tmp18_); -#line 38844 "Photo.c" + library_photo_upgrade_rating_flags (self, _tmp12_); +#line 38961 "Photo.c" } #line 4995 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 38848 "Photo.c" +#line 38965 "Photo.c" } -static LibraryPhoto* library_photo_new_from_import_params (PhotoImportParams* import_params) { +static LibraryPhoto* +library_photo_new_from_import_params (PhotoImportParams* import_params) +{ #line 4995 "/home/jens/Source/shotwell/src/Photo.vala" return library_photo_construct_from_import_params (TYPE_LIBRARY_PHOTO, import_params); -#line 38855 "Photo.c" +#line 38974 "Photo.c" } -void library_photo_init (ProgressMonitor monitor, void* monitor_target) { +void +library_photo_init (ProgressMonitor monitor, + void* monitor_target) +{ LibraryPhotoSourceCollection* _tmp0_; GeeArrayList* all = NULL; PhotoTable* _tmp1_; @@ -38877,14 +38999,14 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { GeeArrayList* _tmp8_; gint _tmp9_; gint _tmp10_; - LibraryPhotoSourceCollection* _tmp34_; - GeeArrayList* _tmp35_; - GeeCollection* _tmp36_; - GeeCollection* _tmp37_; + LibraryPhotoSourceCollection* _tmp32_; + GeeArrayList* _tmp33_; + GeeCollection* _tmp34_; + GeeCollection* _tmp35_; + LibraryPhotoSourceCollection* _tmp36_; + GeeArrayList* _tmp37_; LibraryPhotoSourceCollection* _tmp38_; GeeArrayList* _tmp39_; - LibraryPhotoSourceCollection* _tmp40_; - GeeArrayList* _tmp41_; #line 5010 "/home/jens/Source/shotwell/src/Photo.vala" photo_init_photo (); #line 5012 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38925,19 +39047,19 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { _tmp10_ = _tmp9_; #line 5020 "/home/jens/Source/shotwell/src/Photo.vala" count = _tmp10_; -#line 38924 "Photo.c" +#line 39046 "Photo.c" { gint ctr = 0; #line 5021 "/home/jens/Source/shotwell/src/Photo.vala" ctr = 0; -#line 38929 "Photo.c" +#line 39051 "Photo.c" { gboolean _tmp11_ = FALSE; #line 5021 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = TRUE; #line 5021 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 38936 "Photo.c" +#line 39058 "Photo.c" gint _tmp13_; gint _tmp14_; PhotoRow* row = NULL; @@ -38951,17 +39073,15 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { PhotoRow* _tmp20_; guint64 _tmp21_; guint64 _tmp22_; - ProgressMonitor _tmp30_; - void* _tmp30__target; #line 5021 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp11_) { -#line 38954 "Photo.c" +#line 39074 "Photo.c" gint _tmp12_; #line 5021 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = ctr; #line 5021 "/home/jens/Source/shotwell/src/Photo.vala" ctr = _tmp12_ + 1; -#line 38960 "Photo.c" +#line 39080 "Photo.c" } #line 5021 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = FALSE; @@ -38973,7 +39093,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { if (!(_tmp13_ < _tmp14_)) { #line 5021 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 38972 "Photo.c" +#line 39092 "Photo.c" } #line 5022 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = all; @@ -38999,7 +39119,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { _tmp22_ = flags; #line 5026 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp22_ & LIBRARY_PHOTO_FLAG_TRASH) != ((guint64) 0)) { -#line 38998 "Photo.c" +#line 39118 "Photo.c" GeeArrayList* _tmp23_; LibraryPhoto* _tmp24_; #line 5027 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39008,14 +39128,14 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { _tmp24_ = photo; #line 5027 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_); -#line 39007 "Photo.c" +#line 39127 "Photo.c" } else { guint64 _tmp25_; #line 5028 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = flags; #line 5028 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp25_ & LIBRARY_PHOTO_FLAG_OFFLINE) != ((guint64) 0)) { -#line 39014 "Photo.c" +#line 39134 "Photo.c" GeeArrayList* _tmp26_; LibraryPhoto* _tmp27_; #line 5029 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39024,7 +39144,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { _tmp27_ = photo; #line 5029 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp27_); -#line 39023 "Photo.c" +#line 39143 "Photo.c" } else { GeeArrayList* _tmp28_; LibraryPhoto* _tmp29_; @@ -39034,62 +39154,52 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { _tmp29_ = photo; #line 5031 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_); -#line 39033 "Photo.c" +#line 39153 "Photo.c" } } #line 5033 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = monitor; -#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30__target = monitor_target; -#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp30_ != NULL) { -#line 39042 "Photo.c" - ProgressMonitor _tmp31_; - void* _tmp31__target; - gint _tmp32_; - gint _tmp33_; -#line 5034 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = monitor; -#line 5034 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31__target = monitor_target; + if (monitor != NULL) { +#line 39158 "Photo.c" + gint _tmp30_; + gint _tmp31_; #line 5034 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = ctr; + _tmp30_ = ctr; #line 5034 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = count; + _tmp31_ = count; #line 5034 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ ((guint64) _tmp32_, (guint64) _tmp33_, TRUE, _tmp31__target); -#line 39057 "Photo.c" + monitor ((guint64) _tmp30_, (guint64) _tmp31_, TRUE, monitor_target); +#line 39167 "Photo.c" } #line 5021 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 5021 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (row); -#line 39063 "Photo.c" +#line 39173 "Photo.c" } } } #line 5037 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = library_photo_global; + _tmp32_ = library_photo_global; #line 5037 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = all_photos; + _tmp33_ = all_photos; #line 5037 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); + _tmp34_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); #line 5037 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tmp36_; + _tmp35_ = _tmp34_; #line 5037 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp37_); + _g_object_unref0 (_tmp35_); #line 5038 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = library_photo_global; + _tmp36_ = library_photo_global; #line 5038 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = trashed_photos; + _tmp37_ = trashed_photos; #line 5038 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_collection_add_many_to_trash (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection)); + media_source_collection_add_many_to_trash (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection)); #line 5039 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = library_photo_global; + _tmp38_ = library_photo_global; #line 5039 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = offline_photos; + _tmp39_ = offline_photos; #line 5039 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_collection_add_many_to_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection)); + media_source_collection_add_many_to_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection)); #line 5009 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (offline_photos); #line 5009 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39098,30 +39208,32 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { _g_object_unref0 (all_photos); #line 5009 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (all); -#line 39097 "Photo.c" +#line 39207 "Photo.c" } -void library_photo_terminate (void) { +void +library_photo_terminate (void) +{ #line 5043 "/home/jens/Source/shotwell/src/Photo.vala" photo_terminate_photo (); -#line 39104 "Photo.c" +#line 39216 "Photo.c" } -ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhoto* * photo) { +ImportResult +library_photo_import_create (PhotoImportParams* params, + LibraryPhoto* * photo) +{ LibraryPhoto* _vala_photo = NULL; ImportResult result = 0; PhotoID photo_id = {0}; PhotoTable* _tmp0_; PhotoTable* _tmp1_; - PhotoImportParams* _tmp2_; - PhotoRow* _tmp3_; - PhotoID _tmp4_ = {0}; - PhotoID _tmp5_; - gboolean _tmp6_; - PhotoImportParams* _tmp7_; - LibraryPhoto* _tmp8_; + PhotoRow* _tmp2_; + PhotoID _tmp3_ = {0}; + PhotoID _tmp4_; + LibraryPhoto* _tmp5_; #line 5050 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (params), 0); #line 5052 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39129,21 +39241,17 @@ ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhot #line 5052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 5052 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = params; + _tmp2_ = params->row; #line 5052 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_->row; + photo_table_add (_tmp1_, _tmp2_, &_tmp3_); #line 5052 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_add (_tmp1_, _tmp3_, &_tmp4_); -#line 5052 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 5052 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); #line 5052 "/home/jens/Source/shotwell/src/Photo.vala" - photo_id = _tmp5_; -#line 5053 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_id_is_invalid (&photo_id); + photo_id = _tmp4_; #line 5053 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_) { + if (photo_id_is_invalid (&photo_id)) { #line 5054 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_vala_photo); #line 5054 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39154,69 +39262,66 @@ ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhot if (photo) { #line 5056 "/home/jens/Source/shotwell/src/Photo.vala" *photo = _vala_photo; -#line 39153 "Photo.c" +#line 39261 "Photo.c" } else { #line 5056 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_vala_photo); -#line 39157 "Photo.c" +#line 39265 "Photo.c" } #line 5056 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39161 "Photo.c" +#line 39269 "Photo.c" } #line 5060 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = params; -#line 5060 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = library_photo_new_from_import_params (_tmp7_); + _tmp5_ = library_photo_new_from_import_params (params); #line 5060 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_vala_photo); #line 5060 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_photo = _tmp8_; + _vala_photo = _tmp5_; #line 5062 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_SUCCESS; #line 5062 "/home/jens/Source/shotwell/src/Photo.vala" if (photo) { #line 5062 "/home/jens/Source/shotwell/src/Photo.vala" *photo = _vala_photo; -#line 39177 "Photo.c" +#line 39283 "Photo.c" } else { #line 5062 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_vala_photo); -#line 39181 "Photo.c" +#line 39287 "Photo.c" } #line 5062 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39185 "Photo.c" +#line 39291 "Photo.c" } -void library_photo_import_failed (LibraryPhoto* photo) { +void +library_photo_import_failed (LibraryPhoto* photo) +{ GError * _inner_error_ = NULL; #line 5065 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 39193 "Photo.c" +#line 39301 "Photo.c" { PhotoTable* _tmp0_; PhotoTable* _tmp1_; - LibraryPhoto* _tmp2_; - PhotoID _tmp3_ = {0}; + PhotoID _tmp2_ = {0}; #line 5067 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_table_get_instance (); #line 5067 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 5067 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo; + photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo), &_tmp2_); #line 5067 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO, Photo), &_tmp3_); -#line 5067 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_remove (_tmp1_, &_tmp3_, &_inner_error_); + photo_table_remove (_tmp1_, &_tmp2_, &_inner_error_); #line 5067 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); #line 5067 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 5067 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 39215 "Photo.c" +#line 39320 "Photo.c" goto __catch419_database_error; } #line 5067 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39225,25 +39330,25 @@ void library_photo_import_failed (LibraryPhoto* photo) { g_clear_error (&_inner_error_); #line 5067 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39224 "Photo.c" +#line 39329 "Photo.c" } } goto __finally419; __catch419_database_error: { GError* err = NULL; - GError* _tmp4_; + GError* _tmp3_; #line 5066 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 5066 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 5069 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = err; + _tmp3_ = err; #line 5069 "/home/jens/Source/shotwell/src/Photo.vala" - app_window_database_error (_tmp4_); + app_window_database_error (_tmp3_); #line 5066 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 39242 "Photo.c" +#line 39347 "Photo.c" } __finally419: #line 5066 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39254,114 +39359,104 @@ void library_photo_import_failed (LibraryPhoto* photo) { g_clear_error (&_inner_error_); #line 5066 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39253 "Photo.c" +#line 39358 "Photo.c" } } -static void library_photo_real_notify_master_reimported (Photo* base, PhotoMetadata* metadata) { +static void +library_photo_real_notify_master_reimported (Photo* base, + PhotoMetadata* metadata) +{ LibraryPhoto * self; - PhotoMetadata* _tmp0_; - LibraryPhotoSourceCollection* _tmp1_; - PhotoMetadata* _tmp2_; + LibraryPhotoSourceCollection* _tmp0_; #line 5073 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5073 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 5074 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = metadata; -#line 5074 "/home/jens/Source/shotwell/src/Photo.vala" - PHOTO_CLASS (library_photo_parent_class)->notify_master_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_); + PHOTO_CLASS (library_photo_parent_class)->notify_master_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), metadata); #line 5076 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = library_photo_global; + _tmp0_ = library_photo_global; #line 5076 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = metadata; -#line 5076 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_source_collection_notify_master_reimported (_tmp1_, self, _tmp2_); -#line 39277 "Photo.c" + library_photo_source_collection_notify_master_reimported (_tmp0_, self, metadata); +#line 39379 "Photo.c" } -static void library_photo_real_notify_editable_reimported (Photo* base, PhotoMetadata* metadata) { +static void +library_photo_real_notify_editable_reimported (Photo* base, + PhotoMetadata* metadata) +{ LibraryPhoto * self; - PhotoMetadata* _tmp0_; - LibraryPhotoSourceCollection* _tmp1_; - PhotoMetadata* _tmp2_; + LibraryPhotoSourceCollection* _tmp0_; #line 5079 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5079 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 5080 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = metadata; -#line 5080 "/home/jens/Source/shotwell/src/Photo.vala" - PHOTO_CLASS (library_photo_parent_class)->notify_editable_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_); -#line 5082 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = library_photo_global; + PHOTO_CLASS (library_photo_parent_class)->notify_editable_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), metadata); #line 5082 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = metadata; + _tmp0_ = library_photo_global; #line 5082 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_source_collection_notify_editable_reimported (_tmp1_, self, _tmp2_); -#line 39300 "Photo.c" + library_photo_source_collection_notify_editable_reimported (_tmp0_, self, metadata); +#line 39399 "Photo.c" } -static void library_photo_real_notify_source_reimported (Photo* base, PhotoMetadata* metadata) { +static void +library_photo_real_notify_source_reimported (Photo* base, + PhotoMetadata* metadata) +{ LibraryPhoto * self; - PhotoMetadata* _tmp0_; - LibraryPhotoSourceCollection* _tmp1_; - PhotoMetadata* _tmp2_; + LibraryPhotoSourceCollection* _tmp0_; #line 5085 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5085 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 5086 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = metadata; -#line 5086 "/home/jens/Source/shotwell/src/Photo.vala" - PHOTO_CLASS (library_photo_parent_class)->notify_source_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_); + PHOTO_CLASS (library_photo_parent_class)->notify_source_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), metadata); #line 5088 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = library_photo_global; + _tmp0_ = library_photo_global; #line 5088 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = metadata; -#line 5088 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_source_collection_notify_source_reimported (_tmp1_, self, _tmp2_); -#line 39323 "Photo.c" + library_photo_source_collection_notify_source_reimported (_tmp0_, self, metadata); +#line 39419 "Photo.c" } -static void library_photo_real_notify_baseline_reimported (Photo* base, PhotoMetadata* metadata) { +static void +library_photo_real_notify_baseline_reimported (Photo* base, + PhotoMetadata* metadata) +{ LibraryPhoto * self; - PhotoMetadata* _tmp0_; - LibraryPhotoSourceCollection* _tmp1_; - PhotoMetadata* _tmp2_; + LibraryPhotoSourceCollection* _tmp0_; #line 5091 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5091 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 5092 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = metadata; -#line 5092 "/home/jens/Source/shotwell/src/Photo.vala" - PHOTO_CLASS (library_photo_parent_class)->notify_baseline_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_); -#line 5094 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = library_photo_global; + PHOTO_CLASS (library_photo_parent_class)->notify_baseline_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), metadata); #line 5094 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = metadata; + _tmp0_ = library_photo_global; #line 5094 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_source_collection_notify_baseline_reimported (_tmp1_, self, _tmp2_); -#line 39346 "Photo.c" + library_photo_source_collection_notify_baseline_reimported (_tmp0_, self, metadata); +#line 39439 "Photo.c" } -static void library_photo_generate_thumbnails (LibraryPhoto* self) { +static void +library_photo_generate_thumbnails (LibraryPhoto* self) +{ GError * _inner_error_ = NULL; #line 5097 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); -#line 39354 "Photo.c" +#line 39449 "Photo.c" { #line 5099 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_cache_import_from_source (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TRUE, &_inner_error_); #line 5099 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 39360 "Photo.c" +#line 39455 "Photo.c" goto __catch420_g_error; } } @@ -39391,7 +39486,7 @@ static void library_photo_generate_thumbnails (LibraryPhoto* self) { _g_free0 (_tmp1_); #line 5098 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 39390 "Photo.c" +#line 39485 "Photo.c" } __finally420: #line 5098 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39402,15 +39497,17 @@ static void library_photo_generate_thumbnails (LibraryPhoto* self) { g_clear_error (&_inner_error_); #line 5098 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39401 "Photo.c" +#line 39496 "Photo.c" } #line 5105 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 39405 "Photo.c" +#line 39500 "Photo.c" } -GeeCollection* library_photo_get_import_keywords (LibraryPhoto* self) { +GeeCollection* +library_photo_get_import_keywords (LibraryPhoto* self) +{ GeeCollection* result = NULL; GeeCollection* _tmp0_; GeeCollection* _tmp1_; @@ -39424,26 +39521,30 @@ GeeCollection* library_photo_get_import_keywords (LibraryPhoto* self) { result = _tmp1_; #line 5110 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39423 "Photo.c" +#line 39520 "Photo.c" } -void library_photo_clear_import_keywords (LibraryPhoto* self) { +void +library_photo_clear_import_keywords (LibraryPhoto* self) +{ #line 5113 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); #line 5114 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->import_keywords); #line 5114 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->import_keywords = NULL; -#line 39434 "Photo.c" +#line 39533 "Photo.c" } -static void library_photo_real_notify_altered (DataObject* base, Alteration* alteration) { +static void +library_photo_real_notify_altered (DataObject* base, + Alteration* alteration) +{ LibraryPhoto * self; gboolean _tmp0_ = FALSE; gboolean _tmp1_; - Alteration* _tmp5_; #line 5117 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5117 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39452,40 +39553,35 @@ static void library_photo_real_notify_altered (DataObject* base, Alteration* alt _tmp1_ = self->priv->block_thumbnail_generation; #line 5119 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp1_) { -#line 39451 "Photo.c" - Alteration* _tmp2_; - gboolean _tmp3_; #line 5119 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = alteration; -#line 5119 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = alteration_has_subject (_tmp2_, "image"); -#line 5119 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp3_; -#line 39460 "Photo.c" + _tmp0_ = alteration_has_subject (alteration, "image"); +#line 39554 "Photo.c" } else { #line 5119 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = FALSE; -#line 39464 "Photo.c" +#line 39558 "Photo.c" } #line 5119 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_) { -#line 39468 "Photo.c" - OneShotScheduler* _tmp4_; +#line 39562 "Photo.c" + OneShotScheduler* _tmp2_; #line 5120 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->priv->thumbnail_scheduler; + _tmp2_ = self->priv->thumbnail_scheduler; #line 5120 "/home/jens/Source/shotwell/src/Photo.vala" - one_shot_scheduler_at_priority_idle (_tmp4_, G_PRIORITY_LOW); -#line 39474 "Photo.c" + one_shot_scheduler_at_priority_idle (_tmp2_, G_PRIORITY_LOW); +#line 39568 "Photo.c" } #line 5122 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = alteration; -#line 5122 "/home/jens/Source/shotwell/src/Photo.vala" - DATA_OBJECT_CLASS (library_photo_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_OBJECT, DataObject), _tmp5_); -#line 39480 "Photo.c" + DATA_OBJECT_CLASS (library_photo_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_OBJECT, DataObject), alteration); +#line 39572 "Photo.c" } -static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scaling* scaling, GError** error) { +static GdkPixbuf* +library_photo_real_get_preview_pixbuf (MediaSource* base, + Scaling* scaling, + GError** error) +{ LibraryPhoto * self; GdkPixbuf* result = NULL; GdkPixbuf* pixbuf = NULL; @@ -39506,7 +39602,7 @@ static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scal g_propagate_error (error, _inner_error_); #line 5126 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39505 "Photo.c" +#line 39601 "Photo.c" } #line 5128 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_BILINEAR, TRUE); @@ -39516,34 +39612,31 @@ static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scal _g_object_unref0 (pixbuf); #line 5128 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39515 "Photo.c" +#line 39611 "Photo.c" } -static void library_photo_real_rotate (Photo* base, Rotation rotation) { +static void +library_photo_real_rotate (Photo* base, + Rotation rotation) +{ LibraryPhoto * self; - Rotation _tmp0_; GError * _inner_error_ = NULL; #line 5131 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5133 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->block_thumbnail_generation = TRUE; #line 5134 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = rotation; -#line 5134 "/home/jens/Source/shotwell/src/Photo.vala" - PHOTO_CLASS (library_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_); + PHOTO_CLASS (library_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), rotation); #line 5135 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->block_thumbnail_generation = FALSE; -#line 39533 "Photo.c" +#line 39629 "Photo.c" { - Rotation _tmp1_; -#line 5143 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = rotation; #line 5143 "/home/jens/Source/shotwell/src/Photo.vala" - thumbnail_cache_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_); + thumbnail_cache_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), rotation, &_inner_error_); #line 5143 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 39542 "Photo.c" +#line 39635 "Photo.c" goto __catch421_g_error; } } @@ -39551,29 +39644,29 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) { __catch421_g_error: { GError* err = NULL; - gchar* _tmp2_; - gchar* _tmp3_; - GError* _tmp4_; - const gchar* _tmp5_; + gchar* _tmp0_; + gchar* _tmp1_; + GError* _tmp2_; + const gchar* _tmp3_; #line 5142 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 5142 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 5146 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 5146 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 5146 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = err; + _tmp2_ = err; #line 5146 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_->message; + _tmp3_ = _tmp2_->message; #line 5146 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:5146: Unable to update thumbnails for %s: %s", _tmp3_, _tmp5_); + g_warning ("Photo.vala:5146: Unable to update thumbnails for %s: %s", _tmp1_, _tmp3_); #line 5146 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp1_); #line 5142 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 39572 "Photo.c" +#line 39665 "Photo.c" } __finally421: #line 5142 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39584,69 +39677,76 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) { g_clear_error (&_inner_error_); #line 5142 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39583 "Photo.c" +#line 39676 "Photo.c" } #line 5149 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 39587 "Photo.c" +#line 39680 "Photo.c" } -static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error) { +static GdkPixbuf* +library_photo_real_get_thumbnail (ThumbnailSource* base, + gint scale, + GError** error) +{ LibraryPhoto * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; - gint _tmp1_; + GdkPixbuf* _tmp1_; GdkPixbuf* _tmp2_; - GdkPixbuf* _tmp3_; GError * _inner_error_ = NULL; #line 5153 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = scale; + _tmp1_ = thumbnail_cache_fetch (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), scale, &_inner_error_); #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = thumbnail_cache_fetch (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_); -#line 5154 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp2_; + _tmp0_ = _tmp1_; #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39613 "Photo.c" +#line 39707 "Photo.c" } #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp0_; + _tmp2_ = _tmp0_; #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp3_; + result = _tmp2_; #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39625 "Photo.c" +#line 39719 "Photo.c" } -static void _library_photo_on_duplicate_progress_gfile_progress_callback (gint64 current_num_bytes, gint64 total_num_bytes, gpointer self) { +static void +_library_photo_on_duplicate_progress_gfile_progress_callback (gint64 current_num_bytes, + gint64 total_num_bytes, + gpointer self) +{ #line 5166 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_on_duplicate_progress ((LibraryPhoto*) self, current_num_bytes, total_num_bytes); -#line 39632 "Photo.c" +#line 39730 "Photo.c" } -static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPhotoRow* backing, BackingPhotoID* result, GError** error) { +static void +library_photo_duplicate_backing_photo (LibraryPhoto* self, + BackingPhotoRow* backing, + BackingPhotoID* result, + GError** error) +{ BackingPhotoID backing_id = {0}; gboolean _tmp0_ = FALSE; - BackingPhotoRow* _tmp1_; GFile* file = NULL; - BackingPhotoRow* _tmp4_; - const gchar* _tmp5_; - GFile* _tmp6_; - GFile* _tmp7_; - gboolean _tmp8_; + const gchar* _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; GError * _inner_error_ = NULL; #line 5159 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); @@ -39655,22 +39755,17 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh #line 5160 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_id_init (&backing_id, BACKING_PHOTO_ID_INVALID); #line 5161 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = backing; -#line 5161 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_ == NULL) { + if (backing == NULL) { #line 5161 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = TRUE; -#line 39659 "Photo.c" +#line 39757 "Photo.c" } else { - BackingPhotoRow* _tmp2_; - const gchar* _tmp3_; -#line 5161 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = backing; + const gchar* _tmp1_; #line 5161 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_->filepath; + _tmp1_ = backing->filepath; #line 5161 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp3_ == NULL; -#line 39669 "Photo.c" + _tmp0_ = _tmp1_ == NULL; +#line 39764 "Photo.c" } #line 5161 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_) { @@ -39678,38 +39773,34 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh *result = backing_id; #line 5162 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39677 "Photo.c" +#line 39772 "Photo.c" } #line 5164 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = backing; + _tmp2_ = backing->filepath; #line 5164 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_->filepath; + _tmp3_ = g_file_new_for_path (_tmp2_); #line 5164 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = g_file_new_for_path (_tmp5_); -#line 5164 "/home/jens/Source/shotwell/src/Photo.vala" - file = _tmp6_; -#line 5165 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = file; + file = _tmp3_; #line 5165 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = g_file_query_exists (_tmp7_, NULL); + _tmp4_ = file; #line 5165 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_) { -#line 39693 "Photo.c" + if (g_file_query_exists (_tmp4_, NULL)) { +#line 39784 "Photo.c" GFile* dupe_file = NULL; - GFile* _tmp9_; - GFile* _tmp10_; + GFile* _tmp5_; + GFile* _tmp6_; DetectedPhotoInformation* detected = NULL; BackingPhotoRow* state = NULL; - GFile* _tmp11_; - DetectedPhotoInformation* _tmp12_ = NULL; - BackingPhotoRow* _tmp13_; - BackingPhotoRow* _tmp14_; + GFile* _tmp7_; + DetectedPhotoInformation* _tmp8_ = NULL; + BackingPhotoRow* _tmp9_; + BackingPhotoRow* _tmp10_; #line 5166 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = file; + _tmp5_ = file; #line 5166 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = library_files_duplicate (_tmp9_, _library_photo_on_duplicate_progress_gfile_progress_callback, self, TRUE, &_inner_error_); + _tmp6_ = library_files_duplicate (_tmp5_, _library_photo_on_duplicate_progress_gfile_progress_callback, self, TRUE, &_inner_error_); #line 5166 "/home/jens/Source/shotwell/src/Photo.vala" - dupe_file = _tmp10_; + dupe_file = _tmp6_; #line 5166 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 5166 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39718,18 +39809,18 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh _g_object_unref0 (file); #line 5166 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39717 "Photo.c" +#line 39808 "Photo.c" } #line 5169 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = dupe_file; + _tmp7_ = dupe_file; #line 5169 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_query_backing_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp11_, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp12_, &_inner_error_); + _tmp9_ = photo_query_backing_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp7_, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp8_, &_inner_error_); #line 5169 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); #line 5169 "/home/jens/Source/shotwell/src/Photo.vala" - detected = _tmp12_; + detected = _tmp8_; #line 5169 "/home/jens/Source/shotwell/src/Photo.vala" - state = _tmp13_; + state = _tmp9_; #line 5169 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 5169 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39742,28 +39833,28 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh _g_object_unref0 (file); #line 5169 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39741 "Photo.c" +#line 39832 "Photo.c" } #line 5171 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = state; + _tmp10_ = state; #line 5171 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp14_ != NULL) { -#line 39747 "Photo.c" - BackingPhotoTable* _tmp15_; - BackingPhotoTable* _tmp16_; - BackingPhotoRow* _tmp17_; - BackingPhotoRow* _tmp18_; - BackingPhotoID _tmp19_; + if (_tmp10_ != NULL) { +#line 39838 "Photo.c" + BackingPhotoTable* _tmp11_; + BackingPhotoTable* _tmp12_; + BackingPhotoRow* _tmp13_; + BackingPhotoRow* _tmp14_; + BackingPhotoID _tmp15_; #line 5172 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = backing_photo_table_get_instance (); + _tmp11_ = backing_photo_table_get_instance (); #line 5172 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_; + _tmp12_ = _tmp11_; #line 5172 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = state; + _tmp13_ = state; #line 5172 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_add (_tmp16_, _tmp17_, &_inner_error_); + backing_photo_table_add (_tmp12_, _tmp13_, &_inner_error_); #line 5172 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp16_); + _database_table_unref0 (_tmp12_); #line 5172 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 5172 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39778,15 +39869,15 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh _g_object_unref0 (file); #line 5172 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39777 "Photo.c" +#line 39868 "Photo.c" } #line 5173 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = state; + _tmp14_ = state; #line 5173 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_->id; + _tmp15_ = _tmp14_->id; #line 5173 "/home/jens/Source/shotwell/src/Photo.vala" - backing_id = _tmp19_; -#line 39785 "Photo.c" + backing_id = _tmp15_; +#line 39876 "Photo.c" } #line 5165 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (state); @@ -39794,7 +39885,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh _detected_photo_information_unref0 (detected); #line 5165 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dupe_file); -#line 39793 "Photo.c" +#line 39884 "Photo.c" } #line 5177 "/home/jens/Source/shotwell/src/Photo.vala" *result = backing_id; @@ -39802,11 +39893,14 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh _g_object_unref0 (file); #line 5177 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39801 "Photo.c" +#line 39892 "Photo.c" } -LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { +LibraryPhoto* +library_photo_duplicate (LibraryPhoto* self, + GError** error) +{ LibraryPhoto* result = NULL; GFile* dupe_file = NULL; GFile* _tmp0_; @@ -39887,7 +39981,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { g_propagate_error (error, _inner_error_); #line 5182 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39886 "Photo.c" +#line 39980 "Photo.c" } #line 5185 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)); @@ -39909,7 +40003,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _g_object_unref0 (dupe_file); #line 5185 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39908 "Photo.c" +#line 40002 "Photo.c" } #line 5186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_SHOTWELL); @@ -39931,7 +40025,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _g_object_unref0 (dupe_file); #line 5186 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39930 "Photo.c" +#line 40024 "Photo.c" } #line 5188 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_CAMERA); @@ -39953,7 +40047,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _g_object_unref0 (dupe_file); #line 5188 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39952 "Photo.c" +#line 40046 "Photo.c" } #line 5190 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_EMBEDDED); @@ -39975,7 +40069,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _g_object_unref0 (dupe_file); #line 5190 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39974 "Photo.c" +#line 40068 "Photo.c" } #line 5194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = photo_table_get_instance (); @@ -40049,7 +40143,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _g_object_unref0 (_tmp44_); #line 5208 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp45_) { -#line 40048 "Photo.c" +#line 40142 "Photo.c" LibraryPhoto* _tmp46_; Event* _tmp47_; Event* _tmp48_; @@ -40066,7 +40160,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { event_attach (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_MEDIA_SOURCE, MediaSource)); #line 5209 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp48_); -#line 40065 "Photo.c" +#line 40159 "Photo.c" } #line 5212 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = tag_global; @@ -40078,7 +40172,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _tmp52_ = tags; #line 5213 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp52_ != NULL) { -#line 40077 "Photo.c" +#line 40171 "Photo.c" { GeeIterator* _tag_it = NULL; GeeCollection* _tmp53_; @@ -40091,43 +40185,40 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _tag_it = _tmp54_; #line 5214 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 40090 "Photo.c" +#line 40184 "Photo.c" GeeIterator* _tmp55_; - gboolean _tmp56_; Tag* tag = NULL; - GeeIterator* _tmp57_; - gpointer _tmp58_; - Tag* _tmp59_; - LibraryPhoto* _tmp60_; + GeeIterator* _tmp56_; + gpointer _tmp57_; + Tag* _tmp58_; + LibraryPhoto* _tmp59_; #line 5214 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = _tag_it; #line 5214 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = gee_iterator_next (_tmp55_); -#line 5214 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp56_) { + if (!gee_iterator_next (_tmp55_)) { #line 5214 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 40106 "Photo.c" +#line 40197 "Photo.c" } #line 5214 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = _tag_it; + _tmp56_ = _tag_it; #line 5214 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = gee_iterator_get (_tmp57_); + _tmp57_ = gee_iterator_get (_tmp56_); #line 5214 "/home/jens/Source/shotwell/src/Photo.vala" - tag = (Tag*) _tmp58_; + tag = (Tag*) _tmp57_; #line 5215 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = tag; + _tmp58_ = tag; #line 5215 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = dupe; + _tmp59_ = dupe; #line 5215 "/home/jens/Source/shotwell/src/Photo.vala" - tag_attach (_tmp59_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE, MediaSource)); + tag_attach (_tmp58_, G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, TYPE_MEDIA_SOURCE, MediaSource)); #line 5214 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 40122 "Photo.c" +#line 40213 "Photo.c" } #line 5214 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_it); -#line 40126 "Photo.c" +#line 40217 "Photo.c" } } #line 5219 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40140,136 +40231,144 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _g_object_unref0 (dupe_file); #line 5219 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40139 "Photo.c" +#line 40230 "Photo.c" } -static void library_photo_on_duplicate_progress (LibraryPhoto* self, gint64 current, gint64 total) { +static void +library_photo_on_duplicate_progress (LibraryPhoto* self, + gint64 current, + gint64 total) +{ #line 5222 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); #line 5223 "/home/jens/Source/shotwell/src/Photo.vala" spin_event_loop (); -#line 40148 "Photo.c" +#line 40243 "Photo.c" } -static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flags) { - guint64 _tmp0_; - guint64 _tmp1_; +static void +library_photo_upgrade_rating_flags (LibraryPhoto* self, + guint64 flags) +{ #line 5226 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); #line 5227 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = flags; -#line 5227 "/home/jens/Source/shotwell/src/Photo.vala" - if ((_tmp0_ & LIBRARY_PHOTO_FLAG_HIDDEN) != ((guint64) 0)) { + if ((flags & LIBRARY_PHOTO_FLAG_HIDDEN) != ((guint64) 0)) { #line 5228 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_REJECTED); #line 5229 "/home/jens/Source/shotwell/src/Photo.vala" photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_HIDDEN, NULL); -#line 40165 "Photo.c" +#line 40259 "Photo.c" } #line 5232 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = flags; -#line 5232 "/home/jens/Source/shotwell/src/Photo.vala" - if ((_tmp1_ & LIBRARY_PHOTO_FLAG_FAVORITE) != ((guint64) 0)) { + if ((flags & LIBRARY_PHOTO_FLAG_FAVORITE) != ((guint64) 0)) { #line 5233 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_FIVE); #line 5234 "/home/jens/Source/shotwell/src/Photo.vala" photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FAVORITE, NULL); -#line 40175 "Photo.c" +#line 40267 "Photo.c" } } -static gboolean library_photo_real_is_trashed (MediaSource* base) { +static gboolean +library_photo_real_is_trashed (MediaSource* base) +{ LibraryPhoto * self; gboolean result = FALSE; - gboolean _tmp0_; #line 5239 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5240 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH); -#line 5240 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp0_; + result = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH); #line 5240 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40192 "Photo.c" +#line 40283 "Photo.c" } -static void library_photo_real_trash (MediaSource* base) { +static void +library_photo_real_trash (MediaSource* base) +{ LibraryPhoto * self; #line 5243 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5244 "/home/jens/Source/shotwell/src/Photo.vala" photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH, NULL); -#line 40202 "Photo.c" +#line 40295 "Photo.c" } -static void library_photo_real_untrash (MediaSource* base) { +static void +library_photo_real_untrash (MediaSource* base) +{ LibraryPhoto * self; #line 5247 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5248 "/home/jens/Source/shotwell/src/Photo.vala" photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH, NULL); -#line 40212 "Photo.c" +#line 40307 "Photo.c" } -static gboolean library_photo_real_is_offline (Monitorable* base) { +static gboolean +library_photo_real_is_offline (Monitorable* base) +{ LibraryPhoto * self; gboolean result = FALSE; - gboolean _tmp0_; #line 5251 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE); -#line 5252 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp0_; + result = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE); #line 5252 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40228 "Photo.c" +#line 40322 "Photo.c" } -static void library_photo_real_mark_offline (Monitorable* base) { +static void +library_photo_real_mark_offline (Monitorable* base) +{ LibraryPhoto * self; #line 5255 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5256 "/home/jens/Source/shotwell/src/Photo.vala" photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE, NULL); -#line 40238 "Photo.c" +#line 40334 "Photo.c" } -static void library_photo_real_mark_online (Monitorable* base) { +static void +library_photo_real_mark_online (Monitorable* base) +{ LibraryPhoto * self; #line 5259 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5260 "/home/jens/Source/shotwell/src/Photo.vala" photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE, NULL); -#line 40248 "Photo.c" +#line 40346 "Photo.c" } -static gboolean library_photo_real_is_flagged (Flaggable* base) { +static gboolean +library_photo_real_is_flagged (Flaggable* base) +{ LibraryPhoto * self; gboolean result = FALSE; - gboolean _tmp0_; #line 5263 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5264 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED); -#line 5264 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp0_; + result = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED); #line 5264 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40264 "Photo.c" +#line 40361 "Photo.c" } -static void library_photo_real_mark_flagged (Flaggable* base) { +static void +library_photo_real_mark_flagged (Flaggable* base) +{ LibraryPhoto * self; Alteration* _tmp0_; Alteration* _tmp1_; @@ -40283,11 +40382,13 @@ static void library_photo_real_mark_flagged (Flaggable* base) { photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED, _tmp1_); #line 5268 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp1_); -#line 40282 "Photo.c" +#line 40381 "Photo.c" } -static void library_photo_real_mark_unflagged (Flaggable* base) { +static void +library_photo_real_mark_unflagged (Flaggable* base) +{ LibraryPhoto * self; Alteration* _tmp0_; Alteration* _tmp1_; @@ -40301,32 +40402,31 @@ static void library_photo_real_mark_unflagged (Flaggable* base) { photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED, _tmp1_); #line 5272 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp1_); -#line 40300 "Photo.c" +#line 40401 "Photo.c" } -static gboolean library_photo_real_internal_delete_backing (DataSource* base, GError** error) { +static gboolean +library_photo_real_internal_delete_backing (DataSource* base, + GError** error) +{ LibraryPhoto * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; - gboolean _tmp1_; - gboolean _tmp3_; GError * _inner_error_ = NULL; #line 5275 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5278 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = DATA_SOURCE_CLASS (library_photo_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_SOURCE, DataSource), &_inner_error_); -#line 5278 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp1_; + _tmp0_ = DATA_SOURCE_CLASS (library_photo_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_SOURCE, DataSource), &_inner_error_); #line 5278 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 40319 "Photo.c" - gboolean _tmp2_ = FALSE; +#line 40419 "Photo.c" + gboolean _tmp1_ = FALSE; #line 5278 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 5278 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp2_; -#line 40325 "Photo.c" + return _tmp1_; +#line 40425 "Photo.c" } #line 5278 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp0_) { @@ -40334,19 +40434,19 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE result = FALSE; #line 5279 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40333 "Photo.c" +#line 40433 "Photo.c" } #line 5281 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5281 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp3_; + result = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 5281 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40341 "Photo.c" +#line 40439 "Photo.c" } -static void library_photo_real_destroy (DataSource* base) { +static void +library_photo_real_destroy (DataSource* base) +{ LibraryPhoto * self; PhotoID photo_id = {0}; PhotoID _tmp0_ = {0}; @@ -40359,7 +40459,7 @@ static void library_photo_real_destroy (DataSource* base) { photo_id = _tmp0_; #line 5288 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 40358 "Photo.c" +#line 40458 "Photo.c" { PhotoTable* _tmp1_; PhotoTable* _tmp2_; @@ -40378,7 +40478,7 @@ static void library_photo_real_destroy (DataSource* base) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 5294 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 40377 "Photo.c" +#line 40477 "Photo.c" goto __catch422_database_error; } #line 5294 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40387,7 +40487,7 @@ static void library_photo_real_destroy (DataSource* base) { g_clear_error (&_inner_error_); #line 5294 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40386 "Photo.c" +#line 40486 "Photo.c" } } goto __finally422; @@ -40405,7 +40505,7 @@ static void library_photo_real_destroy (DataSource* base) { app_window_database_error (_tmp4_); #line 5293 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 40404 "Photo.c" +#line 40504 "Photo.c" } __finally422: #line 5293 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40416,169 +40516,150 @@ static void library_photo_real_destroy (DataSource* base) { g_clear_error (&_inner_error_); #line 5293 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40415 "Photo.c" +#line 40515 "Photo.c" } #line 5299 "/home/jens/Source/shotwell/src/Photo.vala" DATA_SOURCE_CLASS (library_photo_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_SOURCE, DataSource)); -#line 40419 "Photo.c" +#line 40519 "Photo.c" } -gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format) { +gboolean +library_photo_has_nontrash_duplicate (GFile* file, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format) +{ gboolean result = FALSE; - GFile* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - PhotoFileFormat _tmp3_; - PhotoID _tmp4_ = {0}; - gboolean _tmp5_; + PhotoID _tmp0_ = {0}; #line 5302 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE); #line 5304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file; -#line 5304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = thumbnail_md5; -#line 5304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = full_md5; -#line 5304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = file_format; -#line 5304 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_get_nontrash_duplicate (_tmp0_, _tmp1_, _tmp2_, _tmp3_, &_tmp4_); + library_photo_get_nontrash_duplicate (file, thumbnail_md5, full_md5, file_format, &_tmp0_); #line 5304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_id_is_valid (&_tmp4_); -#line 5304 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp5_; + result = photo_id_is_valid (&_tmp0_); #line 5304 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40449 "Photo.c" +#line 40539 "Photo.c" } -void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, PhotoID* result) { +void +library_photo_get_nontrash_duplicate (GFile* file, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format, + PhotoID* result) +{ PhotoID* ids = NULL; - GFile* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - PhotoFileFormat _tmp3_; - gint _tmp4_; - PhotoID* _tmp5_; + gint _tmp0_; + PhotoID* _tmp1_; gint ids_length1; gint _ids_size_; - gboolean _tmp6_ = FALSE; - PhotoID* _tmp7_; - gint _tmp7__length1; - PhotoID* _tmp10_; - gint _tmp10__length1; - PhotoID _tmp18_ = {0}; + gboolean _tmp2_ = FALSE; + PhotoID* _tmp3_; + gint _tmp3__length1; + PhotoID* _tmp6_; + gint _tmp6__length1; + PhotoID _tmp13_ = {0}; #line 5307 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((file == NULL) || G_IS_FILE (file)); #line 5309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file; -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = thumbnail_md5; -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = full_md5; + _tmp1_ = photo_get_duplicate_ids (file, thumbnail_md5, full_md5, file_format, &_tmp0_); #line 5309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = file_format; + ids = _tmp1_; #line 5309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_get_duplicate_ids (_tmp0_, _tmp1_, _tmp2_, _tmp3_, &_tmp4_); -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" - ids = _tmp5_; -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" - ids_length1 = _tmp4_; + ids_length1 = _tmp0_; #line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _ids_size_ = ids_length1; #line 5311 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = ids; + _tmp3_ = ids; #line 5311 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7__length1 = ids_length1; + _tmp3__length1 = ids_length1; #line 5311 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp7_ == NULL) { + if (_tmp3_ == NULL) { #line 5311 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = TRUE; -#line 40495 "Photo.c" + _tmp2_ = TRUE; +#line 40579 "Photo.c" } else { - PhotoID* _tmp8_; - gint _tmp8__length1; + PhotoID* _tmp4_; + gint _tmp4__length1; #line 5311 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = ids; + _tmp4_ = ids; #line 5311 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8__length1 = ids_length1; + _tmp4__length1 = ids_length1; #line 5311 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp8__length1 == 0; -#line 40505 "Photo.c" + _tmp2_ = _tmp4__length1 == 0; +#line 40589 "Photo.c" } #line 5311 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_) { -#line 40509 "Photo.c" - PhotoID _tmp9_ = {0}; + if (_tmp2_) { +#line 40593 "Photo.c" + PhotoID _tmp5_ = {0}; #line 5312 "/home/jens/Source/shotwell/src/Photo.vala" - photo_id_init (&_tmp9_, PHOTO_ID_INVALID); + photo_id_init (&_tmp5_, PHOTO_ID_INVALID); #line 5312 "/home/jens/Source/shotwell/src/Photo.vala" - *result = _tmp9_; + *result = _tmp5_; #line 5312 "/home/jens/Source/shotwell/src/Photo.vala" ids = (g_free (ids), NULL); #line 5312 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40519 "Photo.c" +#line 40603 "Photo.c" } #line 5314 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = ids; + _tmp6_ = ids; #line 5314 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10__length1 = ids_length1; -#line 40525 "Photo.c" + _tmp6__length1 = ids_length1; +#line 40609 "Photo.c" { PhotoID* id_collection = NULL; gint id_collection_length1 = 0; gint _id_collection_size_ = 0; gint id_it = 0; #line 5314 "/home/jens/Source/shotwell/src/Photo.vala" - id_collection = _tmp10_; + id_collection = _tmp6_; #line 5314 "/home/jens/Source/shotwell/src/Photo.vala" - id_collection_length1 = _tmp10__length1; + id_collection_length1 = _tmp6__length1; #line 5314 "/home/jens/Source/shotwell/src/Photo.vala" - for (id_it = 0; id_it < _tmp10__length1; id_it = id_it + 1) { -#line 40537 "Photo.c" + for (id_it = 0; id_it < _tmp6__length1; id_it = id_it + 1) { +#line 40621 "Photo.c" PhotoID id = {0}; #line 5314 "/home/jens/Source/shotwell/src/Photo.vala" id = id_collection[id_it]; -#line 40541 "Photo.c" +#line 40625 "Photo.c" { LibraryPhoto* photo = NULL; - LibraryPhotoSourceCollection* _tmp11_; - PhotoID _tmp12_; - LibraryPhoto* _tmp13_; - gboolean _tmp14_ = FALSE; - LibraryPhoto* _tmp15_; + LibraryPhotoSourceCollection* _tmp7_; + PhotoID _tmp8_; + LibraryPhoto* _tmp9_; + gboolean _tmp10_ = FALSE; + LibraryPhoto* _tmp11_; #line 5315 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = library_photo_global; + _tmp7_ = library_photo_global; #line 5315 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = id; + _tmp8_ = id; #line 5315 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = library_photo_source_collection_fetch (_tmp11_, &_tmp12_); + _tmp9_ = library_photo_source_collection_fetch (_tmp7_, &_tmp8_); #line 5315 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp13_; -#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo; + photo = _tmp9_; #line 5316 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp15_ != NULL) { -#line 40561 "Photo.c" - LibraryPhoto* _tmp16_; - gboolean _tmp17_; + _tmp11_ = photo; #line 5316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = photo; + if (_tmp11_ != NULL) { +#line 40645 "Photo.c" + LibraryPhoto* _tmp12_; #line 5316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp12_ = photo; #line 5316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = !_tmp17_; -#line 40570 "Photo.c" + _tmp10_ = !media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MEDIA_SOURCE, MediaSource)); +#line 40651 "Photo.c" } else { #line 5316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = FALSE; -#line 40574 "Photo.c" + _tmp10_ = FALSE; +#line 40655 "Photo.c" } #line 5316 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp14_) { + if (_tmp10_) { #line 5317 "/home/jens/Source/shotwell/src/Photo.vala" *result = id; #line 5317 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40587,27 +40668,29 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m ids = (g_free (ids), NULL); #line 5317 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40586 "Photo.c" +#line 40667 "Photo.c" } #line 5314 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 40590 "Photo.c" +#line 40671 "Photo.c" } } } #line 5320 "/home/jens/Source/shotwell/src/Photo.vala" - photo_id_init (&_tmp18_, PHOTO_ID_INVALID); + photo_id_init (&_tmp13_, PHOTO_ID_INVALID); #line 5320 "/home/jens/Source/shotwell/src/Photo.vala" - *result = _tmp18_; + *result = _tmp13_; #line 5320 "/home/jens/Source/shotwell/src/Photo.vala" ids = (g_free (ids), NULL); #line 5320 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40602 "Photo.c" +#line 40683 "Photo.c" } -static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { +static gboolean +library_photo_real_has_user_generated_metadata (Photo* base) +{ LibraryPhoto * self; gboolean result = FALSE; GeeList* tags = NULL; @@ -40616,22 +40699,20 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { PhotoMetadata* metadata = NULL; PhotoMetadata* _tmp2_; PhotoMetadata* _tmp3_; - Rating _tmp11_; - PhotoMetadata* _tmp12_; - Rating _tmp13_; + PhotoMetadata* _tmp10_; GeeSet* keywords = NULL; - PhotoMetadata* _tmp14_; - GeeSet* _tmp15_; - gint _tmp16_ = 0; - GeeList* _tmp17_; + PhotoMetadata* _tmp11_; + GeeSet* _tmp12_; + gint _tmp13_ = 0; + GeeList* _tmp14_; gint tags_count = 0; - gint _tmp21_ = 0; - GeeSet* _tmp22_; + gint _tmp18_ = 0; + GeeSet* _tmp19_; gint keywords_count = 0; - gint _tmp26_; - gint _tmp27_; - gboolean _tmp28_ = FALSE; - GeeList* _tmp29_; + gint _tmp23_; + gint _tmp24_; + gboolean _tmp25_ = FALSE; + GeeList* _tmp26_; #line 5323 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5324 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40648,7 +40729,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _tmp3_ = metadata; #line 5327 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ == NULL) { -#line 40647 "Photo.c" +#line 40728 "Photo.c" gboolean _tmp4_ = FALSE; gboolean _tmp5_ = FALSE; GeeList* _tmp6_; @@ -40658,7 +40739,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { if (_tmp6_ != NULL) { #line 5328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = TRUE; -#line 40657 "Photo.c" +#line 40738 "Photo.c" } else { GeeList* _tmp7_; gint _tmp8_; @@ -40671,20 +40752,17 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _tmp9_ = _tmp8_; #line 5328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp9_ > 0; -#line 40670 "Photo.c" +#line 40751 "Photo.c" } #line 5328 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { #line 5328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = TRUE; -#line 40676 "Photo.c" +#line 40757 "Photo.c" } else { - Rating _tmp10_; #line 5328 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp10_ != RATING_UNRATED; -#line 40683 "Photo.c" + _tmp4_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)) != RATING_UNRATED; +#line 40761 "Photo.c" } #line 5328 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; @@ -40694,16 +40772,12 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _g_object_unref0 (tags); #line 5328 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40693 "Photo.c" +#line 40771 "Photo.c" } #line 5330 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5330 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = metadata; -#line 5330 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_metadata_get_rating (_tmp12_); + _tmp10_ = metadata; #line 5330 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_ != _tmp13_) { + if (media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)) != photo_metadata_get_rating (_tmp10_)) { #line 5331 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 5331 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40712,68 +40786,68 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _g_object_unref0 (tags); #line 5331 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40711 "Photo.c" +#line 40785 "Photo.c" } #line 5333 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = metadata; + _tmp11_ = metadata; #line 5333 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo_metadata_get_keywords (_tmp14_, NULL, NULL, NULL); + _tmp12_ = photo_metadata_get_keywords (_tmp11_, NULL, NULL, NULL); #line 5333 "/home/jens/Source/shotwell/src/Photo.vala" - keywords = _tmp15_; + keywords = _tmp12_; #line 5334 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = tags; + _tmp14_ = tags; #line 5334 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp17_ != NULL) { -#line 40723 "Photo.c" - GeeList* _tmp18_; - gint _tmp19_; - gint _tmp20_; + if (_tmp14_ != NULL) { +#line 40797 "Photo.c" + GeeList* _tmp15_; + gint _tmp16_; + gint _tmp17_; #line 5334 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = tags; + _tmp15_ = tags; #line 5334 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp16_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); #line 5334 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_; + _tmp17_ = _tmp16_; #line 5334 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp20_; -#line 40735 "Photo.c" + _tmp13_ = _tmp17_; +#line 40809 "Photo.c" } else { #line 5334 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = 0; -#line 40739 "Photo.c" + _tmp13_ = 0; +#line 40813 "Photo.c" } #line 5334 "/home/jens/Source/shotwell/src/Photo.vala" - tags_count = _tmp16_; + tags_count = _tmp13_; #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = keywords; + _tmp19_ = keywords; #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp22_ != NULL) { -#line 40747 "Photo.c" - GeeSet* _tmp23_; - gint _tmp24_; - gint _tmp25_; + if (_tmp19_ != NULL) { +#line 40821 "Photo.c" + GeeSet* _tmp20_; + gint _tmp21_; + gint _tmp22_; #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = keywords; + _tmp20_ = keywords; #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp24_; + _tmp22_ = _tmp21_; #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp25_; -#line 40759 "Photo.c" + _tmp18_ = _tmp22_; +#line 40833 "Photo.c" } else { #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = 0; -#line 40763 "Photo.c" + _tmp18_ = 0; +#line 40837 "Photo.c" } #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" - keywords_count = _tmp21_; + keywords_count = _tmp18_; #line 5337 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = tags_count; + _tmp23_ = tags_count; #line 5337 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = keywords_count; + _tmp24_ = keywords_count; #line 5337 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp26_ != _tmp27_) { + if (_tmp23_ != _tmp24_) { #line 5338 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 5338 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40784,114 +40858,111 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _g_object_unref0 (tags); #line 5338 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40783 "Photo.c" +#line 40857 "Photo.c" } #line 5340 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = tags; + _tmp26_ = tags; #line 5340 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp29_ != NULL) { -#line 40789 "Photo.c" - GeeSet* _tmp30_; + if (_tmp26_ != NULL) { +#line 40863 "Photo.c" + GeeSet* _tmp27_; #line 5340 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = keywords; + _tmp27_ = keywords; #line 5340 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp30_ != NULL; -#line 40795 "Photo.c" + _tmp25_ = _tmp27_ != NULL; +#line 40869 "Photo.c" } else { #line 5340 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = FALSE; -#line 40799 "Photo.c" + _tmp25_ = FALSE; +#line 40873 "Photo.c" } #line 5340 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp28_) { -#line 40803 "Photo.c" + if (_tmp25_) { +#line 40877 "Photo.c" { GeeList* _tag_list = NULL; - GeeList* _tmp31_; - GeeList* _tmp32_; + GeeList* _tmp28_; + GeeList* _tmp29_; gint _tag_size = 0; - GeeList* _tmp33_; - gint _tmp34_; - gint _tmp35_; + GeeList* _tmp30_; + gint _tmp31_; + gint _tmp32_; gint _tag_index = 0; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = tags; + _tmp28_ = tags; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _g_object_ref0 (_tmp31_); + _tmp29_ = _g_object_ref0 (_tmp28_); #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tag_list = _tmp32_; + _tag_list = _tmp29_; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tag_list; + _tmp30_ = _tag_list; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp31_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection)); #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = _tmp34_; + _tmp32_ = _tmp31_; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tag_size = _tmp35_; + _tag_size = _tmp32_; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _tag_index = -1; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 40831 "Photo.c" - gint _tmp36_; - gint _tmp37_; - gint _tmp38_; +#line 40905 "Photo.c" + gint _tmp33_; + gint _tmp34_; + gint _tmp35_; Tag* tag = NULL; - GeeList* _tmp39_; - gint _tmp40_; - gpointer _tmp41_; - GeeSet* _tmp42_; - Tag* _tmp43_; + GeeList* _tmp36_; + gint _tmp37_; + gpointer _tmp38_; + GeeSet* _tmp39_; + Tag* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; + gchar* _tmp43_; gchar* _tmp44_; - gchar* _tmp45_; - gchar* _tmp46_; - gchar* _tmp47_; - gboolean _tmp48_; - gboolean _tmp49_; + gboolean _tmp45_; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = _tag_index; + _tmp33_ = _tag_index; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tag_index = _tmp36_ + 1; + _tag_index = _tmp33_ + 1; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tag_index; + _tmp34_ = _tag_index; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = _tag_size; + _tmp35_ = _tag_size; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - if (!(_tmp37_ < _tmp38_)) { + if (!(_tmp34_ < _tmp35_)) { #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 40859 "Photo.c" +#line 40932 "Photo.c" } #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = _tag_list; + _tmp36_ = _tag_list; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = _tag_index; + _tmp37_ = _tag_index; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = gee_list_get (_tmp39_, _tmp40_); + _tmp38_ = gee_list_get (_tmp36_, _tmp37_); #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - tag = (Tag*) _tmp41_; + tag = (Tag*) _tmp38_; #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = keywords; + _tmp39_ = keywords; #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = tag; + _tmp40_ = tag; #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_DATA_OBJECT, DataObject)); + _tmp41_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_OBJECT, DataObject)); #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = _tmp44_; + _tmp42_ = _tmp41_; #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = g_utf8_normalize (_tmp45_, (gssize) -1, G_NORMALIZE_DEFAULT); -#line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = _tmp46_; + _tmp43_ = g_utf8_normalize (_tmp42_, (gssize) -1, G_NORMALIZE_DEFAULT); #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection), _tmp47_); + _tmp44_ = _tmp43_; #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = !_tmp48_; + _tmp45_ = !gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection), _tmp44_); #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp47_); + _g_free0 (_tmp44_); #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp45_); + _g_free0 (_tmp42_); #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp49_) { + if (_tmp45_) { #line 5343 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 5343 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40906,15 +40977,15 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _g_object_unref0 (tags); #line 5343 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40905 "Photo.c" +#line 40976 "Photo.c" } #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 40909 "Photo.c" +#line 40980 "Photo.c" } #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_list); -#line 40913 "Photo.c" +#line 40984 "Photo.c" } } #line 5347 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40927,18 +40998,19 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _g_object_unref0 (tags); #line 5347 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40926 "Photo.c" +#line 40997 "Photo.c" } -static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoMetadata* metadata) { +static void +library_photo_real_set_user_metadata_for_export (Photo* base, + PhotoMetadata* metadata) +{ LibraryPhoto * self; GeeList* photo_tags = NULL; TagSourceCollection* _tmp0_; GeeList* _tmp1_; GeeList* _tmp2_; - PhotoMetadata* _tmp22_; - Rating _tmp23_; #line 5350 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5350 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40953,16 +41025,15 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM _tmp2_ = photo_tags; #line 5352 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 40952 "Photo.c" +#line 41024 "Photo.c" GeeCollection* string_tags = NULL; GeeArrayList* _tmp3_; - PhotoMetadata* _tmp19_; - GeeCollection* _tmp20_; + GeeCollection* _tmp19_; #line 5353 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 5353 "/home/jens/Source/shotwell/src/Photo.vala" string_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); -#line 40961 "Photo.c" +#line 41032 "Photo.c" { GeeList* _tag_list = NULL; GeeList* _tmp4_; @@ -40990,7 +41061,7 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM _tag_index = -1; #line 5354 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 40989 "Photo.c" +#line 41060 "Photo.c" gint _tmp9_; gint _tmp10_; gint _tmp11_; @@ -41014,7 +41085,7 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM if (!(_tmp10_ < _tmp11_)) { #line 5354 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41013 "Photo.c" +#line 41084 "Photo.c" } #line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tag_list; @@ -41038,51 +41109,42 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM _g_free0 (_tmp18_); #line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 41037 "Photo.c" +#line 41108 "Photo.c" } #line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_list); -#line 41041 "Photo.c" +#line 41112 "Photo.c" } #line 5357 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = metadata; -#line 5357 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = string_tags; + _tmp19_ = string_tags; #line 5357 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_keywords (_tmp19_, _tmp20_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_keywords (metadata, _tmp19_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 5352 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (string_tags); -#line 41051 "Photo.c" +#line 41120 "Photo.c" } else { - PhotoMetadata* _tmp21_; #line 5359 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = metadata; -#line 5359 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_keywords (_tmp21_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 41058 "Photo.c" + photo_metadata_set_keywords (metadata, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); +#line 41124 "Photo.c" } #line 5361 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = metadata; -#line 5361 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5361 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_rating (_tmp22_, _tmp23_); + photo_metadata_set_rating (metadata, media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource))); #line 5350 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo_tags); -#line 41068 "Photo.c" +#line 41130 "Photo.c" } -static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, PhotoMetadata* metadata) { +static void +library_photo_real_apply_user_metadata_for_reimport (Photo* base, + PhotoMetadata* metadata) +{ LibraryPhoto * self; HierarchicalTagIndex* new_htag_index = NULL; - PhotoMetadata* _tmp0_; - gboolean _tmp1_; GeeCollection* keywords = NULL; - PhotoMetadata* _tmp6_; - GeeSet* _tmp7_; - GeeCollection* _tmp8_; - HierarchicalTagIndex* _tmp39_; + GeeSet* _tmp3_; + GeeCollection* _tmp4_; + HierarchicalTagIndex* _tmp31_; #line 5364 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5364 "/home/jens/Source/shotwell/src/Photo.vala" @@ -41090,158 +41152,139 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph #line 5365 "/home/jens/Source/shotwell/src/Photo.vala" new_htag_index = NULL; #line 5367 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = metadata; -#line 5367 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_metadata_has_hierarchical_keywords (_tmp0_); -#line 5367 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_) { -#line 41094 "Photo.c" - PhotoMetadata* _tmp2_; - GeeSet* _tmp3_; - GeeSet* _tmp4_; - HierarchicalTagIndex* _tmp5_; -#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = metadata; + if (photo_metadata_has_hierarchical_keywords (metadata)) { +#line 41152 "Photo.c" + GeeSet* _tmp0_; + GeeSet* _tmp1_; + HierarchicalTagIndex* _tmp2_; #line 5368 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_metadata_get_hierarchical_keywords (_tmp2_); + _tmp0_ = photo_metadata_get_hierarchical_keywords (metadata); #line 5368 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_; + _tmp1_ = _tmp0_; #line 5368 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = hierarchical_tag_utilities_process_hierarchical_import_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = hierarchical_tag_utilities_process_hierarchical_import_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); #line 5368 "/home/jens/Source/shotwell/src/Photo.vala" _hierarchical_tag_index_unref0 (new_htag_index); #line 5368 "/home/jens/Source/shotwell/src/Photo.vala" - new_htag_index = _tmp5_; + new_htag_index = _tmp2_; #line 5368 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp4_); -#line 41113 "Photo.c" + _g_object_unref0 (_tmp1_); +#line 41168 "Photo.c" } #line 5372 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = metadata; + _tmp3_ = photo_metadata_get_keywords (metadata, NULL, NULL, NULL); #line 5372 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo_metadata_get_keywords (_tmp6_, NULL, NULL, NULL); -#line 5372 "/home/jens/Source/shotwell/src/Photo.vala" - keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection); + keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); #line 5373 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = keywords; + _tmp4_ = keywords; #line 5373 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_ != NULL) { -#line 41125 "Photo.c" + if (_tmp4_ != NULL) { +#line 41178 "Photo.c" { GeeIterator* _keyword_it = NULL; - GeeCollection* _tmp9_; - GeeIterator* _tmp10_; + GeeCollection* _tmp5_; + GeeIterator* _tmp6_; #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = keywords; + _tmp5_ = keywords; #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" - _keyword_it = _tmp10_; + _keyword_it = _tmp6_; #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41138 "Photo.c" - GeeIterator* _tmp11_; - gboolean _tmp12_; +#line 41191 "Photo.c" + GeeIterator* _tmp7_; gchar* keyword = NULL; - GeeIterator* _tmp13_; - gpointer _tmp14_; - gboolean _tmp15_ = FALSE; - HierarchicalTagIndex* _tmp16_; + GeeIterator* _tmp8_; + gpointer _tmp9_; + gboolean _tmp10_ = FALSE; + HierarchicalTagIndex* _tmp11_; gchar* safe_keyword = NULL; - const gchar* _tmp20_; - gchar* _tmp21_; + const gchar* _tmp14_; + gchar* _tmp15_; gchar* promoted_keyword = NULL; - const gchar* _tmp22_; - gchar* _tmp23_; - TagSourceCollection* _tmp24_; - const gchar* _tmp25_; - gboolean _tmp26_; - TagSourceCollection* _tmp30_; - const gchar* _tmp31_; - gboolean _tmp32_; - const gchar* _tmp36_; - Tag* _tmp37_; - Tag* _tmp38_; -#line 5374 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _keyword_it; + const gchar* _tmp16_; + gchar* _tmp17_; + TagSourceCollection* _tmp18_; + const gchar* _tmp19_; + TagSourceCollection* _tmp23_; + const gchar* _tmp24_; + const gchar* _tmp28_; + Tag* _tmp29_; + Tag* _tmp30_; #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = gee_iterator_next (_tmp11_); + _tmp7_ = _keyword_it; #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp12_) { + if (!gee_iterator_next (_tmp7_)) { #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41169 "Photo.c" +#line 41217 "Photo.c" } #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _keyword_it; + _tmp8_ = _keyword_it; #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = gee_iterator_get (_tmp13_); + _tmp9_ = gee_iterator_get (_tmp8_); #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" - keyword = (gchar*) _tmp14_; -#line 5375 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = new_htag_index; + keyword = (gchar*) _tmp9_; #line 5375 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp16_ != NULL) { -#line 41181 "Photo.c" - HierarchicalTagIndex* _tmp17_; - const gchar* _tmp18_; - gboolean _tmp19_; + _tmp11_ = new_htag_index; #line 5375 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = new_htag_index; + if (_tmp11_ != NULL) { +#line 41229 "Photo.c" + HierarchicalTagIndex* _tmp12_; + const gchar* _tmp13_; #line 5375 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = keyword; + _tmp12_ = new_htag_index; #line 5375 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = hierarchical_tag_index_is_tag_in_index (_tmp17_, _tmp18_); + _tmp13_ = keyword; #line 5375 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp19_; -#line 41193 "Photo.c" + _tmp10_ = hierarchical_tag_index_is_tag_in_index (_tmp12_, _tmp13_); +#line 41238 "Photo.c" } else { #line 5375 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = FALSE; -#line 41197 "Photo.c" + _tmp10_ = FALSE; +#line 41242 "Photo.c" } #line 5375 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp15_) { + if (_tmp10_) { #line 5376 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); #line 5376 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 41205 "Photo.c" +#line 41250 "Photo.c" } #line 5378 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = keyword; + _tmp14_ = keyword; #line 5378 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp20_); + _tmp15_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp14_); #line 5378 "/home/jens/Source/shotwell/src/Photo.vala" - safe_keyword = _tmp21_; + safe_keyword = _tmp15_; #line 5379 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = safe_keyword; + _tmp16_ = safe_keyword; #line 5379 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp22_); + _tmp17_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp16_); #line 5379 "/home/jens/Source/shotwell/src/Photo.vala" - promoted_keyword = _tmp23_; + promoted_keyword = _tmp17_; #line 5382 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = tag_global; + _tmp18_ = tag_global; #line 5382 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = safe_keyword; + _tmp19_ = safe_keyword; #line 5382 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = tag_source_collection_exists (_tmp24_, _tmp25_, FALSE); -#line 5382 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp26_) { -#line 41227 "Photo.c" - const gchar* _tmp27_; - Tag* _tmp28_; - Tag* _tmp29_; + if (tag_source_collection_exists (_tmp18_, _tmp19_, FALSE)) { +#line 41270 "Photo.c" + const gchar* _tmp20_; + Tag* _tmp21_; + Tag* _tmp22_; #line 5383 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = safe_keyword; + _tmp20_ = safe_keyword; #line 5383 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = tag_for_path (_tmp27_); + _tmp21_ = tag_for_path (_tmp20_); #line 5383 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _tmp28_; + _tmp22_ = _tmp21_; #line 5383 "/home/jens/Source/shotwell/src/Photo.vala" - tag_attach (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + tag_attach (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 5383 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp29_); + _g_object_unref0 (_tmp22_); #line 5384 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (promoted_keyword); #line 5384 "/home/jens/Source/shotwell/src/Photo.vala" @@ -41250,30 +41293,28 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph _g_free0 (keyword); #line 5384 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 41249 "Photo.c" +#line 41292 "Photo.c" } #line 5387 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = tag_global; -#line 5387 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = promoted_keyword; + _tmp23_ = tag_global; #line 5387 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = tag_source_collection_exists (_tmp30_, _tmp31_, FALSE); + _tmp24_ = promoted_keyword; #line 5387 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp32_) { -#line 41259 "Photo.c" - const gchar* _tmp33_; - Tag* _tmp34_; - Tag* _tmp35_; + if (tag_source_collection_exists (_tmp23_, _tmp24_, FALSE)) { +#line 41300 "Photo.c" + const gchar* _tmp25_; + Tag* _tmp26_; + Tag* _tmp27_; #line 5388 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = promoted_keyword; + _tmp25_ = promoted_keyword; #line 5388 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = tag_for_path (_tmp33_); + _tmp26_ = tag_for_path (_tmp25_); #line 5388 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = _tmp34_; + _tmp27_ = _tmp26_; #line 5388 "/home/jens/Source/shotwell/src/Photo.vala" - tag_attach (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + tag_attach (_tmp27_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 5388 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp35_); + _g_object_unref0 (_tmp27_); #line 5389 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (promoted_keyword); #line 5389 "/home/jens/Source/shotwell/src/Photo.vala" @@ -41282,112 +41323,111 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph _g_free0 (keyword); #line 5389 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 41281 "Photo.c" +#line 41322 "Photo.c" } #line 5392 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = keyword; + _tmp28_ = keyword; #line 5392 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = tag_for_path (_tmp36_); + _tmp29_ = tag_for_path (_tmp28_); #line 5392 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = _tmp37_; + _tmp30_ = _tmp29_; #line 5392 "/home/jens/Source/shotwell/src/Photo.vala" - tag_attach (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + tag_attach (_tmp30_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 5392 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp38_); + _g_object_unref0 (_tmp30_); #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (promoted_keyword); #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (safe_keyword); #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); -#line 41299 "Photo.c" +#line 41340 "Photo.c" } #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_keyword_it); -#line 41303 "Photo.c" +#line 41344 "Photo.c" } } #line 5396 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = new_htag_index; + _tmp31_ = new_htag_index; #line 5396 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp39_ != NULL) { -#line 41310 "Photo.c" + if (_tmp31_ != NULL) { +#line 41351 "Photo.c" { GeeIterator* _path_it = NULL; - HierarchicalTagIndex* _tmp40_; - GeeCollection* _tmp41_; - GeeCollection* _tmp42_; - GeeIterator* _tmp43_; - GeeIterator* _tmp44_; + HierarchicalTagIndex* _tmp32_; + GeeCollection* _tmp33_; + GeeCollection* _tmp34_; + GeeIterator* _tmp35_; + GeeIterator* _tmp36_; #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = new_htag_index; + _tmp32_ = new_htag_index; #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = hierarchical_tag_index_get_all_paths (_tmp40_); + _tmp33_ = hierarchical_tag_index_get_all_paths (_tmp32_); #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _tmp41_; + _tmp34_ = _tmp33_; #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp35_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ITERABLE, GeeIterable)); #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = _tmp43_; + _tmp36_ = _tmp35_; #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp42_); + _g_object_unref0 (_tmp34_); #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _path_it = _tmp44_; + _path_it = _tmp36_; #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41334 "Photo.c" - GeeIterator* _tmp45_; - gboolean _tmp46_; +#line 41375 "Photo.c" + GeeIterator* _tmp37_; gchar* path = NULL; - GeeIterator* _tmp47_; - gpointer _tmp48_; - const gchar* _tmp49_; - Tag* _tmp50_; - Tag* _tmp51_; + GeeIterator* _tmp38_; + gpointer _tmp39_; + const gchar* _tmp40_; + Tag* _tmp41_; + Tag* _tmp42_; #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = _path_it; + _tmp37_ = _path_it; #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = gee_iterator_next (_tmp45_); -#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp46_) { + if (!gee_iterator_next (_tmp37_)) { #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41351 "Photo.c" +#line 41389 "Photo.c" } #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = _path_it; + _tmp38_ = _path_it; #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = gee_iterator_get (_tmp47_); + _tmp39_ = gee_iterator_get (_tmp38_); #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - path = (gchar*) _tmp48_; + path = (gchar*) _tmp39_; #line 5398 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = path; + _tmp40_ = path; #line 5398 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = tag_for_path (_tmp49_); + _tmp41_ = tag_for_path (_tmp40_); #line 5398 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = _tmp50_; + _tmp42_ = _tmp41_; #line 5398 "/home/jens/Source/shotwell/src/Photo.vala" - tag_attach (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + tag_attach (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 5398 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp51_); + _g_object_unref0 (_tmp42_); #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (path); -#line 41371 "Photo.c" +#line 41409 "Photo.c" } #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_path_it); -#line 41375 "Photo.c" +#line 41413 "Photo.c" } } #line 5364 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (keywords); #line 5364 "/home/jens/Source/shotwell/src/Photo.vala" _hierarchical_tag_index_unref0 (new_htag_index); -#line 41382 "Photo.c" +#line 41420 "Photo.c" } -static void library_photo_class_init (LibraryPhotoClass * klass) { +static void +library_photo_class_init (LibraryPhotoClass * klass) +{ #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_parent_class = g_type_class_peek_parent (klass); #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" @@ -41432,11 +41472,13 @@ static void library_photo_class_init (LibraryPhotoClass * klass) { ((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_apply_user_metadata_for_reimport; #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (klass)->finalize = library_photo_finalize; -#line 41431 "Photo.c" +#line 41471 "Photo.c" } -static void library_photo_flaggable_interface_init (FlaggableIface * iface) { +static void +library_photo_flaggable_interface_init (FlaggableIface * iface) +{ #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_flaggable_parent_iface = g_type_interface_peek_parent (iface); #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" @@ -41445,11 +41487,13 @@ static void library_photo_flaggable_interface_init (FlaggableIface * iface) { iface->mark_flagged = (void (*) (Flaggable *)) library_photo_real_mark_flagged; #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" iface->mark_unflagged = (void (*) (Flaggable *)) library_photo_real_mark_unflagged; -#line 41444 "Photo.c" +#line 41486 "Photo.c" } -static void library_photo_monitorable_interface_init (MonitorableIface * iface) { +static void +library_photo_monitorable_interface_init (MonitorableIface * iface) +{ #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_monitorable_parent_iface = g_type_interface_peek_parent (iface); #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" @@ -41462,22 +41506,26 @@ static void library_photo_monitorable_interface_init (MonitorableIface * iface) iface->set_master_file = (void (*) (Monitorable *, GFile*)) photo_set_master_file; #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" iface->set_master_timestamp = (void (*) (Monitorable *, GFileInfo*)) photo_set_master_timestamp; -#line 41461 "Photo.c" +#line 41505 "Photo.c" } -static void library_photo_instance_init (LibraryPhoto * self) { +static void +library_photo_instance_init (LibraryPhoto * self) +{ #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" self->priv = LIBRARY_PHOTO_GET_PRIVATE (self); #line 4976 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->block_thumbnail_generation = FALSE; #line 4977 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->thumbnail_scheduler = NULL; -#line 41472 "Photo.c" +#line 41518 "Photo.c" } -static void library_photo_finalize (GObject * obj) { +static void +library_photo_finalize (GObject * obj) +{ LibraryPhoto * self; #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO, LibraryPhoto); @@ -41487,11 +41535,13 @@ static void library_photo_finalize (GObject * obj) { _g_object_unref0 (self->priv->import_keywords); #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (library_photo_parent_class)->finalize (obj); -#line 41486 "Photo.c" +#line 41534 "Photo.c" } -GType library_photo_get_type (void) { +GType +library_photo_get_type (void) +{ static volatile gsize library_photo_type_id__volatile = 0; if (g_once_init_enter (&library_photo_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryPhotoClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_photo_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryPhoto), 0, (GInstanceInitFunc) library_photo_instance_init, NULL }; @@ -41507,50 +41557,49 @@ GType library_photo_get_type (void) { } -LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_construct (GType object_type, LibraryPhotoSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) { +LibraryPhotoSourceHoldingTank* +library_photo_source_holding_tank_construct (GType object_type, + LibraryPhotoSourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target) +{ LibraryPhotoSourceHoldingTank* self = NULL; - LibraryPhotoSourceCollection* _tmp0_; - SourceHoldingTankCheckToKeep _tmp1_; - void* _tmp1__target; - GetSourceDatabaseKey _tmp2_; - void* _tmp2__target; #line 5414 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (sources), NULL); #line 5416 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = sources; -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = check_to_keep; -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1__target = check_to_keep_target; -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = get_key; -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2__target = get_key_target; -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" - self = (LibraryPhotoSourceHoldingTank*) media_source_holding_tank_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp1_, _tmp1__target, _tmp2_, _tmp2__target); + self = (LibraryPhotoSourceHoldingTank*) media_source_holding_tank_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), check_to_keep, check_to_keep_target, get_key, get_key_target); #line 5414 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 41529 "Photo.c" +#line 41571 "Photo.c" } -LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_new (LibraryPhotoSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) { +LibraryPhotoSourceHoldingTank* +library_photo_source_holding_tank_new (LibraryPhotoSourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target) +{ #line 5414 "/home/jens/Source/shotwell/src/Photo.vala" return library_photo_source_holding_tank_construct (TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target, get_key, get_key_target); -#line 41536 "Photo.c" +#line 41584 "Photo.c" } -LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPhotoSourceHoldingTank* self, GFile* file) { +LibraryPhoto* +library_photo_source_holding_tank_fetch_by_backing_file (LibraryPhotoSourceHoldingTank* self, + GFile* file) +{ LibraryPhoto* result = NULL; LibraryPhoto* ret = NULL; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gpointer _tmp2_; - LibraryPhoto* _tmp3_; - GeeHashMap* _tmp4_; - GFile* _tmp5_; - gpointer _tmp6_; + gpointer _tmp1_; + LibraryPhoto* _tmp2_; + GeeHashMap* _tmp3_; + gpointer _tmp4_; #line 5419 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self), NULL); #line 5419 "/home/jens/Source/shotwell/src/Photo.vala" @@ -41560,59 +41609,63 @@ LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPh #line 5421 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->editable_file_map; #line 5421 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = file; -#line 5421 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 5421 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (ret); #line 5421 "/home/jens/Source/shotwell/src/Photo.vala" - ret = (LibraryPhoto*) _tmp2_; + ret = (LibraryPhoto*) _tmp1_; #line 5422 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = ret; + _tmp2_ = ret; #line 5422 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp3_ != NULL) { + if (_tmp2_ != NULL) { #line 5423 "/home/jens/Source/shotwell/src/Photo.vala" result = ret; #line 5423 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 41574 "Photo.c" +#line 41621 "Photo.c" } #line 5425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->priv->development_file_map; + _tmp3_ = self->priv->development_file_map; #line 5425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = file; + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 5425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_); -#line 5425 "/home/jens/Source/shotwell/src/Photo.vala" - result = (LibraryPhoto*) _tmp6_; + result = (LibraryPhoto*) _tmp4_; #line 5425 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (ret); #line 5425 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 41588 "Photo.c" +#line 41633 "Photo.c" } -static void _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced (Photo* _sender, GFile* old_file, GFile* new_file, gpointer self) { +static void +_library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced (Photo* _sender, + GFile* old_file, + GFile* new_file, + gpointer self) +{ #line 5449 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_holding_tank_on_editable_replaced ((LibraryPhotoSourceHoldingTank*) self, _sender, old_file, new_file); -#line 41595 "Photo.c" +#line 41645 "Photo.c" } -static void _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self) { +static void +_library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, + gpointer self) +{ #line 5450 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_holding_tank_on_raw_development_modified ((LibraryPhotoSourceHoldingTank*) self, _sender); -#line 41602 "Photo.c" +#line 41655 "Photo.c" } -static void library_photo_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed) { +static void +library_photo_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, + GeeCollection* added, + GeeCollection* removed) +{ LibraryPhotoSourceHoldingTank * self; - GeeCollection* _tmp0_; - GeeCollection* _tmp40_; - GeeCollection* _tmp81_; - GeeCollection* _tmp82_; #line 5428 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank); #line 5428 "/home/jens/Source/shotwell/src/Photo.vala" @@ -41620,453 +41673,425 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour #line 5428 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 5430 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = added; -#line 5430 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_ != NULL) { -#line 41622 "Photo.c" + if (added != NULL) { +#line 41673 "Photo.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp0_; #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = added; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_ITERABLE, GeeIterable)); #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" - _source_it = _tmp2_; + _source_it = _tmp0_; #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41635 "Photo.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 41683 "Photo.c" + GeeIterator* _tmp1_; DataSource* source = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp2_; + gpointer _tmp3_; LibraryPhoto* photo = NULL; - DataSource* _tmp7_; - LibraryPhoto* _tmp8_; - LibraryPhoto* _tmp9_; - GFile* _tmp10_; - GFile* _tmp11_; - gboolean _tmp12_; + DataSource* _tmp4_; + LibraryPhoto* _tmp5_; + LibraryPhoto* _tmp6_; + GFile* _tmp7_; + GFile* _tmp8_; + gboolean _tmp9_; GeeCollection* raw_files = NULL; - LibraryPhoto* _tmp23_; - GeeCollection* _tmp24_; - GeeCollection* _tmp25_; - LibraryPhoto* _tmp38_; - LibraryPhoto* _tmp39_; -#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _source_it; + LibraryPhoto* _tmp20_; + GeeCollection* _tmp21_; + GeeCollection* _tmp22_; + LibraryPhoto* _tmp34_; + LibraryPhoto* _tmp35_; #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp1_ = _source_it; #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41662 "Photo.c" +#line 41707 "Photo.c" } #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _source_it; + _tmp2_ = _source_it; #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" - source = (DataSource*) _tmp6_; + source = (DataSource*) _tmp3_; #line 5432 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = source; + _tmp4_ = source; #line 5432 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 5432 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp8_; + photo = _tmp5_; #line 5435 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo; + _tmp6_ = photo; #line 5435 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo)); + _tmp7_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo)); #line 5435 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 5435 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_ != NULL; + _tmp9_ = _tmp8_ != NULL; #line 5435 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp8_); #line 5435 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_) { -#line 41688 "Photo.c" - GeeHashMap* _tmp13_; + if (_tmp9_) { +#line 41733 "Photo.c" + GeeHashMap* _tmp10_; + LibraryPhoto* _tmp11_; + GFile* _tmp12_; + GFile* _tmp13_; LibraryPhoto* _tmp14_; - GFile* _tmp15_; - GFile* _tmp16_; + GeeMultiMap* _tmp15_; + LibraryPhoto* _tmp16_; LibraryPhoto* _tmp17_; - GeeMultiMap* _tmp18_; - LibraryPhoto* _tmp19_; - LibraryPhoto* _tmp20_; - GFile* _tmp21_; - GFile* _tmp22_; + GFile* _tmp18_; + GFile* _tmp19_; #line 5436 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = self->priv->editable_file_map; + _tmp10_ = self->priv->editable_file_map; #line 5436 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = photo; + _tmp11_ = photo; #line 5436 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo)); + _tmp12_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO, Photo)); #line 5436 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_; + _tmp13_ = _tmp12_; #line 5436 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo; + _tmp14_ = photo; #line 5436 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_, _tmp17_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, _tmp14_); #line 5436 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp13_); #line 5437 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->priv->reverse_editable_file_map; + _tmp15_ = self->priv->reverse_editable_file_map; #line 5437 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = photo; + _tmp16_ = photo; #line 5437 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = photo; + _tmp17_ = photo; #line 5437 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo)); + _tmp18_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo)); #line 5437 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_; + _tmp19_ = _tmp18_; #line 5437 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp18_, _tmp19_, _tmp22_); + gee_multi_map_set (_tmp15_, _tmp16_, _tmp19_); #line 5437 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp22_); -#line 41727 "Photo.c" + _g_object_unref0 (_tmp19_); +#line 41772 "Photo.c" } #line 5441 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = photo; + _tmp20_ = photo; #line 5441 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO, Photo)); + _tmp21_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo)); #line 5441 "/home/jens/Source/shotwell/src/Photo.vala" - raw_files = _tmp24_; + raw_files = _tmp21_; #line 5442 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = raw_files; + _tmp22_ = raw_files; #line 5442 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp25_ != NULL) { -#line 41739 "Photo.c" + if (_tmp22_ != NULL) { +#line 41784 "Photo.c" { GeeIterator* _f_it = NULL; - GeeCollection* _tmp26_; - GeeIterator* _tmp27_; + GeeCollection* _tmp23_; + GeeIterator* _tmp24_; #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = raw_files; + _tmp23_ = raw_files; #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp24_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable)); #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" - _f_it = _tmp27_; + _f_it = _tmp24_; #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41752 "Photo.c" - GeeIterator* _tmp28_; - gboolean _tmp29_; +#line 41797 "Photo.c" + GeeIterator* _tmp25_; GFile* f = NULL; - GeeIterator* _tmp30_; - gpointer _tmp31_; - GeeHashMap* _tmp32_; + GeeIterator* _tmp26_; + gpointer _tmp27_; + GeeHashMap* _tmp28_; + GFile* _tmp29_; + LibraryPhoto* _tmp30_; + GeeMultiMap* _tmp31_; + LibraryPhoto* _tmp32_; GFile* _tmp33_; - LibraryPhoto* _tmp34_; - GeeMultiMap* _tmp35_; - LibraryPhoto* _tmp36_; - GFile* _tmp37_; -#line 5443 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _f_it; #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = gee_iterator_next (_tmp28_); + _tmp25_ = _f_it; #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp29_) { + if (!gee_iterator_next (_tmp25_)) { #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41772 "Photo.c" +#line 41814 "Photo.c" } #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _f_it; + _tmp26_ = _f_it; #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = gee_iterator_get (_tmp30_); + _tmp27_ = gee_iterator_get (_tmp26_); #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" - f = (GFile*) _tmp31_; + f = (GFile*) _tmp27_; #line 5444 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = self->priv->development_file_map; + _tmp28_ = self->priv->development_file_map; #line 5444 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = f; + _tmp29_ = f; #line 5444 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = photo; + _tmp30_ = photo; #line 5444 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp33_, _tmp34_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp29_, _tmp30_); #line 5445 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = self->priv->reverse_development_file_map; + _tmp31_ = self->priv->reverse_development_file_map; #line 5445 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = photo; + _tmp32_ = photo; #line 5445 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = f; + _tmp33_ = f; #line 5445 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp35_, _tmp36_, _tmp37_); + gee_multi_map_set (_tmp31_, _tmp32_, _tmp33_); #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 41798 "Photo.c" +#line 41840 "Photo.c" } #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 41802 "Photo.c" +#line 41844 "Photo.c" } } #line 5449 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = photo; + _tmp34_ = photo; #line 5449 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PHOTO, Photo), "editable-replaced", (GCallback) _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_PHOTO, Photo), "editable-replaced", (GCallback) _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced, self); #line 5450 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = photo; + _tmp35_ = photo; #line 5450 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PHOTO, Photo), "raw-development-modified", (GCallback) _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo), "raw-development-modified", (GCallback) _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified, self); #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_files); #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (source); -#line 41819 "Photo.c" +#line 41861 "Photo.c" } #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_source_it); -#line 41823 "Photo.c" +#line 41865 "Photo.c" } } #line 5454 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = removed; -#line 5454 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp40_ != NULL) { -#line 41830 "Photo.c" + if (removed != NULL) { +#line 41870 "Photo.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp41_; - GeeIterator* _tmp42_; -#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = removed; + GeeIterator* _tmp36_; #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp36_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_ITERABLE, GeeIterable)); #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" - _source_it = _tmp42_; + _source_it = _tmp36_; #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41843 "Photo.c" - GeeIterator* _tmp43_; - gboolean _tmp44_; +#line 41880 "Photo.c" + GeeIterator* _tmp37_; DataSource* source = NULL; - GeeIterator* _tmp45_; - gpointer _tmp46_; + GeeIterator* _tmp38_; + gpointer _tmp39_; LibraryPhoto* photo = NULL; - DataSource* _tmp47_; - LibraryPhoto* _tmp48_; - GeeMultiMap* _tmp73_; - LibraryPhoto* _tmp74_; - GeeMultiMap* _tmp75_; - LibraryPhoto* _tmp76_; - LibraryPhoto* _tmp77_; - guint _tmp78_; - LibraryPhoto* _tmp79_; - guint _tmp80_; -#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = _source_it; + DataSource* _tmp40_; + LibraryPhoto* _tmp41_; + GeeMultiMap* _tmp64_; + LibraryPhoto* _tmp65_; + GeeMultiMap* _tmp66_; + LibraryPhoto* _tmp67_; + LibraryPhoto* _tmp68_; + guint _tmp69_; + LibraryPhoto* _tmp70_; + guint _tmp71_; #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = gee_iterator_next (_tmp43_); + _tmp37_ = _source_it; #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp44_) { + if (!gee_iterator_next (_tmp37_)) { #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41868 "Photo.c" +#line 41902 "Photo.c" } #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = _source_it; + _tmp38_ = _source_it; #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = gee_iterator_get (_tmp45_); + _tmp39_ = gee_iterator_get (_tmp38_); #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" - source = (DataSource*) _tmp46_; + source = (DataSource*) _tmp39_; #line 5456 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = source; + _tmp40_ = source; #line 5456 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 5456 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp48_; -#line 41882 "Photo.c" + photo = _tmp41_; +#line 41916 "Photo.c" { GeeIterator* _f_it = NULL; - GeeMultiMap* _tmp49_; - LibraryPhoto* _tmp50_; - GeeCollection* _tmp51_; - GeeCollection* _tmp52_; - GeeIterator* _tmp53_; - GeeIterator* _tmp54_; + GeeMultiMap* _tmp42_; + LibraryPhoto* _tmp43_; + GeeCollection* _tmp44_; + GeeCollection* _tmp45_; + GeeIterator* _tmp46_; + GeeIterator* _tmp47_; #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = self->priv->reverse_editable_file_map; + _tmp42_ = self->priv->reverse_editable_file_map; #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = photo; + _tmp43_ = photo; #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = gee_multi_map_get (_tmp49_, _tmp50_); + _tmp44_ = gee_multi_map_get (_tmp42_, _tmp43_); #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = _tmp51_; + _tmp45_ = _tmp44_; #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp46_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ITERABLE, GeeIterable)); #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = _tmp53_; + _tmp47_ = _tmp46_; #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp52_); + _g_object_unref0 (_tmp45_); #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _f_it = _tmp54_; + _f_it = _tmp47_; #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41909 "Photo.c" - GeeIterator* _tmp55_; - gboolean _tmp56_; +#line 41943 "Photo.c" + GeeIterator* _tmp48_; GFile* f = NULL; - GeeIterator* _tmp57_; - gpointer _tmp58_; - GeeHashMap* _tmp59_; - GFile* _tmp60_; + GeeIterator* _tmp49_; + gpointer _tmp50_; + GeeHashMap* _tmp51_; + GFile* _tmp52_; #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = _f_it; + _tmp48_ = _f_it; #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = gee_iterator_next (_tmp55_); -#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp56_) { + if (!gee_iterator_next (_tmp48_)) { #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41925 "Photo.c" +#line 41956 "Photo.c" } #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = _f_it; + _tmp49_ = _f_it; #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = gee_iterator_get (_tmp57_); + _tmp50_ = gee_iterator_get (_tmp49_); #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - f = (GFile*) _tmp58_; + f = (GFile*) _tmp50_; #line 5458 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = self->priv->editable_file_map; + _tmp51_ = self->priv->editable_file_map; #line 5458 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = f; + _tmp52_ = f; #line 5458 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp60_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp52_, NULL); #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 41941 "Photo.c" +#line 41972 "Photo.c" } #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 41945 "Photo.c" +#line 41976 "Photo.c" } { GeeIterator* _f_it = NULL; - GeeMultiMap* _tmp61_; - LibraryPhoto* _tmp62_; - GeeCollection* _tmp63_; - GeeCollection* _tmp64_; - GeeIterator* _tmp65_; - GeeIterator* _tmp66_; + GeeMultiMap* _tmp53_; + LibraryPhoto* _tmp54_; + GeeCollection* _tmp55_; + GeeCollection* _tmp56_; + GeeIterator* _tmp57_; + GeeIterator* _tmp58_; #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = self->priv->reverse_development_file_map; + _tmp53_ = self->priv->reverse_development_file_map; #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = photo; + _tmp54_ = photo; #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = gee_multi_map_get (_tmp61_, _tmp62_); + _tmp55_ = gee_multi_map_get (_tmp53_, _tmp54_); #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = _tmp63_; + _tmp56_ = _tmp55_; #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp57_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_ITERABLE, GeeIterable)); #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = _tmp65_; + _tmp58_ = _tmp57_; #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp64_); + _g_object_unref0 (_tmp56_); #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _f_it = _tmp66_; + _f_it = _tmp58_; #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41973 "Photo.c" - GeeIterator* _tmp67_; - gboolean _tmp68_; +#line 42004 "Photo.c" + GeeIterator* _tmp59_; GFile* f = NULL; - GeeIterator* _tmp69_; - gpointer _tmp70_; - GeeHashMap* _tmp71_; - GFile* _tmp72_; -#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = _f_it; + GeeIterator* _tmp60_; + gpointer _tmp61_; + GeeHashMap* _tmp62_; + GFile* _tmp63_; #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = gee_iterator_next (_tmp67_); + _tmp59_ = _f_it; #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp68_) { + if (!gee_iterator_next (_tmp59_)) { #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41989 "Photo.c" +#line 42017 "Photo.c" } #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = _f_it; + _tmp60_ = _f_it; #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = gee_iterator_get (_tmp69_); + _tmp61_ = gee_iterator_get (_tmp60_); #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - f = (GFile*) _tmp70_; + f = (GFile*) _tmp61_; #line 5461 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = self->priv->development_file_map; + _tmp62_ = self->priv->development_file_map; #line 5461 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = f; + _tmp63_ = f; #line 5461 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp72_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp63_, NULL); #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 42005 "Photo.c" +#line 42033 "Photo.c" } #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 42009 "Photo.c" +#line 42037 "Photo.c" } #line 5463 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = self->priv->reverse_editable_file_map; + _tmp64_ = self->priv->reverse_editable_file_map; #line 5463 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = photo; + _tmp65_ = photo; #line 5463 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove_all (_tmp73_, _tmp74_); + gee_multi_map_remove_all (_tmp64_, _tmp65_); #line 5464 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = self->priv->reverse_development_file_map; + _tmp66_ = self->priv->reverse_development_file_map; #line 5464 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = photo; + _tmp67_ = photo; #line 5464 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove_all (_tmp75_, _tmp76_); + gee_multi_map_remove_all (_tmp66_, _tmp67_); #line 5466 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = photo; + _tmp68_ = photo; #line 5466 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_parse_name ("editable-replaced", TYPE_PHOTO, &_tmp78_, NULL, FALSE); + g_signal_parse_name ("editable-replaced", TYPE_PHOTO, &_tmp69_, NULL, FALSE); #line 5466 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp78_, 0, NULL, (GCallback) _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp69_, 0, NULL, (GCallback) _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced, self); #line 5467 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = photo; + _tmp70_ = photo; #line 5467 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_parse_name ("raw-development-modified", TYPE_PHOTO, &_tmp80_, NULL, FALSE); + g_signal_parse_name ("raw-development-modified", TYPE_PHOTO, &_tmp71_, NULL, FALSE); #line 5467 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp80_, 0, NULL, (GCallback) _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp71_, 0, NULL, (GCallback) _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified, self); #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (source); -#line 42039 "Photo.c" +#line 42067 "Photo.c" } #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_source_it); -#line 42043 "Photo.c" +#line 42071 "Photo.c" } } #line 5471 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = added; -#line 5471 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = removed; -#line 5471 "/home/jens/Source/shotwell/src/Photo.vala" - SOURCE_HOLDING_TANK_CLASS (library_photo_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank), TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp81_, _tmp82_); -#line 42052 "Photo.c" + SOURCE_HOLDING_TANK_CLASS (library_photo_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank), TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), added, removed); +#line 42076 "Photo.c" } -static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhotoSourceHoldingTank* self, Photo* _photo, GFile* old_file, GFile* new_file) { +static void +library_photo_source_holding_tank_on_editable_replaced (LibraryPhotoSourceHoldingTank* self, + Photo* _photo, + GFile* old_file, + GFile* new_file) +{ LibraryPhoto* photo = NULL; - Photo* _tmp0_; + LibraryPhoto* _tmp0_; LibraryPhoto* _tmp1_; - LibraryPhoto* _tmp2_; - GFile* _tmp3_; - GFile* _tmp9_; - GeeMultiMap* _tmp13_; - LibraryPhoto* _tmp14_; - GFile* _tmp15_; + GeeMultiMap* _tmp7_; + LibraryPhoto* _tmp8_; #line 5474 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self)); #line 5474 "/home/jens/Source/shotwell/src/Photo.vala" @@ -42076,267 +42101,243 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto #line 5474 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file)); #line 5475 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _photo; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_photo, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _photo) : NULL); #line 5475 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL); -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp1_; + photo = _tmp0_; #line 5476 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo; + _tmp1_ = photo; #line 5476 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp2_ != NULL, "photo != null"); -#line 5478 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = old_file; + _vala_assert (_tmp1_ != NULL, "photo != null"); #line 5478 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp3_ != NULL) { -#line 42088 "Photo.c" - GeeHashMap* _tmp4_; - GFile* _tmp5_; - GeeMultiMap* _tmp6_; - LibraryPhoto* _tmp7_; - GFile* _tmp8_; -#line 5479 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->priv->editable_file_map; + if (old_file != NULL) { +#line 42109 "Photo.c" + GeeHashMap* _tmp2_; + GeeMultiMap* _tmp3_; + LibraryPhoto* _tmp4_; #line 5479 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = old_file; + _tmp2_ = self->priv->editable_file_map; #line 5479 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), old_file, NULL); #line 5480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->priv->reverse_editable_file_map; + _tmp3_ = self->priv->reverse_editable_file_map; #line 5480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo; -#line 5480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = old_file; + _tmp4_ = photo; #line 5480 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove (_tmp6_, _tmp7_, _tmp8_); -#line 42108 "Photo.c" + gee_multi_map_remove (_tmp3_, _tmp4_, old_file); +#line 42123 "Photo.c" } #line 5483 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = new_file; -#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp9_ != NULL) { -#line 42114 "Photo.c" - GeeHashMap* _tmp10_; - GFile* _tmp11_; - LibraryPhoto* _tmp12_; -#line 5484 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = self->priv->editable_file_map; + if (new_file != NULL) { +#line 42127 "Photo.c" + GeeHashMap* _tmp5_; + LibraryPhoto* _tmp6_; #line 5484 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = new_file; + _tmp5_ = self->priv->editable_file_map; #line 5484 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo; + _tmp6_ = photo; #line 5484 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, _tmp12_); -#line 42126 "Photo.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), new_file, _tmp6_); +#line 42136 "Photo.c" } #line 5485 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = self->priv->reverse_editable_file_map; + _tmp7_ = self->priv->reverse_editable_file_map; #line 5485 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = photo; -#line 5485 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = new_file; + _tmp8_ = photo; #line 5485 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp13_, _tmp14_, _tmp15_); + gee_multi_map_set (_tmp7_, _tmp8_, new_file); #line 5474 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 42138 "Photo.c" +#line 42146 "Photo.c" } -static void library_photo_source_holding_tank_on_raw_development_modified (LibraryPhotoSourceHoldingTank* self, Photo* _photo) { +static void +library_photo_source_holding_tank_on_raw_development_modified (LibraryPhotoSourceHoldingTank* self, + Photo* _photo) +{ LibraryPhoto* photo = NULL; - Photo* _tmp0_; + LibraryPhoto* _tmp0_; LibraryPhoto* _tmp1_; - LibraryPhoto* _tmp2_; - GeeMultiMap* _tmp3_; - LibraryPhoto* _tmp4_; - gboolean _tmp5_; + GeeMultiMap* _tmp2_; + LibraryPhoto* _tmp3_; GeeCollection* raw_list = NULL; - LibraryPhoto* _tmp20_; - GeeCollection* _tmp21_; - GeeCollection* _tmp22_; + LibraryPhoto* _tmp17_; + GeeCollection* _tmp18_; + GeeCollection* _tmp19_; #line 5488 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self)); #line 5488 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (_photo)); #line 5489 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _photo; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_photo, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _photo) : NULL); #line 5489 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL); -#line 5489 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp1_; + photo = _tmp0_; #line 5490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo; + _tmp1_ = photo; #line 5490 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp2_ != NULL, "photo != null"); -#line 5493 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->priv->reverse_development_file_map; + _vala_assert (_tmp1_ != NULL, "photo != null"); #line 5493 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo; + _tmp2_ = self->priv->reverse_development_file_map; #line 5493 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_); + _tmp3_ = photo; #line 5493 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_) { -#line 42176 "Photo.c" - GeeMultiMap* _tmp18_; - LibraryPhoto* _tmp19_; + if (gee_multi_map_contains (_tmp2_, _tmp3_)) { +#line 42181 "Photo.c" + GeeMultiMap* _tmp15_; + LibraryPhoto* _tmp16_; { GeeIterator* _f_it = NULL; - GeeMultiMap* _tmp6_; - LibraryPhoto* _tmp7_; - GeeCollection* _tmp8_; - GeeCollection* _tmp9_; - GeeIterator* _tmp10_; - GeeIterator* _tmp11_; + GeeMultiMap* _tmp4_; + LibraryPhoto* _tmp5_; + GeeCollection* _tmp6_; + GeeCollection* _tmp7_; + GeeIterator* _tmp8_; + GeeIterator* _tmp9_; #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->priv->reverse_development_file_map; + _tmp4_ = self->priv->reverse_development_file_map; #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo; + _tmp5_ = photo; #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = gee_multi_map_get (_tmp6_, _tmp7_); + _tmp6_ = gee_multi_map_get (_tmp4_, _tmp5_); #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp7_); #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _f_it = _tmp11_; + _f_it = _tmp9_; #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 42205 "Photo.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 42210 "Photo.c" + GeeIterator* _tmp10_; GFile* f = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; - GeeHashMap* _tmp16_; - GFile* _tmp17_; -#line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _f_it; + GeeIterator* _tmp11_; + gpointer _tmp12_; + GeeHashMap* _tmp13_; + GFile* _tmp14_; #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = gee_iterator_next (_tmp12_); + _tmp10_ = _f_it; #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp10_)) { #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 42221 "Photo.c" +#line 42223 "Photo.c" } #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _f_it; + _tmp11_ = _f_it; #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - f = (GFile*) _tmp15_; + f = (GFile*) _tmp12_; #line 5495 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = self->priv->development_file_map; + _tmp13_ = self->priv->development_file_map; #line 5495 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = f; + _tmp14_ = f; #line 5495 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp14_, NULL); #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 42237 "Photo.c" +#line 42239 "Photo.c" } #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 42241 "Photo.c" +#line 42243 "Photo.c" } #line 5496 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->priv->reverse_development_file_map; + _tmp15_ = self->priv->reverse_development_file_map; #line 5496 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = photo; + _tmp16_ = photo; #line 5496 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove_all (_tmp18_, _tmp19_); -#line 42249 "Photo.c" + gee_multi_map_remove_all (_tmp15_, _tmp16_); +#line 42251 "Photo.c" } #line 5500 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = photo; + _tmp17_ = photo; #line 5500 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo)); + _tmp18_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo)); #line 5500 "/home/jens/Source/shotwell/src/Photo.vala" - raw_list = _tmp21_; + raw_list = _tmp18_; #line 5501 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = raw_list; + _tmp19_ = raw_list; #line 5501 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp22_ != NULL) { -#line 42261 "Photo.c" + if (_tmp19_ != NULL) { +#line 42263 "Photo.c" { GeeIterator* _f_it = NULL; - GeeCollection* _tmp23_; - GeeIterator* _tmp24_; + GeeCollection* _tmp20_; + GeeIterator* _tmp21_; #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = raw_list; + _tmp20_ = raw_list; #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp21_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ITERABLE, GeeIterable)); #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" - _f_it = _tmp24_; + _f_it = _tmp21_; #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 42274 "Photo.c" - GeeIterator* _tmp25_; - gboolean _tmp26_; +#line 42276 "Photo.c" + GeeIterator* _tmp22_; GFile* f = NULL; - GeeIterator* _tmp27_; - gpointer _tmp28_; - GeeHashMap* _tmp29_; + GeeIterator* _tmp23_; + gpointer _tmp24_; + GeeHashMap* _tmp25_; + GFile* _tmp26_; + LibraryPhoto* _tmp27_; + GeeMultiMap* _tmp28_; + LibraryPhoto* _tmp29_; GFile* _tmp30_; - LibraryPhoto* _tmp31_; - GeeMultiMap* _tmp32_; - LibraryPhoto* _tmp33_; - GFile* _tmp34_; -#line 5502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _f_it; #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = gee_iterator_next (_tmp25_); + _tmp22_ = _f_it; #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp26_) { + if (!gee_iterator_next (_tmp22_)) { #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 42294 "Photo.c" +#line 42293 "Photo.c" } #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _f_it; + _tmp23_ = _f_it; #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = gee_iterator_get (_tmp27_); + _tmp24_ = gee_iterator_get (_tmp23_); #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" - f = (GFile*) _tmp28_; + f = (GFile*) _tmp24_; #line 5503 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = self->priv->development_file_map; + _tmp25_ = self->priv->development_file_map; #line 5503 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = f; + _tmp26_ = f; #line 5503 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = photo; + _tmp27_ = photo; #line 5503 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp30_, _tmp31_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp26_, _tmp27_); #line 5504 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = self->priv->reverse_development_file_map; + _tmp28_ = self->priv->reverse_development_file_map; #line 5504 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = photo; + _tmp29_ = photo; #line 5504 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = f; + _tmp30_ = f; #line 5504 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp32_, _tmp33_, _tmp34_); + gee_multi_map_set (_tmp28_, _tmp29_, _tmp30_); #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 42320 "Photo.c" +#line 42319 "Photo.c" } #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 42324 "Photo.c" +#line 42323 "Photo.c" } } #line 5488 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_list); #line 5488 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 42331 "Photo.c" +#line 42330 "Photo.c" } -static void library_photo_source_holding_tank_class_init (LibraryPhotoSourceHoldingTankClass * klass) { +static void +library_photo_source_holding_tank_class_init (LibraryPhotoSourceHoldingTankClass * klass) +{ #line 5404 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_holding_tank_parent_class = g_type_class_peek_parent (klass); #line 5404 "/home/jens/Source/shotwell/src/Photo.vala" @@ -42345,11 +42346,13 @@ static void library_photo_source_holding_tank_class_init (LibraryPhotoSourceHold g_type_class_add_private (klass, sizeof (LibraryPhotoSourceHoldingTankPrivate)); #line 5404 "/home/jens/Source/shotwell/src/Photo.vala" ((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*) (SourceHoldingTank *, GeeCollection*, GeeCollection*)) library_photo_source_holding_tank_real_notify_contents_altered; -#line 42344 "Photo.c" +#line 42345 "Photo.c" } -static void library_photo_source_holding_tank_instance_init (LibraryPhotoSourceHoldingTank * self) { +static void +library_photo_source_holding_tank_instance_init (LibraryPhotoSourceHoldingTank * self) +{ GeeHashMap* _tmp0_; GeeHashMap* _tmp1_; GeeHashMultiMap* _tmp2_; @@ -42372,11 +42375,13 @@ static void library_photo_source_holding_tank_instance_init (LibraryPhotoSourceH _tmp3_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); #line 5411 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->reverse_development_file_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MULTI_MAP, GeeMultiMap); -#line 42371 "Photo.c" +#line 42374 "Photo.c" } -static void library_photo_source_holding_tank_finalize (SourceHoldingTank * obj) { +static void +library_photo_source_holding_tank_finalize (SourceHoldingTank * obj) +{ LibraryPhotoSourceHoldingTank * self; #line 5404 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank); @@ -42390,11 +42395,13 @@ static void library_photo_source_holding_tank_finalize (SourceHoldingTank * obj) _g_object_unref0 (self->priv->reverse_development_file_map); #line 5404 "/home/jens/Source/shotwell/src/Photo.vala" SOURCE_HOLDING_TANK_CLASS (library_photo_source_holding_tank_parent_class)->finalize (obj); -#line 42389 "Photo.c" +#line 42394 "Photo.c" } -GType library_photo_source_holding_tank_get_type (void) { +GType +library_photo_source_holding_tank_get_type (void) +{ static volatile gsize library_photo_source_holding_tank_type_id__volatile = 0; if (g_once_init_enter (&library_photo_source_holding_tank_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryPhotoSourceHoldingTankClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_photo_source_holding_tank_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryPhotoSourceHoldingTank), 0, (GInstanceInitFunc) library_photo_source_holding_tank_instance_init, NULL }; @@ -42406,7 +42413,11 @@ GType library_photo_source_holding_tank_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -42418,7 +42429,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/PhotoMonitor.c b/src/PhotoMonitor.c index 82de1d6..c87391c 100644 --- a/src/PhotoMonitor.c +++ b/src/PhotoMonitor.c @@ -1,4 +1,4 @@ -/* PhotoMonitor.c generated by valac 0.36.6, the Vala compiler +/* PhotoMonitor.c generated by valac 0.40.4, the Vala compiler * generated from PhotoMonitor.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -240,6 +241,11 @@ typedef struct _PhotoMonitorReimportEditableJobClass PhotoMonitorReimportEditabl typedef struct _PhotoMonitorReimportRawDevelopmentJob PhotoMonitorReimportRawDevelopmentJob; typedef struct _PhotoMonitorReimportRawDevelopmentJobClass PhotoMonitorReimportRawDevelopmentJobClass; +enum { + PHOTO_MONITOR_0_PROPERTY, + PHOTO_MONITOR_NUM_PROPERTIES +}; +static GParamSpec* photo_monitor_properties[PHOTO_MONITOR_NUM_PROPERTIES]; #define _workers_unref0(var) ((var == NULL) ? NULL : (var = (workers_unref (var), NULL))) #define TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION (library_photo_source_collection_get_type ()) @@ -597,9 +603,15 @@ static gpointer photo_monitor_reimport_raw_development_job_parent_class = NULL; gpointer monitorable_updates_ref (gpointer instance); void monitorable_updates_unref (gpointer instance); -GParamSpec* param_spec_monitorable_updates (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_monitorable_updates (GValue* value, gpointer v_object); -void value_take_monitorable_updates (GValue* value, gpointer v_object); +GParamSpec* param_spec_monitorable_updates (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_monitorable_updates (GValue* value, + gpointer v_object); +void value_take_monitorable_updates (GValue* value, + gpointer v_object); gpointer value_get_monitorable_updates (const GValue* value); GType monitorable_updates_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; @@ -611,13 +623,12 @@ GType photo_updates_get_type (void) G_GNUC_CONST; GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; -enum { - PHOTO_UPDATES_DUMMY_PROPERTY -}; PhotoUpdates* photo_updates_new (LibraryPhoto* photo); -PhotoUpdates* photo_updates_construct (GType object_type, LibraryPhoto* photo); +PhotoUpdates* photo_updates_construct (GType object_type, + LibraryPhoto* photo); MonitorableUpdates* monitorable_updates_new (Monitorable* monitorable); -MonitorableUpdates* monitorable_updates_construct (GType object_type, Monitorable* monitorable); +MonitorableUpdates* monitorable_updates_construct (GType object_type, + Monitorable* monitorable); static void photo_updates_real_mark_offline (MonitorableUpdates* base); void monitorable_updates_mark_offline (MonitorableUpdates* self); gboolean photo_updates_is_reimport_master (PhotoUpdates* self); @@ -628,41 +639,69 @@ GeeCollection* photo_updates_get_raw_developer_files (PhotoUpdates* self); static gboolean photo_updates_real_is_in_alteration (MonitorableUpdates* base); gboolean monitorable_updates_is_in_alteration (MonitorableUpdates* self); gboolean photo_updates_is_revert_to_master (PhotoUpdates* self); -void photo_updates_set_editable_file (PhotoUpdates* self, GFile* file); -static void photo_updates_real_set_editable_file (PhotoUpdates* self, GFile* file); -void photo_updates_set_editable_file_info (PhotoUpdates* self, GFileInfo* info); -static void photo_updates_real_set_editable_file_info (PhotoUpdates* self, GFileInfo* info); -void photo_updates_set_editable_file_info_altered (PhotoUpdates* self, gboolean altered); -static void photo_updates_real_set_editable_file_info_altered (PhotoUpdates* self, gboolean altered); -void photo_updates_set_editable_in_alteration (PhotoUpdates* self, gboolean in_alteration); -static void photo_updates_real_set_editable_in_alteration (PhotoUpdates* self, gboolean in_alteration); -void photo_updates_set_raw_development_in_alteration (PhotoUpdates* self, gboolean in_alteration); -static void photo_updates_real_set_raw_development_in_alteration (PhotoUpdates* self, gboolean in_alteration); -void photo_updates_set_raw_developer_file_info_altered (PhotoUpdates* self, gboolean altered); -static void photo_updates_real_set_raw_developer_file_info_altered (PhotoUpdates* self, gboolean altered); -void photo_updates_set_revert_to_master (PhotoUpdates* self, gboolean revert); -static void photo_updates_real_set_revert_to_master (PhotoUpdates* self, gboolean revert); -void photo_updates_add_raw_developer_file (PhotoUpdates* self, GFile* file); -static void photo_updates_real_add_raw_developer_file (PhotoUpdates* self, GFile* file); +void photo_updates_set_editable_file (PhotoUpdates* self, + GFile* file); +static void photo_updates_real_set_editable_file (PhotoUpdates* self, + GFile* file); +void photo_updates_set_editable_file_info (PhotoUpdates* self, + GFileInfo* info); +static void photo_updates_real_set_editable_file_info (PhotoUpdates* self, + GFileInfo* info); +void photo_updates_set_editable_file_info_altered (PhotoUpdates* self, + gboolean altered); +static void photo_updates_real_set_editable_file_info_altered (PhotoUpdates* self, + gboolean altered); +void photo_updates_set_editable_in_alteration (PhotoUpdates* self, + gboolean in_alteration); +static void photo_updates_real_set_editable_in_alteration (PhotoUpdates* self, + gboolean in_alteration); +void photo_updates_set_raw_development_in_alteration (PhotoUpdates* self, + gboolean in_alteration); +static void photo_updates_real_set_raw_development_in_alteration (PhotoUpdates* self, + gboolean in_alteration); +void photo_updates_set_raw_developer_file_info_altered (PhotoUpdates* self, + gboolean altered); +static void photo_updates_real_set_raw_developer_file_info_altered (PhotoUpdates* self, + gboolean altered); +void photo_updates_set_revert_to_master (PhotoUpdates* self, + gboolean revert); +static void photo_updates_real_set_revert_to_master (PhotoUpdates* self, + gboolean revert); +void photo_updates_add_raw_developer_file (PhotoUpdates* self, + GFile* file); +static void photo_updates_real_add_raw_developer_file (PhotoUpdates* self, + GFile* file); void photo_updates_clear_raw_developer_files (PhotoUpdates* self); static void photo_updates_real_clear_raw_developer_files (PhotoUpdates* self); -void photo_updates_set_reimport_master (PhotoUpdates* self, gboolean reimport); -static void photo_updates_real_set_reimport_master (PhotoUpdates* self, gboolean reimport); +void photo_updates_set_reimport_master (PhotoUpdates* self, + gboolean reimport); +static void photo_updates_real_set_reimport_master (PhotoUpdates* self, + gboolean reimport); void monitorable_updates_mark_online (MonitorableUpdates* self); -void photo_updates_set_reimport_editable (PhotoUpdates* self, gboolean reimport); -static void photo_updates_real_set_reimport_editable (PhotoUpdates* self, gboolean reimport); +void photo_updates_set_reimport_editable (PhotoUpdates* self, + gboolean reimport); +static void photo_updates_real_set_reimport_editable (PhotoUpdates* self, + gboolean reimport); gboolean monitorable_updates_is_set_offline (MonitorableUpdates* self); -void photo_updates_set_reimport_raw_developments (PhotoUpdates* self, gboolean reimport); -static void photo_updates_real_set_reimport_raw_developments (PhotoUpdates* self, gboolean reimport); +void photo_updates_set_reimport_raw_developments (PhotoUpdates* self, + gboolean reimport); +static void photo_updates_real_set_reimport_raw_developments (PhotoUpdates* self, + gboolean reimport); static gboolean photo_updates_real_is_all_updated (MonitorableUpdates* base); gboolean monitorable_updates_is_all_updated (MonitorableUpdates* self); static void photo_updates_finalize (MonitorableUpdates * obj); GType media_monitor_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -671,91 +710,171 @@ GType media_source_collection_get_type (void) G_GNUC_CONST; GType media_monitor_discovered_file_get_type (void) G_GNUC_CONST; gpointer transaction_controller_ref (gpointer instance); void transaction_controller_unref (gpointer instance); -GParamSpec* param_spec_transaction_controller (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_transaction_controller (GValue* value, gpointer v_object); -void value_take_transaction_controller (GValue* value, gpointer v_object); +GParamSpec* param_spec_transaction_controller (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_transaction_controller (GValue* value, + gpointer v_object); +void value_take_transaction_controller (GValue* value, + gpointer v_object); gpointer value_get_transaction_controller (const GValue* value); GType transaction_controller_get_type (void) G_GNUC_CONST; GType photo_monitor_get_type (void) G_GNUC_CONST; gpointer workers_ref (gpointer instance); void workers_unref (gpointer instance); -GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_workers (GValue* value, gpointer v_object); -void value_take_workers (GValue* value, gpointer v_object); +GParamSpec* param_spec_workers (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_workers (GValue* value, + gpointer v_object); +void value_take_workers (GValue* value, + gpointer v_object); gpointer value_get_workers (const GValue* value); GType workers_get_type (void) G_GNUC_CONST; gpointer background_job_ref (gpointer instance); void background_job_unref (gpointer instance); -GParamSpec* param_spec_background_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_background_job (GValue* value, gpointer v_object); -void value_take_background_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_background_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_background_job (GValue* value, + gpointer v_object); +void value_take_background_job (GValue* value, + gpointer v_object); gpointer value_get_background_job (const GValue* value); GType background_job_get_type (void) G_GNUC_CONST; static GType photo_monitor_reimport_master_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static GType photo_monitor_reimport_editable_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static GType photo_monitor_reimport_raw_development_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define PHOTO_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_MONITOR, PhotoMonitorPrivate)) -enum { - PHOTO_MONITOR_DUMMY_PROPERTY -}; #define PHOTO_MONITOR_MAX_REIMPORT_JOBS_PER_CYCLE 20 #define PHOTO_MONITOR_MAX_REVERTS_PER_CYCLE 5 -PhotoMonitor* photo_monitor_new (Workers* workers, GCancellable* cancellable); -PhotoMonitor* photo_monitor_construct (GType object_type, Workers* workers, GCancellable* cancellable); +PhotoMonitor* photo_monitor_new (Workers* workers, + GCancellable* cancellable); +PhotoMonitor* photo_monitor_construct (GType object_type, + Workers* workers, + GCancellable* cancellable); GType library_photo_source_collection_get_type (void) G_GNUC_CONST; -MediaMonitor* media_monitor_construct (GType object_type, MediaSourceCollection* sources, GCancellable* cancellable); -static MonitorableUpdates* photo_monitor_real_create_updates (MediaMonitor* base, Monitorable* monitorable); +MediaMonitor* media_monitor_construct (GType object_type, + MediaSourceCollection* sources, + GCancellable* cancellable); +static MonitorableUpdates* photo_monitor_real_create_updates (MediaMonitor* base, + Monitorable* monitorable); static MediaSourceCollection* photo_monitor_real_get_media_source_collection (MediaMonitor* base); -static gboolean photo_monitor_real_is_file_represented (MediaMonitor* base, GFile* file); +static gboolean photo_monitor_real_is_file_represented (MediaMonitor* base, + GFile* file); GType library_photo_source_collection_state_get_type (void) G_GNUC_CONST; -static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self, GFile* file, LibraryPhotoSourceCollectionState* state); +static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self, + GFile* file, + LibraryPhotoSourceCollectionState* state); static void photo_monitor_real_close (MediaMonitor* base); void background_job_cancel (BackgroundJob* self); void media_monitor_close (MediaMonitor* self); -static void photo_monitor_cancel_reimports (PhotoMonitor* self, LibraryPhoto* photo); -static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (MediaMonitor* base, GFile* file, GFileInfo* info, Monitorable* * monitorable); -static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonitor* base, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_); -void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSourceCollection* self, GFileInfo* info, GeeCollection* matches_master, GeeCollection* matches_editable, GeeCollection* matched_development); +static void photo_monitor_cancel_reimports (PhotoMonitor* self, + LibraryPhoto* photo); +static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (MediaMonitor* base, + GFile* file, + GFileInfo* info, + Monitorable* * monitorable); +static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonitor* base, + GFile* file, + GFileInfo* info, + MediaMonitorDiscoveredFile* _result_); +void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSourceCollection* self, + GFileInfo* info, + GeeCollection* matches_master, + GeeCollection* matches_editable, + GeeCollection* matched_development); gchar* data_object_to_string (DataObject* self); gboolean photo_does_editable_exist (Photo* self); -void photo_revert_to_master (Photo* self, gboolean notify); -void photo_monitor_update_editable_file (PhotoMonitor* self, LibraryPhoto* photo, GFile* file); -void photo_monitor_update_raw_development_file (PhotoMonitor* self, LibraryPhoto* photo, GFile* file); -static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* base, Monitorable* monitorable, int* result_length1); +void photo_revert_to_master (Photo* self, + gboolean notify); +void photo_monitor_update_editable_file (PhotoMonitor* self, + LibraryPhoto* photo, + GFile* file); +void photo_monitor_update_raw_development_file (PhotoMonitor* self, + LibraryPhoto* photo, + GFile* file); +static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* base, + Monitorable* monitorable, + int* result_length1); gboolean photo_has_editable (Photo* self); GFile* photo_get_editable_file (Photo* self); -static void _vala_array_add132 (GFile** * array, int* length, int* size, GFile* value); +static void _vala_array_add132 (GFile** * array, + int* length, + int* size, + GFile* value); GeeCollection* photo_get_raw_developer_files (Photo* self); -static void _vala_array_add133 (GFile** * array, int* length, int* size, GFile* value); -static GFile** _vala_array_dup26 (GFile** self, int length); -static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, Monitorable* monitorable, GFile* file, GFileInfo* info); -GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorable); -static void photo_monitor_check_for_master_changes (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info); -GFile* photo_monitor_get_editable_file (PhotoMonitor* self, LibraryPhoto* photo); -static void photo_monitor_check_for_editable_changes (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info); -GeeCollection* photo_monitor_get_raw_development_files (PhotoMonitor* self, LibraryPhoto* photo); -static void photo_monitor_check_for_raw_development_changes (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info); +static void _vala_array_add133 (GFile** * array, + int* length, + int* size, + GFile* value); +static GFile** _vala_array_dup26 (GFile** self, + int length); +static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, + Monitorable* monitorable, + GFile* file, + GFileInfo* info); +GFile* media_monitor_get_master_file (MediaMonitor* self, + Monitorable* monitorable); +static void photo_monitor_check_for_master_changes (PhotoMonitor* self, + LibraryPhoto* photo, + GFileInfo* info); +GFile* photo_monitor_get_editable_file (PhotoMonitor* self, + LibraryPhoto* photo); +static void photo_monitor_check_for_editable_changes (PhotoMonitor* self, + LibraryPhoto* photo, + GFileInfo* info); +GeeCollection* photo_monitor_get_raw_development_files (PhotoMonitor* self, + LibraryPhoto* photo); +static void photo_monitor_check_for_raw_development_changes (PhotoMonitor* self, + LibraryPhoto* photo, + GFileInfo* info); static void photo_monitor_real_notify_discovery_completing (MediaMonitor* base); gpointer backing_photo_row_ref (gpointer instance); void backing_photo_row_unref (gpointer instance); -GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_photo_row (GValue* value, gpointer v_object); -void value_take_backing_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_photo_row (GValue* value, + gpointer v_object); +void value_take_backing_photo_row (GValue* value, + gpointer v_object); gpointer value_get_backing_photo_row (const GValue* value); GType backing_photo_row_get_type (void) G_GNUC_CONST; BackingPhotoRow* photo_get_master_photo_row (Photo* self); -gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* info); -gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info); -void media_monitor_update_master_file_info_altered (MediaMonitor* self, Monitorable* monitorable); -void media_monitor_update_master_file_alterations_completed (MediaMonitor* self, Monitorable* monitorable, GFileInfo* info); -void photo_monitor_update_reimport_master (PhotoMonitor* self, LibraryPhoto* photo); -void photo_monitor_update_revert_to_master (PhotoMonitor* self, LibraryPhoto* photo); +gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, + GFileInfo* info); +gboolean backing_photo_row_is_touched (BackingPhotoRow* self, + GFileInfo* info); +void media_monitor_update_master_file_info_altered (MediaMonitor* self, + Monitorable* monitorable); +void media_monitor_update_master_file_alterations_completed (MediaMonitor* self, + Monitorable* monitorable, + GFileInfo* info); +void photo_monitor_update_reimport_master (PhotoMonitor* self, + LibraryPhoto* photo); +void photo_monitor_update_revert_to_master (PhotoMonitor* self, + LibraryPhoto* photo); BackingPhotoRow* photo_get_editable_photo_row (Photo* self); -void photo_monitor_update_editable_file_info_altered (PhotoMonitor* self, LibraryPhoto* photo); -void photo_monitor_update_editable_file_alterations_completed (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info); -void photo_monitor_update_reimport_editable (PhotoMonitor* self, LibraryPhoto* photo); +void photo_monitor_update_editable_file_info_altered (PhotoMonitor* self, + LibraryPhoto* photo); +void photo_monitor_update_editable_file_alterations_completed (PhotoMonitor* self, + LibraryPhoto* photo, + GFileInfo* info); +void photo_monitor_update_reimport_editable (PhotoMonitor* self, + LibraryPhoto* photo); GType raw_developer_get_type (void) G_GNUC_CONST; -void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify); +void photo_set_raw_developer (Photo* self, + RawDeveloper d, + gboolean notify); GeeCollection* photo_get_raw_development_photo_rows (Photo* self); GType backing_photo_id_get_type (void) G_GNUC_CONST; BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self); @@ -765,157 +884,261 @@ GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); GType orientation_get_type (void) G_GNUC_CONST; -void photo_monitor_update_raw_development_file_info_altered (PhotoMonitor* self, LibraryPhoto* photo); -void photo_monitor_update_raw_development_file_alterations_completed (PhotoMonitor* self, LibraryPhoto* photo); -void photo_monitor_update_reimport_raw_developments (PhotoMonitor* self, LibraryPhoto* photo); -static gboolean photo_monitor_real_notify_file_created (MediaMonitor* base, GFile* file, GFileInfo* info); +void photo_monitor_update_raw_development_file_info_altered (PhotoMonitor* self, + LibraryPhoto* photo); +void photo_monitor_update_raw_development_file_alterations_completed (PhotoMonitor* self, + LibraryPhoto* photo); +void photo_monitor_update_reimport_raw_developments (PhotoMonitor* self, + LibraryPhoto* photo); +static gboolean photo_monitor_real_notify_file_created (MediaMonitor* base, + GFile* file, + GFileInfo* info); const gchar* library_photo_source_collection_state_to_string (LibraryPhotoSourceCollectionState self); void media_monitor_mdbg (const gchar* msg); -void media_monitor_update_online (MediaMonitor* self, Monitorable* monitorable); -static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile* old_file, GFile* new_file, GFileInfo* info); -void media_monitor_update_master_file (MediaMonitor* self, Monitorable* monitorable, GFile* file); -void media_monitor_update_offline (MediaMonitor* self, Monitorable* monitorable); -static gboolean photo_monitor_real_notify_file_altered (MediaMonitor* base, GFile* file); -void media_monitor_update_master_file_in_alteration (MediaMonitor* self, Monitorable* monitorable, gboolean in_alteration); -void photo_monitor_update_editable_file_in_alteration (PhotoMonitor* self, LibraryPhoto* photo, gboolean in_alteration); -void photo_monitor_update_raw_development_file_in_alteration (PhotoMonitor* self, LibraryPhoto* photo, gboolean in_alteration); -static gboolean photo_monitor_real_notify_file_attributes_altered (MediaMonitor* base, GFile* file); -static gboolean photo_monitor_real_notify_file_alteration_completed (MediaMonitor* base, GFile* file, GFileInfo* info); -static gboolean photo_monitor_real_notify_file_deleted (MediaMonitor* base, GFile* file); -static void photo_monitor_real_on_media_source_destroyed (MediaMonitor* base, DataSource* source); -void media_monitor_on_media_source_destroyed (MediaMonitor* self, DataSource* source); +void media_monitor_update_online (MediaMonitor* self, + Monitorable* monitorable); +static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, + GFile* old_file, + GFile* new_file, + GFileInfo* info); +void media_monitor_update_master_file (MediaMonitor* self, + Monitorable* monitorable, + GFile* file); +void media_monitor_update_offline (MediaMonitor* self, + Monitorable* monitorable); +static gboolean photo_monitor_real_notify_file_altered (MediaMonitor* base, + GFile* file); +void media_monitor_update_master_file_in_alteration (MediaMonitor* self, + Monitorable* monitorable, + gboolean in_alteration); +void photo_monitor_update_editable_file_in_alteration (PhotoMonitor* self, + LibraryPhoto* photo, + gboolean in_alteration); +void photo_monitor_update_raw_development_file_in_alteration (PhotoMonitor* self, + LibraryPhoto* photo, + gboolean in_alteration); +static gboolean photo_monitor_real_notify_file_attributes_altered (MediaMonitor* base, + GFile* file); +static gboolean photo_monitor_real_notify_file_alteration_completed (MediaMonitor* base, + GFile* file, + GFileInfo* info); +static gboolean photo_monitor_real_notify_file_deleted (MediaMonitor* base, + GFile* file); +static void photo_monitor_real_on_media_source_destroyed (MediaMonitor* base, + DataSource* source); +void media_monitor_on_media_source_destroyed (MediaMonitor* self, + DataSource* source); gboolean media_monitor_has_pending_updates (MediaMonitor* self); GeeCollection* media_monitor_get_monitorables (MediaMonitor* self); -PhotoUpdates* photo_monitor_get_existing_photo_updates (PhotoMonitor* self, LibraryPhoto* photo); +PhotoUpdates* photo_monitor_get_existing_photo_updates (PhotoMonitor* self, + LibraryPhoto* photo); GFile* monitorable_updates_get_master_file (MonitorableUpdates* self); GFile* media_source_get_master_file (MediaSource* self); -LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSourceCollection* self, GFile* file, LibraryPhotoSourceCollectionState* state); -PhotoUpdates* photo_monitor_fetch_photo_updates (PhotoMonitor* self, LibraryPhoto* photo); -MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, Monitorable* monitorable); -MonitorableUpdates* media_monitor_get_existing_updates (MediaMonitor* self, Monitorable* monitorable); -static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollection* all_updates, TransactionController* controller, gint* op_count, GError** error); -void media_monitor_process_updates (MediaMonitor* self, GeeCollection* all_updates, TransactionController* controller, gint* op_count, GError** error); +LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSourceCollection* self, + GFile* file, + LibraryPhotoSourceCollectionState* state); +PhotoUpdates* photo_monitor_fetch_photo_updates (PhotoMonitor* self, + LibraryPhoto* photo); +MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, + Monitorable* monitorable); +MonitorableUpdates* media_monitor_get_existing_updates (MediaMonitor* self, + Monitorable* monitorable); +static void photo_monitor_real_process_updates (MediaMonitor* base, + GeeCollection* all_updates, + TransactionController* controller, + gint* op_count, + GError** error); +void media_monitor_process_updates (MediaMonitor* self, + GeeCollection* all_updates, + TransactionController* controller, + gint* op_count, + GError** error); #define MEDIA_MONITOR_MAX_OPERATIONS_PER_CYCLE 100 GQuark database_error_quark (void); -void photo_set_many_editable_file (GeeMap* map, GError** error); +void photo_set_many_editable_file (GeeMap* map, + GError** error); void app_window_database_error (GError* err); -void photo_update_many_editable_timestamps (GeeMap* map, GError** error); -static PhotoMonitorReimportMasterJob* photo_monitor_reimport_master_job_new (PhotoMonitor* owner, LibraryPhoto* photo); -static PhotoMonitorReimportMasterJob* photo_monitor_reimport_master_job_construct (GType object_type, PhotoMonitor* owner, LibraryPhoto* photo); -void workers_enqueue (Workers* self, BackgroundJob* job); -static PhotoMonitorReimportEditableJob* photo_monitor_reimport_editable_job_new (PhotoMonitor* owner, LibraryPhoto* photo); -static PhotoMonitorReimportEditableJob* photo_monitor_reimport_editable_job_construct (GType object_type, PhotoMonitor* owner, LibraryPhoto* photo); -static PhotoMonitorReimportRawDevelopmentJob* photo_monitor_reimport_raw_development_job_new (PhotoMonitor* owner, LibraryPhoto* photo); -static PhotoMonitorReimportRawDevelopmentJob* photo_monitor_reimport_raw_development_job_construct (GType object_type, PhotoMonitor* owner, LibraryPhoto* photo); -static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJob* j); +void photo_update_many_editable_timestamps (GeeMap* map, + GError** error); +static PhotoMonitorReimportMasterJob* photo_monitor_reimport_master_job_new (PhotoMonitor* owner, + LibraryPhoto* photo); +static PhotoMonitorReimportMasterJob* photo_monitor_reimport_master_job_construct (GType object_type, + PhotoMonitor* owner, + LibraryPhoto* photo); +void workers_enqueue (Workers* self, + BackgroundJob* job); +static PhotoMonitorReimportEditableJob* photo_monitor_reimport_editable_job_new (PhotoMonitor* owner, + LibraryPhoto* photo); +static PhotoMonitorReimportEditableJob* photo_monitor_reimport_editable_job_construct (GType object_type, + PhotoMonitor* owner, + LibraryPhoto* photo); +static PhotoMonitorReimportRawDevelopmentJob* photo_monitor_reimport_raw_development_job_new (PhotoMonitor* owner, + LibraryPhoto* photo); +static PhotoMonitorReimportRawDevelopmentJob* photo_monitor_reimport_raw_development_job_construct (GType object_type, + PhotoMonitor* owner, + LibraryPhoto* photo); +static void photo_monitor_on_master_reimported (PhotoMonitor* self, + BackgroundJob* j); GType background_job_job_priority_get_type (void) G_GNUC_CONST; gpointer photo_reimport_master_state_ref (gpointer instance); void photo_reimport_master_state_unref (gpointer instance); -GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void photo_value_set_reimport_master_state (GValue* value, gpointer v_object); -void photo_value_take_reimport_master_state (GValue* value, gpointer v_object); +GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void photo_value_set_reimport_master_state (GValue* value, + gpointer v_object); +void photo_value_take_reimport_master_state (GValue* value, + gpointer v_object); gpointer photo_value_get_reimport_master_state (const GValue* value); GType photo_reimport_master_state_get_type (void) G_GNUC_CONST; -void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, GError** error); +void photo_finish_reimport_master (Photo* self, + PhotoReimportMasterState* state, + GError** error); gboolean media_source_is_offline (MediaSource* self); -static void photo_monitor_on_master_reimport_cancelled (PhotoMonitor* self, BackgroundJob* j); -static void photo_monitor_on_editable_reimported (PhotoMonitor* self, BackgroundJob* j); +static void photo_monitor_on_master_reimport_cancelled (PhotoMonitor* self, + BackgroundJob* j); +static void photo_monitor_on_editable_reimported (PhotoMonitor* self, + BackgroundJob* j); gpointer photo_reimport_editable_state_ref (gpointer instance); void photo_reimport_editable_state_unref (gpointer instance); -GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object); -void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object); +GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void photo_value_set_reimport_editable_state (GValue* value, + gpointer v_object); +void photo_value_take_reimport_editable_state (GValue* value, + gpointer v_object); gpointer photo_value_get_reimport_editable_state (const GValue* value); GType photo_reimport_editable_state_get_type (void) G_GNUC_CONST; -void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* state, GError** error); -static void photo_monitor_on_editable_reimport_cancelled (PhotoMonitor* self, BackgroundJob* j); -static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, BackgroundJob* j); +void photo_finish_reimport_editable (Photo* self, + PhotoReimportEditableState* state, + GError** error); +static void photo_monitor_on_editable_reimport_cancelled (PhotoMonitor* self, + BackgroundJob* j); +static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, + BackgroundJob* j); gpointer photo_reimport_raw_development_state_ref (gpointer instance); void photo_reimport_raw_development_state_unref (gpointer instance); -GParamSpec* photo_param_spec_reimport_raw_development_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void photo_value_set_reimport_raw_development_state (GValue* value, gpointer v_object); -void photo_value_take_reimport_raw_development_state (GValue* value, gpointer v_object); +GParamSpec* photo_param_spec_reimport_raw_development_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void photo_value_set_reimport_raw_development_state (GValue* value, + gpointer v_object); +void photo_value_take_reimport_raw_development_state (GValue* value, + gpointer v_object); gpointer photo_value_get_reimport_raw_development_state (const GValue* value); GType photo_reimport_raw_development_state_get_type (void) G_GNUC_CONST; -void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState* state, GError** error); -static void photo_monitor_on_raw_development_reimport_cancelled (PhotoMonitor* self, BackgroundJob* j); -enum { - PHOTO_MONITOR_REIMPORT_MASTER_JOB_DUMMY_PROPERTY -}; -static void _photo_monitor_on_master_reimported_completion_callback (BackgroundJob* job, gpointer self); -static void _photo_monitor_on_master_reimport_cancelled_cancellation_callback (BackgroundJob* job, gpointer self); +void photo_finish_reimport_raw_development (Photo* self, + PhotoReimportRawDevelopmentState* state, + GError** error); +static void photo_monitor_on_raw_development_reimport_cancelled (PhotoMonitor* self, + BackgroundJob* j); +static void _photo_monitor_on_master_reimported_completion_callback (BackgroundJob* job, + gpointer self); +static void _photo_monitor_on_master_reimport_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self); gpointer abstract_semaphore_ref (gpointer instance); void abstract_semaphore_unref (gpointer instance); -GParamSpec* param_spec_abstract_semaphore (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_abstract_semaphore (GValue* value, gpointer v_object); -void value_take_abstract_semaphore (GValue* value, gpointer v_object); +GParamSpec* param_spec_abstract_semaphore (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_abstract_semaphore (GValue* value, + gpointer v_object); +void value_take_abstract_semaphore (GValue* value, + gpointer v_object); gpointer value_get_abstract_semaphore (const GValue* value); GType abstract_semaphore_get_type (void) G_GNUC_CONST; -BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore); +BackgroundJob* background_job_construct (GType object_type, + GObject* owner, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target, + AbstractSemaphore* completion_semaphore); static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base); -gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState* * reimport_state, GError** error); +gboolean photo_prepare_for_reimport_master (Photo* self, + PhotoReimportMasterState* * reimport_state, + GError** error); static void photo_monitor_reimport_master_job_finalize (BackgroundJob * obj); -enum { - PHOTO_MONITOR_REIMPORT_EDITABLE_JOB_DUMMY_PROPERTY -}; -static void _photo_monitor_on_editable_reimported_completion_callback (BackgroundJob* job, gpointer self); -static void _photo_monitor_on_editable_reimport_cancelled_cancellation_callback (BackgroundJob* job, gpointer self); +static void _photo_monitor_on_editable_reimported_completion_callback (BackgroundJob* job, + gpointer self); +static void _photo_monitor_on_editable_reimport_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self); static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* base); -gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditableState* * state, GError** error); +gboolean photo_prepare_for_reimport_editable (Photo* self, + PhotoReimportEditableState* * state, + GError** error); static void photo_monitor_reimport_editable_job_finalize (BackgroundJob * obj); -enum { - PHOTO_MONITOR_REIMPORT_RAW_DEVELOPMENT_JOB_DUMMY_PROPERTY -}; -static void _photo_monitor_on_raw_development_reimported_completion_callback (BackgroundJob* job, gpointer self); -static void _photo_monitor_on_raw_development_reimport_cancelled_cancellation_callback (BackgroundJob* job, gpointer self); +static void _photo_monitor_on_raw_development_reimported_completion_callback (BackgroundJob* job, + gpointer self); +static void _photo_monitor_on_raw_development_reimport_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self); static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJob* base); -gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState* * state, GError** error); +gboolean photo_prepare_for_reimport_raw_development (Photo* self, + PhotoReimportRawDevelopmentState* * state, + GError** error); static void photo_monitor_reimport_raw_development_job_finalize (BackgroundJob * obj); static void photo_monitor_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 25 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self ? g_object_ref (self) : NULL; -#line 883 "PhotoMonitor.c" +#line 1105 "PhotoMonitor.c" } -PhotoUpdates* photo_updates_construct (GType object_type, LibraryPhoto* photo) { +PhotoUpdates* +photo_updates_construct (GType object_type, + LibraryPhoto* photo) +{ PhotoUpdates* self = NULL; LibraryPhoto* _tmp0_; - LibraryPhoto* _tmp1_; - LibraryPhoto* _tmp2_; #line 22 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO (photo), NULL); #line 23 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; -#line 23 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self = (PhotoUpdates*) monitorable_updates_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MONITORABLE, Monitorable)); + self = (PhotoUpdates*) monitorable_updates_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MONITORABLE, Monitorable)); #line 25 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo; -#line 25 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp0_ = _g_object_ref0 (photo); #line 25 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (self->photo); #line 25 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->photo = _tmp2_; + self->photo = _tmp0_; #line 22 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self; -#line 908 "PhotoMonitor.c" +#line 1127 "PhotoMonitor.c" } -PhotoUpdates* photo_updates_new (LibraryPhoto* photo) { +PhotoUpdates* +photo_updates_new (LibraryPhoto* photo) +{ #line 22 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return photo_updates_construct (TYPE_PHOTO_UPDATES, photo); -#line 915 "PhotoMonitor.c" +#line 1136 "PhotoMonitor.c" } -static void photo_updates_real_mark_offline (MonitorableUpdates* base) { +static void +photo_updates_real_mark_offline (MonitorableUpdates* base) +{ PhotoUpdates * self; #line 28 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_UPDATES, PhotoUpdates); @@ -927,11 +1150,13 @@ static void photo_updates_real_mark_offline (MonitorableUpdates* base) { self->reimport_editable = FALSE; #line 33 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->reimport_raw_developments = FALSE; -#line 931 "PhotoMonitor.c" +#line 1154 "PhotoMonitor.c" } -gboolean photo_updates_is_reimport_master (PhotoUpdates* self) { +gboolean +photo_updates_is_reimport_master (PhotoUpdates* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 36 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -942,11 +1167,13 @@ gboolean photo_updates_is_reimport_master (PhotoUpdates* self) { result = _tmp0_; #line 37 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 946 "PhotoMonitor.c" +#line 1171 "PhotoMonitor.c" } -gboolean photo_updates_is_reimport_editable (PhotoUpdates* self) { +gboolean +photo_updates_is_reimport_editable (PhotoUpdates* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 40 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -957,11 +1184,13 @@ gboolean photo_updates_is_reimport_editable (PhotoUpdates* self) { result = _tmp0_; #line 41 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 961 "PhotoMonitor.c" +#line 1188 "PhotoMonitor.c" } -GFile* photo_updates_get_editable_file (PhotoUpdates* self) { +GFile* +photo_updates_get_editable_file (PhotoUpdates* self) +{ GFile* result = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -975,11 +1204,13 @@ GFile* photo_updates_get_editable_file (PhotoUpdates* self) { result = _tmp1_; #line 45 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 979 "PhotoMonitor.c" +#line 1208 "PhotoMonitor.c" } -GFileInfo* photo_updates_get_editable_file_info (PhotoUpdates* self) { +GFileInfo* +photo_updates_get_editable_file_info (PhotoUpdates* self) +{ GFileInfo* result = NULL; GFileInfo* _tmp0_; GFileInfo* _tmp1_; @@ -993,11 +1224,13 @@ GFileInfo* photo_updates_get_editable_file_info (PhotoUpdates* self) { result = _tmp1_; #line 49 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 997 "PhotoMonitor.c" +#line 1228 "PhotoMonitor.c" } -GeeCollection* photo_updates_get_raw_developer_files (PhotoUpdates* self) { +GeeCollection* +photo_updates_get_raw_developer_files (PhotoUpdates* self) +{ GeeCollection* result = NULL; GeeCollection* _tmp0_; GeeCollection* _tmp1_; @@ -1011,41 +1244,42 @@ GeeCollection* photo_updates_get_raw_developer_files (PhotoUpdates* self) { result = _tmp1_; #line 53 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 1015 "PhotoMonitor.c" +#line 1248 "PhotoMonitor.c" } -static gboolean photo_updates_real_is_in_alteration (MonitorableUpdates* base) { +static gboolean +photo_updates_real_is_in_alteration (MonitorableUpdates* base) +{ PhotoUpdates * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; - gboolean _tmp1_; #line 56 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_UPDATES, PhotoUpdates); #line 57 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = MONITORABLE_UPDATES_CLASS (photo_updates_parent_class)->is_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); -#line 57 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp1_) { + if (MONITORABLE_UPDATES_CLASS (photo_updates_parent_class)->is_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates))) { #line 57 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = TRUE; -#line 1032 "PhotoMonitor.c" +#line 1264 "PhotoMonitor.c" } else { - gboolean _tmp2_; + gboolean _tmp1_; #line 57 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = self->editable_in_alteration; + _tmp1_ = self->editable_in_alteration; #line 57 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = _tmp2_; -#line 1039 "PhotoMonitor.c" + _tmp0_ = _tmp1_; +#line 1271 "PhotoMonitor.c" } #line 57 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result = _tmp0_; #line 57 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 1045 "PhotoMonitor.c" +#line 1277 "PhotoMonitor.c" } -gboolean photo_updates_is_revert_to_master (PhotoUpdates* self) { +gboolean +photo_updates_is_revert_to_master (PhotoUpdates* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 60 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -1056,225 +1290,230 @@ gboolean photo_updates_is_revert_to_master (PhotoUpdates* self) { result = _tmp0_; #line 61 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 1060 "PhotoMonitor.c" +#line 1294 "PhotoMonitor.c" } -static void photo_updates_real_set_editable_file (PhotoUpdates* self, GFile* file) { +static void +photo_updates_real_set_editable_file (PhotoUpdates* self, + GFile* file) +{ gboolean _tmp0_ = FALSE; - GFile* _tmp1_; - GFile* _tmp3_; - GFile* _tmp4_; + GFile* _tmp2_; #line 64 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail ((file == NULL) || G_IS_FILE (file)); #line 66 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = file; -#line 66 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp1_ != NULL) { -#line 1075 "PhotoMonitor.c" - gboolean _tmp2_; + if (file != NULL) { +#line 1308 "PhotoMonitor.c" + gboolean _tmp1_; #line 66 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = self->revert_to_master; + _tmp1_ = self->revert_to_master; #line 66 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = _tmp2_; -#line 1081 "PhotoMonitor.c" + _tmp0_ = _tmp1_; +#line 1314 "PhotoMonitor.c" } else { #line 66 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = FALSE; -#line 1085 "PhotoMonitor.c" +#line 1318 "PhotoMonitor.c" } #line 66 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp0_) { #line 67 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 1091 "PhotoMonitor.c" +#line 1324 "PhotoMonitor.c" } #line 69 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = file; -#line 69 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp2_ = _g_object_ref0 (file); #line 69 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (self->editable_file); #line 69 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->editable_file = _tmp4_; -#line 1101 "PhotoMonitor.c" + self->editable_file = _tmp2_; +#line 1332 "PhotoMonitor.c" } -void photo_updates_set_editable_file (PhotoUpdates* self, GFile* file) { +void +photo_updates_set_editable_file (PhotoUpdates* self, + GFile* file) +{ #line 64 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 64 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->set_editable_file (self, file); -#line 1110 "PhotoMonitor.c" +#line 1344 "PhotoMonitor.c" } -static void photo_updates_real_set_editable_file_info (PhotoUpdates* self, GFileInfo* info) { +static void +photo_updates_real_set_editable_file_info (PhotoUpdates* self, + GFileInfo* info) +{ gboolean _tmp0_ = FALSE; - GFileInfo* _tmp1_; - GFileInfo* _tmp3_; - GFileInfo* _tmp4_; - GFileInfo* _tmp5_; + GFileInfo* _tmp2_; #line 72 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail ((info == NULL) || G_IS_FILE_INFO (info)); #line 74 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = info; -#line 74 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp1_ != NULL) { -#line 1126 "PhotoMonitor.c" - gboolean _tmp2_; + if (info != NULL) { +#line 1358 "PhotoMonitor.c" + gboolean _tmp1_; #line 74 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = self->revert_to_master; + _tmp1_ = self->revert_to_master; #line 74 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = _tmp2_; -#line 1132 "PhotoMonitor.c" + _tmp0_ = _tmp1_; +#line 1364 "PhotoMonitor.c" } else { #line 74 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = FALSE; -#line 1136 "PhotoMonitor.c" +#line 1368 "PhotoMonitor.c" } #line 74 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp0_) { #line 75 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 1142 "PhotoMonitor.c" +#line 1374 "PhotoMonitor.c" } #line 77 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = info; -#line 77 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp2_ = _g_object_ref0 (info); #line 77 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (self->editable_file_info); #line 77 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->editable_file_info = _tmp4_; -#line 78 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = info; + self->editable_file_info = _tmp2_; #line 78 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp5_ == NULL) { + if (info == NULL) { #line 79 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->editable_file_info_altered = FALSE; -#line 1158 "PhotoMonitor.c" +#line 1386 "PhotoMonitor.c" } } -void photo_updates_set_editable_file_info (PhotoUpdates* self, GFileInfo* info) { +void +photo_updates_set_editable_file_info (PhotoUpdates* self, + GFileInfo* info) +{ #line 72 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 72 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->set_editable_file_info (self, info); -#line 1168 "PhotoMonitor.c" +#line 1399 "PhotoMonitor.c" } -static void photo_updates_real_set_editable_file_info_altered (PhotoUpdates* self, gboolean altered) { +static void +photo_updates_real_set_editable_file_info_altered (PhotoUpdates* self, + gboolean altered) +{ gboolean _tmp0_ = FALSE; - gboolean _tmp1_; - gboolean _tmp3_; #line 84 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = altered; -#line 84 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp1_) { -#line 1180 "PhotoMonitor.c" - gboolean _tmp2_; + if (altered) { +#line 1410 "PhotoMonitor.c" + gboolean _tmp1_; #line 84 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = self->revert_to_master; + _tmp1_ = self->revert_to_master; #line 84 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = _tmp2_; -#line 1186 "PhotoMonitor.c" + _tmp0_ = _tmp1_; +#line 1416 "PhotoMonitor.c" } else { #line 84 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = FALSE; -#line 1190 "PhotoMonitor.c" +#line 1420 "PhotoMonitor.c" } #line 84 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp0_) { #line 85 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 1196 "PhotoMonitor.c" +#line 1426 "PhotoMonitor.c" } #line 87 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = altered; -#line 87 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->editable_file_info_altered = _tmp3_; -#line 1202 "PhotoMonitor.c" + self->editable_file_info_altered = altered; +#line 1430 "PhotoMonitor.c" } -void photo_updates_set_editable_file_info_altered (PhotoUpdates* self, gboolean altered) { +void +photo_updates_set_editable_file_info_altered (PhotoUpdates* self, + gboolean altered) +{ #line 82 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 82 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->set_editable_file_info_altered (self, altered); -#line 1211 "PhotoMonitor.c" +#line 1442 "PhotoMonitor.c" } -static void photo_updates_real_set_editable_in_alteration (PhotoUpdates* self, gboolean in_alteration) { - gboolean _tmp0_; +static void +photo_updates_real_set_editable_in_alteration (PhotoUpdates* self, + gboolean in_alteration) +{ #line 91 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = in_alteration; -#line 91 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->editable_in_alteration = _tmp0_; -#line 1221 "PhotoMonitor.c" + self->editable_in_alteration = in_alteration; +#line 1452 "PhotoMonitor.c" } -void photo_updates_set_editable_in_alteration (PhotoUpdates* self, gboolean in_alteration) { +void +photo_updates_set_editable_in_alteration (PhotoUpdates* self, + gboolean in_alteration) +{ #line 90 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 90 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->set_editable_in_alteration (self, in_alteration); -#line 1230 "PhotoMonitor.c" +#line 1464 "PhotoMonitor.c" } -static void photo_updates_real_set_raw_development_in_alteration (PhotoUpdates* self, gboolean in_alteration) { - gboolean _tmp0_; +static void +photo_updates_real_set_raw_development_in_alteration (PhotoUpdates* self, + gboolean in_alteration) +{ #line 95 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = in_alteration; -#line 95 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->raw_development_in_alteration = _tmp0_; -#line 1240 "PhotoMonitor.c" + self->raw_development_in_alteration = in_alteration; +#line 1474 "PhotoMonitor.c" } -void photo_updates_set_raw_development_in_alteration (PhotoUpdates* self, gboolean in_alteration) { +void +photo_updates_set_raw_development_in_alteration (PhotoUpdates* self, + gboolean in_alteration) +{ #line 94 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 94 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->set_raw_development_in_alteration (self, in_alteration); -#line 1249 "PhotoMonitor.c" +#line 1486 "PhotoMonitor.c" } -static void photo_updates_real_set_raw_developer_file_info_altered (PhotoUpdates* self, gboolean altered) { - gboolean _tmp0_; +static void +photo_updates_real_set_raw_developer_file_info_altered (PhotoUpdates* self, + gboolean altered) +{ #line 99 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = altered; -#line 99 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->raw_developer_file_info_altered = _tmp0_; -#line 1259 "PhotoMonitor.c" + self->raw_developer_file_info_altered = altered; +#line 1496 "PhotoMonitor.c" } -void photo_updates_set_raw_developer_file_info_altered (PhotoUpdates* self, gboolean altered) { +void +photo_updates_set_raw_developer_file_info_altered (PhotoUpdates* self, + gboolean altered) +{ #line 98 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 98 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->set_raw_developer_file_info_altered (self, altered); -#line 1268 "PhotoMonitor.c" +#line 1508 "PhotoMonitor.c" } -static void photo_updates_real_set_revert_to_master (PhotoUpdates* self, gboolean revert) { - gboolean _tmp0_; - gboolean _tmp1_; +static void +photo_updates_real_set_revert_to_master (PhotoUpdates* self, + gboolean revert) +{ #line 103 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = revert; -#line 103 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp0_) { + if (revert) { #line 105 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->reimport_editable = FALSE; #line 106 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -1285,180 +1524,187 @@ static void photo_updates_real_set_revert_to_master (PhotoUpdates* self, gboolea _g_object_unref0 (self->editable_file_info); #line 107 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->editable_file_info = NULL; -#line 1289 "PhotoMonitor.c" +#line 1528 "PhotoMonitor.c" } #line 110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = revert; -#line 110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->revert_to_master = _tmp1_; -#line 1295 "PhotoMonitor.c" + self->revert_to_master = revert; +#line 1532 "PhotoMonitor.c" } -void photo_updates_set_revert_to_master (PhotoUpdates* self, gboolean revert) { +void +photo_updates_set_revert_to_master (PhotoUpdates* self, + gboolean revert) +{ #line 102 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 102 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->set_revert_to_master (self, revert); -#line 1304 "PhotoMonitor.c" +#line 1544 "PhotoMonitor.c" } -static void photo_updates_real_add_raw_developer_file (PhotoUpdates* self, GFile* file) { +static void +photo_updates_real_add_raw_developer_file (PhotoUpdates* self, + GFile* file) +{ GeeCollection* _tmp0_; - GFile* _tmp1_; #line 113 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 114 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = self->developer_files; #line 114 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = file; -#line 114 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - gee_collection_add (_tmp0_, _tmp1_); -#line 1319 "PhotoMonitor.c" + gee_collection_add (_tmp0_, file); +#line 1559 "PhotoMonitor.c" } -void photo_updates_add_raw_developer_file (PhotoUpdates* self, GFile* file) { +void +photo_updates_add_raw_developer_file (PhotoUpdates* self, + GFile* file) +{ #line 113 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 113 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->add_raw_developer_file (self, file); -#line 1328 "PhotoMonitor.c" +#line 1571 "PhotoMonitor.c" } -static void photo_updates_real_clear_raw_developer_files (PhotoUpdates* self) { +static void +photo_updates_real_clear_raw_developer_files (PhotoUpdates* self) +{ GeeCollection* _tmp0_; #line 118 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = self->developer_files; #line 118 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" gee_collection_clear (_tmp0_); -#line 1338 "PhotoMonitor.c" +#line 1583 "PhotoMonitor.c" } -void photo_updates_clear_raw_developer_files (PhotoUpdates* self) { +void +photo_updates_clear_raw_developer_files (PhotoUpdates* self) +{ #line 117 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 117 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->clear_raw_developer_files (self); -#line 1347 "PhotoMonitor.c" +#line 1594 "PhotoMonitor.c" } -static void photo_updates_real_set_reimport_master (PhotoUpdates* self, gboolean reimport) { - gboolean _tmp0_; - gboolean _tmp1_; +static void +photo_updates_real_set_reimport_master (PhotoUpdates* self, + gboolean reimport) +{ #line 122 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = reimport; -#line 122 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->reimport_master = _tmp0_; -#line 124 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = reimport; + self->reimport_master = reimport; #line 124 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp1_) { + if (reimport) { #line 125 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" monitorable_updates_mark_online (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); -#line 1364 "PhotoMonitor.c" +#line 1608 "PhotoMonitor.c" } } -void photo_updates_set_reimport_master (PhotoUpdates* self, gboolean reimport) { +void +photo_updates_set_reimport_master (PhotoUpdates* self, + gboolean reimport) +{ #line 121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->set_reimport_master (self, reimport); -#line 1374 "PhotoMonitor.c" +#line 1621 "PhotoMonitor.c" } -static void photo_updates_real_set_reimport_editable (PhotoUpdates* self, gboolean reimport) { +static void +photo_updates_real_set_reimport_editable (PhotoUpdates* self, + gboolean reimport) +{ gboolean _tmp0_ = FALSE; - gboolean _tmp1_; - gboolean _tmp5_; #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = reimport; -#line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp1_) { -#line 1386 "PhotoMonitor.c" - gboolean _tmp2_ = FALSE; - gboolean _tmp3_; + if (reimport) { +#line 1632 "PhotoMonitor.c" + gboolean _tmp1_ = FALSE; + gboolean _tmp2_; #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = self->revert_to_master; + _tmp2_ = self->revert_to_master; #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp3_) { + if (_tmp2_) { #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = TRUE; -#line 1395 "PhotoMonitor.c" + _tmp1_ = TRUE; +#line 1641 "PhotoMonitor.c" } else { - gboolean _tmp4_; #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = monitorable_updates_is_set_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); -#line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp4_; -#line 1402 "PhotoMonitor.c" + _tmp1_ = monitorable_updates_is_set_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); +#line 1645 "PhotoMonitor.c" } #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = _tmp2_; -#line 1406 "PhotoMonitor.c" + _tmp0_ = _tmp1_; +#line 1649 "PhotoMonitor.c" } else { #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = FALSE; -#line 1410 "PhotoMonitor.c" +#line 1653 "PhotoMonitor.c" } #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp0_) { #line 131 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 1416 "PhotoMonitor.c" +#line 1659 "PhotoMonitor.c" } #line 133 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = reimport; -#line 133 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->reimport_editable = _tmp5_; -#line 1422 "PhotoMonitor.c" + self->reimport_editable = reimport; +#line 1663 "PhotoMonitor.c" } -void photo_updates_set_reimport_editable (PhotoUpdates* self, gboolean reimport) { +void +photo_updates_set_reimport_editable (PhotoUpdates* self, + gboolean reimport) +{ #line 128 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 128 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->set_reimport_editable (self, reimport); -#line 1431 "PhotoMonitor.c" +#line 1675 "PhotoMonitor.c" } -static void photo_updates_real_set_reimport_raw_developments (PhotoUpdates* self, gboolean reimport) { - gboolean _tmp0_; - gboolean _tmp1_; -#line 137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = reimport; +static void +photo_updates_real_set_reimport_raw_developments (PhotoUpdates* self, + gboolean reimport) +{ #line 137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->reimport_raw_developments = _tmp0_; + self->reimport_raw_developments = reimport; #line 139 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = reimport; -#line 139 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp1_) { + if (reimport) { #line 140 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" monitorable_updates_mark_online (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); -#line 1448 "PhotoMonitor.c" +#line 1689 "PhotoMonitor.c" } } -void photo_updates_set_reimport_raw_developments (PhotoUpdates* self, gboolean reimport) { +void +photo_updates_set_reimport_raw_developments (PhotoUpdates* self, + gboolean reimport) +{ #line 136 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 136 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->set_reimport_raw_developments (self, reimport); -#line 1458 "PhotoMonitor.c" +#line 1702 "PhotoMonitor.c" } -static gboolean photo_updates_real_is_all_updated (MonitorableUpdates* base) { +static gboolean +photo_updates_real_is_all_updated (MonitorableUpdates* base) +{ PhotoUpdates * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; @@ -1470,152 +1716,151 @@ static gboolean photo_updates_real_is_all_updated (MonitorableUpdates* base) { gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; gboolean _tmp8_ = FALSE; - gboolean _tmp9_; #line 143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_UPDATES, PhotoUpdates); #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = MONITORABLE_UPDATES_CLASS (photo_updates_parent_class)->is_all_updated (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); -#line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp9_) { -#line 1481 "PhotoMonitor.c" - gboolean _tmp10_; + if (MONITORABLE_UPDATES_CLASS (photo_updates_parent_class)->is_all_updated (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates))) { +#line 1724 "PhotoMonitor.c" + gboolean _tmp9_; #line 145 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = self->reimport_master; + _tmp9_ = self->reimport_master; #line 145 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = _tmp10_ == FALSE; -#line 1487 "PhotoMonitor.c" + _tmp8_ = _tmp9_ == FALSE; +#line 1730 "PhotoMonitor.c" } else { #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp8_ = FALSE; -#line 1491 "PhotoMonitor.c" +#line 1734 "PhotoMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp8_) { -#line 1495 "PhotoMonitor.c" - gboolean _tmp11_; +#line 1738 "PhotoMonitor.c" + gboolean _tmp10_; #line 146 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = self->reimport_editable; + _tmp10_ = self->reimport_editable; #line 146 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = _tmp11_ == FALSE; -#line 1501 "PhotoMonitor.c" + _tmp7_ = _tmp10_ == FALSE; +#line 1744 "PhotoMonitor.c" } else { #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp7_ = FALSE; -#line 1505 "PhotoMonitor.c" +#line 1748 "PhotoMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp7_) { -#line 1509 "PhotoMonitor.c" - GFile* _tmp12_; +#line 1752 "PhotoMonitor.c" + GFile* _tmp11_; #line 147 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = self->editable_file; + _tmp11_ = self->editable_file; #line 147 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = _tmp12_ == NULL; -#line 1515 "PhotoMonitor.c" + _tmp6_ = _tmp11_ == NULL; +#line 1758 "PhotoMonitor.c" } else { #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp6_ = FALSE; -#line 1519 "PhotoMonitor.c" +#line 1762 "PhotoMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp6_) { -#line 1523 "PhotoMonitor.c" - gboolean _tmp13_; +#line 1766 "PhotoMonitor.c" + gboolean _tmp12_; #line 148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = self->editable_file_info_altered; + _tmp12_ = self->editable_file_info_altered; #line 148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = _tmp13_ == FALSE; -#line 1529 "PhotoMonitor.c" + _tmp5_ = _tmp12_ == FALSE; +#line 1772 "PhotoMonitor.c" } else { #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp5_ = FALSE; -#line 1533 "PhotoMonitor.c" +#line 1776 "PhotoMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp5_) { -#line 1537 "PhotoMonitor.c" - GFileInfo* _tmp14_; +#line 1780 "PhotoMonitor.c" + GFileInfo* _tmp13_; #line 149 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = self->editable_file_info; + _tmp13_ = self->editable_file_info; #line 149 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _tmp14_ == NULL; -#line 1543 "PhotoMonitor.c" + _tmp4_ = _tmp13_ == NULL; +#line 1786 "PhotoMonitor.c" } else { #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp4_ = FALSE; -#line 1547 "PhotoMonitor.c" +#line 1790 "PhotoMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp4_) { -#line 1551 "PhotoMonitor.c" - gboolean _tmp15_; +#line 1794 "PhotoMonitor.c" + gboolean _tmp14_; #line 150 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = self->editable_in_alteration; + _tmp14_ = self->editable_in_alteration; #line 150 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = _tmp15_ == FALSE; -#line 1557 "PhotoMonitor.c" + _tmp3_ = _tmp14_ == FALSE; +#line 1800 "PhotoMonitor.c" } else { #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp3_ = FALSE; -#line 1561 "PhotoMonitor.c" +#line 1804 "PhotoMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp3_) { -#line 1565 "PhotoMonitor.c" - GeeCollection* _tmp16_; +#line 1808 "PhotoMonitor.c" + GeeCollection* _tmp15_; + gint _tmp16_; gint _tmp17_; - gint _tmp18_; #line 151 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = self->developer_files; + _tmp15_ = self->developer_files; #line 151 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = gee_collection_get_size (_tmp16_); + _tmp16_ = gee_collection_get_size (_tmp15_); #line 151 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 151 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp18_ == 0; -#line 1577 "PhotoMonitor.c" + _tmp2_ = _tmp17_ == 0; +#line 1820 "PhotoMonitor.c" } else { #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp2_ = FALSE; -#line 1581 "PhotoMonitor.c" +#line 1824 "PhotoMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp2_) { -#line 1585 "PhotoMonitor.c" - gboolean _tmp19_; +#line 1828 "PhotoMonitor.c" + gboolean _tmp18_; #line 152 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = self->raw_developer_file_info_altered; + _tmp18_ = self->raw_developer_file_info_altered; #line 152 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = _tmp19_ == FALSE; -#line 1591 "PhotoMonitor.c" + _tmp1_ = _tmp18_ == FALSE; +#line 1834 "PhotoMonitor.c" } else { #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp1_ = FALSE; -#line 1595 "PhotoMonitor.c" +#line 1838 "PhotoMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp1_) { -#line 1599 "PhotoMonitor.c" - gboolean _tmp20_; +#line 1842 "PhotoMonitor.c" + gboolean _tmp19_; #line 153 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = self->revert_to_master; + _tmp19_ = self->revert_to_master; #line 153 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = _tmp20_ == FALSE; -#line 1605 "PhotoMonitor.c" + _tmp0_ = _tmp19_ == FALSE; +#line 1848 "PhotoMonitor.c" } else { #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = FALSE; -#line 1609 "PhotoMonitor.c" +#line 1852 "PhotoMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result = _tmp0_; #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 1615 "PhotoMonitor.c" +#line 1858 "PhotoMonitor.c" } -static void photo_updates_class_init (PhotoUpdatesClass * klass) { +static void +photo_updates_class_init (PhotoUpdatesClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_updates_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -1650,11 +1895,13 @@ static void photo_updates_class_init (PhotoUpdatesClass * klass) { ((PhotoUpdatesClass *) klass)->set_reimport_raw_developments = (void (*) (PhotoUpdates *, gboolean)) photo_updates_real_set_reimport_raw_developments; #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" ((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*) (MonitorableUpdates *)) photo_updates_real_is_all_updated; -#line 1654 "PhotoMonitor.c" +#line 1899 "PhotoMonitor.c" } -static void photo_updates_instance_init (PhotoUpdates * self) { +static void +photo_updates_instance_init (PhotoUpdates * self) +{ GeeArrayList* _tmp0_; #line 10 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->reimport_master = FALSE; @@ -1680,11 +1927,13 @@ static void photo_updates_instance_init (PhotoUpdates * self) { _tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 20 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->developer_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); -#line 1684 "PhotoMonitor.c" +#line 1931 "PhotoMonitor.c" } -static void photo_updates_finalize (MonitorableUpdates * obj) { +static void +photo_updates_finalize (MonitorableUpdates * obj) +{ PhotoUpdates * self; #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_UPDATES, PhotoUpdates); @@ -1698,11 +1947,13 @@ static void photo_updates_finalize (MonitorableUpdates * obj) { _g_object_unref0 (self->developer_files); #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" MONITORABLE_UPDATES_CLASS (photo_updates_parent_class)->finalize (obj); -#line 1702 "PhotoMonitor.c" +#line 1951 "PhotoMonitor.c" } -GType photo_updates_get_type (void) { +GType +photo_updates_get_type (void) +{ static volatile gsize photo_updates_type_id__volatile = 0; if (g_once_init_enter (&photo_updates_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoUpdatesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_updates_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoUpdates), 0, (GInstanceInitFunc) photo_updates_instance_init, NULL }; @@ -1714,19 +1965,23 @@ GType photo_updates_get_type (void) { } -static gpointer _workers_ref0 (gpointer self) { +static gpointer +_workers_ref0 (gpointer self) +{ #line 240 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self ? workers_ref (self) : NULL; -#line 1721 "PhotoMonitor.c" +#line 1974 "PhotoMonitor.c" } -PhotoMonitor* photo_monitor_construct (GType object_type, Workers* workers, GCancellable* cancellable) { +PhotoMonitor* +photo_monitor_construct (GType object_type, + Workers* workers, + GCancellable* cancellable) +{ PhotoMonitor * self = NULL; LibraryPhotoSourceCollection* _tmp0_; - GCancellable* _tmp1_; - Workers* _tmp2_; - Workers* _tmp3_; + Workers* _tmp1_; #line 237 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_WORKERS (workers), NULL); #line 237 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -1734,64 +1989,64 @@ PhotoMonitor* photo_monitor_construct (GType object_type, Workers* workers, GCan #line 238 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = library_photo_global; #line 238 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = cancellable; -#line 238 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self = (PhotoMonitor*) media_monitor_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp1_); + self = (PhotoMonitor*) media_monitor_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), cancellable); #line 240 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = workers; -#line 240 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = _workers_ref0 (_tmp2_); + _tmp1_ = _workers_ref0 (workers); #line 240 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _workers_unref0 (self->priv->workers); #line 240 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->priv->workers = _tmp3_; + self->priv->workers = _tmp1_; #line 237 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self; -#line 1751 "PhotoMonitor.c" +#line 2002 "PhotoMonitor.c" } -PhotoMonitor* photo_monitor_new (Workers* workers, GCancellable* cancellable) { +PhotoMonitor* +photo_monitor_new (Workers* workers, + GCancellable* cancellable) +{ #line 237 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return photo_monitor_construct (TYPE_PHOTO_MONITOR, workers, cancellable); -#line 1758 "PhotoMonitor.c" +#line 2012 "PhotoMonitor.c" } -static MonitorableUpdates* photo_monitor_real_create_updates (MediaMonitor* base, Monitorable* monitorable) { +static MonitorableUpdates* +photo_monitor_real_create_updates (MediaMonitor* base, + Monitorable* monitorable) +{ PhotoMonitor * self; MonitorableUpdates* result = NULL; - Monitorable* _tmp0_; - Monitorable* _tmp1_; - PhotoUpdates* _tmp2_; + PhotoUpdates* _tmp0_; #line 243 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 243 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL); #line 244 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = monitorable; -#line 244 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO), "monitorable is LibraryPhoto"); + _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (monitorable, TYPE_LIBRARY_PHOTO), "monitorable is LibraryPhoto"); #line 246 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = monitorable; + _tmp0_ = photo_updates_new (G_TYPE_CHECK_INSTANCE_CAST (monitorable, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 246 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo_updates_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 246 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MONITORABLE_UPDATES, MonitorableUpdates); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MONITORABLE_UPDATES, MonitorableUpdates); #line 246 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 1784 "PhotoMonitor.c" +#line 2035 "PhotoMonitor.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 250 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self ? data_collection_ref (self) : NULL; -#line 1791 "PhotoMonitor.c" +#line 2044 "PhotoMonitor.c" } -static MediaSourceCollection* photo_monitor_real_get_media_source_collection (MediaMonitor* base) { +static MediaSourceCollection* +photo_monitor_real_get_media_source_collection (MediaMonitor* base) +{ PhotoMonitor * self; MediaSourceCollection* result = NULL; LibraryPhotoSourceCollection* _tmp0_; @@ -1806,48 +2061,50 @@ static MediaSourceCollection* photo_monitor_real_get_media_source_collection (Me result = _tmp1_; #line 250 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 1810 "PhotoMonitor.c" +#line 2065 "PhotoMonitor.c" } -static gboolean photo_monitor_real_is_file_represented (MediaMonitor* base, GFile* file) { +static gboolean +photo_monitor_real_is_file_represented (MediaMonitor* base, + GFile* file) +{ PhotoMonitor * self; gboolean result = FALSE; LibraryPhotoSourceCollectionState state = 0; - GFile* _tmp0_; - LibraryPhotoSourceCollectionState _tmp1_ = 0; + LibraryPhotoSourceCollectionState _tmp0_ = 0; + LibraryPhoto* _tmp1_; LibraryPhoto* _tmp2_; - LibraryPhoto* _tmp3_; - gboolean _tmp4_; + gboolean _tmp3_; #line 253 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 253 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 255 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = file; + _tmp1_ = photo_monitor_get_photo_state_by_file (self, file, &_tmp0_); #line 255 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo_monitor_get_photo_state_by_file (self, _tmp0_, &_tmp1_); + state = _tmp0_; #line 255 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - state = _tmp1_; -#line 255 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 255 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _tmp3_ != NULL; + _tmp3_ = _tmp2_ != NULL; #line 255 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 255 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - result = _tmp4_; + result = _tmp3_; #line 255 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 1843 "PhotoMonitor.c" +#line 2098 "PhotoMonitor.c" } -static void photo_monitor_real_close (MediaMonitor* base) { +static void +photo_monitor_real_close (MediaMonitor* base) +{ PhotoMonitor * self; #line 258 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); -#line 1851 "PhotoMonitor.c" +#line 2108 "PhotoMonitor.c" { GeeIterator* _job_it = NULL; GeeHashMap* _tmp0_; @@ -1874,180 +2131,172 @@ static void photo_monitor_real_close (MediaMonitor* base) { _job_it = _tmp5_; #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 1878 "PhotoMonitor.c" +#line 2135 "PhotoMonitor.c" GeeIterator* _tmp6_; - gboolean _tmp7_; PhotoMonitorReimportMasterJob* job = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - PhotoMonitorReimportMasterJob* _tmp10_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + PhotoMonitorReimportMasterJob* _tmp9_; #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp6_ = _job_it; #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 1893 "PhotoMonitor.c" +#line 2147 "PhotoMonitor.c" } #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = _job_it; + _tmp7_ = _job_it; #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - job = (PhotoMonitorReimportMasterJob*) _tmp9_; + job = (PhotoMonitorReimportMasterJob*) _tmp8_; #line 260 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = job; + _tmp9_ = job; #line 260 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_BACKGROUND_JOB, BackgroundJob)); + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); -#line 1907 "PhotoMonitor.c" +#line 2161 "PhotoMonitor.c" } #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_job_it); -#line 1911 "PhotoMonitor.c" +#line 2165 "PhotoMonitor.c" } { GeeIterator* _job_it = NULL; - GeeHashMap* _tmp11_; + GeeHashMap* _tmp10_; + GeeCollection* _tmp11_; GeeCollection* _tmp12_; GeeCollection* _tmp13_; - GeeCollection* _tmp14_; + GeeIterator* _tmp14_; GeeIterator* _tmp15_; - GeeIterator* _tmp16_; #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = self->priv->editable_reimport_pending; + _tmp10_ = self->priv->editable_reimport_pending; #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp11_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp13_); #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _job_it = _tmp16_; + _job_it = _tmp15_; #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 1939 "PhotoMonitor.c" - GeeIterator* _tmp17_; - gboolean _tmp18_; +#line 2193 "PhotoMonitor.c" + GeeIterator* _tmp16_; PhotoMonitorReimportEditableJob* job = NULL; - GeeIterator* _tmp19_; - gpointer _tmp20_; - PhotoMonitorReimportEditableJob* _tmp21_; -#line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = _job_it; + GeeIterator* _tmp17_; + gpointer _tmp18_; + PhotoMonitorReimportEditableJob* _tmp19_; #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = gee_iterator_next (_tmp17_); + _tmp16_ = _job_it; #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp18_) { + if (!gee_iterator_next (_tmp16_)) { #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 1954 "PhotoMonitor.c" +#line 2205 "PhotoMonitor.c" } #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = _job_it; + _tmp17_ = _job_it; #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = gee_iterator_get (_tmp19_); + _tmp18_ = gee_iterator_get (_tmp17_); #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - job = (PhotoMonitorReimportEditableJob*) _tmp20_; + job = (PhotoMonitorReimportEditableJob*) _tmp18_; #line 263 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = job; + _tmp19_ = job; #line 263 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_BACKGROUND_JOB, BackgroundJob)); + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); -#line 1968 "PhotoMonitor.c" +#line 2219 "PhotoMonitor.c" } #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_job_it); -#line 1972 "PhotoMonitor.c" +#line 2223 "PhotoMonitor.c" } { GeeIterator* _job_it = NULL; - GeeHashMap* _tmp22_; + GeeHashMap* _tmp20_; + GeeCollection* _tmp21_; + GeeCollection* _tmp22_; GeeCollection* _tmp23_; - GeeCollection* _tmp24_; - GeeCollection* _tmp25_; - GeeIterator* _tmp26_; - GeeIterator* _tmp27_; + GeeIterator* _tmp24_; + GeeIterator* _tmp25_; #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = self->priv->raw_developments_reimport_pending; + _tmp20_ = self->priv->raw_developments_reimport_pending; #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp21_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = _tmp23_; + _tmp22_ = _tmp21_; #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = _tmp24_; + _tmp23_ = _tmp22_; #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp24_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable)); #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp27_ = _tmp26_; + _tmp25_ = _tmp24_; #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp25_); + _g_object_unref0 (_tmp23_); #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _job_it = _tmp27_; + _job_it = _tmp25_; #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 2000 "PhotoMonitor.c" - GeeIterator* _tmp28_; - gboolean _tmp29_; +#line 2251 "PhotoMonitor.c" + GeeIterator* _tmp26_; PhotoMonitorReimportRawDevelopmentJob* job = NULL; - GeeIterator* _tmp30_; - gpointer _tmp31_; - PhotoMonitorReimportRawDevelopmentJob* _tmp32_; -#line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp28_ = _job_it; + GeeIterator* _tmp27_; + gpointer _tmp28_; + PhotoMonitorReimportRawDevelopmentJob* _tmp29_; #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp29_ = gee_iterator_next (_tmp28_); + _tmp26_ = _job_it; #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp29_) { + if (!gee_iterator_next (_tmp26_)) { #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 2015 "PhotoMonitor.c" +#line 2263 "PhotoMonitor.c" } #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp30_ = _job_it; + _tmp27_ = _job_it; #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp31_ = gee_iterator_get (_tmp30_); + _tmp28_ = gee_iterator_get (_tmp27_); #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - job = (PhotoMonitorReimportRawDevelopmentJob*) _tmp31_; + job = (PhotoMonitorReimportRawDevelopmentJob*) _tmp28_; #line 266 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp32_ = job; + _tmp29_ = job; #line 266 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_BACKGROUND_JOB, BackgroundJob)); + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); -#line 2029 "PhotoMonitor.c" +#line 2277 "PhotoMonitor.c" } #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_job_it); -#line 2033 "PhotoMonitor.c" +#line 2281 "PhotoMonitor.c" } #line 268 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" MEDIA_MONITOR_CLASS (photo_monitor_parent_class)->close (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor)); -#line 2037 "PhotoMonitor.c" +#line 2285 "PhotoMonitor.c" } -static void photo_monitor_cancel_reimports (PhotoMonitor* self, LibraryPhoto* photo) { +static void +photo_monitor_cancel_reimports (PhotoMonitor* self, + LibraryPhoto* photo) +{ PhotoMonitorReimportMasterJob* master_job = NULL; GeeHashMap* _tmp0_; - LibraryPhoto* _tmp1_; - gpointer _tmp2_; - PhotoMonitorReimportMasterJob* _tmp3_; + gpointer _tmp1_; + PhotoMonitorReimportMasterJob* _tmp2_; PhotoMonitorReimportEditableJob* editable_job = NULL; - GeeHashMap* _tmp5_; - LibraryPhoto* _tmp6_; - gpointer _tmp7_; - PhotoMonitorReimportEditableJob* _tmp8_; + GeeHashMap* _tmp4_; + gpointer _tmp5_; + PhotoMonitorReimportEditableJob* _tmp6_; #line 271 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 271 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2055,62 +2304,62 @@ static void photo_monitor_cancel_reimports (PhotoMonitor* self, LibraryPhoto* ph #line 272 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = self->priv->master_reimport_pending; #line 272 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo; -#line 272 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo); #line 272 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - master_job = (PhotoMonitorReimportMasterJob*) _tmp2_; + master_job = (PhotoMonitorReimportMasterJob*) _tmp1_; #line 273 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = master_job; + _tmp2_ = master_job; #line 273 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp3_ != NULL) { -#line 2068 "PhotoMonitor.c" - PhotoMonitorReimportMasterJob* _tmp4_; + if (_tmp2_ != NULL) { +#line 2315 "PhotoMonitor.c" + PhotoMonitorReimportMasterJob* _tmp3_; #line 274 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = master_job; + _tmp3_ = master_job; #line 274 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_BACKGROUND_JOB, BackgroundJob)); -#line 2074 "PhotoMonitor.c" + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_BACKGROUND_JOB, BackgroundJob)); +#line 2321 "PhotoMonitor.c" } #line 276 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = self->priv->editable_reimport_pending; + _tmp4_ = self->priv->editable_reimport_pending; #line 276 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = photo; -#line 276 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_); + _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo); #line 276 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - editable_job = (PhotoMonitorReimportEditableJob*) _tmp7_; + editable_job = (PhotoMonitorReimportEditableJob*) _tmp5_; #line 277 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = editable_job; + _tmp6_ = editable_job; #line 277 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp8_ != NULL) { -#line 2088 "PhotoMonitor.c" - PhotoMonitorReimportEditableJob* _tmp9_; + if (_tmp6_ != NULL) { +#line 2333 "PhotoMonitor.c" + PhotoMonitorReimportEditableJob* _tmp7_; #line 278 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = editable_job; + _tmp7_ = editable_job; #line 278 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_BACKGROUND_JOB, BackgroundJob)); -#line 2094 "PhotoMonitor.c" + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_BACKGROUND_JOB, BackgroundJob)); +#line 2339 "PhotoMonitor.c" } #line 271 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (editable_job); #line 271 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (master_job); -#line 2100 "PhotoMonitor.c" +#line 2345 "PhotoMonitor.c" } -static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (MediaMonitor* base, GFile* file, GFileInfo* info, Monitorable* * monitorable) { +static MediaMonitorDiscoveredFile +photo_monitor_real_notify_file_discovered (MediaMonitor* base, + GFile* file, + GFileInfo* info, + Monitorable* * monitorable) +{ PhotoMonitor * self; Monitorable* _vala_monitorable = NULL; MediaMonitorDiscoveredFile result = 0; LibraryPhotoSourceCollectionState state = 0; LibraryPhoto* photo = NULL; - GFile* _tmp0_; - LibraryPhotoSourceCollectionState _tmp1_ = 0; + LibraryPhotoSourceCollectionState _tmp0_ = 0; + LibraryPhoto* _tmp1_; LibraryPhoto* _tmp2_; - LibraryPhoto* _tmp3_; - LibraryPhotoSourceCollectionState _tmp4_; + LibraryPhotoSourceCollectionState _tmp3_; #line 281 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 281 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2118,17 +2367,15 @@ static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (Med #line 281 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), 0); #line 284 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = file; + _tmp1_ = photo_monitor_get_photo_state_by_file (self, file, &_tmp0_); #line 284 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo_monitor_get_photo_state_by_file (self, _tmp0_, &_tmp1_); + state = _tmp0_; #line 284 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - state = _tmp1_; -#line 284 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = _tmp2_; + photo = _tmp1_; #line 285 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = photo; + _tmp2_ = photo; #line 285 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 286 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_vala_monitorable); #line 286 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2141,36 +2388,36 @@ static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (Med if (monitorable) { #line 288 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *monitorable = _vala_monitorable; -#line 2145 "PhotoMonitor.c" +#line 2392 "PhotoMonitor.c" } else { #line 288 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_vala_monitorable); -#line 2149 "PhotoMonitor.c" +#line 2396 "PhotoMonitor.c" } #line 288 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 2153 "PhotoMonitor.c" +#line 2400 "PhotoMonitor.c" } #line 291 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = state; + _tmp3_ = state; #line 291 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - switch (_tmp4_) { + switch (_tmp3_) { #line 291 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: #line 291 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 2163 "PhotoMonitor.c" +#line 2410 "PhotoMonitor.c" { - LibraryPhoto* _tmp5_; - Monitorable* _tmp6_; + LibraryPhoto* _tmp4_; + Monitorable* _tmp5_; #line 294 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = photo; + _tmp4_ = photo; #line 294 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MONITORABLE, Monitorable)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MONITORABLE, Monitorable)); #line 294 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_vala_monitorable); #line 294 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_monitorable = _tmp6_; + _vala_monitorable = _tmp5_; #line 296 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result = MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED; #line 296 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2179,15 +2426,15 @@ static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (Med if (monitorable) { #line 296 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *monitorable = _vala_monitorable; -#line 2183 "PhotoMonitor.c" +#line 2430 "PhotoMonitor.c" } else { #line 296 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_vala_monitorable); -#line 2187 "PhotoMonitor.c" +#line 2434 "PhotoMonitor.c" } #line 296 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 2191 "PhotoMonitor.c" +#line 2438 "PhotoMonitor.c" } default: #line 291 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2196,7 +2443,7 @@ static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (Med case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: #line 291 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 2200 "PhotoMonitor.c" +#line 2447 "PhotoMonitor.c" { #line 304 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_vala_monitorable); @@ -2210,15 +2457,15 @@ static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (Med if (monitorable) { #line 306 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *monitorable = _vala_monitorable; -#line 2214 "PhotoMonitor.c" +#line 2461 "PhotoMonitor.c" } else { #line 306 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_vala_monitorable); -#line 2218 "PhotoMonitor.c" +#line 2465 "PhotoMonitor.c" } #line 306 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 2222 "PhotoMonitor.c" +#line 2469 "PhotoMonitor.c" } } #line 281 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2227,16 +2474,21 @@ static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (Med if (monitorable) { #line 281 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *monitorable = _vala_monitorable; -#line 2231 "PhotoMonitor.c" +#line 2478 "PhotoMonitor.c" } else { #line 281 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_vala_monitorable); -#line 2235 "PhotoMonitor.c" +#line 2482 "PhotoMonitor.c" } } -static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonitor* base, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_) { +static GeeCollection* +photo_monitor_real_candidates_for_unknown_file (MediaMonitor* base, + GFile* file, + GFileInfo* info, + MediaMonitorDiscoveredFile* _result_) +{ PhotoMonitor * self; MediaMonitorDiscoveredFile _vala_result = 0; GeeCollection* result = NULL; @@ -2245,23 +2497,22 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit GeeCollection* matched_masters = NULL; GeeArrayList* _tmp2_; LibraryPhotoSourceCollection* _tmp3_; - GFileInfo* _tmp4_; - GeeCollection* _tmp5_; + GeeCollection* _tmp4_; + GeeArrayList* _tmp5_; GeeArrayList* _tmp6_; - GeeArrayList* _tmp7_; - GeeCollection* _tmp8_; + GeeCollection* _tmp7_; + gint _tmp8_; gint _tmp9_; - gint _tmp10_; - gboolean _tmp11_ = FALSE; - GeeArrayList* _tmp12_; + gboolean _tmp10_ = FALSE; + GeeArrayList* _tmp11_; + gint _tmp12_; gint _tmp13_; - gint _tmp14_; - GeeArrayList* _tmp18_; + GeeArrayList* _tmp17_; + gint _tmp18_; gint _tmp19_; - gint _tmp20_; - GeeArrayList* _tmp53_; - gint _tmp54_; - gint _tmp55_; + GeeArrayList* _tmp49_; + gint _tmp50_; + gint _tmp51_; #line 310 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 310 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2283,23 +2534,21 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit #line 317 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp3_ = library_photo_global; #line 317 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = info; + _tmp4_ = matched_masters; #line 317 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = matched_masters; + _tmp5_ = self->priv->matched_editables; #line 317 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = self->priv->matched_editables; + _tmp6_ = self->priv->matched_developments; #line 317 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = self->priv->matched_developments; -#line 317 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - library_photo_source_collection_fetch_by_matching_backing (_tmp3_, _tmp4_, _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); + library_photo_source_collection_fetch_by_matching_backing (_tmp3_, info, _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); #line 319 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = matched_masters; + _tmp7_ = matched_masters; #line 319 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = gee_collection_get_size (_tmp8_); + _tmp8_ = gee_collection_get_size (_tmp7_); #line 319 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 319 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp10_ > 0) { + if (_tmp9_ > 0) { #line 320 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _vala_result = MEDIA_MONITOR_DISCOVERED_FILE_UNKNOWN; #line 322 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2308,40 +2557,40 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit if (_result_) { #line 322 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *_result_ = _vala_result; -#line 2312 "PhotoMonitor.c" +#line 2561 "PhotoMonitor.c" } #line 322 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 2316 "PhotoMonitor.c" +#line 2565 "PhotoMonitor.c" } #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = self->priv->matched_editables; + _tmp11_ = self->priv->matched_editables; #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp14_ == 0) { -#line 2326 "PhotoMonitor.c" - GeeArrayList* _tmp15_; + if (_tmp13_ == 0) { +#line 2575 "PhotoMonitor.c" + GeeArrayList* _tmp14_; + gint _tmp15_; gint _tmp16_; - gint _tmp17_; #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = self->priv->matched_developments; + _tmp14_ = self->priv->matched_developments; #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp15_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = _tmp17_ == 0; -#line 2338 "PhotoMonitor.c" + _tmp10_ = _tmp16_ == 0; +#line 2587 "PhotoMonitor.c" } else { #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = FALSE; -#line 2342 "PhotoMonitor.c" + _tmp10_ = FALSE; +#line 2591 "PhotoMonitor.c" } #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp11_) { + if (_tmp10_) { #line 326 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _vala_result = MEDIA_MONITOR_DISCOVERED_FILE_UNKNOWN; #line 328 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2352,253 +2601,238 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit if (_result_) { #line 328 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *_result_ = _vala_result; -#line 2356 "PhotoMonitor.c" +#line 2605 "PhotoMonitor.c" } #line 328 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 2360 "PhotoMonitor.c" +#line 2609 "PhotoMonitor.c" } #line 332 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = self->priv->matched_editables; + _tmp17_ = self->priv->matched_editables; #line 332 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp18_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 332 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 332 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp20_ > 0) { -#line 2370 "PhotoMonitor.c" + if (_tmp19_ > 0) { +#line 2619 "PhotoMonitor.c" LibraryPhoto* match = NULL; - GeeArrayList* _tmp21_; - gpointer _tmp22_; - GeeArrayList* _tmp23_; + GeeArrayList* _tmp20_; + gpointer _tmp21_; + GeeArrayList* _tmp22_; + gint _tmp23_; gint _tmp24_; - gint _tmp25_; - LibraryPhoto* _tmp51_; - GFile* _tmp52_; + LibraryPhoto* _tmp48_; #line 333 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = self->priv->matched_editables; + _tmp20_ = self->priv->matched_editables; #line 333 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); + _tmp21_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); #line 333 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - match = (LibraryPhoto*) _tmp22_; + match = (LibraryPhoto*) _tmp21_; #line 334 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = self->priv->matched_editables; + _tmp22_ = self->priv->matched_editables; #line 334 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp23_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 334 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = _tmp24_; + _tmp24_ = _tmp23_; #line 334 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp25_ > 1) { -#line 2393 "PhotoMonitor.c" - GFile* _tmp26_; - gchar* _tmp27_; - gchar* _tmp28_; - GeeArrayList* _tmp29_; - gint _tmp30_; - gint _tmp31_; - LibraryPhoto* _tmp32_; - gchar* _tmp33_; - gchar* _tmp34_; -#line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = file; + if (_tmp24_ > 1) { +#line 2641 "PhotoMonitor.c" + gchar* _tmp25_; + gchar* _tmp26_; + GeeArrayList* _tmp27_; + gint _tmp28_; + gint _tmp29_; + LibraryPhoto* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp27_ = g_file_get_path (_tmp26_); + _tmp25_ = g_file_get_path (file); #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp28_ = _tmp27_; + _tmp26_ = _tmp25_; #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp29_ = self->priv->matched_editables; + _tmp27_ = self->priv->matched_editables; #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp31_ = _tmp30_; + _tmp29_ = _tmp28_; #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp32_ = match; + _tmp30_ = match; #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp33_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject)); + _tmp31_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_OBJECT, DataObject)); #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp34_ = _tmp33_; + _tmp32_ = _tmp31_; #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_warning ("PhotoMonitor.vala:335: Unknown file %s could be matched with %d photos" \ -"; giving to %s, dropping others", _tmp28_, _tmp31_, _tmp34_); +"; giving to %s, dropping others", _tmp26_, _tmp29_, _tmp32_); #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp34_); + _g_free0 (_tmp32_); #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp28_); -#line 2427 "PhotoMonitor.c" + _g_free0 (_tmp26_); +#line 2672 "PhotoMonitor.c" { gint ctr = 0; #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" ctr = 1; -#line 2432 "PhotoMonitor.c" +#line 2677 "PhotoMonitor.c" { - gboolean _tmp35_ = FALSE; + gboolean _tmp33_ = FALSE; #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp35_ = TRUE; + _tmp33_ = TRUE; #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 2439 "PhotoMonitor.c" +#line 2684 "PhotoMonitor.c" + gint _tmp35_; + GeeArrayList* _tmp36_; gint _tmp37_; - GeeArrayList* _tmp38_; - gint _tmp39_; + gint _tmp38_; + GeeArrayList* _tmp39_; gint _tmp40_; - GeeArrayList* _tmp41_; - gint _tmp42_; - gpointer _tmp43_; - LibraryPhoto* _tmp44_; - gboolean _tmp45_; - gboolean _tmp46_; + gpointer _tmp41_; + LibraryPhoto* _tmp42_; + gboolean _tmp43_; #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp35_) { -#line 2452 "PhotoMonitor.c" - gint _tmp36_; + if (!_tmp33_) { +#line 2696 "PhotoMonitor.c" + gint _tmp34_; #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp36_ = ctr; + _tmp34_ = ctr; #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - ctr = _tmp36_ + 1; -#line 2458 "PhotoMonitor.c" + ctr = _tmp34_ + 1; +#line 2702 "PhotoMonitor.c" } #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp35_ = FALSE; + _tmp33_ = FALSE; #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp37_ = ctr; + _tmp35_ = ctr; #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp38_ = self->priv->matched_editables; + _tmp36_ = self->priv->matched_editables; #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp39_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp40_ = _tmp39_; + _tmp38_ = _tmp37_; #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!(_tmp37_ < _tmp40_)) { + if (!(_tmp35_ < _tmp38_)) { #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 2474 "PhotoMonitor.c" +#line 2718 "PhotoMonitor.c" } #line 338 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp41_ = self->priv->matched_editables; -#line 338 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp42_ = ctr; + _tmp39_ = self->priv->matched_editables; #line 338 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp43_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp42_); + _tmp40_ = ctr; #line 338 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp44_ = (LibraryPhoto*) _tmp43_; + _tmp41_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp40_); #line 338 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp45_ = photo_does_editable_exist (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_PHOTO, Photo)); + _tmp42_ = (LibraryPhoto*) _tmp41_; #line 338 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp46_ = !_tmp45_; + _tmp43_ = !photo_does_editable_exist (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PHOTO, Photo)); #line 338 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp44_); + _g_object_unref0 (_tmp42_); #line 338 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp46_) { -#line 2492 "PhotoMonitor.c" - GeeArrayList* _tmp47_; - gint _tmp48_; - gpointer _tmp49_; - LibraryPhoto* _tmp50_; + if (_tmp43_) { +#line 2734 "PhotoMonitor.c" + GeeArrayList* _tmp44_; + gint _tmp45_; + gpointer _tmp46_; + LibraryPhoto* _tmp47_; #line 339 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp47_ = self->priv->matched_editables; + _tmp44_ = self->priv->matched_editables; #line 339 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp48_ = ctr; + _tmp45_ = ctr; #line 339 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp49_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp48_); + _tmp46_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp45_); #line 339 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp50_ = (LibraryPhoto*) _tmp49_; + _tmp47_ = (LibraryPhoto*) _tmp46_; #line 339 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_revert_to_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_PHOTO, Photo), TRUE); + photo_revert_to_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO, Photo), TRUE); #line 339 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp50_); -#line 2509 "PhotoMonitor.c" + _g_object_unref0 (_tmp47_); +#line 2751 "PhotoMonitor.c" } } } } } #line 343 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp51_ = match; -#line 343 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp52_ = file; + _tmp48_ = match; #line 343 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_editable_file (self, _tmp51_, _tmp52_); + photo_monitor_update_editable_file (self, _tmp48_, file); #line 332 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (match); -#line 2523 "PhotoMonitor.c" +#line 2763 "PhotoMonitor.c" } #line 346 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp53_ = self->priv->matched_developments; + _tmp49_ = self->priv->matched_developments; #line 346 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp54_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp50_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 346 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp55_ = _tmp54_; + _tmp51_ = _tmp50_; #line 346 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp55_ > 0) { -#line 2533 "PhotoMonitor.c" + if (_tmp51_ > 0) { +#line 2773 "PhotoMonitor.c" LibraryPhoto* match_raw = NULL; - GeeArrayList* _tmp56_; - gpointer _tmp57_; - GeeArrayList* _tmp58_; - gint _tmp59_; - gint _tmp60_; - LibraryPhoto* _tmp70_; - GFile* _tmp71_; + GeeArrayList* _tmp52_; + gpointer _tmp53_; + GeeArrayList* _tmp54_; + gint _tmp55_; + gint _tmp56_; + LibraryPhoto* _tmp65_; #line 347 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp56_ = self->priv->matched_developments; + _tmp52_ = self->priv->matched_developments; #line 347 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp57_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); + _tmp53_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); #line 347 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - match_raw = (LibraryPhoto*) _tmp57_; + match_raw = (LibraryPhoto*) _tmp53_; #line 348 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp58_ = self->priv->matched_developments; + _tmp54_ = self->priv->matched_developments; #line 348 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp59_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp55_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 348 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp60_ = _tmp59_; + _tmp56_ = _tmp55_; #line 348 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp60_ > 1) { -#line 2556 "PhotoMonitor.c" - GFile* _tmp61_; - gchar* _tmp62_; + if (_tmp56_ > 1) { +#line 2795 "PhotoMonitor.c" + gchar* _tmp57_; + gchar* _tmp58_; + GeeArrayList* _tmp59_; + gint _tmp60_; + gint _tmp61_; + LibraryPhoto* _tmp62_; gchar* _tmp63_; - GeeArrayList* _tmp64_; - gint _tmp65_; - gint _tmp66_; - LibraryPhoto* _tmp67_; - gchar* _tmp68_; - gchar* _tmp69_; + gchar* _tmp64_; #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp61_ = file; + _tmp57_ = g_file_get_path (file); #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp62_ = g_file_get_path (_tmp61_); + _tmp58_ = _tmp57_; #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp63_ = _tmp62_; + _tmp59_ = self->priv->matched_developments; #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp64_ = self->priv->matched_developments; + _tmp60_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp65_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp61_ = _tmp60_; #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp66_ = _tmp65_; + _tmp62_ = match_raw; #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp67_ = match_raw; + _tmp63_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_DATA_OBJECT, DataObject)); #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp68_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_DATA_OBJECT, DataObject)); -#line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp69_ = _tmp68_; + _tmp64_ = _tmp63_; #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_warning ("PhotoMonitor.vala:349: Unknown file %s could be matched with %d photos" \ -"; giving to %s, dropping others", _tmp63_, _tmp66_, _tmp69_); +"; giving to %s, dropping others", _tmp58_, _tmp61_, _tmp64_); #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp69_); + _g_free0 (_tmp64_); #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp63_); -#line 2590 "PhotoMonitor.c" + _g_free0 (_tmp58_); +#line 2826 "PhotoMonitor.c" } #line 353 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp70_ = match_raw; -#line 353 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp71_ = file; + _tmp65_ = match_raw; #line 353 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_raw_development_file (self, _tmp70_, _tmp71_); + photo_monitor_update_raw_development_file (self, _tmp65_, file); #line 346 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (match_raw); -#line 2600 "PhotoMonitor.c" +#line 2834 "PhotoMonitor.c" } #line 356 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _vala_result = MEDIA_MONITOR_DISCOVERED_FILE_IGNORE; @@ -2610,248 +2844,256 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit if (_result_) { #line 358 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *_result_ = _vala_result; -#line 2612 "PhotoMonitor.c" +#line 2846 "PhotoMonitor.c" } #line 358 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 2616 "PhotoMonitor.c" +#line 2850 "PhotoMonitor.c" } -static void _vala_array_add132 (GFile** * array, int* length, int* size, GFile* value) { +static void +_vala_array_add132 (GFile** * array, + int* length, + int* size, + GFile* value) +{ #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if ((*length) == (*size)) { #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *size = (*size) ? (2 * (*size)) : 4; #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *array = g_renew (GFile*, *array, (*size) + 1); -#line 2627 "PhotoMonitor.c" +#line 2866 "PhotoMonitor.c" } #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" (*array)[(*length)++] = value; #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" (*array)[*length] = NULL; -#line 2633 "PhotoMonitor.c" +#line 2872 "PhotoMonitor.c" } -static void _vala_array_add133 (GFile** * array, int* length, int* size, GFile* value) { +static void +_vala_array_add133 (GFile** * array, + int* length, + int* size, + GFile* value) +{ #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if ((*length) == (*size)) { #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *size = (*size) ? (2 * (*size)) : 4; #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *array = g_renew (GFile*, *array, (*size) + 1); -#line 2644 "PhotoMonitor.c" +#line 2888 "PhotoMonitor.c" } #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" (*array)[(*length)++] = value; #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" (*array)[*length] = NULL; -#line 2650 "PhotoMonitor.c" +#line 2894 "PhotoMonitor.c" } -static GFile** _vala_array_dup26 (GFile** self, int length) { +static GFile** +_vala_array_dup26 (GFile** self, + int length) +{ GFile** result; int i; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result = g_new0 (GFile*, length + 1); #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" for (i = 0; i < length; i++) { -#line 2661 "PhotoMonitor.c" +#line 2908 "PhotoMonitor.c" GFile* _tmp0_; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result[i] = _tmp0_; -#line 2667 "PhotoMonitor.c" +#line 2914 "PhotoMonitor.c" } #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 2671 "PhotoMonitor.c" +#line 2918 "PhotoMonitor.c" } -static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* base, Monitorable* monitorable, int* result_length1) { +static GFile** +photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* base, + Monitorable* monitorable, + int* result_length1) +{ PhotoMonitor * self; GFile** result = NULL; LibraryPhoto* photo = NULL; - Monitorable* _tmp0_; - LibraryPhoto* _tmp1_; + LibraryPhoto* _tmp0_; GFile** files = NULL; - GFile** _tmp2_; + GFile** _tmp1_; gint files_length1; gint _files_size_; - LibraryPhoto* _tmp3_; - gboolean _tmp4_; + LibraryPhoto* _tmp2_; GeeCollection* raw_files = NULL; - LibraryPhoto* _tmp8_; - GeeCollection* _tmp9_; - GeeCollection* _tmp10_; - GFile** _tmp20_ = NULL; - gint _tmp20__length1 = 0; - gint __tmp20__size_ = 0; + LibraryPhoto* _tmp6_; + GeeCollection* _tmp7_; + GeeCollection* _tmp8_; + GFile** _tmp17_ = NULL; + gint _tmp17__length1 = 0; + gint __tmp17__size_ = 0; + GFile** _tmp18_; + gint _tmp18__length1; + GFile** _tmp20_; + gint _tmp20__length1; GFile** _tmp21_; gint _tmp21__length1; - GFile** _tmp23_; - gint _tmp23__length1; - GFile** _tmp24_; - gint _tmp24__length1; #line 361 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 361 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL); #line 362 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = monitorable; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (monitorable, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 362 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 362 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = _tmp1_; + photo = _tmp0_; #line 363 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = g_new0 (GFile*, 0 + 1); + _tmp1_ = g_new0 (GFile*, 0 + 1); #line 363 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - files = _tmp2_; + files = _tmp1_; #line 363 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" files_length1 = 0; #line 363 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _files_size_ = files_length1; #line 366 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = photo; -#line 366 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO, Photo)); + _tmp2_ = photo; #line 366 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp4_) { -#line 2724 "PhotoMonitor.c" - GFile** _tmp5_; - gint _tmp5__length1; - LibraryPhoto* _tmp6_; - GFile* _tmp7_; + if (photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO, Photo))) { +#line 2969 "PhotoMonitor.c" + GFile** _tmp3_; + gint _tmp3__length1; + LibraryPhoto* _tmp4_; + GFile* _tmp5_; #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = files; + _tmp3_ = files; #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5__length1 = files_length1; + _tmp3__length1 = files_length1; #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = photo; + _tmp4_ = photo; #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo)); + _tmp5_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO, Photo)); #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_array_add132 (&files, &files_length1, &_files_size_, _tmp7_); -#line 2739 "PhotoMonitor.c" + _vala_array_add132 (&files, &files_length1, &_files_size_, _tmp5_); +#line 2984 "PhotoMonitor.c" } #line 370 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = photo; + _tmp6_ = photo; #line 370 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo)); + _tmp7_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo)); #line 370 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - raw_files = _tmp9_; + raw_files = _tmp7_; #line 371 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = raw_files; + _tmp8_ = raw_files; #line 371 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp10_ != NULL) { -#line 2751 "PhotoMonitor.c" + if (_tmp8_ != NULL) { +#line 2996 "PhotoMonitor.c" { GeeIterator* _f_it = NULL; - GeeCollection* _tmp11_; - GeeIterator* _tmp12_; + GeeCollection* _tmp9_; + GeeIterator* _tmp10_; #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = raw_files; + _tmp9_ = raw_files; #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _f_it = _tmp12_; + _f_it = _tmp10_; #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 2764 "PhotoMonitor.c" - GeeIterator* _tmp13_; - gboolean _tmp14_; +#line 3009 "PhotoMonitor.c" + GeeIterator* _tmp11_; GFile* f = NULL; - GeeIterator* _tmp15_; - gpointer _tmp16_; - GFile** _tmp17_; - gint _tmp17__length1; - GFile* _tmp18_; - GFile* _tmp19_; -#line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = _f_it; + GeeIterator* _tmp12_; + gpointer _tmp13_; + GFile** _tmp14_; + gint _tmp14__length1; + GFile* _tmp15_; + GFile* _tmp16_; #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = gee_iterator_next (_tmp13_); + _tmp11_ = _f_it; #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp14_) { + if (!gee_iterator_next (_tmp11_)) { #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 2782 "PhotoMonitor.c" +#line 3024 "PhotoMonitor.c" } #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = _f_it; + _tmp12_ = _f_it; #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = gee_iterator_get (_tmp15_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - f = (GFile*) _tmp16_; + f = (GFile*) _tmp13_; #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = files; + _tmp14_ = files; #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17__length1 = files_length1; + _tmp14__length1 = files_length1; #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = f; + _tmp15_ = f; #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = _g_object_ref0 (_tmp18_); + _tmp16_ = _g_object_ref0 (_tmp15_); #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_array_add133 (&files, &files_length1, &_files_size_, _tmp19_); + _vala_array_add133 (&files, &files_length1, &_files_size_, _tmp16_); #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (f); -#line 2802 "PhotoMonitor.c" +#line 3044 "PhotoMonitor.c" } #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_f_it); -#line 2806 "PhotoMonitor.c" +#line 3048 "PhotoMonitor.c" } } #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = files; + _tmp18_ = files; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21__length1 = files_length1; + _tmp18__length1 = files_length1; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp21__length1 > 0) { -#line 2815 "PhotoMonitor.c" - GFile** _tmp22_; - gint _tmp22__length1; + if (_tmp18__length1 > 0) { +#line 3057 "PhotoMonitor.c" + GFile** _tmp19_; + gint _tmp19__length1; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = files; + _tmp19_ = files; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22__length1 = files_length1; + _tmp19__length1 = files_length1; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = _tmp22_; + _tmp17_ = _tmp19_; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20__length1 = _tmp22__length1; + _tmp17__length1 = _tmp19__length1; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - __tmp20__size_ = _tmp20__length1; -#line 2828 "PhotoMonitor.c" + __tmp17__size_ = _tmp17__length1; +#line 3070 "PhotoMonitor.c" } else { #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = NULL; + _tmp17_ = NULL; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20__length1 = 0; + _tmp17__length1 = 0; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - __tmp20__size_ = _tmp20__length1; -#line 2836 "PhotoMonitor.c" + __tmp17__size_ = _tmp17__length1; +#line 3078 "PhotoMonitor.c" } #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = (_tmp20_ != NULL) ? _vala_array_dup26 (_tmp20_, _tmp20__length1) : ((gpointer) _tmp20_); + _tmp20_ = (_tmp17_ != NULL) ? _vala_array_dup26 (_tmp17_, _tmp17__length1) : ((gpointer) _tmp17_); #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23__length1 = _tmp20__length1; + _tmp20__length1 = _tmp17__length1; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = _tmp23_; + _tmp21_ = _tmp20_; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24__length1 = _tmp23__length1; + _tmp21__length1 = _tmp20__length1; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (result_length1) { #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - *result_length1 = _tmp24__length1; -#line 2850 "PhotoMonitor.c" + *result_length1 = _tmp21__length1; +#line 3092 "PhotoMonitor.c" } #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - result = _tmp24_; + result = _tmp21_; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (raw_files); #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2860,21 +3102,23 @@ static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* ba _g_object_unref0 (photo); #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 2862 "PhotoMonitor.c" +#line 3104 "PhotoMonitor.c" } -static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, Monitorable* monitorable, GFile* file, GFileInfo* info) { +static void +photo_monitor_real_update_backing_file_info (MediaMonitor* base, + Monitorable* monitorable, + GFile* file, + GFileInfo* info) +{ PhotoMonitor * self; LibraryPhoto* photo = NULL; - Monitorable* _tmp0_; + LibraryPhoto* _tmp0_; LibraryPhoto* _tmp1_; - LibraryPhoto* _tmp2_; + GFile* _tmp2_; GFile* _tmp3_; - GFile* _tmp4_; - GFile* _tmp5_; - gboolean _tmp6_; - gboolean _tmp7_; + gboolean _tmp4_; #line 379 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 379 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2884,196 +3128,168 @@ static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, Mon #line 379 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail ((info == NULL) || G_IS_FILE_INFO (info)); #line 380 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = monitorable; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (monitorable, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 380 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 380 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = _tmp1_; -#line 382 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo; + photo = _tmp0_; #line 382 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = media_monitor_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MONITORABLE, Monitorable)); -#line 382 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _tmp3_; + _tmp1_ = photo; #line 382 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = file; + _tmp2_ = media_monitor_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MONITORABLE, Monitorable)); #line 382 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = g_file_equal (_tmp4_, _tmp5_); + _tmp3_ = _tmp2_; #line 382 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = _tmp6_; + _tmp4_ = g_file_equal (_tmp3_, file); #line 382 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 382 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp7_) { -#line 2907 "PhotoMonitor.c" - LibraryPhoto* _tmp8_; - GFileInfo* _tmp9_; -#line 383 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = photo; + if (_tmp4_) { +#line 3145 "PhotoMonitor.c" + LibraryPhoto* _tmp5_; #line 383 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = info; + _tmp5_ = photo; #line 383 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_check_for_master_changes (self, _tmp8_, _tmp9_); -#line 2916 "PhotoMonitor.c" + photo_monitor_check_for_master_changes (self, _tmp5_, info); +#line 3151 "PhotoMonitor.c" } else { - gboolean _tmp10_ = FALSE; - LibraryPhoto* _tmp11_; - GFile* _tmp12_; - GFile* _tmp13_; - gboolean _tmp14_; -#line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = photo; -#line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = photo_monitor_get_editable_file (self, _tmp11_); + gboolean _tmp6_ = FALSE; + LibraryPhoto* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; + gboolean _tmp10_; #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = _tmp12_; + _tmp7_ = photo; #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp13_ != NULL; + _tmp8_ = photo_monitor_get_editable_file (self, _tmp7_); #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp13_); + _tmp9_ = _tmp8_; #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp14_) { -#line 2935 "PhotoMonitor.c" - LibraryPhoto* _tmp15_; - GFile* _tmp16_; - GFile* _tmp17_; - GFile* _tmp18_; - gboolean _tmp19_; + _tmp10_ = _tmp9_ != NULL; #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = photo; + _g_object_unref0 (_tmp9_); #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = photo_monitor_get_editable_file (self, _tmp15_); + if (_tmp10_) { +#line 3170 "PhotoMonitor.c" + LibraryPhoto* _tmp11_; + GFile* _tmp12_; + GFile* _tmp13_; #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = _tmp16_; + _tmp11_ = photo; #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = file; + _tmp12_ = photo_monitor_get_editable_file (self, _tmp11_); #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = g_file_equal (_tmp17_, _tmp18_); + _tmp13_ = _tmp12_; #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = _tmp19_; + _tmp6_ = g_file_equal (_tmp13_, file); #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp17_); -#line 2955 "PhotoMonitor.c" + _g_object_unref0 (_tmp13_); +#line 3184 "PhotoMonitor.c" } else { #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = FALSE; -#line 2959 "PhotoMonitor.c" + _tmp6_ = FALSE; +#line 3188 "PhotoMonitor.c" } #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp10_) { -#line 2963 "PhotoMonitor.c" - LibraryPhoto* _tmp20_; - GFileInfo* _tmp21_; + if (_tmp6_) { +#line 3192 "PhotoMonitor.c" + LibraryPhoto* _tmp14_; #line 385 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = photo; + _tmp14_ = photo; #line 385 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = info; -#line 385 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_check_for_editable_changes (self, _tmp20_, _tmp21_); -#line 2972 "PhotoMonitor.c" + photo_monitor_check_for_editable_changes (self, _tmp14_, info); +#line 3198 "PhotoMonitor.c" } else { - LibraryPhoto* _tmp22_; - GeeCollection* _tmp23_; - GeeCollection* _tmp24_; - gboolean _tmp25_; + LibraryPhoto* _tmp15_; + GeeCollection* _tmp16_; + GeeCollection* _tmp17_; + gboolean _tmp18_; #line 386 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = photo; + _tmp15_ = photo; #line 386 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = photo_monitor_get_raw_development_files (self, _tmp22_); + _tmp16_ = photo_monitor_get_raw_development_files (self, _tmp15_); #line 386 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = _tmp23_; + _tmp17_ = _tmp16_; #line 386 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = _tmp24_ != NULL; + _tmp18_ = _tmp17_ != NULL; #line 386 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp17_); #line 386 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp25_) { -#line 2990 "PhotoMonitor.c" + if (_tmp18_) { +#line 3216 "PhotoMonitor.c" { GeeIterator* _f_it = NULL; - LibraryPhoto* _tmp26_; - GeeCollection* _tmp27_; - GeeCollection* _tmp28_; - GeeIterator* _tmp29_; - GeeIterator* _tmp30_; + LibraryPhoto* _tmp19_; + GeeCollection* _tmp20_; + GeeCollection* _tmp21_; + GeeIterator* _tmp22_; + GeeIterator* _tmp23_; #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = photo; + _tmp19_ = photo; #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp27_ = photo_monitor_get_raw_development_files (self, _tmp26_); + _tmp20_ = photo_monitor_get_raw_development_files (self, _tmp19_); #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp28_ = _tmp27_; + _tmp21_ = _tmp20_; #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp29_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp22_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ITERABLE, GeeIterable)); #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp30_ = _tmp29_; + _tmp23_ = _tmp22_; #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp28_); + _g_object_unref0 (_tmp21_); #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _f_it = _tmp30_; + _f_it = _tmp23_; #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 3014 "PhotoMonitor.c" - GeeIterator* _tmp31_; - gboolean _tmp32_; +#line 3240 "PhotoMonitor.c" + GeeIterator* _tmp24_; GFile* f = NULL; - GeeIterator* _tmp33_; - gpointer _tmp34_; - GFile* _tmp35_; - GFile* _tmp36_; - gboolean _tmp37_; -#line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp31_ = _f_it; + GeeIterator* _tmp25_; + gpointer _tmp26_; + GFile* _tmp27_; #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp32_ = gee_iterator_next (_tmp31_); + _tmp24_ = _f_it; #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp32_) { + if (!gee_iterator_next (_tmp24_)) { #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3031 "PhotoMonitor.c" +#line 3252 "PhotoMonitor.c" } #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp33_ = _f_it; + _tmp25_ = _f_it; #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp34_ = gee_iterator_get (_tmp33_); + _tmp26_ = gee_iterator_get (_tmp25_); #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - f = (GFile*) _tmp34_; -#line 388 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp35_ = f; -#line 388 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp36_ = file; + f = (GFile*) _tmp26_; #line 388 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp37_ = g_file_equal (_tmp35_, _tmp36_); + _tmp27_ = f; #line 388 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp37_) { -#line 3047 "PhotoMonitor.c" - LibraryPhoto* _tmp38_; - GFileInfo* _tmp39_; -#line 389 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp38_ = photo; + if (g_file_equal (_tmp27_, file)) { +#line 3264 "PhotoMonitor.c" + LibraryPhoto* _tmp28_; #line 389 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp39_ = info; + _tmp28_ = photo; #line 389 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_check_for_raw_development_changes (self, _tmp38_, _tmp39_); -#line 3056 "PhotoMonitor.c" + photo_monitor_check_for_raw_development_changes (self, _tmp28_, info); +#line 3270 "PhotoMonitor.c" } #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (f); -#line 3060 "PhotoMonitor.c" +#line 3274 "PhotoMonitor.c" } #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_f_it); -#line 3064 "PhotoMonitor.c" +#line 3278 "PhotoMonitor.c" } } } } #line 379 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (photo); -#line 3071 "PhotoMonitor.c" +#line 3285 "PhotoMonitor.c" } -static void photo_monitor_real_notify_discovery_completing (MediaMonitor* base) { +static void +photo_monitor_real_notify_discovery_completing (MediaMonitor* base) +{ PhotoMonitor * self; GeeArrayList* _tmp0_; #line 394 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3082,21 +3298,19 @@ static void photo_monitor_real_notify_discovery_completing (MediaMonitor* base) _tmp0_ = self->priv->matched_editables; #line 395 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 3084 "PhotoMonitor.c" +#line 3300 "PhotoMonitor.c" } -static void photo_monitor_check_for_master_changes (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info) { - GFileInfo* _tmp0_; +static void +photo_monitor_check_for_master_changes (PhotoMonitor* self, + LibraryPhoto* photo, + GFileInfo* info) +{ BackingPhotoRow* state = NULL; - LibraryPhoto* _tmp1_; + BackingPhotoRow* _tmp0_; + BackingPhotoRow* _tmp1_; BackingPhotoRow* _tmp2_; - BackingPhotoRow* _tmp3_; - GFileInfo* _tmp4_; - gboolean _tmp5_; - BackingPhotoRow* _tmp6_; - GFileInfo* _tmp7_; - gboolean _tmp8_; #line 402 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 402 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3104,80 +3318,55 @@ static void photo_monitor_check_for_master_changes (PhotoMonitor* self, LibraryP #line 402 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail ((info == NULL) || G_IS_FILE_INFO (info)); #line 404 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = info; -#line 404 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp0_ == NULL) { + if (info == NULL) { #line 405 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 3111 "PhotoMonitor.c" +#line 3323 "PhotoMonitor.c" } #line 407 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo; -#line 407 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO, Photo)); + _tmp0_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo)); #line 407 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - state = _tmp2_; + state = _tmp0_; #line 408 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = state; -#line 408 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = info; + _tmp1_ = state; #line 408 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = backing_photo_row_matches_file_info (_tmp3_, _tmp4_); -#line 408 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp5_) { + if (backing_photo_row_matches_file_info (_tmp1_, info)) { #line 409 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _backing_photo_row_unref0 (state); #line 409 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 3131 "PhotoMonitor.c" +#line 3337 "PhotoMonitor.c" } #line 411 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = state; + _tmp2_ = state; #line 411 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = info; -#line 411 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = backing_photo_row_is_touched (_tmp6_, _tmp7_); -#line 411 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp8_) { -#line 3141 "PhotoMonitor.c" - LibraryPhoto* _tmp9_; - LibraryPhoto* _tmp10_; - GFileInfo* _tmp11_; + if (backing_photo_row_is_touched (_tmp2_, info)) { #line 412 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = photo; -#line 412 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_master_file_info_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MONITORABLE, Monitorable)); -#line 413 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = photo; + media_monitor_update_master_file_info_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MONITORABLE, Monitorable)); #line 413 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = info; -#line 413 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_master_file_alterations_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MONITORABLE, Monitorable), _tmp11_); -#line 3155 "PhotoMonitor.c" + media_monitor_update_master_file_alterations_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MONITORABLE, Monitorable), info); +#line 3347 "PhotoMonitor.c" } else { - LibraryPhoto* _tmp12_; #line 415 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = photo; -#line 415 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_master (self, _tmp12_); -#line 3162 "PhotoMonitor.c" + photo_monitor_update_reimport_master (self, photo); +#line 3351 "PhotoMonitor.c" } #line 402 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _backing_photo_row_unref0 (state); -#line 3166 "PhotoMonitor.c" +#line 3355 "PhotoMonitor.c" } -static void photo_monitor_check_for_editable_changes (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info) { - GFileInfo* _tmp0_; +static void +photo_monitor_check_for_editable_changes (PhotoMonitor* self, + LibraryPhoto* photo, + GFileInfo* info) +{ BackingPhotoRow* state = NULL; - LibraryPhoto* _tmp2_; - BackingPhotoRow* _tmp3_; - gboolean _tmp4_ = FALSE; - BackingPhotoRow* _tmp5_; - BackingPhotoRow* _tmp9_; - GFileInfo* _tmp10_; - gboolean _tmp11_; + BackingPhotoRow* _tmp0_; + gboolean _tmp1_ = FALSE; + BackingPhotoRow* _tmp2_; + BackingPhotoRow* _tmp4_; #line 419 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 419 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3185,97 +3374,68 @@ static void photo_monitor_check_for_editable_changes (PhotoMonitor* self, Librar #line 419 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail ((info == NULL) || G_IS_FILE_INFO (info)); #line 420 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = info; -#line 420 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp0_ == NULL) { -#line 3190 "PhotoMonitor.c" - LibraryPhoto* _tmp1_; + if (info == NULL) { #line 421 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo; -#line 421 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_revert_to_master (self, _tmp1_); + photo_monitor_update_revert_to_master (self, photo); #line 423 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 3198 "PhotoMonitor.c" +#line 3381 "PhotoMonitor.c" } #line 427 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo; -#line 427 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO, Photo)); + _tmp0_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo)); #line 427 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - state = _tmp3_; + state = _tmp0_; #line 428 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = state; + _tmp2_ = state; #line 428 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp5_ == NULL) { + if (_tmp2_ == NULL) { #line 428 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = TRUE; -#line 3212 "PhotoMonitor.c" + _tmp1_ = TRUE; +#line 3393 "PhotoMonitor.c" } else { - BackingPhotoRow* _tmp6_; - GFileInfo* _tmp7_; - gboolean _tmp8_; -#line 428 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = state; + BackingPhotoRow* _tmp3_; #line 428 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = info; + _tmp3_ = state; #line 428 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = backing_photo_row_matches_file_info (_tmp6_, _tmp7_); -#line 428 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _tmp8_; -#line 3225 "PhotoMonitor.c" + _tmp1_ = backing_photo_row_matches_file_info (_tmp3_, info); +#line 3400 "PhotoMonitor.c" } #line 428 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp4_) { + if (_tmp1_) { #line 429 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _backing_photo_row_unref0 (state); #line 429 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 3233 "PhotoMonitor.c" +#line 3408 "PhotoMonitor.c" } #line 431 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = state; -#line 431 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = info; -#line 431 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = backing_photo_row_is_touched (_tmp9_, _tmp10_); + _tmp4_ = state; #line 431 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp11_) { -#line 3243 "PhotoMonitor.c" - LibraryPhoto* _tmp12_; - LibraryPhoto* _tmp13_; - GFileInfo* _tmp14_; -#line 432 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = photo; + if (backing_photo_row_is_touched (_tmp4_, info)) { #line 432 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_editable_file_info_altered (self, _tmp12_); -#line 433 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = photo; -#line 433 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = info; + photo_monitor_update_editable_file_info_altered (self, photo); #line 433 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_editable_file_alterations_completed (self, _tmp13_, _tmp14_); -#line 3257 "PhotoMonitor.c" + photo_monitor_update_editable_file_alterations_completed (self, photo, info); +#line 3418 "PhotoMonitor.c" } else { - LibraryPhoto* _tmp15_; #line 435 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = photo; -#line 435 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_editable (self, _tmp15_); -#line 3264 "PhotoMonitor.c" + photo_monitor_update_reimport_editable (self, photo); +#line 3422 "PhotoMonitor.c" } #line 419 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _backing_photo_row_unref0 (state); -#line 3268 "PhotoMonitor.c" +#line 3426 "PhotoMonitor.c" } -static void photo_monitor_check_for_raw_development_changes (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info) { - GFileInfo* _tmp0_; +static void +photo_monitor_check_for_raw_development_changes (PhotoMonitor* self, + LibraryPhoto* photo, + GFileInfo* info) +{ GeeCollection* rows = NULL; - LibraryPhoto* _tmp2_; - GeeCollection* _tmp3_; - GeeCollection* _tmp4_; + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; #line 439 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 439 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3283,84 +3443,66 @@ static void photo_monitor_check_for_raw_development_changes (PhotoMonitor* self, #line 439 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail ((info == NULL) || G_IS_FILE_INFO (info)); #line 440 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = info; -#line 440 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp0_ == NULL) { -#line 3288 "PhotoMonitor.c" - LibraryPhoto* _tmp1_; -#line 442 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo; + if (info == NULL) { #line 442 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_set_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO, Photo), RAW_DEVELOPER_SHOTWELL, TRUE); + photo_set_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo), RAW_DEVELOPER_SHOTWELL, TRUE); #line 444 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 3296 "PhotoMonitor.c" +#line 3450 "PhotoMonitor.c" } #line 447 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo; -#line 447 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO, Photo)); + _tmp0_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo)); #line 447 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - rows = _tmp3_; + rows = _tmp0_; #line 448 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = rows; + _tmp1_ = rows; #line 448 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp4_ == NULL) { + if (_tmp1_ == NULL) { #line 449 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (rows); #line 449 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 3312 "PhotoMonitor.c" +#line 3464 "PhotoMonitor.c" } { GeeIterator* _row_it = NULL; - GeeCollection* _tmp5_; - GeeIterator* _tmp6_; + GeeCollection* _tmp2_; + GeeIterator* _tmp3_; #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = rows; + _tmp2_ = rows; #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _row_it = _tmp6_; + _row_it = _tmp3_; #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 3326 "PhotoMonitor.c" - GeeIterator* _tmp7_; - gboolean _tmp8_; +#line 3478 "PhotoMonitor.c" + GeeIterator* _tmp4_; BackingPhotoRow* row = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; - BackingPhotoRow* _tmp11_; - GFileInfo* _tmp12_; - gboolean _tmp13_; - GFileInfo* _tmp14_; - const gchar* _tmp15_; - BackingPhotoRow* _tmp16_; - const gchar* _tmp17_; -#line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = _row_it; + GeeIterator* _tmp5_; + gpointer _tmp6_; + BackingPhotoRow* _tmp7_; + const gchar* _tmp8_; + BackingPhotoRow* _tmp9_; + const gchar* _tmp10_; #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = gee_iterator_next (_tmp7_); + _tmp4_ = _row_it; #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp4_)) { #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3347 "PhotoMonitor.c" +#line 3493 "PhotoMonitor.c" } #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = _row_it; + _tmp5_ = _row_it; #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - row = (BackingPhotoRow*) _tmp10_; -#line 454 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = row; + row = (BackingPhotoRow*) _tmp6_; #line 454 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = info; + _tmp7_ = row; #line 454 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = backing_photo_row_matches_file_info (_tmp11_, _tmp12_); -#line 454 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp13_) { + if (backing_photo_row_matches_file_info (_tmp7_, info)) { #line 455 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _backing_photo_row_unref0 (row); #line 455 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3369,80 +3511,65 @@ static void photo_monitor_check_for_raw_development_changes (PhotoMonitor* self, _g_object_unref0 (rows); #line 455 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 3371 "PhotoMonitor.c" +#line 3513 "PhotoMonitor.c" } #line 456 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = info; -#line 456 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = g_file_info_get_name (_tmp14_); + _tmp8_ = g_file_info_get_name (info); #line 456 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = row; + _tmp9_ = row; #line 456 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = _tmp16_->filepath; + _tmp10_ = _tmp9_->filepath; #line 456 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (g_strcmp0 (_tmp15_, _tmp17_) == 0) { -#line 3383 "PhotoMonitor.c" - BackingPhotoRow* _tmp18_; - GFileInfo* _tmp19_; - gboolean _tmp20_; + if (g_strcmp0 (_tmp8_, _tmp10_) == 0) { +#line 3523 "PhotoMonitor.c" + BackingPhotoRow* _tmp11_; #line 457 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = row; + _tmp11_ = row; #line 457 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = info; -#line 457 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = backing_photo_row_is_touched (_tmp18_, _tmp19_); -#line 457 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp20_) { -#line 3395 "PhotoMonitor.c" - LibraryPhoto* _tmp21_; - LibraryPhoto* _tmp22_; -#line 458 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = photo; + if (backing_photo_row_is_touched (_tmp11_, info)) { #line 458 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_raw_development_file_info_altered (self, _tmp21_); + photo_monitor_update_raw_development_file_info_altered (self, photo); #line 459 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = photo; -#line 459 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_raw_development_file_alterations_completed (self, _tmp22_); -#line 3406 "PhotoMonitor.c" + photo_monitor_update_raw_development_file_alterations_completed (self, photo); +#line 3533 "PhotoMonitor.c" } else { - LibraryPhoto* _tmp23_; -#line 461 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = photo; #line 461 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_raw_developments (self, _tmp23_); -#line 3413 "PhotoMonitor.c" + photo_monitor_update_reimport_raw_developments (self, photo); +#line 3537 "PhotoMonitor.c" } #line 464 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _backing_photo_row_unref0 (row); #line 464 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3419 "PhotoMonitor.c" +#line 3543 "PhotoMonitor.c" } #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _backing_photo_row_unref0 (row); -#line 3423 "PhotoMonitor.c" +#line 3547 "PhotoMonitor.c" } #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_row_it); -#line 3427 "PhotoMonitor.c" +#line 3551 "PhotoMonitor.c" } #line 439 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (rows); -#line 3431 "PhotoMonitor.c" +#line 3555 "PhotoMonitor.c" } -static gboolean photo_monitor_real_notify_file_created (MediaMonitor* base, GFile* file, GFileInfo* info) { +static gboolean +photo_monitor_real_notify_file_created (MediaMonitor* base, + GFile* file, + GFileInfo* info) +{ PhotoMonitor * self; gboolean result = FALSE; LibraryPhotoSourceCollectionState state = 0; LibraryPhoto* photo = NULL; - GFile* _tmp0_; - LibraryPhotoSourceCollectionState _tmp1_ = 0; + LibraryPhotoSourceCollectionState _tmp0_ = 0; + LibraryPhoto* _tmp1_; LibraryPhoto* _tmp2_; - LibraryPhoto* _tmp3_; - LibraryPhotoSourceCollectionState _tmp4_; + LibraryPhotoSourceCollectionState _tmp3_; #line 469 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 469 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3450,29 +3577,27 @@ static gboolean photo_monitor_real_notify_file_created (MediaMonitor* base, GFil #line 469 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); #line 471 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = file; -#line 471 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo_monitor_get_photo_state_by_file (self, _tmp0_, &_tmp1_); + _tmp1_ = photo_monitor_get_photo_state_by_file (self, file, &_tmp0_); #line 471 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - state = _tmp1_; + state = _tmp0_; #line 471 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = _tmp2_; + photo = _tmp1_; #line 472 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = photo; + _tmp2_ = photo; #line 472 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 473 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result = FALSE; #line 473 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (photo); #line 473 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 3469 "PhotoMonitor.c" +#line 3594 "PhotoMonitor.c" } #line 475 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = state; + _tmp3_ = state; #line 475 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - switch (_tmp4_) { + switch (_tmp3_) { #line 475 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: #line 475 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3481,76 +3606,73 @@ static gboolean photo_monitor_real_notify_file_created (MediaMonitor* base, GFil case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: #line 475 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 3483 "PhotoMonitor.c" +#line 3608 "PhotoMonitor.c" { - GFile* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - LibraryPhotoSourceCollectionState _tmp8_; - GEnumValue* _tmp9_; -#line 481 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = file; + gchar* _tmp4_; + gchar* _tmp5_; + LibraryPhotoSourceCollectionState _tmp6_; + GEnumValue* _tmp7_; #line 481 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = g_file_get_path (_tmp5_); + _tmp4_ = g_file_get_path (file); #line 481 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 481 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = state; + _tmp6_ = state; #line 481 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp8_); + _tmp7_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp6_); #line 481 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_warning ("PhotoMonitor.vala:481: File %s created in %s state", _tmp7_, (_tmp9_ != NULL) ? _tmp9_->value_name : NULL); + g_warning ("PhotoMonitor.vala:481: File %s created in %s state", _tmp5_, (_tmp7_ != NULL) ? _tmp7_->value_name : NULL); #line 481 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp5_); #line 482 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3506 "PhotoMonitor.c" +#line 3628 "PhotoMonitor.c" } #line 475 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 3510 "PhotoMonitor.c" +#line 3632 "PhotoMonitor.c" { - LibraryPhoto* _tmp10_; + LibraryPhoto* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; gchar* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; - LibraryPhoto* _tmp15_; + LibraryPhoto* _tmp13_; #line 485 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = photo; + _tmp8_ = photo; #line 485 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); + _tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); #line 485 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 485 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = g_strdup_printf ("Will mark %s online", _tmp12_); + _tmp11_ = g_strdup_printf ("Will mark %s online", _tmp10_); #line 485 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp13_; -#line 485 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp14_); + _tmp12_ = _tmp11_; #line 485 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp14_); + media_monitor_mdbg (_tmp12_); #line 485 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_free0 (_tmp12_); +#line 485 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" + _g_free0 (_tmp10_); #line 486 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = photo; + _tmp13_ = photo; #line 486 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_online (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MONITORABLE, Monitorable)); + media_monitor_update_online (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MONITORABLE, Monitorable)); #line 487 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3540 "PhotoMonitor.c" +#line 3662 "PhotoMonitor.c" } default: { - LibraryPhotoSourceCollectionState _tmp16_; - GEnumValue* _tmp17_; + LibraryPhotoSourceCollectionState _tmp14_; + GEnumValue* _tmp15_; #line 490 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = state; + _tmp14_ = state; #line 490 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp16_); + _tmp15_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp14_); #line 490 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_error ("PhotoMonitor.vala:490: Unknown LibraryPhoto collection state %s", (_tmp17_ != NULL) ? _tmp17_->value_name : NULL); -#line 3552 "PhotoMonitor.c" + g_error ("PhotoMonitor.vala:490: Unknown LibraryPhoto collection state %s", (_tmp15_ != NULL) ? _tmp15_->value_name : NULL); +#line 3674 "PhotoMonitor.c" } } #line 493 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3559,25 +3681,28 @@ static gboolean photo_monitor_real_notify_file_created (MediaMonitor* base, GFil _g_object_unref0 (photo); #line 493 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 3561 "PhotoMonitor.c" +#line 3683 "PhotoMonitor.c" } -static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile* old_file, GFile* new_file, GFileInfo* info) { +static gboolean +photo_monitor_real_notify_file_moved (MediaMonitor* base, + GFile* old_file, + GFile* new_file, + GFileInfo* info) +{ PhotoMonitor * self; gboolean result = FALSE; LibraryPhotoSourceCollectionState old_state = 0; LibraryPhoto* old_photo = NULL; - GFile* _tmp0_; - LibraryPhotoSourceCollectionState _tmp1_ = 0; - LibraryPhoto* _tmp2_; + LibraryPhotoSourceCollectionState _tmp0_ = 0; + LibraryPhoto* _tmp1_; LibraryPhotoSourceCollectionState new_state = 0; LibraryPhoto* new_photo = NULL; - GFile* _tmp3_; - LibraryPhotoSourceCollectionState _tmp4_ = 0; + LibraryPhotoSourceCollectionState _tmp2_ = 0; + LibraryPhoto* _tmp3_; + gboolean _tmp4_ = FALSE; LibraryPhoto* _tmp5_; - gboolean _tmp6_ = FALSE; - LibraryPhoto* _tmp7_; #line 496 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 496 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3587,373 +3712,351 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile* #line 496 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); #line 498 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = old_file; -#line 498 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo_monitor_get_photo_state_by_file (self, _tmp0_, &_tmp1_); + _tmp1_ = photo_monitor_get_photo_state_by_file (self, old_file, &_tmp0_); #line 498 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - old_state = _tmp1_; + old_state = _tmp0_; #line 498 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - old_photo = _tmp2_; + old_photo = _tmp1_; #line 501 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = new_file; + _tmp3_ = photo_monitor_get_photo_state_by_file (self, new_file, &_tmp2_); #line 501 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = photo_monitor_get_photo_state_by_file (self, _tmp3_, &_tmp4_); + new_state = _tmp2_; #line 501 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - new_state = _tmp4_; -#line 501 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - new_photo = _tmp5_; + new_photo = _tmp3_; #line 515 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = old_photo; + _tmp5_ = old_photo; #line 515 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp7_ != NULL) { -#line 3608 "PhotoMonitor.c" - LibraryPhoto* _tmp8_; + if (_tmp5_ != NULL) { +#line 3729 "PhotoMonitor.c" + LibraryPhoto* _tmp6_; #line 515 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = new_photo; + _tmp6_ = new_photo; #line 515 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = _tmp8_ == NULL; -#line 3614 "PhotoMonitor.c" + _tmp4_ = _tmp6_ == NULL; +#line 3735 "PhotoMonitor.c" } else { #line 515 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = FALSE; -#line 3618 "PhotoMonitor.c" + _tmp4_ = FALSE; +#line 3739 "PhotoMonitor.c" } #line 515 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp6_) { -#line 3622 "PhotoMonitor.c" - LibraryPhotoSourceCollectionState _tmp9_; + if (_tmp4_) { +#line 3743 "PhotoMonitor.c" + LibraryPhotoSourceCollectionState _tmp7_; #line 517 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = old_state; + _tmp7_ = old_state; #line 517 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - switch (_tmp9_) { + switch (_tmp7_) { #line 517 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: #line 517 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH: #line 517 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 3634 "PhotoMonitor.c" +#line 3755 "PhotoMonitor.c" { - LibraryPhoto* _tmp10_; + LibraryPhoto* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; gchar* _tmp12_; - GFile* _tmp13_; + gchar* _tmp13_; gchar* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; - LibraryPhoto* _tmp18_; - GFile* _tmp19_; -#line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = old_photo; -#line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); + LibraryPhoto* _tmp15_; #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = _tmp11_; + _tmp8_ = old_photo; #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = new_file; + _tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = g_file_get_path (_tmp13_); + _tmp10_ = _tmp9_; #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = _tmp14_; + _tmp11_ = g_file_get_path (new_file); #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = g_strdup_printf ("Will set new master file for %s to %s", _tmp12_, _tmp15_); + _tmp12_ = _tmp11_; #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = _tmp16_; + _tmp13_ = g_strdup_printf ("Will set new master file for %s to %s", _tmp10_, _tmp12_); #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp17_); + _tmp14_ = _tmp13_; #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp17_); + media_monitor_mdbg (_tmp14_); #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp14_); #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_free0 (_tmp12_); +#line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" + _g_free0 (_tmp10_); #line 523 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = old_photo; -#line 523 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = new_file; + _tmp15_ = old_photo; #line 523 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_MONITORABLE, Monitorable), _tmp19_); + media_monitor_update_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MONITORABLE, Monitorable), new_file); #line 524 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3678 "PhotoMonitor.c" +#line 3793 "PhotoMonitor.c" } #line 517 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: -#line 3682 "PhotoMonitor.c" +#line 3797 "PhotoMonitor.c" { - LibraryPhoto* _tmp20_; + LibraryPhoto* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; gchar* _tmp21_; gchar* _tmp22_; - GFile* _tmp23_; - gchar* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; - gchar* _tmp27_; - LibraryPhoto* _tmp28_; - GFile* _tmp29_; + LibraryPhoto* _tmp23_; #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = old_photo; + _tmp16_ = old_photo; #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_OBJECT, DataObject)); + _tmp17_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject)); #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = _tmp21_; + _tmp18_ = _tmp17_; #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = new_file; + _tmp19_ = g_file_get_path (new_file); #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = g_file_get_path (_tmp23_); + _tmp20_ = _tmp19_; #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = _tmp24_; + _tmp21_ = g_strdup_printf ("Will set new editable file for %s to %s", _tmp18_, _tmp20_); #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = g_strdup_printf ("Will set new editable file for %s to %s", _tmp22_, _tmp25_); -#line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp27_ = _tmp26_; + _tmp22_ = _tmp21_; #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp27_); + media_monitor_mdbg (_tmp22_); #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp27_); + _g_free0 (_tmp22_); #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp25_); + _g_free0 (_tmp20_); #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp18_); #line 529 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp28_ = old_photo; + _tmp23_ = old_photo; #line 529 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp29_ = new_file; -#line 529 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_editable_file (self, _tmp28_, _tmp29_); + photo_monitor_update_editable_file (self, _tmp23_, new_file); #line 530 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3726 "PhotoMonitor.c" +#line 3835 "PhotoMonitor.c" } #line 517 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 3730 "PhotoMonitor.c" +#line 3839 "PhotoMonitor.c" { - LibraryPhoto* _tmp30_; - gchar* _tmp31_; - gchar* _tmp32_; - GFile* _tmp33_; - gchar* _tmp34_; - gchar* _tmp35_; - gchar* _tmp36_; - gchar* _tmp37_; - LibraryPhoto* _tmp38_; - GFile* _tmp39_; -#line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp30_ = old_photo; + LibraryPhoto* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; + gchar* _tmp30_; + LibraryPhoto* _tmp31_; #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp31_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_OBJECT, DataObject)); + _tmp24_ = old_photo; #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp32_ = _tmp31_; + _tmp25_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_OBJECT, DataObject)); #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp33_ = new_file; + _tmp26_ = _tmp25_; #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp34_ = g_file_get_path (_tmp33_); + _tmp27_ = g_file_get_path (new_file); #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp35_ = _tmp34_; + _tmp28_ = _tmp27_; #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp36_ = g_strdup_printf ("Will set new raw development file for %s to %s", _tmp32_, _tmp35_); + _tmp29_ = g_strdup_printf ("Will set new raw development file for %s to %s", _tmp26_, _tmp28_); #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp37_ = _tmp36_; + _tmp30_ = _tmp29_; #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp37_); + media_monitor_mdbg (_tmp30_); #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp37_); + _g_free0 (_tmp30_); #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp35_); + _g_free0 (_tmp28_); #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp32_); + _g_free0 (_tmp26_); #line 535 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp38_ = old_photo; + _tmp31_ = old_photo; #line 535 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp39_ = new_file; -#line 535 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_raw_development_file (self, _tmp38_, _tmp39_); + photo_monitor_update_raw_development_file (self, _tmp31_, new_file); #line 536 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3774 "PhotoMonitor.c" +#line 3877 "PhotoMonitor.c" } default: { - LibraryPhotoSourceCollectionState _tmp40_; - GEnumValue* _tmp41_; + LibraryPhotoSourceCollectionState _tmp32_; + GEnumValue* _tmp33_; #line 539 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp40_ = old_state; + _tmp32_ = old_state; #line 539 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp41_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp40_); + _tmp33_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp32_); #line 539 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_error ("PhotoMonitor.vala:539: Unknown LibraryPhoto collection state %s", (_tmp41_ != NULL) ? _tmp41_->value_name : NULL); -#line 3786 "PhotoMonitor.c" + g_error ("PhotoMonitor.vala:539: Unknown LibraryPhoto collection state %s", (_tmp33_ != NULL) ? _tmp33_->value_name : NULL); +#line 3889 "PhotoMonitor.c" } } } else { - gboolean _tmp42_ = FALSE; - LibraryPhoto* _tmp43_; + gboolean _tmp34_ = FALSE; + LibraryPhoto* _tmp35_; #line 541 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp43_ = old_photo; + _tmp35_ = old_photo; #line 541 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp43_ == NULL) { -#line 3796 "PhotoMonitor.c" - LibraryPhoto* _tmp44_; + if (_tmp35_ == NULL) { +#line 3899 "PhotoMonitor.c" + LibraryPhoto* _tmp36_; #line 541 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp44_ = new_photo; + _tmp36_ = new_photo; #line 541 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp42_ = _tmp44_ != NULL; -#line 3802 "PhotoMonitor.c" + _tmp34_ = _tmp36_ != NULL; +#line 3905 "PhotoMonitor.c" } else { #line 541 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp42_ = FALSE; -#line 3806 "PhotoMonitor.c" + _tmp34_ = FALSE; +#line 3909 "PhotoMonitor.c" } #line 541 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp42_) { -#line 3810 "PhotoMonitor.c" - LibraryPhotoSourceCollectionState _tmp45_; + if (_tmp34_) { +#line 3913 "PhotoMonitor.c" + LibraryPhotoSourceCollectionState _tmp37_; #line 543 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp45_ = new_state; + _tmp37_ = new_state; #line 543 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - switch (_tmp45_) { + switch (_tmp37_) { #line 543 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: #line 543 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH: #line 543 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 3822 "PhotoMonitor.c" +#line 3925 "PhotoMonitor.c" { - LibraryPhoto* _tmp46_; - gchar* _tmp47_; - gchar* _tmp48_; - gchar* _tmp49_; - gchar* _tmp50_; - LibraryPhoto* _tmp51_; + LibraryPhoto* _tmp38_; + gchar* _tmp39_; + gchar* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; + LibraryPhoto* _tmp43_; #line 547 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp46_ = new_photo; + _tmp38_ = new_photo; #line 547 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp47_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_DATA_OBJECT, DataObject)); + _tmp39_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_OBJECT, DataObject)); #line 547 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp48_ = _tmp47_; + _tmp40_ = _tmp39_; #line 547 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp49_ = g_strdup_printf ("Will reimport master file for %s", _tmp48_); + _tmp41_ = g_strdup_printf ("Will reimport master file for %s", _tmp40_); #line 547 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp50_ = _tmp49_; + _tmp42_ = _tmp41_; #line 547 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp50_); + media_monitor_mdbg (_tmp42_); #line 547 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp50_); + _g_free0 (_tmp42_); #line 547 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp48_); + _g_free0 (_tmp40_); #line 548 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp51_ = new_photo; + _tmp43_ = new_photo; #line 548 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_master (self, _tmp51_); + photo_monitor_update_reimport_master (self, _tmp43_); #line 549 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3852 "PhotoMonitor.c" +#line 3955 "PhotoMonitor.c" } #line 543 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: -#line 3856 "PhotoMonitor.c" +#line 3959 "PhotoMonitor.c" { - LibraryPhoto* _tmp52_; - gchar* _tmp53_; - gchar* _tmp54_; - gchar* _tmp55_; - gchar* _tmp56_; - LibraryPhoto* _tmp57_; + LibraryPhoto* _tmp44_; + gchar* _tmp45_; + gchar* _tmp46_; + gchar* _tmp47_; + gchar* _tmp48_; + LibraryPhoto* _tmp49_; #line 552 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp52_ = new_photo; + _tmp44_ = new_photo; #line 552 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp53_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_DATA_OBJECT, DataObject)); + _tmp45_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_DATA_OBJECT, DataObject)); #line 552 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp54_ = _tmp53_; + _tmp46_ = _tmp45_; #line 552 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp55_ = g_strdup_printf ("Will reimport editable file for %s", _tmp54_); + _tmp47_ = g_strdup_printf ("Will reimport editable file for %s", _tmp46_); #line 552 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp56_ = _tmp55_; + _tmp48_ = _tmp47_; #line 552 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp56_); + media_monitor_mdbg (_tmp48_); #line 552 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp56_); + _g_free0 (_tmp48_); #line 552 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp54_); + _g_free0 (_tmp46_); #line 553 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp57_ = new_photo; + _tmp49_ = new_photo; #line 553 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_editable (self, _tmp57_); + photo_monitor_update_reimport_editable (self, _tmp49_); #line 554 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3886 "PhotoMonitor.c" +#line 3989 "PhotoMonitor.c" } #line 543 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 3890 "PhotoMonitor.c" +#line 3993 "PhotoMonitor.c" { - LibraryPhoto* _tmp58_; - gchar* _tmp59_; - gchar* _tmp60_; - gchar* _tmp61_; - gchar* _tmp62_; - LibraryPhoto* _tmp63_; + LibraryPhoto* _tmp50_; + gchar* _tmp51_; + gchar* _tmp52_; + gchar* _tmp53_; + gchar* _tmp54_; + LibraryPhoto* _tmp55_; #line 557 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp58_ = new_photo; + _tmp50_ = new_photo; #line 557 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp59_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_DATA_OBJECT, DataObject)); + _tmp51_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_DATA_OBJECT, DataObject)); #line 557 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp60_ = _tmp59_; + _tmp52_ = _tmp51_; #line 557 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp61_ = g_strdup_printf ("Will reimport raw development file for %s", _tmp60_); + _tmp53_ = g_strdup_printf ("Will reimport raw development file for %s", _tmp52_); #line 557 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp62_ = _tmp61_; + _tmp54_ = _tmp53_; #line 557 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp62_); + media_monitor_mdbg (_tmp54_); #line 557 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp62_); + _g_free0 (_tmp54_); #line 557 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp60_); + _g_free0 (_tmp52_); #line 558 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp63_ = new_photo; + _tmp55_ = new_photo; #line 558 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_raw_developments (self, _tmp63_); + photo_monitor_update_reimport_raw_developments (self, _tmp55_); #line 559 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3920 "PhotoMonitor.c" +#line 4023 "PhotoMonitor.c" } default: { - LibraryPhotoSourceCollectionState _tmp64_; - GEnumValue* _tmp65_; + LibraryPhotoSourceCollectionState _tmp56_; + GEnumValue* _tmp57_; #line 562 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp64_ = new_state; + _tmp56_ = new_state; #line 562 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp65_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp64_); + _tmp57_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp56_); #line 562 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_error ("PhotoMonitor.vala:562: Unknown LibraryPhoto collection state %s", (_tmp65_ != NULL) ? _tmp65_->value_name : NULL); -#line 3932 "PhotoMonitor.c" + g_error ("PhotoMonitor.vala:562: Unknown LibraryPhoto collection state %s", (_tmp57_ != NULL) ? _tmp57_->value_name : NULL); +#line 4035 "PhotoMonitor.c" } } } else { - gboolean _tmp66_ = FALSE; - LibraryPhoto* _tmp67_; + gboolean _tmp58_ = FALSE; + LibraryPhoto* _tmp59_; #line 564 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp67_ = old_photo; + _tmp59_ = old_photo; #line 564 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp67_ == NULL) { -#line 3942 "PhotoMonitor.c" - LibraryPhoto* _tmp68_; + if (_tmp59_ == NULL) { +#line 4045 "PhotoMonitor.c" + LibraryPhoto* _tmp60_; #line 564 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp68_ = new_photo; + _tmp60_ = new_photo; #line 564 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp66_ = _tmp68_ == NULL; -#line 3948 "PhotoMonitor.c" + _tmp58_ = _tmp60_ == NULL; +#line 4051 "PhotoMonitor.c" } else { #line 564 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp66_ = FALSE; -#line 3952 "PhotoMonitor.c" + _tmp58_ = FALSE; +#line 4055 "PhotoMonitor.c" } #line 564 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp66_) { + if (_tmp58_) { #line 566 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result = FALSE; #line 566 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3962,254 +4065,254 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile* _g_object_unref0 (old_photo); #line 566 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 3964 "PhotoMonitor.c" +#line 4067 "PhotoMonitor.c" } else { - gboolean _tmp69_ = FALSE; - LibraryPhoto* _tmp70_; - LibraryPhotoSourceCollectionState _tmp72_; - LibraryPhotoSourceCollectionState _tmp87_; + gboolean _tmp61_ = FALSE; + LibraryPhoto* _tmp62_; + LibraryPhotoSourceCollectionState _tmp64_; + LibraryPhotoSourceCollectionState _tmp79_; #line 568 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp70_ = old_photo; + _tmp62_ = old_photo; #line 568 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp70_ != NULL) { -#line 3974 "PhotoMonitor.c" - LibraryPhoto* _tmp71_; + if (_tmp62_ != NULL) { +#line 4077 "PhotoMonitor.c" + LibraryPhoto* _tmp63_; #line 568 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp71_ = new_photo; + _tmp63_ = new_photo; #line 568 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp69_ = _tmp71_ != NULL; -#line 3980 "PhotoMonitor.c" + _tmp61_ = _tmp63_ != NULL; +#line 4083 "PhotoMonitor.c" } else { #line 568 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp69_ = FALSE; -#line 3984 "PhotoMonitor.c" + _tmp61_ = FALSE; +#line 4087 "PhotoMonitor.c" } #line 568 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_assert (_tmp69_, "old_photo != null && new_photo != null"); + _vala_assert (_tmp61_, "old_photo != null && new_photo != null"); #line 570 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp72_ = old_state; + _tmp64_ = old_state; #line 570 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - switch (_tmp72_) { + switch (_tmp64_) { #line 570 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: -#line 3994 "PhotoMonitor.c" +#line 4097 "PhotoMonitor.c" { - LibraryPhoto* _tmp73_; - gchar* _tmp74_; - gchar* _tmp75_; - gchar* _tmp76_; - gchar* _tmp77_; - LibraryPhoto* _tmp78_; + LibraryPhoto* _tmp65_; + gchar* _tmp66_; + gchar* _tmp67_; + gchar* _tmp68_; + gchar* _tmp69_; + LibraryPhoto* _tmp70_; #line 572 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp73_ = old_photo; + _tmp65_ = old_photo; #line 572 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp74_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_DATA_OBJECT, DataObject)); + _tmp66_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_DATA_OBJECT, DataObject)); #line 572 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp75_ = _tmp74_; + _tmp67_ = _tmp66_; #line 572 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp76_ = g_strdup_printf ("Will mark offline %s", _tmp75_); + _tmp68_ = g_strdup_printf ("Will mark offline %s", _tmp67_); #line 572 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp77_ = _tmp76_; + _tmp69_ = _tmp68_; #line 572 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp77_); + media_monitor_mdbg (_tmp69_); #line 572 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp77_); + _g_free0 (_tmp69_); #line 572 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp75_); + _g_free0 (_tmp67_); #line 573 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp78_ = old_photo; + _tmp70_ = old_photo; #line 573 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_MONITORABLE, Monitorable)); + media_monitor_update_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_MONITORABLE, Monitorable)); #line 574 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4024 "PhotoMonitor.c" +#line 4127 "PhotoMonitor.c" } #line 570 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH: #line 570 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 4030 "PhotoMonitor.c" +#line 4133 "PhotoMonitor.c" { #line 579 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4034 "PhotoMonitor.c" +#line 4137 "PhotoMonitor.c" } #line 570 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: -#line 4038 "PhotoMonitor.c" +#line 4141 "PhotoMonitor.c" { - LibraryPhoto* _tmp79_; - gchar* _tmp80_; - gchar* _tmp81_; - gchar* _tmp82_; - gchar* _tmp83_; - LibraryPhoto* _tmp84_; + LibraryPhoto* _tmp71_; + gchar* _tmp72_; + gchar* _tmp73_; + gchar* _tmp74_; + gchar* _tmp75_; + LibraryPhoto* _tmp76_; #line 582 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp79_ = old_photo; + _tmp71_ = old_photo; #line 582 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp80_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_DATA_OBJECT, DataObject)); + _tmp72_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, TYPE_DATA_OBJECT, DataObject)); #line 582 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp81_ = _tmp80_; + _tmp73_ = _tmp72_; #line 582 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp82_ = g_strdup_printf ("Will revert %s to master", _tmp81_); + _tmp74_ = g_strdup_printf ("Will revert %s to master", _tmp73_); #line 582 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp83_ = _tmp82_; + _tmp75_ = _tmp74_; #line 582 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp83_); + media_monitor_mdbg (_tmp75_); #line 582 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp83_); + _g_free0 (_tmp75_); #line 582 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp81_); + _g_free0 (_tmp73_); #line 583 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp84_ = old_photo; + _tmp76_ = old_photo; #line 583 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_revert_to_master (self, _tmp84_); + photo_monitor_update_revert_to_master (self, _tmp76_); #line 584 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4068 "PhotoMonitor.c" +#line 4171 "PhotoMonitor.c" } #line 570 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 4072 "PhotoMonitor.c" +#line 4175 "PhotoMonitor.c" { #line 588 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4076 "PhotoMonitor.c" +#line 4179 "PhotoMonitor.c" } default: { - LibraryPhotoSourceCollectionState _tmp85_; - GEnumValue* _tmp86_; + LibraryPhotoSourceCollectionState _tmp77_; + GEnumValue* _tmp78_; #line 591 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp85_ = old_state; + _tmp77_ = old_state; #line 591 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp86_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp85_); + _tmp78_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp77_); #line 591 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_error ("PhotoMonitor.vala:591: Unknown LibraryPhoto collection state %s", (_tmp86_ != NULL) ? _tmp86_->value_name : NULL); -#line 4088 "PhotoMonitor.c" + g_error ("PhotoMonitor.vala:591: Unknown LibraryPhoto collection state %s", (_tmp78_ != NULL) ? _tmp78_->value_name : NULL); +#line 4191 "PhotoMonitor.c" } } #line 594 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp87_ = new_state; + _tmp79_ = new_state; #line 594 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - switch (_tmp87_) { + switch (_tmp79_) { #line 594 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: #line 594 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH: #line 594 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 4101 "PhotoMonitor.c" +#line 4204 "PhotoMonitor.c" { - LibraryPhoto* _tmp88_; - gchar* _tmp89_; - gchar* _tmp90_; - gchar* _tmp91_; - gchar* _tmp92_; - LibraryPhoto* _tmp93_; + LibraryPhoto* _tmp80_; + gchar* _tmp81_; + gchar* _tmp82_; + gchar* _tmp83_; + gchar* _tmp84_; + LibraryPhoto* _tmp85_; #line 598 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp88_ = new_photo; + _tmp80_ = new_photo; #line 598 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp89_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_DATA_OBJECT, DataObject)); + _tmp81_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_DATA_OBJECT, DataObject)); #line 598 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp90_ = _tmp89_; + _tmp82_ = _tmp81_; #line 598 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp91_ = g_strdup_printf ("Will reimport master file for %s", _tmp90_); + _tmp83_ = g_strdup_printf ("Will reimport master file for %s", _tmp82_); #line 598 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp92_ = _tmp91_; + _tmp84_ = _tmp83_; #line 598 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp92_); + media_monitor_mdbg (_tmp84_); #line 598 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp92_); + _g_free0 (_tmp84_); #line 598 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp90_); + _g_free0 (_tmp82_); #line 599 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp93_ = new_photo; + _tmp85_ = new_photo; #line 599 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_master (self, _tmp93_); + photo_monitor_update_reimport_master (self, _tmp85_); #line 600 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4131 "PhotoMonitor.c" +#line 4234 "PhotoMonitor.c" } #line 594 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: -#line 4135 "PhotoMonitor.c" +#line 4238 "PhotoMonitor.c" { - LibraryPhoto* _tmp94_; - gchar* _tmp95_; - gchar* _tmp96_; - gchar* _tmp97_; - gchar* _tmp98_; - LibraryPhoto* _tmp99_; + LibraryPhoto* _tmp86_; + gchar* _tmp87_; + gchar* _tmp88_; + gchar* _tmp89_; + gchar* _tmp90_; + LibraryPhoto* _tmp91_; #line 603 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp94_ = new_photo; + _tmp86_ = new_photo; #line 603 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp95_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, TYPE_DATA_OBJECT, DataObject)); + _tmp87_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, TYPE_DATA_OBJECT, DataObject)); #line 603 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp96_ = _tmp95_; + _tmp88_ = _tmp87_; #line 603 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp97_ = g_strdup_printf ("Will reimport editable file for %s", _tmp96_); + _tmp89_ = g_strdup_printf ("Will reimport editable file for %s", _tmp88_); #line 603 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp98_ = _tmp97_; + _tmp90_ = _tmp89_; #line 603 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp98_); + media_monitor_mdbg (_tmp90_); #line 603 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp98_); + _g_free0 (_tmp90_); #line 603 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp96_); + _g_free0 (_tmp88_); #line 604 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp99_ = new_photo; + _tmp91_ = new_photo; #line 604 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_editable (self, _tmp99_); + photo_monitor_update_reimport_editable (self, _tmp91_); #line 605 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4165 "PhotoMonitor.c" +#line 4268 "PhotoMonitor.c" } #line 594 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 4169 "PhotoMonitor.c" +#line 4272 "PhotoMonitor.c" { - LibraryPhoto* _tmp100_; - gchar* _tmp101_; - gchar* _tmp102_; - gchar* _tmp103_; - gchar* _tmp104_; - LibraryPhoto* _tmp105_; + LibraryPhoto* _tmp92_; + gchar* _tmp93_; + gchar* _tmp94_; + gchar* _tmp95_; + gchar* _tmp96_; + LibraryPhoto* _tmp97_; #line 608 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp100_ = new_photo; + _tmp92_ = new_photo; #line 608 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp101_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, TYPE_DATA_OBJECT, DataObject)); + _tmp93_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, TYPE_DATA_OBJECT, DataObject)); #line 608 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp102_ = _tmp101_; + _tmp94_ = _tmp93_; #line 608 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp103_ = g_strdup_printf ("Will reimport raw development file for %s", _tmp102_); + _tmp95_ = g_strdup_printf ("Will reimport raw development file for %s", _tmp94_); #line 608 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp104_ = _tmp103_; + _tmp96_ = _tmp95_; #line 608 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp104_); + media_monitor_mdbg (_tmp96_); #line 608 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp104_); + _g_free0 (_tmp96_); #line 608 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp102_); + _g_free0 (_tmp94_); #line 609 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp105_ = new_photo; + _tmp97_ = new_photo; #line 609 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_raw_developments (self, _tmp105_); + photo_monitor_update_reimport_raw_developments (self, _tmp97_); #line 610 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4199 "PhotoMonitor.c" +#line 4302 "PhotoMonitor.c" } default: { - LibraryPhotoSourceCollectionState _tmp106_; - GEnumValue* _tmp107_; + LibraryPhotoSourceCollectionState _tmp98_; + GEnumValue* _tmp99_; #line 613 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp106_ = new_state; + _tmp98_ = new_state; #line 613 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp107_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp106_); + _tmp99_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp98_); #line 613 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_error ("PhotoMonitor.vala:613: Unknown LibraryPhoto collection state %s", (_tmp107_ != NULL) ? _tmp107_->value_name : NULL); -#line 4211 "PhotoMonitor.c" + g_error ("PhotoMonitor.vala:613: Unknown LibraryPhoto collection state %s", (_tmp99_ != NULL) ? _tmp99_->value_name : NULL); +#line 4314 "PhotoMonitor.c" } } } @@ -4223,180 +4326,180 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile* _g_object_unref0 (old_photo); #line 617 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 4225 "PhotoMonitor.c" +#line 4328 "PhotoMonitor.c" } -static gboolean photo_monitor_real_notify_file_altered (MediaMonitor* base, GFile* file) { +static gboolean +photo_monitor_real_notify_file_altered (MediaMonitor* base, + GFile* file) +{ PhotoMonitor * self; gboolean result = FALSE; LibraryPhotoSourceCollectionState state = 0; LibraryPhoto* photo = NULL; - GFile* _tmp0_; - LibraryPhotoSourceCollectionState _tmp1_ = 0; + LibraryPhotoSourceCollectionState _tmp0_ = 0; + LibraryPhoto* _tmp1_; LibraryPhoto* _tmp2_; - LibraryPhoto* _tmp3_; - LibraryPhotoSourceCollectionState _tmp4_; + LibraryPhotoSourceCollectionState _tmp3_; #line 620 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 620 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 622 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = file; + _tmp1_ = photo_monitor_get_photo_state_by_file (self, file, &_tmp0_); #line 622 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo_monitor_get_photo_state_by_file (self, _tmp0_, &_tmp1_); + state = _tmp0_; #line 622 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - state = _tmp1_; -#line 622 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = _tmp2_; + photo = _tmp1_; #line 623 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = photo; + _tmp2_ = photo; #line 623 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 624 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result = FALSE; #line 624 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (photo); #line 624 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 4261 "PhotoMonitor.c" +#line 4364 "PhotoMonitor.c" } #line 626 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = state; + _tmp3_ = state; #line 626 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - switch (_tmp4_) { + switch (_tmp3_) { #line 626 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: #line 626 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE: #line 626 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH: -#line 4273 "PhotoMonitor.c" +#line 4376 "PhotoMonitor.c" { - LibraryPhoto* _tmp5_; + LibraryPhoto* _tmp4_; + gchar* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; + LibraryPhoto* _tmp9_; LibraryPhoto* _tmp10_; - LibraryPhoto* _tmp11_; #line 630 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = photo; + _tmp4_ = photo; #line 630 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); + _tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject)); #line 630 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 630 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = g_strdup_printf ("Will reimport master for %s", _tmp7_); + _tmp7_ = g_strdup_printf ("Will reimport master for %s", _tmp6_); #line 630 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 630 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp9_); + media_monitor_mdbg (_tmp8_); #line 630 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp8_); #line 630 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 631 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = photo; + _tmp9_ = photo; #line 631 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_master (self, _tmp10_); + photo_monitor_update_reimport_master (self, _tmp9_); #line 632 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = photo; + _tmp10_ = photo; #line 632 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MONITORABLE, Monitorable), TRUE); + media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MONITORABLE, Monitorable), TRUE); #line 633 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4308 "PhotoMonitor.c" +#line 4411 "PhotoMonitor.c" } #line 626 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: -#line 4312 "PhotoMonitor.c" +#line 4415 "PhotoMonitor.c" { - LibraryPhoto* _tmp12_; + LibraryPhoto* _tmp11_; + gchar* _tmp12_; gchar* _tmp13_; gchar* _tmp14_; gchar* _tmp15_; - gchar* _tmp16_; + LibraryPhoto* _tmp16_; LibraryPhoto* _tmp17_; - LibraryPhoto* _tmp18_; #line 636 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = photo; + _tmp11_ = photo; #line 636 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject)); + _tmp12_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject)); #line 636 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 636 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = g_strdup_printf ("Will reimport editable for %s", _tmp14_); + _tmp14_ = g_strdup_printf ("Will reimport editable for %s", _tmp13_); #line 636 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 636 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp16_); + media_monitor_mdbg (_tmp15_); #line 636 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp15_); #line 636 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp14_); + _g_free0 (_tmp13_); #line 637 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = photo; + _tmp16_ = photo; #line 637 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_editable (self, _tmp17_); + photo_monitor_update_reimport_editable (self, _tmp16_); #line 638 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = photo; + _tmp17_ = photo; #line 638 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_editable_file_in_alteration (self, _tmp18_, TRUE); + photo_monitor_update_editable_file_in_alteration (self, _tmp17_, TRUE); #line 639 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4347 "PhotoMonitor.c" +#line 4450 "PhotoMonitor.c" } #line 626 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 4351 "PhotoMonitor.c" +#line 4454 "PhotoMonitor.c" { - LibraryPhoto* _tmp19_; + LibraryPhoto* _tmp18_; + gchar* _tmp19_; gchar* _tmp20_; gchar* _tmp21_; gchar* _tmp22_; - gchar* _tmp23_; + LibraryPhoto* _tmp23_; LibraryPhoto* _tmp24_; - LibraryPhoto* _tmp25_; #line 642 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = photo; + _tmp18_ = photo; #line 642 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_OBJECT, DataObject)); + _tmp19_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_OBJECT, DataObject)); #line 642 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = _tmp20_; + _tmp20_ = _tmp19_; #line 642 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = g_strdup_printf ("Will reimport raw development for %s", _tmp21_); + _tmp21_ = g_strdup_printf ("Will reimport raw development for %s", _tmp20_); #line 642 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = _tmp22_; + _tmp22_ = _tmp21_; #line 642 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp23_); + media_monitor_mdbg (_tmp22_); #line 642 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp23_); + _g_free0 (_tmp22_); #line 642 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp21_); + _g_free0 (_tmp20_); #line 643 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = photo; + _tmp23_ = photo; #line 643 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_raw_developments (self, _tmp24_); + photo_monitor_update_reimport_raw_developments (self, _tmp23_); #line 644 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = photo; + _tmp24_ = photo; #line 644 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_raw_development_file_in_alteration (self, _tmp25_, TRUE); + photo_monitor_update_raw_development_file_in_alteration (self, _tmp24_, TRUE); #line 645 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4386 "PhotoMonitor.c" +#line 4489 "PhotoMonitor.c" } default: { - LibraryPhotoSourceCollectionState _tmp26_; - GEnumValue* _tmp27_; + LibraryPhotoSourceCollectionState _tmp25_; + GEnumValue* _tmp26_; #line 648 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = state; + _tmp25_ = state; #line 648 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp27_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp26_); + _tmp26_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp25_); #line 648 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_error ("PhotoMonitor.vala:648: Unknown LibraryPhoto collection state %s", (_tmp27_ != NULL) ? _tmp27_->value_name : NULL); -#line 4398 "PhotoMonitor.c" + g_error ("PhotoMonitor.vala:648: Unknown LibraryPhoto collection state %s", (_tmp26_ != NULL) ? _tmp26_->value_name : NULL); +#line 4501 "PhotoMonitor.c" } } #line 651 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -4405,210 +4508,207 @@ static gboolean photo_monitor_real_notify_file_altered (MediaMonitor* base, GFil _g_object_unref0 (photo); #line 651 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 4407 "PhotoMonitor.c" +#line 4510 "PhotoMonitor.c" } -static gboolean photo_monitor_real_notify_file_attributes_altered (MediaMonitor* base, GFile* file) { +static gboolean +photo_monitor_real_notify_file_attributes_altered (MediaMonitor* base, + GFile* file) +{ PhotoMonitor * self; gboolean result = FALSE; LibraryPhotoSourceCollectionState state = 0; LibraryPhoto* photo = NULL; - GFile* _tmp0_; - LibraryPhotoSourceCollectionState _tmp1_ = 0; + LibraryPhotoSourceCollectionState _tmp0_ = 0; + LibraryPhoto* _tmp1_; LibraryPhoto* _tmp2_; - LibraryPhoto* _tmp3_; - LibraryPhotoSourceCollectionState _tmp4_; + LibraryPhotoSourceCollectionState _tmp3_; #line 654 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 654 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 656 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = file; + _tmp1_ = photo_monitor_get_photo_state_by_file (self, file, &_tmp0_); #line 656 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo_monitor_get_photo_state_by_file (self, _tmp0_, &_tmp1_); + state = _tmp0_; #line 656 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - state = _tmp1_; -#line 656 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = _tmp2_; + photo = _tmp1_; #line 657 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = photo; + _tmp2_ = photo; #line 657 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 658 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result = FALSE; #line 658 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (photo); #line 658 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 4443 "PhotoMonitor.c" +#line 4546 "PhotoMonitor.c" } #line 660 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = state; + _tmp3_ = state; #line 660 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - switch (_tmp4_) { + switch (_tmp3_) { #line 660 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: #line 660 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH: -#line 4453 "PhotoMonitor.c" +#line 4556 "PhotoMonitor.c" { - LibraryPhoto* _tmp5_; + LibraryPhoto* _tmp4_; + gchar* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; + LibraryPhoto* _tmp9_; LibraryPhoto* _tmp10_; - LibraryPhoto* _tmp11_; #line 663 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = photo; + _tmp4_ = photo; #line 663 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); + _tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject)); #line 663 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 663 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = g_strdup_printf ("Will update master file info for %s", _tmp7_); + _tmp7_ = g_strdup_printf ("Will update master file info for %s", _tmp6_); #line 663 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 663 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp9_); + media_monitor_mdbg (_tmp8_); #line 663 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp8_); #line 663 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 664 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = photo; + _tmp9_ = photo; #line 664 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_master_file_info_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MONITORABLE, Monitorable)); + media_monitor_update_master_file_info_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MONITORABLE, Monitorable)); #line 665 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = photo; + _tmp10_ = photo; #line 665 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MONITORABLE, Monitorable), TRUE); + media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MONITORABLE, Monitorable), TRUE); #line 666 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4488 "PhotoMonitor.c" +#line 4591 "PhotoMonitor.c" } #line 660 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 4492 "PhotoMonitor.c" +#line 4595 "PhotoMonitor.c" { - GFile* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; - LibraryPhotoSourceCollectionState _tmp15_; - GEnumValue* _tmp16_; - LibraryPhoto* _tmp17_; -#line 670 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = file; + gchar* _tmp11_; + gchar* _tmp12_; + LibraryPhotoSourceCollectionState _tmp13_; + GEnumValue* _tmp14_; + LibraryPhoto* _tmp15_; #line 670 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = g_file_get_path (_tmp12_); + _tmp11_ = g_file_get_path (file); #line 670 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 670 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = state; + _tmp13_ = state; #line 671 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp15_); + _tmp14_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp13_); #line 670 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_warning ("PhotoMonitor.vala:670: File %s attributes altered in %s state", _tmp14_, (_tmp16_ != NULL) ? _tmp16_->value_name : NULL); + g_warning ("PhotoMonitor.vala:670: File %s attributes altered in %s state", _tmp12_, (_tmp14_ != NULL) ? _tmp14_->value_name : NULL); #line 670 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp14_); + _g_free0 (_tmp12_); #line 672 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = photo; + _tmp15_ = photo; #line 672 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MONITORABLE, Monitorable), TRUE); + media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MONITORABLE, Monitorable), TRUE); #line 673 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4520 "PhotoMonitor.c" +#line 4620 "PhotoMonitor.c" } #line 660 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: -#line 4524 "PhotoMonitor.c" +#line 4624 "PhotoMonitor.c" { - LibraryPhoto* _tmp18_; + LibraryPhoto* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; gchar* _tmp19_; gchar* _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; - LibraryPhoto* _tmp23_; - LibraryPhoto* _tmp24_; -#line 676 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = photo; + LibraryPhoto* _tmp21_; + LibraryPhoto* _tmp22_; #line 676 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_OBJECT, DataObject)); + _tmp16_ = photo; #line 676 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = _tmp19_; + _tmp17_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject)); #line 676 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = g_strdup_printf ("Will update editable file info for %s", _tmp20_); + _tmp18_ = _tmp17_; #line 676 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = _tmp21_; + _tmp19_ = g_strdup_printf ("Will update editable file info for %s", _tmp18_); #line 676 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp22_); + _tmp20_ = _tmp19_; #line 676 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp22_); + media_monitor_mdbg (_tmp20_); #line 676 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_free0 (_tmp20_); +#line 676 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" + _g_free0 (_tmp18_); #line 677 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = photo; + _tmp21_ = photo; #line 677 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_editable_file_info_altered (self, _tmp23_); + photo_monitor_update_editable_file_info_altered (self, _tmp21_); #line 678 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = photo; + _tmp22_ = photo; #line 678 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_editable_file_in_alteration (self, _tmp24_, TRUE); + photo_monitor_update_editable_file_in_alteration (self, _tmp22_, TRUE); #line 679 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4559 "PhotoMonitor.c" +#line 4659 "PhotoMonitor.c" } #line 660 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 4563 "PhotoMonitor.c" +#line 4663 "PhotoMonitor.c" { - LibraryPhoto* _tmp25_; + LibraryPhoto* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; gchar* _tmp26_; gchar* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; - LibraryPhoto* _tmp30_; - LibraryPhoto* _tmp31_; -#line 682 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = photo; + LibraryPhoto* _tmp28_; + LibraryPhoto* _tmp29_; #line 682 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject)); + _tmp23_ = photo; #line 682 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp27_ = _tmp26_; + _tmp24_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_DATA_OBJECT, DataObject)); #line 682 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp28_ = g_strdup_printf ("Will update raw development file info for %s", _tmp27_); + _tmp25_ = _tmp24_; #line 682 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp29_ = _tmp28_; + _tmp26_ = g_strdup_printf ("Will update raw development file info for %s", _tmp25_); #line 682 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp29_); + _tmp27_ = _tmp26_; #line 682 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp29_); + media_monitor_mdbg (_tmp27_); #line 682 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_free0 (_tmp27_); +#line 682 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" + _g_free0 (_tmp25_); #line 683 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp30_ = photo; + _tmp28_ = photo; #line 683 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_raw_development_file_info_altered (self, _tmp30_); + photo_monitor_update_raw_development_file_info_altered (self, _tmp28_); #line 684 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp31_ = photo; + _tmp29_ = photo; #line 684 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_raw_development_file_in_alteration (self, _tmp31_, TRUE); + photo_monitor_update_raw_development_file_in_alteration (self, _tmp29_, TRUE); #line 685 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4598 "PhotoMonitor.c" +#line 4698 "PhotoMonitor.c" } default: { - LibraryPhotoSourceCollectionState _tmp32_; - GEnumValue* _tmp33_; + LibraryPhotoSourceCollectionState _tmp30_; + GEnumValue* _tmp31_; #line 688 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp32_ = state; + _tmp30_ = state; #line 688 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp33_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp32_); + _tmp31_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp30_); #line 688 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_error ("PhotoMonitor.vala:688: Unknown LibraryPhoto collection state %s", (_tmp33_ != NULL) ? _tmp33_->value_name : NULL); -#line 4610 "PhotoMonitor.c" + g_error ("PhotoMonitor.vala:688: Unknown LibraryPhoto collection state %s", (_tmp31_ != NULL) ? _tmp31_->value_name : NULL); +#line 4710 "PhotoMonitor.c" } } #line 691 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -4617,20 +4717,23 @@ static gboolean photo_monitor_real_notify_file_attributes_altered (MediaMonitor* _g_object_unref0 (photo); #line 691 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 4619 "PhotoMonitor.c" +#line 4719 "PhotoMonitor.c" } -static gboolean photo_monitor_real_notify_file_alteration_completed (MediaMonitor* base, GFile* file, GFileInfo* info) { +static gboolean +photo_monitor_real_notify_file_alteration_completed (MediaMonitor* base, + GFile* file, + GFileInfo* info) +{ PhotoMonitor * self; gboolean result = FALSE; LibraryPhotoSourceCollectionState state = 0; LibraryPhoto* photo = NULL; - GFile* _tmp0_; - LibraryPhotoSourceCollectionState _tmp1_ = 0; + LibraryPhotoSourceCollectionState _tmp0_ = 0; + LibraryPhoto* _tmp1_; LibraryPhoto* _tmp2_; - LibraryPhoto* _tmp3_; - LibraryPhotoSourceCollectionState _tmp4_; + LibraryPhotoSourceCollectionState _tmp3_; #line 694 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 694 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -4638,89 +4741,81 @@ static gboolean photo_monitor_real_notify_file_alteration_completed (MediaMonito #line 694 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); #line 696 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = file; -#line 696 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo_monitor_get_photo_state_by_file (self, _tmp0_, &_tmp1_); + _tmp1_ = photo_monitor_get_photo_state_by_file (self, file, &_tmp0_); #line 696 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - state = _tmp1_; + state = _tmp0_; #line 696 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = _tmp2_; + photo = _tmp1_; #line 697 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = photo; + _tmp2_ = photo; #line 697 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 698 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result = FALSE; #line 698 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (photo); #line 698 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 4657 "PhotoMonitor.c" +#line 4758 "PhotoMonitor.c" } #line 700 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = state; + _tmp3_ = state; #line 700 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - switch (_tmp4_) { + switch (_tmp3_) { #line 700 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: #line 700 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH: #line 700 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 4669 "PhotoMonitor.c" +#line 4770 "PhotoMonitor.c" { - LibraryPhoto* _tmp5_; - GFileInfo* _tmp6_; -#line 704 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = photo; + LibraryPhoto* _tmp4_; #line 704 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = info; + _tmp4_ = photo; #line 704 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_master_file_alterations_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MONITORABLE, Monitorable), _tmp6_); + media_monitor_update_master_file_alterations_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MONITORABLE, Monitorable), info); #line 705 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4681 "PhotoMonitor.c" +#line 4779 "PhotoMonitor.c" } #line 700 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: -#line 4685 "PhotoMonitor.c" +#line 4783 "PhotoMonitor.c" { - LibraryPhoto* _tmp7_; - GFileInfo* _tmp8_; -#line 708 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = photo; + LibraryPhoto* _tmp5_; #line 708 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = info; + _tmp5_ = photo; #line 708 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_editable_file_alterations_completed (self, _tmp7_, _tmp8_); + photo_monitor_update_editable_file_alterations_completed (self, _tmp5_, info); #line 709 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4697 "PhotoMonitor.c" +#line 4792 "PhotoMonitor.c" } #line 700 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 4701 "PhotoMonitor.c" +#line 4796 "PhotoMonitor.c" { - LibraryPhoto* _tmp9_; + LibraryPhoto* _tmp6_; #line 712 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = photo; + _tmp6_ = photo; #line 712 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_raw_development_file_alterations_completed (self, _tmp9_); + photo_monitor_update_raw_development_file_alterations_completed (self, _tmp6_); #line 713 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4710 "PhotoMonitor.c" +#line 4805 "PhotoMonitor.c" } default: { - LibraryPhotoSourceCollectionState _tmp10_; - GEnumValue* _tmp11_; + LibraryPhotoSourceCollectionState _tmp7_; + GEnumValue* _tmp8_; #line 716 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = state; + _tmp7_ = state; #line 716 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp10_); + _tmp8_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp7_); #line 716 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_error ("PhotoMonitor.vala:716: Unknown LibraryPhoto collection state %s", (_tmp11_ != NULL) ? _tmp11_->value_name : NULL); -#line 4722 "PhotoMonitor.c" + g_error ("PhotoMonitor.vala:716: Unknown LibraryPhoto collection state %s", (_tmp8_ != NULL) ? _tmp8_->value_name : NULL); +#line 4817 "PhotoMonitor.c" } } #line 719 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -4729,196 +4824,196 @@ static gboolean photo_monitor_real_notify_file_alteration_completed (MediaMonito _g_object_unref0 (photo); #line 719 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 4731 "PhotoMonitor.c" +#line 4826 "PhotoMonitor.c" } -static gboolean photo_monitor_real_notify_file_deleted (MediaMonitor* base, GFile* file) { +static gboolean +photo_monitor_real_notify_file_deleted (MediaMonitor* base, + GFile* file) +{ PhotoMonitor * self; gboolean result = FALSE; LibraryPhotoSourceCollectionState state = 0; LibraryPhoto* photo = NULL; - GFile* _tmp0_; - LibraryPhotoSourceCollectionState _tmp1_ = 0; + LibraryPhotoSourceCollectionState _tmp0_ = 0; + LibraryPhoto* _tmp1_; LibraryPhoto* _tmp2_; - LibraryPhoto* _tmp3_; - LibraryPhotoSourceCollectionState _tmp4_; + LibraryPhotoSourceCollectionState _tmp3_; #line 722 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 722 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 724 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = file; + _tmp1_ = photo_monitor_get_photo_state_by_file (self, file, &_tmp0_); #line 724 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo_monitor_get_photo_state_by_file (self, _tmp0_, &_tmp1_); + state = _tmp0_; #line 724 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - state = _tmp1_; -#line 724 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = _tmp2_; + photo = _tmp1_; #line 725 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = photo; + _tmp2_ = photo; #line 725 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 726 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result = FALSE; #line 726 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (photo); #line 726 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 4767 "PhotoMonitor.c" +#line 4862 "PhotoMonitor.c" } #line 728 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = state; + _tmp3_ = state; #line 728 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - switch (_tmp4_) { + switch (_tmp3_) { #line 728 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: -#line 4775 "PhotoMonitor.c" +#line 4870 "PhotoMonitor.c" { - LibraryPhoto* _tmp5_; + LibraryPhoto* _tmp4_; + gchar* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; + LibraryPhoto* _tmp9_; LibraryPhoto* _tmp10_; - LibraryPhoto* _tmp11_; #line 730 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = photo; + _tmp4_ = photo; #line 730 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); + _tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject)); #line 730 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 730 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = g_strdup_printf ("Will mark %s offline", _tmp7_); + _tmp7_ = g_strdup_printf ("Will mark %s offline", _tmp6_); #line 730 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 730 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp9_); + media_monitor_mdbg (_tmp8_); #line 730 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp8_); #line 730 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 731 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = photo; + _tmp9_ = photo; #line 731 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MONITORABLE, Monitorable)); + media_monitor_update_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MONITORABLE, Monitorable)); #line 732 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = photo; + _tmp10_ = photo; #line 732 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MONITORABLE, Monitorable), FALSE); + media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MONITORABLE, Monitorable), FALSE); #line 733 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4810 "PhotoMonitor.c" +#line 4905 "PhotoMonitor.c" } #line 728 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH: #line 728 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 4816 "PhotoMonitor.c" +#line 4911 "PhotoMonitor.c" { - LibraryPhoto* _tmp12_; + LibraryPhoto* _tmp11_; #line 738 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = photo; + _tmp11_ = photo; #line 738 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MONITORABLE, Monitorable), FALSE); + media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MONITORABLE, Monitorable), FALSE); #line 739 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4825 "PhotoMonitor.c" +#line 4920 "PhotoMonitor.c" } #line 728 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: -#line 4829 "PhotoMonitor.c" +#line 4924 "PhotoMonitor.c" { - LibraryPhoto* _tmp13_; + LibraryPhoto* _tmp12_; + gchar* _tmp13_; gchar* _tmp14_; gchar* _tmp15_; gchar* _tmp16_; - gchar* _tmp17_; + LibraryPhoto* _tmp17_; LibraryPhoto* _tmp18_; - LibraryPhoto* _tmp19_; #line 742 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = photo; + _tmp12_ = photo; #line 742 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject)); + _tmp13_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject)); #line 742 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 742 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = g_strdup_printf ("Will revert %s to master", _tmp15_); + _tmp15_ = g_strdup_printf ("Will revert %s to master", _tmp14_); #line 742 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 742 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp17_); + media_monitor_mdbg (_tmp16_); #line 742 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp16_); #line 742 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp14_); #line 743 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = photo; + _tmp17_ = photo; #line 743 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_revert_to_master (self, _tmp18_); + photo_monitor_update_revert_to_master (self, _tmp17_); #line 744 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = photo; + _tmp18_ = photo; #line 744 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_editable_file_in_alteration (self, _tmp19_, FALSE); + photo_monitor_update_editable_file_in_alteration (self, _tmp18_, FALSE); #line 745 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4864 "PhotoMonitor.c" +#line 4959 "PhotoMonitor.c" } #line 728 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 4868 "PhotoMonitor.c" +#line 4963 "PhotoMonitor.c" { - LibraryPhoto* _tmp20_; + LibraryPhoto* _tmp19_; + gchar* _tmp20_; gchar* _tmp21_; gchar* _tmp22_; gchar* _tmp23_; - gchar* _tmp24_; + LibraryPhoto* _tmp24_; LibraryPhoto* _tmp25_; LibraryPhoto* _tmp26_; - LibraryPhoto* _tmp27_; #line 748 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = photo; + _tmp19_ = photo; #line 748 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_OBJECT, DataObject)); + _tmp20_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_OBJECT, DataObject)); #line 748 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 748 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = g_strdup_printf ("Will revert %s to master", _tmp22_); + _tmp22_ = g_strdup_printf ("Will revert %s to master", _tmp21_); #line 748 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 748 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp24_); + media_monitor_mdbg (_tmp23_); #line 748 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp24_); + _g_free0 (_tmp23_); #line 748 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp21_); #line 749 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = photo; + _tmp24_ = photo; #line 749 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_revert_to_master (self, _tmp25_); + photo_monitor_update_revert_to_master (self, _tmp24_); #line 750 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = photo; + _tmp25_ = photo; #line 750 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_editable_file_in_alteration (self, _tmp26_, FALSE); + photo_monitor_update_editable_file_in_alteration (self, _tmp25_, FALSE); #line 751 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp27_ = photo; + _tmp26_ = photo; #line 751 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_raw_development_file_in_alteration (self, _tmp27_, FALSE); + photo_monitor_update_raw_development_file_in_alteration (self, _tmp26_, FALSE); #line 752 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4908 "PhotoMonitor.c" +#line 5003 "PhotoMonitor.c" } default: { - LibraryPhotoSourceCollectionState _tmp28_; - GEnumValue* _tmp29_; + LibraryPhotoSourceCollectionState _tmp27_; + GEnumValue* _tmp28_; #line 755 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp28_ = state; + _tmp27_ = state; #line 755 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp29_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp28_); + _tmp28_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp27_); #line 755 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_error ("PhotoMonitor.vala:755: Unknown LibraryPhoto collection state %s", (_tmp29_ != NULL) ? _tmp29_->value_name : NULL); -#line 4920 "PhotoMonitor.c" + g_error ("PhotoMonitor.vala:755: Unknown LibraryPhoto collection state %s", (_tmp28_ != NULL) ? _tmp28_->value_name : NULL); +#line 5015 "PhotoMonitor.c" } } #line 758 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -4927,40 +5022,40 @@ static gboolean photo_monitor_real_notify_file_deleted (MediaMonitor* base, GFil _g_object_unref0 (photo); #line 758 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 4929 "PhotoMonitor.c" +#line 5024 "PhotoMonitor.c" } -static void photo_monitor_real_on_media_source_destroyed (MediaMonitor* base, DataSource* source) { +static void +photo_monitor_real_on_media_source_destroyed (MediaMonitor* base, + DataSource* source) +{ PhotoMonitor * self; - DataSource* _tmp0_; - DataSource* _tmp1_; #line 761 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 761 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 762 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = source; -#line 762 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - MEDIA_MONITOR_CLASS (photo_monitor_parent_class)->on_media_source_destroyed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), _tmp0_); -#line 764 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = source; + MEDIA_MONITOR_CLASS (photo_monitor_parent_class)->on_media_source_destroyed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), source); #line 764 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_cancel_reimports (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 4949 "PhotoMonitor.c" + photo_monitor_cancel_reimports (self, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_LIBRARY_PHOTO, LibraryPhoto)); +#line 5041 "PhotoMonitor.c" } -static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self, GFile* file, LibraryPhotoSourceCollectionState* state) { +static LibraryPhoto* +photo_monitor_get_photo_state_by_file (PhotoMonitor* self, + GFile* file, + LibraryPhotoSourceCollectionState* state) +{ LibraryPhotoSourceCollectionState _vala_state = 0; LibraryPhoto* result = NULL; GFile* real_file = NULL; - gboolean _tmp0_; - GFile* _tmp70_ = NULL; - GFile* _tmp71_; - LibraryPhotoSourceCollection* _tmp73_; - LibraryPhotoSourceCollectionState _tmp74_ = 0; - LibraryPhoto* _tmp75_; + GFile* _tmp58_ = NULL; + GFile* _tmp59_; + LibraryPhotoSourceCollection* _tmp60_; + LibraryPhotoSourceCollectionState _tmp61_ = 0; + LibraryPhoto* _tmp62_; #line 767 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_PHOTO_MONITOR (self), NULL); #line 767 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -4968,89 +5063,84 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self, #line 768 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" real_file = NULL; #line 769 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = media_monitor_has_pending_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor)); -#line 769 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp0_) { -#line 4973 "PhotoMonitor.c" + if (media_monitor_has_pending_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor))) { +#line 5066 "PhotoMonitor.c" { GeeIterator* _monitorable_it = NULL; + GeeCollection* _tmp0_; GeeCollection* _tmp1_; - GeeCollection* _tmp2_; + GeeIterator* _tmp2_; GeeIterator* _tmp3_; - GeeIterator* _tmp4_; #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = media_monitor_get_monitorables (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor)); + _tmp0_ = media_monitor_get_monitorables (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor)); #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_it = _tmp4_; + _monitorable_it = _tmp3_; #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 4994 "PhotoMonitor.c" - GeeIterator* _tmp5_; - gboolean _tmp6_; +#line 5087 "PhotoMonitor.c" + GeeIterator* _tmp4_; Monitorable* monitorable = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; + GeeIterator* _tmp5_; + gpointer _tmp6_; LibraryPhoto* photo = NULL; - Monitorable* _tmp9_; - LibraryPhoto* _tmp10_; + Monitorable* _tmp7_; + LibraryPhoto* _tmp8_; PhotoUpdates* updates = NULL; - LibraryPhoto* _tmp11_; - PhotoUpdates* _tmp12_; + LibraryPhoto* _tmp9_; + PhotoUpdates* _tmp10_; + PhotoUpdates* _tmp11_; + gboolean _tmp12_ = FALSE; PhotoUpdates* _tmp13_; - gboolean _tmp14_ = FALSE; - PhotoUpdates* _tmp15_; - GFile* _tmp16_; - GFile* _tmp17_; - gboolean _tmp18_; - gboolean _tmp26_ = FALSE; - PhotoUpdates* _tmp27_; - GFile* _tmp28_; - GFile* _tmp29_; - gboolean _tmp30_; - PhotoUpdates* _tmp39_; - GeeCollection* _tmp40_; - GeeCollection* _tmp41_; - gboolean _tmp42_; -#line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = _monitorable_it; + GFile* _tmp14_; + GFile* _tmp15_; + gboolean _tmp16_; + gboolean _tmp22_ = FALSE; + PhotoUpdates* _tmp23_; + GFile* _tmp24_; + GFile* _tmp25_; + gboolean _tmp26_; + PhotoUpdates* _tmp33_; + GeeCollection* _tmp34_; + GeeCollection* _tmp35_; + gboolean _tmp36_; #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = gee_iterator_next (_tmp5_); + _tmp4_ = _monitorable_it; #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp4_)) { #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 5029 "PhotoMonitor.c" +#line 5119 "PhotoMonitor.c" } #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = _monitorable_it; + _tmp5_ = _monitorable_it; #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - monitorable = (Monitorable*) _tmp8_; + monitorable = (Monitorable*) _tmp6_; #line 771 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = monitorable; + _tmp7_ = monitorable; #line 771 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 771 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = _tmp10_; + photo = _tmp8_; #line 773 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = photo; + _tmp9_ = photo; #line 773 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = photo_monitor_get_existing_photo_updates (self, _tmp11_); + _tmp10_ = photo_monitor_get_existing_photo_updates (self, _tmp9_); #line 773 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - updates = _tmp12_; + updates = _tmp10_; #line 774 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = updates; + _tmp11_ = updates; #line 774 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp13_ == NULL) { + if (_tmp11_ == NULL) { #line 775 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _monitorable_updates_unref0 (updates); #line 775 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -5059,59 +5149,53 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self, _g_object_unref0 (monitorable); #line 775 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" continue; -#line 5061 "PhotoMonitor.c" +#line 5151 "PhotoMonitor.c" } #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = updates; -#line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = monitorable_updates_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); -#line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = _tmp16_; + _tmp13_ = updates; #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = _tmp17_ != NULL; + _tmp14_ = monitorable_updates_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp17_); + _tmp15_ = _tmp14_; #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp18_) { -#line 5075 "PhotoMonitor.c" - PhotoUpdates* _tmp19_; - GFile* _tmp20_; - GFile* _tmp21_; - GFile* _tmp22_; - gboolean _tmp23_; + _tmp16_ = _tmp15_ != NULL; #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = updates; + _g_object_unref0 (_tmp15_); #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = monitorable_updates_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); + if (_tmp16_) { +#line 5165 "PhotoMonitor.c" + PhotoUpdates* _tmp17_; + GFile* _tmp18_; + GFile* _tmp19_; #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = _tmp20_; + _tmp17_ = updates; #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = file; + _tmp18_ = monitorable_updates_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = g_file_equal (_tmp21_, _tmp22_); + _tmp19_ = _tmp18_; #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp23_; + _tmp12_ = g_file_equal (_tmp19_, file); #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp21_); -#line 5095 "PhotoMonitor.c" + _g_object_unref0 (_tmp19_); +#line 5179 "PhotoMonitor.c" } else { #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = FALSE; -#line 5099 "PhotoMonitor.c" + _tmp12_ = FALSE; +#line 5183 "PhotoMonitor.c" } #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp14_) { -#line 5103 "PhotoMonitor.c" - LibraryPhoto* _tmp24_; - GFile* _tmp25_; + if (_tmp12_) { +#line 5187 "PhotoMonitor.c" + LibraryPhoto* _tmp20_; + GFile* _tmp21_; #line 778 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = photo; + _tmp20_ = photo; #line 778 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp21_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_MEDIA_SOURCE, MediaSource)); #line 778 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (real_file); #line 778 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - real_file = _tmp25_; + real_file = _tmp21_; #line 780 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _monitorable_updates_unref0 (updates); #line 780 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -5120,64 +5204,58 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self, _g_object_unref0 (monitorable); #line 780 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 5122 "PhotoMonitor.c" +#line 5206 "PhotoMonitor.c" } #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp27_ = updates; -#line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp28_ = photo_updates_get_editable_file (_tmp27_); + _tmp23_ = updates; #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp29_ = _tmp28_; + _tmp24_ = photo_updates_get_editable_file (_tmp23_); #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp30_ = _tmp29_ != NULL; -#line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp29_); + _tmp25_ = _tmp24_; #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp30_) { -#line 5136 "PhotoMonitor.c" - PhotoUpdates* _tmp31_; - GFile* _tmp32_; - GFile* _tmp33_; - GFile* _tmp34_; - gboolean _tmp35_; + _tmp26_ = _tmp25_ != NULL; #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp31_ = updates; + _g_object_unref0 (_tmp25_); #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp32_ = photo_updates_get_editable_file (_tmp31_); + if (_tmp26_) { +#line 5220 "PhotoMonitor.c" + PhotoUpdates* _tmp27_; + GFile* _tmp28_; + GFile* _tmp29_; #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp33_ = _tmp32_; + _tmp27_ = updates; #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp34_ = file; + _tmp28_ = photo_updates_get_editable_file (_tmp27_); #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp35_ = g_file_equal (_tmp33_, _tmp34_); + _tmp29_ = _tmp28_; #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = _tmp35_; + _tmp22_ = g_file_equal (_tmp29_, file); #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp33_); -#line 5156 "PhotoMonitor.c" + _g_object_unref0 (_tmp29_); +#line 5234 "PhotoMonitor.c" } else { #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = FALSE; -#line 5160 "PhotoMonitor.c" + _tmp22_ = FALSE; +#line 5238 "PhotoMonitor.c" } #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp26_) { -#line 5164 "PhotoMonitor.c" - LibraryPhoto* _tmp36_; - GFile* _tmp37_; - GFile* _tmp38_; + if (_tmp22_) { +#line 5242 "PhotoMonitor.c" + LibraryPhoto* _tmp30_; + GFile* _tmp31_; + GFile* _tmp32_; #line 784 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp36_ = photo; + _tmp30_ = photo; #line 784 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp37_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_PHOTO, Photo)); + _tmp31_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_PHOTO, Photo)); #line 784 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (real_file); #line 784 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - real_file = _tmp37_; + real_file = _tmp31_; #line 788 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp38_ = real_file; + _tmp32_ = real_file; #line 788 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp38_ == NULL) { + if (_tmp32_ == NULL) { #line 789 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE; #line 791 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -5194,11 +5272,11 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self, if (state) { #line 791 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *state = _vala_state; -#line 5196 "PhotoMonitor.c" +#line 5274 "PhotoMonitor.c" } #line 791 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 5200 "PhotoMonitor.c" +#line 5278 "PhotoMonitor.c" } #line 794 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _monitorable_updates_unref0 (updates); @@ -5208,189 +5286,171 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self, _g_object_unref0 (monitorable); #line 794 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 5210 "PhotoMonitor.c" +#line 5288 "PhotoMonitor.c" } #line 797 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp39_ = updates; + _tmp33_ = updates; #line 797 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp40_ = photo_updates_get_raw_developer_files (_tmp39_); + _tmp34_ = photo_updates_get_raw_developer_files (_tmp33_); #line 797 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp41_ = _tmp40_; + _tmp35_ = _tmp34_; #line 797 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp42_ = _tmp41_ != NULL; + _tmp36_ = _tmp35_ != NULL; #line 797 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp41_); + _g_object_unref0 (_tmp35_); #line 797 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp42_) { -#line 5224 "PhotoMonitor.c" + if (_tmp36_) { +#line 5302 "PhotoMonitor.c" gboolean found = FALSE; - gboolean _tmp55_; + gboolean _tmp46_; #line 798 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" found = FALSE; -#line 5229 "PhotoMonitor.c" +#line 5307 "PhotoMonitor.c" { GeeIterator* _raw_it = NULL; - PhotoUpdates* _tmp43_; - GeeCollection* _tmp44_; - GeeCollection* _tmp45_; - GeeIterator* _tmp46_; - GeeIterator* _tmp47_; + PhotoUpdates* _tmp37_; + GeeCollection* _tmp38_; + GeeCollection* _tmp39_; + GeeIterator* _tmp40_; + GeeIterator* _tmp41_; #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp43_ = updates; + _tmp37_ = updates; #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp44_ = photo_updates_get_raw_developer_files (_tmp43_); + _tmp38_ = photo_updates_get_raw_developer_files (_tmp37_); #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp45_ = _tmp44_; + _tmp39_ = _tmp38_; #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp46_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp40_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ITERABLE, GeeIterable)); #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp47_ = _tmp46_; + _tmp41_ = _tmp40_; #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp45_); + _g_object_unref0 (_tmp39_); #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _raw_it = _tmp47_; + _raw_it = _tmp41_; #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 5253 "PhotoMonitor.c" - GeeIterator* _tmp48_; - gboolean _tmp49_; +#line 5331 "PhotoMonitor.c" + GeeIterator* _tmp42_; GFile* raw = NULL; - GeeIterator* _tmp50_; - gpointer _tmp51_; - GFile* _tmp52_; - GFile* _tmp53_; - gboolean _tmp54_; -#line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp48_ = _raw_it; + GeeIterator* _tmp43_; + gpointer _tmp44_; + GFile* _tmp45_; #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp49_ = gee_iterator_next (_tmp48_); + _tmp42_ = _raw_it; #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp49_) { + if (!gee_iterator_next (_tmp42_)) { #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 5270 "PhotoMonitor.c" +#line 5343 "PhotoMonitor.c" } #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp50_ = _raw_it; + _tmp43_ = _raw_it; #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp51_ = gee_iterator_get (_tmp50_); + _tmp44_ = gee_iterator_get (_tmp43_); #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - raw = (GFile*) _tmp51_; -#line 800 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp52_ = raw; -#line 800 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp53_ = file; + raw = (GFile*) _tmp44_; #line 800 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp54_ = g_file_equal (_tmp52_, _tmp53_); + _tmp45_ = raw; #line 800 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp54_) { + if (g_file_equal (_tmp45_, file)) { #line 801 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" found = TRUE; #line 803 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (raw); #line 803 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 5292 "PhotoMonitor.c" +#line 5361 "PhotoMonitor.c" } #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (raw); -#line 5296 "PhotoMonitor.c" +#line 5365 "PhotoMonitor.c" } #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_raw_it); -#line 5300 "PhotoMonitor.c" +#line 5369 "PhotoMonitor.c" } #line 807 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp55_ = found; + _tmp46_ = found; #line 807 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp55_) { -#line 5306 "PhotoMonitor.c" + if (_tmp46_) { +#line 5375 "PhotoMonitor.c" GeeCollection* developed = NULL; - LibraryPhoto* _tmp56_; - GeeCollection* _tmp57_; - GeeCollection* _tmp58_; + LibraryPhoto* _tmp47_; + GeeCollection* _tmp48_; + GeeCollection* _tmp49_; #line 808 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp56_ = photo; + _tmp47_ = photo; #line 808 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp57_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PHOTO, Photo)); + _tmp48_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO, Photo)); #line 808 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - developed = _tmp57_; + developed = _tmp48_; #line 809 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp58_ = developed; + _tmp49_ = developed; #line 809 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp58_ != NULL) { -#line 5321 "PhotoMonitor.c" + if (_tmp49_ != NULL) { +#line 5390 "PhotoMonitor.c" { GeeIterator* _f_it = NULL; - GeeCollection* _tmp59_; - GeeIterator* _tmp60_; + GeeCollection* _tmp50_; + GeeIterator* _tmp51_; #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp59_ = developed; + _tmp50_ = developed; #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp60_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp51_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ITERABLE, GeeIterable)); #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _f_it = _tmp60_; + _f_it = _tmp51_; #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 5334 "PhotoMonitor.c" - GeeIterator* _tmp61_; - gboolean _tmp62_; +#line 5403 "PhotoMonitor.c" + GeeIterator* _tmp52_; GFile* f = NULL; - GeeIterator* _tmp63_; - gpointer _tmp64_; - GFile* _tmp65_; - GFile* _tmp66_; - gboolean _tmp67_; + GeeIterator* _tmp53_; + gpointer _tmp54_; + GFile* _tmp55_; #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp61_ = _f_it; + _tmp52_ = _f_it; #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp62_ = gee_iterator_next (_tmp61_); -#line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp62_) { + if (!gee_iterator_next (_tmp52_)) { #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 5351 "PhotoMonitor.c" +#line 5415 "PhotoMonitor.c" } #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp63_ = _f_it; + _tmp53_ = _f_it; #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp64_ = gee_iterator_get (_tmp63_); + _tmp54_ = gee_iterator_get (_tmp53_); #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - f = (GFile*) _tmp64_; -#line 811 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp65_ = f; -#line 811 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp66_ = file; + f = (GFile*) _tmp54_; #line 811 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp67_ = g_file_equal (_tmp65_, _tmp66_); + _tmp55_ = f; #line 811 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp67_) { -#line 5367 "PhotoMonitor.c" - GFile* _tmp68_; - GFile* _tmp69_; + if (g_file_equal (_tmp55_, file)) { +#line 5427 "PhotoMonitor.c" + GFile* _tmp56_; + GFile* _tmp57_; #line 812 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp68_ = f; + _tmp56_ = f; #line 812 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp69_ = _g_object_ref0 (_tmp68_); + _tmp57_ = _g_object_ref0 (_tmp56_); #line 812 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (real_file); #line 812 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - real_file = _tmp69_; + real_file = _tmp57_; #line 813 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER; #line 815 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (f); #line 815 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 5384 "PhotoMonitor.c" +#line 5444 "PhotoMonitor.c" } #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (f); -#line 5388 "PhotoMonitor.c" +#line 5448 "PhotoMonitor.c" } #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_f_it); -#line 5392 "PhotoMonitor.c" +#line 5452 "PhotoMonitor.c" } } #line 821 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -5403,7 +5463,7 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self, _g_object_unref0 (monitorable); #line 821 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 5405 "PhotoMonitor.c" +#line 5465 "PhotoMonitor.c" } } #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -5412,414 +5472,379 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self, _g_object_unref0 (photo); #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (monitorable); -#line 5414 "PhotoMonitor.c" +#line 5474 "PhotoMonitor.c" } #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_monitorable_it); -#line 5418 "PhotoMonitor.c" +#line 5478 "PhotoMonitor.c" } } #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp71_ = real_file; -#line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp70_ = _tmp71_; + _tmp59_ = real_file; #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp70_ == NULL) { -#line 5427 "PhotoMonitor.c" - GFile* _tmp72_; + _tmp58_ = _tmp59_; #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp72_ = file; + if (_tmp58_ == NULL) { #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp70_ = _tmp72_; -#line 5433 "PhotoMonitor.c" + _tmp58_ = file; +#line 5489 "PhotoMonitor.c" } #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp73_ = library_photo_global; + _tmp60_ = library_photo_global; #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp75_ = library_photo_source_collection_get_state_by_file (_tmp73_, _tmp70_, &_tmp74_); + _tmp62_ = library_photo_source_collection_get_state_by_file (_tmp60_, _tmp58_, &_tmp61_); #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_state = _tmp74_; + _vala_state = _tmp61_; #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - result = _tmp75_; + result = _tmp62_; #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (real_file); #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (state) { #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *state = _vala_state; -#line 5449 "PhotoMonitor.c" +#line 5505 "PhotoMonitor.c" } #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 5453 "PhotoMonitor.c" +#line 5509 "PhotoMonitor.c" } -PhotoUpdates* photo_monitor_fetch_photo_updates (PhotoMonitor* self, LibraryPhoto* photo) { +PhotoUpdates* +photo_monitor_fetch_photo_updates (PhotoMonitor* self, + LibraryPhoto* photo) +{ PhotoUpdates* result = NULL; - LibraryPhoto* _tmp0_; - MonitorableUpdates* _tmp1_; + MonitorableUpdates* _tmp0_; #line 830 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_PHOTO_MONITOR (self), NULL); #line 830 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO (photo), NULL); #line 831 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; + _tmp0_ = media_monitor_fetch_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MONITORABLE, Monitorable)); #line 831 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = media_monitor_fetch_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MONITORABLE, Monitorable)); -#line 831 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_UPDATES, PhotoUpdates); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_UPDATES, PhotoUpdates); #line 831 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 5473 "PhotoMonitor.c" +#line 5529 "PhotoMonitor.c" } -PhotoUpdates* photo_monitor_get_existing_photo_updates (PhotoMonitor* self, LibraryPhoto* photo) { +PhotoUpdates* +photo_monitor_get_existing_photo_updates (PhotoMonitor* self, + LibraryPhoto* photo) +{ PhotoUpdates* result = NULL; - LibraryPhoto* _tmp0_; - MonitorableUpdates* _tmp1_; - PhotoUpdates* _tmp2_; + MonitorableUpdates* _tmp0_; + PhotoUpdates* _tmp1_; #line 834 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_PHOTO_MONITOR (self), NULL); #line 834 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO (photo), NULL); #line 835 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; + _tmp0_ = media_monitor_get_existing_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MONITORABLE, Monitorable)); #line 835 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = media_monitor_get_existing_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MONITORABLE, Monitorable)); + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO_UPDATES) ? ((PhotoUpdates*) _tmp0_) : NULL; #line 835 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_PHOTO_UPDATES) ? ((PhotoUpdates*) _tmp1_) : NULL; + if (_tmp1_ == NULL) { #line 835 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp2_ == NULL) { -#line 835 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp1_); -#line 5496 "PhotoMonitor.c" + _monitorable_updates_unref0 (_tmp0_); +#line 5552 "PhotoMonitor.c" } #line 835 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - result = _tmp2_; + result = _tmp1_; #line 835 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 5502 "PhotoMonitor.c" +#line 5558 "PhotoMonitor.c" } -void photo_monitor_update_reimport_master (PhotoMonitor* self, LibraryPhoto* photo) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_reimport_master (PhotoMonitor* self, + LibraryPhoto* photo) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; - GeeHashMap* _tmp3_; - LibraryPhoto* _tmp4_; - gboolean _tmp5_; + GeeHashMap* _tmp2_; #line 838 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 838 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 839 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 839 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); -#line 839 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 839 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_reimport_master (_tmp2_, TRUE); + photo_updates_set_reimport_master (_tmp1_, TRUE); #line 839 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); + _monitorable_updates_unref0 (_tmp1_); #line 842 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = self->priv->master_reimport_pending; -#line 842 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = photo; -#line 842 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp2_ = self->priv->master_reimport_pending; #line 842 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp5_) { -#line 5535 "PhotoMonitor.c" - GeeHashMap* _tmp6_; - LibraryPhoto* _tmp7_; - gpointer _tmp8_; - PhotoMonitorReimportMasterJob* _tmp9_; -#line 843 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = self->priv->master_reimport_pending; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo)) { +#line 5585 "PhotoMonitor.c" + GeeHashMap* _tmp3_; + gpointer _tmp4_; + PhotoMonitorReimportMasterJob* _tmp5_; #line 843 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = photo; + _tmp3_ = self->priv->master_reimport_pending; #line 843 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_); + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo); #line 843 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = (PhotoMonitorReimportMasterJob*) _tmp8_; + _tmp5_ = (PhotoMonitorReimportMasterJob*) _tmp4_; #line 843 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_BACKGROUND_JOB, BackgroundJob)); + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 843 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _background_job_unref0 (_tmp9_); -#line 5552 "PhotoMonitor.c" + _background_job_unref0 (_tmp5_); +#line 5599 "PhotoMonitor.c" } } -void photo_monitor_update_reimport_editable (PhotoMonitor* self, LibraryPhoto* photo) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_reimport_editable (PhotoMonitor* self, + LibraryPhoto* photo) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; - GeeHashMap* _tmp3_; - LibraryPhoto* _tmp4_; - gboolean _tmp5_; + GeeHashMap* _tmp2_; #line 846 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 846 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 847 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 847 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); -#line 847 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 847 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_reimport_editable (_tmp2_, TRUE); + photo_updates_set_reimport_editable (_tmp1_, TRUE); #line 847 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); + _monitorable_updates_unref0 (_tmp1_); #line 850 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = self->priv->editable_reimport_pending; -#line 850 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = photo; -#line 850 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp2_ = self->priv->editable_reimport_pending; #line 850 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp5_) { -#line 5586 "PhotoMonitor.c" - GeeHashMap* _tmp6_; - LibraryPhoto* _tmp7_; - gpointer _tmp8_; - PhotoMonitorReimportEditableJob* _tmp9_; -#line 851 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = self->priv->editable_reimport_pending; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo)) { +#line 5627 "PhotoMonitor.c" + GeeHashMap* _tmp3_; + gpointer _tmp4_; + PhotoMonitorReimportEditableJob* _tmp5_; #line 851 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = photo; + _tmp3_ = self->priv->editable_reimport_pending; #line 851 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_); + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo); #line 851 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = (PhotoMonitorReimportEditableJob*) _tmp8_; + _tmp5_ = (PhotoMonitorReimportEditableJob*) _tmp4_; #line 851 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_BACKGROUND_JOB, BackgroundJob)); + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 851 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _background_job_unref0 (_tmp9_); -#line 5603 "PhotoMonitor.c" + _background_job_unref0 (_tmp5_); +#line 5641 "PhotoMonitor.c" } } -void photo_monitor_update_reimport_raw_developments (PhotoMonitor* self, LibraryPhoto* photo) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_reimport_raw_developments (PhotoMonitor* self, + LibraryPhoto* photo) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; - GeeHashMap* _tmp3_; - LibraryPhoto* _tmp4_; - gboolean _tmp5_; + GeeHashMap* _tmp2_; #line 854 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 854 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 855 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; -#line 855 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 855 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 855 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_reimport_raw_developments (_tmp2_, TRUE); + photo_updates_set_reimport_raw_developments (_tmp1_, TRUE); #line 855 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 858 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = self->priv->raw_developments_reimport_pending; + _monitorable_updates_unref0 (_tmp1_); #line 858 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = photo; -#line 858 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp2_ = self->priv->raw_developments_reimport_pending; #line 858 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp5_) { -#line 5637 "PhotoMonitor.c" - GeeHashMap* _tmp6_; - LibraryPhoto* _tmp7_; - gpointer _tmp8_; - PhotoMonitorReimportRawDevelopmentJob* _tmp9_; -#line 859 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = self->priv->raw_developments_reimport_pending; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo)) { +#line 5669 "PhotoMonitor.c" + GeeHashMap* _tmp3_; + gpointer _tmp4_; + PhotoMonitorReimportRawDevelopmentJob* _tmp5_; #line 859 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = photo; + _tmp3_ = self->priv->raw_developments_reimport_pending; #line 859 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_); + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo); #line 859 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = (PhotoMonitorReimportRawDevelopmentJob*) _tmp8_; + _tmp5_ = (PhotoMonitorReimportRawDevelopmentJob*) _tmp4_; #line 859 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_BACKGROUND_JOB, BackgroundJob)); + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 859 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _background_job_unref0 (_tmp9_); -#line 5654 "PhotoMonitor.c" + _background_job_unref0 (_tmp5_); +#line 5683 "PhotoMonitor.c" } } -GFile* photo_monitor_get_editable_file (PhotoMonitor* self, LibraryPhoto* photo) { +GFile* +photo_monitor_get_editable_file (PhotoMonitor* self, + LibraryPhoto* photo) +{ GFile* result = NULL; PhotoUpdates* updates = NULL; - LibraryPhoto* _tmp0_; - PhotoUpdates* _tmp1_; - GFile* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - PhotoUpdates* _tmp4_; + PhotoUpdates* _tmp0_; + GFile* _tmp1_ = NULL; + gboolean _tmp2_ = FALSE; + PhotoUpdates* _tmp3_; #line 862 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_PHOTO_MONITOR (self), NULL); #line 862 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO (photo), NULL); #line 863 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; + _tmp0_ = photo_monitor_get_existing_photo_updates (self, photo); #line 863 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_get_existing_photo_updates (self, _tmp0_); -#line 863 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - updates = _tmp1_; + updates = _tmp0_; #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = updates; + _tmp3_ = updates; #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp4_ != NULL) { -#line 5681 "PhotoMonitor.c" - PhotoUpdates* _tmp5_; + if (_tmp3_ != NULL) { +#line 5710 "PhotoMonitor.c" + PhotoUpdates* _tmp4_; + GFile* _tmp5_; GFile* _tmp6_; - GFile* _tmp7_; #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = updates; + _tmp4_ = updates; #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = photo_updates_get_editable_file (_tmp5_); + _tmp5_ = photo_updates_get_editable_file (_tmp4_); #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = _tmp7_ != NULL; + _tmp2_ = _tmp6_ != NULL; #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp7_); -#line 5695 "PhotoMonitor.c" + _g_object_unref0 (_tmp6_); +#line 5724 "PhotoMonitor.c" } else { #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = FALSE; -#line 5699 "PhotoMonitor.c" + _tmp2_ = FALSE; +#line 5728 "PhotoMonitor.c" } #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp3_) { -#line 5703 "PhotoMonitor.c" - PhotoUpdates* _tmp8_; - GFile* _tmp9_; + if (_tmp2_) { +#line 5732 "PhotoMonitor.c" + PhotoUpdates* _tmp7_; + GFile* _tmp8_; #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = updates; + _tmp7_ = updates; #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = photo_updates_get_editable_file (_tmp8_); + _tmp8_ = photo_updates_get_editable_file (_tmp7_); #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp9_; -#line 5714 "PhotoMonitor.c" + _tmp1_ = _tmp8_; +#line 5743 "PhotoMonitor.c" } else { - LibraryPhoto* _tmp10_; - GFile* _tmp11_; -#line 866 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = photo; + GFile* _tmp9_; #line 866 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PHOTO, Photo)); + _tmp9_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo)); #line 866 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 866 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp11_; -#line 5726 "PhotoMonitor.c" + _tmp1_ = _tmp9_; +#line 5752 "PhotoMonitor.c" } #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - result = _tmp2_; + result = _tmp1_; #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _monitorable_updates_unref0 (updates); #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 5734 "PhotoMonitor.c" +#line 5760 "PhotoMonitor.c" } -GeeCollection* photo_monitor_get_raw_development_files (PhotoMonitor* self, LibraryPhoto* photo) { +GeeCollection* +photo_monitor_get_raw_development_files (PhotoMonitor* self, + LibraryPhoto* photo) +{ GeeCollection* result = NULL; PhotoUpdates* updates = NULL; - LibraryPhoto* _tmp0_; - PhotoUpdates* _tmp1_; - GeeCollection* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - PhotoUpdates* _tmp4_; + PhotoUpdates* _tmp0_; + GeeCollection* _tmp1_ = NULL; + gboolean _tmp2_ = FALSE; + PhotoUpdates* _tmp3_; #line 869 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_PHOTO_MONITOR (self), NULL); #line 869 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO (photo), NULL); #line 870 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; + _tmp0_ = photo_monitor_get_existing_photo_updates (self, photo); #line 870 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_get_existing_photo_updates (self, _tmp0_); -#line 870 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - updates = _tmp1_; + updates = _tmp0_; #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = updates; + _tmp3_ = updates; #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp4_ != NULL) { -#line 5760 "PhotoMonitor.c" - PhotoUpdates* _tmp5_; + if (_tmp3_ != NULL) { +#line 5786 "PhotoMonitor.c" + PhotoUpdates* _tmp4_; + GeeCollection* _tmp5_; GeeCollection* _tmp6_; - GeeCollection* _tmp7_; #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = updates; + _tmp4_ = updates; #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = photo_updates_get_raw_developer_files (_tmp5_); + _tmp5_ = photo_updates_get_raw_developer_files (_tmp4_); #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = _tmp7_ != NULL; + _tmp2_ = _tmp6_ != NULL; #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp7_); -#line 5774 "PhotoMonitor.c" + _g_object_unref0 (_tmp6_); +#line 5800 "PhotoMonitor.c" } else { #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = FALSE; -#line 5778 "PhotoMonitor.c" + _tmp2_ = FALSE; +#line 5804 "PhotoMonitor.c" } #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp3_) { -#line 5782 "PhotoMonitor.c" - PhotoUpdates* _tmp8_; - GeeCollection* _tmp9_; + if (_tmp2_) { +#line 5808 "PhotoMonitor.c" + PhotoUpdates* _tmp7_; + GeeCollection* _tmp8_; #line 873 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = updates; + _tmp7_ = updates; #line 873 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = photo_updates_get_raw_developer_files (_tmp8_); + _tmp8_ = photo_updates_get_raw_developer_files (_tmp7_); #line 873 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 873 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp9_; -#line 5793 "PhotoMonitor.c" + _tmp1_ = _tmp8_; +#line 5819 "PhotoMonitor.c" } else { - LibraryPhoto* _tmp10_; - GeeCollection* _tmp11_; -#line 873 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = photo; + GeeCollection* _tmp9_; #line 873 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PHOTO, Photo)); + _tmp9_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo)); #line 873 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 873 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp11_; -#line 5805 "PhotoMonitor.c" + _tmp1_ = _tmp9_; +#line 5828 "PhotoMonitor.c" } #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - result = _tmp2_; + result = _tmp1_; #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _monitorable_updates_unref0 (updates); #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 5813 "PhotoMonitor.c" +#line 5836 "PhotoMonitor.c" } -void photo_monitor_update_editable_file (PhotoMonitor* self, LibraryPhoto* photo, GFile* file) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_editable_file (PhotoMonitor* self, + LibraryPhoto* photo, + GFile* file) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; - GFile* _tmp3_; #line 876 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 876 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -5827,48 +5852,46 @@ void photo_monitor_update_editable_file (PhotoMonitor* self, LibraryPhoto* photo #line 876 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 877 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 877 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); + _tmp1_ = _tmp0_; #line 877 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; -#line 877 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = file; + photo_updates_set_editable_file (_tmp1_, file); #line 877 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_editable_file (_tmp2_, _tmp3_); -#line 877 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 5840 "PhotoMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 5861 "PhotoMonitor.c" } -void photo_monitor_update_editable_file_info_altered (PhotoMonitor* self, LibraryPhoto* photo) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_editable_file_info_altered (PhotoMonitor* self, + LibraryPhoto* photo) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; #line 880 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 880 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 881 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; -#line 881 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 881 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 881 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_editable_file_info_altered (_tmp2_, TRUE); + photo_updates_set_editable_file_info_altered (_tmp1_, TRUE); #line 881 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 5862 "PhotoMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 5883 "PhotoMonitor.c" } -void photo_monitor_update_raw_development_file (PhotoMonitor* self, LibraryPhoto* photo, GFile* file) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_raw_development_file (PhotoMonitor* self, + LibraryPhoto* photo, + GFile* file) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; - GFile* _tmp3_; #line 884 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 884 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -5876,76 +5899,71 @@ void photo_monitor_update_raw_development_file (PhotoMonitor* self, LibraryPhoto #line 884 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 885 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; -#line 885 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); -#line 885 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 885 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = file; + _tmp1_ = _tmp0_; #line 885 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_add_raw_developer_file (_tmp2_, _tmp3_); + photo_updates_add_raw_developer_file (_tmp1_, file); #line 885 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 5889 "PhotoMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 5908 "PhotoMonitor.c" } -void photo_monitor_update_raw_development_file_info_altered (PhotoMonitor* self, LibraryPhoto* photo) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_raw_development_file_info_altered (PhotoMonitor* self, + LibraryPhoto* photo) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; #line 888 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 888 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 889 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; -#line 889 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 889 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 889 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_raw_developer_file_info_altered (_tmp2_, TRUE); + photo_updates_set_raw_developer_file_info_altered (_tmp1_, TRUE); #line 889 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 5911 "PhotoMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 5930 "PhotoMonitor.c" } -void photo_monitor_update_editable_file_in_alteration (PhotoMonitor* self, LibraryPhoto* photo, gboolean in_alteration) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_editable_file_in_alteration (PhotoMonitor* self, + LibraryPhoto* photo, + gboolean in_alteration) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; - gboolean _tmp3_; #line 892 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 892 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 893 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 893 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); + _tmp1_ = _tmp0_; #line 893 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; -#line 893 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = in_alteration; + photo_updates_set_editable_in_alteration (_tmp1_, in_alteration); #line 893 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_editable_in_alteration (_tmp2_, _tmp3_); -#line 893 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 5936 "PhotoMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 5953 "PhotoMonitor.c" } -void photo_monitor_update_editable_file_alterations_completed (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_editable_file_alterations_completed (PhotoMonitor* self, + LibraryPhoto* photo, + GFileInfo* info) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; PhotoUpdates* _tmp2_; - GFileInfo* _tmp3_; - LibraryPhoto* _tmp4_; - PhotoUpdates* _tmp5_; - PhotoUpdates* _tmp6_; + PhotoUpdates* _tmp3_; #line 896 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 896 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -5953,111 +5971,109 @@ void photo_monitor_update_editable_file_alterations_completed (PhotoMonitor* sel #line 896 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 897 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 897 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); + _tmp1_ = _tmp0_; #line 897 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; -#line 897 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = info; + photo_updates_set_editable_file_info (_tmp1_, info); #line 897 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_editable_file_info (_tmp2_, _tmp3_); -#line 897 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 898 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = photo; + _monitorable_updates_unref0 (_tmp1_); #line 898 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = photo_monitor_fetch_photo_updates (self, _tmp4_); + _tmp2_ = photo_monitor_fetch_photo_updates (self, photo); #line 898 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 898 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_editable_in_alteration (_tmp6_, FALSE); + photo_updates_set_editable_in_alteration (_tmp3_, FALSE); #line 898 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp6_); -#line 5976 "PhotoMonitor.c" + _monitorable_updates_unref0 (_tmp3_); +#line 5988 "PhotoMonitor.c" } -void photo_monitor_update_raw_development_file_in_alteration (PhotoMonitor* self, LibraryPhoto* photo, gboolean in_alteration) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_raw_development_file_in_alteration (PhotoMonitor* self, + LibraryPhoto* photo, + gboolean in_alteration) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; - gboolean _tmp3_; #line 901 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 901 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 902 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 902 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); + _tmp1_ = _tmp0_; #line 902 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; -#line 902 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = in_alteration; + photo_updates_set_raw_development_in_alteration (_tmp1_, in_alteration); #line 902 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_raw_development_in_alteration (_tmp2_, _tmp3_); -#line 902 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 6001 "PhotoMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 6011 "PhotoMonitor.c" } -void photo_monitor_update_raw_development_file_alterations_completed (PhotoMonitor* self, LibraryPhoto* photo) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_raw_development_file_alterations_completed (PhotoMonitor* self, + LibraryPhoto* photo) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; #line 905 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 905 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 906 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; -#line 906 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 906 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 906 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_raw_development_in_alteration (_tmp2_, FALSE); + photo_updates_set_raw_development_in_alteration (_tmp1_, FALSE); #line 906 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 6023 "PhotoMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 6033 "PhotoMonitor.c" } -void photo_monitor_update_revert_to_master (PhotoMonitor* self, LibraryPhoto* photo) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_revert_to_master (PhotoMonitor* self, + LibraryPhoto* photo) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; #line 909 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 909 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 910 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; -#line 910 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 910 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 910 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_revert_to_master (_tmp2_, TRUE); + photo_updates_set_revert_to_master (_tmp1_, TRUE); #line 910 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 6045 "PhotoMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 6055 "PhotoMonitor.c" } -static gpointer _monitorable_updates_ref0 (gpointer self) { +static gpointer +_monitorable_updates_ref0 (gpointer self) +{ #line 930 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self ? monitorable_updates_ref (self) : NULL; -#line 6052 "PhotoMonitor.c" +#line 6064 "PhotoMonitor.c" } -static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollection* all_updates, TransactionController* controller, gint* op_count, GError** error) { +static void +photo_monitor_real_process_updates (MediaMonitor* base, + GeeCollection* all_updates, + TransactionController* controller, + gint* op_count, + GError** error) +{ PhotoMonitor * self; - GeeCollection* _tmp0_; - TransactionController* _tmp1_; GeeMap* set_editable_file = NULL; GeeMap* set_editable_file_info = NULL; GeeMap* set_raw_developer_files = NULL; @@ -6066,12 +6082,12 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio GeeArrayList* reimport_editable = NULL; GeeArrayList* reimport_raw_developments = NULL; gint reimport_job_count = 0; + GeeMap* _tmp82_; GeeMap* _tmp90_; - GeeMap* _tmp98_; - GeeArrayList* _tmp106_; - GeeArrayList* _tmp124_; - GeeArrayList* _tmp151_; - GeeArrayList* _tmp178_; + GeeArrayList* _tmp98_; + GeeArrayList* _tmp116_; + GeeArrayList* _tmp142_; + GeeArrayList* _tmp168_; GError * _inner_error_ = NULL; #line 913 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); @@ -6080,18 +6096,14 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio #line 913 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_TRANSACTION_CONTROLLER (controller)); #line 915 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = all_updates; -#line 915 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = controller; -#line 915 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - MEDIA_MONITOR_CLASS (photo_monitor_parent_class)->process_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), _tmp0_, _tmp1_, op_count, &_inner_error_); + MEDIA_MONITOR_CLASS (photo_monitor_parent_class)->process_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), all_updates, controller, op_count, &_inner_error_); #line 915 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 915 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_propagate_error (error, _inner_error_); #line 915 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 6093 "PhotoMonitor.c" +#line 6105 "PhotoMonitor.c" } #line 917 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" set_editable_file = NULL; @@ -6109,70 +6121,58 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio reimport_raw_developments = NULL; #line 924 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" reimport_job_count = 0; -#line 6111 "PhotoMonitor.c" +#line 6123 "PhotoMonitor.c" { GeeIterator* _monitorable_updates_it = NULL; - GeeCollection* _tmp2_; - GeeIterator* _tmp3_; + GeeIterator* _tmp0_; #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = all_updates; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (all_updates, GEE_TYPE_ITERABLE, GeeIterable)); #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_it = _tmp3_; + _monitorable_updates_it = _tmp0_; #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 6124 "PhotoMonitor.c" - GeeIterator* _tmp4_; - gboolean _tmp5_; +#line 6133 "PhotoMonitor.c" + GeeIterator* _tmp1_; MonitorableUpdates* monitorable_updates = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - gint _tmp8_; + GeeIterator* _tmp2_; + gpointer _tmp3_; PhotoUpdates* updates = NULL; - MonitorableUpdates* _tmp9_; - PhotoUpdates* _tmp10_; - PhotoUpdates* _tmp11_; - PhotoUpdates* _tmp12_; - GFile* _tmp13_; - GFile* _tmp14_; - gboolean _tmp15_; - PhotoUpdates* _tmp26_; - GFileInfo* _tmp27_; - GFileInfo* _tmp28_; - gboolean _tmp29_; - PhotoUpdates* _tmp40_; - GeeCollection* _tmp41_; - GeeCollection* _tmp42_; - gboolean _tmp43_; - PhotoUpdates* _tmp54_; - gboolean _tmp55_; - gboolean _tmp66_ = FALSE; - PhotoUpdates* _tmp67_; - gboolean _tmp68_; - gboolean _tmp78_ = FALSE; - PhotoUpdates* _tmp79_; - gboolean _tmp80_; -#line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _monitorable_updates_it; + MonitorableUpdates* _tmp4_; + PhotoUpdates* _tmp5_; + PhotoUpdates* _tmp6_; + PhotoUpdates* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; + gboolean _tmp10_; + PhotoUpdates* _tmp21_; + GFileInfo* _tmp22_; + GFileInfo* _tmp23_; + gboolean _tmp24_; + PhotoUpdates* _tmp35_; + GeeCollection* _tmp36_; + GeeCollection* _tmp37_; + gboolean _tmp38_; + PhotoUpdates* _tmp49_; + gboolean _tmp60_ = FALSE; + PhotoUpdates* _tmp61_; + gboolean _tmp71_ = FALSE; + PhotoUpdates* _tmp72_; #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = gee_iterator_next (_tmp4_); + _tmp1_ = _monitorable_updates_it; #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp1_)) { #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 6163 "PhotoMonitor.c" +#line 6165 "PhotoMonitor.c" } #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = _monitorable_updates_it; + _tmp2_ = _monitorable_updates_it; #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - monitorable_updates = (MonitorableUpdates*) _tmp7_; + monitorable_updates = (MonitorableUpdates*) _tmp3_; #line 927 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = *op_count; -#line 927 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp8_ >= MEDIA_MONITOR_MAX_OPERATIONS_PER_CYCLE) { + if ((*op_count) >= MEDIA_MONITOR_MAX_OPERATIONS_PER_CYCLE) { #line 928 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _monitorable_updates_unref0 (monitorable_updates); #line 928 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -6180,15 +6180,15 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio #line 6179 "PhotoMonitor.c" } #line 930 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = monitorable_updates; + _tmp4_ = monitorable_updates; #line 930 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = _monitorable_updates_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO_UPDATES) ? ((PhotoUpdates*) _tmp9_) : NULL); + _tmp5_ = _monitorable_updates_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_PHOTO_UPDATES) ? ((PhotoUpdates*) _tmp4_) : NULL); #line 930 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - updates = _tmp10_; + updates = _tmp5_; #line 931 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = updates; + _tmp6_ = updates; #line 931 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp11_ == NULL) { + if (_tmp6_ == NULL) { #line 932 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _monitorable_updates_unref0 (updates); #line 932 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -6198,424 +6198,418 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio #line 6197 "PhotoMonitor.c" } #line 934 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = updates; + _tmp7_ = updates; #line 934 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = photo_updates_get_editable_file (_tmp12_); + _tmp8_ = photo_updates_get_editable_file (_tmp7_); #line 934 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp13_; + _tmp9_ = _tmp8_; #line 934 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = _tmp14_ != NULL; + _tmp10_ = _tmp9_ != NULL; #line 934 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp9_); #line 934 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp15_) { + if (_tmp10_) { #line 6211 "PhotoMonitor.c" - GeeMap* _tmp16_; - GeeMap* _tmp18_; + GeeMap* _tmp11_; + GeeMap* _tmp13_; + PhotoUpdates* _tmp14_; + LibraryPhoto* _tmp15_; + PhotoUpdates* _tmp16_; + GFile* _tmp17_; + GFile* _tmp18_; PhotoUpdates* _tmp19_; - LibraryPhoto* _tmp20_; - PhotoUpdates* _tmp21_; - GFile* _tmp22_; - GFile* _tmp23_; - PhotoUpdates* _tmp24_; - gint _tmp25_; + gint _tmp20_; #line 935 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = set_editable_file; + _tmp11_ = set_editable_file; #line 935 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp16_ == NULL) { + if (_tmp11_ == NULL) { #line 6225 "PhotoMonitor.c" - GeeHashMap* _tmp17_; + GeeHashMap* _tmp12_; #line 936 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp12_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 936 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (set_editable_file); #line 936 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - set_editable_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_MAP, GeeMap); + set_editable_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_MAP, GeeMap); #line 6233 "PhotoMonitor.c" } #line 938 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = set_editable_file; + _tmp13_ = set_editable_file; #line 938 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = updates; + _tmp14_ = updates; #line 938 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = _tmp19_->photo; + _tmp15_ = _tmp14_->photo; #line 938 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = updates; + _tmp16_ = updates; #line 938 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = photo_updates_get_editable_file (_tmp21_); + _tmp17_ = photo_updates_get_editable_file (_tmp16_); #line 938 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = _tmp22_; + _tmp18_ = _tmp17_; #line 938 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - gee_map_set (_tmp18_, _tmp20_, _tmp23_); + gee_map_set (_tmp13_, _tmp15_, _tmp18_); #line 938 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp18_); #line 939 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = updates; + _tmp19_ = updates; #line 939 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_editable_file (_tmp24_, NULL); + photo_updates_set_editable_file (_tmp19_, NULL); #line 940 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = *op_count; + _tmp20_ = *op_count; #line 940 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - *op_count = _tmp25_ + 1; + *op_count = _tmp20_ + 1; #line 6259 "PhotoMonitor.c" } #line 943 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = updates; + _tmp21_ = updates; #line 943 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp27_ = photo_updates_get_editable_file_info (_tmp26_); + _tmp22_ = photo_updates_get_editable_file_info (_tmp21_); #line 943 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp28_ = _tmp27_; + _tmp23_ = _tmp22_; #line 943 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp29_ = _tmp28_ != NULL; + _tmp24_ = _tmp23_ != NULL; #line 943 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp28_); + _g_object_unref0 (_tmp23_); #line 943 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp29_) { + if (_tmp24_) { #line 6273 "PhotoMonitor.c" - GeeMap* _tmp30_; - GeeMap* _tmp32_; + GeeMap* _tmp25_; + GeeMap* _tmp27_; + PhotoUpdates* _tmp28_; + LibraryPhoto* _tmp29_; + PhotoUpdates* _tmp30_; + GFileInfo* _tmp31_; + GFileInfo* _tmp32_; PhotoUpdates* _tmp33_; - LibraryPhoto* _tmp34_; - PhotoUpdates* _tmp35_; - GFileInfo* _tmp36_; - GFileInfo* _tmp37_; - PhotoUpdates* _tmp38_; - gint _tmp39_; + gint _tmp34_; #line 944 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp30_ = set_editable_file_info; + _tmp25_ = set_editable_file_info; #line 944 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp30_ == NULL) { + if (_tmp25_ == NULL) { #line 6287 "PhotoMonitor.c" - GeeHashMap* _tmp31_; + GeeHashMap* _tmp26_; #line 945 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp31_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp26_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 945 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (set_editable_file_info); #line 945 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - set_editable_file_info = G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_MAP, GeeMap); + set_editable_file_info = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_MAP, GeeMap); #line 6295 "PhotoMonitor.c" } #line 947 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp32_ = set_editable_file_info; + _tmp27_ = set_editable_file_info; #line 947 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp33_ = updates; + _tmp28_ = updates; #line 947 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp34_ = _tmp33_->photo; + _tmp29_ = _tmp28_->photo; #line 947 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp35_ = updates; + _tmp30_ = updates; #line 947 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp36_ = photo_updates_get_editable_file_info (_tmp35_); + _tmp31_ = photo_updates_get_editable_file_info (_tmp30_); #line 947 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp37_ = _tmp36_; + _tmp32_ = _tmp31_; #line 947 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - gee_map_set (_tmp32_, _tmp34_, _tmp37_); + gee_map_set (_tmp27_, _tmp29_, _tmp32_); #line 947 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp37_); + _g_object_unref0 (_tmp32_); #line 948 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp38_ = updates; + _tmp33_ = updates; #line 948 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_editable_file_info (_tmp38_, NULL); + photo_updates_set_editable_file_info (_tmp33_, NULL); #line 949 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp39_ = *op_count; + _tmp34_ = *op_count; #line 949 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - *op_count = _tmp39_ + 1; + *op_count = _tmp34_ + 1; #line 6321 "PhotoMonitor.c" } #line 952 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp40_ = updates; + _tmp35_ = updates; #line 952 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp41_ = photo_updates_get_raw_developer_files (_tmp40_); + _tmp36_ = photo_updates_get_raw_developer_files (_tmp35_); #line 952 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp42_ = _tmp41_; + _tmp37_ = _tmp36_; #line 952 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp43_ = _tmp42_ != NULL; + _tmp38_ = _tmp37_ != NULL; #line 952 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp42_); + _g_object_unref0 (_tmp37_); #line 952 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp43_) { + if (_tmp38_) { #line 6335 "PhotoMonitor.c" - GeeMap* _tmp44_; - GeeMap* _tmp46_; + GeeMap* _tmp39_; + GeeMap* _tmp41_; + PhotoUpdates* _tmp42_; + LibraryPhoto* _tmp43_; + PhotoUpdates* _tmp44_; + GeeCollection* _tmp45_; + GeeCollection* _tmp46_; PhotoUpdates* _tmp47_; - LibraryPhoto* _tmp48_; - PhotoUpdates* _tmp49_; - GeeCollection* _tmp50_; - GeeCollection* _tmp51_; - PhotoUpdates* _tmp52_; - gint _tmp53_; + gint _tmp48_; #line 953 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp44_ = set_raw_developer_files; + _tmp39_ = set_raw_developer_files; #line 953 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp44_ == NULL) { + if (_tmp39_ == NULL) { #line 6349 "PhotoMonitor.c" - GeeHashMap* _tmp45_; + GeeHashMap* _tmp40_; #line 954 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp45_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GEE_TYPE_COLLECTION, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp40_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GEE_TYPE_COLLECTION, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 954 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (set_raw_developer_files); #line 954 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - set_raw_developer_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_MAP, GeeMap); + set_raw_developer_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_MAP, GeeMap); #line 6357 "PhotoMonitor.c" } #line 956 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp46_ = set_raw_developer_files; + _tmp41_ = set_raw_developer_files; #line 956 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp47_ = updates; + _tmp42_ = updates; #line 956 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp48_ = _tmp47_->photo; + _tmp43_ = _tmp42_->photo; #line 956 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp49_ = updates; + _tmp44_ = updates; #line 956 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp50_ = photo_updates_get_raw_developer_files (_tmp49_); + _tmp45_ = photo_updates_get_raw_developer_files (_tmp44_); #line 956 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp51_ = _tmp50_; + _tmp46_ = _tmp45_; #line 956 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - gee_map_set (_tmp46_, _tmp48_, _tmp51_); + gee_map_set (_tmp41_, _tmp43_, _tmp46_); #line 956 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp51_); + _g_object_unref0 (_tmp46_); #line 957 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp52_ = updates; + _tmp47_ = updates; #line 957 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_clear_raw_developer_files (_tmp52_); + photo_updates_clear_raw_developer_files (_tmp47_); #line 958 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp53_ = *op_count; + _tmp48_ = *op_count; #line 958 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - *op_count = _tmp53_ + 1; + *op_count = _tmp48_ + 1; #line 6383 "PhotoMonitor.c" } #line 961 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp54_ = updates; + _tmp49_ = updates; #line 961 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp55_ = photo_updates_is_revert_to_master (_tmp54_); -#line 961 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp55_) { -#line 6391 "PhotoMonitor.c" - GeeArrayList* _tmp56_; - GeeArrayList* _tmp58_; + if (photo_updates_is_revert_to_master (_tmp49_)) { +#line 6389 "PhotoMonitor.c" + GeeArrayList* _tmp50_; + GeeArrayList* _tmp52_; + gint _tmp53_; + gint _tmp54_; gint _tmp59_; - gint _tmp60_; - gint _tmp65_; #line 962 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp56_ = revert_to_master; + _tmp50_ = revert_to_master; #line 962 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp56_ == NULL) { -#line 6401 "PhotoMonitor.c" - GeeArrayList* _tmp57_; + if (_tmp50_ == NULL) { +#line 6399 "PhotoMonitor.c" + GeeArrayList* _tmp51_; #line 963 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp57_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp51_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 963 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (revert_to_master); #line 963 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - revert_to_master = _tmp57_; -#line 6409 "PhotoMonitor.c" + revert_to_master = _tmp51_; +#line 6407 "PhotoMonitor.c" } #line 965 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp58_ = revert_to_master; + _tmp52_ = revert_to_master; #line 965 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp59_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp53_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 965 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp60_ = _tmp59_; + _tmp54_ = _tmp53_; #line 965 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp60_ < PHOTO_MONITOR_MAX_REVERTS_PER_CYCLE) { -#line 6419 "PhotoMonitor.c" - GeeArrayList* _tmp61_; - PhotoUpdates* _tmp62_; - LibraryPhoto* _tmp63_; - PhotoUpdates* _tmp64_; + if (_tmp54_ < PHOTO_MONITOR_MAX_REVERTS_PER_CYCLE) { +#line 6417 "PhotoMonitor.c" + GeeArrayList* _tmp55_; + PhotoUpdates* _tmp56_; + LibraryPhoto* _tmp57_; + PhotoUpdates* _tmp58_; #line 966 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp61_ = revert_to_master; + _tmp55_ = revert_to_master; #line 966 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp62_ = updates; + _tmp56_ = updates; #line 966 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp63_ = _tmp62_->photo; + _tmp57_ = _tmp56_->photo; #line 966 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp63_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp57_); #line 967 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp64_ = updates; + _tmp58_ = updates; #line 967 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_revert_to_master (_tmp64_, FALSE); -#line 6436 "PhotoMonitor.c" + photo_updates_set_revert_to_master (_tmp58_, FALSE); +#line 6434 "PhotoMonitor.c" } #line 969 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp65_ = *op_count; + _tmp59_ = *op_count; #line 969 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - *op_count = _tmp65_ + 1; -#line 6442 "PhotoMonitor.c" + *op_count = _tmp59_ + 1; +#line 6440 "PhotoMonitor.c" } #line 972 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp67_ = updates; + _tmp61_ = updates; #line 972 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp68_ = photo_updates_is_reimport_master (_tmp67_); + if (photo_updates_is_reimport_master (_tmp61_)) { +#line 6446 "PhotoMonitor.c" + gint _tmp62_; #line 972 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp68_) { -#line 6450 "PhotoMonitor.c" - gint _tmp69_; -#line 972 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp69_ = reimport_job_count; + _tmp62_ = reimport_job_count; #line 972 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp66_ = _tmp69_ < PHOTO_MONITOR_MAX_REIMPORT_JOBS_PER_CYCLE; -#line 6456 "PhotoMonitor.c" + _tmp60_ = _tmp62_ < PHOTO_MONITOR_MAX_REIMPORT_JOBS_PER_CYCLE; +#line 6452 "PhotoMonitor.c" } else { #line 972 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp66_ = FALSE; -#line 6460 "PhotoMonitor.c" + _tmp60_ = FALSE; +#line 6456 "PhotoMonitor.c" } #line 972 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp66_) { -#line 6464 "PhotoMonitor.c" - GeeArrayList* _tmp70_; - GeeArrayList* _tmp72_; - PhotoUpdates* _tmp73_; - LibraryPhoto* _tmp74_; - PhotoUpdates* _tmp75_; - gint _tmp76_; - gint _tmp77_; + if (_tmp60_) { +#line 6460 "PhotoMonitor.c" + GeeArrayList* _tmp63_; + GeeArrayList* _tmp65_; + PhotoUpdates* _tmp66_; + LibraryPhoto* _tmp67_; + PhotoUpdates* _tmp68_; + gint _tmp69_; + gint _tmp70_; #line 973 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp70_ = reimport_master; + _tmp63_ = reimport_master; #line 973 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp70_ == NULL) { -#line 6476 "PhotoMonitor.c" - GeeArrayList* _tmp71_; + if (_tmp63_ == NULL) { +#line 6472 "PhotoMonitor.c" + GeeArrayList* _tmp64_; #line 974 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp71_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp64_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 974 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (reimport_master); #line 974 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - reimport_master = _tmp71_; -#line 6484 "PhotoMonitor.c" + reimport_master = _tmp64_; +#line 6480 "PhotoMonitor.c" } #line 976 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp72_ = reimport_master; + _tmp65_ = reimport_master; #line 976 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp73_ = updates; + _tmp66_ = updates; #line 976 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp74_ = _tmp73_->photo; + _tmp67_ = _tmp66_->photo; #line 976 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp74_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp67_); #line 977 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp75_ = updates; + _tmp68_ = updates; #line 977 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_reimport_master (_tmp75_, FALSE); + photo_updates_set_reimport_master (_tmp68_, FALSE); #line 978 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp76_ = reimport_job_count; + _tmp69_ = reimport_job_count; #line 978 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - reimport_job_count = _tmp76_ + 1; + reimport_job_count = _tmp69_ + 1; #line 979 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp77_ = *op_count; + _tmp70_ = *op_count; #line 979 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - *op_count = _tmp77_ + 1; -#line 6506 "PhotoMonitor.c" + *op_count = _tmp70_ + 1; +#line 6502 "PhotoMonitor.c" } #line 982 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp79_ = updates; -#line 982 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp80_ = photo_updates_is_reimport_editable (_tmp79_); + _tmp72_ = updates; #line 982 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp80_) { -#line 6514 "PhotoMonitor.c" - gint _tmp81_; + if (photo_updates_is_reimport_editable (_tmp72_)) { +#line 6508 "PhotoMonitor.c" + gint _tmp73_; #line 982 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp81_ = reimport_job_count; + _tmp73_ = reimport_job_count; #line 982 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp78_ = _tmp81_ < PHOTO_MONITOR_MAX_REIMPORT_JOBS_PER_CYCLE; -#line 6520 "PhotoMonitor.c" + _tmp71_ = _tmp73_ < PHOTO_MONITOR_MAX_REIMPORT_JOBS_PER_CYCLE; +#line 6514 "PhotoMonitor.c" } else { #line 982 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp78_ = FALSE; -#line 6524 "PhotoMonitor.c" + _tmp71_ = FALSE; +#line 6518 "PhotoMonitor.c" } #line 982 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp78_) { -#line 6528 "PhotoMonitor.c" - GeeArrayList* _tmp82_; - GeeArrayList* _tmp84_; - PhotoUpdates* _tmp85_; - LibraryPhoto* _tmp86_; - PhotoUpdates* _tmp87_; - gint _tmp88_; - gint _tmp89_; + if (_tmp71_) { +#line 6522 "PhotoMonitor.c" + GeeArrayList* _tmp74_; + GeeArrayList* _tmp76_; + PhotoUpdates* _tmp77_; + LibraryPhoto* _tmp78_; + PhotoUpdates* _tmp79_; + gint _tmp80_; + gint _tmp81_; #line 983 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp82_ = reimport_editable; + _tmp74_ = reimport_editable; #line 983 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp82_ == NULL) { -#line 6540 "PhotoMonitor.c" - GeeArrayList* _tmp83_; + if (_tmp74_ == NULL) { +#line 6534 "PhotoMonitor.c" + GeeArrayList* _tmp75_; #line 984 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp83_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp75_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 984 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (reimport_editable); #line 984 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - reimport_editable = _tmp83_; -#line 6548 "PhotoMonitor.c" + reimport_editable = _tmp75_; +#line 6542 "PhotoMonitor.c" } #line 986 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp84_ = reimport_editable; + _tmp76_ = reimport_editable; #line 986 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp85_ = updates; + _tmp77_ = updates; #line 986 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp86_ = _tmp85_->photo; + _tmp78_ = _tmp77_->photo; #line 986 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp86_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp78_); #line 987 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp87_ = updates; + _tmp79_ = updates; #line 987 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_reimport_editable (_tmp87_, FALSE); + photo_updates_set_reimport_editable (_tmp79_, FALSE); #line 988 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp88_ = reimport_job_count; + _tmp80_ = reimport_job_count; #line 988 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - reimport_job_count = _tmp88_ + 1; + reimport_job_count = _tmp80_ + 1; #line 989 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp89_ = *op_count; + _tmp81_ = *op_count; #line 989 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - *op_count = _tmp89_ + 1; -#line 6570 "PhotoMonitor.c" + *op_count = _tmp81_ + 1; +#line 6564 "PhotoMonitor.c" } #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _monitorable_updates_unref0 (updates); #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _monitorable_updates_unref0 (monitorable_updates); -#line 6576 "PhotoMonitor.c" +#line 6570 "PhotoMonitor.c" } #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_monitorable_updates_it); -#line 6580 "PhotoMonitor.c" +#line 6574 "PhotoMonitor.c" } #line 993 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp90_ = set_editable_file; + _tmp82_ = set_editable_file; #line 993 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp90_ != NULL) { -#line 6586 "PhotoMonitor.c" - GeeMap* _tmp91_; - gint _tmp92_; - gint _tmp93_; - gchar* _tmp94_; - gchar* _tmp95_; + if (_tmp82_ != NULL) { +#line 6580 "PhotoMonitor.c" + GeeMap* _tmp83_; + gint _tmp84_; + gint _tmp85_; + gchar* _tmp86_; + gchar* _tmp87_; #line 994 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp91_ = set_editable_file; + _tmp83_ = set_editable_file; #line 994 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp92_ = gee_map_get_size (_tmp91_); + _tmp84_ = gee_map_get_size (_tmp83_); #line 994 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp93_ = _tmp92_; + _tmp85_ = _tmp84_; #line 994 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp94_ = g_strdup_printf ("Changing editable file of %d photos", _tmp93_); + _tmp86_ = g_strdup_printf ("Changing editable file of %d photos", _tmp85_); #line 994 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp95_ = _tmp94_; + _tmp87_ = _tmp86_; #line 994 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp95_); + media_monitor_mdbg (_tmp87_); #line 994 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp95_); -#line 6606 "PhotoMonitor.c" + _g_free0 (_tmp87_); +#line 6600 "PhotoMonitor.c" { - GeeMap* _tmp96_; + GeeMap* _tmp88_; #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp96_ = set_editable_file; + _tmp88_ = set_editable_file; #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_set_many_editable_file (_tmp96_, &_inner_error_); + photo_set_many_editable_file (_tmp88_, &_inner_error_); #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6617 "PhotoMonitor.c" +#line 6611 "PhotoMonitor.c" goto __catch595_database_error; } #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -6638,25 +6632,25 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio g_clear_error (&_inner_error_); #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 6640 "PhotoMonitor.c" +#line 6634 "PhotoMonitor.c" } } goto __finally595; __catch595_database_error: { GError* err = NULL; - GError* _tmp97_; + GError* _tmp89_; #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" err = _inner_error_; #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _inner_error_ = NULL; #line 999 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp97_ = err; + _tmp89_ = err; #line 999 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - app_window_database_error (_tmp97_); + app_window_database_error (_tmp89_); #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_error_free0 (err); -#line 6658 "PhotoMonitor.c" +#line 6652 "PhotoMonitor.c" } __finally595: #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -6679,45 +6673,45 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio _g_object_unref0 (set_editable_file); #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 6681 "PhotoMonitor.c" +#line 6675 "PhotoMonitor.c" } } #line 1003 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp98_ = set_editable_file_info; + _tmp90_ = set_editable_file_info; #line 1003 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp98_ != NULL) { -#line 6688 "PhotoMonitor.c" - GeeMap* _tmp99_; - gint _tmp100_; - gint _tmp101_; - gchar* _tmp102_; - gchar* _tmp103_; + if (_tmp90_ != NULL) { +#line 6682 "PhotoMonitor.c" + GeeMap* _tmp91_; + gint _tmp92_; + gint _tmp93_; + gchar* _tmp94_; + gchar* _tmp95_; #line 1004 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp99_ = set_editable_file_info; + _tmp91_ = set_editable_file_info; #line 1004 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp100_ = gee_map_get_size (_tmp99_); + _tmp92_ = gee_map_get_size (_tmp91_); #line 1004 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp101_ = _tmp100_; + _tmp93_ = _tmp92_; #line 1004 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp102_ = g_strdup_printf ("Updating %d editable files timestamps", _tmp101_); + _tmp94_ = g_strdup_printf ("Updating %d editable files timestamps", _tmp93_); #line 1004 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp103_ = _tmp102_; + _tmp95_ = _tmp94_; #line 1004 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp103_); + media_monitor_mdbg (_tmp95_); #line 1004 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp103_); -#line 6708 "PhotoMonitor.c" + _g_free0 (_tmp95_); +#line 6702 "PhotoMonitor.c" { - GeeMap* _tmp104_; + GeeMap* _tmp96_; #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp104_ = set_editable_file_info; + _tmp96_ = set_editable_file_info; #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_update_many_editable_timestamps (_tmp104_, &_inner_error_); + photo_update_many_editable_timestamps (_tmp96_, &_inner_error_); #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6719 "PhotoMonitor.c" +#line 6713 "PhotoMonitor.c" goto __catch596_database_error; } #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -6740,25 +6734,25 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio g_clear_error (&_inner_error_); #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 6742 "PhotoMonitor.c" +#line 6736 "PhotoMonitor.c" } } goto __finally596; __catch596_database_error: { GError* err = NULL; - GError* _tmp105_; + GError* _tmp97_; #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" err = _inner_error_; #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _inner_error_ = NULL; #line 1009 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp105_ = err; + _tmp97_ = err; #line 1009 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - app_window_database_error (_tmp105_); + app_window_database_error (_tmp97_); #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_error_free0 (err); -#line 6760 "PhotoMonitor.c" +#line 6754 "PhotoMonitor.c" } __finally596: #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -6781,499 +6775,490 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio _g_object_unref0 (set_editable_file); #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 6783 "PhotoMonitor.c" +#line 6777 "PhotoMonitor.c" } } #line 1013 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp106_ = revert_to_master; + _tmp98_ = revert_to_master; #line 1013 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp106_ != NULL) { -#line 6790 "PhotoMonitor.c" - GeeArrayList* _tmp107_; - gint _tmp108_; - gint _tmp109_; - gchar* _tmp110_; - gchar* _tmp111_; + if (_tmp98_ != NULL) { +#line 6784 "PhotoMonitor.c" + GeeArrayList* _tmp99_; + gint _tmp100_; + gint _tmp101_; + gchar* _tmp102_; + gchar* _tmp103_; #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp107_ = revert_to_master; + _tmp99_ = revert_to_master; #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp108_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp100_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp109_ = _tmp108_; + _tmp101_ = _tmp100_; #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp110_ = g_strdup_printf ("Reverting %d photos to master", _tmp109_); + _tmp102_ = g_strdup_printf ("Reverting %d photos to master", _tmp101_); #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp111_ = _tmp110_; + _tmp103_ = _tmp102_; #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp111_); + media_monitor_mdbg (_tmp103_); #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp111_); -#line 6810 "PhotoMonitor.c" + _g_free0 (_tmp103_); +#line 6804 "PhotoMonitor.c" { GeeArrayList* _photo_list = NULL; - GeeArrayList* _tmp112_; - GeeArrayList* _tmp113_; + GeeArrayList* _tmp104_; + GeeArrayList* _tmp105_; gint _photo_size = 0; - GeeArrayList* _tmp114_; - gint _tmp115_; - gint _tmp116_; + GeeArrayList* _tmp106_; + gint _tmp107_; + gint _tmp108_; gint _photo_index = 0; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp112_ = revert_to_master; + _tmp104_ = revert_to_master; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp113_ = _g_object_ref0 (_tmp112_); + _tmp105_ = _g_object_ref0 (_tmp104_); #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_list = _tmp113_; + _photo_list = _tmp105_; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp114_ = _photo_list; + _tmp106_ = _photo_list; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp115_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp107_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp116_ = _tmp115_; + _tmp108_ = _tmp107_; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_size = _tmp116_; + _photo_size = _tmp108_; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _photo_index = -1; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 6838 "PhotoMonitor.c" - gint _tmp117_; - gint _tmp118_; - gint _tmp119_; +#line 6832 "PhotoMonitor.c" + gint _tmp109_; + gint _tmp110_; + gint _tmp111_; LibraryPhoto* photo = NULL; - GeeArrayList* _tmp120_; - gint _tmp121_; - gpointer _tmp122_; - LibraryPhoto* _tmp123_; + GeeArrayList* _tmp112_; + gint _tmp113_; + gpointer _tmp114_; + LibraryPhoto* _tmp115_; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp117_ = _photo_index; + _tmp109_ = _photo_index; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_index = _tmp117_ + 1; + _photo_index = _tmp109_ + 1; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp118_ = _photo_index; + _tmp110_ = _photo_index; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp119_ = _photo_size; + _tmp111_ = _photo_size; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!(_tmp118_ < _tmp119_)) { + if (!(_tmp110_ < _tmp111_)) { #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 6859 "PhotoMonitor.c" +#line 6853 "PhotoMonitor.c" } #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp120_ = _photo_list; + _tmp112_ = _photo_list; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp121_ = _photo_index; + _tmp113_ = _photo_index; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp122_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp121_); + _tmp114_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp113_); #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = (LibraryPhoto*) _tmp122_; + photo = (LibraryPhoto*) _tmp114_; #line 1017 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp123_ = photo; + _tmp115_ = photo; #line 1017 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_revert_to_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, TYPE_PHOTO, Photo), TRUE); + photo_revert_to_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, TYPE_PHOTO, Photo), TRUE); #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (photo); -#line 6875 "PhotoMonitor.c" +#line 6869 "PhotoMonitor.c" } #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_photo_list); -#line 6879 "PhotoMonitor.c" +#line 6873 "PhotoMonitor.c" } } #line 1024 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp124_ = reimport_master; + _tmp116_ = reimport_master; #line 1024 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp124_ != NULL) { -#line 6886 "PhotoMonitor.c" - GeeArrayList* _tmp125_; - gint _tmp126_; - gint _tmp127_; - gchar* _tmp128_; - gchar* _tmp129_; + if (_tmp116_ != NULL) { +#line 6880 "PhotoMonitor.c" + GeeArrayList* _tmp117_; + gint _tmp118_; + gint _tmp119_; + gchar* _tmp120_; + gchar* _tmp121_; #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp125_ = reimport_master; + _tmp117_ = reimport_master; #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp126_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp118_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp127_ = _tmp126_; + _tmp119_ = _tmp118_; #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp128_ = g_strdup_printf ("Reimporting %d masters", _tmp127_); + _tmp120_ = g_strdup_printf ("Reimporting %d masters", _tmp119_); #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp129_ = _tmp128_; + _tmp121_ = _tmp120_; #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp129_); + media_monitor_mdbg (_tmp121_); #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp129_); -#line 6906 "PhotoMonitor.c" + _g_free0 (_tmp121_); +#line 6900 "PhotoMonitor.c" { GeeArrayList* _photo_list = NULL; - GeeArrayList* _tmp130_; - GeeArrayList* _tmp131_; + GeeArrayList* _tmp122_; + GeeArrayList* _tmp123_; gint _photo_size = 0; - GeeArrayList* _tmp132_; - gint _tmp133_; - gint _tmp134_; + GeeArrayList* _tmp124_; + gint _tmp125_; + gint _tmp126_; gint _photo_index = 0; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp130_ = reimport_master; + _tmp122_ = reimport_master; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp131_ = _g_object_ref0 (_tmp130_); + _tmp123_ = _g_object_ref0 (_tmp122_); #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_list = _tmp131_; + _photo_list = _tmp123_; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp132_ = _photo_list; + _tmp124_ = _photo_list; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp133_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp125_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp134_ = _tmp133_; + _tmp126_ = _tmp125_; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_size = _tmp134_; + _photo_size = _tmp126_; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _photo_index = -1; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 6934 "PhotoMonitor.c" - gint _tmp135_; - gint _tmp136_; - gint _tmp137_; +#line 6928 "PhotoMonitor.c" + gint _tmp127_; + gint _tmp128_; + gint _tmp129_; LibraryPhoto* photo = NULL; - GeeArrayList* _tmp138_; - gint _tmp139_; - gpointer _tmp140_; - GeeHashMap* _tmp141_; - LibraryPhoto* _tmp142_; - gboolean _tmp143_; + GeeArrayList* _tmp130_; + gint _tmp131_; + gpointer _tmp132_; + GeeHashMap* _tmp133_; + LibraryPhoto* _tmp134_; PhotoMonitorReimportMasterJob* job = NULL; - LibraryPhoto* _tmp144_; - PhotoMonitorReimportMasterJob* _tmp145_; - GeeHashMap* _tmp146_; - LibraryPhoto* _tmp147_; - PhotoMonitorReimportMasterJob* _tmp148_; - Workers* _tmp149_; - PhotoMonitorReimportMasterJob* _tmp150_; + LibraryPhoto* _tmp135_; + PhotoMonitorReimportMasterJob* _tmp136_; + GeeHashMap* _tmp137_; + LibraryPhoto* _tmp138_; + PhotoMonitorReimportMasterJob* _tmp139_; + Workers* _tmp140_; + PhotoMonitorReimportMasterJob* _tmp141_; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp135_ = _photo_index; + _tmp127_ = _photo_index; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_index = _tmp135_ + 1; + _photo_index = _tmp127_ + 1; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp136_ = _photo_index; + _tmp128_ = _photo_index; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp137_ = _photo_size; + _tmp129_ = _photo_size; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!(_tmp136_ < _tmp137_)) { + if (!(_tmp128_ < _tmp129_)) { #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 6965 "PhotoMonitor.c" +#line 6958 "PhotoMonitor.c" } #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp138_ = _photo_list; + _tmp130_ = _photo_list; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp139_ = _photo_index; + _tmp131_ = _photo_index; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp140_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp139_); + _tmp132_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp131_); #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = (LibraryPhoto*) _tmp140_; + photo = (LibraryPhoto*) _tmp132_; #line 1028 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp141_ = self->priv->master_reimport_pending; + _tmp133_ = self->priv->master_reimport_pending; #line 1028 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp142_ = photo; + _tmp134_ = photo; #line 1028 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp143_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp142_); -#line 1028 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_assert (!_tmp143_, "!master_reimport_pending.has_key(photo)"); + _vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp134_), "!master_reimport_pending.has_key(photo)"); #line 1030 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp144_ = photo; + _tmp135_ = photo; #line 1030 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp145_ = photo_monitor_reimport_master_job_new (self, _tmp144_); + _tmp136_ = photo_monitor_reimport_master_job_new (self, _tmp135_); #line 1030 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - job = _tmp145_; + job = _tmp136_; #line 1031 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp146_ = self->priv->master_reimport_pending; + _tmp137_ = self->priv->master_reimport_pending; #line 1031 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp147_ = photo; + _tmp138_ = photo; #line 1031 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp148_ = job; + _tmp139_ = job; #line 1031 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp146_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp147_, _tmp148_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp138_, _tmp139_); #line 1032 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp149_ = self->priv->workers; + _tmp140_ = self->priv->workers; #line 1032 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp150_ = job; + _tmp141_ = job; #line 1032 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - workers_enqueue (_tmp149_, G_TYPE_CHECK_INSTANCE_CAST (_tmp150_, TYPE_BACKGROUND_JOB, BackgroundJob)); + workers_enqueue (_tmp140_, G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (photo); -#line 7007 "PhotoMonitor.c" +#line 6998 "PhotoMonitor.c" } #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_photo_list); -#line 7011 "PhotoMonitor.c" +#line 7002 "PhotoMonitor.c" } } #line 1036 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp151_ = reimport_editable; + _tmp142_ = reimport_editable; #line 1036 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp151_ != NULL) { -#line 7018 "PhotoMonitor.c" - GeeArrayList* _tmp152_; - gint _tmp153_; - gint _tmp154_; - gchar* _tmp155_; - gchar* _tmp156_; + if (_tmp142_ != NULL) { +#line 7009 "PhotoMonitor.c" + GeeArrayList* _tmp143_; + gint _tmp144_; + gint _tmp145_; + gchar* _tmp146_; + gchar* _tmp147_; #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp152_ = reimport_editable; + _tmp143_ = reimport_editable; #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp153_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp152_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp144_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp154_ = _tmp153_; + _tmp145_ = _tmp144_; #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp155_ = g_strdup_printf ("Reimporting %d editables", _tmp154_); + _tmp146_ = g_strdup_printf ("Reimporting %d editables", _tmp145_); #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp156_ = _tmp155_; + _tmp147_ = _tmp146_; #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp156_); + media_monitor_mdbg (_tmp147_); #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp156_); -#line 7038 "PhotoMonitor.c" + _g_free0 (_tmp147_); +#line 7029 "PhotoMonitor.c" { GeeArrayList* _photo_list = NULL; - GeeArrayList* _tmp157_; - GeeArrayList* _tmp158_; + GeeArrayList* _tmp148_; + GeeArrayList* _tmp149_; gint _photo_size = 0; - GeeArrayList* _tmp159_; - gint _tmp160_; - gint _tmp161_; + GeeArrayList* _tmp150_; + gint _tmp151_; + gint _tmp152_; gint _photo_index = 0; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp157_ = reimport_editable; + _tmp148_ = reimport_editable; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp158_ = _g_object_ref0 (_tmp157_); + _tmp149_ = _g_object_ref0 (_tmp148_); #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_list = _tmp158_; + _photo_list = _tmp149_; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp159_ = _photo_list; + _tmp150_ = _photo_list; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp160_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp159_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp151_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp150_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp161_ = _tmp160_; + _tmp152_ = _tmp151_; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_size = _tmp161_; + _photo_size = _tmp152_; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _photo_index = -1; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 7066 "PhotoMonitor.c" - gint _tmp162_; - gint _tmp163_; - gint _tmp164_; +#line 7057 "PhotoMonitor.c" + gint _tmp153_; + gint _tmp154_; + gint _tmp155_; LibraryPhoto* photo = NULL; - GeeArrayList* _tmp165_; - gint _tmp166_; - gpointer _tmp167_; - GeeHashMap* _tmp168_; - LibraryPhoto* _tmp169_; - gboolean _tmp170_; + GeeArrayList* _tmp156_; + gint _tmp157_; + gpointer _tmp158_; + GeeHashMap* _tmp159_; + LibraryPhoto* _tmp160_; PhotoMonitorReimportEditableJob* job = NULL; - LibraryPhoto* _tmp171_; - PhotoMonitorReimportEditableJob* _tmp172_; - GeeHashMap* _tmp173_; - LibraryPhoto* _tmp174_; - PhotoMonitorReimportEditableJob* _tmp175_; - Workers* _tmp176_; - PhotoMonitorReimportEditableJob* _tmp177_; + LibraryPhoto* _tmp161_; + PhotoMonitorReimportEditableJob* _tmp162_; + GeeHashMap* _tmp163_; + LibraryPhoto* _tmp164_; + PhotoMonitorReimportEditableJob* _tmp165_; + Workers* _tmp166_; + PhotoMonitorReimportEditableJob* _tmp167_; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp162_ = _photo_index; + _tmp153_ = _photo_index; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_index = _tmp162_ + 1; + _photo_index = _tmp153_ + 1; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp163_ = _photo_index; + _tmp154_ = _photo_index; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp164_ = _photo_size; + _tmp155_ = _photo_size; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!(_tmp163_ < _tmp164_)) { + if (!(_tmp154_ < _tmp155_)) { #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 7097 "PhotoMonitor.c" +#line 7087 "PhotoMonitor.c" } #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp165_ = _photo_list; + _tmp156_ = _photo_list; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp166_ = _photo_index; + _tmp157_ = _photo_index; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp167_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp165_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp166_); + _tmp158_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp156_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp157_); #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = (LibraryPhoto*) _tmp167_; -#line 1040 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp168_ = self->priv->editable_reimport_pending; + photo = (LibraryPhoto*) _tmp158_; #line 1040 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp169_ = photo; + _tmp159_ = self->priv->editable_reimport_pending; #line 1040 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp170_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp168_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp169_); + _tmp160_ = photo; #line 1040 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_assert (!_tmp170_, "!editable_reimport_pending.has_key(photo)"); + _vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp159_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp160_), "!editable_reimport_pending.has_key(photo)"); #line 1042 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp171_ = photo; + _tmp161_ = photo; #line 1042 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp172_ = photo_monitor_reimport_editable_job_new (self, _tmp171_); + _tmp162_ = photo_monitor_reimport_editable_job_new (self, _tmp161_); #line 1042 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - job = _tmp172_; + job = _tmp162_; #line 1043 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp173_ = self->priv->editable_reimport_pending; + _tmp163_ = self->priv->editable_reimport_pending; #line 1043 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp174_ = photo; + _tmp164_ = photo; #line 1043 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp175_ = job; + _tmp165_ = job; #line 1043 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp173_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp174_, _tmp175_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp163_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp164_, _tmp165_); #line 1044 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp176_ = self->priv->workers; + _tmp166_ = self->priv->workers; #line 1044 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp177_ = job; + _tmp167_ = job; #line 1044 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - workers_enqueue (_tmp176_, G_TYPE_CHECK_INSTANCE_CAST (_tmp177_, TYPE_BACKGROUND_JOB, BackgroundJob)); + workers_enqueue (_tmp166_, G_TYPE_CHECK_INSTANCE_CAST (_tmp167_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (photo); -#line 7139 "PhotoMonitor.c" +#line 7127 "PhotoMonitor.c" } #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_photo_list); -#line 7143 "PhotoMonitor.c" +#line 7131 "PhotoMonitor.c" } } #line 1048 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp178_ = reimport_raw_developments; + _tmp168_ = reimport_raw_developments; #line 1048 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp178_ != NULL) { -#line 7150 "PhotoMonitor.c" - GeeArrayList* _tmp179_; - gint _tmp180_; - gint _tmp181_; - gchar* _tmp182_; - gchar* _tmp183_; + if (_tmp168_ != NULL) { +#line 7138 "PhotoMonitor.c" + GeeArrayList* _tmp169_; + gint _tmp170_; + gint _tmp171_; + gchar* _tmp172_; + gchar* _tmp173_; #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp179_ = reimport_raw_developments; + _tmp169_ = reimport_raw_developments; #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp180_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp179_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp170_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp169_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp181_ = _tmp180_; + _tmp171_ = _tmp170_; #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp182_ = g_strdup_printf ("Reimporting %d raw developments", _tmp181_); + _tmp172_ = g_strdup_printf ("Reimporting %d raw developments", _tmp171_); #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp183_ = _tmp182_; + _tmp173_ = _tmp172_; #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp183_); + media_monitor_mdbg (_tmp173_); #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp183_); -#line 7170 "PhotoMonitor.c" + _g_free0 (_tmp173_); +#line 7158 "PhotoMonitor.c" { GeeArrayList* _photo_list = NULL; - GeeArrayList* _tmp184_; - GeeArrayList* _tmp185_; + GeeArrayList* _tmp174_; + GeeArrayList* _tmp175_; gint _photo_size = 0; - GeeArrayList* _tmp186_; - gint _tmp187_; - gint _tmp188_; + GeeArrayList* _tmp176_; + gint _tmp177_; + gint _tmp178_; gint _photo_index = 0; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp184_ = reimport_raw_developments; + _tmp174_ = reimport_raw_developments; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp185_ = _g_object_ref0 (_tmp184_); + _tmp175_ = _g_object_ref0 (_tmp174_); #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_list = _tmp185_; + _photo_list = _tmp175_; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp186_ = _photo_list; + _tmp176_ = _photo_list; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp187_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp186_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp177_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp176_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp188_ = _tmp187_; + _tmp178_ = _tmp177_; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_size = _tmp188_; + _photo_size = _tmp178_; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _photo_index = -1; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 7198 "PhotoMonitor.c" - gint _tmp189_; - gint _tmp190_; - gint _tmp191_; +#line 7186 "PhotoMonitor.c" + gint _tmp179_; + gint _tmp180_; + gint _tmp181_; LibraryPhoto* photo = NULL; - GeeArrayList* _tmp192_; - gint _tmp193_; - gpointer _tmp194_; - GeeHashMap* _tmp195_; - LibraryPhoto* _tmp196_; - gboolean _tmp197_; + GeeArrayList* _tmp182_; + gint _tmp183_; + gpointer _tmp184_; + GeeHashMap* _tmp185_; + LibraryPhoto* _tmp186_; PhotoMonitorReimportRawDevelopmentJob* job = NULL; - LibraryPhoto* _tmp198_; - PhotoMonitorReimportRawDevelopmentJob* _tmp199_; - GeeHashMap* _tmp200_; - LibraryPhoto* _tmp201_; - PhotoMonitorReimportRawDevelopmentJob* _tmp202_; - Workers* _tmp203_; - PhotoMonitorReimportRawDevelopmentJob* _tmp204_; + LibraryPhoto* _tmp187_; + PhotoMonitorReimportRawDevelopmentJob* _tmp188_; + GeeHashMap* _tmp189_; + LibraryPhoto* _tmp190_; + PhotoMonitorReimportRawDevelopmentJob* _tmp191_; + Workers* _tmp192_; + PhotoMonitorReimportRawDevelopmentJob* _tmp193_; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp189_ = _photo_index; + _tmp179_ = _photo_index; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_index = _tmp189_ + 1; + _photo_index = _tmp179_ + 1; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp190_ = _photo_index; + _tmp180_ = _photo_index; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp191_ = _photo_size; + _tmp181_ = _photo_size; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!(_tmp190_ < _tmp191_)) { + if (!(_tmp180_ < _tmp181_)) { #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 7229 "PhotoMonitor.c" +#line 7216 "PhotoMonitor.c" } #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp192_ = _photo_list; + _tmp182_ = _photo_list; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp193_ = _photo_index; + _tmp183_ = _photo_index; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp194_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp192_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp193_); + _tmp184_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp182_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp183_); #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = (LibraryPhoto*) _tmp194_; + photo = (LibraryPhoto*) _tmp184_; #line 1052 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp195_ = self->priv->raw_developments_reimport_pending; + _tmp185_ = self->priv->raw_developments_reimport_pending; #line 1052 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp196_ = photo; + _tmp186_ = photo; #line 1052 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp197_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp195_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp196_); -#line 1052 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_assert (!_tmp197_, "!raw_developments_reimport_pending.has_key(photo)"); + _vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp185_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp186_), "!raw_developments_reimport_pending.has_key(photo)"); #line 1054 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp198_ = photo; + _tmp187_ = photo; #line 1054 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp199_ = photo_monitor_reimport_raw_development_job_new (self, _tmp198_); + _tmp188_ = photo_monitor_reimport_raw_development_job_new (self, _tmp187_); #line 1054 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - job = _tmp199_; + job = _tmp188_; #line 1055 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp200_ = self->priv->raw_developments_reimport_pending; + _tmp189_ = self->priv->raw_developments_reimport_pending; #line 1055 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp201_ = photo; + _tmp190_ = photo; #line 1055 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp202_ = job; + _tmp191_ = job; #line 1055 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp200_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp201_, _tmp202_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp189_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp190_, _tmp191_); #line 1056 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp203_ = self->priv->workers; + _tmp192_ = self->priv->workers; #line 1056 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp204_ = job; + _tmp193_ = job; #line 1056 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - workers_enqueue (_tmp203_, G_TYPE_CHECK_INSTANCE_CAST (_tmp204_, TYPE_BACKGROUND_JOB, BackgroundJob)); + workers_enqueue (_tmp192_, G_TYPE_CHECK_INSTANCE_CAST (_tmp193_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (photo); -#line 7271 "PhotoMonitor.c" +#line 7256 "PhotoMonitor.c" } #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_photo_list); -#line 7275 "PhotoMonitor.c" +#line 7260 "PhotoMonitor.c" } } #line 913 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -7290,153 +7275,154 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio _g_object_unref0 (set_editable_file_info); #line 913 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (set_editable_file); -#line 7292 "PhotoMonitor.c" +#line 7277 "PhotoMonitor.c" } -static gpointer _background_job_ref0 (gpointer self) { +static gpointer +_background_job_ref0 (gpointer self) +{ #line 1062 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self ? background_job_ref (self) : NULL; -#line 7299 "PhotoMonitor.c" +#line 7286 "PhotoMonitor.c" } -static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJob* j) { +static void +photo_monitor_on_master_reimported (PhotoMonitor* self, + BackgroundJob* j) +{ PhotoMonitorReimportMasterJob* job = NULL; - BackgroundJob* _tmp0_; - PhotoMonitorReimportMasterJob* _tmp1_; + PhotoMonitorReimportMasterJob* _tmp0_; gboolean removed = FALSE; - GeeHashMap* _tmp2_; - PhotoMonitorReimportMasterJob* _tmp3_; - LibraryPhoto* _tmp4_; + GeeHashMap* _tmp1_; + PhotoMonitorReimportMasterJob* _tmp2_; + LibraryPhoto* _tmp3_; + gboolean _tmp4_; gboolean _tmp5_; - gboolean _tmp6_; - PhotoMonitorReimportMasterJob* _tmp7_; - GError* _tmp8_; - PhotoMonitorReimportMasterJob* _tmp18_; - gboolean _tmp19_; - PhotoMonitorReimportMasterJob* _tmp27_; - LibraryPhoto* _tmp28_; - gboolean _tmp29_; - PhotoMonitorReimportMasterJob* _tmp32_; - LibraryPhoto* _tmp33_; + PhotoMonitorReimportMasterJob* _tmp6_; + GError* _tmp7_; + PhotoMonitorReimportMasterJob* _tmp17_; + gboolean _tmp18_; + PhotoMonitorReimportMasterJob* _tmp26_; + LibraryPhoto* _tmp27_; + PhotoMonitorReimportMasterJob* _tmp30_; + LibraryPhoto* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; gchar* _tmp34_; gchar* _tmp35_; - gchar* _tmp36_; - gchar* _tmp37_; GError * _inner_error_ = NULL; #line 1061 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 1061 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_BACKGROUND_JOB (j)); #line 1062 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = j; + _tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, PHOTO_MONITOR_TYPE_REIMPORT_MASTER_JOB, PhotoMonitorReimportMasterJob)); #line 1062 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PHOTO_MONITOR_TYPE_REIMPORT_MASTER_JOB, PhotoMonitorReimportMasterJob)); -#line 1062 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - job = _tmp1_; + job = _tmp0_; #line 1065 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = self->priv->master_reimport_pending; + _tmp1_ = self->priv->master_reimport_pending; #line 1065 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = job; + _tmp2_ = job; #line 1065 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _tmp3_->photo; + _tmp3_ = _tmp2_->photo; #line 1065 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, NULL); + _tmp4_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, NULL); #line 1065 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - removed = _tmp5_; + removed = _tmp4_; #line 1066 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = removed; + _tmp5_ = removed; #line 1066 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_assert (_tmp6_, "removed"); + _vala_assert (_tmp5_, "removed"); #line 1068 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = job; + _tmp6_ = job; #line 1068 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = _tmp7_->err; + _tmp7_ = _tmp6_->err; #line 1068 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp8_ != NULL) { -#line 7357 "PhotoMonitor.c" - PhotoMonitorReimportMasterJob* _tmp9_; - LibraryPhoto* _tmp10_; + if (_tmp7_ != NULL) { +#line 7343 "PhotoMonitor.c" + PhotoMonitorReimportMasterJob* _tmp8_; + LibraryPhoto* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; - PhotoMonitorReimportMasterJob* _tmp13_; - GError* _tmp14_; - const gchar* _tmp15_; - PhotoMonitorReimportMasterJob* _tmp16_; - LibraryPhoto* _tmp17_; + PhotoMonitorReimportMasterJob* _tmp12_; + GError* _tmp13_; + const gchar* _tmp14_; + PhotoMonitorReimportMasterJob* _tmp15_; + LibraryPhoto* _tmp16_; #line 1069 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = job; + _tmp8_ = job; #line 1069 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = _tmp9_->photo; + _tmp9_ = _tmp8_->photo; #line 1069 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); + _tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); #line 1069 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 1069 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = job; + _tmp12_ = job; #line 1069 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp13_->err; + _tmp13_ = _tmp12_->err; #line 1069 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = _tmp14_->message; + _tmp14_ = _tmp13_->message; #line 1069 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_critical ("PhotoMonitor.vala:1069: Unable to reimport %s due to master file chang" \ -"ing: %s", _tmp12_, _tmp15_); +"ing: %s", _tmp11_, _tmp14_); #line 1069 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp11_); #line 1072 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = job; + _tmp15_ = job; #line 1072 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = _tmp16_->photo; + _tmp16_ = _tmp15_->photo; #line 1072 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MONITORABLE, Monitorable)); + media_monitor_update_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MONITORABLE, Monitorable)); #line 1074 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); #line 1074 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 7395 "PhotoMonitor.c" +#line 7381 "PhotoMonitor.c" } #line 1077 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = job; + _tmp17_ = job; #line 1077 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = _tmp18_->mark_online; + _tmp18_ = _tmp17_->mark_online; #line 1077 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp19_) { -#line 7403 "PhotoMonitor.c" - PhotoMonitorReimportMasterJob* _tmp20_; - LibraryPhoto* _tmp21_; + if (!_tmp18_) { +#line 7389 "PhotoMonitor.c" + PhotoMonitorReimportMasterJob* _tmp19_; + LibraryPhoto* _tmp20_; #line 1079 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = job; + _tmp19_ = job; #line 1079 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = _tmp20_->photo; + _tmp20_ = _tmp19_->photo; #line 1079 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_MONITORABLE, Monitorable)); + media_monitor_update_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_MONITORABLE, Monitorable)); #line 1081 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); #line 1081 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 7416 "PhotoMonitor.c" +#line 7402 "PhotoMonitor.c" } { - PhotoMonitorReimportMasterJob* _tmp22_; - LibraryPhoto* _tmp23_; - PhotoMonitorReimportMasterJob* _tmp24_; - PhotoReimportMasterState* _tmp25_; + PhotoMonitorReimportMasterJob* _tmp21_; + LibraryPhoto* _tmp22_; + PhotoMonitorReimportMasterJob* _tmp23_; + PhotoReimportMasterState* _tmp24_; #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = job; + _tmp21_ = job; #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = _tmp22_->photo; + _tmp22_ = _tmp21_->photo; #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = job; + _tmp23_ = job; #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = _tmp24_->reimport_state; + _tmp24_ = _tmp23_->reimport_state; #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_finish_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO, Photo), _tmp25_, &_inner_error_); + photo_finish_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PHOTO, Photo), _tmp24_, &_inner_error_); #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 7437 "PhotoMonitor.c" +#line 7423 "PhotoMonitor.c" goto __catch597_database_error; } #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -7447,25 +7433,25 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo g_clear_error (&_inner_error_); #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 7448 "PhotoMonitor.c" +#line 7434 "PhotoMonitor.c" } } goto __finally597; __catch597_database_error: { GError* err = NULL; - GError* _tmp26_; + GError* _tmp25_; #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" err = _inner_error_; #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _inner_error_ = NULL; #line 1087 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = err; + _tmp25_ = err; #line 1087 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - app_window_database_error (_tmp26_); + app_window_database_error (_tmp25_); #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_error_free0 (err); -#line 7466 "PhotoMonitor.c" +#line 7452 "PhotoMonitor.c" } __finally597: #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -7478,57 +7464,57 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo g_clear_error (&_inner_error_); #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 7479 "PhotoMonitor.c" +#line 7465 "PhotoMonitor.c" } #line 1091 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp27_ = job; + _tmp26_ = job; #line 1091 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp28_ = _tmp27_->photo; + _tmp27_ = _tmp26_->photo; #line 1091 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp29_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 1091 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp29_) { -#line 7489 "PhotoMonitor.c" - PhotoMonitorReimportMasterJob* _tmp30_; - LibraryPhoto* _tmp31_; + if (media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_MEDIA_SOURCE, MediaSource))) { +#line 7473 "PhotoMonitor.c" + PhotoMonitorReimportMasterJob* _tmp28_; + LibraryPhoto* _tmp29_; #line 1092 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp30_ = job; + _tmp28_ = job; #line 1092 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp31_ = _tmp30_->photo; + _tmp29_ = _tmp28_->photo; #line 1092 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_online (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_MONITORABLE, Monitorable)); -#line 7498 "PhotoMonitor.c" + media_monitor_update_online (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_MONITORABLE, Monitorable)); +#line 7482 "PhotoMonitor.c" } #line 1094 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp32_ = job; -#line 1094 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp33_ = _tmp32_->photo; + _tmp30_ = job; #line 1094 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp34_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_OBJECT, DataObject)); + _tmp31_ = _tmp30_->photo; #line 1094 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp35_ = _tmp34_; + _tmp32_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_OBJECT, DataObject)); #line 1094 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp36_ = g_strdup_printf ("Reimported master for %s", _tmp35_); + _tmp33_ = _tmp32_; #line 1094 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp37_ = _tmp36_; + _tmp34_ = g_strdup_printf ("Reimported master for %s", _tmp33_); #line 1094 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp37_); + _tmp35_ = _tmp34_; #line 1094 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp37_); + media_monitor_mdbg (_tmp35_); #line 1094 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_free0 (_tmp35_); +#line 1094 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" + _g_free0 (_tmp33_); #line 1061 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); -#line 7520 "PhotoMonitor.c" +#line 7504 "PhotoMonitor.c" } -static void photo_monitor_on_master_reimport_cancelled (PhotoMonitor* self, BackgroundJob* j) { +static void +photo_monitor_on_master_reimport_cancelled (PhotoMonitor* self, + BackgroundJob* j) +{ gboolean removed = FALSE; GeeHashMap* _tmp0_; - BackgroundJob* _tmp1_; - LibraryPhoto* _tmp2_; - gboolean _tmp3_; + LibraryPhoto* _tmp1_; + gboolean _tmp2_; #line 1097 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 1097 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -7536,120 +7522,118 @@ static void photo_monitor_on_master_reimport_cancelled (PhotoMonitor* self, Back #line 1098 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = self->priv->master_reimport_pending; #line 1098 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = j; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (j, PHOTO_MONITOR_TYPE_REIMPORT_MASTER_JOB, PhotoMonitorReimportMasterJob)->photo; #line 1098 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PHOTO_MONITOR_TYPE_REIMPORT_MASTER_JOB, PhotoMonitorReimportMasterJob)->photo; + _tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL); #line 1098 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, NULL); -#line 1098 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - removed = _tmp3_; + removed = _tmp2_; #line 1099 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _vala_assert (removed, "removed"); -#line 7546 "PhotoMonitor.c" +#line 7530 "PhotoMonitor.c" } -static void photo_monitor_on_editable_reimported (PhotoMonitor* self, BackgroundJob* j) { +static void +photo_monitor_on_editable_reimported (PhotoMonitor* self, + BackgroundJob* j) +{ PhotoMonitorReimportEditableJob* job = NULL; - BackgroundJob* _tmp0_; - PhotoMonitorReimportEditableJob* _tmp1_; + PhotoMonitorReimportEditableJob* _tmp0_; gboolean removed = FALSE; - GeeHashMap* _tmp2_; - PhotoMonitorReimportEditableJob* _tmp3_; - LibraryPhoto* _tmp4_; + GeeHashMap* _tmp1_; + PhotoMonitorReimportEditableJob* _tmp2_; + LibraryPhoto* _tmp3_; + gboolean _tmp4_; gboolean _tmp5_; - gboolean _tmp6_; - PhotoMonitorReimportEditableJob* _tmp7_; - GError* _tmp8_; - PhotoMonitorReimportEditableJob* _tmp21_; - LibraryPhoto* _tmp22_; + PhotoMonitorReimportEditableJob* _tmp6_; + GError* _tmp7_; + PhotoMonitorReimportEditableJob* _tmp20_; + LibraryPhoto* _tmp21_; + gchar* _tmp22_; gchar* _tmp23_; gchar* _tmp24_; gchar* _tmp25_; - gchar* _tmp26_; GError * _inner_error_ = NULL; #line 1102 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 1102 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_BACKGROUND_JOB (j)); #line 1103 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = j; + _tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, PHOTO_MONITOR_TYPE_REIMPORT_EDITABLE_JOB, PhotoMonitorReimportEditableJob)); #line 1103 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PHOTO_MONITOR_TYPE_REIMPORT_EDITABLE_JOB, PhotoMonitorReimportEditableJob)); -#line 1103 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - job = _tmp1_; + job = _tmp0_; #line 1106 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = self->priv->editable_reimport_pending; + _tmp1_ = self->priv->editable_reimport_pending; #line 1106 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = job; + _tmp2_ = job; #line 1106 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _tmp3_->photo; + _tmp3_ = _tmp2_->photo; #line 1106 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, NULL); + _tmp4_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, NULL); #line 1106 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - removed = _tmp5_; + removed = _tmp4_; #line 1107 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = removed; + _tmp5_ = removed; #line 1107 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_assert (_tmp6_, "removed"); + _vala_assert (_tmp5_, "removed"); #line 1109 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = job; + _tmp6_ = job; #line 1109 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = _tmp7_->err; + _tmp7_ = _tmp6_->err; #line 1109 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp8_ != NULL) { -#line 7599 "PhotoMonitor.c" - PhotoMonitorReimportEditableJob* _tmp9_; - LibraryPhoto* _tmp10_; + if (_tmp7_ != NULL) { +#line 7583 "PhotoMonitor.c" + PhotoMonitorReimportEditableJob* _tmp8_; + LibraryPhoto* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; - PhotoMonitorReimportEditableJob* _tmp13_; - GError* _tmp14_; - const gchar* _tmp15_; + PhotoMonitorReimportEditableJob* _tmp12_; + GError* _tmp13_; + const gchar* _tmp14_; #line 1110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = job; + _tmp8_ = job; #line 1110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = _tmp9_->photo; + _tmp9_ = _tmp8_->photo; #line 1110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); + _tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); #line 1110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 1110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = job; + _tmp12_ = job; #line 1110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp13_->err; + _tmp13_ = _tmp12_->err; #line 1110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = _tmp14_->message; + _tmp14_ = _tmp13_->message; #line 1110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_critical ("PhotoMonitor.vala:1110: Unable to reimport editable %s: %s", _tmp12_, _tmp15_); + g_critical ("PhotoMonitor.vala:1110: Unable to reimport editable %s: %s", _tmp11_, _tmp14_); #line 1110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp11_); #line 1112 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); #line 1112 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 7629 "PhotoMonitor.c" +#line 7613 "PhotoMonitor.c" } { - PhotoMonitorReimportEditableJob* _tmp16_; - LibraryPhoto* _tmp17_; - PhotoMonitorReimportEditableJob* _tmp18_; - PhotoReimportEditableState* _tmp19_; + PhotoMonitorReimportEditableJob* _tmp15_; + LibraryPhoto* _tmp16_; + PhotoMonitorReimportEditableJob* _tmp17_; + PhotoReimportEditableState* _tmp18_; #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = job; + _tmp15_ = job; #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = _tmp16_->photo; + _tmp16_ = _tmp15_->photo; #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = job; + _tmp17_ = job; #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = _tmp18_->state; + _tmp18_ = _tmp17_->state; #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_finish_reimport_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo), _tmp19_, &_inner_error_); + photo_finish_reimport_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO, Photo), _tmp18_, &_inner_error_); #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 7650 "PhotoMonitor.c" +#line 7634 "PhotoMonitor.c" goto __catch598_database_error; } #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -7660,25 +7644,25 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background g_clear_error (&_inner_error_); #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 7661 "PhotoMonitor.c" +#line 7645 "PhotoMonitor.c" } } goto __finally598; __catch598_database_error: { GError* err = NULL; - GError* _tmp20_; + GError* _tmp19_; #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" err = _inner_error_; #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _inner_error_ = NULL; #line 1118 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = err; + _tmp19_ = err; #line 1118 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - app_window_database_error (_tmp20_); + app_window_database_error (_tmp19_); #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_error_free0 (err); -#line 7679 "PhotoMonitor.c" +#line 7663 "PhotoMonitor.c" } __finally598: #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -7691,38 +7675,40 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background g_clear_error (&_inner_error_); #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 7692 "PhotoMonitor.c" +#line 7676 "PhotoMonitor.c" } #line 1121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = job; + _tmp20_ = job; #line 1121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = _tmp21_->photo; + _tmp21_ = _tmp20_->photo; #line 1121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject)); + _tmp22_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_OBJECT, DataObject)); #line 1121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 1121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = g_strdup_printf ("Reimported editable for %s", _tmp24_); + _tmp24_ = g_strdup_printf ("Reimported editable for %s", _tmp23_); #line 1121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = _tmp25_; + _tmp25_ = _tmp24_; #line 1121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp26_); + media_monitor_mdbg (_tmp25_); #line 1121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp25_); #line 1121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp24_); + _g_free0 (_tmp23_); #line 1102 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); -#line 7714 "PhotoMonitor.c" +#line 7698 "PhotoMonitor.c" } -static void photo_monitor_on_editable_reimport_cancelled (PhotoMonitor* self, BackgroundJob* j) { +static void +photo_monitor_on_editable_reimport_cancelled (PhotoMonitor* self, + BackgroundJob* j) +{ gboolean removed = FALSE; GeeHashMap* _tmp0_; - BackgroundJob* _tmp1_; - LibraryPhoto* _tmp2_; - gboolean _tmp3_; + LibraryPhoto* _tmp1_; + gboolean _tmp2_; #line 1124 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 1124 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -7730,120 +7716,118 @@ static void photo_monitor_on_editable_reimport_cancelled (PhotoMonitor* self, Ba #line 1125 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = self->priv->editable_reimport_pending; #line 1125 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = j; -#line 1125 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PHOTO_MONITOR_TYPE_REIMPORT_EDITABLE_JOB, PhotoMonitorReimportEditableJob)->photo; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (j, PHOTO_MONITOR_TYPE_REIMPORT_EDITABLE_JOB, PhotoMonitorReimportEditableJob)->photo; #line 1125 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, NULL); + _tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL); #line 1125 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - removed = _tmp3_; + removed = _tmp2_; #line 1126 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _vala_assert (removed, "removed"); -#line 7740 "PhotoMonitor.c" +#line 7724 "PhotoMonitor.c" } -static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, BackgroundJob* j) { +static void +photo_monitor_on_raw_development_reimported (PhotoMonitor* self, + BackgroundJob* j) +{ PhotoMonitorReimportRawDevelopmentJob* job = NULL; - BackgroundJob* _tmp0_; - PhotoMonitorReimportRawDevelopmentJob* _tmp1_; + PhotoMonitorReimportRawDevelopmentJob* _tmp0_; gboolean removed = FALSE; - GeeHashMap* _tmp2_; - PhotoMonitorReimportRawDevelopmentJob* _tmp3_; - LibraryPhoto* _tmp4_; + GeeHashMap* _tmp1_; + PhotoMonitorReimportRawDevelopmentJob* _tmp2_; + LibraryPhoto* _tmp3_; + gboolean _tmp4_; gboolean _tmp5_; - gboolean _tmp6_; - PhotoMonitorReimportRawDevelopmentJob* _tmp7_; - GError* _tmp8_; - PhotoMonitorReimportRawDevelopmentJob* _tmp21_; - LibraryPhoto* _tmp22_; + PhotoMonitorReimportRawDevelopmentJob* _tmp6_; + GError* _tmp7_; + PhotoMonitorReimportRawDevelopmentJob* _tmp20_; + LibraryPhoto* _tmp21_; + gchar* _tmp22_; gchar* _tmp23_; gchar* _tmp24_; gchar* _tmp25_; - gchar* _tmp26_; GError * _inner_error_ = NULL; #line 1129 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 1129 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_BACKGROUND_JOB (j)); #line 1130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = j; -#line 1130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, PhotoMonitorReimportRawDevelopmentJob)); + _tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, PhotoMonitorReimportRawDevelopmentJob)); #line 1130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - job = _tmp1_; + job = _tmp0_; #line 1133 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = self->priv->raw_developments_reimport_pending; + _tmp1_ = self->priv->raw_developments_reimport_pending; #line 1133 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = job; + _tmp2_ = job; #line 1133 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _tmp3_->photo; + _tmp3_ = _tmp2_->photo; #line 1133 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, NULL); + _tmp4_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, NULL); #line 1133 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - removed = _tmp5_; + removed = _tmp4_; #line 1134 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = removed; + _tmp5_ = removed; #line 1134 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_assert (_tmp6_, "removed"); + _vala_assert (_tmp5_, "removed"); #line 1136 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = job; + _tmp6_ = job; #line 1136 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = _tmp7_->err; + _tmp7_ = _tmp6_->err; #line 1136 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp8_ != NULL) { -#line 7793 "PhotoMonitor.c" - PhotoMonitorReimportRawDevelopmentJob* _tmp9_; - LibraryPhoto* _tmp10_; + if (_tmp7_ != NULL) { +#line 7777 "PhotoMonitor.c" + PhotoMonitorReimportRawDevelopmentJob* _tmp8_; + LibraryPhoto* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; - PhotoMonitorReimportRawDevelopmentJob* _tmp13_; - GError* _tmp14_; - const gchar* _tmp15_; + PhotoMonitorReimportRawDevelopmentJob* _tmp12_; + GError* _tmp13_; + const gchar* _tmp14_; #line 1137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = job; + _tmp8_ = job; #line 1137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = _tmp9_->photo; + _tmp9_ = _tmp8_->photo; #line 1137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); + _tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); #line 1137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 1137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = job; + _tmp12_ = job; #line 1137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp13_->err; + _tmp13_ = _tmp12_->err; #line 1137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = _tmp14_->message; + _tmp14_ = _tmp13_->message; #line 1137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_critical ("PhotoMonitor.vala:1137: Unable to reimport raw development %s: %s", _tmp12_, _tmp15_); + g_critical ("PhotoMonitor.vala:1137: Unable to reimport raw development %s: %s", _tmp11_, _tmp14_); #line 1137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp11_); #line 1139 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); #line 1139 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 7823 "PhotoMonitor.c" +#line 7807 "PhotoMonitor.c" } { - PhotoMonitorReimportRawDevelopmentJob* _tmp16_; - LibraryPhoto* _tmp17_; - PhotoMonitorReimportRawDevelopmentJob* _tmp18_; - PhotoReimportRawDevelopmentState* _tmp19_; + PhotoMonitorReimportRawDevelopmentJob* _tmp15_; + LibraryPhoto* _tmp16_; + PhotoMonitorReimportRawDevelopmentJob* _tmp17_; + PhotoReimportRawDevelopmentState* _tmp18_; #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = job; + _tmp15_ = job; #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = _tmp16_->photo; + _tmp16_ = _tmp15_->photo; #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = job; + _tmp17_ = job; #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = _tmp18_->state; + _tmp18_ = _tmp17_->state; #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_finish_reimport_raw_development (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo), _tmp19_, &_inner_error_); + photo_finish_reimport_raw_development (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO, Photo), _tmp18_, &_inner_error_); #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 7844 "PhotoMonitor.c" +#line 7828 "PhotoMonitor.c" goto __catch599_database_error; } #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -7854,25 +7838,25 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac g_clear_error (&_inner_error_); #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 7855 "PhotoMonitor.c" +#line 7839 "PhotoMonitor.c" } } goto __finally599; __catch599_database_error: { GError* err = NULL; - GError* _tmp20_; + GError* _tmp19_; #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" err = _inner_error_; #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _inner_error_ = NULL; #line 1145 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = err; + _tmp19_ = err; #line 1145 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - app_window_database_error (_tmp20_); + app_window_database_error (_tmp19_); #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_error_free0 (err); -#line 7873 "PhotoMonitor.c" +#line 7857 "PhotoMonitor.c" } __finally599: #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -7885,38 +7869,40 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac g_clear_error (&_inner_error_); #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 7886 "PhotoMonitor.c" +#line 7870 "PhotoMonitor.c" } #line 1148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = job; + _tmp20_ = job; #line 1148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = _tmp21_->photo; + _tmp21_ = _tmp20_->photo; #line 1148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject)); + _tmp22_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_OBJECT, DataObject)); #line 1148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 1148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = g_strdup_printf ("Reimported raw development for %s", _tmp24_); + _tmp24_ = g_strdup_printf ("Reimported raw development for %s", _tmp23_); #line 1148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = _tmp25_; + _tmp25_ = _tmp24_; #line 1148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp26_); + media_monitor_mdbg (_tmp25_); #line 1148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp25_); #line 1148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp24_); + _g_free0 (_tmp23_); #line 1129 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); -#line 7908 "PhotoMonitor.c" +#line 7892 "PhotoMonitor.c" } -static void photo_monitor_on_raw_development_reimport_cancelled (PhotoMonitor* self, BackgroundJob* j) { +static void +photo_monitor_on_raw_development_reimport_cancelled (PhotoMonitor* self, + BackgroundJob* j) +{ gboolean removed = FALSE; GeeHashMap* _tmp0_; - BackgroundJob* _tmp1_; - LibraryPhoto* _tmp2_; - gboolean _tmp3_; + LibraryPhoto* _tmp1_; + gboolean _tmp2_; #line 1151 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 1151 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -7924,94 +7910,97 @@ static void photo_monitor_on_raw_development_reimport_cancelled (PhotoMonitor* s #line 1152 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = self->priv->raw_developments_reimport_pending; #line 1152 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = j; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (j, PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, PhotoMonitorReimportRawDevelopmentJob)->photo; #line 1152 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, PhotoMonitorReimportRawDevelopmentJob)->photo; + _tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL); #line 1152 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, NULL); -#line 1152 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - removed = _tmp3_; + removed = _tmp2_; #line 1153 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _vala_assert (removed, "removed"); -#line 7934 "PhotoMonitor.c" +#line 7918 "PhotoMonitor.c" } -static void _photo_monitor_on_master_reimported_completion_callback (BackgroundJob* job, gpointer self) { +static void +_photo_monitor_on_master_reimported_completion_callback (BackgroundJob* job, + gpointer self) +{ #line 168 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_monitor_on_master_reimported ((PhotoMonitor*) self, job); -#line 7941 "PhotoMonitor.c" +#line 7928 "PhotoMonitor.c" } -static void _photo_monitor_on_master_reimport_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { +static void +_photo_monitor_on_master_reimport_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self) +{ #line 168 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_monitor_on_master_reimport_cancelled ((PhotoMonitor*) self, job); -#line 7948 "PhotoMonitor.c" +#line 7938 "PhotoMonitor.c" } -static PhotoMonitorReimportMasterJob* photo_monitor_reimport_master_job_construct (GType object_type, PhotoMonitor* owner, LibraryPhoto* photo) { +static PhotoMonitorReimportMasterJob* +photo_monitor_reimport_master_job_construct (GType object_type, + PhotoMonitor* owner, + LibraryPhoto* photo) +{ PhotoMonitorReimportMasterJob* self = NULL; - PhotoMonitor* _tmp0_; - PhotoMonitor* _tmp1_; - GCancellable* _tmp2_; - GCancellable* _tmp3_; - PhotoMonitor* _tmp4_; - LibraryPhoto* _tmp5_; - LibraryPhoto* _tmp6_; + GCancellable* _tmp0_; + GCancellable* _tmp1_; + LibraryPhoto* _tmp2_; #line 167 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_PHOTO_MONITOR (owner), NULL); #line 167 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO (photo), NULL); #line 168 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = owner; -#line 168 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = owner; -#line 168 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = g_cancellable_new (); -#line 168 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = _tmp2_; + _tmp0_ = g_cancellable_new (); #line 168 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = owner; + _tmp1_ = _tmp0_; #line 168 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self = (PhotoMonitorReimportMasterJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _photo_monitor_on_master_reimported_completion_callback, _tmp1_, _tmp3_, _photo_monitor_on_master_reimport_cancelled_cancellation_callback, _tmp4_, NULL); + self = (PhotoMonitorReimportMasterJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), _photo_monitor_on_master_reimported_completion_callback, owner, _tmp1_, _photo_monitor_on_master_reimport_cancelled_cancellation_callback, owner, NULL); #line 168 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 171 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = photo; -#line 171 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp2_ = _g_object_ref0 (photo); #line 171 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (self->photo); #line 171 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->photo = _tmp6_; + self->photo = _tmp2_; #line 167 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self; -#line 7989 "PhotoMonitor.c" +#line 7971 "PhotoMonitor.c" } -static PhotoMonitorReimportMasterJob* photo_monitor_reimport_master_job_new (PhotoMonitor* owner, LibraryPhoto* photo) { +static PhotoMonitorReimportMasterJob* +photo_monitor_reimport_master_job_new (PhotoMonitor* owner, + LibraryPhoto* photo) +{ #line 167 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return photo_monitor_reimport_master_job_construct (PHOTO_MONITOR_TYPE_REIMPORT_MASTER_JOB, owner, photo); -#line 7996 "PhotoMonitor.c" +#line 7981 "PhotoMonitor.c" } -static gpointer _g_error_copy0 (gpointer self) { +static gpointer +_g_error_copy0 (gpointer self) +{ #line 178 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self ? g_error_copy (self) : NULL; -#line 8003 "PhotoMonitor.c" +#line 7990 "PhotoMonitor.c" } -static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base) { +static void +photo_monitor_reimport_master_job_real_execute (BackgroundJob* base) +{ PhotoMonitorReimportMasterJob * self; GError * _inner_error_ = NULL; #line 174 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTO_MONITOR_TYPE_REIMPORT_MASTER_JOB, PhotoMonitorReimportMasterJob); -#line 8012 "PhotoMonitor.c" +#line 8001 "PhotoMonitor.c" { gboolean _tmp0_ = FALSE; LibraryPhoto* _tmp1_; @@ -8029,12 +8018,12 @@ static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base) _tmp0_ = _tmp3_; #line 176 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8030 "PhotoMonitor.c" +#line 8019 "PhotoMonitor.c" goto __catch600_g_error; } #line 176 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->mark_online = _tmp0_; -#line 8035 "PhotoMonitor.c" +#line 8024 "PhotoMonitor.c" } goto __finally600; __catch600_g_error: @@ -8056,7 +8045,7 @@ static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base) self->err = _tmp5_; #line 175 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_error_free0 (err); -#line 8057 "PhotoMonitor.c" +#line 8046 "PhotoMonitor.c" } __finally600: #line 175 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -8067,34 +8056,40 @@ static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base) g_clear_error (&_inner_error_); #line 175 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 8068 "PhotoMonitor.c" +#line 8057 "PhotoMonitor.c" } } -static void photo_monitor_reimport_master_job_class_init (PhotoMonitorReimportMasterJobClass * klass) { +static void +photo_monitor_reimport_master_job_class_init (PhotoMonitorReimportMasterJobClass * klass) +{ #line 161 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_monitor_reimport_master_job_parent_class = g_type_class_peek_parent (klass); #line 161 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" ((BackgroundJobClass *) klass)->finalize = photo_monitor_reimport_master_job_finalize; #line 161 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) photo_monitor_reimport_master_job_real_execute; -#line 8080 "PhotoMonitor.c" +#line 8071 "PhotoMonitor.c" } -static void photo_monitor_reimport_master_job_instance_init (PhotoMonitorReimportMasterJob * self) { +static void +photo_monitor_reimport_master_job_instance_init (PhotoMonitorReimportMasterJob * self) +{ #line 163 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->reimport_state = NULL; #line 164 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->mark_online = FALSE; #line 165 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->err = NULL; -#line 8091 "PhotoMonitor.c" +#line 8084 "PhotoMonitor.c" } -static void photo_monitor_reimport_master_job_finalize (BackgroundJob * obj) { +static void +photo_monitor_reimport_master_job_finalize (BackgroundJob * obj) +{ PhotoMonitorReimportMasterJob * self; #line 161 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_MONITOR_TYPE_REIMPORT_MASTER_JOB, PhotoMonitorReimportMasterJob); @@ -8106,11 +8101,13 @@ static void photo_monitor_reimport_master_job_finalize (BackgroundJob * obj) { _g_error_free0 (self->err); #line 161 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" BACKGROUND_JOB_CLASS (photo_monitor_reimport_master_job_parent_class)->finalize (obj); -#line 8107 "PhotoMonitor.c" +#line 8102 "PhotoMonitor.c" } -static GType photo_monitor_reimport_master_job_get_type (void) { +static GType +photo_monitor_reimport_master_job_get_type (void) +{ static volatile gsize photo_monitor_reimport_master_job_type_id__volatile = 0; if (g_once_init_enter (&photo_monitor_reimport_master_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoMonitorReimportMasterJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_monitor_reimport_master_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoMonitorReimportMasterJob), 0, (GInstanceInitFunc) photo_monitor_reimport_master_job_instance_init, NULL }; @@ -8122,69 +8119,72 @@ static GType photo_monitor_reimport_master_job_get_type (void) { } -static void _photo_monitor_on_editable_reimported_completion_callback (BackgroundJob* job, gpointer self) { +static void +_photo_monitor_on_editable_reimported_completion_callback (BackgroundJob* job, + gpointer self) +{ #line 190 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_monitor_on_editable_reimported ((PhotoMonitor*) self, job); #line 8126 "PhotoMonitor.c" } -static void _photo_monitor_on_editable_reimport_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { +static void +_photo_monitor_on_editable_reimport_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self) +{ #line 190 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_monitor_on_editable_reimport_cancelled ((PhotoMonitor*) self, job); -#line 8133 "PhotoMonitor.c" +#line 8136 "PhotoMonitor.c" } -static PhotoMonitorReimportEditableJob* photo_monitor_reimport_editable_job_construct (GType object_type, PhotoMonitor* owner, LibraryPhoto* photo) { +static PhotoMonitorReimportEditableJob* +photo_monitor_reimport_editable_job_construct (GType object_type, + PhotoMonitor* owner, + LibraryPhoto* photo) +{ PhotoMonitorReimportEditableJob* self = NULL; - PhotoMonitor* _tmp0_; - PhotoMonitor* _tmp1_; - GCancellable* _tmp2_; - GCancellable* _tmp3_; - PhotoMonitor* _tmp4_; - LibraryPhoto* _tmp5_; - LibraryPhoto* _tmp6_; + GCancellable* _tmp0_; + GCancellable* _tmp1_; + LibraryPhoto* _tmp2_; #line 189 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_PHOTO_MONITOR (owner), NULL); #line 189 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO (photo), NULL); #line 190 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = owner; -#line 190 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = owner; -#line 190 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = g_cancellable_new (); + _tmp0_ = g_cancellable_new (); #line 190 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = _tmp2_; -#line 190 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = owner; + _tmp1_ = _tmp0_; #line 190 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self = (PhotoMonitorReimportEditableJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _photo_monitor_on_editable_reimported_completion_callback, _tmp1_, _tmp3_, _photo_monitor_on_editable_reimport_cancelled_cancellation_callback, _tmp4_, NULL); + self = (PhotoMonitorReimportEditableJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), _photo_monitor_on_editable_reimported_completion_callback, owner, _tmp1_, _photo_monitor_on_editable_reimport_cancelled_cancellation_callback, owner, NULL); #line 190 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp3_); -#line 193 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = photo; + _g_object_unref0 (_tmp1_); #line 193 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp2_ = _g_object_ref0 (photo); #line 193 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (self->photo); #line 193 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->photo = _tmp6_; + self->photo = _tmp2_; #line 189 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self; -#line 8174 "PhotoMonitor.c" +#line 8169 "PhotoMonitor.c" } -static PhotoMonitorReimportEditableJob* photo_monitor_reimport_editable_job_new (PhotoMonitor* owner, LibraryPhoto* photo) { +static PhotoMonitorReimportEditableJob* +photo_monitor_reimport_editable_job_new (PhotoMonitor* owner, + LibraryPhoto* photo) +{ #line 189 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return photo_monitor_reimport_editable_job_construct (PHOTO_MONITOR_TYPE_REIMPORT_EDITABLE_JOB, owner, photo); -#line 8181 "PhotoMonitor.c" +#line 8179 "PhotoMonitor.c" } -static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* base) { +static void +photo_monitor_reimport_editable_job_real_execute (BackgroundJob* base) +{ PhotoMonitorReimportEditableJob * self; GError * _inner_error_ = NULL; #line 196 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -8250,29 +8250,35 @@ static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* bas } -static void photo_monitor_reimport_editable_job_class_init (PhotoMonitorReimportEditableJobClass * klass) { +static void +photo_monitor_reimport_editable_job_class_init (PhotoMonitorReimportEditableJobClass * klass) +{ #line 183 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_monitor_reimport_editable_job_parent_class = g_type_class_peek_parent (klass); #line 183 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" ((BackgroundJobClass *) klass)->finalize = photo_monitor_reimport_editable_job_finalize; #line 183 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) photo_monitor_reimport_editable_job_real_execute; -#line 8258 "PhotoMonitor.c" +#line 8260 "PhotoMonitor.c" } -static void photo_monitor_reimport_editable_job_instance_init (PhotoMonitorReimportEditableJob * self) { +static void +photo_monitor_reimport_editable_job_instance_init (PhotoMonitorReimportEditableJob * self) +{ #line 185 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->state = NULL; #line 186 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->success = FALSE; #line 187 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->err = NULL; -#line 8269 "PhotoMonitor.c" +#line 8273 "PhotoMonitor.c" } -static void photo_monitor_reimport_editable_job_finalize (BackgroundJob * obj) { +static void +photo_monitor_reimport_editable_job_finalize (BackgroundJob * obj) +{ PhotoMonitorReimportEditableJob * self; #line 183 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_MONITOR_TYPE_REIMPORT_EDITABLE_JOB, PhotoMonitorReimportEditableJob); @@ -8284,11 +8290,13 @@ static void photo_monitor_reimport_editable_job_finalize (BackgroundJob * obj) { _g_error_free0 (self->err); #line 183 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" BACKGROUND_JOB_CLASS (photo_monitor_reimport_editable_job_parent_class)->finalize (obj); -#line 8285 "PhotoMonitor.c" +#line 8291 "PhotoMonitor.c" } -static GType photo_monitor_reimport_editable_job_get_type (void) { +static GType +photo_monitor_reimport_editable_job_get_type (void) +{ static volatile gsize photo_monitor_reimport_editable_job_type_id__volatile = 0; if (g_once_init_enter (&photo_monitor_reimport_editable_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoMonitorReimportEditableJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_monitor_reimport_editable_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoMonitorReimportEditableJob), 0, (GInstanceInitFunc) photo_monitor_reimport_editable_job_instance_init, NULL }; @@ -8300,74 +8308,77 @@ static GType photo_monitor_reimport_editable_job_get_type (void) { } -static void _photo_monitor_on_raw_development_reimported_completion_callback (BackgroundJob* job, gpointer self) { +static void +_photo_monitor_on_raw_development_reimported_completion_callback (BackgroundJob* job, + gpointer self) +{ #line 212 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_monitor_on_raw_development_reimported ((PhotoMonitor*) self, job); -#line 8304 "PhotoMonitor.c" +#line 8315 "PhotoMonitor.c" } -static void _photo_monitor_on_raw_development_reimport_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { +static void +_photo_monitor_on_raw_development_reimport_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self) +{ #line 212 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_monitor_on_raw_development_reimport_cancelled ((PhotoMonitor*) self, job); -#line 8311 "PhotoMonitor.c" +#line 8325 "PhotoMonitor.c" } -static PhotoMonitorReimportRawDevelopmentJob* photo_monitor_reimport_raw_development_job_construct (GType object_type, PhotoMonitor* owner, LibraryPhoto* photo) { +static PhotoMonitorReimportRawDevelopmentJob* +photo_monitor_reimport_raw_development_job_construct (GType object_type, + PhotoMonitor* owner, + LibraryPhoto* photo) +{ PhotoMonitorReimportRawDevelopmentJob* self = NULL; - PhotoMonitor* _tmp0_; - PhotoMonitor* _tmp1_; - GCancellable* _tmp2_; - GCancellable* _tmp3_; - PhotoMonitor* _tmp4_; - LibraryPhoto* _tmp5_; - LibraryPhoto* _tmp6_; + GCancellable* _tmp0_; + GCancellable* _tmp1_; + LibraryPhoto* _tmp2_; #line 211 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_PHOTO_MONITOR (owner), NULL); #line 211 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO (photo), NULL); #line 212 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = owner; -#line 212 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = owner; -#line 212 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = g_cancellable_new (); -#line 212 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = _tmp2_; + _tmp0_ = g_cancellable_new (); #line 212 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = owner; + _tmp1_ = _tmp0_; #line 212 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self = (PhotoMonitorReimportRawDevelopmentJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _photo_monitor_on_raw_development_reimported_completion_callback, _tmp1_, _tmp3_, _photo_monitor_on_raw_development_reimport_cancelled_cancellation_callback, _tmp4_, NULL); + self = (PhotoMonitorReimportRawDevelopmentJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), _photo_monitor_on_raw_development_reimported_completion_callback, owner, _tmp1_, _photo_monitor_on_raw_development_reimport_cancelled_cancellation_callback, owner, NULL); #line 212 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 215 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = photo; -#line 215 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp2_ = _g_object_ref0 (photo); #line 215 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (self->photo); #line 215 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->photo = _tmp6_; + self->photo = _tmp2_; #line 211 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self; -#line 8352 "PhotoMonitor.c" +#line 8358 "PhotoMonitor.c" } -static PhotoMonitorReimportRawDevelopmentJob* photo_monitor_reimport_raw_development_job_new (PhotoMonitor* owner, LibraryPhoto* photo) { +static PhotoMonitorReimportRawDevelopmentJob* +photo_monitor_reimport_raw_development_job_new (PhotoMonitor* owner, + LibraryPhoto* photo) +{ #line 211 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return photo_monitor_reimport_raw_development_job_construct (PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, owner, photo); -#line 8359 "PhotoMonitor.c" +#line 8368 "PhotoMonitor.c" } -static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJob* base) { +static void +photo_monitor_reimport_raw_development_job_real_execute (BackgroundJob* base) +{ PhotoMonitorReimportRawDevelopmentJob * self; GError * _inner_error_ = NULL; #line 218 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, PhotoMonitorReimportRawDevelopmentJob); -#line 8368 "PhotoMonitor.c" +#line 8379 "PhotoMonitor.c" { gboolean _tmp0_ = FALSE; LibraryPhoto* _tmp1_; @@ -8385,12 +8396,12 @@ static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJ _tmp0_ = _tmp3_; #line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8386 "PhotoMonitor.c" +#line 8397 "PhotoMonitor.c" goto __catch602_g_error; } #line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->success = _tmp0_; -#line 8391 "PhotoMonitor.c" +#line 8402 "PhotoMonitor.c" } goto __finally602; __catch602_g_error: @@ -8412,7 +8423,7 @@ static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJ self->err = _tmp5_; #line 219 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_error_free0 (err); -#line 8413 "PhotoMonitor.c" +#line 8424 "PhotoMonitor.c" } __finally602: #line 219 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -8423,34 +8434,40 @@ static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJ g_clear_error (&_inner_error_); #line 219 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 8424 "PhotoMonitor.c" +#line 8435 "PhotoMonitor.c" } } -static void photo_monitor_reimport_raw_development_job_class_init (PhotoMonitorReimportRawDevelopmentJobClass * klass) { +static void +photo_monitor_reimport_raw_development_job_class_init (PhotoMonitorReimportRawDevelopmentJobClass * klass) +{ #line 205 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_monitor_reimport_raw_development_job_parent_class = g_type_class_peek_parent (klass); #line 205 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" ((BackgroundJobClass *) klass)->finalize = photo_monitor_reimport_raw_development_job_finalize; #line 205 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) photo_monitor_reimport_raw_development_job_real_execute; -#line 8436 "PhotoMonitor.c" +#line 8449 "PhotoMonitor.c" } -static void photo_monitor_reimport_raw_development_job_instance_init (PhotoMonitorReimportRawDevelopmentJob * self) { +static void +photo_monitor_reimport_raw_development_job_instance_init (PhotoMonitorReimportRawDevelopmentJob * self) +{ #line 207 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->state = NULL; #line 208 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->success = FALSE; #line 209 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->err = NULL; -#line 8447 "PhotoMonitor.c" +#line 8462 "PhotoMonitor.c" } -static void photo_monitor_reimport_raw_development_job_finalize (BackgroundJob * obj) { +static void +photo_monitor_reimport_raw_development_job_finalize (BackgroundJob * obj) +{ PhotoMonitorReimportRawDevelopmentJob * self; #line 205 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, PhotoMonitorReimportRawDevelopmentJob); @@ -8462,11 +8479,13 @@ static void photo_monitor_reimport_raw_development_job_finalize (BackgroundJob * _g_error_free0 (self->err); #line 205 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" BACKGROUND_JOB_CLASS (photo_monitor_reimport_raw_development_job_parent_class)->finalize (obj); -#line 8463 "PhotoMonitor.c" +#line 8480 "PhotoMonitor.c" } -static GType photo_monitor_reimport_raw_development_job_get_type (void) { +static GType +photo_monitor_reimport_raw_development_job_get_type (void) +{ static volatile gsize photo_monitor_reimport_raw_development_job_type_id__volatile = 0; if (g_once_init_enter (&photo_monitor_reimport_raw_development_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoMonitorReimportRawDevelopmentJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_monitor_reimport_raw_development_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoMonitorReimportRawDevelopmentJob), 0, (GInstanceInitFunc) photo_monitor_reimport_raw_development_job_instance_init, NULL }; @@ -8478,7 +8497,9 @@ static GType photo_monitor_reimport_raw_development_job_get_type (void) { } -static void photo_monitor_class_init (PhotoMonitorClass * klass) { +static void +photo_monitor_class_init (PhotoMonitorClass * klass) +{ #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_monitor_parent_class = g_type_class_peek_parent (klass); #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -8519,11 +8540,13 @@ static void photo_monitor_class_init (PhotoMonitorClass * klass) { ((MediaMonitorClass *) klass)->process_updates = (void (*) (MediaMonitor *, GeeCollection*, TransactionController*, gint*, GError**)) photo_monitor_real_process_updates; #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" G_OBJECT_CLASS (klass)->finalize = photo_monitor_finalize; -#line 8520 "PhotoMonitor.c" +#line 8541 "PhotoMonitor.c" } -static void photo_monitor_instance_init (PhotoMonitor * self) { +static void +photo_monitor_instance_init (PhotoMonitor * self) +{ GeeArrayList* _tmp0_; GeeArrayList* _tmp1_; GeeHashMap* _tmp2_; @@ -8551,11 +8574,13 @@ static void photo_monitor_instance_init (PhotoMonitor * self) { _tmp4_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, (GBoxedCopyFunc) background_job_ref, (GDestroyNotify) background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 234 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->priv->raw_developments_reimport_pending = _tmp4_; -#line 8552 "PhotoMonitor.c" +#line 8575 "PhotoMonitor.c" } -static void photo_monitor_finalize (GObject * obj) { +static void +photo_monitor_finalize (GObject * obj) +{ PhotoMonitor * self; #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_MONITOR, PhotoMonitor); @@ -8573,11 +8598,13 @@ static void photo_monitor_finalize (GObject * obj) { _g_object_unref0 (self->priv->raw_developments_reimport_pending); #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" G_OBJECT_CLASS (photo_monitor_parent_class)->finalize (obj); -#line 8574 "PhotoMonitor.c" +#line 8599 "PhotoMonitor.c" } -GType photo_monitor_get_type (void) { +GType +photo_monitor_get_type (void) +{ static volatile gsize photo_monitor_type_id__volatile = 0; if (g_once_init_enter (&photo_monitor_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoMonitorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_monitor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoMonitor), 0, (GInstanceInitFunc) photo_monitor_instance_init, NULL }; @@ -8589,7 +8616,11 @@ GType photo_monitor_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -8601,7 +8632,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/PhotoPage.c b/src/PhotoPage.c index 8693b5d..8b5783a 100644 --- a/src/PhotoPage.c +++ b/src/PhotoPage.c @@ -1,4 +1,4 @@ -/* PhotoPage.c generated by valac 0.36.6, the Vala compiler +/* PhotoPage.c generated by valac 0.40.4, the Vala compiler * generated from PhotoPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -153,6 +154,11 @@ typedef struct _PageClass PageClass; typedef struct _SinglePhotoPage SinglePhotoPage; typedef struct _SinglePhotoPageClass SinglePhotoPageClass; +enum { + ZOOM_BUFFER_0_PROPERTY, + ZOOM_BUFFER_NUM_PROPERTIES +}; +static GParamSpec* zoom_buffer_properties[ZOOM_BUFFER_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _background_job_unref0(var) ((var == NULL) ? NULL : (var = (background_job_unref (var), NULL))) #define _workers_unref0(var) ((var == NULL) ? NULL : (var = (workers_unref (var), NULL))) @@ -309,6 +315,11 @@ typedef struct _PixbufCacheClass PixbufCacheClass; typedef struct _DragAndDropHandler DragAndDropHandler; typedef struct _DragAndDropHandlerClass DragAndDropHandlerClass; +enum { + EDITING_HOST_PAGE_0_PROPERTY, + EDITING_HOST_PAGE_NUM_PROPERTIES +}; +static GParamSpec* editing_host_page_properties[EDITING_HOST_PAGE_NUM_PROPERTIES]; #define TYPE_ALTERATION (alteration_get_type ()) #define ALTERATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ALTERATION, Alteration)) @@ -729,6 +740,11 @@ typedef struct _ViewFilterClass ViewFilterClass; typedef struct _LibraryPhotoPageLibraryPhotoPageViewFilter LibraryPhotoPageLibraryPhotoPageViewFilter; typedef struct _LibraryPhotoPageLibraryPhotoPageViewFilterClass LibraryPhotoPageLibraryPhotoPageViewFilterClass; +enum { + LIBRARY_PHOTO_PAGE_0_PROPERTY, + LIBRARY_PHOTO_PAGE_NUM_PROPERTIES +}; +static GParamSpec* library_photo_page_properties[LIBRARY_PHOTO_PAGE_NUM_PROPERTIES]; #define TYPE_DATABASE_SOURCE_COLLECTION (database_source_collection_get_type ()) #define DATABASE_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection)) @@ -1480,73 +1496,139 @@ ZoomState* zoom_state_dup (const ZoomState* self); void zoom_state_free (ZoomState* self); gpointer background_job_ref (gpointer instance); void background_job_unref (gpointer instance); -GParamSpec* param_spec_background_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_background_job (GValue* value, gpointer v_object); -void value_take_background_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_background_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_background_job (GValue* value, + gpointer v_object); +void value_take_background_job (GValue* value, + gpointer v_object); gpointer value_get_background_job (const GValue* value); GType background_job_get_type (void) G_GNUC_CONST; static GType zoom_buffer_transformation_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; gpointer workers_ref (gpointer instance); void workers_unref (gpointer instance); -GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_workers (GValue* value, gpointer v_object); -void value_take_workers (GValue* value, gpointer v_object); +GParamSpec* param_spec_workers (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_workers (GValue* value, + gpointer v_object); +void value_take_workers (GValue* value, + gpointer v_object); gpointer value_get_workers (const GValue* value); GType workers_get_type (void) G_GNUC_CONST; GType page_get_type (void) G_GNUC_CONST; GType single_photo_page_get_type (void) G_GNUC_CONST; #define ZOOM_BUFFER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ZOOM_BUFFER, ZoomBufferPrivate)) -enum { - ZOOM_BUFFER_DUMMY_PROPERTY -}; #define ZOOM_BUFFER_MEGAPIXEL 1048576 #define ZOOM_BUFFER_USE_REDUCED_THRESHOLD (((gint) 2.0) * ZOOM_BUFFER_MEGAPIXEL) -ZoomBuffer* zoom_buffer_new (SinglePhotoPage* parent_page, Photo* backing_photo, GdkPixbuf* preview_image); -ZoomBuffer* zoom_buffer_construct (GType object_type, SinglePhotoPage* parent_page, Photo* backing_photo, GdkPixbuf* preview_image); -Workers* workers_new (guint max_threads, gboolean exclusive); -Workers* workers_construct (GType object_type, guint max_threads, gboolean exclusive); -static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, BackgroundJob* job); +ZoomBuffer* zoom_buffer_new (SinglePhotoPage* parent_page, + Photo* backing_photo, + GdkPixbuf* preview_image); +ZoomBuffer* zoom_buffer_construct (GType object_type, + SinglePhotoPage* parent_page, + Photo* backing_photo, + GdkPixbuf* preview_image); +Workers* workers_new (guint max_threads, + gboolean exclusive); +Workers* workers_construct (GType object_type, + guint max_threads, + gboolean exclusive); +static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, + BackgroundJob* job); static GType zoom_buffer_iso_source_fetch_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; GType background_job_job_priority_get_type (void) G_GNUC_CONST; GType direction_get_type (void) G_GNUC_CONST; -void single_photo_page_repaint (SinglePhotoPage* self, Direction* direction); +void single_photo_page_repaint (SinglePhotoPage* self, + Direction* direction); PixelTransformer* photo_get_pixel_transformer (Photo* self); -static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, BackgroundJob* job); -static void _zoom_buffer_on_iso_transformation_complete_completion_callback (BackgroundJob* job, gpointer self); -static ZoomBufferTransformationJob* zoom_buffer_transformation_job_new (ZoomBuffer* owner, GdkPixbuf* to_transform, PixelTransformer* transformer, CompletionCallback completion_callback, void* completion_callback_target, GCancellable* cancellable); -static ZoomBufferTransformationJob* zoom_buffer_transformation_job_construct (GType object_type, ZoomBuffer* owner, GdkPixbuf* to_transform, PixelTransformer* transformer, CompletionCallback completion_callback, void* completion_callback_target, GCancellable* cancellable); -void workers_enqueue (Workers* self, BackgroundJob* job); -static void zoom_buffer_on_demand_transform_complete (ZoomBuffer* self, BackgroundJob* job); -static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, ZoomState* zoom_state, GdkPixbuf* iso_pixbuf, GdkPixbuf* reduced_pixbuf); -void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle* result); -void zoom_state_get_viewing_rectangle_projection (ZoomState *self, GdkPixbuf* for_pixbuf, GdkRectangle* result); +static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, + BackgroundJob* job); +static void _zoom_buffer_on_iso_transformation_complete_completion_callback (BackgroundJob* job, + gpointer self); +static ZoomBufferTransformationJob* zoom_buffer_transformation_job_new (ZoomBuffer* owner, + GdkPixbuf* to_transform, + PixelTransformer* transformer, + CompletionCallback completion_callback, + void* completion_callback_target, + GCancellable* cancellable); +static ZoomBufferTransformationJob* zoom_buffer_transformation_job_construct (GType object_type, + ZoomBuffer* owner, + GdkPixbuf* to_transform, + PixelTransformer* transformer, + CompletionCallback completion_callback, + void* completion_callback_target, + GCancellable* cancellable); +void workers_enqueue (Workers* self, + BackgroundJob* job); +static void zoom_buffer_on_demand_transform_complete (ZoomBuffer* self, + BackgroundJob* job); +static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, + ZoomState* zoom_state, + GdkPixbuf* iso_pixbuf, + GdkPixbuf* reduced_pixbuf); +void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, + GdkRectangle* result); +void zoom_state_get_viewing_rectangle_projection (ZoomState *self, + GdkPixbuf* for_pixbuf, + GdkRectangle* result); gdouble zoom_state_get_zoom_factor (ZoomState *self); -static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffer* self, ZoomState* zoom_state); -gboolean zoom_state_equals (ZoomState *self, ZoomState* other); -GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomState* zoom_state); +static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffer* self, + ZoomState* zoom_state); +gboolean zoom_state_equals (ZoomState *self, + ZoomState* other); +GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, + ZoomState* zoom_state); void background_job_cancel (BackgroundJob* self); -static void _zoom_buffer_on_demand_transform_complete_completion_callback (BackgroundJob* job, gpointer self); -static void _zoom_buffer_on_iso_source_fetch_complete_completion_callback (BackgroundJob* job, gpointer self); -static ZoomBufferIsoSourceFetchJob* zoom_buffer_iso_source_fetch_job_new (ZoomBuffer* owner, Photo* to_fetch, CompletionCallback completion_callback, void* completion_callback_target); -static ZoomBufferIsoSourceFetchJob* zoom_buffer_iso_source_fetch_job_construct (GType object_type, ZoomBuffer* owner, Photo* to_fetch, CompletionCallback completion_callback, void* completion_callback_target); +static void _zoom_buffer_on_demand_transform_complete_completion_callback (BackgroundJob* job, + gpointer self); +static void _zoom_buffer_on_iso_source_fetch_complete_completion_callback (BackgroundJob* job, + gpointer self); +static ZoomBufferIsoSourceFetchJob* zoom_buffer_iso_source_fetch_job_new (ZoomBuffer* owner, + Photo* to_fetch, + CompletionCallback completion_callback, + void* completion_callback_target); +static ZoomBufferIsoSourceFetchJob* zoom_buffer_iso_source_fetch_job_construct (GType object_type, + ZoomBuffer* owner, + Photo* to_fetch, + CompletionCallback completion_callback, + void* completion_callback_target); Photo* zoom_buffer_get_backing_photo (ZoomBuffer* self); -void zoom_buffer_update_preview_image (ZoomBuffer* self, GdkPixbuf* preview_image); -void zoom_buffer_flush_demand_cache (ZoomBuffer* self, ZoomState* initial_zoom_state); -GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state); +void zoom_buffer_update_preview_image (ZoomBuffer* self, + GdkPixbuf* preview_image); +void zoom_buffer_flush_demand_cache (ZoomBuffer* self, + ZoomState* initial_zoom_state); +GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, + ZoomState* zoom_state); gdouble zoom_state_get_interpolation_factor (ZoomState *self); -GdkPixbuf* zoom_buffer_get_zoom_preview_image (ZoomBuffer* self, ZoomState* zoom_state); +GdkPixbuf* zoom_buffer_get_zoom_preview_image (ZoomBuffer* self, + ZoomState* zoom_state); #define ZOOM_BUFFER_ISO_SOURCE_FETCH_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ZOOM_BUFFER_TYPE_ISO_SOURCE_FETCH_JOB, ZoomBufferIsoSourceFetchJobPrivate)) -enum { - ZOOM_BUFFER_ISO_SOURCE_FETCH_JOB_DUMMY_PROPERTY -}; gpointer abstract_semaphore_ref (gpointer instance); void abstract_semaphore_unref (gpointer instance); -GParamSpec* param_spec_abstract_semaphore (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_abstract_semaphore (GValue* value, gpointer v_object); -void value_take_abstract_semaphore (GValue* value, gpointer v_object); +GParamSpec* param_spec_abstract_semaphore (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_abstract_semaphore (GValue* value, + gpointer v_object); +void value_take_abstract_semaphore (GValue* value, + gpointer v_object); gpointer value_get_abstract_semaphore (const GValue* value); GType abstract_semaphore_get_type (void) G_GNUC_CONST; -BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore); +BackgroundJob* background_job_construct (GType object_type, + GObject* owner, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target, + AbstractSemaphore* completion_semaphore); static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base); GType scaling_get_type (void) G_GNUC_CONST; GType scale_constraint_get_type (void) G_GNUC_CONST; @@ -1554,13 +1636,14 @@ Scaling* scaling_dup (const Scaling* self); void scaling_free (Scaling* self); GType photo_exception_get_type (void) G_GNUC_CONST; GType backing_fetch_mode_get_type (void) G_GNUC_CONST; -GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error); +GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, + Scaling* scaling, + PhotoException exceptions, + BackingFetchMode fetch_mode, + GError** error); void scaling_for_original (Scaling* result); static void zoom_buffer_iso_source_fetch_job_finalize (BackgroundJob * obj); #define ZOOM_BUFFER_TRANSFORMATION_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, ZoomBufferTransformationJobPrivate)) -enum { - ZOOM_BUFFER_TRANSFORMATION_JOB_DUMMY_PROPERTY -}; static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base); static void zoom_buffer_transformation_job_finalize (BackgroundJob * obj); static void zoom_buffer_finalize (GObject * obj); @@ -1568,9 +1651,15 @@ GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType single_photo_page_update_reason_get_type (void) G_GNUC_CONST; @@ -1578,45 +1667,73 @@ GType editing_host_page_get_type (void) G_GNUC_CONST; GType data_view_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; gpointer editing_tools_editing_tool_ref (gpointer instance); void editing_tools_editing_tool_unref (gpointer instance); -GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void editing_tools_value_set_editing_tool (GValue* value, gpointer v_object); -void editing_tools_value_take_editing_tool (GValue* value, gpointer v_object); +GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void editing_tools_value_set_editing_tool (GValue* value, + gpointer v_object); +void editing_tools_value_take_editing_tool (GValue* value, + gpointer v_object); gpointer editing_tools_value_get_editing_tool (const GValue* value); GType editing_tools_editing_tool_get_type (void) G_GNUC_CONST; GType pixbuf_cache_get_type (void) G_GNUC_CONST; gpointer drag_and_drop_handler_ref (gpointer instance); void drag_and_drop_handler_unref (gpointer instance); -GParamSpec* param_spec_drag_and_drop_handler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_drag_and_drop_handler (GValue* value, gpointer v_object); -void value_take_drag_and_drop_handler (GValue* value, gpointer v_object); +GParamSpec* param_spec_drag_and_drop_handler (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_drag_and_drop_handler (GValue* value, + gpointer v_object); +void value_take_drag_and_drop_handler (GValue* value, + gpointer v_object); gpointer value_get_drag_and_drop_handler (const GValue* value); GType drag_and_drop_handler_get_type (void) G_GNUC_CONST; #define EDITING_HOST_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EDITING_HOST_PAGE, EditingHostPagePrivate)) -enum { - EDITING_HOST_PAGE_DUMMY_PROPERTY -}; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; -static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap* map); -static void _editing_host_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void editing_host_page_on_photos_altered (EditingHostPage* self, + GeeMap* map); +static void _editing_host_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); ViewCollection* page_get_view (Page* self); static void editing_host_page_on_view_contents_ordering_altered (EditingHostPage* self); -static void _editing_host_page_on_view_contents_ordering_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self); -static void _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed (DataCollection* _sender, gpointer self); +static void _editing_host_page_on_view_contents_ordering_altered_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self); +static void _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed (DataCollection* _sender, + gpointer self); #define RESOURCES_PREVIOUS_LABEL _ ("_Previous") #define RESOURCES_NEXT_LABEL _ ("_Next") #define EDITING_HOST_PAGE_TRINKET_SCALE 20 @@ -1626,63 +1743,99 @@ static void _editing_host_page_on_view_contents_ordering_altered_data_collection #define EDITING_HOST_PAGE_TOOL_WINDOW_SEPARATOR 8 #define EDITING_HOST_PAGE_PIXBUF_CACHE_COUNT 5 #define EDITING_HOST_PAGE_ORIGINAL_PIXBUF_CACHE_COUNT 5 -EditingHostPage* editing_host_page_construct (GType object_type, SourceCollection* sources, const gchar* name); -SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* page_name, gboolean scale_up_to_viewport); +EditingHostPage* editing_host_page_construct (GType object_type, + SourceCollection* sources, + const gchar* name); +SinglePhotoPage* single_photo_page_construct (GType object_type, + const gchar* page_name, + gboolean scale_up_to_viewport); static void editing_host_page_on_viewport_resized (EditingHostPage* self); -static void _editing_host_page_on_viewport_resized_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self); +static void _editing_host_page_on_viewport_resized_gtk_widget_size_allocate (GtkWidget* _sender, + GtkAllocation* allocation, + gpointer self); GtkToolbar* page_get_toolbar (Page* self); #define RESOURCES_ROTATE_CW_LABEL _ ("Rotate") #define RESOURCES_CLOCKWISE "object-rotate-right" #define RESOURCES_ROTATE_CW_TOOLTIP _ ("Rotate the photos right (press Ctrl to rotate left)") void editing_host_page_on_rotate_clockwise (EditingHostPage* self); -static void _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); +static void _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked (GtkToolButton* _sender, + gpointer self); #define RESOURCES_CROP_LABEL _ ("Crop") #define RESOURCES_CROP_TOOLTIP _ ("Crop the photo’s size") static void editing_host_page_on_crop_toggled (EditingHostPage* self); -static void _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self); +static void _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, + gpointer self); #define RESOURCES_STRAIGHTEN_LABEL _ ("Straighten") #define RESOURCES_STRAIGHTEN_TOOLTIP _ ("Straighten the photo") static void editing_host_page_on_straighten_toggled (EditingHostPage* self); -static void _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self); +static void _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, + gpointer self); #define RESOURCES_RED_EYE_LABEL _ ("Red-eye") #define RESOURCES_RED_EYE_TOOLTIP _ ("Reduce or eliminate any red-eye effects in the photo") static void editing_host_page_on_redeye_toggled (EditingHostPage* self); -static void _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self); +static void _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, + gpointer self); #define RESOURCES_ADJUST "image-adjust" #define RESOURCES_ADJUST_LABEL _ ("Adjust") #define RESOURCES_ADJUST_TOOLTIP _ ("Adjust the photo’s color and tone") static void editing_host_page_on_adjust_toggled (EditingHostPage* self); -static void _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self); +static void _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, + gpointer self); #define RESOURCES_ENHANCE_LABEL _ ("Enhance") #define RESOURCES_ENHANCE "shotwell-auto-enhance" #define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo’s appearance") void editing_host_page_on_enhance (EditingHostPage* self); -static void _editing_host_page_on_enhance_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); -GdkPixbuf* resources_load_icon (const gchar* name, gint scale); +static void _editing_host_page_on_enhance_gtk_tool_button_clicked (GtkToolButton* _sender, + gpointer self); +GdkPixbuf* resources_load_icon (const gchar* name, + gint scale); #define RESOURCES_ICON_ZOOM_OUT "zoom-out.png" #define RESOURCES_ICON_ZOOM_SCALE 16 -static gboolean editing_host_page_on_zoom_out_pressed (EditingHostPage* self, GdkEventButton* event); -static gboolean _editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); +static gboolean editing_host_page_on_zoom_out_pressed (EditingHostPage* self, + GdkEventButton* event); +static gboolean _editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self); static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* self); -static void _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self); -static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* self, GdkEventButton* event); -static gboolean _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); -static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self, GdkEventButton* event); -static gboolean _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); -gboolean editing_host_page_on_zoom_slider_key_press (EditingHostPage* self, GdkEventKey* event); -static gboolean _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self); +static void _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed (GtkRange* _sender, + gpointer self); +static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* self, + GdkEventButton* event); +static gboolean _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self); +static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self, + GdkEventButton* event); +static gboolean _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self); +gboolean editing_host_page_on_zoom_slider_key_press (EditingHostPage* self, + GdkEventKey* event); +static gboolean _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event (GtkWidget* _sender, + GdkEventKey* event, + gpointer self); #define RESOURCES_ICON_ZOOM_IN "zoom-in.png" -static gboolean editing_host_page_on_zoom_in_pressed (EditingHostPage* self, GdkEventButton* event); -static gboolean _editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); +static gboolean editing_host_page_on_zoom_in_pressed (EditingHostPage* self, + GdkEventButton* event); +static gboolean _editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self); void single_photo_page_on_previous_photo (SinglePhotoPage* self); -static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); +static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, + gpointer self); void single_photo_page_on_next_photo (SinglePhotoPage* self); -static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); -void single_photo_page_get_zoom_state (SinglePhotoPage* self, ZoomState* result); -void zoom_state_init_rescale (ZoomState *self, ZoomState* existing, gdouble new_slider_val); -void single_photo_page_on_interactive_zoom (SinglePhotoPage* self, ZoomState* interactive_zoom_state); +static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, + gpointer self); +void single_photo_page_get_zoom_state (SinglePhotoPage* self, + ZoomState* result); +void zoom_state_init_rescale (ZoomState *self, + ZoomState* existing, + gdouble new_slider_val); +void single_photo_page_on_interactive_zoom (SinglePhotoPage* self, + ZoomState* interactive_zoom_state); gboolean zoom_state_is_default (ZoomState *self); -void single_photo_page_set_zoom_state (SinglePhotoPage* self, ZoomState* zoom_state); +void single_photo_page_set_zoom_state (SinglePhotoPage* self, + ZoomState* zoom_state); void single_photo_page_cancel_zoom (SinglePhotoPage* self); static void editing_host_page_update_cursor_for_zoom_context (EditingHostPage* self); GtkWindow* page_get_container (Page* self); @@ -1690,23 +1843,46 @@ void fullscreen_window_disable_toolbar_dismissal (FullscreenWindow* self); void fullscreen_window_update_toolbar_dismissal (FullscreenWindow* self); void editing_host_page_snap_zoom_to_min (EditingHostPage* self); void editing_host_page_snap_zoom_to_max (EditingHostPage* self); -static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, GdkEventScroll* event, GdkPoint* result); -void zoom_state_get_viewing_rectangle_wrt_screen (ZoomState *self, GdkRectangle* result); -static void editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* self, GdkEventScroll* event, GdkPoint* result); -void subtract_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result); -static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self, GdkEventScroll* event, GdkPoint* result); -void scale_point (GdkPoint* p, gdouble factor, GdkPoint* result); -void zoom_state_get_viewport_center (ZoomState *self, GdkPoint* result); -void add_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result); -static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* self, gdouble interp); -static gdouble editing_host_page_adjust_interpolation_factor (EditingHostPage* self, gdouble adjustment); -static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* self, GdkEventScroll* event, gdouble zoom_increment); +static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, + GdkEventScroll* event, + GdkPoint* result); +void zoom_state_get_viewing_rectangle_wrt_screen (ZoomState *self, + GdkRectangle* result); +static void editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* self, + GdkEventScroll* event, + GdkPoint* result); +void subtract_points (GdkPoint* p1, + GdkPoint* p2, + GdkPoint* result); +static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self, + GdkEventScroll* event, + GdkPoint* result); +void scale_point (GdkPoint* p, + gdouble factor, + GdkPoint* result); +void zoom_state_get_viewport_center (ZoomState *self, + GdkPoint* result); +void add_points (GdkPoint* p1, + GdkPoint* p2, + GdkPoint* result); +static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* self, + gdouble interp); +static gdouble editing_host_page_adjust_interpolation_factor (EditingHostPage* self, + gdouble adjustment); +static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* self, + GdkEventScroll* event, + gdouble zoom_increment); gboolean zoom_state_is_min (ZoomState *self); -void zoom_state_init_pan (ZoomState *self, ZoomState* existing, GdkPoint* new_viewport_center); +void zoom_state_init_pan (ZoomState *self, + ZoomState* existing, + GdkPoint* new_viewport_center); void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self); -void zoom_state_init_rescale_to_isomorphic (ZoomState *self, ZoomState* existing); -static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage* self, GdkEventKey* event); -void page_activate_action (Page* self, const gchar* name); +void zoom_state_init_rescale_to_isomorphic (ZoomState *self, + ZoomState* existing); +static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage* self, + GdkEventKey* event); +void page_activate_action (Page* self, + const gchar* name); void editing_host_page_on_increase_size (EditingHostPage* self); static void editing_host_page_real_on_increase_size (EditingHostPage* self); void editing_host_page_on_decrease_size (EditingHostPage* self); @@ -1714,247 +1890,498 @@ static void editing_host_page_real_on_decrease_size (EditingHostPage* self); static void editing_host_page_real_save_zoom_state (SinglePhotoPage* base); void single_photo_page_save_zoom_state (SinglePhotoPage* self); static ZoomBuffer* editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base); -static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScroll* event); +static gboolean editing_host_page_real_on_mousewheel_up (Page* base, + GdkEventScroll* event); gboolean zoom_state_is_max (ZoomState *self); -static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventScroll* event); +static gboolean editing_host_page_real_on_mousewheel_down (Page* base, + GdkEventScroll* event); static void editing_host_page_real_restore_zoom_state (SinglePhotoPage* base); void single_photo_page_restore_zoom_state (SinglePhotoPage* self); static gboolean editing_host_page_real_is_zoom_supported (SinglePhotoPage* base); -static void editing_host_page_real_set_container (Page* base, GtkWindow* container); -void page_set_container (Page* self, GtkWindow* container); +static void editing_host_page_real_set_container (Page* base, + GtkWindow* container); +void page_set_container (Page* self, + GtkWindow* container); DragAndDropHandler* drag_and_drop_handler_new (Page* page); -DragAndDropHandler* drag_and_drop_handler_construct (GType object_type, Page* page); +DragAndDropHandler* drag_and_drop_handler_construct (GType object_type, + Page* page); ViewCollection* editing_host_page_get_parent_view (EditingHostPage* self); gboolean editing_host_page_has_photo (EditingHostPage* self); Photo* editing_host_page_get_photo (EditingHostPage* self); gint view_collection_get_selected_count (ViewCollection* self); -DataView* view_collection_get_selected_at (ViewCollection* self, gint index); +DataView* view_collection_get_selected_at (ViewCollection* self, + gint index); DataSource* data_view_get_source (DataView* self); -void editing_host_page_photo_changing (EditingHostPage* self, Photo* new_photo); -static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo* new_photo); +void editing_host_page_photo_changing (EditingHostPage* self, + Photo* new_photo); +static void editing_host_page_real_photo_changing (EditingHostPage* self, + Photo* new_photo); GType photo_file_format_get_type (void) G_GNUC_CONST; PhotoFileFormat photo_get_file_format (Photo* self); -void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missing); +void editing_host_page_set_photo_missing (EditingHostPage* self, + gboolean missing); GFile* media_source_get_file (MediaSource* self); -void editing_host_page_update_ui (EditingHostPage* self, gboolean missing); -static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo); -DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source); +void editing_host_page_update_ui (EditingHostPage* self, + gboolean missing); +static void editing_host_page_set_photo (EditingHostPage* self, + Photo* photo); +DataView* view_collection_get_view_for_source (ViewCollection* self, + DataSource* source); void view_collection_unselect_all (ViewCollection* self); GType marker_get_type (void) G_GNUC_CONST; -Marker* data_collection_mark (DataCollection* self, DataObject* object); -void view_collection_select_marked (ViewCollection* self, Marker* marker); -DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, DataSource* source); +Marker* data_collection_mark (DataCollection* self, + DataObject* object); +void view_collection_select_marked (ViewCollection* self, + Marker* marker); +DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, + DataSource* source); static void editing_host_page_real_realize (GtkWidget* base); -static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar* caller); +static void editing_host_page_rebuild_caches (EditingHostPage* self, + const gchar* caller); static void editing_host_page_real_switched_to (Page* base); void page_switched_to (Page* self); -static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_photo); +static void editing_host_page_replace_photo (EditingHostPage* self, + Photo* new_photo); static void editing_host_page_real_switching_from (Page* base); void page_switching_from (Page* self); GType command_get_type (void) G_GNUC_CONST; -static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement); -void dimensions_init (Dimensions *self, gint width, gint height); +static void editing_host_page_deactivate_tool (EditingHostPage* self, + Command* command, + GdkPixbuf* new_pixbuf, + Dimensions* new_max_dim, + gboolean needs_improvement); +void dimensions_init (Dimensions *self, + gint width, + gint height); void data_collection_clear (DataCollection* self); -static void editing_host_page_real_switching_to_fullscreen (Page* base, FullscreenWindow* fsw); -void page_switching_to_fullscreen (Page* self, FullscreenWindow* fsw); +static void editing_host_page_real_switching_to_fullscreen (Page* base, + FullscreenWindow* fsw); +void page_switching_to_fullscreen (Page* self, + FullscreenWindow* fsw); Page* page_window_get_current_page (PageWindow* self); -static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIterable* selected); -static void _editing_host_page_on_selection_changed_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self); -static void editing_host_page_real_returning_from_fullscreen (Page* base, FullscreenWindow* fsw); -void page_returning_from_fullscreen (Page* self, FullscreenWindow* fsw); -void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_enable); -void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, Scaling* result); -void pixbuf_cache_get_scaling (PixbufCache* self, Scaling* result); -gboolean scaling_equals (Scaling *self, Scaling* scaling); +static void editing_host_page_on_selection_changed (EditingHostPage* self, + GeeIterable* selected); +static void _editing_host_page_on_selection_changed_view_collection_items_selected (ViewCollection* _sender, + GeeIterable* selected, + gpointer self); +static void editing_host_page_real_returning_from_fullscreen (Page* base, + FullscreenWindow* fsw); +void page_returning_from_fullscreen (Page* self, + FullscreenWindow* fsw); +void editing_host_page_enable_rotate (EditingHostPage* self, + gboolean should_enable); +void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, + Scaling* result); +void pixbuf_cache_get_scaling (PixbufCache* self, + Scaling* result); +gboolean scaling_equals (Scaling *self, + Scaling* scaling); gchar* scaling_to_string (Scaling *self); -static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* photo, GdkPixbuf* pixbuf, GError* err); -static void _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched (PixbufCache* _sender, Photo* photo, GdkPixbuf* pixbuf, GError* err, gpointer self); +static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, + Photo* photo, + GdkPixbuf* pixbuf, + GError* err); +static void _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched (PixbufCache* _sender, + Photo* photo, + GdkPixbuf* pixbuf, + GError* err, + gpointer self); void pixbuf_cache_cancel_all (PixbufCache* self); GType pixbuf_cache_photo_type_get_type (void) G_GNUC_CONST; -PixbufCache* pixbuf_cache_new (SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target); -PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target); -static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Photo* photo); -static gboolean _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter (Photo* photo, gpointer self); -static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar* caller); +PixbufCache* pixbuf_cache_new (SourceCollection* sources, + PixbufCachePhotoType type, + Scaling* scaling, + gint max_count, + PixbufCacheCacheFilter filter, + void* filter_target); +PixbufCache* pixbuf_cache_construct (GType object_type, + SourceCollection* sources, + PixbufCachePhotoType type, + Scaling* scaling, + gint max_count, + PixbufCacheCacheFilter filter, + void* filter_target); +static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, + Photo* photo); +static gboolean _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter (Photo* photo, + gpointer self); +static void editing_host_page_refresh_caches (EditingHostPage* self, + const gchar* caller); gchar* data_object_to_string (DataObject* self); -static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCollection* controller, Photo* photo); +static void editing_host_page_prefetch_neighbors (EditingHostPage* self, + ViewCollection* controller, + Photo* photo); gboolean photo_has_transformations (Photo* self); gboolean photo_has_editable (Photo* self); -gboolean data_source_equals (DataSource* self, DataSource* source); -void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result); -GdkPixbuf* editing_tools_editing_tool_get_display_pixbuf (EditingToolsEditingTool* self, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error); -void single_photo_page_set_pixbuf (SinglePhotoPage* self, GdkPixbuf* unscaled, Dimensions* max_dim, Direction* direction); -void editing_host_page_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing); +gboolean data_source_equals (DataSource* self, + DataSource* source); +void media_source_get_dimensions (MediaSource* self, + PhotoException disallowed_steps, + Dimensions* result); +GdkPixbuf* editing_tools_editing_tool_get_display_pixbuf (EditingToolsEditingTool* self, + Scaling* scaling, + Photo* photo, + Dimensions* max_dim, + GError** error); +void single_photo_page_set_pixbuf (SinglePhotoPage* self, + GdkPixbuf* unscaled, + Dimensions* max_dim, + Direction* direction); +void editing_host_page_notify_photo_backing_missing (EditingHostPage* self, + Photo* photo, + gboolean missing); GType pixbuf_cache_pixbuf_cache_batch_get_type (void) G_GNUC_CONST; PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_new (void); PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_construct (GType object_type); -gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource* * next, DataSource* * prev, const gchar* type_selector); +gboolean view_collection_get_immediate_neighbors (ViewCollection* self, + DataSource* home, + DataSource* * next, + DataSource* * prev, + const gchar* type_selector); #define PHOTO_TYPENAME "thumb" -GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource* home, const gchar* typename); -void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch* batch, gboolean force); -static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, ViewCollection* old_controller, Photo* old_photo, ViewCollection* new_controller, Photo* new_photo); -void pixbuf_cache_drop (PixbufCache* self, Photo* photo); -DataView* editing_host_page_create_photo_view (EditingHostPage* self, DataSource* source); -static DataView* editing_host_page_real_create_photo_view (EditingHostPage* self, DataSource* source); +GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, + DataSource* home, + const gchar* typename); +void pixbuf_cache_prefetch_batch (PixbufCache* self, + PixbufCachePixbufCacheBatch* batch, + gboolean force); +static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, + ViewCollection* old_controller, + Photo* old_photo, + ViewCollection* new_controller, + Photo* new_photo); +void pixbuf_cache_drop (PixbufCache* self, + Photo* photo); +DataView* editing_host_page_create_photo_view (EditingHostPage* self, + DataSource* source); +static DataView* editing_host_page_real_create_photo_view (EditingHostPage* self, + DataSource* source); PhotoView* photo_view_new (PhotoSource* source); -PhotoView* photo_view_construct (GType object_type, PhotoSource* source); +PhotoView* photo_view_construct (GType object_type, + PhotoSource* source); GType thumbnail_view_get_type (void) G_GNUC_CONST; GType photo_view_get_type (void) G_GNUC_CONST; -static gboolean editing_host_page_is_photo (EditingHostPage* self, DataSource* source); -void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* controller, Photo* starting_photo); -void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, CreateView copying_ctor, void* copying_ctor_target, CreateViewPredicate should_copy, void* should_copy_target); -static DataView* _editing_host_page_create_photo_view_create_view (DataSource* source, gpointer self); -static gboolean _editing_host_page_is_photo_create_view_predicate (DataSource* source, gpointer self); -void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection* controller, Photo* starting_photo); -void view_collection_mirror (ViewCollection* self, ViewCollection* to_mirror, CreateView mirroring_ctor, void* mirroring_ctor_target, CreateViewPredicate should_mirror, void* should_mirror_target); -static void editing_host_page_real_update_ui (EditingHostPage* self, gboolean missing); -static void editing_host_page_real_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing); -static void editing_host_page_draw_message (EditingHostPage* self, const gchar* message); -void single_photo_page_paint_text (SinglePhotoPage* self, PangoLayout* pango_layout, gint x, gint y); -GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, Scaling* scaling, GError** error); +static gboolean editing_host_page_is_photo (EditingHostPage* self, + DataSource* source); +void editing_host_page_display_copy_of (EditingHostPage* self, + ViewCollection* controller, + Photo* starting_photo); +void view_collection_copy_into (ViewCollection* self, + ViewCollection* to_copy, + CreateView copying_ctor, + void* copying_ctor_target, + CreateViewPredicate should_copy, + void* should_copy_target); +static DataView* _editing_host_page_create_photo_view_create_view (DataSource* source, + gpointer self); +static gboolean _editing_host_page_is_photo_create_view_predicate (DataSource* source, + gpointer self); +void editing_host_page_display_mirror_of (EditingHostPage* self, + ViewCollection* controller, + Photo* starting_photo); +void view_collection_mirror (ViewCollection* self, + ViewCollection* to_mirror, + CreateView mirroring_ctor, + void* mirroring_ctor_target, + CreateViewPredicate should_mirror, + void* should_mirror_target); +static void editing_host_page_real_update_ui (EditingHostPage* self, + gboolean missing); +static void editing_host_page_real_notify_photo_backing_missing (EditingHostPage* self, + Photo* photo, + gboolean missing); +static void editing_host_page_draw_message (EditingHostPage* self, + const gchar* message); +void single_photo_page_paint_text (SinglePhotoPage* self, + PangoLayout* pango_layout, + gint x, + gint y); +GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, + Scaling* scaling, + GError** error); gboolean editing_host_page_get_photo_missing (EditingHostPage* self); -gboolean editing_host_page_confirm_replace_photo (EditingHostPage* self, Photo* old_photo, Photo* new_photo); -static gboolean editing_host_page_real_confirm_replace_photo (EditingHostPage* self, Photo* old_photo, Photo* new_photo); -static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Photo* new_photo); -GdkPixbuf* pixbuf_cache_get_ready_pixbuf (PixbufCache* self, Photo* photo); +gboolean editing_host_page_confirm_replace_photo (EditingHostPage* self, + Photo* old_photo, + Photo* new_photo); +static gboolean editing_host_page_real_confirm_replace_photo (EditingHostPage* self, + Photo* old_photo, + Photo* new_photo); +static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, + Photo* new_photo); +GdkPixbuf* pixbuf_cache_get_ready_pixbuf (PixbufCache* self, + Photo* photo); GdkPixbuf* get_placeholder_pixbuf (void); -GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInterpType interp, gboolean scale_up); -void page_set_page_name (Page* self, const gchar* page_name); +GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, + GdkPixbuf* pixbuf, + GdkInterpType interp, + gboolean scale_up); +void page_set_page_name (Page* self, + const gchar* page_name); gchar* data_object_get_name (DataObject* self); static void editing_host_page_quick_update_pixbuf (EditingHostPage* self); static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base); -void single_photo_page_get_surface_dim (SinglePhotoPage* self, Dimensions* result); -void zoom_state_init (ZoomState *self, Dimensions* content_dimensions, Dimensions* viewport_dimensions, gdouble slider_val, GdkPoint* viewport_center); -void page_set_page_cursor (Page* self, GdkCursorType cursor_type); -void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPriority priority, gboolean force); +void single_photo_page_get_surface_dim (SinglePhotoPage* self, + Dimensions* result); +void zoom_state_init (ZoomState *self, + Dimensions* content_dimensions, + Dimensions* viewport_dimensions, + gdouble slider_val, + GdkPoint* viewport_center); +void page_set_page_cursor (Page* self, + GdkCursorType cursor_type); +void pixbuf_cache_prefetch (PixbufCache* self, + Photo* photo, + BackgroundJobJobPriority priority, + gboolean force); static gboolean editing_host_page_update_pixbuf (EditingHostPage* self); -static void editing_host_page_real_on_resize (Page* base, GdkRectangle* rect); -void page_on_resize (Page* self, GdkRectangle* rect); +static void editing_host_page_real_on_resize (Page* base, + GdkRectangle* rect); +void page_on_resize (Page* self, + GdkRectangle* rect); static void editing_host_page_track_tool_window (EditingHostPage* self); -static void editing_host_page_real_on_resize_finished (Page* base, GdkRectangle* rect); -static void editing_host_page_real_update_actions (Page* base, gint selected_count, gint count); -gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t); +static void editing_host_page_real_on_resize_finished (Page* base, + GdkRectangle* rect); +static void editing_host_page_real_update_actions (Page* base, + gint selected_count, + gint count); +gint view_collection_get_sources_of_type_count (ViewCollection* self, + GType t); gboolean photo_check_can_rotate (Photo* self); -gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* photo); -gboolean editing_tools_crop_tool_is_available (Photo* photo, Scaling* scaling); -gboolean editing_tools_redeye_tool_is_available (Photo* photo, Scaling* scaling); -gboolean editing_tools_adjust_tool_is_available (Photo* photo, Scaling* scaling); -gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* photo); -gboolean editing_tools_straighten_tool_is_available (Photo* photo, Scaling* scaling); -void page_update_actions (Page* self, gint selected_count, gint count); -static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey* event); +gboolean editing_host_page_is_rotate_available (EditingHostPage* self, + Photo* photo); +gboolean editing_tools_crop_tool_is_available (Photo* photo, + Scaling* scaling); +gboolean editing_tools_redeye_tool_is_available (Photo* photo, + Scaling* scaling); +gboolean editing_tools_adjust_tool_is_available (Photo* photo, + Scaling* scaling); +gboolean editing_host_page_is_enhance_available (EditingHostPage* self, + Photo* photo); +gboolean editing_tools_straighten_tool_is_available (Photo* photo, + Scaling* scaling); +void page_update_actions (Page* self, + gint selected_count, + gint count); +static gboolean editing_host_page_real_on_shift_pressed (Page* base, + GdkEventKey* event); gboolean page_get_ctrl_pressed (Page* self); gboolean page_get_alt_pressed (Page* self); static void editing_host_page_swap_in_original (EditingHostPage* self); -gboolean page_on_shift_pressed (Page* self, GdkEventKey* event); -static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKey* event); +gboolean page_on_shift_pressed (Page* self, + GdkEventKey* event); +static gboolean editing_host_page_real_on_shift_released (Page* base, + GdkEventKey* event); static void editing_host_page_swap_out_original (EditingHostPage* self); -gboolean page_on_shift_released (Page* self, GdkEventKey* event); -static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey* event); -gboolean page_on_alt_pressed (Page* self, GdkEventKey* event); -static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey* event); +gboolean page_on_shift_released (Page* self, + GdkEventKey* event); +static gboolean editing_host_page_real_on_alt_pressed (Page* base, + GdkEventKey* event); +gboolean page_on_alt_pressed (Page* self, + GdkEventKey* event); +static gboolean editing_host_page_real_on_alt_released (Page* base, + GdkEventKey* event); gboolean page_get_shift_pressed (Page* self); -gboolean page_on_alt_released (Page* self, GdkEventKey* event); -GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error); +gboolean page_on_alt_released (Page* self, + GdkEventKey* event); +GdkPixbuf* photo_get_prefetched_copy (Photo* self, + GError** error); GType orientation_get_type (void) G_GNUC_CONST; Orientation photo_get_original_orientation (Photo* self); -GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf); +GdkPixbuf* orientation_rotate_pixbuf (Orientation self, + GdkPixbuf* pixbuf); GdkPixbuf* single_photo_page_get_unscaled_pixbuf (SinglePhotoPage* self); -void photo_get_master_dimensions (Photo* self, Dimensions* result); -static void editing_host_page_activate_tool (EditingHostPage* self, EditingToolsEditingTool* tool); +void photo_get_master_dimensions (Photo* self, + Dimensions* result); +static void editing_host_page_activate_tool (EditingHostPage* self, + EditingToolsEditingTool* tool); gpointer editing_tools_photo_canvas_ref (gpointer instance); void editing_tools_photo_canvas_unref (gpointer instance); -GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void editing_tools_value_set_photo_canvas (GValue* value, gpointer v_object); -void editing_tools_value_take_photo_canvas (GValue* value, gpointer v_object); +GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void editing_tools_value_set_photo_canvas (GValue* value, + gpointer v_object); +void editing_tools_value_take_photo_canvas (GValue* value, + gpointer v_object); gpointer editing_tools_value_get_photo_canvas (const GValue* value); GType editing_tools_photo_canvas_get_type (void) G_GNUC_CONST; static EditingHostPageEditingHostCanvas* editing_host_page_editing_host_canvas_new (EditingHostPage* host_page); -static EditingHostPageEditingHostCanvas* editing_host_page_editing_host_canvas_construct (GType object_type, EditingHostPage* host_page); +static EditingHostPageEditingHostCanvas* editing_host_page_editing_host_canvas_construct (GType object_type, + EditingHostPage* host_page); static GType editing_host_page_editing_host_canvas_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, EditingToolsPhotoCanvas* canvas); +void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, + EditingToolsPhotoCanvas* canvas); static void editing_host_page_place_tool_window (EditingHostPage* self); GType editing_tools_editing_tool_window_get_type (void) G_GNUC_CONST; EditingToolsEditingToolWindow* editing_tools_editing_tool_get_tool_window (EditingToolsEditingTool* self); gboolean editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingToolWindow* self); void editing_tools_editing_tool_deactivate (EditingToolsEditingTool* self); static void editing_host_page_on_tool_activated (EditingHostPage* self); -static void _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated (EditingToolsEditingTool* _sender, gpointer self); +static void _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated (EditingToolsEditingTool* _sender, + gpointer self); static void editing_host_page_on_tool_deactivated (EditingHostPage* self); -static void _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self); -static void editing_host_page_on_tool_applied (EditingHostPage* self, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement); -static void _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied (EditingToolsEditingTool* _sender, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement, gpointer self); +static void _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, + gpointer self); +static void editing_host_page_on_tool_applied (EditingHostPage* self, + Command* command, + GdkPixbuf* new_pixbuf, + Dimensions* new_max_dim, + gboolean needs_improvement); +static void _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied (EditingToolsEditingTool* _sender, + Command* command, + GdkPixbuf* new_pixbuf, + Dimensions* new_max_dim, + gboolean needs_improvement, + gpointer self); static void editing_host_page_on_tool_cancelled (EditingHostPage* self); -static void _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled (EditingToolsEditingTool* _sender, gpointer self); +static void _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled (EditingToolsEditingTool* _sender, + gpointer self); static void editing_host_page_on_tool_aborted (EditingHostPage* self); -static void _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted (EditingToolsEditingTool* _sender, gpointer self); -void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result); +static void _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted (EditingToolsEditingTool* _sender, + gpointer self); +void dimensions_for_pixbuf (GdkPixbuf* pixbuf, + Dimensions* result); static gboolean _editing_host_page_update_pixbuf_gsource_func (gpointer self); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* page_get_command_manager (Page* self); -void command_manager_execute (CommandManager* self, Command* command); -gboolean editing_host_page_on_double_click (EditingHostPage* self, GdkEventButton* event); -static gboolean editing_host_page_real_on_double_click (EditingHostPage* self, GdkEventButton* event); -static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton* event); +void command_manager_execute (CommandManager* self, + Command* command); +gboolean editing_host_page_on_double_click (EditingHostPage* self, + GdkEventButton* event); +static gboolean editing_host_page_real_on_double_click (EditingHostPage* self, + GdkEventButton* event); +static gboolean editing_host_page_real_on_left_click (Page* base, + GdkEventButton* event); void page_suspend_cursor_hiding (Page* self); -gboolean single_photo_page_is_inside_pixbuf (SinglePhotoPage* self, gint x, gint y); -void editing_tools_editing_tool_on_left_click (EditingToolsEditingTool* self, gint x, gint y); -static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventButton* event); +gboolean single_photo_page_is_inside_pixbuf (SinglePhotoPage* self, + gint x, + gint y); +void editing_tools_editing_tool_on_left_click (EditingToolsEditingTool* self, + gint x, + gint y); +static gboolean editing_host_page_real_on_left_released (Page* base, + GdkEventButton* event); ZoomBuffer* single_photo_page_get_zoom_buffer (SinglePhotoPage* self); void page_restore_cursor_hiding (Page* self); -void editing_tools_editing_tool_on_left_released (EditingToolsEditingTool* self, gint x, gint y); -static gboolean editing_host_page_real_on_right_click (Page* base, GdkEventButton* event); -gboolean page_on_context_buttonpress (Page* self, GdkEventButton* event); +void editing_tools_editing_tool_on_left_released (EditingToolsEditingTool* self, + gint x, + gint y); +static gboolean editing_host_page_real_on_right_click (Page* base, + GdkEventButton* event); +gboolean page_on_context_buttonpress (Page* self, + GdkEventButton* event); static gboolean editing_host_page_on_fetch_original (EditingHostPage* self); static gboolean _editing_host_page_on_fetch_original_gsource_func (gpointer self); gint data_collection_get_count (DataCollection* self); static gboolean editing_host_page_is_panning_possible (EditingHostPage* self); gint zoom_state_get_zoomed_width (ZoomState *self); gint zoom_state_get_zoomed_height (ZoomState *self); -static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* event, gint x, gint y, GdkModifierType mask); -void editing_tools_editing_tool_on_motion (EditingToolsEditingTool* self, gint x, gint y, GdkModifierType mask); -void single_photo_page_on_interactive_pan (SinglePhotoPage* self, ZoomState* interactive_zoom_state); -gboolean page_on_motion (Page* self, GdkEventMotion* event, gint x, gint y, GdkModifierType mask); +static gboolean editing_host_page_real_on_motion (Page* base, + GdkEventMotion* event, + gint x, + gint y, + GdkModifierType mask); +void editing_tools_editing_tool_on_motion (EditingToolsEditingTool* self, + gint x, + gint y, + GdkModifierType mask); +void single_photo_page_on_interactive_pan (SinglePhotoPage* self, + ZoomState* interactive_zoom_state); +gboolean page_on_motion (Page* self, + GdkEventMotion* event, + gint x, + gint y, + GdkModifierType mask); static gboolean editing_host_page_real_on_leave_notify_event (Page* base); gboolean editing_tools_editing_tool_on_leave_notify_event (EditingToolsEditingTool* self); gboolean page_on_leave_notify_event (Page* self); -static void editing_host_page_real_on_move (Page* base, GdkRectangle* rect); -void page_on_move (Page* self, GdkRectangle* rect); -static void editing_host_page_real_on_move_finished (Page* base, GdkRectangle* rect); -void page_on_move_finished (Page* self, GdkRectangle* rect); -static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self, GdkEventKey* event); -static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEventKey* event); -gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self, GdkEventKey* event); -static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t* default_ctx, Dimensions* dim); -void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, cairo_t* default_ctx, Dimensions* surface_dim); -static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim); -void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position); -void single_photo_page_get_scaled_pixbuf_position (SinglePhotoPage* self, GdkRectangle* result); -GdkPixbuf* editing_host_page_get_bottom_left_trinket (EditingHostPage* self, gint scale); -static GdkPixbuf* editing_host_page_real_get_bottom_left_trinket (EditingHostPage* self, gint scale); -GdkPixbuf* editing_host_page_get_top_left_trinket (EditingHostPage* self, gint scale); -static GdkPixbuf* editing_host_page_real_get_top_left_trinket (EditingHostPage* self, gint scale); -GdkPixbuf* editing_host_page_get_top_right_trinket (EditingHostPage* self, gint scale); -static GdkPixbuf* editing_host_page_real_get_top_right_trinket (EditingHostPage* self, gint scale); -GdkPixbuf* editing_host_page_get_bottom_right_trinket (EditingHostPage* self, gint scale); -static GdkPixbuf* editing_host_page_real_get_bottom_right_trinket (EditingHostPage* self, gint scale); -static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dimensions* ctx_dim); -void editing_tools_editing_tool_paint (EditingToolsEditingTool* self, cairo_t* ctx); -void set_source_color_from_string (cairo_t* ctx, const gchar* spec); -void single_photo_page_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim); +static void editing_host_page_real_on_move (Page* base, + GdkRectangle* rect); +void page_on_move (Page* self, + GdkRectangle* rect); +static void editing_host_page_real_on_move_finished (Page* base, + GdkRectangle* rect); +void page_on_move_finished (Page* self, + GdkRectangle* rect); +static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self, + GdkEventKey* event); +static gboolean editing_host_page_real_key_press_event (GtkWidget* base, + GdkEventKey* event); +gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self, + GdkEventKey* event); +static void editing_host_page_real_new_surface (SinglePhotoPage* base, + cairo_t* default_ctx, + Dimensions* dim); +void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, + cairo_t* default_ctx, + Dimensions* surface_dim); +static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, + GdkPixbuf* pixbuf, + SinglePhotoPageUpdateReason reason, + Dimensions* old_dim); +void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, + Dimensions* old_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position); +void single_photo_page_get_scaled_pixbuf_position (SinglePhotoPage* self, + GdkRectangle* result); +GdkPixbuf* editing_host_page_get_bottom_left_trinket (EditingHostPage* self, + gint scale); +static GdkPixbuf* editing_host_page_real_get_bottom_left_trinket (EditingHostPage* self, + gint scale); +GdkPixbuf* editing_host_page_get_top_left_trinket (EditingHostPage* self, + gint scale); +static GdkPixbuf* editing_host_page_real_get_top_left_trinket (EditingHostPage* self, + gint scale); +GdkPixbuf* editing_host_page_get_top_right_trinket (EditingHostPage* self, + gint scale); +static GdkPixbuf* editing_host_page_real_get_top_right_trinket (EditingHostPage* self, + gint scale); +GdkPixbuf* editing_host_page_get_bottom_right_trinket (EditingHostPage* self, + gint scale); +static GdkPixbuf* editing_host_page_real_get_bottom_right_trinket (EditingHostPage* self, + gint scale); +static void editing_host_page_real_paint (SinglePhotoPage* base, + cairo_t* ctx, + Dimensions* ctx_dim); +void editing_tools_editing_tool_paint (EditingToolsEditingTool* self, + cairo_t* ctx); +void set_source_color_from_string (cairo_t* ctx, + const gchar* spec); +void single_photo_page_paint (SinglePhotoPage* self, + cairo_t* ctx, + Dimensions* ctx_dim); GType rotation_get_type (void) G_GNUC_CONST; -static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation, const gchar* name, const gchar* description); +static void editing_host_page_rotate (EditingHostPage* self, + Rotation rotation, + const gchar* name, + const gchar* description); GType page_command_get_type (void) G_GNUC_CONST; GType single_data_source_command_get_type (void) G_GNUC_CONST; GType rotate_single_command_get_type (void) G_GNUC_CONST; -RotateSingleCommand* rotate_single_command_new (Photo* photo, Rotation rotation, const gchar* name, const gchar* explanation); -RotateSingleCommand* rotate_single_command_construct (GType object_type, Photo* photo, Rotation rotation, const gchar* name, const gchar* explanation); +RotateSingleCommand* rotate_single_command_new (Photo* photo, + Rotation rotation, + const gchar* name, + const gchar* explanation); +RotateSingleCommand* rotate_single_command_construct (GType object_type, + Photo* photo, + Rotation rotation, + const gchar* name, + const gchar* explanation); #define RESOURCES_ROTATE_CW_FULL_LABEL _ ("Rotate Right") void editing_host_page_on_rotate_counterclockwise (EditingHostPage* self); #define RESOURCES_ROTATE_CCW_FULL_LABEL _ ("Rotate Left") @@ -1964,75 +2391,128 @@ void editing_host_page_on_flip_horizontally (EditingHostPage* self); void editing_host_page_on_flip_vertically (EditingHostPage* self); #define RESOURCES_VFLIP_LABEL _ ("Flip Vertically") void editing_host_page_on_revert (EditingHostPage* self); -gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos); +gboolean revert_editable_dialog (GtkWindow* owner, + GeeCollection* photos); GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); GeeCollection* view_collection_get_sources (ViewCollection* self); -void photo_revert_to_master (Photo* self, gboolean notify); +void photo_revert_to_master (Photo* self, + gboolean notify); GType generic_photo_transformation_command_get_type (void) G_GNUC_CONST; GType revert_single_command_get_type (void) G_GNUC_CONST; RevertSingleCommand* revert_single_command_new (Photo* photo); -RevertSingleCommand* revert_single_command_construct (GType object_type, Photo* photo); +RevertSingleCommand* revert_single_command_construct (GType object_type, + Photo* photo); void editing_host_page_on_edit_title (EditingHostPage* self); GType library_photo_get_type (void) G_GNUC_CONST; gpointer text_entry_dialog_mediator_ref (gpointer instance); void text_entry_dialog_mediator_unref (gpointer instance); -GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_text_entry_dialog_mediator (GValue* value, gpointer v_object); -void value_take_text_entry_dialog_mediator (GValue* value, gpointer v_object); +GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_text_entry_dialog_mediator (GValue* value, + gpointer v_object); +void value_take_text_entry_dialog_mediator (GValue* value, + gpointer v_object); gpointer value_get_text_entry_dialog_mediator (const GValue* value); GType text_entry_dialog_mediator_get_type (void) G_GNUC_CONST; GType edit_title_dialog_get_type (void) G_GNUC_CONST; gchar* media_source_get_title (MediaSource* self); EditTitleDialog* edit_title_dialog_new (const gchar* photo_title); -EditTitleDialog* edit_title_dialog_construct (GType object_type, const gchar* photo_title); +EditTitleDialog* edit_title_dialog_construct (GType object_type, + const gchar* photo_title); gchar* edit_title_dialog_execute (EditTitleDialog* self); GType edit_title_command_get_type (void) G_GNUC_CONST; -EditTitleCommand* edit_title_command_new (MediaSource* source, const gchar* new_title); -EditTitleCommand* edit_title_command_construct (GType object_type, MediaSource* source, const gchar* new_title); +EditTitleCommand* edit_title_command_new (MediaSource* source, + const gchar* new_title); +EditTitleCommand* edit_title_command_construct (GType object_type, + MediaSource* source, + const gchar* new_title); void editing_host_page_on_edit_comment (EditingHostPage* self); gpointer multi_text_entry_dialog_mediator_ref (gpointer instance); void multi_text_entry_dialog_mediator_unref (gpointer instance); -GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object); -void value_take_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object); +GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_multi_text_entry_dialog_mediator (GValue* value, + gpointer v_object); +void value_take_multi_text_entry_dialog_mediator (GValue* value, + gpointer v_object); gpointer value_get_multi_text_entry_dialog_mediator (const GValue* value); GType multi_text_entry_dialog_mediator_get_type (void) G_GNUC_CONST; GType edit_comment_dialog_get_type (void) G_GNUC_CONST; gchar* media_source_get_comment (MediaSource* self); -EditCommentDialog* edit_comment_dialog_new (const gchar* comment, gboolean is_event); -EditCommentDialog* edit_comment_dialog_construct (GType object_type, const gchar* comment, gboolean is_event); +EditCommentDialog* edit_comment_dialog_new (const gchar* comment, + gboolean is_event); +EditCommentDialog* edit_comment_dialog_construct (GType object_type, + const gchar* comment, + gboolean is_event); gchar* edit_comment_dialog_execute (EditCommentDialog* self); GType edit_comment_command_get_type (void) G_GNUC_CONST; -EditCommentCommand* edit_comment_command_new (MediaSource* source, const gchar* new_comment); -EditCommentCommand* edit_comment_command_construct (GType object_type, MediaSource* source, const gchar* new_comment); +EditCommentCommand* edit_comment_command_new (MediaSource* source, + const gchar* new_comment); +EditCommentCommand* edit_comment_command_construct (GType object_type, + MediaSource* source, + const gchar* new_comment); void editing_host_page_on_adjust_date_time (EditingHostPage* self); GType adjust_date_time_dialog_get_type (void) G_GNUC_CONST; GType dateable_get_type (void) G_GNUC_CONST; GType direct_photo_page_get_type (void) G_GNUC_CONST; -AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video); -AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video); -gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* time_shift, gboolean* keep_relativity, gboolean* modify_originals); +AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source, + gint photo_count, + gboolean display_options, + gboolean contains_video, + gboolean only_video); +AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, + Dateable* source, + gint photo_count, + gboolean display_options, + gboolean contains_video, + gboolean only_video); +gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, + gint64* time_shift, + gboolean* keep_relativity, + gboolean* modify_originals); GeeList* view_collection_get_selected (ViewCollection* self); GType adjust_date_time_photo_command_get_type (void) G_GNUC_CONST; -AdjustDateTimePhotoCommand* adjust_date_time_photo_command_new (Dateable* dateable, gint64 time_shift, gboolean modify_original); -AdjustDateTimePhotoCommand* adjust_date_time_photo_command_construct (GType object_type, Dateable* dateable, gint64 time_shift, gboolean modify_original); +AdjustDateTimePhotoCommand* adjust_date_time_photo_command_new (Dateable* dateable, + gint64 time_shift, + gboolean modify_original); +AdjustDateTimePhotoCommand* adjust_date_time_photo_command_construct (GType object_type, + Dateable* dateable, + gint64 time_shift, + gboolean modify_original); void editing_host_page_on_set_background (EditingHostPage* self); GType set_background_photo_dialog_get_type (void) G_GNUC_CONST; SetBackgroundPhotoDialog* set_background_photo_dialog_new (void); SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type); -gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gboolean* desktop_background, gboolean* screensaver); +gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, + gboolean* desktop_background, + gboolean* screensaver); void page_window_set_busy_cursor (PageWindow* self); -void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolean screensaver); +void desktop_integration_set_background (Photo* photo, + gboolean desktop, + gboolean screensaver); void page_window_set_normal_cursor (PageWindow* self); -static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey* event); +static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, + GdkEventKey* event); #define RESOURCES_COUNTERCLOCKWISE "object-rotate-left" #define RESOURCES_ROTATE_CCW_LABEL _ ("Rotate") -static void _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); -gboolean page_on_ctrl_pressed (Page* self, GdkEventKey* event); -static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey* event); -gboolean page_on_ctrl_released (Page* self, GdkEventKey* event); -void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleToolButton* toggle, EditingToolsEditingToolFactory factory); +static void _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked (GtkToolButton* _sender, + gpointer self); +gboolean page_on_ctrl_pressed (Page* self, + GdkEventKey* event); +static gboolean editing_host_page_real_on_ctrl_released (Page* base, + GdkEventKey* event); +gboolean page_on_ctrl_released (Page* self, + GdkEventKey* event); +void editing_host_page_on_tool_button_toggled (EditingHostPage* self, + GtkToggleToolButton* toggle, + EditingToolsEditingToolFactory factory); void editing_host_page_toggle_crop (EditingHostPage* self); void editing_host_page_toggle_straighten (EditingHostPage* self); void editing_host_page_toggle_redeye (EditingHostPage* self); @@ -2052,29 +2532,45 @@ static EditingToolsEditingTool* _editing_tools_adjust_tool_factory_editing_tools gboolean editing_tools_adjust_tool_enhance (EditingToolsAdjustTool* self); GType enhance_single_command_get_type (void) G_GNUC_CONST; EnhanceSingleCommand* enhance_single_command_new (Photo* photo); -EnhanceSingleCommand* enhance_single_command_construct (GType object_type, Photo* photo); +EnhanceSingleCommand* enhance_single_command_construct (GType object_type, + Photo* photo); void editing_host_page_on_copy_adjustments (EditingHostPage* self); PixelTransformationBundle* photo_get_color_adjustments (Photo* self); -void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); +void page_set_action_sensitive (Page* self, + const gchar* name, + gboolean sensitive); void editing_host_page_on_paste_adjustments (EditingHostPage* self); GType adjust_colors_single_command_get_type (void) G_GNUC_CONST; #define RESOURCES_PASTE_ADJUSTMENTS_LABEL _ ("Paste Color Adjustments") #define RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP _ ("Apply copied color adjustments to the selected photos") -AdjustColorsSingleCommand* adjust_colors_single_command_new (Photo* photo, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation); -AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_type, Photo* photo, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation); +AdjustColorsSingleCommand* adjust_colors_single_command_new (Photo* photo, + PixelTransformationBundle* transformations, + const gchar* name, + const gchar* explanation); +AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_type, + Photo* photo, + PixelTransformationBundle* transformations, + const gchar* name, + const gchar* explanation); static void editing_host_page_real_on_next_photo (SinglePhotoPage* base); -DataView* view_collection_get_next (ViewCollection* self, DataView* view); +DataView* view_collection_get_next (ViewCollection* self, + DataView* view); static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base); -DataView* view_collection_get_previous (ViewCollection* self, DataView* view); +DataView* view_collection_get_previous (ViewCollection* self, + DataView* view); gboolean editing_host_page_has_current_tool (EditingHostPage* self); void editing_host_page_unset_view_collection (EditingHostPage* self); #define EDITING_HOST_PAGE_EDITING_HOST_CANVAS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_HOST_PAGE_TYPE_EDITING_HOST_CANVAS, EditingHostPageEditingHostCanvasPrivate)) -enum { - EDITING_HOST_PAGE_EDITING_HOST_CANVAS_DUMMY_PROPERTY -}; cairo_t* single_photo_page_get_cairo_context (SinglePhotoPage* self); GdkPixbuf* single_photo_page_get_scaled_pixbuf (SinglePhotoPage* self); -EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type, GtkWindow* container, GdkWindow* drawing_window, Photo* photo, cairo_t* default_ctx, Dimensions* surface_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position); +EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type, + GtkWindow* container, + GdkWindow* drawing_window, + Photo* photo, + cairo_t* default_ctx, + Dimensions* surface_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position); static void editing_host_page_editing_host_canvas_real_repaint (EditingToolsPhotoCanvas* base); static void editing_host_page_editing_host_canvas_finalize (EditingToolsPhotoCanvas * obj); static void editing_host_page_finalize (GObject * obj); @@ -2085,134 +2581,280 @@ GType media_page_get_type (void) G_GNUC_CONST; GType collection_page_get_type (void) G_GNUC_CONST; gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; static GType library_photo_page_library_photo_page_view_filter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define LIBRARY_PHOTO_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPagePrivate)) -enum { - LIBRARY_PHOTO_PAGE_DUMMY_PROPERTY -}; GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; GType library_photo_source_collection_get_type (void) G_GNUC_CONST; -static void library_photo_page_on_photo_destroyed (LibraryPhotoPage* self, DataSource* source); -static void _library_photo_page_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); -static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeMap* map); -static void _library_photo_page_on_metadata_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void library_photo_page_on_photo_destroyed (LibraryPhotoPage* self, + DataSource* source); +static void _library_photo_page_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); +static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, + GeeMap* map); +static void _library_photo_page_on_metadata_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); static void library_photo_page_on_external_app_changed (LibraryPhotoPage* self); -static void _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self); +static void _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, + gpointer self); static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_new (void); static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_construct (GType object_type); static void library_photo_page_on_export (LibraryPhotoPage* self); -static void _library_photo_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_photo_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_photo_page_on_print (LibraryPhotoPage* self); -static void _library_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_photo_page_on_publish (LibraryPhotoPage* self); -static void _library_photo_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_photo_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self); -static void _library_photo_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_photo_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self); -static void _library_photo_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_photo_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_photo_page_on_external_edit (LibraryPhotoPage* self); -static void _library_photo_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_photo_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self); -static void _library_photo_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_photo_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_photo_page_on_send_to (LibraryPhotoPage* self); -static void _library_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self); -static void _library_photo_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_photo_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_photo_page_on_increase_rating (LibraryPhotoPage* self); -static void _library_photo_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_photo_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self); -static void _library_photo_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_photo_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_photo_page_on_rate_rejected (LibraryPhotoPage* self); -static void _library_photo_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_photo_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_photo_page_on_rate_unrated (LibraryPhotoPage* self); -static void _library_photo_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_photo_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_photo_page_on_rate_one (LibraryPhotoPage* self); -static void _library_photo_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_photo_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_photo_page_on_rate_two (LibraryPhotoPage* self); -static void _library_photo_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_photo_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_photo_page_on_rate_three (LibraryPhotoPage* self); -static void _library_photo_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_photo_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_photo_page_on_rate_four (LibraryPhotoPage* self); -static void _library_photo_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_photo_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_photo_page_on_rate_five (LibraryPhotoPage* self); -static void _library_photo_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_photo_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_photo_page_on_add_tags (LibraryPhotoPage* self); -static void _library_photo_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_photo_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_photo_page_on_modify_tags (LibraryPhotoPage* self); -static void _library_photo_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_photo_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_photo_page_on_slideshow (LibraryPhotoPage* self); -static void _library_photo_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -void page_on_action_toggle (Page* self, GAction* action, GVariant* value); -static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value); -static void _library_photo_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); +static void _library_photo_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +void page_on_action_toggle (Page* self, + GAction* action, + GVariant* value); +static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, + GSimpleAction* action, + GVariant* value); +static void _library_photo_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); LibraryPhotoPage* library_photo_page_new (void); LibraryPhotoPage* library_photo_page_construct (GType object_type); static void library_photo_page_on_photos_altered (LibraryPhotoPage* self); -static void _library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); -void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f); -static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCollection* unlinking); -static void _library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self); -static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCollection* relinked); -static void _library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self); -gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, DataView* view); +static void _library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); +void view_collection_install_view_filter (ViewCollection* self, + ViewFilter* f); +static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, + GeeCollection* unlinking); +static void _library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender, + GeeCollection* unlinking, + gpointer self); +static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, + GeeCollection* relinked); +static void _library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender, + GeeCollection* relinked, + gpointer self); +gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, + DataView* view); gboolean media_source_is_trashed (MediaSource* self); -static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); -void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static void library_photo_page_real_add_actions (Page* base, GActionMap* map); -void page_add_actions (Page* self, GActionMap* map); -GAction* page_get_action (Page* self, const gchar* name); +static void library_photo_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames); +void page_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames); +static void library_photo_page_real_add_actions (Page* base, + GActionMap* map); +void page_add_actions (Page* self, + GActionMap* map); +GAction* page_get_action (Page* self, + const gchar* name); gboolean configuration_facade_get_display_photo_ratings (ConfigurationFacade* self); static GVariant* _variant_new16 (gboolean value); RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self); static GVariant* _variant_new17 (const gchar* value); -static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value); -static void _library_photo_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self); -static void library_photo_page_real_remove_actions (Page* base, GActionMap* map); -void page_remove_actions (Page* self, GActionMap* map); -static InjectionGroup** library_photo_page_real_init_collect_injection_groups (Page* base, int* result_length1); -InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1); +static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, + GSimpleAction* action, + GVariant* value); +static void _library_photo_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, + GVariant* value, + gpointer self); +static void library_photo_page_real_remove_actions (Page* base, + GActionMap* map); +void page_remove_actions (Page* self, + GActionMap* map); +static InjectionGroup** library_photo_page_real_init_collect_injection_groups (Page* base, + int* result_length1); +InjectionGroup** page_init_collect_injection_groups (Page* self, + int* result_length1); InjectionGroup* injection_group_new (const gchar* path); -InjectionGroup* injection_group_construct (GType object_type, const gchar* path); -void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator); -static void _vala_array_add86 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); -static void _vala_array_add87 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); -static void _vala_array_add88 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); -static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboolean display); -void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self, gboolean display); -static void library_photo_page_real_update_actions (Page* base, gint selected_count, gint count); +InjectionGroup* injection_group_construct (GType object_type, + const gchar* path); +void injection_group_add_menu_item (InjectionGroup* self, + const gchar* name, + const gchar* action, + const gchar* accellerator); +static void _vala_array_add86 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value); +static void _vala_array_add87 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value); +static void _vala_array_add88 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value); +static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, + gboolean display); +void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self, + gboolean display); +static void library_photo_page_real_update_actions (Page* base, + gint selected_count, + gint count); PhotoFileFormat photo_get_master_file_format (Photo* self); gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self); static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhotoPage* self); @@ -2220,150 +2862,252 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library gboolean photo_has_color_adjustments (Photo* self); static void library_photo_page_update_flag_action (LibraryPhotoPage* self); gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self); -void library_photo_page_developer_changed (LibraryPhotoPage* self, RawDeveloper rd); -static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, RawDeveloper rd); -gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d); +void library_photo_page_developer_changed (LibraryPhotoPage* self, + RawDeveloper rd); +static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, + RawDeveloper rd); +gboolean raw_developer_is_equivalent (RawDeveloper self, + RawDeveloper d); RawDeveloper photo_get_raw_developer (Photo* self); gboolean dialogs_confirm_warn_developer_changed (gint number); GType multiple_data_source_command_get_type (void) G_GNUC_CONST; GType set_raw_developer_command_get_type (void) G_GNUC_CONST; -SetRawDeveloperCommand* set_raw_developer_command_new (GeeIterable* iter, RawDeveloper developer); -SetRawDeveloperCommand* set_raw_developer_command_construct (GType object_type, GeeIterable* iter, RawDeveloper developer); -void library_photo_page_display_for_collection (LibraryPhotoPage* self, CollectionPage* return_page, Photo* photo, ViewCollection* view); +SetRawDeveloperCommand* set_raw_developer_command_new (GeeIterable* iter, + RawDeveloper developer); +SetRawDeveloperCommand* set_raw_developer_command_construct (GType object_type, + GeeIterable* iter, + RawDeveloper developer); +void library_photo_page_display_for_collection (LibraryPhotoPage* self, + CollectionPage* return_page, + Photo* photo, + ViewCollection* view); void library_photo_page_on_page_destroyed (LibraryPhotoPage* self); -static void _library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self); +static void _library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, + gpointer self); CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self); static void library_photo_page_real_switched_to (Page* base); static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPage* self); static void library_photo_page_real_switching_from (Page* base); -static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPage* base, gint scale); +static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPage* base, + gint scale); GType rating_get_type (void) G_GNUC_CONST; -GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale); +GdkPixbuf* resources_get_rating_trinket (Rating rating, + gint scale); Rating media_source_get_rating (MediaSource* self); -static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage* base, gint scale); +static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage* base, + gint scale); GType flaggable_get_type (void) G_GNUC_CONST; gboolean flaggable_is_flagged (Flaggable* self); -GdkPixbuf* resources_get_icon (const gchar* name, gint scale); +GdkPixbuf* resources_get_icon (const gchar* name, + gint scale); #define RESOURCES_ICON_FLAGGED_TRINKET "flag-trinket.png" #define RESOURCES_DEFAULT_ICON_SCALE 24 -void app_window_go_fullscreen (AppWindow* self, Page* page); -SlideshowPage* slideshow_page_new (SourceCollection* sources, ViewCollection* controller, Photo* start); -SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* sources, ViewCollection* controller, Photo* start); +void app_window_go_fullscreen (AppWindow* self, + Page* page); +SlideshowPage* slideshow_page_new (SourceCollection* sources, + ViewCollection* controller, + Photo* start); +SlideshowPage* slideshow_page_construct (GType object_type, + SourceCollection* sources, + ViewCollection* controller, + Photo* start); GType slideshow_page_get_type (void) G_GNUC_CONST; static void library_photo_page_real_on_increase_size (EditingHostPage* base); static void library_photo_page_real_on_decrease_size (EditingHostPage* base); -static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPage* base, GdkEventKey* event); +static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPage* base, + GdkEventKey* event); static void library_photo_page_return_to_collection (LibraryPhotoPage* self); -static void library_photo_page_real_update_ui (EditingHostPage* base, gboolean missing); -static void library_photo_page_real_notify_photo_backing_missing (EditingHostPage* base, Photo* photo, gboolean missing); +static void library_photo_page_real_update_ui (EditingHostPage* base, + gboolean missing); +static void library_photo_page_real_notify_photo_backing_missing (EditingHostPage* base, + Photo* photo, + gboolean missing); void media_source_mark_offline (MediaSource* self); void media_source_mark_online (MediaSource* self); -static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEventKey* event); -static gboolean library_photo_page_real_on_double_click (EditingHostPage* base, GdkEventButton* event); +static gboolean library_photo_page_real_key_press_event (GtkWidget* base, + GdkEventKey* event); +static gboolean library_photo_page_real_on_double_click (EditingHostPage* base, + GdkEventButton* event); void fullscreen_window_close (FullscreenWindow* self); -static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventButton* event); -gboolean page_on_left_released (Page* self, GdkEventButton* event); +static gboolean library_photo_page_real_on_left_released (Page* base, + GdkEventButton* event); +gboolean page_on_left_released (Page* self, + GdkEventButton* event); static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self); -static gboolean library_photo_page_real_on_context_buttonpress (Page* base, GdkEventButton* event); -gboolean page_popup_context_menu (Page* self, GtkMenu* context_menu, GdkEventButton* event); +static gboolean library_photo_page_real_on_context_buttonpress (Page* base, + GdkEventButton* event); +gboolean page_popup_context_menu (Page* self, + GtkMenu* context_menu, + GdkEventButton* event); static gboolean library_photo_page_real_on_context_keypress (Page* base); GType library_window_get_type (void) G_GNUC_CONST; LibraryWindow* library_window_get_app (void); -void library_window_switch_to_page (LibraryWindow* self, Page* page); +void library_window_switch_to_page (LibraryWindow* self, + Page* page); void library_window_switch_to_library_page (LibraryWindow* self); -void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const gchar* progress_dialog_text); +void remove_from_app (GeeCollection* sources, + const gchar* dialog_title, + const gchar* progress_dialog_text); GType event_page_get_type (void) G_GNUC_CONST; -void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable); -TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, gboolean to_trash); -TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type, GeeCollection* sources, gboolean to_trash); +void library_window_set_page_switching_enabled (LibraryWindow* self, + gboolean should_enable); +TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, + gboolean to_trash); +TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type, + GeeCollection* sources, + gboolean to_trash); GType trash_untrash_photos_command_get_type (void) G_GNUC_CONST; -FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources, gboolean flag); -FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollection* sources, gboolean flag); +FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources, + gboolean flag); +FlagUnflagCommand* flag_unflag_command_construct (GType object_type, + GeeCollection* sources, + gboolean flag); GType multiple_data_source_at_once_command_get_type (void) G_GNUC_CONST; GType flag_unflag_command_get_type (void) G_GNUC_CONST; -static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, LibraryPhoto* photo); -void data_collection_remove_marked (DataCollection* self, Marker* m); +static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, + LibraryPhoto* photo); +void data_collection_remove_marked (DataCollection* self, + Marker* m); gpointer print_manager_ref (gpointer instance); void print_manager_unref (gpointer instance); -GParamSpec* param_spec_print_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_print_manager (GValue* value, gpointer v_object); -void value_take_print_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_print_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_print_manager (GValue* value, + gpointer v_object); +void value_take_print_manager (GValue* value, + gpointer v_object); gpointer value_get_print_manager (const GValue* value); GType print_manager_get_type (void) G_GNUC_CONST; PrintManager* print_manager_get_instance (void); -void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print); -GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t); -void photo_open_with_external_editor (Photo* self, GError** error); -void open_external_editor_error_dialog (GError* err, Photo* photo); -void photo_open_with_raw_external_editor (Photo* self, GError** error); -void app_window_error_message (const gchar* message, GtkWindow* parent); +void print_manager_spool_photo (PrintManager* self, + GeeCollection* to_print); +GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, + GType t); +void photo_open_with_external_editor (Photo* self, + GError** error); +void open_external_editor_error_dialog (GError* err, + Photo* photo); +void photo_open_with_raw_external_editor (Photo* self, + GError** error); +void app_window_error_message (const gchar* message, + GtkWindow* parent); gchar* resources_launch_editor_failed (GError* err); void desktop_integration_send_to (GeeCollection* media); GeeList* view_collection_get_selected_sources (ViewCollection* self); GType export_dialog_get_type (void) G_GNUC_CONST; ExportDialog* export_dialog_new (const gchar* title); -ExportDialog* export_dialog_construct (GType object_type, const gchar* title); +ExportDialog* export_dialog_construct (GType object_type, + const gchar* title); GType export_format_parameters_get_type (void) G_GNUC_CONST; GType export_format_mode_get_type (void) G_GNUC_CONST; GType jpeg_quality_get_type (void) G_GNUC_CONST; ExportFormatParameters* export_format_parameters_dup (const ExportFormatParameters* self); void export_format_parameters_free (ExportFormatParameters* self); void export_format_parameters_last (ExportFormatParameters* result); -gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint* constraint, ExportFormatParameters* parameters); +gboolean export_dialog_execute (ExportDialog* self, + gint* scale, + ScaleConstraint* constraint, + ExportFormatParameters* parameters); GFile* export_ui_choose_file (const gchar* current_file_basename); -gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParameters* params); -void scaling_for_constraint (ScaleConstraint constraint, gint scale, gboolean scale_up, Scaling* result); -void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error); -PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportFormatParameters* params); +gchar* photo_get_export_basename_for_parameters (Photo* self, + ExportFormatParameters* params); +void scaling_for_constraint (ScaleConstraint constraint, + gint scale, + gboolean scale_up, + Scaling* result); +void photo_export (Photo* self, + GFile* dest_file, + Scaling* scaling, + JpegQuality quality, + PhotoFileFormat export_format, + gboolean direct_copy_unmodified, + gboolean export_metadata, + GError** error); +PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, + ExportFormatParameters* params); void publishing_ui_publishing_dialog_go (GeeCollection* to_publish); GType set_rating_single_command_get_type (void) G_GNUC_CONST; -SetRatingSingleCommand* set_rating_single_command_new_inc_dec (DataSource* source, gboolean is_incrementing); -SetRatingSingleCommand* set_rating_single_command_construct_inc_dec (GType object_type, DataSource* source, gboolean is_incrementing); -static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rating); -SetRatingSingleCommand* set_rating_single_command_new (DataSource* source, Rating rating); -SetRatingSingleCommand* set_rating_single_command_construct (GType object_type, DataSource* source, Rating rating); +SetRatingSingleCommand* set_rating_single_command_new_inc_dec (DataSource* source, + gboolean is_incrementing); +SetRatingSingleCommand* set_rating_single_command_construct_inc_dec (GType object_type, + DataSource* source, + gboolean is_incrementing); +static void library_photo_page_on_set_rating (LibraryPhotoPage* self, + Rating rating); +SetRatingSingleCommand* set_rating_single_command_new (DataSource* source, + Rating rating); +SetRatingSingleCommand* set_rating_single_command_construct (GType object_type, + DataSource* source, + Rating rating); gboolean rating_can_increase (Rating self); gboolean rating_can_decrease (Rating self); static GVariant* _variant_new18 (const gchar* value); static GVariant* _variant_new19 (const gchar* value); -gboolean alteration_has_subject (Alteration* self, const gchar* subject); +gboolean alteration_has_subject (Alteration* self, + const gchar* subject); GType tags_dialog_get_type (void) G_GNUC_CONST; GType add_tags_dialog_get_type (void) G_GNUC_CONST; AddTagsDialog* add_tags_dialog_new (void); AddTagsDialog* add_tags_dialog_construct (GType object_type); -gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1); +gchar** add_tags_dialog_execute (AddTagsDialog* self, + int* result_length1); gpointer hierarchical_tag_index_ref (gpointer instance); void hierarchical_tag_index_unref (gpointer instance); -GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_hierarchical_tag_index (GValue* value, gpointer v_object); -void value_take_hierarchical_tag_index (GValue* value, gpointer v_object); +GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_hierarchical_tag_index (GValue* value, + gpointer v_object); +void value_take_hierarchical_tag_index (GValue* value, + gpointer v_object); gpointer value_get_hierarchical_tag_index (const GValue* value); GType hierarchical_tag_index_get_type (void) G_GNUC_CONST; HierarchicalTagIndex* hierarchical_tag_index_get_global_index (void); -gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, gchar** names, int names_length1, int* result_length1); -AddTagsCommand* add_tags_command_new (gchar** paths, int paths_length1, GeeCollection* sources); -AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, int paths_length1, GeeCollection* sources); +gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, + gchar** names, + int names_length1, + int* result_length1); +AddTagsCommand* add_tags_command_new (gchar** paths, + int paths_length1, + GeeCollection* sources); +AddTagsCommand* add_tags_command_construct (GType object_type, + gchar** paths, + int paths_length1, + GeeCollection* sources); GType add_tags_command_get_type (void) G_GNUC_CONST; GType modify_tags_dialog_get_type (void) G_GNUC_CONST; ModifyTagsDialog* modify_tags_dialog_new (MediaSource* source); -ModifyTagsDialog* modify_tags_dialog_construct (GType object_type, MediaSource* source); +ModifyTagsDialog* modify_tags_dialog_construct (GType object_type, + MediaSource* source); GType tag_get_type (void) G_GNUC_CONST; GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self); -ModifyTagsCommand* modify_tags_command_new (MediaSource* media, GeeCollection* new_tag_list); -ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource* media, GeeCollection* new_tag_list); +ModifyTagsCommand* modify_tags_command_new (MediaSource* media, + GeeCollection* new_tag_list); +ModifyTagsCommand* modify_tags_command_construct (GType object_type, + MediaSource* media, + GeeCollection* new_tag_list); GType modify_tags_command_get_type (void) G_GNUC_CONST; -enum { - LIBRARY_PHOTO_PAGE_LIBRARY_PHOTO_PAGE_VIEW_FILTER_DUMMY_PROPERTY -}; -static gboolean library_photo_page_library_photo_page_view_filter_real_predicate (ViewFilter* base, DataView* view); +static gboolean library_photo_page_library_photo_page_view_filter_real_predicate (ViewFilter* base, + DataView* view); ViewFilter* view_filter_construct (GType object_type); static void library_photo_page_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static const GActionEntry LIBRARY_PHOTO_PAGE_entries[45] = {{"Export", _library_photo_page_on_export_gsimple_action_activate_callback}, {"Print", _library_photo_page_on_print_gsimple_action_activate_callback}, {"Publish", _library_photo_page_on_publish_gsimple_action_activate_callback}, {"RemoveFromLibrary", _library_photo_page_on_remove_from_library_gsimple_action_activate_callback}, {"MoveToTrash", _library_photo_page_on_move_to_trash_gsimple_action_activate_callback}, {"PrevPhoto", _single_photo_page_on_previous_photo_gsimple_action_activate_callback}, {"NextPhoto", _single_photo_page_on_next_photo_gsimple_action_activate_callback}, {"RotateClockwise", _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback}, {"RotateCounterclockwise", _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback}, {"FlipHorizontally", _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback}, {"FlipVertically", _editing_host_page_on_flip_vertically_gsimple_action_activate_callback}, {"Enhance", _editing_host_page_on_enhance_gsimple_action_activate_callback}, {"CopyColorAdjustments", _editing_host_page_on_copy_adjustments_gsimple_action_activate_callback}, {"PasteColorAdjustments", _editing_host_page_on_paste_adjustments_gsimple_action_activate_callback}, {"Crop", _editing_host_page_toggle_crop_gsimple_action_activate_callback}, {"Straighten", _editing_host_page_toggle_straighten_gsimple_action_activate_callback}, {"RedEye", _editing_host_page_toggle_redeye_gsimple_action_activate_callback}, {"Adjust", _editing_host_page_toggle_adjust_gsimple_action_activate_callback}, {"Revert", _editing_host_page_on_revert_gsimple_action_activate_callback}, {"EditTitle", _editing_host_page_on_edit_title_gsimple_action_activate_callback}, {"EditComment", _editing_host_page_on_edit_comment_gsimple_action_activate_callback}, {"AdjustDateTime", _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback}, {"ExternalEdit", _library_photo_page_on_external_edit_gsimple_action_activate_callback}, {"ExternalEditRAW", _library_photo_page_on_external_edit_raw_gsimple_action_activate_callback}, {"SendTo", _library_photo_page_on_send_to_gsimple_action_activate_callback}, {"SetBackground", _editing_host_page_on_set_background_gsimple_action_activate_callback}, {"Flag", _library_photo_page_on_flag_unflag_gsimple_action_activate_callback}, {"IncreaseRating", _library_photo_page_on_increase_rating_gsimple_action_activate_callback}, {"DecreaseRating", _library_photo_page_on_decrease_rating_gsimple_action_activate_callback}, {"RateRejected", _library_photo_page_on_rate_rejected_gsimple_action_activate_callback}, {"RateUnrated", _library_photo_page_on_rate_unrated_gsimple_action_activate_callback}, {"RateOne", _library_photo_page_on_rate_one_gsimple_action_activate_callback}, {"RateTwo", _library_photo_page_on_rate_two_gsimple_action_activate_callback}, {"RateThree", _library_photo_page_on_rate_three_gsimple_action_activate_callback}, {"RateFour", _library_photo_page_on_rate_four_gsimple_action_activate_callback}, {"RateFive", _library_photo_page_on_rate_five_gsimple_action_activate_callback}, {"IncreaseSize", _editing_host_page_on_increase_size_gsimple_action_activate_callback}, {"DecreaseSize", _editing_host_page_on_decrease_size_gsimple_action_activate_callback}, {"ZoomFit", _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback}, {"Zoom100", _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback}, {"Zoom200", _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback}, {"AddTags", _library_photo_page_on_add_tags_gsimple_action_activate_callback}, {"ModifyTags", _library_photo_page_on_modify_tags_gsimple_action_activate_callback}, {"Slideshow", _library_photo_page_on_slideshow_gsimple_action_activate_callback}, {"ViewRatings", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_photo_page_on_display_ratings_gsimple_action_change_state_callback}}; -static GType zoom_buffer_object_state_get_type (void) { +static GType +zoom_buffer_object_state_get_type (void) +{ static volatile gsize zoom_buffer_object_state_type_id__volatile = 0; if (g_once_init_enter (&zoom_buffer_object_state_type_id__volatile)) { static const GEnumValue values[] = {{ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_LOADED, "ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_LOADED", "source-not-loaded"}, {ZOOM_BUFFER_OBJECT_STATE_SOURCE_LOAD_IN_PROGRESS, "ZOOM_BUFFER_OBJECT_STATE_SOURCE_LOAD_IN_PROGRESS", "source-load-in-progress"}, {ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED, "ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED", "source-not-transformed"}, {ZOOM_BUFFER_OBJECT_STATE_TRANSFORMED_READY, "ZOOM_BUFFER_OBJECT_STATE_TRANSFORMED_READY", "transformed-ready"}, {0, NULL, NULL}}; @@ -2375,22 +3119,26 @@ static GType zoom_buffer_object_state_get_type (void) { } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 86 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self ? g_object_ref (self) : NULL; -#line 2382 "PhotoPage.c" +#line 3128 "PhotoPage.c" } -ZoomBuffer* zoom_buffer_construct (GType object_type, SinglePhotoPage* parent_page, Photo* backing_photo, GdkPixbuf* preview_image) { +ZoomBuffer* +zoom_buffer_construct (GType object_type, + SinglePhotoPage* parent_page, + Photo* backing_photo, + GdkPixbuf* preview_image) +{ ZoomBuffer * self = NULL; SinglePhotoPage* _tmp0_; - SinglePhotoPage* _tmp1_; - GdkPixbuf* _tmp2_; - GdkPixbuf* _tmp3_; - Photo* _tmp4_; - Photo* _tmp5_; - Workers* _tmp6_; + GdkPixbuf* _tmp1_; + Photo* _tmp2_; + Workers* _tmp3_; #line 84 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (parent_page), NULL); #line 84 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -2400,105 +3148,108 @@ ZoomBuffer* zoom_buffer_construct (GType object_type, SinglePhotoPage* parent_pa #line 84 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = (ZoomBuffer*) g_object_new (object_type, NULL); #line 86 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = parent_page; -#line 86 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (parent_page); #line 86 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->parent_page); #line 86 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->parent_page = _tmp1_; -#line 87 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = preview_image; + self->priv->parent_page = _tmp0_; #line 87 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (preview_image); #line 87 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->preview_image); #line 87 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->preview_image = _tmp3_; -#line 88 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = backing_photo; + self->priv->preview_image = _tmp1_; #line 88 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp2_ = _g_object_ref0 (backing_photo); #line 88 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->backing_photo); #line 88 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->backing_photo = _tmp5_; + self->priv->backing_photo = _tmp2_; #line 89 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = workers_new ((guint) 2, FALSE); + _tmp3_ = workers_new ((guint) 2, FALSE); #line 89 "/home/jens/Source/shotwell/src/PhotoPage.vala" _workers_unref0 (self->priv->workers); #line 89 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->workers = _tmp6_; + self->priv->workers = _tmp3_; #line 84 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self; -#line 2435 "PhotoPage.c" +#line 3177 "PhotoPage.c" } -ZoomBuffer* zoom_buffer_new (SinglePhotoPage* parent_page, Photo* backing_photo, GdkPixbuf* preview_image) { +ZoomBuffer* +zoom_buffer_new (SinglePhotoPage* parent_page, + Photo* backing_photo, + GdkPixbuf* preview_image) +{ #line 84 "/home/jens/Source/shotwell/src/PhotoPage.vala" return zoom_buffer_construct (TYPE_ZOOM_BUFFER, parent_page, backing_photo, preview_image); -#line 2442 "PhotoPage.c" +#line 3188 "PhotoPage.c" } -static gpointer _background_job_ref0 (gpointer self) { +static gpointer +_background_job_ref0 (gpointer self) +{ #line 93 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self ? background_job_ref (self) : NULL; -#line 2449 "PhotoPage.c" +#line 3197 "PhotoPage.c" } -static void _zoom_buffer_on_iso_transformation_complete_completion_callback (BackgroundJob* job, gpointer self) { +static void +_zoom_buffer_on_iso_transformation_complete_completion_callback (BackgroundJob* job, + gpointer self) +{ #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_buffer_on_iso_transformation_complete ((ZoomBuffer*) self, job); -#line 2456 "PhotoPage.c" +#line 3207 "PhotoPage.c" } -static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, BackgroundJob* job) { +static void +zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, + BackgroundJob* job) +{ ZoomBufferIsoSourceFetchJob* fetch_job = NULL; - BackgroundJob* _tmp0_; + ZoomBufferIsoSourceFetchJob* _tmp0_; ZoomBufferIsoSourceFetchJob* _tmp1_; - ZoomBufferIsoSourceFetchJob* _tmp2_; - GdkPixbuf* _tmp3_; - ZoomBufferIsoSourceFetchJob* _tmp4_; + GdkPixbuf* _tmp2_; + ZoomBufferIsoSourceFetchJob* _tmp3_; + GdkPixbuf* _tmp4_; GdkPixbuf* _tmp5_; GdkPixbuf* _tmp6_; - GdkPixbuf* _tmp7_; + gint _tmp7_; gint _tmp8_; - gint _tmp9_; - GdkPixbuf* _tmp10_; + GdkPixbuf* _tmp9_; + gint _tmp10_; gint _tmp11_; - gint _tmp12_; - gboolean _tmp21_; + gboolean _tmp20_; BackgroundJob* transformation_job = NULL; - GdkPixbuf* _tmp23_; - Photo* _tmp24_; + GdkPixbuf* _tmp22_; + Photo* _tmp23_; + PixelTransformer* _tmp24_; PixelTransformer* _tmp25_; - PixelTransformer* _tmp26_; + GCancellable* _tmp26_; GCancellable* _tmp27_; - GCancellable* _tmp28_; - ZoomBufferTransformationJob* _tmp29_; - BackgroundJob* _tmp30_; - Workers* _tmp31_; - BackgroundJob* _tmp32_; + ZoomBufferTransformationJob* _tmp28_; + BackgroundJob* _tmp29_; + Workers* _tmp30_; + BackgroundJob* _tmp31_; #line 92 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_ZOOM_BUFFER (self)); #line 92 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_BACKGROUND_JOB (job)); #line 93 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = job; -#line 93 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, ZOOM_BUFFER_TYPE_ISO_SOURCE_FETCH_JOB, ZoomBufferIsoSourceFetchJob)); + _tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (job, ZOOM_BUFFER_TYPE_ISO_SOURCE_FETCH_JOB, ZoomBufferIsoSourceFetchJob)); #line 93 "/home/jens/Source/shotwell/src/PhotoPage.vala" - fetch_job = _tmp1_; + fetch_job = _tmp0_; #line 94 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = fetch_job; + _tmp1_ = fetch_job; #line 94 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_->fetched; + _tmp2_ = _tmp1_->fetched; #line 94 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 95 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_critical ("PhotoPage.vala:95: ZoomBuffer: iso_source_fetch_complete( ): fetch job" \ " has null image member"); @@ -2506,314 +3257,312 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou _background_job_unref0 (fetch_job); #line 96 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 2509 "PhotoPage.c" +#line 3260 "PhotoPage.c" } #line 99 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = fetch_job; + _tmp3_ = fetch_job; #line 99 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = _tmp4_->fetched; + _tmp4_ = _tmp3_->fetched; #line 99 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp5_ = _g_object_ref0 (_tmp4_); #line 99 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->iso_source_image); #line 99 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->iso_source_image = _tmp6_; + self->priv->iso_source_image = _tmp5_; #line 100 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = self->priv->iso_source_image; + _tmp6_ = self->priv->iso_source_image; #line 100 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = gdk_pixbuf_get_width (_tmp7_); + _tmp7_ = gdk_pixbuf_get_width (_tmp6_); #line 100 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 100 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = self->priv->iso_source_image; + _tmp9_ = self->priv->iso_source_image; #line 100 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = gdk_pixbuf_get_height (_tmp10_); + _tmp10_ = gdk_pixbuf_get_height (_tmp9_); #line 100 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 100 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((_tmp9_ * _tmp12_) > ZOOM_BUFFER_USE_REDUCED_THRESHOLD) { -#line 2535 "PhotoPage.c" + if ((_tmp8_ * _tmp11_) > ZOOM_BUFFER_USE_REDUCED_THRESHOLD) { +#line 3286 "PhotoPage.c" + GdkPixbuf* _tmp12_; GdkPixbuf* _tmp13_; - GdkPixbuf* _tmp14_; + gint _tmp14_; gint _tmp15_; - gint _tmp16_; - GdkPixbuf* _tmp17_; + GdkPixbuf* _tmp16_; + gint _tmp17_; gint _tmp18_; - gint _tmp19_; - GdkPixbuf* _tmp20_; + GdkPixbuf* _tmp19_; #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = self->priv->iso_source_image; + _tmp12_ = self->priv->iso_source_image; #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = self->priv->iso_source_image; + _tmp13_ = self->priv->iso_source_image; #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = gdk_pixbuf_get_width (_tmp14_); + _tmp14_ = gdk_pixbuf_get_width (_tmp13_); #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = self->priv->iso_source_image; + _tmp16_ = self->priv->iso_source_image; #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = gdk_pixbuf_get_height (_tmp17_); + _tmp17_ = gdk_pixbuf_get_height (_tmp16_); #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = gdk_pixbuf_scale_simple (_tmp13_, _tmp16_ / 2, _tmp19_ / 2, GDK_INTERP_BILINEAR); + _tmp19_ = gdk_pixbuf_scale_simple (_tmp12_, _tmp15_ / 2, _tmp18_ / 2, GDK_INTERP_BILINEAR); #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->reduced_source_image); #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->reduced_source_image = _tmp20_; -#line 2564 "PhotoPage.c" + self->priv->reduced_source_image = _tmp19_; +#line 3315 "PhotoPage.c" } #line 104 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->object_state = ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED; #line 106 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = self->priv->is_interactive_redraw_in_progress; + _tmp20_ = self->priv->is_interactive_redraw_in_progress; #line 106 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp21_) { -#line 2572 "PhotoPage.c" - SinglePhotoPage* _tmp22_; + if (!_tmp20_) { +#line 3323 "PhotoPage.c" + SinglePhotoPage* _tmp21_; #line 107 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = self->priv->parent_page; + _tmp21_ = self->priv->parent_page; #line 107 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_repaint (_tmp22_, NULL); -#line 2578 "PhotoPage.c" + single_photo_page_repaint (_tmp21_, NULL); +#line 3329 "PhotoPage.c" } #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = self->priv->iso_source_image; + _tmp22_ = self->priv->iso_source_image; #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = self->priv->backing_photo; + _tmp23_ = self->priv->backing_photo; #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = photo_get_pixel_transformer (_tmp24_); + _tmp24_ = photo_get_pixel_transformer (_tmp23_); #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp26_ = _tmp25_; + _tmp25_ = _tmp24_; #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = g_cancellable_new (); + _tmp26_ = g_cancellable_new (); #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = _tmp27_; + _tmp27_ = _tmp26_; #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = zoom_buffer_transformation_job_new (self, _tmp23_, _tmp26_, _zoom_buffer_on_iso_transformation_complete_completion_callback, self, _tmp28_); + _tmp28_ = zoom_buffer_transformation_job_new (self, _tmp22_, _tmp25_, _zoom_buffer_on_iso_transformation_complete_completion_callback, self, _tmp27_); #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_BACKGROUND_JOB, BackgroundJob); + _tmp29_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_BACKGROUND_JOB, BackgroundJob); #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp28_); + _g_object_unref0 (_tmp27_); #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _pixel_transformer_unref0 (_tmp26_); + _pixel_transformer_unref0 (_tmp25_); #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala" - transformation_job = _tmp30_; + transformation_job = _tmp29_; #line 112 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp31_ = self->priv->workers; + _tmp30_ = self->priv->workers; #line 112 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp32_ = transformation_job; + _tmp31_ = transformation_job; #line 112 "/home/jens/Source/shotwell/src/PhotoPage.vala" - workers_enqueue (_tmp31_, _tmp32_); + workers_enqueue (_tmp30_, _tmp31_); #line 92 "/home/jens/Source/shotwell/src/PhotoPage.vala" _background_job_unref0 (transformation_job); #line 92 "/home/jens/Source/shotwell/src/PhotoPage.vala" _background_job_unref0 (fetch_job); -#line 2612 "PhotoPage.c" +#line 3363 "PhotoPage.c" } -static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, BackgroundJob* job) { +static void +zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, + BackgroundJob* job) +{ ZoomBufferTransformationJob* transform_job = NULL; - BackgroundJob* _tmp0_; + ZoomBufferTransformationJob* _tmp0_; ZoomBufferTransformationJob* _tmp1_; - ZoomBufferTransformationJob* _tmp2_; - GdkPixbuf* _tmp3_; - ZoomBufferTransformationJob* _tmp4_; + GdkPixbuf* _tmp2_; + ZoomBufferTransformationJob* _tmp3_; + GdkPixbuf* _tmp4_; GdkPixbuf* _tmp5_; GdkPixbuf* _tmp6_; - GdkPixbuf* _tmp7_; + gint _tmp7_; gint _tmp8_; - gint _tmp9_; - GdkPixbuf* _tmp10_; + GdkPixbuf* _tmp9_; + gint _tmp10_; gint _tmp11_; - gint _tmp12_; #line 115 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_ZOOM_BUFFER (self)); #line 115 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_BACKGROUND_JOB (job)); #line 116 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = job; -#line 116 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, ZoomBufferTransformationJob)); + _tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (job, ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, ZoomBufferTransformationJob)); #line 116 "/home/jens/Source/shotwell/src/PhotoPage.vala" - transform_job = _tmp1_; + transform_job = _tmp0_; #line 117 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = transform_job; + _tmp1_ = transform_job; #line 117 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_->transformed; + _tmp2_ = _tmp1_->transformed; #line 117 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 118 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_critical ("PhotoPage.vala:118: %s", "ZoomBuffer: on_iso_transformation_complete( ): completed job has null " "image"); #line 120 "/home/jens/Source/shotwell/src/PhotoPage.vala" _background_job_unref0 (transform_job); #line 120 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 2653 "PhotoPage.c" +#line 3404 "PhotoPage.c" } #line 123 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = transform_job; + _tmp3_ = transform_job; #line 123 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = _tmp4_->transformed; + _tmp4_ = _tmp3_->transformed; #line 123 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp5_ = _g_object_ref0 (_tmp4_); #line 123 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->iso_transformed_image); #line 123 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->iso_transformed_image = _tmp6_; + self->priv->iso_transformed_image = _tmp5_; #line 124 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = self->priv->iso_transformed_image; + _tmp6_ = self->priv->iso_transformed_image; #line 124 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = gdk_pixbuf_get_width (_tmp7_); + _tmp7_ = gdk_pixbuf_get_width (_tmp6_); #line 124 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 124 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = self->priv->iso_transformed_image; + _tmp9_ = self->priv->iso_transformed_image; #line 124 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = gdk_pixbuf_get_height (_tmp10_); + _tmp10_ = gdk_pixbuf_get_height (_tmp9_); #line 124 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 124 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((_tmp9_ * _tmp12_) > ZOOM_BUFFER_USE_REDUCED_THRESHOLD) { -#line 2679 "PhotoPage.c" + if ((_tmp8_ * _tmp11_) > ZOOM_BUFFER_USE_REDUCED_THRESHOLD) { +#line 3430 "PhotoPage.c" + GdkPixbuf* _tmp12_; GdkPixbuf* _tmp13_; - GdkPixbuf* _tmp14_; + gint _tmp14_; gint _tmp15_; - gint _tmp16_; - GdkPixbuf* _tmp17_; + GdkPixbuf* _tmp16_; + gint _tmp17_; gint _tmp18_; - gint _tmp19_; - GdkPixbuf* _tmp20_; + GdkPixbuf* _tmp19_; #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = self->priv->iso_transformed_image; + _tmp12_ = self->priv->iso_transformed_image; #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = self->priv->iso_transformed_image; + _tmp13_ = self->priv->iso_transformed_image; #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = gdk_pixbuf_get_width (_tmp14_); + _tmp14_ = gdk_pixbuf_get_width (_tmp13_); #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = self->priv->iso_transformed_image; + _tmp16_ = self->priv->iso_transformed_image; #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = gdk_pixbuf_get_height (_tmp17_); + _tmp17_ = gdk_pixbuf_get_height (_tmp16_); #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = gdk_pixbuf_scale_simple (_tmp13_, _tmp16_ / 2, _tmp19_ / 2, GDK_INTERP_BILINEAR); + _tmp19_ = gdk_pixbuf_scale_simple (_tmp12_, _tmp15_ / 2, _tmp18_ / 2, GDK_INTERP_BILINEAR); #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->reduced_transformed_image); #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->reduced_transformed_image = _tmp20_; -#line 2708 "PhotoPage.c" + self->priv->reduced_transformed_image = _tmp19_; +#line 3459 "PhotoPage.c" } #line 129 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->object_state = ZOOM_BUFFER_OBJECT_STATE_TRANSFORMED_READY; #line 115 "/home/jens/Source/shotwell/src/PhotoPage.vala" _background_job_unref0 (transform_job); -#line 2714 "PhotoPage.c" +#line 3465 "PhotoPage.c" } -static void zoom_buffer_on_demand_transform_complete (ZoomBuffer* self, BackgroundJob* job) { +static void +zoom_buffer_on_demand_transform_complete (ZoomBuffer* self, + BackgroundJob* job) +{ ZoomBufferTransformationJob* transform_job = NULL; - BackgroundJob* _tmp0_; + ZoomBufferTransformationJob* _tmp0_; ZoomBufferTransformationJob* _tmp1_; - ZoomBufferTransformationJob* _tmp2_; - GdkPixbuf* _tmp3_; - ZoomBufferTransformationJob* _tmp4_; + GdkPixbuf* _tmp2_; + ZoomBufferTransformationJob* _tmp3_; + GdkPixbuf* _tmp4_; GdkPixbuf* _tmp5_; - GdkPixbuf* _tmp6_; - SinglePhotoPage* _tmp7_; + SinglePhotoPage* _tmp6_; #line 132 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_ZOOM_BUFFER (self)); #line 132 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_BACKGROUND_JOB (job)); #line 133 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = job; + _tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (job, ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, ZoomBufferTransformationJob)); #line 133 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, ZoomBufferTransformationJob)); -#line 133 "/home/jens/Source/shotwell/src/PhotoPage.vala" - transform_job = _tmp1_; + transform_job = _tmp0_; #line 134 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = transform_job; + _tmp1_ = transform_job; #line 134 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_->transformed; + _tmp2_ = _tmp1_->transformed; #line 134 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 135 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_critical ("PhotoPage.vala:135: %s", "ZoomBuffer: on_demand_transform_complete( ): completed job has null " "image"); #line 137 "/home/jens/Source/shotwell/src/PhotoPage.vala" _background_job_unref0 (transform_job); #line 137 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 2750 "PhotoPage.c" +#line 3501 "PhotoPage.c" } #line 140 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = transform_job; + _tmp3_ = transform_job; #line 140 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = _tmp4_->transformed; + _tmp4_ = _tmp3_->transformed; #line 140 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp5_ = _g_object_ref0 (_tmp4_); #line 140 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->demand_transform_cached_pixbuf); #line 140 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->demand_transform_cached_pixbuf = _tmp6_; + self->priv->demand_transform_cached_pixbuf = _tmp5_; #line 141 "/home/jens/Source/shotwell/src/PhotoPage.vala" _background_job_unref0 (self->priv->demand_transform_job); #line 141 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->demand_transform_job = NULL; #line 143 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = self->priv->parent_page; + _tmp6_ = self->priv->parent_page; #line 143 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_repaint (_tmp7_, NULL); + single_photo_page_repaint (_tmp6_, NULL); #line 132 "/home/jens/Source/shotwell/src/PhotoPage.vala" _background_job_unref0 (transform_job); -#line 2772 "PhotoPage.c" +#line 3523 "PhotoPage.c" } -static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, ZoomState* zoom_state, GdkPixbuf* iso_pixbuf, GdkPixbuf* reduced_pixbuf) { +static GdkPixbuf* +zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, + ZoomState* zoom_state, + GdkPixbuf* iso_pixbuf, + GdkPixbuf* reduced_pixbuf) +{ GdkPixbuf* result = NULL; GdkRectangle view_rect = {0}; GdkRectangle _tmp0_ = {0}; GdkRectangle view_rect_proj = {0}; - GdkPixbuf* _tmp1_; - GdkRectangle _tmp2_ = {0}; + GdkRectangle _tmp1_ = {0}; GdkPixbuf* sample_source_pixbuf = NULL; - GdkPixbuf* _tmp3_; - GdkPixbuf* _tmp4_; - gboolean _tmp5_ = FALSE; - GdkPixbuf* _tmp6_; - GdkRectangle _tmp14_; - gint _tmp15_; + GdkPixbuf* _tmp2_; + gboolean _tmp3_ = FALSE; + GdkRectangle _tmp9_; + gint _tmp10_; + GdkRectangle _tmp11_; + gint _tmp12_; + GdkRectangle _tmp13_; + gint _tmp14_; + GdkRectangle _tmp15_; gint _tmp16_; - GdkRectangle _tmp17_; - gint _tmp18_; + GdkPixbuf* proj_subpixbuf = NULL; + GdkPixbuf* _tmp17_; + GdkRectangle _tmp18_; gint _tmp19_; GdkRectangle _tmp20_; gint _tmp21_; - gint _tmp22_; - GdkRectangle _tmp23_; - gint _tmp24_; + GdkRectangle _tmp22_; + gint _tmp23_; + GdkRectangle _tmp24_; gint _tmp25_; - GdkPixbuf* proj_subpixbuf = NULL; GdkPixbuf* _tmp26_; + GdkPixbuf* zoomed = NULL; GdkRectangle _tmp27_; gint _tmp28_; GdkRectangle _tmp29_; gint _tmp30_; - GdkRectangle _tmp31_; - gint _tmp32_; - GdkRectangle _tmp33_; - gint _tmp34_; - GdkPixbuf* _tmp35_; - GdkPixbuf* zoomed = NULL; - GdkRectangle _tmp36_; - gint _tmp37_; - GdkRectangle _tmp38_; - gint _tmp39_; - GdkPixbuf* _tmp40_; + GdkPixbuf* _tmp31_; #line 149 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_ZOOM_BUFFER (self), NULL); #line 149 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -2827,134 +3576,113 @@ static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, Zoom #line 151 "/home/jens/Source/shotwell/src/PhotoPage.vala" view_rect = _tmp0_; #line 152 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = iso_pixbuf; -#line 152 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_state_get_viewing_rectangle_projection (zoom_state, _tmp1_, &_tmp2_); + zoom_state_get_viewing_rectangle_projection (zoom_state, iso_pixbuf, &_tmp1_); #line 152 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view_rect_proj = _tmp2_; + view_rect_proj = _tmp1_; #line 154 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = iso_pixbuf; + _tmp2_ = _g_object_ref0 (iso_pixbuf); #line 154 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); -#line 154 "/home/jens/Source/shotwell/src/PhotoPage.vala" - sample_source_pixbuf = _tmp4_; -#line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = reduced_pixbuf; + sample_source_pixbuf = _tmp2_; #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp6_ != NULL) { -#line 2845 "PhotoPage.c" - gdouble _tmp7_; -#line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = zoom_state_get_zoom_factor (zoom_state); + if (reduced_pixbuf != NULL) { #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = _tmp7_ < 0.5; -#line 2851 "PhotoPage.c" + _tmp3_ = zoom_state_get_zoom_factor (zoom_state) < 0.5; +#line 3590 "PhotoPage.c" } else { #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = FALSE; -#line 2855 "PhotoPage.c" + _tmp3_ = FALSE; +#line 3594 "PhotoPage.c" } #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp5_) { -#line 2859 "PhotoPage.c" - GdkPixbuf* _tmp8_; - GdkPixbuf* _tmp9_; - gint _tmp10_; - gint _tmp11_; - gint _tmp12_; - gint _tmp13_; -#line 157 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = reduced_pixbuf; + if (_tmp3_) { +#line 3598 "PhotoPage.c" + GdkPixbuf* _tmp4_; + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 157 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = _g_object_ref0 (_tmp8_); + _tmp4_ = _g_object_ref0 (reduced_pixbuf); #line 157 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (sample_source_pixbuf); #line 157 "/home/jens/Source/shotwell/src/PhotoPage.vala" - sample_source_pixbuf = _tmp9_; + sample_source_pixbuf = _tmp4_; #line 158 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = view_rect_proj.x; + _tmp5_ = view_rect_proj.x; #line 158 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view_rect_proj.x = _tmp10_ / 2; + view_rect_proj.x = _tmp5_ / 2; #line 159 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = view_rect_proj.y; + _tmp6_ = view_rect_proj.y; #line 159 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view_rect_proj.y = _tmp11_ / 2; + view_rect_proj.y = _tmp6_ / 2; #line 160 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = view_rect_proj.width; + _tmp7_ = view_rect_proj.width; #line 160 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view_rect_proj.width = _tmp12_ / 2; + view_rect_proj.width = _tmp7_ / 2; #line 161 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = view_rect_proj.height; + _tmp8_ = view_rect_proj.height; #line 161 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view_rect_proj.height = _tmp13_ / 2; -#line 2890 "PhotoPage.c" + view_rect_proj.height = _tmp8_ / 2; +#line 3626 "PhotoPage.c" } #line 167 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = view_rect_proj; + _tmp9_ = view_rect_proj; #line 167 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = _tmp14_.width; -#line 167 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = CLAMP (_tmp15_, 1, G_MAXINT); + _tmp10_ = _tmp9_.width; #line 167 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view_rect_proj.width = _tmp16_; + view_rect_proj.width = CLAMP (_tmp10_, 1, G_MAXINT); #line 168 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = view_rect_proj; -#line 168 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = _tmp17_.height; + _tmp11_ = view_rect_proj; #line 168 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = CLAMP (_tmp18_, 1, G_MAXINT); + _tmp12_ = _tmp11_.height; #line 168 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view_rect_proj.height = _tmp19_; + view_rect_proj.height = CLAMP (_tmp12_, 1, G_MAXINT); #line 170 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = view_rect; + _tmp13_ = view_rect; #line 170 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = _tmp20_.width; + _tmp14_ = _tmp13_.width; #line 170 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = CLAMP (_tmp21_, 1, G_MAXINT); -#line 170 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view_rect.width = _tmp22_; -#line 171 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = view_rect; + view_rect.width = CLAMP (_tmp14_, 1, G_MAXINT); #line 171 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = _tmp23_.height; + _tmp15_ = view_rect; #line 171 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = CLAMP (_tmp24_, 1, G_MAXINT); + _tmp16_ = _tmp15_.height; #line 171 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view_rect.height = _tmp25_; + view_rect.height = CLAMP (_tmp16_, 1, G_MAXINT); #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp26_ = sample_source_pixbuf; + _tmp17_ = sample_source_pixbuf; #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = view_rect_proj; + _tmp18_ = view_rect_proj; #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = _tmp27_.x; + _tmp19_ = _tmp18_.x; #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = view_rect_proj; + _tmp20_ = view_rect_proj; #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_ = _tmp29_.y; + _tmp21_ = _tmp20_.y; #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp31_ = view_rect_proj; + _tmp22_ = view_rect_proj; #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp32_ = _tmp31_.width; + _tmp23_ = _tmp22_.width; #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp33_ = view_rect_proj; + _tmp24_ = view_rect_proj; #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp34_ = _tmp33_.height; + _tmp25_ = _tmp24_.height; #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp35_ = gdk_pixbuf_new_subpixbuf (_tmp26_, _tmp28_, _tmp30_, _tmp32_, _tmp34_); + _tmp26_ = gdk_pixbuf_new_subpixbuf (_tmp17_, _tmp19_, _tmp21_, _tmp23_, _tmp25_); #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala" - proj_subpixbuf = _tmp35_; + proj_subpixbuf = _tmp26_; #line 176 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp36_ = view_rect; + _tmp27_ = view_rect; #line 176 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp37_ = _tmp36_.width; + _tmp28_ = _tmp27_.width; #line 176 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp38_ = view_rect; + _tmp29_ = view_rect; #line 176 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp39_ = _tmp38_.height; + _tmp30_ = _tmp29_.height; #line 176 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp40_ = gdk_pixbuf_scale_simple (proj_subpixbuf, _tmp37_, _tmp39_, GDK_INTERP_BILINEAR); + _tmp31_ = gdk_pixbuf_scale_simple (proj_subpixbuf, _tmp28_, _tmp30_, GDK_INTERP_BILINEAR); #line 176 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoomed = _tmp40_; + zoomed = _tmp31_; #line 179 "/home/jens/Source/shotwell/src/PhotoPage.vala" _vala_assert (zoomed != NULL, "zoomed != null"); #line 181 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -2965,24 +3693,30 @@ static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, Zoom _g_object_unref0 (sample_source_pixbuf); #line 181 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 2968 "PhotoPage.c" +#line 3696 "PhotoPage.c" } -static void _zoom_buffer_on_demand_transform_complete_completion_callback (BackgroundJob* job, gpointer self) { +static void +_zoom_buffer_on_demand_transform_complete_completion_callback (BackgroundJob* job, + gpointer self) +{ #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_buffer_on_demand_transform_complete ((ZoomBuffer*) self, job); -#line 2975 "PhotoPage.c" +#line 3706 "PhotoPage.c" } -static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffer* self, ZoomState* zoom_state) { +static GdkPixbuf* +zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffer* self, + ZoomState* zoom_state) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_; - ZoomBufferTransformationJob* _tmp97_; - ZoomBufferTransformationJob* _tmp119_; - ZoomState _tmp136_; - GdkPixbuf* _tmp137_; + ZoomBufferTransformationJob* _tmp86_; + ZoomBufferTransformationJob* _tmp107_; + ZoomState _tmp124_; + GdkPixbuf* _tmp125_; #line 184 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_ZOOM_BUFFER (self), NULL); #line 184 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -2991,98 +3725,93 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe _tmp0_ = self->priv->demand_transform_cached_pixbuf; #line 185 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 2994 "PhotoPage.c" +#line 3728 "PhotoPage.c" ZoomState _tmp1_; - gboolean _tmp2_; #line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->demand_transform_zoom_state; #line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = zoom_state_equals (zoom_state, &_tmp1_); -#line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp2_) { -#line 3003 "PhotoPage.c" + if (zoom_state_equals (zoom_state, &_tmp1_)) { +#line 3734 "PhotoPage.c" + GdkPixbuf* _tmp2_; GdkPixbuf* _tmp3_; - GdkPixbuf* _tmp4_; #line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = self->priv->demand_transform_cached_pixbuf; + _tmp2_ = self->priv->demand_transform_cached_pixbuf; #line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp3_ = _g_object_ref0 (_tmp2_); #line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp4_; + result = _tmp3_; #line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3014 "PhotoPage.c" +#line 3745 "PhotoPage.c" } else { - gdouble _tmp5_; - gdouble _tmp6_; -#line 191 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = zoom_state_get_zoom_factor (zoom_state); -#line 191 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = zoom_state_get_zoom_factor (&self->priv->demand_transform_zoom_state); #line 191 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp5_ == _tmp6_) { -#line 3024 "PhotoPage.c" + if (zoom_state_get_zoom_factor (zoom_state) == zoom_state_get_zoom_factor (&self->priv->demand_transform_zoom_state)) { +#line 3749 "PhotoPage.c" GdkRectangle curr_rect = {0}; - GdkRectangle _tmp7_ = {0}; + GdkRectangle _tmp4_ = {0}; GdkRectangle pre_rect = {0}; - GdkRectangle _tmp8_ = {0}; + GdkRectangle _tmp5_ = {0}; GdkRectangle transfer_src_rect = {0}; GdkRectangle transfer_dest_rect = {0}; - GdkRectangle _tmp9_; - gint _tmp10_; - GdkRectangle _tmp11_; - gint _tmp12_; - GdkRectangle _tmp13_; - gint _tmp14_; + GdkRectangle _tmp6_; + gint _tmp7_; + GdkRectangle _tmp8_; + gint _tmp9_; + GdkRectangle _tmp10_; + gint _tmp11_; + GdkRectangle _tmp12_; + gint _tmp13_; + GdkRectangle _tmp14_; gint _tmp15_; GdkRectangle _tmp16_; gint _tmp17_; + gint transfer_src_right = 0; GdkRectangle _tmp18_; gint _tmp19_; GdkRectangle _tmp20_; gint _tmp21_; - gint _tmp22_; - gint transfer_src_right = 0; - GdkRectangle _tmp23_; - gint _tmp24_; - GdkRectangle _tmp25_; + GdkRectangle _tmp22_; + gint _tmp23_; + GdkRectangle _tmp24_; + gint _tmp25_; gint _tmp26_; GdkRectangle _tmp27_; gint _tmp28_; + gint transfer_src_bottom = 0; GdkRectangle _tmp29_; gint _tmp30_; - gint _tmp31_; + GdkRectangle _tmp31_; gint _tmp32_; GdkRectangle _tmp33_; gint _tmp34_; - gint transfer_src_bottom = 0; GdkRectangle _tmp35_; gint _tmp36_; - GdkRectangle _tmp37_; - gint _tmp38_; - GdkRectangle _tmp39_; - gint _tmp40_; - GdkRectangle _tmp41_; - gint _tmp42_; + gint _tmp37_; + GdkRectangle _tmp38_; + gint _tmp39_; + GdkRectangle _tmp40_; + gint _tmp41_; + GdkRectangle _tmp42_; gint _tmp43_; - gint _tmp44_; - GdkRectangle _tmp45_; - gint _tmp46_; - GdkRectangle _tmp47_; - gint _tmp48_; - GdkRectangle _tmp49_; - gint _tmp50_; - GdkRectangle _tmp51_; - gint _tmp52_; + GdkRectangle _tmp44_; + gint _tmp45_; + GdkRectangle _tmp46_; + gint _tmp47_; + GdkRectangle _tmp48_; + gint _tmp49_; + GdkRectangle _tmp50_; + gint _tmp51_; + gint transfer_dest_right = 0; + GdkRectangle _tmp52_; gint _tmp53_; GdkRectangle _tmp54_; gint _tmp55_; GdkRectangle _tmp56_; gint _tmp57_; - GdkRectangle _tmp58_; - gint _tmp59_; + gint _tmp58_; + GdkRectangle _tmp59_; gint _tmp60_; - gint transfer_dest_right = 0; + gint transfer_dest_bottom = 0; GdkRectangle _tmp61_; gint _tmp62_; GdkRectangle _tmp63_; @@ -3090,467 +3819,442 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe GdkRectangle _tmp65_; gint _tmp66_; gint _tmp67_; - gint _tmp68_; - GdkRectangle _tmp69_; - gint _tmp70_; - gint transfer_dest_bottom = 0; - GdkRectangle _tmp71_; - gint _tmp72_; + GdkRectangle _tmp68_; + gint _tmp69_; + GdkPixbuf* composited_result = NULL; + ZoomState _tmp70_; + GdkPixbuf* _tmp71_; + GdkPixbuf* _tmp72_; GdkRectangle _tmp73_; gint _tmp74_; GdkRectangle _tmp75_; gint _tmp76_; - gint _tmp77_; + GdkRectangle _tmp77_; gint _tmp78_; GdkRectangle _tmp79_; gint _tmp80_; - GdkPixbuf* composited_result = NULL; - ZoomState _tmp81_; - GdkPixbuf* _tmp82_; - GdkPixbuf* _tmp83_; + GdkPixbuf* _tmp81_; + GdkRectangle _tmp82_; + gint _tmp83_; GdkRectangle _tmp84_; gint _tmp85_; - GdkRectangle _tmp86_; - gint _tmp87_; - GdkRectangle _tmp88_; - gint _tmp89_; - GdkRectangle _tmp90_; - gint _tmp91_; - GdkPixbuf* _tmp92_; - GdkRectangle _tmp93_; - gint _tmp94_; - GdkRectangle _tmp95_; - gint _tmp96_; #line 202 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp7_); + zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp4_); #line 202 "/home/jens/Source/shotwell/src/PhotoPage.vala" - curr_rect = _tmp7_; + curr_rect = _tmp4_; #line 203 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_state_get_viewing_rectangle_wrt_content (&self->priv->demand_transform_zoom_state, &_tmp8_); + zoom_state_get_viewing_rectangle_wrt_content (&self->priv->demand_transform_zoom_state, &_tmp5_); #line 203 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pre_rect = _tmp8_; + pre_rect = _tmp5_; #line 205 "/home/jens/Source/shotwell/src/PhotoPage.vala" memset (&transfer_src_rect, 0, sizeof (GdkRectangle)); #line 206 "/home/jens/Source/shotwell/src/PhotoPage.vala" memset (&transfer_dest_rect, 0, sizeof (GdkRectangle)); #line 208 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = curr_rect; -#line 208 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp9_.x; + _tmp6_ = curr_rect; #line 208 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = pre_rect; + _tmp7_ = _tmp6_.x; #line 208 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _tmp11_.x; + _tmp8_ = pre_rect; #line 208 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = pre_rect; + _tmp9_ = _tmp8_.x; #line 208 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = _tmp13_.width; + _tmp10_ = pre_rect; #line 208 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = CLAMP (_tmp10_ - _tmp12_, 0, _tmp14_); + _tmp11_ = _tmp10_.width; #line 208 "/home/jens/Source/shotwell/src/PhotoPage.vala" - transfer_src_rect.x = _tmp15_; + transfer_src_rect.x = CLAMP (_tmp7_ - _tmp9_, 0, _tmp11_); #line 209 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = curr_rect; + _tmp12_ = curr_rect; #line 209 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = _tmp16_.y; + _tmp13_ = _tmp12_.y; #line 209 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = pre_rect; + _tmp14_ = pre_rect; #line 209 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = _tmp18_.y; + _tmp15_ = _tmp14_.y; #line 209 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = pre_rect; + _tmp16_ = pre_rect; #line 209 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = _tmp20_.height; + _tmp17_ = _tmp16_.height; #line 209 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = CLAMP (_tmp17_ - _tmp19_, 0, _tmp21_); -#line 209 "/home/jens/Source/shotwell/src/PhotoPage.vala" - transfer_src_rect.y = _tmp22_; -#line 210 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = curr_rect; + transfer_src_rect.y = CLAMP (_tmp13_ - _tmp15_, 0, _tmp17_); #line 210 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = _tmp23_.x; + _tmp18_ = curr_rect; #line 210 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = curr_rect; + _tmp19_ = _tmp18_.x; #line 210 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp26_ = _tmp25_.width; + _tmp20_ = curr_rect; #line 210 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = pre_rect; + _tmp21_ = _tmp20_.width; #line 210 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = _tmp27_.width; + _tmp22_ = pre_rect; #line 210 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = pre_rect; + _tmp23_ = _tmp22_.width; #line 210 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_ = _tmp29_.width; + _tmp24_ = pre_rect; #line 210 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp31_ = CLAMP ((_tmp24_ + _tmp26_) - _tmp28_, 0, _tmp30_); + _tmp25_ = _tmp24_.width; #line 210 "/home/jens/Source/shotwell/src/PhotoPage.vala" - transfer_src_right = _tmp31_; + transfer_src_right = CLAMP ((_tmp19_ + _tmp21_) - _tmp23_, 0, _tmp25_); #line 212 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp32_ = transfer_src_right; + _tmp26_ = transfer_src_right; #line 212 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp33_ = transfer_src_rect; + _tmp27_ = transfer_src_rect; #line 212 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp34_ = _tmp33_.x; + _tmp28_ = _tmp27_.x; #line 212 "/home/jens/Source/shotwell/src/PhotoPage.vala" - transfer_src_rect.width = _tmp32_ - _tmp34_; + transfer_src_rect.width = _tmp26_ - _tmp28_; #line 213 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp35_ = curr_rect; + _tmp29_ = curr_rect; #line 213 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp36_ = _tmp35_.y; + _tmp30_ = _tmp29_.y; #line 213 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp37_ = curr_rect; + _tmp31_ = curr_rect; #line 213 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp38_ = _tmp37_.height; + _tmp32_ = _tmp31_.height; #line 213 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp39_ = pre_rect; + _tmp33_ = pre_rect; #line 213 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp40_ = _tmp39_.width; + _tmp34_ = _tmp33_.width; #line 213 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp41_ = pre_rect; + _tmp35_ = pre_rect; #line 213 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp42_ = _tmp41_.height; + _tmp36_ = _tmp35_.height; #line 213 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp43_ = CLAMP ((_tmp36_ + _tmp38_) - _tmp40_, 0, _tmp42_); -#line 213 "/home/jens/Source/shotwell/src/PhotoPage.vala" - transfer_src_bottom = _tmp43_; + transfer_src_bottom = CLAMP ((_tmp30_ + _tmp32_) - _tmp34_, 0, _tmp36_); #line 215 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp44_ = transfer_src_bottom; + _tmp37_ = transfer_src_bottom; #line 215 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp45_ = transfer_src_rect; + _tmp38_ = transfer_src_rect; #line 215 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp46_ = _tmp45_.y; + _tmp39_ = _tmp38_.y; #line 215 "/home/jens/Source/shotwell/src/PhotoPage.vala" - transfer_src_rect.height = _tmp44_ - _tmp46_; -#line 217 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp47_ = pre_rect; + transfer_src_rect.height = _tmp37_ - _tmp39_; #line 217 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp48_ = _tmp47_.x; + _tmp40_ = pre_rect; #line 217 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp49_ = curr_rect; + _tmp41_ = _tmp40_.x; #line 217 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp50_ = _tmp49_.x; + _tmp42_ = curr_rect; #line 217 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp51_ = curr_rect; + _tmp43_ = _tmp42_.x; #line 217 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp52_ = _tmp51_.width; + _tmp44_ = curr_rect; #line 217 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp53_ = CLAMP (_tmp48_ - _tmp50_, 0, _tmp52_); + _tmp45_ = _tmp44_.width; #line 217 "/home/jens/Source/shotwell/src/PhotoPage.vala" - transfer_dest_rect.x = _tmp53_; + transfer_dest_rect.x = CLAMP (_tmp41_ - _tmp43_, 0, _tmp45_); #line 218 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp54_ = pre_rect; + _tmp46_ = pre_rect; #line 218 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp55_ = _tmp54_.y; + _tmp47_ = _tmp46_.y; #line 218 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp56_ = curr_rect; -#line 218 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp57_ = _tmp56_.y; + _tmp48_ = curr_rect; #line 218 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp58_ = curr_rect; + _tmp49_ = _tmp48_.y; #line 218 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp59_ = _tmp58_.height; + _tmp50_ = curr_rect; #line 218 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp60_ = CLAMP (_tmp55_ - _tmp57_, 0, _tmp59_); + _tmp51_ = _tmp50_.height; #line 218 "/home/jens/Source/shotwell/src/PhotoPage.vala" - transfer_dest_rect.y = _tmp60_; -#line 219 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp61_ = transfer_dest_rect; + transfer_dest_rect.y = CLAMP (_tmp47_ - _tmp49_, 0, _tmp51_); #line 219 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp62_ = _tmp61_.x; + _tmp52_ = transfer_dest_rect; #line 219 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp63_ = transfer_src_rect; + _tmp53_ = _tmp52_.x; #line 219 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp64_ = _tmp63_.width; + _tmp54_ = transfer_src_rect; #line 219 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp65_ = curr_rect; + _tmp55_ = _tmp54_.width; #line 219 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp66_ = _tmp65_.width; + _tmp56_ = curr_rect; #line 219 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp67_ = CLAMP (_tmp62_ + _tmp64_, 0, _tmp66_); + _tmp57_ = _tmp56_.width; #line 219 "/home/jens/Source/shotwell/src/PhotoPage.vala" - transfer_dest_right = _tmp67_; + transfer_dest_right = CLAMP (_tmp53_ + _tmp55_, 0, _tmp57_); #line 221 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp68_ = transfer_dest_right; + _tmp58_ = transfer_dest_right; #line 221 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp69_ = transfer_dest_rect; + _tmp59_ = transfer_dest_rect; #line 221 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp70_ = _tmp69_.x; + _tmp60_ = _tmp59_.x; #line 221 "/home/jens/Source/shotwell/src/PhotoPage.vala" - transfer_dest_rect.width = _tmp68_ - _tmp70_; + transfer_dest_rect.width = _tmp58_ - _tmp60_; #line 222 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp71_ = transfer_dest_rect; -#line 222 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp72_ = _tmp71_.y; + _tmp61_ = transfer_dest_rect; #line 222 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp73_ = transfer_src_rect; + _tmp62_ = _tmp61_.y; #line 222 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp74_ = _tmp73_.height; + _tmp63_ = transfer_src_rect; #line 222 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp75_ = curr_rect; + _tmp64_ = _tmp63_.height; #line 222 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp76_ = _tmp75_.height; + _tmp65_ = curr_rect; #line 222 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp77_ = CLAMP (_tmp72_ + _tmp74_, 0, _tmp76_); + _tmp66_ = _tmp65_.height; #line 222 "/home/jens/Source/shotwell/src/PhotoPage.vala" - transfer_dest_bottom = _tmp77_; + transfer_dest_bottom = CLAMP (_tmp62_ + _tmp64_, 0, _tmp66_); #line 224 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp78_ = transfer_dest_bottom; + _tmp67_ = transfer_dest_bottom; #line 224 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp79_ = transfer_dest_rect; + _tmp68_ = transfer_dest_rect; #line 224 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp80_ = _tmp79_.y; + _tmp69_ = _tmp68_.y; #line 224 "/home/jens/Source/shotwell/src/PhotoPage.vala" - transfer_dest_rect.height = _tmp78_ - _tmp80_; + transfer_dest_rect.height = _tmp67_ - _tmp69_; #line 226 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp81_ = *zoom_state; + _tmp70_ = *zoom_state; #line 226 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp82_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp81_); + _tmp71_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp70_); #line 226 "/home/jens/Source/shotwell/src/PhotoPage.vala" - composited_result = _tmp82_; + composited_result = _tmp71_; #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp83_ = self->priv->demand_transform_cached_pixbuf; + _tmp72_ = self->priv->demand_transform_cached_pixbuf; #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp84_ = transfer_src_rect; + _tmp73_ = transfer_src_rect; #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp85_ = _tmp84_.x; + _tmp74_ = _tmp73_.x; #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp86_ = transfer_src_rect; + _tmp75_ = transfer_src_rect; #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp87_ = _tmp86_.y; + _tmp76_ = _tmp75_.y; #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp88_ = transfer_dest_rect; + _tmp77_ = transfer_dest_rect; #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp89_ = _tmp88_.width; + _tmp78_ = _tmp77_.width; #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp90_ = transfer_dest_rect; + _tmp79_ = transfer_dest_rect; #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp91_ = _tmp90_.height; + _tmp80_ = _tmp79_.height; #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp92_ = composited_result; + _tmp81_ = composited_result; #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp93_ = transfer_dest_rect; + _tmp82_ = transfer_dest_rect; #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp94_ = _tmp93_.x; + _tmp83_ = _tmp82_.x; #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp95_ = transfer_dest_rect; + _tmp84_ = transfer_dest_rect; #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp96_ = _tmp95_.y; + _tmp85_ = _tmp84_.y; #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gdk_pixbuf_copy_area (_tmp83_, _tmp85_, _tmp87_, _tmp89_, _tmp91_, _tmp92_, _tmp94_, _tmp96_); + gdk_pixbuf_copy_area (_tmp72_, _tmp74_, _tmp76_, _tmp78_, _tmp80_, _tmp81_, _tmp83_, _tmp85_); #line 231 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = composited_result; #line 231 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3344 "PhotoPage.c" +#line 4045 "PhotoPage.c" } } } #line 242 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp97_ = self->priv->demand_transform_job; + _tmp86_ = self->priv->demand_transform_job; #line 242 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp97_ != NULL) { -#line 3352 "PhotoPage.c" - ZoomState _tmp98_; - gboolean _tmp99_; + if (_tmp86_ != NULL) { +#line 4053 "PhotoPage.c" + ZoomState _tmp87_; #line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp98_ = self->priv->demand_transform_zoom_state; + _tmp87_ = self->priv->demand_transform_zoom_state; #line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp99_ = zoom_state_equals (zoom_state, &_tmp98_); -#line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp99_) { -#line 3361 "PhotoPage.c" - ZoomState _tmp100_; - GdkPixbuf* _tmp101_; + if (zoom_state_equals (zoom_state, &_tmp87_)) { +#line 4059 "PhotoPage.c" + ZoomState _tmp88_; + GdkPixbuf* _tmp89_; #line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp100_ = *zoom_state; + _tmp88_ = *zoom_state; #line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp101_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp100_); + _tmp89_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp88_); #line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp101_; + result = _tmp89_; #line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3372 "PhotoPage.c" +#line 4070 "PhotoPage.c" } else { - ZoomBufferTransformationJob* _tmp102_; + ZoomBufferTransformationJob* _tmp90_; GdkPixbuf* zoomed = NULL; - ZoomState _tmp103_; - GdkPixbuf* _tmp104_; - GdkPixbuf* _tmp105_; + ZoomState _tmp91_; + GdkPixbuf* _tmp92_; + GdkPixbuf* _tmp93_; + GdkPixbuf* _tmp94_; + GdkPixbuf* _tmp95_; + Photo* _tmp96_; + PixelTransformer* _tmp97_; + PixelTransformer* _tmp98_; + GCancellable* _tmp99_; + GCancellable* _tmp100_; + ZoomBufferTransformationJob* _tmp101_; + ZoomState _tmp102_; + Workers* _tmp103_; + ZoomBufferTransformationJob* _tmp104_; + ZoomState _tmp105_; GdkPixbuf* _tmp106_; - GdkPixbuf* _tmp107_; - Photo* _tmp108_; - PixelTransformer* _tmp109_; - PixelTransformer* _tmp110_; - GCancellable* _tmp111_; - GCancellable* _tmp112_; - ZoomBufferTransformationJob* _tmp113_; - ZoomState _tmp114_; - Workers* _tmp115_; - ZoomBufferTransformationJob* _tmp116_; - ZoomState _tmp117_; - GdkPixbuf* _tmp118_; #line 246 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp102_ = self->priv->demand_transform_job; + _tmp90_ = self->priv->demand_transform_job; #line 246 "/home/jens/Source/shotwell/src/PhotoPage.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, TYPE_BACKGROUND_JOB, BackgroundJob)); + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 247 "/home/jens/Source/shotwell/src/PhotoPage.vala" _background_job_unref0 (self->priv->demand_transform_job); #line 247 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->demand_transform_job = NULL; #line 249 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp103_ = *zoom_state; + _tmp91_ = *zoom_state; #line 249 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp104_ = self->priv->iso_source_image; + _tmp92_ = self->priv->iso_source_image; #line 249 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp105_ = self->priv->reduced_source_image; + _tmp93_ = self->priv->reduced_source_image; #line 249 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp106_ = zoom_buffer_get_view_projection_pixbuf (self, &_tmp103_, _tmp104_, _tmp105_); + _tmp94_ = zoom_buffer_get_view_projection_pixbuf (self, &_tmp91_, _tmp92_, _tmp93_); #line 249 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoomed = _tmp106_; + zoomed = _tmp94_; #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp107_ = zoomed; + _tmp95_ = zoomed; #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp108_ = self->priv->backing_photo; + _tmp96_ = self->priv->backing_photo; #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp109_ = photo_get_pixel_transformer (_tmp108_); + _tmp97_ = photo_get_pixel_transformer (_tmp96_); #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp110_ = _tmp109_; + _tmp98_ = _tmp97_; #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp111_ = g_cancellable_new (); + _tmp99_ = g_cancellable_new (); #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp112_ = _tmp111_; + _tmp100_ = _tmp99_; #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp113_ = zoom_buffer_transformation_job_new (self, _tmp107_, _tmp110_, _zoom_buffer_on_demand_transform_complete_completion_callback, self, _tmp112_); + _tmp101_ = zoom_buffer_transformation_job_new (self, _tmp95_, _tmp98_, _zoom_buffer_on_demand_transform_complete_completion_callback, self, _tmp100_); #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala" _background_job_unref0 (self->priv->demand_transform_job); #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->demand_transform_job = _tmp113_; + self->priv->demand_transform_job = _tmp101_; #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp112_); + _g_object_unref0 (_tmp100_); #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _pixel_transformer_unref0 (_tmp110_); + _pixel_transformer_unref0 (_tmp98_); #line 255 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp114_ = *zoom_state; + _tmp102_ = *zoom_state; #line 255 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->demand_transform_zoom_state = _tmp114_; + self->priv->demand_transform_zoom_state = _tmp102_; #line 256 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp115_ = self->priv->workers; + _tmp103_ = self->priv->workers; #line 256 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp116_ = self->priv->demand_transform_job; + _tmp104_ = self->priv->demand_transform_job; #line 256 "/home/jens/Source/shotwell/src/PhotoPage.vala" - workers_enqueue (_tmp115_, G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, TYPE_BACKGROUND_JOB, BackgroundJob)); + workers_enqueue (_tmp103_, G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 258 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp117_ = *zoom_state; + _tmp105_ = *zoom_state; #line 258 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp118_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp117_); + _tmp106_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp105_); #line 258 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp118_; + result = _tmp106_; #line 258 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (zoomed); #line 258 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3452 "PhotoPage.c" +#line 4150 "PhotoPage.c" } } #line 263 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp119_ = self->priv->demand_transform_job; + _tmp107_ = self->priv->demand_transform_job; #line 263 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp119_ == NULL) { -#line 3459 "PhotoPage.c" + if (_tmp107_ == NULL) { +#line 4157 "PhotoPage.c" GdkPixbuf* zoomed = NULL; - ZoomState _tmp120_; - GdkPixbuf* _tmp121_; - GdkPixbuf* _tmp122_; + ZoomState _tmp108_; + GdkPixbuf* _tmp109_; + GdkPixbuf* _tmp110_; + GdkPixbuf* _tmp111_; + GdkPixbuf* _tmp112_; + Photo* _tmp113_; + PixelTransformer* _tmp114_; + PixelTransformer* _tmp115_; + GCancellable* _tmp116_; + GCancellable* _tmp117_; + ZoomBufferTransformationJob* _tmp118_; + ZoomState _tmp119_; + Workers* _tmp120_; + ZoomBufferTransformationJob* _tmp121_; + ZoomState _tmp122_; GdkPixbuf* _tmp123_; - GdkPixbuf* _tmp124_; - Photo* _tmp125_; - PixelTransformer* _tmp126_; - PixelTransformer* _tmp127_; - GCancellable* _tmp128_; - GCancellable* _tmp129_; - ZoomBufferTransformationJob* _tmp130_; - ZoomState _tmp131_; - Workers* _tmp132_; - ZoomBufferTransformationJob* _tmp133_; - ZoomState _tmp134_; - GdkPixbuf* _tmp135_; #line 264 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp120_ = *zoom_state; + _tmp108_ = *zoom_state; #line 264 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp121_ = self->priv->iso_source_image; + _tmp109_ = self->priv->iso_source_image; #line 264 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp122_ = self->priv->reduced_source_image; + _tmp110_ = self->priv->reduced_source_image; #line 264 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp123_ = zoom_buffer_get_view_projection_pixbuf (self, &_tmp120_, _tmp121_, _tmp122_); + _tmp111_ = zoom_buffer_get_view_projection_pixbuf (self, &_tmp108_, _tmp109_, _tmp110_); #line 264 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoomed = _tmp123_; + zoomed = _tmp111_; #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp124_ = zoomed; + _tmp112_ = zoomed; #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp125_ = self->priv->backing_photo; + _tmp113_ = self->priv->backing_photo; #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp126_ = photo_get_pixel_transformer (_tmp125_); + _tmp114_ = photo_get_pixel_transformer (_tmp113_); #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp127_ = _tmp126_; + _tmp115_ = _tmp114_; #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp128_ = g_cancellable_new (); + _tmp116_ = g_cancellable_new (); #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp129_ = _tmp128_; + _tmp117_ = _tmp116_; #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp130_ = zoom_buffer_transformation_job_new (self, _tmp124_, _tmp127_, _zoom_buffer_on_demand_transform_complete_completion_callback, self, _tmp129_); + _tmp118_ = zoom_buffer_transformation_job_new (self, _tmp112_, _tmp115_, _zoom_buffer_on_demand_transform_complete_completion_callback, self, _tmp117_); #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala" _background_job_unref0 (self->priv->demand_transform_job); #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->demand_transform_job = _tmp130_; + self->priv->demand_transform_job = _tmp118_; #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp129_); + _g_object_unref0 (_tmp117_); #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _pixel_transformer_unref0 (_tmp127_); + _pixel_transformer_unref0 (_tmp115_); #line 271 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp131_ = *zoom_state; + _tmp119_ = *zoom_state; #line 271 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->demand_transform_zoom_state = _tmp131_; + self->priv->demand_transform_zoom_state = _tmp119_; #line 273 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp132_ = self->priv->workers; + _tmp120_ = self->priv->workers; #line 273 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp133_ = self->priv->demand_transform_job; + _tmp121_ = self->priv->demand_transform_job; #line 273 "/home/jens/Source/shotwell/src/PhotoPage.vala" - workers_enqueue (_tmp132_, G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, TYPE_BACKGROUND_JOB, BackgroundJob)); + workers_enqueue (_tmp120_, G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 275 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp134_ = *zoom_state; + _tmp122_ = *zoom_state; #line 275 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp135_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp134_); + _tmp123_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp122_); #line 275 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp135_; + result = _tmp123_; #line 275 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (zoomed); #line 275 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3529 "PhotoPage.c" +#line 4227 "PhotoPage.c" } #line 283 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_critical ("PhotoPage.vala:283: %s", "ZoomBuffer: get_zoomed_image( ): in SOURCE-NOT-TRANSFORMED but can't t" \ "ransform " "on-screen projection on-demand; using preview image"); #line 285 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp136_ = *zoom_state; + _tmp124_ = *zoom_state; #line 285 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp137_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp136_); + _tmp125_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp124_); #line 285 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp137_; + result = _tmp125_; #line 285 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3541 "PhotoPage.c" +#line 4239 "PhotoPage.c" } -static void _zoom_buffer_on_iso_source_fetch_complete_completion_callback (BackgroundJob* job, gpointer self) { +static void +_zoom_buffer_on_iso_source_fetch_complete_completion_callback (BackgroundJob* job, + gpointer self) +{ #line 290 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_buffer_on_iso_source_fetch_complete ((ZoomBuffer*) self, job); -#line 3548 "PhotoPage.c" +#line 4249 "PhotoPage.c" } -GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomState* zoom_state) { +GdkPixbuf* +zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, + ZoomState* zoom_state) +{ GdkPixbuf* result = NULL; ZoomBufferObjectState _tmp0_; GdkRectangle view_rect = {0}; @@ -3560,27 +4264,25 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt GdkRectangle _tmp7_ = {0}; GdkRectangle _tmp8_; gint _tmp9_; - gint _tmp10_; - GdkRectangle _tmp11_; - gint _tmp12_; - gint _tmp13_; + GdkRectangle _tmp10_; + gint _tmp11_; GdkPixbuf* proj_subpixbuf = NULL; - GdkPixbuf* _tmp14_; + GdkPixbuf* _tmp12_; + GdkRectangle _tmp13_; + gint _tmp14_; GdkRectangle _tmp15_; gint _tmp16_; GdkRectangle _tmp17_; gint _tmp18_; GdkRectangle _tmp19_; gint _tmp20_; - GdkRectangle _tmp21_; - gint _tmp22_; - GdkPixbuf* _tmp23_; + GdkPixbuf* _tmp21_; GdkPixbuf* zoomed = NULL; + GdkRectangle _tmp22_; + gint _tmp23_; GdkRectangle _tmp24_; gint _tmp25_; - GdkRectangle _tmp26_; - gint _tmp27_; - GdkPixbuf* _tmp28_; + GdkPixbuf* _tmp26_; #line 288 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_ZOOM_BUFFER (self), NULL); #line 288 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3589,7 +4291,7 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt _tmp0_ = self->priv->object_state; #line 289 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ == ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_LOADED) { -#line 3591 "PhotoPage.c" +#line 4293 "PhotoPage.c" BackgroundJob* iso_source_fetch_job = NULL; Photo* _tmp1_; ZoomBufferIsoSourceFetchJob* _tmp2_; @@ -3611,7 +4313,7 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt self->priv->object_state = ZOOM_BUFFER_OBJECT_STATE_SOURCE_LOAD_IN_PROGRESS; #line 289 "/home/jens/Source/shotwell/src/PhotoPage.vala" _background_job_unref0 (iso_source_fetch_job); -#line 3613 "PhotoPage.c" +#line 4315 "PhotoPage.c" } #line 296 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp5_); @@ -3628,62 +4330,60 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt #line 300 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp9_ = _tmp8_.width; #line 300 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = CLAMP (_tmp9_, 1, G_MAXINT); -#line 300 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view_rect_proj.width = _tmp10_; -#line 301 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = view_rect_proj; + view_rect_proj.width = CLAMP (_tmp9_, 1, G_MAXINT); #line 301 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _tmp11_.height; + _tmp10_ = view_rect_proj; #line 301 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = CLAMP (_tmp12_, 1, G_MAXINT); + _tmp11_ = _tmp10_.height; #line 301 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view_rect_proj.height = _tmp13_; + view_rect_proj.height = CLAMP (_tmp11_, 1, G_MAXINT); +#line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp12_ = self->priv->preview_image; +#line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp13_ = view_rect_proj; #line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = self->priv->preview_image; + _tmp14_ = _tmp13_.x; #line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp15_ = view_rect_proj; #line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = _tmp15_.x; + _tmp16_ = _tmp15_.y; #line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp17_ = view_rect_proj; #line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = _tmp17_.y; + _tmp18_ = _tmp17_.width; #line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = view_rect_proj; #line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = _tmp19_.width; + _tmp20_ = _tmp19_.height; #line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = view_rect_proj; + _tmp21_ = gdk_pixbuf_new_subpixbuf (_tmp12_, _tmp14_, _tmp16_, _tmp18_, _tmp20_); #line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = _tmp21_.height; -#line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = gdk_pixbuf_new_subpixbuf (_tmp14_, _tmp16_, _tmp18_, _tmp20_, _tmp22_); -#line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala" - proj_subpixbuf = _tmp23_; + proj_subpixbuf = _tmp21_; #line 306 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = view_rect; + _tmp22_ = view_rect; #line 306 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = _tmp24_.width; + _tmp23_ = _tmp22_.width; #line 306 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp26_ = view_rect; + _tmp24_ = view_rect; #line 306 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = _tmp26_.height; + _tmp25_ = _tmp24_.height; #line 306 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = gdk_pixbuf_scale_simple (proj_subpixbuf, _tmp25_, _tmp27_, GDK_INTERP_BILINEAR); + _tmp26_ = gdk_pixbuf_scale_simple (proj_subpixbuf, _tmp23_, _tmp25_, GDK_INTERP_BILINEAR); #line 306 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoomed = _tmp28_; + zoomed = _tmp26_; #line 309 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = zoomed; #line 309 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (proj_subpixbuf); #line 309 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3681 "PhotoPage.c" +#line 4379 "PhotoPage.c" } -Photo* zoom_buffer_get_backing_photo (ZoomBuffer* self) { +Photo* +zoom_buffer_get_backing_photo (ZoomBuffer* self) +{ Photo* result = NULL; Photo* _tmp0_; Photo* _tmp1_; @@ -3697,31 +4397,33 @@ Photo* zoom_buffer_get_backing_photo (ZoomBuffer* self) { result = _tmp1_; #line 313 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3699 "PhotoPage.c" +#line 4399 "PhotoPage.c" } -void zoom_buffer_update_preview_image (ZoomBuffer* self, GdkPixbuf* preview_image) { +void +zoom_buffer_update_preview_image (ZoomBuffer* self, + GdkPixbuf* preview_image) +{ GdkPixbuf* _tmp0_; - GdkPixbuf* _tmp1_; #line 316 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_ZOOM_BUFFER (self)); #line 316 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (GDK_IS_PIXBUF (preview_image)); #line 317 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = preview_image; -#line 317 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (preview_image); #line 317 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->preview_image); #line 317 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->preview_image = _tmp1_; -#line 3718 "PhotoPage.c" + self->priv->preview_image = _tmp0_; +#line 4418 "PhotoPage.c" } -void zoom_buffer_flush_demand_cache (ZoomBuffer* self, ZoomState* initial_zoom_state) { - ZoomState* _tmp0_; +void +zoom_buffer_flush_demand_cache (ZoomBuffer* self, + ZoomState* initial_zoom_state) +{ #line 322 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_ZOOM_BUFFER (self)); #line 323 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3729,33 +4431,30 @@ void zoom_buffer_flush_demand_cache (ZoomBuffer* self, ZoomState* initial_zoom_s #line 323 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->demand_transform_cached_pixbuf = NULL; #line 324 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = initial_zoom_state; -#line 324 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp0_ != NULL) { -#line 3734 "PhotoPage.c" - ZoomState* _tmp1_; - ZoomState _tmp2_; - GdkPixbuf* _tmp3_; - GdkPixbuf* _tmp4_; -#line 325 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = initial_zoom_state; + if (initial_zoom_state != NULL) { +#line 4434 "PhotoPage.c" + ZoomState _tmp0_; + GdkPixbuf* _tmp1_; + GdkPixbuf* _tmp2_; #line 325 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = *_tmp1_; + _tmp0_ = *initial_zoom_state; #line 325 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = zoom_buffer_get_zoomed_image (self, &_tmp2_); + _tmp1_ = zoom_buffer_get_zoomed_image (self, &_tmp0_); #line 325 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 325 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp4_); -#line 3749 "PhotoPage.c" + _g_object_unref0 (_tmp2_); +#line 4446 "PhotoPage.c" } } -GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state) { +GdkPixbuf* +zoom_buffer_get_zoomed_image (ZoomBuffer* self, + ZoomState* zoom_state) +{ GdkPixbuf* result = NULL; - gdouble _tmp0_; - ZoomBufferObjectState _tmp3_; + ZoomBufferObjectState _tmp2_; #line 328 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_ZOOM_BUFFER (self), NULL); #line 328 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3763,104 +4462,105 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state #line 329 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->is_interactive_redraw_in_progress = FALSE; #line 333 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = zoom_state_get_interpolation_factor (zoom_state); -#line 333 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp0_ == 0.0) { -#line 3768 "PhotoPage.c" - ZoomState _tmp1_; - GdkPixbuf* _tmp2_; + if (zoom_state_get_interpolation_factor (zoom_state) == 0.0) { +#line 4465 "PhotoPage.c" + ZoomState _tmp0_; + GdkPixbuf* _tmp1_; #line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = *zoom_state; + _tmp0_ = *zoom_state; #line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp1_); + _tmp1_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp0_); #line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp2_; + result = _tmp1_; #line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3779 "PhotoPage.c" +#line 4476 "PhotoPage.c" } #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = self->priv->object_state; + _tmp2_ = self->priv->object_state; #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala" - switch (_tmp3_) { + switch (_tmp2_) { #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala" case ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_LOADED: #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala" case ZOOM_BUFFER_OBJECT_STATE_SOURCE_LOAD_IN_PROGRESS: -#line 3789 "PhotoPage.c" +#line 4486 "PhotoPage.c" { - ZoomState _tmp4_; - GdkPixbuf* _tmp5_; + ZoomState _tmp3_; + GdkPixbuf* _tmp4_; #line 340 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = *zoom_state; + _tmp3_ = *zoom_state; #line 340 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp4_); + _tmp4_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp3_); #line 340 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp5_; + result = _tmp4_; #line 340 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3801 "PhotoPage.c" +#line 4498 "PhotoPage.c" } #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala" case ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED: -#line 3805 "PhotoPage.c" +#line 4502 "PhotoPage.c" { - ZoomState _tmp6_; - GdkPixbuf* _tmp7_; + ZoomState _tmp5_; + GdkPixbuf* _tmp6_; #line 343 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = *zoom_state; + _tmp5_ = *zoom_state; #line 343 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = zoom_buffer_get_zoomed_image_source_not_transformed (self, &_tmp6_); + _tmp6_ = zoom_buffer_get_zoomed_image_source_not_transformed (self, &_tmp5_); #line 343 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp7_; + result = _tmp6_; #line 343 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3817 "PhotoPage.c" +#line 4514 "PhotoPage.c" } #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala" case ZOOM_BUFFER_OBJECT_STATE_TRANSFORMED_READY: -#line 3821 "PhotoPage.c" +#line 4518 "PhotoPage.c" { - ZoomState _tmp8_; + ZoomState _tmp7_; + GdkPixbuf* _tmp8_; GdkPixbuf* _tmp9_; GdkPixbuf* _tmp10_; - GdkPixbuf* _tmp11_; #line 348 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = *zoom_state; + _tmp7_ = *zoom_state; #line 348 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = self->priv->iso_transformed_image; + _tmp8_ = self->priv->iso_transformed_image; #line 348 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = self->priv->reduced_transformed_image; + _tmp9_ = self->priv->reduced_transformed_image; #line 348 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = zoom_buffer_get_view_projection_pixbuf (self, &_tmp8_, _tmp9_, _tmp10_); + _tmp10_ = zoom_buffer_get_view_projection_pixbuf (self, &_tmp7_, _tmp8_, _tmp9_); #line 348 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp11_; + result = _tmp10_; #line 348 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3839 "PhotoPage.c" +#line 4536 "PhotoPage.c" } default: { - ZoomState _tmp12_; - GdkPixbuf* _tmp13_; + ZoomState _tmp11_; + GdkPixbuf* _tmp12_; #line 352 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_critical ("PhotoPage.vala:352: ZoomBuffer: get_zoomed_image( ): object is an inco" \ "nsistent state"); #line 353 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = *zoom_state; + _tmp11_ = *zoom_state; #line 353 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp12_); + _tmp12_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp11_); #line 353 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp13_; + result = _tmp12_; #line 353 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3855 "PhotoPage.c" +#line 4552 "PhotoPage.c" } } } -GdkPixbuf* zoom_buffer_get_zoom_preview_image (ZoomBuffer* self, ZoomState* zoom_state) { +GdkPixbuf* +zoom_buffer_get_zoom_preview_image (ZoomBuffer* self, + ZoomState* zoom_state) +{ GdkPixbuf* result = NULL; ZoomState _tmp0_; GdkPixbuf* _tmp1_; @@ -3878,56 +4578,57 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image (ZoomBuffer* self, ZoomState* zoom result = _tmp1_; #line 360 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 3879 "PhotoPage.c" +#line 4579 "PhotoPage.c" } -static ZoomBufferIsoSourceFetchJob* zoom_buffer_iso_source_fetch_job_construct (GType object_type, ZoomBuffer* owner, Photo* to_fetch, CompletionCallback completion_callback, void* completion_callback_target) { +static ZoomBufferIsoSourceFetchJob* +zoom_buffer_iso_source_fetch_job_construct (GType object_type, + ZoomBuffer* owner, + Photo* to_fetch, + CompletionCallback completion_callback, + void* completion_callback_target) +{ ZoomBufferIsoSourceFetchJob* self = NULL; - ZoomBuffer* _tmp0_; - CompletionCallback _tmp1_; - void* _tmp1__target; - Photo* _tmp2_; - Photo* _tmp3_; + Photo* _tmp0_; #line 20 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_ZOOM_BUFFER (owner), NULL); #line 20 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_PHOTO (to_fetch), NULL); #line 22 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = owner; -#line 22 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = completion_callback; -#line 22 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1__target = completion_callback_target; -#line 22 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self = (ZoomBufferIsoSourceFetchJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _tmp1_, _tmp1__target, NULL, NULL, NULL, NULL); -#line 24 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = to_fetch; + self = (ZoomBufferIsoSourceFetchJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), completion_callback, completion_callback_target, NULL, NULL, NULL, NULL); #line 24 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp0_ = _g_object_ref0 (to_fetch); #line 24 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->to_fetch); #line 24 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->to_fetch = _tmp3_; + self->priv->to_fetch = _tmp0_; #line 20 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self; -#line 3912 "PhotoPage.c" +#line 4606 "PhotoPage.c" } -static ZoomBufferIsoSourceFetchJob* zoom_buffer_iso_source_fetch_job_new (ZoomBuffer* owner, Photo* to_fetch, CompletionCallback completion_callback, void* completion_callback_target) { +static ZoomBufferIsoSourceFetchJob* +zoom_buffer_iso_source_fetch_job_new (ZoomBuffer* owner, + Photo* to_fetch, + CompletionCallback completion_callback, + void* completion_callback_target) +{ #line 20 "/home/jens/Source/shotwell/src/PhotoPage.vala" return zoom_buffer_iso_source_fetch_job_construct (ZOOM_BUFFER_TYPE_ISO_SOURCE_FETCH_JOB, owner, to_fetch, completion_callback, completion_callback_target); -#line 3919 "PhotoPage.c" +#line 4618 "PhotoPage.c" } -static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base) { +static void +zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base) +{ ZoomBufferIsoSourceFetchJob * self; GError * _inner_error_ = NULL; #line 27 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, ZOOM_BUFFER_TYPE_ISO_SOURCE_FETCH_JOB, ZoomBufferIsoSourceFetchJob); -#line 3928 "PhotoPage.c" +#line 4629 "PhotoPage.c" { GdkPixbuf* _tmp0_ = NULL; Photo* _tmp1_; @@ -3944,7 +4645,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base) _tmp0_ = _tmp3_; #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3945 "PhotoPage.c" +#line 4646 "PhotoPage.c" goto __catch255_g_error; } #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3957,7 +4658,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base) self->fetched = _tmp4_; #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp0_); -#line 3958 "PhotoPage.c" +#line 4659 "PhotoPage.c" } goto __finally255; __catch255_g_error: @@ -3972,7 +4673,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base) "m backing photo"); #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (fetch_error); -#line 3972 "PhotoPage.c" +#line 4673 "PhotoPage.c" } __finally255: #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3983,12 +4684,14 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base) g_clear_error (&_inner_error_); #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 3983 "PhotoPage.c" +#line 4684 "PhotoPage.c" } } -static void zoom_buffer_iso_source_fetch_job_class_init (ZoomBufferIsoSourceFetchJobClass * klass) { +static void +zoom_buffer_iso_source_fetch_job_class_init (ZoomBufferIsoSourceFetchJobClass * klass) +{ #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_buffer_iso_source_fetch_job_parent_class = g_type_class_peek_parent (klass); #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -3997,20 +4700,24 @@ static void zoom_buffer_iso_source_fetch_job_class_init (ZoomBufferIsoSourceFetc g_type_class_add_private (klass, sizeof (ZoomBufferIsoSourceFetchJobPrivate)); #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) zoom_buffer_iso_source_fetch_job_real_execute; -#line 3997 "PhotoPage.c" +#line 4700 "PhotoPage.c" } -static void zoom_buffer_iso_source_fetch_job_instance_init (ZoomBufferIsoSourceFetchJob * self) { +static void +zoom_buffer_iso_source_fetch_job_instance_init (ZoomBufferIsoSourceFetchJob * self) +{ #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv = ZOOM_BUFFER_ISO_SOURCE_FETCH_JOB_GET_PRIVATE (self); #line 18 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->fetched = NULL; -#line 4006 "PhotoPage.c" +#line 4711 "PhotoPage.c" } -static void zoom_buffer_iso_source_fetch_job_finalize (BackgroundJob * obj) { +static void +zoom_buffer_iso_source_fetch_job_finalize (BackgroundJob * obj) +{ ZoomBufferIsoSourceFetchJob * self; #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, ZOOM_BUFFER_TYPE_ISO_SOURCE_FETCH_JOB, ZoomBufferIsoSourceFetchJob); @@ -4020,11 +4727,13 @@ static void zoom_buffer_iso_source_fetch_job_finalize (BackgroundJob * obj) { _g_object_unref0 (self->fetched); #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala" BACKGROUND_JOB_CLASS (zoom_buffer_iso_source_fetch_job_parent_class)->finalize (obj); -#line 4020 "PhotoPage.c" +#line 4727 "PhotoPage.c" } -static GType zoom_buffer_iso_source_fetch_job_get_type (void) { +static GType +zoom_buffer_iso_source_fetch_job_get_type (void) +{ static volatile gsize zoom_buffer_iso_source_fetch_job_type_id__volatile = 0; if (g_once_init_enter (&zoom_buffer_iso_source_fetch_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ZoomBufferIsoSourceFetchJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) zoom_buffer_iso_source_fetch_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ZoomBufferIsoSourceFetchJob), 0, (GInstanceInitFunc) zoom_buffer_iso_source_fetch_job_instance_init, NULL }; @@ -4036,27 +4745,29 @@ static GType zoom_buffer_iso_source_fetch_job_get_type (void) { } -static gpointer _pixel_transformer_ref0 (gpointer self) { +static gpointer +_pixel_transformer_ref0 (gpointer self) +{ #line 55 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self ? pixel_transformer_ref (self) : NULL; -#line 4039 "PhotoPage.c" +#line 4750 "PhotoPage.c" } -static ZoomBufferTransformationJob* zoom_buffer_transformation_job_construct (GType object_type, ZoomBuffer* owner, GdkPixbuf* to_transform, PixelTransformer* transformer, CompletionCallback completion_callback, void* completion_callback_target, GCancellable* cancellable) { +static ZoomBufferTransformationJob* +zoom_buffer_transformation_job_construct (GType object_type, + ZoomBuffer* owner, + GdkPixbuf* to_transform, + PixelTransformer* transformer, + CompletionCallback completion_callback, + void* completion_callback_target, + GCancellable* cancellable) +{ ZoomBufferTransformationJob* self = NULL; - ZoomBuffer* _tmp0_; - CompletionCallback _tmp1_; - void* _tmp1__target; - GCancellable* _tmp2_; - GCancellable* _tmp3_; - GCancellable* _tmp4_; - GdkPixbuf* _tmp5_; - GdkPixbuf* _tmp6_; - PixelTransformer* _tmp7_; - PixelTransformer* _tmp8_; - GdkPixbuf* _tmp9_; - GdkPixbuf* _tmp10_; + GCancellable* _tmp0_; + GdkPixbuf* _tmp1_; + PixelTransformer* _tmp2_; + GdkPixbuf* _tmp3_; #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_ZOOM_BUFFER (owner), NULL); #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -4066,61 +4777,54 @@ static ZoomBufferTransformationJob* zoom_buffer_transformation_job_construct (GT #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL); #line 51 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = owner; -#line 51 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = completion_callback; -#line 51 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1__target = completion_callback_target; -#line 51 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = cancellable; -#line 51 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self = (ZoomBufferTransformationJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _tmp1_, _tmp1__target, _tmp2_, NULL, NULL, NULL); -#line 53 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = cancellable; + self = (ZoomBufferTransformationJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), completion_callback, completion_callback_target, cancellable, NULL, NULL, NULL); #line 53 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp0_ = _g_object_ref0 (cancellable); #line 53 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->cancellable); #line 53 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->cancellable = _tmp4_; + self->priv->cancellable = _tmp0_; #line 54 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = to_transform; -#line 54 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp1_ = _g_object_ref0 (to_transform); #line 54 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->to_transform); #line 54 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->to_transform = _tmp6_; -#line 55 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = transformer; + self->priv->to_transform = _tmp1_; #line 55 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _pixel_transformer_ref0 (_tmp7_); + _tmp2_ = _pixel_transformer_ref0 (transformer); #line 55 "/home/jens/Source/shotwell/src/PhotoPage.vala" _pixel_transformer_unref0 (self->priv->transformer); #line 55 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->transformer = _tmp8_; + self->priv->transformer = _tmp2_; #line 56 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = to_transform; -#line 56 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = gdk_pixbuf_copy (_tmp9_); + _tmp3_ = gdk_pixbuf_copy (to_transform); #line 56 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->transformed); #line 56 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->transformed = _tmp10_; + self->transformed = _tmp3_; #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self; -#line 4109 "PhotoPage.c" +#line 4804 "PhotoPage.c" } -static ZoomBufferTransformationJob* zoom_buffer_transformation_job_new (ZoomBuffer* owner, GdkPixbuf* to_transform, PixelTransformer* transformer, CompletionCallback completion_callback, void* completion_callback_target, GCancellable* cancellable) { +static ZoomBufferTransformationJob* +zoom_buffer_transformation_job_new (ZoomBuffer* owner, + GdkPixbuf* to_transform, + PixelTransformer* transformer, + CompletionCallback completion_callback, + void* completion_callback_target, + GCancellable* cancellable) +{ #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala" return zoom_buffer_transformation_job_construct (ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, owner, to_transform, transformer, completion_callback, completion_callback_target, cancellable); -#line 4116 "PhotoPage.c" +#line 4818 "PhotoPage.c" } -static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base) { +static void +zoom_buffer_transformation_job_real_execute (BackgroundJob* base) +{ ZoomBufferTransformationJob * self; PixelTransformer* _tmp0_; #line 59 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -4129,7 +4833,7 @@ static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base) { _tmp0_ = self->priv->transformer; #line 60 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 4129 "PhotoPage.c" +#line 4833 "PhotoPage.c" PixelTransformer* _tmp1_; GdkPixbuf* _tmp2_; GdkPixbuf* _tmp3_; @@ -4144,12 +4848,14 @@ static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base) { _tmp4_ = self->priv->cancellable; #line 61 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixel_transformer_transform_to_other_pixbuf (_tmp1_, _tmp2_, _tmp3_, _tmp4_, -1); -#line 4144 "PhotoPage.c" +#line 4848 "PhotoPage.c" } } -static void zoom_buffer_transformation_job_class_init (ZoomBufferTransformationJobClass * klass) { +static void +zoom_buffer_transformation_job_class_init (ZoomBufferTransformationJobClass * klass) +{ #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_buffer_transformation_job_parent_class = g_type_class_peek_parent (klass); #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -4158,20 +4864,24 @@ static void zoom_buffer_transformation_job_class_init (ZoomBufferTransformationJ g_type_class_add_private (klass, sizeof (ZoomBufferTransformationJobPrivate)); #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) zoom_buffer_transformation_job_real_execute; -#line 4158 "PhotoPage.c" +#line 4864 "PhotoPage.c" } -static void zoom_buffer_transformation_job_instance_init (ZoomBufferTransformationJob * self) { +static void +zoom_buffer_transformation_job_instance_init (ZoomBufferTransformationJob * self) +{ #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv = ZOOM_BUFFER_TRANSFORMATION_JOB_GET_PRIVATE (self); #line 47 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->transformed = NULL; -#line 4167 "PhotoPage.c" +#line 4875 "PhotoPage.c" } -static void zoom_buffer_transformation_job_finalize (BackgroundJob * obj) { +static void +zoom_buffer_transformation_job_finalize (BackgroundJob * obj) +{ ZoomBufferTransformationJob * self; #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, ZoomBufferTransformationJob); @@ -4185,11 +4895,13 @@ static void zoom_buffer_transformation_job_finalize (BackgroundJob * obj) { _g_object_unref0 (self->transformed); #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala" BACKGROUND_JOB_CLASS (zoom_buffer_transformation_job_parent_class)->finalize (obj); -#line 4185 "PhotoPage.c" +#line 4895 "PhotoPage.c" } -static GType zoom_buffer_transformation_job_get_type (void) { +static GType +zoom_buffer_transformation_job_get_type (void) +{ static volatile gsize zoom_buffer_transformation_job_type_id__volatile = 0; if (g_once_init_enter (&zoom_buffer_transformation_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ZoomBufferTransformationJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) zoom_buffer_transformation_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ZoomBufferTransformationJob), 0, (GInstanceInitFunc) zoom_buffer_transformation_job_instance_init, NULL }; @@ -4201,18 +4913,22 @@ static GType zoom_buffer_transformation_job_get_type (void) { } -static void zoom_buffer_class_init (ZoomBufferClass * klass) { +static void +zoom_buffer_class_init (ZoomBufferClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/PhotoPage.vala" zoom_buffer_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_type_class_add_private (klass, sizeof (ZoomBufferPrivate)); #line 7 "/home/jens/Source/shotwell/src/PhotoPage.vala" G_OBJECT_CLASS (klass)->finalize = zoom_buffer_finalize; -#line 4208 "PhotoPage.c" +#line 4922 "PhotoPage.c" } -static void zoom_buffer_instance_init (ZoomBuffer * self) { +static void +zoom_buffer_instance_init (ZoomBuffer * self) +{ #line 7 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv = ZOOM_BUFFER_GET_PRIVATE (self); #line 69 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -4237,11 +4953,13 @@ static void zoom_buffer_instance_init (ZoomBuffer * self) { self->priv->workers = NULL; #line 82 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->is_interactive_redraw_in_progress = FALSE; -#line 4237 "PhotoPage.c" +#line 4953 "PhotoPage.c" } -static void zoom_buffer_finalize (GObject * obj) { +static void +zoom_buffer_finalize (GObject * obj) +{ ZoomBuffer * self; #line 7 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ZOOM_BUFFER, ZoomBuffer); @@ -4267,11 +4985,13 @@ static void zoom_buffer_finalize (GObject * obj) { _g_object_unref0 (self->priv->parent_page); #line 7 "/home/jens/Source/shotwell/src/PhotoPage.vala" G_OBJECT_CLASS (zoom_buffer_parent_class)->finalize (obj); -#line 4267 "PhotoPage.c" +#line 4985 "PhotoPage.c" } -GType zoom_buffer_get_type (void) { +GType +zoom_buffer_get_type (void) +{ static volatile gsize zoom_buffer_type_id__volatile = 0; if (g_once_init_enter (&zoom_buffer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ZoomBufferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) zoom_buffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ZoomBuffer), 0, (GInstanceInitFunc) zoom_buffer_instance_init, NULL }; @@ -4283,172 +5003,241 @@ GType zoom_buffer_get_type (void) { } -static void _editing_host_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_editing_host_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_photos_altered ((EditingHostPage*) self, items); -#line 4286 "PhotoPage.c" +#line 5010 "PhotoPage.c" } -static void _editing_host_page_on_view_contents_ordering_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { +static void +_editing_host_page_on_view_contents_ordering_altered_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self) +{ #line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self); -#line 4293 "PhotoPage.c" +#line 5022 "PhotoPage.c" } -static void _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed (DataCollection* _sender, gpointer self) { +static void +_editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed (DataCollection* _sender, + gpointer self) +{ #line 554 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self); -#line 4300 "PhotoPage.c" +#line 5032 "PhotoPage.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 420 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self ? data_collection_ref (self) : NULL; -#line 4307 "PhotoPage.c" +#line 5041 "PhotoPage.c" } -static void _editing_host_page_on_viewport_resized_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) { +static void +_editing_host_page_on_viewport_resized_gtk_widget_size_allocate (GtkWidget* _sender, + GtkAllocation* allocation, + gpointer self) +{ #line 431 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_viewport_resized ((EditingHostPage*) self); -#line 4314 "PhotoPage.c" +#line 5052 "PhotoPage.c" } -static void _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { +static void +_editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked (GtkToolButton* _sender, + gpointer self) +{ #line 440 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_rotate_clockwise ((EditingHostPage*) self); -#line 4321 "PhotoPage.c" +#line 5062 "PhotoPage.c" } -static void _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) { +static void +_editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, + gpointer self) +{ #line 452 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_crop_toggled ((EditingHostPage*) self); -#line 4328 "PhotoPage.c" +#line 5072 "PhotoPage.c" } -static void _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) { +static void +_editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, + gpointer self) +{ #line 461 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_straighten_toggled ((EditingHostPage*) self); -#line 4335 "PhotoPage.c" +#line 5082 "PhotoPage.c" } -static void _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) { +static void +_editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, + gpointer self) +{ #line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_redeye_toggled ((EditingHostPage*) self); -#line 4342 "PhotoPage.c" +#line 5092 "PhotoPage.c" } -static void _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) { +static void +_editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, + gpointer self) +{ #line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_adjust_toggled ((EditingHostPage*) self); -#line 4349 "PhotoPage.c" +#line 5102 "PhotoPage.c" } -static void _editing_host_page_on_enhance_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { +static void +_editing_host_page_on_enhance_gtk_tool_button_clicked (GtkToolButton* _sender, + gpointer self) +{ #line 487 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_enhance ((EditingHostPage*) self); -#line 4356 "PhotoPage.c" +#line 5112 "PhotoPage.c" } -static gboolean _editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { +static gboolean +_editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self) +{ gboolean result; result = editing_host_page_on_zoom_out_pressed ((EditingHostPage*) self, event); #line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 4365 "PhotoPage.c" +#line 5125 "PhotoPage.c" } -static void _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) { +static void +_editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed (GtkRange* _sender, + gpointer self) +{ #line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_zoom_slider_value_changed ((EditingHostPage*) self); -#line 4372 "PhotoPage.c" +#line 5135 "PhotoPage.c" } -static gboolean _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { +static gboolean +_editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self) +{ gboolean result; result = editing_host_page_on_zoom_slider_drag_begin ((EditingHostPage*) self, event); #line 515 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 4381 "PhotoPage.c" +#line 5148 "PhotoPage.c" } -static gboolean _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { +static gboolean +_editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self) +{ gboolean result; result = editing_host_page_on_zoom_slider_drag_end ((EditingHostPage*) self, event); #line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 4390 "PhotoPage.c" +#line 5161 "PhotoPage.c" } -static gboolean _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) { +static gboolean +_editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event (GtkWidget* _sender, + GdkEventKey* event, + gpointer self) +{ gboolean result; result = editing_host_page_on_zoom_slider_key_press ((EditingHostPage*) self, event); #line 517 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 4399 "PhotoPage.c" +#line 5174 "PhotoPage.c" } -static gboolean _editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { +static gboolean +_editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self) +{ gboolean result; result = editing_host_page_on_zoom_in_pressed ((EditingHostPage*) self, event); #line 528 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 4408 "PhotoPage.c" +#line 5187 "PhotoPage.c" } -static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { +static void +_single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, + gpointer self) +{ #line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_on_previous_photo ((SinglePhotoPage*) self); -#line 4415 "PhotoPage.c" +#line 5197 "PhotoPage.c" } -static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { +static void +_single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, + gpointer self) +{ #line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_on_next_photo ((SinglePhotoPage*) self); -#line 4422 "PhotoPage.c" +#line 5207 "PhotoPage.c" } -EditingHostPage* editing_host_page_construct (GType object_type, SourceCollection* sources, const gchar* name) { +EditingHostPage* +editing_host_page_construct (GType object_type, + SourceCollection* sources, + const gchar* name) +{ EditingHostPage * self = NULL; - const gchar* _tmp0_; - SourceCollection* _tmp1_; - SourceCollection* _tmp2_; - SourceCollection* _tmp3_; + SourceCollection* _tmp0_; + ViewCollection* _tmp1_; + ViewCollection* _tmp2_; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; - ViewCollection* _tmp6_; - ViewCollection* _tmp7_; - GtkViewport* _tmp8_; + GtkViewport* _tmp5_; GtkToolbar* toolbar = NULL; - GtkToolbar* _tmp9_; + GtkToolbar* _tmp6_; + GtkToolButton* _tmp7_; + GtkToolButton* _tmp8_; + GtkToolButton* _tmp9_; GtkToolButton* _tmp10_; GtkToolButton* _tmp11_; GtkToolButton* _tmp12_; - GtkToolButton* _tmp13_; - GtkToolButton* _tmp14_; - GtkToolButton* _tmp15_; GtkBindingSet* binding_set = NULL; - GtkToolButton* _tmp16_; - GObjectClass* _tmp17_; - GtkBindingSet* _tmp18_; + GtkToolButton* _tmp13_; + GObjectClass* _tmp14_; + GtkBindingSet* _tmp15_; + GtkToggleToolButton* _tmp16_; + GtkToggleToolButton* _tmp17_; + GtkToggleToolButton* _tmp18_; GtkToggleToolButton* _tmp19_; GtkToggleToolButton* _tmp20_; GtkToggleToolButton* _tmp21_; @@ -4474,299 +5263,290 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio GtkToggleToolButton* _tmp41_; GtkToggleToolButton* _tmp42_; GtkToggleToolButton* _tmp43_; - GtkToggleToolButton* _tmp44_; - GtkToggleToolButton* _tmp45_; - GtkToggleToolButton* _tmp46_; + GtkToolButton* _tmp44_; + GtkToolButton* _tmp45_; + GtkToolButton* _tmp46_; GtkToolButton* _tmp47_; GtkToolButton* _tmp48_; GtkToolButton* _tmp49_; - GtkToolButton* _tmp50_; - GtkToolButton* _tmp51_; - GtkToolButton* _tmp52_; GtkSeparatorToolItem* separator = NULL; - GtkSeparatorToolItem* _tmp53_; + GtkSeparatorToolItem* _tmp50_; GtkBox* zoom_group = NULL; - GtkBox* _tmp54_; + GtkBox* _tmp51_; GtkImage* zoom_out = NULL; - GdkPixbuf* _tmp55_; - GdkPixbuf* _tmp56_; - GtkImage* _tmp57_; - GtkImage* _tmp58_; + GdkPixbuf* _tmp52_; + GdkPixbuf* _tmp53_; + GtkImage* _tmp54_; + GtkImage* _tmp55_; GtkEventBox* zoom_out_box = NULL; - GtkEventBox* _tmp59_; - GtkAdjustment* _tmp60_; - GtkAdjustment* _tmp61_; + GtkEventBox* _tmp56_; + GtkAdjustment* _tmp57_; + GtkAdjustment* _tmp58_; + GtkScale* _tmp59_; + GtkScale* _tmp60_; + GtkScale* _tmp61_; GtkScale* _tmp62_; GtkScale* _tmp63_; GtkScale* _tmp64_; GtkScale* _tmp65_; GtkScale* _tmp66_; - GtkScale* _tmp67_; - GtkScale* _tmp68_; - GtkScale* _tmp69_; GtkImage* zoom_in = NULL; - GdkPixbuf* _tmp70_; - GdkPixbuf* _tmp71_; - GtkImage* _tmp72_; - GtkImage* _tmp73_; + GdkPixbuf* _tmp67_; + GdkPixbuf* _tmp68_; + GtkImage* _tmp69_; + GtkImage* _tmp70_; GtkEventBox* zoom_in_box = NULL; - GtkEventBox* _tmp74_; + GtkEventBox* _tmp71_; GtkToolItem* group_wrapper = NULL; - GtkToolItem* _tmp75_; + GtkToolItem* _tmp72_; + GtkToolButton* _tmp73_; + GtkToolButton* _tmp74_; + GtkToolButton* _tmp75_; GtkToolButton* _tmp76_; GtkToolButton* _tmp77_; GtkToolButton* _tmp78_; GtkToolButton* _tmp79_; GtkToolButton* _tmp80_; - GtkToolButton* _tmp81_; - GtkToolButton* _tmp82_; - GtkToolButton* _tmp83_; #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL); #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (name != NULL, NULL); #line 418 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = name; -#line 418 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self = (EditingHostPage*) single_photo_page_construct (object_type, _tmp0_, FALSE); -#line 420 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = sources; + self = (EditingHostPage*) single_photo_page_construct (object_type, name, FALSE); #line 420 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = _data_collection_ref0 (_tmp1_); + _tmp0_ = _data_collection_ref0 (sources); #line 420 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (self->priv->sources); #line 420 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->sources = _tmp2_; + self->priv->sources = _tmp0_; #line 423 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = sources; -#line 423 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _editing_host_page_on_photos_altered_data_collection_items_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _editing_host_page_on_photos_altered_data_collection_items_altered, self, 0); #line 426 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 426 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 426 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _editing_host_page_on_view_contents_ordering_altered_data_collection_contents_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _editing_host_page_on_view_contents_ordering_altered_data_collection_contents_altered, self, 0); #line 426 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp2_); #line 427 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 427 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 427 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection), "ordering-changed", (GCallback) _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), "ordering-changed", (GCallback) _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed, self, 0); #line 427 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp7_); + _data_collection_unref0 (_tmp4_); #line 431 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->viewport; + _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->viewport; #line 431 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), "size-allocate", (GCallback) _editing_host_page_on_viewport_resized_gtk_widget_size_allocate, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), "size-allocate", (GCallback) _editing_host_page_on_viewport_resized_gtk_widget_size_allocate, self, 0); #line 434 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp6_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 434 "/home/jens/Source/shotwell/src/PhotoPage.vala" - toolbar = _tmp9_; + toolbar = _tmp6_; #line 437 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_ROTATE_CW_LABEL); + _tmp7_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_ROTATE_CW_LABEL); #line 437 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp10_); + g_object_ref_sink (_tmp7_); #line 437 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->rotate_button); #line 437 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->rotate_button = _tmp10_; + self->priv->rotate_button = _tmp7_; #line 438 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = self->priv->rotate_button; + _tmp8_ = self->priv->rotate_button; #line 438 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_button_set_icon_name (_tmp11_, RESOURCES_CLOCKWISE); + gtk_tool_button_set_icon_name (_tmp8_, RESOURCES_CLOCKWISE); #line 439 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = self->priv->rotate_button; + _tmp9_ = self->priv->rotate_button; #line 439 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CW_TOOLTIP); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CW_TOOLTIP); #line 440 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = self->priv->rotate_button; + _tmp10_ = self->priv->rotate_button; #line 440 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp13_, "clicked", (GCallback) _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked, self, 0); + g_signal_connect_object (_tmp10_, "clicked", (GCallback) _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked, self, 0); #line 441 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = self->priv->rotate_button; + _tmp11_ = self->priv->rotate_button; #line 441 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_tool_item_get_type (), GtkToolItem), TRUE); + gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_tool_item_get_type (), GtkToolItem), TRUE); #line 442 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = self->priv->rotate_button; + _tmp12_ = self->priv->rotate_button; #line 442 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_tool_item_get_type (), GtkToolItem), -1); + gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 443 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = self->priv->rotate_button; + _tmp13_ = self->priv->rotate_button; #line 443 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = G_OBJECT_GET_CLASS (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, G_TYPE_OBJECT, GObject)); + _tmp14_ = G_OBJECT_GET_CLASS (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, G_TYPE_OBJECT, GObject)); #line 443 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = gtk_binding_set_by_class (_tmp17_); + _tmp15_ = gtk_binding_set_by_class ((gpointer) _tmp14_); #line 443 "/home/jens/Source/shotwell/src/PhotoPage.vala" - binding_set = _tmp18_; + binding_set = _tmp15_; #line 444 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_binding_entry_add_signal (binding_set, (guint) GDK_KEY_KP_Space, GDK_CONTROL_MASK, "clicked", (guint) 0, NULL); #line 445 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_binding_entry_add_signal (binding_set, (guint) GDK_KEY_space, GDK_CONTROL_MASK, "clicked", (guint) 0, NULL); #line 448 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new (); + _tmp16_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new (); #line 448 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp19_); + g_object_ref_sink (_tmp16_); #line 448 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->crop_button); #line 448 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->crop_button = _tmp19_; + self->priv->crop_button = _tmp16_; #line 449 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = self->priv->crop_button; + _tmp17_ = self->priv->crop_button; #line 449 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_tool_button_get_type (), GtkToolButton), "crop"); + gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_tool_button_get_type (), GtkToolButton), "crop"); #line 450 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = self->priv->crop_button; + _tmp18_ = self->priv->crop_button; #line 450 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_CROP_LABEL); + gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_CROP_LABEL); #line 451 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = self->priv->crop_button; + _tmp19_ = self->priv->crop_button; #line 451 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_CROP_TOOLTIP); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_CROP_TOOLTIP); #line 452 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = self->priv->crop_button; + _tmp20_ = self->priv->crop_button; #line 452 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp23_, "toggled", (GCallback) _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled, self, 0); + g_signal_connect_object (_tmp20_, "toggled", (GCallback) _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled, self, 0); #line 453 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = self->priv->crop_button; + _tmp21_ = self->priv->crop_button; #line 453 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_item_get_type (), GtkToolItem), TRUE); + gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_tool_item_get_type (), GtkToolItem), TRUE); #line 454 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = self->priv->crop_button; + _tmp22_ = self->priv->crop_button; #line 454 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_tool_item_get_type (), GtkToolItem), -1); + gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp26_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new (); + _tmp23_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new (); #line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp26_); + g_object_ref_sink (_tmp23_); #line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->straighten_button); #line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->straighten_button = _tmp26_; + self->priv->straighten_button = _tmp23_; #line 458 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = self->priv->straighten_button; + _tmp24_ = self->priv->straighten_button; #line 458 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_tool_button_get_type (), GtkToolButton), "straighten"); + gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_button_get_type (), GtkToolButton), "straighten"); #line 459 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = self->priv->straighten_button; + _tmp25_ = self->priv->straighten_button; #line 459 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_STRAIGHTEN_LABEL); + gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_STRAIGHTEN_LABEL); #line 460 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = self->priv->straighten_button; + _tmp26_ = self->priv->straighten_button; #line 460 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_STRAIGHTEN_TOOLTIP); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_STRAIGHTEN_TOOLTIP); #line 461 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_ = self->priv->straighten_button; + _tmp27_ = self->priv->straighten_button; #line 461 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp30_, "toggled", (GCallback) _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled, self, 0); + g_signal_connect_object (_tmp27_, "toggled", (GCallback) _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled, self, 0); #line 462 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp31_ = self->priv->straighten_button; + _tmp28_ = self->priv->straighten_button; #line 462 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_item_get_type (), GtkToolItem), TRUE); + gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_tool_item_get_type (), GtkToolItem), TRUE); #line 463 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp32_ = self->priv->straighten_button; + _tmp29_ = self->priv->straighten_button; #line 463 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_tool_item_get_type (), GtkToolItem), -1); + gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 466 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp33_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new (); + _tmp30_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new (); #line 466 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp33_); + g_object_ref_sink (_tmp30_); #line 466 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->redeye_button); #line 466 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->redeye_button = _tmp33_; + self->priv->redeye_button = _tmp30_; #line 467 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp34_ = self->priv->redeye_button; + _tmp31_ = self->priv->redeye_button; #line 467 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_tool_button_get_type (), GtkToolButton), "redeye"); + gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_button_get_type (), GtkToolButton), "redeye"); #line 468 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp35_ = self->priv->redeye_button; + _tmp32_ = self->priv->redeye_button; #line 468 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_RED_EYE_LABEL); + gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_RED_EYE_LABEL); #line 469 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp36_ = self->priv->redeye_button; + _tmp33_ = self->priv->redeye_button; #line 469 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_RED_EYE_TOOLTIP); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_RED_EYE_TOOLTIP); #line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp37_ = self->priv->redeye_button; + _tmp34_ = self->priv->redeye_button; #line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp37_, "toggled", (GCallback) _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled, self, 0); + g_signal_connect_object (_tmp34_, "toggled", (GCallback) _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled, self, 0); #line 471 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp38_ = self->priv->redeye_button; + _tmp35_ = self->priv->redeye_button; #line 471 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_item_get_type (), GtkToolItem), TRUE); + gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_item_get_type (), GtkToolItem), TRUE); #line 472 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp39_ = self->priv->redeye_button; + _tmp36_ = self->priv->redeye_button; #line 472 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tool_item_get_type (), GtkToolItem), -1); + gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 475 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp40_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new (); + _tmp37_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new (); #line 475 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp40_); + g_object_ref_sink (_tmp37_); #line 475 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->adjust_button); #line 475 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->adjust_button = _tmp40_; + self->priv->adjust_button = _tmp37_; #line 476 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp41_ = self->priv->adjust_button; + _tmp38_ = self->priv->adjust_button; #line 476 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST); + gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST); #line 477 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp42_ = self->priv->adjust_button; + _tmp39_ = self->priv->adjust_button; #line 477 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST_LABEL); + gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST_LABEL); #line 478 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp43_ = self->priv->adjust_button; + _tmp40_ = self->priv->adjust_button; #line 478 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ADJUST_TOOLTIP); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ADJUST_TOOLTIP); #line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp44_ = self->priv->adjust_button; + _tmp41_ = self->priv->adjust_button; #line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp44_, "toggled", (GCallback) _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled, self, 0); + g_signal_connect_object (_tmp41_, "toggled", (GCallback) _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled, self, 0); #line 480 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp45_ = self->priv->adjust_button; + _tmp42_ = self->priv->adjust_button; #line 480 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_tool_item_get_type (), GtkToolItem), TRUE); + gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_tool_item_get_type (), GtkToolItem), TRUE); #line 481 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp46_ = self->priv->adjust_button; + _tmp43_ = self->priv->adjust_button; #line 481 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_tool_item_get_type (), GtkToolItem), -1); + gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp47_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_ENHANCE_LABEL); + _tmp44_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_ENHANCE_LABEL); #line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp47_); + g_object_ref_sink (_tmp44_); #line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->enhance_button); #line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->enhance_button = _tmp47_; + self->priv->enhance_button = _tmp44_; #line 485 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp48_ = self->priv->enhance_button; + _tmp45_ = self->priv->enhance_button; #line 485 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_button_set_icon_name (_tmp48_, RESOURCES_ENHANCE); + gtk_tool_button_set_icon_name (_tmp45_, RESOURCES_ENHANCE); #line 486 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp49_ = self->priv->enhance_button; + _tmp46_ = self->priv->enhance_button; #line 486 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ENHANCE_TOOLTIP); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ENHANCE_TOOLTIP); #line 487 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp50_ = self->priv->enhance_button; + _tmp47_ = self->priv->enhance_button; #line 487 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp50_, "clicked", (GCallback) _editing_host_page_on_enhance_gtk_tool_button_clicked, self, 0); + g_signal_connect_object (_tmp47_, "clicked", (GCallback) _editing_host_page_on_enhance_gtk_tool_button_clicked, self, 0); #line 488 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp51_ = self->priv->enhance_button; + _tmp48_ = self->priv->enhance_button; #line 488 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_tool_item_get_type (), GtkToolItem), TRUE); + gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_tool_item_get_type (), GtkToolItem), TRUE); #line 489 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp52_ = self->priv->enhance_button; + _tmp49_ = self->priv->enhance_button; #line 489 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_tool_item_get_type (), GtkToolItem), -1); + gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 492 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp53_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); + _tmp50_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); #line 492 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp53_); + g_object_ref_sink (_tmp50_); #line 492 "/home/jens/Source/shotwell/src/PhotoPage.vala" - separator = _tmp53_; + separator = _tmp50_; #line 493 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (separator, gtk_tool_item_get_type (), GtkToolItem), TRUE); #line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -4774,31 +5554,31 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio #line 495 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (separator, gtk_tool_item_get_type (), GtkToolItem), -1); #line 497 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp54_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + _tmp51_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); #line 497 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp54_); + g_object_ref_sink (_tmp51_); #line 497 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_group = _tmp54_; + zoom_group = _tmp51_; #line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp55_ = resources_load_icon (RESOURCES_ICON_ZOOM_OUT, RESOURCES_ICON_ZOOM_SCALE); + _tmp52_ = resources_load_icon (RESOURCES_ICON_ZOOM_OUT, RESOURCES_ICON_ZOOM_SCALE); #line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp56_ = _tmp55_; + _tmp53_ = _tmp52_; #line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp57_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp56_); + _tmp54_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp53_); #line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp57_); + g_object_ref_sink (_tmp54_); #line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp58_ = _tmp57_; + _tmp55_ = _tmp54_; #line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp56_); + _g_object_unref0 (_tmp53_); #line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_out = _tmp58_; + zoom_out = _tmp55_; #line 501 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp59_ = (GtkEventBox*) gtk_event_box_new (); + _tmp56_ = (GtkEventBox*) gtk_event_box_new (); #line 501 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp59_); + g_object_ref_sink (_tmp56_); #line 501 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_out_box = _tmp59_; + zoom_out_box = _tmp56_; #line 502 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_event_box_set_above_child (zoom_out_box, TRUE); #line 503 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -4810,69 +5590,69 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio #line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (zoom_out_box, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp60_ = gtk_adjustment_new (0.0, 0.0, 1.1, 0.1, 0.1, 0.1); + _tmp57_ = gtk_adjustment_new (0.0, 0.0, 1.1, 0.1, 0.1, 0.1); #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp60_); + g_object_ref_sink (_tmp57_); #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp61_ = _tmp60_; + _tmp58_ = _tmp57_; #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp62_ = (GtkScale*) gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, _tmp61_); + _tmp59_ = (GtkScale*) gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, _tmp58_); #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp62_); + g_object_ref_sink (_tmp59_); #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->zoom_slider); #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->zoom_slider = _tmp62_; + self->priv->zoom_slider = _tmp59_; #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp61_); + _g_object_unref0 (_tmp58_); #line 512 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp63_ = self->priv->zoom_slider; + _tmp60_ = self->priv->zoom_slider; #line 512 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_scale_set_draw_value (_tmp63_, FALSE); + gtk_scale_set_draw_value (_tmp60_, FALSE); #line 513 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp64_ = self->priv->zoom_slider; + _tmp61_ = self->priv->zoom_slider; #line 513 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), 120, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), 120, -1); #line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp65_ = self->priv->zoom_slider; + _tmp62_ = self->priv->zoom_slider; #line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0); #line 515 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp66_ = self->priv->zoom_slider; + _tmp63_ = self->priv->zoom_slider; #line 515 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event, self, 0); #line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp67_ = self->priv->zoom_slider; + _tmp64_ = self->priv->zoom_slider; #line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), "button-release-event", (GCallback) _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), "button-release-event", (GCallback) _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event, self, 0); #line 517 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp68_ = self->priv->zoom_slider; + _tmp65_ = self->priv->zoom_slider; #line 517 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event, self, 0); #line 519 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp69_ = self->priv->zoom_slider; + _tmp66_ = self->priv->zoom_slider; #line 519 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp70_ = resources_load_icon (RESOURCES_ICON_ZOOM_IN, RESOURCES_ICON_ZOOM_SCALE); + _tmp67_ = resources_load_icon (RESOURCES_ICON_ZOOM_IN, RESOURCES_ICON_ZOOM_SCALE); #line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp71_ = _tmp70_; + _tmp68_ = _tmp67_; #line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp72_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp71_); + _tmp69_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp68_); #line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp72_); + g_object_ref_sink (_tmp69_); #line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp73_ = _tmp72_; + _tmp70_ = _tmp69_; #line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp71_); + _g_object_unref0 (_tmp68_); #line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_in = _tmp73_; + zoom_in = _tmp70_; #line 523 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp74_ = (GtkEventBox*) gtk_event_box_new (); + _tmp71_ = (GtkEventBox*) gtk_event_box_new (); #line 523 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp74_); + g_object_ref_sink (_tmp71_); #line 523 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_in_box = _tmp74_; + zoom_in_box = _tmp71_; #line 524 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_event_box_set_above_child (zoom_in_box, TRUE); #line 525 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -4884,47 +5664,47 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio #line 530 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 532 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp75_ = gtk_tool_item_new (); + _tmp72_ = gtk_tool_item_new (); #line 532 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp75_); + g_object_ref_sink (_tmp72_); #line 532 "/home/jens/Source/shotwell/src/PhotoPage.vala" - group_wrapper = _tmp75_; + group_wrapper = _tmp72_; #line 533 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (group_wrapper, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_group, gtk_widget_get_type (), GtkWidget)); #line 535 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toolbar_insert (toolbar, group_wrapper, -1); #line 538 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp76_ = self->priv->prev_button; + _tmp73_ = self->priv->prev_button; #line 538 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_tool_item_get_type (), GtkToolItem), _ ("Previous photo")); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_tool_item_get_type (), GtkToolItem), _ ("Previous photo")); #line 539 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp77_ = self->priv->prev_button; + _tmp74_ = self->priv->prev_button; #line 539 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_button_set_icon_name (_tmp77_, "go-previous"); + gtk_tool_button_set_icon_name (_tmp74_, "go-previous"); #line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp78_ = self->priv->prev_button; + _tmp75_ = self->priv->prev_button; #line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp78_, "clicked", (GCallback) _single_photo_page_on_previous_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0); + g_signal_connect_object (_tmp75_, "clicked", (GCallback) _single_photo_page_on_previous_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0); #line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp79_ = self->priv->prev_button; + _tmp76_ = self->priv->prev_button; #line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_tool_item_get_type (), GtkToolItem), -1); + gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 544 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp80_ = self->priv->next_button; + _tmp77_ = self->priv->next_button; #line 544 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_tool_item_get_type (), GtkToolItem), _ ("Next photo")); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_tool_item_get_type (), GtkToolItem), _ ("Next photo")); #line 545 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp81_ = self->priv->next_button; + _tmp78_ = self->priv->next_button; #line 545 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_tool_button_set_icon_name (_tmp81_, "go-next"); + gtk_tool_button_set_icon_name (_tmp78_, "go-next"); #line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp82_ = self->priv->next_button; + _tmp79_ = self->priv->next_button; #line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp82_, "clicked", (GCallback) _single_photo_page_on_next_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0); + g_signal_connect_object (_tmp79_, "clicked", (GCallback) _single_photo_page_on_next_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0); #line 547 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp83_ = self->priv->next_button; + _tmp80_ = self->priv->next_button; #line 547 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, gtk_tool_item_get_type (), GtkToolItem), -1); + gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (group_wrapper); #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -4943,16 +5723,17 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio _g_object_unref0 (toolbar); #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self; -#line 4943 "PhotoPage.c" +#line 5723 "PhotoPage.c" } -static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* self) { +static void +editing_host_page_on_zoom_slider_value_changed (EditingHostPage* self) +{ ZoomState new_zoom_state = {0}; ZoomState _tmp0_ = {0}; GtkScale* _tmp1_; - gdouble _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; #line 557 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -4960,60 +5741,55 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel #line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->zoom_slider; #line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)); -#line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_state_init_rescale (&new_zoom_state, &_tmp0_, _tmp2_); + zoom_state_init_rescale (&new_zoom_state, &_tmp0_, gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange))); #line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = self->priv->enable_interactive_zoom_refresh; + _tmp2_ = self->priv->enable_interactive_zoom_refresh; #line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp3_) { -#line 4967 "PhotoPage.c" - ZoomState _tmp4_; - gboolean _tmp5_; + if (_tmp2_) { +#line 5746 "PhotoPage.c" + ZoomState _tmp3_; #line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = new_zoom_state; + _tmp3_ = new_zoom_state; #line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_on_interactive_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp4_); -#line 563 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = zoom_state_is_default (&new_zoom_state); + single_photo_page_on_interactive_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp3_); #line 563 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp5_) { -#line 4978 "PhotoPage.c" - ZoomState _tmp6_; + if (zoom_state_is_default (&new_zoom_state)) { +#line 5754 "PhotoPage.c" + ZoomState _tmp4_; #line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = new_zoom_state; + _tmp4_ = new_zoom_state; #line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp6_); -#line 4984 "PhotoPage.c" + single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp4_); +#line 5760 "PhotoPage.c" } } else { - gboolean _tmp7_; -#line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = zoom_state_is_default (&new_zoom_state); #line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp7_) { + if (zoom_state_is_default (&new_zoom_state)) { #line 567 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 4994 "PhotoPage.c" +#line 5767 "PhotoPage.c" } else { - ZoomState _tmp8_; + ZoomState _tmp5_; #line 569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = new_zoom_state; + _tmp5_ = new_zoom_state; #line 569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_); -#line 5001 "PhotoPage.c" + single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_); +#line 5774 "PhotoPage.c" } #line 571 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); -#line 5005 "PhotoPage.c" +#line 5778 "PhotoPage.c" } #line 574 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_cursor_for_zoom_context (self); -#line 5009 "PhotoPage.c" +#line 5782 "PhotoPage.c" } -static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* self, GdkEventButton* event) { +static gboolean +editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* self, + GdkEventButton* event) +{ gboolean result = FALSE; GtkWindow* _tmp0_; GtkWindow* _tmp1_; @@ -5034,7 +5810,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se _g_object_unref0 (_tmp1_); #line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 5034 "PhotoPage.c" +#line 5810 "PhotoPage.c" GtkWindow* _tmp3_; FullscreenWindow* _tmp4_; #line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5045,17 +5821,20 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se fullscreen_window_disable_toolbar_dismissal (_tmp4_); #line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 5045 "PhotoPage.c" +#line 5821 "PhotoPage.c" } #line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; #line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5051 "PhotoPage.c" +#line 5827 "PhotoPage.c" } -static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self, GdkEventButton* event) { +static gboolean +editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self, + GdkEventButton* event) +{ gboolean result = FALSE; GtkWindow* _tmp0_; GtkWindow* _tmp1_; @@ -5063,8 +5842,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self ZoomState zoom_state = {0}; ZoomState _tmp5_ = {0}; GtkScale* _tmp6_; - gdouble _tmp7_; - ZoomState _tmp8_; + ZoomState _tmp7_; #line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); #line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5081,7 +5859,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self _g_object_unref0 (_tmp1_); #line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 5081 "PhotoPage.c" +#line 5859 "PhotoPage.c" GtkWindow* _tmp3_; FullscreenWindow* _tmp4_; #line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5092,31 +5870,32 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self fullscreen_window_update_toolbar_dismissal (_tmp4_); #line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 5092 "PhotoPage.c" +#line 5870 "PhotoPage.c" } #line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_); #line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = self->priv->zoom_slider; #line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange)); -#line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_state_init_rescale (&zoom_state, &_tmp5_, _tmp7_); + zoom_state_init_rescale (&zoom_state, &_tmp5_, gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange))); #line 593 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = zoom_state; + _tmp7_ = zoom_state; #line 593 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_); + single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp7_); #line 595 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); #line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; #line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5112 "PhotoPage.c" +#line 5888 "PhotoPage.c" } -static gboolean editing_host_page_on_zoom_out_pressed (EditingHostPage* self, GdkEventButton* event) { +static gboolean +editing_host_page_on_zoom_out_pressed (EditingHostPage* self, + GdkEventButton* event) +{ gboolean result = FALSE; #line 600 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); @@ -5128,11 +5907,14 @@ static gboolean editing_host_page_on_zoom_out_pressed (EditingHostPage* self, Gd result = TRUE; #line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5128 "PhotoPage.c" +#line 5907 "PhotoPage.c" } -static gboolean editing_host_page_on_zoom_in_pressed (EditingHostPage* self, GdkEventButton* event) { +static gboolean +editing_host_page_on_zoom_in_pressed (EditingHostPage* self, + GdkEventButton* event) +{ gboolean result = FALSE; #line 605 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); @@ -5144,40 +5926,40 @@ static gboolean editing_host_page_on_zoom_in_pressed (EditingHostPage* self, Gdk result = TRUE; #line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5144 "PhotoPage.c" +#line 5926 "PhotoPage.c" } -static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, GdkEventScroll* event, GdkPoint* result) { +static void +editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, + GdkEventScroll* event, + GdkPoint* result) +{ GdkPoint cursor_wrt_canvas = {0}; GdkPoint _tmp0_ = {0}; - GdkEventScroll* _tmp1_; + gdouble _tmp1_; gdouble _tmp2_; - GdkEventScroll* _tmp3_; - gdouble _tmp4_; GdkRectangle viewport_wrt_canvas = {0}; - ZoomState _tmp5_ = {0}; - GdkRectangle _tmp6_ = {0}; + ZoomState _tmp3_ = {0}; + GdkRectangle _tmp4_ = {0}; GdkPoint _result_ = {0}; - GdkPoint _tmp7_ = {0}; - GdkPoint _tmp8_; + GdkPoint _tmp5_ = {0}; + GdkPoint _tmp6_; + gint _tmp7_; + GdkRectangle _tmp8_; gint _tmp9_; - GdkRectangle _tmp10_; + GdkPoint _tmp10_; gint _tmp11_; - GdkPoint _tmp12_; + GdkRectangle _tmp12_; gint _tmp13_; - GdkRectangle _tmp14_; + GdkPoint _tmp14_; gint _tmp15_; - gint _tmp16_; - GdkPoint _tmp17_; - gint _tmp18_; - GdkRectangle _tmp19_; - gint _tmp20_; - GdkPoint _tmp21_; - gint _tmp22_; - GdkRectangle _tmp23_; - gint _tmp24_; - gint _tmp25_; + GdkRectangle _tmp16_; + gint _tmp17_; + GdkPoint _tmp18_; + gint _tmp19_; + GdkRectangle _tmp20_; + gint _tmp21_; #line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5187,157 +5969,151 @@ static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, Gd #line 611 "/home/jens/Source/shotwell/src/PhotoPage.vala" cursor_wrt_canvas = _tmp0_; #line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = event; -#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = _tmp1_->x; + _tmp1_ = event->x; #line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cursor_wrt_canvas.x = (gint) _tmp2_; + cursor_wrt_canvas.x = (gint) _tmp1_; #line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = event; + _tmp2_ = event->y; #line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_->y; -#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cursor_wrt_canvas.y = (gint) _tmp4_; + cursor_wrt_canvas.y = (gint) _tmp2_; #line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_); + single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp3_); #line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_state_get_viewing_rectangle_wrt_screen (&_tmp5_, &_tmp6_); + zoom_state_get_viewing_rectangle_wrt_screen (&_tmp3_, &_tmp4_); #line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_wrt_canvas = _tmp6_; + viewport_wrt_canvas = _tmp4_; #line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_.x = 0; + _tmp5_.x = 0; #line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _result_ = _tmp7_; + _result_ = _tmp5_; #line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = cursor_wrt_canvas; + _tmp6_ = cursor_wrt_canvas; #line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = _tmp8_.x; + _tmp7_ = _tmp6_.x; #line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = viewport_wrt_canvas; + _tmp8_ = viewport_wrt_canvas; #line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = _tmp10_.x; + _tmp9_ = _tmp8_.x; #line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _result_.x = _tmp9_ - _tmp11_; + _result_.x = _tmp7_ - _tmp9_; #line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _result_; + _tmp10_ = _result_; #line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = _tmp12_.x; -#line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = viewport_wrt_canvas; + _tmp11_ = _tmp10_.x; #line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = _tmp14_.width; + _tmp12_ = viewport_wrt_canvas; #line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = CLAMP (_tmp13_, 0, _tmp15_); + _tmp13_ = _tmp12_.width; #line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _result_.x = _tmp16_; + _result_.x = CLAMP (_tmp11_, 0, _tmp13_); #line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = cursor_wrt_canvas; + _tmp14_ = cursor_wrt_canvas; #line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = _tmp17_.y; + _tmp15_ = _tmp14_.y; #line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = viewport_wrt_canvas; + _tmp16_ = viewport_wrt_canvas; #line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = _tmp19_.y; + _tmp17_ = _tmp16_.y; #line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _result_.y = _tmp18_ - _tmp20_; + _result_.y = _tmp15_ - _tmp17_; #line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = _result_; + _tmp18_ = _result_; #line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = _tmp21_.y; + _tmp19_ = _tmp18_.y; #line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = viewport_wrt_canvas; + _tmp20_ = viewport_wrt_canvas; #line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = _tmp23_.height; + _tmp21_ = _tmp20_.height; #line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = CLAMP (_tmp22_, 0, _tmp24_); -#line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _result_.y = _tmp25_; + _result_.y = CLAMP (_tmp19_, 0, _tmp21_); #line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala" *result = _result_; #line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 5256 "PhotoPage.c" +#line 6030 "PhotoPage.c" } -static void editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* self, GdkEventScroll* event, GdkPoint* result) { +static void +editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* self, + GdkEventScroll* event, + GdkPoint* result) +{ GdkPoint cursor_wrt_viewport = {0}; - GdkEventScroll* _tmp0_; - GdkPoint _tmp1_ = {0}; + GdkPoint _tmp0_ = {0}; GdkRectangle viewport_wrt_canvas = {0}; - ZoomState _tmp2_ = {0}; - GdkRectangle _tmp3_ = {0}; + ZoomState _tmp1_ = {0}; + GdkRectangle _tmp2_ = {0}; GdkPoint viewport_center = {0}; - GdkPoint _tmp4_ = {0}; - GdkRectangle _tmp5_; - gint _tmp6_; - GdkRectangle _tmp7_; - gint _tmp8_; + GdkPoint _tmp3_ = {0}; + GdkRectangle _tmp4_; + gint _tmp5_; + GdkRectangle _tmp6_; + gint _tmp7_; + GdkPoint _tmp8_; GdkPoint _tmp9_; - GdkPoint _tmp10_; - GdkPoint _tmp11_ = {0}; + GdkPoint _tmp10_ = {0}; #line 625 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 625 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (event != NULL); #line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = event; -#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_get_cursor_wrt_viewport (self, _tmp0_, &_tmp1_); + editing_host_page_get_cursor_wrt_viewport (self, event, &_tmp0_); #line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cursor_wrt_viewport = _tmp1_; + cursor_wrt_viewport = _tmp0_; #line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp2_); + single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_); #line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_state_get_viewing_rectangle_wrt_screen (&_tmp2_, &_tmp3_); + zoom_state_get_viewing_rectangle_wrt_screen (&_tmp1_, &_tmp2_); #line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_wrt_canvas = _tmp3_; + viewport_wrt_canvas = _tmp2_; #line 629 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_.x = 0; + _tmp3_.x = 0; #line 629 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_center = _tmp4_; + viewport_center = _tmp3_; #line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = viewport_wrt_canvas; + _tmp4_ = viewport_wrt_canvas; #line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _tmp5_.width; + _tmp5_ = _tmp4_.width; #line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_center.x = _tmp6_ / 2; + viewport_center.x = _tmp5_ / 2; #line 631 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = viewport_wrt_canvas; + _tmp6_ = viewport_wrt_canvas; #line 631 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp7_.height; + _tmp7_ = _tmp6_.height; #line 631 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_center.y = _tmp8_ / 2; + viewport_center.y = _tmp7_ / 2; #line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = cursor_wrt_viewport; + _tmp8_ = cursor_wrt_viewport; #line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = viewport_center; + _tmp9_ = viewport_center; #line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala" - subtract_points (&_tmp9_, &_tmp10_, &_tmp11_); + subtract_points (&_tmp8_, &_tmp9_, &_tmp10_); #line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *result = _tmp11_; + *result = _tmp10_; #line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 5318 "PhotoPage.c" +#line 6093 "PhotoPage.c" } -static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self, GdkEventScroll* event, GdkPoint* result) { +static void +editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self, + GdkEventScroll* event, + GdkPoint* result) +{ GdkPoint viewport_center_iso = {0}; ZoomState _tmp0_ = {0}; GdkPoint _tmp1_ = {0}; ZoomState _tmp2_ = {0}; - gdouble _tmp3_; - GdkPoint _tmp4_ = {0}; + GdkPoint _tmp3_ = {0}; GdkPoint cursor_wrt_center_iso = {0}; - GdkEventScroll* _tmp5_; + GdkPoint _tmp4_ = {0}; + ZoomState _tmp5_ = {0}; GdkPoint _tmp6_ = {0}; - ZoomState _tmp7_ = {0}; - gdouble _tmp8_; + GdkPoint _tmp7_; + GdkPoint _tmp8_; GdkPoint _tmp9_ = {0}; - GdkPoint _tmp10_; - GdkPoint _tmp11_; - GdkPoint _tmp12_ = {0}; #line 636 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 636 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5349,126 +6125,106 @@ static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self, #line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp2_); #line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = zoom_state_get_zoom_factor (&_tmp2_); -#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala" - scale_point (&_tmp1_, 1.0 / _tmp3_, &_tmp4_); + scale_point (&_tmp1_, 1.0 / zoom_state_get_zoom_factor (&_tmp2_), &_tmp3_); #line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_center_iso = _tmp4_; + viewport_center_iso = _tmp3_; #line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = event; + editing_host_page_get_cursor_wrt_viewport_center (self, event, &_tmp4_); #line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_get_cursor_wrt_viewport_center (self, _tmp5_, &_tmp6_); -#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp7_); -#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = zoom_state_get_zoom_factor (&_tmp7_); + single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_); #line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala" - scale_point (&_tmp6_, 1.0 / _tmp8_, &_tmp9_); + scale_point (&_tmp4_, 1.0 / zoom_state_get_zoom_factor (&_tmp5_), &_tmp6_); #line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cursor_wrt_center_iso = _tmp9_; + cursor_wrt_center_iso = _tmp6_; #line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = viewport_center_iso; + _tmp7_ = viewport_center_iso; #line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = cursor_wrt_center_iso; + _tmp8_ = cursor_wrt_center_iso; #line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala" - add_points (&_tmp10_, &_tmp11_, &_tmp12_); + add_points (&_tmp7_, &_tmp8_, &_tmp9_); #line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *result = _tmp12_; + *result = _tmp9_; #line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 5376 "PhotoPage.c" +#line 6146 "PhotoPage.c" } -static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* self, gdouble interp) { +static gdouble +editing_host_page_snap_interpolation_factor (EditingHostPage* self, + gdouble interp) +{ gdouble result = 0.0; - gdouble _tmp0_; - gdouble _tmp2_; #line 646 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), 0.0); #line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = interp; -#line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp0_ < 0.03) { + if (interp < 0.03) { #line 648 "/home/jens/Source/shotwell/src/PhotoPage.vala" interp = 0.0; -#line 5392 "PhotoPage.c" +#line 6161 "PhotoPage.c" } else { - gdouble _tmp1_; -#line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = interp; #line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp1_ > 0.97) { + if (interp > 0.97) { #line 650 "/home/jens/Source/shotwell/src/PhotoPage.vala" interp = 1.0; -#line 5401 "PhotoPage.c" +#line 6167 "PhotoPage.c" } } #line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = interp; -#line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp2_; + result = interp; #line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5410 "PhotoPage.c" +#line 6174 "PhotoPage.c" } -static gdouble editing_host_page_adjust_interpolation_factor (EditingHostPage* self, gdouble adjustment) { +static gdouble +editing_host_page_adjust_interpolation_factor (EditingHostPage* self, + gdouble adjustment) +{ gdouble result = 0.0; ZoomState _tmp0_ = {0}; - gdouble _tmp1_; - gdouble _tmp2_; - gdouble _tmp3_; #line 655 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), 0.0); #line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_); #line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = zoom_state_get_interpolation_factor (&_tmp0_); -#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = adjustment; -#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = editing_host_page_snap_interpolation_factor (self, _tmp1_ + _tmp2_); -#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp3_; + result = editing_host_page_snap_interpolation_factor (self, zoom_state_get_interpolation_factor (&_tmp0_) + adjustment); #line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5434 "PhotoPage.c" +#line 6192 "PhotoPage.c" } -static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* self, GdkEventScroll* event, gdouble zoom_increment) { +static void +editing_host_page_zoom_about_event_cursor_point (EditingHostPage* self, + GdkEventScroll* event, + gdouble zoom_increment) +{ gboolean _tmp0_; GdkPoint cursor_wrt_viewport_center = {0}; - GdkEventScroll* _tmp1_; - GdkPoint _tmp2_ = {0}; + GdkPoint _tmp1_ = {0}; GdkPoint iso_pixel_under_cursor = {0}; - GdkEventScroll* _tmp3_; - GdkPoint _tmp4_ = {0}; + GdkPoint _tmp2_ = {0}; gdouble interp = 0.0; - gdouble _tmp5_; + GtkScale* _tmp3_; + guint _tmp4_; + GtkScale* _tmp5_; gdouble _tmp6_; GtkScale* _tmp7_; - guint _tmp8_; - GtkScale* _tmp9_; - gdouble _tmp10_; - GtkScale* _tmp11_; ZoomState new_zoom_state = {0}; - ZoomState _tmp12_ = {0}; - gdouble _tmp13_; - gboolean _tmp14_; + ZoomState _tmp8_ = {0}; + gdouble _tmp9_; GdkPoint new_zoomed_old_cursor = {0}; - GdkPoint _tmp15_; - gdouble _tmp16_; - GdkPoint _tmp17_ = {0}; + GdkPoint _tmp10_; + GdkPoint _tmp11_ = {0}; GdkPoint desired_new_viewport_center = {0}; - GdkPoint _tmp18_; - GdkPoint _tmp19_; - GdkPoint _tmp20_ = {0}; - ZoomState _tmp21_; - GdkPoint _tmp22_; - ZoomState _tmp23_; + GdkPoint _tmp12_; + GdkPoint _tmp13_; + GdkPoint _tmp14_ = {0}; + ZoomState _tmp15_; + GdkPoint _tmp16_; + ZoomState _tmp17_; #line 659 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 659 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5479,52 +6235,42 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se if (_tmp0_) { #line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 5479 "PhotoPage.c" +#line 6235 "PhotoPage.c" } #line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = event; + editing_host_page_get_cursor_wrt_viewport_center (self, event, &_tmp1_); #line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_get_cursor_wrt_viewport_center (self, _tmp1_, &_tmp2_); -#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cursor_wrt_viewport_center = _tmp2_; -#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = event; + cursor_wrt_viewport_center = _tmp1_; #line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_get_iso_pixel_under_cursor (self, _tmp3_, &_tmp4_); + editing_host_page_get_iso_pixel_under_cursor (self, event, &_tmp2_); #line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala" - iso_pixel_under_cursor = _tmp4_; -#line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = zoom_increment; -#line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = editing_host_page_adjust_interpolation_factor (self, _tmp5_); + iso_pixel_under_cursor = _tmp2_; #line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala" - interp = _tmp6_; + interp = editing_host_page_adjust_interpolation_factor (self, zoom_increment); #line 667 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = self->priv->zoom_slider; + _tmp3_ = self->priv->zoom_slider; #line 667 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp8_, NULL, FALSE); + g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp4_, NULL, FALSE); #line 667 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self); #line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = self->priv->zoom_slider; + _tmp5_ = self->priv->zoom_slider; #line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = interp; + _tmp6_ = interp; #line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), _tmp10_); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_range_get_type (), GtkRange), _tmp6_); #line 669 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = self->priv->zoom_slider; + _tmp7_ = self->priv->zoom_slider; #line 669 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0); #line 671 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp12_); + single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_); #line 671 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = interp; + _tmp9_ = interp; #line 671 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_state_init_rescale (&new_zoom_state, &_tmp12_, _tmp13_); + zoom_state_init_rescale (&new_zoom_state, &_tmp8_, _tmp9_); #line 673 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = zoom_state_is_min (&new_zoom_state); -#line 673 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp14_) { + if (zoom_state_is_min (&new_zoom_state)) { #line 674 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 675 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5533,43 +6279,43 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); #line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 5533 "PhotoPage.c" +#line 6279 "PhotoPage.c" } #line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = iso_pixel_under_cursor; -#line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = zoom_state_get_zoom_factor (&new_zoom_state); + _tmp10_ = iso_pixel_under_cursor; #line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala" - scale_point (&_tmp15_, _tmp16_, &_tmp17_); + scale_point (&_tmp10_, zoom_state_get_zoom_factor (&new_zoom_state), &_tmp11_); #line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala" - new_zoomed_old_cursor = _tmp17_; + new_zoomed_old_cursor = _tmp11_; #line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = new_zoomed_old_cursor; + _tmp12_ = new_zoomed_old_cursor; #line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = cursor_wrt_viewport_center; + _tmp13_ = cursor_wrt_viewport_center; #line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala" - subtract_points (&_tmp18_, &_tmp19_, &_tmp20_); + subtract_points (&_tmp12_, &_tmp13_, &_tmp14_); #line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala" - desired_new_viewport_center = _tmp20_; + desired_new_viewport_center = _tmp14_; #line 685 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = new_zoom_state; + _tmp15_ = new_zoom_state; #line 685 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = desired_new_viewport_center; + _tmp16_ = desired_new_viewport_center; #line 685 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_state_init_pan (&new_zoom_state, &_tmp21_, &_tmp22_); + zoom_state_init_pan (&new_zoom_state, &_tmp15_, &_tmp16_); #line 687 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = new_zoom_state; + _tmp17_ = new_zoom_state; #line 687 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp23_); + single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp17_); #line 688 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); #line 690 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_cursor_for_zoom_context (self); -#line 5565 "PhotoPage.c" +#line 6309 "PhotoPage.c" } -void editing_host_page_snap_zoom_to_min (EditingHostPage* self) { +void +editing_host_page_snap_zoom_to_min (EditingHostPage* self) +{ GtkScale* _tmp0_; #line 693 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); @@ -5577,11 +6323,13 @@ void editing_host_page_snap_zoom_to_min (EditingHostPage* self) { _tmp0_ = self->priv->zoom_slider; #line 694 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 0.0); -#line 5577 "PhotoPage.c" +#line 6323 "PhotoPage.c" } -void editing_host_page_snap_zoom_to_max (EditingHostPage* self) { +void +editing_host_page_snap_zoom_to_max (EditingHostPage* self) +{ GtkScale* _tmp0_; #line 697 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); @@ -5589,15 +6337,16 @@ void editing_host_page_snap_zoom_to_max (EditingHostPage* self) { _tmp0_ = self->priv->zoom_slider; #line 698 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 1.0); -#line 5589 "PhotoPage.c" +#line 6337 "PhotoPage.c" } -void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self) { +void +editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self) +{ ZoomState iso_state = {0}; ZoomState _tmp0_ = {0}; GtkScale* _tmp1_; - gdouble _tmp2_; #line 701 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5607,53 +6356,51 @@ void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self) { #line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->zoom_slider; #line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = zoom_state_get_interpolation_factor (&iso_state); -#line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange), _tmp2_); -#line 5610 "PhotoPage.c" + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange), zoom_state_get_interpolation_factor (&iso_state)); +#line 6357 "PhotoPage.c" } -static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage* self, GdkEventKey* event) { +static gboolean +editing_host_page_real_on_zoom_slider_key_press (EditingHostPage* self, + GdkEventKey* event) +{ gboolean result = FALSE; - GdkEventKey* _tmp0_; - guint _tmp1_; + guint _tmp0_; + const gchar* _tmp1_; const gchar* _tmp2_; - const gchar* _tmp3_; - GQuark _tmp5_ = 0U; + GQuark _tmp4_ = 0U; #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp4_label0 = 0; + static GQuark _tmp3_label0 = 0; #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp4_label1 = 0; + static GQuark _tmp3_label1 = 0; #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp4_label2 = 0; + static GQuark _tmp3_label2 = 0; #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp4_label3 = 0; + static GQuark _tmp3_label3 = 0; #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp4_label4 = 0; + static GQuark _tmp3_label4 = 0; #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp4_label5 = 0; + static GQuark _tmp3_label5 = 0; #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp4_label6 = 0; + static GQuark _tmp3_label6 = 0; #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp4_label7 = 0; + static GQuark _tmp3_label7 = 0; #line 706 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = event; -#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = _tmp0_->keyval; + _tmp0_ = event->keyval; #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = gdk_keyval_name (_tmp1_); + _tmp1_ = gdk_keyval_name (_tmp0_); #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_); + _tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_); #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("equal")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("plus"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("KP_Add"))))) { + if (((_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("equal")))) || (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("plus"))))) || (_tmp4_ == ((0 != _tmp3_label2) ? _tmp3_label2 : (_tmp3_label2 = g_quark_from_static_string ("KP_Add"))))) { #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 5653 "PhotoPage.c" +#line 6400 "PhotoPage.c" default: { #line 711 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5662,13 +6409,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage result = TRUE; #line 712 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5662 "PhotoPage.c" +#line 6409 "PhotoPage.c" } } - } else if (((_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("minus")))) || (_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("underscore"))))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Subtract"))))) { + } else if (((_tmp4_ == ((0 != _tmp3_label3) ? _tmp3_label3 : (_tmp3_label3 = g_quark_from_static_string ("minus")))) || (_tmp4_ == ((0 != _tmp3_label4) ? _tmp3_label4 : (_tmp3_label4 = g_quark_from_static_string ("underscore"))))) || (_tmp4_ == ((0 != _tmp3_label5) ? _tmp3_label5 : (_tmp3_label5 = g_quark_from_static_string ("KP_Subtract"))))) { #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 5668 "PhotoPage.c" +#line 6415 "PhotoPage.c" default: { #line 717 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5677,13 +6424,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage result = TRUE; #line 718 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5677 "PhotoPage.c" +#line 6424 "PhotoPage.c" } } - } else if (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("KP_Divide")))) { + } else if (_tmp4_ == ((0 != _tmp3_label6) ? _tmp3_label6 : (_tmp3_label6 = g_quark_from_static_string ("KP_Divide")))) { #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 5683 "PhotoPage.c" +#line 6430 "PhotoPage.c" default: { #line 721 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5692,13 +6439,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage result = TRUE; #line 722 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5692 "PhotoPage.c" +#line 6439 "PhotoPage.c" } } - } else if (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("KP_Multiply")))) { + } else if (_tmp4_ == ((0 != _tmp3_label7) ? _tmp3_label7 : (_tmp3_label7 = g_quark_from_static_string ("KP_Multiply")))) { #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 5698 "PhotoPage.c" +#line 6445 "PhotoPage.c" default: { #line 725 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5707,7 +6454,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage result = TRUE; #line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5707 "PhotoPage.c" +#line 6454 "PhotoPage.c" } } } @@ -5715,67 +6462,73 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage result = FALSE; #line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5715 "PhotoPage.c" +#line 6462 "PhotoPage.c" } -gboolean editing_host_page_on_zoom_slider_key_press (EditingHostPage* self, GdkEventKey* event) { +gboolean +editing_host_page_on_zoom_slider_key_press (EditingHostPage* self, + GdkEventKey* event) +{ #line 706 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); #line 706 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->on_zoom_slider_key_press (self, event); -#line 5724 "PhotoPage.c" +#line 6474 "PhotoPage.c" } -static void editing_host_page_real_on_increase_size (EditingHostPage* self) { +static void +editing_host_page_real_on_increase_size (EditingHostPage* self) +{ GtkScale* _tmp0_; - gdouble _tmp1_; #line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->zoom_slider; #line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = editing_host_page_adjust_interpolation_factor (self, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE); -#line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp1_); -#line 5737 "PhotoPage.c" + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), editing_host_page_adjust_interpolation_factor (self, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE)); +#line 6486 "PhotoPage.c" } -void editing_host_page_on_increase_size (EditingHostPage* self) { +void +editing_host_page_on_increase_size (EditingHostPage* self) +{ #line 732 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 732 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_GET_CLASS (self)->on_increase_size (self); -#line 5746 "PhotoPage.c" +#line 6497 "PhotoPage.c" } -static void editing_host_page_real_on_decrease_size (EditingHostPage* self) { +static void +editing_host_page_real_on_decrease_size (EditingHostPage* self) +{ GtkScale* _tmp0_; - gdouble _tmp1_; #line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->zoom_slider; #line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = editing_host_page_adjust_interpolation_factor (self, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE); -#line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp1_); -#line 5759 "PhotoPage.c" + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), editing_host_page_adjust_interpolation_factor (self, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE)); +#line 6509 "PhotoPage.c" } -void editing_host_page_on_decrease_size (EditingHostPage* self) { +void +editing_host_page_on_decrease_size (EditingHostPage* self) +{ #line 736 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 736 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_GET_CLASS (self)->on_decrease_size (self); -#line 5768 "PhotoPage.c" +#line 6520 "PhotoPage.c" } -static void editing_host_page_real_save_zoom_state (SinglePhotoPage* base) { +static void +editing_host_page_real_save_zoom_state (SinglePhotoPage* base) +{ EditingHostPage * self; GtkScale* _tmp0_; - gdouble _tmp1_; #line 740 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 741 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5783,14 +6536,14 @@ static void editing_host_page_real_save_zoom_state (SinglePhotoPage* base) { #line 742 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->zoom_slider; #line 742 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange)); -#line 742 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->saved_slider_val = _tmp1_; -#line 5786 "PhotoPage.c" + self->priv->saved_slider_val = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange)); +#line 6537 "PhotoPage.c" } -static ZoomBuffer* editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base) { +static ZoomBuffer* +editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base) +{ EditingHostPage * self; ZoomBuffer* result = NULL; ZoomBuffer* _tmp0_; @@ -5805,17 +6558,18 @@ static ZoomBuffer* editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base result = _tmp1_; #line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5805 "PhotoPage.c" +#line 6558 "PhotoPage.c" } -static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScroll* event) { +static gboolean +editing_host_page_real_on_mousewheel_up (Page* base, + GdkEventScroll* event) +{ EditingHostPage * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; ZoomState _tmp1_ = {0}; - gboolean _tmp2_; - GdkEventScroll* _tmp5_; #line 749 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 749 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5823,22 +6577,17 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_); #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = zoom_state_is_max (&_tmp1_); -#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp2_) { + if (zoom_state_is_max (&_tmp1_)) { #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 5828 "PhotoPage.c" +#line 6580 "PhotoPage.c" } else { - GtkScale* _tmp3_; - gboolean _tmp4_; -#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = self->priv->zoom_slider; + GtkScale* _tmp2_; #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); + _tmp2_ = self->priv->zoom_slider; #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = !_tmp4_; -#line 5838 "PhotoPage.c" + _tmp0_ = !gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); +#line 6587 "PhotoPage.c" } #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { @@ -5846,27 +6595,26 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr result = FALSE; #line 751 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5846 "PhotoPage.c" +#line 6595 "PhotoPage.c" } #line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = event; -#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_zoom_about_event_cursor_point (self, _tmp5_, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE); + editing_host_page_zoom_about_event_cursor_point (self, event, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE); #line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; #line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5856 "PhotoPage.c" +#line 6603 "PhotoPage.c" } -static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventScroll* event) { +static gboolean +editing_host_page_real_on_mousewheel_down (Page* base, + GdkEventScroll* event) +{ EditingHostPage * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; ZoomState _tmp1_ = {0}; - gboolean _tmp2_; - GdkEventScroll* _tmp5_; #line 757 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 757 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5874,22 +6622,17 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_); #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = zoom_state_is_min (&_tmp1_); -#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp2_) { + if (zoom_state_is_min (&_tmp1_)) { #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 5879 "PhotoPage.c" +#line 6625 "PhotoPage.c" } else { - GtkScale* _tmp3_; - gboolean _tmp4_; -#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = self->priv->zoom_slider; + GtkScale* _tmp2_; #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); + _tmp2_ = self->priv->zoom_slider; #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = !_tmp4_; -#line 5889 "PhotoPage.c" + _tmp0_ = !gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); +#line 6632 "PhotoPage.c" } #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { @@ -5897,21 +6640,21 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS result = FALSE; #line 759 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5897 "PhotoPage.c" +#line 6640 "PhotoPage.c" } #line 761 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = event; -#line 761 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_zoom_about_event_cursor_point (self, _tmp5_, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE); + editing_host_page_zoom_about_event_cursor_point (self, event, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE); #line 762 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; #line 762 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5907 "PhotoPage.c" +#line 6648 "PhotoPage.c" } -static void editing_host_page_real_restore_zoom_state (SinglePhotoPage* base) { +static void +editing_host_page_real_restore_zoom_state (SinglePhotoPage* base) +{ EditingHostPage * self; GtkScale* _tmp0_; guint _tmp1_; @@ -5938,11 +6681,13 @@ static void editing_host_page_real_restore_zoom_state (SinglePhotoPage* base) { _tmp4_ = self->priv->zoom_slider; #line 770 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0); -#line 5938 "PhotoPage.c" +#line 6681 "PhotoPage.c" } -static gboolean editing_host_page_real_is_zoom_supported (SinglePhotoPage* base) { +static gboolean +editing_host_page_real_is_zoom_supported (SinglePhotoPage* base) +{ EditingHostPage * self; gboolean result = FALSE; #line 773 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -5951,40 +6696,39 @@ static gboolean editing_host_page_real_is_zoom_supported (SinglePhotoPage* base) result = TRUE; #line 774 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5951 "PhotoPage.c" +#line 6696 "PhotoPage.c" } -static void editing_host_page_real_set_container (Page* base, GtkWindow* container) { +static void +editing_host_page_real_set_container (Page* base, + GtkWindow* container) +{ EditingHostPage * self; - GtkWindow* _tmp0_; - GtkWindow* _tmp1_; #line 777 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 777 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (GTK_IS_WINDOW (container)); #line 778 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = container; -#line 778 "/home/jens/Source/shotwell/src/PhotoPage.vala" - PAGE_CLASS (editing_host_page_parent_class)->set_container (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_); -#line 781 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = container; + PAGE_CLASS (editing_host_page_parent_class)->set_container (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), container); #line 781 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) { -#line 5971 "PhotoPage.c" - DragAndDropHandler* _tmp2_; + if (!G_TYPE_CHECK_INSTANCE_TYPE (container, TYPE_FULLSCREEN_WINDOW)) { +#line 6713 "PhotoPage.c" + DragAndDropHandler* _tmp0_; #line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = drag_and_drop_handler_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp0_ = drag_and_drop_handler_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala" _drag_and_drop_handler_unref0 (self->priv->dnd_handler); #line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->dnd_handler = _tmp2_; -#line 5979 "PhotoPage.c" + self->priv->dnd_handler = _tmp0_; +#line 6721 "PhotoPage.c" } } -ViewCollection* editing_host_page_get_parent_view (EditingHostPage* self) { +ViewCollection* +editing_host_page_get_parent_view (EditingHostPage* self) +{ ViewCollection* result = NULL; ViewCollection* _tmp0_; ViewCollection* _tmp1_; @@ -5998,11 +6742,13 @@ ViewCollection* editing_host_page_get_parent_view (EditingHostPage* self) { result = _tmp1_; #line 786 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 5998 "PhotoPage.c" +#line 6742 "PhotoPage.c" } -gboolean editing_host_page_has_photo (EditingHostPage* self) { +gboolean +editing_host_page_has_photo (EditingHostPage* self) +{ gboolean result = FALSE; Photo* _tmp0_; Photo* _tmp1_; @@ -6021,25 +6767,25 @@ gboolean editing_host_page_has_photo (EditingHostPage* self) { result = _tmp2_; #line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6021 "PhotoPage.c" +#line 6767 "PhotoPage.c" } -Photo* editing_host_page_get_photo (EditingHostPage* self) { +Photo* +editing_host_page_get_photo (EditingHostPage* self) +{ Photo* result = NULL; ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; ViewCollection* _tmp5_; - gint _tmp6_; - ViewCollection* _tmp7_; - ViewCollection* _tmp8_; - DataView* _tmp9_; - DataView* _tmp10_; - DataSource* _tmp11_; - Photo* _tmp12_; + ViewCollection* _tmp6_; + DataView* _tmp7_; + DataView* _tmp8_; + DataSource* _tmp9_; + Photo* _tmp10_; #line 793 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); #line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -6047,129 +6793,120 @@ Photo* editing_host_page_get_photo (EditingHostPage* self) { #line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; #line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0; #line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp1_); #line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = NULL; #line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6058 "PhotoPage.c" +#line 6802 "PhotoPage.c" } #line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = _tmp4_; + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = view_collection_get_selected_count (_tmp5_); + _tmp4_ = _tmp3_; #line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_assert (_tmp6_ == 1, "get_view().get_selected_count() == 1"); + _vala_assert (view_collection_get_selected_count (_tmp4_) == 1, "get_view().get_selected_count() == 1"); #line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = view_collection_get_selected_at (_tmp8_, 0); + _tmp7_ = view_collection_get_selected_at (_tmp6_, 0); #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = data_view_get_source (_tmp10_); + _tmp9_ = data_view_get_source (_tmp8_); #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO, Photo); + _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo); #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp8_); + _data_collection_unref0 (_tmp6_); #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp12_; + result = _tmp10_; #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6090 "PhotoPage.c" +#line 6832 "PhotoPage.c" } -static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo* new_photo) { - Photo* _tmp0_; - PhotoFileFormat _tmp1_; - gboolean _tmp6_; +static void +editing_host_page_real_photo_changing (EditingHostPage* self, + Photo* new_photo) +{ + gboolean _tmp2_; #line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (new_photo)); #line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = new_photo; -#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = photo_get_file_format (_tmp0_); -#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) { + if (photo_get_file_format (new_photo) == PHOTO_FILE_FORMAT_RAW) { #line 809 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_set_photo_missing (self, FALSE); -#line 6108 "PhotoPage.c" +#line 6847 "PhotoPage.c" } else { - Photo* _tmp2_; - GFile* _tmp3_; - GFile* _tmp4_; - gboolean _tmp5_; + GFile* _tmp0_; + GFile* _tmp1_; #line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = new_photo; + _tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (new_photo, TYPE_MEDIA_SOURCE, MediaSource)); #line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp1_ = _tmp0_; #line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_; + editing_host_page_set_photo_missing (self, !g_file_query_exists (_tmp1_, NULL)); #line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = g_file_query_exists (_tmp4_, NULL); -#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_set_photo_missing (self, !_tmp5_); -#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp4_); -#line 6126 "PhotoPage.c" + _g_object_unref0 (_tmp1_); +#line 6859 "PhotoPage.c" } #line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = self->priv->photo_missing; + _tmp2_ = self->priv->photo_missing; #line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_update_ui (self, _tmp6_); -#line 6132 "PhotoPage.c" + editing_host_page_update_ui (self, _tmp2_); +#line 6865 "PhotoPage.c" } -void editing_host_page_photo_changing (EditingHostPage* self, Photo* new_photo) { +void +editing_host_page_photo_changing (EditingHostPage* self, + Photo* new_photo) +{ #line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_GET_CLASS (self)->photo_changing (self, new_photo); -#line 6141 "PhotoPage.c" +#line 6877 "PhotoPage.c" } -static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) { +static void +editing_host_page_set_photo (EditingHostPage* self, + Photo* photo) +{ GtkScale* _tmp0_; guint _tmp1_; GtkScale* _tmp2_; GtkScale* _tmp3_; - Photo* _tmp4_; DataView* view = NULL; + ViewCollection* _tmp4_; ViewCollection* _tmp5_; - ViewCollection* _tmp6_; - Photo* _tmp7_; + DataView* _tmp6_; + DataView* _tmp7_; DataView* _tmp8_; - DataView* _tmp9_; - DataView* _tmp10_; + ViewCollection* _tmp9_; + ViewCollection* _tmp10_; + Marker* marker = NULL; ViewCollection* _tmp11_; ViewCollection* _tmp12_; - Marker* marker = NULL; - ViewCollection* _tmp13_; - ViewCollection* _tmp14_; - DataView* _tmp15_; - Marker* _tmp16_; - Marker* _tmp17_; - ViewCollection* _tmp18_; + DataView* _tmp13_; + Marker* _tmp14_; + Marker* _tmp15_; + ViewCollection* _tmp16_; + ViewCollection* _tmp17_; + Marker* _tmp18_; ViewCollection* _tmp19_; - Marker* _tmp20_; - ViewCollection* _tmp21_; #line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -6189,121 +6926,116 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) { #line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0); #line 821 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = photo; -#line 821 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_photo_changing (self, _tmp4_); + editing_host_page_photo_changing (self, photo); #line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _tmp5_; + _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = photo; + _tmp5_ = _tmp4_; #line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = view_collection_get_view_for_source (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource)); + _tmp6_ = view_collection_get_view_for_source (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_SOURCE, DataSource)); #line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp6_); + _data_collection_unref0 (_tmp5_); #line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view = _tmp9_; + view = _tmp7_; #line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = view; + _tmp8_ = view; #line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_assert (_tmp10_ != NULL, "view != null"); + _vala_assert (_tmp8_ != NULL, "view != null"); #line 826 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 826 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 826 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view_collection_unselect_all (_tmp12_); + view_collection_unselect_all (_tmp10_); #line 826 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp12_); + _data_collection_unref0 (_tmp10_); #line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = view; + _tmp13_ = view; #line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_OBJECT, DataObject)); + _tmp14_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject)); #line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = _tmp16_; + _tmp15_ = _tmp14_; #line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp14_); + _data_collection_unref0 (_tmp12_); #line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala" - marker = _tmp17_; + marker = _tmp15_; #line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = _tmp18_; + _tmp17_ = _tmp16_; #line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = marker; + _tmp18_ = marker; #line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view_collection_select_marked (_tmp19_, _tmp20_); + view_collection_select_marked (_tmp17_, _tmp18_); #line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp19_); + _data_collection_unref0 (_tmp17_); #line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = self->priv->parent_view; + _tmp19_ = self->priv->parent_view; #line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp21_ != NULL) { -#line 6246 "PhotoPage.c" - ViewCollection* _tmp22_; + if (_tmp19_ != NULL) { +#line 6979 "PhotoPage.c" + ViewCollection* _tmp20_; DataView* view_in_parent = NULL; - ViewCollection* _tmp23_; - Photo* _tmp24_; - DataView* _tmp25_; - DataView* _tmp26_; + ViewCollection* _tmp21_; + DataView* _tmp22_; + DataView* _tmp23_; #line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = self->priv->parent_view; + _tmp20_ = self->priv->parent_view; #line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view_collection_unselect_all (_tmp22_); + view_collection_unselect_all (_tmp20_); #line 834 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = self->priv->parent_view; + _tmp21_ = self->priv->parent_view; #line 834 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = photo; + _tmp22_ = view_collection_get_view_for_source_filtered (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_SOURCE, DataSource)); #line 834 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = view_collection_get_view_for_source_filtered (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_SOURCE, DataSource)); -#line 834 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view_in_parent = _tmp25_; + view_in_parent = _tmp22_; #line 835 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp26_ = view_in_parent; + _tmp23_ = view_in_parent; #line 835 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (NULL != _tmp26_) { -#line 6269 "PhotoPage.c" - ViewCollection* _tmp27_; - ViewCollection* _tmp28_; - DataView* _tmp29_; - Marker* _tmp30_; - Marker* _tmp31_; + if (NULL != _tmp23_) { +#line 6999 "PhotoPage.c" + ViewCollection* _tmp24_; + ViewCollection* _tmp25_; + DataView* _tmp26_; + Marker* _tmp27_; + Marker* _tmp28_; #line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = self->priv->parent_view; + _tmp24_ = self->priv->parent_view; #line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = self->priv->parent_view; + _tmp25_ = self->priv->parent_view; #line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = view_in_parent; + _tmp26_ = view_in_parent; #line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject)); + _tmp27_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_OBJECT, DataObject)); #line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp31_ = _tmp30_; + _tmp28_ = _tmp27_; #line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view_collection_select_marked (_tmp27_, _tmp31_); + view_collection_select_marked (_tmp24_, _tmp28_); #line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp31_); -#line 6289 "PhotoPage.c" + _g_object_unref0 (_tmp28_); +#line 7019 "PhotoPage.c" } #line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (view_in_parent); -#line 6293 "PhotoPage.c" +#line 7023 "PhotoPage.c" } #line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (marker); #line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (view); -#line 6299 "PhotoPage.c" +#line 7029 "PhotoPage.c" } -static void editing_host_page_real_realize (GtkWidget* base) { +static void +editing_host_page_real_realize (GtkWidget* base) +{ EditingHostPage * self; #line 840 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); @@ -6311,14 +7043,15 @@ static void editing_host_page_real_realize (GtkWidget* base) { GTK_WIDGET_CLASS (editing_host_page_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget)); #line 843 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rebuild_caches (self, "realize"); -#line 6311 "PhotoPage.c" +#line 7043 "PhotoPage.c" } -static void editing_host_page_real_switched_to (Page* base) { +static void +editing_host_page_real_switched_to (Page* base) +{ EditingHostPage * self; gboolean _tmp0_ = FALSE; - gboolean _tmp1_; #line 846 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 847 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -6326,46 +7059,45 @@ static void editing_host_page_real_switched_to (Page* base) { #line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rebuild_caches (self, "switched_to"); #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = editing_host_page_has_photo (self); -#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp1_) { -#line 6329 "PhotoPage.c" - gboolean _tmp2_; + if (editing_host_page_has_photo (self)) { +#line 7060 "PhotoPage.c" + gboolean _tmp1_; #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = self->priv->pixbuf_dirty; + _tmp1_ = self->priv->pixbuf_dirty; #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = _tmp2_; -#line 6335 "PhotoPage.c" + _tmp0_ = _tmp1_; +#line 7066 "PhotoPage.c" } else { #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 6339 "PhotoPage.c" +#line 7070 "PhotoPage.c" } #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 6343 "PhotoPage.c" +#line 7074 "PhotoPage.c" + Photo* _tmp2_; Photo* _tmp3_; - Photo* _tmp4_; #line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = editing_host_page_get_photo (self); + _tmp2_ = editing_host_page_get_photo (self); #line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_replace_photo (self, _tmp4_); + editing_host_page_replace_photo (self, _tmp3_); #line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp4_); -#line 6354 "PhotoPage.c" + _g_object_unref0 (_tmp3_); +#line 7085 "PhotoPage.c" } } -static void editing_host_page_real_switching_from (Page* base) { +static void +editing_host_page_real_switching_from (Page* base) +{ EditingHostPage * self; Dimensions _tmp0_ = {0}; gboolean _tmp1_ = FALSE; - gboolean _tmp2_; + ViewCollection* _tmp12_; ViewCollection* _tmp13_; - ViewCollection* _tmp14_; #line 856 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 857 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -6379,300 +7111,303 @@ static void editing_host_page_real_switching_from (Page* base) { #line 862 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE); #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = editing_host_page_has_photo (self); -#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp2_) { -#line 6382 "PhotoPage.c" - ViewCollection* _tmp3_; + if (editing_host_page_has_photo (self)) { +#line 7112 "PhotoPage.c" + ViewCollection* _tmp2_; #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = self->priv->parent_view; + _tmp2_ = self->priv->parent_view; #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = _tmp3_ != NULL; -#line 6388 "PhotoPage.c" + _tmp1_ = _tmp2_ != NULL; +#line 7118 "PhotoPage.c" } else { #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 6392 "PhotoPage.c" +#line 7122 "PhotoPage.c" } #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 6396 "PhotoPage.c" +#line 7126 "PhotoPage.c" + ViewCollection* _tmp3_; ViewCollection* _tmp4_; ViewCollection* _tmp5_; - ViewCollection* _tmp6_; + Photo* _tmp6_; Photo* _tmp7_; - Photo* _tmp8_; + DataView* _tmp8_; DataView* _tmp9_; - DataView* _tmp10_; + Marker* _tmp10_; Marker* _tmp11_; - Marker* _tmp12_; +#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp3_ = self->priv->parent_view; #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = self->priv->parent_view; #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = self->priv->parent_view; #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = self->priv->parent_view; + _tmp6_ = editing_host_page_get_photo (self); #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = editing_host_page_get_photo (self); -#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = view_collection_get_view_for_source (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource)); + _tmp8_ = view_collection_get_view_for_source (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource)); #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); + _tmp10_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view_collection_select_marked (_tmp4_, _tmp12_); + view_collection_select_marked (_tmp3_, _tmp11_); #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp11_); #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp9_); #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp8_); -#line 6432 "PhotoPage.c" + _g_object_unref0 (_tmp7_); +#line 7162 "PhotoPage.c" } #line 873 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (self->priv->parent_view); #line 873 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->parent_view = NULL; #line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala" - data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection)); #line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp14_); -#line 6446 "PhotoPage.c" + _data_collection_unref0 (_tmp13_); +#line 7176 "PhotoPage.c" } -static void _editing_host_page_on_selection_changed_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self) { +static void +_editing_host_page_on_selection_changed_view_collection_items_selected (ViewCollection* _sender, + GeeIterable* selected, + gpointer self) +{ #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_selection_changed ((EditingHostPage*) self, selected); -#line 6453 "PhotoPage.c" +#line 7187 "PhotoPage.c" } -static void editing_host_page_real_switching_to_fullscreen (Page* base, FullscreenWindow* fsw) { +static void +editing_host_page_real_switching_to_fullscreen (Page* base, + FullscreenWindow* fsw) +{ EditingHostPage * self; - FullscreenWindow* _tmp0_; - Dimensions _tmp1_ = {0}; + Dimensions _tmp0_ = {0}; Page* page = NULL; - FullscreenWindow* _tmp2_; - Page* _tmp3_; - Page* _tmp4_; + Page* _tmp1_; + Page* _tmp2_; #line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw)); #line 878 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = fsw; -#line 878 "/home/jens/Source/shotwell/src/PhotoPage.vala" - PAGE_CLASS (editing_host_page_parent_class)->switching_to_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_); + PAGE_CLASS (editing_host_page_parent_class)->switching_to_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), fsw); #line 880 "/home/jens/Source/shotwell/src/PhotoPage.vala" - dimensions_init (&_tmp1_, 0, 0); + dimensions_init (&_tmp0_, 0, 0); #line 880 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE); + editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE); #line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 883 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->is_pan_in_progress = FALSE; #line 885 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = fsw; + _tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (fsw, TYPE_PAGE_WINDOW, PageWindow)); #line 885 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PAGE_WINDOW, PageWindow)); -#line 885 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page = _tmp3_; + page = _tmp1_; #line 886 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = page; + _tmp2_ = page; #line 886 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp4_ != NULL) { -#line 6491 "PhotoPage.c" - Page* _tmp5_; - ViewCollection* _tmp6_; - ViewCollection* _tmp7_; + if (_tmp2_ != NULL) { +#line 7222 "PhotoPage.c" + Page* _tmp3_; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = page; + _tmp3_ = page; #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = page_get_view (_tmp5_); + _tmp4_ = page_get_view (_tmp3_); #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp7_, "items-selected", (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self, 0); + g_signal_connect_object (_tmp5_, "items-selected", (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self, 0); #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp7_); -#line 6505 "PhotoPage.c" + _data_collection_unref0 (_tmp5_); +#line 7236 "PhotoPage.c" } #line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (page); -#line 6509 "PhotoPage.c" +#line 7240 "PhotoPage.c" } -static void editing_host_page_real_returning_from_fullscreen (Page* base, FullscreenWindow* fsw) { +static void +editing_host_page_real_returning_from_fullscreen (Page* base, + FullscreenWindow* fsw) +{ EditingHostPage * self; - FullscreenWindow* _tmp0_; Page* page = NULL; - FullscreenWindow* _tmp1_; - Page* _tmp2_; - Page* _tmp3_; + Page* _tmp0_; + Page* _tmp1_; #line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw)); #line 891 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = fsw; -#line 891 "/home/jens/Source/shotwell/src/PhotoPage.vala" - PAGE_CLASS (editing_host_page_parent_class)->returning_from_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_); + PAGE_CLASS (editing_host_page_parent_class)->returning_from_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), fsw); #line 893 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); #line 895 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = fsw; -#line 895 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE_WINDOW, PageWindow)); + _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (fsw, TYPE_PAGE_WINDOW, PageWindow)); #line 895 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page = _tmp2_; + page = _tmp0_; #line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = page; + _tmp1_ = page; #line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp3_ != NULL) { -#line 6540 "PhotoPage.c" - Page* _tmp4_; - ViewCollection* _tmp5_; - ViewCollection* _tmp6_; - guint _tmp7_; + if (_tmp1_ != NULL) { +#line 7268 "PhotoPage.c" + Page* _tmp2_; + ViewCollection* _tmp3_; + ViewCollection* _tmp4_; + guint _tmp5_; #line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = page; + _tmp2_ = page; #line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = page_get_view (_tmp4_); + _tmp3_ = page_get_view (_tmp2_); #line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_parse_name ("items-selected", TYPE_VIEW_COLLECTION, &_tmp7_, NULL, FALSE); + g_signal_parse_name ("items-selected", TYPE_VIEW_COLLECTION, &_tmp5_, NULL, FALSE); #line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self); + g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self); #line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp6_); -#line 6557 "PhotoPage.c" + _data_collection_unref0 (_tmp4_); +#line 7285 "PhotoPage.c" } #line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (page); -#line 6561 "PhotoPage.c" +#line 7289 "PhotoPage.c" } -static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIterable* selected) { +static void +editing_host_page_on_selection_changed (EditingHostPage* self, + GeeIterable* selected) +{ #line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (GEE_IS_ITERABLE (selected)); -#line 6570 "PhotoPage.c" +#line 7301 "PhotoPage.c" { GeeIterator* _view_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; -#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = selected; + GeeIterator* _tmp0_; #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); + _tmp0_ = gee_iterable_iterator (selected); #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _view_it = _tmp1_; + _view_it = _tmp0_; #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala" while (TRUE) { -#line 6583 "PhotoPage.c" - gboolean _tmp2_; +#line 7311 "PhotoPage.c" DataView* view = NULL; - gpointer _tmp3_; - DataView* _tmp4_; - DataSource* _tmp5_; - Photo* _tmp6_; -#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = gee_iterator_next (_view_it); + gpointer _tmp1_; + DataView* _tmp2_; + DataSource* _tmp3_; + Photo* _tmp4_; #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp2_) { + if (!gee_iterator_next (_view_it)) { #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 6596 "PhotoPage.c" +#line 7321 "PhotoPage.c" } #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = gee_iterator_get (_view_it); + _tmp1_ = gee_iterator_get (_view_it); #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view = (DataView*) _tmp3_; + view = (DataView*) _tmp1_; #line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = view; + _tmp2_ = view; #line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = data_view_get_source (_tmp4_); + _tmp3_ = data_view_get_source (_tmp2_); #line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO, Photo); + _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO, Photo); #line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_replace_photo (self, _tmp6_); + editing_host_page_replace_photo (self, _tmp4_); #line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp4_); #line 903 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (view); #line 903 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 6616 "PhotoPage.c" +#line 7341 "PhotoPage.c" } #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_view_it); -#line 6620 "PhotoPage.c" +#line 7345 "PhotoPage.c" } } -void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_enable) { +void +editing_host_page_enable_rotate (EditingHostPage* self, + gboolean should_enable) +{ GtkToolButton* _tmp0_; - gboolean _tmp1_; #line 907 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 908 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->rotate_button; #line 908 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = should_enable; -#line 908 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_); -#line 6636 "PhotoPage.c" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), should_enable); +#line 7361 "PhotoPage.c" } -static void _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched (PixbufCache* _sender, Photo* photo, GdkPixbuf* pixbuf, GError* err, gpointer self) { +static void +_editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched (PixbufCache* _sender, + Photo* photo, + GdkPixbuf* pixbuf, + GError* err, + gpointer self) +{ #line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_pixbuf_fetched ((EditingHostPage*) self, photo, pixbuf, err); -#line 6643 "PhotoPage.c" +#line 7374 "PhotoPage.c" } -static gboolean _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter (Photo* photo, gpointer self) { +static gboolean +_editing_host_page_master_cache_filter_pixbuf_cache_cache_filter (Photo* photo, + gpointer self) +{ gboolean result; result = editing_host_page_master_cache_filter ((EditingHostPage*) self, photo); #line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6652 "PhotoPage.c" +#line 7386 "PhotoPage.c" } -static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar* caller) { +static void +editing_host_page_rebuild_caches (EditingHostPage* self, + const gchar* caller) +{ Scaling scaling = {0}; Scaling _tmp0_ = {0}; gboolean _tmp1_ = FALSE; PixbufCache* _tmp2_; - const gchar* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - PixbufCache* _tmp10_; - SourceCollection* _tmp14_; - Scaling _tmp15_; - PixbufCache* _tmp16_; - PixbufCache* _tmp17_; - SourceCollection* _tmp18_; - Scaling _tmp19_; - PixbufCache* _tmp20_; - const gchar* _tmp21_; + gchar* _tmp6_; + gchar* _tmp7_; + PixbufCache* _tmp8_; + SourceCollection* _tmp12_; + Scaling _tmp13_; + PixbufCache* _tmp14_; + PixbufCache* _tmp15_; + SourceCollection* _tmp16_; + Scaling _tmp17_; + PixbufCache* _tmp18_; #line 914 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 914 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -6685,11 +7420,10 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar _tmp2_ = self->priv->cache; #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_ != NULL) { -#line 6685 "PhotoPage.c" +#line 7420 "PhotoPage.c" PixbufCache* _tmp3_; Scaling _tmp4_ = {0}; Scaling _tmp5_; - gboolean _tmp6_; #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->cache; #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -6697,190 +7431,171 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = scaling; #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = scaling_equals (&_tmp4_, &_tmp5_); -#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = _tmp6_; -#line 6700 "PhotoPage.c" + _tmp1_ = scaling_equals (&_tmp4_, &_tmp5_); +#line 7432 "PhotoPage.c" } else { #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 6704 "PhotoPage.c" +#line 7436 "PhotoPage.c" } #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { #line 919 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 6710 "PhotoPage.c" +#line 7442 "PhotoPage.c" } #line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = caller; + _tmp6_ = scaling_to_string (&scaling); #line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = scaling_to_string (&scaling); -#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_debug ("PhotoPage.vala:921: Rebuild pixbuf caches: %s (%s)", _tmp7_, _tmp9_); + g_debug ("PhotoPage.vala:921: Rebuild pixbuf caches: %s (%s)", caller, _tmp7_); #line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp7_); #line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = self->priv->cache; + _tmp8_ = self->priv->cache; #line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp10_ != NULL) { -#line 6726 "PhotoPage.c" + if (_tmp8_ != NULL) { +#line 7456 "PhotoPage.c" + PixbufCache* _tmp9_; + guint _tmp10_; PixbufCache* _tmp11_; - guint _tmp12_; - PixbufCache* _tmp13_; #line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = self->priv->cache; + _tmp9_ = self->priv->cache; #line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_parse_name ("fetched", TYPE_PIXBUF_CACHE, &_tmp12_, NULL, FALSE); + g_signal_parse_name ("fetched", TYPE_PIXBUF_CACHE, &_tmp10_, NULL, FALSE); #line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched, self); + g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched, self); #line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = self->priv->cache; + _tmp11_ = self->priv->cache; #line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pixbuf_cache_cancel_all (_tmp13_); -#line 6740 "PhotoPage.c" + pixbuf_cache_cancel_all (_tmp11_); +#line 7470 "PhotoPage.c" } #line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = self->priv->sources; + _tmp12_ = self->priv->sources; #line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = scaling; + _tmp13_ = scaling; #line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = pixbuf_cache_new (_tmp14_, PIXBUF_CACHE_PHOTO_TYPE_BASELINE, &_tmp15_, EDITING_HOST_PAGE_PIXBUF_CACHE_COUNT, NULL, NULL); + _tmp14_ = pixbuf_cache_new (_tmp12_, PIXBUF_CACHE_PHOTO_TYPE_BASELINE, &_tmp13_, EDITING_HOST_PAGE_PIXBUF_CACHE_COUNT, NULL, NULL); #line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->cache); #line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->cache = _tmp16_; + self->priv->cache = _tmp14_; #line 931 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = self->priv->cache; + _tmp15_ = self->priv->cache; #line 931 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp17_, "fetched", (GCallback) _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched, self, 0); + g_signal_connect_object (_tmp15_, "fetched", (GCallback) _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched, self, 0); #line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = self->priv->sources; + _tmp16_ = self->priv->sources; #line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = scaling; + _tmp17_ = scaling; #line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = pixbuf_cache_new (_tmp18_, PIXBUF_CACHE_PHOTO_TYPE_MASTER, &_tmp19_, EDITING_HOST_PAGE_ORIGINAL_PIXBUF_CACHE_COUNT, _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter, self); + _tmp18_ = pixbuf_cache_new (_tmp16_, PIXBUF_CACHE_PHOTO_TYPE_MASTER, &_tmp17_, EDITING_HOST_PAGE_ORIGINAL_PIXBUF_CACHE_COUNT, _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter, self); #line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->master_cache); #line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->master_cache = _tmp20_; -#line 936 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = caller; + self->priv->master_cache = _tmp18_; #line 936 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_refresh_caches (self, _tmp21_); -#line 6770 "PhotoPage.c" + editing_host_page_refresh_caches (self, caller); +#line 7498 "PhotoPage.c" } -static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar* caller) { - gboolean _tmp0_; +static void +editing_host_page_refresh_caches (EditingHostPage* self, + const gchar* caller) +{ #line 940 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 940 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (caller != NULL); #line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = editing_host_page_has_photo (self); -#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp0_) { -#line 6784 "PhotoPage.c" - const gchar* _tmp1_; - Photo* _tmp2_; - Photo* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - ViewCollection* _tmp6_; - ViewCollection* _tmp7_; - Photo* _tmp8_; - Photo* _tmp9_; -#line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = caller; + if (editing_host_page_has_photo (self)) { +#line 7512 "PhotoPage.c" + Photo* _tmp0_; + Photo* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; + Photo* _tmp6_; + Photo* _tmp7_; #line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = editing_host_page_get_photo (self); + _tmp0_ = editing_host_page_get_photo (self); #line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); + _tmp2_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); #line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_debug ("PhotoPage.vala:942: Refresh pixbuf caches (%s): prefetching neighbors " \ -"of %s", _tmp1_, _tmp5_); +"of %s", caller, _tmp3_); #line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp3_); #line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = editing_host_page_get_photo (self); + _tmp6_ = editing_host_page_get_photo (self); #line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_prefetch_neighbors (self, _tmp7_, _tmp9_); + editing_host_page_prefetch_neighbors (self, _tmp5_, _tmp7_); #line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp7_); #line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp7_); -#line 6824 "PhotoPage.c" + _data_collection_unref0 (_tmp5_); +#line 7549 "PhotoPage.c" } else { - const gchar* _tmp10_; #line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = caller; -#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_debug ("PhotoPage.vala:946: Refresh pixbuf caches (%s): (no photo)", _tmp10_); -#line 6831 "PhotoPage.c" + g_debug ("PhotoPage.vala:946: Refresh pixbuf caches (%s): (no photo)", caller); +#line 7553 "PhotoPage.c" } } -static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Photo* photo) { +static gboolean +editing_host_page_master_cache_filter (EditingHostPage* self, + Photo* photo) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; - Photo* _tmp1_; - gboolean _tmp2_; #line 950 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); #line 950 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_PHOTO (photo), FALSE); #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = photo; -#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = photo_has_transformations (_tmp1_); -#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp2_) { + if (photo_has_transformations (photo)) { #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 6853 "PhotoPage.c" +#line 7572 "PhotoPage.c" } else { - Photo* _tmp3_; - gboolean _tmp4_; -#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = photo; #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = photo_has_editable (_tmp3_); -#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = _tmp4_; -#line 6863 "PhotoPage.c" + _tmp0_ = photo_has_editable (photo); +#line 7576 "PhotoPage.c" } #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp0_; #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 6869 "PhotoPage.c" +#line 7582 "PhotoPage.c" } -static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* photo, GdkPixbuf* pixbuf, GError* err) { +static void +editing_host_page_on_pixbuf_fetched (EditingHostPage* self, + Photo* photo, + GdkPixbuf* pixbuf, + GError* err) +{ Photo* _tmp0_; Photo* _tmp1_; - Photo* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; - GdkPixbuf* _tmp5_; + gboolean _tmp2_; GError * _inner_error_ = NULL; #line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); @@ -6889,174 +7604,148 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p #line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail ((pixbuf == NULL) || GDK_IS_PIXBUF (pixbuf)); #line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = photo; -#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = editing_host_page_get_photo (self); -#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = _tmp1_; + _tmp0_ = editing_host_page_get_photo (self); #line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource)); + _tmp1_ = _tmp0_; #line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = !_tmp3_; + _tmp2_ = !data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource)); #line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp4_) { + if (_tmp2_) { #line 957 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 6903 "PhotoPage.c" +#line 7614 "PhotoPage.c" } #line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = pixbuf; -#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp5_ != NULL) { -#line 6909 "PhotoPage.c" - gboolean _tmp6_ = FALSE; - ZoomBuffer* _tmp7_; + if (pixbuf != NULL) { +#line 7618 "PhotoPage.c" + gboolean _tmp3_ = FALSE; + ZoomBuffer* _tmp4_; Dimensions max_dim = {0}; - Photo* _tmp15_; - Dimensions _tmp16_ = {0}; - EditingToolsEditingTool* _tmp17_; - GdkPixbuf* _tmp31_; - Dimensions _tmp32_; - Photo* _tmp33_; -#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = self->priv->zoom_buffer; + Dimensions _tmp9_ = {0}; + EditingToolsEditingTool* _tmp10_; + Dimensions _tmp22_; #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp7_ != NULL) { -#line 6923 "PhotoPage.c" - ZoomBuffer* _tmp8_; - Photo* _tmp9_; - Photo* _tmp10_; - Photo* _tmp11_; + _tmp4_ = self->priv->zoom_buffer; #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = self->priv->zoom_buffer; + if (_tmp4_ != NULL) { +#line 7629 "PhotoPage.c" + ZoomBuffer* _tmp5_; + Photo* _tmp6_; + Photo* _tmp7_; #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = zoom_buffer_get_backing_photo (_tmp8_); + _tmp5_ = self->priv->zoom_buffer; #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp9_; + _tmp6_ = zoom_buffer_get_backing_photo (_tmp5_); #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = photo; + _tmp7_ = _tmp6_; #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _tmp10_ == _tmp11_; + _tmp3_ = _tmp7_ == photo; #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp10_); -#line 6940 "PhotoPage.c" + _g_object_unref0 (_tmp7_); +#line 7643 "PhotoPage.c" } else { #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = FALSE; -#line 6944 "PhotoPage.c" + _tmp3_ = FALSE; +#line 7647 "PhotoPage.c" } #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp6_) { -#line 6948 "PhotoPage.c" - Photo* _tmp12_; - GdkPixbuf* _tmp13_; - ZoomBuffer* _tmp14_; -#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = photo; -#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = pixbuf; + if (_tmp3_) { +#line 7651 "PhotoPage.c" + ZoomBuffer* _tmp8_; #line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp12_, _tmp13_); + _tmp8_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), photo, pixbuf); #line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->zoom_buffer); #line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->zoom_buffer = _tmp14_; -#line 6962 "PhotoPage.c" + self->priv->zoom_buffer = _tmp8_; +#line 7659 "PhotoPage.c" } #line 966 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = photo; -#line 966 "/home/jens/Source/shotwell/src/PhotoPage.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp16_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp9_); #line 966 "/home/jens/Source/shotwell/src/PhotoPage.vala" - max_dim = _tmp16_; + max_dim = _tmp9_; #line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = self->priv->current_tool; + _tmp10_ = self->priv->current_tool; #line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp17_ != NULL) { -#line 6974 "PhotoPage.c" + if (_tmp10_ != NULL) { +#line 7669 "PhotoPage.c" { Dimensions tool_pixbuf_dim = {0}; GdkPixbuf* tool_pixbuf = NULL; - EditingToolsEditingTool* _tmp18_; - Scaling _tmp19_ = {0}; - Photo* _tmp20_; - Dimensions _tmp21_ = {0}; - GdkPixbuf* _tmp22_; - GdkPixbuf* _tmp23_; -#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = self->priv->current_tool; + EditingToolsEditingTool* _tmp11_; + Scaling _tmp12_ = {0}; + Dimensions _tmp13_ = {0}; + GdkPixbuf* _tmp14_; + GdkPixbuf* _tmp15_; #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp19_); + _tmp11_ = self->priv->current_tool; #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = photo; + single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp12_); #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = editing_tools_editing_tool_get_display_pixbuf (_tmp18_, &_tmp19_, _tmp20_, &_tmp21_, &_inner_error_); + _tmp14_ = editing_tools_editing_tool_get_display_pixbuf (_tmp11_, &_tmp12_, photo, &_tmp13_, &_inner_error_); #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala" - tool_pixbuf_dim = _tmp21_; + tool_pixbuf_dim = _tmp13_; #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala" - tool_pixbuf = _tmp22_; + tool_pixbuf = _tmp14_; #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6998 "PhotoPage.c" +#line 7690 "PhotoPage.c" goto __catch256_g_error; } #line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = tool_pixbuf; + _tmp15_ = tool_pixbuf; #line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp23_ != NULL) { -#line 7005 "PhotoPage.c" - GdkPixbuf* _tmp24_; - Dimensions _tmp25_; + if (_tmp15_ != NULL) { +#line 7697 "PhotoPage.c" + GdkPixbuf* _tmp16_; + Dimensions _tmp17_; #line 974 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = tool_pixbuf; + _tmp16_ = tool_pixbuf; #line 974 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pixbuf = _tmp24_; + pixbuf = _tmp16_; #line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = tool_pixbuf_dim; + _tmp17_ = tool_pixbuf_dim; #line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala" - max_dim = _tmp25_; -#line 7016 "PhotoPage.c" + max_dim = _tmp17_; +#line 7708 "PhotoPage.c" } #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (tool_pixbuf); -#line 7020 "PhotoPage.c" +#line 7712 "PhotoPage.c" } goto __finally256; __catch256_g_error: { GError* err = NULL; - Photo* _tmp26_; - gchar* _tmp27_; - gchar* _tmp28_; - GError* _tmp29_; - const gchar* _tmp30_; + gchar* _tmp18_; + gchar* _tmp19_; + GError* _tmp20_; + const gchar* _tmp21_; #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala" err = _inner_error_; #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala" _inner_error_ = NULL; #line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp26_ = photo; + _tmp18_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_OBJECT, DataObject)); #line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_OBJECT, DataObject)); + _tmp19_ = _tmp18_; #line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = _tmp27_; + _tmp20_ = err; #line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = err; + _tmp21_ = _tmp20_->message; #line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_ = _tmp29_->message; + g_warning ("PhotoPage.vala:978: Unable to fetch tool pixbuf for %s: %s", _tmp19_, _tmp21_); #line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_warning ("PhotoPage.vala:978: Unable to fetch tool pixbuf for %s: %s", _tmp28_, _tmp30_); -#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_free0 (_tmp28_); + _g_free0 (_tmp19_); #line 979 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_set_photo_missing (self, TRUE); #line 981 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); #line 981 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 7055 "PhotoPage.c" +#line 7744 "PhotoPage.c" } __finally256: #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -7067,68 +7756,57 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p g_clear_error (&_inner_error_); #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 7066 "PhotoPage.c" +#line 7755 "PhotoPage.c" } } #line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp31_ = pixbuf; + _tmp22_ = max_dim; #line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp32_ = max_dim; -#line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp31_, &_tmp32_, NULL); + single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), pixbuf, &_tmp22_, NULL); #line 986 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->pixbuf_dirty = FALSE; #line 988 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp33_ = photo; -#line 988 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_notify_photo_backing_missing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PHOTO, Photo), FALSE); -#line 7081 "PhotoPage.c" + editing_host_page_notify_photo_backing_missing (self, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo), FALSE); +#line 7766 "PhotoPage.c" } else { - GError* _tmp34_; #line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp34_ = err; -#line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp34_ != NULL) { -#line 7088 "PhotoPage.c" - Photo* _tmp35_; + if (err != NULL) { #line 992 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_set_photo_missing (self, TRUE); #line 995 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp35_ = photo; -#line 995 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_notify_photo_backing_missing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo), TRUE); -#line 7096 "PhotoPage.c" + editing_host_page_notify_photo_backing_missing (self, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo), TRUE); +#line 7774 "PhotoPage.c" } } } -static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCollection* controller, Photo* photo) { +static void +editing_host_page_prefetch_neighbors (EditingHostPage* self, + ViewCollection* controller, + Photo* photo) +{ PixbufCachePixbufCacheBatch* normal_batch = NULL; PixbufCachePixbufCacheBatch* _tmp0_; PixbufCachePixbufCacheBatch* master_batch = NULL; PixbufCachePixbufCacheBatch* _tmp1_; PixbufCachePixbufCacheBatch* _tmp2_; - Photo* _tmp3_; - PixbufCachePixbufCacheBatch* _tmp4_; - Photo* _tmp5_; + PixbufCachePixbufCacheBatch* _tmp3_; DataSource* next_source = NULL; DataSource* prev_source = NULL; - ViewCollection* _tmp6_; - Photo* _tmp7_; - DataSource* _tmp8_ = NULL; - DataSource* _tmp9_ = NULL; - gboolean _tmp10_; + DataSource* _tmp4_ = NULL; + DataSource* _tmp5_ = NULL; + gboolean _tmp6_; Photo* next = NULL; - DataSource* _tmp11_; - Photo* _tmp12_; + DataSource* _tmp7_; + Photo* _tmp8_; Photo* prev = NULL; - DataSource* _tmp13_; - Photo* _tmp14_; - PixbufCache* _tmp39_; - PixbufCachePixbufCacheBatch* _tmp40_; - PixbufCache* _tmp41_; - PixbufCachePixbufCacheBatch* _tmp42_; + DataSource* _tmp9_; + Photo* _tmp10_; + PixbufCache* _tmp30_; + PixbufCachePixbufCacheBatch* _tmp31_; + PixbufCache* _tmp32_; + PixbufCachePixbufCacheBatch* _tmp33_; #line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -7146,31 +7824,23 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol #line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = normal_batch; #line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = photo; -#line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_HIGHEST), _tmp3_); -#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = master_batch; + gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_HIGHEST), photo); #line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = photo; + _tmp3_ = master_batch; #line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_LOW), _tmp5_); + gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_LOW), photo); #line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = controller; -#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = photo; -#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = view_collection_get_immediate_neighbors (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource), &_tmp8_, &_tmp9_, PHOTO_TYPENAME); + _tmp6_ = view_collection_get_immediate_neighbors (controller, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_SOURCE, DataSource), &_tmp4_, &_tmp5_, PHOTO_TYPENAME); #line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (next_source); #line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala" - next_source = _tmp8_; + next_source = _tmp4_; #line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (prev_source); #line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala" - prev_source = _tmp9_; + prev_source = _tmp5_; #line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp10_) { + if (!_tmp6_) { #line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (prev_source); #line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -7181,157 +7851,142 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol _g_object_unref0 (normal_batch); #line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 7180 "PhotoPage.c" +#line 7850 "PhotoPage.c" } #line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = next_source; + _tmp7_ = next_source; #line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO, Photo)); + _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO, Photo)); #line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala" - next = _tmp12_; + next = _tmp8_; #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = prev_source; + _tmp9_ = prev_source; #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO, Photo)); + _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo)); #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala" - prev = _tmp14_; -#line 7194 "PhotoPage.c" + prev = _tmp10_; +#line 7864 "PhotoPage.c" { GeeIterator* _neighbor_source_it = NULL; - ViewCollection* _tmp15_; - Photo* _tmp16_; - GeeSet* _tmp17_; - GeeSet* _tmp18_; - GeeIterator* _tmp19_; - GeeIterator* _tmp20_; -#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = controller; + GeeSet* _tmp11_; + GeeSet* _tmp12_; + GeeIterator* _tmp13_; + GeeIterator* _tmp14_; #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = photo; + _tmp11_ = view_collection_get_extended_neighbors (controller, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME); #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = view_collection_get_extended_neighbors (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME); -#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = _tmp17_; + _tmp12_ = _tmp11_; #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = _tmp19_; + _tmp14_ = _tmp13_; #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp12_); #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _neighbor_source_it = _tmp20_; + _neighbor_source_it = _tmp14_; #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" while (TRUE) { -#line 7221 "PhotoPage.c" - GeeIterator* _tmp21_; - gboolean _tmp22_; +#line 7885 "PhotoPage.c" + GeeIterator* _tmp15_; DataSource* neighbor_source = NULL; - GeeIterator* _tmp23_; - gpointer _tmp24_; + GeeIterator* _tmp16_; + gpointer _tmp17_; Photo* neighbor = NULL; - DataSource* _tmp25_; - Photo* _tmp26_; + DataSource* _tmp18_; + Photo* _tmp19_; BackgroundJobJobPriority priority = 0; - gboolean _tmp27_ = FALSE; - Photo* _tmp28_; + gboolean _tmp20_ = FALSE; + Photo* _tmp21_; + Photo* _tmp22_; + PixbufCachePixbufCacheBatch* _tmp25_; + BackgroundJobJobPriority _tmp26_; + Photo* _tmp27_; + PixbufCachePixbufCacheBatch* _tmp28_; Photo* _tmp29_; - gboolean _tmp30_; - PixbufCachePixbufCacheBatch* _tmp34_; - BackgroundJobJobPriority _tmp35_; - Photo* _tmp36_; - PixbufCachePixbufCacheBatch* _tmp37_; - Photo* _tmp38_; #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = _neighbor_source_it; + _tmp15_ = _neighbor_source_it; #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = gee_iterator_next (_tmp21_); -#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp22_) { + if (!gee_iterator_next (_tmp15_)) { #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 7248 "PhotoPage.c" +#line 7908 "PhotoPage.c" } #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = _neighbor_source_it; + _tmp16_ = _neighbor_source_it; #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = gee_iterator_get (_tmp23_); + _tmp17_ = gee_iterator_get (_tmp16_); #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - neighbor_source = (DataSource*) _tmp24_; + neighbor_source = (DataSource*) _tmp17_; #line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = neighbor_source; + _tmp18_ = neighbor_source; #line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO, Photo)); + _tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo)); #line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala" - neighbor = _tmp26_; + neighbor = _tmp19_; #line 1017 "/home/jens/Source/shotwell/src/PhotoPage.vala" priority = BACKGROUND_JOB_JOB_PRIORITY_NORMAL; #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = neighbor; -#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = next; + _tmp21_ = neighbor; #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_SOURCE, DataSource)); + _tmp22_ = next; #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp30_) { + if (data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_SOURCE, DataSource))) { #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = TRUE; -#line 7274 "PhotoPage.c" + _tmp20_ = TRUE; +#line 7932 "PhotoPage.c" } else { - Photo* _tmp31_; - Photo* _tmp32_; - gboolean _tmp33_; -#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp31_ = neighbor; + Photo* _tmp23_; + Photo* _tmp24_; #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp32_ = prev; + _tmp23_ = neighbor; #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp33_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_SOURCE, DataSource)); + _tmp24_ = prev; #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = _tmp33_; -#line 7287 "PhotoPage.c" + _tmp20_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_SOURCE, DataSource)); +#line 7942 "PhotoPage.c" } #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp27_) { + if (_tmp20_) { #line 1019 "/home/jens/Source/shotwell/src/PhotoPage.vala" priority = BACKGROUND_JOB_JOB_PRIORITY_HIGH; -#line 7293 "PhotoPage.c" +#line 7948 "PhotoPage.c" } #line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp34_ = normal_batch; + _tmp25_ = normal_batch; #line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp35_ = priority; + _tmp26_ = priority; #line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp36_ = neighbor; + _tmp27_ = neighbor; #line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) _tmp35_), _tmp36_); + gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) _tmp26_), _tmp27_); #line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp37_ = master_batch; + _tmp28_ = master_batch; #line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp38_ = neighbor; + _tmp29_ = neighbor; #line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_LOWEST), _tmp38_); + gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_LOWEST), _tmp29_); #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (neighbor); #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (neighbor_source); -#line 7313 "PhotoPage.c" +#line 7968 "PhotoPage.c" } #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_neighbor_source_it); -#line 7317 "PhotoPage.c" +#line 7972 "PhotoPage.c" } #line 1025 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp39_ = self->priv->cache; + _tmp30_ = self->priv->cache; #line 1025 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp40_ = normal_batch; + _tmp31_ = normal_batch; #line 1025 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pixbuf_cache_prefetch_batch (_tmp39_, _tmp40_, FALSE); + pixbuf_cache_prefetch_batch (_tmp30_, _tmp31_, FALSE); #line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp41_ = self->priv->master_cache; + _tmp32_ = self->priv->master_cache; #line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp42_ = master_batch; + _tmp33_ = master_batch; #line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pixbuf_cache_prefetch_batch (_tmp41_, _tmp42_, FALSE); + pixbuf_cache_prefetch_batch (_tmp32_, _tmp33_, FALSE); #line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (prev); #line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -7344,23 +7999,23 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol _g_object_unref0 (master_batch); #line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (normal_batch); -#line 7343 "PhotoPage.c" +#line 7998 "PhotoPage.c" } -static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, ViewCollection* old_controller, Photo* old_photo, ViewCollection* new_controller, Photo* new_photo) { +static void +editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, + ViewCollection* old_controller, + Photo* old_photo, + ViewCollection* new_controller, + Photo* new_photo) +{ GeeSet* old_neighbors = NULL; - ViewCollection* _tmp0_; - Photo* _tmp1_; - GeeSet* _tmp2_; + GeeSet* _tmp0_; GeeSet* new_neighbors = NULL; - ViewCollection* _tmp3_; - Photo* _tmp4_; - GeeSet* _tmp5_; - gboolean _tmp23_ = FALSE; - GeeSet* _tmp24_; - Photo* _tmp25_; - gboolean _tmp26_; + GeeSet* _tmp1_; + gboolean _tmp15_ = FALSE; + GeeSet* _tmp16_; #line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -7372,243 +8027,212 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, #line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (new_photo)); #line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = old_controller; -#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = old_photo; + _tmp0_ = view_collection_get_extended_neighbors (old_controller, G_TYPE_CHECK_INSTANCE_CAST (old_photo, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME); #line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = view_collection_get_extended_neighbors (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME); -#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala" - old_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_SET, GeeSet); -#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = new_controller; + old_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet); #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = new_photo; + _tmp1_ = view_collection_get_extended_neighbors (new_controller, G_TYPE_CHECK_INSTANCE_CAST (new_photo, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME); #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = view_collection_get_extended_neighbors (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME); -#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala" - new_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_SET, GeeSet); -#line 7386 "PhotoPage.c" + new_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SET, GeeSet); +#line 8033 "PhotoPage.c" { GeeIterator* _old_neighbor_it = NULL; - GeeSet* _tmp6_; - GeeIterator* _tmp7_; + GeeSet* _tmp2_; + GeeIterator* _tmp3_; #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = old_neighbors; + _tmp2_ = old_neighbors; #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _old_neighbor_it = _tmp7_; + _old_neighbor_it = _tmp3_; #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" while (TRUE) { -#line 7399 "PhotoPage.c" - GeeIterator* _tmp8_; - gboolean _tmp9_; +#line 8046 "PhotoPage.c" + GeeIterator* _tmp4_; Photo* old_neighbor = NULL; - GeeIterator* _tmp10_; - gpointer _tmp11_; - gboolean _tmp12_ = FALSE; - GeeSet* _tmp13_; - Photo* _tmp14_; - gboolean _tmp15_; -#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _old_neighbor_it; + GeeIterator* _tmp5_; + gpointer _tmp6_; + gboolean _tmp7_ = FALSE; + GeeSet* _tmp8_; + Photo* _tmp9_; #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = gee_iterator_next (_tmp8_); + _tmp4_ = _old_neighbor_it; #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp9_) { + if (!gee_iterator_next (_tmp4_)) { #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 7417 "PhotoPage.c" +#line 8060 "PhotoPage.c" } #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _old_neighbor_it; + _tmp5_ = _old_neighbor_it; #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = gee_iterator_get (_tmp10_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" - old_neighbor = (Photo*) _tmp11_; + old_neighbor = (Photo*) _tmp6_; #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = new_neighbors; + _tmp8_ = new_neighbors; #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = old_neighbor; + _tmp9_ = old_neighbor; #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_); + if (!gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp9_)) { +#line 8074 "PhotoPage.c" + Photo* _tmp10_; #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp15_) { -#line 7433 "PhotoPage.c" - Photo* _tmp16_; - Photo* _tmp17_; - gboolean _tmp18_; + _tmp10_ = old_neighbor; #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = new_photo; -#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = old_neighbor; -#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource)); -#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = !_tmp18_; -#line 7445 "PhotoPage.c" + _tmp7_ = !data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (new_photo, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_SOURCE, DataSource)); +#line 8080 "PhotoPage.c" } else { #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = FALSE; -#line 7449 "PhotoPage.c" + _tmp7_ = FALSE; +#line 8084 "PhotoPage.c" } #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp12_) { -#line 7453 "PhotoPage.c" - PixbufCache* _tmp19_; - Photo* _tmp20_; - PixbufCache* _tmp21_; - Photo* _tmp22_; + if (_tmp7_) { +#line 8088 "PhotoPage.c" + PixbufCache* _tmp11_; + Photo* _tmp12_; + PixbufCache* _tmp13_; + Photo* _tmp14_; #line 1042 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = self->priv->cache; + _tmp11_ = self->priv->cache; #line 1042 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = old_neighbor; + _tmp12_ = old_neighbor; #line 1042 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pixbuf_cache_drop (_tmp19_, _tmp20_); + pixbuf_cache_drop (_tmp11_, _tmp12_); #line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = self->priv->master_cache; + _tmp13_ = self->priv->master_cache; #line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = old_neighbor; + _tmp14_ = old_neighbor; #line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pixbuf_cache_drop (_tmp21_, _tmp22_); -#line 7470 "PhotoPage.c" + pixbuf_cache_drop (_tmp13_, _tmp14_); +#line 8105 "PhotoPage.c" } #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (old_neighbor); -#line 7474 "PhotoPage.c" +#line 8109 "PhotoPage.c" } #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_old_neighbor_it); -#line 7478 "PhotoPage.c" +#line 8113 "PhotoPage.c" } #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = new_neighbors; + _tmp16_ = new_neighbors; #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = old_photo; -#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp26_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_); -#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp26_) { -#line 7488 "PhotoPage.c" - Photo* _tmp27_; - Photo* _tmp28_; - gboolean _tmp29_; + if (!gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), old_photo)) { #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = new_photo; -#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = old_photo; -#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_SOURCE, DataSource)); -#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = !_tmp29_; -#line 7500 "PhotoPage.c" + _tmp15_ = !data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (new_photo, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (old_photo, TYPE_DATA_SOURCE, DataSource)); +#line 8121 "PhotoPage.c" } else { #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = FALSE; -#line 7504 "PhotoPage.c" + _tmp15_ = FALSE; +#line 8125 "PhotoPage.c" } #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp23_) { -#line 7508 "PhotoPage.c" - PixbufCache* _tmp30_; - Photo* _tmp31_; - PixbufCache* _tmp32_; - Photo* _tmp33_; -#line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_ = self->priv->cache; + if (_tmp15_) { +#line 8129 "PhotoPage.c" + PixbufCache* _tmp17_; + PixbufCache* _tmp18_; #line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp31_ = old_photo; + _tmp17_ = self->priv->cache; #line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pixbuf_cache_drop (_tmp30_, _tmp31_); -#line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp32_ = self->priv->master_cache; + pixbuf_cache_drop (_tmp17_, old_photo); #line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp33_ = old_photo; + _tmp18_ = self->priv->master_cache; #line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pixbuf_cache_drop (_tmp32_, _tmp33_); -#line 7525 "PhotoPage.c" + pixbuf_cache_drop (_tmp18_, old_photo); +#line 8140 "PhotoPage.c" } #line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (new_neighbors); #line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (old_neighbors); -#line 7531 "PhotoPage.c" +#line 8146 "PhotoPage.c" } -static DataView* editing_host_page_real_create_photo_view (EditingHostPage* self, DataSource* source) { +static DataView* +editing_host_page_real_create_photo_view (EditingHostPage* self, + DataSource* source) +{ DataView* result = NULL; - DataSource* _tmp0_; - PhotoView* _tmp1_; + PhotoView* _tmp0_; #line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = source; -#line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = photo_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_SOURCE, PhotoSource)); + _tmp0_ = photo_view_new (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_PHOTO_SOURCE, PhotoSource)); #line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView); #line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 7549 "PhotoPage.c" +#line 8164 "PhotoPage.c" } -DataView* editing_host_page_create_photo_view (EditingHostPage* self, DataSource* source) { +DataView* +editing_host_page_create_photo_view (EditingHostPage* self, + DataSource* source) +{ #line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); #line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->create_photo_view (self, source); -#line 7558 "PhotoPage.c" +#line 8176 "PhotoPage.c" } -static gboolean editing_host_page_is_photo (EditingHostPage* self, DataSource* source) { +static gboolean +editing_host_page_is_photo (EditingHostPage* self, + DataSource* source) +{ gboolean result = FALSE; - DataSource* _tmp0_; #line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); #line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = source; -#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO_SOURCE); + result = G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_PHOTO_SOURCE); #line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 7575 "PhotoPage.c" +#line 8193 "PhotoPage.c" } -static DataView* _editing_host_page_create_photo_view_create_view (DataSource* source, gpointer self) { +static DataView* +_editing_host_page_create_photo_view_create_view (DataSource* source, + gpointer self) +{ DataView* result; result = editing_host_page_create_photo_view ((EditingHostPage*) self, source); #line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 7584 "PhotoPage.c" +#line 8205 "PhotoPage.c" } -static gboolean _editing_host_page_is_photo_create_view_predicate (DataSource* source, gpointer self) { +static gboolean +_editing_host_page_is_photo_create_view_predicate (DataSource* source, + gpointer self) +{ gboolean result; result = editing_host_page_is_photo ((EditingHostPage*) self, source); #line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 7593 "PhotoPage.c" +#line 8217 "PhotoPage.c" } -void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* controller, Photo* starting_photo) { - ViewCollection* _tmp0_; - Photo* _tmp1_; - DataView* _tmp2_; - DataView* _tmp3_; - gboolean _tmp4_ = FALSE; - ViewCollection* _tmp5_; - ViewCollection* _tmp6_; - ViewCollection* _tmp7_; - gboolean _tmp8_; - Photo* _tmp18_; +void +editing_host_page_display_copy_of (EditingHostPage* self, + ViewCollection* controller, + Photo* starting_photo) +{ + DataView* _tmp0_; + DataView* _tmp1_; + gboolean _tmp2_ = FALSE; + ViewCollection* _tmp3_; + ViewCollection* _tmp4_; + gboolean _tmp5_; #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -7616,101 +8240,84 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (starting_photo)); #line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = controller; -#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = starting_photo; + _tmp0_ = view_collection_get_view_for_source (controller, G_TYPE_CHECK_INSTANCE_CAST (starting_photo, TYPE_DATA_SOURCE, DataSource)); #line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = view_collection_get_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource)); -#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_assert (_tmp3_ != NULL, "controller.get_view_for_source(starting_photo) != null"); + _vala_assert (_tmp1_ != NULL, "controller.get_view_for_source(starting_photo) != null"); #line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp3_); -#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = controller; -#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _g_object_unref0 (_tmp1_); #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = _tmp6_; + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp5_ != _tmp7_; + _tmp4_ = _tmp3_; #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp7_); + _tmp5_ = controller != _tmp4_; #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp8_) { -#line 7638 "PhotoPage.c" - ViewCollection* _tmp9_; - ViewCollection* _tmp10_; + _data_collection_unref0 (_tmp4_); #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = controller; + if (_tmp5_) { +#line 8256 "PhotoPage.c" + ViewCollection* _tmp6_; #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = self->priv->parent_view; + _tmp6_ = self->priv->parent_view; #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp9_ != _tmp10_; -#line 7647 "PhotoPage.c" + _tmp2_ = controller != _tmp6_; +#line 8262 "PhotoPage.c" } else { #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = FALSE; -#line 7651 "PhotoPage.c" + _tmp2_ = FALSE; +#line 8266 "PhotoPage.c" } #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp4_) { -#line 7655 "PhotoPage.c" + if (_tmp2_) { +#line 8270 "PhotoPage.c" + ViewCollection* _tmp7_; + ViewCollection* _tmp8_; + ViewCollection* _tmp9_; + ViewCollection* _tmp10_; ViewCollection* _tmp11_; - ViewCollection* _tmp12_; - ViewCollection* _tmp13_; - ViewCollection* _tmp14_; - ViewCollection* _tmp15_; - ViewCollection* _tmp16_; - ViewCollection* _tmp17_; #line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala" - data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection)); #line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp12_); -#line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _data_collection_unref0 (_tmp8_); #line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = _tmp13_; + _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = controller; + _tmp10_ = _tmp9_; #line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view_collection_copy_into (_tmp14_, _tmp15_, _editing_host_page_create_photo_view_create_view, self, _editing_host_page_is_photo_create_view_predicate, self); + view_collection_copy_into (_tmp10_, controller, _editing_host_page_create_photo_view_create_view, self, _editing_host_page_is_photo_create_view_predicate, self); #line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp14_); -#line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = controller; + _data_collection_unref0 (_tmp10_); #line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = _data_collection_ref0 (_tmp16_); + _tmp11_ = _data_collection_ref0 (controller); #line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (self->priv->parent_view); #line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->parent_view = _tmp17_; -#line 7689 "PhotoPage.c" + self->priv->parent_view = _tmp11_; +#line 8298 "PhotoPage.c" } #line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = starting_photo; -#line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_replace_photo (self, _tmp18_); -#line 7695 "PhotoPage.c" + editing_host_page_replace_photo (self, starting_photo); +#line 8302 "PhotoPage.c" } -void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection* controller, Photo* starting_photo) { - ViewCollection* _tmp0_; - Photo* _tmp1_; - DataView* _tmp2_; - DataView* _tmp3_; - gboolean _tmp4_ = FALSE; - ViewCollection* _tmp5_; - ViewCollection* _tmp6_; - ViewCollection* _tmp7_; - gboolean _tmp8_; - Photo* _tmp18_; +void +editing_host_page_display_mirror_of (EditingHostPage* self, + ViewCollection* controller, + Photo* starting_photo) +{ + DataView* _tmp0_; + DataView* _tmp1_; + gboolean _tmp2_ = FALSE; + ViewCollection* _tmp3_; + ViewCollection* _tmp4_; + gboolean _tmp5_; #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -7718,419 +8325,401 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection* #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (starting_photo)); #line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = controller; + _tmp0_ = view_collection_get_view_for_source (controller, G_TYPE_CHECK_INSTANCE_CAST (starting_photo, TYPE_DATA_SOURCE, DataSource)); #line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = starting_photo; -#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = view_collection_get_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource)); -#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_assert (_tmp3_ != NULL, "controller.get_view_for_source(starting_photo) != null"); + _vala_assert (_tmp1_ != NULL, "controller.get_view_for_source(starting_photo) != null"); #line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp3_); -#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = controller; -#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _g_object_unref0 (_tmp1_); #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = _tmp6_; + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp5_ != _tmp7_; + _tmp4_ = _tmp3_; #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp7_); + _tmp5_ = controller != _tmp4_; #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp8_) { -#line 7740 "PhotoPage.c" - ViewCollection* _tmp9_; - ViewCollection* _tmp10_; + _data_collection_unref0 (_tmp4_); #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = controller; + if (_tmp5_) { +#line 8341 "PhotoPage.c" + ViewCollection* _tmp6_; #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = self->priv->parent_view; + _tmp6_ = self->priv->parent_view; #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp9_ != _tmp10_; -#line 7749 "PhotoPage.c" + _tmp2_ = controller != _tmp6_; +#line 8347 "PhotoPage.c" } else { #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = FALSE; -#line 7753 "PhotoPage.c" + _tmp2_ = FALSE; +#line 8351 "PhotoPage.c" } #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp4_) { -#line 7757 "PhotoPage.c" + if (_tmp2_) { +#line 8355 "PhotoPage.c" + ViewCollection* _tmp7_; + ViewCollection* _tmp8_; + ViewCollection* _tmp9_; + ViewCollection* _tmp10_; ViewCollection* _tmp11_; - ViewCollection* _tmp12_; - ViewCollection* _tmp13_; - ViewCollection* _tmp14_; - ViewCollection* _tmp15_; - ViewCollection* _tmp16_; - ViewCollection* _tmp17_; #line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala" - data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection)); #line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp12_); -#line 1079 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _data_collection_unref0 (_tmp8_); #line 1079 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = _tmp13_; + _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1079 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = controller; + _tmp10_ = _tmp9_; #line 1079 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view_collection_mirror (_tmp14_, _tmp15_, _editing_host_page_create_photo_view_create_view, self, _editing_host_page_is_photo_create_view_predicate, self); + view_collection_mirror (_tmp10_, controller, _editing_host_page_create_photo_view_create_view, self, _editing_host_page_is_photo_create_view_predicate, self); #line 1079 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp14_); -#line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = controller; + _data_collection_unref0 (_tmp10_); #line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = _data_collection_ref0 (_tmp16_); + _tmp11_ = _data_collection_ref0 (controller); #line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (self->priv->parent_view); #line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->parent_view = _tmp17_; -#line 7791 "PhotoPage.c" + self->priv->parent_view = _tmp11_; +#line 8383 "PhotoPage.c" } #line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = starting_photo; -#line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_replace_photo (self, _tmp18_); -#line 7797 "PhotoPage.c" + editing_host_page_replace_photo (self, starting_photo); +#line 8387 "PhotoPage.c" } -static void editing_host_page_real_update_ui (EditingHostPage* self, gboolean missing) { +static void +editing_host_page_real_update_ui (EditingHostPage* self, + gboolean missing) +{ gboolean sensitivity = FALSE; - gboolean _tmp0_; - GtkToolButton* _tmp1_; + GtkToolButton* _tmp0_; + GtkToggleToolButton* _tmp1_; GtkToggleToolButton* _tmp2_; GtkToggleToolButton* _tmp3_; GtkToggleToolButton* _tmp4_; - GtkToggleToolButton* _tmp5_; - GtkToolButton* _tmp6_; - GtkScale* _tmp7_; - Dimensions _tmp8_ = {0}; -#line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = missing; + GtkToolButton* _tmp5_; + GtkScale* _tmp6_; + Dimensions _tmp7_ = {0}; #line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala" - sensitivity = !_tmp0_; + sensitivity = !missing; #line 1089 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = self->priv->rotate_button; + _tmp0_ = self->priv->rotate_button; #line 1089 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), sensitivity); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), sensitivity); #line 1090 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = self->priv->crop_button; + _tmp1_ = self->priv->crop_button; #line 1090 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), sensitivity); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), sensitivity); #line 1091 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = self->priv->straighten_button; + _tmp2_ = self->priv->straighten_button; #line 1091 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), sensitivity); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), sensitivity); #line 1092 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = self->priv->redeye_button; + _tmp3_ = self->priv->redeye_button; #line 1092 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), sensitivity); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), sensitivity); #line 1093 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = self->priv->adjust_button; + _tmp4_ = self->priv->adjust_button; #line 1093 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), sensitivity); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), sensitivity); #line 1094 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = self->priv->enhance_button; + _tmp5_ = self->priv->enhance_button; #line 1094 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), sensitivity); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), sensitivity); #line 1095 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = self->priv->zoom_slider; + _tmp6_ = self->priv->zoom_slider; #line 1095 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), sensitivity); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), sensitivity); #line 1097 "/home/jens/Source/shotwell/src/PhotoPage.vala" - dimensions_init (&_tmp8_, 0, 0); + dimensions_init (&_tmp7_, 0, 0); #line 1097 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp8_, FALSE); -#line 7848 "PhotoPage.c" + editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp7_, FALSE); +#line 8438 "PhotoPage.c" } -void editing_host_page_update_ui (EditingHostPage* self, gboolean missing) { +void +editing_host_page_update_ui (EditingHostPage* self, + gboolean missing) +{ #line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_GET_CLASS (self)->update_ui (self, missing); -#line 7857 "PhotoPage.c" +#line 8450 "PhotoPage.c" } -static void editing_host_page_real_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing) { +static void +editing_host_page_real_notify_photo_backing_missing (EditingHostPage* self, + Photo* photo, + gboolean missing) +{ #line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (photo)); -#line 7864 "PhotoPage.c" +#line 8461 "PhotoPage.c" } -void editing_host_page_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing) { +void +editing_host_page_notify_photo_backing_missing (EditingHostPage* self, + Photo* photo, + gboolean missing) +{ #line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_HOST_PAGE_GET_CLASS (self)->notify_photo_backing_missing (self, photo, missing); -#line 7873 "PhotoPage.c" +#line 8474 "PhotoPage.c" } -static void editing_host_page_draw_message (EditingHostPage* self, const gchar* message) { +static void +editing_host_page_draw_message (EditingHostPage* self, + const gchar* message) +{ PangoLayout* pango_layout = NULL; - const gchar* _tmp0_; - PangoLayout* _tmp1_; + PangoLayout* _tmp0_; gint text_width = 0; gint text_height = 0; - PangoLayout* _tmp2_; + PangoLayout* _tmp1_; + gint _tmp2_ = 0; gint _tmp3_ = 0; - gint _tmp4_ = 0; GtkAllocation allocation = {0}; - GtkAllocation _tmp5_ = {0}; + GtkAllocation _tmp4_ = {0}; gint x = 0; - GtkAllocation _tmp6_; + GtkAllocation _tmp5_; + gint _tmp6_; gint _tmp7_; - gint _tmp8_; - gint _tmp9_ = 0; - gint _tmp10_; + gint _tmp8_ = 0; + gint _tmp9_; gint y = 0; - GtkAllocation _tmp12_; + GtkAllocation _tmp11_; + gint _tmp12_; gint _tmp13_; - gint _tmp14_; - gint _tmp15_ = 0; - gint _tmp16_; - PangoLayout* _tmp18_; + gint _tmp14_ = 0; + gint _tmp15_; + PangoLayout* _tmp17_; + gint _tmp18_; gint _tmp19_; - gint _tmp20_; #line 1104 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1104 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (message != NULL); #line 1106 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = message; + _tmp0_ = gtk_widget_create_pango_layout (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), message); #line 1106 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = gtk_widget_create_pango_layout (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_); -#line 1106 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pango_layout = _tmp1_; + pango_layout = _tmp0_; #line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = pango_layout; + _tmp1_ = pango_layout; #line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pango_layout_get_pixel_size (_tmp2_, &_tmp3_, &_tmp4_); + pango_layout_get_pixel_size (_tmp1_, &_tmp2_, &_tmp3_); #line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala" - text_width = _tmp3_; + text_width = _tmp2_; #line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala" - text_height = _tmp4_; + text_height = _tmp3_; #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp5_); + gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp4_); #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala" - allocation = _tmp5_; + allocation = _tmp4_; #line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = allocation; + _tmp5_ = allocation; #line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = _tmp6_.width; + _tmp6_ = _tmp5_.width; #line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = text_width; + _tmp7_ = text_width; #line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala" - x = _tmp7_ - _tmp8_; + x = _tmp6_ - _tmp7_; #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = x; + _tmp9_ = x; #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp10_ > 0) { -#line 7937 "PhotoPage.c" - gint _tmp11_; + if (_tmp9_ > 0) { +#line 8538 "PhotoPage.c" + gint _tmp10_; #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = x; + _tmp10_ = x; #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = _tmp11_ / 2; -#line 7943 "PhotoPage.c" + _tmp8_ = _tmp10_ / 2; +#line 8544 "PhotoPage.c" } else { #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = 0; -#line 7947 "PhotoPage.c" + _tmp8_ = 0; +#line 8548 "PhotoPage.c" } #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala" - x = _tmp9_; + x = _tmp8_; #line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = allocation; + _tmp11_ = allocation; #line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = _tmp12_.height; + _tmp12_ = _tmp11_.height; #line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = text_height; + _tmp13_ = text_height; #line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala" - y = _tmp13_ - _tmp14_; + y = _tmp12_ - _tmp13_; #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = y; + _tmp15_ = y; #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp16_ > 0) { -#line 7963 "PhotoPage.c" - gint _tmp17_; + if (_tmp15_ > 0) { +#line 8564 "PhotoPage.c" + gint _tmp16_; #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = y; + _tmp16_ = y; #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = _tmp17_ / 2; -#line 7969 "PhotoPage.c" + _tmp14_ = _tmp16_ / 2; +#line 8570 "PhotoPage.c" } else { #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = 0; -#line 7973 "PhotoPage.c" + _tmp14_ = 0; +#line 8574 "PhotoPage.c" } #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala" - y = _tmp15_; + y = _tmp14_; #line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = pango_layout; + _tmp17_ = pango_layout; #line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = x; + _tmp18_ = x; #line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = y; + _tmp19_ = y; #line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_paint_text (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp18_, _tmp19_, _tmp20_); + single_photo_page_paint_text (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp17_, _tmp18_, _tmp19_); #line 1104 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pango_layout); -#line 7987 "PhotoPage.c" +#line 8588 "PhotoPage.c" } -void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missing) { +void +editing_host_page_set_photo_missing (EditingHostPage* self, + gboolean missing) +{ gboolean _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_; Photo* photo = NULL; - Photo* _tmp3_; - Photo* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; + Photo* _tmp1_; + Photo* _tmp2_; + gboolean _tmp3_; GError * _inner_error_ = NULL; #line 1123 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->photo_missing; #line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = missing; -#line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp0_ == _tmp1_) { + if (_tmp0_ == missing) { #line 1125 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8011 "PhotoPage.c" +#line 8610 "PhotoPage.c" } #line 1127 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = missing; -#line 1127 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->photo_missing = _tmp2_; + self->priv->photo_missing = missing; #line 1129 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = editing_host_page_get_photo (self); + _tmp1_ = editing_host_page_get_photo (self); #line 1129 "/home/jens/Source/shotwell/src/PhotoPage.vala" - photo = _tmp3_; + photo = _tmp1_; #line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = photo; + _tmp2_ = photo; #line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp4_ == NULL) { + if (_tmp2_ == NULL) { #line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); #line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8029 "PhotoPage.c" +#line 8626 "PhotoPage.c" } #line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = missing; -#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_update_ui (self, _tmp5_); + editing_host_page_update_ui (self, missing); #line 1135 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = self->priv->photo_missing; + _tmp3_ = self->priv->photo_missing; #line 1135 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp6_) { -#line 8039 "PhotoPage.c" + if (_tmp3_) { +#line 8634 "PhotoPage.c" { GdkPixbuf* pixbuf = NULL; - Photo* _tmp7_; - Scaling _tmp8_ = {0}; + Photo* _tmp4_; + Scaling _tmp5_ = {0}; + GdkPixbuf* _tmp6_; + GdkPixbuf* _tmp7_; + GdkPixbuf* _tmp8_; GdkPixbuf* _tmp9_; GdkPixbuf* _tmp10_; GdkPixbuf* _tmp11_; - gint _tmp12_; - GdkPixbuf* _tmp13_; - gint _tmp14_; - GdkPixbuf* _tmp15_; - GdkPixbuf* _tmp16_; - Photo* _tmp17_; - Dimensions _tmp18_ = {0}; + Photo* _tmp12_; + Dimensions _tmp13_ = {0}; #line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = photo; + _tmp4_ = photo; #line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_); + single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_); #line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = media_source_get_preview_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp8_, &_inner_error_); + _tmp6_ = media_source_get_preview_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp5_, &_inner_error_); #line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pixbuf = _tmp9_; + pixbuf = _tmp6_; #line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8064 "PhotoPage.c" +#line 8657 "PhotoPage.c" goto __catch257_g_error; } #line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = pixbuf; -#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = pixbuf; -#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = gdk_pixbuf_get_width (_tmp11_); + _tmp7_ = pixbuf; #line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = pixbuf; + _tmp8_ = pixbuf; #line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = gdk_pixbuf_get_height (_tmp13_); + _tmp9_ = pixbuf; #line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = gdk_pixbuf_composite_color_simple (_tmp10_, _tmp12_, _tmp14_, GDK_INTERP_NEAREST, 100, 2, (guint32) 0, (guint32) 0); + _tmp10_ = gdk_pixbuf_composite_color_simple (_tmp7_, gdk_pixbuf_get_width (_tmp8_), gdk_pixbuf_get_height (_tmp9_), GDK_INTERP_NEAREST, 100, 2, (guint32) 0, (guint32) 0); #line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); #line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pixbuf = _tmp15_; + pixbuf = _tmp10_; #line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = pixbuf; + _tmp11_ = pixbuf; #line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = photo; + _tmp12_ = photo; #line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp18_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp13_); #line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp16_, &_tmp18_, NULL); + single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp11_, &_tmp13_, NULL); #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); -#line 8093 "PhotoPage.c" +#line 8682 "PhotoPage.c" } goto __finally257; __catch257_g_error: { GError* err = NULL; - GdkPixbuf* _tmp19_; - GdkPixbuf* _tmp20_; - Photo* _tmp21_; - Dimensions _tmp22_ = {0}; - GError* _tmp23_; - const gchar* _tmp24_; + GdkPixbuf* _tmp14_; + GdkPixbuf* _tmp15_; + Photo* _tmp16_; + Dimensions _tmp17_ = {0}; + GError* _tmp18_; + const gchar* _tmp19_; #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala" err = _inner_error_; #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala" _inner_error_ = NULL; #line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 1, 1); + _tmp14_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 1, 1); #line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = _tmp19_; + _tmp15_ = _tmp14_; #line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = photo; + _tmp16_ = photo; #line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp22_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp17_); #line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp20_, &_tmp22_, NULL); + single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp15_, &_tmp17_, NULL); #line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp15_); #line 1145 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = err; + _tmp18_ = err; #line 1145 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = _tmp23_->message; + _tmp19_ = _tmp18_->message; #line 1145 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_warning ("PhotoPage.vala:1145: %s", _tmp24_); + g_warning ("PhotoPage.vala:1145: %s", _tmp19_); #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 8129 "PhotoPage.c" +#line 8718 "PhotoPage.c" } __finally257: #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8143,16 +8732,18 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin g_clear_error (&_inner_error_); #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8142 "PhotoPage.c" +#line 8731 "PhotoPage.c" } } #line 1123 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 8147 "PhotoPage.c" +#line 8736 "PhotoPage.c" } -gboolean editing_host_page_get_photo_missing (EditingHostPage* self) { +gboolean +editing_host_page_get_photo_missing (EditingHostPage* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 1150 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8163,11 +8754,15 @@ gboolean editing_host_page_get_photo_missing (EditingHostPage* self) { result = _tmp0_; #line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 8162 "PhotoPage.c" +#line 8753 "PhotoPage.c" } -static gboolean editing_host_page_real_confirm_replace_photo (EditingHostPage* self, Photo* old_photo, Photo* new_photo) { +static gboolean +editing_host_page_real_confirm_replace_photo (EditingHostPage* self, + Photo* old_photo, + Photo* new_photo) +{ gboolean result = FALSE; #line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail ((old_photo == NULL) || IS_PHOTO (old_photo), FALSE); @@ -8177,27 +8772,33 @@ static gboolean editing_host_page_real_confirm_replace_photo (EditingHostPage* s result = TRUE; #line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 8176 "PhotoPage.c" +#line 8771 "PhotoPage.c" } -gboolean editing_host_page_confirm_replace_photo (EditingHostPage* self, Photo* old_photo, Photo* new_photo) { +gboolean +editing_host_page_confirm_replace_photo (EditingHostPage* self, + Photo* old_photo, + Photo* new_photo) +{ #line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); #line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->confirm_replace_photo (self, old_photo, new_photo); -#line 8185 "PhotoPage.c" +#line 8784 "PhotoPage.c" } -static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Photo* new_photo) { +static GdkPixbuf* +editing_host_page_get_zoom_pixbuf (EditingHostPage* self, + Photo* new_photo) +{ GdkPixbuf* result = NULL; GdkPixbuf* pixbuf = NULL; PixbufCache* _tmp0_; - Photo* _tmp1_; + GdkPixbuf* _tmp1_; GdkPixbuf* _tmp2_; - GdkPixbuf* _tmp3_; - GdkPixbuf* _tmp11_; + GdkPixbuf* _tmp9_; GError * _inner_error_ = NULL; #line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); @@ -8206,66 +8807,61 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot #line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->cache; #line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = new_photo; + _tmp1_ = pixbuf_cache_get_ready_pixbuf (_tmp0_, new_photo); #line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = pixbuf_cache_get_ready_pixbuf (_tmp0_, _tmp1_); -#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pixbuf = _tmp2_; + pixbuf = _tmp1_; #line 1160 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = pixbuf; + _tmp2_ = pixbuf; #line 1160 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp3_ == NULL) { -#line 8214 "PhotoPage.c" + if (_tmp2_ == NULL) { +#line 8813 "PhotoPage.c" { - GdkPixbuf* _tmp4_ = NULL; - Photo* _tmp5_; - Scaling _tmp6_ = {0}; - GdkPixbuf* _tmp7_; - GdkPixbuf* _tmp8_; -#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = new_photo; + GdkPixbuf* _tmp3_ = NULL; + Scaling _tmp4_ = {0}; + GdkPixbuf* _tmp5_; + GdkPixbuf* _tmp6_; #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp6_); + single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp4_); #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = media_source_get_preview_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp6_, &_inner_error_); + _tmp5_ = media_source_get_preview_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (new_photo, TYPE_MEDIA_SOURCE, MediaSource), &_tmp4_, &_inner_error_); #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp7_; + _tmp3_ = _tmp5_; #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8231 "PhotoPage.c" +#line 8827 "PhotoPage.c" goto __catch258_g_error; } #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp4_; + _tmp6_ = _tmp3_; #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = NULL; + _tmp3_ = NULL; #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pixbuf = _tmp8_; + pixbuf = _tmp6_; #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp4_); -#line 8244 "PhotoPage.c" + _g_object_unref0 (_tmp3_); +#line 8840 "PhotoPage.c" } goto __finally258; __catch258_g_error: { GError* err = NULL; - GError* _tmp9_; - const gchar* _tmp10_; + GError* _tmp7_; + const gchar* _tmp8_; #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala" err = _inner_error_; #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala" _inner_error_ = NULL; #line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = err; + _tmp7_ = err; #line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp9_->message; + _tmp8_ = _tmp7_->message; #line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_warning ("PhotoPage.vala:1164: %s", _tmp10_); + g_warning ("PhotoPage.vala:1164: %s", _tmp8_); #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 8264 "PhotoPage.c" +#line 8860 "PhotoPage.c" } __finally258: #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8278,311 +8874,268 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot g_clear_error (&_inner_error_); #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala" return NULL; -#line 8277 "PhotoPage.c" +#line 8873 "PhotoPage.c" } } #line 1167 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = pixbuf; + _tmp9_ = pixbuf; #line 1167 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp11_ == NULL) { -#line 8284 "PhotoPage.c" + if (_tmp9_ == NULL) { +#line 8880 "PhotoPage.c" + GdkPixbuf* _tmp10_; + Scaling _tmp11_ = {0}; GdkPixbuf* _tmp12_; - Scaling _tmp13_ = {0}; + GdkPixbuf* _tmp13_; GdkPixbuf* _tmp14_; - GdkPixbuf* _tmp15_; - GdkPixbuf* _tmp16_; #line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = get_placeholder_pixbuf (); + _tmp10_ = get_placeholder_pixbuf (); #line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); #line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pixbuf = _tmp12_; + pixbuf = _tmp10_; #line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp13_); + single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp11_); #line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = pixbuf; + _tmp12_ = pixbuf; #line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = scaling_perform_on_pixbuf (&_tmp13_, _tmp14_, GDK_INTERP_NEAREST, TRUE); + _tmp13_ = scaling_perform_on_pixbuf (&_tmp11_, _tmp12_, GDK_INTERP_NEAREST, TRUE); #line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = _tmp15_; + _tmp14_ = _tmp13_; #line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp16_); -#line 8306 "PhotoPage.c" + _g_object_unref0 (_tmp14_); +#line 8902 "PhotoPage.c" } #line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = pixbuf; #line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 8312 "PhotoPage.c" +#line 8908 "PhotoPage.c" } -static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_photo) { +static void +editing_host_page_replace_photo (EditingHostPage* self, + Photo* new_photo) +{ gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; Photo* _tmp2_; Photo* _tmp3_; - Photo* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; - gboolean _tmp14_ = FALSE; - gboolean _tmp15_ = FALSE; - gboolean _tmp16_; - Dimensions _tmp26_ = {0}; + gboolean _tmp4_; + gboolean _tmp10_ = FALSE; + gboolean _tmp11_ = FALSE; + Dimensions _tmp17_ = {0}; Photo* old_photo = NULL; - Photo* _tmp27_; - Photo* _tmp28_; - Photo* _tmp29_; - gchar* _tmp30_; - gchar* _tmp31_; - Photo* _tmp32_; - GFile* _tmp33_; - GFile* _tmp34_; - gboolean _tmp35_; - Photo* _tmp36_; - Photo* _tmp43_; - Photo* _tmp44_; - GdkPixbuf* _tmp45_; - GdkPixbuf* _tmp46_; - ZoomBuffer* _tmp47_; + Photo* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; + GFile* _tmp21_; + GFile* _tmp22_; + Photo* _tmp23_; + GdkPixbuf* _tmp29_; + GdkPixbuf* _tmp30_; + ZoomBuffer* _tmp31_; #line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (new_photo)); #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = new_photo; -#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = editing_host_page_get_photo (self); -#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_; + _tmp2_ = editing_host_page_get_photo (self); #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource)); + _tmp3_ = _tmp2_; #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _tmp5_; + _tmp4_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (new_photo, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource)); #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp6_) { -#line 8362 "PhotoPage.c" - gboolean _tmp7_; + if (_tmp4_) { +#line 8948 "PhotoPage.c" + gboolean _tmp5_; #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = self->priv->pixbuf_dirty; + _tmp5_ = self->priv->pixbuf_dirty; #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = !_tmp7_; -#line 8368 "PhotoPage.c" + _tmp1_ = !_tmp5_; +#line 8954 "PhotoPage.c" } else { #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 8372 "PhotoPage.c" +#line 8958 "PhotoPage.c" } #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 8376 "PhotoPage.c" - gboolean _tmp8_; +#line 8962 "PhotoPage.c" + gboolean _tmp6_; #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = self->priv->photo_missing; + _tmp6_ = self->priv->photo_missing; #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = !_tmp8_; -#line 8382 "PhotoPage.c" + _tmp0_ = !_tmp6_; +#line 8968 "PhotoPage.c" } else { #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 8386 "PhotoPage.c" +#line 8972 "PhotoPage.c" } #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 8390 "PhotoPage.c" - Photo* _tmp9_; - Photo* _tmp10_; - GdkPixbuf* _tmp11_; - GdkPixbuf* _tmp12_; - ZoomBuffer* _tmp13_; -#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = new_photo; -#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = new_photo; +#line 8976 "PhotoPage.c" + GdkPixbuf* _tmp7_; + GdkPixbuf* _tmp8_; + ZoomBuffer* _tmp9_; #line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = editing_host_page_get_zoom_pixbuf (self, _tmp10_); + _tmp7_ = editing_host_page_get_zoom_pixbuf (self, new_photo); #line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp9_, _tmp12_); + _tmp9_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), new_photo, _tmp8_); #line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->zoom_buffer); #line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->zoom_buffer = _tmp13_; + self->priv->zoom_buffer = _tmp9_; #line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp8_); #line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8414 "PhotoPage.c" +#line 8994 "PhotoPage.c" } #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = editing_host_page_has_photo (self); -#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp16_) { -#line 8420 "PhotoPage.c" - Photo* _tmp17_; - Photo* _tmp18_; - Photo* _tmp19_; - gboolean _tmp20_; -#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = new_photo; -#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = editing_host_page_get_photo (self); + if (editing_host_page_has_photo (self)) { +#line 8998 "PhotoPage.c" + Photo* _tmp12_; + Photo* _tmp13_; #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = _tmp18_; + _tmp12_ = editing_host_page_get_photo (self); #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_SOURCE, DataSource)); + _tmp13_ = _tmp12_; #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = !_tmp20_; + _tmp11_ = !data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (new_photo, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_SOURCE, DataSource)); #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp19_); -#line 8437 "PhotoPage.c" + _g_object_unref0 (_tmp13_); +#line 9009 "PhotoPage.c" } else { #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = FALSE; -#line 8441 "PhotoPage.c" + _tmp11_ = FALSE; +#line 9013 "PhotoPage.c" } #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp15_) { + if (_tmp11_) { #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = editing_host_page_confirm_replace_photo != NULL; -#line 8447 "PhotoPage.c" + _tmp10_ = editing_host_page_confirm_replace_photo != NULL; +#line 9019 "PhotoPage.c" } else { #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = FALSE; -#line 8451 "PhotoPage.c" + _tmp10_ = FALSE; +#line 9023 "PhotoPage.c" } #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp14_) { -#line 8455 "PhotoPage.c" - Photo* _tmp21_; - Photo* _tmp22_; - Photo* _tmp23_; - gboolean _tmp24_; - gboolean _tmp25_; -#line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = editing_host_page_get_photo (self); -#line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = _tmp21_; + if (_tmp10_) { +#line 9027 "PhotoPage.c" + Photo* _tmp14_; + Photo* _tmp15_; + gboolean _tmp16_; #line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = new_photo; + _tmp14_ = editing_host_page_get_photo (self); #line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = editing_host_page_confirm_replace_photo (self, _tmp22_, _tmp23_); + _tmp15_ = _tmp14_; #line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = !_tmp24_; + _tmp16_ = !editing_host_page_confirm_replace_photo (self, _tmp15_, new_photo); #line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp22_); + _g_object_unref0 (_tmp15_); #line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp25_) { + if (_tmp16_) { #line 1187 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8477 "PhotoPage.c" +#line 9043 "PhotoPage.c" } } #line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala" - dimensions_init (&_tmp26_, 0, 0); + dimensions_init (&_tmp17_, 0, 0); #line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp26_, FALSE); + editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp17_, FALSE); #line 1193 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = editing_host_page_get_photo (self); + _tmp18_ = editing_host_page_get_photo (self); #line 1193 "/home/jens/Source/shotwell/src/PhotoPage.vala" - old_photo = _tmp27_; -#line 1194 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = new_photo; + old_photo = _tmp18_; #line 1194 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_set_photo (self, _tmp28_); + editing_host_page_set_photo (self, new_photo); #line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = new_photo; + _tmp19_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (new_photo, TYPE_DATA_OBJECT, DataObject)); #line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject)); -#line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp31_ = _tmp30_; + _tmp20_ = _tmp19_; #line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp31_); + page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp20_); #line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_free0 (_tmp31_); + _g_free0 (_tmp20_); #line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->swapped); #line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->swapped = NULL; #line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp32_ = new_photo; -#line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp33_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp34_ = _tmp33_; + _tmp21_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (new_photo, TYPE_MEDIA_SOURCE, MediaSource)); #line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp35_ = g_file_query_exists (_tmp34_, NULL); + _tmp22_ = _tmp21_; #line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_set_photo_missing (self, !_tmp35_); + editing_host_page_set_photo_missing (self, !g_file_query_exists (_tmp22_, NULL)); #line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp34_); + _g_object_unref0 (_tmp22_); #line 1202 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->pixbuf_dirty = TRUE; #line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rebuild_caches (self, "replace_photo"); #line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp36_ = old_photo; + _tmp23_ = old_photo; #line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp36_ != NULL) { -#line 8526 "PhotoPage.c" - ViewCollection* _tmp37_; - ViewCollection* _tmp38_; - Photo* _tmp39_; - ViewCollection* _tmp40_; - ViewCollection* _tmp41_; - Photo* _tmp42_; -#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + if (_tmp23_ != NULL) { +#line 9084 "PhotoPage.c" + ViewCollection* _tmp24_; + ViewCollection* _tmp25_; + Photo* _tmp26_; + ViewCollection* _tmp27_; + ViewCollection* _tmp28_; #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp38_ = _tmp37_; + _tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp39_ = old_photo; + _tmp25_ = _tmp24_; #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp40_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp26_ = old_photo; #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp41_ = _tmp40_; + _tmp27_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp42_ = new_photo; + _tmp28_ = _tmp27_; #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_cancel_prefetch_neighbors (self, _tmp38_, _tmp39_, _tmp41_, _tmp42_); + editing_host_page_cancel_prefetch_neighbors (self, _tmp25_, _tmp26_, _tmp28_, new_photo); #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp41_); + _data_collection_unref0 (_tmp28_); #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp38_); -#line 8551 "PhotoPage.c" + _data_collection_unref0 (_tmp25_); +#line 9106 "PhotoPage.c" } #line 1211 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp43_ = new_photo; -#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp44_ = new_photo; + _tmp29_ = editing_host_page_get_zoom_pixbuf (self, new_photo); #line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp45_ = editing_host_page_get_zoom_pixbuf (self, _tmp44_); -#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp46_ = _tmp45_; + _tmp30_ = _tmp29_; #line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp47_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp43_, _tmp46_); + _tmp31_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), new_photo, _tmp30_); #line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->zoom_buffer); #line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->zoom_buffer = _tmp47_; + self->priv->zoom_buffer = _tmp31_; #line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp46_); + _g_object_unref0 (_tmp30_); #line 1215 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_quick_update_pixbuf (self); #line 1218 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_refresh_caches (self, "replace_photo"); #line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (old_photo); -#line 8577 "PhotoPage.c" +#line 9128 "PhotoPage.c" } -static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) { +static void +editing_host_page_real_cancel_zoom (SinglePhotoPage* base) +{ EditingHostPage * self; GtkScale* _tmp0_; guint _tmp1_; @@ -8621,7 +9174,7 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) { _g_object_unref0 (_tmp5_); #line 1228 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { -#line 8620 "PhotoPage.c" +#line 9173 "PhotoPage.c" Photo* _tmp7_; Photo* _tmp8_; Dimensions _tmp9_ = {0}; @@ -8641,13 +9194,13 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) { single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp11_); #line 1229 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 8640 "PhotoPage.c" +#line 9193 "PhotoPage.c" } #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas; #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp13_ != NULL) { -#line 8646 "PhotoPage.c" +#line 9199 "PhotoPage.c" GtkDrawingArea* _tmp14_; GdkWindow* _tmp15_; #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8656,25 +9209,27 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) { _tmp15_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget)); #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = _tmp15_ != NULL; -#line 8655 "PhotoPage.c" +#line 9208 "PhotoPage.c" } else { #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp12_ = FALSE; -#line 8659 "PhotoPage.c" +#line 9212 "PhotoPage.c" } #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp12_) { #line 1236 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_LEFT_PTR); -#line 8665 "PhotoPage.c" +#line 9218 "PhotoPage.c" } #line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); -#line 8669 "PhotoPage.c" +#line 9222 "PhotoPage.c" } -static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { +static void +editing_host_page_quick_update_pixbuf (EditingHostPage* self) +{ GdkPixbuf* pixbuf = NULL; PixbufCache* _tmp0_; Photo* _tmp1_; @@ -8714,7 +9269,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { _tmp5_ = pixbuf; #line 1243 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_ != NULL) { -#line 8713 "PhotoPage.c" +#line 9268 "PhotoPage.c" GdkPixbuf* _tmp6_; Photo* _tmp7_; Photo* _tmp8_; @@ -8737,7 +9292,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { _g_object_unref0 (pixbuf); #line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8736 "PhotoPage.c" +#line 9291 "PhotoPage.c" } #line 1250 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp10_); @@ -8763,7 +9318,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { _g_free0 (_tmp14_); #line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp12_); -#line 8762 "PhotoPage.c" +#line 9317 "PhotoPage.c" { GdkPixbuf* _tmp17_ = NULL; Photo* _tmp18_; @@ -8790,7 +9345,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { _tmp17_ = _tmp22_; #line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8789 "PhotoPage.c" +#line 9344 "PhotoPage.c" goto __catch259_g_error; } #line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8805,7 +9360,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { _g_object_unref0 (_tmp24_); #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp17_); -#line 8804 "PhotoPage.c" +#line 9359 "PhotoPage.c" } goto __finally259; __catch259_g_error: @@ -8825,7 +9380,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { g_warning ("PhotoPage.vala:1259: %s", _tmp27_); #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 8824 "PhotoPage.c" +#line 9379 "PhotoPage.c" } __finally259: #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8838,7 +9393,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { g_clear_error (&_inner_error_); #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 8837 "PhotoPage.c" +#line 9392 "PhotoPage.c" } #line 1262 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = self->priv->cache; @@ -8854,11 +9409,13 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) { self->priv->pixbuf_dirty = FALSE; #line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); -#line 8853 "PhotoPage.c" +#line 9408 "PhotoPage.c" } -static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { +static gboolean +editing_host_page_update_pixbuf (EditingHostPage* self) +{ gboolean result = FALSE; Photo* photo = NULL; Photo* _tmp0_; @@ -8887,7 +9444,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { _g_object_unref0 (photo); #line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 8886 "PhotoPage.c" +#line 9443 "PhotoPage.c" } #line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf = NULL; @@ -8897,7 +9454,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp3_); #line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala" max_dim = _tmp3_; -#line 8896 "PhotoPage.c" +#line 9453 "PhotoPage.c" { Dimensions tool_pixbuf_dim = {0}; Dimensions _tmp4_ = {0}; @@ -8911,7 +9468,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { _tmp5_ = self->priv->current_tool; #line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_ != NULL) { -#line 8910 "PhotoPage.c" +#line 9467 "PhotoPage.c" GdkPixbuf* _tmp6_ = NULL; EditingToolsEditingTool* _tmp7_; Scaling _tmp8_ = {0}; @@ -8933,7 +9490,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { _tmp6_ = _tmp11_; #line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8932 "PhotoPage.c" +#line 9489 "PhotoPage.c" goto __catch260_g_error; } #line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -8946,19 +9503,19 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { pixbuf = _tmp12_; #line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp6_); -#line 8945 "PhotoPage.c" +#line 9502 "PhotoPage.c" } #line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = pixbuf; #line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp13_ != NULL) { -#line 8951 "PhotoPage.c" +#line 9508 "PhotoPage.c" Dimensions _tmp14_; #line 1287 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp14_ = tool_pixbuf_dim; #line 1287 "/home/jens/Source/shotwell/src/PhotoPage.vala" max_dim = _tmp14_; -#line 8957 "PhotoPage.c" +#line 9514 "PhotoPage.c" } } goto __finally260; @@ -8981,12 +9538,12 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { editing_host_page_set_photo_missing (self, TRUE); #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 8980 "PhotoPage.c" +#line 9537 "PhotoPage.c" } __finally260: #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8985 "PhotoPage.c" +#line 9542 "PhotoPage.c" gboolean _tmp17_ = FALSE; #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (pixbuf); @@ -8998,20 +9555,20 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { g_clear_error (&_inner_error_); #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala" return _tmp17_; -#line 8997 "PhotoPage.c" +#line 9554 "PhotoPage.c" } #line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp18_ = self->priv->photo_missing; #line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp18_) { -#line 9003 "PhotoPage.c" +#line 9560 "PhotoPage.c" GdkPixbuf* _tmp19_; GdkPixbuf* _tmp23_; #line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp19_ = pixbuf; #line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp19_ == NULL) { -#line 9010 "PhotoPage.c" +#line 9567 "PhotoPage.c" PixbufCache* _tmp20_; Photo* _tmp21_; GdkPixbuf* _tmp22_; @@ -9025,13 +9582,13 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { _g_object_unref0 (pixbuf); #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf = _tmp22_; -#line 9024 "PhotoPage.c" +#line 9581 "PhotoPage.c" } #line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp23_ = pixbuf; #line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp23_ == NULL) { -#line 9030 "PhotoPage.c" +#line 9587 "PhotoPage.c" PixbufCache* _tmp24_; Photo* _tmp25_; #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9040,28 +9597,28 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { _tmp25_ = photo; #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala" pixbuf_cache_prefetch (_tmp24_, _tmp25_, BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE); -#line 9039 "PhotoPage.c" +#line 9596 "PhotoPage.c" } } #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp27_ = self->priv->photo_missing; #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!_tmp27_) { -#line 9046 "PhotoPage.c" +#line 9603 "PhotoPage.c" GdkPixbuf* _tmp28_; #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = pixbuf; #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = _tmp28_ != NULL; -#line 9052 "PhotoPage.c" +#line 9609 "PhotoPage.c" } else { #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = FALSE; -#line 9056 "PhotoPage.c" +#line 9613 "PhotoPage.c" } #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp26_) { -#line 9060 "PhotoPage.c" +#line 9617 "PhotoPage.c" GdkPixbuf* _tmp29_; Dimensions _tmp30_; #line 1304 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9072,7 +9629,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp29_, &_tmp30_, NULL); #line 1305 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->pixbuf_dirty = FALSE; -#line 9071 "PhotoPage.c" +#line 9628 "PhotoPage.c" } #line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; @@ -9082,11 +9639,14 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) { _g_object_unref0 (photo); #line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9081 "PhotoPage.c" +#line 9638 "PhotoPage.c" } -static void editing_host_page_real_on_resize (Page* base, GdkRectangle* rect) { +static void +editing_host_page_real_on_resize (Page* base, + GdkRectangle* rect) +{ EditingHostPage * self; GdkRectangle _tmp0_; #line 1315 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9099,11 +9659,14 @@ static void editing_host_page_real_on_resize (Page* base, GdkRectangle* rect) { PAGE_CLASS (editing_host_page_parent_class)->on_resize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp0_); #line 1318 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_track_tool_window (self); -#line 9098 "PhotoPage.c" +#line 9658 "PhotoPage.c" } -static void editing_host_page_real_on_resize_finished (Page* base, GdkRectangle* rect) { +static void +editing_host_page_real_on_resize_finished (Page* base, + GdkRectangle* rect) +{ EditingHostPage * self; #line 1321 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); @@ -9115,11 +9678,13 @@ static void editing_host_page_real_on_resize_finished (Page* base, GdkRectangle* self->priv->pixbuf_dirty = TRUE; #line 1328 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_pixbuf (self); -#line 9114 "PhotoPage.c" +#line 9677 "PhotoPage.c" } -static void editing_host_page_on_viewport_resized (EditingHostPage* self) { +static void +editing_host_page_on_viewport_resized (EditingHostPage* self) +{ #line 1331 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1334 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9128,52 +9693,53 @@ static void editing_host_page_on_viewport_resized (EditingHostPage* self) { self->priv->pixbuf_dirty = TRUE; #line 1337 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_pixbuf (self); -#line 9127 "PhotoPage.c" +#line 9692 "PhotoPage.c" } -static void editing_host_page_real_update_actions (Page* base, gint selected_count, gint count) { +static void +editing_host_page_real_update_actions (Page* base, + gint selected_count, + gint count) +{ EditingHostPage * self; gboolean multiple_photos = FALSE; ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; - GtkToolButton* _tmp4_; - gboolean _tmp5_; - GtkToolButton* _tmp6_; - gboolean _tmp7_; + gboolean _tmp2_; + GtkToolButton* _tmp3_; + gboolean _tmp4_; + GtkToolButton* _tmp5_; + gboolean _tmp6_; Photo* photo = NULL; - Photo* _tmp8_; + Photo* _tmp7_; Scaling scaling = {0}; - Scaling _tmp9_ = {0}; + Scaling _tmp8_ = {0}; + gboolean _tmp9_ = FALSE; gboolean _tmp10_ = FALSE; gboolean _tmp11_ = FALSE; - gboolean _tmp12_ = FALSE; - Photo* _tmp13_; - GtkToolButton* _tmp19_; - gboolean _tmp20_ = FALSE; - gboolean _tmp21_ = FALSE; - Photo* _tmp22_; - GtkToggleToolButton* _tmp27_; - gboolean _tmp28_ = FALSE; - gboolean _tmp29_ = FALSE; - Photo* _tmp30_; - GtkToggleToolButton* _tmp35_; - gboolean _tmp36_ = FALSE; - gboolean _tmp37_ = FALSE; - Photo* _tmp38_; - GtkToggleToolButton* _tmp43_; + Photo* _tmp12_; + GtkToolButton* _tmp16_; + gboolean _tmp17_ = FALSE; + gboolean _tmp18_ = FALSE; + Photo* _tmp19_; + GtkToggleToolButton* _tmp23_; + gboolean _tmp24_ = FALSE; + gboolean _tmp25_ = FALSE; + Photo* _tmp26_; + GtkToggleToolButton* _tmp30_; + gboolean _tmp31_ = FALSE; + gboolean _tmp32_ = FALSE; + Photo* _tmp33_; + GtkToggleToolButton* _tmp37_; + gboolean _tmp38_ = FALSE; + gboolean _tmp39_ = FALSE; + Photo* _tmp40_; + GtkToolButton* _tmp43_; gboolean _tmp44_ = FALSE; gboolean _tmp45_ = FALSE; Photo* _tmp46_; - GtkToolButton* _tmp50_; - gboolean _tmp51_ = FALSE; - gboolean _tmp52_ = FALSE; - Photo* _tmp53_; - GtkToggleToolButton* _tmp58_; - gint _tmp59_; - gint _tmp60_; + GtkToggleToolButton* _tmp50_; #line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9181,375 +9747,334 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou #line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; #line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = view_collection_get_sources_of_type_count (_tmp1_, TYPE_PHOTO); -#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_ > 1; + _tmp2_ = view_collection_get_sources_of_type_count (_tmp1_, TYPE_PHOTO) > 1; #line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp1_); #line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala" - multiple_photos = _tmp3_; + multiple_photos = _tmp2_; #line 1343 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = self->priv->prev_button; + _tmp3_ = self->priv->prev_button; #line 1343 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = multiple_photos; + _tmp4_ = multiple_photos; #line 1343 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), _tmp5_); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _tmp4_); #line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = self->priv->next_button; + _tmp5_ = self->priv->next_button; #line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = multiple_photos; + _tmp6_ = multiple_photos; #line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), _tmp7_); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), _tmp6_); #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = editing_host_page_get_photo (self); + _tmp7_ = editing_host_page_get_photo (self); #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala" - photo = _tmp8_; + photo = _tmp7_; #line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp9_); + single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_); #line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala" - scaling = _tmp9_; + scaling = _tmp8_; #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = photo; + _tmp12_ = photo; #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp13_ != NULL) { -#line 9211 "PhotoPage.c" - gboolean _tmp14_; + if (_tmp12_ != NULL) { +#line 9775 "PhotoPage.c" + gboolean _tmp13_; #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = self->priv->photo_missing; + _tmp13_ = self->priv->photo_missing; #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = !_tmp14_; -#line 9217 "PhotoPage.c" + _tmp11_ = !_tmp13_; +#line 9781 "PhotoPage.c" } else { #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = FALSE; -#line 9221 "PhotoPage.c" + _tmp11_ = FALSE; +#line 9785 "PhotoPage.c" } #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp12_) { -#line 9225 "PhotoPage.c" - Photo* _tmp15_; - gboolean _tmp16_; -#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = photo; + if (_tmp11_) { +#line 9789 "PhotoPage.c" + Photo* _tmp14_; #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = photo_check_can_rotate (_tmp15_); + _tmp14_ = photo; #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = _tmp16_; -#line 9234 "PhotoPage.c" + _tmp10_ = photo_check_can_rotate (_tmp14_); +#line 9795 "PhotoPage.c" } else { #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = FALSE; -#line 9238 "PhotoPage.c" + _tmp10_ = FALSE; +#line 9799 "PhotoPage.c" } #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp11_) { -#line 9242 "PhotoPage.c" - Photo* _tmp17_; - gboolean _tmp18_; -#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = photo; + if (_tmp10_) { +#line 9803 "PhotoPage.c" + Photo* _tmp15_; #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = editing_host_page_is_rotate_available (self, _tmp17_); + _tmp15_ = photo; #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp18_; -#line 9251 "PhotoPage.c" + _tmp9_ = editing_host_page_is_rotate_available (self, _tmp15_); +#line 9809 "PhotoPage.c" } else { #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = FALSE; -#line 9255 "PhotoPage.c" + _tmp9_ = FALSE; +#line 9813 "PhotoPage.c" } #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = self->priv->rotate_button; + _tmp16_ = self->priv->rotate_button; #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), _tmp10_); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), _tmp9_); #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = photo; + _tmp19_ = photo; #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp22_ != NULL) { -#line 9265 "PhotoPage.c" - gboolean _tmp23_; + if (_tmp19_ != NULL) { +#line 9823 "PhotoPage.c" + gboolean _tmp20_; #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = self->priv->photo_missing; + _tmp20_ = self->priv->photo_missing; #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = !_tmp23_; -#line 9271 "PhotoPage.c" + _tmp18_ = !_tmp20_; +#line 9829 "PhotoPage.c" } else { #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = FALSE; -#line 9275 "PhotoPage.c" + _tmp18_ = FALSE; +#line 9833 "PhotoPage.c" } #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp21_) { -#line 9279 "PhotoPage.c" - Photo* _tmp24_; - Scaling _tmp25_; - gboolean _tmp26_; -#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = photo; + if (_tmp18_) { +#line 9837 "PhotoPage.c" + Photo* _tmp21_; + Scaling _tmp22_; #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = scaling; + _tmp21_ = photo; #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp26_ = editing_tools_crop_tool_is_available (_tmp24_, &_tmp25_); + _tmp22_ = scaling; #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = _tmp26_; -#line 9291 "PhotoPage.c" + _tmp17_ = editing_tools_crop_tool_is_available (_tmp21_, &_tmp22_); +#line 9846 "PhotoPage.c" } else { #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = FALSE; -#line 9295 "PhotoPage.c" + _tmp17_ = FALSE; +#line 9850 "PhotoPage.c" } #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = self->priv->crop_button; + _tmp23_ = self->priv->crop_button; #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), _tmp20_); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), _tmp17_); #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_ = photo; + _tmp26_ = photo; #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp30_ != NULL) { -#line 9305 "PhotoPage.c" - gboolean _tmp31_; + if (_tmp26_ != NULL) { +#line 9860 "PhotoPage.c" + gboolean _tmp27_; #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp31_ = self->priv->photo_missing; + _tmp27_ = self->priv->photo_missing; #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = !_tmp31_; -#line 9311 "PhotoPage.c" + _tmp25_ = !_tmp27_; +#line 9866 "PhotoPage.c" } else { #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = FALSE; -#line 9315 "PhotoPage.c" + _tmp25_ = FALSE; +#line 9870 "PhotoPage.c" } #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp29_) { -#line 9319 "PhotoPage.c" - Photo* _tmp32_; - Scaling _tmp33_; - gboolean _tmp34_; -#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp32_ = photo; + if (_tmp25_) { +#line 9874 "PhotoPage.c" + Photo* _tmp28_; + Scaling _tmp29_; #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp33_ = scaling; + _tmp28_ = photo; #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp34_ = editing_tools_redeye_tool_is_available (_tmp32_, &_tmp33_); + _tmp29_ = scaling; #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = _tmp34_; -#line 9331 "PhotoPage.c" + _tmp24_ = editing_tools_redeye_tool_is_available (_tmp28_, &_tmp29_); +#line 9883 "PhotoPage.c" } else { #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = FALSE; -#line 9335 "PhotoPage.c" + _tmp24_ = FALSE; +#line 9887 "PhotoPage.c" } #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp35_ = self->priv->redeye_button; + _tmp30_ = self->priv->redeye_button; #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), _tmp28_); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), _tmp24_); #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp38_ = photo; + _tmp33_ = photo; #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp38_ != NULL) { -#line 9345 "PhotoPage.c" - gboolean _tmp39_; + if (_tmp33_ != NULL) { +#line 9897 "PhotoPage.c" + gboolean _tmp34_; #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp39_ = self->priv->photo_missing; + _tmp34_ = self->priv->photo_missing; #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp37_ = !_tmp39_; -#line 9351 "PhotoPage.c" + _tmp32_ = !_tmp34_; +#line 9903 "PhotoPage.c" } else { #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp37_ = FALSE; -#line 9355 "PhotoPage.c" + _tmp32_ = FALSE; +#line 9907 "PhotoPage.c" } #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp37_) { -#line 9359 "PhotoPage.c" - Photo* _tmp40_; - Scaling _tmp41_; - gboolean _tmp42_; -#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp40_ = photo; + if (_tmp32_) { +#line 9911 "PhotoPage.c" + Photo* _tmp35_; + Scaling _tmp36_; #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp41_ = scaling; + _tmp35_ = photo; #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp42_ = editing_tools_adjust_tool_is_available (_tmp40_, &_tmp41_); + _tmp36_ = scaling; #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp36_ = _tmp42_; -#line 9371 "PhotoPage.c" + _tmp31_ = editing_tools_adjust_tool_is_available (_tmp35_, &_tmp36_); +#line 9920 "PhotoPage.c" } else { #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp36_ = FALSE; -#line 9375 "PhotoPage.c" + _tmp31_ = FALSE; +#line 9924 "PhotoPage.c" } #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp43_ = self->priv->adjust_button; + _tmp37_ = self->priv->adjust_button; #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), _tmp36_); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), _tmp31_); #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp46_ = photo; + _tmp40_ = photo; #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp46_ != NULL) { -#line 9385 "PhotoPage.c" - gboolean _tmp47_; + if (_tmp40_ != NULL) { +#line 9934 "PhotoPage.c" + gboolean _tmp41_; #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp47_ = self->priv->photo_missing; + _tmp41_ = self->priv->photo_missing; #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp45_ = !_tmp47_; -#line 9391 "PhotoPage.c" + _tmp39_ = !_tmp41_; +#line 9940 "PhotoPage.c" } else { #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp45_ = FALSE; -#line 9395 "PhotoPage.c" + _tmp39_ = FALSE; +#line 9944 "PhotoPage.c" } #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp45_) { -#line 9399 "PhotoPage.c" - Photo* _tmp48_; - gboolean _tmp49_; -#line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp48_ = photo; + if (_tmp39_) { +#line 9948 "PhotoPage.c" + Photo* _tmp42_; #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp49_ = editing_host_page_is_enhance_available (self, _tmp48_); + _tmp42_ = photo; #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp44_ = _tmp49_; -#line 9408 "PhotoPage.c" + _tmp38_ = editing_host_page_is_enhance_available (self, _tmp42_); +#line 9954 "PhotoPage.c" } else { #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp44_ = FALSE; -#line 9412 "PhotoPage.c" + _tmp38_ = FALSE; +#line 9958 "PhotoPage.c" } #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp50_ = self->priv->enhance_button; + _tmp43_ = self->priv->enhance_button; #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), _tmp44_); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), _tmp38_); #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp53_ = photo; + _tmp46_ = photo; #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp53_ != NULL) { -#line 9422 "PhotoPage.c" - gboolean _tmp54_; + if (_tmp46_ != NULL) { +#line 9968 "PhotoPage.c" + gboolean _tmp47_; #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp54_ = self->priv->photo_missing; + _tmp47_ = self->priv->photo_missing; #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp52_ = !_tmp54_; -#line 9428 "PhotoPage.c" + _tmp45_ = !_tmp47_; +#line 9974 "PhotoPage.c" } else { #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp52_ = FALSE; -#line 9432 "PhotoPage.c" + _tmp45_ = FALSE; +#line 9978 "PhotoPage.c" } #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp52_) { -#line 9436 "PhotoPage.c" - Photo* _tmp55_; - Scaling _tmp56_; - gboolean _tmp57_; -#line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp55_ = photo; + if (_tmp45_) { +#line 9982 "PhotoPage.c" + Photo* _tmp48_; + Scaling _tmp49_; #line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp56_ = scaling; + _tmp48_ = photo; #line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp57_ = editing_tools_straighten_tool_is_available (_tmp55_, &_tmp56_); + _tmp49_ = scaling; #line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp51_ = _tmp57_; -#line 9448 "PhotoPage.c" + _tmp44_ = editing_tools_straighten_tool_is_available (_tmp48_, &_tmp49_); +#line 9991 "PhotoPage.c" } else { #line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp51_ = FALSE; -#line 9452 "PhotoPage.c" + _tmp44_ = FALSE; +#line 9995 "PhotoPage.c" } #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp58_ = self->priv->straighten_button; + _tmp50_ = self->priv->straighten_button; #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), _tmp51_); -#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp59_ = selected_count; -#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp60_ = count; + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), _tmp44_); #line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala" - PAGE_CLASS (editing_host_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp59_, _tmp60_); + PAGE_CLASS (editing_host_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), selected_count, count); #line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 9466 "PhotoPage.c" +#line 10005 "PhotoPage.c" } -static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey* event) { +static gboolean +editing_host_page_real_on_shift_pressed (Page* base, + GdkEventKey* event) +{ EditingHostPage * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; EditingToolsEditingTool* _tmp3_; - GdkEventKey* _tmp7_; - gboolean _tmp8_; #line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = self->priv->current_tool; #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_ == NULL) { -#line 9485 "PhotoPage.c" - gboolean _tmp4_; -#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = !_tmp4_; -#line 9491 "PhotoPage.c" + _tmp2_ = !page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); +#line 10027 "PhotoPage.c" } else { #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = FALSE; -#line 9495 "PhotoPage.c" +#line 10031 "PhotoPage.c" } #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 9499 "PhotoPage.c" - gboolean _tmp5_; #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = !_tmp5_; -#line 9505 "PhotoPage.c" + _tmp1_ = !page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); +#line 10037 "PhotoPage.c" } else { #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 9509 "PhotoPage.c" +#line 10041 "PhotoPage.c" } #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 9513 "PhotoPage.c" - gboolean _tmp6_; #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = editing_host_page_has_photo (self); -#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = _tmp6_; -#line 9519 "PhotoPage.c" + _tmp0_ = editing_host_page_has_photo (self); +#line 10047 "PhotoPage.c" } else { #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 9523 "PhotoPage.c" +#line 10051 "PhotoPage.c" } #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { #line 1368 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_in_original (self); -#line 9529 "PhotoPage.c" +#line 10057 "PhotoPage.c" } #line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = event; -#line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = PAGE_CLASS (editing_host_page_parent_class)->on_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp7_); -#line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp8_; + result = PAGE_CLASS (editing_host_page_parent_class)->on_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), event); #line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9539 "PhotoPage.c" +#line 10063 "PhotoPage.c" } -static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKey* event) { +static gboolean +editing_host_page_real_on_shift_released (Page* base, + GdkEventKey* event) +{ EditingHostPage * self; gboolean result = FALSE; EditingToolsEditingTool* _tmp0_; - GdkEventKey* _tmp1_; - gboolean _tmp2_; #line 1373 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9558,26 +10083,23 @@ static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKe if (_tmp0_ == NULL) { #line 1375 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_out_original (self); -#line 9557 "PhotoPage.c" +#line 10082 "PhotoPage.c" } #line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = event; -#line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = PAGE_CLASS (editing_host_page_parent_class)->on_shift_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp1_); -#line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp2_; + result = PAGE_CLASS (editing_host_page_parent_class)->on_shift_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), event); #line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9567 "PhotoPage.c" +#line 10088 "PhotoPage.c" } -static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey* event) { +static gboolean +editing_host_page_real_on_alt_pressed (Page* base, + GdkEventKey* event) +{ EditingHostPage * self; gboolean result = FALSE; EditingToolsEditingTool* _tmp0_; - GdkEventKey* _tmp1_; - gboolean _tmp2_; #line 1380 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9586,91 +10108,77 @@ static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey* if (_tmp0_ == NULL) { #line 1382 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_out_original (self); -#line 9585 "PhotoPage.c" +#line 10107 "PhotoPage.c" } #line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = event; -#line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = PAGE_CLASS (editing_host_page_parent_class)->on_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp1_); -#line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp2_; + result = PAGE_CLASS (editing_host_page_parent_class)->on_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), event); #line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9595 "PhotoPage.c" +#line 10113 "PhotoPage.c" } -static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey* event) { +static gboolean +editing_host_page_real_on_alt_released (Page* base, + GdkEventKey* event) +{ EditingHostPage * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; EditingToolsEditingTool* _tmp2_; - GdkEventKey* _tmp5_; - gboolean _tmp6_; #line 1387 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = self->priv->current_tool; #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_ == NULL) { -#line 9613 "PhotoPage.c" - gboolean _tmp3_; -#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = _tmp3_; -#line 9619 "PhotoPage.c" + _tmp1_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); +#line 10134 "PhotoPage.c" } else { #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = FALSE; -#line 9623 "PhotoPage.c" +#line 10138 "PhotoPage.c" } #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { -#line 9627 "PhotoPage.c" - gboolean _tmp4_; #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = !_tmp4_; -#line 9633 "PhotoPage.c" + _tmp0_ = !page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); +#line 10144 "PhotoPage.c" } else { #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 9637 "PhotoPage.c" +#line 10148 "PhotoPage.c" } #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { #line 1389 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_in_original (self); -#line 9643 "PhotoPage.c" +#line 10154 "PhotoPage.c" } #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = event; -#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = PAGE_CLASS (editing_host_page_parent_class)->on_alt_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp5_); -#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp6_; + result = PAGE_CLASS (editing_host_page_parent_class)->on_alt_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), event); #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 9653 "PhotoPage.c" +#line 10160 "PhotoPage.c" } -static void editing_host_page_swap_in_original (EditingHostPage* self) { +static void +editing_host_page_swap_in_original (EditingHostPage* self) +{ GdkPixbuf* original = NULL; - GdkPixbuf* _tmp9_; - GtkScale* _tmp10_; - gdouble _tmp11_; - GdkPixbuf* _tmp12_; - Photo* _tmp13_; - Photo* _tmp14_; - Dimensions _tmp15_ = {0}; + GdkPixbuf* _tmp8_; + GtkScale* _tmp9_; + GdkPixbuf* _tmp10_; + Photo* _tmp11_; + Photo* _tmp12_; + Dimensions _tmp13_ = {0}; GError * _inner_error_ = NULL; #line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); -#line 9669 "PhotoPage.c" +#line 10177 "PhotoPage.c" { GdkPixbuf* _tmp0_ = NULL; Photo* _tmp1_; @@ -9679,8 +10187,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) { GdkPixbuf* _tmp4_; Photo* _tmp5_; Photo* _tmp6_; - Orientation _tmp7_; - GdkPixbuf* _tmp8_; + GdkPixbuf* _tmp7_; #line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = editing_host_page_get_photo (self); #line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9695,7 +10202,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) { _tmp0_ = _tmp4_; #line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9694 "PhotoPage.c" +#line 10201 "PhotoPage.c" goto __catch261_g_error; } #line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9703,18 +10210,16 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) { #line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = _tmp5_; #line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = photo_get_original_orientation (_tmp6_); -#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = orientation_rotate_pixbuf (_tmp7_, _tmp0_); + _tmp7_ = orientation_rotate_pixbuf (photo_get_original_orientation (_tmp6_), _tmp0_); #line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (original); #line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala" - original = _tmp8_; + original = _tmp7_; #line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp6_); #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp0_); -#line 9713 "PhotoPage.c" +#line 10218 "PhotoPage.c" } goto __finally261; __catch261_g_error: @@ -9730,7 +10235,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) { _g_object_unref0 (original); #line 1400 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 9729 "PhotoPage.c" +#line 10234 "PhotoPage.c" } __finally261: #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9743,45 +10248,45 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) { g_clear_error (&_inner_error_); #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 9742 "PhotoPage.c" +#line 10247 "PhotoPage.c" } #line 1404 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = single_photo_page_get_unscaled_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); + _tmp8_ = single_photo_page_get_unscaled_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 1404 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->swapped); #line 1404 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->swapped = _tmp9_; + self->priv->swapped = _tmp8_; #line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = self->priv->zoom_slider; -#line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_range_get_type (), GtkRange)); + _tmp9_ = self->priv->zoom_slider; #line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp11_ != 0.0) { + if (gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange)) != 0.0) { #line 1409 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_save_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 9760 "PhotoPage.c" +#line 10263 "PhotoPage.c" } #line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = original; + _tmp10_ = original; #line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = editing_host_page_get_photo (self); + _tmp11_ = editing_host_page_get_photo (self); #line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala" - photo_get_master_dimensions (_tmp14_, &_tmp15_); + photo_get_master_dimensions (_tmp12_, &_tmp13_); #line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp12_, &_tmp15_, NULL); + single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp10_, &_tmp13_, NULL); #line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp12_); #line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (original); -#line 9776 "PhotoPage.c" +#line 10279 "PhotoPage.c" } -static void editing_host_page_swap_out_original (EditingHostPage* self) { +static void +editing_host_page_swap_out_original (EditingHostPage* self) +{ GdkPixbuf* _tmp0_; #line 1416 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); @@ -9789,7 +10294,7 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) { _tmp0_ = self->priv->swapped; #line 1417 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 9788 "PhotoPage.c" +#line 10293 "PhotoPage.c" GdkPixbuf* _tmp1_; Photo* _tmp2_; Photo* _tmp3_; @@ -9814,19 +10319,24 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) { _g_object_unref0 (self->priv->swapped); #line 1424 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->swapped = NULL; -#line 9813 "PhotoPage.c" +#line 10318 "PhotoPage.c" } } -static gpointer _editing_tools_editing_tool_ref0 (gpointer self) { +static gpointer +_editing_tools_editing_tool_ref0 (gpointer self) +{ #line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self ? editing_tools_editing_tool_ref (self) : NULL; -#line 9821 "PhotoPage.c" +#line 10328 "PhotoPage.c" } -static void editing_host_page_activate_tool (EditingHostPage* self, EditingToolsEditingTool* tool) { +static void +editing_host_page_activate_tool (EditingHostPage* self, + EditingToolsEditingTool* tool) +{ Dimensions _tmp0_ = {0}; GdkPixbuf* _tmp1_; GdkPixbuf* unscaled = NULL; @@ -9835,13 +10345,12 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools Photo* _tmp3_; Dimensions _tmp4_ = {0}; Dimensions _tmp5_; - GdkPixbuf* _tmp22_; + GdkPixbuf* _tmp21_; EditingToolsPhotoCanvas* photo_canvas = NULL; - EditingHostPageEditingHostCanvas* _tmp25_; + EditingHostPageEditingHostCanvas* _tmp24_; + EditingToolsEditingTool* _tmp25_; EditingToolsEditingTool* _tmp26_; - EditingToolsEditingTool* _tmp27_; - EditingToolsEditingTool* _tmp28_; - EditingToolsPhotoCanvas* _tmp29_; + EditingToolsPhotoCanvas* _tmp27_; GError * _inner_error_ = NULL; #line 1428 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); @@ -9873,106 +10382,103 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools _g_object_unref0 (_tmp3_); #line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala" max_dim = _tmp5_; -#line 9872 "PhotoPage.c" +#line 10381 "PhotoPage.c" { Dimensions tool_pixbuf_dim = {0}; Dimensions _tmp6_ = {0}; GdkPixbuf* _tmp7_ = NULL; - EditingToolsEditingTool* _tmp8_; - Scaling _tmp9_ = {0}; + Scaling _tmp8_ = {0}; + Photo* _tmp9_; Photo* _tmp10_; - Photo* _tmp11_; - Dimensions _tmp12_ = {0}; + Dimensions _tmp11_ = {0}; + GdkPixbuf* _tmp12_; GdkPixbuf* _tmp13_; GdkPixbuf* _tmp14_; GdkPixbuf* _tmp15_; - GdkPixbuf* _tmp16_; #line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_.width = 0; #line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala" tool_pixbuf_dim = _tmp6_; #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = tool; -#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp9_); + single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_); #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = editing_host_page_get_photo (self); + _tmp9_ = editing_host_page_get_photo (self); #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = editing_tools_editing_tool_get_display_pixbuf (_tmp8_, &_tmp9_, _tmp11_, &_tmp12_, &_inner_error_); + _tmp12_ = editing_tools_editing_tool_get_display_pixbuf (tool, &_tmp8_, _tmp10_, &_tmp11_, &_inner_error_); #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - tool_pixbuf_dim = _tmp12_; + tool_pixbuf_dim = _tmp11_; #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp10_); #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = _tmp14_; + _tmp7_ = _tmp13_; #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9910 "PhotoPage.c" +#line 10416 "PhotoPage.c" goto __catch262_g_error; } #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = _tmp7_; + _tmp14_ = _tmp7_; #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = NULL; #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (unscaled); #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - unscaled = _tmp15_; + unscaled = _tmp14_; #line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = unscaled; + _tmp15_ = unscaled; #line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp16_ != NULL) { -#line 9925 "PhotoPage.c" - Dimensions _tmp17_; + if (_tmp15_ != NULL) { +#line 10431 "PhotoPage.c" + Dimensions _tmp16_; #line 1449 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = tool_pixbuf_dim; + _tmp16_ = tool_pixbuf_dim; #line 1449 "/home/jens/Source/shotwell/src/PhotoPage.vala" - max_dim = _tmp17_; -#line 9931 "PhotoPage.c" + max_dim = _tmp16_; +#line 10437 "PhotoPage.c" } #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp7_); -#line 9935 "PhotoPage.c" +#line 10441 "PhotoPage.c" } goto __finally262; __catch262_g_error: { GError* err = NULL; - GError* _tmp18_; - const gchar* _tmp19_; + GError* _tmp17_; + const gchar* _tmp18_; + GtkToggleToolButton* _tmp19_; GtkToggleToolButton* _tmp20_; - GtkToggleToolButton* _tmp21_; #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala" err = _inner_error_; #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala" _inner_error_ = NULL; #line 1451 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = err; + _tmp17_ = err; #line 1451 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = _tmp18_->message; + _tmp18_ = _tmp17_->message; #line 1451 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_warning ("PhotoPage.vala:1451: %s", _tmp19_); + g_warning ("PhotoPage.vala:1451: %s", _tmp18_); #line 1452 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_set_photo_missing (self, TRUE); #line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = self->priv->current_editing_toggle; + _tmp19_ = self->priv->current_editing_toggle; #line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_assert (_tmp20_ != NULL, "current_editing_toggle != null"); + _vala_assert (_tmp19_ != NULL, "current_editing_toggle != null"); #line 1456 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = self->priv->current_editing_toggle; + _tmp20_ = self->priv->current_editing_toggle; #line 1456 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toggle_tool_button_set_active (_tmp21_, FALSE); + gtk_toggle_tool_button_set_active (_tmp20_, FALSE); #line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); #line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (unscaled); #line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 9971 "PhotoPage.c" +#line 10477 "PhotoPage.c" } __finally262: #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -9985,41 +10491,39 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools g_clear_error (&_inner_error_); #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 9984 "PhotoPage.c" +#line 10490 "PhotoPage.c" } #line 1461 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = unscaled; + _tmp21_ = unscaled; #line 1461 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp22_ != NULL) { -#line 9990 "PhotoPage.c" - GdkPixbuf* _tmp23_; - Dimensions _tmp24_; + if (_tmp21_ != NULL) { +#line 10496 "PhotoPage.c" + GdkPixbuf* _tmp22_; + Dimensions _tmp23_; #line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = unscaled; + _tmp22_ = unscaled; #line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = max_dim; + _tmp23_ = max_dim; #line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp23_, &_tmp24_, NULL); -#line 9999 "PhotoPage.c" + single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp22_, &_tmp23_, NULL); +#line 10505 "PhotoPage.c" } #line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = editing_host_page_editing_host_canvas_new (self); + _tmp24_ = editing_host_page_editing_host_canvas_new (self); #line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala" - photo_canvas = G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, EDITING_TOOLS_TYPE_PHOTO_CANVAS, EditingToolsPhotoCanvas); -#line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp26_ = tool; + photo_canvas = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, EDITING_TOOLS_TYPE_PHOTO_CANVAS, EditingToolsPhotoCanvas); #line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = _editing_tools_editing_tool_ref0 (_tmp26_); + _tmp25_ = _editing_tools_editing_tool_ref0 (tool); #line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala" _editing_tools_editing_tool_unref0 (self->priv->current_tool); #line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->current_tool = _tmp27_; + self->priv->current_tool = _tmp25_; #line 1469 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = self->priv->current_tool; + _tmp26_ = self->priv->current_tool; #line 1469 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = photo_canvas; + _tmp27_ = photo_canvas; #line 1469 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_tools_editing_tool_activate (_tmp28_, _tmp29_); + editing_tools_editing_tool_activate (_tmp26_, _tmp27_); #line 1472 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_place_tool_window (self); #line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10028,55 +10532,82 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools _editing_tools_photo_canvas_unref0 (photo_canvas); #line 1428 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (unscaled); -#line 10027 "PhotoPage.c" +#line 10531 "PhotoPage.c" } -static void _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated (EditingToolsEditingTool* _sender, gpointer self) { +static void +_editing_host_page_on_tool_activated_editing_tools_editing_tool_activated (EditingToolsEditingTool* _sender, + gpointer self) +{ #line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_activated ((EditingHostPage*) self); -#line 10034 "PhotoPage.c" +#line 10541 "PhotoPage.c" } -static void _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) { +static void +_editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, + gpointer self) +{ #line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_deactivated ((EditingHostPage*) self); -#line 10041 "PhotoPage.c" +#line 10551 "PhotoPage.c" } -static void _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied (EditingToolsEditingTool* _sender, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement, gpointer self) { +static void +_editing_host_page_on_tool_applied_editing_tools_editing_tool_applied (EditingToolsEditingTool* _sender, + Command* command, + GdkPixbuf* new_pixbuf, + Dimensions* new_max_dim, + gboolean needs_improvement, + gpointer self) +{ #line 1501 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_applied ((EditingHostPage*) self, command, new_pixbuf, new_max_dim, needs_improvement); -#line 10048 "PhotoPage.c" +#line 10565 "PhotoPage.c" } -static void _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled (EditingToolsEditingTool* _sender, gpointer self) { +static void +_editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled (EditingToolsEditingTool* _sender, + gpointer self) +{ #line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_cancelled ((EditingHostPage*) self); -#line 10055 "PhotoPage.c" +#line 10575 "PhotoPage.c" } -static void _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted (EditingToolsEditingTool* _sender, gpointer self) { +static void +_editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted (EditingToolsEditingTool* _sender, + gpointer self) +{ #line 1503 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_aborted ((EditingHostPage*) self); -#line 10062 "PhotoPage.c" +#line 10585 "PhotoPage.c" } -static gboolean _editing_host_page_update_pixbuf_gsource_func (gpointer self) { +static gboolean +_editing_host_page_update_pixbuf_gsource_func (gpointer self) +{ gboolean result; result = editing_host_page_update_pixbuf ((EditingHostPage*) self); #line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10071 "PhotoPage.c" +#line 10596 "PhotoPage.c" } -static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement) { +static void +editing_host_page_deactivate_tool (EditingHostPage* self, + Command* command, + GdkPixbuf* new_pixbuf, + Dimensions* new_max_dim, + gboolean needs_improvement) +{ EditingToolsEditingTool* _tmp0_; EditingToolsEditingTool* tool = NULL; EditingToolsEditingTool* _tmp1_; @@ -10086,22 +10617,19 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c EditingToolsEditingToolWindow* _tmp4_; gboolean _tmp5_ = FALSE; EditingToolsEditingToolWindow* _tmp6_; + EditingToolsEditingTool* _tmp23_; EditingToolsEditingTool* _tmp24_; - EditingToolsEditingTool* _tmp25_; - guint _tmp26_; - EditingToolsEditingTool* _tmp27_; - guint _tmp28_; - EditingToolsEditingTool* _tmp29_; - guint _tmp30_; - EditingToolsEditingTool* _tmp31_; - guint _tmp32_; - EditingToolsEditingTool* _tmp33_; - guint _tmp34_; + guint _tmp25_; + EditingToolsEditingTool* _tmp26_; + guint _tmp27_; + EditingToolsEditingTool* _tmp28_; + guint _tmp29_; + EditingToolsEditingTool* _tmp30_; + guint _tmp31_; + EditingToolsEditingTool* _tmp32_; + guint _tmp33_; GdkPixbuf* replacement = NULL; - GdkPixbuf* _tmp35_; - GdkPixbuf* _tmp43_; - gboolean _tmp46_; - Command* _tmp47_; + GdkPixbuf* _tmp40_; #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10116,7 +10644,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c if (_tmp0_ == NULL) { #line 1481 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 10115 "PhotoPage.c" +#line 10643 "PhotoPage.c" } #line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; @@ -10138,117 +10666,114 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c _tmp6_ = tool_window; #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_ != NULL) { -#line 10137 "PhotoPage.c" +#line 10665 "PhotoPage.c" EditingToolsEditingToolWindow* _tmp7_; - gboolean _tmp8_; #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = tool_window; #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = editing_tools_editing_tool_window_has_user_moved (_tmp7_); -#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = _tmp8_; -#line 10146 "PhotoPage.c" + _tmp5_ = editing_tools_editing_tool_window_has_user_moved (_tmp7_); +#line 10671 "PhotoPage.c" } else { #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = FALSE; -#line 10150 "PhotoPage.c" +#line 10675 "PhotoPage.c" } #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp5_) { -#line 10154 "PhotoPage.c" +#line 10679 "PhotoPage.c" gint last_location_x = 0; gint last_location_y = 0; - EditingToolsEditingToolWindow* _tmp9_; + EditingToolsEditingToolWindow* _tmp8_; + gint _tmp9_ = 0; gint _tmp10_ = 0; - gint _tmp11_ = 0; - GeeHashMap* _tmp12_; - EditingToolsEditingTool* _tmp13_; - const gchar* _tmp14_; + GeeHashMap* _tmp11_; + EditingToolsEditingTool* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; gchar* _tmp15_; - gchar* _tmp16_; - gint _tmp17_; - GeeHashMap* _tmp18_; - EditingToolsEditingTool* _tmp19_; - const gchar* _tmp20_; + gint _tmp16_; + GeeHashMap* _tmp17_; + EditingToolsEditingTool* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_; gchar* _tmp21_; - gchar* _tmp22_; - gint _tmp23_; + gint _tmp22_; #line 1490 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = tool_window; + _tmp8_ = tool_window; #line 1490 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_window_get_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow), &_tmp10_, &_tmp11_); + gtk_window_get_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), &_tmp9_, &_tmp10_); #line 1490 "/home/jens/Source/shotwell/src/PhotoPage.vala" - last_location_x = _tmp10_; + last_location_x = _tmp9_; #line 1490 "/home/jens/Source/shotwell/src/PhotoPage.vala" - last_location_y = _tmp11_; + last_location_y = _tmp10_; #line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = self->priv->last_locations; + _tmp11_ = self->priv->last_locations; #line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = tool; + _tmp12_ = tool; #line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = _tmp13_->name; + _tmp13_ = _tmp12_->name; #line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = g_strconcat (_tmp14_, "_x", NULL); + _tmp14_ = g_strconcat (_tmp13_, "_x", NULL); #line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = last_location_x; + _tmp16_ = last_location_x; #line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_, (gpointer) ((gintptr) _tmp17_)); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_, (gpointer) ((gintptr) _tmp16_)); #line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp15_); #line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = self->priv->last_locations; + _tmp17_ = self->priv->last_locations; #line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = tool; + _tmp18_ = tool; #line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = _tmp19_->name; + _tmp19_ = _tmp18_->name; #line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = g_strconcat (_tmp20_, "_y", NULL); + _tmp20_ = g_strconcat (_tmp19_, "_y", NULL); #line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = last_location_y; + _tmp22_ = last_location_y; #line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, (gpointer) ((gintptr) _tmp23_)); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp21_, (gpointer) ((gintptr) _tmp22_)); #line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_free0 (_tmp22_); -#line 10212 "PhotoPage.c" + _g_free0 (_tmp21_); +#line 10737 "PhotoPage.c" } #line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = tool; + _tmp23_ = tool; #line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_tools_editing_tool_deactivate (_tmp24_); + editing_tools_editing_tool_deactivate (_tmp23_); #line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = tool; + _tmp24_ = tool; #line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_parse_name ("activated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp26_, NULL, FALSE); + g_signal_parse_name ("activated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp25_, NULL, FALSE); #line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_handlers_disconnect_matched (_tmp25_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated, self); + g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated, self); #line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = tool; + _tmp26_ = tool; #line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_parse_name ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp28_, NULL, FALSE); + g_signal_parse_name ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp27_, NULL, FALSE); #line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_handlers_disconnect_matched (_tmp27_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp28_, 0, NULL, (GCallback) _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated, self); + g_signal_handlers_disconnect_matched (_tmp26_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp27_, 0, NULL, (GCallback) _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated, self); #line 1501 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = tool; + _tmp28_ = tool; #line 1501 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_parse_name ("applied", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp30_, NULL, FALSE); + g_signal_parse_name ("applied", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp29_, NULL, FALSE); #line 1501 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_handlers_disconnect_matched (_tmp29_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp30_, 0, NULL, (GCallback) _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied, self); + g_signal_handlers_disconnect_matched (_tmp28_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp29_, 0, NULL, (GCallback) _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied, self); #line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp31_ = tool; + _tmp30_ = tool; #line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_parse_name ("cancelled", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp32_, NULL, FALSE); + g_signal_parse_name ("cancelled", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp31_, NULL, FALSE); #line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_handlers_disconnect_matched (_tmp31_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp32_, 0, NULL, (GCallback) _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled, self); + g_signal_handlers_disconnect_matched (_tmp30_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp31_, 0, NULL, (GCallback) _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled, self); #line 1503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp33_ = tool; + _tmp32_ = tool; #line 1503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_parse_name ("aborted", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp34_, NULL, FALSE); + g_signal_parse_name ("aborted", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp33_, NULL, FALSE); #line 1503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_handlers_disconnect_matched (_tmp33_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp34_, 0, NULL, (GCallback) _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted, self); + g_signal_handlers_disconnect_matched (_tmp32_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp33_, 0, NULL, (GCallback) _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted, self); #line 1505 "/home/jens/Source/shotwell/src/PhotoPage.vala" _editing_tools_editing_tool_unref0 (tool); #line 1505 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10260,103 +10785,91 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c #line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala" replacement = NULL; #line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp35_ = new_pixbuf; -#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp35_ != NULL) { -#line 10262 "PhotoPage.c" - GdkPixbuf* _tmp36_; - GdkPixbuf* _tmp37_; -#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp36_ = new_pixbuf; + if (new_pixbuf != NULL) { +#line 10785 "PhotoPage.c" + GdkPixbuf* _tmp34_; #line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp37_ = _g_object_ref0 (_tmp36_); + _tmp34_ = _g_object_ref0 (new_pixbuf); #line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (replacement); #line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala" - replacement = _tmp37_; -#line 10273 "PhotoPage.c" + replacement = _tmp34_; +#line 10793 "PhotoPage.c" } else { - GdkPixbuf* _tmp38_; + GdkPixbuf* _tmp35_; #line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp38_ = self->priv->cancel_editing_pixbuf; + _tmp35_ = self->priv->cancel_editing_pixbuf; #line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp38_ != NULL) { -#line 10280 "PhotoPage.c" - GdkPixbuf* _tmp39_; - GdkPixbuf* _tmp40_; - GdkPixbuf* _tmp41_; - Dimensions _tmp42_ = {0}; + if (_tmp35_ != NULL) { +#line 10800 "PhotoPage.c" + GdkPixbuf* _tmp36_; + GdkPixbuf* _tmp37_; + GdkPixbuf* _tmp38_; + Dimensions _tmp39_ = {0}; #line 1516 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp39_ = self->priv->cancel_editing_pixbuf; + _tmp36_ = self->priv->cancel_editing_pixbuf; #line 1516 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp40_ = _g_object_ref0 (_tmp39_); + _tmp37_ = _g_object_ref0 (_tmp36_); #line 1516 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (replacement); #line 1516 "/home/jens/Source/shotwell/src/PhotoPage.vala" - replacement = _tmp40_; + replacement = _tmp37_; #line 1517 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp41_ = replacement; + _tmp38_ = replacement; #line 1517 "/home/jens/Source/shotwell/src/PhotoPage.vala" - dimensions_for_pixbuf (_tmp41_, &_tmp42_); + dimensions_for_pixbuf (_tmp38_, &_tmp39_); #line 1517 "/home/jens/Source/shotwell/src/PhotoPage.vala" - *new_max_dim = _tmp42_; + *new_max_dim = _tmp39_; #line 1518 "/home/jens/Source/shotwell/src/PhotoPage.vala" needs_improvement = FALSE; -#line 10301 "PhotoPage.c" +#line 10821 "PhotoPage.c" } else { #line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala" needs_improvement = TRUE; -#line 10305 "PhotoPage.c" +#line 10825 "PhotoPage.c" } } #line 1523 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp43_ = replacement; + _tmp40_ = replacement; #line 1523 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp43_ != NULL) { -#line 10312 "PhotoPage.c" - GdkPixbuf* _tmp44_; - Dimensions _tmp45_; + if (_tmp40_ != NULL) { +#line 10832 "PhotoPage.c" + GdkPixbuf* _tmp41_; + Dimensions _tmp42_; #line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp44_ = replacement; + _tmp41_ = replacement; #line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp45_ = *new_max_dim; + _tmp42_ = *new_max_dim; #line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp44_, &_tmp45_, NULL); -#line 10321 "PhotoPage.c" + single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp41_, &_tmp42_, NULL); +#line 10841 "PhotoPage.c" } #line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->cancel_editing_pixbuf); #line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->cancel_editing_pixbuf = NULL; #line 1528 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp46_ = needs_improvement; -#line 1528 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp46_) { + if (needs_improvement) { #line 1529 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->pixbuf_dirty = TRUE; #line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _editing_host_page_update_pixbuf_gsource_func, g_object_ref (self), g_object_unref); -#line 10335 "PhotoPage.c" +#line 10853 "PhotoPage.c" } #line 1534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp47_ = command; -#line 1534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp47_ != NULL) { -#line 10341 "PhotoPage.c" - CommandManager* _tmp48_; - CommandManager* _tmp49_; - Command* _tmp50_; -#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp48_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + if (command != NULL) { +#line 10857 "PhotoPage.c" + CommandManager* _tmp43_; + CommandManager* _tmp44_; #line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp49_ = _tmp48_; + _tmp43_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp50_ = command; + _tmp44_ = _tmp43_; #line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command_manager_execute (_tmp49_, _tmp50_); + command_manager_execute (_tmp44_, command); #line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _command_manager_unref0 (_tmp49_); -#line 10355 "PhotoPage.c" + _command_manager_unref0 (_tmp44_); +#line 10868 "PhotoPage.c" } #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (replacement); @@ -10364,11 +10877,14 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c _g_object_unref0 (tool_window); #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala" _editing_tools_editing_tool_unref0 (tool); -#line 10363 "PhotoPage.c" +#line 10876 "PhotoPage.c" } -static gboolean editing_host_page_real_on_double_click (EditingHostPage* self, GdkEventButton* event) { +static gboolean +editing_host_page_real_on_double_click (EditingHostPage* self, + GdkEventButton* event) +{ gboolean result = FALSE; #line 1540 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); @@ -10376,127 +10892,107 @@ static gboolean editing_host_page_real_on_double_click (EditingHostPage* self, G result = FALSE; #line 1541 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10375 "PhotoPage.c" +#line 10891 "PhotoPage.c" } -gboolean editing_host_page_on_double_click (EditingHostPage* self, GdkEventButton* event) { +gboolean +editing_host_page_on_double_click (EditingHostPage* self, + GdkEventButton* event) +{ #line 1540 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); #line 1540 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->on_double_click (self, event); -#line 10384 "PhotoPage.c" +#line 10903 "PhotoPage.c" } -static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton* event) { +static gboolean +editing_host_page_real_on_left_click (Page* base, + GdkEventButton* event) +{ EditingHostPage * self; gboolean result = FALSE; - GdkEventButton* _tmp0_; - GdkEventType _tmp1_; + GdkEventType _tmp0_; gint x = 0; - GdkEventButton* _tmp6_; - gdouble _tmp7_; + gdouble _tmp3_; gint y = 0; - GdkEventButton* _tmp8_; - gdouble _tmp9_; - gboolean _tmp10_ = FALSE; - EditingToolsEditingTool* _tmp11_; - EditingToolsEditingTool* _tmp18_; - gint _tmp19_; - gint _tmp20_; - gboolean _tmp21_; - EditingToolsEditingTool* _tmp22_; - gint _tmp23_; - gint _tmp24_; + gdouble _tmp4_; + gboolean _tmp5_ = FALSE; + EditingToolsEditingTool* _tmp6_; + EditingToolsEditingTool* _tmp10_; + gint _tmp11_; + gint _tmp12_; + EditingToolsEditingTool* _tmp13_; + gint _tmp14_; + gint _tmp15_; #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); #line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = event; -#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = _tmp0_->type; + _tmp0_ = event->type; #line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp1_ == GDK_2BUTTON_PRESS) { -#line 10418 "PhotoPage.c" - gboolean _tmp2_ = FALSE; - EditingToolsEditingTool* _tmp3_; -#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = self->priv->current_tool; + if (_tmp0_ == GDK_2BUTTON_PRESS) { +#line 10934 "PhotoPage.c" + gboolean _tmp1_ = FALSE; + EditingToolsEditingTool* _tmp2_; #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp3_ == NULL) { -#line 10425 "PhotoPage.c" - GdkEventButton* _tmp4_; - gboolean _tmp5_; + _tmp2_ = self->priv->current_tool; #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = event; + if (_tmp2_ == NULL) { #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = editing_host_page_on_double_click (self, _tmp4_); -#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = _tmp5_; -#line 10434 "PhotoPage.c" + _tmp1_ = editing_host_page_on_double_click (self, event); +#line 10943 "PhotoPage.c" } else { #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = FALSE; -#line 10438 "PhotoPage.c" + _tmp1_ = FALSE; +#line 10947 "PhotoPage.c" } #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp2_; + result = _tmp1_; #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10444 "PhotoPage.c" +#line 10953 "PhotoPage.c" } #line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = event; -#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = _tmp6_->x; + _tmp3_ = event->x; #line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala" - x = (gint) _tmp7_; + x = (gint) _tmp3_; #line 1551 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = event; + _tmp4_ = event->y; #line 1551 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = _tmp8_->y; -#line 1551 "/home/jens/Source/shotwell/src/PhotoPage.vala" - y = (gint) _tmp9_; -#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = self->priv->current_tool; + y = (gint) _tmp4_; #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp11_ == NULL) { -#line 10462 "PhotoPage.c" - GtkScale* _tmp12_; - gdouble _tmp13_; + _tmp6_ = self->priv->current_tool; #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = self->priv->zoom_slider; + if (_tmp6_ == NULL) { +#line 10967 "PhotoPage.c" + GtkScale* _tmp7_; #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_range_get_type (), GtkRange)); + _tmp7_ = self->priv->zoom_slider; #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp13_ != 0.0; -#line 10471 "PhotoPage.c" + _tmp5_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange)) != 0.0; +#line 10973 "PhotoPage.c" } else { #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = FALSE; -#line 10475 "PhotoPage.c" + _tmp5_ = FALSE; +#line 10977 "PhotoPage.c" } #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp10_) { -#line 10479 "PhotoPage.c" - GdkEventButton* _tmp14_; - gdouble _tmp15_; - GdkEventButton* _tmp16_; - gdouble _tmp17_; -#line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = event; + if (_tmp5_) { +#line 10981 "PhotoPage.c" + gdouble _tmp8_; + gdouble _tmp9_; #line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = _tmp14_->x; + _tmp8_ = event->x; #line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->zoom_pan_start_point.x = (gint) _tmp15_; + self->priv->zoom_pan_start_point.x = (gint) _tmp8_; #line 1557 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = event; + _tmp9_ = event->y; #line 1557 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = _tmp16_->y; -#line 1557 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->zoom_pan_start_point.y = (gint) _tmp17_; + self->priv->zoom_pan_start_point.y = (gint) _tmp9_; #line 1558 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->is_pan_in_progress = TRUE; #line 1559 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10505,62 +11001,61 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton result = TRUE; #line 1561 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10504 "PhotoPage.c" +#line 11000 "PhotoPage.c" } #line 1565 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = self->priv->current_tool; + _tmp10_ = self->priv->current_tool; #line 1565 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp18_ == NULL) { + if (_tmp10_ == NULL) { #line 1566 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; #line 1566 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10514 "PhotoPage.c" +#line 11010 "PhotoPage.c" } #line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = x; -#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = y; + _tmp11_ = x; #line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = single_photo_page_is_inside_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp19_, _tmp20_); + _tmp12_ = y; #line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp21_) { + if (!single_photo_page_is_inside_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp11_, _tmp12_)) { #line 1572 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; #line 1572 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10528 "PhotoPage.c" +#line 11022 "PhotoPage.c" } #line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = self->priv->current_tool; + _tmp13_ = self->priv->current_tool; #line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = x; + _tmp14_ = x; #line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = y; + _tmp15_ = y; #line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_tools_editing_tool_on_left_click (_tmp22_, _tmp23_, _tmp24_); + editing_tools_editing_tool_on_left_click (_tmp13_, _tmp14_, _tmp15_); #line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; #line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10542 "PhotoPage.c" +#line 11036 "PhotoPage.c" } -static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventButton* event) { +static gboolean +editing_host_page_real_on_left_released (Page* base, + GdkEventButton* event) +{ EditingHostPage * self; gboolean result = FALSE; gboolean _tmp0_; - EditingToolsEditingTool* _tmp21_; - EditingToolsEditingTool* _tmp22_; - GdkEventButton* _tmp23_; - gdouble _tmp24_; - GdkEventButton* _tmp25_; - gdouble _tmp26_; - EditingToolsEditingTool* _tmp27_; - EditingToolsEditingToolWindow* _tmp28_; - EditingToolsEditingToolWindow* _tmp29_; - gboolean _tmp30_; + EditingToolsEditingTool* _tmp19_; + EditingToolsEditingTool* _tmp20_; + gdouble _tmp21_; + gdouble _tmp22_; + EditingToolsEditingTool* _tmp23_; + EditingToolsEditingToolWindow* _tmp24_; + EditingToolsEditingToolWindow* _tmp25_; + gboolean _tmp26_; #line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10569,31 +11064,29 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut _tmp0_ = self->priv->is_pan_in_progress; #line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 10568 "PhotoPage.c" +#line 11063 "PhotoPage.c" GdkPoint viewport_center = {0}; ZoomState _tmp1_ = {0}; GdkPoint _tmp2_ = {0}; gint delta_x = 0; - GdkEventButton* _tmp3_; - gdouble _tmp4_; - GdkPoint _tmp5_; - gint _tmp6_; + gdouble _tmp3_; + GdkPoint _tmp4_; + gint _tmp5_; gint delta_y = 0; - GdkEventButton* _tmp7_; - gdouble _tmp8_; - GdkPoint _tmp9_; + gdouble _tmp6_; + GdkPoint _tmp7_; + gint _tmp8_; + gint _tmp9_; gint _tmp10_; gint _tmp11_; gint _tmp12_; - gint _tmp13_; - gint _tmp14_; ZoomState zoom_state = {0}; - ZoomState _tmp15_ = {0}; - GdkPoint _tmp16_; - ZoomState _tmp17_; - ZoomBuffer* _tmp18_; - ZoomBuffer* _tmp19_; - ZoomState _tmp20_; + ZoomState _tmp13_ = {0}; + GdkPoint _tmp14_; + ZoomState _tmp15_; + ZoomBuffer* _tmp16_; + ZoomBuffer* _tmp17_; + ZoomState _tmp18_; #line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_); #line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10601,286 +11094,266 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut #line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala" viewport_center = _tmp2_; #line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = event; + _tmp3_ = event->x; #line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_->x; + _tmp4_ = self->priv->zoom_pan_start_point; #line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = self->priv->zoom_pan_start_point; + _tmp5_ = _tmp4_.x; #line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _tmp5_.x; -#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala" - delta_x = ((gint) _tmp4_) - _tmp6_; -#line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = event; + delta_x = ((gint) _tmp3_) - _tmp5_; #line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp7_->y; + _tmp6_ = event->y; #line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = self->priv->zoom_pan_start_point; + _tmp7_ = self->priv->zoom_pan_start_point; #line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp9_.y; + _tmp8_ = _tmp7_.y; #line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala" - delta_y = ((gint) _tmp8_) - _tmp10_; + delta_y = ((gint) _tmp6_) - _tmp8_; #line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = viewport_center.x; + _tmp9_ = viewport_center.x; #line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = delta_x; + _tmp10_ = delta_x; #line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_center.x = _tmp11_ - _tmp12_; + viewport_center.x = _tmp9_ - _tmp10_; #line 1586 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = viewport_center.y; + _tmp11_ = viewport_center.y; #line 1586 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = delta_y; + _tmp12_ = delta_y; #line 1586 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_center.y = _tmp13_ - _tmp14_; + viewport_center.y = _tmp11_ - _tmp12_; #line 1588 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp15_); + single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp13_); #line 1588 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = viewport_center; + _tmp14_ = viewport_center; #line 1588 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_state_init_pan (&zoom_state, &_tmp15_, &_tmp16_); + zoom_state_init_pan (&zoom_state, &_tmp13_, &_tmp14_); #line 1589 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = zoom_state; + _tmp15_ = zoom_state; #line 1589 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp17_); + single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp15_); #line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = single_photo_page_get_zoom_buffer (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); + _tmp16_ = single_photo_page_get_zoom_buffer (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = _tmp18_; + _tmp17_ = _tmp16_; #line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = zoom_state; + _tmp18_ = zoom_state; #line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_buffer_flush_demand_cache (_tmp19_, &_tmp20_); + zoom_buffer_flush_demand_cache (_tmp17_, &_tmp18_); #line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp19_); + _g_object_unref0 (_tmp17_); #line 1592 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->is_pan_in_progress = FALSE; #line 1593 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 10655 "PhotoPage.c" +#line 11144 "PhotoPage.c" } #line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = self->priv->current_tool; + _tmp19_ = self->priv->current_tool; #line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp21_ == NULL) { + if (_tmp19_ == NULL) { #line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; #line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10665 "PhotoPage.c" +#line 11154 "PhotoPage.c" } #line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = self->priv->current_tool; -#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = event; + _tmp20_ = self->priv->current_tool; #line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = _tmp23_->x; + _tmp21_ = event->x; #line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = event; + _tmp22_ = event->y; #line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp26_ = _tmp25_->y; -#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_tools_editing_tool_on_left_released (_tmp22_, (gint) _tmp24_, (gint) _tmp26_); + editing_tools_editing_tool_on_left_released (_tmp20_, (gint) _tmp21_, (gint) _tmp22_); #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = self->priv->current_tool; + _tmp23_ = self->priv->current_tool; #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = editing_tools_editing_tool_get_tool_window (_tmp27_); + _tmp24_ = editing_tools_editing_tool_get_tool_window (_tmp23_); #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = _tmp28_; + _tmp25_ = _tmp24_; #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_ = _tmp29_ != NULL; + _tmp26_ = _tmp25_ != NULL; #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp29_); + _g_object_unref0 (_tmp25_); #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp30_) { -#line 10691 "PhotoPage.c" - EditingToolsEditingTool* _tmp31_; - EditingToolsEditingToolWindow* _tmp32_; - EditingToolsEditingToolWindow* _tmp33_; + if (_tmp26_) { +#line 11176 "PhotoPage.c" + EditingToolsEditingTool* _tmp27_; + EditingToolsEditingToolWindow* _tmp28_; + EditingToolsEditingToolWindow* _tmp29_; #line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp31_ = self->priv->current_tool; + _tmp27_ = self->priv->current_tool; #line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp32_ = editing_tools_editing_tool_get_tool_window (_tmp31_); + _tmp28_ = editing_tools_editing_tool_get_tool_window (_tmp27_); #line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp33_ = _tmp32_; + _tmp29_ = _tmp28_; #line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow)); + gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_window_get_type (), GtkWindow)); #line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp33_); -#line 10705 "PhotoPage.c" + _g_object_unref0 (_tmp29_); +#line 11190 "PhotoPage.c" } #line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; #line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10711 "PhotoPage.c" +#line 11196 "PhotoPage.c" } -static gboolean editing_host_page_real_on_right_click (Page* base, GdkEventButton* event) { +static gboolean +editing_host_page_real_on_right_click (Page* base, + GdkEventButton* event) +{ EditingHostPage * self; gboolean result = FALSE; - GdkEventButton* _tmp0_; - gboolean _tmp1_; #line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); #line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = event; -#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = page_on_context_buttonpress (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp0_); -#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp1_; + result = page_on_context_buttonpress (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), event); #line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10732 "PhotoPage.c" +#line 11214 "PhotoPage.c" } -static gboolean _editing_host_page_on_fetch_original_gsource_func (gpointer self) { +static gboolean +_editing_host_page_on_fetch_original_gsource_func (gpointer self) +{ gboolean result; result = editing_host_page_on_fetch_original ((EditingHostPage*) self); #line 1622 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10741 "PhotoPage.c" +#line 11225 "PhotoPage.c" } -static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap* map) { - GeeMap* _tmp0_; +static void +editing_host_page_on_photos_altered (EditingHostPage* self, + GeeMap* map) +{ + Photo* _tmp0_; Photo* _tmp1_; - Photo* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; - Photo* _tmp5_; - Photo* _tmp6_; - gboolean _tmp7_; - gboolean _tmp8_; + gboolean _tmp2_; + Photo* _tmp3_; + Photo* _tmp4_; + gboolean _tmp5_; + ViewCollection* _tmp6_; + ViewCollection* _tmp7_; + ViewCollection* _tmp8_; ViewCollection* _tmp9_; - ViewCollection* _tmp10_; - gint _tmp11_; - ViewCollection* _tmp12_; - ViewCollection* _tmp13_; - gint _tmp14_; #line 1613 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1613 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (GEE_IS_MAP (map)); #line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = map; -#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = editing_host_page_get_photo (self); -#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = _tmp1_; + _tmp0_ = editing_host_page_get_photo (self); #line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject)); + _tmp1_ = _tmp0_; #line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = !_tmp3_; + _tmp2_ = !gee_map_has_key (map, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); #line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp4_) { + if (_tmp2_) { #line 1615 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 10781 "PhotoPage.c" +#line 11259 "PhotoPage.c" } #line 1617 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->pixbuf_dirty = TRUE; #line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = editing_host_page_get_photo (self); -#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _tmp5_; + _tmp3_ = editing_host_page_get_photo (self); #line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = photo_has_transformations (_tmp6_); + _tmp4_ = _tmp3_; #line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp7_; + _tmp5_ = photo_has_transformations (_tmp4_); #line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp4_); #line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp8_) { + if (_tmp5_) { #line 1622 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _editing_host_page_on_fetch_original_gsource_func, g_object_ref (self), g_object_unref); -#line 10799 "PhotoPage.c" +#line 11275 "PhotoPage.c" } #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp9_; -#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = view_collection_get_selected_count (_tmp10_); + _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp7_ = _tmp6_; #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = _tmp12_; + _tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp9_ = _tmp8_; #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_update_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp11_, _tmp14_); + page_update_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), view_collection_get_selected_count (_tmp7_), data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection))); #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp13_); + _data_collection_unref0 (_tmp9_); #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp10_); -#line 10819 "PhotoPage.c" + _data_collection_unref0 (_tmp7_); +#line 11291 "PhotoPage.c" } -static void editing_host_page_on_view_contents_ordering_altered (EditingHostPage* self) { +static void +editing_host_page_on_view_contents_ordering_altered (EditingHostPage* self) +{ #line 1627 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_refresh_caches (self, "on_view_contents_ordering_altered"); -#line 10828 "PhotoPage.c" +#line 11302 "PhotoPage.c" } -static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) { +static gboolean +editing_host_page_on_fetch_original (EditingHostPage* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 1631 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); -#line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = editing_host_page_has_photo (self); -#line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp0_) { -#line 10841 "PhotoPage.c" - PixbufCache* _tmp1_; +#line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala" + if (editing_host_page_has_photo (self)) { +#line 11314 "PhotoPage.c" + PixbufCache* _tmp0_; + Photo* _tmp1_; Photo* _tmp2_; - Photo* _tmp3_; #line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = self->priv->master_cache; + _tmp0_ = self->priv->master_cache; #line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = editing_host_page_get_photo (self); + _tmp1_ = editing_host_page_get_photo (self); #line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pixbuf_cache_prefetch (_tmp1_, _tmp3_, BACKGROUND_JOB_JOB_PRIORITY_LOW, FALSE); + pixbuf_cache_prefetch (_tmp0_, _tmp2_, BACKGROUND_JOB_JOB_PRIORITY_LOW, FALSE); #line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp3_); -#line 10855 "PhotoPage.c" + _g_object_unref0 (_tmp2_); +#line 11328 "PhotoPage.c" } #line 1635 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; #line 1635 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10861 "PhotoPage.c" +#line 11334 "PhotoPage.c" } -static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) { +static gboolean +editing_host_page_is_panning_possible (EditingHostPage* self) +{ gboolean result = FALSE; Dimensions content_dim = {0}; Dimensions _tmp0_ = {0}; ZoomState _tmp1_ = {0}; - gint _tmp2_; - ZoomState _tmp3_ = {0}; - gint _tmp4_; + ZoomState _tmp2_ = {0}; Dimensions canvas_dim = {0}; - Dimensions _tmp5_ = {0}; - gboolean _tmp6_ = FALSE; + Dimensions _tmp3_ = {0}; + gboolean _tmp4_ = FALSE; + Dimensions _tmp5_; + gint _tmp6_; Dimensions _tmp7_; gint _tmp8_; - Dimensions _tmp9_; - gint _tmp10_; #line 1638 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); #line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10890,87 +11363,83 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) { #line 1642 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_); #line 1642 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = zoom_state_get_zoomed_width (&_tmp1_); -#line 1642 "/home/jens/Source/shotwell/src/PhotoPage.vala" - content_dim.width = _tmp2_; -#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp3_); + content_dim.width = zoom_state_get_zoomed_width (&_tmp1_); #line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = zoom_state_get_zoomed_height (&_tmp3_); + single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp2_); #line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala" - content_dim.height = _tmp4_; + content_dim.height = zoom_state_get_zoomed_height (&_tmp2_); #line 1644 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_); + single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp3_); #line 1644 "/home/jens/Source/shotwell/src/PhotoPage.vala" - canvas_dim = _tmp5_; + canvas_dim = _tmp3_; #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = canvas_dim; + _tmp5_ = canvas_dim; #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp7_.width; + _tmp6_ = _tmp5_.width; #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = content_dim; + _tmp7_ = content_dim; #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp9_.width; + _tmp8_ = _tmp7_.width; #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp8_ >= _tmp10_) { -#line 10912 "PhotoPage.c" + if (_tmp6_ >= _tmp8_) { +#line 11381 "PhotoPage.c" + Dimensions _tmp9_; + gint _tmp10_; Dimensions _tmp11_; gint _tmp12_; - Dimensions _tmp13_; - gint _tmp14_; #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = canvas_dim; + _tmp9_ = canvas_dim; #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _tmp11_.height; + _tmp10_ = _tmp9_.height; #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = content_dim; + _tmp11_ = content_dim; #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = _tmp13_.height; + _tmp12_ = _tmp11_.height; #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _tmp12_ >= _tmp14_; -#line 10927 "PhotoPage.c" + _tmp4_ = _tmp10_ >= _tmp12_; +#line 11396 "PhotoPage.c" } else { #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = FALSE; -#line 10931 "PhotoPage.c" + _tmp4_ = FALSE; +#line 11400 "PhotoPage.c" } #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = !_tmp6_; + result = !_tmp4_; #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 10937 "PhotoPage.c" +#line 11406 "PhotoPage.c" } -static void editing_host_page_update_cursor_for_zoom_context (EditingHostPage* self) { - gboolean _tmp0_; +static void +editing_host_page_update_cursor_for_zoom_context (EditingHostPage* self) +{ #line 1649 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1650 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = editing_host_page_is_panning_possible (self); -#line 1650 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp0_) { + if (editing_host_page_is_panning_possible (self)) { #line 1651 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_FLEUR); -#line 10951 "PhotoPage.c" +#line 11419 "PhotoPage.c" } else { #line 1653 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_LEFT_PTR); -#line 10955 "PhotoPage.c" +#line 11423 "PhotoPage.c" } } -static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* event, gint x, gint y, GdkModifierType mask) { +static gboolean +editing_host_page_real_on_motion (Page* base, + GdkEventMotion* event, + gint x, + gint y, + GdkModifierType mask) +{ EditingHostPage * self; gboolean result = FALSE; EditingToolsEditingTool* _tmp0_; - gboolean _tmp6_; - GdkEventMotion* _tmp24_; - gint _tmp25_; - gint _tmp26_; - GdkModifierType _tmp27_; - gboolean _tmp28_; + gboolean _tmp2_; #line 1657 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 1657 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -10979,167 +11448,137 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev _tmp0_ = self->priv->current_tool; #line 1658 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 10978 "PhotoPage.c" +#line 11447 "PhotoPage.c" EditingToolsEditingTool* _tmp1_; - gint _tmp2_; - gint _tmp3_; - GdkModifierType _tmp4_; - GdkEventMotion* _tmp5_; #line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; #line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = x; -#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = y; -#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = mask; -#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_tools_editing_tool_on_motion (_tmp1_, _tmp2_, _tmp3_, _tmp4_); + editing_tools_editing_tool_on_motion (_tmp1_, x, y, mask); #line 1662 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = event; -#line 1662 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gdk_event_request_motions (_tmp5_); + gdk_event_request_motions (event); #line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; #line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11002 "PhotoPage.c" +#line 11459 "PhotoPage.c" } #line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_update_cursor_for_zoom_context (self); #line 1669 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = self->priv->is_pan_in_progress; + _tmp2_ = self->priv->is_pan_in_progress; #line 1669 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp6_) { -#line 11010 "PhotoPage.c" + if (_tmp2_) { +#line 11467 "PhotoPage.c" gint delta_x = 0; - GdkEventMotion* _tmp7_; - gdouble _tmp8_; - GdkPoint _tmp9_; - gint _tmp10_; + gdouble _tmp3_; + GdkPoint _tmp4_; + gint _tmp5_; gint delta_y = 0; - GdkEventMotion* _tmp11_; - gdouble _tmp12_; - GdkPoint _tmp13_; - gint _tmp14_; + gdouble _tmp6_; + GdkPoint _tmp7_; + gint _tmp8_; GdkPoint viewport_center = {0}; - ZoomState _tmp15_ = {0}; - GdkPoint _tmp16_ = {0}; - gint _tmp17_; - gint _tmp18_; - gint _tmp19_; - gint _tmp20_; + ZoomState _tmp9_ = {0}; + GdkPoint _tmp10_ = {0}; + gint _tmp11_; + gint _tmp12_; + gint _tmp13_; + gint _tmp14_; ZoomState zoom_state = {0}; - ZoomState _tmp21_ = {0}; - GdkPoint _tmp22_; - ZoomState _tmp23_; -#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = event; + ZoomState _tmp15_ = {0}; + GdkPoint _tmp16_; + ZoomState _tmp17_; #line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp7_->x; + _tmp3_ = event->x; #line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = self->priv->zoom_pan_start_point; + _tmp4_ = self->priv->zoom_pan_start_point; #line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp9_.x; + _tmp5_ = _tmp4_.x; #line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala" - delta_x = ((gint) _tmp8_) - _tmp10_; + delta_x = ((gint) _tmp3_) - _tmp5_; #line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = event; + _tmp6_ = event->y; #line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _tmp11_->y; + _tmp7_ = self->priv->zoom_pan_start_point; #line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = self->priv->zoom_pan_start_point; + _tmp8_ = _tmp7_.y; #line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = _tmp13_.y; -#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala" - delta_y = ((gint) _tmp12_) - _tmp14_; + delta_y = ((gint) _tmp6_) - _tmp8_; #line 1673 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp15_); + single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp9_); #line 1673 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_state_get_viewport_center (&_tmp15_, &_tmp16_); + zoom_state_get_viewport_center (&_tmp9_, &_tmp10_); #line 1673 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_center = _tmp16_; + viewport_center = _tmp10_; #line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = viewport_center.x; + _tmp11_ = viewport_center.x; #line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = delta_x; + _tmp12_ = delta_x; #line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_center.x = _tmp17_ - _tmp18_; + viewport_center.x = _tmp11_ - _tmp12_; #line 1675 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = viewport_center.y; + _tmp13_ = viewport_center.y; #line 1675 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = delta_y; + _tmp14_ = delta_y; #line 1675 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_center.y = _tmp19_ - _tmp20_; + viewport_center.y = _tmp13_ - _tmp14_; #line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp21_); + single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp15_); #line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = viewport_center; + _tmp16_ = viewport_center; #line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_state_init_pan (&zoom_state, &_tmp21_, &_tmp22_); + zoom_state_init_pan (&zoom_state, &_tmp15_, &_tmp16_); #line 1679 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = zoom_state; + _tmp17_ = zoom_state; #line 1679 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_on_interactive_pan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp23_); + single_photo_page_on_interactive_pan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp17_); #line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; #line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11084 "PhotoPage.c" +#line 11535 "PhotoPage.c" } #line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = event; -#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = x; -#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp26_ = y; -#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = mask; -#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = PAGE_CLASS (editing_host_page_parent_class)->on_motion (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp24_, _tmp25_, _tmp26_, _tmp27_); -#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp28_; + result = PAGE_CLASS (editing_host_page_parent_class)->on_motion (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), event, x, y, mask); #line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11100 "PhotoPage.c" +#line 11541 "PhotoPage.c" } -static gboolean editing_host_page_real_on_leave_notify_event (Page* base) { +static gboolean +editing_host_page_real_on_leave_notify_event (Page* base) +{ EditingHostPage * self; gboolean result = FALSE; EditingToolsEditingTool* _tmp0_; - gboolean _tmp3_; #line 1686 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->current_tool; #line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11115 "PhotoPage.c" +#line 11557 "PhotoPage.c" EditingToolsEditingTool* _tmp1_; - gboolean _tmp2_; #line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; #line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = editing_tools_editing_tool_on_leave_notify_event (_tmp1_); -#line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp2_; + result = editing_tools_editing_tool_on_leave_notify_event (_tmp1_); #line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11126 "PhotoPage.c" +#line 11565 "PhotoPage.c" } #line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = PAGE_CLASS (editing_host_page_parent_class)->on_leave_notify_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page)); -#line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp3_; + result = PAGE_CLASS (editing_host_page_parent_class)->on_leave_notify_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page)); #line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11134 "PhotoPage.c" +#line 11571 "PhotoPage.c" } -static void editing_host_page_track_tool_window (EditingHostPage* self) { +static void +editing_host_page_track_tool_window (EditingHostPage* self) +{ EditingToolsEditingTool* _tmp0_; #line 1693 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); @@ -11147,7 +11586,7 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) { _tmp0_ = self->priv->current_tool; #line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11146 "PhotoPage.c" +#line 11585 "PhotoPage.c" EditingToolsEditingToolWindow* tool_window = NULL; EditingToolsEditingTool* _tmp1_; EditingToolsEditingToolWindow* _tmp2_; @@ -11163,35 +11602,35 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) { _tmp4_ = tool_window; #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_ != NULL) { -#line 11162 "PhotoPage.c" +#line 11601 "PhotoPage.c" EditingToolsEditingToolWindow* _tmp5_; - gboolean _tmp6_; #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = tool_window; #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = editing_tools_editing_tool_window_has_user_moved (_tmp5_); -#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = !_tmp6_; -#line 11171 "PhotoPage.c" + _tmp3_ = !editing_tools_editing_tool_window_has_user_moved (_tmp5_); +#line 11607 "PhotoPage.c" } else { #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = FALSE; -#line 11175 "PhotoPage.c" +#line 11611 "PhotoPage.c" } #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp3_) { #line 1698 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_place_tool_window (self); -#line 11181 "PhotoPage.c" +#line 11617 "PhotoPage.c" } #line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (tool_window); -#line 11185 "PhotoPage.c" +#line 11621 "PhotoPage.c" } } -static void editing_host_page_real_on_move (Page* base, GdkRectangle* rect) { +static void +editing_host_page_real_on_move (Page* base, + GdkRectangle* rect) +{ EditingHostPage * self; GdkRectangle _tmp0_; #line 1702 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11204,11 +11643,14 @@ static void editing_host_page_real_on_move (Page* base, GdkRectangle* rect) { _tmp0_ = *rect; #line 1705 "/home/jens/Source/shotwell/src/PhotoPage.vala" PAGE_CLASS (editing_host_page_parent_class)->on_move (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp0_); -#line 11203 "PhotoPage.c" +#line 11642 "PhotoPage.c" } -static void editing_host_page_real_on_move_finished (Page* base, GdkRectangle* rect) { +static void +editing_host_page_real_on_move_finished (Page* base, + GdkRectangle* rect) +{ EditingHostPage * self; GeeHashMap* _tmp0_; GdkRectangle _tmp1_; @@ -11224,50 +11666,52 @@ static void editing_host_page_real_on_move_finished (Page* base, GdkRectangle* r _tmp1_ = *rect; #line 1711 "/home/jens/Source/shotwell/src/PhotoPage.vala" PAGE_CLASS (editing_host_page_parent_class)->on_move_finished (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp1_); -#line 11223 "PhotoPage.c" +#line 11665 "PhotoPage.c" } -static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self, GdkEventKey* event) { +static gboolean +editing_host_page_on_keyboard_pan_event (EditingHostPage* self, + GdkEventKey* event) +{ gboolean result = FALSE; ZoomState current_zoom_state = {0}; ZoomState _tmp0_ = {0}; GdkPoint viewport_center = {0}; GdkPoint _tmp1_ = {0}; - GdkEventKey* _tmp2_; - guint _tmp3_; + guint _tmp2_; + const gchar* _tmp3_; const gchar* _tmp4_; - const gchar* _tmp5_; - GQuark _tmp7_ = 0U; + GQuark _tmp6_ = 0U; #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp6_label0 = 0; + static GQuark _tmp5_label0 = 0; #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp6_label1 = 0; + static GQuark _tmp5_label1 = 0; #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp6_label2 = 0; + static GQuark _tmp5_label2 = 0; #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp6_label3 = 0; + static GQuark _tmp5_label3 = 0; #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp6_label4 = 0; + static GQuark _tmp5_label4 = 0; #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp6_label5 = 0; + static GQuark _tmp5_label5 = 0; #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp6_label6 = 0; + static GQuark _tmp5_label6 = 0; #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp6_label7 = 0; + static GQuark _tmp5_label7 = 0; #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp6_label8 = 0; + static GQuark _tmp5_label8 = 0; #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp6_label9 = 0; + static GQuark _tmp5_label9 = 0; #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp6_label10 = 0; + static GQuark _tmp5_label10 = 0; #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp6_label11 = 0; -#line 11262 "PhotoPage.c" + static GQuark _tmp5_label11 = 0; +#line 11706 "PhotoPage.c" ZoomState new_zoom_state = {0}; - ZoomState _tmp12_; - GdkPoint _tmp13_; - ZoomState _tmp14_; + ZoomState _tmp11_; + GdkPoint _tmp12_; + ZoomState _tmp13_; #line 1714 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE); #line 1714 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11281,146 +11725,143 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self, #line 1716 "/home/jens/Source/shotwell/src/PhotoPage.vala" viewport_center = _tmp1_; #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = event; + _tmp2_ = event->keyval; #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_->keyval; + _tmp3_ = gdk_keyval_name (_tmp2_); #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = gdk_keyval_name (_tmp3_); -#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = (NULL == _tmp5_) ? 0 : g_quark_from_string (_tmp5_); + _tmp6_ = (NULL == _tmp4_) ? 0 : g_quark_from_string (_tmp4_); #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (((_tmp7_ == ((0 != _tmp6_label0) ? _tmp6_label0 : (_tmp6_label0 = g_quark_from_static_string ("Left")))) || (_tmp7_ == ((0 != _tmp6_label1) ? _tmp6_label1 : (_tmp6_label1 = g_quark_from_static_string ("KP_Left"))))) || (_tmp7_ == ((0 != _tmp6_label2) ? _tmp6_label2 : (_tmp6_label2 = g_quark_from_static_string ("KP_4"))))) { + if (((_tmp6_ == ((0 != _tmp5_label0) ? _tmp5_label0 : (_tmp5_label0 = g_quark_from_static_string ("Left")))) || (_tmp6_ == ((0 != _tmp5_label1) ? _tmp5_label1 : (_tmp5_label1 = g_quark_from_static_string ("KP_Left"))))) || (_tmp6_ == ((0 != _tmp5_label2) ? _tmp5_label2 : (_tmp5_label2 = g_quark_from_static_string ("KP_4"))))) { #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11293 "PhotoPage.c" +#line 11735 "PhotoPage.c" default: { - gint _tmp8_; + gint _tmp7_; #line 1722 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = viewport_center.x; + _tmp7_ = viewport_center.x; #line 1722 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_center.x = _tmp8_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE; + viewport_center.x = _tmp7_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE; #line 1723 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11303 "PhotoPage.c" +#line 11745 "PhotoPage.c" } } - } else if (((_tmp7_ == ((0 != _tmp6_label3) ? _tmp6_label3 : (_tmp6_label3 = g_quark_from_static_string ("Right")))) || (_tmp7_ == ((0 != _tmp6_label4) ? _tmp6_label4 : (_tmp6_label4 = g_quark_from_static_string ("KP_Right"))))) || (_tmp7_ == ((0 != _tmp6_label5) ? _tmp6_label5 : (_tmp6_label5 = g_quark_from_static_string ("KP_6"))))) { + } else if (((_tmp6_ == ((0 != _tmp5_label3) ? _tmp5_label3 : (_tmp5_label3 = g_quark_from_static_string ("Right")))) || (_tmp6_ == ((0 != _tmp5_label4) ? _tmp5_label4 : (_tmp5_label4 = g_quark_from_static_string ("KP_Right"))))) || (_tmp6_ == ((0 != _tmp5_label5) ? _tmp5_label5 : (_tmp5_label5 = g_quark_from_static_string ("KP_6"))))) { #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11309 "PhotoPage.c" +#line 11751 "PhotoPage.c" default: { - gint _tmp9_; + gint _tmp8_; #line 1728 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = viewport_center.x; + _tmp8_ = viewport_center.x; #line 1728 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_center.x = _tmp9_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE; + viewport_center.x = _tmp8_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE; #line 1729 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11319 "PhotoPage.c" +#line 11761 "PhotoPage.c" } } - } else if (((_tmp7_ == ((0 != _tmp6_label6) ? _tmp6_label6 : (_tmp6_label6 = g_quark_from_static_string ("Down")))) || (_tmp7_ == ((0 != _tmp6_label7) ? _tmp6_label7 : (_tmp6_label7 = g_quark_from_static_string ("KP_Down"))))) || (_tmp7_ == ((0 != _tmp6_label8) ? _tmp6_label8 : (_tmp6_label8 = g_quark_from_static_string ("KP_2"))))) { + } else if (((_tmp6_ == ((0 != _tmp5_label6) ? _tmp5_label6 : (_tmp5_label6 = g_quark_from_static_string ("Down")))) || (_tmp6_ == ((0 != _tmp5_label7) ? _tmp5_label7 : (_tmp5_label7 = g_quark_from_static_string ("KP_Down"))))) || (_tmp6_ == ((0 != _tmp5_label8) ? _tmp5_label8 : (_tmp5_label8 = g_quark_from_static_string ("KP_2"))))) { #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11325 "PhotoPage.c" +#line 11767 "PhotoPage.c" default: { - gint _tmp10_; + gint _tmp9_; #line 1734 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = viewport_center.y; + _tmp9_ = viewport_center.y; #line 1734 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_center.y = _tmp10_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE; + viewport_center.y = _tmp9_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE; #line 1735 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11335 "PhotoPage.c" +#line 11777 "PhotoPage.c" } } - } else if (((_tmp7_ == ((0 != _tmp6_label9) ? _tmp6_label9 : (_tmp6_label9 = g_quark_from_static_string ("Up")))) || (_tmp7_ == ((0 != _tmp6_label10) ? _tmp6_label10 : (_tmp6_label10 = g_quark_from_static_string ("KP_Up"))))) || (_tmp7_ == ((0 != _tmp6_label11) ? _tmp6_label11 : (_tmp6_label11 = g_quark_from_static_string ("KP_8"))))) { + } else if (((_tmp6_ == ((0 != _tmp5_label9) ? _tmp5_label9 : (_tmp5_label9 = g_quark_from_static_string ("Up")))) || (_tmp6_ == ((0 != _tmp5_label10) ? _tmp5_label10 : (_tmp5_label10 = g_quark_from_static_string ("KP_Up"))))) || (_tmp6_ == ((0 != _tmp5_label11) ? _tmp5_label11 : (_tmp5_label11 = g_quark_from_static_string ("KP_8"))))) { #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11341 "PhotoPage.c" +#line 11783 "PhotoPage.c" default: { - gint _tmp11_; + gint _tmp10_; #line 1740 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = viewport_center.y; + _tmp10_ = viewport_center.y; #line 1740 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_center.y = _tmp11_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE; + viewport_center.y = _tmp10_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE; #line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11351 "PhotoPage.c" +#line 11793 "PhotoPage.c" } } } else { #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11357 "PhotoPage.c" +#line 11799 "PhotoPage.c" default: { #line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; #line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11364 "PhotoPage.c" +#line 11806 "PhotoPage.c" } } } #line 1747 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = current_zoom_state; + _tmp11_ = current_zoom_state; #line 1747 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = viewport_center; + _tmp12_ = viewport_center; #line 1747 "/home/jens/Source/shotwell/src/PhotoPage.vala" - zoom_state_init_pan (&new_zoom_state, &_tmp12_, &_tmp13_); + zoom_state_init_pan (&new_zoom_state, &_tmp11_, &_tmp12_); #line 1748 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = new_zoom_state; + _tmp13_ = new_zoom_state; #line 1748 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp14_); + single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp13_); #line 1749 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); #line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; #line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11384 "PhotoPage.c" +#line 11826 "PhotoPage.c" } -static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEventKey* event) { +static gboolean +editing_host_page_real_key_press_event (GtkWidget* base, + GdkEventKey* event) +{ EditingHostPage * self; gboolean result = FALSE; EditingToolsEditingTool* _tmp0_; - gboolean _tmp4_; - GdkEventKey* _tmp7_; - gboolean _tmp8_; gboolean handled = FALSE; - GdkEventKey* _tmp9_; - guint _tmp10_; - const gchar* _tmp11_; - const gchar* _tmp12_; - GQuark _tmp14_ = 0U; + guint _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + GQuark _tmp6_ = 0U; #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp13_label0 = 0; + static GQuark _tmp5_label0 = 0; #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp13_label1 = 0; + static GQuark _tmp5_label1 = 0; #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp13_label2 = 0; + static GQuark _tmp5_label2 = 0; #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp13_label3 = 0; + static GQuark _tmp5_label3 = 0; #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp13_label4 = 0; + static GQuark _tmp5_label4 = 0; #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp13_label5 = 0; + static GQuark _tmp5_label5 = 0; #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp13_label6 = 0; + static GQuark _tmp5_label6 = 0; #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp13_label7 = 0; -#line 11417 "PhotoPage.c" - gboolean _tmp15_; - gboolean _tmp16_ = FALSE; + static GQuark _tmp5_label7 = 0; +#line 11858 "PhotoPage.c" + gboolean _tmp7_; + gboolean _tmp8_ = FALSE; #line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11429,157 +11870,133 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven _tmp0_ = self->priv->current_tool; #line 1756 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11428 "PhotoPage.c" +#line 11869 "PhotoPage.c" EditingToolsEditingTool* _tmp1_; - GdkEventKey* _tmp2_; - gboolean _tmp3_; #line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; #line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = event; -#line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = editing_tools_editing_tool_on_keypress (_tmp1_, _tmp2_); -#line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp3_) { + if (editing_tools_editing_tool_on_keypress (_tmp1_, event)) { #line 1758 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; #line 1758 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11444 "PhotoPage.c" +#line 11879 "PhotoPage.c" } } #line 1762 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = editing_host_page_is_panning_possible (self); -#line 1762 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp4_) { -#line 11451 "PhotoPage.c" - GdkEventKey* _tmp5_; - gboolean _tmp6_; -#line 1763 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = event; + if (editing_host_page_is_panning_possible (self)) { #line 1763 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = editing_host_page_on_keyboard_pan_event (self, _tmp5_); -#line 1763 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp6_) { + if (editing_host_page_on_keyboard_pan_event (self, event)) { #line 1764 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; #line 1764 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11464 "PhotoPage.c" +#line 11890 "PhotoPage.c" } } #line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = event; -#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = editing_host_page_on_zoom_slider_key_press (self, _tmp7_); -#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp8_) { + if (editing_host_page_on_zoom_slider_key_press (self, event)) { #line 1771 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; #line 1771 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11477 "PhotoPage.c" +#line 11899 "PhotoPage.c" } #line 1773 "/home/jens/Source/shotwell/src/PhotoPage.vala" handled = TRUE; #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = event; + _tmp2_ = event->keyval; #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp9_->keyval; + _tmp3_ = gdk_keyval_name (_tmp2_); #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = gdk_keyval_name (_tmp10_); -#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _tmp11_; + _tmp4_ = _tmp3_; #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = (NULL == _tmp12_) ? 0 : g_quark_from_string (_tmp12_); + _tmp6_ = (NULL == _tmp4_) ? 0 : g_quark_from_string (_tmp4_); #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if ((_tmp14_ == ((0 != _tmp13_label0) ? _tmp13_label0 : (_tmp13_label0 = g_quark_from_static_string ("Down")))) || (_tmp14_ == ((0 != _tmp13_label1) ? _tmp13_label1 : (_tmp13_label1 = g_quark_from_static_string ("KP_Down"))))) { + if ((_tmp6_ == ((0 != _tmp5_label0) ? _tmp5_label0 : (_tmp5_label0 = g_quark_from_static_string ("Down")))) || (_tmp6_ == ((0 != _tmp5_label1) ? _tmp5_label1 : (_tmp5_label1 = g_quark_from_static_string ("KP_Down"))))) { #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11495 "PhotoPage.c" +#line 11915 "PhotoPage.c" default: { #line 1780 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11500 "PhotoPage.c" +#line 11920 "PhotoPage.c" } } - } else if (((_tmp14_ == ((0 != _tmp13_label2) ? _tmp13_label2 : (_tmp13_label2 = g_quark_from_static_string ("equal")))) || (_tmp14_ == ((0 != _tmp13_label3) ? _tmp13_label3 : (_tmp13_label3 = g_quark_from_static_string ("plus"))))) || (_tmp14_ == ((0 != _tmp13_label4) ? _tmp13_label4 : (_tmp13_label4 = g_quark_from_static_string ("KP_Add"))))) { + } else if (((_tmp6_ == ((0 != _tmp5_label2) ? _tmp5_label2 : (_tmp5_label2 = g_quark_from_static_string ("equal")))) || (_tmp6_ == ((0 != _tmp5_label3) ? _tmp5_label3 : (_tmp5_label3 = g_quark_from_static_string ("plus"))))) || (_tmp6_ == ((0 != _tmp5_label4) ? _tmp5_label4 : (_tmp5_label4 = g_quark_from_static_string ("KP_Add"))))) { #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11506 "PhotoPage.c" +#line 11926 "PhotoPage.c" default: { #line 1785 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize"); #line 1786 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11513 "PhotoPage.c" +#line 11933 "PhotoPage.c" } } - } else if (((_tmp14_ == ((0 != _tmp13_label5) ? _tmp13_label5 : (_tmp13_label5 = g_quark_from_static_string ("minus")))) || (_tmp14_ == ((0 != _tmp13_label6) ? _tmp13_label6 : (_tmp13_label6 = g_quark_from_static_string ("underscore"))))) || (_tmp14_ == ((0 != _tmp13_label7) ? _tmp13_label7 : (_tmp13_label7 = g_quark_from_static_string ("KP_Subtract"))))) { + } else if (((_tmp6_ == ((0 != _tmp5_label5) ? _tmp5_label5 : (_tmp5_label5 = g_quark_from_static_string ("minus")))) || (_tmp6_ == ((0 != _tmp5_label6) ? _tmp5_label6 : (_tmp5_label6 = g_quark_from_static_string ("underscore"))))) || (_tmp6_ == ((0 != _tmp5_label7) ? _tmp5_label7 : (_tmp5_label7 = g_quark_from_static_string ("KP_Subtract"))))) { #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11519 "PhotoPage.c" +#line 11939 "PhotoPage.c" default: { #line 1792 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize"); #line 1793 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11526 "PhotoPage.c" +#line 11946 "PhotoPage.c" } } } else { #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 11532 "PhotoPage.c" +#line 11952 "PhotoPage.c" default: { #line 1796 "/home/jens/Source/shotwell/src/PhotoPage.vala" handled = FALSE; #line 1797 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 11539 "PhotoPage.c" +#line 11959 "PhotoPage.c" } } } #line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = handled; + _tmp7_ = handled; #line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp15_) { + if (_tmp7_) { #line 1801 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; #line 1801 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11551 "PhotoPage.c" +#line 11971 "PhotoPage.c" } #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event != NULL) { -#line 11555 "PhotoPage.c" - GdkEventKey* _tmp17_; - gboolean _tmp18_; -#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = event; -#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget), _tmp17_); #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = _tmp18_; -#line 11564 "PhotoPage.c" + _tmp8_ = GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget), event); +#line 11977 "PhotoPage.c" } else { #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = TRUE; -#line 11568 "PhotoPage.c" + _tmp8_ = TRUE; +#line 11981 "PhotoPage.c" } #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp16_; + result = _tmp8_; #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11574 "PhotoPage.c" +#line 11987 "PhotoPage.c" } -static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t* default_ctx, Dimensions* dim) { +static void +editing_host_page_real_new_surface (SinglePhotoPage* base, + cairo_t* default_ctx, + Dimensions* dim) +{ EditingHostPage * self; EditingToolsEditingTool* _tmp0_; #line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11592,27 +12009,29 @@ static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t* _tmp0_ = self->priv->current_tool; #line 1808 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11591 "PhotoPage.c" +#line 12008 "PhotoPage.c" EditingToolsEditingTool* _tmp1_; EditingToolsPhotoCanvas* _tmp2_; - cairo_t* _tmp3_; - Dimensions _tmp4_; + Dimensions _tmp3_; #line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; #line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = _tmp1_->canvas; #line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = default_ctx; + _tmp3_ = *dim; #line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = *dim; -#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_tools_photo_canvas_set_surface (_tmp2_, _tmp3_, &_tmp4_); -#line 11606 "PhotoPage.c" + editing_tools_photo_canvas_set_surface (_tmp2_, default_ctx, &_tmp3_); +#line 12020 "PhotoPage.c" } } -static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim) { +static void +editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, + GdkPixbuf* pixbuf, + SinglePhotoPageUpdateReason reason, + Dimensions* old_dim) +{ EditingHostPage * self; gboolean _tmp0_ = FALSE; EditingToolsEditingTool* _tmp1_; @@ -11626,143 +12045,162 @@ static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPix _tmp1_ = self->priv->current_tool; #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_ != NULL) { -#line 11625 "PhotoPage.c" - SinglePhotoPageUpdateReason _tmp2_; -#line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = reason; #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = _tmp2_ != SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT; -#line 11631 "PhotoPage.c" + _tmp0_ = reason != SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT; +#line 12046 "PhotoPage.c" } else { #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 11635 "PhotoPage.c" +#line 12050 "PhotoPage.c" } #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { -#line 11639 "PhotoPage.c" - EditingToolsEditingTool* _tmp3_; - EditingToolsPhotoCanvas* _tmp4_; - Dimensions _tmp5_; - GdkPixbuf* _tmp6_; - GdkRectangle _tmp7_ = {0}; -#line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = self->priv->current_tool; +#line 12054 "PhotoPage.c" + EditingToolsEditingTool* _tmp2_; + EditingToolsPhotoCanvas* _tmp3_; + Dimensions _tmp4_; + GdkRectangle _tmp5_ = {0}; #line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_->canvas; + _tmp2_ = self->priv->current_tool; #line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = *old_dim; + _tmp3_ = _tmp2_->canvas; #line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = pixbuf; + _tmp4_ = *old_dim; #line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp7_); + single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_); #line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_tools_photo_canvas_resized_pixbuf (_tmp4_, &_tmp5_, _tmp6_, &_tmp7_); + editing_tools_photo_canvas_resized_pixbuf (_tmp3_, &_tmp4_, pixbuf, &_tmp5_); #line 1818 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->cancel_editing_pixbuf); #line 1818 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->cancel_editing_pixbuf = NULL; -#line 11661 "PhotoPage.c" +#line 12073 "PhotoPage.c" } } -static GdkPixbuf* editing_host_page_real_get_bottom_left_trinket (EditingHostPage* self, gint scale) { +static GdkPixbuf* +editing_host_page_real_get_bottom_left_trinket (EditingHostPage* self, + gint scale) +{ GdkPixbuf* result = NULL; #line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = NULL; #line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11672 "PhotoPage.c" +#line 12087 "PhotoPage.c" } -GdkPixbuf* editing_host_page_get_bottom_left_trinket (EditingHostPage* self, gint scale) { +GdkPixbuf* +editing_host_page_get_bottom_left_trinket (EditingHostPage* self, + gint scale) +{ #line 1822 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); #line 1822 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_left_trinket (self, scale); -#line 11681 "PhotoPage.c" +#line 12099 "PhotoPage.c" } -static GdkPixbuf* editing_host_page_real_get_top_left_trinket (EditingHostPage* self, gint scale) { +static GdkPixbuf* +editing_host_page_real_get_top_left_trinket (EditingHostPage* self, + gint scale) +{ GdkPixbuf* result = NULL; #line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = NULL; #line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11691 "PhotoPage.c" +#line 12112 "PhotoPage.c" } -GdkPixbuf* editing_host_page_get_top_left_trinket (EditingHostPage* self, gint scale) { +GdkPixbuf* +editing_host_page_get_top_left_trinket (EditingHostPage* self, + gint scale) +{ #line 1826 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); #line 1826 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_left_trinket (self, scale); -#line 11700 "PhotoPage.c" +#line 12124 "PhotoPage.c" } -static GdkPixbuf* editing_host_page_real_get_top_right_trinket (EditingHostPage* self, gint scale) { +static GdkPixbuf* +editing_host_page_real_get_top_right_trinket (EditingHostPage* self, + gint scale) +{ GdkPixbuf* result = NULL; #line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = NULL; #line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11710 "PhotoPage.c" +#line 12137 "PhotoPage.c" } -GdkPixbuf* editing_host_page_get_top_right_trinket (EditingHostPage* self, gint scale) { +GdkPixbuf* +editing_host_page_get_top_right_trinket (EditingHostPage* self, + gint scale) +{ #line 1830 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); #line 1830 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_right_trinket (self, scale); -#line 11719 "PhotoPage.c" +#line 12149 "PhotoPage.c" } -static GdkPixbuf* editing_host_page_real_get_bottom_right_trinket (EditingHostPage* self, gint scale) { +static GdkPixbuf* +editing_host_page_real_get_bottom_right_trinket (EditingHostPage* self, + gint scale) +{ GdkPixbuf* result = NULL; #line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = NULL; #line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 11729 "PhotoPage.c" +#line 12162 "PhotoPage.c" } -GdkPixbuf* editing_host_page_get_bottom_right_trinket (EditingHostPage* self, gint scale) { +GdkPixbuf* +editing_host_page_get_bottom_right_trinket (EditingHostPage* self, + gint scale) +{ #line 1834 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL); #line 1834 "/home/jens/Source/shotwell/src/PhotoPage.vala" return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_right_trinket (self, scale); -#line 11738 "PhotoPage.c" +#line 12174 "PhotoPage.c" } -static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dimensions* ctx_dim) { +static void +editing_host_page_real_paint (SinglePhotoPage* base, + cairo_t* ctx, + Dimensions* ctx_dim) +{ EditingHostPage * self; EditingToolsEditingTool* _tmp0_; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_; - cairo_t* _tmp22_; - Dimensions _tmp23_; - ZoomState _tmp24_ = {0}; - gboolean _tmp25_; + gboolean _tmp2_ = FALSE; + gboolean _tmp3_; + Dimensions _tmp16_; + ZoomState _tmp17_ = {0}; GdkRectangle scaled_rect = {0}; - GdkRectangle _tmp26_ = {0}; + GdkRectangle _tmp18_ = {0}; GdkPixbuf* trinket = NULL; - GdkPixbuf* _tmp27_; - GdkPixbuf* _tmp28_; - GdkPixbuf* _tmp52_; - GdkPixbuf* _tmp53_; - GdkPixbuf* _tmp72_; - GdkPixbuf* _tmp73_; - GdkPixbuf* _tmp97_; - GdkPixbuf* _tmp98_; + GdkPixbuf* _tmp19_; + GdkPixbuf* _tmp20_; + GdkPixbuf* _tmp41_; + GdkPixbuf* _tmp42_; + GdkPixbuf* _tmp58_; + GdkPixbuf* _tmp59_; + GdkPixbuf* _tmp80_; + GdkPixbuf* _tmp81_; #line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -11773,509 +12211,453 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D _tmp0_ = self->priv->current_tool; #line 1839 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ != NULL) { -#line 11772 "PhotoPage.c" +#line 12210 "PhotoPage.c" EditingToolsEditingTool* _tmp1_; - cairo_t* _tmp2_; #line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; #line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = ctx; -#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_tools_editing_tool_paint (_tmp1_, _tmp2_); + editing_tools_editing_tool_paint (_tmp1_, ctx); #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 11783 "PhotoPage.c" +#line 12218 "PhotoPage.c" } #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = self->priv->photo_missing; -#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp4_) { -#line 11789 "PhotoPage.c" - gboolean _tmp5_; + _tmp3_ = self->priv->photo_missing; #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = editing_host_page_has_photo (self); + if (_tmp3_) { #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp5_; -#line 11795 "PhotoPage.c" + _tmp2_ = editing_host_page_has_photo (self); +#line 12226 "PhotoPage.c" } else { #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = FALSE; -#line 11799 "PhotoPage.c" + _tmp2_ = FALSE; +#line 12230 "PhotoPage.c" } #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp3_) { -#line 11803 "PhotoPage.c" - cairo_t* _tmp6_; - cairo_t* _tmp7_; - Dimensions _tmp8_ = {0}; - gint _tmp9_; - Dimensions _tmp10_ = {0}; - gint _tmp11_; - cairo_t* _tmp12_; - cairo_t* _tmp13_; - Photo* _tmp14_; - Photo* _tmp15_; - GFile* _tmp16_; - GFile* _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; - gchar* _tmp21_; -#line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = ctx; + if (_tmp2_) { +#line 12234 "PhotoPage.c" + Dimensions _tmp4_ = {0}; + gint _tmp5_; + Dimensions _tmp6_ = {0}; + gint _tmp7_; + Photo* _tmp8_; + Photo* _tmp9_; + GFile* _tmp10_; + GFile* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; #line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala" - set_source_color_from_string (_tmp6_, "#000"); -#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = ctx; + set_source_color_from_string (ctx, "#000"); #line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_); + single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp4_); #line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = _tmp8_.width; + _tmp5_ = _tmp4_.width; #line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp10_); + single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp6_); #line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = _tmp10_.height; + _tmp7_ = _tmp6_.height; #line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cairo_rectangle (_tmp7_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp9_, (gdouble) _tmp11_); -#line 1848 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = ctx; + cairo_rectangle (ctx, (gdouble) 0, (gdouble) 0, (gdouble) _tmp5_, (gdouble) _tmp7_); #line 1848 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cairo_fill (_tmp12_); + cairo_fill (ctx); #line 1849 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = ctx; -#line 1849 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cairo_paint (_tmp13_); + cairo_paint (ctx); #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = editing_host_page_get_photo (self); + _tmp8_ = editing_host_page_get_photo (self); #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = _tmp14_; + _tmp9_ = _tmp8_; #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp10_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource)); #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = _tmp16_; + _tmp11_ = _tmp10_; #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = g_file_get_path (_tmp17_); + _tmp12_ = g_file_get_path (_tmp11_); #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = _tmp18_; + _tmp13_ = _tmp12_; #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = g_strdup_printf (_ ("Photo source file missing: %s"), _tmp19_); + _tmp14_ = g_strdup_printf (_ ("Photo source file missing: %s"), _tmp13_); #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = _tmp20_; + _tmp15_ = _tmp14_; #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_draw_message (self, _tmp21_); + editing_host_page_draw_message (self, _tmp15_); #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_free0 (_tmp21_); + _g_free0 (_tmp15_); #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_free0 (_tmp19_); + _g_free0 (_tmp13_); #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp17_); + _g_object_unref0 (_tmp11_); #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp9_); #line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 11872 "PhotoPage.c" +#line 12291 "PhotoPage.c" } #line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = ctx; -#line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = *ctx_dim; + _tmp16_ = *ctx_dim; #line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala" - SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->paint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp22_, &_tmp23_); + SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->paint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), ctx, &_tmp16_); #line 1856 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp24_); + single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp17_); #line 1856 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = zoom_state_is_default (&_tmp24_); -#line 1856 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp25_) { + if (!zoom_state_is_default (&_tmp17_)) { #line 1857 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 11888 "PhotoPage.c" +#line 12303 "PhotoPage.c" } #line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp26_); + single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp18_); #line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala" - scaled_rect = _tmp26_; + scaled_rect = _tmp18_; #line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = editing_host_page_get_bottom_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); + _tmp19_ = editing_host_page_get_bottom_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); #line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala" - trinket = _tmp27_; + trinket = _tmp19_; #line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = trinket; + _tmp20_ = trinket; #line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp28_ != NULL) { -#line 11902 "PhotoPage.c" + if (_tmp20_ != NULL) { +#line 12317 "PhotoPage.c" gint x = 0; - GdkRectangle _tmp29_; - gint _tmp30_; + GdkRectangle _tmp21_; + gint _tmp22_; gint y = 0; - GdkRectangle _tmp31_; + GdkRectangle _tmp23_; + gint _tmp24_; + GdkRectangle _tmp25_; + gint _tmp26_; + GdkPixbuf* _tmp27_; + gint _tmp28_; + gint _tmp29_; + GdkPixbuf* _tmp30_; + gint _tmp31_; gint _tmp32_; - GdkRectangle _tmp33_; + gint _tmp33_; gint _tmp34_; GdkPixbuf* _tmp35_; gint _tmp36_; gint _tmp37_; - cairo_t* _tmp38_; - GdkPixbuf* _tmp39_; + GdkPixbuf* _tmp38_; + gint _tmp39_; gint _tmp40_; - gint _tmp41_; - cairo_t* _tmp42_; - gint _tmp43_; - gint _tmp44_; - GdkPixbuf* _tmp45_; - gint _tmp46_; - gint _tmp47_; - GdkPixbuf* _tmp48_; - gint _tmp49_; - gint _tmp50_; - cairo_t* _tmp51_; #line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = scaled_rect; + _tmp21_ = scaled_rect; #line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_ = _tmp29_.x; + _tmp22_ = _tmp21_.x; #line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala" - x = _tmp30_ + EDITING_HOST_PAGE_TRINKET_PADDING; + x = _tmp22_ + EDITING_HOST_PAGE_TRINKET_PADDING; #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp31_ = scaled_rect; + _tmp23_ = scaled_rect; #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp32_ = _tmp31_.y; + _tmp24_ = _tmp23_.y; #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp33_ = scaled_rect; + _tmp25_ = scaled_rect; #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp34_ = _tmp33_.height; + _tmp26_ = _tmp25_.height; #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp35_ = trinket; + _tmp27_ = trinket; #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp36_ = gdk_pixbuf_get_height (_tmp35_); + _tmp28_ = gdk_pixbuf_get_height (_tmp27_); #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp37_ = _tmp36_; + _tmp29_ = _tmp28_; #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala" - y = ((_tmp32_ + _tmp34_) - _tmp37_) - EDITING_HOST_PAGE_TRINKET_PADDING; -#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp38_ = ctx; + y = ((_tmp24_ + _tmp26_) - _tmp29_) - EDITING_HOST_PAGE_TRINKET_PADDING; #line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp39_ = trinket; + _tmp30_ = trinket; #line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp40_ = x; + _tmp31_ = x; #line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp41_ = y; + _tmp32_ = y; #line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gdk_cairo_set_source_pixbuf (_tmp38_, _tmp39_, (gdouble) _tmp40_, (gdouble) _tmp41_); + gdk_cairo_set_source_pixbuf (ctx, _tmp30_, (gdouble) _tmp31_, (gdouble) _tmp32_); #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp42_ = ctx; + _tmp33_ = x; #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp43_ = x; + _tmp34_ = y; #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp44_ = y; -#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp45_ = trinket; + _tmp35_ = trinket; #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp46_ = gdk_pixbuf_get_width (_tmp45_); + _tmp36_ = gdk_pixbuf_get_width (_tmp35_); #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp47_ = _tmp46_; + _tmp37_ = _tmp36_; #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp48_ = trinket; + _tmp38_ = trinket; #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp49_ = gdk_pixbuf_get_height (_tmp48_); + _tmp39_ = gdk_pixbuf_get_height (_tmp38_); #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp50_ = _tmp49_; + _tmp40_ = _tmp39_; #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cairo_rectangle (_tmp42_, (gdouble) _tmp43_, (gdouble) _tmp44_, (gdouble) _tmp47_, (gdouble) _tmp50_); -#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp51_ = ctx; + cairo_rectangle (ctx, (gdouble) _tmp33_, (gdouble) _tmp34_, (gdouble) _tmp37_, (gdouble) _tmp40_); #line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cairo_fill (_tmp51_); -#line 11984 "PhotoPage.c" + cairo_fill (ctx); +#line 12390 "PhotoPage.c" } #line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp52_ = editing_host_page_get_top_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); + _tmp41_ = editing_host_page_get_top_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); #line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (trinket); #line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala" - trinket = _tmp52_; + trinket = _tmp41_; #line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp53_ = trinket; + _tmp42_ = trinket; #line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp53_ != NULL) { -#line 11996 "PhotoPage.c" + if (_tmp42_ != NULL) { +#line 12402 "PhotoPage.c" gint x = 0; - GdkRectangle _tmp54_; - gint _tmp55_; + GdkRectangle _tmp43_; + gint _tmp44_; gint y = 0; - GdkRectangle _tmp56_; + GdkRectangle _tmp45_; + gint _tmp46_; + GdkPixbuf* _tmp47_; + gint _tmp48_; + gint _tmp49_; + gint _tmp50_; + gint _tmp51_; + GdkPixbuf* _tmp52_; + gint _tmp53_; + gint _tmp54_; + GdkPixbuf* _tmp55_; + gint _tmp56_; gint _tmp57_; - cairo_t* _tmp58_; - GdkPixbuf* _tmp59_; - gint _tmp60_; - gint _tmp61_; - cairo_t* _tmp62_; - gint _tmp63_; - gint _tmp64_; - GdkPixbuf* _tmp65_; - gint _tmp66_; - gint _tmp67_; - GdkPixbuf* _tmp68_; - gint _tmp69_; - gint _tmp70_; - cairo_t* _tmp71_; #line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp54_ = scaled_rect; + _tmp43_ = scaled_rect; #line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp55_ = _tmp54_.x; + _tmp44_ = _tmp43_.x; #line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala" - x = _tmp55_ + EDITING_HOST_PAGE_TRINKET_PADDING; + x = _tmp44_ + EDITING_HOST_PAGE_TRINKET_PADDING; #line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp56_ = scaled_rect; + _tmp45_ = scaled_rect; #line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp57_ = _tmp56_.y; + _tmp46_ = _tmp45_.y; #line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala" - y = _tmp57_ + EDITING_HOST_PAGE_TRINKET_PADDING; + y = _tmp46_ + EDITING_HOST_PAGE_TRINKET_PADDING; #line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp58_ = ctx; + _tmp47_ = trinket; #line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp59_ = trinket; + _tmp48_ = x; #line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp60_ = x; + _tmp49_ = y; #line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp61_ = y; -#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gdk_cairo_set_source_pixbuf (_tmp58_, _tmp59_, (gdouble) _tmp60_, (gdouble) _tmp61_); -#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp62_ = ctx; + gdk_cairo_set_source_pixbuf (ctx, _tmp47_, (gdouble) _tmp48_, (gdouble) _tmp49_); #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp63_ = x; + _tmp50_ = x; #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp64_ = y; + _tmp51_ = y; #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp65_ = trinket; + _tmp52_ = trinket; #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp66_ = gdk_pixbuf_get_width (_tmp65_); + _tmp53_ = gdk_pixbuf_get_width (_tmp52_); #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp67_ = _tmp66_; + _tmp54_ = _tmp53_; #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp68_ = trinket; + _tmp55_ = trinket; #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp69_ = gdk_pixbuf_get_height (_tmp68_); + _tmp56_ = gdk_pixbuf_get_height (_tmp55_); #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp70_ = _tmp69_; + _tmp57_ = _tmp56_; #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cairo_rectangle (_tmp62_, (gdouble) _tmp63_, (gdouble) _tmp64_, (gdouble) _tmp67_, (gdouble) _tmp70_); + cairo_rectangle (ctx, (gdouble) _tmp50_, (gdouble) _tmp51_, (gdouble) _tmp54_, (gdouble) _tmp57_); #line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp71_ = ctx; -#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cairo_fill (_tmp71_); -#line 12063 "PhotoPage.c" + cairo_fill (ctx); +#line 12460 "PhotoPage.c" } #line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp72_ = editing_host_page_get_top_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); + _tmp58_ = editing_host_page_get_top_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); #line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (trinket); #line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala" - trinket = _tmp72_; + trinket = _tmp58_; #line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp73_ = trinket; + _tmp59_ = trinket; #line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp73_ != NULL) { -#line 12075 "PhotoPage.c" + if (_tmp59_ != NULL) { +#line 12472 "PhotoPage.c" gint x = 0; - GdkRectangle _tmp74_; + GdkRectangle _tmp60_; + gint _tmp61_; + GdkRectangle _tmp62_; + gint _tmp63_; + GdkPixbuf* _tmp64_; + gint _tmp65_; + gint _tmp66_; + gint y = 0; + GdkRectangle _tmp67_; + gint _tmp68_; + GdkPixbuf* _tmp69_; + gint _tmp70_; + gint _tmp71_; + gint _tmp72_; + gint _tmp73_; + GdkPixbuf* _tmp74_; gint _tmp75_; - GdkRectangle _tmp76_; - gint _tmp77_; - GdkPixbuf* _tmp78_; + gint _tmp76_; + GdkPixbuf* _tmp77_; + gint _tmp78_; gint _tmp79_; - gint _tmp80_; - gint y = 0; - GdkRectangle _tmp81_; - gint _tmp82_; - cairo_t* _tmp83_; - GdkPixbuf* _tmp84_; - gint _tmp85_; - gint _tmp86_; - cairo_t* _tmp87_; - gint _tmp88_; - gint _tmp89_; - GdkPixbuf* _tmp90_; - gint _tmp91_; - gint _tmp92_; - GdkPixbuf* _tmp93_; - gint _tmp94_; - gint _tmp95_; - cairo_t* _tmp96_; #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp74_ = scaled_rect; + _tmp60_ = scaled_rect; #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp75_ = _tmp74_.x; + _tmp61_ = _tmp60_.x; #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp76_ = scaled_rect; + _tmp62_ = scaled_rect; #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp77_ = _tmp76_.width; + _tmp63_ = _tmp62_.width; #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp78_ = trinket; + _tmp64_ = trinket; #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp79_ = gdk_pixbuf_get_width (_tmp78_); + _tmp65_ = gdk_pixbuf_get_width (_tmp64_); #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp80_ = _tmp79_; + _tmp66_ = _tmp65_; #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala" - x = ((_tmp75_ + _tmp77_) - _tmp80_) - EDITING_HOST_PAGE_TRINKET_PADDING; + x = ((_tmp61_ + _tmp63_) - _tmp66_) - EDITING_HOST_PAGE_TRINKET_PADDING; #line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp81_ = scaled_rect; + _tmp67_ = scaled_rect; #line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp82_ = _tmp81_.y; + _tmp68_ = _tmp67_.y; #line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala" - y = _tmp82_ + EDITING_HOST_PAGE_TRINKET_PADDING; -#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp83_ = ctx; + y = _tmp68_ + EDITING_HOST_PAGE_TRINKET_PADDING; #line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp84_ = trinket; + _tmp69_ = trinket; #line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp85_ = x; + _tmp70_ = x; #line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp86_ = y; + _tmp71_ = y; #line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gdk_cairo_set_source_pixbuf (_tmp83_, _tmp84_, (gdouble) _tmp85_, (gdouble) _tmp86_); + gdk_cairo_set_source_pixbuf (ctx, _tmp69_, (gdouble) _tmp70_, (gdouble) _tmp71_); #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp87_ = ctx; + _tmp72_ = x; #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp88_ = x; + _tmp73_ = y; #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp89_ = y; + _tmp74_ = trinket; #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp90_ = trinket; + _tmp75_ = gdk_pixbuf_get_width (_tmp74_); #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp91_ = gdk_pixbuf_get_width (_tmp90_); + _tmp76_ = _tmp75_; #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp92_ = _tmp91_; + _tmp77_ = trinket; #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp93_ = trinket; -#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp94_ = gdk_pixbuf_get_height (_tmp93_); + _tmp78_ = gdk_pixbuf_get_height (_tmp77_); #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp95_ = _tmp94_; + _tmp79_ = _tmp78_; #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cairo_rectangle (_tmp87_, (gdouble) _tmp88_, (gdouble) _tmp89_, (gdouble) _tmp92_, (gdouble) _tmp95_); + cairo_rectangle (ctx, (gdouble) _tmp72_, (gdouble) _tmp73_, (gdouble) _tmp76_, (gdouble) _tmp79_); #line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp96_ = ctx; -#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cairo_fill (_tmp96_); -#line 12157 "PhotoPage.c" + cairo_fill (ctx); +#line 12545 "PhotoPage.c" } #line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp97_ = editing_host_page_get_bottom_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); + _tmp80_ = editing_host_page_get_bottom_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE); #line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (trinket); #line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala" - trinket = _tmp97_; + trinket = _tmp80_; #line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp98_ = trinket; + _tmp81_ = trinket; #line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp98_ != NULL) { -#line 12169 "PhotoPage.c" + if (_tmp81_ != NULL) { +#line 12557 "PhotoPage.c" gint x = 0; - GdkRectangle _tmp99_; + GdkRectangle _tmp82_; + gint _tmp83_; + GdkRectangle _tmp84_; + gint _tmp85_; + GdkPixbuf* _tmp86_; + gint _tmp87_; + gint _tmp88_; + gint y = 0; + GdkRectangle _tmp89_; + gint _tmp90_; + GdkRectangle _tmp91_; + gint _tmp92_; + GdkPixbuf* _tmp93_; + gint _tmp94_; + gint _tmp95_; + GdkPixbuf* _tmp96_; + gint _tmp97_; + gint _tmp98_; + gint _tmp99_; gint _tmp100_; - GdkRectangle _tmp101_; + GdkPixbuf* _tmp101_; gint _tmp102_; - GdkPixbuf* _tmp103_; - gint _tmp104_; + gint _tmp103_; + GdkPixbuf* _tmp104_; gint _tmp105_; - gint y = 0; - GdkRectangle _tmp106_; - gint _tmp107_; - GdkRectangle _tmp108_; - gint _tmp109_; - GdkPixbuf* _tmp110_; - gint _tmp111_; - gint _tmp112_; - cairo_t* _tmp113_; - GdkPixbuf* _tmp114_; - gint _tmp115_; - gint _tmp116_; - cairo_t* _tmp117_; - gint _tmp118_; - gint _tmp119_; - GdkPixbuf* _tmp120_; - gint _tmp121_; - gint _tmp122_; - GdkPixbuf* _tmp123_; - gint _tmp124_; - gint _tmp125_; - cairo_t* _tmp126_; + gint _tmp106_; #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp99_ = scaled_rect; + _tmp82_ = scaled_rect; #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp100_ = _tmp99_.x; + _tmp83_ = _tmp82_.x; #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp101_ = scaled_rect; + _tmp84_ = scaled_rect; #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp102_ = _tmp101_.width; + _tmp85_ = _tmp84_.width; #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp103_ = trinket; + _tmp86_ = trinket; #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp104_ = gdk_pixbuf_get_width (_tmp103_); + _tmp87_ = gdk_pixbuf_get_width (_tmp86_); #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp105_ = _tmp104_; + _tmp88_ = _tmp87_; #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala" - x = ((_tmp100_ + _tmp102_) - _tmp105_) - EDITING_HOST_PAGE_TRINKET_PADDING; + x = ((_tmp83_ + _tmp85_) - _tmp88_) - EDITING_HOST_PAGE_TRINKET_PADDING; #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp106_ = scaled_rect; + _tmp89_ = scaled_rect; #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp107_ = _tmp106_.y; + _tmp90_ = _tmp89_.y; #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp108_ = scaled_rect; + _tmp91_ = scaled_rect; #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp109_ = _tmp108_.height; + _tmp92_ = _tmp91_.height; #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp110_ = trinket; + _tmp93_ = trinket; #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp111_ = gdk_pixbuf_get_height (_tmp110_); + _tmp94_ = gdk_pixbuf_get_height (_tmp93_); #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp112_ = _tmp111_; + _tmp95_ = _tmp94_; #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala" - y = ((_tmp107_ + _tmp109_) - _tmp112_) - EDITING_HOST_PAGE_TRINKET_PADDING; + y = ((_tmp90_ + _tmp92_) - _tmp95_) - EDITING_HOST_PAGE_TRINKET_PADDING; #line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp113_ = ctx; + _tmp96_ = trinket; #line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp114_ = trinket; + _tmp97_ = x; #line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp115_ = x; + _tmp98_ = y; #line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp116_ = y; -#line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gdk_cairo_set_source_pixbuf (_tmp113_, _tmp114_, (gdouble) _tmp115_, (gdouble) _tmp116_); -#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp117_ = ctx; + gdk_cairo_set_source_pixbuf (ctx, _tmp96_, (gdouble) _tmp97_, (gdouble) _tmp98_); #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp118_ = x; + _tmp99_ = x; #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp119_ = y; + _tmp100_ = y; #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp120_ = trinket; + _tmp101_ = trinket; #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp121_ = gdk_pixbuf_get_width (_tmp120_); + _tmp102_ = gdk_pixbuf_get_width (_tmp101_); #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp122_ = _tmp121_; + _tmp103_ = _tmp102_; #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp123_ = trinket; + _tmp104_ = trinket; #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp124_ = gdk_pixbuf_get_height (_tmp123_); + _tmp105_ = gdk_pixbuf_get_height (_tmp104_); #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp125_ = _tmp124_; + _tmp106_ = _tmp105_; #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cairo_rectangle (_tmp117_, (gdouble) _tmp118_, (gdouble) _tmp119_, (gdouble) _tmp122_, (gdouble) _tmp125_); + cairo_rectangle (ctx, (gdouble) _tmp99_, (gdouble) _tmp100_, (gdouble) _tmp103_, (gdouble) _tmp106_); #line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp126_ = ctx; -#line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cairo_fill (_tmp126_); -#line 12266 "PhotoPage.c" + cairo_fill (ctx); +#line 12645 "PhotoPage.c" } #line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (trinket); -#line 12270 "PhotoPage.c" +#line 12649 "PhotoPage.c" } -gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* photo) { +gboolean +editing_host_page_is_rotate_available (EditingHostPage* self, + Photo* photo) +{ gboolean result = FALSE; gboolean _tmp0_; #line 1899 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -12288,24 +12670,25 @@ gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* ph result = !_tmp0_; #line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 12287 "PhotoPage.c" +#line 12669 "PhotoPage.c" } -static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation, const gchar* name, const gchar* description) { +static void +editing_host_page_rotate (EditingHostPage* self, + Rotation rotation, + const gchar* name, + const gchar* description) +{ Dimensions _tmp0_ = {0}; - gboolean _tmp1_; RotateSingleCommand* command = NULL; + Photo* _tmp1_; Photo* _tmp2_; - Photo* _tmp3_; - Rotation _tmp4_; - const gchar* _tmp5_; - const gchar* _tmp6_; - RotateSingleCommand* _tmp7_; - RotateSingleCommand* _tmp8_; - CommandManager* _tmp9_; - CommandManager* _tmp10_; - RotateSingleCommand* _tmp11_; + RotateSingleCommand* _tmp3_; + RotateSingleCommand* _tmp4_; + CommandManager* _tmp5_; + CommandManager* _tmp6_; + RotateSingleCommand* _tmp7_; #line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -12319,99 +12702,99 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation, #line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE); #line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = editing_host_page_has_photo (self); -#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp1_) { + if (!editing_host_page_has_photo (self)) { #line 1909 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12323 "PhotoPage.c" +#line 12704 "PhotoPage.c" } #line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = editing_host_page_get_photo (self); -#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_; -#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = rotation; -#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = name; + _tmp1_ = editing_host_page_get_photo (self); #line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = description; + _tmp2_ = _tmp1_; #line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = rotate_single_command_new (_tmp3_, _tmp4_, _tmp5_, _tmp6_); + _tmp3_ = rotate_single_command_new (_tmp2_, rotation, name, description); #line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp7_; + _tmp4_ = _tmp3_; #line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command = _tmp8_; + command = _tmp4_; #line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp9_; + _tmp6_ = _tmp5_; #line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = command; + _tmp7_ = command; #line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command)); #line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _command_manager_unref0 (_tmp10_); + _command_manager_unref0 (_tmp6_); #line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 12355 "PhotoPage.c" +#line 12730 "PhotoPage.c" } -void editing_host_page_on_rotate_clockwise (EditingHostPage* self) { +void +editing_host_page_on_rotate_clockwise (EditingHostPage* self) +{ #line 1916 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1917 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rotate (self, ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP); -#line 12364 "PhotoPage.c" +#line 12741 "PhotoPage.c" } -void editing_host_page_on_rotate_counterclockwise (EditingHostPage* self) { +void +editing_host_page_on_rotate_counterclockwise (EditingHostPage* self) +{ #line 1920 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1921 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rotate (self, ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP); -#line 12373 "PhotoPage.c" +#line 12752 "PhotoPage.c" } -void editing_host_page_on_flip_horizontally (EditingHostPage* self) { +void +editing_host_page_on_flip_horizontally (EditingHostPage* self) +{ #line 1924 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1925 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rotate (self, ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, ""); -#line 12382 "PhotoPage.c" +#line 12763 "PhotoPage.c" } -void editing_host_page_on_flip_vertically (EditingHostPage* self) { +void +editing_host_page_on_flip_vertically (EditingHostPage* self) +{ #line 1928 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_rotate (self, ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, ""); -#line 12391 "PhotoPage.c" +#line 12774 "PhotoPage.c" } -void editing_host_page_on_revert (EditingHostPage* self) { +void +editing_host_page_on_revert (EditingHostPage* self) +{ gboolean _tmp0_; Dimensions _tmp1_ = {0}; - gboolean _tmp2_; + Photo* _tmp2_; Photo* _tmp3_; - Photo* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; + gboolean _tmp4_; RevertSingleCommand* command = NULL; - Photo* _tmp17_; - Photo* _tmp18_; - RevertSingleCommand* _tmp19_; + Photo* _tmp14_; + Photo* _tmp15_; + RevertSingleCommand* _tmp16_; + RevertSingleCommand* _tmp17_; + CommandManager* _tmp18_; + CommandManager* _tmp19_; RevertSingleCommand* _tmp20_; - CommandManager* _tmp21_; - CommandManager* _tmp22_; - RevertSingleCommand* _tmp23_; #line 1932 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -12420,114 +12803,109 @@ void editing_host_page_on_revert (EditingHostPage* self) { if (_tmp0_) { #line 1934 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12419 "PhotoPage.c" +#line 12802 "PhotoPage.c" } #line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp1_, 0, 0); #line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE); #line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = editing_host_page_has_photo (self); -#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp2_) { + if (!editing_host_page_has_photo (self)) { #line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12431 "PhotoPage.c" +#line 12812 "PhotoPage.c" } #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = editing_host_page_get_photo (self); -#line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_; + _tmp2_ = editing_host_page_get_photo (self); #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = photo_has_editable (_tmp4_); + _tmp3_ = _tmp2_; #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _tmp5_; + _tmp4_ = photo_has_editable (_tmp3_); #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp6_) { -#line 12445 "PhotoPage.c" - AppWindow* _tmp7_; - AppWindow* _tmp8_; - ViewCollection* _tmp9_; - ViewCollection* _tmp10_; - GeeCollection* _tmp11_; - GeeCollection* _tmp12_; - gboolean _tmp13_; - gboolean _tmp14_; - Photo* _tmp15_; - Photo* _tmp16_; -#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = app_window_get_instance (); + if (_tmp4_) { +#line 12824 "PhotoPage.c" + AppWindow* _tmp5_; + AppWindow* _tmp6_; + ViewCollection* _tmp7_; + ViewCollection* _tmp8_; + GeeCollection* _tmp9_; + GeeCollection* _tmp10_; + gboolean _tmp11_; + Photo* _tmp12_; + Photo* _tmp13_; #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp7_; + _tmp5_ = app_window_get_instance (); #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp6_ = _tmp5_; #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp9_; + _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = view_collection_get_sources (_tmp10_); + _tmp8_ = _tmp7_; #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp9_ = view_collection_get_sources (_tmp8_); #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = revert_editable_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), _tmp12_); + _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection); #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = !_tmp13_; + _tmp11_ = !revert_editable_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp10_); #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp10_); #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp10_); + _data_collection_unref0 (_tmp8_); #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp6_); #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp14_) { + if (_tmp11_) { #line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12482 "PhotoPage.c" +#line 12858 "PhotoPage.c" } #line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = editing_host_page_get_photo (self); + _tmp12_ = editing_host_page_get_photo (self); #line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = _tmp15_; + _tmp13_ = _tmp12_; #line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala" - photo_revert_to_master (_tmp16_, TRUE); + photo_revert_to_master (_tmp13_, TRUE); #line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp16_); -#line 12492 "PhotoPage.c" + _g_object_unref0 (_tmp13_); +#line 12868 "PhotoPage.c" } #line 1950 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_set_photo_missing (self, FALSE); #line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = editing_host_page_get_photo (self); + _tmp14_ = editing_host_page_get_photo (self); #line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = _tmp17_; + _tmp15_ = _tmp14_; #line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = revert_single_command_new (_tmp18_); + _tmp16_ = revert_single_command_new (_tmp15_); #line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = _tmp19_; + _tmp17_ = _tmp16_; #line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp15_); #line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command = _tmp20_; + command = _tmp17_; #line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp18_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = _tmp21_; + _tmp19_ = _tmp18_; #line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = command; + _tmp20_ = command; #line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_COMMAND, Command)); #line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _command_manager_unref0 (_tmp22_); + _command_manager_unref0 (_tmp19_); #line 1932 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 12522 "PhotoPage.c" +#line 12898 "PhotoPage.c" } -void editing_host_page_on_edit_title (EditingHostPage* self) { +void +editing_host_page_on_edit_title (EditingHostPage* self) +{ LibraryPhoto* item = NULL; Photo* _tmp0_; Photo* _tmp1_; @@ -12561,7 +12939,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) { _g_object_unref0 (_tmp1_); #line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 12560 "PhotoPage.c" +#line 12938 "PhotoPage.c" Photo* _tmp3_; LibraryPhoto* _tmp4_; #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -12572,19 +12950,19 @@ void editing_host_page_on_edit_title (EditingHostPage* self) { if (_tmp4_ == NULL) { #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 12571 "PhotoPage.c" +#line 12949 "PhotoPage.c" } #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala" item = _tmp4_; -#line 12577 "PhotoPage.c" +#line 12955 "PhotoPage.c" } else { #line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); #line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12583 "PhotoPage.c" +#line 12961 "PhotoPage.c" } #line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = item; @@ -12618,7 +12996,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) { _g_object_unref0 (item); #line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12617 "PhotoPage.c" +#line 12995 "PhotoPage.c" } #line 1970 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = item; @@ -12646,11 +13024,13 @@ void editing_host_page_on_edit_title (EditingHostPage* self) { _text_entry_dialog_mediator_unref0 (edit_title_dialog); #line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); -#line 12645 "PhotoPage.c" +#line 13023 "PhotoPage.c" } -void editing_host_page_on_edit_comment (EditingHostPage* self) { +void +editing_host_page_on_edit_comment (EditingHostPage* self) +{ LibraryPhoto* item = NULL; Photo* _tmp0_; Photo* _tmp1_; @@ -12684,7 +13064,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) { _g_object_unref0 (_tmp1_); #line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_) { -#line 12683 "PhotoPage.c" +#line 13063 "PhotoPage.c" Photo* _tmp3_; LibraryPhoto* _tmp4_; #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -12695,19 +13075,19 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) { if (_tmp4_ == NULL) { #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 12694 "PhotoPage.c" +#line 13074 "PhotoPage.c" } #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala" item = _tmp4_; -#line 12700 "PhotoPage.c" +#line 13080 "PhotoPage.c" } else { #line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); #line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12706 "PhotoPage.c" +#line 13086 "PhotoPage.c" } #line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp5_ = item; @@ -12741,7 +13121,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) { _g_object_unref0 (item); #line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12740 "PhotoPage.c" +#line 13120 "PhotoPage.c" } #line 1986 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp13_ = item; @@ -12769,211 +13149,215 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) { _multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog); #line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (item); -#line 12768 "PhotoPage.c" +#line 13148 "PhotoPage.c" } -void editing_host_page_on_adjust_date_time (EditingHostPage* self) { - gboolean _tmp0_; +void +editing_host_page_on_adjust_date_time (EditingHostPage* self) +{ AdjustDateTimeDialog* dialog = NULL; + Photo* _tmp0_; Photo* _tmp1_; - Photo* _tmp2_; + AdjustDateTimeDialog* _tmp2_; AdjustDateTimeDialog* _tmp3_; - AdjustDateTimeDialog* _tmp4_; gint64 time_shift = 0LL; gboolean keep_relativity = FALSE; gboolean modify_originals = FALSE; - AdjustDateTimeDialog* _tmp5_; - gint64 _tmp6_ = 0LL; + AdjustDateTimeDialog* _tmp4_; + gint64 _tmp5_ = 0LL; + gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; - gboolean _tmp8_ = FALSE; - gboolean _tmp9_; + gboolean _tmp8_; #line 1990 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = editing_host_page_has_photo (self); -#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp0_) { + if (!editing_host_page_has_photo (self)) { #line 1992 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 12795 "PhotoPage.c" +#line 13174 "PhotoPage.c" } #line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = editing_host_page_get_photo (self); + _tmp0_ = editing_host_page_get_photo (self); #line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = adjust_date_time_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATEABLE, Dateable), 1, !G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE), FALSE, FALSE); + _tmp2_ = adjust_date_time_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATEABLE, Dateable), 1, !G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE), FALSE, FALSE); #line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp3_); + g_object_ref_sink (_tmp2_); #line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala" - dialog = _tmp4_; + dialog = _tmp3_; #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = dialog; + _tmp4_ = dialog; #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = adjust_date_time_dialog_execute (_tmp5_, &_tmp6_, &_tmp7_, &_tmp8_); + _tmp8_ = adjust_date_time_dialog_execute (_tmp4_, &_tmp5_, &_tmp6_, &_tmp7_); #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" - time_shift = _tmp6_; + time_shift = _tmp5_; #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" - keep_relativity = _tmp7_; + keep_relativity = _tmp6_; #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" - modify_originals = _tmp8_; + modify_originals = _tmp7_; #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp9_) { -#line 12823 "PhotoPage.c" + if (_tmp8_) { +#line 13202 "PhotoPage.c" + ViewCollection* _tmp9_; ViewCollection* _tmp10_; - ViewCollection* _tmp11_; + GeeList* _tmp11_; GeeList* _tmp12_; - GeeList* _tmp13_; AdjustDateTimePhotoCommand* command = NULL; + Photo* _tmp13_; Photo* _tmp14_; - Photo* _tmp15_; - gint64 _tmp16_; - gboolean _tmp17_; + gint64 _tmp15_; + gboolean _tmp16_; + AdjustDateTimePhotoCommand* _tmp17_; AdjustDateTimePhotoCommand* _tmp18_; - AdjustDateTimePhotoCommand* _tmp19_; + CommandManager* _tmp19_; CommandManager* _tmp20_; - CommandManager* _tmp21_; - AdjustDateTimePhotoCommand* _tmp22_; + AdjustDateTimePhotoCommand* _tmp21_; #line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = view_collection_get_selected (_tmp11_); + _tmp11_ = view_collection_get_selected (_tmp10_); #line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp12_); #line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp11_); + _data_collection_unref0 (_tmp10_); #line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = editing_host_page_get_photo (self); + _tmp13_ = editing_host_page_get_photo (self); #line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = time_shift; + _tmp15_ = time_shift; #line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = modify_originals; + _tmp16_ = modify_originals; #line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = adjust_date_time_photo_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATEABLE, Dateable), _tmp16_, _tmp17_); + _tmp17_ = adjust_date_time_photo_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATEABLE, Dateable), _tmp15_, _tmp16_); #line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp14_); #line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command = _tmp19_; + command = _tmp18_; #line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp19_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = _tmp20_; + _tmp20_ = _tmp19_; #line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = command; + _tmp21_ = command; #line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command_manager_execute (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_COMMAND, Command)); #line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _command_manager_unref0 (_tmp21_); + _command_manager_unref0 (_tmp20_); #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 12878 "PhotoPage.c" +#line 13257 "PhotoPage.c" } #line 1990 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (dialog); -#line 12882 "PhotoPage.c" +#line 13261 "PhotoPage.c" } -void editing_host_page_on_set_background (EditingHostPage* self) { - gboolean _tmp0_; +void +editing_host_page_on_set_background (EditingHostPage* self) +{ #line 2007 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = editing_host_page_has_photo (self); -#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp0_) { -#line 12894 "PhotoPage.c" + if (editing_host_page_has_photo (self)) { +#line 13272 "PhotoPage.c" SetBackgroundPhotoDialog* dialog = NULL; - SetBackgroundPhotoDialog* _tmp1_; + SetBackgroundPhotoDialog* _tmp0_; gboolean desktop = FALSE; gboolean screensaver = FALSE; - SetBackgroundPhotoDialog* _tmp2_; + SetBackgroundPhotoDialog* _tmp1_; + gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_; + gboolean _tmp4_; #line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = set_background_photo_dialog_new (); + _tmp0_ = set_background_photo_dialog_new (); #line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp1_); + g_object_ref_sink (_tmp0_); #line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala" - dialog = _tmp1_; + dialog = _tmp0_; #line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = dialog; + _tmp1_ = dialog; #line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = set_background_photo_dialog_execute (_tmp2_, &_tmp3_, &_tmp4_); + _tmp4_ = set_background_photo_dialog_execute (_tmp1_, &_tmp2_, &_tmp3_); #line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala" - desktop = _tmp3_; + desktop = _tmp2_; #line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala" - screensaver = _tmp4_; + screensaver = _tmp3_; #line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp5_) { -#line 12919 "PhotoPage.c" + if (_tmp4_) { +#line 13297 "PhotoPage.c" + AppWindow* _tmp5_; AppWindow* _tmp6_; - AppWindow* _tmp7_; + Photo* _tmp7_; Photo* _tmp8_; - Photo* _tmp9_; + gboolean _tmp9_; gboolean _tmp10_; - gboolean _tmp11_; + AppWindow* _tmp11_; AppWindow* _tmp12_; - AppWindow* _tmp13_; #line 2012 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = app_window_get_instance (); + _tmp5_ = app_window_get_instance (); #line 2012 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 2012 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow)); #line 2012 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = editing_host_page_get_photo (self); + _tmp7_ = editing_host_page_get_photo (self); #line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = desktop; + _tmp9_ = desktop; #line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = screensaver; + _tmp10_ = screensaver; #line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala" - desktop_integration_set_background (_tmp9_, _tmp10_, _tmp11_); + desktop_integration_set_background (_tmp8_, _tmp9_, _tmp10_); #line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = app_window_get_instance (); + _tmp11_ = app_window_get_instance (); #line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE_WINDOW, PageWindow)); #line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp13_); -#line 12956 "PhotoPage.c" + _g_object_unref0 (_tmp12_); +#line 13334 "PhotoPage.c" } #line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (dialog); -#line 12960 "PhotoPage.c" +#line 13338 "PhotoPage.c" } } -static void _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { +static void +_editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked (GtkToolButton* _sender, + gpointer self) +{ #line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self); -#line 12968 "PhotoPage.c" +#line 13349 "PhotoPage.c" } -static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey* event) { +static gboolean +editing_host_page_real_on_ctrl_pressed (Page* base, + GdkEventKey* event) +{ EditingHostPage * self; gboolean result = FALSE; GtkToolButton* _tmp0_; @@ -12983,8 +13367,6 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey* guint _tmp4_; GtkToolButton* _tmp5_; EditingToolsEditingTool* _tmp6_; - GdkEventKey* _tmp7_; - gboolean _tmp8_; #line 2019 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 2020 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -13015,21 +13397,20 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey* if (_tmp6_ == NULL) { #line 2027 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_out_original (self); -#line 13014 "PhotoPage.c" +#line 13396 "PhotoPage.c" } #line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = event; -#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = PAGE_CLASS (editing_host_page_parent_class)->on_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp7_); -#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp8_; + result = PAGE_CLASS (editing_host_page_parent_class)->on_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), event); #line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13024 "PhotoPage.c" +#line 13402 "PhotoPage.c" } -static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey* event) { +static gboolean +editing_host_page_real_on_ctrl_released (Page* base, + GdkEventKey* event) +{ EditingHostPage * self; gboolean result = FALSE; GtkToolButton* _tmp0_; @@ -13041,8 +13422,6 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; EditingToolsEditingTool* _tmp8_; - GdkEventKey* _tmp11_; - gboolean _tmp12_; #line 2032 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 2033 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -13071,159 +13450,141 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey _tmp8_ = self->priv->current_tool; #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp8_ == NULL) { -#line 13070 "PhotoPage.c" - gboolean _tmp9_; -#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = _tmp9_; -#line 13076 "PhotoPage.c" + _tmp7_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); +#line 13451 "PhotoPage.c" } else { #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = FALSE; -#line 13080 "PhotoPage.c" +#line 13455 "PhotoPage.c" } #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp7_) { -#line 13084 "PhotoPage.c" - gboolean _tmp10_; -#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = !_tmp10_; -#line 13090 "PhotoPage.c" + _tmp6_ = !page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); +#line 13461 "PhotoPage.c" } else { #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp6_ = FALSE; -#line 13094 "PhotoPage.c" +#line 13465 "PhotoPage.c" } #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp6_) { #line 2040 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_swap_in_original (self); -#line 13100 "PhotoPage.c" +#line 13471 "PhotoPage.c" } #line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = event; -#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = PAGE_CLASS (editing_host_page_parent_class)->on_ctrl_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp11_); -#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp12_; + result = PAGE_CLASS (editing_host_page_parent_class)->on_ctrl_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), event); #line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13110 "PhotoPage.c" +#line 13477 "PhotoPage.c" } -void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleToolButton* toggle, EditingToolsEditingToolFactory factory) { +void +editing_host_page_on_tool_button_toggled (EditingHostPage* self, + GtkToggleToolButton* toggle, + EditingToolsEditingToolFactory factory) +{ gboolean _tmp0_ = FALSE; - GtkToggleToolButton* _tmp1_; + gboolean _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; gboolean deactivating_only = FALSE; - Dimensions _tmp6_ = {0}; - gboolean _tmp7_; - GtkToggleToolButton* _tmp8_; - GtkToggleToolButton* _tmp9_; + Dimensions _tmp4_ = {0}; + gboolean _tmp5_; + GtkToggleToolButton* _tmp6_; EditingToolsEditingTool* tool = NULL; - EditingToolsEditingToolFactory _tmp10_; + EditingToolsEditingTool* _tmp7_; + EditingToolsEditingTool* _tmp8_; + EditingToolsEditingTool* _tmp9_; + EditingToolsEditingTool* _tmp10_; EditingToolsEditingTool* _tmp11_; EditingToolsEditingTool* _tmp12_; EditingToolsEditingTool* _tmp13_; - EditingToolsEditingTool* _tmp14_; - EditingToolsEditingTool* _tmp15_; - EditingToolsEditingTool* _tmp16_; - EditingToolsEditingTool* _tmp17_; #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (GTK_IS_TOGGLE_TOOL_BUTTON (toggle)); #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = toggle; -#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_); + _tmp1_ = gtk_toggle_tool_button_get_active (toggle); #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_; -#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp3_) { -#line 13145 "PhotoPage.c" - GtkToggleToolButton* _tmp4_; - GtkToggleToolButton* _tmp5_; + _tmp2_ = _tmp1_; #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = self->priv->current_editing_toggle; + if (!_tmp2_) { +#line 13511 "PhotoPage.c" + GtkToggleToolButton* _tmp3_; #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = toggle; + _tmp3_ = self->priv->current_editing_toggle; #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = _tmp4_ == _tmp5_; -#line 13154 "PhotoPage.c" + _tmp0_ = _tmp3_ == toggle; +#line 13517 "PhotoPage.c" } else { #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 13158 "PhotoPage.c" +#line 13521 "PhotoPage.c" } #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala" deactivating_only = _tmp0_; #line 2049 "/home/jens/Source/shotwell/src/PhotoPage.vala" - dimensions_init (&_tmp6_, 0, 0); + dimensions_init (&_tmp4_, 0, 0); #line 2049 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp6_, FALSE); + editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp4_, FALSE); #line 2051 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = deactivating_only; + _tmp5_ = deactivating_only; #line 2051 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp7_) { + if (_tmp5_) { #line 2052 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13174 "PhotoPage.c" +#line 13537 "PhotoPage.c" } #line 2056 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = toggle; -#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = _g_object_ref0 (_tmp8_); + _tmp6_ = _g_object_ref0 (toggle); #line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->current_editing_toggle); #line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->current_editing_toggle = _tmp9_; -#line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = factory; + self->priv->current_editing_toggle = _tmp6_; #line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = _tmp10_ (); + _tmp7_ = factory (); #line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala" - tool = _tmp11_; + tool = _tmp7_; #line 2062 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = tool; + _tmp8_ = tool; #line 2062 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp12_, "activated", (GCallback) _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated, self, 0); + g_signal_connect_object (_tmp8_, "activated", (GCallback) _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated, self, 0); #line 2063 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = tool; + _tmp9_ = tool; #line 2063 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp13_, "deactivated", (GCallback) _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated, self, 0); + g_signal_connect_object (_tmp9_, "deactivated", (GCallback) _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated, self, 0); #line 2064 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = tool; + _tmp10_ = tool; #line 2064 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp14_, "applied", (GCallback) _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied, self, 0); + g_signal_connect_object (_tmp10_, "applied", (GCallback) _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied, self, 0); #line 2065 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = tool; + _tmp11_ = tool; #line 2065 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp15_, "cancelled", (GCallback) _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled, self, 0); + g_signal_connect_object (_tmp11_, "cancelled", (GCallback) _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled, self, 0); #line 2066 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = tool; + _tmp12_ = tool; #line 2066 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (_tmp16_, "aborted", (GCallback) _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted, self, 0); + g_signal_connect_object (_tmp12_, "aborted", (GCallback) _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted, self, 0); #line 2068 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = tool; + _tmp13_ = tool; #line 2068 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_activate_tool (self, _tmp17_); + editing_host_page_activate_tool (self, _tmp13_); #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala" _editing_tools_editing_tool_unref0 (tool); -#line 13218 "PhotoPage.c" +#line 13577 "PhotoPage.c" } -static void editing_host_page_on_tool_activated (EditingHostPage* self) { +static void +editing_host_page_on_tool_activated (EditingHostPage* self) +{ GtkToggleToolButton* _tmp0_; GtkScale* _tmp1_; GtkToggleToolButton* _tmp2_; @@ -13241,11 +13602,13 @@ static void editing_host_page_on_tool_activated (EditingHostPage* self) { _tmp2_ = self->priv->current_editing_toggle; #line 2074 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toggle_tool_button_set_active (_tmp2_, TRUE); -#line 13240 "PhotoPage.c" +#line 13601 "PhotoPage.c" } -static void editing_host_page_on_tool_deactivated (EditingHostPage* self) { +static void +editing_host_page_on_tool_deactivated (EditingHostPage* self) +{ GtkToggleToolButton* _tmp0_; GtkScale* _tmp1_; GtkToggleToolButton* _tmp2_; @@ -13263,15 +13626,18 @@ static void editing_host_page_on_tool_deactivated (EditingHostPage* self) { _tmp2_ = self->priv->current_editing_toggle; #line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala" gtk_toggle_tool_button_set_active (_tmp2_, FALSE); -#line 13262 "PhotoPage.c" +#line 13625 "PhotoPage.c" } -static void editing_host_page_on_tool_applied (EditingHostPage* self, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement) { - Command* _tmp0_; - GdkPixbuf* _tmp1_; - Dimensions _tmp2_; - gboolean _tmp3_; +static void +editing_host_page_on_tool_applied (EditingHostPage* self, + Command* command, + GdkPixbuf* new_pixbuf, + Dimensions* new_max_dim, + gboolean needs_improvement) +{ + Dimensions _tmp0_; #line 2083 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 2083 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -13281,20 +13647,16 @@ static void editing_host_page_on_tool_applied (EditingHostPage* self, Command* c #line 2083 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (new_max_dim != NULL); #line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = command; -#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = new_pixbuf; -#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = *new_max_dim; -#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = needs_improvement; + _tmp0_ = *new_max_dim; #line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_deactivate_tool (self, _tmp0_, _tmp1_, &_tmp2_, _tmp3_); -#line 13289 "PhotoPage.c" + editing_host_page_deactivate_tool (self, command, new_pixbuf, &_tmp0_, needs_improvement); +#line 13649 "PhotoPage.c" } -static void editing_host_page_on_tool_cancelled (EditingHostPage* self) { +static void +editing_host_page_on_tool_cancelled (EditingHostPage* self) +{ Dimensions _tmp0_ = {0}; #line 2088 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); @@ -13306,11 +13668,13 @@ static void editing_host_page_on_tool_cancelled (EditingHostPage* self) { single_photo_page_restore_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 2092 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); -#line 13305 "PhotoPage.c" +#line 13667 "PhotoPage.c" } -static void editing_host_page_on_tool_aborted (EditingHostPage* self) { +static void +editing_host_page_on_tool_aborted (EditingHostPage* self) +{ Dimensions _tmp0_ = {0}; #line 2095 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); @@ -13320,14 +13684,15 @@ static void editing_host_page_on_tool_aborted (EditingHostPage* self) { editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE); #line 2097 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_set_photo_missing (self, TRUE); -#line 13319 "PhotoPage.c" +#line 13683 "PhotoPage.c" } -void editing_host_page_toggle_crop (EditingHostPage* self) { +void +editing_host_page_toggle_crop (EditingHostPage* self) +{ GtkToggleToolButton* _tmp0_; GtkToggleToolButton* _tmp1_; - gboolean _tmp2_; #line 2100 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -13335,17 +13700,16 @@ void editing_host_page_toggle_crop (EditingHostPage* self) { #line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->crop_button; #line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_); -#line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_); -#line 13337 "PhotoPage.c" + gtk_toggle_tool_button_set_active (_tmp0_, !gtk_toggle_tool_button_get_active (_tmp1_)); +#line 13700 "PhotoPage.c" } -void editing_host_page_toggle_straighten (EditingHostPage* self) { +void +editing_host_page_toggle_straighten (EditingHostPage* self) +{ GtkToggleToolButton* _tmp0_; GtkToggleToolButton* _tmp1_; - gboolean _tmp2_; #line 2104 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -13353,17 +13717,16 @@ void editing_host_page_toggle_straighten (EditingHostPage* self) { #line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->straighten_button; #line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_); -#line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_); -#line 13355 "PhotoPage.c" + gtk_toggle_tool_button_set_active (_tmp0_, !gtk_toggle_tool_button_get_active (_tmp1_)); +#line 13717 "PhotoPage.c" } -void editing_host_page_toggle_redeye (EditingHostPage* self) { +void +editing_host_page_toggle_redeye (EditingHostPage* self) +{ GtkToggleToolButton* _tmp0_; GtkToggleToolButton* _tmp1_; - gboolean _tmp2_; #line 2108 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -13371,17 +13734,16 @@ void editing_host_page_toggle_redeye (EditingHostPage* self) { #line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->redeye_button; #line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_); -#line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_); -#line 13373 "PhotoPage.c" + gtk_toggle_tool_button_set_active (_tmp0_, !gtk_toggle_tool_button_get_active (_tmp1_)); +#line 13734 "PhotoPage.c" } -void editing_host_page_toggle_adjust (EditingHostPage* self) { +void +editing_host_page_toggle_adjust (EditingHostPage* self) +{ GtkToggleToolButton* _tmp0_; GtkToggleToolButton* _tmp1_; - gboolean _tmp2_; #line 2112 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -13389,23 +13751,25 @@ void editing_host_page_toggle_adjust (EditingHostPage* self) { #line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->adjust_button; #line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_); -#line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_); -#line 13391 "PhotoPage.c" + gtk_toggle_tool_button_set_active (_tmp0_, !gtk_toggle_tool_button_get_active (_tmp1_)); +#line 13751 "PhotoPage.c" } -static EditingToolsEditingTool* _editing_tools_straighten_tool_factory_editing_tools_editing_tool_factory (void) { +static EditingToolsEditingTool* +_editing_tools_straighten_tool_factory_editing_tools_editing_tool_factory (void) +{ EditingToolsEditingTool* result; result = editing_tools_straighten_tool_factory (); #line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13400 "PhotoPage.c" +#line 13762 "PhotoPage.c" } -static void editing_host_page_on_straighten_toggled (EditingHostPage* self) { +static void +editing_host_page_on_straighten_toggled (EditingHostPage* self) +{ GtkToggleToolButton* _tmp0_; #line 2116 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); @@ -13413,20 +13777,24 @@ static void editing_host_page_on_straighten_toggled (EditingHostPage* self) { _tmp0_ = self->priv->straighten_button; #line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_straighten_tool_factory_editing_tools_editing_tool_factory); -#line 13412 "PhotoPage.c" +#line 13776 "PhotoPage.c" } -static EditingToolsEditingTool* _editing_tools_crop_tool_factory_editing_tools_editing_tool_factory (void) { +static EditingToolsEditingTool* +_editing_tools_crop_tool_factory_editing_tools_editing_tool_factory (void) +{ EditingToolsEditingTool* result; result = editing_tools_crop_tool_factory (); #line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13421 "PhotoPage.c" +#line 13787 "PhotoPage.c" } -static void editing_host_page_on_crop_toggled (EditingHostPage* self) { +static void +editing_host_page_on_crop_toggled (EditingHostPage* self) +{ GtkToggleToolButton* _tmp0_; #line 2120 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); @@ -13434,20 +13802,24 @@ static void editing_host_page_on_crop_toggled (EditingHostPage* self) { _tmp0_ = self->priv->crop_button; #line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_crop_tool_factory_editing_tools_editing_tool_factory); -#line 13433 "PhotoPage.c" +#line 13801 "PhotoPage.c" } -static EditingToolsEditingTool* _editing_tools_redeye_tool_factory_editing_tools_editing_tool_factory (void) { +static EditingToolsEditingTool* +_editing_tools_redeye_tool_factory_editing_tools_editing_tool_factory (void) +{ EditingToolsEditingTool* result; result = editing_tools_redeye_tool_factory (); #line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13442 "PhotoPage.c" +#line 13812 "PhotoPage.c" } -static void editing_host_page_on_redeye_toggled (EditingHostPage* self) { +static void +editing_host_page_on_redeye_toggled (EditingHostPage* self) +{ GtkToggleToolButton* _tmp0_; #line 2124 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); @@ -13455,20 +13827,24 @@ static void editing_host_page_on_redeye_toggled (EditingHostPage* self) { _tmp0_ = self->priv->redeye_button; #line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_redeye_tool_factory_editing_tools_editing_tool_factory); -#line 13454 "PhotoPage.c" +#line 13826 "PhotoPage.c" } -static EditingToolsEditingTool* _editing_tools_adjust_tool_factory_editing_tools_editing_tool_factory (void) { +static EditingToolsEditingTool* +_editing_tools_adjust_tool_factory_editing_tools_editing_tool_factory (void) +{ EditingToolsEditingTool* result; result = editing_tools_adjust_tool_factory (); #line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13463 "PhotoPage.c" +#line 13837 "PhotoPage.c" } -static void editing_host_page_on_adjust_toggled (EditingHostPage* self) { +static void +editing_host_page_on_adjust_toggled (EditingHostPage* self) +{ GtkToggleToolButton* _tmp0_; #line 2128 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); @@ -13476,11 +13852,14 @@ static void editing_host_page_on_adjust_toggled (EditingHostPage* self) { _tmp0_ = self->priv->adjust_button; #line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_adjust_tool_factory_editing_tools_editing_tool_factory); -#line 13475 "PhotoPage.c" +#line 13851 "PhotoPage.c" } -gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* photo) { +gboolean +editing_host_page_is_enhance_available (EditingHostPage* self, + Photo* photo) +{ gboolean result = FALSE; gboolean _tmp0_; #line 2132 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -13493,32 +13872,33 @@ gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* p result = !_tmp0_; #line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 13492 "PhotoPage.c" +#line 13871 "PhotoPage.c" } -void editing_host_page_on_enhance (EditingHostPage* self) { +void +editing_host_page_on_enhance (EditingHostPage* self) +{ EditingToolsEditingTool* _tmp0_; - gboolean _tmp2_; EditingToolsAdjustTool* adjust_tool = NULL; - EditingToolsEditingTool* _tmp3_; + EditingToolsEditingTool* _tmp2_; + EditingToolsAdjustTool* _tmp3_; EditingToolsAdjustTool* _tmp4_; - EditingToolsAdjustTool* _tmp5_; EnhanceSingleCommand* command = NULL; + Photo* _tmp6_; Photo* _tmp7_; - Photo* _tmp8_; + EnhanceSingleCommand* _tmp8_; EnhanceSingleCommand* _tmp9_; - EnhanceSingleCommand* _tmp10_; + CommandManager* _tmp10_; CommandManager* _tmp11_; - CommandManager* _tmp12_; - EnhanceSingleCommand* _tmp13_; + EnhanceSingleCommand* _tmp12_; #line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 2140 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = self->priv->current_tool; #line 2140 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) { -#line 13517 "PhotoPage.c" +#line 13897 "PhotoPage.c" Dimensions _tmp1_ = {0}; #line 2141 "/home/jens/Source/shotwell/src/PhotoPage.vala" dimensions_init (&_tmp1_, 0, 0); @@ -13526,118 +13906,116 @@ void editing_host_page_on_enhance (EditingHostPage* self) { editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE); #line 2143 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 13525 "PhotoPage.c" +#line 13905 "PhotoPage.c" } #line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = editing_host_page_has_photo (self); -#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp2_) { + if (!editing_host_page_has_photo (self)) { #line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13533 "PhotoPage.c" +#line 13911 "PhotoPage.c" } #line 2149 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = self->priv->current_tool; + _tmp2_ = self->priv->current_tool; #line 2149 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _editing_tools_editing_tool_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, EDITING_TOOLS_TYPE_ADJUST_TOOL) ? ((EditingToolsAdjustTool*) _tmp3_) : NULL); + _tmp3_ = _editing_tools_editing_tool_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, EDITING_TOOLS_TYPE_ADJUST_TOOL) ? ((EditingToolsAdjustTool*) _tmp2_) : NULL); #line 2149 "/home/jens/Source/shotwell/src/PhotoPage.vala" - adjust_tool = _tmp4_; + adjust_tool = _tmp3_; #line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = adjust_tool; + _tmp4_ = adjust_tool; #line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp5_ != NULL) { -#line 13545 "PhotoPage.c" - EditingToolsAdjustTool* _tmp6_; + if (_tmp4_ != NULL) { +#line 13923 "PhotoPage.c" + EditingToolsAdjustTool* _tmp5_; #line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = adjust_tool; + _tmp5_ = adjust_tool; #line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_tools_adjust_tool_enhance (_tmp6_); + editing_tools_adjust_tool_enhance (_tmp5_); #line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala" _editing_tools_editing_tool_unref0 (adjust_tool); #line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13555 "PhotoPage.c" +#line 13933 "PhotoPage.c" } #line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = editing_host_page_get_photo (self); + _tmp6_ = editing_host_page_get_photo (self); #line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = enhance_single_command_new (_tmp8_); + _tmp8_ = enhance_single_command_new (_tmp7_); #line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command = _tmp10_; + command = _tmp9_; #line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = command; + _tmp12_ = command; #line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); #line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _command_manager_unref0 (_tmp12_); + _command_manager_unref0 (_tmp11_); #line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); #line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala" _editing_tools_editing_tool_unref0 (adjust_tool); -#line 13583 "PhotoPage.c" +#line 13961 "PhotoPage.c" } -void editing_host_page_on_copy_adjustments (EditingHostPage* self) { - gboolean _tmp0_; +void +editing_host_page_on_copy_adjustments (EditingHostPage* self) +{ + Photo* _tmp0_; Photo* _tmp1_; - Photo* _tmp2_; + PixelTransformationBundle* _tmp2_; PixelTransformationBundle* _tmp3_; - PixelTransformationBundle* _tmp4_; #line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 2161 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = editing_host_page_has_photo (self); -#line 2161 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp0_) { + if (!editing_host_page_has_photo (self)) { #line 2162 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13601 "PhotoPage.c" +#line 13978 "PhotoPage.c" } #line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = editing_host_page_get_photo (self); + _tmp0_ = editing_host_page_get_photo (self); #line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = photo_get_color_adjustments (_tmp2_); + _tmp2_ = photo_get_color_adjustments (_tmp1_); #line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala" - pixel_transformation_bundle_set_copied_color_adjustments (_tmp4_); + pixel_transformation_bundle_set_copied_color_adjustments (_tmp3_); #line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _pixel_transformation_bundle_unref0 (_tmp4_); + _pixel_transformation_bundle_unref0 (_tmp3_); #line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", TRUE); -#line 13619 "PhotoPage.c" +#line 13996 "PhotoPage.c" } -void editing_host_page_on_paste_adjustments (EditingHostPage* self) { +void +editing_host_page_on_paste_adjustments (EditingHostPage* self) +{ PixelTransformationBundle* copied_adjustments = NULL; PixelTransformationBundle* _tmp0_; gboolean _tmp1_ = FALSE; - gboolean _tmp2_; AdjustColorsSingleCommand* command = NULL; + Photo* _tmp3_; Photo* _tmp4_; - Photo* _tmp5_; - PixelTransformationBundle* _tmp6_; + PixelTransformationBundle* _tmp5_; + AdjustColorsSingleCommand* _tmp6_; AdjustColorsSingleCommand* _tmp7_; - AdjustColorsSingleCommand* _tmp8_; + CommandManager* _tmp8_; CommandManager* _tmp9_; - CommandManager* _tmp10_; - AdjustColorsSingleCommand* _tmp11_; + AdjustColorsSingleCommand* _tmp10_; #line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 2168 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -13645,19 +14023,17 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) { #line 2168 "/home/jens/Source/shotwell/src/PhotoPage.vala" copied_adjustments = _tmp0_; #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = editing_host_page_has_photo (self); -#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp2_) { + if (!editing_host_page_has_photo (self)) { #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = TRUE; -#line 13649 "PhotoPage.c" +#line 14025 "PhotoPage.c" } else { - PixelTransformationBundle* _tmp3_; + PixelTransformationBundle* _tmp2_; #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = copied_adjustments; + _tmp2_ = copied_adjustments; #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = _tmp3_ == NULL; -#line 13656 "PhotoPage.c" + _tmp1_ = _tmp2_ == NULL; +#line 14032 "PhotoPage.c" } #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp1_) { @@ -13665,41 +14041,43 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) { _pixel_transformation_bundle_unref0 (copied_adjustments); #line 2170 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13664 "PhotoPage.c" +#line 14040 "PhotoPage.c" } #line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = editing_host_page_get_photo (self); + _tmp3_ = editing_host_page_get_photo (self); #line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = copied_adjustments; + _tmp5_ = copied_adjustments; #line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = adjust_colors_single_command_new (_tmp5_, _tmp6_, RESOURCES_PASTE_ADJUSTMENTS_LABEL, RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP); + _tmp6_ = adjust_colors_single_command_new (_tmp4_, _tmp5_, RESOURCES_PASTE_ADJUSTMENTS_LABEL, RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP); #line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command = _tmp8_; + command = _tmp7_; #line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp8_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = command; + _tmp10_ = command; #line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command)); #line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _command_manager_unref0 (_tmp10_); + _command_manager_unref0 (_tmp9_); #line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); #line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala" _pixel_transformation_bundle_unref0 (copied_adjustments); -#line 13694 "PhotoPage.c" +#line 14070 "PhotoPage.c" } -static void editing_host_page_place_tool_window (EditingHostPage* self) { +static void +editing_host_page_place_tool_window (EditingHostPage* self) +{ EditingToolsEditingTool* _tmp0_; EditingToolsEditingToolWindow* tool_window = NULL; EditingToolsEditingTool* _tmp1_; @@ -13721,30 +14099,25 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { gchar* _tmp14_; gchar* _tmp15_; gboolean _tmp16_; - gboolean _tmp17_; GdkScreen* screen = NULL; - GtkWindow* _tmp87_; - GtkWindow* _tmp88_; - GdkScreen* _tmp89_; + GtkWindow* _tmp84_; + GtkWindow* _tmp85_; + GdkScreen* _tmp86_; + GdkScreen* _tmp87_; + GdkScreen* _tmp88_; + gint _tmp89_; GdkScreen* _tmp90_; - GdkScreen* _tmp91_; + GtkAllocation _tmp91_; gint _tmp92_; - GdkScreen* _tmp93_; - gint _tmp94_; + gint _tmp93_; + GdkScreen* _tmp94_; GtkAllocation _tmp95_; gint _tmp96_; - gint _tmp97_; + EditingToolsEditingToolWindow* _tmp97_; gint _tmp98_; - GdkScreen* _tmp99_; - gint _tmp100_; - GtkAllocation _tmp101_; - gint _tmp102_; - gint _tmp103_; - EditingToolsEditingToolWindow* _tmp104_; - gint _tmp105_; - gint _tmp106_; - EditingToolsEditingToolWindow* _tmp107_; - EditingToolsEditingToolWindow* _tmp108_; + gint _tmp99_; + EditingToolsEditingToolWindow* _tmp100_; + EditingToolsEditingToolWindow* _tmp101_; #line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -13753,7 +14126,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { if (_tmp0_ == NULL) { #line 2179 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13752 "PhotoPage.c" +#line 14125 "PhotoPage.c" } #line 2181 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = self->priv->current_tool; @@ -13769,7 +14142,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { _g_object_unref0 (tool_window); #line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 13768 "PhotoPage.c" +#line 14141 "PhotoPage.c" } #line 2186 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp4_ = tool_window; @@ -13807,391 +14180,376 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) { _tmp15_ = _tmp14_; #line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp16_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_); -#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = _tmp16_; #line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_free0 (_tmp15_); #line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp17_) { -#line 13812 "PhotoPage.c" - GeeHashMap* _tmp18_; - EditingToolsEditingTool* _tmp19_; - const gchar* _tmp20_; + if (_tmp16_) { +#line 14183 "PhotoPage.c" + GeeHashMap* _tmp17_; + EditingToolsEditingTool* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_; gchar* _tmp21_; - gchar* _tmp22_; - gpointer _tmp23_; - GeeHashMap* _tmp24_; - EditingToolsEditingTool* _tmp25_; - const gchar* _tmp26_; + gpointer _tmp22_; + GeeHashMap* _tmp23_; + EditingToolsEditingTool* _tmp24_; + const gchar* _tmp25_; + gchar* _tmp26_; gchar* _tmp27_; - gchar* _tmp28_; - gpointer _tmp29_; + gpointer _tmp28_; #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = self->priv->last_locations; + _tmp17_ = self->priv->last_locations; #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = self->priv->current_tool; + _tmp18_ = self->priv->current_tool; #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = _tmp19_->name; + _tmp19_ = _tmp18_->name; #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = g_strconcat (_tmp20_, "_x", NULL); + _tmp20_ = g_strconcat (_tmp19_, "_x", NULL); #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_); + _tmp22_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp21_); #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala" - x = (gint) ((gintptr) _tmp23_); + x = (gint) ((gintptr) _tmp22_); #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp21_); #line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = self->priv->last_locations; + _tmp23_ = self->priv->last_locations; #line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = self->priv->current_tool; + _tmp24_ = self->priv->current_tool; #line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp26_ = _tmp25_->name; + _tmp25_ = _tmp24_->name; #line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = g_strconcat (_tmp26_, "_y", NULL); + _tmp26_ = g_strconcat (_tmp25_, "_y", NULL); #line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = _tmp27_; + _tmp27_ = _tmp26_; #line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp28_); + _tmp28_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_); #line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala" - y = (gint) ((gintptr) _tmp29_); + y = (gint) ((gintptr) _tmp28_); #line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_free0 (_tmp28_); -#line 13857 "PhotoPage.c" + _g_free0 (_tmp27_); +#line 14228 "PhotoPage.c" } else { + GtkWindow* _tmp29_; GtkWindow* _tmp30_; - GtkWindow* _tmp31_; + AppWindow* _tmp31_; AppWindow* _tmp32_; - AppWindow* _tmp33_; - gboolean _tmp34_; + gboolean _tmp33_; #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp29_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp31_ = _tmp30_; + _tmp30_ = _tmp29_; #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp32_ = app_window_get_instance (); + _tmp31_ = app_window_get_instance (); #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp33_ = _tmp32_; + _tmp32_ = _tmp31_; #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp34_ = _tmp31_ == G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow); + _tmp33_ = _tmp30_ == G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_window_get_type (), GtkWindow); #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp33_); + _g_object_unref0 (_tmp32_); #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp31_); + _g_object_unref0 (_tmp30_); #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp34_) { -#line 13880 "PhotoPage.c" + if (_tmp33_) { +#line 14251 "PhotoPage.c" gint rx = 0; gint ry = 0; + GtkWindow* _tmp34_; GtkWindow* _tmp35_; - GtkWindow* _tmp36_; - GdkWindow* _tmp37_; + GdkWindow* _tmp36_; + gint _tmp37_ = 0; gint _tmp38_ = 0; - gint _tmp39_ = 0; GtkAllocation viewport_allocation = {0}; - GtkViewport* _tmp40_; - GtkAllocation _tmp41_ = {0}; + GtkViewport* _tmp39_; + GtkAllocation _tmp40_ = {0}; gint cx = 0; gint cy = 0; gint cwidth = 0; gint cheight = 0; - GtkAllocation _tmp42_; - gint _tmp43_; - GtkAllocation _tmp44_; - gint _tmp45_; - GtkAllocation _tmp46_; - gint _tmp47_; - GtkAllocation _tmp48_; - gint _tmp49_; - gint _tmp50_ = 0; + GtkAllocation _tmp41_; + gint _tmp42_; + GtkAllocation _tmp43_; + gint _tmp44_; + GtkAllocation _tmp45_; + gint _tmp46_; + GtkAllocation _tmp47_; + gint _tmp48_; + gint _tmp49_ = 0; + gint _tmp58_; gint _tmp59_; gint _tmp60_; - gint _tmp61_; - GtkAllocation _tmp62_; - gint _tmp63_; + GtkAllocation _tmp61_; + gint _tmp62_; #line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp35_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp34_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp36_ = _tmp35_; + _tmp35_ = _tmp34_; #line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp37_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget)); + _tmp36_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget)); #line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gdk_window_get_root_origin (_tmp37_, &_tmp38_, &_tmp39_); + gdk_window_get_root_origin (_tmp36_, &_tmp37_, &_tmp38_); #line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rx = _tmp38_; + rx = _tmp37_; #line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala" - ry = _tmp39_; + ry = _tmp38_; #line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp36_); + _g_object_unref0 (_tmp35_); #line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp40_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->viewport; + _tmp39_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->viewport; #line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), &_tmp41_); + gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget), &_tmp40_); #line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala" - viewport_allocation = _tmp41_; + viewport_allocation = _tmp40_; #line 2211 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp42_ = viewport_allocation; + _tmp41_ = viewport_allocation; #line 2211 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp43_ = _tmp42_.x; + _tmp42_ = _tmp41_.x; #line 2211 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cx = _tmp43_; + cx = _tmp42_; #line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp44_ = viewport_allocation; + _tmp43_ = viewport_allocation; #line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp45_ = _tmp44_.y; + _tmp44_ = _tmp43_.y; #line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cy = _tmp45_; + cy = _tmp44_; #line 2213 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp46_ = viewport_allocation; + _tmp45_ = viewport_allocation; #line 2213 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp47_ = _tmp46_.width; + _tmp46_ = _tmp45_.width; #line 2213 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cwidth = _tmp47_; + cwidth = _tmp46_; #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp48_ = viewport_allocation; + _tmp47_ = viewport_allocation; #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp49_ = _tmp48_.height; + _tmp48_ = _tmp47_.height; #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala" - cheight = _tmp49_; + cheight = _tmp48_; #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE)) { -#line 13955 "PhotoPage.c" +#line 14326 "PhotoPage.c" + gint _tmp50_; gint _tmp51_; gint _tmp52_; - gint _tmp53_; - GtkAllocation _tmp54_; - gint _tmp55_; + GtkAllocation _tmp53_; + gint _tmp54_; #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp51_ = rx; + _tmp50_ = rx; #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp52_ = cx; + _tmp51_ = cx; #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp53_ = cwidth; + _tmp52_ = cwidth; #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp54_ = tool_alloc; + _tmp53_ = tool_alloc; #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp55_ = _tmp54_.width; + _tmp54_ = _tmp53_.width; #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp50_ = ((_tmp51_ + _tmp52_) + (_tmp53_ / 2)) - (_tmp55_ / 2); -#line 13973 "PhotoPage.c" + _tmp49_ = ((_tmp50_ + _tmp51_) + (_tmp52_ / 2)) - (_tmp54_ / 2); +#line 14344 "PhotoPage.c" } else { + gint _tmp55_; gint _tmp56_; gint _tmp57_; - gint _tmp58_; #line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp56_ = rx; + _tmp55_ = rx; #line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp57_ = cx; + _tmp56_ = cx; #line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp58_ = cwidth; + _tmp57_ = cwidth; #line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp50_ = (_tmp56_ + _tmp57_) + (_tmp58_ / 2); -#line 13986 "PhotoPage.c" + _tmp49_ = (_tmp55_ + _tmp56_) + (_tmp57_ / 2); +#line 14357 "PhotoPage.c" } #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala" - x = _tmp50_; + x = _tmp49_; #line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp59_ = ry; + _tmp58_ = ry; #line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp60_ = cy; + _tmp59_ = cy; #line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp61_ = cheight; + _tmp60_ = cheight; #line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp62_ = tool_alloc; + _tmp61_ = tool_alloc; #line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp63_ = _tmp62_.height; + _tmp62_ = _tmp61_.height; #line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala" - y = ((_tmp59_ + _tmp60_) + _tmp61_) - ((_tmp63_ / 4) * 3); -#line 14002 "PhotoPage.c" + y = ((_tmp58_ + _tmp59_) + _tmp60_) - ((_tmp62_ / 4) * 3); +#line 14373 "PhotoPage.c" } else { + GtkWindow* _tmp63_; GtkWindow* _tmp64_; - GtkWindow* _tmp65_; GtkAllocation toolbar_alloc = {0}; + GtkToolbar* _tmp65_; GtkToolbar* _tmp66_; - GtkToolbar* _tmp67_; - GtkAllocation _tmp68_ = {0}; + GtkAllocation _tmp67_ = {0}; GdkScreen* screen = NULL; + GtkWindow* _tmp68_; GtkWindow* _tmp69_; - GtkWindow* _tmp70_; + GdkScreen* _tmp70_; GdkScreen* _tmp71_; GdkScreen* _tmp72_; GdkScreen* _tmp73_; GdkScreen* _tmp74_; - gint _tmp75_; - GdkScreen* _tmp76_; - gint _tmp77_; - GtkAllocation _tmp78_; - gint _tmp79_; - GtkAllocation _tmp80_; - gint _tmp81_; - EditingToolsEditingTool* _tmp82_; + GtkAllocation _tmp75_; + gint _tmp76_; + GtkAllocation _tmp77_; + gint _tmp78_; + EditingToolsEditingTool* _tmp79_; #line 2222 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp64_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp63_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2222 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp65_ = _tmp64_; + _tmp64_ = _tmp63_; #line 2222 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp65_, TYPE_FULLSCREEN_WINDOW), "get_container() is FullscreenWindow"); + _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp64_, TYPE_FULLSCREEN_WINDOW), "get_container() is FullscreenWindow"); #line 2222 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp65_); + _g_object_unref0 (_tmp64_); #line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp66_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp65_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp67_ = _tmp66_; + _tmp66_ = _tmp65_; #line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), &_tmp68_); + gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), &_tmp67_); #line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala" - toolbar_alloc = _tmp68_; + toolbar_alloc = _tmp67_; #line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp67_); + _g_object_unref0 (_tmp66_); #line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp69_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp68_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp70_ = _tmp69_; + _tmp69_ = _tmp68_; #line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp71_ = gtk_window_get_screen (_tmp70_); + _tmp70_ = gtk_window_get_screen (_tmp69_); #line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp72_ = _g_object_ref0 (_tmp71_); + _tmp71_ = _g_object_ref0 (_tmp70_); #line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp73_ = _tmp72_; + _tmp72_ = _tmp71_; #line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp70_); + _g_object_unref0 (_tmp69_); #line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala" - screen = _tmp73_; -#line 2230 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp74_ = screen; + screen = _tmp72_; #line 2230 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp75_ = gdk_screen_get_width (_tmp74_); + _tmp73_ = screen; #line 2230 "/home/jens/Source/shotwell/src/PhotoPage.vala" - x = _tmp75_; -#line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp76_ = screen; + x = gdk_screen_get_width (_tmp73_); #line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp77_ = gdk_screen_get_height (_tmp76_); + _tmp74_ = screen; #line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp78_ = toolbar_alloc; + _tmp75_ = toolbar_alloc; #line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp79_ = _tmp78_.height; + _tmp76_ = _tmp75_.height; #line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp80_ = tool_alloc; + _tmp77_ = tool_alloc; #line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp81_ = _tmp80_.height; + _tmp78_ = _tmp77_.height; #line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala" - y = ((_tmp77_ - _tmp79_) - _tmp81_) - EDITING_HOST_PAGE_TOOL_WINDOW_SEPARATOR; + y = ((gdk_screen_get_height (_tmp74_) - _tmp76_) - _tmp78_) - EDITING_HOST_PAGE_TOOL_WINDOW_SEPARATOR; #line 2235 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp82_ = self->priv->current_tool; + _tmp79_ = self->priv->current_tool; #line 2235 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp82_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) { -#line 14081 "PhotoPage.c" - gint _tmp83_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) { +#line 14446 "PhotoPage.c" + gint _tmp80_; #line 2236 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp83_ = x; + _tmp80_ = x; #line 2236 "/home/jens/Source/shotwell/src/PhotoPage.vala" - x = (_tmp83_ * 3) / 4; -#line 14087 "PhotoPage.c" + x = (_tmp80_ * 3) / 4; +#line 14452 "PhotoPage.c" } else { - gint _tmp84_; - GtkAllocation _tmp85_; - gint _tmp86_; + gint _tmp81_; + GtkAllocation _tmp82_; + gint _tmp83_; #line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp84_ = x; + _tmp81_ = x; #line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp85_ = tool_alloc; + _tmp82_ = tool_alloc; #line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp86_ = _tmp85_.width; + _tmp83_ = _tmp82_.width; #line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala" - x = (_tmp84_ - _tmp86_) / 2; -#line 14100 "PhotoPage.c" + x = (_tmp81_ - _tmp83_) / 2; +#line 14465 "PhotoPage.c" } #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (screen); -#line 14104 "PhotoPage.c" +#line 14469 "PhotoPage.c" } } #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp87_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp84_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp88_ = _tmp87_; + _tmp85_ = _tmp84_; #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp89_ = gtk_window_get_screen (_tmp88_); + _tmp86_ = gtk_window_get_screen (_tmp85_); #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp90_ = _g_object_ref0 (_tmp89_); + _tmp87_ = _g_object_ref0 (_tmp86_); #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp91_ = _tmp90_; + _tmp88_ = _tmp87_; #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp88_); + _g_object_unref0 (_tmp85_); #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala" - screen = _tmp91_; -#line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp92_ = x; -#line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp93_ = screen; + screen = _tmp88_; #line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp94_ = gdk_screen_get_width (_tmp93_); + _tmp89_ = x; #line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp95_ = tool_alloc; + _tmp90_ = screen; #line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp96_ = _tmp95_.width; + _tmp91_ = tool_alloc; #line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp97_ = CLAMP (_tmp92_, 0, _tmp94_ - _tmp96_); + _tmp92_ = _tmp91_.width; #line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala" - x = _tmp97_; -#line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp98_ = y; + x = CLAMP (_tmp89_, 0, gdk_screen_get_width (_tmp90_) - _tmp92_); #line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp99_ = screen; + _tmp93_ = y; #line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp100_ = gdk_screen_get_height (_tmp99_); + _tmp94_ = screen; #line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp101_ = tool_alloc; -#line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp102_ = _tmp101_.height; + _tmp95_ = tool_alloc; #line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp103_ = CLAMP (_tmp98_, 0, _tmp100_ - _tmp102_); + _tmp96_ = _tmp95_.height; #line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala" - y = _tmp103_; + y = CLAMP (_tmp93_, 0, gdk_screen_get_height (_tmp94_) - _tmp96_); #line 2248 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp104_ = tool_window; + _tmp97_ = tool_window; #line 2248 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp105_ = x; + _tmp98_ = x; #line 2248 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp106_ = y; + _tmp99_ = y; #line 2248 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, gtk_window_get_type (), GtkWindow), _tmp105_, _tmp106_); + gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, gtk_window_get_type (), GtkWindow), _tmp98_, _tmp99_); #line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp107_ = tool_window; + _tmp100_ = tool_window; #line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget)); #line 2250 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp108_ = tool_window; + _tmp101_ = tool_window; #line 2250 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_window_get_type (), GtkWindow)); + gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, gtk_window_get_type (), GtkWindow)); #line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (screen); #line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (tool_window); -#line 14169 "PhotoPage.c" +#line 14526 "PhotoPage.c" } -static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { +static void +editing_host_page_real_on_next_photo (SinglePhotoPage* base) +{ EditingHostPage * self; Dimensions _tmp0_ = {0}; - gboolean _tmp1_; Photo* current_photo = NULL; + Photo* _tmp1_; Photo* _tmp2_; - Photo* _tmp3_; DataView* current = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + Photo* _tmp5_; Photo* _tmp6_; - Photo* _tmp7_; + DataView* _tmp7_; DataView* _tmp8_; DataView* _tmp9_; - DataView* _tmp10_; DataView* next = NULL; + DataView* _tmp10_; DataView* _tmp11_; - DataView* _tmp12_; #line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 2254 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -14199,151 +14557,149 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { #line 2254 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE); #line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = editing_host_page_has_photo (self); -#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp1_) { + if (!editing_host_page_has_photo (self)) { #line 2257 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 14203 "PhotoPage.c" +#line 14559 "PhotoPage.c" } #line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = editing_host_page_get_photo (self); + _tmp1_ = editing_host_page_get_photo (self); #line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala" - current_photo = _tmp2_; + current_photo = _tmp1_; #line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = current_photo; + _tmp2_ = current_photo; #line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_assert (_tmp3_ != NULL, "current_photo != null"); + _vala_assert (_tmp2_ != NULL, "current_photo != null"); #line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = editing_host_page_get_photo (self); + _tmp5_ = editing_host_page_get_photo (self); #line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = view_collection_get_view_for_source (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource)); + _tmp7_ = view_collection_get_view_for_source (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_SOURCE, DataSource)); #line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala" - current = _tmp9_; + current = _tmp8_; #line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = current; + _tmp9_ = current; #line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp10_ == NULL) { + if (_tmp9_ == NULL) { #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (current); #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (current_photo); #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 14241 "PhotoPage.c" +#line 14597 "PhotoPage.c" } #line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = current; + _tmp10_ = current; #line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _g_object_ref0 (_tmp11_); + _tmp11_ = _g_object_ref0 (_tmp10_); #line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala" - next = _tmp12_; -#line 14249 "PhotoPage.c" + next = _tmp11_; +#line 14605 "PhotoPage.c" { - gboolean _tmp13_ = FALSE; + gboolean _tmp12_ = FALSE; #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = TRUE; + _tmp12_ = TRUE; #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala" while (TRUE) { -#line 14256 "PhotoPage.c" +#line 14612 "PhotoPage.c" + ViewCollection* _tmp13_; ViewCollection* _tmp14_; - ViewCollection* _tmp15_; + DataView* _tmp15_; DataView* _tmp16_; DataView* _tmp17_; - DataView* _tmp18_; Photo* next_photo = NULL; - DataView* _tmp19_; - DataSource* _tmp20_; + DataView* _tmp18_; + DataSource* _tmp19_; + Photo* _tmp20_; Photo* _tmp21_; Photo* _tmp22_; Photo* _tmp23_; Photo* _tmp24_; - Photo* _tmp25_; #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp13_) { -#line 14272 "PhotoPage.c" + if (!_tmp12_) { +#line 14628 "PhotoPage.c" } #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = FALSE; + _tmp12_ = FALSE; #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = next; + _tmp15_ = next; #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = view_collection_get_next (_tmp15_, _tmp16_); + _tmp16_ = view_collection_get_next (_tmp14_, _tmp15_); #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (next); #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala" - next = _tmp17_; + next = _tmp16_; #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp15_); + _data_collection_unref0 (_tmp14_); #line 2270 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = next; + _tmp17_ = next; #line 2270 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp18_ == NULL) { + if (_tmp17_ == NULL) { #line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14296 "PhotoPage.c" +#line 14652 "PhotoPage.c" } #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = next; + _tmp18_ = next; #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = data_view_get_source (_tmp19_); + _tmp19_ = data_view_get_source (_tmp18_); #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO) ? ((Photo*) _tmp20_) : NULL; + _tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_PHOTO) ? ((Photo*) _tmp19_) : NULL; #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp21_ == NULL) { + if (_tmp20_ == NULL) { #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp20_); -#line 14308 "PhotoPage.c" + _g_object_unref0 (_tmp19_); +#line 14664 "PhotoPage.c" } #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala" - next_photo = _tmp21_; + next_photo = _tmp20_; #line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = next_photo; + _tmp21_ = next_photo; #line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp22_ == NULL) { + if (_tmp21_ == NULL) { #line 2275 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (next_photo); #line 2275 "/home/jens/Source/shotwell/src/PhotoPage.vala" continue; -#line 14320 "PhotoPage.c" +#line 14676 "PhotoPage.c" } #line 2277 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = next_photo; + _tmp22_ = next_photo; #line 2277 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = current_photo; + _tmp23_ = current_photo; #line 2277 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp23_ == _tmp24_) { + if (_tmp22_ == _tmp23_) { #line 2278 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (next_photo); #line 2278 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14332 "PhotoPage.c" +#line 14688 "PhotoPage.c" } #line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = next_photo; + _tmp24_ = next_photo; #line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_replace_photo (self, _tmp25_); + editing_host_page_replace_photo (self, _tmp24_); #line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (next_photo); #line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14342 "PhotoPage.c" +#line 14698 "PhotoPage.c" } } #line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -14352,28 +14708,29 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) { _g_object_unref0 (current); #line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (current_photo); -#line 14351 "PhotoPage.c" +#line 14707 "PhotoPage.c" } -static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { +static void +editing_host_page_real_on_previous_photo (SinglePhotoPage* base) +{ EditingHostPage * self; Dimensions _tmp0_ = {0}; - gboolean _tmp1_; Photo* current_photo = NULL; + Photo* _tmp1_; Photo* _tmp2_; - Photo* _tmp3_; DataView* current = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + Photo* _tmp5_; Photo* _tmp6_; - Photo* _tmp7_; + DataView* _tmp7_; DataView* _tmp8_; DataView* _tmp9_; - DataView* _tmp10_; DataView* previous = NULL; + DataView* _tmp10_; DataView* _tmp11_; - DataView* _tmp12_; #line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage); #line 2287 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -14381,151 +14738,149 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { #line 2287 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE); #line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = editing_host_page_has_photo (self); -#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp1_) { + if (!editing_host_page_has_photo (self)) { #line 2290 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 14385 "PhotoPage.c" +#line 14740 "PhotoPage.c" } #line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = editing_host_page_get_photo (self); + _tmp1_ = editing_host_page_get_photo (self); #line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala" - current_photo = _tmp2_; + current_photo = _tmp1_; #line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = current_photo; + _tmp2_ = current_photo; #line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _vala_assert (_tmp3_ != NULL, "current_photo != null"); + _vala_assert (_tmp2_ != NULL, "current_photo != null"); #line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = editing_host_page_get_photo (self); + _tmp5_ = editing_host_page_get_photo (self); #line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = view_collection_get_view_for_source (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource)); + _tmp7_ = view_collection_get_view_for_source (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_SOURCE, DataSource)); #line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala" - current = _tmp9_; + current = _tmp8_; #line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = current; + _tmp9_ = current; #line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp10_ == NULL) { + if (_tmp9_ == NULL) { #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (current); #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (current_photo); #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 14423 "PhotoPage.c" +#line 14778 "PhotoPage.c" } #line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = current; + _tmp10_ = current; #line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _g_object_ref0 (_tmp11_); + _tmp11_ = _g_object_ref0 (_tmp10_); #line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala" - previous = _tmp12_; -#line 14431 "PhotoPage.c" + previous = _tmp11_; +#line 14786 "PhotoPage.c" { - gboolean _tmp13_ = FALSE; + gboolean _tmp12_ = FALSE; #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = TRUE; + _tmp12_ = TRUE; #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala" while (TRUE) { -#line 14438 "PhotoPage.c" +#line 14793 "PhotoPage.c" + ViewCollection* _tmp13_; ViewCollection* _tmp14_; - ViewCollection* _tmp15_; + DataView* _tmp15_; DataView* _tmp16_; DataView* _tmp17_; - DataView* _tmp18_; Photo* previous_photo = NULL; - DataView* _tmp19_; - DataSource* _tmp20_; + DataView* _tmp18_; + DataSource* _tmp19_; + Photo* _tmp20_; Photo* _tmp21_; Photo* _tmp22_; Photo* _tmp23_; Photo* _tmp24_; - Photo* _tmp25_; #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp13_) { -#line 14454 "PhotoPage.c" + if (!_tmp12_) { +#line 14809 "PhotoPage.c" } #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = FALSE; + _tmp12_ = FALSE; #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = previous; + _tmp15_ = previous; #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = view_collection_get_previous (_tmp15_, _tmp16_); + _tmp16_ = view_collection_get_previous (_tmp14_, _tmp15_); #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (previous); #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala" - previous = _tmp17_; + previous = _tmp16_; #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp15_); + _data_collection_unref0 (_tmp14_); #line 2303 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = previous; + _tmp17_ = previous; #line 2303 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp18_ == NULL) { + if (_tmp17_ == NULL) { #line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14478 "PhotoPage.c" +#line 14833 "PhotoPage.c" } #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = previous; + _tmp18_ = previous; #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = data_view_get_source (_tmp19_); + _tmp19_ = data_view_get_source (_tmp18_); #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO) ? ((Photo*) _tmp20_) : NULL; + _tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_PHOTO) ? ((Photo*) _tmp19_) : NULL; #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp21_ == NULL) { + if (_tmp20_ == NULL) { #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp20_); -#line 14490 "PhotoPage.c" + _g_object_unref0 (_tmp19_); +#line 14845 "PhotoPage.c" } #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala" - previous_photo = _tmp21_; + previous_photo = _tmp20_; #line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = previous_photo; + _tmp21_ = previous_photo; #line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp22_ == NULL) { + if (_tmp21_ == NULL) { #line 2308 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (previous_photo); #line 2308 "/home/jens/Source/shotwell/src/PhotoPage.vala" continue; -#line 14502 "PhotoPage.c" +#line 14857 "PhotoPage.c" } #line 2310 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = previous_photo; + _tmp22_ = previous_photo; #line 2310 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = current_photo; + _tmp23_ = current_photo; #line 2310 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp23_ == _tmp24_) { + if (_tmp22_ == _tmp23_) { #line 2311 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (previous_photo); #line 2311 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14514 "PhotoPage.c" +#line 14869 "PhotoPage.c" } #line 2313 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = previous_photo; + _tmp24_ = previous_photo; #line 2313 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_replace_photo (self, _tmp25_); + editing_host_page_replace_photo (self, _tmp24_); #line 2315 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (previous_photo); #line 2315 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 14524 "PhotoPage.c" +#line 14879 "PhotoPage.c" } } #line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -14534,11 +14889,13 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) { _g_object_unref0 (current); #line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (current_photo); -#line 14533 "PhotoPage.c" +#line 14888 "PhotoPage.c" } -gboolean editing_host_page_has_current_tool (EditingHostPage* self) { +gboolean +editing_host_page_has_current_tool (EditingHostPage* self) +{ gboolean result = FALSE; EditingToolsEditingTool* _tmp0_; #line 2319 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -14549,116 +14906,101 @@ gboolean editing_host_page_has_current_tool (EditingHostPage* self) { result = _tmp0_ != NULL; #line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 14548 "PhotoPage.c" +#line 14905 "PhotoPage.c" } -void editing_host_page_unset_view_collection (EditingHostPage* self) { +void +editing_host_page_unset_view_collection (EditingHostPage* self) +{ #line 2323 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_EDITING_HOST_PAGE (self)); #line 2324 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (self->priv->parent_view); #line 2324 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->parent_view = NULL; -#line 14559 "PhotoPage.c" +#line 14918 "PhotoPage.c" } -static EditingHostPageEditingHostCanvas* editing_host_page_editing_host_canvas_construct (GType object_type, EditingHostPage* host_page) { +static EditingHostPageEditingHostCanvas* +editing_host_page_editing_host_canvas_construct (GType object_type, + EditingHostPage* host_page) +{ EditingHostPageEditingHostCanvas* self = NULL; - EditingHostPage* _tmp0_; + GtkWindow* _tmp0_; GtkWindow* _tmp1_; - GtkWindow* _tmp2_; - EditingHostPage* _tmp3_; - GtkDrawingArea* _tmp4_; - GdkWindow* _tmp5_; - EditingHostPage* _tmp6_; - Photo* _tmp7_; - Photo* _tmp8_; - EditingHostPage* _tmp9_; - cairo_t* _tmp10_; - cairo_t* _tmp11_; + GtkDrawingArea* _tmp2_; + GdkWindow* _tmp3_; + Photo* _tmp4_; + Photo* _tmp5_; + cairo_t* _tmp6_; + cairo_t* _tmp7_; + Dimensions _tmp8_ = {0}; + GdkPixbuf* _tmp9_; + GdkPixbuf* _tmp10_; + GdkRectangle _tmp11_ = {0}; EditingHostPage* _tmp12_; - Dimensions _tmp13_ = {0}; - EditingHostPage* _tmp14_; - GdkPixbuf* _tmp15_; - GdkPixbuf* _tmp16_; - EditingHostPage* _tmp17_; - GdkRectangle _tmp18_ = {0}; - EditingHostPage* _tmp19_; - EditingHostPage* _tmp20_; #line 377 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_EDITING_HOST_PAGE (host_page), NULL); #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = host_page; -#line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page)); -#line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = _tmp1_; -#line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = host_page; -#line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas; -#line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); -#line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = host_page; -#line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = editing_host_page_get_photo (_tmp6_); + _tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (host_page, TYPE_PAGE, Page)); #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp7_; + _tmp1_ = _tmp0_; #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = host_page; + _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (host_page, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas; #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = single_photo_page_get_cairo_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); + _tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = _tmp10_; + _tmp4_ = editing_host_page_get_photo (host_page); #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = host_page; + _tmp5_ = _tmp4_; #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp13_); + _tmp6_ = single_photo_page_get_cairo_context (G_TYPE_CHECK_INSTANCE_CAST (host_page, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = host_page; + _tmp7_ = _tmp6_; #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = single_photo_page_get_scaled_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); + single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (host_page, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_); #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = _tmp15_; + _tmp9_ = single_photo_page_get_scaled_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (host_page, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = host_page; + _tmp10_ = _tmp9_; #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp18_); + single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (host_page, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp11_); #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self = (EditingHostPageEditingHostCanvas*) editing_tools_photo_canvas_construct (object_type, _tmp2_, _tmp5_, _tmp8_, _tmp11_, &_tmp13_, _tmp16_, &_tmp18_); + self = (EditingHostPageEditingHostCanvas*) editing_tools_photo_canvas_construct (object_type, _tmp1_, _tmp3_, _tmp5_, _tmp7_, &_tmp8_, _tmp10_, &_tmp11_); #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp10_); #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _cairo_destroy0 (_tmp11_); + _cairo_destroy0 (_tmp7_); #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp5_); #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp2_); -#line 382 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = host_page; + _g_object_unref0 (_tmp1_); #line 382 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = _g_object_ref0 (_tmp19_); + _tmp12_ = _g_object_ref0 (host_page); #line 382 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->host_page); #line 382 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->host_page = _tmp20_; + self->priv->host_page = _tmp12_; #line 377 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self; -#line 14646 "PhotoPage.c" +#line 14984 "PhotoPage.c" } -static EditingHostPageEditingHostCanvas* editing_host_page_editing_host_canvas_new (EditingHostPage* host_page) { +static EditingHostPageEditingHostCanvas* +editing_host_page_editing_host_canvas_new (EditingHostPage* host_page) +{ #line 377 "/home/jens/Source/shotwell/src/PhotoPage.vala" return editing_host_page_editing_host_canvas_construct (EDITING_HOST_PAGE_TYPE_EDITING_HOST_CANVAS, host_page); -#line 14653 "PhotoPage.c" +#line 14993 "PhotoPage.c" } -static void editing_host_page_editing_host_canvas_real_repaint (EditingToolsPhotoCanvas* base) { +static void +editing_host_page_editing_host_canvas_real_repaint (EditingToolsPhotoCanvas* base) +{ EditingHostPageEditingHostCanvas * self; EditingHostPage* _tmp0_; #line 385 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -14667,11 +15009,13 @@ static void editing_host_page_editing_host_canvas_real_repaint (EditingToolsPhot _tmp0_ = self->priv->host_page; #line 386 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); -#line 14666 "PhotoPage.c" +#line 15008 "PhotoPage.c" } -static void editing_host_page_editing_host_canvas_class_init (EditingHostPageEditingHostCanvasClass * klass) { +static void +editing_host_page_editing_host_canvas_class_init (EditingHostPageEditingHostCanvasClass * klass) +{ #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_editing_host_canvas_parent_class = g_type_class_peek_parent (klass); #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -14680,18 +15024,22 @@ static void editing_host_page_editing_host_canvas_class_init (EditingHostPageEdi g_type_class_add_private (klass, sizeof (EditingHostPageEditingHostCanvasPrivate)); #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((EditingToolsPhotoCanvasClass *) klass)->repaint = (void (*) (EditingToolsPhotoCanvas *)) editing_host_page_editing_host_canvas_real_repaint; -#line 14679 "PhotoPage.c" +#line 15023 "PhotoPage.c" } -static void editing_host_page_editing_host_canvas_instance_init (EditingHostPageEditingHostCanvas * self) { +static void +editing_host_page_editing_host_canvas_instance_init (EditingHostPageEditingHostCanvas * self) +{ #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv = EDITING_HOST_PAGE_EDITING_HOST_CANVAS_GET_PRIVATE (self); -#line 14686 "PhotoPage.c" +#line 15032 "PhotoPage.c" } -static void editing_host_page_editing_host_canvas_finalize (EditingToolsPhotoCanvas * obj) { +static void +editing_host_page_editing_host_canvas_finalize (EditingToolsPhotoCanvas * obj) +{ EditingHostPageEditingHostCanvas * self; #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_HOST_PAGE_TYPE_EDITING_HOST_CANVAS, EditingHostPageEditingHostCanvas); @@ -14699,11 +15047,13 @@ static void editing_host_page_editing_host_canvas_finalize (EditingToolsPhotoCan _g_object_unref0 (self->priv->host_page); #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala" EDITING_TOOLS_PHOTO_CANVAS_CLASS (editing_host_page_editing_host_canvas_parent_class)->finalize (obj); -#line 14698 "PhotoPage.c" +#line 15046 "PhotoPage.c" } -static GType editing_host_page_editing_host_canvas_get_type (void) { +static GType +editing_host_page_editing_host_canvas_get_type (void) +{ static volatile gsize editing_host_page_editing_host_canvas_type_id__volatile = 0; if (g_once_init_enter (&editing_host_page_editing_host_canvas_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditingHostPageEditingHostCanvasClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_host_page_editing_host_canvas_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingHostPageEditingHostCanvas), 0, (GInstanceInitFunc) editing_host_page_editing_host_canvas_instance_init, NULL }; @@ -14715,7 +15065,9 @@ static GType editing_host_page_editing_host_canvas_get_type (void) { } -static void editing_host_page_class_init (EditingHostPageClass * klass) { +static void +editing_host_page_class_init (EditingHostPageClass * klass) +{ #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_parent_class = g_type_class_peek_parent (klass); #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -14818,11 +15170,13 @@ static void editing_host_page_class_init (EditingHostPageClass * klass) { ((SinglePhotoPageClass *) klass)->on_previous_photo = (void (*) (SinglePhotoPage *)) editing_host_page_real_on_previous_photo; #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" G_OBJECT_CLASS (klass)->finalize = editing_host_page_finalize; -#line 14817 "PhotoPage.c" +#line 15169 "PhotoPage.c" } -static void editing_host_page_instance_init (EditingHostPage * self) { +static void +editing_host_page_instance_init (EditingHostPage * self) +{ GtkToolButton* _tmp0_; GtkToolButton* _tmp1_; GeeHashMap* _tmp2_; @@ -14886,11 +15240,13 @@ static void editing_host_page_instance_init (EditingHostPage * self) { _tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_INT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 415 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->last_locations = _tmp2_; -#line 14885 "PhotoPage.c" +#line 15239 "PhotoPage.c" } -static void editing_host_page_finalize (GObject * obj) { +static void +editing_host_page_finalize (GObject * obj) +{ EditingHostPage * self; SourceCollection* _tmp0_; guint _tmp1_; @@ -14970,11 +15326,13 @@ static void editing_host_page_finalize (GObject * obj) { _g_object_unref0 (self->priv->last_locations); #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala" G_OBJECT_CLASS (editing_host_page_parent_class)->finalize (obj); -#line 14969 "PhotoPage.c" +#line 15325 "PhotoPage.c" } -GType editing_host_page_get_type (void) { +GType +editing_host_page_get_type (void) +{ static volatile gsize editing_host_page_type_id__volatile = 0; if (g_once_init_enter (&editing_host_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditingHostPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_host_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingHostPage), 0, (GInstanceInitFunc) editing_host_page_instance_init, NULL }; @@ -14986,371 +15344,580 @@ GType editing_host_page_get_type (void) { } -static void _library_photo_page_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +static void +_library_photo_page_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self) +{ #line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_photo_destroyed ((LibraryPhotoPage*) self, source); -#line 14988 "PhotoPage.c" +#line 15350 "PhotoPage.c" } -static void _library_photo_page_on_metadata_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_library_photo_page_on_metadata_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_metadata_altered ((LibraryPhotoPage*) self, items); -#line 14995 "PhotoPage.c" +#line 15361 "PhotoPage.c" } -static void _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self) { +static void +_library_photo_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, + gpointer self) +{ #line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_external_app_changed ((LibraryPhotoPage*) self); -#line 15002 "PhotoPage.c" +#line 15371 "PhotoPage.c" } -static void _library_photo_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_export ((LibraryPhotoPage*) self); -#line 15009 "PhotoPage.c" +#line 15382 "PhotoPage.c" } -static void _library_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_print ((LibraryPhotoPage*) self); -#line 15016 "PhotoPage.c" +#line 15393 "PhotoPage.c" } -static void _library_photo_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_publish ((LibraryPhotoPage*) self); -#line 15023 "PhotoPage.c" +#line 15404 "PhotoPage.c" } -static void _library_photo_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_remove_from_library ((LibraryPhotoPage*) self); -#line 15030 "PhotoPage.c" +#line 15415 "PhotoPage.c" } -static void _library_photo_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_move_to_trash ((LibraryPhotoPage*) self); -#line 15037 "PhotoPage.c" +#line 15426 "PhotoPage.c" } -static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_on_previous_photo ((SinglePhotoPage*) self); -#line 15044 "PhotoPage.c" +#line 15437 "PhotoPage.c" } -static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_on_next_photo ((SinglePhotoPage*) self); -#line 15051 "PhotoPage.c" +#line 15448 "PhotoPage.c" } -static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_rotate_clockwise ((EditingHostPage*) self); -#line 15058 "PhotoPage.c" +#line 15459 "PhotoPage.c" } -static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self); -#line 15065 "PhotoPage.c" +#line 15470 "PhotoPage.c" } -static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_flip_horizontally ((EditingHostPage*) self); -#line 15072 "PhotoPage.c" +#line 15481 "PhotoPage.c" } -static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_flip_vertically ((EditingHostPage*) self); -#line 15079 "PhotoPage.c" +#line 15492 "PhotoPage.c" } -static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_enhance ((EditingHostPage*) self); -#line 15086 "PhotoPage.c" +#line 15503 "PhotoPage.c" } -static void _editing_host_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_copy_adjustments ((EditingHostPage*) self); -#line 15093 "PhotoPage.c" +#line 15514 "PhotoPage.c" } -static void _editing_host_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_paste_adjustments ((EditingHostPage*) self); -#line 15100 "PhotoPage.c" +#line 15525 "PhotoPage.c" } -static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_toggle_crop ((EditingHostPage*) self); -#line 15107 "PhotoPage.c" +#line 15536 "PhotoPage.c" } -static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_toggle_straighten ((EditingHostPage*) self); -#line 15114 "PhotoPage.c" +#line 15547 "PhotoPage.c" } -static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_toggle_redeye ((EditingHostPage*) self); -#line 15121 "PhotoPage.c" +#line 15558 "PhotoPage.c" } -static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_toggle_adjust ((EditingHostPage*) self); -#line 15128 "PhotoPage.c" +#line 15569 "PhotoPage.c" } -static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_revert ((EditingHostPage*) self); -#line 15135 "PhotoPage.c" +#line 15580 "PhotoPage.c" } -static void _editing_host_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_edit_title ((EditingHostPage*) self); -#line 15142 "PhotoPage.c" +#line 15591 "PhotoPage.c" } -static void _editing_host_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_edit_comment ((EditingHostPage*) self); -#line 15149 "PhotoPage.c" +#line 15602 "PhotoPage.c" } -static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_adjust_date_time ((EditingHostPage*) self); -#line 15156 "PhotoPage.c" +#line 15613 "PhotoPage.c" } -static void _library_photo_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_external_edit ((LibraryPhotoPage*) self); -#line 15163 "PhotoPage.c" +#line 15624 "PhotoPage.c" } -static void _library_photo_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_external_edit_raw ((LibraryPhotoPage*) self); -#line 15170 "PhotoPage.c" +#line 15635 "PhotoPage.c" } -static void _library_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_send_to ((LibraryPhotoPage*) self); -#line 15177 "PhotoPage.c" +#line 15646 "PhotoPage.c" } -static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_set_background ((EditingHostPage*) self); -#line 15184 "PhotoPage.c" +#line 15657 "PhotoPage.c" } -static void _library_photo_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_flag_unflag ((LibraryPhotoPage*) self); -#line 15191 "PhotoPage.c" +#line 15668 "PhotoPage.c" } -static void _library_photo_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_increase_rating ((LibraryPhotoPage*) self); -#line 15198 "PhotoPage.c" +#line 15679 "PhotoPage.c" } -static void _library_photo_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_decrease_rating ((LibraryPhotoPage*) self); -#line 15205 "PhotoPage.c" +#line 15690 "PhotoPage.c" } -static void _library_photo_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_rejected ((LibraryPhotoPage*) self); -#line 15212 "PhotoPage.c" +#line 15701 "PhotoPage.c" } -static void _library_photo_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_unrated ((LibraryPhotoPage*) self); -#line 15219 "PhotoPage.c" +#line 15712 "PhotoPage.c" } -static void _library_photo_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_one ((LibraryPhotoPage*) self); -#line 15226 "PhotoPage.c" +#line 15723 "PhotoPage.c" } -static void _library_photo_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_two ((LibraryPhotoPage*) self); -#line 15233 "PhotoPage.c" +#line 15734 "PhotoPage.c" } -static void _library_photo_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_three ((LibraryPhotoPage*) self); -#line 15240 "PhotoPage.c" +#line 15745 "PhotoPage.c" } -static void _library_photo_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_four ((LibraryPhotoPage*) self); -#line 15247 "PhotoPage.c" +#line 15756 "PhotoPage.c" } -static void _library_photo_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_rate_five ((LibraryPhotoPage*) self); -#line 15254 "PhotoPage.c" +#line 15767 "PhotoPage.c" } -static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_increase_size ((EditingHostPage*) self); -#line 15261 "PhotoPage.c" +#line 15778 "PhotoPage.c" } -static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_on_decrease_size ((EditingHostPage*) self); -#line 15268 "PhotoPage.c" +#line 15789 "PhotoPage.c" } -static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_snap_zoom_to_min ((EditingHostPage*) self); -#line 15275 "PhotoPage.c" +#line 15800 "PhotoPage.c" } -static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_snap_zoom_to_isomorphic ((EditingHostPage*) self); -#line 15282 "PhotoPage.c" +#line 15811 "PhotoPage.c" } -static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_snap_zoom_to_max ((EditingHostPage*) self); -#line 15289 "PhotoPage.c" +#line 15822 "PhotoPage.c" } -static void _library_photo_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_add_tags ((LibraryPhotoPage*) self); -#line 15296 "PhotoPage.c" +#line 15833 "PhotoPage.c" } -static void _library_photo_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_modify_tags ((LibraryPhotoPage*) self); -#line 15303 "PhotoPage.c" +#line 15844 "PhotoPage.c" } -static void _library_photo_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_photo_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_slideshow ((LibraryPhotoPage*) self); -#line 15310 "PhotoPage.c" +#line 15855 "PhotoPage.c" } -static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_on_action_toggle ((Page*) self, action, parameter); -#line 15317 "PhotoPage.c" +#line 15866 "PhotoPage.c" } -static void _library_photo_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_library_photo_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_display_ratings ((LibraryPhotoPage*) self, action, value); -#line 15324 "PhotoPage.c" +#line 15877 "PhotoPage.c" } -static void _library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_photos_altered ((LibraryPhotoPage*) self); -#line 15331 "PhotoPage.c" +#line 15888 "PhotoPage.c" } -static void _library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self) { +static void +_library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender, + GeeCollection* unlinking, + gpointer self) +{ #line 2359 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_photo_unlinking ((LibraryPhotoPage*) self, unlinking); -#line 15338 "PhotoPage.c" +#line 15899 "PhotoPage.c" } -static void _library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self) { +static void +_library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender, + GeeCollection* relinked, + gpointer self) +{ #line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_photo_relinked ((LibraryPhotoPage*) self, relinked); -#line 15345 "PhotoPage.c" +#line 15910 "PhotoPage.c" } -LibraryPhotoPage* library_photo_page_construct (GType object_type) { +LibraryPhotoPage* +library_photo_page_construct (GType object_type) +{ LibraryPhotoPage * self = NULL; LibraryPhotoSourceCollection* _tmp0_; ViewCollection* _tmp1_; @@ -15412,49 +15979,51 @@ LibraryPhotoPage* library_photo_page_construct (GType object_type) { g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-relinked", (GCallback) _library_photo_page_on_photo_relinked_source_collection_items_relinked, self, 0); #line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self; -#line 15411 "PhotoPage.c" +#line 15978 "PhotoPage.c" } -LibraryPhotoPage* library_photo_page_new (void) { +LibraryPhotoPage* +library_photo_page_new (void) +{ #line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala" return library_photo_page_construct (TYPE_LIBRARY_PHOTO_PAGE); -#line 15418 "PhotoPage.c" +#line 15987 "PhotoPage.c" } -gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, DataView* view) { +gboolean +library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, + DataView* view) +{ gboolean result = FALSE; - DataView* _tmp0_; - DataSource* _tmp1_; - MediaSource* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; + DataSource* _tmp0_; + MediaSource* _tmp1_; + gboolean _tmp2_; #line 2369 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), FALSE); #line 2369 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_DATA_VIEW (view), FALSE); #line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = view; + _tmp0_ = data_view_get_source (view); #line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = data_view_get_source (_tmp0_); + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource); #line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp2_ = !media_source_is_trashed (_tmp1_); #line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = media_source_is_trashed (_tmp2_); -#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = !_tmp3_; -#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp4_; + result = _tmp2_; #line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 15449 "PhotoPage.c" +#line 16015 "PhotoPage.c" } -static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCollection* unlinking) { +static void +library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, + GeeCollection* unlinking) +{ LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_; #line 2373 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); @@ -15464,11 +16033,14 @@ static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCo _tmp0_ = self->priv->filter; #line 2374 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh"); -#line 15463 "PhotoPage.c" +#line 16032 "PhotoPage.c" } -static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCollection* relinked) { +static void +library_photo_page_on_photo_relinked (LibraryPhotoPage* self, + GeeCollection* relinked) +{ LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_; #line 2377 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); @@ -15478,182 +16050,172 @@ static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCol _tmp0_ = self->priv->filter; #line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh"); -#line 15477 "PhotoPage.c" +#line 16049 "PhotoPage.c" } -static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { +static void +library_photo_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames) +{ LibraryPhotoPage * self; - GeeList* _tmp0_; - GeeList* _tmp1_; - GeeList* _tmp2_; #line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); #line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); #line 2382 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = ui_filenames; -#line 2382 "/home/jens/Source/shotwell/src/PhotoPage.vala" - PAGE_CLASS (library_photo_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_); + PAGE_CLASS (library_photo_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), ui_filenames); #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = ui_filenames; -#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui"); -#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = ui_filenames; + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui"); #line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), "photo.ui"); -#line 15502 "PhotoPage.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "photo.ui"); +#line 16068 "PhotoPage.c" } -static GVariant* _variant_new16 (gboolean value) { +static GVariant* +_variant_new16 (gboolean value) +{ #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 15509 "PhotoPage.c" +#line 16077 "PhotoPage.c" } -static GVariant* _variant_new17 (const gchar* value) { +static GVariant* +_variant_new17 (const gchar* value) +{ #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 15516 "PhotoPage.c" +#line 16086 "PhotoPage.c" } -static void _library_photo_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self) { +static void +_library_photo_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, + GVariant* value, + gpointer self) +{ #line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_raw_developer_changed ((LibraryPhotoPage*) self, _sender, value); -#line 15523 "PhotoPage.c" +#line 16097 "PhotoPage.c" } -static void library_photo_page_real_add_actions (Page* base, GActionMap* map) { +static void +library_photo_page_real_add_actions (Page* base, + GActionMap* map) +{ LibraryPhotoPage * self; - GActionMap* _tmp0_; - GActionMap* _tmp1_; - GAction* _tmp2_; - GSimpleAction* _tmp3_; - GSimpleAction* _tmp4_; - ConfigFacade* _tmp5_; - ConfigFacade* _tmp6_; - gboolean _tmp7_; - GVariant* _tmp8_; + GAction* _tmp0_; + GSimpleAction* _tmp1_; + GSimpleAction* _tmp2_; + ConfigFacade* _tmp3_; + ConfigFacade* _tmp4_; + GVariant* _tmp5_; RawDeveloper d = 0; - ConfigFacade* _tmp9_; - ConfigFacade* _tmp10_; - RawDeveloper _tmp11_; - RawDeveloper _tmp12_; - const gchar* _tmp13_ = NULL; - RawDeveloper _tmp14_; + ConfigFacade* _tmp6_; + ConfigFacade* _tmp7_; + RawDeveloper _tmp8_; + const gchar* _tmp9_ = NULL; + RawDeveloper _tmp10_; GSimpleAction* action = NULL; - const GVariantType* _tmp15_; - GVariant* _tmp16_; - GSimpleAction* _tmp17_; - GSimpleAction* _tmp18_; - GActionMap* _tmp19_; + const GVariantType* _tmp11_; + GVariant* _tmp12_; + GSimpleAction* _tmp13_; + GSimpleAction* _tmp14_; #line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); #line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = map; -#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala" - PAGE_CLASS (library_photo_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_); -#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = map; + PAGE_CLASS (library_photo_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), map); #line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_action_map_add_action_entries (_tmp1_, LIBRARY_PHOTO_PAGE_entries, G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries), self); + g_action_map_add_action_entries (map, LIBRARY_PHOTO_PAGE_entries, G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries), self); #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings"); + _tmp0_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings"); #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL; + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL; #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp3_ == NULL) { + if (_tmp1_ == NULL) { #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp2_); -#line 15571 "PhotoPage.c" + _g_object_unref0 (_tmp0_); +#line 16139 "PhotoPage.c" } #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_; -#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = config_facade_get_instance (); -#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _tmp5_; + _tmp2_ = _tmp1_; #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp3_ = config_facade_get_instance (); #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _variant_new16 (_tmp7_); + _tmp4_ = _tmp3_; #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_emit_by_name (_tmp4_, "change-state", _tmp8_); + _tmp5_ = _variant_new16 (configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_variant_unref0 (_tmp8_); + g_signal_emit_by_name (_tmp2_, "change-state", _tmp5_); #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp6_); + _g_variant_unref0 (_tmp5_); #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp4_); +#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _g_object_unref0 (_tmp2_); #line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = config_facade_get_instance (); -#line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp9_; + _tmp6_ = config_facade_get_instance (); #line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp7_ = _tmp6_; #line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _tmp11_; + _tmp8_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp7_); #line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala" - d = _tmp12_; + d = _tmp8_; #line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = d; + _tmp10_ = d; #line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp14_ == RAW_DEVELOPER_SHOTWELL) { + if (_tmp10_ == RAW_DEVELOPER_SHOTWELL) { #line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = "Shotwell"; -#line 15609 "PhotoPage.c" + _tmp9_ = "Shotwell"; +#line 16173 "PhotoPage.c" } else { #line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = "Camera"; -#line 15613 "PhotoPage.c" + _tmp9_ = "Camera"; +#line 16177 "PhotoPage.c" } #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = G_VARIANT_TYPE_STRING; + _tmp11_ = G_VARIANT_TYPE_STRING; #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = _variant_new17 (_tmp13_); + _tmp12_ = _variant_new17 (_tmp9_); #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = g_simple_action_new_stateful ("RawDeveloper", _tmp15_, _tmp16_); + _tmp13_ = g_simple_action_new_stateful ("RawDeveloper", _tmp11_, _tmp12_); #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = _tmp17_; + _tmp14_ = _tmp13_; #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_variant_unref0 (_tmp16_); + _g_variant_unref0 (_tmp12_); #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala" - action = _tmp18_; + action = _tmp14_; #line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_signal_connect_object (action, "change-state", (GCallback) _library_photo_page_on_raw_developer_changed_g_simple_action_change_state, self, 0); #line 2449 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_simple_action_set_enabled (action, TRUE); #line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = map; -#line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_action_map_add_action (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (action, g_action_get_type (), GAction)); + g_action_map_add_action (map, G_TYPE_CHECK_INSTANCE_CAST (action, g_action_get_type (), GAction)); #line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (action); -#line 15637 "PhotoPage.c" +#line 16199 "PhotoPage.c" } -static void library_photo_page_real_remove_actions (Page* base, GActionMap* map) { +static void +library_photo_page_real_remove_actions (Page* base, + GActionMap* map) +{ LibraryPhotoPage * self; - GActionMap* _tmp0_; #line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); #line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 2454 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = map; -#line 2454 "/home/jens/Source/shotwell/src/PhotoPage.vala" - PAGE_CLASS (library_photo_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_); -#line 15652 "PhotoPage.c" + PAGE_CLASS (library_photo_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), map); +#line 16214 "PhotoPage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -15665,89 +16227,106 @@ static void library_photo_page_real_remove_actions (Page* base, GActionMap* map) entry_collection_length1 = G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries); #line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries); entry_it = entry_it + 1) { -#line 15664 "PhotoPage.c" +#line 16226 "PhotoPage.c" GActionEntry entry = {0}; #line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala" entry = entry_collection[entry_it]; -#line 15668 "PhotoPage.c" +#line 16230 "PhotoPage.c" { - GActionMap* _tmp1_; - GActionEntry _tmp2_; - const gchar* _tmp3_; -#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = map; + GActionEntry _tmp0_; + const gchar* _tmp1_; #line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = entry; + _tmp0_ = entry; #line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_.name; + _tmp1_ = _tmp0_.name; #line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_action_map_remove_action (_tmp1_, _tmp3_); -#line 15681 "PhotoPage.c" + g_action_map_remove_action (map, _tmp1_); +#line 16240 "PhotoPage.c" } } } } -static gpointer _injection_group_ref0 (gpointer self) { +static gpointer +_injection_group_ref0 (gpointer self) +{ #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self ? injection_group_ref (self) : NULL; -#line 15691 "PhotoPage.c" +#line 16252 "PhotoPage.c" } -static void _vala_array_add86 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { +static void +_vala_array_add86 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value) +{ #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala" if ((*length) == (*size)) { #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala" *size = (*size) ? (2 * (*size)) : 4; #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 15702 "PhotoPage.c" +#line 16268 "PhotoPage.c" } #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[(*length)++] = value; #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[*length] = NULL; -#line 15708 "PhotoPage.c" +#line 16274 "PhotoPage.c" } -static void _vala_array_add87 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { +static void +_vala_array_add87 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value) +{ #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" if ((*length) == (*size)) { #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" *size = (*size) ? (2 * (*size)) : 4; #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 15719 "PhotoPage.c" +#line 16290 "PhotoPage.c" } #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[(*length)++] = value; #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[*length] = NULL; -#line 15725 "PhotoPage.c" +#line 16296 "PhotoPage.c" } -static void _vala_array_add88 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { +static void +_vala_array_add88 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value) +{ #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala" if ((*length) == (*size)) { #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala" *size = (*size) ? (2 * (*size)) : 4; #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 15736 "PhotoPage.c" +#line 16312 "PhotoPage.c" } #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[(*length)++] = value; #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala" (*array)[*length] = NULL; -#line 15742 "PhotoPage.c" +#line 16318 "PhotoPage.c" } -static InjectionGroup** library_photo_page_real_init_collect_injection_groups (Page* base, int* result_length1) { +static InjectionGroup** +library_photo_page_real_init_collect_injection_groups (Page* base, + int* result_length1) +{ LibraryPhotoPage * self; InjectionGroup** result = NULL; InjectionGroup** groups = NULL; @@ -15832,7 +16411,7 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P if (result_length1) { #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala" *result_length1 = _tmp11__length1; -#line 15831 "PhotoPage.c" +#line 16410 "PhotoPage.c" } #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = _tmp11_; @@ -15844,49 +16423,44 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P _injection_group_unref0 (print_group); #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 15843 "PhotoPage.c" +#line 16422 "PhotoPage.c" } -static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value) { +static void +library_photo_page_on_display_ratings (LibraryPhotoPage* self, + GSimpleAction* action, + GVariant* value) +{ gboolean display = FALSE; - GVariant* _tmp0_; - gboolean _tmp1_; - ConfigFacade* _tmp2_; - ConfigFacade* _tmp3_; - GSimpleAction* _tmp4_; - GVariant* _tmp5_; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; #line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); #line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = value; -#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala" - display = _tmp1_; + display = g_variant_get_boolean (value); #line 2484 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_set_display_ratings (self, display); #line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = config_facade_get_instance (); + _tmp0_ = config_facade_get_instance (); #line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala" - configuration_facade_set_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display); + configuration_facade_set_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display); #line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp3_); -#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = action; -#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = value; + _g_object_unref0 (_tmp1_); #line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_simple_action_set_state (_tmp4_, _tmp5_); -#line 15881 "PhotoPage.c" + g_simple_action_set_state (action, value); +#line 16452 "PhotoPage.c" } -static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboolean display) { +static void +library_photo_page_set_display_ratings (LibraryPhotoPage* self, + gboolean display) +{ GSimpleAction* action = NULL; GAction* _tmp0_; GSimpleAction* _tmp1_; @@ -15901,7 +16475,7 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo if (_tmp1_ == NULL) { #line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp0_); -#line 15900 "PhotoPage.c" +#line 16474 "PhotoPage.c" } #line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala" action = _tmp1_; @@ -15909,57 +16483,46 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo _tmp2_ = action; #line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp2_ != NULL) { -#line 15908 "PhotoPage.c" +#line 16482 "PhotoPage.c" GSimpleAction* _tmp3_; - gboolean _tmp4_; #line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = action; #line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = display; -#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_simple_action_set_enabled (_tmp3_, _tmp4_); -#line 15917 "PhotoPage.c" + g_simple_action_set_enabled (_tmp3_, display); +#line 16488 "PhotoPage.c" } #line 2491 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (action); -#line 15921 "PhotoPage.c" +#line 16492 "PhotoPage.c" } -static void library_photo_page_real_update_actions (Page* base, gint selected_count, gint count) { +static void +library_photo_page_real_update_actions (Page* base, + gint selected_count, + gint count) +{ LibraryPhotoPage * self; gboolean multiple = FALSE; ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_; + gboolean _tmp2_; + gboolean _tmp3_ = FALSE; gboolean rotate_possible = FALSE; - gboolean _tmp9_ = FALSE; - gboolean _tmp10_; + gboolean _tmp6_ = FALSE; gboolean is_raw = FALSE; + gboolean _tmp9_ = FALSE; gboolean _tmp14_ = FALSE; - gboolean _tmp15_; - gboolean _tmp20_ = FALSE; - gboolean _tmp21_; - gboolean _tmp30_ = FALSE; - gboolean _tmp31_; - gboolean _tmp33_; - gboolean _tmp34_ = FALSE; - gboolean _tmp35_; - gboolean _tmp39_; - gboolean _tmp40_; - gboolean _tmp41_; - gboolean _tmp42_; - gboolean _tmp43_; - gboolean _tmp44_; - gboolean _tmp45_; - gboolean _tmp46_; - gboolean _tmp55_ = FALSE; - gboolean _tmp56_; - gint _tmp61_; - gint _tmp62_; + gboolean _tmp21_ = FALSE; + gboolean _tmp22_ = FALSE; + gboolean _tmp25_; + gboolean _tmp26_; + gboolean _tmp27_; + gboolean _tmp28_; + gboolean _tmp29_; + gboolean _tmp30_; + gboolean _tmp37_ = FALSE; + gboolean _tmp38_; #line 2497 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); #line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -15967,387 +16530,332 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co #line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; #line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)); -#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_ > 1; + _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)) > 1; #line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp1_); #line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala" - multiple = _tmp3_; -#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp5_) { -#line 15977 "PhotoPage.c" - Photo* _tmp6_; - Photo* _tmp7_; - gboolean _tmp8_; + multiple = _tmp2_; #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { +#line 16536 "PhotoPage.c" + Photo* _tmp4_; + Photo* _tmp5_; #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = _tmp6_; + _tmp4_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = editing_host_page_is_rotate_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp7_); + _tmp5_ = _tmp4_; #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp8_; + _tmp3_ = editing_host_page_is_rotate_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp5_); #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp7_); -#line 15991 "PhotoPage.c" + _g_object_unref0 (_tmp5_); +#line 16547 "PhotoPage.c" } else { #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = FALSE; -#line 15995 "PhotoPage.c" + _tmp3_ = FALSE; +#line 16551 "PhotoPage.c" } #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala" - rotate_possible = _tmp4_; -#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp10_) { -#line 16003 "PhotoPage.c" - Photo* _tmp11_; - Photo* _tmp12_; - PhotoFileFormat _tmp13_; + rotate_possible = _tmp3_; #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { +#line 16557 "PhotoPage.c" + Photo* _tmp7_; + Photo* _tmp8_; #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _tmp11_; + _tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = photo_get_master_file_format (_tmp12_); + _tmp8_ = _tmp7_; #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW; + _tmp6_ = photo_get_master_file_format (_tmp8_) == PHOTO_FILE_FORMAT_RAW; #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp12_); -#line 16017 "PhotoPage.c" + _g_object_unref0 (_tmp8_); +#line 16568 "PhotoPage.c" } else { #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = FALSE; -#line 16021 "PhotoPage.c" + _tmp6_ = FALSE; +#line 16572 "PhotoPage.c" } #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala" - is_raw = _tmp9_; -#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + is_raw = _tmp6_; #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp15_) { -#line 16029 "PhotoPage.c" - ConfigFacade* _tmp16_; - ConfigFacade* _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; + if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { +#line 16578 "PhotoPage.c" + ConfigFacade* _tmp10_; + ConfigFacade* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = config_facade_get_instance (); + _tmp10_ = config_facade_get_instance (); #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = _tmp16_; + _tmp11_ = _tmp10_; #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp12_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = _tmp18_; + _tmp13_ = _tmp12_; #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = g_strcmp0 (_tmp19_, "") != 0; + _tmp9_ = g_strcmp0 (_tmp13_, "") != 0; #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_free0 (_tmp19_); + _g_free0 (_tmp13_); #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp17_); -#line 16048 "PhotoPage.c" + _g_object_unref0 (_tmp11_); +#line 16597 "PhotoPage.c" } else { #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = FALSE; -#line 16052 "PhotoPage.c" + _tmp9_ = FALSE; +#line 16601 "PhotoPage.c" } #line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp14_); -#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp9_); #line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp21_) { -#line 16060 "PhotoPage.c" - gboolean _tmp22_ = FALSE; - Photo* _tmp23_; - Photo* _tmp24_; - gboolean _tmp25_; - gboolean _tmp26_; -#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { +#line 16607 "PhotoPage.c" + gboolean _tmp15_ = FALSE; + Photo* _tmp16_; + Photo* _tmp17_; + gboolean _tmp18_; #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = _tmp23_; + _tmp16_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = photo_has_transformations (_tmp24_); + _tmp17_ = _tmp16_; #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp26_ = _tmp25_; + _tmp18_ = photo_has_transformations (_tmp17_); #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp17_); #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp26_) { + if (_tmp18_) { #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = TRUE; -#line 16080 "PhotoPage.c" + _tmp15_ = TRUE; +#line 16624 "PhotoPage.c" } else { - Photo* _tmp27_; - Photo* _tmp28_; - gboolean _tmp29_; -#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + Photo* _tmp19_; + Photo* _tmp20_; #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = _tmp27_; + _tmp19_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = photo_has_editable (_tmp28_); + _tmp20_ = _tmp19_; #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = _tmp29_; + _tmp15_ = photo_has_editable (_tmp20_); #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp28_); -#line 16095 "PhotoPage.c" + _g_object_unref0 (_tmp20_); +#line 16636 "PhotoPage.c" } #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = _tmp22_; -#line 16099 "PhotoPage.c" + _tmp14_ = _tmp15_; +#line 16640 "PhotoPage.c" } else { #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = FALSE; -#line 16103 "PhotoPage.c" + _tmp14_ = FALSE; +#line 16644 "PhotoPage.c" } #line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp20_); -#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp31_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp14_); #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp31_) { -#line 16111 "PhotoPage.c" - gboolean _tmp32_; + if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp32_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_ = !_tmp32_; -#line 16117 "PhotoPage.c" + _tmp21_ = !editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); +#line 16652 "PhotoPage.c" } else { #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_ = FALSE; -#line 16121 "PhotoPage.c" + _tmp21_ = FALSE; +#line 16656 "PhotoPage.c" } #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp30_) { + if (_tmp21_) { #line 2509 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_rating_menu_item_sensitivity (self); #line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_development_menu_item_sensitivity (self); -#line 16129 "PhotoPage.c" +#line 16664 "PhotoPage.c" } #line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp33_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp33_); -#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp35_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp35_) { -#line 16139 "PhotoPage.c" - Photo* _tmp36_; - Photo* _tmp37_; - gboolean _tmp38_; + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))); #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp36_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { +#line 16670 "PhotoPage.c" + Photo* _tmp23_; + Photo* _tmp24_; #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp37_ = _tmp36_; + _tmp23_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp38_ = photo_has_color_adjustments (_tmp37_); + _tmp24_ = _tmp23_; #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp34_ = _tmp38_; + _tmp22_ = photo_has_color_adjustments (_tmp24_); #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp37_); -#line 16153 "PhotoPage.c" + _g_object_unref0 (_tmp24_); +#line 16681 "PhotoPage.c" } else { #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp34_ = FALSE; -#line 16157 "PhotoPage.c" + _tmp22_ = FALSE; +#line 16685 "PhotoPage.c" } #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp34_); -#line 2516 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp39_ = pixel_transformation_bundle_has_copied_color_adjustments (); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp22_); #line 2516 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", _tmp39_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", pixel_transformation_bundle_has_copied_color_adjustments ()); #line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp40_ = multiple; + _tmp25_ = multiple; #line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PrevPhoto", _tmp40_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PrevPhoto", _tmp25_); #line 2519 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp41_ = multiple; + _tmp26_ = multiple; #line 2519 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NextPhoto", _tmp41_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NextPhoto", _tmp26_); #line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp42_ = rotate_possible; + _tmp27_ = rotate_possible; #line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp42_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp27_); #line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp43_ = rotate_possible; + _tmp28_ = rotate_possible; #line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp43_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp28_); #line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp44_ = rotate_possible; + _tmp29_ = rotate_possible; #line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp44_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp29_); #line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp45_ = rotate_possible; + _tmp30_ = rotate_possible; #line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp45_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp30_); #line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp46_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp46_) { -#line 16193 "PhotoPage.c" - Photo* _tmp47_; - Photo* _tmp48_; - Scaling _tmp49_ = {0}; - gboolean _tmp50_; - Photo* _tmp51_; - Photo* _tmp52_; - Scaling _tmp53_ = {0}; - gboolean _tmp54_; -#line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp47_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { +#line 16717 "PhotoPage.c" + Photo* _tmp31_; + Photo* _tmp32_; + Scaling _tmp33_ = {0}; + Photo* _tmp34_; + Photo* _tmp35_; + Scaling _tmp36_ = {0}; #line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp48_ = _tmp47_; + _tmp31_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala" - scaling_for_original (&_tmp49_); + _tmp32_ = _tmp31_; #line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp50_ = editing_tools_crop_tool_is_available (_tmp48_, &_tmp49_); + scaling_for_original (&_tmp33_); #line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp50_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", editing_tools_crop_tool_is_available (_tmp32_, &_tmp33_)); #line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp48_); -#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp51_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _g_object_unref0 (_tmp32_); #line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp52_ = _tmp51_; + _tmp34_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala" - scaling_for_original (&_tmp53_); + _tmp35_ = _tmp34_; #line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp54_ = editing_tools_redeye_tool_is_available (_tmp52_, &_tmp53_); + scaling_for_original (&_tmp36_); #line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp54_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", editing_tools_redeye_tool_is_available (_tmp35_, &_tmp36_)); #line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp52_); -#line 16226 "PhotoPage.c" + _g_object_unref0 (_tmp35_); +#line 16744 "PhotoPage.c" } #line 2531 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_flag_action (self); #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp56_ = is_raw; + _tmp38_ = is_raw; #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp56_) { -#line 16234 "PhotoPage.c" - ConfigFacade* _tmp57_; - ConfigFacade* _tmp58_; - gchar* _tmp59_; - gchar* _tmp60_; + if (_tmp38_) { +#line 16752 "PhotoPage.c" + ConfigFacade* _tmp39_; + ConfigFacade* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp57_ = config_facade_get_instance (); + _tmp39_ = config_facade_get_instance (); #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp58_ = _tmp57_; + _tmp40_ = _tmp39_; #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp59_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp41_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp60_ = _tmp59_; + _tmp42_ = _tmp41_; #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp55_ = g_strcmp0 (_tmp60_, "") != 0; + _tmp37_ = g_strcmp0 (_tmp42_, "") != 0; #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_free0 (_tmp60_); + _g_free0 (_tmp42_); #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp58_); -#line 16253 "PhotoPage.c" + _g_object_unref0 (_tmp40_); +#line 16771 "PhotoPage.c" } else { #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp55_ = FALSE; -#line 16257 "PhotoPage.c" + _tmp37_ = FALSE; +#line 16775 "PhotoPage.c" } #line 2533 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp55_); -#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp61_ = selected_count; + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp37_); #line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp62_ = count; -#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala" - PAGE_CLASS (library_photo_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp61_, _tmp62_); -#line 16267 "PhotoPage.c" + PAGE_CLASS (library_photo_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), selected_count, count); +#line 16781 "PhotoPage.c" } -static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) { +static void +library_photo_page_on_photos_altered (LibraryPhotoPage* self) +{ gboolean _tmp0_ = FALSE; - gboolean _tmp1_; #line 2539 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp1_) { -#line 16280 "PhotoPage.c" - gboolean _tmp2_ = FALSE; + if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { +#line 16793 "PhotoPage.c" + gboolean _tmp1_ = FALSE; + Photo* _tmp2_; Photo* _tmp3_; - Photo* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; -#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + gboolean _tmp4_; #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_; + _tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = photo_has_transformations (_tmp4_); + _tmp3_ = _tmp2_; #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _tmp5_; + _tmp4_ = photo_has_transformations (_tmp3_); #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp6_) { + if (_tmp4_) { #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = TRUE; -#line 16300 "PhotoPage.c" + _tmp1_ = TRUE; +#line 16810 "PhotoPage.c" } else { - Photo* _tmp7_; - Photo* _tmp8_; - gboolean _tmp9_; -#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + Photo* _tmp5_; + Photo* _tmp6_; #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp7_; + _tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = photo_has_editable (_tmp8_); + _tmp6_ = _tmp5_; #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = _tmp9_; + _tmp1_ = photo_has_editable (_tmp6_); #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp8_); -#line 16315 "PhotoPage.c" + _g_object_unref0 (_tmp6_); +#line 16822 "PhotoPage.c" } #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = _tmp2_; -#line 16319 "PhotoPage.c" + _tmp0_ = _tmp1_; +#line 16826 "PhotoPage.c" } else { #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 16323 "PhotoPage.c" +#line 16830 "PhotoPage.c" } #line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp0_); #line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_flag_action (self); -#line 16329 "PhotoPage.c" +#line 16836 "PhotoPage.c" } -static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value) { +static void +library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, + GSimpleAction* action, + GVariant* value) +{ RawDeveloper developer = 0; - GVariant* _tmp0_; + const gchar* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; - GQuark _tmp4_ = 0U; + GQuark _tmp3_ = 0U; #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp3_label0 = 0; + static GQuark _tmp2_label0 = 0; #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp3_label1 = 0; -#line 16343 "PhotoPage.c" - RawDeveloper _tmp5_; - GSimpleAction* _tmp6_; - GVariant* _tmp7_; + static GQuark _tmp2_label1 = 0; +#line 16853 "PhotoPage.c" + RawDeveloper _tmp4_; #line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -16355,274 +16863,256 @@ static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, #line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala" developer = RAW_DEVELOPER_SHOTWELL; #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = value; + _tmp0_ = g_variant_get_string (value, NULL); #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = g_variant_get_string (_tmp0_, NULL); -#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_); + _tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_); #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("Shotwell")))) { + if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("Shotwell")))) { #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 16365 "PhotoPage.c" +#line 16871 "PhotoPage.c" default: { #line 2551 "/home/jens/Source/shotwell/src/PhotoPage.vala" developer = RAW_DEVELOPER_SHOTWELL; #line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 16372 "PhotoPage.c" +#line 16878 "PhotoPage.c" } } - } else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("Camera")))) { + } else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("Camera")))) { #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 16378 "PhotoPage.c" +#line 16884 "PhotoPage.c" default: { #line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala" developer = RAW_DEVELOPER_CAMERA; #line 2555 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 16385 "PhotoPage.c" +#line 16891 "PhotoPage.c" } } } else { #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 16391 "PhotoPage.c" +#line 16897 "PhotoPage.c" default: { #line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 16396 "PhotoPage.c" +#line 16902 "PhotoPage.c" } } } #line 2560 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = developer; + _tmp4_ = developer; #line 2560 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_photo_page_developer_changed (self, _tmp5_); -#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = action; + library_photo_page_developer_changed (self, _tmp4_); #line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = value; -#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_simple_action_set_state (_tmp6_, _tmp7_); -#line 16410 "PhotoPage.c" + g_simple_action_set_state (action, value); +#line 16912 "PhotoPage.c" } -static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, RawDeveloper rd) { +static void +library_photo_page_real_developer_changed (LibraryPhotoPage* self, + RawDeveloper rd) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; Photo* photo = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + GeeList* _tmp5_; GeeList* _tmp6_; - GeeList* _tmp7_; - gpointer _tmp8_; - DataView* _tmp9_; - DataSource* _tmp10_; + gpointer _tmp7_; + DataView* _tmp8_; + DataSource* _tmp9_; + Photo* _tmp10_; Photo* _tmp11_; - Photo* _tmp12_; - gboolean _tmp13_ = FALSE; - Photo* _tmp14_; - gboolean _tmp19_ = FALSE; - Photo* _tmp20_; - gboolean _tmp21_; + gboolean _tmp12_ = FALSE; + Photo* _tmp13_; + gboolean _tmp15_ = FALSE; + Photo* _tmp16_; #line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; #line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_ != 1; + _tmp2_ = view_collection_get_selected_count (_tmp1_) != 1; #line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp1_); #line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 16448 "PhotoPage.c" +#line 16949 "PhotoPage.c" } #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = view_collection_get_selected (_tmp5_); + _tmp5_ = view_collection_get_selected (_tmp4_); #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = gee_list_get (_tmp7_, 0); + _tmp7_ = gee_list_get (_tmp6_, 0); #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = (DataView*) _tmp8_; + _tmp8_ = (DataView*) _tmp7_; #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = data_view_get_source (_tmp9_); + _tmp9_ = data_view_get_source (_tmp8_); #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_PHOTO) ? ((Photo*) _tmp10_) : NULL; + _tmp10_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO) ? ((Photo*) _tmp9_) : NULL; #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp11_ == NULL) { + if (_tmp10_ == NULL) { #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp10_); -#line 16470 "PhotoPage.c" + _g_object_unref0 (_tmp9_); +#line 16971 "PhotoPage.c" } #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala" - photo = _tmp12_; + photo = _tmp11_; #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = photo; + _tmp13_ = photo; #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp14_ == NULL) { + if (_tmp13_ == NULL) { #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = TRUE; -#line 16488 "PhotoPage.c" + _tmp12_ = TRUE; +#line 16989 "PhotoPage.c" } else { - RawDeveloper _tmp15_; - Photo* _tmp16_; - RawDeveloper _tmp17_; - gboolean _tmp18_; -#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = rd; -#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = photo; -#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = photo_get_raw_developer (_tmp16_); + Photo* _tmp14_; #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = raw_developer_is_equivalent (_tmp15_, _tmp17_); + _tmp14_ = photo; #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = _tmp18_; -#line 16504 "PhotoPage.c" + _tmp12_ = raw_developer_is_equivalent (rd, photo_get_raw_developer (_tmp14_)); +#line 16996 "PhotoPage.c" } #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp13_) { + if (_tmp12_) { #line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); #line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 16512 "PhotoPage.c" +#line 17004 "PhotoPage.c" } #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = photo; -#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = photo_has_transformations (_tmp20_); + _tmp16_ = photo; #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp21_) { + if (!photo_has_transformations (_tmp16_)) { #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = TRUE; -#line 16522 "PhotoPage.c" + _tmp15_ = TRUE; +#line 17012 "PhotoPage.c" } else { - gboolean _tmp22_; -#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = dialogs_confirm_warn_developer_changed (1); #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = _tmp22_; -#line 16529 "PhotoPage.c" + _tmp15_ = dialogs_confirm_warn_developer_changed (1); +#line 17016 "PhotoPage.c" } #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp19_) { -#line 16533 "PhotoPage.c" + if (_tmp15_) { +#line 17020 "PhotoPage.c" SetRawDeveloperCommand* command = NULL; - ViewCollection* _tmp23_; - ViewCollection* _tmp24_; - GeeList* _tmp25_; - GeeList* _tmp26_; - RawDeveloper _tmp27_; - SetRawDeveloperCommand* _tmp28_; - SetRawDeveloperCommand* _tmp29_; - CommandManager* _tmp30_; - CommandManager* _tmp31_; - SetRawDeveloperCommand* _tmp32_; -#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + ViewCollection* _tmp17_; + ViewCollection* _tmp18_; + GeeList* _tmp19_; + GeeList* _tmp20_; + SetRawDeveloperCommand* _tmp21_; + SetRawDeveloperCommand* _tmp22_; + CommandManager* _tmp23_; + CommandManager* _tmp24_; + SetRawDeveloperCommand* _tmp25_; #line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = _tmp23_; + _tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = view_collection_get_selected (_tmp24_); + _tmp18_ = _tmp17_; #line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp26_ = _tmp25_; + _tmp19_ = view_collection_get_selected (_tmp18_); #line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = rd; + _tmp20_ = _tmp19_; #line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = set_raw_developer_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable), _tmp27_); + _tmp21_ = set_raw_developer_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ITERABLE, GeeIterable), rd); #line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = _tmp28_; + _tmp22_ = _tmp21_; #line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp26_); + _g_object_unref0 (_tmp20_); #line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp24_); + _data_collection_unref0 (_tmp18_); #line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command = _tmp29_; + command = _tmp22_; #line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp23_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp31_ = _tmp30_; + _tmp24_ = _tmp23_; #line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp32_ = command; + _tmp25_ = command; #line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command_manager_execute (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_COMMAND, Command)); #line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _command_manager_unref0 (_tmp31_); + _command_manager_unref0 (_tmp24_); #line 2580 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_development_menu_item_sensitivity (self); #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 16579 "PhotoPage.c" +#line 17063 "PhotoPage.c" } #line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 16583 "PhotoPage.c" +#line 17067 "PhotoPage.c" } -void library_photo_page_developer_changed (LibraryPhotoPage* self, RawDeveloper rd) { +void +library_photo_page_developer_changed (LibraryPhotoPage* self, + RawDeveloper rd) +{ #line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala" LIBRARY_PHOTO_PAGE_GET_CLASS (self)->developer_changed (self, rd); -#line 16592 "PhotoPage.c" +#line 17079 "PhotoPage.c" } -static void library_photo_page_update_flag_action (LibraryPhotoPage* self) { - gboolean _tmp0_; +static void +library_photo_page_update_flag_action (LibraryPhotoPage* self) +{ #line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 2585 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2585 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", _tmp0_); -#line 16604 "PhotoPage.c" + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))); +#line 17090 "PhotoPage.c" } -static void _library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) { +static void +_library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, + gpointer self) +{ #line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_page_destroyed ((LibraryPhotoPage*) self); -#line 16611 "PhotoPage.c" +#line 17100 "PhotoPage.c" } -void library_photo_page_display_for_collection (LibraryPhotoPage* self, CollectionPage* return_page, Photo* photo, ViewCollection* view) { +void +library_photo_page_display_for_collection (LibraryPhotoPage* self, + CollectionPage* return_page, + Photo* photo, + ViewCollection* view) +{ CollectionPage* _tmp0_; - CollectionPage* _tmp1_; - CollectionPage* _tmp2_; - ViewCollection* _tmp3_ = NULL; - ViewCollection* _tmp4_; - Photo* _tmp9_; + ViewCollection* _tmp1_ = NULL; #line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -16632,57 +17122,45 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti #line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail ((view == NULL) || IS_VIEW_COLLECTION (view)); #line 2594 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = return_page; -#line 2594 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (return_page); #line 2594 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (self->priv->return_page); #line 2594 "/home/jens/Source/shotwell/src/PhotoPage.vala" - self->priv->return_page = _tmp1_; -#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = return_page; + self->priv->return_page = _tmp0_; #line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), "destroy", (GCallback) _library_photo_page_on_page_destroyed_gtk_widget_destroy, self, 0); -#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = view; -#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp4_ != NULL) { -#line 16646 "PhotoPage.c" - ViewCollection* _tmp5_; - ViewCollection* _tmp6_; + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (return_page, gtk_widget_get_type (), GtkWidget), "destroy", (GCallback) _library_photo_page_on_page_destroyed_gtk_widget_destroy, self, 0); #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = view; + if (view != NULL) { +#line 17130 "PhotoPage.c" + ViewCollection* _tmp2_; #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _data_collection_ref0 (_tmp5_); + _tmp2_ = _data_collection_ref0 (view); #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp3_); + _data_collection_unref0 (_tmp1_); #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp6_; -#line 16657 "PhotoPage.c" + _tmp1_ = _tmp2_; +#line 17138 "PhotoPage.c" } else { - CollectionPage* _tmp7_; - ViewCollection* _tmp8_; -#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = return_page; + ViewCollection* _tmp3_; #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (return_page, TYPE_PAGE, Page)); #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp3_); + _data_collection_unref0 (_tmp1_); #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp8_; -#line 16669 "PhotoPage.c" + _tmp1_ = _tmp3_; +#line 17147 "PhotoPage.c" } #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = photo; -#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala" - editing_host_page_display_copy_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp3_, _tmp9_); + editing_host_page_display_copy_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp1_, photo); #line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp3_); -#line 16677 "PhotoPage.c" + _data_collection_unref0 (_tmp1_); +#line 17153 "PhotoPage.c" } -void library_photo_page_on_page_destroyed (LibraryPhotoPage* self) { +void +library_photo_page_on_page_destroyed (LibraryPhotoPage* self) +{ #line 2600 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 2603 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -16691,11 +17169,13 @@ void library_photo_page_on_page_destroyed (LibraryPhotoPage* self) { self->priv->return_page = NULL; #line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala" editing_host_page_unset_view_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 16690 "PhotoPage.c" +#line 17168 "PhotoPage.c" } -CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self) { +CollectionPage* +library_photo_page_get_controller_page (LibraryPhotoPage* self) +{ CollectionPage* result = NULL; CollectionPage* _tmp0_; CollectionPage* _tmp1_; @@ -16709,17 +17189,18 @@ CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self) result = _tmp1_; #line 2608 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 16708 "PhotoPage.c" +#line 17188 "PhotoPage.c" } -static void library_photo_page_real_switched_to (Page* base) { +static void +library_photo_page_real_switched_to (Page* base) +{ LibraryPhotoPage * self; Photo* _tmp0_; Photo* _tmp1_; ConfigFacade* _tmp2_; ConfigFacade* _tmp3_; - gboolean _tmp4_; #line 2611 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); #line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -16741,22 +17222,22 @@ static void library_photo_page_real_switched_to (Page* base) { #line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = _tmp2_; #line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_photo_page_set_display_ratings (self, _tmp4_); + library_photo_page_set_display_ratings (self, configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 16745 "PhotoPage.c" +#line 17224 "PhotoPage.c" } -static void library_photo_page_real_switching_from (Page* base) { +static void +library_photo_page_real_switching_from (Page* base) +{ LibraryPhotoPage * self; #line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); #line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala" PAGE_CLASS (library_photo_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page)); -#line 16755 "PhotoPage.c" +#line 17236 "PhotoPage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -16768,11 +17249,11 @@ static void library_photo_page_real_switching_from (Page* base) { entry_collection_length1 = G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries); #line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries); entry_it = entry_it + 1) { -#line 16767 "PhotoPage.c" +#line 17248 "PhotoPage.c" GActionEntry entry = {0}; #line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala" entry = entry_collection[entry_it]; -#line 16771 "PhotoPage.c" +#line 17252 "PhotoPage.c" { AppWindow* _tmp0_; AppWindow* _tmp1_; @@ -16790,48 +17271,43 @@ static void library_photo_page_real_switching_from (Page* base) { g_action_map_remove_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), _tmp3_); #line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp1_); -#line 16789 "PhotoPage.c" +#line 17270 "PhotoPage.c" } } } } -static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPage* base, gint scale) { +static GdkPixbuf* +library_photo_page_real_get_bottom_left_trinket (EditingHostPage* base, + gint scale) +{ LibraryPhotoPage * self; GdkPixbuf* result = NULL; gboolean _tmp0_ = FALSE; - gboolean _tmp1_; - Photo* _tmp5_; - LibraryPhoto* _tmp6_; - Rating _tmp7_; - gint _tmp8_; - GdkPixbuf* _tmp9_; - GdkPixbuf* _tmp10_; + Photo* _tmp3_; + LibraryPhoto* _tmp4_; + GdkPixbuf* _tmp5_; + GdkPixbuf* _tmp6_; #line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp1_) { + if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 16815 "PhotoPage.c" +#line 17294 "PhotoPage.c" } else { + ConfigFacade* _tmp1_; ConfigFacade* _tmp2_; - ConfigFacade* _tmp3_; - gboolean _tmp4_; #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = config_facade_get_instance (); + _tmp1_ = config_facade_get_instance (); #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_; -#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp2_ = _tmp1_; #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = !_tmp4_; + _tmp0_ = !configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp3_); -#line 16830 "PhotoPage.c" + _g_object_unref0 (_tmp2_); +#line 17306 "PhotoPage.c" } #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { @@ -16839,60 +17315,53 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa result = NULL; #line 2635 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 16838 "PhotoPage.c" +#line 17314 "PhotoPage.c" } #line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = scale; + _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = resources_get_rating_trinket (_tmp7_, _tmp8_); + _tmp5_ = resources_get_rating_trinket (media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource)), scale); #line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp9_; + _tmp6_ = _tmp5_; #line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp4_); #line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp10_; + result = _tmp6_; #line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 16858 "PhotoPage.c" +#line 17330 "PhotoPage.c" } -static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage* base, gint scale) { +static GdkPixbuf* +library_photo_page_real_get_top_right_trinket (EditingHostPage* base, + gint scale) +{ LibraryPhotoPage * self; GdkPixbuf* result = NULL; gboolean _tmp0_ = FALSE; - gboolean _tmp1_; - GdkPixbuf* _tmp5_; + GdkPixbuf* _tmp3_; #line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp1_) { + if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 16876 "PhotoPage.c" +#line 17348 "PhotoPage.c" } else { - Photo* _tmp2_; - LibraryPhoto* _tmp3_; - gboolean _tmp4_; -#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + Photo* _tmp1_; + LibraryPhoto* _tmp2_; #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto); + _tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_FLAGGABLE, Flaggable)); + _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = !_tmp4_; + _tmp0_ = !flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_FLAGGABLE, Flaggable)); #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp3_); -#line 16891 "PhotoPage.c" + _g_object_unref0 (_tmp2_); +#line 17360 "PhotoPage.c" } #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { @@ -16900,19 +17369,21 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage result = NULL; #line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 16899 "PhotoPage.c" +#line 17368 "PhotoPage.c" } #line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE); + _tmp3_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE); #line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp5_; + result = _tmp3_; #line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 16907 "PhotoPage.c" +#line 17376 "PhotoPage.c" } -static void library_photo_page_on_slideshow (LibraryPhotoPage* self) { +static void +library_photo_page_on_slideshow (LibraryPhotoPage* self) +{ LibraryPhoto* photo = NULL; Photo* _tmp0_; LibraryPhoto* _tmp1_; @@ -16938,7 +17409,7 @@ static void library_photo_page_on_slideshow (LibraryPhotoPage* self) { _g_object_unref0 (photo); #line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 16937 "PhotoPage.c" +#line 17408 "PhotoPage.c" } #line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = app_window_get_instance (); @@ -16968,64 +17439,54 @@ static void library_photo_page_on_slideshow (LibraryPhotoPage* self) { _g_object_unref0 (_tmp3_); #line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 16967 "PhotoPage.c" +#line 17438 "PhotoPage.c" } -static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPage* self) { +static void +library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPage* self) +{ gboolean _tmp0_ = FALSE; ZoomState _tmp1_ = {0}; - gboolean _tmp2_; - gboolean _tmp4_ = FALSE; - ZoomState _tmp5_ = {0}; - gboolean _tmp6_; + gboolean _tmp2_ = FALSE; + ZoomState _tmp3_ = {0}; #line 2656 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_); #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = zoom_state_is_max (&_tmp1_); -#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp2_) { -#line 16986 "PhotoPage.c" - gboolean _tmp3_; -#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + if (!zoom_state_is_max (&_tmp1_)) { #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = !_tmp3_; -#line 16992 "PhotoPage.c" + _tmp0_ = !editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); +#line 17457 "PhotoPage.c" } else { #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 16996 "PhotoPage.c" +#line 17461 "PhotoPage.c" } #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_); #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala" - single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_); -#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = zoom_state_is_default (&_tmp5_); -#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp6_) { -#line 17006 "PhotoPage.c" - gboolean _tmp7_; + single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp3_); #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + if (!zoom_state_is_default (&_tmp3_)) { #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = !_tmp7_; -#line 17012 "PhotoPage.c" + _tmp2_ = !editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); +#line 17471 "PhotoPage.c" } else { #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = FALSE; -#line 17016 "PhotoPage.c" + _tmp2_ = FALSE; +#line 17475 "PhotoPage.c" } #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_); -#line 17020 "PhotoPage.c" + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp2_); +#line 17479 "PhotoPage.c" } -static void library_photo_page_real_on_increase_size (EditingHostPage* base) { +static void +library_photo_page_real_on_increase_size (EditingHostPage* base) +{ LibraryPhotoPage * self; #line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); @@ -17033,11 +17494,13 @@ static void library_photo_page_real_on_increase_size (EditingHostPage* base) { EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_increase_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_zoom_menu_item_sensitivity (self); -#line 17032 "PhotoPage.c" +#line 17493 "PhotoPage.c" } -static void library_photo_page_real_on_decrease_size (EditingHostPage* base) { +static void +library_photo_page_real_on_decrease_size (EditingHostPage* base) +{ LibraryPhotoPage * self; #line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); @@ -17045,70 +17508,63 @@ static void library_photo_page_real_on_decrease_size (EditingHostPage* base) { EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_decrease_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2670 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_zoom_menu_item_sensitivity (self); -#line 17044 "PhotoPage.c" +#line 17507 "PhotoPage.c" } -static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPage* base, GdkEventKey* event) { +static gboolean +library_photo_page_real_on_zoom_slider_key_press (EditingHostPage* base, + GdkEventKey* event) +{ LibraryPhotoPage * self; gboolean result = FALSE; - GdkEventKey* _tmp0_; - gboolean _tmp1_; - GdkEventKey* _tmp2_; - guint _tmp3_; - const gchar* _tmp4_; + guint _tmp0_; + const gchar* _tmp1_; #line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); #line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); #line 2674 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = event; -#line 2674 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_zoom_slider_key_press (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp0_); -#line 2674 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp1_) { + if (EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_zoom_slider_key_press (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), event)) { #line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; #line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17070 "PhotoPage.c" +#line 17529 "PhotoPage.c" } #line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = event; -#line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_->keyval; + _tmp0_ = event->keyval; #line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = gdk_keyval_name (_tmp3_); + _tmp1_ = gdk_keyval_name (_tmp0_); #line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (g_strcmp0 (_tmp4_, "Escape") == 0) { + if (g_strcmp0 (_tmp1_, "Escape") == 0) { #line 2678 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_return_to_collection (self); #line 2679 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; #line 2679 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17086 "PhotoPage.c" +#line 17543 "PhotoPage.c" } else { #line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = FALSE; #line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17092 "PhotoPage.c" +#line 17549 "PhotoPage.c" } } -static void library_photo_page_real_update_ui (EditingHostPage* base, gboolean missing) { +static void +library_photo_page_real_update_ui (EditingHostPage* base, + gboolean missing) +{ LibraryPhotoPage * self; gboolean sensitivity = FALSE; - gboolean _tmp0_; - gboolean _tmp1_; #line 2685 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); #line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = missing; -#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala" - sensitivity = !_tmp0_; + sensitivity = !missing; #line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", sensitivity); #line 2689 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -17170,117 +17626,98 @@ static void library_photo_page_real_update_ui (EditingHostPage* base, gboolean m #line 2722 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", sensitivity); #line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = missing; -#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala" - EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->update_ui (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp1_); -#line 17172 "PhotoPage.c" + EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->update_ui (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), missing); +#line 17626 "PhotoPage.c" } -static void library_photo_page_real_notify_photo_backing_missing (EditingHostPage* base, Photo* photo, gboolean missing) { +static void +library_photo_page_real_notify_photo_backing_missing (EditingHostPage* base, + Photo* photo, + gboolean missing) +{ LibraryPhotoPage * self; - gboolean _tmp0_; - Photo* _tmp3_; - gboolean _tmp4_; #line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); #line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_PHOTO (photo)); #line 2728 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = missing; -#line 2728 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp0_) { -#line 17189 "PhotoPage.c" - Photo* _tmp1_; + if (missing) { #line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = photo; -#line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala" - media_source_mark_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); -#line 17195 "PhotoPage.c" + media_source_mark_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); +#line 17644 "PhotoPage.c" } else { - Photo* _tmp2_; #line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = photo; -#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala" - media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); -#line 17202 "PhotoPage.c" + media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); +#line 17648 "PhotoPage.c" } #line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = photo; -#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = missing; -#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala" - EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->notify_photo_backing_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp3_, _tmp4_); -#line 17210 "PhotoPage.c" + EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->notify_photo_backing_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), photo, missing); +#line 17652 "PhotoPage.c" } -static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEventKey* event) { +static gboolean +library_photo_page_real_key_press_event (GtkWidget* base, + GdkEventKey* event) +{ LibraryPhotoPage * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean handled = FALSE; - GdkEventKey* _tmp3_; - guint _tmp4_; - const gchar* _tmp5_; - const gchar* _tmp6_; - GQuark _tmp8_ = 0U; + guint _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + GQuark _tmp5_ = 0U; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp7_label0 = 0; + static GQuark _tmp4_label0 = 0; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp7_label1 = 0; + static GQuark _tmp4_label1 = 0; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp7_label2 = 0; + static GQuark _tmp4_label2 = 0; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp7_label3 = 0; + static GQuark _tmp4_label3 = 0; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp7_label4 = 0; + static GQuark _tmp4_label4 = 0; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp7_label5 = 0; + static GQuark _tmp4_label5 = 0; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp7_label6 = 0; + static GQuark _tmp4_label6 = 0; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp7_label7 = 0; + static GQuark _tmp4_label7 = 0; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp7_label8 = 0; + static GQuark _tmp4_label8 = 0; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp7_label9 = 0; + static GQuark _tmp4_label9 = 0; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp7_label10 = 0; + static GQuark _tmp4_label10 = 0; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp7_label11 = 0; + static GQuark _tmp4_label11 = 0; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp7_label12 = 0; + static GQuark _tmp4_label12 = 0; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp7_label13 = 0; + static GQuark _tmp4_label13 = 0; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp7_label14 = 0; + static GQuark _tmp4_label14 = 0; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp7_label15 = 0; + static GQuark _tmp4_label15 = 0; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp7_label16 = 0; + static GQuark _tmp4_label16 = 0; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - static GQuark _tmp7_label17 = 0; + static GQuark _tmp4_label17 = 0; #line 2736 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); #line 2736 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event != NULL) { -#line 17266 "PhotoPage.c" - GdkEventKey* _tmp1_; - gboolean _tmp2_; -#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = event; #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), gtk_widget_get_type (), GtkWidget), _tmp1_); -#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = _tmp2_ == TRUE; -#line 17275 "PhotoPage.c" + _tmp0_ = GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), gtk_widget_get_type (), GtkWidget), event) == TRUE; +#line 17712 "PhotoPage.c" } else { #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 17279 "PhotoPage.c" +#line 17716 "PhotoPage.c" } #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { @@ -17288,229 +17725,227 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve result = TRUE; #line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17287 "PhotoPage.c" +#line 17724 "PhotoPage.c" } #line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala" handled = TRUE; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = event; -#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_->keyval; + _tmp1_ = event->keyval; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = gdk_keyval_name (_tmp4_); + _tmp2_ = gdk_keyval_name (_tmp1_); #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = (NULL == _tmp6_) ? 0 : g_quark_from_string (_tmp6_); + _tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_); #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (((_tmp8_ == ((0 != _tmp7_label0) ? _tmp7_label0 : (_tmp7_label0 = g_quark_from_static_string ("Escape")))) || (_tmp8_ == ((0 != _tmp7_label1) ? _tmp7_label1 : (_tmp7_label1 = g_quark_from_static_string ("Return"))))) || (_tmp8_ == ((0 != _tmp7_label2) ? _tmp7_label2 : (_tmp7_label2 = g_quark_from_static_string ("KP_Enter"))))) { + if (((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("Escape")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("Return"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("KP_Enter"))))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17305 "PhotoPage.c" +#line 17740 "PhotoPage.c" default: { - GtkWindow* _tmp9_; - GtkWindow* _tmp10_; - gboolean _tmp11_; + GtkWindow* _tmp6_; + GtkWindow* _tmp7_; + gboolean _tmp8_; #line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp6_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp9_; + _tmp7_ = _tmp6_; #line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_FULLSCREEN_WINDOW); + _tmp8_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_FULLSCREEN_WINDOW); #line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp7_); #line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp11_) { + if (_tmp8_) { #line 2746 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_return_to_collection (self); -#line 17323 "PhotoPage.c" +#line 17758 "PhotoPage.c" } #line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17327 "PhotoPage.c" +#line 17762 "PhotoPage.c" } } - } else if (_tmp8_ == ((0 != _tmp7_label3) ? _tmp7_label3 : (_tmp7_label3 = g_quark_from_static_string ("Delete")))) { + } else if (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("Delete")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17333 "PhotoPage.c" +#line 17768 "PhotoPage.c" default: { #line 2753 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MoveToTrash"); #line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17340 "PhotoPage.c" +#line 17775 "PhotoPage.c" } } - } else if ((_tmp8_ == ((0 != _tmp7_label4) ? _tmp7_label4 : (_tmp7_label4 = g_quark_from_static_string ("period")))) || (_tmp8_ == ((0 != _tmp7_label5) ? _tmp7_label5 : (_tmp7_label5 = g_quark_from_static_string ("greater"))))) { + } else if ((_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("period")))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("greater"))))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17346 "PhotoPage.c" +#line 17781 "PhotoPage.c" default: { #line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating"); #line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17353 "PhotoPage.c" +#line 17788 "PhotoPage.c" } } - } else if ((_tmp8_ == ((0 != _tmp7_label6) ? _tmp7_label6 : (_tmp7_label6 = g_quark_from_static_string ("comma")))) || (_tmp8_ == ((0 != _tmp7_label7) ? _tmp7_label7 : (_tmp7_label7 = g_quark_from_static_string ("less"))))) { + } else if ((_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("comma")))) || (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("less"))))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17359 "PhotoPage.c" +#line 17794 "PhotoPage.c" default: { #line 2763 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating"); #line 2764 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17366 "PhotoPage.c" +#line 17801 "PhotoPage.c" } } - } else if (_tmp8_ == ((0 != _tmp7_label8) ? _tmp7_label8 : (_tmp7_label8 = g_quark_from_static_string ("KP_1")))) { + } else if (_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("KP_1")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17372 "PhotoPage.c" +#line 17807 "PhotoPage.c" default: { #line 2767 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne"); #line 2768 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17379 "PhotoPage.c" +#line 17814 "PhotoPage.c" } } - } else if (_tmp8_ == ((0 != _tmp7_label9) ? _tmp7_label9 : (_tmp7_label9 = g_quark_from_static_string ("KP_2")))) { + } else if (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("KP_2")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17385 "PhotoPage.c" +#line 17820 "PhotoPage.c" default: { #line 2771 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo"); #line 2772 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17392 "PhotoPage.c" +#line 17827 "PhotoPage.c" } } - } else if (_tmp8_ == ((0 != _tmp7_label10) ? _tmp7_label10 : (_tmp7_label10 = g_quark_from_static_string ("KP_3")))) { + } else if (_tmp5_ == ((0 != _tmp4_label10) ? _tmp4_label10 : (_tmp4_label10 = g_quark_from_static_string ("KP_3")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17398 "PhotoPage.c" +#line 17833 "PhotoPage.c" default: { #line 2775 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree"); #line 2776 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17405 "PhotoPage.c" +#line 17840 "PhotoPage.c" } } - } else if (_tmp8_ == ((0 != _tmp7_label11) ? _tmp7_label11 : (_tmp7_label11 = g_quark_from_static_string ("KP_4")))) { + } else if (_tmp5_ == ((0 != _tmp4_label11) ? _tmp4_label11 : (_tmp4_label11 = g_quark_from_static_string ("KP_4")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17411 "PhotoPage.c" +#line 17846 "PhotoPage.c" default: { #line 2779 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour"); #line 2780 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17418 "PhotoPage.c" +#line 17853 "PhotoPage.c" } } - } else if (_tmp8_ == ((0 != _tmp7_label12) ? _tmp7_label12 : (_tmp7_label12 = g_quark_from_static_string ("KP_5")))) { + } else if (_tmp5_ == ((0 != _tmp4_label12) ? _tmp4_label12 : (_tmp4_label12 = g_quark_from_static_string ("KP_5")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17424 "PhotoPage.c" +#line 17859 "PhotoPage.c" default: { #line 2783 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive"); #line 2784 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17431 "PhotoPage.c" +#line 17866 "PhotoPage.c" } } - } else if (_tmp8_ == ((0 != _tmp7_label13) ? _tmp7_label13 : (_tmp7_label13 = g_quark_from_static_string ("KP_0")))) { + } else if (_tmp5_ == ((0 != _tmp4_label13) ? _tmp4_label13 : (_tmp4_label13 = g_quark_from_static_string ("KP_0")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17437 "PhotoPage.c" +#line 17872 "PhotoPage.c" default: { #line 2787 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated"); #line 2788 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17444 "PhotoPage.c" +#line 17879 "PhotoPage.c" } } - } else if (_tmp8_ == ((0 != _tmp7_label14) ? _tmp7_label14 : (_tmp7_label14 = g_quark_from_static_string ("KP_9")))) { + } else if (_tmp5_ == ((0 != _tmp4_label14) ? _tmp4_label14 : (_tmp4_label14 = g_quark_from_static_string ("KP_9")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17450 "PhotoPage.c" +#line 17885 "PhotoPage.c" default: { #line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected"); #line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17457 "PhotoPage.c" +#line 17892 "PhotoPage.c" } } - } else if (_tmp8_ == ((0 != _tmp7_label15) ? _tmp7_label15 : (_tmp7_label15 = g_quark_from_static_string ("bracketright")))) { + } else if (_tmp5_ == ((0 != _tmp4_label15) ? _tmp4_label15 : (_tmp4_label15 = g_quark_from_static_string ("bracketright")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17463 "PhotoPage.c" +#line 17898 "PhotoPage.c" default: { #line 2795 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise"); #line 2796 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17470 "PhotoPage.c" +#line 17905 "PhotoPage.c" } } - } else if (_tmp8_ == ((0 != _tmp7_label16) ? _tmp7_label16 : (_tmp7_label16 = g_quark_from_static_string ("bracketleft")))) { + } else if (_tmp5_ == ((0 != _tmp4_label16) ? _tmp4_label16 : (_tmp4_label16 = g_quark_from_static_string ("bracketleft")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17476 "PhotoPage.c" +#line 17911 "PhotoPage.c" default: { #line 2799 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise"); #line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17483 "PhotoPage.c" +#line 17918 "PhotoPage.c" } } - } else if (_tmp8_ == ((0 != _tmp7_label17) ? _tmp7_label17 : (_tmp7_label17 = g_quark_from_static_string ("slash")))) { + } else if (_tmp5_ == ((0 != _tmp4_label17) ? _tmp4_label17 : (_tmp4_label17 = g_quark_from_static_string ("slash")))) { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17489 "PhotoPage.c" +#line 17924 "PhotoPage.c" default: { #line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag"); #line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17496 "PhotoPage.c" +#line 17931 "PhotoPage.c" } } } else { #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala" switch (0) { -#line 17502 "PhotoPage.c" +#line 17937 "PhotoPage.c" default: { #line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala" handled = FALSE; #line 2808 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 17509 "PhotoPage.c" +#line 17944 "PhotoPage.c" } } } @@ -17518,11 +17953,14 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve result = handled; #line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17517 "PhotoPage.c" +#line 17952 "PhotoPage.c" } -static gboolean library_photo_page_real_on_double_click (EditingHostPage* base, GdkEventButton* event) { +static gboolean +library_photo_page_real_on_double_click (EditingHostPage* base, + GdkEventButton* event) +{ LibraryPhotoPage * self; gboolean result = FALSE; FullscreenWindow* fs = NULL; @@ -17541,7 +17979,7 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base, if (_tmp1_ == NULL) { #line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp0_); -#line 17540 "PhotoPage.c" +#line 17978 "PhotoPage.c" } #line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala" fs = _tmp1_; @@ -17551,14 +17989,14 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base, if (_tmp2_ == NULL) { #line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->return_to_collection_on_release = TRUE; -#line 17550 "PhotoPage.c" +#line 17988 "PhotoPage.c" } else { FullscreenWindow* _tmp3_; #line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp3_ = fs; #line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala" fullscreen_window_close (_tmp3_); -#line 17557 "PhotoPage.c" +#line 17995 "PhotoPage.c" } #line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; @@ -17566,16 +18004,17 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base, _g_object_unref0 (fs); #line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17565 "PhotoPage.c" +#line 18003 "PhotoPage.c" } -static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventButton* event) { +static gboolean +library_photo_page_real_on_left_released (Page* base, + GdkEventButton* event) +{ LibraryPhotoPage * self; gboolean result = FALSE; gboolean _tmp0_; - GdkEventButton* _tmp1_; - gboolean _tmp2_; #line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); #line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -17592,21 +18031,19 @@ static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventBu result = TRUE; #line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17591 "PhotoPage.c" +#line 18030 "PhotoPage.c" } #line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = event; -#line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = PAGE_CLASS (library_photo_page_parent_class)->on_left_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp1_); -#line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp2_; + result = PAGE_CLASS (library_photo_page_parent_class)->on_left_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), event); #line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17601 "PhotoPage.c" +#line 18036 "PhotoPage.c" } -static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) { +static GtkMenu* +library_photo_page_get_context_menu (LibraryPhotoPage* self) +{ GtkMenu* result = NULL; GtkMenu* _tmp0_; GtkMenu* _tmp7_; @@ -17617,7 +18054,7 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) { _tmp0_ = self->priv->context_menu; #line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_ == NULL) { -#line 17616 "PhotoPage.c" +#line 18053 "PhotoPage.c" GMenuModel* model = NULL; GtkBuilder* _tmp1_; GObject* _tmp2_; @@ -17649,7 +18086,7 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) { gtk_menu_attach_to_widget (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL); #line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (model); -#line 17648 "PhotoPage.c" +#line 18085 "PhotoPage.c" } #line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp7_ = self->priv->context_menu; @@ -17659,16 +18096,18 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) { result = _tmp8_; #line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17658 "PhotoPage.c" +#line 18095 "PhotoPage.c" } -static gboolean library_photo_page_real_on_context_buttonpress (Page* base, GdkEventButton* event) { +static gboolean +library_photo_page_real_on_context_buttonpress (Page* base, + GdkEventButton* event) +{ LibraryPhotoPage * self; gboolean result = FALSE; GtkMenu* _tmp0_; GtkMenu* _tmp1_; - GdkEventButton* _tmp2_; #line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage); #line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -17678,20 +18117,20 @@ static gboolean library_photo_page_real_on_context_buttonpress (Page* base, GdkE #line 2849 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; #line 2849 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = event; -#line 2849 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, _tmp2_); + page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, event); #line 2849 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp1_); #line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala" result = TRUE; #line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17686 "PhotoPage.c" +#line 18123 "PhotoPage.c" } -static gboolean library_photo_page_real_on_context_keypress (Page* base) { +static gboolean +library_photo_page_real_on_context_keypress (Page* base) +{ LibraryPhotoPage * self; gboolean result = FALSE; GtkMenu* _tmp0_; @@ -17710,11 +18149,13 @@ static gboolean library_photo_page_real_on_context_keypress (Page* base) { result = TRUE; #line 2857 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 17709 "PhotoPage.c" +#line 18148 "PhotoPage.c" } -static void library_photo_page_return_to_collection (LibraryPhotoPage* self) { +static void +library_photo_page_return_to_collection (LibraryPhotoPage* self) +{ CollectionPage* _tmp0_; #line 2860 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); @@ -17722,7 +18163,7 @@ static void library_photo_page_return_to_collection (LibraryPhotoPage* self) { _tmp0_ = self->priv->return_page; #line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (NULL != _tmp0_) { -#line 17721 "PhotoPage.c" +#line 18162 "PhotoPage.c" LibraryWindow* _tmp1_; LibraryWindow* _tmp2_; CollectionPage* _tmp3_; @@ -17736,7 +18177,7 @@ static void library_photo_page_return_to_collection (LibraryPhotoPage* self) { library_window_switch_to_page (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PAGE, Page)); #line 2863 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp2_); -#line 17735 "PhotoPage.c" +#line 18176 "PhotoPage.c" } else { LibraryWindow* _tmp4_; LibraryWindow* _tmp5_; @@ -17748,12 +18189,14 @@ static void library_photo_page_return_to_collection (LibraryPhotoPage* self) { library_window_switch_to_library_page (_tmp5_); #line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp5_); -#line 17747 "PhotoPage.c" +#line 18188 "PhotoPage.c" } } -static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self) { +static void +library_photo_page_on_remove_from_library (LibraryPhotoPage* self) +{ LibraryPhoto* photo = NULL; Photo* _tmp0_; GeeCollection* photos = NULL; @@ -17776,370 +18219,348 @@ static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self) { _g_object_unref0 (photos); #line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 17775 "PhotoPage.c" +#line 18218 "PhotoPage.c" } -static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) { - gboolean _tmp0_; - CollectionPage* _tmp1_; +static void +library_photo_page_on_move_to_trash (LibraryPhotoPage* self) +{ + CollectionPage* _tmp0_; LibraryPhoto* photo = NULL; - Photo* _tmp4_; + Photo* _tmp3_; GeeCollection* photos = NULL; - GeeArrayList* _tmp5_; - GeeCollection* _tmp6_; + GeeArrayList* _tmp4_; + GeeCollection* _tmp5_; + LibraryPhoto* _tmp6_; LibraryPhoto* _tmp7_; - LibraryPhoto* _tmp8_; + Photo* _tmp8_; Photo* _tmp9_; - Photo* _tmp10_; - gboolean _tmp11_; - gboolean _tmp12_; - CommandManager* _tmp22_; - CommandManager* _tmp23_; - GeeCollection* _tmp24_; - TrashUntrashPhotosCommand* _tmp25_; - TrashUntrashPhotosCommand* _tmp26_; - LibraryWindow* _tmp27_; - LibraryWindow* _tmp28_; + gboolean _tmp10_; + CommandManager* _tmp20_; + CommandManager* _tmp21_; + GeeCollection* _tmp22_; + TrashUntrashPhotosCommand* _tmp23_; + TrashUntrashPhotosCommand* _tmp24_; + LibraryWindow* _tmp25_; + LibraryWindow* _tmp26_; #line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 2878 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2878 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp0_) { + if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { #line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 17808 "PhotoPage.c" +#line 18249 "PhotoPage.c" } #line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = self->priv->return_page; + _tmp0_ = self->priv->return_page; #line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_EVENT_PAGE)) { -#line 17814 "PhotoPage.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_EVENT_PAGE)) { +#line 18255 "PhotoPage.c" + LibraryWindow* _tmp1_; LibraryWindow* _tmp2_; - LibraryWindow* _tmp3_; #line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = library_window_get_app (); + _tmp1_ = library_window_get_app (); #line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_window_set_page_switching_enabled (_tmp3_, FALSE); + library_window_set_page_switching_enabled (_tmp2_, FALSE); #line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp3_); -#line 17825 "PhotoPage.c" + _g_object_unref0 (_tmp2_); +#line 18266 "PhotoPage.c" } #line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala" - photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto); + photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 2892 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp4_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 2892 "/home/jens/Source/shotwell/src/PhotoPage.vala" - photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection); + photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection); #line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = photos; + _tmp5_ = photos; #line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = photo; + _tmp6_ = photo; #line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gee_collection_add (_tmp6_, _tmp7_); + gee_collection_add (_tmp5_, _tmp6_); #line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = photo; -#line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp7_ = photo; #line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp9_; + _tmp8_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_SOURCE, DataSource)); + _tmp9_ = _tmp8_; #line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _tmp11_; + _tmp10_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_SOURCE, DataSource)); #line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp9_); #line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp12_) { -#line 17857 "PhotoPage.c" - LibraryWindow* _tmp13_; - LibraryWindow* _tmp14_; - GtkWindow* _tmp15_; - GtkWindow* _tmp16_; - gboolean _tmp17_; - LibraryWindow* _tmp20_; - LibraryWindow* _tmp21_; + if (_tmp10_) { +#line 18296 "PhotoPage.c" + LibraryWindow* _tmp11_; + LibraryWindow* _tmp12_; + GtkWindow* _tmp13_; + GtkWindow* _tmp14_; + gboolean _tmp15_; + LibraryWindow* _tmp18_; + LibraryWindow* _tmp19_; #line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = library_window_get_app (); + _tmp11_ = library_window_get_app (); #line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_window_set_page_switching_enabled (_tmp14_, TRUE); + library_window_set_page_switching_enabled (_tmp12_, TRUE); #line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp12_); #line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp13_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = _tmp15_; + _tmp14_ = _tmp13_; #line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_FULLSCREEN_WINDOW); + _tmp15_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_FULLSCREEN_WINDOW); #line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp14_); #line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp17_) { -#line 17883 "PhotoPage.c" - GtkWindow* _tmp18_; - FullscreenWindow* _tmp19_; + if (_tmp15_) { +#line 18322 "PhotoPage.c" + GtkWindow* _tmp16_; + FullscreenWindow* _tmp17_; #line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp16_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_FULLSCREEN_WINDOW, FullscreenWindow); + _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_FULLSCREEN_WINDOW, FullscreenWindow); #line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala" - fullscreen_window_close (_tmp19_); + fullscreen_window_close (_tmp17_); #line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp19_); -#line 17894 "PhotoPage.c" + _g_object_unref0 (_tmp17_); +#line 18333 "PhotoPage.c" } #line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = library_window_get_app (); + _tmp18_ = library_window_get_app (); #line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = _tmp20_; + _tmp19_ = _tmp18_; #line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_window_switch_to_library_page (_tmp21_); + library_window_switch_to_library_page (_tmp19_); #line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp21_); -#line 17904 "PhotoPage.c" + _g_object_unref0 (_tmp19_); +#line 18343 "PhotoPage.c" } #line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = _tmp22_; + _tmp21_ = _tmp20_; #line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = photos; + _tmp22_ = photos; #line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = trash_untrash_photos_command_new (_tmp24_, TRUE); + _tmp23_ = trash_untrash_photos_command_new (_tmp22_, TRUE); #line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp26_ = _tmp25_; + _tmp24_ = _tmp23_; #line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command_manager_execute (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_COMMAND, Command)); #line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp26_); + _g_object_unref0 (_tmp24_); #line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _command_manager_unref0 (_tmp23_); + _command_manager_unref0 (_tmp21_); #line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = library_window_get_app (); + _tmp25_ = library_window_get_app (); #line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = _tmp27_; + _tmp26_ = _tmp25_; #line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_window_set_page_switching_enabled (_tmp28_, TRUE); + library_window_set_page_switching_enabled (_tmp26_, TRUE); #line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp28_); + _g_object_unref0 (_tmp26_); #line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photos); #line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 17934 "PhotoPage.c" +#line 18373 "PhotoPage.c" } -static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) { - gboolean _tmp0_; +static void +library_photo_page_on_flag_unflag (LibraryPhotoPage* self) +{ #line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp0_) { -#line 17946 "PhotoPage.c" + if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { +#line 18384 "PhotoPage.c" GeeArrayList* photo_list = NULL; + GeeArrayList* _tmp0_; GeeArrayList* _tmp1_; - GeeArrayList* _tmp2_; + Photo* _tmp2_; Photo* _tmp3_; - Photo* _tmp4_; + CommandManager* _tmp4_; CommandManager* _tmp5_; - CommandManager* _tmp6_; - GeeArrayList* _tmp7_; - Photo* _tmp8_; - LibraryPhoto* _tmp9_; - gboolean _tmp10_; - FlagUnflagCommand* _tmp11_; - FlagUnflagCommand* _tmp12_; + GeeArrayList* _tmp6_; + Photo* _tmp7_; + LibraryPhoto* _tmp8_; + FlagUnflagCommand* _tmp9_; + FlagUnflagCommand* _tmp10_; #line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala" - photo_list = _tmp1_; + photo_list = _tmp0_; #line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = photo_list; + _tmp1_ = photo_list; #line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource)); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource)); #line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp4_); -#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _g_object_unref0 (_tmp3_); #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _tmp5_; + _tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = photo_list; + _tmp5_ = _tmp4_; #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp6_ = photo_list; #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto); + _tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_FLAGGABLE, Flaggable)); + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = flag_unflag_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), !_tmp10_); + _tmp9_ = flag_unflag_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), !flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_FLAGGABLE, Flaggable))); #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command)); #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp10_); #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _command_manager_unref0 (_tmp6_); + _command_manager_unref0 (_tmp5_); #line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo_list); -#line 18000 "PhotoPage.c" +#line 18435 "PhotoPage.c" } } -static void library_photo_page_on_photo_destroyed (LibraryPhotoPage* self, DataSource* source) { - DataSource* _tmp0_; +static void +library_photo_page_on_photo_destroyed (LibraryPhotoPage* self, + DataSource* source) +{ #line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = source; -#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_photo_page_on_photo_removed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 18015 "PhotoPage.c" + library_photo_page_on_photo_removed (self, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_LIBRARY_PHOTO, LibraryPhoto)); +#line 18450 "PhotoPage.c" } -static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, LibraryPhoto* photo) { +static void +library_photo_page_on_photo_removed (LibraryPhotoPage* self, + LibraryPhoto* photo) +{ gboolean _tmp0_ = FALSE; - LibraryPhoto* _tmp1_; ViewCollection* view = NULL; + ViewCollection* _tmp3_; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; ViewCollection* _tmp6_; - ViewCollection* _tmp7_; - ViewCollection* _tmp8_; - ViewCollection* _tmp9_; - LibraryPhoto* _tmp10_; - DataView* _tmp11_; - DataView* _tmp12_; - Marker* _tmp13_; - Marker* _tmp14_; - LibraryPhoto* _tmp15_; - Photo* _tmp16_; - Photo* _tmp17_; - gboolean _tmp18_; - gboolean _tmp19_; + DataView* _tmp7_; + DataView* _tmp8_; + Marker* _tmp9_; + Marker* _tmp10_; + Photo* _tmp11_; + Photo* _tmp12_; + gboolean _tmp13_; #line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = photo; -#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp1_ == NULL) { + if (photo == NULL) { #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 18047 "PhotoPage.c" +#line 18479 "PhotoPage.c" } else { - LibraryPhoto* _tmp2_; - Photo* _tmp3_; - Photo* _tmp4_; - gboolean _tmp5_; -#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = photo; -#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + Photo* _tmp1_; + Photo* _tmp2_; #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_; + _tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource)); + _tmp2_ = _tmp1_; #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = !_tmp5_; + _tmp0_ = !data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource)); #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp4_); -#line 18065 "PhotoPage.c" + _g_object_unref0 (_tmp2_); +#line 18491 "PhotoPage.c" } #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { #line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18071 "PhotoPage.c" +#line 18497 "PhotoPage.c" } #line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala" - view = _tmp6_; -#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = view; + view = _tmp3_; #line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = view; + _tmp4_ = view; #line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = view; + _tmp5_ = view; #line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = photo; + _tmp6_ = view; #line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = view_collection_get_view_for_source (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_SOURCE, DataSource)); + _tmp7_ = view_collection_get_view_for_source (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_SOURCE, DataSource)); #line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject)); + _tmp9_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); #line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = _tmp13_; + _tmp10_ = _tmp9_; #line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection), _tmp14_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), _tmp10_); #line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp10_); #line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp12_); -#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = photo; -#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _g_object_unref0 (_tmp8_); #line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = _tmp16_; + _tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource)); + _tmp12_ = _tmp11_; #line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = _tmp18_; + _tmp13_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_SOURCE, DataSource)); #line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp17_); + _g_object_unref0 (_tmp12_); #line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp19_) { -#line 18115 "PhotoPage.c" - LibraryWindow* _tmp20_; - LibraryWindow* _tmp21_; + if (_tmp13_) { +#line 18535 "PhotoPage.c" + LibraryWindow* _tmp14_; + LibraryWindow* _tmp15_; #line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = library_window_get_app (); + _tmp14_ = library_window_get_app (); #line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = _tmp20_; + _tmp15_ = _tmp14_; #line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala" - library_window_switch_to_library_page (_tmp21_); + library_window_switch_to_library_page (_tmp15_); #line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp21_); -#line 18126 "PhotoPage.c" + _g_object_unref0 (_tmp15_); +#line 18546 "PhotoPage.c" } #line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (view); -#line 18130 "PhotoPage.c" +#line 18550 "PhotoPage.c" } -static void library_photo_page_on_print (LibraryPhotoPage* self) { +static void +library_photo_page_on_print (LibraryPhotoPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; #line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -18147,170 +18568,166 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) { #line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; #line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_ > 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) > 0; #line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp1_); #line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp3_) { -#line 18153 "PhotoPage.c" + if (_tmp2_) { +#line 18572 "PhotoPage.c" + PrintManager* _tmp3_; PrintManager* _tmp4_; - PrintManager* _tmp5_; + ViewCollection* _tmp5_; ViewCollection* _tmp6_; - ViewCollection* _tmp7_; - GeeList* _tmp8_; - GeeCollection* _tmp9_; + GeeList* _tmp7_; + GeeCollection* _tmp8_; #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = print_manager_get_instance (); + _tmp3_ = print_manager_get_instance (); #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO); + _tmp7_ = view_collection_get_selected_sources_of_type (_tmp6_, TYPE_PHOTO); #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection); #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala" - print_manager_spool_photo (_tmp5_, _tmp9_); + print_manager_spool_photo (_tmp4_, _tmp8_); #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp7_); + _data_collection_unref0 (_tmp6_); #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _print_manager_unref0 (_tmp5_); -#line 18180 "PhotoPage.c" + _print_manager_unref0 (_tmp4_); +#line 18599 "PhotoPage.c" } } -static void library_photo_page_on_external_app_changed (LibraryPhotoPage* self) { +static void +library_photo_page_on_external_app_changed (LibraryPhotoPage* self) +{ gboolean _tmp0_ = FALSE; - gboolean _tmp1_; #line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp1_) { -#line 18194 "PhotoPage.c" + if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { +#line 18612 "PhotoPage.c" + ConfigFacade* _tmp1_; ConfigFacade* _tmp2_; - ConfigFacade* _tmp3_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; #line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = config_facade_get_instance (); + _tmp1_ = config_facade_get_instance (); #line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp3_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = g_strcmp0 (_tmp5_, "") != 0; + _tmp0_ = g_strcmp0 (_tmp4_, "") != 0; #line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp4_); #line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp3_); -#line 18213 "PhotoPage.c" + _g_object_unref0 (_tmp2_); +#line 18631 "PhotoPage.c" } else { #line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 18217 "PhotoPage.c" +#line 18635 "PhotoPage.c" } #line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp0_); -#line 18221 "PhotoPage.c" +#line 18639 "PhotoPage.c" } -static void library_photo_page_on_external_edit (LibraryPhotoPage* self) { - gboolean _tmp0_; +static void +library_photo_page_on_external_edit (LibraryPhotoPage* self) +{ GError * _inner_error_ = NULL; #line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp0_) { + if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { #line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18236 "PhotoPage.c" +#line 18653 "PhotoPage.c" } { + AppWindow* _tmp0_; AppWindow* _tmp1_; - AppWindow* _tmp2_; + Photo* _tmp2_; Photo* _tmp3_; - Photo* _tmp4_; + AppWindow* _tmp4_; AppWindow* _tmp5_; - AppWindow* _tmp6_; #line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = app_window_get_instance (); + _tmp0_ = app_window_get_instance (); #line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE_WINDOW, PageWindow)); #line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala" - photo_open_with_external_editor (_tmp4_, &_inner_error_); + photo_open_with_external_editor (_tmp3_, &_inner_error_); #line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18263 "PhotoPage.c" +#line 18680 "PhotoPage.c" goto __catch263_g_error; } #line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = app_window_get_instance (); + _tmp4_ = app_window_get_instance (); #line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PAGE_WINDOW, PageWindow)); #line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp6_); -#line 18274 "PhotoPage.c" + _g_object_unref0 (_tmp5_); +#line 18691 "PhotoPage.c" } goto __finally263; __catch263_g_error: { GError* err = NULL; + AppWindow* _tmp6_; AppWindow* _tmp7_; - AppWindow* _tmp8_; - GError* _tmp9_; + GError* _tmp8_; + Photo* _tmp9_; Photo* _tmp10_; - Photo* _tmp11_; #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala" err = _inner_error_; #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala" _inner_error_ = NULL; #line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = app_window_get_instance (); + _tmp6_ = app_window_get_instance (); #line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE_WINDOW, PageWindow)); #line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = err; + _tmp8_ = err; #line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp9_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala" - open_external_editor_error_dialog (_tmp9_, _tmp11_); + open_external_editor_error_dialog (_tmp8_, _tmp10_); #line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp10_); #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 18309 "PhotoPage.c" +#line 18726 "PhotoPage.c" } __finally263: #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -18321,116 +18738,112 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) { g_clear_error (&_inner_error_); #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18320 "PhotoPage.c" +#line 18737 "PhotoPage.c" } } -static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) { - gboolean _tmp0_; +static void +library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) +{ + Photo* _tmp0_; Photo* _tmp1_; - Photo* _tmp2_; - PhotoFileFormat _tmp3_; - gboolean _tmp4_; + gboolean _tmp2_; GError * _inner_error_ = NULL; #line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 2973 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2973 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp0_) { + if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { #line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18340 "PhotoPage.c" +#line 18755 "PhotoPage.c" } #line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = _tmp1_; + _tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = photo_get_master_file_format (_tmp2_); + _tmp1_ = _tmp0_; #line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_ != PHOTO_FILE_FORMAT_RAW; + _tmp2_ = photo_get_master_file_format (_tmp1_) != PHOTO_FILE_FORMAT_RAW; #line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp4_) { + if (_tmp2_) { #line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18356 "PhotoPage.c" +#line 18769 "PhotoPage.c" } { - AppWindow* _tmp5_; - AppWindow* _tmp6_; - Photo* _tmp7_; - Photo* _tmp8_; - AppWindow* _tmp9_; - AppWindow* _tmp10_; + AppWindow* _tmp3_; + AppWindow* _tmp4_; + Photo* _tmp5_; + Photo* _tmp6_; + AppWindow* _tmp7_; + AppWindow* _tmp8_; #line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = app_window_get_instance (); + _tmp3_ = app_window_get_instance (); #line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE_WINDOW, PageWindow)); #line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp4_); #line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" - photo_open_with_raw_external_editor (_tmp8_, &_inner_error_); + photo_open_with_raw_external_editor (_tmp6_, &_inner_error_); #line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp6_); #line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18383 "PhotoPage.c" +#line 18796 "PhotoPage.c" goto __catch264_g_error; } #line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = app_window_get_instance (); + _tmp7_ = app_window_get_instance (); #line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE_WINDOW, PageWindow)); #line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp10_); -#line 18394 "PhotoPage.c" + _g_object_unref0 (_tmp8_); +#line 18807 "PhotoPage.c" } goto __finally264; __catch264_g_error: { GError* err = NULL; - AppWindow* _tmp11_; - AppWindow* _tmp12_; - GError* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; + AppWindow* _tmp9_; + AppWindow* _tmp10_; + GError* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala" err = _inner_error_; #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala" _inner_error_ = NULL; #line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = app_window_get_instance (); + _tmp9_ = app_window_get_instance (); #line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PAGE_WINDOW, PageWindow)); #line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp10_); #line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = err; + _tmp11_ = err; #line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = resources_launch_editor_failed (_tmp13_); + _tmp12_ = resources_launch_editor_failed (_tmp11_); #line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = _tmp14_; + _tmp13_ = _tmp12_; #line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala" - app_window_error_message (_tmp15_, NULL); + app_window_error_message (_tmp13_, NULL); #line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp13_); #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 18429 "PhotoPage.c" +#line 18842 "PhotoPage.c" } __finally264: #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -18441,198 +18854,193 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) { g_clear_error (&_inner_error_); #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18440 "PhotoPage.c" +#line 18853 "PhotoPage.c" } } -static void library_photo_page_on_send_to (LibraryPhotoPage* self) { - gboolean _tmp0_; +static void +library_photo_page_on_send_to (LibraryPhotoPage* self) +{ #line 2989 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp0_) { -#line 18453 "PhotoPage.c" + if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { +#line 18865 "PhotoPage.c" + ViewCollection* _tmp0_; ViewCollection* _tmp1_; - ViewCollection* _tmp2_; - GeeList* _tmp3_; - GeeCollection* _tmp4_; + GeeList* _tmp2_; + GeeCollection* _tmp3_; #line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = view_collection_get_selected_sources (_tmp2_); + _tmp2_ = view_collection_get_selected_sources (_tmp1_); #line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala" - desktop_integration_send_to (_tmp4_); + desktop_integration_send_to (_tmp3_); #line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp2_); -#line 18472 "PhotoPage.c" + _data_collection_unref0 (_tmp1_); +#line 18884 "PhotoPage.c" } } -static void library_photo_page_on_export (LibraryPhotoPage* self) { - gboolean _tmp0_; +static void +library_photo_page_on_export (LibraryPhotoPage* self) +{ ExportDialog* export_dialog = NULL; - ExportDialog* _tmp1_; + ExportDialog* _tmp0_; gint scale = 0; ScaleConstraint constraint = 0; ExportFormatParameters export_params = {0}; - ExportFormatParameters _tmp2_ = {0}; - ExportDialog* _tmp3_; - gint _tmp4_ = 0; - ScaleConstraint _tmp5_ = 0; - gboolean _tmp6_; + ExportFormatParameters _tmp1_ = {0}; + ExportDialog* _tmp2_; + gint _tmp3_ = 0; + ScaleConstraint _tmp4_ = 0; + gboolean _tmp5_; GFile* save_as = NULL; + Photo* _tmp6_; Photo* _tmp7_; - Photo* _tmp8_; - ExportFormatParameters _tmp9_; + ExportFormatParameters _tmp8_; + gchar* _tmp9_; gchar* _tmp10_; - gchar* _tmp11_; + GFile* _tmp11_; GFile* _tmp12_; GFile* _tmp13_; - GFile* _tmp14_; Scaling scaling = {0}; - ScaleConstraint _tmp15_; - gint _tmp16_; - Scaling _tmp17_ = {0}; + ScaleConstraint _tmp14_; + gint _tmp15_; + Scaling _tmp16_ = {0}; GError * _inner_error_ = NULL; #line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 2995 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 2995 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp0_) { + if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { #line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18511 "PhotoPage.c" +#line 18922 "PhotoPage.c" } #line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = export_dialog_new (_ ("Export Photo")); + _tmp0_ = export_dialog_new (_ ("Export Photo")); #line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_object_ref_sink (_tmp1_); + g_object_ref_sink (_tmp0_); #line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala" - export_dialog = _tmp1_; + export_dialog = _tmp0_; #line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala" - export_format_parameters_last (&_tmp2_); + export_format_parameters_last (&_tmp1_); #line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala" - export_params = _tmp2_; + export_params = _tmp1_; #line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = export_dialog; + _tmp2_ = export_dialog; #line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = export_dialog_execute (_tmp3_, &_tmp4_, &_tmp5_, &export_params); + _tmp5_ = export_dialog_execute (_tmp2_, &_tmp3_, &_tmp4_, &export_params); #line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" - scale = _tmp4_; + scale = _tmp3_; #line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" - constraint = _tmp5_; + constraint = _tmp4_; #line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp6_) { + if (!_tmp5_) { #line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (export_dialog); #line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18537 "PhotoPage.c" +#line 18948 "PhotoPage.c" } #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = export_params; + _tmp8_ = export_params; #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = photo_get_export_basename_for_parameters (_tmp8_, &_tmp9_); + _tmp9_ = photo_get_export_basename_for_parameters (_tmp7_, &_tmp8_); #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = export_ui_choose_file (_tmp11_); + _tmp11_ = export_ui_choose_file (_tmp10_); #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp10_); #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala" - save_as = _tmp13_; + save_as = _tmp12_; #line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = save_as; + _tmp13_ = save_as; #line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp14_ == NULL) { + if (_tmp13_ == NULL) { #line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (save_as); #line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (export_dialog); #line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18569 "PhotoPage.c" +#line 18980 "PhotoPage.c" } #line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = constraint; + _tmp14_ = constraint; #line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = scale; + _tmp15_ = scale; #line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala" - scaling_for_constraint (_tmp15_, _tmp16_, FALSE, &_tmp17_); + scaling_for_constraint (_tmp14_, _tmp15_, FALSE, &_tmp16_); #line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala" - scaling = _tmp17_; -#line 18579 "PhotoPage.c" + scaling = _tmp16_; +#line 18990 "PhotoPage.c" { + Photo* _tmp17_; Photo* _tmp18_; - Photo* _tmp19_; - GFile* _tmp20_; - Scaling _tmp21_; - ExportFormatParameters _tmp22_; - JpegQuality _tmp23_; + GFile* _tmp19_; + Scaling _tmp20_; + ExportFormatParameters _tmp21_; + JpegQuality _tmp22_; + Photo* _tmp23_; Photo* _tmp24_; - Photo* _tmp25_; + ExportFormatParameters _tmp25_; ExportFormatParameters _tmp26_; - PhotoFileFormat _tmp27_; + ExportFormatMode _tmp27_; ExportFormatParameters _tmp28_; - ExportFormatMode _tmp29_; - ExportFormatParameters _tmp30_; - gboolean _tmp31_; + gboolean _tmp29_; #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp17_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = save_as; + _tmp19_ = save_as; +#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" + _tmp20_ = scaling; #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = scaling; + _tmp21_ = export_params; #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = export_params; + _tmp22_ = _tmp21_.quality; #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = _tmp22_.quality; + _tmp23_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp24_ = _tmp23_; #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = _tmp24_; + _tmp25_ = export_params; #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp26_ = export_params; #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = photo_get_export_format_for_parameters (_tmp25_, &_tmp26_); + _tmp27_ = _tmp26_.mode; #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp28_ = export_params; #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp29_ = _tmp28_.mode; -#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp30_ = export_params; + _tmp29_ = _tmp28_.export_metadata; #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp31_ = _tmp30_.export_metadata; + photo_export (_tmp18_, _tmp19_, &_tmp20_, _tmp22_, photo_get_export_format_for_parameters (_tmp24_, &_tmp25_), _tmp27_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp29_, &_inner_error_); #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - photo_export (_tmp19_, _tmp20_, &_tmp21_, _tmp23_, _tmp27_, _tmp29_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp31_, &_inner_error_); -#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp25_); + _g_object_unref0 (_tmp24_); #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp19_); + _g_object_unref0 (_tmp18_); #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18631 "PhotoPage.c" +#line 19039 "PhotoPage.c" goto __catch265_g_error; } } @@ -18640,40 +19048,40 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) { __catch265_g_error: { GError* err = NULL; - GFile* _tmp32_; - gchar* _tmp33_; - gchar* _tmp34_; - GError* _tmp35_; - const gchar* _tmp36_; - gchar* _tmp37_; - gchar* _tmp38_; + GFile* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + GError* _tmp33_; + const gchar* _tmp34_; + gchar* _tmp35_; + gchar* _tmp36_; #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" err = _inner_error_; #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" _inner_error_ = NULL; #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp32_ = save_as; + _tmp30_ = save_as; #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp33_ = g_file_get_path (_tmp32_); + _tmp31_ = g_file_get_path (_tmp30_); #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp34_ = _tmp33_; + _tmp32_ = _tmp31_; #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp35_ = err; + _tmp33_ = err; #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp36_ = _tmp35_->message; + _tmp34_ = _tmp33_->message; #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp37_ = g_strdup_printf (_ ("Unable to export %s: %s"), _tmp34_, _tmp36_); + _tmp35_ = g_strdup_printf (_ ("Unable to export %s: %s"), _tmp32_, _tmp34_); #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp38_ = _tmp37_; + _tmp36_ = _tmp35_; #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala" - app_window_error_message (_tmp38_, NULL); + app_window_error_message (_tmp36_, NULL); #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_free0 (_tmp38_); + _g_free0 (_tmp36_); #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_free0 (_tmp34_); + _g_free0 (_tmp32_); #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_error_free0 (err); -#line 18672 "PhotoPage.c" +#line 19080 "PhotoPage.c" } __finally265: #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -18688,21 +19096,22 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) { g_clear_error (&_inner_error_); #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18687 "PhotoPage.c" +#line 19095 "PhotoPage.c" } #line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (save_as); #line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (export_dialog); -#line 18693 "PhotoPage.c" +#line 19101 "PhotoPage.c" } -static void library_photo_page_on_publish (LibraryPhotoPage* self) { +static void +library_photo_page_on_publish (LibraryPhotoPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; #line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -18710,325 +19119,314 @@ static void library_photo_page_on_publish (LibraryPhotoPage* self) { #line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; #line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)); -#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_ > 0; + _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)) > 0; #line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala" _data_collection_unref0 (_tmp1_); #line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp3_) { -#line 18716 "PhotoPage.c" + if (_tmp2_) { +#line 19123 "PhotoPage.c" + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; - GeeList* _tmp6_; - GeeCollection* _tmp7_; + GeeList* _tmp5_; + GeeCollection* _tmp6_; #line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = view_collection_get_selected_sources (_tmp5_); + _tmp5_ = view_collection_get_selected_sources (_tmp4_); #line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection); #line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala" - publishing_ui_publishing_dialog_go (_tmp7_); + publishing_ui_publishing_dialog_go (_tmp6_); #line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _data_collection_unref0 (_tmp5_); -#line 18735 "PhotoPage.c" + _data_collection_unref0 (_tmp4_); +#line 19142 "PhotoPage.c" } } -static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) { +static void +library_photo_page_on_increase_rating (LibraryPhotoPage* self) +{ gboolean _tmp0_ = FALSE; - gboolean _tmp1_; SetRatingSingleCommand* command = NULL; - Photo* _tmp3_; - Photo* _tmp4_; - SetRatingSingleCommand* _tmp5_; - SetRatingSingleCommand* _tmp6_; - CommandManager* _tmp7_; - CommandManager* _tmp8_; - SetRatingSingleCommand* _tmp9_; + Photo* _tmp1_; + Photo* _tmp2_; + SetRatingSingleCommand* _tmp3_; + SetRatingSingleCommand* _tmp4_; + CommandManager* _tmp5_; + CommandManager* _tmp6_; + SetRatingSingleCommand* _tmp7_; #line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp1_) { + if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 18759 "PhotoPage.c" +#line 19165 "PhotoPage.c" } else { - gboolean _tmp2_; -#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = _tmp2_; -#line 18766 "PhotoPage.c" + _tmp0_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); +#line 19169 "PhotoPage.c" } #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { #line 3030 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18772 "PhotoPage.c" +#line 19175 "PhotoPage.c" } #line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = set_rating_single_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), TRUE); + _tmp3_ = set_rating_single_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource), TRUE); #line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp2_); #line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command = _tmp6_; + command = _tmp4_; #line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = command; + _tmp7_ = command; #line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command)); #line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _command_manager_unref0 (_tmp8_); + _command_manager_unref0 (_tmp6_); #line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_rating_menu_item_sensitivity (self); #line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 18800 "PhotoPage.c" +#line 19203 "PhotoPage.c" } -static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self) { +static void +library_photo_page_on_decrease_rating (LibraryPhotoPage* self) +{ gboolean _tmp0_ = FALSE; - gboolean _tmp1_; SetRatingSingleCommand* command = NULL; - Photo* _tmp3_; - Photo* _tmp4_; - SetRatingSingleCommand* _tmp5_; - SetRatingSingleCommand* _tmp6_; - CommandManager* _tmp7_; - CommandManager* _tmp8_; - SetRatingSingleCommand* _tmp9_; + Photo* _tmp1_; + Photo* _tmp2_; + SetRatingSingleCommand* _tmp3_; + SetRatingSingleCommand* _tmp4_; + CommandManager* _tmp5_; + CommandManager* _tmp6_; + SetRatingSingleCommand* _tmp7_; #line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp1_) { + if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 18823 "PhotoPage.c" +#line 19225 "PhotoPage.c" } else { - gboolean _tmp2_; #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = _tmp2_; -#line 18830 "PhotoPage.c" + _tmp0_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); +#line 19229 "PhotoPage.c" } #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { #line 3040 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18836 "PhotoPage.c" +#line 19235 "PhotoPage.c" } #line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = set_rating_single_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), FALSE); + _tmp3_ = set_rating_single_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource), FALSE); #line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp2_); #line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command = _tmp6_; + command = _tmp4_; #line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = command; + _tmp7_ = command; #line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command)); #line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _command_manager_unref0 (_tmp8_); + _command_manager_unref0 (_tmp6_); #line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_rating_menu_item_sensitivity (self); #line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 18864 "PhotoPage.c" +#line 19263 "PhotoPage.c" } -static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rating) { +static void +library_photo_page_on_set_rating (LibraryPhotoPage* self, + Rating rating) +{ gboolean _tmp0_ = FALSE; - gboolean _tmp1_; SetRatingSingleCommand* command = NULL; - Photo* _tmp3_; - Photo* _tmp4_; - Rating _tmp5_; - SetRatingSingleCommand* _tmp6_; + Photo* _tmp1_; + Photo* _tmp2_; + SetRatingSingleCommand* _tmp3_; + SetRatingSingleCommand* _tmp4_; + CommandManager* _tmp5_; + CommandManager* _tmp6_; SetRatingSingleCommand* _tmp7_; - CommandManager* _tmp8_; - CommandManager* _tmp9_; - SetRatingSingleCommand* _tmp10_; #line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (!_tmp1_) { + if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = TRUE; -#line 18888 "PhotoPage.c" +#line 19286 "PhotoPage.c" } else { - gboolean _tmp2_; #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = _tmp2_; -#line 18895 "PhotoPage.c" + _tmp0_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); +#line 19290 "PhotoPage.c" } #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { #line 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 18901 "PhotoPage.c" +#line 19296 "PhotoPage.c" } #line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_; + _tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = rating; + _tmp2_ = _tmp1_; #line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = set_rating_single_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), _tmp5_); + _tmp3_ = set_rating_single_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource), rating); #line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp2_); #line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command = _tmp7_; + command = _tmp4_; #line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = command; + _tmp7_ = command; #line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala" - command_manager_execute (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command)); #line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _command_manager_unref0 (_tmp9_); + _command_manager_unref0 (_tmp6_); #line 3055 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_update_rating_menu_item_sensitivity (self); #line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (command); -#line 18931 "PhotoPage.c" +#line 19324 "PhotoPage.c" } -static void library_photo_page_on_rate_rejected (LibraryPhotoPage* self) { +static void +library_photo_page_on_rate_rejected (LibraryPhotoPage* self) +{ #line 3058 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3059 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_REJECTED); -#line 18940 "PhotoPage.c" +#line 19335 "PhotoPage.c" } -static void library_photo_page_on_rate_unrated (LibraryPhotoPage* self) { +static void +library_photo_page_on_rate_unrated (LibraryPhotoPage* self) +{ #line 3062 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3063 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_UNRATED); -#line 18949 "PhotoPage.c" +#line 19346 "PhotoPage.c" } -static void library_photo_page_on_rate_one (LibraryPhotoPage* self) { +static void +library_photo_page_on_rate_one (LibraryPhotoPage* self) +{ #line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_ONE); -#line 18958 "PhotoPage.c" +#line 19357 "PhotoPage.c" } -static void library_photo_page_on_rate_two (LibraryPhotoPage* self) { +static void +library_photo_page_on_rate_two (LibraryPhotoPage* self) +{ #line 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_TWO); -#line 18967 "PhotoPage.c" +#line 19368 "PhotoPage.c" } -static void library_photo_page_on_rate_three (LibraryPhotoPage* self) { +static void +library_photo_page_on_rate_three (LibraryPhotoPage* self) +{ #line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3075 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_THREE); -#line 18976 "PhotoPage.c" +#line 19379 "PhotoPage.c" } -static void library_photo_page_on_rate_four (LibraryPhotoPage* self) { +static void +library_photo_page_on_rate_four (LibraryPhotoPage* self) +{ #line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_FOUR); -#line 18985 "PhotoPage.c" +#line 19390 "PhotoPage.c" } -static void library_photo_page_on_rate_five (LibraryPhotoPage* self) { +static void +library_photo_page_on_rate_five (LibraryPhotoPage* self) +{ #line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_on_set_rating (self, RATING_FIVE); -#line 18994 "PhotoPage.c" +#line 19401 "PhotoPage.c" } -static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhotoPage* self) { +static void +library_photo_page_update_rating_menu_item_sensitivity (LibraryPhotoPage* self) +{ Photo* _tmp0_; Photo* _tmp1_; - Rating _tmp2_; + Photo* _tmp2_; Photo* _tmp3_; Photo* _tmp4_; - Rating _tmp5_; + Photo* _tmp5_; Photo* _tmp6_; Photo* _tmp7_; - Rating _tmp8_; + Photo* _tmp8_; Photo* _tmp9_; Photo* _tmp10_; - Rating _tmp11_; + Photo* _tmp11_; Photo* _tmp12_; Photo* _tmp13_; - Rating _tmp14_; + Photo* _tmp14_; Photo* _tmp15_; Photo* _tmp16_; - Rating _tmp17_; - Photo* _tmp18_; - Photo* _tmp19_; - Rating _tmp20_; - Photo* _tmp21_; - Photo* _tmp22_; - Rating _tmp23_; - gboolean _tmp24_; - Photo* _tmp25_; - Photo* _tmp26_; - Rating _tmp27_; - gboolean _tmp28_; + Photo* _tmp17_; #line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -19036,121 +19434,104 @@ static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhoto #line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp1_ = _tmp0_; #line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected", _tmp2_ != RATING_REJECTED); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected", media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource)) != RATING_REJECTED); #line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp1_); #line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = _tmp3_; + _tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp3_ = _tmp2_; #line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated", _tmp5_ != RATING_UNRATED); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated", media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource)) != RATING_UNRATED); #line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp4_); -#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _g_object_unref0 (_tmp3_); #line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = _tmp6_; + _tmp4_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp5_ = _tmp4_; #line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne", _tmp8_ != RATING_ONE); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne", media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource)) != RATING_ONE); #line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp7_); -#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _g_object_unref0 (_tmp5_); #line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = _tmp9_; + _tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp7_ = _tmp6_; #line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo", _tmp11_ != RATING_TWO); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo", media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource)) != RATING_TWO); #line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp10_); -#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _g_object_unref0 (_tmp7_); #line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = _tmp12_; + _tmp8_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp9_ = _tmp8_; #line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree", _tmp14_ != RATING_THREE); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree", media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource)) != RATING_THREE); #line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp13_); -#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _g_object_unref0 (_tmp9_); #line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp16_ = _tmp15_; + _tmp10_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp17_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp11_ = _tmp10_; #line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour", _tmp17_ != RATING_FOUR); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour", media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource)) != RATING_FOUR); #line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp16_); -#line 3093 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp18_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _g_object_unref0 (_tmp11_); #line 3093 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp19_ = _tmp18_; + _tmp12_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3093 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp20_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp13_ = _tmp12_; #line 3093 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive", _tmp20_ != RATING_FIVE); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive", media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource)) != RATING_FIVE); #line 3093 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp19_); -#line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp21_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp22_ = _tmp21_; + _g_object_unref0 (_tmp13_); #line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp23_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp14_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp24_ = rating_can_increase (_tmp23_); + _tmp15_ = _tmp14_; #line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating", _tmp24_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating", rating_can_increase (media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_SOURCE, MediaSource)))); #line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp22_); -#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp25_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _g_object_unref0 (_tmp15_); #line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp26_ = _tmp25_; -#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp27_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp16_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp28_ = rating_can_decrease (_tmp27_); + _tmp17_ = _tmp16_; #line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", _tmp28_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", rating_can_decrease (media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MEDIA_SOURCE, MediaSource)))); #line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp26_); -#line 19124 "PhotoPage.c" + _g_object_unref0 (_tmp17_); +#line 19500 "PhotoPage.c" } -static GVariant* _variant_new18 (const gchar* value) { +static GVariant* +_variant_new18 (const gchar* value) +{ #line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 19131 "PhotoPage.c" +#line 19509 "PhotoPage.c" } -static GVariant* _variant_new19 (const gchar* value) { +static GVariant* +_variant_new19 (const gchar* value) +{ #line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 19138 "PhotoPage.c" +#line 19518 "PhotoPage.c" } -static void library_photo_page_update_development_menu_item_sensitivity (LibraryPhotoPage* self) { +static void +library_photo_page_update_development_menu_item_sensitivity (LibraryPhotoPage* self) +{ PhotoFileFormat format = 0; Photo* _tmp0_; Photo* _tmp1_; PhotoFileFormat _tmp2_; PhotoFileFormat _tmp3_; PhotoFileFormat _tmp4_; - PhotoFileFormat _tmp5_; #line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -19159,162 +19540,150 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library _tmp1_ = _tmp0_; #line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp2_ = photo_get_master_file_format (_tmp1_); -#line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_; #line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (_tmp1_); #line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala" - format = _tmp3_; + format = _tmp2_; #line 3100 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = format; + _tmp3_ = format; #line 3100 "/home/jens/Source/shotwell/src/PhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", _tmp4_ == PHOTO_FILE_FORMAT_RAW); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", _tmp3_ == PHOTO_FILE_FORMAT_RAW); #line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = format; + _tmp4_ = format; #line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp5_ == PHOTO_FILE_FORMAT_RAW) { -#line 19172 "PhotoPage.c" + if (_tmp4_ == PHOTO_FILE_FORMAT_RAW) { +#line 19551 "PhotoPage.c" + Photo* _tmp5_; Photo* _tmp6_; - Photo* _tmp7_; - RawDeveloper _tmp8_; - RawDeveloper _tmp9_; + RawDeveloper _tmp7_; #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = _tmp6_; -#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = photo_get_raw_developer (_tmp7_); + _tmp6_ = _tmp5_; #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = _tmp8_; + _tmp7_ = photo_get_raw_developer (_tmp6_); #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala" - switch (_tmp9_) { + switch (_tmp7_) { #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala" case RAW_DEVELOPER_SHOTWELL: -#line 19191 "PhotoPage.c" +#line 19567 "PhotoPage.c" { - GAction* _tmp10_; - GAction* _tmp11_; - GVariant* _tmp12_; + GAction* _tmp8_; + GAction* _tmp9_; + GVariant* _tmp10_; #line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper"); + _tmp8_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper"); #line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp12_ = _variant_new18 ("Shotwell"); + _tmp10_ = _variant_new18 ("Shotwell"); #line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_action_change_state (_tmp11_, _tmp12_); + g_action_change_state (_tmp9_, _tmp10_); #line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_variant_unref0 (_tmp12_); + _g_variant_unref0 (_tmp10_); #line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp9_); #line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 19210 "PhotoPage.c" +#line 19586 "PhotoPage.c" } #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala" case RAW_DEVELOPER_CAMERA: #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala" case RAW_DEVELOPER_EMBEDDED: -#line 19216 "PhotoPage.c" +#line 19592 "PhotoPage.c" { - GAction* _tmp13_; - GAction* _tmp14_; - GVariant* _tmp15_; + GAction* _tmp11_; + GAction* _tmp12_; + GVariant* _tmp13_; #line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp13_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper"); + _tmp11_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper"); #line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp15_ = _variant_new19 ("Camera"); + _tmp13_ = _variant_new19 ("Camera"); #line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" - g_action_change_state (_tmp14_, _tmp15_); + g_action_change_state (_tmp12_, _tmp13_); #line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_variant_unref0 (_tmp15_); + _g_variant_unref0 (_tmp13_); #line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp12_); #line 3113 "/home/jens/Source/shotwell/src/PhotoPage.vala" break; -#line 19235 "PhotoPage.c" +#line 19611 "PhotoPage.c" } default: { #line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_assert_not_reached (); -#line 19241 "PhotoPage.c" +#line 19617 "PhotoPage.c" } } } } -static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeMap* map) { +static void +library_photo_page_on_metadata_altered (LibraryPhotoPage* self, + GeeMap* map) +{ gboolean _tmp0_ = FALSE; - GeeMap* _tmp1_; + Photo* _tmp1_; Photo* _tmp2_; - Photo* _tmp3_; - gboolean _tmp4_; - gboolean _tmp5_; + gboolean _tmp3_; #line 3121 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self)); #line 3121 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_if_fail (GEE_IS_MAP (map)); #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = map; -#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = _tmp2_; -#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = gee_map_has_key (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); -#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp5_ = _tmp4_; + _tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp3_); + _tmp2_ = _tmp1_; #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" - if (_tmp5_) { -#line 19273 "PhotoPage.c" - GeeMap* _tmp6_; - Photo* _tmp7_; - Photo* _tmp8_; - gpointer _tmp9_; - Alteration* _tmp10_; - gboolean _tmp11_; + _tmp3_ = gee_map_has_key (map, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject)); #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp6_ = map; + _g_object_unref0 (_tmp2_); #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + if (_tmp3_) { +#line 19646 "PhotoPage.c" + Photo* _tmp4_; + Photo* _tmp5_; + gpointer _tmp6_; + Alteration* _tmp7_; #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp8_ = _tmp7_; + _tmp4_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp9_ = gee_map_get (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); + _tmp5_ = _tmp4_; #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp10_ = (Alteration*) _tmp9_; + _tmp6_ = gee_map_get (map, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp11_ = alteration_has_subject (_tmp10_, "metadata"); + _tmp7_ = (Alteration*) _tmp6_; #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = _tmp11_; + _tmp0_ = alteration_has_subject (_tmp7_, "metadata"); #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _alteration_unref0 (_tmp10_); + _alteration_unref0 (_tmp7_); #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp8_); -#line 19298 "PhotoPage.c" + _g_object_unref0 (_tmp5_); +#line 19665 "PhotoPage.c" } else { #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp0_ = FALSE; -#line 19302 "PhotoPage.c" +#line 19669 "PhotoPage.c" } #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp0_) { #line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala" single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL); -#line 19308 "PhotoPage.c" +#line 19675 "PhotoPage.c" } } -static void library_photo_page_on_add_tags (LibraryPhotoPage* self) { +static void +library_photo_page_on_add_tags (LibraryPhotoPage* self) +{ AddTagsDialog* dialog = NULL; AddTagsDialog* _tmp0_; gchar** names = NULL; @@ -19347,7 +19716,7 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) { _tmp4__length1 = names_length1; #line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala" if (_tmp4_ != NULL) { -#line 19346 "PhotoPage.c" +#line 19715 "PhotoPage.c" CommandManager* _tmp5_; CommandManager* _tmp6_; HierarchicalTagIndex* _tmp7_; @@ -19408,17 +19777,19 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) { _hierarchical_tag_index_unref0 (_tmp8_); #line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala" _command_manager_unref0 (_tmp6_); -#line 19407 "PhotoPage.c" +#line 19776 "PhotoPage.c" } #line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala" names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL); #line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala" _text_entry_dialog_mediator_unref0 (dialog); -#line 19413 "PhotoPage.c" +#line 19782 "PhotoPage.c" } -static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) { +static void +library_photo_page_on_modify_tags (LibraryPhotoPage* self) +{ LibraryPhoto* photo = NULL; ViewCollection* _tmp0_; ViewCollection* _tmp1_; @@ -19483,7 +19854,7 @@ static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) { _g_object_unref0 (photo); #line 3143 "/home/jens/Source/shotwell/src/PhotoPage.vala" return; -#line 19482 "PhotoPage.c" +#line 19853 "PhotoPage.c" } #line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala" _tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -19509,73 +19880,80 @@ static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) { _text_entry_dialog_mediator_unref0 (dialog); #line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala" _g_object_unref0 (photo); -#line 19508 "PhotoPage.c" +#line 19879 "PhotoPage.c" } -static gboolean library_photo_page_library_photo_page_view_filter_real_predicate (ViewFilter* base, DataView* view) { +static gboolean +library_photo_page_library_photo_page_view_filter_real_predicate (ViewFilter* base, + DataView* view) +{ LibraryPhotoPageLibraryPhotoPageViewFilter * self; gboolean result = FALSE; - DataView* _tmp0_; - DataSource* _tmp1_; - MediaSource* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; + DataSource* _tmp0_; + MediaSource* _tmp1_; + gboolean _tmp2_; #line 2335 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_PHOTO_PAGE_TYPE_LIBRARY_PHOTO_PAGE_VIEW_FILTER, LibraryPhotoPageLibraryPhotoPageViewFilter); #line 2335 "/home/jens/Source/shotwell/src/PhotoPage.vala" g_return_val_if_fail (IS_DATA_VIEW (view), FALSE); #line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp0_ = view; -#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp1_ = data_view_get_source (_tmp0_); + _tmp0_ = data_view_get_source (view); #line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource); #line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp3_ = media_source_is_trashed (_tmp2_); + _tmp2_ = !media_source_is_trashed (_tmp1_); #line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _tmp4_ = !_tmp3_; -#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala" - result = _tmp4_; + result = _tmp2_; #line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala" return result; -#line 19540 "PhotoPage.c" +#line 19908 "PhotoPage.c" } -static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_construct (GType object_type) { +static LibraryPhotoPageLibraryPhotoPageViewFilter* +library_photo_page_library_photo_page_view_filter_construct (GType object_type) +{ LibraryPhotoPageLibraryPhotoPageViewFilter* self = NULL; #line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala" self = (LibraryPhotoPageLibraryPhotoPageViewFilter*) view_filter_construct (object_type); #line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala" return self; -#line 19550 "PhotoPage.c" +#line 19920 "PhotoPage.c" } -static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_new (void) { +static LibraryPhotoPageLibraryPhotoPageViewFilter* +library_photo_page_library_photo_page_view_filter_new (void) +{ #line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala" return library_photo_page_library_photo_page_view_filter_construct (LIBRARY_PHOTO_PAGE_TYPE_LIBRARY_PHOTO_PAGE_VIEW_FILTER); -#line 19557 "PhotoPage.c" +#line 19929 "PhotoPage.c" } -static void library_photo_page_library_photo_page_view_filter_class_init (LibraryPhotoPageLibraryPhotoPageViewFilterClass * klass) { +static void +library_photo_page_library_photo_page_view_filter_class_init (LibraryPhotoPageLibraryPhotoPageViewFilterClass * klass) +{ #line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_library_photo_page_view_filter_parent_class = g_type_class_peek_parent (klass); #line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala" ((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) library_photo_page_library_photo_page_view_filter_real_predicate; -#line 19566 "PhotoPage.c" +#line 19940 "PhotoPage.c" } -static void library_photo_page_library_photo_page_view_filter_instance_init (LibraryPhotoPageLibraryPhotoPageViewFilter * self) { +static void +library_photo_page_library_photo_page_view_filter_instance_init (LibraryPhotoPageLibraryPhotoPageViewFilter * self) +{ } -static GType library_photo_page_library_photo_page_view_filter_get_type (void) { +static GType +library_photo_page_library_photo_page_view_filter_get_type (void) +{ static volatile gsize library_photo_page_library_photo_page_view_filter_type_id__volatile = 0; if (g_once_init_enter (&library_photo_page_library_photo_page_view_filter_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryPhotoPageLibraryPhotoPageViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_photo_page_library_photo_page_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryPhotoPageLibraryPhotoPageViewFilter), 0, (GInstanceInitFunc) library_photo_page_library_photo_page_view_filter_instance_init, NULL }; @@ -19587,7 +19965,9 @@ static GType library_photo_page_library_photo_page_view_filter_get_type (void) { } -static void library_photo_page_class_init (LibraryPhotoPageClass * klass) { +static void +library_photo_page_class_init (LibraryPhotoPageClass * klass) +{ #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" library_photo_page_parent_class = g_type_class_peek_parent (klass); #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" @@ -19634,11 +20014,13 @@ static void library_photo_page_class_init (LibraryPhotoPageClass * klass) { ((PageClass *) klass)->on_context_keypress = (gboolean (*) (Page *)) library_photo_page_real_on_context_keypress; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" G_OBJECT_CLASS (klass)->finalize = library_photo_page_finalize; -#line 19633 "PhotoPage.c" +#line 20013 "PhotoPage.c" } -static void library_photo_page_instance_init (LibraryPhotoPage * self) { +static void +library_photo_page_instance_init (LibraryPhotoPage * self) +{ LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_; #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv = LIBRARY_PHOTO_PAGE_GET_PRIVATE (self); @@ -19650,11 +20032,13 @@ static void library_photo_page_instance_init (LibraryPhotoPage * self) { _tmp0_ = library_photo_page_library_photo_page_view_filter_new (); #line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala" self->priv->filter = _tmp0_; -#line 19649 "PhotoPage.c" +#line 20031 "PhotoPage.c" } -static void library_photo_page_finalize (GObject * obj) { +static void +library_photo_page_finalize (GObject * obj) +{ LibraryPhotoPage * self; LibraryPhotoSourceCollection* _tmp0_; guint _tmp1_; @@ -19695,11 +20079,13 @@ static void library_photo_page_finalize (GObject * obj) { _g_object_unref0 (self->priv->context_menu); #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala" G_OBJECT_CLASS (library_photo_page_parent_class)->finalize (obj); -#line 19694 "PhotoPage.c" +#line 20078 "PhotoPage.c" } -GType library_photo_page_get_type (void) { +GType +library_photo_page_get_type (void) +{ static volatile gsize library_photo_page_type_id__volatile = 0; if (g_once_init_enter (&library_photo_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryPhotoPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_photo_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryPhotoPage), 0, (GInstanceInitFunc) library_photo_page_instance_init, NULL }; @@ -19711,7 +20097,11 @@ GType library_photo_page_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -19723,7 +20113,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/PixbufCache.c b/src/PixbufCache.c index cf238a0..c4d3563 100644 --- a/src/PixbufCache.c +++ b/src/PixbufCache.c @@ -1,4 +1,4 @@ -/* PixbufCache.c generated by valac 0.36.6, the Vala compiler +/* PixbufCache.c generated by valac 0.40.4, the Vala compiler * generated from PixbufCache.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -136,6 +137,11 @@ typedef struct _BackgroundJobClass BackgroundJobClass; typedef struct _PixbufCacheFetchJob PixbufCacheFetchJob; typedef struct _PixbufCacheFetchJobClass PixbufCacheFetchJobClass; +enum { + PIXBUF_CACHE_0_PROPERTY, + PIXBUF_CACHE_NUM_PROPERTIES +}; +static GParamSpec* pixbuf_cache_properties[PIXBUF_CACHE_NUM_PROPERTIES]; #define TYPE_ALTERATION (alteration_get_type ()) #define ALTERATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ALTERATION, Alteration)) @@ -197,6 +203,11 @@ typedef struct _PixbufCachePixbufCacheBatchClass PixbufCachePixbufCacheBatchClas #define _g_free0(var) (var = (g_free (var), NULL)) #define _alteration_unref0(var) ((var == NULL) ? NULL : (var = (alteration_unref (var), NULL))) typedef struct _PixbufCachePixbufCacheBatchPrivate PixbufCachePixbufCacheBatchPrivate; +enum { + PIXBUF_CACHE_PIXBUF_CACHE_BATCH_0_PROPERTY, + PIXBUF_CACHE_PIXBUF_CACHE_BATCH_NUM_PROPERTIES +}; +static GParamSpec* pixbuf_cache_pixbuf_cache_batch_properties[PIXBUF_CACHE_PIXBUF_CACHE_BATCH_NUM_PROPERTIES]; #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) #define TYPE_ABSTRACT_SEMAPHORE (abstract_semaphore_get_type ()) @@ -223,9 +234,9 @@ typedef struct _PixbufCacheBaselineFetchJobPrivate PixbufCacheBaselineFetchJobPr typedef struct _PixbufCacheMasterFetchJobPrivate PixbufCacheMasterFetchJobPrivate; enum { PIXBUF_CACHE_FETCHED_SIGNAL, - PIXBUF_CACHE_LAST_SIGNAL + PIXBUF_CACHE_NUM_SIGNALS }; -static guint pixbuf_cache_signals[PIXBUF_CACHE_LAST_SIGNAL] = {0}; +static guint pixbuf_cache_signals[PIXBUF_CACHE_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -354,9 +365,15 @@ static gpointer pixbuf_cache_master_fetch_job_parent_class = NULL; GType pixbuf_cache_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -376,120 +393,228 @@ GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; gpointer background_job_ref (gpointer instance); void background_job_unref (gpointer instance); -GParamSpec* param_spec_background_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_background_job (GValue* value, gpointer v_object); -void value_take_background_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_background_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_background_job (GValue* value, + gpointer v_object); +void value_take_background_job (GValue* value, + gpointer v_object); gpointer value_get_background_job (const GValue* value); GType background_job_get_type (void) G_GNUC_CONST; static GType pixbuf_cache_fetch_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define PIXBUF_CACHE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PIXBUF_CACHE, PixbufCachePrivate)) -enum { - PIXBUF_CACHE_DUMMY_PROPERTY -}; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; -static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map); -static void _pixbuf_cache_on_sources_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); -static void pixbuf_cache_on_sources_removed (PixbufCache* self, GeeIterable* removed); -static void _pixbuf_cache_on_sources_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self); +static void pixbuf_cache_on_sources_altered (PixbufCache* self, + GeeMap* map); +static void _pixbuf_cache_on_sources_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); +static void pixbuf_cache_on_sources_removed (PixbufCache* self, + GeeIterable* removed); +static void _pixbuf_cache_on_sources_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self); void background_job_cancel (BackgroundJob* self); gpointer workers_ref (gpointer instance); void workers_unref (gpointer instance); -GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_workers (GValue* value, gpointer v_object); -void value_take_workers (GValue* value, gpointer v_object); +GParamSpec* param_spec_workers (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_workers (GValue* value, + gpointer v_object); +void value_take_workers (GValue* value, + gpointer v_object); gpointer value_get_workers (const GValue* value); GType workers_get_type (void) G_GNUC_CONST; -PixbufCache* pixbuf_cache_new (SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target); -PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target); +PixbufCache* pixbuf_cache_new (SourceCollection* sources, + PixbufCachePhotoType type, + Scaling* scaling, + gint max_count, + PixbufCacheCacheFilter filter, + void* filter_target); +PixbufCache* pixbuf_cache_construct (GType object_type, + SourceCollection* sources, + PixbufCachePhotoType type, + Scaling* scaling, + gint max_count, + PixbufCacheCacheFilter filter, + void* filter_target); guint workers_thread_per_cpu_minus_one (void); -Workers* workers_new (guint max_threads, gboolean exclusive); -Workers* workers_construct (GType object_type, guint max_threads, gboolean exclusive); -void pixbuf_cache_get_scaling (PixbufCache* self, Scaling* result); -GdkPixbuf* pixbuf_cache_get_ready_pixbuf (PixbufCache* self, Photo* photo); -static GdkPixbuf* pixbuf_cache_get_cached (PixbufCache* self, Photo* photo); -GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error); +Workers* workers_new (guint max_threads, + gboolean exclusive); +Workers* workers_construct (GType object_type, + guint max_threads, + gboolean exclusive); +void pixbuf_cache_get_scaling (PixbufCache* self, + Scaling* result); +GdkPixbuf* pixbuf_cache_get_ready_pixbuf (PixbufCache* self, + Photo* photo); +static GdkPixbuf* pixbuf_cache_get_cached (PixbufCache* self, + Photo* photo); +GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, + Photo* photo, + GError** error); GFile* photo_get_actual_file (Photo* self); -static void pixbuf_cache_decache (PixbufCache* self, Photo* photo); +static void pixbuf_cache_decache (PixbufCache* self, + Photo* photo); void background_job_wait_for_completion (BackgroundJob* self); GType background_job_job_priority_get_type (void) G_GNUC_CONST; -GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error); -static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pixbuf); -void pixbuf_cache_drop (PixbufCache* self, Photo* photo); -gboolean pixbuf_cache_cancel_prefetch (PixbufCache* self, Photo* photo); -void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPriority priority, gboolean force); -static void pixbuf_cache_prioritize (PixbufCache* self, Photo* photo); -static void pixbuf_cache_on_fetched (PixbufCache* self, BackgroundJob* j); -static void _pixbuf_cache_on_fetched_completion_callback (BackgroundJob* job, gpointer self); -static PixbufCacheBaselineFetchJob* pixbuf_cache_baseline_fetch_job_new (PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target); -static PixbufCacheBaselineFetchJob* pixbuf_cache_baseline_fetch_job_construct (GType object_type, PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target); +GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, + Scaling* scaling, + GError** error); +static void pixbuf_cache_encache (PixbufCache* self, + Photo* photo, + GdkPixbuf* pixbuf); +void pixbuf_cache_drop (PixbufCache* self, + Photo* photo); +gboolean pixbuf_cache_cancel_prefetch (PixbufCache* self, + Photo* photo); +void pixbuf_cache_prefetch (PixbufCache* self, + Photo* photo, + BackgroundJobJobPriority priority, + gboolean force); +static void pixbuf_cache_prioritize (PixbufCache* self, + Photo* photo); +static void pixbuf_cache_on_fetched (PixbufCache* self, + BackgroundJob* j); +static void _pixbuf_cache_on_fetched_completion_callback (BackgroundJob* job, + gpointer self); +static PixbufCacheBaselineFetchJob* pixbuf_cache_baseline_fetch_job_new (PixbufCache* owner, + BackgroundJobJobPriority priority, + Photo* photo, + Scaling* scaling, + CompletionCallback callback, + void* callback_target); +static PixbufCacheBaselineFetchJob* pixbuf_cache_baseline_fetch_job_construct (GType object_type, + PixbufCache* owner, + BackgroundJobJobPriority priority, + Photo* photo, + Scaling* scaling, + CompletionCallback callback, + void* callback_target); static GType pixbuf_cache_baseline_fetch_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_new (PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target); -static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_construct (GType object_type, PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target); +static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_new (PixbufCache* owner, + BackgroundJobJobPriority priority, + Photo* photo, + Scaling* scaling, + CompletionCallback callback, + void* callback_target); +static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_construct (GType object_type, + PixbufCache* owner, + BackgroundJobJobPriority priority, + Photo* photo, + Scaling* scaling, + CompletionCallback callback, + void* callback_target); static GType pixbuf_cache_master_fetch_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -void workers_enqueue (Workers* self, BackgroundJob* job); -void pixbuf_cache_prefetch_many (PixbufCache* self, GeeCollection* photos, BackgroundJobJobPriority priority, gboolean force); +void workers_enqueue (Workers* self, + BackgroundJob* job); +void pixbuf_cache_prefetch_many (PixbufCache* self, + GeeCollection* photos, + BackgroundJobJobPriority priority, + gboolean force); GType pixbuf_cache_pixbuf_cache_batch_get_type (void) G_GNUC_CONST; -void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch* batch, gboolean force); +void pixbuf_cache_prefetch_batch (PixbufCache* self, + PixbufCachePixbufCacheBatch* batch, + gboolean force); void pixbuf_cache_cancel_all (PixbufCache* self); gchar* data_object_to_string (DataObject* self); -gboolean alteration_has_subject (Alteration* self, const gchar* subject); -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -enum { - PIXBUF_CACHE_PIXBUF_CACHE_BATCH_DUMMY_PROPERTY -}; +gboolean alteration_has_subject (Alteration* self, + const gchar* subject); +static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_new (void); PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_construct (GType object_type); -gint background_job_job_priority_compare_func (BackgroundJobJobPriority a, BackgroundJobJobPriority b); -enum { - PIXBUF_CACHE_FETCH_JOB_DUMMY_PROPERTY -}; -static PixbufCacheFetchJob* pixbuf_cache_fetch_job_construct (GType object_type, PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target); +gint background_job_job_priority_compare_func (BackgroundJobJobPriority a, + BackgroundJobJobPriority b); +static PixbufCacheFetchJob* pixbuf_cache_fetch_job_construct (GType object_type, + PixbufCache* owner, + BackgroundJobJobPriority priority, + Photo* photo, + Scaling* scaling, + CompletionCallback callback, + void* callback_target); Semaphore* semaphore_new (void); Semaphore* semaphore_construct (GType object_type); gpointer abstract_semaphore_ref (gpointer instance); void abstract_semaphore_unref (gpointer instance); -GParamSpec* param_spec_abstract_semaphore (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_abstract_semaphore (GValue* value, gpointer v_object); -void value_take_abstract_semaphore (GValue* value, gpointer v_object); +GParamSpec* param_spec_abstract_semaphore (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_abstract_semaphore (GValue* value, + gpointer v_object); +void value_take_abstract_semaphore (GValue* value, + gpointer v_object); gpointer value_get_abstract_semaphore (const GValue* value); GType abstract_semaphore_get_type (void) G_GNUC_CONST; GType semaphore_get_type (void) G_GNUC_CONST; -BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore); +BackgroundJob* background_job_construct (GType object_type, + GObject* owner, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target, + AbstractSemaphore* completion_semaphore); static BackgroundJobJobPriority pixbuf_cache_fetch_job_real_get_priority (BackgroundJob* base); static void pixbuf_cache_fetch_job_finalize (BackgroundJob * obj); -enum { - PIXBUF_CACHE_BASELINE_FETCH_JOB_DUMMY_PROPERTY -}; static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base); -enum { - PIXBUF_CACHE_MASTER_FETCH_JOB_DUMMY_PROPERTY -}; static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base); -GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, GError** error); +GdkPixbuf* photo_get_master_pixbuf (Photo* self, + Scaling* scaling, + gboolean rotate, + GError** error); static void pixbuf_cache_finalize (GObject * obj); -static void _pixbuf_cache_on_sources_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_pixbuf_cache_on_sources_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 111 "/home/jens/Source/shotwell/src/PixbufCache.vala" pixbuf_cache_on_sources_altered ((PixbufCache*) self, items); -#line 482 "PixbufCache.c" +#line 601 "PixbufCache.c" } -static void _pixbuf_cache_on_sources_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) { +static void +_pixbuf_cache_on_sources_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self) +{ #line 112 "/home/jens/Source/shotwell/src/PixbufCache.vala" pixbuf_cache_on_sources_removed ((PixbufCache*) self, removed); -#line 489 "PixbufCache.c" +#line 612 "PixbufCache.c" } -GType pixbuf_cache_photo_type_get_type (void) { +GType +pixbuf_cache_photo_type_get_type (void) +{ static volatile gsize pixbuf_cache_photo_type_type_id__volatile = 0; if (g_once_init_enter (&pixbuf_cache_photo_type_type_id__volatile)) { static const GEnumValue values[] = {{PIXBUF_CACHE_PHOTO_TYPE_BASELINE, "PIXBUF_CACHE_PHOTO_TYPE_BASELINE", "baseline"}, {PIXBUF_CACHE_PHOTO_TYPE_MASTER, "PIXBUF_CACHE_PHOTO_TYPE_MASTER", "master"}, {0, NULL, NULL}}; @@ -501,26 +626,28 @@ GType pixbuf_cache_photo_type_get_type (void) { } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 87 "/home/jens/Source/shotwell/src/PixbufCache.vala" return self ? data_collection_ref (self) : NULL; -#line 508 "PixbufCache.c" +#line 635 "PixbufCache.c" } -PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target) { +PixbufCache* +pixbuf_cache_construct (GType object_type, + SourceCollection* sources, + PixbufCachePhotoType type, + Scaling* scaling, + gint max_count, + PixbufCacheCacheFilter filter, + void* filter_target) +{ PixbufCache * self = NULL; SourceCollection* _tmp0_; - SourceCollection* _tmp1_; - PixbufCachePhotoType _tmp2_; - Scaling _tmp3_; - gint _tmp4_; - PixbufCacheCacheFilter _tmp5_; - void* _tmp5__target; - gint _tmp6_; - Workers* _tmp7_; - PixbufCachePhotoType _tmp10_; - SourceCollection* _tmp12_; + Scaling _tmp1_; + Workers* _tmp2_; #line 85 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL); #line 85 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -528,84 +655,71 @@ PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* source #line 85 "/home/jens/Source/shotwell/src/PixbufCache.vala" self = (PixbufCache*) g_object_new (object_type, NULL); #line 87 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp0_ = sources; -#line 87 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp1_ = _data_collection_ref0 (_tmp0_); + _tmp0_ = _data_collection_ref0 (sources); #line 87 "/home/jens/Source/shotwell/src/PixbufCache.vala" _data_collection_unref0 (self->priv->sources); #line 87 "/home/jens/Source/shotwell/src/PixbufCache.vala" - self->priv->sources = _tmp1_; + self->priv->sources = _tmp0_; #line 88 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp2_ = type; -#line 88 "/home/jens/Source/shotwell/src/PixbufCache.vala" - self->priv->type = _tmp2_; + self->priv->type = type; #line 89 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp3_ = *scaling; + _tmp1_ = *scaling; #line 89 "/home/jens/Source/shotwell/src/PixbufCache.vala" - self->priv->scaling = _tmp3_; -#line 90 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp4_ = max_count; + self->priv->scaling = _tmp1_; #line 90 "/home/jens/Source/shotwell/src/PixbufCache.vala" - self->priv->max_count = _tmp4_; + self->priv->max_count = max_count; #line 91 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp5_ = filter; + self->priv->filter = filter; #line 91 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp5__target = filter_target; -#line 91 "/home/jens/Source/shotwell/src/PixbufCache.vala" - self->priv->filter = _tmp5_; -#line 91 "/home/jens/Source/shotwell/src/PixbufCache.vala" - self->priv->filter_target = _tmp5__target; -#line 93 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp6_ = max_count; + self->priv->filter_target = filter_target; #line 93 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _vala_assert (_tmp6_ > 0, "max_count > 0"); + _vala_assert (max_count > 0, "max_count > 0"); #line 95 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp7_ = pixbuf_cache_background_workers; + _tmp2_ = pixbuf_cache_background_workers; #line 95 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (_tmp7_ == NULL) { -#line 567 "PixbufCache.c" - guint _tmp8_; - Workers* _tmp9_; + if (_tmp2_ == NULL) { +#line 682 "PixbufCache.c" + Workers* _tmp3_; #line 96 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp8_ = workers_thread_per_cpu_minus_one (); -#line 96 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp9_ = workers_new (_tmp8_, FALSE); + _tmp3_ = workers_new (workers_thread_per_cpu_minus_one (), FALSE); #line 96 "/home/jens/Source/shotwell/src/PixbufCache.vala" _workers_unref0 (pixbuf_cache_background_workers); #line 96 "/home/jens/Source/shotwell/src/PixbufCache.vala" - pixbuf_cache_background_workers = _tmp9_; -#line 578 "PixbufCache.c" + pixbuf_cache_background_workers = _tmp3_; +#line 690 "PixbufCache.c" } #line 100 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp10_ = type; -#line 100 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (_tmp10_ != PIXBUF_CACHE_PHOTO_TYPE_MASTER) { -#line 584 "PixbufCache.c" - SourceCollection* _tmp11_; -#line 101 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp11_ = sources; + if (type != PIXBUF_CACHE_PHOTO_TYPE_MASTER) { #line 101 "/home/jens/Source/shotwell/src/PixbufCache.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _pixbuf_cache_on_sources_altered_data_collection_items_altered, self, 0); -#line 590 "PixbufCache.c" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _pixbuf_cache_on_sources_altered_data_collection_items_altered, self, 0); +#line 696 "PixbufCache.c" } #line 102 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp12_ = sources; -#line 102 "/home/jens/Source/shotwell/src/PixbufCache.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _pixbuf_cache_on_sources_removed_data_collection_items_removed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _pixbuf_cache_on_sources_removed_data_collection_items_removed, self, 0); #line 85 "/home/jens/Source/shotwell/src/PixbufCache.vala" return self; -#line 598 "PixbufCache.c" +#line 702 "PixbufCache.c" } -PixbufCache* pixbuf_cache_new (SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target) { +PixbufCache* +pixbuf_cache_new (SourceCollection* sources, + PixbufCachePhotoType type, + Scaling* scaling, + gint max_count, + PixbufCacheCacheFilter filter, + void* filter_target) +{ #line 85 "/home/jens/Source/shotwell/src/PixbufCache.vala" return pixbuf_cache_construct (TYPE_PIXBUF_CACHE, sources, type, scaling, max_count, filter, filter_target); -#line 605 "PixbufCache.c" +#line 716 "PixbufCache.c" } -void pixbuf_cache_get_scaling (PixbufCache* self, Scaling* result) { +void +pixbuf_cache_get_scaling (PixbufCache* self, + Scaling* result) +{ Scaling _tmp0_; #line 118 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PIXBUF_CACHE (self)); @@ -615,151 +729,141 @@ void pixbuf_cache_get_scaling (PixbufCache* self, Scaling* result) { *result = _tmp0_; #line 119 "/home/jens/Source/shotwell/src/PixbufCache.vala" return; -#line 619 "PixbufCache.c" +#line 733 "PixbufCache.c" } -GdkPixbuf* pixbuf_cache_get_ready_pixbuf (PixbufCache* self, Photo* photo) { +GdkPixbuf* +pixbuf_cache_get_ready_pixbuf (PixbufCache* self, + Photo* photo) +{ GdkPixbuf* result = NULL; - Photo* _tmp0_; - GdkPixbuf* _tmp1_; + GdkPixbuf* _tmp0_; #line 123 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (IS_PIXBUF_CACHE (self), NULL); #line 123 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); #line 124 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp0_ = photo; -#line 124 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp1_ = pixbuf_cache_get_cached (self, _tmp0_); + _tmp0_ = pixbuf_cache_get_cached (self, photo); #line 124 "/home/jens/Source/shotwell/src/PixbufCache.vala" - result = _tmp1_; + result = _tmp0_; #line 124 "/home/jens/Source/shotwell/src/PixbufCache.vala" return result; -#line 639 "PixbufCache.c" +#line 753 "PixbufCache.c" } -static gpointer _g_error_copy0 (gpointer self) { +static gpointer +_g_error_copy0 (gpointer self) +{ #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala" return self ? g_error_copy (self) : NULL; -#line 646 "PixbufCache.c" +#line 762 "PixbufCache.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala" return self ? g_object_ref (self) : NULL; -#line 653 "PixbufCache.c" +#line 771 "PixbufCache.c" } -GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error) { +GdkPixbuf* +pixbuf_cache_fetch (PixbufCache* self, + Photo* photo, + GError** error) +{ GdkPixbuf* result = NULL; - Photo* _tmp0_; + GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; + gboolean _tmp2_; GdkPixbuf* pixbuf = NULL; - Photo* _tmp6_; - GdkPixbuf* _tmp7_; - GdkPixbuf* _tmp8_; + GdkPixbuf* _tmp3_; + GdkPixbuf* _tmp4_; PixbufCacheFetchJob* job = NULL; - GeeHashMap* _tmp9_; - Photo* _tmp10_; - gpointer _tmp11_; - PixbufCacheFetchJob* _tmp12_; - GdkPixbuf* _tmp22_ = NULL; - Photo* _tmp23_; - Scaling _tmp24_; - GdkPixbuf* _tmp25_; - GdkPixbuf* _tmp26_; - Photo* _tmp27_; - GdkPixbuf* _tmp28_; + GeeHashMap* _tmp5_; + gpointer _tmp6_; + PixbufCacheFetchJob* _tmp7_; + GdkPixbuf* _tmp17_ = NULL; + Scaling _tmp18_; + GdkPixbuf* _tmp19_; + GdkPixbuf* _tmp20_; + GdkPixbuf* _tmp21_; GError * _inner_error_ = NULL; #line 129 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (IS_PIXBUF_CACHE (self), NULL); #line 129 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); #line 130 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp0_ = photo; + _tmp0_ = photo_get_actual_file (photo); #line 130 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp1_ = photo_get_actual_file (_tmp0_); + _tmp1_ = _tmp0_; #line 130 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp2_ = _tmp1_; + _tmp2_ = !g_file_query_exists (_tmp1_, NULL); #line 130 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp3_ = g_file_query_exists (_tmp2_, NULL); + _g_object_unref0 (_tmp1_); #line 130 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp4_ = !_tmp3_; -#line 130 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _g_object_unref0 (_tmp2_); -#line 130 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (_tmp4_) { -#line 699 "PixbufCache.c" - Photo* _tmp5_; -#line 131 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp5_ = photo; + if (_tmp2_) { #line 131 "/home/jens/Source/shotwell/src/PixbufCache.vala" - pixbuf_cache_decache (self, _tmp5_); -#line 705 "PixbufCache.c" + pixbuf_cache_decache (self, photo); +#line 813 "PixbufCache.c" } #line 133 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp6_ = photo; + _tmp3_ = pixbuf_cache_get_cached (self, photo); #line 133 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp7_ = pixbuf_cache_get_cached (self, _tmp6_); -#line 133 "/home/jens/Source/shotwell/src/PixbufCache.vala" - pixbuf = _tmp7_; + pixbuf = _tmp3_; #line 134 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp8_ = pixbuf; + _tmp4_ = pixbuf; #line 134 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (_tmp8_ != NULL) { + if (_tmp4_ != NULL) { #line 139 "/home/jens/Source/shotwell/src/PixbufCache.vala" result = pixbuf; #line 139 "/home/jens/Source/shotwell/src/PixbufCache.vala" return result; -#line 721 "PixbufCache.c" +#line 827 "PixbufCache.c" } #line 142 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp9_ = self->priv->in_progress; -#line 142 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp10_ = photo; + _tmp5_ = self->priv->in_progress; #line 142 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp11_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_); + _tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo); #line 142 "/home/jens/Source/shotwell/src/PixbufCache.vala" - job = (PixbufCacheFetchJob*) _tmp11_; + job = (PixbufCacheFetchJob*) _tmp6_; #line 143 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp12_ = job; + _tmp7_ = job; #line 143 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (_tmp12_ != NULL) { -#line 735 "PixbufCache.c" - PixbufCacheFetchJob* _tmp13_; + if (_tmp7_ != NULL) { +#line 839 "PixbufCache.c" + PixbufCacheFetchJob* _tmp8_; + PixbufCacheFetchJob* _tmp9_; + GError* _tmp10_; PixbufCacheFetchJob* _tmp14_; - GError* _tmp15_; - PixbufCacheFetchJob* _tmp19_; - GdkPixbuf* _tmp20_; - GdkPixbuf* _tmp21_; + GdkPixbuf* _tmp15_; + GdkPixbuf* _tmp16_; #line 144 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp13_ = job; + _tmp8_ = job; #line 144 "/home/jens/Source/shotwell/src/PixbufCache.vala" - background_job_wait_for_completion (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_BACKGROUND_JOB, BackgroundJob)); + background_job_wait_for_completion (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 145 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp14_ = job; + _tmp9_ = job; #line 145 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp15_ = _tmp14_->err; + _tmp10_ = _tmp9_->err; #line 145 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (_tmp15_ != NULL) { -#line 752 "PixbufCache.c" - PixbufCacheFetchJob* _tmp16_; - GError* _tmp17_; - GError* _tmp18_; + if (_tmp10_ != NULL) { +#line 856 "PixbufCache.c" + PixbufCacheFetchJob* _tmp11_; + GError* _tmp12_; + GError* _tmp13_; #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp16_ = job; + _tmp11_ = job; #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp17_ = _tmp16_->err; + _tmp12_ = _tmp11_->err; #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp18_ = _g_error_copy0 (_tmp17_); + _tmp13_ = _g_error_copy0 (_tmp12_); #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _inner_error_ = _tmp18_; + _inner_error_ = _tmp13_; #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_propagate_error (error, _inner_error_); #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -768,32 +872,30 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error) _g_object_unref0 (pixbuf); #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala" return NULL; -#line 772 "PixbufCache.c" +#line 876 "PixbufCache.c" } #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp19_ = job; + _tmp14_ = job; #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp20_ = _tmp19_->pixbuf; + _tmp15_ = _tmp14_->pixbuf; #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp21_ = _g_object_ref0 (_tmp20_); + _tmp16_ = _g_object_ref0 (_tmp15_); #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala" - result = _tmp21_; + result = _tmp16_; #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala" _background_job_unref0 (job); #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (pixbuf); #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala" return result; -#line 788 "PixbufCache.c" +#line 892 "PixbufCache.c" } #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp23_ = photo; -#line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp24_ = self->priv->scaling; + _tmp18_ = self->priv->scaling; #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp25_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp24_, &_inner_error_); + _tmp19_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp18_, &_inner_error_); #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp22_ = _tmp25_; + _tmp17_ = _tmp19_; #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -804,472 +906,408 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error) _g_object_unref0 (pixbuf); #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala" return NULL; -#line 808 "PixbufCache.c" +#line 910 "PixbufCache.c" } #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp26_ = _tmp22_; + _tmp20_ = _tmp17_; #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp22_ = NULL; + _tmp17_ = NULL; #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (pixbuf); #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala" - pixbuf = _tmp26_; + pixbuf = _tmp20_; #line 157 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp27_ = photo; + _tmp21_ = pixbuf; #line 157 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp28_ = pixbuf; -#line 157 "/home/jens/Source/shotwell/src/PixbufCache.vala" - pixbuf_cache_encache (self, _tmp27_, _tmp28_); + pixbuf_cache_encache (self, photo, _tmp21_); #line 159 "/home/jens/Source/shotwell/src/PixbufCache.vala" result = pixbuf; #line 159 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _g_object_unref0 (_tmp22_); + _g_object_unref0 (_tmp17_); #line 159 "/home/jens/Source/shotwell/src/PixbufCache.vala" _background_job_unref0 (job); #line 159 "/home/jens/Source/shotwell/src/PixbufCache.vala" return result; -#line 832 "PixbufCache.c" +#line 932 "PixbufCache.c" } -void pixbuf_cache_drop (PixbufCache* self, Photo* photo) { - Photo* _tmp0_; - Photo* _tmp1_; +void +pixbuf_cache_drop (PixbufCache* self, + Photo* photo) +{ #line 165 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 165 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PHOTO (photo)); #line 166 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp0_ = photo; -#line 166 "/home/jens/Source/shotwell/src/PixbufCache.vala" - pixbuf_cache_cancel_prefetch (self, _tmp0_); + pixbuf_cache_cancel_prefetch (self, photo); #line 167 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp1_ = photo; -#line 167 "/home/jens/Source/shotwell/src/PixbufCache.vala" - pixbuf_cache_decache (self, _tmp1_); -#line 851 "PixbufCache.c" + pixbuf_cache_decache (self, photo); +#line 948 "PixbufCache.c" } -static void _pixbuf_cache_on_fetched_completion_callback (BackgroundJob* job, gpointer self) { +static void +_pixbuf_cache_on_fetched_completion_callback (BackgroundJob* job, + gpointer self) +{ #line 192 "/home/jens/Source/shotwell/src/PixbufCache.vala" pixbuf_cache_on_fetched ((PixbufCache*) self, job); -#line 858 "PixbufCache.c" +#line 958 "PixbufCache.c" } -void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPriority priority, gboolean force) { - Photo* _tmp0_; +void +pixbuf_cache_prefetch (PixbufCache* self, + Photo* photo, + BackgroundJobJobPriority priority, + gboolean force) +{ + GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; + gboolean _tmp2_; + gboolean _tmp3_ = FALSE; + GeeHashMap* _tmp5_; gboolean _tmp6_ = FALSE; - gboolean _tmp7_; - GeeHashMap* _tmp12_; - Photo* _tmp13_; - gboolean _tmp14_; - gboolean _tmp15_ = FALSE; - PixbufCacheCacheFilter _tmp16_; - void* _tmp16__target; + PixbufCacheCacheFilter _tmp7_; + void* _tmp7__target; PixbufCacheFetchJob* job = NULL; - PixbufCachePhotoType _tmp20_; - GeeHashMap* _tmp30_; - Photo* _tmp31_; - PixbufCacheFetchJob* _tmp32_; - Workers* _tmp33_; - PixbufCacheFetchJob* _tmp34_; + PixbufCachePhotoType _tmp9_; + GeeHashMap* _tmp15_; + PixbufCacheFetchJob* _tmp16_; + Workers* _tmp17_; + PixbufCacheFetchJob* _tmp18_; #line 172 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 172 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PHOTO (photo)); #line 174 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp0_ = photo; -#line 174 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp1_ = photo_get_actual_file (_tmp0_); -#line 174 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp2_ = _tmp1_; + _tmp0_ = photo_get_actual_file (photo); #line 174 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp3_ = g_file_query_exists (_tmp2_, NULL); + _tmp1_ = _tmp0_; #line 174 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp4_ = !_tmp3_; + _tmp2_ = !g_file_query_exists (_tmp1_, NULL); #line 174 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 174 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (_tmp4_) { -#line 901 "PixbufCache.c" - Photo* _tmp5_; + if (_tmp2_) { #line 175 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp5_ = photo; -#line 175 "/home/jens/Source/shotwell/src/PixbufCache.vala" - pixbuf_cache_decache (self, _tmp5_); -#line 907 "PixbufCache.c" + pixbuf_cache_decache (self, photo); +#line 998 "PixbufCache.c" } #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp7_ = force; -#line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (!_tmp7_) { -#line 913 "PixbufCache.c" - GeeHashMap* _tmp8_; - Photo* _tmp9_; - gboolean _tmp10_; -#line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp8_ = self->priv->cache; -#line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp9_ = photo; + if (!force) { +#line 1002 "PixbufCache.c" + GeeHashMap* _tmp4_; #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp10_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_); + _tmp4_ = self->priv->cache; #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp6_ = _tmp10_; -#line 925 "PixbufCache.c" + _tmp3_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo); +#line 1008 "PixbufCache.c" } else { #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp6_ = FALSE; -#line 929 "PixbufCache.c" + _tmp3_ = FALSE; +#line 1012 "PixbufCache.c" } #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (_tmp6_) { -#line 933 "PixbufCache.c" - Photo* _tmp11_; + if (_tmp3_) { #line 178 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp11_ = photo; -#line 178 "/home/jens/Source/shotwell/src/PixbufCache.vala" - pixbuf_cache_prioritize (self, _tmp11_); + pixbuf_cache_prioritize (self, photo); #line 180 "/home/jens/Source/shotwell/src/PixbufCache.vala" return; -#line 941 "PixbufCache.c" +#line 1020 "PixbufCache.c" } #line 183 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp12_ = self->priv->in_progress; + _tmp5_ = self->priv->in_progress; #line 183 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp13_ = photo; -#line 183 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp14_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_); -#line 183 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (_tmp14_) { + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo)) { #line 184 "/home/jens/Source/shotwell/src/PixbufCache.vala" return; -#line 953 "PixbufCache.c" +#line 1028 "PixbufCache.c" } #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp16_ = self->priv->filter; -#line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp16__target = self->priv->filter_target; + _tmp7_ = self->priv->filter; #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (_tmp16_ != NULL) { -#line 961 "PixbufCache.c" - PixbufCacheCacheFilter _tmp17_; - void* _tmp17__target; - Photo* _tmp18_; - gboolean _tmp19_; + _tmp7__target = self->priv->filter_target; #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp17_ = self->priv->filter; + if (_tmp7_ != NULL) { +#line 1036 "PixbufCache.c" + PixbufCacheCacheFilter _tmp8_; + void* _tmp8__target; #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp17__target = self->priv->filter_target; + _tmp8_ = self->priv->filter; #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp18_ = photo; + _tmp8__target = self->priv->filter_target; #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp19_ = _tmp17_ (_tmp18_, _tmp17__target); -#line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp15_ = !_tmp19_; -#line 976 "PixbufCache.c" + _tmp6_ = !_tmp8_ (photo, _tmp8__target); +#line 1045 "PixbufCache.c" } else { #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp15_ = FALSE; -#line 980 "PixbufCache.c" + _tmp6_ = FALSE; +#line 1049 "PixbufCache.c" } #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (_tmp15_) { + if (_tmp6_) { #line 187 "/home/jens/Source/shotwell/src/PixbufCache.vala" return; -#line 986 "PixbufCache.c" +#line 1055 "PixbufCache.c" } #line 189 "/home/jens/Source/shotwell/src/PixbufCache.vala" job = NULL; #line 190 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp20_ = self->priv->type; + _tmp9_ = self->priv->type; #line 190 "/home/jens/Source/shotwell/src/PixbufCache.vala" - switch (_tmp20_) { + switch (_tmp9_) { #line 190 "/home/jens/Source/shotwell/src/PixbufCache.vala" case PIXBUF_CACHE_PHOTO_TYPE_BASELINE: -#line 996 "PixbufCache.c" +#line 1065 "PixbufCache.c" { - BackgroundJobJobPriority _tmp21_; - Photo* _tmp22_; - Scaling _tmp23_; - PixbufCacheBaselineFetchJob* _tmp24_; + Scaling _tmp10_; + PixbufCacheBaselineFetchJob* _tmp11_; #line 192 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp21_ = priority; + _tmp10_ = self->priv->scaling; #line 192 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp22_ = photo; -#line 192 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp23_ = self->priv->scaling; -#line 192 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp24_ = pixbuf_cache_baseline_fetch_job_new (self, _tmp21_, _tmp22_, &_tmp23_, _pixbuf_cache_on_fetched_completion_callback, self); + _tmp11_ = pixbuf_cache_baseline_fetch_job_new (self, priority, photo, &_tmp10_, _pixbuf_cache_on_fetched_completion_callback, self); #line 192 "/home/jens/Source/shotwell/src/PixbufCache.vala" _background_job_unref0 (job); #line 192 "/home/jens/Source/shotwell/src/PixbufCache.vala" - job = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob); + job = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob); #line 193 "/home/jens/Source/shotwell/src/PixbufCache.vala" break; -#line 1016 "PixbufCache.c" +#line 1079 "PixbufCache.c" } #line 190 "/home/jens/Source/shotwell/src/PixbufCache.vala" case PIXBUF_CACHE_PHOTO_TYPE_MASTER: -#line 1020 "PixbufCache.c" +#line 1083 "PixbufCache.c" { - BackgroundJobJobPriority _tmp25_; - Photo* _tmp26_; - Scaling _tmp27_; - PixbufCacheMasterFetchJob* _tmp28_; + Scaling _tmp12_; + PixbufCacheMasterFetchJob* _tmp13_; #line 196 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp25_ = priority; + _tmp12_ = self->priv->scaling; #line 196 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp26_ = photo; -#line 196 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp27_ = self->priv->scaling; -#line 196 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp28_ = pixbuf_cache_master_fetch_job_new (self, _tmp25_, _tmp26_, &_tmp27_, _pixbuf_cache_on_fetched_completion_callback, self); + _tmp13_ = pixbuf_cache_master_fetch_job_new (self, priority, photo, &_tmp12_, _pixbuf_cache_on_fetched_completion_callback, self); #line 196 "/home/jens/Source/shotwell/src/PixbufCache.vala" _background_job_unref0 (job); #line 196 "/home/jens/Source/shotwell/src/PixbufCache.vala" - job = G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob); + job = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob); #line 197 "/home/jens/Source/shotwell/src/PixbufCache.vala" break; -#line 1040 "PixbufCache.c" +#line 1097 "PixbufCache.c" } default: { - PixbufCachePhotoType _tmp29_; + PixbufCachePhotoType _tmp14_; #line 200 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp29_ = self->priv->type; + _tmp14_ = self->priv->type; #line 200 "/home/jens/Source/shotwell/src/PixbufCache.vala" - g_error ("PixbufCache.vala:200: Unknown photo type: %d", (gint) _tmp29_); -#line 1049 "PixbufCache.c" + g_error ("PixbufCache.vala:200: Unknown photo type: %d", (gint) _tmp14_); +#line 1106 "PixbufCache.c" } } #line 203 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp30_ = self->priv->in_progress; -#line 203 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp31_ = photo; + _tmp15_ = self->priv->in_progress; #line 203 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp32_ = job; + _tmp16_ = job; #line 203 "/home/jens/Source/shotwell/src/PixbufCache.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp31_, _tmp32_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo, _tmp16_); #line 205 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp33_ = pixbuf_cache_background_workers; + _tmp17_ = pixbuf_cache_background_workers; #line 205 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp34_ = job; + _tmp18_ = job; #line 205 "/home/jens/Source/shotwell/src/PixbufCache.vala" - workers_enqueue (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_BACKGROUND_JOB, BackgroundJob)); + workers_enqueue (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 172 "/home/jens/Source/shotwell/src/PixbufCache.vala" _background_job_unref0 (job); -#line 1068 "PixbufCache.c" +#line 1123 "PixbufCache.c" } -void pixbuf_cache_prefetch_many (PixbufCache* self, GeeCollection* photos, BackgroundJobJobPriority priority, gboolean force) { +void +pixbuf_cache_prefetch_many (PixbufCache* self, + GeeCollection* photos, + BackgroundJobJobPriority priority, + gboolean force) +{ #line 210 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 210 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (GEE_IS_COLLECTION (photos)); -#line 1077 "PixbufCache.c" +#line 1137 "PixbufCache.c" { GeeIterator* _photo_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp0_ = photos; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_ITERABLE, GeeIterable)); #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _photo_it = _tmp1_; + _photo_it = _tmp0_; #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" while (TRUE) { -#line 1090 "PixbufCache.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 1147 "PixbufCache.c" + GeeIterator* _tmp1_; Photo* photo = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - Photo* _tmp6_; - BackgroundJobJobPriority _tmp7_; - gboolean _tmp8_; -#line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp2_ = _photo_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + Photo* _tmp4_; #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _photo_it; #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" break; -#line 1107 "PixbufCache.c" +#line 1159 "PixbufCache.c" } #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp4_ = _photo_it; + _tmp2_ = _photo_it; #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" - photo = (Photo*) _tmp5_; + photo = (Photo*) _tmp3_; #line 213 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp6_ = photo; + _tmp4_ = photo; #line 213 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp7_ = priority; -#line 213 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp8_ = force; -#line 213 "/home/jens/Source/shotwell/src/PixbufCache.vala" - pixbuf_cache_prefetch (self, _tmp6_, _tmp7_, _tmp8_); + pixbuf_cache_prefetch (self, _tmp4_, priority, force); #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (photo); -#line 1125 "PixbufCache.c" +#line 1173 "PixbufCache.c" } #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (_photo_it); -#line 1129 "PixbufCache.c" +#line 1177 "PixbufCache.c" } } -void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch* batch, gboolean force) { +void +pixbuf_cache_prefetch_batch (PixbufCache* self, + PixbufCachePixbufCacheBatch* batch, + gboolean force) +{ #line 217 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 217 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (PIXBUF_CACHE_IS_PIXBUF_CACHE_BATCH (batch)); -#line 1139 "PixbufCache.c" +#line 1191 "PixbufCache.c" { GeeIterator* _priority_it = NULL; - PixbufCachePixbufCacheBatch* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; - GeeSet* _tmp2_; + GeeIterator* _tmp2_; GeeIterator* _tmp3_; - GeeIterator* _tmp4_; #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp0_ = batch; + _tmp0_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (batch, GEE_TYPE_MULTI_MAP, GeeMultiMap)); #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp1_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap)); + _tmp1_ = _tmp0_; #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp2_ = _tmp1_; + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _priority_it = _tmp4_; + _priority_it = _tmp3_; #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" while (TRUE) { -#line 1163 "PixbufCache.c" - GeeIterator* _tmp5_; - gboolean _tmp6_; +#line 1212 "PixbufCache.c" + GeeIterator* _tmp4_; BackgroundJobJobPriority priority = 0; - GeeIterator* _tmp7_; - gpointer _tmp8_; -#line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp5_ = _priority_it; + GeeIterator* _tmp5_; + gpointer _tmp6_; #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp6_ = gee_iterator_next (_tmp5_); + _tmp4_ = _priority_it; #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp4_)) { #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" break; -#line 1177 "PixbufCache.c" +#line 1223 "PixbufCache.c" } #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp7_ = _priority_it; + _tmp5_ = _priority_it; #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" - priority = (BackgroundJobJobPriority) ((gintptr) _tmp8_); -#line 1185 "PixbufCache.c" + priority = (BackgroundJobJobPriority) ((gintptr) _tmp6_); +#line 1231 "PixbufCache.c" { GeeIterator* _photo_it = NULL; - PixbufCachePixbufCacheBatch* _tmp9_; - BackgroundJobJobPriority _tmp10_; - GeeCollection* _tmp11_; - GeeCollection* _tmp12_; - GeeIterator* _tmp13_; - GeeIterator* _tmp14_; -#line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp9_ = batch; + BackgroundJobJobPriority _tmp7_; + GeeCollection* _tmp8_; + GeeCollection* _tmp9_; + GeeIterator* _tmp10_; + GeeIterator* _tmp11_; #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp10_ = priority; + _tmp7_ = priority; #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp11_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) _tmp10_)); + _tmp8_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (batch, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) _tmp7_)); #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp12_ = _tmp11_; + _tmp9_ = _tmp8_; #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp14_ = _tmp13_; + _tmp11_ = _tmp10_; #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp9_); #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _photo_it = _tmp14_; + _photo_it = _tmp11_; #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" while (TRUE) { -#line 1212 "PixbufCache.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 1255 "PixbufCache.c" + GeeIterator* _tmp12_; Photo* photo = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; - Photo* _tmp19_; - BackgroundJobJobPriority _tmp20_; - gboolean _tmp21_; -#line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp15_ = _photo_it; + GeeIterator* _tmp13_; + gpointer _tmp14_; + Photo* _tmp15_; + BackgroundJobJobPriority _tmp16_; #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp16_ = gee_iterator_next (_tmp15_); + _tmp12_ = _photo_it; #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp12_)) { #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" break; -#line 1229 "PixbufCache.c" +#line 1268 "PixbufCache.c" } #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp17_ = _photo_it; + _tmp13_ = _photo_it; #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp14_ = gee_iterator_get (_tmp13_); #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" - photo = (Photo*) _tmp18_; -#line 220 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp19_ = photo; + photo = (Photo*) _tmp14_; #line 220 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp20_ = priority; + _tmp15_ = photo; #line 220 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp21_ = force; + _tmp16_ = priority; #line 220 "/home/jens/Source/shotwell/src/PixbufCache.vala" - pixbuf_cache_prefetch (self, _tmp19_, _tmp20_, _tmp21_); + pixbuf_cache_prefetch (self, _tmp15_, _tmp16_, force); #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (photo); -#line 1247 "PixbufCache.c" +#line 1284 "PixbufCache.c" } #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (_photo_it); -#line 1251 "PixbufCache.c" +#line 1288 "PixbufCache.c" } } #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (_priority_it); -#line 1256 "PixbufCache.c" +#line 1293 "PixbufCache.c" } } -gboolean pixbuf_cache_cancel_prefetch (PixbufCache* self, Photo* photo) { +gboolean +pixbuf_cache_cancel_prefetch (PixbufCache* self, + Photo* photo) +{ gboolean result = FALSE; PixbufCacheFetchJob* job = NULL; GeeHashMap* _tmp0_; - Photo* _tmp1_; - gpointer _tmp2_; - PixbufCacheFetchJob* _tmp3_; + gpointer _tmp1_; + PixbufCacheFetchJob* _tmp2_; gboolean removed = FALSE; - GeeHashMap* _tmp4_; - Photo* _tmp5_; - gboolean _tmp6_; - gboolean _tmp7_; - PixbufCacheFetchJob* _tmp8_; + GeeHashMap* _tmp3_; + gboolean _tmp4_; + gboolean _tmp5_; + PixbufCacheFetchJob* _tmp6_; #line 224 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (IS_PIXBUF_CACHE (self), FALSE); #line 224 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1277,54 +1315,52 @@ gboolean pixbuf_cache_cancel_prefetch (PixbufCache* self, Photo* photo) { #line 225 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp0_ = self->priv->in_progress; #line 225 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp1_ = photo; -#line 225 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo); #line 225 "/home/jens/Source/shotwell/src/PixbufCache.vala" - job = (PixbufCacheFetchJob*) _tmp2_; + job = (PixbufCacheFetchJob*) _tmp1_; #line 226 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp3_ = job; + _tmp2_ = job; #line 226 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 227 "/home/jens/Source/shotwell/src/PixbufCache.vala" result = FALSE; #line 227 "/home/jens/Source/shotwell/src/PixbufCache.vala" _background_job_unref0 (job); #line 227 "/home/jens/Source/shotwell/src/PixbufCache.vala" return result; -#line 1296 "PixbufCache.c" +#line 1332 "PixbufCache.c" } #line 230 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp4_ = self->priv->in_progress; + _tmp3_ = self->priv->in_progress; #line 230 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp5_ = photo; + _tmp4_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo, NULL); #line 230 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp6_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, NULL); -#line 230 "/home/jens/Source/shotwell/src/PixbufCache.vala" - removed = _tmp6_; + removed = _tmp4_; #line 231 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp7_ = removed; + _tmp5_ = removed; #line 231 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _vala_assert (_tmp7_, "removed"); + _vala_assert (_tmp5_, "removed"); #line 233 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp8_ = job; + _tmp6_ = job; #line 233 "/home/jens/Source/shotwell/src/PixbufCache.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_BACKGROUND_JOB, BackgroundJob)); + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 239 "/home/jens/Source/shotwell/src/PixbufCache.vala" result = TRUE; #line 239 "/home/jens/Source/shotwell/src/PixbufCache.vala" _background_job_unref0 (job); #line 239 "/home/jens/Source/shotwell/src/PixbufCache.vala" return result; -#line 1320 "PixbufCache.c" +#line 1354 "PixbufCache.c" } -void pixbuf_cache_cancel_all (PixbufCache* self) { - GeeHashMap* _tmp11_; +void +pixbuf_cache_cancel_all (PixbufCache* self) +{ + GeeHashMap* _tmp10_; #line 242 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PIXBUF_CACHE (self)); -#line 1328 "PixbufCache.c" +#line 1364 "PixbufCache.c" { GeeIterator* _job_it = NULL; GeeHashMap* _tmp0_; @@ -1351,428 +1387,411 @@ void pixbuf_cache_cancel_all (PixbufCache* self) { _job_it = _tmp5_; #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala" while (TRUE) { -#line 1355 "PixbufCache.c" +#line 1391 "PixbufCache.c" GeeIterator* _tmp6_; - gboolean _tmp7_; PixbufCacheFetchJob* job = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - PixbufCacheFetchJob* _tmp10_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + PixbufCacheFetchJob* _tmp9_; #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp6_ = _job_it; #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala" break; -#line 1370 "PixbufCache.c" +#line 1403 "PixbufCache.c" } #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp8_ = _job_it; + _tmp7_ = _job_it; #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala" - job = (PixbufCacheFetchJob*) _tmp9_; + job = (PixbufCacheFetchJob*) _tmp8_; #line 247 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp10_ = job; + _tmp9_ = job; #line 247 "/home/jens/Source/shotwell/src/PixbufCache.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_BACKGROUND_JOB, BackgroundJob)); + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala" _background_job_unref0 (job); -#line 1384 "PixbufCache.c" +#line 1417 "PixbufCache.c" } #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (_job_it); -#line 1388 "PixbufCache.c" +#line 1421 "PixbufCache.c" } #line 249 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp11_ = self->priv->in_progress; + _tmp10_ = self->priv->in_progress; #line 249 "/home/jens/Source/shotwell/src/PixbufCache.vala" - gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); -#line 1394 "PixbufCache.c" + gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); +#line 1427 "PixbufCache.c" } -static gpointer _background_job_ref0 (gpointer self) { +static gpointer +_background_job_ref0 (gpointer self) +{ #line 253 "/home/jens/Source/shotwell/src/PixbufCache.vala" return self ? background_job_ref (self) : NULL; -#line 1401 "PixbufCache.c" +#line 1436 "PixbufCache.c" } -static void pixbuf_cache_on_fetched (PixbufCache* self, BackgroundJob* j) { +static void +pixbuf_cache_on_fetched (PixbufCache* self, + BackgroundJob* j) +{ PixbufCacheFetchJob* job = NULL; - BackgroundJob* _tmp0_; - PixbufCacheFetchJob* _tmp1_; - GeeHashMap* _tmp2_; - PixbufCacheFetchJob* _tmp3_; - Photo* _tmp4_; - PixbufCacheFetchJob* _tmp5_; - GError* _tmp6_; - PixbufCacheFetchJob* _tmp20_; - Photo* _tmp21_; - PixbufCacheFetchJob* _tmp22_; - GdkPixbuf* _tmp23_; - PixbufCacheFetchJob* _tmp24_; - Photo* _tmp25_; - PixbufCacheFetchJob* _tmp26_; - GdkPixbuf* _tmp27_; + PixbufCacheFetchJob* _tmp0_; + GeeHashMap* _tmp1_; + PixbufCacheFetchJob* _tmp2_; + Photo* _tmp3_; + PixbufCacheFetchJob* _tmp4_; + GError* _tmp5_; + PixbufCacheFetchJob* _tmp19_; + Photo* _tmp20_; + PixbufCacheFetchJob* _tmp21_; + GdkPixbuf* _tmp22_; + PixbufCacheFetchJob* _tmp23_; + Photo* _tmp24_; + PixbufCacheFetchJob* _tmp25_; + GdkPixbuf* _tmp26_; #line 252 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 252 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_BACKGROUND_JOB (j)); #line 253 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp0_ = j; -#line 253 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)); + _tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)); #line 253 "/home/jens/Source/shotwell/src/PixbufCache.vala" - job = _tmp1_; + job = _tmp0_; #line 257 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp2_ = self->priv->in_progress; + _tmp1_ = self->priv->in_progress; #line 257 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp3_ = job; + _tmp2_ = job; #line 257 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp4_ = _tmp3_->photo; + _tmp3_ = _tmp2_->photo; #line 257 "/home/jens/Source/shotwell/src/PixbufCache.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, NULL); #line 259 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp5_ = job; + _tmp4_ = job; #line 259 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp6_ = _tmp5_->err; + _tmp5_ = _tmp4_->err; #line 259 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (_tmp6_ != NULL) { -#line 1446 "PixbufCache.c" - PixbufCacheFetchJob* _tmp7_; - GdkPixbuf* _tmp8_; - PixbufCacheFetchJob* _tmp9_; - Photo* _tmp10_; + if (_tmp5_ != NULL) { +#line 1481 "PixbufCache.c" + PixbufCacheFetchJob* _tmp6_; + GdkPixbuf* _tmp7_; + PixbufCacheFetchJob* _tmp8_; + Photo* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; - PixbufCacheFetchJob* _tmp13_; - GError* _tmp14_; - const gchar* _tmp15_; - PixbufCacheFetchJob* _tmp16_; - Photo* _tmp17_; - PixbufCacheFetchJob* _tmp18_; - GError* _tmp19_; + PixbufCacheFetchJob* _tmp12_; + GError* _tmp13_; + const gchar* _tmp14_; + PixbufCacheFetchJob* _tmp15_; + Photo* _tmp16_; + PixbufCacheFetchJob* _tmp17_; + GError* _tmp18_; #line 260 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp7_ = job; + _tmp6_ = job; #line 260 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp8_ = _tmp7_->pixbuf; + _tmp7_ = _tmp6_->pixbuf; #line 260 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _vala_assert (_tmp8_ == NULL, "job.pixbuf == null"); + _vala_assert (_tmp7_ == NULL, "job.pixbuf == null"); #line 262 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp9_ = job; + _tmp8_ = job; #line 262 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp10_ = _tmp9_->photo; + _tmp9_ = _tmp8_->photo; #line 262 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); + _tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); #line 262 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 262 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp13_ = job; + _tmp12_ = job; #line 262 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp14_ = _tmp13_->err; + _tmp13_ = _tmp12_->err; #line 262 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp15_ = _tmp14_->message; + _tmp14_ = _tmp13_->message; #line 262 "/home/jens/Source/shotwell/src/PixbufCache.vala" - g_critical ("PixbufCache.vala:262: Unable to readahead %s: %s", _tmp12_, _tmp15_); + g_critical ("PixbufCache.vala:262: Unable to readahead %s: %s", _tmp11_, _tmp14_); #line 262 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp11_); #line 263 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp16_ = job; + _tmp15_ = job; #line 263 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp17_ = _tmp16_->photo; + _tmp16_ = _tmp15_->photo; #line 263 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp18_ = job; + _tmp17_ = job; #line 263 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp19_ = _tmp18_->err; + _tmp18_ = _tmp17_->err; #line 263 "/home/jens/Source/shotwell/src/PixbufCache.vala" - g_signal_emit (self, pixbuf_cache_signals[PIXBUF_CACHE_FETCHED_SIGNAL], 0, _tmp17_, NULL, _tmp19_); + g_signal_emit (self, pixbuf_cache_signals[PIXBUF_CACHE_FETCHED_SIGNAL], 0, _tmp16_, NULL, _tmp18_); #line 265 "/home/jens/Source/shotwell/src/PixbufCache.vala" _background_job_unref0 (job); #line 265 "/home/jens/Source/shotwell/src/PixbufCache.vala" return; -#line 1498 "PixbufCache.c" +#line 1533 "PixbufCache.c" } #line 272 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp20_ = job; + _tmp19_ = job; #line 272 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp21_ = _tmp20_->photo; + _tmp20_ = _tmp19_->photo; #line 272 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp22_ = job; + _tmp21_ = job; #line 272 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp23_ = _tmp22_->pixbuf; + _tmp22_ = _tmp21_->pixbuf; #line 272 "/home/jens/Source/shotwell/src/PixbufCache.vala" - pixbuf_cache_encache (self, _tmp21_, _tmp23_); + pixbuf_cache_encache (self, _tmp20_, _tmp22_); #line 275 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp24_ = job; + _tmp23_ = job; #line 275 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp25_ = _tmp24_->photo; + _tmp24_ = _tmp23_->photo; #line 275 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp26_ = job; + _tmp25_ = job; #line 275 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp27_ = _tmp26_->pixbuf; + _tmp26_ = _tmp25_->pixbuf; #line 275 "/home/jens/Source/shotwell/src/PixbufCache.vala" - g_signal_emit (self, pixbuf_cache_signals[PIXBUF_CACHE_FETCHED_SIGNAL], 0, _tmp25_, _tmp27_, NULL); + g_signal_emit (self, pixbuf_cache_signals[PIXBUF_CACHE_FETCHED_SIGNAL], 0, _tmp24_, _tmp26_, NULL); #line 252 "/home/jens/Source/shotwell/src/PixbufCache.vala" _background_job_unref0 (job); -#line 1522 "PixbufCache.c" +#line 1557 "PixbufCache.c" } -static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) { +static void +pixbuf_cache_on_sources_altered (PixbufCache* self, + GeeMap* map) +{ #line 278 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 278 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (GEE_IS_MAP (map)); -#line 1531 "PixbufCache.c" +#line 1569 "PixbufCache.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp0_ = map; + _tmp0_ = gee_map_get_keys (map); #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp2_ = _tmp1_; #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp3_ = _tmp2_; -#line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" while (TRUE) { -#line 1558 "PixbufCache.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 1593 "PixbufCache.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; + GeeIterator* _tmp6_; + gpointer _tmp7_; + DataObject* _tmp8_; gpointer _tmp9_; - GeeMap* _tmp10_; - DataObject* _tmp11_; - gpointer _tmp12_; - Alteration* _tmp13_; - gboolean _tmp14_; - gboolean _tmp15_; + Alteration* _tmp10_; + gboolean _tmp11_; Photo* photo = NULL; - DataObject* _tmp16_; - Photo* _tmp17_; - GeeHashMap* _tmp18_; - Photo* _tmp19_; - gboolean _tmp20_; - Photo* _tmp30_; - Photo* _tmp31_; -#line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp6_ = _object_it; + DataObject* _tmp12_; + Photo* _tmp13_; + GeeHashMap* _tmp14_; + Photo* _tmp15_; + Photo* _tmp24_; + Photo* _tmp25_; #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" break; -#line 1586 "PixbufCache.c" +#line 1615 "PixbufCache.c" } #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" - object = (DataObject*) _tmp9_; -#line 280 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp10_ = map; -#line 280 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp11_ = object; + object = (DataObject*) _tmp7_; #line 280 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp12_ = gee_map_get (_tmp10_, _tmp11_); + _tmp8_ = object; #line 280 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp13_ = (Alteration*) _tmp12_; + _tmp9_ = gee_map_get (map, _tmp8_); #line 280 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp14_ = alteration_has_subject (_tmp13_, "image"); + _tmp10_ = (Alteration*) _tmp9_; #line 280 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp15_ = !_tmp14_; + _tmp11_ = !alteration_has_subject (_tmp10_, "image"); #line 280 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _alteration_unref0 (_tmp13_); + _alteration_unref0 (_tmp10_); #line 280 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (_tmp15_) { + if (_tmp11_) { #line 281 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (object); #line 281 "/home/jens/Source/shotwell/src/PixbufCache.vala" continue; -#line 1614 "PixbufCache.c" +#line 1639 "PixbufCache.c" } #line 283 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp16_ = object; + _tmp12_ = object; #line 283 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO, Photo)); + _tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO, Photo)); #line 283 "/home/jens/Source/shotwell/src/PixbufCache.vala" - photo = _tmp17_; + photo = _tmp13_; #line 285 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp18_ = self->priv->in_progress; + _tmp14_ = self->priv->in_progress; #line 285 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp19_ = photo; + _tmp15_ = photo; #line 285 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp20_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp19_); -#line 285 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (_tmp20_) { -#line 1630 "PixbufCache.c" - GeeHashMap* _tmp21_; - Photo* _tmp22_; - gpointer _tmp23_; - PixbufCacheFetchJob* _tmp24_; - GeeHashMap* _tmp25_; - Photo* _tmp26_; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_)) { +#line 1653 "PixbufCache.c" + GeeHashMap* _tmp16_; + Photo* _tmp17_; + gpointer _tmp18_; + PixbufCacheFetchJob* _tmp19_; + GeeHashMap* _tmp20_; + Photo* _tmp21_; #line 288 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp21_ = self->priv->in_progress; + _tmp16_ = self->priv->in_progress; #line 288 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp22_ = photo; + _tmp17_ = photo; #line 288 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp23_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_); + _tmp18_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_); #line 288 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp24_ = (PixbufCacheFetchJob*) _tmp23_; + _tmp19_ = (PixbufCacheFetchJob*) _tmp18_; #line 288 "/home/jens/Source/shotwell/src/PixbufCache.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_BACKGROUND_JOB, BackgroundJob)); + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 288 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _background_job_unref0 (_tmp24_); + _background_job_unref0 (_tmp19_); #line 289 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp25_ = self->priv->in_progress; + _tmp20_ = self->priv->in_progress; #line 289 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp26_ = photo; + _tmp21_ = photo; #line 289 "/home/jens/Source/shotwell/src/PixbufCache.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp26_, NULL); -#line 1655 "PixbufCache.c" + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp21_, NULL); +#line 1678 "PixbufCache.c" } else { - GeeHashMap* _tmp27_; - Photo* _tmp28_; - gboolean _tmp29_; -#line 290 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp27_ = self->priv->cache; + GeeHashMap* _tmp22_; + Photo* _tmp23_; #line 290 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp28_ = photo; + _tmp22_ = self->priv->cache; #line 290 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp29_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp28_); + _tmp23_ = photo; #line 290 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (!_tmp29_) { + if (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp23_)) { #line 291 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (photo); #line 291 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (object); #line 291 "/home/jens/Source/shotwell/src/PixbufCache.vala" continue; -#line 1674 "PixbufCache.c" +#line 1694 "PixbufCache.c" } } #line 294 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp30_ = photo; + _tmp24_ = photo; #line 294 "/home/jens/Source/shotwell/src/PixbufCache.vala" - pixbuf_cache_decache (self, _tmp30_); + pixbuf_cache_decache (self, _tmp24_); #line 301 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp31_ = photo; + _tmp25_ = photo; #line 301 "/home/jens/Source/shotwell/src/PixbufCache.vala" - pixbuf_cache_prefetch (self, _tmp31_, BACKGROUND_JOB_JOB_PRIORITY_HIGH, FALSE); + pixbuf_cache_prefetch (self, _tmp25_, BACKGROUND_JOB_JOB_PRIORITY_HIGH, FALSE); #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (photo); #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (object); -#line 1689 "PixbufCache.c" +#line 1709 "PixbufCache.c" } #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (_object_it); -#line 1693 "PixbufCache.c" +#line 1713 "PixbufCache.c" } } -static void pixbuf_cache_on_sources_removed (PixbufCache* self, GeeIterable* removed) { +static void +pixbuf_cache_on_sources_removed (PixbufCache* self, + GeeIterable* removed) +{ #line 305 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 305 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); -#line 1703 "PixbufCache.c" +#line 1726 "PixbufCache.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; -#line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp0_ = removed; + GeeIterator* _tmp0_; #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); + _tmp0_ = gee_iterable_iterator (removed); #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" while (TRUE) { -#line 1716 "PixbufCache.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 1736 "PixbufCache.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; Photo* photo = NULL; - DataObject* _tmp6_; + DataObject* _tmp4_; + Photo* _tmp5_; + Photo* _tmp6_; Photo* _tmp7_; - Photo* _tmp8_; - Photo* _tmp9_; -#line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp2_ = _object_it; #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" break; -#line 1735 "PixbufCache.c" +#line 1752 "PixbufCache.c" } #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 307 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp6_ = object; + _tmp4_ = object; #line 307 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_PHOTO) ? ((Photo*) _tmp6_) : NULL); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_PHOTO) ? ((Photo*) _tmp4_) : NULL); #line 307 "/home/jens/Source/shotwell/src/PixbufCache.vala" - photo = _tmp7_; + photo = _tmp5_; #line 308 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp8_ = photo; + _tmp6_ = photo; #line 308 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _vala_assert (_tmp8_ != NULL, "photo != null"); + _vala_assert (_tmp6_ != NULL, "photo != null"); #line 310 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp9_ = photo; + _tmp7_ = photo; #line 310 "/home/jens/Source/shotwell/src/PixbufCache.vala" - pixbuf_cache_decache (self, _tmp9_); + pixbuf_cache_decache (self, _tmp7_); #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (photo); #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (object); -#line 1761 "PixbufCache.c" +#line 1778 "PixbufCache.c" } #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (_object_it); -#line 1765 "PixbufCache.c" +#line 1782 "PixbufCache.c" } } -static GdkPixbuf* pixbuf_cache_get_cached (PixbufCache* self, Photo* photo) { +static GdkPixbuf* +pixbuf_cache_get_cached (PixbufCache* self, + Photo* photo) +{ GdkPixbuf* result = NULL; GdkPixbuf* pixbuf = NULL; GeeHashMap* _tmp0_; - Photo* _tmp1_; - gpointer _tmp2_; - GdkPixbuf* _tmp3_; + gpointer _tmp1_; + GdkPixbuf* _tmp2_; #line 314 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (IS_PIXBUF_CACHE (self), NULL); #line 314 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1780,38 +1799,33 @@ static GdkPixbuf* pixbuf_cache_get_cached (PixbufCache* self, Photo* photo) { #line 315 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp0_ = self->priv->cache; #line 315 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp1_ = photo; -#line 315 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo); #line 315 "/home/jens/Source/shotwell/src/PixbufCache.vala" - pixbuf = (GdkPixbuf*) _tmp2_; + pixbuf = (GdkPixbuf*) _tmp1_; #line 316 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp3_ = pixbuf; + _tmp2_ = pixbuf; #line 316 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (_tmp3_ != NULL) { -#line 1793 "PixbufCache.c" - Photo* _tmp4_; + if (_tmp2_ != NULL) { #line 317 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp4_ = photo; -#line 317 "/home/jens/Source/shotwell/src/PixbufCache.vala" - pixbuf_cache_prioritize (self, _tmp4_); -#line 1799 "PixbufCache.c" + pixbuf_cache_prioritize (self, photo); +#line 1812 "PixbufCache.c" } #line 319 "/home/jens/Source/shotwell/src/PixbufCache.vala" result = pixbuf; #line 319 "/home/jens/Source/shotwell/src/PixbufCache.vala" return result; -#line 1805 "PixbufCache.c" +#line 1818 "PixbufCache.c" } -static void pixbuf_cache_prioritize (PixbufCache* self, Photo* photo) { +static void +pixbuf_cache_prioritize (PixbufCache* self, + Photo* photo) +{ gint index = 0; GeeArrayList* _tmp0_; - Photo* _tmp1_; + gint _tmp1_; gint _tmp2_; - gint _tmp3_; - gint _tmp4_; #line 323 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 323 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1819,60 +1833,53 @@ static void pixbuf_cache_prioritize (PixbufCache* self, Photo* photo) { #line 324 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp0_ = self->priv->lru; #line 324 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp1_ = photo; -#line 324 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp2_ = gee_abstract_list_index_of (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp1_); -#line 324 "/home/jens/Source/shotwell/src/PixbufCache.vala" - index = _tmp2_; + index = gee_abstract_list_index_of (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), photo); #line 325 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp3_ = index; + _tmp1_ = index; #line 325 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _vala_assert (_tmp3_ >= 0, "index >= 0"); + _vala_assert (_tmp1_ >= 0, "index >= 0"); #line 327 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp4_ = index; + _tmp2_ = index; #line 327 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (_tmp4_ > 0) { -#line 1836 "PixbufCache.c" - GeeArrayList* _tmp5_; - gint _tmp6_; - gpointer _tmp7_; - Photo* _tmp8_; - GeeArrayList* _tmp9_; - Photo* _tmp10_; + if (_tmp2_ > 0) { +#line 1846 "PixbufCache.c" + GeeArrayList* _tmp3_; + gint _tmp4_; + gpointer _tmp5_; + Photo* _tmp6_; + GeeArrayList* _tmp7_; #line 328 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp5_ = self->priv->lru; + _tmp3_ = self->priv->lru; #line 328 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp6_ = index; + _tmp4_ = index; #line 328 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp7_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp6_); + _tmp5_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp4_); #line 328 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp8_ = (Photo*) _tmp7_; + _tmp6_ = (Photo*) _tmp5_; #line 328 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp6_); #line 329 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp9_ = self->priv->lru; + _tmp7_ = self->priv->lru; #line 329 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp10_ = photo; -#line 329 "/home/jens/Source/shotwell/src/PixbufCache.vala" - gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp10_); -#line 1859 "PixbufCache.c" + gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, photo); +#line 1866 "PixbufCache.c" } } -static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pixbuf) { - Photo* _tmp0_; - GeeHashMap* _tmp1_; - Photo* _tmp2_; - GdkPixbuf* _tmp3_; - GeeArrayList* _tmp4_; - Photo* _tmp5_; - GeeArrayList* _tmp20_; +static void +pixbuf_cache_encache (PixbufCache* self, + Photo* photo, + GdkPixbuf* pixbuf) +{ + GeeHashMap* _tmp0_; + GeeArrayList* _tmp1_; + GeeArrayList* _tmp16_; + gint _tmp17_; + gint _tmp18_; + GeeHashMap* _tmp19_; + gint _tmp20_; gint _tmp21_; - gint _tmp22_; - GeeHashMap* _tmp23_; - gint _tmp24_; - gint _tmp25_; #line 333 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 333 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1880,115 +1887,107 @@ static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pi #line 333 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); #line 335 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp0_ = photo; -#line 335 "/home/jens/Source/shotwell/src/PixbufCache.vala" - pixbuf_cache_decache (self, _tmp0_); -#line 337 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp1_ = self->priv->cache; + pixbuf_cache_decache (self, photo); #line 337 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp2_ = photo; -#line 337 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp3_ = pixbuf; + _tmp0_ = self->priv->cache; #line 337 "/home/jens/Source/shotwell/src/PixbufCache.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp3_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo, pixbuf); #line 338 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp4_ = self->priv->lru; + _tmp1_ = self->priv->lru; #line 338 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp5_ = photo; -#line 338 "/home/jens/Source/shotwell/src/PixbufCache.vala" - gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp5_); + gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, photo); #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala" while (TRUE) { -#line 1903 "PixbufCache.c" +#line 1902 "PixbufCache.c" + GeeArrayList* _tmp2_; + gint _tmp3_; + gint _tmp4_; + gint _tmp5_; + Photo* cached_photo = NULL; GeeArrayList* _tmp6_; - gint _tmp7_; + GeeArrayList* _tmp7_; gint _tmp8_; gint _tmp9_; - Photo* cached_photo = NULL; - GeeArrayList* _tmp10_; - GeeArrayList* _tmp11_; - gint _tmp12_; - gint _tmp13_; - gpointer _tmp14_; - Photo* _tmp15_; + gpointer _tmp10_; + Photo* _tmp11_; gboolean removed = FALSE; - GeeHashMap* _tmp16_; - Photo* _tmp17_; - gboolean _tmp18_; - gboolean _tmp19_; + GeeHashMap* _tmp12_; + Photo* _tmp13_; + gboolean _tmp14_; + gboolean _tmp15_; #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp6_ = self->priv->lru; + _tmp2_ = self->priv->lru; #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp8_ = _tmp7_; + _tmp4_ = _tmp3_; #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp9_ = self->priv->max_count; + _tmp5_ = self->priv->max_count; #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (!(_tmp8_ > _tmp9_)) { + if (!(_tmp4_ > _tmp5_)) { #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala" break; -#line 1932 "PixbufCache.c" +#line 1931 "PixbufCache.c" } #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp10_ = self->priv->lru; + _tmp6_ = self->priv->lru; #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp11_ = self->priv->lru; + _tmp7_ = self->priv->lru; #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp13_ = _tmp12_; + _tmp9_ = _tmp8_; #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp14_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp13_ - 1); + _tmp10_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp9_ - 1); #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala" - cached_photo = (Photo*) _tmp14_; + cached_photo = (Photo*) _tmp10_; #line 342 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp15_ = cached_photo; + _tmp11_ = cached_photo; #line 342 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _vala_assert (_tmp15_ != NULL, "cached_photo != null"); + _vala_assert (_tmp11_ != NULL, "cached_photo != null"); #line 344 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp16_ = self->priv->cache; + _tmp12_ = self->priv->cache; #line 344 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp17_ = cached_photo; + _tmp13_ = cached_photo; #line 344 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp18_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_, NULL); + _tmp14_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, NULL); #line 344 "/home/jens/Source/shotwell/src/PixbufCache.vala" - removed = _tmp18_; + removed = _tmp14_; #line 345 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp19_ = removed; + _tmp15_ = removed; #line 345 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _vala_assert (_tmp19_, "removed"); + _vala_assert (_tmp15_, "removed"); #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (cached_photo); -#line 1964 "PixbufCache.c" +#line 1963 "PixbufCache.c" } #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp20_ = self->priv->lru; + _tmp16_ = self->priv->lru; #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp22_ = _tmp21_; + _tmp18_ = _tmp17_; #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp23_ = self->priv->cache; + _tmp19_ = self->priv->cache; #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp24_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp20_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp25_ = _tmp24_; + _tmp21_ = _tmp20_; #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _vala_assert (_tmp22_ == _tmp25_, "lru.size == cache.size"); -#line 1980 "PixbufCache.c" + _vala_assert (_tmp18_ == _tmp21_, "lru.size == cache.size"); +#line 1979 "PixbufCache.c" } -static void pixbuf_cache_decache (PixbufCache* self, Photo* photo) { +static void +pixbuf_cache_decache (PixbufCache* self, + Photo* photo) +{ GeeHashMap* _tmp0_; - Photo* _tmp1_; - gboolean _tmp2_; + gboolean _tmp1_; gboolean removed = FALSE; - GeeArrayList* _tmp6_; - Photo* _tmp7_; - gboolean _tmp8_; - gboolean _tmp9_; + GeeArrayList* _tmp3_; + gboolean _tmp4_; #line 351 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 351 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1996,44 +1995,39 @@ static void pixbuf_cache_decache (PixbufCache* self, Photo* photo) { #line 352 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp0_ = self->priv->cache; #line 352 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp1_ = photo; -#line 352 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL); + _tmp1_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo, NULL); #line 352 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (!_tmp2_) { -#line 2005 "PixbufCache.c" - GeeArrayList* _tmp3_; - Photo* _tmp4_; - gboolean _tmp5_; + if (!_tmp1_) { +#line 2002 "PixbufCache.c" + GeeArrayList* _tmp2_; #line 353 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp3_ = self->priv->lru; -#line 353 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp4_ = photo; -#line 353 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp5_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); + _tmp2_ = self->priv->lru; #line 353 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _vala_assert (!_tmp5_, "!lru.contains(photo)"); + _vala_assert (!gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), photo), "!lru.contains(photo)"); #line 355 "/home/jens/Source/shotwell/src/PixbufCache.vala" return; -#line 2019 "PixbufCache.c" +#line 2010 "PixbufCache.c" } #line 358 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp6_ = self->priv->lru; + _tmp3_ = self->priv->lru; #line 358 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp7_ = photo; -#line 358 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp8_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_); -#line 358 "/home/jens/Source/shotwell/src/PixbufCache.vala" - removed = _tmp8_; + removed = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), photo); #line 359 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp9_ = removed; + _tmp4_ = removed; #line 359 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _vala_assert (_tmp9_, "removed"); -#line 2033 "PixbufCache.c" + _vala_assert (_tmp4_, "removed"); +#line 2020 "PixbufCache.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT_POINTER) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer arg_3, gpointer data2); register GMarshalFunc_VOID__OBJECT_OBJECT_POINTER callback; register GCClosure * cc; @@ -2048,51 +2042,61 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER (GClosure * clos data1 = closure->data; #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" data2 = param_values->data[0].v_pointer; -#line 2052 "PixbufCache.c" +#line 2046 "PixbufCache.c" } else { #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" data1 = param_values->data[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" data2 = closure->data; -#line 2058 "PixbufCache.c" +#line 2052 "PixbufCache.c" } #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT_POINTER) (marshal_data ? marshal_data : cc->callback); #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_pointer (param_values + 3), data2); -#line 2064 "PixbufCache.c" +#line 2058 "PixbufCache.c" } -PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_construct (GType object_type) { +PixbufCachePixbufCacheBatch* +pixbuf_cache_pixbuf_cache_batch_construct (GType object_type) +{ PixbufCachePixbufCacheBatch * self = NULL; #line 17 "/home/jens/Source/shotwell/src/PixbufCache.vala" self = (PixbufCachePixbufCacheBatch*) gee_tree_multi_map_construct (object_type, BACKGROUND_JOB_TYPE_JOB_PRIORITY, NULL, NULL, TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, (GCompareDataFunc) background_job_job_priority_compare_func, NULL, NULL, NULL, NULL, NULL); #line 16 "/home/jens/Source/shotwell/src/PixbufCache.vala" return self; -#line 2074 "PixbufCache.c" +#line 2070 "PixbufCache.c" } -PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_new (void) { +PixbufCachePixbufCacheBatch* +pixbuf_cache_pixbuf_cache_batch_new (void) +{ #line 16 "/home/jens/Source/shotwell/src/PixbufCache.vala" return pixbuf_cache_pixbuf_cache_batch_construct (PIXBUF_CACHE_TYPE_PIXBUF_CACHE_BATCH); -#line 2081 "PixbufCache.c" +#line 2079 "PixbufCache.c" } -static void pixbuf_cache_pixbuf_cache_batch_class_init (PixbufCachePixbufCacheBatchClass * klass) { +static void +pixbuf_cache_pixbuf_cache_batch_class_init (PixbufCachePixbufCacheBatchClass * klass) +{ #line 15 "/home/jens/Source/shotwell/src/PixbufCache.vala" pixbuf_cache_pixbuf_cache_batch_parent_class = g_type_class_peek_parent (klass); #line 2088 "PixbufCache.c" } -static void pixbuf_cache_pixbuf_cache_batch_instance_init (PixbufCachePixbufCacheBatch * self) { +static void +pixbuf_cache_pixbuf_cache_batch_instance_init (PixbufCachePixbufCacheBatch * self) +{ } -GType pixbuf_cache_pixbuf_cache_batch_get_type (void) { +GType +pixbuf_cache_pixbuf_cache_batch_get_type (void) +{ static volatile gsize pixbuf_cache_pixbuf_cache_batch_type_id__volatile = 0; if (g_once_init_enter (&pixbuf_cache_pixbuf_cache_batch_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PixbufCachePixbufCacheBatchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) pixbuf_cache_pixbuf_cache_batch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PixbufCachePixbufCacheBatch), 0, (GInstanceInitFunc) pixbuf_cache_pixbuf_cache_batch_instance_init, NULL }; @@ -2104,19 +2108,22 @@ GType pixbuf_cache_pixbuf_cache_batch_get_type (void) { } -static PixbufCacheFetchJob* pixbuf_cache_fetch_job_construct (GType object_type, PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target) { +static PixbufCacheFetchJob* +pixbuf_cache_fetch_job_construct (GType object_type, + PixbufCache* owner, + BackgroundJobJobPriority priority, + Photo* photo, + Scaling* scaling, + CompletionCallback callback, + void* callback_target) +{ PixbufCacheFetchJob* self = NULL; - PixbufCache* _tmp0_; - CompletionCallback _tmp1_; - void* _tmp1__target; - GCancellable* _tmp2_; - GCancellable* _tmp3_; - Semaphore* _tmp4_; - Semaphore* _tmp5_; - BackgroundJobJobPriority _tmp6_; - Photo* _tmp7_; - Photo* _tmp8_; - Scaling _tmp9_; + GCancellable* _tmp0_; + GCancellable* _tmp1_; + Semaphore* _tmp2_; + Semaphore* _tmp3_; + Photo* _tmp4_; + Scaling _tmp5_; #line 28 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (IS_PIXBUF_CACHE (owner), NULL); #line 28 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2124,48 +2131,40 @@ static PixbufCacheFetchJob* pixbuf_cache_fetch_job_construct (GType object_type, #line 28 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (scaling != NULL, NULL); #line 30 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp0_ = owner; + _tmp0_ = g_cancellable_new (); #line 30 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp1_ = callback; + _tmp1_ = _tmp0_; #line 30 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp1__target = callback_target; -#line 30 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp2_ = g_cancellable_new (); + _tmp2_ = semaphore_new (); #line 30 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp3_ = _tmp2_; #line 30 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp4_ = semaphore_new (); -#line 30 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp5_ = _tmp4_; -#line 30 "/home/jens/Source/shotwell/src/PixbufCache.vala" - self = (PixbufCacheFetchJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _tmp1_, _tmp1__target, _tmp3_, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphore)); + self = (PixbufCacheFetchJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), callback, callback_target, _tmp1_, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphore)); #line 30 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _abstract_semaphore_unref0 (_tmp5_); + _abstract_semaphore_unref0 (_tmp3_); #line 30 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 32 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp6_ = priority; -#line 32 "/home/jens/Source/shotwell/src/PixbufCache.vala" - self->priority = _tmp6_; -#line 33 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp7_ = photo; + self->priority = priority; #line 33 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp8_ = _g_object_ref0 (_tmp7_); + _tmp4_ = _g_object_ref0 (photo); #line 33 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (self->photo); #line 33 "/home/jens/Source/shotwell/src/PixbufCache.vala" - self->photo = _tmp8_; + self->photo = _tmp4_; #line 34 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp9_ = *scaling; + _tmp5_ = *scaling; #line 34 "/home/jens/Source/shotwell/src/PixbufCache.vala" - self->scaling = _tmp9_; + self->scaling = _tmp5_; #line 28 "/home/jens/Source/shotwell/src/PixbufCache.vala" return self; -#line 2165 "PixbufCache.c" +#line 2162 "PixbufCache.c" } -static BackgroundJobJobPriority pixbuf_cache_fetch_job_real_get_priority (BackgroundJob* base) { +static BackgroundJobJobPriority +pixbuf_cache_fetch_job_real_get_priority (BackgroundJob* base) +{ PixbufCacheFetchJob * self; BackgroundJobJobPriority result = 0; BackgroundJobJobPriority _tmp0_; @@ -2177,31 +2176,37 @@ static BackgroundJobJobPriority pixbuf_cache_fetch_job_real_get_priority (Backgr result = _tmp0_; #line 38 "/home/jens/Source/shotwell/src/PixbufCache.vala" return result; -#line 2181 "PixbufCache.c" +#line 2180 "PixbufCache.c" } -static void pixbuf_cache_fetch_job_class_init (PixbufCacheFetchJobClass * klass) { +static void +pixbuf_cache_fetch_job_class_init (PixbufCacheFetchJobClass * klass) +{ #line 21 "/home/jens/Source/shotwell/src/PixbufCache.vala" pixbuf_cache_fetch_job_parent_class = g_type_class_peek_parent (klass); #line 21 "/home/jens/Source/shotwell/src/PixbufCache.vala" ((BackgroundJobClass *) klass)->finalize = pixbuf_cache_fetch_job_finalize; #line 21 "/home/jens/Source/shotwell/src/PixbufCache.vala" ((BackgroundJobClass *) klass)->get_priority = (BackgroundJobJobPriority (*) (BackgroundJob *)) pixbuf_cache_fetch_job_real_get_priority; -#line 2192 "PixbufCache.c" +#line 2193 "PixbufCache.c" } -static void pixbuf_cache_fetch_job_instance_init (PixbufCacheFetchJob * self) { +static void +pixbuf_cache_fetch_job_instance_init (PixbufCacheFetchJob * self) +{ #line 25 "/home/jens/Source/shotwell/src/PixbufCache.vala" self->pixbuf = NULL; #line 26 "/home/jens/Source/shotwell/src/PixbufCache.vala" self->err = NULL; -#line 2201 "PixbufCache.c" +#line 2204 "PixbufCache.c" } -static void pixbuf_cache_fetch_job_finalize (BackgroundJob * obj) { +static void +pixbuf_cache_fetch_job_finalize (BackgroundJob * obj) +{ PixbufCacheFetchJob * self; #line 21 "/home/jens/Source/shotwell/src/PixbufCache.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob); @@ -2213,11 +2218,13 @@ static void pixbuf_cache_fetch_job_finalize (BackgroundJob * obj) { _g_error_free0 (self->err); #line 21 "/home/jens/Source/shotwell/src/PixbufCache.vala" BACKGROUND_JOB_CLASS (pixbuf_cache_fetch_job_parent_class)->finalize (obj); -#line 2217 "PixbufCache.c" +#line 2222 "PixbufCache.c" } -static GType pixbuf_cache_fetch_job_get_type (void) { +static GType +pixbuf_cache_fetch_job_get_type (void) +{ static volatile gsize pixbuf_cache_fetch_job_type_id__volatile = 0; if (g_once_init_enter (&pixbuf_cache_fetch_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PixbufCacheFetchJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) pixbuf_cache_fetch_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PixbufCacheFetchJob), 0, (GInstanceInitFunc) pixbuf_cache_fetch_job_instance_init, NULL }; @@ -2229,14 +2236,17 @@ static GType pixbuf_cache_fetch_job_get_type (void) { } -static PixbufCacheBaselineFetchJob* pixbuf_cache_baseline_fetch_job_construct (GType object_type, PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target) { +static PixbufCacheBaselineFetchJob* +pixbuf_cache_baseline_fetch_job_construct (GType object_type, + PixbufCache* owner, + BackgroundJobJobPriority priority, + Photo* photo, + Scaling* scaling, + CompletionCallback callback, + void* callback_target) +{ PixbufCacheBaselineFetchJob* self = NULL; - PixbufCache* _tmp0_; - BackgroundJobJobPriority _tmp1_; - Photo* _tmp2_; - Scaling _tmp3_; - CompletionCallback _tmp4_; - void* _tmp4__target; + Scaling _tmp0_; #line 43 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (IS_PIXBUF_CACHE (owner), NULL); #line 43 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2244,38 +2254,37 @@ static PixbufCacheBaselineFetchJob* pixbuf_cache_baseline_fetch_job_construct (G #line 43 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (scaling != NULL, NULL); #line 45 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp0_ = owner; -#line 45 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp1_ = priority; -#line 45 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp2_ = photo; -#line 45 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp3_ = *scaling; + _tmp0_ = *scaling; #line 45 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp4_ = callback; -#line 45 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp4__target = callback_target; -#line 45 "/home/jens/Source/shotwell/src/PixbufCache.vala" - self = (PixbufCacheBaselineFetchJob*) pixbuf_cache_fetch_job_construct (object_type, _tmp0_, _tmp1_, _tmp2_, &_tmp3_, _tmp4_, _tmp4__target); + self = (PixbufCacheBaselineFetchJob*) pixbuf_cache_fetch_job_construct (object_type, owner, priority, photo, &_tmp0_, callback, callback_target); #line 43 "/home/jens/Source/shotwell/src/PixbufCache.vala" return self; #line 2263 "PixbufCache.c" } -static PixbufCacheBaselineFetchJob* pixbuf_cache_baseline_fetch_job_new (PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target) { +static PixbufCacheBaselineFetchJob* +pixbuf_cache_baseline_fetch_job_new (PixbufCache* owner, + BackgroundJobJobPriority priority, + Photo* photo, + Scaling* scaling, + CompletionCallback callback, + void* callback_target) +{ #line 43 "/home/jens/Source/shotwell/src/PixbufCache.vala" return pixbuf_cache_baseline_fetch_job_construct (PIXBUF_CACHE_TYPE_BASELINE_FETCH_JOB, owner, priority, photo, scaling, callback, callback_target); -#line 2270 "PixbufCache.c" +#line 2277 "PixbufCache.c" } -static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) { +static void +pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) +{ PixbufCacheBaselineFetchJob * self; GError * _inner_error_ = NULL; #line 48 "/home/jens/Source/shotwell/src/PixbufCache.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PIXBUF_CACHE_TYPE_BASELINE_FETCH_JOB, PixbufCacheBaselineFetchJob); -#line 2279 "PixbufCache.c" +#line 2288 "PixbufCache.c" { GdkPixbuf* _tmp0_ = NULL; Photo* _tmp1_; @@ -2292,7 +2301,7 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) { _tmp0_ = _tmp3_; #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2296 "PixbufCache.c" +#line 2305 "PixbufCache.c" goto __catch462_g_error; } #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2305,7 +2314,7 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) { G_TYPE_CHECK_INSTANCE_CAST (self, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)->pixbuf = _tmp4_; #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (_tmp0_); -#line 2309 "PixbufCache.c" +#line 2318 "PixbufCache.c" } goto __finally462; __catch462_g_error: @@ -2327,7 +2336,7 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) { G_TYPE_CHECK_INSTANCE_CAST (self, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)->err = _tmp6_; #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_error_free0 (err); -#line 2331 "PixbufCache.c" +#line 2340 "PixbufCache.c" } __finally462: #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2338,25 +2347,31 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) { g_clear_error (&_inner_error_); #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala" return; -#line 2342 "PixbufCache.c" +#line 2351 "PixbufCache.c" } } -static void pixbuf_cache_baseline_fetch_job_class_init (PixbufCacheBaselineFetchJobClass * klass) { +static void +pixbuf_cache_baseline_fetch_job_class_init (PixbufCacheBaselineFetchJobClass * klass) +{ #line 42 "/home/jens/Source/shotwell/src/PixbufCache.vala" pixbuf_cache_baseline_fetch_job_parent_class = g_type_class_peek_parent (klass); #line 42 "/home/jens/Source/shotwell/src/PixbufCache.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) pixbuf_cache_baseline_fetch_job_real_execute; -#line 2352 "PixbufCache.c" +#line 2363 "PixbufCache.c" } -static void pixbuf_cache_baseline_fetch_job_instance_init (PixbufCacheBaselineFetchJob * self) { +static void +pixbuf_cache_baseline_fetch_job_instance_init (PixbufCacheBaselineFetchJob * self) +{ } -static GType pixbuf_cache_baseline_fetch_job_get_type (void) { +static GType +pixbuf_cache_baseline_fetch_job_get_type (void) +{ static volatile gsize pixbuf_cache_baseline_fetch_job_type_id__volatile = 0; if (g_once_init_enter (&pixbuf_cache_baseline_fetch_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PixbufCacheBaselineFetchJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) pixbuf_cache_baseline_fetch_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PixbufCacheBaselineFetchJob), 0, (GInstanceInitFunc) pixbuf_cache_baseline_fetch_job_instance_init, NULL }; @@ -2368,14 +2383,17 @@ static GType pixbuf_cache_baseline_fetch_job_get_type (void) { } -static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_construct (GType object_type, PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target) { +static PixbufCacheMasterFetchJob* +pixbuf_cache_master_fetch_job_construct (GType object_type, + PixbufCache* owner, + BackgroundJobJobPriority priority, + Photo* photo, + Scaling* scaling, + CompletionCallback callback, + void* callback_target) +{ PixbufCacheMasterFetchJob* self = NULL; - PixbufCache* _tmp0_; - BackgroundJobJobPriority _tmp1_; - Photo* _tmp2_; - Scaling _tmp3_; - CompletionCallback _tmp4_; - void* _tmp4__target; + Scaling _tmp0_; #line 58 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (IS_PIXBUF_CACHE (owner), NULL); #line 58 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2383,38 +2401,37 @@ static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_construct (GType #line 58 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (scaling != NULL, NULL); #line 60 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp0_ = owner; -#line 60 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp1_ = priority; -#line 60 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp2_ = photo; -#line 60 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp3_ = *scaling; -#line 60 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp4_ = callback; + _tmp0_ = *scaling; #line 60 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp4__target = callback_target; -#line 60 "/home/jens/Source/shotwell/src/PixbufCache.vala" - self = (PixbufCacheMasterFetchJob*) pixbuf_cache_fetch_job_construct (object_type, _tmp0_, _tmp1_, _tmp2_, &_tmp3_, _tmp4_, _tmp4__target); + self = (PixbufCacheMasterFetchJob*) pixbuf_cache_fetch_job_construct (object_type, owner, priority, photo, &_tmp0_, callback, callback_target); #line 58 "/home/jens/Source/shotwell/src/PixbufCache.vala" return self; -#line 2402 "PixbufCache.c" +#line 2410 "PixbufCache.c" } -static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_new (PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target) { +static PixbufCacheMasterFetchJob* +pixbuf_cache_master_fetch_job_new (PixbufCache* owner, + BackgroundJobJobPriority priority, + Photo* photo, + Scaling* scaling, + CompletionCallback callback, + void* callback_target) +{ #line 58 "/home/jens/Source/shotwell/src/PixbufCache.vala" return pixbuf_cache_master_fetch_job_construct (PIXBUF_CACHE_TYPE_MASTER_FETCH_JOB, owner, priority, photo, scaling, callback, callback_target); -#line 2409 "PixbufCache.c" +#line 2424 "PixbufCache.c" } -static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) { +static void +pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) +{ PixbufCacheMasterFetchJob * self; GError * _inner_error_ = NULL; #line 63 "/home/jens/Source/shotwell/src/PixbufCache.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PIXBUF_CACHE_TYPE_MASTER_FETCH_JOB, PixbufCacheMasterFetchJob); -#line 2418 "PixbufCache.c" +#line 2435 "PixbufCache.c" { GdkPixbuf* _tmp0_ = NULL; Photo* _tmp1_; @@ -2431,7 +2448,7 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) { _tmp0_ = _tmp3_; #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2435 "PixbufCache.c" +#line 2452 "PixbufCache.c" goto __catch463_g_error; } #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2444,7 +2461,7 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) { G_TYPE_CHECK_INSTANCE_CAST (self, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)->pixbuf = _tmp4_; #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (_tmp0_); -#line 2448 "PixbufCache.c" +#line 2465 "PixbufCache.c" } goto __finally463; __catch463_g_error: @@ -2466,7 +2483,7 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) { G_TYPE_CHECK_INSTANCE_CAST (self, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)->err = _tmp6_; #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_error_free0 (err); -#line 2470 "PixbufCache.c" +#line 2487 "PixbufCache.c" } __finally463: #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2477,25 +2494,31 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) { g_clear_error (&_inner_error_); #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala" return; -#line 2481 "PixbufCache.c" +#line 2498 "PixbufCache.c" } } -static void pixbuf_cache_master_fetch_job_class_init (PixbufCacheMasterFetchJobClass * klass) { +static void +pixbuf_cache_master_fetch_job_class_init (PixbufCacheMasterFetchJobClass * klass) +{ #line 57 "/home/jens/Source/shotwell/src/PixbufCache.vala" pixbuf_cache_master_fetch_job_parent_class = g_type_class_peek_parent (klass); #line 57 "/home/jens/Source/shotwell/src/PixbufCache.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) pixbuf_cache_master_fetch_job_real_execute; -#line 2491 "PixbufCache.c" +#line 2510 "PixbufCache.c" } -static void pixbuf_cache_master_fetch_job_instance_init (PixbufCacheMasterFetchJob * self) { +static void +pixbuf_cache_master_fetch_job_instance_init (PixbufCacheMasterFetchJob * self) +{ } -static GType pixbuf_cache_master_fetch_job_get_type (void) { +static GType +pixbuf_cache_master_fetch_job_get_type (void) +{ static volatile gsize pixbuf_cache_master_fetch_job_type_id__volatile = 0; if (g_once_init_enter (&pixbuf_cache_master_fetch_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PixbufCacheMasterFetchJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) pixbuf_cache_master_fetch_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PixbufCacheMasterFetchJob), 0, (GInstanceInitFunc) pixbuf_cache_master_fetch_job_instance_init, NULL }; @@ -2507,7 +2530,9 @@ static GType pixbuf_cache_master_fetch_job_get_type (void) { } -static void pixbuf_cache_class_init (PixbufCacheClass * klass) { +static void +pixbuf_cache_class_init (PixbufCacheClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" pixbuf_cache_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2516,11 +2541,13 @@ static void pixbuf_cache_class_init (PixbufCacheClass * klass) { G_OBJECT_CLASS (klass)->finalize = pixbuf_cache_finalize; #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" pixbuf_cache_signals[PIXBUF_CACHE_FETCHED_SIGNAL] = g_signal_new ("fetched", TYPE_PIXBUF_CACHE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER, G_TYPE_NONE, 3, TYPE_PHOTO, gdk_pixbuf_get_type (), G_TYPE_POINTER); -#line 2520 "PixbufCache.c" +#line 2545 "PixbufCache.c" } -static void pixbuf_cache_instance_init (PixbufCache * self) { +static void +pixbuf_cache_instance_init (PixbufCache * self) +{ GeeHashMap* _tmp0_; GeeArrayList* _tmp1_; GeeHashMap* _tmp2_; @@ -2538,11 +2565,13 @@ static void pixbuf_cache_instance_init (PixbufCache * self) { _tmp2_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, PIXBUF_CACHE_TYPE_FETCH_JOB, (GBoxedCopyFunc) background_job_ref, (GDestroyNotify) background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 81 "/home/jens/Source/shotwell/src/PixbufCache.vala" self->priv->in_progress = _tmp2_; -#line 2542 "PixbufCache.c" +#line 2569 "PixbufCache.c" } -static void pixbuf_cache_finalize (GObject * obj) { +static void +pixbuf_cache_finalize (GObject * obj) +{ PixbufCache * self; PixbufCachePhotoType _tmp0_; SourceCollection* _tmp3_; @@ -2553,7 +2582,7 @@ static void pixbuf_cache_finalize (GObject * obj) { _tmp0_ = self->priv->type; #line 110 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (_tmp0_ != PIXBUF_CACHE_PHOTO_TYPE_MASTER) { -#line 2557 "PixbufCache.c" +#line 2586 "PixbufCache.c" SourceCollection* _tmp1_; guint _tmp2_; #line 111 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2562,7 +2591,7 @@ static void pixbuf_cache_finalize (GObject * obj) { g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp2_, NULL, FALSE); #line 111 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _pixbuf_cache_on_sources_altered_data_collection_items_altered, self); -#line 2566 "PixbufCache.c" +#line 2595 "PixbufCache.c" } #line 112 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp3_ = self->priv->sources; @@ -2570,7 +2599,7 @@ static void pixbuf_cache_finalize (GObject * obj) { g_signal_parse_name ("items-removed", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE); #line 112 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _pixbuf_cache_on_sources_removed_data_collection_items_removed, self); -#line 2574 "PixbufCache.c" +#line 2603 "PixbufCache.c" { GeeIterator* _job_it = NULL; GeeHashMap* _tmp5_; @@ -2597,40 +2626,37 @@ static void pixbuf_cache_finalize (GObject * obj) { _job_it = _tmp10_; #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala" while (TRUE) { -#line 2601 "PixbufCache.c" +#line 2630 "PixbufCache.c" GeeIterator* _tmp11_; - gboolean _tmp12_; PixbufCacheFetchJob* job = NULL; - GeeIterator* _tmp13_; - gpointer _tmp14_; - PixbufCacheFetchJob* _tmp15_; + GeeIterator* _tmp12_; + gpointer _tmp13_; + PixbufCacheFetchJob* _tmp14_; #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp11_ = _job_it; #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp12_ = gee_iterator_next (_tmp11_); -#line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala" - if (!_tmp12_) { + if (!gee_iterator_next (_tmp11_)) { #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala" break; -#line 2616 "PixbufCache.c" +#line 2642 "PixbufCache.c" } #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp13_ = _job_it; + _tmp12_ = _job_it; #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp14_ = gee_iterator_get (_tmp13_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala" - job = (PixbufCacheFetchJob*) _tmp14_; + job = (PixbufCacheFetchJob*) _tmp13_; #line 115 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp15_ = job; + _tmp14_ = job; #line 115 "/home/jens/Source/shotwell/src/PixbufCache.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_BACKGROUND_JOB, BackgroundJob)); + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala" _background_job_unref0 (job); -#line 2630 "PixbufCache.c" +#line 2656 "PixbufCache.c" } #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (_job_it); -#line 2634 "PixbufCache.c" +#line 2660 "PixbufCache.c" } #line 74 "/home/jens/Source/shotwell/src/PixbufCache.vala" _data_collection_unref0 (self->priv->sources); @@ -2642,11 +2668,13 @@ static void pixbuf_cache_finalize (GObject * obj) { _g_object_unref0 (self->priv->in_progress); #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" G_OBJECT_CLASS (pixbuf_cache_parent_class)->finalize (obj); -#line 2646 "PixbufCache.c" +#line 2672 "PixbufCache.c" } -GType pixbuf_cache_get_type (void) { +GType +pixbuf_cache_get_type (void) +{ static volatile gsize pixbuf_cache_type_id__volatile = 0; if (g_once_init_enter (&pixbuf_cache_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PixbufCacheClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) pixbuf_cache_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PixbufCache), 0, (GInstanceInitFunc) pixbuf_cache_instance_init, NULL }; diff --git a/src/Printing.c b/src/Printing.c index bb93377..2e017b8 100644 --- a/src/Printing.c +++ b/src/Printing.c @@ -1,4 +1,4 @@ -/* Printing.c generated by valac 0.36.6, the Vala compiler +/* Printing.c generated by valac 0.40.4, the Vala compiler * generated from Printing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -111,6 +112,11 @@ typedef struct _CustomPrintTabPrivate CustomPrintTabPrivate; typedef struct _PrintJob PrintJob; typedef struct _PrintJobClass PrintJobClass; +enum { + CUSTOM_PRINT_TAB_0_PROPERTY, + CUSTOM_PRINT_TAB_NUM_PROPERTIES +}; +static GParamSpec* custom_print_tab_properties[CUSTOM_PRINT_TAB_NUM_PROPERTIES]; #define _standard_print_size_unref0(var) ((var == NULL) ? NULL : (var = (standard_print_size_unref (var), NULL))) #define RESOURCES_TYPE_UNIT_SYSTEM (resources_unit_system_get_type ()) @@ -176,6 +182,11 @@ typedef struct _PhotoSourceClass PhotoSourceClass; typedef struct _Photo Photo; typedef struct _PhotoClass PhotoClass; +enum { + PRINT_JOB_0_PROPERTY, + PRINT_JOB_NUM_PROPERTIES +}; +static GParamSpec* print_job_properties[PRINT_JOB_NUM_PROPERTIES]; #define PHOTO_TYPE_EXCEPTION (photo_exception_get_type ()) @@ -415,9 +426,15 @@ static PrintManager* print_manager_instance = NULL; GType content_layout_get_type (void) G_GNUC_CONST; gpointer print_settings_ref (gpointer instance); void print_settings_unref (gpointer instance); -GParamSpec* param_spec_print_settings (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_print_settings (GValue* value, gpointer v_object); -void value_take_print_settings (GValue* value, gpointer v_object); +GParamSpec* param_spec_print_settings (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_print_settings (GValue* value, + gpointer v_object); +void value_take_print_settings (GValue* value, + gpointer v_object); gpointer value_get_print_settings (const GValue* value); GType print_settings_get_type (void) G_GNUC_CONST; GType measurement_get_type (void) G_GNUC_CONST; @@ -425,9 +442,6 @@ GType measurement_unit_get_type (void) G_GNUC_CONST; Measurement* measurement_dup (const Measurement* self); void measurement_free (Measurement* self); #define PRINT_SETTINGS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PRINT_SETTINGS, PrintSettingsPrivate)) -enum { - PRINT_SETTINGS_DUMMY_PROPERTY -}; #define PRINT_SETTINGS_MIN_CONTENT_PPI 72 #define PRINT_SETTINGS_MAX_CONTENT_PPI 1200 PrintSettings* print_settings_new (void); @@ -437,7 +451,9 @@ GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); gint configuration_facade_get_printing_content_units (ConfigurationFacade* self); gdouble configuration_facade_get_printing_content_width (ConfigurationFacade* self); -void measurement_init (Measurement *self, gdouble value, MeasurementUnit unit); +void measurement_init (Measurement *self, + gdouble value, + MeasurementUnit unit); gdouble configuration_facade_get_printing_content_height (ConfigurationFacade* self); gint configuration_facade_get_printing_size_selection (ConfigurationFacade* self); gint configuration_facade_get_printing_content_layout (ConfigurationFacade* self); @@ -447,58 +463,98 @@ gchar* configuration_facade_get_printing_titles_font (ConfigurationFacade* self) gint configuration_facade_get_printing_images_per_page (ConfigurationFacade* self); gint configuration_facade_get_printing_content_ppi (ConfigurationFacade* self); void print_settings_save (PrintSettings* self); -void configuration_facade_set_printing_content_units (ConfigurationFacade* self, gint units_code); -void configuration_facade_set_printing_content_width (ConfigurationFacade* self, gdouble content_width); -void configuration_facade_set_printing_content_height (ConfigurationFacade* self, gdouble content_height); -void configuration_facade_set_printing_size_selection (ConfigurationFacade* self, gint size_code); -void configuration_facade_set_printing_content_layout (ConfigurationFacade* self, gint layout_code); -void configuration_facade_set_printing_match_aspect_ratio (ConfigurationFacade* self, gboolean match_aspect_ratio); -void configuration_facade_set_printing_print_titles (ConfigurationFacade* self, gboolean print_titles); -void configuration_facade_set_printing_titles_font (ConfigurationFacade* self, const gchar* font_name); -void configuration_facade_set_printing_images_per_page (ConfigurationFacade* self, gint images_per_page_code); -void configuration_facade_set_printing_content_ppi (ConfigurationFacade* self, gint content_ppi); -void print_settings_get_content_width (PrintSettings* self, Measurement* result); +void configuration_facade_set_printing_content_units (ConfigurationFacade* self, + gint units_code); +void configuration_facade_set_printing_content_width (ConfigurationFacade* self, + gdouble content_width); +void configuration_facade_set_printing_content_height (ConfigurationFacade* self, + gdouble content_height); +void configuration_facade_set_printing_size_selection (ConfigurationFacade* self, + gint size_code); +void configuration_facade_set_printing_content_layout (ConfigurationFacade* self, + gint layout_code); +void configuration_facade_set_printing_match_aspect_ratio (ConfigurationFacade* self, + gboolean match_aspect_ratio); +void configuration_facade_set_printing_print_titles (ConfigurationFacade* self, + gboolean print_titles); +void configuration_facade_set_printing_titles_font (ConfigurationFacade* self, + const gchar* font_name); +void configuration_facade_set_printing_images_per_page (ConfigurationFacade* self, + gint images_per_page_code); +void configuration_facade_set_printing_content_ppi (ConfigurationFacade* self, + gint content_ppi); +void print_settings_get_content_width (PrintSettings* self, + Measurement* result); ContentLayout print_settings_get_content_layout (PrintSettings* self); gpointer print_manager_ref (gpointer instance); void print_manager_unref (gpointer instance); -GParamSpec* param_spec_print_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_print_manager (GValue* value, gpointer v_object); -void value_take_print_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_print_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_print_manager (GValue* value, + gpointer v_object); +void value_take_print_manager (GValue* value, + gpointer v_object); gpointer value_get_print_manager (const GValue* value); GType print_manager_get_type (void) G_GNUC_CONST; PrintManager* print_manager_get_instance (void); gpointer standard_print_size_ref (gpointer instance); void standard_print_size_unref (gpointer instance); -GParamSpec* param_spec_standard_print_size (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_standard_print_size (GValue* value, gpointer v_object); -void value_take_standard_print_size (GValue* value, gpointer v_object); +GParamSpec* param_spec_standard_print_size (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_standard_print_size (GValue* value, + gpointer v_object); +void value_take_standard_print_size (GValue* value, + gpointer v_object); gpointer value_get_standard_print_size (const GValue* value); GType standard_print_size_get_type (void) G_GNUC_CONST; -StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* result_length1); +StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, + int* result_length1); gint print_settings_get_size_selection (PrintSettings* self); -void print_settings_get_content_height (PrintSettings* self, Measurement* result); -void print_settings_get_minimum_content_dimension (PrintSettings* self, Measurement* result); -void print_settings_get_maximum_content_dimension (PrintSettings* self, Measurement* result); +void print_settings_get_content_height (PrintSettings* self, + Measurement* result); +void print_settings_get_minimum_content_dimension (PrintSettings* self, + Measurement* result); +void print_settings_get_maximum_content_dimension (PrintSettings* self, + Measurement* result); gboolean print_settings_is_match_aspect_ratio_enabled (PrintSettings* self); gboolean print_settings_is_print_titles_enabled (PrintSettings* self); gint print_settings_get_content_ppi (PrintSettings* self); gint print_settings_get_image_per_page_selection (PrintSettings* self); -void print_settings_set_content_layout (PrintSettings* self, ContentLayout content_layout); -void print_settings_set_content_width (PrintSettings* self, Measurement* content_width); -void print_settings_set_content_height (PrintSettings* self, Measurement* content_height); -void print_settings_set_content_ppi (PrintSettings* self, gint content_ppi); -void print_settings_set_image_per_page_selection (PrintSettings* self, gint image_per_page_selection); -void print_settings_set_size_selection (PrintSettings* self, gint size_selection); -void print_settings_set_match_aspect_ratio_enabled (PrintSettings* self, gboolean enable_state); -void print_settings_set_print_titles_enabled (PrintSettings* self, gboolean print_titles); -void print_settings_set_print_titles_font (PrintSettings* self, const gchar* fontname); +void print_settings_set_content_layout (PrintSettings* self, + ContentLayout content_layout); +void print_settings_set_content_width (PrintSettings* self, + Measurement* content_width); +void print_settings_set_content_height (PrintSettings* self, + Measurement* content_height); +void print_settings_set_content_ppi (PrintSettings* self, + gint content_ppi); +void print_settings_set_image_per_page_selection (PrintSettings* self, + gint image_per_page_selection); +void print_settings_set_size_selection (PrintSettings* self, + gint size_selection); +void print_settings_set_match_aspect_ratio_enabled (PrintSettings* self, + gboolean enable_state); +void print_settings_set_print_titles_enabled (PrintSettings* self, + gboolean print_titles); +void print_settings_set_print_titles_font (PrintSettings* self, + const gchar* fontname); gchar* print_settings_get_print_titles_font (PrintSettings* self); static void print_settings_finalize (PrintSettings * obj); #define MEASUREMENT_CENTIMETERS_PER_INCH 2.54 #define MEASUREMENT_INCHES_PER_CENTIMETER (1.0 / 2.54) -void measurement_convert_to (Measurement *self, MeasurementUnit to_unit, Measurement* result); -gboolean measurement_is_less_than (Measurement *self, Measurement* rhs); -gboolean measurement_is_greater_than (Measurement *self, Measurement* rhs); +void measurement_convert_to (Measurement *self, + MeasurementUnit to_unit, + Measurement* result); +gboolean measurement_is_less_than (Measurement *self, + Measurement* rhs); +gboolean measurement_is_greater_than (Measurement *self, + Measurement* rhs); GType print_layout_get_type (void) G_GNUC_CONST; PrintLayout* print_layout_get_all (int* result_length1); gint print_layout_get_per_page (PrintLayout self); @@ -508,56 +564,105 @@ gchar* print_layout_to_string (PrintLayout self); GType custom_print_tab_get_type (void) G_GNUC_CONST; GType print_job_get_type (void) G_GNUC_CONST; #define CUSTOM_PRINT_TAB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CUSTOM_PRINT_TAB, CustomPrintTabPrivate)) -enum { - CUSTOM_PRINT_TAB_DUMMY_PROPERTY -}; #define CUSTOM_PRINT_TAB_INCHES_COMBO_CHOICE 0 #define CUSTOM_PRINT_TAB_CENTIMETERS_COMBO_CHOICE 1 CustomPrintTab* custom_print_tab_new (PrintJob* source_job); -CustomPrintTab* custom_print_tab_construct (GType object_type, PrintJob* source_job); -static void custom_print_tab_on_radio_group_click (CustomPrintTab* self, GtkButton* b); -static void _custom_print_tab_on_radio_group_click_gtk_button_clicked (GtkButton* _sender, gpointer self); -static gboolean custom_print_tab_standard_sizes_combo_separator_func (GtkTreeModel* model, GtkTreeIter* iter); -static gboolean _custom_print_tab_standard_sizes_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self); +CustomPrintTab* custom_print_tab_construct (GType object_type, + PrintJob* source_job); +static void custom_print_tab_on_radio_group_click (CustomPrintTab* self, + GtkButton* b); +static void _custom_print_tab_on_radio_group_click_gtk_button_clicked (GtkButton* _sender, + gpointer self); +static gboolean custom_print_tab_standard_sizes_combo_separator_func (GtkTreeModel* model, + GtkTreeIter* iter); +static gboolean _custom_print_tab_standard_sizes_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, + GtkTreeIter* iter, + gpointer self); GType resources_unit_system_get_type (void) G_GNUC_CONST; ResourcesUnitSystem resources_get_default_measurement_unit (void); -static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEditable* editable, const gchar* text, gint length, gint* position); -static void _custom_print_tab_on_entry_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self); -static gboolean custom_print_tab_on_width_entry_focus_out (CustomPrintTab* self, GdkEventFocus* event); -static gboolean _custom_print_tab_on_width_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self); -static gboolean custom_print_tab_on_height_entry_focus_out (CustomPrintTab* self, GdkEventFocus* event); -static gboolean _custom_print_tab_on_height_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self); +static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, + GtkEditable* editable, + const gchar* text, + gint length, + gint* position); +static void _custom_print_tab_on_entry_insert_text_gtk_editable_insert_text (GtkEditable* _sender, + const gchar* new_text, + gint new_text_length, + gint* position, + gpointer self); +static gboolean custom_print_tab_on_width_entry_focus_out (CustomPrintTab* self, + GdkEventFocus* event); +static gboolean _custom_print_tab_on_width_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, + GdkEventFocus* event, + gpointer self); +static gboolean custom_print_tab_on_height_entry_focus_out (CustomPrintTab* self, + GdkEventFocus* event); +static gboolean _custom_print_tab_on_height_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, + GdkEventFocus* event, + gpointer self); static void custom_print_tab_on_units_combo_changed (CustomPrintTab* self); -static void _custom_print_tab_on_units_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); -static void custom_print_tab_on_ppi_entry_insert_text (CustomPrintTab* self, GtkEditable* editable, const gchar* text, gint length, gint* position); -static void _custom_print_tab_on_ppi_entry_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self); -static gboolean custom_print_tab_on_ppi_entry_focus_out (CustomPrintTab* self, GdkEventFocus* event); -static gboolean _custom_print_tab_on_ppi_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self); -static void custom_print_tab_sync_state_from_job (CustomPrintTab* self, PrintJob* job); +static void _custom_print_tab_on_units_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self); +static void custom_print_tab_on_ppi_entry_insert_text (CustomPrintTab* self, + GtkEditable* editable, + const gchar* text, + gint length, + gint* position); +static void _custom_print_tab_on_ppi_entry_insert_text_gtk_editable_insert_text (GtkEditable* _sender, + const gchar* new_text, + gint new_text_length, + gint* position, + gpointer self); +static gboolean custom_print_tab_on_ppi_entry_focus_out (CustomPrintTab* self, + GdkEventFocus* event); +static gboolean _custom_print_tab_on_ppi_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, + GdkEventFocus* event, + gpointer self); +static void custom_print_tab_sync_state_from_job (CustomPrintTab* self, + PrintJob* job); static void custom_print_tab_on_aspect_ratio_check_clicked (CustomPrintTab* self); -static void _custom_print_tab_on_aspect_ratio_check_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void _custom_print_tab_on_aspect_ratio_check_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self); gdouble print_job_get_source_aspect_ratio (PrintJob* self); -static gchar* custom_print_tab_format_measurement (CustomPrintTab* self, Measurement* measurement); -static gchar* custom_print_tab_format_measurement_as (CustomPrintTab* self, Measurement* measurement, MeasurementUnit to_unit); +static gchar* custom_print_tab_format_measurement (CustomPrintTab* self, + Measurement* measurement); +static gchar* custom_print_tab_format_measurement_as (CustomPrintTab* self, + Measurement* measurement, + MeasurementUnit to_unit); static MeasurementUnit custom_print_tab_get_user_unit_choice (CustomPrintTab* self); -static void custom_print_tab_get_width_entry_value (CustomPrintTab* self, Measurement* result); +static void custom_print_tab_get_width_entry_value (CustomPrintTab* self, + Measurement* result); PrintSettings* print_job_get_local_settings (PrintJob* self); static gboolean custom_print_tab_is_match_aspect_ratio_enabled (CustomPrintTab* self); -static void custom_print_tab_set_content_ppi (CustomPrintTab* self, gint content_ppi); -static void custom_print_tab_get_height_entry_value (CustomPrintTab* self, Measurement* result); -static void custom_print_tab_set_user_unit_choice (CustomPrintTab* self, MeasurementUnit unit); -static void custom_print_tab_set_content_width (CustomPrintTab* self, Measurement* content_width); -static void custom_print_tab_set_content_height (CustomPrintTab* self, Measurement* content_height); -static void custom_print_tab_set_content_layout (CustomPrintTab* self, ContentLayout content_layout); -static void custom_print_tab_set_image_per_page_selection (CustomPrintTab* self, gint image_per_page); -static void custom_print_tab_set_size_selection (CustomPrintTab* self, gint size_selection); -static void custom_print_tab_set_match_aspect_ratio_enabled (CustomPrintTab* self, gboolean enable_state); -static void custom_print_tab_set_print_titles_enabled (CustomPrintTab* self, gboolean print_titles); -static void custom_print_tab_set_print_titles_font (CustomPrintTab* self, const gchar* fontname); -static void custom_print_tab_set_content_layout_control_state (CustomPrintTab* self, ContentLayout layout); +static void custom_print_tab_set_content_ppi (CustomPrintTab* self, + gint content_ppi); +static void custom_print_tab_get_height_entry_value (CustomPrintTab* self, + Measurement* result); +static void custom_print_tab_set_user_unit_choice (CustomPrintTab* self, + MeasurementUnit unit); +static void custom_print_tab_set_content_width (CustomPrintTab* self, + Measurement* content_width); +static void custom_print_tab_set_content_height (CustomPrintTab* self, + Measurement* content_height); +static void custom_print_tab_set_content_layout (CustomPrintTab* self, + ContentLayout content_layout); +static void custom_print_tab_set_image_per_page_selection (CustomPrintTab* self, + gint image_per_page); +static void custom_print_tab_set_size_selection (CustomPrintTab* self, + gint size_selection); +static void custom_print_tab_set_match_aspect_ratio_enabled (CustomPrintTab* self, + gboolean enable_state); +static void custom_print_tab_set_print_titles_enabled (CustomPrintTab* self, + gboolean print_titles); +static void custom_print_tab_set_print_titles_font (CustomPrintTab* self, + const gchar* fontname); +static void custom_print_tab_set_content_layout_control_state (CustomPrintTab* self, + ContentLayout layout); static ContentLayout custom_print_tab_get_content_layout (CustomPrintTab* self); -static void custom_print_tab_get_content_width (CustomPrintTab* self, Measurement* result); -static void custom_print_tab_get_content_height (CustomPrintTab* self, Measurement* result); +static void custom_print_tab_get_content_width (CustomPrintTab* self, + Measurement* result); +static void custom_print_tab_get_content_height (CustomPrintTab* self, + Measurement* result); static gint custom_print_tab_get_content_ppi (CustomPrintTab* self); static gint custom_print_tab_get_image_per_page_selection (CustomPrintTab* self); static gint custom_print_tab_get_size_selection (CustomPrintTab* self); @@ -573,96 +678,202 @@ GType media_source_get_type (void) G_GNUC_CONST; GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; #define PRINT_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PRINT_JOB, PrintJobPrivate)) -enum { - PRINT_JOB_DUMMY_PROPERTY -}; PrintJob* print_job_new (GeeCollection* to_print); -PrintJob* print_job_construct (GType object_type, GeeCollection* to_print); +PrintJob* print_job_construct (GType object_type, + GeeCollection* to_print); PrintSettings* print_manager_get_global_settings (PrintManager* self); GType photo_exception_get_type (void) G_GNUC_CONST; GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); -void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result); +void media_source_get_dimensions (MediaSource* self, + PhotoException disallowed_steps, + Dimensions* result); gdouble dimensions_get_aspect_ratio (Dimensions *self); GeeList* print_job_get_photos (PrintJob* self); Photo* print_job_get_source_photo (PrintJob* self); -void print_job_set_local_settings (PrintJob* self, PrintSettings* settings); +void print_job_set_local_settings (PrintJob* self, + PrintSettings* settings); static void print_job_finalize (GObject * obj); -enum { - STANDARD_PRINT_SIZE_DUMMY_PROPERTY -}; -StandardPrintSize* standard_print_size_new (const gchar* name, Measurement* width, Measurement* height); -StandardPrintSize* standard_print_size_construct (GType object_type, const gchar* name, Measurement* width, Measurement* height); +StandardPrintSize* standard_print_size_new (const gchar* name, + Measurement* width, + Measurement* height); +StandardPrintSize* standard_print_size_construct (GType object_type, + const gchar* name, + Measurement* width, + Measurement* height); static void standard_print_size_finalize (StandardPrintSize * obj); GType progress_dialog_get_type (void) G_GNUC_CONST; #define PRINT_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PRINT_MANAGER, PrintManagerPrivate)) -enum { - PRINT_MANAGER_DUMMY_PROPERTY -}; #define PRINT_MANAGER_IMAGE_DISTANCE 0.24 static PrintManager* print_manager_new (void); static PrintManager* print_manager_construct (GType object_type); -static void _vala_array_add113 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value); -static void _vala_array_add114 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value); -static void _vala_array_add115 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value); -static void _vala_array_add116 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value); -static void _vala_array_add117 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value); -static void _vala_array_add118 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value); -static void _vala_array_add119 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value); -static void _vala_array_add120 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value); -static void _vala_array_add121 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value); -static void _vala_array_add122 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value); -static void _vala_array_add123 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value); -static void _vala_array_add124 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value); -static void _vala_array_add125 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value); -static void _vala_array_add126 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value); -static void _vala_array_add127 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value); -void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print); +static void _vala_array_add113 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value); +static void _vala_array_add114 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value); +static void _vala_array_add115 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value); +static void _vala_array_add116 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value); +static void _vala_array_add117 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value); +static void _vala_array_add118 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value); +static void _vala_array_add119 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value); +static void _vala_array_add120 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value); +static void _vala_array_add121 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value); +static void _vala_array_add122 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value); +static void _vala_array_add123 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value); +static void _vala_array_add124 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value); +static void _vala_array_add125 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value); +static void _vala_array_add126 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value); +static void _vala_array_add127 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value); +void print_manager_spool_photo (PrintManager* self, + GeeCollection* to_print); gchar* data_object_get_name (DataObject* self); -static void print_manager_on_begin_print (PrintManager* self, GtkPrintOperation* emitting_object, GtkPrintContext* job_context); -static void _print_manager_on_begin_print_gtk_print_operation_begin_print (GtkPrintOperation* _sender, GtkPrintContext* context, gpointer self); -static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* emitting_object, GtkPrintContext* job_context, gint page_num); -static void _print_manager_on_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, GtkPrintContext* context, gint page_nr, gpointer self); -static GObject* print_manager_on_create_custom_widget (PrintManager* self, GtkPrintOperation* emitting_object); -static GObject* _print_manager_on_create_custom_widget_gtk_print_operation_create_custom_widget (GtkPrintOperation* _sender, gpointer self); -static void print_manager_on_status_changed (PrintManager* self, GtkPrintOperation* job); -static void _print_manager_on_status_changed_gtk_print_operation_status_changed (GtkPrintOperation* _sender, gpointer self); +static void print_manager_on_begin_print (PrintManager* self, + GtkPrintOperation* emitting_object, + GtkPrintContext* job_context); +static void _print_manager_on_begin_print_gtk_print_operation_begin_print (GtkPrintOperation* _sender, + GtkPrintContext* context, + gpointer self); +static void print_manager_on_draw_page (PrintManager* self, + GtkPrintOperation* emitting_object, + GtkPrintContext* job_context, + gint page_num); +static void _print_manager_on_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, + GtkPrintContext* context, + gint page_nr, + gpointer self); +static GObject* print_manager_on_create_custom_widget (PrintManager* self, + GtkPrintOperation* emitting_object); +static GObject* _print_manager_on_create_custom_widget_gtk_print_operation_create_custom_widget (GtkPrintOperation* _sender, + gpointer self); +static void print_manager_on_status_changed (PrintManager* self, + GtkPrintOperation* job); +static void _print_manager_on_status_changed_gtk_print_operation_status_changed (GtkPrintOperation* _sender, + gpointer self); GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); void page_window_set_busy_cursor (PageWindow* self); -ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable); -ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable); +ProgressDialog* progress_dialog_new (GtkWindow* owner, + const gchar* text, + GCancellable* cancellable); +ProgressDialog* progress_dialog_construct (GType object_type, + GtkWindow* owner, + const gchar* text, + GCancellable* cancellable); void progress_dialog_close (ProgressDialog* self); void page_window_set_normal_cursor (PageWindow* self); -void app_window_error_message (const gchar* message, GtkWindow* parent); +void app_window_error_message (const gchar* message, + GtkWindow* parent); void spin_event_loop (void); -void progress_dialog_set_status (ProgressDialog* self, const gchar* text); -static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo, gdouble x, gdouble y, gdouble canvas_width, gdouble canvas_height, gboolean crop, PrintJob* job, GtkPrintContext* job_context); -static void print_manager_add_title_to_canvas (PrintManager* self, gdouble x, gdouble y, const gchar* title, PrintJob* job, GtkPrintContext* job_context); -gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop); -static void print_manager_on_custom_widget_apply (PrintManager* self, GtkWidget* custom_widget); -static void _print_manager_on_custom_widget_apply_gtk_print_operation_custom_widget_apply (GtkPrintOperation* _sender, GtkWidget* widget, gpointer self); -void print_manager_set_global_settings (PrintManager* self, PrintSettings* settings); -void dimensions_init (Dimensions *self, gint width, gint height); -static gboolean print_manager_are_approximately_equal (PrintManager* self, gdouble val1, gdouble val2); +void progress_dialog_set_status (ProgressDialog* self, + const gchar* text); +static void print_manager_fit_image_to_canvas (PrintManager* self, + Photo* photo, + gdouble x, + gdouble y, + gdouble canvas_width, + gdouble canvas_height, + gboolean crop, + PrintJob* job, + GtkPrintContext* job_context); +static void print_manager_add_title_to_canvas (PrintManager* self, + gdouble x, + gdouble y, + const gchar* title, + PrintJob* job, + GtkPrintContext* job_context); +gboolean progress_dialog_monitor (ProgressDialog* self, + guint64 count, + guint64 total, + gboolean do_event_loop); +static void print_manager_on_custom_widget_apply (PrintManager* self, + GtkWidget* custom_widget); +static void _print_manager_on_custom_widget_apply_gtk_print_operation_custom_widget_apply (GtkPrintOperation* _sender, + GtkWidget* widget, + gpointer self); +void print_manager_set_global_settings (PrintManager* self, + PrintSettings* settings); +void dimensions_init (Dimensions *self, + gint width, + gint height); +static gboolean print_manager_are_approximately_equal (PrintManager* self, + gdouble val1, + gdouble val2); GType scaling_get_type (void) G_GNUC_CONST; GType scale_constraint_get_type (void) G_GNUC_CONST; Scaling* scaling_dup (const Scaling* self); void scaling_free (Scaling* self); -void scaling_to_fill_viewport (Dimensions* viewport, Scaling* result); -GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error); -void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result); -GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInterpType interp, gboolean scale_up); -void scaling_for_viewport (Dimensions* viewport, gboolean scale_up, Scaling* result); +void scaling_to_fill_viewport (Dimensions* viewport, + Scaling* result); +GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, + Scaling* scaling, + GError** error); +void dimensions_for_pixbuf (GdkPixbuf* pixbuf, + Dimensions* result); +GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, + GdkPixbuf* pixbuf, + GdkInterpType interp, + gboolean scale_up); +void scaling_for_viewport (Dimensions* viewport, + gboolean scale_up, + Scaling* result); static void _vala_PangoFontDescription_free (PangoFontDescription* self); static void print_manager_finalize (PrintManager * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -GType content_layout_get_type (void) { +GType +content_layout_get_type (void) +{ static volatile gsize content_layout_type_id__volatile = 0; if (g_once_init_enter (&content_layout_type_id__volatile)) { static const GEnumValue values[] = {{CONTENT_LAYOUT_STANDARD_SIZE, "CONTENT_LAYOUT_STANDARD_SIZE", "standard-size"}, {CONTENT_LAYOUT_CUSTOM_SIZE, "CONTENT_LAYOUT_CUSTOM_SIZE", "custom-size"}, {CONTENT_LAYOUT_IMAGE_PER_PAGE, "CONTENT_LAYOUT_IMAGE_PER_PAGE", "image-per-page"}, {0, NULL, NULL}}; @@ -674,21 +885,14 @@ GType content_layout_get_type (void) { } -PrintSettings* print_settings_construct (GType object_type) { +PrintSettings* +print_settings_construct (GType object_type) +{ PrintSettings* self = NULL; ConfigFacade* config = NULL; ConfigFacade* _tmp0_; MeasurementUnit units = 0; - gint _tmp1_; - gdouble _tmp2_; - gdouble _tmp3_; - gint _tmp4_; - gint _tmp5_; - gboolean _tmp6_; - gboolean _tmp7_; - gchar* _tmp8_; - gint _tmp9_; - gint _tmp10_; + gchar* _tmp1_; #line 30 "/home/jens/Source/shotwell/src/Printing.vala" self = (PrintSettings*) g_type_create_instance (object_type); #line 31 "/home/jens/Source/shotwell/src/Printing.vala" @@ -696,63 +900,49 @@ PrintSettings* print_settings_construct (GType object_type) { #line 31 "/home/jens/Source/shotwell/src/Printing.vala" config = _tmp0_; #line 33 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = configuration_facade_get_printing_content_units (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 33 "/home/jens/Source/shotwell/src/Printing.vala" - units = (MeasurementUnit) _tmp1_; + units = (MeasurementUnit) configuration_facade_get_printing_content_units (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 35 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = configuration_facade_get_printing_content_width (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 35 "/home/jens/Source/shotwell/src/Printing.vala" - measurement_init (&self->priv->content_width, _tmp2_, units); -#line 36 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = configuration_facade_get_printing_content_height (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + measurement_init (&self->priv->content_width, configuration_facade_get_printing_content_width (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)), units); #line 36 "/home/jens/Source/shotwell/src/Printing.vala" - measurement_init (&self->priv->content_height, _tmp3_, units); + measurement_init (&self->priv->content_height, configuration_facade_get_printing_content_height (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)), units); #line 37 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = configuration_facade_get_printing_size_selection (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 37 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->size_selection = _tmp4_; -#line 38 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = configuration_facade_get_printing_content_layout (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + self->priv->size_selection = configuration_facade_get_printing_size_selection (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 38 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->content_layout = (ContentLayout) _tmp5_; + self->priv->content_layout = (ContentLayout) configuration_facade_get_printing_content_layout (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 39 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = configuration_facade_get_printing_match_aspect_ratio (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 39 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->match_aspect_ratio = _tmp6_; -#line 40 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = configuration_facade_get_printing_print_titles (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + self->priv->match_aspect_ratio = configuration_facade_get_printing_match_aspect_ratio (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 40 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->print_titles = _tmp7_; + self->priv->print_titles = configuration_facade_get_printing_print_titles (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 41 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = configuration_facade_get_printing_titles_font (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp1_ = configuration_facade_get_printing_titles_font (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 41 "/home/jens/Source/shotwell/src/Printing.vala" _g_free0 (self->priv->print_titles_font); #line 41 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->print_titles_font = _tmp8_; -#line 42 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = configuration_facade_get_printing_images_per_page (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + self->priv->print_titles_font = _tmp1_; #line 42 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->image_per_page_selection = _tmp9_; + self->priv->image_per_page_selection = configuration_facade_get_printing_images_per_page (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 43 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp10_ = configuration_facade_get_printing_content_ppi (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 43 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->content_ppi = _tmp10_; + self->priv->content_ppi = configuration_facade_get_printing_content_ppi (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 30 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (config); #line 30 "/home/jens/Source/shotwell/src/Printing.vala" return self; -#line 745 "Printing.c" +#line 931 "Printing.c" } -PrintSettings* print_settings_new (void) { +PrintSettings* +print_settings_new (void) +{ #line 30 "/home/jens/Source/shotwell/src/Printing.vala" return print_settings_construct (TYPE_PRINT_SETTINGS); -#line 752 "Printing.c" +#line 940 "Printing.c" } -void print_settings_save (PrintSettings* self) { +void +print_settings_save (PrintSettings* self) +{ ConfigFacade* config = NULL; ConfigFacade* _tmp0_; Measurement _tmp1_; @@ -822,145 +1012,142 @@ void print_settings_save (PrintSettings* self) { configuration_facade_set_printing_content_ppi (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp13_); #line 46 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (config); -#line 826 "Printing.c" +#line 1016 "Printing.c" } -void print_settings_get_content_width (PrintSettings* self, Measurement* result) { - ContentLayout _tmp0_; +void +print_settings_get_content_width (PrintSettings* self, + Measurement* result) +{ #line 62 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_SETTINGS (self)); #line 63 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = print_settings_get_content_layout (self); -#line 63 "/home/jens/Source/shotwell/src/Printing.vala" - switch (_tmp0_) { + switch (print_settings_get_content_layout (self)) { #line 63 "/home/jens/Source/shotwell/src/Printing.vala" case CONTENT_LAYOUT_STANDARD_SIZE: #line 63 "/home/jens/Source/shotwell/src/Printing.vala" case CONTENT_LAYOUT_IMAGE_PER_PAGE: -#line 842 "Printing.c" +#line 1032 "Printing.c" { + PrintManager* _tmp0_; PrintManager* _tmp1_; - PrintManager* _tmp2_; - gint _tmp3_; - StandardPrintSize** _tmp4_; - gint _tmp5_; - StandardPrintSize* _tmp6_; - Measurement _tmp7_; - Measurement _tmp8_; + gint _tmp2_; + StandardPrintSize** _tmp3_; + StandardPrintSize* _tmp4_; + Measurement _tmp5_; + Measurement _tmp6_; #line 66 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = print_manager_get_instance (); + _tmp0_ = print_manager_get_instance (); #line 66 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 66 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = print_manager_get_standard_sizes (_tmp2_, &_tmp3_); + _tmp3_ = print_manager_get_standard_sizes (_tmp1_, &_tmp2_); #line 66 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = print_settings_get_size_selection (self); + _tmp4_ = _tmp3_[print_settings_get_size_selection (self)]; #line 66 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = _tmp4_[_tmp5_]; + _tmp5_ = _tmp4_->width; #line 66 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = _tmp6_->width; + _tmp6_ = _tmp5_; #line 66 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = _tmp7_; + _print_manager_unref0 (_tmp1_); #line 66 "/home/jens/Source/shotwell/src/Printing.vala" - _print_manager_unref0 (_tmp2_); -#line 66 "/home/jens/Source/shotwell/src/Printing.vala" - *result = _tmp8_; + *result = _tmp6_; #line 66 "/home/jens/Source/shotwell/src/Printing.vala" return; -#line 872 "Printing.c" +#line 1059 "Printing.c" } #line 63 "/home/jens/Source/shotwell/src/Printing.vala" case CONTENT_LAYOUT_CUSTOM_SIZE: -#line 876 "Printing.c" +#line 1063 "Printing.c" { - Measurement _tmp9_; + Measurement _tmp7_; #line 70 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = self->priv->content_width; + _tmp7_ = self->priv->content_width; #line 70 "/home/jens/Source/shotwell/src/Printing.vala" - *result = _tmp9_; + *result = _tmp7_; #line 70 "/home/jens/Source/shotwell/src/Printing.vala" return; -#line 885 "Printing.c" +#line 1072 "Printing.c" } default: { #line 73 "/home/jens/Source/shotwell/src/Printing.vala" g_error ("Printing.vala:73: unknown ContentLayout enumeration value"); -#line 891 "Printing.c" +#line 1078 "Printing.c" } } } -void print_settings_get_content_height (PrintSettings* self, Measurement* result) { - ContentLayout _tmp0_; +void +print_settings_get_content_height (PrintSettings* self, + Measurement* result) +{ #line 77 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_SETTINGS (self)); #line 78 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = print_settings_get_content_layout (self); -#line 78 "/home/jens/Source/shotwell/src/Printing.vala" - switch (_tmp0_) { + switch (print_settings_get_content_layout (self)) { #line 78 "/home/jens/Source/shotwell/src/Printing.vala" case CONTENT_LAYOUT_STANDARD_SIZE: #line 78 "/home/jens/Source/shotwell/src/Printing.vala" case CONTENT_LAYOUT_IMAGE_PER_PAGE: -#line 909 "Printing.c" +#line 1096 "Printing.c" { + PrintManager* _tmp0_; PrintManager* _tmp1_; - PrintManager* _tmp2_; - gint _tmp3_; - StandardPrintSize** _tmp4_; - gint _tmp5_; - StandardPrintSize* _tmp6_; - Measurement _tmp7_; - Measurement _tmp8_; + gint _tmp2_; + StandardPrintSize** _tmp3_; + StandardPrintSize* _tmp4_; + Measurement _tmp5_; + Measurement _tmp6_; #line 81 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = print_manager_get_instance (); + _tmp0_ = print_manager_get_instance (); #line 81 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 81 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = print_manager_get_standard_sizes (_tmp2_, &_tmp3_); + _tmp3_ = print_manager_get_standard_sizes (_tmp1_, &_tmp2_); #line 81 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = print_settings_get_size_selection (self); + _tmp4_ = _tmp3_[print_settings_get_size_selection (self)]; #line 81 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = _tmp4_[_tmp5_]; + _tmp5_ = _tmp4_->height; #line 81 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = _tmp6_->height; + _tmp6_ = _tmp5_; #line 81 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = _tmp7_; + _print_manager_unref0 (_tmp1_); #line 81 "/home/jens/Source/shotwell/src/Printing.vala" - _print_manager_unref0 (_tmp2_); -#line 81 "/home/jens/Source/shotwell/src/Printing.vala" - *result = _tmp8_; + *result = _tmp6_; #line 81 "/home/jens/Source/shotwell/src/Printing.vala" return; -#line 939 "Printing.c" +#line 1123 "Printing.c" } #line 78 "/home/jens/Source/shotwell/src/Printing.vala" case CONTENT_LAYOUT_CUSTOM_SIZE: -#line 943 "Printing.c" +#line 1127 "Printing.c" { - Measurement _tmp9_; + Measurement _tmp7_; #line 85 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = self->priv->content_height; + _tmp7_ = self->priv->content_height; #line 85 "/home/jens/Source/shotwell/src/Printing.vala" - *result = _tmp9_; + *result = _tmp7_; #line 85 "/home/jens/Source/shotwell/src/Printing.vala" return; -#line 952 "Printing.c" +#line 1136 "Printing.c" } default: { #line 88 "/home/jens/Source/shotwell/src/Printing.vala" g_error ("Printing.vala:88: unknown ContentLayout enumeration value"); -#line 958 "Printing.c" +#line 1142 "Printing.c" } } } -void print_settings_get_minimum_content_dimension (PrintSettings* self, Measurement* result) { +void +print_settings_get_minimum_content_dimension (PrintSettings* self, + Measurement* result) +{ Measurement _tmp0_ = {0}; #line 92 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_SETTINGS (self)); @@ -970,11 +1157,14 @@ void print_settings_get_minimum_content_dimension (PrintSettings* self, Measurem *result = _tmp0_; #line 93 "/home/jens/Source/shotwell/src/Printing.vala" return; -#line 974 "Printing.c" +#line 1161 "Printing.c" } -void print_settings_get_maximum_content_dimension (PrintSettings* self, Measurement* result) { +void +print_settings_get_maximum_content_dimension (PrintSettings* self, + Measurement* result) +{ Measurement _tmp0_ = {0}; #line 96 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_SETTINGS (self)); @@ -984,11 +1174,13 @@ void print_settings_get_maximum_content_dimension (PrintSettings* self, Measurem *result = _tmp0_; #line 97 "/home/jens/Source/shotwell/src/Printing.vala" return; -#line 988 "Printing.c" +#line 1178 "Printing.c" } -gboolean print_settings_is_match_aspect_ratio_enabled (PrintSettings* self) { +gboolean +print_settings_is_match_aspect_ratio_enabled (PrintSettings* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 100 "/home/jens/Source/shotwell/src/Printing.vala" @@ -999,11 +1191,13 @@ gboolean print_settings_is_match_aspect_ratio_enabled (PrintSettings* self) { result = _tmp0_; #line 101 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 1003 "Printing.c" +#line 1195 "Printing.c" } -gboolean print_settings_is_print_titles_enabled (PrintSettings* self) { +gboolean +print_settings_is_print_titles_enabled (PrintSettings* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 104 "/home/jens/Source/shotwell/src/Printing.vala" @@ -1014,11 +1208,13 @@ gboolean print_settings_is_print_titles_enabled (PrintSettings* self) { result = _tmp0_; #line 105 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 1018 "Printing.c" +#line 1212 "Printing.c" } -gint print_settings_get_content_ppi (PrintSettings* self) { +gint +print_settings_get_content_ppi (PrintSettings* self) +{ gint result = 0; gint _tmp0_; #line 108 "/home/jens/Source/shotwell/src/Printing.vala" @@ -1029,11 +1225,13 @@ gint print_settings_get_content_ppi (PrintSettings* self) { result = _tmp0_; #line 109 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 1033 "Printing.c" +#line 1229 "Printing.c" } -gint print_settings_get_image_per_page_selection (PrintSettings* self) { +gint +print_settings_get_image_per_page_selection (PrintSettings* self) +{ gint result = 0; gint _tmp0_; #line 112 "/home/jens/Source/shotwell/src/Printing.vala" @@ -1044,11 +1242,13 @@ gint print_settings_get_image_per_page_selection (PrintSettings* self) { result = _tmp0_; #line 113 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 1048 "Printing.c" +#line 1246 "Printing.c" } -gint print_settings_get_size_selection (PrintSettings* self) { +gint +print_settings_get_size_selection (PrintSettings* self) +{ gint result = 0; gint _tmp0_; #line 116 "/home/jens/Source/shotwell/src/Printing.vala" @@ -1059,11 +1259,13 @@ gint print_settings_get_size_selection (PrintSettings* self) { result = _tmp0_; #line 117 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 1063 "Printing.c" +#line 1263 "Printing.c" } -ContentLayout print_settings_get_content_layout (PrintSettings* self) { +ContentLayout +print_settings_get_content_layout (PrintSettings* self) +{ ContentLayout result = 0; ContentLayout _tmp0_; #line 120 "/home/jens/Source/shotwell/src/Printing.vala" @@ -1074,23 +1276,26 @@ ContentLayout print_settings_get_content_layout (PrintSettings* self) { result = _tmp0_; #line 121 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 1078 "Printing.c" +#line 1280 "Printing.c" } -void print_settings_set_content_layout (PrintSettings* self, ContentLayout content_layout) { - ContentLayout _tmp0_; +void +print_settings_set_content_layout (PrintSettings* self, + ContentLayout content_layout) +{ #line 124 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_SETTINGS (self)); #line 125 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = content_layout; -#line 125 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->content_layout = _tmp0_; -#line 1090 "Printing.c" + self->priv->content_layout = content_layout; +#line 1292 "Printing.c" } -void print_settings_set_content_width (PrintSettings* self, Measurement* content_width) { +void +print_settings_set_content_width (PrintSettings* self, + Measurement* content_width) +{ Measurement _tmp0_; #line 128 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_SETTINGS (self)); @@ -1100,11 +1305,14 @@ void print_settings_set_content_width (PrintSettings* self, Measurement* content _tmp0_ = *content_width; #line 129 "/home/jens/Source/shotwell/src/Printing.vala" self->priv->content_width = _tmp0_; -#line 1104 "Printing.c" +#line 1309 "Printing.c" } -void print_settings_set_content_height (PrintSettings* self, Measurement* content_height) { +void +print_settings_set_content_height (PrintSettings* self, + Measurement* content_height) +{ Measurement _tmp0_; #line 132 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_SETTINGS (self)); @@ -1114,90 +1322,92 @@ void print_settings_set_content_height (PrintSettings* self, Measurement* conten _tmp0_ = *content_height; #line 133 "/home/jens/Source/shotwell/src/Printing.vala" self->priv->content_height = _tmp0_; -#line 1118 "Printing.c" +#line 1326 "Printing.c" } -void print_settings_set_content_ppi (PrintSettings* self, gint content_ppi) { - gint _tmp0_; +void +print_settings_set_content_ppi (PrintSettings* self, + gint content_ppi) +{ #line 136 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_SETTINGS (self)); #line 137 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = content_ppi; -#line 137 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->content_ppi = _tmp0_; -#line 1130 "Printing.c" + self->priv->content_ppi = content_ppi; +#line 1338 "Printing.c" } -void print_settings_set_image_per_page_selection (PrintSettings* self, gint image_per_page_selection) { - gint _tmp0_; +void +print_settings_set_image_per_page_selection (PrintSettings* self, + gint image_per_page_selection) +{ #line 140 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_SETTINGS (self)); #line 141 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = image_per_page_selection; -#line 141 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->image_per_page_selection = _tmp0_; -#line 1142 "Printing.c" + self->priv->image_per_page_selection = image_per_page_selection; +#line 1350 "Printing.c" } -void print_settings_set_size_selection (PrintSettings* self, gint size_selection) { - gint _tmp0_; +void +print_settings_set_size_selection (PrintSettings* self, + gint size_selection) +{ #line 144 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_SETTINGS (self)); #line 145 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = size_selection; -#line 145 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->size_selection = _tmp0_; -#line 1154 "Printing.c" + self->priv->size_selection = size_selection; +#line 1362 "Printing.c" } -void print_settings_set_match_aspect_ratio_enabled (PrintSettings* self, gboolean enable_state) { - gboolean _tmp0_; +void +print_settings_set_match_aspect_ratio_enabled (PrintSettings* self, + gboolean enable_state) +{ #line 148 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_SETTINGS (self)); #line 149 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = enable_state; -#line 149 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->match_aspect_ratio = _tmp0_; -#line 1166 "Printing.c" + self->priv->match_aspect_ratio = enable_state; +#line 1374 "Printing.c" } -void print_settings_set_print_titles_enabled (PrintSettings* self, gboolean print_titles) { - gboolean _tmp0_; +void +print_settings_set_print_titles_enabled (PrintSettings* self, + gboolean print_titles) +{ #line 152 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_SETTINGS (self)); #line 153 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = print_titles; -#line 153 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->print_titles = _tmp0_; -#line 1178 "Printing.c" + self->priv->print_titles = print_titles; +#line 1386 "Printing.c" } -void print_settings_set_print_titles_font (PrintSettings* self, const gchar* fontname) { - const gchar* _tmp0_; - gchar* _tmp1_; +void +print_settings_set_print_titles_font (PrintSettings* self, + const gchar* fontname) +{ + gchar* _tmp0_; #line 156 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_SETTINGS (self)); #line 156 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (fontname != NULL); #line 157 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = fontname; -#line 157 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (fontname); #line 157 "/home/jens/Source/shotwell/src/Printing.vala" _g_free0 (self->priv->print_titles_font); #line 157 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->print_titles_font = _tmp1_; -#line 1197 "Printing.c" + self->priv->print_titles_font = _tmp0_; +#line 1405 "Printing.c" } -gchar* print_settings_get_print_titles_font (PrintSettings* self) { +gchar* +print_settings_get_print_titles_font (PrintSettings* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -1211,108 +1421,133 @@ gchar* print_settings_get_print_titles_font (PrintSettings* self) { result = _tmp1_; #line 161 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 1215 "Printing.c" +#line 1425 "Printing.c" } -static void value_print_settings_init (GValue* value) { +static void +value_print_settings_init (GValue* value) +{ #line 13 "/home/jens/Source/shotwell/src/Printing.vala" value->data[0].v_pointer = NULL; -#line 1222 "Printing.c" +#line 1434 "Printing.c" } -static void value_print_settings_free_value (GValue* value) { +static void +value_print_settings_free_value (GValue* value) +{ #line 13 "/home/jens/Source/shotwell/src/Printing.vala" if (value->data[0].v_pointer) { #line 13 "/home/jens/Source/shotwell/src/Printing.vala" print_settings_unref (value->data[0].v_pointer); -#line 1231 "Printing.c" +#line 1445 "Printing.c" } } -static void value_print_settings_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_print_settings_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 13 "/home/jens/Source/shotwell/src/Printing.vala" if (src_value->data[0].v_pointer) { #line 13 "/home/jens/Source/shotwell/src/Printing.vala" dest_value->data[0].v_pointer = print_settings_ref (src_value->data[0].v_pointer); -#line 1241 "Printing.c" +#line 1458 "Printing.c" } else { #line 13 "/home/jens/Source/shotwell/src/Printing.vala" dest_value->data[0].v_pointer = NULL; -#line 1245 "Printing.c" +#line 1462 "Printing.c" } } -static gpointer value_print_settings_peek_pointer (const GValue* value) { +static gpointer +value_print_settings_peek_pointer (const GValue* value) +{ #line 13 "/home/jens/Source/shotwell/src/Printing.vala" return value->data[0].v_pointer; -#line 1253 "Printing.c" +#line 1472 "Printing.c" } -static gchar* value_print_settings_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_print_settings_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 13 "/home/jens/Source/shotwell/src/Printing.vala" if (collect_values[0].v_pointer) { -#line 1260 "Printing.c" +#line 1484 "Printing.c" PrintSettings * object; object = collect_values[0].v_pointer; #line 13 "/home/jens/Source/shotwell/src/Printing.vala" if (object->parent_instance.g_class == NULL) { #line 13 "/home/jens/Source/shotwell/src/Printing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1267 "Printing.c" +#line 1491 "Printing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 13 "/home/jens/Source/shotwell/src/Printing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1271 "Printing.c" +#line 1495 "Printing.c" } #line 13 "/home/jens/Source/shotwell/src/Printing.vala" value->data[0].v_pointer = print_settings_ref (object); -#line 1275 "Printing.c" +#line 1499 "Printing.c" } else { #line 13 "/home/jens/Source/shotwell/src/Printing.vala" value->data[0].v_pointer = NULL; -#line 1279 "Printing.c" +#line 1503 "Printing.c" } #line 13 "/home/jens/Source/shotwell/src/Printing.vala" return NULL; -#line 1283 "Printing.c" +#line 1507 "Printing.c" } -static gchar* value_print_settings_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_print_settings_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PrintSettings ** object_p; object_p = collect_values[0].v_pointer; #line 13 "/home/jens/Source/shotwell/src/Printing.vala" if (!object_p) { #line 13 "/home/jens/Source/shotwell/src/Printing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1294 "Printing.c" +#line 1523 "Printing.c" } #line 13 "/home/jens/Source/shotwell/src/Printing.vala" if (!value->data[0].v_pointer) { #line 13 "/home/jens/Source/shotwell/src/Printing.vala" *object_p = NULL; -#line 1300 "Printing.c" +#line 1529 "Printing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 13 "/home/jens/Source/shotwell/src/Printing.vala" *object_p = value->data[0].v_pointer; -#line 1304 "Printing.c" +#line 1533 "Printing.c" } else { #line 13 "/home/jens/Source/shotwell/src/Printing.vala" *object_p = print_settings_ref (value->data[0].v_pointer); -#line 1308 "Printing.c" +#line 1537 "Printing.c" } #line 13 "/home/jens/Source/shotwell/src/Printing.vala" return NULL; -#line 1312 "Printing.c" +#line 1541 "Printing.c" } -GParamSpec* param_spec_print_settings (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_print_settings (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPrintSettings* spec; #line 13 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PRINT_SETTINGS), NULL); @@ -1322,20 +1557,25 @@ GParamSpec* param_spec_print_settings (const gchar* name, const gchar* nick, con G_PARAM_SPEC (spec)->value_type = object_type; #line 13 "/home/jens/Source/shotwell/src/Printing.vala" return G_PARAM_SPEC (spec); -#line 1326 "Printing.c" +#line 1561 "Printing.c" } -gpointer value_get_print_settings (const GValue* value) { +gpointer +value_get_print_settings (const GValue* value) +{ #line 13 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PRINT_SETTINGS), NULL); #line 13 "/home/jens/Source/shotwell/src/Printing.vala" return value->data[0].v_pointer; -#line 1335 "Printing.c" +#line 1572 "Printing.c" } -void value_set_print_settings (GValue* value, gpointer v_object) { +void +value_set_print_settings (GValue* value, + gpointer v_object) +{ PrintSettings * old; #line 13 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PRINT_SETTINGS)); @@ -1351,22 +1591,25 @@ void value_set_print_settings (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 13 "/home/jens/Source/shotwell/src/Printing.vala" print_settings_ref (value->data[0].v_pointer); -#line 1355 "Printing.c" +#line 1595 "Printing.c" } else { #line 13 "/home/jens/Source/shotwell/src/Printing.vala" value->data[0].v_pointer = NULL; -#line 1359 "Printing.c" +#line 1599 "Printing.c" } #line 13 "/home/jens/Source/shotwell/src/Printing.vala" if (old) { #line 13 "/home/jens/Source/shotwell/src/Printing.vala" print_settings_unref (old); -#line 1365 "Printing.c" +#line 1605 "Printing.c" } } -void value_take_print_settings (GValue* value, gpointer v_object) { +void +value_take_print_settings (GValue* value, + gpointer v_object) +{ PrintSettings * old; #line 13 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PRINT_SETTINGS)); @@ -1380,42 +1623,48 @@ void value_take_print_settings (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 13 "/home/jens/Source/shotwell/src/Printing.vala" value->data[0].v_pointer = v_object; -#line 1384 "Printing.c" +#line 1627 "Printing.c" } else { #line 13 "/home/jens/Source/shotwell/src/Printing.vala" value->data[0].v_pointer = NULL; -#line 1388 "Printing.c" +#line 1631 "Printing.c" } #line 13 "/home/jens/Source/shotwell/src/Printing.vala" if (old) { #line 13 "/home/jens/Source/shotwell/src/Printing.vala" print_settings_unref (old); -#line 1394 "Printing.c" +#line 1637 "Printing.c" } } -static void print_settings_class_init (PrintSettingsClass * klass) { +static void +print_settings_class_init (PrintSettingsClass * klass) +{ #line 13 "/home/jens/Source/shotwell/src/Printing.vala" print_settings_parent_class = g_type_class_peek_parent (klass); #line 13 "/home/jens/Source/shotwell/src/Printing.vala" ((PrintSettingsClass *) klass)->finalize = print_settings_finalize; #line 13 "/home/jens/Source/shotwell/src/Printing.vala" g_type_class_add_private (klass, sizeof (PrintSettingsPrivate)); -#line 1406 "Printing.c" +#line 1651 "Printing.c" } -static void print_settings_instance_init (PrintSettings * self) { +static void +print_settings_instance_init (PrintSettings * self) +{ #line 13 "/home/jens/Source/shotwell/src/Printing.vala" self->priv = PRINT_SETTINGS_GET_PRIVATE (self); #line 13 "/home/jens/Source/shotwell/src/Printing.vala" self->ref_count = 1; -#line 1415 "Printing.c" +#line 1662 "Printing.c" } -static void print_settings_finalize (PrintSettings * obj) { +static void +print_settings_finalize (PrintSettings * obj) +{ PrintSettings * self; #line 13 "/home/jens/Source/shotwell/src/Printing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PRINT_SETTINGS, PrintSettings); @@ -1423,11 +1672,13 @@ static void print_settings_finalize (PrintSettings * obj) { g_signal_handlers_destroy (self); #line 28 "/home/jens/Source/shotwell/src/Printing.vala" _g_free0 (self->priv->print_titles_font); -#line 1427 "Printing.c" +#line 1676 "Printing.c" } -GType print_settings_get_type (void) { +GType +print_settings_get_type (void) +{ static volatile gsize print_settings_type_id__volatile = 0; if (g_once_init_enter (&print_settings_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_print_settings_init, value_print_settings_free_value, value_print_settings_copy_value, value_print_settings_peek_pointer, "p", value_print_settings_collect_value, "p", value_print_settings_lcopy_value }; @@ -1441,18 +1692,22 @@ GType print_settings_get_type (void) { } -gpointer print_settings_ref (gpointer instance) { +gpointer +print_settings_ref (gpointer instance) +{ PrintSettings * self; self = instance; #line 13 "/home/jens/Source/shotwell/src/Printing.vala" g_atomic_int_inc (&self->ref_count); #line 13 "/home/jens/Source/shotwell/src/Printing.vala" return instance; -#line 1452 "Printing.c" +#line 1705 "Printing.c" } -void print_settings_unref (gpointer instance) { +void +print_settings_unref (gpointer instance) +{ PrintSettings * self; self = instance; #line 13 "/home/jens/Source/shotwell/src/Printing.vala" @@ -1461,12 +1716,14 @@ void print_settings_unref (gpointer instance) { PRINT_SETTINGS_GET_CLASS (self)->finalize (self); #line 13 "/home/jens/Source/shotwell/src/Printing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1465 "Printing.c" +#line 1720 "Printing.c" } } -GType measurement_unit_get_type (void) { +GType +measurement_unit_get_type (void) +{ static volatile gsize measurement_unit_type_id__volatile = 0; if (g_once_init_enter (&measurement_unit_type_id__volatile)) { static const GEnumValue values[] = {{MEASUREMENT_UNIT_INCHES, "MEASUREMENT_UNIT_INCHES", "inches"}, {MEASUREMENT_UNIT_CENTIMETERS, "MEASUREMENT_UNIT_CENTIMETERS", "centimeters"}, {0, NULL, NULL}}; @@ -1478,83 +1735,79 @@ GType measurement_unit_get_type (void) { } -void measurement_init (Measurement *self, gdouble value, MeasurementUnit unit) { - gdouble _tmp0_; - MeasurementUnit _tmp1_; +void +measurement_init (Measurement *self, + gdouble value, + MeasurementUnit unit) +{ #line 185 "/home/jens/Source/shotwell/src/Printing.vala" memset (self, 0, sizeof (Measurement)); #line 186 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = value; -#line 186 "/home/jens/Source/shotwell/src/Printing.vala" - (*self).value = _tmp0_; -#line 187 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = unit; + (*self).value = value; #line 187 "/home/jens/Source/shotwell/src/Printing.vala" - (*self).unit = _tmp1_; -#line 1495 "Printing.c" + (*self).unit = unit; +#line 1750 "Printing.c" } -void measurement_convert_to (Measurement *self, MeasurementUnit to_unit, Measurement* result) { +void +measurement_convert_to (Measurement *self, + MeasurementUnit to_unit, + Measurement* result) +{ MeasurementUnit _tmp0_; - MeasurementUnit _tmp1_; - MeasurementUnit _tmp2_; #line 191 "/home/jens/Source/shotwell/src/Printing.vala" _tmp0_ = (*self).unit; #line 191 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = to_unit; -#line 191 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp0_ == _tmp1_) { + if (_tmp0_ == to_unit) { #line 192 "/home/jens/Source/shotwell/src/Printing.vala" *result = (*self); #line 192 "/home/jens/Source/shotwell/src/Printing.vala" return; -#line 1513 "Printing.c" +#line 1768 "Printing.c" } #line 194 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = to_unit; -#line 194 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp2_ == MEASUREMENT_UNIT_INCHES) { -#line 1519 "Printing.c" - gdouble _tmp3_; - Measurement _tmp4_ = {0}; + if (to_unit == MEASUREMENT_UNIT_INCHES) { +#line 1772 "Printing.c" + gdouble _tmp1_; + Measurement _tmp2_ = {0}; #line 195 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = (*self).value; + _tmp1_ = (*self).value; #line 195 "/home/jens/Source/shotwell/src/Printing.vala" - measurement_init (&_tmp4_, _tmp3_ * MEASUREMENT_INCHES_PER_CENTIMETER, MEASUREMENT_UNIT_INCHES); + measurement_init (&_tmp2_, _tmp1_ * MEASUREMENT_INCHES_PER_CENTIMETER, MEASUREMENT_UNIT_INCHES); #line 195 "/home/jens/Source/shotwell/src/Printing.vala" - *result = _tmp4_; + *result = _tmp2_; #line 195 "/home/jens/Source/shotwell/src/Printing.vala" return; -#line 1530 "Printing.c" +#line 1783 "Printing.c" } else { - MeasurementUnit _tmp5_; #line 196 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = to_unit; -#line 196 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp5_ == MEASUREMENT_UNIT_CENTIMETERS) { -#line 1537 "Printing.c" - gdouble _tmp6_; - Measurement _tmp7_ = {0}; + if (to_unit == MEASUREMENT_UNIT_CENTIMETERS) { +#line 1787 "Printing.c" + gdouble _tmp3_; + Measurement _tmp4_ = {0}; #line 197 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = (*self).value; + _tmp3_ = (*self).value; #line 197 "/home/jens/Source/shotwell/src/Printing.vala" - measurement_init (&_tmp7_, _tmp6_ * MEASUREMENT_CENTIMETERS_PER_INCH, MEASUREMENT_UNIT_CENTIMETERS); + measurement_init (&_tmp4_, _tmp3_ * MEASUREMENT_CENTIMETERS_PER_INCH, MEASUREMENT_UNIT_CENTIMETERS); #line 197 "/home/jens/Source/shotwell/src/Printing.vala" - *result = _tmp7_; + *result = _tmp4_; #line 197 "/home/jens/Source/shotwell/src/Printing.vala" return; -#line 1548 "Printing.c" +#line 1798 "Printing.c" } else { #line 199 "/home/jens/Source/shotwell/src/Printing.vala" g_error ("Printing.vala:199: unrecognized unit"); -#line 1552 "Printing.c" +#line 1802 "Printing.c" } } } -gboolean measurement_is_less_than (Measurement *self, Measurement* rhs) { +gboolean +measurement_is_less_than (Measurement *self, + Measurement* rhs) +{ gboolean result = FALSE; Measurement _tmp0_ = {0}; MeasurementUnit _tmp1_; @@ -1574,13 +1827,13 @@ gboolean measurement_is_less_than (Measurement *self, Measurement* rhs) { _tmp3_ = _tmp2_.unit; #line 204 "/home/jens/Source/shotwell/src/Printing.vala" if (_tmp1_ == _tmp3_) { -#line 1578 "Printing.c" +#line 1831 "Printing.c" Measurement _tmp4_; #line 204 "/home/jens/Source/shotwell/src/Printing.vala" _tmp4_ = *rhs; #line 204 "/home/jens/Source/shotwell/src/Printing.vala" _tmp0_ = _tmp4_; -#line 1584 "Printing.c" +#line 1837 "Printing.c" } else { MeasurementUnit _tmp5_; Measurement _tmp6_ = {0}; @@ -1590,7 +1843,7 @@ gboolean measurement_is_less_than (Measurement *self, Measurement* rhs) { measurement_convert_to (rhs, _tmp5_, &_tmp6_); #line 204 "/home/jens/Source/shotwell/src/Printing.vala" _tmp0_ = _tmp6_; -#line 1594 "Printing.c" +#line 1847 "Printing.c" } #line 204 "/home/jens/Source/shotwell/src/Printing.vala" converted_rhs = _tmp0_; @@ -1604,11 +1857,14 @@ gboolean measurement_is_less_than (Measurement *self, Measurement* rhs) { result = _tmp7_ < _tmp9_; #line 205 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 1608 "Printing.c" +#line 1861 "Printing.c" } -gboolean measurement_is_greater_than (Measurement *self, Measurement* rhs) { +gboolean +measurement_is_greater_than (Measurement *self, + Measurement* rhs) +{ gboolean result = FALSE; Measurement _tmp0_ = {0}; MeasurementUnit _tmp1_; @@ -1628,13 +1884,13 @@ gboolean measurement_is_greater_than (Measurement *self, Measurement* rhs) { _tmp3_ = _tmp2_.unit; #line 209 "/home/jens/Source/shotwell/src/Printing.vala" if (_tmp1_ == _tmp3_) { -#line 1632 "Printing.c" +#line 1888 "Printing.c" Measurement _tmp4_; #line 209 "/home/jens/Source/shotwell/src/Printing.vala" _tmp4_ = *rhs; #line 209 "/home/jens/Source/shotwell/src/Printing.vala" _tmp0_ = _tmp4_; -#line 1638 "Printing.c" +#line 1894 "Printing.c" } else { MeasurementUnit _tmp5_; Measurement _tmp6_ = {0}; @@ -1644,7 +1900,7 @@ gboolean measurement_is_greater_than (Measurement *self, Measurement* rhs) { measurement_convert_to (rhs, _tmp5_, &_tmp6_); #line 209 "/home/jens/Source/shotwell/src/Printing.vala" _tmp0_ = _tmp6_; -#line 1648 "Printing.c" +#line 1904 "Printing.c" } #line 209 "/home/jens/Source/shotwell/src/Printing.vala" converted_rhs = _tmp0_; @@ -1658,11 +1914,13 @@ gboolean measurement_is_greater_than (Measurement *self, Measurement* rhs) { result = _tmp7_ > _tmp9_; #line 210 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 1662 "Printing.c" +#line 1918 "Printing.c" } -Measurement* measurement_dup (const Measurement* self) { +Measurement* +measurement_dup (const Measurement* self) +{ Measurement* dup; #line 178 "/home/jens/Source/shotwell/src/Printing.vala" dup = g_new0 (Measurement, 1); @@ -1670,18 +1928,22 @@ Measurement* measurement_dup (const Measurement* self) { memcpy (dup, self, sizeof (Measurement)); #line 178 "/home/jens/Source/shotwell/src/Printing.vala" return dup; -#line 1674 "Printing.c" +#line 1932 "Printing.c" } -void measurement_free (Measurement* self) { +void +measurement_free (Measurement* self) +{ #line 178 "/home/jens/Source/shotwell/src/Printing.vala" g_free (self); -#line 1681 "Printing.c" +#line 1941 "Printing.c" } -GType measurement_get_type (void) { +GType +measurement_get_type (void) +{ static volatile gsize measurement_type_id__volatile = 0; if (g_once_init_enter (&measurement_type_id__volatile)) { GType measurement_type_id; @@ -1692,7 +1954,9 @@ GType measurement_get_type (void) { } -PrintLayout* print_layout_get_all (int* result_length1) { +PrintLayout* +print_layout_get_all (int* result_length1) +{ PrintLayout* result = NULL; PrintLayout* _tmp0_; PrintLayout* _tmp1_; @@ -1721,17 +1985,19 @@ PrintLayout* print_layout_get_all (int* result_length1) { if (result_length1) { #line 224 "/home/jens/Source/shotwell/src/Printing.vala" *result_length1 = _tmp1__length1; -#line 1725 "Printing.c" +#line 1989 "Printing.c" } #line 224 "/home/jens/Source/shotwell/src/Printing.vala" result = _tmp1_; #line 224 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 1731 "Printing.c" +#line 1995 "Printing.c" } -gint print_layout_get_per_page (PrintLayout self) { +gint +print_layout_get_per_page (PrintLayout self) +{ gint result = 0; gint* per_page = NULL; gint* _tmp0_; @@ -1768,11 +2034,13 @@ gint print_layout_get_per_page (PrintLayout self) { per_page = (g_free (per_page), NULL); #line 238 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 1772 "Printing.c" +#line 2038 "Printing.c" } -gint print_layout_get_x (PrintLayout self) { +gint +print_layout_get_x (PrintLayout self) +{ gint result = 0; gint* x = NULL; gint* _tmp0_; @@ -1809,11 +2077,13 @@ gint print_layout_get_x (PrintLayout self) { x = (g_free (x), NULL); #line 244 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 1813 "Printing.c" +#line 2081 "Printing.c" } -gint print_layout_get_y (PrintLayout self) { +gint +print_layout_get_y (PrintLayout self) +{ gint result = 0; gint* y = NULL; gint* _tmp0_; @@ -1850,11 +2120,13 @@ gint print_layout_get_y (PrintLayout self) { y = (g_free (y), NULL); #line 250 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 1854 "Printing.c" +#line 2124 "Printing.c" } -gchar* print_layout_to_string (PrintLayout self) { +gchar* +print_layout_to_string (PrintLayout self) +{ gchar* result = NULL; gchar** labels = NULL; gchar* _tmp0_; @@ -1915,11 +2187,13 @@ gchar* print_layout_to_string (PrintLayout self) { labels = (_vala_array_free (labels, labels_length1, (GDestroyNotify) g_free), NULL); #line 264 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 1919 "Printing.c" +#line 2191 "Printing.c" } -GType print_layout_get_type (void) { +GType +print_layout_get_type (void) +{ static volatile gsize print_layout_type_id__volatile = 0; if (g_once_init_enter (&print_layout_type_id__volatile)) { static const GEnumValue values[] = {{PRINT_LAYOUT_ENTIRE_PAGE, "PRINT_LAYOUT_ENTIRE_PAGE", "entire-page"}, {PRINT_LAYOUT_TWO_PER_PAGE, "PRINT_LAYOUT_TWO_PER_PAGE", "two-per-page"}, {PRINT_LAYOUT_FOUR_PER_PAGE, "PRINT_LAYOUT_FOUR_PER_PAGE", "four-per-page"}, {PRINT_LAYOUT_SIX_PER_PAGE, "PRINT_LAYOUT_SIX_PER_PAGE", "six-per-page"}, {PRINT_LAYOUT_EIGHT_PER_PAGE, "PRINT_LAYOUT_EIGHT_PER_PAGE", "eight-per-page"}, {PRINT_LAYOUT_SIXTEEN_PER_PAGE, "PRINT_LAYOUT_SIXTEEN_PER_PAGE", "sixteen-per-page"}, {PRINT_LAYOUT_THIRTY_TWO_PER_PAGE, "PRINT_LAYOUT_THIRTY_TWO_PER_PAGE", "thirty-two-per-page"}, {0, NULL, NULL}}; @@ -1931,404 +2205,434 @@ GType print_layout_get_type (void) { } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 305 "/home/jens/Source/shotwell/src/Printing.vala" return self ? g_object_ref (self) : NULL; -#line 1938 "Printing.c" +#line 2214 "Printing.c" } -static void _custom_print_tab_on_radio_group_click_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_custom_print_tab_on_radio_group_click_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 307 "/home/jens/Source/shotwell/src/Printing.vala" custom_print_tab_on_radio_group_click ((CustomPrintTab*) self, _sender); -#line 1945 "Printing.c" +#line 2224 "Printing.c" } -static gboolean _custom_print_tab_standard_sizes_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self) { +static gboolean +_custom_print_tab_standard_sizes_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, + GtkTreeIter* iter, + gpointer self) +{ gboolean result; result = custom_print_tab_standard_sizes_combo_separator_func (model, iter); #line 316 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 1954 "Printing.c" +#line 2237 "Printing.c" } -static gpointer _standard_print_size_ref0 (gpointer self) { +static gpointer +_standard_print_size_ref0 (gpointer self) +{ #line 317 "/home/jens/Source/shotwell/src/Printing.vala" return self ? standard_print_size_ref (self) : NULL; -#line 1961 "Printing.c" +#line 2246 "Printing.c" } -static void _custom_print_tab_on_entry_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) { +static void +_custom_print_tab_on_entry_insert_text_gtk_editable_insert_text (GtkEditable* _sender, + const gchar* new_text, + gint new_text_length, + gint* position, + gpointer self) +{ #line 323 "/home/jens/Source/shotwell/src/Printing.vala" custom_print_tab_on_entry_insert_text ((CustomPrintTab*) self, _sender, new_text, new_text_length, position); -#line 1968 "Printing.c" +#line 2259 "Printing.c" } -static gboolean _custom_print_tab_on_width_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) { +static gboolean +_custom_print_tab_on_width_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, + GdkEventFocus* event, + gpointer self) +{ gboolean result; result = custom_print_tab_on_width_entry_focus_out ((CustomPrintTab*) self, event); #line 324 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 1977 "Printing.c" +#line 2272 "Printing.c" } -static gboolean _custom_print_tab_on_height_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) { +static gboolean +_custom_print_tab_on_height_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, + GdkEventFocus* event, + gpointer self) +{ gboolean result; result = custom_print_tab_on_height_entry_focus_out ((CustomPrintTab*) self, event); #line 327 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 1986 "Printing.c" +#line 2285 "Printing.c" } -static void _custom_print_tab_on_units_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void +_custom_print_tab_on_units_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self) +{ #line 329 "/home/jens/Source/shotwell/src/Printing.vala" custom_print_tab_on_units_combo_changed ((CustomPrintTab*) self); -#line 1993 "Printing.c" +#line 2295 "Printing.c" } -static void _custom_print_tab_on_ppi_entry_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) { +static void +_custom_print_tab_on_ppi_entry_insert_text_gtk_editable_insert_text (GtkEditable* _sender, + const gchar* new_text, + gint new_text_length, + gint* position, + gpointer self) +{ #line 332 "/home/jens/Source/shotwell/src/Printing.vala" custom_print_tab_on_ppi_entry_insert_text ((CustomPrintTab*) self, _sender, new_text, new_text_length, position); -#line 2000 "Printing.c" +#line 2308 "Printing.c" } -static gboolean _custom_print_tab_on_ppi_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) { +static gboolean +_custom_print_tab_on_ppi_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, + GdkEventFocus* event, + gpointer self) +{ gboolean result; result = custom_print_tab_on_ppi_entry_focus_out ((CustomPrintTab*) self, event); #line 333 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 2009 "Printing.c" +#line 2321 "Printing.c" } -static void _custom_print_tab_on_aspect_ratio_check_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_custom_print_tab_on_aspect_ratio_check_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 340 "/home/jens/Source/shotwell/src/Printing.vala" custom_print_tab_on_aspect_ratio_check_clicked ((CustomPrintTab*) self); -#line 2016 "Printing.c" +#line 2331 "Printing.c" } -CustomPrintTab* custom_print_tab_construct (GType object_type, PrintJob* source_job) { +CustomPrintTab* +custom_print_tab_construct (GType object_type, + PrintJob* source_job) +{ CustomPrintTab * self = NULL; PrintJob* _tmp0_; - PrintJob* _tmp1_; + GtkRadioButton* _tmp1_; GtkRadioButton* _tmp2_; GtkRadioButton* _tmp3_; - GtkRadioButton* _tmp4_; - gint _tmp5_; - PrintLayout* _tmp6_; + gint _tmp4_; + PrintLayout* _tmp5_; StandardPrintSize** standard_sizes = NULL; + PrintManager* _tmp10_; PrintManager* _tmp11_; - PrintManager* _tmp12_; - gint _tmp13_; + gint _tmp12_; + StandardPrintSize** _tmp13_; StandardPrintSize** _tmp14_; - StandardPrintSize** _tmp15_; - gint _tmp15__length1; + gint _tmp14__length1; gint standard_sizes_length1; gint _standard_sizes_size_; - GtkComboBoxText* _tmp16_; - StandardPrintSize** _tmp17_; - gint _tmp17__length1; - GtkComboBoxText* _tmp22_; - ResourcesUnitSystem _tmp23_; + GtkComboBoxText* _tmp15_; + StandardPrintSize** _tmp16_; + gint _tmp16__length1; + GtkComboBoxText* _tmp21_; + GtkEntry* _tmp22_; + GtkEntry* _tmp23_; GtkEntry* _tmp24_; GtkEntry* _tmp25_; - GtkEntry* _tmp26_; - GtkEntry* _tmp27_; - GtkComboBoxText* _tmp28_; - GtkComboBoxText* _tmp29_; - ResourcesUnitSystem _tmp30_; - GtkEntry* _tmp31_; - GtkEntry* _tmp32_; - PrintJob* _tmp33_; - GtkCheckButton* _tmp34_; + GtkComboBoxText* _tmp26_; + GtkComboBoxText* _tmp27_; + GtkEntry* _tmp28_; + GtkEntry* _tmp29_; + GtkCheckButton* _tmp30_; #line 304 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (IS_PRINT_JOB (source_job), NULL); #line 304 "/home/jens/Source/shotwell/src/Printing.vala" self = (CustomPrintTab*) g_object_new (object_type, NULL); #line 305 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = source_job; -#line 305 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (source_job); #line 305 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (self->priv->source_job); #line 305 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->source_job = _tmp1_; + self->priv->source_job = _tmp0_; #line 307 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = self->priv->standard_size_radio; + _tmp1_ = self->priv->standard_size_radio; #line 307 "/home/jens/Source/shotwell/src/Printing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_radio_group_click_gtk_button_clicked, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_radio_group_click_gtk_button_clicked, self, 0); #line 308 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = self->priv->custom_size_radio; + _tmp2_ = self->priv->custom_size_radio; #line 308 "/home/jens/Source/shotwell/src/Printing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_radio_group_click_gtk_button_clicked, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_radio_group_click_gtk_button_clicked, self, 0); #line 309 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = self->priv->image_per_page_radio; + _tmp3_ = self->priv->image_per_page_radio; #line 309 "/home/jens/Source/shotwell/src/Printing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_radio_group_click_gtk_button_clicked, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_radio_group_click_gtk_button_clicked, self, 0); #line 311 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = print_layout_get_all (&_tmp5_); -#line 2080 "Printing.c" + _tmp5_ = print_layout_get_all (&_tmp4_); +#line 2392 "Printing.c" { PrintLayout* layout_collection = NULL; gint layout_collection_length1 = 0; gint _layout_collection_size_ = 0; gint layout_it = 0; #line 311 "/home/jens/Source/shotwell/src/Printing.vala" - layout_collection = _tmp6_; + layout_collection = _tmp5_; #line 311 "/home/jens/Source/shotwell/src/Printing.vala" - layout_collection_length1 = _tmp5_; + layout_collection_length1 = _tmp4_; #line 311 "/home/jens/Source/shotwell/src/Printing.vala" - for (layout_it = 0; layout_it < _tmp5_; layout_it = layout_it + 1) { -#line 2092 "Printing.c" + for (layout_it = 0; layout_it < _tmp4_; layout_it = layout_it + 1) { +#line 2404 "Printing.c" PrintLayout layout = 0; #line 311 "/home/jens/Source/shotwell/src/Printing.vala" layout = layout_collection[layout_it]; -#line 2096 "Printing.c" +#line 2408 "Printing.c" { - GtkComboBoxText* _tmp7_; - PrintLayout _tmp8_; + GtkComboBoxText* _tmp6_; + PrintLayout _tmp7_; + gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; #line 312 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = self->priv->image_per_page_combo; + _tmp6_ = self->priv->image_per_page_combo; #line 312 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = layout; + _tmp7_ = layout; #line 312 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = print_layout_to_string (_tmp8_); + _tmp8_ = print_layout_to_string (_tmp7_); #line 312 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 312 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_combo_box_text_append_text (_tmp7_, _tmp10_); + gtk_combo_box_text_append_text (_tmp6_, _tmp9_); #line 312 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp10_); -#line 2114 "Printing.c" + _g_free0 (_tmp9_); +#line 2426 "Printing.c" } } #line 311 "/home/jens/Source/shotwell/src/Printing.vala" layout_collection = (g_free (layout_collection), NULL); -#line 2119 "Printing.c" +#line 2431 "Printing.c" } #line 315 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp11_ = print_manager_get_instance (); + _tmp10_ = print_manager_get_instance (); #line 315 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 315 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp14_ = print_manager_get_standard_sizes (_tmp12_, &_tmp13_); + _tmp13_ = print_manager_get_standard_sizes (_tmp11_, &_tmp12_); #line 315 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 315 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp15__length1 = _tmp13_; + _tmp14__length1 = _tmp12_; #line 315 "/home/jens/Source/shotwell/src/Printing.vala" - _print_manager_unref0 (_tmp12_); + _print_manager_unref0 (_tmp11_); #line 315 "/home/jens/Source/shotwell/src/Printing.vala" - standard_sizes = _tmp15_; + standard_sizes = _tmp14_; #line 315 "/home/jens/Source/shotwell/src/Printing.vala" - standard_sizes_length1 = _tmp15__length1; + standard_sizes_length1 = _tmp14__length1; #line 315 "/home/jens/Source/shotwell/src/Printing.vala" _standard_sizes_size_ = standard_sizes_length1; #line 316 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp16_ = self->priv->standard_sizes_combo; + _tmp15_ = self->priv->standard_sizes_combo; #line 316 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_combo_box_set_row_separator_func (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), _custom_print_tab_standard_sizes_combo_separator_func_gtk_tree_view_row_separator_func, NULL, NULL); + gtk_combo_box_set_row_separator_func (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_combo_box_get_type (), GtkComboBox), _custom_print_tab_standard_sizes_combo_separator_func_gtk_tree_view_row_separator_func, NULL, NULL); #line 317 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp17_ = standard_sizes; + _tmp16_ = standard_sizes; #line 317 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp17__length1 = standard_sizes_length1; -#line 2147 "Printing.c" + _tmp16__length1 = standard_sizes_length1; +#line 2459 "Printing.c" { StandardPrintSize** size_collection = NULL; gint size_collection_length1 = 0; gint _size_collection_size_ = 0; gint size_it = 0; #line 317 "/home/jens/Source/shotwell/src/Printing.vala" - size_collection = _tmp17_; + size_collection = _tmp16_; #line 317 "/home/jens/Source/shotwell/src/Printing.vala" - size_collection_length1 = _tmp17__length1; + size_collection_length1 = _tmp16__length1; #line 317 "/home/jens/Source/shotwell/src/Printing.vala" - for (size_it = 0; size_it < _tmp17__length1; size_it = size_it + 1) { -#line 2159 "Printing.c" - StandardPrintSize* _tmp18_; + for (size_it = 0; size_it < _tmp16__length1; size_it = size_it + 1) { +#line 2471 "Printing.c" + StandardPrintSize* _tmp17_; StandardPrintSize* size = NULL; #line 317 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp18_ = _standard_print_size_ref0 (size_collection[size_it]); + _tmp17_ = _standard_print_size_ref0 (size_collection[size_it]); #line 317 "/home/jens/Source/shotwell/src/Printing.vala" - size = _tmp18_; -#line 2166 "Printing.c" + size = _tmp17_; +#line 2478 "Printing.c" { - GtkComboBoxText* _tmp19_; - StandardPrintSize* _tmp20_; - const gchar* _tmp21_; + GtkComboBoxText* _tmp18_; + StandardPrintSize* _tmp19_; + const gchar* _tmp20_; #line 318 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp19_ = self->priv->standard_sizes_combo; + _tmp18_ = self->priv->standard_sizes_combo; #line 318 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp20_ = size; + _tmp19_ = size; #line 318 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp21_ = _tmp20_->name; + _tmp20_ = _tmp19_->name; #line 318 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_combo_box_text_append_text (_tmp19_, _tmp21_); + gtk_combo_box_text_append_text (_tmp18_, _tmp20_); #line 317 "/home/jens/Source/shotwell/src/Printing.vala" _standard_print_size_unref0 (size); -#line 2181 "Printing.c" +#line 2493 "Printing.c" } } } #line 321 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp22_ = self->priv->standard_sizes_combo; + _tmp21_ = self->priv->standard_sizes_combo; #line 321 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp23_ = resources_get_default_measurement_unit (); -#line 321 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_combo_box_get_type (), GtkComboBox), 9 * _tmp23_); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_combo_box_get_type (), GtkComboBox), 9 * resources_get_default_measurement_unit ()); #line 323 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp24_ = self->priv->custom_width_entry; + _tmp22_ = self->priv->custom_width_entry; #line 323 "/home/jens/Source/shotwell/src/Printing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _custom_print_tab_on_entry_insert_text_gtk_editable_insert_text, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_editable_get_type (), GtkEditable), "insert-text", (GCallback) _custom_print_tab_on_entry_insert_text_gtk_editable_insert_text, self, 0); #line 324 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp25_ = self->priv->custom_width_entry; + _tmp23_ = self->priv->custom_width_entry; #line 324 "/home/jens/Source/shotwell/src/Printing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _custom_print_tab_on_width_entry_focus_out_gtk_widget_focus_out_event, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _custom_print_tab_on_width_entry_focus_out_gtk_widget_focus_out_event, self, 0); #line 326 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp26_ = self->priv->custom_height_entry; + _tmp24_ = self->priv->custom_height_entry; #line 326 "/home/jens/Source/shotwell/src/Printing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _custom_print_tab_on_entry_insert_text_gtk_editable_insert_text, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_editable_get_type (), GtkEditable), "insert-text", (GCallback) _custom_print_tab_on_entry_insert_text_gtk_editable_insert_text, self, 0); #line 327 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp27_ = self->priv->custom_height_entry; + _tmp25_ = self->priv->custom_height_entry; #line 327 "/home/jens/Source/shotwell/src/Printing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _custom_print_tab_on_height_entry_focus_out_gtk_widget_focus_out_event, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _custom_print_tab_on_height_entry_focus_out_gtk_widget_focus_out_event, self, 0); #line 329 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp28_ = self->priv->units_combo; + _tmp26_ = self->priv->units_combo; #line 329 "/home/jens/Source/shotwell/src/Printing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _custom_print_tab_on_units_combo_changed_gtk_combo_box_changed, self, 0); -#line 330 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp29_ = self->priv->units_combo; + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _custom_print_tab_on_units_combo_changed_gtk_combo_box_changed, self, 0); #line 330 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp30_ = resources_get_default_measurement_unit (); + _tmp27_ = self->priv->units_combo; #line 330 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp30_); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_combo_box_get_type (), GtkComboBox), (gint) resources_get_default_measurement_unit ()); #line 332 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp31_ = self->priv->ppi_entry; + _tmp28_ = self->priv->ppi_entry; #line 332 "/home/jens/Source/shotwell/src/Printing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _custom_print_tab_on_ppi_entry_insert_text_gtk_editable_insert_text, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_editable_get_type (), GtkEditable), "insert-text", (GCallback) _custom_print_tab_on_ppi_entry_insert_text_gtk_editable_insert_text, self, 0); #line 333 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp32_ = self->priv->ppi_entry; + _tmp29_ = self->priv->ppi_entry; #line 333 "/home/jens/Source/shotwell/src/Printing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _custom_print_tab_on_ppi_entry_focus_out_gtk_widget_focus_out_event, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _custom_print_tab_on_ppi_entry_focus_out_gtk_widget_focus_out_event, self, 0); #line 335 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp33_ = source_job; -#line 335 "/home/jens/Source/shotwell/src/Printing.vala" - custom_print_tab_sync_state_from_job (self, _tmp33_); + custom_print_tab_sync_state_from_job (self, source_job); #line 337 "/home/jens/Source/shotwell/src/Printing.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 340 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp34_ = self->priv->aspect_ratio_check; + _tmp30_ = self->priv->aspect_ratio_check; #line 340 "/home/jens/Source/shotwell/src/Printing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_aspect_ratio_check_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_aspect_ratio_check_clicked_gtk_button_clicked, self, 0); #line 304 "/home/jens/Source/shotwell/src/Printing.vala" return self; -#line 2237 "Printing.c" +#line 2543 "Printing.c" } -CustomPrintTab* custom_print_tab_new (PrintJob* source_job) { +CustomPrintTab* +custom_print_tab_new (PrintJob* source_job) +{ #line 304 "/home/jens/Source/shotwell/src/Printing.vala" return custom_print_tab_construct (TYPE_CUSTOM_PRINT_TAB, source_job); -#line 2244 "Printing.c" +#line 2552 "Printing.c" } -static void custom_print_tab_on_aspect_ratio_check_clicked (CustomPrintTab* self) { +static void +custom_print_tab_on_aspect_ratio_check_clicked (CustomPrintTab* self) +{ GtkCheckButton* _tmp0_; - gboolean _tmp1_; #line 343 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_CUSTOM_PRINT_TAB (self)); #line 344 "/home/jens/Source/shotwell/src/Printing.vala" _tmp0_ = self->priv->aspect_ratio_check; #line 344 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 344 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp1_) { -#line 2259 "Printing.c" - Measurement _tmp2_; - gdouble _tmp3_; - PrintJob* _tmp4_; - gdouble _tmp5_; - Measurement _tmp6_; - MeasurementUnit _tmp7_; - GtkEntry* _tmp8_; - Measurement _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; -#line 345 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = self->priv->local_content_height; + if (gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton))) { +#line 2566 "Printing.c" + Measurement _tmp1_; + gdouble _tmp2_; + PrintJob* _tmp3_; + Measurement _tmp4_; + MeasurementUnit _tmp5_; + GtkEntry* _tmp6_; + Measurement _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 345 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = _tmp2_.value; + _tmp1_ = self->priv->local_content_height; #line 345 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = self->priv->source_job; + _tmp2_ = _tmp1_.value; #line 345 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = print_job_get_source_aspect_ratio (_tmp4_); + _tmp3_ = self->priv->source_job; #line 345 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = self->priv->local_content_height; + _tmp4_ = self->priv->local_content_height; #line 345 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = _tmp6_.unit; + _tmp5_ = _tmp4_.unit; #line 345 "/home/jens/Source/shotwell/src/Printing.vala" - measurement_init (&self->priv->local_content_width, _tmp3_ * _tmp5_, _tmp7_); + measurement_init (&self->priv->local_content_width, _tmp2_ * print_job_get_source_aspect_ratio (_tmp3_), _tmp5_); #line 348 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = self->priv->custom_width_entry; + _tmp6_ = self->priv->custom_width_entry; #line 348 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = self->priv->local_content_width; + _tmp7_ = self->priv->local_content_width; #line 348 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp10_ = custom_print_tab_format_measurement (self, &_tmp9_); + _tmp8_ = custom_print_tab_format_measurement (self, &_tmp7_); #line 348 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 348 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_entry_set_text (_tmp8_, _tmp11_); + gtk_entry_set_text (_tmp6_, _tmp9_); #line 348 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp11_); -#line 2296 "Printing.c" + _g_free0 (_tmp9_); +#line 2600 "Printing.c" } } -static gboolean custom_print_tab_on_width_entry_focus_out (CustomPrintTab* self, GdkEventFocus* event) { +static gboolean +custom_print_tab_on_width_entry_focus_out (CustomPrintTab* self, + GdkEventFocus* event) +{ gboolean result = FALSE; GtkEntry* _tmp0_; const gchar* _tmp1_; Measurement _tmp2_; - MeasurementUnit _tmp3_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; - gboolean _tmp6_; + gboolean _tmp5_; Measurement new_width = {0}; - Measurement _tmp7_ = {0}; + Measurement _tmp6_ = {0}; Measurement min_width = {0}; - PrintJob* _tmp8_; + PrintJob* _tmp7_; + PrintSettings* _tmp8_; PrintSettings* _tmp9_; - PrintSettings* _tmp10_; - Measurement _tmp11_ = {0}; - Measurement _tmp12_; + Measurement _tmp10_ = {0}; + Measurement _tmp11_; Measurement max_width = {0}; - PrintJob* _tmp13_; + PrintJob* _tmp12_; + PrintSettings* _tmp13_; PrintSettings* _tmp14_; - PrintSettings* _tmp15_; - Measurement _tmp16_ = {0}; - Measurement _tmp17_; - gboolean _tmp18_ = FALSE; - Measurement _tmp19_; - gboolean _tmp20_; - gboolean _tmp27_; - Measurement _tmp39_; - GtkEntry* _tmp40_; - Measurement _tmp41_; - gchar* _tmp42_; - gchar* _tmp43_; + Measurement _tmp15_ = {0}; + Measurement _tmp16_; + gboolean _tmp17_ = FALSE; + Measurement _tmp18_; + Measurement _tmp34_; + GtkEntry* _tmp35_; + Measurement _tmp36_; + gchar* _tmp37_; + gchar* _tmp38_; #line 352 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), FALSE); #line 352 "/home/jens/Source/shotwell/src/Printing.vala" @@ -2340,174 +2644,165 @@ static gboolean custom_print_tab_on_width_entry_focus_out (CustomPrintTab* self, #line 353 "/home/jens/Source/shotwell/src/Printing.vala" _tmp2_ = self->priv->local_content_width; #line 353 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = custom_print_tab_get_user_unit_choice (self); + _tmp3_ = custom_print_tab_format_measurement_as (self, &_tmp2_, custom_print_tab_get_user_unit_choice (self)); #line 353 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = custom_print_tab_format_measurement_as (self, &_tmp2_, _tmp3_); -#line 353 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 353 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = g_strcmp0 (_tmp1_, _tmp5_) == 0; + _tmp5_ = g_strcmp0 (_tmp1_, _tmp4_) == 0; #line 353 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp4_); #line 353 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp6_) { + if (_tmp5_) { #line 355 "/home/jens/Source/shotwell/src/Printing.vala" result = FALSE; #line 355 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 2359 "Printing.c" +#line 2661 "Printing.c" } #line 357 "/home/jens/Source/shotwell/src/Printing.vala" - custom_print_tab_get_width_entry_value (self, &_tmp7_); + custom_print_tab_get_width_entry_value (self, &_tmp6_); #line 357 "/home/jens/Source/shotwell/src/Printing.vala" - new_width = _tmp7_; + new_width = _tmp6_; #line 358 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = self->priv->source_job; + _tmp7_ = self->priv->source_job; #line 358 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = print_job_get_local_settings (_tmp8_); + _tmp8_ = print_job_get_local_settings (_tmp7_); #line 358 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 358 "/home/jens/Source/shotwell/src/Printing.vala" - print_settings_get_minimum_content_dimension (_tmp10_, &_tmp11_); + print_settings_get_minimum_content_dimension (_tmp9_, &_tmp10_); #line 358 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 358 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp10_); + _print_settings_unref0 (_tmp9_); #line 358 "/home/jens/Source/shotwell/src/Printing.vala" - min_width = _tmp12_; + min_width = _tmp11_; #line 359 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp13_ = self->priv->source_job; + _tmp12_ = self->priv->source_job; #line 359 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp14_ = print_job_get_local_settings (_tmp13_); + _tmp13_ = print_job_get_local_settings (_tmp12_); #line 359 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 359 "/home/jens/Source/shotwell/src/Printing.vala" - print_settings_get_maximum_content_dimension (_tmp15_, &_tmp16_); + print_settings_get_maximum_content_dimension (_tmp14_, &_tmp15_); #line 359 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 359 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp15_); + _print_settings_unref0 (_tmp14_); #line 359 "/home/jens/Source/shotwell/src/Printing.vala" - max_width = _tmp17_; -#line 361 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp19_ = min_width; + max_width = _tmp16_; #line 361 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp20_ = measurement_is_less_than (&new_width, &_tmp19_); + _tmp18_ = min_width; #line 361 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp20_) { + if (measurement_is_less_than (&new_width, &_tmp18_)) { #line 361 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp18_ = TRUE; -#line 2401 "Printing.c" + _tmp17_ = TRUE; +#line 2701 "Printing.c" } else { - Measurement _tmp21_; - gboolean _tmp22_; -#line 361 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp21_ = max_width; + Measurement _tmp19_; #line 361 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp22_ = measurement_is_greater_than (&new_width, &_tmp21_); + _tmp19_ = max_width; #line 361 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp18_ = _tmp22_; -#line 2411 "Printing.c" + _tmp17_ = measurement_is_greater_than (&new_width, &_tmp19_); +#line 2708 "Printing.c" } #line 361 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp18_) { -#line 2415 "Printing.c" - GtkEntry* _tmp23_; - Measurement _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; + if (_tmp17_) { +#line 2712 "Printing.c" + GtkEntry* _tmp20_; + Measurement _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; #line 362 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp23_ = self->priv->custom_width_entry; + _tmp20_ = self->priv->custom_width_entry; #line 362 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp24_ = self->priv->local_content_width; + _tmp21_ = self->priv->local_content_width; #line 362 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp25_ = custom_print_tab_format_measurement (self, &_tmp24_); + _tmp22_ = custom_print_tab_format_measurement (self, &_tmp21_); #line 362 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp26_ = _tmp25_; + _tmp23_ = _tmp22_; #line 362 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_entry_set_text (_tmp23_, _tmp26_); + gtk_entry_set_text (_tmp20_, _tmp23_); #line 362 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp23_); #line 363 "/home/jens/Source/shotwell/src/Printing.vala" result = FALSE; #line 363 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 2436 "Printing.c" +#line 2733 "Printing.c" } #line 366 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp27_ = custom_print_tab_is_match_aspect_ratio_enabled (self); -#line 366 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp27_) { -#line 2442 "Printing.c" + if (custom_print_tab_is_match_aspect_ratio_enabled (self)) { +#line 2737 "Printing.c" Measurement new_height = {0}; - Measurement _tmp28_; - gdouble _tmp29_; - PrintJob* _tmp30_; - gdouble _tmp31_; - Measurement _tmp32_; - MeasurementUnit _tmp33_; - Measurement _tmp34_; - GtkEntry* _tmp35_; - Measurement _tmp36_; - gchar* _tmp37_; - gchar* _tmp38_; -#line 367 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp28_ = new_width; + Measurement _tmp24_; + gdouble _tmp25_; + PrintJob* _tmp26_; + Measurement _tmp27_; + MeasurementUnit _tmp28_; + Measurement _tmp29_; + GtkEntry* _tmp30_; + Measurement _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; #line 367 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp29_ = _tmp28_.value; + _tmp24_ = new_width; #line 367 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp30_ = self->priv->source_job; + _tmp25_ = _tmp24_.value; #line 367 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp31_ = print_job_get_source_aspect_ratio (_tmp30_); + _tmp26_ = self->priv->source_job; #line 367 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp32_ = new_width; + _tmp27_ = new_width; #line 367 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp33_ = _tmp32_.unit; + _tmp28_ = _tmp27_.unit; #line 367 "/home/jens/Source/shotwell/src/Printing.vala" - measurement_init (&new_height, _tmp29_ / _tmp31_, _tmp33_); + measurement_init (&new_height, _tmp25_ / print_job_get_source_aspect_ratio (_tmp26_), _tmp28_); #line 370 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp34_ = new_height; + _tmp29_ = new_height; #line 370 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->local_content_height = _tmp34_; + self->priv->local_content_height = _tmp29_; #line 371 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp35_ = self->priv->custom_height_entry; + _tmp30_ = self->priv->custom_height_entry; #line 371 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp36_ = new_height; + _tmp31_ = new_height; #line 371 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp37_ = custom_print_tab_format_measurement (self, &_tmp36_); + _tmp32_ = custom_print_tab_format_measurement (self, &_tmp31_); #line 371 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp38_ = _tmp37_; + _tmp33_ = _tmp32_; #line 371 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_entry_set_text (_tmp35_, _tmp38_); + gtk_entry_set_text (_tmp30_, _tmp33_); #line 371 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp38_); -#line 2485 "Printing.c" + _g_free0 (_tmp33_); +#line 2777 "Printing.c" } #line 374 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp39_ = new_width; + _tmp34_ = new_width; #line 374 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->local_content_width = _tmp39_; + self->priv->local_content_width = _tmp34_; #line 375 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp40_ = self->priv->custom_width_entry; + _tmp35_ = self->priv->custom_width_entry; #line 375 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp41_ = new_width; + _tmp36_ = new_width; #line 375 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp42_ = custom_print_tab_format_measurement (self, &_tmp41_); + _tmp37_ = custom_print_tab_format_measurement (self, &_tmp36_); #line 375 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp43_ = _tmp42_; + _tmp38_ = _tmp37_; #line 375 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_entry_set_text (_tmp40_, _tmp43_); + gtk_entry_set_text (_tmp35_, _tmp38_); #line 375 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp43_); + _g_free0 (_tmp38_); #line 376 "/home/jens/Source/shotwell/src/Printing.vala" result = FALSE; #line 376 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 2507 "Printing.c" +#line 2799 "Printing.c" } -static gchar* custom_print_tab_format_measurement (CustomPrintTab* self, Measurement* measurement) { +static gchar* +custom_print_tab_format_measurement (CustomPrintTab* self, + Measurement* measurement) +{ gchar* result = NULL; Measurement _tmp0_; gdouble _tmp1_; @@ -2526,19 +2821,22 @@ static gchar* custom_print_tab_format_measurement (CustomPrintTab* self, Measure result = _tmp2_; #line 380 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 2530 "Printing.c" +#line 2825 "Printing.c" } -static gchar* custom_print_tab_format_measurement_as (CustomPrintTab* self, Measurement* measurement, MeasurementUnit to_unit) { +static gchar* +custom_print_tab_format_measurement_as (CustomPrintTab* self, + Measurement* measurement, + MeasurementUnit to_unit) +{ gchar* result = NULL; Measurement _tmp0_ = {0}; Measurement _tmp1_; MeasurementUnit _tmp2_; - MeasurementUnit _tmp3_; Measurement converted_measurement = {0}; - Measurement _tmp7_; - gchar* _tmp8_; + Measurement _tmp5_; + gchar* _tmp6_; #line 383 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), NULL); #line 383 "/home/jens/Source/shotwell/src/Printing.vala" @@ -2548,46 +2846,43 @@ static gchar* custom_print_tab_format_measurement_as (CustomPrintTab* self, Meas #line 384 "/home/jens/Source/shotwell/src/Printing.vala" _tmp2_ = _tmp1_.unit; #line 384 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = to_unit; -#line 384 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp2_ == _tmp3_) { -#line 2555 "Printing.c" - Measurement _tmp4_; + if (_tmp2_ == to_unit) { +#line 2851 "Printing.c" + Measurement _tmp3_; #line 384 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = *measurement; + _tmp3_ = *measurement; #line 384 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = _tmp4_; -#line 2561 "Printing.c" + _tmp0_ = _tmp3_; +#line 2857 "Printing.c" } else { - MeasurementUnit _tmp5_; - Measurement _tmp6_ = {0}; -#line 385 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = to_unit; + Measurement _tmp4_ = {0}; #line 385 "/home/jens/Source/shotwell/src/Printing.vala" - measurement_convert_to (measurement, _tmp5_, &_tmp6_); + measurement_convert_to (measurement, to_unit, &_tmp4_); #line 385 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = _tmp6_; -#line 2571 "Printing.c" + _tmp0_ = _tmp4_; +#line 2864 "Printing.c" } #line 384 "/home/jens/Source/shotwell/src/Printing.vala" converted_measurement = _tmp0_; #line 386 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = converted_measurement; + _tmp5_ = converted_measurement; #line 386 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = custom_print_tab_format_measurement (self, &_tmp7_); + _tmp6_ = custom_print_tab_format_measurement (self, &_tmp5_); #line 386 "/home/jens/Source/shotwell/src/Printing.vala" - result = _tmp8_; + result = _tmp6_; #line 386 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 2583 "Printing.c" +#line 2876 "Printing.c" } -static gboolean custom_print_tab_on_ppi_entry_focus_out (CustomPrintTab* self, GdkEventFocus* event) { +static gboolean +custom_print_tab_on_ppi_entry_focus_out (CustomPrintTab* self, + GdkEventFocus* event) +{ gboolean result = FALSE; GtkEntry* _tmp0_; const gchar* _tmp1_; - gint _tmp2_; #line 389 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), FALSE); #line 389 "/home/jens/Source/shotwell/src/Printing.vala" @@ -2597,47 +2892,49 @@ static gboolean custom_print_tab_on_ppi_entry_focus_out (CustomPrintTab* self, G #line 390 "/home/jens/Source/shotwell/src/Printing.vala" _tmp1_ = gtk_entry_get_text (_tmp0_); #line 390 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = atoi (_tmp1_); -#line 390 "/home/jens/Source/shotwell/src/Printing.vala" - custom_print_tab_set_content_ppi (self, _tmp2_); + custom_print_tab_set_content_ppi (self, atoi (_tmp1_)); #line 391 "/home/jens/Source/shotwell/src/Printing.vala" result = FALSE; #line 391 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 2608 "Printing.c" +#line 2901 "Printing.c" } -static gchar string_get (const gchar* self, glong index) { +static gchar +string_get (const gchar* self, + glong index) +{ gchar result = '\0'; - glong _tmp0_; - gchar _tmp1_; -#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar _tmp0_; +#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = index; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = ((gchar*) self)[index]; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2626 "Printing.c" +#line 2919 "Printing.c" } -static void custom_print_tab_on_ppi_entry_insert_text (CustomPrintTab* self, GtkEditable* editable, const gchar* text, gint length, gint* position) { +static void +custom_print_tab_on_ppi_entry_insert_text (CustomPrintTab* self, + GtkEditable* editable, + const gchar* text, + gint length, + gint* position) +{ GtkEntry* sender = NULL; - GtkEditable* _tmp0_; - GtkEntry* _tmp1_; - gboolean _tmp2_; - gint _tmp3_; + GtkEntry* _tmp0_; + gboolean _tmp1_; gchar* new_text = NULL; - gchar* _tmp7_; - const gchar* _tmp23_; - gint _tmp24_; - gint _tmp25_; - GtkEntry* _tmp31_; + gchar* _tmp4_; + const gchar* _tmp14_; + gint _tmp15_; + gint _tmp16_; + GtkEntry* _tmp22_; #line 394 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_CUSTOM_PRINT_TAB (self)); #line 394 "/home/jens/Source/shotwell/src/Printing.vala" @@ -2645,203 +2942,178 @@ static void custom_print_tab_on_ppi_entry_insert_text (CustomPrintTab* self, Gtk #line 394 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (text != NULL); #line 396 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = editable; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (editable, gtk_entry_get_type (), GtkEntry)); #line 396 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_entry_get_type (), GtkEntry)); -#line 396 "/home/jens/Source/shotwell/src/Printing.vala" - sender = _tmp1_; + sender = _tmp0_; #line 398 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = self->priv->is_text_insertion_in_progress; + _tmp1_ = self->priv->is_text_insertion_in_progress; #line 398 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp2_) { + if (_tmp1_) { #line 399 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (sender); #line 399 "/home/jens/Source/shotwell/src/Printing.vala" return; -#line 2662 "Printing.c" +#line 2957 "Printing.c" } #line 401 "/home/jens/Source/shotwell/src/Printing.vala" self->priv->is_text_insertion_in_progress = TRUE; #line 403 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = length; -#line 403 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp3_ == -1) { -#line 2670 "Printing.c" - const gchar* _tmp4_; - gint _tmp5_; - gint _tmp6_; -#line 404 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = text; + if (length == -1) { +#line 2963 "Printing.c" + gint _tmp2_; + gint _tmp3_; #line 404 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = strlen (_tmp4_); + _tmp2_ = strlen (text); #line 404 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 404 "/home/jens/Source/shotwell/src/Printing.vala" - length = (gint) _tmp6_; -#line 2682 "Printing.c" + length = (gint) _tmp3_; +#line 2972 "Printing.c" } #line 406 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = g_strdup (""); + _tmp4_ = g_strdup (""); #line 406 "/home/jens/Source/shotwell/src/Printing.vala" - new_text = _tmp7_; -#line 2688 "Printing.c" + new_text = _tmp4_; +#line 2978 "Printing.c" { gint ctr = 0; #line 407 "/home/jens/Source/shotwell/src/Printing.vala" ctr = 0; -#line 2693 "Printing.c" +#line 2983 "Printing.c" { - gboolean _tmp8_ = FALSE; + gboolean _tmp5_ = FALSE; #line 407 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = TRUE; + _tmp5_ = TRUE; #line 407 "/home/jens/Source/shotwell/src/Printing.vala" while (TRUE) { -#line 2700 "Printing.c" - gint _tmp10_; - gint _tmp11_; - const gchar* _tmp12_; - gint _tmp13_; - gchar _tmp14_; - gboolean _tmp15_; +#line 2990 "Printing.c" + gint _tmp7_; + gint _tmp8_; #line 407 "/home/jens/Source/shotwell/src/Printing.vala" - if (!_tmp8_) { -#line 2709 "Printing.c" - gint _tmp9_; + if (!_tmp5_) { +#line 2995 "Printing.c" + gint _tmp6_; #line 407 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = ctr; + _tmp6_ = ctr; #line 407 "/home/jens/Source/shotwell/src/Printing.vala" - ctr = _tmp9_ + 1; -#line 2715 "Printing.c" + ctr = _tmp6_ + 1; +#line 3001 "Printing.c" } #line 407 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = FALSE; + _tmp5_ = FALSE; #line 407 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp10_ = ctr; + _tmp7_ = ctr; #line 407 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp11_ = length; -#line 407 "/home/jens/Source/shotwell/src/Printing.vala" - if (!(_tmp10_ < _tmp11_)) { + if (!(_tmp7_ < length)) { #line 407 "/home/jens/Source/shotwell/src/Printing.vala" break; -#line 2727 "Printing.c" +#line 3011 "Printing.c" } #line 408 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp12_ = text; -#line 408 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp13_ = ctr; -#line 408 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp14_ = string_get (_tmp12_, (glong) _tmp13_); -#line 408 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp15_ = g_ascii_isdigit (_tmp14_); + _tmp8_ = ctr; #line 408 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp15_) { -#line 2739 "Printing.c" - const gchar* _tmp16_; - const gchar* _tmp17_; - gint _tmp18_; - gchar _tmp19_; - gchar* _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; + if (g_ascii_isdigit (string_get (text, (glong) _tmp8_))) { +#line 3017 "Printing.c" + const gchar* _tmp9_; + gint _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; #line 409 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp16_ = new_text; + _tmp9_ = new_text; #line 409 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp17_ = text; + _tmp10_ = ctr; #line 409 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp18_ = ctr; + _tmp11_ = g_strdup_printf ("%c", (gchar) string_get (text, (glong) _tmp10_)); #line 409 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp19_ = string_get (_tmp17_, (glong) _tmp18_); + _tmp12_ = _tmp11_; #line 409 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp20_ = g_strdup_printf ("%c", (gchar) _tmp19_); -#line 409 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp21_ = _tmp20_; -#line 409 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp22_ = g_strconcat (_tmp16_, _tmp21_, NULL); + _tmp13_ = g_strconcat (_tmp9_, _tmp12_, NULL); #line 409 "/home/jens/Source/shotwell/src/Printing.vala" _g_free0 (new_text); #line 409 "/home/jens/Source/shotwell/src/Printing.vala" - new_text = _tmp22_; + new_text = _tmp13_; #line 409 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp21_); -#line 2767 "Printing.c" + _g_free0 (_tmp12_); +#line 3039 "Printing.c" } } } } #line 412 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp23_ = new_text; + _tmp14_ = new_text; #line 412 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp24_ = strlen (_tmp23_); + _tmp15_ = strlen (_tmp14_); #line 412 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp25_ = _tmp24_; + _tmp16_ = _tmp15_; #line 412 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp25_ > 0) { -#line 2780 "Printing.c" - GtkEntry* _tmp26_; - const gchar* _tmp27_; - const gchar* _tmp28_; - gint _tmp29_; - gint _tmp30_; + if (_tmp16_ > 0) { +#line 3052 "Printing.c" + GtkEntry* _tmp17_; + const gchar* _tmp18_; + const gchar* _tmp19_; + gint _tmp20_; + gint _tmp21_; #line 413 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp26_ = sender; + _tmp17_ = sender; #line 413 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp27_ = new_text; + _tmp18_ = new_text; #line 413 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp28_ = new_text; + _tmp19_ = new_text; #line 413 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp29_ = strlen (_tmp28_); + _tmp20_ = strlen (_tmp19_); #line 413 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp30_ = _tmp29_; + _tmp21_ = _tmp20_; #line 413 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GTK_TYPE_EDITABLE, GtkEditable), _tmp27_, (gint) _tmp30_, position); -#line 2798 "Printing.c" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_editable_get_type (), GtkEditable), "insert-text", _tmp18_, (gint) _tmp21_, position); +#line 3070 "Printing.c" } #line 415 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp31_ = sender; + _tmp22_ = sender; #line 415 "/home/jens/Source/shotwell/src/Printing.vala" - g_signal_stop_emission_by_name (_tmp31_, "insert-text"); + g_signal_stop_emission_by_name (_tmp22_, "insert-text"); #line 417 "/home/jens/Source/shotwell/src/Printing.vala" self->priv->is_text_insertion_in_progress = FALSE; #line 394 "/home/jens/Source/shotwell/src/Printing.vala" _g_free0 (new_text); #line 394 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (sender); -#line 2810 "Printing.c" +#line 3082 "Printing.c" } -static gboolean custom_print_tab_on_height_entry_focus_out (CustomPrintTab* self, GdkEventFocus* event) { +static gboolean +custom_print_tab_on_height_entry_focus_out (CustomPrintTab* self, + GdkEventFocus* event) +{ gboolean result = FALSE; GtkEntry* _tmp0_; const gchar* _tmp1_; Measurement _tmp2_; - MeasurementUnit _tmp3_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; - gboolean _tmp6_; + gboolean _tmp5_; Measurement new_height = {0}; - Measurement _tmp7_ = {0}; + Measurement _tmp6_ = {0}; Measurement min_height = {0}; - PrintJob* _tmp8_; + PrintJob* _tmp7_; + PrintSettings* _tmp8_; PrintSettings* _tmp9_; - PrintSettings* _tmp10_; - Measurement _tmp11_ = {0}; - Measurement _tmp12_; + Measurement _tmp10_ = {0}; + Measurement _tmp11_; Measurement max_height = {0}; - PrintJob* _tmp13_; + PrintJob* _tmp12_; + PrintSettings* _tmp13_; PrintSettings* _tmp14_; - PrintSettings* _tmp15_; - Measurement _tmp16_ = {0}; - Measurement _tmp17_; - gboolean _tmp18_ = FALSE; - Measurement _tmp19_; - gboolean _tmp20_; - gboolean _tmp27_; - Measurement _tmp39_; - GtkEntry* _tmp40_; - Measurement _tmp41_; - gchar* _tmp42_; - gchar* _tmp43_; + Measurement _tmp15_ = {0}; + Measurement _tmp16_; + gboolean _tmp17_ = FALSE; + Measurement _tmp18_; + Measurement _tmp34_; + GtkEntry* _tmp35_; + Measurement _tmp36_; + gchar* _tmp37_; + gchar* _tmp38_; #line 420 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), FALSE); #line 420 "/home/jens/Source/shotwell/src/Printing.vala" @@ -2853,274 +3125,255 @@ static gboolean custom_print_tab_on_height_entry_focus_out (CustomPrintTab* self #line 421 "/home/jens/Source/shotwell/src/Printing.vala" _tmp2_ = self->priv->local_content_height; #line 421 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = custom_print_tab_get_user_unit_choice (self); + _tmp3_ = custom_print_tab_format_measurement_as (self, &_tmp2_, custom_print_tab_get_user_unit_choice (self)); #line 421 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = custom_print_tab_format_measurement_as (self, &_tmp2_, _tmp3_); -#line 421 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 421 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = g_strcmp0 (_tmp1_, _tmp5_) == 0; + _tmp5_ = g_strcmp0 (_tmp1_, _tmp4_) == 0; #line 421 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp4_); #line 421 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp6_) { + if (_tmp5_) { #line 423 "/home/jens/Source/shotwell/src/Printing.vala" result = FALSE; #line 423 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 2872 "Printing.c" +#line 3142 "Printing.c" } #line 425 "/home/jens/Source/shotwell/src/Printing.vala" - custom_print_tab_get_height_entry_value (self, &_tmp7_); + custom_print_tab_get_height_entry_value (self, &_tmp6_); #line 425 "/home/jens/Source/shotwell/src/Printing.vala" - new_height = _tmp7_; + new_height = _tmp6_; #line 426 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = self->priv->source_job; + _tmp7_ = self->priv->source_job; #line 426 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = print_job_get_local_settings (_tmp8_); + _tmp8_ = print_job_get_local_settings (_tmp7_); #line 426 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 426 "/home/jens/Source/shotwell/src/Printing.vala" - print_settings_get_minimum_content_dimension (_tmp10_, &_tmp11_); + print_settings_get_minimum_content_dimension (_tmp9_, &_tmp10_); #line 426 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 426 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp10_); + _print_settings_unref0 (_tmp9_); #line 426 "/home/jens/Source/shotwell/src/Printing.vala" - min_height = _tmp12_; + min_height = _tmp11_; #line 427 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp13_ = self->priv->source_job; + _tmp12_ = self->priv->source_job; #line 427 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp14_ = print_job_get_local_settings (_tmp13_); + _tmp13_ = print_job_get_local_settings (_tmp12_); #line 427 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 427 "/home/jens/Source/shotwell/src/Printing.vala" - print_settings_get_maximum_content_dimension (_tmp15_, &_tmp16_); + print_settings_get_maximum_content_dimension (_tmp14_, &_tmp15_); #line 427 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 427 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp15_); + _print_settings_unref0 (_tmp14_); #line 427 "/home/jens/Source/shotwell/src/Printing.vala" - max_height = _tmp17_; -#line 429 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp19_ = min_height; + max_height = _tmp16_; #line 429 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp20_ = measurement_is_less_than (&new_height, &_tmp19_); + _tmp18_ = min_height; #line 429 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp20_) { + if (measurement_is_less_than (&new_height, &_tmp18_)) { #line 429 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp18_ = TRUE; -#line 2914 "Printing.c" + _tmp17_ = TRUE; +#line 3182 "Printing.c" } else { - Measurement _tmp21_; - gboolean _tmp22_; -#line 429 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp21_ = max_height; + Measurement _tmp19_; #line 429 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp22_ = measurement_is_greater_than (&new_height, &_tmp21_); + _tmp19_ = max_height; #line 429 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp18_ = _tmp22_; -#line 2924 "Printing.c" + _tmp17_ = measurement_is_greater_than (&new_height, &_tmp19_); +#line 3189 "Printing.c" } #line 429 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp18_) { -#line 2928 "Printing.c" - GtkEntry* _tmp23_; - Measurement _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; + if (_tmp17_) { +#line 3193 "Printing.c" + GtkEntry* _tmp20_; + Measurement _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; #line 430 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp23_ = self->priv->custom_height_entry; + _tmp20_ = self->priv->custom_height_entry; #line 430 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp24_ = self->priv->local_content_height; + _tmp21_ = self->priv->local_content_height; #line 430 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp25_ = custom_print_tab_format_measurement (self, &_tmp24_); + _tmp22_ = custom_print_tab_format_measurement (self, &_tmp21_); #line 430 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp26_ = _tmp25_; + _tmp23_ = _tmp22_; #line 430 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_entry_set_text (_tmp23_, _tmp26_); + gtk_entry_set_text (_tmp20_, _tmp23_); #line 430 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp23_); #line 431 "/home/jens/Source/shotwell/src/Printing.vala" result = FALSE; #line 431 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 2949 "Printing.c" +#line 3214 "Printing.c" } #line 434 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp27_ = custom_print_tab_is_match_aspect_ratio_enabled (self); -#line 434 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp27_) { -#line 2955 "Printing.c" + if (custom_print_tab_is_match_aspect_ratio_enabled (self)) { +#line 3218 "Printing.c" Measurement new_width = {0}; - Measurement _tmp28_; - gdouble _tmp29_; - PrintJob* _tmp30_; - gdouble _tmp31_; - Measurement _tmp32_; - MeasurementUnit _tmp33_; - Measurement _tmp34_; - GtkEntry* _tmp35_; - Measurement _tmp36_; - gchar* _tmp37_; - gchar* _tmp38_; -#line 435 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp28_ = new_height; + Measurement _tmp24_; + gdouble _tmp25_; + PrintJob* _tmp26_; + Measurement _tmp27_; + MeasurementUnit _tmp28_; + Measurement _tmp29_; + GtkEntry* _tmp30_; + Measurement _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; #line 435 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp29_ = _tmp28_.value; + _tmp24_ = new_height; #line 435 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp30_ = self->priv->source_job; + _tmp25_ = _tmp24_.value; #line 435 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp31_ = print_job_get_source_aspect_ratio (_tmp30_); + _tmp26_ = self->priv->source_job; #line 435 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp32_ = new_height; + _tmp27_ = new_height; #line 435 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp33_ = _tmp32_.unit; + _tmp28_ = _tmp27_.unit; #line 435 "/home/jens/Source/shotwell/src/Printing.vala" - measurement_init (&new_width, _tmp29_ * _tmp31_, _tmp33_); + measurement_init (&new_width, _tmp25_ * print_job_get_source_aspect_ratio (_tmp26_), _tmp28_); #line 438 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp34_ = new_width; + _tmp29_ = new_width; #line 438 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->local_content_width = _tmp34_; + self->priv->local_content_width = _tmp29_; #line 439 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp35_ = self->priv->custom_width_entry; + _tmp30_ = self->priv->custom_width_entry; #line 439 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp36_ = new_width; + _tmp31_ = new_width; #line 439 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp37_ = custom_print_tab_format_measurement (self, &_tmp36_); + _tmp32_ = custom_print_tab_format_measurement (self, &_tmp31_); #line 439 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp38_ = _tmp37_; + _tmp33_ = _tmp32_; #line 439 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_entry_set_text (_tmp35_, _tmp38_); + gtk_entry_set_text (_tmp30_, _tmp33_); #line 439 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp38_); -#line 2998 "Printing.c" + _g_free0 (_tmp33_); +#line 3258 "Printing.c" } #line 442 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp39_ = new_height; + _tmp34_ = new_height; #line 442 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->local_content_height = _tmp39_; + self->priv->local_content_height = _tmp34_; #line 443 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp40_ = self->priv->custom_height_entry; + _tmp35_ = self->priv->custom_height_entry; #line 443 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp41_ = new_height; + _tmp36_ = new_height; #line 443 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp42_ = custom_print_tab_format_measurement (self, &_tmp41_); + _tmp37_ = custom_print_tab_format_measurement (self, &_tmp36_); #line 443 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp43_ = _tmp42_; + _tmp38_ = _tmp37_; #line 443 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_entry_set_text (_tmp40_, _tmp43_); + gtk_entry_set_text (_tmp35_, _tmp38_); #line 443 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp43_); + _g_free0 (_tmp38_); #line 444 "/home/jens/Source/shotwell/src/Printing.vala" result = FALSE; #line 444 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 3020 "Printing.c" +#line 3280 "Printing.c" } -static MeasurementUnit custom_print_tab_get_user_unit_choice (CustomPrintTab* self) { +static MeasurementUnit +custom_print_tab_get_user_unit_choice (CustomPrintTab* self) +{ MeasurementUnit result = 0; GtkComboBoxText* _tmp0_; - gint _tmp1_; #line 447 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), 0); #line 448 "/home/jens/Source/shotwell/src/Printing.vala" _tmp0_ = self->priv->units_combo; #line 448 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox)); -#line 448 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp1_ == CUSTOM_PRINT_TAB_INCHES_COMBO_CHOICE) { + if (gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox)) == CUSTOM_PRINT_TAB_INCHES_COMBO_CHOICE) { #line 449 "/home/jens/Source/shotwell/src/Printing.vala" result = MEASUREMENT_UNIT_INCHES; #line 449 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 3040 "Printing.c" +#line 3299 "Printing.c" } else { - GtkComboBoxText* _tmp2_; - gint _tmp3_; -#line 450 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = self->priv->units_combo; + GtkComboBoxText* _tmp1_; #line 450 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox)); + _tmp1_ = self->priv->units_combo; #line 450 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp3_ == CUSTOM_PRINT_TAB_CENTIMETERS_COMBO_CHOICE) { + if (gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)) == CUSTOM_PRINT_TAB_CENTIMETERS_COMBO_CHOICE) { #line 451 "/home/jens/Source/shotwell/src/Printing.vala" result = MEASUREMENT_UNIT_CENTIMETERS; #line 451 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 3054 "Printing.c" +#line 3310 "Printing.c" } else { #line 453 "/home/jens/Source/shotwell/src/Printing.vala" g_error ("Printing.vala:453: unknown unit combo box choice"); -#line 3058 "Printing.c" +#line 3314 "Printing.c" } } } -static void custom_print_tab_set_user_unit_choice (CustomPrintTab* self, MeasurementUnit unit) { - MeasurementUnit _tmp0_; +static void +custom_print_tab_set_user_unit_choice (CustomPrintTab* self, + MeasurementUnit unit) +{ #line 457 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_CUSTOM_PRINT_TAB (self)); #line 458 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = unit; -#line 458 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp0_ == MEASUREMENT_UNIT_INCHES) { -#line 3072 "Printing.c" - GtkComboBoxText* _tmp1_; + if (unit == MEASUREMENT_UNIT_INCHES) { +#line 3328 "Printing.c" + GtkComboBoxText* _tmp0_; #line 459 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = self->priv->units_combo; + _tmp0_ = self->priv->units_combo; #line 459 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), CUSTOM_PRINT_TAB_INCHES_COMBO_CHOICE); -#line 3078 "Printing.c" + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), CUSTOM_PRINT_TAB_INCHES_COMBO_CHOICE); +#line 3334 "Printing.c" } else { - MeasurementUnit _tmp2_; -#line 460 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = unit; #line 460 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp2_ == MEASUREMENT_UNIT_CENTIMETERS) { -#line 3085 "Printing.c" - GtkComboBoxText* _tmp3_; + if (unit == MEASUREMENT_UNIT_CENTIMETERS) { +#line 3338 "Printing.c" + GtkComboBoxText* _tmp1_; #line 461 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = self->priv->units_combo; + _tmp1_ = self->priv->units_combo; #line 461 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox), CUSTOM_PRINT_TAB_CENTIMETERS_COMBO_CHOICE); -#line 3091 "Printing.c" + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), CUSTOM_PRINT_TAB_CENTIMETERS_COMBO_CHOICE); +#line 3344 "Printing.c" } else { #line 463 "/home/jens/Source/shotwell/src/Printing.vala" g_error ("Printing.vala:463: unknown MeasurementUnit enumeration"); -#line 3095 "Printing.c" +#line 3348 "Printing.c" } } } -static gdouble double_parse (const gchar* str) { +static gdouble +double_parse (const gchar* str) +{ gdouble result = 0.0; - const gchar* _tmp0_; - gdouble _tmp1_; -#line 877 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gdouble _tmp0_; +#line 889 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (str != NULL, 0.0); -#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = g_ascii_strtod (_tmp0_, NULL); -#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_; -#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 890 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_ascii_strtod (str, NULL); +#line 890 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_; +#line 890 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 3115 "Printing.c" +#line 3367 "Printing.c" } -static void custom_print_tab_get_width_entry_value (CustomPrintTab* self, Measurement* result) { +static void +custom_print_tab_get_width_entry_value (CustomPrintTab* self, + Measurement* result) +{ GtkEntry* _tmp0_; const gchar* _tmp1_; - gdouble _tmp2_; - MeasurementUnit _tmp3_; - Measurement _tmp4_ = {0}; + Measurement _tmp2_ = {0}; #line 467 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_CUSTOM_PRINT_TAB (self)); #line 468 "/home/jens/Source/shotwell/src/Printing.vala" @@ -3128,25 +3381,22 @@ static void custom_print_tab_get_width_entry_value (CustomPrintTab* self, Measur #line 468 "/home/jens/Source/shotwell/src/Printing.vala" _tmp1_ = gtk_entry_get_text (_tmp0_); #line 468 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = double_parse (_tmp1_); -#line 468 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = custom_print_tab_get_user_unit_choice (self); -#line 468 "/home/jens/Source/shotwell/src/Printing.vala" - measurement_init (&_tmp4_, _tmp2_, _tmp3_); + measurement_init (&_tmp2_, double_parse (_tmp1_), custom_print_tab_get_user_unit_choice (self)); #line 468 "/home/jens/Source/shotwell/src/Printing.vala" - *result = _tmp4_; + *result = _tmp2_; #line 468 "/home/jens/Source/shotwell/src/Printing.vala" return; -#line 3141 "Printing.c" +#line 3390 "Printing.c" } -static void custom_print_tab_get_height_entry_value (CustomPrintTab* self, Measurement* result) { +static void +custom_print_tab_get_height_entry_value (CustomPrintTab* self, + Measurement* result) +{ GtkEntry* _tmp0_; const gchar* _tmp1_; - gdouble _tmp2_; - MeasurementUnit _tmp3_; - Measurement _tmp4_ = {0}; + Measurement _tmp2_ = {0}; #line 471 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_CUSTOM_PRINT_TAB (self)); #line 472 "/home/jens/Source/shotwell/src/Printing.vala" @@ -3154,58 +3404,57 @@ static void custom_print_tab_get_height_entry_value (CustomPrintTab* self, Measu #line 472 "/home/jens/Source/shotwell/src/Printing.vala" _tmp1_ = gtk_entry_get_text (_tmp0_); #line 472 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = double_parse (_tmp1_); -#line 472 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = custom_print_tab_get_user_unit_choice (self); -#line 472 "/home/jens/Source/shotwell/src/Printing.vala" - measurement_init (&_tmp4_, _tmp2_, _tmp3_); + measurement_init (&_tmp2_, double_parse (_tmp1_), custom_print_tab_get_user_unit_choice (self)); #line 472 "/home/jens/Source/shotwell/src/Printing.vala" - *result = _tmp4_; + *result = _tmp2_; #line 472 "/home/jens/Source/shotwell/src/Printing.vala" return; -#line 3167 "Printing.c" +#line 3413 "Printing.c" } -static gboolean string_contains (const gchar* self, const gchar* needle) { +static gboolean +string_contains (const gchar* self, + const gchar* needle) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gchar* _tmp1_; -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = needle; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_ != NULL; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = strstr ((gchar*) self, (gchar*) needle); +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_ != NULL; +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 3187 "Printing.c" +#line 3433 "Printing.c" } -static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEditable* editable, const gchar* text, gint length, gint* position) { +static void +custom_print_tab_on_entry_insert_text (CustomPrintTab* self, + GtkEditable* editable, + const gchar* text, + gint length, + gint* position) +{ GtkEntry* sender = NULL; - GtkEditable* _tmp0_; - GtkEntry* _tmp1_; - gboolean _tmp2_; - gint _tmp3_; + GtkEntry* _tmp0_; + gboolean _tmp1_; const gchar* decimal_point = NULL; - const gchar* _tmp7_; + const gchar* _tmp4_; gboolean contains_decimal_point = FALSE; - GtkEntry* _tmp8_; - const gchar* _tmp9_; - const gchar* _tmp10_; - gboolean _tmp11_; + GtkEntry* _tmp5_; + const gchar* _tmp6_; + const gchar* _tmp7_; gchar* new_text = NULL; - gchar* _tmp12_; - const gchar* _tmp42_; - gint _tmp43_; - gint _tmp44_; - GtkEntry* _tmp50_; + gchar* _tmp8_; + const gchar* _tmp27_; + gint _tmp28_; + gint _tmp29_; + GtkEntry* _tmp35_; #line 475 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_CUSTOM_PRINT_TAB (self)); #line 475 "/home/jens/Source/shotwell/src/Printing.vala" @@ -3213,596 +3462,488 @@ static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEdit #line 475 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (text != NULL); #line 478 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = editable; -#line 478 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_entry_get_type (), GtkEntry)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (editable, gtk_entry_get_type (), GtkEntry)); #line 478 "/home/jens/Source/shotwell/src/Printing.vala" - sender = _tmp1_; + sender = _tmp0_; #line 480 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = self->priv->is_text_insertion_in_progress; + _tmp1_ = self->priv->is_text_insertion_in_progress; #line 480 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp2_) { + if (_tmp1_) { #line 481 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (sender); #line 481 "/home/jens/Source/shotwell/src/Printing.vala" return; -#line 3230 "Printing.c" +#line 3477 "Printing.c" } #line 483 "/home/jens/Source/shotwell/src/Printing.vala" self->priv->is_text_insertion_in_progress = TRUE; #line 485 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = length; -#line 485 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp3_ == -1) { -#line 3238 "Printing.c" - const gchar* _tmp4_; - gint _tmp5_; - gint _tmp6_; -#line 486 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = text; + if (length == -1) { +#line 3483 "Printing.c" + gint _tmp2_; + gint _tmp3_; #line 486 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = strlen (_tmp4_); + _tmp2_ = strlen (text); #line 486 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 486 "/home/jens/Source/shotwell/src/Printing.vala" - length = (gint) _tmp6_; -#line 3250 "Printing.c" + length = (gint) _tmp3_; +#line 3492 "Printing.c" } #line 488 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = nl_langinfo (RADIXCHAR); + _tmp4_ = nl_langinfo (RADIXCHAR); #line 488 "/home/jens/Source/shotwell/src/Printing.vala" - decimal_point = _tmp7_; + decimal_point = _tmp4_; #line 490 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = sender; + _tmp5_ = sender; #line 490 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = gtk_entry_get_text (_tmp8_); + _tmp6_ = gtk_entry_get_text (_tmp5_); #line 490 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp10_ = decimal_point; + _tmp7_ = decimal_point; #line 490 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp11_ = string_contains (_tmp9_, _tmp10_); -#line 490 "/home/jens/Source/shotwell/src/Printing.vala" - contains_decimal_point = _tmp11_; + contains_decimal_point = string_contains (_tmp6_, _tmp7_); #line 492 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp12_ = g_strdup (""); + _tmp8_ = g_strdup (""); #line 492 "/home/jens/Source/shotwell/src/Printing.vala" - new_text = _tmp12_; -#line 3270 "Printing.c" + new_text = _tmp8_; +#line 3510 "Printing.c" { gint ctr = 0; #line 493 "/home/jens/Source/shotwell/src/Printing.vala" ctr = 0; -#line 3275 "Printing.c" +#line 3515 "Printing.c" { - gboolean _tmp13_ = FALSE; + gboolean _tmp9_ = FALSE; #line 493 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp13_ = TRUE; + _tmp9_ = TRUE; #line 493 "/home/jens/Source/shotwell/src/Printing.vala" while (TRUE) { -#line 3282 "Printing.c" - gint _tmp15_; - gint _tmp16_; - const gchar* _tmp17_; - gint _tmp18_; - gchar _tmp19_; - gboolean _tmp20_; +#line 3522 "Printing.c" + gint _tmp11_; + gint _tmp12_; #line 493 "/home/jens/Source/shotwell/src/Printing.vala" - if (!_tmp13_) { -#line 3291 "Printing.c" - gint _tmp14_; + if (!_tmp9_) { +#line 3527 "Printing.c" + gint _tmp10_; #line 493 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp14_ = ctr; + _tmp10_ = ctr; #line 493 "/home/jens/Source/shotwell/src/Printing.vala" - ctr = _tmp14_ + 1; -#line 3297 "Printing.c" + ctr = _tmp10_ + 1; +#line 3533 "Printing.c" } #line 493 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp13_ = FALSE; + _tmp9_ = FALSE; #line 493 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp15_ = ctr; + _tmp11_ = ctr; #line 493 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp16_ = length; -#line 493 "/home/jens/Source/shotwell/src/Printing.vala" - if (!(_tmp15_ < _tmp16_)) { + if (!(_tmp11_ < length)) { #line 493 "/home/jens/Source/shotwell/src/Printing.vala" break; -#line 3309 "Printing.c" +#line 3543 "Printing.c" } #line 494 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp17_ = text; -#line 494 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp18_ = ctr; + _tmp12_ = ctr; #line 494 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp19_ = string_get (_tmp17_, (glong) _tmp18_); -#line 494 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp20_ = g_ascii_isdigit (_tmp19_); -#line 494 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp20_) { -#line 3321 "Printing.c" - const gchar* _tmp21_; - const gchar* _tmp22_; - gint _tmp23_; - gchar _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; - gchar* _tmp27_; -#line 495 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp21_ = new_text; -#line 495 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp22_ = text; + if (g_ascii_isdigit (string_get (text, (glong) _tmp12_))) { +#line 3549 "Printing.c" + const gchar* _tmp13_; + gint _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; #line 495 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp23_ = ctr; + _tmp13_ = new_text; #line 495 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp24_ = string_get (_tmp22_, (glong) _tmp23_); + _tmp14_ = ctr; #line 495 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp25_ = g_strdup_printf ("%c", (gchar) _tmp24_); + _tmp15_ = g_strdup_printf ("%c", (gchar) string_get (text, (glong) _tmp14_)); #line 495 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp26_ = _tmp25_; + _tmp16_ = _tmp15_; #line 495 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp27_ = g_strconcat (_tmp21_, _tmp26_, NULL); + _tmp17_ = g_strconcat (_tmp13_, _tmp16_, NULL); #line 495 "/home/jens/Source/shotwell/src/Printing.vala" _g_free0 (new_text); #line 495 "/home/jens/Source/shotwell/src/Printing.vala" - new_text = _tmp27_; + new_text = _tmp17_; #line 495 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp26_); -#line 3349 "Printing.c" + _g_free0 (_tmp16_); +#line 3571 "Printing.c" } else { - gboolean _tmp28_ = FALSE; - gboolean _tmp29_; -#line 496 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp29_ = contains_decimal_point; -#line 496 "/home/jens/Source/shotwell/src/Printing.vala" - if (!_tmp29_) { -#line 3357 "Printing.c" - const gchar* _tmp30_; - gint _tmp31_; - gchar _tmp32_; - const gchar* _tmp33_; - gchar _tmp34_; + gboolean _tmp18_ = FALSE; + gboolean _tmp19_; #line 496 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp30_ = text; + _tmp19_ = contains_decimal_point; #line 496 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp31_ = ctr; + if (!_tmp19_) { +#line 3579 "Printing.c" + gint _tmp20_; + const gchar* _tmp21_; #line 496 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp32_ = string_get (_tmp30_, (glong) _tmp31_); + _tmp20_ = ctr; #line 496 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp33_ = decimal_point; + _tmp21_ = decimal_point; #line 496 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp34_ = string_get (_tmp33_, (glong) 0); -#line 496 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp28_ = _tmp32_ == _tmp34_; -#line 3375 "Printing.c" + _tmp18_ = string_get (text, (glong) _tmp20_) == string_get (_tmp21_, (glong) 0); +#line 3588 "Printing.c" } else { #line 496 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp28_ = FALSE; -#line 3379 "Printing.c" + _tmp18_ = FALSE; +#line 3592 "Printing.c" } #line 496 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp28_) { -#line 3383 "Printing.c" - const gchar* _tmp35_; - const gchar* _tmp36_; - gint _tmp37_; - gchar _tmp38_; - gchar* _tmp39_; - gchar* _tmp40_; - gchar* _tmp41_; -#line 497 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp35_ = new_text; + if (_tmp18_) { +#line 3596 "Printing.c" + const gchar* _tmp22_; + gint _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; #line 497 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp36_ = text; + _tmp22_ = new_text; #line 497 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp37_ = ctr; + _tmp23_ = ctr; #line 497 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp38_ = string_get (_tmp36_, (glong) _tmp37_); + _tmp24_ = g_strdup_printf ("%c", (gchar) string_get (text, (glong) _tmp23_)); #line 497 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp39_ = g_strdup_printf ("%c", (gchar) _tmp38_); + _tmp25_ = _tmp24_; #line 497 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp40_ = _tmp39_; -#line 497 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp41_ = g_strconcat (_tmp35_, _tmp40_, NULL); + _tmp26_ = g_strconcat (_tmp22_, _tmp25_, NULL); #line 497 "/home/jens/Source/shotwell/src/Printing.vala" _g_free0 (new_text); #line 497 "/home/jens/Source/shotwell/src/Printing.vala" - new_text = _tmp41_; + new_text = _tmp26_; #line 497 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp40_); -#line 3411 "Printing.c" + _g_free0 (_tmp25_); +#line 3618 "Printing.c" } } } } } #line 501 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp42_ = new_text; + _tmp27_ = new_text; #line 501 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp43_ = strlen (_tmp42_); + _tmp28_ = strlen (_tmp27_); #line 501 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp44_ = _tmp43_; + _tmp29_ = _tmp28_; #line 501 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp44_ > 0) { -#line 3425 "Printing.c" - GtkEntry* _tmp45_; - const gchar* _tmp46_; - const gchar* _tmp47_; - gint _tmp48_; - gint _tmp49_; + if (_tmp29_ > 0) { +#line 3632 "Printing.c" + GtkEntry* _tmp30_; + const gchar* _tmp31_; + const gchar* _tmp32_; + gint _tmp33_; + gint _tmp34_; #line 502 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp45_ = sender; + _tmp30_ = sender; #line 502 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp46_ = new_text; + _tmp31_ = new_text; #line 502 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp47_ = new_text; + _tmp32_ = new_text; #line 502 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp48_ = strlen (_tmp47_); + _tmp33_ = strlen (_tmp32_); #line 502 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp49_ = _tmp48_; + _tmp34_ = _tmp33_; #line 502 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GTK_TYPE_EDITABLE, GtkEditable), _tmp46_, (gint) _tmp49_, position); -#line 3443 "Printing.c" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_editable_get_type (), GtkEditable), "insert-text", _tmp31_, (gint) _tmp34_, position); +#line 3650 "Printing.c" } #line 504 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp50_ = sender; + _tmp35_ = sender; #line 504 "/home/jens/Source/shotwell/src/Printing.vala" - g_signal_stop_emission_by_name (_tmp50_, "insert-text"); + g_signal_stop_emission_by_name (_tmp35_, "insert-text"); #line 506 "/home/jens/Source/shotwell/src/Printing.vala" self->priv->is_text_insertion_in_progress = FALSE; #line 475 "/home/jens/Source/shotwell/src/Printing.vala" _g_free0 (new_text); #line 475 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (sender); -#line 3455 "Printing.c" +#line 3662 "Printing.c" } -static void custom_print_tab_sync_state_from_job (CustomPrintTab* self, PrintJob* job) { - PrintJob* _tmp0_; +static void +custom_print_tab_sync_state_from_job (CustomPrintTab* self, + PrintJob* job) +{ + PrintSettings* _tmp0_; PrintSettings* _tmp1_; - PrintSettings* _tmp2_; - Measurement _tmp3_ = {0}; - MeasurementUnit _tmp4_; - PrintJob* _tmp5_; - PrintSettings* _tmp6_; - PrintSettings* _tmp7_; - Measurement _tmp8_ = {0}; - MeasurementUnit _tmp9_; + Measurement _tmp2_ = {0}; + MeasurementUnit _tmp3_; + PrintSettings* _tmp4_; + PrintSettings* _tmp5_; + Measurement _tmp6_ = {0}; + MeasurementUnit _tmp7_; Measurement constrained_width = {0}; - PrintJob* _tmp10_; - PrintSettings* _tmp11_; + PrintSettings* _tmp8_; + PrintSettings* _tmp9_; + Measurement _tmp10_ = {0}; + Measurement _tmp11_; PrintSettings* _tmp12_; - Measurement _tmp13_ = {0}; - Measurement _tmp14_; - PrintJob* _tmp15_; - PrintSettings* _tmp16_; - PrintSettings* _tmp17_; - gboolean _tmp18_; - gboolean _tmp19_; - Measurement _tmp32_; - PrintJob* _tmp33_; + PrintSettings* _tmp13_; + gboolean _tmp14_; + Measurement _tmp23_; + PrintSettings* _tmp24_; + PrintSettings* _tmp25_; + Measurement _tmp26_ = {0}; + PrintSettings* _tmp27_; + PrintSettings* _tmp28_; + PrintSettings* _tmp29_; + PrintSettings* _tmp30_; + PrintSettings* _tmp31_; + PrintSettings* _tmp32_; + PrintSettings* _tmp33_; PrintSettings* _tmp34_; PrintSettings* _tmp35_; - Measurement _tmp36_ = {0}; - PrintJob* _tmp37_; + PrintSettings* _tmp36_; + PrintSettings* _tmp37_; PrintSettings* _tmp38_; PrintSettings* _tmp39_; - ContentLayout _tmp40_; - PrintJob* _tmp41_; - PrintSettings* _tmp42_; - PrintSettings* _tmp43_; - gint _tmp44_; - PrintJob* _tmp45_; - PrintSettings* _tmp46_; - PrintSettings* _tmp47_; - gint _tmp48_; - PrintJob* _tmp49_; - PrintSettings* _tmp50_; - PrintSettings* _tmp51_; - gint _tmp52_; - PrintJob* _tmp53_; - PrintSettings* _tmp54_; - PrintSettings* _tmp55_; - gboolean _tmp56_; - PrintJob* _tmp57_; - PrintSettings* _tmp58_; - PrintSettings* _tmp59_; - gboolean _tmp60_; - PrintJob* _tmp61_; - PrintSettings* _tmp62_; - PrintSettings* _tmp63_; - gchar* _tmp64_; - gchar* _tmp65_; + PrintSettings* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; #line 509 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_CUSTOM_PRINT_TAB (self)); #line 509 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_JOB (job)); #line 510 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = job; -#line 510 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = print_job_get_local_settings (_tmp0_); + _tmp0_ = print_job_get_local_settings (job); #line 510 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = _tmp1_; -#line 510 "/home/jens/Source/shotwell/src/Printing.vala" - print_settings_get_content_width (_tmp2_, &_tmp3_); + _tmp1_ = _tmp0_; #line 510 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = _tmp3_.unit; + print_settings_get_content_width (_tmp1_, &_tmp2_); #line 510 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = job; + _tmp3_ = _tmp2_.unit; #line 510 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = print_job_get_local_settings (_tmp5_); + _tmp4_ = print_job_get_local_settings (job); #line 510 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 510 "/home/jens/Source/shotwell/src/Printing.vala" - print_settings_get_content_height (_tmp7_, &_tmp8_); + print_settings_get_content_height (_tmp5_, &_tmp6_); #line 510 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = _tmp8_.unit; + _tmp7_ = _tmp6_.unit; #line 510 "/home/jens/Source/shotwell/src/Printing.vala" - _vala_assert (_tmp4_ == _tmp9_, "job.get_local_settings().get_content_width().unit == job.get_local_settings().get_content_height().unit"); + _vala_assert (_tmp3_ == _tmp7_, "job.get_local_settings().get_content_width().unit == job.get_local_settings().get_content_height().unit"); #line 510 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp7_); + _print_settings_unref0 (_tmp5_); #line 510 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp2_); + _print_settings_unref0 (_tmp1_); #line 513 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp10_ = job; + _tmp8_ = print_job_get_local_settings (job); #line 513 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp11_ = print_job_get_local_settings (_tmp10_); -#line 513 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp12_ = _tmp11_; + _tmp9_ = _tmp8_; #line 513 "/home/jens/Source/shotwell/src/Printing.vala" - print_settings_get_content_width (_tmp12_, &_tmp13_); + print_settings_get_content_width (_tmp9_, &_tmp10_); #line 513 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp14_ = _tmp13_; + _tmp11_ = _tmp10_; #line 513 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp12_); + _print_settings_unref0 (_tmp9_); #line 513 "/home/jens/Source/shotwell/src/Printing.vala" - constrained_width = _tmp14_; + constrained_width = _tmp11_; #line 514 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp15_ = job; + _tmp12_ = print_job_get_local_settings (job); #line 514 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp16_ = print_job_get_local_settings (_tmp15_); + _tmp13_ = _tmp12_; #line 514 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp17_ = _tmp16_; -#line 514 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp18_ = print_settings_is_match_aspect_ratio_enabled (_tmp17_); + _tmp14_ = print_settings_is_match_aspect_ratio_enabled (_tmp13_); #line 514 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp19_ = _tmp18_; + _print_settings_unref0 (_tmp13_); #line 514 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp17_); -#line 514 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp19_) { -#line 3573 "Printing.c" - PrintJob* _tmp20_; - PrintSettings* _tmp21_; - PrintSettings* _tmp22_; - Measurement _tmp23_ = {0}; - gdouble _tmp24_; - PrintJob* _tmp25_; - gdouble _tmp26_; - PrintJob* _tmp27_; - PrintSettings* _tmp28_; - PrintSettings* _tmp29_; - Measurement _tmp30_ = {0}; - MeasurementUnit _tmp31_; -#line 515 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp20_ = job; -#line 515 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp21_ = print_job_get_local_settings (_tmp20_); -#line 515 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp22_ = _tmp21_; -#line 515 "/home/jens/Source/shotwell/src/Printing.vala" - print_settings_get_content_height (_tmp22_, &_tmp23_); + if (_tmp14_) { +#line 3754 "Printing.c" + PrintSettings* _tmp15_; + PrintSettings* _tmp16_; + Measurement _tmp17_ = {0}; + gdouble _tmp18_; + PrintSettings* _tmp19_; + PrintSettings* _tmp20_; + Measurement _tmp21_ = {0}; + MeasurementUnit _tmp22_; #line 515 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp24_ = _tmp23_.value; + _tmp15_ = print_job_get_local_settings (job); #line 515 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp25_ = job; + _tmp16_ = _tmp15_; #line 515 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp26_ = print_job_get_source_aspect_ratio (_tmp25_); + print_settings_get_content_height (_tmp16_, &_tmp17_); #line 515 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp27_ = job; + _tmp18_ = _tmp17_.value; #line 515 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp28_ = print_job_get_local_settings (_tmp27_); + _tmp19_ = print_job_get_local_settings (job); #line 515 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp29_ = _tmp28_; + _tmp20_ = _tmp19_; #line 515 "/home/jens/Source/shotwell/src/Printing.vala" - print_settings_get_content_height (_tmp29_, &_tmp30_); + print_settings_get_content_height (_tmp20_, &_tmp21_); #line 515 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp31_ = _tmp30_.unit; + _tmp22_ = _tmp21_.unit; #line 515 "/home/jens/Source/shotwell/src/Printing.vala" - measurement_init (&constrained_width, _tmp24_ * _tmp26_, _tmp31_); + measurement_init (&constrained_width, _tmp18_ * print_job_get_source_aspect_ratio (job), _tmp22_); #line 515 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp29_); + _print_settings_unref0 (_tmp20_); #line 515 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp22_); -#line 3616 "Printing.c" + _print_settings_unref0 (_tmp16_); +#line 3785 "Printing.c" } #line 517 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp32_ = constrained_width; + _tmp23_ = constrained_width; #line 517 "/home/jens/Source/shotwell/src/Printing.vala" - custom_print_tab_set_content_width (self, &_tmp32_); -#line 518 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp33_ = job; + custom_print_tab_set_content_width (self, &_tmp23_); #line 518 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp34_ = print_job_get_local_settings (_tmp33_); + _tmp24_ = print_job_get_local_settings (job); #line 518 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp35_ = _tmp34_; + _tmp25_ = _tmp24_; #line 518 "/home/jens/Source/shotwell/src/Printing.vala" - print_settings_get_content_height (_tmp35_, &_tmp36_); + print_settings_get_content_height (_tmp25_, &_tmp26_); #line 518 "/home/jens/Source/shotwell/src/Printing.vala" - custom_print_tab_set_content_height (self, &_tmp36_); + custom_print_tab_set_content_height (self, &_tmp26_); #line 518 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp35_); -#line 519 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp37_ = job; + _print_settings_unref0 (_tmp25_); #line 519 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp38_ = print_job_get_local_settings (_tmp37_); + _tmp27_ = print_job_get_local_settings (job); #line 519 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp39_ = _tmp38_; + _tmp28_ = _tmp27_; #line 519 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp40_ = print_settings_get_content_layout (_tmp39_); + custom_print_tab_set_content_layout (self, print_settings_get_content_layout (_tmp28_)); #line 519 "/home/jens/Source/shotwell/src/Printing.vala" - custom_print_tab_set_content_layout (self, _tmp40_); -#line 519 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp39_); -#line 520 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp41_ = job; + _print_settings_unref0 (_tmp28_); #line 520 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp42_ = print_job_get_local_settings (_tmp41_); + _tmp29_ = print_job_get_local_settings (job); #line 520 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp43_ = _tmp42_; -#line 520 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp44_ = print_settings_get_content_ppi (_tmp43_); + _tmp30_ = _tmp29_; #line 520 "/home/jens/Source/shotwell/src/Printing.vala" - custom_print_tab_set_content_ppi (self, _tmp44_); + custom_print_tab_set_content_ppi (self, print_settings_get_content_ppi (_tmp30_)); #line 520 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp43_); -#line 521 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp45_ = job; -#line 521 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp46_ = print_job_get_local_settings (_tmp45_); + _print_settings_unref0 (_tmp30_); #line 521 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp47_ = _tmp46_; + _tmp31_ = print_job_get_local_settings (job); #line 521 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp48_ = print_settings_get_image_per_page_selection (_tmp47_); + _tmp32_ = _tmp31_; #line 521 "/home/jens/Source/shotwell/src/Printing.vala" - custom_print_tab_set_image_per_page_selection (self, _tmp48_); + custom_print_tab_set_image_per_page_selection (self, print_settings_get_image_per_page_selection (_tmp32_)); #line 521 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp47_); -#line 522 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp49_ = job; -#line 522 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp50_ = print_job_get_local_settings (_tmp49_); + _print_settings_unref0 (_tmp32_); #line 522 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp51_ = _tmp50_; + _tmp33_ = print_job_get_local_settings (job); #line 522 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp52_ = print_settings_get_size_selection (_tmp51_); + _tmp34_ = _tmp33_; #line 522 "/home/jens/Source/shotwell/src/Printing.vala" - custom_print_tab_set_size_selection (self, _tmp52_); + custom_print_tab_set_size_selection (self, print_settings_get_size_selection (_tmp34_)); #line 522 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp51_); + _print_settings_unref0 (_tmp34_); #line 523 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp53_ = job; + _tmp35_ = print_job_get_local_settings (job); #line 523 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp54_ = print_job_get_local_settings (_tmp53_); + _tmp36_ = _tmp35_; #line 523 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp55_ = _tmp54_; + custom_print_tab_set_match_aspect_ratio_enabled (self, print_settings_is_match_aspect_ratio_enabled (_tmp36_)); #line 523 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp56_ = print_settings_is_match_aspect_ratio_enabled (_tmp55_); -#line 523 "/home/jens/Source/shotwell/src/Printing.vala" - custom_print_tab_set_match_aspect_ratio_enabled (self, _tmp56_); -#line 523 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp55_); -#line 524 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp57_ = job; -#line 524 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp58_ = print_job_get_local_settings (_tmp57_); + _print_settings_unref0 (_tmp36_); #line 524 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp59_ = _tmp58_; + _tmp37_ = print_job_get_local_settings (job); #line 524 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp60_ = print_settings_is_print_titles_enabled (_tmp59_); + _tmp38_ = _tmp37_; #line 524 "/home/jens/Source/shotwell/src/Printing.vala" - custom_print_tab_set_print_titles_enabled (self, _tmp60_); + custom_print_tab_set_print_titles_enabled (self, print_settings_is_print_titles_enabled (_tmp38_)); #line 524 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp59_); + _print_settings_unref0 (_tmp38_); #line 525 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp61_ = job; + _tmp39_ = print_job_get_local_settings (job); #line 525 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp62_ = print_job_get_local_settings (_tmp61_); + _tmp40_ = _tmp39_; #line 525 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp63_ = _tmp62_; -#line 525 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp64_ = print_settings_get_print_titles_font (_tmp63_); + _tmp41_ = print_settings_get_print_titles_font (_tmp40_); #line 525 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp65_ = _tmp64_; + _tmp42_ = _tmp41_; #line 525 "/home/jens/Source/shotwell/src/Printing.vala" - custom_print_tab_set_print_titles_font (self, _tmp65_); + custom_print_tab_set_print_titles_font (self, _tmp42_); #line 525 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp65_); + _g_free0 (_tmp42_); #line 525 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp63_); -#line 3722 "Printing.c" + _print_settings_unref0 (_tmp40_); +#line 3863 "Printing.c" } -static void custom_print_tab_on_radio_group_click (CustomPrintTab* self, GtkButton* b) { +static void +custom_print_tab_on_radio_group_click (CustomPrintTab* self, + GtkButton* b) +{ GtkRadioButton* sender = NULL; - GtkButton* _tmp0_; + GtkRadioButton* _tmp0_; GtkRadioButton* _tmp1_; GtkRadioButton* _tmp2_; - GtkRadioButton* _tmp3_; #line 528 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_CUSTOM_PRINT_TAB (self)); #line 528 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (GTK_IS_BUTTON (b)); #line 529 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = b; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (b, gtk_radio_button_get_type (), GtkRadioButton)); #line 529 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_radio_button_get_type (), GtkRadioButton)); -#line 529 "/home/jens/Source/shotwell/src/Printing.vala" - sender = _tmp1_; + sender = _tmp0_; #line 531 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = sender; + _tmp1_ = sender; #line 531 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = self->priv->standard_size_radio; + _tmp2_ = self->priv->standard_size_radio; #line 531 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp2_ == _tmp3_) { -#line 3748 "Printing.c" - GtkComboBoxText* _tmp4_; + if (_tmp1_ == _tmp2_) { +#line 3889 "Printing.c" + GtkComboBoxText* _tmp3_; #line 532 "/home/jens/Source/shotwell/src/Printing.vala" custom_print_tab_set_content_layout_control_state (self, CONTENT_LAYOUT_STANDARD_SIZE); #line 533 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = self->priv->standard_sizes_combo; + _tmp3_ = self->priv->standard_sizes_combo; #line 533 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); -#line 3756 "Printing.c" + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); +#line 3897 "Printing.c" } else { + GtkRadioButton* _tmp4_; GtkRadioButton* _tmp5_; - GtkRadioButton* _tmp6_; #line 534 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = sender; + _tmp4_ = sender; #line 534 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = self->priv->custom_size_radio; + _tmp5_ = self->priv->custom_size_radio; #line 534 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp5_ == _tmp6_) { -#line 3766 "Printing.c" - GtkEntry* _tmp7_; + if (_tmp4_ == _tmp5_) { +#line 3907 "Printing.c" + GtkEntry* _tmp6_; #line 535 "/home/jens/Source/shotwell/src/Printing.vala" custom_print_tab_set_content_layout_control_state (self, CONTENT_LAYOUT_CUSTOM_SIZE); #line 536 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = self->priv->custom_height_entry; + _tmp6_ = self->priv->custom_height_entry; #line 536 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget)); -#line 3774 "Printing.c" + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); +#line 3915 "Printing.c" } else { + GtkRadioButton* _tmp7_; GtkRadioButton* _tmp8_; - GtkRadioButton* _tmp9_; #line 537 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = sender; + _tmp7_ = sender; #line 537 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = self->priv->image_per_page_radio; + _tmp8_ = self->priv->image_per_page_radio; #line 537 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp8_ == _tmp9_) { + if (_tmp7_ == _tmp8_) { #line 538 "/home/jens/Source/shotwell/src/Printing.vala" custom_print_tab_set_content_layout_control_state (self, CONTENT_LAYOUT_IMAGE_PER_PAGE); -#line 3786 "Printing.c" +#line 3927 "Printing.c" } } } #line 528 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (sender); -#line 3792 "Printing.c" +#line 3933 "Printing.c" } -static void custom_print_tab_on_units_combo_changed (CustomPrintTab* self) { +static void +custom_print_tab_on_units_combo_changed (CustomPrintTab* self) +{ GtkEntry* _tmp0_; Measurement _tmp1_; - MeasurementUnit _tmp2_; + gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - GtkEntry* _tmp5_; - Measurement _tmp6_; - MeasurementUnit _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; + GtkEntry* _tmp4_; + Measurement _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; #line 542 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_CUSTOM_PRINT_TAB (self)); #line 543 "/home/jens/Source/shotwell/src/Printing.vala" @@ -3810,314 +3951,303 @@ static void custom_print_tab_on_units_combo_changed (CustomPrintTab* self) { #line 543 "/home/jens/Source/shotwell/src/Printing.vala" _tmp1_ = self->priv->local_content_height; #line 543 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = custom_print_tab_get_user_unit_choice (self); -#line 543 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = custom_print_tab_format_measurement_as (self, &_tmp1_, _tmp2_); + _tmp2_ = custom_print_tab_format_measurement_as (self, &_tmp1_, custom_print_tab_get_user_unit_choice (self)); #line 543 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 543 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_entry_set_text (_tmp0_, _tmp4_); + gtk_entry_set_text (_tmp0_, _tmp3_); #line 543 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp4_); -#line 545 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = self->priv->custom_width_entry; + _g_free0 (_tmp3_); #line 545 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = self->priv->local_content_width; + _tmp4_ = self->priv->custom_width_entry; #line 545 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = custom_print_tab_get_user_unit_choice (self); + _tmp5_ = self->priv->local_content_width; #line 545 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = custom_print_tab_format_measurement_as (self, &_tmp6_, _tmp7_); + _tmp6_ = custom_print_tab_format_measurement_as (self, &_tmp5_, custom_print_tab_get_user_unit_choice (self)); #line 545 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 545 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_entry_set_text (_tmp5_, _tmp9_); + gtk_entry_set_text (_tmp4_, _tmp7_); #line 545 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp9_); -#line 3837 "Printing.c" + _g_free0 (_tmp7_); +#line 3974 "Printing.c" } -static void custom_print_tab_set_content_layout_control_state (CustomPrintTab* self, ContentLayout layout) { - ContentLayout _tmp0_; +static void +custom_print_tab_set_content_layout_control_state (CustomPrintTab* self, + ContentLayout layout) +{ #line 549 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_CUSTOM_PRINT_TAB (self)); #line 550 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = layout; -#line 550 "/home/jens/Source/shotwell/src/Printing.vala" - switch (_tmp0_) { + switch (layout) { #line 550 "/home/jens/Source/shotwell/src/Printing.vala" case CONTENT_LAYOUT_STANDARD_SIZE: -#line 3851 "Printing.c" +#line 3988 "Printing.c" { + GtkComboBoxText* _tmp0_; GtkComboBoxText* _tmp1_; - GtkComboBoxText* _tmp2_; + GtkEntry* _tmp2_; GtkEntry* _tmp3_; - GtkEntry* _tmp4_; - GtkCheckButton* _tmp5_; - GtkComboBoxText* _tmp6_; + GtkCheckButton* _tmp4_; + GtkComboBoxText* _tmp5_; #line 552 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = self->priv->standard_sizes_combo; + _tmp0_ = self->priv->standard_sizes_combo; #line 552 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE); #line 553 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = self->priv->units_combo; + _tmp1_ = self->priv->units_combo; #line 553 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE); #line 554 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = self->priv->custom_width_entry; + _tmp2_ = self->priv->custom_width_entry; #line 554 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE); #line 555 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = self->priv->custom_height_entry; + _tmp3_ = self->priv->custom_height_entry; #line 555 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE); #line 556 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = self->priv->aspect_ratio_check; + _tmp4_ = self->priv->aspect_ratio_check; #line 556 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), FALSE); #line 557 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = self->priv->image_per_page_combo; + _tmp5_ = self->priv->image_per_page_combo; #line 557 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), FALSE); #line 558 "/home/jens/Source/shotwell/src/Printing.vala" break; -#line 3885 "Printing.c" +#line 4022 "Printing.c" } #line 550 "/home/jens/Source/shotwell/src/Printing.vala" case CONTENT_LAYOUT_CUSTOM_SIZE: -#line 3889 "Printing.c" +#line 4026 "Printing.c" { + GtkComboBoxText* _tmp6_; GtkComboBoxText* _tmp7_; - GtkComboBoxText* _tmp8_; + GtkEntry* _tmp8_; GtkEntry* _tmp9_; - GtkEntry* _tmp10_; - GtkCheckButton* _tmp11_; - GtkComboBoxText* _tmp12_; + GtkCheckButton* _tmp10_; + GtkComboBoxText* _tmp11_; #line 561 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = self->priv->standard_sizes_combo; + _tmp6_ = self->priv->standard_sizes_combo; #line 561 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE); #line 562 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = self->priv->units_combo; + _tmp7_ = self->priv->units_combo; #line 562 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), TRUE); #line 563 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = self->priv->custom_width_entry; + _tmp8_ = self->priv->custom_width_entry; #line 563 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), TRUE); #line 564 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp10_ = self->priv->custom_height_entry; + _tmp9_ = self->priv->custom_height_entry; #line 564 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE); #line 565 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp11_ = self->priv->aspect_ratio_check; + _tmp10_ = self->priv->aspect_ratio_check; #line 565 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), TRUE); #line 566 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp12_ = self->priv->image_per_page_combo; + _tmp11_ = self->priv->image_per_page_combo; #line 566 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), FALSE); #line 567 "/home/jens/Source/shotwell/src/Printing.vala" break; -#line 3923 "Printing.c" +#line 4060 "Printing.c" } #line 550 "/home/jens/Source/shotwell/src/Printing.vala" case CONTENT_LAYOUT_IMAGE_PER_PAGE: -#line 3927 "Printing.c" +#line 4064 "Printing.c" { + GtkComboBoxText* _tmp12_; GtkComboBoxText* _tmp13_; - GtkComboBoxText* _tmp14_; + GtkEntry* _tmp14_; GtkEntry* _tmp15_; - GtkEntry* _tmp16_; - GtkCheckButton* _tmp17_; - GtkComboBoxText* _tmp18_; + GtkCheckButton* _tmp16_; + GtkComboBoxText* _tmp17_; #line 570 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp13_ = self->priv->standard_sizes_combo; + _tmp12_ = self->priv->standard_sizes_combo; #line 570 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE); #line 571 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp14_ = self->priv->units_combo; + _tmp13_ = self->priv->units_combo; #line 571 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), FALSE); #line 572 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp15_ = self->priv->custom_width_entry; + _tmp14_ = self->priv->custom_width_entry; #line 572 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), FALSE); #line 573 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp16_ = self->priv->custom_height_entry; + _tmp15_ = self->priv->custom_height_entry; #line 573 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE); #line 574 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp17_ = self->priv->aspect_ratio_check; + _tmp16_ = self->priv->aspect_ratio_check; #line 574 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), FALSE); #line 575 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp18_ = self->priv->image_per_page_combo; + _tmp17_ = self->priv->image_per_page_combo; #line 575 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), TRUE); #line 576 "/home/jens/Source/shotwell/src/Printing.vala" break; -#line 3961 "Printing.c" +#line 4098 "Printing.c" } default: { #line 579 "/home/jens/Source/shotwell/src/Printing.vala" g_error ("Printing.vala:579: unknown ContentLayout enumeration value"); -#line 3967 "Printing.c" +#line 4104 "Printing.c" } } } -static gboolean custom_print_tab_standard_sizes_combo_separator_func (GtkTreeModel* model, GtkTreeIter* iter) { +static gboolean +custom_print_tab_standard_sizes_combo_separator_func (GtkTreeModel* model, + GtkTreeIter* iter) +{ gboolean result = FALSE; GValue val = {0}; - GtkTreeModel* _tmp0_; - GtkTreeIter _tmp1_; - GValue _tmp2_ = {0}; - const gchar* _tmp3_; + GtkTreeIter _tmp0_; + GValue _tmp1_ = {0}; + const gchar* _tmp2_; #line 583 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE); #line 583 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (iter != NULL, FALSE); #line 586 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = model; -#line 586 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = *iter; + _tmp0_ = *iter; #line 586 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_tree_model_get_value (_tmp0_, &_tmp1_, 0, &_tmp2_); + gtk_tree_model_get_value (model, &_tmp0_, 0, &_tmp1_); #line 586 "/home/jens/Source/shotwell/src/Printing.vala" G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL; #line 586 "/home/jens/Source/shotwell/src/Printing.vala" - val = _tmp2_; + val = _tmp1_; #line 588 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = g_value_get_string (&val); + _tmp2_ = g_value_get_string (&val); #line 588 "/home/jens/Source/shotwell/src/Printing.vala" - result = g_strcmp0 (_tmp3_, "-") == 0; + result = g_strcmp0 (_tmp2_, "-") == 0; #line 588 "/home/jens/Source/shotwell/src/Printing.vala" G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL; #line 588 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 4002 "Printing.c" +#line 4139 "Printing.c" } -static void custom_print_tab_set_content_layout (CustomPrintTab* self, ContentLayout content_layout) { - ContentLayout _tmp0_; - ContentLayout _tmp1_; +static void +custom_print_tab_set_content_layout (CustomPrintTab* self, + ContentLayout content_layout) +{ #line 591 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_CUSTOM_PRINT_TAB (self)); #line 592 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = content_layout; -#line 592 "/home/jens/Source/shotwell/src/Printing.vala" - custom_print_tab_set_content_layout_control_state (self, _tmp0_); + custom_print_tab_set_content_layout_control_state (self, content_layout); #line 593 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = content_layout; -#line 593 "/home/jens/Source/shotwell/src/Printing.vala" - switch (_tmp1_) { + switch (content_layout) { #line 593 "/home/jens/Source/shotwell/src/Printing.vala" case CONTENT_LAYOUT_STANDARD_SIZE: -#line 4021 "Printing.c" +#line 4155 "Printing.c" { - GtkRadioButton* _tmp2_; + GtkRadioButton* _tmp0_; #line 595 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = self->priv->standard_size_radio; + _tmp0_ = self->priv->standard_size_radio; #line 595 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); #line 596 "/home/jens/Source/shotwell/src/Printing.vala" break; -#line 4030 "Printing.c" +#line 4164 "Printing.c" } #line 593 "/home/jens/Source/shotwell/src/Printing.vala" case CONTENT_LAYOUT_CUSTOM_SIZE: -#line 4034 "Printing.c" +#line 4168 "Printing.c" { - GtkRadioButton* _tmp3_; + GtkRadioButton* _tmp1_; #line 599 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = self->priv->custom_size_radio; + _tmp1_ = self->priv->custom_size_radio; #line 599 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); #line 600 "/home/jens/Source/shotwell/src/Printing.vala" break; -#line 4043 "Printing.c" +#line 4177 "Printing.c" } #line 593 "/home/jens/Source/shotwell/src/Printing.vala" case CONTENT_LAYOUT_IMAGE_PER_PAGE: -#line 4047 "Printing.c" +#line 4181 "Printing.c" { - GtkRadioButton* _tmp4_; + GtkRadioButton* _tmp2_; #line 603 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = self->priv->image_per_page_radio; + _tmp2_ = self->priv->image_per_page_radio; #line 603 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); #line 604 "/home/jens/Source/shotwell/src/Printing.vala" break; -#line 4056 "Printing.c" +#line 4190 "Printing.c" } default: { #line 607 "/home/jens/Source/shotwell/src/Printing.vala" g_error ("Printing.vala:607: unknown ContentLayout enumeration value"); -#line 4062 "Printing.c" +#line 4196 "Printing.c" } } } -static ContentLayout custom_print_tab_get_content_layout (CustomPrintTab* self) { +static ContentLayout +custom_print_tab_get_content_layout (CustomPrintTab* self) +{ ContentLayout result = 0; GtkRadioButton* _tmp0_; - gboolean _tmp1_; + GtkRadioButton* _tmp1_; GtkRadioButton* _tmp2_; - gboolean _tmp3_; - GtkRadioButton* _tmp4_; - gboolean _tmp5_; #line 611 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), 0); #line 612 "/home/jens/Source/shotwell/src/Printing.vala" _tmp0_ = self->priv->standard_size_radio; #line 612 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 612 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp1_) { + if (gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton))) { #line 613 "/home/jens/Source/shotwell/src/Printing.vala" result = CONTENT_LAYOUT_STANDARD_SIZE; #line 613 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 4088 "Printing.c" +#line 4219 "Printing.c" } #line 614 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = self->priv->custom_size_radio; -#line 614 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton)); + _tmp1_ = self->priv->custom_size_radio; #line 614 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp3_) { + if (gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton))) { #line 615 "/home/jens/Source/shotwell/src/Printing.vala" result = CONTENT_LAYOUT_CUSTOM_SIZE; #line 615 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 4100 "Printing.c" +#line 4229 "Printing.c" } #line 616 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = self->priv->image_per_page_radio; + _tmp2_ = self->priv->image_per_page_radio; #line 616 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 616 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp5_) { + if (gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton))) { #line 617 "/home/jens/Source/shotwell/src/Printing.vala" result = CONTENT_LAYOUT_IMAGE_PER_PAGE; #line 617 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 4112 "Printing.c" +#line 4239 "Printing.c" } #line 619 "/home/jens/Source/shotwell/src/Printing.vala" g_error ("Printing.vala:619: inconsistent content layout radio button group stat" \ "e"); -#line 4116 "Printing.c" +#line 4243 "Printing.c" } -static void custom_print_tab_set_content_width (CustomPrintTab* self, Measurement* content_width) { +static void +custom_print_tab_set_content_width (CustomPrintTab* self, + Measurement* content_width) +{ Measurement _tmp0_; MeasurementUnit _tmp1_; Measurement _tmp2_; @@ -4141,7 +4271,7 @@ static void custom_print_tab_set_content_width (CustomPrintTab* self, Measuremen _tmp3_ = _tmp2_.unit; #line 623 "/home/jens/Source/shotwell/src/Printing.vala" if (_tmp1_ != _tmp3_) { -#line 4144 "Printing.c" +#line 4274 "Printing.c" Measurement _tmp4_; MeasurementUnit _tmp5_; Measurement _tmp6_; @@ -4177,7 +4307,7 @@ static void custom_print_tab_set_content_width (CustomPrintTab* self, Measuremen gtk_entry_set_text (_tmp9_, _tmp12_); #line 626 "/home/jens/Source/shotwell/src/Printing.vala" _g_free0 (_tmp12_); -#line 4180 "Printing.c" +#line 4310 "Printing.c" } #line 628 "/home/jens/Source/shotwell/src/Printing.vala" _tmp13_ = *content_width; @@ -4195,11 +4325,14 @@ static void custom_print_tab_set_content_width (CustomPrintTab* self, Measuremen gtk_entry_set_text (_tmp14_, _tmp17_); #line 629 "/home/jens/Source/shotwell/src/Printing.vala" _g_free0 (_tmp17_); -#line 4198 "Printing.c" +#line 4328 "Printing.c" } -static void custom_print_tab_get_content_width (CustomPrintTab* self, Measurement* result) { +static void +custom_print_tab_get_content_width (CustomPrintTab* self, + Measurement* result) +{ Measurement _tmp0_; #line 632 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_CUSTOM_PRINT_TAB (self)); @@ -4209,11 +4342,14 @@ static void custom_print_tab_get_content_width (CustomPrintTab* self, Measuremen *result = _tmp0_; #line 633 "/home/jens/Source/shotwell/src/Printing.vala" return; -#line 4212 "Printing.c" +#line 4345 "Printing.c" } -static void custom_print_tab_set_content_height (CustomPrintTab* self, Measurement* content_height) { +static void +custom_print_tab_set_content_height (CustomPrintTab* self, + Measurement* content_height) +{ Measurement _tmp0_; MeasurementUnit _tmp1_; Measurement _tmp2_; @@ -4237,7 +4373,7 @@ static void custom_print_tab_set_content_height (CustomPrintTab* self, Measureme _tmp3_ = _tmp2_.unit; #line 637 "/home/jens/Source/shotwell/src/Printing.vala" if (_tmp1_ != _tmp3_) { -#line 4240 "Printing.c" +#line 4376 "Printing.c" Measurement _tmp4_; MeasurementUnit _tmp5_; Measurement _tmp6_; @@ -4273,7 +4409,7 @@ static void custom_print_tab_set_content_height (CustomPrintTab* self, Measureme gtk_entry_set_text (_tmp9_, _tmp12_); #line 640 "/home/jens/Source/shotwell/src/Printing.vala" _g_free0 (_tmp12_); -#line 4276 "Printing.c" +#line 4412 "Printing.c" } #line 642 "/home/jens/Source/shotwell/src/Printing.vala" _tmp13_ = *content_height; @@ -4291,11 +4427,14 @@ static void custom_print_tab_set_content_height (CustomPrintTab* self, Measureme gtk_entry_set_text (_tmp14_, _tmp17_); #line 643 "/home/jens/Source/shotwell/src/Printing.vala" _g_free0 (_tmp17_); -#line 4294 "Printing.c" +#line 4430 "Printing.c" } -static void custom_print_tab_get_content_height (CustomPrintTab* self, Measurement* result) { +static void +custom_print_tab_get_content_height (CustomPrintTab* self, + Measurement* result) +{ Measurement _tmp0_; #line 646 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_CUSTOM_PRINT_TAB (self)); @@ -4305,42 +4444,41 @@ static void custom_print_tab_get_content_height (CustomPrintTab* self, Measureme *result = _tmp0_; #line 647 "/home/jens/Source/shotwell/src/Printing.vala" return; -#line 4308 "Printing.c" +#line 4447 "Printing.c" } -static void custom_print_tab_set_content_ppi (CustomPrintTab* self, gint content_ppi) { - gint _tmp0_; +static void +custom_print_tab_set_content_ppi (CustomPrintTab* self, + gint content_ppi) +{ + GtkEntry* _tmp0_; gint _tmp1_; - GtkEntry* _tmp2_; - gint _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; + gchar* _tmp2_; + gchar* _tmp3_; #line 650 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_CUSTOM_PRINT_TAB (self)); #line 651 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = content_ppi; -#line 651 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = CLAMP (_tmp0_, PRINT_SETTINGS_MIN_CONTENT_PPI, PRINT_SETTINGS_MAX_CONTENT_PPI); -#line 651 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->local_content_ppi = _tmp1_; + self->priv->local_content_ppi = CLAMP (content_ppi, PRINT_SETTINGS_MIN_CONTENT_PPI, PRINT_SETTINGS_MAX_CONTENT_PPI); #line 654 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = self->priv->ppi_entry; + _tmp0_ = self->priv->ppi_entry; #line 654 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = self->priv->local_content_ppi; + _tmp1_ = self->priv->local_content_ppi; #line 654 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = g_strdup_printf ("%d", _tmp3_); + _tmp2_ = g_strdup_printf ("%d", _tmp1_); #line 654 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 654 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_entry_set_text (_tmp2_, _tmp5_); + gtk_entry_set_text (_tmp0_, _tmp3_); #line 654 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp5_); -#line 4339 "Printing.c" + _g_free0 (_tmp3_); +#line 4475 "Printing.c" } -static gint custom_print_tab_get_content_ppi (CustomPrintTab* self) { +static gint +custom_print_tab_get_content_ppi (CustomPrintTab* self) +{ gint result = 0; gint _tmp0_; #line 657 "/home/jens/Source/shotwell/src/Printing.vala" @@ -4351,109 +4489,109 @@ static gint custom_print_tab_get_content_ppi (CustomPrintTab* self) { result = _tmp0_; #line 658 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 4354 "Printing.c" +#line 4492 "Printing.c" } -static void custom_print_tab_set_image_per_page_selection (CustomPrintTab* self, gint image_per_page) { +static void +custom_print_tab_set_image_per_page_selection (CustomPrintTab* self, + gint image_per_page) +{ GtkComboBoxText* _tmp0_; - gint _tmp1_; #line 661 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_CUSTOM_PRINT_TAB (self)); #line 662 "/home/jens/Source/shotwell/src/Printing.vala" _tmp0_ = self->priv->image_per_page_combo; #line 662 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = image_per_page; -#line 662 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), _tmp1_); -#line 4369 "Printing.c" + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), image_per_page); +#line 4507 "Printing.c" } -static gint custom_print_tab_get_image_per_page_selection (CustomPrintTab* self) { +static gint +custom_print_tab_get_image_per_page_selection (CustomPrintTab* self) +{ gint result = 0; GtkComboBoxText* _tmp0_; - gint _tmp1_; #line 665 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), 0); #line 666 "/home/jens/Source/shotwell/src/Printing.vala" _tmp0_ = self->priv->image_per_page_combo; #line 666 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox)); -#line 666 "/home/jens/Source/shotwell/src/Printing.vala" - result = _tmp1_; + result = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox)); #line 666 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 4387 "Printing.c" +#line 4524 "Printing.c" } -static void custom_print_tab_set_size_selection (CustomPrintTab* self, gint size_selection) { +static void +custom_print_tab_set_size_selection (CustomPrintTab* self, + gint size_selection) +{ GtkComboBoxText* _tmp0_; - gint _tmp1_; #line 669 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_CUSTOM_PRINT_TAB (self)); #line 670 "/home/jens/Source/shotwell/src/Printing.vala" _tmp0_ = self->priv->standard_sizes_combo; #line 670 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = size_selection; -#line 670 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), _tmp1_); -#line 4402 "Printing.c" + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), size_selection); +#line 4539 "Printing.c" } -static gint custom_print_tab_get_size_selection (CustomPrintTab* self) { +static gint +custom_print_tab_get_size_selection (CustomPrintTab* self) +{ gint result = 0; GtkComboBoxText* _tmp0_; - gint _tmp1_; #line 673 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), 0); #line 674 "/home/jens/Source/shotwell/src/Printing.vala" _tmp0_ = self->priv->standard_sizes_combo; #line 674 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox)); -#line 674 "/home/jens/Source/shotwell/src/Printing.vala" - result = _tmp1_; + result = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox)); #line 674 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 4420 "Printing.c" +#line 4556 "Printing.c" } -static void custom_print_tab_set_match_aspect_ratio_enabled (CustomPrintTab* self, gboolean enable_state) { +static void +custom_print_tab_set_match_aspect_ratio_enabled (CustomPrintTab* self, + gboolean enable_state) +{ GtkCheckButton* _tmp0_; - gboolean _tmp1_; #line 677 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_CUSTOM_PRINT_TAB (self)); #line 678 "/home/jens/Source/shotwell/src/Printing.vala" _tmp0_ = self->priv->aspect_ratio_check; #line 678 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = enable_state; -#line 678 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp1_); -#line 4435 "Printing.c" + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton), enable_state); +#line 4571 "Printing.c" } -static void custom_print_tab_set_print_titles_enabled (CustomPrintTab* self, gboolean print_titles) { +static void +custom_print_tab_set_print_titles_enabled (CustomPrintTab* self, + gboolean print_titles) +{ GtkCheckButton* _tmp0_; - gboolean _tmp1_; #line 681 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_CUSTOM_PRINT_TAB (self)); #line 682 "/home/jens/Source/shotwell/src/Printing.vala" _tmp0_ = self->priv->title_print_check; #line 682 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = print_titles; -#line 682 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp1_); -#line 4450 "Printing.c" + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton), print_titles); +#line 4586 "Printing.c" } -static void custom_print_tab_set_print_titles_font (CustomPrintTab* self, const gchar* fontname) { +static void +custom_print_tab_set_print_titles_font (CustomPrintTab* self, + const gchar* fontname) +{ GtkFontButton* _tmp0_; - const gchar* _tmp1_; #line 685 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_CUSTOM_PRINT_TAB (self)); #line 685 "/home/jens/Source/shotwell/src/Printing.vala" @@ -4461,50 +4599,48 @@ static void custom_print_tab_set_print_titles_font (CustomPrintTab* self, const #line 686 "/home/jens/Source/shotwell/src/Printing.vala" _tmp0_ = self->priv->title_print_font; #line 686 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = fontname; -#line 686 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_font_button_set_font_name (_tmp0_, _tmp1_); -#line 4467 "Printing.c" + gtk_font_button_set_font_name (_tmp0_, fontname); +#line 4603 "Printing.c" } -static gboolean custom_print_tab_is_match_aspect_ratio_enabled (CustomPrintTab* self) { +static gboolean +custom_print_tab_is_match_aspect_ratio_enabled (CustomPrintTab* self) +{ gboolean result = FALSE; GtkCheckButton* _tmp0_; - gboolean _tmp1_; #line 690 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), FALSE); #line 691 "/home/jens/Source/shotwell/src/Printing.vala" _tmp0_ = self->priv->aspect_ratio_check; #line 691 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 691 "/home/jens/Source/shotwell/src/Printing.vala" - result = _tmp1_; + result = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 691 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 4485 "Printing.c" +#line 4620 "Printing.c" } -static gboolean custom_print_tab_is_print_titles_enabled (CustomPrintTab* self) { +static gboolean +custom_print_tab_is_print_titles_enabled (CustomPrintTab* self) +{ gboolean result = FALSE; GtkCheckButton* _tmp0_; - gboolean _tmp1_; #line 694 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), FALSE); #line 695 "/home/jens/Source/shotwell/src/Printing.vala" _tmp0_ = self->priv->title_print_check; #line 695 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 695 "/home/jens/Source/shotwell/src/Printing.vala" - result = _tmp1_; + result = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 695 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 4503 "Printing.c" +#line 4637 "Printing.c" } -static gchar* custom_print_tab_get_print_titles_font (CustomPrintTab* self) { +static gchar* +custom_print_tab_get_print_titles_font (CustomPrintTab* self) +{ gchar* result = NULL; GtkFontButton* _tmp0_; const gchar* _tmp1_; @@ -4521,11 +4657,13 @@ static gchar* custom_print_tab_get_print_titles_font (CustomPrintTab* self) { result = _tmp2_; #line 699 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 4524 "Printing.c" +#line 4660 "Printing.c" } -PrintJob* custom_print_tab_get_source_job (CustomPrintTab* self) { +PrintJob* +custom_print_tab_get_source_job (CustomPrintTab* self) +{ PrintJob* result = NULL; PrintJob* _tmp0_; PrintJob* _tmp1_; @@ -4539,24 +4677,20 @@ PrintJob* custom_print_tab_get_source_job (CustomPrintTab* self) { result = _tmp1_; #line 703 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 4542 "Printing.c" +#line 4680 "Printing.c" } -PrintSettings* custom_print_tab_get_local_settings (CustomPrintTab* self) { +PrintSettings* +custom_print_tab_get_local_settings (CustomPrintTab* self) +{ PrintSettings* result = NULL; PrintSettings* _result_ = NULL; PrintSettings* _tmp0_; Measurement _tmp1_ = {0}; Measurement _tmp2_ = {0}; - ContentLayout _tmp3_; - gint _tmp4_; - gint _tmp5_; - gint _tmp6_; - gboolean _tmp7_; - gboolean _tmp8_; - gchar* _tmp9_; - gchar* _tmp10_; + gchar* _tmp3_; + gchar* _tmp4_; #line 706 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), NULL); #line 707 "/home/jens/Source/shotwell/src/Printing.vala" @@ -4572,46 +4706,36 @@ PrintSettings* custom_print_tab_get_local_settings (CustomPrintTab* self) { #line 710 "/home/jens/Source/shotwell/src/Printing.vala" print_settings_set_content_height (_result_, &_tmp2_); #line 711 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = custom_print_tab_get_content_layout (self); -#line 711 "/home/jens/Source/shotwell/src/Printing.vala" - print_settings_set_content_layout (_result_, _tmp3_); + print_settings_set_content_layout (_result_, custom_print_tab_get_content_layout (self)); #line 712 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = custom_print_tab_get_content_ppi (self); -#line 712 "/home/jens/Source/shotwell/src/Printing.vala" - print_settings_set_content_ppi (_result_, _tmp4_); -#line 713 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = custom_print_tab_get_image_per_page_selection (self); + print_settings_set_content_ppi (_result_, custom_print_tab_get_content_ppi (self)); #line 713 "/home/jens/Source/shotwell/src/Printing.vala" - print_settings_set_image_per_page_selection (_result_, _tmp5_); + print_settings_set_image_per_page_selection (_result_, custom_print_tab_get_image_per_page_selection (self)); #line 714 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = custom_print_tab_get_size_selection (self); -#line 714 "/home/jens/Source/shotwell/src/Printing.vala" - print_settings_set_size_selection (_result_, _tmp6_); -#line 715 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = custom_print_tab_is_match_aspect_ratio_enabled (self); + print_settings_set_size_selection (_result_, custom_print_tab_get_size_selection (self)); #line 715 "/home/jens/Source/shotwell/src/Printing.vala" - print_settings_set_match_aspect_ratio_enabled (_result_, _tmp7_); + print_settings_set_match_aspect_ratio_enabled (_result_, custom_print_tab_is_match_aspect_ratio_enabled (self)); #line 716 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = custom_print_tab_is_print_titles_enabled (self); -#line 716 "/home/jens/Source/shotwell/src/Printing.vala" - print_settings_set_print_titles_enabled (_result_, _tmp8_); + print_settings_set_print_titles_enabled (_result_, custom_print_tab_is_print_titles_enabled (self)); #line 717 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = custom_print_tab_get_print_titles_font (self); + _tmp3_ = custom_print_tab_get_print_titles_font (self); #line 717 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp10_ = _tmp9_; + _tmp4_ = _tmp3_; #line 717 "/home/jens/Source/shotwell/src/Printing.vala" - print_settings_set_print_titles_font (_result_, _tmp10_); + print_settings_set_print_titles_font (_result_, _tmp4_); #line 717 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp4_); #line 719 "/home/jens/Source/shotwell/src/Printing.vala" result = _result_; #line 719 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 4610 "Printing.c" +#line 4732 "Printing.c" } -static void custom_print_tab_class_init (CustomPrintTabClass * klass) { +static void +custom_print_tab_class_init (CustomPrintTabClass * klass) +{ gint CustomPrintTab_private_offset; #line 269 "/home/jens/Source/shotwell/src/Printing.vala" custom_print_tab_parent_class = g_type_class_peek_parent (klass); @@ -4647,11 +4771,13 @@ static void custom_print_tab_class_init (CustomPrintTabClass * klass) { gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "title_print_check", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, title_print_check)); #line 269 "/home/jens/Source/shotwell/src/Printing.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "title_print_font", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, title_print_font)); -#line 4650 "Printing.c" +#line 4774 "Printing.c" } -static void custom_print_tab_instance_init (CustomPrintTab * self) { +static void +custom_print_tab_instance_init (CustomPrintTab * self) +{ #line 269 "/home/jens/Source/shotwell/src/Printing.vala" self->priv = CUSTOM_PRINT_TAB_GET_PRIVATE (self); #line 298 "/home/jens/Source/shotwell/src/Printing.vala" @@ -4662,11 +4788,13 @@ static void custom_print_tab_instance_init (CustomPrintTab * self) { self->priv->is_text_insertion_in_progress = FALSE; #line 269 "/home/jens/Source/shotwell/src/Printing.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 4665 "Printing.c" +#line 4791 "Printing.c" } -static void custom_print_tab_finalize (GObject * obj) { +static void +custom_print_tab_finalize (GObject * obj) +{ CustomPrintTab * self; #line 269 "/home/jens/Source/shotwell/src/Printing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CUSTOM_PRINT_TAB, CustomPrintTab); @@ -4698,11 +4826,13 @@ static void custom_print_tab_finalize (GObject * obj) { _g_object_unref0 (self->priv->source_job); #line 269 "/home/jens/Source/shotwell/src/Printing.vala" G_OBJECT_CLASS (custom_print_tab_parent_class)->finalize (obj); -#line 4701 "Printing.c" +#line 4829 "Printing.c" } -GType custom_print_tab_get_type (void) { +GType +custom_print_tab_get_type (void) +{ static volatile gsize custom_print_tab_type_id__volatile = 0; if (g_once_init_enter (&custom_print_tab_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CustomPrintTabClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) custom_print_tab_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CustomPrintTab), 0, (GInstanceInitFunc) custom_print_tab_instance_init, NULL }; @@ -4714,21 +4844,22 @@ GType custom_print_tab_get_type (void) { } -PrintJob* print_job_construct (GType object_type, GeeCollection* to_print) { +PrintJob* +print_job_construct (GType object_type, + GeeCollection* to_print) +{ PrintJob * self = NULL; PrintManager* _tmp0_; PrintManager* _tmp1_; PrintSettings* _tmp2_; GeeArrayList* _tmp3_; - GeeCollection* _tmp4_; gdouble photo_aspect_ratio = 0.0; - GeeArrayList* _tmp5_; - gpointer _tmp6_; - Photo* _tmp7_; - Dimensions _tmp8_ = {0}; + GeeArrayList* _tmp4_; + gpointer _tmp5_; + Photo* _tmp6_; + Dimensions _tmp7_ = {0}; + gdouble _tmp8_; gdouble _tmp9_; - gdouble _tmp10_; - gdouble _tmp11_; #line 727 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (GEE_IS_COLLECTION (to_print), NULL); #line 727 "/home/jens/Source/shotwell/src/Printing.vala" @@ -4748,53 +4879,53 @@ PrintJob* print_job_construct (GType object_type, GeeCollection* to_print) { #line 729 "/home/jens/Source/shotwell/src/Printing.vala" _tmp3_ = self->priv->photos; #line 729 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = to_print; -#line 729 "/home/jens/Source/shotwell/src/Printing.vala" - gee_array_list_add_all (_tmp3_, _tmp4_); + gee_array_list_add_all (_tmp3_, to_print); #line 731 "/home/jens/Source/shotwell/src/Printing.vala" gtk_print_operation_set_embed_page_setup (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_print_operation_get_type (), GtkPrintOperation), TRUE); #line 732 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = self->priv->photos; + _tmp4_ = self->priv->photos; #line 732 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); + _tmp5_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); #line 732 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = (Photo*) _tmp6_; + _tmp6_ = (Photo*) _tmp5_; #line 732 "/home/jens/Source/shotwell/src/Printing.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp8_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp7_); #line 732 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = dimensions_get_aspect_ratio (&_tmp8_); -#line 732 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp10_ = _tmp9_; + _tmp8_ = dimensions_get_aspect_ratio (&_tmp7_); #line 732 "/home/jens/Source/shotwell/src/Printing.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 732 "/home/jens/Source/shotwell/src/Printing.vala" - photo_aspect_ratio = _tmp10_; + photo_aspect_ratio = _tmp8_; #line 733 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp11_ = photo_aspect_ratio; + _tmp9_ = photo_aspect_ratio; #line 733 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp11_ < 1.0) { -#line 4776 "Printing.c" - gdouble _tmp12_; + if (_tmp9_ < 1.0) { +#line 4903 "Printing.c" + gdouble _tmp10_; #line 734 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp12_ = photo_aspect_ratio; + _tmp10_ = photo_aspect_ratio; #line 734 "/home/jens/Source/shotwell/src/Printing.vala" - photo_aspect_ratio = 1.0 / _tmp12_; -#line 4782 "Printing.c" + photo_aspect_ratio = 1.0 / _tmp10_; +#line 4909 "Printing.c" } #line 727 "/home/jens/Source/shotwell/src/Printing.vala" return self; -#line 4786 "Printing.c" +#line 4913 "Printing.c" } -PrintJob* print_job_new (GeeCollection* to_print) { +PrintJob* +print_job_new (GeeCollection* to_print) +{ #line 727 "/home/jens/Source/shotwell/src/Printing.vala" return print_job_construct (TYPE_PRINT_JOB, to_print); -#line 4793 "Printing.c" +#line 4922 "Printing.c" } -GeeList* print_job_get_photos (PrintJob* self) { +GeeList* +print_job_get_photos (PrintJob* self) +{ GeeList* result = NULL; GeeArrayList* _tmp0_; GeeList* _tmp1_; @@ -4808,11 +4939,13 @@ GeeList* print_job_get_photos (PrintJob* self) { result = _tmp1_; #line 738 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 4811 "Printing.c" +#line 4942 "Printing.c" } -Photo* print_job_get_source_photo (PrintJob* self) { +Photo* +print_job_get_source_photo (PrintJob* self) +{ Photo* result = NULL; GeeArrayList* _tmp0_; gpointer _tmp1_; @@ -4826,11 +4959,13 @@ Photo* print_job_get_source_photo (PrintJob* self) { result = (Photo*) _tmp1_; #line 742 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 4829 "Printing.c" +#line 4962 "Printing.c" } -gdouble print_job_get_source_aspect_ratio (PrintJob* self) { +gdouble +print_job_get_source_aspect_ratio (PrintJob* self) +{ gdouble result = 0.0; gdouble aspect_ratio = 0.0; GeeArrayList* _tmp0_; @@ -4838,9 +4973,8 @@ gdouble print_job_get_source_aspect_ratio (PrintJob* self) { Photo* _tmp2_; Dimensions _tmp3_ = {0}; gdouble _tmp4_; - gdouble _tmp5_; - gdouble _tmp6_ = 0.0; - gdouble _tmp7_; + gdouble _tmp5_ = 0.0; + gdouble _tmp6_; #line 745 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (IS_PRINT_JOB (self), 0.0); #line 746 "/home/jens/Source/shotwell/src/Printing.vala" @@ -4853,47 +4987,49 @@ gdouble print_job_get_source_aspect_ratio (PrintJob* self) { media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp3_); #line 746 "/home/jens/Source/shotwell/src/Printing.vala" _tmp4_ = dimensions_get_aspect_ratio (&_tmp3_); -#line 746 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = _tmp4_; #line 746 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (_tmp2_); #line 746 "/home/jens/Source/shotwell/src/Printing.vala" - aspect_ratio = _tmp5_; + aspect_ratio = _tmp4_; #line 747 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = aspect_ratio; + _tmp6_ = aspect_ratio; #line 747 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp7_ < 1.0) { -#line 4866 "Printing.c" - gdouble _tmp8_; + if (_tmp6_ < 1.0) { +#line 4998 "Printing.c" + gdouble _tmp7_; #line 747 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = aspect_ratio; + _tmp7_ = aspect_ratio; #line 747 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = 1.0 / _tmp8_; -#line 4872 "Printing.c" + _tmp5_ = 1.0 / _tmp7_; +#line 5004 "Printing.c" } else { - gdouble _tmp9_; + gdouble _tmp8_; #line 747 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = aspect_ratio; + _tmp8_ = aspect_ratio; #line 747 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = _tmp9_; -#line 4879 "Printing.c" + _tmp5_ = _tmp8_; +#line 5011 "Printing.c" } #line 747 "/home/jens/Source/shotwell/src/Printing.vala" - result = _tmp6_; + result = _tmp5_; #line 747 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 4885 "Printing.c" +#line 5017 "Printing.c" } -static gpointer _print_settings_ref0 (gpointer self) { +static gpointer +_print_settings_ref0 (gpointer self) +{ #line 751 "/home/jens/Source/shotwell/src/Printing.vala" return self ? print_settings_ref (self) : NULL; -#line 4892 "Printing.c" +#line 5026 "Printing.c" } -PrintSettings* print_job_get_local_settings (PrintJob* self) { +PrintSettings* +print_job_get_local_settings (PrintJob* self) +{ PrintSettings* result = NULL; PrintSettings* _tmp0_; PrintSettings* _tmp1_; @@ -4907,41 +5043,45 @@ PrintSettings* print_job_get_local_settings (PrintJob* self) { result = _tmp1_; #line 751 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 4910 "Printing.c" +#line 5046 "Printing.c" } -void print_job_set_local_settings (PrintJob* self, PrintSettings* settings) { +void +print_job_set_local_settings (PrintJob* self, + PrintSettings* settings) +{ PrintSettings* _tmp0_; - PrintSettings* _tmp1_; #line 754 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_JOB (self)); #line 754 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_SETTINGS (settings)); #line 755 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = settings; -#line 755 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = _print_settings_ref0 (_tmp0_); + _tmp0_ = _print_settings_ref0 (settings); #line 755 "/home/jens/Source/shotwell/src/Printing.vala" _print_settings_unref0 (self->priv->settings); #line 755 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->settings = _tmp1_; -#line 4929 "Printing.c" + self->priv->settings = _tmp0_; +#line 5065 "Printing.c" } -static void print_job_class_init (PrintJobClass * klass) { +static void +print_job_class_init (PrintJobClass * klass) +{ #line 723 "/home/jens/Source/shotwell/src/Printing.vala" print_job_parent_class = g_type_class_peek_parent (klass); #line 723 "/home/jens/Source/shotwell/src/Printing.vala" g_type_class_add_private (klass, sizeof (PrintJobPrivate)); #line 723 "/home/jens/Source/shotwell/src/Printing.vala" G_OBJECT_CLASS (klass)->finalize = print_job_finalize; -#line 4940 "Printing.c" +#line 5078 "Printing.c" } -static void print_job_instance_init (PrintJob * self) { +static void +print_job_instance_init (PrintJob * self) +{ GeeArrayList* _tmp0_; #line 723 "/home/jens/Source/shotwell/src/Printing.vala" self->priv = PRINT_JOB_GET_PRIVATE (self); @@ -4949,11 +5089,13 @@ static void print_job_instance_init (PrintJob * self) { _tmp0_ = gee_array_list_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 725 "/home/jens/Source/shotwell/src/Printing.vala" self->priv->photos = _tmp0_; -#line 4952 "Printing.c" +#line 5092 "Printing.c" } -static void print_job_finalize (GObject * obj) { +static void +print_job_finalize (GObject * obj) +{ PrintJob * self; #line 723 "/home/jens/Source/shotwell/src/Printing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PRINT_JOB, PrintJob); @@ -4963,11 +5105,13 @@ static void print_job_finalize (GObject * obj) { _g_object_unref0 (self->priv->photos); #line 723 "/home/jens/Source/shotwell/src/Printing.vala" G_OBJECT_CLASS (print_job_parent_class)->finalize (obj); -#line 4966 "Printing.c" +#line 5108 "Printing.c" } -GType print_job_get_type (void) { +GType +print_job_get_type (void) +{ static volatile gsize print_job_type_id__volatile = 0; if (g_once_init_enter (&print_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PrintJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) print_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PrintJob), 0, (GInstanceInitFunc) print_job_instance_init, NULL }; @@ -4979,12 +5123,16 @@ GType print_job_get_type (void) { } -StandardPrintSize* standard_print_size_construct (GType object_type, const gchar* name, Measurement* width, Measurement* height) { +StandardPrintSize* +standard_print_size_construct (GType object_type, + const gchar* name, + Measurement* width, + Measurement* height) +{ StandardPrintSize* self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; + Measurement _tmp1_; Measurement _tmp2_; - Measurement _tmp3_; #line 760 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (name != NULL, NULL); #line 760 "/home/jens/Source/shotwell/src/Printing.vala" @@ -4994,132 +5142,159 @@ StandardPrintSize* standard_print_size_construct (GType object_type, const gchar #line 760 "/home/jens/Source/shotwell/src/Printing.vala" self = (StandardPrintSize*) g_type_create_instance (object_type); #line 761 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = name; -#line 761 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (name); #line 761 "/home/jens/Source/shotwell/src/Printing.vala" _g_free0 (self->name); #line 761 "/home/jens/Source/shotwell/src/Printing.vala" - self->name = _tmp1_; + self->name = _tmp0_; #line 762 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = *width; + _tmp1_ = *width; #line 762 "/home/jens/Source/shotwell/src/Printing.vala" - self->width = _tmp2_; + self->width = _tmp1_; #line 763 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = *height; + _tmp2_ = *height; #line 763 "/home/jens/Source/shotwell/src/Printing.vala" - self->height = _tmp3_; + self->height = _tmp2_; #line 760 "/home/jens/Source/shotwell/src/Printing.vala" return self; -#line 5014 "Printing.c" +#line 5160 "Printing.c" } -StandardPrintSize* standard_print_size_new (const gchar* name, Measurement* width, Measurement* height) { +StandardPrintSize* +standard_print_size_new (const gchar* name, + Measurement* width, + Measurement* height) +{ #line 760 "/home/jens/Source/shotwell/src/Printing.vala" return standard_print_size_construct (TYPE_STANDARD_PRINT_SIZE, name, width, height); -#line 5021 "Printing.c" +#line 5171 "Printing.c" } -static void value_standard_print_size_init (GValue* value) { +static void +value_standard_print_size_init (GValue* value) +{ #line 759 "/home/jens/Source/shotwell/src/Printing.vala" value->data[0].v_pointer = NULL; -#line 5028 "Printing.c" +#line 5180 "Printing.c" } -static void value_standard_print_size_free_value (GValue* value) { +static void +value_standard_print_size_free_value (GValue* value) +{ #line 759 "/home/jens/Source/shotwell/src/Printing.vala" if (value->data[0].v_pointer) { #line 759 "/home/jens/Source/shotwell/src/Printing.vala" standard_print_size_unref (value->data[0].v_pointer); -#line 5037 "Printing.c" +#line 5191 "Printing.c" } } -static void value_standard_print_size_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_standard_print_size_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 759 "/home/jens/Source/shotwell/src/Printing.vala" if (src_value->data[0].v_pointer) { #line 759 "/home/jens/Source/shotwell/src/Printing.vala" dest_value->data[0].v_pointer = standard_print_size_ref (src_value->data[0].v_pointer); -#line 5047 "Printing.c" +#line 5204 "Printing.c" } else { #line 759 "/home/jens/Source/shotwell/src/Printing.vala" dest_value->data[0].v_pointer = NULL; -#line 5051 "Printing.c" +#line 5208 "Printing.c" } } -static gpointer value_standard_print_size_peek_pointer (const GValue* value) { +static gpointer +value_standard_print_size_peek_pointer (const GValue* value) +{ #line 759 "/home/jens/Source/shotwell/src/Printing.vala" return value->data[0].v_pointer; -#line 5059 "Printing.c" +#line 5218 "Printing.c" } -static gchar* value_standard_print_size_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_standard_print_size_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 759 "/home/jens/Source/shotwell/src/Printing.vala" if (collect_values[0].v_pointer) { -#line 5066 "Printing.c" +#line 5230 "Printing.c" StandardPrintSize * object; object = collect_values[0].v_pointer; #line 759 "/home/jens/Source/shotwell/src/Printing.vala" if (object->parent_instance.g_class == NULL) { #line 759 "/home/jens/Source/shotwell/src/Printing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 5073 "Printing.c" +#line 5237 "Printing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 759 "/home/jens/Source/shotwell/src/Printing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 5077 "Printing.c" +#line 5241 "Printing.c" } #line 759 "/home/jens/Source/shotwell/src/Printing.vala" value->data[0].v_pointer = standard_print_size_ref (object); -#line 5081 "Printing.c" +#line 5245 "Printing.c" } else { #line 759 "/home/jens/Source/shotwell/src/Printing.vala" value->data[0].v_pointer = NULL; -#line 5085 "Printing.c" +#line 5249 "Printing.c" } #line 759 "/home/jens/Source/shotwell/src/Printing.vala" return NULL; -#line 5089 "Printing.c" +#line 5253 "Printing.c" } -static gchar* value_standard_print_size_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_standard_print_size_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ StandardPrintSize ** object_p; object_p = collect_values[0].v_pointer; #line 759 "/home/jens/Source/shotwell/src/Printing.vala" if (!object_p) { #line 759 "/home/jens/Source/shotwell/src/Printing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 5100 "Printing.c" +#line 5269 "Printing.c" } #line 759 "/home/jens/Source/shotwell/src/Printing.vala" if (!value->data[0].v_pointer) { #line 759 "/home/jens/Source/shotwell/src/Printing.vala" *object_p = NULL; -#line 5106 "Printing.c" +#line 5275 "Printing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 759 "/home/jens/Source/shotwell/src/Printing.vala" *object_p = value->data[0].v_pointer; -#line 5110 "Printing.c" +#line 5279 "Printing.c" } else { #line 759 "/home/jens/Source/shotwell/src/Printing.vala" *object_p = standard_print_size_ref (value->data[0].v_pointer); -#line 5114 "Printing.c" +#line 5283 "Printing.c" } #line 759 "/home/jens/Source/shotwell/src/Printing.vala" return NULL; -#line 5118 "Printing.c" +#line 5287 "Printing.c" } -GParamSpec* param_spec_standard_print_size (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_standard_print_size (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecStandardPrintSize* spec; #line 759 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_STANDARD_PRINT_SIZE), NULL); @@ -5129,20 +5304,25 @@ GParamSpec* param_spec_standard_print_size (const gchar* name, const gchar* nick G_PARAM_SPEC (spec)->value_type = object_type; #line 759 "/home/jens/Source/shotwell/src/Printing.vala" return G_PARAM_SPEC (spec); -#line 5132 "Printing.c" +#line 5307 "Printing.c" } -gpointer value_get_standard_print_size (const GValue* value) { +gpointer +value_get_standard_print_size (const GValue* value) +{ #line 759 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_STANDARD_PRINT_SIZE), NULL); #line 759 "/home/jens/Source/shotwell/src/Printing.vala" return value->data[0].v_pointer; -#line 5141 "Printing.c" +#line 5318 "Printing.c" } -void value_set_standard_print_size (GValue* value, gpointer v_object) { +void +value_set_standard_print_size (GValue* value, + gpointer v_object) +{ StandardPrintSize * old; #line 759 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_STANDARD_PRINT_SIZE)); @@ -5158,22 +5338,25 @@ void value_set_standard_print_size (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 759 "/home/jens/Source/shotwell/src/Printing.vala" standard_print_size_ref (value->data[0].v_pointer); -#line 5161 "Printing.c" +#line 5341 "Printing.c" } else { #line 759 "/home/jens/Source/shotwell/src/Printing.vala" value->data[0].v_pointer = NULL; -#line 5165 "Printing.c" +#line 5345 "Printing.c" } #line 759 "/home/jens/Source/shotwell/src/Printing.vala" if (old) { #line 759 "/home/jens/Source/shotwell/src/Printing.vala" standard_print_size_unref (old); -#line 5171 "Printing.c" +#line 5351 "Printing.c" } } -void value_take_standard_print_size (GValue* value, gpointer v_object) { +void +value_take_standard_print_size (GValue* value, + gpointer v_object) +{ StandardPrintSize * old; #line 759 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_STANDARD_PRINT_SIZE)); @@ -5187,38 +5370,44 @@ void value_take_standard_print_size (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 759 "/home/jens/Source/shotwell/src/Printing.vala" value->data[0].v_pointer = v_object; -#line 5190 "Printing.c" +#line 5373 "Printing.c" } else { #line 759 "/home/jens/Source/shotwell/src/Printing.vala" value->data[0].v_pointer = NULL; -#line 5194 "Printing.c" +#line 5377 "Printing.c" } #line 759 "/home/jens/Source/shotwell/src/Printing.vala" if (old) { #line 759 "/home/jens/Source/shotwell/src/Printing.vala" standard_print_size_unref (old); -#line 5200 "Printing.c" +#line 5383 "Printing.c" } } -static void standard_print_size_class_init (StandardPrintSizeClass * klass) { +static void +standard_print_size_class_init (StandardPrintSizeClass * klass) +{ #line 759 "/home/jens/Source/shotwell/src/Printing.vala" standard_print_size_parent_class = g_type_class_peek_parent (klass); #line 759 "/home/jens/Source/shotwell/src/Printing.vala" ((StandardPrintSizeClass *) klass)->finalize = standard_print_size_finalize; -#line 5210 "Printing.c" +#line 5395 "Printing.c" } -static void standard_print_size_instance_init (StandardPrintSize * self) { +static void +standard_print_size_instance_init (StandardPrintSize * self) +{ #line 759 "/home/jens/Source/shotwell/src/Printing.vala" self->ref_count = 1; -#line 5217 "Printing.c" +#line 5404 "Printing.c" } -static void standard_print_size_finalize (StandardPrintSize * obj) { +static void +standard_print_size_finalize (StandardPrintSize * obj) +{ StandardPrintSize * self; #line 759 "/home/jens/Source/shotwell/src/Printing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_STANDARD_PRINT_SIZE, StandardPrintSize); @@ -5226,11 +5415,13 @@ static void standard_print_size_finalize (StandardPrintSize * obj) { g_signal_handlers_destroy (self); #line 766 "/home/jens/Source/shotwell/src/Printing.vala" _g_free0 (self->name); -#line 5229 "Printing.c" +#line 5418 "Printing.c" } -GType standard_print_size_get_type (void) { +GType +standard_print_size_get_type (void) +{ static volatile gsize standard_print_size_type_id__volatile = 0; if (g_once_init_enter (&standard_print_size_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_standard_print_size_init, value_standard_print_size_free_value, value_standard_print_size_copy_value, value_standard_print_size_peek_pointer, "p", value_standard_print_size_collect_value, "p", value_standard_print_size_lcopy_value }; @@ -5244,18 +5435,22 @@ GType standard_print_size_get_type (void) { } -gpointer standard_print_size_ref (gpointer instance) { +gpointer +standard_print_size_ref (gpointer instance) +{ StandardPrintSize * self; self = instance; #line 759 "/home/jens/Source/shotwell/src/Printing.vala" g_atomic_int_inc (&self->ref_count); #line 759 "/home/jens/Source/shotwell/src/Printing.vala" return instance; -#line 5254 "Printing.c" +#line 5447 "Printing.c" } -void standard_print_size_unref (gpointer instance) { +void +standard_print_size_unref (gpointer instance) +{ StandardPrintSize * self; self = instance; #line 759 "/home/jens/Source/shotwell/src/Printing.vala" @@ -5264,12 +5459,14 @@ void standard_print_size_unref (gpointer instance) { STANDARD_PRINT_SIZE_GET_CLASS (self)->finalize (self); #line 759 "/home/jens/Source/shotwell/src/Printing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 5267 "Printing.c" +#line 5462 "Printing.c" } } -static PrintManager* print_manager_construct (GType object_type) { +static PrintManager* +print_manager_construct (GType object_type) +{ PrintManager* self = NULL; GtkPageSetup* _tmp0_; PrintSettings* _tmp1_; @@ -5289,273 +5486,353 @@ static PrintManager* print_manager_construct (GType object_type) { self->priv->settings = _tmp1_; #line 783 "/home/jens/Source/shotwell/src/Printing.vala" return self; -#line 5292 "Printing.c" +#line 5489 "Printing.c" } -static PrintManager* print_manager_new (void) { +static PrintManager* +print_manager_new (void) +{ #line 783 "/home/jens/Source/shotwell/src/Printing.vala" return print_manager_construct (TYPE_PRINT_MANAGER); -#line 5299 "Printing.c" +#line 5498 "Printing.c" } -static void _vala_array_add113 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) { +static void +_vala_array_add113 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value) +{ #line 792 "/home/jens/Source/shotwell/src/Printing.vala" if ((*length) == (*size)) { #line 792 "/home/jens/Source/shotwell/src/Printing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 792 "/home/jens/Source/shotwell/src/Printing.vala" *array = g_renew (StandardPrintSize*, *array, (*size) + 1); -#line 5310 "Printing.c" +#line 5514 "Printing.c" } #line 792 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[(*length)++] = value; #line 792 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[*length] = NULL; -#line 5316 "Printing.c" +#line 5520 "Printing.c" } -static void _vala_array_add114 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) { +static void +_vala_array_add114 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value) +{ #line 795 "/home/jens/Source/shotwell/src/Printing.vala" if ((*length) == (*size)) { #line 795 "/home/jens/Source/shotwell/src/Printing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 795 "/home/jens/Source/shotwell/src/Printing.vala" *array = g_renew (StandardPrintSize*, *array, (*size) + 1); -#line 5327 "Printing.c" +#line 5536 "Printing.c" } #line 795 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[(*length)++] = value; #line 795 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[*length] = NULL; -#line 5333 "Printing.c" +#line 5542 "Printing.c" } -static void _vala_array_add115 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) { +static void +_vala_array_add115 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value) +{ #line 798 "/home/jens/Source/shotwell/src/Printing.vala" if ((*length) == (*size)) { #line 798 "/home/jens/Source/shotwell/src/Printing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 798 "/home/jens/Source/shotwell/src/Printing.vala" *array = g_renew (StandardPrintSize*, *array, (*size) + 1); -#line 5344 "Printing.c" +#line 5558 "Printing.c" } #line 798 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[(*length)++] = value; #line 798 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[*length] = NULL; -#line 5350 "Printing.c" +#line 5564 "Printing.c" } -static void _vala_array_add116 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) { +static void +_vala_array_add116 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value) +{ #line 801 "/home/jens/Source/shotwell/src/Printing.vala" if ((*length) == (*size)) { #line 801 "/home/jens/Source/shotwell/src/Printing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 801 "/home/jens/Source/shotwell/src/Printing.vala" *array = g_renew (StandardPrintSize*, *array, (*size) + 1); -#line 5361 "Printing.c" +#line 5580 "Printing.c" } #line 801 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[(*length)++] = value; #line 801 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[*length] = NULL; -#line 5367 "Printing.c" +#line 5586 "Printing.c" } -static void _vala_array_add117 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) { +static void +_vala_array_add117 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value) +{ #line 804 "/home/jens/Source/shotwell/src/Printing.vala" if ((*length) == (*size)) { #line 804 "/home/jens/Source/shotwell/src/Printing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 804 "/home/jens/Source/shotwell/src/Printing.vala" *array = g_renew (StandardPrintSize*, *array, (*size) + 1); -#line 5378 "Printing.c" +#line 5602 "Printing.c" } #line 804 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[(*length)++] = value; #line 804 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[*length] = NULL; -#line 5384 "Printing.c" +#line 5608 "Printing.c" } -static void _vala_array_add118 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) { +static void +_vala_array_add118 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value) +{ #line 807 "/home/jens/Source/shotwell/src/Printing.vala" if ((*length) == (*size)) { #line 807 "/home/jens/Source/shotwell/src/Printing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 807 "/home/jens/Source/shotwell/src/Printing.vala" *array = g_renew (StandardPrintSize*, *array, (*size) + 1); -#line 5395 "Printing.c" +#line 5624 "Printing.c" } #line 807 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[(*length)++] = value; #line 807 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[*length] = NULL; -#line 5401 "Printing.c" +#line 5630 "Printing.c" } -static void _vala_array_add119 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) { +static void +_vala_array_add119 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value) +{ #line 810 "/home/jens/Source/shotwell/src/Printing.vala" if ((*length) == (*size)) { #line 810 "/home/jens/Source/shotwell/src/Printing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 810 "/home/jens/Source/shotwell/src/Printing.vala" *array = g_renew (StandardPrintSize*, *array, (*size) + 1); -#line 5412 "Printing.c" +#line 5646 "Printing.c" } #line 810 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[(*length)++] = value; #line 810 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[*length] = NULL; -#line 5418 "Printing.c" +#line 5652 "Printing.c" } -static void _vala_array_add120 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) { +static void +_vala_array_add120 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value) +{ #line 813 "/home/jens/Source/shotwell/src/Printing.vala" if ((*length) == (*size)) { #line 813 "/home/jens/Source/shotwell/src/Printing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 813 "/home/jens/Source/shotwell/src/Printing.vala" *array = g_renew (StandardPrintSize*, *array, (*size) + 1); -#line 5429 "Printing.c" +#line 5668 "Printing.c" } #line 813 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[(*length)++] = value; #line 813 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[*length] = NULL; -#line 5435 "Printing.c" +#line 5674 "Printing.c" } -static void _vala_array_add121 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) { +static void +_vala_array_add121 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value) +{ #line 816 "/home/jens/Source/shotwell/src/Printing.vala" if ((*length) == (*size)) { #line 816 "/home/jens/Source/shotwell/src/Printing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 816 "/home/jens/Source/shotwell/src/Printing.vala" *array = g_renew (StandardPrintSize*, *array, (*size) + 1); -#line 5446 "Printing.c" +#line 5690 "Printing.c" } #line 816 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[(*length)++] = value; #line 816 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[*length] = NULL; -#line 5452 "Printing.c" +#line 5696 "Printing.c" } -static void _vala_array_add122 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) { +static void +_vala_array_add122 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value) +{ #line 819 "/home/jens/Source/shotwell/src/Printing.vala" if ((*length) == (*size)) { #line 819 "/home/jens/Source/shotwell/src/Printing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 819 "/home/jens/Source/shotwell/src/Printing.vala" *array = g_renew (StandardPrintSize*, *array, (*size) + 1); -#line 5463 "Printing.c" +#line 5712 "Printing.c" } #line 819 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[(*length)++] = value; #line 819 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[*length] = NULL; -#line 5469 "Printing.c" +#line 5718 "Printing.c" } -static void _vala_array_add123 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) { +static void +_vala_array_add123 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value) +{ #line 822 "/home/jens/Source/shotwell/src/Printing.vala" if ((*length) == (*size)) { #line 822 "/home/jens/Source/shotwell/src/Printing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 822 "/home/jens/Source/shotwell/src/Printing.vala" *array = g_renew (StandardPrintSize*, *array, (*size) + 1); -#line 5480 "Printing.c" +#line 5734 "Printing.c" } #line 822 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[(*length)++] = value; #line 822 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[*length] = NULL; -#line 5486 "Printing.c" +#line 5740 "Printing.c" } -static void _vala_array_add124 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) { +static void +_vala_array_add124 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value) +{ #line 825 "/home/jens/Source/shotwell/src/Printing.vala" if ((*length) == (*size)) { #line 825 "/home/jens/Source/shotwell/src/Printing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 825 "/home/jens/Source/shotwell/src/Printing.vala" *array = g_renew (StandardPrintSize*, *array, (*size) + 1); -#line 5497 "Printing.c" +#line 5756 "Printing.c" } #line 825 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[(*length)++] = value; #line 825 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[*length] = NULL; -#line 5503 "Printing.c" +#line 5762 "Printing.c" } -static void _vala_array_add125 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) { +static void +_vala_array_add125 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value) +{ #line 828 "/home/jens/Source/shotwell/src/Printing.vala" if ((*length) == (*size)) { #line 828 "/home/jens/Source/shotwell/src/Printing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 828 "/home/jens/Source/shotwell/src/Printing.vala" *array = g_renew (StandardPrintSize*, *array, (*size) + 1); -#line 5514 "Printing.c" +#line 5778 "Printing.c" } #line 828 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[(*length)++] = value; #line 828 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[*length] = NULL; -#line 5520 "Printing.c" +#line 5784 "Printing.c" } -static void _vala_array_add126 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) { +static void +_vala_array_add126 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value) +{ #line 831 "/home/jens/Source/shotwell/src/Printing.vala" if ((*length) == (*size)) { #line 831 "/home/jens/Source/shotwell/src/Printing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 831 "/home/jens/Source/shotwell/src/Printing.vala" *array = g_renew (StandardPrintSize*, *array, (*size) + 1); -#line 5531 "Printing.c" +#line 5800 "Printing.c" } #line 831 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[(*length)++] = value; #line 831 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[*length] = NULL; -#line 5537 "Printing.c" +#line 5806 "Printing.c" } -static void _vala_array_add127 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) { +static void +_vala_array_add127 (StandardPrintSize** * array, + int* length, + int* size, + StandardPrintSize* value) +{ #line 834 "/home/jens/Source/shotwell/src/Printing.vala" if ((*length) == (*size)) { #line 834 "/home/jens/Source/shotwell/src/Printing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 834 "/home/jens/Source/shotwell/src/Printing.vala" *array = g_renew (StandardPrintSize*, *array, (*size) + 1); -#line 5548 "Printing.c" +#line 5822 "Printing.c" } #line 834 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[(*length)++] = value; #line 834 "/home/jens/Source/shotwell/src/Printing.vala" (*array)[*length] = NULL; -#line 5554 "Printing.c" +#line 5828 "Printing.c" } -StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* result_length1) { +StandardPrintSize** +print_manager_get_standard_sizes (PrintManager* self, + int* result_length1) +{ StandardPrintSize** result = NULL; StandardPrintSize** _tmp0_; gint _tmp0__length1; @@ -5571,7 +5848,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r _tmp0__length1 = self->priv->standard_sizes_length1; #line 789 "/home/jens/Source/shotwell/src/Printing.vala" if (_tmp0_ == NULL) { -#line 5574 "Printing.c" +#line 5851 "Printing.c" StandardPrintSize** _tmp1_; StandardPrintSize** _tmp2_; gint _tmp2__length1; @@ -5838,7 +6115,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r _tmp61_ = standard_print_size_new (_ ("30 × 40 cm"), &_tmp59_, &_tmp60_); #line 834 "/home/jens/Source/shotwell/src/Printing.vala" _vala_array_add127 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp61_); -#line 5841 "Printing.c" +#line 6118 "Printing.c" } #line 839 "/home/jens/Source/shotwell/src/Printing.vala" _tmp62_ = self->priv->standard_sizes; @@ -5852,24 +6129,28 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r if (result_length1) { #line 839 "/home/jens/Source/shotwell/src/Printing.vala" *result_length1 = _tmp63__length1; -#line 5855 "Printing.c" +#line 6132 "Printing.c" } #line 839 "/home/jens/Source/shotwell/src/Printing.vala" result = _tmp63_; #line 839 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 5861 "Printing.c" +#line 6138 "Printing.c" } -static gpointer _print_manager_ref0 (gpointer self) { +static gpointer +_print_manager_ref0 (gpointer self) +{ #line 846 "/home/jens/Source/shotwell/src/Printing.vala" return self ? print_manager_ref (self) : NULL; -#line 5868 "Printing.c" +#line 6147 "Printing.c" } -PrintManager* print_manager_get_instance (void) { +PrintManager* +print_manager_get_instance (void) +{ PrintManager* result = NULL; PrintManager* _tmp0_; PrintManager* _tmp2_; @@ -5878,7 +6159,7 @@ PrintManager* print_manager_get_instance (void) { _tmp0_ = print_manager_instance; #line 843 "/home/jens/Source/shotwell/src/Printing.vala" if (_tmp0_ == NULL) { -#line 5881 "Printing.c" +#line 6162 "Printing.c" PrintManager* _tmp1_; #line 844 "/home/jens/Source/shotwell/src/Printing.vala" _tmp1_ = print_manager_new (); @@ -5886,7 +6167,7 @@ PrintManager* print_manager_get_instance (void) { _print_manager_unref0 (print_manager_instance); #line 844 "/home/jens/Source/shotwell/src/Printing.vala" print_manager_instance = _tmp1_; -#line 5889 "Printing.c" +#line 6170 "Printing.c" } #line 846 "/home/jens/Source/shotwell/src/Printing.vala" _tmp2_ = print_manager_instance; @@ -5896,72 +6177,87 @@ PrintManager* print_manager_get_instance (void) { result = _tmp3_; #line 846 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 5899 "Printing.c" +#line 6180 "Printing.c" } -static void _print_manager_on_begin_print_gtk_print_operation_begin_print (GtkPrintOperation* _sender, GtkPrintContext* context, gpointer self) { +static void +_print_manager_on_begin_print_gtk_print_operation_begin_print (GtkPrintOperation* _sender, + GtkPrintContext* context, + gpointer self) +{ #line 856 "/home/jens/Source/shotwell/src/Printing.vala" print_manager_on_begin_print ((PrintManager*) self, _sender, context); -#line 5906 "Printing.c" +#line 6191 "Printing.c" } -static void _print_manager_on_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, GtkPrintContext* context, gint page_nr, gpointer self) { +static void +_print_manager_on_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, + GtkPrintContext* context, + gint page_nr, + gpointer self) +{ #line 857 "/home/jens/Source/shotwell/src/Printing.vala" print_manager_on_draw_page ((PrintManager*) self, _sender, context, page_nr); -#line 5913 "Printing.c" +#line 6203 "Printing.c" } -static GObject* _print_manager_on_create_custom_widget_gtk_print_operation_create_custom_widget (GtkPrintOperation* _sender, gpointer self) { +static GObject* +_print_manager_on_create_custom_widget_gtk_print_operation_create_custom_widget (GtkPrintOperation* _sender, + gpointer self) +{ GObject* result; result = print_manager_on_create_custom_widget ((PrintManager*) self, _sender); #line 858 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 5922 "Printing.c" +#line 6215 "Printing.c" } -static void _print_manager_on_status_changed_gtk_print_operation_status_changed (GtkPrintOperation* _sender, gpointer self) { +static void +_print_manager_on_status_changed_gtk_print_operation_status_changed (GtkPrintOperation* _sender, + gpointer self) +{ #line 859 "/home/jens/Source/shotwell/src/Printing.vala" print_manager_on_status_changed ((PrintManager*) self, _sender); -#line 5929 "Printing.c" +#line 6225 "Printing.c" } -void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) { +void +print_manager_spool_photo (PrintManager* self, + GeeCollection* to_print) +{ PrintJob* job = NULL; - GeeCollection* _tmp0_; - PrintJob* _tmp1_; + PrintJob* _tmp0_; + Photo* _tmp1_; Photo* _tmp2_; - Photo* _tmp3_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; - GtkPageSetup* _tmp6_; + GtkPageSetup* _tmp5_; + AppWindow* _tmp6_; AppWindow* _tmp7_; - AppWindow* _tmp8_; - GCancellable* _tmp9_; + GCancellable* _tmp8_; + AppWindow* _tmp9_; AppWindow* _tmp10_; - AppWindow* _tmp11_; - GCancellable* _tmp12_; - ProgressDialog* _tmp13_; + GCancellable* _tmp11_; + ProgressDialog* _tmp12_; gchar* err_msg = NULL; - ProgressDialog* _tmp23_; - AppWindow* _tmp24_; - AppWindow* _tmp25_; - const gchar* _tmp26_; + ProgressDialog* _tmp21_; + AppWindow* _tmp22_; + AppWindow* _tmp23_; + const gchar* _tmp24_; GError * _inner_error_ = NULL; #line 849 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_MANAGER (self)); #line 849 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (GEE_IS_COLLECTION (to_print)); #line 850 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = to_print; -#line 850 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = print_job_new (_tmp0_); + _tmp0_ = print_job_new (to_print); #line 850 "/home/jens/Source/shotwell/src/Printing.vala" - job = _tmp1_; + job = _tmp0_; #line 851 "/home/jens/Source/shotwell/src/Printing.vala" gtk_print_operation_set_custom_tab_label (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), _ ("Image Settings")); #line 852 "/home/jens/Source/shotwell/src/Printing.vala" @@ -5969,23 +6265,23 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) { #line 853 "/home/jens/Source/shotwell/src/Printing.vala" gtk_print_operation_set_n_pages (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), 1); #line 854 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = print_job_get_source_photo (job); + _tmp1_ = print_job_get_source_photo (job); #line 854 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 854 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); + _tmp3_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject)); #line 854 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 854 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_print_operation_set_job_name (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), _tmp5_); + gtk_print_operation_set_job_name (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), _tmp4_); #line 854 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp4_); #line 854 "/home/jens/Source/shotwell/src/Printing.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 855 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = self->priv->user_page_setup; + _tmp5_ = self->priv->user_page_setup; #line 855 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_print_operation_set_default_page_setup (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), _tmp6_); + gtk_print_operation_set_default_page_setup (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), _tmp5_); #line 856 "/home/jens/Source/shotwell/src/Printing.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), "begin-print", (GCallback) _print_manager_on_begin_print_gtk_print_operation_begin_print, self); #line 857 "/home/jens/Source/shotwell/src/Printing.vala" @@ -5995,84 +6291,81 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) { #line 859 "/home/jens/Source/shotwell/src/Printing.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), "status-changed", (GCallback) _print_manager_on_status_changed_gtk_print_operation_status_changed, self); #line 861 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = app_window_get_instance (); + _tmp6_ = app_window_get_instance (); #line 861 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 861 "/home/jens/Source/shotwell/src/Printing.vala" - page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE_WINDOW, PageWindow)); #line 861 "/home/jens/Source/shotwell/src/Printing.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 863 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = g_cancellable_new (); + _tmp8_ = g_cancellable_new (); #line 863 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (self->priv->cancellable); #line 863 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->cancellable = _tmp9_; + self->priv->cancellable = _tmp8_; #line 864 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp10_ = app_window_get_instance (); + _tmp9_ = app_window_get_instance (); #line 864 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 864 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp12_ = self->priv->cancellable; + _tmp11_ = self->priv->cancellable; #line 864 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp13_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow), _ ("Printing…"), _tmp12_); + _tmp12_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow), _ ("Printing…"), _tmp11_); #line 864 "/home/jens/Source/shotwell/src/Printing.vala" - g_object_ref_sink (_tmp13_); + g_object_ref_sink (_tmp12_); #line 864 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (self->priv->progress_dialog); #line 864 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->progress_dialog = _tmp13_; + self->priv->progress_dialog = _tmp12_; #line 864 "/home/jens/Source/shotwell/src/Printing.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp10_); #line 866 "/home/jens/Source/shotwell/src/Printing.vala" err_msg = NULL; -#line 6029 "Printing.c" +#line 6325 "Printing.c" { GtkPrintOperationResult _result_ = 0; + AppWindow* _tmp13_; AppWindow* _tmp14_; - AppWindow* _tmp15_; - GtkPrintOperationResult _tmp16_; - GtkPrintOperationResult _tmp17_; -#line 868 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp14_ = app_window_get_instance (); + GtkPrintOperationResult _tmp15_; #line 868 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp15_ = _tmp14_; + _tmp13_ = app_window_get_instance (); #line 868 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp16_ = gtk_print_operation_run (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_window_get_type (), GtkWindow), &_inner_error_); + _tmp14_ = _tmp13_; #line 868 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp17_ = _tmp16_; + _tmp15_ = gtk_print_operation_run (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow), &_inner_error_); #line 868 "/home/jens/Source/shotwell/src/Printing.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp14_); #line 868 "/home/jens/Source/shotwell/src/Printing.vala" - _result_ = _tmp17_; + _result_ = _tmp15_; #line 868 "/home/jens/Source/shotwell/src/Printing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6050 "Printing.c" +#line 6343 "Printing.c" goto __catch478_g_error; } #line 870 "/home/jens/Source/shotwell/src/Printing.vala" if (_result_ == GTK_PRINT_OPERATION_RESULT_APPLY) { -#line 6055 "Printing.c" - GtkPageSetup* _tmp18_; - GtkPageSetup* _tmp19_; +#line 6348 "Printing.c" + GtkPageSetup* _tmp16_; + GtkPageSetup* _tmp17_; #line 871 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp18_ = gtk_print_operation_get_default_page_setup (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation)); + _tmp16_ = gtk_print_operation_get_default_page_setup (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation)); #line 871 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp19_ = _g_object_ref0 (_tmp18_); + _tmp17_ = _g_object_ref0 (_tmp16_); #line 871 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (self->priv->user_page_setup); #line 871 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->user_page_setup = _tmp19_; -#line 6066 "Printing.c" + self->priv->user_page_setup = _tmp17_; +#line 6359 "Printing.c" } } goto __finally478; __catch478_g_error: { GError* e = NULL; - GError* _tmp20_; - const gchar* _tmp21_; - gchar* _tmp22_; + GError* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_; #line 867 "/home/jens/Source/shotwell/src/Printing.vala" e = _inner_error_; #line 867 "/home/jens/Source/shotwell/src/Printing.vala" @@ -6080,18 +6373,18 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) { #line 873 "/home/jens/Source/shotwell/src/Printing.vala" gtk_print_operation_cancel (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation)); #line 874 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp20_ = e; + _tmp18_ = e; #line 874 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp21_ = _tmp20_->message; + _tmp19_ = _tmp18_->message; #line 874 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp22_ = g_strdup (_tmp21_); + _tmp20_ = g_strdup (_tmp19_); #line 874 "/home/jens/Source/shotwell/src/Printing.vala" _g_free0 (err_msg); #line 874 "/home/jens/Source/shotwell/src/Printing.vala" - err_msg = _tmp22_; + err_msg = _tmp20_; #line 867 "/home/jens/Source/shotwell/src/Printing.vala" _g_error_free0 (e); -#line 6094 "Printing.c" +#line 6387 "Printing.c" } __finally478: #line 867 "/home/jens/Source/shotwell/src/Printing.vala" @@ -6106,12 +6399,12 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) { g_clear_error (&_inner_error_); #line 867 "/home/jens/Source/shotwell/src/Printing.vala" return; -#line 6109 "Printing.c" +#line 6402 "Printing.c" } #line 877 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp23_ = self->priv->progress_dialog; + _tmp21_ = self->priv->progress_dialog; #line 877 "/home/jens/Source/shotwell/src/Printing.vala" - progress_dialog_close (_tmp23_); + progress_dialog_close (_tmp21_); #line 878 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (self->priv->progress_dialog); #line 878 "/home/jens/Source/shotwell/src/Printing.vala" @@ -6121,55 +6414,57 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) { #line 879 "/home/jens/Source/shotwell/src/Printing.vala" self->priv->cancellable = NULL; #line 881 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp24_ = app_window_get_instance (); + _tmp22_ = app_window_get_instance (); #line 881 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp25_ = _tmp24_; + _tmp23_ = _tmp22_; #line 881 "/home/jens/Source/shotwell/src/Printing.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PAGE_WINDOW, PageWindow)); #line 881 "/home/jens/Source/shotwell/src/Printing.vala" - _g_object_unref0 (_tmp25_); + _g_object_unref0 (_tmp23_); #line 883 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp26_ = err_msg; + _tmp24_ = err_msg; #line 883 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp26_ != NULL) { -#line 6135 "Printing.c" - const gchar* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; + if (_tmp24_ != NULL) { +#line 6428 "Printing.c" + const gchar* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; #line 884 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp27_ = err_msg; + _tmp25_ = err_msg; #line 884 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp28_ = g_strdup_printf (_ ("Unable to print photo:\n\n%s"), _tmp27_); + _tmp26_ = g_strdup_printf (_ ("Unable to print photo:\n\n%s"), _tmp25_); #line 884 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp29_ = _tmp28_; + _tmp27_ = _tmp26_; #line 884 "/home/jens/Source/shotwell/src/Printing.vala" - app_window_error_message (_tmp29_, NULL); + app_window_error_message (_tmp27_, NULL); #line 884 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp29_); -#line 6149 "Printing.c" + _g_free0 (_tmp27_); +#line 6442 "Printing.c" } #line 849 "/home/jens/Source/shotwell/src/Printing.vala" _g_free0 (err_msg); #line 849 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (job); -#line 6155 "Printing.c" +#line 6448 "Printing.c" } -static void print_manager_on_begin_print (PrintManager* self, GtkPrintOperation* emitting_object, GtkPrintContext* job_context) { +static void +print_manager_on_begin_print (PrintManager* self, + GtkPrintOperation* emitting_object, + GtkPrintContext* job_context) +{ PrintJob* job = NULL; - GtkPrintOperation* _tmp0_; - PrintJob* _tmp1_; - gboolean _tmp2_ = FALSE; - GCancellable* _tmp3_; + PrintJob* _tmp0_; + gboolean _tmp1_ = FALSE; + GCancellable* _tmp2_; GeeList* photos = NULL; + PrintJob* _tmp5_; + GeeList* _tmp6_; PrintJob* _tmp7_; - GeeList* _tmp8_; - PrintJob* _tmp9_; - PrintSettings* _tmp10_; - PrintSettings* _tmp11_; - ContentLayout _tmp12_; - gboolean _tmp13_; + PrintSettings* _tmp8_; + PrintSettings* _tmp9_; + gboolean _tmp10_; #line 887 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_MANAGER (self)); #line 887 "/home/jens/Source/shotwell/src/Printing.vala" @@ -6179,125 +6474,109 @@ static void print_manager_on_begin_print (PrintManager* self, GtkPrintOperation* #line 888 "/home/jens/Source/shotwell/src/Printing.vala" g_debug ("Printing.vala:888: on_begin_print"); #line 890 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = emitting_object; -#line 890 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PRINT_JOB, PrintJob)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (emitting_object, TYPE_PRINT_JOB, PrintJob)); #line 890 "/home/jens/Source/shotwell/src/Printing.vala" - job = _tmp1_; + job = _tmp0_; #line 893 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = self->priv->cancellable; -#line 893 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp3_ != NULL) { -#line 6191 "Printing.c" - GCancellable* _tmp4_; - gboolean _tmp5_; + _tmp2_ = self->priv->cancellable; #line 893 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = self->priv->cancellable; + if (_tmp2_ != NULL) { +#line 6484 "Printing.c" + GCancellable* _tmp3_; #line 893 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = g_cancellable_is_cancelled (_tmp4_); + _tmp3_ = self->priv->cancellable; #line 893 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = _tmp5_; -#line 6200 "Printing.c" + _tmp1_ = g_cancellable_is_cancelled (_tmp3_); +#line 6490 "Printing.c" } else { #line 893 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = FALSE; -#line 6204 "Printing.c" + _tmp1_ = FALSE; +#line 6494 "Printing.c" } #line 893 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp2_) { -#line 6208 "Printing.c" - PrintJob* _tmp6_; + if (_tmp1_) { +#line 6498 "Printing.c" + PrintJob* _tmp4_; #line 894 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = job; + _tmp4_ = job; #line 894 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_print_operation_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_print_operation_get_type (), GtkPrintOperation)); + gtk_print_operation_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_print_operation_get_type (), GtkPrintOperation)); #line 896 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (job); #line 896 "/home/jens/Source/shotwell/src/Printing.vala" return; -#line 6218 "Printing.c" +#line 6508 "Printing.c" } #line 899 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = job; + _tmp5_ = job; #line 899 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = print_job_get_photos (_tmp7_); + _tmp6_ = print_job_get_photos (_tmp5_); #line 899 "/home/jens/Source/shotwell/src/Printing.vala" - photos = _tmp8_; -#line 900 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = job; + photos = _tmp6_; #line 900 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp10_ = print_job_get_local_settings (_tmp9_); + _tmp7_ = job; #line 900 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp11_ = _tmp10_; + _tmp8_ = print_job_get_local_settings (_tmp7_); #line 900 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp12_ = print_settings_get_content_layout (_tmp11_); + _tmp9_ = _tmp8_; #line 900 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp13_ = _tmp12_ == CONTENT_LAYOUT_IMAGE_PER_PAGE; + _tmp10_ = print_settings_get_content_layout (_tmp9_) == CONTENT_LAYOUT_IMAGE_PER_PAGE; #line 900 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp11_); + _print_settings_unref0 (_tmp9_); #line 900 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp13_) { -#line 6240 "Printing.c" + if (_tmp10_) { +#line 6528 "Printing.c" PrintLayout layout = 0; - PrintJob* _tmp14_; - PrintSettings* _tmp15_; - PrintSettings* _tmp16_; + PrintJob* _tmp11_; + PrintSettings* _tmp12_; + PrintSettings* _tmp13_; + PrintLayout _tmp14_; + PrintJob* _tmp15_; + GeeList* _tmp16_; gint _tmp17_; - PrintLayout _tmp18_; - PrintJob* _tmp19_; - GeeList* _tmp20_; - gint _tmp21_; - gint _tmp22_; - PrintLayout _tmp23_; - gint _tmp24_; - gdouble _tmp25_; + gint _tmp18_; + PrintLayout _tmp19_; #line 901 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp14_ = job; + _tmp11_ = job; #line 901 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp15_ = print_job_get_local_settings (_tmp14_); + _tmp12_ = print_job_get_local_settings (_tmp11_); #line 901 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp16_ = _tmp15_; -#line 901 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp17_ = print_settings_get_image_per_page_selection (_tmp16_); + _tmp13_ = _tmp12_; #line 901 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp18_ = (PrintLayout) _tmp17_; + _tmp14_ = (PrintLayout) print_settings_get_image_per_page_selection (_tmp13_); #line 901 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp16_); + _print_settings_unref0 (_tmp13_); #line 901 "/home/jens/Source/shotwell/src/Printing.vala" - layout = _tmp18_; -#line 902 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp19_ = job; + layout = _tmp14_; #line 902 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp20_ = photos; + _tmp15_ = job; #line 902 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp16_ = photos; #line 902 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp22_ = _tmp21_; + _tmp17_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection)); #line 902 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp23_ = layout; + _tmp18_ = _tmp17_; #line 902 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp24_ = print_layout_get_per_page (_tmp23_); + _tmp19_ = layout; #line 902 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp25_ = ceil (((gdouble) _tmp22_) / ((gdouble) _tmp24_)); -#line 902 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_print_operation_set_n_pages (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_print_operation_get_type (), GtkPrintOperation), (gint) _tmp25_); -#line 6284 "Printing.c" + gtk_print_operation_set_n_pages (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_print_operation_get_type (), GtkPrintOperation), (gint) ceil (((gdouble) _tmp18_) / ((gdouble) print_layout_get_per_page (_tmp19_)))); +#line 6563 "Printing.c" } else { - PrintJob* _tmp26_; - GeeList* _tmp27_; - gint _tmp28_; - gint _tmp29_; + PrintJob* _tmp20_; + GeeList* _tmp21_; + gint _tmp22_; + gint _tmp23_; #line 904 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp26_ = job; + _tmp20_ = job; #line 904 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp27_ = photos; + _tmp21_ = photos; #line 904 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp28_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp22_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); #line 904 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp29_ = _tmp28_; + _tmp23_ = _tmp22_; #line 904 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_print_operation_set_n_pages (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_print_operation_get_type (), GtkPrintOperation), _tmp29_); -#line 6300 "Printing.c" + gtk_print_operation_set_n_pages (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_print_operation_get_type (), GtkPrintOperation), _tmp23_); +#line 6579 "Printing.c" } #line 907 "/home/jens/Source/shotwell/src/Printing.vala" spin_event_loop (); @@ -6305,95 +6584,92 @@ static void print_manager_on_begin_print (PrintManager* self, GtkPrintOperation* _g_object_unref0 (photos); #line 887 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (job); -#line 6308 "Printing.c" +#line 6587 "Printing.c" } -static void print_manager_on_status_changed (PrintManager* self, GtkPrintOperation* job) { - GtkPrintOperation* _tmp0_; - const gchar* _tmp1_; - ProgressDialog* _tmp2_; +static void +print_manager_on_status_changed (PrintManager* self, + GtkPrintOperation* job) +{ + const gchar* _tmp0_; + ProgressDialog* _tmp1_; #line 910 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_MANAGER (self)); #line 910 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (GTK_IS_PRINT_OPERATION (job)); #line 911 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = job; -#line 911 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = gtk_print_operation_get_status_string (_tmp0_); + _tmp0_ = gtk_print_operation_get_status_string (job); #line 911 "/home/jens/Source/shotwell/src/Printing.vala" - g_debug ("Printing.vala:911: on_status_changed: %s", _tmp1_); + g_debug ("Printing.vala:911: on_status_changed: %s", _tmp0_); #line 913 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = self->priv->progress_dialog; + _tmp1_ = self->priv->progress_dialog; #line 913 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp2_ != NULL) { -#line 6330 "Printing.c" - ProgressDialog* _tmp3_; - GtkPrintOperation* _tmp4_; - const gchar* _tmp5_; -#line 914 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = self->priv->progress_dialog; + if (_tmp1_ != NULL) { +#line 6609 "Printing.c" + ProgressDialog* _tmp2_; + const gchar* _tmp3_; #line 914 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = job; + _tmp2_ = self->priv->progress_dialog; #line 914 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = gtk_print_operation_get_status_string (_tmp4_); + _tmp3_ = gtk_print_operation_get_status_string (job); #line 914 "/home/jens/Source/shotwell/src/Printing.vala" - progress_dialog_set_status (_tmp3_, _tmp5_); + progress_dialog_set_status (_tmp2_, _tmp3_); #line 915 "/home/jens/Source/shotwell/src/Printing.vala" spin_event_loop (); -#line 6344 "Printing.c" +#line 6620 "Printing.c" } } -static gpointer _cairo_reference0 (gpointer self) { +static gpointer +_cairo_reference0 (gpointer self) +{ #line 940 "/home/jens/Source/shotwell/src/Printing.vala" return self ? cairo_reference (self) : NULL; -#line 6352 "Printing.c" +#line 6630 "Printing.c" } -static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* emitting_object, GtkPrintContext* job_context, gint page_num) { +static void +print_manager_on_draw_page (PrintManager* self, + GtkPrintOperation* emitting_object, + GtkPrintContext* job_context, + gint page_num) +{ PrintJob* job = NULL; - GtkPrintOperation* _tmp0_; - PrintJob* _tmp1_; - gboolean _tmp2_ = FALSE; - GCancellable* _tmp3_; + PrintJob* _tmp0_; + gboolean _tmp1_ = FALSE; + GCancellable* _tmp2_; GtkPageSetup* page_setup = NULL; - GtkPrintContext* _tmp7_; - GtkPageSetup* _tmp8_; - GtkPageSetup* _tmp9_; + GtkPageSetup* _tmp5_; + GtkPageSetup* _tmp6_; gdouble page_width = 0.0; - GtkPageSetup* _tmp10_; - gdouble _tmp11_; + GtkPageSetup* _tmp7_; gdouble page_height = 0.0; - GtkPageSetup* _tmp12_; - gdouble _tmp13_; + GtkPageSetup* _tmp8_; gdouble dpi = 0.0; - PrintJob* _tmp14_; - PrintSettings* _tmp15_; - PrintSettings* _tmp16_; - gint _tmp17_; - gdouble _tmp18_; + PrintJob* _tmp9_; + PrintSettings* _tmp10_; + PrintSettings* _tmp11_; + gdouble _tmp12_; gdouble inv_dpi = 0.0; - gdouble _tmp19_; + gdouble _tmp13_; cairo_t* dc = NULL; - GtkPrintContext* _tmp20_; - cairo_t* _tmp21_; - cairo_t* _tmp22_; - cairo_t* _tmp23_; - gdouble _tmp24_; - gdouble _tmp25_; + cairo_t* _tmp14_; + cairo_t* _tmp15_; + cairo_t* _tmp16_; + gdouble _tmp17_; + gdouble _tmp18_; GeeList* photos = NULL; - PrintJob* _tmp26_; - GeeList* _tmp27_; + PrintJob* _tmp19_; + GeeList* _tmp20_; ContentLayout content_layout = 0; - PrintJob* _tmp28_; - PrintSettings* _tmp29_; - PrintSettings* _tmp30_; - ContentLayout _tmp31_; - ContentLayout _tmp32_; - ContentLayout _tmp33_; + PrintJob* _tmp21_; + PrintSettings* _tmp22_; + PrintSettings* _tmp23_; + ContentLayout _tmp24_; + ContentLayout _tmp25_; #line 919 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_MANAGER (self)); #line 919 "/home/jens/Source/shotwell/src/Printing.vala" @@ -6403,803 +6679,723 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e #line 921 "/home/jens/Source/shotwell/src/Printing.vala" g_debug ("Printing.vala:921: on_draw_page"); #line 923 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = emitting_object; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (emitting_object, TYPE_PRINT_JOB, PrintJob)); #line 923 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PRINT_JOB, PrintJob)); -#line 923 "/home/jens/Source/shotwell/src/Printing.vala" - job = _tmp1_; -#line 926 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = self->priv->cancellable; + job = _tmp0_; #line 926 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp3_ != NULL) { -#line 6415 "Printing.c" - GCancellable* _tmp4_; - gboolean _tmp5_; + _tmp2_ = self->priv->cancellable; #line 926 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = self->priv->cancellable; + if (_tmp2_ != NULL) { +#line 6689 "Printing.c" + GCancellable* _tmp3_; #line 926 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = g_cancellable_is_cancelled (_tmp4_); + _tmp3_ = self->priv->cancellable; #line 926 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = _tmp5_; -#line 6424 "Printing.c" + _tmp1_ = g_cancellable_is_cancelled (_tmp3_); +#line 6695 "Printing.c" } else { #line 926 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = FALSE; -#line 6428 "Printing.c" + _tmp1_ = FALSE; +#line 6699 "Printing.c" } #line 926 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp2_) { -#line 6432 "Printing.c" - PrintJob* _tmp6_; + if (_tmp1_) { +#line 6703 "Printing.c" + PrintJob* _tmp4_; #line 927 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = job; + _tmp4_ = job; #line 927 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_print_operation_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_print_operation_get_type (), GtkPrintOperation)); + gtk_print_operation_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_print_operation_get_type (), GtkPrintOperation)); #line 929 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (job); #line 929 "/home/jens/Source/shotwell/src/Printing.vala" return; -#line 6442 "Printing.c" +#line 6713 "Printing.c" } #line 932 "/home/jens/Source/shotwell/src/Printing.vala" spin_event_loop (); #line 934 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = job_context; + _tmp5_ = gtk_print_context_get_page_setup (job_context); #line 934 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = gtk_print_context_get_page_setup (_tmp7_); + _tmp6_ = _g_object_ref0 (_tmp5_); #line 934 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = _g_object_ref0 (_tmp8_); -#line 934 "/home/jens/Source/shotwell/src/Printing.vala" - page_setup = _tmp9_; -#line 935 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp10_ = page_setup; + page_setup = _tmp6_; #line 935 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp11_ = gtk_page_setup_get_page_width (_tmp10_, GTK_UNIT_INCH); + _tmp7_ = page_setup; #line 935 "/home/jens/Source/shotwell/src/Printing.vala" - page_width = _tmp11_; + page_width = gtk_page_setup_get_page_width (_tmp7_, GTK_UNIT_INCH); #line 936 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp12_ = page_setup; + _tmp8_ = page_setup; #line 936 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp13_ = gtk_page_setup_get_page_height (_tmp12_, GTK_UNIT_INCH); -#line 936 "/home/jens/Source/shotwell/src/Printing.vala" - page_height = _tmp13_; -#line 938 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp14_ = job; + page_height = gtk_page_setup_get_page_height (_tmp8_, GTK_UNIT_INCH); #line 938 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp15_ = print_job_get_local_settings (_tmp14_); + _tmp9_ = job; #line 938 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp16_ = _tmp15_; + _tmp10_ = print_job_get_local_settings (_tmp9_); #line 938 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp17_ = print_settings_get_content_ppi (_tmp16_); + _tmp11_ = _tmp10_; #line 938 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp18_ = (gdouble) _tmp17_; + _tmp12_ = (gdouble) print_settings_get_content_ppi (_tmp11_); #line 938 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp16_); + _print_settings_unref0 (_tmp11_); #line 938 "/home/jens/Source/shotwell/src/Printing.vala" - dpi = _tmp18_; + dpi = _tmp12_; #line 939 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp19_ = dpi; + _tmp13_ = dpi; #line 939 "/home/jens/Source/shotwell/src/Printing.vala" - inv_dpi = 1.0 / _tmp19_; -#line 940 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp20_ = job_context; + inv_dpi = 1.0 / _tmp13_; #line 940 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp21_ = gtk_print_context_get_cairo_context (_tmp20_); + _tmp14_ = gtk_print_context_get_cairo_context (job_context); #line 940 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp22_ = _cairo_reference0 (_tmp21_); + _tmp15_ = _cairo_reference0 (_tmp14_); #line 940 "/home/jens/Source/shotwell/src/Printing.vala" - dc = _tmp22_; + dc = _tmp15_; #line 941 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp23_ = dc; + _tmp16_ = dc; #line 941 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp24_ = inv_dpi; + _tmp17_ = inv_dpi; #line 941 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp25_ = inv_dpi; + _tmp18_ = inv_dpi; #line 941 "/home/jens/Source/shotwell/src/Printing.vala" - cairo_scale (_tmp23_, _tmp24_, _tmp25_); + cairo_scale (_tmp16_, _tmp17_, _tmp18_); #line 942 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp26_ = job; + _tmp19_ = job; #line 942 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp27_ = print_job_get_photos (_tmp26_); + _tmp20_ = print_job_get_photos (_tmp19_); #line 942 "/home/jens/Source/shotwell/src/Printing.vala" - photos = _tmp27_; + photos = _tmp20_; #line 944 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp28_ = job; + _tmp21_ = job; #line 944 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp29_ = print_job_get_local_settings (_tmp28_); + _tmp22_ = print_job_get_local_settings (_tmp21_); #line 944 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp30_ = _tmp29_; -#line 944 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp31_ = print_settings_get_content_layout (_tmp30_); + _tmp23_ = _tmp22_; #line 944 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp32_ = _tmp31_; + _tmp24_ = print_settings_get_content_layout (_tmp23_); #line 944 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp30_); + _print_settings_unref0 (_tmp23_); #line 944 "/home/jens/Source/shotwell/src/Printing.vala" - content_layout = _tmp32_; + content_layout = _tmp24_; #line 945 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp33_ = content_layout; + _tmp25_ = content_layout; #line 945 "/home/jens/Source/shotwell/src/Printing.vala" - switch (_tmp33_) { + switch (_tmp25_) { #line 945 "/home/jens/Source/shotwell/src/Printing.vala" case CONTENT_LAYOUT_STANDARD_SIZE: #line 945 "/home/jens/Source/shotwell/src/Printing.vala" case CONTENT_LAYOUT_CUSTOM_SIZE: -#line 6528 "Printing.c" +#line 6787 "Printing.c" { gdouble canvas_width = 0.0; gdouble canvas_height = 0.0; - ContentLayout _tmp34_; - gint _tmp66_; - GeeList* _tmp67_; - gint _tmp68_; - gint _tmp69_; - ProgressDialog* _tmp115_; + ContentLayout _tmp26_; + GeeList* _tmp56_; + gint _tmp57_; + gint _tmp58_; + ProgressDialog* _tmp95_; #line 949 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp34_ = content_layout; + _tmp26_ = content_layout; #line 949 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp34_ == CONTENT_LAYOUT_STANDARD_SIZE) { -#line 6542 "Printing.c" + if (_tmp26_ == CONTENT_LAYOUT_STANDARD_SIZE) { +#line 6800 "Printing.c" + gint _tmp27_; + StandardPrintSize** _tmp28_; + PrintJob* _tmp29_; + PrintSettings* _tmp30_; + PrintSettings* _tmp31_; + StandardPrintSize* _tmp32_; + Measurement _tmp33_ = {0}; + gdouble _tmp34_; gint _tmp35_; StandardPrintSize** _tmp36_; PrintJob* _tmp37_; PrintSettings* _tmp38_; PrintSettings* _tmp39_; - gint _tmp40_; - StandardPrintSize* _tmp41_; - Measurement _tmp42_ = {0}; - gdouble _tmp43_; - gint _tmp44_; - StandardPrintSize** _tmp45_; - PrintJob* _tmp46_; - PrintSettings* _tmp47_; - PrintSettings* _tmp48_; - gint _tmp49_; - StandardPrintSize* _tmp50_; - Measurement _tmp51_ = {0}; - gdouble _tmp52_; -#line 950 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp36_ = print_manager_get_standard_sizes (self, &_tmp35_); + StandardPrintSize* _tmp40_; + Measurement _tmp41_ = {0}; + gdouble _tmp42_; #line 950 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp37_ = job; + _tmp28_ = print_manager_get_standard_sizes (self, &_tmp27_); #line 950 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp38_ = print_job_get_local_settings (_tmp37_); + _tmp29_ = job; #line 950 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp39_ = _tmp38_; + _tmp30_ = print_job_get_local_settings (_tmp29_); #line 950 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp40_ = print_settings_get_size_selection (_tmp39_); + _tmp31_ = _tmp30_; #line 950 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp41_ = _tmp36_[_tmp40_]; + _tmp32_ = _tmp28_[print_settings_get_size_selection (_tmp31_)]; #line 950 "/home/jens/Source/shotwell/src/Printing.vala" - measurement_convert_to (&_tmp41_->width, MEASUREMENT_UNIT_INCHES, &_tmp42_); + measurement_convert_to (&_tmp32_->width, MEASUREMENT_UNIT_INCHES, &_tmp33_); #line 950 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp43_ = _tmp42_.value; + _tmp34_ = _tmp33_.value; #line 950 "/home/jens/Source/shotwell/src/Printing.vala" - canvas_width = _tmp43_; + canvas_width = _tmp34_; #line 950 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp39_); -#line 952 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp45_ = print_manager_get_standard_sizes (self, &_tmp44_); + _print_settings_unref0 (_tmp31_); #line 952 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp46_ = job; + _tmp36_ = print_manager_get_standard_sizes (self, &_tmp35_); #line 952 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp47_ = print_job_get_local_settings (_tmp46_); + _tmp37_ = job; #line 952 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp48_ = _tmp47_; + _tmp38_ = print_job_get_local_settings (_tmp37_); #line 952 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp49_ = print_settings_get_size_selection (_tmp48_); + _tmp39_ = _tmp38_; #line 952 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp50_ = _tmp45_[_tmp49_]; + _tmp40_ = _tmp36_[print_settings_get_size_selection (_tmp39_)]; #line 952 "/home/jens/Source/shotwell/src/Printing.vala" - measurement_convert_to (&_tmp50_->height, MEASUREMENT_UNIT_INCHES, &_tmp51_); + measurement_convert_to (&_tmp40_->height, MEASUREMENT_UNIT_INCHES, &_tmp41_); #line 952 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp52_ = _tmp51_.value; + _tmp42_ = _tmp41_.value; #line 952 "/home/jens/Source/shotwell/src/Printing.vala" - canvas_height = _tmp52_; + canvas_height = _tmp42_; #line 952 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp48_); -#line 6601 "Printing.c" + _print_settings_unref0 (_tmp39_); +#line 6853 "Printing.c" } else { - ContentLayout _tmp53_; - PrintJob* _tmp54_; - PrintSettings* _tmp55_; - PrintSettings* _tmp56_; - Measurement _tmp57_ = {0}; - Measurement _tmp58_ = {0}; - gdouble _tmp59_; - PrintJob* _tmp60_; - PrintSettings* _tmp61_; - PrintSettings* _tmp62_; - Measurement _tmp63_ = {0}; - Measurement _tmp64_ = {0}; - gdouble _tmp65_; + ContentLayout _tmp43_; + PrintJob* _tmp44_; + PrintSettings* _tmp45_; + PrintSettings* _tmp46_; + Measurement _tmp47_ = {0}; + Measurement _tmp48_ = {0}; + gdouble _tmp49_; + PrintJob* _tmp50_; + PrintSettings* _tmp51_; + PrintSettings* _tmp52_; + Measurement _tmp53_ = {0}; + Measurement _tmp54_ = {0}; + gdouble _tmp55_; #line 955 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp53_ = content_layout; + _tmp43_ = content_layout; #line 955 "/home/jens/Source/shotwell/src/Printing.vala" - _vala_assert (_tmp53_ == CONTENT_LAYOUT_CUSTOM_SIZE, "content_layout == ContentLayout.CUSTOM_SIZE"); + _vala_assert (_tmp43_ == CONTENT_LAYOUT_CUSTOM_SIZE, "content_layout == ContentLayout.CUSTOM_SIZE"); #line 956 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp54_ = job; + _tmp44_ = job; #line 956 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp55_ = print_job_get_local_settings (_tmp54_); + _tmp45_ = print_job_get_local_settings (_tmp44_); #line 956 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp56_ = _tmp55_; + _tmp46_ = _tmp45_; #line 956 "/home/jens/Source/shotwell/src/Printing.vala" - print_settings_get_content_width (_tmp56_, &_tmp57_); + print_settings_get_content_width (_tmp46_, &_tmp47_); #line 956 "/home/jens/Source/shotwell/src/Printing.vala" - measurement_convert_to (&_tmp57_, MEASUREMENT_UNIT_INCHES, &_tmp58_); + measurement_convert_to (&_tmp47_, MEASUREMENT_UNIT_INCHES, &_tmp48_); #line 956 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp59_ = _tmp58_.value; + _tmp49_ = _tmp48_.value; #line 956 "/home/jens/Source/shotwell/src/Printing.vala" - canvas_width = _tmp59_; + canvas_width = _tmp49_; #line 956 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp56_); + _print_settings_unref0 (_tmp46_); #line 958 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp60_ = job; + _tmp50_ = job; #line 958 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp61_ = print_job_get_local_settings (_tmp60_); + _tmp51_ = print_job_get_local_settings (_tmp50_); #line 958 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp62_ = _tmp61_; + _tmp52_ = _tmp51_; #line 958 "/home/jens/Source/shotwell/src/Printing.vala" - print_settings_get_content_height (_tmp62_, &_tmp63_); + print_settings_get_content_height (_tmp52_, &_tmp53_); #line 958 "/home/jens/Source/shotwell/src/Printing.vala" - measurement_convert_to (&_tmp63_, MEASUREMENT_UNIT_INCHES, &_tmp64_); + measurement_convert_to (&_tmp53_, MEASUREMENT_UNIT_INCHES, &_tmp54_); #line 958 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp65_ = _tmp64_.value; + _tmp55_ = _tmp54_.value; #line 958 "/home/jens/Source/shotwell/src/Printing.vala" - canvas_height = _tmp65_; + canvas_height = _tmp55_; #line 958 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp62_); -#line 6652 "Printing.c" + _print_settings_unref0 (_tmp52_); +#line 6904 "Printing.c" } #line 962 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp66_ = page_num; + _tmp56_ = photos; #line 962 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp67_ = photos; + _tmp57_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_COLLECTION, GeeCollection)); #line 962 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp68_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp58_ = _tmp57_; #line 962 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp69_ = _tmp68_; -#line 962 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp66_ < _tmp69_) { -#line 6664 "Printing.c" + if (page_num < _tmp58_) { +#line 6914 "Printing.c" Dimensions photo_dimensions = {0}; - GeeList* _tmp70_; - gint _tmp71_; - gpointer _tmp72_; - Photo* _tmp73_; - Dimensions _tmp74_ = {0}; - Dimensions _tmp75_; + GeeList* _tmp59_; + gpointer _tmp60_; + Photo* _tmp61_; + Dimensions _tmp62_ = {0}; + Dimensions _tmp63_; gdouble photo_aspect_ratio = 0.0; - gdouble _tmp76_; gdouble canvas_aspect_ratio = 0.0; - gdouble _tmp77_; + gdouble _tmp64_; + gdouble _tmp65_; + gdouble _tmp66_; + gdouble _tmp67_; + gdouble dx = 0.0; + gdouble _tmp71_; + gdouble _tmp72_; + gdouble dy = 0.0; + gdouble _tmp73_; + gdouble _tmp74_; + GeeList* _tmp75_; + gpointer _tmp76_; + Photo* _tmp77_; gdouble _tmp78_; gdouble _tmp79_; gdouble _tmp80_; gdouble _tmp81_; - gdouble _tmp82_; - gdouble dx = 0.0; - gdouble _tmp86_; - gdouble _tmp87_; - gdouble dy = 0.0; - gdouble _tmp88_; - gdouble _tmp89_; - GeeList* _tmp90_; - gint _tmp91_; - gpointer _tmp92_; - Photo* _tmp93_; - gdouble _tmp94_; - gdouble _tmp95_; - gdouble _tmp96_; - gdouble _tmp97_; - PrintJob* _tmp98_; - GtkPrintContext* _tmp99_; - PrintJob* _tmp100_; - PrintSettings* _tmp101_; - PrintSettings* _tmp102_; - gboolean _tmp103_; - gboolean _tmp104_; -#line 963 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp70_ = photos; + PrintJob* _tmp82_; + PrintJob* _tmp83_; + PrintSettings* _tmp84_; + PrintSettings* _tmp85_; + gboolean _tmp86_; #line 963 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp71_ = page_num; + _tmp59_ = photos; #line 963 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp72_ = gee_list_get (_tmp70_, _tmp71_); + _tmp60_ = gee_list_get (_tmp59_, page_num); #line 963 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp73_ = (Photo*) _tmp72_; + _tmp61_ = (Photo*) _tmp60_; #line 963 "/home/jens/Source/shotwell/src/Printing.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp74_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp62_); #line 963 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp75_ = _tmp74_; + _tmp63_ = _tmp62_; #line 963 "/home/jens/Source/shotwell/src/Printing.vala" - _g_object_unref0 (_tmp73_); + _g_object_unref0 (_tmp61_); #line 963 "/home/jens/Source/shotwell/src/Printing.vala" - photo_dimensions = _tmp75_; -#line 964 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp76_ = dimensions_get_aspect_ratio (&photo_dimensions); + photo_dimensions = _tmp63_; #line 964 "/home/jens/Source/shotwell/src/Printing.vala" - photo_aspect_ratio = _tmp76_; + photo_aspect_ratio = dimensions_get_aspect_ratio (&photo_dimensions); #line 965 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp77_ = canvas_width; + _tmp64_ = canvas_width; #line 965 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp78_ = canvas_height; + _tmp65_ = canvas_height; #line 965 "/home/jens/Source/shotwell/src/Printing.vala" - canvas_aspect_ratio = ((gdouble) _tmp77_) / _tmp78_; + canvas_aspect_ratio = ((gdouble) _tmp64_) / _tmp65_; #line 966 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp79_ = canvas_aspect_ratio; + _tmp66_ = canvas_aspect_ratio; #line 966 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp80_ = floor (_tmp79_); + _tmp67_ = photo_aspect_ratio; #line 966 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp81_ = photo_aspect_ratio; -#line 966 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp82_ = floor (_tmp81_); -#line 966 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp80_ != _tmp82_) { -#line 6738 "Printing.c" + if (floor (_tmp66_) != floor (_tmp67_)) { +#line 6973 "Printing.c" gdouble canvas_tmp = 0.0; - gdouble _tmp83_; - gdouble _tmp84_; - gdouble _tmp85_; + gdouble _tmp68_; + gdouble _tmp69_; + gdouble _tmp70_; #line 967 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp83_ = canvas_width; + _tmp68_ = canvas_width; #line 967 "/home/jens/Source/shotwell/src/Printing.vala" - canvas_tmp = _tmp83_; + canvas_tmp = _tmp68_; #line 968 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp84_ = canvas_height; + _tmp69_ = canvas_height; #line 968 "/home/jens/Source/shotwell/src/Printing.vala" - canvas_width = _tmp84_; + canvas_width = _tmp69_; #line 969 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp85_ = canvas_tmp; + _tmp70_ = canvas_tmp; #line 969 "/home/jens/Source/shotwell/src/Printing.vala" - canvas_height = _tmp85_; -#line 6755 "Printing.c" + canvas_height = _tmp70_; +#line 6990 "Printing.c" } #line 972 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp86_ = page_width; + _tmp71_ = page_width; #line 972 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp87_ = canvas_width; + _tmp72_ = canvas_width; #line 972 "/home/jens/Source/shotwell/src/Printing.vala" - dx = (_tmp86_ - _tmp87_) / 2.0; + dx = (_tmp71_ - _tmp72_) / 2.0; #line 973 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp88_ = page_height; + _tmp73_ = page_height; #line 973 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp89_ = canvas_height; + _tmp74_ = canvas_height; #line 973 "/home/jens/Source/shotwell/src/Printing.vala" - dy = (_tmp88_ - _tmp89_) / 2.0; -#line 974 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp90_ = photos; -#line 974 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp91_ = page_num; + dy = (_tmp73_ - _tmp74_) / 2.0; #line 974 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp92_ = gee_list_get (_tmp90_, _tmp91_); + _tmp75_ = photos; #line 974 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp93_ = (Photo*) _tmp92_; + _tmp76_ = gee_list_get (_tmp75_, page_num); #line 974 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp94_ = dx; + _tmp77_ = (Photo*) _tmp76_; #line 974 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp95_ = dy; + _tmp78_ = dx; #line 974 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp96_ = canvas_width; + _tmp79_ = dy; #line 974 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp97_ = canvas_height; + _tmp80_ = canvas_width; #line 974 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp98_ = job; + _tmp81_ = canvas_height; #line 974 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp99_ = job_context; + _tmp82_ = job; #line 974 "/home/jens/Source/shotwell/src/Printing.vala" - print_manager_fit_image_to_canvas (self, _tmp93_, _tmp94_, _tmp95_, _tmp96_, _tmp97_, TRUE, _tmp98_, _tmp99_); + print_manager_fit_image_to_canvas (self, _tmp77_, _tmp78_, _tmp79_, _tmp80_, _tmp81_, TRUE, _tmp82_, job_context); #line 974 "/home/jens/Source/shotwell/src/Printing.vala" - _g_object_unref0 (_tmp93_); + _g_object_unref0 (_tmp77_); #line 976 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp100_ = job; + _tmp83_ = job; #line 976 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp101_ = print_job_get_local_settings (_tmp100_); + _tmp84_ = print_job_get_local_settings (_tmp83_); #line 976 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp102_ = _tmp101_; + _tmp85_ = _tmp84_; #line 976 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp103_ = print_settings_is_print_titles_enabled (_tmp102_); + _tmp86_ = print_settings_is_print_titles_enabled (_tmp85_); #line 976 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp104_ = _tmp103_; + _print_settings_unref0 (_tmp85_); #line 976 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp102_); -#line 976 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp104_) { -#line 6807 "Printing.c" - gdouble _tmp105_; - gdouble _tmp106_; - GeeList* _tmp107_; - gint _tmp108_; - gpointer _tmp109_; - Photo* _tmp110_; - gchar* _tmp111_; - gchar* _tmp112_; - PrintJob* _tmp113_; - GtkPrintContext* _tmp114_; -#line 977 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp105_ = page_width; + if (_tmp86_) { +#line 7036 "Printing.c" + gdouble _tmp87_; + gdouble _tmp88_; + GeeList* _tmp89_; + gpointer _tmp90_; + Photo* _tmp91_; + gchar* _tmp92_; + gchar* _tmp93_; + PrintJob* _tmp94_; #line 977 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp106_ = page_height; + _tmp87_ = page_width; #line 977 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp107_ = photos; + _tmp88_ = page_height; #line 977 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp108_ = page_num; + _tmp89_ = photos; #line 977 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp109_ = gee_list_get (_tmp107_, _tmp108_); + _tmp90_ = gee_list_get (_tmp89_, page_num); #line 977 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp110_ = (Photo*) _tmp109_; + _tmp91_ = (Photo*) _tmp90_; #line 977 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp111_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, TYPE_DATA_OBJECT, DataObject)); + _tmp92_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, TYPE_DATA_OBJECT, DataObject)); #line 977 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp112_ = _tmp111_; + _tmp93_ = _tmp92_; #line 977 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp113_ = job; + _tmp94_ = job; #line 977 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp114_ = job_context; + print_manager_add_title_to_canvas (self, _tmp87_ / 2, _tmp88_, _tmp93_, _tmp94_, job_context); #line 977 "/home/jens/Source/shotwell/src/Printing.vala" - print_manager_add_title_to_canvas (self, _tmp105_ / 2, _tmp106_, _tmp112_, _tmp113_, _tmp114_); + _g_free0 (_tmp93_); #line 977 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp112_); -#line 977 "/home/jens/Source/shotwell/src/Printing.vala" - _g_object_unref0 (_tmp110_); -#line 6844 "Printing.c" + _g_object_unref0 (_tmp91_); +#line 7067 "Printing.c" } } #line 982 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp115_ = self->priv->progress_dialog; + _tmp95_ = self->priv->progress_dialog; #line 982 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp115_ != NULL) { -#line 6851 "Printing.c" - ProgressDialog* _tmp116_; - gint _tmp117_; - GeeList* _tmp118_; - gint _tmp119_; - gint _tmp120_; -#line 983 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp116_ = self->priv->progress_dialog; + if (_tmp95_ != NULL) { +#line 7074 "Printing.c" + ProgressDialog* _tmp96_; + GeeList* _tmp97_; + gint _tmp98_; + gint _tmp99_; #line 983 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp117_ = page_num; + _tmp96_ = self->priv->progress_dialog; #line 983 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp118_ = photos; + _tmp97_ = photos; #line 983 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp119_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp98_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, GEE_TYPE_COLLECTION, GeeCollection)); #line 983 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp120_ = _tmp119_; + _tmp99_ = _tmp98_; #line 983 "/home/jens/Source/shotwell/src/Printing.vala" - progress_dialog_monitor (_tmp116_, (guint64) _tmp117_, (guint64) _tmp120_, TRUE); -#line 6869 "Printing.c" + progress_dialog_monitor (_tmp96_, (guint64) page_num, (guint64) _tmp99_, TRUE); +#line 7089 "Printing.c" } #line 984 "/home/jens/Source/shotwell/src/Printing.vala" break; -#line 6873 "Printing.c" +#line 7093 "Printing.c" } #line 945 "/home/jens/Source/shotwell/src/Printing.vala" case CONTENT_LAYOUT_IMAGE_PER_PAGE: -#line 6877 "Printing.c" +#line 7097 "Printing.c" { PrintLayout layout = 0; - PrintJob* _tmp121_; - PrintSettings* _tmp122_; - PrintSettings* _tmp123_; - gint _tmp124_; - PrintLayout _tmp125_; + PrintJob* _tmp100_; + PrintSettings* _tmp101_; + PrintSettings* _tmp102_; + PrintLayout _tmp103_; gint nx = 0; - PrintLayout _tmp126_; - gint _tmp127_; + PrintLayout _tmp104_; gint ny = 0; - PrintLayout _tmp128_; - gint _tmp129_; + PrintLayout _tmp105_; gint start = 0; - gint _tmp130_; - PrintLayout _tmp131_; - gint _tmp132_; + PrintLayout _tmp106_; gdouble canvas_width = 0.0; - gdouble _tmp133_; - gint _tmp134_; - gint _tmp135_; + gdouble _tmp107_; + gint _tmp108_; + gint _tmp109_; gdouble canvas_height = 0.0; - gdouble _tmp136_; - gint _tmp137_; - gint _tmp138_; + gdouble _tmp110_; + gint _tmp111_; + gint _tmp112_; #line 987 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp121_ = job; + _tmp100_ = job; #line 987 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp122_ = print_job_get_local_settings (_tmp121_); + _tmp101_ = print_job_get_local_settings (_tmp100_); #line 987 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp123_ = _tmp122_; + _tmp102_ = _tmp101_; #line 987 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp124_ = print_settings_get_image_per_page_selection (_tmp123_); + _tmp103_ = (PrintLayout) print_settings_get_image_per_page_selection (_tmp102_); #line 987 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp125_ = (PrintLayout) _tmp124_; + _print_settings_unref0 (_tmp102_); #line 987 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp123_); -#line 987 "/home/jens/Source/shotwell/src/Printing.vala" - layout = _tmp125_; -#line 988 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp126_ = layout; + layout = _tmp103_; #line 988 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp127_ = print_layout_get_x (_tmp126_); + _tmp104_ = layout; #line 988 "/home/jens/Source/shotwell/src/Printing.vala" - nx = _tmp127_; + nx = print_layout_get_x (_tmp104_); #line 989 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp128_ = layout; + _tmp105_ = layout; #line 989 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp129_ = print_layout_get_y (_tmp128_); -#line 989 "/home/jens/Source/shotwell/src/Printing.vala" - ny = _tmp129_; -#line 990 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp130_ = page_num; + ny = print_layout_get_y (_tmp105_); #line 990 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp131_ = layout; + _tmp106_ = layout; #line 990 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp132_ = print_layout_get_per_page (_tmp131_); -#line 990 "/home/jens/Source/shotwell/src/Printing.vala" - start = _tmp130_ * _tmp132_; + start = page_num * print_layout_get_per_page (_tmp106_); #line 991 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp133_ = page_width; + _tmp107_ = page_width; #line 991 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp134_ = nx; + _tmp108_ = nx; #line 991 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp135_ = nx; + _tmp109_ = nx; #line 991 "/home/jens/Source/shotwell/src/Printing.vala" - canvas_width = ((gdouble) (_tmp133_ - (PRINT_MANAGER_IMAGE_DISTANCE * (_tmp134_ - 1)))) / _tmp135_; + canvas_width = ((gdouble) (_tmp107_ - (PRINT_MANAGER_IMAGE_DISTANCE * (_tmp108_ - 1)))) / _tmp109_; #line 992 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp136_ = page_height; + _tmp110_ = page_height; #line 992 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp137_ = ny; + _tmp111_ = ny; #line 992 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp138_ = ny; + _tmp112_ = ny; #line 992 "/home/jens/Source/shotwell/src/Printing.vala" - canvas_height = ((gdouble) (_tmp136_ - (PRINT_MANAGER_IMAGE_DISTANCE * (_tmp137_ - 1)))) / _tmp138_; -#line 6953 "Printing.c" + canvas_height = ((gdouble) (_tmp110_ - (PRINT_MANAGER_IMAGE_DISTANCE * (_tmp111_ - 1)))) / _tmp112_; +#line 7158 "Printing.c" { gint y = 0; #line 993 "/home/jens/Source/shotwell/src/Printing.vala" y = 0; -#line 6958 "Printing.c" +#line 7163 "Printing.c" { - gboolean _tmp139_ = FALSE; + gboolean _tmp113_ = FALSE; #line 993 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp139_ = TRUE; + _tmp113_ = TRUE; #line 993 "/home/jens/Source/shotwell/src/Printing.vala" while (TRUE) { -#line 6965 "Printing.c" - gint _tmp141_; - gint _tmp142_; +#line 7170 "Printing.c" + gint _tmp115_; + gint _tmp116_; #line 993 "/home/jens/Source/shotwell/src/Printing.vala" - if (!_tmp139_) { -#line 6970 "Printing.c" - gint _tmp140_; + if (!_tmp113_) { +#line 7175 "Printing.c" + gint _tmp114_; #line 993 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp140_ = y; + _tmp114_ = y; #line 993 "/home/jens/Source/shotwell/src/Printing.vala" - y = _tmp140_ + 1; -#line 6976 "Printing.c" + y = _tmp114_ + 1; +#line 7181 "Printing.c" } #line 993 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp139_ = FALSE; + _tmp113_ = FALSE; #line 993 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp141_ = y; + _tmp115_ = y; #line 993 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp142_ = ny; + _tmp116_ = ny; #line 993 "/home/jens/Source/shotwell/src/Printing.vala" - if (!(_tmp141_ < _tmp142_)) { + if (!(_tmp115_ < _tmp116_)) { #line 993 "/home/jens/Source/shotwell/src/Printing.vala" break; -#line 6988 "Printing.c" +#line 7193 "Printing.c" } { gint x = 0; #line 994 "/home/jens/Source/shotwell/src/Printing.vala" x = 0; -#line 6994 "Printing.c" +#line 7199 "Printing.c" { - gboolean _tmp143_ = FALSE; + gboolean _tmp117_ = FALSE; #line 994 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp143_ = TRUE; + _tmp117_ = TRUE; #line 994 "/home/jens/Source/shotwell/src/Printing.vala" while (TRUE) { -#line 7001 "Printing.c" - gint _tmp145_; - gint _tmp146_; +#line 7206 "Printing.c" + gint _tmp119_; + gint _tmp120_; gint i = 0; - gint _tmp147_; - gint _tmp148_; - gint _tmp149_; - gint _tmp150_; - gint _tmp151_; - GeeList* _tmp152_; - gint _tmp153_; - gint _tmp154_; - ProgressDialog* _tmp188_; + gint _tmp121_; + gint _tmp122_; + gint _tmp123_; + gint _tmp124_; + gint _tmp125_; + GeeList* _tmp126_; + gint _tmp127_; + gint _tmp128_; + ProgressDialog* _tmp159_; #line 994 "/home/jens/Source/shotwell/src/Printing.vala" - if (!_tmp143_) { -#line 7016 "Printing.c" - gint _tmp144_; + if (!_tmp117_) { +#line 7221 "Printing.c" + gint _tmp118_; #line 994 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp144_ = x; + _tmp118_ = x; #line 994 "/home/jens/Source/shotwell/src/Printing.vala" - x = _tmp144_ + 1; -#line 7022 "Printing.c" + x = _tmp118_ + 1; +#line 7227 "Printing.c" } #line 994 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp143_ = FALSE; + _tmp117_ = FALSE; #line 994 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp145_ = x; + _tmp119_ = x; #line 994 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp146_ = nx; + _tmp120_ = nx; #line 994 "/home/jens/Source/shotwell/src/Printing.vala" - if (!(_tmp145_ < _tmp146_)) { + if (!(_tmp119_ < _tmp120_)) { #line 994 "/home/jens/Source/shotwell/src/Printing.vala" break; -#line 7034 "Printing.c" +#line 7239 "Printing.c" } #line 995 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp147_ = start; + _tmp121_ = start; #line 995 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp148_ = y; + _tmp122_ = y; #line 995 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp149_ = nx; + _tmp123_ = nx; #line 995 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp150_ = x; + _tmp124_ = x; #line 995 "/home/jens/Source/shotwell/src/Printing.vala" - i = (_tmp147_ + (_tmp148_ * _tmp149_)) + _tmp150_; + i = (_tmp121_ + (_tmp122_ * _tmp123_)) + _tmp124_; #line 996 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp151_ = i; + _tmp125_ = i; #line 996 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp152_ = photos; + _tmp126_ = photos; #line 996 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp153_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp152_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp127_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, GEE_TYPE_COLLECTION, GeeCollection)); #line 996 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp154_ = _tmp153_; + _tmp128_ = _tmp127_; #line 996 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp151_ < _tmp154_) { -#line 7056 "Printing.c" + if (_tmp125_ < _tmp128_) { +#line 7261 "Printing.c" gdouble dx = 0.0; - gint _tmp155_; - gdouble _tmp156_; - gint _tmp157_; + gint _tmp129_; + gdouble _tmp130_; + gint _tmp131_; gdouble dy = 0.0; - gint _tmp158_; - gdouble _tmp159_; - gint _tmp160_; - GeeList* _tmp161_; - gint _tmp162_; - gpointer _tmp163_; - Photo* _tmp164_; - gdouble _tmp165_; - gdouble _tmp166_; - gdouble _tmp167_; - gdouble _tmp168_; - PrintJob* _tmp169_; - GtkPrintContext* _tmp170_; - PrintJob* _tmp171_; - PrintSettings* _tmp172_; - PrintSettings* _tmp173_; - gboolean _tmp174_; - gboolean _tmp175_; + gint _tmp132_; + gdouble _tmp133_; + gint _tmp134_; + GeeList* _tmp135_; + gint _tmp136_; + gpointer _tmp137_; + Photo* _tmp138_; + gdouble _tmp139_; + gdouble _tmp140_; + gdouble _tmp141_; + gdouble _tmp142_; + PrintJob* _tmp143_; + PrintJob* _tmp144_; + PrintSettings* _tmp145_; + PrintSettings* _tmp146_; + gboolean _tmp147_; #line 997 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp155_ = x; + _tmp129_ = x; #line 997 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp156_ = canvas_width; + _tmp130_ = canvas_width; #line 997 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp157_ = x; + _tmp131_ = x; #line 997 "/home/jens/Source/shotwell/src/Printing.vala" - dx = (_tmp155_ * _tmp156_) + (_tmp157_ * PRINT_MANAGER_IMAGE_DISTANCE); + dx = (_tmp129_ * _tmp130_) + (_tmp131_ * PRINT_MANAGER_IMAGE_DISTANCE); #line 998 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp158_ = y; + _tmp132_ = y; #line 998 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp159_ = canvas_height; + _tmp133_ = canvas_height; #line 998 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp160_ = y; + _tmp134_ = y; #line 998 "/home/jens/Source/shotwell/src/Printing.vala" - dy = (_tmp158_ * _tmp159_) + (_tmp160_ * PRINT_MANAGER_IMAGE_DISTANCE); -#line 999 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp161_ = photos; + dy = (_tmp132_ * _tmp133_) + (_tmp134_ * PRINT_MANAGER_IMAGE_DISTANCE); #line 999 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp162_ = i; + _tmp135_ = photos; #line 999 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp163_ = gee_list_get (_tmp161_, _tmp162_); + _tmp136_ = i; #line 999 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp164_ = (Photo*) _tmp163_; + _tmp137_ = gee_list_get (_tmp135_, _tmp136_); #line 999 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp165_ = dx; + _tmp138_ = (Photo*) _tmp137_; #line 999 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp166_ = dy; + _tmp139_ = dx; #line 999 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp167_ = canvas_width; + _tmp140_ = dy; #line 999 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp168_ = canvas_height; + _tmp141_ = canvas_width; #line 999 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp169_ = job; + _tmp142_ = canvas_height; #line 999 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp170_ = job_context; + _tmp143_ = job; #line 999 "/home/jens/Source/shotwell/src/Printing.vala" - print_manager_fit_image_to_canvas (self, _tmp164_, _tmp165_, _tmp166_, _tmp167_, _tmp168_, FALSE, _tmp169_, _tmp170_); + print_manager_fit_image_to_canvas (self, _tmp138_, _tmp139_, _tmp140_, _tmp141_, _tmp142_, FALSE, _tmp143_, job_context); #line 999 "/home/jens/Source/shotwell/src/Printing.vala" - _g_object_unref0 (_tmp164_); + _g_object_unref0 (_tmp138_); #line 1001 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp171_ = job; + _tmp144_ = job; #line 1001 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp172_ = print_job_get_local_settings (_tmp171_); + _tmp145_ = print_job_get_local_settings (_tmp144_); #line 1001 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp173_ = _tmp172_; + _tmp146_ = _tmp145_; #line 1001 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp174_ = print_settings_is_print_titles_enabled (_tmp173_); + _tmp147_ = print_settings_is_print_titles_enabled (_tmp146_); #line 1001 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp175_ = _tmp174_; + _print_settings_unref0 (_tmp146_); #line 1001 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp173_); -#line 1001 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp175_) { -#line 7134 "Printing.c" - gdouble _tmp176_; - gdouble _tmp177_; - gdouble _tmp178_; - gdouble _tmp179_; - GeeList* _tmp180_; - gint _tmp181_; - gpointer _tmp182_; - Photo* _tmp183_; - gchar* _tmp184_; - gchar* _tmp185_; - PrintJob* _tmp186_; - GtkPrintContext* _tmp187_; -#line 1002 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp176_ = dx; + if (_tmp147_) { +#line 7333 "Printing.c" + gdouble _tmp148_; + gdouble _tmp149_; + gdouble _tmp150_; + gdouble _tmp151_; + GeeList* _tmp152_; + gint _tmp153_; + gpointer _tmp154_; + Photo* _tmp155_; + gchar* _tmp156_; + gchar* _tmp157_; + PrintJob* _tmp158_; #line 1002 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp177_ = canvas_width; + _tmp148_ = dx; #line 1002 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp178_ = dy; + _tmp149_ = canvas_width; #line 1002 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp179_ = canvas_height; + _tmp150_ = dy; #line 1002 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp180_ = photos; + _tmp151_ = canvas_height; #line 1002 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp181_ = i; + _tmp152_ = photos; #line 1002 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp182_ = gee_list_get (_tmp180_, _tmp181_); + _tmp153_ = i; #line 1002 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp183_ = (Photo*) _tmp182_; + _tmp154_ = gee_list_get (_tmp152_, _tmp153_); #line 1002 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp184_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp183_, TYPE_DATA_OBJECT, DataObject)); + _tmp155_ = (Photo*) _tmp154_; #line 1002 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp185_ = _tmp184_; + _tmp156_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp155_, TYPE_DATA_OBJECT, DataObject)); #line 1002 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp186_ = job; + _tmp157_ = _tmp156_; #line 1002 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp187_ = job_context; + _tmp158_ = job; #line 1002 "/home/jens/Source/shotwell/src/Printing.vala" - print_manager_add_title_to_canvas (self, _tmp176_ + (_tmp177_ / 2), _tmp178_ + _tmp179_, _tmp185_, _tmp186_, _tmp187_); + print_manager_add_title_to_canvas (self, _tmp148_ + (_tmp149_ / 2), _tmp150_ + _tmp151_, _tmp157_, _tmp158_, job_context); #line 1002 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp185_); + _g_free0 (_tmp157_); #line 1002 "/home/jens/Source/shotwell/src/Printing.vala" - _g_object_unref0 (_tmp183_); -#line 7177 "Printing.c" + _g_object_unref0 (_tmp155_); +#line 7373 "Printing.c" } } #line 1007 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp188_ = self->priv->progress_dialog; + _tmp159_ = self->priv->progress_dialog; #line 1007 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp188_ != NULL) { -#line 7184 "Printing.c" - ProgressDialog* _tmp189_; - gint _tmp190_; - GeeList* _tmp191_; - gint _tmp192_; - gint _tmp193_; + if (_tmp159_ != NULL) { +#line 7380 "Printing.c" + ProgressDialog* _tmp160_; + gint _tmp161_; + GeeList* _tmp162_; + gint _tmp163_; + gint _tmp164_; #line 1008 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp189_ = self->priv->progress_dialog; + _tmp160_ = self->priv->progress_dialog; #line 1008 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp190_ = i; + _tmp161_ = i; #line 1008 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp191_ = photos; + _tmp162_ = photos; #line 1008 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp192_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp191_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp163_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp162_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1008 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp193_ = _tmp192_; + _tmp164_ = _tmp163_; #line 1008 "/home/jens/Source/shotwell/src/Printing.vala" - progress_dialog_monitor (_tmp189_, (guint64) _tmp190_, (guint64) _tmp193_, TRUE); -#line 7202 "Printing.c" + progress_dialog_monitor (_tmp160_, (guint64) _tmp161_, (guint64) _tmp164_, TRUE); +#line 7398 "Printing.c" } } } @@ -7209,13 +7405,13 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e } #line 1011 "/home/jens/Source/shotwell/src/Printing.vala" break; -#line 7212 "Printing.c" +#line 7408 "Printing.c" } default: { #line 1014 "/home/jens/Source/shotwell/src/Printing.vala" g_error ("Printing.vala:1014: unknown or unsupported layout mode"); -#line 7218 "Printing.c" +#line 7414 "Printing.c" } } #line 919 "/home/jens/Source/shotwell/src/Printing.vala" @@ -7226,141 +7422,140 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e _g_object_unref0 (page_setup); #line 919 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (job); -#line 7229 "Printing.c" +#line 7425 "Printing.c" } -static void _print_manager_on_custom_widget_apply_gtk_print_operation_custom_widget_apply (GtkPrintOperation* _sender, GtkWidget* widget, gpointer self) { +static void +_print_manager_on_custom_widget_apply_gtk_print_operation_custom_widget_apply (GtkPrintOperation* _sender, + GtkWidget* widget, + gpointer self) +{ #line 1020 "/home/jens/Source/shotwell/src/Printing.vala" print_manager_on_custom_widget_apply ((PrintManager*) self, widget); -#line 7236 "Printing.c" +#line 7436 "Printing.c" } -static GObject* print_manager_on_create_custom_widget (PrintManager* self, GtkPrintOperation* emitting_object) { +static GObject* +print_manager_on_create_custom_widget (PrintManager* self, + GtkPrintOperation* emitting_object) +{ GObject* result = NULL; - GtkPrintOperation* _tmp0_; + CustomPrintTab* _tmp0_; CustomPrintTab* _tmp1_; - GtkPrintOperation* _tmp2_; - CustomPrintTab* _tmp3_; #line 1018 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (IS_PRINT_MANAGER (self), NULL); #line 1018 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (GTK_IS_PRINT_OPERATION (emitting_object), NULL); #line 1019 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = emitting_object; + _tmp0_ = custom_print_tab_new (G_TYPE_CHECK_INSTANCE_CAST (emitting_object, TYPE_PRINT_JOB, PrintJob)); #line 1019 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = custom_print_tab_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PRINT_JOB, PrintJob)); -#line 1019 "/home/jens/Source/shotwell/src/Printing.vala" - g_object_ref_sink (_tmp1_); + g_object_ref_sink (_tmp0_); #line 1019 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (self->priv->custom_tab); #line 1019 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->custom_tab = _tmp1_; -#line 1020 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = emitting_object; + self->priv->custom_tab = _tmp0_; #line 1020 "/home/jens/Source/shotwell/src/Printing.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PRINT_JOB, PrintJob), gtk_print_operation_get_type (), GtkPrintOperation), "custom-widget-apply", (GCallback) _print_manager_on_custom_widget_apply_gtk_print_operation_custom_widget_apply, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (emitting_object, TYPE_PRINT_JOB, PrintJob), gtk_print_operation_get_type (), GtkPrintOperation), "custom-widget-apply", (GCallback) _print_manager_on_custom_widget_apply_gtk_print_operation_custom_widget_apply, self); #line 1021 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = self->priv->custom_tab; + _tmp1_ = self->priv->custom_tab; #line 1021 "/home/jens/Source/shotwell/src/Printing.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_OBJECT, GObject); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_OBJECT, GObject); #line 1021 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 7270 "Printing.c" +#line 7467 "Printing.c" } -static void print_manager_on_custom_widget_apply (PrintManager* self, GtkWidget* custom_widget) { +static void +print_manager_on_custom_widget_apply (PrintManager* self, + GtkWidget* custom_widget) +{ CustomPrintTab* tab = NULL; - GtkWidget* _tmp0_; - CustomPrintTab* _tmp1_; + CustomPrintTab* _tmp0_; + PrintJob* _tmp1_; PrintJob* _tmp2_; - PrintJob* _tmp3_; + PrintSettings* _tmp3_; PrintSettings* _tmp4_; PrintSettings* _tmp5_; PrintSettings* _tmp6_; - PrintSettings* _tmp7_; #line 1024 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_MANAGER (self)); #line 1024 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (GTK_IS_WIDGET (custom_widget)); #line 1025 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = custom_widget; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (custom_widget, TYPE_CUSTOM_PRINT_TAB, CustomPrintTab)); #line 1025 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_CUSTOM_PRINT_TAB, CustomPrintTab)); -#line 1025 "/home/jens/Source/shotwell/src/Printing.vala" - tab = _tmp1_; + tab = _tmp0_; #line 1026 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = custom_print_tab_get_source_job (tab); + _tmp1_ = custom_print_tab_get_source_job (tab); #line 1026 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 1026 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = custom_print_tab_get_local_settings (tab); + _tmp3_ = custom_print_tab_get_local_settings (tab); #line 1026 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 1026 "/home/jens/Source/shotwell/src/Printing.vala" - print_job_set_local_settings (_tmp3_, _tmp5_); + print_job_set_local_settings (_tmp2_, _tmp4_); #line 1026 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp5_); + _print_settings_unref0 (_tmp4_); #line 1026 "/home/jens/Source/shotwell/src/Printing.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 1027 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = custom_print_tab_get_local_settings (tab); + _tmp5_ = custom_print_tab_get_local_settings (tab); #line 1027 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 1027 "/home/jens/Source/shotwell/src/Printing.vala" - print_manager_set_global_settings (self, _tmp7_); + print_manager_set_global_settings (self, _tmp6_); #line 1027 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp7_); + _print_settings_unref0 (_tmp6_); #line 1024 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (tab); -#line 7318 "Printing.c" +#line 7515 "Printing.c" } -static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo, gdouble x, gdouble y, gdouble canvas_width, gdouble canvas_height, gboolean crop, PrintJob* job, GtkPrintContext* job_context) { +static void +print_manager_fit_image_to_canvas (PrintManager* self, + Photo* photo, + gdouble x, + gdouble y, + gdouble canvas_width, + gdouble canvas_height, + gboolean crop, + PrintJob* job, + GtkPrintContext* job_context) +{ cairo_t* dc = NULL; - GtkPrintContext* _tmp0_; + cairo_t* _tmp0_; cairo_t* _tmp1_; - cairo_t* _tmp2_; Dimensions photo_dimensions = {0}; - Photo* _tmp3_; - Dimensions _tmp4_ = {0}; + Dimensions _tmp2_ = {0}; gdouble photo_aspect_ratio = 0.0; - gdouble _tmp5_; gdouble canvas_aspect_ratio = 0.0; - gdouble _tmp6_; - gdouble _tmp7_; gdouble target_width = 0.0; gdouble target_height = 0.0; gdouble dpi = 0.0; - PrintJob* _tmp8_; - PrintSettings* _tmp9_; - PrintSettings* _tmp10_; - gint _tmp11_; - gdouble _tmp12_; - gboolean _tmp13_; + PrintSettings* _tmp3_; + PrintSettings* _tmp4_; + gdouble _tmp5_; gdouble x_offset = 0.0; - gdouble _tmp28_; - gdouble _tmp29_; + gdouble _tmp14_; gdouble y_offset = 0.0; - gdouble _tmp30_; - gdouble _tmp31_; - cairo_t* _tmp32_; - cairo_t* _tmp33_; - gdouble _tmp34_; - gdouble _tmp35_; + gdouble _tmp15_; + cairo_t* _tmp16_; + cairo_t* _tmp17_; + gdouble _tmp18_; + gdouble _tmp19_; gint w = 0; - gdouble _tmp36_; - gdouble _tmp37_; + gdouble _tmp20_; gint h = 0; - gdouble _tmp38_; - gdouble _tmp39_; + gdouble _tmp21_; Dimensions viewport = {0}; - gint _tmp40_; - gint _tmp41_; - cairo_t* _tmp95_; + gint _tmp22_; + gint _tmp23_; + cairo_t* _tmp72_; GError * _inner_error_ = NULL; #line 1030 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_MANAGER (self)); @@ -7371,418 +7566,361 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo, #line 1030 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (GTK_IS_PRINT_CONTEXT (job_context)); #line 1031 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = job_context; + _tmp0_ = gtk_print_context_get_cairo_context (job_context); #line 1031 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = gtk_print_context_get_cairo_context (_tmp0_); + _tmp1_ = _cairo_reference0 (_tmp0_); #line 1031 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = _cairo_reference0 (_tmp1_); -#line 1031 "/home/jens/Source/shotwell/src/Printing.vala" - dc = _tmp2_; -#line 1032 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = photo; + dc = _tmp1_; #line 1032 "/home/jens/Source/shotwell/src/Printing.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp4_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp2_); #line 1032 "/home/jens/Source/shotwell/src/Printing.vala" - photo_dimensions = _tmp4_; + photo_dimensions = _tmp2_; #line 1033 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = dimensions_get_aspect_ratio (&photo_dimensions); -#line 1033 "/home/jens/Source/shotwell/src/Printing.vala" - photo_aspect_ratio = _tmp5_; -#line 1034 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = canvas_width; + photo_aspect_ratio = dimensions_get_aspect_ratio (&photo_dimensions); #line 1034 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = canvas_height; -#line 1034 "/home/jens/Source/shotwell/src/Printing.vala" - canvas_aspect_ratio = ((gdouble) _tmp6_) / _tmp7_; + canvas_aspect_ratio = ((gdouble) canvas_width) / canvas_height; #line 1036 "/home/jens/Source/shotwell/src/Printing.vala" target_width = 0.0; #line 1037 "/home/jens/Source/shotwell/src/Printing.vala" target_height = 0.0; #line 1038 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = job; -#line 1038 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = print_job_get_local_settings (_tmp8_); -#line 1038 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp10_ = _tmp9_; + _tmp3_ = print_job_get_local_settings (job); #line 1038 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp11_ = print_settings_get_content_ppi (_tmp10_); + _tmp4_ = _tmp3_; #line 1038 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp12_ = (gdouble) _tmp11_; + _tmp5_ = (gdouble) print_settings_get_content_ppi (_tmp4_); #line 1038 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp10_); + _print_settings_unref0 (_tmp4_); #line 1038 "/home/jens/Source/shotwell/src/Printing.vala" - dpi = _tmp12_; + dpi = _tmp5_; #line 1040 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp13_ = crop; -#line 1040 "/home/jens/Source/shotwell/src/Printing.vala" - if (!_tmp13_) { -#line 7419 "Printing.c" - gdouble _tmp14_; - gdouble _tmp15_; - gdouble _tmp22_; - gdouble _tmp23_; - gdouble _tmp24_; - gdouble _tmp25_; - gdouble _tmp26_; - gdouble _tmp27_; + if (!crop) { +#line 7598 "Printing.c" + gdouble _tmp6_; + gdouble _tmp7_; + gdouble _tmp12_; + gdouble _tmp13_; #line 1041 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp14_ = canvas_aspect_ratio; + _tmp6_ = canvas_aspect_ratio; #line 1041 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp15_ = photo_aspect_ratio; + _tmp7_ = photo_aspect_ratio; #line 1041 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp14_ < _tmp15_) { -#line 7434 "Printing.c" - gdouble _tmp16_; - gdouble _tmp17_; - gdouble _tmp18_; -#line 1042 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp16_ = canvas_width; + if (_tmp6_ < _tmp7_) { +#line 7609 "Printing.c" + gdouble _tmp8_; + gdouble _tmp9_; #line 1042 "/home/jens/Source/shotwell/src/Printing.vala" - target_width = _tmp16_; + target_width = canvas_width; #line 1043 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp17_ = target_width; + _tmp8_ = target_width; #line 1043 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp18_ = photo_aspect_ratio; + _tmp9_ = photo_aspect_ratio; #line 1043 "/home/jens/Source/shotwell/src/Printing.vala" - target_height = _tmp17_ * (1.0 / _tmp18_); -#line 7448 "Printing.c" + target_height = _tmp8_ * (1.0 / _tmp9_); +#line 7620 "Printing.c" } else { - gdouble _tmp19_; - gdouble _tmp20_; - gdouble _tmp21_; + gdouble _tmp10_; + gdouble _tmp11_; #line 1045 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp19_ = canvas_height; -#line 1045 "/home/jens/Source/shotwell/src/Printing.vala" - target_height = _tmp19_; + target_height = canvas_height; #line 1046 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp20_ = target_height; + _tmp10_ = target_height; #line 1046 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp21_ = photo_aspect_ratio; + _tmp11_ = photo_aspect_ratio; #line 1046 "/home/jens/Source/shotwell/src/Printing.vala" - target_width = _tmp20_ * _tmp21_; -#line 7463 "Printing.c" + target_width = _tmp10_ * _tmp11_; +#line 7632 "Printing.c" } #line 1048 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp22_ = x; -#line 1048 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp23_ = canvas_width; + _tmp12_ = target_width; #line 1048 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp24_ = target_width; -#line 1048 "/home/jens/Source/shotwell/src/Printing.vala" - x = _tmp22_ + ((_tmp23_ - _tmp24_) / 2.0); -#line 1049 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp25_ = y; + x = x + ((canvas_width - _tmp12_) / 2.0); #line 1049 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp26_ = canvas_height; + _tmp13_ = target_height; #line 1049 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp27_ = target_height; -#line 1049 "/home/jens/Source/shotwell/src/Printing.vala" - y = _tmp25_ + ((_tmp26_ - _tmp27_) / 2.0); -#line 7481 "Printing.c" + y = y + ((canvas_height - _tmp13_) / 2.0); +#line 7642 "Printing.c" } #line 1052 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp28_ = dpi; -#line 1052 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp29_ = x; + _tmp14_ = dpi; #line 1052 "/home/jens/Source/shotwell/src/Printing.vala" - x_offset = _tmp28_ * _tmp29_; + x_offset = _tmp14_ * x; #line 1053 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp30_ = dpi; + _tmp15_ = dpi; #line 1053 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp31_ = y; -#line 1053 "/home/jens/Source/shotwell/src/Printing.vala" - y_offset = _tmp30_ * _tmp31_; + y_offset = _tmp15_ * y; #line 1054 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp32_ = dc; + _tmp16_ = dc; #line 1054 "/home/jens/Source/shotwell/src/Printing.vala" - cairo_save (_tmp32_); + cairo_save (_tmp16_); #line 1055 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp33_ = dc; + _tmp17_ = dc; #line 1055 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp34_ = x_offset; + _tmp18_ = x_offset; #line 1055 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp35_ = y_offset; + _tmp19_ = y_offset; #line 1055 "/home/jens/Source/shotwell/src/Printing.vala" - cairo_translate (_tmp33_, _tmp34_, _tmp35_); -#line 1057 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp36_ = dpi; + cairo_translate (_tmp17_, _tmp18_, _tmp19_); #line 1057 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp37_ = canvas_width; + _tmp20_ = dpi; #line 1057 "/home/jens/Source/shotwell/src/Printing.vala" - w = (gint) (_tmp36_ * _tmp37_); -#line 1058 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp38_ = dpi; + w = (gint) (_tmp20_ * canvas_width); #line 1058 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp39_ = canvas_height; + _tmp21_ = dpi; #line 1058 "/home/jens/Source/shotwell/src/Printing.vala" - h = (gint) (_tmp38_ * _tmp39_); + h = (gint) (_tmp21_ * canvas_height); #line 1059 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp40_ = w; + _tmp22_ = w; #line 1059 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp41_ = h; + _tmp23_ = h; #line 1059 "/home/jens/Source/shotwell/src/Printing.vala" - dimensions_init (&viewport, _tmp40_, _tmp41_); -#line 7525 "Printing.c" + dimensions_init (&viewport, _tmp22_, _tmp23_); +#line 7678 "Printing.c" { - gboolean _tmp42_ = FALSE; - gboolean _tmp43_; - cairo_t* _tmp89_; + gboolean _tmp24_ = FALSE; + cairo_t* _tmp67_; #line 1062 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp43_ = crop; + if (crop) { +#line 7684 "Printing.c" + gdouble _tmp25_; + gdouble _tmp26_; #line 1062 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp43_) { -#line 7534 "Printing.c" - gdouble _tmp44_; - gdouble _tmp45_; - gboolean _tmp46_; + _tmp25_ = canvas_aspect_ratio; #line 1062 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp44_ = canvas_aspect_ratio; + _tmp26_ = photo_aspect_ratio; #line 1062 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp45_ = photo_aspect_ratio; -#line 1062 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp46_ = print_manager_are_approximately_equal (self, _tmp44_, _tmp45_); -#line 1062 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp42_ = !_tmp46_; -#line 7546 "Printing.c" + _tmp24_ = !print_manager_are_approximately_equal (self, _tmp25_, _tmp26_); +#line 7693 "Printing.c" } else { #line 1062 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp42_ = FALSE; -#line 7550 "Printing.c" + _tmp24_ = FALSE; +#line 7697 "Printing.c" } #line 1062 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp42_) { -#line 7554 "Printing.c" + if (_tmp24_) { +#line 7701 "Printing.c" Scaling pixbuf_scaling = {0}; - Dimensions _tmp47_; - Scaling _tmp48_ = {0}; + Dimensions _tmp27_; + Scaling _tmp28_ = {0}; GdkPixbuf* photo_pixbuf = NULL; - Photo* _tmp49_; - Scaling _tmp50_; - GdkPixbuf* _tmp51_; + Scaling _tmp29_; + GdkPixbuf* _tmp30_; Dimensions scaled_photo_dimensions = {0}; - GdkPixbuf* _tmp52_; - Dimensions _tmp53_ = {0}; + GdkPixbuf* _tmp31_; + Dimensions _tmp32_ = {0}; gint shave_vertical = 0; gint shave_horizontal = 0; - gdouble _tmp54_; - gdouble _tmp55_; + gdouble _tmp33_; + gdouble _tmp34_; GdkPixbuf* shaved_pixbuf = NULL; - GdkPixbuf* _tmp66_; - gint _tmp67_; - gint _tmp68_; - Dimensions _tmp69_; - gint _tmp70_; - gint _tmp71_; - Dimensions _tmp72_; - gint _tmp73_; - gint _tmp74_; - GdkPixbuf* _tmp75_; - GdkPixbuf* _tmp76_; - GdkPixbuf* _tmp77_; - cairo_t* _tmp78_; - GdkPixbuf* _tmp79_; + GdkPixbuf* _tmp45_; + gint _tmp46_; + gint _tmp47_; + Dimensions _tmp48_; + gint _tmp49_; + gint _tmp50_; + Dimensions _tmp51_; + gint _tmp52_; + gint _tmp53_; + GdkPixbuf* _tmp54_; + GdkPixbuf* _tmp55_; + GdkPixbuf* _tmp56_; + cairo_t* _tmp57_; + GdkPixbuf* _tmp58_; #line 1063 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp47_ = viewport; + _tmp27_ = viewport; #line 1063 "/home/jens/Source/shotwell/src/Printing.vala" - scaling_to_fill_viewport (&_tmp47_, &_tmp48_); + scaling_to_fill_viewport (&_tmp27_, &_tmp28_); #line 1063 "/home/jens/Source/shotwell/src/Printing.vala" - pixbuf_scaling = _tmp48_; -#line 1064 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp49_ = photo; + pixbuf_scaling = _tmp28_; #line 1064 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp50_ = pixbuf_scaling; + _tmp29_ = pixbuf_scaling; #line 1064 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp51_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp50_, &_inner_error_); + _tmp30_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp29_, &_inner_error_); #line 1064 "/home/jens/Source/shotwell/src/Printing.vala" - photo_pixbuf = _tmp51_; + photo_pixbuf = _tmp30_; #line 1064 "/home/jens/Source/shotwell/src/Printing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7600 "Printing.c" +#line 7744 "Printing.c" goto __catch479_g_error; } #line 1065 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp52_ = photo_pixbuf; + _tmp31_ = photo_pixbuf; #line 1065 "/home/jens/Source/shotwell/src/Printing.vala" - dimensions_for_pixbuf (_tmp52_, &_tmp53_); + dimensions_for_pixbuf (_tmp31_, &_tmp32_); #line 1065 "/home/jens/Source/shotwell/src/Printing.vala" - scaled_photo_dimensions = _tmp53_; + scaled_photo_dimensions = _tmp32_; #line 1066 "/home/jens/Source/shotwell/src/Printing.vala" shave_vertical = 0; #line 1067 "/home/jens/Source/shotwell/src/Printing.vala" shave_horizontal = 0; #line 1068 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp54_ = canvas_aspect_ratio; + _tmp33_ = canvas_aspect_ratio; #line 1068 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp55_ = photo_aspect_ratio; + _tmp34_ = photo_aspect_ratio; #line 1068 "/home/jens/Source/shotwell/src/Printing.vala" - if (_tmp54_ < _tmp55_) { -#line 7619 "Printing.c" - Dimensions _tmp56_; - gint _tmp57_; - Dimensions _tmp58_; - gint _tmp59_; - gdouble _tmp60_; + if (_tmp33_ < _tmp34_) { +#line 7763 "Printing.c" + Dimensions _tmp35_; + gint _tmp36_; + Dimensions _tmp37_; + gint _tmp38_; + gdouble _tmp39_; #line 1069 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp56_ = scaled_photo_dimensions; + _tmp35_ = scaled_photo_dimensions; #line 1069 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp57_ = _tmp56_.width; + _tmp36_ = _tmp35_.width; #line 1069 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp58_ = scaled_photo_dimensions; + _tmp37_ = scaled_photo_dimensions; #line 1069 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp59_ = _tmp58_.height; + _tmp38_ = _tmp37_.height; #line 1069 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp60_ = canvas_aspect_ratio; + _tmp39_ = canvas_aspect_ratio; #line 1069 "/home/jens/Source/shotwell/src/Printing.vala" - shave_vertical = (gint) ((_tmp57_ - (_tmp59_ * _tmp60_)) / 2.0); -#line 7637 "Printing.c" + shave_vertical = (gint) ((_tmp36_ - (_tmp38_ * _tmp39_)) / 2.0); +#line 7781 "Printing.c" } else { - Dimensions _tmp61_; - gint _tmp62_; - Dimensions _tmp63_; - gint _tmp64_; - gdouble _tmp65_; + Dimensions _tmp40_; + gint _tmp41_; + Dimensions _tmp42_; + gint _tmp43_; + gdouble _tmp44_; #line 1071 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp61_ = scaled_photo_dimensions; + _tmp40_ = scaled_photo_dimensions; #line 1071 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp62_ = _tmp61_.height; + _tmp41_ = _tmp40_.height; #line 1071 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp63_ = scaled_photo_dimensions; + _tmp42_ = scaled_photo_dimensions; #line 1071 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp64_ = _tmp63_.width; + _tmp43_ = _tmp42_.width; #line 1071 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp65_ = canvas_aspect_ratio; + _tmp44_ = canvas_aspect_ratio; #line 1071 "/home/jens/Source/shotwell/src/Printing.vala" - shave_horizontal = (gint) ((_tmp62_ - (_tmp64_ * (1.0 / _tmp65_))) / 2.0); -#line 7656 "Printing.c" + shave_horizontal = (gint) ((_tmp41_ - (_tmp43_ * (1.0 / _tmp44_))) / 2.0); +#line 7800 "Printing.c" } #line 1073 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp66_ = photo_pixbuf; + _tmp45_ = photo_pixbuf; #line 1073 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp67_ = shave_vertical; + _tmp46_ = shave_vertical; #line 1073 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp68_ = shave_horizontal; + _tmp47_ = shave_horizontal; #line 1073 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp69_ = scaled_photo_dimensions; + _tmp48_ = scaled_photo_dimensions; #line 1073 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp70_ = _tmp69_.width; + _tmp49_ = _tmp48_.width; #line 1073 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp71_ = shave_vertical; + _tmp50_ = shave_vertical; #line 1073 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp72_ = scaled_photo_dimensions; + _tmp51_ = scaled_photo_dimensions; #line 1073 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp73_ = _tmp72_.height; + _tmp52_ = _tmp51_.height; #line 1073 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp74_ = shave_horizontal; + _tmp53_ = shave_horizontal; #line 1073 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp75_ = gdk_pixbuf_new_subpixbuf (_tmp66_, _tmp67_, _tmp68_, _tmp70_ - (2 * _tmp71_), _tmp73_ - (2 * _tmp74_)); + _tmp54_ = gdk_pixbuf_new_subpixbuf (_tmp45_, _tmp46_, _tmp47_, _tmp49_ - (2 * _tmp50_), _tmp52_ - (2 * _tmp53_)); #line 1073 "/home/jens/Source/shotwell/src/Printing.vala" - shaved_pixbuf = _tmp75_; + shaved_pixbuf = _tmp54_; #line 1075 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp76_ = shaved_pixbuf; + _tmp55_ = shaved_pixbuf; #line 1075 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp77_ = scaling_perform_on_pixbuf (&pixbuf_scaling, _tmp76_, GDK_INTERP_HYPER, TRUE); + _tmp56_ = scaling_perform_on_pixbuf (&pixbuf_scaling, _tmp55_, GDK_INTERP_HYPER, TRUE); #line 1075 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (photo_pixbuf); #line 1075 "/home/jens/Source/shotwell/src/Printing.vala" - photo_pixbuf = _tmp77_; + photo_pixbuf = _tmp56_; #line 1076 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp78_ = dc; + _tmp57_ = dc; #line 1076 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp79_ = photo_pixbuf; + _tmp58_ = photo_pixbuf; #line 1076 "/home/jens/Source/shotwell/src/Printing.vala" - gdk_cairo_set_source_pixbuf (_tmp78_, _tmp79_, 0.0, 0.0); + gdk_cairo_set_source_pixbuf (_tmp57_, _tmp58_, 0.0, 0.0); #line 1062 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (shaved_pixbuf); #line 1062 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (photo_pixbuf); -#line 7698 "Printing.c" +#line 7842 "Printing.c" } else { Scaling pixbuf_scaling = {0}; - Dimensions _tmp80_; - Scaling _tmp81_ = {0}; + Dimensions _tmp59_; + Scaling _tmp60_ = {0}; GdkPixbuf* photo_pixbuf = NULL; - Photo* _tmp82_; - Scaling _tmp83_; - GdkPixbuf* _tmp84_; - GdkPixbuf* _tmp85_; - GdkPixbuf* _tmp86_; - cairo_t* _tmp87_; - GdkPixbuf* _tmp88_; + Scaling _tmp61_; + GdkPixbuf* _tmp62_; + GdkPixbuf* _tmp63_; + GdkPixbuf* _tmp64_; + cairo_t* _tmp65_; + GdkPixbuf* _tmp66_; #line 1078 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp80_ = viewport; + _tmp59_ = viewport; #line 1078 "/home/jens/Source/shotwell/src/Printing.vala" - scaling_for_viewport (&_tmp80_, TRUE, &_tmp81_); + scaling_for_viewport (&_tmp59_, TRUE, &_tmp60_); #line 1078 "/home/jens/Source/shotwell/src/Printing.vala" - pixbuf_scaling = _tmp81_; + pixbuf_scaling = _tmp60_; #line 1079 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp82_ = photo; + _tmp61_ = pixbuf_scaling; #line 1079 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp83_ = pixbuf_scaling; + _tmp62_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp61_, &_inner_error_); #line 1079 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp84_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp83_, &_inner_error_); -#line 1079 "/home/jens/Source/shotwell/src/Printing.vala" - photo_pixbuf = _tmp84_; + photo_pixbuf = _tmp62_; #line 1079 "/home/jens/Source/shotwell/src/Printing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7727 "Printing.c" +#line 7868 "Printing.c" goto __catch479_g_error; } #line 1080 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp85_ = photo_pixbuf; + _tmp63_ = photo_pixbuf; #line 1080 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp86_ = scaling_perform_on_pixbuf (&pixbuf_scaling, _tmp85_, GDK_INTERP_HYPER, TRUE); + _tmp64_ = scaling_perform_on_pixbuf (&pixbuf_scaling, _tmp63_, GDK_INTERP_HYPER, TRUE); #line 1080 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (photo_pixbuf); #line 1080 "/home/jens/Source/shotwell/src/Printing.vala" - photo_pixbuf = _tmp86_; + photo_pixbuf = _tmp64_; #line 1081 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp87_ = dc; + _tmp65_ = dc; #line 1081 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp88_ = photo_pixbuf; + _tmp66_ = photo_pixbuf; #line 1081 "/home/jens/Source/shotwell/src/Printing.vala" - gdk_cairo_set_source_pixbuf (_tmp87_, _tmp88_, 0.0, 0.0); + gdk_cairo_set_source_pixbuf (_tmp65_, _tmp66_, 0.0, 0.0); #line 1062 "/home/jens/Source/shotwell/src/Printing.vala" _g_object_unref0 (photo_pixbuf); -#line 7746 "Printing.c" +#line 7887 "Printing.c" } #line 1083 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp89_ = dc; + _tmp67_ = dc; #line 1083 "/home/jens/Source/shotwell/src/Printing.vala" - cairo_paint (_tmp89_); -#line 7752 "Printing.c" + cairo_paint (_tmp67_); +#line 7893 "Printing.c" } goto __finally479; __catch479_g_error: { GError* e = NULL; - PrintJob* _tmp90_; - GError* _tmp91_; - const gchar* _tmp92_; - gchar* _tmp93_; - gchar* _tmp94_; + GError* _tmp68_; + const gchar* _tmp69_; + gchar* _tmp70_; + gchar* _tmp71_; #line 1061 "/home/jens/Source/shotwell/src/Printing.vala" e = _inner_error_; #line 1061 "/home/jens/Source/shotwell/src/Printing.vala" _inner_error_ = NULL; #line 1086 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp90_ = job; -#line 1086 "/home/jens/Source/shotwell/src/Printing.vala" - gtk_print_operation_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, gtk_print_operation_get_type (), GtkPrintOperation)); + gtk_print_operation_cancel (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation)); #line 1087 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp91_ = e; + _tmp68_ = e; #line 1087 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp92_ = _tmp91_->message; + _tmp69_ = _tmp68_->message; #line 1087 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp93_ = g_strdup_printf (_ ("Unable to print photo:\n\n%s"), _tmp92_); + _tmp70_ = g_strdup_printf (_ ("Unable to print photo:\n\n%s"), _tmp69_); #line 1087 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp94_ = _tmp93_; + _tmp71_ = _tmp70_; #line 1087 "/home/jens/Source/shotwell/src/Printing.vala" - app_window_error_message (_tmp94_, NULL); + app_window_error_message (_tmp71_, NULL); #line 1087 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp94_); + _g_free0 (_tmp71_); #line 1061 "/home/jens/Source/shotwell/src/Printing.vala" _g_error_free0 (e); -#line 7785 "Printing.c" +#line 7923 "Printing.c" } __finally479: #line 1061 "/home/jens/Source/shotwell/src/Printing.vala" @@ -7795,58 +7933,60 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo, g_clear_error (&_inner_error_); #line 1061 "/home/jens/Source/shotwell/src/Printing.vala" return; -#line 7798 "Printing.c" +#line 7936 "Printing.c" } #line 1089 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp95_ = dc; + _tmp72_ = dc; #line 1089 "/home/jens/Source/shotwell/src/Printing.vala" - cairo_restore (_tmp95_); + cairo_restore (_tmp72_); #line 1030 "/home/jens/Source/shotwell/src/Printing.vala" _cairo_destroy0 (dc); -#line 7806 "Printing.c" +#line 7944 "Printing.c" } -static void _vala_PangoFontDescription_free (PangoFontDescription* self) { +static void +_vala_PangoFontDescription_free (PangoFontDescription* self) +{ #line 1092 "/home/jens/Source/shotwell/src/Printing.vala" g_boxed_free (pango_font_description_get_type (), self); -#line 7813 "Printing.c" +#line 7953 "Printing.c" } -static void print_manager_add_title_to_canvas (PrintManager* self, gdouble x, gdouble y, const gchar* title, PrintJob* job, GtkPrintContext* job_context) { +static void +print_manager_add_title_to_canvas (PrintManager* self, + gdouble x, + gdouble y, + const gchar* title, + PrintJob* job, + GtkPrintContext* job_context) +{ cairo_t* dc = NULL; - GtkPrintContext* _tmp0_; + cairo_t* _tmp0_; cairo_t* _tmp1_; - cairo_t* _tmp2_; gdouble dpi = 0.0; - PrintJob* _tmp3_; - PrintSettings* _tmp4_; - PrintSettings* _tmp5_; - gint _tmp6_; - gdouble _tmp7_; + PrintSettings* _tmp2_; + PrintSettings* _tmp3_; + gdouble _tmp4_; PangoFontDescription* title_font_description = NULL; - PrintJob* _tmp8_; - PrintSettings* _tmp9_; - PrintSettings* _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; - PangoFontDescription* _tmp13_; - PangoFontDescription* _tmp14_; + PrintSettings* _tmp5_; + PrintSettings* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + PangoFontDescription* _tmp9_; + PangoFontDescription* _tmp10_; PangoLayout* title_layout = NULL; - PangoLayout* _tmp15_; + PangoLayout* _tmp11_; PangoContext* context = NULL; - PangoContext* _tmp16_; - PangoContext* _tmp17_; - const gchar* _tmp18_; + PangoContext* _tmp12_; + PangoContext* _tmp13_; gint title_width = 0; gint title_height = 0; - gint _tmp19_ = 0; - gint _tmp20_ = 0; + gint _tmp14_ = 0; + gint _tmp15_ = 0; gdouble tx = 0.0; - gdouble _tmp21_; gdouble ty = 0.0; - gdouble _tmp22_; #line 1092 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_MANAGER (self)); #line 1092 "/home/jens/Source/shotwell/src/Printing.vala" @@ -7856,79 +7996,65 @@ static void print_manager_add_title_to_canvas (PrintManager* self, gdouble x, gd #line 1092 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (GTK_IS_PRINT_CONTEXT (job_context)); #line 1093 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = job_context; + _tmp0_ = gtk_print_context_get_cairo_context (job_context); #line 1093 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = gtk_print_context_get_cairo_context (_tmp0_); + _tmp1_ = _cairo_reference0 (_tmp0_); #line 1093 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = _cairo_reference0 (_tmp1_); -#line 1093 "/home/jens/Source/shotwell/src/Printing.vala" - dc = _tmp2_; -#line 1094 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp3_ = job; + dc = _tmp1_; #line 1094 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp4_ = print_job_get_local_settings (_tmp3_); -#line 1094 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp5_ = _tmp4_; + _tmp2_ = print_job_get_local_settings (job); #line 1094 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp6_ = print_settings_get_content_ppi (_tmp5_); + _tmp3_ = _tmp2_; #line 1094 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp7_ = (gdouble) _tmp6_; + _tmp4_ = (gdouble) print_settings_get_content_ppi (_tmp3_); #line 1094 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp5_); + _print_settings_unref0 (_tmp3_); #line 1094 "/home/jens/Source/shotwell/src/Printing.vala" - dpi = _tmp7_; + dpi = _tmp4_; #line 1095 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp8_ = job; + _tmp5_ = print_job_get_local_settings (job); #line 1095 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp9_ = print_job_get_local_settings (_tmp8_); + _tmp6_ = _tmp5_; #line 1095 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp10_ = _tmp9_; + _tmp7_ = print_settings_get_print_titles_font (_tmp6_); #line 1095 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp11_ = print_settings_get_print_titles_font (_tmp10_); -#line 1095 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 1095 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp13_ = pango_font_description_from_string (_tmp12_); + _tmp9_ = pango_font_description_from_string (_tmp8_); #line 1095 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp14_ = _tmp13_; + _tmp10_ = _tmp9_; #line 1095 "/home/jens/Source/shotwell/src/Printing.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp8_); #line 1095 "/home/jens/Source/shotwell/src/Printing.vala" - _print_settings_unref0 (_tmp10_); + _print_settings_unref0 (_tmp6_); #line 1095 "/home/jens/Source/shotwell/src/Printing.vala" - title_font_description = _tmp14_; + title_font_description = _tmp10_; #line 1096 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp15_ = pango_cairo_create_layout (dc); + _tmp11_ = pango_cairo_create_layout (dc); #line 1096 "/home/jens/Source/shotwell/src/Printing.vala" - title_layout = _tmp15_; + title_layout = _tmp11_; #line 1097 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp16_ = pango_layout_get_context (title_layout); + _tmp12_ = pango_layout_get_context (title_layout); #line 1097 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp17_ = _g_object_ref0 (_tmp16_); + _tmp13_ = _g_object_ref0 (_tmp12_); #line 1097 "/home/jens/Source/shotwell/src/Printing.vala" - context = _tmp17_; + context = _tmp13_; #line 1098 "/home/jens/Source/shotwell/src/Printing.vala" pango_cairo_context_set_resolution (context, dpi); #line 1099 "/home/jens/Source/shotwell/src/Printing.vala" pango_layout_set_font_description (title_layout, title_font_description); #line 1100 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp18_ = title; -#line 1100 "/home/jens/Source/shotwell/src/Printing.vala" - pango_layout_set_text (title_layout, _tmp18_, -1); + pango_layout_set_text (title_layout, title, -1); #line 1102 "/home/jens/Source/shotwell/src/Printing.vala" - pango_layout_get_pixel_size (title_layout, &_tmp19_, &_tmp20_); + pango_layout_get_pixel_size (title_layout, &_tmp14_, &_tmp15_); #line 1102 "/home/jens/Source/shotwell/src/Printing.vala" - title_width = _tmp19_; + title_width = _tmp14_; #line 1102 "/home/jens/Source/shotwell/src/Printing.vala" - title_height = _tmp20_; -#line 1103 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp21_ = x; + title_height = _tmp15_; #line 1103 "/home/jens/Source/shotwell/src/Printing.vala" - tx = (dpi * _tmp21_) - (title_width / 2); + tx = (dpi * x) - (title_width / 2); #line 1104 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp22_ = y; -#line 1104 "/home/jens/Source/shotwell/src/Printing.vala" - ty = (dpi * _tmp22_) - title_height; + ty = (dpi * y) - title_height; #line 1107 "/home/jens/Source/shotwell/src/Printing.vala" cairo_rectangle (dc, tx - 10, ty + 2, (gdouble) (title_width + 20), (gdouble) title_height); #line 1108 "/home/jens/Source/shotwell/src/Printing.vala" @@ -7955,35 +8081,32 @@ static void print_manager_add_title_to_canvas (PrintManager* self, gdouble x, gd __vala_PangoFontDescription_free0 (title_font_description); #line 1092 "/home/jens/Source/shotwell/src/Printing.vala" _cairo_destroy0 (dc); -#line 7958 "Printing.c" +#line 8084 "Printing.c" } -static gboolean print_manager_are_approximately_equal (PrintManager* self, gdouble val1, gdouble val2) { +static gboolean +print_manager_are_approximately_equal (PrintManager* self, + gdouble val1, + gdouble val2) +{ gboolean result = FALSE; gdouble accept_err = 0.0; - gdouble _tmp0_; - gdouble _tmp1_; - gdouble _tmp2_; #line 1119 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (IS_PRINT_MANAGER (self), FALSE); #line 1120 "/home/jens/Source/shotwell/src/Printing.vala" accept_err = 0.005; #line 1121 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = val1; -#line 1121 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = val2; -#line 1121 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = fabs (_tmp0_ - _tmp1_); -#line 1121 "/home/jens/Source/shotwell/src/Printing.vala" - result = _tmp2_ <= accept_err; + result = fabs (val1 - val2) <= accept_err; #line 1121 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 7982 "Printing.c" +#line 8103 "Printing.c" } -PrintSettings* print_manager_get_global_settings (PrintManager* self) { +PrintSettings* +print_manager_get_global_settings (PrintManager* self) +{ PrintSettings* result = NULL; PrintSettings* _tmp0_; PrintSettings* _tmp1_; @@ -7997,132 +8120,154 @@ PrintSettings* print_manager_get_global_settings (PrintManager* self) { result = _tmp1_; #line 1125 "/home/jens/Source/shotwell/src/Printing.vala" return result; -#line 8000 "Printing.c" +#line 8123 "Printing.c" } -void print_manager_set_global_settings (PrintManager* self, PrintSettings* settings) { +void +print_manager_set_global_settings (PrintManager* self, + PrintSettings* settings) +{ PrintSettings* _tmp0_; - PrintSettings* _tmp1_; - PrintSettings* _tmp2_; #line 1128 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_MANAGER (self)); #line 1128 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (IS_PRINT_SETTINGS (settings)); #line 1129 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp0_ = settings; -#line 1129 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp1_ = _print_settings_ref0 (_tmp0_); + _tmp0_ = _print_settings_ref0 (settings); #line 1129 "/home/jens/Source/shotwell/src/Printing.vala" _print_settings_unref0 (self->priv->settings); #line 1129 "/home/jens/Source/shotwell/src/Printing.vala" - self->priv->settings = _tmp1_; + self->priv->settings = _tmp0_; #line 1130 "/home/jens/Source/shotwell/src/Printing.vala" - _tmp2_ = settings; -#line 1130 "/home/jens/Source/shotwell/src/Printing.vala" - print_settings_save (_tmp2_); -#line 8024 "Printing.c" + print_settings_save (settings); +#line 8144 "Printing.c" } -static void value_print_manager_init (GValue* value) { +static void +value_print_manager_init (GValue* value) +{ #line 771 "/home/jens/Source/shotwell/src/Printing.vala" value->data[0].v_pointer = NULL; -#line 8031 "Printing.c" +#line 8153 "Printing.c" } -static void value_print_manager_free_value (GValue* value) { +static void +value_print_manager_free_value (GValue* value) +{ #line 771 "/home/jens/Source/shotwell/src/Printing.vala" if (value->data[0].v_pointer) { #line 771 "/home/jens/Source/shotwell/src/Printing.vala" print_manager_unref (value->data[0].v_pointer); -#line 8040 "Printing.c" +#line 8164 "Printing.c" } } -static void value_print_manager_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_print_manager_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 771 "/home/jens/Source/shotwell/src/Printing.vala" if (src_value->data[0].v_pointer) { #line 771 "/home/jens/Source/shotwell/src/Printing.vala" dest_value->data[0].v_pointer = print_manager_ref (src_value->data[0].v_pointer); -#line 8050 "Printing.c" +#line 8177 "Printing.c" } else { #line 771 "/home/jens/Source/shotwell/src/Printing.vala" dest_value->data[0].v_pointer = NULL; -#line 8054 "Printing.c" +#line 8181 "Printing.c" } } -static gpointer value_print_manager_peek_pointer (const GValue* value) { +static gpointer +value_print_manager_peek_pointer (const GValue* value) +{ #line 771 "/home/jens/Source/shotwell/src/Printing.vala" return value->data[0].v_pointer; -#line 8062 "Printing.c" +#line 8191 "Printing.c" } -static gchar* value_print_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_print_manager_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 771 "/home/jens/Source/shotwell/src/Printing.vala" if (collect_values[0].v_pointer) { -#line 8069 "Printing.c" +#line 8203 "Printing.c" PrintManager * object; object = collect_values[0].v_pointer; #line 771 "/home/jens/Source/shotwell/src/Printing.vala" if (object->parent_instance.g_class == NULL) { #line 771 "/home/jens/Source/shotwell/src/Printing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8076 "Printing.c" +#line 8210 "Printing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 771 "/home/jens/Source/shotwell/src/Printing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8080 "Printing.c" +#line 8214 "Printing.c" } #line 771 "/home/jens/Source/shotwell/src/Printing.vala" value->data[0].v_pointer = print_manager_ref (object); -#line 8084 "Printing.c" +#line 8218 "Printing.c" } else { #line 771 "/home/jens/Source/shotwell/src/Printing.vala" value->data[0].v_pointer = NULL; -#line 8088 "Printing.c" +#line 8222 "Printing.c" } #line 771 "/home/jens/Source/shotwell/src/Printing.vala" return NULL; -#line 8092 "Printing.c" +#line 8226 "Printing.c" } -static gchar* value_print_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_print_manager_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PrintManager ** object_p; object_p = collect_values[0].v_pointer; #line 771 "/home/jens/Source/shotwell/src/Printing.vala" if (!object_p) { #line 771 "/home/jens/Source/shotwell/src/Printing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8103 "Printing.c" +#line 8242 "Printing.c" } #line 771 "/home/jens/Source/shotwell/src/Printing.vala" if (!value->data[0].v_pointer) { #line 771 "/home/jens/Source/shotwell/src/Printing.vala" *object_p = NULL; -#line 8109 "Printing.c" +#line 8248 "Printing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 771 "/home/jens/Source/shotwell/src/Printing.vala" *object_p = value->data[0].v_pointer; -#line 8113 "Printing.c" +#line 8252 "Printing.c" } else { #line 771 "/home/jens/Source/shotwell/src/Printing.vala" *object_p = print_manager_ref (value->data[0].v_pointer); -#line 8117 "Printing.c" +#line 8256 "Printing.c" } #line 771 "/home/jens/Source/shotwell/src/Printing.vala" return NULL; -#line 8121 "Printing.c" +#line 8260 "Printing.c" } -GParamSpec* param_spec_print_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_print_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPrintManager* spec; #line 771 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PRINT_MANAGER), NULL); @@ -8132,20 +8277,25 @@ GParamSpec* param_spec_print_manager (const gchar* name, const gchar* nick, cons G_PARAM_SPEC (spec)->value_type = object_type; #line 771 "/home/jens/Source/shotwell/src/Printing.vala" return G_PARAM_SPEC (spec); -#line 8135 "Printing.c" +#line 8280 "Printing.c" } -gpointer value_get_print_manager (const GValue* value) { +gpointer +value_get_print_manager (const GValue* value) +{ #line 771 "/home/jens/Source/shotwell/src/Printing.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PRINT_MANAGER), NULL); #line 771 "/home/jens/Source/shotwell/src/Printing.vala" return value->data[0].v_pointer; -#line 8144 "Printing.c" +#line 8291 "Printing.c" } -void value_set_print_manager (GValue* value, gpointer v_object) { +void +value_set_print_manager (GValue* value, + gpointer v_object) +{ PrintManager * old; #line 771 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PRINT_MANAGER)); @@ -8161,22 +8311,25 @@ void value_set_print_manager (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 771 "/home/jens/Source/shotwell/src/Printing.vala" print_manager_ref (value->data[0].v_pointer); -#line 8164 "Printing.c" +#line 8314 "Printing.c" } else { #line 771 "/home/jens/Source/shotwell/src/Printing.vala" value->data[0].v_pointer = NULL; -#line 8168 "Printing.c" +#line 8318 "Printing.c" } #line 771 "/home/jens/Source/shotwell/src/Printing.vala" if (old) { #line 771 "/home/jens/Source/shotwell/src/Printing.vala" print_manager_unref (old); -#line 8174 "Printing.c" +#line 8324 "Printing.c" } } -void value_take_print_manager (GValue* value, gpointer v_object) { +void +value_take_print_manager (GValue* value, + gpointer v_object) +{ PrintManager * old; #line 771 "/home/jens/Source/shotwell/src/Printing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PRINT_MANAGER)); @@ -8190,33 +8343,37 @@ void value_take_print_manager (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 771 "/home/jens/Source/shotwell/src/Printing.vala" value->data[0].v_pointer = v_object; -#line 8193 "Printing.c" +#line 8346 "Printing.c" } else { #line 771 "/home/jens/Source/shotwell/src/Printing.vala" value->data[0].v_pointer = NULL; -#line 8197 "Printing.c" +#line 8350 "Printing.c" } #line 771 "/home/jens/Source/shotwell/src/Printing.vala" if (old) { #line 771 "/home/jens/Source/shotwell/src/Printing.vala" print_manager_unref (old); -#line 8203 "Printing.c" +#line 8356 "Printing.c" } } -static void print_manager_class_init (PrintManagerClass * klass) { +static void +print_manager_class_init (PrintManagerClass * klass) +{ #line 771 "/home/jens/Source/shotwell/src/Printing.vala" print_manager_parent_class = g_type_class_peek_parent (klass); #line 771 "/home/jens/Source/shotwell/src/Printing.vala" ((PrintManagerClass *) klass)->finalize = print_manager_finalize; #line 771 "/home/jens/Source/shotwell/src/Printing.vala" g_type_class_add_private (klass, sizeof (PrintManagerPrivate)); -#line 8215 "Printing.c" +#line 8370 "Printing.c" } -static void print_manager_instance_init (PrintManager * self) { +static void +print_manager_instance_init (PrintManager * self) +{ #line 771 "/home/jens/Source/shotwell/src/Printing.vala" self->priv = PRINT_MANAGER_GET_PRIVATE (self); #line 779 "/home/jens/Source/shotwell/src/Printing.vala" @@ -8231,11 +8388,13 @@ static void print_manager_instance_init (PrintManager * self) { self->priv->_standard_sizes_size_ = self->priv->standard_sizes_length1; #line 771 "/home/jens/Source/shotwell/src/Printing.vala" self->ref_count = 1; -#line 8234 "Printing.c" +#line 8391 "Printing.c" } -static void print_manager_finalize (PrintManager * obj) { +static void +print_manager_finalize (PrintManager * obj) +{ PrintManager * self; #line 771 "/home/jens/Source/shotwell/src/Printing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PRINT_MANAGER, PrintManager); @@ -8253,11 +8412,13 @@ static void print_manager_finalize (PrintManager * obj) { _g_object_unref0 (self->priv->cancellable); #line 781 "/home/jens/Source/shotwell/src/Printing.vala" self->priv->standard_sizes = (_vala_array_free (self->priv->standard_sizes, self->priv->standard_sizes_length1, (GDestroyNotify) standard_print_size_unref), NULL); -#line 8256 "Printing.c" +#line 8415 "Printing.c" } -GType print_manager_get_type (void) { +GType +print_manager_get_type (void) +{ static volatile gsize print_manager_type_id__volatile = 0; if (g_once_init_enter (&print_manager_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_print_manager_init, value_print_manager_free_value, value_print_manager_copy_value, value_print_manager_peek_pointer, "p", value_print_manager_collect_value, "p", value_print_manager_lcopy_value }; @@ -8271,18 +8432,22 @@ GType print_manager_get_type (void) { } -gpointer print_manager_ref (gpointer instance) { +gpointer +print_manager_ref (gpointer instance) +{ PrintManager * self; self = instance; #line 771 "/home/jens/Source/shotwell/src/Printing.vala" g_atomic_int_inc (&self->ref_count); #line 771 "/home/jens/Source/shotwell/src/Printing.vala" return instance; -#line 8281 "Printing.c" +#line 8444 "Printing.c" } -void print_manager_unref (gpointer instance) { +void +print_manager_unref (gpointer instance) +{ PrintManager * self; self = instance; #line 771 "/home/jens/Source/shotwell/src/Printing.vala" @@ -8291,12 +8456,16 @@ void print_manager_unref (gpointer instance) { PRINT_MANAGER_GET_CLASS (self)->finalize (self); #line 771 "/home/jens/Source/shotwell/src/Printing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8294 "Printing.c" +#line 8459 "Printing.c" } } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -8308,7 +8477,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/Properties.c b/src/Properties.c index 21f7671..a39f400 100644 --- a/src/Properties.c +++ b/src/Properties.c @@ -1,4 +1,4 @@ -/* Properties.c generated by valac 0.36.6, the Vala compiler +/* Properties.c generated by valac 0.40.4, the Vala compiler * generated from Properties.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -62,6 +63,11 @@ typedef struct _DataViewClass DataViewClass; typedef struct _Page Page; typedef struct _PageClass PageClass; +enum { + PROPERTIES_0_PROPERTY, + PROPERTIES_NUM_PROPERTIES +}; +static GParamSpec* properties_properties[PROPERTIES_NUM_PROPERTIES]; #define _g_free0(var) (var = (g_free (var), NULL)) #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) @@ -100,6 +106,11 @@ typedef struct _BasicPropertiesPrivate BasicPropertiesPrivate; #define TYPE_DIMENSIONS (dimensions_get_type ()) typedef struct _Dimensions Dimensions; +enum { + BASIC_PROPERTIES_0_PROPERTY, + BASIC_PROPERTIES_NUM_PROPERTIES +}; +static GParamSpec* basic_properties_properties[BASIC_PROPERTIES_NUM_PROPERTIES]; #define TYPE_DATA_SOURCE (data_source_get_type ()) #define DATA_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_SOURCE, DataSource)) @@ -311,6 +322,11 @@ typedef struct _ExtendedPropertiesWindowPrivate ExtendedPropertiesWindowPrivate; typedef struct _ExtendedPropertiesWindowExtendedProperties ExtendedPropertiesWindowExtendedProperties; typedef struct _ExtendedPropertiesWindowExtendedPropertiesClass ExtendedPropertiesWindowExtendedPropertiesClass; +enum { + EXTENDED_PROPERTIES_WINDOW_0_PROPERTY, + EXTENDED_PROPERTIES_WINDOW_NUM_PROPERTIES +}; +static GParamSpec* extended_properties_window_properties[EXTENDED_PROPERTIES_WINDOW_NUM_PROPERTIES]; #define TYPE_PAGE_WINDOW (page_window_get_type ()) #define PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_WINDOW, PageWindow)) @@ -332,6 +348,11 @@ typedef struct _PageWindowClass PageWindowClass; typedef struct _AppWindow AppWindow; typedef struct _AppWindowClass AppWindowClass; typedef struct _ExtendedPropertiesWindowExtendedPropertiesPrivate ExtendedPropertiesWindowExtendedPropertiesPrivate; +enum { + EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_0_PROPERTY, + EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NUM_PROPERTIES +}; +static GParamSpec* extended_properties_window_extended_properties_properties[EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NUM_PROPERTIES]; #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) #define TYPE_METADATA_DATE_TIME (metadata_date_time_get_type ()) @@ -517,29 +538,44 @@ GType data_object_get_type (void) G_GNUC_CONST; GType data_view_get_type (void) G_GNUC_CONST; GType page_get_type (void) G_GNUC_CONST; #define PROPERTIES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PROPERTIES, PropertiesPrivate)) -enum { - PROPERTIES_DUMMY_PROPERTY -}; Properties* properties_construct (GType object_type); -void properties_add_line (Properties* self, const gchar* label_text, const gchar* info_text, gboolean multi_line); +void properties_add_line (Properties* self, + const gchar* label_text, + const gchar* info_text, + gboolean multi_line); gboolean is_string_empty (const gchar* s); -gchar* properties_get_prettyprint_time (Properties* self, struct tm* time); +gchar* properties_get_prettyprint_time (Properties* self, + struct tm* time); gchar* resources_get_hh_mm_format_string (void); -gchar* properties_get_prettyprint_time_with_seconds (Properties* self, struct tm* time); +gchar* properties_get_prettyprint_time_with_seconds (Properties* self, + struct tm* time); gchar* resources_get_hh_mm_ss_format_string (void); -gchar* properties_get_prettyprint_date (Properties* self, struct tm* date); +gchar* properties_get_prettyprint_date (Properties* self, + struct tm* date); gchar* format_local_date (struct tm* date); -void properties_get_single_properties (Properties* self, DataView* view); -static void properties_real_get_single_properties (Properties* self, DataView* view); -void properties_get_multiple_properties (Properties* self, GeeIterable* iter); -static void properties_real_get_multiple_properties (Properties* self, GeeIterable* iter); -void properties_get_properties (Properties* self, Page* current_page); -static void properties_real_get_properties (Properties* self, Page* current_page); +void properties_get_single_properties (Properties* self, + DataView* view); +static void properties_real_get_single_properties (Properties* self, + DataView* view); +void properties_get_multiple_properties (Properties* self, + GeeIterable* iter); +static void properties_real_get_multiple_properties (Properties* self, + GeeIterable* iter); +void properties_get_properties (Properties* self, + Page* current_page); +static void properties_real_get_properties (Properties* self, + Page* current_page); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; @@ -550,9 +586,12 @@ gint data_collection_get_count (DataCollection* self); GeeCollection* data_collection_get_all (DataCollection* self); void properties_clear_properties (Properties* self); static void properties_real_clear_properties (Properties* self); -void properties_update_properties (Properties* self, Page* page); -void properties_internal_update_properties (Properties* self, Page* page); -static void properties_real_internal_update_properties (Properties* self, Page* page); +void properties_update_properties (Properties* self, + Page* page); +void properties_internal_update_properties (Properties* self, + Page* page); +static void properties_real_internal_update_properties (Properties* self, + Page* page); void properties_unselect_text (Properties* self); static void properties_finalize (GObject * obj); GType basic_properties_get_type (void) G_GNUC_CONST; @@ -560,14 +599,14 @@ GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); #define BASIC_PROPERTIES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_BASIC_PROPERTIES, BasicPropertiesPrivate)) -enum { - BASIC_PROPERTIES_DUMMY_PROPERTY -}; BasicProperties* basic_properties_new (void); BasicProperties* basic_properties_construct (GType object_type); static void basic_properties_real_clear_properties (Properties* base); -void dimensions_init (Dimensions *self, gint width, gint height); -static void basic_properties_real_get_single_properties (Properties* base, DataView* view); +void dimensions_init (Dimensions *self, + gint width, + gint height); +static void basic_properties_real_get_single_properties (Properties* base, + DataView* view); GType data_source_get_type (void) G_GNUC_CONST; DataSource* data_view_get_source (DataView* self); gchar* data_object_get_name (DataObject* self); @@ -580,44 +619,62 @@ time_t media_source_get_exposure_time (MediaSource* self); time_t import_source_get_exposure_time (ImportSource* self); gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; PhotoMetadata* photo_source_get_metadata (PhotoSource* self); PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self); gchar* photo_metadata_get_exposure_string (PhotoMetadata* self); -gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_formatted); +gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, + gboolean pango_formatted); gchar* photo_metadata_get_iso_string (PhotoMetadata* self); Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self); GType orientation_get_type (void) G_GNUC_CONST; Orientation photo_metadata_get_orientation (PhotoMetadata* self); -void orientation_rotate_dimensions (Orientation self, Dimensions* dim, Dimensions* result); +void orientation_rotate_dimensions (Orientation self, + Dimensions* dim, + Dimensions* result); GType photo_exception_get_type (void) G_GNUC_CONST; -void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result); +void media_source_get_dimensions (MediaSource* self, + PhotoException disallowed_steps, + Dimensions* result); GType photo_get_type (void) G_GNUC_CONST; GType photo_file_format_get_type (void) G_GNUC_CONST; PhotoFileFormat photo_get_master_file_format (Photo* self); GType raw_developer_get_type (void) G_GNUC_CONST; RawDeveloper photo_get_raw_developer (Photo* self); gchar* raw_developer_get_label (RawDeveloper self); -gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d); +gboolean photo_is_raw_developer_available (Photo* self, + RawDeveloper d); GType event_source_get_type (void) G_GNUC_CONST; time_t event_source_get_start_time (EventSource* self); time_t event_source_get_end_time (EventSource* self); -void media_source_collection_count_media (GeeCollection* media, gint* photo_count, gint* video_count); +void media_source_collection_count_media (GeeCollection* media, + gint* photo_count, + gint* video_count); GeeCollection* event_source_get_media (EventSource* self); GType video_source_get_type (void) G_GNUC_CONST; GType video_import_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; gdouble video_get_clip_duration (Video* self); gboolean video_get_is_interpretable (Video* self); -void video_get_frame_dimensions (Video* self, Dimensions* result); -static void basic_properties_real_get_multiple_properties (Properties* base, GeeIterable* iter); -static void basic_properties_real_get_properties (Properties* base, Page* current_page); -static void basic_properties_real_internal_update_properties (Properties* base, Page* page); +void video_get_frame_dimensions (Video* self, + Dimensions* result); +static void basic_properties_real_get_multiple_properties (Properties* base, + GeeIterable* iter); +static void basic_properties_real_get_properties (Properties* base, + Page* current_page); +static void basic_properties_real_internal_update_properties (Properties* base, + Page* page); GType checkerboard_page_get_type (void) G_GNUC_CONST; GType media_page_get_type (void) G_GNUC_CONST; GType collection_page_get_type (void) G_GNUC_CONST; @@ -631,51 +688,67 @@ static void basic_properties_finalize (GObject * obj); GType extended_properties_window_get_type (void) G_GNUC_CONST; static GType extended_properties_window_extended_properties_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define EXTENDED_PROPERTIES_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EXTENDED_PROPERTIES_WINDOW, ExtendedPropertiesWindowPrivate)) -enum { - EXTENDED_PROPERTIES_WINDOW_DUMMY_PROPERTY -}; ExtendedPropertiesWindow* extended_properties_window_new (GtkWindow* owner); -ExtendedPropertiesWindow* extended_properties_window_construct (GType object_type, GtkWindow* owner); +ExtendedPropertiesWindow* extended_properties_window_construct (GType object_type, + GtkWindow* owner); gint resources_use_header_bar (void); -static gboolean _gtk_widget_hide_on_delete_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self); +static gboolean _gtk_widget_hide_on_delete_gtk_widget_delete_event (GtkWidget* _sender, + GdkEventAny* event, + gpointer self); static ExtendedPropertiesWindowExtendedProperties* extended_properties_window_extended_properties_new (void); static ExtendedPropertiesWindowExtendedProperties* extended_properties_window_extended_properties_construct (GType object_type); -static gboolean extended_properties_window_real_button_press_event (GtkWidget* base, GdkEventButton* event); -static gboolean extended_properties_window_real_key_press_event (GtkWidget* base, GdkEventKey* event); +static gboolean extended_properties_window_real_button_press_event (GtkWidget* base, + GdkEventButton* event); +static gboolean extended_properties_window_real_key_press_event (GtkWidget* base, + GdkEventKey* event); GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); -void extended_properties_window_update_properties (ExtendedPropertiesWindow* self, Page* page); +void extended_properties_window_update_properties (ExtendedPropertiesWindow* self, + Page* page); static void extended_properties_window_real_show_all (GtkWidget* base); #define EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EXTENDED_PROPERTIES_WINDOW_TYPE_EXTENDED_PROPERTIES, ExtendedPropertiesWindowExtendedPropertiesPrivate)) -enum { - EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_DUMMY_PROPERTY -}; #define EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE "" static void extended_properties_window_extended_properties_real_clear_properties (Properties* base); -static void extended_properties_window_extended_properties_real_get_single_properties (Properties* base, DataView* view); +static void extended_properties_window_extended_properties_real_get_single_properties (Properties* base, + DataView* view); GFile* media_source_get_master_file (MediaSource* self); GFile* media_source_get_file (MediaSource* self); guint64 media_source_get_master_filesize (MediaSource* self); -PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error); +PhotoMetadata* photo_get_master_metadata (Photo* self, + GError** error); gpointer metadata_date_time_ref (gpointer instance); void metadata_date_time_unref (gpointer instance); -GParamSpec* param_spec_metadata_date_time (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_metadata_date_time (GValue* value, gpointer v_object); -void value_take_metadata_date_time (GValue* value, gpointer v_object); +GParamSpec* param_spec_metadata_date_time (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_metadata_date_time (GValue* value, + gpointer v_object); +void value_take_metadata_date_time (GValue* value, + gpointer v_object); gpointer value_get_metadata_date_time (const GValue* value); GType metadata_date_time_get_type (void) G_GNUC_CONST; MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self); GType photo_metadata_set_option_get_type (void) G_GNUC_CONST; -void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option); +void photo_metadata_set_exposure_date_time (PhotoMetadata* self, + MetadataDateTime* date_time, + PhotoMetadataSetOption option); time_t media_source_get_timestamp (MediaSource* self); MetadataDateTime* metadata_date_time_new (time_t timestamp); -MetadataDateTime* metadata_date_time_construct (GType object_type, time_t timestamp); +MetadataDateTime* metadata_date_time_construct (GType object_type, + time_t timestamp); gchar* photo_metadata_get_camera_make (PhotoMetadata* self); gchar* photo_metadata_get_camera_model (PhotoMetadata* self); gchar* photo_metadata_get_flash_string (PhotoMetadata* self); gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self); -gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar* * long_ref, gdouble* latitude, gchar* * lat_ref, gdouble* altitude); +gboolean photo_metadata_get_gps (PhotoMetadata* self, + gdouble* longitude, + gchar* * long_ref, + gdouble* latitude, + gchar* * lat_ref, + gdouble* altitude); gchar* photo_metadata_get_artist (PhotoMetadata* self); gchar* photo_metadata_get_copyright (PhotoMetadata* self); gchar* photo_metadata_get_software (PhotoMetadata* self); @@ -684,13 +757,16 @@ time_t metadata_date_time_get_timestamp (MetadataDateTime* self); gchar* media_source_get_comment (MediaSource* self); GType event_get_type (void) G_GNUC_CONST; gchar* event_source_get_comment (EventSource* self); -static void extended_properties_window_extended_properties_real_internal_update_properties (Properties* base, Page* page); +static void extended_properties_window_extended_properties_real_internal_update_properties (Properties* base, + Page* page); GType events_directory_page_get_type (void) G_GNUC_CONST; static void extended_properties_window_extended_properties_finalize (GObject * obj); static void extended_properties_window_finalize (GObject * obj); -Properties* properties_construct (GType object_type) { +Properties* +properties_construct (GType object_type) +{ Properties * self = NULL; #line 10 "/home/jens/Source/shotwell/src/Properties.vala" self = (Properties*) g_object_new (object_type, NULL); @@ -700,31 +776,35 @@ Properties* properties_construct (GType object_type) { gtk_grid_set_column_spacing (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_grid_get_type (), GtkGrid), 6); #line 10 "/home/jens/Source/shotwell/src/Properties.vala" return self; -#line 704 "Properties.c" +#line 780 "Properties.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 31 "/home/jens/Source/shotwell/src/Properties.vala" return self ? g_object_ref (self) : NULL; -#line 711 "Properties.c" +#line 789 "Properties.c" } -void properties_add_line (Properties* self, const gchar* label_text, const gchar* info_text, gboolean multi_line) { +void +properties_add_line (Properties* self, + const gchar* label_text, + const gchar* info_text, + gboolean multi_line) +{ GtkLabel* label = NULL; GtkLabel* _tmp0_; GtkWidget* info = NULL; GtkLabel* _tmp1_; GtkLabel* _tmp2_; - const gchar* _tmp3_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; - gboolean _tmp6_; - GtkLabel* _tmp46_; - guint _tmp47_; - gboolean _tmp48_; - guint _tmp53_; + GtkLabel* _tmp38_; + guint _tmp39_; + guint _tmp44_; #line 15 "/home/jens/Source/shotwell/src/Properties.vala" g_return_if_fail (IS_PROPERTIES (self)); #line 15 "/home/jens/Source/shotwell/src/Properties.vala" @@ -744,267 +824,246 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar #line 21 "/home/jens/Source/shotwell/src/Properties.vala" _tmp2_ = label; #line 21 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp3_ = label_text; + _tmp3_ = g_markup_printf_escaped ("%s", label_text); #line 21 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp4_ = g_markup_printf_escaped ("%s", _tmp3_); -#line 21 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 21 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_label_set_markup (_tmp2_, _tmp5_); + gtk_label_set_markup (_tmp2_, _tmp4_); #line 21 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp4_); #line 23 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp6_ = multi_line; -#line 23 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp6_) { -#line 761 "Properties.c" + if (multi_line) { +#line 837 "Properties.c" GtkScrolledWindow* info_scroll = NULL; - GtkScrolledWindow* _tmp7_; - GtkScrolledWindow* _tmp8_; + GtkScrolledWindow* _tmp5_; + GtkScrolledWindow* _tmp6_; GtkTextView* view = NULL; - GtkTextView* _tmp9_; + GtkTextView* _tmp7_; GtkStyleContext* context = NULL; - GtkScrolledWindow* _tmp10_; - GtkStyleContext* _tmp11_; + GtkScrolledWindow* _tmp8_; + GtkStyleContext* _tmp9_; + GtkStyleContext* _tmp10_; + GtkTextView* _tmp11_; GtkStyleContext* _tmp12_; - GtkTextView* _tmp13_; - GtkStyleContext* _tmp14_; - GdkRGBA _tmp15_ = {0}; + GdkRGBA _tmp13_ = {0}; + GtkTextView* _tmp14_; + GtkTextView* _tmp15_; GtkTextView* _tmp16_; - GtkTextView* _tmp17_; + const gchar* _tmp17_ = NULL; GtkTextView* _tmp18_; - const gchar* _tmp19_ = NULL; - const gchar* _tmp20_; - gboolean _tmp21_; - GtkTextView* _tmp23_; - GtkTextBuffer* _tmp24_; - GtkTextBuffer* _tmp25_; - GtkScrolledWindow* _tmp26_; - GtkTextView* _tmp27_; - GtkLabel* _tmp28_; - GtkLabel* _tmp29_; - GtkScrolledWindow* _tmp30_; - GtkWidget* _tmp31_; + GtkTextBuffer* _tmp19_; + GtkTextBuffer* _tmp20_; + GtkScrolledWindow* _tmp21_; + GtkTextView* _tmp22_; + GtkLabel* _tmp23_; + GtkLabel* _tmp24_; + GtkScrolledWindow* _tmp25_; + GtkWidget* _tmp26_; #line 24 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp7_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL); + _tmp5_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL); #line 24 "/home/jens/Source/shotwell/src/Properties.vala" - g_object_ref_sink (_tmp7_); + g_object_ref_sink (_tmp5_); #line 24 "/home/jens/Source/shotwell/src/Properties.vala" - info_scroll = _tmp7_; + info_scroll = _tmp5_; #line 25 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp8_ = info_scroll; + _tmp6_ = info_scroll; #line 25 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_scrolled_window_set_shadow_type (_tmp8_, GTK_SHADOW_ETCHED_IN); + gtk_scrolled_window_set_shadow_type (_tmp6_, GTK_SHADOW_ETCHED_IN); #line 26 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp9_ = (GtkTextView*) gtk_text_view_new (); + _tmp7_ = (GtkTextView*) gtk_text_view_new (); #line 26 "/home/jens/Source/shotwell/src/Properties.vala" - g_object_ref_sink (_tmp9_); + g_object_ref_sink (_tmp7_); #line 26 "/home/jens/Source/shotwell/src/Properties.vala" - view = _tmp9_; + view = _tmp7_; #line 31 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp10_ = info_scroll; + _tmp8_ = info_scroll; #line 31 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp11_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget)); + _tmp9_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget)); #line 31 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp12_ = _g_object_ref0 (_tmp11_); + _tmp10_ = _g_object_ref0 (_tmp9_); #line 31 "/home/jens/Source/shotwell/src/Properties.vala" - context = _tmp12_; + context = _tmp10_; #line 32 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp13_ = view; + _tmp11_ = view; #line 32 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp14_ = context; + _tmp12_ = context; #line 32 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_style_context_get_background_color (_tmp14_, GTK_STATE_FLAG_NORMAL, &_tmp15_); + gtk_style_context_get_background_color (_tmp12_, GTK_STATE_FLAG_NORMAL, &_tmp13_); #line 32 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_widget_override_background_color (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), GTK_STATE_FLAG_NORMAL, &_tmp15_); + gtk_widget_override_background_color (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), GTK_STATE_FLAG_NORMAL, &_tmp13_); #line 34 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp16_ = view; + _tmp14_ = view; #line 34 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_text_view_set_wrap_mode (_tmp16_, GTK_WRAP_WORD); + gtk_text_view_set_wrap_mode (_tmp14_, GTK_WRAP_WORD); #line 35 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp17_ = view; + _tmp15_ = view; #line 35 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_text_view_set_cursor_visible (_tmp17_, FALSE); + gtk_text_view_set_cursor_visible (_tmp15_, FALSE); #line 36 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp18_ = view; + _tmp16_ = view; #line 36 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_text_view_set_editable (_tmp18_, FALSE); + gtk_text_view_set_editable (_tmp16_, FALSE); #line 37 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp20_ = info_text; + if (is_string_empty (info_text)) { #line 37 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp21_ = is_string_empty (_tmp20_); -#line 37 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp21_) { -#line 37 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp19_ = ""; -#line 841 "Properties.c" + _tmp17_ = ""; +#line 911 "Properties.c" } else { - const gchar* _tmp22_; -#line 37 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp22_ = info_text; #line 37 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp19_ = _tmp22_; -#line 848 "Properties.c" + _tmp17_ = info_text; +#line 915 "Properties.c" } #line 37 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp23_ = view; + _tmp18_ = view; #line 37 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp24_ = gtk_text_view_get_buffer (_tmp23_); + _tmp19_ = gtk_text_view_get_buffer (_tmp18_); #line 37 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp25_ = _tmp24_; + _tmp20_ = _tmp19_; #line 37 "/home/jens/Source/shotwell/src/Properties.vala" - g_object_set (_tmp25_, "text", _tmp19_, NULL); + g_object_set (_tmp20_, "text", _tmp17_, NULL); #line 38 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp26_ = info_scroll; + _tmp21_ = info_scroll; #line 38 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp27_ = view; + _tmp22_ = view; #line 38 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget)); #line 39 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp28_ = label; + _tmp23_ = label; #line 39 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_label_set_xalign (_tmp28_, 1.0f); + gtk_label_set_xalign (_tmp23_, 1.0f); #line 40 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp29_ = label; + _tmp24_ = label; #line 40 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_label_set_yalign (_tmp29_, 0.0f); + gtk_label_set_yalign (_tmp24_, 0.0f); #line 41 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp30_ = info_scroll; + _tmp25_ = info_scroll; #line 41 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget)); + _tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget)); #line 41 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (info); #line 41 "/home/jens/Source/shotwell/src/Properties.vala" - info = _tmp31_; + info = _tmp26_; #line 23 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (context); #line 23 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (view); #line 23 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (info_scroll); -#line 886 "Properties.c" +#line 953 "Properties.c" } else { GtkLabel* info_label = NULL; + GtkLabel* _tmp27_; + const gchar* _tmp28_ = NULL; + GtkLabel* _tmp29_; + GtkLabel* _tmp30_; + GtkLabel* _tmp31_; GtkLabel* _tmp32_; - const gchar* _tmp33_ = NULL; - const gchar* _tmp34_; - gboolean _tmp35_; - GtkLabel* _tmp37_; - GtkLabel* _tmp38_; - GtkLabel* _tmp39_; - GtkLabel* _tmp40_; - GtkLabel* _tmp41_; - GtkLabel* _tmp42_; - GtkLabel* _tmp43_; - GtkLabel* _tmp44_; - GtkWidget* _tmp45_; + GtkLabel* _tmp33_; + GtkLabel* _tmp34_; + GtkLabel* _tmp35_; + GtkLabel* _tmp36_; + GtkWidget* _tmp37_; #line 43 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp32_ = (GtkLabel*) gtk_label_new (""); + _tmp27_ = (GtkLabel*) gtk_label_new (""); #line 43 "/home/jens/Source/shotwell/src/Properties.vala" - g_object_ref_sink (_tmp32_); + g_object_ref_sink (_tmp27_); #line 43 "/home/jens/Source/shotwell/src/Properties.vala" - info_label = _tmp32_; + info_label = _tmp27_; #line 44 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp34_ = info_text; + if (is_string_empty (info_text)) { #line 44 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp35_ = is_string_empty (_tmp34_); -#line 44 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp35_) { -#line 44 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp33_ = ""; -#line 916 "Properties.c" + _tmp28_ = ""; +#line 977 "Properties.c" } else { - const gchar* _tmp36_; -#line 44 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp36_ = info_text; #line 44 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp33_ = _tmp36_; -#line 923 "Properties.c" + _tmp28_ = info_text; +#line 981 "Properties.c" } #line 44 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp37_ = info_label; + _tmp29_ = info_label; #line 44 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_label_set_markup (_tmp37_, _tmp33_); + gtk_label_set_markup (_tmp29_, _tmp28_); #line 45 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp38_ = info_label; + _tmp30_ = info_label; #line 45 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_label_set_ellipsize (_tmp38_, PANGO_ELLIPSIZE_END); + gtk_label_set_ellipsize (_tmp30_, PANGO_ELLIPSIZE_END); #line 46 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp39_ = info_label; + _tmp31_ = info_label; #line 46 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_label_set_xalign (_tmp39_, 0.0f); + gtk_label_set_xalign (_tmp31_, 0.0f); #line 47 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp40_ = info_label; + _tmp32_ = info_label; #line 47 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_label_set_yalign (_tmp40_, 0.5f); + gtk_label_set_yalign (_tmp32_, 0.5f); #line 48 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp41_ = info_label; + _tmp33_ = info_label; #line 48 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_label_set_selectable (_tmp41_, TRUE); + gtk_label_set_selectable (_tmp33_, TRUE); #line 49 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp42_ = label; + _tmp34_ = label; #line 49 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_label_set_xalign (_tmp42_, 1.0f); + gtk_label_set_xalign (_tmp34_, 1.0f); #line 50 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp43_ = label; + _tmp35_ = label; #line 50 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_label_set_yalign (_tmp43_, 0.5f); + gtk_label_set_yalign (_tmp35_, 0.5f); #line 51 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp44_ = info_label; + _tmp36_ = info_label; #line 51 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp45_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget)); + _tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget)); #line 51 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (info); #line 51 "/home/jens/Source/shotwell/src/Properties.vala" - info = _tmp45_; + info = _tmp37_; #line 23 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (info_label); -#line 963 "Properties.c" +#line 1021 "Properties.c" } #line 54 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp46_ = label; + _tmp38_ = label; #line 54 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp47_ = self->priv->line_count; + _tmp39_ = self->priv->line_count; #line 54 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_grid_attach (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_grid_get_type (), GtkGrid), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), 0, (gint) _tmp47_, 1, 1); + gtk_grid_attach (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_grid_get_type (), GtkGrid), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), 0, (gint) _tmp39_, 1, 1); #line 56 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp48_ = multi_line; -#line 56 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp48_) { -#line 975 "Properties.c" - GtkWidget* _tmp49_; - guint _tmp50_; + if (multi_line) { +#line 1031 "Properties.c" + GtkWidget* _tmp40_; + guint _tmp41_; #line 57 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp49_ = info; + _tmp40_ = info; #line 57 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp50_ = self->priv->line_count; + _tmp41_ = self->priv->line_count; #line 57 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_grid_attach (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_grid_get_type (), GtkGrid), _tmp49_, 1, (gint) _tmp50_, 1, 2); -#line 984 "Properties.c" + gtk_grid_attach (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_grid_get_type (), GtkGrid), _tmp40_, 1, (gint) _tmp41_, 1, 2); +#line 1040 "Properties.c" } else { - GtkWidget* _tmp51_; - guint _tmp52_; + GtkWidget* _tmp42_; + guint _tmp43_; #line 59 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp51_ = info; + _tmp42_ = info; #line 59 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp52_ = self->priv->line_count; + _tmp43_ = self->priv->line_count; #line 59 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_grid_attach (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_grid_get_type (), GtkGrid), _tmp51_, 1, (gint) _tmp52_, 1, 1); -#line 994 "Properties.c" + gtk_grid_attach (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_grid_get_type (), GtkGrid), _tmp42_, 1, (gint) _tmp43_, 1, 1); +#line 1050 "Properties.c" } #line 62 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp53_ = self->priv->line_count; + _tmp44_ = self->priv->line_count; #line 62 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->line_count = _tmp53_ + 1; + self->priv->line_count = _tmp44_ + 1; #line 15 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (info); #line 15 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (label); -#line 1004 "Properties.c" +#line 1060 "Properties.c" } -static gchar* g_time_format (struct tm *self, const gchar* format) { +static gchar* +g_time_format (struct tm *self, + const gchar* format) +{ gchar* result = NULL; gchar* buffer = NULL; gchar* _tmp0_; @@ -1012,231 +1071,178 @@ static gchar* g_time_format (struct tm *self, const gchar* format) { gint _buffer_size_; gchar* _tmp1_; gint _tmp1__length1; - const gchar* _tmp2_; + gchar* _tmp2_; + gint _tmp2__length1; gchar* _tmp3_; - gint _tmp3__length1; - gchar* _tmp4_; -#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2874 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (format != NULL, NULL); -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_new0 (gchar, 64); -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer = _tmp0_; -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer_length1 = 64; -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _buffer_size_ = buffer_length1; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = buffer; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1__length1 = buffer_length1; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = format; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self)); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = buffer; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3__length1 = buffer_length1; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = g_strdup ((const gchar*) _tmp3_); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + strftime (_tmp1_, _tmp1__length1, format, &(*self)); +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = buffer; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2__length1 = buffer_length1; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_strdup ((const gchar*) _tmp2_); +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp3_; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer = (g_free (buffer), NULL); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1050 "Properties.c" +#line 1106 "Properties.c" } -static gchar string_get (const gchar* self, glong index) { +static gchar +string_get (const gchar* self, + glong index) +{ gchar result = '\0'; - glong _tmp0_; - gchar _tmp1_; -#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar _tmp0_; +#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = index; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = ((gchar*) self)[index]; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1068 "Properties.c" +#line 1124 "Properties.c" } -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, + glong maxlen) +{ glong result = 0L; gchar* end = NULL; gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 1091 "Properties.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1099 "Properties.c" +#line 1148 "Properties.c" } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1111 "Properties.c" +#line 1157 "Properties.c" } } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, + glong offset, + glong len) +{ gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + glong _tmp6_; + gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#line 1135 "Properties.c" - glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = _tmp2_ >= ((glong) 0); -#line 1141 "Properties.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = len >= ((glong) 0); +#line 1178 "Properties.c" } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 1145 "Properties.c" +#line 1182 "Properties.c" } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 1149 "Properties.c" - glong _tmp3_; - glong _tmp4_; - glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 1161 "Properties.c" +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = string_strnlen ((gchar*) self, offset + len); +#line 1188 "Properties.c" } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#line 1171 "Properties.c" + gint _tmp1_; + gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = (glong) _tmp2_; +#line 1198 "Properties.c" } -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp8_ < ((glong) 0)) { -#line 1177 "Properties.c" - glong _tmp9_; - glong _tmp10_; - glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 1191 "Properties.c" +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset < ((glong) 0)) { +#line 1202 "Properties.c" + glong _tmp3_; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 1210 "Properties.c" } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 1201 "Properties.c" + glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 1217 "Properties.c" } -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp14_ < ((glong) 0)) { -#line 1207 "Properties.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 1216 "Properties.c" +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (len < ((glong) 0)) { +#line 1221 "Properties.c" + glong _tmp5_; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp5_ - offset; +#line 1227 "Properties.c" } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1236 "Properties.c" +#line 1239 "Properties.c" } -gchar* properties_get_prettyprint_time (Properties* self, struct tm* time) { +gchar* +properties_get_prettyprint_time (Properties* self, + struct tm* time) +{ gchar* result = NULL; gchar* timestring = NULL; gchar* _tmp0_; @@ -1244,7 +1250,6 @@ gchar* properties_get_prettyprint_time (Properties* self, struct tm* time) { gchar* _tmp2_; gchar* _tmp3_; const gchar* _tmp4_; - gchar _tmp5_; #line 65 "/home/jens/Source/shotwell/src/Properties.vala" g_return_val_if_fail (IS_PROPERTIES (self), NULL); #line 65 "/home/jens/Source/shotwell/src/Properties.vala" @@ -1264,31 +1269,32 @@ gchar* properties_get_prettyprint_time (Properties* self, struct tm* time) { #line 68 "/home/jens/Source/shotwell/src/Properties.vala" _tmp4_ = timestring; #line 68 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp5_ = string_get (_tmp4_, (glong) 0); -#line 68 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp5_ == '0') { -#line 1271 "Properties.c" - const gchar* _tmp6_; - gchar* _tmp7_; + if (string_get (_tmp4_, (glong) 0) == '0') { +#line 1274 "Properties.c" + const gchar* _tmp5_; + gchar* _tmp6_; #line 69 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp6_ = timestring; + _tmp5_ = timestring; #line 69 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp7_ = string_substring (_tmp6_, (glong) 1, (glong) -1); + _tmp6_ = string_substring (_tmp5_, (glong) 1, (glong) -1); #line 69 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (timestring); #line 69 "/home/jens/Source/shotwell/src/Properties.vala" - timestring = _tmp7_; -#line 1282 "Properties.c" + timestring = _tmp6_; +#line 1285 "Properties.c" } #line 71 "/home/jens/Source/shotwell/src/Properties.vala" result = timestring; #line 71 "/home/jens/Source/shotwell/src/Properties.vala" return result; -#line 1288 "Properties.c" +#line 1291 "Properties.c" } -gchar* properties_get_prettyprint_time_with_seconds (Properties* self, struct tm* time) { +gchar* +properties_get_prettyprint_time_with_seconds (Properties* self, + struct tm* time) +{ gchar* result = NULL; gchar* timestring = NULL; gchar* _tmp0_; @@ -1296,7 +1302,6 @@ gchar* properties_get_prettyprint_time_with_seconds (Properties* self, struct tm gchar* _tmp2_; gchar* _tmp3_; const gchar* _tmp4_; - gchar _tmp5_; #line 74 "/home/jens/Source/shotwell/src/Properties.vala" g_return_val_if_fail (IS_PROPERTIES (self), NULL); #line 74 "/home/jens/Source/shotwell/src/Properties.vala" @@ -1316,46 +1321,50 @@ gchar* properties_get_prettyprint_time_with_seconds (Properties* self, struct tm #line 77 "/home/jens/Source/shotwell/src/Properties.vala" _tmp4_ = timestring; #line 77 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp5_ = string_get (_tmp4_, (glong) 0); -#line 77 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp5_ == '0') { -#line 1323 "Properties.c" - const gchar* _tmp6_; - gchar* _tmp7_; + if (string_get (_tmp4_, (glong) 0) == '0') { +#line 1326 "Properties.c" + const gchar* _tmp5_; + gchar* _tmp6_; #line 78 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp6_ = timestring; + _tmp5_ = timestring; #line 78 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp7_ = string_substring (_tmp6_, (glong) 1, (glong) -1); + _tmp6_ = string_substring (_tmp5_, (glong) 1, (glong) -1); #line 78 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (timestring); #line 78 "/home/jens/Source/shotwell/src/Properties.vala" - timestring = _tmp7_; -#line 1334 "Properties.c" + timestring = _tmp6_; +#line 1337 "Properties.c" } #line 80 "/home/jens/Source/shotwell/src/Properties.vala" result = timestring; #line 80 "/home/jens/Source/shotwell/src/Properties.vala" return result; -#line 1340 "Properties.c" +#line 1343 "Properties.c" } -static void g_time_local (time_t time, struct tm* result) { +static void +g_time_local (time_t time, + struct tm* result) +{ struct tm _result_ = {0}; struct tm _tmp0_ = {0}; -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" localtime_r (&time, &_tmp0_); -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" *result = _result_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return; -#line 1355 "Properties.c" +#line 1361 "Properties.c" } -gchar* properties_get_prettyprint_date (Properties* self, struct tm* date) { +gchar* +properties_get_prettyprint_date (Properties* self, + struct tm* date) +{ gchar* result = NULL; gchar* date_string = NULL; struct tm today = {0}; @@ -1388,7 +1397,7 @@ gchar* properties_get_prettyprint_date (Properties* self, struct tm* date) { _tmp6_ = _tmp5_.tm_yday; #line 86 "/home/jens/Source/shotwell/src/Properties.vala" if (_tmp4_ == _tmp6_) { -#line 1392 "Properties.c" +#line 1401 "Properties.c" struct tm _tmp7_; gint _tmp8_; struct tm _tmp9_; @@ -1403,15 +1412,15 @@ gchar* properties_get_prettyprint_date (Properties* self, struct tm* date) { _tmp10_ = _tmp9_.tm_year; #line 86 "/home/jens/Source/shotwell/src/Properties.vala" _tmp2_ = _tmp8_ == _tmp10_; -#line 1407 "Properties.c" +#line 1416 "Properties.c" } else { #line 86 "/home/jens/Source/shotwell/src/Properties.vala" _tmp2_ = FALSE; -#line 1411 "Properties.c" +#line 1420 "Properties.c" } #line 86 "/home/jens/Source/shotwell/src/Properties.vala" if (_tmp2_) { -#line 1415 "Properties.c" +#line 1424 "Properties.c" gchar* _tmp11_; #line 87 "/home/jens/Source/shotwell/src/Properties.vala" _tmp11_ = g_strdup (_ ("Today")); @@ -1419,7 +1428,7 @@ gchar* properties_get_prettyprint_date (Properties* self, struct tm* date) { _g_free0 (date_string); #line 87 "/home/jens/Source/shotwell/src/Properties.vala" date_string = _tmp11_; -#line 1423 "Properties.c" +#line 1432 "Properties.c" } else { gboolean _tmp12_ = FALSE; struct tm _tmp13_; @@ -1436,7 +1445,7 @@ gchar* properties_get_prettyprint_date (Properties* self, struct tm* date) { _tmp16_ = _tmp15_.tm_yday; #line 88 "/home/jens/Source/shotwell/src/Properties.vala" if (_tmp14_ == (_tmp16_ - 1)) { -#line 1440 "Properties.c" +#line 1449 "Properties.c" struct tm _tmp17_; gint _tmp18_; struct tm _tmp19_; @@ -1451,15 +1460,15 @@ gchar* properties_get_prettyprint_date (Properties* self, struct tm* date) { _tmp20_ = _tmp19_.tm_year; #line 88 "/home/jens/Source/shotwell/src/Properties.vala" _tmp12_ = _tmp18_ == _tmp20_; -#line 1455 "Properties.c" +#line 1464 "Properties.c" } else { #line 88 "/home/jens/Source/shotwell/src/Properties.vala" _tmp12_ = FALSE; -#line 1459 "Properties.c" +#line 1468 "Properties.c" } #line 88 "/home/jens/Source/shotwell/src/Properties.vala" if (_tmp12_) { -#line 1463 "Properties.c" +#line 1472 "Properties.c" gchar* _tmp21_; #line 89 "/home/jens/Source/shotwell/src/Properties.vala" _tmp21_ = g_strdup (_ ("Yesterday")); @@ -1467,7 +1476,7 @@ gchar* properties_get_prettyprint_date (Properties* self, struct tm* date) { _g_free0 (date_string); #line 89 "/home/jens/Source/shotwell/src/Properties.vala" date_string = _tmp21_; -#line 1471 "Properties.c" +#line 1480 "Properties.c" } else { struct tm _tmp22_; gchar* _tmp23_; @@ -1479,234 +1488,242 @@ gchar* properties_get_prettyprint_date (Properties* self, struct tm* date) { _g_free0 (date_string); #line 91 "/home/jens/Source/shotwell/src/Properties.vala" date_string = _tmp23_; -#line 1483 "Properties.c" +#line 1492 "Properties.c" } } #line 94 "/home/jens/Source/shotwell/src/Properties.vala" result = date_string; #line 94 "/home/jens/Source/shotwell/src/Properties.vala" return result; -#line 1490 "Properties.c" +#line 1499 "Properties.c" } -static void properties_real_get_single_properties (Properties* self, DataView* view) { +static void +properties_real_get_single_properties (Properties* self, + DataView* view) +{ #line 97 "/home/jens/Source/shotwell/src/Properties.vala" g_return_if_fail (IS_DATA_VIEW (view)); -#line 1497 "Properties.c" +#line 1509 "Properties.c" } -void properties_get_single_properties (Properties* self, DataView* view) { +void +properties_get_single_properties (Properties* self, + DataView* view) +{ #line 97 "/home/jens/Source/shotwell/src/Properties.vala" g_return_if_fail (IS_PROPERTIES (self)); #line 97 "/home/jens/Source/shotwell/src/Properties.vala" PROPERTIES_GET_CLASS (self)->get_single_properties (self, view); -#line 1506 "Properties.c" +#line 1521 "Properties.c" } -static void properties_real_get_multiple_properties (Properties* self, GeeIterable* iter) { +static void +properties_real_get_multiple_properties (Properties* self, + GeeIterable* iter) +{ #line 100 "/home/jens/Source/shotwell/src/Properties.vala" g_return_if_fail ((iter == NULL) || GEE_IS_ITERABLE (iter)); -#line 1513 "Properties.c" +#line 1531 "Properties.c" } -void properties_get_multiple_properties (Properties* self, GeeIterable* iter) { +void +properties_get_multiple_properties (Properties* self, + GeeIterable* iter) +{ #line 100 "/home/jens/Source/shotwell/src/Properties.vala" g_return_if_fail (IS_PROPERTIES (self)); #line 100 "/home/jens/Source/shotwell/src/Properties.vala" PROPERTIES_GET_CLASS (self)->get_multiple_properties (self, iter); -#line 1522 "Properties.c" +#line 1543 "Properties.c" } -static void properties_real_get_properties (Properties* self, Page* current_page) { +static void +properties_real_get_properties (Properties* self, + Page* current_page) +{ ViewCollection* view = NULL; - Page* _tmp0_; + ViewCollection* _tmp0_; ViewCollection* _tmp1_; - ViewCollection* _tmp2_; gint count = 0; - ViewCollection* _tmp3_; - gint _tmp4_; + ViewCollection* _tmp2_; GeeIterable* iter = NULL; - gint _tmp5_; - gboolean _tmp12_ = FALSE; - GeeIterable* _tmp13_; - gint _tmp15_; + gint _tmp3_; + gboolean _tmp9_ = FALSE; + GeeIterable* _tmp10_; + gint _tmp12_; #line 103 "/home/jens/Source/shotwell/src/Properties.vala" g_return_if_fail (IS_PAGE (current_page)); #line 104 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp0_ = current_page; -#line 104 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp1_ = page_get_view (_tmp0_); + _tmp0_ = page_get_view (current_page); #line 104 "/home/jens/Source/shotwell/src/Properties.vala" - view = _tmp1_; + view = _tmp0_; #line 105 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp2_ = view; + _tmp1_ = view; #line 105 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 106 "/home/jens/Source/shotwell/src/Properties.vala" _data_collection_unref0 (view); #line 106 "/home/jens/Source/shotwell/src/Properties.vala" return; -#line 1555 "Properties.c" +#line 1575 "Properties.c" } #line 109 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp3_ = view; -#line 109 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp4_ = view_collection_get_selected_count (_tmp3_); + _tmp2_ = view; #line 109 "/home/jens/Source/shotwell/src/Properties.vala" - count = _tmp4_; + count = view_collection_get_selected_count (_tmp2_); #line 110 "/home/jens/Source/shotwell/src/Properties.vala" iter = NULL; #line 111 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp5_ = count; + _tmp3_ = count; #line 111 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp5_ != 0) { -#line 1569 "Properties.c" - ViewCollection* _tmp6_; - GeeList* _tmp7_; + if (_tmp3_ != 0) { +#line 1587 "Properties.c" + ViewCollection* _tmp4_; + GeeList* _tmp5_; #line 112 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp6_ = view; + _tmp4_ = view; #line 112 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp7_ = view_collection_get_selected (_tmp6_); + _tmp5_ = view_collection_get_selected (_tmp4_); #line 112 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (iter); #line 112 "/home/jens/Source/shotwell/src/Properties.vala" - iter = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable); -#line 1580 "Properties.c" + iter = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable); +#line 1598 "Properties.c" } else { - ViewCollection* _tmp8_; - gint _tmp9_; - ViewCollection* _tmp10_; - GeeCollection* _tmp11_; -#line 114 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp8_ = view; + ViewCollection* _tmp6_; + ViewCollection* _tmp7_; + GeeCollection* _tmp8_; #line 114 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp9_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp6_ = view; #line 114 "/home/jens/Source/shotwell/src/Properties.vala" - count = _tmp9_; + count = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection)); #line 115 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp10_ = view; + _tmp7_ = view; #line 115 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp11_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp8_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection)); #line 115 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (iter); #line 115 "/home/jens/Source/shotwell/src/Properties.vala" - iter = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable); -#line 1600 "Properties.c" + iter = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable); +#line 1615 "Properties.c" } #line 118 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp13_ = iter; + _tmp10_ = iter; #line 118 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp13_ == NULL) { + if (_tmp10_ == NULL) { #line 118 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp12_ = TRUE; -#line 1608 "Properties.c" + _tmp9_ = TRUE; +#line 1623 "Properties.c" } else { - gint _tmp14_; + gint _tmp11_; #line 118 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp14_ = count; + _tmp11_ = count; #line 118 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp12_ = _tmp14_ == 0; -#line 1615 "Properties.c" + _tmp9_ = _tmp11_ == 0; +#line 1630 "Properties.c" } #line 118 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp12_) { + if (_tmp9_) { #line 119 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (iter); #line 119 "/home/jens/Source/shotwell/src/Properties.vala" _data_collection_unref0 (view); #line 119 "/home/jens/Source/shotwell/src/Properties.vala" return; -#line 1625 "Properties.c" +#line 1640 "Properties.c" } #line 121 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp15_ = count; + _tmp12_ = count; #line 121 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp15_ == 1) { -#line 1631 "Properties.c" + if (_tmp12_ == 1) { +#line 1646 "Properties.c" { GeeIterator* _item_it = NULL; - GeeIterable* _tmp16_; - GeeIterator* _tmp17_; + GeeIterable* _tmp13_; + GeeIterator* _tmp14_; #line 122 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp16_ = iter; + _tmp13_ = iter; #line 122 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp17_ = gee_iterable_iterator (_tmp16_); + _tmp14_ = gee_iterable_iterator (_tmp13_); #line 122 "/home/jens/Source/shotwell/src/Properties.vala" - _item_it = _tmp17_; + _item_it = _tmp14_; #line 122 "/home/jens/Source/shotwell/src/Properties.vala" while (TRUE) { -#line 1644 "Properties.c" - GeeIterator* _tmp18_; - gboolean _tmp19_; +#line 1659 "Properties.c" + GeeIterator* _tmp15_; DataView* item = NULL; - GeeIterator* _tmp20_; - gpointer _tmp21_; - DataView* _tmp22_; -#line 122 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp18_ = _item_it; + GeeIterator* _tmp16_; + gpointer _tmp17_; + DataView* _tmp18_; #line 122 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp19_ = gee_iterator_next (_tmp18_); + _tmp15_ = _item_it; #line 122 "/home/jens/Source/shotwell/src/Properties.vala" - if (!_tmp19_) { + if (!gee_iterator_next (_tmp15_)) { #line 122 "/home/jens/Source/shotwell/src/Properties.vala" break; -#line 1659 "Properties.c" +#line 1671 "Properties.c" } #line 122 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp20_ = _item_it; + _tmp16_ = _item_it; #line 122 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp21_ = gee_iterator_get (_tmp20_); + _tmp17_ = gee_iterator_get (_tmp16_); #line 122 "/home/jens/Source/shotwell/src/Properties.vala" - item = (DataView*) _tmp21_; + item = (DataView*) _tmp17_; #line 123 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp22_ = item; + _tmp18_ = item; #line 123 "/home/jens/Source/shotwell/src/Properties.vala" - properties_get_single_properties (self, _tmp22_); + properties_get_single_properties (self, _tmp18_); #line 124 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (item); #line 124 "/home/jens/Source/shotwell/src/Properties.vala" break; -#line 1675 "Properties.c" +#line 1687 "Properties.c" } #line 122 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (_item_it); -#line 1679 "Properties.c" +#line 1691 "Properties.c" } } else { - GeeIterable* _tmp23_; + GeeIterable* _tmp19_; #line 127 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp23_ = iter; + _tmp19_ = iter; #line 127 "/home/jens/Source/shotwell/src/Properties.vala" - properties_get_multiple_properties (self, _tmp23_); -#line 1687 "Properties.c" + properties_get_multiple_properties (self, _tmp19_); +#line 1699 "Properties.c" } #line 103 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (iter); #line 103 "/home/jens/Source/shotwell/src/Properties.vala" _data_collection_unref0 (view); -#line 1693 "Properties.c" +#line 1705 "Properties.c" } -void properties_get_properties (Properties* self, Page* current_page) { +void +properties_get_properties (Properties* self, + Page* current_page) +{ #line 103 "/home/jens/Source/shotwell/src/Properties.vala" g_return_if_fail (IS_PROPERTIES (self)); #line 103 "/home/jens/Source/shotwell/src/Properties.vala" PROPERTIES_GET_CLASS (self)->get_properties (self, current_page); -#line 1702 "Properties.c" +#line 1717 "Properties.c" } -static void properties_real_clear_properties (Properties* self) { +static void +properties_real_clear_properties (Properties* self) +{ GList* _tmp0_; #line 132 "/home/jens/Source/shotwell/src/Properties.vala" _tmp0_ = gtk_container_get_children (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer)); -#line 1710 "Properties.c" +#line 1727 "Properties.c" { GList* child_collection = NULL; GList* child_it = NULL; @@ -1714,14 +1731,14 @@ static void properties_real_clear_properties (Properties* self) { child_collection = _tmp0_; #line 132 "/home/jens/Source/shotwell/src/Properties.vala" for (child_it = child_collection; child_it != NULL; child_it = child_it->next) { -#line 1718 "Properties.c" +#line 1735 "Properties.c" GtkWidget* _tmp1_; GtkWidget* child = NULL; #line 132 "/home/jens/Source/shotwell/src/Properties.vala" _tmp1_ = _g_object_ref0 ((GtkWidget*) child_it->data); #line 132 "/home/jens/Source/shotwell/src/Properties.vala" child = _tmp1_; -#line 1725 "Properties.c" +#line 1742 "Properties.c" { GtkWidget* _tmp2_; #line 133 "/home/jens/Source/shotwell/src/Properties.vala" @@ -1730,30 +1747,34 @@ static void properties_real_clear_properties (Properties* self) { gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), _tmp2_); #line 132 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (child); -#line 1734 "Properties.c" +#line 1751 "Properties.c" } } #line 132 "/home/jens/Source/shotwell/src/Properties.vala" _g_list_free0 (child_collection); -#line 1739 "Properties.c" +#line 1756 "Properties.c" } #line 135 "/home/jens/Source/shotwell/src/Properties.vala" self->priv->line_count = (guint) 0; -#line 1743 "Properties.c" +#line 1760 "Properties.c" } -void properties_clear_properties (Properties* self) { +void +properties_clear_properties (Properties* self) +{ #line 131 "/home/jens/Source/shotwell/src/Properties.vala" g_return_if_fail (IS_PROPERTIES (self)); #line 131 "/home/jens/Source/shotwell/src/Properties.vala" PROPERTIES_GET_CLASS (self)->clear_properties (self); -#line 1752 "Properties.c" +#line 1771 "Properties.c" } -void properties_update_properties (Properties* self, Page* page) { - Page* _tmp0_; +void +properties_update_properties (Properties* self, + Page* page) +{ #line 138 "/home/jens/Source/shotwell/src/Properties.vala" g_return_if_fail (IS_PROPERTIES (self)); #line 138 "/home/jens/Source/shotwell/src/Properties.vala" @@ -1761,43 +1782,46 @@ void properties_update_properties (Properties* self, Page* page) { #line 139 "/home/jens/Source/shotwell/src/Properties.vala" properties_clear_properties (self); #line 140 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp0_ = page; -#line 140 "/home/jens/Source/shotwell/src/Properties.vala" - properties_internal_update_properties (self, _tmp0_); + properties_internal_update_properties (self, page); #line 141 "/home/jens/Source/shotwell/src/Properties.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 1770 "Properties.c" +#line 1789 "Properties.c" } -static void properties_real_internal_update_properties (Properties* self, Page* page) { - Page* _tmp0_; +static void +properties_real_internal_update_properties (Properties* self, + Page* page) +{ #line 144 "/home/jens/Source/shotwell/src/Properties.vala" g_return_if_fail (IS_PAGE (page)); #line 145 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp0_ = page; -#line 145 "/home/jens/Source/shotwell/src/Properties.vala" - properties_get_properties (self, _tmp0_); -#line 1782 "Properties.c" + properties_get_properties (self, page); +#line 1801 "Properties.c" } -void properties_internal_update_properties (Properties* self, Page* page) { +void +properties_internal_update_properties (Properties* self, + Page* page) +{ #line 144 "/home/jens/Source/shotwell/src/Properties.vala" g_return_if_fail (IS_PROPERTIES (self)); #line 144 "/home/jens/Source/shotwell/src/Properties.vala" PROPERTIES_GET_CLASS (self)->internal_update_properties (self, page); -#line 1791 "Properties.c" +#line 1813 "Properties.c" } -void properties_unselect_text (Properties* self) { +void +properties_unselect_text (Properties* self) +{ GList* _tmp0_; #line 148 "/home/jens/Source/shotwell/src/Properties.vala" g_return_if_fail (IS_PROPERTIES (self)); #line 149 "/home/jens/Source/shotwell/src/Properties.vala" _tmp0_ = gtk_container_get_children (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer)); -#line 1801 "Properties.c" +#line 1825 "Properties.c" { GList* child_collection = NULL; GList* child_it = NULL; @@ -1805,41 +1829,43 @@ void properties_unselect_text (Properties* self) { child_collection = _tmp0_; #line 149 "/home/jens/Source/shotwell/src/Properties.vala" for (child_it = child_collection; child_it != NULL; child_it = child_it->next) { -#line 1809 "Properties.c" +#line 1833 "Properties.c" GtkWidget* _tmp1_; GtkWidget* child = NULL; #line 149 "/home/jens/Source/shotwell/src/Properties.vala" _tmp1_ = _g_object_ref0 ((GtkWidget*) child_it->data); #line 149 "/home/jens/Source/shotwell/src/Properties.vala" child = _tmp1_; -#line 1816 "Properties.c" +#line 1840 "Properties.c" { GtkWidget* _tmp2_; #line 150 "/home/jens/Source/shotwell/src/Properties.vala" _tmp2_ = child; #line 150 "/home/jens/Source/shotwell/src/Properties.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_label_get_type ())) { -#line 1823 "Properties.c" +#line 1847 "Properties.c" GtkWidget* _tmp3_; #line 151 "/home/jens/Source/shotwell/src/Properties.vala" _tmp3_ = child; #line 151 "/home/jens/Source/shotwell/src/Properties.vala" gtk_label_select_region (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_label_get_type (), GtkLabel), 0, 0); -#line 1829 "Properties.c" +#line 1853 "Properties.c" } #line 149 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (child); -#line 1833 "Properties.c" +#line 1857 "Properties.c" } } #line 149 "/home/jens/Source/shotwell/src/Properties.vala" _g_list_free0 (child_collection); -#line 1838 "Properties.c" +#line 1862 "Properties.c" } } -static void properties_class_init (PropertiesClass * klass) { +static void +properties_class_init (PropertiesClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/Properties.vala" properties_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/Properties.vala" @@ -1856,30 +1882,36 @@ static void properties_class_init (PropertiesClass * klass) { ((PropertiesClass *) klass)->internal_update_properties = (void (*) (Properties *, Page*)) properties_real_internal_update_properties; #line 7 "/home/jens/Source/shotwell/src/Properties.vala" G_OBJECT_CLASS (klass)->finalize = properties_finalize; -#line 1860 "Properties.c" +#line 1886 "Properties.c" } -static void properties_instance_init (Properties * self) { +static void +properties_instance_init (Properties * self) +{ #line 7 "/home/jens/Source/shotwell/src/Properties.vala" self->priv = PROPERTIES_GET_PRIVATE (self); #line 8 "/home/jens/Source/shotwell/src/Properties.vala" self->priv->line_count = (guint) 0; -#line 1869 "Properties.c" +#line 1897 "Properties.c" } -static void properties_finalize (GObject * obj) { +static void +properties_finalize (GObject * obj) +{ Properties * self; #line 7 "/home/jens/Source/shotwell/src/Properties.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROPERTIES, Properties); #line 7 "/home/jens/Source/shotwell/src/Properties.vala" G_OBJECT_CLASS (properties_parent_class)->finalize (obj); -#line 1879 "Properties.c" +#line 1909 "Properties.c" } -GType properties_get_type (void) { +GType +properties_get_type (void) +{ static volatile gsize properties_type_id__volatile = 0; if (g_once_init_enter (&properties_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PropertiesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) properties_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Properties), 0, (GInstanceInitFunc) properties_instance_init, NULL }; @@ -1891,24 +1923,30 @@ GType properties_get_type (void) { } -BasicProperties* basic_properties_construct (GType object_type) { +BasicProperties* +basic_properties_construct (GType object_type) +{ BasicProperties * self = NULL; #line 171 "/home/jens/Source/shotwell/src/Properties.vala" self = (BasicProperties*) properties_construct (object_type); #line 171 "/home/jens/Source/shotwell/src/Properties.vala" return self; -#line 1901 "Properties.c" +#line 1935 "Properties.c" } -BasicProperties* basic_properties_new (void) { +BasicProperties* +basic_properties_new (void) +{ #line 171 "/home/jens/Source/shotwell/src/Properties.vala" return basic_properties_construct (TYPE_BASIC_PROPERTIES); -#line 1908 "Properties.c" +#line 1944 "Properties.c" } -static void basic_properties_real_clear_properties (Properties* base) { +static void +basic_properties_real_clear_properties (Properties* base) +{ BasicProperties * self; gchar* _tmp0_; gchar* _tmp1_; @@ -1970,1054 +2008,975 @@ static void basic_properties_real_clear_properties (Properties* base) { _g_free0 (self->priv->raw_assoc); #line 188 "/home/jens/Source/shotwell/src/Properties.vala" self->priv->raw_assoc = _tmp5_; -#line 1974 "Properties.c" +#line 2012 "Properties.c" } -static gpointer _media_metadata_ref0 (gpointer self) { +static gpointer +_media_metadata_ref0 (gpointer self) +{ #line 203 "/home/jens/Source/shotwell/src/Properties.vala" return self ? media_metadata_ref (self) : NULL; -#line 1981 "Properties.c" +#line 2021 "Properties.c" } -static void basic_properties_real_get_single_properties (Properties* base, DataView* view) { +static void +basic_properties_real_get_single_properties (Properties* base, + DataView* view) +{ BasicProperties * self; - DataView* _tmp0_; DataSource* source = NULL; - DataView* _tmp1_; - DataSource* _tmp2_; - DataSource* _tmp3_; - gchar* _tmp4_; - gboolean _tmp5_ = FALSE; - DataSource* _tmp6_; + DataSource* _tmp0_; + DataSource* _tmp1_; + gchar* _tmp2_; + gboolean _tmp3_ = FALSE; + DataSource* _tmp4_; #line 191 "/home/jens/Source/shotwell/src/Properties.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BASIC_PROPERTIES, BasicProperties); #line 191 "/home/jens/Source/shotwell/src/Properties.vala" g_return_if_fail (IS_DATA_VIEW (view)); #line 192 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp0_ = view; -#line 192 "/home/jens/Source/shotwell/src/Properties.vala" - PROPERTIES_CLASS (basic_properties_parent_class)->get_single_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp0_); -#line 194 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp1_ = view; + PROPERTIES_CLASS (basic_properties_parent_class)->get_single_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), view); #line 194 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp2_ = data_view_get_source (_tmp1_); + _tmp0_ = data_view_get_source (view); #line 194 "/home/jens/Source/shotwell/src/Properties.vala" - source = _tmp2_; + source = _tmp0_; #line 196 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp3_ = source; + _tmp1_ = source; #line 196 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); + _tmp2_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); #line 196 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->title); #line 196 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->title = _tmp4_; + self->priv->title = _tmp2_; #line 198 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp6_ = source; + _tmp4_ = source; #line 198 "/home/jens/Source/shotwell/src/Properties.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_PHOTO_SOURCE)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_PHOTO_SOURCE)) { #line 198 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp5_ = TRUE; -#line 2023 "Properties.c" + _tmp3_ = TRUE; +#line 2060 "Properties.c" } else { - DataSource* _tmp7_; + DataSource* _tmp5_; #line 198 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp7_ = source; + _tmp5_ = source; #line 198 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_PHOTO_IMPORT_SOURCE); -#line 2030 "Properties.c" + _tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_PHOTO_IMPORT_SOURCE); +#line 2067 "Properties.c" } #line 198 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp5_) { -#line 2034 "Properties.c" - time_t _tmp8_ = 0; - DataSource* _tmp9_; - time_t _tmp14_; - PhotoMetadata* _tmp15_ = NULL; - DataSource* _tmp16_; + if (_tmp3_) { +#line 2071 "Properties.c" + time_t _tmp6_ = 0; + DataSource* _tmp7_; + time_t _tmp10_; + PhotoMetadata* _tmp11_ = NULL; + DataSource* _tmp12_; PhotoMetadata* metadata = NULL; - PhotoMetadata* _tmp21_; - PhotoMetadata* _tmp22_; - DataSource* _tmp47_; - gboolean _tmp50_ = FALSE; - DataSource* _tmp51_; + PhotoMetadata* _tmp17_; + PhotoMetadata* _tmp18_; + DataSource* _tmp42_; + gboolean _tmp45_ = FALSE; + DataSource* _tmp46_; #line 199 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp9_ = source; -#line 199 "/home/jens/Source/shotwell/src/Properties.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO_SOURCE)) { -#line 2050 "Properties.c" - DataSource* _tmp10_; - time_t _tmp11_; + _tmp7_ = source; #line 199 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp10_ = source; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_PHOTO_SOURCE)) { +#line 2087 "Properties.c" + DataSource* _tmp8_; #line 199 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp11_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_MEDIA_SOURCE, MediaSource)); + _tmp8_ = source; #line 199 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp8_ = _tmp11_; -#line 2059 "Properties.c" + _tmp6_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_MEDIA_SOURCE, MediaSource)); +#line 2093 "Properties.c" } else { - DataSource* _tmp12_; - time_t _tmp13_; + DataSource* _tmp9_; #line 200 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp12_ = source; + _tmp9_ = source; #line 200 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp13_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource), TYPE_IMPORT_SOURCE, ImportSource)); -#line 200 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp8_ = _tmp13_; -#line 2069 "Properties.c" + _tmp6_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource), TYPE_IMPORT_SOURCE, ImportSource)); +#line 2100 "Properties.c" } #line 199 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->start_time = _tmp8_; + self->priv->start_time = _tmp6_; #line 201 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp14_ = self->priv->start_time; + _tmp10_ = self->priv->start_time; #line 201 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->end_time = _tmp14_; + self->priv->end_time = _tmp10_; #line 203 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp16_ = source; + _tmp12_ = source; #line 203 "/home/jens/Source/shotwell/src/Properties.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_PHOTO_SOURCE)) { -#line 2081 "Properties.c" - DataSource* _tmp17_; - PhotoMetadata* _tmp18_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_PHOTO_SOURCE)) { +#line 2112 "Properties.c" + DataSource* _tmp13_; + PhotoMetadata* _tmp14_; #line 203 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp17_ = source; + _tmp13_ = source; #line 203 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp18_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO_SOURCE, PhotoSource)); + _tmp14_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO_SOURCE, PhotoSource)); #line 203 "/home/jens/Source/shotwell/src/Properties.vala" - _media_metadata_unref0 (_tmp15_); + _media_metadata_unref0 (_tmp11_); #line 203 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp15_ = _tmp18_; -#line 2092 "Properties.c" + _tmp11_ = _tmp14_; +#line 2123 "Properties.c" } else { - DataSource* _tmp19_; - PhotoMetadata* _tmp20_; + DataSource* _tmp15_; + PhotoMetadata* _tmp16_; #line 204 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp19_ = source; + _tmp15_ = source; #line 204 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp20_ = photo_import_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource)); + _tmp16_ = photo_import_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource)); #line 204 "/home/jens/Source/shotwell/src/Properties.vala" - _media_metadata_unref0 (_tmp15_); + _media_metadata_unref0 (_tmp11_); #line 204 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp15_ = _tmp20_; -#line 2104 "Properties.c" + _tmp11_ = _tmp16_; +#line 2135 "Properties.c" } #line 203 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp21_ = _media_metadata_ref0 (_tmp15_); + _tmp17_ = _media_metadata_ref0 (_tmp11_); #line 203 "/home/jens/Source/shotwell/src/Properties.vala" - metadata = _tmp21_; + metadata = _tmp17_; #line 206 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp22_ = metadata; + _tmp18_ = metadata; #line 206 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp22_ != NULL) { -#line 2114 "Properties.c" + if (_tmp18_ != NULL) { +#line 2145 "Properties.c" + PhotoMetadata* _tmp19_; + gchar* _tmp20_; + const gchar* _tmp21_; PhotoMetadata* _tmp23_; gchar* _tmp24_; const gchar* _tmp25_; PhotoMetadata* _tmp27_; gchar* _tmp28_; const gchar* _tmp29_; - PhotoMetadata* _tmp31_; - gchar* _tmp32_; - const gchar* _tmp33_; - Dimensions _tmp35_ = {0}; - PhotoMetadata* _tmp36_; - Dimensions* _tmp37_; - Dimensions* _tmp38_; - gboolean _tmp39_; + Dimensions _tmp31_ = {0}; + PhotoMetadata* _tmp32_; + Dimensions* _tmp33_; + Dimensions* _tmp34_; + gboolean _tmp35_; #line 207 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp23_ = metadata; + _tmp19_ = metadata; #line 207 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp24_ = photo_metadata_get_exposure_string (_tmp23_); + _tmp20_ = photo_metadata_get_exposure_string (_tmp19_); #line 207 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->exposure); #line 207 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->exposure = _tmp24_; + self->priv->exposure = _tmp20_; #line 208 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp25_ = self->priv->exposure; + _tmp21_ = self->priv->exposure; #line 208 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp25_ == NULL) { -#line 2141 "Properties.c" - gchar* _tmp26_; + if (_tmp21_ == NULL) { +#line 2172 "Properties.c" + gchar* _tmp22_; #line 209 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp26_ = g_strdup (""); + _tmp22_ = g_strdup (""); #line 209 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->exposure); #line 209 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->exposure = _tmp26_; -#line 2149 "Properties.c" + self->priv->exposure = _tmp22_; +#line 2180 "Properties.c" } #line 211 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp27_ = metadata; + _tmp23_ = metadata; #line 211 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp28_ = photo_metadata_get_aperture_string (_tmp27_, TRUE); + _tmp24_ = photo_metadata_get_aperture_string (_tmp23_, TRUE); #line 211 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->aperture); #line 211 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->aperture = _tmp28_; + self->priv->aperture = _tmp24_; #line 212 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp29_ = self->priv->aperture; + _tmp25_ = self->priv->aperture; #line 212 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp29_ == NULL) { -#line 2163 "Properties.c" - gchar* _tmp30_; + if (_tmp25_ == NULL) { +#line 2194 "Properties.c" + gchar* _tmp26_; #line 213 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp30_ = g_strdup (""); + _tmp26_ = g_strdup (""); #line 213 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->aperture); #line 213 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->aperture = _tmp30_; -#line 2171 "Properties.c" + self->priv->aperture = _tmp26_; +#line 2202 "Properties.c" } #line 215 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp31_ = metadata; + _tmp27_ = metadata; #line 215 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp32_ = photo_metadata_get_iso_string (_tmp31_); + _tmp28_ = photo_metadata_get_iso_string (_tmp27_); #line 215 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->iso); #line 215 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->iso = _tmp32_; + self->priv->iso = _tmp28_; #line 216 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp33_ = self->priv->iso; + _tmp29_ = self->priv->iso; #line 216 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp33_ == NULL) { -#line 2185 "Properties.c" - gchar* _tmp34_; + if (_tmp29_ == NULL) { +#line 2216 "Properties.c" + gchar* _tmp30_; #line 217 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp34_ = g_strdup (""); + _tmp30_ = g_strdup (""); #line 217 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->iso); #line 217 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->iso = _tmp34_; -#line 2193 "Properties.c" + self->priv->iso = _tmp30_; +#line 2224 "Properties.c" } #line 219 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp36_ = metadata; + _tmp32_ = metadata; #line 219 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp37_ = photo_metadata_get_pixel_dimensions (_tmp36_); + _tmp33_ = photo_metadata_get_pixel_dimensions (_tmp32_); #line 219 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp38_ = _tmp37_; + _tmp34_ = _tmp33_; #line 219 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp39_ = _tmp38_ != NULL; + _tmp35_ = _tmp34_ != NULL; #line 219 "/home/jens/Source/shotwell/src/Properties.vala" - _dimensions_free0 (_tmp38_); + _dimensions_free0 (_tmp34_); #line 219 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp39_) { -#line 2207 "Properties.c" - PhotoMetadata* _tmp40_; - Orientation _tmp41_; - PhotoMetadata* _tmp42_; - Dimensions* _tmp43_; - Dimensions* _tmp44_; - Dimensions _tmp45_; - Dimensions _tmp46_ = {0}; -#line 220 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp40_ = metadata; + if (_tmp35_) { +#line 2238 "Properties.c" + PhotoMetadata* _tmp36_; + PhotoMetadata* _tmp37_; + Dimensions* _tmp38_; + Dimensions* _tmp39_; + Dimensions _tmp40_; + Dimensions _tmp41_ = {0}; #line 220 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp41_ = photo_metadata_get_orientation (_tmp40_); + _tmp36_ = metadata; #line 220 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp42_ = metadata; + _tmp37_ = metadata; #line 220 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp43_ = photo_metadata_get_pixel_dimensions (_tmp42_); + _tmp38_ = photo_metadata_get_pixel_dimensions (_tmp37_); #line 220 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp44_ = _tmp43_; + _tmp39_ = _tmp38_; #line 220 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp45_ = *_tmp44_; + _tmp40_ = *_tmp39_; #line 220 "/home/jens/Source/shotwell/src/Properties.vala" - orientation_rotate_dimensions (_tmp41_, &_tmp45_, &_tmp46_); + orientation_rotate_dimensions (photo_metadata_get_orientation (_tmp36_), &_tmp40_, &_tmp41_); #line 220 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp35_ = _tmp46_; + _tmp31_ = _tmp41_; #line 220 "/home/jens/Source/shotwell/src/Properties.vala" - _dimensions_free0 (_tmp44_); -#line 2233 "Properties.c" + _dimensions_free0 (_tmp39_); +#line 2261 "Properties.c" } else { #line 221 "/home/jens/Source/shotwell/src/Properties.vala" - dimensions_init (&_tmp35_, 0, 0); -#line 2237 "Properties.c" + dimensions_init (&_tmp31_, 0, 0); +#line 2265 "Properties.c" } #line 219 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->dimensions = _tmp35_; -#line 2241 "Properties.c" + self->priv->dimensions = _tmp31_; +#line 2269 "Properties.c" } #line 224 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp47_ = source; + _tmp42_ = source; #line 224 "/home/jens/Source/shotwell/src/Properties.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp47_, TYPE_PHOTO_SOURCE)) { -#line 2247 "Properties.c" - DataSource* _tmp48_; - Dimensions _tmp49_ = {0}; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, TYPE_PHOTO_SOURCE)) { +#line 2275 "Properties.c" + DataSource* _tmp43_; + Dimensions _tmp44_ = {0}; #line 225 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp48_ = source; + _tmp43_ = source; #line 225 "/home/jens/Source/shotwell/src/Properties.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp49_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp44_); #line 225 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->dimensions = _tmp49_; -#line 2256 "Properties.c" + self->priv->dimensions = _tmp44_; +#line 2284 "Properties.c" } #line 227 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp51_ = source; -#line 227 "/home/jens/Source/shotwell/src/Properties.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp51_, TYPE_PHOTO)) { -#line 2262 "Properties.c" - DataSource* _tmp52_; - PhotoFileFormat _tmp53_; + _tmp46_ = source; #line 227 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp52_ = source; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp46_, TYPE_PHOTO)) { +#line 2290 "Properties.c" + DataSource* _tmp47_; #line 227 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp53_ = photo_get_master_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_PHOTO, Photo)); + _tmp47_ = source; #line 227 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp50_ = _tmp53_ == PHOTO_FILE_FORMAT_RAW; -#line 2271 "Properties.c" + _tmp45_ = photo_get_master_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO, Photo)) == PHOTO_FILE_FORMAT_RAW; +#line 2296 "Properties.c" } else { #line 227 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp50_ = FALSE; -#line 2275 "Properties.c" + _tmp45_ = FALSE; +#line 2300 "Properties.c" } #line 227 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp50_) { -#line 2279 "Properties.c" + if (_tmp45_) { +#line 2304 "Properties.c" Photo* photo = NULL; - DataSource* _tmp54_; - Photo* _tmp55_; - Photo* _tmp56_; - RawDeveloper _tmp57_; - gchar* _tmp58_; - const gchar* _tmp59_ = NULL; - Photo* _tmp60_; - gboolean _tmp61_; - gchar* _tmp62_; + DataSource* _tmp48_; + Photo* _tmp49_; + Photo* _tmp50_; + gchar* _tmp51_; + const gchar* _tmp52_ = NULL; + Photo* _tmp53_; + gchar* _tmp54_; #line 228 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp54_ = source; + _tmp48_ = source; #line 228 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp55_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp54_, TYPE_PHOTO) ? ((Photo*) _tmp54_) : NULL); + _tmp49_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp48_, TYPE_PHOTO) ? ((Photo*) _tmp48_) : NULL); #line 228 "/home/jens/Source/shotwell/src/Properties.vala" - photo = _tmp55_; + photo = _tmp49_; #line 229 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp56_ = photo; + _tmp50_ = photo; #line 229 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp57_ = photo_get_raw_developer (_tmp56_); -#line 229 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp58_ = raw_developer_get_label (_tmp57_); + _tmp51_ = raw_developer_get_label (photo_get_raw_developer (_tmp50_)); #line 229 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->raw_developer); #line 229 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->raw_developer = _tmp58_; -#line 230 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp60_ = photo; + self->priv->raw_developer = _tmp51_; #line 230 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp61_ = photo_is_raw_developer_available (_tmp60_, RAW_DEVELOPER_CAMERA); + _tmp53_ = photo; #line 230 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp61_) { + if (photo_is_raw_developer_available (_tmp53_, RAW_DEVELOPER_CAMERA)) { #line 230 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp59_ = _ ("RAW+JPEG"); -#line 2314 "Properties.c" + _tmp52_ = _ ("RAW+JPEG"); +#line 2333 "Properties.c" } else { #line 230 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp59_ = ""; -#line 2318 "Properties.c" + _tmp52_ = ""; +#line 2337 "Properties.c" } #line 230 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp62_ = g_strdup (_tmp59_); + _tmp54_ = g_strdup (_tmp52_); #line 230 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->raw_assoc); #line 230 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->raw_assoc = _tmp62_; + self->priv->raw_assoc = _tmp54_; #line 227 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (photo); -#line 2328 "Properties.c" +#line 2347 "Properties.c" } #line 198 "/home/jens/Source/shotwell/src/Properties.vala" _media_metadata_unref0 (metadata); #line 198 "/home/jens/Source/shotwell/src/Properties.vala" - _media_metadata_unref0 (_tmp15_); -#line 2334 "Properties.c" + _media_metadata_unref0 (_tmp11_); +#line 2353 "Properties.c" } else { - DataSource* _tmp63_; + DataSource* _tmp55_; #line 232 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp63_ = source; + _tmp55_ = source; #line 232 "/home/jens/Source/shotwell/src/Properties.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp63_, TYPE_EVENT_SOURCE)) { -#line 2341 "Properties.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp55_, TYPE_EVENT_SOURCE)) { +#line 2360 "Properties.c" EventSource* event_source = NULL; - DataSource* _tmp64_; - EventSource* _tmp65_; - EventSource* _tmp66_; - time_t _tmp67_; - EventSource* _tmp68_; - time_t _tmp69_; + DataSource* _tmp56_; + EventSource* _tmp57_; + EventSource* _tmp58_; + EventSource* _tmp59_; gint event_photo_count = 0; gint event_video_count = 0; - EventSource* _tmp70_; - GeeCollection* _tmp71_; - GeeCollection* _tmp72_; - gint _tmp73_ = 0; - gint _tmp74_ = 0; - gint _tmp75_; - gint _tmp76_; + EventSource* _tmp60_; + GeeCollection* _tmp61_; + GeeCollection* _tmp62_; + gint _tmp63_ = 0; + gint _tmp64_ = 0; + gint _tmp65_; + gint _tmp66_; #line 233 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp64_ = source; + _tmp56_ = source; #line 233 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp65_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_EVENT_SOURCE, EventSource)); + _tmp57_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_EVENT_SOURCE, EventSource)); #line 233 "/home/jens/Source/shotwell/src/Properties.vala" - event_source = _tmp65_; -#line 235 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp66_ = event_source; + event_source = _tmp57_; #line 235 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp67_ = event_source_get_start_time (_tmp66_); + _tmp58_ = event_source; #line 235 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->start_time = _tmp67_; -#line 236 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp68_ = event_source; + self->priv->start_time = event_source_get_start_time (_tmp58_); #line 236 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp69_ = event_source_get_end_time (_tmp68_); + _tmp59_ = event_source; #line 236 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->end_time = _tmp69_; + self->priv->end_time = event_source_get_end_time (_tmp59_); #line 240 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp70_ = event_source; + _tmp60_ = event_source; #line 240 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp71_ = event_source_get_media (_tmp70_); + _tmp61_ = event_source_get_media (_tmp60_); #line 240 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp72_ = _tmp71_; + _tmp62_ = _tmp61_; #line 240 "/home/jens/Source/shotwell/src/Properties.vala" - media_source_collection_count_media (_tmp72_, &_tmp73_, &_tmp74_); + media_source_collection_count_media (_tmp62_, &_tmp63_, &_tmp64_); #line 240 "/home/jens/Source/shotwell/src/Properties.vala" - event_photo_count = _tmp73_; + event_photo_count = _tmp63_; #line 240 "/home/jens/Source/shotwell/src/Properties.vala" - event_video_count = _tmp74_; + event_video_count = _tmp64_; #line 240 "/home/jens/Source/shotwell/src/Properties.vala" - _g_object_unref0 (_tmp72_); + _g_object_unref0 (_tmp62_); #line 243 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp75_ = event_photo_count; + _tmp65_ = event_photo_count; #line 243 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->photo_count = _tmp75_; + self->priv->photo_count = _tmp65_; #line 244 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp76_ = event_video_count; + _tmp66_ = event_video_count; #line 244 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->video_count = _tmp76_; + self->priv->video_count = _tmp66_; #line 232 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (event_source); -#line 2400 "Properties.c" +#line 2413 "Properties.c" } else { - gboolean _tmp77_ = FALSE; - DataSource* _tmp78_; + gboolean _tmp67_ = FALSE; + DataSource* _tmp68_; #line 245 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp78_ = source; + _tmp68_ = source; #line 245 "/home/jens/Source/shotwell/src/Properties.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp78_, TYPE_VIDEO_SOURCE)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp68_, TYPE_VIDEO_SOURCE)) { #line 245 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp77_ = TRUE; -#line 2410 "Properties.c" + _tmp67_ = TRUE; +#line 2423 "Properties.c" } else { - DataSource* _tmp79_; + DataSource* _tmp69_; #line 245 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp79_ = source; + _tmp69_ = source; #line 245 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp77_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, TYPE_VIDEO_IMPORT_SOURCE); -#line 2417 "Properties.c" + _tmp67_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp69_, TYPE_VIDEO_IMPORT_SOURCE); +#line 2430 "Properties.c" } #line 245 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp77_) { -#line 2421 "Properties.c" - DataSource* _tmp80_; - time_t _tmp93_; + if (_tmp67_) { +#line 2434 "Properties.c" + DataSource* _tmp70_; + time_t _tmp79_; #line 246 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp80_ = source; + _tmp70_ = source; #line 246 "/home/jens/Source/shotwell/src/Properties.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp80_, TYPE_VIDEO_SOURCE)) { -#line 2428 "Properties.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp70_, TYPE_VIDEO_SOURCE)) { +#line 2441 "Properties.c" Video* video = NULL; - DataSource* _tmp81_; - Video* _tmp82_; - Video* _tmp83_; - gdouble _tmp84_; - Video* _tmp85_; - gboolean _tmp86_; - Video* _tmp89_; - time_t _tmp90_; + DataSource* _tmp71_; + Video* _tmp72_; + Video* _tmp73_; + Video* _tmp74_; + Video* _tmp77_; #line 247 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp81_ = source; + _tmp71_ = source; #line 247 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp82_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, TYPE_VIDEO, Video)); + _tmp72_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, TYPE_VIDEO, Video)); #line 247 "/home/jens/Source/shotwell/src/Properties.vala" - video = _tmp82_; + video = _tmp72_; #line 248 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp83_ = video; + _tmp73_ = video; #line 248 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp84_ = video_get_clip_duration (_tmp83_); -#line 248 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->clip_duration = _tmp84_; -#line 250 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp85_ = video; + self->priv->clip_duration = video_get_clip_duration (_tmp73_); #line 250 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp86_ = video_get_is_interpretable (_tmp85_); + _tmp74_ = video; #line 250 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp86_) { -#line 2456 "Properties.c" - Video* _tmp87_; - Dimensions _tmp88_ = {0}; + if (video_get_is_interpretable (_tmp74_)) { +#line 2462 "Properties.c" + Video* _tmp75_; + Dimensions _tmp76_ = {0}; #line 251 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp87_ = video; + _tmp75_ = video; #line 251 "/home/jens/Source/shotwell/src/Properties.vala" - video_get_frame_dimensions (_tmp87_, &_tmp88_); + video_get_frame_dimensions (_tmp75_, &_tmp76_); #line 251 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->dimensions = _tmp88_; -#line 2465 "Properties.c" + self->priv->dimensions = _tmp76_; +#line 2471 "Properties.c" } #line 253 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp89_ = video; + _tmp77_ = video; #line 253 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp90_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp89_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 253 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->start_time = _tmp90_; + self->priv->start_time = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_MEDIA_SOURCE, MediaSource)); #line 246 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (video); -#line 2475 "Properties.c" +#line 2479 "Properties.c" } else { - DataSource* _tmp91_; - time_t _tmp92_; -#line 255 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp91_ = source; + DataSource* _tmp78_; #line 255 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp92_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource), TYPE_IMPORT_SOURCE, ImportSource)); + _tmp78_ = source; #line 255 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->start_time = _tmp92_; -#line 2485 "Properties.c" + self->priv->start_time = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource), TYPE_IMPORT_SOURCE, ImportSource)); +#line 2486 "Properties.c" } #line 257 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp93_ = self->priv->start_time; + _tmp79_ = self->priv->start_time; #line 257 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->end_time = _tmp93_; -#line 2491 "Properties.c" + self->priv->end_time = _tmp79_; +#line 2492 "Properties.c" } } } #line 191 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (source); -#line 2497 "Properties.c" +#line 2498 "Properties.c" } -static void basic_properties_real_get_multiple_properties (Properties* base, GeeIterable* iter) { +static void +basic_properties_real_get_multiple_properties (Properties* base, + GeeIterable* iter) +{ BasicProperties * self; - GeeIterable* _tmp0_; #line 261 "/home/jens/Source/shotwell/src/Properties.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BASIC_PROPERTIES, BasicProperties); #line 261 "/home/jens/Source/shotwell/src/Properties.vala" g_return_if_fail ((iter == NULL) || GEE_IS_ITERABLE (iter)); #line 262 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp0_ = iter; -#line 262 "/home/jens/Source/shotwell/src/Properties.vala" - PROPERTIES_CLASS (basic_properties_parent_class)->get_multiple_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp0_); + PROPERTIES_CLASS (basic_properties_parent_class)->get_multiple_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), iter); #line 264 "/home/jens/Source/shotwell/src/Properties.vala" self->priv->photo_count = 0; #line 265 "/home/jens/Source/shotwell/src/Properties.vala" self->priv->video_count = 0; -#line 2516 "Properties.c" +#line 2517 "Properties.c" { GeeIterator* _view_it = NULL; - GeeIterable* _tmp1_; - GeeIterator* _tmp2_; -#line 266 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp1_ = iter; + GeeIterator* _tmp0_; #line 266 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp2_ = gee_iterable_iterator (_tmp1_); + _tmp0_ = gee_iterable_iterator (iter); #line 266 "/home/jens/Source/shotwell/src/Properties.vala" - _view_it = _tmp2_; + _view_it = _tmp0_; #line 266 "/home/jens/Source/shotwell/src/Properties.vala" while (TRUE) { -#line 2529 "Properties.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 2527 "Properties.c" + GeeIterator* _tmp1_; DataView* view = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp2_; + gpointer _tmp3_; DataSource* source = NULL; - DataView* _tmp7_; - DataSource* _tmp8_; - gboolean _tmp9_ = FALSE; - DataSource* _tmp10_; + DataView* _tmp4_; + DataSource* _tmp5_; + gboolean _tmp6_ = FALSE; + DataSource* _tmp7_; #line 266 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp3_ = _view_it; + _tmp1_ = _view_it; #line 266 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp4_ = gee_iterator_next (_tmp3_); -#line 266 "/home/jens/Source/shotwell/src/Properties.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 266 "/home/jens/Source/shotwell/src/Properties.vala" break; -#line 2548 "Properties.c" +#line 2543 "Properties.c" } #line 266 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp5_ = _view_it; + _tmp2_ = _view_it; #line 266 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 266 "/home/jens/Source/shotwell/src/Properties.vala" - view = (DataView*) _tmp6_; + view = (DataView*) _tmp3_; #line 267 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp7_ = view; + _tmp4_ = view; #line 267 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp8_ = data_view_get_source (_tmp7_); + _tmp5_ = data_view_get_source (_tmp4_); #line 267 "/home/jens/Source/shotwell/src/Properties.vala" - source = _tmp8_; + source = _tmp5_; #line 269 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp10_ = source; + _tmp7_ = source; #line 269 "/home/jens/Source/shotwell/src/Properties.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_PHOTO_SOURCE)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_PHOTO_SOURCE)) { #line 269 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp9_ = TRUE; -#line 2568 "Properties.c" + _tmp6_ = TRUE; +#line 2563 "Properties.c" } else { - DataSource* _tmp11_; + DataSource* _tmp8_; #line 269 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp11_ = source; + _tmp8_ = source; #line 269 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_PHOTO_IMPORT_SOURCE); -#line 2575 "Properties.c" + _tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_PHOTO_IMPORT_SOURCE); +#line 2570 "Properties.c" } #line 269 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp9_) { -#line 2579 "Properties.c" - time_t _tmp12_ = 0; - DataSource* _tmp13_; + if (_tmp6_) { +#line 2574 "Properties.c" + time_t _tmp9_ = 0; + DataSource* _tmp10_; time_t exposure_time = 0; - time_t _tmp18_; - gint _tmp29_; + time_t _tmp13_; + gint _tmp24_; #line 270 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp13_ = source; + _tmp10_ = source; #line 270 "/home/jens/Source/shotwell/src/Properties.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_PHOTO_SOURCE)) { -#line 2589 "Properties.c" - DataSource* _tmp14_; - time_t _tmp15_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_PHOTO_SOURCE)) { +#line 2584 "Properties.c" + DataSource* _tmp11_; #line 271 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp14_ = source; + _tmp11_ = source; #line 271 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp15_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_MEDIA_SOURCE, MediaSource)); -#line 271 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp12_ = _tmp15_; -#line 2598 "Properties.c" + _tmp9_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_MEDIA_SOURCE, MediaSource)); +#line 2590 "Properties.c" } else { - DataSource* _tmp16_; - time_t _tmp17_; -#line 272 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp16_ = source; + DataSource* _tmp12_; #line 272 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp17_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource), TYPE_IMPORT_SOURCE, ImportSource)); + _tmp12_ = source; #line 272 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp12_ = _tmp17_; -#line 2608 "Properties.c" + _tmp9_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource), TYPE_IMPORT_SOURCE, ImportSource)); +#line 2597 "Properties.c" } #line 270 "/home/jens/Source/shotwell/src/Properties.vala" - exposure_time = _tmp12_; + exposure_time = _tmp9_; #line 274 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp18_ = exposure_time; + _tmp13_ = exposure_time; #line 274 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp18_ != ((time_t) 0)) { -#line 2616 "Properties.c" + if (_tmp13_ != ((time_t) 0)) { +#line 2605 "Properties.c" + gboolean _tmp14_ = FALSE; + time_t _tmp15_; gboolean _tmp19_ = FALSE; time_t _tmp20_; - gboolean _tmp24_ = FALSE; - time_t _tmp25_; #line 275 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp20_ = self->priv->start_time; + _tmp15_ = self->priv->start_time; #line 275 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp20_ == ((time_t) 0)) { + if (_tmp15_ == ((time_t) 0)) { #line 275 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp19_ = TRUE; -#line 2627 "Properties.c" + _tmp14_ = TRUE; +#line 2616 "Properties.c" } else { - time_t _tmp21_; - time_t _tmp22_; + time_t _tmp16_; + time_t _tmp17_; #line 275 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp21_ = exposure_time; + _tmp16_ = exposure_time; #line 275 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp22_ = self->priv->start_time; + _tmp17_ = self->priv->start_time; #line 275 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp19_ = _tmp21_ < _tmp22_; -#line 2637 "Properties.c" + _tmp14_ = _tmp16_ < _tmp17_; +#line 2626 "Properties.c" } #line 275 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp19_) { -#line 2641 "Properties.c" - time_t _tmp23_; + if (_tmp14_) { +#line 2630 "Properties.c" + time_t _tmp18_; #line 276 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp23_ = exposure_time; + _tmp18_ = exposure_time; #line 276 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->start_time = _tmp23_; -#line 2647 "Properties.c" + self->priv->start_time = _tmp18_; +#line 2636 "Properties.c" } #line 278 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp25_ = self->priv->end_time; + _tmp20_ = self->priv->end_time; #line 278 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp25_ == ((time_t) 0)) { + if (_tmp20_ == ((time_t) 0)) { #line 278 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp24_ = TRUE; -#line 2655 "Properties.c" + _tmp19_ = TRUE; +#line 2644 "Properties.c" } else { - time_t _tmp26_; - time_t _tmp27_; + time_t _tmp21_; + time_t _tmp22_; #line 278 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp26_ = exposure_time; + _tmp21_ = exposure_time; #line 278 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp27_ = self->priv->end_time; + _tmp22_ = self->priv->end_time; #line 278 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp24_ = _tmp26_ > _tmp27_; -#line 2665 "Properties.c" + _tmp19_ = _tmp21_ > _tmp22_; +#line 2654 "Properties.c" } #line 278 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp24_) { -#line 2669 "Properties.c" - time_t _tmp28_; + if (_tmp19_) { +#line 2658 "Properties.c" + time_t _tmp23_; #line 279 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp28_ = exposure_time; + _tmp23_ = exposure_time; #line 279 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->end_time = _tmp28_; -#line 2675 "Properties.c" + self->priv->end_time = _tmp23_; +#line 2664 "Properties.c" } } #line 282 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp29_ = self->priv->photo_count; + _tmp24_ = self->priv->photo_count; #line 282 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->photo_count = _tmp29_ + 1; -#line 2682 "Properties.c" + self->priv->photo_count = _tmp24_ + 1; +#line 2671 "Properties.c" } else { - DataSource* _tmp30_; + DataSource* _tmp25_; #line 283 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp30_ = source; + _tmp25_ = source; #line 283 "/home/jens/Source/shotwell/src/Properties.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_EVENT_SOURCE)) { -#line 2689 "Properties.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, TYPE_EVENT_SOURCE)) { +#line 2678 "Properties.c" EventSource* event_source = NULL; - DataSource* _tmp31_; - EventSource* _tmp32_; - gint _tmp33_; - gboolean _tmp34_ = FALSE; - gboolean _tmp35_ = FALSE; - time_t _tmp36_; - gboolean _tmp44_ = FALSE; - gboolean _tmp45_ = FALSE; - time_t _tmp46_; + DataSource* _tmp26_; + EventSource* _tmp27_; + gint _tmp28_; + gboolean _tmp29_ = FALSE; + gboolean _tmp30_ = FALSE; + time_t _tmp31_; + gboolean _tmp36_ = FALSE; + gboolean _tmp37_ = FALSE; + time_t _tmp38_; gint event_photo_count = 0; gint event_video_count = 0; - EventSource* _tmp61_; - GeeCollection* _tmp62_; - GeeCollection* _tmp63_; - gint _tmp64_ = 0; - gint _tmp65_ = 0; - gint _tmp66_; - gint _tmp67_; - gint _tmp68_; - gint _tmp69_; - gint _tmp70_; + EventSource* _tmp48_; + GeeCollection* _tmp49_; + GeeCollection* _tmp50_; + gint _tmp51_ = 0; + gint _tmp52_ = 0; + gint _tmp53_; + gint _tmp54_; + gint _tmp55_; + gint _tmp56_; + gint _tmp57_; #line 284 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp31_ = source; + _tmp26_ = source; #line 284 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_EVENT_SOURCE, EventSource)); + _tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_EVENT_SOURCE, EventSource)); #line 284 "/home/jens/Source/shotwell/src/Properties.vala" - event_source = _tmp32_; + event_source = _tmp27_; #line 286 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp33_ = self->priv->event_count; + _tmp28_ = self->priv->event_count; #line 286 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp33_ == -1) { + if (_tmp28_ == -1) { #line 287 "/home/jens/Source/shotwell/src/Properties.vala" self->priv->event_count = 0; -#line 2724 "Properties.c" +#line 2713 "Properties.c" } #line 289 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp36_ = self->priv->start_time; + _tmp31_ = self->priv->start_time; #line 289 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp36_ == ((time_t) 0)) { + if (_tmp31_ == ((time_t) 0)) { #line 289 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp35_ = TRUE; -#line 2732 "Properties.c" + _tmp30_ = TRUE; +#line 2721 "Properties.c" } else { - EventSource* _tmp37_; - time_t _tmp38_; - time_t _tmp39_; -#line 289 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp37_ = event_source; + EventSource* _tmp32_; + time_t _tmp33_; #line 289 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp38_ = event_source_get_start_time (_tmp37_); + _tmp32_ = event_source; #line 289 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp39_ = self->priv->start_time; + _tmp33_ = self->priv->start_time; #line 289 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp35_ = _tmp38_ < _tmp39_; -#line 2745 "Properties.c" + _tmp30_ = event_source_get_start_time (_tmp32_) < _tmp33_; +#line 2731 "Properties.c" } #line 289 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp35_) { -#line 2749 "Properties.c" - EventSource* _tmp40_; - time_t _tmp41_; + if (_tmp30_) { +#line 2735 "Properties.c" + EventSource* _tmp34_; #line 290 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp40_ = event_source; + _tmp34_ = event_source; #line 290 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp41_ = event_source_get_start_time (_tmp40_); -#line 290 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp34_ = _tmp41_ != ((time_t) 0); -#line 2758 "Properties.c" + _tmp29_ = event_source_get_start_time (_tmp34_) != ((time_t) 0); +#line 2741 "Properties.c" } else { #line 289 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp34_ = FALSE; -#line 2762 "Properties.c" + _tmp29_ = FALSE; +#line 2745 "Properties.c" } #line 289 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp34_) { -#line 2766 "Properties.c" - EventSource* _tmp42_; - time_t _tmp43_; -#line 291 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp42_ = event_source; + if (_tmp29_) { +#line 2749 "Properties.c" + EventSource* _tmp35_; #line 291 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp43_ = event_source_get_start_time (_tmp42_); + _tmp35_ = event_source; #line 291 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->start_time = _tmp43_; -#line 2775 "Properties.c" + self->priv->start_time = event_source_get_start_time (_tmp35_); +#line 2755 "Properties.c" } #line 293 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp46_ = self->priv->end_time; + _tmp38_ = self->priv->end_time; #line 293 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp46_ == ((time_t) 0)) { + if (_tmp38_ == ((time_t) 0)) { #line 293 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp45_ = TRUE; -#line 2783 "Properties.c" + _tmp37_ = TRUE; +#line 2763 "Properties.c" } else { - EventSource* _tmp47_; - time_t _tmp48_; - time_t _tmp49_; + EventSource* _tmp39_; + time_t _tmp40_; #line 293 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp47_ = event_source; + _tmp39_ = event_source; #line 293 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp48_ = event_source_get_end_time (_tmp47_); + _tmp40_ = self->priv->end_time; #line 293 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp49_ = self->priv->end_time; -#line 293 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp45_ = _tmp48_ > _tmp49_; -#line 2796 "Properties.c" + _tmp37_ = event_source_get_end_time (_tmp39_) > _tmp40_; +#line 2773 "Properties.c" } #line 293 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp45_) { -#line 2800 "Properties.c" - EventSource* _tmp50_; - time_t _tmp51_; -#line 294 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp50_ = event_source; + if (_tmp37_) { +#line 2777 "Properties.c" + EventSource* _tmp41_; #line 294 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp51_ = event_source_get_end_time (_tmp50_); + _tmp41_ = event_source; #line 294 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp44_ = _tmp51_ != ((time_t) 0); -#line 2809 "Properties.c" + _tmp36_ = event_source_get_end_time (_tmp41_) != ((time_t) 0); +#line 2783 "Properties.c" } else { #line 293 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp44_ = FALSE; -#line 2813 "Properties.c" + _tmp36_ = FALSE; +#line 2787 "Properties.c" } #line 293 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp44_) { -#line 2817 "Properties.c" - EventSource* _tmp52_; - time_t _tmp53_; -#line 295 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp52_ = event_source; + if (_tmp36_) { +#line 2791 "Properties.c" + EventSource* _tmp42_; #line 295 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp53_ = event_source_get_end_time (_tmp52_); + _tmp42_ = event_source; #line 295 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->end_time = _tmp53_; -#line 2826 "Properties.c" + self->priv->end_time = event_source_get_end_time (_tmp42_); +#line 2797 "Properties.c" } else { - gboolean _tmp54_ = FALSE; - time_t _tmp55_; + gboolean _tmp43_ = FALSE; + time_t _tmp44_; #line 296 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp55_ = self->priv->end_time; + _tmp44_ = self->priv->end_time; #line 296 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp55_ == ((time_t) 0)) { + if (_tmp44_ == ((time_t) 0)) { #line 296 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp54_ = TRUE; -#line 2836 "Properties.c" + _tmp43_ = TRUE; +#line 2807 "Properties.c" } else { - EventSource* _tmp56_; - time_t _tmp57_; - time_t _tmp58_; + EventSource* _tmp45_; + time_t _tmp46_; #line 296 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp56_ = event_source; + _tmp45_ = event_source; #line 296 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp57_ = event_source_get_start_time (_tmp56_); + _tmp46_ = self->priv->end_time; #line 296 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp58_ = self->priv->end_time; -#line 296 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp54_ = _tmp57_ > _tmp58_; -#line 2849 "Properties.c" + _tmp43_ = event_source_get_start_time (_tmp45_) > _tmp46_; +#line 2817 "Properties.c" } #line 296 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp54_) { -#line 2853 "Properties.c" - EventSource* _tmp59_; - time_t _tmp60_; -#line 297 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp59_ = event_source; + if (_tmp43_) { +#line 2821 "Properties.c" + EventSource* _tmp47_; #line 297 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp60_ = event_source_get_start_time (_tmp59_); + _tmp47_ = event_source; #line 297 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->end_time = _tmp60_; -#line 2862 "Properties.c" + self->priv->end_time = event_source_get_start_time (_tmp47_); +#line 2827 "Properties.c" } } #line 302 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp61_ = event_source; + _tmp48_ = event_source; #line 302 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp62_ = event_source_get_media (_tmp61_); + _tmp49_ = event_source_get_media (_tmp48_); #line 302 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp63_ = _tmp62_; + _tmp50_ = _tmp49_; #line 302 "/home/jens/Source/shotwell/src/Properties.vala" - media_source_collection_count_media (_tmp63_, &_tmp64_, &_tmp65_); + media_source_collection_count_media (_tmp50_, &_tmp51_, &_tmp52_); #line 302 "/home/jens/Source/shotwell/src/Properties.vala" - event_photo_count = _tmp64_; + event_photo_count = _tmp51_; #line 302 "/home/jens/Source/shotwell/src/Properties.vala" - event_video_count = _tmp65_; + event_video_count = _tmp52_; #line 302 "/home/jens/Source/shotwell/src/Properties.vala" - _g_object_unref0 (_tmp63_); + _g_object_unref0 (_tmp50_); #line 305 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp66_ = self->priv->photo_count; + _tmp53_ = self->priv->photo_count; #line 305 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp67_ = event_photo_count; + _tmp54_ = event_photo_count; #line 305 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->photo_count = _tmp66_ + _tmp67_; + self->priv->photo_count = _tmp53_ + _tmp54_; #line 306 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp68_ = self->priv->video_count; + _tmp55_ = self->priv->video_count; #line 306 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp69_ = event_video_count; + _tmp56_ = event_video_count; #line 306 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->video_count = _tmp68_ + _tmp69_; + self->priv->video_count = _tmp55_ + _tmp56_; #line 307 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp70_ = self->priv->event_count; + _tmp57_ = self->priv->event_count; #line 307 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->event_count = _tmp70_ + 1; + self->priv->event_count = _tmp57_ + 1; #line 283 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (event_source); -#line 2897 "Properties.c" +#line 2862 "Properties.c" } else { - gboolean _tmp71_ = FALSE; - DataSource* _tmp72_; + gboolean _tmp58_ = FALSE; + DataSource* _tmp59_; #line 308 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp72_ = source; + _tmp59_ = source; #line 308 "/home/jens/Source/shotwell/src/Properties.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp72_, TYPE_VIDEO_SOURCE)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp59_, TYPE_VIDEO_SOURCE)) { #line 308 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp71_ = TRUE; -#line 2907 "Properties.c" + _tmp58_ = TRUE; +#line 2872 "Properties.c" } else { - DataSource* _tmp73_; + DataSource* _tmp60_; #line 308 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp73_ = source; + _tmp60_ = source; #line 308 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp71_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp73_, TYPE_VIDEO_IMPORT_SOURCE); -#line 2914 "Properties.c" + _tmp58_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp60_, TYPE_VIDEO_IMPORT_SOURCE); +#line 2879 "Properties.c" } #line 308 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp71_) { -#line 2918 "Properties.c" - time_t _tmp74_ = 0; - DataSource* _tmp75_; + if (_tmp58_) { +#line 2883 "Properties.c" + time_t _tmp61_ = 0; + DataSource* _tmp62_; time_t exposure_time = 0; - time_t _tmp80_; - gint _tmp91_; + time_t _tmp65_; + gint _tmp76_; #line 309 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp75_ = source; + _tmp62_ = source; #line 309 "/home/jens/Source/shotwell/src/Properties.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, TYPE_VIDEO_SOURCE)) { -#line 2928 "Properties.c" - DataSource* _tmp76_; - time_t _tmp77_; -#line 310 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp76_ = source; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp62_, TYPE_VIDEO_SOURCE)) { +#line 2893 "Properties.c" + DataSource* _tmp63_; #line 310 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp77_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, TYPE_VIDEO_SOURCE, VideoSource), TYPE_MEDIA_SOURCE, MediaSource)); + _tmp63_ = source; #line 310 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp74_ = _tmp77_; -#line 2937 "Properties.c" + _tmp61_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_VIDEO_SOURCE, VideoSource), TYPE_MEDIA_SOURCE, MediaSource)); +#line 2899 "Properties.c" } else { - DataSource* _tmp78_; - time_t _tmp79_; + DataSource* _tmp64_; #line 311 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp78_ = source; + _tmp64_ = source; #line 311 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp79_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource), TYPE_IMPORT_SOURCE, ImportSource)); -#line 311 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp74_ = _tmp79_; -#line 2947 "Properties.c" + _tmp61_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource), TYPE_IMPORT_SOURCE, ImportSource)); +#line 2906 "Properties.c" } #line 309 "/home/jens/Source/shotwell/src/Properties.vala" - exposure_time = _tmp74_; + exposure_time = _tmp61_; #line 313 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp80_ = exposure_time; + _tmp65_ = exposure_time; #line 313 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp80_ != ((time_t) 0)) { -#line 2955 "Properties.c" - gboolean _tmp81_ = FALSE; - time_t _tmp82_; - gboolean _tmp86_ = FALSE; - time_t _tmp87_; + if (_tmp65_ != ((time_t) 0)) { +#line 2914 "Properties.c" + gboolean _tmp66_ = FALSE; + time_t _tmp67_; + gboolean _tmp71_ = FALSE; + time_t _tmp72_; #line 314 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp82_ = self->priv->start_time; + _tmp67_ = self->priv->start_time; #line 314 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp82_ == ((time_t) 0)) { + if (_tmp67_ == ((time_t) 0)) { #line 314 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp81_ = TRUE; -#line 2966 "Properties.c" + _tmp66_ = TRUE; +#line 2925 "Properties.c" } else { - time_t _tmp83_; - time_t _tmp84_; + time_t _tmp68_; + time_t _tmp69_; #line 314 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp83_ = exposure_time; + _tmp68_ = exposure_time; #line 314 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp84_ = self->priv->start_time; + _tmp69_ = self->priv->start_time; #line 314 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp81_ = _tmp83_ < _tmp84_; -#line 2976 "Properties.c" + _tmp66_ = _tmp68_ < _tmp69_; +#line 2935 "Properties.c" } #line 314 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp81_) { -#line 2980 "Properties.c" - time_t _tmp85_; + if (_tmp66_) { +#line 2939 "Properties.c" + time_t _tmp70_; #line 315 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp85_ = exposure_time; + _tmp70_ = exposure_time; #line 315 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->start_time = _tmp85_; -#line 2986 "Properties.c" + self->priv->start_time = _tmp70_; +#line 2945 "Properties.c" } #line 317 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp87_ = self->priv->end_time; + _tmp72_ = self->priv->end_time; #line 317 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp87_ == ((time_t) 0)) { + if (_tmp72_ == ((time_t) 0)) { #line 317 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp86_ = TRUE; -#line 2994 "Properties.c" + _tmp71_ = TRUE; +#line 2953 "Properties.c" } else { - time_t _tmp88_; - time_t _tmp89_; + time_t _tmp73_; + time_t _tmp74_; #line 317 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp88_ = exposure_time; + _tmp73_ = exposure_time; #line 317 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp89_ = self->priv->end_time; + _tmp74_ = self->priv->end_time; #line 317 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp86_ = _tmp88_ > _tmp89_; -#line 3004 "Properties.c" + _tmp71_ = _tmp73_ > _tmp74_; +#line 2963 "Properties.c" } #line 317 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp86_) { -#line 3008 "Properties.c" - time_t _tmp90_; + if (_tmp71_) { +#line 2967 "Properties.c" + time_t _tmp75_; #line 318 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp90_ = exposure_time; + _tmp75_ = exposure_time; #line 318 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->end_time = _tmp90_; -#line 3014 "Properties.c" + self->priv->end_time = _tmp75_; +#line 2973 "Properties.c" } } #line 321 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp91_ = self->priv->video_count; + _tmp76_ = self->priv->video_count; #line 321 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->video_count = _tmp91_ + 1; -#line 3021 "Properties.c" + self->priv->video_count = _tmp76_ + 1; +#line 2980 "Properties.c" } } } @@ -3025,255 +2984,247 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee _g_object_unref0 (source); #line 266 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (view); -#line 3029 "Properties.c" +#line 2988 "Properties.c" } #line 266 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (_view_it); -#line 3033 "Properties.c" +#line 2992 "Properties.c" } } -static void basic_properties_real_get_properties (Properties* base, Page* current_page) { +static void +basic_properties_real_get_properties (Properties* base, + Page* current_page) +{ BasicProperties * self; - Page* _tmp0_; - time_t _tmp1_; - time_t _tmp3_; + time_t _tmp0_; + time_t _tmp2_; #line 326 "/home/jens/Source/shotwell/src/Properties.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BASIC_PROPERTIES, BasicProperties); #line 326 "/home/jens/Source/shotwell/src/Properties.vala" g_return_if_fail (IS_PAGE (current_page)); #line 327 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp0_ = current_page; -#line 327 "/home/jens/Source/shotwell/src/Properties.vala" - PROPERTIES_CLASS (basic_properties_parent_class)->get_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp0_); + PROPERTIES_CLASS (basic_properties_parent_class)->get_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), current_page); #line 329 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp1_ = self->priv->end_time; + _tmp0_ = self->priv->end_time; #line 329 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp1_ == ((time_t) 0)) { -#line 3055 "Properties.c" - time_t _tmp2_; + if (_tmp0_ == ((time_t) 0)) { +#line 3014 "Properties.c" + time_t _tmp1_; #line 330 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp2_ = self->priv->start_time; + _tmp1_ = self->priv->start_time; #line 330 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->end_time = _tmp2_; -#line 3061 "Properties.c" + self->priv->end_time = _tmp1_; +#line 3020 "Properties.c" } #line 331 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp3_ = self->priv->start_time; + _tmp2_ = self->priv->start_time; #line 331 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp3_ == ((time_t) 0)) { -#line 3067 "Properties.c" - time_t _tmp4_; + if (_tmp2_ == ((time_t) 0)) { +#line 3026 "Properties.c" + time_t _tmp3_; #line 332 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp4_ = self->priv->end_time; + _tmp3_ = self->priv->end_time; #line 332 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->start_time = _tmp4_; -#line 3073 "Properties.c" + self->priv->start_time = _tmp3_; +#line 3032 "Properties.c" } } -static void basic_properties_real_internal_update_properties (Properties* base, Page* page) { +static void +basic_properties_real_internal_update_properties (Properties* base, + Page* page) +{ BasicProperties * self; - Page* _tmp0_; - gboolean _tmp1_ = FALSE; - const gchar* _tmp2_; - const gchar* _tmp8_; - gboolean _tmp12_ = FALSE; - gint _tmp13_; - time_t _tmp38_; - gboolean _tmp61_; - gdouble _tmp72_; - const gchar* _tmp76_; - const gchar* _tmp78_; - gboolean _tmp80_ = FALSE; - gboolean _tmp81_ = FALSE; - const gchar* _tmp82_; + gboolean _tmp0_ = FALSE; + const gchar* _tmp1_; + const gchar* _tmp5_; + gboolean _tmp9_ = FALSE; + gint _tmp10_; + time_t _tmp35_; + gdouble _tmp67_; + const gchar* _tmp71_; + const gchar* _tmp73_; + gboolean _tmp75_ = FALSE; + gboolean _tmp76_ = FALSE; + const gchar* _tmp77_; #line 335 "/home/jens/Source/shotwell/src/Properties.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BASIC_PROPERTIES, BasicProperties); #line 335 "/home/jens/Source/shotwell/src/Properties.vala" g_return_if_fail (IS_PAGE (page)); #line 336 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp0_ = page; -#line 336 "/home/jens/Source/shotwell/src/Properties.vala" - PROPERTIES_CLASS (basic_properties_parent_class)->internal_update_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp0_); + PROPERTIES_CLASS (basic_properties_parent_class)->internal_update_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), page); #line 339 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp2_ = self->priv->title; + _tmp1_ = self->priv->title; #line 339 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp2_, "") == 0) { -#line 3106 "Properties.c" - Page* _tmp3_; + if (g_strcmp0 (_tmp1_, "") == 0) { #line 339 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp3_ = page; -#line 339 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_TAG_PAGE); -#line 3112 "Properties.c" + _tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_TAG_PAGE); +#line 3066 "Properties.c" } else { #line 339 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp1_ = FALSE; -#line 3116 "Properties.c" + _tmp0_ = FALSE; +#line 3070 "Properties.c" } #line 339 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp1_) { -#line 3120 "Properties.c" - Page* _tmp4_; - Tag* _tmp5_; - Tag* _tmp6_; - gchar* _tmp7_; -#line 340 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp4_ = page; + if (_tmp0_) { +#line 3074 "Properties.c" + Tag* _tmp2_; + Tag* _tmp3_; + gchar* _tmp4_; #line 340 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp5_ = tag_page_get_tag (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_TAG_PAGE, TagPage)); + _tmp2_ = tag_page_get_tag (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_TAG_PAGE, TagPage)); #line 340 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 340 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp7_ = tag_get_user_visible_name (_tmp6_); + _tmp4_ = tag_get_user_visible_name (_tmp3_); #line 340 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->title); #line 340 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->title = _tmp7_; + self->priv->title = _tmp4_; #line 340 "/home/jens/Source/shotwell/src/Properties.vala" - _g_object_unref0 (_tmp6_); -#line 3139 "Properties.c" + _g_object_unref0 (_tmp3_); +#line 3090 "Properties.c" } #line 342 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp8_ = self->priv->title; + _tmp5_ = self->priv->title; #line 342 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp8_, "") != 0) { -#line 3145 "Properties.c" - const gchar* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; + if (g_strcmp0 (_tmp5_, "") != 0) { +#line 3096 "Properties.c" + const gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; #line 343 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp9_ = self->priv->title; + _tmp6_ = self->priv->title; #line 343 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp10_ = guarded_markup_escape_text (_tmp9_); + _tmp7_ = guarded_markup_escape_text (_tmp6_); #line 343 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 343 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Title:"), _tmp11_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Title:"), _tmp8_, FALSE); #line 343 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp11_); -#line 3159 "Properties.c" + _g_free0 (_tmp8_); +#line 3110 "Properties.c" } #line 345 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp13_ = self->priv->photo_count; + _tmp10_ = self->priv->photo_count; #line 345 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp13_ >= 0) { + if (_tmp10_ >= 0) { #line 345 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp12_ = TRUE; -#line 3167 "Properties.c" + _tmp9_ = TRUE; +#line 3118 "Properties.c" } else { - gint _tmp14_; + gint _tmp11_; #line 345 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp14_ = self->priv->video_count; + _tmp11_ = self->priv->video_count; #line 345 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp12_ = _tmp14_ >= 0; -#line 3174 "Properties.c" + _tmp9_ = _tmp11_ >= 0; +#line 3125 "Properties.c" } #line 345 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp12_) { -#line 3178 "Properties.c" + if (_tmp9_) { +#line 3129 "Properties.c" gchar* label = NULL; - gchar* _tmp15_; - gint _tmp16_; + gchar* _tmp12_; + gint _tmp13_; gchar* photo_num_string = NULL; + gint _tmp20_; + gint _tmp21_; + gchar* _tmp22_; + gchar* video_num_string = NULL; gint _tmp23_; gint _tmp24_; gchar* _tmp25_; - gchar* video_num_string = NULL; - gint _tmp26_; + gboolean _tmp26_ = FALSE; gint _tmp27_; - gchar* _tmp28_; - gboolean _tmp29_ = FALSE; - gint _tmp30_; - const gchar* _tmp34_; - const gchar* _tmp35_; - gint _tmp36_; + const gchar* _tmp31_; + const gchar* _tmp32_; + gint _tmp33_; #line 346 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp15_ = g_strdup (_ ("Items:")); + _tmp12_ = g_strdup (_ ("Items:")); #line 346 "/home/jens/Source/shotwell/src/Properties.vala" - label = _tmp15_; + label = _tmp12_; #line 348 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp16_ = self->priv->event_count; + _tmp13_ = self->priv->event_count; #line 348 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp16_ >= 0) { -#line 3203 "Properties.c" + if (_tmp13_ >= 0) { +#line 3154 "Properties.c" gchar* event_num_string = NULL; - gint _tmp17_; - gint _tmp18_; + gint _tmp14_; + gint _tmp15_; + gchar* _tmp16_; + const gchar* _tmp17_; + const gchar* _tmp18_; gchar* _tmp19_; - const gchar* _tmp20_; - const gchar* _tmp21_; - gchar* _tmp22_; #line 349 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp17_ = self->priv->event_count; + _tmp14_ = self->priv->event_count; #line 349 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp18_ = self->priv->event_count; + _tmp15_ = self->priv->event_count; #line 349 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp19_ = g_strdup_printf (ngettext ("%d Event", "%d Events", (gulong) _tmp17_), _tmp18_); + _tmp16_ = g_strdup_printf (ngettext ("%d Event", "%d Events", (gulong) _tmp14_), _tmp15_); #line 349 "/home/jens/Source/shotwell/src/Properties.vala" - event_num_string = _tmp19_; + event_num_string = _tmp16_; #line 352 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp20_ = label; + _tmp17_ = label; #line 352 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp21_ = event_num_string; + _tmp18_ = event_num_string; #line 352 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp20_, _tmp21_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp17_, _tmp18_, FALSE); #line 353 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp22_ = g_strdup (""); + _tmp19_ = g_strdup (""); #line 353 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (label); #line 353 "/home/jens/Source/shotwell/src/Properties.vala" - label = _tmp22_; + label = _tmp19_; #line 348 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (event_num_string); -#line 3233 "Properties.c" +#line 3184 "Properties.c" } #line 356 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp23_ = self->priv->photo_count; + _tmp20_ = self->priv->photo_count; #line 356 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp24_ = self->priv->photo_count; + _tmp21_ = self->priv->photo_count; #line 356 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp25_ = g_strdup_printf (ngettext ("%d Photo", "%d Photos", (gulong) _tmp23_), _tmp24_); + _tmp22_ = g_strdup_printf (ngettext ("%d Photo", "%d Photos", (gulong) _tmp20_), _tmp21_); #line 356 "/home/jens/Source/shotwell/src/Properties.vala" - photo_num_string = _tmp25_; + photo_num_string = _tmp22_; #line 358 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp26_ = self->priv->video_count; + _tmp23_ = self->priv->video_count; #line 358 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp27_ = self->priv->video_count; + _tmp24_ = self->priv->video_count; #line 358 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp28_ = g_strdup_printf (ngettext ("%d Video", "%d Videos", (gulong) _tmp26_), _tmp27_); + _tmp25_ = g_strdup_printf (ngettext ("%d Video", "%d Videos", (gulong) _tmp23_), _tmp24_); #line 358 "/home/jens/Source/shotwell/src/Properties.vala" - video_num_string = _tmp28_; + video_num_string = _tmp25_; #line 361 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp30_ = self->priv->photo_count; + _tmp27_ = self->priv->photo_count; #line 361 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp30_ == 0) { -#line 3255 "Properties.c" - gint _tmp31_; + if (_tmp27_ == 0) { +#line 3206 "Properties.c" + gint _tmp28_; #line 361 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp31_ = self->priv->video_count; + _tmp28_ = self->priv->video_count; #line 361 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp29_ = _tmp31_ > 0; -#line 3261 "Properties.c" + _tmp26_ = _tmp28_ > 0; +#line 3212 "Properties.c" } else { #line 361 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp29_ = FALSE; -#line 3265 "Properties.c" + _tmp26_ = FALSE; +#line 3216 "Properties.c" } #line 361 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp29_) { -#line 3269 "Properties.c" - const gchar* _tmp32_; - const gchar* _tmp33_; + if (_tmp26_) { +#line 3220 "Properties.c" + const gchar* _tmp29_; + const gchar* _tmp30_; #line 362 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp32_ = label; + _tmp29_ = label; #line 362 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp33_ = video_num_string; + _tmp30_ = video_num_string; #line 362 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp32_, _tmp33_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp29_, _tmp30_, FALSE); #line 363 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (video_num_string); #line 363 "/home/jens/Source/shotwell/src/Properties.vala" @@ -3282,25 +3233,25 @@ static void basic_properties_real_internal_update_properties (Properties* base, _g_free0 (label); #line 363 "/home/jens/Source/shotwell/src/Properties.vala" return; -#line 3286 "Properties.c" +#line 3237 "Properties.c" } #line 366 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp34_ = label; + _tmp31_ = label; #line 366 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp35_ = photo_num_string; + _tmp32_ = photo_num_string; #line 366 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp34_, _tmp35_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp31_, _tmp32_, FALSE); #line 368 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp36_ = self->priv->video_count; + _tmp33_ = self->priv->video_count; #line 368 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp36_ > 0) { -#line 3298 "Properties.c" - const gchar* _tmp37_; + if (_tmp33_ > 0) { +#line 3249 "Properties.c" + const gchar* _tmp34_; #line 369 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp37_ = video_num_string; + _tmp34_ = video_num_string; #line 369 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), "", _tmp37_, FALSE); -#line 3304 "Properties.c" + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), "", _tmp34_, FALSE); +#line 3255 "Properties.c" } #line 345 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (video_num_string); @@ -3308,115 +3259,115 @@ static void basic_properties_real_internal_update_properties (Properties* base, _g_free0 (photo_num_string); #line 345 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (label); -#line 3312 "Properties.c" +#line 3263 "Properties.c" } #line 372 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp38_ = self->priv->start_time; + _tmp35_ = self->priv->start_time; #line 372 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp38_ != ((time_t) 0)) { -#line 3318 "Properties.c" + if (_tmp35_ != ((time_t) 0)) { +#line 3269 "Properties.c" gchar* start_date = NULL; + time_t _tmp36_; + struct tm _tmp37_ = {0}; + gchar* _tmp38_; + gchar* start_time = NULL; time_t _tmp39_; struct tm _tmp40_ = {0}; gchar* _tmp41_; - gchar* start_time = NULL; + gchar* end_date = NULL; time_t _tmp42_; struct tm _tmp43_ = {0}; gchar* _tmp44_; - gchar* end_date = NULL; + gchar* end_time = NULL; time_t _tmp45_; struct tm _tmp46_ = {0}; gchar* _tmp47_; - gchar* end_time = NULL; - time_t _tmp48_; - struct tm _tmp49_ = {0}; - gchar* _tmp50_; - const gchar* _tmp51_; - const gchar* _tmp52_; + const gchar* _tmp48_; + const gchar* _tmp49_; #line 373 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp39_ = self->priv->start_time; + _tmp36_ = self->priv->start_time; #line 373 "/home/jens/Source/shotwell/src/Properties.vala" - g_time_local (_tmp39_, &_tmp40_); + g_time_local (_tmp36_, &_tmp37_); #line 373 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp41_ = properties_get_prettyprint_date (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp40_); + _tmp38_ = properties_get_prettyprint_date (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp37_); #line 373 "/home/jens/Source/shotwell/src/Properties.vala" - start_date = _tmp41_; + start_date = _tmp38_; #line 374 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp42_ = self->priv->start_time; + _tmp39_ = self->priv->start_time; #line 374 "/home/jens/Source/shotwell/src/Properties.vala" - g_time_local (_tmp42_, &_tmp43_); + g_time_local (_tmp39_, &_tmp40_); #line 374 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp44_ = properties_get_prettyprint_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp43_); + _tmp41_ = properties_get_prettyprint_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp40_); #line 374 "/home/jens/Source/shotwell/src/Properties.vala" - start_time = _tmp44_; + start_time = _tmp41_; #line 375 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp45_ = self->priv->end_time; + _tmp42_ = self->priv->end_time; #line 375 "/home/jens/Source/shotwell/src/Properties.vala" - g_time_local (_tmp45_, &_tmp46_); + g_time_local (_tmp42_, &_tmp43_); #line 375 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp47_ = properties_get_prettyprint_date (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp46_); + _tmp44_ = properties_get_prettyprint_date (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp43_); #line 375 "/home/jens/Source/shotwell/src/Properties.vala" - end_date = _tmp47_; + end_date = _tmp44_; #line 376 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp48_ = self->priv->end_time; + _tmp45_ = self->priv->end_time; #line 376 "/home/jens/Source/shotwell/src/Properties.vala" - g_time_local (_tmp48_, &_tmp49_); + g_time_local (_tmp45_, &_tmp46_); #line 376 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp50_ = properties_get_prettyprint_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp49_); + _tmp47_ = properties_get_prettyprint_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp46_); #line 376 "/home/jens/Source/shotwell/src/Properties.vala" - end_time = _tmp50_; + end_time = _tmp47_; #line 378 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp51_ = start_date; + _tmp48_ = start_date; #line 378 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp52_ = end_date; + _tmp49_ = end_date; #line 378 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp51_, _tmp52_) == 0) { -#line 3375 "Properties.c" - const gchar* _tmp53_; - const gchar* _tmp54_; - const gchar* _tmp55_; + if (g_strcmp0 (_tmp48_, _tmp49_) == 0) { +#line 3326 "Properties.c" + const gchar* _tmp50_; + const gchar* _tmp51_; + const gchar* _tmp52_; #line 380 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp53_ = start_date; + _tmp50_ = start_date; #line 380 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Date:"), _tmp53_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Date:"), _tmp50_, FALSE); #line 382 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp54_ = start_time; + _tmp51_ = start_time; #line 382 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp55_ = end_time; + _tmp52_ = end_time; #line 382 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp54_, _tmp55_) == 0) { -#line 3389 "Properties.c" - const gchar* _tmp56_; + if (g_strcmp0 (_tmp51_, _tmp52_) == 0) { +#line 3340 "Properties.c" + const gchar* _tmp53_; #line 384 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp56_ = start_time; + _tmp53_ = start_time; #line 384 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Time:"), _tmp56_, FALSE); -#line 3395 "Properties.c" + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Time:"), _tmp53_, FALSE); +#line 3346 "Properties.c" } else { - const gchar* _tmp57_; - const gchar* _tmp58_; + const gchar* _tmp54_; + const gchar* _tmp55_; #line 387 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp57_ = start_time; + _tmp54_ = start_time; #line 387 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("From:"), _tmp57_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("From:"), _tmp54_, FALSE); #line 388 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp58_ = end_time; + _tmp55_ = end_time; #line 388 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("To:"), _tmp58_, FALSE); -#line 3407 "Properties.c" + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("To:"), _tmp55_, FALSE); +#line 3358 "Properties.c" } } else { - const gchar* _tmp59_; - const gchar* _tmp60_; + const gchar* _tmp56_; + const gchar* _tmp57_; #line 392 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp59_ = start_date; + _tmp56_ = start_date; #line 392 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("From:"), _tmp59_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("From:"), _tmp56_, FALSE); #line 393 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp60_ = end_date; + _tmp57_ = end_date; #line 393 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("To:"), _tmp60_, FALSE); -#line 3420 "Properties.c" + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("To:"), _tmp57_, FALSE); +#line 3371 "Properties.c" } #line 372 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (end_time); @@ -3426,355 +3377,352 @@ static void basic_properties_real_internal_update_properties (Properties* base, _g_free0 (start_time); #line 372 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (start_date); -#line 3430 "Properties.c" +#line 3381 "Properties.c" } #line 397 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp61_ = dimensions_has_area (&self->priv->dimensions); -#line 397 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp61_) { -#line 3436 "Properties.c" + if (dimensions_has_area (&self->priv->dimensions)) { +#line 3385 "Properties.c" gchar* label = NULL; - gchar* _tmp62_; - gboolean _tmp63_; + gchar* _tmp58_; #line 398 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp62_ = g_strdup (_ ("Size:")); + _tmp58_ = g_strdup (_ ("Size:")); #line 398 "/home/jens/Source/shotwell/src/Properties.vala" - label = _tmp62_; + label = _tmp58_; #line 400 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp63_ = dimensions_has_area (&self->priv->dimensions); -#line 400 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp63_) { -#line 3448 "Properties.c" - const gchar* _tmp64_; - Dimensions _tmp65_; - gint _tmp66_; - Dimensions _tmp67_; - gint _tmp68_; - gchar* _tmp69_; - gchar* _tmp70_; - gchar* _tmp71_; + if (dimensions_has_area (&self->priv->dimensions)) { +#line 3394 "Properties.c" + const gchar* _tmp59_; + Dimensions _tmp60_; + gint _tmp61_; + Dimensions _tmp62_; + gint _tmp63_; + gchar* _tmp64_; + gchar* _tmp65_; + gchar* _tmp66_; #line 401 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp64_ = label; + _tmp59_ = label; #line 401 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp65_ = self->priv->dimensions; + _tmp60_ = self->priv->dimensions; #line 401 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp66_ = _tmp65_.width; + _tmp61_ = _tmp60_.width; #line 401 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp67_ = self->priv->dimensions; + _tmp62_ = self->priv->dimensions; #line 401 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp68_ = _tmp67_.height; + _tmp63_ = _tmp62_.height; #line 401 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp69_ = g_strdup_printf ("%d × %d", _tmp66_, _tmp68_); + _tmp64_ = g_strdup_printf ("%d × %d", _tmp61_, _tmp63_); #line 401 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp70_ = _tmp69_; + _tmp65_ = _tmp64_; #line 401 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp64_, _tmp70_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp59_, _tmp65_, FALSE); #line 401 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp70_); + _g_free0 (_tmp65_); #line 402 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp71_ = g_strdup (""); + _tmp66_ = g_strdup (""); #line 402 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (label); #line 402 "/home/jens/Source/shotwell/src/Properties.vala" - label = _tmp71_; -#line 3481 "Properties.c" + label = _tmp66_; +#line 3427 "Properties.c" } #line 397 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (label); -#line 3485 "Properties.c" +#line 3431 "Properties.c" } #line 406 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp72_ = self->priv->clip_duration; + _tmp67_ = self->priv->clip_duration; #line 406 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp72_ > 0.0) { -#line 3491 "Properties.c" - gdouble _tmp73_; - gchar* _tmp74_; - gchar* _tmp75_; + if (_tmp67_ > 0.0) { +#line 3437 "Properties.c" + gdouble _tmp68_; + gchar* _tmp69_; + gchar* _tmp70_; #line 407 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp73_ = self->priv->clip_duration; + _tmp68_ = self->priv->clip_duration; #line 407 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp74_ = g_strdup_printf (_ ("%.1f seconds"), _tmp73_); + _tmp69_ = g_strdup_printf (_ ("%.1f seconds"), _tmp68_); #line 407 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp75_ = _tmp74_; + _tmp70_ = _tmp69_; #line 407 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Duration:"), _tmp75_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Duration:"), _tmp70_, FALSE); #line 407 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp75_); -#line 3505 "Properties.c" + _g_free0 (_tmp70_); +#line 3451 "Properties.c" } #line 410 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp76_ = self->priv->raw_developer; + _tmp71_ = self->priv->raw_developer; #line 410 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp76_, "") != 0) { -#line 3511 "Properties.c" - const gchar* _tmp77_; + if (g_strcmp0 (_tmp71_, "") != 0) { +#line 3457 "Properties.c" + const gchar* _tmp72_; #line 411 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp77_ = self->priv->raw_developer; + _tmp72_ = self->priv->raw_developer; #line 411 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Developer:"), _tmp77_, FALSE); -#line 3517 "Properties.c" + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Developer:"), _tmp72_, FALSE); +#line 3463 "Properties.c" } #line 415 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp78_ = self->priv->raw_assoc; + _tmp73_ = self->priv->raw_assoc; #line 415 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp78_, "") != 0) { -#line 3523 "Properties.c" - const gchar* _tmp79_; + if (g_strcmp0 (_tmp73_, "") != 0) { +#line 3469 "Properties.c" + const gchar* _tmp74_; #line 416 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp79_ = self->priv->raw_assoc; + _tmp74_ = self->priv->raw_assoc; #line 416 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), "", _tmp79_, FALSE); -#line 3529 "Properties.c" + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), "", _tmp74_, FALSE); +#line 3475 "Properties.c" } #line 418 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp82_ = self->priv->exposure; + _tmp77_ = self->priv->exposure; #line 418 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp82_, "") != 0) { + if (g_strcmp0 (_tmp77_, "") != 0) { #line 418 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp81_ = TRUE; -#line 3537 "Properties.c" + _tmp76_ = TRUE; +#line 3483 "Properties.c" } else { - const gchar* _tmp83_; + const gchar* _tmp78_; #line 418 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp83_ = self->priv->aperture; + _tmp78_ = self->priv->aperture; #line 418 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp81_ = g_strcmp0 (_tmp83_, "") != 0; -#line 3544 "Properties.c" + _tmp76_ = g_strcmp0 (_tmp78_, "") != 0; +#line 3490 "Properties.c" } #line 418 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp81_) { + if (_tmp76_) { #line 418 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp80_ = TRUE; -#line 3550 "Properties.c" + _tmp75_ = TRUE; +#line 3496 "Properties.c" } else { - const gchar* _tmp84_; + const gchar* _tmp79_; #line 418 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp84_ = self->priv->iso; + _tmp79_ = self->priv->iso; #line 418 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp80_ = g_strcmp0 (_tmp84_, "") != 0; -#line 3557 "Properties.c" + _tmp75_ = g_strcmp0 (_tmp79_, "") != 0; +#line 3503 "Properties.c" } #line 418 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp80_) { -#line 3561 "Properties.c" + if (_tmp75_) { +#line 3507 "Properties.c" gchar* line = NULL; - const gchar* _tmp85_; - const gchar* _tmp88_; - gboolean _tmp97_ = FALSE; - gboolean _tmp98_ = FALSE; - const gchar* _tmp99_; + const gchar* _tmp80_; + const gchar* _tmp83_; + gboolean _tmp92_ = FALSE; + gboolean _tmp93_ = FALSE; + const gchar* _tmp94_; #line 419 "/home/jens/Source/shotwell/src/Properties.vala" line = NULL; #line 422 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp85_ = self->priv->exposure; + _tmp80_ = self->priv->exposure; #line 422 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp85_, "") != 0) { -#line 3574 "Properties.c" - const gchar* _tmp86_; - gchar* _tmp87_; + if (g_strcmp0 (_tmp80_, "") != 0) { +#line 3520 "Properties.c" + const gchar* _tmp81_; + gchar* _tmp82_; #line 423 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp86_ = self->priv->exposure; + _tmp81_ = self->priv->exposure; #line 423 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp87_ = g_strdup (_tmp86_); + _tmp82_ = g_strdup (_tmp81_); #line 423 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (line); #line 423 "/home/jens/Source/shotwell/src/Properties.vala" - line = _tmp87_; -#line 3585 "Properties.c" + line = _tmp82_; +#line 3531 "Properties.c" } #line 425 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp88_ = self->priv->aperture; + _tmp83_ = self->priv->aperture; #line 425 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp88_, "") != 0) { -#line 3591 "Properties.c" - const gchar* _tmp89_; + if (g_strcmp0 (_tmp83_, "") != 0) { +#line 3537 "Properties.c" + const gchar* _tmp84_; #line 426 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp89_ = line; + _tmp84_ = line; #line 426 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp89_ != NULL) { -#line 3597 "Properties.c" - const gchar* _tmp90_; - const gchar* _tmp91_; - gchar* _tmp92_; - gchar* _tmp93_; - gchar* _tmp94_; + if (_tmp84_ != NULL) { +#line 3543 "Properties.c" + const gchar* _tmp85_; + const gchar* _tmp86_; + gchar* _tmp87_; + gchar* _tmp88_; + gchar* _tmp89_; #line 427 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp90_ = line; + _tmp85_ = line; #line 427 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp91_ = self->priv->aperture; + _tmp86_ = self->priv->aperture; #line 427 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp92_ = g_strconcat (", ", _tmp91_, NULL); + _tmp87_ = g_strconcat (", ", _tmp86_, NULL); #line 427 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp93_ = _tmp92_; + _tmp88_ = _tmp87_; #line 427 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp94_ = g_strconcat (_tmp90_, _tmp93_, NULL); + _tmp89_ = g_strconcat (_tmp85_, _tmp88_, NULL); #line 427 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (line); #line 427 "/home/jens/Source/shotwell/src/Properties.vala" - line = _tmp94_; + line = _tmp89_; #line 427 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp93_); -#line 3619 "Properties.c" + _g_free0 (_tmp88_); +#line 3565 "Properties.c" } else { - const gchar* _tmp95_; - gchar* _tmp96_; + const gchar* _tmp90_; + gchar* _tmp91_; #line 429 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp95_ = self->priv->aperture; + _tmp90_ = self->priv->aperture; #line 429 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp96_ = g_strdup (_tmp95_); + _tmp91_ = g_strdup (_tmp90_); #line 429 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (line); #line 429 "/home/jens/Source/shotwell/src/Properties.vala" - line = _tmp96_; -#line 3631 "Properties.c" + line = _tmp91_; +#line 3577 "Properties.c" } } #line 433 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp99_ = self->priv->exposure; + _tmp94_ = self->priv->exposure; #line 433 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp99_, "") == 0) { + if (g_strcmp0 (_tmp94_, "") == 0) { #line 433 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp98_ = TRUE; -#line 3640 "Properties.c" + _tmp93_ = TRUE; +#line 3586 "Properties.c" } else { - const gchar* _tmp100_; + const gchar* _tmp95_; #line 433 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp100_ = self->priv->aperture; + _tmp95_ = self->priv->aperture; #line 433 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp98_ = g_strcmp0 (_tmp100_, "") == 0; -#line 3647 "Properties.c" + _tmp93_ = g_strcmp0 (_tmp95_, "") == 0; +#line 3593 "Properties.c" } #line 433 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp98_) { -#line 3651 "Properties.c" - const gchar* _tmp101_; + if (_tmp93_) { +#line 3597 "Properties.c" + const gchar* _tmp96_; #line 433 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp101_ = self->priv->iso; + _tmp96_ = self->priv->iso; #line 433 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp97_ = g_strcmp0 (_tmp101_, "") != 0; -#line 3657 "Properties.c" + _tmp92_ = g_strcmp0 (_tmp96_, "") != 0; +#line 3603 "Properties.c" } else { #line 433 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp97_ = FALSE; -#line 3661 "Properties.c" + _tmp92_ = FALSE; +#line 3607 "Properties.c" } #line 433 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp97_) { -#line 3665 "Properties.c" - const gchar* _tmp102_; - const gchar* _tmp110_; + if (_tmp92_) { +#line 3611 "Properties.c" + const gchar* _tmp97_; + const gchar* _tmp105_; #line 434 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp102_ = line; + _tmp97_ = line; #line 434 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp102_ != NULL) { -#line 3672 "Properties.c" - const gchar* _tmp103_; - const gchar* _tmp104_; - gchar* _tmp105_; - gchar* _tmp106_; - gchar* _tmp107_; + if (_tmp97_ != NULL) { +#line 3618 "Properties.c" + const gchar* _tmp98_; + const gchar* _tmp99_; + gchar* _tmp100_; + gchar* _tmp101_; + gchar* _tmp102_; #line 435 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp103_ = line; + _tmp98_ = line; #line 435 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp104_ = self->priv->iso; + _tmp99_ = self->priv->iso; #line 435 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp105_ = g_strconcat (", " "ISO ", _tmp104_, NULL); + _tmp100_ = g_strconcat (", " "ISO ", _tmp99_, NULL); #line 435 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp106_ = _tmp105_; + _tmp101_ = _tmp100_; #line 435 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp107_ = g_strconcat (_tmp103_, _tmp106_, NULL); + _tmp102_ = g_strconcat (_tmp98_, _tmp101_, NULL); #line 435 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (line); #line 435 "/home/jens/Source/shotwell/src/Properties.vala" - line = _tmp107_; + line = _tmp102_; #line 435 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp106_); -#line 3694 "Properties.c" + _g_free0 (_tmp101_); +#line 3640 "Properties.c" } else { - const gchar* _tmp108_; - gchar* _tmp109_; + const gchar* _tmp103_; + gchar* _tmp104_; #line 437 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp108_ = self->priv->iso; + _tmp103_ = self->priv->iso; #line 437 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp109_ = g_strconcat ("ISO ", _tmp108_, NULL); + _tmp104_ = g_strconcat ("ISO ", _tmp103_, NULL); #line 437 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (line); #line 437 "/home/jens/Source/shotwell/src/Properties.vala" - line = _tmp109_; -#line 3706 "Properties.c" + line = _tmp104_; +#line 3652 "Properties.c" } #line 439 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp110_ = line; + _tmp105_ = line; #line 439 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure:"), _tmp110_, FALSE); -#line 3712 "Properties.c" + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure:"), _tmp105_, FALSE); +#line 3658 "Properties.c" } else { - const gchar* _tmp111_; - const gchar* _tmp113_; + const gchar* _tmp106_; + const gchar* _tmp108_; #line 442 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp111_ = line; + _tmp106_ = line; #line 442 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp111_ != NULL) { -#line 3720 "Properties.c" - const gchar* _tmp112_; + if (_tmp106_ != NULL) { +#line 3666 "Properties.c" + const gchar* _tmp107_; #line 443 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp112_ = line; + _tmp107_ = line; #line 443 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure:"), _tmp112_, FALSE); -#line 3726 "Properties.c" + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure:"), _tmp107_, FALSE); +#line 3672 "Properties.c" } #line 446 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp113_ = self->priv->iso; + _tmp108_ = self->priv->iso; #line 446 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp113_, "") != 0) { -#line 3732 "Properties.c" - const gchar* _tmp114_; + if (g_strcmp0 (_tmp108_, "") != 0) { +#line 3678 "Properties.c" + const gchar* _tmp109_; #line 447 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp114_ = line; + _tmp109_ = line; #line 447 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp114_ != NULL) { -#line 3738 "Properties.c" - const gchar* _tmp115_; - gchar* _tmp116_; - gchar* _tmp117_; + if (_tmp109_ != NULL) { +#line 3684 "Properties.c" + const gchar* _tmp110_; + gchar* _tmp111_; + gchar* _tmp112_; #line 448 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp115_ = self->priv->iso; + _tmp110_ = self->priv->iso; #line 448 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp116_ = g_strconcat ("ISO ", _tmp115_, NULL); + _tmp111_ = g_strconcat ("ISO ", _tmp110_, NULL); #line 448 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp117_ = _tmp116_; + _tmp112_ = _tmp111_; #line 448 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), "", _tmp117_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), "", _tmp112_, FALSE); #line 448 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp117_); -#line 3752 "Properties.c" + _g_free0 (_tmp112_); +#line 3698 "Properties.c" } else { - const gchar* _tmp118_; - gchar* _tmp119_; - gchar* _tmp120_; + const gchar* _tmp113_; + gchar* _tmp114_; + gchar* _tmp115_; #line 450 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp118_ = self->priv->iso; + _tmp113_ = self->priv->iso; #line 450 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp119_ = g_strconcat ("ISO ", _tmp118_, NULL); + _tmp114_ = g_strconcat ("ISO ", _tmp113_, NULL); #line 450 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp120_ = _tmp119_; + _tmp115_ = _tmp114_; #line 450 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure:"), _tmp120_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure:"), _tmp115_, FALSE); #line 450 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp120_); -#line 3767 "Properties.c" + _g_free0 (_tmp115_); +#line 3713 "Properties.c" } } } #line 418 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (line); -#line 3773 "Properties.c" +#line 3719 "Properties.c" } } -static void basic_properties_class_init (BasicPropertiesClass * klass) { +static void +basic_properties_class_init (BasicPropertiesClass * klass) +{ #line 156 "/home/jens/Source/shotwell/src/Properties.vala" basic_properties_parent_class = g_type_class_peek_parent (klass); #line 156 "/home/jens/Source/shotwell/src/Properties.vala" @@ -3791,11 +3739,13 @@ static void basic_properties_class_init (BasicPropertiesClass * klass) { ((PropertiesClass *) klass)->internal_update_properties = (void (*) (Properties *, Page*)) basic_properties_real_internal_update_properties; #line 156 "/home/jens/Source/shotwell/src/Properties.vala" G_OBJECT_CLASS (klass)->finalize = basic_properties_finalize; -#line 3795 "Properties.c" +#line 3743 "Properties.c" } -static void basic_properties_instance_init (BasicProperties * self) { +static void +basic_properties_instance_init (BasicProperties * self) +{ time_t _tmp0_; time_t _tmp1_; #line 156 "/home/jens/Source/shotwell/src/Properties.vala" @@ -3808,11 +3758,13 @@ static void basic_properties_instance_init (BasicProperties * self) { _tmp1_ = time (NULL); #line 159 "/home/jens/Source/shotwell/src/Properties.vala" self->priv->end_time = _tmp1_; -#line 3812 "Properties.c" +#line 3762 "Properties.c" } -static void basic_properties_finalize (GObject * obj) { +static void +basic_properties_finalize (GObject * obj) +{ BasicProperties * self; #line 156 "/home/jens/Source/shotwell/src/Properties.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BASIC_PROPERTIES, BasicProperties); @@ -3830,11 +3782,13 @@ static void basic_properties_finalize (GObject * obj) { _g_free0 (self->priv->raw_assoc); #line 156 "/home/jens/Source/shotwell/src/Properties.vala" G_OBJECT_CLASS (basic_properties_parent_class)->finalize (obj); -#line 3834 "Properties.c" +#line 3786 "Properties.c" } -GType basic_properties_get_type (void) { +GType +basic_properties_get_type (void) +{ static volatile gsize basic_properties_type_id__volatile = 0; if (g_once_init_enter (&basic_properties_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (BasicPropertiesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) basic_properties_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (BasicProperties), 0, (GInstanceInitFunc) basic_properties_instance_init, NULL }; @@ -3846,19 +3800,26 @@ GType basic_properties_get_type (void) { } -static gboolean _gtk_widget_hide_on_delete_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) { +static gboolean +_gtk_widget_hide_on_delete_gtk_widget_delete_event (GtkWidget* _sender, + GdkEventAny* event, + gpointer self) +{ gboolean result; result = gtk_widget_hide_on_delete ((GtkWidget*) self); #line 647 "/home/jens/Source/shotwell/src/Properties.vala" return result; -#line 3855 "Properties.c" +#line 3813 "Properties.c" } -ExtendedPropertiesWindow* extended_properties_window_construct (GType object_type, GtkWindow* owner) { +ExtendedPropertiesWindow* +extended_properties_window_construct (GType object_type, + GtkWindow* owner) +{ ExtendedPropertiesWindow * self = NULL; - gint _tmp0_; - GtkWindow* _tmp1_; + ExtendedPropertiesWindowExtendedProperties* _tmp0_; + ExtendedPropertiesWindowExtendedProperties* _tmp1_; ExtendedPropertiesWindowExtendedProperties* _tmp2_; ExtendedPropertiesWindowExtendedProperties* _tmp3_; ExtendedPropertiesWindowExtendedProperties* _tmp4_; @@ -3866,16 +3827,12 @@ ExtendedPropertiesWindow* extended_properties_window_construct (GType object_typ ExtendedPropertiesWindowExtendedProperties* _tmp6_; ExtendedPropertiesWindowExtendedProperties* _tmp7_; ExtendedPropertiesWindowExtendedProperties* _tmp8_; - ExtendedPropertiesWindowExtendedProperties* _tmp9_; + GtkBox* _tmp9_; ExtendedPropertiesWindowExtendedProperties* _tmp10_; - GtkBox* _tmp11_; - ExtendedPropertiesWindowExtendedProperties* _tmp12_; #line 635 "/home/jens/Source/shotwell/src/Properties.vala" g_return_val_if_fail (GTK_IS_WINDOW (owner), NULL); #line 636 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp0_ = resources_use_header_bar (); -#line 636 "/home/jens/Source/shotwell/src/Properties.vala" - self = (ExtendedPropertiesWindow*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL); + self = (ExtendedPropertiesWindow*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL); #line 638 "/home/jens/Source/shotwell/src/Properties.vala" gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) (GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK)); #line 639 "/home/jens/Source/shotwell/src/Properties.vala" @@ -3889,200 +3846,180 @@ ExtendedPropertiesWindow* extended_properties_window_construct (GType object_typ #line 643 "/home/jens/Source/shotwell/src/Properties.vala" gtk_window_set_position (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GTK_WIN_POS_CENTER); #line 644 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp1_ = owner; -#line 644 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp1_); + gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), owner); #line 645 "/home/jens/Source/shotwell/src/Properties.vala" gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG); #line 647 "/home/jens/Source/shotwell/src/Properties.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _gtk_widget_hide_on_delete_gtk_widget_delete_event, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), 0); #line 649 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp2_ = extended_properties_window_extended_properties_new (); + _tmp0_ = extended_properties_window_extended_properties_new (); #line 649 "/home/jens/Source/shotwell/src/Properties.vala" - g_object_ref_sink (_tmp2_); + g_object_ref_sink (_tmp0_); #line 649 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (self->priv->properties); #line 649 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->properties = _tmp2_; + self->priv->properties = _tmp0_; #line 650 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp3_ = self->priv->properties; + _tmp1_ = self->priv->properties; #line 650 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL); + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL); #line 651 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp4_ = self->priv->properties; + _tmp2_ = self->priv->properties; #line 651 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL); + gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL); #line 652 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp5_ = self->priv->properties; + _tmp3_ = self->priv->properties; #line 652 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), TRUE); #line 653 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp6_ = self->priv->properties; + _tmp4_ = self->priv->properties; #line 653 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), TRUE); #line 654 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp7_ = self->priv->properties; + _tmp5_ = self->priv->properties; #line 654 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 3); + gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), 3); #line 655 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp8_ = self->priv->properties; + _tmp6_ = self->priv->properties; #line 655 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), 3); + gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), 3); #line 656 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp9_ = self->priv->properties; + _tmp7_ = self->priv->properties; #line 656 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), 3); + gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 3); #line 657 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp10_ = self->priv->properties; + _tmp8_ = self->priv->properties; #line 657 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 3); + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), 3); #line 658 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp11_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); + _tmp9_ = gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); #line 658 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp12_ = self->priv->properties; + _tmp10_ = self->priv->properties; #line 658 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget)); #line 635 "/home/jens/Source/shotwell/src/Properties.vala" return self; -#line 3948 "Properties.c" +#line 3903 "Properties.c" } -ExtendedPropertiesWindow* extended_properties_window_new (GtkWindow* owner) { +ExtendedPropertiesWindow* +extended_properties_window_new (GtkWindow* owner) +{ #line 635 "/home/jens/Source/shotwell/src/Properties.vala" return extended_properties_window_construct (TYPE_EXTENDED_PROPERTIES_WINDOW, owner); -#line 3955 "Properties.c" +#line 3912 "Properties.c" } -static gboolean extended_properties_window_real_button_press_event (GtkWidget* base, GdkEventButton* event) { +static gboolean +extended_properties_window_real_button_press_event (GtkWidget* base, + GdkEventButton* event) +{ ExtendedPropertiesWindow * self; gboolean result = FALSE; - GdkEventButton* _tmp0_; - guint _tmp1_; - GdkEventButton* _tmp5_; - guint _tmp6_; - GdkEventButton* _tmp7_; - gdouble _tmp8_; - GdkEventButton* _tmp9_; - gdouble _tmp10_; - GdkEventButton* _tmp11_; - guint32 _tmp12_; + guint _tmp0_; + guint _tmp2_; + gdouble _tmp3_; + gdouble _tmp4_; + guint32 _tmp5_; #line 661 "/home/jens/Source/shotwell/src/Properties.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXTENDED_PROPERTIES_WINDOW, ExtendedPropertiesWindow); #line 661 "/home/jens/Source/shotwell/src/Properties.vala" g_return_val_if_fail (event != NULL, FALSE); #line 663 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp0_ = event; -#line 663 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp1_ = _tmp0_->button; + _tmp0_ = event->button; #line 663 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp1_ != ((guint) 1)) { -#line 3982 "Properties.c" - gboolean _tmp2_ = FALSE; + if (_tmp0_ != ((guint) 1)) { +#line 3935 "Properties.c" + gboolean _tmp1_ = FALSE; #line 664 "/home/jens/Source/shotwell/src/Properties.vala" if (GTK_WIDGET_CLASS (extended_properties_window_parent_class)->button_press_event != NULL) { -#line 3986 "Properties.c" - GdkEventButton* _tmp3_; - gboolean _tmp4_; #line 664 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp3_ = event; -#line 664 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp4_ = GTK_WIDGET_CLASS (extended_properties_window_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), gtk_widget_get_type (), GtkWidget), _tmp3_); -#line 664 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp2_ = _tmp4_; -#line 3995 "Properties.c" + _tmp1_ = GTK_WIDGET_CLASS (extended_properties_window_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), gtk_widget_get_type (), GtkWidget), event); +#line 3941 "Properties.c" } else { #line 664 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp2_ = TRUE; -#line 3999 "Properties.c" + _tmp1_ = TRUE; +#line 3945 "Properties.c" } #line 664 "/home/jens/Source/shotwell/src/Properties.vala" - result = _tmp2_; + result = _tmp1_; #line 664 "/home/jens/Source/shotwell/src/Properties.vala" return result; -#line 4005 "Properties.c" +#line 3951 "Properties.c" } #line 666 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp5_ = event; -#line 666 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp6_ = _tmp5_->button; -#line 666 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp7_ = event; -#line 666 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp8_ = _tmp7_->x_root; + _tmp2_ = event->button; #line 666 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp9_ = event; + _tmp3_ = event->x_root; #line 666 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp10_ = _tmp9_->y_root; + _tmp4_ = event->y_root; #line 666 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp11_ = event; + _tmp5_ = event->time; #line 666 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp12_ = _tmp11_->time; -#line 666 "/home/jens/Source/shotwell/src/Properties.vala" - gtk_window_begin_move_drag (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), (gint) _tmp6_, (gint) _tmp8_, (gint) _tmp10_, _tmp12_); + gtk_window_begin_move_drag (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), (gint) _tmp2_, (gint) _tmp3_, (gint) _tmp4_, _tmp5_); #line 668 "/home/jens/Source/shotwell/src/Properties.vala" result = TRUE; #line 668 "/home/jens/Source/shotwell/src/Properties.vala" return result; -#line 4029 "Properties.c" +#line 3967 "Properties.c" } -static gboolean extended_properties_window_real_key_press_event (GtkWidget* base, GdkEventKey* event) { +static gboolean +extended_properties_window_real_key_press_event (GtkWidget* base, + GdkEventKey* event) +{ ExtendedPropertiesWindow * self; gboolean result = FALSE; - GdkEventKey* _tmp0_; - guint _tmp1_; - const gchar* _tmp2_; + guint _tmp0_; + const gchar* _tmp1_; + AppWindow* _tmp2_; AppWindow* _tmp3_; - AppWindow* _tmp4_; - GdkEventKey* _tmp5_; - gboolean _tmp6_ = FALSE; - gboolean _tmp7_; + gboolean _tmp4_ = FALSE; + gboolean _tmp5_; #line 671 "/home/jens/Source/shotwell/src/Properties.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXTENDED_PROPERTIES_WINDOW, ExtendedPropertiesWindow); #line 671 "/home/jens/Source/shotwell/src/Properties.vala" g_return_val_if_fail (event != NULL, FALSE); #line 673 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp0_ = event; -#line 673 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp1_ = _tmp0_->keyval; + _tmp0_ = event->keyval; #line 673 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp2_ = gdk_keyval_name (_tmp1_); + _tmp1_ = gdk_keyval_name (_tmp0_); #line 673 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp2_, "Escape") == 0) { + if (g_strcmp0 (_tmp1_, "Escape") == 0) { #line 674 "/home/jens/Source/shotwell/src/Properties.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 675 "/home/jens/Source/shotwell/src/Properties.vala" result = TRUE; #line 675 "/home/jens/Source/shotwell/src/Properties.vala" return result; -#line 4062 "Properties.c" +#line 3999 "Properties.c" } #line 678 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp3_ = app_window_get_instance (); + _tmp2_ = app_window_get_instance (); #line 678 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp4_ = _tmp3_; -#line 678 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp5_ = event; + _tmp3_ = _tmp2_; #line 678 "/home/jens/Source/shotwell/src/Properties.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp5_, &_tmp6_); + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), "key-press-event", event, &_tmp4_); #line 678 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 678 "/home/jens/Source/shotwell/src/Properties.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 678 "/home/jens/Source/shotwell/src/Properties.vala" - result = _tmp7_; + result = _tmp5_; #line 678 "/home/jens/Source/shotwell/src/Properties.vala" return result; -#line 4080 "Properties.c" +#line 4015 "Properties.c" } -void extended_properties_window_update_properties (ExtendedPropertiesWindow* self, Page* page) { +void +extended_properties_window_update_properties (ExtendedPropertiesWindow* self, + Page* page) +{ ExtendedPropertiesWindowExtendedProperties* _tmp0_; - Page* _tmp1_; #line 681 "/home/jens/Source/shotwell/src/Properties.vala" g_return_if_fail (IS_EXTENDED_PROPERTIES_WINDOW (self)); #line 681 "/home/jens/Source/shotwell/src/Properties.vala" @@ -4090,14 +4027,14 @@ void extended_properties_window_update_properties (ExtendedPropertiesWindow* sel #line 682 "/home/jens/Source/shotwell/src/Properties.vala" _tmp0_ = self->priv->properties; #line 682 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp1_ = page; -#line 682 "/home/jens/Source/shotwell/src/Properties.vala" - properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PROPERTIES, Properties), _tmp1_); -#line 4097 "Properties.c" + properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PROPERTIES, Properties), page); +#line 4032 "Properties.c" } -static void extended_properties_window_real_show_all (GtkWidget* base) { +static void +extended_properties_window_real_show_all (GtkWidget* base) +{ ExtendedPropertiesWindow * self; ExtendedPropertiesWindowExtendedProperties* _tmp0_; #line 685 "/home/jens/Source/shotwell/src/Properties.vala" @@ -4110,18 +4047,22 @@ static void extended_properties_window_real_show_all (GtkWidget* base) { properties_unselect_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PROPERTIES, Properties)); #line 688 "/home/jens/Source/shotwell/src/Properties.vala" gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 4114 "Properties.c" +#line 4051 "Properties.c" } -static gpointer _dimensions_dup0 (gpointer self) { +static gpointer +_dimensions_dup0 (gpointer self) +{ #line 498 "/home/jens/Source/shotwell/src/Properties.vala" return self ? dimensions_dup (self) : NULL; -#line 4121 "Properties.c" +#line 4060 "Properties.c" } -static void extended_properties_window_extended_properties_real_clear_properties (Properties* base) { +static void +extended_properties_window_extended_properties_real_clear_properties (Properties* base) +{ ExtendedPropertiesWindowExtendedProperties * self; gchar* _tmp0_; gchar* _tmp1_; @@ -4250,161 +4191,153 @@ static void extended_properties_window_extended_properties_real_clear_properties _g_free0 (self->priv->comment); #line 513 "/home/jens/Source/shotwell/src/Properties.vala" self->priv->comment = _tmp16_; -#line 4254 "Properties.c" +#line 4195 "Properties.c" } -static void extended_properties_window_extended_properties_real_get_single_properties (Properties* base, DataView* view) { +static void +extended_properties_window_extended_properties_real_get_single_properties (Properties* base, + DataView* view) +{ ExtendedPropertiesWindowExtendedProperties * self; - DataView* _tmp0_; DataSource* source = NULL; - DataView* _tmp1_; + DataSource* _tmp0_; + DataSource* _tmp1_; DataSource* _tmp2_; - DataSource* _tmp3_; - DataSource* _tmp4_; GError * _inner_error_ = NULL; #line 516 "/home/jens/Source/shotwell/src/Properties.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EXTENDED_PROPERTIES_WINDOW_TYPE_EXTENDED_PROPERTIES, ExtendedPropertiesWindowExtendedProperties); #line 516 "/home/jens/Source/shotwell/src/Properties.vala" g_return_if_fail (IS_DATA_VIEW (view)); #line 517 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp0_ = view; -#line 517 "/home/jens/Source/shotwell/src/Properties.vala" - PROPERTIES_CLASS (extended_properties_window_extended_properties_parent_class)->get_single_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp0_); + PROPERTIES_CLASS (extended_properties_window_extended_properties_parent_class)->get_single_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), view); #line 519 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp1_ = view; -#line 519 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp2_ = data_view_get_source (_tmp1_); + _tmp0_ = data_view_get_source (view); #line 519 "/home/jens/Source/shotwell/src/Properties.vala" - source = _tmp2_; + source = _tmp0_; #line 520 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp3_ = source; + _tmp1_ = source; #line 520 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp3_ == NULL) { + if (_tmp1_ == NULL) { #line 521 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (source); #line 521 "/home/jens/Source/shotwell/src/Properties.vala" return; -#line 4289 "Properties.c" +#line 4227 "Properties.c" } #line 523 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp4_ = source; + _tmp2_ = source; #line 523 "/home/jens/Source/shotwell/src/Properties.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_MEDIA_SOURCE)) { -#line 4295 "Properties.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_MEDIA_SOURCE)) { +#line 4233 "Properties.c" MediaSource* media = NULL; - DataSource* _tmp5_; - MediaSource* _tmp6_; - MediaSource* _tmp7_; - GFile* _tmp8_; - GFile* _tmp9_; - gchar* _tmp10_; - MediaSource* _tmp11_; - GFile* _tmp12_; - GFile* _tmp13_; - gchar* _tmp14_; - MediaSource* _tmp15_; - guint64 _tmp16_; + DataSource* _tmp3_; + MediaSource* _tmp4_; + MediaSource* _tmp5_; + GFile* _tmp6_; + GFile* _tmp7_; + gchar* _tmp8_; + MediaSource* _tmp9_; + GFile* _tmp10_; + GFile* _tmp11_; + gchar* _tmp12_; + MediaSource* _tmp13_; Photo* photo = NULL; - MediaSource* _tmp17_; - Photo* _tmp18_; - Photo* _tmp19_; + MediaSource* _tmp14_; + Photo* _tmp15_; + Photo* _tmp16_; PhotoMetadata* metadata = NULL; - PhotoMetadata* _tmp26_; - PhotoMetadata* _tmp27_; - MetadataDateTime* _tmp28_; - MetadataDateTime* _tmp29_; - gboolean _tmp30_; - Photo* _tmp36_; - PhotoFileFormat _tmp37_; - PhotoMetadata* _tmp38_; - Dimensions* _tmp39_; - PhotoMetadata* _tmp40_; - gchar* _tmp41_; - PhotoMetadata* _tmp42_; - gchar* _tmp43_; - PhotoMetadata* _tmp44_; - gchar* _tmp45_; - PhotoMetadata* _tmp46_; - gchar* _tmp47_; - PhotoMetadata* _tmp48_; - gdouble _tmp49_ = 0.0; - gchar* _tmp50_ = NULL; - gdouble _tmp51_ = 0.0; - gchar* _tmp52_ = NULL; - gdouble _tmp53_ = 0.0; - PhotoMetadata* _tmp54_; - gchar* _tmp55_; - PhotoMetadata* _tmp56_; - gchar* _tmp57_; - PhotoMetadata* _tmp58_; - gchar* _tmp59_; - PhotoMetadata* _tmp60_; - gchar* _tmp61_; + PhotoMetadata* _tmp23_; + PhotoMetadata* _tmp24_; + MetadataDateTime* _tmp25_; + MetadataDateTime* _tmp26_; + gboolean _tmp27_; + Photo* _tmp32_; + PhotoMetadata* _tmp33_; + Dimensions* _tmp34_; + PhotoMetadata* _tmp35_; + gchar* _tmp36_; + PhotoMetadata* _tmp37_; + gchar* _tmp38_; + PhotoMetadata* _tmp39_; + gchar* _tmp40_; + PhotoMetadata* _tmp41_; + gchar* _tmp42_; + PhotoMetadata* _tmp43_; + gdouble _tmp44_ = 0.0; + gchar* _tmp45_ = NULL; + gdouble _tmp46_ = 0.0; + gchar* _tmp47_ = NULL; + gdouble _tmp48_ = 0.0; + PhotoMetadata* _tmp49_; + gchar* _tmp50_; + PhotoMetadata* _tmp51_; + gchar* _tmp52_; + PhotoMetadata* _tmp53_; + gchar* _tmp54_; + PhotoMetadata* _tmp55_; + gchar* _tmp56_; time_t exposure_time_obj = 0; - PhotoMetadata* _tmp62_; - MetadataDateTime* _tmp63_; - MetadataDateTime* _tmp64_; - time_t _tmp65_; - time_t _tmp66_; - time_t _tmp67_; - struct tm _tmp68_ = {0}; - gchar* _tmp69_; - time_t _tmp70_; - struct tm _tmp71_ = {0}; - gchar* _tmp72_; - MediaSource* _tmp73_; - gchar* _tmp74_; + PhotoMetadata* _tmp57_; + MetadataDateTime* _tmp58_; + MetadataDateTime* _tmp59_; + time_t _tmp60_; + time_t _tmp61_; + struct tm _tmp62_ = {0}; + gchar* _tmp63_; + time_t _tmp64_; + struct tm _tmp65_ = {0}; + gchar* _tmp66_; + MediaSource* _tmp67_; + gchar* _tmp68_; #line 524 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp5_ = source; + _tmp3_ = source; #line 524 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource)); #line 524 "/home/jens/Source/shotwell/src/Properties.vala" - media = _tmp6_; + media = _tmp4_; #line 525 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp7_ = media; + _tmp5_ = media; #line 525 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp8_ = media_source_get_master_file (_tmp7_); + _tmp6_ = media_source_get_master_file (_tmp5_); #line 525 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 525 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp10_ = g_file_get_path (_tmp9_); + _tmp8_ = g_file_get_path (_tmp7_); #line 525 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->file_path); #line 525 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->file_path = _tmp10_; + self->priv->file_path = _tmp8_; #line 525 "/home/jens/Source/shotwell/src/Properties.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp7_); #line 526 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp11_ = media; + _tmp9_ = media; #line 526 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp12_ = media_source_get_file (_tmp11_); + _tmp10_ = media_source_get_file (_tmp9_); #line 526 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 526 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp14_ = g_file_get_path (_tmp13_); + _tmp12_ = g_file_get_path (_tmp11_); #line 526 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->development_path); #line 526 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->development_path = _tmp14_; + self->priv->development_path = _tmp12_; #line 526 "/home/jens/Source/shotwell/src/Properties.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp11_); #line 527 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp15_ = media; + _tmp13_ = media; #line 527 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp16_ = media_source_get_master_filesize (_tmp15_); -#line 527 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->filesize = _tmp16_; + self->priv->filesize = media_source_get_master_filesize (_tmp13_); #line 532 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp17_ = media; + _tmp14_ = media; #line 532 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_PHOTO) ? ((Photo*) _tmp17_) : NULL); + _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_PHOTO) ? ((Photo*) _tmp14_) : NULL); #line 532 "/home/jens/Source/shotwell/src/Properties.vala" - photo = _tmp18_; + photo = _tmp15_; #line 533 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp19_ = photo; + _tmp16_ = photo; #line 533 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp19_ == NULL) { + if (_tmp16_ == NULL) { #line 534 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (photo); #line 534 "/home/jens/Source/shotwell/src/Properties.vala" @@ -4413,57 +4346,57 @@ static void extended_properties_window_extended_properties_real_get_single_prope _g_object_unref0 (source); #line 534 "/home/jens/Source/shotwell/src/Properties.vala" return; -#line 4417 "Properties.c" +#line 4350 "Properties.c" } { - PhotoMetadata* _tmp20_ = NULL; - Photo* _tmp21_; - PhotoMetadata* _tmp22_; - PhotoMetadata* _tmp23_; + PhotoMetadata* _tmp17_ = NULL; + Photo* _tmp18_; + PhotoMetadata* _tmp19_; + PhotoMetadata* _tmp20_; #line 543 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp21_ = photo; + _tmp18_ = photo; #line 543 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp22_ = photo_get_master_metadata (_tmp21_, &_inner_error_); + _tmp19_ = photo_get_master_metadata (_tmp18_, &_inner_error_); #line 543 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp20_ = _tmp22_; + _tmp17_ = _tmp19_; #line 543 "/home/jens/Source/shotwell/src/Properties.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4432 "Properties.c" +#line 4365 "Properties.c" goto __catch442_g_error; } #line 543 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp23_ = _tmp20_; + _tmp20_ = _tmp17_; #line 543 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp20_ = NULL; + _tmp17_ = NULL; #line 543 "/home/jens/Source/shotwell/src/Properties.vala" _media_metadata_unref0 (metadata); #line 543 "/home/jens/Source/shotwell/src/Properties.vala" - metadata = _tmp23_; + metadata = _tmp20_; #line 538 "/home/jens/Source/shotwell/src/Properties.vala" - _media_metadata_unref0 (_tmp20_); -#line 4445 "Properties.c" + _media_metadata_unref0 (_tmp17_); +#line 4378 "Properties.c" } goto __finally442; __catch442_g_error: { GError* e = NULL; - Photo* _tmp24_; - PhotoMetadata* _tmp25_; + Photo* _tmp21_; + PhotoMetadata* _tmp22_; #line 538 "/home/jens/Source/shotwell/src/Properties.vala" e = _inner_error_; #line 538 "/home/jens/Source/shotwell/src/Properties.vala" _inner_error_ = NULL; #line 545 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp24_ = photo; + _tmp21_ = photo; #line 545 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp25_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PHOTO_SOURCE, PhotoSource)); + _tmp22_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PHOTO_SOURCE, PhotoSource)); #line 545 "/home/jens/Source/shotwell/src/Properties.vala" _media_metadata_unref0 (metadata); #line 545 "/home/jens/Source/shotwell/src/Properties.vala" - metadata = _tmp25_; + metadata = _tmp22_; #line 538 "/home/jens/Source/shotwell/src/Properties.vala" _g_error_free0 (e); -#line 4467 "Properties.c" +#line 4400 "Properties.c" } __finally442: #line 538 "/home/jens/Source/shotwell/src/Properties.vala" @@ -4482,12 +4415,12 @@ static void extended_properties_window_extended_properties_real_get_single_prope g_clear_error (&_inner_error_); #line 538 "/home/jens/Source/shotwell/src/Properties.vala" return; -#line 4486 "Properties.c" +#line 4419 "Properties.c" } #line 548 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp26_ = metadata; + _tmp23_ = metadata; #line 548 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp26_ == NULL) { + if (_tmp23_ == NULL) { #line 549 "/home/jens/Source/shotwell/src/Properties.vala" _media_metadata_unref0 (metadata); #line 549 "/home/jens/Source/shotwell/src/Properties.vala" @@ -4498,1103 +4431,1085 @@ static void extended_properties_window_extended_properties_real_get_single_prope _g_object_unref0 (source); #line 549 "/home/jens/Source/shotwell/src/Properties.vala" return; -#line 4502 "Properties.c" +#line 4435 "Properties.c" } #line 556 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp27_ = metadata; + _tmp24_ = metadata; #line 556 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp28_ = photo_metadata_get_exposure_date_time (_tmp27_); + _tmp25_ = photo_metadata_get_exposure_date_time (_tmp24_); #line 556 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp29_ = _tmp28_; + _tmp26_ = _tmp25_; #line 556 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp30_ = _tmp29_ == NULL; + _tmp27_ = _tmp26_ == NULL; #line 556 "/home/jens/Source/shotwell/src/Properties.vala" - _metadata_date_time_unref0 (_tmp29_); + _metadata_date_time_unref0 (_tmp26_); #line 556 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp30_) { -#line 4516 "Properties.c" - PhotoMetadata* _tmp31_; - Photo* _tmp32_; - time_t _tmp33_; - MetadataDateTime* _tmp34_; - MetadataDateTime* _tmp35_; -#line 557 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp31_ = metadata; + if (_tmp27_) { +#line 4449 "Properties.c" + PhotoMetadata* _tmp28_; + Photo* _tmp29_; + MetadataDateTime* _tmp30_; + MetadataDateTime* _tmp31_; #line 557 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp32_ = photo; + _tmp28_ = metadata; #line 557 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp33_ = media_source_get_timestamp (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp29_ = photo; #line 557 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp34_ = metadata_date_time_new (_tmp33_); + _tmp30_ = metadata_date_time_new (media_source_get_timestamp (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_MEDIA_SOURCE, MediaSource))); #line 557 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp35_ = _tmp34_; + _tmp31_ = _tmp30_; #line 557 "/home/jens/Source/shotwell/src/Properties.vala" - photo_metadata_set_exposure_date_time (_tmp31_, _tmp35_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_exposure_date_time (_tmp28_, _tmp31_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 557 "/home/jens/Source/shotwell/src/Properties.vala" - _metadata_date_time_unref0 (_tmp35_); -#line 4536 "Properties.c" + _metadata_date_time_unref0 (_tmp31_); +#line 4466 "Properties.c" } #line 559 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp36_ = photo; -#line 559 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp37_ = photo_get_master_file_format (_tmp36_); + _tmp32_ = photo; #line 559 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->is_raw = _tmp37_ == PHOTO_FILE_FORMAT_RAW; + self->priv->is_raw = photo_get_master_file_format (_tmp32_) == PHOTO_FILE_FORMAT_RAW; #line 560 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp38_ = metadata; + _tmp33_ = metadata; #line 560 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp39_ = photo_metadata_get_pixel_dimensions (_tmp38_); + _tmp34_ = photo_metadata_get_pixel_dimensions (_tmp33_); #line 560 "/home/jens/Source/shotwell/src/Properties.vala" _dimensions_free0 (self->priv->original_dim); #line 560 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->original_dim = _tmp39_; + self->priv->original_dim = _tmp34_; #line 561 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp40_ = metadata; + _tmp35_ = metadata; #line 561 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp41_ = photo_metadata_get_camera_make (_tmp40_); + _tmp36_ = photo_metadata_get_camera_make (_tmp35_); #line 561 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->camera_make); #line 561 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->camera_make = _tmp41_; + self->priv->camera_make = _tmp36_; #line 562 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp42_ = metadata; + _tmp37_ = metadata; #line 562 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp43_ = photo_metadata_get_camera_model (_tmp42_); + _tmp38_ = photo_metadata_get_camera_model (_tmp37_); #line 562 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->camera_model); #line 562 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->camera_model = _tmp43_; + self->priv->camera_model = _tmp38_; #line 563 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp44_ = metadata; + _tmp39_ = metadata; #line 563 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp45_ = photo_metadata_get_flash_string (_tmp44_); + _tmp40_ = photo_metadata_get_flash_string (_tmp39_); #line 563 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->flash); #line 563 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->flash = _tmp45_; + self->priv->flash = _tmp40_; #line 564 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp46_ = metadata; + _tmp41_ = metadata; #line 564 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp47_ = photo_metadata_get_focal_length_string (_tmp46_); + _tmp42_ = photo_metadata_get_focal_length_string (_tmp41_); #line 564 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->focal_length); #line 564 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->focal_length = _tmp47_; + self->priv->focal_length = _tmp42_; #line 565 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp48_ = metadata; + _tmp43_ = metadata; #line 565 "/home/jens/Source/shotwell/src/Properties.vala" - photo_metadata_get_gps (_tmp48_, &_tmp49_, &_tmp50_, &_tmp51_, &_tmp52_, &_tmp53_); + photo_metadata_get_gps (_tmp43_, &_tmp44_, &_tmp45_, &_tmp46_, &_tmp47_, &_tmp48_); #line 565 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->gps_long = _tmp49_; + self->priv->gps_long = _tmp44_; #line 565 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->gps_long_ref); #line 565 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->gps_long_ref = _tmp50_; + self->priv->gps_long_ref = _tmp45_; #line 565 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->gps_lat = _tmp51_; + self->priv->gps_lat = _tmp46_; #line 565 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->gps_lat_ref); #line 565 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->gps_lat_ref = _tmp52_; + self->priv->gps_lat_ref = _tmp47_; #line 565 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->gps_alt = _tmp53_; + self->priv->gps_alt = _tmp48_; #line 566 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp54_ = metadata; + _tmp49_ = metadata; #line 566 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp55_ = photo_metadata_get_artist (_tmp54_); + _tmp50_ = photo_metadata_get_artist (_tmp49_); #line 566 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->artist); #line 566 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->artist = _tmp55_; + self->priv->artist = _tmp50_; #line 567 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp56_ = metadata; + _tmp51_ = metadata; #line 567 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp57_ = photo_metadata_get_copyright (_tmp56_); + _tmp52_ = photo_metadata_get_copyright (_tmp51_); #line 567 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->copyright); #line 567 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->copyright = _tmp57_; + self->priv->copyright = _tmp52_; #line 568 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp58_ = metadata; + _tmp53_ = metadata; #line 568 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp59_ = photo_metadata_get_software (_tmp58_); + _tmp54_ = photo_metadata_get_software (_tmp53_); #line 568 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->software); #line 568 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->software = _tmp59_; + self->priv->software = _tmp54_; #line 569 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp60_ = metadata; + _tmp55_ = metadata; #line 569 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp61_ = photo_metadata_get_exposure_bias (_tmp60_); + _tmp56_ = photo_metadata_get_exposure_bias (_tmp55_); #line 569 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->exposure_bias); #line 569 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->exposure_bias = _tmp61_; + self->priv->exposure_bias = _tmp56_; #line 570 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp62_ = metadata; + _tmp57_ = metadata; #line 570 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp63_ = photo_metadata_get_exposure_date_time (_tmp62_); + _tmp58_ = photo_metadata_get_exposure_date_time (_tmp57_); #line 570 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp64_ = _tmp63_; + _tmp59_ = _tmp58_; #line 570 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp65_ = metadata_date_time_get_timestamp (_tmp64_); + _tmp60_ = metadata_date_time_get_timestamp (_tmp59_); #line 570 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp66_ = _tmp65_; + _metadata_date_time_unref0 (_tmp59_); #line 570 "/home/jens/Source/shotwell/src/Properties.vala" - _metadata_date_time_unref0 (_tmp64_); -#line 570 "/home/jens/Source/shotwell/src/Properties.vala" - exposure_time_obj = _tmp66_; + exposure_time_obj = _tmp60_; #line 571 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp67_ = exposure_time_obj; + _tmp61_ = exposure_time_obj; #line 571 "/home/jens/Source/shotwell/src/Properties.vala" - g_time_local (_tmp67_, &_tmp68_); + g_time_local (_tmp61_, &_tmp62_); #line 571 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp69_ = properties_get_prettyprint_date (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp68_); + _tmp63_ = properties_get_prettyprint_date (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp62_); #line 571 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->exposure_date); #line 571 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->exposure_date = _tmp69_; + self->priv->exposure_date = _tmp63_; #line 572 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp70_ = exposure_time_obj; + _tmp64_ = exposure_time_obj; #line 572 "/home/jens/Source/shotwell/src/Properties.vala" - g_time_local (_tmp70_, &_tmp71_); + g_time_local (_tmp64_, &_tmp65_); #line 572 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp72_ = properties_get_prettyprint_time_with_seconds (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp71_); + _tmp66_ = properties_get_prettyprint_time_with_seconds (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp65_); #line 572 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->exposure_time); #line 572 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->exposure_time = _tmp72_; + self->priv->exposure_time = _tmp66_; #line 573 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp73_ = media; + _tmp67_ = media; #line 573 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp74_ = media_source_get_comment (_tmp73_); + _tmp68_ = media_source_get_comment (_tmp67_); #line 573 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->comment); #line 573 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->comment = _tmp74_; + self->priv->comment = _tmp68_; #line 523 "/home/jens/Source/shotwell/src/Properties.vala" _media_metadata_unref0 (metadata); #line 523 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (photo); #line 523 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (media); -#line 4682 "Properties.c" +#line 4608 "Properties.c" } else { - DataSource* _tmp75_; + DataSource* _tmp69_; #line 574 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp75_ = source; + _tmp69_ = source; #line 574 "/home/jens/Source/shotwell/src/Properties.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, TYPE_EVENT_SOURCE)) { -#line 4689 "Properties.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp69_, TYPE_EVENT_SOURCE)) { +#line 4615 "Properties.c" Event* event = NULL; - DataSource* _tmp76_; - Event* _tmp77_; - Event* _tmp78_; - gchar* _tmp79_; + DataSource* _tmp70_; + Event* _tmp71_; + Event* _tmp72_; + gchar* _tmp73_; #line 575 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp76_ = source; + _tmp70_ = source; #line 575 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp77_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, TYPE_EVENT, Event)); + _tmp71_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_EVENT, Event)); #line 575 "/home/jens/Source/shotwell/src/Properties.vala" - event = _tmp77_; + event = _tmp71_; #line 576 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp78_ = event; + _tmp72_ = event; #line 576 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp79_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_EVENT_SOURCE, EventSource)); + _tmp73_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_EVENT_SOURCE, EventSource)); #line 576 "/home/jens/Source/shotwell/src/Properties.vala" _g_free0 (self->priv->comment); #line 576 "/home/jens/Source/shotwell/src/Properties.vala" - self->priv->comment = _tmp79_; + self->priv->comment = _tmp73_; #line 574 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (event); -#line 4711 "Properties.c" +#line 4637 "Properties.c" } } #line 516 "/home/jens/Source/shotwell/src/Properties.vala" _g_object_unref0 (source); -#line 4716 "Properties.c" +#line 4642 "Properties.c" } -static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { +static gchar* +string_replace (const gchar* self, + const gchar* old, + const gchar* replacement) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if ((*((gchar*) self)) == '\0') { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 4735 "Properties.c" +#line 4665 "Properties.c" } else { - const gchar* _tmp2_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; -#line 4742 "Properties.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) old)) == '\0'; +#line 4669 "Properties.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = TRUE; -#line 4748 "Properties.c" +#line 4675 "Properties.c" } else { - const gchar* _tmp3_; - const gchar* _tmp4_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = replacement; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; -#line 4758 "Properties.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (old, replacement) == 0; +#line 4679 "Properties.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 4762 "Properties.c" - gchar* _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = g_strdup (self); -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 4683 "Properties.c" + gchar* _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = g_strdup (self); +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 4770 "Properties.c" +#line 4691 "Properties.c" } { GRegex* regex = NULL; - const gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - GRegex* _tmp9_; - GRegex* _tmp10_; - gchar* _tmp11_ = NULL; - GRegex* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = old; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = g_regex_escape_string (_tmp6_, -1); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = _tmp9_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp8_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - regex = _tmp10_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp3_; + gchar* _tmp4_; + GRegex* _tmp5_; + GRegex* _tmp6_; + gchar* _tmp7_ = NULL; + GRegex* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_regex_escape_string (old, -1); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = _tmp3_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp5_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp4_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + regex = _tmp6_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 4802 "Properties.c" +#line 4719 "Properties.c" goto __catch443_g_regex_error; } -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 4811 "Properties.c" +#line 4728 "Properties.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = regex; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = replacement; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp14_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = regex; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp9_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 4827 "Properties.c" +#line 4742 "Properties.c" goto __catch443_g_regex_error; } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 4838 "Properties.c" +#line 4753 "Properties.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = _tmp11_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = NULL; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp15_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp11_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = _tmp7_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = NULL; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp10_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp7_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 4852 "Properties.c" +#line 4767 "Properties.c" } goto __finally443; __catch443_g_regex_error: { GError* e = NULL; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 4866 "Properties.c" +#line 4781 "Properties.c" } __finally443: -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 4877 "Properties.c" +#line 4792 "Properties.c" } } -static void extended_properties_window_extended_properties_real_internal_update_properties (Properties* base, Page* page) { +static void +extended_properties_window_extended_properties_real_internal_update_properties (Properties* base, + Page* page) +{ ExtendedPropertiesWindowExtendedProperties * self; - Page* _tmp0_; - Page* _tmp1_; - gboolean _tmp97_ = FALSE; - const gchar* _tmp98_; + gboolean _tmp94_ = FALSE; + const gchar* _tmp95_; gboolean has_comment = FALSE; - const gchar* _tmp100_ = NULL; - gboolean _tmp101_; - gboolean _tmp103_; + const gchar* _tmp97_ = NULL; + gboolean _tmp98_; + gboolean _tmp100_; #line 580 "/home/jens/Source/shotwell/src/Properties.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EXTENDED_PROPERTIES_WINDOW_TYPE_EXTENDED_PROPERTIES, ExtendedPropertiesWindowExtendedProperties); #line 580 "/home/jens/Source/shotwell/src/Properties.vala" g_return_if_fail (IS_PAGE (page)); #line 581 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp0_ = page; -#line 581 "/home/jens/Source/shotwell/src/Properties.vala" - PROPERTIES_CLASS (extended_properties_window_extended_properties_parent_class)->internal_update_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp0_); -#line 583 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp1_ = page; + PROPERTIES_CLASS (extended_properties_window_extended_properties_parent_class)->internal_update_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), page); #line 583 "/home/jens/Source/shotwell/src/Properties.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_EVENTS_DIRECTORY_PAGE)) { -#line 4904 "Properties.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_EVENTS_DIRECTORY_PAGE)) { +#line 4816 "Properties.c" } else { - gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - const gchar* _tmp4_; - gchar* _tmp9_ = NULL; - guint64 _tmp10_; - gboolean _tmp14_; - gchar* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; - Dimensions* _tmp18_; - const gchar* _tmp27_ = NULL; - gboolean _tmp28_ = FALSE; - const gchar* _tmp29_; - const gchar* _tmp32_ = NULL; - gboolean _tmp33_ = FALSE; - const gchar* _tmp34_; - const gchar* _tmp37_ = NULL; - gboolean _tmp38_ = FALSE; - const gchar* _tmp39_; - const gchar* _tmp42_ = NULL; - gboolean _tmp43_ = FALSE; - const gchar* _tmp44_; - const gchar* _tmp47_ = NULL; - gboolean _tmp48_ = FALSE; - const gchar* _tmp49_; - const gchar* _tmp52_ = NULL; - gboolean _tmp53_ = FALSE; - const gchar* _tmp54_; - const gchar* _tmp57_ = NULL; - gboolean _tmp58_ = FALSE; - const gchar* _tmp59_; - gchar* _tmp62_ = NULL; - gboolean _tmp63_ = FALSE; - gboolean _tmp64_ = FALSE; - gdouble _tmp65_; - gchar* _tmp72_ = NULL; - gboolean _tmp73_ = FALSE; - gboolean _tmp74_ = FALSE; - gdouble _tmp75_; - const gchar* _tmp82_ = NULL; - gboolean _tmp83_ = FALSE; - const gchar* _tmp84_; - const gchar* _tmp87_ = NULL; - gboolean _tmp88_ = FALSE; - const gchar* _tmp89_; - const gchar* _tmp92_ = NULL; - gboolean _tmp93_ = FALSE; - const gchar* _tmp94_; + gchar* _tmp0_ = NULL; + gboolean _tmp1_ = FALSE; + const gchar* _tmp2_; + gchar* _tmp7_ = NULL; + guint64 _tmp8_; + gboolean _tmp12_; + gchar* _tmp14_ = NULL; + gboolean _tmp15_ = FALSE; + Dimensions* _tmp16_; + const gchar* _tmp24_ = NULL; + gboolean _tmp25_ = FALSE; + const gchar* _tmp26_; + const gchar* _tmp29_ = NULL; + gboolean _tmp30_ = FALSE; + const gchar* _tmp31_; + const gchar* _tmp34_ = NULL; + gboolean _tmp35_ = FALSE; + const gchar* _tmp36_; + const gchar* _tmp39_ = NULL; + gboolean _tmp40_ = FALSE; + const gchar* _tmp41_; + const gchar* _tmp44_ = NULL; + gboolean _tmp45_ = FALSE; + const gchar* _tmp46_; + const gchar* _tmp49_ = NULL; + gboolean _tmp50_ = FALSE; + const gchar* _tmp51_; + const gchar* _tmp54_ = NULL; + gboolean _tmp55_ = FALSE; + const gchar* _tmp56_; + gchar* _tmp59_ = NULL; + gboolean _tmp60_ = FALSE; + gboolean _tmp61_ = FALSE; + gdouble _tmp62_; + gchar* _tmp69_ = NULL; + gboolean _tmp70_ = FALSE; + gboolean _tmp71_ = FALSE; + gdouble _tmp72_; + const gchar* _tmp79_ = NULL; + gboolean _tmp80_ = FALSE; + const gchar* _tmp81_; + const gchar* _tmp84_ = NULL; + gboolean _tmp85_ = FALSE; + const gchar* _tmp86_; + const gchar* _tmp89_ = NULL; + gboolean _tmp90_ = FALSE; + const gchar* _tmp91_; #line 586 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp4_ = self->priv->file_path; + _tmp2_ = self->priv->file_path; #line 586 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp4_, "") != 0) { -#line 4957 "Properties.c" - const gchar* _tmp5_; + if (g_strcmp0 (_tmp2_, "") != 0) { +#line 4869 "Properties.c" + const gchar* _tmp3_; #line 586 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp5_ = self->priv->file_path; + _tmp3_ = self->priv->file_path; #line 586 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp3_ = _tmp5_ != NULL; -#line 4963 "Properties.c" + _tmp1_ = _tmp3_ != NULL; +#line 4875 "Properties.c" } else { #line 586 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp3_ = FALSE; -#line 4967 "Properties.c" + _tmp1_ = FALSE; +#line 4879 "Properties.c" } #line 586 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp3_) { -#line 4971 "Properties.c" - const gchar* _tmp6_; - gchar* _tmp7_; + if (_tmp1_) { +#line 4883 "Properties.c" + const gchar* _tmp4_; + gchar* _tmp5_; #line 587 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp6_ = self->priv->file_path; + _tmp4_ = self->priv->file_path; #line 587 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp7_ = string_replace (_tmp6_, "&", "&"); + _tmp5_ = string_replace (_tmp4_, "&", "&"); #line 587 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp0_); #line 587 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp2_ = _tmp7_; -#line 4982 "Properties.c" + _tmp0_ = _tmp5_; +#line 4894 "Properties.c" } else { - gchar* _tmp8_; + gchar* _tmp6_; #line 587 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp8_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE); + _tmp6_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE); #line 587 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp0_); #line 587 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp2_ = _tmp8_; -#line 4991 "Properties.c" + _tmp0_ = _tmp6_; +#line 4903 "Properties.c" } #line 586 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Location:"), _tmp2_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Location:"), _tmp0_, FALSE); #line 589 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp10_ = self->priv->filesize; + _tmp8_ = self->priv->filesize; #line 589 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp10_ > ((guint64) 0)) { -#line 4999 "Properties.c" - guint64 _tmp11_; - gchar* _tmp12_; + if (_tmp8_ > ((guint64) 0)) { +#line 4911 "Properties.c" + guint64 _tmp9_; + gchar* _tmp10_; #line 590 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp11_ = self->priv->filesize; + _tmp9_ = self->priv->filesize; #line 590 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp12_ = g_format_size_full ((guint64) ((gint64) _tmp11_), G_FORMAT_SIZE_DEFAULT); + _tmp10_ = g_format_size_full ((guint64) ((gint64) _tmp9_), G_FORMAT_SIZE_DEFAULT); #line 590 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp7_); #line 590 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp9_ = _tmp12_; -#line 5010 "Properties.c" + _tmp7_ = _tmp10_; +#line 4922 "Properties.c" } else { - gchar* _tmp13_; + gchar* _tmp11_; #line 590 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp13_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE); + _tmp11_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE); #line 590 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp7_); #line 590 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp9_ = _tmp13_; -#line 5019 "Properties.c" + _tmp7_ = _tmp11_; +#line 4931 "Properties.c" } #line 589 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("File size:"), _tmp9_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("File size:"), _tmp7_, FALSE); #line 592 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp14_ = self->priv->is_raw; + _tmp12_ = self->priv->is_raw; #line 592 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp14_) { -#line 5027 "Properties.c" - const gchar* _tmp15_; + if (_tmp12_) { +#line 4939 "Properties.c" + const gchar* _tmp13_; #line 593 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp15_ = self->priv->development_path; + _tmp13_ = self->priv->development_path; #line 593 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Current Development:"), _tmp15_, FALSE); -#line 5033 "Properties.c" + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Current Development:"), _tmp13_, FALSE); +#line 4945 "Properties.c" } #line 595 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp18_ = self->priv->original_dim; -#line 595 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp18_ != NULL) { -#line 5039 "Properties.c" - Dimensions* _tmp19_; - gboolean _tmp20_; + _tmp16_ = self->priv->original_dim; #line 595 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp19_ = self->priv->original_dim; + if (_tmp16_ != NULL) { +#line 4951 "Properties.c" + Dimensions* _tmp17_; #line 595 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp20_ = dimensions_has_area (_tmp19_); + _tmp17_ = self->priv->original_dim; #line 595 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp17_ = _tmp20_; -#line 5048 "Properties.c" + _tmp15_ = dimensions_has_area (_tmp17_); +#line 4957 "Properties.c" } else { #line 595 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp17_ = FALSE; -#line 5052 "Properties.c" + _tmp15_ = FALSE; +#line 4961 "Properties.c" } #line 595 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp17_) { -#line 5056 "Properties.c" - Dimensions* _tmp21_; - gint _tmp22_; - Dimensions* _tmp23_; - gint _tmp24_; - gchar* _tmp25_; + if (_tmp15_) { +#line 4965 "Properties.c" + Dimensions* _tmp18_; + gint _tmp19_; + Dimensions* _tmp20_; + gint _tmp21_; + gchar* _tmp22_; #line 596 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp21_ = self->priv->original_dim; + _tmp18_ = self->priv->original_dim; #line 596 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp22_ = (*_tmp21_).width; + _tmp19_ = (*_tmp18_).width; #line 596 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp23_ = self->priv->original_dim; + _tmp20_ = self->priv->original_dim; #line 596 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp24_ = (*_tmp23_).height; + _tmp21_ = (*_tmp20_).height; #line 596 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp25_ = g_strdup_printf ("%d × %d", _tmp22_, _tmp24_); + _tmp22_ = g_strdup_printf ("%d × %d", _tmp19_, _tmp21_); #line 596 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp14_); #line 596 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp16_ = _tmp25_; -#line 5076 "Properties.c" + _tmp14_ = _tmp22_; +#line 4985 "Properties.c" } else { - gchar* _tmp26_; + gchar* _tmp23_; #line 596 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp26_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE); + _tmp23_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE); #line 596 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp14_); #line 596 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp16_ = _tmp26_; -#line 5085 "Properties.c" + _tmp14_ = _tmp23_; +#line 4994 "Properties.c" } #line 595 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Original dimensions:"), _tmp16_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Original dimensions:"), _tmp14_, FALSE); #line 598 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp29_ = self->priv->camera_make; + _tmp26_ = self->priv->camera_make; #line 598 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp29_, "") != 0) { -#line 5093 "Properties.c" - const gchar* _tmp30_; + if (g_strcmp0 (_tmp26_, "") != 0) { +#line 5002 "Properties.c" + const gchar* _tmp27_; #line 598 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp30_ = self->priv->camera_make; + _tmp27_ = self->priv->camera_make; #line 598 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp28_ = _tmp30_ != NULL; -#line 5099 "Properties.c" + _tmp25_ = _tmp27_ != NULL; +#line 5008 "Properties.c" } else { #line 598 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp28_ = FALSE; -#line 5103 "Properties.c" + _tmp25_ = FALSE; +#line 5012 "Properties.c" } #line 598 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp28_) { -#line 5107 "Properties.c" - const gchar* _tmp31_; + if (_tmp25_) { +#line 5016 "Properties.c" + const gchar* _tmp28_; #line 599 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp31_ = self->priv->camera_make; + _tmp28_ = self->priv->camera_make; #line 599 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp27_ = _tmp31_; -#line 5113 "Properties.c" + _tmp24_ = _tmp28_; +#line 5022 "Properties.c" } else { #line 599 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp27_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; -#line 5117 "Properties.c" + _tmp24_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; +#line 5026 "Properties.c" } #line 598 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Camera make:"), _tmp27_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Camera make:"), _tmp24_, FALSE); #line 601 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp34_ = self->priv->camera_model; + _tmp31_ = self->priv->camera_model; #line 601 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp34_, "") != 0) { -#line 5125 "Properties.c" - const gchar* _tmp35_; + if (g_strcmp0 (_tmp31_, "") != 0) { +#line 5034 "Properties.c" + const gchar* _tmp32_; #line 601 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp35_ = self->priv->camera_model; + _tmp32_ = self->priv->camera_model; #line 601 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp33_ = _tmp35_ != NULL; -#line 5131 "Properties.c" + _tmp30_ = _tmp32_ != NULL; +#line 5040 "Properties.c" } else { #line 601 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp33_ = FALSE; -#line 5135 "Properties.c" + _tmp30_ = FALSE; +#line 5044 "Properties.c" } #line 601 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp33_) { -#line 5139 "Properties.c" - const gchar* _tmp36_; + if (_tmp30_) { +#line 5048 "Properties.c" + const gchar* _tmp33_; #line 602 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp36_ = self->priv->camera_model; + _tmp33_ = self->priv->camera_model; #line 602 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp32_ = _tmp36_; -#line 5145 "Properties.c" + _tmp29_ = _tmp33_; +#line 5054 "Properties.c" } else { #line 602 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp32_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; -#line 5149 "Properties.c" + _tmp29_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; +#line 5058 "Properties.c" } #line 601 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Camera model:"), _tmp32_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Camera model:"), _tmp29_, FALSE); #line 604 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp39_ = self->priv->flash; + _tmp36_ = self->priv->flash; #line 604 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp39_, "") != 0) { -#line 5157 "Properties.c" - const gchar* _tmp40_; + if (g_strcmp0 (_tmp36_, "") != 0) { +#line 5066 "Properties.c" + const gchar* _tmp37_; #line 604 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp40_ = self->priv->flash; + _tmp37_ = self->priv->flash; #line 604 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp38_ = _tmp40_ != NULL; -#line 5163 "Properties.c" + _tmp35_ = _tmp37_ != NULL; +#line 5072 "Properties.c" } else { #line 604 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp38_ = FALSE; -#line 5167 "Properties.c" + _tmp35_ = FALSE; +#line 5076 "Properties.c" } #line 604 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp38_) { -#line 5171 "Properties.c" - const gchar* _tmp41_; + if (_tmp35_) { +#line 5080 "Properties.c" + const gchar* _tmp38_; #line 604 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp41_ = self->priv->flash; + _tmp38_ = self->priv->flash; #line 604 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp37_ = _tmp41_; -#line 5177 "Properties.c" + _tmp34_ = _tmp38_; +#line 5086 "Properties.c" } else { #line 604 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp37_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; -#line 5181 "Properties.c" + _tmp34_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; +#line 5090 "Properties.c" } #line 604 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Flash:"), _tmp37_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Flash:"), _tmp34_, FALSE); #line 606 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp44_ = self->priv->focal_length; + _tmp41_ = self->priv->focal_length; #line 606 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp44_, "") != 0) { -#line 5189 "Properties.c" - const gchar* _tmp45_; + if (g_strcmp0 (_tmp41_, "") != 0) { +#line 5098 "Properties.c" + const gchar* _tmp42_; #line 606 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp45_ = self->priv->focal_length; + _tmp42_ = self->priv->focal_length; #line 606 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp43_ = _tmp45_ != NULL; -#line 5195 "Properties.c" + _tmp40_ = _tmp42_ != NULL; +#line 5104 "Properties.c" } else { #line 606 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp43_ = FALSE; -#line 5199 "Properties.c" + _tmp40_ = FALSE; +#line 5108 "Properties.c" } #line 606 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp43_) { -#line 5203 "Properties.c" - const gchar* _tmp46_; + if (_tmp40_) { +#line 5112 "Properties.c" + const gchar* _tmp43_; #line 607 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp46_ = self->priv->focal_length; + _tmp43_ = self->priv->focal_length; #line 607 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp42_ = _tmp46_; -#line 5209 "Properties.c" + _tmp39_ = _tmp43_; +#line 5118 "Properties.c" } else { #line 607 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp42_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; -#line 5213 "Properties.c" + _tmp39_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; +#line 5122 "Properties.c" } #line 606 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Focal length:"), _tmp42_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Focal length:"), _tmp39_, FALSE); #line 609 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp49_ = self->priv->exposure_date; + _tmp46_ = self->priv->exposure_date; #line 609 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp49_, "") != 0) { -#line 5221 "Properties.c" - const gchar* _tmp50_; + if (g_strcmp0 (_tmp46_, "") != 0) { +#line 5130 "Properties.c" + const gchar* _tmp47_; #line 609 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp50_ = self->priv->exposure_date; + _tmp47_ = self->priv->exposure_date; #line 609 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp48_ = _tmp50_ != NULL; -#line 5227 "Properties.c" + _tmp45_ = _tmp47_ != NULL; +#line 5136 "Properties.c" } else { #line 609 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp48_ = FALSE; -#line 5231 "Properties.c" + _tmp45_ = FALSE; +#line 5140 "Properties.c" } #line 609 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp48_) { -#line 5235 "Properties.c" - const gchar* _tmp51_; + if (_tmp45_) { +#line 5144 "Properties.c" + const gchar* _tmp48_; #line 610 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp51_ = self->priv->exposure_date; + _tmp48_ = self->priv->exposure_date; #line 610 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp47_ = _tmp51_; -#line 5241 "Properties.c" + _tmp44_ = _tmp48_; +#line 5150 "Properties.c" } else { #line 610 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp47_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; -#line 5245 "Properties.c" + _tmp44_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; +#line 5154 "Properties.c" } #line 609 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure date:"), _tmp47_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure date:"), _tmp44_, FALSE); #line 612 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp54_ = self->priv->exposure_time; + _tmp51_ = self->priv->exposure_time; #line 612 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp54_, "") != 0) { -#line 5253 "Properties.c" - const gchar* _tmp55_; + if (g_strcmp0 (_tmp51_, "") != 0) { +#line 5162 "Properties.c" + const gchar* _tmp52_; #line 612 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp55_ = self->priv->exposure_time; + _tmp52_ = self->priv->exposure_time; #line 612 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp53_ = _tmp55_ != NULL; -#line 5259 "Properties.c" + _tmp50_ = _tmp52_ != NULL; +#line 5168 "Properties.c" } else { #line 612 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp53_ = FALSE; -#line 5263 "Properties.c" + _tmp50_ = FALSE; +#line 5172 "Properties.c" } #line 612 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp53_) { -#line 5267 "Properties.c" - const gchar* _tmp56_; + if (_tmp50_) { +#line 5176 "Properties.c" + const gchar* _tmp53_; #line 613 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp56_ = self->priv->exposure_time; + _tmp53_ = self->priv->exposure_time; #line 613 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp52_ = _tmp56_; -#line 5273 "Properties.c" + _tmp49_ = _tmp53_; +#line 5182 "Properties.c" } else { #line 613 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp52_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; -#line 5277 "Properties.c" + _tmp49_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; +#line 5186 "Properties.c" } #line 612 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure time:"), _tmp52_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure time:"), _tmp49_, FALSE); #line 615 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp59_ = self->priv->exposure_bias; + _tmp56_ = self->priv->exposure_bias; #line 615 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp59_, "") != 0) { -#line 5285 "Properties.c" - const gchar* _tmp60_; + if (g_strcmp0 (_tmp56_, "") != 0) { +#line 5194 "Properties.c" + const gchar* _tmp57_; #line 615 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp60_ = self->priv->exposure_bias; + _tmp57_ = self->priv->exposure_bias; #line 615 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp58_ = _tmp60_ != NULL; -#line 5291 "Properties.c" + _tmp55_ = _tmp57_ != NULL; +#line 5200 "Properties.c" } else { #line 615 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp58_ = FALSE; -#line 5295 "Properties.c" + _tmp55_ = FALSE; +#line 5204 "Properties.c" } #line 615 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp58_) { -#line 5299 "Properties.c" - const gchar* _tmp61_; + if (_tmp55_) { +#line 5208 "Properties.c" + const gchar* _tmp58_; #line 615 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp61_ = self->priv->exposure_bias; + _tmp58_ = self->priv->exposure_bias; #line 615 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp57_ = _tmp61_; -#line 5305 "Properties.c" + _tmp54_ = _tmp58_; +#line 5214 "Properties.c" } else { #line 615 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp57_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; -#line 5309 "Properties.c" + _tmp54_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; +#line 5218 "Properties.c" } #line 615 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure bias:"), _tmp57_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure bias:"), _tmp54_, FALSE); #line 617 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp65_ = self->priv->gps_lat; + _tmp62_ = self->priv->gps_lat; #line 617 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp65_ != ((gdouble) -1)) { -#line 5317 "Properties.c" - const gchar* _tmp66_; + if (_tmp62_ != ((gdouble) -1)) { +#line 5226 "Properties.c" + const gchar* _tmp63_; #line 617 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp66_ = self->priv->gps_lat_ref; + _tmp63_ = self->priv->gps_lat_ref; #line 617 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp64_ = g_strcmp0 (_tmp66_, "") != 0; -#line 5323 "Properties.c" + _tmp61_ = g_strcmp0 (_tmp63_, "") != 0; +#line 5232 "Properties.c" } else { #line 617 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp64_ = FALSE; -#line 5327 "Properties.c" + _tmp61_ = FALSE; +#line 5236 "Properties.c" } #line 617 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp64_) { -#line 5331 "Properties.c" - const gchar* _tmp67_; + if (_tmp61_) { +#line 5240 "Properties.c" + const gchar* _tmp64_; #line 618 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp67_ = self->priv->gps_lat_ref; + _tmp64_ = self->priv->gps_lat_ref; #line 618 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp63_ = _tmp67_ != NULL; -#line 5337 "Properties.c" + _tmp60_ = _tmp64_ != NULL; +#line 5246 "Properties.c" } else { #line 617 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp63_ = FALSE; -#line 5341 "Properties.c" + _tmp60_ = FALSE; +#line 5250 "Properties.c" } #line 617 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp63_) { -#line 5345 "Properties.c" - gdouble _tmp68_; - const gchar* _tmp69_; - gchar* _tmp70_; + if (_tmp60_) { +#line 5254 "Properties.c" + gdouble _tmp65_; + const gchar* _tmp66_; + gchar* _tmp67_; #line 618 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp68_ = self->priv->gps_lat; + _tmp65_ = self->priv->gps_lat; #line 618 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp69_ = self->priv->gps_lat_ref; + _tmp66_ = self->priv->gps_lat_ref; #line 618 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp70_ = g_strdup_printf ("%f °%s", _tmp68_, _tmp69_); + _tmp67_ = g_strdup_printf ("%f °%s", _tmp65_, _tmp66_); #line 618 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp62_); + _g_free0 (_tmp59_); #line 618 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp62_ = _tmp70_; -#line 5359 "Properties.c" + _tmp59_ = _tmp67_; +#line 5268 "Properties.c" } else { - gchar* _tmp71_; + gchar* _tmp68_; #line 618 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp71_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE); + _tmp68_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE); #line 618 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp62_); + _g_free0 (_tmp59_); #line 618 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp62_ = _tmp71_; -#line 5368 "Properties.c" + _tmp59_ = _tmp68_; +#line 5277 "Properties.c" } #line 617 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("GPS latitude:"), _tmp62_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("GPS latitude:"), _tmp59_, FALSE); #line 620 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp75_ = self->priv->gps_long; + _tmp72_ = self->priv->gps_long; #line 620 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp75_ != ((gdouble) -1)) { -#line 5376 "Properties.c" - const gchar* _tmp76_; + if (_tmp72_ != ((gdouble) -1)) { +#line 5285 "Properties.c" + const gchar* _tmp73_; #line 620 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp76_ = self->priv->gps_long_ref; + _tmp73_ = self->priv->gps_long_ref; #line 620 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp74_ = g_strcmp0 (_tmp76_, "") != 0; -#line 5382 "Properties.c" + _tmp71_ = g_strcmp0 (_tmp73_, "") != 0; +#line 5291 "Properties.c" } else { #line 620 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp74_ = FALSE; -#line 5386 "Properties.c" + _tmp71_ = FALSE; +#line 5295 "Properties.c" } #line 620 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp74_) { -#line 5390 "Properties.c" - const gchar* _tmp77_; + if (_tmp71_) { +#line 5299 "Properties.c" + const gchar* _tmp74_; #line 621 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp77_ = self->priv->gps_long_ref; + _tmp74_ = self->priv->gps_long_ref; #line 621 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp73_ = _tmp77_ != NULL; -#line 5396 "Properties.c" + _tmp70_ = _tmp74_ != NULL; +#line 5305 "Properties.c" } else { #line 620 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp73_ = FALSE; -#line 5400 "Properties.c" + _tmp70_ = FALSE; +#line 5309 "Properties.c" } #line 620 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp73_) { -#line 5404 "Properties.c" - gdouble _tmp78_; - const gchar* _tmp79_; - gchar* _tmp80_; + if (_tmp70_) { +#line 5313 "Properties.c" + gdouble _tmp75_; + const gchar* _tmp76_; + gchar* _tmp77_; #line 621 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp78_ = self->priv->gps_long; + _tmp75_ = self->priv->gps_long; #line 621 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp79_ = self->priv->gps_long_ref; + _tmp76_ = self->priv->gps_long_ref; #line 621 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp80_ = g_strdup_printf ("%f °%s", _tmp78_, _tmp79_); + _tmp77_ = g_strdup_printf ("%f °%s", _tmp75_, _tmp76_); #line 621 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp72_); + _g_free0 (_tmp69_); #line 621 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp72_ = _tmp80_; -#line 5418 "Properties.c" + _tmp69_ = _tmp77_; +#line 5327 "Properties.c" } else { - gchar* _tmp81_; + gchar* _tmp78_; #line 621 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp81_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE); + _tmp78_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE); #line 621 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp72_); + _g_free0 (_tmp69_); #line 621 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp72_ = _tmp81_; -#line 5427 "Properties.c" + _tmp69_ = _tmp78_; +#line 5336 "Properties.c" } #line 620 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("GPS longitude:"), _tmp72_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("GPS longitude:"), _tmp69_, FALSE); #line 623 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp84_ = self->priv->artist; + _tmp81_ = self->priv->artist; #line 623 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp84_, "") != 0) { -#line 5435 "Properties.c" - const gchar* _tmp85_; + if (g_strcmp0 (_tmp81_, "") != 0) { +#line 5344 "Properties.c" + const gchar* _tmp82_; #line 623 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp85_ = self->priv->artist; + _tmp82_ = self->priv->artist; #line 623 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp83_ = _tmp85_ != NULL; -#line 5441 "Properties.c" + _tmp80_ = _tmp82_ != NULL; +#line 5350 "Properties.c" } else { #line 623 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp83_ = FALSE; -#line 5445 "Properties.c" + _tmp80_ = FALSE; +#line 5354 "Properties.c" } #line 623 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp83_) { -#line 5449 "Properties.c" - const gchar* _tmp86_; + if (_tmp80_) { +#line 5358 "Properties.c" + const gchar* _tmp83_; #line 623 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp86_ = self->priv->artist; + _tmp83_ = self->priv->artist; #line 623 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp82_ = _tmp86_; -#line 5455 "Properties.c" + _tmp79_ = _tmp83_; +#line 5364 "Properties.c" } else { #line 623 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp82_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; -#line 5459 "Properties.c" + _tmp79_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; +#line 5368 "Properties.c" } #line 623 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Artist:"), _tmp82_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Artist:"), _tmp79_, FALSE); #line 625 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp89_ = self->priv->copyright; + _tmp86_ = self->priv->copyright; #line 625 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp89_, "") != 0) { -#line 5467 "Properties.c" - const gchar* _tmp90_; + if (g_strcmp0 (_tmp86_, "") != 0) { +#line 5376 "Properties.c" + const gchar* _tmp87_; #line 625 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp90_ = self->priv->copyright; + _tmp87_ = self->priv->copyright; #line 625 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp88_ = _tmp90_ != NULL; -#line 5473 "Properties.c" + _tmp85_ = _tmp87_ != NULL; +#line 5382 "Properties.c" } else { #line 625 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp88_ = FALSE; -#line 5477 "Properties.c" + _tmp85_ = FALSE; +#line 5386 "Properties.c" } #line 625 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp88_) { -#line 5481 "Properties.c" - const gchar* _tmp91_; + if (_tmp85_) { +#line 5390 "Properties.c" + const gchar* _tmp88_; #line 625 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp91_ = self->priv->copyright; + _tmp88_ = self->priv->copyright; #line 625 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp87_ = _tmp91_; -#line 5487 "Properties.c" + _tmp84_ = _tmp88_; +#line 5396 "Properties.c" } else { #line 625 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp87_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; -#line 5491 "Properties.c" + _tmp84_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; +#line 5400 "Properties.c" } #line 625 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Copyright:"), _tmp87_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Copyright:"), _tmp84_, FALSE); #line 627 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp94_ = self->priv->software; + _tmp91_ = self->priv->software; #line 627 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp94_, "") != 0) { -#line 5499 "Properties.c" - const gchar* _tmp95_; + if (g_strcmp0 (_tmp91_, "") != 0) { +#line 5408 "Properties.c" + const gchar* _tmp92_; #line 627 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp95_ = self->priv->software; + _tmp92_ = self->priv->software; #line 627 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp93_ = _tmp95_ != NULL; -#line 5505 "Properties.c" + _tmp90_ = _tmp92_ != NULL; +#line 5414 "Properties.c" } else { #line 627 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp93_ = FALSE; -#line 5509 "Properties.c" + _tmp90_ = FALSE; +#line 5418 "Properties.c" } #line 627 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp93_) { -#line 5513 "Properties.c" - const gchar* _tmp96_; + if (_tmp90_) { +#line 5422 "Properties.c" + const gchar* _tmp93_; #line 627 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp96_ = self->priv->software; + _tmp93_ = self->priv->software; #line 627 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp92_ = _tmp96_; -#line 5519 "Properties.c" + _tmp89_ = _tmp93_; +#line 5428 "Properties.c" } else { #line 627 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp92_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; -#line 5523 "Properties.c" + _tmp89_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; +#line 5432 "Properties.c" } #line 627 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Software:"), _tmp92_, FALSE); + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Software:"), _tmp89_, FALSE); #line 583 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp72_); + _g_free0 (_tmp69_); #line 583 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp62_); + _g_free0 (_tmp59_); #line 583 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp14_); #line 583 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp7_); #line 583 "/home/jens/Source/shotwell/src/Properties.vala" - _g_free0 (_tmp2_); -#line 5537 "Properties.c" + _g_free0 (_tmp0_); +#line 5446 "Properties.c" } #line 630 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp98_ = self->priv->comment; + _tmp95_ = self->priv->comment; #line 630 "/home/jens/Source/shotwell/src/Properties.vala" - if (g_strcmp0 (_tmp98_, "") != 0) { -#line 5543 "Properties.c" - const gchar* _tmp99_; + if (g_strcmp0 (_tmp95_, "") != 0) { +#line 5452 "Properties.c" + const gchar* _tmp96_; #line 630 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp99_ = self->priv->comment; + _tmp96_ = self->priv->comment; #line 630 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp97_ = _tmp99_ != NULL; -#line 5549 "Properties.c" + _tmp94_ = _tmp96_ != NULL; +#line 5458 "Properties.c" } else { #line 630 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp97_ = FALSE; -#line 5553 "Properties.c" + _tmp94_ = FALSE; +#line 5462 "Properties.c" } #line 630 "/home/jens/Source/shotwell/src/Properties.vala" - has_comment = _tmp97_; + has_comment = _tmp94_; #line 631 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp101_ = has_comment; + _tmp98_ = has_comment; #line 631 "/home/jens/Source/shotwell/src/Properties.vala" - if (_tmp101_) { -#line 5561 "Properties.c" - const gchar* _tmp102_; + if (_tmp98_) { +#line 5470 "Properties.c" + const gchar* _tmp99_; #line 631 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp102_ = self->priv->comment; + _tmp99_ = self->priv->comment; #line 631 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp100_ = _tmp102_; -#line 5567 "Properties.c" + _tmp97_ = _tmp99_; +#line 5476 "Properties.c" } else { #line 631 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp100_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; -#line 5571 "Properties.c" + _tmp97_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE; +#line 5480 "Properties.c" } #line 631 "/home/jens/Source/shotwell/src/Properties.vala" - _tmp103_ = has_comment; + _tmp100_ = has_comment; #line 631 "/home/jens/Source/shotwell/src/Properties.vala" - properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Comment:"), _tmp100_, _tmp103_); -#line 5577 "Properties.c" + properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Comment:"), _tmp97_, _tmp100_); +#line 5486 "Properties.c" } -static ExtendedPropertiesWindowExtendedProperties* extended_properties_window_extended_properties_construct (GType object_type) { +static ExtendedPropertiesWindowExtendedProperties* +extended_properties_window_extended_properties_construct (GType object_type) +{ ExtendedPropertiesWindowExtendedProperties * self = NULL; #line 460 "/home/jens/Source/shotwell/src/Properties.vala" self = (ExtendedPropertiesWindowExtendedProperties*) properties_construct (object_type); #line 460 "/home/jens/Source/shotwell/src/Properties.vala" return self; -#line 5587 "Properties.c" +#line 5498 "Properties.c" } -static ExtendedPropertiesWindowExtendedProperties* extended_properties_window_extended_properties_new (void) { +static ExtendedPropertiesWindowExtendedProperties* +extended_properties_window_extended_properties_new (void) +{ #line 460 "/home/jens/Source/shotwell/src/Properties.vala" return extended_properties_window_extended_properties_construct (EXTENDED_PROPERTIES_WINDOW_TYPE_EXTENDED_PROPERTIES); -#line 5594 "Properties.c" +#line 5507 "Properties.c" } -static void extended_properties_window_extended_properties_class_init (ExtendedPropertiesWindowExtendedPropertiesClass * klass) { +static void +extended_properties_window_extended_properties_class_init (ExtendedPropertiesWindowExtendedPropertiesClass * klass) +{ #line 460 "/home/jens/Source/shotwell/src/Properties.vala" extended_properties_window_extended_properties_parent_class = g_type_class_peek_parent (klass); #line 460 "/home/jens/Source/shotwell/src/Properties.vala" @@ -5607,18 +5522,22 @@ static void extended_properties_window_extended_properties_class_init (ExtendedP ((PropertiesClass *) klass)->internal_update_properties = (void (*) (Properties *, Page*)) extended_properties_window_extended_properties_real_internal_update_properties; #line 460 "/home/jens/Source/shotwell/src/Properties.vala" G_OBJECT_CLASS (klass)->finalize = extended_properties_window_extended_properties_finalize; -#line 5611 "Properties.c" +#line 5526 "Properties.c" } -static void extended_properties_window_extended_properties_instance_init (ExtendedPropertiesWindowExtendedProperties * self) { +static void +extended_properties_window_extended_properties_instance_init (ExtendedPropertiesWindowExtendedProperties * self) +{ #line 460 "/home/jens/Source/shotwell/src/Properties.vala" self->priv = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_GET_PRIVATE (self); -#line 5618 "Properties.c" +#line 5535 "Properties.c" } -static void extended_properties_window_extended_properties_finalize (GObject * obj) { +static void +extended_properties_window_extended_properties_finalize (GObject * obj) +{ ExtendedPropertiesWindowExtendedProperties * self; #line 460 "/home/jens/Source/shotwell/src/Properties.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EXTENDED_PROPERTIES_WINDOW_TYPE_EXTENDED_PROPERTIES, ExtendedPropertiesWindowExtendedProperties); @@ -5656,11 +5575,13 @@ static void extended_properties_window_extended_properties_finalize (GObject * o _g_free0 (self->priv->comment); #line 460 "/home/jens/Source/shotwell/src/Properties.vala" G_OBJECT_CLASS (extended_properties_window_extended_properties_parent_class)->finalize (obj); -#line 5660 "Properties.c" +#line 5579 "Properties.c" } -static GType extended_properties_window_extended_properties_get_type (void) { +static GType +extended_properties_window_extended_properties_get_type (void) +{ static volatile gsize extended_properties_window_extended_properties_type_id__volatile = 0; if (g_once_init_enter (&extended_properties_window_extended_properties_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ExtendedPropertiesWindowExtendedPropertiesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) extended_properties_window_extended_properties_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ExtendedPropertiesWindowExtendedProperties), 0, (GInstanceInitFunc) extended_properties_window_extended_properties_instance_init, NULL }; @@ -5672,7 +5593,9 @@ static GType extended_properties_window_extended_properties_get_type (void) { } -static void extended_properties_window_class_init (ExtendedPropertiesWindowClass * klass) { +static void +extended_properties_window_class_init (ExtendedPropertiesWindowClass * klass) +{ #line 457 "/home/jens/Source/shotwell/src/Properties.vala" extended_properties_window_parent_class = g_type_class_peek_parent (klass); #line 457 "/home/jens/Source/shotwell/src/Properties.vala" @@ -5685,20 +5608,24 @@ static void extended_properties_window_class_init (ExtendedPropertiesWindowClass ((GtkWidgetClass *) klass)->show_all = (void (*) (GtkWidget *)) extended_properties_window_real_show_all; #line 457 "/home/jens/Source/shotwell/src/Properties.vala" G_OBJECT_CLASS (klass)->finalize = extended_properties_window_finalize; -#line 5689 "Properties.c" +#line 5612 "Properties.c" } -static void extended_properties_window_instance_init (ExtendedPropertiesWindow * self) { +static void +extended_properties_window_instance_init (ExtendedPropertiesWindow * self) +{ #line 457 "/home/jens/Source/shotwell/src/Properties.vala" self->priv = EXTENDED_PROPERTIES_WINDOW_GET_PRIVATE (self); #line 458 "/home/jens/Source/shotwell/src/Properties.vala" self->priv->properties = NULL; -#line 5698 "Properties.c" +#line 5623 "Properties.c" } -static void extended_properties_window_finalize (GObject * obj) { +static void +extended_properties_window_finalize (GObject * obj) +{ ExtendedPropertiesWindow * self; #line 457 "/home/jens/Source/shotwell/src/Properties.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXTENDED_PROPERTIES_WINDOW, ExtendedPropertiesWindow); @@ -5706,11 +5633,13 @@ static void extended_properties_window_finalize (GObject * obj) { _g_object_unref0 (self->priv->properties); #line 457 "/home/jens/Source/shotwell/src/Properties.vala" G_OBJECT_CLASS (extended_properties_window_parent_class)->finalize (obj); -#line 5710 "Properties.c" +#line 5637 "Properties.c" } -GType extended_properties_window_get_type (void) { +GType +extended_properties_window_get_type (void) +{ static volatile gsize extended_properties_window_type_id__volatile = 0; if (g_once_init_enter (&extended_properties_window_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ExtendedPropertiesWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) extended_properties_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ExtendedPropertiesWindow), 0, (GInstanceInitFunc) extended_properties_window_instance_init, NULL }; diff --git a/src/Resources.c b/src/Resources.c index da32009..0db3c0e 100644 --- a/src/Resources.c +++ b/src/Resources.c @@ -1,4 +1,4 @@ -/* Resources.c generated by valac 0.36.6, the Vala compiler +/* Resources.c generated by valac 0.40.4, the Vala compiler * generated from Resources.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -8,6 +8,7 @@ */ /* defined by ./configure or Makefile and included by gcc -D*/ + #include #include #include @@ -412,7 +413,8 @@ GeeMap* resources_providers = NULL; #define RESOURCES_FLAG_MENU _ ("_Flag") #define RESOURCES_UNFLAG_MENU _ ("Un_flag") gchar* resources_launch_editor_failed (GError* err); -gchar* resources_add_tags_label (gchar** names, int names_length1); +gchar* resources_add_tags_label (gchar** names, + int names_length1); gchar* hierarchical_tag_utilities_get_basename (const gchar* in_path); gchar* resources_delete_tag_menu (const gchar* name); gchar* resources_delete_tag_label (const gchar* name); @@ -420,14 +422,19 @@ gchar* resources_delete_tag_label (const gchar* name); #define RESOURCES_DELETE_TAG_SIDEBAR_MENU _ ("_Delete") #define RESOURCES_NEW_CHILD_TAG_SIDEBAR_MENU _ ("_New") gchar* resources_rename_tag_menu (const gchar* name); -gchar* resources_rename_tag_label (const gchar* old_name, const gchar* new_name); +gchar* resources_rename_tag_label (const gchar* old_name, + const gchar* new_name); #define RESOURCES_RENAME_TAG_SIDEBAR_MENU _ ("_Rename…") #define RESOURCES_MODIFY_TAGS_MENU _ ("Modif_y Tags…") #define RESOURCES_MODIFY_TAGS_LABEL _ ("Modify Tags") -gchar* resources_tag_photos_label (const gchar* name, gint count); -gchar* resources_tag_photos_tooltip (const gchar* name, gint count); -gchar* resources_untag_photos_menu (const gchar* name, gint count); -gchar* resources_untag_photos_label (const gchar* name, gint count); +gchar* resources_tag_photos_label (const gchar* name, + gint count); +gchar* resources_tag_photos_tooltip (const gchar* name, + gint count); +gchar* resources_untag_photos_menu (const gchar* name, + gint count); +gchar* resources_untag_photos_label (const gchar* name, + gint count); gchar* resources_rename_tag_exists_message (const gchar* name); gchar* resources_rename_search_exists_message (const gchar* name); #define RESOURCES_DEFAULT_SAVED_SEARCH_NAME _ ("Saved Search") @@ -435,7 +442,8 @@ gchar* resources_rename_search_exists_message (const gchar* name); #define RESOURCES_DELETE_SEARCH_MENU _ ("_Delete") #define RESOURCES_EDIT_SEARCH_MENU _ ("_Edit…") #define RESOURCES_RENAME_SEARCH_MENU _ ("Re_name…") -gchar* resources_rename_search_label (const gchar* old_name, const gchar* new_name); +gchar* resources_rename_search_label (const gchar* old_name, + const gchar* new_name); gchar* resources_delete_search_label (const gchar* name); GType rating_get_type (void) G_GNUC_CONST; const gchar* resources_rating_label (Rating rating); @@ -444,8 +452,10 @@ GType rating_filter_get_type (void) G_GNUC_CONST; gchar* resources_get_rating_filter_tooltip (RatingFilter filter); gchar* resources_rating_progress (Rating rating); gchar* resources_get_stars (Rating rating); -GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale); -GdkPixbuf* resources_get_icon (const gchar* name, gint scale); +GdkPixbuf* resources_get_rating_trinket (Rating rating, + gint scale); +GdkPixbuf* resources_get_icon (const gchar* name, + gint scale); void resources_generate_rating_strings (void); #define RESOURCES_DELETE_PHOTOS_MENU _ ("_Delete") #define RESOURCES_DELETE_FROM_TRASH_TOOLTIP _ ("Remove the selected photos from the trash") @@ -465,7 +475,9 @@ void resources_terminate (void); void resources_fetch_lc_time_format (void); GType resources_unit_system_get_type (void) G_GNUC_CONST; ResourcesUnitSystem resources_get_default_measurement_unit (void); -static gboolean _vala_string_array_contains (const gchar* * stack, int stack_length, const gchar* needle); +static gboolean _vala_string_array_contains (const gchar* * stack, + int stack_length, + const gchar* needle); gchar* resources_get_hh_mm_format_string (void); gchar* resources_get_hh_mm_ss_format_string (void); gchar* resources_get_long_date_format_string (void); @@ -476,15 +488,24 @@ gchar* resources_get_end_multimonth_span_format_string (void); gchar* resources_get_ui (const gchar* filename); #define RESOURCES_NONINTERPRETABLE_BADGE_FILE "noninterpretable-video.png" GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void); -GdkPixbuf* resources_load_icon (const gchar* name, gint scale); -GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gboolean scale_up); +GdkPixbuf* resources_load_icon (const gchar* name, + gint scale); +GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, + gint scale, + GdkInterpType interp, + gboolean scale_up); gchar* resources_get_help_path (void); GFile* app_dirs_get_exec_dir (void); -void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** error); -void sys_show_uri (GdkScreen* screen, const gchar* uri, GError** error); +void resources_launch_help (GdkScreen* screen, + const gchar* anchor, + GError** error); +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); +void resources_style_widget (GtkWidget* widget, + const gchar* stylesheet); gint resources_use_header_bar (void); #define RESOURCES_CUSTOM_CSS "LibraryWindow .pane-separator {\n" \ " background-color: @borders;\n" \ @@ -496,470 +517,421 @@ gint resources_use_header_bar (void); " }" #define RESOURCES_ONIMAGE_FONT_COLOR "#000000" #define RESOURCES_ONIMAGE_FONT_BACKGROUND "rgba(255,255,255,0.5)" -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); const gchar* RESOURCES_AUTHORS[6] = {"Jim Nelson ", "Lucas Beeler ", "Allison Barlow ", "Eric Gregory ", "Clinton Rogers ", NULL}; const gint RESOURCES_rating_thresholds[6] = {0, 1, 25, 50, 75, 99}; const gchar* RESOURCES_IMPERIAL_COUNTRIES[4] = {"unm_US", "es_US", "en_US", "yi_US"}; -gchar* resources_launch_editor_failed (GError* err) { +gchar* +resources_launch_editor_failed (GError* err) +{ gchar* result = NULL; - GError* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; -#line 336 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = err; + const gchar* _tmp0_; + gchar* _tmp1_; #line 336 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = _tmp0_->message; + _tmp0_ = err->message; #line 336 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = g_strdup_printf (_ ("Unable to launch editor: %s"), _tmp1_); + _tmp1_ = g_strdup_printf (_ ("Unable to launch editor: %s"), _tmp0_); #line 336 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp2_; + result = _tmp1_; #line 336 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 495 "Resources.c" +#line 519 "Resources.c" } -gchar* resources_add_tags_label (gchar** names, int names_length1) { +gchar* +resources_add_tags_label (gchar** names, + int names_length1) +{ gchar* result = NULL; - gchar** _tmp0_; - gint _tmp0__length1; -#line 340 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = names; #line 340 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0__length1 = names_length1; -#line 340 "/home/jens/Source/shotwell/src/Resources.vala" - if (_tmp0__length1 == 1) { -#line 509 "Resources.c" - gchar** _tmp1_; - gint _tmp1__length1; - const gchar* _tmp2_; + if (names_length1 == 1) { +#line 530 "Resources.c" + const gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; #line 341 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = names; + _tmp0_ = names[0]; #line 341 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1__length1 = names_length1; + _tmp1_ = hierarchical_tag_utilities_get_basename (_tmp0_); #line 341 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = _tmp1_[0]; + _tmp2_ = _tmp1_; #line 341 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp3_ = hierarchical_tag_utilities_get_basename (_tmp2_); + _tmp3_ = g_strdup_printf (_ ("Add Tag “%s”"), _tmp2_); #line 341 "/home/jens/Source/shotwell/src/Resources.vala" _tmp4_ = _tmp3_; #line 341 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp5_ = g_strdup_printf (_ ("Add Tag “%s”"), _tmp4_); -#line 341 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp6_ = _tmp5_; + _g_free0 (_tmp2_); #line 341 "/home/jens/Source/shotwell/src/Resources.vala" - _g_free0 (_tmp4_); -#line 341 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp6_; + result = _tmp4_; #line 341 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 537 "Resources.c" +#line 552 "Resources.c" } else { - gchar** _tmp7_; - gint _tmp7__length1; -#line 342 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp7_ = names; -#line 342 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp7__length1 = names_length1; #line 342 "/home/jens/Source/shotwell/src/Resources.vala" - if (_tmp7__length1 == 2) { -#line 547 "Resources.c" - gchar** _tmp8_; - gint _tmp8__length1; - const gchar* _tmp9_; + if (names_length1 == 2) { +#line 556 "Resources.c" + const gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + const gchar* _tmp8_; + gchar* _tmp9_; gchar* _tmp10_; gchar* _tmp11_; - gchar** _tmp12_; - gint _tmp12__length1; - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; -#line 344 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp8_ = names; -#line 344 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp8__length1 = names_length1; -#line 344 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp9_ = _tmp8_[0]; -#line 344 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp10_ = hierarchical_tag_utilities_get_basename (_tmp9_); + gchar* _tmp12_; #line 344 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp11_ = _tmp10_; + _tmp5_ = names[0]; #line 344 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp12_ = names; + _tmp6_ = hierarchical_tag_utilities_get_basename (_tmp5_); #line 344 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp12__length1 = names_length1; + _tmp7_ = _tmp6_; #line 344 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp13_ = _tmp12_[1]; + _tmp8_ = names[1]; #line 344 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp14_ = hierarchical_tag_utilities_get_basename (_tmp13_); + _tmp9_ = hierarchical_tag_utilities_get_basename (_tmp8_); #line 344 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp15_ = _tmp14_; + _tmp10_ = _tmp9_; #line 344 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp16_ = g_strdup_printf (_ ("Add Tags “%s” and “%s”"), _tmp11_, _tmp15_); + _tmp11_ = g_strdup_printf (_ ("Add Tags “%s” and “%s”"), _tmp7_, _tmp10_); #line 344 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp17_ = _tmp16_; + _tmp12_ = _tmp11_; #line 344 "/home/jens/Source/shotwell/src/Resources.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp10_); #line 344 "/home/jens/Source/shotwell/src/Resources.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp7_); #line 344 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp17_; + result = _tmp12_; #line 344 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 592 "Resources.c" +#line 589 "Resources.c" } else { - gchar* _tmp18_; + gchar* _tmp13_; #line 349 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp18_ = g_strdup (C_ ("UndoRedo menu entry", "Add Tags")); + _tmp13_ = g_strdup (C_ ("UndoRedo menu entry", "Add Tags")); #line 349 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp18_; + result = _tmp13_; #line 349 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 601 "Resources.c" +#line 598 "Resources.c" } } } -gchar* resources_delete_tag_menu (const gchar* name) { +gchar* +resources_delete_tag_menu (const gchar* name) +{ gchar* result = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; #line 353 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (name != NULL, NULL); #line 354 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = name; + _tmp0_ = g_strdup_printf (_ ("_Delete Tag “%s”"), name); #line 354 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = g_strdup_printf (_ ("_Delete Tag “%s”"), _tmp0_); -#line 354 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp1_; + result = _tmp0_; #line 354 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 621 "Resources.c" +#line 617 "Resources.c" } -gchar* resources_delete_tag_label (const gchar* name) { +gchar* +resources_delete_tag_label (const gchar* name) +{ gchar* result = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; #line 357 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (name != NULL, NULL); #line 358 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = name; -#line 358 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = g_strdup_printf (_ ("Delete Tag “%s”"), _tmp0_); + _tmp0_ = g_strdup_printf (_ ("Delete Tag “%s”"), name); #line 358 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp1_; + result = _tmp0_; #line 358 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 639 "Resources.c" +#line 634 "Resources.c" } -gchar* resources_rename_tag_menu (const gchar* name) { +gchar* +resources_rename_tag_menu (const gchar* name) +{ gchar* result = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; #line 366 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (name != NULL, NULL); #line 367 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = name; + _tmp0_ = g_strdup_printf (_ ("Re_name Tag “%s”…"), name); #line 367 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = g_strdup_printf (_ ("Re_name Tag “%s”…"), _tmp0_); -#line 367 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp1_; + result = _tmp0_; #line 367 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 657 "Resources.c" +#line 651 "Resources.c" } -gchar* resources_rename_tag_label (const gchar* old_name, const gchar* new_name) { +gchar* +resources_rename_tag_label (const gchar* old_name, + const gchar* new_name) +{ gchar* result = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp0_; #line 370 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (old_name != NULL, NULL); #line 370 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (new_name != NULL, NULL); #line 371 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = old_name; + _tmp0_ = g_strdup_printf (_ ("Rename Tag “%s” to “%s”"), old_name, new_name); #line 371 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = new_name; -#line 371 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = g_strdup_printf (_ ("Rename Tag “%s” to “%s”"), _tmp0_, _tmp1_); -#line 371 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp2_; + result = _tmp0_; #line 371 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 680 "Resources.c" +#line 671 "Resources.c" } -gchar* resources_tag_photos_label (const gchar* name, gint count) { +gchar* +resources_tag_photos_label (const gchar* name, + gint count) +{ gchar* result = NULL; - gint _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp0_; #line 379 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (name != NULL, NULL); #line 380 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = count; -#line 380 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = name; + _tmp0_ = g_strdup_printf (ngettext ("Tag Photo as “%s”", "Tag Photos as “%s”", (gulong) count), name); #line 380 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = g_strdup_printf (ngettext ("Tag Photo as “%s”", "Tag Photos as “%s”", (gulong) _tmp0_), _tmp1_); -#line 380 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp2_; + result = _tmp0_; #line 380 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 701 "Resources.c" +#line 689 "Resources.c" } -gchar* resources_tag_photos_tooltip (const gchar* name, gint count) { +gchar* +resources_tag_photos_tooltip (const gchar* name, + gint count) +{ gchar* result = NULL; - gint _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp0_; #line 385 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (name != NULL, NULL); #line 386 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = count; + _tmp0_ = g_strdup_printf (ngettext ("Tag the selected photo as “%s”", "Tag the selected photos as “%s”", (gulong) count), name); #line 386 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = name; -#line 386 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = g_strdup_printf (ngettext ("Tag the selected photo as “%s”", "Tag the selected photos as “%s”", (gulong) _tmp0_), _tmp1_); -#line 386 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp2_; + result = _tmp0_; #line 386 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 722 "Resources.c" +#line 707 "Resources.c" } -gchar* resources_untag_photos_menu (const gchar* name, gint count) { +gchar* +resources_untag_photos_menu (const gchar* name, + gint count) +{ gchar* result = NULL; - gint _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp0_; #line 391 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (name != NULL, NULL); #line 392 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = count; -#line 392 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = name; + _tmp0_ = g_strdup_printf (ngettext ("Remove Tag “%s” From _Photo", "Remove Tag “%s” From _Photos", (gulong) count), name); #line 392 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = g_strdup_printf (ngettext ("Remove Tag “%s” From _Photo", "Remove Tag “%s” From _Photos", (gulong) _tmp0_), _tmp1_); -#line 392 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp2_; + result = _tmp0_; #line 392 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 743 "Resources.c" +#line 725 "Resources.c" } -gchar* resources_untag_photos_label (const gchar* name, gint count) { +gchar* +resources_untag_photos_label (const gchar* name, + gint count) +{ gchar* result = NULL; - gint _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp0_; #line 397 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (name != NULL, NULL); #line 398 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = count; -#line 398 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = name; + _tmp0_ = g_strdup_printf (ngettext ("Remove Tag “%s” From Photo", "Remove Tag “%s” From Photos", (gulong) count), name); #line 398 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = g_strdup_printf (ngettext ("Remove Tag “%s” From Photo", "Remove Tag “%s” From Photos", (gulong) _tmp0_), _tmp1_); -#line 398 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp2_; + result = _tmp0_; #line 398 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 764 "Resources.c" +#line 743 "Resources.c" } -gchar* resources_rename_tag_exists_message (const gchar* name) { +gchar* +resources_rename_tag_exists_message (const gchar* name) +{ gchar* result = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; #line 403 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (name != NULL, NULL); #line 404 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = name; + _tmp0_ = g_strdup_printf (_ ("Unable to rename tag to “%s” because the tag already exists."), name); #line 404 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = g_strdup_printf (_ ("Unable to rename tag to “%s” because the tag already exists."), _tmp0_); -#line 404 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp1_; + result = _tmp0_; #line 404 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 782 "Resources.c" +#line 760 "Resources.c" } -gchar* resources_rename_search_exists_message (const gchar* name) { +gchar* +resources_rename_search_exists_message (const gchar* name) +{ gchar* result = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; #line 407 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (name != NULL, NULL); #line 408 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = name; + _tmp0_ = g_strdup_printf (_ ("Unable to rename search to “%s” because the search already exists."), name); #line 408 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = g_strdup_printf (_ ("Unable to rename search to “%s” because the search already exists."), _tmp0_); -#line 408 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp1_; + result = _tmp0_; #line 408 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 800 "Resources.c" +#line 777 "Resources.c" } -gchar* resources_rename_search_label (const gchar* old_name, const gchar* new_name) { +gchar* +resources_rename_search_label (const gchar* old_name, + const gchar* new_name) +{ gchar* result = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp0_; #line 419 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (old_name != NULL, NULL); #line 419 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (new_name != NULL, NULL); #line 420 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = old_name; -#line 420 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = new_name; + _tmp0_ = g_strdup_printf (_ ("Rename Search “%s” to “%s”"), old_name, new_name); #line 420 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = g_strdup_printf (_ ("Rename Search “%s” to “%s”"), _tmp0_, _tmp1_); -#line 420 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp2_; + result = _tmp0_; #line 420 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 823 "Resources.c" +#line 797 "Resources.c" } -gchar* resources_delete_search_label (const gchar* name) { +gchar* +resources_delete_search_label (const gchar* name) +{ gchar* result = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; #line 423 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (name != NULL, NULL); #line 424 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = name; + _tmp0_ = g_strdup_printf (_ ("Delete Search “%s”"), name); #line 424 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = g_strdup_printf (_ ("Delete Search “%s”"), _tmp0_); -#line 424 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp1_; + result = _tmp0_; #line 424 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 841 "Resources.c" +#line 814 "Resources.c" } -const gchar* resources_rating_label (Rating rating) { +const gchar* +resources_rating_label (Rating rating) +{ const gchar* result = NULL; - Rating _tmp0_; #line 428 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = rating; -#line 428 "/home/jens/Source/shotwell/src/Resources.vala" - switch (_tmp0_) { + switch (rating) { #line 428 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_REJECTED: -#line 854 "Resources.c" +#line 826 "Resources.c" { #line 430 "/home/jens/Source/shotwell/src/Resources.vala" result = RESOURCES_RATE_REJECTED_LABEL; #line 430 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 860 "Resources.c" +#line 832 "Resources.c" } #line 428 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_UNRATED: -#line 864 "Resources.c" +#line 836 "Resources.c" { #line 432 "/home/jens/Source/shotwell/src/Resources.vala" result = RESOURCES_RATE_UNRATED_LABEL; #line 432 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 870 "Resources.c" +#line 842 "Resources.c" } #line 428 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_ONE: -#line 874 "Resources.c" +#line 846 "Resources.c" { - const gchar* _tmp1_; + const gchar* _tmp0_; #line 434 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = resources_RATE_ONE_LABEL; + _tmp0_ = resources_RATE_ONE_LABEL; #line 434 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp1_; + result = _tmp0_; #line 434 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 883 "Resources.c" +#line 855 "Resources.c" } #line 428 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_TWO: -#line 887 "Resources.c" +#line 859 "Resources.c" { - const gchar* _tmp2_; + const gchar* _tmp1_; #line 436 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = resources_RATE_TWO_LABEL; + _tmp1_ = resources_RATE_TWO_LABEL; #line 436 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp2_; + result = _tmp1_; #line 436 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 896 "Resources.c" +#line 868 "Resources.c" } #line 428 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_THREE: -#line 900 "Resources.c" +#line 872 "Resources.c" { - const gchar* _tmp3_; + const gchar* _tmp2_; #line 438 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp3_ = resources_RATE_THREE_LABEL; + _tmp2_ = resources_RATE_THREE_LABEL; #line 438 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp3_; + result = _tmp2_; #line 438 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 909 "Resources.c" +#line 881 "Resources.c" } #line 428 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FOUR: -#line 913 "Resources.c" +#line 885 "Resources.c" { - const gchar* _tmp4_; + const gchar* _tmp3_; #line 440 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp4_ = resources_RATE_FOUR_LABEL; + _tmp3_ = resources_RATE_FOUR_LABEL; #line 440 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp4_; + result = _tmp3_; #line 440 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 922 "Resources.c" +#line 894 "Resources.c" } #line 428 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FIVE: -#line 926 "Resources.c" +#line 898 "Resources.c" { - const gchar* _tmp5_; + const gchar* _tmp4_; #line 442 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp5_ = resources_RATE_FIVE_LABEL; + _tmp4_ = resources_RATE_FIVE_LABEL; #line 442 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp5_; + result = _tmp4_; #line 442 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 935 "Resources.c" +#line 907 "Resources.c" } default: { @@ -967,103 +939,102 @@ const gchar* resources_rating_label (Rating rating) { result = RESOURCES_RATE_UNRATED_LABEL; #line 444 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 943 "Resources.c" +#line 915 "Resources.c" } } } -const gchar* resources_rating_combo_box (Rating rating) { +const gchar* +resources_rating_combo_box (Rating rating) +{ const gchar* result = NULL; - Rating _tmp0_; #line 449 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = rating; -#line 449 "/home/jens/Source/shotwell/src/Resources.vala" - switch (_tmp0_) { + switch (rating) { #line 449 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_REJECTED: -#line 958 "Resources.c" +#line 929 "Resources.c" { #line 451 "/home/jens/Source/shotwell/src/Resources.vala" result = RESOURCES_RATE_REJECTED_COMBO_BOX; #line 451 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 964 "Resources.c" +#line 935 "Resources.c" } #line 449 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_UNRATED: -#line 968 "Resources.c" +#line 939 "Resources.c" { #line 453 "/home/jens/Source/shotwell/src/Resources.vala" result = RESOURCES_RATE_UNRATED_COMBO_BOX; #line 453 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 974 "Resources.c" +#line 945 "Resources.c" } #line 449 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_ONE: -#line 978 "Resources.c" +#line 949 "Resources.c" { - const gchar* _tmp1_; + const gchar* _tmp0_; #line 455 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = resources_RATE_ONE_MENU; + _tmp0_ = resources_RATE_ONE_MENU; #line 455 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp1_; + result = _tmp0_; #line 455 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 987 "Resources.c" +#line 958 "Resources.c" } #line 449 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_TWO: -#line 991 "Resources.c" +#line 962 "Resources.c" { - const gchar* _tmp2_; + const gchar* _tmp1_; #line 457 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = resources_RATE_TWO_MENU; + _tmp1_ = resources_RATE_TWO_MENU; #line 457 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp2_; + result = _tmp1_; #line 457 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1000 "Resources.c" +#line 971 "Resources.c" } #line 449 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_THREE: -#line 1004 "Resources.c" +#line 975 "Resources.c" { - const gchar* _tmp3_; + const gchar* _tmp2_; #line 459 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp3_ = resources_RATE_THREE_MENU; + _tmp2_ = resources_RATE_THREE_MENU; #line 459 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp3_; + result = _tmp2_; #line 459 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1013 "Resources.c" +#line 984 "Resources.c" } #line 449 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FOUR: -#line 1017 "Resources.c" +#line 988 "Resources.c" { - const gchar* _tmp4_; + const gchar* _tmp3_; #line 461 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp4_ = resources_RATE_FOUR_MENU; + _tmp3_ = resources_RATE_FOUR_MENU; #line 461 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp4_; + result = _tmp3_; #line 461 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1026 "Resources.c" +#line 997 "Resources.c" } #line 449 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FIVE: -#line 1030 "Resources.c" +#line 1001 "Resources.c" { - const gchar* _tmp5_; + const gchar* _tmp4_; #line 463 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp5_ = resources_RATE_FIVE_MENU; + _tmp4_ = resources_RATE_FIVE_MENU; #line 463 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp5_; + result = _tmp4_; #line 463 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1039 "Resources.c" +#line 1010 "Resources.c" } default: { @@ -1071,462 +1042,441 @@ const gchar* resources_rating_combo_box (Rating rating) { result = RESOURCES_RATE_UNRATED_MENU; #line 465 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1047 "Resources.c" +#line 1018 "Resources.c" } } } -gchar* resources_get_rating_filter_tooltip (RatingFilter filter) { +gchar* +resources_get_rating_filter_tooltip (RatingFilter filter) +{ gchar* result = NULL; - RatingFilter _tmp0_; -#line 470 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = filter; #line 470 "/home/jens/Source/shotwell/src/Resources.vala" - switch (_tmp0_) { + switch (filter) { #line 470 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_REJECTED_OR_HIGHER: -#line 1062 "Resources.c" +#line 1032 "Resources.c" { - gchar* _tmp1_; + gchar* _tmp0_; #line 472 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = g_strdup (RESOURCES_DISPLAY_REJECTED_OR_HIGHER_TOOLTIP); + _tmp0_ = g_strdup (RESOURCES_DISPLAY_REJECTED_OR_HIGHER_TOOLTIP); #line 472 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp1_; + result = _tmp0_; #line 472 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1071 "Resources.c" +#line 1041 "Resources.c" } #line 470 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_ONE_OR_HIGHER: -#line 1075 "Resources.c" +#line 1045 "Resources.c" { - const gchar* _tmp2_; - gchar* _tmp3_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 475 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = resources_DISPLAY_ONE_OR_HIGHER_TOOLTIP; + _tmp1_ = resources_DISPLAY_ONE_OR_HIGHER_TOOLTIP; #line 475 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp2_ = g_strdup (_tmp1_); #line 475 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp3_; + result = _tmp2_; #line 475 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1087 "Resources.c" +#line 1057 "Resources.c" } #line 470 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_TWO_OR_HIGHER: -#line 1091 "Resources.c" +#line 1061 "Resources.c" { - const gchar* _tmp4_; - gchar* _tmp5_; + const gchar* _tmp3_; + gchar* _tmp4_; #line 478 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp4_ = resources_DISPLAY_TWO_OR_HIGHER_TOOLTIP; + _tmp3_ = resources_DISPLAY_TWO_OR_HIGHER_TOOLTIP; #line 478 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp5_ = g_strdup (_tmp4_); + _tmp4_ = g_strdup (_tmp3_); #line 478 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp5_; + result = _tmp4_; #line 478 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1103 "Resources.c" +#line 1073 "Resources.c" } #line 470 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_THREE_OR_HIGHER: -#line 1107 "Resources.c" +#line 1077 "Resources.c" { - const gchar* _tmp6_; - gchar* _tmp7_; + const gchar* _tmp5_; + gchar* _tmp6_; #line 481 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp6_ = resources_DISPLAY_THREE_OR_HIGHER_TOOLTIP; + _tmp5_ = resources_DISPLAY_THREE_OR_HIGHER_TOOLTIP; #line 481 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp6_ = g_strdup (_tmp5_); #line 481 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp7_; + result = _tmp6_; #line 481 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1119 "Resources.c" +#line 1089 "Resources.c" } #line 470 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_FOUR_OR_HIGHER: -#line 1123 "Resources.c" +#line 1093 "Resources.c" { - const gchar* _tmp8_; - gchar* _tmp9_; + const gchar* _tmp7_; + gchar* _tmp8_; #line 484 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp8_ = resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP; + _tmp7_ = resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP; #line 484 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp9_ = g_strdup (_tmp8_); + _tmp8_ = g_strdup (_tmp7_); #line 484 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp9_; + result = _tmp8_; #line 484 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1135 "Resources.c" +#line 1105 "Resources.c" } #line 470 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_FIVE_ONLY: #line 470 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_FIVE_OR_HIGHER: -#line 1141 "Resources.c" +#line 1111 "Resources.c" { - const gchar* _tmp10_; - gchar* _tmp11_; + const gchar* _tmp9_; + gchar* _tmp10_; #line 488 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp10_ = resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP; + _tmp9_ = resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP; #line 488 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp11_ = g_strdup (_tmp10_); + _tmp10_ = g_strdup (_tmp9_); #line 488 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp11_; + result = _tmp10_; #line 488 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1153 "Resources.c" +#line 1123 "Resources.c" } #line 470 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_REJECTED_ONLY: -#line 1157 "Resources.c" +#line 1127 "Resources.c" { - gchar* _tmp12_; + gchar* _tmp11_; #line 491 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp12_ = g_strdup (RESOURCES_DISPLAY_REJECTED_ONLY_TOOLTIP); + _tmp11_ = g_strdup (RESOURCES_DISPLAY_REJECTED_ONLY_TOOLTIP); #line 491 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp12_; + result = _tmp11_; #line 491 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1166 "Resources.c" +#line 1136 "Resources.c" } default: #line 470 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_UNRATED_OR_HIGHER: -#line 1171 "Resources.c" +#line 1141 "Resources.c" { - gchar* _tmp13_; + gchar* _tmp12_; #line 495 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp13_ = g_strdup (RESOURCES_DISPLAY_UNRATED_OR_HIGHER_TOOLTIP); + _tmp12_ = g_strdup (RESOURCES_DISPLAY_UNRATED_OR_HIGHER_TOOLTIP); #line 495 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp13_; + result = _tmp12_; #line 495 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1180 "Resources.c" +#line 1150 "Resources.c" } } } -gchar* resources_rating_progress (Rating rating) { +gchar* +resources_rating_progress (Rating rating) +{ gchar* result = NULL; - Rating _tmp0_; #line 500 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = rating; -#line 500 "/home/jens/Source/shotwell/src/Resources.vala" - switch (_tmp0_) { + switch (rating) { #line 500 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_REJECTED: -#line 1195 "Resources.c" +#line 1164 "Resources.c" { - gchar* _tmp1_; + gchar* _tmp0_; #line 502 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = g_strdup (RESOURCES_RATE_REJECTED_PROGRESS); + _tmp0_ = g_strdup (RESOURCES_RATE_REJECTED_PROGRESS); #line 502 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp1_; + result = _tmp0_; #line 502 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1204 "Resources.c" +#line 1173 "Resources.c" } #line 500 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_UNRATED: -#line 1208 "Resources.c" +#line 1177 "Resources.c" { - gchar* _tmp2_; + gchar* _tmp1_; #line 504 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = g_strdup (RESOURCES_RATE_UNRATED_PROGRESS); + _tmp1_ = g_strdup (RESOURCES_RATE_UNRATED_PROGRESS); #line 504 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp2_; + result = _tmp1_; #line 504 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1217 "Resources.c" +#line 1186 "Resources.c" } #line 500 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_ONE: -#line 1221 "Resources.c" +#line 1190 "Resources.c" { - const gchar* _tmp3_; - gchar* _tmp4_; + const gchar* _tmp2_; + gchar* _tmp3_; #line 506 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp3_ = resources_RATE_ONE_PROGRESS; + _tmp2_ = resources_RATE_ONE_PROGRESS; #line 506 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp4_ = g_strdup (_tmp3_); + _tmp3_ = g_strdup (_tmp2_); #line 506 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp4_; + result = _tmp3_; #line 506 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1233 "Resources.c" +#line 1202 "Resources.c" } #line 500 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_TWO: -#line 1237 "Resources.c" +#line 1206 "Resources.c" { - const gchar* _tmp5_; - gchar* _tmp6_; + const gchar* _tmp4_; + gchar* _tmp5_; #line 508 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp5_ = resources_RATE_TWO_PROGRESS; + _tmp4_ = resources_RATE_TWO_PROGRESS; #line 508 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp6_ = g_strdup (_tmp5_); + _tmp5_ = g_strdup (_tmp4_); #line 508 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp6_; + result = _tmp5_; #line 508 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1249 "Resources.c" +#line 1218 "Resources.c" } #line 500 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_THREE: -#line 1253 "Resources.c" +#line 1222 "Resources.c" { - const gchar* _tmp7_; - gchar* _tmp8_; + const gchar* _tmp6_; + gchar* _tmp7_; #line 510 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp7_ = resources_RATE_THREE_PROGRESS; + _tmp6_ = resources_RATE_THREE_PROGRESS; #line 510 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp8_ = g_strdup (_tmp7_); + _tmp7_ = g_strdup (_tmp6_); #line 510 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp8_; + result = _tmp7_; #line 510 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1265 "Resources.c" +#line 1234 "Resources.c" } #line 500 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FOUR: -#line 1269 "Resources.c" +#line 1238 "Resources.c" { - const gchar* _tmp9_; - gchar* _tmp10_; + const gchar* _tmp8_; + gchar* _tmp9_; #line 512 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp9_ = resources_RATE_FOUR_PROGRESS; + _tmp8_ = resources_RATE_FOUR_PROGRESS; #line 512 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp10_ = g_strdup (_tmp9_); + _tmp9_ = g_strdup (_tmp8_); #line 512 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp10_; + result = _tmp9_; #line 512 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1281 "Resources.c" +#line 1250 "Resources.c" } #line 500 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FIVE: -#line 1285 "Resources.c" +#line 1254 "Resources.c" { - const gchar* _tmp11_; - gchar* _tmp12_; + const gchar* _tmp10_; + gchar* _tmp11_; #line 514 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp11_ = resources_RATE_FIVE_PROGRESS; + _tmp10_ = resources_RATE_FIVE_PROGRESS; #line 514 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp12_ = g_strdup (_tmp11_); + _tmp11_ = g_strdup (_tmp10_); #line 514 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp12_; + result = _tmp11_; #line 514 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1297 "Resources.c" +#line 1266 "Resources.c" } default: { - gchar* _tmp13_; + gchar* _tmp12_; #line 516 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp13_ = g_strdup (RESOURCES_RATE_UNRATED_PROGRESS); + _tmp12_ = g_strdup (RESOURCES_RATE_UNRATED_PROGRESS); #line 516 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp13_; + result = _tmp12_; #line 516 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1308 "Resources.c" +#line 1277 "Resources.c" } } } -gchar* resources_get_stars (Rating rating) { +gchar* +resources_get_stars (Rating rating) +{ gchar* result = NULL; - Rating _tmp0_; -#line 523 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = rating; #line 523 "/home/jens/Source/shotwell/src/Resources.vala" - switch (_tmp0_) { + switch (rating) { #line 523 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_ONE: -#line 1323 "Resources.c" +#line 1291 "Resources.c" { - gchar* _tmp1_; + gchar* _tmp0_; #line 525 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = g_strdup ("\xE2\x98\x85"); + _tmp0_ = g_strdup ("\xE2\x98\x85"); #line 525 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp1_; + result = _tmp0_; #line 525 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1332 "Resources.c" +#line 1300 "Resources.c" } #line 523 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_TWO: -#line 1336 "Resources.c" +#line 1304 "Resources.c" { - gchar* _tmp2_; + gchar* _tmp1_; #line 527 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85"); + _tmp1_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85"); #line 527 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp2_; + result = _tmp1_; #line 527 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1345 "Resources.c" +#line 1313 "Resources.c" } #line 523 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_THREE: -#line 1349 "Resources.c" +#line 1317 "Resources.c" { - gchar* _tmp3_; + gchar* _tmp2_; #line 529 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp3_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85"); + _tmp2_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85"); #line 529 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp3_; + result = _tmp2_; #line 529 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1358 "Resources.c" +#line 1326 "Resources.c" } #line 523 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FOUR: -#line 1362 "Resources.c" +#line 1330 "Resources.c" { - gchar* _tmp4_; + gchar* _tmp3_; #line 531 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp4_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85"); + _tmp3_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85"); #line 531 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp4_; + result = _tmp3_; #line 531 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1371 "Resources.c" +#line 1339 "Resources.c" } #line 523 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FIVE: -#line 1375 "Resources.c" +#line 1343 "Resources.c" { - gchar* _tmp5_; + gchar* _tmp4_; #line 533 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp5_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85"); + _tmp4_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85"); #line 533 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp5_; + result = _tmp4_; #line 533 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1384 "Resources.c" +#line 1352 "Resources.c" } default: { - gchar* _tmp6_; + gchar* _tmp5_; #line 535 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp6_ = g_strdup (""); + _tmp5_ = g_strdup (""); #line 535 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp6_; + result = _tmp5_; #line 535 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1395 "Resources.c" +#line 1363 "Resources.c" } } } -GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) { +GdkPixbuf* +resources_get_rating_trinket (Rating rating, + gint scale) +{ GdkPixbuf* result = NULL; - Rating _tmp0_; #line 540 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = rating; -#line 540 "/home/jens/Source/shotwell/src/Resources.vala" - switch (_tmp0_) { + switch (rating) { #line 540 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_REJECTED: -#line 1410 "Resources.c" +#line 1378 "Resources.c" { - gint _tmp1_; - GdkPixbuf* _tmp2_; -#line 542 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = scale; + GdkPixbuf* _tmp0_; #line 542 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = resources_get_icon (RESOURCES_ICON_RATING_REJECTED, _tmp1_); + _tmp0_ = resources_get_icon (RESOURCES_ICON_RATING_REJECTED, scale); #line 542 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp2_; + result = _tmp0_; #line 542 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1422 "Resources.c" +#line 1387 "Resources.c" } #line 540 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_ONE: -#line 1426 "Resources.c" +#line 1391 "Resources.c" { - gint _tmp3_; - GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp1_; #line 545 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp3_ = scale; + _tmp1_ = resources_get_icon (RESOURCES_ICON_RATING_ONE, scale); #line 545 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp4_ = resources_get_icon (RESOURCES_ICON_RATING_ONE, _tmp3_); -#line 545 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp4_; + result = _tmp1_; #line 545 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1438 "Resources.c" +#line 1400 "Resources.c" } #line 540 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_TWO: -#line 1442 "Resources.c" +#line 1404 "Resources.c" { - gint _tmp5_; - GdkPixbuf* _tmp6_; -#line 547 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp5_ = scale; + GdkPixbuf* _tmp2_; #line 547 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp6_ = resources_get_icon (RESOURCES_ICON_RATING_TWO, _tmp5_ * 2); + _tmp2_ = resources_get_icon (RESOURCES_ICON_RATING_TWO, scale * 2); #line 547 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp6_; + result = _tmp2_; #line 547 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1454 "Resources.c" +#line 1413 "Resources.c" } #line 540 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_THREE: -#line 1458 "Resources.c" +#line 1417 "Resources.c" { - gint _tmp7_; - GdkPixbuf* _tmp8_; + GdkPixbuf* _tmp3_; #line 549 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp7_ = scale; + _tmp3_ = resources_get_icon (RESOURCES_ICON_RATING_THREE, scale * 3); #line 549 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp8_ = resources_get_icon (RESOURCES_ICON_RATING_THREE, _tmp7_ * 3); -#line 549 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp8_; + result = _tmp3_; #line 549 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1470 "Resources.c" +#line 1426 "Resources.c" } #line 540 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FOUR: -#line 1474 "Resources.c" +#line 1430 "Resources.c" { - gint _tmp9_; - GdkPixbuf* _tmp10_; -#line 551 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp9_ = scale; + GdkPixbuf* _tmp4_; #line 551 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp10_ = resources_get_icon (RESOURCES_ICON_RATING_FOUR, _tmp9_ * 4); + _tmp4_ = resources_get_icon (RESOURCES_ICON_RATING_FOUR, scale * 4); #line 551 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp10_; + result = _tmp4_; #line 551 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1486 "Resources.c" +#line 1439 "Resources.c" } #line 540 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FIVE: -#line 1490 "Resources.c" +#line 1443 "Resources.c" { - gint _tmp11_; - GdkPixbuf* _tmp12_; -#line 553 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp11_ = scale; + GdkPixbuf* _tmp5_; #line 553 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp12_ = resources_get_icon (RESOURCES_ICON_RATING_FIVE, _tmp11_ * 5); + _tmp5_ = resources_get_icon (RESOURCES_ICON_RATING_FIVE, scale * 5); #line 553 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp12_; + result = _tmp5_; #line 553 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1502 "Resources.c" +#line 1452 "Resources.c" } default: { @@ -1534,13 +1484,15 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) { result = NULL; #line 555 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1510 "Resources.c" +#line 1460 "Resources.c" } } } -void resources_generate_rating_strings (void) { +void +resources_generate_rating_strings (void) +{ gchar* menu_base = NULL; gchar* _tmp0_; gchar* label_base = NULL; @@ -2146,30 +2098,31 @@ void resources_generate_rating_strings (void) { _g_free0 (label_base); #line 559 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (menu_base); -#line 2122 "Resources.c" +#line 2074 "Resources.c" } -gchar* resources_jump_to_file_failed (GError* err) { +gchar* +resources_jump_to_file_failed (GError* err) +{ gchar* result = NULL; - GError* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; -#line 670 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = err; + const gchar* _tmp0_; + gchar* _tmp1_; #line 670 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = _tmp0_->message; + _tmp0_ = err->message; #line 670 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = g_strdup_printf (_ ("Unable to open in file manager: %s"), _tmp1_); + _tmp1_ = g_strdup_printf (_ ("Unable to open in file manager: %s"), _tmp0_); #line 670 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp2_; + result = _tmp1_; #line 670 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2141 "Resources.c" +#line 2092 "Resources.c" } -void resources_init (void) { +void +resources_init (void) +{ GtkIconTheme* _tmp0_; GtkIconTheme* _tmp1_; #line 692 "/home/jens/Source/shotwell/src/Resources.vala" @@ -2180,11 +2133,13 @@ void resources_init (void) { _g_object_unref0 (_tmp1_); #line 694 "/home/jens/Source/shotwell/src/Resources.vala" resources_generate_rating_strings (); -#line 2156 "Resources.c" +#line 2109 "Resources.c" } -void resources_terminate (void) { +void +resources_terminate (void) +{ } @@ -2198,7 +2153,9 @@ void resources_terminate (void) { * and from Marcel Stimberg's original patch to Shotwell to * try to fix this; both are graciously thanked for their help. */ -void resources_fetch_lc_time_format (void) { +void +resources_fetch_lc_time_format (void) +{ gchar* old_language = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -2232,7 +2189,7 @@ void resources_fetch_lc_time_format (void) { if (_tmp2_ != NULL) { #line 715 "/home/jens/Source/shotwell/src/Resources.vala" g_unsetenv ("LANGUAGE"); -#line 2208 "Resources.c" +#line 2165 "Resources.c" } #line 719 "/home/jens/Source/shotwell/src/Resources.vala" _tmp3_ = setlocale (LC_MESSAGES, NULL); @@ -2250,13 +2207,13 @@ void resources_fetch_lc_time_format (void) { _tmp7_ = lc_time; #line 722 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp7_ != NULL) { -#line 2226 "Resources.c" +#line 2183 "Resources.c" const gchar* _tmp8_; #line 723 "/home/jens/Source/shotwell/src/Resources.vala" _tmp8_ = lc_time; #line 723 "/home/jens/Source/shotwell/src/Resources.vala" setlocale (LC_MESSAGES, _tmp8_); -#line 2232 "Resources.c" +#line 2189 "Resources.c" } #line 730 "/home/jens/Source/shotwell/src/Resources.vala" _tmp9_ = g_strdup ("%X"); @@ -2306,25 +2263,25 @@ void resources_fetch_lc_time_format (void) { _tmp17_ = old_messages; #line 762 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp17_ != NULL) { -#line 2282 "Resources.c" +#line 2239 "Resources.c" const gchar* _tmp18_; #line 763 "/home/jens/Source/shotwell/src/Resources.vala" _tmp18_ = old_messages; #line 763 "/home/jens/Source/shotwell/src/Resources.vala" setlocale (LC_MESSAGES, _tmp18_); -#line 2288 "Resources.c" +#line 2245 "Resources.c" } #line 766 "/home/jens/Source/shotwell/src/Resources.vala" _tmp19_ = old_language; #line 766 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp19_ != NULL) { -#line 2294 "Resources.c" +#line 2251 "Resources.c" const gchar* _tmp20_; #line 767 "/home/jens/Source/shotwell/src/Resources.vala" _tmp20_ = old_language; #line 767 "/home/jens/Source/shotwell/src/Resources.vala" g_setenv ("LANGUAGE", _tmp20_, TRUE); -#line 2300 "Resources.c" +#line 2257 "Resources.c" } #line 710 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (lc_time); @@ -2332,11 +2289,13 @@ void resources_fetch_lc_time_format (void) { _g_free0 (old_messages); #line 710 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (old_language); -#line 2308 "Resources.c" +#line 2265 "Resources.c" } -GType resources_unit_system_get_type (void) { +GType +resources_unit_system_get_type (void) +{ static volatile gsize resources_unit_system_type_id__volatile = 0; if (g_once_init_enter (&resources_unit_system_type_id__volatile)) { static const GEnumValue values[] = {{RESOURCES_UNIT_SYSTEM_IMPERIAL, "RESOURCES_UNIT_SYSTEM_IMPERIAL", "imperial"}, {RESOURCES_UNIT_SYSTEM_METRIC, "RESOURCES_UNIT_SYSTEM_METRIC", "metric"}, {RESOURCES_UNIT_SYSTEM_UNKNOWN, "RESOURCES_UNIT_SYSTEM_UNKNOWN", "unknown"}, {0, NULL, NULL}}; @@ -2348,215 +2307,164 @@ GType resources_unit_system_get_type (void) { } -static gint string_last_index_of_char (const gchar* self, gunichar c, gint start_index) { +static gint +string_last_index_of_char (const gchar* self, + gunichar c, + gint start_index) +{ gint result = 0; gchar* _result_ = NULL; - gint _tmp0_; - gunichar _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1041 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; + gchar* _tmp1_; +#line 1055 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = start_index; -#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = c; -#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_); -#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _result_ = _tmp2_; -#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = _result_; -#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ != NULL) { -#line 2345 "Resources.c" - gchar* _tmp4_; -#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = _result_; -#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1056 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_utf8_strrchr (((gchar*) self) + start_index, (gssize) -1, c); +#line 1056 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _result_ = _tmp0_; +#line 1058 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = _result_; +#line 1058 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ != NULL) { +#line 2302 "Resources.c" + gchar* _tmp2_; +#line 1059 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _result_; +#line 1059 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (gint) (_tmp2_ - ((gchar*) self)); +#line 1059 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2353 "Resources.c" +#line 2310 "Resources.c" } else { -#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = -1; -#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2359 "Resources.c" +#line 2316 "Resources.c" } } -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, + glong maxlen) +{ glong result = 0L; gchar* end = NULL; gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 2383 "Resources.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2391 "Resources.c" +#line 2341 "Resources.c" } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2403 "Resources.c" +#line 2350 "Resources.c" } } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, + glong offset, + glong len) +{ gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + glong _tmp6_; + gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#line 2427 "Resources.c" - glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = _tmp2_ >= ((glong) 0); -#line 2433 "Resources.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = len >= ((glong) 0); +#line 2371 "Resources.c" } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 2437 "Resources.c" +#line 2375 "Resources.c" } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 2441 "Resources.c" - glong _tmp3_; - glong _tmp4_; - glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 2453 "Resources.c" +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = string_strnlen ((gchar*) self, offset + len); +#line 2381 "Resources.c" } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#line 2463 "Resources.c" + gint _tmp1_; + gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = (glong) _tmp2_; +#line 2391 "Resources.c" } -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp8_ < ((glong) 0)) { -#line 2469 "Resources.c" - glong _tmp9_; - glong _tmp10_; - glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 2483 "Resources.c" +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset < ((glong) 0)) { +#line 2395 "Resources.c" + glong _tmp3_; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 2403 "Resources.c" } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 2493 "Resources.c" + glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 2410 "Resources.c" } -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp14_ < ((glong) 0)) { -#line 2499 "Resources.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 2508 "Resources.c" +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (len < ((glong) 0)) { +#line 2414 "Resources.c" + glong _tmp5_; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp5_ - offset; +#line 2420 "Resources.c" } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2528 "Resources.c" +#line 2432 "Resources.c" } -static gboolean _vala_string_array_contains (const gchar* * stack, int stack_length, const gchar* needle) { +static gboolean +_vala_string_array_contains (const gchar* * stack, + int stack_length, + const gchar* needle) +{ int i; #line 798 "/home/jens/Source/shotwell/src/Resources.vala" for (i = 0; i < stack_length; i++) { @@ -2564,16 +2472,18 @@ static gboolean _vala_string_array_contains (const gchar* * stack, int stack_len if (g_strcmp0 (stack[i], needle) == 0) { #line 798 "/home/jens/Source/shotwell/src/Resources.vala" return TRUE; -#line 2540 "Resources.c" +#line 2448 "Resources.c" } } #line 798 "/home/jens/Source/shotwell/src/Resources.vala" return FALSE; -#line 2545 "Resources.c" +#line 2453 "Resources.c" } -ResourcesUnitSystem resources_get_default_measurement_unit (void) { +ResourcesUnitSystem +resources_get_default_measurement_unit (void) +{ ResourcesUnitSystem result = 0; ResourcesUnitSystem _tmp0_; const gchar* _tmp2_; @@ -2582,14 +2492,13 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) { gint index = 0; const gchar* _tmp9_; gint _tmp10_; - gint _tmp11_; - const gchar* _tmp15_; - ResourcesUnitSystem _tmp16_; + const gchar* _tmp14_; + ResourcesUnitSystem _tmp15_; #line 783 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = resources_unit_system; #line 783 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp0_ != RESOURCES_UNIT_SYSTEM_UNKNOWN) { -#line 2565 "Resources.c" +#line 2474 "Resources.c" ResourcesUnitSystem _tmp1_; #line 784 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_unit_system; @@ -2597,7 +2506,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) { result = _tmp1_; #line 784 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2573 "Resources.c" +#line 2482 "Resources.c" } #line 787 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = g_getenv ("LC_MEASUREMENT"); @@ -2611,7 +2520,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) { _tmp4_ = resources_lc_measurement; #line 788 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp4_ == NULL) { -#line 2587 "Resources.c" +#line 2496 "Resources.c" gchar** _tmp5_; gchar** _tmp6_; const gchar* _tmp7_; @@ -2626,51 +2535,49 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) { _g_free0 (resources_lc_measurement); #line 789 "/home/jens/Source/shotwell/src/Resources.vala" resources_lc_measurement = _tmp8_; -#line 2602 "Resources.c" +#line 2511 "Resources.c" } #line 792 "/home/jens/Source/shotwell/src/Resources.vala" _tmp9_ = resources_lc_measurement; #line 792 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp10_ = string_last_index_of_char (_tmp9_, (gunichar) '.', 0); -#line 792 "/home/jens/Source/shotwell/src/Resources.vala" - index = _tmp10_; + index = string_last_index_of_char (_tmp9_, (gunichar) '.', 0); #line 793 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp11_ = index; + _tmp10_ = index; #line 793 "/home/jens/Source/shotwell/src/Resources.vala" - if (_tmp11_ > 0) { -#line 2614 "Resources.c" - const gchar* _tmp12_; - gint _tmp13_; - gchar* _tmp14_; + if (_tmp10_ > 0) { +#line 2521 "Resources.c" + const gchar* _tmp11_; + gint _tmp12_; + gchar* _tmp13_; #line 794 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp12_ = resources_lc_measurement; + _tmp11_ = resources_lc_measurement; #line 794 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp13_ = index; + _tmp12_ = index; #line 794 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp14_ = string_substring (_tmp12_, (glong) 0, (glong) _tmp13_); + _tmp13_ = string_substring (_tmp11_, (glong) 0, (glong) _tmp12_); #line 794 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (resources_lc_measurement); #line 794 "/home/jens/Source/shotwell/src/Resources.vala" - resources_lc_measurement = _tmp14_; -#line 2628 "Resources.c" + resources_lc_measurement = _tmp13_; +#line 2535 "Resources.c" } #line 797 "/home/jens/Source/shotwell/src/Resources.vala" resources_unit_system = RESOURCES_UNIT_SYSTEM_METRIC; #line 798 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp15_ = resources_lc_measurement; + _tmp14_ = resources_lc_measurement; #line 798 "/home/jens/Source/shotwell/src/Resources.vala" - if (_vala_string_array_contains (RESOURCES_IMPERIAL_COUNTRIES, G_N_ELEMENTS (RESOURCES_IMPERIAL_COUNTRIES), _tmp15_)) { + if (_vala_string_array_contains (RESOURCES_IMPERIAL_COUNTRIES, G_N_ELEMENTS (RESOURCES_IMPERIAL_COUNTRIES), _tmp14_)) { #line 799 "/home/jens/Source/shotwell/src/Resources.vala" resources_unit_system = RESOURCES_UNIT_SYSTEM_IMPERIAL; -#line 2638 "Resources.c" +#line 2545 "Resources.c" } #line 802 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp16_ = resources_unit_system; + _tmp15_ = resources_unit_system; #line 802 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp16_; + result = _tmp15_; #line 802 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2646 "Resources.c" +#line 2553 "Resources.c" } @@ -2678,7 +2585,9 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) { * @brief Returns a precached format string that matches the * user's LC_TIME settings. */ -gchar* resources_get_hh_mm_format_string (void) { +gchar* +resources_get_hh_mm_format_string (void) +{ gchar* result = NULL; const gchar* _tmp0_; const gchar* _tmp1_; @@ -2689,7 +2598,7 @@ gchar* resources_get_hh_mm_format_string (void) { if (_tmp0_ == NULL) { #line 811 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2665 "Resources.c" +#line 2574 "Resources.c" } #line 814 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_HH_MM_FORMAT_STRING; @@ -2699,11 +2608,13 @@ gchar* resources_get_hh_mm_format_string (void) { result = _tmp2_; #line 814 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2675 "Resources.c" +#line 2584 "Resources.c" } -gchar* resources_get_hh_mm_ss_format_string (void) { +gchar* +resources_get_hh_mm_ss_format_string (void) +{ gchar* result = NULL; const gchar* _tmp0_; const gchar* _tmp1_; @@ -2714,7 +2625,7 @@ gchar* resources_get_hh_mm_ss_format_string (void) { if (_tmp0_ == NULL) { #line 819 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2690 "Resources.c" +#line 2601 "Resources.c" } #line 822 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_HH_MM_SS_FORMAT_STRING; @@ -2724,11 +2635,13 @@ gchar* resources_get_hh_mm_ss_format_string (void) { result = _tmp2_; #line 822 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2700 "Resources.c" +#line 2611 "Resources.c" } -gchar* resources_get_long_date_format_string (void) { +gchar* +resources_get_long_date_format_string (void) +{ gchar* result = NULL; const gchar* _tmp0_; const gchar* _tmp1_; @@ -2739,7 +2652,7 @@ gchar* resources_get_long_date_format_string (void) { if (_tmp0_ == NULL) { #line 827 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2715 "Resources.c" +#line 2628 "Resources.c" } #line 830 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_LONG_DATE_FORMAT_STRING; @@ -2749,11 +2662,13 @@ gchar* resources_get_long_date_format_string (void) { result = _tmp2_; #line 830 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2725 "Resources.c" +#line 2638 "Resources.c" } -gchar* resources_get_start_multiday_span_format_string (void) { +gchar* +resources_get_start_multiday_span_format_string (void) +{ gchar* result = NULL; const gchar* _tmp0_; const gchar* _tmp1_; @@ -2764,7 +2679,7 @@ gchar* resources_get_start_multiday_span_format_string (void) { if (_tmp0_ == NULL) { #line 835 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2740 "Resources.c" +#line 2655 "Resources.c" } #line 838 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_START_MULTIDAY_DATE_FORMAT_STRING; @@ -2774,11 +2689,13 @@ gchar* resources_get_start_multiday_span_format_string (void) { result = _tmp2_; #line 838 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2750 "Resources.c" +#line 2665 "Resources.c" } -gchar* resources_get_end_multiday_span_format_string (void) { +gchar* +resources_get_end_multiday_span_format_string (void) +{ gchar* result = NULL; const gchar* _tmp0_; const gchar* _tmp1_; @@ -2789,7 +2706,7 @@ gchar* resources_get_end_multiday_span_format_string (void) { if (_tmp0_ == NULL) { #line 843 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2765 "Resources.c" +#line 2682 "Resources.c" } #line 846 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_END_MULTIDAY_DATE_FORMAT_STRING; @@ -2799,11 +2716,13 @@ gchar* resources_get_end_multiday_span_format_string (void) { result = _tmp2_; #line 846 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2775 "Resources.c" +#line 2692 "Resources.c" } -gchar* resources_get_start_multimonth_span_format_string (void) { +gchar* +resources_get_start_multimonth_span_format_string (void) +{ gchar* result = NULL; const gchar* _tmp0_; const gchar* _tmp1_; @@ -2814,7 +2733,7 @@ gchar* resources_get_start_multimonth_span_format_string (void) { if (_tmp0_ == NULL) { #line 851 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2790 "Resources.c" +#line 2709 "Resources.c" } #line 854 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_START_MULTIMONTH_DATE_FORMAT_STRING; @@ -2824,11 +2743,13 @@ gchar* resources_get_start_multimonth_span_format_string (void) { result = _tmp2_; #line 854 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2800 "Resources.c" +#line 2719 "Resources.c" } -gchar* resources_get_end_multimonth_span_format_string (void) { +gchar* +resources_get_end_multimonth_span_format_string (void) +{ gchar* result = NULL; const gchar* _tmp0_; const gchar* _tmp1_; @@ -2839,7 +2760,7 @@ gchar* resources_get_end_multimonth_span_format_string (void) { if (_tmp0_ == NULL) { #line 859 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2815 "Resources.c" +#line 2736 "Resources.c" } #line 862 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_END_MULTIMONTH_DATE_FORMAT_STRING; @@ -2849,36 +2770,39 @@ gchar* resources_get_end_multimonth_span_format_string (void) { result = _tmp2_; #line 862 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2825 "Resources.c" +#line 2746 "Resources.c" } -gchar* resources_get_ui (const gchar* filename) { +gchar* +resources_get_ui (const gchar* filename) +{ gchar* result = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; #line 865 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (filename != NULL, NULL); #line 866 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = filename; + _tmp0_ = g_strdup_printf ("/org/gnome/Shotwell/ui/%s", filename); #line 866 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = g_strdup_printf ("/org/gnome/Shotwell/ui/%s", _tmp0_); -#line 866 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp1_; + result = _tmp0_; #line 866 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2843 "Resources.c" +#line 2763 "Resources.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 882 "/home/jens/Source/shotwell/src/Resources.vala" return self ? g_object_ref (self) : NULL; -#line 2850 "Resources.c" +#line 2772 "Resources.c" } -GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) { +GdkPixbuf* +resources_get_noninterpretable_badge_pixbuf (void) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_; GdkPixbuf* _tmp7_; @@ -2888,7 +2812,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) { _tmp0_ = resources_noninterpretable_badge_pixbuf; #line 873 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp0_ == NULL) { -#line 2864 "Resources.c" +#line 2788 "Resources.c" { gchar* path = NULL; gchar* _tmp1_; @@ -2910,7 +2834,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 876 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (path); -#line 2886 "Resources.c" +#line 2810 "Resources.c" goto __catch438_g_error; } #line 876 "/home/jens/Source/shotwell/src/Resources.vala" @@ -2925,7 +2849,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) { _g_object_unref0 (_tmp2_); #line 874 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (path); -#line 2901 "Resources.c" +#line 2825 "Resources.c" } goto __finally438; __catch438_g_error: @@ -2943,7 +2867,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) { "e: %s", _tmp6_); #line 874 "/home/jens/Source/shotwell/src/Resources.vala" _g_error_free0 (err); -#line 2918 "Resources.c" +#line 2842 "Resources.c" } __finally438: #line 874 "/home/jens/Source/shotwell/src/Resources.vala" @@ -2954,7 +2878,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) { g_clear_error (&_inner_error_); #line 874 "/home/jens/Source/shotwell/src/Resources.vala" return NULL; -#line 2929 "Resources.c" +#line 2853 "Resources.c" } } #line 882 "/home/jens/Source/shotwell/src/Resources.vala" @@ -2965,11 +2889,13 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) { result = _tmp8_; #line 882 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2940 "Resources.c" +#line 2864 "Resources.c" } -GtkIconTheme* resources_get_icon_theme_engine (void) { +GtkIconTheme* +resources_get_icon_theme_engine (void) +{ GtkIconTheme* result = NULL; GtkIconTheme* icon_theme = NULL; GtkIconTheme* _tmp0_; @@ -2986,276 +2912,245 @@ GtkIconTheme* resources_get_icon_theme_engine (void) { result = icon_theme; #line 889 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2961 "Resources.c" +#line 2887 "Resources.c" } -GdkPixbuf* resources_get_icon (const gchar* name, gint scale) { +GdkPixbuf* +resources_get_icon (const gchar* name, + gint scale) +{ GdkPixbuf* result = NULL; GeeHashMap* _tmp0_; - GeeHashMap* _tmp10_; + GeeHashMap* _tmp7_; GdkPixbuf* pixbuf = NULL; - GeeHashMap* _tmp12_; - const gchar* _tmp13_; - gpointer _tmp14_; - GdkPixbuf* _tmp15_; - gint _tmp22_; + GeeHashMap* _tmp9_; + gpointer _tmp10_; + GdkPixbuf* _tmp11_; GdkPixbuf* scaled_pixbuf = NULL; + GdkPixbuf* _tmp16_; + GdkPixbuf* _tmp17_; + GeeHashMap* _tmp18_; + GeeHashMap* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; GdkPixbuf* _tmp23_; - gint _tmp24_; - GdkPixbuf* _tmp25_; - GeeHashMap* _tmp26_; - GeeHashMap* _tmp28_; - const gchar* _tmp29_; - gint _tmp30_; - gchar* _tmp31_; - gchar* _tmp32_; - GdkPixbuf* _tmp33_; #line 894 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (name != NULL, NULL); #line 895 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = resources_scaled_icon_cache; #line 895 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp0_ != NULL) { -#line 2992 "Resources.c" +#line 2916 "Resources.c" gchar* scaled_name = NULL; - const gchar* _tmp1_; - gint _tmp2_; - gchar* _tmp3_; - GeeHashMap* _tmp4_; - const gchar* _tmp5_; - gboolean _tmp6_; -#line 896 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = name; -#line 896 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = scale; + gchar* _tmp1_; + GeeHashMap* _tmp2_; + const gchar* _tmp3_; #line 896 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp3_ = g_strdup_printf ("%s-%d", _tmp1_, _tmp2_); + _tmp1_ = g_strdup_printf ("%s-%d", name, scale); #line 896 "/home/jens/Source/shotwell/src/Resources.vala" - scaled_name = _tmp3_; -#line 897 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp4_ = resources_scaled_icon_cache; + scaled_name = _tmp1_; #line 897 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp5_ = scaled_name; + _tmp2_ = resources_scaled_icon_cache; #line 897 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp6_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_); + _tmp3_ = scaled_name; #line 897 "/home/jens/Source/shotwell/src/Resources.vala" - if (_tmp6_) { -#line 3016 "Resources.c" - GeeHashMap* _tmp7_; - const gchar* _tmp8_; - gpointer _tmp9_; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_)) { +#line 2931 "Resources.c" + GeeHashMap* _tmp4_; + const gchar* _tmp5_; + gpointer _tmp6_; #line 898 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp7_ = resources_scaled_icon_cache; + _tmp4_ = resources_scaled_icon_cache; #line 898 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp8_ = scaled_name; + _tmp5_ = scaled_name; #line 898 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp9_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_); + _tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_); #line 898 "/home/jens/Source/shotwell/src/Resources.vala" - result = (GdkPixbuf*) _tmp9_; + result = (GdkPixbuf*) _tmp6_; #line 898 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (scaled_name); #line 898 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3032 "Resources.c" +#line 2947 "Resources.c" } #line 895 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (scaled_name); -#line 3036 "Resources.c" +#line 2951 "Resources.c" } #line 903 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp10_ = resources_icon_cache; + _tmp7_ = resources_icon_cache; #line 903 "/home/jens/Source/shotwell/src/Resources.vala" - if (_tmp10_ == NULL) { -#line 3042 "Resources.c" - GeeHashMap* _tmp11_; + if (_tmp7_ == NULL) { +#line 2957 "Resources.c" + GeeHashMap* _tmp8_; #line 904 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp8_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 904 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (resources_icon_cache); #line 904 "/home/jens/Source/shotwell/src/Resources.vala" - resources_icon_cache = _tmp11_; -#line 3050 "Resources.c" + resources_icon_cache = _tmp8_; +#line 2965 "Resources.c" } #line 907 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp12_ = resources_icon_cache; -#line 907 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp13_ = name; + _tmp9_ = resources_icon_cache; #line 907 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp14_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_); + _tmp10_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name); #line 907 "/home/jens/Source/shotwell/src/Resources.vala" - pixbuf = (GdkPixbuf*) _tmp14_; + pixbuf = (GdkPixbuf*) _tmp10_; #line 908 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp15_ = pixbuf; + _tmp11_ = pixbuf; #line 908 "/home/jens/Source/shotwell/src/Resources.vala" - if (_tmp15_ == NULL) { -#line 3064 "Resources.c" - const gchar* _tmp16_; - GdkPixbuf* _tmp17_; - GdkPixbuf* _tmp18_; - GeeHashMap* _tmp19_; - const gchar* _tmp20_; - GdkPixbuf* _tmp21_; -#line 909 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp16_ = name; + if (_tmp11_ == NULL) { +#line 2977 "Resources.c" + GdkPixbuf* _tmp12_; + GdkPixbuf* _tmp13_; + GeeHashMap* _tmp14_; + GdkPixbuf* _tmp15_; #line 909 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp17_ = resources_load_icon (_tmp16_, 0); + _tmp12_ = resources_load_icon (name, 0); #line 909 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (pixbuf); #line 909 "/home/jens/Source/shotwell/src/Resources.vala" - pixbuf = _tmp17_; + pixbuf = _tmp12_; #line 910 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp18_ = pixbuf; + _tmp13_ = pixbuf; #line 910 "/home/jens/Source/shotwell/src/Resources.vala" - if (_tmp18_ == NULL) { + if (_tmp13_ == NULL) { #line 911 "/home/jens/Source/shotwell/src/Resources.vala" result = NULL; #line 911 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (pixbuf); #line 911 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3089 "Resources.c" +#line 2998 "Resources.c" } #line 913 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp19_ = resources_icon_cache; -#line 913 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp20_ = name; + _tmp14_ = resources_icon_cache; #line 913 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp21_ = pixbuf; + _tmp15_ = pixbuf; #line 913 "/home/jens/Source/shotwell/src/Resources.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_, _tmp21_); -#line 3099 "Resources.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name, _tmp15_); +#line 3006 "Resources.c" } #line 916 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp22_ = scale; -#line 916 "/home/jens/Source/shotwell/src/Resources.vala" - if (_tmp22_ <= 0) { + if (scale <= 0) { #line 917 "/home/jens/Source/shotwell/src/Resources.vala" result = pixbuf; #line 917 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3109 "Resources.c" +#line 3014 "Resources.c" } #line 919 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp23_ = pixbuf; + _tmp16_ = pixbuf; #line 919 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp24_ = scale; + _tmp17_ = scale_pixbuf (_tmp16_, scale, GDK_INTERP_BILINEAR, FALSE); #line 919 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp25_ = scale_pixbuf (_tmp23_, _tmp24_, GDK_INTERP_BILINEAR, FALSE); -#line 919 "/home/jens/Source/shotwell/src/Resources.vala" - scaled_pixbuf = _tmp25_; + scaled_pixbuf = _tmp17_; #line 921 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp26_ = resources_scaled_icon_cache; + _tmp18_ = resources_scaled_icon_cache; #line 921 "/home/jens/Source/shotwell/src/Resources.vala" - if (_tmp26_ == NULL) { -#line 3123 "Resources.c" - GeeHashMap* _tmp27_; + if (_tmp18_ == NULL) { +#line 3026 "Resources.c" + GeeHashMap* _tmp19_; #line 922 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp27_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp19_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 922 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (resources_scaled_icon_cache); #line 922 "/home/jens/Source/shotwell/src/Resources.vala" - resources_scaled_icon_cache = _tmp27_; -#line 3131 "Resources.c" + resources_scaled_icon_cache = _tmp19_; +#line 3034 "Resources.c" } #line 924 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp28_ = resources_scaled_icon_cache; + _tmp20_ = resources_scaled_icon_cache; #line 924 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp29_ = name; + _tmp21_ = g_strdup_printf ("%s-%d", name, scale); #line 924 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp30_ = scale; + _tmp22_ = _tmp21_; #line 924 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp31_ = g_strdup_printf ("%s-%d", _tmp29_, _tmp30_); -#line 924 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp32_ = _tmp31_; + _tmp23_ = scaled_pixbuf; #line 924 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp33_ = scaled_pixbuf; + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, _tmp23_); #line 924 "/home/jens/Source/shotwell/src/Resources.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp32_, _tmp33_); -#line 924 "/home/jens/Source/shotwell/src/Resources.vala" - _g_free0 (_tmp32_); + _g_free0 (_tmp22_); #line 926 "/home/jens/Source/shotwell/src/Resources.vala" result = scaled_pixbuf; #line 926 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (pixbuf); #line 926 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3155 "Resources.c" +#line 3054 "Resources.c" } -GdkPixbuf* resources_load_icon (const gchar* name, gint scale) { +GdkPixbuf* +resources_load_icon (const gchar* name, + gint scale) +{ GdkPixbuf* result = NULL; GdkPixbuf* pixbuf = NULL; - GdkPixbuf* _tmp8_; - GdkPixbuf* _tmp9_ = NULL; - gint _tmp10_; + GdkPixbuf* _tmp6_; + GdkPixbuf* _tmp7_ = NULL; GError * _inner_error_ = NULL; #line 929 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (name != NULL, NULL); #line 930 "/home/jens/Source/shotwell/src/Resources.vala" pixbuf = NULL; -#line 3170 "Resources.c" +#line 3071 "Resources.c" { gchar* path = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - GdkPixbuf* _tmp2_ = NULL; + gchar* _tmp0_; + GdkPixbuf* _tmp1_ = NULL; + GdkPixbuf* _tmp2_; GdkPixbuf* _tmp3_; - GdkPixbuf* _tmp4_; #line 932 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = name; + _tmp0_ = g_strdup_printf ("/org/gnome/Shotwell/icons/%s", name); #line 932 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = g_strdup_printf ("/org/gnome/Shotwell/icons/%s", _tmp0_); -#line 932 "/home/jens/Source/shotwell/src/Resources.vala" - path = _tmp1_; + path = _tmp0_; #line 933 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp3_ = gdk_pixbuf_new_from_resource (path, &_inner_error_); + _tmp2_ = gdk_pixbuf_new_from_resource (path, &_inner_error_); #line 933 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = _tmp3_; + _tmp1_ = _tmp2_; #line 933 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 933 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (path); -#line 3192 "Resources.c" +#line 3090 "Resources.c" goto __catch439_g_error; } #line 933 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp4_ = _tmp2_; + _tmp3_ = _tmp1_; #line 933 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = NULL; + _tmp1_ = NULL; #line 933 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (pixbuf); #line 933 "/home/jens/Source/shotwell/src/Resources.vala" - pixbuf = _tmp4_; + pixbuf = _tmp3_; #line 931 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 931 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (path); -#line 3207 "Resources.c" +#line 3105 "Resources.c" } goto __finally439; __catch439_g_error: { GError* err = NULL; + GError* _tmp4_; const gchar* _tmp5_; - GError* _tmp6_; - const gchar* _tmp7_; #line 931 "/home/jens/Source/shotwell/src/Resources.vala" err = _inner_error_; #line 931 "/home/jens/Source/shotwell/src/Resources.vala" _inner_error_ = NULL; #line 935 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp5_ = name; -#line 935 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp6_ = err; + _tmp4_ = err; #line 935 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp7_ = _tmp6_->message; + _tmp5_ = _tmp4_->message; #line 935 "/home/jens/Source/shotwell/src/Resources.vala" - g_critical ("Resources.vala:935: Unable to load icon %s: %s", _tmp5_, _tmp7_); + g_critical ("Resources.vala:935: Unable to load icon %s: %s", name, _tmp5_); #line 931 "/home/jens/Source/shotwell/src/Resources.vala" _g_error_free0 (err); -#line 3230 "Resources.c" +#line 3125 "Resources.c" } __finally439: #line 931 "/home/jens/Source/shotwell/src/Resources.vala" @@ -3268,63 +3163,60 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) { g_clear_error (&_inner_error_); #line 931 "/home/jens/Source/shotwell/src/Resources.vala" return NULL; -#line 3243 "Resources.c" +#line 3138 "Resources.c" } #line 938 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp8_ = pixbuf; + _tmp6_ = pixbuf; #line 938 "/home/jens/Source/shotwell/src/Resources.vala" - if (_tmp8_ == NULL) { + if (_tmp6_ == NULL) { #line 939 "/home/jens/Source/shotwell/src/Resources.vala" result = NULL; #line 939 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (pixbuf); #line 939 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3255 "Resources.c" +#line 3150 "Resources.c" } #line 941 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp10_ = scale; + if (scale > 0) { +#line 3154 "Resources.c" + GdkPixbuf* _tmp8_; + GdkPixbuf* _tmp9_; #line 941 "/home/jens/Source/shotwell/src/Resources.vala" - if (_tmp10_ > 0) { -#line 3261 "Resources.c" - GdkPixbuf* _tmp11_; - gint _tmp12_; - GdkPixbuf* _tmp13_; + _tmp8_ = pixbuf; #line 941 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp11_ = pixbuf; + _tmp9_ = scale_pixbuf (_tmp8_, scale, GDK_INTERP_BILINEAR, FALSE); #line 941 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp12_ = scale; + _g_object_unref0 (_tmp7_); #line 941 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp13_ = scale_pixbuf (_tmp11_, _tmp12_, GDK_INTERP_BILINEAR, FALSE); -#line 941 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp9_); -#line 941 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp9_ = _tmp13_; -#line 3275 "Resources.c" + _tmp7_ = _tmp9_; +#line 3165 "Resources.c" } else { - GdkPixbuf* _tmp14_; - GdkPixbuf* _tmp15_; + GdkPixbuf* _tmp10_; + GdkPixbuf* _tmp11_; #line 941 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp14_ = pixbuf; + _tmp10_ = pixbuf; #line 941 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp15_ = _g_object_ref0 (_tmp14_); + _tmp11_ = _g_object_ref0 (_tmp10_); #line 941 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp7_); #line 941 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp9_ = _tmp15_; -#line 3287 "Resources.c" + _tmp7_ = _tmp11_; +#line 3177 "Resources.c" } #line 941 "/home/jens/Source/shotwell/src/Resources.vala" - result = _tmp9_; + result = _tmp7_; #line 941 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (pixbuf); #line 941 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3295 "Resources.c" +#line 3185 "Resources.c" } -gchar* resources_get_help_path (void) { +gchar* +resources_get_help_path (void) +{ gchar* result = NULL; GFile* dir = NULL; GFile* _tmp0_; @@ -3332,18 +3224,16 @@ gchar* resources_get_help_path (void) { gchar* _tmp2_; gchar* _tmp3_; gboolean _tmp4_; - gboolean _tmp5_; GFile* help_dir = NULL; + GFile* _tmp9_; GFile* _tmp10_; GFile* _tmp11_; GFile* _tmp12_; GFile* _tmp13_; - GFile* _tmp14_; GFile* help_index = NULL; + GFile* _tmp14_; GFile* _tmp15_; GFile* _tmp16_; - GFile* _tmp17_; - gboolean _tmp18_; #line 951 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = app_dirs_get_exec_dir (); #line 951 "/home/jens/Source/shotwell/src/Resources.vala" @@ -3356,91 +3246,84 @@ gchar* resources_get_help_path (void) { _tmp3_ = _tmp2_; #line 953 "/home/jens/Source/shotwell/src/Resources.vala" _tmp4_ = g_str_has_suffix (_tmp3_, "src"); -#line 953 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp5_ = _tmp4_; #line 953 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (_tmp3_); #line 953 "/home/jens/Source/shotwell/src/Resources.vala" - if (_tmp5_) { -#line 3337 "Resources.c" + if (_tmp4_) { +#line 3225 "Resources.c" + GFile* _tmp5_; GFile* _tmp6_; GFile* _tmp7_; GFile* _tmp8_; - GFile* _tmp9_; #line 954 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp6_ = dir; + _tmp5_ = dir; #line 954 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp7_ = g_file_get_parent (_tmp6_); + _tmp6_ = g_file_get_parent (_tmp5_); #line 954 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 954 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp9_ = g_file_get_parent (_tmp8_); + _tmp8_ = g_file_get_parent (_tmp7_); #line 954 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (dir); #line 954 "/home/jens/Source/shotwell/src/Resources.vala" - dir = _tmp9_; + dir = _tmp8_; #line 954 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp8_); -#line 3356 "Resources.c" + _g_object_unref0 (_tmp7_); +#line 3244 "Resources.c" } #line 957 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp10_ = dir; + _tmp9_ = dir; #line 957 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp11_ = g_file_get_child (_tmp10_, "help"); + _tmp10_ = g_file_get_child (_tmp9_, "help"); #line 957 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 957 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp13_ = g_file_get_child (_tmp12_, "C"); + _tmp12_ = g_file_get_child (_tmp11_, "C"); #line 957 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 957 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp11_); #line 957 "/home/jens/Source/shotwell/src/Resources.vala" - help_dir = _tmp14_; + help_dir = _tmp13_; #line 958 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp15_ = help_dir; + _tmp14_ = help_dir; #line 958 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp16_ = g_file_get_child (_tmp15_, "index.page"); + _tmp15_ = g_file_get_child (_tmp14_, "index.page"); #line 958 "/home/jens/Source/shotwell/src/Resources.vala" - help_index = _tmp16_; + help_index = _tmp15_; #line 960 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp17_ = help_index; + _tmp16_ = help_index; #line 960 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp18_ = g_file_query_exists (_tmp17_, NULL); -#line 960 "/home/jens/Source/shotwell/src/Resources.vala" - if (_tmp18_) { -#line 3384 "Resources.c" + if (g_file_query_exists (_tmp16_, NULL)) { +#line 3270 "Resources.c" gchar* help_path = NULL; - GFile* _tmp19_; - gchar* _tmp20_; - const gchar* _tmp21_; - gboolean _tmp22_; + GFile* _tmp17_; + gchar* _tmp18_; + const gchar* _tmp19_; #line 963 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp19_ = help_dir; + _tmp17_ = help_dir; #line 963 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp20_ = g_file_get_path (_tmp19_); + _tmp18_ = g_file_get_path (_tmp17_); #line 963 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (help_path); #line 963 "/home/jens/Source/shotwell/src/Resources.vala" - help_path = _tmp20_; -#line 965 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp21_ = help_path; + help_path = _tmp18_; #line 965 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp22_ = g_str_has_suffix (_tmp21_, "/"); + _tmp19_ = help_path; #line 965 "/home/jens/Source/shotwell/src/Resources.vala" - if (!_tmp22_) { -#line 3404 "Resources.c" - const gchar* _tmp23_; - gchar* _tmp24_; + if (!g_str_has_suffix (_tmp19_, "/")) { +#line 3287 "Resources.c" + const gchar* _tmp20_; + gchar* _tmp21_; #line 966 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp23_ = help_path; + _tmp20_ = help_path; #line 966 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp24_ = g_strconcat (_tmp23_, "/", NULL); + _tmp21_ = g_strconcat (_tmp20_, "/", NULL); #line 966 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (help_path); #line 966 "/home/jens/Source/shotwell/src/Resources.vala" - help_path = _tmp24_; -#line 3415 "Resources.c" + help_path = _tmp21_; +#line 3298 "Resources.c" } #line 969 "/home/jens/Source/shotwell/src/Resources.vala" result = help_path; @@ -3452,7 +3335,7 @@ gchar* resources_get_help_path (void) { _g_object_unref0 (dir); #line 969 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3427 "Resources.c" +#line 3310 "Resources.c" } #line 975 "/home/jens/Source/shotwell/src/Resources.vala" result = NULL; @@ -3464,15 +3347,18 @@ gchar* resources_get_help_path (void) { _g_object_unref0 (dir); #line 975 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3439 "Resources.c" +#line 3322 "Resources.c" } -void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** error) { +void +resources_launch_help (GdkScreen* screen, + const gchar* anchor, + GError** error) +{ gchar* help_path = NULL; gchar* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp27_; GError * _inner_error_ = NULL; #line 978 "/home/jens/Source/shotwell/src/Resources.vala" g_return_if_fail (GDK_IS_SCREEN (screen)); @@ -3484,126 +3370,120 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err _tmp1_ = help_path; #line 981 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp1_ != NULL) { -#line 3459 "Resources.c" - const gchar* _tmp2_; +#line 3345 "Resources.c" gchar** argv = NULL; - gchar** _tmp6_; + gchar** _tmp4_; gint argv_length1; gint _argv_size_; - gchar** _tmp7_; - gint _tmp7__length1; - gchar* _tmp8_; - gchar* _tmp9_; - gchar** _tmp10_; - gint _tmp10__length1; - const gchar* _tmp11_; - gchar* _tmp12_; + gchar** _tmp5_; + gint _tmp5__length1; + gchar* _tmp6_; + gchar* _tmp7_; + gchar** _tmp8_; + gint _tmp8__length1; + const gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + gchar** _tmp12_; + gint _tmp12__length1; gchar* _tmp13_; - gchar** _tmp14_; - gint _tmp14__length1; - gchar* _tmp15_; GPid pid = 0; - gboolean _tmp16_ = FALSE; - GFile* _tmp17_; - GFile* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; - gchar** _tmp21_; - gint _tmp21__length1; - GPid _tmp22_ = 0; - gboolean _tmp23_; - gboolean _tmp24_; - gchar** _tmp25_; - gint _tmp25__length1; - const gchar* _tmp26_; -#line 985 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = anchor; + gboolean _tmp14_ = FALSE; + GFile* _tmp15_; + GFile* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + gchar** _tmp19_; + gint _tmp19__length1; + GPid _tmp20_ = 0; + gboolean _tmp21_; + gboolean _tmp22_; + gchar** _tmp23_; + gint _tmp23__length1; + const gchar* _tmp24_; #line 985 "/home/jens/Source/shotwell/src/Resources.vala" - if (_tmp2_ != NULL) { -#line 3495 "Resources.c" - const gchar* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; -#line 986 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp3_ = help_path; + if (anchor != NULL) { +#line 3378 "Resources.c" + const gchar* _tmp2_; + gchar* _tmp3_; #line 986 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp4_ = anchor; + _tmp2_ = help_path; #line 986 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp5_ = g_strconcat (_tmp3_, _tmp4_, NULL); + _tmp3_ = g_strconcat (_tmp2_, anchor, NULL); #line 986 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (help_path); #line 986 "/home/jens/Source/shotwell/src/Resources.vala" - help_path = _tmp5_; -#line 3509 "Resources.c" + help_path = _tmp3_; +#line 3389 "Resources.c" } #line 989 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp6_ = g_new0 (gchar*, 3 + 1); + _tmp4_ = g_new0 (gchar*, 3 + 1); #line 989 "/home/jens/Source/shotwell/src/Resources.vala" - argv = _tmp6_; + argv = _tmp4_; #line 989 "/home/jens/Source/shotwell/src/Resources.vala" argv_length1 = 3; #line 989 "/home/jens/Source/shotwell/src/Resources.vala" _argv_size_ = argv_length1; #line 990 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp7_ = argv; + _tmp5_ = argv; #line 990 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp7__length1 = argv_length1; + _tmp5__length1 = argv_length1; #line 990 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp8_ = g_strdup ("yelp"); + _tmp6_ = g_strdup ("yelp"); #line 990 "/home/jens/Source/shotwell/src/Resources.vala" - _g_free0 (_tmp7_[0]); + _g_free0 (_tmp5_[0]); #line 990 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp7_[0] = _tmp8_; + _tmp5_[0] = _tmp6_; #line 990 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp9_ = _tmp7_[0]; + _tmp7_ = _tmp5_[0]; #line 991 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp10_ = argv; + _tmp8_ = argv; #line 991 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp10__length1 = argv_length1; + _tmp8__length1 = argv_length1; #line 991 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp11_ = help_path; + _tmp9_ = help_path; #line 991 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp12_ = g_strdup (_tmp11_); + _tmp10_ = g_strdup (_tmp9_); #line 991 "/home/jens/Source/shotwell/src/Resources.vala" - _g_free0 (_tmp10_[1]); + _g_free0 (_tmp8_[1]); #line 991 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp10_[1] = _tmp12_; + _tmp8_[1] = _tmp10_; #line 991 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp13_ = _tmp10_[1]; + _tmp11_ = _tmp8_[1]; #line 992 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp14_ = argv; + _tmp12_ = argv; #line 992 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp14__length1 = argv_length1; + _tmp12__length1 = argv_length1; #line 992 "/home/jens/Source/shotwell/src/Resources.vala" - _g_free0 (_tmp14_[2]); + _g_free0 (_tmp12_[2]); #line 992 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp14_[2] = NULL; + _tmp12_[2] = NULL; #line 992 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp15_ = _tmp14_[2]; + _tmp13_ = _tmp12_[2]; #line 995 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp17_ = app_dirs_get_exec_dir (); + _tmp15_ = app_dirs_get_exec_dir (); #line 995 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp18_ = _tmp17_; + _tmp16_ = _tmp15_; #line 995 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp19_ = g_file_get_path (_tmp18_); + _tmp17_ = g_file_get_path (_tmp16_); #line 995 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp20_ = _tmp19_; + _tmp18_ = _tmp17_; #line 995 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp21_ = argv; + _tmp19_ = argv; #line 995 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp21__length1 = argv_length1; + _tmp19__length1 = argv_length1; #line 995 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp23_ = g_spawn_async (_tmp20_, _tmp21_, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &_tmp22_, &_inner_error_); + _tmp21_ = g_spawn_async (_tmp18_, _tmp19_, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &_tmp20_, &_inner_error_); #line 995 "/home/jens/Source/shotwell/src/Resources.vala" - pid = _tmp22_; + pid = _tmp20_; #line 995 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp24_ = _tmp23_; + _tmp22_ = _tmp21_; #line 995 "/home/jens/Source/shotwell/src/Resources.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp18_); #line 995 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp16_); #line 995 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp16_ = _tmp24_; + _tmp14_ = _tmp22_; #line 995 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 995 "/home/jens/Source/shotwell/src/Resources.vala" @@ -3614,51 +3494,43 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err _g_free0 (help_path); #line 995 "/home/jens/Source/shotwell/src/Resources.vala" return; -#line 3589 "Resources.c" +#line 3469 "Resources.c" } #line 995 "/home/jens/Source/shotwell/src/Resources.vala" - if (_tmp16_) { + if (_tmp14_) { #line 997 "/home/jens/Source/shotwell/src/Resources.vala" argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL); #line 997 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (help_path); #line 997 "/home/jens/Source/shotwell/src/Resources.vala" return; -#line 3599 "Resources.c" +#line 3479 "Resources.c" } #line 1000 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp25_ = argv; + _tmp23_ = argv; #line 1000 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp25__length1 = argv_length1; + _tmp23__length1 = argv_length1; #line 1000 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp26_ = _tmp25_[0]; + _tmp24_ = _tmp23_[0]; #line 1000 "/home/jens/Source/shotwell/src/Resources.vala" - g_warning ("Resources.vala:1000: Unable to launch %s", _tmp26_); + g_warning ("Resources.vala:1000: Unable to launch %s", _tmp24_); #line 981 "/home/jens/Source/shotwell/src/Resources.vala" argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL); -#line 3611 "Resources.c" +#line 3491 "Resources.c" } #line 1004 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp27_ = anchor; -#line 1004 "/home/jens/Source/shotwell/src/Resources.vala" - if (_tmp27_ != NULL) { -#line 3617 "Resources.c" - GdkScreen* _tmp28_; - const gchar* _tmp29_; - gchar* _tmp30_; - gchar* _tmp31_; -#line 1005 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp28_ = screen; -#line 1005 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp29_ = anchor; + if (anchor != NULL) { +#line 3495 "Resources.c" + gchar* _tmp25_; + gchar* _tmp26_; #line 1005 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp30_ = g_strconcat ("help:shotwell", _tmp29_, NULL); + _tmp25_ = g_strconcat ("help:shotwell", anchor, NULL); #line 1005 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp31_ = _tmp30_; + _tmp26_ = _tmp25_; #line 1005 "/home/jens/Source/shotwell/src/Resources.vala" - sys_show_uri (_tmp28_, _tmp31_, &_inner_error_); + sys_show_uri (screen, _tmp26_, &_inner_error_); #line 1005 "/home/jens/Source/shotwell/src/Resources.vala" - _g_free0 (_tmp31_); + _g_free0 (_tmp26_); #line 1005 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1005 "/home/jens/Source/shotwell/src/Resources.vala" @@ -3667,14 +3539,11 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err _g_free0 (help_path); #line 1005 "/home/jens/Source/shotwell/src/Resources.vala" return; -#line 3642 "Resources.c" +#line 3514 "Resources.c" } } else { - GdkScreen* _tmp32_; #line 1007 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp32_ = screen; -#line 1007 "/home/jens/Source/shotwell/src/Resources.vala" - sys_show_uri (_tmp32_, "help:shotwell", &_inner_error_); + sys_show_uri (screen, "help:shotwell", &_inner_error_); #line 1007 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1007 "/home/jens/Source/shotwell/src/Resources.vala" @@ -3683,16 +3552,18 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err _g_free0 (help_path); #line 1007 "/home/jens/Source/shotwell/src/Resources.vala" return; -#line 3658 "Resources.c" +#line 3527 "Resources.c" } } #line 978 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (help_path); -#line 3663 "Resources.c" +#line 3532 "Resources.c" } -gchar* resources_to_css_color (GdkRGBA* color) { +gchar* +resources_to_css_color (GdkRGBA* color) +{ gchar* result = NULL; gint r = 0; GdkRGBA _tmp0_; @@ -3730,23 +3601,22 @@ gchar* resources_to_css_color (GdkRGBA* color) { result = _tmp6_; #line 1016 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3705 "Resources.c" +#line 3576 "Resources.c" } -void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) { +void +resources_style_widget (GtkWidget* widget, + const gchar* stylesheet) +{ GeeMap* _tmp0_; GeeMap* _tmp2_; - GtkWidget* _tmp3_; - gboolean _tmp4_; GtkCssProvider* styler = NULL; - GtkCssProvider* _tmp11_; - GtkWidget* _tmp17_; - GtkStyleContext* _tmp18_; - GtkCssProvider* _tmp19_; - GeeMap* _tmp20_; - GtkWidget* _tmp21_; - GtkCssProvider* _tmp22_; + GtkCssProvider* _tmp7_; + GtkStyleContext* _tmp11_; + GtkCssProvider* _tmp12_; + GeeMap* _tmp13_; + GtkCssProvider* _tmp14_; GError * _inner_error_ = NULL; #line 1023 "/home/jens/Source/shotwell/src/Resources.vala" g_return_if_fail (GTK_IS_WIDGET (widget)); @@ -3756,66 +3626,53 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) { _tmp0_ = resources_providers; #line 1024 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp0_ == NULL) { -#line 3731 "Resources.c" +#line 3601 "Resources.c" GeeHashMap* _tmp1_; #line 1025 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = gee_hash_map_new (gtk_widget_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GTK_TYPE_CSS_PROVIDER, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp1_ = gee_hash_map_new (gtk_widget_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, gtk_css_provider_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 1025 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (resources_providers); #line 1025 "/home/jens/Source/shotwell/src/Resources.vala" resources_providers = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MAP, GeeMap); -#line 3739 "Resources.c" +#line 3609 "Resources.c" } #line 1027 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = resources_providers; #line 1027 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp3_ = widget; -#line 1027 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp4_ = gee_map_has_key (_tmp2_, _tmp3_); -#line 1027 "/home/jens/Source/shotwell/src/Resources.vala" - if (_tmp4_) { -#line 3749 "Resources.c" - GtkWidget* _tmp5_; - GtkStyleContext* _tmp6_; - GeeMap* _tmp7_; - GtkWidget* _tmp8_; - gpointer _tmp9_; - GtkCssProvider* _tmp10_; -#line 1028 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp5_ = widget; + if (gee_map_has_key (_tmp2_, widget)) { +#line 3615 "Resources.c" + GtkStyleContext* _tmp3_; + GeeMap* _tmp4_; + gpointer _tmp5_; + GtkCssProvider* _tmp6_; #line 1028 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp6_ = gtk_widget_get_style_context (_tmp5_); + _tmp3_ = gtk_widget_get_style_context (widget); #line 1028 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp7_ = resources_providers; + _tmp4_ = resources_providers; #line 1028 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp8_ = widget; + _tmp5_ = gee_map_get (_tmp4_, widget); #line 1028 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp9_ = gee_map_get (_tmp7_, _tmp8_); + _tmp6_ = (GtkCssProvider*) _tmp5_; #line 1028 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp10_ = (GtkCssProvider*) _tmp9_; + gtk_style_context_remove_provider (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_style_provider_get_type (), GtkStyleProvider)); #line 1028 "/home/jens/Source/shotwell/src/Resources.vala" - gtk_style_context_remove_provider (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider)); -#line 1028 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp10_); -#line 3772 "Resources.c" + _g_object_unref0 (_tmp6_); +#line 3632 "Resources.c" } #line 1030 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp11_ = gtk_css_provider_new (); + _tmp7_ = gtk_css_provider_new (); #line 1030 "/home/jens/Source/shotwell/src/Resources.vala" - styler = _tmp11_; -#line 3778 "Resources.c" + styler = _tmp7_; +#line 3638 "Resources.c" { - GtkCssProvider* _tmp12_; - const gchar* _tmp13_; -#line 1033 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp12_ = styler; + GtkCssProvider* _tmp8_; #line 1033 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp13_ = stylesheet; + _tmp8_ = styler; #line 1033 "/home/jens/Source/shotwell/src/Resources.vala" - gtk_css_provider_load_from_data (_tmp12_, _tmp13_, (gssize) RESOURCES_ALL_DATA, &_inner_error_); + gtk_css_provider_load_from_data (_tmp8_, stylesheet, (gssize) RESOURCES_ALL_DATA, &_inner_error_); #line 1033 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3790 "Resources.c" +#line 3647 "Resources.c" goto __catch440_g_error; } } @@ -3823,28 +3680,25 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) { __catch440_g_error: { GError* e = NULL; - const gchar* _tmp14_; - GError* _tmp15_; - const gchar* _tmp16_; + GError* _tmp9_; + const gchar* _tmp10_; #line 1032 "/home/jens/Source/shotwell/src/Resources.vala" e = _inner_error_; #line 1032 "/home/jens/Source/shotwell/src/Resources.vala" _inner_error_ = NULL; #line 1035 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp14_ = stylesheet; -#line 1035 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp15_ = e; + _tmp9_ = e; #line 1035 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp16_ = _tmp15_->message; + _tmp10_ = _tmp9_->message; #line 1035 "/home/jens/Source/shotwell/src/Resources.vala" - g_warning ("Resources.vala:1035: couldn't parse widget stylesheet '%s': %s", _tmp14_, _tmp16_); + g_warning ("Resources.vala:1035: couldn't parse widget stylesheet '%s': %s", stylesheet, _tmp10_); #line 1039 "/home/jens/Source/shotwell/src/Resources.vala" _g_error_free0 (e); #line 1039 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (styler); #line 1039 "/home/jens/Source/shotwell/src/Resources.vala" return; -#line 3819 "Resources.c" +#line 3673 "Resources.c" } __finally440: #line 1032 "/home/jens/Source/shotwell/src/Resources.vala" @@ -3857,31 +3711,29 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) { g_clear_error (&_inner_error_); #line 1032 "/home/jens/Source/shotwell/src/Resources.vala" return; -#line 3832 "Resources.c" +#line 3686 "Resources.c" } #line 1042 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp17_ = widget; + _tmp11_ = gtk_widget_get_style_context (widget); #line 1042 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp18_ = gtk_widget_get_style_context (_tmp17_); + _tmp12_ = styler; #line 1042 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp19_ = styler; -#line 1042 "/home/jens/Source/shotwell/src/Resources.vala" - gtk_style_context_add_provider (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider), (guint) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); -#line 1045 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp20_ = resources_providers; + gtk_style_context_add_provider (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_style_provider_get_type (), GtkStyleProvider), (guint) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); #line 1045 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp21_ = widget; + _tmp13_ = resources_providers; #line 1045 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp22_ = styler; + _tmp14_ = styler; #line 1045 "/home/jens/Source/shotwell/src/Resources.vala" - gee_map_set (_tmp20_, _tmp21_, _tmp22_); + gee_map_set (_tmp13_, widget, _tmp14_); #line 1023 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (styler); -#line 3852 "Resources.c" +#line 3702 "Resources.c" } -gint resources_use_header_bar (void) { +gint +resources_use_header_bar (void) +{ gint result = 0; const gchar* _tmp0_; gboolean use_header = FALSE; @@ -3896,7 +3748,7 @@ gint resources_use_header_bar (void) { result = 0; #line 1050 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3871 "Resources.c" +#line 3723 "Resources.c" } #line 1054 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = gtk_settings_get_default (); @@ -3908,21 +3760,25 @@ gint resources_use_header_bar (void) { if (_tmp3_) { #line 1056 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = 1; -#line 3883 "Resources.c" +#line 3735 "Resources.c" } else { #line 1056 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = 0; -#line 3887 "Resources.c" +#line 3739 "Resources.c" } #line 1056 "/home/jens/Source/shotwell/src/Resources.vala" result = _tmp2_; #line 1056 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3893 "Resources.c" +#line 3745 "Resources.c" } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -3934,13 +3790,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -static gint _vala_array_length (gpointer array) { +static gint +_vala_array_length (gpointer array) +{ int length; length = 0; if (array) { diff --git a/src/Screensaver.c b/src/Screensaver.c index da25d5f..f397c01 100644 --- a/src/Screensaver.c +++ b/src/Screensaver.c @@ -1,4 +1,4 @@ -/* Screensaver.c generated by valac 0.36.6, the Vala compiler +/* Screensaver.c generated by valac 0.40.4, the Vala compiler * generated from Screensaver.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -63,54 +64,73 @@ static gpointer screensaver_parent_class = NULL; gpointer screensaver_ref (gpointer instance); void screensaver_unref (gpointer instance); -GParamSpec* param_spec_screensaver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_screensaver (GValue* value, gpointer v_object); -void value_take_screensaver (GValue* value, gpointer v_object); +GParamSpec* param_spec_screensaver (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_screensaver (GValue* value, + gpointer v_object); +void value_take_screensaver (GValue* value, + gpointer v_object); gpointer value_get_screensaver (const GValue* value); GType screensaver_get_type (void) G_GNUC_CONST; #define SCREENSAVER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SCREENSAVER, ScreensaverPrivate)) -enum { - SCREENSAVER_DUMMY_PROPERTY -}; Screensaver* screensaver_new (void); Screensaver* screensaver_construct (GType object_type); -void screensaver_inhibit (Screensaver* self, const gchar* reason); +void screensaver_inhibit (Screensaver* self, + const gchar* reason); gpointer application_ref (gpointer instance); void application_unref (gpointer instance); -GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_application (GValue* value, gpointer v_object); -void value_take_application (GValue* value, gpointer v_object); +GParamSpec* param_spec_application (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_application (GValue* value, + gpointer v_object); +void value_take_application (GValue* value, + gpointer v_object); gpointer value_get_application (const GValue* value); GType application_get_type (void) G_GNUC_CONST; Application* application_get_instance (void); -guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, const gchar* reason); +guint application_inhibit (Application* self, + GtkApplicationInhibitFlags what, + const gchar* reason); void screensaver_uninhibit (Screensaver* self); -void application_uninhibit (Application* self, guint cookie); +void application_uninhibit (Application* self, + guint cookie); static void screensaver_finalize (Screensaver * obj); -Screensaver* screensaver_construct (GType object_type) { +Screensaver* +screensaver_construct (GType object_type) +{ Screensaver* self = NULL; #line 10 "/home/jens/Source/shotwell/src/Screensaver.vala" self = (Screensaver*) g_type_create_instance (object_type); #line 10 "/home/jens/Source/shotwell/src/Screensaver.vala" return self; -#line 99 "Screensaver.c" +#line 115 "Screensaver.c" } -Screensaver* screensaver_new (void) { +Screensaver* +screensaver_new (void) +{ #line 10 "/home/jens/Source/shotwell/src/Screensaver.vala" return screensaver_construct (TYPE_SCREENSAVER); -#line 106 "Screensaver.c" +#line 124 "Screensaver.c" } -void screensaver_inhibit (Screensaver* self, const gchar* reason) { +void +screensaver_inhibit (Screensaver* self, + const gchar* reason) +{ guint32 _tmp0_; Application* _tmp1_; Application* _tmp2_; - guint _tmp3_; #line 13 "/home/jens/Source/shotwell/src/Screensaver.vala" g_return_if_fail (IS_SCREENSAVER (self)); #line 13 "/home/jens/Source/shotwell/src/Screensaver.vala" @@ -121,23 +141,23 @@ void screensaver_inhibit (Screensaver* self, const gchar* reason) { if (_tmp0_ != ((guint32) 0)) { #line 15 "/home/jens/Source/shotwell/src/Screensaver.vala" return; -#line 125 "Screensaver.c" +#line 145 "Screensaver.c" } #line 17 "/home/jens/Source/shotwell/src/Screensaver.vala" _tmp1_ = application_get_instance (); #line 17 "/home/jens/Source/shotwell/src/Screensaver.vala" _tmp2_ = _tmp1_; #line 17 "/home/jens/Source/shotwell/src/Screensaver.vala" - _tmp3_ = application_inhibit (_tmp2_, GTK_APPLICATION_INHIBIT_IDLE | GTK_APPLICATION_INHIBIT_SUSPEND, _ ("Slideshow")); -#line 17 "/home/jens/Source/shotwell/src/Screensaver.vala" - self->priv->cookie = (guint32) _tmp3_; + self->priv->cookie = (guint32) application_inhibit (_tmp2_, GTK_APPLICATION_INHIBIT_IDLE | GTK_APPLICATION_INHIBIT_SUSPEND, _ ("Slideshow")); #line 17 "/home/jens/Source/shotwell/src/Screensaver.vala" _application_unref0 (_tmp2_); -#line 137 "Screensaver.c" +#line 155 "Screensaver.c" } -void screensaver_uninhibit (Screensaver* self) { +void +screensaver_uninhibit (Screensaver* self) +{ guint32 _tmp0_; Application* _tmp1_; Application* _tmp2_; @@ -150,7 +170,7 @@ void screensaver_uninhibit (Screensaver* self) { if (_tmp0_ == ((guint32) 0)) { #line 23 "/home/jens/Source/shotwell/src/Screensaver.vala" return; -#line 154 "Screensaver.c" +#line 174 "Screensaver.c" } #line 25 "/home/jens/Source/shotwell/src/Screensaver.vala" _tmp1_ = application_get_instance (); @@ -164,108 +184,133 @@ void screensaver_uninhibit (Screensaver* self) { _application_unref0 (_tmp2_); #line 26 "/home/jens/Source/shotwell/src/Screensaver.vala" self->priv->cookie = (guint32) 0; -#line 168 "Screensaver.c" +#line 188 "Screensaver.c" } -static void value_screensaver_init (GValue* value) { +static void +value_screensaver_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" value->data[0].v_pointer = NULL; -#line 175 "Screensaver.c" +#line 197 "Screensaver.c" } -static void value_screensaver_free_value (GValue* value) { +static void +value_screensaver_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" screensaver_unref (value->data[0].v_pointer); -#line 184 "Screensaver.c" +#line 208 "Screensaver.c" } } -static void value_screensaver_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_screensaver_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" dest_value->data[0].v_pointer = screensaver_ref (src_value->data[0].v_pointer); -#line 194 "Screensaver.c" +#line 221 "Screensaver.c" } else { #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" dest_value->data[0].v_pointer = NULL; -#line 198 "Screensaver.c" +#line 225 "Screensaver.c" } } -static gpointer value_screensaver_peek_pointer (const GValue* value) { +static gpointer +value_screensaver_peek_pointer (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" return value->data[0].v_pointer; -#line 206 "Screensaver.c" +#line 235 "Screensaver.c" } -static gchar* value_screensaver_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_screensaver_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" if (collect_values[0].v_pointer) { -#line 213 "Screensaver.c" +#line 247 "Screensaver.c" Screensaver * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 220 "Screensaver.c" +#line 254 "Screensaver.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/Screensaver.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 224 "Screensaver.c" +#line 258 "Screensaver.c" } #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" value->data[0].v_pointer = screensaver_ref (object); -#line 228 "Screensaver.c" +#line 262 "Screensaver.c" } else { #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" value->data[0].v_pointer = NULL; -#line 232 "Screensaver.c" +#line 266 "Screensaver.c" } #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" return NULL; -#line 236 "Screensaver.c" +#line 270 "Screensaver.c" } -static gchar* value_screensaver_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_screensaver_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ Screensaver ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 247 "Screensaver.c" +#line 286 "Screensaver.c" } #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" *object_p = NULL; -#line 253 "Screensaver.c" +#line 292 "Screensaver.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" *object_p = value->data[0].v_pointer; -#line 257 "Screensaver.c" +#line 296 "Screensaver.c" } else { #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" *object_p = screensaver_ref (value->data[0].v_pointer); -#line 261 "Screensaver.c" +#line 300 "Screensaver.c" } #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" return NULL; -#line 265 "Screensaver.c" +#line 304 "Screensaver.c" } -GParamSpec* param_spec_screensaver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_screensaver (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecScreensaver* spec; #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_SCREENSAVER), NULL); @@ -275,20 +320,25 @@ GParamSpec* param_spec_screensaver (const gchar* name, const gchar* nick, const G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" return G_PARAM_SPEC (spec); -#line 279 "Screensaver.c" +#line 324 "Screensaver.c" } -gpointer value_get_screensaver (const GValue* value) { +gpointer +value_get_screensaver (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCREENSAVER), NULL); #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" return value->data[0].v_pointer; -#line 288 "Screensaver.c" +#line 335 "Screensaver.c" } -void value_set_screensaver (GValue* value, gpointer v_object) { +void +value_set_screensaver (GValue* value, + gpointer v_object) +{ Screensaver * old; #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCREENSAVER)); @@ -304,22 +354,25 @@ void value_set_screensaver (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" screensaver_ref (value->data[0].v_pointer); -#line 308 "Screensaver.c" +#line 358 "Screensaver.c" } else { #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" value->data[0].v_pointer = NULL; -#line 312 "Screensaver.c" +#line 362 "Screensaver.c" } #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" screensaver_unref (old); -#line 318 "Screensaver.c" +#line 368 "Screensaver.c" } } -void value_take_screensaver (GValue* value, gpointer v_object) { +void +value_take_screensaver (GValue* value, + gpointer v_object) +{ Screensaver * old; #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCREENSAVER)); @@ -333,54 +386,62 @@ void value_take_screensaver (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" value->data[0].v_pointer = v_object; -#line 337 "Screensaver.c" +#line 390 "Screensaver.c" } else { #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" value->data[0].v_pointer = NULL; -#line 341 "Screensaver.c" +#line 394 "Screensaver.c" } #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" screensaver_unref (old); -#line 347 "Screensaver.c" +#line 400 "Screensaver.c" } } -static void screensaver_class_init (ScreensaverClass * klass) { +static void +screensaver_class_init (ScreensaverClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" screensaver_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" ((ScreensaverClass *) klass)->finalize = screensaver_finalize; #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" g_type_class_add_private (klass, sizeof (ScreensaverPrivate)); -#line 359 "Screensaver.c" +#line 414 "Screensaver.c" } -static void screensaver_instance_init (Screensaver * self) { +static void +screensaver_instance_init (Screensaver * self) +{ #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" self->priv = SCREENSAVER_GET_PRIVATE (self); #line 8 "/home/jens/Source/shotwell/src/Screensaver.vala" self->priv->cookie = (guint32) 0; #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" self->ref_count = 1; -#line 370 "Screensaver.c" +#line 427 "Screensaver.c" } -static void screensaver_finalize (Screensaver * obj) { +static void +screensaver_finalize (Screensaver * obj) +{ Screensaver * self; #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCREENSAVER, Screensaver); #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" g_signal_handlers_destroy (self); -#line 380 "Screensaver.c" +#line 439 "Screensaver.c" } -GType screensaver_get_type (void) { +GType +screensaver_get_type (void) +{ static volatile gsize screensaver_type_id__volatile = 0; if (g_once_init_enter (&screensaver_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_screensaver_init, value_screensaver_free_value, value_screensaver_copy_value, value_screensaver_peek_pointer, "p", value_screensaver_collect_value, "p", value_screensaver_lcopy_value }; @@ -394,18 +455,22 @@ GType screensaver_get_type (void) { } -gpointer screensaver_ref (gpointer instance) { +gpointer +screensaver_ref (gpointer instance) +{ Screensaver * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" return instance; -#line 405 "Screensaver.c" +#line 468 "Screensaver.c" } -void screensaver_unref (gpointer instance) { +void +screensaver_unref (gpointer instance) +{ Screensaver * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" @@ -414,7 +479,7 @@ void screensaver_unref (gpointer instance) { SCREENSAVER_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala" g_type_free_instance ((GTypeInstance *) self); -#line 418 "Screensaver.c" +#line 483 "Screensaver.c" } } diff --git a/src/SearchFilter.c b/src/SearchFilter.c index 00b08ac..59ae93b 100644 --- a/src/SearchFilter.c +++ b/src/SearchFilter.c @@ -1,4 +1,4 @@ -/* SearchFilter.c generated by valac 0.36.6, the Vala compiler +/* SearchFilter.c generated by valac 0.40.4, the Vala compiler * generated from SearchFilter.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -8,6 +8,7 @@ */ /* Bitfield values used to specify which search bar features we want.*/ + #include #include #include @@ -318,9 +319,9 @@ enum { TEXT_ACTION_TEXT_CHANGED_SIGNAL, TEXT_ACTION_SENSITIVITY_CHANGED_SIGNAL, TEXT_ACTION_VISIBILITY_CHANGED_SIGNAL, - TEXT_ACTION_LAST_SIGNAL + TEXT_ACTION_NUM_SIGNALS }; -static guint text_action_signals[TEXT_ACTION_LAST_SIGNAL] = {0}; +static guint text_action_signals[TEXT_ACTION_NUM_SIGNALS] = {0}; #define TYPE_SEARCH_FILTER_ACTIONS (search_filter_actions_get_type ()) #define SEARCH_FILTER_ACTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SEARCH_FILTER_ACTIONS, SearchFilterActions)) @@ -478,9 +479,9 @@ enum { SEARCH_FILTER_ACTIONS_TEXT_CHANGED_SIGNAL, SEARCH_FILTER_ACTIONS_MEDIA_CONTEXT_CHANGED_SIGNAL, SEARCH_FILTER_ACTIONS_CRITERIA_CHANGED_SIGNAL, - SEARCH_FILTER_ACTIONS_LAST_SIGNAL + SEARCH_FILTER_ACTIONS_NUM_SIGNALS }; -static guint search_filter_actions_signals[SEARCH_FILTER_ACTIONS_LAST_SIGNAL] = {0}; +static guint search_filter_actions_signals[SEARCH_FILTER_ACTIONS_NUM_SIGNALS] = {0}; #define TYPE_SEARCH_FILTER_TOOLBAR (search_filter_toolbar_get_type ()) #define SEARCH_FILTER_TOOLBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SEARCH_FILTER_TOOLBAR, SearchFilterToolbar)) @@ -542,6 +543,11 @@ typedef struct _SearchFilterToolbarLabelToolItemClass SearchFilterToolbarLabelTo typedef struct _SearchFilterToolbarToggleActionToolButton SearchFilterToolbarToggleActionToolButton; typedef struct _SearchFilterToolbarToggleActionToolButtonClass SearchFilterToolbarToggleActionToolButtonClass; +enum { + SEARCH_FILTER_TOOLBAR_0_PROPERTY, + SEARCH_FILTER_TOOLBAR_NUM_PROPERTIES +}; +static GParamSpec* search_filter_toolbar_properties[SEARCH_FILTER_TOOLBAR_NUM_PROPERTIES]; #define _search_filter_actions_unref0(var) ((var == NULL) ? NULL : (var = (search_filter_actions_unref (var), NULL))) #define _view_filter_unref0(var) ((var == NULL) ? NULL : (var = (view_filter_unref (var), NULL))) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) @@ -619,14 +625,39 @@ typedef struct _DeleteSavedSearchCommandClass DeleteSavedSearchCommandClass; #define _command_manager_unref0(var) ((var == NULL) ? NULL : (var = (command_manager_unref (var), NULL))) #define _search_filter_toolbar_saved_search_popover_unref0(var) ((var == NULL) ? NULL : (var = (search_filter_toolbar_saved_search_popover_unref (var), NULL))) typedef struct _SearchFilterToolbarLabelToolItemPrivate SearchFilterToolbarLabelToolItemPrivate; +enum { + SEARCH_FILTER_TOOLBAR_LABEL_TOOL_ITEM_0_PROPERTY, + SEARCH_FILTER_TOOLBAR_LABEL_TOOL_ITEM_NUM_PROPERTIES +}; +static GParamSpec* search_filter_toolbar_label_tool_item_properties[SEARCH_FILTER_TOOLBAR_LABEL_TOOL_ITEM_NUM_PROPERTIES]; typedef struct _SearchFilterToolbarToggleActionToolButtonPrivate SearchFilterToolbarToggleActionToolButtonPrivate; +enum { + SEARCH_FILTER_TOOLBAR_TOGGLE_ACTION_TOOL_BUTTON_0_PROPERTY, + SEARCH_FILTER_TOOLBAR_TOGGLE_ACTION_TOOL_BUTTON_NUM_PROPERTIES +}; +static GParamSpec* search_filter_toolbar_toggle_action_tool_button_properties[SEARCH_FILTER_TOOLBAR_TOGGLE_ACTION_TOOL_BUTTON_NUM_PROPERTIES]; typedef struct _SearchFilterToolbarSearchBoxPrivate SearchFilterToolbarSearchBoxPrivate; +enum { + SEARCH_FILTER_TOOLBAR_SEARCH_BOX_0_PROPERTY, + SEARCH_FILTER_TOOLBAR_SEARCH_BOX_NUM_PROPERTIES +}; +static GParamSpec* search_filter_toolbar_search_box_properties[SEARCH_FILTER_TOOLBAR_SEARCH_BOX_NUM_PROPERTIES]; typedef struct _SearchFilterToolbarRatingFilterButtonPrivate SearchFilterToolbarRatingFilterButtonPrivate; +enum { + SEARCH_FILTER_TOOLBAR_RATING_FILTER_BUTTON_0_PROPERTY, + SEARCH_FILTER_TOOLBAR_RATING_FILTER_BUTTON_NUM_PROPERTIES +}; +static GParamSpec* search_filter_toolbar_rating_filter_button_properties[SEARCH_FILTER_TOOLBAR_RATING_FILTER_BUTTON_NUM_PROPERTIES]; +enum { + SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_FILTER_BUTTON_0_PROPERTY, + SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_FILTER_BUTTON_NUM_PROPERTIES +}; +static GParamSpec* search_filter_toolbar_saved_search_filter_button_properties[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_FILTER_BUTTON_NUM_PROPERTIES]; enum { SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_FILTER_BUTTON_CLICKED_SIGNAL, - SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_FILTER_BUTTON_LAST_SIGNAL + SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_FILTER_BUTTON_NUM_SIGNALS }; -static guint search_filter_toolbar_saved_search_filter_button_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_FILTER_BUTTON_LAST_SIGNAL] = {0}; +static guint search_filter_toolbar_saved_search_filter_button_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_FILTER_BUTTON_NUM_SIGNALS] = {0}; typedef struct _SearchFilterToolbarSavedSearchPopoverPrivate SearchFilterToolbarSavedSearchPopoverPrivate; #define SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON (search_filter_toolbar_saved_search_popover_data_button_get_type ()) @@ -651,11 +682,17 @@ typedef struct _SavedSearchTableClass SavedSearchTableClass; #define _saved_search_table_unref0(var) ((var == NULL) ? NULL : (var = (saved_search_table_unref (var), NULL))) #define _g_list_free0(var) ((var == NULL) ? NULL : (var = (g_list_free (var), NULL))) typedef struct _SearchFilterToolbarSavedSearchPopoverDataButtonPrivate SearchFilterToolbarSavedSearchPopoverDataButtonPrivate; +enum { + SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_0_PROPERTY, + SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH_PROPERTY, + SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_NUM_PROPERTIES +}; +static GParamSpec* search_filter_toolbar_saved_search_popover_data_button_properties[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_NUM_PROPERTIES]; enum { SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_CLICKED_SIGNAL, - SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_LAST_SIGNAL + SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_NUM_SIGNALS }; -static guint search_filter_toolbar_saved_search_popover_data_button_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_LAST_SIGNAL] = {0}; +static guint search_filter_toolbar_saved_search_popover_data_button_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_NUM_SIGNALS] = {0}; typedef struct _SearchFilterToolbarParamSpecSavedSearchPopover SearchFilterToolbarParamSpecSavedSearchPopover; enum { SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_SEARCH_ACTIVATED_SIGNAL, @@ -663,9 +700,9 @@ enum { SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DELETE_CLICKED_SIGNAL, SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_ADD_CLICKED_SIGNAL, SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_CLOSED_SIGNAL, - SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_LAST_SIGNAL + SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_NUM_SIGNALS }; -static guint search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_LAST_SIGNAL] = {0}; +static guint search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -1052,9 +1089,15 @@ GType search_filter_criteria_get_type (void) G_GNUC_CONST; GType rating_filter_get_type (void) G_GNUC_CONST; gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; @@ -1064,18 +1107,19 @@ GType rating_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; GType saved_search_get_type (void) G_GNUC_CONST; #define SEARCH_VIEW_FILTER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_VIEW_FILTER, SearchViewFilterPrivate)) -enum { - SEARCH_VIEW_FILTER_DUMMY_PROPERTY -}; guint search_view_filter_get_criteria (SearchViewFilter* self); static guint search_view_filter_real_get_criteria (SearchViewFilter* self); -void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter rf); +void search_view_filter_set_rating_filter (SearchViewFilter* self, + RatingFilter rf); gboolean search_view_filter_has_search_filter (SearchViewFilter* self); gboolean is_string_empty (const gchar* s); const gchar* search_view_filter_get_search_filter (SearchViewFilter* self); -gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, int* result_length1); -void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar* text); -static gchar** _vala_array_dup27 (gchar** self, int length); +gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, + int* result_length1); +void search_view_filter_set_search_filter (SearchViewFilter* self, + const gchar* text); +static gchar** _vala_array_dup27 (gchar** self, + int length); void search_view_filter_clear_search_filter (SearchViewFilter* self); gboolean search_view_filter_has_saved_search (SearchViewFilter* self); SavedSearch* search_view_filter_get_saved_search (SearchViewFilter* self); @@ -1088,17 +1132,20 @@ gboolean search_view_filter_get_show_media_raw (SearchViewFilter* self); SearchViewFilter* search_view_filter_construct (GType object_type); ViewFilter* view_filter_construct (GType object_type); gboolean search_view_filter_get_flagged (SearchViewFilter* self); -void search_view_filter_set_flagged (SearchViewFilter* self, gboolean value); -void search_view_filter_set_show_media_video (SearchViewFilter* self, gboolean value); -void search_view_filter_set_show_media_photos (SearchViewFilter* self, gboolean value); -void search_view_filter_set_show_media_raw (SearchViewFilter* self, gboolean value); -void search_view_filter_set_saved_search (SearchViewFilter* self, SavedSearch* value); +void search_view_filter_set_flagged (SearchViewFilter* self, + gboolean value); +void search_view_filter_set_show_media_video (SearchViewFilter* self, + gboolean value); +void search_view_filter_set_show_media_photos (SearchViewFilter* self, + gboolean value); +void search_view_filter_set_show_media_raw (SearchViewFilter* self, + gboolean value); +void search_view_filter_set_saved_search (SearchViewFilter* self, + SavedSearch* value); static void search_view_filter_finalize (ViewFilter * obj); GType default_search_view_filter_get_type (void) G_GNUC_CONST; -enum { - DEFAULT_SEARCH_VIEW_FILTER_DUMMY_PROPERTY -}; -static gboolean default_search_view_filter_real_predicate (ViewFilter* base, DataView* view); +static gboolean default_search_view_filter_real_predicate (ViewFilter* base, + DataView* view); GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; GType thumbnail_view_get_type (void) G_GNUC_CONST; @@ -1122,86 +1169,138 @@ Event* media_source_get_event (MediaSource* self); GType tag_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType tag_source_collection_get_type (void) G_GNUC_CONST; -GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, MediaSource* source); -gboolean saved_search_predicate (SavedSearch* self, MediaSource* source); +GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, + MediaSource* source); +gboolean saved_search_predicate (SavedSearch* self, + MediaSource* source); DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type); GType disabled_view_filter_get_type (void) G_GNUC_CONST; -enum { - DISABLED_VIEW_FILTER_DUMMY_PROPERTY -}; -static gboolean disabled_view_filter_real_predicate (ViewFilter* base, DataView* view); +static gboolean disabled_view_filter_real_predicate (ViewFilter* base, + DataView* view); static guint disabled_view_filter_real_get_criteria (SearchViewFilter* base); DisabledViewFilter* disabled_view_filter_new (void); DisabledViewFilter* disabled_view_filter_construct (GType object_type); gpointer text_action_ref (gpointer instance); void text_action_unref (gpointer instance); -GParamSpec* param_spec_text_action (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_text_action (GValue* value, gpointer v_object); -void value_take_text_action (GValue* value, gpointer v_object); +GParamSpec* param_spec_text_action (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_text_action (GValue* value, + gpointer v_object); +void value_take_text_action (GValue* value, + gpointer v_object); gpointer value_get_text_action (const GValue* value); GType text_action_get_type (void) G_GNUC_CONST; #define TEXT_ACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TEXT_ACTION, TextActionPrivate)) -enum { - TEXT_ACTION_DUMMY_PROPERTY -}; TextAction* text_action_new (const gchar* init); -TextAction* text_action_construct (GType object_type, const gchar* init); -void text_action_set_text (TextAction* self, const gchar* text); +TextAction* text_action_construct (GType object_type, + const gchar* init); +void text_action_set_text (TextAction* self, + const gchar* text); void text_action_clear (TextAction* self); gboolean text_action_is_sensitive (TextAction* self); -void text_action_set_sensitive (TextAction* self, gboolean sensitive); +void text_action_set_sensitive (TextAction* self, + gboolean sensitive); gboolean text_action_is_visible (TextAction* self); -void text_action_set_visible (TextAction* self, gboolean visible); +void text_action_set_visible (TextAction* self, + gboolean visible); const gchar* text_action_get_value (TextAction* self); static void text_action_finalize (TextAction * obj); gpointer search_filter_actions_ref (gpointer instance); void search_filter_actions_unref (gpointer instance); -GParamSpec* param_spec_search_filter_actions (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_search_filter_actions (GValue* value, gpointer v_object); -void value_take_search_filter_actions (GValue* value, gpointer v_object); +GParamSpec* param_spec_search_filter_actions (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_search_filter_actions (GValue* value, + gpointer v_object); +void value_take_search_filter_actions (GValue* value, + gpointer v_object); gpointer value_get_search_filter_actions (const GValue* value); GType search_filter_actions_get_type (void) G_GNUC_CONST; #define SEARCH_FILTER_ACTIONS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_FILTER_ACTIONS, SearchFilterActionsPrivate)) -enum { - SEARCH_FILTER_ACTIONS_DUMMY_PROPERTY -}; -static void search_filter_actions_on_action_radio (SearchFilterActions* self, GSimpleAction* action, GVariant* parameter); -static void _search_filter_actions_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void search_filter_actions_on_rating_changed (SearchFilterActions* self, GSimpleAction* action, GVariant* value); -static void _search_filter_actions_on_rating_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); -static void search_filter_actions_on_action_toggle (SearchFilterActions* self, GSimpleAction* action, GVariant* parameter); -static void _search_filter_actions_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void search_filter_actions_on_flagged_toggled (SearchFilterActions* self, GSimpleAction* action, GVariant* value); -static void _search_filter_actions_on_flagged_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); -static void search_filter_actions_on_photos_toggled (SearchFilterActions* self, GSimpleAction* action, GVariant* value); -static void _search_filter_actions_on_photos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); -static void search_filter_actions_on_videos_toggled (SearchFilterActions* self, GSimpleAction* action, GVariant* value); -static void _search_filter_actions_on_videos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); -static void search_filter_actions_on_raw_toggled (SearchFilterActions* self, GSimpleAction* action, GVariant* value); -static void _search_filter_actions_on_raw_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); +static void search_filter_actions_on_action_radio (SearchFilterActions* self, + GSimpleAction* action, + GVariant* parameter); +static void _search_filter_actions_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void search_filter_actions_on_rating_changed (SearchFilterActions* self, + GSimpleAction* action, + GVariant* value); +static void _search_filter_actions_on_rating_changed_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); +static void search_filter_actions_on_action_toggle (SearchFilterActions* self, + GSimpleAction* action, + GVariant* parameter); +static void _search_filter_actions_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void search_filter_actions_on_flagged_toggled (SearchFilterActions* self, + GSimpleAction* action, + GVariant* value); +static void _search_filter_actions_on_flagged_toggled_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); +static void search_filter_actions_on_photos_toggled (SearchFilterActions* self, + GSimpleAction* action, + GVariant* value); +static void _search_filter_actions_on_photos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); +static void search_filter_actions_on_videos_toggled (SearchFilterActions* self, + GSimpleAction* action, + GVariant* value); +static void _search_filter_actions_on_videos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); +static void search_filter_actions_on_raw_toggled (SearchFilterActions* self, + GSimpleAction* action, + GVariant* value); +static void _search_filter_actions_on_raw_toggled_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); SearchFilterActions* search_filter_actions_new (void); SearchFilterActions* search_filter_actions_construct (GType object_type); static void search_filter_actions_register (SearchFilterActions* self); TextAction* search_filter_actions_get_text (SearchFilterActions* self); -static void search_filter_actions_on_text_changed (SearchFilterActions* self, TextAction* action, const gchar* text); -static void _search_filter_actions_on_text_changed_text_action_text_changed (TextAction* _sender, const gchar* text, gpointer self); +static void search_filter_actions_on_text_changed (SearchFilterActions* self, + TextAction* action, + const gchar* text); +static void _search_filter_actions_on_text_changed_text_action_text_changed (TextAction* _sender, + const gchar* text, + gpointer self); SearchFilterCriteria search_filter_actions_get_criteria (SearchFilterActions* self); -GActionEntry* search_filter_actions_get_actions (SearchFilterActions* self, int* result_length1); -GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, const gchar* name); +GActionEntry* search_filter_actions_get_actions (SearchFilterActions* self, + int* result_length1); +GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, + const gchar* name); GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; GType library_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); -void search_filter_actions_set_action_sensitive (SearchFilterActions* self, const gchar* name, gboolean sensitive); +void search_filter_actions_set_action_sensitive (SearchFilterActions* self, + const gchar* name, + gboolean sensitive); void search_filter_actions_reset (SearchFilterActions* self); GSimpleAction* search_filter_actions_get_flagged (SearchFilterActions* self); static GVariant* _variant_new32 (gboolean value); @@ -1213,32 +1312,51 @@ GSimpleAction* search_filter_actions_get_videos (SearchFilterActions* self); static GVariant* _variant_new35 (gboolean value); static GVariant* _variant_new36 (gchar* value); GSimpleAction* search_filter_actions_get_rating (SearchFilterActions* self); -void search_filter_actions_set_sensitive_for_search_criteria (SearchFilterActions* self, SearchFilterCriteria criteria); +void search_filter_actions_set_sensitive_for_search_criteria (SearchFilterActions* self, + SearchFilterCriteria criteria); static void search_filter_actions_update_sensitivities (SearchFilterActions* self); GType page_get_type (void) G_GNUC_CONST; -void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Page* old_page, Page* new_page); +void search_filter_actions_monitor_page_contents (SearchFilterActions* self, + Page* old_page, + Page* new_page); GType checkerboard_page_get_type (void) G_GNUC_CONST; gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; CoreViewTracker* checkerboard_page_get_view_tracker (CheckerboardPage* self); GType media_view_tracker_get_type (void) G_GNUC_CONST; -static void search_filter_actions_on_media_tracker_updated (SearchFilterActions* self, CoreTracker* t); -static void _search_filter_actions_on_media_tracker_updated_core_tracker_updated (CoreTracker* _sender, gpointer self); +static void search_filter_actions_on_media_tracker_updated (SearchFilterActions* self, + CoreTracker* t); +static void _search_filter_actions_on_media_tracker_updated_core_tracker_updated (CoreTracker* _sender, + gpointer self); GType camera_view_tracker_get_type (void) G_GNUC_CONST; -static void search_filter_actions_on_camera_tracker_updated (SearchFilterActions* self, CoreTracker* t); -static void _search_filter_actions_on_camera_tracker_updated_core_tracker_updated (CoreTracker* _sender, gpointer self); +static void search_filter_actions_on_camera_tracker_updated (SearchFilterActions* self, + CoreTracker* t); +static void _search_filter_actions_on_camera_tracker_updated_core_tracker_updated (CoreTracker* _sender, + gpointer self); GType media_accumulator_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType core_tracker_accumulator_get_type (void) G_GNUC_CONST; @@ -1252,7 +1370,12 @@ gboolean search_filter_actions_get_has_photos (SearchFilterActions* self); gboolean search_filter_actions_get_has_videos (SearchFilterActions* self); gboolean search_filter_actions_get_has_raw (SearchFilterActions* self); gboolean search_filter_actions_get_has_flagged (SearchFilterActions* self); -static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); +static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); static void search_filter_actions_finalize (SearchFilterActions * obj); GType search_filter_toolbar_get_type (void) G_GNUC_CONST; GType search_filter_toolbar_search_box_get_type (void) G_GNUC_CONST; @@ -1261,27 +1384,53 @@ GType search_filter_toolbar_saved_search_filter_button_get_type (void) G_GNUC_CO static GType search_filter_toolbar_label_tool_item_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static GType search_filter_toolbar_toggle_action_tool_button_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define SEARCH_FILTER_TOOLBAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_FILTER_TOOLBAR, SearchFilterToolbarPrivate)) -enum { - SEARCH_FILTER_TOOLBAR_DUMMY_PROPERTY -}; -static void search_filter_toolbar_on_media_context_changed (SearchFilterToolbar* self, gboolean has_photos, gboolean has_videos, gboolean has_raw, gboolean has_flagged); -static void _search_filter_toolbar_on_media_context_changed_search_filter_actions_media_context_changed (SearchFilterActions* _sender, gboolean has_photos, gboolean has_videos, gboolean has_raw, gboolean has_flagged, gpointer self); +static void search_filter_toolbar_on_media_context_changed (SearchFilterToolbar* self, + gboolean has_photos, + gboolean has_videos, + gboolean has_raw, + gboolean has_flagged); +static void _search_filter_toolbar_on_media_context_changed_search_filter_actions_media_context_changed (SearchFilterActions* _sender, + gboolean has_photos, + gboolean has_videos, + gboolean has_raw, + gboolean has_flagged, + gpointer self); static void search_filter_toolbar_on_flagged_toggled (SearchFilterToolbar* self); -static void _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled (SearchFilterActions* _sender, gboolean on, gpointer self); +static void _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled (SearchFilterActions* _sender, + gboolean on, + gpointer self); static void search_filter_toolbar_on_photos_toggled (SearchFilterToolbar* self); -static void _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled (SearchFilterActions* _sender, gboolean on, gpointer self); +static void _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled (SearchFilterActions* _sender, + gboolean on, + gpointer self); static void search_filter_toolbar_on_videos_toggled (SearchFilterToolbar* self); -static void _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled (SearchFilterActions* _sender, gboolean on, gpointer self); +static void _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled (SearchFilterActions* _sender, + gboolean on, + gpointer self); static void search_filter_toolbar_on_raw_toggled (SearchFilterToolbar* self); -static void _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled (SearchFilterActions* _sender, gboolean on, gpointer self); +static void _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled (SearchFilterActions* _sender, + gboolean on, + gpointer self); static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self); -static void _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed (SearchFilterActions* _sender, RatingFilter filter, gpointer self); +static void _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed (SearchFilterActions* _sender, + RatingFilter filter, + gpointer self); static void search_filter_toolbar_on_search_text_changed (SearchFilterToolbar* self); -static void _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed (SearchFilterActions* _sender, const gchar* text, gpointer self); +static void _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed (SearchFilterActions* _sender, + const gchar* text, + gpointer self); static void search_filter_toolbar_on_criteria_changed (SearchFilterToolbar* self); -static void _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed (SearchFilterActions* _sender, gpointer self); -static gboolean search_filter_toolbar_on_context_menu_requested (SearchFilterToolbar* self, gint x, gint y, gint button); -static gboolean _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu (GtkToolbar* _sender, gint x, gint y, gint button_number, gpointer self); +static void _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed (SearchFilterActions* _sender, + gpointer self); +static gboolean search_filter_toolbar_on_context_menu_requested (SearchFilterToolbar* self, + gint x, + gint y, + gint button); +static gboolean _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu (GtkToolbar* _sender, + gint x, + gint y, + gint button_number, + gpointer self); SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_filter_button_new (void); SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_filter_button_construct (GType object_type); #define SEARCH_FILTER_TOOLBAR_FILTER_BUTTON_MARGIN 12 @@ -1290,25 +1439,40 @@ SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_f #define SEARCH_FILTER_TOOLBAR_FILTER_ICON_BASE_WIDTH 30 #define SEARCH_FILTER_TOOLBAR_FILTER_ICON_PLUS_WIDTH 20 SearchFilterToolbar* search_filter_toolbar_new (SearchFilterActions* actions); -SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchFilterActions* actions); +SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, + SearchFilterActions* actions); SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_new (TextAction* action); -SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_construct (GType object_type, TextAction* action); +SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_construct (GType object_type, + TextAction* action); gchar* resources_get_ui (const gchar* filename); void app_window_panic (const gchar* msg); static void search_filter_toolbar_on_context_menu_close_chosen (SearchFilterToolbar* self); -static void _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); -static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_new (const gchar* s, gint left_padding, gint right_padding); -static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_construct (GType object_type, const gchar* s, gint left_padding, gint right_padding); +static void _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate (GtkMenuItem* _sender, + gpointer self); +static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_new (const gchar* s, + gint left_padding, + gint right_padding); +static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_construct (GType object_type, + const gchar* s, + gint left_padding, + gint right_padding); static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_new (const gchar* action); -static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_construct (GType object_type, const gchar* action); -static void search_filter_toolbar_toggle_action_tool_button_set_label (SearchFilterToolbarToggleActionToolButton* self, const gchar* label); +static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_construct (GType object_type, + const gchar* action); +static void search_filter_toolbar_toggle_action_tool_button_set_label (SearchFilterToolbarToggleActionToolButton* self, + const gchar* label); SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_button_new (GMenuModel* model); -SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_button_construct (GType object_type, GMenuModel* model); -void search_filter_toolbar_rating_filter_button_set_label (SearchFilterToolbarRatingFilterButton* self, const gchar* label); -void search_filter_toolbar_saved_search_filter_button_set_label (SearchFilterToolbarSavedSearchFilterButton* self, const gchar* label); +SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_button_construct (GType object_type, + GMenuModel* model); +void search_filter_toolbar_rating_filter_button_set_label (SearchFilterToolbarRatingFilterButton* self, + const gchar* label); +void search_filter_toolbar_saved_search_filter_button_set_label (SearchFilterToolbarSavedSearchFilterButton* self, + const gchar* label); static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterToolbar* self); -static void _search_filter_toolbar_on_saved_search_button_clicked_search_filter_toolbar_saved_search_filter_button_clicked (SearchFilterToolbarSavedSearchFilterButton* _sender, gpointer self); -static void search_filter_toolbar_toggle_action_tool_button_set_icon_name (SearchFilterToolbarToggleActionToolButton* self, const gchar* icon_name); +static void _search_filter_toolbar_on_saved_search_button_clicked_search_filter_toolbar_saved_search_filter_button_clicked (SearchFilterToolbarSavedSearchFilterButton* _sender, + gpointer self); +static void search_filter_toolbar_toggle_action_tool_button_set_icon_name (SearchFilterToolbarToggleActionToolButton* self, + const gchar* icon_name); #define RESOURCES_ICON_FILTER_PHOTOS "filter-photos" #define RESOURCES_ICON_FILTER_PHOTOS_DISABLED "filter-photos-disabled" #define RESOURCES_ICON_FILTER_VIDEOS "filter-videos" @@ -1321,39 +1485,60 @@ LibraryWindow* library_window_get_app (void); static GVariant* _variant_new39 (gboolean value); void search_filter_toolbar_update (SearchFilterToolbar* self); static GVariant* _variant_new40 (gboolean value); -void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchViewFilter* search_filter); +void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, + SearchViewFilter* search_filter); void search_filter_toolbar_unset_view_filter (SearchFilterToolbar* self); -void library_window_show_search_bar (LibraryWindow* self, gboolean display); -void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToolbarRatingFilterButton* self, RatingFilter filter); -static void search_filter_toolbar_on_savedsearch_selected (SearchFilterToolbar* self, SavedSearch* saved_search); +void library_window_show_search_bar (LibraryWindow* self, + gboolean display); +void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToolbarRatingFilterButton* self, + RatingFilter filter); +static void search_filter_toolbar_on_savedsearch_selected (SearchFilterToolbar* self, + SavedSearch* saved_search); static void search_filter_toolbar_disable_savedsearch (SearchFilterToolbar* self); -static void search_filter_toolbar_edit_dialog (SearchFilterToolbar* self, SavedSearch* search); +static void search_filter_toolbar_edit_dialog (SearchFilterToolbar* self, + SavedSearch* search); gpointer search_filter_toolbar_saved_search_popover_ref (gpointer instance); void search_filter_toolbar_saved_search_popover_unref (gpointer instance); -GParamSpec* search_filter_toolbar_param_spec_saved_search_popover (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void search_filter_toolbar_value_set_saved_search_popover (GValue* value, gpointer v_object); -void search_filter_toolbar_value_take_saved_search_popover (GValue* value, gpointer v_object); +GParamSpec* search_filter_toolbar_param_spec_saved_search_popover (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void search_filter_toolbar_value_set_saved_search_popover (GValue* value, + gpointer v_object); +void search_filter_toolbar_value_take_saved_search_popover (GValue* value, + gpointer v_object); gpointer search_filter_toolbar_value_get_saved_search_popover (const GValue* value); GType search_filter_toolbar_saved_search_popover_get_type (void) G_GNUC_CONST; void search_filter_toolbar_saved_search_popover_hide (SearchFilterToolbarSavedSearchPopover* self); GType saved_search_dialog_get_type (void) G_GNUC_CONST; SavedSearchDialog* saved_search_dialog_new_edit_existing (SavedSearch* saved_search); -SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_type, SavedSearch* saved_search); +SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_type, + SavedSearch* saved_search); void saved_search_dialog_show (SavedSearchDialog* self); -static void search_filter_toolbar_delete_dialog (SearchFilterToolbar* self, SavedSearch* search); +static void search_filter_toolbar_delete_dialog (SearchFilterToolbar* self, + SavedSearch* search); gboolean dialogs_confirm_delete_saved_search (SavedSearch* search); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* app_window_get_command_manager (void); GType command_get_type (void) G_GNUC_CONST; -void command_manager_execute (CommandManager* self, Command* command); +void command_manager_execute (CommandManager* self, + Command* command); DeleteSavedSearchCommand* delete_saved_search_command_new (SavedSearch* search); -DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_type, SavedSearch* search); +DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_type, + SavedSearch* search); GType page_command_get_type (void) G_GNUC_CONST; GType single_data_source_command_get_type (void) G_GNUC_CONST; GType delete_saved_search_command_get_type (void) G_GNUC_CONST; @@ -1361,119 +1546,174 @@ static void search_filter_toolbar_add_dialog (SearchFilterToolbar* self); SavedSearchDialog* saved_search_dialog_new (void); SavedSearchDialog* saved_search_dialog_construct (GType object_type); static void search_filter_toolbar_on_popover_closed (SearchFilterToolbar* self); -void search_filter_toolbar_saved_search_filter_button_set_active (SearchFilterToolbarSavedSearchFilterButton* self, gboolean active); -static void _search_filter_toolbar_edit_dialog_search_filter_toolbar_saved_search_popover_edit_clicked (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self); -static void _search_filter_toolbar_on_savedsearch_selected_search_filter_toolbar_saved_search_popover_search_activated (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self); -static void _search_filter_toolbar_delete_dialog_search_filter_toolbar_saved_search_popover_delete_clicked (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self); -static void _search_filter_toolbar_add_dialog_search_filter_toolbar_saved_search_popover_add_clicked (SearchFilterToolbarSavedSearchPopover* _sender, gpointer self); -static void _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed (SearchFilterToolbarSavedSearchPopover* _sender, gpointer self); +void search_filter_toolbar_saved_search_filter_button_set_active (SearchFilterToolbarSavedSearchFilterButton* self, + gboolean active); +static void _search_filter_toolbar_edit_dialog_search_filter_toolbar_saved_search_popover_edit_clicked (SearchFilterToolbarSavedSearchPopover* _sender, + SavedSearch* search, + gpointer self); +static void _search_filter_toolbar_on_savedsearch_selected_search_filter_toolbar_saved_search_popover_search_activated (SearchFilterToolbarSavedSearchPopover* _sender, + SavedSearch* search, + gpointer self); +static void _search_filter_toolbar_delete_dialog_search_filter_toolbar_saved_search_popover_delete_clicked (SearchFilterToolbarSavedSearchPopover* _sender, + SavedSearch* search, + gpointer self); +static void _search_filter_toolbar_add_dialog_search_filter_toolbar_saved_search_popover_add_clicked (SearchFilterToolbarSavedSearchPopover* _sender, + gpointer self); +static void _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed (SearchFilterToolbarSavedSearchPopover* _sender, + gpointer self); SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popover_new (GtkWidget* relative_to); -SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popover_construct (GType object_type, GtkWidget* relative_to); +SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popover_construct (GType object_type, + GtkWidget* relative_to); void search_filter_toolbar_saved_search_popover_show_all (SearchFilterToolbarSavedSearchPopover* self); void search_filter_toolbar_take_focus (SearchFilterToolbar* self); void search_filter_toolbar_search_box_get_focus (SearchFilterToolbarSearchBox* self); #define SEARCH_FILTER_TOOLBAR_LABEL_TOOL_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCH_FILTER_TOOLBAR_TYPE_LABEL_TOOL_ITEM, SearchFilterToolbarLabelToolItemPrivate)) -enum { - SEARCH_FILTER_TOOLBAR_LABEL_TOOL_ITEM_DUMMY_PROPERTY -}; static void search_filter_toolbar_label_tool_item_finalize (GObject * obj); #define SEARCH_FILTER_TOOLBAR_TOGGLE_ACTION_TOOL_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCH_FILTER_TOOLBAR_TYPE_TOGGLE_ACTION_TOOL_BUTTON, SearchFilterToolbarToggleActionToolButtonPrivate)) -enum { - SEARCH_FILTER_TOOLBAR_TOGGLE_ACTION_TOOL_BUTTON_DUMMY_PROPERTY -}; static void search_filter_toolbar_toggle_action_tool_button_finalize (GObject * obj); #define SEARCH_FILTER_TOOLBAR_SEARCH_BOX_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCH_FILTER_TOOLBAR_TYPE_SEARCH_BOX, SearchFilterToolbarSearchBoxPrivate)) -enum { - SEARCH_FILTER_TOOLBAR_SEARCH_BOX_DUMMY_PROPERTY -}; -static void search_filter_toolbar_search_box_on_action_text_changed (SearchFilterToolbarSearchBox* self, const gchar* text); -static void _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed (TextAction* _sender, const gchar* text, gpointer self); -static void search_filter_toolbar_search_box_on_sensitivity_changed (SearchFilterToolbarSearchBox* self, gboolean sensitive); -static void _search_filter_toolbar_search_box_on_sensitivity_changed_text_action_sensitivity_changed (TextAction* _sender, gboolean sensitive, gpointer self); -static void search_filter_toolbar_search_box_on_visibility_changed (SearchFilterToolbarSearchBox* self, gboolean visible); -static void _search_filter_toolbar_search_box_on_visibility_changed_text_action_visibility_changed (TextAction* _sender, gboolean visible, gpointer self); +static void search_filter_toolbar_search_box_on_action_text_changed (SearchFilterToolbarSearchBox* self, + const gchar* text); +static void _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed (TextAction* _sender, + const gchar* text, + gpointer self); +static void search_filter_toolbar_search_box_on_sensitivity_changed (SearchFilterToolbarSearchBox* self, + gboolean sensitive); +static void _search_filter_toolbar_search_box_on_sensitivity_changed_text_action_sensitivity_changed (TextAction* _sender, + gboolean sensitive, + gpointer self); +static void search_filter_toolbar_search_box_on_visibility_changed (SearchFilterToolbarSearchBox* self, + gboolean visible); +static void _search_filter_toolbar_search_box_on_visibility_changed_text_action_visibility_changed (TextAction* _sender, + gboolean visible, + gpointer self); static void search_filter_toolbar_search_box_on_entry_changed (SearchFilterToolbarSearchBox* self); -static void _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text (GtkEntryBuffer* _sender, guint position, guint n_chars, gpointer self); -static void _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text (GtkEntryBuffer* _sender, guint position, const gchar* chars, guint n_chars, gpointer self); -static gboolean search_filter_toolbar_search_box_on_escape_key (SearchFilterToolbarSearchBox* self, GdkEventKey* e); -static gboolean _search_filter_toolbar_search_box_on_escape_key_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self); -static void search_filter_toolbar_search_box_set_nullable_text (SearchFilterToolbarSearchBox* self, const gchar* text); +static void _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text (GtkEntryBuffer* _sender, + guint position, + guint n_chars, + gpointer self); +static void _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text (GtkEntryBuffer* _sender, + guint position, + const gchar* chars, + guint n_chars, + gpointer self); +static gboolean search_filter_toolbar_search_box_on_escape_key (SearchFilterToolbarSearchBox* self, + GdkEventKey* e); +static gboolean _search_filter_toolbar_search_box_on_escape_key_gtk_widget_key_press_event (GtkWidget* _sender, + GdkEventKey* event, + gpointer self); +static void search_filter_toolbar_search_box_set_nullable_text (SearchFilterToolbarSearchBox* self, + const gchar* text); static void search_filter_toolbar_search_box_finalize (GObject * obj); -enum { - SEARCH_FILTER_TOOLBAR_RATING_FILTER_BUTTON_DUMMY_PROPERTY -}; -static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (SearchFilterToolbarRatingFilterButton* self, RatingFilter filter); +static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (SearchFilterToolbarRatingFilterButton* self, + RatingFilter filter); #define RESOURCES_ICON_FILTER_REJECTED_OR_BETTER "all-rejected.png" #define RESOURCES_ICON_RATING_REJECTED "rejected.svg" #define RESOURCES_ICON_FILTER_UNRATED_OR_BETTER "shotwell-16.png" -GdkPixbuf* resources_load_icon (const gchar* name, gint scale); -static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (SearchFilterToolbarRatingFilterButton* self, RatingFilter filter); +GdkPixbuf* resources_load_icon (const gchar* name, + gint scale); +static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (SearchFilterToolbarRatingFilterButton* self, + RatingFilter filter); #define RESOURCES_ICON_FILTER_REJECTED_OR_BETTER_FIXED_SIZE 32 #define RESOURCES_ICON_FILTER_UNRATED_OR_BETTER_FIXED_SIZE 16 -static gint search_filter_toolbar_rating_filter_button_get_filter_button_size (SearchFilterToolbarRatingFilterButton* self, RatingFilter filter); +static gint search_filter_toolbar_rating_filter_button_get_filter_button_size (SearchFilterToolbarRatingFilterButton* self, + RatingFilter filter); gchar* resources_get_rating_filter_tooltip (RatingFilter filter); static void search_filter_toolbar_rating_filter_button_finalize (GObject * obj); -enum { - SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_FILTER_BUTTON_DUMMY_PROPERTY -}; static void search_filter_toolbar_saved_search_filter_button_on_clicked (SearchFilterToolbarSavedSearchFilterButton* self); -static void _search_filter_toolbar_saved_search_filter_button_on_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void _search_filter_toolbar_saved_search_filter_button_on_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self); void search_filter_toolbar_saved_search_filter_button_restyle (SearchFilterToolbarSavedSearchFilterButton* self); static void search_filter_toolbar_saved_search_filter_button_finalize (GObject * obj); static GType search_filter_toolbar_saved_search_popover_data_button_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, SearchFilterToolbarSavedSearchPopoverPrivate)) -enum { - SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DUMMY_PROPERTY -}; -static void search_filter_toolbar_saved_search_popover_on_edit_click (SearchFilterToolbarSavedSearchPopover* self, SavedSearch* search); -static void _search_filter_toolbar_saved_search_popover_on_edit_click_search_filter_toolbar_saved_search_popover_data_button_clicked (SearchFilterToolbarSavedSearchPopoverDataButton* _sender, SavedSearch* search, gpointer self); -static void search_filter_toolbar_saved_search_popover_on_delete_click (SearchFilterToolbarSavedSearchPopover* self, SavedSearch* search); -static void _search_filter_toolbar_saved_search_popover_on_delete_click_search_filter_toolbar_saved_search_popover_data_button_clicked (SearchFilterToolbarSavedSearchPopoverDataButton* _sender, SavedSearch* search, gpointer self); +static void search_filter_toolbar_saved_search_popover_on_edit_click (SearchFilterToolbarSavedSearchPopover* self, + SavedSearch* search); +static void _search_filter_toolbar_saved_search_popover_on_edit_click_search_filter_toolbar_saved_search_popover_data_button_clicked (SearchFilterToolbarSavedSearchPopoverDataButton* _sender, + SavedSearch* search, + gpointer self); +static void search_filter_toolbar_saved_search_popover_on_delete_click (SearchFilterToolbarSavedSearchPopover* self, + SavedSearch* search); +static void _search_filter_toolbar_saved_search_popover_on_delete_click_search_filter_toolbar_saved_search_popover_data_button_clicked (SearchFilterToolbarSavedSearchPopoverDataButton* _sender, + SavedSearch* search, + gpointer self); static void search_filter_toolbar_saved_search_popover_on_add_click (SearchFilterToolbarSavedSearchPopover* self); -static void _search_filter_toolbar_saved_search_popover_on_add_click_gtk_button_clicked (GtkButton* _sender, gpointer self); -static void search_filter_toolbar_saved_search_popover_on_activate_row (SearchFilterToolbarSavedSearchPopover* self, GtkListBoxRow* row); -static void _search_filter_toolbar_saved_search_popover_on_activate_row_gtk_list_box_row_activated (GtkListBox* _sender, GtkListBoxRow* row, gpointer self); +static void _search_filter_toolbar_saved_search_popover_on_add_click_gtk_button_clicked (GtkButton* _sender, + gpointer self); +static void search_filter_toolbar_saved_search_popover_on_activate_row (SearchFilterToolbarSavedSearchPopover* self, + GtkListBoxRow* row); +static void _search_filter_toolbar_saved_search_popover_on_activate_row_gtk_list_box_row_activated (GtkListBox* _sender, + GtkListBoxRow* row, + gpointer self); static void search_filter_toolbar_saved_search_popover_on_popover_closed (SearchFilterToolbarSavedSearchPopover* self); -static void _search_filter_toolbar_saved_search_popover_on_popover_closed_gtk_popover_closed (GtkPopover* _sender, gpointer self); +static void _search_filter_toolbar_saved_search_popover_on_popover_closed_gtk_popover_closed (GtkPopover* _sender, + gpointer self); gpointer saved_search_table_ref (gpointer instance); void saved_search_table_unref (gpointer instance); -GParamSpec* param_spec_saved_search_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_saved_search_table (GValue* value, gpointer v_object); -void value_take_saved_search_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_saved_search_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_saved_search_table (GValue* value, + gpointer v_object); +void value_take_saved_search_table (GValue* value, + gpointer v_object); gpointer value_get_saved_search_table (const GValue* value); GType saved_search_table_get_type (void) G_GNUC_CONST; SavedSearchTable* saved_search_table_get_instance (void); GeeCollection* saved_search_table_get_all (SavedSearchTable* self); gchar* data_object_get_name (DataObject* self); -static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_saved_search_popover_data_button_new (SavedSearch* search, const gchar* name); -static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_saved_search_popover_data_button_construct (GType object_type, SavedSearch* search, const gchar* name); -static void _vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton** * array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value); -static void _vala_array_add135 (SearchFilterToolbarSavedSearchPopoverDataButton** * array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value); +static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_saved_search_popover_data_button_new (SavedSearch* search, + const gchar* name); +static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_saved_search_popover_data_button_construct (GType object_type, + SavedSearch* search, + const gchar* name); +static void _vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton** * array, + int* length, + int* size, + SearchFilterToolbarSavedSearchPopoverDataButton* value); +static void _vala_array_add135 (SearchFilterToolbarSavedSearchPopoverDataButton** * array, + int* length, + int* size, + SearchFilterToolbarSavedSearchPopoverDataButton* value); void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSavedSearchPopover* self); static void search_filter_toolbar_saved_search_popover_data_button_restyle (SearchFilterToolbarSavedSearchPopoverDataButton* self); -static gboolean search_filter_toolbar_saved_search_popover_is_search_row (SearchFilterToolbarSavedSearchPopover* self, GtkListBoxRow* row); -static SavedSearch* search_filter_toolbar_saved_search_popover_get_search (SearchFilterToolbarSavedSearchPopover* self, GtkListBoxRow* row); +static gboolean search_filter_toolbar_saved_search_popover_is_search_row (SearchFilterToolbarSavedSearchPopover* self, + GtkListBoxRow* row); +static SavedSearch* search_filter_toolbar_saved_search_popover_get_search (SearchFilterToolbarSavedSearchPopover* self, + GtkListBoxRow* row); static SavedSearch* search_filter_toolbar_saved_search_popover_data_button_get_search (SearchFilterToolbarSavedSearchPopoverDataButton* self); #define SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, SearchFilterToolbarSavedSearchPopoverDataButtonPrivate)) -enum { - SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_DUMMY_PROPERTY, - SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH_PROPERTY -}; static void search_filter_toolbar_saved_search_popover_data_button_on_click (SearchFilterToolbarSavedSearchPopoverDataButton* self); -static void _search_filter_toolbar_saved_search_popover_data_button_on_click_gtk_button_clicked (GtkButton* _sender, gpointer self); -static void search_filter_toolbar_saved_search_popover_data_button_set_search (SearchFilterToolbarSavedSearchPopoverDataButton* self, SavedSearch* value); +static void _search_filter_toolbar_saved_search_popover_data_button_on_click_gtk_button_clicked (GtkButton* _sender, + gpointer self); +static void search_filter_toolbar_saved_search_popover_data_button_set_search (SearchFilterToolbarSavedSearchPopoverDataButton* self, + SavedSearch* value); static void search_filter_toolbar_saved_search_popover_data_button_finalize (GObject * obj); -static void _vala_search_filter_toolbar_saved_search_popover_data_button_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void _vala_search_filter_toolbar_saved_search_popover_data_button_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); +static void _vala_search_filter_toolbar_saved_search_popover_data_button_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); +static void _vala_search_filter_toolbar_saved_search_popover_data_button_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec); static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToolbarSavedSearchPopover * obj); static void search_filter_toolbar_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); static const GActionEntry SEARCH_FILTER_ACTIONS_entries[5] = {{"display.rating", _search_filter_actions_on_action_radio_gsimple_action_activate_callback, "s", "'2'", _search_filter_actions_on_rating_changed_gsimple_action_change_state_callback}, {"display.flagged", _search_filter_actions_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _search_filter_actions_on_flagged_toggled_gsimple_action_change_state_callback}, {"display.photos", _search_filter_actions_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _search_filter_actions_on_photos_toggled_gsimple_action_change_state_callback}, {"display.videos", _search_filter_actions_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _search_filter_actions_on_videos_toggled_gsimple_action_change_state_callback}, {"display.raw", _search_filter_actions_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _search_filter_actions_on_raw_toggled_gsimple_action_change_state_callback}}; -GType search_filter_criteria_get_type (void) { +GType +search_filter_criteria_get_type (void) +{ static volatile gsize search_filter_criteria_type_id__volatile = 0; if (g_once_init_enter (&search_filter_criteria_type_id__volatile)) { static const GFlagsValue values[] = {{SEARCH_FILTER_CRITERIA_NONE, "SEARCH_FILTER_CRITERIA_NONE", "none"}, {SEARCH_FILTER_CRITERIA_RECURSIVE, "SEARCH_FILTER_CRITERIA_RECURSIVE", "recursive"}, {SEARCH_FILTER_CRITERIA_TEXT, "SEARCH_FILTER_CRITERIA_TEXT", "text"}, {SEARCH_FILTER_CRITERIA_FLAG, "SEARCH_FILTER_CRITERIA_FLAG", "flag"}, {SEARCH_FILTER_CRITERIA_MEDIA, "SEARCH_FILTER_CRITERIA_MEDIA", "media"}, {SEARCH_FILTER_CRITERIA_RATING, "SEARCH_FILTER_CRITERIA_RATING", "rating"}, {SEARCH_FILTER_CRITERIA_SAVEDSEARCH, "SEARCH_FILTER_CRITERIA_SAVEDSEARCH", "savedsearch"}, {SEARCH_FILTER_CRITERIA_ALL, "SEARCH_FILTER_CRITERIA_ALL", "all"}, {0, NULL, NULL}}; @@ -1485,7 +1725,9 @@ GType search_filter_criteria_get_type (void) { } -GType rating_filter_get_type (void) { +GType +rating_filter_get_type (void) +{ static volatile gsize rating_filter_type_id__volatile = 0; if (g_once_init_enter (&rating_filter_type_id__volatile)) { static const GEnumValue values[] = {{RATING_FILTER_NO_FILTER, "RATING_FILTER_NO_FILTER", "no-filter"}, {RATING_FILTER_REJECTED_OR_HIGHER, "RATING_FILTER_REJECTED_OR_HIGHER", "rejected-or-higher"}, {RATING_FILTER_UNRATED_OR_HIGHER, "RATING_FILTER_UNRATED_OR_HIGHER", "unrated-or-higher"}, {RATING_FILTER_ONE_OR_HIGHER, "RATING_FILTER_ONE_OR_HIGHER", "one-or-higher"}, {RATING_FILTER_TWO_OR_HIGHER, "RATING_FILTER_TWO_OR_HIGHER", "two-or-higher"}, {RATING_FILTER_THREE_OR_HIGHER, "RATING_FILTER_THREE_OR_HIGHER", "three-or-higher"}, {RATING_FILTER_FOUR_OR_HIGHER, "RATING_FILTER_FOUR_OR_HIGHER", "four-or-higher"}, {RATING_FILTER_FIVE_OR_HIGHER, "RATING_FILTER_FIVE_OR_HIGHER", "five-or-higher"}, {RATING_FILTER_REJECTED_ONLY, "RATING_FILTER_REJECTED_ONLY", "rejected-only"}, {RATING_FILTER_UNRATED_ONLY, "RATING_FILTER_UNRATED_ONLY", "unrated-only"}, {RATING_FILTER_ONE_ONLY, "RATING_FILTER_ONE_ONLY", "one-only"}, {RATING_FILTER_TWO_ONLY, "RATING_FILTER_TWO_ONLY", "two-only"}, {RATING_FILTER_THREE_ONLY, "RATING_FILTER_THREE_ONLY", "three-only"}, {RATING_FILTER_FOUR_ONLY, "RATING_FILTER_FOUR_ONLY", "four-only"}, {RATING_FILTER_FIVE_ONLY, "RATING_FILTER_FIVE_ONLY", "five-only"}, {0, NULL, NULL}}; @@ -1497,41 +1739,45 @@ GType rating_filter_get_type (void) { } -static guint search_view_filter_real_get_criteria (SearchViewFilter* self) { +static guint +search_view_filter_real_get_criteria (SearchViewFilter* self) +{ guint _tmp0_ = 0U; #line 65 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_critical ("Type `%s' does not implement abstract method `search_view_filter_get_criteria'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 65 "/home/jens/Source/shotwell/src/SearchFilter.vala" return _tmp0_; -#line 1507 "SearchFilter.c" +#line 1751 "SearchFilter.c" } -guint search_view_filter_get_criteria (SearchViewFilter* self) { +guint +search_view_filter_get_criteria (SearchViewFilter* self) +{ #line 65 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (IS_SEARCH_VIEW_FILTER (self), 0U); #line 65 "/home/jens/Source/shotwell/src/SearchFilter.vala" return SEARCH_VIEW_FILTER_GET_CLASS (self)->get_criteria (self); -#line 1516 "SearchFilter.c" +#line 1762 "SearchFilter.c" } -void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter rf) { +void +search_view_filter_set_rating_filter (SearchViewFilter* self, + RatingFilter rf) +{ RatingFilter _tmp0_; - RatingFilter _tmp1_; #line 67 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_VIEW_FILTER (self)); #line 68 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = rf; -#line 68 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->rating_filter = _tmp0_; + self->priv->rating_filter = rf; #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = self->priv->rating_filter; + _tmp0_ = self->priv->rating_filter; #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" - switch (_tmp1_) { + switch (_tmp0_) { #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_REJECTED_ONLY: -#line 1535 "SearchFilter.c" +#line 1781 "SearchFilter.c" { #line 71 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_REJECTED; @@ -1539,11 +1785,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = FALSE; #line 73 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1543 "SearchFilter.c" +#line 1789 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_REJECTED_OR_HIGHER: -#line 1547 "SearchFilter.c" +#line 1793 "SearchFilter.c" { #line 76 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_REJECTED; @@ -1551,11 +1797,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = TRUE; #line 78 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1555 "SearchFilter.c" +#line 1801 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_ONE_OR_HIGHER: -#line 1559 "SearchFilter.c" +#line 1805 "SearchFilter.c" { #line 81 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_ONE; @@ -1563,11 +1809,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = TRUE; #line 83 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1567 "SearchFilter.c" +#line 1813 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_ONE_ONLY: -#line 1571 "SearchFilter.c" +#line 1817 "SearchFilter.c" { #line 86 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_ONE; @@ -1575,11 +1821,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = FALSE; #line 88 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1579 "SearchFilter.c" +#line 1825 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_TWO_OR_HIGHER: -#line 1583 "SearchFilter.c" +#line 1829 "SearchFilter.c" { #line 91 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_TWO; @@ -1587,11 +1833,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = TRUE; #line 93 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1591 "SearchFilter.c" +#line 1837 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_TWO_ONLY: -#line 1595 "SearchFilter.c" +#line 1841 "SearchFilter.c" { #line 96 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_TWO; @@ -1599,11 +1845,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = FALSE; #line 98 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1603 "SearchFilter.c" +#line 1849 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_THREE_OR_HIGHER: -#line 1607 "SearchFilter.c" +#line 1853 "SearchFilter.c" { #line 101 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_THREE; @@ -1611,11 +1857,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = TRUE; #line 103 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1615 "SearchFilter.c" +#line 1861 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_THREE_ONLY: -#line 1619 "SearchFilter.c" +#line 1865 "SearchFilter.c" { #line 106 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_THREE; @@ -1623,11 +1869,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = FALSE; #line 108 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1627 "SearchFilter.c" +#line 1873 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_FOUR_OR_HIGHER: -#line 1631 "SearchFilter.c" +#line 1877 "SearchFilter.c" { #line 111 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_FOUR; @@ -1635,11 +1881,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = TRUE; #line 113 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1639 "SearchFilter.c" +#line 1885 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_FOUR_ONLY: -#line 1643 "SearchFilter.c" +#line 1889 "SearchFilter.c" { #line 116 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_FOUR; @@ -1647,11 +1893,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = FALSE; #line 118 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1651 "SearchFilter.c" +#line 1897 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_FIVE_OR_HIGHER: -#line 1655 "SearchFilter.c" +#line 1901 "SearchFilter.c" { #line 121 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_FIVE; @@ -1659,11 +1905,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = TRUE; #line 123 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1663 "SearchFilter.c" +#line 1909 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_FIVE_ONLY: -#line 1667 "SearchFilter.c" +#line 1913 "SearchFilter.c" { #line 126 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_FIVE; @@ -1671,12 +1917,12 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = FALSE; #line 128 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1675 "SearchFilter.c" +#line 1921 "SearchFilter.c" } default: #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_UNRATED_OR_HIGHER: -#line 1680 "SearchFilter.c" +#line 1926 "SearchFilter.c" { #line 132 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_UNRATED; @@ -1684,31 +1930,32 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = TRUE; #line 134 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1688 "SearchFilter.c" +#line 1934 "SearchFilter.c" } } } -gboolean search_view_filter_has_search_filter (SearchViewFilter* self) { +gboolean +search_view_filter_has_search_filter (SearchViewFilter* self) +{ gboolean result = FALSE; const gchar* _tmp0_; - gboolean _tmp1_; #line 138 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (IS_SEARCH_VIEW_FILTER (self), FALSE); #line 139 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->search_filter; #line 139 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = is_string_empty (_tmp0_); -#line 139 "/home/jens/Source/shotwell/src/SearchFilter.vala" - result = !_tmp1_; + result = !is_string_empty (_tmp0_); #line 139 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 1708 "SearchFilter.c" +#line 1953 "SearchFilter.c" } -const gchar* search_view_filter_get_search_filter (SearchViewFilter* self) { +const gchar* +search_view_filter_get_search_filter (SearchViewFilter* self) +{ const gchar* result = NULL; const gchar* _tmp0_; #line 142 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -1719,11 +1966,14 @@ const gchar* search_view_filter_get_search_filter (SearchViewFilter* self) { result = _tmp0_; #line 143 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 1723 "SearchFilter.c" +#line 1970 "SearchFilter.c" } -gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, int* result_length1) { +gchar** +search_view_filter_get_search_filter_words (SearchViewFilter* self, + int* result_length1) +{ gchar** result = NULL; gchar** _tmp0_; gint _tmp0__length1; @@ -1743,134 +1993,133 @@ gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, int* if (result_length1) { #line 147 "/home/jens/Source/shotwell/src/SearchFilter.vala" *result_length1 = _tmp1__length1; -#line 1747 "SearchFilter.c" +#line 1997 "SearchFilter.c" } #line 147 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = _tmp1_; #line 147 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 1753 "SearchFilter.c" +#line 2003 "SearchFilter.c" } -static gchar** _vala_array_dup27 (gchar** self, int length) { +static gchar** +_vala_array_dup27 (gchar** self, + int length) +{ gchar** result; int i; #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = g_new0 (gchar*, length + 1); #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" for (i = 0; i < length; i++) { -#line 1764 "SearchFilter.c" +#line 2017 "SearchFilter.c" gchar* _tmp0_; #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = g_strdup (self[i]); #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" result[i] = _tmp0_; -#line 1770 "SearchFilter.c" +#line 2023 "SearchFilter.c" } #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 1774 "SearchFilter.c" +#line 2027 "SearchFilter.c" } -void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar* text) { +void +search_view_filter_set_search_filter (SearchViewFilter* self, + const gchar* text) +{ gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - gboolean _tmp2_; - gchar* _tmp5_; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - gint __tmp6__size_ = 0; - const gchar* _tmp7_; - gchar** _tmp11_; - gint _tmp11__length1; + gchar* _tmp2_; + gchar** _tmp3_ = NULL; + gint _tmp3__length1 = 0; + gint __tmp3__size_ = 0; + const gchar* _tmp4_; + gchar** _tmp8_; + gint _tmp8__length1; #line 150 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_VIEW_FILTER (self)); #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = text; -#line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = is_string_empty (_tmp1_); -#line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (!_tmp2_) { -#line 1797 "SearchFilter.c" - const gchar* _tmp3_; - gchar* _tmp4_; -#line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = text; + if (!is_string_empty (text)) { +#line 2047 "SearchFilter.c" + gchar* _tmp1_; #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = g_utf8_strdown (_tmp3_, (gssize) -1); + _tmp1_ = g_utf8_strdown (text, (gssize) -1); #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_free0 (_tmp0_); #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = _tmp4_; -#line 1808 "SearchFilter.c" + _tmp0_ = _tmp1_; +#line 2055 "SearchFilter.c" } else { #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_free0 (_tmp0_); #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = NULL; -#line 1814 "SearchFilter.c" +#line 2061 "SearchFilter.c" } #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = g_strdup (_tmp0_); + _tmp2_ = g_strdup (_tmp0_); #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_free0 (self->priv->search_filter); #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->search_filter = _tmp5_; + self->priv->search_filter = _tmp2_; #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp7_ = self->priv->search_filter; + _tmp4_ = self->priv->search_filter; #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp7_ != NULL) { -#line 1826 "SearchFilter.c" - const gchar* _tmp8_; - gchar** _tmp9_; - gchar** _tmp10_; + if (_tmp4_ != NULL) { +#line 2073 "SearchFilter.c" + const gchar* _tmp5_; + gchar** _tmp6_; + gchar** _tmp7_; #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = self->priv->search_filter; + _tmp5_ = self->priv->search_filter; #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp10_ = _tmp9_ = g_strsplit (_tmp8_, " ", 0); + _tmp7_ = _tmp6_ = g_strsplit (_tmp5_, " ", 0); #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL); + _tmp3_ = (_vala_array_free (_tmp3_, _tmp3__length1, (GDestroyNotify) g_free), NULL); #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = _tmp10_; + _tmp3_ = _tmp7_; #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6__length1 = _vala_array_length (_tmp9_); + _tmp3__length1 = _vala_array_length (_tmp6_); #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" - __tmp6__size_ = _tmp6__length1; -#line 1842 "SearchFilter.c" + __tmp3__size_ = _tmp3__length1; +#line 2089 "SearchFilter.c" } else { #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL); + _tmp3_ = (_vala_array_free (_tmp3_, _tmp3__length1, (GDestroyNotify) g_free), NULL); #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = NULL; + _tmp3_ = NULL; #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6__length1 = 0; + _tmp3__length1 = 0; #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" - __tmp6__size_ = _tmp6__length1; -#line 1852 "SearchFilter.c" + __tmp3__size_ = _tmp3__length1; +#line 2099 "SearchFilter.c" } #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp11_ = (_tmp6_ != NULL) ? _vala_array_dup27 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_); + _tmp8_ = (_tmp3_ != NULL) ? _vala_array_dup27 (_tmp3_, _tmp3__length1) : ((gpointer) _tmp3_); #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp11__length1 = _tmp6__length1; + _tmp8__length1 = _tmp3__length1; #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->search_filter_words = (_vala_array_free (self->priv->search_filter_words, self->priv->search_filter_words_length1, (GDestroyNotify) g_free), NULL); #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->search_filter_words = _tmp11_; + self->priv->search_filter_words = _tmp8_; #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->search_filter_words_length1 = _tmp11__length1; + self->priv->search_filter_words_length1 = _tmp8__length1; #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->_search_filter_words_size_ = self->priv->search_filter_words_length1; #line 150 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL); + _tmp3_ = (_vala_array_free (_tmp3_, _tmp3__length1, (GDestroyNotify) g_free), NULL); #line 150 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_free0 (_tmp0_); -#line 1870 "SearchFilter.c" +#line 2117 "SearchFilter.c" } -void search_view_filter_clear_search_filter (SearchViewFilter* self) { +void +search_view_filter_clear_search_filter (SearchViewFilter* self) +{ #line 155 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_VIEW_FILTER (self)); #line 156 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -1885,11 +2134,13 @@ void search_view_filter_clear_search_filter (SearchViewFilter* self) { self->priv->search_filter_words_length1 = 0; #line 157 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->_search_filter_words_size_ = self->priv->search_filter_words_length1; -#line 1889 "SearchFilter.c" +#line 2138 "SearchFilter.c" } -gboolean search_view_filter_has_saved_search (SearchViewFilter* self) { +gboolean +search_view_filter_has_saved_search (SearchViewFilter* self) +{ gboolean result = FALSE; SavedSearch* _tmp0_; #line 160 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -1900,11 +2151,13 @@ gboolean search_view_filter_has_saved_search (SearchViewFilter* self) { result = _tmp0_ != NULL; #line 161 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 1904 "SearchFilter.c" +#line 2155 "SearchFilter.c" } -gboolean search_view_filter_get_rating_allow_higher (SearchViewFilter* self) { +gboolean +search_view_filter_get_rating_allow_higher (SearchViewFilter* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 164 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -1915,11 +2168,13 @@ gboolean search_view_filter_get_rating_allow_higher (SearchViewFilter* self) { result = _tmp0_; #line 165 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 1919 "SearchFilter.c" +#line 2172 "SearchFilter.c" } -Rating search_view_filter_get_rating (SearchViewFilter* self) { +Rating +search_view_filter_get_rating (SearchViewFilter* self) +{ Rating result = 0; Rating _tmp0_; #line 168 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -1930,11 +2185,13 @@ Rating search_view_filter_get_rating (SearchViewFilter* self) { result = _tmp0_; #line 169 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 1934 "SearchFilter.c" +#line 2189 "SearchFilter.c" } -gboolean search_view_filter_filter_by_media_type (SearchViewFilter* self) { +gboolean +search_view_filter_filter_by_media_type (SearchViewFilter* self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; @@ -1948,31 +2205,31 @@ gboolean search_view_filter_filter_by_media_type (SearchViewFilter* self) { if (_tmp3_) { #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = TRUE; -#line 1952 "SearchFilter.c" +#line 2209 "SearchFilter.c" } else { gboolean _tmp4_; #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4_ = self->priv->_show_media_photos; #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = _tmp4_; -#line 1959 "SearchFilter.c" +#line 2216 "SearchFilter.c" } #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp2_) { #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = TRUE; -#line 1965 "SearchFilter.c" +#line 2222 "SearchFilter.c" } else { gboolean _tmp5_; #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = self->priv->_show_media_raw; #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = _tmp5_; -#line 1972 "SearchFilter.c" +#line 2229 "SearchFilter.c" } #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp1_) { -#line 1976 "SearchFilter.c" +#line 2233 "SearchFilter.c" gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; gboolean _tmp8_; @@ -1980,59 +2237,63 @@ gboolean search_view_filter_filter_by_media_type (SearchViewFilter* self) { _tmp8_ = self->priv->_show_media_video; #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp8_) { -#line 1984 "SearchFilter.c" +#line 2241 "SearchFilter.c" gboolean _tmp9_; #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp9_ = self->priv->_show_media_photos; #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp7_ = _tmp9_; -#line 1990 "SearchFilter.c" +#line 2247 "SearchFilter.c" } else { #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp7_ = FALSE; -#line 1994 "SearchFilter.c" +#line 2251 "SearchFilter.c" } #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp7_) { -#line 1998 "SearchFilter.c" +#line 2255 "SearchFilter.c" gboolean _tmp10_; #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp10_ = self->priv->_show_media_raw; #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp6_ = _tmp10_; -#line 2004 "SearchFilter.c" +#line 2261 "SearchFilter.c" } else { #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp6_ = FALSE; -#line 2008 "SearchFilter.c" +#line 2265 "SearchFilter.c" } #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = !_tmp6_; -#line 2012 "SearchFilter.c" +#line 2269 "SearchFilter.c" } else { #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = FALSE; -#line 2016 "SearchFilter.c" +#line 2273 "SearchFilter.c" } #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = _tmp0_; #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2022 "SearchFilter.c" +#line 2279 "SearchFilter.c" } -SearchViewFilter* search_view_filter_construct (GType object_type) { +SearchViewFilter* +search_view_filter_construct (GType object_type) +{ SearchViewFilter* self = NULL; #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = (SearchViewFilter*) view_filter_construct (object_type); #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 2032 "SearchFilter.c" +#line 2291 "SearchFilter.c" } -gboolean search_view_filter_get_flagged (SearchViewFilter* self) { +gboolean +search_view_filter_get_flagged (SearchViewFilter* self) +{ gboolean result; gboolean _tmp0_; #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -2043,23 +2304,25 @@ gboolean search_view_filter_get_flagged (SearchViewFilter* self) { result = _tmp0_; #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2047 "SearchFilter.c" +#line 2308 "SearchFilter.c" } -void search_view_filter_set_flagged (SearchViewFilter* self, gboolean value) { - gboolean _tmp0_; +void +search_view_filter_set_flagged (SearchViewFilter* self, + gboolean value) +{ #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_VIEW_FILTER (self)); #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = value; -#line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->_flagged = _tmp0_; -#line 2059 "SearchFilter.c" + self->priv->_flagged = value; +#line 2320 "SearchFilter.c" } -gboolean search_view_filter_get_show_media_video (SearchViewFilter* self) { +gboolean +search_view_filter_get_show_media_video (SearchViewFilter* self) +{ gboolean result; gboolean _tmp0_; #line 51 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -2070,23 +2333,25 @@ gboolean search_view_filter_get_show_media_video (SearchViewFilter* self) { result = _tmp0_; #line 51 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2074 "SearchFilter.c" +#line 2337 "SearchFilter.c" } -void search_view_filter_set_show_media_video (SearchViewFilter* self, gboolean value) { - gboolean _tmp0_; +void +search_view_filter_set_show_media_video (SearchViewFilter* self, + gboolean value) +{ #line 51 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_VIEW_FILTER (self)); #line 51 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = value; -#line 51 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->_show_media_video = _tmp0_; -#line 2086 "SearchFilter.c" + self->priv->_show_media_video = value; +#line 2349 "SearchFilter.c" } -gboolean search_view_filter_get_show_media_photos (SearchViewFilter* self) { +gboolean +search_view_filter_get_show_media_photos (SearchViewFilter* self) +{ gboolean result; gboolean _tmp0_; #line 52 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -2097,23 +2362,25 @@ gboolean search_view_filter_get_show_media_photos (SearchViewFilter* self) { result = _tmp0_; #line 52 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2101 "SearchFilter.c" +#line 2366 "SearchFilter.c" } -void search_view_filter_set_show_media_photos (SearchViewFilter* self, gboolean value) { - gboolean _tmp0_; +void +search_view_filter_set_show_media_photos (SearchViewFilter* self, + gboolean value) +{ #line 52 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_VIEW_FILTER (self)); #line 52 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = value; -#line 52 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->_show_media_photos = _tmp0_; -#line 2113 "SearchFilter.c" + self->priv->_show_media_photos = value; +#line 2378 "SearchFilter.c" } -gboolean search_view_filter_get_show_media_raw (SearchViewFilter* self) { +gboolean +search_view_filter_get_show_media_raw (SearchViewFilter* self) +{ gboolean result; gboolean _tmp0_; #line 53 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -2124,23 +2391,25 @@ gboolean search_view_filter_get_show_media_raw (SearchViewFilter* self) { result = _tmp0_; #line 53 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2128 "SearchFilter.c" +#line 2395 "SearchFilter.c" } -void search_view_filter_set_show_media_raw (SearchViewFilter* self, gboolean value) { - gboolean _tmp0_; +void +search_view_filter_set_show_media_raw (SearchViewFilter* self, + gboolean value) +{ #line 53 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_VIEW_FILTER (self)); #line 53 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = value; -#line 53 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->_show_media_raw = _tmp0_; -#line 2140 "SearchFilter.c" + self->priv->_show_media_raw = value; +#line 2407 "SearchFilter.c" } -SavedSearch* search_view_filter_get_saved_search (SearchViewFilter* self) { +SavedSearch* +search_view_filter_get_saved_search (SearchViewFilter* self) +{ SavedSearch* result; SavedSearch* _tmp0_; #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -2151,35 +2420,39 @@ SavedSearch* search_view_filter_get_saved_search (SearchViewFilter* self) { result = _tmp0_; #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2155 "SearchFilter.c" +#line 2424 "SearchFilter.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self ? g_object_ref (self) : NULL; -#line 2162 "SearchFilter.c" +#line 2433 "SearchFilter.c" } -void search_view_filter_set_saved_search (SearchViewFilter* self, SavedSearch* value) { +void +search_view_filter_set_saved_search (SearchViewFilter* self, + SavedSearch* value) +{ SavedSearch* _tmp0_; - SavedSearch* _tmp1_; #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_VIEW_FILTER (self)); #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = value; -#line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (value); #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->_saved_search); #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->_saved_search = _tmp1_; -#line 2179 "SearchFilter.c" + self->priv->_saved_search = _tmp0_; +#line 2450 "SearchFilter.c" } -static void search_view_filter_class_init (SearchViewFilterClass * klass) { +static void +search_view_filter_class_init (SearchViewFilterClass * klass) +{ #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_view_filter_parent_class = g_type_class_peek_parent (klass); #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -2188,11 +2461,13 @@ static void search_view_filter_class_init (SearchViewFilterClass * klass) { g_type_class_add_private (klass, sizeof (SearchViewFilterPrivate)); #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala" ((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) search_view_filter_real_get_criteria; -#line 2192 "SearchFilter.c" +#line 2465 "SearchFilter.c" } -static void search_view_filter_instance_init (SearchViewFilter * self) { +static void +search_view_filter_instance_init (SearchViewFilter * self) +{ #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv = SEARCH_VIEW_FILTER_GET_PRIVATE (self); #line 41 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -2219,11 +2494,13 @@ static void search_view_filter_instance_init (SearchViewFilter * self) { self->priv->_search_filter_words_size_ = self->priv->search_filter_words_length1; #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->_saved_search = NULL; -#line 2223 "SearchFilter.c" +#line 2498 "SearchFilter.c" } -static void search_view_filter_finalize (ViewFilter * obj) { +static void +search_view_filter_finalize (ViewFilter * obj) +{ SearchViewFilter * self; #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter); @@ -2235,11 +2512,13 @@ static void search_view_filter_finalize (ViewFilter * obj) { _g_object_unref0 (self->priv->_saved_search); #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala" VIEW_FILTER_CLASS (search_view_filter_parent_class)->finalize (obj); -#line 2239 "SearchFilter.c" +#line 2516 "SearchFilter.c" } -GType search_view_filter_get_type (void) { +GType +search_view_filter_get_type (void) +{ static volatile gsize search_view_filter_type_id__volatile = 0; if (g_once_init_enter (&search_view_filter_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SearchViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) search_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchViewFilter), 0, (GInstanceInitFunc) search_view_filter_instance_init, NULL }; @@ -2251,278 +2530,247 @@ GType search_view_filter_get_type (void) { } -static gboolean string_contains (const gchar* self, const gchar* needle) { +static gboolean +string_contains (const gchar* self, + const gchar* needle) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gchar* _tmp1_; -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = needle; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_ != NULL; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = strstr ((gchar*) self, (gchar*) needle); +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_ != NULL; +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2271 "SearchFilter.c" +#line 2550 "SearchFilter.c" } -static gboolean default_search_view_filter_real_predicate (ViewFilter* base, DataView* view) { +static gboolean +default_search_view_filter_real_predicate (ViewFilter* base, + DataView* view) +{ DefaultSearchViewFilter * self; gboolean result = FALSE; MediaSource* source = NULL; - DataView* _tmp0_; - MediaSource* _tmp1_; + MediaSource* _tmp0_; guint criteria = 0U; - guint _tmp2_; - guint _tmp3_; + guint _tmp1_; + guint _tmp6_; + gboolean _tmp13_ = FALSE; guint _tmp14_; - gboolean _tmp22_ = FALSE; - guint _tmp23_; - gboolean _tmp40_ = FALSE; - guint _tmp41_; - gboolean _tmp87_ = FALSE; - guint _tmp88_; + gboolean _tmp29_ = FALSE; + guint _tmp30_; + gboolean _tmp72_ = FALSE; + guint _tmp73_; #line 181 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DEFAULT_SEARCH_VIEW_FILTER, DefaultSearchViewFilter); #line 181 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (IS_DATA_VIEW (view), FALSE); #line 182 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = view; + _tmp0_ = thumbnail_get_media_source (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_THUMBNAIL, Thumbnail)); #line 182 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = thumbnail_get_media_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL, Thumbnail)); -#line 182 "/home/jens/Source/shotwell/src/SearchFilter.vala" - source = _tmp1_; -#line 183 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = search_view_filter_get_criteria (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); + source = _tmp0_; #line 183 "/home/jens/Source/shotwell/src/SearchFilter.vala" - criteria = _tmp2_; + criteria = search_view_filter_get_criteria (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 186 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = criteria; + _tmp1_ = criteria; #line 186 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if ((SEARCH_FILTER_CRITERIA_RATING & _tmp3_) != 0) { -#line 2309 "SearchFilter.c" - gboolean _tmp4_ = FALSE; - gboolean _tmp5_; -#line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = search_view_filter_get_rating_allow_higher (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); + if ((SEARCH_FILTER_CRITERIA_RATING & _tmp1_) != 0) { +#line 2585 "SearchFilter.c" + gboolean _tmp2_ = FALSE; #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp5_) { -#line 2316 "SearchFilter.c" - MediaSource* _tmp6_; - Rating _tmp7_; - Rating _tmp8_; + if (search_view_filter_get_rating_allow_higher (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter))) { +#line 2589 "SearchFilter.c" + MediaSource* _tmp3_; #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = source; + _tmp3_ = source; #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp7_ = media_source_get_rating (_tmp6_); -#line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = search_view_filter_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = _tmp7_ < _tmp8_; -#line 2328 "SearchFilter.c" + _tmp2_ = media_source_get_rating (_tmp3_) < search_view_filter_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); +#line 2595 "SearchFilter.c" } else { #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = FALSE; -#line 2332 "SearchFilter.c" + _tmp2_ = FALSE; +#line 2599 "SearchFilter.c" } #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp4_) { + if (_tmp2_) { #line 188 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = FALSE; #line 188 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (source); #line 188 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2342 "SearchFilter.c" +#line 2609 "SearchFilter.c" } else { - gboolean _tmp9_ = FALSE; - gboolean _tmp10_; -#line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp10_ = search_view_filter_get_rating_allow_higher (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); + gboolean _tmp4_ = FALSE; #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (!_tmp10_) { -#line 2350 "SearchFilter.c" - MediaSource* _tmp11_; - Rating _tmp12_; - Rating _tmp13_; + if (!search_view_filter_get_rating_allow_higher (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter))) { +#line 2614 "SearchFilter.c" + MediaSource* _tmp5_; #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp11_ = source; + _tmp5_ = source; #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp12_ = media_source_get_rating (_tmp11_); -#line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp13_ = search_view_filter_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp9_ = _tmp12_ != _tmp13_; -#line 2362 "SearchFilter.c" + _tmp4_ = media_source_get_rating (_tmp5_) != search_view_filter_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); +#line 2620 "SearchFilter.c" } else { #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp9_ = FALSE; -#line 2366 "SearchFilter.c" + _tmp4_ = FALSE; +#line 2624 "SearchFilter.c" } #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp9_) { + if (_tmp4_) { #line 190 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = FALSE; #line 190 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (source); #line 190 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2376 "SearchFilter.c" +#line 2634 "SearchFilter.c" } } } #line 194 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp14_ = criteria; + _tmp6_ = criteria; #line 194 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if ((SEARCH_FILTER_CRITERIA_FLAG & _tmp14_) != 0) { -#line 2384 "SearchFilter.c" - gboolean _tmp15_ = FALSE; - gboolean _tmp16_ = FALSE; - gboolean _tmp17_; - gboolean _tmp18_; + if ((SEARCH_FILTER_CRITERIA_FLAG & _tmp6_) != 0) { +#line 2642 "SearchFilter.c" + gboolean _tmp7_ = FALSE; + gboolean _tmp8_ = FALSE; + gboolean _tmp9_; + gboolean _tmp10_; #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp17_ = search_view_filter_get_flagged (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); + _tmp9_ = search_view_filter_get_flagged (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp18_ = _tmp17_; + _tmp10_ = _tmp9_; #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp18_) { -#line 2395 "SearchFilter.c" - MediaSource* _tmp19_; + if (_tmp10_) { +#line 2653 "SearchFilter.c" + MediaSource* _tmp11_; #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp19_ = source; + _tmp11_ = source; #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_FLAGGABLE); -#line 2401 "SearchFilter.c" + _tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_FLAGGABLE); +#line 2659 "SearchFilter.c" } else { #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp16_ = FALSE; -#line 2405 "SearchFilter.c" + _tmp8_ = FALSE; +#line 2663 "SearchFilter.c" } #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp16_) { -#line 2409 "SearchFilter.c" - MediaSource* _tmp20_; - gboolean _tmp21_; -#line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp20_ = source; + if (_tmp8_) { +#line 2667 "SearchFilter.c" + MediaSource* _tmp12_; #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp21_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_FLAGGABLE, Flaggable)); + _tmp12_ = source; #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp15_ = !_tmp21_; -#line 2418 "SearchFilter.c" + _tmp7_ = !flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_FLAGGABLE, Flaggable)); +#line 2673 "SearchFilter.c" } else { #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp15_ = FALSE; -#line 2422 "SearchFilter.c" + _tmp7_ = FALSE; +#line 2677 "SearchFilter.c" } #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp15_) { + if (_tmp7_) { #line 196 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = FALSE; #line 196 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (source); #line 196 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2432 "SearchFilter.c" +#line 2687 "SearchFilter.c" } } #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp23_ = criteria; -#line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if ((SEARCH_FILTER_CRITERIA_MEDIA & _tmp23_) != 0) { -#line 2439 "SearchFilter.c" - gboolean _tmp24_; + _tmp14_ = criteria; #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp24_ = search_view_filter_filter_by_media_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); + if ((SEARCH_FILTER_CRITERIA_MEDIA & _tmp14_) != 0) { #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp22_ = _tmp24_; -#line 2445 "SearchFilter.c" + _tmp13_ = search_view_filter_filter_by_media_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); +#line 2696 "SearchFilter.c" } else { #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp22_ = FALSE; -#line 2449 "SearchFilter.c" + _tmp13_ = FALSE; +#line 2700 "SearchFilter.c" } #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp22_) { -#line 2453 "SearchFilter.c" - MediaSource* _tmp25_; + if (_tmp13_) { +#line 2704 "SearchFilter.c" + MediaSource* _tmp15_; #line 201 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp25_ = source; + _tmp15_ = source; #line 201 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, TYPE_VIDEO_SOURCE)) { -#line 2459 "SearchFilter.c" - gboolean _tmp26_; - gboolean _tmp27_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_VIDEO_SOURCE)) { +#line 2710 "SearchFilter.c" + gboolean _tmp16_; + gboolean _tmp17_; #line 202 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp26_ = search_view_filter_get_show_media_video (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); + _tmp16_ = search_view_filter_get_show_media_video (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 202 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp27_ = _tmp26_; + _tmp17_ = _tmp16_; #line 202 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (!_tmp27_) { + if (!_tmp17_) { #line 203 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = FALSE; #line 203 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (source); #line 203 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2474 "SearchFilter.c" +#line 2725 "SearchFilter.c" } } else { - MediaSource* _tmp28_; + MediaSource* _tmp18_; #line 204 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp28_ = source; + _tmp18_ = source; #line 204 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, TYPE_PHOTO)) { -#line 2482 "SearchFilter.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_PHOTO)) { +#line 2733 "SearchFilter.c" Photo* photo = NULL; - MediaSource* _tmp29_; - Photo* _tmp30_; - Photo* _tmp31_; - PhotoFileFormat _tmp32_; + MediaSource* _tmp19_; + Photo* _tmp20_; + Photo* _tmp21_; #line 205 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp29_ = source; + _tmp19_ = source; #line 205 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, TYPE_PHOTO) ? ((Photo*) _tmp29_) : NULL); + _tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_PHOTO) ? ((Photo*) _tmp19_) : NULL); #line 205 "/home/jens/Source/shotwell/src/SearchFilter.vala" - photo = _tmp30_; -#line 206 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp31_ = photo; + photo = _tmp20_; #line 206 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp32_ = photo_get_master_file_format (_tmp31_); + _tmp21_ = photo; #line 206 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp32_ == PHOTO_FILE_FORMAT_RAW) { -#line 2500 "SearchFilter.c" - gboolean _tmp33_ = FALSE; - gboolean _tmp34_; - gboolean _tmp35_; + if (photo_get_master_file_format (_tmp21_) == PHOTO_FILE_FORMAT_RAW) { +#line 2748 "SearchFilter.c" + gboolean _tmp22_ = FALSE; + gboolean _tmp23_; + gboolean _tmp24_; #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp34_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); + _tmp23_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp35_ = _tmp34_; + _tmp24_ = _tmp23_; #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (!_tmp35_) { -#line 2510 "SearchFilter.c" - gboolean _tmp36_; - gboolean _tmp37_; + if (!_tmp24_) { +#line 2758 "SearchFilter.c" + gboolean _tmp25_; + gboolean _tmp26_; #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp36_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); + _tmp25_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp37_ = _tmp36_; + _tmp26_ = _tmp25_; #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp33_ = !_tmp37_; -#line 2519 "SearchFilter.c" + _tmp22_ = !_tmp26_; +#line 2767 "SearchFilter.c" } else { #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp33_ = FALSE; -#line 2523 "SearchFilter.c" + _tmp22_ = FALSE; +#line 2771 "SearchFilter.c" } #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp33_) { + if (_tmp22_) { #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = FALSE; #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -2531,17 +2779,17 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _g_object_unref0 (source); #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2535 "SearchFilter.c" +#line 2783 "SearchFilter.c" } } else { - gboolean _tmp38_; - gboolean _tmp39_; + gboolean _tmp27_; + gboolean _tmp28_; #line 209 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp38_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); + _tmp27_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 209 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp39_ = _tmp38_; + _tmp28_ = _tmp27_; #line 209 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (!_tmp39_) { + if (!_tmp28_) { #line 210 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = FALSE; #line 210 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -2550,304 +2798,291 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _g_object_unref0 (source); #line 210 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2554 "SearchFilter.c" +#line 2802 "SearchFilter.c" } } #line 204 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (photo); -#line 2559 "SearchFilter.c" +#line 2807 "SearchFilter.c" } } } #line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp41_ = criteria; + _tmp30_ = criteria; #line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if ((SEARCH_FILTER_CRITERIA_TEXT & _tmp41_) != 0) { -#line 2567 "SearchFilter.c" - gboolean _tmp42_; + if ((SEARCH_FILTER_CRITERIA_TEXT & _tmp30_) != 0) { #line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp42_ = search_view_filter_has_search_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp40_ = _tmp42_; -#line 2573 "SearchFilter.c" + _tmp29_ = search_view_filter_has_search_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); +#line 2817 "SearchFilter.c" } else { #line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp40_ = FALSE; -#line 2577 "SearchFilter.c" + _tmp29_ = FALSE; +#line 2821 "SearchFilter.c" } #line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp40_) { -#line 2581 "SearchFilter.c" + if (_tmp29_) { +#line 2825 "SearchFilter.c" const gchar* media_keywords = NULL; - MediaSource* _tmp43_; - const gchar* _tmp44_; + MediaSource* _tmp31_; + const gchar* _tmp32_; const gchar* event_keywords = NULL; Event* event = NULL; - MediaSource* _tmp45_; - Event* _tmp46_; - Event* _tmp47_; + MediaSource* _tmp33_; + Event* _tmp34_; + Event* _tmp35_; GeeList* tags = NULL; - TagSourceCollection* _tmp50_; - MediaSource* _tmp51_; - GeeList* _tmp52_; - gint _tmp53_ = 0; - GeeList* _tmp54_; + TagSourceCollection* _tmp38_; + MediaSource* _tmp39_; + GeeList* _tmp40_; + gint _tmp41_ = 0; + GeeList* _tmp42_; gint tags_size = 0; - gint _tmp58_; - gchar** _tmp59_; + gint _tmp46_; + gchar** _tmp47_; #line 216 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp43_ = source; + _tmp31_ = source; #line 216 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp44_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_INDEXABLE, Indexable)); + _tmp32_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_INDEXABLE, Indexable)); #line 216 "/home/jens/Source/shotwell/src/SearchFilter.vala" - media_keywords = _tmp44_; + media_keywords = _tmp32_; #line 218 "/home/jens/Source/shotwell/src/SearchFilter.vala" event_keywords = NULL; #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp45_ = source; + _tmp33_ = source; #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp46_ = media_source_get_event (_tmp45_); + _tmp34_ = media_source_get_event (_tmp33_); #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala" - event = _tmp46_; + event = _tmp34_; #line 220 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp47_ = event; + _tmp35_ = event; #line 220 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp47_ != NULL) { -#line 2617 "SearchFilter.c" - Event* _tmp48_; - const gchar* _tmp49_; + if (_tmp35_ != NULL) { +#line 2861 "SearchFilter.c" + Event* _tmp36_; + const gchar* _tmp37_; #line 221 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp48_ = event; + _tmp36_ = event; #line 221 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp49_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_INDEXABLE, Indexable)); + _tmp37_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_INDEXABLE, Indexable)); #line 221 "/home/jens/Source/shotwell/src/SearchFilter.vala" - event_keywords = _tmp49_; -#line 2626 "SearchFilter.c" + event_keywords = _tmp37_; +#line 2870 "SearchFilter.c" } #line 223 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp50_ = tag_global; + _tmp38_ = tag_global; #line 223 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp51_ = source; + _tmp39_ = source; #line 223 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp52_ = tag_source_collection_fetch_for_source (_tmp50_, _tmp51_); + _tmp40_ = tag_source_collection_fetch_for_source (_tmp38_, _tmp39_); #line 223 "/home/jens/Source/shotwell/src/SearchFilter.vala" - tags = _tmp52_; + tags = _tmp40_; #line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp54_ = tags; + _tmp42_ = tags; #line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp54_ != NULL) { -#line 2640 "SearchFilter.c" - GeeList* _tmp55_; - gint _tmp56_; - gint _tmp57_; + if (_tmp42_ != NULL) { +#line 2884 "SearchFilter.c" + GeeList* _tmp43_; + gint _tmp44_; + gint _tmp45_; #line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp55_ = tags; + _tmp43_ = tags; #line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp56_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp44_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection)); #line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp57_ = _tmp56_; + _tmp45_ = _tmp44_; #line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp53_ = _tmp57_; -#line 2652 "SearchFilter.c" + _tmp41_ = _tmp45_; +#line 2896 "SearchFilter.c" } else { #line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp53_ = 0; -#line 2656 "SearchFilter.c" + _tmp41_ = 0; +#line 2900 "SearchFilter.c" } #line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala" - tags_size = _tmp53_; + tags_size = _tmp41_; #line 226 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp59_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp58_); -#line 2662 "SearchFilter.c" + _tmp47_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp46_); +#line 2906 "SearchFilter.c" { gchar** word_collection = NULL; gint word_collection_length1 = 0; gint _word_collection_size_ = 0; gint word_it = 0; #line 226 "/home/jens/Source/shotwell/src/SearchFilter.vala" - word_collection = _tmp59_; + word_collection = _tmp47_; #line 226 "/home/jens/Source/shotwell/src/SearchFilter.vala" - word_collection_length1 = _tmp58_; + word_collection_length1 = _tmp46_; #line 226 "/home/jens/Source/shotwell/src/SearchFilter.vala" - for (word_it = 0; word_it < _tmp58_; word_it = word_it + 1) { -#line 2674 "SearchFilter.c" + for (word_it = 0; word_it < _tmp46_; word_it = word_it + 1) { +#line 2918 "SearchFilter.c" const gchar* word = NULL; #line 226 "/home/jens/Source/shotwell/src/SearchFilter.vala" word = word_collection[word_it]; -#line 2678 "SearchFilter.c" +#line 2922 "SearchFilter.c" { - gboolean _tmp60_ = FALSE; - const gchar* _tmp61_; - gboolean _tmp65_ = FALSE; - const gchar* _tmp66_; - gint _tmp70_; + gboolean _tmp48_ = FALSE; + const gchar* _tmp49_; + gboolean _tmp52_ = FALSE; + const gchar* _tmp53_; + gint _tmp56_; #line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp61_ = media_keywords; + _tmp49_ = media_keywords; #line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp61_ != NULL) { -#line 2689 "SearchFilter.c" - const gchar* _tmp62_; - const gchar* _tmp63_; - gboolean _tmp64_; + if (_tmp49_ != NULL) { +#line 2933 "SearchFilter.c" + const gchar* _tmp50_; + const gchar* _tmp51_; #line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp62_ = media_keywords; + _tmp50_ = media_keywords; #line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp63_ = word; + _tmp51_ = word; #line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp64_ = string_contains (_tmp62_, _tmp63_); -#line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp60_ = _tmp64_; -#line 2701 "SearchFilter.c" + _tmp48_ = string_contains (_tmp50_, _tmp51_); +#line 2942 "SearchFilter.c" } else { #line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp60_ = FALSE; -#line 2705 "SearchFilter.c" + _tmp48_ = FALSE; +#line 2946 "SearchFilter.c" } #line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp60_) { + if (_tmp48_) { #line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala" continue; -#line 2711 "SearchFilter.c" +#line 2952 "SearchFilter.c" } #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp66_ = event_keywords; -#line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp66_ != NULL) { -#line 2717 "SearchFilter.c" - const gchar* _tmp67_; - const gchar* _tmp68_; - gboolean _tmp69_; + _tmp53_ = event_keywords; #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp67_ = event_keywords; + if (_tmp53_ != NULL) { +#line 2958 "SearchFilter.c" + const gchar* _tmp54_; + const gchar* _tmp55_; #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp68_ = word; + _tmp54_ = event_keywords; #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp69_ = string_contains (_tmp67_, _tmp68_); + _tmp55_ = word; #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp65_ = _tmp69_; -#line 2729 "SearchFilter.c" + _tmp52_ = string_contains (_tmp54_, _tmp55_); +#line 2967 "SearchFilter.c" } else { #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp65_ = FALSE; -#line 2733 "SearchFilter.c" + _tmp52_ = FALSE; +#line 2971 "SearchFilter.c" } #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp65_) { + if (_tmp52_) { #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala" continue; -#line 2739 "SearchFilter.c" +#line 2977 "SearchFilter.c" } #line 233 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp70_ = tags_size; + _tmp56_ = tags_size; #line 233 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp70_ > 0) { -#line 2745 "SearchFilter.c" + if (_tmp56_ > 0) { +#line 2983 "SearchFilter.c" gboolean found = FALSE; - gboolean _tmp86_; + gboolean _tmp71_; #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala" found = FALSE; -#line 2750 "SearchFilter.c" +#line 2988 "SearchFilter.c" { gint ctr = 0; #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala" ctr = 0; -#line 2755 "SearchFilter.c" +#line 2993 "SearchFilter.c" { - gboolean _tmp71_ = FALSE; + gboolean _tmp57_ = FALSE; #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp71_ = TRUE; + _tmp57_ = TRUE; #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala" while (TRUE) { -#line 2762 "SearchFilter.c" - gint _tmp73_; - gint _tmp74_; +#line 3000 "SearchFilter.c" + gint _tmp59_; + gint _tmp60_; const gchar* tag_keywords = NULL; - GeeList* _tmp75_; - gint _tmp76_; - gpointer _tmp77_; - Tag* _tmp78_; - const gchar* _tmp79_; - const gchar* _tmp80_; - gboolean _tmp81_ = FALSE; - const gchar* _tmp82_; + GeeList* _tmp61_; + gint _tmp62_; + gpointer _tmp63_; + Tag* _tmp64_; + const gchar* _tmp65_; + const gchar* _tmp66_; + gboolean _tmp67_ = FALSE; + const gchar* _tmp68_; #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (!_tmp71_) { -#line 2776 "SearchFilter.c" - gint _tmp72_; + if (!_tmp57_) { +#line 3014 "SearchFilter.c" + gint _tmp58_; #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp72_ = ctr; + _tmp58_ = ctr; #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala" - ctr = _tmp72_ + 1; -#line 2782 "SearchFilter.c" + ctr = _tmp58_ + 1; +#line 3020 "SearchFilter.c" } #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp71_ = FALSE; + _tmp57_ = FALSE; #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp73_ = ctr; + _tmp59_ = ctr; #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp74_ = tags_size; + _tmp60_ = tags_size; #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (!(_tmp73_ < _tmp74_)) { + if (!(_tmp59_ < _tmp60_)) { #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 2794 "SearchFilter.c" +#line 3032 "SearchFilter.c" } #line 236 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp75_ = tags; + _tmp61_ = tags; #line 236 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp76_ = ctr; + _tmp62_ = ctr; #line 236 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp77_ = gee_list_get (_tmp75_, _tmp76_); + _tmp63_ = gee_list_get (_tmp61_, _tmp62_); #line 236 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp78_ = (Tag*) _tmp77_; + _tmp64_ = (Tag*) _tmp63_; #line 236 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp79_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_INDEXABLE, Indexable)); + _tmp65_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_INDEXABLE, Indexable)); #line 236 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp80_ = _tmp79_; + _tmp66_ = _tmp65_; #line 236 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_object_unref0 (_tmp78_); + _g_object_unref0 (_tmp64_); #line 236 "/home/jens/Source/shotwell/src/SearchFilter.vala" - tag_keywords = _tmp80_; -#line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp82_ = tag_keywords; + tag_keywords = _tmp66_; #line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp82_ != NULL) { -#line 2816 "SearchFilter.c" - const gchar* _tmp83_; - const gchar* _tmp84_; - gboolean _tmp85_; + _tmp68_ = tag_keywords; #line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp83_ = tag_keywords; + if (_tmp68_ != NULL) { +#line 3054 "SearchFilter.c" + const gchar* _tmp69_; + const gchar* _tmp70_; #line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp84_ = word; + _tmp69_ = tag_keywords; #line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp85_ = string_contains (_tmp83_, _tmp84_); + _tmp70_ = word; #line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp81_ = _tmp85_; -#line 2828 "SearchFilter.c" + _tmp67_ = string_contains (_tmp69_, _tmp70_); +#line 3063 "SearchFilter.c" } else { #line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp81_ = FALSE; -#line 2832 "SearchFilter.c" + _tmp67_ = FALSE; +#line 3067 "SearchFilter.c" } #line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp81_) { + if (_tmp67_) { #line 238 "/home/jens/Source/shotwell/src/SearchFilter.vala" found = TRUE; #line 240 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 2840 "SearchFilter.c" +#line 3075 "SearchFilter.c" } } } } #line 244 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp86_ = found; + _tmp71_ = found; #line 244 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp86_) { + if (_tmp71_) { #line 245 "/home/jens/Source/shotwell/src/SearchFilter.vala" continue; -#line 2851 "SearchFilter.c" +#line 3086 "SearchFilter.c" } } #line 250 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -2860,7 +3095,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _g_object_unref0 (source); #line 250 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2864 "SearchFilter.c" +#line 3099 "SearchFilter.c" } } } @@ -2868,46 +3103,39 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _g_object_unref0 (tags); #line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (event); -#line 2872 "SearchFilter.c" +#line 3107 "SearchFilter.c" } #line 255 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp88_ = criteria; + _tmp73_ = criteria; #line 255 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if ((SEARCH_FILTER_CRITERIA_SAVEDSEARCH & _tmp88_) != 0) { -#line 2878 "SearchFilter.c" - gboolean _tmp89_; + if ((SEARCH_FILTER_CRITERIA_SAVEDSEARCH & _tmp73_) != 0) { #line 255 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp89_ = search_view_filter_has_saved_search (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 255 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp87_ = _tmp89_; -#line 2884 "SearchFilter.c" + _tmp72_ = search_view_filter_has_saved_search (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); +#line 3115 "SearchFilter.c" } else { #line 255 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp87_ = FALSE; -#line 2888 "SearchFilter.c" + _tmp72_ = FALSE; +#line 3119 "SearchFilter.c" } #line 255 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp87_) { -#line 2892 "SearchFilter.c" - SavedSearch* _tmp90_; - SavedSearch* _tmp91_; - MediaSource* _tmp92_; - gboolean _tmp93_; + if (_tmp72_) { +#line 3123 "SearchFilter.c" + SavedSearch* _tmp74_; + SavedSearch* _tmp75_; + MediaSource* _tmp76_; #line 256 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp90_ = search_view_filter_get_saved_search (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); + _tmp74_ = search_view_filter_get_saved_search (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 256 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp91_ = _tmp90_; + _tmp75_ = _tmp74_; #line 256 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp92_ = source; + _tmp76_ = source; #line 256 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp93_ = saved_search_predicate (_tmp91_, _tmp92_); -#line 256 "/home/jens/Source/shotwell/src/SearchFilter.vala" - result = _tmp93_; + result = saved_search_predicate (_tmp75_, _tmp76_); #line 256 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (source); #line 256 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2911 "SearchFilter.c" +#line 3139 "SearchFilter.c" } #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = TRUE; @@ -2915,34 +3143,42 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _g_object_unref0 (source); #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2919 "SearchFilter.c" +#line 3147 "SearchFilter.c" } -DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type) { +DefaultSearchViewFilter* +default_search_view_filter_construct (GType object_type) +{ DefaultSearchViewFilter* self = NULL; #line 180 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = (DefaultSearchViewFilter*) search_view_filter_construct (object_type); #line 180 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 2929 "SearchFilter.c" +#line 3159 "SearchFilter.c" } -static void default_search_view_filter_class_init (DefaultSearchViewFilterClass * klass) { +static void +default_search_view_filter_class_init (DefaultSearchViewFilterClass * klass) +{ #line 180 "/home/jens/Source/shotwell/src/SearchFilter.vala" default_search_view_filter_parent_class = g_type_class_peek_parent (klass); #line 180 "/home/jens/Source/shotwell/src/SearchFilter.vala" ((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) default_search_view_filter_real_predicate; -#line 2938 "SearchFilter.c" +#line 3170 "SearchFilter.c" } -static void default_search_view_filter_instance_init (DefaultSearchViewFilter * self) { +static void +default_search_view_filter_instance_init (DefaultSearchViewFilter * self) +{ } -GType default_search_view_filter_get_type (void) { +GType +default_search_view_filter_get_type (void) +{ static volatile gsize default_search_view_filter_type_id__volatile = 0; if (g_once_init_enter (&default_search_view_filter_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DefaultSearchViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) default_search_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DefaultSearchViewFilter), 0, (GInstanceInitFunc) default_search_view_filter_instance_init, NULL }; @@ -2954,7 +3190,10 @@ GType default_search_view_filter_get_type (void) { } -static gboolean disabled_view_filter_real_predicate (ViewFilter* base, DataView* view) { +static gboolean +disabled_view_filter_real_predicate (ViewFilter* base, + DataView* view) +{ DisabledViewFilter * self; gboolean result = FALSE; #line 264 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -2965,11 +3204,13 @@ static gboolean disabled_view_filter_real_predicate (ViewFilter* base, DataView* result = TRUE; #line 265 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2969 "SearchFilter.c" +#line 3208 "SearchFilter.c" } -static guint disabled_view_filter_real_get_criteria (SearchViewFilter* base) { +static guint +disabled_view_filter_real_get_criteria (SearchViewFilter* base) +{ DisabledViewFilter * self; guint result = 0U; #line 268 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -2978,43 +3219,53 @@ static guint disabled_view_filter_real_get_criteria (SearchViewFilter* base) { result = (guint) SEARCH_FILTER_CRITERIA_RATING; #line 269 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2982 "SearchFilter.c" +#line 3223 "SearchFilter.c" } -DisabledViewFilter* disabled_view_filter_construct (GType object_type) { +DisabledViewFilter* +disabled_view_filter_construct (GType object_type) +{ DisabledViewFilter* self = NULL; #line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = (DisabledViewFilter*) search_view_filter_construct (object_type); #line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 2992 "SearchFilter.c" +#line 3235 "SearchFilter.c" } -DisabledViewFilter* disabled_view_filter_new (void) { +DisabledViewFilter* +disabled_view_filter_new (void) +{ #line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala" return disabled_view_filter_construct (TYPE_DISABLED_VIEW_FILTER); -#line 2999 "SearchFilter.c" +#line 3244 "SearchFilter.c" } -static void disabled_view_filter_class_init (DisabledViewFilterClass * klass) { +static void +disabled_view_filter_class_init (DisabledViewFilterClass * klass) +{ #line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala" disabled_view_filter_parent_class = g_type_class_peek_parent (klass); #line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala" ((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) disabled_view_filter_real_predicate; #line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala" ((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) disabled_view_filter_real_get_criteria; -#line 3010 "SearchFilter.c" +#line 3257 "SearchFilter.c" } -static void disabled_view_filter_instance_init (DisabledViewFilter * self) { +static void +disabled_view_filter_instance_init (DisabledViewFilter * self) +{ } -GType disabled_view_filter_get_type (void) { +GType +disabled_view_filter_get_type (void) +{ static volatile gsize disabled_view_filter_type_id__volatile = 0; if (g_once_init_enter (&disabled_view_filter_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DisabledViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) disabled_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DisabledViewFilter), 0, (GInstanceInitFunc) disabled_view_filter_instance_init, NULL }; @@ -3026,75 +3277,75 @@ GType disabled_view_filter_get_type (void) { } -TextAction* text_action_construct (GType object_type, const gchar* init) { +TextAction* +text_action_construct (GType object_type, + const gchar* init) +{ TextAction* self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; #line 290 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = (TextAction*) g_type_create_instance (object_type); #line 291 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = init; -#line 291 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (init); #line 291 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_free0 (self->priv->text); #line 291 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->text = _tmp1_; + self->priv->text = _tmp0_; #line 290 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 3046 "SearchFilter.c" +#line 3297 "SearchFilter.c" } -TextAction* text_action_new (const gchar* init) { +TextAction* +text_action_new (const gchar* init) +{ #line 290 "/home/jens/Source/shotwell/src/SearchFilter.vala" return text_action_construct (TYPE_TEXT_ACTION, init); -#line 3053 "SearchFilter.c" +#line 3306 "SearchFilter.c" } -void text_action_set_text (TextAction* self, const gchar* text) { +void +text_action_set_text (TextAction* self, + const gchar* text) +{ const gchar* _tmp0_; - const gchar* _tmp1_; #line 294 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_TEXT_ACTION (self)); #line 295 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->text; #line 295 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = text; -#line 295 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (g_strcmp0 (_tmp0_, _tmp1_) != 0) { -#line 3068 "SearchFilter.c" - const gchar* _tmp2_; - gchar* _tmp3_; - const gchar* _tmp4_; -#line 296 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = text; + if (g_strcmp0 (_tmp0_, text) != 0) { +#line 3321 "SearchFilter.c" + gchar* _tmp1_; #line 296 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (text); #line 296 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_free0 (self->priv->text); #line 296 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->text = _tmp3_; + self->priv->text = _tmp1_; #line 297 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = text; -#line 297 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_emit (self, text_action_signals[TEXT_ACTION_TEXT_CHANGED_SIGNAL], 0, _tmp4_); -#line 3084 "SearchFilter.c" + g_signal_emit (self, text_action_signals[TEXT_ACTION_TEXT_CHANGED_SIGNAL], 0, text); +#line 3331 "SearchFilter.c" } } -void text_action_clear (TextAction* self) { +void +text_action_clear (TextAction* self) +{ #line 301 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_TEXT_ACTION (self)); #line 302 "/home/jens/Source/shotwell/src/SearchFilter.vala" text_action_set_text (self, NULL); -#line 3094 "SearchFilter.c" +#line 3343 "SearchFilter.c" } -gboolean text_action_is_sensitive (TextAction* self) { +gboolean +text_action_is_sensitive (TextAction* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 305 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -3105,38 +3356,33 @@ gboolean text_action_is_sensitive (TextAction* self) { result = _tmp0_; #line 306 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 3109 "SearchFilter.c" +#line 3360 "SearchFilter.c" } -void text_action_set_sensitive (TextAction* self, gboolean sensitive) { +void +text_action_set_sensitive (TextAction* self, + gboolean sensitive) +{ gboolean _tmp0_; - gboolean _tmp1_; #line 309 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_TEXT_ACTION (self)); #line 310 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->sensitive; #line 310 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = sensitive; -#line 310 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp0_ != _tmp1_) { -#line 3124 "SearchFilter.c" - gboolean _tmp2_; - gboolean _tmp3_; + if (_tmp0_ != sensitive) { #line 311 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = sensitive; -#line 311 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->sensitive = _tmp2_; -#line 312 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = sensitive; + self->priv->sensitive = sensitive; #line 312 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_emit (self, text_action_signals[TEXT_ACTION_SENSITIVITY_CHANGED_SIGNAL], 0, _tmp3_); -#line 3135 "SearchFilter.c" + g_signal_emit (self, text_action_signals[TEXT_ACTION_SENSITIVITY_CHANGED_SIGNAL], 0, sensitive); +#line 3379 "SearchFilter.c" } } -gboolean text_action_is_visible (TextAction* self) { +gboolean +text_action_is_visible (TextAction* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 316 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -3147,38 +3393,33 @@ gboolean text_action_is_visible (TextAction* self) { result = _tmp0_; #line 317 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 3151 "SearchFilter.c" +#line 3397 "SearchFilter.c" } -void text_action_set_visible (TextAction* self, gboolean visible) { +void +text_action_set_visible (TextAction* self, + gboolean visible) +{ gboolean _tmp0_; - gboolean _tmp1_; #line 320 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_TEXT_ACTION (self)); #line 321 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->visible; #line 321 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = visible; -#line 321 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp0_ != _tmp1_) { -#line 3166 "SearchFilter.c" - gboolean _tmp2_; - gboolean _tmp3_; + if (_tmp0_ != visible) { #line 322 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = visible; -#line 322 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->visible = _tmp2_; -#line 323 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = visible; + self->priv->visible = visible; #line 323 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_emit (self, text_action_signals[TEXT_ACTION_VISIBILITY_CHANGED_SIGNAL], 0, _tmp3_); -#line 3177 "SearchFilter.c" + g_signal_emit (self, text_action_signals[TEXT_ACTION_VISIBILITY_CHANGED_SIGNAL], 0, visible); +#line 3416 "SearchFilter.c" } } -const gchar* text_action_get_value (TextAction* self) { +const gchar* +text_action_get_value (TextAction* self) +{ const gchar* result; const gchar* _tmp0_; #line 275 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -3189,108 +3430,133 @@ const gchar* text_action_get_value (TextAction* self) { result = _tmp0_; #line 276 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 3193 "SearchFilter.c" +#line 3434 "SearchFilter.c" } -static void value_text_action_init (GValue* value) { +static void +value_text_action_init (GValue* value) +{ #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 3200 "SearchFilter.c" +#line 3443 "SearchFilter.c" } -static void value_text_action_free_value (GValue* value) { +static void +value_text_action_free_value (GValue* value) +{ #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (value->data[0].v_pointer) { #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" text_action_unref (value->data[0].v_pointer); -#line 3209 "SearchFilter.c" +#line 3454 "SearchFilter.c" } } -static void value_text_action_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_text_action_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (src_value->data[0].v_pointer) { #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" dest_value->data[0].v_pointer = text_action_ref (src_value->data[0].v_pointer); -#line 3219 "SearchFilter.c" +#line 3467 "SearchFilter.c" } else { #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" dest_value->data[0].v_pointer = NULL; -#line 3223 "SearchFilter.c" +#line 3471 "SearchFilter.c" } } -static gpointer value_text_action_peek_pointer (const GValue* value) { +static gpointer +value_text_action_peek_pointer (const GValue* value) +{ #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" return value->data[0].v_pointer; -#line 3231 "SearchFilter.c" +#line 3481 "SearchFilter.c" } -static gchar* value_text_action_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_text_action_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (collect_values[0].v_pointer) { -#line 3238 "SearchFilter.c" +#line 3493 "SearchFilter.c" TextAction * object; object = collect_values[0].v_pointer; #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (object->parent_instance.g_class == NULL) { #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3245 "SearchFilter.c" +#line 3500 "SearchFilter.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3249 "SearchFilter.c" +#line 3504 "SearchFilter.c" } #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = text_action_ref (object); -#line 3253 "SearchFilter.c" +#line 3508 "SearchFilter.c" } else { #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 3257 "SearchFilter.c" +#line 3512 "SearchFilter.c" } #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" return NULL; -#line 3261 "SearchFilter.c" +#line 3516 "SearchFilter.c" } -static gchar* value_text_action_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_text_action_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ TextAction ** object_p; object_p = collect_values[0].v_pointer; #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (!object_p) { #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3272 "SearchFilter.c" +#line 3532 "SearchFilter.c" } #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (!value->data[0].v_pointer) { #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" *object_p = NULL; -#line 3278 "SearchFilter.c" +#line 3538 "SearchFilter.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" *object_p = value->data[0].v_pointer; -#line 3282 "SearchFilter.c" +#line 3542 "SearchFilter.c" } else { #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" *object_p = text_action_ref (value->data[0].v_pointer); -#line 3286 "SearchFilter.c" +#line 3546 "SearchFilter.c" } #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" return NULL; -#line 3290 "SearchFilter.c" +#line 3550 "SearchFilter.c" } -GParamSpec* param_spec_text_action (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_text_action (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecTextAction* spec; #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_TEXT_ACTION), NULL); @@ -3300,20 +3566,25 @@ GParamSpec* param_spec_text_action (const gchar* name, const gchar* nick, const G_PARAM_SPEC (spec)->value_type = object_type; #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" return G_PARAM_SPEC (spec); -#line 3304 "SearchFilter.c" +#line 3570 "SearchFilter.c" } -gpointer value_get_text_action (const GValue* value) { +gpointer +value_get_text_action (const GValue* value) +{ #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ACTION), NULL); #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" return value->data[0].v_pointer; -#line 3313 "SearchFilter.c" +#line 3581 "SearchFilter.c" } -void value_set_text_action (GValue* value, gpointer v_object) { +void +value_set_text_action (GValue* value, + gpointer v_object) +{ TextAction * old; #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ACTION)); @@ -3329,22 +3600,25 @@ void value_set_text_action (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" text_action_ref (value->data[0].v_pointer); -#line 3333 "SearchFilter.c" +#line 3604 "SearchFilter.c" } else { #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 3337 "SearchFilter.c" +#line 3608 "SearchFilter.c" } #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (old) { #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" text_action_unref (old); -#line 3343 "SearchFilter.c" +#line 3614 "SearchFilter.c" } } -void value_take_text_action (GValue* value, gpointer v_object) { +void +value_take_text_action (GValue* value, + gpointer v_object) +{ TextAction * old; #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ACTION)); @@ -3358,22 +3632,24 @@ void value_take_text_action (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = v_object; -#line 3362 "SearchFilter.c" +#line 3636 "SearchFilter.c" } else { #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 3366 "SearchFilter.c" +#line 3640 "SearchFilter.c" } #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (old) { #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" text_action_unref (old); -#line 3372 "SearchFilter.c" +#line 3646 "SearchFilter.c" } } -static void text_action_class_init (TextActionClass * klass) { +static void +text_action_class_init (TextActionClass * klass) +{ #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" text_action_parent_class = g_type_class_peek_parent (klass); #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -3386,11 +3662,13 @@ static void text_action_class_init (TextActionClass * klass) { text_action_signals[TEXT_ACTION_SENSITIVITY_CHANGED_SIGNAL] = g_signal_new ("sensitivity-changed", TYPE_TEXT_ACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" text_action_signals[TEXT_ACTION_VISIBILITY_CHANGED_SIGNAL] = g_signal_new ("visibility-changed", TYPE_TEXT_ACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); -#line 3390 "SearchFilter.c" +#line 3666 "SearchFilter.c" } -static void text_action_instance_init (TextAction * self) { +static void +text_action_instance_init (TextAction * self) +{ #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv = TEXT_ACTION_GET_PRIVATE (self); #line 280 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -3401,11 +3679,13 @@ static void text_action_instance_init (TextAction * self) { self->priv->visible = TRUE; #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->ref_count = 1; -#line 3405 "SearchFilter.c" +#line 3683 "SearchFilter.c" } -static void text_action_finalize (TextAction * obj) { +static void +text_action_finalize (TextAction * obj) +{ TextAction * self; #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEXT_ACTION, TextAction); @@ -3413,11 +3693,13 @@ static void text_action_finalize (TextAction * obj) { g_signal_handlers_destroy (self); #line 280 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_free0 (self->priv->text); -#line 3417 "SearchFilter.c" +#line 3697 "SearchFilter.c" } -GType text_action_get_type (void) { +GType +text_action_get_type (void) +{ static volatile gsize text_action_type_id__volatile = 0; if (g_once_init_enter (&text_action_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_text_action_init, value_text_action_free_value, value_text_action_copy_value, value_text_action_peek_pointer, "p", value_text_action_collect_value, "p", value_text_action_lcopy_value }; @@ -3431,18 +3713,22 @@ GType text_action_get_type (void) { } -gpointer text_action_ref (gpointer instance) { +gpointer +text_action_ref (gpointer instance) +{ TextAction * self; self = instance; #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_atomic_int_inc (&self->ref_count); #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" return instance; -#line 3442 "SearchFilter.c" +#line 3726 "SearchFilter.c" } -void text_action_unref (gpointer instance) { +void +text_action_unref (gpointer instance) +{ TextAction * self; self = instance; #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -3451,68 +3737,102 @@ void text_action_unref (gpointer instance) { TEXT_ACTION_GET_CLASS (self)->finalize (self); #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3455 "SearchFilter.c" +#line 3741 "SearchFilter.c" } } -static void _search_filter_actions_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_search_filter_actions_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_on_action_radio ((SearchFilterActions*) self, action, parameter); -#line 3463 "SearchFilter.c" +#line 3753 "SearchFilter.c" } -static void _search_filter_actions_on_rating_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_search_filter_actions_on_rating_changed_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_on_rating_changed ((SearchFilterActions*) self, action, value); -#line 3470 "SearchFilter.c" +#line 3764 "SearchFilter.c" } -static void _search_filter_actions_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_search_filter_actions_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_on_action_toggle ((SearchFilterActions*) self, action, parameter); -#line 3477 "SearchFilter.c" +#line 3775 "SearchFilter.c" } -static void _search_filter_actions_on_flagged_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_search_filter_actions_on_flagged_toggled_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_on_flagged_toggled ((SearchFilterActions*) self, action, value); -#line 3484 "SearchFilter.c" +#line 3786 "SearchFilter.c" } -static void _search_filter_actions_on_photos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_search_filter_actions_on_photos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_on_photos_toggled ((SearchFilterActions*) self, action, value); -#line 3491 "SearchFilter.c" +#line 3797 "SearchFilter.c" } -static void _search_filter_actions_on_videos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_search_filter_actions_on_videos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_on_videos_toggled ((SearchFilterActions*) self, action, value); -#line 3498 "SearchFilter.c" +#line 3808 "SearchFilter.c" } -static void _search_filter_actions_on_raw_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_search_filter_actions_on_raw_toggled_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_on_raw_toggled ((SearchFilterActions*) self, action, value); -#line 3505 "SearchFilter.c" +#line 3819 "SearchFilter.c" } -static void _search_filter_actions_on_text_changed_text_action_text_changed (TextAction* _sender, const gchar* text, gpointer self) { +static void +_search_filter_actions_on_text_changed_text_action_text_changed (TextAction* _sender, + const gchar* text, + gpointer self) +{ #line 406 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_on_text_changed ((SearchFilterActions*) self, _sender, text); -#line 3512 "SearchFilter.c" +#line 3830 "SearchFilter.c" } -SearchFilterActions* search_filter_actions_construct (GType object_type) { +SearchFilterActions* +search_filter_actions_construct (GType object_type) +{ SearchFilterActions* self = NULL; TextAction* _tmp0_; TextAction* _tmp1_; @@ -3528,18 +3848,22 @@ SearchFilterActions* search_filter_actions_construct (GType object_type) { g_signal_connect (_tmp1_, "text-changed", (GCallback) _search_filter_actions_on_text_changed_text_action_text_changed, self); #line 402 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 3532 "SearchFilter.c" +#line 3852 "SearchFilter.c" } -SearchFilterActions* search_filter_actions_new (void) { +SearchFilterActions* +search_filter_actions_new (void) +{ #line 402 "/home/jens/Source/shotwell/src/SearchFilter.vala" return search_filter_actions_construct (TYPE_SEARCH_FILTER_ACTIONS); -#line 3539 "SearchFilter.c" +#line 3861 "SearchFilter.c" } -SearchFilterCriteria search_filter_actions_get_criteria (SearchFilterActions* self) { +SearchFilterCriteria +search_filter_actions_get_criteria (SearchFilterActions* self) +{ SearchFilterCriteria result = 0; SearchFilterCriteria _tmp0_; #line 409 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -3550,11 +3874,14 @@ SearchFilterCriteria search_filter_actions_get_criteria (SearchFilterActions* se result = _tmp0_; #line 410 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 3554 "SearchFilter.c" +#line 3878 "SearchFilter.c" } -GActionEntry* search_filter_actions_get_actions (SearchFilterActions* self, int* result_length1) { +GActionEntry* +search_filter_actions_get_actions (SearchFilterActions* self, + int* result_length1) +{ GActionEntry* result = NULL; GActionEntry* _tmp0_; gint _tmp0__length1; @@ -3568,17 +3895,20 @@ GActionEntry* search_filter_actions_get_actions (SearchFilterActions* self, int* if (result_length1) { #line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala" *result_length1 = _tmp0__length1; -#line 3572 "SearchFilter.c" +#line 3899 "SearchFilter.c" } #line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = _tmp0_; #line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 3578 "SearchFilter.c" +#line 3905 "SearchFilter.c" } -GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, const gchar* name) { +GSimpleAction* +search_filter_actions_get_action (SearchFilterActions* self, + const gchar* name) +{ GSimpleAction* result = NULL; LibraryWindow* lw = NULL; AppWindow* _tmp0_; @@ -3596,7 +3926,7 @@ GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, cons if (_tmp1_ == NULL) { #line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (_tmp0_); -#line 3600 "SearchFilter.c" +#line 3930 "SearchFilter.c" } #line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala" lw = _tmp1_; @@ -3604,23 +3934,20 @@ GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, cons _tmp2_ = lw; #line 419 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp2_ != NULL) { -#line 3608 "SearchFilter.c" +#line 3938 "SearchFilter.c" LibraryWindow* _tmp3_; - const gchar* _tmp4_; - GAction* _tmp5_; + GAction* _tmp4_; #line 420 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = lw; #line 420 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = name; -#line 420 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_action_map_get_type (), GActionMap), _tmp4_); + _tmp4_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_action_map_get_type (), GActionMap), name); #line 420 "/home/jens/Source/shotwell/src/SearchFilter.vala" - result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp5_) : NULL; + result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp4_) : NULL; #line 420 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (lw); #line 420 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 3624 "SearchFilter.c" +#line 3951 "SearchFilter.c" } #line 423 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = NULL; @@ -3628,85 +3955,95 @@ GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, cons _g_object_unref0 (lw); #line 423 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 3632 "SearchFilter.c" +#line 3959 "SearchFilter.c" } -void search_filter_actions_set_action_sensitive (SearchFilterActions* self, const gchar* name, gboolean sensitive) { +void +search_filter_actions_set_action_sensitive (SearchFilterActions* self, + const gchar* name, + gboolean sensitive) +{ GSimpleAction* action = NULL; - const gchar* _tmp0_; + GSimpleAction* _tmp0_; GSimpleAction* _tmp1_; GSimpleAction* _tmp2_; - GSimpleAction* _tmp3_; #line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self)); #line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (name != NULL); #line 428 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = name; + _tmp0_ = search_filter_actions_get_action (self, name); #line 428 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = search_filter_actions_get_action (self, _tmp0_); -#line 428 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 428 "/home/jens/Source/shotwell/src/SearchFilter.vala" - action = _tmp2_; + action = _tmp1_; #line 429 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = action; + _tmp2_ = action; #line 429 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp3_ != NULL) { -#line 3658 "SearchFilter.c" - GSimpleAction* _tmp4_; - gboolean _tmp5_; -#line 430 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = action; + if (_tmp2_ != NULL) { +#line 3986 "SearchFilter.c" + GSimpleAction* _tmp3_; #line 430 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = sensitive; + _tmp3_ = action; #line 430 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_simple_action_set_enabled (_tmp4_, _tmp5_); -#line 3667 "SearchFilter.c" + g_simple_action_set_enabled (_tmp3_, sensitive); +#line 3992 "SearchFilter.c" } #line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (action); -#line 3671 "SearchFilter.c" +#line 3996 "SearchFilter.c" } -static GVariant* _variant_new32 (gboolean value) { +static GVariant* +_variant_new32 (gboolean value) +{ #line 435 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 3678 "SearchFilter.c" +#line 4005 "SearchFilter.c" } -static GVariant* _variant_new33 (gboolean value) { +static GVariant* +_variant_new33 (gboolean value) +{ #line 436 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 3685 "SearchFilter.c" +#line 4014 "SearchFilter.c" } -static GVariant* _variant_new34 (gboolean value) { +static GVariant* +_variant_new34 (gboolean value) +{ #line 437 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 3692 "SearchFilter.c" +#line 4023 "SearchFilter.c" } -static GVariant* _variant_new35 (gboolean value) { +static GVariant* +_variant_new35 (gboolean value) +{ #line 438 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 3699 "SearchFilter.c" +#line 4032 "SearchFilter.c" } -static GVariant* _variant_new36 (gchar* value) { +static GVariant* +_variant_new36 (gchar* value) +{ #line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 3706 "SearchFilter.c" +#line 4041 "SearchFilter.c" } -void search_filter_actions_reset (SearchFilterActions* self) { +void +search_filter_actions_reset (SearchFilterActions* self) +{ GSimpleAction* _tmp0_; GSimpleAction* _tmp1_; GVariant* _tmp2_; @@ -3796,49 +4133,57 @@ void search_filter_actions_reset (SearchFilterActions* self) { text_action_set_text (_tmp19_, NULL); #line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_variant_unref0 (v); -#line 3800 "SearchFilter.c" +#line 4137 "SearchFilter.c" } -void search_filter_actions_set_sensitive_for_search_criteria (SearchFilterActions* self, SearchFilterCriteria criteria) { - SearchFilterCriteria _tmp0_; +void +search_filter_actions_set_sensitive_for_search_criteria (SearchFilterActions* self, + SearchFilterCriteria criteria) +{ #line 445 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self)); #line 446 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = criteria; -#line 446 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->criteria = _tmp0_; + self->priv->criteria = criteria; #line 447 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_update_sensitivities (self); #line 450 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_CRITERIA_CHANGED_SIGNAL], 0); -#line 3816 "SearchFilter.c" +#line 4153 "SearchFilter.c" } -static void _search_filter_actions_on_media_tracker_updated_core_tracker_updated (CoreTracker* _sender, gpointer self) { +static void +_search_filter_actions_on_media_tracker_updated_core_tracker_updated (CoreTracker* _sender, + gpointer self) +{ #line 458 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_on_media_tracker_updated ((SearchFilterActions*) self, _sender); -#line 3823 "SearchFilter.c" +#line 4163 "SearchFilter.c" } -static void _search_filter_actions_on_camera_tracker_updated_core_tracker_updated (CoreTracker* _sender, gpointer self) { +static void +_search_filter_actions_on_camera_tracker_updated_core_tracker_updated (CoreTracker* _sender, + gpointer self) +{ #line 460 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_on_camera_tracker_updated ((SearchFilterActions*) self, _sender); -#line 3830 "SearchFilter.c" +#line 4173 "SearchFilter.c" } -void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Page* old_page, Page* new_page) { +void +search_filter_actions_monitor_page_contents (SearchFilterActions* self, + Page* old_page, + Page* new_page) +{ CheckerboardPage* old_tracked_page = NULL; - Page* _tmp0_; + CheckerboardPage* _tmp0_; CheckerboardPage* _tmp1_; - CheckerboardPage* _tmp2_; CheckerboardPage* new_tracked_page = NULL; - Page* _tmp11_; - CheckerboardPage* _tmp12_; - CheckerboardPage* _tmp13_; + CheckerboardPage* _tmp10_; + CheckerboardPage* _tmp11_; #line 453 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self)); #line 453 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -3846,100 +4191,96 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag #line 453 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page)); #line 454 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = old_page; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (old_page, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) old_page) : NULL); #line 454 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp0_) : NULL); -#line 454 "/home/jens/Source/shotwell/src/SearchFilter.vala" - old_tracked_page = _tmp1_; + old_tracked_page = _tmp0_; #line 455 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = old_tracked_page; + _tmp1_ = old_tracked_page; #line 455 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp2_ != NULL) { -#line 3859 "SearchFilter.c" + if (_tmp1_ != NULL) { +#line 4202 "SearchFilter.c" CoreViewTracker* tracker = NULL; - CheckerboardPage* _tmp3_; + CheckerboardPage* _tmp2_; + CoreViewTracker* _tmp3_; CoreViewTracker* _tmp4_; - CoreViewTracker* _tmp5_; #line 456 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = old_tracked_page; + _tmp2_ = old_tracked_page; #line 456 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = checkerboard_page_get_view_tracker (_tmp3_); + _tmp3_ = checkerboard_page_get_view_tracker (_tmp2_); #line 456 "/home/jens/Source/shotwell/src/SearchFilter.vala" - tracker = _tmp4_; + tracker = _tmp3_; #line 457 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = tracker; + _tmp4_ = tracker; #line 457 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_MEDIA_VIEW_TRACKER)) { -#line 3874 "SearchFilter.c" - CoreViewTracker* _tmp6_; - guint _tmp7_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_MEDIA_VIEW_TRACKER)) { +#line 4217 "SearchFilter.c" + CoreViewTracker* _tmp5_; + guint _tmp6_; #line 458 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = tracker; + _tmp5_ = tracker; #line 458 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_parse_name ("updated", CORE_TYPE_TRACKER, &_tmp7_, NULL, FALSE); + g_signal_parse_name ("updated", CORE_TYPE_TRACKER, &_tmp6_, NULL, FALSE); #line 458 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, CORE_TYPE_TRACKER, CoreTracker), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _search_filter_actions_on_media_tracker_updated_core_tracker_updated, self); -#line 3883 "SearchFilter.c" + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, CORE_TYPE_TRACKER, CoreTracker), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _search_filter_actions_on_media_tracker_updated_core_tracker_updated, self); +#line 4226 "SearchFilter.c" } else { - CoreViewTracker* _tmp8_; + CoreViewTracker* _tmp7_; #line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = tracker; + _tmp7_ = tracker; #line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_CAMERA_VIEW_TRACKER)) { -#line 3890 "SearchFilter.c" - CoreViewTracker* _tmp9_; - guint _tmp10_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_CAMERA_VIEW_TRACKER)) { +#line 4233 "SearchFilter.c" + CoreViewTracker* _tmp8_; + guint _tmp9_; #line 460 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp9_ = tracker; + _tmp8_ = tracker; #line 460 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_parse_name ("updated", CORE_TYPE_TRACKER, &_tmp10_, NULL, FALSE); + g_signal_parse_name ("updated", CORE_TYPE_TRACKER, &_tmp9_, NULL, FALSE); #line 460 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, CORE_TYPE_TRACKER, CoreTracker), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _search_filter_actions_on_camera_tracker_updated_core_tracker_updated, self); -#line 3899 "SearchFilter.c" + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, CORE_TYPE_TRACKER, CoreTracker), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _search_filter_actions_on_camera_tracker_updated_core_tracker_updated, self); +#line 4242 "SearchFilter.c" } } #line 455 "/home/jens/Source/shotwell/src/SearchFilter.vala" _core_tracker_unref0 (tracker); -#line 3904 "SearchFilter.c" +#line 4247 "SearchFilter.c" } #line 463 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp11_ = new_page; -#line 463 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp11_) : NULL); + _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (new_page, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) new_page) : NULL); #line 463 "/home/jens/Source/shotwell/src/SearchFilter.vala" - new_tracked_page = _tmp12_; + new_tracked_page = _tmp10_; #line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp13_ = new_tracked_page; + _tmp11_ = new_tracked_page; #line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp13_ != NULL) { -#line 3916 "SearchFilter.c" + if (_tmp11_ != NULL) { +#line 4257 "SearchFilter.c" CoreViewTracker* tracker = NULL; - CheckerboardPage* _tmp14_; - CoreViewTracker* _tmp15_; - CoreViewTracker* _tmp16_; + CheckerboardPage* _tmp12_; + CoreViewTracker* _tmp13_; + CoreViewTracker* _tmp14_; #line 465 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->can_filter_by_stars = TRUE; #line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp14_ = new_tracked_page; + _tmp12_ = new_tracked_page; #line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp15_ = checkerboard_page_get_view_tracker (_tmp14_); + _tmp13_ = checkerboard_page_get_view_tracker (_tmp12_); #line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala" - tracker = _tmp15_; + tracker = _tmp13_; #line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp16_ = tracker; + _tmp14_ = tracker; #line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_MEDIA_VIEW_TRACKER)) { -#line 3933 "SearchFilter.c" - CoreViewTracker* _tmp17_; - CoreViewTracker* _tmp18_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_MEDIA_VIEW_TRACKER)) { +#line 4274 "SearchFilter.c" + CoreViewTracker* _tmp15_; + CoreViewTracker* _tmp16_; #line 469 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp17_ = tracker; + _tmp15_ = tracker; #line 469 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, CORE_TYPE_TRACKER, CoreTracker), "updated", (GCallback) _search_filter_actions_on_media_tracker_updated_core_tracker_updated, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, CORE_TYPE_TRACKER, CoreTracker), "updated", (GCallback) _search_filter_actions_on_media_tracker_updated_core_tracker_updated, self); #line 470 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp18_ = tracker; + _tmp16_ = tracker; #line 470 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_actions_on_media_tracker_updated (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, CORE_TYPE_TRACKER, CoreTracker)); + search_filter_actions_on_media_tracker_updated (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, CORE_TYPE_TRACKER, CoreTracker)); #line 472 "/home/jens/Source/shotwell/src/SearchFilter.vala" _core_tracker_unref0 (tracker); #line 472 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -3948,24 +4289,24 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag _g_object_unref0 (old_tracked_page); #line 472 "/home/jens/Source/shotwell/src/SearchFilter.vala" return; -#line 3952 "SearchFilter.c" +#line 4293 "SearchFilter.c" } else { - CoreViewTracker* _tmp19_; + CoreViewTracker* _tmp17_; #line 473 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp19_ = tracker; + _tmp17_ = tracker; #line 473 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_CAMERA_VIEW_TRACKER)) { -#line 3959 "SearchFilter.c" - CoreViewTracker* _tmp20_; - CoreViewTracker* _tmp21_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_CAMERA_VIEW_TRACKER)) { +#line 4300 "SearchFilter.c" + CoreViewTracker* _tmp18_; + CoreViewTracker* _tmp19_; #line 474 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp20_ = tracker; + _tmp18_ = tracker; #line 474 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, CORE_TYPE_TRACKER, CoreTracker), "updated", (GCallback) _search_filter_actions_on_camera_tracker_updated_core_tracker_updated, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, CORE_TYPE_TRACKER, CoreTracker), "updated", (GCallback) _search_filter_actions_on_camera_tracker_updated_core_tracker_updated, self); #line 475 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp21_ = tracker; + _tmp19_ = tracker; #line 475 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_actions_on_camera_tracker_updated (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, CORE_TYPE_TRACKER, CoreTracker)); + search_filter_actions_on_camera_tracker_updated (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, CORE_TYPE_TRACKER, CoreTracker)); #line 477 "/home/jens/Source/shotwell/src/SearchFilter.vala" _core_tracker_unref0 (tracker); #line 477 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -3974,12 +4315,12 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag _g_object_unref0 (old_tracked_page); #line 477 "/home/jens/Source/shotwell/src/SearchFilter.vala" return; -#line 3978 "SearchFilter.c" +#line 4319 "SearchFilter.c" } } #line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala" _core_tracker_unref0 (tracker); -#line 3983 "SearchFilter.c" +#line 4324 "SearchFilter.c" } #line 482 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->has_flagged = FALSE; @@ -3997,129 +4338,133 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag _g_object_unref0 (new_tracked_page); #line 453 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (old_tracked_page); -#line 4001 "SearchFilter.c" +#line 4342 "SearchFilter.c" } -static gpointer _core_tracker_ref0 (gpointer self) { +static gpointer +_core_tracker_ref0 (gpointer self) +{ #line 492 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self ? core_tracker_ref (self) : NULL; -#line 4008 "SearchFilter.c" +#line 4351 "SearchFilter.c" } -static void search_filter_actions_on_media_tracker_updated (SearchFilterActions* self, CoreTracker* t) { +static void +search_filter_actions_on_media_tracker_updated (SearchFilterActions* self, + CoreTracker* t) +{ MediaViewTracker* tracker = NULL; - CoreTracker* _tmp0_; - MediaViewTracker* _tmp1_; - MediaAccumulator* _tmp2_; - gint _tmp3_; - MediaAccumulator* _tmp4_; - gint _tmp5_; - MediaAccumulator* _tmp6_; - gint _tmp7_; - MediaAccumulator* _tmp8_; - gint _tmp9_; + MediaViewTracker* _tmp0_; + MediaAccumulator* _tmp1_; + gint _tmp2_; + MediaAccumulator* _tmp3_; + gint _tmp4_; + MediaAccumulator* _tmp5_; + gint _tmp6_; + MediaAccumulator* _tmp7_; + gint _tmp8_; #line 491 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self)); #line 491 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (CORE_IS_TRACKER (t)); #line 492 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = t; -#line 492 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_VIEW_TRACKER, MediaViewTracker)); + _tmp0_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (t, TYPE_MEDIA_VIEW_TRACKER, MediaViewTracker)); #line 492 "/home/jens/Source/shotwell/src/SearchFilter.vala" - tracker = _tmp1_; + tracker = _tmp0_; #line 494 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = tracker->all; + _tmp1_ = tracker->all; #line 494 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = _tmp2_->flagged; + _tmp2_ = _tmp1_->flagged; #line 494 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->has_flagged = _tmp3_ > 0; + self->priv->has_flagged = _tmp2_ > 0; #line 495 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = tracker->all; + _tmp3_ = tracker->all; #line 495 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = _tmp4_->photos; + _tmp4_ = _tmp3_->photos; #line 495 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->has_photos = _tmp5_ > 0; + self->priv->has_photos = _tmp4_ > 0; #line 496 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = tracker->all; + _tmp5_ = tracker->all; #line 496 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp7_ = _tmp6_->videos; + _tmp6_ = _tmp5_->videos; #line 496 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->has_videos = _tmp7_ > 0; + self->priv->has_videos = _tmp6_ > 0; #line 497 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = tracker->all; + _tmp7_ = tracker->all; #line 497 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp9_ = _tmp8_->raw; + _tmp8_ = _tmp7_->raw; #line 497 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->has_raw = _tmp9_ > 0; + self->priv->has_raw = _tmp8_ > 0; #line 499 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_update_sensitivities (self); #line 491 "/home/jens/Source/shotwell/src/SearchFilter.vala" _core_tracker_unref0 (tracker); -#line 4062 "SearchFilter.c" +#line 4405 "SearchFilter.c" } -static void search_filter_actions_on_camera_tracker_updated (SearchFilterActions* self, CoreTracker* t) { +static void +search_filter_actions_on_camera_tracker_updated (SearchFilterActions* self, + CoreTracker* t) +{ CameraViewTracker* tracker = NULL; - CoreTracker* _tmp0_; - CameraViewTracker* _tmp1_; - CameraAccumulator* _tmp2_; + CameraViewTracker* _tmp0_; + CameraAccumulator* _tmp1_; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; - CameraAccumulator* _tmp5_; + CameraAccumulator* _tmp4_; + gint _tmp5_; gint _tmp6_; - gint _tmp7_; - CameraAccumulator* _tmp8_; + CameraAccumulator* _tmp7_; + gint _tmp8_; gint _tmp9_; - gint _tmp10_; #line 502 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self)); #line 502 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (CORE_IS_TRACKER (t)); #line 503 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = t; + _tmp0_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (t, TYPE_CAMERA_VIEW_TRACKER, CameraViewTracker)); #line 503 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_CAMERA_VIEW_TRACKER, CameraViewTracker)); -#line 503 "/home/jens/Source/shotwell/src/SearchFilter.vala" - tracker = _tmp1_; + tracker = _tmp0_; #line 505 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->has_flagged = FALSE; #line 506 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = tracker->all; + _tmp1_ = tracker->all; #line 506 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = camera_accumulator_get_photos (_tmp2_); + _tmp2_ = camera_accumulator_get_photos (_tmp1_); #line 506 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 506 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->has_photos = _tmp4_ > 0; + self->priv->has_photos = _tmp3_ > 0; #line 507 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = tracker->all; + _tmp4_ = tracker->all; #line 507 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = camera_accumulator_get_videos (_tmp5_); + _tmp5_ = camera_accumulator_get_videos (_tmp4_); #line 507 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 507 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->has_videos = _tmp7_ > 0; + self->priv->has_videos = _tmp6_ > 0; #line 508 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = tracker->all; + _tmp7_ = tracker->all; #line 508 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp9_ = camera_accumulator_get_raw (_tmp8_); + _tmp8_ = camera_accumulator_get_raw (_tmp7_); #line 508 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 508 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->has_raw = _tmp10_ > 0; + self->priv->has_raw = _tmp9_ > 0; #line 510 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_update_sensitivities (self); #line 502 "/home/jens/Source/shotwell/src/SearchFilter.vala" _core_tracker_unref0 (tracker); -#line 4119 "SearchFilter.c" +#line 4462 "SearchFilter.c" } -static void search_filter_actions_update_sensitivities (SearchFilterActions* self) { +static void +search_filter_actions_update_sensitivities (SearchFilterActions* self) +{ gboolean allow_ratings = FALSE; SearchFilterCriteria _tmp0_; gboolean _tmp1_; @@ -4155,95 +4500,98 @@ static void search_filter_actions_update_sensitivities (SearchFilterActions* sel _tmp7_ = self->priv->has_flagged; #line 521 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_MEDIA_CONTEXT_CHANGED_SIGNAL], 0, _tmp4_, _tmp5_, _tmp6_, _tmp7_); -#line 4159 "SearchFilter.c" +#line 4504 "SearchFilter.c" } -static void search_filter_actions_on_text_changed (SearchFilterActions* self, TextAction* action, const gchar* text) { - const gchar* _tmp0_; +static void +search_filter_actions_on_text_changed (SearchFilterActions* self, + TextAction* action, + const gchar* text) +{ #line 524 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self)); #line 524 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_TEXT_ACTION (action)); #line 525 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = text; -#line 525 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_TEXT_CHANGED_SIGNAL], 0, _tmp0_); -#line 4173 "SearchFilter.c" + g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_TEXT_CHANGED_SIGNAL], 0, text); +#line 4519 "SearchFilter.c" } -static void search_filter_actions_on_action_radio (SearchFilterActions* self, GSimpleAction* action, GVariant* parameter) { - GSimpleAction* _tmp0_; - GVariant* _tmp1_; +static void +search_filter_actions_on_action_radio (SearchFilterActions* self, + GSimpleAction* action, + GVariant* parameter) +{ #line 536 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self)); #line 536 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); #line 538 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = action; -#line 538 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = parameter; -#line 538 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_emit_by_name (_tmp0_, "change-state", _tmp1_); -#line 4190 "SearchFilter.c" + g_signal_emit_by_name (action, "change-state", parameter); +#line 4534 "SearchFilter.c" } -static gboolean _variant_get37 (GVariant* value) { +static gboolean +_variant_get37 (GVariant* value) +{ #line 543 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_variant_get_boolean (value); -#line 4197 "SearchFilter.c" +#line 4543 "SearchFilter.c" } -static GVariant* _variant_new38 (gboolean value) { +static GVariant* +_variant_new38 (gboolean value) +{ #line 544 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 4204 "SearchFilter.c" +#line 4552 "SearchFilter.c" } -static void search_filter_actions_on_action_toggle (SearchFilterActions* self, GSimpleAction* action, GVariant* parameter) { +static void +search_filter_actions_on_action_toggle (SearchFilterActions* self, + GSimpleAction* action, + GVariant* parameter) +{ gboolean state = FALSE; - GSimpleAction* _tmp0_; + GVariant* _tmp0_; GVariant* _tmp1_; - GVariant* _tmp2_; + gboolean _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; - GSimpleAction* _tmp5_; - GVariant* _tmp6_; + GVariant* _tmp4_; #line 541 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self)); #line 541 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); #line 543 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = action; -#line 543 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_action_get_type (), GAction)); + _tmp0_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (action, g_action_get_type (), GAction)); #line 543 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 543 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = _variant_get37 (_tmp2_); + _tmp2_ = _variant_get37 (_tmp1_); #line 543 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 543 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_variant_unref0 (_tmp2_); + _g_variant_unref0 (_tmp1_); #line 543 "/home/jens/Source/shotwell/src/SearchFilter.vala" - state = _tmp4_; -#line 544 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = action; + state = _tmp3_; #line 544 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = _variant_new38 (!state); + _tmp4_ = _variant_new38 (!state); #line 544 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_emit_by_name (_tmp5_, "change-state", _tmp6_); + g_signal_emit_by_name (action, "change-state", _tmp4_); #line 544 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_variant_unref0 (_tmp6_); -#line 4243 "SearchFilter.c" + _g_variant_unref0 (_tmp4_); +#line 4589 "SearchFilter.c" } -static void search_filter_actions_register (SearchFilterActions* self) { +static void +search_filter_actions_register (SearchFilterActions* self) +{ TextAction* _tmp0_; #line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self)); @@ -4253,25 +4601,23 @@ static void search_filter_actions_register (SearchFilterActions* self) { _text_action_unref0 (self->priv->_text); #line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->_text = _tmp0_; -#line 4257 "SearchFilter.c" +#line 4605 "SearchFilter.c" } -static void search_filter_actions_on_rating_changed (SearchFilterActions* self, GSimpleAction* action, GVariant* value) { - GVariant* _tmp0_; - const gchar* _tmp1_; - GSimpleAction* _tmp2_; - GVariant* _tmp3_; - GVariant* _tmp4_; - const gchar* _tmp5_; - gboolean _tmp6_; +static void +search_filter_actions_on_rating_changed (SearchFilterActions* self, + GSimpleAction* action, + GVariant* value) +{ + const gchar* _tmp0_; + GVariant* _tmp1_; + GVariant* _tmp2_; + const gchar* _tmp3_; + gboolean _tmp4_; RatingFilter filter = 0; - GVariant* _tmp7_; - const gchar* _tmp8_; - gint _tmp9_; - GSimpleAction* _tmp10_; - GVariant* _tmp11_; - RatingFilter _tmp12_; + const gchar* _tmp5_; + RatingFilter _tmp6_; #line 551 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self)); #line 551 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -4279,54 +4625,42 @@ static void search_filter_actions_on_rating_changed (SearchFilterActions* self, #line 551 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (value != NULL); #line 553 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = value; -#line 553 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = g_variant_get_string (_tmp0_, NULL); -#line 553 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = action; + _tmp0_ = g_variant_get_string (value, NULL); #line 553 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_action_get_type (), GAction)); + _tmp1_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (action, g_action_get_type (), GAction)); #line 553 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 553 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = g_variant_get_string (_tmp4_, NULL); + _tmp3_ = g_variant_get_string (_tmp2_, NULL); #line 553 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = g_strcmp0 (_tmp1_, _tmp5_) == 0; + _tmp4_ = g_strcmp0 (_tmp0_, _tmp3_) == 0; #line 553 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_variant_unref0 (_tmp4_); + _g_variant_unref0 (_tmp2_); #line 553 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp6_) { + if (_tmp4_) { #line 554 "/home/jens/Source/shotwell/src/SearchFilter.vala" return; -#line 4302 "SearchFilter.c" +#line 4644 "SearchFilter.c" } #line 556 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp7_ = value; + _tmp5_ = g_variant_get_string (value, NULL); #line 556 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = g_variant_get_string (_tmp7_, NULL); -#line 556 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp9_ = atoi (_tmp8_); -#line 556 "/home/jens/Source/shotwell/src/SearchFilter.vala" - filter = (RatingFilter) _tmp9_; -#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp10_ = action; -#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp11_ = value; + filter = (RatingFilter) atoi (_tmp5_); #line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_simple_action_set_state (_tmp10_, _tmp11_); + g_simple_action_set_state (action, value); #line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp12_ = filter; + _tmp6_ = filter; #line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_RATING_CHANGED_SIGNAL], 0, _tmp12_); -#line 4322 "SearchFilter.c" + g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_RATING_CHANGED_SIGNAL], 0, _tmp6_); +#line 4656 "SearchFilter.c" } -static void search_filter_actions_on_flagged_toggled (SearchFilterActions* self, GSimpleAction* action, GVariant* value) { - GSimpleAction* _tmp0_; - GVariant* _tmp1_; - GVariant* _tmp2_; - gboolean _tmp3_; +static void +search_filter_actions_on_flagged_toggled (SearchFilterActions* self, + GSimpleAction* action, + GVariant* value) +{ #line 561 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self)); #line 561 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -4334,26 +4668,18 @@ static void search_filter_actions_on_flagged_toggled (SearchFilterActions* self, #line 561 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (value != NULL); #line 563 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = action; -#line 563 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = value; -#line 563 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_simple_action_set_state (_tmp0_, _tmp1_); -#line 564 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = value; -#line 564 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = g_variant_get_boolean (_tmp2_); + g_simple_action_set_state (action, value); #line 564 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_FLAGGED_TOGGLED_SIGNAL], 0, _tmp3_); -#line 4349 "SearchFilter.c" + g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_FLAGGED_TOGGLED_SIGNAL], 0, g_variant_get_boolean (value)); +#line 4675 "SearchFilter.c" } -static void search_filter_actions_on_photos_toggled (SearchFilterActions* self, GSimpleAction* action, GVariant* value) { - GSimpleAction* _tmp0_; - GVariant* _tmp1_; - GVariant* _tmp2_; - gboolean _tmp3_; +static void +search_filter_actions_on_photos_toggled (SearchFilterActions* self, + GSimpleAction* action, + GVariant* value) +{ #line 567 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self)); #line 567 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -4361,26 +4687,18 @@ static void search_filter_actions_on_photos_toggled (SearchFilterActions* self, #line 567 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (value != NULL); #line 569 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = action; -#line 569 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = value; -#line 569 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_simple_action_set_state (_tmp0_, _tmp1_); -#line 570 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = value; -#line 570 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = g_variant_get_boolean (_tmp2_); + g_simple_action_set_state (action, value); #line 570 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_PHOTOS_TOGGLED_SIGNAL], 0, _tmp3_); -#line 4376 "SearchFilter.c" + g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_PHOTOS_TOGGLED_SIGNAL], 0, g_variant_get_boolean (value)); +#line 4694 "SearchFilter.c" } -static void search_filter_actions_on_videos_toggled (SearchFilterActions* self, GSimpleAction* action, GVariant* value) { - GSimpleAction* _tmp0_; - GVariant* _tmp1_; - GVariant* _tmp2_; - gboolean _tmp3_; +static void +search_filter_actions_on_videos_toggled (SearchFilterActions* self, + GSimpleAction* action, + GVariant* value) +{ #line 573 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self)); #line 573 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -4388,26 +4706,18 @@ static void search_filter_actions_on_videos_toggled (SearchFilterActions* self, #line 573 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (value != NULL); #line 575 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = action; -#line 575 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = value; -#line 575 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_simple_action_set_state (_tmp0_, _tmp1_); -#line 576 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = value; -#line 576 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = g_variant_get_boolean (_tmp2_); + g_simple_action_set_state (action, value); #line 576 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_VIDEOS_TOGGLED_SIGNAL], 0, _tmp3_); -#line 4403 "SearchFilter.c" + g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_VIDEOS_TOGGLED_SIGNAL], 0, g_variant_get_boolean (value)); +#line 4713 "SearchFilter.c" } -static void search_filter_actions_on_raw_toggled (SearchFilterActions* self, GSimpleAction* action, GVariant* value) { - GSimpleAction* _tmp0_; - GVariant* _tmp1_; - GVariant* _tmp2_; - gboolean _tmp3_; +static void +search_filter_actions_on_raw_toggled (SearchFilterActions* self, + GSimpleAction* action, + GVariant* value) +{ #line 579 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self)); #line 579 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -4415,22 +4725,16 @@ static void search_filter_actions_on_raw_toggled (SearchFilterActions* self, GSi #line 579 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (value != NULL); #line 581 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = action; -#line 581 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = value; -#line 581 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_simple_action_set_state (_tmp0_, _tmp1_); -#line 582 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = value; + g_simple_action_set_state (action, value); #line 582 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = g_variant_get_boolean (_tmp2_); -#line 582 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_RAW_TOGGLED_SIGNAL], 0, _tmp3_); -#line 4430 "SearchFilter.c" + g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_RAW_TOGGLED_SIGNAL], 0, g_variant_get_boolean (value)); +#line 4732 "SearchFilter.c" } -gboolean search_filter_actions_get_has_photos (SearchFilterActions* self) { +gboolean +search_filter_actions_get_has_photos (SearchFilterActions* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 585 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -4441,11 +4745,13 @@ gboolean search_filter_actions_get_has_photos (SearchFilterActions* self) { result = _tmp0_; #line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4445 "SearchFilter.c" +#line 4749 "SearchFilter.c" } -gboolean search_filter_actions_get_has_videos (SearchFilterActions* self) { +gboolean +search_filter_actions_get_has_videos (SearchFilterActions* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 589 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -4456,11 +4762,13 @@ gboolean search_filter_actions_get_has_videos (SearchFilterActions* self) { result = _tmp0_; #line 590 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4460 "SearchFilter.c" +#line 4766 "SearchFilter.c" } -gboolean search_filter_actions_get_has_raw (SearchFilterActions* self) { +gboolean +search_filter_actions_get_has_raw (SearchFilterActions* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 593 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -4471,11 +4779,13 @@ gboolean search_filter_actions_get_has_raw (SearchFilterActions* self) { result = _tmp0_; #line 594 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4475 "SearchFilter.c" +#line 4783 "SearchFilter.c" } -gboolean search_filter_actions_get_has_flagged (SearchFilterActions* self) { +gboolean +search_filter_actions_get_has_flagged (SearchFilterActions* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 597 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -4486,11 +4796,13 @@ gboolean search_filter_actions_get_has_flagged (SearchFilterActions* self) { result = _tmp0_; #line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4490 "SearchFilter.c" +#line 4800 "SearchFilter.c" } -GSimpleAction* search_filter_actions_get_flagged (SearchFilterActions* self) { +GSimpleAction* +search_filter_actions_get_flagged (SearchFilterActions* self) +{ GSimpleAction* result; GSimpleAction* _tmp0_; #line 331 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -4501,11 +4813,13 @@ GSimpleAction* search_filter_actions_get_flagged (SearchFilterActions* self) { result = _tmp0_; #line 332 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4505 "SearchFilter.c" +#line 4817 "SearchFilter.c" } -GSimpleAction* search_filter_actions_get_photos (SearchFilterActions* self) { +GSimpleAction* +search_filter_actions_get_photos (SearchFilterActions* self) +{ GSimpleAction* result; GSimpleAction* _tmp0_; #line 337 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -4516,11 +4830,13 @@ GSimpleAction* search_filter_actions_get_photos (SearchFilterActions* self) { result = _tmp0_; #line 338 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4520 "SearchFilter.c" +#line 4834 "SearchFilter.c" } -GSimpleAction* search_filter_actions_get_videos (SearchFilterActions* self) { +GSimpleAction* +search_filter_actions_get_videos (SearchFilterActions* self) +{ GSimpleAction* result; GSimpleAction* _tmp0_; #line 343 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -4531,11 +4847,13 @@ GSimpleAction* search_filter_actions_get_videos (SearchFilterActions* self) { result = _tmp0_; #line 344 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4535 "SearchFilter.c" +#line 4851 "SearchFilter.c" } -GSimpleAction* search_filter_actions_get_raw (SearchFilterActions* self) { +GSimpleAction* +search_filter_actions_get_raw (SearchFilterActions* self) +{ GSimpleAction* result; GSimpleAction* _tmp0_; #line 349 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -4546,11 +4864,13 @@ GSimpleAction* search_filter_actions_get_raw (SearchFilterActions* self) { result = _tmp0_; #line 350 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4550 "SearchFilter.c" +#line 4868 "SearchFilter.c" } -GSimpleAction* search_filter_actions_get_rating (SearchFilterActions* self) { +GSimpleAction* +search_filter_actions_get_rating (SearchFilterActions* self) +{ GSimpleAction* result; GSimpleAction* _tmp0_; #line 355 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -4561,11 +4881,13 @@ GSimpleAction* search_filter_actions_get_rating (SearchFilterActions* self) { result = _tmp0_; #line 356 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4565 "SearchFilter.c" +#line 4885 "SearchFilter.c" } -TextAction* search_filter_actions_get_text (SearchFilterActions* self) { +TextAction* +search_filter_actions_get_text (SearchFilterActions* self) +{ TextAction* result; TextAction* _tmp0_; TextAction* _tmp1_; @@ -4581,11 +4903,18 @@ TextAction* search_filter_actions_get_text (SearchFilterActions* self) { result = _tmp1_; #line 363 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4585 "SearchFilter.c" +#line 4907 "SearchFilter.c" } -static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN) (gpointer data1, gboolean arg_1, gboolean arg_2, gboolean arg_3, gboolean arg_4, gpointer data2); register GMarshalFunc_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN callback; register GCClosure * cc; @@ -4600,120 +4929,145 @@ static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN (GClos data1 = closure->data; #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" data2 = param_values->data[0].v_pointer; -#line 4604 "SearchFilter.c" +#line 4933 "SearchFilter.c" } else { #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" data1 = param_values->data[0].v_pointer; #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" data2 = closure->data; -#line 4610 "SearchFilter.c" +#line 4939 "SearchFilter.c" } #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" callback = (GMarshalFunc_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN) (marshal_data ? marshal_data : cc->callback); #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" callback (data1, g_value_get_boolean (param_values + 1), g_value_get_boolean (param_values + 2), g_value_get_boolean (param_values + 3), g_value_get_boolean (param_values + 4), data2); -#line 4616 "SearchFilter.c" +#line 4945 "SearchFilter.c" } -static void value_search_filter_actions_init (GValue* value) { +static void +value_search_filter_actions_init (GValue* value) +{ #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 4623 "SearchFilter.c" +#line 4954 "SearchFilter.c" } -static void value_search_filter_actions_free_value (GValue* value) { +static void +value_search_filter_actions_free_value (GValue* value) +{ #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (value->data[0].v_pointer) { #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_unref (value->data[0].v_pointer); -#line 4632 "SearchFilter.c" +#line 4965 "SearchFilter.c" } } -static void value_search_filter_actions_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_search_filter_actions_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (src_value->data[0].v_pointer) { #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" dest_value->data[0].v_pointer = search_filter_actions_ref (src_value->data[0].v_pointer); -#line 4642 "SearchFilter.c" +#line 4978 "SearchFilter.c" } else { #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" dest_value->data[0].v_pointer = NULL; -#line 4646 "SearchFilter.c" +#line 4982 "SearchFilter.c" } } -static gpointer value_search_filter_actions_peek_pointer (const GValue* value) { +static gpointer +value_search_filter_actions_peek_pointer (const GValue* value) +{ #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" return value->data[0].v_pointer; -#line 4654 "SearchFilter.c" +#line 4992 "SearchFilter.c" } -static gchar* value_search_filter_actions_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_search_filter_actions_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (collect_values[0].v_pointer) { -#line 4661 "SearchFilter.c" +#line 5004 "SearchFilter.c" SearchFilterActions * object; object = collect_values[0].v_pointer; #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (object->parent_instance.g_class == NULL) { #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4668 "SearchFilter.c" +#line 5011 "SearchFilter.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4672 "SearchFilter.c" +#line 5015 "SearchFilter.c" } #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = search_filter_actions_ref (object); -#line 4676 "SearchFilter.c" +#line 5019 "SearchFilter.c" } else { #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 4680 "SearchFilter.c" +#line 5023 "SearchFilter.c" } #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" return NULL; -#line 4684 "SearchFilter.c" +#line 5027 "SearchFilter.c" } -static gchar* value_search_filter_actions_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_search_filter_actions_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ SearchFilterActions ** object_p; object_p = collect_values[0].v_pointer; #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (!object_p) { #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 4695 "SearchFilter.c" +#line 5043 "SearchFilter.c" } #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (!value->data[0].v_pointer) { #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" *object_p = NULL; -#line 4701 "SearchFilter.c" +#line 5049 "SearchFilter.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" *object_p = value->data[0].v_pointer; -#line 4705 "SearchFilter.c" +#line 5053 "SearchFilter.c" } else { #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" *object_p = search_filter_actions_ref (value->data[0].v_pointer); -#line 4709 "SearchFilter.c" +#line 5057 "SearchFilter.c" } #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" return NULL; -#line 4713 "SearchFilter.c" +#line 5061 "SearchFilter.c" } -GParamSpec* param_spec_search_filter_actions (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_search_filter_actions (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecSearchFilterActions* spec; #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_SEARCH_FILTER_ACTIONS), NULL); @@ -4723,20 +5077,25 @@ GParamSpec* param_spec_search_filter_actions (const gchar* name, const gchar* ni G_PARAM_SPEC (spec)->value_type = object_type; #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" return G_PARAM_SPEC (spec); -#line 4727 "SearchFilter.c" +#line 5081 "SearchFilter.c" } -gpointer value_get_search_filter_actions (const GValue* value) { +gpointer +value_get_search_filter_actions (const GValue* value) +{ #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_FILTER_ACTIONS), NULL); #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" return value->data[0].v_pointer; -#line 4736 "SearchFilter.c" +#line 5092 "SearchFilter.c" } -void value_set_search_filter_actions (GValue* value, gpointer v_object) { +void +value_set_search_filter_actions (GValue* value, + gpointer v_object) +{ SearchFilterActions * old; #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_FILTER_ACTIONS)); @@ -4752,22 +5111,25 @@ void value_set_search_filter_actions (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_ref (value->data[0].v_pointer); -#line 4756 "SearchFilter.c" +#line 5115 "SearchFilter.c" } else { #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 4760 "SearchFilter.c" +#line 5119 "SearchFilter.c" } #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (old) { #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_unref (old); -#line 4766 "SearchFilter.c" +#line 5125 "SearchFilter.c" } } -void value_take_search_filter_actions (GValue* value, gpointer v_object) { +void +value_take_search_filter_actions (GValue* value, + gpointer v_object) +{ SearchFilterActions * old; #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_FILTER_ACTIONS)); @@ -4781,22 +5143,24 @@ void value_take_search_filter_actions (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = v_object; -#line 4785 "SearchFilter.c" +#line 5147 "SearchFilter.c" } else { #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 4789 "SearchFilter.c" +#line 5151 "SearchFilter.c" } #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (old) { #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_unref (old); -#line 4795 "SearchFilter.c" +#line 5157 "SearchFilter.c" } } -static void search_filter_actions_class_init (SearchFilterActionsClass * klass) { +static void +search_filter_actions_class_init (SearchFilterActionsClass * klass) +{ #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_parent_class = g_type_class_peek_parent (klass); #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -4815,7 +5179,7 @@ static void search_filter_actions_class_init (SearchFilterActionsClass * klass) search_filter_actions_signals[SEARCH_FILTER_ACTIONS_RATING_CHANGED_SIGNAL] = g_signal_new ("rating-changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__ENUM, G_TYPE_NONE, 1, TYPE_RATING_FILTER); #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_signals[SEARCH_FILTER_ACTIONS_TEXT_CHANGED_SIGNAL] = g_signal_new ("text-changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); -#line 4819 "SearchFilter.c" +#line 5183 "SearchFilter.c" /** * fired when the kinds of media present in the current view change (e.g., a video becomes * available in the view through a new import operation or no raw photos are available in @@ -4825,11 +5189,13 @@ static void search_filter_actions_class_init (SearchFilterActionsClass * klass) search_filter_actions_signals[SEARCH_FILTER_ACTIONS_MEDIA_CONTEXT_CHANGED_SIGNAL] = g_signal_new ("media-context-changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN); #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_signals[SEARCH_FILTER_ACTIONS_CRITERIA_CHANGED_SIGNAL] = g_signal_new ("criteria-changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 4829 "SearchFilter.c" +#line 5193 "SearchFilter.c" } -static void search_filter_actions_instance_init (SearchFilterActions * self) { +static void +search_filter_actions_instance_init (SearchFilterActions * self) +{ #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv = SEARCH_FILTER_ACTIONS_GET_PRIVATE (self); #line 367 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -4848,11 +5214,13 @@ static void search_filter_actions_instance_init (SearchFilterActions * self) { self->priv->can_filter_by_stars = TRUE; #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->ref_count = 1; -#line 4852 "SearchFilter.c" +#line 5218 "SearchFilter.c" } -static void search_filter_actions_finalize (SearchFilterActions * obj) { +static void +search_filter_actions_finalize (SearchFilterActions * obj) +{ SearchFilterActions * self; #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_FILTER_ACTIONS, SearchFilterActions); @@ -4860,11 +5228,13 @@ static void search_filter_actions_finalize (SearchFilterActions * obj) { g_signal_handlers_destroy (self); #line 368 "/home/jens/Source/shotwell/src/SearchFilter.vala" _text_action_unref0 (self->priv->_text); -#line 4864 "SearchFilter.c" +#line 5232 "SearchFilter.c" } -GType search_filter_actions_get_type (void) { +GType +search_filter_actions_get_type (void) +{ static volatile gsize search_filter_actions_type_id__volatile = 0; if (g_once_init_enter (&search_filter_actions_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_search_filter_actions_init, value_search_filter_actions_free_value, value_search_filter_actions_copy_value, value_search_filter_actions_peek_pointer, "p", value_search_filter_actions_collect_value, "p", value_search_filter_actions_lcopy_value }; @@ -4878,18 +5248,22 @@ GType search_filter_actions_get_type (void) { } -gpointer search_filter_actions_ref (gpointer instance) { +gpointer +search_filter_actions_ref (gpointer instance) +{ SearchFilterActions * self; self = instance; #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_atomic_int_inc (&self->ref_count); #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" return instance; -#line 4889 "SearchFilter.c" +#line 5261 "SearchFilter.c" } -void search_filter_actions_unref (gpointer instance) { +void +search_filter_actions_unref (gpointer instance) +{ SearchFilterActions * self; self = instance; #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -4898,245 +5272,272 @@ void search_filter_actions_unref (gpointer instance) { SEARCH_FILTER_ACTIONS_GET_CLASS (self)->finalize (self); #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_type_free_instance ((GTypeInstance *) self); -#line 4902 "SearchFilter.c" +#line 5276 "SearchFilter.c" } } -static void _search_filter_toolbar_on_media_context_changed_search_filter_actions_media_context_changed (SearchFilterActions* _sender, gboolean has_photos, gboolean has_videos, gboolean has_raw, gboolean has_flagged, gpointer self) { -#line 1154 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_on_media_context_changed_search_filter_actions_media_context_changed (SearchFilterActions* _sender, + gboolean has_photos, + gboolean has_videos, + gboolean has_raw, + gboolean has_flagged, + gpointer self) +{ +#line 1156 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_media_context_changed ((SearchFilterToolbar*) self, has_photos, has_videos, has_raw, has_flagged); -#line 4910 "SearchFilter.c" +#line 5291 "SearchFilter.c" } -static void _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) { -#line 1156 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled (SearchFilterActions* _sender, + gboolean on, + gpointer self) +{ +#line 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_flagged_toggled ((SearchFilterToolbar*) self); -#line 4917 "SearchFilter.c" +#line 5302 "SearchFilter.c" } -static void _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) { -#line 1157 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled (SearchFilterActions* _sender, + gboolean on, + gpointer self) +{ +#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_photos_toggled ((SearchFilterToolbar*) self); -#line 4924 "SearchFilter.c" +#line 5313 "SearchFilter.c" } -static void _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) { -#line 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled (SearchFilterActions* _sender, + gboolean on, + gpointer self) +{ +#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_videos_toggled ((SearchFilterToolbar*) self); -#line 4931 "SearchFilter.c" +#line 5324 "SearchFilter.c" } -static void _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) { -#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled (SearchFilterActions* _sender, + gboolean on, + gpointer self) +{ +#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_raw_toggled ((SearchFilterToolbar*) self); -#line 4938 "SearchFilter.c" +#line 5335 "SearchFilter.c" } -static void _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed (SearchFilterActions* _sender, RatingFilter filter, gpointer self) { -#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed (SearchFilterActions* _sender, + RatingFilter filter, + gpointer self) +{ +#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_rating_changed ((SearchFilterToolbar*) self); -#line 4945 "SearchFilter.c" +#line 5346 "SearchFilter.c" } -static void _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed (SearchFilterActions* _sender, const gchar* text, gpointer self) { -#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed (SearchFilterActions* _sender, + const gchar* text, + gpointer self) +{ +#line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_search_text_changed ((SearchFilterToolbar*) self); -#line 4952 "SearchFilter.c" +#line 5357 "SearchFilter.c" } -static void _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed (SearchFilterActions* _sender, gpointer self) { -#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed (SearchFilterActions* _sender, + gpointer self) +{ +#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_criteria_changed ((SearchFilterToolbar*) self); -#line 4959 "SearchFilter.c" +#line 5367 "SearchFilter.c" } -static gboolean _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu (GtkToolbar* _sender, gint x, gint y, gint button_number, gpointer self) { +static gboolean +_search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu (GtkToolbar* _sender, + gint x, + gint y, + gint button_number, + gpointer self) +{ gboolean result; result = search_filter_toolbar_on_context_menu_requested ((SearchFilterToolbar*) self, x, y, button_number); -#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4968 "SearchFilter.c" +#line 5382 "SearchFilter.c" } -static gpointer _search_filter_actions_ref0 (gpointer self) { -#line 1049 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static gpointer +_search_filter_actions_ref0 (gpointer self) +{ +#line 1051 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self ? search_filter_actions_ref (self) : NULL; -#line 4975 "SearchFilter.c" +#line 5391 "SearchFilter.c" } -static void _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { -#line 1071 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate (GtkMenuItem* _sender, + gpointer self) +{ +#line 1073 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_context_menu_close_chosen ((SearchFilterToolbar*) self); -#line 4982 "SearchFilter.c" +#line 5401 "SearchFilter.c" } -static void _search_filter_toolbar_on_saved_search_button_clicked_search_filter_toolbar_saved_search_filter_button_clicked (SearchFilterToolbarSavedSearchFilterButton* _sender, gpointer self) { -#line 1122 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_on_saved_search_button_clicked_search_filter_toolbar_saved_search_filter_button_clicked (SearchFilterToolbarSavedSearchFilterButton* _sender, + gpointer self) +{ +#line 1124 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_saved_search_button_clicked ((SearchFilterToolbar*) self); -#line 4989 "SearchFilter.c" +#line 5411 "SearchFilter.c" } -SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchFilterActions* actions) { +SearchFilterToolbar* +search_filter_toolbar_construct (GType object_type, + SearchFilterActions* actions) +{ SearchFilterToolbar * self = NULL; SearchFilterActions* _tmp0_; - SearchFilterActions* _tmp1_; - GtkToolbar* _tmp2_; - SearchFilterActions* _tmp3_; - SearchFilterActions* _tmp4_; - TextAction* _tmp5_; - TextAction* _tmp6_; - SearchFilterToolbarSearchBox* _tmp7_; - GtkToolbar* _tmp8_; - GtkToolbar* _tmp9_; - GtkMenuItem* _tmp17_; + GtkToolbar* _tmp1_; + TextAction* _tmp2_; + TextAction* _tmp3_; + SearchFilterToolbarSearchBox* _tmp4_; + GtkToolbar* _tmp5_; + GtkToolbar* _tmp6_; + GtkMenuItem* _tmp14_; + GtkMenuItem* _tmp15_; + GtkMenuItem* _tmp16_; + GtkMenu* _tmp17_; GtkMenuItem* _tmp18_; - GtkMenuItem* _tmp19_; - GtkMenu* _tmp20_; - GtkMenuItem* _tmp21_; - SearchFilterToolbarLabelToolItem* _tmp22_; - GtkToolbar* _tmp23_; - SearchFilterToolbarLabelToolItem* _tmp24_; + SearchFilterToolbarLabelToolItem* _tmp19_; + GtkToolbar* _tmp20_; + SearchFilterToolbarLabelToolItem* _tmp21_; + SearchFilterToolbarToggleActionToolButton* _tmp22_; + SearchFilterToolbarToggleActionToolButton* _tmp23_; + SearchFilterToolbarToggleActionToolButton* _tmp24_; SearchFilterToolbarToggleActionToolButton* _tmp25_; SearchFilterToolbarToggleActionToolButton* _tmp26_; SearchFilterToolbarToggleActionToolButton* _tmp27_; - SearchFilterToolbarToggleActionToolButton* _tmp28_; + GtkToolbar* _tmp28_; SearchFilterToolbarToggleActionToolButton* _tmp29_; - SearchFilterToolbarToggleActionToolButton* _tmp30_; - GtkToolbar* _tmp31_; - SearchFilterToolbarToggleActionToolButton* _tmp32_; - GtkToolbar* _tmp33_; - SearchFilterToolbarToggleActionToolButton* _tmp34_; + GtkToolbar* _tmp30_; + SearchFilterToolbarToggleActionToolButton* _tmp31_; + GtkToolbar* _tmp32_; + SearchFilterToolbarToggleActionToolButton* _tmp33_; + GtkSeparatorToolItem* _tmp34_; GtkToolbar* _tmp35_; - SearchFilterToolbarToggleActionToolButton* _tmp36_; - GtkSeparatorToolItem* _tmp37_; - GtkToolbar* _tmp38_; - GtkSeparatorToolItem* _tmp39_; - SearchFilterToolbarToggleActionToolButton* _tmp40_; + GtkSeparatorToolItem* _tmp36_; + SearchFilterToolbarToggleActionToolButton* _tmp37_; + SearchFilterToolbarToggleActionToolButton* _tmp38_; + SearchFilterToolbarToggleActionToolButton* _tmp39_; + GtkToolbar* _tmp40_; SearchFilterToolbarToggleActionToolButton* _tmp41_; - SearchFilterToolbarToggleActionToolButton* _tmp42_; + GtkSeparatorToolItem* _tmp42_; GtkToolbar* _tmp43_; - SearchFilterToolbarToggleActionToolButton* _tmp44_; - GtkSeparatorToolItem* _tmp45_; - GtkToolbar* _tmp46_; - GtkSeparatorToolItem* _tmp47_; + GtkSeparatorToolItem* _tmp44_; GMenuModel* model = NULL; - GtkBuilder* _tmp48_; - GObject* _tmp49_; - GMenuModel* _tmp50_; - SearchFilterToolbarRatingFilterButton* _tmp51_; + GtkBuilder* _tmp45_; + GObject* _tmp46_; + GMenuModel* _tmp47_; + SearchFilterToolbarRatingFilterButton* _tmp48_; + SearchFilterToolbarRatingFilterButton* _tmp49_; + SearchFilterToolbarRatingFilterButton* _tmp50_; + GtkToolbar* _tmp51_; SearchFilterToolbarRatingFilterButton* _tmp52_; - SearchFilterToolbarRatingFilterButton* _tmp53_; + GtkSeparatorToolItem* _tmp53_; GtkToolbar* _tmp54_; - SearchFilterToolbarRatingFilterButton* _tmp55_; - GtkSeparatorToolItem* _tmp56_; - GtkToolbar* _tmp57_; - GtkSeparatorToolItem* _tmp58_; + GtkSeparatorToolItem* _tmp55_; + SearchFilterToolbarSavedSearchFilterButton* _tmp56_; + SearchFilterToolbarSavedSearchFilterButton* _tmp57_; + SearchFilterToolbarSavedSearchFilterButton* _tmp58_; SearchFilterToolbarSavedSearchFilterButton* _tmp59_; - SearchFilterToolbarSavedSearchFilterButton* _tmp60_; + GtkToolbar* _tmp60_; SearchFilterToolbarSavedSearchFilterButton* _tmp61_; - SearchFilterToolbarSavedSearchFilterButton* _tmp62_; - GtkToolbar* _tmp63_; - SearchFilterToolbarSavedSearchFilterButton* _tmp64_; GtkSeparatorToolItem* separator_align = NULL; - GtkSeparatorToolItem* _tmp65_; + GtkSeparatorToolItem* _tmp62_; + GtkToolbar* _tmp63_; + GtkToolbar* _tmp64_; + SearchFilterToolbarSearchBox* _tmp65_; GtkToolbar* _tmp66_; GtkToolbar* _tmp67_; - SearchFilterToolbarSearchBox* _tmp68_; - GtkToolbar* _tmp69_; - SearchFilterActions* _tmp70_; - SearchFilterActions* _tmp71_; - SearchFilterActions* _tmp72_; - SearchFilterActions* _tmp73_; - SearchFilterActions* _tmp74_; - SearchFilterActions* _tmp75_; - SearchFilterActions* _tmp76_; - GtkToolbar* _tmp77_; - SearchFilterActions* _tmp78_; - gboolean _tmp79_; - SearchFilterActions* _tmp80_; - gboolean _tmp81_; - SearchFilterActions* _tmp82_; - gboolean _tmp83_; - SearchFilterActions* _tmp84_; - gboolean _tmp85_; GError * _inner_error_ = NULL; -#line 1048 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (actions), NULL); -#line 1048 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self = (SearchFilterToolbar*) g_object_new (object_type, NULL); -#line 1049 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = actions; -#line 1049 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = _search_filter_actions_ref0 (_tmp0_); -#line 1049 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _search_filter_actions_unref0 (self->priv->actions); -#line 1049 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->actions = _tmp1_; -#line 1050 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = (GtkToolbar*) gtk_toolbar_new (); #line 1050 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp2_); -#line 1050 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_object_unref0 (self->priv->toolbar); + g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (actions), NULL); #line 1050 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->toolbar = _tmp2_; + self = (SearchFilterToolbar*) g_object_new (object_type, NULL); #line 1051 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = actions; + _tmp0_ = _search_filter_actions_ref0 (actions); #line 1051 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (_tmp3_, "media-context-changed", (GCallback) _search_filter_toolbar_on_media_context_changed_search_filter_actions_media_context_changed, self, 0); -#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = actions; -#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = search_filter_actions_get_text (_tmp4_); -#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = _tmp5_; + _search_filter_actions_unref0 (self->priv->actions); +#line 1051 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->actions = _tmp0_; #line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp7_ = search_filter_toolbar_search_box_new (_tmp6_); + _tmp1_ = (GtkToolbar*) gtk_toolbar_new (); #line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp7_); + g_object_ref_sink (_tmp1_); #line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_object_unref0 (self->priv->search_box); + _g_object_unref0 (self->priv->toolbar); #line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->search_box = _tmp7_; + self->priv->toolbar = _tmp1_; +#line 1053 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_connect_object (actions, "media-context-changed", (GCallback) _search_filter_toolbar_on_media_context_changed_search_filter_actions_media_context_changed, self, 0); +#line 1054 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp2_ = search_filter_actions_get_text (actions); +#line 1054 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp3_ = _tmp2_; +#line 1054 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp4_ = search_filter_toolbar_search_box_new (_tmp3_); #line 1054 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = self->priv->toolbar; + g_object_ref_sink (_tmp4_); +#line 1054 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_object_unref0 (self->priv->search_box); #line 1054 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_buildable_set_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_BUILDABLE, GtkBuildable), "search-filter-toolbar"); -#line 1055 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp9_ = self->priv->toolbar; -#line 1055 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_toolbar_set_icon_size (_tmp9_, GTK_ICON_SIZE_SMALL_TOOLBAR); -#line 5123 "SearchFilter.c" + self->priv->search_box = _tmp4_; +#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp5_ = self->priv->toolbar; +#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_buildable_set_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_buildable_get_type (), GtkBuildable), "search-filter-toolbar"); +#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp6_ = self->priv->toolbar; +#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_toolbar_set_icon_size (_tmp6_, GTK_ICON_SIZE_SMALL_TOOLBAR); +#line 5524 "SearchFilter.c" { - GtkBuilder* _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; -#line 1058 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp10_ = self->builder; -#line 1058 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp11_ = resources_get_ui ("search_bar.ui"); -#line 1058 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp12_ = _tmp11_; -#line 1058 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_builder_add_from_resource (_tmp10_, _tmp12_, &_inner_error_); -#line 1058 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_free0 (_tmp12_); -#line 1058 "/home/jens/Source/shotwell/src/SearchFilter.vala" + GtkBuilder* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; +#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp7_ = self->builder; +#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp8_ = resources_get_ui ("search_bar.ui"); +#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp9_ = _tmp8_; +#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_builder_add_from_resource (_tmp7_, _tmp9_, &_inner_error_); +#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_free0 (_tmp9_); +#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5140 "SearchFilter.c" +#line 5541 "SearchFilter.c" goto __catch603_g_error; } } @@ -5144,465 +5545,431 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF __catch603_g_error: { GError* err = NULL; - GError* _tmp13_; - const gchar* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; -#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala" + GError* _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; +#line 1059 "/home/jens/Source/shotwell/src/SearchFilter.vala" err = _inner_error_; -#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1059 "/home/jens/Source/shotwell/src/SearchFilter.vala" _inner_error_ = NULL; -#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp13_ = err; -#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp14_ = _tmp13_->message; -#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp15_ = g_strdup_printf (_ ("Error loading search bar UI: %s"), _tmp14_); -#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp16_ = _tmp15_; -#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala" - app_window_panic (_tmp16_); -#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_free0 (_tmp16_); -#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp10_ = err; +#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp11_ = _tmp10_->message; +#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp12_ = g_strdup_printf (_ ("Error loading search bar UI: %s"), _tmp11_); +#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp13_ = _tmp12_; +#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala" + app_window_panic (_tmp13_); +#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_free0 (_tmp13_); +#line 1059 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_error_free0 (err); -#line 5170 "SearchFilter.c" +#line 5571 "SearchFilter.c" } __finally603: -#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1059 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1059 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1059 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_clear_error (&_inner_error_); -#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1059 "/home/jens/Source/shotwell/src/SearchFilter.vala" return NULL; -#line 5181 "SearchFilter.c" +#line 5582 "SearchFilter.c" } -#line 1069 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp17_ = self->priv->close_item; -#line 1069 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_menu_item_set_label (_tmp17_, _ ("Close")); -#line 1070 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp18_ = self->priv->close_item; -#line 1070 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget)); #line 1071 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp19_ = self->priv->close_item; + _tmp14_ = self->priv->close_item; #line 1071 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (_tmp19_, "activate", (GCallback) _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate, self, 0); + gtk_menu_item_set_label (_tmp14_, _ ("Close")); #line 1072 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp20_ = self->priv->close_menu; + _tmp15_ = self->priv->close_item; #line 1072 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp21_ = self->priv->close_item; -#line 1072 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_menu_shell_get_type (), GtkMenuShell), (GtkWidget*) _tmp21_); -#line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp22_ = search_filter_toolbar_label_tool_item_new (_ ("Type"), 10, 5); -#line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp22_); -#line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget)); +#line 1073 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp16_ = self->priv->close_item; +#line 1073 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_connect_object (_tmp16_, "activate", (GCallback) _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate, self, 0); +#line 1074 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp17_ = self->priv->close_menu; +#line 1074 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp18_ = self->priv->close_item; +#line 1074 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_menu_shell_get_type (), GtkMenuShell), _tmp18_); +#line 1077 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp19_ = search_filter_toolbar_label_tool_item_new (_ ("Type"), 10, 5); +#line 1077 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_object_ref_sink (_tmp19_); +#line 1077 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->label_type); -#line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->label_type = _tmp22_; -#line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp23_ = self->priv->toolbar; -#line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp24_ = self->priv->label_type; -#line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_toolbar_insert (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_item_get_type (), GtkToolItem), -1); +#line 1077 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->label_type = _tmp19_; #line 1078 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp25_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.photos"); + _tmp20_ = self->priv->toolbar; #line 1078 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp25_); + _tmp21_ = self->priv->label_type; #line 1078 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_toolbar_insert (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_tool_item_get_type (), GtkToolItem), -1); +#line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp22_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.photos"); +#line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_object_ref_sink (_tmp22_); +#line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->toolbtn_photos); -#line 1078 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->toolbtn_photos = _tmp25_; -#line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp26_ = self->priv->toolbtn_photos; -#line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_tool_item_get_type (), GtkToolItem), _ ("Photos")); -#line 1081 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp27_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.videos"); +#line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->toolbtn_photos = _tmp22_; #line 1081 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp27_); + _tmp23_ = self->priv->toolbtn_photos; #line 1081 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_tool_item_get_type (), GtkToolItem), _ ("Photos")); +#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp24_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.videos"); +#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_object_ref_sink (_tmp24_); +#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->toolbtn_videos); -#line 1081 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->toolbtn_videos = _tmp27_; -#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp28_ = self->priv->toolbtn_videos; -#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_tool_item_get_type (), GtkToolItem), _ ("Videos")); -#line 1084 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp29_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.raw"); +#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->toolbtn_videos = _tmp24_; #line 1084 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp29_); + _tmp25_ = self->priv->toolbtn_videos; #line 1084 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_tool_item_get_type (), GtkToolItem), _ ("Videos")); +#line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp26_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.raw"); +#line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_object_ref_sink (_tmp26_); +#line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->toolbtn_raw); -#line 1084 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->toolbtn_raw = _tmp29_; -#line 1085 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp30_ = self->priv->toolbtn_raw; -#line 1085 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_tool_item_get_type (), GtkToolItem), _ ("RAW Photos")); -#line 1087 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp31_ = self->priv->toolbar; +#line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->toolbtn_raw = _tmp26_; #line 1087 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp32_ = self->priv->toolbtn_photos; + _tmp27_ = self->priv->toolbtn_raw; #line 1087 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_toolbar_insert (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp33_ = self->priv->toolbar; -#line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp34_ = self->priv->toolbtn_videos; -#line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_toolbar_insert (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_tool_item_get_type (), GtkToolItem), -1); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_tool_item_get_type (), GtkToolItem), _ ("RAW Photos")); #line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp35_ = self->priv->toolbar; + _tmp28_ = self->priv->toolbar; #line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp36_ = self->priv->toolbtn_raw; + _tmp29_ = self->priv->toolbtn_photos; #line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_toolbar_insert (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_tool_item_get_type (), GtkToolItem), -1); +#line 1090 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp30_ = self->priv->toolbar; +#line 1090 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp31_ = self->priv->toolbtn_videos; +#line 1090 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_toolbar_insert (_tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_item_get_type (), GtkToolItem), -1); +#line 1091 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp32_ = self->priv->toolbar; +#line 1091 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp33_ = self->priv->toolbtn_raw; +#line 1091 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_toolbar_insert (_tmp32_, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tool_item_get_type (), GtkToolItem), -1); +#line 1094 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp34_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); +#line 1094 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_object_ref_sink (_tmp34_); +#line 1094 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_object_unref0 (self->priv->sepr_mediatype_flagged); +#line 1094 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->sepr_mediatype_flagged = _tmp34_; +#line 1095 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp35_ = self->priv->toolbar; +#line 1095 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp36_ = self->priv->sepr_mediatype_flagged; +#line 1095 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_toolbar_insert (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp37_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); -#line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1099 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp37_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.flagged"); +#line 1099 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_object_ref_sink (_tmp37_); -#line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_object_unref0 (self->priv->sepr_mediatype_flagged); -#line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->sepr_mediatype_flagged = _tmp37_; -#line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp38_ = self->priv->toolbar; -#line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp39_ = self->priv->sepr_mediatype_flagged; -#line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_toolbar_insert (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp40_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.flagged"); -#line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp40_); -#line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_object_unref0 (self->priv->toolbtn_flag); -#line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->toolbtn_flag = _tmp40_; -#line 1098 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp41_ = self->priv->toolbtn_flag; -#line 1098 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_toolbar_toggle_action_tool_button_set_label (_tmp41_, _ ("Flagged")); #line 1099 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp42_ = self->priv->toolbtn_flag; + _g_object_unref0 (self->priv->toolbtn_flag); #line 1099 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_tool_item_get_type (), GtkToolItem), _ ("Flagged")); -#line 1101 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp43_ = self->priv->toolbar; + self->priv->toolbtn_flag = _tmp37_; +#line 1100 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp38_ = self->priv->toolbtn_flag; +#line 1100 "/home/jens/Source/shotwell/src/SearchFilter.vala" + search_filter_toolbar_toggle_action_tool_button_set_label (_tmp38_, _ ("Flagged")); #line 1101 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp44_ = self->priv->toolbtn_flag; + _tmp39_ = self->priv->toolbtn_flag; #line 1101 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_toolbar_insert (_tmp43_, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 1104 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp45_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); -#line 1104 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp45_); -#line 1104 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tool_item_get_type (), GtkToolItem), _ ("Flagged")); +#line 1103 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp40_ = self->priv->toolbar; +#line 1103 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp41_ = self->priv->toolbtn_flag; +#line 1103 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_toolbar_insert (_tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_tool_item_get_type (), GtkToolItem), -1); +#line 1106 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp42_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); +#line 1106 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_object_ref_sink (_tmp42_); +#line 1106 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->sepr_flagged_rating); -#line 1104 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->sepr_flagged_rating = _tmp45_; -#line 1105 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp46_ = self->priv->toolbar; -#line 1105 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp47_ = self->priv->sepr_flagged_rating; -#line 1105 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_toolbar_insert (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp48_ = self->builder; -#line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp49_ = gtk_builder_get_object (_tmp48_, "popup-menu"); -#line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp50_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp49_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp49_) : NULL); -#line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala" - model = _tmp50_; -#line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp51_ = search_filter_toolbar_rating_filter_button_new (model); -#line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp51_); -#line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_object_unref0 (self->priv->rating_button); -#line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->rating_button = _tmp51_; +#line 1106 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->sepr_flagged_rating = _tmp42_; +#line 1107 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp43_ = self->priv->toolbar; +#line 1107 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp44_ = self->priv->sepr_flagged_rating; +#line 1107 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_toolbar_insert (_tmp43_, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 1110 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp52_ = self->priv->rating_button; + _tmp45_ = self->builder; +#line 1110 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp46_ = gtk_builder_get_object (_tmp45_, "popup-menu"); #line 1110 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_toolbar_rating_filter_button_set_label (_tmp52_, _ ("Rating")); + _tmp47_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp46_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp46_) : NULL); +#line 1110 "/home/jens/Source/shotwell/src/SearchFilter.vala" + model = _tmp47_; #line 1111 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp53_ = self->priv->rating_button; + _tmp48_ = search_filter_toolbar_rating_filter_button_new (model); #line 1111 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_tool_item_get_type (), GtkToolItem), FALSE); -#line 1112 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp54_ = self->priv->toolbar; + g_object_ref_sink (_tmp48_); +#line 1111 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_object_unref0 (self->priv->rating_button); +#line 1111 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->rating_button = _tmp48_; #line 1112 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp55_ = self->priv->rating_button; + _tmp49_ = self->priv->rating_button; #line 1112 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_toolbar_insert (_tmp54_, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 1115 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp56_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); -#line 1115 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp56_); -#line 1115 "/home/jens/Source/shotwell/src/SearchFilter.vala" + search_filter_toolbar_rating_filter_button_set_label (_tmp49_, _ ("Rating")); +#line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp50_ = self->priv->rating_button; +#line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_tool_item_get_type (), GtkToolItem), FALSE); +#line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp51_ = self->priv->toolbar; +#line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp52_ = self->priv->rating_button; +#line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_toolbar_insert (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_tool_item_get_type (), GtkToolItem), -1); +#line 1117 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp53_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); +#line 1117 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_object_ref_sink (_tmp53_); +#line 1117 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->sepr_rating_saved); -#line 1115 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->sepr_rating_saved = _tmp56_; -#line 1116 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp57_ = self->priv->toolbar; -#line 1116 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp58_ = self->priv->sepr_rating_saved; -#line 1116 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_toolbar_insert (_tmp57_, G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 1119 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp59_ = self->priv->saved_search_button; -#line 1119 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_tool_item_get_type (), GtkToolItem), FALSE); -#line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp60_ = self->priv->saved_search_button; -#line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_toolbar_saved_search_filter_button_set_label (_tmp60_, _ ("Saved Search")); +#line 1117 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->sepr_rating_saved = _tmp53_; +#line 1118 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp54_ = self->priv->toolbar; +#line 1118 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp55_ = self->priv->sepr_rating_saved; +#line 1118 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_toolbar_insert (_tmp54_, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 1121 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp61_ = self->priv->saved_search_button; + _tmp56_ = self->priv->saved_search_button; #line 1121 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_tool_item_get_type (), GtkToolItem), _ ("Use a saved search to filter items in the current view")); + gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_tool_item_get_type (), GtkToolItem), FALSE); #line 1122 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp62_ = self->priv->saved_search_button; + _tmp57_ = self->priv->saved_search_button; #line 1122 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (_tmp62_, "clicked", (GCallback) _search_filter_toolbar_on_saved_search_button_clicked_search_filter_toolbar_saved_search_filter_button_clicked, self, 0); -#line 1123 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp63_ = self->priv->toolbar; + search_filter_toolbar_saved_search_filter_button_set_label (_tmp57_, _ ("Saved Search")); #line 1123 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp64_ = self->priv->saved_search_button; + _tmp58_ = self->priv->saved_search_button; #line 1123 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_toolbar_insert (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 1126 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp65_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); -#line 1126 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp65_); -#line 1126 "/home/jens/Source/shotwell/src/SearchFilter.vala" - separator_align = _tmp65_; -#line 1127 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (separator_align, gtk_tool_item_get_type (), GtkToolItem), TRUE); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_tool_item_get_type (), GtkToolItem), _ ("Use a saved search to filter items in the current view")); +#line 1124 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp59_ = self->priv->saved_search_button; +#line 1124 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_connect_object (_tmp59_, "clicked", (GCallback) _search_filter_toolbar_on_saved_search_button_clicked_search_filter_toolbar_saved_search_filter_button_clicked, self, 0); +#line 1125 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp60_ = self->priv->toolbar; +#line 1125 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp61_ = self->priv->saved_search_button; +#line 1125 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_toolbar_insert (_tmp60_, G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 1128 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_separator_tool_item_set_draw (separator_align, FALSE); -#line 1129 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp66_ = self->priv->toolbar; + _tmp62_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); +#line 1128 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_object_ref_sink (_tmp62_); +#line 1128 "/home/jens/Source/shotwell/src/SearchFilter.vala" + separator_align = _tmp62_; #line 1129 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_toolbar_insert (_tmp66_, G_TYPE_CHECK_INSTANCE_CAST (separator_align, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 1132 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp67_ = self->priv->toolbar; -#line 1132 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp68_ = self->priv->search_box; -#line 1132 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_toolbar_insert (_tmp67_, G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_tool_item_get_type (), GtkToolItem), -1); + gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (separator_align, gtk_tool_item_get_type (), GtkToolItem), TRUE); +#line 1130 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_separator_tool_item_set_draw (separator_align, FALSE); +#line 1131 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp63_ = self->priv->toolbar; +#line 1131 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_toolbar_insert (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (separator_align, gtk_tool_item_get_type (), GtkToolItem), -1); #line 1134 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp69_ = self->priv->toolbar; + _tmp64_ = self->priv->toolbar; #line 1134 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget)); -#line 1137 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp70_ = actions; -#line 1137 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (_tmp70_, "flagged-toggled", (GCallback) _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled, self, 0); -#line 1138 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp71_ = actions; -#line 1138 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (_tmp71_, "photos-toggled", (GCallback) _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled, self, 0); -#line 1139 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp72_ = actions; + _tmp65_ = self->priv->search_box; +#line 1134 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_toolbar_insert (_tmp64_, G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_tool_item_get_type (), GtkToolItem), -1); +#line 1136 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp66_ = self->priv->toolbar; +#line 1136 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget)); #line 1139 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (_tmp72_, "videos-toggled", (GCallback) _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled, self, 0); + g_signal_connect_object (actions, "flagged-toggled", (GCallback) _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled, self, 0); #line 1140 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp73_ = actions; -#line 1140 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (_tmp73_, "raw-toggled", (GCallback) _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled, self, 0); -#line 1141 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp74_ = actions; + g_signal_connect_object (actions, "photos-toggled", (GCallback) _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled, self, 0); #line 1141 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (_tmp74_, "rating-changed", (GCallback) _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed, self, 0); + g_signal_connect_object (actions, "videos-toggled", (GCallback) _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled, self, 0); #line 1142 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp75_ = actions; -#line 1142 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (_tmp75_, "text-changed", (GCallback) _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed, self, 0); -#line 1143 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp76_ = actions; + g_signal_connect_object (actions, "raw-toggled", (GCallback) _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled, self, 0); #line 1143 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (_tmp76_, "criteria-changed", (GCallback) _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed, self, 0); -#line 1146 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp77_ = self->priv->toolbar; -#line 1146 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (_tmp77_, "popup-context-menu", (GCallback) _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu, self, 0); -#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp78_ = actions; -#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp79_ = search_filter_actions_get_has_photos (_tmp78_); -#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp80_ = actions; -#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp81_ = search_filter_actions_get_has_videos (_tmp80_); + g_signal_connect_object (actions, "rating-changed", (GCallback) _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed, self, 0); +#line 1144 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_connect_object (actions, "text-changed", (GCallback) _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed, self, 0); +#line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_connect_object (actions, "criteria-changed", (GCallback) _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed, self, 0); #line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp82_ = actions; -#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp83_ = search_filter_actions_get_has_raw (_tmp82_); -#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp84_ = actions; -#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp85_ = search_filter_actions_get_has_flagged (_tmp84_); + _tmp67_ = self->priv->toolbar; #line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_toolbar_on_media_context_changed (self, _tmp79_, _tmp81_, _tmp83_, _tmp85_); -#line 1048 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_connect_object (_tmp67_, "popup-context-menu", (GCallback) _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu, self, 0); +#line 1150 "/home/jens/Source/shotwell/src/SearchFilter.vala" + search_filter_toolbar_on_media_context_changed (self, search_filter_actions_get_has_photos (actions), search_filter_actions_get_has_videos (actions), search_filter_actions_get_has_raw (actions), search_filter_actions_get_has_flagged (actions)); +#line 1050 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (separator_align); -#line 1048 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1050 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (model); -#line 1048 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1050 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 5465 "SearchFilter.c" +#line 5836 "SearchFilter.c" } -SearchFilterToolbar* search_filter_toolbar_new (SearchFilterActions* actions) { -#line 1048 "/home/jens/Source/shotwell/src/SearchFilter.vala" +SearchFilterToolbar* +search_filter_toolbar_new (SearchFilterActions* actions) +{ +#line 1050 "/home/jens/Source/shotwell/src/SearchFilter.vala" return search_filter_toolbar_construct (TYPE_SEARCH_FILTER_TOOLBAR, actions); -#line 5472 "SearchFilter.c" +#line 5845 "SearchFilter.c" } -static void search_filter_toolbar_on_media_context_changed (SearchFilterToolbar* self, gboolean has_photos, gboolean has_videos, gboolean has_raw, gboolean has_flagged) { +static void +search_filter_toolbar_on_media_context_changed (SearchFilterToolbar* self, + gboolean has_photos, + gboolean has_videos, + gboolean has_raw, + gboolean has_flagged) +{ gboolean _tmp0_ = FALSE; - gboolean _tmp1_; - gboolean _tmp5_; - gboolean _tmp8_; - gboolean _tmp11_; -#line 1167 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); -#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = has_photos; -#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp1_) { #line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); +#line 1171 "/home/jens/Source/shotwell/src/SearchFilter.vala" + if (has_photos) { +#line 1171 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = TRUE; -#line 5490 "SearchFilter.c" +#line 5863 "SearchFilter.c" } else { - gboolean _tmp2_; -#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = has_raw; -#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = _tmp2_; -#line 5497 "SearchFilter.c" +#line 1171 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp0_ = has_raw; +#line 5867 "SearchFilter.c" } -#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1171 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp0_) { -#line 5501 "SearchFilter.c" - SearchFilterToolbarToggleActionToolButton* _tmp3_; -#line 1172 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = self->priv->toolbtn_photos; -#line 1172 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp3_, RESOURCES_ICON_FILTER_PHOTOS); -#line 5507 "SearchFilter.c" - } else { - SearchFilterToolbarToggleActionToolButton* _tmp4_; +#line 5871 "SearchFilter.c" + SearchFilterToolbarToggleActionToolButton* _tmp1_; #line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = self->priv->toolbtn_photos; + _tmp1_ = self->priv->toolbtn_photos; #line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp4_, RESOURCES_ICON_FILTER_PHOTOS_DISABLED); -#line 5514 "SearchFilter.c" - } + search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp1_, RESOURCES_ICON_FILTER_PHOTOS); +#line 5877 "SearchFilter.c" + } else { + SearchFilterToolbarToggleActionToolButton* _tmp2_; #line 1176 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = has_videos; + _tmp2_ = self->priv->toolbtn_photos; #line 1176 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp5_) { -#line 5520 "SearchFilter.c" - SearchFilterToolbarToggleActionToolButton* _tmp6_; -#line 1177 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = self->priv->toolbtn_videos; -#line 1177 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp6_, RESOURCES_ICON_FILTER_VIDEOS); -#line 5526 "SearchFilter.c" - } else { - SearchFilterToolbarToggleActionToolButton* _tmp7_; + search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp2_, RESOURCES_ICON_FILTER_PHOTOS_DISABLED); +#line 5884 "SearchFilter.c" + } +#line 1178 "/home/jens/Source/shotwell/src/SearchFilter.vala" + if (has_videos) { +#line 5888 "SearchFilter.c" + SearchFilterToolbarToggleActionToolButton* _tmp3_; #line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp7_ = self->priv->toolbtn_videos; + _tmp3_ = self->priv->toolbtn_videos; #line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp7_, RESOURCES_ICON_FILTER_VIDEOS_DISABLED); -#line 5533 "SearchFilter.c" - } + search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp3_, RESOURCES_ICON_FILTER_VIDEOS); +#line 5894 "SearchFilter.c" + } else { + SearchFilterToolbarToggleActionToolButton* _tmp4_; #line 1181 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = has_raw; + _tmp4_ = self->priv->toolbtn_videos; #line 1181 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp8_) { -#line 5539 "SearchFilter.c" - SearchFilterToolbarToggleActionToolButton* _tmp9_; -#line 1182 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp9_ = self->priv->toolbtn_raw; -#line 1182 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp9_, RESOURCES_ICON_FILTER_RAW); -#line 5545 "SearchFilter.c" - } else { - SearchFilterToolbarToggleActionToolButton* _tmp10_; + search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp4_, RESOURCES_ICON_FILTER_VIDEOS_DISABLED); +#line 5901 "SearchFilter.c" + } +#line 1183 "/home/jens/Source/shotwell/src/SearchFilter.vala" + if (has_raw) { +#line 5905 "SearchFilter.c" + SearchFilterToolbarToggleActionToolButton* _tmp5_; #line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp10_ = self->priv->toolbtn_raw; + _tmp5_ = self->priv->toolbtn_raw; #line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp10_, RESOURCES_ICON_FILTER_RAW_DISABLED); -#line 5552 "SearchFilter.c" - } + search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp5_, RESOURCES_ICON_FILTER_RAW); +#line 5911 "SearchFilter.c" + } else { + SearchFilterToolbarToggleActionToolButton* _tmp6_; #line 1186 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp11_ = has_flagged; + _tmp6_ = self->priv->toolbtn_raw; #line 1186 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp11_) { -#line 5558 "SearchFilter.c" - SearchFilterToolbarToggleActionToolButton* _tmp12_; -#line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp12_ = self->priv->toolbtn_flag; -#line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp12_, RESOURCES_ICON_FILTER_FLAGGED); -#line 5564 "SearchFilter.c" - } else { - SearchFilterToolbarToggleActionToolButton* _tmp13_; + search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp6_, RESOURCES_ICON_FILTER_RAW_DISABLED); +#line 5918 "SearchFilter.c" + } +#line 1188 "/home/jens/Source/shotwell/src/SearchFilter.vala" + if (has_flagged) { +#line 5922 "SearchFilter.c" + SearchFilterToolbarToggleActionToolButton* _tmp7_; #line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp13_ = self->priv->toolbtn_flag; + _tmp7_ = self->priv->toolbtn_flag; #line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp13_, RESOURCES_ICON_FILTER_FLAGGED_DISABLED); -#line 5571 "SearchFilter.c" + search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp7_, RESOURCES_ICON_FILTER_FLAGGED); +#line 5928 "SearchFilter.c" + } else { + SearchFilterToolbarToggleActionToolButton* _tmp8_; +#line 1191 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp8_ = self->priv->toolbtn_flag; +#line 1191 "/home/jens/Source/shotwell/src/SearchFilter.vala" + search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp8_, RESOURCES_ICON_FILTER_FLAGGED_DISABLED); +#line 5935 "SearchFilter.c" } } -static gboolean search_filter_toolbar_on_context_menu_requested (SearchFilterToolbar* self, gint x, gint y, gint button) { +static gboolean +search_filter_toolbar_on_context_menu_requested (SearchFilterToolbar* self, + gint x, + gint y, + gint button) +{ gboolean result = FALSE; GtkMenu* _tmp0_; - gint _tmp1_; - guint32 _tmp2_; -#line 1193 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1195 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (IS_SEARCH_FILTER_TOOLBAR (self), FALSE); -#line 1194 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1196 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->close_menu; -#line 1194 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = button; -#line 1194 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = gtk_get_current_event_time (); -#line 1194 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, (guint) _tmp1_, _tmp2_); -#line 1195 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1196 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, (guint) button, gtk_get_current_event_time ()); +#line 1197 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = FALSE; -#line 1195 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1197 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 5595 "SearchFilter.c" +#line 5958 "SearchFilter.c" } -static GVariant* _variant_new39 (gboolean value) { -#line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static GVariant* +_variant_new39 (gboolean value) +{ +#line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 5602 "SearchFilter.c" +#line 5967 "SearchFilter.c" } -static void search_filter_toolbar_on_context_menu_close_chosen (SearchFilterToolbar* self) { +static void +search_filter_toolbar_on_context_menu_close_chosen (SearchFilterToolbar* self) +{ AppWindow* aw = NULL; LibraryWindow* _tmp0_; GSimpleAction* action = NULL; @@ -5610,98 +5977,112 @@ static void search_filter_toolbar_on_context_menu_close_chosen (SearchFilterTool GAction* _tmp2_; GSimpleAction* _tmp3_; GSimpleAction* _tmp4_; -#line 1200 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1202 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); -#line 1201 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1203 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = library_window_get_app (); -#line 1201 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1203 "/home/jens/Source/shotwell/src/SearchFilter.vala" aw = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_APP_WINDOW, AppWindow); -#line 1206 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1208 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = aw; -#line 1206 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1208 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar"); -#line 1206 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1208 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL); -#line 1206 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1208 "/home/jens/Source/shotwell/src/SearchFilter.vala" action = _tmp3_; -#line 1210 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4_ = action; -#line 1210 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp4_ != NULL) { -#line 5632 "SearchFilter.c" +#line 5999 "SearchFilter.c" GSimpleAction* _tmp5_; GVariant* _tmp6_; -#line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = action; -#line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp6_ = _variant_new39 (FALSE); -#line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (_tmp5_, "change-state", _tmp6_); -#line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_variant_unref0 (_tmp6_); -#line 5643 "SearchFilter.c" +#line 6010 "SearchFilter.c" } -#line 1200 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1202 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (action); -#line 1200 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1202 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (aw); -#line 5649 "SearchFilter.c" +#line 6016 "SearchFilter.c" } -static void search_filter_toolbar_on_flagged_toggled (SearchFilterToolbar* self) { -#line 1216 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_on_flagged_toggled (SearchFilterToolbar* self) +{ +#line 1218 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); -#line 1217 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1219 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_update (self); -#line 5658 "SearchFilter.c" +#line 6027 "SearchFilter.c" } -static void search_filter_toolbar_on_videos_toggled (SearchFilterToolbar* self) { -#line 1220 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_on_videos_toggled (SearchFilterToolbar* self) +{ +#line 1222 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); -#line 1221 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1223 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_update (self); -#line 5667 "SearchFilter.c" +#line 6038 "SearchFilter.c" } -static void search_filter_toolbar_on_photos_toggled (SearchFilterToolbar* self) { -#line 1224 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_on_photos_toggled (SearchFilterToolbar* self) +{ +#line 1226 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); -#line 1225 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1227 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_update (self); -#line 5676 "SearchFilter.c" +#line 6049 "SearchFilter.c" } -static void search_filter_toolbar_on_raw_toggled (SearchFilterToolbar* self) { -#line 1228 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_on_raw_toggled (SearchFilterToolbar* self) +{ +#line 1230 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); -#line 1229 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1231 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_update (self); -#line 5685 "SearchFilter.c" +#line 6060 "SearchFilter.c" } -static void search_filter_toolbar_on_search_text_changed (SearchFilterToolbar* self) { -#line 1232 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_on_search_text_changed (SearchFilterToolbar* self) +{ +#line 1234 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); -#line 1233 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1235 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_update (self); -#line 5694 "SearchFilter.c" +#line 6071 "SearchFilter.c" } -static GVariant* _variant_new40 (gboolean value) { -#line 1247 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static GVariant* +_variant_new40 (gboolean value) +{ +#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 5701 "SearchFilter.c" +#line 6080 "SearchFilter.c" } -static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self) { +static void +search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self) +{ AppWindow* aw = NULL; LibraryWindow* _tmp0_; AppWindow* _tmp1_; @@ -5710,146 +6091,139 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self) GAction* _tmp3_; GSimpleAction* _tmp4_; GSimpleAction* _tmp5_; -#line 1236 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); -#line 1237 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1239 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = library_window_get_app (); -#line 1237 "/home/jens/Source/shotwell/src/SearchFilter.vala" - aw = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_APP_WINDOW, AppWindow); #line 1239 "/home/jens/Source/shotwell/src/SearchFilter.vala" + aw = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_APP_WINDOW, AppWindow); +#line 1241 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = aw; -#line 1239 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1241 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp1_ == NULL) { -#line 1240 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (aw); -#line 1240 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala" return; -#line 5728 "SearchFilter.c" +#line 6109 "SearchFilter.c" } -#line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1244 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = aw; -#line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1244 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar"); -#line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1244 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp3_) : NULL); -#line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1244 "/home/jens/Source/shotwell/src/SearchFilter.vala" action = _tmp4_; -#line 1246 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1248 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = action; -#line 1246 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1248 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp5_ != NULL) { -#line 5742 "SearchFilter.c" +#line 6123 "SearchFilter.c" GSimpleAction* _tmp6_; GVariant* _tmp7_; -#line 1247 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp6_ = action; -#line 1247 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp7_ = _variant_new40 (TRUE); -#line 1247 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (_tmp6_, "change-state", _tmp7_); -#line 1247 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_variant_unref0 (_tmp7_); -#line 5753 "SearchFilter.c" +#line 6134 "SearchFilter.c" } -#line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1252 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_update (self); -#line 1236 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (action); -#line 1236 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (aw); -#line 5761 "SearchFilter.c" +#line 6142 "SearchFilter.c" } -static void search_filter_toolbar_on_criteria_changed (SearchFilterToolbar* self) { -#line 1256 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_on_criteria_changed (SearchFilterToolbar* self) +{ +#line 1258 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); -#line 1257 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1259 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_update (self); -#line 5770 "SearchFilter.c" +#line 6153 "SearchFilter.c" } -static gpointer _view_filter_ref0 (gpointer self) { -#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static gpointer +_view_filter_ref0 (gpointer self) +{ +#line 1266 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self ? view_filter_ref (self) : NULL; -#line 5777 "SearchFilter.c" +#line 6162 "SearchFilter.c" } -void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchViewFilter* search_filter) { +void +search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, + SearchViewFilter* search_filter) +{ SearchViewFilter* _tmp0_; SearchViewFilter* _tmp1_; - SearchViewFilter* _tmp2_; - SearchViewFilter* _tmp3_; - SearchFilterActions* _tmp4_; - SearchViewFilter* _tmp5_; - guint _tmp6_; - SearchFilterToolbarRatingFilterButton* _tmp7_; - SearchViewFilter* _tmp8_; - guint _tmp9_; -#line 1260 "/home/jens/Source/shotwell/src/SearchFilter.vala" + SearchFilterActions* _tmp2_; + SearchFilterToolbarRatingFilterButton* _tmp3_; +#line 1262 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); -#line 1260 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_return_if_fail (IS_SEARCH_VIEW_FILTER (search_filter)); -#line 1261 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = search_filter; -#line 1261 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = self->priv->search_filter; -#line 1261 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp0_ == _tmp1_) { #line 1262 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_return_if_fail (IS_SEARCH_VIEW_FILTER (search_filter)); +#line 1263 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp0_ = self->priv->search_filter; +#line 1263 "/home/jens/Source/shotwell/src/SearchFilter.vala" + if (search_filter == _tmp0_) { +#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala" return; -#line 5804 "SearchFilter.c" +#line 6184 "SearchFilter.c" } -#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = search_filter; -#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = _view_filter_ref0 (_tmp2_); -#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1266 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp1_ = _view_filter_ref0 (search_filter); +#line 1266 "/home/jens/Source/shotwell/src/SearchFilter.vala" _view_filter_unref0 (self->priv->search_filter); -#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->search_filter = _tmp3_; -#line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = self->priv->actions; -#line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = search_filter; -#line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = search_view_filter_get_criteria (_tmp5_); -#line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_actions_set_sensitive_for_search_criteria (_tmp4_, (SearchFilterCriteria) _tmp6_); -#line 1268 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp7_ = self->priv->rating_button; -#line 1268 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = search_filter; -#line 1268 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp9_ = search_view_filter_get_criteria (_tmp8_); -#line 1268 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), (SEARCH_FILTER_CRITERIA_RATING & _tmp9_) != 0); +#line 1266 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->search_filter = _tmp1_; +#line 1269 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp2_ = self->priv->actions; +#line 1269 "/home/jens/Source/shotwell/src/SearchFilter.vala" + search_filter_actions_set_sensitive_for_search_criteria (_tmp2_, (SearchFilterCriteria) search_view_filter_get_criteria (search_filter)); #line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp3_ = self->priv->rating_button; +#line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), (SEARCH_FILTER_CRITERIA_RATING & search_view_filter_get_criteria (search_filter)) != 0); +#line 1272 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_update (self); -#line 5832 "SearchFilter.c" +#line 6202 "SearchFilter.c" } -void search_filter_toolbar_unset_view_filter (SearchFilterToolbar* self) { +void +search_filter_toolbar_unset_view_filter (SearchFilterToolbar* self) +{ DisabledViewFilter* _tmp0_; DisabledViewFilter* _tmp1_; -#line 1273 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1275 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); -#line 1274 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1276 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = disabled_view_filter_new (); -#line 1274 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1276 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = _tmp0_; -#line 1274 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1276 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_set_view_filter (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 1274 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1276 "/home/jens/Source/shotwell/src/SearchFilter.vala" _view_filter_unref0 (_tmp1_); -#line 5849 "SearchFilter.c" +#line 6221 "SearchFilter.c" } -void search_filter_toolbar_update (SearchFilterToolbar* self) { +void +search_filter_toolbar_update (SearchFilterToolbar* self) +{ SearchViewFilter* _tmp0_; SearchViewFilter* _tmp3_; SearchViewFilter* _tmp4_; @@ -5864,627 +6238,629 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) { GSimpleAction* _tmp13_; GVariant* _tmp14_; GVariant* _tmp15_; - gboolean _tmp16_; - SearchViewFilter* _tmp17_; - SearchFilterActions* _tmp18_; + SearchViewFilter* _tmp16_; + SearchFilterActions* _tmp17_; + GSimpleAction* _tmp18_; GSimpleAction* _tmp19_; - GSimpleAction* _tmp20_; + GVariant* _tmp20_; GVariant* _tmp21_; - GVariant* _tmp22_; - gboolean _tmp23_; - SearchViewFilter* _tmp24_; - SearchFilterActions* _tmp25_; - GSimpleAction* _tmp26_; - GSimpleAction* _tmp27_; - GVariant* _tmp28_; - GVariant* _tmp29_; - gboolean _tmp30_; - SearchViewFilter* _tmp31_; - SearchFilterActions* _tmp32_; - GSimpleAction* _tmp33_; - GSimpleAction* _tmp34_; - GVariant* _tmp35_; - GVariant* _tmp36_; - gboolean _tmp37_; + SearchViewFilter* _tmp22_; + SearchFilterActions* _tmp23_; + GSimpleAction* _tmp24_; + GSimpleAction* _tmp25_; + GVariant* _tmp26_; + GVariant* _tmp27_; + SearchViewFilter* _tmp28_; + SearchFilterActions* _tmp29_; + GSimpleAction* _tmp30_; + GSimpleAction* _tmp31_; + GVariant* _tmp32_; + GVariant* _tmp33_; RatingFilter filter = 0; - SearchFilterActions* _tmp38_; - GSimpleAction* _tmp39_; - GSimpleAction* _tmp40_; - GVariant* _tmp41_; - GVariant* _tmp42_; - const gchar* _tmp43_; - gint _tmp44_; - RatingFilter _tmp45_; - SearchViewFilter* _tmp46_; - RatingFilter _tmp47_; - SearchFilterToolbarRatingFilterButton* _tmp48_; - RatingFilter _tmp49_; - SearchViewFilter* _tmp50_; - SavedSearch* _tmp51_; + SearchFilterActions* _tmp34_; + GSimpleAction* _tmp35_; + GSimpleAction* _tmp36_; + GVariant* _tmp37_; + GVariant* _tmp38_; + const gchar* _tmp39_; + RatingFilter _tmp40_; + SearchViewFilter* _tmp41_; + RatingFilter _tmp42_; + SearchFilterToolbarRatingFilterButton* _tmp43_; + RatingFilter _tmp44_; + SearchViewFilter* _tmp45_; + SavedSearch* _tmp46_; SearchFilterCriteria criteria = 0; - SearchFilterActions* _tmp52_; + SearchFilterActions* _tmp47_; + SearchFilterToolbarSearchBox* _tmp48_; + SearchFilterCriteria _tmp49_; + SearchFilterToolbarRatingFilterButton* _tmp50_; + SearchFilterCriteria _tmp51_; + SearchFilterToolbarToggleActionToolButton* _tmp52_; SearchFilterCriteria _tmp53_; - SearchFilterToolbarSearchBox* _tmp54_; + SearchFilterToolbarLabelToolItem* _tmp54_; SearchFilterCriteria _tmp55_; - SearchFilterToolbarRatingFilterButton* _tmp56_; + SearchFilterToolbarToggleActionToolButton* _tmp56_; SearchFilterCriteria _tmp57_; SearchFilterToolbarToggleActionToolButton* _tmp58_; SearchFilterCriteria _tmp59_; - SearchFilterToolbarLabelToolItem* _tmp60_; + SearchFilterToolbarToggleActionToolButton* _tmp60_; SearchFilterCriteria _tmp61_; - SearchFilterToolbarToggleActionToolButton* _tmp62_; + SearchFilterToolbarSavedSearchFilterButton* _tmp62_; SearchFilterCriteria _tmp63_; - SearchFilterToolbarToggleActionToolButton* _tmp64_; - SearchFilterCriteria _tmp65_; - SearchFilterToolbarToggleActionToolButton* _tmp66_; - SearchFilterCriteria _tmp67_; - SearchFilterToolbarSavedSearchFilterButton* _tmp68_; - SearchFilterCriteria _tmp69_; - gboolean _tmp70_ = FALSE; - SearchFilterToolbarLabelToolItem* _tmp71_; - gboolean _tmp72_; - gboolean _tmp73_; - GtkSeparatorToolItem* _tmp77_; - gboolean _tmp78_ = FALSE; - gboolean _tmp79_ = FALSE; - SearchFilterToolbarLabelToolItem* _tmp80_; - gboolean _tmp81_; - gboolean _tmp82_; - GtkSeparatorToolItem* _tmp93_; - SearchViewFilter* _tmp94_; -#line 1278 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gboolean _tmp64_ = FALSE; + SearchFilterToolbarLabelToolItem* _tmp65_; + gboolean _tmp66_; + gboolean _tmp67_; + GtkSeparatorToolItem* _tmp71_; + gboolean _tmp72_ = FALSE; + gboolean _tmp73_ = FALSE; + SearchFilterToolbarLabelToolItem* _tmp74_; + gboolean _tmp75_; + gboolean _tmp76_; + GtkSeparatorToolItem* _tmp87_; + SearchViewFilter* _tmp88_; +#line 1280 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); -#line 1279 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->search_filter; -#line 1279 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (NULL == _tmp0_) { -#line 5942 "SearchFilter.c" +#line 6310 "SearchFilter.c" LibraryWindow* _tmp1_; LibraryWindow* _tmp2_; -#line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1283 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = library_window_get_app (); -#line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1283 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = _tmp1_; -#line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1283 "/home/jens/Source/shotwell/src/SearchFilter.vala" library_window_show_search_bar (_tmp2_, TRUE); -#line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1283 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (_tmp2_); -#line 5953 "SearchFilter.c" +#line 6321 "SearchFilter.c" } -#line 1284 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = self->priv->search_filter; -#line 1284 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _vala_assert (NULL != _tmp3_, "null != search_filter"); #line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _vala_assert (NULL != _tmp3_, "null != search_filter"); +#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4_ = self->priv->search_filter; -#line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = self->priv->actions; -#line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp6_ = search_filter_actions_get_text (_tmp5_); -#line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp7_ = _tmp6_; -#line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp8_ = text_action_get_value (_tmp7_); -#line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp9_ = _tmp8_; -#line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_view_filter_set_search_filter (_tmp4_, _tmp9_); -#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp10_ = self->priv->search_filter; -#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp11_ = self->priv->actions; -#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp12_ = search_filter_actions_get_flagged (_tmp11_); -#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp13_ = _tmp12_; -#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp14_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, g_action_get_type (), GAction)); -#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp15_ = _tmp14_; -#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp16_ = g_variant_get_boolean (_tmp15_); -#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_view_filter_set_flagged (_tmp10_, _tmp16_); -#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala" + search_view_filter_set_flagged (_tmp10_, g_variant_get_boolean (_tmp15_)); +#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_variant_unref0 (_tmp15_); -#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp17_ = self->priv->search_filter; -#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp18_ = self->priv->actions; -#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp19_ = search_filter_actions_get_videos (_tmp18_); -#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp20_ = _tmp19_; -#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp21_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, g_action_get_type (), GAction)); -#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp22_ = _tmp21_; -#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp23_ = g_variant_get_boolean (_tmp22_); -#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_view_filter_set_show_media_video (_tmp17_, _tmp23_); -#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_variant_unref0 (_tmp22_); #line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp24_ = self->priv->search_filter; + _tmp16_ = self->priv->search_filter; #line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp25_ = self->priv->actions; + _tmp17_ = self->priv->actions; #line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp26_ = search_filter_actions_get_photos (_tmp25_); + _tmp18_ = search_filter_actions_get_videos (_tmp17_); #line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp27_ = _tmp26_; -#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp28_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, g_action_get_type (), GAction)); + _tmp19_ = _tmp18_; #line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp29_ = _tmp28_; + _tmp20_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, g_action_get_type (), GAction)); #line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp30_ = g_variant_get_boolean (_tmp29_); + _tmp21_ = _tmp20_; #line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_view_filter_set_show_media_photos (_tmp24_, _tmp30_); + search_view_filter_set_show_media_video (_tmp16_, g_variant_get_boolean (_tmp21_)); #line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_variant_unref0 (_tmp29_); -#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp31_ = self->priv->search_filter; + _g_variant_unref0 (_tmp21_); #line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp32_ = self->priv->actions; + _tmp22_ = self->priv->search_filter; #line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp33_ = search_filter_actions_get_raw (_tmp32_); + _tmp23_ = self->priv->actions; #line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp34_ = _tmp33_; + _tmp24_ = search_filter_actions_get_photos (_tmp23_); #line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp35_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, g_action_get_type (), GAction)); + _tmp25_ = _tmp24_; #line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp36_ = _tmp35_; + _tmp26_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, g_action_get_type (), GAction)); #line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp37_ = g_variant_get_boolean (_tmp36_); + _tmp27_ = _tmp26_; #line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_view_filter_set_show_media_raw (_tmp31_, _tmp37_); + search_view_filter_set_show_media_photos (_tmp22_, g_variant_get_boolean (_tmp27_)); #line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_variant_unref0 (_tmp36_); -#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp38_ = self->priv->actions; -#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp39_ = search_filter_actions_get_rating (_tmp38_); + _g_variant_unref0 (_tmp27_); #line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp40_ = _tmp39_; + _tmp28_ = self->priv->search_filter; #line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp41_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, g_action_get_type (), GAction)); + _tmp29_ = self->priv->actions; #line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp42_ = _tmp41_; + _tmp30_ = search_filter_actions_get_raw (_tmp29_); #line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp43_ = g_variant_get_string (_tmp42_, NULL); + _tmp31_ = _tmp30_; #line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp44_ = atoi (_tmp43_); + _tmp32_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_action_get_type (), GAction)); #line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp45_ = (RatingFilter) _tmp44_; + _tmp33_ = _tmp32_; #line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_variant_unref0 (_tmp42_); + search_view_filter_set_show_media_raw (_tmp28_, g_variant_get_boolean (_tmp33_)); #line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala" - filter = _tmp45_; -#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp46_ = self->priv->search_filter; -#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp47_ = filter; -#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_view_filter_set_rating_filter (_tmp46_, _tmp47_); + _g_variant_unref0 (_tmp33_); +#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp34_ = self->priv->actions; +#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp35_ = search_filter_actions_get_rating (_tmp34_); +#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp36_ = _tmp35_; #line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp48_ = self->priv->rating_button; + _tmp37_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, g_action_get_type (), GAction)); #line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp49_ = filter; + _tmp38_ = _tmp37_; #line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_toolbar_rating_filter_button_set_filter_icon (_tmp48_, _tmp49_); + _tmp39_ = g_variant_get_string (_tmp38_, NULL); +#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp40_ = (RatingFilter) atoi (_tmp39_); +#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_variant_unref0 (_tmp38_); +#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala" + filter = _tmp40_; +#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp41_ = self->priv->search_filter; +#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp42_ = filter; +#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala" + search_view_filter_set_rating_filter (_tmp41_, _tmp42_); #line 1298 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp50_ = self->priv->search_filter; + _tmp43_ = self->priv->rating_button; #line 1298 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp51_ = self->priv->saved_search; + _tmp44_ = filter; #line 1298 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_view_filter_set_saved_search (_tmp50_, _tmp51_); -#line 1302 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp52_ = self->priv->actions; -#line 1302 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp53_ = search_filter_actions_get_criteria (_tmp52_); -#line 1302 "/home/jens/Source/shotwell/src/SearchFilter.vala" - criteria = _tmp53_; -#line 1304 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp54_ = self->priv->search_box; + search_filter_toolbar_rating_filter_button_set_filter_icon (_tmp43_, _tmp44_); +#line 1300 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp45_ = self->priv->search_filter; +#line 1300 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp46_ = self->priv->saved_search; +#line 1300 "/home/jens/Source/shotwell/src/SearchFilter.vala" + search_view_filter_set_saved_search (_tmp45_, _tmp46_); #line 1304 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp55_ = criteria; + _tmp47_ = self->priv->actions; #line 1304 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), (_tmp55_ & SEARCH_FILTER_CRITERIA_TEXT) != 0); + criteria = search_filter_actions_get_criteria (_tmp47_); #line 1306 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp56_ = self->priv->rating_button; + _tmp48_ = self->priv->search_box; #line 1306 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp57_ = criteria; + _tmp49_ = criteria; #line 1306 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_widget_get_type (), GtkWidget), (_tmp57_ & SEARCH_FILTER_CRITERIA_RATING) != 0); + gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget), (_tmp49_ & SEARCH_FILTER_CRITERIA_TEXT) != 0); #line 1308 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp58_ = self->priv->toolbtn_flag; + _tmp50_ = self->priv->rating_button; #line 1308 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp59_ = criteria; + _tmp51_ = criteria; #line 1308 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), (_tmp59_ & SEARCH_FILTER_CRITERIA_FLAG) != 0); + gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), (_tmp51_ & SEARCH_FILTER_CRITERIA_RATING) != 0); #line 1310 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp60_ = self->priv->label_type; + _tmp52_ = self->priv->toolbtn_flag; #line 1310 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp61_ = criteria; + _tmp53_ = criteria; #line 1310 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), (_tmp61_ & SEARCH_FILTER_CRITERIA_MEDIA) != 0); -#line 1311 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp62_ = self->priv->toolbtn_photos; -#line 1311 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp63_ = criteria; -#line 1311 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), (_tmp63_ & SEARCH_FILTER_CRITERIA_MEDIA) != 0); + gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), (_tmp53_ & SEARCH_FILTER_CRITERIA_FLAG) != 0); #line 1312 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp64_ = self->priv->toolbtn_videos; + _tmp54_ = self->priv->label_type; #line 1312 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp65_ = criteria; + _tmp55_ = criteria; #line 1312 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), (_tmp65_ & SEARCH_FILTER_CRITERIA_MEDIA) != 0); + gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), (_tmp55_ & SEARCH_FILTER_CRITERIA_MEDIA) != 0); #line 1313 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp66_ = self->priv->toolbtn_raw; + _tmp56_ = self->priv->toolbtn_photos; #line 1313 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp67_ = criteria; + _tmp57_ = criteria; #line 1313 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), (_tmp67_ & SEARCH_FILTER_CRITERIA_MEDIA) != 0); + gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_widget_get_type (), GtkWidget), (_tmp57_ & SEARCH_FILTER_CRITERIA_MEDIA) != 0); +#line 1314 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp58_ = self->priv->toolbtn_videos; +#line 1314 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp59_ = criteria; +#line 1314 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), (_tmp59_ & SEARCH_FILTER_CRITERIA_MEDIA) != 0); #line 1315 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp68_ = self->priv->saved_search_button; + _tmp60_ = self->priv->toolbtn_raw; #line 1315 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp69_ = criteria; + _tmp61_ = criteria; #line 1315 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_widget_get_type (), GtkWidget), (_tmp69_ & SEARCH_FILTER_CRITERIA_SAVEDSEARCH) != 0); -#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp71_ = self->priv->label_type; -#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp72_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget)); -#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp73_ = _tmp72_; -#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp73_) { -#line 6145 "SearchFilter.c" - SearchFilterToolbarToggleActionToolButton* _tmp74_; - gboolean _tmp75_; - gboolean _tmp76_; -#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp74_ = self->priv->toolbtn_flag; -#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp75_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget)); -#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp76_ = _tmp75_; -#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp70_ = _tmp76_; -#line 6157 "SearchFilter.c" - } else { -#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp70_ = FALSE; -#line 6161 "SearchFilter.c" - } -#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp77_ = self->priv->sepr_mediatype_flagged; -#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget), _tmp70_); + gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), (_tmp61_ & SEARCH_FILTER_CRITERIA_MEDIA) != 0); +#line 1317 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp62_ = self->priv->saved_search_button; +#line 1317 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp63_ = criteria; +#line 1317 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), (_tmp63_ & SEARCH_FILTER_CRITERIA_SAVEDSEARCH) != 0); #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp80_ = self->priv->label_type; + _tmp65_ = self->priv->label_type; #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp81_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget)); + _tmp66_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget)); #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp82_ = _tmp81_; + _tmp67_ = _tmp66_; #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp82_) { -#line 6175 "SearchFilter.c" - SearchFilterToolbarRatingFilterButton* _tmp83_; - gboolean _tmp84_; - gboolean _tmp85_; + if (_tmp67_) { +#line 6501 "SearchFilter.c" + SearchFilterToolbarToggleActionToolButton* _tmp68_; + gboolean _tmp69_; + gboolean _tmp70_; #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp83_ = self->priv->rating_button; + _tmp68_ = self->priv->toolbtn_flag; #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp84_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, gtk_widget_get_type (), GtkWidget)); + _tmp69_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_widget_get_type (), GtkWidget)); #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp85_ = _tmp84_; + _tmp70_ = _tmp69_; #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp79_ = _tmp85_; -#line 6187 "SearchFilter.c" + _tmp64_ = _tmp70_; +#line 6513 "SearchFilter.c" } else { #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp79_ = FALSE; -#line 6191 "SearchFilter.c" + _tmp64_ = FALSE; +#line 6517 "SearchFilter.c" } #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp79_) { + _tmp71_ = self->priv->sepr_mediatype_flagged; #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp78_ = TRUE; -#line 6197 "SearchFilter.c" + gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget), _tmp64_); +#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp74_ = self->priv->label_type; +#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp75_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget)); +#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp76_ = _tmp75_; +#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala" + if (_tmp76_) { +#line 6531 "SearchFilter.c" + SearchFilterToolbarRatingFilterButton* _tmp77_; + gboolean _tmp78_; + gboolean _tmp79_; +#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp77_ = self->priv->rating_button; +#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp78_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget)); +#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp79_ = _tmp78_; +#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp73_ = _tmp79_; +#line 6543 "SearchFilter.c" + } else { +#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp73_ = FALSE; +#line 6547 "SearchFilter.c" + } +#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala" + if (_tmp73_) { +#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp72_ = TRUE; +#line 6553 "SearchFilter.c" } else { - gboolean _tmp86_ = FALSE; - SearchFilterToolbarToggleActionToolButton* _tmp87_; - gboolean _tmp88_; - gboolean _tmp89_; -#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp87_ = self->priv->toolbtn_flag; -#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp88_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_widget_get_type (), GtkWidget)); -#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp89_ = _tmp88_; -#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp89_) { -#line 6211 "SearchFilter.c" - SearchFilterToolbarRatingFilterButton* _tmp90_; - gboolean _tmp91_; - gboolean _tmp92_; -#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp90_ = self->priv->rating_button; -#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp91_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, gtk_widget_get_type (), GtkWidget)); -#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp92_ = _tmp91_; -#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp86_ = _tmp92_; -#line 6223 "SearchFilter.c" + gboolean _tmp80_ = FALSE; + SearchFilterToolbarToggleActionToolButton* _tmp81_; + gboolean _tmp82_; + gboolean _tmp83_; +#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp81_ = self->priv->toolbtn_flag; +#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp82_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_widget_get_type (), GtkWidget)); +#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp83_ = _tmp82_; +#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala" + if (_tmp83_) { +#line 6567 "SearchFilter.c" + SearchFilterToolbarRatingFilterButton* _tmp84_; + gboolean _tmp85_; + gboolean _tmp86_; +#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp84_ = self->priv->rating_button; +#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp85_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, gtk_widget_get_type (), GtkWidget)); +#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp86_ = _tmp85_; +#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp80_ = _tmp86_; +#line 6579 "SearchFilter.c" } else { -#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp86_ = FALSE; -#line 6227 "SearchFilter.c" +#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp80_ = FALSE; +#line 6583 "SearchFilter.c" } -#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp78_ = _tmp86_; -#line 6231 "SearchFilter.c" +#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp72_ = _tmp80_; +#line 6587 "SearchFilter.c" } -#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp93_ = self->priv->sepr_flagged_rating; -#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, gtk_widget_get_type (), GtkWidget), _tmp78_); -#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp94_ = self->priv->search_filter; -#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, TYPE_VIEW_FILTER, ViewFilter), "refresh"); -#line 6241 "SearchFilter.c" -} - - -static void search_filter_toolbar_on_savedsearch_selected (SearchFilterToolbar* self, SavedSearch* saved_search) { +#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp87_ = self->priv->sepr_flagged_rating; +#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_widget_get_type (), GtkWidget), _tmp72_); +#line 1327 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp88_ = self->priv->search_filter; +#line 1327 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_VIEW_FILTER, ViewFilter), "refresh"); +#line 6597 "SearchFilter.c" +} + + +static void +search_filter_toolbar_on_savedsearch_selected (SearchFilterToolbar* self, + SavedSearch* saved_search) +{ SavedSearch* _tmp0_; - SavedSearch* _tmp1_; -#line 1328 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1330 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); -#line 1328 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1330 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SAVED_SEARCH (saved_search)); -#line 1329 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = saved_search; -#line 1329 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); -#line 1329 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1331 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp0_ = _g_object_ref0 (saved_search); +#line 1331 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->saved_search); -#line 1329 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->saved_search = _tmp1_; -#line 1330 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1331 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->saved_search = _tmp0_; +#line 1332 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_update (self); -#line 6262 "SearchFilter.c" +#line 6618 "SearchFilter.c" } -static void search_filter_toolbar_disable_savedsearch (SearchFilterToolbar* self) { -#line 1333 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_disable_savedsearch (SearchFilterToolbar* self) +{ +#line 1335 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); -#line 1334 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1336 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->saved_search); -#line 1334 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1336 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->saved_search = NULL; -#line 1335 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1337 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_update (self); -#line 6275 "SearchFilter.c" +#line 6633 "SearchFilter.c" } -static void search_filter_toolbar_edit_dialog (SearchFilterToolbar* self, SavedSearch* search) { +static void +search_filter_toolbar_edit_dialog (SearchFilterToolbar* self, + SavedSearch* search) +{ SearchFilterToolbarSavedSearchFilterButton* _tmp0_; SearchFilterToolbarSavedSearchPopover* _tmp1_; SavedSearchDialog* ssd = NULL; - SavedSearch* _tmp2_; - SavedSearchDialog* _tmp3_; -#line 1338 "/home/jens/Source/shotwell/src/SearchFilter.vala" + SavedSearchDialog* _tmp2_; +#line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); -#line 1338 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SAVED_SEARCH (search)); -#line 1339 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1341 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->saved_search_button; -#line 1339 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1341 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = _tmp0_->filter_popup; -#line 1339 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_toolbar_saved_search_popover_hide (_tmp1_); -#line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = search; -#line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = saved_search_dialog_new_edit_existing (_tmp2_); -#line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp3_); -#line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala" - ssd = _tmp3_; #line 1341 "/home/jens/Source/shotwell/src/SearchFilter.vala" + search_filter_toolbar_saved_search_popover_hide (_tmp1_); +#line 1342 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp2_ = saved_search_dialog_new_edit_existing (search); +#line 1342 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_object_ref_sink (_tmp2_); +#line 1342 "/home/jens/Source/shotwell/src/SearchFilter.vala" + ssd = _tmp2_; +#line 1343 "/home/jens/Source/shotwell/src/SearchFilter.vala" saved_search_dialog_show (ssd); -#line 1338 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (ssd); -#line 6307 "SearchFilter.c" +#line 6665 "SearchFilter.c" } -static void search_filter_toolbar_delete_dialog (SearchFilterToolbar* self, SavedSearch* search) { +static void +search_filter_toolbar_delete_dialog (SearchFilterToolbar* self, + SavedSearch* search) +{ SearchFilterToolbarSavedSearchFilterButton* _tmp0_; SearchFilterToolbarSavedSearchPopover* _tmp1_; - SavedSearch* _tmp2_; - gboolean _tmp3_; -#line 1344 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1346 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); -#line 1344 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1346 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SAVED_SEARCH (search)); -#line 1345 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->saved_search_button; -#line 1345 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = _tmp0_->filter_popup; -#line 1345 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_toolbar_saved_search_popover_hide (_tmp1_); -#line 1346 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = search; -#line 1346 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = dialogs_confirm_delete_saved_search (_tmp2_); -#line 1346 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp3_) { -#line 6332 "SearchFilter.c" - CommandManager* _tmp4_; - CommandManager* _tmp5_; - SavedSearch* _tmp6_; - DeleteSavedSearchCommand* _tmp7_; - DeleteSavedSearchCommand* _tmp8_; #line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = app_window_get_command_manager (); + _tmp1_ = _tmp0_->filter_popup; #line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala" + search_filter_toolbar_saved_search_popover_hide (_tmp1_); +#line 1348 "/home/jens/Source/shotwell/src/SearchFilter.vala" + if (dialogs_confirm_delete_saved_search (search)) { +#line 6687 "SearchFilter.c" + CommandManager* _tmp2_; + CommandManager* _tmp3_; + DeleteSavedSearchCommand* _tmp4_; + DeleteSavedSearchCommand* _tmp5_; +#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp2_ = app_window_get_command_manager (); +#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp3_ = _tmp2_; +#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp4_ = delete_saved_search_command_new (search); +#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = _tmp4_; -#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = search; -#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp7_ = delete_saved_search_command_new (_tmp6_); -#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = _tmp7_; -#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala" - command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_COMMAND, Command)); -#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_object_unref0 (_tmp8_); -#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _command_manager_unref0 (_tmp5_); -#line 6354 "SearchFilter.c" +#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala" + command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_COMMAND, Command)); +#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_object_unref0 (_tmp5_); +#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _command_manager_unref0 (_tmp3_); +#line 6706 "SearchFilter.c" } } -static void search_filter_toolbar_add_dialog (SearchFilterToolbar* self) { +static void +search_filter_toolbar_add_dialog (SearchFilterToolbar* self) +{ SearchFilterToolbarSavedSearchFilterButton* _tmp0_; SearchFilterToolbarSavedSearchPopover* _tmp1_; SavedSearchDialog* _tmp2_; SavedSearchDialog* _tmp3_; -#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1352 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); -#line 1351 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1353 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->saved_search_button; -#line 1351 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1353 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = _tmp0_->filter_popup; -#line 1351 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1353 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_hide (_tmp1_); -#line 1352 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = saved_search_dialog_new (); -#line 1352 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_object_ref_sink (_tmp2_); -#line 1352 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = _tmp2_; -#line 1352 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala" saved_search_dialog_show (_tmp3_); -#line 1352 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (_tmp3_); -#line 6382 "SearchFilter.c" +#line 6736 "SearchFilter.c" } -static void search_filter_toolbar_on_popover_closed (SearchFilterToolbar* self) { +static void +search_filter_toolbar_on_popover_closed (SearchFilterToolbar* self) +{ SearchFilterToolbarSavedSearchFilterButton* _tmp0_; SavedSearch* _tmp1_; SearchFilterToolbarSavedSearchFilterButton* _tmp2_; SearchFilterToolbarSavedSearchPopover* _tmp3_; -#line 1355 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); #line 1357 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); +#line 1359 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->elide_showing_again = TRUE; -#line 1358 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1360 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->saved_search_button; -#line 1358 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1360 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = self->priv->saved_search; -#line 1358 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1360 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_filter_button_set_active (_tmp0_, _tmp1_ != NULL); -#line 1359 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1361 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = self->priv->saved_search_button; -#line 1359 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1361 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = _tmp2_->filter_popup; -#line 1359 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1361 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_hide (_tmp3_); -#line 6407 "SearchFilter.c" +#line 6763 "SearchFilter.c" } -static void _search_filter_toolbar_edit_dialog_search_filter_toolbar_saved_search_popover_edit_clicked (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) { -#line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_edit_dialog_search_filter_toolbar_saved_search_popover_edit_clicked (SearchFilterToolbarSavedSearchPopover* _sender, + SavedSearch* search, + gpointer self) +{ +#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_edit_dialog ((SearchFilterToolbar*) self, search); -#line 6414 "SearchFilter.c" +#line 6774 "SearchFilter.c" } -static void _search_filter_toolbar_on_savedsearch_selected_search_filter_toolbar_saved_search_popover_search_activated (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) { -#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_on_savedsearch_selected_search_filter_toolbar_saved_search_popover_search_activated (SearchFilterToolbarSavedSearchPopover* _sender, + SavedSearch* search, + gpointer self) +{ +#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_savedsearch_selected ((SearchFilterToolbar*) self, search); -#line 6421 "SearchFilter.c" +#line 6785 "SearchFilter.c" } -static void _search_filter_toolbar_delete_dialog_search_filter_toolbar_saved_search_popover_delete_clicked (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) { -#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_delete_dialog_search_filter_toolbar_saved_search_popover_delete_clicked (SearchFilterToolbarSavedSearchPopover* _sender, + SavedSearch* search, + gpointer self) +{ +#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_delete_dialog ((SearchFilterToolbar*) self, search); -#line 6428 "SearchFilter.c" +#line 6796 "SearchFilter.c" } -static void _search_filter_toolbar_add_dialog_search_filter_toolbar_saved_search_popover_add_clicked (SearchFilterToolbarSavedSearchPopover* _sender, gpointer self) { -#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_add_dialog_search_filter_toolbar_saved_search_popover_add_clicked (SearchFilterToolbarSavedSearchPopover* _sender, + gpointer self) +{ +#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_add_dialog ((SearchFilterToolbar*) self); -#line 6435 "SearchFilter.c" +#line 6806 "SearchFilter.c" } -static void _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed (SearchFilterToolbarSavedSearchPopover* _sender, gpointer self) { -#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed (SearchFilterToolbarSavedSearchPopover* _sender, + gpointer self) +{ +#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_popover_closed ((SearchFilterToolbar*) self); -#line 6442 "SearchFilter.c" +#line 6816 "SearchFilter.c" } -static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterToolbar* self) { +static void +search_filter_toolbar_on_saved_search_button_clicked (SearchFilterToolbar* self) +{ gboolean _tmp0_ = FALSE; gboolean _tmp1_; -#line 1362 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1364 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); -#line 1363 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = self->priv->elide_showing_again; -#line 1363 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp1_) { -#line 6455 "SearchFilter.c" +#line 6831 "SearchFilter.c" SavedSearch* _tmp2_; -#line 1363 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = self->priv->saved_search; -#line 1363 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = _tmp2_ == NULL; -#line 6461 "SearchFilter.c" +#line 6837 "SearchFilter.c" } else { -#line 1363 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = FALSE; -#line 6465 "SearchFilter.c" +#line 6841 "SearchFilter.c" } -#line 1363 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp0_) { -#line 6469 "SearchFilter.c" +#line 6845 "SearchFilter.c" } else { SavedSearch* _tmp3_; -#line 1364 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = self->priv->saved_search; -#line 1364 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp3_ != NULL) { -#line 6476 "SearchFilter.c" +#line 6852 "SearchFilter.c" SearchFilterToolbarSavedSearchFilterButton* _tmp4_; -#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->saved_search); -#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->saved_search = NULL; -#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1368 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4_ = self->priv->saved_search_button; -#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1368 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_filter_button_set_active (_tmp4_, FALSE); -#line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_disable_savedsearch (self); -#line 6488 "SearchFilter.c" +#line 6864 "SearchFilter.c" } else { SearchFilterToolbarSavedSearchFilterButton* _tmp5_; SearchFilterToolbarSavedSearchPopover* _tmp6_; @@ -6503,13 +6879,13 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo SearchFilterToolbarSavedSearchPopover* _tmp34_; SearchFilterToolbarSavedSearchFilterButton* _tmp35_; SearchFilterToolbarSavedSearchPopover* _tmp36_; -#line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = self->priv->saved_search_button; -#line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp6_ = _tmp5_->filter_popup; -#line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp6_ != NULL) { -#line 6513 "SearchFilter.c" +#line 6889 "SearchFilter.c" SearchFilterToolbarSavedSearchFilterButton* _tmp7_; SearchFilterToolbarSavedSearchPopover* _tmp8_; guint _tmp9_; @@ -6525,218 +6901,220 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo SearchFilterToolbarSavedSearchFilterButton* _tmp19_; SearchFilterToolbarSavedSearchPopover* _tmp20_; guint _tmp21_; -#line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp7_ = self->priv->saved_search_button; -#line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp8_ = _tmp7_->filter_popup; -#line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("edit-clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp9_, NULL, FALSE); -#line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _search_filter_toolbar_edit_dialog_search_filter_toolbar_saved_search_popover_edit_clicked, self); -#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp10_ = self->priv->saved_search_button; -#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp11_ = _tmp10_->filter_popup; -#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("search-activated", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp12_, NULL, FALSE); -#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _search_filter_toolbar_on_savedsearch_selected_search_filter_toolbar_saved_search_popover_search_activated, self); -#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp13_ = self->priv->saved_search_button; -#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp14_ = _tmp13_->filter_popup; -#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("delete-clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp15_, NULL, FALSE); -#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp14_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _search_filter_toolbar_delete_dialog_search_filter_toolbar_saved_search_popover_delete_clicked, self); -#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp16_ = self->priv->saved_search_button; -#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp17_ = _tmp16_->filter_popup; -#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("add-clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp18_, NULL, FALSE); -#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp17_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _search_filter_toolbar_add_dialog_search_filter_toolbar_saved_search_popover_add_clicked, self); -#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp19_ = self->priv->saved_search_button; -#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp20_ = _tmp19_->filter_popup; -#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("closed", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp21_, NULL, FALSE); -#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp20_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp21_, 0, NULL, (GCallback) _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed, self); -#line 6569 "SearchFilter.c" +#line 6945 "SearchFilter.c" } -#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp22_ = self->priv->saved_search_button; -#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp23_ = self->priv->saved_search_button; -#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp24_ = search_filter_toolbar_saved_search_popover_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget)); -#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala" _search_filter_toolbar_saved_search_popover_unref0 (_tmp22_->filter_popup); -#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp22_->filter_popup = _tmp24_; -#line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp25_ = self->priv->saved_search_button; -#line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp26_ = _tmp25_->filter_popup; -#line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_connect_object (_tmp26_, "edit-clicked", (GCallback) _search_filter_toolbar_edit_dialog_search_filter_toolbar_saved_search_popover_edit_clicked, self, 0); -#line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1380 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp27_ = self->priv->saved_search_button; -#line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1380 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp28_ = _tmp27_->filter_popup; -#line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1380 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_connect_object (_tmp28_, "search-activated", (GCallback) _search_filter_toolbar_on_savedsearch_selected_search_filter_toolbar_saved_search_popover_search_activated, self, 0); -#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1381 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp29_ = self->priv->saved_search_button; -#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1381 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp30_ = _tmp29_->filter_popup; -#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1381 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_connect_object (_tmp30_, "delete-clicked", (GCallback) _search_filter_toolbar_delete_dialog_search_filter_toolbar_saved_search_popover_delete_clicked, self, 0); -#line 1380 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1382 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp31_ = self->priv->saved_search_button; -#line 1380 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1382 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp32_ = _tmp31_->filter_popup; -#line 1380 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1382 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_connect_object (_tmp32_, "add-clicked", (GCallback) _search_filter_toolbar_add_dialog_search_filter_toolbar_saved_search_popover_add_clicked, self, 0); -#line 1381 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp33_ = self->priv->saved_search_button; -#line 1381 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp34_ = _tmp33_->filter_popup; -#line 1381 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (_tmp34_, "closed", (GCallback) _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed, self, 0); #line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_connect_object (_tmp34_, "closed", (GCallback) _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed, self, 0); +#line 1385 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp35_ = self->priv->saved_search_button; -#line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1385 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp36_ = _tmp35_->filter_popup; -#line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1385 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_show_all (_tmp36_); -#line 6617 "SearchFilter.c" +#line 6993 "SearchFilter.c" } } -#line 1385 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1387 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->elide_showing_again = FALSE; -#line 6622 "SearchFilter.c" +#line 6998 "SearchFilter.c" } -void search_filter_toolbar_take_focus (SearchFilterToolbar* self) { +void +search_filter_toolbar_take_focus (SearchFilterToolbar* self) +{ SearchFilterToolbarSearchBox* _tmp0_; -#line 1388 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1390 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); -#line 1389 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1391 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->search_box; -#line 1389 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1391 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_search_box_get_focus (_tmp0_); -#line 6634 "SearchFilter.c" +#line 7012 "SearchFilter.c" } -static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_construct (GType object_type, const gchar* s, gint left_padding, gint right_padding) { +static SearchFilterToolbarLabelToolItem* +search_filter_toolbar_label_tool_item_construct (GType object_type, + const gchar* s, + gint left_padding, + gint right_padding) +{ SearchFilterToolbarLabelToolItem * self = NULL; - const gchar* _tmp0_; - GtkLabel* _tmp1_; - gboolean _tmp2_ = FALSE; - gint _tmp3_; - GtkLabel* _tmp11_; + GtkLabel* _tmp0_; + gboolean _tmp1_ = FALSE; + GtkLabel* _tmp6_; #line 616 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (s != NULL, NULL); #line 616 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = (SearchFilterToolbarLabelToolItem*) g_object_new (object_type, NULL); #line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = s; -#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = (GtkLabel*) gtk_label_new (_tmp0_); + _tmp0_ = (GtkLabel*) gtk_label_new (s); #line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp1_); + g_object_ref_sink (_tmp0_); #line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->label); #line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->label = _tmp1_; + self->priv->label = _tmp0_; #line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = left_padding; + if (left_padding != 0) { #line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp3_ != 0) { -#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = TRUE; -#line 6665 "SearchFilter.c" + _tmp1_ = TRUE; +#line 7042 "SearchFilter.c" } else { - gint _tmp4_; #line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = right_padding; -#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = _tmp4_ != 0; -#line 6672 "SearchFilter.c" + _tmp1_ = right_padding != 0; +#line 7046 "SearchFilter.c" } #line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp2_) { -#line 6676 "SearchFilter.c" + if (_tmp1_) { +#line 7050 "SearchFilter.c" + GtkLabel* _tmp2_; + GtkLabel* _tmp3_; + GtkLabel* _tmp4_; GtkLabel* _tmp5_; - GtkLabel* _tmp6_; - GtkLabel* _tmp7_; - gint _tmp8_; - GtkLabel* _tmp9_; - gint _tmp10_; #line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = self->priv->label; + _tmp2_ = self->priv->label; #line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); #line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = self->priv->label; + _tmp3_ = self->priv->label; #line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); + gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); #line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp7_ = self->priv->label; + _tmp4_ = self->priv->label; #line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = left_padding; -#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp8_); -#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp9_ = self->priv->label; + gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), left_padding); #line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp10_ = right_padding; + _tmp5_ = self->priv->label; #line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), _tmp10_); -#line 6703 "SearchFilter.c" + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), right_padding); +#line 7071 "SearchFilter.c" } #line 624 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp11_ = self->priv->label; + _tmp6_ = self->priv->label; #line 624 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); #line 616 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 6711 "SearchFilter.c" +#line 7079 "SearchFilter.c" } -static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_new (const gchar* s, gint left_padding, gint right_padding) { +static SearchFilterToolbarLabelToolItem* +search_filter_toolbar_label_tool_item_new (const gchar* s, + gint left_padding, + gint right_padding) +{ #line 616 "/home/jens/Source/shotwell/src/SearchFilter.vala" return search_filter_toolbar_label_tool_item_construct (SEARCH_FILTER_TOOLBAR_TYPE_LABEL_TOOL_ITEM, s, left_padding, right_padding); -#line 6718 "SearchFilter.c" +#line 7090 "SearchFilter.c" } -static void search_filter_toolbar_label_tool_item_class_init (SearchFilterToolbarLabelToolItemClass * klass) { +static void +search_filter_toolbar_label_tool_item_class_init (SearchFilterToolbarLabelToolItemClass * klass) +{ #line 613 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_label_tool_item_parent_class = g_type_class_peek_parent (klass); #line 613 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_type_class_add_private (klass, sizeof (SearchFilterToolbarLabelToolItemPrivate)); #line 613 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_label_tool_item_finalize; -#line 6729 "SearchFilter.c" +#line 7103 "SearchFilter.c" } -static void search_filter_toolbar_label_tool_item_instance_init (SearchFilterToolbarLabelToolItem * self) { +static void +search_filter_toolbar_label_tool_item_instance_init (SearchFilterToolbarLabelToolItem * self) +{ #line 613 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv = SEARCH_FILTER_TOOLBAR_LABEL_TOOL_ITEM_GET_PRIVATE (self); -#line 6736 "SearchFilter.c" +#line 7112 "SearchFilter.c" } -static void search_filter_toolbar_label_tool_item_finalize (GObject * obj) { +static void +search_filter_toolbar_label_tool_item_finalize (GObject * obj) +{ SearchFilterToolbarLabelToolItem * self; #line 613 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_LABEL_TOOL_ITEM, SearchFilterToolbarLabelToolItem); @@ -6744,11 +7122,13 @@ static void search_filter_toolbar_label_tool_item_finalize (GObject * obj) { _g_object_unref0 (self->priv->label); #line 613 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (search_filter_toolbar_label_tool_item_parent_class)->finalize (obj); -#line 6748 "SearchFilter.c" +#line 7126 "SearchFilter.c" } -static GType search_filter_toolbar_label_tool_item_get_type (void) { +static GType +search_filter_toolbar_label_tool_item_get_type (void) +{ static volatile gsize search_filter_toolbar_label_tool_item_type_id__volatile = 0; if (g_once_init_enter (&search_filter_toolbar_label_tool_item_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SearchFilterToolbarLabelToolItemClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) search_filter_toolbar_label_tool_item_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchFilterToolbarLabelToolItem), 0, (GInstanceInitFunc) search_filter_toolbar_label_tool_item_instance_init, NULL }; @@ -6760,16 +7140,18 @@ static GType search_filter_toolbar_label_tool_item_get_type (void) { } -static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_construct (GType object_type, const gchar* action) { +static SearchFilterToolbarToggleActionToolButton* +search_filter_toolbar_toggle_action_tool_button_construct (GType object_type, + const gchar* action) +{ SearchFilterToolbarToggleActionToolButton * self = NULL; GtkToggleButton* _tmp0_; GtkToggleButton* _tmp1_; GtkToggleButton* _tmp2_; - const gchar* _tmp3_; + GtkToggleButton* _tmp3_; GtkToggleButton* _tmp4_; GtkToggleButton* _tmp5_; GtkToggleButton* _tmp6_; - GtkToggleButton* _tmp7_; #line 631 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (action != NULL, NULL); #line 631 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -6789,46 +7171,50 @@ static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_a #line 634 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = self->priv->button; #line 634 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = action; -#line 634 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_ACTIONABLE, GtkActionable), _tmp3_); + gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_actionable_get_type (), GtkActionable), action); #line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = self->priv->button; + _tmp3_ = self->priv->button; #line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_has_tooltip (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_has_tooltip (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), TRUE); #line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = self->priv->button; + _tmp4_ = self->priv->button; #line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_button_set_relief (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton), GTK_RELIEF_NONE); + gtk_button_set_relief (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_button_get_type (), GtkButton), GTK_RELIEF_NONE); #line 637 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = self->priv->button; + _tmp5_ = self->priv->button; #line 637 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), 2); + gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), 2); #line 639 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp7_ = self->priv->button; + _tmp6_ = self->priv->button; #line 639 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); #line 631 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 6814 "SearchFilter.c" +#line 7194 "SearchFilter.c" } -static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_new (const gchar* action) { +static SearchFilterToolbarToggleActionToolButton* +search_filter_toolbar_toggle_action_tool_button_new (const gchar* action) +{ #line 631 "/home/jens/Source/shotwell/src/SearchFilter.vala" return search_filter_toolbar_toggle_action_tool_button_construct (SEARCH_FILTER_TOOLBAR_TYPE_TOGGLE_ACTION_TOOL_BUTTON, action); -#line 6821 "SearchFilter.c" +#line 7203 "SearchFilter.c" } -static void search_filter_toolbar_toggle_action_tool_button_set_icon_name (SearchFilterToolbarToggleActionToolButton* self, const gchar* icon_name) { +static void +search_filter_toolbar_toggle_action_tool_button_set_icon_name (SearchFilterToolbarToggleActionToolButton* self, + const gchar* icon_name) +{ GtkImage* image = NULL; GtkToggleButton* _tmp0_; - const gchar* _tmp1_; - GtkImage* _tmp2_; + GtkImage* _tmp1_; + GtkToggleButton* _tmp2_; GtkImage* _tmp3_; - GtkToggleButton* _tmp4_; - GtkImage* _tmp5_; + gboolean _tmp4_ = FALSE; + GtkToggleButton* _tmp5_; + const gchar* _tmp6_; #line 642 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_TOGGLE_ACTION_TOOL_BUTTON (self)); #line 642 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -6840,67 +7226,98 @@ static void search_filter_toolbar_toggle_action_tool_button_set_icon_name (Searc #line 644 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_button_set_always_show_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), TRUE); #line 645 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = icon_name; -#line 645 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = (GtkImage*) gtk_image_new_from_icon_name (_tmp1_, GTK_ICON_SIZE_SMALL_TOOLBAR); + _tmp1_ = (GtkImage*) gtk_image_new_from_icon_name (icon_name, (GtkIconSize) GTK_ICON_SIZE_SMALL_TOOLBAR); #line 645 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp2_); + g_object_ref_sink (_tmp1_); #line 645 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (image); #line 645 "/home/jens/Source/shotwell/src/SearchFilter.vala" - image = _tmp2_; + image = _tmp1_; +#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp2_ = self->priv->button; #line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = image; #line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), 6); + gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_button_get_type (), GtkButton), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); #line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = self->priv->button; + _tmp5_ = self->priv->button; +#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp6_ = gtk_button_get_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton)); #line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = image; + if (g_strcmp0 (_tmp6_, "") != 0) { +#line 7249 "SearchFilter.c" + GtkToggleButton* _tmp7_; + const gchar* _tmp8_; +#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp7_ = self->priv->button; +#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp8_ = gtk_button_get_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_button_get_type (), GtkButton)); +#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp4_ = _tmp8_ != NULL; +#line 7258 "SearchFilter.c" + } else { +#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp4_ = FALSE; +#line 7262 "SearchFilter.c" + } #line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_button_get_type (), GtkButton), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget)); + if (_tmp4_) { +#line 7266 "SearchFilter.c" + GtkImage* _tmp9_; +#line 648 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp9_ = image; +#line 648 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), 6); +#line 7272 "SearchFilter.c" + } #line 642 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (image); -#line 6865 "SearchFilter.c" +#line 7276 "SearchFilter.c" } -static void search_filter_toolbar_toggle_action_tool_button_set_label (SearchFilterToolbarToggleActionToolButton* self, const gchar* label) { +static void +search_filter_toolbar_toggle_action_tool_button_set_label (SearchFilterToolbarToggleActionToolButton* self, + const gchar* label) +{ GtkToggleButton* _tmp0_; - const gchar* _tmp1_; -#line 650 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 652 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_TOGGLE_ACTION_TOOL_BUTTON (self)); -#line 650 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 652 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (label != NULL); -#line 651 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 653 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->button; -#line 651 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = label; -#line 651 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_); -#line 6882 "SearchFilter.c" +#line 653 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), label); +#line 7293 "SearchFilter.c" } -static void search_filter_toolbar_toggle_action_tool_button_class_init (SearchFilterToolbarToggleActionToolButtonClass * klass) { +static void +search_filter_toolbar_toggle_action_tool_button_class_init (SearchFilterToolbarToggleActionToolButtonClass * klass) +{ #line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_toggle_action_tool_button_parent_class = g_type_class_peek_parent (klass); #line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_type_class_add_private (klass, sizeof (SearchFilterToolbarToggleActionToolButtonPrivate)); #line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_toggle_action_tool_button_finalize; -#line 6893 "SearchFilter.c" +#line 7306 "SearchFilter.c" } -static void search_filter_toolbar_toggle_action_tool_button_instance_init (SearchFilterToolbarToggleActionToolButton * self) { +static void +search_filter_toolbar_toggle_action_tool_button_instance_init (SearchFilterToolbarToggleActionToolButton * self) +{ #line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv = SEARCH_FILTER_TOOLBAR_TOGGLE_ACTION_TOOL_BUTTON_GET_PRIVATE (self); -#line 6900 "SearchFilter.c" +#line 7315 "SearchFilter.c" } -static void search_filter_toolbar_toggle_action_tool_button_finalize (GObject * obj) { +static void +search_filter_toolbar_toggle_action_tool_button_finalize (GObject * obj) +{ SearchFilterToolbarToggleActionToolButton * self; #line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_TOGGLE_ACTION_TOOL_BUTTON, SearchFilterToolbarToggleActionToolButton); @@ -6908,11 +7325,13 @@ static void search_filter_toolbar_toggle_action_tool_button_finalize (GObject * _g_object_unref0 (self->priv->button); #line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (search_filter_toolbar_toggle_action_tool_button_parent_class)->finalize (obj); -#line 6912 "SearchFilter.c" +#line 7329 "SearchFilter.c" } -static GType search_filter_toolbar_toggle_action_tool_button_get_type (void) { +static GType +search_filter_toolbar_toggle_action_tool_button_get_type (void) +{ static volatile gsize search_filter_toolbar_toggle_action_tool_button_type_id__volatile = 0; if (g_once_init_enter (&search_filter_toolbar_toggle_action_tool_button_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SearchFilterToolbarToggleActionToolButtonClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) search_filter_toolbar_toggle_action_tool_button_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchFilterToolbarToggleActionToolButton), 0, (GInstanceInitFunc) search_filter_toolbar_toggle_action_tool_button_instance_init, NULL }; @@ -6924,204 +7343,228 @@ static GType search_filter_toolbar_toggle_action_tool_button_get_type (void) { } -static void _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed (TextAction* _sender, const gchar* text, gpointer self) { -#line 686 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed (TextAction* _sender, + const gchar* text, + gpointer self) +{ +#line 688 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_search_box_on_action_text_changed ((SearchFilterToolbarSearchBox*) self, text); -#line 6931 "SearchFilter.c" +#line 7354 "SearchFilter.c" } -static void _search_filter_toolbar_search_box_on_sensitivity_changed_text_action_sensitivity_changed (TextAction* _sender, gboolean sensitive, gpointer self) { -#line 687 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_search_box_on_sensitivity_changed_text_action_sensitivity_changed (TextAction* _sender, + gboolean sensitive, + gpointer self) +{ +#line 689 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_search_box_on_sensitivity_changed ((SearchFilterToolbarSearchBox*) self, sensitive); -#line 6938 "SearchFilter.c" +#line 7365 "SearchFilter.c" } -static void _search_filter_toolbar_search_box_on_visibility_changed_text_action_visibility_changed (TextAction* _sender, gboolean visible, gpointer self) { -#line 688 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_search_box_on_visibility_changed_text_action_visibility_changed (TextAction* _sender, + gboolean visible, + gpointer self) +{ +#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_search_box_on_visibility_changed ((SearchFilterToolbarSearchBox*) self, visible); -#line 6945 "SearchFilter.c" +#line 7376 "SearchFilter.c" } -static void _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text (GtkEntryBuffer* _sender, guint position, guint n_chars, gpointer self) { -#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text (GtkEntryBuffer* _sender, + guint position, + guint n_chars, + gpointer self) +{ +#line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_search_box_on_entry_changed ((SearchFilterToolbarSearchBox*) self); -#line 6952 "SearchFilter.c" +#line 7388 "SearchFilter.c" } -static void _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text (GtkEntryBuffer* _sender, guint position, const gchar* chars, guint n_chars, gpointer self) { -#line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text (GtkEntryBuffer* _sender, + guint position, + const gchar* chars, + guint n_chars, + gpointer self) +{ +#line 693 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_search_box_on_entry_changed ((SearchFilterToolbarSearchBox*) self); -#line 6959 "SearchFilter.c" +#line 7401 "SearchFilter.c" } -static gpointer _text_action_ref0 (gpointer self) { -#line 668 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static gpointer +_text_action_ref0 (gpointer self) +{ +#line 670 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self ? text_action_ref (self) : NULL; -#line 6966 "SearchFilter.c" +#line 7410 "SearchFilter.c" } -static gboolean _search_filter_toolbar_search_box_on_escape_key_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) { +static gboolean +_search_filter_toolbar_search_box_on_escape_key_gtk_widget_key_press_event (GtkWidget* _sender, + GdkEventKey* event, + gpointer self) +{ gboolean result; result = search_filter_toolbar_search_box_on_escape_key ((SearchFilterToolbarSearchBox*) self, event); -#line 672 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 674 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 6975 "SearchFilter.c" +#line 7423 "SearchFilter.c" } -SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_construct (GType object_type, TextAction* action) { +SearchFilterToolbarSearchBox* +search_filter_toolbar_search_box_construct (GType object_type, + TextAction* action) +{ SearchFilterToolbarSearchBox * self = NULL; TextAction* _tmp0_; - TextAction* _tmp1_; + GtkSearchEntry* _tmp1_; GtkSearchEntry* _tmp2_; GtkSearchEntry* _tmp3_; GtkSearchEntry* _tmp4_; - GtkSearchEntry* _tmp5_; - TextAction* _tmp6_; - const gchar* _tmp7_; - const gchar* _tmp8_; - TextAction* _tmp9_; - TextAction* _tmp10_; - TextAction* _tmp11_; - GtkSearchEntry* _tmp12_; - GtkEntryBuffer* _tmp13_; - GtkEntryBuffer* _tmp14_; - GtkSearchEntry* _tmp15_; - GtkEntryBuffer* _tmp16_; - GtkEntryBuffer* _tmp17_; -#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala" + const gchar* _tmp5_; + const gchar* _tmp6_; + GtkSearchEntry* _tmp7_; + GtkEntryBuffer* _tmp8_; + GtkEntryBuffer* _tmp9_; + GtkSearchEntry* _tmp10_; + GtkEntryBuffer* _tmp11_; + GtkEntryBuffer* _tmp12_; +#line 669 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (IS_TEXT_ACTION (action), NULL); -#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 669 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = (SearchFilterToolbarSearchBox*) g_object_new (object_type, NULL); -#line 668 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = action; -#line 668 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = _text_action_ref0 (_tmp0_); -#line 668 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 670 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp0_ = _text_action_ref0 (action); +#line 670 "/home/jens/Source/shotwell/src/SearchFilter.vala" _text_action_unref0 (self->priv->action); -#line 668 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->action = _tmp1_; -#line 669 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = (GtkSearchEntry*) gtk_search_entry_new (); -#line 669 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp2_); -#line 669 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_object_unref0 (self->priv->search_entry); -#line 669 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->search_entry = _tmp2_; +#line 670 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->action = _tmp0_; #line 671 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = self->priv->search_entry; + _tmp1_ = (GtkSearchEntry*) gtk_search_entry_new (); #line 671 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_entry_get_type (), GtkEntry), 23); -#line 672 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = self->priv->search_entry; -#line 672 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _search_filter_toolbar_search_box_on_escape_key_gtk_widget_key_press_event, self, 0); + g_object_ref_sink (_tmp1_); +#line 671 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_object_unref0 (self->priv->search_entry); +#line 671 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->search_entry = _tmp1_; #line 673 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = self->priv->search_entry; + _tmp2_ = self->priv->search_entry; #line 673 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget)); -#line 675 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = action; -#line 675 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp7_ = text_action_get_value (_tmp6_); + gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_entry_get_type (), GtkEntry), 23); +#line 674 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp3_ = self->priv->search_entry; +#line 674 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _search_filter_toolbar_search_box_on_escape_key_gtk_widget_key_press_event, self, 0); #line 675 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = _tmp7_; + _tmp4_ = self->priv->search_entry; #line 675 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_toolbar_search_box_set_nullable_text (self, _tmp8_); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); #line 677 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp9_ = action; + _tmp5_ = text_action_get_value (action); #line 677 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (_tmp9_, "text-changed", (GCallback) _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed, self, 0); -#line 678 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp10_ = action; -#line 678 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (_tmp10_, "sensitivity-changed", (GCallback) _search_filter_toolbar_search_box_on_sensitivity_changed_text_action_sensitivity_changed, self, 0); -#line 679 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp11_ = action; + _tmp6_ = _tmp5_; +#line 677 "/home/jens/Source/shotwell/src/SearchFilter.vala" + search_filter_toolbar_search_box_set_nullable_text (self, _tmp6_); #line 679 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (_tmp11_, "visibility-changed", (GCallback) _search_filter_toolbar_search_box_on_visibility_changed_text_action_visibility_changed, self, 0); -#line 681 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp12_ = self->priv->search_entry; -#line 681 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp13_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_entry_get_type (), GtkEntry)); -#line 681 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp14_ = _tmp13_; + g_signal_connect_object (action, "text-changed", (GCallback) _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed, self, 0); +#line 680 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_connect_object (action, "sensitivity-changed", (GCallback) _search_filter_toolbar_search_box_on_sensitivity_changed_text_action_sensitivity_changed, self, 0); #line 681 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (_tmp14_, "deleted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text, self, 0); -#line 682 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp15_ = self->priv->search_entry; -#line 682 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp16_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_entry_get_type (), GtkEntry)); -#line 682 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp17_ = _tmp16_; -#line 682 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (_tmp17_, "inserted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text, self, 0); -#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_connect_object (action, "visibility-changed", (GCallback) _search_filter_toolbar_search_box_on_visibility_changed_text_action_visibility_changed, self, 0); +#line 683 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp7_ = self->priv->search_entry; +#line 683 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp8_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_entry_get_type (), GtkEntry)); +#line 683 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp9_ = _tmp8_; +#line 683 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_connect_object (_tmp9_, "deleted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text, self, 0); +#line 684 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp10_ = self->priv->search_entry; +#line 684 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp11_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_entry_get_type (), GtkEntry)); +#line 684 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp12_ = _tmp11_; +#line 684 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_connect_object (_tmp12_, "inserted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text, self, 0); +#line 669 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 7069 "SearchFilter.c" +#line 7505 "SearchFilter.c" } -SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_new (TextAction* action) { -#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala" +SearchFilterToolbarSearchBox* +search_filter_toolbar_search_box_new (TextAction* action) +{ +#line 669 "/home/jens/Source/shotwell/src/SearchFilter.vala" return search_filter_toolbar_search_box_construct (SEARCH_FILTER_TOOLBAR_TYPE_SEARCH_BOX, action); -#line 7076 "SearchFilter.c" +#line 7514 "SearchFilter.c" } -void search_filter_toolbar_search_box_get_focus (SearchFilterToolbarSearchBox* self) { +void +search_filter_toolbar_search_box_get_focus (SearchFilterToolbarSearchBox* self) +{ GtkSearchEntry* _tmp0_; -#line 694 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 696 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self)); -#line 695 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 697 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->search_entry; -#line 695 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 697 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), "has-focus", TRUE, NULL); -#line 7088 "SearchFilter.c" +#line 7528 "SearchFilter.c" } -static gboolean search_filter_toolbar_search_box_on_escape_key (SearchFilterToolbarSearchBox* self, GdkEventKey* e) { +static gboolean +search_filter_toolbar_search_box_on_escape_key (SearchFilterToolbarSearchBox* self, + GdkEventKey* e) +{ gboolean result = FALSE; - GdkEventKey* _tmp0_; - guint _tmp1_; - const gchar* _tmp2_; -#line 700 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self), FALSE); -#line 700 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_return_val_if_fail (e != NULL, FALSE); -#line 701 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = e; -#line 701 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = _tmp0_->keyval; -#line 701 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = gdk_keyval_name (_tmp1_); -#line 701 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (g_strcmp0 (_tmp2_, "Escape") == 0) { -#line 7109 "SearchFilter.c" - TextAction* _tmp3_; + guint _tmp0_; + const gchar* _tmp1_; #line 702 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = self->priv->action; + g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self), FALSE); #line 702 "/home/jens/Source/shotwell/src/SearchFilter.vala" - text_action_clear (_tmp3_); -#line 7115 "SearchFilter.c" + g_return_val_if_fail (e != NULL, FALSE); +#line 703 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp0_ = e->keyval; +#line 703 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp1_ = gdk_keyval_name (_tmp0_); +#line 703 "/home/jens/Source/shotwell/src/SearchFilter.vala" + if (g_strcmp0 (_tmp1_, "Escape") == 0) { +#line 7549 "SearchFilter.c" + TextAction* _tmp2_; +#line 704 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp2_ = self->priv->action; +#line 704 "/home/jens/Source/shotwell/src/SearchFilter.vala" + text_action_clear (_tmp2_); +#line 7555 "SearchFilter.c" } -#line 706 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 708 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = FALSE; -#line 706 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 708 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7121 "SearchFilter.c" +#line 7561 "SearchFilter.c" } -static void search_filter_toolbar_search_box_on_action_text_changed (SearchFilterToolbarSearchBox* self, const gchar* text) { +static void +search_filter_toolbar_search_box_on_action_text_changed (SearchFilterToolbarSearchBox* self, + const gchar* text) +{ GtkSearchEntry* _tmp0_; GtkEntryBuffer* _tmp1_; GtkEntryBuffer* _tmp2_; @@ -7130,163 +7573,164 @@ static void search_filter_toolbar_search_box_on_action_text_changed (SearchFilte GtkEntryBuffer* _tmp5_; GtkEntryBuffer* _tmp6_; guint _tmp7_; - const gchar* _tmp8_; - GtkSearchEntry* _tmp9_; + GtkSearchEntry* _tmp8_; + GtkEntryBuffer* _tmp9_; GtkEntryBuffer* _tmp10_; - GtkEntryBuffer* _tmp11_; - GtkSearchEntry* _tmp12_; + GtkSearchEntry* _tmp11_; + GtkEntryBuffer* _tmp12_; GtkEntryBuffer* _tmp13_; - GtkEntryBuffer* _tmp14_; -#line 709 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 711 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self)); -#line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 712 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->search_entry; -#line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 712 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_entry_get_type (), GtkEntry)); -#line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 712 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = _tmp1_; -#line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 712 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("deleted-text", gtk_entry_buffer_get_type (), &_tmp3_, NULL, FALSE); -#line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 712 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text, self); -#line 711 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 713 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4_ = self->priv->search_entry; -#line 711 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_entry_get_type (), GtkEntry)); -#line 711 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = _tmp5_; -#line 711 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_parse_name ("inserted-text", gtk_entry_buffer_get_type (), &_tmp7_, NULL, FALSE); -#line 711 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text, self); -#line 712 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = text; -#line 712 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_toolbar_search_box_set_nullable_text (self, _tmp8_); #line 713 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp9_ = self->priv->search_entry; + _tmp5_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_entry_get_type (), GtkEntry)); #line 713 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp10_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_entry_get_type (), GtkEntry)); + _tmp6_ = _tmp5_; #line 713 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp11_ = _tmp10_; + g_signal_parse_name ("inserted-text", gtk_entry_buffer_get_type (), &_tmp7_, NULL, FALSE); #line 713 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (_tmp11_, "deleted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text, self, 0); -#line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp12_ = self->priv->search_entry; -#line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp13_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_entry_get_type (), GtkEntry)); -#line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp14_ = _tmp13_; + g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text, self); #line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (_tmp14_, "inserted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text, self, 0); -#line 7183 "SearchFilter.c" + search_filter_toolbar_search_box_set_nullable_text (self, text); +#line 715 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp8_ = self->priv->search_entry; +#line 715 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp9_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_entry_get_type (), GtkEntry)); +#line 715 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp10_ = _tmp9_; +#line 715 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_connect_object (_tmp10_, "deleted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text, self, 0); +#line 716 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp11_ = self->priv->search_entry; +#line 716 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp12_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_entry_get_type (), GtkEntry)); +#line 716 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp13_ = _tmp12_; +#line 716 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_connect_object (_tmp13_, "inserted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text, self, 0); +#line 7623 "SearchFilter.c" } -static void search_filter_toolbar_search_box_on_entry_changed (SearchFilterToolbarSearchBox* self) { +static void +search_filter_toolbar_search_box_on_entry_changed (SearchFilterToolbarSearchBox* self) +{ TextAction* _tmp0_; guint _tmp1_; TextAction* _tmp2_; GtkSearchEntry* _tmp3_; const gchar* _tmp4_; TextAction* _tmp5_; -#line 717 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 719 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self)); -#line 718 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 720 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->action; -#line 718 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 720 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("text-changed", TYPE_TEXT_ACTION, &_tmp1_, NULL, FALSE); -#line 718 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 720 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed, self); -#line 719 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 721 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = self->priv->action; -#line 719 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 721 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = self->priv->search_entry; -#line 719 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 721 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4_ = gtk_entry_get_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_entry_get_type (), GtkEntry)); -#line 719 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 721 "/home/jens/Source/shotwell/src/SearchFilter.vala" text_action_set_text (_tmp2_, _tmp4_); -#line 720 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 722 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = self->priv->action; -#line 720 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 722 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_connect_object (_tmp5_, "text-changed", (GCallback) _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed, self, 0); -#line 7214 "SearchFilter.c" +#line 7656 "SearchFilter.c" } -static void search_filter_toolbar_search_box_on_sensitivity_changed (SearchFilterToolbarSearchBox* self, gboolean sensitive) { - gboolean _tmp0_; -#line 723 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_search_box_on_sensitivity_changed (SearchFilterToolbarSearchBox* self, + gboolean sensitive) +{ +#line 725 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self)); -#line 724 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = sensitive; -#line 724 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_); -#line 7226 "SearchFilter.c" +#line 726 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), sensitive); +#line 7668 "SearchFilter.c" } -static void search_filter_toolbar_search_box_on_visibility_changed (SearchFilterToolbarSearchBox* self, gboolean visible) { - gboolean _tmp0_; -#line 727 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_search_box_on_visibility_changed (SearchFilterToolbarSearchBox* self, + gboolean visible) +{ +#line 729 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self)); -#line 728 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = visible; -#line 728 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_); -#line 7238 "SearchFilter.c" +#line 730 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), visible); +#line 7680 "SearchFilter.c" } -static void search_filter_toolbar_search_box_set_nullable_text (SearchFilterToolbarSearchBox* self, const gchar* text) { +static void +search_filter_toolbar_search_box_set_nullable_text (SearchFilterToolbarSearchBox* self, + const gchar* text) +{ const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - GtkSearchEntry* _tmp3_; -#line 731 "/home/jens/Source/shotwell/src/SearchFilter.vala" + GtkSearchEntry* _tmp1_; +#line 733 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self)); -#line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = text; -#line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp1_ != NULL) { -#line 7252 "SearchFilter.c" - const gchar* _tmp2_; -#line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = text; -#line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = _tmp2_; -#line 7258 "SearchFilter.c" +#line 734 "/home/jens/Source/shotwell/src/SearchFilter.vala" + if (text != NULL) { +#line 734 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp0_ = text; +#line 7696 "SearchFilter.c" } else { -#line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 734 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = ""; -#line 7262 "SearchFilter.c" +#line 7700 "SearchFilter.c" } -#line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = self->priv->search_entry; -#line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_entry_set_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_entry_get_type (), GtkEntry), _tmp0_); -#line 7268 "SearchFilter.c" +#line 734 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp1_ = self->priv->search_entry; +#line 734 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_entry_set_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_entry_get_type (), GtkEntry), _tmp0_); +#line 7706 "SearchFilter.c" } -static void search_filter_toolbar_search_box_class_init (SearchFilterToolbarSearchBoxClass * klass) { -#line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_search_box_class_init (SearchFilterToolbarSearchBoxClass * klass) +{ +#line 665 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_search_box_parent_class = g_type_class_peek_parent (klass); -#line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 665 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_type_class_add_private (klass, sizeof (SearchFilterToolbarSearchBoxPrivate)); -#line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 665 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_search_box_finalize; -#line 7279 "SearchFilter.c" +#line 7719 "SearchFilter.c" } -static void search_filter_toolbar_search_box_instance_init (SearchFilterToolbarSearchBox * self) { -#line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_search_box_instance_init (SearchFilterToolbarSearchBox * self) +{ +#line 665 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv = SEARCH_FILTER_TOOLBAR_SEARCH_BOX_GET_PRIVATE (self); -#line 7286 "SearchFilter.c" +#line 7728 "SearchFilter.c" } -static void search_filter_toolbar_search_box_finalize (GObject * obj) { +static void +search_filter_toolbar_search_box_finalize (GObject * obj) +{ SearchFilterToolbarSearchBox * self; TextAction* _tmp0_; guint _tmp1_; @@ -7302,57 +7746,59 @@ static void search_filter_toolbar_search_box_finalize (GObject * obj) { GtkEntryBuffer* _tmp11_; GtkEntryBuffer* _tmp12_; guint _tmp13_; -#line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 665 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_SEARCH_BOX, SearchFilterToolbarSearchBox); -#line 686 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 688 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->action; -#line 686 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 688 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("text-changed", TYPE_TEXT_ACTION, &_tmp1_, NULL, FALSE); -#line 686 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 688 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed, self); -#line 687 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 689 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = self->priv->action; -#line 687 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 689 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("sensitivity-changed", TYPE_TEXT_ACTION, &_tmp3_, NULL, FALSE); -#line 687 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 689 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_sensitivity_changed_text_action_sensitivity_changed, self); -#line 688 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4_ = self->priv->action; -#line 688 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("visibility-changed", TYPE_TEXT_ACTION, &_tmp5_, NULL, FALSE); -#line 688 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_visibility_changed_text_action_visibility_changed, self); #line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_visibility_changed_text_action_visibility_changed, self); +#line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp6_ = self->priv->search_entry; -#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp7_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_entry_get_type (), GtkEntry)); -#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp8_ = _tmp7_; -#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("deleted-text", gtk_entry_buffer_get_type (), &_tmp9_, NULL, FALSE); -#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text, self); -#line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 693 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp10_ = self->priv->search_entry; -#line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 693 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp11_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_entry_get_type (), GtkEntry)); -#line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 693 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp12_ = _tmp11_; -#line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 693 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("inserted-text", gtk_entry_buffer_get_type (), &_tmp13_, NULL, FALSE); -#line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 693 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text, self); -#line 664 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 666 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->search_entry); -#line 665 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala" _text_action_unref0 (self->priv->action); -#line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 665 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (search_filter_toolbar_search_box_parent_class)->finalize (obj); -#line 7352 "SearchFilter.c" +#line 7796 "SearchFilter.c" } -GType search_filter_toolbar_search_box_get_type (void) { +GType +search_filter_toolbar_search_box_get_type (void) +{ static volatile gsize search_filter_toolbar_search_box_type_id__volatile = 0; if (g_once_init_enter (&search_filter_toolbar_search_box_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SearchFilterToolbarSearchBoxClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) search_filter_toolbar_search_box_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchFilterToolbarSearchBox), 0, (GInstanceInitFunc) search_filter_toolbar_search_box_instance_init, NULL }; @@ -7364,7 +7810,10 @@ GType search_filter_toolbar_search_box_get_type (void) { } -SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_button_construct (GType object_type, GMenuModel* model) { +SearchFilterToolbarRatingFilterButton* +search_filter_toolbar_rating_filter_button_construct (GType object_type, + GMenuModel* model) +{ SearchFilterToolbarRatingFilterButton * self = NULL; GtkMenuButton* _tmp0_; GtkMenuButton* _tmp1_; @@ -7374,503 +7823,489 @@ SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_butto GtkMenuButton* _tmp5_; GtkMenuButton* _tmp6_; GtkMenuButton* _tmp7_; - GMenuModel* _tmp8_; - GtkMenuButton* _tmp9_; -#line 740 "/home/jens/Source/shotwell/src/SearchFilter.vala" + GtkMenuButton* _tmp8_; +#line 742 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (G_IS_MENU_MODEL (model), NULL); -#line 740 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 742 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = (SearchFilterToolbarRatingFilterButton*) g_object_new (object_type, NULL); -#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 743 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = (GtkMenuButton*) gtk_menu_button_new (); -#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 743 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_object_ref_sink (_tmp0_); -#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 743 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->button); -#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->button = _tmp0_; #line 743 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->button = _tmp0_; +#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = self->button; -#line 743 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = search_filter_toolbar_rating_filter_button_get_filter_icon (self, RATING_FILTER_UNRATED_OR_HIGHER); -#line 743 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = _tmp2_; -#line 743 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_button_get_type (), GtkButton), _tmp3_); -#line 743 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (_tmp3_); -#line 744 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 746 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4_ = self->button; -#line 744 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 746 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = self->button; -#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_button_set_relief (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton), GTK_RELIEF_NONE); -#line 746 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 748 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp6_ = self->button; -#line 746 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 748 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), 2); -#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 749 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp7_ = self->button; -#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = model; -#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_menu_button_set_menu_model (_tmp7_, _tmp8_); #line 749 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_tool_item_set_homogeneous (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tool_item_get_type (), GtkToolItem), FALSE); -#line 751 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp9_ = self->button; + gtk_menu_button_set_menu_model (_tmp7_, model); #line 751 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); -#line 740 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_tool_item_set_homogeneous (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tool_item_get_type (), GtkToolItem), FALSE); +#line 753 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp8_ = self->button; +#line 753 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget)); +#line 742 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 7428 "SearchFilter.c" +#line 7874 "SearchFilter.c" } -SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_button_new (GMenuModel* model) { -#line 740 "/home/jens/Source/shotwell/src/SearchFilter.vala" +SearchFilterToolbarRatingFilterButton* +search_filter_toolbar_rating_filter_button_new (GMenuModel* model) +{ +#line 742 "/home/jens/Source/shotwell/src/SearchFilter.vala" return search_filter_toolbar_rating_filter_button_construct (SEARCH_FILTER_TOOLBAR_TYPE_RATING_FILTER_BUTTON, model); -#line 7435 "SearchFilter.c" +#line 7883 "SearchFilter.c" } -static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (SearchFilterToolbarRatingFilterButton* self, RatingFilter filter) { +static GtkWidget* +search_filter_toolbar_rating_filter_button_get_filter_icon (SearchFilterToolbarRatingFilterButton* self, + RatingFilter filter) +{ GtkWidget* result = NULL; gchar* filename = NULL; - RatingFilter _tmp0_; GtkImage* image = NULL; - const gchar* _tmp4_; - RatingFilter _tmp5_; - gint _tmp6_; - GdkPixbuf* _tmp7_; - GdkPixbuf* _tmp8_; - GtkImage* _tmp9_; - GtkImage* _tmp10_; -#line 754 "/home/jens/Source/shotwell/src/SearchFilter.vala" + const gchar* _tmp3_; + GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp5_; + GtkImage* _tmp6_; + GtkImage* _tmp7_; +#line 756 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_IS_RATING_FILTER_BUTTON (self), NULL); -#line 755 "/home/jens/Source/shotwell/src/SearchFilter.vala" - filename = NULL; -#line 757 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = filter; -#line 757 "/home/jens/Source/shotwell/src/SearchFilter.vala" - switch (_tmp0_) { #line 757 "/home/jens/Source/shotwell/src/SearchFilter.vala" - case RATING_FILTER_REJECTED_OR_HIGHER: -#line 7461 "SearchFilter.c" - { - gchar* _tmp1_; + filename = NULL; #line 759 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = g_strdup (RESOURCES_ICON_FILTER_REJECTED_OR_BETTER); + switch (filter) { #line 759 "/home/jens/Source/shotwell/src/SearchFilter.vala" + case RATING_FILTER_REJECTED_OR_HIGHER: +#line 7907 "SearchFilter.c" + { + gchar* _tmp0_; +#line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp0_ = g_strdup (RESOURCES_ICON_FILTER_REJECTED_OR_BETTER); +#line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_free0 (filename); -#line 759 "/home/jens/Source/shotwell/src/SearchFilter.vala" - filename = _tmp1_; -#line 760 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala" + filename = _tmp0_; +#line 762 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 7472 "SearchFilter.c" +#line 7918 "SearchFilter.c" } -#line 757 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 759 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_REJECTED_ONLY: -#line 7476 "SearchFilter.c" +#line 7922 "SearchFilter.c" { - gchar* _tmp2_; -#line 763 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = g_strdup (RESOURCES_ICON_RATING_REJECTED); -#line 763 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gchar* _tmp1_; +#line 765 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp1_ = g_strdup (RESOURCES_ICON_RATING_REJECTED); +#line 765 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_free0 (filename); -#line 763 "/home/jens/Source/shotwell/src/SearchFilter.vala" - filename = _tmp2_; -#line 764 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 765 "/home/jens/Source/shotwell/src/SearchFilter.vala" + filename = _tmp1_; +#line 766 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 7487 "SearchFilter.c" +#line 7933 "SearchFilter.c" } default: -#line 757 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 759 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_UNRATED_OR_HIGHER: -#line 7492 "SearchFilter.c" +#line 7938 "SearchFilter.c" { - gchar* _tmp3_; -#line 768 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = g_strdup (RESOURCES_ICON_FILTER_UNRATED_OR_BETTER); -#line 768 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gchar* _tmp2_; +#line 770 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp2_ = g_strdup (RESOURCES_ICON_FILTER_UNRATED_OR_BETTER); +#line 770 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_free0 (filename); -#line 768 "/home/jens/Source/shotwell/src/SearchFilter.vala" - filename = _tmp3_; -#line 769 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 770 "/home/jens/Source/shotwell/src/SearchFilter.vala" + filename = _tmp2_; +#line 771 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 7503 "SearchFilter.c" +#line 7949 "SearchFilter.c" } } -#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = filename; -#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = filter; -#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = search_filter_toolbar_rating_filter_button_get_filter_icon_size (self, _tmp5_); -#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp7_ = resources_load_icon (_tmp4_, _tmp6_); -#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = _tmp7_; -#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp9_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp8_); -#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp9_); -#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp10_ = _tmp9_; -#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_object_unref0 (_tmp8_); -#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala" - image = _tmp10_; #line 774 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget), 6); + _tmp3_ = filename; +#line 774 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp4_ = resources_load_icon (_tmp3_, search_filter_toolbar_rating_filter_button_get_filter_icon_size (self, filter)); +#line 774 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp5_ = _tmp4_; +#line 774 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp6_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp5_); +#line 774 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_object_ref_sink (_tmp6_); +#line 774 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp7_ = _tmp6_; +#line 774 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_object_unref0 (_tmp5_); +#line 774 "/home/jens/Source/shotwell/src/SearchFilter.vala" + image = _tmp7_; #line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget), 6); +#line 778 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget); -#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 778 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_free0 (filename); -#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 778 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7534 "SearchFilter.c" +#line 7976 "SearchFilter.c" } -static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (SearchFilterToolbarRatingFilterButton* self, RatingFilter filter) { +static gint +search_filter_toolbar_rating_filter_button_get_filter_icon_size (SearchFilterToolbarRatingFilterButton* self, + RatingFilter filter) +{ gint result = 0; gint icon_base = 0; gint icon_star_base = 0; gint icon_plus = 0; - RatingFilter _tmp0_; -#line 779 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 781 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_IS_RATING_FILTER_BUTTON (self), 0); -#line 780 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 782 "/home/jens/Source/shotwell/src/SearchFilter.vala" icon_base = (gint) (SEARCH_FILTER_TOOLBAR_FILTER_ICON_BASE_WIDTH * SEARCH_FILTER_TOOLBAR_FILTER_ICON_SCALE); -#line 781 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 783 "/home/jens/Source/shotwell/src/SearchFilter.vala" icon_star_base = (gint) (SEARCH_FILTER_TOOLBAR_FILTER_ICON_BASE_WIDTH * SEARCH_FILTER_TOOLBAR_FILTER_ICON_STAR_SCALE); -#line 782 "/home/jens/Source/shotwell/src/SearchFilter.vala" - icon_plus = (gint) (SEARCH_FILTER_TOOLBAR_FILTER_ICON_PLUS_WIDTH * SEARCH_FILTER_TOOLBAR_FILTER_ICON_STAR_SCALE); -#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = filter; -#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala" - switch (_tmp0_) { #line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala" + icon_plus = (gint) (SEARCH_FILTER_TOOLBAR_FILTER_ICON_PLUS_WIDTH * SEARCH_FILTER_TOOLBAR_FILTER_ICON_STAR_SCALE); +#line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala" + switch (filter) { +#line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_ONE_OR_HIGHER: -#line 7558 "SearchFilter.c" +#line 8000 "SearchFilter.c" { + gint _tmp0_; gint _tmp1_; - gint _tmp2_; -#line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = icon_star_base; -#line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = icon_plus; -#line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala" - result = _tmp1_ + _tmp2_; -#line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala" - return result; -#line 7570 "SearchFilter.c" - } -#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala" - case RATING_FILTER_TWO_OR_HIGHER: -#line 7574 "SearchFilter.c" - { - gint _tmp3_; - gint _tmp4_; #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = icon_star_base; + _tmp0_ = icon_star_base; #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = icon_plus; + _tmp1_ = icon_plus; #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala" - result = (_tmp3_ * 2) + _tmp4_; + result = _tmp0_ + _tmp1_; #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7586 "SearchFilter.c" +#line 8012 "SearchFilter.c" } -#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala" - case RATING_FILTER_THREE_OR_HIGHER: -#line 7590 "SearchFilter.c" +#line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala" + case RATING_FILTER_TWO_OR_HIGHER: +#line 8016 "SearchFilter.c" { - gint _tmp5_; - gint _tmp6_; + gint _tmp2_; + gint _tmp3_; #line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = icon_star_base; + _tmp2_ = icon_star_base; #line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = icon_plus; + _tmp3_ = icon_plus; #line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala" - result = (_tmp5_ * 3) + _tmp6_; + result = (_tmp2_ * 2) + _tmp3_; #line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7602 "SearchFilter.c" +#line 8028 "SearchFilter.c" } -#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala" - case RATING_FILTER_FOUR_OR_HIGHER: -#line 7606 "SearchFilter.c" +#line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala" + case RATING_FILTER_THREE_OR_HIGHER: +#line 8032 "SearchFilter.c" { - gint _tmp7_; - gint _tmp8_; + gint _tmp4_; + gint _tmp5_; #line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp7_ = icon_star_base; + _tmp4_ = icon_star_base; #line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = icon_plus; + _tmp5_ = icon_plus; #line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala" - result = (_tmp7_ * 4) + _tmp8_; + result = (_tmp4_ * 3) + _tmp5_; #line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7618 "SearchFilter.c" +#line 8044 "SearchFilter.c" } -#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala" + case RATING_FILTER_FOUR_OR_HIGHER: +#line 8048 "SearchFilter.c" + { + gint _tmp6_; + gint _tmp7_; +#line 794 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp6_ = icon_star_base; +#line 794 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp7_ = icon_plus; +#line 794 "/home/jens/Source/shotwell/src/SearchFilter.vala" + result = (_tmp6_ * 4) + _tmp7_; +#line 794 "/home/jens/Source/shotwell/src/SearchFilter.vala" + return result; +#line 8060 "SearchFilter.c" + } +#line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_FIVE_OR_HIGHER: -#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_FIVE_ONLY: -#line 7624 "SearchFilter.c" +#line 8066 "SearchFilter.c" { - gint _tmp9_; -#line 795 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp9_ = icon_star_base; -#line 795 "/home/jens/Source/shotwell/src/SearchFilter.vala" - result = _tmp9_ * 5; -#line 795 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gint _tmp8_; +#line 797 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp8_ = icon_star_base; +#line 797 "/home/jens/Source/shotwell/src/SearchFilter.vala" + result = _tmp8_ * 5; +#line 797 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7633 "SearchFilter.c" +#line 8075 "SearchFilter.c" } -#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_REJECTED_OR_HIGHER: -#line 7637 "SearchFilter.c" +#line 8079 "SearchFilter.c" { -#line 797 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = RESOURCES_ICON_FILTER_REJECTED_OR_BETTER_FIXED_SIZE; -#line 797 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7643 "SearchFilter.c" +#line 8085 "SearchFilter.c" } -#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_UNRATED_OR_HIGHER: -#line 7647 "SearchFilter.c" +#line 8089 "SearchFilter.c" { -#line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 801 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = RESOURCES_ICON_FILTER_UNRATED_OR_BETTER_FIXED_SIZE; -#line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 801 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7653 "SearchFilter.c" +#line 8095 "SearchFilter.c" } -#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_REJECTED_ONLY: -#line 7657 "SearchFilter.c" +#line 8099 "SearchFilter.c" { -#line 801 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 803 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = icon_plus; -#line 801 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 803 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7663 "SearchFilter.c" +#line 8105 "SearchFilter.c" } default: { -#line 803 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 805 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = icon_base; -#line 803 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 805 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7671 "SearchFilter.c" +#line 8113 "SearchFilter.c" } } } -void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToolbarRatingFilterButton* self, RatingFilter filter) { +void +search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToolbarRatingFilterButton* self, + RatingFilter filter) +{ GtkMenuButton* _tmp0_; - RatingFilter _tmp1_; - RatingFilter _tmp12_; - gint _tmp13_; - RatingFilter _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; -#line 807 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gchar* _tmp10_; + gchar* _tmp11_; +#line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_RATING_FILTER_BUTTON (self)); -#line 808 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 810 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->button; -#line 808 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 810 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_button_set_always_show_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), TRUE); -#line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = filter; -#line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala" - switch (_tmp1_) { -#line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala" - case RATING_FILTER_ONE_OR_HIGHER: -#line 7697 "SearchFilter.c" - { - GtkMenuButton* _tmp2_; #line 811 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = self->button; + switch (filter) { #line 811 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_button_get_type (), GtkButton), _ ("★+ Rating")); -#line 812 "/home/jens/Source/shotwell/src/SearchFilter.vala" + case RATING_FILTER_ONE_OR_HIGHER: +#line 8136 "SearchFilter.c" + { + GtkMenuButton* _tmp1_; +#line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp1_ = self->button; +#line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_button_get_type (), GtkButton), _ ("★+ Rating")); +#line 814 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 7706 "SearchFilter.c" +#line 8145 "SearchFilter.c" } -#line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 811 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_TWO_OR_HIGHER: -#line 7710 "SearchFilter.c" +#line 8149 "SearchFilter.c" { - GtkMenuButton* _tmp3_; -#line 814 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = self->button; -#line 814 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_button_get_type (), GtkButton), _ ("★★+ Rating")); -#line 815 "/home/jens/Source/shotwell/src/SearchFilter.vala" + GtkMenuButton* _tmp2_; +#line 816 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp2_ = self->button; +#line 816 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_button_get_type (), GtkButton), _ ("★★+ Rating")); +#line 817 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 7719 "SearchFilter.c" +#line 8158 "SearchFilter.c" } -#line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 811 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_THREE_OR_HIGHER: -#line 7723 "SearchFilter.c" +#line 8162 "SearchFilter.c" { - GtkMenuButton* _tmp4_; -#line 817 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = self->button; -#line 817 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_button_get_type (), GtkButton), _ ("★★★+ Rating")); -#line 818 "/home/jens/Source/shotwell/src/SearchFilter.vala" + GtkMenuButton* _tmp3_; +#line 819 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp3_ = self->button; +#line 819 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_button_get_type (), GtkButton), _ ("★★★+ Rating")); +#line 820 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 7732 "SearchFilter.c" +#line 8171 "SearchFilter.c" } -#line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 811 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_FOUR_OR_HIGHER: -#line 7736 "SearchFilter.c" +#line 8175 "SearchFilter.c" { - GtkMenuButton* _tmp5_; -#line 820 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = self->button; -#line 820 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton), _ ("★★★★+ Rating")); -#line 821 "/home/jens/Source/shotwell/src/SearchFilter.vala" + GtkMenuButton* _tmp4_; +#line 822 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp4_ = self->button; +#line 822 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_button_get_type (), GtkButton), _ ("★★★★+ Rating")); +#line 823 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 7745 "SearchFilter.c" +#line 8184 "SearchFilter.c" } -#line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 811 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_FIVE_ONLY: -#line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 811 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_FIVE_OR_HIGHER: -#line 7751 "SearchFilter.c" +#line 8190 "SearchFilter.c" { - GtkMenuButton* _tmp6_; -#line 824 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = self->button; -#line 824 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_button_get_type (), GtkButton), _ ("★★★★★+ Rating")); -#line 825 "/home/jens/Source/shotwell/src/SearchFilter.vala" + GtkMenuButton* _tmp5_; +#line 826 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp5_ = self->button; +#line 826 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton), _ ("★★★★★+ Rating")); +#line 827 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 7760 "SearchFilter.c" +#line 8199 "SearchFilter.c" } default: { + GtkMenuButton* _tmp6_; GtkMenuButton* _tmp7_; - GtkMenuButton* _tmp8_; - RatingFilter _tmp9_; - GtkWidget* _tmp10_; - GtkWidget* _tmp11_; -#line 827 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp7_ = self->button; -#line 827 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_button_get_type (), GtkButton), _ ("Rating")); -#line 828 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = self->button; -#line 828 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp9_ = filter; -#line 828 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp10_ = search_filter_toolbar_rating_filter_button_get_filter_icon (self, _tmp9_); -#line 828 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp11_ = _tmp10_; -#line 828 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_button_get_type (), GtkButton), _tmp11_); -#line 828 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_object_unref0 (_tmp11_); + GtkWidget* _tmp8_; + GtkWidget* _tmp9_; #line 829 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp6_ = self->button; +#line 829 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_button_get_type (), GtkButton), _ ("Rating")); +#line 830 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp7_ = self->button; +#line 830 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp8_ = search_filter_toolbar_rating_filter_button_get_filter_icon (self, filter); +#line 830 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp9_ = _tmp8_; +#line 830 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_button_get_type (), GtkButton), _tmp9_); +#line 830 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_object_unref0 (_tmp9_); +#line 831 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 7787 "SearchFilter.c" +#line 8223 "SearchFilter.c" } } -#line 832 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp12_ = filter; -#line 832 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp13_ = search_filter_toolbar_rating_filter_button_get_filter_button_size (self, _tmp12_); -#line 832 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp13_, -1); -#line 833 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp14_ = filter; -#line 833 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp15_ = resources_get_rating_filter_tooltip (_tmp14_); -#line 833 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp16_ = _tmp15_; -#line 833 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tool_item_get_type (), GtkToolItem), _tmp16_); -#line 833 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_free0 (_tmp16_); #line 834 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_has_tooltip (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), search_filter_toolbar_rating_filter_button_get_filter_button_size (self, filter), -1); +#line 835 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp10_ = resources_get_rating_filter_tooltip (filter); +#line 835 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp11_ = _tmp10_; #line 835 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tool_item_get_type (), GtkToolItem), _tmp11_); +#line 835 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_free0 (_tmp11_); +#line 836 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_widget_set_has_tooltip (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), TRUE); +#line 837 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 7810 "SearchFilter.c" +#line 8240 "SearchFilter.c" } -static gint search_filter_toolbar_rating_filter_button_get_filter_button_size (SearchFilterToolbarRatingFilterButton* self, RatingFilter filter) { +static gint +search_filter_toolbar_rating_filter_button_get_filter_button_size (SearchFilterToolbarRatingFilterButton* self, + RatingFilter filter) +{ gint result = 0; - RatingFilter _tmp0_; - gint _tmp1_; -#line 838 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 840 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_IS_RATING_FILTER_BUTTON (self), 0); -#line 839 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = filter; -#line 839 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = search_filter_toolbar_rating_filter_button_get_filter_icon_size (self, _tmp0_); -#line 839 "/home/jens/Source/shotwell/src/SearchFilter.vala" - result = _tmp1_ + (2 * SEARCH_FILTER_TOOLBAR_FILTER_BUTTON_MARGIN); -#line 839 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 841 "/home/jens/Source/shotwell/src/SearchFilter.vala" + result = search_filter_toolbar_rating_filter_button_get_filter_icon_size (self, filter) + (2 * SEARCH_FILTER_TOOLBAR_FILTER_BUTTON_MARGIN); +#line 841 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7828 "SearchFilter.c" +#line 8255 "SearchFilter.c" } -void search_filter_toolbar_rating_filter_button_set_label (SearchFilterToolbarRatingFilterButton* self, const gchar* label) { +void +search_filter_toolbar_rating_filter_button_set_label (SearchFilterToolbarRatingFilterButton* self, + const gchar* label) +{ GtkMenuButton* _tmp0_; - const gchar* _tmp1_; -#line 842 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 844 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_RATING_FILTER_BUTTON (self)); -#line 842 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 844 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (label != NULL); -#line 843 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 845 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->button; -#line 843 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = label; -#line 843 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_); -#line 7845 "SearchFilter.c" +#line 845 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), label); +#line 8272 "SearchFilter.c" } -static void search_filter_toolbar_rating_filter_button_class_init (SearchFilterToolbarRatingFilterButtonClass * klass) { -#line 737 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_rating_filter_button_class_init (SearchFilterToolbarRatingFilterButtonClass * klass) +{ +#line 739 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_rating_filter_button_parent_class = g_type_class_peek_parent (klass); -#line 737 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 739 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_rating_filter_button_finalize; -#line 7854 "SearchFilter.c" +#line 8283 "SearchFilter.c" } -static void search_filter_toolbar_rating_filter_button_instance_init (SearchFilterToolbarRatingFilterButton * self) { +static void +search_filter_toolbar_rating_filter_button_instance_init (SearchFilterToolbarRatingFilterButton * self) +{ } -static void search_filter_toolbar_rating_filter_button_finalize (GObject * obj) { +static void +search_filter_toolbar_rating_filter_button_finalize (GObject * obj) +{ SearchFilterToolbarRatingFilterButton * self; -#line 737 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 739 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_RATING_FILTER_BUTTON, SearchFilterToolbarRatingFilterButton); -#line 738 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 740 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->button); -#line 737 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 739 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (search_filter_toolbar_rating_filter_button_parent_class)->finalize (obj); -#line 7870 "SearchFilter.c" +#line 8303 "SearchFilter.c" } -GType search_filter_toolbar_rating_filter_button_get_type (void) { +GType +search_filter_toolbar_rating_filter_button_get_type (void) +{ static volatile gsize search_filter_toolbar_rating_filter_button_type_id__volatile = 0; if (g_once_init_enter (&search_filter_toolbar_rating_filter_button_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SearchFilterToolbarRatingFilterButtonClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) search_filter_toolbar_rating_filter_button_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchFilterToolbarRatingFilterButton), 0, (GInstanceInitFunc) search_filter_toolbar_rating_filter_button_instance_init, NULL }; @@ -7882,14 +8317,19 @@ GType search_filter_toolbar_rating_filter_button_get_type (void) { } -static void _search_filter_toolbar_saved_search_filter_button_on_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 873 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_saved_search_filter_button_on_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ +#line 875 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_filter_button_on_clicked ((SearchFilterToolbarSavedSearchFilterButton*) self); -#line 7889 "SearchFilter.c" +#line 8327 "SearchFilter.c" } -SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_filter_button_construct (GType object_type) { +SearchFilterToolbarSavedSearchFilterButton* +search_filter_toolbar_saved_search_filter_button_construct (GType object_type) +{ SearchFilterToolbarSavedSearchFilterButton * self = NULL; GtkToggleButton* _tmp0_; GtkToggleButton* _tmp1_; @@ -7899,162 +8339,176 @@ SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_f GtkToggleButton* _tmp4_; GtkToggleButton* _tmp5_; GtkToggleButton* _tmp6_; -#line 854 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 856 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = (SearchFilterToolbarSavedSearchFilterButton*) g_object_new (object_type, NULL); -#line 855 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 857 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = (GtkToggleButton*) gtk_toggle_button_new (); -#line 855 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 857 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_object_ref_sink (_tmp0_); -#line 855 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 857 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->button); -#line 855 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 857 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->button = _tmp0_; -#line 856 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = self->button; -#line 856 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_button_set_always_show_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_button_get_type (), GtkButton), TRUE); #line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = (GtkImage*) gtk_image_new_from_icon_name ("edit-find", GTK_ICON_SIZE_SMALL_TOOLBAR); + _tmp1_ = self->button; #line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_button_set_always_show_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_button_get_type (), GtkButton), TRUE); +#line 860 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp2_ = (GtkImage*) gtk_image_new_from_icon_name ("edit-find", (GtkIconSize) GTK_ICON_SIZE_SMALL_TOOLBAR); +#line 860 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_object_ref_sink (_tmp2_); -#line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 860 "/home/jens/Source/shotwell/src/SearchFilter.vala" image = _tmp2_; -#line 859 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 861 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget), 6); -#line 860 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 862 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = self->button; -#line 860 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 862 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_button_get_type (), GtkButton), G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget)); -#line 861 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 863 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4_ = self->button; -#line 861 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), FALSE); #line 863 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), FALSE); +#line 865 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = self->button; -#line 863 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _search_filter_toolbar_saved_search_filter_button_on_clicked_gtk_button_clicked, self, 0); #line 865 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_toolbar_saved_search_filter_button_restyle (self); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _search_filter_toolbar_saved_search_filter_button_on_clicked_gtk_button_clicked, self, 0); #line 867 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_tool_item_set_homogeneous (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tool_item_get_type (), GtkToolItem), FALSE); + search_filter_toolbar_saved_search_filter_button_restyle (self); #line 869 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_tool_item_set_homogeneous (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tool_item_get_type (), GtkToolItem), FALSE); +#line 871 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp6_ = self->button; -#line 869 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 871 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); -#line 854 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 856 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (image); -#line 854 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 856 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 7949 "SearchFilter.c" +#line 8389 "SearchFilter.c" } -SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_filter_button_new (void) { -#line 854 "/home/jens/Source/shotwell/src/SearchFilter.vala" +SearchFilterToolbarSavedSearchFilterButton* +search_filter_toolbar_saved_search_filter_button_new (void) +{ +#line 856 "/home/jens/Source/shotwell/src/SearchFilter.vala" return search_filter_toolbar_saved_search_filter_button_construct (SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_FILTER_BUTTON); -#line 7956 "SearchFilter.c" +#line 8398 "SearchFilter.c" } -static void search_filter_toolbar_saved_search_filter_button_on_clicked (SearchFilterToolbarSavedSearchFilterButton* self) { -#line 876 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_saved_search_filter_button_on_clicked (SearchFilterToolbarSavedSearchFilterButton* self) +{ +#line 878 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_FILTER_BUTTON (self)); -#line 877 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 879 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit (self, search_filter_toolbar_saved_search_filter_button_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_FILTER_BUTTON_CLICKED_SIGNAL], 0); -#line 7965 "SearchFilter.c" +#line 8409 "SearchFilter.c" } -void search_filter_toolbar_saved_search_filter_button_set_active (SearchFilterToolbarSavedSearchFilterButton* self, gboolean active) { +void +search_filter_toolbar_saved_search_filter_button_set_active (SearchFilterToolbarSavedSearchFilterButton* self, + gboolean active) +{ GtkToggleButton* _tmp0_; - gboolean _tmp1_; -#line 880 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 882 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_FILTER_BUTTON (self)); -#line 881 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 883 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->button; -#line 881 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = active; -#line 881 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_toggle_button_set_active (_tmp0_, _tmp1_); -#line 7980 "SearchFilter.c" +#line 883 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_toggle_button_set_active (_tmp0_, active); +#line 8424 "SearchFilter.c" } -void search_filter_toolbar_saved_search_filter_button_set_label (SearchFilterToolbarSavedSearchFilterButton* self, const gchar* label) { +void +search_filter_toolbar_saved_search_filter_button_set_label (SearchFilterToolbarSavedSearchFilterButton* self, + const gchar* label) +{ GtkToggleButton* _tmp0_; - const gchar* _tmp1_; -#line 884 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 886 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_FILTER_BUTTON (self)); -#line 884 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 886 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (label != NULL); -#line 885 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 887 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->button; -#line 885 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = label; -#line 885 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_); -#line 7997 "SearchFilter.c" +#line 887 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), label); +#line 8441 "SearchFilter.c" } -void search_filter_toolbar_saved_search_filter_button_restyle (SearchFilterToolbarSavedSearchFilterButton* self) { +void +search_filter_toolbar_saved_search_filter_button_restyle (SearchFilterToolbarSavedSearchFilterButton* self) +{ GtkToggleButton* _tmp0_; GtkToggleButton* _tmp1_; -#line 888 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 890 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_FILTER_BUTTON (self)); -#line 889 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 891 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->button; -#line 889 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 891 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), 24, 24); -#line 890 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 892 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = self->button; -#line 890 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 892 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_button_set_relief (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_button_get_type (), GtkButton), GTK_RELIEF_NONE); -#line 8014 "SearchFilter.c" +#line 8460 "SearchFilter.c" } -static void search_filter_toolbar_saved_search_filter_button_class_init (SearchFilterToolbarSavedSearchFilterButtonClass * klass) { -#line 848 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_saved_search_filter_button_class_init (SearchFilterToolbarSavedSearchFilterButtonClass * klass) +{ +#line 850 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_filter_button_parent_class = g_type_class_peek_parent (klass); -#line 848 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 850 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_saved_search_filter_button_finalize; -#line 848 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 850 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_filter_button_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_FILTER_BUTTON_CLICKED_SIGNAL] = g_signal_new ("clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_FILTER_BUTTON, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 8025 "SearchFilter.c" +#line 8473 "SearchFilter.c" } -static void search_filter_toolbar_saved_search_filter_button_instance_init (SearchFilterToolbarSavedSearchFilterButton * self) { -#line 849 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_saved_search_filter_button_instance_init (SearchFilterToolbarSavedSearchFilterButton * self) +{ +#line 851 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->filter_popup = NULL; -#line 8032 "SearchFilter.c" +#line 8482 "SearchFilter.c" } -static void search_filter_toolbar_saved_search_filter_button_finalize (GObject * obj) { +static void +search_filter_toolbar_saved_search_filter_button_finalize (GObject * obj) +{ SearchFilterToolbarSavedSearchFilterButton * self; GtkToggleButton* _tmp0_; guint _tmp1_; -#line 848 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 850 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_FILTER_BUTTON, SearchFilterToolbarSavedSearchFilterButton); -#line 873 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 875 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->button; -#line 873 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 875 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp1_, NULL, FALSE); -#line 873 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 875 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_filter_button_on_clicked_gtk_button_clicked, self); -#line 849 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 851 "/home/jens/Source/shotwell/src/SearchFilter.vala" _search_filter_toolbar_saved_search_popover_unref0 (self->filter_popup); -#line 850 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 852 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->button); -#line 848 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 850 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (search_filter_toolbar_saved_search_filter_button_parent_class)->finalize (obj); -#line 8054 "SearchFilter.c" +#line 8506 "SearchFilter.c" } -GType search_filter_toolbar_saved_search_filter_button_get_type (void) { +GType +search_filter_toolbar_saved_search_filter_button_get_type (void) +{ static volatile gsize search_filter_toolbar_saved_search_filter_button_type_id__volatile = 0; if (g_once_init_enter (&search_filter_toolbar_saved_search_filter_button_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SearchFilterToolbarSavedSearchFilterButtonClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) search_filter_toolbar_saved_search_filter_button_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchFilterToolbarSavedSearchFilterButton), 0, (GInstanceInitFunc) search_filter_toolbar_saved_search_filter_button_instance_init, NULL }; @@ -8066,877 +8520,923 @@ GType search_filter_toolbar_saved_search_filter_button_get_type (void) { } -static void _search_filter_toolbar_saved_search_popover_on_edit_click_search_filter_toolbar_saved_search_popover_data_button_clicked (SearchFilterToolbarSavedSearchPopoverDataButton* _sender, SavedSearch* search, gpointer self) { -#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_saved_search_popover_on_edit_click_search_filter_toolbar_saved_search_popover_data_button_clicked (SearchFilterToolbarSavedSearchPopoverDataButton* _sender, + SavedSearch* search, + gpointer self) +{ +#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_on_edit_click ((SearchFilterToolbarSavedSearchPopover*) self, search); -#line 8073 "SearchFilter.c" +#line 8531 "SearchFilter.c" } -static void _search_filter_toolbar_saved_search_popover_on_delete_click_search_filter_toolbar_saved_search_popover_data_button_clicked (SearchFilterToolbarSavedSearchPopoverDataButton* _sender, SavedSearch* search, gpointer self) { -#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_saved_search_popover_on_delete_click_search_filter_toolbar_saved_search_popover_data_button_clicked (SearchFilterToolbarSavedSearchPopoverDataButton* _sender, + SavedSearch* search, + gpointer self) +{ +#line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_on_delete_click ((SearchFilterToolbarSavedSearchPopover*) self, search); -#line 8080 "SearchFilter.c" +#line 8542 "SearchFilter.c" } -static void _search_filter_toolbar_saved_search_popover_on_add_click_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_saved_search_popover_on_add_click_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ +#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_on_add_click ((SearchFilterToolbarSavedSearchPopover*) self); -#line 8087 "SearchFilter.c" +#line 8552 "SearchFilter.c" } -static void _search_filter_toolbar_saved_search_popover_on_activate_row_gtk_list_box_row_activated (GtkListBox* _sender, GtkListBoxRow* row, gpointer self) { -#line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_saved_search_popover_on_activate_row_gtk_list_box_row_activated (GtkListBox* _sender, + GtkListBoxRow* row, + gpointer self) +{ +#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_on_activate_row ((SearchFilterToolbarSavedSearchPopover*) self, row); -#line 8094 "SearchFilter.c" +#line 8563 "SearchFilter.c" } -static void _search_filter_toolbar_saved_search_popover_on_popover_closed_gtk_popover_closed (GtkPopover* _sender, gpointer self) { -#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_saved_search_popover_on_popover_closed_gtk_popover_closed (GtkPopover* _sender, + gpointer self) +{ +#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_on_popover_closed ((SearchFilterToolbarSavedSearchPopover*) self); -#line 8101 "SearchFilter.c" +#line 8573 "SearchFilter.c" } -static void _vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton** * array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value) { -#line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton** * array, + int* length, + int* size, + SearchFilterToolbarSavedSearchPopoverDataButton* value) +{ +#line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala" if ((*length) == (*size)) { -#line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala" *array = g_renew (SearchFilterToolbarSavedSearchPopoverDataButton*, *array, (*size) + 1); -#line 8112 "SearchFilter.c" +#line 8589 "SearchFilter.c" } -#line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala" (*array)[(*length)++] = value; -#line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala" (*array)[*length] = NULL; -#line 8118 "SearchFilter.c" +#line 8595 "SearchFilter.c" } -static void _vala_array_add135 (SearchFilterToolbarSavedSearchPopoverDataButton** * array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value) { -#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_vala_array_add135 (SearchFilterToolbarSavedSearchPopoverDataButton** * array, + int* length, + int* size, + SearchFilterToolbarSavedSearchPopoverDataButton* value) +{ +#line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala" if ((*length) == (*size)) { -#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala" *array = g_renew (SearchFilterToolbarSavedSearchPopoverDataButton*, *array, (*size) + 1); -#line 8129 "SearchFilter.c" +#line 8611 "SearchFilter.c" } -#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala" (*array)[(*length)++] = value; -#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala" (*array)[*length] = NULL; -#line 8135 "SearchFilter.c" +#line 8617 "SearchFilter.c" } -SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popover_construct (GType object_type, GtkWidget* relative_to) { +SearchFilterToolbarSavedSearchPopover* +search_filter_toolbar_saved_search_popover_construct (GType object_type, + GtkWidget* relative_to) +{ SearchFilterToolbarSavedSearchPopover* self = NULL; - GtkWidget* _tmp0_; + GtkPopover* _tmp0_; GtkPopover* _tmp1_; - GtkPopover* _tmp2_; - GtkListBox* _tmp3_; + GtkListBox* _tmp2_; + SearchFilterToolbarSavedSearchPopoverDataButton** _tmp3_; SearchFilterToolbarSavedSearchPopoverDataButton** _tmp4_; - SearchFilterToolbarSavedSearchPopoverDataButton** _tmp5_; - GtkButton* _tmp44_; + GtkButton* _tmp42_; + GtkButton* _tmp43_; + GtkListBox* _tmp44_; GtkButton* _tmp45_; GtkListBox* _tmp46_; - GtkButton* _tmp47_; - GtkListBox* _tmp48_; + GtkListBox* _tmp47_; + GtkPopover* _tmp48_; GtkListBox* _tmp49_; - GtkPopover* _tmp50_; - GtkListBox* _tmp51_; -#line 938 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_return_val_if_fail (GTK_IS_WIDGET (relative_to), NULL); -#line 938 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self = (SearchFilterToolbarSavedSearchPopover*) g_type_create_instance (object_type); -#line 939 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = relative_to; -#line 939 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = (GtkPopover*) gtk_popover_new (_tmp0_); -#line 939 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp1_); -#line 939 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_object_unref0 (self->priv->popover); -#line 939 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->popover = _tmp1_; #line 940 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = self->priv->popover; + g_return_val_if_fail (GTK_IS_WIDGET (relative_to), NULL); #line 940 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect (_tmp2_, "closed", (GCallback) _search_filter_toolbar_saved_search_popover_on_popover_closed_gtk_popover_closed, self); + self = (SearchFilterToolbarSavedSearchPopover*) g_type_create_instance (object_type); #line 941 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = (GtkListBox*) gtk_list_box_new (); + _tmp0_ = (GtkPopover*) gtk_popover_new (relative_to); #line 941 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp3_); + g_object_ref_sink (_tmp0_); #line 941 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_object_unref0 (self->priv->list_box); + _g_object_unref0 (self->priv->popover); #line 941 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->list_box = _tmp3_; -#line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = g_new0 (SearchFilterToolbarSavedSearchPopoverDataButton*, 0 + 1); -#line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->edit_buttons = (_vala_array_free (self->priv->edit_buttons, self->priv->edit_buttons_length1, (GDestroyNotify) g_object_unref), NULL); -#line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->edit_buttons = _tmp4_; + self->priv->popover = _tmp0_; #line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->edit_buttons_length1 = 0; + _tmp1_ = self->priv->popover; #line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->_edit_buttons_size_ = self->priv->edit_buttons_length1; + g_signal_connect (_tmp1_, "closed", (GCallback) _search_filter_toolbar_saved_search_popover_on_popover_closed_gtk_popover_closed, self); #line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = g_new0 (SearchFilterToolbarSavedSearchPopoverDataButton*, 0 + 1); + _tmp2_ = (GtkListBox*) gtk_list_box_new (); #line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->delete_buttons = (_vala_array_free (self->priv->delete_buttons, self->priv->delete_buttons_length1, (GDestroyNotify) g_object_unref), NULL); + g_object_ref_sink (_tmp2_); #line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->delete_buttons = _tmp5_; + _g_object_unref0 (self->priv->list_box); #line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->list_box = _tmp2_; +#line 944 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp3_ = g_new0 (SearchFilterToolbarSavedSearchPopoverDataButton*, 0 + 1); +#line 944 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->edit_buttons = (_vala_array_free (self->priv->edit_buttons, self->priv->edit_buttons_length1, (GDestroyNotify) g_object_unref), NULL); +#line 944 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->edit_buttons = _tmp3_; +#line 944 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->edit_buttons_length1 = 0; +#line 944 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->_edit_buttons_size_ = self->priv->edit_buttons_length1; +#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp4_ = g_new0 (SearchFilterToolbarSavedSearchPopoverDataButton*, 0 + 1); +#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->delete_buttons = (_vala_array_free (self->priv->delete_buttons, self->priv->delete_buttons_length1, (GDestroyNotify) g_object_unref), NULL); +#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->delete_buttons = _tmp4_; +#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->delete_buttons_length1 = 0; -#line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->_delete_buttons_size_ = self->priv->delete_buttons_length1; -#line 8201 "SearchFilter.c" +#line 8683 "SearchFilter.c" { GeeIterator* _search_it = NULL; + SavedSearchTable* _tmp5_; SavedSearchTable* _tmp6_; - SavedSearchTable* _tmp7_; + GeeCollection* _tmp7_; GeeCollection* _tmp8_; - GeeCollection* _tmp9_; + GeeIterator* _tmp9_; GeeIterator* _tmp10_; - GeeIterator* _tmp11_; -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = saved_search_table_get_instance (); -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp7_ = _tmp6_; -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = saved_search_table_get_all (_tmp7_); -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp9_ = _tmp8_; -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp11_ = _tmp10_; -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_object_unref0 (_tmp9_); -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _saved_search_table_unref0 (_tmp7_); -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _search_it = _tmp11_; -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp5_ = saved_search_table_get_instance (); +#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp6_ = _tmp5_; +#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp7_ = saved_search_table_get_all (_tmp6_); +#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp8_ = _tmp7_; +#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); +#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp10_ = _tmp9_; +#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_object_unref0 (_tmp8_); +#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _saved_search_table_unref0 (_tmp6_); +#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _search_it = _tmp10_; +#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" while (TRUE) { -#line 8230 "SearchFilter.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 8712 "SearchFilter.c" + GeeIterator* _tmp11_; SavedSearch* search = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; + GeeIterator* _tmp12_; + gpointer _tmp13_; GtkBox* row = NULL; - GtkBox* _tmp16_; - GtkBox* _tmp17_; + GtkBox* _tmp14_; + GtkBox* _tmp15_; GtkLabel* label = NULL; - SavedSearch* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; + SavedSearch* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + GtkLabel* _tmp19_; + GtkLabel* _tmp20_; GtkLabel* _tmp21_; - GtkLabel* _tmp22_; + GtkBox* _tmp22_; GtkLabel* _tmp23_; - GtkBox* _tmp24_; - GtkLabel* _tmp25_; SearchFilterToolbarSavedSearchPopoverDataButton* delete_button = NULL; - SavedSearch* _tmp26_; + SavedSearch* _tmp24_; + SearchFilterToolbarSavedSearchPopoverDataButton* _tmp25_; + GtkBox* _tmp26_; SearchFilterToolbarSavedSearchPopoverDataButton* _tmp27_; - GtkBox* _tmp28_; - SearchFilterToolbarSavedSearchPopoverDataButton* _tmp29_; + SearchFilterToolbarSavedSearchPopoverDataButton* _tmp28_; + SearchFilterToolbarSavedSearchPopoverDataButton** _tmp29_; + gint _tmp29__length1; SearchFilterToolbarSavedSearchPopoverDataButton* _tmp30_; - SearchFilterToolbarSavedSearchPopoverDataButton** _tmp31_; - gint _tmp31__length1; - SearchFilterToolbarSavedSearchPopoverDataButton* _tmp32_; - SearchFilterToolbarSavedSearchPopoverDataButton* _tmp33_; + SearchFilterToolbarSavedSearchPopoverDataButton* _tmp31_; SearchFilterToolbarSavedSearchPopoverDataButton* edit_button = NULL; - SavedSearch* _tmp34_; + SavedSearch* _tmp32_; + SearchFilterToolbarSavedSearchPopoverDataButton* _tmp33_; + GtkBox* _tmp34_; SearchFilterToolbarSavedSearchPopoverDataButton* _tmp35_; - GtkBox* _tmp36_; - SearchFilterToolbarSavedSearchPopoverDataButton* _tmp37_; + SearchFilterToolbarSavedSearchPopoverDataButton* _tmp36_; + SearchFilterToolbarSavedSearchPopoverDataButton** _tmp37_; + gint _tmp37__length1; SearchFilterToolbarSavedSearchPopoverDataButton* _tmp38_; - SearchFilterToolbarSavedSearchPopoverDataButton** _tmp39_; - gint _tmp39__length1; - SearchFilterToolbarSavedSearchPopoverDataButton* _tmp40_; - SearchFilterToolbarSavedSearchPopoverDataButton* _tmp41_; - GtkListBox* _tmp42_; - GtkBox* _tmp43_; -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp12_ = _search_it; -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp13_ = gee_iterator_next (_tmp12_); -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (!_tmp13_) { -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" + SearchFilterToolbarSavedSearchPopoverDataButton* _tmp39_; + GtkListBox* _tmp40_; + GtkBox* _tmp41_; +#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp11_ = _search_it; +#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" + if (!gee_iterator_next (_tmp11_)) { +#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 8278 "SearchFilter.c" +#line 8757 "SearchFilter.c" } -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp14_ = _search_it; -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp15_ = gee_iterator_get (_tmp14_); -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search = (SavedSearch*) _tmp15_; -#line 946 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp16_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1); -#line 946 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp16_); -#line 946 "/home/jens/Source/shotwell/src/SearchFilter.vala" - row = _tmp16_; #line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp17_ = row; + _tmp12_ = _search_it; #line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_box_set_homogeneous (_tmp17_, FALSE); -#line 948 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp18_ = search; -#line 948 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp19_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_OBJECT, DataObject)); -#line 948 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp20_ = _tmp19_; -#line 948 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp21_ = (GtkLabel*) gtk_label_new (_tmp20_); -#line 948 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp21_); + _tmp13_ = gee_iterator_get (_tmp12_); +#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" + search = (SavedSearch*) _tmp13_; #line 948 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp22_ = _tmp21_; + _tmp14_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1); #line 948 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_free0 (_tmp20_); + g_object_ref_sink (_tmp14_); #line 948 "/home/jens/Source/shotwell/src/SearchFilter.vala" - label = _tmp22_; + row = _tmp14_; #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp23_ = label; + _tmp15_ = row; #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); + gtk_box_set_homogeneous (_tmp15_, FALSE); #line 950 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp24_ = row; + _tmp16_ = search; #line 950 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp25_ = label; + _tmp17_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject)); #line 950 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 3); -#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp26_ = search; + _tmp18_ = _tmp17_; +#line 950 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp19_ = (GtkLabel*) gtk_label_new (_tmp18_); +#line 950 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_object_ref_sink (_tmp19_); +#line 950 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp20_ = _tmp19_; +#line 950 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_free0 (_tmp18_); +#line 950 "/home/jens/Source/shotwell/src/SearchFilter.vala" + label = _tmp20_; +#line 951 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp21_ = label; +#line 951 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); #line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp27_ = search_filter_toolbar_saved_search_popover_data_button_new (_tmp26_, "edit-delete-symbolic"); + _tmp22_ = row; #line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp27_); + _tmp23_ = label; #line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala" - delete_button = _tmp27_; -#line 953 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp28_ = row; -#line 953 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp29_ = delete_button; -#line 953 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_box_pack_end (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 3); #line 954 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp30_ = delete_button; + _tmp24_ = search; #line 954 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect (_tmp30_, "clicked", (GCallback) _search_filter_toolbar_saved_search_popover_on_delete_click_search_filter_toolbar_saved_search_popover_data_button_clicked, self); -#line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp31_ = self->priv->delete_buttons; -#line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp31__length1 = self->priv->delete_buttons_length1; + _tmp25_ = search_filter_toolbar_saved_search_popover_data_button_new (_tmp24_, "edit-delete-symbolic"); +#line 954 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_object_ref_sink (_tmp25_); +#line 954 "/home/jens/Source/shotwell/src/SearchFilter.vala" + delete_button = _tmp25_; #line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp32_ = delete_button; + _tmp26_ = row; #line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp33_ = _g_object_ref0 (_tmp32_); + _tmp27_ = delete_button; #line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _vala_array_add134 (&self->priv->delete_buttons, &self->priv->delete_buttons_length1, &self->priv->_delete_buttons_size_, _tmp33_); + gtk_box_pack_end (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); +#line 956 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp28_ = delete_button; +#line 956 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_connect (_tmp28_, "clicked", (GCallback) _search_filter_toolbar_saved_search_popover_on_delete_click_search_filter_toolbar_saved_search_popover_data_button_clicked, self); +#line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp29_ = self->priv->delete_buttons; #line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp34_ = search; + _tmp29__length1 = self->priv->delete_buttons_length1; #line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp35_ = search_filter_toolbar_saved_search_popover_data_button_new (_tmp34_, "text-editor-symbolic"); + _tmp30_ = delete_button; #line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp35_); + _tmp31_ = _g_object_ref0 (_tmp30_); #line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala" - edit_button = _tmp35_; -#line 958 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp36_ = row; -#line 958 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp37_ = edit_button; -#line 958 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_box_pack_end (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + _vala_array_add134 (&self->priv->delete_buttons, &self->priv->delete_buttons_length1, &self->priv->_delete_buttons_size_, _tmp31_); #line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp38_ = edit_button; + _tmp32_ = search; #line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect (_tmp38_, "clicked", (GCallback) _search_filter_toolbar_saved_search_popover_on_edit_click_search_filter_toolbar_saved_search_popover_data_button_clicked, self); -#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp39_ = self->priv->edit_buttons; -#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp39__length1 = self->priv->edit_buttons_length1; + _tmp33_ = search_filter_toolbar_saved_search_popover_data_button_new (_tmp32_, "text-editor-symbolic"); +#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_object_ref_sink (_tmp33_); +#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala" + edit_button = _tmp33_; #line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp40_ = edit_button; + _tmp34_ = row; #line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp41_ = _g_object_ref0 (_tmp40_); + _tmp35_ = edit_button; #line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _vala_array_add135 (&self->priv->edit_buttons, &self->priv->edit_buttons_length1, &self->priv->_edit_buttons_size_, _tmp41_); + gtk_box_pack_end (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); +#line 961 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp36_ = edit_button; +#line 961 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_connect (_tmp36_, "clicked", (GCallback) _search_filter_toolbar_saved_search_popover_on_edit_click_search_filter_toolbar_saved_search_popover_data_button_clicked, self); #line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp42_ = self->priv->list_box; + _tmp37_ = self->priv->edit_buttons; #line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp43_ = row; + _tmp37__length1 = self->priv->edit_buttons_length1; #line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_list_box_insert (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), -1); -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp38_ = edit_button; +#line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp39_ = _g_object_ref0 (_tmp38_); +#line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _vala_array_add135 (&self->priv->edit_buttons, &self->priv->edit_buttons_length1, &self->priv->_edit_buttons_size_, _tmp39_); +#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp40_ = self->priv->list_box; +#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp41_ = row; +#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_list_box_insert (_tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), -1); +#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (edit_button); -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (delete_button); -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (label); -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (row); -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (search); -#line 8394 "SearchFilter.c" +#line 8873 "SearchFilter.c" } -#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (_search_it); -#line 8398 "SearchFilter.c" +#line 8877 "SearchFilter.c" } -#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp44_ = (GtkButton*) gtk_button_new_from_icon_name ("list-add-symbolic", GTK_ICON_SIZE_BUTTON); -#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp44_); -#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_object_unref0 (self->priv->add); -#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->add = _tmp44_; -#line 965 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp45_ = self->priv->add; -#line 965 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect (_tmp45_, "clicked", (GCallback) _search_filter_toolbar_saved_search_popover_on_add_click_gtk_button_clicked, self); #line 966 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp46_ = self->priv->list_box; + _tmp42_ = (GtkButton*) gtk_button_new_from_icon_name ("list-add-symbolic", (GtkIconSize) GTK_ICON_SIZE_BUTTON); #line 966 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp47_ = self->priv->add; + g_object_ref_sink (_tmp42_); #line 966 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_list_box_insert (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget), -1); + _g_object_unref0 (self->priv->add); +#line 966 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->add = _tmp42_; #line 967 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp48_ = self->priv->list_box; + _tmp43_ = self->priv->add; #line 967 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect (_tmp48_, "row-activated", (GCallback) _search_filter_toolbar_saved_search_popover_on_activate_row_gtk_list_box_row_activated, self); + g_signal_connect (_tmp43_, "clicked", (GCallback) _search_filter_toolbar_saved_search_popover_on_add_click_gtk_button_clicked, self); #line 968 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp49_ = self->priv->list_box; + _tmp44_ = self->priv->list_box; #line 968 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_list_box_set_selection_mode (_tmp49_, GTK_SELECTION_NONE); -#line 969 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp50_ = self->priv->popover; + _tmp45_ = self->priv->add; +#line 968 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_list_box_insert (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), -1); #line 969 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp51_ = self->priv->list_box; + _tmp46_ = self->priv->list_box; #line 969 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget)); + g_signal_connect (_tmp46_, "row-activated", (GCallback) _search_filter_toolbar_saved_search_popover_on_activate_row_gtk_list_box_row_activated, self); +#line 970 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp47_ = self->priv->list_box; +#line 970 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_list_box_set_selection_mode (_tmp47_, GTK_SELECTION_NONE); +#line 971 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp48_ = self->priv->popover; #line 971 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp49_ = self->priv->list_box; +#line 971 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget)); +#line 973 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_restyle (self); -#line 938 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 940 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 8436 "SearchFilter.c" +#line 8915 "SearchFilter.c" } -SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popover_new (GtkWidget* relative_to) { -#line 938 "/home/jens/Source/shotwell/src/SearchFilter.vala" +SearchFilterToolbarSavedSearchPopover* +search_filter_toolbar_saved_search_popover_new (GtkWidget* relative_to) +{ +#line 940 "/home/jens/Source/shotwell/src/SearchFilter.vala" return search_filter_toolbar_saved_search_popover_construct (SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, relative_to); -#line 8443 "SearchFilter.c" +#line 8924 "SearchFilter.c" } -void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSavedSearchPopover* self) { +void +search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSavedSearchPopover* self) +{ GtkButton* _tmp0_; SearchFilterToolbarSavedSearchPopoverDataButton** _tmp1_; gint _tmp1__length1; SearchFilterToolbarSavedSearchPopoverDataButton** _tmp4_; gint _tmp4__length1; -#line 982 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self)); -#line 983 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->add; -#line 983 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_button_set_relief (_tmp0_, GTK_RELIEF_NONE); -#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 986 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = self->priv->edit_buttons; -#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 986 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1__length1 = self->priv->edit_buttons_length1; -#line 8463 "SearchFilter.c" +#line 8946 "SearchFilter.c" { SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL; gint button_collection_length1 = 0; gint _button_collection_size_ = 0; gint button_it = 0; -#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 986 "/home/jens/Source/shotwell/src/SearchFilter.vala" button_collection = _tmp1_; -#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 986 "/home/jens/Source/shotwell/src/SearchFilter.vala" button_collection_length1 = _tmp1__length1; -#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 986 "/home/jens/Source/shotwell/src/SearchFilter.vala" for (button_it = 0; button_it < _tmp1__length1; button_it = button_it + 1) { -#line 8475 "SearchFilter.c" +#line 8958 "SearchFilter.c" SearchFilterToolbarSavedSearchPopoverDataButton* _tmp2_; SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL; -#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 986 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = _g_object_ref0 (button_collection[button_it]); -#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 986 "/home/jens/Source/shotwell/src/SearchFilter.vala" button = _tmp2_; -#line 8482 "SearchFilter.c" +#line 8965 "SearchFilter.c" { SearchFilterToolbarSavedSearchPopoverDataButton* _tmp3_; -#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 986 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = button; -#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 986 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_data_button_restyle (_tmp3_); -#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 986 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (button); -#line 8491 "SearchFilter.c" +#line 8974 "SearchFilter.c" } } } -#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 987 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4_ = self->priv->delete_buttons; -#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 987 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4__length1 = self->priv->delete_buttons_length1; -#line 8499 "SearchFilter.c" +#line 8982 "SearchFilter.c" { SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL; gint button_collection_length1 = 0; gint _button_collection_size_ = 0; gint button_it = 0; -#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 987 "/home/jens/Source/shotwell/src/SearchFilter.vala" button_collection = _tmp4_; -#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 987 "/home/jens/Source/shotwell/src/SearchFilter.vala" button_collection_length1 = _tmp4__length1; -#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 987 "/home/jens/Source/shotwell/src/SearchFilter.vala" for (button_it = 0; button_it < _tmp4__length1; button_it = button_it + 1) { -#line 8511 "SearchFilter.c" +#line 8994 "SearchFilter.c" SearchFilterToolbarSavedSearchPopoverDataButton* _tmp5_; SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL; -#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 987 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = _g_object_ref0 (button_collection[button_it]); -#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 987 "/home/jens/Source/shotwell/src/SearchFilter.vala" button = _tmp5_; -#line 8518 "SearchFilter.c" +#line 9001 "SearchFilter.c" { SearchFilterToolbarSavedSearchPopoverDataButton* _tmp6_; -#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 987 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp6_ = button; -#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 987 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_data_button_restyle (_tmp6_); -#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 987 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (button); -#line 8527 "SearchFilter.c" +#line 9010 "SearchFilter.c" } } } } -static gboolean search_filter_toolbar_saved_search_popover_is_search_row (SearchFilterToolbarSavedSearchPopover* self, GtkListBoxRow* row) { +static gboolean +search_filter_toolbar_saved_search_popover_is_search_row (SearchFilterToolbarSavedSearchPopover* self, + GtkListBoxRow* row) +{ gboolean result = FALSE; - GtkListBoxRow* _tmp0_; - GtkListBoxRow* _tmp1_; + GList* _tmp0_; + GList* _tmp1_; GList* _tmp2_; - GList* _tmp3_; - GList* _tmp4_; - gconstpointer _tmp5_; - gboolean _tmp6_; -#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gconstpointer _tmp3_; + gboolean _tmp4_; +#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self), FALSE); -#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail ((row == NULL) || GTK_IS_LIST_BOX_ROW (row), FALSE); -#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = row; -#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp0_ == NULL) { -#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 991 "/home/jens/Source/shotwell/src/SearchFilter.vala" + if (row == NULL) { +#line 991 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = FALSE; -#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 991 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 8555 "SearchFilter.c" +#line 9037 "SearchFilter.c" } -#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = row; -#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = gtk_container_get_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer)); -#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = _tmp2_; -#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = g_list_last (_tmp3_); -#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = _tmp4_->data; -#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE ((GtkWidget*) _tmp5_, gtk_button_get_type ()); -#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_list_free0 (_tmp3_); -#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp6_) { -#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 992 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp0_ = gtk_container_get_children (G_TYPE_CHECK_INSTANCE_CAST (row, gtk_container_get_type (), GtkContainer)); +#line 992 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp1_ = _tmp0_; +#line 992 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp2_ = g_list_last (_tmp1_); +#line 992 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp3_ = _tmp2_->data; +#line 992 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE ((GtkWidget*) _tmp3_, gtk_button_get_type ()); +#line 992 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_list_free0 (_tmp1_); +#line 992 "/home/jens/Source/shotwell/src/SearchFilter.vala" + if (_tmp4_) { +#line 992 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = FALSE; -#line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 992 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 8577 "SearchFilter.c" +#line 9057 "SearchFilter.c" } -#line 991 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 993 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = TRUE; -#line 991 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 993 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 8583 "SearchFilter.c" +#line 9063 "SearchFilter.c" } -static SavedSearch* search_filter_toolbar_saved_search_popover_get_search (SearchFilterToolbarSavedSearchPopover* self, GtkListBoxRow* row) { +static SavedSearch* +search_filter_toolbar_saved_search_popover_get_search (SearchFilterToolbarSavedSearchPopover* self, + GtkListBoxRow* row) +{ SavedSearch* result = NULL; SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL; - GtkListBoxRow* _tmp0_; + GList* _tmp0_; GList* _tmp1_; GList* _tmp2_; - GList* _tmp3_; - gconstpointer _tmp4_; - GtkWidget* _tmp5_; + gconstpointer _tmp3_; + GtkWidget* _tmp4_; + GList* _tmp5_; GList* _tmp6_; GList* _tmp7_; - GList* _tmp8_; - gconstpointer _tmp9_; - GtkWidget* _tmp10_; + gconstpointer _tmp8_; + GtkWidget* _tmp9_; + SearchFilterToolbarSavedSearchPopoverDataButton* _tmp10_; SearchFilterToolbarSavedSearchPopoverDataButton* _tmp11_; - SearchFilterToolbarSavedSearchPopoverDataButton* _tmp12_; + SavedSearch* _tmp12_; SavedSearch* _tmp13_; SavedSearch* _tmp14_; - SavedSearch* _tmp15_; -#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self), NULL); -#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_return_val_if_fail (GTK_IS_LIST_BOX_ROW (row), NULL); -#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = row; -#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = gtk_container_get_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer)); -#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = _tmp1_; -#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = g_list_first (_tmp2_); -#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = _tmp3_->data; -#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = (GtkWidget*) _tmp4_; -#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = gtk_container_get_children (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_box_get_type ()) ? ((GtkBox*) _tmp5_) : NULL, gtk_container_get_type (), GtkContainer)); -#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp7_ = _tmp6_; -#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = g_list_last (_tmp7_); -#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp9_ = _tmp8_->data; -#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp10_ = (GtkWidget*) _tmp9_; -#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON) ? ((SearchFilterToolbarSavedSearchPopoverDataButton*) _tmp10_) : NULL); -#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp12_ = _tmp11_; -#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_list_free0 (_tmp7_); -#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_list_free0 (_tmp2_); -#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala" - button = _tmp12_; #line 996 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp13_ = search_filter_toolbar_saved_search_popover_data_button_get_search (button); -#line 996 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp14_ = _tmp13_; -#line 996 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp15_ = _g_object_ref0 (_tmp14_); -#line 996 "/home/jens/Source/shotwell/src/SearchFilter.vala" - result = _tmp15_; + g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self), NULL); #line 996 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_return_val_if_fail (GTK_IS_LIST_BOX_ROW (row), NULL); +#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp0_ = gtk_container_get_children (G_TYPE_CHECK_INSTANCE_CAST (row, gtk_container_get_type (), GtkContainer)); +#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp1_ = _tmp0_; +#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp2_ = g_list_first (_tmp1_); +#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp3_ = _tmp2_->data; +#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp4_ = (GtkWidget*) _tmp3_; +#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp5_ = gtk_container_get_children (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, gtk_box_get_type ()) ? ((GtkBox*) _tmp4_) : NULL, gtk_container_get_type (), GtkContainer)); +#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp6_ = _tmp5_; +#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp7_ = g_list_last (_tmp6_); +#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp8_ = _tmp7_->data; +#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp9_ = (GtkWidget*) _tmp8_; +#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON) ? ((SearchFilterToolbarSavedSearchPopoverDataButton*) _tmp9_) : NULL); +#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp11_ = _tmp10_; +#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_list_free0 (_tmp6_); +#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_list_free0 (_tmp1_); +#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala" + button = _tmp11_; +#line 998 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp12_ = search_filter_toolbar_saved_search_popover_data_button_get_search (button); +#line 998 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp13_ = _tmp12_; +#line 998 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp14_ = _g_object_ref0 (_tmp13_); +#line 998 "/home/jens/Source/shotwell/src/SearchFilter.vala" + result = _tmp14_; +#line 998 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (button); -#line 996 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 998 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 8654 "SearchFilter.c" +#line 9134 "SearchFilter.c" } -static void search_filter_toolbar_saved_search_popover_on_activate_row (SearchFilterToolbarSavedSearchPopover* self, GtkListBoxRow* row) { - GtkListBoxRow* _tmp0_; - gboolean _tmp1_; - GtkPopover* _tmp5_; -#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self)); -#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_return_if_fail ((row == NULL) || GTK_IS_LIST_BOX_ROW (row)); -#line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = row; -#line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = search_filter_toolbar_saved_search_popover_is_search_row (self, _tmp0_); -#line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp1_) { -#line 8672 "SearchFilter.c" - GtkListBoxRow* _tmp2_; - SavedSearch* _tmp3_; - SavedSearch* _tmp4_; -#line 1001 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = row; -#line 1001 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = search_filter_toolbar_saved_search_popover_get_search (self, _tmp2_); -#line 1001 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = _tmp3_; +static void +search_filter_toolbar_saved_search_popover_on_activate_row (SearchFilterToolbarSavedSearchPopover* self, + GtkListBoxRow* row) +{ + GtkPopover* _tmp2_; #line 1001 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_emit (self, search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_SEARCH_ACTIVATED_SIGNAL], 0, _tmp4_); + g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self)); #line 1001 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_object_unref0 (_tmp4_); -#line 8686 "SearchFilter.c" - } -#line 1002 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = self->priv->popover; + g_return_if_fail ((row == NULL) || GTK_IS_LIST_BOX_ROW (row)); #line 1002 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget)); -#line 8692 "SearchFilter.c" + if (search_filter_toolbar_saved_search_popover_is_search_row (self, row)) { +#line 9149 "SearchFilter.c" + SavedSearch* _tmp0_; + SavedSearch* _tmp1_; +#line 1003 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp0_ = search_filter_toolbar_saved_search_popover_get_search (self, row); +#line 1003 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp1_ = _tmp0_; +#line 1003 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_emit (self, search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_SEARCH_ACTIVATED_SIGNAL], 0, _tmp1_); +#line 1003 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_object_unref0 (_tmp1_); +#line 9160 "SearchFilter.c" + } +#line 1004 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp2_ = self->priv->popover; +#line 1004 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); +#line 9166 "SearchFilter.c" } -static void search_filter_toolbar_saved_search_popover_on_edit_click (SearchFilterToolbarSavedSearchPopover* self, SavedSearch* search) { - SavedSearch* _tmp0_; -#line 1005 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_saved_search_popover_on_edit_click (SearchFilterToolbarSavedSearchPopover* self, + SavedSearch* search) +{ +#line 1007 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self)); -#line 1005 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1007 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SAVED_SEARCH (search)); -#line 1006 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = search; -#line 1006 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_emit (self, search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_EDIT_CLICKED_SIGNAL], 0, _tmp0_); -#line 8706 "SearchFilter.c" +#line 1008 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_emit (self, search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_EDIT_CLICKED_SIGNAL], 0, search); +#line 9180 "SearchFilter.c" } -static void search_filter_toolbar_saved_search_popover_on_delete_click (SearchFilterToolbarSavedSearchPopover* self, SavedSearch* search) { - SavedSearch* _tmp0_; -#line 1009 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_saved_search_popover_on_delete_click (SearchFilterToolbarSavedSearchPopover* self, + SavedSearch* search) +{ +#line 1011 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self)); -#line 1009 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1011 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SAVED_SEARCH (search)); -#line 1010 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = search; -#line 1010 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_emit (self, search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DELETE_CLICKED_SIGNAL], 0, _tmp0_); -#line 8720 "SearchFilter.c" +#line 1012 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_emit (self, search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DELETE_CLICKED_SIGNAL], 0, search); +#line 9194 "SearchFilter.c" } -static void search_filter_toolbar_saved_search_popover_on_add_click (SearchFilterToolbarSavedSearchPopover* self) { -#line 1013 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_saved_search_popover_on_add_click (SearchFilterToolbarSavedSearchPopover* self) +{ +#line 1015 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self)); -#line 1014 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1016 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit (self, search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_ADD_CLICKED_SIGNAL], 0); -#line 8729 "SearchFilter.c" +#line 9205 "SearchFilter.c" } -static void search_filter_toolbar_saved_search_popover_on_popover_closed (SearchFilterToolbarSavedSearchPopover* self) { -#line 1017 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_saved_search_popover_on_popover_closed (SearchFilterToolbarSavedSearchPopover* self) +{ +#line 1019 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self)); -#line 1018 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1020 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit (self, search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_CLOSED_SIGNAL], 0); -#line 8738 "SearchFilter.c" +#line 9216 "SearchFilter.c" } -void search_filter_toolbar_saved_search_popover_show_all (SearchFilterToolbarSavedSearchPopover* self) { +void +search_filter_toolbar_saved_search_popover_show_all (SearchFilterToolbarSavedSearchPopover* self) +{ GtkPopover* _tmp0_; -#line 1021 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1023 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self)); -#line 1022 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1024 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->popover; -#line 1022 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1024 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 8750 "SearchFilter.c" +#line 9230 "SearchFilter.c" } -void search_filter_toolbar_saved_search_popover_hide (SearchFilterToolbarSavedSearchPopover* self) { +void +search_filter_toolbar_saved_search_popover_hide (SearchFilterToolbarSavedSearchPopover* self) +{ GtkPopover* _tmp0_; -#line 1025 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1027 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self)); -#line 1026 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1028 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->popover; -#line 1026 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1028 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 8762 "SearchFilter.c" +#line 9244 "SearchFilter.c" } -static void _search_filter_toolbar_saved_search_popover_data_button_on_click_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 925 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +_search_filter_toolbar_saved_search_popover_data_button_on_click_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ +#line 927 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_data_button_on_click ((SearchFilterToolbarSavedSearchPopoverDataButton*) self); -#line 8769 "SearchFilter.c" +#line 9254 "SearchFilter.c" } -static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_saved_search_popover_data_button_construct (GType object_type, SavedSearch* search, const gchar* name) { +static SearchFilterToolbarSavedSearchPopoverDataButton* +search_filter_toolbar_saved_search_popover_data_button_construct (GType object_type, + SavedSearch* search, + const gchar* name) +{ SearchFilterToolbarSavedSearchPopoverDataButton * self = NULL; - const gchar* _tmp0_; + GtkButton* _tmp0_; GtkButton* _tmp1_; - SavedSearch* _tmp2_; - GtkButton* _tmp3_; - GtkButton* _tmp4_; -#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala" + GtkButton* _tmp2_; +#line 916 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL); -#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_return_val_if_fail (name != NULL, NULL); -#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self = (SearchFilterToolbarSavedSearchPopoverDataButton*) g_object_new (object_type, NULL); -#line 915 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = name; -#line 915 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = (GtkButton*) gtk_button_new_from_icon_name (_tmp0_, GTK_ICON_SIZE_SMALL_TOOLBAR); -#line 915 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp1_); -#line 915 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_object_unref0 (self->priv->button); -#line 915 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->button = _tmp1_; #line 916 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = search; + g_return_val_if_fail (name != NULL, NULL); #line 916 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_toolbar_saved_search_popover_data_button_set_search (self, _tmp2_); + self = (SearchFilterToolbarSavedSearchPopoverDataButton*) g_object_new (object_type, NULL); #line 917 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = self->priv->button; + _tmp0_ = (GtkButton*) gtk_button_new_from_icon_name (name, (GtkIconSize) GTK_ICON_SIZE_SMALL_TOOLBAR); +#line 917 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_object_ref_sink (_tmp0_); +#line 917 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_object_unref0 (self->priv->button); #line 917 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); + self->priv->button = _tmp0_; +#line 918 "/home/jens/Source/shotwell/src/SearchFilter.vala" + search_filter_toolbar_saved_search_popover_data_button_set_search (self, search); #line 919 "/home/jens/Source/shotwell/src/SearchFilter.vala" - search_filter_toolbar_saved_search_popover_data_button_restyle (self); -#line 921 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = self->priv->button; + _tmp1_ = self->priv->button; +#line 919 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); #line 921 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_connect_object (_tmp4_, "clicked", (GCallback) _search_filter_toolbar_saved_search_popover_data_button_on_click_gtk_button_clicked, self, 0); -#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala" + search_filter_toolbar_saved_search_popover_data_button_restyle (self); +#line 923 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp2_ = self->priv->button; +#line 923 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_connect_object (_tmp2_, "clicked", (GCallback) _search_filter_toolbar_saved_search_popover_data_button_on_click_gtk_button_clicked, self, 0); +#line 916 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 8812 "SearchFilter.c" +#line 9295 "SearchFilter.c" } -static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_saved_search_popover_data_button_new (SavedSearch* search, const gchar* name) { -#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static SearchFilterToolbarSavedSearchPopoverDataButton* +search_filter_toolbar_saved_search_popover_data_button_new (SavedSearch* search, + const gchar* name) +{ +#line 916 "/home/jens/Source/shotwell/src/SearchFilter.vala" return search_filter_toolbar_saved_search_popover_data_button_construct (SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, search, name); -#line 8819 "SearchFilter.c" +#line 9305 "SearchFilter.c" } -static void search_filter_toolbar_saved_search_popover_data_button_restyle (SearchFilterToolbarSavedSearchPopoverDataButton* self) { +static void +search_filter_toolbar_saved_search_popover_data_button_restyle (SearchFilterToolbarSavedSearchPopoverDataButton* self) +{ GtkButton* _tmp0_; GtkButton* _tmp1_; -#line 928 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 930 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_IS_DATA_BUTTON (self)); -#line 929 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 931 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->button; -#line 929 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 931 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), 24, 24); -#line 930 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 932 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = self->priv->button; -#line 930 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 932 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_button_set_relief (_tmp1_, GTK_RELIEF_NONE); -#line 8836 "SearchFilter.c" +#line 9324 "SearchFilter.c" } -static void search_filter_toolbar_saved_search_popover_data_button_on_click (SearchFilterToolbarSavedSearchPopoverDataButton* self) { +static void +search_filter_toolbar_saved_search_popover_data_button_on_click (SearchFilterToolbarSavedSearchPopoverDataButton* self) +{ SavedSearch* _tmp0_; -#line 933 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 935 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_IS_DATA_BUTTON (self)); -#line 934 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 936 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->_search; -#line 934 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 936 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit (self, search_filter_toolbar_saved_search_popover_data_button_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_CLICKED_SIGNAL], 0, _tmp0_); -#line 8848 "SearchFilter.c" +#line 9338 "SearchFilter.c" } -static SavedSearch* search_filter_toolbar_saved_search_popover_data_button_get_search (SearchFilterToolbarSavedSearchPopoverDataButton* self) { +static SavedSearch* +search_filter_toolbar_saved_search_popover_data_button_get_search (SearchFilterToolbarSavedSearchPopoverDataButton* self) +{ SavedSearch* result; SavedSearch* _tmp0_; -#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_IS_DATA_BUTTON (self), NULL); -#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->_search; -#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = _tmp0_; -#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 8863 "SearchFilter.c" +#line 9355 "SearchFilter.c" } -static void search_filter_toolbar_saved_search_popover_data_button_set_search (SearchFilterToolbarSavedSearchPopoverDataButton* self, SavedSearch* value) { -#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_saved_search_popover_data_button_set_search (SearchFilterToolbarSavedSearchPopoverDataButton* self, + SavedSearch* value) +{ +#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_IS_DATA_BUTTON (self)); -#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (search_filter_toolbar_saved_search_popover_data_button_get_search (self) != value) { -#line 8872 "SearchFilter.c" +#line 9367 "SearchFilter.c" SavedSearch* _tmp0_; - SavedSearch* _tmp1_; -#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = value; -#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); -#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp0_ = _g_object_ref0 (value); +#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->_search); -#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" - self->priv->_search = _tmp1_; -#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_notify ((GObject *) self, "search"); -#line 8885 "SearchFilter.c" +#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala" + self->priv->_search = _tmp0_; +#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_object_notify_by_pspec ((GObject *) self, search_filter_toolbar_saved_search_popover_data_button_properties[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH_PROPERTY]); +#line 9377 "SearchFilter.c" } } -static void search_filter_toolbar_saved_search_popover_data_button_class_init (SearchFilterToolbarSavedSearchPopoverDataButtonClass * klass) { -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_saved_search_popover_data_button_class_init (SearchFilterToolbarSavedSearchPopoverDataButtonClass * klass) +{ +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_data_button_parent_class = g_type_class_peek_parent (klass); -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_type_class_add_private (klass, sizeof (SearchFilterToolbarSavedSearchPopoverDataButtonPrivate)); -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (klass)->get_property = _vala_search_filter_toolbar_saved_search_popover_data_button_get_property; -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (klass)->set_property = _vala_search_filter_toolbar_saved_search_popover_data_button_set_property; -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_saved_search_popover_data_button_finalize; -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH_PROPERTY, g_param_spec_object ("search", "search", "search", TYPE_SAVED_SEARCH, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_object_class_install_property (G_OBJECT_CLASS (klass), SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH_PROPERTY, search_filter_toolbar_saved_search_popover_data_button_properties[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH_PROPERTY] = g_param_spec_object ("search", "search", "search", TYPE_SAVED_SEARCH, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_data_button_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_CLICKED_SIGNAL] = g_signal_new ("clicked", SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH); -#line 8905 "SearchFilter.c" +#line 9399 "SearchFilter.c" } -static void search_filter_toolbar_saved_search_popover_data_button_instance_init (SearchFilterToolbarSavedSearchPopoverDataButton * self) { -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_saved_search_popover_data_button_instance_init (SearchFilterToolbarSavedSearchPopoverDataButton * self) +{ +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv = SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_GET_PRIVATE (self); -#line 909 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 911 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->button = NULL; -#line 8914 "SearchFilter.c" +#line 9410 "SearchFilter.c" } -static void search_filter_toolbar_saved_search_popover_data_button_finalize (GObject * obj) { +static void +search_filter_toolbar_saved_search_popover_data_button_finalize (GObject * obj) +{ SearchFilterToolbarSavedSearchPopoverDataButton * self; GtkButton* _tmp0_; guint _tmp1_; -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, SearchFilterToolbarSavedSearchPopoverDataButton); -#line 925 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 927 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->button; -#line 925 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 927 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp1_, NULL, FALSE); -#line 925 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 927 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_data_button_on_click_gtk_button_clicked, self); -#line 909 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 911 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->button); -#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->_search); -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (search_filter_toolbar_saved_search_popover_data_button_parent_class)->finalize (obj); -#line 8936 "SearchFilter.c" +#line 9434 "SearchFilter.c" } -static GType search_filter_toolbar_saved_search_popover_data_button_get_type (void) { +static GType +search_filter_toolbar_saved_search_popover_data_button_get_type (void) +{ static volatile gsize search_filter_toolbar_saved_search_popover_data_button_type_id__volatile = 0; if (g_once_init_enter (&search_filter_toolbar_saved_search_popover_data_button_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SearchFilterToolbarSavedSearchPopoverDataButtonClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) search_filter_toolbar_saved_search_popover_data_button_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchFilterToolbarSavedSearchPopoverDataButton), 0, (GInstanceInitFunc) search_filter_toolbar_saved_search_popover_data_button_instance_init, NULL }; @@ -8948,279 +9448,328 @@ static GType search_filter_toolbar_saved_search_popover_data_button_get_type (vo } -static void _vala_search_filter_toolbar_saved_search_popover_data_button_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_search_filter_toolbar_saved_search_popover_data_button_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ SearchFilterToolbarSavedSearchPopoverDataButton * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, SearchFilterToolbarSavedSearchPopoverDataButton); -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" switch (property_id) { -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" case SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH_PROPERTY: -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_value_set_object (value, search_filter_toolbar_saved_search_popover_data_button_get_search (self)); -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 8963 "SearchFilter.c" +#line 9468 "SearchFilter.c" default: -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 8969 "SearchFilter.c" +#line 9474 "SearchFilter.c" } } -static void _vala_search_filter_toolbar_saved_search_popover_data_button_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { +static void +_vala_search_filter_toolbar_saved_search_popover_data_button_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec) +{ SearchFilterToolbarSavedSearchPopoverDataButton * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, SearchFilterToolbarSavedSearchPopoverDataButton); -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" switch (property_id) { -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" case SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH_PROPERTY: -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_data_button_set_search (self, g_value_get_object (value)); -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 8985 "SearchFilter.c" +#line 9495 "SearchFilter.c" default: -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 8991 "SearchFilter.c" +#line 9501 "SearchFilter.c" } } -static void search_filter_toolbar_value_saved_search_popover_init (GValue* value) { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_value_saved_search_popover_init (GValue* value) +{ +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 8999 "SearchFilter.c" +#line 9511 "SearchFilter.c" } -static void search_filter_toolbar_value_saved_search_popover_free_value (GValue* value) { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_value_saved_search_popover_free_value (GValue* value) +{ +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (value->data[0].v_pointer) { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_unref (value->data[0].v_pointer); -#line 9008 "SearchFilter.c" +#line 9522 "SearchFilter.c" } } -static void search_filter_toolbar_value_saved_search_popover_copy_value (const GValue* src_value, GValue* dest_value) { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_value_saved_search_popover_copy_value (const GValue* src_value, + GValue* dest_value) +{ +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (src_value->data[0].v_pointer) { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" dest_value->data[0].v_pointer = search_filter_toolbar_saved_search_popover_ref (src_value->data[0].v_pointer); -#line 9018 "SearchFilter.c" +#line 9535 "SearchFilter.c" } else { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" dest_value->data[0].v_pointer = NULL; -#line 9022 "SearchFilter.c" +#line 9539 "SearchFilter.c" } } -static gpointer search_filter_toolbar_value_saved_search_popover_peek_pointer (const GValue* value) { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static gpointer +search_filter_toolbar_value_saved_search_popover_peek_pointer (const GValue* value) +{ +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" return value->data[0].v_pointer; -#line 9030 "SearchFilter.c" +#line 9549 "SearchFilter.c" } -static gchar* search_filter_toolbar_value_saved_search_popover_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static gchar* +search_filter_toolbar_value_saved_search_popover_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (collect_values[0].v_pointer) { -#line 9037 "SearchFilter.c" +#line 9561 "SearchFilter.c" SearchFilterToolbarSavedSearchPopover * object; object = collect_values[0].v_pointer; -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (object->parent_instance.g_class == NULL) { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9044 "SearchFilter.c" +#line 9568 "SearchFilter.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9048 "SearchFilter.c" +#line 9572 "SearchFilter.c" } -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = search_filter_toolbar_saved_search_popover_ref (object); -#line 9052 "SearchFilter.c" +#line 9576 "SearchFilter.c" } else { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 9056 "SearchFilter.c" +#line 9580 "SearchFilter.c" } -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" return NULL; -#line 9060 "SearchFilter.c" +#line 9584 "SearchFilter.c" } -static gchar* search_filter_toolbar_value_saved_search_popover_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +search_filter_toolbar_value_saved_search_popover_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ SearchFilterToolbarSavedSearchPopover ** object_p; object_p = collect_values[0].v_pointer; -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (!object_p) { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 9071 "SearchFilter.c" +#line 9600 "SearchFilter.c" } -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (!value->data[0].v_pointer) { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" *object_p = NULL; -#line 9077 "SearchFilter.c" +#line 9606 "SearchFilter.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" *object_p = value->data[0].v_pointer; -#line 9081 "SearchFilter.c" +#line 9610 "SearchFilter.c" } else { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" *object_p = search_filter_toolbar_saved_search_popover_ref (value->data[0].v_pointer); -#line 9085 "SearchFilter.c" +#line 9614 "SearchFilter.c" } -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" return NULL; -#line 9089 "SearchFilter.c" +#line 9618 "SearchFilter.c" } -GParamSpec* search_filter_toolbar_param_spec_saved_search_popover (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +search_filter_toolbar_param_spec_saved_search_popover (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ SearchFilterToolbarParamSpecSavedSearchPopover* spec; -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (g_type_is_a (object_type, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER), NULL); -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" return G_PARAM_SPEC (spec); -#line 9103 "SearchFilter.c" +#line 9638 "SearchFilter.c" } -gpointer search_filter_toolbar_value_get_saved_search_popover (const GValue* value) { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +gpointer +search_filter_toolbar_value_get_saved_search_popover (const GValue* value) +{ +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER), NULL); -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" return value->data[0].v_pointer; -#line 9112 "SearchFilter.c" +#line 9649 "SearchFilter.c" } -void search_filter_toolbar_value_set_saved_search_popover (GValue* value, gpointer v_object) { +void +search_filter_toolbar_value_set_saved_search_popover (GValue* value, + gpointer v_object) +{ SearchFilterToolbarSavedSearchPopover * old; -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER)); -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" old = value->data[0].v_pointer; -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (v_object) { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER)); -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = v_object; -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_ref (value->data[0].v_pointer); -#line 9132 "SearchFilter.c" +#line 9672 "SearchFilter.c" } else { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 9136 "SearchFilter.c" +#line 9676 "SearchFilter.c" } -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (old) { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_unref (old); -#line 9142 "SearchFilter.c" +#line 9682 "SearchFilter.c" } } -void search_filter_toolbar_value_take_saved_search_popover (GValue* value, gpointer v_object) { +void +search_filter_toolbar_value_take_saved_search_popover (GValue* value, + gpointer v_object) +{ SearchFilterToolbarSavedSearchPopover * old; -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER)); -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" old = value->data[0].v_pointer; -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (v_object) { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER)); -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = v_object; -#line 9161 "SearchFilter.c" +#line 9704 "SearchFilter.c" } else { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 9165 "SearchFilter.c" +#line 9708 "SearchFilter.c" } -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (old) { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_unref (old); -#line 9171 "SearchFilter.c" +#line 9714 "SearchFilter.c" } } -static void search_filter_toolbar_saved_search_popover_class_init (SearchFilterToolbarSavedSearchPopoverClass * klass) { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_saved_search_popover_class_init (SearchFilterToolbarSavedSearchPopoverClass * klass) +{ +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_parent_class = g_type_class_peek_parent (klass); -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" ((SearchFilterToolbarSavedSearchPopoverClass *) klass)->finalize = search_filter_toolbar_saved_search_popover_finalize; -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_type_class_add_private (klass, sizeof (SearchFilterToolbarSavedSearchPopoverPrivate)); -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_SEARCH_ACTIVATED_SIGNAL] = g_signal_new ("search-activated", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH); -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_EDIT_CLICKED_SIGNAL] = g_signal_new ("edit-clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH); -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DELETE_CLICKED_SIGNAL] = g_signal_new ("delete-clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH); -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_ADD_CLICKED_SIGNAL] = g_signal_new ("add-clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_CLOSED_SIGNAL] = g_signal_new ("closed", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 9193 "SearchFilter.c" +#line 9738 "SearchFilter.c" } -static void search_filter_toolbar_saved_search_popover_instance_init (SearchFilterToolbarSavedSearchPopover * self) { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +static void +search_filter_toolbar_saved_search_popover_instance_init (SearchFilterToolbarSavedSearchPopover * self) +{ +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv = SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_GET_PRIVATE (self); -#line 895 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 897 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->popover = NULL; -#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->list_box = NULL; -#line 897 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 899 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->edit_buttons = NULL; -#line 897 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 899 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->edit_buttons_length1 = 0; -#line 897 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 899 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->_edit_buttons_size_ = self->priv->edit_buttons_length1; -#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 900 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->delete_buttons = NULL; -#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 900 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->delete_buttons_length1 = 0; -#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 900 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->_delete_buttons_size_ = self->priv->delete_buttons_length1; -#line 899 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 901 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->add = NULL; -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->ref_count = 1; -#line 9220 "SearchFilter.c" +#line 9767 "SearchFilter.c" } -static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToolbarSavedSearchPopover * obj) { +static void +search_filter_toolbar_saved_search_popover_finalize (SearchFilterToolbarSavedSearchPopover * obj) +{ SearchFilterToolbarSavedSearchPopover * self; SearchFilterToolbarSavedSearchPopoverDataButton** _tmp0_; gint _tmp0__length1; @@ -9232,121 +9781,123 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo guint _tmp11_; GtkPopover* _tmp12_; guint _tmp13_; -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, SearchFilterToolbarSavedSearchPopover); -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_destroy (self); -#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->edit_buttons; -#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0__length1 = self->priv->edit_buttons_length1; -#line 9244 "SearchFilter.c" +#line 9793 "SearchFilter.c" { SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL; gint button_collection_length1 = 0; gint _button_collection_size_ = 0; gint button_it = 0; -#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala" button_collection = _tmp0_; -#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala" button_collection_length1 = _tmp0__length1; -#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala" for (button_it = 0; button_it < _tmp0__length1; button_it = button_it + 1) { -#line 9256 "SearchFilter.c" +#line 9805 "SearchFilter.c" SearchFilterToolbarSavedSearchPopoverDataButton* _tmp1_; SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL; -#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = _g_object_ref0 (button_collection[button_it]); -#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala" button = _tmp1_; -#line 9263 "SearchFilter.c" +#line 9812 "SearchFilter.c" { SearchFilterToolbarSavedSearchPopoverDataButton* _tmp2_; guint _tmp3_; -#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = button; -#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("clicked", SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, &_tmp3_, NULL, FALSE); -#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_on_edit_click_search_filter_toolbar_saved_search_popover_data_button_clicked, self); -#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (button); -#line 9275 "SearchFilter.c" +#line 9824 "SearchFilter.c" } } } -#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4_ = self->priv->delete_buttons; -#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4__length1 = self->priv->delete_buttons_length1; -#line 9283 "SearchFilter.c" +#line 9832 "SearchFilter.c" { SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL; gint button_collection_length1 = 0; gint _button_collection_size_ = 0; gint button_it = 0; -#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala" button_collection = _tmp4_; -#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala" button_collection_length1 = _tmp4__length1; -#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala" for (button_it = 0; button_it < _tmp4__length1; button_it = button_it + 1) { -#line 9295 "SearchFilter.c" +#line 9844 "SearchFilter.c" SearchFilterToolbarSavedSearchPopoverDataButton* _tmp5_; SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL; -#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = _g_object_ref0 (button_collection[button_it]); -#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala" button = _tmp5_; -#line 9302 "SearchFilter.c" +#line 9851 "SearchFilter.c" { SearchFilterToolbarSavedSearchPopoverDataButton* _tmp6_; guint _tmp7_; -#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp6_ = button; -#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("clicked", SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, &_tmp7_, NULL, FALSE); -#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_on_delete_click_search_filter_toolbar_saved_search_popover_data_button_clicked, self); -#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (button); -#line 9314 "SearchFilter.c" +#line 9863 "SearchFilter.c" } } } -#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp8_ = self->priv->add; -#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp9_, NULL, FALSE); -#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_on_add_click_gtk_button_clicked, self); -#line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp10_ = self->priv->list_box; -#line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("row-activated", gtk_list_box_get_type (), &_tmp11_, NULL, FALSE); -#line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_on_activate_row_gtk_list_box_row_activated, self); -#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp12_ = self->priv->popover; -#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("closed", gtk_popover_get_type (), &_tmp13_, NULL, FALSE); -#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_on_popover_closed_gtk_popover_closed, self); -#line 895 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 897 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->popover); -#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->list_box); -#line 897 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 899 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->edit_buttons = (_vala_array_free (self->priv->edit_buttons, self->priv->edit_buttons_length1, (GDestroyNotify) g_object_unref), NULL); -#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 900 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->delete_buttons = (_vala_array_free (self->priv->delete_buttons, self->priv->delete_buttons_length1, (GDestroyNotify) g_object_unref), NULL); -#line 899 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 901 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->add); -#line 9346 "SearchFilter.c" +#line 9895 "SearchFilter.c" } -GType search_filter_toolbar_saved_search_popover_get_type (void) { +GType +search_filter_toolbar_saved_search_popover_get_type (void) +{ static volatile gsize search_filter_toolbar_saved_search_popover_type_id__volatile = 0; if (g_once_init_enter (&search_filter_toolbar_saved_search_popover_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { search_filter_toolbar_value_saved_search_popover_init, search_filter_toolbar_value_saved_search_popover_free_value, search_filter_toolbar_value_saved_search_popover_copy_value, search_filter_toolbar_value_saved_search_popover_peek_pointer, "p", search_filter_toolbar_value_saved_search_popover_collect_value, "p", search_filter_toolbar_value_saved_search_popover_lcopy_value }; @@ -9360,82 +9911,92 @@ GType search_filter_toolbar_saved_search_popover_get_type (void) { } -gpointer search_filter_toolbar_saved_search_popover_ref (gpointer instance) { +gpointer +search_filter_toolbar_saved_search_popover_ref (gpointer instance) +{ SearchFilterToolbarSavedSearchPopover * self; self = instance; -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_atomic_int_inc (&self->ref_count); -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" return instance; -#line 9371 "SearchFilter.c" +#line 9924 "SearchFilter.c" } -void search_filter_toolbar_saved_search_popover_unref (gpointer instance) { +void +search_filter_toolbar_saved_search_popover_unref (gpointer instance) +{ SearchFilterToolbarSavedSearchPopover * self; self = instance; -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_GET_CLASS (self)->finalize (self); -#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 896 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_type_free_instance ((GTypeInstance *) self); -#line 9384 "SearchFilter.c" +#line 9939 "SearchFilter.c" } } -static void search_filter_toolbar_class_init (SearchFilterToolbarClass * klass) { +static void +search_filter_toolbar_class_init (SearchFilterToolbarClass * klass) +{ #line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_parent_class = g_type_class_peek_parent (klass); #line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_type_class_add_private (klass, sizeof (SearchFilterToolbarPrivate)); #line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_finalize; -#line 9396 "SearchFilter.c" +#line 9953 "SearchFilter.c" } -static void search_filter_toolbar_instance_init (SearchFilterToolbar * self) { +static void +search_filter_toolbar_instance_init (SearchFilterToolbar * self) +{ GtkMenu* _tmp0_; GtkMenuItem* _tmp1_; GtkBuilder* _tmp2_; SearchFilterToolbarSavedSearchFilterButton* _tmp3_; #line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv = SEARCH_FILTER_TOOLBAR_GET_PRIVATE (self); -#line 659 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 661 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = (GtkMenu*) gtk_menu_new (); -#line 659 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 661 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_object_ref_sink (_tmp0_); -#line 659 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 661 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->close_menu = _tmp0_; -#line 660 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 662 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = (GtkMenuItem*) gtk_menu_item_new (); -#line 660 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 662 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_object_ref_sink (_tmp1_); -#line 660 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 662 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->close_item = _tmp1_; -#line 1030 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = gtk_builder_new (); -#line 1030 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->builder = _tmp2_; -#line 1033 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1035 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->saved_search = NULL; -#line 1036 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1038 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = search_filter_toolbar_saved_search_filter_button_new (); -#line 1036 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1038 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_object_ref_sink (_tmp3_); -#line 1036 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1038 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->saved_search_button = _tmp3_; -#line 1037 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1039 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->elide_showing_again = FALSE; -#line 1038 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1040 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->search_filter = NULL; -#line 9435 "SearchFilter.c" +#line 9994 "SearchFilter.c" } -static void search_filter_toolbar_finalize (GObject * obj) { +static void +search_filter_toolbar_finalize (GObject * obj) +{ SearchFilterToolbar * self; SearchFilterActions* _tmp0_; guint _tmp1_; @@ -9457,103 +10018,105 @@ static void search_filter_toolbar_finalize (GObject * obj) { guint _tmp17_; #line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_FILTER_TOOLBAR, SearchFilterToolbar); -#line 1154 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1156 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->actions; -#line 1154 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1156 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("media-context-changed", TYPE_SEARCH_FILTER_ACTIONS, &_tmp1_, NULL, FALSE); -#line 1154 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _search_filter_toolbar_on_media_context_changed_search_filter_actions_media_context_changed, self); #line 1156 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _search_filter_toolbar_on_media_context_changed_search_filter_actions_media_context_changed, self); +#line 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = self->priv->actions; -#line 1156 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("flagged-toggled", TYPE_SEARCH_FILTER_ACTIONS, &_tmp3_, NULL, FALSE); -#line 1156 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled, self); -#line 1157 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4_ = self->priv->actions; -#line 1157 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("photos-toggled", TYPE_SEARCH_FILTER_ACTIONS, &_tmp5_, NULL, FALSE); -#line 1157 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled, self); -#line 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp6_ = self->priv->actions; -#line 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("videos-toggled", TYPE_SEARCH_FILTER_ACTIONS, &_tmp7_, NULL, FALSE); -#line 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled, self); -#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp8_ = self->priv->actions; -#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("raw-toggled", TYPE_SEARCH_FILTER_ACTIONS, &_tmp9_, NULL, FALSE); -#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled, self); -#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp10_ = self->priv->actions; -#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("rating-changed", TYPE_SEARCH_FILTER_ACTIONS, &_tmp11_, NULL, FALSE); -#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed, self); -#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp12_ = self->priv->actions; -#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("text-changed", TYPE_SEARCH_FILTER_ACTIONS, &_tmp13_, NULL, FALSE); -#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed, self); -#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp14_ = self->priv->actions; -#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("criteria-changed", TYPE_SEARCH_FILTER_ACTIONS, &_tmp15_, NULL, FALSE); -#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_handlers_disconnect_matched (_tmp14_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed, self); #line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_handlers_disconnect_matched (_tmp14_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed, self); +#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp16_ = self->priv->toolbar; -#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_parse_name ("popup-context-menu", gtk_toolbar_get_type (), &_tmp17_, NULL, FALSE); -#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp16_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu, self); #line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->toolbar); -#line 659 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 661 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->close_menu); -#line 660 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 662 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->close_item); -#line 1030 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_object_unref0 (self->builder); #line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_object_unref0 (self->builder); +#line 1034 "/home/jens/Source/shotwell/src/SearchFilter.vala" _search_filter_actions_unref0 (self->priv->actions); -#line 1033 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1035 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->saved_search); -#line 1034 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1036 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->search_box); -#line 1035 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1037 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->rating_button); -#line 1036 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_object_unref0 (self->priv->saved_search_button); #line 1038 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_object_unref0 (self->priv->saved_search_button); +#line 1040 "/home/jens/Source/shotwell/src/SearchFilter.vala" _view_filter_unref0 (self->priv->search_filter); -#line 1039 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1041 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->label_type); -#line 1040 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1042 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->toolbtn_photos); -#line 1041 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1043 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->toolbtn_videos); -#line 1042 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1044 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->toolbtn_raw); -#line 1043 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1045 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->toolbtn_flag); -#line 1044 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1046 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->sepr_mediatype_flagged); -#line 1045 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1047 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->sepr_flagged_rating); -#line 1046 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 1048 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->sepr_rating_saved); #line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (search_filter_toolbar_parent_class)->finalize (obj); -#line 9553 "SearchFilter.c" +#line 10114 "SearchFilter.c" } -GType search_filter_toolbar_get_type (void) { +GType +search_filter_toolbar_get_type (void) +{ static volatile gsize search_filter_toolbar_type_id__volatile = 0; if (g_once_init_enter (&search_filter_toolbar_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SearchFilterToolbarClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) search_filter_toolbar_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchFilterToolbar), 0, (GInstanceInitFunc) search_filter_toolbar_instance_init, NULL }; @@ -9565,7 +10128,11 @@ GType search_filter_toolbar_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -9577,13 +10144,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -static gint _vala_array_length (gpointer array) { +static gint +_vala_array_length (gpointer array) +{ int length; length = 0; if (array) { diff --git a/src/SearchFilter.vala b/src/SearchFilter.vala index fba5488..8acf035 100644 --- a/src/SearchFilter.vala +++ b/src/SearchFilter.vala @@ -643,8 +643,10 @@ public class SearchFilterToolbar : Gtk.Revealer { Gtk.Image? image = null; button.set_always_show_image(true); image = new Gtk.Image.from_icon_name(icon_name, Gtk.IconSize.SMALL_TOOLBAR); - image.set_margin_end(6); button.set_image(image); + if (button.get_label() != "" && button.get_label() != null) { + image.margin_end = 6; + } } public void set_label(string label) { diff --git a/src/SlideshowPage.c b/src/SlideshowPage.c index a9b13ec..e19ca76 100644 --- a/src/SlideshowPage.c +++ b/src/SlideshowPage.c @@ -1,4 +1,4 @@ -/* SlideshowPage.c generated by valac 0.36.6, the Vala compiler +/* SlideshowPage.c generated by valac 0.40.4, the Vala compiler * generated from SlideshowPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -211,6 +212,11 @@ typedef struct _PixbufCacheClass PixbufCacheClass; typedef struct _Screensaver Screensaver; typedef struct _ScreensaverClass ScreensaverClass; +enum { + SLIDESHOW_PAGE_0_PROPERTY, + SLIDESHOW_PAGE_NUM_PROPERTIES +}; +static GParamSpec* slideshow_page_properties[SLIDESHOW_PAGE_NUM_PROPERTIES]; #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL))) #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _g_timer_destroy0(var) ((var == NULL) ? NULL : (var = (g_timer_destroy (var), NULL))) @@ -294,11 +300,16 @@ typedef struct _SlideshowPageSettingsDialogClass SlideshowPageSettingsDialogClas #define _pango_attribute_destroy0(var) ((var == NULL) ? NULL : (var = (pango_attribute_destroy (var), NULL))) #define _pango_attr_list_unref0(var) ((var == NULL) ? NULL : (var = (pango_attr_list_unref (var), NULL))) typedef struct _SlideshowPageSettingsDialogPrivate SlideshowPageSettingsDialogPrivate; +enum { + SLIDESHOW_PAGE_SETTINGS_DIALOG_0_PROPERTY, + SLIDESHOW_PAGE_SETTINGS_DIALOG_NUM_PROPERTIES +}; +static GParamSpec* slideshow_page_settings_dialog_properties[SLIDESHOW_PAGE_SETTINGS_DIALOG_NUM_PROPERTIES]; enum { SLIDESHOW_PAGE_HIDE_TOOLBAR_SIGNAL, - SLIDESHOW_PAGE_LAST_SIGNAL + SLIDESHOW_PAGE_NUM_SIGNALS }; -static guint slideshow_page_signals[SLIDESHOW_PAGE_LAST_SIGNAL] = {0}; +static guint slideshow_page_signals[SLIDESHOW_PAGE_NUM_SIGNALS] = {0}; struct _Page { GtkScrolledWindow parent_instance; @@ -491,9 +502,15 @@ GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType single_photo_page_get_type (void) G_GNUC_CONST; @@ -505,9 +522,15 @@ GType single_photo_page_update_reason_get_type (void) G_GNUC_CONST; GType slideshow_page_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -521,25 +544,41 @@ GType photo_get_type (void) G_GNUC_CONST; GType pixbuf_cache_get_type (void) G_GNUC_CONST; gpointer screensaver_ref (gpointer instance); void screensaver_unref (gpointer instance); -GParamSpec* param_spec_screensaver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_screensaver (GValue* value, gpointer v_object); -void value_take_screensaver (GValue* value, gpointer v_object); +GParamSpec* param_spec_screensaver (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_screensaver (GValue* value, + gpointer v_object); +void value_take_screensaver (GValue* value, + gpointer v_object); gpointer value_get_screensaver (const GValue* value); GType screensaver_get_type (void) G_GNUC_CONST; #define SLIDESHOW_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SLIDESHOW_PAGE, SlideshowPagePrivate)) -enum { - SLIDESHOW_PAGE_DUMMY_PROPERTY -}; #define SLIDESHOW_PAGE_READAHEAD_COUNT 5 #define SLIDESHOW_PAGE_CHECK_ADVANCE_MSEC 250 -SlideshowPage* slideshow_page_new (SourceCollection* sources, ViewCollection* controller, Photo* start); -SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* sources, ViewCollection* controller, Photo* start); -SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* page_name, gboolean scale_up_to_viewport); +SlideshowPage* slideshow_page_new (SourceCollection* sources, + ViewCollection* controller, + Photo* start); +SlideshowPage* slideshow_page_construct (GType object_type, + SourceCollection* sources, + ViewCollection* controller, + Photo* start); +SinglePhotoPage* single_photo_page_construct (GType object_type, + const gchar* page_name, + gboolean scale_up_to_viewport); gpointer transition_effects_manager_ref (gpointer instance); void transition_effects_manager_unref (gpointer instance); -GParamSpec* param_spec_transition_effects_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_transition_effects_manager (GValue* value, gpointer v_object); -void value_take_transition_effects_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_transition_effects_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_transition_effects_manager (GValue* value, + gpointer v_object); +void value_take_transition_effects_manager (GValue* value, + gpointer v_object); gpointer value_get_transition_effects_manager (const GValue* value); GType transition_effects_manager_get_type (void) G_GNUC_CONST; TransitionEffectsManager* transition_effects_manager_get_instance (void); @@ -549,13 +588,17 @@ GeeCollection* transition_effects_manager_get_effect_ids (TransitionEffectsManag static void slideshow_page_update_transition_effect (SlideshowPage* self); GtkToolbar* page_get_toolbar (Page* self); void single_photo_page_on_previous_photo (SinglePhotoPage* self); -static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); +static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, + gpointer self); static void slideshow_page_on_play_pause (SlideshowPage* self); -static void _slideshow_page_on_play_pause_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); +static void _slideshow_page_on_play_pause_gtk_tool_button_clicked (GtkToolButton* _sender, + gpointer self); void single_photo_page_on_next_photo (SinglePhotoPage* self); -static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); +static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, + gpointer self); static void slideshow_page_on_change_settings (SlideshowPage* self); -static void _slideshow_page_on_change_settings_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); +static void _slideshow_page_on_change_settings_gtk_tool_button_clicked (GtkToolButton* _sender, + gpointer self); Screensaver* screensaver_new (void); Screensaver* screensaver_construct (GType object_type); static void slideshow_page_real_switched_to (Page* base); @@ -565,40 +608,82 @@ GType scaling_get_type (void) G_GNUC_CONST; GType scale_constraint_get_type (void) G_GNUC_CONST; Scaling* scaling_dup (const Scaling* self); void scaling_free (Scaling* self); -void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, Scaling* result); -PixbufCache* pixbuf_cache_new (SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target); -PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target); +void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, + Scaling* result); +PixbufCache* pixbuf_cache_new (SourceCollection* sources, + PixbufCachePhotoType type, + Scaling* scaling, + gint max_count, + PixbufCacheCacheFilter filter, + void* filter_target); +PixbufCache* pixbuf_cache_construct (GType object_type, + SourceCollection* sources, + PixbufCachePhotoType type, + Scaling* scaling, + gint max_count, + PixbufCacheCacheFilter filter, + void* filter_target); GType direction_get_type (void) G_GNUC_CONST; -static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start, Direction direction, Photo* * next, GdkPixbuf* * next_pixbuf); -void single_photo_page_set_pixbuf (SinglePhotoPage* self, GdkPixbuf* unscaled, Dimensions* max_dim, Direction* direction); +static gboolean slideshow_page_get_next_photo (SlideshowPage* self, + Photo* start, + Direction direction, + Photo* * next, + GdkPixbuf* * next_pixbuf); +void single_photo_page_set_pixbuf (SinglePhotoPage* self, + GdkPixbuf* unscaled, + Dimensions* max_dim, + Direction* direction); GType photo_exception_get_type (void) G_GNUC_CONST; -void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result); +void media_source_get_dimensions (MediaSource* self, + PhotoException disallowed_steps, + Dimensions* result); static gboolean slideshow_page_auto_advance (SlideshowPage* self); static gboolean _slideshow_page_auto_advance_gsource_func (gpointer self); -void screensaver_inhibit (Screensaver* self, const gchar* reason); +void screensaver_inhibit (Screensaver* self, + const gchar* reason); static void slideshow_page_real_switching_from (Page* base); void page_switching_from (Page* self); void screensaver_uninhibit (Screensaver* self); -GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error); +GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, + Photo* photo, + GError** error); gchar* data_object_to_string (DataObject* self); GType data_view_get_type (void) G_GNUC_CONST; -DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source); -DataView* view_collection_get_next (ViewCollection* self, DataView* view); -DataView* view_collection_get_previous (ViewCollection* self, DataView* view); +DataView* view_collection_get_view_for_source (ViewCollection* self, + DataSource* source); +DataView* view_collection_get_next (ViewCollection* self, + DataView* view); +DataView* view_collection_get_previous (ViewCollection* self, + DataView* view); DataSource* data_view_get_source (DataView* self); -void app_window_error_message (const gchar* message, GtkWindow* parent); +void app_window_error_message (const gchar* message, + GtkWindow* parent); GtkWindow* page_get_container (Page* self); GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); void app_window_end_fullscreen (AppWindow* self); -gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource* * next, DataSource* * prev, const gchar* type_selector); +gboolean view_collection_get_immediate_neighbors (ViewCollection* self, + DataSource* home, + DataSource* * next, + DataSource* * prev, + const gchar* type_selector); #define PHOTO_TYPENAME "thumb" GType background_job_job_priority_get_type (void) G_GNUC_CONST; -void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPriority priority, gboolean force); -GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource* home, const gchar* typename); -void pixbuf_cache_prefetch_many (PixbufCache* self, GeeCollection* photos, BackgroundJobJobPriority priority, gboolean force); +void pixbuf_cache_prefetch (PixbufCache* self, + Photo* photo, + BackgroundJobJobPriority priority, + gboolean force); +GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, + DataSource* home, + const gchar* typename); +void pixbuf_cache_prefetch_many (PixbufCache* self, + GeeCollection* photos, + BackgroundJobJobPriority priority, + gboolean force); static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base); -static void slideshow_page_advance (SlideshowPage* self, Photo* photo, Direction direction); +static void slideshow_page_advance (SlideshowPage* self, + Photo* photo, + Direction direction); static void slideshow_page_real_on_next_photo (SinglePhotoPage* base); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; @@ -606,124 +691,166 @@ ConfigFacade* config_facade_get_instance (void); gchar* configuration_facade_get_slideshow_transition_effect_id (ConfigurationFacade* self); static void slideshow_page_random_transition_effect (SlideshowPage* self); gdouble configuration_facade_get_slideshow_delay (ConfigurationFacade* self); -static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKey* event); +static gboolean slideshow_page_real_key_press_event (GtkWidget* base, + GdkEventKey* event); static GType slideshow_page_settings_dialog_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_new (void); static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GType object_type); -void configuration_facade_set_slideshow_delay (ConfigurationFacade* self, gdouble delay); +void configuration_facade_set_slideshow_delay (ConfigurationFacade* self, + gdouble delay); static gdouble slideshow_page_settings_dialog_get_delay (SlideshowPageSettingsDialog* self); -void configuration_facade_set_slideshow_transition_delay (ConfigurationFacade* self, gdouble delay); +void configuration_facade_set_slideshow_transition_delay (ConfigurationFacade* self, + gdouble delay); static gdouble slideshow_page_settings_dialog_get_transition_delay (SlideshowPageSettingsDialog* self); -void configuration_facade_set_slideshow_transition_effect_id (ConfigurationFacade* self, const gchar* id); +void configuration_facade_set_slideshow_transition_effect_id (ConfigurationFacade* self, + const gchar* id); static gchar* slideshow_page_settings_dialog_get_transition_effect_id (SlideshowPageSettingsDialog* self); -void configuration_facade_set_slideshow_show_title (ConfigurationFacade* self, gboolean show_title); +void configuration_facade_set_slideshow_show_title (ConfigurationFacade* self, + gboolean show_title); static gboolean slideshow_page_settings_dialog_get_show_title (SlideshowPageSettingsDialog* self); gdouble configuration_facade_get_slideshow_transition_delay (ConfigurationFacade* self); -void single_photo_page_set_transition (SinglePhotoPage* self, const gchar* effect_id, gint duration_msec); +void single_photo_page_set_transition (SinglePhotoPage* self, + const gchar* effect_id, + gint duration_msec); #define TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID NULL_TRANSITION_DESCRIPTOR_EFFECT_ID -static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimensions* ctx_dim); +static void slideshow_page_paint_title (SlideshowPage* self, + cairo_t* ctx, + Dimensions* ctx_dim); gchar* media_source_get_title (MediaSource* self); -void set_source_color_from_string (cairo_t* ctx, const gchar* spec); -static void slideshow_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dimensions* ctx_dim); -void single_photo_page_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim); +void set_source_color_from_string (cairo_t* ctx, + const gchar* spec); +static void slideshow_page_real_paint (SinglePhotoPage* base, + cairo_t* ctx, + Dimensions* ctx_dim); +void single_photo_page_paint (SinglePhotoPage* self, + cairo_t* ctx, + Dimensions* ctx_dim); gboolean configuration_facade_get_slideshow_show_title (ConfigurationFacade* self); gboolean single_photo_page_is_transition_in_progress (SinglePhotoPage* self); #define SLIDESHOW_PAGE_SETTINGS_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SLIDESHOW_PAGE_TYPE_SETTINGS_DIALOG, SlideshowPageSettingsDialogPrivate)) -enum { - SLIDESHOW_PAGE_SETTINGS_DIALOG_DUMMY_PROPERTY -}; FullscreenWindow* app_window_get_fullscreen (void); -gchar* transition_effects_manager_get_effect_name (TransitionEffectsManager* self, const gchar* effect_id); -GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsManager* self, GCompareDataFunc comparator, void* comparator_target, GDestroyNotify comparator_target_destroy_notify); -gint utf8_ci_compare (void* a, void* b); -static gint _utf8_ci_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); -gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManager* self, const gchar* effect_name); +gchar* transition_effects_manager_get_effect_name (TransitionEffectsManager* self, + const gchar* effect_id); +GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsManager* self, + GCompareDataFunc comparator, + void* comparator_target, + GDestroyNotify comparator_target_destroy_notify); +gint utf8_ci_compare (void* a, + void* b); +static gint _utf8_ci_compare_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self); +gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManager* self, + const gchar* effect_name); static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageSettingsDialog* self); -static void _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); +static void _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self); static void slideshow_page_settings_dialog_finalize (GObject * obj); static void slideshow_page_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return self ? data_collection_ref (self) : NULL; -#line 653 "SlideshowPage.c" +#line 764 "SlideshowPage.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return self ? g_object_ref (self) : NULL; -#line 660 "SlideshowPage.c" +#line 773 "SlideshowPage.c" } -static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { +static void +_single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, + gpointer self) +{ #line 137 "/home/jens/Source/shotwell/src/SlideshowPage.vala" single_photo_page_on_previous_photo ((SinglePhotoPage*) self); -#line 667 "SlideshowPage.c" +#line 783 "SlideshowPage.c" } -static void _slideshow_page_on_play_pause_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { +static void +_slideshow_page_on_play_pause_gtk_tool_button_clicked (GtkToolButton* _sender, + gpointer self) +{ #line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala" slideshow_page_on_play_pause ((SlideshowPage*) self); -#line 674 "SlideshowPage.c" +#line 793 "SlideshowPage.c" } -static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { +static void +_single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, + gpointer self) +{ #line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala" single_photo_page_on_next_photo ((SinglePhotoPage*) self); -#line 681 "SlideshowPage.c" +#line 803 "SlideshowPage.c" } -static void _slideshow_page_on_change_settings_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { +static void +_slideshow_page_on_change_settings_gtk_tool_button_clicked (GtkToolButton* _sender, + gpointer self) +{ #line 159 "/home/jens/Source/shotwell/src/SlideshowPage.vala" slideshow_page_on_change_settings ((SlideshowPage*) self); -#line 688 "SlideshowPage.c" +#line 813 "SlideshowPage.c" } -SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* sources, ViewCollection* controller, Photo* start) { +SlideshowPage* +slideshow_page_construct (GType object_type, + SourceCollection* sources, + ViewCollection* controller, + Photo* start) +{ SlideshowPage * self = NULL; SourceCollection* _tmp0_; - SourceCollection* _tmp1_; - ViewCollection* _tmp2_; - ViewCollection* _tmp3_; + ViewCollection* _tmp1_; GeeCollection* pluggables = NULL; - TransitionEffectsManager* _tmp4_; - TransitionEffectsManager* _tmp5_; - GeeCollection* _tmp6_; - GeeCollection* _tmp7_; + TransitionEffectsManager* _tmp2_; + TransitionEffectsManager* _tmp3_; + GeeCollection* _tmp4_; + GeeCollection* _tmp5_; GeeArrayList* a = NULL; - GeeArrayList* _tmp8_; - gint _tmp9_; - gpointer* _tmp10_; - Photo* _tmp11_; - Photo* _tmp12_; + GeeArrayList* _tmp6_; + gint _tmp7_; + gpointer* _tmp8_; + Photo* _tmp9_; GtkToolbar* toolbar = NULL; - GtkToolbar* _tmp13_; + GtkToolbar* _tmp10_; GtkToolButton* previous_button = NULL; + GtkToolButton* _tmp11_; + GtkToolButton* _tmp12_; + GtkToolButton* _tmp13_; GtkToolButton* _tmp14_; GtkToolButton* _tmp15_; GtkToolButton* _tmp16_; + GtkToolButton* next_button = NULL; GtkToolButton* _tmp17_; GtkToolButton* _tmp18_; GtkToolButton* _tmp19_; - GtkToolButton* next_button = NULL; GtkToolButton* _tmp20_; GtkToolButton* _tmp21_; GtkToolButton* _tmp22_; GtkToolButton* _tmp23_; GtkToolButton* _tmp24_; - GtkToolButton* _tmp25_; - GtkToolButton* _tmp26_; - GtkToolButton* _tmp27_; - Screensaver* _tmp28_; + Screensaver* _tmp25_; #line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL); #line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -733,37 +860,33 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so #line 115 "/home/jens/Source/shotwell/src/SlideshowPage.vala" self = (SlideshowPage*) single_photo_page_construct (object_type, _ ("Slideshow"), TRUE); #line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp0_ = sources; -#line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp1_ = _data_collection_ref0 (_tmp0_); + _tmp0_ = _data_collection_ref0 (sources); #line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _data_collection_unref0 (self->priv->sources); #line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - self->priv->sources = _tmp1_; + self->priv->sources = _tmp0_; #line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp2_ = controller; -#line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp3_ = _data_collection_ref0 (_tmp2_); + _tmp1_ = _data_collection_ref0 (controller); #line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _data_collection_unref0 (self->priv->controller); #line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - self->priv->controller = _tmp3_; + self->priv->controller = _tmp1_; #line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp4_ = transition_effects_manager_get_instance (); + _tmp2_ = transition_effects_manager_get_instance (); #line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp6_ = transition_effects_manager_get_effect_ids (_tmp5_); + _tmp4_ = transition_effects_manager_get_effect_ids (_tmp3_); #line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _transition_effects_manager_unref0 (_tmp5_); + _transition_effects_manager_unref0 (_tmp3_); #line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - pluggables = _tmp7_; + pluggables = _tmp5_; #line 121 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp8_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp6_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 121 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - a = _tmp8_; + a = _tmp6_; #line 122 "/home/jens/Source/shotwell/src/SlideshowPage.vala" gee_array_list_add_all (a, pluggables); #line 123 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -771,35 +894,33 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so #line 124 "/home/jens/Source/shotwell/src/SlideshowPage.vala" gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), RANDOM_EFFECT_DESCRIPTOR_EFFECT_ID); #line 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp10_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_COLLECTION, GeeCollection), &_tmp9_); + _tmp8_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_COLLECTION, GeeCollection), &_tmp7_); #line 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala" self->priv->transitions = (_vala_array_free (self->priv->transitions, self->priv->transitions_length1, (GDestroyNotify) g_free), NULL); #line 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - self->priv->transitions = _tmp10_; + self->priv->transitions = _tmp8_; #line 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - self->priv->transitions_length1 = _tmp9_; + self->priv->transitions_length1 = _tmp7_; #line 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala" self->priv->_transitions_size_ = self->priv->transitions_length1; #line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp11_ = start; -#line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp12_ = _g_object_ref0 (_tmp11_); + _tmp9_ = _g_object_ref0 (start); #line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (self->priv->current); #line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - self->priv->current = _tmp12_; + self->priv->current = _tmp9_; #line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala" slideshow_page_update_transition_effect (self); #line 131 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp13_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp10_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 131 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - toolbar = _tmp13_; + toolbar = _tmp10_; #line 134 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp14_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Back")); + _tmp11_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Back")); #line 134 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - g_object_ref_sink (_tmp14_); + g_object_ref_sink (_tmp11_); #line 134 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - previous_button = _tmp14_; + previous_button = _tmp11_; #line 135 "/home/jens/Source/shotwell/src/SlideshowPage.vala" gtk_tool_button_set_icon_name (previous_button, "go-previous"); #line 136 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -809,35 +930,35 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so #line 139 "/home/jens/Source/shotwell/src/SlideshowPage.vala" gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (previous_button, gtk_tool_item_get_type (), GtkToolItem), -1); #line 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp15_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Pause")); + _tmp12_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Pause")); #line 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - g_object_ref_sink (_tmp15_); + g_object_ref_sink (_tmp12_); #line 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (self->priv->play_pause_button); #line 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - self->priv->play_pause_button = _tmp15_; + self->priv->play_pause_button = _tmp12_; #line 142 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp16_ = self->priv->play_pause_button; + _tmp13_ = self->priv->play_pause_button; #line 142 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gtk_tool_button_set_icon_name (_tmp16_, "media-playback-pause"); + gtk_tool_button_set_icon_name (_tmp13_, "media-playback-pause"); #line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp17_ = self->priv->play_pause_button; + _tmp14_ = self->priv->play_pause_button; #line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_tool_item_get_type (), GtkToolItem), _ ("Pause the slideshow")); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_tool_item_get_type (), GtkToolItem), _ ("Pause the slideshow")); #line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp18_ = self->priv->play_pause_button; + _tmp15_ = self->priv->play_pause_button; #line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - g_signal_connect_object (_tmp18_, "clicked", (GCallback) _slideshow_page_on_play_pause_gtk_tool_button_clicked, self, 0); + g_signal_connect_object (_tmp15_, "clicked", (GCallback) _slideshow_page_on_play_pause_gtk_tool_button_clicked, self, 0); #line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp19_ = self->priv->play_pause_button; + _tmp16_ = self->priv->play_pause_button; #line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_tool_item_get_type (), GtkToolItem), -1); + gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 148 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp20_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Next")); + _tmp17_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Next")); #line 148 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - g_object_ref_sink (_tmp20_); + g_object_ref_sink (_tmp17_); #line 148 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - next_button = _tmp20_; + next_button = _tmp17_; #line 149 "/home/jens/Source/shotwell/src/SlideshowPage.vala" gtk_tool_button_set_icon_name (next_button, "go-next"); #line 150 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -847,43 +968,43 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so #line 153 "/home/jens/Source/shotwell/src/SlideshowPage.vala" gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (next_button, gtk_tool_item_get_type (), GtkToolItem), -1); #line 155 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp21_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL); + _tmp18_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL); #line 155 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - g_object_ref_sink (_tmp21_); + g_object_ref_sink (_tmp18_); #line 155 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (self->priv->settings_button); #line 155 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - self->priv->settings_button = _tmp21_; + self->priv->settings_button = _tmp18_; #line 156 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp22_ = self->priv->settings_button; + _tmp19_ = self->priv->settings_button; #line 156 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gtk_tool_button_set_icon_name (_tmp22_, "preferences-system"); + gtk_tool_button_set_icon_name (_tmp19_, "preferences-system"); #line 157 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp23_ = self->priv->settings_button; + _tmp20_ = self->priv->settings_button; #line 157 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gtk_tool_button_set_label (_tmp23_, _ ("Settings")); + gtk_tool_button_set_label (_tmp20_, _ ("Settings")); #line 158 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp24_ = self->priv->settings_button; + _tmp21_ = self->priv->settings_button; #line 158 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_item_get_type (), GtkToolItem), _ ("Change slideshow settings")); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_tool_item_get_type (), GtkToolItem), _ ("Change slideshow settings")); #line 159 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp25_ = self->priv->settings_button; + _tmp22_ = self->priv->settings_button; #line 159 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - g_signal_connect_object (_tmp25_, "clicked", (GCallback) _slideshow_page_on_change_settings_gtk_tool_button_clicked, self, 0); + g_signal_connect_object (_tmp22_, "clicked", (GCallback) _slideshow_page_on_change_settings_gtk_tool_button_clicked, self, 0); #line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp26_ = self->priv->settings_button; + _tmp23_ = self->priv->settings_button; #line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_tool_item_get_type (), GtkToolItem), TRUE); + gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_tool_item_get_type (), GtkToolItem), TRUE); #line 162 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp27_ = self->priv->settings_button; + _tmp24_ = self->priv->settings_button; #line 162 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_tool_item_get_type (), GtkToolItem), -1); + gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 164 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp28_ = screensaver_new (); + _tmp25_ = screensaver_new (); #line 164 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _screensaver_unref0 (self->priv->screensaver); #line 164 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - self->priv->screensaver = _tmp28_; + self->priv->screensaver = _tmp25_; #line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (next_button); #line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -896,27 +1017,35 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so _g_object_unref0 (pluggables); #line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return self; -#line 900 "SlideshowPage.c" +#line 1021 "SlideshowPage.c" } -SlideshowPage* slideshow_page_new (SourceCollection* sources, ViewCollection* controller, Photo* start) { +SlideshowPage* +slideshow_page_new (SourceCollection* sources, + ViewCollection* controller, + Photo* start) +{ #line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return slideshow_page_construct (TYPE_SLIDESHOW_PAGE, sources, controller, start); -#line 907 "SlideshowPage.c" +#line 1032 "SlideshowPage.c" } -static gboolean _slideshow_page_auto_advance_gsource_func (gpointer self) { +static gboolean +_slideshow_page_auto_advance_gsource_func (gpointer self) +{ gboolean result; result = slideshow_page_auto_advance ((SlideshowPage*) self); #line 179 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 916 "SlideshowPage.c" +#line 1043 "SlideshowPage.c" } -static void slideshow_page_real_switched_to (Page* base) { +static void +slideshow_page_real_switched_to (Page* base) +{ SlideshowPage * self; SourceCollection* _tmp0_; Scaling _tmp1_ = {0}; @@ -956,7 +1085,7 @@ static void slideshow_page_real_switched_to (Page* base) { pixbuf = _tmp5_; #line 175 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (_tmp6_) { -#line 960 "SlideshowPage.c" +#line 1089 "SlideshowPage.c" GdkPixbuf* _tmp7_; Photo* _tmp8_; Dimensions _tmp9_ = {0}; @@ -971,7 +1100,7 @@ static void slideshow_page_real_switched_to (Page* base) { _tmp10_ = DIRECTION_FORWARD; #line 176 "/home/jens/Source/shotwell/src/SlideshowPage.vala" single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp7_, &_tmp9_, &_tmp10_); -#line 975 "SlideshowPage.c" +#line 1104 "SlideshowPage.c" } #line 179 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) SLIDESHOW_PAGE_CHECK_ADVANCE_MSEC, _slideshow_page_auto_advance_gsource_func, g_object_ref (self), g_object_unref); @@ -985,11 +1114,13 @@ static void slideshow_page_real_switched_to (Page* base) { screensaver_inhibit (_tmp12_, "Playing slideshow"); #line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (pixbuf); -#line 989 "SlideshowPage.c" +#line 1118 "SlideshowPage.c" } -static void slideshow_page_real_switching_from (Page* base) { +static void +slideshow_page_real_switching_from (Page* base) +{ SlideshowPage * self; Screensaver* _tmp0_; #line 185 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1002,252 +1133,249 @@ static void slideshow_page_real_switching_from (Page* base) { screensaver_uninhibit (_tmp0_); #line 189 "/home/jens/Source/shotwell/src/SlideshowPage.vala" self->priv->exiting = TRUE; -#line 1006 "SlideshowPage.c" +#line 1137 "SlideshowPage.c" } -static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start, Direction direction, Photo* * next, GdkPixbuf* * next_pixbuf) { +static gboolean +slideshow_page_get_next_photo (SlideshowPage* self, + Photo* start, + Direction direction, + Photo* * next, + GdkPixbuf* * next_pixbuf) +{ Photo* _vala_next = NULL; GdkPixbuf* _vala_next_pixbuf = NULL; gboolean result = FALSE; Photo* _tmp0_; - Photo* _tmp1_; GError * _inner_error_ = NULL; #line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_return_val_if_fail (IS_SLIDESHOW_PAGE (self), FALSE); #line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_return_val_if_fail (IS_PHOTO (start), FALSE); #line 194 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp0_ = start; -#line 194 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (start); #line 194 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (_vala_next); #line 194 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _vala_next = _tmp1_; -#line 1029 "SlideshowPage.c" + _vala_next = _tmp0_; +#line 1163 "SlideshowPage.c" { - gboolean _tmp2_ = FALSE; + gboolean _tmp1_ = FALSE; #line 196 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp2_ = TRUE; + _tmp1_ = TRUE; #line 196 "/home/jens/Source/shotwell/src/SlideshowPage.vala" while (TRUE) { -#line 1036 "SlideshowPage.c" +#line 1170 "SlideshowPage.c" DataSource* forward = NULL; DataSource* back = NULL; - ViewCollection* _tmp40_; - Photo* _tmp41_; - DataSource* _tmp42_ = NULL; - DataSource* _tmp43_ = NULL; - PixbufCache* _tmp44_; - DataSource* _tmp45_; - PixbufCache* _tmp46_; - DataSource* _tmp47_; + ViewCollection* _tmp37_; + Photo* _tmp38_; + DataSource* _tmp39_ = NULL; + DataSource* _tmp40_ = NULL; + PixbufCache* _tmp41_; + DataSource* _tmp42_; + PixbufCache* _tmp43_; + DataSource* _tmp44_; GeeSet* neighbors = NULL; - ViewCollection* _tmp48_; - Photo* _tmp49_; + ViewCollection* _tmp45_; + Photo* _tmp46_; + GeeSet* _tmp47_; + GeeSet* _tmp48_; + DataSource* _tmp49_; GeeSet* _tmp50_; - GeeSet* _tmp51_; - DataSource* _tmp52_; + DataSource* _tmp51_; + PixbufCache* _tmp52_; GeeSet* _tmp53_; - DataSource* _tmp54_; - PixbufCache* _tmp55_; - GeeSet* _tmp56_; #line 196 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - if (!_tmp2_) { -#line 1059 "SlideshowPage.c" + if (!_tmp1_) { +#line 1193 "SlideshowPage.c" } #line 196 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp2_ = FALSE; -#line 1063 "SlideshowPage.c" + _tmp1_ = FALSE; +#line 1197 "SlideshowPage.c" { - GdkPixbuf* _tmp3_ = NULL; - PixbufCache* _tmp4_; - Photo* _tmp5_; + GdkPixbuf* _tmp2_ = NULL; + PixbufCache* _tmp3_; + Photo* _tmp4_; + GdkPixbuf* _tmp5_; GdkPixbuf* _tmp6_; - GdkPixbuf* _tmp7_; #line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp4_ = self->priv->cache; + _tmp3_ = self->priv->cache; #line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp5_ = _vala_next; + _tmp4_ = _vala_next; #line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp6_ = pixbuf_cache_fetch (_tmp4_, _tmp5_, &_inner_error_); + _tmp5_ = pixbuf_cache_fetch (_tmp3_, _tmp4_, &_inner_error_); #line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp3_ = _tmp6_; + _tmp2_ = _tmp5_; #line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1080 "SlideshowPage.c" +#line 1214 "SlideshowPage.c" goto __catch470_g_error; } #line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp7_ = _tmp3_; + _tmp6_ = _tmp2_; #line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp3_ = NULL; + _tmp2_ = NULL; #line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (_vala_next_pixbuf); #line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _vala_next_pixbuf = _tmp7_; + _vala_next_pixbuf = _tmp6_; #line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _g_object_unref0 (_tmp3_); -#line 1093 "SlideshowPage.c" + _g_object_unref0 (_tmp2_); +#line 1227 "SlideshowPage.c" } goto __finally470; __catch470_g_error: { GError* err = NULL; - Photo* _tmp8_; + Photo* _tmp7_; + gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; - GError* _tmp11_; - const gchar* _tmp12_; + GError* _tmp10_; + const gchar* _tmp11_; DataView* view = NULL; - ViewCollection* _tmp13_; - Photo* _tmp14_; - DataView* _tmp15_; - DataView* _tmp16_ = NULL; - Direction _tmp17_; - DataView* _tmp24_; - DataView* _tmp25_; - DataSource* _tmp26_; - gboolean _tmp27_ = FALSE; - gboolean _tmp28_ = FALSE; - Photo* _tmp29_; - Photo* _tmp30_; + ViewCollection* _tmp12_; + Photo* _tmp13_; + DataView* _tmp14_; + DataView* _tmp15_ = NULL; + DataView* _tmp22_; + DataView* _tmp23_; + DataSource* _tmp24_; + gboolean _tmp25_ = FALSE; + gboolean _tmp26_ = FALSE; + Photo* _tmp27_; #line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala" err = _inner_error_; #line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _inner_error_ = NULL; #line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp8_ = _vala_next; + _tmp7_ = _vala_next; #line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); + _tmp8_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject)); #line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp11_ = err; + _tmp10_ = err; #line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp12_ = _tmp11_->message; + _tmp11_ = _tmp10_->message; #line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - g_warning ("SlideshowPage.vala:201: Unable to fetch pixbuf for %s: %s", _tmp10_, _tmp12_); + g_warning ("SlideshowPage.vala:201: Unable to fetch pixbuf for %s: %s", _tmp9_, _tmp11_); #line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp9_); #line 204 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp13_ = self->priv->controller; + _tmp12_ = self->priv->controller; #line 204 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp14_ = _vala_next; + _tmp13_ = _vala_next; #line 204 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp15_ = view_collection_get_view_for_source (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_SOURCE, DataSource)); + _tmp14_ = view_collection_get_view_for_source (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_SOURCE, DataSource)); #line 204 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - view = _tmp15_; -#line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp17_ = direction; + view = _tmp14_; #line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - if (_tmp17_ == DIRECTION_FORWARD) { -#line 1147 "SlideshowPage.c" - ViewCollection* _tmp18_; - DataView* _tmp19_; - DataView* _tmp20_; + if (direction == DIRECTION_FORWARD) { +#line 1277 "SlideshowPage.c" + ViewCollection* _tmp16_; + DataView* _tmp17_; + DataView* _tmp18_; #line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp18_ = self->priv->controller; + _tmp16_ = self->priv->controller; #line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp19_ = view; + _tmp17_ = view; #line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp20_ = view_collection_get_next (_tmp18_, _tmp19_); + _tmp18_ = view_collection_get_next (_tmp16_, _tmp17_); #line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp15_); #line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp16_ = _tmp20_; -#line 1161 "SlideshowPage.c" + _tmp15_ = _tmp18_; +#line 1291 "SlideshowPage.c" } else { - ViewCollection* _tmp21_; - DataView* _tmp22_; - DataView* _tmp23_; + ViewCollection* _tmp19_; + DataView* _tmp20_; + DataView* _tmp21_; #line 207 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp21_ = self->priv->controller; + _tmp19_ = self->priv->controller; #line 207 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp22_ = view; + _tmp20_ = view; #line 207 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp23_ = view_collection_get_previous (_tmp21_, _tmp22_); + _tmp21_ = view_collection_get_previous (_tmp19_, _tmp20_); #line 207 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp15_); #line 207 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp16_ = _tmp23_; -#line 1176 "SlideshowPage.c" + _tmp15_ = _tmp21_; +#line 1306 "SlideshowPage.c" } #line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp24_ = _g_object_ref0 (_tmp16_); + _tmp22_ = _g_object_ref0 (_tmp15_); #line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (view); #line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - view = _tmp24_; + view = _tmp22_; #line 208 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp25_ = view; + _tmp23_ = view; #line 208 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp26_ = data_view_get_source (_tmp25_); + _tmp24_ = data_view_get_source (_tmp23_); #line 208 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (_vala_next); #line 208 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _vala_next = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_PHOTO, Photo); + _vala_next = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PHOTO, Photo); #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp29_ = _vala_next; + _tmp27_ = _vala_next; #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp30_ = start; + if (_tmp27_ == start) { +#line 1326 "SlideshowPage.c" + Photo* _tmp28_; + Photo* _tmp29_; #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - if (_tmp29_ == _tmp30_) { -#line 1198 "SlideshowPage.c" - Photo* _tmp31_; - Photo* _tmp32_; + _tmp28_ = _vala_next; #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp31_ = _vala_next; + _tmp29_ = self->priv->current; #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp32_ = self->priv->current; -#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp28_ = _tmp31_ != _tmp32_; -#line 1207 "SlideshowPage.c" + _tmp26_ = _tmp28_ != _tmp29_; +#line 1335 "SlideshowPage.c" } else { #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp28_ = FALSE; -#line 1211 "SlideshowPage.c" + _tmp26_ = FALSE; +#line 1339 "SlideshowPage.c" } #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - if (_tmp28_) { + if (_tmp26_) { #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp27_ = TRUE; -#line 1217 "SlideshowPage.c" + _tmp25_ = TRUE; +#line 1345 "SlideshowPage.c" } else { - Photo* _tmp33_; - Photo* _tmp34_; + Photo* _tmp30_; + Photo* _tmp31_; #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp33_ = _vala_next; + _tmp30_ = _vala_next; #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp34_ = self->priv->current; + _tmp31_ = self->priv->current; #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp27_ = _tmp33_ == _tmp34_; -#line 1227 "SlideshowPage.c" + _tmp25_ = _tmp30_ == _tmp31_; +#line 1355 "SlideshowPage.c" } #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - if (_tmp27_) { -#line 1231 "SlideshowPage.c" - GtkWindow* _tmp35_; - GtkWindow* _tmp36_; - AppWindow* _tmp37_; - AppWindow* _tmp38_; + if (_tmp25_) { +#line 1359 "SlideshowPage.c" + GtkWindow* _tmp32_; + GtkWindow* _tmp33_; + AppWindow* _tmp34_; + AppWindow* _tmp35_; #line 212 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp35_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp32_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 212 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp36_ = _tmp35_; + _tmp33_ = _tmp32_; #line 212 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - app_window_error_message (_ ("All photo source files are missing."), _tmp36_); + app_window_error_message (_ ("All photo source files are missing."), _tmp33_); #line 212 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _g_object_unref0 (_tmp36_); + _g_object_unref0 (_tmp33_); #line 213 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp37_ = app_window_get_instance (); + _tmp34_ = app_window_get_instance (); #line 213 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp38_ = _tmp37_; + _tmp35_ = _tmp34_; #line 213 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - app_window_end_fullscreen (_tmp38_); + app_window_end_fullscreen (_tmp35_); #line 213 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _g_object_unref0 (_tmp38_); + _g_object_unref0 (_tmp35_); #line 215 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (_vala_next); #line 215 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1259,7 +1387,7 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" result = FALSE; #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp15_); #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (view); #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1268,101 +1396,101 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start if (next) { #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" *next = _vala_next; -#line 1272 "SlideshowPage.c" +#line 1400 "SlideshowPage.c" } else { #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (_vala_next); -#line 1276 "SlideshowPage.c" +#line 1404 "SlideshowPage.c" } #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (next_pixbuf) { #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" *next_pixbuf = _vala_next_pixbuf; -#line 1282 "SlideshowPage.c" +#line 1410 "SlideshowPage.c" } else { #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (_vala_next_pixbuf); -#line 1286 "SlideshowPage.c" +#line 1414 "SlideshowPage.c" } #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 1290 "SlideshowPage.c" +#line 1418 "SlideshowPage.c" } #line 221 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp15_); #line 221 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (view); #line 221 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_error_free0 (err); #line 221 "/home/jens/Source/shotwell/src/SlideshowPage.vala" continue; -#line 1300 "SlideshowPage.c" +#line 1428 "SlideshowPage.c" } __finally470: #line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1305 "SlideshowPage.c" - gboolean _tmp39_ = FALSE; +#line 1433 "SlideshowPage.c" + gboolean _tmp36_ = FALSE; #line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_clear_error (&_inner_error_); #line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - return _tmp39_; -#line 1313 "SlideshowPage.c" + return _tmp36_; +#line 1441 "SlideshowPage.c" } #line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp40_ = self->priv->controller; + _tmp37_ = self->priv->controller; #line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp41_ = _vala_next; + _tmp38_ = _vala_next; #line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - view_collection_get_immediate_neighbors (_tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_DATA_SOURCE, DataSource), &_tmp42_, &_tmp43_, PHOTO_TYPENAME); + view_collection_get_immediate_neighbors (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_SOURCE, DataSource), &_tmp39_, &_tmp40_, PHOTO_TYPENAME); #line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (forward); #line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - forward = _tmp42_; + forward = _tmp39_; #line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (back); #line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - back = _tmp43_; + back = _tmp40_; #line 228 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp44_ = self->priv->cache; + _tmp41_ = self->priv->cache; #line 228 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp45_ = forward; + _tmp42_ = forward; #line 228 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - pixbuf_cache_prefetch (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_HIGHEST, FALSE); + pixbuf_cache_prefetch (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_HIGHEST, FALSE); #line 229 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp46_ = self->priv->cache; + _tmp43_ = self->priv->cache; #line 229 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp47_ = back; + _tmp44_ = back; #line 229 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - pixbuf_cache_prefetch (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE); + pixbuf_cache_prefetch (_tmp43_, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE); #line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp48_ = self->priv->controller; + _tmp45_ = self->priv->controller; #line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp49_ = _vala_next; + _tmp46_ = _vala_next; #line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp50_ = view_collection_get_extended_neighbors (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME); + _tmp47_ = view_collection_get_extended_neighbors (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME); #line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - neighbors = _tmp50_; + neighbors = _tmp47_; #line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp51_ = neighbors; + _tmp48_ = neighbors; #line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp52_ = forward; + _tmp49_ = forward; #line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection), _tmp52_); + gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection), _tmp49_); #line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp53_ = neighbors; + _tmp50_ = neighbors; #line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp54_ = back; + _tmp51_ = back; #line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection), _tmp54_); + gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection), _tmp51_); #line 235 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp55_ = self->priv->cache; + _tmp52_ = self->priv->cache; #line 235 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp56_ = neighbors; + _tmp53_ = neighbors; #line 235 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - pixbuf_cache_prefetch_many (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_COLLECTION, GeeCollection), BACKGROUND_JOB_JOB_PRIORITY_LOWEST, FALSE); + pixbuf_cache_prefetch_many (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection), BACKGROUND_JOB_JOB_PRIORITY_LOWEST, FALSE); #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" result = TRUE; #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1375,51 +1503,53 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start if (next) { #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" *next = _vala_next; -#line 1379 "SlideshowPage.c" +#line 1507 "SlideshowPage.c" } else { #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (_vala_next); -#line 1383 "SlideshowPage.c" +#line 1511 "SlideshowPage.c" } #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (next_pixbuf) { #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" *next_pixbuf = _vala_next_pixbuf; -#line 1389 "SlideshowPage.c" +#line 1517 "SlideshowPage.c" } else { #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (_vala_next_pixbuf); -#line 1393 "SlideshowPage.c" +#line 1521 "SlideshowPage.c" } #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 1397 "SlideshowPage.c" +#line 1525 "SlideshowPage.c" } } #line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (next) { #line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala" *next = _vala_next; -#line 1404 "SlideshowPage.c" +#line 1532 "SlideshowPage.c" } else { #line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (_vala_next); -#line 1408 "SlideshowPage.c" +#line 1536 "SlideshowPage.c" } #line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (next_pixbuf) { #line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala" *next_pixbuf = _vala_next_pixbuf; -#line 1414 "SlideshowPage.c" +#line 1542 "SlideshowPage.c" } else { #line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (_vala_next_pixbuf); -#line 1418 "SlideshowPage.c" +#line 1546 "SlideshowPage.c" } } -static void slideshow_page_on_play_pause (SlideshowPage* self) { +static void +slideshow_page_on_play_pause (SlideshowPage* self) +{ gboolean _tmp0_; gboolean _tmp7_; GTimer* _tmp8_; @@ -1429,7 +1559,7 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) { _tmp0_ = self->priv->playing; #line 242 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (_tmp0_) { -#line 1433 "SlideshowPage.c" +#line 1563 "SlideshowPage.c" GtkToolButton* _tmp1_; GtkToolButton* _tmp2_; GtkToolButton* _tmp3_; @@ -1445,7 +1575,7 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) { _tmp3_ = self->priv->play_pause_button; #line 245 "/home/jens/Source/shotwell/src/SlideshowPage.vala" gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_tool_item_get_type (), GtkToolItem), _ ("Continue the slideshow")); -#line 1449 "SlideshowPage.c" +#line 1579 "SlideshowPage.c" } else { GtkToolButton* _tmp4_; GtkToolButton* _tmp5_; @@ -1462,7 +1592,7 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) { _tmp6_ = self->priv->play_pause_button; #line 249 "/home/jens/Source/shotwell/src/SlideshowPage.vala" gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tool_item_get_type (), GtkToolItem), _ ("Pause the slideshow")); -#line 1466 "SlideshowPage.c" +#line 1596 "SlideshowPage.c" } #line 252 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp7_ = self->priv->playing; @@ -1472,11 +1602,13 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) { _tmp8_ = self->priv->timer; #line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_timer_start (_tmp8_); -#line 1476 "SlideshowPage.c" +#line 1606 "SlideshowPage.c" } -static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) { +static void +slideshow_page_real_on_previous_photo (SinglePhotoPage* base) +{ SlideshowPage * self; DataView* view = NULL; ViewCollection* _tmp0_; @@ -1519,7 +1651,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) { prev_view = _tmp7_; #line 265 "/home/jens/Source/shotwell/src/SlideshowPage.vala" while (TRUE) { -#line 1523 "SlideshowPage.c" +#line 1655 "SlideshowPage.c" DataView* _tmp8_; DataView* _tmp9_; DataSource* _tmp10_; @@ -1536,7 +1668,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) { if (!(_tmp8_ != NULL)) { #line 265 "/home/jens/Source/shotwell/src/SlideshowPage.vala" break; -#line 1540 "SlideshowPage.c" +#line 1672 "SlideshowPage.c" } #line 266 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp9_ = prev_view; @@ -1550,7 +1682,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) { _g_object_unref0 (_tmp11_); #line 266 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (_tmp12_) { -#line 1554 "SlideshowPage.c" +#line 1686 "SlideshowPage.c" DataView* _tmp13_; DataSource* _tmp14_; #line 267 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1563,7 +1695,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) { prev_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo); #line 268 "/home/jens/Source/shotwell/src/SlideshowPage.vala" break; -#line 1567 "SlideshowPage.c" +#line 1699 "SlideshowPage.c" } #line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp15_ = self->priv->controller; @@ -1594,7 +1726,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) { _g_object_unref0 (view); #line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return; -#line 1597 "SlideshowPage.c" +#line 1729 "SlideshowPage.c" } } #line 279 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1609,11 +1741,13 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) { _g_object_unref0 (prev_photo); #line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (view); -#line 1612 "SlideshowPage.c" +#line 1744 "SlideshowPage.c" } -static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) { +static void +slideshow_page_real_on_next_photo (SinglePhotoPage* base) +{ SlideshowPage * self; DataView* view = NULL; ViewCollection* _tmp0_; @@ -1661,7 +1795,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) { next_view = _tmp7_; #line 289 "/home/jens/Source/shotwell/src/SlideshowPage.vala" while (TRUE) { -#line 1664 "SlideshowPage.c" +#line 1798 "SlideshowPage.c" DataView* _tmp8_; DataView* _tmp9_; DataSource* _tmp10_; @@ -1678,7 +1812,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) { if (!(_tmp8_ != NULL)) { #line 289 "/home/jens/Source/shotwell/src/SlideshowPage.vala" break; -#line 1681 "SlideshowPage.c" +#line 1815 "SlideshowPage.c" } #line 290 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp9_ = next_view; @@ -1692,7 +1826,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) { _g_object_unref0 (_tmp11_); #line 290 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (_tmp12_) { -#line 1695 "SlideshowPage.c" +#line 1829 "SlideshowPage.c" DataView* _tmp13_; DataSource* _tmp14_; #line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1705,7 +1839,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) { next_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo); #line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala" break; -#line 1708 "SlideshowPage.c" +#line 1842 "SlideshowPage.c" } #line 295 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp15_ = self->priv->controller; @@ -1736,7 +1870,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) { _g_object_unref0 (view); #line 299 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return; -#line 1738 "SlideshowPage.c" +#line 1872 "SlideshowPage.c" } } #line 303 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1757,7 +1891,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) { if (_tmp24_) { #line 305 "/home/jens/Source/shotwell/src/SlideshowPage.vala" slideshow_page_random_transition_effect (self); -#line 1759 "SlideshowPage.c" +#line 1893 "SlideshowPage.c" } #line 308 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp25_ = next_photo; @@ -1771,76 +1905,73 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) { _g_object_unref0 (next_photo); #line 282 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (view); -#line 1773 "SlideshowPage.c" +#line 1907 "SlideshowPage.c" } -static void slideshow_page_advance (SlideshowPage* self, Photo* photo, Direction direction) { +static void +slideshow_page_advance (SlideshowPage* self, + Photo* photo, + Direction direction) +{ Photo* _tmp0_; - Photo* _tmp1_; GdkPixbuf* next_pixbuf = NULL; - Photo* _tmp2_; - Direction _tmp3_; - Photo* _tmp4_ = NULL; - GdkPixbuf* _tmp5_ = NULL; - gboolean _tmp6_; - GTimer* _tmp11_; + Photo* _tmp1_; + Photo* _tmp2_ = NULL; + GdkPixbuf* _tmp3_ = NULL; + gboolean _tmp4_; + GTimer* _tmp8_; #line 311 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_return_if_fail (IS_SLIDESHOW_PAGE (self)); #line 311 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_return_if_fail (IS_PHOTO (photo)); #line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp0_ = photo; -#line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (photo); #line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (self->priv->current); #line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - self->priv->current = _tmp1_; -#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp2_ = self->priv->current; + self->priv->current = _tmp0_; #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp3_ = direction; + _tmp1_ = self->priv->current; #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp6_ = slideshow_page_get_next_photo (self, _tmp2_, _tmp3_, &_tmp4_, &_tmp5_); + _tmp4_ = slideshow_page_get_next_photo (self, _tmp1_, direction, &_tmp2_, &_tmp3_); #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (self->priv->current); #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - self->priv->current = _tmp4_; + self->priv->current = _tmp2_; #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (next_pixbuf); #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - next_pixbuf = _tmp5_; + next_pixbuf = _tmp3_; #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - if (_tmp6_) { -#line 1815 "SlideshowPage.c" - GdkPixbuf* _tmp7_; - Photo* _tmp8_; - Dimensions _tmp9_ = {0}; - Direction _tmp10_; + if (_tmp4_) { +#line 1947 "SlideshowPage.c" + GdkPixbuf* _tmp5_; + Photo* _tmp6_; + Dimensions _tmp7_ = {0}; #line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp7_ = next_pixbuf; + _tmp5_ = next_pixbuf; #line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp8_ = self->priv->current; + _tmp6_ = self->priv->current; #line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp9_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp7_); #line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp10_ = direction; -#line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp7_, &_tmp9_, &_tmp10_); -#line 1830 "SlideshowPage.c" + single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp5_, &_tmp7_, &direction); +#line 1959 "SlideshowPage.c" } #line 320 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp11_ = self->priv->timer; + _tmp8_ = self->priv->timer; #line 320 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - g_timer_start (_tmp11_); + g_timer_start (_tmp8_); #line 311 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (next_pixbuf); -#line 1838 "SlideshowPage.c" +#line 1967 "SlideshowPage.c" } -static gboolean slideshow_page_auto_advance (SlideshowPage* self) { +static gboolean +slideshow_page_auto_advance (SlideshowPage* self) +{ gboolean result = FALSE; gboolean _tmp0_; gboolean _tmp1_; @@ -1848,8 +1979,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) { gdouble _tmp3_; ConfigFacade* _tmp4_; ConfigFacade* _tmp5_; - gdouble _tmp6_; - gboolean _tmp7_; + gboolean _tmp6_; #line 323 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_return_val_if_fail (IS_SLIDESHOW_PAGE (self), FALSE); #line 324 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1860,7 +1990,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) { result = FALSE; #line 325 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 1862 "SlideshowPage.c" +#line 1992 "SlideshowPage.c" } #line 327 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp1_ = self->priv->playing; @@ -1870,7 +2000,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) { result = TRUE; #line 328 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 1872 "SlideshowPage.c" +#line 2002 "SlideshowPage.c" } #line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp2_ = self->priv->timer; @@ -1881,18 +2011,16 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) { #line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp5_ = _tmp4_; #line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp6_ = configuration_facade_get_slideshow_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp7_ = _tmp3_ < _tmp6_; + _tmp6_ = _tmp3_ < configuration_facade_get_slideshow_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (_tmp5_); #line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - if (_tmp7_) { + if (_tmp6_) { #line 331 "/home/jens/Source/shotwell/src/SlideshowPage.vala" result = TRUE; #line 331 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 1894 "SlideshowPage.c" +#line 2022 "SlideshowPage.c" } #line 333 "/home/jens/Source/shotwell/src/SlideshowPage.vala" single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); @@ -1900,24 +2028,26 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) { result = TRUE; #line 335 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 1902 "SlideshowPage.c" +#line 2030 "SlideshowPage.c" } -static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKey* event) { +static gboolean +slideshow_page_real_key_press_event (GtkWidget* base, + GdkEventKey* event) +{ SlideshowPage * self; gboolean result = FALSE; gboolean handled = FALSE; - GdkEventKey* _tmp0_; - guint _tmp1_; + guint _tmp0_; + const gchar* _tmp1_; const gchar* _tmp2_; - const gchar* _tmp3_; - GQuark _tmp5_ = 0U; + GQuark _tmp4_ = 0U; #line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - static GQuark _tmp4_label0 = 0; -#line 1917 "SlideshowPage.c" - gboolean _tmp6_; - gboolean _tmp7_ = FALSE; + static GQuark _tmp3_label0 = 0; +#line 2047 "SlideshowPage.c" + gboolean _tmp5_; + gboolean _tmp6_ = FALSE; #line 338 "/home/jens/Source/shotwell/src/SlideshowPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage); #line 338 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1925,89 +2055,81 @@ static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKe #line 339 "/home/jens/Source/shotwell/src/SlideshowPage.vala" handled = TRUE; #line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp0_ = event; + _tmp0_ = event->keyval; #line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp1_ = _tmp0_->keyval; + _tmp1_ = gdk_keyval_name (_tmp0_); #line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp2_ = gdk_keyval_name (_tmp1_); -#line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_); + _tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_); #line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - if (_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("space")))) { + if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("space")))) { #line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala" switch (0) { -#line 1940 "SlideshowPage.c" +#line 2068 "SlideshowPage.c" default: { #line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala" slideshow_page_on_play_pause (self); #line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala" break; -#line 1947 "SlideshowPage.c" +#line 2075 "SlideshowPage.c" } } } else { #line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala" switch (0) { -#line 1953 "SlideshowPage.c" +#line 2081 "SlideshowPage.c" default: { #line 346 "/home/jens/Source/shotwell/src/SlideshowPage.vala" handled = FALSE; #line 347 "/home/jens/Source/shotwell/src/SlideshowPage.vala" break; -#line 1960 "SlideshowPage.c" +#line 2088 "SlideshowPage.c" } } } #line 350 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp6_ = handled; + _tmp5_ = handled; #line 350 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - if (_tmp6_) { + if (_tmp5_) { #line 351 "/home/jens/Source/shotwell/src/SlideshowPage.vala" result = TRUE; #line 351 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 1972 "SlideshowPage.c" +#line 2100 "SlideshowPage.c" } #line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (GTK_WIDGET_CLASS (slideshow_page_parent_class)->key_press_event != NULL) { -#line 1976 "SlideshowPage.c" - GdkEventKey* _tmp8_; - gboolean _tmp9_; -#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp8_ = event; -#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp9_ = GTK_WIDGET_CLASS (slideshow_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget), _tmp8_); #line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp7_ = _tmp9_; -#line 1985 "SlideshowPage.c" + _tmp6_ = GTK_WIDGET_CLASS (slideshow_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget), event); +#line 2106 "SlideshowPage.c" } else { #line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp7_ = TRUE; -#line 1989 "SlideshowPage.c" + _tmp6_ = TRUE; +#line 2110 "SlideshowPage.c" } #line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - result = _tmp7_; + result = _tmp6_; #line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 1995 "SlideshowPage.c" +#line 2116 "SlideshowPage.c" } -static void slideshow_page_on_change_settings (SlideshowPage* self) { +static void +slideshow_page_on_change_settings (SlideshowPage* self) +{ SlideshowPageSettingsDialog* settings_dialog = NULL; SlideshowPageSettingsDialog* _tmp0_; SlideshowPageSettingsDialog* _tmp1_; gboolean slideshow_playing = FALSE; gboolean _tmp2_; SlideshowPageSettingsDialog* _tmp3_; - gint _tmp4_; - SlideshowPageSettingsDialog* _tmp22_; - gboolean _tmp23_; - GTimer* _tmp24_; + SlideshowPageSettingsDialog* _tmp18_; + gboolean _tmp19_; + GTimer* _tmp20_; #line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_return_if_fail (IS_SLIDESHOW_PAGE (self)); #line 357 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -2031,102 +2153,93 @@ static void slideshow_page_on_change_settings (SlideshowPage* self) { #line 364 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp3_ = settings_dialog; #line 364 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp4_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_dialog_get_type (), GtkDialog)); -#line 364 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - if (_tmp4_ == ((gint) GTK_RESPONSE_OK)) { -#line 2036 "SlideshowPage.c" + if (gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_dialog_get_type (), GtkDialog)) == ((gint) GTK_RESPONSE_OK)) { +#line 2156 "SlideshowPage.c" + ConfigFacade* _tmp4_; ConfigFacade* _tmp5_; - ConfigFacade* _tmp6_; - SlideshowPageSettingsDialog* _tmp7_; - gdouble _tmp8_; - ConfigFacade* _tmp9_; + SlideshowPageSettingsDialog* _tmp6_; + ConfigFacade* _tmp7_; + ConfigFacade* _tmp8_; + SlideshowPageSettingsDialog* _tmp9_; ConfigFacade* _tmp10_; - SlideshowPageSettingsDialog* _tmp11_; - gdouble _tmp12_; - ConfigFacade* _tmp13_; - ConfigFacade* _tmp14_; - SlideshowPageSettingsDialog* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; - ConfigFacade* _tmp18_; - ConfigFacade* _tmp19_; - SlideshowPageSettingsDialog* _tmp20_; - gboolean _tmp21_; -#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp5_ = config_facade_get_instance (); + ConfigFacade* _tmp11_; + SlideshowPageSettingsDialog* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + ConfigFacade* _tmp15_; + ConfigFacade* _tmp16_; + SlideshowPageSettingsDialog* _tmp17_; #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp6_ = _tmp5_; + _tmp4_ = config_facade_get_instance (); #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp7_ = settings_dialog; + _tmp5_ = _tmp4_; #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp8_ = slideshow_page_settings_dialog_get_delay (_tmp7_); + _tmp6_ = settings_dialog; #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - configuration_facade_set_slideshow_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp8_); + configuration_facade_set_slideshow_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), slideshow_page_settings_dialog_get_delay (_tmp6_)); #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _g_object_unref0 (_tmp6_); -#line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp9_ = config_facade_get_instance (); + _g_object_unref0 (_tmp5_); #line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp10_ = _tmp9_; + _tmp7_ = config_facade_get_instance (); #line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp11_ = settings_dialog; + _tmp8_ = _tmp7_; #line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp12_ = slideshow_page_settings_dialog_get_transition_delay (_tmp11_); + _tmp9_ = settings_dialog; #line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - configuration_facade_set_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_); + configuration_facade_set_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), slideshow_page_settings_dialog_get_transition_delay (_tmp9_)); #line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp13_ = config_facade_get_instance (); + _tmp10_ = config_facade_get_instance (); #line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp14_ = _tmp13_; + _tmp11_ = _tmp10_; #line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp15_ = settings_dialog; + _tmp12_ = settings_dialog; #line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp16_ = slideshow_page_settings_dialog_get_transition_effect_id (_tmp15_); + _tmp13_ = slideshow_page_settings_dialog_get_transition_effect_id (_tmp12_); #line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp17_ = _tmp16_; + _tmp14_ = _tmp13_; #line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - configuration_facade_set_slideshow_transition_effect_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp17_); + configuration_facade_set_slideshow_transition_effect_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp14_); #line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp14_); #line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp11_); #line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp18_ = config_facade_get_instance (); + _tmp15_ = config_facade_get_instance (); #line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp19_ = _tmp18_; + _tmp16_ = _tmp15_; #line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp20_ = settings_dialog; + _tmp17_ = settings_dialog; #line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp21_ = slideshow_page_settings_dialog_get_show_title (_tmp20_); + configuration_facade_set_slideshow_show_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), slideshow_page_settings_dialog_get_show_title (_tmp17_)); #line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - configuration_facade_set_slideshow_show_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp21_); -#line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _g_object_unref0 (_tmp19_); + _g_object_unref0 (_tmp16_); #line 372 "/home/jens/Source/shotwell/src/SlideshowPage.vala" slideshow_page_update_transition_effect (self); -#line 2108 "SlideshowPage.c" +#line 2219 "SlideshowPage.c" } #line 375 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp22_ = settings_dialog; + _tmp18_ = settings_dialog; #line 375 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget)); #line 376 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp23_ = slideshow_playing; + _tmp19_ = slideshow_playing; #line 376 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - self->priv->playing = _tmp23_; + self->priv->playing = _tmp19_; #line 377 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp24_ = self->priv->timer; + _tmp20_ = self->priv->timer; #line 377 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - g_timer_start (_tmp24_); + g_timer_start (_tmp20_); #line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (settings_dialog); -#line 2124 "SlideshowPage.c" +#line 2235 "SlideshowPage.c" } -static void slideshow_page_update_transition_effect (SlideshowPage* self) { +static void +slideshow_page_update_transition_effect (SlideshowPage* self) +{ gchar* effect_id = NULL; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; @@ -2136,7 +2249,6 @@ static void slideshow_page_update_transition_effect (SlideshowPage* self) { ConfigFacade* _tmp4_; ConfigFacade* _tmp5_; gdouble _tmp6_; - gdouble _tmp7_; #line 380 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_return_if_fail (IS_SLIDESHOW_PAGE (self)); #line 381 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -2157,32 +2269,31 @@ static void slideshow_page_update_transition_effect (SlideshowPage* self) { _tmp5_ = _tmp4_; #line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp6_ = configuration_facade_get_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp7_ = _tmp6_; #line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (_tmp5_); #line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - effect_delay = _tmp7_; + effect_delay = _tmp6_; #line 384 "/home/jens/Source/shotwell/src/SlideshowPage.vala" single_photo_page_set_transition (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), effect_id, (gint) (effect_delay * 1000.0)); #line 380 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_free0 (effect_id); -#line 2169 "SlideshowPage.c" +#line 2279 "SlideshowPage.c" } -static void slideshow_page_random_transition_effect (SlideshowPage* self) { +static void +slideshow_page_random_transition_effect (SlideshowPage* self) +{ gdouble effect_delay = 0.0; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; gdouble _tmp2_; - gdouble _tmp3_; gchar* effect_id = NULL; - gchar* _tmp4_; - gchar** _tmp5_; - gint _tmp5__length1; - const gchar* _tmp12_; - gdouble _tmp13_; + gchar* _tmp3_; + gchar** _tmp4_; + gint _tmp4__length1; + const gchar* _tmp10_; + gdouble _tmp11_; #line 387 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_return_if_fail (IS_SLIDESHOW_PAGE (self)); #line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -2191,69 +2302,68 @@ static void slideshow_page_random_transition_effect (SlideshowPage* self) { _tmp1_ = _tmp0_; #line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp2_ = configuration_facade_get_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp3_ = _tmp2_; #line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (_tmp1_); #line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - effect_delay = _tmp3_; + effect_delay = _tmp2_; #line 389 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp4_ = g_strdup (TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID); + _tmp3_ = g_strdup (TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID); #line 389 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - effect_id = _tmp4_; + effect_id = _tmp3_; #line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp5_ = self->priv->transitions; + _tmp4_ = self->priv->transitions; #line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp5__length1 = self->priv->transitions_length1; + _tmp4__length1 = self->priv->transitions_length1; #line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - if (0 < _tmp5__length1) { -#line 2209 "SlideshowPage.c" + if (0 < _tmp4__length1) { +#line 2318 "SlideshowPage.c" gint random = 0; + gchar** _tmp5_; + gint _tmp5__length1; gchar** _tmp6_; gint _tmp6__length1; - gint32 _tmp7_; - gchar** _tmp8_; - gint _tmp8__length1; - gint _tmp9_; - const gchar* _tmp10_; - gchar* _tmp11_; + gint _tmp7_; + const gchar* _tmp8_; + gchar* _tmp9_; #line 391 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp6_ = self->priv->transitions; + _tmp5_ = self->priv->transitions; #line 391 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp6__length1 = self->priv->transitions_length1; + _tmp5__length1 = self->priv->transitions_length1; #line 391 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp7_ = g_random_int_range ((gint32) 0, (gint32) _tmp6__length1); -#line 391 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - random = (gint) _tmp7_; + random = (gint) g_random_int_range ((gint32) 0, (gint32) _tmp5__length1); #line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp8_ = self->priv->transitions; + _tmp6_ = self->priv->transitions; #line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp8__length1 = self->priv->transitions_length1; + _tmp6__length1 = self->priv->transitions_length1; #line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp9_ = random; + _tmp7_ = random; #line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp10_ = _tmp8_[_tmp9_]; + _tmp8_ = _tmp6_[_tmp7_]; #line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp11_ = g_strdup (_tmp10_); + _tmp9_ = g_strdup (_tmp8_); #line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_free0 (effect_id); #line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - effect_id = _tmp11_; -#line 2241 "SlideshowPage.c" + effect_id = _tmp9_; +#line 2347 "SlideshowPage.c" } #line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp12_ = effect_id; + _tmp10_ = effect_id; #line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp13_ = effect_delay; + _tmp11_ = effect_delay; #line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - single_photo_page_set_transition (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp12_, (gint) (_tmp13_ * 1000.0)); + single_photo_page_set_transition (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp10_, (gint) (_tmp11_ * 1000.0)); #line 387 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_free0 (effect_id); -#line 2251 "SlideshowPage.c" +#line 2357 "SlideshowPage.c" } -static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimensions* ctx_dim) { +static void +slideshow_page_paint_title (SlideshowPage* self, + cairo_t* ctx, + Dimensions* ctx_dim) +{ gchar* title = NULL; Photo* _tmp0_; gchar* _tmp1_; @@ -2293,17 +2403,10 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen gint _tmp32_; Dimensions _tmp33_; gint _tmp34_; - cairo_t* _tmp38_; - cairo_t* _tmp39_; - gdouble _tmp40_; - gdouble _tmp41_; - cairo_t* _tmp42_; - PangoLayout* _tmp43_; - cairo_t* _tmp44_; - PangoLayout* _tmp45_; - cairo_t* _tmp46_; - cairo_t* _tmp47_; - cairo_t* _tmp48_; + gdouble _tmp38_; + gdouble _tmp39_; + PangoLayout* _tmp40_; + PangoLayout* _tmp41_; #line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_return_if_fail (IS_SLIDESHOW_PAGE (self)); #line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -2322,14 +2425,14 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen if (_tmp3_ == NULL) { #line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp2_ = TRUE; -#line 2324 "SlideshowPage.c" +#line 2427 "SlideshowPage.c" } else { const gchar* _tmp4_; #line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp4_ = title; #line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp2_ = g_strcmp0 (_tmp4_, "") == 0; -#line 2331 "SlideshowPage.c" +#line 2434 "SlideshowPage.c" } #line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (_tmp2_) { @@ -2337,7 +2440,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen _g_free0 (title); #line 403 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return; -#line 2339 "SlideshowPage.c" +#line 2442 "SlideshowPage.c" } #line 405 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp5_ = title; @@ -2405,7 +2508,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen _tmp27_ = _tmp26_.height; #line 419 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if ((_tmp24_ + _tmp25_) >= (_tmp27_ * 0.95)) { -#line 2407 "SlideshowPage.c" +#line 2510 "SlideshowPage.c" Dimensions _tmp28_; gint _tmp29_; gint _tmp30_; @@ -2417,7 +2520,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen _tmp30_ = title_height; #line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala" y = (_tmp29_ * 0.95) - _tmp30_; -#line 2419 "SlideshowPage.c" +#line 2522 "SlideshowPage.c" } #line 422 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp31_ = x; @@ -2429,7 +2532,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen _tmp34_ = _tmp33_.width; #line 422 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if ((_tmp31_ + _tmp32_) >= (_tmp34_ * 0.95)) { -#line 2431 "SlideshowPage.c" +#line 2534 "SlideshowPage.c" Dimensions _tmp35_; gint _tmp36_; gint _tmp37_; @@ -2441,44 +2544,30 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen _tmp37_ = title_width; #line 423 "/home/jens/Source/shotwell/src/SlideshowPage.vala" x = (gdouble) ((_tmp36_ / 2) - (_tmp37_ / 2)); -#line 2443 "SlideshowPage.c" +#line 2546 "SlideshowPage.c" } #line 425 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp38_ = ctx; -#line 425 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - set_source_color_from_string (_tmp38_, "#fff"); -#line 426 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp39_ = ctx; + set_source_color_from_string (ctx, "#fff"); #line 426 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp40_ = x; + _tmp38_ = x; #line 426 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp41_ = y; + _tmp39_ = y; #line 426 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - cairo_move_to (_tmp39_, _tmp40_, _tmp41_); + cairo_move_to (ctx, _tmp38_, _tmp39_); #line 427 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp42_ = ctx; + _tmp40_ = layout; #line 427 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp43_ = layout; -#line 427 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - pango_cairo_show_layout (_tmp42_, _tmp43_); -#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp44_ = ctx; + pango_cairo_show_layout (ctx, _tmp40_); #line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp45_ = layout; + _tmp41_ = layout; #line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - pango_cairo_layout_path (_tmp44_, _tmp45_); + pango_cairo_layout_path (ctx, _tmp41_); #line 429 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp46_ = ctx; -#line 429 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - cairo_set_line_width (_tmp46_, 1.5); -#line 430 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp47_ = ctx; + cairo_set_line_width (ctx, 1.5); #line 430 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - set_source_color_from_string (_tmp47_, "#000"); -#line 431 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp48_ = ctx; + set_source_color_from_string (ctx, "#000"); #line 431 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - cairo_stroke (_tmp48_); + cairo_stroke (ctx); #line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _pango_attribute_destroy0 (size); #line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -2487,19 +2576,21 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen _g_object_unref0 (layout); #line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_free0 (title); -#line 2489 "SlideshowPage.c" +#line 2578 "SlideshowPage.c" } -static void slideshow_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dimensions* ctx_dim) { +static void +slideshow_page_real_paint (SinglePhotoPage* base, + cairo_t* ctx, + Dimensions* ctx_dim) +{ SlideshowPage * self; - cairo_t* _tmp0_; - Dimensions _tmp1_; - gboolean _tmp2_ = FALSE; + Dimensions _tmp0_; + gboolean _tmp1_ = FALSE; + ConfigFacade* _tmp2_; ConfigFacade* _tmp3_; - ConfigFacade* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; + gboolean _tmp4_; #line 434 "/home/jens/Source/shotwell/src/SlideshowPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage); #line 434 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -2507,105 +2598,100 @@ static void slideshow_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dime #line 434 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_return_if_fail (ctx_dim != NULL); #line 435 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp0_ = ctx; -#line 435 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp1_ = *ctx_dim; + _tmp0_ = *ctx_dim; #line 435 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - SINGLE_PHOTO_PAGE_CLASS (slideshow_page_parent_class)->paint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp0_, &_tmp1_); -#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp3_ = config_facade_get_instance (); -#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp4_ = _tmp3_; + SINGLE_PHOTO_PAGE_CLASS (slideshow_page_parent_class)->paint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), ctx, &_tmp0_); #line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp5_ = configuration_facade_get_slideshow_show_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp2_ = config_facade_get_instance (); #line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _g_object_unref0 (_tmp4_); + _tmp4_ = configuration_facade_get_slideshow_show_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - if (_tmp6_) { -#line 2526 "SlideshowPage.c" - gboolean _tmp7_; + _g_object_unref0 (_tmp3_); #line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp7_ = single_photo_page_is_transition_in_progress (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); + if (_tmp4_) { #line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp2_ = !_tmp7_; -#line 2532 "SlideshowPage.c" + _tmp1_ = !single_photo_page_is_transition_in_progress (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); +#line 2615 "SlideshowPage.c" } else { #line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp2_ = FALSE; -#line 2536 "SlideshowPage.c" + _tmp1_ = FALSE; +#line 2619 "SlideshowPage.c" } #line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - if (_tmp2_) { -#line 2540 "SlideshowPage.c" - cairo_t* _tmp8_; - Dimensions _tmp9_; -#line 438 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp8_ = ctx; + if (_tmp1_) { +#line 2623 "SlideshowPage.c" + Dimensions _tmp5_; #line 438 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp9_ = *ctx_dim; + _tmp5_ = *ctx_dim; #line 438 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - slideshow_page_paint_title (self, _tmp8_, &_tmp9_); -#line 2549 "SlideshowPage.c" + slideshow_page_paint_title (self, ctx, &_tmp5_); +#line 2629 "SlideshowPage.c" } } -static gint _utf8_ci_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gint +_utf8_ci_compare_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gint result; result = utf8_ci_compare (a, b); #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 2559 "SlideshowPage.c" +#line 2643 "SlideshowPage.c" } -static void _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void +_slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self) +{ #line 71 "/home/jens/Source/shotwell/src/SlideshowPage.vala" slideshow_page_settings_dialog_on_transition_changed ((SlideshowPageSettingsDialog*) self); -#line 2566 "SlideshowPage.c" +#line 2653 "SlideshowPage.c" } -static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GType object_type) { +static SlideshowPageSettingsDialog* +slideshow_page_settings_dialog_construct (GType object_type) +{ SlideshowPageSettingsDialog * self = NULL; gdouble delay = 0.0; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; gdouble _tmp2_; - gdouble _tmp3_; + FullscreenWindow* _tmp3_; FullscreenWindow* _tmp4_; - FullscreenWindow* _tmp5_; - GtkAdjustment* _tmp6_; - gdouble _tmp7_; + GtkAdjustment* _tmp5_; + gdouble _tmp6_; gchar* effect_id = NULL; + ConfigFacade* _tmp7_; ConfigFacade* _tmp8_; - ConfigFacade* _tmp9_; + gchar* _tmp9_; gchar* _tmp10_; - gchar* _tmp11_; gchar* null_display_name = NULL; + TransitionEffectsManager* _tmp11_; TransitionEffectsManager* _tmp12_; - TransitionEffectsManager* _tmp13_; + gchar* _tmp13_; gchar* _tmp14_; - gchar* _tmp15_; - GtkComboBoxText* _tmp16_; - const gchar* _tmp17_; - GtkComboBoxText* _tmp18_; + GtkComboBoxText* _tmp15_; + const gchar* _tmp16_; + GtkComboBoxText* _tmp17_; gint i = 0; - GtkComboBoxText* _tmp43_; + GtkComboBoxText* _tmp41_; gdouble transition_delay = 0.0; - ConfigFacade* _tmp44_; - ConfigFacade* _tmp45_; - gdouble _tmp46_; - gdouble _tmp47_; - GtkAdjustment* _tmp48_; + ConfigFacade* _tmp42_; + ConfigFacade* _tmp43_; + gdouble _tmp44_; + GtkAdjustment* _tmp45_; gboolean show_title = FALSE; - ConfigFacade* _tmp49_; - ConfigFacade* _tmp50_; - gboolean _tmp51_; - gboolean _tmp52_; - GtkCheckButton* _tmp53_; + ConfigFacade* _tmp46_; + ConfigFacade* _tmp47_; + gboolean _tmp48_; + GtkCheckButton* _tmp49_; #line 43 "/home/jens/Source/shotwell/src/SlideshowPage.vala" self = (SlideshowPageSettingsDialog*) g_object_new (object_type, NULL); #line 44 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -2614,222 +2700,213 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT _tmp1_ = _tmp0_; #line 44 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp2_ = configuration_facade_get_slideshow_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 44 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp3_ = _tmp2_; #line 44 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (_tmp1_); #line 44 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - delay = _tmp3_; + delay = _tmp2_; #line 46 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp4_ = app_window_get_fullscreen (); + _tmp3_ = app_window_get_fullscreen (); #line 46 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 46 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow)); + gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow)); #line 46 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 48 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp6_ = self->priv->delay_adjustment; + _tmp5_ = self->priv->delay_adjustment; #line 48 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp7_ = delay; + _tmp6_ = delay; #line 48 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gtk_adjustment_set_value (_tmp6_, _tmp7_); + gtk_adjustment_set_value (_tmp5_, _tmp6_); #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp8_ = config_facade_get_instance (); + _tmp7_ = config_facade_get_instance (); #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp10_ = configuration_facade_get_slideshow_transition_effect_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp9_ = configuration_facade_get_slideshow_transition_effect_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - effect_id = _tmp11_; + effect_id = _tmp10_; #line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp12_ = transition_effects_manager_get_instance (); + _tmp11_ = transition_effects_manager_get_instance (); #line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp14_ = transition_effects_manager_get_effect_name (_tmp13_, TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID); + _tmp13_ = transition_effects_manager_get_effect_name (_tmp12_, TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID); #line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _transition_effects_manager_unref0 (_tmp13_); + _transition_effects_manager_unref0 (_tmp12_); #line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - null_display_name = _tmp15_; + null_display_name = _tmp14_; #line 56 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp16_ = self->priv->transition_effect_selector; + _tmp15_ = self->priv->transition_effect_selector; #line 56 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp17_ = null_display_name; + _tmp16_ = null_display_name; #line 56 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gtk_combo_box_text_append_text (_tmp16_, _tmp17_); + gtk_combo_box_text_append_text (_tmp15_, _tmp16_); #line 57 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp18_ = self->priv->transition_effect_selector; + _tmp17_ = self->priv->transition_effect_selector; #line 57 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), 0); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 59 "/home/jens/Source/shotwell/src/SlideshowPage.vala" i = 1; -#line 2672 "SlideshowPage.c" +#line 2756 "SlideshowPage.c" { GeeIterator* _display_name_it = NULL; + TransitionEffectsManager* _tmp18_; TransitionEffectsManager* _tmp19_; - TransitionEffectsManager* _tmp20_; + GeeCollection* _tmp20_; GeeCollection* _tmp21_; - GeeCollection* _tmp22_; + GeeIterator* _tmp22_; GeeIterator* _tmp23_; - GeeIterator* _tmp24_; #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp19_ = transition_effects_manager_get_instance (); + _tmp18_ = transition_effects_manager_get_instance (); #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp21_ = transition_effects_manager_get_effect_names (_tmp20_, _utf8_ci_compare_gcompare_data_func, NULL, NULL); + _tmp20_ = transition_effects_manager_get_effect_names (_tmp19_, _utf8_ci_compare_gcompare_data_func, NULL, NULL); #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp23_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp22_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ITERABLE, GeeIterable)); #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _g_object_unref0 (_tmp22_); + _g_object_unref0 (_tmp21_); #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _transition_effects_manager_unref0 (_tmp20_); + _transition_effects_manager_unref0 (_tmp19_); #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _display_name_it = _tmp24_; + _display_name_it = _tmp23_; #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" while (TRUE) { -#line 2701 "SlideshowPage.c" - GeeIterator* _tmp25_; - gboolean _tmp26_; +#line 2785 "SlideshowPage.c" + GeeIterator* _tmp24_; gchar* display_name = NULL; - GeeIterator* _tmp27_; - gpointer _tmp28_; - const gchar* _tmp29_; + GeeIterator* _tmp25_; + gpointer _tmp26_; + const gchar* _tmp27_; + const gchar* _tmp28_; + GtkComboBoxText* _tmp29_; const gchar* _tmp30_; - GtkComboBoxText* _tmp31_; - const gchar* _tmp32_; - const gchar* _tmp33_; - TransitionEffectsManager* _tmp34_; - TransitionEffectsManager* _tmp35_; - const gchar* _tmp36_; - gchar* _tmp37_; - gchar* _tmp38_; - gboolean _tmp39_; - gint _tmp42_; -#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp25_ = _display_name_it; + const gchar* _tmp31_; + TransitionEffectsManager* _tmp32_; + TransitionEffectsManager* _tmp33_; + const gchar* _tmp34_; + gchar* _tmp35_; + gchar* _tmp36_; + gboolean _tmp37_; + gint _tmp40_; #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp26_ = gee_iterator_next (_tmp25_); + _tmp24_ = _display_name_it; #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - if (!_tmp26_) { + if (!gee_iterator_next (_tmp24_)) { #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" break; -#line 2727 "SlideshowPage.c" +#line 2808 "SlideshowPage.c" } #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp27_ = _display_name_it; + _tmp25_ = _display_name_it; #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp28_ = gee_iterator_get (_tmp27_); + _tmp26_ = gee_iterator_get (_tmp25_); #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - display_name = (gchar*) _tmp28_; + display_name = (gchar*) _tmp26_; #line 62 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp29_ = display_name; + _tmp27_ = display_name; #line 62 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp30_ = null_display_name; + _tmp28_ = null_display_name; #line 62 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - if (g_strcmp0 (_tmp29_, _tmp30_) == 0) { + if (g_strcmp0 (_tmp27_, _tmp28_) == 0) { #line 63 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_free0 (display_name); #line 63 "/home/jens/Source/shotwell/src/SlideshowPage.vala" continue; -#line 2745 "SlideshowPage.c" +#line 2826 "SlideshowPage.c" } #line 65 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp31_ = self->priv->transition_effect_selector; + _tmp29_ = self->priv->transition_effect_selector; #line 65 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp32_ = display_name; + _tmp30_ = display_name; #line 65 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gtk_combo_box_text_append_text (_tmp31_, _tmp32_); + gtk_combo_box_text_append_text (_tmp29_, _tmp30_); #line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp33_ = effect_id; + _tmp31_ = effect_id; #line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp34_ = transition_effects_manager_get_instance (); + _tmp32_ = transition_effects_manager_get_instance (); #line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp35_ = _tmp34_; + _tmp33_ = _tmp32_; #line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp36_ = display_name; + _tmp34_ = display_name; #line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp37_ = transition_effects_manager_get_id_for_effect_name (_tmp35_, _tmp36_); + _tmp35_ = transition_effects_manager_get_id_for_effect_name (_tmp33_, _tmp34_); #line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp38_ = _tmp37_; + _tmp36_ = _tmp35_; #line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp39_ = g_strcmp0 (_tmp33_, _tmp38_) == 0; + _tmp37_ = g_strcmp0 (_tmp31_, _tmp36_) == 0; #line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _g_free0 (_tmp38_); + _g_free0 (_tmp36_); #line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _transition_effects_manager_unref0 (_tmp35_); + _transition_effects_manager_unref0 (_tmp33_); #line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - if (_tmp39_) { -#line 2773 "SlideshowPage.c" - GtkComboBoxText* _tmp40_; - gint _tmp41_; + if (_tmp37_) { +#line 2854 "SlideshowPage.c" + GtkComboBoxText* _tmp38_; + gint _tmp39_; #line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp40_ = self->priv->transition_effect_selector; + _tmp38_ = self->priv->transition_effect_selector; #line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp41_ = i; + _tmp39_ = i; #line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_combo_box_get_type (), GtkComboBox), _tmp41_); -#line 2782 "SlideshowPage.c" + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_combo_box_get_type (), GtkComboBox), _tmp39_); +#line 2863 "SlideshowPage.c" } #line 69 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp42_ = i; + _tmp40_ = i; #line 69 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - i = _tmp42_ + 1; + i = _tmp40_ + 1; #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_free0 (display_name); -#line 2790 "SlideshowPage.c" +#line 2871 "SlideshowPage.c" } #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (_display_name_it); -#line 2794 "SlideshowPage.c" +#line 2875 "SlideshowPage.c" } #line 71 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp43_ = self->priv->transition_effect_selector; + _tmp41_ = self->priv->transition_effect_selector; #line 71 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed, self, 0); #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp44_ = config_facade_get_instance (); + _tmp42_ = config_facade_get_instance (); #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp45_ = _tmp44_; + _tmp43_ = _tmp42_; #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp46_ = configuration_facade_get_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp44_ = configuration_facade_get_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp47_ = _tmp46_; + _g_object_unref0 (_tmp43_); #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _g_object_unref0 (_tmp45_); -#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - transition_delay = _tmp47_; + transition_delay = _tmp44_; #line 74 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp48_ = self->priv->transition_effect_adjustment; + _tmp45_ = self->priv->transition_effect_adjustment; #line 74 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gtk_adjustment_set_value (_tmp48_, transition_delay); -#line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp49_ = config_facade_get_instance (); + gtk_adjustment_set_value (_tmp45_, transition_delay); #line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp50_ = _tmp49_; + _tmp46_ = config_facade_get_instance (); #line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp51_ = configuration_facade_get_slideshow_show_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp47_ = _tmp46_; #line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp52_ = _tmp51_; + _tmp48_ = configuration_facade_get_slideshow_show_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _g_object_unref0 (_tmp50_); + _g_object_unref0 (_tmp47_); #line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - show_title = _tmp52_; + show_title = _tmp48_; #line 77 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp53_ = self->priv->show_title_button; + _tmp49_ = self->priv->show_title_button; #line 77 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_toggle_button_get_type (), GtkToggleButton), show_title); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_toggle_button_get_type (), GtkToggleButton), show_title); #line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala" slideshow_page_settings_dialog_on_transition_changed (self); #line 43 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -2838,18 +2915,22 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT _g_free0 (effect_id); #line 43 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return self; -#line 2840 "SlideshowPage.c" +#line 2917 "SlideshowPage.c" } -static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_new (void) { +static SlideshowPageSettingsDialog* +slideshow_page_settings_dialog_new (void) +{ #line 43 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return slideshow_page_settings_dialog_construct (SLIDESHOW_PAGE_TYPE_SETTINGS_DIALOG); -#line 2847 "SlideshowPage.c" +#line 2926 "SlideshowPage.c" } -static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageSettingsDialog* self) { +static void +slideshow_page_settings_dialog_on_transition_changed (SlideshowPageSettingsDialog* self) +{ gchar* selected = NULL; GtkComboBoxText* _tmp0_; gchar* _tmp1_; @@ -2870,17 +2951,17 @@ static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageS _tmp3_ = selected; #line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (_tmp3_ != NULL) { -#line 2872 "SlideshowPage.c" +#line 2953 "SlideshowPage.c" const gchar* _tmp4_; #line 85 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp4_ = selected; #line 85 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp2_ = g_strcmp0 (_tmp4_, TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID) != 0; -#line 2878 "SlideshowPage.c" +#line 2959 "SlideshowPage.c" } else { #line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp2_ = FALSE; -#line 2882 "SlideshowPage.c" +#line 2963 "SlideshowPage.c" } #line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala" sensitive = _tmp2_; @@ -2894,47 +2975,47 @@ static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageS gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), sensitive); #line 82 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_free0 (selected); -#line 2896 "SlideshowPage.c" +#line 2977 "SlideshowPage.c" } -static gdouble slideshow_page_settings_dialog_get_delay (SlideshowPageSettingsDialog* self) { +static gdouble +slideshow_page_settings_dialog_get_delay (SlideshowPageSettingsDialog* self) +{ gdouble result = 0.0; GtkSpinButton* _tmp0_; - gdouble _tmp1_; #line 91 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_return_val_if_fail (SLIDESHOW_PAGE_IS_SETTINGS_DIALOG (self), 0.0); #line 92 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp0_ = self->priv->delay_entry; #line 92 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp1_ = gtk_spin_button_get_value (_tmp0_); -#line 92 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - result = _tmp1_; + result = gtk_spin_button_get_value (_tmp0_); #line 92 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 2914 "SlideshowPage.c" +#line 2994 "SlideshowPage.c" } -static gdouble slideshow_page_settings_dialog_get_transition_delay (SlideshowPageSettingsDialog* self) { +static gdouble +slideshow_page_settings_dialog_get_transition_delay (SlideshowPageSettingsDialog* self) +{ gdouble result = 0.0; GtkSpinButton* _tmp0_; - gdouble _tmp1_; #line 95 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_return_val_if_fail (SLIDESHOW_PAGE_IS_SETTINGS_DIALOG (self), 0.0); #line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp0_ = self->priv->transition_effect_entry; #line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp1_ = gtk_spin_button_get_value (_tmp0_); -#line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - result = _tmp1_; + result = gtk_spin_button_get_value (_tmp0_); #line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 2932 "SlideshowPage.c" +#line 3011 "SlideshowPage.c" } -static gchar* slideshow_page_settings_dialog_get_transition_effect_id (SlideshowPageSettingsDialog* self) { +static gchar* +slideshow_page_settings_dialog_get_transition_effect_id (SlideshowPageSettingsDialog* self) +{ gchar* result = NULL; gchar* active = NULL; GtkComboBoxText* _tmp0_; @@ -2961,7 +3042,7 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow _tmp2_ = active; #line 101 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (_tmp2_ == NULL) { -#line 2963 "SlideshowPage.c" +#line 3044 "SlideshowPage.c" gchar* _tmp3_; #line 102 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp3_ = g_strdup (TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID); @@ -2971,7 +3052,7 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow _g_free0 (active); #line 102 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 2973 "SlideshowPage.c" +#line 3054 "SlideshowPage.c" } #line 104 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp4_ = transition_effects_manager_get_instance (); @@ -2991,17 +3072,17 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow _tmp10_ = id; #line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (_tmp10_ != NULL) { -#line 2993 "SlideshowPage.c" +#line 3074 "SlideshowPage.c" const gchar* _tmp11_; #line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp11_ = id; #line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp9_ = _tmp11_; -#line 2999 "SlideshowPage.c" +#line 3080 "SlideshowPage.c" } else { #line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp9_ = TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID; -#line 3003 "SlideshowPage.c" +#line 3084 "SlideshowPage.c" } #line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp12_ = g_strdup (_tmp9_); @@ -3013,11 +3094,13 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow _g_free0 (active); #line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 3015 "SlideshowPage.c" +#line 3096 "SlideshowPage.c" } -static gboolean slideshow_page_settings_dialog_get_show_title (SlideshowPageSettingsDialog* self) { +static gboolean +slideshow_page_settings_dialog_get_show_title (SlideshowPageSettingsDialog* self) +{ gboolean result = FALSE; GtkCheckButton* _tmp0_; gboolean _tmp1_; @@ -3034,11 +3117,13 @@ static gboolean slideshow_page_settings_dialog_get_show_title (SlideshowPageSett result = _tmp2_; #line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 3036 "SlideshowPage.c" +#line 3119 "SlideshowPage.c" } -static void slideshow_page_settings_dialog_class_init (SlideshowPageSettingsDialogClass * klass) { +static void +slideshow_page_settings_dialog_class_init (SlideshowPageSettingsDialogClass * klass) +{ gint SlideshowPageSettingsDialog_private_offset; #line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala" slideshow_page_settings_dialog_parent_class = g_type_class_peek_parent (klass); @@ -3064,20 +3149,24 @@ static void slideshow_page_settings_dialog_class_init (SlideshowPageSettingsDial gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "transition_effect_adjustment", FALSE, SlideshowPageSettingsDialog_private_offset + G_STRUCT_OFFSET (SlideshowPageSettingsDialogPrivate, transition_effect_adjustment)); #line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "show_title_button", FALSE, SlideshowPageSettingsDialog_private_offset + G_STRUCT_OFFSET (SlideshowPageSettingsDialogPrivate, show_title_button)); -#line 3066 "SlideshowPage.c" +#line 3151 "SlideshowPage.c" } -static void slideshow_page_settings_dialog_instance_init (SlideshowPageSettingsDialog * self) { +static void +slideshow_page_settings_dialog_instance_init (SlideshowPageSettingsDialog * self) +{ #line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala" self->priv = SLIDESHOW_PAGE_SETTINGS_DIALOG_GET_PRIVATE (self); #line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 3075 "SlideshowPage.c" +#line 3162 "SlideshowPage.c" } -static void slideshow_page_settings_dialog_finalize (GObject * obj) { +static void +slideshow_page_settings_dialog_finalize (GObject * obj) +{ SlideshowPageSettingsDialog * self; #line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SLIDESHOW_PAGE_TYPE_SETTINGS_DIALOG, SlideshowPageSettingsDialog); @@ -3097,11 +3186,13 @@ static void slideshow_page_settings_dialog_finalize (GObject * obj) { _g_object_unref0 (self->priv->show_title_button); #line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala" G_OBJECT_CLASS (slideshow_page_settings_dialog_parent_class)->finalize (obj); -#line 3099 "SlideshowPage.c" +#line 3188 "SlideshowPage.c" } -static GType slideshow_page_settings_dialog_get_type (void) { +static GType +slideshow_page_settings_dialog_get_type (void) +{ static volatile gsize slideshow_page_settings_dialog_type_id__volatile = 0; if (g_once_init_enter (&slideshow_page_settings_dialog_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SlideshowPageSettingsDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) slideshow_page_settings_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SlideshowPageSettingsDialog), 0, (GInstanceInitFunc) slideshow_page_settings_dialog_instance_init, NULL }; @@ -3113,7 +3204,9 @@ static GType slideshow_page_settings_dialog_get_type (void) { } -static void slideshow_page_class_init (SlideshowPageClass * klass) { +static void +slideshow_page_class_init (SlideshowPageClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala" slideshow_page_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -3134,11 +3227,13 @@ static void slideshow_page_class_init (SlideshowPageClass * klass) { G_OBJECT_CLASS (klass)->finalize = slideshow_page_finalize; #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala" slideshow_page_signals[SLIDESHOW_PAGE_HIDE_TOOLBAR_SIGNAL] = g_signal_new ("hide-toolbar", TYPE_SLIDESHOW_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 3136 "SlideshowPage.c" +#line 3229 "SlideshowPage.c" } -static void slideshow_page_instance_init (SlideshowPage * self) { +static void +slideshow_page_instance_init (SlideshowPage * self) +{ GTimer* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala" self->priv = SLIDESHOW_PAGE_GET_PRIVATE (self); @@ -3152,11 +3247,13 @@ static void slideshow_page_instance_init (SlideshowPage * self) { self->priv->playing = TRUE; #line 19 "/home/jens/Source/shotwell/src/SlideshowPage.vala" self->priv->exiting = FALSE; -#line 3154 "SlideshowPage.c" +#line 3249 "SlideshowPage.c" } -static void slideshow_page_finalize (GObject * obj) { +static void +slideshow_page_finalize (GObject * obj) +{ SlideshowPage * self; #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SLIDESHOW_PAGE, SlideshowPage); @@ -3180,11 +3277,13 @@ static void slideshow_page_finalize (GObject * obj) { _screensaver_unref0 (self->priv->screensaver); #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala" G_OBJECT_CLASS (slideshow_page_parent_class)->finalize (obj); -#line 3182 "SlideshowPage.c" +#line 3279 "SlideshowPage.c" } -GType slideshow_page_get_type (void) { +GType +slideshow_page_get_type (void) +{ static volatile gsize slideshow_page_type_id__volatile = 0; if (g_once_init_enter (&slideshow_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SlideshowPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) slideshow_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SlideshowPage), 0, (GInstanceInitFunc) slideshow_page_instance_init, NULL }; @@ -3196,7 +3295,11 @@ GType slideshow_page_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -3208,7 +3311,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/SortedList.c b/src/SortedList.c index f5bd10e..37f2db4 100644 --- a/src/SortedList.c +++ b/src/SortedList.c @@ -1,4 +1,4 @@ -/* SortedList.c generated by valac 0.36.6, the Vala compiler +/* SortedList.c generated by valac 0.40.4, the Vala compiler * generated from SortedList.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -22,6 +23,20 @@ typedef struct _SortedList SortedList; typedef struct _SortedListClass SortedListClass; typedef struct _SortedListPrivate SortedListPrivate; +enum { + SORTED_LIST_0_PROPERTY, + SORTED_LIST_G_TYPE, + SORTED_LIST_G_DUP_FUNC, + SORTED_LIST_G_DESTROY_FUNC, + SORTED_LIST_ELEMENT_TYPE_PROPERTY, + SORTED_LIST_READ_ONLY_PROPERTY, + SORTED_LIST_IS_EMPTY_PROPERTY, + SORTED_LIST_SIZE_PROPERTY, + SORTED_LIST_READ_ONLY_VIEW_PROPERTY, + SORTED_LIST_READ_ONLY_VIEW_AS_LIST_PROPERTY, + SORTED_LIST_NUM_PROPERTIES +}; +static GParamSpec* sorted_list_properties[SORTED_LIST_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } @@ -55,58 +70,107 @@ static GeeCollectionIface * sorted_list_gee_collection_parent_iface = NULL; GType sorted_list_get_type (void) G_GNUC_CONST; #define SORTED_LIST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SORTED_LIST, SortedListPrivate)) -enum { - SORTED_LIST_DUMMY_PROPERTY, - SORTED_LIST_G_TYPE, - SORTED_LIST_G_DUP_FUNC, - SORTED_LIST_G_DESTROY_FUNC, - SORTED_LIST_ELEMENT_TYPE_PROPERTY, - SORTED_LIST_READ_ONLY_PROPERTY, - SORTED_LIST_IS_EMPTY_PROPERTY, - SORTED_LIST_SIZE_PROPERTY, - SORTED_LIST_READ_ONLY_VIEW_PROPERTY, - SORTED_LIST_READ_ONLY_VIEW_AS_LIST_PROPERTY -}; -SortedList* sorted_list_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target); -SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target); +SortedList* sorted_list_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + Comparator cmp, + void* cmp_target); +SortedList* sorted_list_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + Comparator cmp, + void* cmp_target); static GeeIterator* sorted_list_real_iterator (GeeIterable* base); -static gboolean sorted_list_real_foreach (GeeTraversable* base, GeeForallFunc f, void* f_target); -static gboolean sorted_list_real_add (GeeCollection* base, gconstpointer item); -static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer item); -static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* collection); -gboolean sorted_list_add_list (SortedList* self, GeeList* items); -static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add); +static gboolean sorted_list_real_foreach (GeeTraversable* base, + GeeForallFunc f, + void* f_target); +static gboolean sorted_list_real_add (GeeCollection* base, + gconstpointer item); +static gint sorted_list_get_sorted_insert_pos (SortedList* self, + gconstpointer item); +static gboolean sorted_list_real_add_all (GeeCollection* base, + GeeCollection* collection); +gboolean sorted_list_add_list (SortedList* self, + GeeList* items); +static gboolean sorted_list_merge_sort (SortedList* self, + GeeList* add); static void sorted_list_real_clear (GeeCollection* base); -static gboolean sorted_list_real_contains (GeeCollection* base, gconstpointer item); -static gboolean sorted_list_real_contains_all (GeeCollection* base, GeeCollection* collection); -static gboolean sorted_list_real_remove (GeeCollection* base, gconstpointer item); -static gboolean sorted_list_real_remove_all (GeeCollection* base, GeeCollection* collection); -static gboolean sorted_list_real_retain_all (GeeCollection* base, GeeCollection* collection); +static gboolean sorted_list_real_contains (GeeCollection* base, + gconstpointer item); +static gboolean sorted_list_real_contains_all (GeeCollection* base, + GeeCollection* collection); +static gboolean sorted_list_real_remove (GeeCollection* base, + gconstpointer item); +static gboolean sorted_list_real_remove_all (GeeCollection* base, + GeeCollection* collection); +static gboolean sorted_list_real_retain_all (GeeCollection* base, + GeeCollection* collection); gint sorted_list_get_count (SortedList* self); -gpointer sorted_list_get_at (SortedList* self, gint index); -static gint sorted_list_binary_search (SortedList* self, gconstpointer search, GEqualFunc equal_func); -gint sorted_list_index_of (SortedList* self, gconstpointer search); -gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altered, GEqualFunc equal_func); -gpointer sorted_list_remove_at (SortedList* self, gint index); -static gpointer* sorted_list_real_to_array (GeeCollection* base, int* result_length1); -void sorted_list_resort (SortedList* self, Comparator new_cmp, void* new_cmp_target); -gboolean sorted_list_resort_item (SortedList* self, gconstpointer item); +gpointer sorted_list_get_at (SortedList* self, + gint index); +static gint sorted_list_binary_search (SortedList* self, + gconstpointer search, + GEqualFunc equal_func); +gint sorted_list_index_of (SortedList* self, + gconstpointer search); +gint sorted_list_locate (SortedList* self, + gconstpointer search, + gboolean altered, + GEqualFunc equal_func); +gpointer sorted_list_remove_at (SortedList* self, + gint index); +static gpointer* sorted_list_real_to_array (GeeCollection* base, + int* result_length1); +void sorted_list_resort (SortedList* self, + Comparator new_cmp, + void* new_cmp_target); +gboolean sorted_list_resort_item (SortedList* self, + gconstpointer item); SortedList* sorted_list_copy (SortedList* self); -static void _sorted_list_merge_sort (SortedList* self, gpointer* array, int array_length1, gpointer* scratch, int scratch_length1, gint start_index, gint end_index); -static void sorted_list_merge (SortedList* self, gpointer* array, int array_length1, gpointer* scratch, int scratch_length1, gint start_index, gint middle_index, gint end_index); +static void _sorted_list_merge_sort (SortedList* self, + gpointer* array, + int array_length1, + gpointer* scratch, + int scratch_length1, + gint start_index, + gint end_index); +static void sorted_list_merge (SortedList* self, + gpointer* array, + int array_length1, + gpointer* scratch, + int scratch_length1, + gint start_index, + gint middle_index, + gint end_index); GeeList* sorted_list_get_read_only_view_as_list (SortedList* self); static void sorted_list_finalize (GObject * obj); -static void _vala_sorted_list_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void _vala_sorted_list_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target) { +static void _vala_sorted_list_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); +static void _vala_sorted_list_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); + + +SortedList* +sorted_list_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + Comparator cmp, + void* cmp_target) +{ SortedList * self = NULL; GeeArrayList* _tmp0_; - Comparator _tmp1_; - void* _tmp1__target; #line 13 "/home/jens/Source/shotwell/src/SortedList.vala" self = (SortedList*) g_object_new (object_type, NULL); #line 13 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -122,27 +186,31 @@ SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFu #line 14 "/home/jens/Source/shotwell/src/SortedList.vala" self->priv->list = _tmp0_; #line 15 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = cmp; -#line 15 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1__target = cmp_target; -#line 15 "/home/jens/Source/shotwell/src/SortedList.vala" - self->priv->cmp = _tmp1_; + self->priv->cmp = cmp; #line 15 "/home/jens/Source/shotwell/src/SortedList.vala" - self->priv->cmp_target = _tmp1__target; + self->priv->cmp_target = cmp_target; #line 13 "/home/jens/Source/shotwell/src/SortedList.vala" return self; -#line 135 "SortedList.c" +#line 195 "SortedList.c" } -SortedList* sorted_list_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target) { +SortedList* +sorted_list_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + Comparator cmp, + void* cmp_target) +{ #line 13 "/home/jens/Source/shotwell/src/SortedList.vala" return sorted_list_construct (TYPE_SORTED_LIST, g_type, g_dup_func, g_destroy_func, cmp, cmp_target); -#line 142 "SortedList.c" +#line 208 "SortedList.c" } -static GeeIterator* sorted_list_real_iterator (GeeIterable* base) { +static GeeIterator* +sorted_list_real_iterator (GeeIterable* base) +{ SortedList * self; GeeIterator* result = NULL; GeeArrayList* _tmp0_; @@ -157,36 +225,34 @@ static GeeIterator* sorted_list_real_iterator (GeeIterable* base) { result = _tmp1_; #line 27 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 161 "SortedList.c" +#line 229 "SortedList.c" } -static gboolean sorted_list_real_foreach (GeeTraversable* base, GeeForallFunc f, void* f_target) { +static gboolean +sorted_list_real_foreach (GeeTraversable* base, + GeeForallFunc f, + void* f_target) +{ SortedList * self; gboolean result = FALSE; GeeArrayList* _tmp0_; - GeeForallFunc _tmp1_; - void* _tmp1__target; - gboolean _tmp2_; #line 30 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 31 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; #line 31 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = f; -#line 31 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1__target = f_target; -#line 31 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = gee_abstract_collection_foreach (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_, _tmp1__target); -#line 31 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp2_; + result = gee_abstract_collection_foreach (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), f, f_target); #line 31 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 186 "SortedList.c" +#line 249 "SortedList.c" } -static gboolean sorted_list_real_add (GeeCollection* base, gconstpointer item) { +static gboolean +sorted_list_real_add (GeeCollection* base, + gconstpointer item) +{ SortedList * self; gboolean result = FALSE; Comparator _tmp0_; @@ -199,212 +265,175 @@ static gboolean sorted_list_real_add (GeeCollection* base, gconstpointer item) { _tmp0__target = self->priv->cmp_target; #line 35 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp0_ == NULL) { -#line 203 "SortedList.c" +#line 269 "SortedList.c" GeeArrayList* _tmp1_; - gconstpointer _tmp2_; #line 36 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = self->priv->list; #line 36 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = item; -#line 36 "/home/jens/Source/shotwell/src/SortedList.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); -#line 212 "SortedList.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), item); +#line 275 "SortedList.c" } else { - GeeArrayList* _tmp3_; - gconstpointer _tmp4_; - gint _tmp5_; - gconstpointer _tmp6_; -#line 38 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp3_ = self->priv->list; -#line 38 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp4_ = item; -#line 38 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp5_ = sorted_list_get_sorted_insert_pos (self, _tmp4_); + GeeArrayList* _tmp2_; #line 38 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = item; + _tmp2_ = self->priv->list; #line 38 "/home/jens/Source/shotwell/src/SortedList.vala" - gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp5_, _tmp6_); -#line 228 "SortedList.c" + gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), sorted_list_get_sorted_insert_pos (self, item), item); +#line 282 "SortedList.c" } #line 44 "/home/jens/Source/shotwell/src/SortedList.vala" result = TRUE; #line 44 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 234 "SortedList.c" +#line 288 "SortedList.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 51 "/home/jens/Source/shotwell/src/SortedList.vala" return self ? g_object_ref (self) : NULL; -#line 241 "SortedList.c" +#line 297 "SortedList.c" } -static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* collection) { +static gboolean +sorted_list_real_add_all (GeeCollection* base, + GeeCollection* collection) +{ SortedList * self; gboolean result = FALSE; - GeeCollection* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; GeeList* as_list = NULL; - GeeCollection* _tmp3_; - GeeList* _tmp4_; - GeeList* _tmp5_; - Comparator _tmp8_; - void* _tmp8__target; + GeeList* _tmp2_; + GeeList* _tmp3_; + Comparator _tmp5_; + void* _tmp5__target; gboolean changed = FALSE; - GeeCollection* _tmp12_; - gint _tmp13_; - gint _tmp14_; + gint _tmp7_; + gint _tmp8_; #line 47 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 47 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (GEE_IS_COLLECTION (collection), FALSE); #line 48 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp0_ = collection; -#line 48 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp0_ = gee_collection_get_size (collection); #line 48 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 48 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 49 "/home/jens/Source/shotwell/src/SortedList.vala" result = FALSE; #line 49 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 277 "SortedList.c" +#line 331 "SortedList.c" } #line 51 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp3_ = collection; -#line 51 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, GEE_TYPE_LIST) ? ((GeeList*) _tmp3_) : NULL); + _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (collection, GEE_TYPE_LIST) ? ((GeeList*) collection) : NULL); #line 51 "/home/jens/Source/shotwell/src/SortedList.vala" - as_list = _tmp4_; + as_list = _tmp2_; #line 52 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp5_ = as_list; + _tmp3_ = as_list; #line 52 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp5_ != NULL) { -#line 289 "SortedList.c" - GeeList* _tmp6_; - gboolean _tmp7_; -#line 53 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = as_list; + if (_tmp3_ != NULL) { +#line 341 "SortedList.c" + GeeList* _tmp4_; #line 53 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp7_ = sorted_list_add_list (self, _tmp6_); + _tmp4_ = as_list; #line 53 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp7_; + result = sorted_list_add_list (self, _tmp4_); #line 53 "/home/jens/Source/shotwell/src/SortedList.vala" _g_object_unref0 (as_list); #line 53 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 302 "SortedList.c" +#line 351 "SortedList.c" } #line 55 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8_ = self->priv->cmp; + _tmp5_ = self->priv->cmp; #line 55 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8__target = self->priv->cmp_target; + _tmp5__target = self->priv->cmp_target; #line 55 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp8_ == NULL) { -#line 310 "SortedList.c" - GeeArrayList* _tmp9_; - GeeCollection* _tmp10_; - gboolean _tmp11_; -#line 56 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp9_ = self->priv->list; -#line 56 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp10_ = collection; + if (_tmp5_ == NULL) { +#line 359 "SortedList.c" + GeeArrayList* _tmp6_; #line 56 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp11_ = gee_array_list_add_all (_tmp9_, _tmp10_); + _tmp6_ = self->priv->list; #line 56 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp11_; + result = gee_array_list_add_all (_tmp6_, collection); #line 56 "/home/jens/Source/shotwell/src/SortedList.vala" _g_object_unref0 (as_list); #line 56 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 326 "SortedList.c" +#line 369 "SortedList.c" } #line 58 "/home/jens/Source/shotwell/src/SortedList.vala" changed = FALSE; #line 59 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12_ = collection; + _tmp7_ = gee_collection_get_size (collection); #line 59 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp13_ = gee_collection_get_size (_tmp12_); + _tmp8_ = _tmp7_; #line 59 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp14_ = _tmp13_; -#line 59 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp14_ == 1) { -#line 338 "SortedList.c" + if (_tmp8_ == 1) { +#line 379 "SortedList.c" GeeIterator* iter = NULL; - GeeCollection* _tmp15_; - GeeIterator* _tmp16_; - GeeIterator* _tmp17_; + GeeIterator* _tmp9_; + GeeIterator* _tmp10_; gpointer item = NULL; - GeeIterator* _tmp18_; - gpointer _tmp19_; - GeeArrayList* _tmp20_; - gconstpointer _tmp21_; - gint _tmp22_; - gconstpointer _tmp23_; -#line 60 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15_ = collection; + GeeIterator* _tmp11_; + gpointer _tmp12_; + GeeArrayList* _tmp13_; + gconstpointer _tmp14_; + gconstpointer _tmp15_; #line 60 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (collection, GEE_TYPE_ITERABLE, GeeIterable)); #line 60 "/home/jens/Source/shotwell/src/SortedList.vala" - iter = _tmp16_; + iter = _tmp9_; #line 61 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp17_ = iter; + _tmp10_ = iter; #line 61 "/home/jens/Source/shotwell/src/SortedList.vala" - gee_iterator_next (_tmp17_); + gee_iterator_next (_tmp10_); #line 62 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp18_ = iter; + _tmp11_ = iter; #line 62 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19_ = gee_iterator_get (_tmp18_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 62 "/home/jens/Source/shotwell/src/SortedList.vala" - item = _tmp19_; -#line 64 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp20_ = self->priv->list; + item = _tmp12_; #line 64 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp21_ = item; + _tmp13_ = self->priv->list; #line 64 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp22_ = sorted_list_get_sorted_insert_pos (self, _tmp21_); + _tmp14_ = item; #line 64 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp23_ = item; + _tmp15_ = item; #line 64 "/home/jens/Source/shotwell/src/SortedList.vala" - gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp22_, _tmp23_); + gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), sorted_list_get_sorted_insert_pos (self, _tmp14_), _tmp15_); #line 65 "/home/jens/Source/shotwell/src/SortedList.vala" changed = TRUE; #line 59 "/home/jens/Source/shotwell/src/SortedList.vala" ((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL)); #line 59 "/home/jens/Source/shotwell/src/SortedList.vala" _g_object_unref0 (iter); -#line 382 "SortedList.c" +#line 417 "SortedList.c" } else { GeeList* items = NULL; - GeeArrayList* _tmp24_; - GeeList* _tmp25_; - GeeCollection* _tmp26_; - GeeList* _tmp27_; - gboolean _tmp28_; + GeeArrayList* _tmp16_; + GeeList* _tmp17_; + GeeList* _tmp18_; #line 67 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp24_ = gee_array_list_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, (GDestroyNotify) self->priv->g_destroy_func, NULL, NULL, NULL); + _tmp16_ = gee_array_list_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, (GDestroyNotify) self->priv->g_destroy_func, NULL, NULL, NULL); #line 67 "/home/jens/Source/shotwell/src/SortedList.vala" - items = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_LIST, GeeList); -#line 68 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp25_ = items; + items = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_LIST, GeeList); #line 68 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp26_ = collection; + _tmp17_ = items; #line 68 "/home/jens/Source/shotwell/src/SortedList.vala" - gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), _tmp26_); + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection), collection); #line 70 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp27_ = items; + _tmp18_ = items; #line 70 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp28_ = sorted_list_merge_sort (self, _tmp27_); -#line 70 "/home/jens/Source/shotwell/src/SortedList.vala" - changed = _tmp28_; + changed = sorted_list_merge_sort (self, _tmp18_); #line 59 "/home/jens/Source/shotwell/src/SortedList.vala" _g_object_unref0 (items); -#line 408 "SortedList.c" +#line 437 "SortedList.c" } #line 76 "/home/jens/Source/shotwell/src/SortedList.vala" result = changed; @@ -412,16 +441,18 @@ static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* co _g_object_unref0 (as_list); #line 76 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 416 "SortedList.c" +#line 445 "SortedList.c" } -gboolean sorted_list_add_list (SortedList* self, GeeList* items) { +gboolean +sorted_list_add_list (SortedList* self, + GeeList* items) +{ gboolean result = FALSE; gboolean added = FALSE; - GeeList* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; #line 79 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), FALSE); #line 79 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -429,104 +460,80 @@ gboolean sorted_list_add_list (SortedList* self, GeeList* items) { #line 80 "/home/jens/Source/shotwell/src/SortedList.vala" added = FALSE; #line 81 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp0_ = items; -#line 81 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp0_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (items, GEE_TYPE_COLLECTION, GeeCollection)); #line 81 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 81 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp2_ == 0) { -#line 440 "SortedList.c" + if (_tmp1_ == 0) { +#line 469 "SortedList.c" } else { - Comparator _tmp3_; - void* _tmp3__target; + Comparator _tmp2_; + void* _tmp2__target; #line 83 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp3_ = self->priv->cmp; + _tmp2_ = self->priv->cmp; #line 83 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp3__target = self->priv->cmp_target; + _tmp2__target = self->priv->cmp_target; #line 83 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp3_ != NULL) { -#line 450 "SortedList.c" - GeeList* _tmp4_; - gint _tmp5_; - gint _tmp6_; -#line 86 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp4_ = items; + if (_tmp2_ != NULL) { +#line 479 "SortedList.c" + gint _tmp3_; + gint _tmp4_; #line 86 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (items, GEE_TYPE_COLLECTION, GeeCollection)); #line 86 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 86 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp6_ == 1) { -#line 462 "SortedList.c" - GeeArrayList* _tmp7_; - GeeList* _tmp8_; + if (_tmp4_ == 1) { +#line 488 "SortedList.c" + GeeArrayList* _tmp5_; + gpointer _tmp6_; + gpointer _tmp7_; + gpointer _tmp8_; gpointer _tmp9_; - gpointer _tmp10_; - gint _tmp11_; - GeeList* _tmp12_; - gpointer _tmp13_; - gpointer _tmp14_; -#line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp7_ = self->priv->list; -#line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8_ = items; #line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp9_ = gee_list_get (_tmp8_, 0); + _tmp5_ = self->priv->list; #line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp10_ = _tmp9_; + _tmp6_ = gee_list_get (items, 0); #line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp11_ = sorted_list_get_sorted_insert_pos (self, _tmp10_); + _tmp7_ = _tmp6_; #line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12_ = items; + _tmp8_ = gee_list_get (items, 0); #line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp13_ = gee_list_get (_tmp12_, 0); + _tmp9_ = _tmp8_; #line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp14_ = _tmp13_; + gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), sorted_list_get_sorted_insert_pos (self, _tmp7_), _tmp9_); #line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp11_, _tmp14_); + ((_tmp9_ == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp9_ = (self->priv->g_destroy_func (_tmp9_), NULL)); #line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - ((_tmp14_ == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp14_ = (self->priv->g_destroy_func (_tmp14_), NULL)); -#line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - ((_tmp10_ == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp10_ = (self->priv->g_destroy_func (_tmp10_), NULL)); + ((_tmp7_ == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp7_ = (self->priv->g_destroy_func (_tmp7_), NULL)); #line 88 "/home/jens/Source/shotwell/src/SortedList.vala" added = TRUE; -#line 495 "SortedList.c" +#line 512 "SortedList.c" } else { - GeeList* _tmp15_; - gboolean _tmp16_; -#line 90 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15_ = items; -#line 90 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_ = sorted_list_merge_sort (self, _tmp15_); #line 90 "/home/jens/Source/shotwell/src/SortedList.vala" - added = _tmp16_; -#line 505 "SortedList.c" + added = sorted_list_merge_sort (self, items); +#line 516 "SortedList.c" } } else { - GeeArrayList* _tmp17_; - GeeList* _tmp18_; - gboolean _tmp19_; -#line 93 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp17_ = self->priv->list; -#line 93 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp18_ = items; + GeeArrayList* _tmp10_; #line 93 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19_ = gee_array_list_add_all (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp10_ = self->priv->list; #line 93 "/home/jens/Source/shotwell/src/SortedList.vala" - added = _tmp19_; -#line 519 "SortedList.c" + added = gee_array_list_add_all (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (items, GEE_TYPE_COLLECTION, GeeCollection)); +#line 524 "SortedList.c" } } #line 100 "/home/jens/Source/shotwell/src/SortedList.vala" result = added; #line 100 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 526 "SortedList.c" +#line 531 "SortedList.c" } -static void sorted_list_real_clear (GeeCollection* base) { +static void +sorted_list_real_clear (GeeCollection* base) +{ SortedList * self; GeeArrayList* _tmp0_; #line 103 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -535,38 +542,36 @@ static void sorted_list_real_clear (GeeCollection* base) { _tmp0_ = self->priv->list; #line 104 "/home/jens/Source/shotwell/src/SortedList.vala" gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 539 "SortedList.c" +#line 546 "SortedList.c" } -static gboolean sorted_list_real_contains (GeeCollection* base, gconstpointer item) { +static gboolean +sorted_list_real_contains (GeeCollection* base, + gconstpointer item) +{ SortedList * self; gboolean result = FALSE; GeeArrayList* _tmp0_; - gconstpointer _tmp1_; - gboolean _tmp2_; #line 107 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 108 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; #line 108 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = item; -#line 108 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 108 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp2_; + result = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), item); #line 108 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 561 "SortedList.c" +#line 565 "SortedList.c" } -static gboolean sorted_list_real_contains_all (GeeCollection* base, GeeCollection* collection) { +static gboolean +sorted_list_real_contains_all (GeeCollection* base, + GeeCollection* collection) +{ SortedList * self; gboolean result = FALSE; GeeArrayList* _tmp0_; - GeeCollection* _tmp1_; - gboolean _tmp2_; #line 111 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 111 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -574,45 +579,39 @@ static gboolean sorted_list_real_contains_all (GeeCollection* base, GeeCollectio #line 112 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; #line 112 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = collection; -#line 112 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = gee_collection_contains_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 112 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp2_; + result = gee_collection_contains_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), collection); #line 112 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 585 "SortedList.c" +#line 586 "SortedList.c" } -static gboolean sorted_list_real_remove (GeeCollection* base, gconstpointer item) { +static gboolean +sorted_list_real_remove (GeeCollection* base, + gconstpointer item) +{ SortedList * self; gboolean result = FALSE; GeeArrayList* _tmp0_; - gconstpointer _tmp1_; - gboolean _tmp2_; #line 121 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 122 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; #line 122 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = item; -#line 122 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 122 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp2_; + result = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), item); #line 122 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 607 "SortedList.c" +#line 605 "SortedList.c" } -static gboolean sorted_list_real_remove_all (GeeCollection* base, GeeCollection* collection) { +static gboolean +sorted_list_real_remove_all (GeeCollection* base, + GeeCollection* collection) +{ SortedList * self; gboolean result = FALSE; GeeArrayList* _tmp0_; - GeeCollection* _tmp1_; - gboolean _tmp2_; #line 125 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 125 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -620,23 +619,20 @@ static gboolean sorted_list_real_remove_all (GeeCollection* base, GeeCollection* #line 126 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; #line 126 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = collection; -#line 126 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 126 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp2_; + result = gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), collection); #line 126 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 631 "SortedList.c" +#line 626 "SortedList.c" } -static gboolean sorted_list_real_retain_all (GeeCollection* base, GeeCollection* collection) { +static gboolean +sorted_list_real_retain_all (GeeCollection* base, + GeeCollection* collection) +{ SortedList * self; gboolean result = FALSE; GeeArrayList* _tmp0_; - GeeCollection* _tmp1_; - gboolean _tmp2_; #line 129 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 129 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -644,18 +640,16 @@ static gboolean sorted_list_real_retain_all (GeeCollection* base, GeeCollection* #line 130 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; #line 130 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = collection; -#line 130 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = gee_collection_retain_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 130 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp2_; + result = gee_collection_retain_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), collection); #line 130 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 655 "SortedList.c" +#line 647 "SortedList.c" } -inline gint sorted_list_get_count (SortedList* self) { +inline gint +sorted_list_get_count (SortedList* self) +{ gint result = 0; GeeArrayList* _tmp0_; gint _tmp1_; @@ -672,32 +666,36 @@ inline gint sorted_list_get_count (SortedList* self) { result = _tmp2_; #line 138 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 676 "SortedList.c" +#line 670 "SortedList.c" } -gpointer sorted_list_get_at (SortedList* self, gint index) { +gpointer +sorted_list_get_at (SortedList* self, + gint index) +{ gpointer result = NULL; GeeArrayList* _tmp0_; - gint _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 141 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), NULL); #line 142 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; #line 142 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = index; -#line 142 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp1_); + _tmp1_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), index); #line 142 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp2_; + result = _tmp1_; #line 142 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 697 "SortedList.c" +#line 691 "SortedList.c" } -static gint sorted_list_binary_search (SortedList* self, gconstpointer search, GEqualFunc equal_func) { +static gint +sorted_list_binary_search (SortedList* self, + gconstpointer search, + GEqualFunc equal_func) +{ gint result = 0; Comparator _tmp0_; void* _tmp0__target; @@ -724,14 +722,14 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G _tmp3_ = _tmp2_; #line 149 "/home/jens/Source/shotwell/src/SortedList.vala" max = _tmp3_; -#line 728 "SortedList.c" +#line 726 "SortedList.c" { gboolean _tmp4_ = FALSE; #line 150 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp4_ = TRUE; #line 150 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 735 "SortedList.c" +#line 733 "SortedList.c" gint mid = 0; gint _tmp5_; gint _tmp6_; @@ -741,19 +739,16 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G gint _tmp9_; gpointer _tmp10_; gboolean _tmp11_ = FALSE; - GEqualFunc _tmp12_; gint64 compare = 0LL; - Comparator _tmp17_; - void* _tmp17__target; - gconstpointer _tmp18_; - gconstpointer _tmp19_; - gint64 _tmp20_; - gint64 _tmp21_; - gint _tmp25_; - gint _tmp26_; + Comparator _tmp13_; + void* _tmp13__target; + gconstpointer _tmp14_; + gint64 _tmp15_; + gint _tmp19_; + gint _tmp20_; #line 150 "/home/jens/Source/shotwell/src/SortedList.vala" if (!_tmp4_) { -#line 757 "SortedList.c" +#line 752 "SortedList.c" } #line 150 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp4_ = FALSE; @@ -774,29 +769,18 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G #line 152 "/home/jens/Source/shotwell/src/SortedList.vala" item = _tmp10_; #line 154 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12_ = equal_func; -#line 154 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp12_ != NULL) { -#line 781 "SortedList.c" - GEqualFunc _tmp13_; - gconstpointer _tmp14_; - gconstpointer _tmp15_; - gboolean _tmp16_; -#line 154 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp13_ = equal_func; + if (equal_func != NULL) { +#line 774 "SortedList.c" + gconstpointer _tmp12_; #line 154 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp14_ = item; + _tmp12_ = item; #line 154 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15_ = search; -#line 154 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_ = _tmp13_ (_tmp14_, _tmp15_); -#line 154 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp11_ = _tmp16_; -#line 796 "SortedList.c" + _tmp11_ = equal_func (_tmp12_, search); +#line 780 "SortedList.c" } else { #line 154 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp11_ = FALSE; -#line 800 "SortedList.c" +#line 784 "SortedList.c" } #line 154 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp11_) { @@ -806,79 +790,78 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G ((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL)); #line 155 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 810 "SortedList.c" +#line 794 "SortedList.c" } #line 157 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp17_ = self->priv->cmp; -#line 157 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp17__target = self->priv->cmp_target; -#line 157 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp18_ = item; + _tmp13_ = self->priv->cmp; #line 157 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19_ = search; + _tmp13__target = self->priv->cmp_target; #line 157 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp20_ = _tmp17_ (_tmp18_, _tmp19_, _tmp17__target); + _tmp14_ = item; #line 157 "/home/jens/Source/shotwell/src/SortedList.vala" - compare = _tmp20_; + compare = _tmp13_ (_tmp14_, search, _tmp13__target); #line 158 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp21_ = compare; + _tmp15_ = compare; #line 158 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp21_ == ((gint64) 0)) { + if (_tmp15_ == ((gint64) 0)) { #line 159 "/home/jens/Source/shotwell/src/SortedList.vala" result = mid; #line 159 "/home/jens/Source/shotwell/src/SortedList.vala" ((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL)); #line 159 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 834 "SortedList.c" +#line 814 "SortedList.c" } else { - gint64 _tmp22_; + gint64 _tmp16_; #line 160 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp22_ = compare; + _tmp16_ = compare; #line 160 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp22_ > ((gint64) 0)) { -#line 841 "SortedList.c" - gint _tmp23_; + if (_tmp16_ > ((gint64) 0)) { +#line 821 "SortedList.c" + gint _tmp17_; #line 161 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp23_ = mid; + _tmp17_ = mid; #line 161 "/home/jens/Source/shotwell/src/SortedList.vala" - max = _tmp23_ - 1; -#line 847 "SortedList.c" + max = _tmp17_ - 1; +#line 827 "SortedList.c" } else { - gint _tmp24_; + gint _tmp18_; #line 163 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp24_ = mid; + _tmp18_ = mid; #line 163 "/home/jens/Source/shotwell/src/SortedList.vala" - min = _tmp24_ + 1; -#line 854 "SortedList.c" + min = _tmp18_ + 1; +#line 834 "SortedList.c" } } #line 165 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp25_ = min; + _tmp19_ = min; #line 165 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp26_ = max; + _tmp20_ = max; #line 165 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp25_ > _tmp26_) { + if (_tmp19_ > _tmp20_) { #line 166 "/home/jens/Source/shotwell/src/SortedList.vala" ((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL)); #line 166 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 867 "SortedList.c" +#line 847 "SortedList.c" } #line 150 "/home/jens/Source/shotwell/src/SortedList.vala" ((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL)); -#line 871 "SortedList.c" +#line 851 "SortedList.c" } } #line 169 "/home/jens/Source/shotwell/src/SortedList.vala" result = -1; #line 169 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 878 "SortedList.c" +#line 858 "SortedList.c" } -gint sorted_list_index_of (SortedList* self, gconstpointer search) { +gint +sorted_list_index_of (SortedList* self, + gconstpointer search) +{ gint result = 0; gint _tmp0_ = 0; Comparator _tmp1_; @@ -891,46 +874,35 @@ gint sorted_list_index_of (SortedList* self, gconstpointer search) { _tmp1__target = self->priv->cmp_target; #line 180 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp1_ != NULL) { -#line 895 "SortedList.c" - gconstpointer _tmp2_; - gint _tmp3_; #line 180 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = search; -#line 180 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp3_ = sorted_list_binary_search (self, _tmp2_, NULL); -#line 180 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp0_ = _tmp3_; -#line 904 "SortedList.c" + _tmp0_ = sorted_list_binary_search (self, search, NULL); +#line 880 "SortedList.c" } else { - gconstpointer _tmp4_; - GEqualFunc _tmp5_; - gint _tmp6_; -#line 180 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp4_ = search; + GEqualFunc _tmp2_; #line 180 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp5_ = g_direct_equal; + _tmp2_ = g_direct_equal; #line 180 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = sorted_list_locate (self, _tmp4_, FALSE, _tmp5_); -#line 180 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp0_ = _tmp6_; -#line 917 "SortedList.c" + _tmp0_ = sorted_list_locate (self, search, FALSE, _tmp2_); +#line 887 "SortedList.c" } #line 180 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp0_; #line 180 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 923 "SortedList.c" +#line 893 "SortedList.c" } -gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altered, GEqualFunc equal_func) { +gint +sorted_list_locate (SortedList* self, + gconstpointer search, + gboolean altered, + GEqualFunc equal_func) +{ gint result = 0; gboolean _tmp0_ = FALSE; Comparator _tmp1_; void* _tmp1__target; - gconstpointer _tmp18_; - GEqualFunc _tmp19_; - gint _tmp20_; #line 184 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), 0); #line 185 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -941,100 +913,88 @@ gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altere if (_tmp1_ == NULL) { #line 185 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = TRUE; -#line 945 "SortedList.c" +#line 917 "SortedList.c" } else { - gboolean _tmp2_; #line 185 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = altered; -#line 185 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp0_ = _tmp2_; -#line 952 "SortedList.c" + _tmp0_ = altered; +#line 921 "SortedList.c" } #line 185 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp0_) { -#line 956 "SortedList.c" +#line 925 "SortedList.c" gint count = 0; - GeeArrayList* _tmp3_; + GeeArrayList* _tmp2_; + gint _tmp3_; gint _tmp4_; - gint _tmp5_; #line 186 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp3_ = self->priv->list; + _tmp2_ = self->priv->list; #line 186 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 186 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 186 "/home/jens/Source/shotwell/src/SortedList.vala" - count = _tmp5_; -#line 969 "SortedList.c" + count = _tmp4_; +#line 938 "SortedList.c" { gint ctr = 0; #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" ctr = 0; -#line 974 "SortedList.c" +#line 943 "SortedList.c" { - gboolean _tmp6_ = FALSE; + gboolean _tmp5_ = FALSE; #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = TRUE; + _tmp5_ = TRUE; #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 981 "SortedList.c" +#line 950 "SortedList.c" + gint _tmp7_; gint _tmp8_; - gint _tmp9_; - GEqualFunc _tmp10_; - GeeArrayList* _tmp11_; - gint _tmp12_; - gpointer _tmp13_; - gpointer _tmp14_; - gconstpointer _tmp15_; - gboolean _tmp16_; - gboolean _tmp17_; + GeeArrayList* _tmp9_; + gint _tmp10_; + gpointer _tmp11_; + gpointer _tmp12_; + gboolean _tmp13_; #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!_tmp6_) { -#line 994 "SortedList.c" - gint _tmp7_; + if (!_tmp5_) { +#line 960 "SortedList.c" + gint _tmp6_; #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp7_ = ctr; + _tmp6_ = ctr; #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" - ctr = _tmp7_ + 1; -#line 1000 "SortedList.c" + ctr = _tmp6_ + 1; +#line 966 "SortedList.c" } #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = FALSE; + _tmp5_ = FALSE; #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8_ = ctr; + _tmp7_ = ctr; #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp9_ = count; + _tmp8_ = count; #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!(_tmp8_ < _tmp9_)) { + if (!(_tmp7_ < _tmp8_)) { #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 1012 "SortedList.c" +#line 978 "SortedList.c" } #line 188 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp10_ = equal_func; -#line 188 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp11_ = self->priv->list; -#line 188 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12_ = ctr; + _tmp9_ = self->priv->list; #line 188 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp13_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp12_); + _tmp10_ = ctr; #line 188 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp14_ = _tmp13_; + _tmp11_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp10_); #line 188 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15_ = search; + _tmp12_ = _tmp11_; #line 188 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_ = _tmp10_ (_tmp14_, _tmp15_); + _tmp13_ = equal_func (_tmp12_, search); #line 188 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp17_ = _tmp16_; + ((_tmp12_ == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp12_ = (self->priv->g_destroy_func (_tmp12_), NULL)); #line 188 "/home/jens/Source/shotwell/src/SortedList.vala" - ((_tmp14_ == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp14_ = (self->priv->g_destroy_func (_tmp14_), NULL)); -#line 188 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp17_) { + if (_tmp13_) { #line 189 "/home/jens/Source/shotwell/src/SortedList.vala" result = ctr; #line 189 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1038 "SortedList.c" +#line 998 "SortedList.c" } } } @@ -1043,44 +1003,41 @@ gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altere result = -1; #line 192 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1047 "SortedList.c" +#line 1007 "SortedList.c" } #line 195 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp18_ = search; -#line 195 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19_ = equal_func; -#line 195 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp20_ = sorted_list_binary_search (self, _tmp18_, _tmp19_); -#line 195 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp20_; + result = sorted_list_binary_search (self, search, equal_func); #line 195 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1059 "SortedList.c" +#line 1013 "SortedList.c" } -gpointer sorted_list_remove_at (SortedList* self, gint index) { +gpointer +sorted_list_remove_at (SortedList* self, + gint index) +{ gpointer result = NULL; GeeArrayList* _tmp0_; - gint _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 210 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), NULL); #line 211 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; #line 211 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = index; -#line 211 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp1_); + _tmp1_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), index); #line 211 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp2_; + result = _tmp1_; #line 211 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1080 "SortedList.c" +#line 1034 "SortedList.c" } -static gpointer* sorted_list_real_to_array (GeeCollection* base, int* result_length1) { +static gpointer* +sorted_list_real_to_array (GeeCollection* base, + int* result_length1) +{ SortedList * self; gpointer* result = NULL; GeeArrayList* _tmp0_; @@ -1102,167 +1059,147 @@ static gpointer* sorted_list_real_to_array (GeeCollection* base, int* result_len if (result_length1) { #line 215 "/home/jens/Source/shotwell/src/SortedList.vala" *result_length1 = _tmp3__length1; -#line 1106 "SortedList.c" +#line 1063 "SortedList.c" } #line 215 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp3_; #line 215 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1112 "SortedList.c" +#line 1069 "SortedList.c" } -void sorted_list_resort (SortedList* self, Comparator new_cmp, void* new_cmp_target) { - Comparator _tmp0_; - void* _tmp0__target; +void +sorted_list_resort (SortedList* self, + Comparator new_cmp, + void* new_cmp_target) +{ #line 218 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_if_fail (IS_SORTED_LIST (self)); #line 219 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp0_ = new_cmp; + self->priv->cmp = new_cmp; #line 219 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp0__target = new_cmp_target; -#line 219 "/home/jens/Source/shotwell/src/SortedList.vala" - self->priv->cmp = _tmp0_; -#line 219 "/home/jens/Source/shotwell/src/SortedList.vala" - self->priv->cmp_target = _tmp0__target; + self->priv->cmp_target = new_cmp_target; #line 221 "/home/jens/Source/shotwell/src/SortedList.vala" sorted_list_merge_sort (self, NULL); -#line 1131 "SortedList.c" +#line 1086 "SortedList.c" } -gboolean sorted_list_resort_item (SortedList* self, gconstpointer item) { +gboolean +sorted_list_resort_item (SortedList* self, + gconstpointer item) +{ gboolean result = FALSE; gint index = 0; - gconstpointer _tmp0_; - GEqualFunc _tmp1_; + GEqualFunc _tmp0_; + gint _tmp1_; + gint new_index = 0; gint _tmp2_; gint _tmp3_; - gint new_index = 0; - gconstpointer _tmp4_; + gint _tmp4_; gint _tmp5_; - gint _tmp6_; - gint _tmp7_; - gint _tmp8_; - gint _tmp9_; #line 229 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), FALSE); #line 230 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp0_ = item; + _tmp0_ = g_direct_equal; #line 230 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = g_direct_equal; -#line 230 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = sorted_list_locate (self, _tmp0_, TRUE, _tmp1_); -#line 230 "/home/jens/Source/shotwell/src/SortedList.vala" - index = _tmp2_; + index = sorted_list_locate (self, item, TRUE, _tmp0_); #line 231 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp3_ = index; + _tmp1_ = index; #line 231 "/home/jens/Source/shotwell/src/SortedList.vala" - _vala_assert (_tmp3_ >= 0, "index >= 0"); -#line 233 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp4_ = item; -#line 233 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp5_ = sorted_list_get_sorted_insert_pos (self, _tmp4_); + _vala_assert (_tmp1_ >= 0, "index >= 0"); #line 233 "/home/jens/Source/shotwell/src/SortedList.vala" - new_index = _tmp5_; + new_index = sorted_list_get_sorted_insert_pos (self, item); #line 235 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = index; + _tmp2_ = index; #line 235 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp7_ = new_index; + _tmp3_ = new_index; #line 235 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp6_ == _tmp7_) { + if (_tmp2_ == _tmp3_) { #line 236 "/home/jens/Source/shotwell/src/SortedList.vala" result = FALSE; #line 236 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1179 "SortedList.c" +#line 1125 "SortedList.c" } #line 240 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8_ = new_index; + _tmp4_ = new_index; #line 240 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp9_ = index; + _tmp5_ = index; #line 240 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp8_ > _tmp9_) { -#line 1187 "SortedList.c" - GeeArrayList* _tmp10_; - gint _tmp11_; - gconstpointer _tmp12_; + if (_tmp4_ > _tmp5_) { +#line 1133 "SortedList.c" + GeeArrayList* _tmp6_; + gint _tmp7_; gpointer removed_item = NULL; - GeeArrayList* _tmp13_; - gint _tmp14_; - gpointer _tmp15_; - gconstpointer _tmp16_; - gconstpointer _tmp17_; + GeeArrayList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + gconstpointer _tmp11_; #line 241 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp10_ = self->priv->list; + _tmp6_ = self->priv->list; #line 241 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp11_ = new_index; + _tmp7_ = new_index; #line 241 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12_ = item; -#line 241 "/home/jens/Source/shotwell/src/SortedList.vala" - gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp11_, _tmp12_); + gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp7_, item); #line 242 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp13_ = self->priv->list; + _tmp8_ = self->priv->list; #line 242 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp14_ = index; + _tmp9_ = index; #line 242 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp14_); + _tmp10_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp9_); #line 242 "/home/jens/Source/shotwell/src/SortedList.vala" - removed_item = _tmp15_; + removed_item = _tmp10_; #line 243 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_ = item; + _tmp11_ = removed_item; #line 243 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp17_ = removed_item; -#line 243 "/home/jens/Source/shotwell/src/SortedList.vala" - _vala_assert (_tmp16_ == _tmp17_, "item == removed_item"); + _vala_assert (item == _tmp11_, "item == removed_item"); #line 240 "/home/jens/Source/shotwell/src/SortedList.vala" ((removed_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (removed_item = (self->priv->g_destroy_func (removed_item), NULL)); -#line 1221 "SortedList.c" +#line 1161 "SortedList.c" } else { gpointer removed_item = NULL; - GeeArrayList* _tmp18_; - gint _tmp19_; - gpointer _tmp20_; - gconstpointer _tmp21_; - gconstpointer _tmp22_; - GeeArrayList* _tmp23_; - gint _tmp24_; - gconstpointer _tmp25_; + GeeArrayList* _tmp12_; + gint _tmp13_; + gpointer _tmp14_; + gconstpointer _tmp15_; + GeeArrayList* _tmp16_; + gint _tmp17_; #line 245 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp18_ = self->priv->list; + _tmp12_ = self->priv->list; #line 245 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19_ = index; + _tmp13_ = index; #line 245 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp20_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp19_); + _tmp14_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp13_); #line 245 "/home/jens/Source/shotwell/src/SortedList.vala" - removed_item = _tmp20_; -#line 246 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp21_ = item; + removed_item = _tmp14_; #line 246 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp22_ = removed_item; + _tmp15_ = removed_item; #line 246 "/home/jens/Source/shotwell/src/SortedList.vala" - _vala_assert (_tmp21_ == _tmp22_, "item == removed_item"); + _vala_assert (item == _tmp15_, "item == removed_item"); #line 247 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp23_ = self->priv->list; + _tmp16_ = self->priv->list; #line 247 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp24_ = new_index; + _tmp17_ = new_index; #line 247 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp25_ = item; -#line 247 "/home/jens/Source/shotwell/src/SortedList.vala" - gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp24_, _tmp25_); + gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp17_, item); #line 240 "/home/jens/Source/shotwell/src/SortedList.vala" ((removed_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (removed_item = (self->priv->g_destroy_func (removed_item), NULL)); -#line 1256 "SortedList.c" +#line 1190 "SortedList.c" } #line 254 "/home/jens/Source/shotwell/src/SortedList.vala" result = TRUE; #line 254 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1262 "SortedList.c" +#line 1196 "SortedList.c" } -static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer item) { +static gint +sorted_list_get_sorted_insert_pos (SortedList* self, + gconstpointer item) +{ gint result = 0; gint low = 0; gint high = 0; @@ -1281,14 +1218,14 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i _tmp2_ = _tmp1_; #line 259 "/home/jens/Source/shotwell/src/SortedList.vala" high = _tmp2_; -#line 1285 "SortedList.c" +#line 1222 "SortedList.c" { gboolean _tmp3_ = FALSE; #line 260 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = TRUE; #line 260 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 1292 "SortedList.c" +#line 1229 "SortedList.c" gint _tmp4_; gint _tmp5_; gint mid = 0; @@ -1300,17 +1237,14 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i gint _tmp10_; gpointer _tmp11_; gconstpointer _tmp12_; - gconstpointer _tmp13_; gint64 _result_ = 0LL; - Comparator _tmp24_; - void* _tmp24__target; - gconstpointer _tmp25_; - gconstpointer _tmp26_; - gint64 _tmp27_; - gint64 _tmp28_; + Comparator _tmp23_; + void* _tmp23__target; + gconstpointer _tmp24_; + gint64 _tmp25_; #line 260 "/home/jens/Source/shotwell/src/SortedList.vala" if (!_tmp3_) { -#line 1314 "SortedList.c" +#line 1248 "SortedList.c" } #line 260 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = FALSE; @@ -1324,7 +1258,7 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i result = low; #line 262 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1328 "SortedList.c" +#line 1262 "SortedList.c" } #line 264 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp6_ = low; @@ -1343,95 +1277,89 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i #line 268 "/home/jens/Source/shotwell/src/SortedList.vala" cmp_item = _tmp11_; #line 269 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12_ = item; -#line 269 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp13_ = cmp_item; + _tmp12_ = cmp_item; #line 269 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp12_ == _tmp13_) { -#line 1352 "SortedList.c" - gint _tmp14_; - GeeArrayList* _tmp15_; + if (item == _tmp12_) { +#line 1284 "SortedList.c" + gint _tmp13_; + GeeArrayList* _tmp14_; + gint _tmp15_; gint _tmp16_; - gint _tmp17_; - GeeArrayList* _tmp21_; - gint _tmp22_; - gpointer _tmp23_; + GeeArrayList* _tmp20_; + gint _tmp21_; + gpointer _tmp22_; #line 271 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp14_ = mid; + _tmp13_ = mid; #line 271 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15_ = self->priv->list; + _tmp14_ = self->priv->list; #line 271 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp15_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 271 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 271 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp14_ >= (_tmp17_ - 1)) { -#line 1370 "SortedList.c" - GeeArrayList* _tmp18_; + if (_tmp13_ >= (_tmp16_ - 1)) { +#line 1302 "SortedList.c" + GeeArrayList* _tmp17_; + gint _tmp18_; gint _tmp19_; - gint _tmp20_; #line 272 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp18_ = self->priv->list; + _tmp17_ = self->priv->list; #line 272 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp18_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 272 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 272 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp20_; + result = _tmp19_; #line 272 "/home/jens/Source/shotwell/src/SortedList.vala" ((cmp_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (cmp_item = (self->priv->g_destroy_func (cmp_item), NULL)); #line 272 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1386 "SortedList.c" +#line 1318 "SortedList.c" } #line 274 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp21_ = self->priv->list; + _tmp20_ = self->priv->list; #line 274 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp22_ = mid; + _tmp21_ = mid; #line 274 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp23_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp22_ + 1); + _tmp22_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp21_ + 1); #line 274 "/home/jens/Source/shotwell/src/SortedList.vala" ((cmp_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (cmp_item = (self->priv->g_destroy_func (cmp_item), NULL)); #line 274 "/home/jens/Source/shotwell/src/SortedList.vala" - cmp_item = _tmp23_; -#line 1398 "SortedList.c" + cmp_item = _tmp22_; +#line 1330 "SortedList.c" } #line 277 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp24_ = self->priv->cmp; -#line 277 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp24__target = self->priv->cmp_target; + _tmp23_ = self->priv->cmp; #line 277 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp25_ = item; + _tmp23__target = self->priv->cmp_target; #line 277 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp26_ = cmp_item; + _tmp24_ = cmp_item; #line 277 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp27_ = _tmp24_ (_tmp25_, _tmp26_, _tmp24__target); -#line 277 "/home/jens/Source/shotwell/src/SortedList.vala" - _result_ = _tmp27_; + _result_ = _tmp23_ (item, _tmp24_, _tmp23__target); #line 278 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp28_ = _result_; + _tmp25_ = _result_; #line 278 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp28_ < ((gint64) 0)) { -#line 1416 "SortedList.c" - gint _tmp29_; + if (_tmp25_ < ((gint64) 0)) { +#line 1344 "SortedList.c" + gint _tmp26_; #line 279 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp29_ = mid; + _tmp26_ = mid; #line 279 "/home/jens/Source/shotwell/src/SortedList.vala" - high = _tmp29_; -#line 1422 "SortedList.c" + high = _tmp26_; +#line 1350 "SortedList.c" } else { - gint64 _tmp30_; + gint64 _tmp27_; #line 280 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp30_ = _result_; + _tmp27_ = _result_; #line 280 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp30_ > ((gint64) 0)) { -#line 1429 "SortedList.c" - gint _tmp31_; + if (_tmp27_ > ((gint64) 0)) { +#line 1357 "SortedList.c" + gint _tmp28_; #line 281 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp31_ = mid; + _tmp28_ = mid; #line 281 "/home/jens/Source/shotwell/src/SortedList.vala" - low = _tmp31_ + 1; -#line 1435 "SortedList.c" + low = _tmp28_ + 1; +#line 1363 "SortedList.c" } else { #line 283 "/home/jens/Source/shotwell/src/SortedList.vala" result = mid; @@ -1439,18 +1367,20 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i ((cmp_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (cmp_item = (self->priv->g_destroy_func (cmp_item), NULL)); #line 283 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1443 "SortedList.c" +#line 1371 "SortedList.c" } } #line 260 "/home/jens/Source/shotwell/src/SortedList.vala" ((cmp_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (cmp_item = (self->priv->g_destroy_func (cmp_item), NULL)); -#line 1448 "SortedList.c" +#line 1376 "SortedList.c" } } } -SortedList* sorted_list_copy (SortedList* self) { +SortedList* +sorted_list_copy (SortedList* self) +{ SortedList* result = NULL; SortedList* copy = NULL; Comparator _tmp0_; @@ -1478,11 +1408,14 @@ SortedList* sorted_list_copy (SortedList* self) { result = copy; #line 292 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1482 "SortedList.c" +#line 1412 "SortedList.c" } -static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { +static gboolean +sorted_list_merge_sort (SortedList* self, + GeeList* add) +{ gboolean result = FALSE; Comparator _tmp0_; void* _tmp0__target; @@ -1491,28 +1424,26 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { gint _tmp2_; gint _tmp3_; gint _tmp4_ = 0; - GeeList* _tmp5_; gint add_count = 0; gint count = 0; + gint _tmp7_; + gint _tmp8_; gint _tmp9_; - gint _tmp10_; - gint _tmp11_; gpointer* array = NULL; - gint _tmp12_; - gpointer* _tmp13_; + gint _tmp10_; + gpointer* _tmp11_; gint array_length1; gint _array_size_; gint offset = 0; - GeeList* _tmp23_; - gint _tmp33_; - gint _tmp34_; - gpointer* _tmp35_; - gint _tmp35__length1; - gint _tmp36_; - gpointer* _tmp37_; - gpointer* _tmp38_; - gint _tmp38__length1; - gint _tmp39_; + gint _tmp29_; + gint _tmp30_; + gpointer* _tmp31_; + gint _tmp31__length1; + gint _tmp32_; + gpointer* _tmp33_; + gpointer* _tmp34_; + gint _tmp34__length1; + gint _tmp35_; #line 313 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), FALSE); #line 313 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1532,271 +1463,261 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { #line 316 "/home/jens/Source/shotwell/src/SortedList.vala" list_count = _tmp3_; #line 317 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp5_ = add; -#line 317 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp5_ != NULL) { -#line 1539 "SortedList.c" - GeeList* _tmp6_; - gint _tmp7_; - gint _tmp8_; -#line 317 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = add; + if (add != NULL) { +#line 1468 "SortedList.c" + gint _tmp5_; + gint _tmp6_; #line 317 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (add, GEE_TYPE_COLLECTION, GeeCollection)); #line 317 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 317 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp4_ = _tmp8_; -#line 1551 "SortedList.c" + _tmp4_ = _tmp6_; +#line 1477 "SortedList.c" } else { #line 317 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp4_ = 0; -#line 1555 "SortedList.c" +#line 1481 "SortedList.c" } #line 317 "/home/jens/Source/shotwell/src/SortedList.vala" add_count = _tmp4_; #line 319 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp9_ = list_count; + _tmp7_ = list_count; #line 319 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp10_ = add_count; + _tmp8_ = add_count; #line 319 "/home/jens/Source/shotwell/src/SortedList.vala" - count = _tmp9_ + _tmp10_; + count = _tmp7_ + _tmp8_; #line 320 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp11_ = count; + _tmp9_ = count; #line 320 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp11_ == 0) { + if (_tmp9_ == 0) { #line 321 "/home/jens/Source/shotwell/src/SortedList.vala" result = FALSE; #line 321 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1573 "SortedList.c" +#line 1499 "SortedList.c" } #line 325 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12_ = count; + _tmp10_ = count; #line 325 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp13_ = g_new0 (gpointer, _tmp12_); + _tmp11_ = g_new0 (gpointer, _tmp10_); #line 325 "/home/jens/Source/shotwell/src/SortedList.vala" - array = _tmp13_; + array = _tmp11_; #line 325 "/home/jens/Source/shotwell/src/SortedList.vala" - array_length1 = _tmp12_; + array_length1 = _tmp10_; #line 325 "/home/jens/Source/shotwell/src/SortedList.vala" _array_size_ = array_length1; #line 326 "/home/jens/Source/shotwell/src/SortedList.vala" offset = 0; #line 328 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 1589 "SortedList.c" - gint _tmp14_; +#line 1515 "SortedList.c" + gint _tmp12_; + gint _tmp13_; + gpointer* _tmp14_; + gint _tmp14__length1; gint _tmp15_; - gpointer* _tmp16_; - gint _tmp16__length1; + GeeArrayList* _tmp16_; gint _tmp17_; - GeeArrayList* _tmp18_; - gint _tmp19_; - gpointer _tmp20_; - gpointer _tmp21_; - gint _tmp22_; + gpointer _tmp18_; + gpointer _tmp19_; + gint _tmp20_; #line 328 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp14_ = offset; + _tmp12_ = offset; #line 328 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15_ = list_count; + _tmp13_ = list_count; #line 328 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!(_tmp14_ < _tmp15_)) { + if (!(_tmp12_ < _tmp13_)) { #line 328 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 1608 "SortedList.c" +#line 1534 "SortedList.c" } #line 329 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_ = array; + _tmp14_ = array; #line 329 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16__length1 = array_length1; + _tmp14__length1 = array_length1; #line 329 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp17_ = offset; + _tmp15_ = offset; #line 329 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp18_ = self->priv->list; + _tmp16_ = self->priv->list; #line 329 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19_ = offset; + _tmp17_ = offset; #line 329 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp20_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp19_); + _tmp18_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp17_); #line 329 "/home/jens/Source/shotwell/src/SortedList.vala" - ((_tmp16_[_tmp17_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp16_[_tmp17_] = (self->priv->g_destroy_func (_tmp16_[_tmp17_]), NULL)); + ((_tmp14_[_tmp15_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp14_[_tmp15_] = (self->priv->g_destroy_func (_tmp14_[_tmp15_]), NULL)); #line 329 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_[_tmp17_] = _tmp20_; + _tmp14_[_tmp15_] = _tmp18_; #line 329 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp21_ = _tmp16_[_tmp17_]; + _tmp19_ = _tmp14_[_tmp15_]; #line 330 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp22_ = offset; + _tmp20_ = offset; #line 330 "/home/jens/Source/shotwell/src/SortedList.vala" - offset = _tmp22_ + 1; -#line 1632 "SortedList.c" + offset = _tmp20_ + 1; +#line 1558 "SortedList.c" } #line 333 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp23_ = add; -#line 333 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp23_ != NULL) { -#line 1638 "SortedList.c" + if (add != NULL) { +#line 1562 "SortedList.c" gint add_ctr = 0; #line 334 "/home/jens/Source/shotwell/src/SortedList.vala" add_ctr = 0; #line 335 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 1644 "SortedList.c" +#line 1568 "SortedList.c" + gint _tmp21_; + gint _tmp22_; + gpointer* _tmp23_; + gint _tmp23__length1; gint _tmp24_; gint _tmp25_; - gpointer* _tmp26_; - gint _tmp26__length1; - gint _tmp27_; - GeeList* _tmp28_; - gint _tmp29_; - gpointer _tmp30_; - gpointer _tmp31_; - gint _tmp32_; + gpointer _tmp26_; + gpointer _tmp27_; + gint _tmp28_; #line 335 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp24_ = offset; + _tmp21_ = offset; #line 335 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp25_ = count; + _tmp22_ = count; #line 335 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!(_tmp24_ < _tmp25_)) { + if (!(_tmp21_ < _tmp22_)) { #line 335 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 1663 "SortedList.c" +#line 1586 "SortedList.c" } #line 336 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp26_ = array; -#line 336 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp26__length1 = array_length1; + _tmp23_ = array; #line 336 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp27_ = offset; + _tmp23__length1 = array_length1; #line 336 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp28_ = add; + _tmp24_ = offset; #line 336 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp29_ = add_ctr; + _tmp25_ = add_ctr; #line 336 "/home/jens/Source/shotwell/src/SortedList.vala" - add_ctr = _tmp29_ + 1; + add_ctr = _tmp25_ + 1; #line 336 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp30_ = gee_list_get (_tmp28_, _tmp29_); + _tmp26_ = gee_list_get (add, _tmp25_); #line 336 "/home/jens/Source/shotwell/src/SortedList.vala" - ((_tmp26_[_tmp27_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp26_[_tmp27_] = (self->priv->g_destroy_func (_tmp26_[_tmp27_]), NULL)); + ((_tmp23_[_tmp24_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp23_[_tmp24_] = (self->priv->g_destroy_func (_tmp23_[_tmp24_]), NULL)); #line 336 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp26_[_tmp27_] = _tmp30_; + _tmp23_[_tmp24_] = _tmp26_; #line 336 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp31_ = _tmp26_[_tmp27_]; + _tmp27_ = _tmp23_[_tmp24_]; #line 337 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp32_ = offset; + _tmp28_ = offset; #line 337 "/home/jens/Source/shotwell/src/SortedList.vala" - offset = _tmp32_ + 1; -#line 1689 "SortedList.c" + offset = _tmp28_ + 1; +#line 1610 "SortedList.c" } } #line 341 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp33_ = offset; + _tmp29_ = offset; #line 341 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp34_ = count; + _tmp30_ = count; #line 341 "/home/jens/Source/shotwell/src/SortedList.vala" - _vala_assert (_tmp33_ == _tmp34_, "offset == count"); + _vala_assert (_tmp29_ == _tmp30_, "offset == count"); #line 343 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp35_ = array; + _tmp31_ = array; #line 343 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp35__length1 = array_length1; + _tmp31__length1 = array_length1; #line 343 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp36_ = count; + _tmp32_ = count; #line 343 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp37_ = g_new0 (gpointer, _tmp36_); + _tmp33_ = g_new0 (gpointer, _tmp32_); #line 343 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp38_ = _tmp37_; + _tmp34_ = _tmp33_; #line 343 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp38__length1 = _tmp36_; + _tmp34__length1 = _tmp32_; #line 343 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp39_ = count; + _tmp35_ = count; #line 343 "/home/jens/Source/shotwell/src/SortedList.vala" - _sorted_list_merge_sort (self, _tmp35_, _tmp35__length1, _tmp38_, _tmp36_, 0, _tmp39_ - 1); + _sorted_list_merge_sort (self, _tmp31_, _tmp31__length1, _tmp34_, _tmp32_, 0, _tmp35_ - 1); #line 343 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp38_ = (_vala_array_free (_tmp38_, _tmp38__length1, (GDestroyNotify) self->priv->g_destroy_func), NULL); + _tmp34_ = (_vala_array_free (_tmp34_, _tmp34__length1, (GDestroyNotify) self->priv->g_destroy_func), NULL); #line 345 "/home/jens/Source/shotwell/src/SortedList.vala" offset = 0; #line 346 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 1720 "SortedList.c" - gint _tmp40_; +#line 1641 "SortedList.c" + gint _tmp36_; + gint _tmp37_; + GeeArrayList* _tmp38_; + gint _tmp39_; + gpointer* _tmp40_; + gint _tmp40__length1; gint _tmp41_; - GeeArrayList* _tmp42_; + gconstpointer _tmp42_; gint _tmp43_; - gpointer* _tmp44_; - gint _tmp44__length1; - gint _tmp45_; - gconstpointer _tmp46_; - gint _tmp47_; #line 346 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp40_ = offset; + _tmp36_ = offset; #line 346 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp41_ = list_count; + _tmp37_ = list_count; #line 346 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!(_tmp40_ < _tmp41_)) { + if (!(_tmp36_ < _tmp37_)) { #line 346 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 1738 "SortedList.c" +#line 1659 "SortedList.c" } #line 347 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp42_ = self->priv->list; + _tmp38_ = self->priv->list; #line 347 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp43_ = offset; + _tmp39_ = offset; #line 347 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp44_ = array; + _tmp40_ = array; #line 347 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp44__length1 = array_length1; + _tmp40__length1 = array_length1; #line 347 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp45_ = offset; + _tmp41_ = offset; #line 347 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp46_ = _tmp44_[_tmp45_]; + _tmp42_ = _tmp40_[_tmp41_]; #line 347 "/home/jens/Source/shotwell/src/SortedList.vala" - gee_abstract_list_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp43_, _tmp46_); + gee_abstract_list_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp39_, _tmp42_); #line 348 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp47_ = offset; + _tmp43_ = offset; #line 348 "/home/jens/Source/shotwell/src/SortedList.vala" - offset = _tmp47_ + 1; -#line 1758 "SortedList.c" + offset = _tmp43_ + 1; +#line 1679 "SortedList.c" } #line 351 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 1762 "SortedList.c" - gint _tmp48_; +#line 1683 "SortedList.c" + gint _tmp44_; + gint _tmp45_; + GeeArrayList* _tmp46_; + gint _tmp47_; + gpointer* _tmp48_; + gint _tmp48__length1; gint _tmp49_; - GeeArrayList* _tmp50_; + gconstpointer _tmp50_; gint _tmp51_; - gpointer* _tmp52_; - gint _tmp52__length1; - gint _tmp53_; - gconstpointer _tmp54_; - gint _tmp55_; #line 351 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp48_ = offset; + _tmp44_ = offset; #line 351 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp49_ = count; + _tmp45_ = count; #line 351 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!(_tmp48_ < _tmp49_)) { + if (!(_tmp44_ < _tmp45_)) { #line 351 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 1780 "SortedList.c" +#line 1701 "SortedList.c" } #line 352 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp50_ = self->priv->list; + _tmp46_ = self->priv->list; #line 352 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp51_ = offset; + _tmp47_ = offset; #line 352 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp52_ = array; + _tmp48_ = array; #line 352 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp52__length1 = array_length1; + _tmp48__length1 = array_length1; #line 352 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp53_ = offset; + _tmp49_ = offset; #line 352 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp54_ = _tmp52_[_tmp53_]; + _tmp50_ = _tmp48_[_tmp49_]; #line 352 "/home/jens/Source/shotwell/src/SortedList.vala" - gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp51_, _tmp54_); + gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp47_, _tmp50_); #line 353 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp55_ = offset; + _tmp51_ = offset; #line 353 "/home/jens/Source/shotwell/src/SortedList.vala" - offset = _tmp55_ + 1; -#line 1800 "SortedList.c" + offset = _tmp51_ + 1; +#line 1721 "SortedList.c" } #line 356 "/home/jens/Source/shotwell/src/SortedList.vala" result = TRUE; @@ -1804,560 +1725,402 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { array = (_vala_array_free (array, array_length1, (GDestroyNotify) self->priv->g_destroy_func), NULL); #line 356 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1808 "SortedList.c" +#line 1729 "SortedList.c" } -static void _sorted_list_merge_sort (SortedList* self, gpointer* array, int array_length1, gpointer* scratch, int scratch_length1, gint start_index, gint end_index) { +static void +_sorted_list_merge_sort (SortedList* self, + gpointer* array, + int array_length1, + gpointer* scratch, + int scratch_length1, + gint start_index, + gint end_index) +{ + gint count = 0; gint _tmp0_; + gint middle_index = 0; gint _tmp1_; - gint count = 0; gint _tmp2_; gint _tmp3_; - gint _tmp4_; - gint middle_index = 0; + Comparator _tmp4_; + void* _tmp4__target; gint _tmp5_; - gint _tmp6_; - gpointer* _tmp7_; - gint _tmp7__length1; - gpointer* _tmp8_; - gint _tmp8__length1; - gint _tmp9_; - gint _tmp10_; - gpointer* _tmp11_; - gint _tmp11__length1; - gpointer* _tmp12_; - gint _tmp12__length1; - gint _tmp13_; - gint _tmp14_; - Comparator _tmp15_; - void* _tmp15__target; - gpointer* _tmp16_; - gint _tmp16__length1; - gint _tmp17_; - gconstpointer _tmp18_; - gpointer* _tmp19_; - gint _tmp19__length1; - gint _tmp20_; - gconstpointer _tmp21_; - gint64 _tmp22_; + gconstpointer _tmp6_; + gint _tmp7_; + gconstpointer _tmp8_; #line 359 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_if_fail (IS_SORTED_LIST (self)); #line 360 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp0_ = start_index; -#line 360 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = end_index; -#line 360 "/home/jens/Source/shotwell/src/SortedList.vala" - _vala_assert (_tmp0_ <= _tmp1_, "start_index <= end_index"); + _vala_assert (start_index <= end_index, "start_index <= end_index"); #line 362 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = end_index; -#line 362 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp3_ = start_index; -#line 362 "/home/jens/Source/shotwell/src/SortedList.vala" - count = (_tmp2_ - _tmp3_) + 1; + count = (end_index - start_index) + 1; #line 363 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp4_ = count; + _tmp0_ = count; #line 363 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp4_ <= 1) { + if (_tmp0_ <= 1) { #line 364 "/home/jens/Source/shotwell/src/SortedList.vala" return; -#line 1865 "SortedList.c" +#line 1766 "SortedList.c" } #line 366 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp5_ = start_index; -#line 366 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = count; + _tmp1_ = count; #line 366 "/home/jens/Source/shotwell/src/SortedList.vala" - middle_index = _tmp5_ + (_tmp6_ / 2); -#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp7_ = array; -#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp7__length1 = array_length1; + middle_index = start_index + (_tmp1_ / 2); #line 368 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8_ = scratch; + _tmp2_ = middle_index; #line 368 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8__length1 = scratch_length1; -#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp9_ = start_index; -#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp10_ = middle_index; -#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" - _sorted_list_merge_sort (self, _tmp7_, _tmp7__length1, _tmp8_, _tmp8__length1, _tmp9_, _tmp10_ - 1); -#line 369 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp11_ = array; + _sorted_list_merge_sort (self, array, array_length1, scratch, scratch_length1, start_index, _tmp2_ - 1); #line 369 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp11__length1 = array_length1; + _tmp3_ = middle_index; #line 369 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12_ = scratch; -#line 369 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12__length1 = scratch_length1; -#line 369 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp13_ = middle_index; -#line 369 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp14_ = end_index; -#line 369 "/home/jens/Source/shotwell/src/SortedList.vala" - _sorted_list_merge_sort (self, _tmp11_, _tmp11__length1, _tmp12_, _tmp12__length1, _tmp13_, _tmp14_); -#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15_ = self->priv->cmp; -#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15__target = self->priv->cmp_target; -#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_ = array; -#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16__length1 = array_length1; -#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp17_ = middle_index; + _sorted_list_merge_sort (self, array, array_length1, scratch, scratch_length1, _tmp3_, end_index); #line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp18_ = _tmp16_[_tmp17_ - 1]; + _tmp4_ = self->priv->cmp; #line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19_ = array; + _tmp4__target = self->priv->cmp_target; #line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19__length1 = array_length1; + _tmp5_ = middle_index; #line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp20_ = middle_index; + _tmp6_ = array[_tmp5_ - 1]; #line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp21_ = _tmp19_[_tmp20_]; + _tmp7_ = middle_index; #line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp22_ = _tmp15_ (_tmp18_, _tmp21_, _tmp15__target); + _tmp8_ = array[_tmp7_]; #line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp22_ > ((gint64) 0)) { -#line 1925 "SortedList.c" - gpointer* _tmp23_; - gint _tmp23__length1; - gpointer* _tmp24_; - gint _tmp24__length1; - gint _tmp25_; - gint _tmp26_; - gint _tmp27_; -#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp23_ = array; -#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp23__length1 = array_length1; -#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp24_ = scratch; -#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp24__length1 = scratch_length1; -#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp25_ = start_index; -#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp26_ = middle_index; + if (_tmp4_ (_tmp6_, _tmp8_, _tmp4__target) > ((gint64) 0)) { +#line 1794 "SortedList.c" + gint _tmp9_; #line 372 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp27_ = end_index; + _tmp9_ = middle_index; #line 372 "/home/jens/Source/shotwell/src/SortedList.vala" - sorted_list_merge (self, _tmp23_, _tmp23__length1, _tmp24_, _tmp24__length1, _tmp25_, _tmp26_, _tmp27_); -#line 1949 "SortedList.c" + sorted_list_merge (self, array, array_length1, scratch, scratch_length1, start_index, _tmp9_, end_index); +#line 1800 "SortedList.c" } } -static void sorted_list_merge (SortedList* self, gpointer* array, int array_length1, gpointer* scratch, int scratch_length1, gint start_index, gint middle_index, gint end_index) { - gint _tmp0_; - gint _tmp1_; +static void +sorted_list_merge (SortedList* self, + gpointer* array, + int array_length1, + gpointer* scratch, + int scratch_length1, + gint start_index, + gint middle_index, + gint end_index) +{ gint count = 0; - gint _tmp2_; - gint _tmp3_; gint left_start = 0; - gint _tmp4_; gint left_end = 0; - gint _tmp5_; gint right_start = 0; - gint _tmp6_; gint right_end = 0; - gint _tmp7_; - gpointer* _tmp8_; - gint _tmp8__length1; - gint _tmp9_; + gint _tmp0_; gint scratch_index = 0; - gint _tmp57_; - gint _tmp58_; + gint _tmp39_; + gint _tmp40_; #line 375 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_if_fail (IS_SORTED_LIST (self)); #line 376 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp0_ = start_index; -#line 376 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = end_index; -#line 376 "/home/jens/Source/shotwell/src/SortedList.vala" - _vala_assert (_tmp0_ < _tmp1_, "start_index < end_index"); -#line 378 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = end_index; + _vala_assert (start_index < end_index, "start_index < end_index"); #line 378 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp3_ = start_index; -#line 378 "/home/jens/Source/shotwell/src/SortedList.vala" - count = (_tmp2_ - _tmp3_) + 1; -#line 379 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp4_ = start_index; + count = (end_index - start_index) + 1; #line 379 "/home/jens/Source/shotwell/src/SortedList.vala" - left_start = _tmp4_; -#line 380 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp5_ = middle_index; + left_start = start_index; #line 380 "/home/jens/Source/shotwell/src/SortedList.vala" - left_end = _tmp5_ - 1; + left_end = middle_index - 1; #line 381 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = middle_index; -#line 381 "/home/jens/Source/shotwell/src/SortedList.vala" - right_start = _tmp6_; -#line 382 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp7_ = end_index; + right_start = middle_index; #line 382 "/home/jens/Source/shotwell/src/SortedList.vala" - right_end = _tmp7_; -#line 384 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8_ = scratch; + right_end = end_index; #line 384 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8__length1 = scratch_length1; -#line 384 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp9_ = count; + _tmp0_ = count; #line 384 "/home/jens/Source/shotwell/src/SortedList.vala" - _vala_assert (_tmp8__length1 >= _tmp9_, "scratch.length >= count"); + _vala_assert (scratch_length1 >= _tmp0_, "scratch.length >= count"); #line 385 "/home/jens/Source/shotwell/src/SortedList.vala" scratch_index = 0; #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 2016 "SortedList.c" - gboolean _tmp10_ = FALSE; - gint _tmp11_; - gint _tmp12_; +#line 1846 "SortedList.c" + gboolean _tmp1_ = FALSE; + gint _tmp2_; + gint _tmp3_; gpointer left = NULL; - gpointer* _tmp15_; - gint _tmp15__length1; - gint _tmp16_; - gconstpointer _tmp17_; - gpointer _tmp18_; + gint _tmp6_; + gconstpointer _tmp7_; + gpointer _tmp8_; gpointer right = NULL; - gpointer* _tmp19_; - gint _tmp19__length1; - gint _tmp20_; - gconstpointer _tmp21_; - gpointer _tmp22_; - Comparator _tmp23_; - void* _tmp23__target; - gconstpointer _tmp24_; - gconstpointer _tmp25_; - gint64 _tmp26_; + gint _tmp9_; + gconstpointer _tmp10_; + gpointer _tmp11_; + Comparator _tmp12_; + void* _tmp12__target; + gconstpointer _tmp13_; + gconstpointer _tmp14_; #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp11_ = left_start; + _tmp2_ = left_start; #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12_ = left_end; + _tmp3_ = left_end; #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp11_ <= _tmp12_) { -#line 2043 "SortedList.c" - gint _tmp13_; - gint _tmp14_; + if (_tmp2_ <= _tmp3_) { +#line 1868 "SortedList.c" + gint _tmp4_; + gint _tmp5_; #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp13_ = right_start; + _tmp4_ = right_start; #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp14_ = right_end; + _tmp5_ = right_end; #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp10_ = _tmp13_ <= _tmp14_; -#line 2052 "SortedList.c" + _tmp1_ = _tmp4_ <= _tmp5_; +#line 1877 "SortedList.c" } else { #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp10_ = FALSE; -#line 2056 "SortedList.c" + _tmp1_ = FALSE; +#line 1881 "SortedList.c" } #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!_tmp10_) { + if (!_tmp1_) { #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2062 "SortedList.c" +#line 1887 "SortedList.c" } #line 388 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15_ = array; -#line 388 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15__length1 = array_length1; -#line 388 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_ = left_start; + _tmp6_ = left_start; #line 388 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp17_ = _tmp15_[_tmp16_]; + _tmp7_ = array[_tmp6_]; #line 388 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp18_ = ((_tmp17_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp17_) : ((gpointer) _tmp17_); + _tmp8_ = ((_tmp7_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp7_) : ((gpointer) _tmp7_); #line 388 "/home/jens/Source/shotwell/src/SortedList.vala" - left = _tmp18_; + left = _tmp8_; #line 389 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19_ = array; + _tmp9_ = right_start; #line 389 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19__length1 = array_length1; + _tmp10_ = array[_tmp9_]; #line 389 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp20_ = right_start; + _tmp11_ = ((_tmp10_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp10_) : ((gpointer) _tmp10_); #line 389 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp21_ = _tmp19_[_tmp20_]; -#line 389 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp22_ = ((_tmp21_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp21_) : ((gpointer) _tmp21_); -#line 389 "/home/jens/Source/shotwell/src/SortedList.vala" - right = _tmp22_; -#line 391 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp23_ = self->priv->cmp; + right = _tmp11_; #line 391 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp23__target = self->priv->cmp_target; + _tmp12_ = self->priv->cmp; #line 391 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp24_ = left; + _tmp12__target = self->priv->cmp_target; #line 391 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp25_ = right; + _tmp13_ = left; #line 391 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp26_ = _tmp23_ (_tmp24_, _tmp25_, _tmp23__target); + _tmp14_ = right; #line 391 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp26_ <= ((gint64) 0)) { -#line 2100 "SortedList.c" - gpointer* _tmp27_; - gint _tmp27__length1; - gint _tmp28_; - gconstpointer _tmp29_; - gpointer _tmp30_; - gpointer _tmp31_; - gint _tmp32_; -#line 392 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp27_ = scratch; + if (_tmp12_ (_tmp13_, _tmp14_, _tmp12__target) <= ((gint64) 0)) { +#line 1915 "SortedList.c" + gint _tmp15_; + gconstpointer _tmp16_; + gpointer _tmp17_; + gpointer _tmp18_; + gint _tmp19_; #line 392 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp27__length1 = scratch_length1; + _tmp15_ = scratch_index; #line 392 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp28_ = scratch_index; + scratch_index = _tmp15_ + 1; #line 392 "/home/jens/Source/shotwell/src/SortedList.vala" - scratch_index = _tmp28_ + 1; + _tmp16_ = left; #line 392 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp29_ = left; + _tmp17_ = ((_tmp16_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp16_) : ((gpointer) _tmp16_); #line 392 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp30_ = ((_tmp29_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp29_) : ((gpointer) _tmp29_); + ((scratch[_tmp15_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (scratch[_tmp15_] = (self->priv->g_destroy_func (scratch[_tmp15_]), NULL)); #line 392 "/home/jens/Source/shotwell/src/SortedList.vala" - ((_tmp27_[_tmp28_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp27_[_tmp28_] = (self->priv->g_destroy_func (_tmp27_[_tmp28_]), NULL)); + scratch[_tmp15_] = _tmp17_; #line 392 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp27_[_tmp28_] = _tmp30_; -#line 392 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp31_ = _tmp27_[_tmp28_]; + _tmp18_ = scratch[_tmp15_]; #line 393 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp32_ = left_start; + _tmp19_ = left_start; #line 393 "/home/jens/Source/shotwell/src/SortedList.vala" - left_start = _tmp32_ + 1; -#line 2130 "SortedList.c" + left_start = _tmp19_ + 1; +#line 1939 "SortedList.c" } else { - gpointer* _tmp33_; - gint _tmp33__length1; - gint _tmp34_; - gconstpointer _tmp35_; - gpointer _tmp36_; - gpointer _tmp37_; - gint _tmp38_; -#line 395 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp33_ = scratch; -#line 395 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp33__length1 = scratch_length1; + gint _tmp20_; + gconstpointer _tmp21_; + gpointer _tmp22_; + gpointer _tmp23_; + gint _tmp24_; #line 395 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp34_ = scratch_index; + _tmp20_ = scratch_index; #line 395 "/home/jens/Source/shotwell/src/SortedList.vala" - scratch_index = _tmp34_ + 1; + scratch_index = _tmp20_ + 1; #line 395 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp35_ = right; + _tmp21_ = right; #line 395 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp36_ = ((_tmp35_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp35_) : ((gpointer) _tmp35_); + _tmp22_ = ((_tmp21_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp21_) : ((gpointer) _tmp21_); #line 395 "/home/jens/Source/shotwell/src/SortedList.vala" - ((_tmp33_[_tmp34_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp33_[_tmp34_] = (self->priv->g_destroy_func (_tmp33_[_tmp34_]), NULL)); + ((scratch[_tmp20_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (scratch[_tmp20_] = (self->priv->g_destroy_func (scratch[_tmp20_]), NULL)); #line 395 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp33_[_tmp34_] = _tmp36_; + scratch[_tmp20_] = _tmp22_; #line 395 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp37_ = _tmp33_[_tmp34_]; + _tmp23_ = scratch[_tmp20_]; #line 396 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp38_ = right_start; + _tmp24_ = right_start; #line 396 "/home/jens/Source/shotwell/src/SortedList.vala" - right_start = _tmp38_ + 1; -#line 2161 "SortedList.c" + right_start = _tmp24_ + 1; +#line 1964 "SortedList.c" } #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" ((right == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (right = (self->priv->g_destroy_func (right), NULL)); #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" ((left == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (left = (self->priv->g_destroy_func (left), NULL)); -#line 2167 "SortedList.c" +#line 1970 "SortedList.c" } #line 400 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 2171 "SortedList.c" - gint _tmp39_; - gint _tmp40_; - gpointer* _tmp41_; - gint _tmp41__length1; - gint _tmp42_; - gpointer* _tmp43_; - gint _tmp43__length1; - gint _tmp44_; - gconstpointer _tmp45_; - gpointer _tmp46_; - gpointer _tmp47_; +#line 1974 "SortedList.c" + gint _tmp25_; + gint _tmp26_; + gint _tmp27_; + gint _tmp28_; + gconstpointer _tmp29_; + gpointer _tmp30_; + gpointer _tmp31_; #line 400 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp39_ = left_start; + _tmp25_ = left_start; #line 400 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp40_ = left_end; + _tmp26_ = left_end; #line 400 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!(_tmp39_ <= _tmp40_)) { + if (!(_tmp25_ <= _tmp26_)) { #line 400 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2191 "SortedList.c" +#line 1990 "SortedList.c" } #line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp41_ = scratch; + _tmp27_ = scratch_index; #line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp41__length1 = scratch_length1; + scratch_index = _tmp27_ + 1; #line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp42_ = scratch_index; + _tmp28_ = left_start; #line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - scratch_index = _tmp42_ + 1; + left_start = _tmp28_ + 1; #line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp43_ = array; + _tmp29_ = array[_tmp28_]; #line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp43__length1 = array_length1; + _tmp30_ = ((_tmp29_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp29_) : ((gpointer) _tmp29_); #line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp44_ = left_start; + ((scratch[_tmp27_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (scratch[_tmp27_] = (self->priv->g_destroy_func (scratch[_tmp27_]), NULL)); #line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - left_start = _tmp44_ + 1; + scratch[_tmp27_] = _tmp30_; #line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp45_ = _tmp43_[_tmp44_]; -#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp46_ = ((_tmp45_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp45_) : ((gpointer) _tmp45_); -#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - ((_tmp41_[_tmp42_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp41_[_tmp42_] = (self->priv->g_destroy_func (_tmp41_[_tmp42_]), NULL)); -#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp41_[_tmp42_] = _tmp46_; -#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp47_ = _tmp41_[_tmp42_]; -#line 2219 "SortedList.c" + _tmp31_ = scratch[_tmp27_]; +#line 2010 "SortedList.c" } #line 403 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 2223 "SortedList.c" - gint _tmp48_; - gint _tmp49_; - gpointer* _tmp50_; - gint _tmp50__length1; - gint _tmp51_; - gpointer* _tmp52_; - gint _tmp52__length1; - gint _tmp53_; - gconstpointer _tmp54_; - gpointer _tmp55_; - gpointer _tmp56_; +#line 2014 "SortedList.c" + gint _tmp32_; + gint _tmp33_; + gint _tmp34_; + gint _tmp35_; + gconstpointer _tmp36_; + gpointer _tmp37_; + gpointer _tmp38_; #line 403 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp48_ = right_start; + _tmp32_ = right_start; #line 403 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp49_ = right_end; + _tmp33_ = right_end; #line 403 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!(_tmp48_ <= _tmp49_)) { + if (!(_tmp32_ <= _tmp33_)) { #line 403 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2243 "SortedList.c" +#line 2030 "SortedList.c" } #line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp50_ = scratch; -#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp50__length1 = scratch_length1; -#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp51_ = scratch_index; -#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - scratch_index = _tmp51_ + 1; + _tmp34_ = scratch_index; #line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp52_ = array; + scratch_index = _tmp34_ + 1; #line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp52__length1 = array_length1; + _tmp35_ = right_start; #line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp53_ = right_start; + right_start = _tmp35_ + 1; #line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - right_start = _tmp53_ + 1; + _tmp36_ = array[_tmp35_]; #line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp54_ = _tmp52_[_tmp53_]; + _tmp37_ = ((_tmp36_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp36_) : ((gpointer) _tmp36_); #line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp55_ = ((_tmp54_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp54_) : ((gpointer) _tmp54_); + ((scratch[_tmp34_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (scratch[_tmp34_] = (self->priv->g_destroy_func (scratch[_tmp34_]), NULL)); #line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - ((_tmp50_[_tmp51_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp50_[_tmp51_] = (self->priv->g_destroy_func (_tmp50_[_tmp51_]), NULL)); + scratch[_tmp34_] = _tmp37_; #line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp50_[_tmp51_] = _tmp55_; -#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp56_ = _tmp50_[_tmp51_]; -#line 2271 "SortedList.c" + _tmp38_ = scratch[_tmp34_]; +#line 2050 "SortedList.c" } #line 406 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp57_ = scratch_index; + _tmp39_ = scratch_index; #line 406 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp58_ = count; + _tmp40_ = count; #line 406 "/home/jens/Source/shotwell/src/SortedList.vala" - _vala_assert (_tmp57_ == _tmp58_, "scratch_index == count"); + _vala_assert (_tmp39_ == _tmp40_, "scratch_index == count"); #line 408 "/home/jens/Source/shotwell/src/SortedList.vala" scratch_index = 0; -#line 2281 "SortedList.c" +#line 2060 "SortedList.c" { gint list_index = 0; - gint _tmp59_; -#line 409 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp59_ = start_index; #line 409 "/home/jens/Source/shotwell/src/SortedList.vala" - list_index = _tmp59_; -#line 2289 "SortedList.c" + list_index = start_index; +#line 2065 "SortedList.c" { - gboolean _tmp60_ = FALSE; + gboolean _tmp41_ = FALSE; #line 409 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp60_ = TRUE; + _tmp41_ = TRUE; #line 409 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 2296 "SortedList.c" - gint _tmp62_; - gint _tmp63_; - gpointer* _tmp64_; - gint _tmp64__length1; - gint _tmp65_; - gpointer* _tmp66_; - gint _tmp66__length1; - gint _tmp67_; - gconstpointer _tmp68_; - gpointer _tmp69_; - gpointer _tmp70_; +#line 2072 "SortedList.c" + gint _tmp43_; + gint _tmp44_; + gint _tmp45_; + gconstpointer _tmp46_; + gpointer _tmp47_; + gpointer _tmp48_; #line 409 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!_tmp60_) { -#line 2310 "SortedList.c" - gint _tmp61_; + if (!_tmp41_) { +#line 2081 "SortedList.c" + gint _tmp42_; #line 409 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp61_ = list_index; + _tmp42_ = list_index; #line 409 "/home/jens/Source/shotwell/src/SortedList.vala" - list_index = _tmp61_ + 1; -#line 2316 "SortedList.c" + list_index = _tmp42_ + 1; +#line 2087 "SortedList.c" } #line 409 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp60_ = FALSE; + _tmp41_ = FALSE; #line 409 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp62_ = list_index; + _tmp43_ = list_index; #line 409 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp63_ = end_index; -#line 409 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!(_tmp62_ <= _tmp63_)) { + if (!(_tmp43_ <= end_index)) { #line 409 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2328 "SortedList.c" +#line 2097 "SortedList.c" } #line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp64_ = array; -#line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp64__length1 = array_length1; + _tmp44_ = list_index; #line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp65_ = list_index; + _tmp45_ = scratch_index; #line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp66_ = scratch; + scratch_index = _tmp45_ + 1; #line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp66__length1 = scratch_length1; + _tmp46_ = scratch[_tmp45_]; #line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp67_ = scratch_index; + _tmp47_ = ((_tmp46_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp46_) : ((gpointer) _tmp46_); #line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - scratch_index = _tmp67_ + 1; + ((array[_tmp44_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (array[_tmp44_] = (self->priv->g_destroy_func (array[_tmp44_]), NULL)); #line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp68_ = _tmp66_[_tmp67_]; + array[_tmp44_] = _tmp47_; #line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp69_ = ((_tmp68_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp68_) : ((gpointer) _tmp68_); -#line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - ((_tmp64_[_tmp65_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp64_[_tmp65_] = (self->priv->g_destroy_func (_tmp64_[_tmp65_]), NULL)); -#line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp64_[_tmp65_] = _tmp69_; -#line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp70_ = _tmp64_[_tmp65_]; -#line 2354 "SortedList.c" + _tmp48_ = array[_tmp44_]; +#line 2115 "SortedList.c" } } } } -static GType sorted_list_real_get_element_type (GeeTraversable* base) { +static GType +sorted_list_real_get_element_type (GeeTraversable* base) +{ GType result; SortedList* self; #line 19 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2366,11 +2129,13 @@ static GType sorted_list_real_get_element_type (GeeTraversable* base) { result = self->priv->g_type; #line 19 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 2370 "SortedList.c" +#line 2133 "SortedList.c" } -static gboolean sorted_list_real_get_read_only (GeeCollection* base) { +static gboolean +sorted_list_real_get_read_only (GeeCollection* base) +{ gboolean result; SortedList* self; GeeArrayList* _tmp0_; @@ -2388,11 +2153,13 @@ static gboolean sorted_list_real_get_read_only (GeeCollection* base) { result = _tmp2_; #line 23 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 2392 "SortedList.c" +#line 2157 "SortedList.c" } -static gboolean sorted_list_real_get_is_empty (GeeCollection* base) { +static gboolean +sorted_list_real_get_is_empty (GeeCollection* base) +{ gboolean result; SortedList* self; GeeArrayList* _tmp0_; @@ -2410,11 +2177,13 @@ static gboolean sorted_list_real_get_is_empty (GeeCollection* base) { result = _tmp2_; #line 117 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 2414 "SortedList.c" +#line 2181 "SortedList.c" } -static gint sorted_list_real_get_size (GeeCollection* base) { +static gint +sorted_list_real_get_size (GeeCollection* base) +{ gint result; SortedList* self; GeeArrayList* _tmp0_; @@ -2432,11 +2201,13 @@ static gint sorted_list_real_get_size (GeeCollection* base) { result = _tmp2_; #line 134 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 2436 "SortedList.c" +#line 2205 "SortedList.c" } -static GeeCollection* sorted_list_real_get_read_only_view (GeeCollection* base) { +static GeeCollection* +sorted_list_real_get_read_only_view (GeeCollection* base) +{ GeeCollection* result; SortedList* self; GeeArrayList* _tmp0_; @@ -2454,11 +2225,13 @@ static GeeCollection* sorted_list_real_get_read_only_view (GeeCollection* base) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 200 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 2458 "SortedList.c" +#line 2229 "SortedList.c" } -GeeList* sorted_list_get_read_only_view_as_list (SortedList* self) { +GeeList* +sorted_list_get_read_only_view_as_list (SortedList* self) +{ GeeList* result; GeeArrayList* _tmp0_; GeeBidirList* _tmp1_; @@ -2475,11 +2248,13 @@ GeeList* sorted_list_get_read_only_view_as_list (SortedList* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList); #line 206 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 2479 "SortedList.c" +#line 2252 "SortedList.c" } -static void sorted_list_class_init (SortedListClass * klass) { +static void +sorted_list_class_init (SortedListClass * klass) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" sorted_list_parent_class = g_type_class_peek_parent (klass); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2491,49 +2266,57 @@ static void sorted_list_class_init (SortedListClass * klass) { #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" G_OBJECT_CLASS (klass)->finalize = sorted_list_finalize; #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_G_TYPE, g_param_spec_gtype ("g-type", "type", "type", G_TYPE_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_G_TYPE, g_param_spec_gtype ("g-type", "type", "type", G_TYPE_NONE, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_G_DUP_FUNC, g_param_spec_pointer ("g-dup-func", "dup func", "dup func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_G_DUP_FUNC, g_param_spec_pointer ("g-dup-func", "dup func", "dup func", G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_ELEMENT_TYPE_PROPERTY, g_param_spec_gtype ("element-type", "element-type", "element-type", G_TYPE_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_ELEMENT_TYPE_PROPERTY, sorted_list_properties[SORTED_LIST_ELEMENT_TYPE_PROPERTY] = g_param_spec_gtype ("element-type", "element-type", "element-type", G_TYPE_NONE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_PROPERTY, g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_PROPERTY, sorted_list_properties[SORTED_LIST_READ_ONLY_PROPERTY] = g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_IS_EMPTY_PROPERTY, g_param_spec_boolean ("is-empty", "is-empty", "is-empty", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_IS_EMPTY_PROPERTY, sorted_list_properties[SORTED_LIST_IS_EMPTY_PROPERTY] = g_param_spec_boolean ("is-empty", "is-empty", "is-empty", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_SIZE_PROPERTY, g_param_spec_int ("size", "size", "size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_SIZE_PROPERTY, sorted_list_properties[SORTED_LIST_SIZE_PROPERTY] = g_param_spec_int ("size", "size", "size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_VIEW_PROPERTY, g_param_spec_object ("read-only-view", "read-only-view", "read-only-view", GEE_TYPE_COLLECTION, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_VIEW_PROPERTY, sorted_list_properties[SORTED_LIST_READ_ONLY_VIEW_PROPERTY] = g_param_spec_object ("read-only-view", "read-only-view", "read-only-view", GEE_TYPE_COLLECTION, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_VIEW_AS_LIST_PROPERTY, g_param_spec_object ("read-only-view-as-list", "read-only-view-as-list", "read-only-view-as-list", GEE_TYPE_LIST, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 2512 "SortedList.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_VIEW_AS_LIST_PROPERTY, sorted_list_properties[SORTED_LIST_READ_ONLY_VIEW_AS_LIST_PROPERTY] = g_param_spec_object ("read-only-view-as-list", "read-only-view-as-list", "read-only-view-as-list", GEE_TYPE_LIST, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 2287 "SortedList.c" } -static GType sorted_list_gee_traversable_get_g_type (SortedList* self) { +static GType +sorted_list_gee_traversable_get_g_type (SortedList* self) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_type; -#line 2519 "SortedList.c" +#line 2296 "SortedList.c" } -static GBoxedCopyFunc sorted_list_gee_traversable_get_g_dup_func (SortedList* self) { +static GBoxedCopyFunc +sorted_list_gee_traversable_get_g_dup_func (SortedList* self) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_dup_func; -#line 2526 "SortedList.c" +#line 2305 "SortedList.c" } -static GDestroyNotify sorted_list_gee_traversable_get_g_destroy_func (SortedList* self) { +static GDestroyNotify +sorted_list_gee_traversable_get_g_destroy_func (SortedList* self) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_destroy_func; -#line 2533 "SortedList.c" +#line 2314 "SortedList.c" } -static void sorted_list_gee_traversable_interface_init (GeeTraversableIface * iface) { +static void +sorted_list_gee_traversable_interface_init (GeeTraversableIface * iface) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" sorted_list_gee_traversable_parent_iface = g_type_interface_peek_parent (iface); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2546,32 +2329,40 @@ static void sorted_list_gee_traversable_interface_init (GeeTraversableIface * if iface->get_g_destroy_func = (GDestroyNotify (*) (GeeTraversable *)) sorted_list_gee_traversable_get_g_destroy_func; #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_element_type = sorted_list_real_get_element_type; -#line 2550 "SortedList.c" +#line 2333 "SortedList.c" } -static GType sorted_list_gee_iterable_get_g_type (SortedList* self) { +static GType +sorted_list_gee_iterable_get_g_type (SortedList* self) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_type; -#line 2557 "SortedList.c" +#line 2342 "SortedList.c" } -static GBoxedCopyFunc sorted_list_gee_iterable_get_g_dup_func (SortedList* self) { +static GBoxedCopyFunc +sorted_list_gee_iterable_get_g_dup_func (SortedList* self) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_dup_func; -#line 2564 "SortedList.c" +#line 2351 "SortedList.c" } -static GDestroyNotify sorted_list_gee_iterable_get_g_destroy_func (SortedList* self) { +static GDestroyNotify +sorted_list_gee_iterable_get_g_destroy_func (SortedList* self) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_destroy_func; -#line 2571 "SortedList.c" +#line 2360 "SortedList.c" } -static void sorted_list_gee_iterable_interface_init (GeeIterableIface * iface) { +static void +sorted_list_gee_iterable_interface_init (GeeIterableIface * iface) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" sorted_list_gee_iterable_parent_iface = g_type_interface_peek_parent (iface); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2582,32 +2373,40 @@ static void sorted_list_gee_iterable_interface_init (GeeIterableIface * iface) { iface->get_g_dup_func = (GBoxedCopyFunc (*) (GeeIterable *)) sorted_list_gee_iterable_get_g_dup_func; #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_g_destroy_func = (GDestroyNotify (*) (GeeIterable *)) sorted_list_gee_iterable_get_g_destroy_func; -#line 2586 "SortedList.c" +#line 2377 "SortedList.c" } -static GType sorted_list_gee_collection_get_g_type (SortedList* self) { +static GType +sorted_list_gee_collection_get_g_type (SortedList* self) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_type; -#line 2593 "SortedList.c" +#line 2386 "SortedList.c" } -static GBoxedCopyFunc sorted_list_gee_collection_get_g_dup_func (SortedList* self) { +static GBoxedCopyFunc +sorted_list_gee_collection_get_g_dup_func (SortedList* self) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_dup_func; -#line 2600 "SortedList.c" +#line 2395 "SortedList.c" } -static GDestroyNotify sorted_list_gee_collection_get_g_destroy_func (SortedList* self) { +static GDestroyNotify +sorted_list_gee_collection_get_g_destroy_func (SortedList* self) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_destroy_func; -#line 2607 "SortedList.c" +#line 2404 "SortedList.c" } -static void sorted_list_gee_collection_interface_init (GeeCollectionIface * iface) { +static void +sorted_list_gee_collection_interface_init (GeeCollectionIface * iface) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" sorted_list_gee_collection_parent_iface = g_type_interface_peek_parent (iface); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2642,18 +2441,22 @@ static void sorted_list_gee_collection_interface_init (GeeCollectionIface * ifac iface->get_size = sorted_list_real_get_size; #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_read_only_view = sorted_list_real_get_read_only_view; -#line 2646 "SortedList.c" +#line 2445 "SortedList.c" } -static void sorted_list_instance_init (SortedList * self) { +static void +sorted_list_instance_init (SortedList * self) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" self->priv = SORTED_LIST_GET_PRIVATE (self); -#line 2653 "SortedList.c" +#line 2454 "SortedList.c" } -static void sorted_list_finalize (GObject * obj) { +static void +sorted_list_finalize (GObject * obj) +{ SortedList * self; #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SORTED_LIST, SortedList); @@ -2661,11 +2464,13 @@ static void sorted_list_finalize (GObject * obj) { _g_object_unref0 (self->priv->list); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" G_OBJECT_CLASS (sorted_list_parent_class)->finalize (obj); -#line 2665 "SortedList.c" +#line 2468 "SortedList.c" } -GType sorted_list_get_type (void) { +GType +sorted_list_get_type (void) +{ static volatile gsize sorted_list_type_id__volatile = 0; if (g_once_init_enter (&sorted_list_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SortedListClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sorted_list_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SortedList), 0, (GInstanceInitFunc) sorted_list_instance_init, NULL }; @@ -2683,7 +2488,12 @@ GType sorted_list_get_type (void) { } -static void _vala_sorted_list_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_sorted_list_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ SortedList * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_SORTED_LIST, SortedList); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2724,18 +2534,23 @@ static void _vala_sorted_list_get_property (GObject * object, guint property_id, g_value_take_object (value, sorted_list_get_read_only_view_as_list (self)); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2728 "SortedList.c" +#line 2538 "SortedList.c" default: #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2734 "SortedList.c" +#line 2544 "SortedList.c" } } -static void _vala_sorted_list_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { +static void +_vala_sorted_list_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec) +{ SortedList * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_SORTED_LIST, SortedList); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2758,18 +2573,22 @@ static void _vala_sorted_list_set_property (GObject * object, guint property_id, self->priv->g_destroy_func = g_value_get_pointer (value); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2762 "SortedList.c" +#line 2577 "SortedList.c" default: #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2768 "SortedList.c" +#line 2583 "SortedList.c" } } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -2781,7 +2600,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/Tag.c b/src/Tag.c index b1d3895..f3b0e2c 100644 --- a/src/Tag.c +++ b/src/Tag.c @@ -1,4 +1,4 @@ -/* Tag.c generated by valac 0.36.6, the Vala compiler +/* Tag.c generated by valac 0.40.4, the Vala compiler * generated from Tag.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -310,6 +311,11 @@ typedef struct _TagRowClass TagRowClass; typedef struct _ViewCollection ViewCollection; typedef struct _ViewCollectionClass ViewCollectionClass; +enum { + TAG_0_PROPERTY, + TAG_NUM_PROPERTIES +}; +static GParamSpec* tag_properties[TAG_NUM_PROPERTIES]; #define TYPE_DATA_VIEW (data_view_get_type ()) #define DATA_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_VIEW, DataView)) @@ -713,17 +719,29 @@ static IndexableIface * tag_indexable_parent_iface = NULL; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType marker_get_type (void) G_GNUC_CONST; @@ -731,9 +749,15 @@ GType source_collection_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; @@ -744,9 +768,6 @@ GType tag_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; #define TAG_SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TAG_SOURCE_COLLECTION, TagSourceCollectionPrivate)) -enum { - TAG_SOURCE_COLLECTION_DUMMY_PROPERTY -}; GType media_source_collection_get_type (void) G_GNUC_CONST; GType library_photo_source_collection_get_type (void) G_GNUC_CONST; GType photo_source_get_type (void) G_GNUC_CONST; @@ -754,243 +775,427 @@ GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; -static void tag_source_collection_on_photo_source_reimported (TagSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -static void _tag_source_collection_on_photo_source_reimported_library_photo_source_collection_source_reimported (LibraryPhotoSourceCollection* _sender, LibraryPhoto* photo, PhotoMetadata* metadata, gpointer self); +static void tag_source_collection_on_photo_source_reimported (TagSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +static void _tag_source_collection_on_photo_source_reimported_library_photo_source_collection_source_reimported (LibraryPhotoSourceCollection* _sender, + LibraryPhoto* photo, + PhotoMetadata* metadata, + gpointer self); guint tag_hash_name_string (const gchar* a); -static guint _tag_hash_name_string_gee_hash_data_func (gconstpointer v, gpointer self); -gboolean tag_equal_name_strings (const gchar* a, const gchar* b); -static gboolean _tag_equal_name_strings_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); +static guint _tag_hash_name_string_gee_hash_data_func (gconstpointer v, + gpointer self); +gboolean tag_equal_name_strings (const gchar* a, + const gchar* b); +static gboolean _tag_equal_name_strings_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); TagSourceCollection* tag_source_collection_new (void); TagSourceCollection* tag_source_collection_construct (GType object_type); #define TAG_TYPENAME "tag" static gint64 tag_source_collection_get_tag_key (DataSource* source); -static gint64 _tag_source_collection_get_tag_key_get_source_database_key (DataSource* source, gpointer self); -ContainerSourceCollection* container_source_collection_construct (GType object_type, const gchar* backlink_name, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target); -void container_source_collection_attach_collection (ContainerSourceCollection* self, SourceCollection* collection); +static gint64 _tag_source_collection_get_tag_key_get_source_database_key (DataSource* source, + gpointer self); +ContainerSourceCollection* container_source_collection_construct (GType object_type, + const gchar* backlink_name, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target); +void container_source_collection_attach_collection (ContainerSourceCollection* self, + SourceCollection* collection); GType video_source_collection_get_type (void) G_GNUC_CONST; -static gboolean tag_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source); +static gboolean tag_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source); gint64 data_source_get_instance_id (DataSource* self); -static GeeCollection* tag_source_collection_real_get_containers_holding_source (ContainerSourceCollection* base, DataSource* source); -GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, MediaSource* source); -static ContainerSource* tag_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* base, SourceBacklink* backlink); +static GeeCollection* tag_source_collection_real_get_containers_holding_source (ContainerSourceCollection* base, + DataSource* source); +GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, + MediaSource* source); +static ContainerSource* tag_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* base, + SourceBacklink* backlink); GType tag_id_get_type (void) G_GNUC_CONST; TagID* tag_id_dup (const TagID* self); void tag_id_free (TagID* self); gint64 source_backlink_get_instance_id (SourceBacklink* self); -void tag_id_init (TagID *self, gint64 id); -Tag* tag_source_collection_fetch (TagSourceCollection* self, TagID* tag_id); +void tag_id_init (TagID *self, + gint64 id); +Tag* tag_source_collection_fetch (TagSourceCollection* self, + TagID* tag_id); GeeCollection* container_source_collection_get_holding_tank (ContainerSourceCollection* self); -void tag_get_tag_id (Tag* self, TagID* result); +void tag_get_tag_id (Tag* self, + TagID* result); gchar* tag_get_path (Tag* self); #define TAG_PATH_SEPARATOR_STRING "/" GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path); gchar* hierarchical_tag_utilities_hierarchical_to_flat (const gchar* path); void tag_promote (Tag* self); -DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, gint64 key); -gboolean tag_source_collection_exists (TagSourceCollection* self, const gchar* name, gboolean treat_htags_as_root); -Tag* tag_source_collection_fetch_by_name (TagSourceCollection* self, const gchar* name, gboolean treat_htags_as_root); +DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, + gint64 key); +gboolean tag_source_collection_exists (TagSourceCollection* self, + const gchar* name, + gboolean treat_htags_as_root); +Tag* tag_source_collection_fetch_by_name (TagSourceCollection* self, + const gchar* name, + gboolean treat_htags_as_root); GeeCollection* tag_source_collection_get_all_names (TagSourceCollection* self); -GeeSortedSet* tag_source_collection_fetch_sorted_for_source (TagSourceCollection* self, MediaSource* photo); +GeeSortedSet* tag_source_collection_fetch_sorted_for_source (TagSourceCollection* self, + MediaSource* photo); GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_path); gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name); -Tag* tag_source_collection_restore_tag_from_holding_tank (TagSourceCollection* self, const gchar* name); +Tag* tag_source_collection_restore_tag_from_holding_tank (TagSourceCollection* self, + const gchar* name); gchar* data_object_get_name (DataObject* self); -gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCollection* self, ContainerSource* source); -static void tag_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added); -void data_collection_notify_items_added (DataCollection* self, GeeIterable* added); -static void tag_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed); +gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCollection* self, + ContainerSource* source); +static void tag_source_collection_real_notify_items_added (DataCollection* base, + GeeIterable* added); +void data_collection_notify_items_added (DataCollection* self, + GeeIterable* added); +static void tag_source_collection_real_notify_items_removed (DataCollection* base, + GeeIterable* removed); Tag* tag_get_hierarchical_parent (Tag* self); GeeList* tag_get_hierarchical_children (Tag* self); void tag_flatten (Tag* self); -void data_collection_notify_items_removed (DataCollection* self, GeeIterable* removed); -static void tag_source_collection_real_notify_items_altered (DataCollection* base, GeeMap* map); -gboolean data_source_equals (DataSource* self, DataSource* source); -void data_collection_notify_items_altered (DataCollection* self, GeeMap* items); -static void tag_source_collection_real_notify_container_contents_added (ContainerSourceCollection* base, ContainerSource* container, GeeCollection* added, gboolean relinking); -gint tag_compare_names (Tag* a, Tag* b); -static gint _tag_compare_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); -void container_source_collection_notify_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked); -static void tag_source_collection_real_notify_container_contents_removed (ContainerSourceCollection* base, ContainerSource* container, GeeCollection* removed, gboolean unlinking); -void container_source_collection_notify_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked); +void data_collection_notify_items_removed (DataCollection* self, + GeeIterable* removed); +static void tag_source_collection_real_notify_items_altered (DataCollection* base, + GeeMap* map); +gboolean data_source_equals (DataSource* self, + DataSource* source); +void data_collection_notify_items_altered (DataCollection* self, + GeeMap* items); +static void tag_source_collection_real_notify_container_contents_added (ContainerSourceCollection* base, + ContainerSource* container, + GeeCollection* added, + gboolean relinking); +gint tag_compare_names (Tag* a, + Tag* b); +static gint _tag_compare_names_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self); +void container_source_collection_notify_container_contents_added (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked); +static void tag_source_collection_real_notify_container_contents_removed (ContainerSourceCollection* base, + ContainerSource* container, + GeeCollection* removed, + gboolean unlinking); +void container_source_collection_notify_container_contents_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* removed, + gboolean unlinked); static void tag_source_collection_finalize (DataCollection * obj); gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; gpointer source_snapshot_ref (gpointer instance); void source_snapshot_unref (gpointer instance); -GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_snapshot (GValue* value, gpointer v_object); -void value_take_source_snapshot (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_snapshot (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_snapshot (GValue* value, + gpointer v_object); +void value_take_source_snapshot (GValue* value, + gpointer v_object); gpointer value_get_source_snapshot (const GValue* value); GType source_snapshot_get_type (void) G_GNUC_CONST; gpointer source_proxy_ref (gpointer instance); void source_proxy_unref (gpointer instance); -GParamSpec* param_spec_source_proxy (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_proxy (GValue* value, gpointer v_object); -void value_take_source_proxy (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_proxy (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_proxy (GValue* value, + gpointer v_object); +void value_take_source_proxy (GValue* value, + gpointer v_object); gpointer value_get_source_proxy (const GValue* value); GType source_proxy_get_type (void) G_GNUC_CONST; GType proxyable_get_type (void) G_GNUC_CONST; GType indexable_get_type (void) G_GNUC_CONST; gpointer tag_row_ref (gpointer instance); void tag_row_unref (gpointer instance); -GParamSpec* param_spec_tag_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_tag_row (GValue* value, gpointer v_object); -void value_take_tag_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_tag_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_tag_row (GValue* value, + gpointer v_object); +void value_take_tag_row (GValue* value, + gpointer v_object); gpointer value_get_tag_row (const GValue* value); GType tag_row_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; #define TAG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TAG, TagPrivate)) -enum { - TAG_DUMMY_PROPERTY -}; GType data_view_get_type (void) G_GNUC_CONST; -static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added, GeeIterable* removed); -static void _tag_on_media_views_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self); -static void tag_on_sources_destroyed (Tag* self, GeeCollection* sources); -static void _tag_on_sources_destroyed_source_collection_items_destroyed (SourceCollection* _sender, GeeCollection* destroyed, gpointer self); +static void tag_on_media_views_contents_altered (Tag* self, + GeeIterable* added, + GeeIterable* removed); +static void _tag_on_media_views_contents_altered_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self); +static void tag_on_sources_destroyed (Tag* self, + GeeCollection* sources); +static void _tag_on_sources_destroyed_source_collection_items_destroyed (SourceCollection* _sender, + GeeCollection* destroyed, + gpointer self); #define TAG_TAG_LIST_SEPARATOR_STRING ", " -static Tag* tag_new (TagRow* row, gint64 object_id); -static Tag* tag_construct (GType object_type, TagRow* row, gint64 object_id); -DataSource* data_source_construct (GType object_type, gint64 object_id); +static Tag* tag_new (TagRow* row, + gint64 object_id); +static Tag* tag_construct (GType object_type, + TagRow* row, + gint64 object_id); +DataSource* data_source_construct (GType object_type, + gint64 object_id); gchar* tag_prep_tag_name (const gchar* name); GType thumbnail_view_get_type (void) G_GNUC_CONST; gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); -MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* self, const gchar* source_id); +MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* self, + const gchar* source_id); ThumbnailView* thumbnail_view_new (ThumbnailSource* source); -ThumbnailView* thumbnail_view_construct (GType object_type, ThumbnailSource* source); +ThumbnailView* thumbnail_view_construct (GType object_type, + ThumbnailSource* source); ViewCollection* view_collection_new (const gchar* name); -ViewCollection* view_collection_construct (GType object_type, const gchar* name); -GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); -void container_source_collection_notify_container_contents_altered (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked); +ViewCollection* view_collection_construct (GType object_type, + const gchar* name); +GeeCollection* data_collection_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); +void container_source_collection_notify_container_contents_altered (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked, + GeeCollection* removed, + gboolean unlinked); static void tag_update_indexable_keywords (Tag* self); -void tag_init (ProgressMonitor monitor, void* monitor_target); +void tag_init (ProgressMonitor monitor, + void* monitor_target); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType tag_table_get_type (void) G_GNUC_CONST; TagTable* tag_table_get_instance (void); GQuark database_error_quark (void); -GeeList* tag_table_get_all_rows (TagTable* self, GError** error); +GeeList* tag_table_get_all_rows (TagTable* self, + GError** error); void app_window_database_error (GError* err); -void tag_table_remove (TagTable* self, TagID* tag_id, GError** error); +void tag_table_remove (TagTable* self, + TagID* tag_id, + GError** error); #define DATA_OBJECT_INVALID_OBJECT_ID ((gint64) -1) gboolean container_source_has_links (ContainerSource* self); -void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlinked_from, const gchar* dehydrated); +void data_source_rehydrate_backlinks (DataSource* self, + SourceCollection* unlinked_from, + const gchar* dehydrated); GeeCollection* tag_get_sources (Tag* self); gchar* tag_get_user_visible_name (Tag* self); -void tag_attach_many (Tag* self, GeeCollection* sources); -GeeMultiMap* tag_detach_many (Tag* self, GeeCollection* sources); -gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing); +void tag_attach_many (Tag* self, + GeeCollection* sources); +GeeMultiMap* tag_detach_many (Tag* self, + GeeCollection* sources); +gboolean data_source_destroy_orphan (DataSource* self, + gboolean delete_backing); gint tag_get_sources_count (Tag* self); -void container_source_collection_init_add_many_unlinked (ContainerSourceCollection* self, GeeCollection* unlinked); +void container_source_collection_init_add_many_unlinked (ContainerSourceCollection* self, + GeeCollection* unlinked); void tag_terminate (void); -gint string_precollated_compare (const gchar* astr, const gchar* akey, const gchar* bstr, const gchar* bkey); +gint string_precollated_compare (const gchar* astr, + const gchar* akey, + const gchar* bstr, + const gchar* bkey); gchar* tag_get_name_collation_key (Tag* self); -gint tag_compare_user_visible_names (Tag* a, Tag* b); +gint tag_compare_user_visible_names (Tag* a, + Tag* b); guint string_collated_hash (void* ptr); -gboolean string_collated_equals (void* a, void* b); +gboolean string_collated_equals (void* a, + void* b); Tag* tag_for_path (const gchar* name); -TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error); -gboolean data_collection_add (DataCollection* self, DataObject* object); +TagRow* tag_table_add (TagTable* self, + const gchar* name, + GError** error); +gboolean data_collection_add (DataCollection* self, + DataObject* object); GeeCollection* tag_get_terminal_tags (GeeCollection* tags); GeeList* tag_make_user_visible_tag_list (GeeCollection* tags); -static gint _tag_compare_user_visible_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); -gchar* tag_make_tag_markup_string (GeeList* tags, gint highlight_index); +static gint _tag_compare_user_visible_names_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self); +gchar* tag_make_tag_markup_string (GeeList* tags, + gint highlight_index); gchar* guarded_markup_escape_text (const gchar* plain); GType prepare_input_text_options_get_type (void) G_GNUC_CONST; -gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length); +gchar* prepare_input_text (const gchar* text, + PrepareInputTextOptions options, + gint dest_length); #define DEFAULT_USER_TEXT_INPUT_LENGTH 1024 -gchar** tag_prep_tag_names (gchar** names, int names_length1, int* result_length1); -static void _vala_array_add128 (gchar** * array, int* length, int* size, gchar* value); -static void tag_set_raw_flat_name (Tag* self, const gchar* name); -void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GError** error); -void data_object_notify_altered (DataObject* self, Alteration* alteration); +gchar** tag_prep_tag_names (gchar** names, + int names_length1, + int* result_length1); +static void _vala_array_add128 (gchar** * array, + int* length, + int* size, + gchar* value); +static void tag_set_raw_flat_name (Tag* self, + const gchar* name); +void tag_table_rename (TagTable* self, + TagID* tag_id, + const gchar* new_name, + GError** error); +void data_object_notify_altered (DataObject* self, + Alteration* alteration); Alteration* alteration_new_from_list (const gchar* list); -Alteration* alteration_construct_from_list (GType object_type, const gchar* list); -static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_notify); +Alteration* alteration_construct_from_list (GType object_type, + const gchar* list); +static void tag_set_raw_path (Tag* self, + const gchar* path, + gboolean suppress_notify); static gchar* tag_real_get_typename (DataSource* base); static gint64 tag_real_get_instance_id (DataSource* base); static gchar* tag_real_get_name (DataObject* base); gchar* hierarchical_tag_utilities_get_basename (const gchar* in_path); gchar* tag_get_searchable_name (Tag* self); gchar* string_remove_diacritics (const gchar* istring); -gint tag_get_attachment_count (Tag* self, MediaSource* source); -gboolean tag_contains (Tag* self, MediaSource* source); +gint tag_get_attachment_count (Tag* self, + MediaSource* source); +gboolean tag_contains (Tag* self, + MediaSource* source); static gchar* tag_get_next_untitled_tag_name (const gchar* _prefix); Tag* tag_create_new_child (Tag* self); Tag* tag_create_new_root (void); static gchar* tag_real_to_string (DataObject* base); gint data_collection_get_count (DataCollection* self); -static gboolean tag_real_equals (DataSource* base, DataSource* source); +static gboolean tag_real_equals (DataSource* base, + DataSource* source); static SourceSnapshot* tag_real_save_snapshot (DataSource* base); static TagTagSnapshot* tag_tag_snapshot_new (Tag* tag); -static TagTagSnapshot* tag_tag_snapshot_construct (GType object_type, Tag* tag); +static TagTagSnapshot* tag_tag_snapshot_construct (GType object_type, + Tag* tag); static GType tag_tag_snapshot_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static SourceProxy* tag_real_get_proxy (Proxyable* base); static TagTagProxy* tag_tag_proxy_new (Tag* tag); -static TagTagProxy* tag_tag_proxy_construct (GType object_type, Tag* tag); +static TagTagProxy* tag_tag_proxy_construct (GType object_type, + Tag* tag); static GType tag_tag_proxy_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -Tag* tag_reconstitute (gint64 object_id, TagRow* row); -void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GError** error); +Tag* tag_reconstitute (gint64 object_id, + TagRow* row); +void tag_table_create_from_row (TagTable* self, + TagRow* row, + TagID* result, + GError** error); gchar* data_object_to_string (DataObject* self); static gboolean tag_real_has_links (ContainerSource* base); -gboolean source_collection_has_backlink (SourceCollection* self, SourceBacklink* backlink); +gboolean source_collection_has_backlink (SourceCollection* self, + SourceBacklink* backlink); SourceBacklink* container_source_get_backlink (ContainerSource* self); static SourceBacklink* tag_real_get_backlink (ContainerSource* base); SourceBacklink* source_backlink_new_from_source (DataSource* source); -SourceBacklink* source_backlink_construct_from_source (GType object_type, DataSource* source); -static void tag_real_break_link (ContainerSource* base, DataSource* source); -GeeList* tag_detach (Tag* self, MediaSource* source); -static void tag_real_break_link_many (ContainerSource* base, GeeCollection* sources); -static void tag_real_establish_link (ContainerSource* base, DataSource* source); -void tag_attach (Tag* self, MediaSource* source); -static void tag_real_establish_link_many (ContainerSource* base, GeeCollection* sources); +SourceBacklink* source_backlink_construct_from_source (GType object_type, + DataSource* source); +static void tag_real_break_link (ContainerSource* base, + DataSource* source); +GeeList* tag_detach (Tag* self, + MediaSource* source); +static void tag_real_break_link_many (ContainerSource* base, + GeeCollection* sources); +static void tag_real_establish_link (ContainerSource* base, + DataSource* source); +void tag_attach (Tag* self, + MediaSource* source); +static void tag_real_establish_link_many (ContainerSource* base, + GeeCollection* sources); gchar* indexable_prepare_indexable_string (const gchar* str); static const gchar* tag_real_get_indexable_keywords (Indexable* base); -gboolean view_collection_has_view_for_source (ViewCollection* self, DataSource* source); -DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source); -void data_collection_remove_marked (DataCollection* self, Marker* m); -Marker* data_collection_mark (DataCollection* self, DataObject* object); +gboolean view_collection_has_view_for_source (ViewCollection* self, + DataSource* source); +DataView* view_collection_get_view_for_source (ViewCollection* self, + DataSource* source); +void data_collection_remove_marked (DataCollection* self, + Marker* m); +Marker* data_collection_mark (DataCollection* self, + DataObject* object); Marker* data_collection_start_marking (DataCollection* self); -void marker_mark (Marker* self, DataObject* object); -gboolean tag_rename (Tag* self, const gchar* name); +void marker_mark (Marker* self, + DataObject* object); +gboolean tag_rename (Tag* self, + const gchar* name); GeeCollection* view_collection_get_sources (ViewCollection* self); -void tag_mirror_sources (Tag* self, ViewCollection* view, CreateView mirroring_ctor, void* mirroring_ctor_target); -void view_collection_mirror (ViewCollection* self, ViewCollection* to_mirror, CreateView mirroring_ctor, void* mirroring_ctor_target, CreateViewPredicate should_mirror, void* should_mirror_target); +void tag_mirror_sources (Tag* self, + ViewCollection* view, + CreateView mirroring_ctor, + void* mirroring_ctor_target); +void view_collection_mirror (ViewCollection* self, + ViewCollection* to_mirror, + CreateView mirroring_ctor, + void* mirroring_ctor_target, + CreateViewPredicate should_mirror, + void* should_mirror_target); DataSource* data_view_get_source (DataView* self); gchar* data_source_get_source_id (DataSource* self); -void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection* source_ids, GError** error); +void tag_table_set_tagged_sources (TagTable* self, + TagID* tag_id, + GeeCollection* source_ids, + GError** error); static void tag_real_destroy (DataSource* base); void data_collection_clear (DataCollection* self); void data_source_destroy (DataSource* self); #define TAG_TAG_SNAPSHOT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TAG_TYPE_TAG_SNAPSHOT, TagTagSnapshotPrivate)) -enum { - TAG_TAG_SNAPSHOT_DUMMY_PROPERTY -}; -static void tag_tag_snapshot_on_source_destroyed (TagTagSnapshot* self, DataSource* source); -static void _tag_tag_snapshot_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); +static void tag_tag_snapshot_on_source_destroyed (TagTagSnapshot* self, + DataSource* source); +static void _tag_tag_snapshot_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); SourceSnapshot* source_snapshot_construct (GType object_type); static TagRow* tag_tag_snapshot_get_row (TagTagSnapshot* self); static void tag_tag_snapshot_real_notify_broken (SourceSnapshot* base); @@ -998,51 +1203,72 @@ TagRow* tag_row_new (void); TagRow* tag_row_construct (GType object_type); void source_snapshot_notify_broken (SourceSnapshot* self); static void tag_tag_snapshot_finalize (SourceSnapshot * obj); -enum { - TAG_TAG_PROXY_DUMMY_PROPERTY -}; -SourceProxy* source_proxy_construct (GType object_type, DataSource* source); -static DataSource* tag_tag_proxy_real_reconstitute (SourceProxy* base, gint64 object_id, SourceSnapshot* snapshot); +SourceProxy* source_proxy_construct (GType object_type, + DataSource* source); +static DataSource* tag_tag_proxy_real_reconstitute (SourceProxy* base, + gint64 object_id, + SourceSnapshot* snapshot); static void tag_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -static void _tag_source_collection_on_photo_source_reimported_library_photo_source_collection_source_reimported (LibraryPhotoSourceCollection* _sender, LibraryPhoto* photo, PhotoMetadata* metadata, gpointer self) { +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); + + +static void +_tag_source_collection_on_photo_source_reimported_library_photo_source_collection_source_reimported (LibraryPhotoSourceCollection* _sender, + LibraryPhoto* photo, + PhotoMetadata* metadata, + gpointer self) +{ #line 26 "/home/jens/Source/shotwell/src/Tag.vala" tag_source_collection_on_photo_source_reimported ((TagSourceCollection*) self, photo, metadata); -#line 1015 "Tag.c" +#line 1229 "Tag.c" } -static guint _tag_hash_name_string_gee_hash_data_func (gconstpointer v, gpointer self) { +static guint +_tag_hash_name_string_gee_hash_data_func (gconstpointer v, + gpointer self) +{ guint result; result = tag_hash_name_string ((const gchar*) v); #line 8 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 1024 "Tag.c" +#line 1241 "Tag.c" } -static gboolean _tag_equal_name_strings_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_tag_equal_name_strings_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = tag_equal_name_strings ((const gchar*) a, (const gchar*) b); #line 8 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 1033 "Tag.c" +#line 1254 "Tag.c" } -static gint64 _tag_source_collection_get_tag_key_get_source_database_key (DataSource* source, gpointer self) { +static gint64 +_tag_source_collection_get_tag_key_get_source_database_key (DataSource* source, + gpointer self) +{ gint64 result; result = tag_source_collection_get_tag_key (source); #line 16 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 1042 "Tag.c" +#line 1266 "Tag.c" } -TagSourceCollection* tag_source_collection_construct (GType object_type) { +TagSourceCollection* +tag_source_collection_construct (GType object_type) +{ TagSourceCollection* self = NULL; LibraryPhotoSourceCollection* _tmp0_; VideoSourceCollection* _tmp1_; @@ -1063,419 +1289,410 @@ TagSourceCollection* tag_source_collection_construct (GType object_type) { g_signal_connect (_tmp2_, "source-reimported", (GCallback) _tag_source_collection_on_photo_source_reimported_library_photo_source_collection_source_reimported, self); #line 15 "/home/jens/Source/shotwell/src/Tag.vala" return self; -#line 1067 "Tag.c" +#line 1293 "Tag.c" } -TagSourceCollection* tag_source_collection_new (void) { +TagSourceCollection* +tag_source_collection_new (void) +{ #line 15 "/home/jens/Source/shotwell/src/Tag.vala" return tag_source_collection_construct (TYPE_TAG_SOURCE_COLLECTION); -#line 1074 "Tag.c" +#line 1302 "Tag.c" } -static gboolean tag_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) { +static gboolean +tag_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source) +{ TagSourceCollection * self; gboolean result = FALSE; - DataSource* _tmp0_; #line 29 "/home/jens/Source/shotwell/src/Tag.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_SOURCE_COLLECTION, TagSourceCollection); #line 29 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 30 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = source; -#line 30 "/home/jens/Source/shotwell/src/Tag.vala" - result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_TAG); + result = G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_TAG); #line 30 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 1092 "Tag.c" +#line 1320 "Tag.c" } -static gint64 tag_source_collection_get_tag_key (DataSource* source) { +static gint64 +tag_source_collection_get_tag_key (DataSource* source) +{ gint64 result = 0LL; - DataSource* _tmp0_; - gint64 _tmp1_; #line 33 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL); #line 34 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = source; -#line 34 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TAG, Tag), TYPE_DATA_SOURCE, DataSource)); -#line 34 "/home/jens/Source/shotwell/src/Tag.vala" - result = _tmp1_; + result = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_TAG, Tag), TYPE_DATA_SOURCE, DataSource)); #line 34 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 1110 "Tag.c" +#line 1334 "Tag.c" } -static GeeCollection* tag_source_collection_real_get_containers_holding_source (ContainerSourceCollection* base, DataSource* source) { +static GeeCollection* +tag_source_collection_real_get_containers_holding_source (ContainerSourceCollection* base, + DataSource* source) +{ TagSourceCollection * self; GeeCollection* result = NULL; - DataSource* _tmp0_; - GeeList* _tmp1_; + GeeList* _tmp0_; #line 37 "/home/jens/Source/shotwell/src/Tag.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_SOURCE_COLLECTION, TagSourceCollection); #line 37 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 38 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = source; -#line 38 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = tag_source_collection_fetch_for_source (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp0_ = tag_source_collection_fetch_for_source (self, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource)); #line 38 "/home/jens/Source/shotwell/src/Tag.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 38 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 1131 "Tag.c" +#line 1355 "Tag.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 48 "/home/jens/Source/shotwell/src/Tag.vala" return self ? g_object_ref (self) : NULL; -#line 1138 "Tag.c" +#line 1364 "Tag.c" } -static ContainerSource* tag_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* base, SourceBacklink* backlink) { +static ContainerSource* +tag_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* base, + SourceBacklink* backlink) +{ TagSourceCollection * self; ContainerSource* result = NULL; TagID tag_id = {0}; - SourceBacklink* _tmp0_; + gint64 _tmp0_; gint64 _tmp1_; - gint64 _tmp2_; Tag* _result_ = NULL; Tag* tag = NULL; - TagID _tmp3_; + TagID _tmp2_; + Tag* _tmp3_; Tag* _tmp4_; - Tag* _tmp5_; - Tag* _tmp25_; + Tag* _tmp23_; #line 41 "/home/jens/Source/shotwell/src/Tag.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_SOURCE_COLLECTION, TagSourceCollection); #line 41 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_SOURCE_BACKLINK (backlink), NULL); #line 42 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = backlink; -#line 42 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = source_backlink_get_instance_id (_tmp0_); + _tmp0_ = source_backlink_get_instance_id (backlink); #line 42 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 42 "/home/jens/Source/shotwell/src/Tag.vala" - tag_id_init (&tag_id, _tmp2_); + tag_id_init (&tag_id, _tmp1_); #line 43 "/home/jens/Source/shotwell/src/Tag.vala" _result_ = NULL; #line 46 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = tag_id; + _tmp2_ = tag_id; #line 46 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = tag_source_collection_fetch (self, &_tmp3_); + _tmp3_ = tag_source_collection_fetch (self, &_tmp2_); #line 46 "/home/jens/Source/shotwell/src/Tag.vala" - tag = _tmp4_; + tag = _tmp3_; #line 47 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = tag; + _tmp4_ = tag; #line 47 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp5_ != NULL) { -#line 1179 "Tag.c" + if (_tmp4_ != NULL) { +#line 1405 "Tag.c" + Tag* _tmp5_; Tag* _tmp6_; - Tag* _tmp7_; #line 48 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = tag; + _tmp5_ = tag; #line 48 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = _g_object_ref0 (_tmp6_); + _tmp6_ = _g_object_ref0 (_tmp5_); #line 48 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_result_); #line 48 "/home/jens/Source/shotwell/src/Tag.vala" - _result_ = _tmp7_; -#line 1190 "Tag.c" + _result_ = _tmp6_; +#line 1416 "Tag.c" } else { { GeeIterator* _container_it = NULL; + GeeCollection* _tmp7_; GeeCollection* _tmp8_; - GeeCollection* _tmp9_; + GeeIterator* _tmp9_; GeeIterator* _tmp10_; - GeeIterator* _tmp11_; #line 51 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = container_source_collection_get_holding_tank (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection)); + _tmp7_ = container_source_collection_get_holding_tank (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection)); #line 51 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 51 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); #line 51 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 51 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 51 "/home/jens/Source/shotwell/src/Tag.vala" - _container_it = _tmp11_; + _container_it = _tmp10_; #line 51 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 1212 "Tag.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 1438 "Tag.c" + GeeIterator* _tmp11_; ContainerSource* container = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; - ContainerSource* _tmp16_; - Tag* _tmp17_; - Tag* _tmp18_; - TagID _tmp19_ = {0}; + GeeIterator* _tmp12_; + gpointer _tmp13_; + ContainerSource* _tmp14_; + Tag* _tmp15_; + Tag* _tmp16_; + TagID _tmp17_ = {0}; + gint64 _tmp18_; + TagID _tmp19_; gint64 _tmp20_; - TagID _tmp21_; - gint64 _tmp22_; -#line 51 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = _container_it; #line 51 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = gee_iterator_next (_tmp12_); + _tmp11_ = _container_it; #line 51 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp11_)) { #line 51 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 1233 "Tag.c" +#line 1456 "Tag.c" } #line 51 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = _container_it; + _tmp12_ = _container_it; #line 51 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 51 "/home/jens/Source/shotwell/src/Tag.vala" - container = (ContainerSource*) _tmp15_; + container = (ContainerSource*) _tmp13_; #line 52 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = container; + _tmp14_ = container; #line 52 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_TAG, Tag)); + _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_TAG, Tag)); #line 52 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (tag); #line 52 "/home/jens/Source/shotwell/src/Tag.vala" - tag = _tmp17_; + tag = _tmp15_; #line 53 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = tag; + _tmp16_ = tag; #line 53 "/home/jens/Source/shotwell/src/Tag.vala" - tag_get_tag_id (_tmp18_, &_tmp19_); + tag_get_tag_id (_tmp16_, &_tmp17_); #line 53 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp20_ = _tmp19_.id; + _tmp18_ = _tmp17_.id; #line 53 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp21_ = tag_id; + _tmp19_ = tag_id; #line 53 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp22_ = _tmp21_.id; + _tmp20_ = _tmp19_.id; #line 53 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp20_ == _tmp22_) { -#line 1261 "Tag.c" - Tag* _tmp23_; - Tag* _tmp24_; + if (_tmp18_ == _tmp20_) { +#line 1484 "Tag.c" + Tag* _tmp21_; + Tag* _tmp22_; #line 54 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp23_ = tag; + _tmp21_ = tag; #line 54 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp24_ = _g_object_ref0 (_tmp23_); + _tmp22_ = _g_object_ref0 (_tmp21_); #line 54 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_result_); #line 54 "/home/jens/Source/shotwell/src/Tag.vala" - _result_ = _tmp24_; + _result_ = _tmp22_; #line 55 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (container); #line 55 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 1276 "Tag.c" +#line 1499 "Tag.c" } #line 51 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (container); -#line 1280 "Tag.c" +#line 1503 "Tag.c" } #line 51 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_container_it); -#line 1284 "Tag.c" +#line 1507 "Tag.c" } } #line 63 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp25_ = _result_; + _tmp23_ = _result_; #line 63 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp25_ != NULL) { -#line 1291 "Tag.c" - gboolean _tmp26_ = FALSE; - Tag* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; - gboolean _tmp30_; - gboolean _tmp31_; -#line 64 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp27_ = _result_; + if (_tmp23_ != NULL) { +#line 1514 "Tag.c" + gboolean _tmp24_ = FALSE; + Tag* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + gboolean _tmp28_; #line 64 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp28_ = tag_get_path (_tmp27_); + _tmp25_ = _result_; #line 64 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp29_ = _tmp28_; + _tmp26_ = tag_get_path (_tmp25_); #line 64 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp30_ = g_str_has_prefix (_tmp29_, TAG_PATH_SEPARATOR_STRING); + _tmp27_ = _tmp26_; #line 64 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp31_ = _tmp30_; + _tmp28_ = g_str_has_prefix (_tmp27_, TAG_PATH_SEPARATOR_STRING); #line 64 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp29_); + _g_free0 (_tmp27_); #line 64 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp31_) { -#line 1312 "Tag.c" - Tag* _tmp32_; - gchar* _tmp33_; - gchar* _tmp34_; - GeeList* _tmp35_; - GeeList* _tmp36_; - gint _tmp37_; - gint _tmp38_; + if (_tmp28_) { +#line 1532 "Tag.c" + Tag* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + GeeList* _tmp32_; + GeeList* _tmp33_; + gint _tmp34_; + gint _tmp35_; #line 65 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp32_ = _result_; + _tmp29_ = _result_; #line 65 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp33_ = tag_get_path (_tmp32_); + _tmp30_ = tag_get_path (_tmp29_); #line 65 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp34_ = _tmp33_; + _tmp31_ = _tmp30_; #line 65 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp35_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp34_); + _tmp32_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp31_); #line 65 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp36_ = _tmp35_; + _tmp33_ = _tmp32_; #line 65 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp37_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp34_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection)); #line 65 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp38_ = _tmp37_; + _tmp35_ = _tmp34_; #line 65 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp26_ = _tmp38_ > 0; + _tmp24_ = _tmp35_ > 0; #line 65 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp36_); + _g_object_unref0 (_tmp33_); #line 65 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp34_); -#line 1340 "Tag.c" + _g_free0 (_tmp31_); +#line 1560 "Tag.c" } else { #line 64 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp26_ = FALSE; -#line 1344 "Tag.c" + _tmp24_ = FALSE; +#line 1564 "Tag.c" } #line 64 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp26_) { -#line 1348 "Tag.c" + if (_tmp24_) { +#line 1568 "Tag.c" gchar* top_level_with_prefix_path = NULL; - Tag* _tmp39_; - gchar* _tmp40_; - gchar* _tmp41_; - GeeList* _tmp42_; - GeeList* _tmp43_; - gpointer _tmp44_; - gchar* _tmp45_; + Tag* _tmp36_; + gchar* _tmp37_; + gchar* _tmp38_; + GeeList* _tmp39_; + GeeList* _tmp40_; + gpointer _tmp41_; + gchar* _tmp42_; gchar* top_level_no_prefix_path = NULL; - const gchar* _tmp46_; - gchar* _tmp47_; + const gchar* _tmp43_; + gchar* _tmp44_; #line 66 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp39_ = _result_; + _tmp36_ = _result_; #line 66 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp40_ = tag_get_path (_tmp39_); + _tmp37_ = tag_get_path (_tmp36_); #line 66 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp41_ = _tmp40_; + _tmp38_ = _tmp37_; #line 66 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp42_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp41_); + _tmp39_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp38_); #line 66 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp43_ = _tmp42_; + _tmp40_ = _tmp39_; #line 66 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp44_ = gee_list_get (_tmp43_, 0); + _tmp41_ = gee_list_get (_tmp40_, 0); #line 66 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp45_ = (gchar*) _tmp44_; + _tmp42_ = (gchar*) _tmp41_; #line 66 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp43_); + _g_object_unref0 (_tmp40_); #line 66 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp41_); + _g_free0 (_tmp38_); #line 66 "/home/jens/Source/shotwell/src/Tag.vala" - top_level_with_prefix_path = _tmp45_; + top_level_with_prefix_path = _tmp42_; #line 68 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp46_ = top_level_with_prefix_path; + _tmp43_ = top_level_with_prefix_path; #line 68 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp47_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp46_); + _tmp44_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp43_); #line 68 "/home/jens/Source/shotwell/src/Tag.vala" - top_level_no_prefix_path = _tmp47_; -#line 1386 "Tag.c" + top_level_no_prefix_path = _tmp44_; +#line 1606 "Tag.c" { GeeIterator* _container_it = NULL; - GeeCollection* _tmp48_; - GeeCollection* _tmp49_; - GeeIterator* _tmp50_; - GeeIterator* _tmp51_; + GeeCollection* _tmp45_; + GeeCollection* _tmp46_; + GeeIterator* _tmp47_; + GeeIterator* _tmp48_; #line 71 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp48_ = container_source_collection_get_holding_tank (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection)); + _tmp45_ = container_source_collection_get_holding_tank (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection)); #line 71 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp49_ = _tmp48_; + _tmp46_ = _tmp45_; #line 71 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp50_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp47_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ITERABLE, GeeIterable)); #line 71 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp51_ = _tmp50_; + _tmp48_ = _tmp47_; #line 71 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp49_); + _g_object_unref0 (_tmp46_); #line 71 "/home/jens/Source/shotwell/src/Tag.vala" - _container_it = _tmp51_; + _container_it = _tmp48_; #line 71 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 1407 "Tag.c" - GeeIterator* _tmp52_; - gboolean _tmp53_; +#line 1627 "Tag.c" + GeeIterator* _tmp49_; ContainerSource* container = NULL; - GeeIterator* _tmp54_; - gpointer _tmp55_; + GeeIterator* _tmp50_; + gpointer _tmp51_; Tag* parent_candidate = NULL; - ContainerSource* _tmp56_; - Tag* _tmp57_; - Tag* _tmp58_; - gchar* _tmp59_; - gchar* _tmp60_; - const gchar* _tmp61_; - gboolean _tmp62_; -#line 71 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp52_ = _container_it; + ContainerSource* _tmp52_; + Tag* _tmp53_; + Tag* _tmp54_; + gchar* _tmp55_; + gchar* _tmp56_; + const gchar* _tmp57_; + gboolean _tmp58_; #line 71 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp53_ = gee_iterator_next (_tmp52_); + _tmp49_ = _container_it; #line 71 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp53_) { + if (!gee_iterator_next (_tmp49_)) { #line 71 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 1429 "Tag.c" +#line 1646 "Tag.c" } #line 71 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp54_ = _container_it; + _tmp50_ = _container_it; #line 71 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp55_ = gee_iterator_get (_tmp54_); + _tmp51_ = gee_iterator_get (_tmp50_); #line 71 "/home/jens/Source/shotwell/src/Tag.vala" - container = (ContainerSource*) _tmp55_; + container = (ContainerSource*) _tmp51_; #line 72 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp56_ = container; + _tmp52_ = container; #line 72 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp57_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_TAG, Tag)); + _tmp53_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_TAG, Tag)); #line 72 "/home/jens/Source/shotwell/src/Tag.vala" - parent_candidate = _tmp57_; + parent_candidate = _tmp53_; #line 73 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp58_ = parent_candidate; + _tmp54_ = parent_candidate; #line 73 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp59_ = tag_get_path (_tmp58_); + _tmp55_ = tag_get_path (_tmp54_); #line 73 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp60_ = _tmp59_; + _tmp56_ = _tmp55_; #line 73 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp61_ = top_level_no_prefix_path; + _tmp57_ = top_level_no_prefix_path; #line 73 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp62_ = g_strcmp0 (_tmp60_, _tmp61_) == 0; + _tmp58_ = g_strcmp0 (_tmp56_, _tmp57_) == 0; #line 73 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp60_); + _g_free0 (_tmp56_); #line 73 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp62_) { -#line 1457 "Tag.c" - Tag* _tmp63_; + if (_tmp58_) { +#line 1674 "Tag.c" + Tag* _tmp59_; #line 74 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp63_ = parent_candidate; + _tmp59_ = parent_candidate; #line 74 "/home/jens/Source/shotwell/src/Tag.vala" - tag_promote (_tmp63_); -#line 1463 "Tag.c" + tag_promote (_tmp59_); +#line 1680 "Tag.c" } #line 71 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (parent_candidate); #line 71 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (container); -#line 1469 "Tag.c" +#line 1686 "Tag.c" } #line 71 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_container_it); -#line 1473 "Tag.c" +#line 1690 "Tag.c" } #line 64 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (top_level_no_prefix_path); #line 64 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (top_level_with_prefix_path); -#line 1479 "Tag.c" +#line 1696 "Tag.c" } } #line 79 "/home/jens/Source/shotwell/src/Tag.vala" @@ -1484,11 +1701,14 @@ static ContainerSource* tag_source_collection_real_convert_backlink_to_container _g_object_unref0 (tag); #line 79 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 1488 "Tag.c" +#line 1705 "Tag.c" } -Tag* tag_source_collection_fetch (TagSourceCollection* self, TagID* tag_id) { +Tag* +tag_source_collection_fetch (TagSourceCollection* self, + TagID* tag_id) +{ Tag* result = NULL; TagID _tmp0_; gint64 _tmp1_; @@ -1507,42 +1727,42 @@ Tag* tag_source_collection_fetch (TagSourceCollection* self, TagID* tag_id) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_TAG, Tag); #line 83 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 1511 "Tag.c" +#line 1731 "Tag.c" } -gboolean tag_source_collection_exists (TagSourceCollection* self, const gchar* name, gboolean treat_htags_as_root) { +gboolean +tag_source_collection_exists (TagSourceCollection* self, + const gchar* name, + gboolean treat_htags_as_root) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gboolean _tmp1_; - Tag* _tmp2_; - Tag* _tmp3_; - gboolean _tmp4_; + Tag* _tmp0_; + Tag* _tmp1_; + gboolean _tmp2_; #line 86 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG_SOURCE_COLLECTION (self), FALSE); #line 86 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (name != NULL, FALSE); #line 87 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = name; -#line 87 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = treat_htags_as_root; -#line 87 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = tag_source_collection_fetch_by_name (self, _tmp0_, _tmp1_); + _tmp0_ = tag_source_collection_fetch_by_name (self, name, treat_htags_as_root); #line 87 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 87 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = _tmp3_ != NULL; + _tmp2_ = _tmp1_ != NULL; #line 87 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 87 "/home/jens/Source/shotwell/src/Tag.vala" - result = _tmp4_; + result = _tmp2_; #line 87 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 1542 "Tag.c" +#line 1760 "Tag.c" } -GeeCollection* tag_source_collection_get_all_names (TagSourceCollection* self) { +GeeCollection* +tag_source_collection_get_all_names (TagSourceCollection* self) +{ GeeCollection* result = NULL; GeeHashMap* _tmp0_; GeeSet* _tmp1_; @@ -1559,15 +1779,17 @@ GeeCollection* tag_source_collection_get_all_names (TagSourceCollection* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 91 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 1563 "Tag.c" +#line 1783 "Tag.c" } -GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, MediaSource* source) { +GeeList* +tag_source_collection_fetch_for_source (TagSourceCollection* self, + MediaSource* source) +{ GeeList* result = NULL; GeeHashMap* _tmp0_; - MediaSource* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 98 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG_SOURCE_COLLECTION (self), NULL); #line 98 "/home/jens/Source/shotwell/src/Tag.vala" @@ -1575,22 +1797,22 @@ GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, Medi #line 99 "/home/jens/Source/shotwell/src/Tag.vala" _tmp0_ = self->priv->source_map; #line 99 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = source; -#line 99 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), source); #line 99 "/home/jens/Source/shotwell/src/Tag.vala" - result = (GeeList*) _tmp2_; + result = (GeeList*) _tmp1_; #line 99 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 1586 "Tag.c" +#line 1806 "Tag.c" } -GeeSortedSet* tag_source_collection_fetch_sorted_for_source (TagSourceCollection* self, MediaSource* photo) { +GeeSortedSet* +tag_source_collection_fetch_sorted_for_source (TagSourceCollection* self, + MediaSource* photo) +{ GeeSortedSet* result = NULL; GeeHashMap* _tmp0_; - MediaSource* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 106 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG_SOURCE_COLLECTION (self), NULL); #line 106 "/home/jens/Source/shotwell/src/Tag.vala" @@ -1598,167 +1820,150 @@ GeeSortedSet* tag_source_collection_fetch_sorted_for_source (TagSourceCollection #line 107 "/home/jens/Source/shotwell/src/Tag.vala" _tmp0_ = self->priv->sorted_source_map; #line 107 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = photo; + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo); #line 107 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 107 "/home/jens/Source/shotwell/src/Tag.vala" - result = (GeeSortedSet*) _tmp2_; + result = (GeeSortedSet*) _tmp1_; #line 107 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 1609 "Tag.c" +#line 1829 "Tag.c" } -Tag* tag_source_collection_fetch_by_name (TagSourceCollection* self, const gchar* name, gboolean treat_htags_as_root) { +Tag* +tag_source_collection_fetch_by_name (TagSourceCollection* self, + const gchar* name, + gboolean treat_htags_as_root) +{ Tag* result = NULL; - gboolean _tmp0_; - GeeHashMap* _tmp23_; - const gchar* _tmp24_; - gpointer _tmp25_; + GeeHashMap* _tmp17_; + gpointer _tmp18_; #line 112 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG_SOURCE_COLLECTION (self), NULL); #line 112 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (name != NULL, NULL); #line 113 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = treat_htags_as_root; -#line 113 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp0_) { -#line 1627 "Tag.c" - const gchar* _tmp1_; - gboolean _tmp2_; -#line 114 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = name; -#line 114 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = g_str_has_prefix (_tmp1_, TAG_PATH_SEPARATOR_STRING); + if (treat_htags_as_root) { #line 114 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp2_) { -#line 1636 "Tag.c" - const gchar* _tmp3_; - GeeList* _tmp4_; - GeeList* _tmp5_; - gint _tmp6_; - gint _tmp7_; - gboolean _tmp8_; -#line 115 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = name; + if (g_str_has_prefix (name, TAG_PATH_SEPARATOR_STRING)) { +#line 1849 "Tag.c" + GeeList* _tmp0_; + GeeList* _tmp1_; + gint _tmp2_; + gint _tmp3_; + gboolean _tmp4_; #line 115 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = hierarchical_tag_utilities_enumerate_path_components (_tmp3_); + _tmp0_ = hierarchical_tag_utilities_enumerate_path_components (name); #line 115 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = _tmp4_; + _tmp1_ = _tmp0_; #line 115 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); #line 115 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = _tmp6_; + _tmp3_ = _tmp2_; #line 115 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = _tmp7_ == 1; + _tmp4_ = _tmp3_ == 1; #line 115 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp1_); #line 115 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp8_) { -#line 1659 "Tag.c" + if (_tmp4_) { +#line 1869 "Tag.c" Tag* tag = NULL; - GeeHashMap* _tmp9_; - const gchar* _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; - gpointer _tmp13_; - Tag* _tmp14_; - Tag* _tmp15_; -#line 116 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = self->priv->name_map; + GeeHashMap* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gpointer _tmp8_; + Tag* _tmp9_; + Tag* _tmp10_; #line 116 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = name; + _tmp5_ = self->priv->name_map; #line 116 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp10_); + _tmp6_ = hierarchical_tag_utilities_hierarchical_to_flat (name); #line 116 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = _tmp11_; + _tmp7_ = _tmp6_; #line 116 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_); + _tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_); #line 116 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = (Tag*) _tmp13_; + _tmp9_ = (Tag*) _tmp8_; #line 116 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp7_); #line 116 "/home/jens/Source/shotwell/src/Tag.vala" - tag = _tmp14_; + tag = _tmp9_; #line 117 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = tag; + _tmp10_ = tag; #line 117 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp15_ != NULL) { + if (_tmp10_ != NULL) { #line 118 "/home/jens/Source/shotwell/src/Tag.vala" result = tag; #line 118 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 1692 "Tag.c" +#line 1899 "Tag.c" } #line 115 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (tag); -#line 1696 "Tag.c" +#line 1903 "Tag.c" } } else { Tag* tag = NULL; - GeeHashMap* _tmp16_; - const gchar* _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; - gpointer _tmp20_; - Tag* _tmp21_; - Tag* _tmp22_; -#line 121 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = self->priv->name_map; + GeeHashMap* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gpointer _tmp14_; + Tag* _tmp15_; + Tag* _tmp16_; #line 121 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = name; + _tmp11_ = self->priv->name_map; #line 121 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp17_); + _tmp12_ = hierarchical_tag_utilities_flat_to_hierarchical (name); #line 121 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp19_ = _tmp18_; + _tmp13_ = _tmp12_; #line 121 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp20_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp19_); + _tmp14_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_); #line 121 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp21_ = (Tag*) _tmp20_; + _tmp15_ = (Tag*) _tmp14_; #line 121 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp19_); + _g_free0 (_tmp13_); #line 121 "/home/jens/Source/shotwell/src/Tag.vala" - tag = _tmp21_; + tag = _tmp15_; #line 122 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp22_ = tag; + _tmp16_ = tag; #line 122 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp22_ != NULL) { + if (_tmp16_ != NULL) { #line 123 "/home/jens/Source/shotwell/src/Tag.vala" result = tag; #line 123 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 1731 "Tag.c" +#line 1935 "Tag.c" } #line 114 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (tag); -#line 1735 "Tag.c" +#line 1939 "Tag.c" } } #line 127 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp23_ = self->priv->name_map; -#line 127 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp24_ = name; + _tmp17_ = self->priv->name_map; #line 127 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp25_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_); + _tmp18_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name); #line 127 "/home/jens/Source/shotwell/src/Tag.vala" - result = (Tag*) _tmp25_; + result = (Tag*) _tmp18_; #line 127 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 1748 "Tag.c" +#line 1950 "Tag.c" } -Tag* tag_source_collection_restore_tag_from_holding_tank (TagSourceCollection* self, const gchar* name) { +Tag* +tag_source_collection_restore_tag_from_holding_tank (TagSourceCollection* self, + const gchar* name) +{ Tag* result = NULL; Tag* found = NULL; - Tag* _tmp17_; + Tag* _tmp15_; #line 130 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG_SOURCE_COLLECTION (self), NULL); #line 130 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (name != NULL, NULL); #line 131 "/home/jens/Source/shotwell/src/Tag.vala" found = NULL; -#line 1762 "Tag.c" +#line 1967 "Tag.c" { GeeIterator* _container_it = NULL; GeeCollection* _tmp0_; @@ -1779,367 +1984,345 @@ Tag* tag_source_collection_restore_tag_from_holding_tank (TagSourceCollection* s _container_it = _tmp3_; #line 132 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 1783 "Tag.c" +#line 1988 "Tag.c" GeeIterator* _tmp4_; - gboolean _tmp5_; ContainerSource* container = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; + GeeIterator* _tmp5_; + gpointer _tmp6_; Tag* tag = NULL; - ContainerSource* _tmp8_; + ContainerSource* _tmp7_; + Tag* _tmp8_; Tag* _tmp9_; - Tag* _tmp10_; + gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; - const gchar* _tmp13_; - gboolean _tmp14_; + gboolean _tmp12_; #line 132 "/home/jens/Source/shotwell/src/Tag.vala" _tmp4_ = _container_it; #line 132 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 132 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp4_)) { #line 132 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 1805 "Tag.c" +#line 2006 "Tag.c" } #line 132 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = _container_it; + _tmp5_ = _container_it; #line 132 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 132 "/home/jens/Source/shotwell/src/Tag.vala" - container = (ContainerSource*) _tmp7_; + container = (ContainerSource*) _tmp6_; #line 133 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = container; + _tmp7_ = container; #line 133 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_TAG, Tag)); + _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_TAG, Tag)); #line 133 "/home/jens/Source/shotwell/src/Tag.vala" - tag = _tmp9_; + tag = _tmp8_; #line 134 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = tag; -#line 134 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); + _tmp9_ = tag; #line 134 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = _tmp11_; + _tmp10_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); #line 134 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = name; + _tmp11_ = _tmp10_; #line 134 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = g_strcmp0 (_tmp12_, _tmp13_) == 0; + _tmp12_ = g_strcmp0 (_tmp11_, name) == 0; #line 134 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp11_); #line 134 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp14_) { -#line 1833 "Tag.c" - Tag* _tmp15_; - Tag* _tmp16_; + if (_tmp12_) { +#line 2032 "Tag.c" + Tag* _tmp13_; + Tag* _tmp14_; #line 135 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = tag; + _tmp13_ = tag; #line 135 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = _g_object_ref0 (_tmp15_); + _tmp14_ = _g_object_ref0 (_tmp13_); #line 135 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (found); #line 135 "/home/jens/Source/shotwell/src/Tag.vala" - found = _tmp16_; + found = _tmp14_; #line 137 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (tag); #line 137 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (container); #line 137 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 1850 "Tag.c" +#line 2049 "Tag.c" } #line 132 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (tag); #line 132 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (container); -#line 1856 "Tag.c" +#line 2055 "Tag.c" } #line 132 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_container_it); -#line 1860 "Tag.c" +#line 2059 "Tag.c" } #line 141 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = found; + _tmp15_ = found; #line 141 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp17_ != NULL) { -#line 1866 "Tag.c" + if (_tmp15_ != NULL) { +#line 2065 "Tag.c" gboolean relinked = FALSE; - Tag* _tmp18_; - gboolean _tmp19_; - gboolean _tmp20_; + Tag* _tmp16_; + gboolean _tmp17_; #line 142 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = found; + _tmp16_ = found; #line 142 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp19_ = container_source_collection_relink_from_holding_tank (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_CONTAINER_SOURCE, ContainerSource)); -#line 142 "/home/jens/Source/shotwell/src/Tag.vala" - relinked = _tmp19_; + relinked = container_source_collection_relink_from_holding_tank (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_CONTAINER_SOURCE, ContainerSource)); #line 143 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp20_ = relinked; + _tmp17_ = relinked; #line 143 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (_tmp20_, "relinked"); -#line 1881 "Tag.c" + _vala_assert (_tmp17_, "relinked"); +#line 2077 "Tag.c" } #line 146 "/home/jens/Source/shotwell/src/Tag.vala" result = found; #line 146 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 1887 "Tag.c" +#line 2083 "Tag.c" } -static void tag_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added) { +static void +tag_source_collection_real_notify_items_added (DataCollection* base, + GeeIterable* added) +{ TagSourceCollection * self; - GeeIterable* _tmp18_; #line 149 "/home/jens/Source/shotwell/src/Tag.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_SOURCE_COLLECTION, TagSourceCollection); #line 149 "/home/jens/Source/shotwell/src/Tag.vala" g_return_if_fail (GEE_IS_ITERABLE (added)); -#line 1898 "Tag.c" +#line 2096 "Tag.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 150 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = added; + _tmp0_ = gee_iterable_iterator (added); #line 150 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); -#line 150 "/home/jens/Source/shotwell/src/Tag.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 150 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 1911 "Tag.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 2106 "Tag.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; Tag* tag = NULL; - DataObject* _tmp6_; + DataObject* _tmp4_; + Tag* _tmp5_; + GeeHashMap* _tmp6_; Tag* _tmp7_; - GeeHashMap* _tmp8_; - Tag* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; - gboolean _tmp12_; - GeeHashMap* _tmp13_; + gchar* _tmp8_; + gchar* _tmp9_; + GeeHashMap* _tmp10_; + Tag* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; Tag* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; - Tag* _tmp17_; -#line 150 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = _object_it; #line 150 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 150 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 150 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 1938 "Tag.c" +#line 2129 "Tag.c" } #line 150 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 150 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 150 "/home/jens/Source/shotwell/src/Tag.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 151 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = object; + _tmp4_ = object; #line 151 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_TAG, Tag)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_TAG, Tag)); #line 151 "/home/jens/Source/shotwell/src/Tag.vala" - tag = _tmp7_; + tag = _tmp5_; #line 153 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = self->priv->name_map; -#line 153 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = tag; + _tmp6_ = self->priv->name_map; #line 153 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); + _tmp7_ = tag; #line 153 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = _tmp10_; + _tmp8_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject)); #line 153 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_); + _tmp9_ = _tmp8_; #line 153 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (!_tmp12_, "!name_map.has_key(tag.get_name())"); + _vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_), "!name_map.has_key(tag.get_name())"); #line 153 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp9_); #line 154 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = self->priv->name_map; + _tmp10_ = self->priv->name_map; #line 154 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = tag; + _tmp11_ = tag; #line 154 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); + _tmp12_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject)); #line 154 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = _tmp15_; + _tmp13_ = _tmp12_; #line 154 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = tag; + _tmp14_ = tag; #line 154 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_, _tmp17_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, _tmp14_); #line 154 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp13_); #line 150 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (tag); #line 150 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (object); -#line 1984 "Tag.c" +#line 2173 "Tag.c" } #line 150 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_object_it); -#line 1988 "Tag.c" +#line 2177 "Tag.c" } #line 157 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = added; -#line 157 "/home/jens/Source/shotwell/src/Tag.vala" - DATA_COLLECTION_CLASS (tag_source_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp18_); -#line 1994 "Tag.c" + DATA_COLLECTION_CLASS (tag_source_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), TYPE_DATA_COLLECTION, DataCollection), added); +#line 2181 "Tag.c" } -static void tag_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed) { +static void +tag_source_collection_real_notify_items_removed (DataCollection* base, + GeeIterable* removed) +{ TagSourceCollection * self; - GeeIterable* _tmp29_; #line 160 "/home/jens/Source/shotwell/src/Tag.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_SOURCE_COLLECTION, TagSourceCollection); #line 160 "/home/jens/Source/shotwell/src/Tag.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); -#line 2005 "Tag.c" +#line 2194 "Tag.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 161 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = removed; + _tmp0_ = gee_iterable_iterator (removed); #line 161 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); -#line 161 "/home/jens/Source/shotwell/src/Tag.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 161 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 2018 "Tag.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 2204 "Tag.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; Tag* tag = NULL; - DataObject* _tmp6_; - Tag* _tmp7_; + DataObject* _tmp4_; + Tag* _tmp5_; gboolean unset = FALSE; - GeeHashMap* _tmp8_; - Tag* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; + GeeHashMap* _tmp6_; + Tag* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gboolean _tmp10_; + gboolean _tmp11_; gboolean _tmp12_; - gboolean _tmp13_; - gboolean _tmp14_; Tag* parent = NULL; - Tag* _tmp15_; + Tag* _tmp13_; + Tag* _tmp14_; + gboolean _tmp15_ = FALSE; Tag* _tmp16_; - gboolean _tmp17_ = FALSE; - Tag* _tmp18_; -#line 161 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = _object_it; #line 161 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 161 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 161 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 2048 "Tag.c" +#line 2231 "Tag.c" } #line 161 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 161 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 161 "/home/jens/Source/shotwell/src/Tag.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 162 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = object; + _tmp4_ = object; #line 162 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_TAG, Tag)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_TAG, Tag)); #line 162 "/home/jens/Source/shotwell/src/Tag.vala" - tag = _tmp7_; + tag = _tmp5_; #line 164 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = self->priv->name_map; + _tmp6_ = self->priv->name_map; #line 164 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = tag; + _tmp7_ = tag; #line 164 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); + _tmp8_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject)); #line 164 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 164 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL); + _tmp10_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, NULL); #line 164 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 164 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp9_); #line 164 "/home/jens/Source/shotwell/src/Tag.vala" - unset = _tmp13_; + unset = _tmp11_; #line 165 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = unset; + _tmp12_ = unset; #line 165 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (_tmp14_, "unset"); + _vala_assert (_tmp12_, "unset"); #line 169 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = tag; + _tmp13_ = tag; #line 169 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = tag_get_hierarchical_parent (_tmp15_); + _tmp14_ = tag_get_hierarchical_parent (_tmp13_); #line 169 "/home/jens/Source/shotwell/src/Tag.vala" - parent = _tmp16_; + parent = _tmp14_; #line 170 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = parent; + _tmp16_ = parent; #line 170 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp18_ != NULL) { -#line 2092 "Tag.c" + if (_tmp16_ != NULL) { +#line 2275 "Tag.c" + Tag* _tmp17_; + Tag* _tmp18_; Tag* _tmp19_; - Tag* _tmp20_; - Tag* _tmp21_; #line 170 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp19_ = parent; + _tmp17_ = parent; #line 170 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp20_ = tag_get_hierarchical_parent (_tmp19_); + _tmp18_ = tag_get_hierarchical_parent (_tmp17_); #line 170 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp21_ = _tmp20_; + _tmp19_ = _tmp18_; #line 170 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = _tmp21_ == NULL; + _tmp15_ = _tmp19_ == NULL; #line 170 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp21_); -#line 2106 "Tag.c" + _g_object_unref0 (_tmp19_); +#line 2289 "Tag.c" } else { #line 170 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = FALSE; -#line 2110 "Tag.c" + _tmp15_ = FALSE; +#line 2293 "Tag.c" } #line 170 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp17_) { -#line 2114 "Tag.c" - Tag* _tmp22_; - GeeList* _tmp23_; - GeeList* _tmp24_; - gint _tmp25_; - gint _tmp26_; - gboolean _tmp27_; + if (_tmp15_) { +#line 2297 "Tag.c" + Tag* _tmp20_; + GeeList* _tmp21_; + GeeList* _tmp22_; + gint _tmp23_; + gint _tmp24_; + gboolean _tmp25_; #line 171 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp22_ = parent; + _tmp20_ = parent; #line 171 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp23_ = tag_get_hierarchical_children (_tmp22_); + _tmp21_ = tag_get_hierarchical_children (_tmp20_); #line 171 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp24_ = _tmp23_; + _tmp22_ = _tmp21_; #line 171 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp25_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp23_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection)); #line 171 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp26_ = _tmp25_; + _tmp24_ = _tmp23_; #line 171 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp27_ = _tmp26_ == 0; + _tmp25_ = _tmp24_ == 0; #line 171 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp22_); #line 171 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp27_) { -#line 2137 "Tag.c" - Tag* _tmp28_; + if (_tmp25_) { +#line 2320 "Tag.c" + Tag* _tmp26_; #line 172 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp28_ = parent; + _tmp26_ = parent; #line 172 "/home/jens/Source/shotwell/src/Tag.vala" - tag_flatten (_tmp28_); -#line 2143 "Tag.c" + tag_flatten (_tmp26_); +#line 2326 "Tag.c" } } #line 161 "/home/jens/Source/shotwell/src/Tag.vala" @@ -2148,205 +2331,193 @@ static void tag_source_collection_real_notify_items_removed (DataCollection* bas _g_object_unref0 (tag); #line 161 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (object); -#line 2152 "Tag.c" +#line 2335 "Tag.c" } #line 161 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_object_it); -#line 2156 "Tag.c" +#line 2339 "Tag.c" } #line 176 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp29_ = removed; -#line 176 "/home/jens/Source/shotwell/src/Tag.vala" - DATA_COLLECTION_CLASS (tag_source_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp29_); -#line 2162 "Tag.c" + DATA_COLLECTION_CLASS (tag_source_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), TYPE_DATA_COLLECTION, DataCollection), removed); +#line 2343 "Tag.c" } -static void tag_source_collection_real_notify_items_altered (DataCollection* base, GeeMap* map) { +static void +tag_source_collection_real_notify_items_altered (DataCollection* base, + GeeMap* map) +{ TagSourceCollection * self; - GeeMap* _tmp37_; #line 179 "/home/jens/Source/shotwell/src/Tag.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_SOURCE_COLLECTION, TagSourceCollection); #line 179 "/home/jens/Source/shotwell/src/Tag.vala" g_return_if_fail (GEE_IS_MAP (map)); -#line 2173 "Tag.c" +#line 2356 "Tag.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 180 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = map; + _tmp0_ = gee_map_get_keys (map); #line 180 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 180 "/home/jens/Source/shotwell/src/Tag.vala" _tmp2_ = _tmp1_; #line 180 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = _tmp2_; -#line 180 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 180 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 180 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 180 "/home/jens/Source/shotwell/src/Tag.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 180 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 2200 "Tag.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 2380 "Tag.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp6_; + gpointer _tmp7_; Tag* tag = NULL; - DataObject* _tmp10_; - Tag* _tmp11_; + DataObject* _tmp8_; + Tag* _tmp9_; gchar* old_name = NULL; GeeMapIterator* iter = NULL; - GeeHashMap* _tmp12_; - GeeMapIterator* _tmp13_; + GeeHashMap* _tmp10_; + GeeMapIterator* _tmp11_; + const gchar* _tmp20_; + Tag* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; const gchar* _tmp24_; - Tag* _tmp25_; - gchar* _tmp26_; - gchar* _tmp27_; - const gchar* _tmp28_; - gboolean _tmp29_; -#line 180 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = _object_it; + gboolean _tmp25_; #line 180 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 180 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 180 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 2227 "Tag.c" +#line 2404 "Tag.c" } #line 180 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 180 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 180 "/home/jens/Source/shotwell/src/Tag.vala" - object = (DataObject*) _tmp9_; + object = (DataObject*) _tmp7_; #line 181 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = object; + _tmp8_ = object; #line 181 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_TAG, Tag)); + _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_TAG, Tag)); #line 181 "/home/jens/Source/shotwell/src/Tag.vala" - tag = _tmp11_; + tag = _tmp9_; #line 183 "/home/jens/Source/shotwell/src/Tag.vala" old_name = NULL; #line 186 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = self->priv->name_map; + _tmp10_ = self->priv->name_map; #line 186 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp11_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 186 "/home/jens/Source/shotwell/src/Tag.vala" - iter = _tmp13_; + iter = _tmp11_; #line 187 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 2251 "Tag.c" - GeeMapIterator* _tmp14_; - gboolean _tmp15_; - GeeMapIterator* _tmp16_; - gpointer _tmp17_; - Tag* _tmp18_; - Tag* _tmp19_; - gboolean _tmp20_; - gboolean _tmp21_; - GeeMapIterator* _tmp22_; - gpointer _tmp23_; -#line 187 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = iter; +#line 2428 "Tag.c" + GeeMapIterator* _tmp12_; + GeeMapIterator* _tmp13_; + gpointer _tmp14_; + Tag* _tmp15_; + Tag* _tmp16_; + gboolean _tmp17_; + GeeMapIterator* _tmp18_; + gpointer _tmp19_; #line 187 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = gee_map_iterator_next (_tmp14_); + _tmp12_ = iter; #line 187 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp15_) { + if (!gee_map_iterator_next (_tmp12_)) { #line 187 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 2270 "Tag.c" +#line 2443 "Tag.c" } #line 188 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = iter; + _tmp13_ = iter; #line 188 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = gee_map_iterator_get_value (_tmp16_); + _tmp14_ = gee_map_iterator_get_value (_tmp13_); #line 188 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = (Tag*) _tmp17_; + _tmp15_ = (Tag*) _tmp14_; #line 188 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp19_ = tag; -#line 188 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp20_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_SOURCE, DataSource)); + _tmp16_ = tag; #line 188 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp21_ = !_tmp20_; + _tmp17_ = !data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource)); #line 188 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp15_); #line 188 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp21_) { + if (_tmp17_) { #line 189 "/home/jens/Source/shotwell/src/Tag.vala" continue; -#line 2290 "Tag.c" +#line 2461 "Tag.c" } #line 191 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp22_ = iter; + _tmp18_ = iter; #line 191 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp23_ = gee_map_iterator_get_key (_tmp22_); + _tmp19_ = gee_map_iterator_get_key (_tmp18_); #line 191 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (old_name); #line 191 "/home/jens/Source/shotwell/src/Tag.vala" - old_name = (gchar*) _tmp23_; + old_name = (gchar*) _tmp19_; #line 193 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 2302 "Tag.c" +#line 2473 "Tag.c" } #line 196 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp24_ = old_name; + _tmp20_ = old_name; #line 196 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (_tmp24_ != NULL, "old_name != null"); + _vala_assert (_tmp20_ != NULL, "old_name != null"); #line 198 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp25_ = tag; + _tmp21_ = tag; #line 198 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp26_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject)); + _tmp22_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_OBJECT, DataObject)); #line 198 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp27_ = _tmp26_; + _tmp23_ = _tmp22_; #line 198 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp28_ = old_name; + _tmp24_ = old_name; #line 198 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp29_ = g_strcmp0 (_tmp27_, _tmp28_) != 0; + _tmp25_ = g_strcmp0 (_tmp23_, _tmp24_) != 0; #line 198 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp27_); + _g_free0 (_tmp23_); #line 198 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp29_) { -#line 2322 "Tag.c" - GeeHashMap* _tmp30_; - const gchar* _tmp31_; - GeeHashMap* _tmp32_; - Tag* _tmp33_; - gchar* _tmp34_; - gchar* _tmp35_; - Tag* _tmp36_; + if (_tmp25_) { +#line 2493 "Tag.c" + GeeHashMap* _tmp26_; + const gchar* _tmp27_; + GeeHashMap* _tmp28_; + Tag* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + Tag* _tmp32_; #line 199 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp30_ = self->priv->name_map; + _tmp26_ = self->priv->name_map; #line 199 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp31_ = old_name; + _tmp27_ = old_name; #line 199 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp31_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_, NULL); #line 200 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp32_ = self->priv->name_map; + _tmp28_ = self->priv->name_map; #line 200 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp33_ = tag; + _tmp29_ = tag; #line 200 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp34_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_OBJECT, DataObject)); + _tmp30_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject)); #line 200 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp35_ = _tmp34_; + _tmp31_ = _tmp30_; #line 200 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp36_ = tag; + _tmp32_ = tag; #line 200 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp35_, _tmp36_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp31_, _tmp32_); #line 200 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp35_); -#line 2350 "Tag.c" + _g_free0 (_tmp31_); +#line 2521 "Tag.c" } #line 180 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (iter); @@ -2356,40 +2527,42 @@ static void tag_source_collection_real_notify_items_altered (DataCollection* bas _g_object_unref0 (tag); #line 180 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (object); -#line 2360 "Tag.c" +#line 2531 "Tag.c" } #line 180 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_object_it); -#line 2364 "Tag.c" +#line 2535 "Tag.c" } #line 204 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp37_ = map; -#line 204 "/home/jens/Source/shotwell/src/Tag.vala" - DATA_COLLECTION_CLASS (tag_source_collection_parent_class)->notify_items_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp37_); -#line 2370 "Tag.c" + DATA_COLLECTION_CLASS (tag_source_collection_parent_class)->notify_items_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), TYPE_DATA_COLLECTION, DataCollection), map); +#line 2539 "Tag.c" } -static gint _tag_compare_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gint +_tag_compare_names_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gint result; result = tag_compare_names ((Tag*) a, (Tag*) b); #line 224 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 2379 "Tag.c" +#line 2552 "Tag.c" } -static void tag_source_collection_real_notify_container_contents_added (ContainerSourceCollection* base, ContainerSource* container, GeeCollection* added, gboolean relinking) { +static void +tag_source_collection_real_notify_container_contents_added (ContainerSourceCollection* base, + ContainerSource* container, + GeeCollection* added, + gboolean relinking) +{ TagSourceCollection * self; Tag* tag = NULL; - ContainerSource* _tmp0_; - Tag* _tmp1_; + Tag* _tmp0_; GeeCollection* sources = NULL; - GeeCollection* _tmp2_; - GeeCollection* _tmp3_; - ContainerSource* _tmp34_; - GeeCollection* _tmp35_; - gboolean _tmp36_; + GeeCollection* _tmp1_; #line 207 "/home/jens/Source/shotwell/src/Tag.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_SOURCE_COLLECTION, TagSourceCollection); #line 207 "/home/jens/Source/shotwell/src/Tag.vala" @@ -2397,200 +2570,181 @@ static void tag_source_collection_real_notify_container_contents_added (Containe #line 207 "/home/jens/Source/shotwell/src/Tag.vala" g_return_if_fail (GEE_IS_COLLECTION (added)); #line 209 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = container; -#line 209 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TAG, Tag)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (container, TYPE_TAG, Tag)); #line 209 "/home/jens/Source/shotwell/src/Tag.vala" - tag = _tmp1_; -#line 210 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = added; + tag = _tmp0_; #line 210 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_COLLECTION, GeeCollection)); #line 210 "/home/jens/Source/shotwell/src/Tag.vala" - sources = _tmp3_; -#line 2412 "Tag.c" + sources = _tmp1_; +#line 2581 "Tag.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp4_; - GeeIterator* _tmp5_; + GeeCollection* _tmp2_; + GeeIterator* _tmp3_; #line 212 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = sources; + _tmp2_ = sources; #line 212 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 212 "/home/jens/Source/shotwell/src/Tag.vala" - _source_it = _tmp5_; + _source_it = _tmp3_; #line 212 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 2425 "Tag.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 2594 "Tag.c" + GeeIterator* _tmp4_; MediaSource* source = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp5_; + gpointer _tmp6_; GeeList* tags = NULL; - GeeHashMap* _tmp10_; - MediaSource* _tmp11_; - gpointer _tmp12_; - GeeList* _tmp13_; + GeeHashMap* _tmp7_; + MediaSource* _tmp8_; + gpointer _tmp9_; + GeeList* _tmp10_; gboolean is_added = FALSE; - GeeList* _tmp18_; - Tag* _tmp19_; - gboolean _tmp20_; - gboolean _tmp21_; + GeeList* _tmp15_; + Tag* _tmp16_; + gboolean _tmp17_; GeeSortedSet* sorted_tags = NULL; - GeeHashMap* _tmp22_; - MediaSource* _tmp23_; - gpointer _tmp24_; - GeeSortedSet* _tmp25_; - GeeSortedSet* _tmp30_; - Tag* _tmp31_; - gboolean _tmp32_; - gboolean _tmp33_; -#line 212 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = _source_it; + GeeHashMap* _tmp18_; + MediaSource* _tmp19_; + gpointer _tmp20_; + GeeSortedSet* _tmp21_; + GeeSortedSet* _tmp26_; + Tag* _tmp27_; + gboolean _tmp28_; #line 212 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp4_ = _source_it; #line 212 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp4_)) { #line 212 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 2458 "Tag.c" +#line 2622 "Tag.c" } #line 212 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = _source_it; + _tmp5_ = _source_it; #line 212 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 212 "/home/jens/Source/shotwell/src/Tag.vala" - source = (MediaSource*) _tmp9_; + source = (MediaSource*) _tmp6_; #line 213 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = self->priv->source_map; + _tmp7_ = self->priv->source_map; #line 213 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = source; + _tmp8_ = source; #line 213 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_); + _tmp9_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_); #line 213 "/home/jens/Source/shotwell/src/Tag.vala" - tags = (GeeList*) _tmp12_; + tags = (GeeList*) _tmp9_; #line 214 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = tags; + _tmp10_ = tags; #line 214 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp13_ == NULL) { -#line 2478 "Tag.c" - GeeArrayList* _tmp14_; - GeeHashMap* _tmp15_; - MediaSource* _tmp16_; - GeeList* _tmp17_; + if (_tmp10_ == NULL) { +#line 2642 "Tag.c" + GeeArrayList* _tmp11_; + GeeHashMap* _tmp12_; + MediaSource* _tmp13_; + GeeList* _tmp14_; #line 215 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp11_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 215 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (tags); #line 215 "/home/jens/Source/shotwell/src/Tag.vala" - tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_LIST, GeeList); + tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_LIST, GeeList); #line 216 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = self->priv->source_map; + _tmp12_ = self->priv->source_map; #line 216 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = source; + _tmp13_ = source; #line 216 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = tags; + _tmp14_ = tags; #line 216 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_, _tmp17_); -#line 2497 "Tag.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, _tmp14_); +#line 2661 "Tag.c" } #line 219 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = tags; + _tmp15_ = tags; #line 219 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp19_ = tag; -#line 219 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp20_ = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_); + _tmp16_ = tag; #line 219 "/home/jens/Source/shotwell/src/Tag.vala" - is_added = _tmp20_; + is_added = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection), _tmp16_); #line 220 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp21_ = is_added; + _tmp17_ = is_added; #line 220 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (_tmp21_, "is_added"); + _vala_assert (_tmp17_, "is_added"); #line 222 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp22_ = self->priv->sorted_source_map; + _tmp18_ = self->priv->sorted_source_map; #line 222 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp23_ = source; + _tmp19_ = source; #line 222 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp24_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp23_); + _tmp20_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp19_); #line 222 "/home/jens/Source/shotwell/src/Tag.vala" - sorted_tags = (GeeSortedSet*) _tmp24_; + sorted_tags = (GeeSortedSet*) _tmp20_; #line 223 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp25_ = sorted_tags; + _tmp21_ = sorted_tags; #line 223 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp25_ == NULL) { -#line 2523 "Tag.c" - GeeTreeSet* _tmp26_; - GeeHashMap* _tmp27_; - MediaSource* _tmp28_; - GeeSortedSet* _tmp29_; + if (_tmp21_ == NULL) { +#line 2685 "Tag.c" + GeeTreeSet* _tmp22_; + GeeHashMap* _tmp23_; + MediaSource* _tmp24_; + GeeSortedSet* _tmp25_; #line 224 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp26_ = gee_tree_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tag_compare_names_gcompare_data_func, NULL, NULL); + _tmp22_ = gee_tree_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tag_compare_names_gcompare_data_func, NULL, NULL); #line 224 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (sorted_tags); #line 224 "/home/jens/Source/shotwell/src/Tag.vala" - sorted_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_SORTED_SET, GeeSortedSet); + sorted_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_SORTED_SET, GeeSortedSet); #line 225 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp27_ = self->priv->sorted_source_map; + _tmp23_ = self->priv->sorted_source_map; #line 225 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp28_ = source; + _tmp24_ = source; #line 225 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp29_ = sorted_tags; + _tmp25_ = sorted_tags; #line 225 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp28_, _tmp29_); -#line 2542 "Tag.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_, _tmp25_); +#line 2704 "Tag.c" } #line 228 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp30_ = sorted_tags; -#line 228 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp31_ = tag; + _tmp26_ = sorted_tags; #line 228 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp32_ = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), _tmp31_); + _tmp27_ = tag; #line 228 "/home/jens/Source/shotwell/src/Tag.vala" - is_added = _tmp32_; + is_added = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_); #line 229 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp33_ = is_added; + _tmp28_ = is_added; #line 229 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (_tmp33_, "is_added"); + _vala_assert (_tmp28_, "is_added"); #line 212 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (sorted_tags); #line 212 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (tags); #line 212 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (source); -#line 2562 "Tag.c" +#line 2722 "Tag.c" } #line 212 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_source_it); -#line 2566 "Tag.c" +#line 2726 "Tag.c" } #line 232 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp34_ = container; -#line 232 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp35_ = added; -#line 232 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp36_ = relinking; -#line 232 "/home/jens/Source/shotwell/src/Tag.vala" - CONTAINER_SOURCE_COLLECTION_CLASS (tag_source_collection_parent_class)->notify_container_contents_added (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), _tmp34_, _tmp35_, _tmp36_); + CONTAINER_SOURCE_COLLECTION_CLASS (tag_source_collection_parent_class)->notify_container_contents_added (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), container, added, relinking); #line 207 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (sources); #line 207 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (tag); -#line 2580 "Tag.c" +#line 2734 "Tag.c" } -static void tag_source_collection_real_notify_container_contents_removed (ContainerSourceCollection* base, ContainerSource* container, GeeCollection* removed, gboolean unlinking) { +static void +tag_source_collection_real_notify_container_contents_removed (ContainerSourceCollection* base, + ContainerSource* container, + GeeCollection* removed, + gboolean unlinking) +{ TagSourceCollection * self; Tag* tag = NULL; - ContainerSource* _tmp0_; - Tag* _tmp1_; + Tag* _tmp0_; GeeCollection* sources = NULL; - GeeCollection* _tmp2_; - GeeCollection* _tmp3_; - ContainerSource* _tmp36_; - GeeCollection* _tmp37_; - gboolean _tmp38_; + GeeCollection* _tmp1_; #line 235 "/home/jens/Source/shotwell/src/Tag.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_SOURCE_COLLECTION, TagSourceCollection); #line 235 "/home/jens/Source/shotwell/src/Tag.vala" @@ -2598,162 +2752,149 @@ static void tag_source_collection_real_notify_container_contents_removed (Contai #line 235 "/home/jens/Source/shotwell/src/Tag.vala" g_return_if_fail (GEE_IS_COLLECTION (removed)); #line 237 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = container; -#line 237 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TAG, Tag)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (container, TYPE_TAG, Tag)); #line 237 "/home/jens/Source/shotwell/src/Tag.vala" - tag = _tmp1_; -#line 238 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = removed; + tag = _tmp0_; #line 238 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_COLLECTION, GeeCollection)); #line 238 "/home/jens/Source/shotwell/src/Tag.vala" - sources = _tmp3_; -#line 2613 "Tag.c" + sources = _tmp1_; +#line 2763 "Tag.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp4_; - GeeIterator* _tmp5_; + GeeCollection* _tmp2_; + GeeIterator* _tmp3_; #line 240 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = sources; + _tmp2_ = sources; #line 240 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 240 "/home/jens/Source/shotwell/src/Tag.vala" - _source_it = _tmp5_; + _source_it = _tmp3_; #line 240 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 2626 "Tag.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 2776 "Tag.c" + GeeIterator* _tmp4_; MediaSource* source = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp5_; + gpointer _tmp6_; GeeList* tags = NULL; - GeeHashMap* _tmp10_; - MediaSource* _tmp11_; - gpointer _tmp12_; - GeeList* _tmp13_; + GeeHashMap* _tmp7_; + MediaSource* _tmp8_; + gpointer _tmp9_; + GeeList* _tmp10_; gboolean is_removed = FALSE; + GeeList* _tmp11_; + Tag* _tmp12_; + gboolean _tmp13_; GeeList* _tmp14_; - Tag* _tmp15_; - gboolean _tmp16_; - gboolean _tmp17_; - GeeList* _tmp18_; - gint _tmp19_; - gint _tmp20_; + gint _tmp15_; + gint _tmp16_; GeeSortedSet* sorted_tags = NULL; - GeeHashMap* _tmp23_; - MediaSource* _tmp24_; - gpointer _tmp25_; + GeeHashMap* _tmp19_; + MediaSource* _tmp20_; + gpointer _tmp21_; + GeeSortedSet* _tmp22_; + GeeSortedSet* _tmp23_; + Tag* _tmp24_; + gboolean _tmp25_; GeeSortedSet* _tmp26_; - GeeSortedSet* _tmp27_; - Tag* _tmp28_; - gboolean _tmp29_; - gboolean _tmp30_; - GeeSortedSet* _tmp31_; - gint _tmp32_; - gint _tmp33_; + gint _tmp27_; + gint _tmp28_; #line 240 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = _source_it; -#line 240 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp4_ = _source_it; #line 240 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp4_)) { #line 240 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 2665 "Tag.c" +#line 2810 "Tag.c" } #line 240 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = _source_it; + _tmp5_ = _source_it; #line 240 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 240 "/home/jens/Source/shotwell/src/Tag.vala" - source = (MediaSource*) _tmp9_; + source = (MediaSource*) _tmp6_; #line 241 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = self->priv->source_map; + _tmp7_ = self->priv->source_map; #line 241 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = source; + _tmp8_ = source; #line 241 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_); + _tmp9_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_); #line 241 "/home/jens/Source/shotwell/src/Tag.vala" - tags = (GeeList*) _tmp12_; + tags = (GeeList*) _tmp9_; #line 242 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = tags; + _tmp10_ = tags; #line 242 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (_tmp13_ != NULL, "tags != null"); -#line 244 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = tags; + _vala_assert (_tmp10_ != NULL, "tags != null"); #line 244 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = tag; + _tmp11_ = tags; #line 244 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_); + _tmp12_ = tag; #line 244 "/home/jens/Source/shotwell/src/Tag.vala" - is_removed = _tmp16_; + is_removed = gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection), _tmp12_); #line 245 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = is_removed; + _tmp13_ = is_removed; #line 245 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (_tmp17_, "is_removed"); + _vala_assert (_tmp13_, "is_removed"); #line 247 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = tags; + _tmp14_ = tags; #line 247 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp15_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection)); #line 247 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp20_ = _tmp19_; + _tmp16_ = _tmp15_; #line 247 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp20_ == 0) { -#line 2705 "Tag.c" - GeeHashMap* _tmp21_; - MediaSource* _tmp22_; + if (_tmp16_ == 0) { +#line 2848 "Tag.c" + GeeHashMap* _tmp17_; + MediaSource* _tmp18_; #line 248 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp21_ = self->priv->source_map; + _tmp17_ = self->priv->source_map; #line 248 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp22_ = source; + _tmp18_ = source; #line 248 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, NULL); -#line 2714 "Tag.c" + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp18_, NULL); +#line 2857 "Tag.c" } #line 250 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp23_ = self->priv->sorted_source_map; + _tmp19_ = self->priv->sorted_source_map; #line 250 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp24_ = source; + _tmp20_ = source; #line 250 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp25_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_); + _tmp21_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_); #line 250 "/home/jens/Source/shotwell/src/Tag.vala" - sorted_tags = (GeeSortedSet*) _tmp25_; + sorted_tags = (GeeSortedSet*) _tmp21_; #line 251 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp26_ = sorted_tags; + _tmp22_ = sorted_tags; #line 251 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (_tmp26_ != NULL, "sorted_tags != null"); + _vala_assert (_tmp22_ != NULL, "sorted_tags != null"); #line 253 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp27_ = sorted_tags; + _tmp23_ = sorted_tags; #line 253 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp28_ = tag; + _tmp24_ = tag; #line 253 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp29_ = gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_); -#line 253 "/home/jens/Source/shotwell/src/Tag.vala" - is_removed = _tmp29_; + is_removed = gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection), _tmp24_); #line 254 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp30_ = is_removed; + _tmp25_ = is_removed; #line 254 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (_tmp30_, "is_removed"); + _vala_assert (_tmp25_, "is_removed"); #line 256 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp31_ = sorted_tags; + _tmp26_ = sorted_tags; #line 256 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp32_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp27_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection)); #line 256 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp33_ = _tmp32_; + _tmp28_ = _tmp27_; #line 256 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp33_ == 0) { -#line 2748 "Tag.c" - GeeHashMap* _tmp34_; - MediaSource* _tmp35_; + if (_tmp28_ == 0) { +#line 2889 "Tag.c" + GeeHashMap* _tmp29_; + MediaSource* _tmp30_; #line 257 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp34_ = self->priv->sorted_source_map; + _tmp29_ = self->priv->sorted_source_map; #line 257 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp35_ = source; + _tmp30_ = source; #line 257 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp35_, NULL); -#line 2757 "Tag.c" + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp30_, NULL); +#line 2898 "Tag.c" } #line 240 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (sorted_tags); @@ -2761,40 +2902,40 @@ static void tag_source_collection_real_notify_container_contents_removed (Contai _g_object_unref0 (tags); #line 240 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (source); -#line 2765 "Tag.c" +#line 2906 "Tag.c" } #line 240 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_source_it); -#line 2769 "Tag.c" +#line 2910 "Tag.c" } #line 260 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp36_ = container; -#line 260 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp37_ = removed; -#line 260 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp38_ = unlinking; -#line 260 "/home/jens/Source/shotwell/src/Tag.vala" - CONTAINER_SOURCE_COLLECTION_CLASS (tag_source_collection_parent_class)->notify_container_contents_removed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), _tmp36_, _tmp37_, _tmp38_); + CONTAINER_SOURCE_COLLECTION_CLASS (tag_source_collection_parent_class)->notify_container_contents_removed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), container, removed, unlinking); #line 235 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (sources); #line 235 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (tag); -#line 2783 "Tag.c" +#line 2918 "Tag.c" } -static void tag_source_collection_on_photo_source_reimported (TagSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { +static void +tag_source_collection_on_photo_source_reimported (TagSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 263 "/home/jens/Source/shotwell/src/Tag.vala" g_return_if_fail (IS_TAG_SOURCE_COLLECTION (self)); #line 263 "/home/jens/Source/shotwell/src/Tag.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 263 "/home/jens/Source/shotwell/src/Tag.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 2794 "Tag.c" +#line 2933 "Tag.c" } -static void tag_source_collection_class_init (TagSourceCollectionClass * klass) { +static void +tag_source_collection_class_init (TagSourceCollectionClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/Tag.vala" tag_source_collection_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/Tag.vala" @@ -2817,11 +2958,13 @@ static void tag_source_collection_class_init (TagSourceCollectionClass * klass) ((ContainerSourceCollectionClass *) klass)->notify_container_contents_added = (void (*) (ContainerSourceCollection *, ContainerSource*, GeeCollection*, gboolean)) tag_source_collection_real_notify_container_contents_added; #line 7 "/home/jens/Source/shotwell/src/Tag.vala" ((ContainerSourceCollectionClass *) klass)->notify_container_contents_removed = (void (*) (ContainerSourceCollection *, ContainerSource*, GeeCollection*, gboolean)) tag_source_collection_real_notify_container_contents_removed; -#line 2821 "Tag.c" +#line 2962 "Tag.c" } -static void tag_source_collection_instance_init (TagSourceCollection * self) { +static void +tag_source_collection_instance_init (TagSourceCollection * self) +{ GeeHashMap* _tmp0_; GeeHashMap* _tmp1_; GeeHashMap* _tmp2_; @@ -2839,11 +2982,13 @@ static void tag_source_collection_instance_init (TagSourceCollection * self) { _tmp2_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GEE_TYPE_SORTED_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 12 "/home/jens/Source/shotwell/src/Tag.vala" self->priv->sorted_source_map = _tmp2_; -#line 2843 "Tag.c" +#line 2986 "Tag.c" } -static void tag_source_collection_finalize (DataCollection * obj) { +static void +tag_source_collection_finalize (DataCollection * obj) +{ TagSourceCollection * self; LibraryPhotoSourceCollection* _tmp0_; guint _tmp1_; @@ -2863,11 +3008,13 @@ static void tag_source_collection_finalize (DataCollection * obj) { _g_object_unref0 (self->priv->sorted_source_map); #line 7 "/home/jens/Source/shotwell/src/Tag.vala" DATA_COLLECTION_CLASS (tag_source_collection_parent_class)->finalize (obj); -#line 2867 "Tag.c" +#line 3012 "Tag.c" } -GType tag_source_collection_get_type (void) { +GType +tag_source_collection_get_type (void) +{ static volatile gsize tag_source_collection_type_id__volatile = 0; if (g_once_init_enter (&tag_source_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TagSourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tag_source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TagSourceCollection), 0, (GInstanceInitFunc) tag_source_collection_instance_init, NULL }; @@ -2879,291 +3026,294 @@ GType tag_source_collection_get_type (void) { } -static void _tag_on_media_views_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { +static void +_tag_on_media_views_contents_altered_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self) +{ #line 382 "/home/jens/Source/shotwell/src/Tag.vala" tag_on_media_views_contents_altered ((Tag*) self, added, removed); -#line 2886 "Tag.c" +#line 3038 "Tag.c" } -static void _tag_on_sources_destroyed_source_collection_items_destroyed (SourceCollection* _sender, GeeCollection* destroyed, gpointer self) { +static void +_tag_on_sources_destroyed_source_collection_items_destroyed (SourceCollection* _sender, + GeeCollection* destroyed, + gpointer self) +{ #line 383 "/home/jens/Source/shotwell/src/Tag.vala" tag_on_sources_destroyed ((Tag*) self, destroyed); -#line 2893 "Tag.c" +#line 3049 "Tag.c" } -static gpointer _tag_row_ref0 (gpointer self) { +static gpointer +_tag_row_ref0 (gpointer self) +{ #line 335 "/home/jens/Source/shotwell/src/Tag.vala" return self ? tag_row_ref (self) : NULL; -#line 2900 "Tag.c" +#line 3058 "Tag.c" } -static Tag* tag_construct (GType object_type, TagRow* row, gint64 object_id) { +static Tag* +tag_construct (GType object_type, + TagRow* row, + gint64 object_id) +{ Tag * self = NULL; - gint64 _tmp0_; + TagRow* _tmp0_; TagRow* _tmp1_; TagRow* _tmp2_; - TagRow* _tmp3_; - TagRow* _tmp4_; - const gchar* _tmp5_; - gchar* _tmp6_; + const gchar* _tmp3_; + gchar* _tmp4_; GeeArrayList* source_list = NULL; - GeeArrayList* _tmp7_; + GeeArrayList* _tmp5_; GeeArrayList* thumbnail_views = NULL; - GeeArrayList* _tmp8_; - TagRow* _tmp9_; - GeeSet* _tmp10_; - TagRow* _tmp32_; - TagID _tmp33_; - gint64 _tmp34_; - gchar* _tmp35_; - gchar* _tmp36_; - gchar* _tmp37_; - gchar* _tmp38_; - ViewCollection* _tmp39_; - ViewCollection* _tmp40_; - GeeArrayList* _tmp41_; - GeeCollection* _tmp42_; - GeeCollection* _tmp43_; - GeeArrayList* _tmp44_; - gint _tmp45_; - gint _tmp46_; - ViewCollection* _tmp51_; - LibraryPhotoSourceCollection* _tmp52_; - VideoSourceCollection* _tmp53_; + GeeArrayList* _tmp6_; + TagRow* _tmp7_; + GeeSet* _tmp8_; + TagID _tmp29_; + gint64 _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; + gchar* _tmp34_; + ViewCollection* _tmp35_; + ViewCollection* _tmp36_; + GeeArrayList* _tmp37_; + GeeCollection* _tmp38_; + GeeCollection* _tmp39_; + GeeArrayList* _tmp40_; + gint _tmp41_; + gint _tmp42_; + ViewCollection* _tmp47_; + LibraryPhotoSourceCollection* _tmp48_; + VideoSourceCollection* _tmp49_; #line 332 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG_ROW (row), NULL); #line 333 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = object_id; -#line 333 "/home/jens/Source/shotwell/src/Tag.vala" - self = (Tag*) data_source_construct (object_type, _tmp0_); -#line 335 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = row; + self = (Tag*) data_source_construct (object_type, object_id); #line 335 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = _tag_row_ref0 (_tmp1_); + _tmp0_ = _tag_row_ref0 (row); #line 335 "/home/jens/Source/shotwell/src/Tag.vala" _tag_row_unref0 (self->priv->row); #line 335 "/home/jens/Source/shotwell/src/Tag.vala" - self->priv->row = _tmp2_; + self->priv->row = _tmp0_; #line 338 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = self->priv->row; + _tmp1_ = self->priv->row; #line 338 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = self->priv->row; + _tmp2_ = self->priv->row; #line 338 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = _tmp4_->name; + _tmp3_ = _tmp2_->name; #line 338 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = tag_prep_tag_name (_tmp5_); + _tmp4_ = tag_prep_tag_name (_tmp3_); #line 338 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp3_->name); + _g_free0 (_tmp1_->name); #line 338 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_->name = _tmp6_; + _tmp1_->name = _tmp4_; #line 341 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp5_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 341 "/home/jens/Source/shotwell/src/Tag.vala" - source_list = _tmp7_; + source_list = _tmp5_; #line 342 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp6_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 342 "/home/jens/Source/shotwell/src/Tag.vala" - thumbnail_views = _tmp8_; + thumbnail_views = _tmp6_; #line 343 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = self->priv->row; + _tmp7_ = self->priv->row; #line 343 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = _tmp9_->source_id_list; + _tmp8_ = _tmp7_->source_id_list; #line 343 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp10_ != NULL) { -#line 2977 "Tag.c" + if (_tmp8_ != NULL) { +#line 3132 "Tag.c" { GeeIterator* _source_id_it = NULL; - TagRow* _tmp11_; - GeeSet* _tmp12_; - GeeIterator* _tmp13_; + TagRow* _tmp9_; + GeeSet* _tmp10_; + GeeIterator* _tmp11_; #line 344 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = self->priv->row; + _tmp9_ = self->priv->row; #line 344 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = _tmp11_->source_id_list; + _tmp10_ = _tmp9_->source_id_list; #line 344 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); #line 344 "/home/jens/Source/shotwell/src/Tag.vala" - _source_id_it = _tmp13_; + _source_id_it = _tmp11_; #line 344 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 2993 "Tag.c" - GeeIterator* _tmp14_; - gboolean _tmp15_; +#line 3148 "Tag.c" + GeeIterator* _tmp12_; gchar* source_id = NULL; - GeeIterator* _tmp16_; - gpointer _tmp17_; + GeeIterator* _tmp13_; + gpointer _tmp14_; MediaSource* current_source = NULL; - MediaCollectionRegistry* _tmp18_; - MediaCollectionRegistry* _tmp19_; - const gchar* _tmp20_; - MediaSource* _tmp21_; + MediaCollectionRegistry* _tmp15_; + MediaCollectionRegistry* _tmp16_; + const gchar* _tmp17_; + MediaSource* _tmp18_; + MediaSource* _tmp19_; + MediaSource* _tmp20_; + GeeArrayList* _tmp21_; MediaSource* _tmp22_; - MediaSource* _tmp23_; - GeeArrayList* _tmp24_; - MediaSource* _tmp25_; - GeeArrayList* _tmp26_; - MediaSource* _tmp27_; - ThumbnailView* _tmp28_; - ThumbnailView* _tmp29_; + GeeArrayList* _tmp23_; + MediaSource* _tmp24_; + ThumbnailView* _tmp25_; + ThumbnailView* _tmp26_; #line 344 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = _source_id_it; + _tmp12_ = _source_id_it; #line 344 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = gee_iterator_next (_tmp14_); -#line 344 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp15_) { + if (!gee_iterator_next (_tmp12_)) { #line 344 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 3020 "Tag.c" +#line 3172 "Tag.c" } #line 344 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = _source_id_it; + _tmp13_ = _source_id_it; #line 344 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = gee_iterator_get (_tmp16_); + _tmp14_ = gee_iterator_get (_tmp13_); #line 344 "/home/jens/Source/shotwell/src/Tag.vala" - source_id = (gchar*) _tmp17_; + source_id = (gchar*) _tmp14_; #line 345 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = media_collection_registry_get_instance (); + _tmp15_ = media_collection_registry_get_instance (); #line 345 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp19_ = _tmp18_; + _tmp16_ = _tmp15_; #line 345 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp20_ = source_id; + _tmp17_ = source_id; #line 345 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp21_ = media_collection_registry_fetch_media (_tmp19_, _tmp20_); + _tmp18_ = media_collection_registry_fetch_media (_tmp16_, _tmp17_); #line 345 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_MEDIA_SOURCE, MediaSource); #line 345 "/home/jens/Source/shotwell/src/Tag.vala" - _media_collection_registry_unref0 (_tmp19_); + _media_collection_registry_unref0 (_tmp16_); #line 345 "/home/jens/Source/shotwell/src/Tag.vala" - current_source = _tmp22_; + current_source = _tmp19_; #line 347 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp23_ = current_source; + _tmp20_ = current_source; #line 347 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp23_ == NULL) { + if (_tmp20_ == NULL) { #line 348 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (current_source); #line 348 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (source_id); #line 348 "/home/jens/Source/shotwell/src/Tag.vala" continue; -#line 3052 "Tag.c" +#line 3204 "Tag.c" } #line 350 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp24_ = source_list; + _tmp21_ = source_list; #line 350 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp25_ = current_source; + _tmp22_ = current_source; #line 350 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp25_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_); #line 351 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp26_ = thumbnail_views; + _tmp23_ = thumbnail_views; #line 351 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp27_ = current_source; + _tmp24_ = current_source; #line 351 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp28_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); + _tmp25_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 351 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp29_ = _tmp28_; + _tmp26_ = _tmp25_; #line 351 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_); #line 351 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp29_); + _g_object_unref0 (_tmp26_); #line 344 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (current_source); #line 344 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (source_id); -#line 3076 "Tag.c" +#line 3228 "Tag.c" } #line 344 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_source_id_it); -#line 3080 "Tag.c" +#line 3232 "Tag.c" } } else { - TagRow* _tmp30_; - GeeHashSet* _tmp31_; + TagRow* _tmp27_; + GeeHashSet* _tmp28_; #line 355 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp30_ = self->priv->row; + _tmp27_ = self->priv->row; #line 355 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp31_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp28_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 355 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp30_->source_id_list); + _g_object_unref0 (_tmp27_->source_id_list); #line 355 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp30_->source_id_list = G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_SET, GeeSet); -#line 3093 "Tag.c" + _tmp27_->source_id_list = G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_SET, GeeSet); +#line 3245 "Tag.c" } #line 359 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp32_ = row; + _tmp29_ = row->tag_id; #line 359 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp33_ = _tmp32_->tag_id; + _tmp30_ = _tmp29_.id; #line 359 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp34_ = _tmp33_.id; + _tmp31_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp30_); #line 359 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp35_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp34_); + _tmp32_ = _tmp31_; #line 359 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp36_ = _tmp35_; + _tmp33_ = g_strdup_printf ("ViewCollection for tag %s", _tmp32_); #line 359 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp37_ = g_strdup_printf ("ViewCollection for tag %s", _tmp36_); + _tmp34_ = _tmp33_; #line 359 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp38_ = _tmp37_; -#line 359 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp39_ = view_collection_new (_tmp38_); + _tmp35_ = view_collection_new (_tmp34_); #line 359 "/home/jens/Source/shotwell/src/Tag.vala" _data_collection_unref0 (self->priv->media_views); #line 359 "/home/jens/Source/shotwell/src/Tag.vala" - self->priv->media_views = _tmp39_; + self->priv->media_views = _tmp35_; #line 359 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp38_); + _g_free0 (_tmp34_); #line 359 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp36_); + _g_free0 (_tmp32_); #line 360 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp40_ = self->priv->media_views; + _tmp36_ = self->priv->media_views; #line 360 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp41_ = thumbnail_views; + _tmp37_ = thumbnail_views; #line 360 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp42_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); + _tmp38_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); #line 360 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp43_ = _tmp42_; + _tmp39_ = _tmp38_; #line 360 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp43_); + _g_object_unref0 (_tmp39_); #line 364 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp44_ = source_list; + _tmp40_ = source_list; #line 364 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp45_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp41_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 364 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp46_ = _tmp45_; + _tmp42_ = _tmp41_; #line 364 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp46_ > 0) { -#line 3137 "Tag.c" - TagSourceCollection* _tmp47_; - GeeArrayList* _tmp48_; - TagSourceCollection* _tmp49_; - GeeArrayList* _tmp50_; + if (_tmp42_ > 0) { +#line 3287 "Tag.c" + TagSourceCollection* _tmp43_; + GeeArrayList* _tmp44_; + TagSourceCollection* _tmp45_; + GeeArrayList* _tmp46_; #line 365 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp47_ = tag_global; + _tmp43_ = tag_global; #line 365 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp48_ = source_list; + _tmp44_ = source_list; #line 365 "/home/jens/Source/shotwell/src/Tag.vala" - container_source_collection_notify_container_contents_added (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection), FALSE); + container_source_collection_notify_container_contents_added (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection), FALSE); #line 366 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp49_ = tag_global; + _tmp45_ = tag_global; #line 366 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp50_ = source_list; + _tmp46_ = source_list; #line 366 "/home/jens/Source/shotwell/src/Tag.vala" - container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, FALSE); -#line 3154 "Tag.c" + container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, FALSE); +#line 3304 "Tag.c" } #line 371 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp51_ = self->priv->media_views; + _tmp47_ = self->priv->media_views; #line 371 "/home/jens/Source/shotwell/src/Tag.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _tag_on_media_views_contents_altered_data_collection_contents_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _tag_on_media_views_contents_altered_data_collection_contents_altered, self, 0); #line 375 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp52_ = library_photo_global; + _tmp48_ = library_photo_global; #line 375 "/home/jens/Source/shotwell/src/Tag.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-destroyed", (GCallback) _tag_on_sources_destroyed_source_collection_items_destroyed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-destroyed", (GCallback) _tag_on_sources_destroyed_source_collection_items_destroyed, self, 0); #line 376 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp53_ = video_global; + _tmp49_ = video_global; #line 376 "/home/jens/Source/shotwell/src/Tag.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-destroyed", (GCallback) _tag_on_sources_destroyed_source_collection_items_destroyed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-destroyed", (GCallback) _tag_on_sources_destroyed_source_collection_items_destroyed, self, 0); #line 378 "/home/jens/Source/shotwell/src/Tag.vala" tag_update_indexable_keywords (self); #line 332 "/home/jens/Source/shotwell/src/Tag.vala" @@ -3172,18 +3322,24 @@ static Tag* tag_construct (GType object_type, TagRow* row, gint64 object_id) { _g_object_unref0 (source_list); #line 332 "/home/jens/Source/shotwell/src/Tag.vala" return self; -#line 3176 "Tag.c" +#line 3326 "Tag.c" } -static Tag* tag_new (TagRow* row, gint64 object_id) { +static Tag* +tag_new (TagRow* row, + gint64 object_id) +{ #line 332 "/home/jens/Source/shotwell/src/Tag.vala" return tag_construct (TYPE_TAG, row, object_id); -#line 3183 "Tag.c" +#line 3336 "Tag.c" } -void tag_init (ProgressMonitor monitor, void* monitor_target) { +void +tag_init (ProgressMonitor monitor, + void* monitor_target) +{ TagSourceCollection* _tmp0_; GeeList* rows = NULL; GeeTreeMap* ancestry_dictionary = NULL; @@ -3195,17 +3351,17 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { gint _tmp11_; gint _tmp12_; GeeSet* victim_set = NULL; - GeeHashSet* _tmp54_; - GeeSet* _tmp110_; - TagSourceCollection* _tmp171_; - GeeTreeMap* _tmp172_; - GeeCollection* _tmp173_; - GeeCollection* _tmp174_; - GeeCollection* _tmp175_; - GeeCollection* _tmp176_; - GeeCollection* _tmp177_; - TagSourceCollection* _tmp178_; - GeeArrayList* _tmp179_; + GeeHashSet* _tmp51_; + GeeSet* _tmp103_; + TagSourceCollection* _tmp158_; + GeeTreeMap* _tmp159_; + GeeCollection* _tmp160_; + GeeCollection* _tmp161_; + GeeCollection* _tmp162_; + GeeCollection* _tmp163_; + GeeCollection* _tmp164_; + TagSourceCollection* _tmp165_; + GeeArrayList* _tmp166_; GError * _inner_error_ = NULL; #line 388 "/home/jens/Source/shotwell/src/Tag.vala" _tmp0_ = tag_source_collection_new (); @@ -3215,7 +3371,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { tag_global = _tmp0_; #line 391 "/home/jens/Source/shotwell/src/Tag.vala" rows = NULL; -#line 3219 "Tag.c" +#line 3375 "Tag.c" { GeeList* _tmp1_ = NULL; TagTable* _tmp2_; @@ -3239,7 +3395,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 393 "/home/jens/Source/shotwell/src/Tag.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 3243 "Tag.c" +#line 3399 "Tag.c" goto __catch480_database_error; } #line 393 "/home/jens/Source/shotwell/src/Tag.vala" @@ -3250,7 +3406,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { g_clear_error (&_inner_error_); #line 393 "/home/jens/Source/shotwell/src/Tag.vala" return; -#line 3254 "Tag.c" +#line 3410 "Tag.c" } #line 393 "/home/jens/Source/shotwell/src/Tag.vala" _tmp6_ = _tmp1_; @@ -3262,7 +3418,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { rows = _tmp6_; #line 392 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_tmp1_); -#line 3266 "Tag.c" +#line 3422 "Tag.c" } goto __finally480; __catch480_database_error: @@ -3279,7 +3435,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { app_window_database_error (_tmp7_); #line 392 "/home/jens/Source/shotwell/src/Tag.vala" _g_error_free0 (err); -#line 3283 "Tag.c" +#line 3439 "Tag.c" } __finally480: #line 392 "/home/jens/Source/shotwell/src/Tag.vala" @@ -3292,7 +3448,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { g_clear_error (&_inner_error_); #line 392 "/home/jens/Source/shotwell/src/Tag.vala" return; -#line 3296 "Tag.c" +#line 3452 "Tag.c" } #line 404 "/home/jens/Source/shotwell/src/Tag.vala" _tmp8_ = gee_tree_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); @@ -3310,19 +3466,19 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { _tmp12_ = _tmp11_; #line 407 "/home/jens/Source/shotwell/src/Tag.vala" count = _tmp12_; -#line 3314 "Tag.c" +#line 3470 "Tag.c" { gint ctr = 0; #line 408 "/home/jens/Source/shotwell/src/Tag.vala" ctr = 0; -#line 3319 "Tag.c" +#line 3475 "Tag.c" { gboolean _tmp13_ = FALSE; #line 408 "/home/jens/Source/shotwell/src/Tag.vala" _tmp13_ = TRUE; #line 408 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 3326 "Tag.c" +#line 3482 "Tag.c" gint _tmp15_; gint _tmp16_; TagRow* row = NULL; @@ -3340,24 +3496,21 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { Tag* tag = NULL; TagRow* _tmp37_; Tag* _tmp38_; - ProgressMonitor _tmp39_; - void* _tmp39__target; - GeeTreeMap* _tmp43_; - Tag* _tmp44_; - gchar* _tmp45_; - gchar* _tmp46_; - Tag* _tmp47_; - Tag* _tmp48_; - gboolean _tmp49_; + GeeTreeMap* _tmp41_; + Tag* _tmp42_; + gchar* _tmp43_; + gchar* _tmp44_; + Tag* _tmp45_; + Tag* _tmp46_; #line 408 "/home/jens/Source/shotwell/src/Tag.vala" if (!_tmp13_) { -#line 3355 "Tag.c" +#line 3508 "Tag.c" gint _tmp14_; #line 408 "/home/jens/Source/shotwell/src/Tag.vala" _tmp14_ = ctr; #line 408 "/home/jens/Source/shotwell/src/Tag.vala" ctr = _tmp14_ + 1; -#line 3361 "Tag.c" +#line 3514 "Tag.c" } #line 408 "/home/jens/Source/shotwell/src/Tag.vala" _tmp13_ = FALSE; @@ -3369,7 +3522,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { if (!(_tmp15_ < _tmp16_)) { #line 408 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 3373 "Tag.c" +#line 3526 "Tag.c" } #line 409 "/home/jens/Source/shotwell/src/Tag.vala" _tmp17_ = rows; @@ -3391,7 +3544,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { _tmp23_ = name; #line 413 "/home/jens/Source/shotwell/src/Tag.vala" if (_tmp23_ == NULL) { -#line 3395 "Tag.c" +#line 3548 "Tag.c" TagRow* _tmp24_; const gchar* _tmp25_; #line 416 "/home/jens/Source/shotwell/src/Tag.vala" @@ -3400,7 +3553,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { _tmp25_ = _tmp24_->name; #line 416 "/home/jens/Source/shotwell/src/Tag.vala" g_warning ("Tag.vala:416: Invalid tag name \"%s\": removing from database", _tmp25_); -#line 3404 "Tag.c" +#line 3557 "Tag.c" { TagTable* _tmp26_; TagTable* _tmp27_; @@ -3422,7 +3575,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 418 "/home/jens/Source/shotwell/src/Tag.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 3426 "Tag.c" +#line 3579 "Tag.c" goto __catch481_database_error; } #line 418 "/home/jens/Source/shotwell/src/Tag.vala" @@ -3441,7 +3594,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { g_clear_error (&_inner_error_); #line 418 "/home/jens/Source/shotwell/src/Tag.vala" return; -#line 3445 "Tag.c" +#line 3598 "Tag.c" } } goto __finally481; @@ -3468,7 +3621,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { g_warning ("Tag.vala:420: Unable to delete tag \"%s\": %s", _tmp31_, _tmp33_); #line 417 "/home/jens/Source/shotwell/src/Tag.vala" _g_error_free0 (err); -#line 3472 "Tag.c" +#line 3625 "Tag.c" } __finally481: #line 417 "/home/jens/Source/shotwell/src/Tag.vala" @@ -3489,7 +3642,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { g_clear_error (&_inner_error_); #line 417 "/home/jens/Source/shotwell/src/Tag.vala" return; -#line 3493 "Tag.c" +#line 3646 "Tag.c" } #line 423 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (name); @@ -3497,7 +3650,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { _tag_row_unref0 (row); #line 423 "/home/jens/Source/shotwell/src/Tag.vala" continue; -#line 3501 "Tag.c" +#line 3654 "Tag.c" } #line 426 "/home/jens/Source/shotwell/src/Tag.vala" _tmp34_ = row; @@ -3516,66 +3669,54 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { #line 428 "/home/jens/Source/shotwell/src/Tag.vala" tag = _tmp38_; #line 429 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp39_ = monitor; -#line 429 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp39__target = monitor_target; -#line 429 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp39_ != NULL) { -#line 3525 "Tag.c" - ProgressMonitor _tmp40_; - void* _tmp40__target; - gint _tmp41_; - gint _tmp42_; -#line 430 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp40_ = monitor; -#line 430 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp40__target = monitor_target; + if (monitor != NULL) { +#line 3674 "Tag.c" + gint _tmp39_; + gint _tmp40_; #line 430 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp41_ = ctr; + _tmp39_ = ctr; #line 430 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp42_ = count; + _tmp40_ = count; #line 430 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp40_ ((guint64) _tmp41_, (guint64) _tmp42_, TRUE, _tmp40__target); -#line 3540 "Tag.c" + monitor ((guint64) _tmp39_, (guint64) _tmp40_, TRUE, monitor_target); +#line 3683 "Tag.c" } #line 432 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp43_ = ancestry_dictionary; + _tmp41_ = ancestry_dictionary; #line 432 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp44_ = tag; + _tmp42_ = tag; #line 432 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp45_ = tag_get_path (_tmp44_); + _tmp43_ = tag_get_path (_tmp42_); #line 432 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp46_ = _tmp45_; + _tmp44_ = _tmp43_; #line 432 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp47_ = tag; + _tmp45_ = tag; #line 432 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp46_, _tmp47_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp44_, _tmp45_); #line 432 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp46_); + _g_free0 (_tmp44_); #line 434 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp48_ = tag; + _tmp46_ = tag; #line 434 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp49_ = container_source_has_links (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_CONTAINER_SOURCE, ContainerSource)); -#line 434 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp49_) { -#line 3562 "Tag.c" + if (container_source_has_links (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_CONTAINER_SOURCE, ContainerSource))) { +#line 3703 "Tag.c" + Tag* _tmp47_; + TagSourceCollection* _tmp48_; + GeeArrayList* _tmp49_; Tag* _tmp50_; - TagSourceCollection* _tmp51_; - GeeArrayList* _tmp52_; - Tag* _tmp53_; #line 435 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp50_ = tag; + _tmp47_ = tag; #line 435 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp51_ = tag_global; + _tmp48_ = tag_global; #line 435 "/home/jens/Source/shotwell/src/Tag.vala" - data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_SOURCE_COLLECTION, SourceCollection), NULL); + data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_SOURCE_COLLECTION, SourceCollection), NULL); #line 436 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp52_ = unlinked; + _tmp49_ = unlinked; #line 436 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp53_ = tag; + _tmp50_ = tag; #line 436 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp53_); -#line 3579 "Tag.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp50_); +#line 3720 "Tag.c" } #line 408 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (tag); @@ -3583,527 +3724,500 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { _g_free0 (name); #line 408 "/home/jens/Source/shotwell/src/Tag.vala" _tag_row_unref0 (row); -#line 3587 "Tag.c" +#line 3728 "Tag.c" } } } #line 440 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp54_ = gee_hash_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp51_ = gee_hash_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 440 "/home/jens/Source/shotwell/src/Tag.vala" - victim_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_SET, GeeSet); -#line 3595 "Tag.c" + victim_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_SET, GeeSet); +#line 3736 "Tag.c" { GeeIterator* _fq_tag_path_it = NULL; - GeeTreeMap* _tmp55_; - GeeSet* _tmp56_; - GeeSet* _tmp57_; - GeeSet* _tmp58_; - GeeIterator* _tmp59_; - GeeIterator* _tmp60_; + GeeTreeMap* _tmp52_; + GeeSet* _tmp53_; + GeeSet* _tmp54_; + GeeSet* _tmp55_; + GeeIterator* _tmp56_; + GeeIterator* _tmp57_; #line 445 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp55_ = ancestry_dictionary; + _tmp52_ = ancestry_dictionary; #line 445 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp56_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp53_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 445 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp57_ = _tmp56_; + _tmp54_ = _tmp53_; #line 445 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp58_ = _tmp57_; + _tmp55_ = _tmp54_; #line 445 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp59_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp56_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_ITERABLE, GeeIterable)); #line 445 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp60_ = _tmp59_; + _tmp57_ = _tmp56_; #line 445 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp58_); + _g_object_unref0 (_tmp55_); #line 445 "/home/jens/Source/shotwell/src/Tag.vala" - _fq_tag_path_it = _tmp60_; + _fq_tag_path_it = _tmp57_; #line 445 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 3622 "Tag.c" - GeeIterator* _tmp61_; - gboolean _tmp62_; +#line 3763 "Tag.c" + GeeIterator* _tmp58_; gchar* fq_tag_path = NULL; - GeeIterator* _tmp63_; - gpointer _tmp64_; - const gchar* _tmp65_; - GeeList* _tmp66_; - GeeList* _tmp67_; - gint _tmp68_; - gint _tmp69_; - gboolean _tmp70_; + GeeIterator* _tmp59_; + gpointer _tmp60_; + const gchar* _tmp61_; + GeeList* _tmp62_; + GeeList* _tmp63_; + gint _tmp64_; + gint _tmp65_; + gboolean _tmp66_; #line 445 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp61_ = _fq_tag_path_it; + _tmp58_ = _fq_tag_path_it; #line 445 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp62_ = gee_iterator_next (_tmp61_); -#line 445 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp62_) { + if (!gee_iterator_next (_tmp58_)) { #line 445 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 3642 "Tag.c" +#line 3780 "Tag.c" } #line 445 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp63_ = _fq_tag_path_it; + _tmp59_ = _fq_tag_path_it; #line 445 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp64_ = gee_iterator_get (_tmp63_); + _tmp60_ = gee_iterator_get (_tmp59_); #line 445 "/home/jens/Source/shotwell/src/Tag.vala" - fq_tag_path = (gchar*) _tmp64_; + fq_tag_path = (gchar*) _tmp60_; #line 446 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp65_ = fq_tag_path; + _tmp61_ = fq_tag_path; #line 446 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp66_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp65_); + _tmp62_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp61_); #line 446 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp67_ = _tmp66_; + _tmp63_ = _tmp62_; #line 446 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp68_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp64_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_COLLECTION, GeeCollection)); #line 446 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp69_ = _tmp68_; + _tmp65_ = _tmp64_; #line 446 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp70_ = _tmp69_ < 1; + _tmp66_ = _tmp65_ < 1; #line 446 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp67_); + _g_object_unref0 (_tmp63_); #line 446 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp70_) { -#line 3666 "Tag.c" - gboolean _tmp71_ = FALSE; - const gchar* _tmp72_; - gboolean _tmp73_; -#line 447 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp72_ = fq_tag_path; + if (_tmp66_) { +#line 3804 "Tag.c" + gboolean _tmp67_ = FALSE; + const gchar* _tmp68_; #line 447 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp73_ = g_str_has_prefix (_tmp72_, TAG_PATH_SEPARATOR_STRING); + _tmp68_ = fq_tag_path; #line 447 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp73_) { -#line 3676 "Tag.c" - GeeTreeMap* _tmp74_; - const gchar* _tmp75_; - gchar* _tmp76_; - gchar* _tmp77_; - gboolean _tmp78_; -#line 448 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp74_ = ancestry_dictionary; + if (g_str_has_prefix (_tmp68_, TAG_PATH_SEPARATOR_STRING)) { +#line 3811 "Tag.c" + GeeTreeMap* _tmp69_; + const gchar* _tmp70_; + gchar* _tmp71_; + gchar* _tmp72_; #line 448 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp75_ = fq_tag_path; + _tmp69_ = ancestry_dictionary; #line 448 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp76_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp75_); + _tmp70_ = fq_tag_path; #line 448 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp77_ = _tmp76_; + _tmp71_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp70_); #line 448 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp78_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp77_); + _tmp72_ = _tmp71_; #line 448 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp71_ = _tmp78_; + _tmp67_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp72_); #line 448 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp77_); -#line 3696 "Tag.c" + _g_free0 (_tmp72_); +#line 3828 "Tag.c" } else { #line 447 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp71_ = FALSE; -#line 3700 "Tag.c" + _tmp67_ = FALSE; +#line 3832 "Tag.c" } #line 447 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp71_) { -#line 3704 "Tag.c" - GeeSet* _tmp79_; - GeeTreeMap* _tmp80_; - const gchar* _tmp81_; - gpointer _tmp82_; - Tag* _tmp83_; + if (_tmp67_) { +#line 3836 "Tag.c" + GeeSet* _tmp73_; + GeeTreeMap* _tmp74_; + const gchar* _tmp75_; + gpointer _tmp76_; + Tag* _tmp77_; #line 449 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp79_ = victim_set; + _tmp73_ = victim_set; #line 449 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp80_ = ancestry_dictionary; + _tmp74_ = ancestry_dictionary; #line 449 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp81_ = fq_tag_path; + _tmp75_ = fq_tag_path; #line 449 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp82_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp81_); + _tmp76_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp75_); #line 449 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp83_ = (Tag*) _tmp82_; + _tmp77_ = (Tag*) _tmp76_; #line 449 "/home/jens/Source/shotwell/src/Tag.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, GEE_TYPE_COLLECTION, GeeCollection), _tmp83_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GEE_TYPE_COLLECTION, GeeCollection), _tmp77_); #line 449 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp83_); -#line 3724 "Tag.c" + _g_object_unref0 (_tmp77_); +#line 3856 "Tag.c" } } #line 445 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (fq_tag_path); -#line 3729 "Tag.c" +#line 3861 "Tag.c" } #line 445 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_fq_tag_path_it); -#line 3733 "Tag.c" +#line 3865 "Tag.c" } { GeeIterator* _tag_it = NULL; - GeeSet* _tmp84_; - GeeIterator* _tmp85_; + GeeSet* _tmp78_; + GeeIterator* _tmp79_; #line 454 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp84_ = victim_set; + _tmp78_ = victim_set; #line 454 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp85_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp79_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, GEE_TYPE_ITERABLE, GeeIterable)); #line 454 "/home/jens/Source/shotwell/src/Tag.vala" - _tag_it = _tmp85_; + _tag_it = _tmp79_; #line 454 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 3747 "Tag.c" - GeeIterator* _tmp86_; - gboolean _tmp87_; +#line 3879 "Tag.c" + GeeIterator* _tmp80_; Tag* tag = NULL; - GeeIterator* _tmp88_; - gpointer _tmp89_; + GeeIterator* _tmp81_; + gpointer _tmp82_; GeeCollection* source_collection = NULL; + Tag* _tmp83_; + GeeCollection* _tmp84_; + gchar* flat_version = NULL; + Tag* _tmp85_; + gchar* _tmp86_; + TagSourceCollection* _tmp87_; + const gchar* _tmp88_; + Tag* _tmp89_; Tag* _tmp90_; GeeCollection* _tmp91_; - gchar* flat_version = NULL; - Tag* _tmp92_; - gchar* _tmp93_; - TagSourceCollection* _tmp94_; - const gchar* _tmp95_; + GeeTreeMap* _tmp92_; + Tag* _tmp93_; + gchar* _tmp94_; + gchar* _tmp95_; Tag* _tmp96_; Tag* _tmp97_; GeeCollection* _tmp98_; - GeeTreeMap* _tmp99_; - Tag* _tmp100_; - gchar* _tmp101_; - gchar* _tmp102_; - Tag* _tmp103_; - Tag* _tmp104_; - GeeCollection* _tmp105_; - GeeCollection* _tmp106_; - GeeMultiMap* _tmp107_; - GeeMultiMap* _tmp108_; - Tag* _tmp109_; + GeeCollection* _tmp99_; + GeeMultiMap* _tmp100_; + GeeMultiMap* _tmp101_; + Tag* _tmp102_; #line 454 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp86_ = _tag_it; + _tmp80_ = _tag_it; #line 454 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp87_ = gee_iterator_next (_tmp86_); -#line 454 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp87_) { + if (!gee_iterator_next (_tmp80_)) { #line 454 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 3783 "Tag.c" +#line 3912 "Tag.c" } #line 454 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp88_ = _tag_it; + _tmp81_ = _tag_it; #line 454 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp89_ = gee_iterator_get (_tmp88_); + _tmp82_ = gee_iterator_get (_tmp81_); #line 454 "/home/jens/Source/shotwell/src/Tag.vala" - tag = (Tag*) _tmp89_; + tag = (Tag*) _tmp82_; #line 455 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp90_ = tag; + _tmp83_ = tag; #line 455 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp91_ = tag_get_sources (_tmp90_); + _tmp84_ = tag_get_sources (_tmp83_); #line 455 "/home/jens/Source/shotwell/src/Tag.vala" - source_collection = _tmp91_; + source_collection = _tmp84_; #line 456 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp92_ = tag; + _tmp85_ = tag; #line 456 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp93_ = tag_get_user_visible_name (_tmp92_); + _tmp86_ = tag_get_user_visible_name (_tmp85_); #line 456 "/home/jens/Source/shotwell/src/Tag.vala" - flat_version = _tmp93_; + flat_version = _tmp86_; #line 457 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp94_ = tag_global; + _tmp87_ = tag_global; #line 457 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp95_ = flat_version; + _tmp88_ = flat_version; #line 457 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp96_ = tag_source_collection_fetch_by_name (_tmp94_, _tmp95_, FALSE); + _tmp89_ = tag_source_collection_fetch_by_name (_tmp87_, _tmp88_, FALSE); #line 457 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp97_ = _tmp96_; + _tmp90_ = _tmp89_; #line 457 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp98_ = source_collection; + _tmp91_ = source_collection; #line 457 "/home/jens/Source/shotwell/src/Tag.vala" - tag_attach_many (_tmp97_, _tmp98_); + tag_attach_many (_tmp90_, _tmp91_); #line 457 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp97_); + _g_object_unref0 (_tmp90_); #line 459 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp99_ = ancestry_dictionary; + _tmp92_ = ancestry_dictionary; #line 459 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp100_ = tag; + _tmp93_ = tag; #line 459 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp101_ = tag_get_path (_tmp100_); + _tmp94_ = tag_get_path (_tmp93_); #line 459 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp102_ = _tmp101_; + _tmp95_ = _tmp94_; #line 459 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp102_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp95_, NULL); #line 459 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp102_); + _g_free0 (_tmp95_); #line 461 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp103_ = tag; + _tmp96_ = tag; #line 461 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp104_ = tag; + _tmp97_ = tag; #line 461 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp105_ = tag_get_sources (_tmp104_); + _tmp98_ = tag_get_sources (_tmp97_); #line 461 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp106_ = _tmp105_; + _tmp99_ = _tmp98_; #line 461 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp107_ = tag_detach_many (_tmp103_, _tmp106_); + _tmp100_ = tag_detach_many (_tmp96_, _tmp99_); #line 461 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp108_ = _tmp107_; + _tmp101_ = _tmp100_; #line 461 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp108_); + _g_object_unref0 (_tmp101_); #line 461 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp106_); + _g_object_unref0 (_tmp99_); #line 462 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp109_ = tag; + _tmp102_ = tag; #line 462 "/home/jens/Source/shotwell/src/Tag.vala" - data_source_destroy_orphan (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, TYPE_DATA_SOURCE, DataSource), TRUE); + data_source_destroy_orphan (G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, TYPE_DATA_SOURCE, DataSource), TRUE); #line 454 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (flat_version); #line 454 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (source_collection); #line 454 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (tag); -#line 3855 "Tag.c" +#line 3984 "Tag.c" } #line 454 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_tag_it); -#line 3859 "Tag.c" +#line 3988 "Tag.c" } #line 468 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp110_ = victim_set; + _tmp103_ = victim_set; #line 468 "/home/jens/Source/shotwell/src/Tag.vala" - gee_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 3865 "Tag.c" + gee_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 3994 "Tag.c" { GeeIterator* _fq_tag_path_it = NULL; - GeeTreeMap* _tmp111_; - GeeSet* _tmp112_; - GeeSet* _tmp113_; - GeeSet* _tmp114_; - GeeIterator* _tmp115_; - GeeIterator* _tmp116_; + GeeTreeMap* _tmp104_; + GeeSet* _tmp105_; + GeeSet* _tmp106_; + GeeSet* _tmp107_; + GeeIterator* _tmp108_; + GeeIterator* _tmp109_; #line 470 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp111_ = ancestry_dictionary; + _tmp104_ = ancestry_dictionary; #line 470 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp112_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp105_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 470 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp113_ = _tmp112_; + _tmp106_ = _tmp105_; #line 470 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp114_ = _tmp113_; + _tmp107_ = _tmp106_; #line 470 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp115_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp108_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, GEE_TYPE_ITERABLE, GeeIterable)); #line 470 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp116_ = _tmp115_; + _tmp109_ = _tmp108_; #line 470 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp114_); + _g_object_unref0 (_tmp107_); #line 470 "/home/jens/Source/shotwell/src/Tag.vala" - _fq_tag_path_it = _tmp116_; + _fq_tag_path_it = _tmp109_; #line 470 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 3892 "Tag.c" - GeeIterator* _tmp117_; - gboolean _tmp118_; +#line 4021 "Tag.c" + GeeIterator* _tmp110_; gchar* fq_tag_path = NULL; - GeeIterator* _tmp119_; - gpointer _tmp120_; + GeeIterator* _tmp111_; + gpointer _tmp112_; GeeList* parents_to_search = NULL; - const gchar* _tmp121_; - GeeList* _tmp122_; + const gchar* _tmp113_; + GeeList* _tmp114_; Tag* curr_child = NULL; - GeeTreeMap* _tmp123_; - const gchar* _tmp124_; - gpointer _tmp125_; + GeeTreeMap* _tmp115_; + const gchar* _tmp116_; + gpointer _tmp117_; #line 470 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp117_ = _fq_tag_path_it; + _tmp110_ = _fq_tag_path_it; #line 470 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp118_ = gee_iterator_next (_tmp117_); -#line 470 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp118_) { + if (!gee_iterator_next (_tmp110_)) { #line 470 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 3913 "Tag.c" +#line 4039 "Tag.c" } #line 470 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp119_ = _fq_tag_path_it; + _tmp111_ = _fq_tag_path_it; #line 470 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp120_ = gee_iterator_get (_tmp119_); + _tmp112_ = gee_iterator_get (_tmp111_); #line 470 "/home/jens/Source/shotwell/src/Tag.vala" - fq_tag_path = (gchar*) _tmp120_; + fq_tag_path = (gchar*) _tmp112_; #line 471 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp121_ = fq_tag_path; + _tmp113_ = fq_tag_path; #line 471 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp122_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp121_); + _tmp114_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp113_); #line 471 "/home/jens/Source/shotwell/src/Tag.vala" - parents_to_search = _tmp122_; + parents_to_search = _tmp114_; #line 474 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp123_ = ancestry_dictionary; + _tmp115_ = ancestry_dictionary; #line 474 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp124_ = fq_tag_path; + _tmp116_ = fq_tag_path; #line 474 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp125_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp124_); + _tmp117_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp116_); #line 474 "/home/jens/Source/shotwell/src/Tag.vala" - curr_child = (Tag*) _tmp125_; -#line 3935 "Tag.c" + curr_child = (Tag*) _tmp117_; +#line 4061 "Tag.c" { GeeList* _parent_path_list = NULL; - GeeList* _tmp126_; - GeeList* _tmp127_; + GeeList* _tmp118_; + GeeList* _tmp119_; gint _parent_path_size = 0; - GeeList* _tmp128_; - gint _tmp129_; - gint _tmp130_; + GeeList* _tmp120_; + gint _tmp121_; + gint _tmp122_; gint _parent_path_index = 0; #line 476 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp126_ = parents_to_search; + _tmp118_ = parents_to_search; #line 476 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp127_ = _g_object_ref0 (_tmp126_); + _tmp119_ = _g_object_ref0 (_tmp118_); #line 476 "/home/jens/Source/shotwell/src/Tag.vala" - _parent_path_list = _tmp127_; + _parent_path_list = _tmp119_; #line 476 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp128_ = _parent_path_list; + _tmp120_ = _parent_path_list; #line 476 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp129_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp128_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp121_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, GEE_TYPE_COLLECTION, GeeCollection)); #line 476 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp130_ = _tmp129_; + _tmp122_ = _tmp121_; #line 476 "/home/jens/Source/shotwell/src/Tag.vala" - _parent_path_size = _tmp130_; + _parent_path_size = _tmp122_; #line 476 "/home/jens/Source/shotwell/src/Tag.vala" _parent_path_index = -1; #line 476 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 3963 "Tag.c" - gint _tmp131_; - gint _tmp132_; - gint _tmp133_; +#line 4089 "Tag.c" + gint _tmp123_; + gint _tmp124_; + gint _tmp125_; gchar* parent_path = NULL; - GeeList* _tmp134_; - gint _tmp135_; - gpointer _tmp136_; + GeeList* _tmp126_; + gint _tmp127_; + gpointer _tmp128_; gint child_ref_count = 0; - Tag* _tmp137_; - gint _tmp138_; + Tag* _tmp129_; gint parent_ref_count = 0; - GeeTreeMap* _tmp139_; - const gchar* _tmp140_; - gboolean _tmp141_; - gint _tmp147_; - gint _tmp148_; - GeeSet* _tmp151_; - GeeTreeMap* _tmp152_; - const gchar* _tmp153_; - gpointer _tmp154_; - Tag* _tmp155_; - gboolean _tmp156_; - gboolean _tmp157_; + GeeTreeMap* _tmp130_; + const gchar* _tmp131_; + gint _tmp136_; + gint _tmp137_; + GeeSet* _tmp140_; + GeeTreeMap* _tmp141_; + const gchar* _tmp142_; + gpointer _tmp143_; + Tag* _tmp144_; + gboolean _tmp145_; #line 476 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp131_ = _parent_path_index; + _tmp123_ = _parent_path_index; #line 476 "/home/jens/Source/shotwell/src/Tag.vala" - _parent_path_index = _tmp131_ + 1; + _parent_path_index = _tmp123_ + 1; #line 476 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp132_ = _parent_path_index; + _tmp124_ = _parent_path_index; #line 476 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp133_ = _parent_path_size; + _tmp125_ = _parent_path_size; #line 476 "/home/jens/Source/shotwell/src/Tag.vala" - if (!(_tmp132_ < _tmp133_)) { + if (!(_tmp124_ < _tmp125_)) { #line 476 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 3999 "Tag.c" +#line 4122 "Tag.c" } #line 476 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp134_ = _parent_path_list; + _tmp126_ = _parent_path_list; #line 476 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp135_ = _parent_path_index; + _tmp127_ = _parent_path_index; #line 476 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp136_ = gee_list_get (_tmp134_, _tmp135_); + _tmp128_ = gee_list_get (_tmp126_, _tmp127_); #line 476 "/home/jens/Source/shotwell/src/Tag.vala" - parent_path = (gchar*) _tmp136_; -#line 479 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp137_ = curr_child; + parent_path = (gchar*) _tmp128_; #line 479 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp138_ = tag_get_sources_count (_tmp137_); + _tmp129_ = curr_child; #line 479 "/home/jens/Source/shotwell/src/Tag.vala" - child_ref_count = _tmp138_; + child_ref_count = tag_get_sources_count (_tmp129_); #line 480 "/home/jens/Source/shotwell/src/Tag.vala" parent_ref_count = -1; #line 483 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp139_ = ancestry_dictionary; + _tmp130_ = ancestry_dictionary; #line 483 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp140_ = parent_path; + _tmp131_ = parent_path; #line 483 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp141_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp140_); -#line 483 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp141_) { -#line 4025 "Tag.c" - GeeTreeMap* _tmp142_; - const gchar* _tmp143_; - gpointer _tmp144_; - Tag* _tmp145_; - gint _tmp146_; -#line 485 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp142_ = ancestry_dictionary; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp131_)) { +#line 4144 "Tag.c" + GeeTreeMap* _tmp132_; + const gchar* _tmp133_; + gpointer _tmp134_; + Tag* _tmp135_; #line 485 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp143_ = parent_path; + _tmp132_ = ancestry_dictionary; #line 485 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp144_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp143_); + _tmp133_ = parent_path; #line 485 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp145_ = (Tag*) _tmp144_; + _tmp134_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp133_); #line 485 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp146_ = tag_get_sources_count (_tmp145_); + _tmp135_ = (Tag*) _tmp134_; #line 485 "/home/jens/Source/shotwell/src/Tag.vala" - parent_ref_count = _tmp146_; + parent_ref_count = tag_get_sources_count (_tmp135_); #line 485 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp145_); -#line 4045 "Tag.c" + _g_object_unref0 (_tmp135_); +#line 4161 "Tag.c" } #line 489 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp147_ = child_ref_count; + _tmp136_ = child_ref_count; #line 489 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp148_ = parent_ref_count; + _tmp137_ = parent_ref_count; #line 489 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp147_ > _tmp148_) { -#line 4053 "Tag.c" - GeeSet* _tmp149_; - Tag* _tmp150_; + if (_tmp136_ > _tmp137_) { +#line 4169 "Tag.c" + GeeSet* _tmp138_; + Tag* _tmp139_; #line 493 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp149_ = victim_set; + _tmp138_ = victim_set; #line 493 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp150_ = curr_child; + _tmp139_ = curr_child; #line 493 "/home/jens/Source/shotwell/src/Tag.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp149_, GEE_TYPE_COLLECTION, GeeCollection), _tmp150_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, GEE_TYPE_COLLECTION, GeeCollection), _tmp139_); #line 497 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (parent_path); #line 497 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 4066 "Tag.c" +#line 4182 "Tag.c" } #line 501 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp151_ = victim_set; -#line 501 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp152_ = ancestry_dictionary; + _tmp140_ = victim_set; #line 501 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp153_ = parent_path; + _tmp141_ = ancestry_dictionary; #line 501 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp154_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp152_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp153_); + _tmp142_ = parent_path; #line 501 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp155_ = (Tag*) _tmp154_; + _tmp143_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp142_); #line 501 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp156_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp151_, GEE_TYPE_COLLECTION, GeeCollection), _tmp155_); + _tmp144_ = (Tag*) _tmp143_; #line 501 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp157_ = _tmp156_; + _tmp145_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp140_, GEE_TYPE_COLLECTION, GeeCollection), _tmp144_); #line 501 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp155_); + _g_object_unref0 (_tmp144_); #line 501 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp157_) { -#line 4086 "Tag.c" - GeeSet* _tmp158_; - Tag* _tmp159_; + if (_tmp145_) { +#line 4200 "Tag.c" + GeeSet* _tmp146_; + Tag* _tmp147_; #line 503 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp158_ = victim_set; + _tmp146_ = victim_set; #line 503 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp159_ = curr_child; + _tmp147_ = curr_child; #line 503 "/home/jens/Source/shotwell/src/Tag.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp158_, GEE_TYPE_COLLECTION, GeeCollection), _tmp159_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp146_, GEE_TYPE_COLLECTION, GeeCollection), _tmp147_); #line 504 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (parent_path); #line 504 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 4099 "Tag.c" +#line 4213 "Tag.c" } #line 476 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (parent_path); -#line 4103 "Tag.c" +#line 4217 "Tag.c" } #line 476 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_parent_path_list); -#line 4107 "Tag.c" +#line 4221 "Tag.c" } #line 470 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (curr_child); @@ -4111,208 +4225,202 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { _g_object_unref0 (parents_to_search); #line 470 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (fq_tag_path); -#line 4115 "Tag.c" +#line 4229 "Tag.c" } #line 470 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_fq_tag_path_it); -#line 4119 "Tag.c" +#line 4233 "Tag.c" } { GeeIterator* _t_it = NULL; - GeeSet* _tmp160_; - GeeIterator* _tmp161_; + GeeSet* _tmp148_; + GeeIterator* _tmp149_; #line 510 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp160_ = victim_set; + _tmp148_ = victim_set; #line 510 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp161_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp160_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp149_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp148_, GEE_TYPE_ITERABLE, GeeIterable)); #line 510 "/home/jens/Source/shotwell/src/Tag.vala" - _t_it = _tmp161_; + _t_it = _tmp149_; #line 510 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 4133 "Tag.c" - GeeIterator* _tmp162_; - gboolean _tmp163_; +#line 4247 "Tag.c" + GeeIterator* _tmp150_; Tag* t = NULL; - GeeIterator* _tmp164_; - gpointer _tmp165_; - GeeTreeMap* _tmp166_; - Tag* _tmp167_; - gchar* _tmp168_; - gchar* _tmp169_; - Tag* _tmp170_; + GeeIterator* _tmp151_; + gpointer _tmp152_; + GeeTreeMap* _tmp153_; + Tag* _tmp154_; + gchar* _tmp155_; + gchar* _tmp156_; + Tag* _tmp157_; #line 510 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp162_ = _t_it; + _tmp150_ = _t_it; #line 510 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp163_ = gee_iterator_next (_tmp162_); -#line 510 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp163_) { + if (!gee_iterator_next (_tmp150_)) { #line 510 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 4152 "Tag.c" +#line 4263 "Tag.c" } #line 510 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp164_ = _t_it; + _tmp151_ = _t_it; #line 510 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp165_ = gee_iterator_get (_tmp164_); + _tmp152_ = gee_iterator_get (_tmp151_); #line 510 "/home/jens/Source/shotwell/src/Tag.vala" - t = (Tag*) _tmp165_; + t = (Tag*) _tmp152_; #line 511 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp166_ = ancestry_dictionary; + _tmp153_ = ancestry_dictionary; #line 511 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp167_ = t; + _tmp154_ = t; #line 511 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp168_ = tag_get_path (_tmp167_); + _tmp155_ = tag_get_path (_tmp154_); #line 511 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp169_ = _tmp168_; + _tmp156_ = _tmp155_; #line 511 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp166_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp169_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp153_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp156_, NULL); #line 511 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp169_); + _g_free0 (_tmp156_); #line 512 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp170_ = t; + _tmp157_ = t; #line 512 "/home/jens/Source/shotwell/src/Tag.vala" - data_source_destroy_orphan (G_TYPE_CHECK_INSTANCE_CAST (_tmp170_, TYPE_DATA_SOURCE, DataSource), TRUE); + data_source_destroy_orphan (G_TYPE_CHECK_INSTANCE_CAST (_tmp157_, TYPE_DATA_SOURCE, DataSource), TRUE); #line 510 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (t); -#line 4178 "Tag.c" +#line 4289 "Tag.c" } #line 510 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_t_it); -#line 4182 "Tag.c" +#line 4293 "Tag.c" } #line 516 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp171_ = tag_global; + _tmp158_ = tag_global; #line 516 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp172_ = ancestry_dictionary; + _tmp159_ = ancestry_dictionary; #line 516 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp173_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp172_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp160_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp159_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 516 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp174_ = _tmp173_; + _tmp161_ = _tmp160_; #line 516 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp175_ = _tmp174_; + _tmp162_ = _tmp161_; #line 516 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp176_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp171_, TYPE_DATA_COLLECTION, DataCollection), _tmp175_, NULL, NULL); + _tmp163_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp158_, TYPE_DATA_COLLECTION, DataCollection), _tmp162_, NULL, NULL); #line 516 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp177_ = _tmp176_; + _tmp164_ = _tmp163_; #line 516 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp177_); + _g_object_unref0 (_tmp164_); #line 516 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp175_); + _g_object_unref0 (_tmp162_); #line 517 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp178_ = tag_global; + _tmp165_ = tag_global; #line 517 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp179_ = unlinked; + _tmp166_ = unlinked; #line 517 "/home/jens/Source/shotwell/src/Tag.vala" - container_source_collection_init_add_many_unlinked (G_TYPE_CHECK_INSTANCE_CAST (_tmp178_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp179_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 4208 "Tag.c" + container_source_collection_init_add_many_unlinked (G_TYPE_CHECK_INSTANCE_CAST (_tmp165_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp166_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 4319 "Tag.c" { GeeIterator* _t_it = NULL; - GeeTreeMap* _tmp180_; - GeeCollection* _tmp181_; - GeeCollection* _tmp182_; - GeeCollection* _tmp183_; - GeeIterator* _tmp184_; - GeeIterator* _tmp185_; + GeeTreeMap* _tmp167_; + GeeCollection* _tmp168_; + GeeCollection* _tmp169_; + GeeCollection* _tmp170_; + GeeIterator* _tmp171_; + GeeIterator* _tmp172_; #line 521 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp180_ = ancestry_dictionary; + _tmp167_ = ancestry_dictionary; #line 521 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp181_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp180_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp168_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp167_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 521 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp182_ = _tmp181_; + _tmp169_ = _tmp168_; #line 521 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp183_ = _tmp182_; + _tmp170_ = _tmp169_; #line 521 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp184_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp183_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp171_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp170_, GEE_TYPE_ITERABLE, GeeIterable)); #line 521 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp185_ = _tmp184_; + _tmp172_ = _tmp171_; #line 521 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp183_); + _g_object_unref0 (_tmp170_); #line 521 "/home/jens/Source/shotwell/src/Tag.vala" - _t_it = _tmp185_; + _t_it = _tmp172_; #line 521 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 4235 "Tag.c" - GeeIterator* _tmp186_; - gboolean _tmp187_; +#line 4346 "Tag.c" + GeeIterator* _tmp173_; Tag* t = NULL; - GeeIterator* _tmp188_; - gpointer _tmp189_; - gboolean _tmp190_ = FALSE; - Tag* _tmp191_; - GeeList* _tmp192_; - GeeList* _tmp193_; - gint _tmp194_; - gint _tmp195_; - gboolean _tmp196_; + GeeIterator* _tmp174_; + gpointer _tmp175_; + gboolean _tmp176_ = FALSE; + Tag* _tmp177_; + GeeList* _tmp178_; + GeeList* _tmp179_; + gint _tmp180_; + gint _tmp181_; + gboolean _tmp182_; #line 521 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp186_ = _t_it; + _tmp173_ = _t_it; #line 521 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp187_ = gee_iterator_next (_tmp186_); -#line 521 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp187_) { + if (!gee_iterator_next (_tmp173_)) { #line 521 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 4256 "Tag.c" +#line 4364 "Tag.c" } #line 521 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp188_ = _t_it; + _tmp174_ = _t_it; #line 521 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp189_ = gee_iterator_get (_tmp188_); + _tmp175_ = gee_iterator_get (_tmp174_); #line 521 "/home/jens/Source/shotwell/src/Tag.vala" - t = (Tag*) _tmp189_; + t = (Tag*) _tmp175_; #line 523 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp191_ = t; + _tmp177_ = t; #line 523 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp192_ = tag_get_hierarchical_children (_tmp191_); + _tmp178_ = tag_get_hierarchical_children (_tmp177_); #line 523 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp193_ = _tmp192_; + _tmp179_ = _tmp178_; #line 523 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp194_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp193_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp180_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp179_, GEE_TYPE_COLLECTION, GeeCollection)); #line 523 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp195_ = _tmp194_; + _tmp181_ = _tmp180_; #line 523 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp196_ = _tmp195_ < 1; + _tmp182_ = _tmp181_ < 1; #line 523 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp193_); + _g_object_unref0 (_tmp179_); #line 523 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp196_) { -#line 4280 "Tag.c" - Tag* _tmp197_; - Tag* _tmp198_; - Tag* _tmp199_; + if (_tmp182_) { +#line 4388 "Tag.c" + Tag* _tmp183_; + Tag* _tmp184_; + Tag* _tmp185_; #line 523 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp197_ = t; + _tmp183_ = t; #line 523 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp198_ = tag_get_hierarchical_parent (_tmp197_); + _tmp184_ = tag_get_hierarchical_parent (_tmp183_); #line 523 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp199_ = _tmp198_; + _tmp185_ = _tmp184_; #line 523 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp190_ = _tmp199_ == NULL; + _tmp176_ = _tmp185_ == NULL; #line 523 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp199_); -#line 4294 "Tag.c" + _g_object_unref0 (_tmp185_); +#line 4402 "Tag.c" } else { #line 523 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp190_ = FALSE; -#line 4298 "Tag.c" + _tmp176_ = FALSE; +#line 4406 "Tag.c" } #line 523 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp190_) { -#line 4302 "Tag.c" - Tag* _tmp200_; + if (_tmp176_) { +#line 4410 "Tag.c" + Tag* _tmp186_; #line 525 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp200_ = t; + _tmp186_ = t; #line 525 "/home/jens/Source/shotwell/src/Tag.vala" - tag_flatten (_tmp200_); -#line 4308 "Tag.c" + tag_flatten (_tmp186_); +#line 4416 "Tag.c" } #line 521 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (t); -#line 4312 "Tag.c" +#line 4420 "Tag.c" } #line 521 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_t_it); -#line 4316 "Tag.c" +#line 4424 "Tag.c" } #line 387 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (victim_set); @@ -4322,261 +4430,222 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { _g_object_unref0 (ancestry_dictionary); #line 387 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (rows); -#line 4326 "Tag.c" +#line 4434 "Tag.c" } -void tag_terminate (void) { +void +tag_terminate (void) +{ } -gint tag_compare_names (Tag* a, Tag* b) { +gint +tag_compare_names (Tag* a, + Tag* b) +{ gint result = 0; - Tag* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; - Tag* _tmp3_; + gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; - Tag* _tmp6_; + gchar* _tmp6_; gchar* _tmp7_; - gchar* _tmp8_; - Tag* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; - gint _tmp12_; - gint _tmp13_; + gint _tmp8_; #line 533 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG (a), 0); #line 533 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG (b), 0); #line 534 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = a; + _tmp0_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (a, TYPE_DATA_OBJECT, DataObject)); #line 534 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject)); + _tmp1_ = _tmp0_; #line 534 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = _tmp1_; + _tmp2_ = tag_get_name_collation_key (a); #line 534 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = a; + _tmp3_ = _tmp2_; #line 534 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = tag_get_name_collation_key (_tmp3_); + _tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (b, TYPE_DATA_OBJECT, DataObject)); #line 534 "/home/jens/Source/shotwell/src/Tag.vala" _tmp5_ = _tmp4_; #line 534 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = b; -#line 534 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_OBJECT, DataObject)); -#line 534 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = _tmp7_; -#line 534 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = b; -#line 534 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = tag_get_name_collation_key (_tmp9_); + _tmp6_ = tag_get_name_collation_key (b); #line 534 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = _tmp10_; -#line 534 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = string_precollated_compare (_tmp2_, _tmp5_, _tmp8_, _tmp11_); -#line 534 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = _tmp12_; + _tmp7_ = _tmp6_; #line 534 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp11_); + _tmp8_ = string_precollated_compare (_tmp1_, _tmp3_, _tmp5_, _tmp7_); #line 534 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp7_); #line 534 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (_tmp5_); #line 534 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp3_); +#line 534 "/home/jens/Source/shotwell/src/Tag.vala" + _g_free0 (_tmp1_); #line 534 "/home/jens/Source/shotwell/src/Tag.vala" - result = _tmp13_; + result = _tmp8_; #line 534 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 4394 "Tag.c" +#line 4492 "Tag.c" } -gint tag_compare_user_visible_names (Tag* a, Tag* b) { +gint +tag_compare_user_visible_names (Tag* a, + Tag* b) +{ gint result = 0; - Tag* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; - Tag* _tmp3_; + gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; - Tag* _tmp6_; + gchar* _tmp6_; gchar* _tmp7_; - gchar* _tmp8_; - Tag* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; - gint _tmp12_; - gint _tmp13_; + gint _tmp8_; #line 538 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG (a), 0); #line 538 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG (b), 0); #line 539 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = a; + _tmp0_ = tag_get_user_visible_name (a); #line 539 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = tag_get_user_visible_name (_tmp0_); + _tmp1_ = _tmp0_; #line 539 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = _tmp1_; + _tmp2_ = tag_get_name_collation_key (a); #line 539 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = a; + _tmp3_ = _tmp2_; #line 539 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = tag_get_name_collation_key (_tmp3_); + _tmp4_ = tag_get_user_visible_name (b); #line 539 "/home/jens/Source/shotwell/src/Tag.vala" _tmp5_ = _tmp4_; #line 539 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = b; + _tmp6_ = tag_get_name_collation_key (b); #line 539 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = tag_get_user_visible_name (_tmp6_); -#line 539 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = _tmp7_; -#line 539 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = b; -#line 539 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = tag_get_name_collation_key (_tmp9_); -#line 539 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = _tmp10_; -#line 539 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = string_precollated_compare (_tmp2_, _tmp5_, _tmp8_, _tmp11_); -#line 539 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = _tmp12_; + _tmp7_ = _tmp6_; #line 539 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp11_); + _tmp8_ = string_precollated_compare (_tmp1_, _tmp3_, _tmp5_, _tmp7_); #line 539 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp7_); #line 539 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (_tmp5_); #line 539 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp3_); +#line 539 "/home/jens/Source/shotwell/src/Tag.vala" + _g_free0 (_tmp1_); #line 539 "/home/jens/Source/shotwell/src/Tag.vala" - result = _tmp13_; + result = _tmp8_; #line 539 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 4458 "Tag.c" +#line 4544 "Tag.c" } -guint tag_hash_name_string (const gchar* a) { +guint +tag_hash_name_string (const gchar* a) +{ guint result = 0U; - const gchar* _tmp0_; - guint _tmp1_; #line 543 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (a != NULL, 0U); #line 544 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = a; -#line 544 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = string_collated_hash (_tmp0_); -#line 544 "/home/jens/Source/shotwell/src/Tag.vala" - result = _tmp1_; + result = string_collated_hash (a); #line 544 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 4476 "Tag.c" +#line 4558 "Tag.c" } -gboolean tag_equal_name_strings (const gchar* a, const gchar* b) { +gboolean +tag_equal_name_strings (const gchar* a, + const gchar* b) +{ gboolean result = FALSE; - const gchar* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; #line 547 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (a != NULL, FALSE); #line 547 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (b != NULL, FALSE); #line 548 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = a; -#line 548 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = b; -#line 548 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = string_collated_equals (_tmp0_, _tmp1_); -#line 548 "/home/jens/Source/shotwell/src/Tag.vala" - result = _tmp2_; + result = string_collated_equals (a, b); #line 548 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 4499 "Tag.c" +#line 4575 "Tag.c" } -Tag* tag_for_path (const gchar* name) { +Tag* +tag_for_path (const gchar* name) +{ Tag* result = NULL; Tag* tag = NULL; TagSourceCollection* _tmp0_; - const gchar* _tmp1_; + Tag* _tmp1_; Tag* _tmp2_; - Tag* _tmp3_; - Tag* _tmp7_; - TagSourceCollection* _tmp16_; - Tag* _tmp17_; + Tag* _tmp5_; + TagSourceCollection* _tmp13_; + Tag* _tmp14_; GError * _inner_error_ = NULL; #line 553 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (name != NULL, NULL); #line 554 "/home/jens/Source/shotwell/src/Tag.vala" _tmp0_ = tag_global; #line 554 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = name; + _tmp1_ = tag_source_collection_fetch_by_name (_tmp0_, name, TRUE); #line 554 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = tag_source_collection_fetch_by_name (_tmp0_, _tmp1_, TRUE); -#line 554 "/home/jens/Source/shotwell/src/Tag.vala" - tag = _tmp2_; + tag = _tmp1_; #line 555 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = tag; + _tmp2_ = tag; #line 555 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp3_ == NULL) { -#line 4528 "Tag.c" - TagSourceCollection* _tmp4_; - const gchar* _tmp5_; - Tag* _tmp6_; + if (_tmp2_ == NULL) { +#line 4603 "Tag.c" + TagSourceCollection* _tmp3_; + Tag* _tmp4_; #line 556 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = tag_global; + _tmp3_ = tag_global; #line 556 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = name; -#line 556 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = tag_source_collection_restore_tag_from_holding_tank (_tmp4_, _tmp5_); + _tmp4_ = tag_source_collection_restore_tag_from_holding_tank (_tmp3_, name); #line 556 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (tag); #line 556 "/home/jens/Source/shotwell/src/Tag.vala" - tag = _tmp6_; -#line 4542 "Tag.c" + tag = _tmp4_; +#line 4614 "Tag.c" } #line 558 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = tag; + _tmp5_ = tag; #line 558 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp7_ != NULL) { + if (_tmp5_ != NULL) { #line 559 "/home/jens/Source/shotwell/src/Tag.vala" result = tag; #line 559 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 4552 "Tag.c" +#line 4624 "Tag.c" } { - TagRow* _tmp8_ = NULL; - TagTable* _tmp9_; - TagTable* _tmp10_; - const gchar* _tmp11_; - TagRow* _tmp12_; - TagRow* _tmp13_; - Tag* _tmp14_; -#line 563 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = tag_table_get_instance (); + TagRow* _tmp6_ = NULL; + TagTable* _tmp7_; + TagTable* _tmp8_; + TagRow* _tmp9_; + TagRow* _tmp10_; + Tag* _tmp11_; #line 563 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = _tmp9_; + _tmp7_ = tag_table_get_instance (); #line 563 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = name; + _tmp8_ = _tmp7_; #line 563 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = tag_table_add (_tmp10_, _tmp11_, &_inner_error_); + _tmp9_ = tag_table_add (_tmp8_, name, &_inner_error_); #line 563 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = _tmp12_; + _tmp10_ = _tmp9_; #line 563 "/home/jens/Source/shotwell/src/Tag.vala" - _database_table_unref0 (_tmp10_); + _database_table_unref0 (_tmp8_); #line 563 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = _tmp13_; + _tmp6_ = _tmp10_; #line 563 "/home/jens/Source/shotwell/src/Tag.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 563 "/home/jens/Source/shotwell/src/Tag.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 4580 "Tag.c" +#line 4649 "Tag.c" goto __catch482_database_error; } #line 563 "/home/jens/Source/shotwell/src/Tag.vala" @@ -4587,34 +4656,34 @@ Tag* tag_for_path (const gchar* name) { g_clear_error (&_inner_error_); #line 563 "/home/jens/Source/shotwell/src/Tag.vala" return NULL; -#line 4591 "Tag.c" +#line 4660 "Tag.c" } #line 563 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = tag_new (_tmp8_, DATA_OBJECT_INVALID_OBJECT_ID); + _tmp11_ = tag_new (_tmp6_, DATA_OBJECT_INVALID_OBJECT_ID); #line 563 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (tag); #line 563 "/home/jens/Source/shotwell/src/Tag.vala" - tag = _tmp14_; + tag = _tmp11_; #line 562 "/home/jens/Source/shotwell/src/Tag.vala" - _tag_row_unref0 (_tmp8_); -#line 4601 "Tag.c" + _tag_row_unref0 (_tmp6_); +#line 4670 "Tag.c" } goto __finally482; __catch482_database_error: { GError* err = NULL; - GError* _tmp15_; + GError* _tmp12_; #line 562 "/home/jens/Source/shotwell/src/Tag.vala" err = _inner_error_; #line 562 "/home/jens/Source/shotwell/src/Tag.vala" _inner_error_ = NULL; #line 565 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = err; + _tmp12_ = err; #line 565 "/home/jens/Source/shotwell/src/Tag.vala" - app_window_database_error (_tmp15_); + app_window_database_error (_tmp12_); #line 562 "/home/jens/Source/shotwell/src/Tag.vala" _g_error_free0 (err); -#line 4618 "Tag.c" +#line 4687 "Tag.c" } __finally482: #line 562 "/home/jens/Source/shotwell/src/Tag.vala" @@ -4627,359 +4696,337 @@ Tag* tag_for_path (const gchar* name) { g_clear_error (&_inner_error_); #line 562 "/home/jens/Source/shotwell/src/Tag.vala" return NULL; -#line 4631 "Tag.c" +#line 4700 "Tag.c" } #line 568 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = tag_global; + _tmp13_ = tag_global; #line 568 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = tag; + _tmp14_ = tag; #line 568 "/home/jens/Source/shotwell/src/Tag.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); #line 570 "/home/jens/Source/shotwell/src/Tag.vala" result = tag; #line 570 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 4643 "Tag.c" +#line 4712 "Tag.c" } -GeeCollection* tag_get_terminal_tags (GeeCollection* tags) { +GeeCollection* +tag_get_terminal_tags (GeeCollection* tags) +{ GeeCollection* result = NULL; GeeSet* result_paths = NULL; GeeHashSet* _tmp0_; GeeArrayList* _result_ = NULL; - GeeArrayList* _tmp38_; + GeeArrayList* _tmp34_; #line 573 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (GEE_IS_COLLECTION (tags), NULL); #line 574 "/home/jens/Source/shotwell/src/Tag.vala" _tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 574 "/home/jens/Source/shotwell/src/Tag.vala" result_paths = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet); -#line 4659 "Tag.c" +#line 4730 "Tag.c" { GeeIterator* _tag_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; -#line 576 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = tags; + GeeIterator* _tmp1_; #line 576 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (tags, GEE_TYPE_ITERABLE, GeeIterable)); #line 576 "/home/jens/Source/shotwell/src/Tag.vala" - _tag_it = _tmp2_; + _tag_it = _tmp1_; #line 576 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 4672 "Tag.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 4740 "Tag.c" + GeeIterator* _tmp2_; Tag* tag = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - Tag* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - gboolean _tmp10_; - gboolean _tmp11_; - Tag* _tmp16_; - Tag* _tmp17_; - Tag* _tmp18_; - gboolean _tmp19_; - GeeSet* _tmp34_; - Tag* _tmp35_; - gchar* _tmp36_; - gchar* _tmp37_; -#line 576 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = _tag_it; + GeeIterator* _tmp3_; + gpointer _tmp4_; + Tag* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gboolean _tmp8_; + Tag* _tmp13_; + Tag* _tmp14_; + Tag* _tmp15_; + gboolean _tmp16_; + GeeSet* _tmp30_; + Tag* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; #line 576 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _tag_it; #line 576 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 576 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 4699 "Tag.c" +#line 4763 "Tag.c" } #line 576 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = _tag_it; + _tmp3_ = _tag_it; #line 576 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 576 "/home/jens/Source/shotwell/src/Tag.vala" - tag = (Tag*) _tmp6_; -#line 578 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = tag; + tag = (Tag*) _tmp4_; #line 578 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = tag_get_path (_tmp7_); + _tmp5_ = tag; #line 578 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = _tmp8_; + _tmp6_ = tag_get_path (_tmp5_); #line 578 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = g_str_has_prefix (_tmp9_, TAG_PATH_SEPARATOR_STRING); + _tmp7_ = _tmp6_; #line 578 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = !_tmp10_; + _tmp8_ = !g_str_has_prefix (_tmp7_, TAG_PATH_SEPARATOR_STRING); #line 578 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp7_); #line 578 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp11_) { -#line 4721 "Tag.c" - GeeSet* _tmp12_; - Tag* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; + if (_tmp8_) { +#line 4783 "Tag.c" + GeeSet* _tmp9_; + Tag* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; #line 579 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = result_paths; + _tmp9_ = result_paths; #line 579 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = tag; + _tmp10_ = tag; #line 579 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = tag_get_path (_tmp13_); + _tmp11_ = tag_get_path (_tmp10_); #line 579 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = _tmp14_; + _tmp12_ = _tmp11_; #line 579 "/home/jens/Source/shotwell/src/Tag.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection), _tmp12_); #line 579 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp12_); #line 580 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (tag); #line 580 "/home/jens/Source/shotwell/src/Tag.vala" continue; -#line 4742 "Tag.c" +#line 4804 "Tag.c" } #line 586 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = tag; + _tmp13_ = tag; #line 586 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = tag_get_hierarchical_parent (_tmp16_); + _tmp14_ = tag_get_hierarchical_parent (_tmp13_); #line 586 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = _tmp17_; + _tmp15_ = _tmp14_; #line 586 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp19_ = _tmp18_ != NULL; + _tmp16_ = _tmp15_ != NULL; #line 586 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp15_); #line 586 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp19_) { -#line 4756 "Tag.c" - GeeSet* _tmp20_; - Tag* _tmp21_; - Tag* _tmp22_; - Tag* _tmp23_; - gchar* _tmp24_; - gchar* _tmp25_; - gboolean _tmp26_; - gboolean _tmp27_; -#line 589 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp20_ = result_paths; + if (_tmp16_) { +#line 4818 "Tag.c" + GeeSet* _tmp17_; + Tag* _tmp18_; + Tag* _tmp19_; + Tag* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + gboolean _tmp23_; #line 589 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp21_ = tag; + _tmp17_ = result_paths; #line 589 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp22_ = tag_get_hierarchical_parent (_tmp21_); + _tmp18_ = tag; #line 589 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp23_ = _tmp22_; + _tmp19_ = tag_get_hierarchical_parent (_tmp18_); #line 589 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp24_ = tag_get_path (_tmp23_); + _tmp20_ = _tmp19_; #line 589 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp25_ = _tmp24_; + _tmp21_ = tag_get_path (_tmp20_); #line 589 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp26_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_); + _tmp22_ = _tmp21_; #line 589 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp27_ = _tmp26_; + _tmp23_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection), _tmp22_); #line 589 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp25_); + _g_free0 (_tmp22_); #line 589 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp20_); #line 589 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp27_) { -#line 4787 "Tag.c" - GeeSet* _tmp28_; - Tag* _tmp29_; - Tag* _tmp30_; - Tag* _tmp31_; - gchar* _tmp32_; - gchar* _tmp33_; + if (_tmp23_) { +#line 4846 "Tag.c" + GeeSet* _tmp24_; + Tag* _tmp25_; + Tag* _tmp26_; + Tag* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; #line 590 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp28_ = result_paths; + _tmp24_ = result_paths; #line 590 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp29_ = tag; + _tmp25_ = tag; #line 590 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp30_ = tag_get_hierarchical_parent (_tmp29_); + _tmp26_ = tag_get_hierarchical_parent (_tmp25_); #line 590 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp31_ = _tmp30_; + _tmp27_ = _tmp26_; #line 590 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp32_ = tag_get_path (_tmp31_); + _tmp28_ = tag_get_path (_tmp27_); #line 590 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp33_ = _tmp32_; + _tmp29_ = _tmp28_; #line 590 "/home/jens/Source/shotwell/src/Tag.vala" - gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection), _tmp33_); + gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp29_); #line 590 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp33_); + _g_free0 (_tmp29_); #line 590 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp31_); -#line 4812 "Tag.c" + _g_object_unref0 (_tmp27_); +#line 4871 "Tag.c" } } #line 593 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp34_ = result_paths; + _tmp30_ = result_paths; #line 593 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp35_ = tag; + _tmp31_ = tag; #line 593 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp36_ = tag_get_path (_tmp35_); + _tmp32_ = tag_get_path (_tmp31_); #line 593 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp37_ = _tmp36_; + _tmp33_ = _tmp32_; #line 593 "/home/jens/Source/shotwell/src/Tag.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), _tmp33_); #line 593 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp37_); + _g_free0 (_tmp33_); #line 576 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (tag); -#line 4829 "Tag.c" +#line 4888 "Tag.c" } #line 576 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_tag_it); -#line 4833 "Tag.c" +#line 4892 "Tag.c" } #line 596 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp38_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp34_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 596 "/home/jens/Source/shotwell/src/Tag.vala" - _result_ = _tmp38_; -#line 4839 "Tag.c" + _result_ = _tmp34_; +#line 4898 "Tag.c" { GeeIterator* _path_it = NULL; - GeeSet* _tmp39_; - GeeIterator* _tmp40_; + GeeSet* _tmp35_; + GeeIterator* _tmp36_; #line 597 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp39_ = result_paths; + _tmp35_ = result_paths; #line 597 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp40_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp36_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ITERABLE, GeeIterable)); #line 597 "/home/jens/Source/shotwell/src/Tag.vala" - _path_it = _tmp40_; + _path_it = _tmp36_; #line 597 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 4852 "Tag.c" - GeeIterator* _tmp41_; - gboolean _tmp42_; +#line 4911 "Tag.c" + GeeIterator* _tmp37_; gchar* path = NULL; - GeeIterator* _tmp43_; - gpointer _tmp44_; - TagSourceCollection* _tmp45_; - const gchar* _tmp46_; - gboolean _tmp47_; -#line 597 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp41_ = _path_it; + GeeIterator* _tmp38_; + gpointer _tmp39_; + TagSourceCollection* _tmp40_; + const gchar* _tmp41_; #line 597 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp42_ = gee_iterator_next (_tmp41_); + _tmp37_ = _path_it; #line 597 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp42_) { + if (!gee_iterator_next (_tmp37_)) { #line 597 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 4869 "Tag.c" +#line 4924 "Tag.c" } #line 597 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp43_ = _path_it; + _tmp38_ = _path_it; #line 597 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp44_ = gee_iterator_get (_tmp43_); + _tmp39_ = gee_iterator_get (_tmp38_); #line 597 "/home/jens/Source/shotwell/src/Tag.vala" - path = (gchar*) _tmp44_; -#line 598 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp45_ = tag_global; + path = (gchar*) _tmp39_; #line 598 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp46_ = path; + _tmp40_ = tag_global; #line 598 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp47_ = tag_source_collection_exists (_tmp45_, _tmp46_, FALSE); + _tmp41_ = path; #line 598 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp47_) { -#line 4885 "Tag.c" - GeeArrayList* _tmp48_; - const gchar* _tmp49_; - Tag* _tmp50_; - Tag* _tmp51_; + if (tag_source_collection_exists (_tmp40_, _tmp41_, FALSE)) { +#line 4938 "Tag.c" + GeeArrayList* _tmp42_; + const gchar* _tmp43_; + Tag* _tmp44_; + Tag* _tmp45_; #line 599 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp48_ = _result_; + _tmp42_ = _result_; #line 599 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp49_ = path; + _tmp43_ = path; #line 599 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp50_ = tag_for_path (_tmp49_); + _tmp44_ = tag_for_path (_tmp43_); #line 599 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp51_ = _tmp50_; + _tmp45_ = _tmp44_; #line 599 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp51_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp45_); #line 599 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp51_); -#line 4902 "Tag.c" + _g_object_unref0 (_tmp45_); +#line 4955 "Tag.c" } else { { GeeIterator* _probed_tag_it = NULL; - GeeCollection* _tmp52_; - GeeIterator* _tmp53_; -#line 601 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp52_ = tags; + GeeIterator* _tmp46_; #line 601 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp53_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp46_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (tags, GEE_TYPE_ITERABLE, GeeIterable)); #line 601 "/home/jens/Source/shotwell/src/Tag.vala" - _probed_tag_it = _tmp53_; + _probed_tag_it = _tmp46_; #line 601 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 4916 "Tag.c" - GeeIterator* _tmp54_; - gboolean _tmp55_; +#line 4966 "Tag.c" + GeeIterator* _tmp47_; Tag* probed_tag = NULL; - GeeIterator* _tmp56_; - gpointer _tmp57_; - Tag* _tmp58_; - gchar* _tmp59_; - gchar* _tmp60_; - const gchar* _tmp61_; - gboolean _tmp62_; -#line 601 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp54_ = _probed_tag_it; + GeeIterator* _tmp48_; + gpointer _tmp49_; + Tag* _tmp50_; + gchar* _tmp51_; + gchar* _tmp52_; + const gchar* _tmp53_; + gboolean _tmp54_; #line 601 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp55_ = gee_iterator_next (_tmp54_); + _tmp47_ = _probed_tag_it; #line 601 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp55_) { + if (!gee_iterator_next (_tmp47_)) { #line 601 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 4935 "Tag.c" +#line 4982 "Tag.c" } #line 601 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp56_ = _probed_tag_it; + _tmp48_ = _probed_tag_it; #line 601 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp57_ = gee_iterator_get (_tmp56_); + _tmp49_ = gee_iterator_get (_tmp48_); #line 601 "/home/jens/Source/shotwell/src/Tag.vala" - probed_tag = (Tag*) _tmp57_; + probed_tag = (Tag*) _tmp49_; #line 602 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp58_ = probed_tag; + _tmp50_ = probed_tag; #line 602 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp59_ = tag_get_path (_tmp58_); + _tmp51_ = tag_get_path (_tmp50_); #line 602 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp60_ = _tmp59_; + _tmp52_ = _tmp51_; #line 602 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp61_ = path; + _tmp53_ = path; #line 602 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp62_ = g_strcmp0 (_tmp60_, _tmp61_) == 0; + _tmp54_ = g_strcmp0 (_tmp52_, _tmp53_) == 0; #line 602 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp60_); + _g_free0 (_tmp52_); #line 602 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp62_) { -#line 4957 "Tag.c" - GeeArrayList* _tmp63_; - Tag* _tmp64_; + if (_tmp54_) { +#line 5004 "Tag.c" + GeeArrayList* _tmp55_; + Tag* _tmp56_; #line 603 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp63_ = _result_; + _tmp55_ = _result_; #line 603 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp64_ = probed_tag; + _tmp56_ = probed_tag; #line 603 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp64_); -#line 4966 "Tag.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp56_); +#line 5013 "Tag.c" } #line 601 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (probed_tag); -#line 4970 "Tag.c" +#line 5017 "Tag.c" } #line 601 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_probed_tag_it); -#line 4974 "Tag.c" +#line 5021 "Tag.c" } } #line 597 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (path); -#line 4979 "Tag.c" +#line 5026 "Tag.c" } #line 597 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_path_it); -#line 4983 "Tag.c" +#line 5030 "Tag.c" } #line 608 "/home/jens/Source/shotwell/src/Tag.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_result_, GEE_TYPE_COLLECTION, GeeCollection); @@ -4987,29 +5034,34 @@ GeeCollection* tag_get_terminal_tags (GeeCollection* tags) { _g_object_unref0 (result_paths); #line 608 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 4991 "Tag.c" +#line 5038 "Tag.c" } -static gint _tag_compare_user_visible_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gint +_tag_compare_user_visible_names_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gint result; result = tag_compare_user_visible_names ((Tag*) a, (Tag*) b); #line 623 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 5000 "Tag.c" +#line 5051 "Tag.c" } -GeeList* tag_make_user_visible_tag_list (GeeCollection* tags) { +GeeList* +tag_make_user_visible_tag_list (GeeCollection* tags) +{ GeeList* result = NULL; GeeHashSet* seen_tags = NULL; GeeHashSet* _tmp0_; GeeCollection* terminal_tags = NULL; GeeCollection* _tmp1_; - GeeCollection* _tmp2_; GeeArrayList* sorted_tags = NULL; - GeeArrayList* _tmp3_; - GeeArrayList* _tmp19_; + GeeArrayList* _tmp2_; + GeeArrayList* _tmp16_; #line 612 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (GEE_IS_COLLECTION (tags), NULL); #line 613 "/home/jens/Source/shotwell/src/Tag.vala" @@ -5017,103 +5069,95 @@ GeeList* tag_make_user_visible_tag_list (GeeCollection* tags) { #line 613 "/home/jens/Source/shotwell/src/Tag.vala" seen_tags = _tmp0_; #line 614 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = tags; -#line 614 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = tag_get_terminal_tags (_tmp1_); + _tmp1_ = tag_get_terminal_tags (tags); #line 614 "/home/jens/Source/shotwell/src/Tag.vala" - terminal_tags = _tmp2_; + terminal_tags = _tmp1_; #line 615 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp2_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 615 "/home/jens/Source/shotwell/src/Tag.vala" - sorted_tags = _tmp3_; -#line 5030 "Tag.c" + sorted_tags = _tmp2_; +#line 5080 "Tag.c" { GeeIterator* _tag_it = NULL; - GeeCollection* _tmp4_; - GeeIterator* _tmp5_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; #line 616 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = terminal_tags; + _tmp3_ = terminal_tags; #line 616 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); #line 616 "/home/jens/Source/shotwell/src/Tag.vala" - _tag_it = _tmp5_; + _tag_it = _tmp4_; #line 616 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 5043 "Tag.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 5093 "Tag.c" + GeeIterator* _tmp5_; Tag* tag = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp6_; + gpointer _tmp7_; gchar* user_visible_name = NULL; - Tag* _tmp10_; - gchar* _tmp11_; - GeeHashSet* _tmp12_; - const gchar* _tmp13_; - gboolean _tmp14_; -#line 616 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = _tag_it; + Tag* _tmp8_; + gchar* _tmp9_; + GeeHashSet* _tmp10_; + const gchar* _tmp11_; #line 616 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _tag_it; #line 616 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 616 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 5063 "Tag.c" +#line 5109 "Tag.c" } #line 616 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = _tag_it; + _tmp6_ = _tag_it; #line 616 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 616 "/home/jens/Source/shotwell/src/Tag.vala" - tag = (Tag*) _tmp9_; + tag = (Tag*) _tmp7_; #line 617 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = tag; + _tmp8_ = tag; #line 617 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = tag_get_user_visible_name (_tmp10_); + _tmp9_ = tag_get_user_visible_name (_tmp8_); #line 617 "/home/jens/Source/shotwell/src/Tag.vala" - user_visible_name = _tmp11_; -#line 618 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = seen_tags; + user_visible_name = _tmp9_; #line 618 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = user_visible_name; + _tmp10_ = seen_tags; #line 618 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_); + _tmp11_ = user_visible_name; #line 618 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp14_) { -#line 5085 "Tag.c" - GeeArrayList* _tmp15_; - Tag* _tmp16_; - GeeHashSet* _tmp17_; - const gchar* _tmp18_; + if (!gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_)) { +#line 5129 "Tag.c" + GeeArrayList* _tmp12_; + Tag* _tmp13_; + GeeHashSet* _tmp14_; + const gchar* _tmp15_; #line 619 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = sorted_tags; + _tmp12_ = sorted_tags; #line 619 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = tag; + _tmp13_ = tag; #line 619 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_); #line 620 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = seen_tags; + _tmp14_ = seen_tags; #line 620 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = user_visible_name; + _tmp15_ = user_visible_name; #line 620 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_); -#line 5102 "Tag.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); +#line 5146 "Tag.c" } #line 616 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (user_visible_name); #line 616 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (tag); -#line 5108 "Tag.c" +#line 5152 "Tag.c" } #line 616 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_tag_it); -#line 5112 "Tag.c" +#line 5156 "Tag.c" } #line 623 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp19_ = sorted_tags; + _tmp16_ = sorted_tags; #line 623 "/home/jens/Source/shotwell/src/Tag.vala" - gee_list_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_LIST, GeeList), _tag_compare_user_visible_names_gcompare_data_func, NULL, NULL); + gee_list_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_LIST, GeeList), _tag_compare_user_visible_names_gcompare_data_func, NULL, NULL); #line 624 "/home/jens/Source/shotwell/src/Tag.vala" result = G_TYPE_CHECK_INSTANCE_CAST (sorted_tags, GEE_TYPE_LIST, GeeList); #line 624 "/home/jens/Source/shotwell/src/Tag.vala" @@ -5122,21 +5166,24 @@ GeeList* tag_make_user_visible_tag_list (GeeCollection* tags) { _g_object_unref0 (seen_tags); #line 624 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 5126 "Tag.c" +#line 5170 "Tag.c" } -gchar* tag_make_tag_markup_string (GeeList* tags, gint highlight_index) { +gchar* +tag_make_tag_markup_string (GeeList* tags, + gint highlight_index) +{ gchar* result = NULL; GString* builder = NULL; GString* _tmp0_; gint i = 0; gboolean first = FALSE; - GString* _tmp27_; + GString* _tmp24_; gchar* built = NULL; - GString* _tmp28_; - const gchar* _tmp29_; - gchar* _tmp30_; + GString* _tmp25_; + const gchar* _tmp26_; + gchar* _tmp27_; #line 627 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (GEE_IS_LIST (tags), NULL); #line 628 "/home/jens/Source/shotwell/src/Tag.vala" @@ -5147,220 +5194,219 @@ gchar* tag_make_tag_markup_string (GeeList* tags, gint highlight_index) { i = 0; #line 630 "/home/jens/Source/shotwell/src/Tag.vala" first = TRUE; -#line 5151 "Tag.c" +#line 5198 "Tag.c" { GeeList* _tag_list = NULL; GeeList* _tmp1_; - GeeList* _tmp2_; gint _tag_size = 0; - GeeList* _tmp3_; + GeeList* _tmp2_; + gint _tmp3_; gint _tmp4_; - gint _tmp5_; gint _tag_index = 0; #line 631 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = tags; -#line 631 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (tags); #line 631 "/home/jens/Source/shotwell/src/Tag.vala" - _tag_list = _tmp2_; + _tag_list = _tmp1_; #line 631 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = _tag_list; + _tmp2_ = _tag_list; #line 631 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 631 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 631 "/home/jens/Source/shotwell/src/Tag.vala" - _tag_size = _tmp5_; + _tag_size = _tmp4_; #line 631 "/home/jens/Source/shotwell/src/Tag.vala" _tag_index = -1; #line 631 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 5179 "Tag.c" +#line 5223 "Tag.c" + gint _tmp5_; gint _tmp6_; gint _tmp7_; - gint _tmp8_; Tag* tag = NULL; - GeeList* _tmp9_; - gint _tmp10_; - gpointer _tmp11_; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; gchar* tag_name = NULL; - Tag* _tmp12_; - gchar* _tmp13_; + Tag* _tmp11_; + gchar* _tmp12_; gchar* esc_tag_name = NULL; - const gchar* _tmp14_; - gchar* _tmp15_; - gboolean _tmp16_; - gint _tmp18_; - gint _tmp19_; - GString* _tmp21_; - const gchar* _tmp22_; + const gchar* _tmp13_; + gchar* _tmp14_; + gboolean _tmp15_; + gint _tmp17_; + GString* _tmp19_; + const gchar* _tmp20_; + gint _tmp21_; gint _tmp23_; - gint _tmp24_; - gint _tmp26_; #line 631 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = _tag_index; + _tmp5_ = _tag_index; #line 631 "/home/jens/Source/shotwell/src/Tag.vala" - _tag_index = _tmp6_ + 1; + _tag_index = _tmp5_ + 1; #line 631 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = _tag_index; + _tmp6_ = _tag_index; #line 631 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = _tag_size; + _tmp7_ = _tag_size; #line 631 "/home/jens/Source/shotwell/src/Tag.vala" - if (!(_tmp7_ < _tmp8_)) { + if (!(_tmp6_ < _tmp7_)) { #line 631 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 5213 "Tag.c" +#line 5255 "Tag.c" } #line 631 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = _tag_list; + _tmp8_ = _tag_list; #line 631 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = _tag_index; + _tmp9_ = _tag_index; #line 631 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = gee_list_get (_tmp9_, _tmp10_); + _tmp10_ = gee_list_get (_tmp8_, _tmp9_); #line 631 "/home/jens/Source/shotwell/src/Tag.vala" - tag = (Tag*) _tmp11_; + tag = (Tag*) _tmp10_; #line 632 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = tag; + _tmp11_ = tag; #line 632 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = tag_get_user_visible_name (_tmp12_); + _tmp12_ = tag_get_user_visible_name (_tmp11_); #line 632 "/home/jens/Source/shotwell/src/Tag.vala" - tag_name = _tmp13_; + tag_name = _tmp12_; #line 633 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = tag_name; + _tmp13_ = tag_name; #line 633 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = guarded_markup_escape_text (_tmp14_); + _tmp14_ = guarded_markup_escape_text (_tmp13_); #line 633 "/home/jens/Source/shotwell/src/Tag.vala" - esc_tag_name = _tmp15_; + esc_tag_name = _tmp14_; #line 634 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = first; + _tmp15_ = first; #line 634 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp16_) { + if (_tmp15_) { #line 635 "/home/jens/Source/shotwell/src/Tag.vala" first = FALSE; -#line 5241 "Tag.c" +#line 5283 "Tag.c" } else { - GString* _tmp17_; + GString* _tmp16_; #line 637 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = builder; + _tmp16_ = builder; #line 637 "/home/jens/Source/shotwell/src/Tag.vala" - g_string_append (_tmp17_, TAG_TAG_LIST_SEPARATOR_STRING); -#line 5248 "Tag.c" + g_string_append (_tmp16_, TAG_TAG_LIST_SEPARATOR_STRING); +#line 5290 "Tag.c" } #line 638 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = highlight_index; -#line 638 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp19_ = i; + _tmp17_ = i; #line 638 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp18_ == _tmp19_) { -#line 5256 "Tag.c" - GString* _tmp20_; + if (highlight_index == _tmp17_) { +#line 5296 "Tag.c" + GString* _tmp18_; #line 639 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp20_ = builder; + _tmp18_ = builder; #line 639 "/home/jens/Source/shotwell/src/Tag.vala" - g_string_append (_tmp20_, ""); -#line 5262 "Tag.c" + g_string_append (_tmp18_, ""); +#line 5302 "Tag.c" } #line 640 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp21_ = builder; + _tmp19_ = builder; #line 640 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp22_ = esc_tag_name; + _tmp20_ = esc_tag_name; #line 640 "/home/jens/Source/shotwell/src/Tag.vala" - g_string_append (_tmp21_, _tmp22_); -#line 641 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp23_ = highlight_index; + g_string_append (_tmp19_, _tmp20_); #line 641 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp24_ = i; + _tmp21_ = i; #line 641 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp23_ == _tmp24_) { -#line 5276 "Tag.c" - GString* _tmp25_; + if (highlight_index == _tmp21_) { +#line 5314 "Tag.c" + GString* _tmp22_; #line 642 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp25_ = builder; + _tmp22_ = builder; #line 642 "/home/jens/Source/shotwell/src/Tag.vala" - g_string_append (_tmp25_, ""); -#line 5282 "Tag.c" + g_string_append (_tmp22_, ""); +#line 5320 "Tag.c" } #line 643 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp26_ = i; + _tmp23_ = i; #line 643 "/home/jens/Source/shotwell/src/Tag.vala" - i = _tmp26_ + 1; + i = _tmp23_ + 1; #line 631 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (esc_tag_name); #line 631 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (tag_name); #line 631 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (tag); -#line 5294 "Tag.c" +#line 5332 "Tag.c" } #line 631 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_tag_list); -#line 5298 "Tag.c" +#line 5336 "Tag.c" } #line 646 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp27_ = builder; + _tmp24_ = builder; #line 646 "/home/jens/Source/shotwell/src/Tag.vala" - g_string_append (_tmp27_, ""); + g_string_append (_tmp24_, ""); #line 647 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp28_ = builder; + _tmp25_ = builder; #line 647 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp29_ = _tmp28_->str; + _tmp26_ = _tmp25_->str; #line 647 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp30_ = g_strdup (_tmp29_); + _tmp27_ = g_strdup (_tmp26_); #line 647 "/home/jens/Source/shotwell/src/Tag.vala" - built = _tmp30_; + built = _tmp27_; #line 648 "/home/jens/Source/shotwell/src/Tag.vala" result = built; #line 648 "/home/jens/Source/shotwell/src/Tag.vala" _g_string_free0 (builder); #line 648 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 5318 "Tag.c" +#line 5356 "Tag.c" } -gchar* tag_prep_tag_name (const gchar* name) { +gchar* +tag_prep_tag_name (const gchar* name) +{ gchar* result = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; #line 653 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (name != NULL, NULL); #line 654 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = name; -#line 654 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = prepare_input_text (_tmp0_, PREPARE_INPUT_TEXT_OPTIONS_DEFAULT, DEFAULT_USER_TEXT_INPUT_LENGTH); + _tmp0_ = prepare_input_text (name, PREPARE_INPUT_TEXT_OPTIONS_DEFAULT, DEFAULT_USER_TEXT_INPUT_LENGTH); #line 654 "/home/jens/Source/shotwell/src/Tag.vala" - result = _tmp1_; + result = _tmp0_; #line 654 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 5336 "Tag.c" +#line 5373 "Tag.c" } -static void _vala_array_add128 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add128 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 665 "/home/jens/Source/shotwell/src/Tag.vala" if ((*length) == (*size)) { #line 665 "/home/jens/Source/shotwell/src/Tag.vala" *size = (*size) ? (2 * (*size)) : 4; #line 665 "/home/jens/Source/shotwell/src/Tag.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 5347 "Tag.c" +#line 5389 "Tag.c" } #line 665 "/home/jens/Source/shotwell/src/Tag.vala" (*array)[(*length)++] = value; #line 665 "/home/jens/Source/shotwell/src/Tag.vala" (*array)[*length] = NULL; -#line 5353 "Tag.c" +#line 5395 "Tag.c" } -gchar** tag_prep_tag_names (gchar** names, int names_length1, int* result_length1) { +gchar** +tag_prep_tag_names (gchar** names, + int names_length1, + int* result_length1) +{ gchar** result = NULL; gchar** _result_ = NULL; gchar** _tmp0_; gint _result__length1; gint __result__size_; - gchar** _tmp13_; - gint _tmp13__length1; + gchar** _tmp11_; + gint _tmp11__length1; #line 660 "/home/jens/Source/shotwell/src/Tag.vala" _tmp0_ = g_new0 (gchar*, 0 + 1); #line 660 "/home/jens/Source/shotwell/src/Tag.vala" @@ -5369,169 +5415,154 @@ gchar** tag_prep_tag_names (gchar** names, int names_length1, int* result_length _result__length1 = 0; #line 660 "/home/jens/Source/shotwell/src/Tag.vala" __result__size_ = _result__length1; -#line 5373 "Tag.c" +#line 5419 "Tag.c" { gint ctr = 0; #line 662 "/home/jens/Source/shotwell/src/Tag.vala" ctr = 0; -#line 5378 "Tag.c" +#line 5424 "Tag.c" { gboolean _tmp1_ = FALSE; #line 662 "/home/jens/Source/shotwell/src/Tag.vala" _tmp1_ = TRUE; #line 662 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 5385 "Tag.c" +#line 5431 "Tag.c" gint _tmp3_; - gchar** _tmp4_; - gint _tmp4__length1; gchar* new_name = NULL; - gchar** _tmp5_; - gint _tmp5__length1; - gint _tmp6_; + gint _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; const gchar* _tmp7_; - gchar* _tmp8_; - const gchar* _tmp9_; #line 662 "/home/jens/Source/shotwell/src/Tag.vala" if (!_tmp1_) { -#line 5398 "Tag.c" +#line 5440 "Tag.c" gint _tmp2_; #line 662 "/home/jens/Source/shotwell/src/Tag.vala" _tmp2_ = ctr; #line 662 "/home/jens/Source/shotwell/src/Tag.vala" ctr = _tmp2_ + 1; -#line 5404 "Tag.c" +#line 5446 "Tag.c" } #line 662 "/home/jens/Source/shotwell/src/Tag.vala" _tmp1_ = FALSE; #line 662 "/home/jens/Source/shotwell/src/Tag.vala" _tmp3_ = ctr; #line 662 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = names; -#line 662 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4__length1 = names_length1; -#line 662 "/home/jens/Source/shotwell/src/Tag.vala" - if (!(_tmp3_ < _tmp4__length1)) { + if (!(_tmp3_ < names_length1)) { #line 662 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 5418 "Tag.c" +#line 5456 "Tag.c" } #line 663 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = names; + _tmp4_ = ctr; #line 663 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5__length1 = names_length1; + _tmp5_ = names[_tmp4_]; #line 663 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = ctr; + _tmp6_ = tag_prep_tag_name (_tmp5_); #line 663 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = _tmp5_[_tmp6_]; -#line 663 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = tag_prep_tag_name (_tmp7_); -#line 663 "/home/jens/Source/shotwell/src/Tag.vala" - new_name = _tmp8_; + new_name = _tmp6_; #line 664 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = new_name; + _tmp7_ = new_name; #line 664 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp9_ != NULL) { -#line 5436 "Tag.c" - gchar** _tmp10_; - gint _tmp10__length1; - const gchar* _tmp11_; - gchar* _tmp12_; + if (_tmp7_ != NULL) { +#line 5470 "Tag.c" + gchar** _tmp8_; + gint _tmp8__length1; + const gchar* _tmp9_; + gchar* _tmp10_; #line 665 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = _result_; + _tmp8_ = _result_; #line 665 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10__length1 = _result__length1; + _tmp8__length1 = _result__length1; #line 665 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = new_name; + _tmp9_ = new_name; #line 665 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = g_strdup (_tmp11_); + _tmp10_ = g_strdup (_tmp9_); #line 665 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_array_add128 (&_result_, &_result__length1, &__result__size_, _tmp12_); -#line 5451 "Tag.c" + _vala_array_add128 (&_result_, &_result__length1, &__result__size_, _tmp10_); +#line 5485 "Tag.c" } #line 662 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (new_name); -#line 5455 "Tag.c" +#line 5489 "Tag.c" } } } #line 668 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = _result_; + _tmp11_ = _result_; #line 668 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13__length1 = _result__length1; + _tmp11__length1 = _result__length1; #line 668 "/home/jens/Source/shotwell/src/Tag.vala" if (result_length1) { #line 668 "/home/jens/Source/shotwell/src/Tag.vala" - *result_length1 = _tmp13__length1; -#line 5467 "Tag.c" + *result_length1 = _tmp11__length1; +#line 5501 "Tag.c" } #line 668 "/home/jens/Source/shotwell/src/Tag.vala" - result = _tmp13_; + result = _tmp11_; #line 668 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 5473 "Tag.c" +#line 5507 "Tag.c" } -static void tag_set_raw_flat_name (Tag* self, const gchar* name) { +static void +tag_set_raw_flat_name (Tag* self, + const gchar* name) +{ gchar* prepped_name = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; + const gchar* _tmp1_; const gchar* _tmp2_; - const gchar* _tmp3_; - gboolean _tmp4_; - TagRow* _tmp11_; - const gchar* _tmp12_; - gchar* _tmp13_; - Alteration* _tmp14_; - Alteration* _tmp15_; + TagRow* _tmp9_; + const gchar* _tmp10_; + gchar* _tmp11_; + Alteration* _tmp12_; + Alteration* _tmp13_; GError * _inner_error_ = NULL; #line 671 "/home/jens/Source/shotwell/src/Tag.vala" g_return_if_fail (IS_TAG (self)); #line 671 "/home/jens/Source/shotwell/src/Tag.vala" g_return_if_fail (name != NULL); #line 672 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = name; -#line 672 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = tag_prep_tag_name (_tmp0_); + _tmp0_ = tag_prep_tag_name (name); #line 672 "/home/jens/Source/shotwell/src/Tag.vala" - prepped_name = _tmp1_; + prepped_name = _tmp0_; #line 674 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = prepped_name; + _tmp1_ = prepped_name; #line 674 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (_tmp2_ != NULL, "prepped_name != null"); -#line 675 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = prepped_name; + _vala_assert (_tmp1_ != NULL, "prepped_name != null"); #line 675 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = g_str_has_prefix (_tmp3_, TAG_PATH_SEPARATOR_STRING); + _tmp2_ = prepped_name; #line 675 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (!_tmp4_, "!prepped_name.has_prefix(Tag.PATH_SEPARATOR_STRING)"); -#line 5510 "Tag.c" + _vala_assert (!g_str_has_prefix (_tmp2_, TAG_PATH_SEPARATOR_STRING), "!prepped_name.has_prefix(Tag.PATH_SEPARATOR_STRING)"); +#line 5541 "Tag.c" { - TagTable* _tmp5_; - TagTable* _tmp6_; - TagRow* _tmp7_; - TagID _tmp8_; - const gchar* _tmp9_; + TagTable* _tmp3_; + TagTable* _tmp4_; + TagRow* _tmp5_; + TagID _tmp6_; + const gchar* _tmp7_; #line 678 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = tag_table_get_instance (); + _tmp3_ = tag_table_get_instance (); #line 678 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 678 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = self->priv->row; + _tmp5_ = self->priv->row; #line 678 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = _tmp7_->tag_id; + _tmp6_ = _tmp5_->tag_id; #line 678 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = prepped_name; + _tmp7_ = prepped_name; #line 678 "/home/jens/Source/shotwell/src/Tag.vala" - tag_table_rename (_tmp6_, &_tmp8_, _tmp9_, &_inner_error_); + tag_table_rename (_tmp4_, &_tmp6_, _tmp7_, &_inner_error_); #line 678 "/home/jens/Source/shotwell/src/Tag.vala" - _database_table_unref0 (_tmp6_); + _database_table_unref0 (_tmp4_); #line 678 "/home/jens/Source/shotwell/src/Tag.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 678 "/home/jens/Source/shotwell/src/Tag.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 5535 "Tag.c" +#line 5566 "Tag.c" goto __catch483_database_error; } #line 678 "/home/jens/Source/shotwell/src/Tag.vala" @@ -5542,29 +5573,29 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) { g_clear_error (&_inner_error_); #line 678 "/home/jens/Source/shotwell/src/Tag.vala" return; -#line 5546 "Tag.c" +#line 5577 "Tag.c" } } goto __finally483; __catch483_database_error: { GError* err = NULL; - GError* _tmp10_; + GError* _tmp8_; #line 677 "/home/jens/Source/shotwell/src/Tag.vala" err = _inner_error_; #line 677 "/home/jens/Source/shotwell/src/Tag.vala" _inner_error_ = NULL; #line 680 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = err; + _tmp8_ = err; #line 680 "/home/jens/Source/shotwell/src/Tag.vala" - app_window_database_error (_tmp10_); + app_window_database_error (_tmp8_); #line 681 "/home/jens/Source/shotwell/src/Tag.vala" _g_error_free0 (err); #line 681 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (prepped_name); #line 681 "/home/jens/Source/shotwell/src/Tag.vala" return; -#line 5568 "Tag.c" +#line 5599 "Tag.c" } __finally483: #line 677 "/home/jens/Source/shotwell/src/Tag.vala" @@ -5577,18 +5608,18 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) { g_clear_error (&_inner_error_); #line 677 "/home/jens/Source/shotwell/src/Tag.vala" return; -#line 5581 "Tag.c" +#line 5612 "Tag.c" } #line 684 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = self->priv->row; + _tmp9_ = self->priv->row; #line 684 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = prepped_name; + _tmp10_ = prepped_name; #line 684 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = g_strdup (_tmp12_); + _tmp11_ = g_strdup (_tmp10_); #line 684 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp11_->name); + _g_free0 (_tmp9_->name); #line 684 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_->name = _tmp13_; + _tmp9_->name = _tmp11_; #line 685 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (self->priv->name_collation_key); #line 685 "/home/jens/Source/shotwell/src/Tag.vala" @@ -5596,88 +5627,82 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) { #line 687 "/home/jens/Source/shotwell/src/Tag.vala" tag_update_indexable_keywords (self); #line 689 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = alteration_new_from_list ("metadata:name, indexable:keywords"); + _tmp12_ = alteration_new_from_list ("metadata:name, indexable:keywords"); #line 689 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = _tmp14_; + _tmp13_ = _tmp12_; #line 689 "/home/jens/Source/shotwell/src/Tag.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_); #line 689 "/home/jens/Source/shotwell/src/Tag.vala" - _alteration_unref0 (_tmp15_); + _alteration_unref0 (_tmp13_); #line 671 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (prepped_name); -#line 5609 "Tag.c" +#line 5640 "Tag.c" } -static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_notify) { +static void +tag_set_raw_path (Tag* self, + const gchar* path, + gboolean suppress_notify) +{ gchar* prepped_path = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; + const gchar* _tmp1_; const gchar* _tmp2_; - const gchar* _tmp3_; - gboolean _tmp4_; - TagSourceCollection* _tmp5_; - const gchar* _tmp6_; - gboolean _tmp7_; - TagRow* _tmp14_; - const gchar* _tmp15_; - gchar* _tmp16_; - gboolean _tmp17_; + TagSourceCollection* _tmp3_; + const gchar* _tmp4_; + TagRow* _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; GError * _inner_error_ = NULL; #line 692 "/home/jens/Source/shotwell/src/Tag.vala" g_return_if_fail (IS_TAG (self)); #line 692 "/home/jens/Source/shotwell/src/Tag.vala" g_return_if_fail (path != NULL); #line 693 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = path; + _tmp0_ = tag_prep_tag_name (path); #line 693 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = tag_prep_tag_name (_tmp0_); -#line 693 "/home/jens/Source/shotwell/src/Tag.vala" - prepped_path = _tmp1_; + prepped_path = _tmp0_; #line 695 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = prepped_path; + _tmp1_ = prepped_path; #line 695 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (_tmp2_ != NULL, "prepped_path != null"); -#line 696 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = prepped_path; + _vala_assert (_tmp1_ != NULL, "prepped_path != null"); #line 696 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = g_str_has_prefix (_tmp3_, TAG_PATH_SEPARATOR_STRING); + _tmp2_ = prepped_path; #line 696 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (_tmp4_, "prepped_path.has_prefix(Tag.PATH_SEPARATOR_STRING)"); -#line 697 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = tag_global; + _vala_assert (g_str_has_prefix (_tmp2_, TAG_PATH_SEPARATOR_STRING), "prepped_path.has_prefix(Tag.PATH_SEPARATOR_STRING)"); #line 697 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = prepped_path; + _tmp3_ = tag_global; #line 697 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = tag_source_collection_exists (_tmp5_, _tmp6_, FALSE); + _tmp4_ = prepped_path; #line 697 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (!_tmp7_, "!Tag.global.exists(prepped_path)"); -#line 5656 "Tag.c" + _vala_assert (!tag_source_collection_exists (_tmp3_, _tmp4_, FALSE), "!Tag.global.exists(prepped_path)"); +#line 5681 "Tag.c" { - TagTable* _tmp8_; - TagTable* _tmp9_; - TagRow* _tmp10_; - TagID _tmp11_; - const gchar* _tmp12_; + TagTable* _tmp5_; + TagTable* _tmp6_; + TagRow* _tmp7_; + TagID _tmp8_; + const gchar* _tmp9_; #line 700 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = tag_table_get_instance (); + _tmp5_ = tag_table_get_instance (); #line 700 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 700 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = self->priv->row; + _tmp7_ = self->priv->row; #line 700 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = _tmp10_->tag_id; + _tmp8_ = _tmp7_->tag_id; #line 700 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = prepped_path; + _tmp9_ = prepped_path; #line 700 "/home/jens/Source/shotwell/src/Tag.vala" - tag_table_rename (_tmp9_, &_tmp11_, _tmp12_, &_inner_error_); + tag_table_rename (_tmp6_, &_tmp8_, _tmp9_, &_inner_error_); #line 700 "/home/jens/Source/shotwell/src/Tag.vala" - _database_table_unref0 (_tmp9_); + _database_table_unref0 (_tmp6_); #line 700 "/home/jens/Source/shotwell/src/Tag.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 700 "/home/jens/Source/shotwell/src/Tag.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 5681 "Tag.c" +#line 5706 "Tag.c" goto __catch484_database_error; } #line 700 "/home/jens/Source/shotwell/src/Tag.vala" @@ -5688,29 +5713,29 @@ static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_no g_clear_error (&_inner_error_); #line 700 "/home/jens/Source/shotwell/src/Tag.vala" return; -#line 5692 "Tag.c" +#line 5717 "Tag.c" } } goto __finally484; __catch484_database_error: { GError* err = NULL; - GError* _tmp13_; + GError* _tmp10_; #line 699 "/home/jens/Source/shotwell/src/Tag.vala" err = _inner_error_; #line 699 "/home/jens/Source/shotwell/src/Tag.vala" _inner_error_ = NULL; #line 702 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = err; + _tmp10_ = err; #line 702 "/home/jens/Source/shotwell/src/Tag.vala" - app_window_database_error (_tmp13_); + app_window_database_error (_tmp10_); #line 703 "/home/jens/Source/shotwell/src/Tag.vala" _g_error_free0 (err); #line 703 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (prepped_path); #line 703 "/home/jens/Source/shotwell/src/Tag.vala" return; -#line 5714 "Tag.c" +#line 5739 "Tag.c" } __finally484: #line 699 "/home/jens/Source/shotwell/src/Tag.vala" @@ -5723,48 +5748,48 @@ static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_no g_clear_error (&_inner_error_); #line 699 "/home/jens/Source/shotwell/src/Tag.vala" return; -#line 5727 "Tag.c" +#line 5752 "Tag.c" } #line 706 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = self->priv->row; + _tmp11_ = self->priv->row; #line 706 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = prepped_path; + _tmp12_ = prepped_path; #line 706 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = g_strdup (_tmp15_); + _tmp13_ = g_strdup (_tmp12_); #line 706 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp14_->name); + _g_free0 (_tmp11_->name); #line 706 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_->name = _tmp16_; + _tmp11_->name = _tmp13_; #line 707 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (self->priv->name_collation_key); #line 707 "/home/jens/Source/shotwell/src/Tag.vala" self->priv->name_collation_key = NULL; #line 709 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = suppress_notify; -#line 709 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp17_) { -#line 5747 "Tag.c" - Alteration* _tmp18_; - Alteration* _tmp19_; + if (!suppress_notify) { +#line 5770 "Tag.c" + Alteration* _tmp14_; + Alteration* _tmp15_; #line 710 "/home/jens/Source/shotwell/src/Tag.vala" tag_update_indexable_keywords (self); #line 711 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = alteration_new_from_list ("metadata:name, indexable:keywords"); + _tmp14_ = alteration_new_from_list ("metadata:name, indexable:keywords"); #line 711 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp19_ = _tmp18_; + _tmp15_ = _tmp14_; #line 711 "/home/jens/Source/shotwell/src/Tag.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp19_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_); #line 711 "/home/jens/Source/shotwell/src/Tag.vala" - _alteration_unref0 (_tmp19_); -#line 5760 "Tag.c" + _alteration_unref0 (_tmp15_); +#line 5783 "Tag.c" } #line 692 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (prepped_path); -#line 5764 "Tag.c" +#line 5787 "Tag.c" } -static gchar* tag_real_get_typename (DataSource* base) { +static gchar* +tag_real_get_typename (DataSource* base) +{ Tag * self; gchar* result = NULL; gchar* _tmp0_; @@ -5776,11 +5801,13 @@ static gchar* tag_real_get_typename (DataSource* base) { result = _tmp0_; #line 716 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 5780 "Tag.c" +#line 5805 "Tag.c" } -static gint64 tag_real_get_instance_id (DataSource* base) { +static gint64 +tag_real_get_instance_id (DataSource* base) +{ Tag * self; gint64 result = 0LL; TagID _tmp0_ = {0}; @@ -5795,11 +5822,13 @@ static gint64 tag_real_get_instance_id (DataSource* base) { result = _tmp1_; #line 720 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 5799 "Tag.c" +#line 5826 "Tag.c" } -static gchar* tag_real_get_name (DataObject* base) { +static gchar* +tag_real_get_name (DataObject* base) +{ Tag * self; gchar* result = NULL; TagRow* _tmp0_; @@ -5817,11 +5846,13 @@ static gchar* tag_real_get_name (DataObject* base) { result = _tmp2_; #line 724 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 5821 "Tag.c" +#line 5850 "Tag.c" } -gchar* tag_get_path (Tag* self) { +gchar* +tag_get_path (Tag* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 727 "/home/jens/Source/shotwell/src/Tag.vala" @@ -5832,11 +5863,13 @@ gchar* tag_get_path (Tag* self) { result = _tmp0_; #line 728 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 5836 "Tag.c" +#line 5867 "Tag.c" } -gchar* tag_get_user_visible_name (Tag* self) { +gchar* +tag_get_user_visible_name (Tag* self) +{ gchar* result = NULL; gchar* _tmp0_; gchar* _tmp1_; @@ -5858,11 +5891,13 @@ gchar* tag_get_user_visible_name (Tag* self) { result = _tmp3_; #line 732 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 5862 "Tag.c" +#line 5895 "Tag.c" } -gchar* tag_get_searchable_name (Tag* self) { +gchar* +tag_get_searchable_name (Tag* self) +{ gchar* result = NULL; gchar* istring = NULL; gchar* _tmp0_; @@ -5900,11 +5935,13 @@ gchar* tag_get_searchable_name (Tag* self) { _g_free0 (istring); #line 737 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 5904 "Tag.c" +#line 5939 "Tag.c" } -void tag_flatten (Tag* self) { +void +tag_flatten (Tag* self) +{ Tag* _tmp0_; Tag* _tmp1_; gchar* _tmp2_; @@ -5927,19 +5964,20 @@ void tag_flatten (Tag* self) { tag_set_raw_flat_name (self, _tmp3_); #line 743 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (_tmp3_); -#line 5931 "Tag.c" +#line 5968 "Tag.c" } -void tag_promote (Tag* self) { +void +tag_promote (Tag* self) +{ gchar* _tmp0_; gchar* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; + gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; #line 746 "/home/jens/Source/shotwell/src/Tag.vala" g_return_if_fail (IS_TAG (self)); #line 747 "/home/jens/Source/shotwell/src/Tag.vala" @@ -5948,56 +5986,54 @@ void tag_promote (Tag* self) { _tmp1_ = _tmp0_; #line 747 "/home/jens/Source/shotwell/src/Tag.vala" _tmp2_ = g_str_has_prefix (_tmp1_, TAG_PATH_SEPARATOR_STRING); -#line 747 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = _tmp2_; #line 747 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (_tmp1_); #line 747 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp3_) { + if (_tmp2_) { #line 748 "/home/jens/Source/shotwell/src/Tag.vala" return; -#line 5960 "Tag.c" +#line 5996 "Tag.c" } #line 750 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = tag_get_path (self); + _tmp3_ = tag_get_path (self); #line 750 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 750 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp5_, NULL); + _tmp5_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp4_, NULL); #line 750 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 750 "/home/jens/Source/shotwell/src/Tag.vala" - tag_set_raw_path (self, _tmp7_, FALSE); + tag_set_raw_path (self, _tmp6_, FALSE); #line 750 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 750 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp5_); -#line 5976 "Tag.c" + _g_free0 (_tmp4_); +#line 6012 "Tag.c" } -Tag* tag_get_hierarchical_parent (Tag* self) { +Tag* +tag_get_hierarchical_parent (Tag* self) +{ Tag* result = NULL; gchar* _tmp0_; gchar* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; GeeList* components = NULL; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; + GeeList* _tmp5_; GeeList* _tmp6_; GeeList* _tmp7_; - GeeList* _tmp8_; + gint _tmp8_; gint _tmp9_; - gint _tmp10_; - GeeList* _tmp11_; + GeeList* _tmp10_; + gint _tmp11_; gint _tmp12_; - gint _tmp13_; gchar* parent_path = NULL; - gchar* _tmp14_; - TagSourceCollection* _tmp29_; - const gchar* _tmp30_; - gboolean _tmp31_; + gchar* _tmp13_; + TagSourceCollection* _tmp28_; + const gchar* _tmp29_; #line 753 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG (self), NULL); #line 755 "/home/jens/Source/shotwell/src/Tag.vala" @@ -6005,162 +6041,158 @@ Tag* tag_get_hierarchical_parent (Tag* self) { #line 755 "/home/jens/Source/shotwell/src/Tag.vala" _tmp1_ = _tmp0_; #line 755 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = g_str_has_prefix (_tmp1_, TAG_PATH_SEPARATOR_STRING); -#line 755 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = !_tmp2_; + _tmp2_ = !g_str_has_prefix (_tmp1_, TAG_PATH_SEPARATOR_STRING); #line 755 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (_tmp1_); #line 755 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp3_) { + if (_tmp2_) { #line 756 "/home/jens/Source/shotwell/src/Tag.vala" result = NULL; #line 756 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 6020 "Tag.c" +#line 6054 "Tag.c" } #line 758 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = tag_get_path (self); + _tmp3_ = tag_get_path (self); #line 758 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 758 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = hierarchical_tag_utilities_enumerate_path_components (_tmp5_); + _tmp5_ = hierarchical_tag_utilities_enumerate_path_components (_tmp4_); #line 758 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 758 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp4_); #line 758 "/home/jens/Source/shotwell/src/Tag.vala" - components = _tmp7_; + components = _tmp6_; #line 761 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = components; + _tmp7_ = components; #line 761 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); #line 761 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 761 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (_tmp10_ > 0, "components.size > 0"); + _vala_assert (_tmp9_ > 0, "components.size > 0"); #line 763 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = components; + _tmp10_ = components; #line 763 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp11_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection)); #line 763 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 763 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp13_ == 1) { + if (_tmp12_ == 1) { #line 764 "/home/jens/Source/shotwell/src/Tag.vala" result = NULL; #line 764 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (components); #line 764 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 6056 "Tag.c" +#line 6090 "Tag.c" } #line 767 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = g_strdup (""); + _tmp13_ = g_strdup (""); #line 767 "/home/jens/Source/shotwell/src/Tag.vala" - parent_path = _tmp14_; -#line 6062 "Tag.c" + parent_path = _tmp13_; +#line 6096 "Tag.c" { gint i = 0; #line 768 "/home/jens/Source/shotwell/src/Tag.vala" i = 0; -#line 6067 "Tag.c" +#line 6101 "Tag.c" { - gboolean _tmp15_ = FALSE; + gboolean _tmp14_ = FALSE; #line 768 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = TRUE; + _tmp14_ = TRUE; #line 768 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 6074 "Tag.c" - gint _tmp17_; - GeeList* _tmp18_; +#line 6108 "Tag.c" + gint _tmp16_; + GeeList* _tmp17_; + gint _tmp18_; gint _tmp19_; - gint _tmp20_; - const gchar* _tmp21_; - GeeList* _tmp22_; - gint _tmp23_; - gpointer _tmp24_; + const gchar* _tmp20_; + GeeList* _tmp21_; + gint _tmp22_; + gpointer _tmp23_; + gchar* _tmp24_; gchar* _tmp25_; gchar* _tmp26_; gchar* _tmp27_; - gchar* _tmp28_; #line 768 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp15_) { -#line 6089 "Tag.c" - gint _tmp16_; + if (!_tmp14_) { +#line 6123 "Tag.c" + gint _tmp15_; #line 768 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = i; + _tmp15_ = i; #line 768 "/home/jens/Source/shotwell/src/Tag.vala" - i = _tmp16_ + 1; -#line 6095 "Tag.c" + i = _tmp15_ + 1; +#line 6129 "Tag.c" } #line 768 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = FALSE; + _tmp14_ = FALSE; #line 768 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = i; + _tmp16_ = i; #line 768 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = components; + _tmp17_ = components; #line 768 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection)); #line 768 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 768 "/home/jens/Source/shotwell/src/Tag.vala" - if (!(_tmp17_ < (_tmp20_ - 1))) { + if (!(_tmp16_ < (_tmp19_ - 1))) { #line 768 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 6111 "Tag.c" +#line 6145 "Tag.c" } #line 769 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp21_ = parent_path; + _tmp20_ = parent_path; #line 769 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp22_ = components; + _tmp21_ = components; #line 769 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp23_ = i; + _tmp22_ = i; #line 769 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp24_ = gee_list_get (_tmp22_, _tmp23_); + _tmp23_ = gee_list_get (_tmp21_, _tmp22_); #line 769 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp25_ = (gchar*) _tmp24_; + _tmp24_ = (gchar*) _tmp23_; #line 769 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp26_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp25_, NULL); + _tmp25_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp24_, NULL); #line 769 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp27_ = _tmp26_; + _tmp26_ = _tmp25_; #line 769 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp28_ = g_strconcat (_tmp21_, _tmp27_, NULL); + _tmp27_ = g_strconcat (_tmp20_, _tmp26_, NULL); #line 769 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (parent_path); #line 769 "/home/jens/Source/shotwell/src/Tag.vala" - parent_path = _tmp28_; + parent_path = _tmp27_; #line 769 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp27_); + _g_free0 (_tmp26_); #line 769 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp25_); -#line 6137 "Tag.c" + _g_free0 (_tmp24_); +#line 6171 "Tag.c" } } } #line 771 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp29_ = tag_global; + _tmp28_ = tag_global; #line 771 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp30_ = parent_path; + _tmp29_ = parent_path; #line 771 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp31_ = tag_source_collection_exists (_tmp29_, _tmp30_, FALSE); -#line 771 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp31_) { -#line 6149 "Tag.c" - const gchar* _tmp32_; - Tag* _tmp33_; + if (tag_source_collection_exists (_tmp28_, _tmp29_, FALSE)) { +#line 6181 "Tag.c" + const gchar* _tmp30_; + Tag* _tmp31_; #line 772 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp32_ = parent_path; + _tmp30_ = parent_path; #line 772 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp33_ = tag_for_path (_tmp32_); + _tmp31_ = tag_for_path (_tmp30_); #line 772 "/home/jens/Source/shotwell/src/Tag.vala" - result = _tmp33_; + result = _tmp31_; #line 772 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (parent_path); #line 772 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (components); #line 772 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 6164 "Tag.c" +#line 6196 "Tag.c" } else { #line 774 "/home/jens/Source/shotwell/src/Tag.vala" result = NULL; @@ -6170,126 +6202,117 @@ Tag* tag_get_hierarchical_parent (Tag* self) { _g_object_unref0 (components); #line 774 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 6174 "Tag.c" +#line 6206 "Tag.c" } #line 753 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (parent_path); #line 753 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (components); -#line 6180 "Tag.c" +#line 6212 "Tag.c" } -gint tag_get_attachment_count (Tag* self, MediaSource* source) { +gint +tag_get_attachment_count (Tag* self, + MediaSource* source) +{ gint result = 0; - MediaSource* _tmp0_; - gboolean _tmp1_; gint _result_ = 0; #line 777 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG (self), 0); #line 777 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (source), 0); #line 779 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = source; -#line 779 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = tag_contains (self, _tmp0_); -#line 779 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp1_) { + if (!tag_contains (self, source)) { #line 780 "/home/jens/Source/shotwell/src/Tag.vala" result = 0; #line 780 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 6203 "Tag.c" +#line 6232 "Tag.c" } #line 783 "/home/jens/Source/shotwell/src/Tag.vala" _result_ = 1; -#line 6207 "Tag.c" +#line 6236 "Tag.c" { GeeList* _child_list = NULL; - GeeList* _tmp2_; + GeeList* _tmp0_; gint _child_size = 0; - GeeList* _tmp3_; - gint _tmp4_; - gint _tmp5_; + GeeList* _tmp1_; + gint _tmp2_; + gint _tmp3_; gint _child_index = 0; #line 786 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = tag_get_hierarchical_children (self); + _tmp0_ = tag_get_hierarchical_children (self); #line 786 "/home/jens/Source/shotwell/src/Tag.vala" - _child_list = _tmp2_; + _child_list = _tmp0_; #line 786 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = _child_list; + _tmp1_ = _child_list; #line 786 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); #line 786 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 786 "/home/jens/Source/shotwell/src/Tag.vala" - _child_size = _tmp5_; + _child_size = _tmp3_; #line 786 "/home/jens/Source/shotwell/src/Tag.vala" _child_index = -1; #line 786 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 6232 "Tag.c" +#line 6261 "Tag.c" + gint _tmp4_; + gint _tmp5_; gint _tmp6_; - gint _tmp7_; - gint _tmp8_; Tag* child = NULL; - GeeList* _tmp9_; - gint _tmp10_; - gpointer _tmp11_; - Tag* _tmp12_; - MediaSource* _tmp13_; - gboolean _tmp14_; + GeeList* _tmp7_; + gint _tmp8_; + gpointer _tmp9_; + Tag* _tmp10_; #line 786 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = _child_index; + _tmp4_ = _child_index; #line 786 "/home/jens/Source/shotwell/src/Tag.vala" - _child_index = _tmp6_ + 1; + _child_index = _tmp4_ + 1; #line 786 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = _child_index; + _tmp5_ = _child_index; #line 786 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = _child_size; + _tmp6_ = _child_size; #line 786 "/home/jens/Source/shotwell/src/Tag.vala" - if (!(_tmp7_ < _tmp8_)) { + if (!(_tmp5_ < _tmp6_)) { #line 786 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 6255 "Tag.c" +#line 6282 "Tag.c" } #line 786 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = _child_list; + _tmp7_ = _child_list; #line 786 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = _child_index; + _tmp8_ = _child_index; #line 786 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = gee_list_get (_tmp9_, _tmp10_); + _tmp9_ = gee_list_get (_tmp7_, _tmp8_); #line 786 "/home/jens/Source/shotwell/src/Tag.vala" - child = (Tag*) _tmp11_; -#line 787 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = child; + child = (Tag*) _tmp9_; #line 787 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = source; + _tmp10_ = child; #line 787 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = tag_contains (_tmp12_, _tmp13_); -#line 787 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp14_) { -#line 6273 "Tag.c" - gint _tmp15_; + if (tag_contains (_tmp10_, source)) { +#line 6296 "Tag.c" + gint _tmp11_; #line 788 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = _result_; + _tmp11_ = _result_; #line 788 "/home/jens/Source/shotwell/src/Tag.vala" - _result_ = _tmp15_ + 1; -#line 6279 "Tag.c" + _result_ = _tmp11_ + 1; +#line 6302 "Tag.c" } #line 786 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (child); -#line 6283 "Tag.c" +#line 6306 "Tag.c" } #line 786 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_child_list); -#line 6287 "Tag.c" +#line 6310 "Tag.c" } #line 790 "/home/jens/Source/shotwell/src/Tag.vala" result = _result_; #line 790 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 6293 "Tag.c" +#line 6316 "Tag.c" } @@ -6297,7 +6320,9 @@ gint tag_get_attachment_count (Tag* self, MediaSource* source) { * gets all hierarchical children of a tag recursively; tags are enumerated from most-derived * to least-derived */ -GeeList* tag_get_hierarchical_children (Tag* self) { +GeeList* +tag_get_hierarchical_children (Tag* self) +{ GeeList* result = NULL; GeeArrayList* _result_ = NULL; GeeArrayList* _tmp0_; @@ -6306,14 +6331,13 @@ GeeList* tag_get_hierarchical_children (Tag* self) { gchar* _tmp2_; gchar* _tmp3_; gboolean _tmp4_; - gboolean _tmp5_; GeeTreeSet* forward_sorted_paths = NULL; - GeeTreeSet* _tmp6_; + GeeTreeSet* _tmp5_; gchar* target_path = NULL; + gchar* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; #line 797 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG (self), NULL); #line 798 "/home/jens/Source/shotwell/src/Tag.vala" @@ -6329,233 +6353,222 @@ GeeList* tag_get_hierarchical_children (Tag* self) { #line 802 "/home/jens/Source/shotwell/src/Tag.vala" _tmp3_ = _tmp2_; #line 802 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = g_str_has_prefix (_tmp3_, TAG_PATH_SEPARATOR_STRING); -#line 802 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = !_tmp4_; + _tmp4_ = !g_str_has_prefix (_tmp3_, TAG_PATH_SEPARATOR_STRING); #line 802 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (_tmp3_); #line 802 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp5_) { + if (_tmp4_) { #line 803 "/home/jens/Source/shotwell/src/Tag.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_result_, GEE_TYPE_LIST, GeeList); #line 803 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (result_reversed); #line 803 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 6346 "Tag.c" +#line 6368 "Tag.c" } #line 807 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp5_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 807 "/home/jens/Source/shotwell/src/Tag.vala" - forward_sorted_paths = _tmp6_; + forward_sorted_paths = _tmp5_; #line 809 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = tag_get_path (self); + _tmp6_ = tag_get_path (self); #line 809 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 809 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = g_strconcat (_tmp8_, TAG_PATH_SEPARATOR_STRING, NULL); + _tmp8_ = g_strconcat (_tmp7_, TAG_PATH_SEPARATOR_STRING, NULL); #line 809 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 809 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp7_); #line 809 "/home/jens/Source/shotwell/src/Tag.vala" - target_path = _tmp10_; -#line 6364 "Tag.c" + target_path = _tmp9_; +#line 6386 "Tag.c" { GeeIterator* _path_it = NULL; - TagSourceCollection* _tmp11_; + TagSourceCollection* _tmp10_; + GeeCollection* _tmp11_; GeeCollection* _tmp12_; - GeeCollection* _tmp13_; + GeeIterator* _tmp13_; GeeIterator* _tmp14_; - GeeIterator* _tmp15_; #line 810 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = tag_global; + _tmp10_ = tag_global; #line 810 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = tag_source_collection_get_all_names (_tmp11_); + _tmp11_ = tag_source_collection_get_all_names (_tmp10_); #line 810 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 810 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); #line 810 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 810 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp12_); #line 810 "/home/jens/Source/shotwell/src/Tag.vala" - _path_it = _tmp15_; + _path_it = _tmp14_; #line 810 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 6388 "Tag.c" - GeeIterator* _tmp16_; - gboolean _tmp17_; +#line 6410 "Tag.c" + GeeIterator* _tmp15_; gchar* path = NULL; - GeeIterator* _tmp18_; - gpointer _tmp19_; - const gchar* _tmp20_; - const gchar* _tmp21_; - gboolean _tmp22_; -#line 810 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = _path_it; + GeeIterator* _tmp16_; + gpointer _tmp17_; + const gchar* _tmp18_; + const gchar* _tmp19_; #line 810 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = gee_iterator_next (_tmp16_); + _tmp15_ = _path_it; #line 810 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp17_) { + if (!gee_iterator_next (_tmp15_)) { #line 810 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 6405 "Tag.c" +#line 6423 "Tag.c" } #line 810 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = _path_it; + _tmp16_ = _path_it; #line 810 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp19_ = gee_iterator_get (_tmp18_); + _tmp17_ = gee_iterator_get (_tmp16_); #line 810 "/home/jens/Source/shotwell/src/Tag.vala" - path = (gchar*) _tmp19_; -#line 811 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp20_ = path; + path = (gchar*) _tmp17_; #line 811 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp21_ = target_path; + _tmp18_ = path; #line 811 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp22_ = g_str_has_prefix (_tmp20_, _tmp21_); + _tmp19_ = target_path; #line 811 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp22_) { -#line 6421 "Tag.c" - GeeTreeSet* _tmp23_; - const gchar* _tmp24_; + if (g_str_has_prefix (_tmp18_, _tmp19_)) { +#line 6437 "Tag.c" + GeeTreeSet* _tmp20_; + const gchar* _tmp21_; #line 812 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp23_ = forward_sorted_paths; + _tmp20_ = forward_sorted_paths; #line 812 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp24_ = path; + _tmp21_ = path; #line 812 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_); -#line 6430 "Tag.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); +#line 6446 "Tag.c" } #line 810 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (path); -#line 6434 "Tag.c" +#line 6450 "Tag.c" } #line 810 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_path_it); -#line 6438 "Tag.c" +#line 6454 "Tag.c" } { GeeIterator* _tmp_it = NULL; - GeeTreeSet* _tmp25_; - GeeIterator* _tmp26_; + GeeTreeSet* _tmp22_; + GeeIterator* _tmp23_; #line 815 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp25_ = forward_sorted_paths; + _tmp22_ = forward_sorted_paths; #line 815 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp26_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp23_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 815 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp_it = _tmp26_; + _tmp_it = _tmp23_; #line 815 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 6452 "Tag.c" - GeeIterator* _tmp27_; - gboolean _tmp28_; +#line 6468 "Tag.c" + GeeIterator* _tmp24_; gchar* tmp = NULL; - GeeIterator* _tmp29_; - gpointer _tmp30_; - GeeArrayList* _tmp31_; - const gchar* _tmp32_; - Tag* _tmp33_; - Tag* _tmp34_; -#line 815 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp27_ = _tmp_it; + GeeIterator* _tmp25_; + gpointer _tmp26_; + GeeArrayList* _tmp27_; + const gchar* _tmp28_; + Tag* _tmp29_; + Tag* _tmp30_; #line 815 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp28_ = gee_iterator_next (_tmp27_); + _tmp24_ = _tmp_it; #line 815 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp28_) { + if (!gee_iterator_next (_tmp24_)) { #line 815 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 6470 "Tag.c" +#line 6483 "Tag.c" } #line 815 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp29_ = _tmp_it; + _tmp25_ = _tmp_it; #line 815 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp30_ = gee_iterator_get (_tmp29_); + _tmp26_ = gee_iterator_get (_tmp25_); #line 815 "/home/jens/Source/shotwell/src/Tag.vala" - tmp = (gchar*) _tmp30_; + tmp = (gchar*) _tmp26_; #line 816 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp31_ = result_reversed; + _tmp27_ = result_reversed; #line 816 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp32_ = tmp; + _tmp28_ = tmp; #line 816 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp33_ = tag_for_path (_tmp32_); + _tmp29_ = tag_for_path (_tmp28_); #line 816 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp34_ = _tmp33_; + _tmp30_ = _tmp29_; #line 816 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp34_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp30_); #line 816 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp34_); + _g_object_unref0 (_tmp30_); #line 815 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (tmp); -#line 6492 "Tag.c" +#line 6505 "Tag.c" } #line 815 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_tmp_it); -#line 6496 "Tag.c" +#line 6509 "Tag.c" } { gint index = 0; - GeeArrayList* _tmp35_; - gint _tmp36_; - gint _tmp37_; + GeeArrayList* _tmp31_; + gint _tmp32_; + gint _tmp33_; #line 819 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp35_ = result_reversed; + _tmp31_ = result_reversed; #line 819 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp36_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp32_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 819 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp37_ = _tmp36_; + _tmp33_ = _tmp32_; #line 819 "/home/jens/Source/shotwell/src/Tag.vala" - index = _tmp37_ - 1; -#line 6511 "Tag.c" + index = _tmp33_ - 1; +#line 6524 "Tag.c" { - gboolean _tmp38_ = FALSE; + gboolean _tmp34_ = FALSE; #line 819 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp38_ = TRUE; + _tmp34_ = TRUE; #line 819 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 6518 "Tag.c" - gint _tmp40_; - GeeArrayList* _tmp41_; - GeeArrayList* _tmp42_; - gint _tmp43_; - gpointer _tmp44_; - Tag* _tmp45_; +#line 6531 "Tag.c" + gint _tmp36_; + GeeArrayList* _tmp37_; + GeeArrayList* _tmp38_; + gint _tmp39_; + gpointer _tmp40_; + Tag* _tmp41_; #line 819 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp38_) { -#line 6527 "Tag.c" - gint _tmp39_; + if (!_tmp34_) { +#line 6540 "Tag.c" + gint _tmp35_; #line 819 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp39_ = index; + _tmp35_ = index; #line 819 "/home/jens/Source/shotwell/src/Tag.vala" - index = _tmp39_ - 1; -#line 6533 "Tag.c" + index = _tmp35_ - 1; +#line 6546 "Tag.c" } #line 819 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp38_ = FALSE; + _tmp34_ = FALSE; #line 819 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp40_ = index; + _tmp36_ = index; #line 819 "/home/jens/Source/shotwell/src/Tag.vala" - if (!(_tmp40_ >= 0)) { + if (!(_tmp36_ >= 0)) { #line 819 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 6543 "Tag.c" +#line 6556 "Tag.c" } #line 820 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp41_ = _result_; + _tmp37_ = _result_; #line 820 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp42_ = result_reversed; + _tmp38_ = result_reversed; #line 820 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp43_ = index; + _tmp39_ = index; #line 820 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp44_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp43_); + _tmp40_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp39_); #line 820 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp45_ = (Tag*) _tmp44_; + _tmp41_ = (Tag*) _tmp40_; #line 820 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp45_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp41_); #line 820 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp45_); -#line 6559 "Tag.c" + _g_object_unref0 (_tmp41_); +#line 6572 "Tag.c" } } } @@ -6569,160 +6582,152 @@ GeeList* tag_get_hierarchical_children (Tag* self) { _g_object_unref0 (result_reversed); #line 823 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 6573 "Tag.c" +#line 6586 "Tag.c" } -static gchar* tag_get_next_untitled_tag_name (const gchar* _prefix) { +static gchar* +tag_get_next_untitled_tag_name (const gchar* _prefix) +{ gchar* result = NULL; const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; gchar* prefix = NULL; - gchar* _tmp3_; + gchar* _tmp1_; gchar* candidate_name = NULL; - gchar* _tmp4_; + gchar* _tmp2_; guint64 counter = 0ULL; #line 829 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = _prefix; -#line 829 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp1_ != NULL) { -#line 6590 "Tag.c" - const gchar* _tmp2_; -#line 829 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = _prefix; + if (_prefix != NULL) { #line 829 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = _tmp2_; -#line 6596 "Tag.c" + _tmp0_ = _prefix; +#line 6604 "Tag.c" } else { #line 829 "/home/jens/Source/shotwell/src/Tag.vala" _tmp0_ = ""; -#line 6600 "Tag.c" +#line 6608 "Tag.c" } #line 829 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = g_strdup (_tmp0_); + _tmp1_ = g_strdup (_tmp0_); #line 829 "/home/jens/Source/shotwell/src/Tag.vala" - prefix = _tmp3_; + prefix = _tmp1_; #line 830 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = g_strdup (_ ("untitled")); + _tmp2_ = g_strdup (_ ("untitled")); #line 830 "/home/jens/Source/shotwell/src/Tag.vala" - candidate_name = _tmp4_; + candidate_name = _tmp2_; #line 831 "/home/jens/Source/shotwell/src/Tag.vala" counter = (guint64) 0; -#line 6612 "Tag.c" +#line 6620 "Tag.c" { - gboolean _tmp5_ = FALSE; + gboolean _tmp3_ = FALSE; #line 832 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = TRUE; + _tmp3_ = TRUE; #line 832 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 6619 "Tag.c" - gchar* _tmp7_ = NULL; - guint64 _tmp8_; +#line 6627 "Tag.c" + gchar* _tmp5_ = NULL; + guint64 _tmp6_; gchar* path_candidate = NULL; - const gchar* _tmp14_; - const gchar* _tmp15_; + const gchar* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; gchar* _tmp16_; gchar* _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; - TagSourceCollection* _tmp20_; - const gchar* _tmp21_; - gboolean _tmp22_; - guint64 _tmp23_; + TagSourceCollection* _tmp18_; + const gchar* _tmp19_; + guint64 _tmp20_; #line 832 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp5_) { -#line 6635 "Tag.c" - guint64 _tmp6_; + if (!_tmp3_) { +#line 6642 "Tag.c" + guint64 _tmp4_; #line 840 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = counter; + _tmp4_ = counter; #line 840 "/home/jens/Source/shotwell/src/Tag.vala" - if (!(_tmp6_ < G_MAXUINT64)) { + if (!(_tmp4_ < G_MAXUINT64)) { #line 840 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 6643 "Tag.c" +#line 6650 "Tag.c" } } #line 832 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = FALSE; + _tmp3_ = FALSE; #line 834 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = counter; + _tmp6_ = counter; #line 834 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp8_ == ((guint64) 0)) { -#line 6652 "Tag.c" - gchar* _tmp9_; + if (_tmp6_ == ((guint64) 0)) { +#line 6659 "Tag.c" + gchar* _tmp7_; #line 834 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = g_strdup (""); + _tmp7_ = g_strdup (""); #line 834 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp5_); #line 834 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = _tmp9_; -#line 6660 "Tag.c" + _tmp5_ = _tmp7_; +#line 6667 "Tag.c" } else { - guint64 _tmp10_; + guint64 _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; #line 834 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = counter; + _tmp8_ = counter; #line 834 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = g_strdup_printf ("%" G_GUINT64_FORMAT, _tmp10_); + _tmp9_ = g_strdup_printf ("%" G_GUINT64_FORMAT, _tmp8_); #line 834 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 834 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = g_strconcat (" ", _tmp12_, NULL); + _tmp11_ = g_strconcat (" ", _tmp10_, NULL); #line 834 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp5_); #line 834 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = _tmp13_; + _tmp5_ = _tmp11_; #line 834 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp12_); -#line 6680 "Tag.c" + _g_free0 (_tmp10_); +#line 6687 "Tag.c" } #line 833 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = prefix; + _tmp12_ = prefix; #line 833 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = candidate_name; + _tmp13_ = candidate_name; #line 833 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = g_strconcat (_tmp14_, _tmp15_, NULL); + _tmp14_ = g_strconcat (_tmp12_, _tmp13_, NULL); #line 833 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = _tmp16_; + _tmp15_ = _tmp14_; #line 833 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = g_strconcat (_tmp17_, _tmp7_, NULL); + _tmp16_ = g_strconcat (_tmp15_, _tmp5_, NULL); #line 833 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp19_ = _tmp18_; + _tmp17_ = _tmp16_; #line 833 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp15_); #line 833 "/home/jens/Source/shotwell/src/Tag.vala" - path_candidate = _tmp19_; + path_candidate = _tmp17_; #line 836 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp20_ = tag_global; + _tmp18_ = tag_global; #line 836 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp21_ = path_candidate; + _tmp19_ = path_candidate; #line 836 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp22_ = tag_source_collection_exists (_tmp20_, _tmp21_, FALSE); -#line 836 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp22_) { + if (!tag_source_collection_exists (_tmp18_, _tmp19_, FALSE)) { #line 837 "/home/jens/Source/shotwell/src/Tag.vala" result = path_candidate; #line 837 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp5_); #line 837 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (candidate_name); #line 837 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (prefix); #line 837 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 6716 "Tag.c" +#line 6721 "Tag.c" } #line 839 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp23_ = counter; + _tmp20_ = counter; #line 839 "/home/jens/Source/shotwell/src/Tag.vala" - counter = _tmp23_ + 1; + counter = _tmp20_ + 1; #line 832 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (path_candidate); #line 832 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp7_); -#line 6726 "Tag.c" + _g_free0 (_tmp5_); +#line 6731 "Tag.c" } } #line 843 "/home/jens/Source/shotwell/src/Tag.vala" @@ -6731,23 +6736,24 @@ static gchar* tag_get_next_untitled_tag_name (const gchar* _prefix) { _g_free0 (candidate_name); #line 828 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (prefix); -#line 6735 "Tag.c" +#line 6740 "Tag.c" } -Tag* tag_create_new_child (Tag* self) { +Tag* +tag_create_new_child (Tag* self) +{ Tag* result = NULL; gchar* path_prefix = NULL; gchar* _tmp0_; const gchar* _tmp1_; - gboolean _tmp2_; - const gchar* _tmp8_; + const gchar* _tmp7_; + gchar* _tmp8_; gchar* _tmp9_; gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; + Tag* _tmp12_; Tag* _tmp13_; - Tag* _tmp14_; #line 846 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG (self), NULL); #line 847 "/home/jens/Source/shotwell/src/Tag.vala" @@ -6757,66 +6763,66 @@ Tag* tag_create_new_child (Tag* self) { #line 849 "/home/jens/Source/shotwell/src/Tag.vala" _tmp1_ = path_prefix; #line 849 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = g_str_has_prefix (_tmp1_, TAG_PATH_SEPARATOR_STRING); -#line 849 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp2_) { -#line 6764 "Tag.c" + if (!g_str_has_prefix (_tmp1_, TAG_PATH_SEPARATOR_STRING)) { +#line 6768 "Tag.c" + gchar* _tmp2_; gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; #line 850 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = tag_get_path (self); + _tmp2_ = tag_get_path (self); #line 850 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 850 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp4_); + _tmp4_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp3_); #line 850 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 850 "/home/jens/Source/shotwell/src/Tag.vala" - tag_set_raw_path (self, _tmp6_, FALSE); + tag_set_raw_path (self, _tmp5_, FALSE); #line 850 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 850 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 852 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = tag_get_path (self); + _tmp6_ = tag_get_path (self); #line 852 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (path_prefix); #line 852 "/home/jens/Source/shotwell/src/Tag.vala" - path_prefix = _tmp7_; -#line 6790 "Tag.c" + path_prefix = _tmp6_; +#line 6794 "Tag.c" } #line 855 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = path_prefix; + _tmp7_ = path_prefix; #line 855 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = g_strconcat (_tmp8_, TAG_PATH_SEPARATOR_STRING, NULL); + _tmp8_ = g_strconcat (_tmp7_, TAG_PATH_SEPARATOR_STRING, NULL); #line 855 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 855 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = tag_get_next_untitled_tag_name (_tmp10_); + _tmp10_ = tag_get_next_untitled_tag_name (_tmp9_); #line 855 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 855 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = tag_for_path (_tmp12_); + _tmp12_ = tag_for_path (_tmp11_); #line 855 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 855 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp11_); #line 855 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp9_); #line 855 "/home/jens/Source/shotwell/src/Tag.vala" - result = _tmp14_; + result = _tmp13_; #line 855 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (path_prefix); #line 855 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 6816 "Tag.c" +#line 6820 "Tag.c" } -Tag* tag_create_new_root (void) { +Tag* +tag_create_new_root (void) +{ Tag* result = NULL; gchar* _tmp0_; gchar* _tmp1_; @@ -6836,11 +6842,13 @@ Tag* tag_create_new_root (void) { result = _tmp3_; #line 859 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 6840 "Tag.c" +#line 6846 "Tag.c" } -gchar* tag_get_name_collation_key (Tag* self) { +gchar* +tag_get_name_collation_key (Tag* self) +{ gchar* result = NULL; const gchar* _tmp0_; const gchar* _tmp4_; @@ -6851,7 +6859,7 @@ gchar* tag_get_name_collation_key (Tag* self) { _tmp0_ = self->priv->name_collation_key; #line 863 "/home/jens/Source/shotwell/src/Tag.vala" if (_tmp0_ == NULL) { -#line 6855 "Tag.c" +#line 6863 "Tag.c" TagRow* _tmp1_; const gchar* _tmp2_; gchar* _tmp3_; @@ -6865,7 +6873,7 @@ gchar* tag_get_name_collation_key (Tag* self) { _g_free0 (self->priv->name_collation_key); #line 864 "/home/jens/Source/shotwell/src/Tag.vala" self->priv->name_collation_key = _tmp3_; -#line 6869 "Tag.c" +#line 6877 "Tag.c" } #line 866 "/home/jens/Source/shotwell/src/Tag.vala" _tmp4_ = self->priv->name_collation_key; @@ -6875,18 +6883,19 @@ gchar* tag_get_name_collation_key (Tag* self) { result = _tmp5_; #line 866 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 6879 "Tag.c" +#line 6887 "Tag.c" } -static gchar* tag_real_to_string (DataObject* base) { +static gchar* +tag_real_to_string (DataObject* base) +{ Tag * self; gchar* result = NULL; TagRow* _tmp0_; const gchar* _tmp1_; ViewCollection* _tmp2_; - gint _tmp3_; - gchar* _tmp4_; + gchar* _tmp3_; #line 869 "/home/jens/Source/shotwell/src/Tag.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag); #line 870 "/home/jens/Source/shotwell/src/Tag.vala" @@ -6896,88 +6905,83 @@ static gchar* tag_real_to_string (DataObject* base) { #line 870 "/home/jens/Source/shotwell/src/Tag.vala" _tmp2_ = self->priv->media_views; #line 870 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection)); -#line 870 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = g_strdup_printf ("Tag %s (%d sources)", _tmp1_, _tmp3_); + _tmp3_ = g_strdup_printf ("Tag %s (%d sources)", _tmp1_, data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection))); #line 870 "/home/jens/Source/shotwell/src/Tag.vala" - result = _tmp4_; + result = _tmp3_; #line 870 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 6907 "Tag.c" +#line 6914 "Tag.c" } -static gboolean tag_real_equals (DataSource* base, DataSource* source) { +static gboolean +tag_real_equals (DataSource* base, + DataSource* source) +{ Tag * self; gboolean result = FALSE; Tag* tag = NULL; - DataSource* _tmp0_; + Tag* _tmp0_; Tag* _tmp1_; - Tag* _tmp2_; - DataSource* _tmp11_; - gboolean _tmp12_; #line 873 "/home/jens/Source/shotwell/src/Tag.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag); #line 873 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail ((source == NULL) || IS_DATA_SOURCE (source), FALSE); #line 875 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = source; -#line 875 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_TAG) ? ((Tag*) _tmp0_) : NULL); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_TAG) ? ((Tag*) source) : NULL); #line 875 "/home/jens/Source/shotwell/src/Tag.vala" - tag = _tmp1_; + tag = _tmp0_; #line 876 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = tag; + _tmp1_ = tag; #line 876 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp2_ != NULL) { -#line 6934 "Tag.c" - Tag* _tmp3_; + if (_tmp1_ != NULL) { +#line 6939 "Tag.c" + Tag* _tmp2_; #line 877 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = tag; + _tmp2_ = tag; #line 877 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp3_ != self) { -#line 6940 "Tag.c" - Tag* _tmp4_; - TagRow* _tmp5_; - TagID _tmp6_; - gint64 _tmp7_; - TagRow* _tmp8_; - TagID _tmp9_; - gint64 _tmp10_; + if (_tmp2_ != self) { +#line 6945 "Tag.c" + Tag* _tmp3_; + TagRow* _tmp4_; + TagID _tmp5_; + gint64 _tmp6_; + TagRow* _tmp7_; + TagID _tmp8_; + gint64 _tmp9_; #line 878 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = tag; + _tmp3_ = tag; #line 878 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = _tmp4_->priv->row; + _tmp4_ = _tmp3_->priv->row; #line 878 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = _tmp5_->tag_id; + _tmp5_ = _tmp4_->tag_id; #line 878 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = _tmp6_.id; + _tmp6_ = _tmp5_.id; #line 878 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = self->priv->row; + _tmp7_ = self->priv->row; #line 878 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = _tmp8_->tag_id; + _tmp8_ = _tmp7_->tag_id; #line 878 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = _tmp9_.id; + _tmp9_ = _tmp8_.id; #line 878 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (_tmp7_ != _tmp10_, "tag.row.tag_id.id != row.tag_id.id"); -#line 6964 "Tag.c" + _vala_assert (_tmp6_ != _tmp9_, "tag.row.tag_id.id != row.tag_id.id"); +#line 6969 "Tag.c" } } #line 882 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = source; -#line 882 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = DATA_SOURCE_CLASS (tag_parent_class)->equals (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), _tmp11_); -#line 882 "/home/jens/Source/shotwell/src/Tag.vala" - result = _tmp12_; + result = DATA_SOURCE_CLASS (tag_parent_class)->equals (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), source); #line 882 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (tag); #line 882 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 6977 "Tag.c" +#line 6978 "Tag.c" } -void tag_get_tag_id (Tag* self, TagID* result) { +void +tag_get_tag_id (Tag* self, + TagID* result) +{ TagRow* _tmp0_; TagID _tmp1_; #line 885 "/home/jens/Source/shotwell/src/Tag.vala" @@ -6990,11 +6994,13 @@ void tag_get_tag_id (Tag* self, TagID* result) { *result = _tmp1_; #line 886 "/home/jens/Source/shotwell/src/Tag.vala" return; -#line 6994 "Tag.c" +#line 6998 "Tag.c" } -static SourceSnapshot* tag_real_save_snapshot (DataSource* base) { +static SourceSnapshot* +tag_real_save_snapshot (DataSource* base) +{ Tag * self; SourceSnapshot* result = NULL; TagTagSnapshot* _tmp0_; @@ -7006,11 +7012,13 @@ static SourceSnapshot* tag_real_save_snapshot (DataSource* base) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_SNAPSHOT, SourceSnapshot); #line 890 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 7010 "Tag.c" +#line 7016 "Tag.c" } -static SourceProxy* tag_real_get_proxy (Proxyable* base) { +static SourceProxy* +tag_real_get_proxy (Proxyable* base) +{ Tag * self; SourceProxy* result = NULL; TagTagProxy* _tmp0_; @@ -7022,50 +7030,47 @@ static SourceProxy* tag_real_get_proxy (Proxyable* base) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_PROXY, SourceProxy); #line 894 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 7026 "Tag.c" +#line 7034 "Tag.c" } -Tag* tag_reconstitute (gint64 object_id, TagRow* row) { +Tag* +tag_reconstitute (gint64 object_id, + TagRow* row) +{ Tag* result = NULL; Tag* tag = NULL; - TagRow* _tmp8_; - gint64 _tmp9_; - Tag* _tmp10_; - TagSourceCollection* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; + Tag* _tmp6_; + TagSourceCollection* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; GError * _inner_error_ = NULL; #line 897 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG_ROW (row), NULL); -#line 7042 "Tag.c" +#line 7051 "Tag.c" { TagID _tmp0_ = {0}; TagTable* _tmp1_; TagTable* _tmp2_; - TagRow* _tmp3_; - TagID _tmp4_ = {0}; - TagID _tmp5_; - TagRow* _tmp6_; + TagID _tmp3_ = {0}; + TagID _tmp4_; #line 900 "/home/jens/Source/shotwell/src/Tag.vala" _tmp1_ = tag_table_get_instance (); #line 900 "/home/jens/Source/shotwell/src/Tag.vala" _tmp2_ = _tmp1_; #line 900 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = row; -#line 900 "/home/jens/Source/shotwell/src/Tag.vala" - tag_table_create_from_row (_tmp2_, _tmp3_, &_tmp4_, &_inner_error_); + tag_table_create_from_row (_tmp2_, row, &_tmp3_, &_inner_error_); #line 900 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 900 "/home/jens/Source/shotwell/src/Tag.vala" _database_table_unref0 (_tmp2_); #line 900 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = _tmp5_; + _tmp0_ = _tmp4_; #line 900 "/home/jens/Source/shotwell/src/Tag.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 900 "/home/jens/Source/shotwell/src/Tag.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 7069 "Tag.c" +#line 7074 "Tag.c" goto __catch485_database_error; } #line 900 "/home/jens/Source/shotwell/src/Tag.vala" @@ -7074,30 +7079,28 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) { g_clear_error (&_inner_error_); #line 900 "/home/jens/Source/shotwell/src/Tag.vala" return NULL; -#line 7078 "Tag.c" +#line 7083 "Tag.c" } #line 900 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = row; -#line 900 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_->tag_id = _tmp0_; -#line 7084 "Tag.c" + row->tag_id = _tmp0_; +#line 7087 "Tag.c" } goto __finally485; __catch485_database_error: { GError* err = NULL; - GError* _tmp7_; + GError* _tmp5_; #line 899 "/home/jens/Source/shotwell/src/Tag.vala" err = _inner_error_; #line 899 "/home/jens/Source/shotwell/src/Tag.vala" _inner_error_ = NULL; #line 902 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = err; + _tmp5_ = err; #line 902 "/home/jens/Source/shotwell/src/Tag.vala" - app_window_database_error (_tmp7_); + app_window_database_error (_tmp5_); #line 899 "/home/jens/Source/shotwell/src/Tag.vala" _g_error_free0 (err); -#line 7101 "Tag.c" +#line 7104 "Tag.c" } __finally485: #line 899 "/home/jens/Source/shotwell/src/Tag.vala" @@ -7108,44 +7111,41 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) { g_clear_error (&_inner_error_); #line 899 "/home/jens/Source/shotwell/src/Tag.vala" return NULL; -#line 7112 "Tag.c" +#line 7115 "Tag.c" } #line 905 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = row; + _tmp6_ = tag_new (row, object_id); #line 905 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = object_id; -#line 905 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = tag_new (_tmp8_, _tmp9_); -#line 905 "/home/jens/Source/shotwell/src/Tag.vala" - tag = _tmp10_; + tag = _tmp6_; #line 906 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = tag_global; + _tmp7_ = tag_global; #line 906 "/home/jens/Source/shotwell/src/Tag.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (tag, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (tag, TYPE_DATA_OBJECT, DataObject)); #line 908 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (tag, TYPE_DATA_OBJECT, DataObject)); + _tmp8_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (tag, TYPE_DATA_OBJECT, DataObject)); #line 908 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = _tmp12_; + _tmp9_ = _tmp8_; #line 908 "/home/jens/Source/shotwell/src/Tag.vala" - g_debug ("Tag.vala:908: Reconstituted %s", _tmp13_); + g_debug ("Tag.vala:908: Reconstituted %s", _tmp9_); #line 908 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp9_); #line 910 "/home/jens/Source/shotwell/src/Tag.vala" result = tag; #line 910 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 7138 "Tag.c" +#line 7137 "Tag.c" } -static gboolean tag_real_has_links (ContainerSource* base) { +static gboolean +tag_real_has_links (ContainerSource* base) +{ Tag * self; gboolean result = FALSE; LibraryPhotoSourceCollection* _tmp0_; SourceBacklink* _tmp1_; SourceBacklink* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 913 "/home/jens/Source/shotwell/src/Tag.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag); #line 914 "/home/jens/Source/shotwell/src/Tag.vala" @@ -7156,19 +7156,19 @@ static gboolean tag_real_has_links (ContainerSource* base) { _tmp2_ = _tmp1_; #line 914 "/home/jens/Source/shotwell/src/Tag.vala" _tmp3_ = source_collection_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp2_); -#line 914 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = _tmp3_; #line 914 "/home/jens/Source/shotwell/src/Tag.vala" _source_backlink_unref0 (_tmp2_); #line 914 "/home/jens/Source/shotwell/src/Tag.vala" - result = _tmp4_; + result = _tmp3_; #line 914 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 7168 "Tag.c" +#line 7166 "Tag.c" } -static SourceBacklink* tag_real_get_backlink (ContainerSource* base) { +static SourceBacklink* +tag_real_get_backlink (ContainerSource* base) +{ Tag * self; SourceBacklink* result = NULL; SourceBacklink* _tmp0_; @@ -7184,11 +7184,13 @@ static SourceBacklink* tag_real_get_backlink (ContainerSource* base) { } -static void tag_real_break_link (ContainerSource* base, DataSource* source) { +static void +tag_real_break_link (ContainerSource* base, + DataSource* source) +{ Tag * self; - DataSource* _tmp0_; + GeeList* _tmp0_; GeeList* _tmp1_; - GeeList* _tmp2_; #line 921 "/home/jens/Source/shotwell/src/Tag.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag); #line 921 "/home/jens/Source/shotwell/src/Tag.vala" @@ -7196,24 +7198,24 @@ static void tag_real_break_link (ContainerSource* base, DataSource* source) { #line 922 "/home/jens/Source/shotwell/src/Tag.vala" self->priv->unlinking = TRUE; #line 924 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = source; -#line 924 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = tag_detach (self, G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); + _tmp0_ = tag_detach (self, G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); #line 924 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 924 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 926 "/home/jens/Source/shotwell/src/Tag.vala" self->priv->unlinking = FALSE; #line 7209 "Tag.c" } -static void tag_real_break_link_many (ContainerSource* base, GeeCollection* sources) { +static void +tag_real_break_link_many (ContainerSource* base, + GeeCollection* sources) +{ Tag * self; - GeeCollection* _tmp0_; + GeeMultiMap* _tmp0_; GeeMultiMap* _tmp1_; - GeeMultiMap* _tmp2_; #line 929 "/home/jens/Source/shotwell/src/Tag.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag); #line 929 "/home/jens/Source/shotwell/src/Tag.vala" @@ -7221,22 +7223,22 @@ static void tag_real_break_link_many (ContainerSource* base, GeeCollection* sour #line 930 "/home/jens/Source/shotwell/src/Tag.vala" self->priv->unlinking = TRUE; #line 932 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = sources; -#line 932 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = tag_detach_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp0_ = tag_detach_many (self, G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_COLLECTION, GeeCollection)); #line 932 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 932 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 934 "/home/jens/Source/shotwell/src/Tag.vala" self->priv->unlinking = FALSE; #line 7234 "Tag.c" } -static void tag_real_establish_link (ContainerSource* base, DataSource* source) { +static void +tag_real_establish_link (ContainerSource* base, + DataSource* source) +{ Tag * self; - DataSource* _tmp0_; #line 937 "/home/jens/Source/shotwell/src/Tag.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag); #line 937 "/home/jens/Source/shotwell/src/Tag.vala" @@ -7244,18 +7246,18 @@ static void tag_real_establish_link (ContainerSource* base, DataSource* source) #line 938 "/home/jens/Source/shotwell/src/Tag.vala" self->priv->relinking = TRUE; #line 940 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = source; -#line 940 "/home/jens/Source/shotwell/src/Tag.vala" - tag_attach (self, G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); + tag_attach (self, G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); #line 942 "/home/jens/Source/shotwell/src/Tag.vala" self->priv->relinking = FALSE; #line 7253 "Tag.c" } -static void tag_real_establish_link_many (ContainerSource* base, GeeCollection* sources) { +static void +tag_real_establish_link_many (ContainerSource* base, + GeeCollection* sources) +{ Tag * self; - GeeCollection* _tmp0_; #line 945 "/home/jens/Source/shotwell/src/Tag.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag); #line 945 "/home/jens/Source/shotwell/src/Tag.vala" @@ -7263,16 +7265,16 @@ static void tag_real_establish_link_many (ContainerSource* base, GeeCollection* #line 946 "/home/jens/Source/shotwell/src/Tag.vala" self->priv->relinking = TRUE; #line 948 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = sources; -#line 948 "/home/jens/Source/shotwell/src/Tag.vala" - tag_attach_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); + tag_attach_many (self, G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_COLLECTION, GeeCollection)); #line 950 "/home/jens/Source/shotwell/src/Tag.vala" self->priv->relinking = FALSE; #line 7272 "Tag.c" } -static void tag_update_indexable_keywords (Tag* self) { +static void +tag_update_indexable_keywords (Tag* self) +{ gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; @@ -7290,11 +7292,13 @@ static void tag_update_indexable_keywords (Tag* self) { self->priv->indexable_keywords = _tmp2_; #line 954 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (_tmp1_); -#line 7294 "Tag.c" +#line 7296 "Tag.c" } -static const gchar* tag_real_get_indexable_keywords (Indexable* base) { +static const gchar* +tag_real_get_indexable_keywords (Indexable* base) +{ Tag * self; const gchar* result = NULL; const gchar* _tmp0_; @@ -7306,11 +7310,14 @@ static const gchar* tag_real_get_indexable_keywords (Indexable* base) { result = _tmp0_; #line 958 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 7310 "Tag.c" +#line 7314 "Tag.c" } -void tag_attach (Tag* self, MediaSource* source) { +void +tag_attach (Tag* self, + MediaSource* source) +{ Tag* attach_to = NULL; Tag* _tmp0_; #line 961 "/home/jens/Source/shotwell/src/Tag.vala" @@ -7323,71 +7330,65 @@ void tag_attach (Tag* self, MediaSource* source) { attach_to = _tmp0_; #line 963 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 7327 "Tag.c" +#line 7334 "Tag.c" Tag* _tmp1_; Tag* _tmp2_; ViewCollection* _tmp3_; - MediaSource* _tmp4_; - gboolean _tmp5_; - Tag* _tmp11_; - Tag* _tmp12_; + Tag* _tmp8_; + Tag* _tmp9_; #line 963 "/home/jens/Source/shotwell/src/Tag.vala" _tmp1_ = attach_to; #line 963 "/home/jens/Source/shotwell/src/Tag.vala" if (!(_tmp1_ != NULL)) { #line 963 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 7341 "Tag.c" +#line 7346 "Tag.c" } #line 964 "/home/jens/Source/shotwell/src/Tag.vala" _tmp2_ = attach_to; #line 964 "/home/jens/Source/shotwell/src/Tag.vala" _tmp3_ = _tmp2_->priv->media_views; #line 964 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = source; -#line 964 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = view_collection_has_view_for_source (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource)); -#line 964 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp5_) { -#line 7353 "Tag.c" - Tag* _tmp6_; - ViewCollection* _tmp7_; - MediaSource* _tmp8_; - ThumbnailView* _tmp9_; - ThumbnailView* _tmp10_; -#line 965 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = attach_to; + if (!view_collection_has_view_for_source (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource))) { +#line 7354 "Tag.c" + Tag* _tmp4_; + ViewCollection* _tmp5_; + ThumbnailView* _tmp6_; + ThumbnailView* _tmp7_; #line 965 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = _tmp6_->priv->media_views; + _tmp4_ = attach_to; #line 965 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = source; + _tmp5_ = _tmp4_->priv->media_views; #line 965 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); + _tmp6_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 965 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = _tmp9_; + _tmp7_ = _tmp6_; #line 965 "/home/jens/Source/shotwell/src/Tag.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject)); #line 965 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp10_); -#line 7373 "Tag.c" + _g_object_unref0 (_tmp7_); +#line 7371 "Tag.c" } #line 968 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = attach_to; + _tmp8_ = attach_to; #line 968 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = tag_get_hierarchical_parent (_tmp11_); + _tmp9_ = tag_get_hierarchical_parent (_tmp8_); #line 968 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (attach_to); #line 968 "/home/jens/Source/shotwell/src/Tag.vala" - attach_to = _tmp12_; -#line 7383 "Tag.c" + attach_to = _tmp9_; +#line 7381 "Tag.c" } #line 961 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (attach_to); -#line 7387 "Tag.c" +#line 7385 "Tag.c" } -void tag_attach_many (Tag* self, GeeCollection* sources) { +void +tag_attach_many (Tag* self, + GeeCollection* sources) +{ Tag* attach_to = NULL; Tag* _tmp0_; #line 972 "/home/jens/Source/shotwell/src/Tag.vala" @@ -7400,164 +7401,157 @@ void tag_attach_many (Tag* self, GeeCollection* sources) { attach_to = _tmp0_; #line 974 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 7404 "Tag.c" +#line 7405 "Tag.c" Tag* _tmp1_; GeeArrayList* view_list = NULL; GeeArrayList* _tmp2_; - GeeArrayList* _tmp17_; - gint _tmp18_; - gint _tmp19_; - Tag* _tmp25_; - Tag* _tmp26_; + GeeArrayList* _tmp14_; + gint _tmp15_; + gint _tmp16_; + Tag* _tmp22_; + Tag* _tmp23_; #line 974 "/home/jens/Source/shotwell/src/Tag.vala" _tmp1_ = attach_to; #line 974 "/home/jens/Source/shotwell/src/Tag.vala" if (!(_tmp1_ != NULL)) { #line 974 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 7419 "Tag.c" +#line 7420 "Tag.c" } #line 975 "/home/jens/Source/shotwell/src/Tag.vala" _tmp2_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 975 "/home/jens/Source/shotwell/src/Tag.vala" view_list = _tmp2_; -#line 7425 "Tag.c" +#line 7426 "Tag.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp3_; - GeeIterator* _tmp4_; -#line 976 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = sources; + GeeIterator* _tmp3_; #line 976 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 976 "/home/jens/Source/shotwell/src/Tag.vala" - _source_it = _tmp4_; + _source_it = _tmp3_; #line 976 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 7438 "Tag.c" - GeeIterator* _tmp5_; - gboolean _tmp6_; +#line 7436 "Tag.c" + GeeIterator* _tmp4_; MediaSource* source = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; - Tag* _tmp9_; - ViewCollection* _tmp10_; - MediaSource* _tmp11_; - gboolean _tmp12_; -#line 976 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = _source_it; + GeeIterator* _tmp5_; + gpointer _tmp6_; + Tag* _tmp7_; + ViewCollection* _tmp8_; + MediaSource* _tmp9_; #line 976 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = gee_iterator_next (_tmp5_); + _tmp4_ = _source_it; #line 976 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp4_)) { #line 976 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 7456 "Tag.c" +#line 7450 "Tag.c" } #line 976 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = _source_it; + _tmp5_ = _source_it; #line 976 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 976 "/home/jens/Source/shotwell/src/Tag.vala" - source = (MediaSource*) _tmp8_; + source = (MediaSource*) _tmp6_; #line 977 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = attach_to; + _tmp7_ = attach_to; #line 977 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = _tmp9_->priv->media_views; + _tmp8_ = _tmp7_->priv->media_views; #line 977 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = source; + _tmp9_ = source; #line 977 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = view_collection_has_view_for_source (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_SOURCE, DataSource)); -#line 977 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp12_) { -#line 7474 "Tag.c" - GeeArrayList* _tmp13_; - MediaSource* _tmp14_; - ThumbnailView* _tmp15_; - ThumbnailView* _tmp16_; + if (!view_collection_has_view_for_source (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_SOURCE, DataSource))) { +#line 7466 "Tag.c" + GeeArrayList* _tmp10_; + MediaSource* _tmp11_; + ThumbnailView* _tmp12_; + ThumbnailView* _tmp13_; #line 978 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = view_list; + _tmp10_ = view_list; #line 978 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = source; + _tmp11_ = source; #line 978 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); + _tmp12_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 978 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = _tmp15_; + _tmp13_ = _tmp12_; #line 978 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_); #line 978 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp16_); -#line 7491 "Tag.c" + _g_object_unref0 (_tmp13_); +#line 7483 "Tag.c" } #line 976 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (source); -#line 7495 "Tag.c" +#line 7487 "Tag.c" } #line 976 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_source_it); -#line 7499 "Tag.c" +#line 7491 "Tag.c" } #line 981 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = view_list; + _tmp14_ = view_list; #line 981 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp15_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 981 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp19_ = _tmp18_; + _tmp16_ = _tmp15_; #line 981 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp19_ > 0) { -#line 7509 "Tag.c" - Tag* _tmp20_; - ViewCollection* _tmp21_; - GeeArrayList* _tmp22_; - GeeCollection* _tmp23_; - GeeCollection* _tmp24_; + if (_tmp16_ > 0) { +#line 7501 "Tag.c" + Tag* _tmp17_; + ViewCollection* _tmp18_; + GeeArrayList* _tmp19_; + GeeCollection* _tmp20_; + GeeCollection* _tmp21_; #line 982 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp20_ = attach_to; + _tmp17_ = attach_to; #line 982 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp21_ = _tmp20_->priv->media_views; + _tmp18_ = _tmp17_->priv->media_views; #line 982 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp22_ = view_list; + _tmp19_ = view_list; #line 982 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp23_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); + _tmp20_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); #line 982 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp24_ = _tmp23_; + _tmp21_ = _tmp20_; #line 982 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp24_); -#line 7527 "Tag.c" + _g_object_unref0 (_tmp21_); +#line 7519 "Tag.c" } #line 984 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp25_ = attach_to; + _tmp22_ = attach_to; #line 984 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp26_ = tag_get_hierarchical_parent (_tmp25_); + _tmp23_ = tag_get_hierarchical_parent (_tmp22_); #line 984 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (attach_to); #line 984 "/home/jens/Source/shotwell/src/Tag.vala" - attach_to = _tmp26_; + attach_to = _tmp23_; #line 974 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (view_list); -#line 7539 "Tag.c" +#line 7531 "Tag.c" } #line 972 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (attach_to); -#line 7543 "Tag.c" +#line 7535 "Tag.c" } -GeeList* tag_detach (Tag* self, MediaSource* source) { +GeeList* +tag_detach (Tag* self, + MediaSource* source) +{ GeeList* result = NULL; DataView* this_view = NULL; ViewCollection* _tmp0_; - MediaSource* _tmp1_; + DataView* _tmp1_; DataView* _tmp2_; - DataView* _tmp3_; GeeList* detached_from = NULL; - GeeArrayList* _tmp4_; - ViewCollection* _tmp29_; - ViewCollection* _tmp30_; - DataView* _tmp31_; - Marker* _tmp32_; - Marker* _tmp33_; - GeeList* _tmp34_; + GeeArrayList* _tmp3_; + ViewCollection* _tmp27_; + ViewCollection* _tmp28_; + DataView* _tmp29_; + Marker* _tmp30_; + Marker* _tmp31_; + GeeList* _tmp32_; #line 991 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG (self), NULL); #line 991 "/home/jens/Source/shotwell/src/Tag.vala" @@ -7565,190 +7559,188 @@ GeeList* tag_detach (Tag* self, MediaSource* source) { #line 992 "/home/jens/Source/shotwell/src/Tag.vala" _tmp0_ = self->priv->media_views; #line 992 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = source; + _tmp1_ = view_collection_get_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #line 992 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = view_collection_get_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource)); -#line 992 "/home/jens/Source/shotwell/src/Tag.vala" - this_view = _tmp2_; + this_view = _tmp1_; #line 993 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = this_view; + _tmp2_ = this_view; #line 993 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 994 "/home/jens/Source/shotwell/src/Tag.vala" result = NULL; #line 994 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (this_view); #line 994 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 7584 "Tag.c" +#line 7576 "Tag.c" } #line 996 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp3_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 996 "/home/jens/Source/shotwell/src/Tag.vala" - detached_from = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList); -#line 7590 "Tag.c" + detached_from = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_LIST, GeeList); +#line 7582 "Tag.c" { GeeList* _child_tag_list = NULL; - GeeList* _tmp5_; + GeeList* _tmp4_; gint _child_tag_size = 0; - GeeList* _tmp6_; + GeeList* _tmp5_; + gint _tmp6_; gint _tmp7_; - gint _tmp8_; gint _child_tag_index = 0; #line 998 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = tag_get_hierarchical_children (self); + _tmp4_ = tag_get_hierarchical_children (self); #line 998 "/home/jens/Source/shotwell/src/Tag.vala" - _child_tag_list = _tmp5_; + _child_tag_list = _tmp4_; #line 998 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = _child_tag_list; + _tmp5_ = _child_tag_list; #line 998 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 998 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 998 "/home/jens/Source/shotwell/src/Tag.vala" - _child_tag_size = _tmp8_; + _child_tag_size = _tmp7_; #line 998 "/home/jens/Source/shotwell/src/Tag.vala" _child_tag_index = -1; #line 998 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 7615 "Tag.c" +#line 7607 "Tag.c" + gint _tmp8_; gint _tmp9_; gint _tmp10_; - gint _tmp11_; Tag* child_tag = NULL; - GeeList* _tmp12_; - gint _tmp13_; - gpointer _tmp14_; + GeeList* _tmp11_; + gint _tmp12_; + gpointer _tmp13_; DataView* child_view = NULL; - Tag* _tmp15_; - ViewCollection* _tmp16_; - MediaSource* _tmp17_; - DataView* _tmp18_; - DataView* _tmp19_; + Tag* _tmp14_; + ViewCollection* _tmp15_; + DataView* _tmp16_; + DataView* _tmp17_; #line 998 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = _child_tag_index; + _tmp8_ = _child_tag_index; #line 998 "/home/jens/Source/shotwell/src/Tag.vala" - _child_tag_index = _tmp9_ + 1; + _child_tag_index = _tmp8_ + 1; #line 998 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = _child_tag_index; + _tmp9_ = _child_tag_index; #line 998 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = _child_tag_size; + _tmp10_ = _child_tag_size; #line 998 "/home/jens/Source/shotwell/src/Tag.vala" - if (!(_tmp10_ < _tmp11_)) { + if (!(_tmp9_ < _tmp10_)) { #line 998 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 7641 "Tag.c" +#line 7632 "Tag.c" } #line 998 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = _child_tag_list; + _tmp11_ = _child_tag_list; #line 998 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = _child_tag_index; + _tmp12_ = _child_tag_index; #line 998 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = gee_list_get (_tmp12_, _tmp13_); + _tmp13_ = gee_list_get (_tmp11_, _tmp12_); #line 998 "/home/jens/Source/shotwell/src/Tag.vala" - child_tag = (Tag*) _tmp14_; -#line 999 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = child_tag; + child_tag = (Tag*) _tmp13_; #line 999 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = _tmp15_->priv->media_views; + _tmp14_ = child_tag; #line 999 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = source; + _tmp15_ = _tmp14_->priv->media_views; #line 999 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = view_collection_get_view_for_source (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource)); + _tmp16_ = view_collection_get_view_for_source (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #line 999 "/home/jens/Source/shotwell/src/Tag.vala" - child_view = _tmp18_; + child_view = _tmp16_; #line 1000 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp19_ = child_view; + _tmp17_ = child_view; #line 1000 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp19_ != NULL) { -#line 7665 "Tag.c" + if (_tmp17_ != NULL) { +#line 7654 "Tag.c" + Tag* _tmp18_; + ViewCollection* _tmp19_; Tag* _tmp20_; ViewCollection* _tmp21_; - Tag* _tmp22_; - ViewCollection* _tmp23_; - DataView* _tmp24_; - Marker* _tmp25_; - Marker* _tmp26_; - GeeList* _tmp27_; - Tag* _tmp28_; + DataView* _tmp22_; + Marker* _tmp23_; + Marker* _tmp24_; + GeeList* _tmp25_; + Tag* _tmp26_; #line 1001 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp20_ = child_tag; + _tmp18_ = child_tag; #line 1001 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp21_ = _tmp20_->priv->media_views; + _tmp19_ = _tmp18_->priv->media_views; #line 1001 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp22_ = child_tag; + _tmp20_ = child_tag; #line 1001 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp23_ = _tmp22_->priv->media_views; + _tmp21_ = _tmp20_->priv->media_views; #line 1001 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp24_ = child_view; + _tmp22_ = child_view; #line 1001 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp25_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_OBJECT, DataObject)); + _tmp23_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject)); #line 1001 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp26_ = _tmp25_; + _tmp24_ = _tmp23_; #line 1001 "/home/jens/Source/shotwell/src/Tag.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection), _tmp26_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_COLLECTION, DataCollection), _tmp24_); #line 1001 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp26_); + _g_object_unref0 (_tmp24_); #line 1002 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp27_ = detached_from; + _tmp25_ = detached_from; #line 1002 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp28_ = child_tag; + _tmp26_ = child_tag; #line 1002 "/home/jens/Source/shotwell/src/Tag.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_); -#line 7699 "Tag.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), _tmp26_); +#line 7688 "Tag.c" } #line 998 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (child_view); #line 998 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (child_tag); -#line 7705 "Tag.c" +#line 7694 "Tag.c" } #line 998 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_child_tag_list); -#line 7709 "Tag.c" +#line 7698 "Tag.c" } #line 1006 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp29_ = self->priv->media_views; + _tmp27_ = self->priv->media_views; #line 1006 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp30_ = self->priv->media_views; + _tmp28_ = self->priv->media_views; #line 1006 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp31_ = this_view; + _tmp29_ = this_view; #line 1006 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp32_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_OBJECT, DataObject)); + _tmp30_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject)); #line 1006 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp33_ = _tmp32_; + _tmp31_ = _tmp30_; #line 1006 "/home/jens/Source/shotwell/src/Tag.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_COLLECTION, DataCollection), _tmp33_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_COLLECTION, DataCollection), _tmp31_); #line 1006 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp33_); + _g_object_unref0 (_tmp31_); #line 1007 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp34_ = detached_from; + _tmp32_ = detached_from; #line 1007 "/home/jens/Source/shotwell/src/Tag.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection), self); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection), self); #line 1009 "/home/jens/Source/shotwell/src/Tag.vala" result = detached_from; #line 1009 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (this_view); #line 1009 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 7735 "Tag.c" +#line 7724 "Tag.c" } -GeeMultiMap* tag_detach_many (Tag* self, GeeCollection* sources) { +GeeMultiMap* +tag_detach_many (Tag* self, + GeeCollection* sources) +{ GeeMultiMap* result = NULL; GeeMultiMap* detached_from = NULL; GeeHashMultiMap* _tmp0_; Marker* marker = NULL; ViewCollection* _tmp1_; Marker* _tmp2_; - ViewCollection* _tmp42_; - Marker* _tmp43_; - GeeMultiMap* _tmp44_ = NULL; - GeeMultiMap* _tmp45_; - gint _tmp46_; - gint _tmp47_; - GeeMultiMap* _tmp49_; + ViewCollection* _tmp40_; + Marker* _tmp41_; + GeeMultiMap* _tmp42_ = NULL; + GeeMultiMap* _tmp43_; + gint _tmp44_; + gint _tmp45_; + GeeMultiMap* _tmp47_; #line 1015 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG (self), NULL); #line 1015 "/home/jens/Source/shotwell/src/Tag.vala" @@ -7763,618 +7755,548 @@ GeeMultiMap* tag_detach_many (Tag* self, GeeCollection* sources) { _tmp2_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)); #line 1018 "/home/jens/Source/shotwell/src/Tag.vala" marker = _tmp2_; -#line 7767 "Tag.c" +#line 7759 "Tag.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp3_; - GeeIterator* _tmp4_; -#line 1019 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = sources; + GeeIterator* _tmp3_; #line 1019 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 1019 "/home/jens/Source/shotwell/src/Tag.vala" - _source_it = _tmp4_; + _source_it = _tmp3_; #line 1019 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 7780 "Tag.c" - GeeIterator* _tmp5_; - gboolean _tmp6_; +#line 7769 "Tag.c" + GeeIterator* _tmp4_; MediaSource* source = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; + GeeIterator* _tmp5_; + gpointer _tmp6_; DataView* view = NULL; - ViewCollection* _tmp9_; - MediaSource* _tmp10_; - DataView* _tmp11_; - DataView* _tmp12_; - Marker* _tmp38_; - DataView* _tmp39_; - GeeMultiMap* _tmp40_; - MediaSource* _tmp41_; -#line 1019 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = _source_it; + ViewCollection* _tmp7_; + MediaSource* _tmp8_; + DataView* _tmp9_; + DataView* _tmp10_; + Marker* _tmp36_; + DataView* _tmp37_; + GeeMultiMap* _tmp38_; + MediaSource* _tmp39_; #line 1019 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = gee_iterator_next (_tmp5_); + _tmp4_ = _source_it; #line 1019 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp4_)) { #line 1019 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 7803 "Tag.c" +#line 7789 "Tag.c" } #line 1019 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = _source_it; + _tmp5_ = _source_it; #line 1019 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 1019 "/home/jens/Source/shotwell/src/Tag.vala" - source = (MediaSource*) _tmp8_; + source = (MediaSource*) _tmp6_; #line 1020 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = self->priv->media_views; + _tmp7_ = self->priv->media_views; #line 1020 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = source; + _tmp8_ = source; #line 1020 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = view_collection_get_view_for_source (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_SOURCE, DataSource)); + _tmp9_ = view_collection_get_view_for_source (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource)); #line 1020 "/home/jens/Source/shotwell/src/Tag.vala" - view = _tmp11_; + view = _tmp9_; #line 1021 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = view; + _tmp10_ = view; #line 1021 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp12_ == NULL) { + if (_tmp10_ == NULL) { #line 1022 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (view); #line 1022 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (source); #line 1022 "/home/jens/Source/shotwell/src/Tag.vala" continue; -#line 7829 "Tag.c" +#line 7815 "Tag.c" } { GeeList* _child_tag_list = NULL; - GeeList* _tmp13_; + GeeList* _tmp11_; gint _child_tag_size = 0; - GeeList* _tmp14_; - gint _tmp15_; - gint _tmp16_; + GeeList* _tmp12_; + gint _tmp13_; + gint _tmp14_; gint _child_tag_index = 0; #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = tag_get_hierarchical_children (self); + _tmp11_ = tag_get_hierarchical_children (self); #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" - _child_tag_list = _tmp13_; + _child_tag_list = _tmp11_; #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = _child_tag_list; + _tmp12_ = _child_tag_list; #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = _tmp15_; + _tmp14_ = _tmp13_; #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" - _child_tag_size = _tmp16_; + _child_tag_size = _tmp14_; #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" _child_tag_index = -1; #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 7855 "Tag.c" +#line 7841 "Tag.c" + gint _tmp15_; + gint _tmp16_; gint _tmp17_; - gint _tmp18_; - gint _tmp19_; Tag* child_tag = NULL; - GeeList* _tmp20_; - gint _tmp21_; - gpointer _tmp22_; + GeeList* _tmp18_; + gint _tmp19_; + gpointer _tmp20_; DataView* child_view = NULL; - Tag* _tmp23_; - ViewCollection* _tmp24_; - MediaSource* _tmp25_; - DataView* _tmp26_; - DataView* _tmp27_; + Tag* _tmp21_; + ViewCollection* _tmp22_; + MediaSource* _tmp23_; + DataView* _tmp24_; + DataView* _tmp25_; #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = _child_tag_index; + _tmp15_ = _child_tag_index; #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" - _child_tag_index = _tmp17_ + 1; + _child_tag_index = _tmp15_ + 1; #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = _child_tag_index; + _tmp16_ = _child_tag_index; #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp19_ = _child_tag_size; + _tmp17_ = _child_tag_size; #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" - if (!(_tmp18_ < _tmp19_)) { + if (!(_tmp16_ < _tmp17_)) { #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 7881 "Tag.c" +#line 7867 "Tag.c" } #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp20_ = _child_tag_list; + _tmp18_ = _child_tag_list; #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp21_ = _child_tag_index; + _tmp19_ = _child_tag_index; #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp22_ = gee_list_get (_tmp20_, _tmp21_); + _tmp20_ = gee_list_get (_tmp18_, _tmp19_); #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" - child_tag = (Tag*) _tmp22_; + child_tag = (Tag*) _tmp20_; #line 1025 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp23_ = child_tag; + _tmp21_ = child_tag; #line 1025 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp24_ = _tmp23_->priv->media_views; + _tmp22_ = _tmp21_->priv->media_views; #line 1025 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp25_ = source; + _tmp23_ = source; #line 1025 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp26_ = view_collection_get_view_for_source (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_SOURCE, DataSource)); + _tmp24_ = view_collection_get_view_for_source (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_DATA_SOURCE, DataSource)); #line 1025 "/home/jens/Source/shotwell/src/Tag.vala" - child_view = _tmp26_; + child_view = _tmp24_; #line 1026 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp27_ = child_view; + _tmp25_ = child_view; #line 1026 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp27_ != NULL) { -#line 7905 "Tag.c" + if (_tmp25_ != NULL) { +#line 7891 "Tag.c" + Tag* _tmp26_; + ViewCollection* _tmp27_; Tag* _tmp28_; ViewCollection* _tmp29_; - Tag* _tmp30_; - ViewCollection* _tmp31_; - DataView* _tmp32_; - Marker* _tmp33_; - Marker* _tmp34_; - GeeMultiMap* _tmp35_; - Tag* _tmp36_; - MediaSource* _tmp37_; + DataView* _tmp30_; + Marker* _tmp31_; + Marker* _tmp32_; + GeeMultiMap* _tmp33_; + Tag* _tmp34_; + MediaSource* _tmp35_; #line 1027 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp28_ = child_tag; + _tmp26_ = child_tag; #line 1027 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp29_ = _tmp28_->priv->media_views; + _tmp27_ = _tmp26_->priv->media_views; #line 1027 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp30_ = child_tag; + _tmp28_ = child_tag; #line 1027 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp31_ = _tmp30_->priv->media_views; + _tmp29_ = _tmp28_->priv->media_views; #line 1027 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp32_ = child_view; + _tmp30_ = child_view; #line 1027 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp33_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject)); + _tmp31_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_OBJECT, DataObject)); #line 1027 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp34_ = _tmp33_; + _tmp32_ = _tmp31_; #line 1027 "/home/jens/Source/shotwell/src/Tag.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_COLLECTION, DataCollection), _tmp34_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_COLLECTION, DataCollection), _tmp32_); #line 1027 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp34_); + _g_object_unref0 (_tmp32_); #line 1028 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp35_ = detached_from; + _tmp33_ = detached_from; #line 1028 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp36_ = child_tag; + _tmp34_ = child_tag; #line 1028 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp37_ = source; + _tmp35_ = source; #line 1028 "/home/jens/Source/shotwell/src/Tag.vala" - gee_multi_map_set (_tmp35_, _tmp36_, _tmp37_); -#line 7942 "Tag.c" + gee_multi_map_set (_tmp33_, _tmp34_, _tmp35_); +#line 7928 "Tag.c" } #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (child_view); #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (child_tag); -#line 7948 "Tag.c" +#line 7934 "Tag.c" } #line 1024 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_child_tag_list); -#line 7952 "Tag.c" +#line 7938 "Tag.c" } #line 1032 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp38_ = marker; + _tmp36_ = marker; #line 1032 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp39_ = view; + _tmp37_ = view; #line 1032 "/home/jens/Source/shotwell/src/Tag.vala" - marker_mark (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_DATA_OBJECT, DataObject)); + marker_mark (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_DATA_OBJECT, DataObject)); #line 1033 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp40_ = detached_from; + _tmp38_ = detached_from; #line 1033 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp41_ = source; + _tmp39_ = source; #line 1033 "/home/jens/Source/shotwell/src/Tag.vala" - gee_multi_map_set (_tmp40_, self, _tmp41_); + gee_multi_map_set (_tmp38_, self, _tmp39_); #line 1019 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (view); #line 1019 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (source); -#line 7970 "Tag.c" +#line 7956 "Tag.c" } #line 1019 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_source_it); -#line 7974 "Tag.c" +#line 7960 "Tag.c" } #line 1036 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp42_ = self->priv->media_views; + _tmp40_ = self->priv->media_views; #line 1036 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp43_ = marker; + _tmp41_ = marker; #line 1036 "/home/jens/Source/shotwell/src/Tag.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_DATA_COLLECTION, DataCollection), _tmp43_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_COLLECTION, DataCollection), _tmp41_); #line 1038 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp45_ = detached_from; + _tmp43_ = detached_from; #line 1038 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp46_ = gee_multi_map_get_size (_tmp45_); + _tmp44_ = gee_multi_map_get_size (_tmp43_); #line 1038 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp47_ = _tmp46_; + _tmp45_ = _tmp44_; #line 1038 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp47_ > 0) { -#line 7990 "Tag.c" - GeeMultiMap* _tmp48_; + if (_tmp45_ > 0) { +#line 7976 "Tag.c" + GeeMultiMap* _tmp46_; #line 1038 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp48_ = detached_from; + _tmp46_ = detached_from; #line 1038 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp44_ = _tmp48_; -#line 7996 "Tag.c" + _tmp42_ = _tmp46_; +#line 7982 "Tag.c" } else { #line 1038 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp44_ = NULL; -#line 8000 "Tag.c" + _tmp42_ = NULL; +#line 7986 "Tag.c" } #line 1038 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp49_ = _g_object_ref0 (_tmp44_); + _tmp47_ = _g_object_ref0 (_tmp42_); #line 1038 "/home/jens/Source/shotwell/src/Tag.vala" - result = _tmp49_; + result = _tmp47_; #line 1038 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (marker); #line 1038 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (detached_from); #line 1038 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 8012 "Tag.c" +#line 7998 "Tag.c" } -static gint string_index_of (const gchar* self, const gchar* needle, gint start_index) { +static gint +string_index_of (const gchar* self, + const gchar* needle, + gint start_index) +{ gint result = 0; gchar* _result_ = NULL; - gint _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; + gchar* _tmp1_; +#line 1025 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1025 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, 0); -#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = start_index; -#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = needle; -#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_); -#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _result_ = _tmp2_; -#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = _result_; -#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ != NULL) { -#line 8039 "Tag.c" - gchar* _tmp4_; -#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = _result_; -#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1026 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = strstr (((gchar*) self) + start_index, (gchar*) needle); +#line 1026 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _result_ = _tmp0_; +#line 1028 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = _result_; +#line 1028 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ != NULL) { +#line 8023 "Tag.c" + gchar* _tmp2_; +#line 1029 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _result_; +#line 1029 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (gint) (_tmp2_ - ((gchar*) self)); +#line 1029 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 8047 "Tag.c" +#line 8031 "Tag.c" } else { -#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1031 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = -1; -#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1031 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 8053 "Tag.c" +#line 8037 "Tag.c" } } -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, + glong maxlen) +{ glong result = 0L; gchar* end = NULL; gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 8077 "Tag.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 8085 "Tag.c" +#line 8062 "Tag.c" } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 8097 "Tag.c" +#line 8071 "Tag.c" } } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, + glong offset, + glong len) +{ gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + glong _tmp6_; + gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#line 8121 "Tag.c" - glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = _tmp2_ >= ((glong) 0); -#line 8127 "Tag.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = len >= ((glong) 0); +#line 8092 "Tag.c" } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 8131 "Tag.c" +#line 8096 "Tag.c" } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 8135 "Tag.c" - glong _tmp3_; - glong _tmp4_; - glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 8147 "Tag.c" +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = string_strnlen ((gchar*) self, offset + len); +#line 8102 "Tag.c" } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#line 8157 "Tag.c" + gint _tmp1_; + gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = (glong) _tmp2_; +#line 8112 "Tag.c" } -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp8_ < ((glong) 0)) { -#line 8163 "Tag.c" - glong _tmp9_; - glong _tmp10_; - glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 8177 "Tag.c" +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset < ((glong) 0)) { +#line 8116 "Tag.c" + glong _tmp3_; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 8124 "Tag.c" } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 8187 "Tag.c" + glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 8131 "Tag.c" } -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp14_ < ((glong) 0)) { -#line 8193 "Tag.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 8202 "Tag.c" +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (len < ((glong) 0)) { +#line 8135 "Tag.c" + glong _tmp5_; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp5_ - offset; +#line 8141 "Tag.c" } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 8222 "Tag.c" +#line 8153 "Tag.c" } -gboolean tag_rename (Tag* self, const gchar* name) { +gboolean +tag_rename (Tag* self, + const gchar* name) +{ gboolean result = FALSE; - const gchar* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; gchar* new_name = NULL; + gchar* _tmp3_; const gchar* _tmp4_; gchar* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - gboolean _tmp9_; - gboolean _tmp10_; + gchar* _tmp6_; + gboolean _tmp7_; #line 1042 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG (self), FALSE); #line 1042 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (name != NULL, FALSE); #line 1043 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = name; + _tmp0_ = tag_get_user_visible_name (self); #line 1043 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = tag_get_user_visible_name (self); -#line 1043 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 1043 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = g_strcmp0 (_tmp0_, _tmp2_) == 0; + _tmp2_ = g_strcmp0 (name, _tmp1_) == 0; #line 1043 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 1043 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp3_) { + if (_tmp2_) { #line 1044 "/home/jens/Source/shotwell/src/Tag.vala" result = TRUE; #line 1044 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 8260 "Tag.c" +#line 8189 "Tag.c" } #line 1046 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = name; -#line 1046 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = tag_prep_tag_name (_tmp4_); + _tmp3_ = tag_prep_tag_name (name); #line 1046 "/home/jens/Source/shotwell/src/Tag.vala" - new_name = _tmp5_; + new_name = _tmp3_; #line 1047 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = new_name; + _tmp4_ = new_name; #line 1047 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp6_ == NULL) { + if (_tmp4_ == NULL) { #line 1048 "/home/jens/Source/shotwell/src/Tag.vala" result = FALSE; #line 1048 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (new_name); #line 1048 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 8278 "Tag.c" +#line 8205 "Tag.c" } #line 1051 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = tag_get_path (self); + _tmp5_ = tag_get_path (self); #line 1051 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 1051 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = g_str_has_prefix (_tmp8_, TAG_PATH_SEPARATOR_STRING); + _tmp7_ = g_str_has_prefix (_tmp6_, TAG_PATH_SEPARATOR_STRING); #line 1051 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = _tmp9_; + _g_free0 (_tmp6_); #line 1051 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp8_); -#line 1051 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp10_) { -#line 8292 "Tag.c" + if (_tmp7_) { +#line 8217 "Tag.c" gchar* new_path = NULL; - const gchar* _tmp11_; - gchar* _tmp12_; + const gchar* _tmp8_; + gchar* _tmp9_; gchar* old_path = NULL; - gchar* _tmp13_; + gchar* _tmp10_; Tag* parent = NULL; - Tag* _tmp14_; - Tag* _tmp15_; - TagSourceCollection* _tmp25_; - const gchar* _tmp26_; - gboolean _tmp27_; + Tag* _tmp11_; + Tag* _tmp12_; + TagSourceCollection* _tmp22_; + const gchar* _tmp23_; GeeCollection* children = NULL; - GeeList* _tmp28_; - const gchar* _tmp29_; - Alteration* _tmp53_; - Alteration* _tmp54_; + GeeList* _tmp24_; + const gchar* _tmp25_; + Alteration* _tmp47_; + Alteration* _tmp48_; #line 1052 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = new_name; + _tmp8_ = new_name; #line 1052 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = g_strdup (_tmp11_); + _tmp9_ = g_strdup (_tmp8_); #line 1052 "/home/jens/Source/shotwell/src/Tag.vala" - new_path = _tmp12_; + new_path = _tmp9_; #line 1053 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = tag_get_path (self); + _tmp10_ = tag_get_path (self); #line 1053 "/home/jens/Source/shotwell/src/Tag.vala" - old_path = _tmp13_; + old_path = _tmp10_; #line 1055 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = tag_get_hierarchical_parent (self); + _tmp11_ = tag_get_hierarchical_parent (self); #line 1055 "/home/jens/Source/shotwell/src/Tag.vala" - parent = _tmp14_; + parent = _tmp11_; #line 1056 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = parent; + _tmp12_ = parent; #line 1056 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp15_ != NULL) { -#line 8327 "Tag.c" - Tag* _tmp16_; + if (_tmp12_ != NULL) { +#line 8251 "Tag.c" + Tag* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; gchar* _tmp17_; - gchar* _tmp18_; + const gchar* _tmp18_; gchar* _tmp19_; - gchar* _tmp20_; - const gchar* _tmp21_; - gchar* _tmp22_; #line 1057 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = parent; + _tmp13_ = parent; #line 1057 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = tag_get_path (_tmp16_); + _tmp14_ = tag_get_path (_tmp13_); #line 1057 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = _tmp17_; + _tmp15_ = _tmp14_; #line 1057 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp19_ = g_strconcat (_tmp18_, TAG_PATH_SEPARATOR_STRING, NULL); + _tmp16_ = g_strconcat (_tmp15_, TAG_PATH_SEPARATOR_STRING, NULL); #line 1057 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp20_ = _tmp19_; + _tmp17_ = _tmp16_; #line 1057 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp21_ = new_path; + _tmp18_ = new_path; #line 1057 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp22_ = g_strconcat (_tmp20_, _tmp21_, NULL); + _tmp19_ = g_strconcat (_tmp17_, _tmp18_, NULL); #line 1057 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (new_path); #line 1057 "/home/jens/Source/shotwell/src/Tag.vala" - new_path = _tmp22_; + new_path = _tmp19_; #line 1057 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp17_); #line 1057 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp18_); -#line 8357 "Tag.c" + _g_free0 (_tmp15_); +#line 8281 "Tag.c" } else { - const gchar* _tmp23_; - gchar* _tmp24_; + const gchar* _tmp20_; + gchar* _tmp21_; #line 1059 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp23_ = new_path; + _tmp20_ = new_path; #line 1059 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp24_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp23_, NULL); + _tmp21_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp20_, NULL); #line 1059 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (new_path); #line 1059 "/home/jens/Source/shotwell/src/Tag.vala" - new_path = _tmp24_; -#line 8369 "Tag.c" + new_path = _tmp21_; +#line 8293 "Tag.c" } #line 1062 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp25_ = tag_global; -#line 1062 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp26_ = new_path; + _tmp22_ = tag_global; #line 1062 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp27_ = tag_source_collection_exists (_tmp25_, _tmp26_, TRUE); + _tmp23_ = new_path; #line 1062 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp27_) { + if (tag_source_collection_exists (_tmp22_, _tmp23_, TRUE)) { #line 1063 "/home/jens/Source/shotwell/src/Tag.vala" result = FALSE; #line 1063 "/home/jens/Source/shotwell/src/Tag.vala" @@ -8387,118 +8309,112 @@ gboolean tag_rename (Tag* self, const gchar* name) { _g_free0 (new_name); #line 1063 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 8391 "Tag.c" +#line 8313 "Tag.c" } #line 1065 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp28_ = tag_get_hierarchical_children (self); + _tmp24_ = tag_get_hierarchical_children (self); #line 1065 "/home/jens/Source/shotwell/src/Tag.vala" - children = G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection); + children = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection); #line 1067 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp29_ = new_path; + _tmp25_ = new_path; #line 1067 "/home/jens/Source/shotwell/src/Tag.vala" - tag_set_raw_path (self, _tmp29_, TRUE); -#line 8401 "Tag.c" + tag_set_raw_path (self, _tmp25_, TRUE); +#line 8323 "Tag.c" { GeeIterator* _child_it = NULL; - GeeCollection* _tmp30_; - GeeIterator* _tmp31_; + GeeCollection* _tmp26_; + GeeIterator* _tmp27_; #line 1069 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp30_ = children; + _tmp26_ = children; #line 1069 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp31_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp27_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1069 "/home/jens/Source/shotwell/src/Tag.vala" - _child_it = _tmp31_; + _child_it = _tmp27_; #line 1069 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 8414 "Tag.c" - GeeIterator* _tmp32_; - gboolean _tmp33_; +#line 8336 "Tag.c" + GeeIterator* _tmp28_; Tag* child = NULL; - GeeIterator* _tmp34_; - gpointer _tmp35_; + GeeIterator* _tmp29_; + gpointer _tmp30_; gchar* old_child_path = NULL; - Tag* _tmp36_; - gchar* _tmp37_; + Tag* _tmp31_; + gchar* _tmp32_; gint old_path_index = 0; + const gchar* _tmp33_; + const gchar* _tmp34_; + gint _tmp35_; + gchar* child_subpath = NULL; + const gchar* _tmp36_; + gint _tmp37_; const gchar* _tmp38_; - const gchar* _tmp39_; + gint _tmp39_; gint _tmp40_; - gint _tmp41_; - gchar* child_subpath = NULL; - const gchar* _tmp42_; - gint _tmp43_; - const gchar* _tmp44_; - gint _tmp45_; - gint _tmp46_; - gchar* _tmp47_; + gchar* _tmp41_; gchar* new_child_path = NULL; - const gchar* _tmp48_; - const gchar* _tmp49_; - gchar* _tmp50_; - Tag* _tmp51_; - const gchar* _tmp52_; -#line 1069 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp32_ = _child_it; + const gchar* _tmp42_; + const gchar* _tmp43_; + gchar* _tmp44_; + Tag* _tmp45_; + const gchar* _tmp46_; #line 1069 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp33_ = gee_iterator_next (_tmp32_); + _tmp28_ = _child_it; #line 1069 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp33_) { + if (!gee_iterator_next (_tmp28_)) { #line 1069 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 8449 "Tag.c" +#line 8367 "Tag.c" } #line 1069 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp34_ = _child_it; + _tmp29_ = _child_it; #line 1069 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp35_ = gee_iterator_get (_tmp34_); + _tmp30_ = gee_iterator_get (_tmp29_); #line 1069 "/home/jens/Source/shotwell/src/Tag.vala" - child = (Tag*) _tmp35_; + child = (Tag*) _tmp30_; #line 1072 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp36_ = child; + _tmp31_ = child; #line 1072 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp37_ = tag_get_path (_tmp36_); + _tmp32_ = tag_get_path (_tmp31_); #line 1072 "/home/jens/Source/shotwell/src/Tag.vala" - old_child_path = _tmp37_; -#line 1076 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp38_ = old_child_path; + old_child_path = _tmp32_; #line 1076 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp39_ = old_path; + _tmp33_ = old_child_path; #line 1076 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp40_ = string_index_of (_tmp38_, _tmp39_, 0); + _tmp34_ = old_path; #line 1076 "/home/jens/Source/shotwell/src/Tag.vala" - old_path_index = _tmp40_; + old_path_index = string_index_of (_tmp33_, _tmp34_, 0); #line 1077 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp41_ = old_path_index; + _tmp35_ = old_path_index; #line 1077 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (_tmp41_ != -1, "old_path_index != -1"); + _vala_assert (_tmp35_ != -1, "old_path_index != -1"); #line 1079 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp42_ = old_child_path; + _tmp36_ = old_child_path; #line 1079 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp43_ = old_path_index; + _tmp37_ = old_path_index; #line 1079 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp44_ = old_path; + _tmp38_ = old_path; #line 1079 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp45_ = strlen (_tmp44_); + _tmp39_ = strlen (_tmp38_); #line 1079 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp46_ = _tmp45_; + _tmp40_ = _tmp39_; #line 1079 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp47_ = string_substring (_tmp42_, (glong) (_tmp43_ + _tmp46_), (glong) -1); + _tmp41_ = string_substring (_tmp36_, (glong) (_tmp37_ + _tmp40_), (glong) -1); #line 1079 "/home/jens/Source/shotwell/src/Tag.vala" - child_subpath = _tmp47_; + child_subpath = _tmp41_; #line 1081 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp48_ = new_path; + _tmp42_ = new_path; #line 1081 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp49_ = child_subpath; + _tmp43_ = child_subpath; #line 1081 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp50_ = g_strconcat (_tmp48_, _tmp49_, NULL); + _tmp44_ = g_strconcat (_tmp42_, _tmp43_, NULL); #line 1081 "/home/jens/Source/shotwell/src/Tag.vala" - new_child_path = _tmp50_; + new_child_path = _tmp44_; #line 1083 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp51_ = child; + _tmp45_ = child; #line 1083 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp52_ = new_child_path; + _tmp46_ = new_child_path; #line 1083 "/home/jens/Source/shotwell/src/Tag.vala" - tag_set_raw_path (_tmp51_, _tmp52_, TRUE); + tag_set_raw_path (_tmp45_, _tmp46_, TRUE); #line 1069 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (new_child_path); #line 1069 "/home/jens/Source/shotwell/src/Tag.vala" @@ -8507,77 +8423,74 @@ gboolean tag_rename (Tag* self, const gchar* name) { _g_free0 (old_child_path); #line 1069 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (child); -#line 8511 "Tag.c" +#line 8427 "Tag.c" } #line 1069 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_child_it); -#line 8515 "Tag.c" +#line 8431 "Tag.c" } #line 1086 "/home/jens/Source/shotwell/src/Tag.vala" tag_update_indexable_keywords (self); #line 1087 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp53_ = alteration_new_from_list ("metadata:name, indexable:keywords"); + _tmp47_ = alteration_new_from_list ("metadata:name, indexable:keywords"); #line 1087 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp54_ = _tmp53_; + _tmp48_ = _tmp47_; #line 1087 "/home/jens/Source/shotwell/src/Tag.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp54_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp48_); #line 1087 "/home/jens/Source/shotwell/src/Tag.vala" - _alteration_unref0 (_tmp54_); -#line 8527 "Tag.c" + _alteration_unref0 (_tmp48_); +#line 8443 "Tag.c" { GeeIterator* _child_it = NULL; - GeeCollection* _tmp55_; - GeeIterator* _tmp56_; + GeeCollection* _tmp49_; + GeeIterator* _tmp50_; #line 1088 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp55_ = children; + _tmp49_ = children; #line 1088 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp56_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp50_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1088 "/home/jens/Source/shotwell/src/Tag.vala" - _child_it = _tmp56_; + _child_it = _tmp50_; #line 1088 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 8540 "Tag.c" - GeeIterator* _tmp57_; - gboolean _tmp58_; +#line 8456 "Tag.c" + GeeIterator* _tmp51_; Tag* child = NULL; - GeeIterator* _tmp59_; - gpointer _tmp60_; - Tag* _tmp61_; - Alteration* _tmp62_; - Alteration* _tmp63_; + GeeIterator* _tmp52_; + gpointer _tmp53_; + Tag* _tmp54_; + Alteration* _tmp55_; + Alteration* _tmp56_; #line 1088 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp57_ = _child_it; + _tmp51_ = _child_it; #line 1088 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp58_ = gee_iterator_next (_tmp57_); -#line 1088 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp58_) { + if (!gee_iterator_next (_tmp51_)) { #line 1088 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 8557 "Tag.c" +#line 8470 "Tag.c" } #line 1088 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp59_ = _child_it; + _tmp52_ = _child_it; #line 1088 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp60_ = gee_iterator_get (_tmp59_); + _tmp53_ = gee_iterator_get (_tmp52_); #line 1088 "/home/jens/Source/shotwell/src/Tag.vala" - child = (Tag*) _tmp60_; + child = (Tag*) _tmp53_; #line 1089 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp61_ = child; + _tmp54_ = child; #line 1089 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp62_ = alteration_new_from_list ("metadata:name, indexable:keywords"); + _tmp55_ = alteration_new_from_list ("metadata:name, indexable:keywords"); #line 1089 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp63_ = _tmp62_; + _tmp56_ = _tmp55_; #line 1089 "/home/jens/Source/shotwell/src/Tag.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_DATA_OBJECT, DataObject), _tmp63_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_DATA_OBJECT, DataObject), _tmp56_); #line 1089 "/home/jens/Source/shotwell/src/Tag.vala" - _alteration_unref0 (_tmp63_); + _alteration_unref0 (_tmp56_); #line 1088 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (child); -#line 8577 "Tag.c" +#line 8490 "Tag.c" } #line 1088 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_child_it); -#line 8581 "Tag.c" +#line 8494 "Tag.c" } #line 1051 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (children); @@ -8587,33 +8500,30 @@ gboolean tag_rename (Tag* self, const gchar* name) { _g_free0 (old_path); #line 1051 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (new_path); -#line 8591 "Tag.c" +#line 8504 "Tag.c" } else { - TagSourceCollection* _tmp64_; - const gchar* _tmp65_; - gboolean _tmp66_; - const gchar* _tmp67_; -#line 1093 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp64_ = tag_global; + TagSourceCollection* _tmp57_; + const gchar* _tmp58_; + const gchar* _tmp59_; #line 1093 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp65_ = new_name; + _tmp57_ = tag_global; #line 1093 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp66_ = tag_source_collection_exists (_tmp64_, _tmp65_, TRUE); + _tmp58_ = new_name; #line 1093 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp66_) { + if (tag_source_collection_exists (_tmp57_, _tmp58_, TRUE)) { #line 1094 "/home/jens/Source/shotwell/src/Tag.vala" result = FALSE; #line 1094 "/home/jens/Source/shotwell/src/Tag.vala" _g_free0 (new_name); #line 1094 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 8611 "Tag.c" +#line 8521 "Tag.c" } #line 1096 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp67_ = new_name; + _tmp59_ = new_name; #line 1096 "/home/jens/Source/shotwell/src/Tag.vala" - tag_set_raw_flat_name (self, _tmp67_); -#line 8617 "Tag.c" + tag_set_raw_flat_name (self, _tmp59_); +#line 8527 "Tag.c" } #line 1099 "/home/jens/Source/shotwell/src/Tag.vala" result = TRUE; @@ -8621,15 +8531,16 @@ gboolean tag_rename (Tag* self, const gchar* name) { _g_free0 (new_name); #line 1099 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 8625 "Tag.c" +#line 8535 "Tag.c" } -gboolean tag_contains (Tag* self, MediaSource* source) { +gboolean +tag_contains (Tag* self, + MediaSource* source) +{ gboolean result = FALSE; ViewCollection* _tmp0_; - MediaSource* _tmp1_; - gboolean _tmp2_; #line 1102 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG (self), FALSE); #line 1102 "/home/jens/Source/shotwell/src/Tag.vala" @@ -8637,36 +8548,33 @@ gboolean tag_contains (Tag* self, MediaSource* source) { #line 1103 "/home/jens/Source/shotwell/src/Tag.vala" _tmp0_ = self->priv->media_views; #line 1103 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = source; -#line 1103 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = view_collection_has_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource)); -#line 1103 "/home/jens/Source/shotwell/src/Tag.vala" - result = _tmp2_; + result = view_collection_has_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #line 1103 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 8648 "Tag.c" +#line 8555 "Tag.c" } -gint tag_get_sources_count (Tag* self) { +gint +tag_get_sources_count (Tag* self) +{ gint result = 0; ViewCollection* _tmp0_; - gint _tmp1_; #line 1106 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG (self), 0); #line 1107 "/home/jens/Source/shotwell/src/Tag.vala" _tmp0_ = self->priv->media_views; #line 1107 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); -#line 1107 "/home/jens/Source/shotwell/src/Tag.vala" - result = _tmp1_; + result = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); #line 1107 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 8666 "Tag.c" +#line 8572 "Tag.c" } -GeeCollection* tag_get_sources (Tag* self) { +GeeCollection* +tag_get_sources (Tag* self) +{ GeeCollection* result = NULL; ViewCollection* _tmp0_; GeeCollection* _tmp1_; @@ -8680,42 +8588,40 @@ GeeCollection* tag_get_sources (Tag* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); #line 1111 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 8684 "Tag.c" +#line 8592 "Tag.c" } -void tag_mirror_sources (Tag* self, ViewCollection* view, CreateView mirroring_ctor, void* mirroring_ctor_target) { +void +tag_mirror_sources (Tag* self, + ViewCollection* view, + CreateView mirroring_ctor, + void* mirroring_ctor_target) +{ ViewCollection* _tmp0_; - ViewCollection* _tmp1_; - CreateView _tmp2_; - void* _tmp2__target; #line 1114 "/home/jens/Source/shotwell/src/Tag.vala" g_return_if_fail (IS_TAG (self)); #line 1114 "/home/jens/Source/shotwell/src/Tag.vala" g_return_if_fail (IS_VIEW_COLLECTION (view)); #line 1115 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = view; -#line 1115 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = self->priv->media_views; -#line 1115 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = mirroring_ctor; -#line 1115 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2__target = mirroring_ctor_target; + _tmp0_ = self->priv->media_views; #line 1115 "/home/jens/Source/shotwell/src/Tag.vala" - view_collection_mirror (_tmp0_, _tmp1_, _tmp2_, _tmp2__target, NULL, NULL); -#line 8707 "Tag.c" + view_collection_mirror (view, _tmp0_, mirroring_ctor, mirroring_ctor_target, NULL, NULL); +#line 8611 "Tag.c" } -static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added, GeeIterable* removed) { +static void +tag_on_media_views_contents_altered (Tag* self, + GeeIterable* added, + GeeIterable* removed) +{ GeeCollection* added_sources = NULL; - GeeIterable* _tmp0_; GeeCollection* removed_sources = NULL; - GeeIterable* _tmp29_; - GeeCollection* _tmp58_; - GeeCollection* _tmp62_; - gboolean _tmp66_ = FALSE; - GeeCollection* _tmp67_; + GeeCollection* _tmp47_; + GeeCollection* _tmp51_; + gboolean _tmp55_ = FALSE; + GeeCollection* _tmp56_; GError * _inner_error_ = NULL; #line 1118 "/home/jens/Source/shotwell/src/Tag.vala" g_return_if_fail (IS_TAG (self)); @@ -8726,293 +8632,262 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added, #line 1120 "/home/jens/Source/shotwell/src/Tag.vala" added_sources = NULL; #line 1121 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = added; -#line 1121 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp0_ != NULL) { -#line 8733 "Tag.c" - GeeArrayList* _tmp1_; + if (added != NULL) { +#line 8637 "Tag.c" + GeeArrayList* _tmp0_; #line 1122 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1122 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (added_sources); #line 1122 "/home/jens/Source/shotwell/src/Tag.vala" - added_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); -#line 8741 "Tag.c" + added_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); +#line 8645 "Tag.c" { GeeIterator* _view_it = NULL; - GeeIterable* _tmp2_; - GeeIterator* _tmp3_; -#line 1123 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = added; + GeeIterator* _tmp1_; #line 1123 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = gee_iterable_iterator (_tmp2_); + _tmp1_ = gee_iterable_iterator (added); #line 1123 "/home/jens/Source/shotwell/src/Tag.vala" - _view_it = _tmp3_; + _view_it = _tmp1_; #line 1123 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 8754 "Tag.c" - GeeIterator* _tmp4_; - gboolean _tmp5_; +#line 8655 "Tag.c" + GeeIterator* _tmp2_; DataView* view = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; + GeeIterator* _tmp3_; + gpointer _tmp4_; MediaSource* source = NULL; - DataView* _tmp8_; - DataSource* _tmp9_; - TagRow* _tmp10_; - GeeSet* _tmp11_; - MediaSource* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; - gboolean _tmp15_; - gboolean _tmp16_; + DataView* _tmp5_; + DataSource* _tmp6_; + TagRow* _tmp7_; + GeeSet* _tmp8_; + MediaSource* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + gboolean _tmp12_; gboolean is_added = FALSE; - GeeCollection* _tmp25_; - MediaSource* _tmp26_; - gboolean _tmp27_; - gboolean _tmp28_; -#line 1123 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = _view_it; + GeeCollection* _tmp20_; + MediaSource* _tmp21_; + gboolean _tmp22_; #line 1123 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = gee_iterator_next (_tmp4_); + _tmp2_ = _view_it; #line 1123 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp2_)) { #line 1123 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 8783 "Tag.c" +#line 8679 "Tag.c" } #line 1123 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = _view_it; + _tmp3_ = _view_it; #line 1123 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 1123 "/home/jens/Source/shotwell/src/Tag.vala" - view = (DataView*) _tmp7_; + view = (DataView*) _tmp4_; #line 1124 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = view; + _tmp5_ = view; #line 1124 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = data_view_get_source (_tmp8_); + _tmp6_ = data_view_get_source (_tmp5_); #line 1124 "/home/jens/Source/shotwell/src/Tag.vala" - source = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource); -#line 1128 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = self->priv->row; + source = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource); #line 1128 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = _tmp10_->source_id_list; + _tmp7_ = self->priv->row; #line 1128 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = source; + _tmp8_ = _tmp7_->source_id_list; #line 1128 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_SOURCE, DataSource)); + _tmp9_ = source; #line 1128 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = _tmp13_; + _tmp10_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_SOURCE, DataSource)); #line 1128 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_); + _tmp11_ = _tmp10_; #line 1128 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = !_tmp15_; + _tmp12_ = !gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_); #line 1128 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp14_); + _g_free0 (_tmp11_); #line 1128 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp16_) { -#line 8815 "Tag.c" + if (_tmp12_) { +#line 8709 "Tag.c" gboolean is_added = FALSE; - TagRow* _tmp17_; - GeeSet* _tmp18_; - MediaSource* _tmp19_; - gchar* _tmp20_; - gchar* _tmp21_; - gboolean _tmp22_; - gboolean _tmp23_; - gboolean _tmp24_; -#line 1129 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = self->priv->row; + TagRow* _tmp13_; + GeeSet* _tmp14_; + MediaSource* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gboolean _tmp18_; + gboolean _tmp19_; #line 1129 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = _tmp17_->source_id_list; + _tmp13_ = self->priv->row; #line 1129 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp19_ = source; + _tmp14_ = _tmp13_->source_id_list; #line 1129 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp20_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_SOURCE, DataSource)); + _tmp15_ = source; #line 1129 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp21_ = _tmp20_; + _tmp16_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_SOURCE, DataSource)); #line 1129 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp22_ = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_); + _tmp17_ = _tmp16_; #line 1129 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp23_ = _tmp22_; + _tmp18_ = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_); #line 1129 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp21_); + _g_free0 (_tmp17_); #line 1129 "/home/jens/Source/shotwell/src/Tag.vala" - is_added = _tmp23_; + is_added = _tmp18_; #line 1130 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp24_ = is_added; + _tmp19_ = is_added; #line 1130 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (_tmp24_, "is_added"); -#line 8847 "Tag.c" + _vala_assert (_tmp19_, "is_added"); +#line 8738 "Tag.c" } #line 1133 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp25_ = added_sources; + _tmp20_ = added_sources; #line 1133 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp26_ = source; + _tmp21_ = source; #line 1133 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp27_ = gee_collection_add (_tmp25_, _tmp26_); -#line 1133 "/home/jens/Source/shotwell/src/Tag.vala" - is_added = _tmp27_; + is_added = gee_collection_add (_tmp20_, _tmp21_); #line 1134 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp28_ = is_added; + _tmp22_ = is_added; #line 1134 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (_tmp28_, "is_added"); + _vala_assert (_tmp22_, "is_added"); #line 1123 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (source); #line 1123 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (view); -#line 8865 "Tag.c" +#line 8754 "Tag.c" } #line 1123 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_view_it); -#line 8869 "Tag.c" +#line 8758 "Tag.c" } } #line 1138 "/home/jens/Source/shotwell/src/Tag.vala" removed_sources = NULL; #line 1139 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp29_ = removed; -#line 1139 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp29_ != NULL) { -#line 8878 "Tag.c" - GeeArrayList* _tmp30_; + if (removed != NULL) { +#line 8765 "Tag.c" + GeeArrayList* _tmp23_; #line 1140 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp30_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp23_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1140 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (removed_sources); #line 1140 "/home/jens/Source/shotwell/src/Tag.vala" - removed_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection); -#line 8886 "Tag.c" + removed_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection); +#line 8773 "Tag.c" { GeeIterator* _view_it = NULL; - GeeIterable* _tmp31_; - GeeIterator* _tmp32_; -#line 1141 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp31_ = removed; + GeeIterator* _tmp24_; #line 1141 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp32_ = gee_iterable_iterator (_tmp31_); + _tmp24_ = gee_iterable_iterator (removed); #line 1141 "/home/jens/Source/shotwell/src/Tag.vala" - _view_it = _tmp32_; + _view_it = _tmp24_; #line 1141 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 8899 "Tag.c" - GeeIterator* _tmp33_; - gboolean _tmp34_; +#line 8783 "Tag.c" + GeeIterator* _tmp25_; DataView* view = NULL; - GeeIterator* _tmp35_; - gpointer _tmp36_; + GeeIterator* _tmp26_; + gpointer _tmp27_; MediaSource* source = NULL; - DataView* _tmp37_; - DataSource* _tmp38_; + DataView* _tmp28_; + DataSource* _tmp29_; gboolean is_removed = FALSE; - TagRow* _tmp39_; - GeeSet* _tmp40_; - MediaSource* _tmp41_; - gchar* _tmp42_; - gchar* _tmp43_; - gboolean _tmp44_; - gboolean _tmp45_; - gboolean _tmp46_; + TagRow* _tmp30_; + GeeSet* _tmp31_; + MediaSource* _tmp32_; + gchar* _tmp33_; + gchar* _tmp34_; + gboolean _tmp35_; + gboolean _tmp36_; gboolean is_added = FALSE; - GeeCollection* _tmp47_; - MediaSource* _tmp48_; - gboolean _tmp49_; - gboolean _tmp50_; -#line 1141 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp33_ = _view_it; + GeeCollection* _tmp37_; + MediaSource* _tmp38_; + gboolean _tmp39_; #line 1141 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp34_ = gee_iterator_next (_tmp33_); + _tmp25_ = _view_it; #line 1141 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp34_) { + if (!gee_iterator_next (_tmp25_)) { #line 1141 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 8930 "Tag.c" +#line 8809 "Tag.c" } #line 1141 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp35_ = _view_it; + _tmp26_ = _view_it; #line 1141 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp36_ = gee_iterator_get (_tmp35_); + _tmp27_ = gee_iterator_get (_tmp26_); #line 1141 "/home/jens/Source/shotwell/src/Tag.vala" - view = (DataView*) _tmp36_; + view = (DataView*) _tmp27_; #line 1142 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp37_ = view; + _tmp28_ = view; #line 1142 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp38_ = data_view_get_source (_tmp37_); + _tmp29_ = data_view_get_source (_tmp28_); #line 1142 "/home/jens/Source/shotwell/src/Tag.vala" - source = G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_MEDIA_SOURCE, MediaSource); -#line 1144 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp39_ = self->priv->row; + source = G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_MEDIA_SOURCE, MediaSource); #line 1144 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp40_ = _tmp39_->source_id_list; + _tmp30_ = self->priv->row; #line 1144 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp41_ = source; + _tmp31_ = _tmp30_->source_id_list; #line 1144 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp42_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_DATA_SOURCE, DataSource)); + _tmp32_ = source; #line 1144 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp43_ = _tmp42_; + _tmp33_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_SOURCE, DataSource)); #line 1144 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp44_ = gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_COLLECTION, GeeCollection), _tmp43_); + _tmp34_ = _tmp33_; #line 1144 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp45_ = _tmp44_; + _tmp35_ = gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection), _tmp34_); #line 1144 "/home/jens/Source/shotwell/src/Tag.vala" - _g_free0 (_tmp43_); + _g_free0 (_tmp34_); #line 1144 "/home/jens/Source/shotwell/src/Tag.vala" - is_removed = _tmp45_; + is_removed = _tmp35_; #line 1145 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp46_ = is_removed; + _tmp36_ = is_removed; #line 1145 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (_tmp46_, "is_removed"); -#line 1147 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp47_ = removed_sources; + _vala_assert (_tmp36_, "is_removed"); #line 1147 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp48_ = source; + _tmp37_ = removed_sources; #line 1147 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp49_ = gee_collection_add (_tmp47_, _tmp48_); + _tmp38_ = source; #line 1147 "/home/jens/Source/shotwell/src/Tag.vala" - is_added = _tmp49_; + is_added = gee_collection_add (_tmp37_, _tmp38_); #line 1148 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp50_ = is_added; + _tmp39_ = is_added; #line 1148 "/home/jens/Source/shotwell/src/Tag.vala" - _vala_assert (_tmp50_, "is_added"); + _vala_assert (_tmp39_, "is_added"); #line 1141 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (source); #line 1141 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (view); -#line 8982 "Tag.c" +#line 8857 "Tag.c" } #line 1141 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_view_it); -#line 8986 "Tag.c" +#line 8861 "Tag.c" } } { - TagTable* _tmp51_; - TagTable* _tmp52_; - TagRow* _tmp53_; - TagID _tmp54_; - TagRow* _tmp55_; - GeeSet* _tmp56_; + TagTable* _tmp40_; + TagTable* _tmp41_; + TagRow* _tmp42_; + TagID _tmp43_; + TagRow* _tmp44_; + GeeSet* _tmp45_; #line 1153 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp51_ = tag_table_get_instance (); + _tmp40_ = tag_table_get_instance (); #line 1153 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp52_ = _tmp51_; + _tmp41_ = _tmp40_; #line 1153 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp53_ = self->priv->row; + _tmp42_ = self->priv->row; #line 1153 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp54_ = _tmp53_->tag_id; + _tmp43_ = _tmp42_->tag_id; #line 1153 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp55_ = self->priv->row; + _tmp44_ = self->priv->row; #line 1153 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp56_ = _tmp55_->source_id_list; + _tmp45_ = _tmp44_->source_id_list; #line 1153 "/home/jens/Source/shotwell/src/Tag.vala" - tag_table_set_tagged_sources (_tmp52_, &_tmp54_, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_COLLECTION, GeeCollection), &_inner_error_); + tag_table_set_tagged_sources (_tmp41_, &_tmp43_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_COLLECTION, GeeCollection), &_inner_error_); #line 1153 "/home/jens/Source/shotwell/src/Tag.vala" - _database_table_unref0 (_tmp52_); + _database_table_unref0 (_tmp41_); #line 1153 "/home/jens/Source/shotwell/src/Tag.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1153 "/home/jens/Source/shotwell/src/Tag.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 9016 "Tag.c" +#line 8891 "Tag.c" goto __catch486_database_error; } #line 1153 "/home/jens/Source/shotwell/src/Tag.vala" @@ -9025,25 +8900,25 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added, g_clear_error (&_inner_error_); #line 1153 "/home/jens/Source/shotwell/src/Tag.vala" return; -#line 9029 "Tag.c" +#line 8904 "Tag.c" } } goto __finally486; __catch486_database_error: { GError* err = NULL; - GError* _tmp57_; + GError* _tmp46_; #line 1152 "/home/jens/Source/shotwell/src/Tag.vala" err = _inner_error_; #line 1152 "/home/jens/Source/shotwell/src/Tag.vala" _inner_error_ = NULL; #line 1155 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp57_ = err; + _tmp46_ = err; #line 1155 "/home/jens/Source/shotwell/src/Tag.vala" - app_window_database_error (_tmp57_); + app_window_database_error (_tmp46_); #line 1152 "/home/jens/Source/shotwell/src/Tag.vala" _g_error_free0 (err); -#line 9047 "Tag.c" +#line 8922 "Tag.c" } __finally486: #line 1152 "/home/jens/Source/shotwell/src/Tag.vala" @@ -9058,205 +8933,204 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added, g_clear_error (&_inner_error_); #line 1152 "/home/jens/Source/shotwell/src/Tag.vala" return; -#line 9062 "Tag.c" +#line 8937 "Tag.c" } #line 1159 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp58_ = added_sources; + _tmp47_ = added_sources; #line 1159 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp58_ != NULL) { -#line 9068 "Tag.c" - TagSourceCollection* _tmp59_; - GeeCollection* _tmp60_; - gboolean _tmp61_; + if (_tmp47_ != NULL) { +#line 8943 "Tag.c" + TagSourceCollection* _tmp48_; + GeeCollection* _tmp49_; + gboolean _tmp50_; #line 1160 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp59_ = tag_global; + _tmp48_ = tag_global; #line 1160 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp60_ = added_sources; + _tmp49_ = added_sources; #line 1160 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp61_ = self->priv->relinking; + _tmp50_ = self->priv->relinking; #line 1160 "/home/jens/Source/shotwell/src/Tag.vala" - container_source_collection_notify_container_contents_added (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), _tmp60_, _tmp61_); -#line 9080 "Tag.c" + container_source_collection_notify_container_contents_added (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), _tmp49_, _tmp50_); +#line 8955 "Tag.c" } #line 1162 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp62_ = removed_sources; + _tmp51_ = removed_sources; #line 1162 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp62_ != NULL) { -#line 9086 "Tag.c" - TagSourceCollection* _tmp63_; - GeeCollection* _tmp64_; - gboolean _tmp65_; + if (_tmp51_ != NULL) { +#line 8961 "Tag.c" + TagSourceCollection* _tmp52_; + GeeCollection* _tmp53_; + gboolean _tmp54_; #line 1163 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp63_ = tag_global; + _tmp52_ = tag_global; #line 1163 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp64_ = removed_sources; + _tmp53_ = removed_sources; #line 1163 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp65_ = self->priv->unlinking; + _tmp54_ = self->priv->unlinking; #line 1163 "/home/jens/Source/shotwell/src/Tag.vala" - container_source_collection_notify_container_contents_removed (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), _tmp64_, _tmp65_); -#line 9098 "Tag.c" + container_source_collection_notify_container_contents_removed (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), _tmp53_, _tmp54_); +#line 8973 "Tag.c" } #line 1165 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp67_ = added_sources; + _tmp56_ = added_sources; #line 1165 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp67_ != NULL) { + if (_tmp56_ != NULL) { #line 1165 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp66_ = TRUE; -#line 9106 "Tag.c" + _tmp55_ = TRUE; +#line 8981 "Tag.c" } else { - GeeCollection* _tmp68_; + GeeCollection* _tmp57_; #line 1165 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp68_ = removed_sources; + _tmp57_ = removed_sources; #line 1165 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp66_ = _tmp68_ != NULL; -#line 9113 "Tag.c" + _tmp55_ = _tmp57_ != NULL; +#line 8988 "Tag.c" } #line 1165 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp66_) { -#line 9117 "Tag.c" - TagSourceCollection* _tmp69_; - GeeCollection* _tmp70_; - gboolean _tmp71_; - GeeCollection* _tmp72_; - gboolean _tmp73_; + if (_tmp55_) { +#line 8992 "Tag.c" + TagSourceCollection* _tmp58_; + GeeCollection* _tmp59_; + gboolean _tmp60_; + GeeCollection* _tmp61_; + gboolean _tmp62_; #line 1166 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp69_ = tag_global; + _tmp58_ = tag_global; #line 1166 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp70_ = added_sources; + _tmp59_ = added_sources; #line 1166 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp71_ = self->priv->relinking; + _tmp60_ = self->priv->relinking; #line 1166 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp72_ = removed_sources; + _tmp61_ = removed_sources; #line 1166 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp73_ = self->priv->unlinking; + _tmp62_ = self->priv->unlinking; #line 1166 "/home/jens/Source/shotwell/src/Tag.vala" - container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), _tmp70_, _tmp71_, _tmp72_, _tmp73_); -#line 9135 "Tag.c" + container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), _tmp59_, _tmp60_, _tmp61_, _tmp62_); +#line 9010 "Tag.c" } #line 1118 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (removed_sources); #line 1118 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (added_sources); -#line 9141 "Tag.c" +#line 9016 "Tag.c" } -static void tag_on_sources_destroyed (Tag* self, GeeCollection* sources) { - GeeCollection* _tmp0_; +static void +tag_on_sources_destroyed (Tag* self, + GeeCollection* sources) +{ + GeeMultiMap* _tmp0_; GeeMultiMap* _tmp1_; - GeeMultiMap* _tmp2_; #line 1171 "/home/jens/Source/shotwell/src/Tag.vala" g_return_if_fail (IS_TAG (self)); #line 1171 "/home/jens/Source/shotwell/src/Tag.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); #line 1172 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = sources; + _tmp0_ = tag_detach_many (self, G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_COLLECTION, GeeCollection)); #line 1172 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = tag_detach_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1172 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 1172 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp2_); -#line 9161 "Tag.c" + _g_object_unref0 (_tmp1_); +#line 9036 "Tag.c" } -static void tag_real_destroy (DataSource* base) { +static void +tag_real_destroy (DataSource* base) +{ Tag * self; ViewCollection* _tmp0_; - gint _tmp1_; GError * _inner_error_ = NULL; #line 1175 "/home/jens/Source/shotwell/src/Tag.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG, Tag); #line 1179 "/home/jens/Source/shotwell/src/Tag.vala" _tmp0_ = self->priv->media_views; #line 1179 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); -#line 1179 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp1_ > 0) { -#line 9178 "Tag.c" - ViewCollection* _tmp2_; - guint _tmp3_; + if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)) > 0) { +#line 9052 "Tag.c" + ViewCollection* _tmp1_; + guint _tmp2_; GeeArrayList* removed = NULL; + GeeArrayList* _tmp3_; GeeArrayList* _tmp4_; - GeeArrayList* _tmp5_; - ViewCollection* _tmp6_; + ViewCollection* _tmp5_; + GeeCollection* _tmp6_; GeeCollection* _tmp7_; - GeeCollection* _tmp8_; - ViewCollection* _tmp9_; - TagSourceCollection* _tmp10_; - GeeArrayList* _tmp11_; - TagSourceCollection* _tmp12_; - GeeArrayList* _tmp13_; - ViewCollection* _tmp14_; + ViewCollection* _tmp8_; + TagSourceCollection* _tmp9_; + GeeArrayList* _tmp10_; + TagSourceCollection* _tmp11_; + GeeArrayList* _tmp12_; + ViewCollection* _tmp13_; #line 1180 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = self->priv->media_views; + _tmp1_ = self->priv->media_views; #line 1180 "/home/jens/Source/shotwell/src/Tag.vala" - g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE); + g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp2_, NULL, FALSE); #line 1180 "/home/jens/Source/shotwell/src/Tag.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _tag_on_media_views_contents_altered_data_collection_contents_altered, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _tag_on_media_views_contents_altered_data_collection_contents_altered, self); #line 1182 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp3_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1182 "/home/jens/Source/shotwell/src/Tag.vala" - removed = _tmp4_; + removed = _tmp3_; #line 1183 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = removed; + _tmp4_ = removed; #line 1183 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = self->priv->media_views; + _tmp5_ = self->priv->media_views; #line 1183 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = view_collection_get_sources (_tmp6_); + _tmp6_ = view_collection_get_sources (_tmp5_); #line 1183 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection); #line 1183 "/home/jens/Source/shotwell/src/Tag.vala" - gee_array_list_add_all (_tmp5_, _tmp8_); + gee_array_list_add_all (_tmp4_, _tmp7_); #line 1183 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 1185 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = self->priv->media_views; + _tmp8_ = self->priv->media_views; #line 1185 "/home/jens/Source/shotwell/src/Tag.vala" - data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection)); #line 1187 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = tag_global; + _tmp9_ = tag_global; #line 1187 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = removed; + _tmp10_ = removed; #line 1187 "/home/jens/Source/shotwell/src/Tag.vala" - container_source_collection_notify_container_contents_removed (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection), FALSE); + container_source_collection_notify_container_contents_removed (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), FALSE); #line 1188 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = tag_global; + _tmp11_ = tag_global; #line 1188 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = removed; + _tmp12_ = removed; #line 1188 "/home/jens/Source/shotwell/src/Tag.vala" - container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), NULL, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), FALSE); + container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), NULL, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), FALSE); #line 1190 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = self->priv->media_views; + _tmp13_ = self->priv->media_views; #line 1190 "/home/jens/Source/shotwell/src/Tag.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _tag_on_media_views_contents_altered_data_collection_contents_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _tag_on_media_views_contents_altered_data_collection_contents_altered, self, 0); #line 1179 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (removed); -#line 9237 "Tag.c" +#line 9111 "Tag.c" } { + TagTable* _tmp14_; TagTable* _tmp15_; - TagTable* _tmp16_; - TagRow* _tmp17_; - TagID _tmp18_; + TagRow* _tmp16_; + TagID _tmp17_; #line 1194 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = tag_table_get_instance (); + _tmp14_ = tag_table_get_instance (); #line 1194 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 1194 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp17_ = self->priv->row; + _tmp16_ = self->priv->row; #line 1194 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = _tmp17_->tag_id; + _tmp17_ = _tmp16_->tag_id; #line 1194 "/home/jens/Source/shotwell/src/Tag.vala" - tag_table_remove (_tmp16_, &_tmp18_, &_inner_error_); + tag_table_remove (_tmp15_, &_tmp17_, &_inner_error_); #line 1194 "/home/jens/Source/shotwell/src/Tag.vala" - _database_table_unref0 (_tmp16_); + _database_table_unref0 (_tmp15_); #line 1194 "/home/jens/Source/shotwell/src/Tag.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1194 "/home/jens/Source/shotwell/src/Tag.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 9260 "Tag.c" +#line 9134 "Tag.c" goto __catch487_database_error; } #line 1194 "/home/jens/Source/shotwell/src/Tag.vala" @@ -9265,25 +9139,25 @@ static void tag_real_destroy (DataSource* base) { g_clear_error (&_inner_error_); #line 1194 "/home/jens/Source/shotwell/src/Tag.vala" return; -#line 9269 "Tag.c" +#line 9143 "Tag.c" } } goto __finally487; __catch487_database_error: { GError* err = NULL; - GError* _tmp19_; + GError* _tmp18_; #line 1193 "/home/jens/Source/shotwell/src/Tag.vala" err = _inner_error_; #line 1193 "/home/jens/Source/shotwell/src/Tag.vala" _inner_error_ = NULL; #line 1196 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp19_ = err; + _tmp18_ = err; #line 1196 "/home/jens/Source/shotwell/src/Tag.vala" - app_window_database_error (_tmp19_); + app_window_database_error (_tmp18_); #line 1193 "/home/jens/Source/shotwell/src/Tag.vala" _g_error_free0 (err); -#line 9287 "Tag.c" +#line 9161 "Tag.c" } __finally487: #line 1193 "/home/jens/Source/shotwell/src/Tag.vala" @@ -9294,126 +9168,128 @@ static void tag_real_destroy (DataSource* base) { g_clear_error (&_inner_error_); #line 1193 "/home/jens/Source/shotwell/src/Tag.vala" return; -#line 9298 "Tag.c" +#line 9172 "Tag.c" } #line 1199 "/home/jens/Source/shotwell/src/Tag.vala" DATA_SOURCE_CLASS (tag_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource)); -#line 9302 "Tag.c" +#line 9176 "Tag.c" } -static void _tag_tag_snapshot_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +static void +_tag_tag_snapshot_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self) +{ #line 292 "/home/jens/Source/shotwell/src/Tag.vala" tag_tag_snapshot_on_source_destroyed ((TagTagSnapshot*) self, source); -#line 9309 "Tag.c" +#line 9187 "Tag.c" } -static TagTagSnapshot* tag_tag_snapshot_construct (GType object_type, Tag* tag) { +static TagTagSnapshot* +tag_tag_snapshot_construct (GType object_type, + Tag* tag) +{ TagTagSnapshot* self = NULL; - Tag* _tmp0_; + TagRow* _tmp0_; TagRow* _tmp1_; - TagRow* _tmp2_; - LibraryPhotoSourceCollection* _tmp14_; - VideoSourceCollection* _tmp15_; + LibraryPhotoSourceCollection* _tmp11_; + VideoSourceCollection* _tmp12_; #line 278 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG (tag), NULL); #line 278 "/home/jens/Source/shotwell/src/Tag.vala" self = (TagTagSnapshot*) source_snapshot_construct (object_type); #line 280 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = tag; -#line 280 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = _tmp0_->priv->row; + _tmp0_ = tag->priv->row; #line 280 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = _tag_row_ref0 (_tmp1_); + _tmp1_ = _tag_row_ref0 (_tmp0_); #line 280 "/home/jens/Source/shotwell/src/Tag.vala" _tag_row_unref0 (self->priv->row); #line 280 "/home/jens/Source/shotwell/src/Tag.vala" - self->priv->row = _tmp2_; -#line 9334 "Tag.c" + self->priv->row = _tmp1_; +#line 9212 "Tag.c" { GeeIterator* _source_it = NULL; - Tag* _tmp3_; - GeeCollection* _tmp4_; - GeeCollection* _tmp5_; - GeeIterator* _tmp6_; - GeeIterator* _tmp7_; -#line 284 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = tag; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 284 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = tag_get_sources (_tmp3_); + _tmp2_ = tag_get_sources (tag); #line 284 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 284 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); #line 284 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 284 "/home/jens/Source/shotwell/src/Tag.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp3_); #line 284 "/home/jens/Source/shotwell/src/Tag.vala" - _source_it = _tmp7_; + _source_it = _tmp5_; #line 284 "/home/jens/Source/shotwell/src/Tag.vala" while (TRUE) { -#line 9358 "Tag.c" - GeeIterator* _tmp8_; - gboolean _tmp9_; +#line 9233 "Tag.c" + GeeIterator* _tmp6_; MediaSource* source = NULL; - GeeIterator* _tmp10_; - gpointer _tmp11_; - GeeHashSet* _tmp12_; - MediaSource* _tmp13_; -#line 284 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = _source_it; + GeeIterator* _tmp7_; + gpointer _tmp8_; + GeeHashSet* _tmp9_; + MediaSource* _tmp10_; #line 284 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = gee_iterator_next (_tmp8_); + _tmp6_ = _source_it; #line 284 "/home/jens/Source/shotwell/src/Tag.vala" - if (!_tmp9_) { + if (!gee_iterator_next (_tmp6_)) { #line 284 "/home/jens/Source/shotwell/src/Tag.vala" break; -#line 9374 "Tag.c" +#line 9246 "Tag.c" } #line 284 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp10_ = _source_it; + _tmp7_ = _source_it; #line 284 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp11_ = gee_iterator_get (_tmp10_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 284 "/home/jens/Source/shotwell/src/Tag.vala" - source = (MediaSource*) _tmp11_; + source = (MediaSource*) _tmp8_; #line 285 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp12_ = self->priv->sources; + _tmp9_ = self->priv->sources; #line 285 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp13_ = source; + _tmp10_ = source; #line 285 "/home/jens/Source/shotwell/src/Tag.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); #line 284 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (source); -#line 9390 "Tag.c" +#line 9262 "Tag.c" } #line 284 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_source_it); -#line 9394 "Tag.c" +#line 9266 "Tag.c" } #line 287 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = library_photo_global; + _tmp11_ = library_photo_global; #line 287 "/home/jens/Source/shotwell/src/Tag.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _tag_tag_snapshot_on_source_destroyed_source_collection_item_destroyed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _tag_tag_snapshot_on_source_destroyed_source_collection_item_destroyed, self); #line 288 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp15_ = video_global; + _tmp12_ = video_global; #line 288 "/home/jens/Source/shotwell/src/Tag.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _tag_tag_snapshot_on_source_destroyed_source_collection_item_destroyed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _tag_tag_snapshot_on_source_destroyed_source_collection_item_destroyed, self); #line 278 "/home/jens/Source/shotwell/src/Tag.vala" return self; -#line 9406 "Tag.c" +#line 9278 "Tag.c" } -static TagTagSnapshot* tag_tag_snapshot_new (Tag* tag) { +static TagTagSnapshot* +tag_tag_snapshot_new (Tag* tag) +{ #line 278 "/home/jens/Source/shotwell/src/Tag.vala" return tag_tag_snapshot_construct (TAG_TYPE_TAG_SNAPSHOT, tag); -#line 9413 "Tag.c" +#line 9287 "Tag.c" } -static TagRow* tag_tag_snapshot_get_row (TagTagSnapshot* self) { +static TagRow* +tag_tag_snapshot_get_row (TagTagSnapshot* self) +{ TagRow* result = NULL; TagRow* _tmp0_; TagRow* _tmp1_; @@ -9427,11 +9303,13 @@ static TagRow* tag_tag_snapshot_get_row (TagTagSnapshot* self) { result = _tmp1_; #line 297 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 9431 "Tag.c" +#line 9307 "Tag.c" } -static void tag_tag_snapshot_real_notify_broken (SourceSnapshot* base) { +static void +tag_tag_snapshot_real_notify_broken (SourceSnapshot* base) +{ TagTagSnapshot * self; TagRow* _tmp0_; GeeHashSet* _tmp1_; @@ -9449,14 +9327,15 @@ static void tag_tag_snapshot_real_notify_broken (SourceSnapshot* base) { gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 304 "/home/jens/Source/shotwell/src/Tag.vala" SOURCE_SNAPSHOT_CLASS (tag_tag_snapshot_parent_class)->notify_broken (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_SNAPSHOT, SourceSnapshot)); -#line 9453 "Tag.c" +#line 9331 "Tag.c" } -static void tag_tag_snapshot_on_source_destroyed (TagTagSnapshot* self, DataSource* source) { +static void +tag_tag_snapshot_on_source_destroyed (TagTagSnapshot* self, + DataSource* source) +{ GeeHashSet* _tmp0_; - DataSource* _tmp1_; - gboolean _tmp2_; #line 307 "/home/jens/Source/shotwell/src/Tag.vala" g_return_if_fail (TAG_IS_TAG_SNAPSHOT (self)); #line 307 "/home/jens/Source/shotwell/src/Tag.vala" @@ -9464,19 +9343,17 @@ static void tag_tag_snapshot_on_source_destroyed (TagTagSnapshot* self, DataSour #line 308 "/home/jens/Source/shotwell/src/Tag.vala" _tmp0_ = self->priv->sources; #line 308 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = source; -#line 308 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 308 "/home/jens/Source/shotwell/src/Tag.vala" - if (_tmp2_) { + if (gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource))) { #line 309 "/home/jens/Source/shotwell/src/Tag.vala" source_snapshot_notify_broken (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_SNAPSHOT, SourceSnapshot)); -#line 9475 "Tag.c" +#line 9350 "Tag.c" } } -static void tag_tag_snapshot_class_init (TagTagSnapshotClass * klass) { +static void +tag_tag_snapshot_class_init (TagTagSnapshotClass * klass) +{ #line 274 "/home/jens/Source/shotwell/src/Tag.vala" tag_tag_snapshot_parent_class = g_type_class_peek_parent (klass); #line 274 "/home/jens/Source/shotwell/src/Tag.vala" @@ -9485,11 +9362,13 @@ static void tag_tag_snapshot_class_init (TagTagSnapshotClass * klass) { g_type_class_add_private (klass, sizeof (TagTagSnapshotPrivate)); #line 274 "/home/jens/Source/shotwell/src/Tag.vala" ((SourceSnapshotClass *) klass)->notify_broken = (void (*) (SourceSnapshot *)) tag_tag_snapshot_real_notify_broken; -#line 9489 "Tag.c" +#line 9366 "Tag.c" } -static void tag_tag_snapshot_instance_init (TagTagSnapshot * self) { +static void +tag_tag_snapshot_instance_init (TagTagSnapshot * self) +{ GeeHashSet* _tmp0_; #line 274 "/home/jens/Source/shotwell/src/Tag.vala" self->priv = TAG_TAG_SNAPSHOT_GET_PRIVATE (self); @@ -9497,11 +9376,13 @@ static void tag_tag_snapshot_instance_init (TagTagSnapshot * self) { _tmp0_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 276 "/home/jens/Source/shotwell/src/Tag.vala" self->priv->sources = _tmp0_; -#line 9501 "Tag.c" +#line 9380 "Tag.c" } -static void tag_tag_snapshot_finalize (SourceSnapshot * obj) { +static void +tag_tag_snapshot_finalize (SourceSnapshot * obj) +{ TagTagSnapshot * self; LibraryPhotoSourceCollection* _tmp0_; guint _tmp1_; @@ -9527,11 +9408,13 @@ static void tag_tag_snapshot_finalize (SourceSnapshot * obj) { _g_object_unref0 (self->priv->sources); #line 274 "/home/jens/Source/shotwell/src/Tag.vala" SOURCE_SNAPSHOT_CLASS (tag_tag_snapshot_parent_class)->finalize (obj); -#line 9531 "Tag.c" +#line 9412 "Tag.c" } -static GType tag_tag_snapshot_get_type (void) { +static GType +tag_tag_snapshot_get_type (void) +{ static volatile gsize tag_tag_snapshot_type_id__volatile = 0; if (g_once_init_enter (&tag_tag_snapshot_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TagTagSnapshotClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tag_tag_snapshot_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TagTagSnapshot), 0, (GInstanceInitFunc) tag_tag_snapshot_instance_init, NULL }; @@ -9543,77 +9426,83 @@ static GType tag_tag_snapshot_get_type (void) { } -static TagTagProxy* tag_tag_proxy_construct (GType object_type, Tag* tag) { +static TagTagProxy* +tag_tag_proxy_construct (GType object_type, + Tag* tag) +{ TagTagProxy* self = NULL; - Tag* _tmp0_; #line 314 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG (tag), NULL); #line 315 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = tag; -#line 315 "/home/jens/Source/shotwell/src/Tag.vala" - self = (TagTagProxy*) source_proxy_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource)); + self = (TagTagProxy*) source_proxy_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (tag, TYPE_DATA_SOURCE, DataSource)); #line 314 "/home/jens/Source/shotwell/src/Tag.vala" return self; -#line 9558 "Tag.c" +#line 9441 "Tag.c" } -static TagTagProxy* tag_tag_proxy_new (Tag* tag) { +static TagTagProxy* +tag_tag_proxy_new (Tag* tag) +{ #line 314 "/home/jens/Source/shotwell/src/Tag.vala" return tag_tag_proxy_construct (TAG_TYPE_TAG_PROXY, tag); -#line 9565 "Tag.c" +#line 9450 "Tag.c" } -static DataSource* tag_tag_proxy_real_reconstitute (SourceProxy* base, gint64 object_id, SourceSnapshot* snapshot) { +static DataSource* +tag_tag_proxy_real_reconstitute (SourceProxy* base, + gint64 object_id, + SourceSnapshot* snapshot) +{ TagTagProxy * self; DataSource* result = NULL; - gint64 _tmp0_; - SourceSnapshot* _tmp1_; - TagRow* _tmp2_; - TagRow* _tmp3_; - Tag* _tmp4_; - DataSource* _tmp5_; + TagRow* _tmp0_; + TagRow* _tmp1_; + Tag* _tmp2_; + DataSource* _tmp3_; #line 318 "/home/jens/Source/shotwell/src/Tag.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAG_TYPE_TAG_PROXY, TagTagProxy); #line 318 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_SOURCE_SNAPSHOT (snapshot), NULL); #line 319 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = object_id; -#line 319 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = snapshot; -#line 319 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = tag_tag_snapshot_get_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TAG_TYPE_TAG_SNAPSHOT, TagTagSnapshot)); + _tmp0_ = tag_tag_snapshot_get_row (G_TYPE_CHECK_INSTANCE_CAST (snapshot, TAG_TYPE_TAG_SNAPSHOT, TagTagSnapshot)); #line 319 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 319 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = tag_reconstitute (_tmp0_, _tmp3_); + _tmp2_ = tag_reconstitute (object_id, _tmp1_); #line 319 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource); + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource); #line 319 "/home/jens/Source/shotwell/src/Tag.vala" - _tag_row_unref0 (_tmp3_); + _tag_row_unref0 (_tmp1_); #line 319 "/home/jens/Source/shotwell/src/Tag.vala" - result = _tmp5_; + result = _tmp3_; #line 319 "/home/jens/Source/shotwell/src/Tag.vala" return result; -#line 9600 "Tag.c" +#line 9483 "Tag.c" } -static void tag_tag_proxy_class_init (TagTagProxyClass * klass) { +static void +tag_tag_proxy_class_init (TagTagProxyClass * klass) +{ #line 313 "/home/jens/Source/shotwell/src/Tag.vala" tag_tag_proxy_parent_class = g_type_class_peek_parent (klass); #line 313 "/home/jens/Source/shotwell/src/Tag.vala" ((SourceProxyClass *) klass)->reconstitute = (DataSource* (*) (SourceProxy *, gint64, SourceSnapshot*)) tag_tag_proxy_real_reconstitute; -#line 9609 "Tag.c" +#line 9494 "Tag.c" } -static void tag_tag_proxy_instance_init (TagTagProxy * self) { +static void +tag_tag_proxy_instance_init (TagTagProxy * self) +{ } -static GType tag_tag_proxy_get_type (void) { +static GType +tag_tag_proxy_get_type (void) +{ static volatile gsize tag_tag_proxy_type_id__volatile = 0; if (g_once_init_enter (&tag_tag_proxy_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TagTagProxyClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tag_tag_proxy_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TagTagProxy), 0, (GInstanceInitFunc) tag_tag_proxy_instance_init, NULL }; @@ -9625,7 +9514,9 @@ static GType tag_tag_proxy_get_type (void) { } -static void tag_class_init (TagClass * klass) { +static void +tag_class_init (TagClass * klass) +{ #line 269 "/home/jens/Source/shotwell/src/Tag.vala" tag_parent_class = g_type_class_peek_parent (klass); #line 269 "/home/jens/Source/shotwell/src/Tag.vala" @@ -9646,11 +9537,13 @@ static void tag_class_init (TagClass * klass) { ((DataSourceClass *) klass)->destroy = (void (*) (DataSource *)) tag_real_destroy; #line 269 "/home/jens/Source/shotwell/src/Tag.vala" G_OBJECT_CLASS (klass)->finalize = tag_finalize; -#line 9650 "Tag.c" +#line 9541 "Tag.c" } -static void tag_container_source_interface_init (ContainerSourceIface * iface) { +static void +tag_container_source_interface_init (ContainerSourceIface * iface) +{ #line 269 "/home/jens/Source/shotwell/src/Tag.vala" tag_container_source_parent_iface = g_type_interface_peek_parent (iface); #line 269 "/home/jens/Source/shotwell/src/Tag.vala" @@ -9665,29 +9558,35 @@ static void tag_container_source_interface_init (ContainerSourceIface * iface) { iface->establish_link = (void (*) (ContainerSource *, DataSource*)) tag_real_establish_link; #line 269 "/home/jens/Source/shotwell/src/Tag.vala" iface->establish_link_many = (void (*) (ContainerSource *, GeeCollection*)) tag_real_establish_link_many; -#line 9669 "Tag.c" +#line 9562 "Tag.c" } -static void tag_proxyable_interface_init (ProxyableIface * iface) { +static void +tag_proxyable_interface_init (ProxyableIface * iface) +{ #line 269 "/home/jens/Source/shotwell/src/Tag.vala" tag_proxyable_parent_iface = g_type_interface_peek_parent (iface); #line 269 "/home/jens/Source/shotwell/src/Tag.vala" iface->get_proxy = (SourceProxy* (*) (Proxyable *)) tag_real_get_proxy; -#line 9678 "Tag.c" +#line 9573 "Tag.c" } -static void tag_indexable_interface_init (IndexableIface * iface) { +static void +tag_indexable_interface_init (IndexableIface * iface) +{ #line 269 "/home/jens/Source/shotwell/src/Tag.vala" tag_indexable_parent_iface = g_type_interface_peek_parent (iface); #line 269 "/home/jens/Source/shotwell/src/Tag.vala" iface->get_indexable_keywords = (const gchar* (*) (Indexable *)) tag_real_get_indexable_keywords; -#line 9687 "Tag.c" +#line 9584 "Tag.c" } -static void tag_instance_init (Tag * self) { +static void +tag_instance_init (Tag * self) +{ #line 269 "/home/jens/Source/shotwell/src/Tag.vala" self->priv = TAG_GET_PRIVATE (self); #line 327 "/home/jens/Source/shotwell/src/Tag.vala" @@ -9698,11 +9597,13 @@ static void tag_instance_init (Tag * self) { self->priv->relinking = FALSE; #line 330 "/home/jens/Source/shotwell/src/Tag.vala" self->priv->indexable_keywords = NULL; -#line 9702 "Tag.c" +#line 9601 "Tag.c" } -static void tag_finalize (GObject * obj) { +static void +tag_finalize (GObject * obj) +{ Tag * self; ViewCollection* _tmp0_; guint _tmp1_; @@ -9740,11 +9641,13 @@ static void tag_finalize (GObject * obj) { _g_free0 (self->priv->indexable_keywords); #line 269 "/home/jens/Source/shotwell/src/Tag.vala" G_OBJECT_CLASS (tag_parent_class)->finalize (obj); -#line 9744 "Tag.c" +#line 9645 "Tag.c" } -GType tag_get_type (void) { +GType +tag_get_type (void) +{ static volatile gsize tag_type_id__volatile = 0; if (g_once_init_enter (&tag_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TagClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tag_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Tag), 0, (GInstanceInitFunc) tag_instance_init, NULL }; @@ -9762,7 +9665,11 @@ GType tag_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -9774,7 +9681,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/Thumbnail.c b/src/Thumbnail.c index f02ebd7..34942cc 100644 --- a/src/Thumbnail.c +++ b/src/Thumbnail.c @@ -1,4 +1,4 @@ -/* Thumbnail.c generated by valac 0.36.6, the Vala compiler +/* Thumbnail.c generated by valac 0.40.4, the Vala compiler * generated from Thumbnail.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -140,6 +141,11 @@ typedef struct _ThumbnailSourceClass ThumbnailSourceClass; typedef struct _MediaSource MediaSource; typedef struct _MediaSourceClass MediaSourceClass; +enum { + THUMBNAIL_0_PROPERTY, + THUMBNAIL_NUM_PROPERTIES +}; +static GParamSpec* thumbnail_properties[THUMBNAIL_NUM_PROPERTIES]; #define TYPE_SOURCE_COLLECTION (source_collection_get_type ()) #define SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SOURCE_COLLECTION, SourceCollection)) @@ -431,16 +437,28 @@ extern TagSourceCollection* tag_global; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_view_get_type (void) G_GNUC_CONST; @@ -455,25 +473,42 @@ GType thumbnail_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; #define THUMBNAIL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_THUMBNAIL, ThumbnailPrivate)) -enum { - THUMBNAIL_DUMMY_PROPERTY -}; GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType tag_source_collection_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; GType container_source_get_type (void) G_GNUC_CONST; -static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource* container, GeeCollection* added, gboolean relinking, GeeCollection* removed, gboolean unlinking); -static void _thumbnail_on_tag_contents_altered_container_source_collection_container_contents_altered (ContainerSourceCollection* _sender, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked, gpointer self); -static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered); -static void _thumbnail_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void thumbnail_on_tag_contents_altered (Thumbnail* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinking, + GeeCollection* removed, + gboolean unlinking); +static void _thumbnail_on_tag_contents_altered_container_source_collection_container_contents_altered (ContainerSourceCollection* _sender, + ContainerSource* container, + GeeCollection* added, + gboolean relinked, + GeeCollection* removed, + gboolean unlinked, + gpointer self); +static void thumbnail_on_tags_altered (Thumbnail* self, + GeeMap* altered); +static void _thumbnail_on_tags_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); #define CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES "show-subtitles" #define THUMBNAIL_PROP_SHOW_TAGS CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES #define THUMBNAIL_PROP_SIZE "thumbnail-size" @@ -481,232 +516,312 @@ static void _thumbnail_on_tags_altered_data_collection_items_altered (DataCollec #define THUMBNAIL_LOW_QUALITY_INTERP GDK_INTERP_NEAREST #define THUMBNAIL_HIGH_QUALITY_INTERP GDK_INTERP_BILINEAR #define THUMBNAIL_HQ_IMPROVEMENT_MSEC 100 -Thumbnail* thumbnail_new (MediaSource* media, gint scale); -Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scale); +Thumbnail* thumbnail_new (MediaSource* media, + gint scale); +Thumbnail* thumbnail_construct (GType object_type, + MediaSource* media, + gint scale); GType photo_exception_get_type (void) G_GNUC_CONST; -void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result); -void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dimensions* result); +void media_source_get_dimensions (MediaSource* self, + PhotoException disallowed_steps, + Dimensions* result); +void dimensions_get_scaled (Dimensions *self, + gint scale, + gboolean scale_up, + Dimensions* result); gchar* data_object_get_name (DataObject* self); gchar* media_source_get_comment (MediaSource* self); -MediaSourceItem* media_source_item_new (ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment); -MediaSourceItem* media_source_item_construct (GType object_type, ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment); +MediaSourceItem* media_source_item_new (ThumbnailSource* source, + Dimensions* initial_pixbuf_dim, + const gchar* title, + const gchar* comment, + gboolean marked_up, + PangoAlignment alignment); +MediaSourceItem* media_source_item_construct (GType object_type, + ThumbnailSource* source, + Dimensions* initial_pixbuf_dim, + const gchar* title, + const gchar* comment, + gboolean marked_up, + PangoAlignment alignment); GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; GType video_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; -void media_source_item_set_enable_sprockets (MediaSourceItem* self, gboolean enable_sprockets); -static void thumbnail_update_title (Thumbnail* self, gboolean init); -static void thumbnail_update_comment (Thumbnail* self, gboolean init); -static void thumbnail_update_tags (Thumbnail* self, gboolean init); +void media_source_item_set_enable_sprockets (MediaSourceItem* self, + gboolean enable_sprockets); +static void thumbnail_update_title (Thumbnail* self, + gboolean init); +static void thumbnail_update_comment (Thumbnail* self, + gboolean init); +static void thumbnail_update_tags (Thumbnail* self, + gboolean init); GType tag_get_type (void) G_GNUC_CONST; -GeeSortedSet* tag_source_collection_fetch_sorted_for_source (TagSourceCollection* self, MediaSource* photo); +GeeSortedSet* tag_source_collection_fetch_sorted_for_source (TagSourceCollection* self, + MediaSource* photo); void checkerboard_item_clear_tags (CheckerboardItem* self); -void checkerboard_item_set_tags (CheckerboardItem* self, GeeCollection* tags, PangoAlignment alignment); -gboolean tag_contains (Tag* self, MediaSource* source); +void checkerboard_item_set_tags (CheckerboardItem* self, + GeeCollection* tags, + PangoAlignment alignment); +gboolean tag_contains (Tag* self, + MediaSource* source); gboolean is_string_empty (const gchar* s); void checkerboard_item_clear_title (CheckerboardItem* self); -void media_source_item_set_title (MediaSourceItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment); +void media_source_item_set_title (MediaSourceItem* self, + const gchar* text, + gboolean marked_up, + PangoAlignment alignment); void checkerboard_item_clear_comment (CheckerboardItem* self); -void checkerboard_item_set_comment (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment); -static void thumbnail_real_notify_altered (DataObject* base, Alteration* alteration); -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail); -void data_object_notify_altered (DataObject* self, Alteration* alteration); +void checkerboard_item_set_comment (CheckerboardItem* self, + const gchar* text, + gboolean marked_up, + PangoAlignment alignment); +static void thumbnail_real_notify_altered (DataObject* base, + Alteration* alteration); +gboolean alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail); +void data_object_notify_altered (DataObject* self, + Alteration* alteration); MediaSource* thumbnail_get_media_source (Thumbnail* self); -gint64 thumbnail_photo_id_ascending_comparator (void* a, void* b); +gint64 thumbnail_photo_id_ascending_comparator (void* a, + void* b); gint64 data_source_get_instance_id (DataSource* self); -gint64 thumbnail_photo_id_descending_comparator (void* a, void* b); -gint64 thumbnail_title_ascending_comparator (void* a, void* b); +gint64 thumbnail_photo_id_descending_comparator (void* a, + void* b); +gint64 thumbnail_title_ascending_comparator (void* a, + void* b); gchar* media_source_item_get_natural_collation_key (MediaSourceItem* self); -gint64 thumbnail_title_descending_comparator (void* a, void* b); -gboolean thumbnail_title_comparator_predicate (DataObject* object, Alteration* alteration); -gint64 thumbnail_exposure_time_ascending_comparator (void* a, void* b); +gint64 thumbnail_title_descending_comparator (void* a, + void* b); +gboolean thumbnail_title_comparator_predicate (DataObject* object, + Alteration* alteration); +gint64 thumbnail_exposure_time_ascending_comparator (void* a, + void* b); time_t media_source_get_exposure_time (MediaSource* self); -gint64 thumbnail_filename_ascending_comparator (void* a, void* b); -gint64 thumbnail_exposure_time_desending_comparator (void* a, void* b); -gint64 thumbnail_filename_descending_comparator (void* a, void* b); -gboolean thumbnail_exposure_time_comparator_predicate (DataObject* object, Alteration* alteration); -gboolean thumbnail_filename_comparator_predicate (DataObject* object, Alteration* alteration); +gint64 thumbnail_filename_ascending_comparator (void* a, + void* b); +gint64 thumbnail_exposure_time_desending_comparator (void* a, + void* b); +gint64 thumbnail_filename_descending_comparator (void* a, + void* b); +gboolean thumbnail_exposure_time_comparator_predicate (DataObject* object, + Alteration* alteration); +gboolean thumbnail_filename_comparator_predicate (DataObject* object, + Alteration* alteration); GFile* media_source_get_file (MediaSource* self); -gint64 thumbnail_rating_ascending_comparator (void* a, void* b); +gint64 thumbnail_rating_ascending_comparator (void* a, + void* b); GType rating_get_type (void) G_GNUC_CONST; Rating media_source_get_rating (MediaSource* self); -gint64 thumbnail_rating_descending_comparator (void* a, void* b); -gboolean thumbnail_rating_comparator_predicate (DataObject* object, Alteration* alteration); +gint64 thumbnail_rating_descending_comparator (void* a, + void* b); +gboolean thumbnail_rating_comparator_predicate (DataObject* object, + Alteration* alteration); static void thumbnail_real_thumbnail_altered (ThumbnailView* base); static void thumbnail_delayed_high_quality_fetch (Thumbnail* self); static void thumbnail_paint_empty (Thumbnail* self); -static void thumbnail_real_notify_collection_property_set (DataObject* base, const gchar* name, GValue* old, GValue* val); -static void thumbnail_resize (Thumbnail* self, gint new_scale); +static void thumbnail_real_notify_collection_property_set (DataObject* base, + const gchar* name, + GValue* old, + GValue* val); +static void thumbnail_resize (Thumbnail* self, + gint new_scale); void data_view_notify_view_altered (DataView* self); -void data_object_notify_collection_property_set (DataObject* self, const gchar* name, GValue* old, GValue* val); +void data_object_notify_collection_property_set (DataObject* self, + const gchar* name, + GValue* old, + GValue* val); gint thumbnail_get_MIN_SCALE (void); gint thumbnail_get_MAX_SCALE (void); static void thumbnail_cancel_async_fetch (Thumbnail* self); gboolean checkerboard_item_has_image (CheckerboardItem* self); GdkPixbuf* checkerboard_item_get_image (CheckerboardItem* self); -void checkerboard_item_set_image (CheckerboardItem* self, GdkPixbuf* pixbuf); -GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp); -void checkerboard_item_clear_image (CheckerboardItem* self, Dimensions* dim); +void checkerboard_item_set_image (CheckerboardItem* self, + GdkPixbuf* pixbuf); +GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, + Dimensions* resized, + GdkInterpType interp); +void checkerboard_item_clear_image (CheckerboardItem* self, + Dimensions* dim); static void thumbnail_schedule_low_quality_fetch (Thumbnail* self); -void thumbnail_cache_fetch_async_scaled (ThumbnailSource* source, gint scale, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable); +void thumbnail_cache_fetch_async_scaled (ThumbnailSource* source, + gint scale, + Dimensions* dim, + GdkInterpType interp, + ThumbnailCacheAsyncFetchCallback callback, + void* callback_target, + GCancellable* cancellable); GType thumbnail_cache_size_get_type (void) G_GNUC_CONST; -static void thumbnail_on_low_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err); -static void _thumbnail_on_low_quality_fetched_thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self); +static void thumbnail_on_low_quality_fetched (Thumbnail* self, + GdkPixbuf* pixbuf, + GdkPixbuf* unscaled, + Dimensions* dim, + GdkInterpType interp, + GError* err); +static void _thumbnail_on_low_quality_fetched_thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, + GdkPixbuf* unscaled, + Dimensions* dim, + GdkInterpType interp, + GError* err, + gpointer self); static gboolean thumbnail_on_schedule_high_quality (Thumbnail* self); static gboolean _thumbnail_on_schedule_high_quality_gsource_func (gpointer self); -static void thumbnail_on_high_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err); -static void _thumbnail_on_high_quality_fetched_thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self); +static void thumbnail_on_high_quality_fetched (Thumbnail* self, + GdkPixbuf* pixbuf, + GdkPixbuf* unscaled, + Dimensions* dim, + GdkInterpType interp, + GError* err); +static void _thumbnail_on_high_quality_fetched_thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, + GdkPixbuf* unscaled, + Dimensions* dim, + GdkInterpType interp, + GError* err, + gpointer self); gchar* data_object_to_string (DataObject* self); static void thumbnail_real_exposed (CheckerboardItem* base); void checkerboard_item_exposed (CheckerboardItem* self); static void thumbnail_real_unexposed (CheckerboardItem* base); void checkerboard_item_unexposed (CheckerboardItem* self); -static GdkPixbuf* thumbnail_real_get_top_right_trinket (CheckerboardItem* base, gint scale); +static GdkPixbuf* thumbnail_real_get_top_right_trinket (CheckerboardItem* base, + gint scale); GType flaggable_get_type (void) G_GNUC_CONST; gboolean flaggable_is_flagged (Flaggable* self); -GdkPixbuf* resources_get_icon (const gchar* name, gint scale); +GdkPixbuf* resources_get_icon (const gchar* name, + gint scale); #define RESOURCES_ICON_FLAGGED_TRINKET "flag-trinket.png" #define RESOURCES_DEFAULT_ICON_SCALE 24 -static GdkPixbuf* thumbnail_real_get_bottom_left_trinket (CheckerboardItem* base, gint scale); -void data_object_get_collection_property (DataObject* self, const gchar* name, GValue* def, GValue* result); +static GdkPixbuf* thumbnail_real_get_bottom_left_trinket (CheckerboardItem* base, + gint scale); +void data_object_get_collection_property (DataObject* self, + const gchar* name, + GValue* def, + GValue* result); static void _vala_GValue_free (GValue* self); -GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale); +GdkPixbuf* resources_get_rating_trinket (Rating rating, + gint scale); gint thumbnail_cache_size_get_scale (ThumbnailCacheSize self); gint thumbnail_get_DEFAULT_SCALE (void); static void thumbnail_finalize (GObject * obj); -static void _vala_thumbnail_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); - - -static void _thumbnail_on_tag_contents_altered_container_source_collection_container_contents_altered (ContainerSourceCollection* _sender, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked, gpointer self) { +static void _vala_thumbnail_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); + + +static void +_thumbnail_on_tag_contents_altered_container_source_collection_container_contents_altered (ContainerSourceCollection* _sender, + ContainerSource* container, + GeeCollection* added, + gboolean relinked, + GeeCollection* removed, + gboolean unlinked, + gpointer self) +{ #line 76 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_on_tag_contents_altered ((Thumbnail*) self, container, added, relinked, removed, unlinked); -#line 585 "Thumbnail.c" +#line 726 "Thumbnail.c" } -static void _thumbnail_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_thumbnail_on_tags_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 77 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_on_tags_altered ((Thumbnail*) self, items); -#line 592 "Thumbnail.c" +#line 737 "Thumbnail.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 53 "/home/jens/Source/shotwell/src/Thumbnail.vala" return self ? g_object_ref (self) : NULL; -#line 599 "Thumbnail.c" +#line 746 "Thumbnail.c" } -Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scale) { +Thumbnail* +thumbnail_construct (GType object_type, + MediaSource* media, + gint scale) +{ Thumbnail * self = NULL; - MediaSource* _tmp0_; - MediaSource* _tmp1_; - Dimensions _tmp2_ = {0}; - gint _tmp3_; - Dimensions _tmp4_ = {0}; - MediaSource* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - MediaSource* _tmp8_; - gchar* _tmp9_; - gchar* _tmp10_; - MediaSource* _tmp11_; - MediaSource* _tmp12_; - gint _tmp13_; - TagSourceCollection* _tmp14_; - TagSourceCollection* _tmp15_; - gboolean _tmp16_ = FALSE; - MediaSource* _tmp17_; - MediaSource* _tmp19_; - MediaSource* _tmp20_; - Dimensions _tmp21_ = {0}; - gint _tmp22_; - Dimensions _tmp23_ = {0}; + Dimensions _tmp0_ = {0}; + Dimensions _tmp1_ = {0}; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + MediaSource* _tmp6_; + TagSourceCollection* _tmp7_; + TagSourceCollection* _tmp8_; + gboolean _tmp9_ = FALSE; + Dimensions _tmp10_ = {0}; + Dimensions _tmp11_ = {0}; #line 49 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (media), NULL); #line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = media; + media_source_get_dimensions (media, PHOTO_EXCEPTION_NONE, &_tmp0_); #line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = media; + dimensions_get_scaled (&_tmp0_, scale, TRUE, &_tmp1_); #line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - media_source_get_dimensions (_tmp1_, PHOTO_EXCEPTION_NONE, &_tmp2_); + _tmp2_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (media, TYPE_DATA_OBJECT, DataObject)); #line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = scale; -#line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - dimensions_get_scaled (&_tmp2_, _tmp3_, TRUE, &_tmp4_); -#line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = media; -#line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); -#line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = _tmp6_; -#line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = media; + _tmp3_ = _tmp2_; #line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = media_source_get_comment (_tmp8_); + _tmp4_ = media_source_get_comment (media); #line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp10_ = _tmp9_; + _tmp5_ = _tmp4_; #line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - self = (Thumbnail*) media_source_item_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), &_tmp4_, _tmp7_, _tmp10_, FALSE, PANGO_ALIGN_LEFT); + self = (Thumbnail*) media_source_item_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (media, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), &_tmp1_, _tmp3_, _tmp5_, FALSE, PANGO_ALIGN_LEFT); #line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp5_); #line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_free0 (_tmp7_); -#line 53 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp11_ = media; + _g_free0 (_tmp3_); #line 53 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp12_ = _g_object_ref0 (_tmp11_); + _tmp6_ = _g_object_ref0 (media); #line 53 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (self->priv->media); #line 53 "/home/jens/Source/shotwell/src/Thumbnail.vala" - self->priv->media = _tmp12_; -#line 54 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp13_ = scale; + self->priv->media = _tmp6_; #line 54 "/home/jens/Source/shotwell/src/Thumbnail.vala" - self->priv->scale = _tmp13_; + self->priv->scale = scale; #line 56 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp14_ = tag_global; + _tmp7_ = tag_global; #line 56 "/home/jens/Source/shotwell/src/Thumbnail.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), "container-contents-altered", (GCallback) _thumbnail_on_tag_contents_altered_container_source_collection_container_contents_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), "container-contents-altered", (GCallback) _thumbnail_on_tag_contents_altered_container_source_collection_container_contents_altered, self, 0); #line 57 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp15_ = tag_global; + _tmp8_ = tag_global; #line 57 "/home/jens/Source/shotwell/src/Thumbnail.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _thumbnail_on_tags_altered_data_collection_items_altered, self, 0); -#line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp17_ = media; + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _thumbnail_on_tags_altered_data_collection_items_altered, self, 0); #line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_LIBRARY_PHOTO)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (media, TYPE_LIBRARY_PHOTO)) { #line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp16_ = TRUE; -#line 684 "Thumbnail.c" + _tmp9_ = TRUE; +#line 808 "Thumbnail.c" } else { - MediaSource* _tmp18_; #line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp18_ = media; -#line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_VIDEO); -#line 691 "Thumbnail.c" + _tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (media, TYPE_VIDEO); +#line 812 "Thumbnail.c" } #line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _vala_assert (_tmp16_, "(media is LibraryPhoto) || (media is Video)"); -#line 60 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp19_ = media; + _vala_assert (_tmp9_, "(media is LibraryPhoto) || (media is Video)"); #line 60 "/home/jens/Source/shotwell/src/Thumbnail.vala" - media_source_item_set_enable_sprockets (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_VIDEO)); + media_source_item_set_enable_sprockets (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), G_TYPE_CHECK_INSTANCE_TYPE (media, TYPE_VIDEO)); #line 62 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp20_ = media; + media_source_get_dimensions (media, PHOTO_EXCEPTION_NONE, &_tmp10_); #line 62 "/home/jens/Source/shotwell/src/Thumbnail.vala" - media_source_get_dimensions (_tmp20_, PHOTO_EXCEPTION_NONE, &_tmp21_); -#line 62 "/home/jens/Source/shotwell/src/Thumbnail.vala" - self->priv->original_dim = _tmp21_; -#line 63 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp22_ = scale; + self->priv->original_dim = _tmp10_; #line 63 "/home/jens/Source/shotwell/src/Thumbnail.vala" - dimensions_get_scaled (&self->priv->original_dim, _tmp22_, TRUE, &_tmp23_); + dimensions_get_scaled (&self->priv->original_dim, scale, TRUE, &_tmp11_); #line 63 "/home/jens/Source/shotwell/src/Thumbnail.vala" - self->priv->dim = _tmp23_; + self->priv->dim = _tmp11_; #line 67 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_update_title (self, TRUE); #line 68 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -715,18 +830,24 @@ Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scal thumbnail_update_tags (self, TRUE); #line 49 "/home/jens/Source/shotwell/src/Thumbnail.vala" return self; -#line 719 "Thumbnail.c" +#line 834 "Thumbnail.c" } -Thumbnail* thumbnail_new (MediaSource* media, gint scale) { +Thumbnail* +thumbnail_new (MediaSource* media, + gint scale) +{ #line 49 "/home/jens/Source/shotwell/src/Thumbnail.vala" return thumbnail_construct (TYPE_THUMBNAIL, media, scale); -#line 726 "Thumbnail.c" +#line 844 "Thumbnail.c" } -static void thumbnail_update_tags (Thumbnail* self, gboolean init) { +static void +thumbnail_update_tags (Thumbnail* self, + gboolean init) +{ GeeCollection* tags = NULL; TagSourceCollection* _tmp0_; MediaSource* _tmp1_; @@ -749,7 +870,7 @@ static void thumbnail_update_tags (Thumbnail* self, gboolean init) { if (_tmp4_ == NULL) { #line 82 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = TRUE; -#line 753 "Thumbnail.c" +#line 874 "Thumbnail.c" } else { GeeCollection* _tmp5_; gint _tmp6_; @@ -762,37 +883,42 @@ static void thumbnail_update_tags (Thumbnail* self, gboolean init) { _tmp7_ = _tmp6_; #line 82 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = _tmp7_ == 0; -#line 766 "Thumbnail.c" +#line 887 "Thumbnail.c" } #line 82 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp3_) { #line 83 "/home/jens/Source/shotwell/src/Thumbnail.vala" checkerboard_item_clear_tags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 772 "Thumbnail.c" +#line 893 "Thumbnail.c" } else { GeeCollection* _tmp8_; #line 85 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp8_ = tags; #line 85 "/home/jens/Source/shotwell/src/Thumbnail.vala" checkerboard_item_set_tags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp8_, PANGO_ALIGN_LEFT); -#line 779 "Thumbnail.c" +#line 900 "Thumbnail.c" } #line 80 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (tags); -#line 783 "Thumbnail.c" +#line 904 "Thumbnail.c" } -static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource* container, GeeCollection* added, gboolean relinking, GeeCollection* removed, gboolean unlinking) { +static void +thumbnail_on_tag_contents_altered (Thumbnail* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinking, + GeeCollection* removed, + gboolean unlinking) +{ gboolean _tmp0_; gboolean _tmp1_ = FALSE; - GeeCollection* _tmp2_; gboolean tag_added = FALSE; - gboolean _tmp6_ = FALSE; - GeeCollection* _tmp7_; + gboolean _tmp3_ = FALSE; gboolean tag_removed = FALSE; - gboolean _tmp11_ = FALSE; - gboolean _tmp12_; + gboolean _tmp5_ = FALSE; + gboolean _tmp6_; #line 88 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); #line 88 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -807,81 +933,68 @@ static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource* if (!_tmp0_) { #line 91 "/home/jens/Source/shotwell/src/Thumbnail.vala" return; -#line 811 "Thumbnail.c" +#line 937 "Thumbnail.c" } #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = added; -#line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp2_ != NULL) { -#line 817 "Thumbnail.c" - GeeCollection* _tmp3_; - MediaSource* _tmp4_; - gboolean _tmp5_; -#line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = added; -#line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = self->priv->media; + if (added != NULL) { +#line 941 "Thumbnail.c" + MediaSource* _tmp2_; #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = gee_collection_contains (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource)); + _tmp2_ = self->priv->media; #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = _tmp5_; -#line 829 "Thumbnail.c" + _tmp1_ = gee_collection_contains (added, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource)); +#line 947 "Thumbnail.c" } else { #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = FALSE; -#line 833 "Thumbnail.c" +#line 951 "Thumbnail.c" } #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala" tag_added = _tmp1_; #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = removed; -#line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp7_ != NULL) { -#line 841 "Thumbnail.c" - GeeCollection* _tmp8_; - MediaSource* _tmp9_; - gboolean _tmp10_; -#line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = removed; -#line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = self->priv->media; + if (removed != NULL) { +#line 957 "Thumbnail.c" + MediaSource* _tmp4_; #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp10_ = gee_collection_contains (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_SOURCE, DataSource)); + _tmp4_ = self->priv->media; #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = _tmp10_; -#line 853 "Thumbnail.c" + _tmp3_ = gee_collection_contains (removed, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource)); +#line 963 "Thumbnail.c" } else { #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = FALSE; -#line 857 "Thumbnail.c" + _tmp3_ = FALSE; +#line 967 "Thumbnail.c" } #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala" - tag_removed = _tmp6_; + tag_removed = _tmp3_; #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp12_ = tag_added; + _tmp6_ = tag_added; #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp12_) { + if (_tmp6_) { #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp11_ = TRUE; -#line 867 "Thumbnail.c" + _tmp5_ = TRUE; +#line 977 "Thumbnail.c" } else { - gboolean _tmp13_; + gboolean _tmp7_; #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp13_ = tag_removed; + _tmp7_ = tag_removed; #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp11_ = _tmp13_; -#line 874 "Thumbnail.c" + _tmp5_ = _tmp7_; +#line 984 "Thumbnail.c" } #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp11_) { + if (_tmp5_) { #line 98 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_update_tags (self, FALSE); -#line 880 "Thumbnail.c" +#line 990 "Thumbnail.c" } } -static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) { +static void +thumbnail_on_tags_altered (Thumbnail* self, + GeeMap* altered) +{ gboolean _tmp0_; #line 101 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); @@ -893,76 +1006,67 @@ static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) { if (!_tmp0_) { #line 103 "/home/jens/Source/shotwell/src/Thumbnail.vala" return; -#line 897 "Thumbnail.c" +#line 1010 "Thumbnail.c" } { GeeIterator* _object_it = NULL; - GeeMap* _tmp1_; + GeeSet* _tmp1_; GeeSet* _tmp2_; GeeSet* _tmp3_; - GeeSet* _tmp4_; + GeeIterator* _tmp4_; GeeIterator* _tmp5_; - GeeIterator* _tmp6_; #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = altered; + _tmp1_ = gee_map_get_keys (altered); #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = gee_map_get_keys (_tmp1_); + _tmp2_ = _tmp1_; #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = _tmp2_; #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = _tmp3_; + _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp5_ = _tmp4_; #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = _tmp5_; + _g_object_unref0 (_tmp3_); #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_object_unref0 (_tmp4_); -#line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _object_it = _tmp6_; + _object_it = _tmp5_; #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" while (TRUE) { -#line 925 "Thumbnail.c" - GeeIterator* _tmp7_; - gboolean _tmp8_; +#line 1035 "Thumbnail.c" + GeeIterator* _tmp6_; DataObject* object = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; + GeeIterator* _tmp7_; + gpointer _tmp8_; Tag* tag = NULL; - DataObject* _tmp11_; - Tag* _tmp12_; - Tag* _tmp13_; - MediaSource* _tmp14_; - gboolean _tmp15_; -#line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = _object_it; + DataObject* _tmp9_; + Tag* _tmp10_; + Tag* _tmp11_; + MediaSource* _tmp12_; #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = gee_iterator_next (_tmp7_); + _tmp6_ = _object_it; #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp6_)) { #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" break; -#line 945 "Thumbnail.c" +#line 1051 "Thumbnail.c" } #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = _object_it; + _tmp7_ = _object_it; #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - object = (DataObject*) _tmp10_; + object = (DataObject*) _tmp8_; #line 106 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp11_ = object; + _tmp9_ = object; #line 106 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_TAG, Tag)); + _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_TAG, Tag)); #line 106 "/home/jens/Source/shotwell/src/Thumbnail.vala" - tag = _tmp12_; -#line 108 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp13_ = tag; + tag = _tmp10_; #line 108 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp14_ = self->priv->media; + _tmp11_ = tag; #line 108 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp15_ = tag_contains (_tmp13_, _tmp14_); + _tmp12_ = self->priv->media; #line 108 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp15_) { + if (tag_contains (_tmp11_, _tmp12_)) { #line 109 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_update_tags (self, FALSE); #line 111 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -971,27 +1075,29 @@ static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) { _g_object_unref0 (object); #line 111 "/home/jens/Source/shotwell/src/Thumbnail.vala" break; -#line 975 "Thumbnail.c" +#line 1079 "Thumbnail.c" } #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (tag); #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (object); -#line 981 "Thumbnail.c" +#line 1085 "Thumbnail.c" } #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (_object_it); -#line 985 "Thumbnail.c" +#line 1089 "Thumbnail.c" } } -static void thumbnail_update_title (Thumbnail* self, gboolean init) { +static void +thumbnail_update_title (Thumbnail* self, + gboolean init) +{ gchar* title = NULL; MediaSource* _tmp0_; gchar* _tmp1_; const gchar* _tmp2_; - gboolean _tmp3_; #line 116 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); #line 117 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -1003,39 +1109,36 @@ static void thumbnail_update_title (Thumbnail* self, gboolean init) { #line 118 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = title; #line 118 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = is_string_empty (_tmp2_); -#line 118 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp3_) { + if (is_string_empty (_tmp2_)) { #line 119 "/home/jens/Source/shotwell/src/Thumbnail.vala" checkerboard_item_clear_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 1012 "Thumbnail.c" +#line 1116 "Thumbnail.c" } else { - gboolean _tmp4_; -#line 120 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = init; #line 120 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (!_tmp4_) { -#line 1019 "Thumbnail.c" - const gchar* _tmp5_; + if (!init) { +#line 1120 "Thumbnail.c" + const gchar* _tmp3_; #line 121 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = title; + _tmp3_ = title; #line 121 "/home/jens/Source/shotwell/src/Thumbnail.vala" - media_source_item_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), _tmp5_, FALSE, PANGO_ALIGN_LEFT); -#line 1025 "Thumbnail.c" + media_source_item_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), _tmp3_, FALSE, PANGO_ALIGN_LEFT); +#line 1126 "Thumbnail.c" } } #line 116 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_free0 (title); -#line 1030 "Thumbnail.c" +#line 1131 "Thumbnail.c" } -static void thumbnail_update_comment (Thumbnail* self, gboolean init) { +static void +thumbnail_update_comment (Thumbnail* self, + gboolean init) +{ gchar* comment = NULL; MediaSource* _tmp0_; gchar* _tmp1_; const gchar* _tmp2_; - gboolean _tmp3_; #line 124 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); #line 125 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -1047,40 +1150,37 @@ static void thumbnail_update_comment (Thumbnail* self, gboolean init) { #line 126 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = comment; #line 126 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = is_string_empty (_tmp2_); -#line 126 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp3_) { + if (is_string_empty (_tmp2_)) { #line 127 "/home/jens/Source/shotwell/src/Thumbnail.vala" checkerboard_item_clear_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 1056 "Thumbnail.c" +#line 1157 "Thumbnail.c" } else { - gboolean _tmp4_; -#line 128 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = init; #line 128 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (!_tmp4_) { -#line 1063 "Thumbnail.c" - const gchar* _tmp5_; + if (!init) { +#line 1161 "Thumbnail.c" + const gchar* _tmp3_; #line 129 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = comment; + _tmp3_ = comment; #line 129 "/home/jens/Source/shotwell/src/Thumbnail.vala" - checkerboard_item_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp5_, FALSE, PANGO_ALIGN_LEFT); -#line 1069 "Thumbnail.c" + checkerboard_item_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp3_, FALSE, PANGO_ALIGN_LEFT); +#line 1167 "Thumbnail.c" } } #line 124 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_free0 (comment); -#line 1074 "Thumbnail.c" +#line 1172 "Thumbnail.c" } -static void thumbnail_real_notify_altered (DataObject* base, Alteration* alteration) { +static void +thumbnail_real_notify_altered (DataObject* base, + Alteration* alteration) +{ Thumbnail * self; gboolean _tmp0_ = FALSE; gboolean _tmp1_; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_; - Alteration* _tmp8_; + gboolean _tmp2_ = FALSE; + gboolean _tmp3_; #line 132 "/home/jens/Source/shotwell/src/Thumbnail.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail); #line 132 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -1089,61 +1189,47 @@ static void thumbnail_real_notify_altered (DataObject* base, Alteration* alterat _tmp1_ = self->priv->exposure; #line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp1_) { -#line 1093 "Thumbnail.c" - Alteration* _tmp2_; - gboolean _tmp3_; #line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = alteration; -#line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = alteration_has_detail (_tmp2_, "metadata", "name"); -#line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = _tmp3_; -#line 1102 "Thumbnail.c" + _tmp0_ = alteration_has_detail (alteration, "metadata", "name"); +#line 1195 "Thumbnail.c" } else { #line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = FALSE; -#line 1106 "Thumbnail.c" +#line 1199 "Thumbnail.c" } #line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp0_) { #line 134 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_update_title (self, FALSE); -#line 1112 "Thumbnail.c" +#line 1205 "Thumbnail.c" } #line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = self->priv->exposure; -#line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp5_) { -#line 1118 "Thumbnail.c" - Alteration* _tmp6_; - gboolean _tmp7_; -#line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = alteration; + _tmp3_ = self->priv->exposure; #line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = alteration_has_detail (_tmp6_, "metadata", "comment"); + if (_tmp3_) { #line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = _tmp7_; -#line 1127 "Thumbnail.c" + _tmp2_ = alteration_has_detail (alteration, "metadata", "comment"); +#line 1213 "Thumbnail.c" } else { #line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = FALSE; -#line 1131 "Thumbnail.c" + _tmp2_ = FALSE; +#line 1217 "Thumbnail.c" } #line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp4_) { + if (_tmp2_) { #line 136 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_update_comment (self, FALSE); -#line 1137 "Thumbnail.c" +#line 1223 "Thumbnail.c" } #line 138 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = alteration; -#line 138 "/home/jens/Source/shotwell/src/Thumbnail.vala" - DATA_OBJECT_CLASS (thumbnail_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TYPE_DATA_OBJECT, DataObject), _tmp8_); -#line 1143 "Thumbnail.c" + DATA_OBJECT_CLASS (thumbnail_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TYPE_DATA_OBJECT, DataObject), alteration); +#line 1227 "Thumbnail.c" } -MediaSource* thumbnail_get_media_source (Thumbnail* self) { +MediaSource* +thumbnail_get_media_source (Thumbnail* self) +{ MediaSource* result = NULL; MediaSource* _tmp0_; MediaSource* _tmp1_; @@ -1157,670 +1243,519 @@ MediaSource* thumbnail_get_media_source (Thumbnail* self) { result = _tmp1_; #line 142 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1161 "Thumbnail.c" +#line 1247 "Thumbnail.c" } -gint64 thumbnail_photo_id_ascending_comparator (void* a, void* b) { +gint64 +thumbnail_photo_id_ascending_comparator (void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; + MediaSource* _tmp0_; MediaSource* _tmp1_; - gint64 _tmp2_; - void* _tmp3_; - MediaSource* _tmp4_; - gint64 _tmp5_; -#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = a; -#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp0_, TYPE_THUMBNAIL, Thumbnail)->priv->media; -#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource)); -#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = b; #line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp3_, TYPE_THUMBNAIL, Thumbnail)->priv->media; + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) a, TYPE_THUMBNAIL, Thumbnail)->priv->media; #line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource)); + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) b, TYPE_THUMBNAIL, Thumbnail)->priv->media; #line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp2_ - _tmp5_; + result = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource)) - data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource)); #line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1189 "Thumbnail.c" +#line 1266 "Thumbnail.c" } -gint64 thumbnail_photo_id_descending_comparator (void* a, void* b) { +gint64 +thumbnail_photo_id_descending_comparator (void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; - void* _tmp1_; - gint64 _tmp2_; -#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = b; -#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = a; #line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = thumbnail_photo_id_ascending_comparator (_tmp0_, _tmp1_); -#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp2_; + result = thumbnail_photo_id_ascending_comparator (b, a); #line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1208 "Thumbnail.c" +#line 1279 "Thumbnail.c" } -gint64 thumbnail_title_ascending_comparator (void* a, void* b) { +gint64 +thumbnail_title_ascending_comparator (void* a, + void* b) +{ gint64 result = 0LL; gint64 _result_ = 0LL; GCompareFunc _tmp0_; - void* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - void* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - gint _tmp7_; - gint64 _tmp8_; - gint64 _tmp9_ = 0LL; - gint64 _tmp10_; + gchar* _tmp4_; + gint64 _tmp5_; + gint64 _tmp6_ = 0LL; + gint64 _tmp7_; #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = g_strcmp0; #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = a; -#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = media_source_item_get_natural_collation_key (G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp1_, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem)); + _tmp1_ = media_source_item_get_natural_collation_key (G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) a, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem)); #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp2_; -#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = b; + _tmp2_ = _tmp1_; #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = media_source_item_get_natural_collation_key (G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp4_, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem)); + _tmp3_ = media_source_item_get_natural_collation_key (G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) b, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem)); #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = _tmp0_ (_tmp3_, _tmp6_); + _tmp5_ = (gint64) _tmp0_ (_tmp2_, _tmp4_); #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = (gint64) _tmp7_; + _g_free0 (_tmp4_); #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp2_); #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_free0 (_tmp3_); -#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _result_ = _tmp8_; + _result_ = _tmp5_; #line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp10_ = _result_; + _tmp7_ = _result_; #line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp10_ != ((gint64) 0)) { -#line 1254 "Thumbnail.c" - gint64 _tmp11_; + if (_tmp7_ != ((gint64) 0)) { +#line 1319 "Thumbnail.c" + gint64 _tmp8_; #line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp11_ = _result_; + _tmp8_ = _result_; #line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = _tmp11_; -#line 1260 "Thumbnail.c" + _tmp6_ = _tmp8_; +#line 1325 "Thumbnail.c" } else { - void* _tmp12_; - void* _tmp13_; - gint64 _tmp14_; -#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp12_ = a; -#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp13_ = b; #line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp14_ = thumbnail_photo_id_ascending_comparator (_tmp12_, _tmp13_); -#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = _tmp14_; -#line 1273 "Thumbnail.c" + _tmp6_ = thumbnail_photo_id_ascending_comparator (a, b); +#line 1329 "Thumbnail.c" } #line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp9_; + result = _tmp6_; #line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1279 "Thumbnail.c" +#line 1335 "Thumbnail.c" } -gint64 thumbnail_title_descending_comparator (void* a, void* b) { +gint64 +thumbnail_title_descending_comparator (void* a, + void* b) +{ gint64 result = 0LL; gint64 _result_ = 0LL; - void* _tmp0_; - void* _tmp1_; - gint64 _tmp2_; - gint64 _tmp3_ = 0LL; - gint64 _tmp4_; -#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = b; + gint64 _tmp0_ = 0LL; + gint64 _tmp1_; #line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = a; -#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = thumbnail_title_ascending_comparator (_tmp0_, _tmp1_); -#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _result_ = _tmp2_; + _result_ = thumbnail_title_ascending_comparator (b, a); #line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = _result_; + _tmp1_ = _result_; #line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp4_ != ((gint64) 0)) { -#line 1303 "Thumbnail.c" - gint64 _tmp5_; + if (_tmp1_ != ((gint64) 0)) { +#line 1353 "Thumbnail.c" + gint64 _tmp2_; #line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = _result_; + _tmp2_ = _result_; #line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp5_; -#line 1309 "Thumbnail.c" + _tmp0_ = _tmp2_; +#line 1359 "Thumbnail.c" } else { - void* _tmp6_; - void* _tmp7_; - gint64 _tmp8_; -#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = a; #line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = b; -#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = thumbnail_photo_id_descending_comparator (_tmp6_, _tmp7_); -#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp8_; -#line 1322 "Thumbnail.c" + _tmp0_ = thumbnail_photo_id_descending_comparator (a, b); +#line 1363 "Thumbnail.c" } #line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp3_; + result = _tmp0_; #line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1328 "Thumbnail.c" +#line 1369 "Thumbnail.c" } -gboolean thumbnail_title_comparator_predicate (DataObject* object, Alteration* alteration) { +gboolean +thumbnail_title_comparator_predicate (DataObject* object, + Alteration* alteration) +{ gboolean result = FALSE; - Alteration* _tmp0_; - gboolean _tmp1_; #line 168 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 168 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = alteration; -#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "title"); -#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp1_; + result = alteration_has_detail (alteration, "metadata", "title"); #line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1348 "Thumbnail.c" +#line 1386 "Thumbnail.c" } -gint64 thumbnail_exposure_time_ascending_comparator (void* a, void* b) { +gint64 +thumbnail_exposure_time_ascending_comparator (void* a, + void* b) +{ gint64 result = 0LL; gint64 time_a = 0LL; - void* _tmp0_; - MediaSource* _tmp1_; - time_t _tmp2_; + MediaSource* _tmp0_; gint64 time_b = 0LL; - void* _tmp3_; - MediaSource* _tmp4_; - time_t _tmp5_; + MediaSource* _tmp1_; gint64 _result_ = 0LL; - gint64 _tmp6_; - gint64 _tmp7_; - gint64 _tmp8_ = 0LL; - gint64 _tmp9_; -#line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = a; -#line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp0_, TYPE_THUMBNAIL, Thumbnail)->priv->media; + gint64 _tmp2_; + gint64 _tmp3_; + gint64 _tmp4_ = 0LL; + gint64 _tmp5_; #line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = media_source_get_exposure_time (_tmp1_); + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) a, TYPE_THUMBNAIL, Thumbnail)->priv->media; #line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala" - time_a = (gint64) _tmp2_; -#line 174 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = b; + time_a = (gint64) media_source_get_exposure_time (_tmp0_); #line 174 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp3_, TYPE_THUMBNAIL, Thumbnail)->priv->media; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) b, TYPE_THUMBNAIL, Thumbnail)->priv->media; #line 174 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = media_source_get_exposure_time (_tmp4_); -#line 174 "/home/jens/Source/shotwell/src/Thumbnail.vala" - time_b = (gint64) _tmp5_; + time_b = (gint64) media_source_get_exposure_time (_tmp1_); #line 175 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = time_a; + _tmp2_ = time_a; #line 175 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = time_b; + _tmp3_ = time_b; #line 175 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _result_ = _tmp6_ - _tmp7_; + _result_ = _tmp2_ - _tmp3_; #line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = _result_; + _tmp5_ = _result_; #line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp9_ != ((gint64) 0)) { -#line 1393 "Thumbnail.c" - gint64 _tmp10_; + if (_tmp5_ != ((gint64) 0)) { +#line 1422 "Thumbnail.c" + gint64 _tmp6_; #line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp10_ = _result_; + _tmp6_ = _result_; #line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = _tmp10_; -#line 1399 "Thumbnail.c" + _tmp4_ = _tmp6_; +#line 1428 "Thumbnail.c" } else { - void* _tmp11_; - void* _tmp12_; - gint64 _tmp13_; -#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp11_ = a; #line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp12_ = b; -#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp13_ = thumbnail_filename_ascending_comparator (_tmp11_, _tmp12_); -#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = _tmp13_; -#line 1412 "Thumbnail.c" + _tmp4_ = thumbnail_filename_ascending_comparator (a, b); +#line 1432 "Thumbnail.c" } #line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp8_; + result = _tmp4_; #line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1418 "Thumbnail.c" +#line 1438 "Thumbnail.c" } -gint64 thumbnail_exposure_time_desending_comparator (void* a, void* b) { +gint64 +thumbnail_exposure_time_desending_comparator (void* a, + void* b) +{ gint64 result = 0LL; gint64 _result_ = 0LL; - void* _tmp0_; - void* _tmp1_; - gint64 _tmp2_; - gint64 _tmp3_ = 0LL; - gint64 _tmp4_; -#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = b; -#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = a; + gint64 _tmp0_ = 0LL; + gint64 _tmp1_; #line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = thumbnail_exposure_time_ascending_comparator (_tmp0_, _tmp1_); -#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _result_ = _tmp2_; + _result_ = thumbnail_exposure_time_ascending_comparator (b, a); #line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = _result_; + _tmp1_ = _result_; #line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp4_ != ((gint64) 0)) { -#line 1442 "Thumbnail.c" - gint64 _tmp5_; + if (_tmp1_ != ((gint64) 0)) { +#line 1456 "Thumbnail.c" + gint64 _tmp2_; #line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = _result_; + _tmp2_ = _result_; #line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp5_; -#line 1448 "Thumbnail.c" + _tmp0_ = _tmp2_; +#line 1462 "Thumbnail.c" } else { - void* _tmp6_; - void* _tmp7_; - gint64 _tmp8_; -#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = a; -#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = b; -#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = thumbnail_filename_descending_comparator (_tmp6_, _tmp7_); #line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp8_; -#line 1461 "Thumbnail.c" + _tmp0_ = thumbnail_filename_descending_comparator (a, b); +#line 1466 "Thumbnail.c" } #line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp3_; + result = _tmp0_; #line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1467 "Thumbnail.c" +#line 1472 "Thumbnail.c" } -gboolean thumbnail_exposure_time_comparator_predicate (DataObject* object, Alteration* alteration) { +gboolean +thumbnail_exposure_time_comparator_predicate (DataObject* object, + Alteration* alteration) +{ gboolean result = FALSE; - Alteration* _tmp0_; - gboolean _tmp1_; #line 186 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 186 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = alteration; -#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "exposure-time"); -#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp1_; + result = alteration_has_detail (alteration, "metadata", "exposure-time"); #line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1487 "Thumbnail.c" +#line 1489 "Thumbnail.c" } -gboolean thumbnail_filename_comparator_predicate (DataObject* object, Alteration* alteration) { +gboolean +thumbnail_filename_comparator_predicate (DataObject* object, + Alteration* alteration) +{ gboolean result = FALSE; - Alteration* _tmp0_; - gboolean _tmp1_; #line 190 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 190 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = alteration; -#line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "filename"); -#line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp1_; + result = alteration_has_detail (alteration, "metadata", "filename"); #line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1507 "Thumbnail.c" +#line 1506 "Thumbnail.c" } -gint64 thumbnail_filename_ascending_comparator (void* a, void* b) { +gint64 +thumbnail_filename_ascending_comparator (void* a, + void* b) +{ gint64 result = 0LL; gchar* path_a = NULL; - void* _tmp0_; - MediaSource* _tmp1_; + MediaSource* _tmp0_; + GFile* _tmp1_; GFile* _tmp2_; - GFile* _tmp3_; + gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; gchar* path_b = NULL; - void* _tmp8_; - MediaSource* _tmp9_; - GFile* _tmp10_; - GFile* _tmp11_; + MediaSource* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; gchar* _tmp12_; gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; gint64 _result_ = 0LL; - GCompareFunc _tmp16_; - const gchar* _tmp17_; - gchar* _tmp18_; + GCompareFunc _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + const gchar* _tmp18_; gchar* _tmp19_; - const gchar* _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; - gint _tmp23_; - gint64 _tmp24_; - gint64 _tmp25_ = 0LL; - gint64 _tmp26_; -#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = a; + gchar* _tmp20_; + gint64 _tmp21_; + gint64 _tmp22_ = 0LL; + gint64 _tmp23_; #line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp0_, TYPE_THUMBNAIL, Thumbnail)->priv->media; + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) a, TYPE_THUMBNAIL, Thumbnail)->priv->media; #line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = media_source_get_file (_tmp1_); + _tmp1_ = media_source_get_file (_tmp0_); #line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = g_file_get_basename (_tmp3_); + _tmp3_ = g_file_get_basename (_tmp2_); #line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = g_utf8_strdown (_tmp5_, (gssize) -1); + _tmp5_ = g_utf8_strdown (_tmp4_, (gssize) -1); #line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp4_); #line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - path_a = _tmp7_; + path_a = _tmp6_; +#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" + _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) b, TYPE_THUMBNAIL, Thumbnail)->priv->media; #line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = b; + _tmp8_ = media_source_get_file (_tmp7_); #line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp8_, TYPE_THUMBNAIL, Thumbnail)->priv->media; + _tmp9_ = _tmp8_; #line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp10_ = media_source_get_file (_tmp9_); + _tmp10_ = g_file_get_basename (_tmp9_); #line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp11_ = _tmp10_; #line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp12_ = g_file_get_basename (_tmp11_); + _tmp12_ = g_utf8_strdown (_tmp11_, (gssize) -1); #line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp13_ = _tmp12_; #line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp14_ = g_utf8_strdown (_tmp13_, (gssize) -1); -#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp15_ = _tmp14_; + _g_free0 (_tmp11_); #line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_free0 (_tmp13_); + _g_object_unref0 (_tmp9_); #line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_object_unref0 (_tmp11_); -#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" - path_b = _tmp15_; -#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp16_ = g_strcmp0; + path_b = _tmp13_; #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp17_ = path_a; + _tmp14_ = g_strcmp0; #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp18_ = g_utf8_collate_key_for_filename (_tmp17_, (gssize) -1); + _tmp15_ = path_a; #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp19_ = _tmp18_; + _tmp16_ = g_utf8_collate_key_for_filename (_tmp15_, (gssize) -1); #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp20_ = path_b; + _tmp17_ = _tmp16_; #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp21_ = g_utf8_collate_key_for_filename (_tmp20_, (gssize) -1); + _tmp18_ = path_b; #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp22_ = _tmp21_; + _tmp19_ = g_utf8_collate_key_for_filename (_tmp18_, (gssize) -1); #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp23_ = _tmp16_ (_tmp19_, _tmp22_); + _tmp20_ = _tmp19_; #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp24_ = (gint64) _tmp23_; + _tmp21_ = (gint64) _tmp14_ (_tmp17_, _tmp20_); #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp20_); #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_free0 (_tmp19_); + _g_free0 (_tmp17_); #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _result_ = _tmp24_; + _result_ = _tmp21_; #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp26_ = _result_; + _tmp23_ = _result_; #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp26_ != ((gint64) 0)) { -#line 1615 "Thumbnail.c" - gint64 _tmp27_; + if (_tmp23_ != ((gint64) 0)) { +#line 1608 "Thumbnail.c" + gint64 _tmp24_; #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp27_ = _result_; + _tmp24_ = _result_; #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp25_ = _tmp27_; -#line 1621 "Thumbnail.c" + _tmp22_ = _tmp24_; +#line 1614 "Thumbnail.c" } else { - void* _tmp28_; - void* _tmp29_; - gint64 _tmp30_; #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp28_ = a; -#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp29_ = b; -#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp30_ = thumbnail_photo_id_ascending_comparator (_tmp28_, _tmp29_); -#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp25_ = _tmp30_; -#line 1634 "Thumbnail.c" + _tmp22_ = thumbnail_photo_id_ascending_comparator (a, b); +#line 1618 "Thumbnail.c" } #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp25_; + result = _tmp22_; #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_free0 (path_b); #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_free0 (path_a); #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1644 "Thumbnail.c" +#line 1628 "Thumbnail.c" } -gint64 thumbnail_filename_descending_comparator (void* a, void* b) { +gint64 +thumbnail_filename_descending_comparator (void* a, + void* b) +{ gint64 result = 0LL; gint64 _result_ = 0LL; - void* _tmp0_; - void* _tmp1_; - gint64 _tmp2_; - gint64 _tmp3_ = 0LL; - gint64 _tmp4_; + gint64 _tmp0_ = 0LL; + gint64 _tmp1_; #line 203 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = b; -#line 203 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = a; -#line 203 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = thumbnail_filename_ascending_comparator (_tmp0_, _tmp1_); -#line 203 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _result_ = _tmp2_; + _result_ = thumbnail_filename_ascending_comparator (b, a); #line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = _result_; + _tmp1_ = _result_; #line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp4_ != ((gint64) 0)) { -#line 1668 "Thumbnail.c" - gint64 _tmp5_; + if (_tmp1_ != ((gint64) 0)) { +#line 1646 "Thumbnail.c" + gint64 _tmp2_; #line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = _result_; + _tmp2_ = _result_; #line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp5_; -#line 1674 "Thumbnail.c" + _tmp0_ = _tmp2_; +#line 1652 "Thumbnail.c" } else { - void* _tmp6_; - void* _tmp7_; - gint64 _tmp8_; -#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = a; #line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = b; -#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = thumbnail_photo_id_descending_comparator (_tmp6_, _tmp7_); -#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp8_; -#line 1687 "Thumbnail.c" + _tmp0_ = thumbnail_photo_id_descending_comparator (a, b); +#line 1656 "Thumbnail.c" } #line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp3_; + result = _tmp0_; #line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1693 "Thumbnail.c" +#line 1662 "Thumbnail.c" } -gint64 thumbnail_rating_ascending_comparator (void* a, void* b) { +gint64 +thumbnail_rating_ascending_comparator (void* a, + void* b) +{ gint64 result = 0LL; gint64 _result_ = 0LL; - void* _tmp0_; + MediaSource* _tmp0_; MediaSource* _tmp1_; - Rating _tmp2_; - void* _tmp3_; - MediaSource* _tmp4_; - Rating _tmp5_; - gint64 _tmp6_ = 0LL; - gint64 _tmp7_; -#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = a; -#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp0_, TYPE_THUMBNAIL, Thumbnail)->priv->media; -#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = media_source_get_rating (_tmp1_); + gint64 _tmp2_ = 0LL; + gint64 _tmp3_; #line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = b; + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) a, TYPE_THUMBNAIL, Thumbnail)->priv->media; #line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp3_, TYPE_THUMBNAIL, Thumbnail)->priv->media; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) b, TYPE_THUMBNAIL, Thumbnail)->priv->media; #line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = media_source_get_rating (_tmp4_); -#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _result_ = (gint64) (_tmp2_ - _tmp5_); + _result_ = (gint64) (media_source_get_rating (_tmp0_) - media_source_get_rating (_tmp1_)); #line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = _result_; + _tmp3_ = _result_; #line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp7_ != ((gint64) 0)) { -#line 1726 "Thumbnail.c" - gint64 _tmp8_; + if (_tmp3_ != ((gint64) 0)) { +#line 1686 "Thumbnail.c" + gint64 _tmp4_; #line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = _result_; + _tmp4_ = _result_; #line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = _tmp8_; -#line 1732 "Thumbnail.c" + _tmp2_ = _tmp4_; +#line 1692 "Thumbnail.c" } else { - void* _tmp9_; - void* _tmp10_; - gint64 _tmp11_; -#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = a; -#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp10_ = b; #line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp11_ = thumbnail_photo_id_ascending_comparator (_tmp9_, _tmp10_); -#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = _tmp11_; -#line 1745 "Thumbnail.c" + _tmp2_ = thumbnail_photo_id_ascending_comparator (a, b); +#line 1696 "Thumbnail.c" } #line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp6_; + result = _tmp2_; #line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1751 "Thumbnail.c" +#line 1702 "Thumbnail.c" } -gint64 thumbnail_rating_descending_comparator (void* a, void* b) { +gint64 +thumbnail_rating_descending_comparator (void* a, + void* b) +{ gint64 result = 0LL; gint64 _result_ = 0LL; - void* _tmp0_; - void* _tmp1_; - gint64 _tmp2_; - gint64 _tmp3_ = 0LL; - gint64 _tmp4_; + gint64 _tmp0_ = 0LL; + gint64 _tmp1_; #line 215 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = b; -#line 215 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = a; -#line 215 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = thumbnail_rating_ascending_comparator (_tmp0_, _tmp1_); -#line 215 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _result_ = _tmp2_; + _result_ = thumbnail_rating_ascending_comparator (b, a); #line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = _result_; + _tmp1_ = _result_; #line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp4_ != ((gint64) 0)) { -#line 1775 "Thumbnail.c" - gint64 _tmp5_; + if (_tmp1_ != ((gint64) 0)) { +#line 1720 "Thumbnail.c" + gint64 _tmp2_; #line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = _result_; + _tmp2_ = _result_; #line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp5_; -#line 1781 "Thumbnail.c" + _tmp0_ = _tmp2_; +#line 1726 "Thumbnail.c" } else { - void* _tmp6_; - void* _tmp7_; - gint64 _tmp8_; #line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = a; -#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = b; -#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = thumbnail_photo_id_descending_comparator (_tmp6_, _tmp7_); -#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp8_; -#line 1794 "Thumbnail.c" + _tmp0_ = thumbnail_photo_id_descending_comparator (a, b); +#line 1730 "Thumbnail.c" } #line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp3_; + result = _tmp0_; #line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1800 "Thumbnail.c" +#line 1736 "Thumbnail.c" } -gboolean thumbnail_rating_comparator_predicate (DataObject* object, Alteration* alteration) { +gboolean +thumbnail_rating_comparator_predicate (DataObject* object, + Alteration* alteration) +{ gboolean result = FALSE; - Alteration* _tmp0_; - gboolean _tmp1_; #line 220 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 220 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 221 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = alteration; -#line 221 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "rating"); -#line 221 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp1_; + result = alteration_has_detail (alteration, "metadata", "rating"); #line 221 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1820 "Thumbnail.c" +#line 1753 "Thumbnail.c" } -static void thumbnail_real_thumbnail_altered (ThumbnailView* base) { +static void +thumbnail_real_thumbnail_altered (ThumbnailView* base) +{ Thumbnail * self; MediaSource* _tmp0_; Dimensions _tmp1_ = {0}; @@ -1847,26 +1782,28 @@ static void thumbnail_real_thumbnail_altered (ThumbnailView* base) { if (_tmp4_) { #line 229 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_delayed_high_quality_fetch (self); -#line 1851 "Thumbnail.c" +#line 1786 "Thumbnail.c" } else { #line 231 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_paint_empty (self); -#line 1855 "Thumbnail.c" +#line 1790 "Thumbnail.c" } #line 233 "/home/jens/Source/shotwell/src/Thumbnail.vala" THUMBNAIL_VIEW_CLASS (thumbnail_parent_class)->thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TYPE_THUMBNAIL_VIEW, ThumbnailView)); -#line 1859 "Thumbnail.c" +#line 1794 "Thumbnail.c" } -static void thumbnail_real_notify_collection_property_set (DataObject* base, const gchar* name, GValue* old, GValue* val) { +static void +thumbnail_real_notify_collection_property_set (DataObject* base, + const gchar* name, + GValue* old, + GValue* val) +{ Thumbnail * self; const gchar* _tmp0_; - const gchar* _tmp1_; - GQuark _tmp3_ = 0U; - const gchar* _tmp5_; - GValue* _tmp6_; - GValue _tmp7_; + GQuark _tmp2_ = 0U; + GValue _tmp4_; #line 236 "/home/jens/Source/shotwell/src/Thumbnail.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail); #line 236 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -1876,188 +1813,172 @@ static void thumbnail_real_notify_collection_property_set (DataObject* base, con #line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = name; #line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = _tmp0_; -#line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_); + _tmp2_ = (NULL == _tmp0_) ? 0 : g_quark_from_string (_tmp0_); #line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp3_ == g_quark_from_string (THUMBNAIL_PROP_SIZE)) { + if (_tmp2_ == g_quark_from_string (THUMBNAIL_PROP_SIZE)) { #line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala" switch (0) { -#line 1887 "Thumbnail.c" +#line 1822 "Thumbnail.c" default: { - GValue _tmp4_; + GValue _tmp3_; #line 239 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = *val; + _tmp3_ = *val; #line 239 "/home/jens/Source/shotwell/src/Thumbnail.vala" - thumbnail_resize (self, g_value_get_int (&_tmp4_)); + thumbnail_resize (self, g_value_get_int (&_tmp3_)); #line 240 "/home/jens/Source/shotwell/src/Thumbnail.vala" break; -#line 1897 "Thumbnail.c" +#line 1832 "Thumbnail.c" } } - } else if (_tmp3_ == g_quark_from_string (THUMBNAIL_PROP_SHOW_RATINGS)) { + } else if (_tmp2_ == g_quark_from_string (THUMBNAIL_PROP_SHOW_RATINGS)) { #line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala" switch (0) { -#line 1903 "Thumbnail.c" +#line 1838 "Thumbnail.c" default: { #line 243 "/home/jens/Source/shotwell/src/Thumbnail.vala" data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); #line 244 "/home/jens/Source/shotwell/src/Thumbnail.vala" break; -#line 1910 "Thumbnail.c" +#line 1845 "Thumbnail.c" } } } #line 247 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = name; -#line 247 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = old; -#line 247 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = *val; + _tmp4_ = *val; #line 247 "/home/jens/Source/shotwell/src/Thumbnail.vala" - DATA_OBJECT_CLASS (thumbnail_parent_class)->notify_collection_property_set (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TYPE_DATA_OBJECT, DataObject), _tmp5_, _tmp6_, &_tmp7_); -#line 1922 "Thumbnail.c" + DATA_OBJECT_CLASS (thumbnail_parent_class)->notify_collection_property_set (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TYPE_DATA_OBJECT, DataObject), name, old, &_tmp4_); +#line 1853 "Thumbnail.c" } -static void thumbnail_resize (Thumbnail* self, gint new_scale) { +static void +thumbnail_resize (Thumbnail* self, + gint new_scale) +{ gint _tmp0_; gint _tmp1_; gint _tmp2_; gint _tmp3_; gint _tmp4_; gint _tmp5_; - gint _tmp6_; - gint _tmp7_; - gint _tmp8_; - gint _tmp9_; - Dimensions _tmp10_ = {0}; - gboolean _tmp11_; + Dimensions _tmp6_ = {0}; + gboolean _tmp7_; #line 250 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); #line 251 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = new_scale; -#line 251 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = thumbnail_get_MIN_SCALE (); + _tmp0_ = thumbnail_get_MIN_SCALE (); #line 251 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 251 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _vala_assert (_tmp0_ >= _tmp2_, "new_scale >= MIN_SCALE"); -#line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = new_scale; + _vala_assert (new_scale >= _tmp1_, "new_scale >= MIN_SCALE"); #line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = thumbnail_get_MAX_SCALE (); + _tmp2_ = thumbnail_get_MAX_SCALE (); #line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _vala_assert (_tmp3_ <= _tmp5_, "new_scale <= MAX_SCALE"); + _vala_assert (new_scale <= _tmp3_, "new_scale <= MAX_SCALE"); #line 254 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = self->priv->scale; + _tmp4_ = self->priv->scale; #line 254 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = new_scale; -#line 254 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp6_ == _tmp7_) { + if (_tmp4_ == new_scale) { #line 255 "/home/jens/Source/shotwell/src/Thumbnail.vala" return; -#line 1965 "Thumbnail.c" +#line 1889 "Thumbnail.c" } #line 257 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = new_scale; -#line 257 "/home/jens/Source/shotwell/src/Thumbnail.vala" - self->priv->scale = _tmp8_; + self->priv->scale = new_scale; #line 258 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = self->priv->scale; + _tmp5_ = self->priv->scale; #line 258 "/home/jens/Source/shotwell/src/Thumbnail.vala" - dimensions_get_scaled (&self->priv->original_dim, _tmp9_, TRUE, &_tmp10_); + dimensions_get_scaled (&self->priv->original_dim, _tmp5_, TRUE, &_tmp6_); #line 258 "/home/jens/Source/shotwell/src/Thumbnail.vala" - self->priv->dim = _tmp10_; + self->priv->dim = _tmp6_; #line 260 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_cancel_async_fetch (self); #line 262 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp11_ = self->priv->exposure; + _tmp7_ = self->priv->exposure; #line 262 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp11_) { -#line 1983 "Thumbnail.c" + if (_tmp7_) { +#line 1905 "Thumbnail.c" GdkPixbuf* resizable = NULL; + GdkPixbuf* _tmp8_; GdkPixbuf* _tmp12_; - GdkPixbuf* _tmp17_; #line 267 "/home/jens/Source/shotwell/src/Thumbnail.vala" resizable = NULL; #line 268 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp12_ = self->priv->unscaled_pixbuf; + _tmp8_ = self->priv->unscaled_pixbuf; #line 268 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp12_ != NULL) { -#line 1993 "Thumbnail.c" - GdkPixbuf* _tmp13_; - GdkPixbuf* _tmp14_; + if (_tmp8_ != NULL) { +#line 1915 "Thumbnail.c" + GdkPixbuf* _tmp9_; + GdkPixbuf* _tmp10_; #line 269 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp13_ = self->priv->unscaled_pixbuf; + _tmp9_ = self->priv->unscaled_pixbuf; #line 269 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp14_ = _g_object_ref0 (_tmp13_); + _tmp10_ = _g_object_ref0 (_tmp9_); #line 269 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (resizable); #line 269 "/home/jens/Source/shotwell/src/Thumbnail.vala" - resizable = _tmp14_; -#line 2004 "Thumbnail.c" + resizable = _tmp10_; +#line 1926 "Thumbnail.c" } else { - gboolean _tmp15_; -#line 270 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp15_ = checkerboard_item_has_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); #line 270 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp15_) { -#line 2011 "Thumbnail.c" - GdkPixbuf* _tmp16_; + if (checkerboard_item_has_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem))) { +#line 1930 "Thumbnail.c" + GdkPixbuf* _tmp11_; #line 271 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp16_ = checkerboard_item_get_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); + _tmp11_ = checkerboard_item_get_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); #line 271 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (resizable); #line 271 "/home/jens/Source/shotwell/src/Thumbnail.vala" - resizable = _tmp16_; -#line 2019 "Thumbnail.c" + resizable = _tmp11_; +#line 1938 "Thumbnail.c" } } #line 273 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp17_ = resizable; + _tmp12_ = resizable; #line 273 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp17_ != NULL) { -#line 2026 "Thumbnail.c" - GdkPixbuf* _tmp18_; - Dimensions _tmp19_; - GdkPixbuf* _tmp20_; - GdkPixbuf* _tmp21_; + if (_tmp12_ != NULL) { +#line 1945 "Thumbnail.c" + GdkPixbuf* _tmp13_; + Dimensions _tmp14_; + GdkPixbuf* _tmp15_; + GdkPixbuf* _tmp16_; #line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp18_ = resizable; + _tmp13_ = resizable; #line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp19_ = self->priv->dim; + _tmp14_ = self->priv->dim; #line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp20_ = resize_pixbuf (_tmp18_, &_tmp19_, THUMBNAIL_LOW_QUALITY_INTERP); + _tmp15_ = resize_pixbuf (_tmp13_, &_tmp14_, THUMBNAIL_LOW_QUALITY_INTERP); #line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp21_ = _tmp20_; + _tmp16_ = _tmp15_; #line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" - checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp21_); + checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp16_); #line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_object_unref0 (_tmp21_); -#line 2043 "Thumbnail.c" + _g_object_unref0 (_tmp16_); +#line 1962 "Thumbnail.c" } #line 276 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_delayed_high_quality_fetch (self); #line 262 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (resizable); -#line 2049 "Thumbnail.c" +#line 1968 "Thumbnail.c" } else { - Dimensions _tmp22_; + Dimensions _tmp17_; #line 278 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp22_ = self->priv->dim; + _tmp17_ = self->priv->dim; #line 278 "/home/jens/Source/shotwell/src/Thumbnail.vala" - checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp22_); -#line 2056 "Thumbnail.c" + checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp17_); +#line 1975 "Thumbnail.c" } } -static void thumbnail_paint_empty (Thumbnail* self) { +static void +thumbnail_paint_empty (Thumbnail* self) +{ Dimensions _tmp0_; #line 282 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); @@ -2071,18 +1992,27 @@ static void thumbnail_paint_empty (Thumbnail* self) { _g_object_unref0 (self->priv->unscaled_pixbuf); #line 285 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->unscaled_pixbuf = NULL; -#line 2075 "Thumbnail.c" +#line 1996 "Thumbnail.c" } -static void _thumbnail_on_low_quality_fetched_thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self) { +static void +_thumbnail_on_low_quality_fetched_thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, + GdkPixbuf* unscaled, + Dimensions* dim, + GdkInterpType interp, + GError* err, + gpointer self) +{ #line 292 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_on_low_quality_fetched ((Thumbnail*) self, pixbuf, unscaled, dim, interp, err); -#line 2082 "Thumbnail.c" +#line 2010 "Thumbnail.c" } -static void thumbnail_schedule_low_quality_fetch (Thumbnail* self) { +static void +thumbnail_schedule_low_quality_fetch (Thumbnail* self) +{ GCancellable* _tmp0_; MediaSource* _tmp1_; Dimensions _tmp2_; @@ -2105,20 +2035,24 @@ static void thumbnail_schedule_low_quality_fetch (Thumbnail* self) { _tmp3_ = self->priv->cancellable; #line 292 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_cache_fetch_async_scaled (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), (gint) THUMBNAIL_CACHE_SIZE_SMALLEST, &_tmp2_, THUMBNAIL_LOW_QUALITY_INTERP, _thumbnail_on_low_quality_fetched_thumbnail_cache_async_fetch_callback, self, _tmp3_); -#line 2109 "Thumbnail.c" +#line 2039 "Thumbnail.c" } -static gboolean _thumbnail_on_schedule_high_quality_gsource_func (gpointer self) { +static gboolean +_thumbnail_on_schedule_high_quality_gsource_func (gpointer self) +{ gboolean result; result = thumbnail_on_schedule_high_quality ((Thumbnail*) self); #line 303 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2118 "Thumbnail.c" +#line 2050 "Thumbnail.c" } -static void thumbnail_delayed_high_quality_fetch (Thumbnail* self) { +static void +thumbnail_delayed_high_quality_fetch (Thumbnail* self) +{ gboolean _tmp0_; #line 296 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); @@ -2130,24 +2064,33 @@ static void thumbnail_delayed_high_quality_fetch (Thumbnail* self) { self->priv->hq_reschedule = TRUE; #line 300 "/home/jens/Source/shotwell/src/Thumbnail.vala" return; -#line 2134 "Thumbnail.c" +#line 2068 "Thumbnail.c" } #line 303 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) THUMBNAIL_HQ_IMPROVEMENT_MSEC, _thumbnail_on_schedule_high_quality_gsource_func, g_object_ref (self), g_object_unref); #line 304 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->hq_scheduled = TRUE; -#line 2140 "Thumbnail.c" +#line 2074 "Thumbnail.c" } -static void _thumbnail_on_high_quality_fetched_thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self) { +static void +_thumbnail_on_high_quality_fetched_thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, + GdkPixbuf* unscaled, + Dimensions* dim, + GdkInterpType interp, + GError* err, + gpointer self) +{ #line 318 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_on_high_quality_fetched ((Thumbnail*) self, pixbuf, unscaled, dim, interp, err); -#line 2147 "Thumbnail.c" +#line 2088 "Thumbnail.c" } -static gboolean thumbnail_on_schedule_high_quality (Thumbnail* self) { +static gboolean +thumbnail_on_schedule_high_quality (Thumbnail* self) +{ gboolean result = FALSE; gboolean _tmp0_; GCancellable* _tmp1_; @@ -2164,7 +2107,7 @@ static gboolean thumbnail_on_schedule_high_quality (Thumbnail* self) { result = TRUE; #line 311 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2168 "Thumbnail.c" +#line 2111 "Thumbnail.c" } #line 314 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_cancel_async_fetch (self); @@ -2178,7 +2121,7 @@ static gboolean thumbnail_on_schedule_high_quality (Thumbnail* self) { _tmp2_ = self->priv->exposure; #line 317 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp2_) { -#line 2182 "Thumbnail.c" +#line 2125 "Thumbnail.c" MediaSource* _tmp3_; gint _tmp4_; Dimensions _tmp5_; @@ -2193,7 +2136,7 @@ static gboolean thumbnail_on_schedule_high_quality (Thumbnail* self) { _tmp6_ = self->priv->cancellable; #line 318 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_cache_fetch_async_scaled (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp4_, &_tmp5_, THUMBNAIL_HIGH_QUALITY_INTERP, _thumbnail_on_high_quality_fetched_thumbnail_cache_async_fetch_callback, self, _tmp6_); -#line 2197 "Thumbnail.c" +#line 2140 "Thumbnail.c" } #line 322 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->hq_scheduled = FALSE; @@ -2201,11 +2144,13 @@ static gboolean thumbnail_on_schedule_high_quality (Thumbnail* self) { result = FALSE; #line 324 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2205 "Thumbnail.c" +#line 2148 "Thumbnail.c" } -static void thumbnail_cancel_async_fetch (Thumbnail* self) { +static void +thumbnail_cancel_async_fetch (Thumbnail* self) +{ GCancellable* _tmp0_; #line 327 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); @@ -2213,21 +2158,25 @@ static void thumbnail_cancel_async_fetch (Thumbnail* self) { _tmp0_ = self->priv->cancellable; #line 329 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp0_ != NULL) { -#line 2217 "Thumbnail.c" +#line 2162 "Thumbnail.c" GCancellable* _tmp1_; #line 330 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = self->priv->cancellable; #line 330 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_cancellable_cancel (_tmp1_); -#line 2223 "Thumbnail.c" +#line 2168 "Thumbnail.c" } } -static void thumbnail_on_low_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err) { - GError* _tmp0_; - GdkPixbuf* _tmp6_; - GdkPixbuf* _tmp8_; +static void +thumbnail_on_low_quality_fetched (Thumbnail* self, + GdkPixbuf* pixbuf, + GdkPixbuf* unscaled, + Dimensions* dim, + GdkInterpType interp, + GError* err) +{ #line 333 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); #line 333 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -2237,71 +2186,59 @@ static void thumbnail_on_low_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf #line 333 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (dim != NULL); #line 335 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = err; -#line 335 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp0_ != NULL) { -#line 2244 "Thumbnail.c" + if (err != NULL) { +#line 2191 "Thumbnail.c" + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - gint _tmp3_; - GError* _tmp4_; - const gchar* _tmp5_; + gint _tmp2_; + const gchar* _tmp3_; #line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = self->priv->scale; + _tmp2_ = self->priv->scale; #line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = err; -#line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = _tmp4_->message; + _tmp3_ = err->message; #line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_critical ("Thumbnail.vala:336: Unable to fetch low-quality thumbnail for %s (scal" \ -"e: %d): %s", _tmp2_, _tmp3_, _tmp5_); +"e: %d): %s", _tmp1_, _tmp2_, _tmp3_); #line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_free0 (_tmp2_); -#line 2264 "Thumbnail.c" + _g_free0 (_tmp1_); +#line 2208 "Thumbnail.c" } #line 339 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = pixbuf; -#line 339 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp6_ != NULL) { -#line 2270 "Thumbnail.c" - GdkPixbuf* _tmp7_; + if (pixbuf != NULL) { #line 340 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = pixbuf; -#line 340 "/home/jens/Source/shotwell/src/Thumbnail.vala" - checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp7_); -#line 2276 "Thumbnail.c" + checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), pixbuf); +#line 2214 "Thumbnail.c" } #line 342 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = unscaled; -#line 342 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp8_ != NULL) { -#line 2282 "Thumbnail.c" - GdkPixbuf* _tmp9_; - GdkPixbuf* _tmp10_; -#line 343 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = unscaled; + if (unscaled != NULL) { +#line 2218 "Thumbnail.c" + GdkPixbuf* _tmp4_; #line 343 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp10_ = _g_object_ref0 (_tmp9_); + _tmp4_ = _g_object_ref0 (unscaled); #line 343 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (self->priv->unscaled_pixbuf); #line 343 "/home/jens/Source/shotwell/src/Thumbnail.vala" - self->priv->unscaled_pixbuf = _tmp10_; -#line 2293 "Thumbnail.c" + self->priv->unscaled_pixbuf = _tmp4_; +#line 2226 "Thumbnail.c" } #line 345 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_delayed_high_quality_fetch (self); -#line 2297 "Thumbnail.c" +#line 2230 "Thumbnail.c" } -static void thumbnail_on_high_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err) { - GError* _tmp0_; - GdkPixbuf* _tmp6_; - GdkPixbuf* _tmp8_; +static void +thumbnail_on_high_quality_fetched (Thumbnail* self, + GdkPixbuf* pixbuf, + GdkPixbuf* unscaled, + Dimensions* dim, + GdkInterpType interp, + GError* err) +{ #line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); #line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -2311,78 +2248,61 @@ static void thumbnail_on_high_quality_fetched (Thumbnail* self, GdkPixbuf* pixbu #line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (dim != NULL); #line 350 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = err; -#line 350 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp0_ != NULL) { -#line 2317 "Thumbnail.c" + if (err != NULL) { +#line 2252 "Thumbnail.c" + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - gint _tmp3_; - GError* _tmp4_; - const gchar* _tmp5_; + gint _tmp2_; + const gchar* _tmp3_; #line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = self->priv->scale; + _tmp2_ = self->priv->scale; #line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = err; -#line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = _tmp4_->message; + _tmp3_ = err->message; #line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_critical ("Thumbnail.vala:351: Unable to fetch high-quality thumbnail for %s (sca" \ -"le: %d): %s", _tmp2_, _tmp3_, _tmp5_); +"le: %d): %s", _tmp1_, _tmp2_, _tmp3_); #line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_free0 (_tmp2_); -#line 2337 "Thumbnail.c" + _g_free0 (_tmp1_); +#line 2269 "Thumbnail.c" } #line 354 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = pixbuf; -#line 354 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp6_ != NULL) { -#line 2343 "Thumbnail.c" - GdkPixbuf* _tmp7_; + if (pixbuf != NULL) { #line 355 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = pixbuf; -#line 355 "/home/jens/Source/shotwell/src/Thumbnail.vala" - checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp7_); -#line 2349 "Thumbnail.c" + checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), pixbuf); +#line 2275 "Thumbnail.c" } #line 357 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = unscaled; -#line 357 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp8_ != NULL) { -#line 2355 "Thumbnail.c" - GdkPixbuf* _tmp9_; - GdkPixbuf* _tmp10_; -#line 358 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = unscaled; + if (unscaled != NULL) { +#line 2279 "Thumbnail.c" + GdkPixbuf* _tmp4_; #line 358 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp10_ = _g_object_ref0 (_tmp9_); + _tmp4_ = _g_object_ref0 (unscaled); #line 358 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (self->priv->unscaled_pixbuf); #line 358 "/home/jens/Source/shotwell/src/Thumbnail.vala" - self->priv->unscaled_pixbuf = _tmp10_; -#line 2366 "Thumbnail.c" + self->priv->unscaled_pixbuf = _tmp4_; +#line 2287 "Thumbnail.c" } } -static void thumbnail_real_exposed (CheckerboardItem* base) { +static void +thumbnail_real_exposed (CheckerboardItem* base) +{ Thumbnail * self; - gboolean _tmp0_; #line 361 "/home/jens/Source/shotwell/src/Thumbnail.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail); #line 362 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->exposure = TRUE; #line 364 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = checkerboard_item_has_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 364 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (!_tmp0_) { + if (!checkerboard_item_has_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem))) { #line 365 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_schedule_low_quality_fetch (self); -#line 2384 "Thumbnail.c" +#line 2304 "Thumbnail.c" } #line 367 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_update_title (self, FALSE); @@ -2392,11 +2312,13 @@ static void thumbnail_real_exposed (CheckerboardItem* base) { thumbnail_update_tags (self, FALSE); #line 371 "/home/jens/Source/shotwell/src/Thumbnail.vala" CHECKERBOARD_ITEM_CLASS (thumbnail_parent_class)->exposed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 2394 "Thumbnail.c" +#line 2314 "Thumbnail.c" } -static void thumbnail_real_unexposed (CheckerboardItem* base) { +static void +thumbnail_real_unexposed (CheckerboardItem* base) +{ Thumbnail * self; #line 374 "/home/jens/Source/shotwell/src/Thumbnail.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail); @@ -2406,11 +2328,14 @@ static void thumbnail_real_unexposed (CheckerboardItem* base) { thumbnail_paint_empty (self); #line 379 "/home/jens/Source/shotwell/src/Thumbnail.vala" CHECKERBOARD_ITEM_CLASS (thumbnail_parent_class)->unexposed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 2408 "Thumbnail.c" +#line 2330 "Thumbnail.c" } -static GdkPixbuf* thumbnail_real_get_top_right_trinket (CheckerboardItem* base, gint scale) { +static GdkPixbuf* +thumbnail_real_get_top_right_trinket (CheckerboardItem* base, + gint scale) +{ Thumbnail * self; GdkPixbuf* result = NULL; Flaggable* flaggable = NULL; @@ -2431,38 +2356,35 @@ static GdkPixbuf* thumbnail_real_get_top_right_trinket (CheckerboardItem* base, _tmp4_ = flaggable; #line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp4_ != NULL) { -#line 2433 "Thumbnail.c" +#line 2358 "Thumbnail.c" Flaggable* _tmp5_; - gboolean _tmp6_; #line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = flaggable; #line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = flaggable_is_flagged (_tmp5_); -#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp6_; -#line 2442 "Thumbnail.c" + _tmp3_ = flaggable_is_flagged (_tmp5_); +#line 2364 "Thumbnail.c" } else { #line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = FALSE; -#line 2446 "Thumbnail.c" +#line 2368 "Thumbnail.c" } #line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp3_) { -#line 2450 "Thumbnail.c" - GdkPixbuf* _tmp7_; +#line 2372 "Thumbnail.c" + GdkPixbuf* _tmp6_; #line 386 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE); + _tmp6_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE); #line 386 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (_tmp2_); #line 386 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = _tmp7_; -#line 2458 "Thumbnail.c" + _tmp2_ = _tmp6_; +#line 2380 "Thumbnail.c" } else { #line 386 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (_tmp2_); #line 386 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = NULL; -#line 2464 "Thumbnail.c" +#line 2386 "Thumbnail.c" } #line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = _tmp2_; @@ -2470,139 +2392,140 @@ static GdkPixbuf* thumbnail_real_get_top_right_trinket (CheckerboardItem* base, _g_object_unref0 (flaggable); #line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2472 "Thumbnail.c" +#line 2394 "Thumbnail.c" } -static void _vala_GValue_free (GValue* self) { +static void +_vala_GValue_free (GValue* self) +{ #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_value_unset (self); #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_free (self); -#line 2481 "Thumbnail.c" +#line 2405 "Thumbnail.c" } -static GdkPixbuf* thumbnail_real_get_bottom_left_trinket (CheckerboardItem* base, gint scale) { +static GdkPixbuf* +thumbnail_real_get_bottom_left_trinket (CheckerboardItem* base, + gint scale) +{ Thumbnail * self; GdkPixbuf* result = NULL; Rating rating = 0; MediaSource* _tmp0_; - Rating _tmp1_; gboolean show_ratings = FALSE; - GValue* _tmp2_ = NULL; - GValue _tmp3_ = {0}; - gboolean _tmp4_; - GdkPixbuf* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - Rating _tmp7_; + GValue* _tmp1_ = NULL; + GValue _tmp2_ = {0}; + gboolean _tmp3_; + GdkPixbuf* _tmp4_ = NULL; + gboolean _tmp5_ = FALSE; + Rating _tmp6_; #line 389 "/home/jens/Source/shotwell/src/Thumbnail.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail); #line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = self->priv->media; #line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = media_source_get_rating (_tmp0_); -#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala" - rating = _tmp1_; + rating = media_source_get_rating (_tmp0_); #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = g_new0 (GValue, 1); + _tmp1_ = g_new0 (GValue, 1); #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" - g_value_init (_tmp2_, G_TYPE_BOOLEAN); + g_value_init (_tmp1_, G_TYPE_BOOLEAN); #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" - g_value_set_boolean (_tmp2_, FALSE); + g_value_set_boolean (_tmp1_, FALSE); #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" - data_object_get_collection_property (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), THUMBNAIL_PROP_SHOW_RATINGS, _tmp2_, &_tmp3_); + data_object_get_collection_property (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), THUMBNAIL_PROP_SHOW_RATINGS, _tmp1_, &_tmp2_); #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = g_value_get_boolean (&_tmp3_); + _tmp3_ = g_value_get_boolean (&_tmp2_); #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" - __vala_GValue_free0 (_tmp2_); + __vala_GValue_free0 (_tmp1_); #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" - show_ratings = _tmp4_; + show_ratings = _tmp3_; #line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = rating; + _tmp6_ = rating; #line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp7_ != RATING_UNRATED) { -#line 2524 "Thumbnail.c" - gboolean _tmp8_; + if (_tmp6_ != RATING_UNRATED) { +#line 2448 "Thumbnail.c" + gboolean _tmp7_; #line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = show_ratings; + _tmp7_ = show_ratings; #line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = _tmp8_; -#line 2530 "Thumbnail.c" + _tmp5_ = _tmp7_; +#line 2454 "Thumbnail.c" } else { #line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = FALSE; -#line 2534 "Thumbnail.c" + _tmp5_ = FALSE; +#line 2458 "Thumbnail.c" } #line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp6_) { -#line 2538 "Thumbnail.c" - Rating _tmp9_; - gint _tmp10_; - GdkPixbuf* _tmp11_; -#line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = rating; + if (_tmp5_) { +#line 2462 "Thumbnail.c" + Rating _tmp8_; + GdkPixbuf* _tmp9_; #line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp10_ = scale; + _tmp8_ = rating; #line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp11_ = resources_get_rating_trinket (_tmp9_, _tmp10_); + _tmp9_ = resources_get_rating_trinket (_tmp8_, scale); #line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = _tmp11_; -#line 2552 "Thumbnail.c" + _tmp4_ = _tmp9_; +#line 2473 "Thumbnail.c" } else { #line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = NULL; -#line 2558 "Thumbnail.c" + _tmp4_ = NULL; +#line 2479 "Thumbnail.c" } #line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp5_; + result = _tmp4_; #line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2564 "Thumbnail.c" +#line 2485 "Thumbnail.c" } -gint thumbnail_get_MIN_SCALE (void) { +gint +thumbnail_get_MIN_SCALE (void) +{ gint result; #line 18 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = 72; #line 18 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2574 "Thumbnail.c" +#line 2497 "Thumbnail.c" } -gint thumbnail_get_MAX_SCALE (void) { +gint +thumbnail_get_MAX_SCALE (void) +{ gint result; - gint _tmp0_; #line 23 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_LARGEST); -#line 23 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp0_; + result = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_LARGEST); #line 23 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2587 "Thumbnail.c" +#line 2509 "Thumbnail.c" } -gint thumbnail_get_DEFAULT_SCALE (void) { +gint +thumbnail_get_DEFAULT_SCALE (void) +{ gint result; - gint _tmp0_; #line 28 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_MEDIUM); -#line 28 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp0_; + result = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_MEDIUM); #line 28 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2600 "Thumbnail.c" +#line 2521 "Thumbnail.c" } -static void thumbnail_class_init (ThumbnailClass * klass) { +static void +thumbnail_class_init (ThumbnailClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -2625,11 +2548,13 @@ static void thumbnail_class_init (ThumbnailClass * klass) { G_OBJECT_CLASS (klass)->get_property = _vala_thumbnail_get_property; #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala" G_OBJECT_CLASS (klass)->finalize = thumbnail_finalize; -#line 2627 "Thumbnail.c" +#line 2550 "Thumbnail.c" } -static void thumbnail_instance_init (Thumbnail * self) { +static void +thumbnail_instance_init (Thumbnail * self) +{ #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv = THUMBNAIL_GET_PRIVATE (self); #line 41 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -2642,11 +2567,13 @@ static void thumbnail_instance_init (Thumbnail * self) { self->priv->hq_reschedule = FALSE; #line 47 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->exposure = FALSE; -#line 2644 "Thumbnail.c" +#line 2569 "Thumbnail.c" } -static void thumbnail_finalize (GObject * obj) { +static void +thumbnail_finalize (GObject * obj) +{ Thumbnail * self; GCancellable* _tmp0_; TagSourceCollection* _tmp2_; @@ -2659,13 +2586,13 @@ static void thumbnail_finalize (GObject * obj) { _tmp0_ = self->priv->cancellable; #line 73 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp0_ != NULL) { -#line 2661 "Thumbnail.c" +#line 2588 "Thumbnail.c" GCancellable* _tmp1_; #line 74 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = self->priv->cancellable; #line 74 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_cancellable_cancel (_tmp1_); -#line 2667 "Thumbnail.c" +#line 2594 "Thumbnail.c" } #line 76 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = tag_global; @@ -2687,11 +2614,13 @@ static void thumbnail_finalize (GObject * obj) { _g_object_unref0 (self->priv->cancellable); #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala" G_OBJECT_CLASS (thumbnail_parent_class)->finalize (obj); -#line 2689 "Thumbnail.c" +#line 2616 "Thumbnail.c" } -GType thumbnail_get_type (void) { +GType +thumbnail_get_type (void) +{ static volatile gsize thumbnail_type_id__volatile = 0; if (g_once_init_enter (&thumbnail_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ThumbnailClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) thumbnail_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Thumbnail), 0, (GInstanceInitFunc) thumbnail_instance_init, NULL }; @@ -2703,18 +2632,23 @@ GType thumbnail_get_type (void) { } -static void _vala_thumbnail_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_thumbnail_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ Thumbnail * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_THUMBNAIL, Thumbnail); #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala" switch (property_id) { -#line 2710 "Thumbnail.c" +#line 2644 "Thumbnail.c" default: #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala" break; -#line 2716 "Thumbnail.c" +#line 2650 "Thumbnail.c" } } diff --git a/src/ThumbnailCache.c b/src/ThumbnailCache.c index 1d4933c..8b17e03 100644 --- a/src/ThumbnailCache.c +++ b/src/ThumbnailCache.c @@ -1,4 +1,4 @@ -/* ThumbnailCache.c generated by valac 0.36.6, the Vala compiler +/* ThumbnailCache.c generated by valac 0.40.4, the Vala compiler * generated from ThumbnailCache.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -54,6 +55,11 @@ typedef struct _ThumbnailCachePrivate ThumbnailCachePrivate; typedef struct _ThumbnailCacheImageData ThumbnailCacheImageData; typedef struct _ThumbnailCacheImageDataClass ThumbnailCacheImageDataClass; +enum { + THUMBNAIL_CACHE_0_PROPERTY, + THUMBNAIL_CACHE_NUM_PROPERTIES +}; +static GParamSpec* thumbnail_cache_properties[THUMBNAIL_CACHE_NUM_PROPERTIES]; #define TYPE_SCALING (scaling_get_type ()) @@ -457,35 +463,45 @@ static gpointer thumbnail_cache_async_fetch_job_parent_class = NULL; gpointer thumbnails_ref (gpointer instance); void thumbnails_unref (gpointer instance); -GParamSpec* param_spec_thumbnails (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_thumbnails (GValue* value, gpointer v_object); -void value_take_thumbnails (GValue* value, gpointer v_object); +GParamSpec* param_spec_thumbnails (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_thumbnails (GValue* value, + gpointer v_object); +void value_take_thumbnails (GValue* value, + gpointer v_object); gpointer value_get_thumbnails (const GValue* value); GType thumbnails_get_type (void) G_GNUC_CONST; GType thumbnail_cache_size_get_type (void) G_GNUC_CONST; #define THUMBNAILS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_THUMBNAILS, ThumbnailsPrivate)) -enum { - THUMBNAILS_DUMMY_PROPERTY -}; Thumbnails* thumbnails_new (void); Thumbnails* thumbnails_construct (GType object_type); -void thumbnails_set (Thumbnails* self, ThumbnailCacheSize size, GdkPixbuf* pixbuf); -void thumbnails_remove (Thumbnails* self, ThumbnailCacheSize size); -GdkPixbuf* thumbnails_get (Thumbnails* self, ThumbnailCacheSize size); +void thumbnails_set (Thumbnails* self, + ThumbnailCacheSize size, + GdkPixbuf* pixbuf); +void thumbnails_remove (Thumbnails* self, + ThumbnailCacheSize size); +GdkPixbuf* thumbnails_get (Thumbnails* self, + ThumbnailCacheSize size); static void thumbnails_finalize (Thumbnails * obj); GType thumbnail_cache_get_type (void) G_GNUC_CONST; GType jpeg_quality_get_type (void) G_GNUC_CONST; static gpointer thumbnail_cache_image_data_ref (gpointer instance); static void thumbnail_cache_image_data_unref (gpointer instance); -static GParamSpec* thumbnail_cache_param_spec_image_data (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; -static void thumbnail_cache_value_set_image_data (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void thumbnail_cache_value_take_image_data (GValue* value, gpointer v_object) G_GNUC_UNUSED; +static GParamSpec* thumbnail_cache_param_spec_image_data (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) G_GNUC_UNUSED; +static void thumbnail_cache_value_set_image_data (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void thumbnail_cache_value_take_image_data (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer thumbnail_cache_value_get_image_data (const GValue* value) G_GNUC_UNUSED; static GType thumbnail_cache_image_data_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define THUMBNAIL_CACHE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_THUMBNAIL_CACHE, ThumbnailCachePrivate)) -enum { - THUMBNAIL_CACHE_DUMMY_PROPERTY -}; gint thumbnail_cache_size_get_scale (ThumbnailCacheSize self); GType scaling_get_type (void) G_GNUC_CONST; GType scale_constraint_get_type (void) G_GNUC_CONST; @@ -494,21 +510,36 @@ Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); Scaling* scaling_dup (const Scaling* self); void scaling_free (Scaling* self); -void thumbnail_cache_size_get_scaling (ThumbnailCacheSize self, Scaling* result); -void scaling_for_best_fit (gint pixels, gboolean scale_up, Scaling* result); +void thumbnail_cache_size_get_scaling (ThumbnailCacheSize self, + Scaling* result); +void scaling_for_best_fit (gint pixels, + gboolean scale_up, + Scaling* result); ThumbnailCacheSize thumbnail_cache_size_get_best_size (gint scale); gpointer workers_ref (gpointer instance); void workers_unref (gpointer instance); -GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_workers (GValue* value, gpointer v_object); -void value_take_workers (GValue* value, gpointer v_object); +GParamSpec* param_spec_workers (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_workers (GValue* value, + gpointer v_object); +void value_take_workers (GValue* value, + gpointer v_object); gpointer value_get_workers (const GValue* value); GType workers_get_type (void) G_GNUC_CONST; gpointer one_shot_scheduler_ref (gpointer instance); void one_shot_scheduler_unref (gpointer instance); -GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_one_shot_scheduler (GValue* value, gpointer v_object); -void value_take_one_shot_scheduler (GValue* value, gpointer v_object); +GParamSpec* param_spec_one_shot_scheduler (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_one_shot_scheduler (GValue* value, + gpointer v_object); +void value_take_one_shot_scheduler (GValue* value, + gpointer v_object); gpointer value_get_one_shot_scheduler (const GValue* value); GType one_shot_scheduler_get_type (void) G_GNUC_CONST; #define THUMBNAIL_CACHE_DEFAULT_INTERP GDK_INTERP_HYPER @@ -516,154 +547,315 @@ GType one_shot_scheduler_get_type (void) G_GNUC_CONST; #define THUMBNAIL_CACHE_MAX_INMEMORY_DATA_SIZE (512 * 1024) #define THUMBNAIL_CACHE_MAX_BIG_CACHED_BYTES ((gulong) ((40 * 1024) * 1024)) #define THUMBNAIL_CACHE_MAX_MEDIUM_CACHED_BYTES ((gulong) ((30 * 1024) * 1024)) -static ThumbnailCache* thumbnail_cache_new (ThumbnailCacheSize size, gulong max_cached_bytes, GdkInterpType interp, JpegQuality quality); -static ThumbnailCache* thumbnail_cache_construct (GType object_type, ThumbnailCacheSize size, gulong max_cached_bytes, GdkInterpType interp, JpegQuality quality); -GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname); +static ThumbnailCache* thumbnail_cache_new (ThumbnailCacheSize size, + gulong max_cached_bytes, + GdkInterpType interp, + JpegQuality quality); +static ThumbnailCache* thumbnail_cache_construct (GType object_type, + ThumbnailCacheSize size, + gulong max_cached_bytes, + GdkInterpType interp, + JpegQuality quality); +GFile* app_dirs_get_cache_subdir (const gchar* name, + const gchar* subname); void thumbnail_cache_init (void); static void thumbnail_cache_report_cycle (void); static void _thumbnail_cache_report_cycle_one_shot_callback (gpointer self); -OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target); -OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target); -guint workers_threads_per_cpu (gint per, gint max); -Workers* workers_new (guint max_threads, gboolean exclusive); -Workers* workers_construct (GType object_type, guint max_threads, gboolean exclusive); +OneShotScheduler* one_shot_scheduler_new (const gchar* name, + OneShotCallback callback, + void* callback_target); +OneShotScheduler* one_shot_scheduler_construct (GType object_type, + const gchar* name, + OneShotCallback callback, + void* callback_target); +guint workers_threads_per_cpu (gint per, + gint max); +Workers* workers_new (guint max_threads, + gboolean exclusive); +Workers* workers_construct (GType object_type, + guint max_threads, + gboolean exclusive); void thumbnail_cache_terminate (void); GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; -void thumbnail_cache_import_from_source (ThumbnailSource* source, gboolean force, GError** error); +void thumbnail_cache_import_from_source (ThumbnailSource* source, + gboolean force, + GError** error); gchar* data_object_to_string (DataObject* self); -static void _thumbnail_cache_import_from_source (ThumbnailCache* self, ThumbnailSource* source, gboolean force, GError** error); -void thumbnail_cache_import_thumbnails (ThumbnailSource* source, Thumbnails* thumbnails, gboolean force, GError** error); -static void _thumbnail_cache_import_thumbnail (ThumbnailCache* self, ThumbnailSource* source, GdkPixbuf* scaled, gboolean force, GError** error); -void thumbnail_cache_duplicate (ThumbnailSource* src_source, ThumbnailSource* dest_source); -static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* src_source, ThumbnailSource* dest_source); +static void _thumbnail_cache_import_from_source (ThumbnailCache* self, + ThumbnailSource* source, + gboolean force, + GError** error); +void thumbnail_cache_import_thumbnails (ThumbnailSource* source, + Thumbnails* thumbnails, + gboolean force, + GError** error); +static void _thumbnail_cache_import_thumbnail (ThumbnailCache* self, + ThumbnailSource* source, + GdkPixbuf* scaled, + gboolean force, + GError** error); +void thumbnail_cache_duplicate (ThumbnailSource* src_source, + ThumbnailSource* dest_source); +static void _thumbnail_cache_duplicate (ThumbnailCache* self, + ThumbnailSource* src_source, + ThumbnailSource* dest_source); void thumbnail_cache_remove (ThumbnailSource* source); -static void _thumbnail_cache_remove (ThumbnailCache* self, ThumbnailSource* source); +static void _thumbnail_cache_remove (ThumbnailCache* self, + ThumbnailSource* source); static ThumbnailCache* thumbnail_cache_get_best_cache (gint scale); static ThumbnailCache* thumbnail_cache_get_cache_for (ThumbnailCacheSize size); -GdkPixbuf* thumbnail_cache_fetch (ThumbnailSource* source, gint scale, GError** error); -static GdkPixbuf* _thumbnail_cache_fetch (ThumbnailCache* self, ThumbnailSource* source, GError** error); -void thumbnail_cache_fetch_async (ThumbnailSource* source, gint scale, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable); +GdkPixbuf* thumbnail_cache_fetch (ThumbnailSource* source, + gint scale, + GError** error); +static GdkPixbuf* _thumbnail_cache_fetch (ThumbnailCache* self, + ThumbnailSource* source, + GError** error); +void thumbnail_cache_fetch_async (ThumbnailSource* source, + gint scale, + ThumbnailCacheAsyncFetchCallback callback, + void* callback_target, + GCancellable* cancellable); GType photo_file_format_get_type (void) G_GNUC_CONST; -static void _thumbnail_cache_fetch_async (ThumbnailCache* self, ThumbnailSource* source, PhotoFileFormat format, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable); +static void _thumbnail_cache_fetch_async (ThumbnailCache* self, + ThumbnailSource* source, + PhotoFileFormat format, + Dimensions* dim, + GdkInterpType interp, + ThumbnailCacheAsyncFetchCallback callback, + void* callback_target, + GCancellable* cancellable); PhotoFileFormat thumbnail_source_get_preferred_thumbnail_format (ThumbnailSource* self); -void dimensions_init (Dimensions *self, gint width, gint height); -void thumbnail_cache_fetch_async_scaled (ThumbnailSource* source, gint scale, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable); -void thumbnail_cache_replace (ThumbnailSource* source, ThumbnailCacheSize size, GdkPixbuf* replacement, GError** error); -static void _thumbnail_cache_replace (ThumbnailCache* self, ThumbnailSource* source, GdkPixbuf* original, GError** error); +void dimensions_init (Dimensions *self, + gint width, + gint height); +void thumbnail_cache_fetch_async_scaled (ThumbnailSource* source, + gint scale, + Dimensions* dim, + GdkInterpType interp, + ThumbnailCacheAsyncFetchCallback callback, + void* callback_target, + GCancellable* cancellable); +void thumbnail_cache_replace (ThumbnailSource* source, + ThumbnailCacheSize size, + GdkPixbuf* replacement, + GError** error); +static void _thumbnail_cache_replace (ThumbnailCache* self, + ThumbnailSource* source, + GdkPixbuf* original, + GError** error); gboolean thumbnail_cache_exists (ThumbnailSource* source); -static gboolean _thumbnail_cache_exists (ThumbnailCache* self, ThumbnailSource* source); +static gboolean _thumbnail_cache_exists (ThumbnailCache* self, + ThumbnailSource* source); GType rotation_get_type (void) G_GNUC_CONST; -void thumbnail_cache_rotate (ThumbnailSource* source, Rotation rotation, GError** error); -GdkPixbuf* rotation_perform (Rotation self, GdkPixbuf* pixbuf); +void thumbnail_cache_rotate (ThumbnailSource* source, + Rotation rotation, + GError** error); +GdkPixbuf* rotation_perform (Rotation self, + GdkPixbuf* pixbuf); gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; GType orientation_get_type (void) G_GNUC_CONST; -void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader* reader, Orientation orientation, Dimensions* original_dim, GError** error); -void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensions* result); -GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error); -GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self, GError** error); -GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf); -void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result); -void thumbnail_cache_generate_for_video_frame (Thumbnails* thumbnails, GdkPixbuf* preview_frame); -GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInterpType interp, gboolean scale_up); +void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, + PhotoFileReader* reader, + Orientation orientation, + Dimensions* original_dim, + GError** error); +void scaling_get_scaled_dimensions (Scaling *self, + Dimensions* original, + Dimensions* result); +GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, + Dimensions* full, + Dimensions* scaled, + GError** error); +GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self, + GError** error); +GdkPixbuf* orientation_rotate_pixbuf (Orientation self, + GdkPixbuf* pixbuf); +void dimensions_for_pixbuf (GdkPixbuf* pixbuf, + Dimensions* result); +void thumbnail_cache_generate_for_video_frame (Thumbnails* thumbnails, + GdkPixbuf* preview_frame); +GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, + GdkPixbuf* pixbuf, + GdkInterpType interp, + gboolean scale_up); static void thumbnail_cache_schedule_debug (void); -static GdkPixbuf* thumbnail_cache_fetch_from_memory (ThumbnailCache* self, const gchar* thumbnail_name); +static GdkPixbuf* thumbnail_cache_fetch_from_memory (ThumbnailCache* self, + const gchar* thumbnail_name); gchar* data_source_get_source_id (DataSource* self); -static GdkPixbuf* thumbnail_cache_read_pixbuf (ThumbnailCache* self, const gchar* thumbnail_name, PhotoFileFormat format, GError** error); -static void thumbnail_cache_store_in_memory (ThumbnailCache* self, const gchar* thumbnail_name, GdkPixbuf* thumbnail); +static GdkPixbuf* thumbnail_cache_read_pixbuf (ThumbnailCache* self, + const gchar* thumbnail_name, + PhotoFileFormat format, + GError** error); +static void thumbnail_cache_store_in_memory (ThumbnailCache* self, + const gchar* thumbnail_name, + GdkPixbuf* thumbnail); gboolean dimensions_has_area (Dimensions *self); -gboolean dimensions_equals (Dimensions *self, Dimensions* dim); +gboolean dimensions_equals (Dimensions *self, + Dimensions* dim); gpointer background_job_ref (gpointer instance); void background_job_unref (gpointer instance); -GParamSpec* param_spec_background_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_background_job (GValue* value, gpointer v_object); -void value_take_background_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_background_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_background_job (GValue* value, + gpointer v_object); +void value_take_background_job (GValue* value, + gpointer v_object); gpointer value_get_background_job (const GValue* value); GType background_job_get_type (void) G_GNUC_CONST; -void workers_enqueue (Workers* self, BackgroundJob* job); -static ThumbnailCacheAsyncFetchJob* thumbnail_cache_async_fetch_job_new (ThumbnailCache* cache, const gchar* thumbnail_name, ThumbnailSource* source, GdkPixbuf* prefetched, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable); -static ThumbnailCacheAsyncFetchJob* thumbnail_cache_async_fetch_job_construct (GType object_type, ThumbnailCache* cache, const gchar* thumbnail_name, ThumbnailSource* source, GdkPixbuf* prefetched, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable); +void workers_enqueue (Workers* self, + BackgroundJob* job); +static ThumbnailCacheAsyncFetchJob* thumbnail_cache_async_fetch_job_new (ThumbnailCache* cache, + const gchar* thumbnail_name, + ThumbnailSource* source, + GdkPixbuf* prefetched, + Dimensions* dim, + GdkInterpType interp, + ThumbnailCacheAsyncFetchCallback callback, + void* callback_target, + GCancellable* cancellable); +static ThumbnailCacheAsyncFetchJob* thumbnail_cache_async_fetch_job_construct (GType object_type, + ThumbnailCache* cache, + const gchar* thumbnail_name, + ThumbnailSource* source, + GdkPixbuf* prefetched, + Dimensions* dim, + GdkInterpType interp, + ThumbnailCacheAsyncFetchCallback callback, + void* callback_target, + GCancellable* cancellable); static GType thumbnail_cache_async_fetch_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* background_job); GType background_job_job_priority_get_type (void) G_GNUC_CONST; -static GFile* thumbnail_cache_get_source_cached_file (ThumbnailCache* self, ThumbnailSource* source); +static GFile* thumbnail_cache_get_source_cached_file (ThumbnailCache* self, + ThumbnailSource* source); GType media_source_get_type (void) G_GNUC_CONST; GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; -GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error); -static void thumbnail_cache_save_thumbnail (ThumbnailCache* self, GFile* file, GdkPixbuf* pixbuf, ThumbnailSource* source, GError** error); -gboolean dimensions_approx_scaled (Dimensions *self, gint scale, gint fudge); -static GFile* thumbnail_cache_get_cached_file (ThumbnailCache* self, const gchar* thumbnail_name, PhotoFileFormat thumbnail_format); +GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, + Scaling* scaling, + GError** error); +static void thumbnail_cache_save_thumbnail (ThumbnailCache* self, + GFile* file, + GdkPixbuf* pixbuf, + ThumbnailSource* source, + GError** error); +gboolean dimensions_approx_scaled (Dimensions *self, + gint scale, + gint fudge); +static GFile* thumbnail_cache_get_cached_file (ThumbnailCache* self, + const gchar* thumbnail_name, + PhotoFileFormat thumbnail_format); gchar* thumbnail_source_get_representative_id (ThumbnailSource* self); void app_window_panic (const gchar* msg); -static gboolean thumbnail_cache_remove_from_memory (ThumbnailCache* self, const gchar* thumbnail_name); -GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gboolean scale_up); -PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gchar* filepath); -gchar* photo_file_format_get_default_basename (PhotoFileFormat self, const gchar* name); +static gboolean thumbnail_cache_remove_from_memory (ThumbnailCache* self, + const gchar* thumbnail_name); +GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, + gint scale, + GdkInterpType interp, + gboolean scale_up); +PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, + const gchar* filepath); +gchar* photo_file_format_get_default_basename (PhotoFileFormat self, + const gchar* name); static ThumbnailCacheImageData* thumbnail_cache_image_data_new (GdkPixbuf* pixbuf); -static ThumbnailCacheImageData* thumbnail_cache_image_data_construct (GType object_type, GdkPixbuf* pixbuf); +static ThumbnailCacheImageData* thumbnail_cache_image_data_construct (GType object_type, + GdkPixbuf* pixbuf); GType photo_file_writer_get_type (void) G_GNUC_CONST; GQuark photo_format_error_quark (void); -PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gchar* filepath, GError** error); -void photo_file_writer_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error); -enum { - THUMBNAIL_CACHE_IMAGE_DATA_DUMMY_PROPERTY -}; +PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, + const gchar* filepath, + GError** error); +void photo_file_writer_write (PhotoFileWriter* self, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error); static void thumbnail_cache_image_data_finalize (ThumbnailCacheImageData * obj); -enum { - THUMBNAIL_CACHE_ASYNC_FETCH_JOB_DUMMY_PROPERTY -}; -static void _thumbnail_cache_async_fetch_completion_callback_completion_callback (BackgroundJob* job, gpointer self); +static void _thumbnail_cache_async_fetch_completion_callback_completion_callback (BackgroundJob* job, + gpointer self); gpointer abstract_semaphore_ref (gpointer instance); void abstract_semaphore_unref (gpointer instance); -GParamSpec* param_spec_abstract_semaphore (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_abstract_semaphore (GValue* value, gpointer v_object); -void value_take_abstract_semaphore (GValue* value, gpointer v_object); +GParamSpec* param_spec_abstract_semaphore (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_abstract_semaphore (GValue* value, + gpointer v_object); +void value_take_abstract_semaphore (GValue* value, + gpointer v_object); gpointer value_get_abstract_semaphore (const GValue* value); GType abstract_semaphore_get_type (void) G_GNUC_CONST; -BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore); +BackgroundJob* background_job_construct (GType object_type, + GObject* owner, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target, + AbstractSemaphore* completion_semaphore); static BackgroundJobJobPriority thumbnail_cache_async_fetch_job_real_get_priority (BackgroundJob* base); static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base); gboolean background_job_is_cancelled (BackgroundJob* self); -GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp); -static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAsyncFetchJob* self, GError** error); +GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, + Dimensions* resized, + GdkInterpType interp); +static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAsyncFetchJob* self, + GError** error); GType video_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; -GdkPixbuf* thumbnail_source_create_thumbnail (ThumbnailSource* self, gint scale, GError** error); +GdkPixbuf* thumbnail_source_create_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); static void thumbnail_cache_async_fetch_job_finalize (BackgroundJob * obj); static void thumbnail_cache_finalize (GObject * obj); -Thumbnails* thumbnails_construct (GType object_type) { +Thumbnails* +thumbnails_construct (GType object_type) +{ Thumbnails* self = NULL; #line 11 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self = (Thumbnails*) g_type_create_instance (object_type); #line 11 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return self; -#line 653 "ThumbnailCache.c" +#line 841 "ThumbnailCache.c" } -Thumbnails* thumbnails_new (void) { +Thumbnails* +thumbnails_new (void) +{ #line 11 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return thumbnails_construct (TYPE_THUMBNAILS); -#line 660 "ThumbnailCache.c" +#line 850 "ThumbnailCache.c" } -void thumbnails_set (Thumbnails* self, ThumbnailCacheSize size, GdkPixbuf* pixbuf) { +void +thumbnails_set (Thumbnails* self, + ThumbnailCacheSize size, + GdkPixbuf* pixbuf) +{ GeeHashMap* _tmp0_; - ThumbnailCacheSize _tmp1_; - GdkPixbuf* _tmp2_; #line 14 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAILS (self)); #line 14 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -671,149 +863,170 @@ void thumbnails_set (Thumbnails* self, ThumbnailCacheSize size, GdkPixbuf* pixbu #line 15 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = self->priv->map; #line 15 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = size; -#line 15 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = pixbuf; -#line 15 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp1_), _tmp2_); -#line 680 "ThumbnailCache.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) size), pixbuf); +#line 868 "ThumbnailCache.c" } -void thumbnails_remove (Thumbnails* self, ThumbnailCacheSize size) { +void +thumbnails_remove (Thumbnails* self, + ThumbnailCacheSize size) +{ GeeHashMap* _tmp0_; - ThumbnailCacheSize _tmp1_; #line 18 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAILS (self)); #line 19 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = self->priv->map; #line 19 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = size; -#line 19 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp1_), NULL); -#line 695 "ThumbnailCache.c" + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) size), NULL); +#line 883 "ThumbnailCache.c" } -GdkPixbuf* thumbnails_get (Thumbnails* self, ThumbnailCacheSize size) { +GdkPixbuf* +thumbnails_get (Thumbnails* self, + ThumbnailCacheSize size) +{ GdkPixbuf* result = NULL; GeeHashMap* _tmp0_; - ThumbnailCacheSize _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 22 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAILS (self), NULL); #line 23 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = self->priv->map; #line 23 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = size; + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) size)); #line 23 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp1_)); -#line 23 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - result = (GdkPixbuf*) _tmp2_; + result = (GdkPixbuf*) _tmp1_; #line 23 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 716 "ThumbnailCache.c" +#line 904 "ThumbnailCache.c" } -static void value_thumbnails_init (GValue* value) { +static void +value_thumbnails_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" value->data[0].v_pointer = NULL; -#line 723 "ThumbnailCache.c" +#line 913 "ThumbnailCache.c" } -static void value_thumbnails_free_value (GValue* value) { +static void +value_thumbnails_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnails_unref (value->data[0].v_pointer); -#line 732 "ThumbnailCache.c" +#line 924 "ThumbnailCache.c" } } -static void value_thumbnails_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_thumbnails_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" dest_value->data[0].v_pointer = thumbnails_ref (src_value->data[0].v_pointer); -#line 742 "ThumbnailCache.c" +#line 937 "ThumbnailCache.c" } else { #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" dest_value->data[0].v_pointer = NULL; -#line 746 "ThumbnailCache.c" +#line 941 "ThumbnailCache.c" } } -static gpointer value_thumbnails_peek_pointer (const GValue* value) { +static gpointer +value_thumbnails_peek_pointer (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return value->data[0].v_pointer; -#line 754 "ThumbnailCache.c" +#line 951 "ThumbnailCache.c" } -static gchar* value_thumbnails_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_thumbnails_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (collect_values[0].v_pointer) { -#line 761 "ThumbnailCache.c" +#line 963 "ThumbnailCache.c" Thumbnails * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 768 "ThumbnailCache.c" +#line 970 "ThumbnailCache.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.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 772 "ThumbnailCache.c" +#line 974 "ThumbnailCache.c" } #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" value->data[0].v_pointer = thumbnails_ref (object); -#line 776 "ThumbnailCache.c" +#line 978 "ThumbnailCache.c" } else { #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" value->data[0].v_pointer = NULL; -#line 780 "ThumbnailCache.c" +#line 982 "ThumbnailCache.c" } #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return NULL; -#line 784 "ThumbnailCache.c" +#line 986 "ThumbnailCache.c" } -static gchar* value_thumbnails_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_thumbnails_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ Thumbnails ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 795 "ThumbnailCache.c" +#line 1002 "ThumbnailCache.c" } #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" *object_p = NULL; -#line 801 "ThumbnailCache.c" +#line 1008 "ThumbnailCache.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" *object_p = value->data[0].v_pointer; -#line 805 "ThumbnailCache.c" +#line 1012 "ThumbnailCache.c" } else { #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" *object_p = thumbnails_ref (value->data[0].v_pointer); -#line 809 "ThumbnailCache.c" +#line 1016 "ThumbnailCache.c" } #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return NULL; -#line 813 "ThumbnailCache.c" +#line 1020 "ThumbnailCache.c" } -GParamSpec* param_spec_thumbnails (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_thumbnails (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecThumbnails* spec; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_THUMBNAILS), NULL); @@ -823,20 +1036,25 @@ GParamSpec* param_spec_thumbnails (const gchar* name, const gchar* nick, const g G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return G_PARAM_SPEC (spec); -#line 827 "ThumbnailCache.c" +#line 1040 "ThumbnailCache.c" } -gpointer value_get_thumbnails (const GValue* value) { +gpointer +value_get_thumbnails (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_THUMBNAILS), NULL); #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return value->data[0].v_pointer; -#line 836 "ThumbnailCache.c" +#line 1051 "ThumbnailCache.c" } -void value_set_thumbnails (GValue* value, gpointer v_object) { +void +value_set_thumbnails (GValue* value, + gpointer v_object) +{ Thumbnails * old; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_THUMBNAILS)); @@ -852,22 +1070,25 @@ void value_set_thumbnails (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnails_ref (value->data[0].v_pointer); -#line 856 "ThumbnailCache.c" +#line 1074 "ThumbnailCache.c" } else { #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" value->data[0].v_pointer = NULL; -#line 860 "ThumbnailCache.c" +#line 1078 "ThumbnailCache.c" } #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnails_unref (old); -#line 866 "ThumbnailCache.c" +#line 1084 "ThumbnailCache.c" } } -void value_take_thumbnails (GValue* value, gpointer v_object) { +void +value_take_thumbnails (GValue* value, + gpointer v_object) +{ Thumbnails * old; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_THUMBNAILS)); @@ -881,33 +1102,37 @@ void value_take_thumbnails (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" value->data[0].v_pointer = v_object; -#line 885 "ThumbnailCache.c" +#line 1106 "ThumbnailCache.c" } else { #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" value->data[0].v_pointer = NULL; -#line 889 "ThumbnailCache.c" +#line 1110 "ThumbnailCache.c" } #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnails_unref (old); -#line 895 "ThumbnailCache.c" +#line 1116 "ThumbnailCache.c" } } -static void thumbnails_class_init (ThumbnailsClass * klass) { +static void +thumbnails_class_init (ThumbnailsClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnails_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" ((ThumbnailsClass *) klass)->finalize = thumbnails_finalize; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_type_class_add_private (klass, sizeof (ThumbnailsPrivate)); -#line 907 "ThumbnailCache.c" +#line 1130 "ThumbnailCache.c" } -static void thumbnails_instance_init (Thumbnails * self) { +static void +thumbnails_instance_init (Thumbnails * self) +{ GeeHashMap* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self->priv = THUMBNAILS_GET_PRIVATE (self); @@ -917,11 +1142,13 @@ static void thumbnails_instance_init (Thumbnails * self) { self->priv->map = _tmp0_; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self->ref_count = 1; -#line 921 "ThumbnailCache.c" +#line 1146 "ThumbnailCache.c" } -static void thumbnails_finalize (Thumbnails * obj) { +static void +thumbnails_finalize (Thumbnails * obj) +{ Thumbnails * self; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_THUMBNAILS, Thumbnails); @@ -929,11 +1156,13 @@ static void thumbnails_finalize (Thumbnails * obj) { g_signal_handlers_destroy (self); #line 8 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (self->priv->map); -#line 933 "ThumbnailCache.c" +#line 1160 "ThumbnailCache.c" } -GType thumbnails_get_type (void) { +GType +thumbnails_get_type (void) +{ static volatile gsize thumbnails_type_id__volatile = 0; if (g_once_init_enter (&thumbnails_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_thumbnails_init, value_thumbnails_free_value, value_thumbnails_copy_value, value_thumbnails_peek_pointer, "p", value_thumbnails_collect_value, "p", value_thumbnails_lcopy_value }; @@ -947,18 +1176,22 @@ GType thumbnails_get_type (void) { } -gpointer thumbnails_ref (gpointer instance) { +gpointer +thumbnails_ref (gpointer instance) +{ Thumbnails * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return instance; -#line 958 "ThumbnailCache.c" +#line 1189 "ThumbnailCache.c" } -void thumbnails_unref (gpointer instance) { +void +thumbnails_unref (gpointer instance) +{ Thumbnails * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -967,64 +1200,64 @@ void thumbnails_unref (gpointer instance) { THUMBNAILS_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_type_free_instance ((GTypeInstance *) self); -#line 971 "ThumbnailCache.c" +#line 1204 "ThumbnailCache.c" } } -gint thumbnail_cache_size_get_scale (ThumbnailCacheSize self) { +gint +thumbnail_cache_size_get_scale (ThumbnailCacheSize self) +{ gint result = 0; #line 42 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" result = (gint) self; #line 42 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 982 "ThumbnailCache.c" +#line 1217 "ThumbnailCache.c" } -void thumbnail_cache_size_get_scaling (ThumbnailCacheSize self, Scaling* result) { - gint _tmp0_; - Scaling _tmp1_ = {0}; +void +thumbnail_cache_size_get_scaling (ThumbnailCacheSize self, + Scaling* result) +{ + Scaling _tmp0_ = {0}; #line 46 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = thumbnail_cache_size_get_scale (self); + scaling_for_best_fit (thumbnail_cache_size_get_scale (self), TRUE, &_tmp0_); #line 46 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - scaling_for_best_fit (_tmp0_, TRUE, &_tmp1_); -#line 46 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - *result = _tmp1_; + *result = _tmp0_; #line 46 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 997 "ThumbnailCache.c" +#line 1232 "ThumbnailCache.c" } -ThumbnailCacheSize thumbnail_cache_size_get_best_size (gint scale) { +ThumbnailCacheSize +thumbnail_cache_size_get_best_size (gint scale) +{ ThumbnailCacheSize result = 0; ThumbnailCacheSize _tmp0_ = 0; - gint _tmp1_; - gint _tmp2_; -#line 50 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = scale; #line 50 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_MEDIUM); -#line 50 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (_tmp1_ <= _tmp2_) { + if (scale <= thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_MEDIUM)) { #line 50 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = THUMBNAIL_CACHE_SIZE_MEDIUM; -#line 1014 "ThumbnailCache.c" +#line 1245 "ThumbnailCache.c" } else { #line 50 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = THUMBNAIL_CACHE_SIZE_BIG; -#line 1018 "ThumbnailCache.c" +#line 1249 "ThumbnailCache.c" } #line 50 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" result = _tmp0_; #line 50 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 1024 "ThumbnailCache.c" +#line 1255 "ThumbnailCache.c" } -GType thumbnail_cache_size_get_type (void) { +GType +thumbnail_cache_size_get_type (void) +{ static volatile gsize thumbnail_cache_size_type_id__volatile = 0; if (g_once_init_enter (&thumbnail_cache_size_type_id__volatile)) { static const GEnumValue values[] = {{THUMBNAIL_CACHE_SIZE_LARGEST, "THUMBNAIL_CACHE_SIZE_LARGEST", "largest"}, {THUMBNAIL_CACHE_SIZE_BIG, "THUMBNAIL_CACHE_SIZE_BIG", "big"}, {THUMBNAIL_CACHE_SIZE_MEDIUM, "THUMBNAIL_CACHE_SIZE_MEDIUM", "medium"}, {THUMBNAIL_CACHE_SIZE_SMALLEST, "THUMBNAIL_CACHE_SIZE_SMALLEST", "smallest"}, {0, NULL, NULL}}; @@ -1036,77 +1269,73 @@ GType thumbnail_cache_size_get_type (void) { } -static ThumbnailCache* thumbnail_cache_construct (GType object_type, ThumbnailCacheSize size, gulong max_cached_bytes, GdkInterpType interp, JpegQuality quality) { +static ThumbnailCache* +thumbnail_cache_construct (GType object_type, + ThumbnailCacheSize size, + gulong max_cached_bytes, + GdkInterpType interp, + JpegQuality quality) +{ ThumbnailCache * self = NULL; - ThumbnailCacheSize _tmp0_; - gint _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; - GFile* _tmp4_; - ThumbnailCacheSize _tmp5_; - gulong _tmp6_; - GdkInterpType _tmp7_; - JpegQuality _tmp8_; + gchar* _tmp0_; + gchar* _tmp1_; + GFile* _tmp2_; #line 190 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self = (ThumbnailCache*) g_object_new (object_type, NULL); #line 192 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = size; -#line 192 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = thumbnail_cache_size_get_scale (_tmp0_); + _tmp0_ = g_strdup_printf ("thumbs%d", thumbnail_cache_size_get_scale (size)); #line 192 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = g_strdup_printf ("thumbs%d", _tmp1_); -#line 192 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 192 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = app_dirs_get_cache_subdir ("thumbs", _tmp3_); + _tmp2_ = app_dirs_get_cache_subdir ("thumbs", _tmp1_); #line 192 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (self->priv->cache_dir); #line 192 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->priv->cache_dir = _tmp4_; + self->priv->cache_dir = _tmp2_; #line 192 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp1_); #line 193 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = size; -#line 193 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->priv->size = _tmp5_; -#line 194 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = max_cached_bytes; + self->priv->size = size; #line 194 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->priv->max_cached_bytes = _tmp6_; + self->priv->max_cached_bytes = max_cached_bytes; #line 195 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = interp; -#line 195 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->priv->interp = _tmp7_; -#line 196 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = quality; + self->priv->interp = interp; #line 196 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->priv->quality = _tmp8_; + self->priv->quality = quality; #line 190 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return self; -#line 1087 "ThumbnailCache.c" +#line 1308 "ThumbnailCache.c" } -static ThumbnailCache* thumbnail_cache_new (ThumbnailCacheSize size, gulong max_cached_bytes, GdkInterpType interp, JpegQuality quality) { +static ThumbnailCache* +thumbnail_cache_new (ThumbnailCacheSize size, + gulong max_cached_bytes, + GdkInterpType interp, + JpegQuality quality) +{ #line 190 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return thumbnail_cache_construct (TYPE_THUMBNAIL_CACHE, size, max_cached_bytes, interp, quality); -#line 1094 "ThumbnailCache.c" +#line 1320 "ThumbnailCache.c" } -static void _thumbnail_cache_report_cycle_one_shot_callback (gpointer self) { +static void +_thumbnail_cache_report_cycle_one_shot_callback (gpointer self) +{ #line 201 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_report_cycle (); -#line 1101 "ThumbnailCache.c" +#line 1329 "ThumbnailCache.c" } -void thumbnail_cache_init (void) { +void +thumbnail_cache_init (void) +{ OneShotScheduler* _tmp0_; - guint _tmp1_; - Workers* _tmp2_; + Workers* _tmp1_; + ThumbnailCache* _tmp2_; ThumbnailCache* _tmp3_; - ThumbnailCache* _tmp4_; #line 201 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = one_shot_scheduler_new ("ThumbnailCache cycle reporter", _thumbnail_cache_report_cycle_one_shot_callback, NULL); #line 201 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1114,104 +1343,92 @@ void thumbnail_cache_init (void) { #line 201 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_debug_scheduler = _tmp0_; #line 202 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = workers_threads_per_cpu (1, -1); -#line 202 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = workers_new (_tmp1_, TRUE); + _tmp1_ = workers_new (workers_threads_per_cpu (1, -1), TRUE); #line 202 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _workers_unref0 (thumbnail_cache_fetch_workers); #line 202 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail_cache_fetch_workers = _tmp2_; + thumbnail_cache_fetch_workers = _tmp1_; #line 204 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = thumbnail_cache_new (THUMBNAIL_CACHE_SIZE_BIG, THUMBNAIL_CACHE_MAX_BIG_CACHED_BYTES, THUMBNAIL_CACHE_DEFAULT_INTERP, THUMBNAIL_CACHE_DEFAULT_QUALITY); + _tmp2_ = thumbnail_cache_new (THUMBNAIL_CACHE_SIZE_BIG, THUMBNAIL_CACHE_MAX_BIG_CACHED_BYTES, THUMBNAIL_CACHE_DEFAULT_INTERP, THUMBNAIL_CACHE_DEFAULT_QUALITY); #line 204 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (thumbnail_cache_big); #line 204 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail_cache_big = _tmp3_; + thumbnail_cache_big = _tmp2_; #line 205 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = thumbnail_cache_new (THUMBNAIL_CACHE_SIZE_MEDIUM, THUMBNAIL_CACHE_MAX_MEDIUM_CACHED_BYTES, THUMBNAIL_CACHE_DEFAULT_INTERP, THUMBNAIL_CACHE_DEFAULT_QUALITY); + _tmp3_ = thumbnail_cache_new (THUMBNAIL_CACHE_SIZE_MEDIUM, THUMBNAIL_CACHE_MAX_MEDIUM_CACHED_BYTES, THUMBNAIL_CACHE_DEFAULT_INTERP, THUMBNAIL_CACHE_DEFAULT_QUALITY); #line 205 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (thumbnail_cache_medium); #line 205 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail_cache_medium = _tmp4_; -#line 1137 "ThumbnailCache.c" + thumbnail_cache_medium = _tmp3_; +#line 1364 "ThumbnailCache.c" } -void thumbnail_cache_terminate (void) { +void +thumbnail_cache_terminate (void) +{ } -void thumbnail_cache_import_from_source (ThumbnailSource* source, gboolean force, GError** error) { - ThumbnailSource* _tmp0_; +void +thumbnail_cache_import_from_source (ThumbnailSource* source, + gboolean force, + GError** error) +{ + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; + ThumbnailCache* _tmp2_; ThumbnailCache* _tmp3_; - ThumbnailSource* _tmp4_; - gboolean _tmp5_; - ThumbnailCache* _tmp6_; - ThumbnailSource* _tmp7_; - gboolean _tmp8_; GError * _inner_error_ = NULL; #line 211 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (source)); #line 213 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = source; + _tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 213 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject)); -#line 213 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 213 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - g_debug ("ThumbnailCache.vala:213: import from source: %s", _tmp2_); + g_debug ("ThumbnailCache.vala:213: import from source: %s", _tmp1_); #line 213 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_free0 (_tmp2_); -#line 214 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = thumbnail_cache_big; + _g_free0 (_tmp1_); #line 214 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = source; + _tmp2_ = thumbnail_cache_big; #line 214 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = force; -#line 214 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _thumbnail_cache_import_from_source (_tmp3_, _tmp4_, _tmp5_, &_inner_error_); + _thumbnail_cache_import_from_source (_tmp2_, source, force, &_inner_error_); #line 214 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 214 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_propagate_error (error, _inner_error_); #line 214 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 1182 "ThumbnailCache.c" +#line 1404 "ThumbnailCache.c" } #line 215 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = thumbnail_cache_medium; -#line 215 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = source; -#line 215 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = force; + _tmp3_ = thumbnail_cache_medium; #line 215 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _thumbnail_cache_import_from_source (_tmp6_, _tmp7_, _tmp8_, &_inner_error_); + _thumbnail_cache_import_from_source (_tmp3_, source, force, &_inner_error_); #line 215 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 215 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_propagate_error (error, _inner_error_); #line 215 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 1198 "ThumbnailCache.c" +#line 1416 "ThumbnailCache.c" } } -void thumbnail_cache_import_thumbnails (ThumbnailSource* source, Thumbnails* thumbnails, gboolean force, GError** error) { +void +thumbnail_cache_import_thumbnails (ThumbnailSource* source, + Thumbnails* thumbnails, + gboolean force, + GError** error) +{ ThumbnailCache* _tmp0_; - ThumbnailSource* _tmp1_; - Thumbnails* _tmp2_; - GdkPixbuf* _tmp3_; + GdkPixbuf* _tmp1_; + GdkPixbuf* _tmp2_; + ThumbnailCache* _tmp3_; GdkPixbuf* _tmp4_; - gboolean _tmp5_; - ThumbnailCache* _tmp6_; - ThumbnailSource* _tmp7_; - Thumbnails* _tmp8_; - GdkPixbuf* _tmp9_; - GdkPixbuf* _tmp10_; - gboolean _tmp11_; + GdkPixbuf* _tmp5_; GError * _inner_error_ = NULL; #line 218 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (source)); @@ -1220,61 +1437,48 @@ void thumbnail_cache_import_thumbnails (ThumbnailSource* source, Thumbnails* thu #line 220 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = thumbnail_cache_big; #line 220 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = source; -#line 220 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = thumbnails; -#line 220 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = thumbnails_get (_tmp2_, THUMBNAIL_CACHE_SIZE_BIG); + _tmp1_ = thumbnails_get (thumbnails, THUMBNAIL_CACHE_SIZE_BIG); #line 220 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = _tmp3_; -#line 220 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = force; + _tmp2_ = _tmp1_; #line 220 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _thumbnail_cache_import_thumbnail (_tmp0_, _tmp1_, _tmp4_, _tmp5_, &_inner_error_); + _thumbnail_cache_import_thumbnail (_tmp0_, source, _tmp2_, force, &_inner_error_); #line 220 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp2_); #line 220 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 220 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_propagate_error (error, _inner_error_); #line 220 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 1243 "ThumbnailCache.c" +#line 1454 "ThumbnailCache.c" } #line 221 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = thumbnail_cache_medium; -#line 221 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = source; -#line 221 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = thumbnails; -#line 221 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp9_ = thumbnails_get (_tmp8_, THUMBNAIL_CACHE_SIZE_MEDIUM); + _tmp3_ = thumbnail_cache_medium; #line 221 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp10_ = _tmp9_; + _tmp4_ = thumbnails_get (thumbnails, THUMBNAIL_CACHE_SIZE_MEDIUM); #line 221 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp11_ = force; + _tmp5_ = _tmp4_; #line 221 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _thumbnail_cache_import_thumbnail (_tmp6_, _tmp7_, _tmp10_, _tmp11_, &_inner_error_); + _thumbnail_cache_import_thumbnail (_tmp3_, source, _tmp5_, force, &_inner_error_); #line 221 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp5_); #line 221 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 221 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_propagate_error (error, _inner_error_); #line 221 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 1267 "ThumbnailCache.c" +#line 1472 "ThumbnailCache.c" } } -void thumbnail_cache_duplicate (ThumbnailSource* src_source, ThumbnailSource* dest_source) { +void +thumbnail_cache_duplicate (ThumbnailSource* src_source, + ThumbnailSource* dest_source) +{ ThumbnailCache* _tmp0_; - ThumbnailSource* _tmp1_; - ThumbnailSource* _tmp2_; - ThumbnailCache* _tmp3_; - ThumbnailSource* _tmp4_; - ThumbnailSource* _tmp5_; + ThumbnailCache* _tmp1_; #line 224 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (src_source)); #line 224 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1282,263 +1486,225 @@ void thumbnail_cache_duplicate (ThumbnailSource* src_source, ThumbnailSource* de #line 225 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = thumbnail_cache_big; #line 225 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = src_source; -#line 225 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = dest_source; -#line 225 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _thumbnail_cache_duplicate (_tmp0_, _tmp1_, _tmp2_); + _thumbnail_cache_duplicate (_tmp0_, src_source, dest_source); #line 226 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = thumbnail_cache_medium; -#line 226 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = src_source; + _tmp1_ = thumbnail_cache_medium; #line 226 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = dest_source; -#line 226 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _thumbnail_cache_duplicate (_tmp3_, _tmp4_, _tmp5_); -#line 1299 "ThumbnailCache.c" + _thumbnail_cache_duplicate (_tmp1_, src_source, dest_source); +#line 1495 "ThumbnailCache.c" } -void thumbnail_cache_remove (ThumbnailSource* source) { +void +thumbnail_cache_remove (ThumbnailSource* source) +{ ThumbnailCache* _tmp0_; - ThumbnailSource* _tmp1_; - ThumbnailCache* _tmp2_; - ThumbnailSource* _tmp3_; + ThumbnailCache* _tmp1_; #line 229 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (source)); #line 230 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = thumbnail_cache_big; #line 230 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = source; -#line 230 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _thumbnail_cache_remove (_tmp0_, _tmp1_); + _thumbnail_cache_remove (_tmp0_, source); #line 231 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = thumbnail_cache_medium; + _tmp1_ = thumbnail_cache_medium; #line 231 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = source; -#line 231 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _thumbnail_cache_remove (_tmp2_, _tmp3_); -#line 1322 "ThumbnailCache.c" + _thumbnail_cache_remove (_tmp1_, source); +#line 1514 "ThumbnailCache.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 237 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return self ? g_object_ref (self) : NULL; -#line 1329 "ThumbnailCache.c" +#line 1523 "ThumbnailCache.c" } -static ThumbnailCache* thumbnail_cache_get_best_cache (gint scale) { +static ThumbnailCache* +thumbnail_cache_get_best_cache (gint scale) +{ ThumbnailCache* result = NULL; ThumbnailCacheSize size = 0; - gint _tmp0_; - ThumbnailCacheSize _tmp1_; - ThumbnailCacheSize _tmp2_; -#line 235 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = scale; -#line 235 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = thumbnail_cache_size_get_best_size (_tmp0_); + ThumbnailCacheSize _tmp0_; #line 235 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - size = _tmp1_; + size = thumbnail_cache_size_get_best_size (scale); #line 236 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = size; + _tmp0_ = size; #line 236 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (_tmp2_ == THUMBNAIL_CACHE_SIZE_BIG) { -#line 1349 "ThumbnailCache.c" - ThumbnailCache* _tmp3_; - ThumbnailCache* _tmp4_; + if (_tmp0_ == THUMBNAIL_CACHE_SIZE_BIG) { +#line 1539 "ThumbnailCache.c" + ThumbnailCache* _tmp1_; + ThumbnailCache* _tmp2_; #line 237 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = thumbnail_cache_big; + _tmp1_ = thumbnail_cache_big; #line 237 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp2_ = _g_object_ref0 (_tmp1_); #line 237 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - result = _tmp4_; + result = _tmp2_; #line 237 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 1360 "ThumbnailCache.c" +#line 1550 "ThumbnailCache.c" } else { - ThumbnailCacheSize _tmp5_; - ThumbnailCache* _tmp6_; - ThumbnailCache* _tmp7_; + ThumbnailCacheSize _tmp3_; + ThumbnailCache* _tmp4_; + ThumbnailCache* _tmp5_; #line 239 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = size; + _tmp3_ = size; #line 239 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _vala_assert (_tmp5_ == THUMBNAIL_CACHE_SIZE_MEDIUM, "size == Size.MEDIUM"); + _vala_assert (_tmp3_ == THUMBNAIL_CACHE_SIZE_MEDIUM, "size == Size.MEDIUM"); #line 241 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = thumbnail_cache_medium; + _tmp4_ = thumbnail_cache_medium; #line 241 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = _g_object_ref0 (_tmp6_); + _tmp5_ = _g_object_ref0 (_tmp4_); #line 241 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - result = _tmp7_; + result = _tmp5_; #line 241 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 1377 "ThumbnailCache.c" +#line 1567 "ThumbnailCache.c" } } -static ThumbnailCache* thumbnail_cache_get_cache_for (ThumbnailCacheSize size) { +static ThumbnailCache* +thumbnail_cache_get_cache_for (ThumbnailCacheSize size) +{ ThumbnailCache* result = NULL; - ThumbnailCacheSize _tmp0_; -#line 246 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = size; #line 246 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - switch (_tmp0_) { + switch (size) { #line 246 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" case THUMBNAIL_CACHE_SIZE_BIG: -#line 1391 "ThumbnailCache.c" +#line 1580 "ThumbnailCache.c" { + ThumbnailCache* _tmp0_; ThumbnailCache* _tmp1_; - ThumbnailCache* _tmp2_; #line 248 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = thumbnail_cache_big; + _tmp0_ = thumbnail_cache_big; #line 248 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 248 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - result = _tmp2_; + result = _tmp1_; #line 248 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 1403 "ThumbnailCache.c" +#line 1592 "ThumbnailCache.c" } #line 246 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" case THUMBNAIL_CACHE_SIZE_MEDIUM: -#line 1407 "ThumbnailCache.c" +#line 1596 "ThumbnailCache.c" { + ThumbnailCache* _tmp2_; ThumbnailCache* _tmp3_; - ThumbnailCache* _tmp4_; #line 251 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = thumbnail_cache_medium; + _tmp2_ = thumbnail_cache_medium; #line 251 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp3_ = _g_object_ref0 (_tmp2_); #line 251 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - result = _tmp4_; + result = _tmp3_; #line 251 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 1419 "ThumbnailCache.c" +#line 1608 "ThumbnailCache.c" } default: { - ThumbnailCacheSize _tmp5_; - gint _tmp6_; -#line 254 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = size; -#line 254 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = thumbnail_cache_size_get_scale (_tmp5_); #line 254 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - g_error ("ThumbnailCache.vala:254: Unknown thumbnail size %d", _tmp6_); -#line 1431 "ThumbnailCache.c" + g_error ("ThumbnailCache.vala:254: Unknown thumbnail size %d", thumbnail_cache_size_get_scale (size)); +#line 1614 "ThumbnailCache.c" } } } -GdkPixbuf* thumbnail_cache_fetch (ThumbnailSource* source, gint scale, GError** error) { +GdkPixbuf* +thumbnail_cache_fetch (ThumbnailSource* source, + gint scale, + GError** error) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; - gint _tmp1_; + ThumbnailCache* _tmp1_; ThumbnailCache* _tmp2_; - ThumbnailCache* _tmp3_; - ThumbnailSource* _tmp4_; + GdkPixbuf* _tmp3_; + GdkPixbuf* _tmp4_; GdkPixbuf* _tmp5_; - GdkPixbuf* _tmp6_; - GdkPixbuf* _tmp7_; GError * _inner_error_ = NULL; #line 258 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_SOURCE (source), NULL); #line 259 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = scale; -#line 259 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = thumbnail_cache_get_best_cache (_tmp1_); -#line 259 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = _tmp2_; + _tmp1_ = thumbnail_cache_get_best_cache (scale); #line 259 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = source; + _tmp2_ = _tmp1_; #line 259 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = _thumbnail_cache_fetch (_tmp3_, _tmp4_, &_inner_error_); + _tmp3_ = _thumbnail_cache_fetch (_tmp2_, source, &_inner_error_); #line 259 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 259 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 259 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = _tmp6_; + _tmp0_ = _tmp4_; #line 259 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 259 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_propagate_error (error, _inner_error_); #line 259 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return NULL; -#line 1472 "ThumbnailCache.c" +#line 1653 "ThumbnailCache.c" } #line 259 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = _tmp0_; + _tmp5_ = _tmp0_; #line 259 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = NULL; #line 259 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - result = _tmp7_; + result = _tmp5_; #line 259 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (_tmp0_); #line 259 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 1484 "ThumbnailCache.c" +#line 1665 "ThumbnailCache.c" } -void thumbnail_cache_fetch_async (ThumbnailSource* source, gint scale, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable) { - gint _tmp0_; +void +thumbnail_cache_fetch_async (ThumbnailSource* source, + gint scale, + ThumbnailCacheAsyncFetchCallback callback, + void* callback_target, + GCancellable* cancellable) +{ + ThumbnailCache* _tmp0_; ThumbnailCache* _tmp1_; - ThumbnailCache* _tmp2_; - ThumbnailSource* _tmp3_; - ThumbnailSource* _tmp4_; - PhotoFileFormat _tmp5_; - Dimensions _tmp6_ = {0}; - ThumbnailCacheAsyncFetchCallback _tmp7_; - void* _tmp7__target; - GCancellable* _tmp8_; + Dimensions _tmp2_ = {0}; #line 262 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (source)); #line 262 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable)); #line 264 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = scale; -#line 264 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = thumbnail_cache_get_best_cache (_tmp0_); -#line 264 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = _tmp1_; -#line 264 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = source; -#line 264 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = source; + _tmp0_ = thumbnail_cache_get_best_cache (scale); #line 264 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = thumbnail_source_get_preferred_thumbnail_format (_tmp4_); + _tmp1_ = _tmp0_; #line 264 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - dimensions_init (&_tmp6_, 0, 0); + dimensions_init (&_tmp2_, 0, 0); #line 264 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = callback; + _thumbnail_cache_fetch_async (_tmp1_, source, thumbnail_source_get_preferred_thumbnail_format (source), &_tmp2_, THUMBNAIL_CACHE_DEFAULT_INTERP, callback, callback_target, cancellable); #line 264 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7__target = callback_target; -#line 264 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = cancellable; -#line 264 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _thumbnail_cache_fetch_async (_tmp2_, _tmp3_, _tmp5_, &_tmp6_, THUMBNAIL_CACHE_DEFAULT_INTERP, _tmp7_, _tmp7__target, _tmp8_); -#line 264 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_object_unref0 (_tmp2_); -#line 1527 "ThumbnailCache.c" + _g_object_unref0 (_tmp1_); +#line 1693 "ThumbnailCache.c" } -void thumbnail_cache_fetch_async_scaled (ThumbnailSource* source, gint scale, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable) { - gint _tmp0_; +void +thumbnail_cache_fetch_async_scaled (ThumbnailSource* source, + gint scale, + Dimensions* dim, + GdkInterpType interp, + ThumbnailCacheAsyncFetchCallback callback, + void* callback_target, + GCancellable* cancellable) +{ + ThumbnailCache* _tmp0_; ThumbnailCache* _tmp1_; - ThumbnailCache* _tmp2_; - ThumbnailSource* _tmp3_; - ThumbnailSource* _tmp4_; - PhotoFileFormat _tmp5_; - Dimensions _tmp6_; - GdkInterpType _tmp7_; - ThumbnailCacheAsyncFetchCallback _tmp8_; - void* _tmp8__target; - GCancellable* _tmp9_; + Dimensions _tmp2_; #line 268 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (source)); #line 268 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1546,114 +1712,88 @@ void thumbnail_cache_fetch_async_scaled (ThumbnailSource* source, gint scale, Di #line 268 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable)); #line 270 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = scale; -#line 270 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = thumbnail_cache_get_best_cache (_tmp0_); -#line 270 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = _tmp1_; -#line 270 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = source; -#line 270 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = source; -#line 270 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = thumbnail_source_get_preferred_thumbnail_format (_tmp4_); -#line 270 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = *dim; -#line 270 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = interp; -#line 270 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = callback; + _tmp0_ = thumbnail_cache_get_best_cache (scale); #line 270 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8__target = callback_target; + _tmp1_ = _tmp0_; #line 270 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp9_ = cancellable; + _tmp2_ = *dim; #line 270 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _thumbnail_cache_fetch_async (_tmp2_, _tmp3_, _tmp5_, &_tmp6_, _tmp7_, _tmp8_, _tmp8__target, _tmp9_); + _thumbnail_cache_fetch_async (_tmp1_, source, thumbnail_source_get_preferred_thumbnail_format (source), &_tmp2_, interp, callback, callback_target, cancellable); #line 270 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_object_unref0 (_tmp2_); -#line 1575 "ThumbnailCache.c" + _g_object_unref0 (_tmp1_); +#line 1725 "ThumbnailCache.c" } -void thumbnail_cache_replace (ThumbnailSource* source, ThumbnailCacheSize size, GdkPixbuf* replacement, GError** error) { - ThumbnailCacheSize _tmp0_; +void +thumbnail_cache_replace (ThumbnailSource* source, + ThumbnailCacheSize size, + GdkPixbuf* replacement, + GError** error) +{ + ThumbnailCache* _tmp0_; ThumbnailCache* _tmp1_; - ThumbnailCache* _tmp2_; - ThumbnailSource* _tmp3_; - GdkPixbuf* _tmp4_; GError * _inner_error_ = NULL; #line 274 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (source)); #line 274 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (GDK_IS_PIXBUF (replacement)); #line 276 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = size; -#line 276 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = thumbnail_cache_get_cache_for (_tmp0_); -#line 276 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = _tmp1_; -#line 276 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = source; + _tmp0_ = thumbnail_cache_get_cache_for (size); #line 276 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = replacement; + _tmp1_ = _tmp0_; #line 276 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _thumbnail_cache_replace (_tmp2_, _tmp3_, _tmp4_, &_inner_error_); + _thumbnail_cache_replace (_tmp1_, source, replacement, &_inner_error_); #line 276 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 276 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 276 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_propagate_error (error, _inner_error_); #line 276 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 1610 "ThumbnailCache.c" +#line 1756 "ThumbnailCache.c" } } -gboolean thumbnail_cache_exists (ThumbnailSource* source) { +gboolean +thumbnail_cache_exists (ThumbnailSource* source) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; ThumbnailCache* _tmp1_; - ThumbnailSource* _tmp2_; - gboolean _tmp3_; #line 279 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_SOURCE (source), FALSE); #line 280 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp1_ = thumbnail_cache_big; #line 280 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = source; -#line 280 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = _thumbnail_cache_exists (_tmp1_, _tmp2_); -#line 280 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (_tmp3_) { -#line 1631 "ThumbnailCache.c" - ThumbnailCache* _tmp4_; - ThumbnailSource* _tmp5_; - gboolean _tmp6_; -#line 280 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = thumbnail_cache_medium; -#line 280 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = source; + if (_thumbnail_cache_exists (_tmp1_, source)) { +#line 1773 "ThumbnailCache.c" + ThumbnailCache* _tmp2_; #line 280 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = _thumbnail_cache_exists (_tmp4_, _tmp5_); + _tmp2_ = thumbnail_cache_medium; #line 280 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = _tmp6_; -#line 1643 "ThumbnailCache.c" + _tmp0_ = _thumbnail_cache_exists (_tmp2_, source); +#line 1779 "ThumbnailCache.c" } else { #line 280 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = FALSE; -#line 1647 "ThumbnailCache.c" +#line 1783 "ThumbnailCache.c" } #line 280 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" result = _tmp0_; #line 280 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 1653 "ThumbnailCache.c" +#line 1789 "ThumbnailCache.c" } -void thumbnail_cache_rotate (ThumbnailSource* source, Rotation rotation, GError** error) { +void +thumbnail_cache_rotate (ThumbnailSource* source, + Rotation rotation, + GError** error) +{ ThumbnailCacheSize* _tmp0_; gint _tmp0__length1; GError * _inner_error_ = NULL; @@ -1663,7 +1803,7 @@ void thumbnail_cache_rotate (ThumbnailSource* source, Rotation rotation, GError* _tmp0_ = thumbnail_cache_ALL_SIZES; #line 284 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0__length1 = thumbnail_cache_ALL_SIZES_length1; -#line 1667 "ThumbnailCache.c" +#line 1807 "ThumbnailCache.c" { ThumbnailCacheSize* size_collection = NULL; gint size_collection_length1 = 0; @@ -1675,56 +1815,47 @@ void thumbnail_cache_rotate (ThumbnailSource* source, Rotation rotation, GError* size_collection_length1 = _tmp0__length1; #line 284 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" for (size_it = 0; size_it < _tmp0__length1; size_it = size_it + 1) { -#line 1679 "ThumbnailCache.c" +#line 1819 "ThumbnailCache.c" ThumbnailCacheSize size = 0; #line 284 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" size = size_collection[size_it]; -#line 1683 "ThumbnailCache.c" +#line 1823 "ThumbnailCache.c" { GdkPixbuf* thumbnail = NULL; - ThumbnailSource* _tmp1_; - ThumbnailCacheSize _tmp2_; + ThumbnailCacheSize _tmp1_; + GdkPixbuf* _tmp2_; GdkPixbuf* _tmp3_; - Rotation _tmp4_; - GdkPixbuf* _tmp5_; + GdkPixbuf* _tmp4_; + ThumbnailCacheSize _tmp5_; GdkPixbuf* _tmp6_; - ThumbnailSource* _tmp7_; - ThumbnailCacheSize _tmp8_; - GdkPixbuf* _tmp9_; #line 285 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = source; -#line 285 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = size; + _tmp1_ = size; #line 285 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = thumbnail_cache_fetch (_tmp1_, (gint) _tmp2_, &_inner_error_); + _tmp2_ = thumbnail_cache_fetch (source, (gint) _tmp1_, &_inner_error_); #line 285 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail = _tmp3_; + thumbnail = _tmp2_; #line 285 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 285 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_propagate_error (error, _inner_error_); #line 285 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 1709 "ThumbnailCache.c" +#line 1844 "ThumbnailCache.c" } #line 286 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = rotation; + _tmp3_ = thumbnail; #line 286 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = thumbnail; -#line 286 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = rotation_perform (_tmp4_, _tmp5_); + _tmp4_ = rotation_perform (rotation, _tmp3_); #line 286 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (thumbnail); #line 286 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail = _tmp6_; -#line 287 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = source; + thumbnail = _tmp4_; #line 287 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = size; + _tmp5_ = size; #line 287 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp9_ = thumbnail; + _tmp6_ = thumbnail; #line 287 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail_cache_replace (_tmp7_, _tmp8_, _tmp9_, &_inner_error_); + thumbnail_cache_replace (source, _tmp5_, _tmp6_, &_inner_error_); #line 287 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 287 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1733,18 +1864,24 @@ void thumbnail_cache_rotate (ThumbnailSource* source, Rotation rotation, GError* _g_object_unref0 (thumbnail); #line 287 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 1737 "ThumbnailCache.c" +#line 1868 "ThumbnailCache.c" } #line 284 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (thumbnail); -#line 1741 "ThumbnailCache.c" +#line 1872 "ThumbnailCache.c" } } } } -void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader* reader, Orientation orientation, Dimensions* original_dim, GError** error) { +void +thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, + PhotoFileReader* reader, + Orientation orientation, + Dimensions* original_dim, + GError** error) +{ ThumbnailCacheSize max_size = 0; Dimensions dim = {0}; ThumbnailCacheSize _tmp0_; @@ -1752,14 +1889,13 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader Dimensions _tmp2_; Dimensions _tmp3_ = {0}; GdkPixbuf* largest_thumbnail = NULL; - Orientation _tmp14_; - GdkPixbuf* _tmp15_; - GdkPixbuf* _tmp16_; + GdkPixbuf* _tmp12_; + GdkPixbuf* _tmp13_; Dimensions largest_thumb_dimensions = {0}; - GdkPixbuf* _tmp17_; - Dimensions _tmp18_ = {0}; - ThumbnailCacheSize* _tmp19_; - gint _tmp19__length1; + GdkPixbuf* _tmp14_; + Dimensions _tmp15_ = {0}; + ThumbnailCacheSize* _tmp16_; + gint _tmp16__length1; GError * _inner_error_ = NULL; #line 293 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAILS (thumbnails)); @@ -1781,79 +1917,73 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader dim = _tmp3_; #line 298 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" largest_thumbnail = NULL; -#line 1785 "ThumbnailCache.c" +#line 1921 "ThumbnailCache.c" { GdkPixbuf* _tmp4_ = NULL; - PhotoFileReader* _tmp5_; + Dimensions _tmp5_; Dimensions _tmp6_; - Dimensions _tmp7_; + GdkPixbuf* _tmp7_; GdkPixbuf* _tmp8_; - GdkPixbuf* _tmp9_; -#line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = reader; #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = *original_dim; + _tmp5_ = *original_dim; #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = dim; + _tmp6_ = dim; #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = photo_file_reader_scaled_read (_tmp5_, &_tmp6_, &_tmp7_, &_inner_error_); + _tmp7_ = photo_file_reader_scaled_read (reader, &_tmp5_, &_tmp6_, &_inner_error_); #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = _tmp8_; + _tmp4_ = _tmp7_; #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1805 "ThumbnailCache.c" +#line 1938 "ThumbnailCache.c" goto __catch248_g_error; } #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp9_ = _tmp4_; + _tmp8_ = _tmp4_; #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp4_ = NULL; #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (largest_thumbnail); #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - largest_thumbnail = _tmp9_; + largest_thumbnail = _tmp8_; #line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (_tmp4_); -#line 1818 "ThumbnailCache.c" +#line 1951 "ThumbnailCache.c" } goto __finally248; __catch248_g_error: { GError* err = NULL; - GdkPixbuf* _tmp10_ = NULL; - PhotoFileReader* _tmp11_; - GdkPixbuf* _tmp12_; - GdkPixbuf* _tmp13_; + GdkPixbuf* _tmp9_ = NULL; + GdkPixbuf* _tmp10_; + GdkPixbuf* _tmp11_; #line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" err = _inner_error_; #line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _inner_error_ = NULL; #line 305 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp11_ = reader; + _tmp10_ = photo_file_reader_unscaled_read (reader, &_inner_error_); #line 305 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp12_ = photo_file_reader_unscaled_read (_tmp11_, &_inner_error_); -#line 305 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp10_ = _tmp12_; + _tmp9_ = _tmp10_; #line 305 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 305 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_error_free0 (err); -#line 1842 "ThumbnailCache.c" +#line 1972 "ThumbnailCache.c" goto __finally248; } #line 305 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp13_ = _tmp10_; + _tmp11_ = _tmp9_; #line 305 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp10_ = NULL; + _tmp9_ = NULL; #line 305 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (largest_thumbnail); #line 305 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - largest_thumbnail = _tmp13_; + largest_thumbnail = _tmp11_; #line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp9_); #line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_error_free0 (err); -#line 1857 "ThumbnailCache.c" +#line 1987 "ThumbnailCache.c" } __finally248: #line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1864,102 +1994,100 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader _g_object_unref0 (largest_thumbnail); #line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 1868 "ThumbnailCache.c" +#line 1998 "ThumbnailCache.c" } #line 307 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp14_ = orientation; + _tmp12_ = largest_thumbnail; #line 307 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp15_ = largest_thumbnail; -#line 307 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp16_ = orientation_rotate_pixbuf (_tmp14_, _tmp15_); + _tmp13_ = orientation_rotate_pixbuf (orientation, _tmp12_); #line 307 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (largest_thumbnail); #line 307 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - largest_thumbnail = _tmp16_; + largest_thumbnail = _tmp13_; #line 308 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp17_ = largest_thumbnail; + _tmp14_ = largest_thumbnail; #line 308 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - dimensions_for_pixbuf (_tmp17_, &_tmp18_); + dimensions_for_pixbuf (_tmp14_, &_tmp15_); #line 308 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - largest_thumb_dimensions = _tmp18_; + largest_thumb_dimensions = _tmp15_; #line 310 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp19_ = thumbnail_cache_ALL_SIZES; + _tmp16_ = thumbnail_cache_ALL_SIZES; #line 310 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp19__length1 = thumbnail_cache_ALL_SIZES_length1; -#line 1890 "ThumbnailCache.c" + _tmp16__length1 = thumbnail_cache_ALL_SIZES_length1; +#line 2018 "ThumbnailCache.c" { ThumbnailCacheSize* size_collection = NULL; gint size_collection_length1 = 0; gint _size_collection_size_ = 0; gint size_it = 0; #line 310 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - size_collection = _tmp19_; + size_collection = _tmp16_; #line 310 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - size_collection_length1 = _tmp19__length1; + size_collection_length1 = _tmp16__length1; #line 310 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - for (size_it = 0; size_it < _tmp19__length1; size_it = size_it + 1) { -#line 1902 "ThumbnailCache.c" + for (size_it = 0; size_it < _tmp16__length1; size_it = size_it + 1) { +#line 2030 "ThumbnailCache.c" ThumbnailCacheSize size = 0; #line 310 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" size = size_collection[size_it]; -#line 1906 "ThumbnailCache.c" +#line 2034 "ThumbnailCache.c" { - ThumbnailCacheSize _tmp20_; - Scaling _tmp21_ = {0}; - Dimensions _tmp22_; - Dimensions _tmp23_ = {0}; - Thumbnails* _tmp24_; - ThumbnailCacheSize _tmp25_; - GdkPixbuf* _tmp26_; - Dimensions _tmp27_; - gint _tmp28_; - Dimensions _tmp29_; - gint _tmp30_; - GdkPixbuf* _tmp31_; - GdkPixbuf* _tmp32_; + ThumbnailCacheSize _tmp17_; + Scaling _tmp18_ = {0}; + Dimensions _tmp19_; + Dimensions _tmp20_ = {0}; + ThumbnailCacheSize _tmp21_; + GdkPixbuf* _tmp22_; + Dimensions _tmp23_; + gint _tmp24_; + Dimensions _tmp25_; + gint _tmp26_; + GdkPixbuf* _tmp27_; + GdkPixbuf* _tmp28_; #line 311 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp20_ = size; + _tmp17_ = size; #line 311 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail_cache_size_get_scaling (_tmp20_, &_tmp21_); + thumbnail_cache_size_get_scaling (_tmp17_, &_tmp18_); #line 311 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp22_ = largest_thumb_dimensions; + _tmp19_ = largest_thumb_dimensions; #line 311 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - scaling_get_scaled_dimensions (&_tmp21_, &_tmp22_, &_tmp23_); + scaling_get_scaled_dimensions (&_tmp18_, &_tmp19_, &_tmp20_); #line 311 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - dim = _tmp23_; -#line 312 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp24_ = thumbnails; + dim = _tmp20_; #line 312 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp25_ = size; + _tmp21_ = size; #line 312 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp26_ = largest_thumbnail; + _tmp22_ = largest_thumbnail; #line 312 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp27_ = dim; + _tmp23_ = dim; #line 312 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp28_ = _tmp27_.width; + _tmp24_ = _tmp23_.width; #line 312 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp29_ = dim; + _tmp25_ = dim; #line 312 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp30_ = _tmp29_.height; + _tmp26_ = _tmp25_.height; #line 312 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp31_ = gdk_pixbuf_scale_simple (_tmp26_, _tmp28_, _tmp30_, GDK_INTERP_HYPER); + _tmp27_ = gdk_pixbuf_scale_simple (_tmp22_, _tmp24_, _tmp26_, GDK_INTERP_HYPER); #line 312 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp32_ = _tmp31_; + _tmp28_ = _tmp27_; #line 312 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnails_set (_tmp24_, _tmp25_, _tmp32_); + thumbnails_set (thumbnails, _tmp21_, _tmp28_); #line 312 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_object_unref0 (_tmp32_); -#line 1953 "ThumbnailCache.c" + _g_object_unref0 (_tmp28_); +#line 2078 "ThumbnailCache.c" } } } #line 293 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (largest_thumbnail); -#line 1959 "ThumbnailCache.c" +#line 2084 "ThumbnailCache.c" } -void thumbnail_cache_generate_for_video_frame (Thumbnails* thumbnails, GdkPixbuf* preview_frame) { +void +thumbnail_cache_generate_for_video_frame (Thumbnails* thumbnails, + GdkPixbuf* preview_frame) +{ ThumbnailCacheSize* _tmp0_; gint _tmp0__length1; #line 316 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1970,7 +2098,7 @@ void thumbnail_cache_generate_for_video_frame (Thumbnails* thumbnails, GdkPixbuf _tmp0_ = thumbnail_cache_ALL_SIZES; #line 317 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0__length1 = thumbnail_cache_ALL_SIZES_length1; -#line 1974 "ThumbnailCache.c" +#line 2102 "ThumbnailCache.c" { ThumbnailCacheSize* size_collection = NULL; gint size_collection_length1 = 0; @@ -1982,21 +2110,19 @@ void thumbnail_cache_generate_for_video_frame (Thumbnails* thumbnails, GdkPixbuf size_collection_length1 = _tmp0__length1; #line 317 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" for (size_it = 0; size_it < _tmp0__length1; size_it = size_it + 1) { -#line 1986 "ThumbnailCache.c" +#line 2114 "ThumbnailCache.c" ThumbnailCacheSize size = 0; #line 317 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" size = size_collection[size_it]; -#line 1990 "ThumbnailCache.c" +#line 2118 "ThumbnailCache.c" { Scaling current_scaling = {0}; ThumbnailCacheSize _tmp1_; Scaling _tmp2_ = {0}; GdkPixbuf* current_thumbnail = NULL; GdkPixbuf* _tmp3_; - GdkPixbuf* _tmp4_; - Thumbnails* _tmp5_; - ThumbnailCacheSize _tmp6_; - GdkPixbuf* _tmp7_; + ThumbnailCacheSize _tmp4_; + GdkPixbuf* _tmp5_; #line 318 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp1_ = size; #line 318 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2004,106 +2130,97 @@ void thumbnail_cache_generate_for_video_frame (Thumbnails* thumbnails, GdkPixbuf #line 318 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" current_scaling = _tmp2_; #line 319 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = preview_frame; + _tmp3_ = scaling_perform_on_pixbuf (¤t_scaling, preview_frame, GDK_INTERP_HYPER, TRUE); #line 319 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = scaling_perform_on_pixbuf (¤t_scaling, _tmp3_, GDK_INTERP_HYPER, TRUE); -#line 319 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - current_thumbnail = _tmp4_; -#line 321 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = thumbnails; + current_thumbnail = _tmp3_; #line 321 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = size; + _tmp4_ = size; #line 321 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = current_thumbnail; + _tmp5_ = current_thumbnail; #line 321 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnails_set (_tmp5_, _tmp6_, _tmp7_); + thumbnails_set (thumbnails, _tmp4_, _tmp5_); #line 317 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (current_thumbnail); -#line 2023 "ThumbnailCache.c" +#line 2145 "ThumbnailCache.c" } } } } -static void thumbnail_cache_schedule_debug (void) { +static void +thumbnail_cache_schedule_debug (void) +{ } -static void thumbnail_cache_report_cycle (void) { +static void +thumbnail_cache_report_cycle (void) +{ } -static GdkPixbuf* _thumbnail_cache_fetch (ThumbnailCache* self, ThumbnailSource* source, GError** error) { +static GdkPixbuf* +_thumbnail_cache_fetch (ThumbnailCache* self, + ThumbnailSource* source, + GError** error) +{ GdkPixbuf* result = NULL; GdkPixbuf* pixbuf = NULL; - ThumbnailSource* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; + GdkPixbuf* _tmp2_; GdkPixbuf* _tmp3_; GdkPixbuf* _tmp4_; - GdkPixbuf* _tmp5_; - GdkPixbuf* _tmp6_ = NULL; - ThumbnailSource* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - ThumbnailSource* _tmp10_; - PhotoFileFormat _tmp11_; - GdkPixbuf* _tmp12_; - GdkPixbuf* _tmp13_; + GdkPixbuf* _tmp5_ = NULL; + gchar* _tmp6_; + gchar* _tmp7_; + GdkPixbuf* _tmp8_; + GdkPixbuf* _tmp9_; + GdkPixbuf* _tmp10_; + gint _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; GdkPixbuf* _tmp14_; - gint _tmp15_; - ThumbnailSource* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; - GdkPixbuf* _tmp19_; GError * _inner_error_ = NULL; #line 371 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), NULL); #line 371 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_SOURCE (source), NULL); #line 373 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = source; -#line 373 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource)); + _tmp0_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #line 373 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 373 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = thumbnail_cache_fetch_from_memory (self, _tmp2_); + _tmp2_ = thumbnail_cache_fetch_from_memory (self, _tmp1_); #line 373 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 373 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 373 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - pixbuf = _tmp4_; + pixbuf = _tmp3_; #line 374 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = pixbuf; + _tmp4_ = pixbuf; #line 374 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (_tmp5_ != NULL) { + if (_tmp4_ != NULL) { #line 375 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" result = pixbuf; #line 375 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 2088 "ThumbnailCache.c" +#line 2211 "ThumbnailCache.c" } #line 377 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = source; -#line 377 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource)); + _tmp6_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #line 377 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp9_ = _tmp8_; -#line 377 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp10_ = source; -#line 377 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp11_ = thumbnail_source_get_preferred_thumbnail_format (_tmp10_); + _tmp7_ = _tmp6_; #line 377 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp12_ = thumbnail_cache_read_pixbuf (self, _tmp9_, _tmp11_, &_inner_error_); + _tmp8_ = thumbnail_cache_read_pixbuf (self, _tmp7_, thumbnail_source_get_preferred_thumbnail_format (source), &_inner_error_); #line 377 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp13_ = _tmp12_; + _tmp9_ = _tmp8_; #line 377 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp7_); #line 377 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = _tmp13_; + _tmp5_ = _tmp9_; #line 377 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 377 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2112,64 +2229,65 @@ static GdkPixbuf* _thumbnail_cache_fetch (ThumbnailCache* self, ThumbnailSource* _g_object_unref0 (pixbuf); #line 377 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return NULL; -#line 2116 "ThumbnailCache.c" +#line 2233 "ThumbnailCache.c" } #line 377 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp14_ = _tmp6_; + _tmp10_ = _tmp5_; #line 377 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = NULL; + _tmp5_ = NULL; #line 377 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (pixbuf); #line 377 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - pixbuf = _tmp14_; + pixbuf = _tmp10_; #line 379 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp15_ = thumbnail_cache_cycle_fetched_thumbnails; + _tmp11_ = thumbnail_cache_cycle_fetched_thumbnails; #line 379 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail_cache_cycle_fetched_thumbnails = _tmp15_ + 1; + thumbnail_cache_cycle_fetched_thumbnails = _tmp11_ + 1; #line 380 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_schedule_debug (); #line 383 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp16_ = source; -#line 383 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp17_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource)); + _tmp12_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #line 383 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp18_ = _tmp17_; + _tmp13_ = _tmp12_; #line 383 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp19_ = pixbuf; + _tmp14_ = pixbuf; #line 383 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail_cache_store_in_memory (self, _tmp18_, _tmp19_); + thumbnail_cache_store_in_memory (self, _tmp13_, _tmp14_); #line 383 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp13_); #line 385 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" result = pixbuf; #line 385 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp5_); #line 385 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 2150 "ThumbnailCache.c" +#line 2265 "ThumbnailCache.c" } -static void _thumbnail_cache_fetch_async (ThumbnailCache* self, ThumbnailSource* source, PhotoFileFormat format, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable) { +static void +_thumbnail_cache_fetch_async (ThumbnailCache* self, + ThumbnailSource* source, + PhotoFileFormat format, + Dimensions* dim, + GdkInterpType interp, + ThumbnailCacheAsyncFetchCallback callback, + void* callback_target, + GCancellable* cancellable) +{ gchar* thumbnail_name = NULL; - ThumbnailSource* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; GdkPixbuf* pixbuf = NULL; - const gchar* _tmp2_; - GdkPixbuf* _tmp3_; - gboolean _tmp4_ = FALSE; - GdkPixbuf* _tmp5_; - Workers* _tmp17_; - const gchar* _tmp18_; - ThumbnailSource* _tmp19_; - GdkPixbuf* _tmp20_; - Dimensions _tmp21_; - GdkInterpType _tmp22_; - ThumbnailCacheAsyncFetchCallback _tmp23_; - void* _tmp23__target; - GCancellable* _tmp24_; - ThumbnailCacheAsyncFetchJob* _tmp25_; - ThumbnailCacheAsyncFetchJob* _tmp26_; + const gchar* _tmp1_; + GdkPixbuf* _tmp2_; + gboolean _tmp3_ = FALSE; + GdkPixbuf* _tmp4_; + Workers* _tmp12_; + const gchar* _tmp13_; + GdkPixbuf* _tmp14_; + Dimensions _tmp15_; + ThumbnailCacheAsyncFetchJob* _tmp16_; + ThumbnailCacheAsyncFetchJob* _tmp17_; #line 388 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_CACHE (self)); #line 388 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2179,217 +2297,193 @@ static void _thumbnail_cache_fetch_async (ThumbnailCache* self, ThumbnailSource* #line 388 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable)); #line 391 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = source; + _tmp0_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #line 391 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource)); -#line 391 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail_name = _tmp1_; + thumbnail_name = _tmp0_; #line 392 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = thumbnail_name; + _tmp1_ = thumbnail_name; #line 392 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = thumbnail_cache_fetch_from_memory (self, _tmp2_); + _tmp2_ = thumbnail_cache_fetch_from_memory (self, _tmp1_); #line 392 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - pixbuf = _tmp3_; -#line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = pixbuf; + pixbuf = _tmp2_; #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (_tmp5_ != NULL) { -#line 2198 "ThumbnailCache.c" - gboolean _tmp6_ = FALSE; - gboolean _tmp7_; + _tmp4_ = pixbuf; #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = dimensions_has_area (dim); + if (_tmp4_ != NULL) { +#line 2314 "ThumbnailCache.c" + gboolean _tmp5_ = FALSE; #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (!_tmp7_) { + if (!dimensions_has_area (dim)) { #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = TRUE; -#line 2207 "ThumbnailCache.c" + _tmp5_ = TRUE; +#line 2320 "ThumbnailCache.c" } else { - GdkPixbuf* _tmp8_; - Dimensions _tmp9_ = {0}; - Dimensions _tmp10_; - gboolean _tmp11_; -#line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = pixbuf; + GdkPixbuf* _tmp6_; + Dimensions _tmp7_ = {0}; + Dimensions _tmp8_; #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - dimensions_for_pixbuf (_tmp8_, &_tmp9_); + _tmp6_ = pixbuf; #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp10_ = *dim; + dimensions_for_pixbuf (_tmp6_, &_tmp7_); #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp11_ = dimensions_equals (&_tmp9_, &_tmp10_); + _tmp8_ = *dim; #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = _tmp11_; -#line 2223 "ThumbnailCache.c" + _tmp5_ = dimensions_equals (&_tmp7_, &_tmp8_); +#line 2333 "ThumbnailCache.c" } #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = _tmp6_; -#line 2227 "ThumbnailCache.c" + _tmp3_ = _tmp5_; +#line 2337 "ThumbnailCache.c" } else { #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = FALSE; -#line 2231 "ThumbnailCache.c" + _tmp3_ = FALSE; +#line 2341 "ThumbnailCache.c" } #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (_tmp4_) { -#line 2235 "ThumbnailCache.c" - ThumbnailCacheAsyncFetchCallback _tmp12_; - void* _tmp12__target; - GdkPixbuf* _tmp13_; - GdkPixbuf* _tmp14_; - Dimensions _tmp15_; - GdkInterpType _tmp16_; -#line 396 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp12_ = callback; -#line 396 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp12__target = callback_target; -#line 396 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp13_ = pixbuf; + if (_tmp3_) { +#line 2345 "ThumbnailCache.c" + GdkPixbuf* _tmp9_; + GdkPixbuf* _tmp10_; + Dimensions _tmp11_; #line 396 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp14_ = pixbuf; + _tmp9_ = pixbuf; #line 396 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp15_ = *dim; + _tmp10_ = pixbuf; #line 396 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp16_ = interp; + _tmp11_ = *dim; #line 396 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp12_ (_tmp13_, _tmp14_, &_tmp15_, _tmp16_, NULL, _tmp12__target); + callback (_tmp9_, _tmp10_, &_tmp11_, interp, NULL, callback_target); #line 398 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (pixbuf); #line 398 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_free0 (thumbnail_name); #line 398 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 2262 "ThumbnailCache.c" +#line 2363 "ThumbnailCache.c" } #line 411 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp17_ = thumbnail_cache_fetch_workers; -#line 411 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp18_ = thumbnail_name; + _tmp12_ = thumbnail_cache_fetch_workers; #line 411 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp19_ = source; + _tmp13_ = thumbnail_name; #line 411 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp20_ = pixbuf; + _tmp14_ = pixbuf; #line 411 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp21_ = *dim; + _tmp15_ = *dim; #line 411 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp22_ = interp; + _tmp16_ = thumbnail_cache_async_fetch_job_new (self, _tmp13_, source, _tmp14_, &_tmp15_, interp, callback, callback_target, cancellable); #line 411 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp23_ = callback; + _tmp17_ = _tmp16_; #line 411 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp23__target = callback_target; + workers_enqueue (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 411 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp24_ = cancellable; -#line 411 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp25_ = thumbnail_cache_async_fetch_job_new (self, _tmp18_, _tmp19_, _tmp20_, &_tmp21_, _tmp22_, _tmp23_, _tmp23__target, _tmp24_); -#line 411 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp26_ = _tmp25_; -#line 411 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - workers_enqueue (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_BACKGROUND_JOB, BackgroundJob)); -#line 411 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _background_job_unref0 (_tmp26_); + _background_job_unref0 (_tmp17_); #line 388 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (pixbuf); #line 388 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_free0 (thumbnail_name); -#line 2294 "ThumbnailCache.c" +#line 2385 "ThumbnailCache.c" } -static gpointer _background_job_ref0 (gpointer self) { +static gpointer +_background_job_ref0 (gpointer self) +{ #line 417 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return self ? background_job_ref (self) : NULL; -#line 2301 "ThumbnailCache.c" +#line 2394 "ThumbnailCache.c" } -static gpointer _g_error_copy0 (gpointer self) { +static gpointer +_g_error_copy0 (gpointer self) +{ #line 425 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return self ? g_error_copy (self) : NULL; -#line 2308 "ThumbnailCache.c" +#line 2403 "ThumbnailCache.c" } -static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* background_job) { +static void +thumbnail_cache_async_fetch_completion_callback (BackgroundJob* background_job) +{ ThumbnailCacheAsyncFetchJob* job = NULL; - BackgroundJob* _tmp0_; - ThumbnailCacheAsyncFetchJob* _tmp1_; - gboolean _tmp2_ = FALSE; - ThumbnailCacheAsyncFetchJob* _tmp3_; - gboolean _tmp4_; - ThumbnailCacheAsyncFetchJob* _tmp17_; - GdkPixbuf* _tmp18_; - ThumbnailCacheAsyncFetchJob* _tmp29_; - ThumbnailCacheAsyncFetchCallback _tmp30_; - void* _tmp30__target; - ThumbnailCacheAsyncFetchJob* _tmp31_; - GdkPixbuf* _tmp32_; - ThumbnailCacheAsyncFetchJob* _tmp33_; - GdkPixbuf* _tmp34_; - ThumbnailCacheAsyncFetchJob* _tmp35_; - Dimensions _tmp36_; - ThumbnailCacheAsyncFetchJob* _tmp37_; - GdkInterpType _tmp38_; - ThumbnailCacheAsyncFetchJob* _tmp39_; - GError* _tmp40_; + ThumbnailCacheAsyncFetchJob* _tmp0_; + gboolean _tmp1_ = FALSE; + ThumbnailCacheAsyncFetchJob* _tmp2_; + gboolean _tmp3_; + ThumbnailCacheAsyncFetchJob* _tmp16_; + GdkPixbuf* _tmp17_; + ThumbnailCacheAsyncFetchJob* _tmp28_; + ThumbnailCacheAsyncFetchCallback _tmp29_; + void* _tmp29__target; + ThumbnailCacheAsyncFetchJob* _tmp30_; + GdkPixbuf* _tmp31_; + ThumbnailCacheAsyncFetchJob* _tmp32_; + GdkPixbuf* _tmp33_; + ThumbnailCacheAsyncFetchJob* _tmp34_; + Dimensions _tmp35_; + ThumbnailCacheAsyncFetchJob* _tmp36_; + GdkInterpType _tmp37_; + ThumbnailCacheAsyncFetchJob* _tmp38_; + GError* _tmp39_; GError * _inner_error_ = NULL; #line 416 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_BACKGROUND_JOB (background_job)); #line 417 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = background_job; -#line 417 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, THUMBNAIL_CACHE_TYPE_ASYNC_FETCH_JOB, ThumbnailCacheAsyncFetchJob)); + _tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (background_job, THUMBNAIL_CACHE_TYPE_ASYNC_FETCH_JOB, ThumbnailCacheAsyncFetchJob)); #line 417 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - job = _tmp1_; + job = _tmp0_; #line 421 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = job; + _tmp2_ = job; #line 421 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = _tmp3_->replace; + _tmp3_ = _tmp2_->replace; #line 421 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (_tmp4_) { -#line 2349 "ThumbnailCache.c" - ThumbnailCacheAsyncFetchJob* _tmp5_; - GdkPixbuf* _tmp6_; + if (_tmp3_) { +#line 2443 "ThumbnailCache.c" + ThumbnailCacheAsyncFetchJob* _tmp4_; + GdkPixbuf* _tmp5_; #line 421 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = job; + _tmp4_ = job; #line 421 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = _tmp5_->unscaled; + _tmp5_ = _tmp4_->unscaled; #line 421 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = _tmp6_ != NULL; -#line 2358 "ThumbnailCache.c" + _tmp1_ = _tmp5_ != NULL; +#line 2452 "ThumbnailCache.c" } else { #line 421 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = FALSE; -#line 2362 "ThumbnailCache.c" + _tmp1_ = FALSE; +#line 2456 "ThumbnailCache.c" } #line 421 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (_tmp2_) { -#line 2366 "ThumbnailCache.c" + if (_tmp1_) { +#line 2460 "ThumbnailCache.c" { - ThumbnailCacheAsyncFetchJob* _tmp7_; - ThumbnailSource* _tmp8_; - ThumbnailCacheAsyncFetchJob* _tmp9_; - ThumbnailCache* _tmp10_; - ThumbnailCacheSize _tmp11_; - ThumbnailCacheAsyncFetchJob* _tmp12_; - GdkPixbuf* _tmp13_; + ThumbnailCacheAsyncFetchJob* _tmp6_; + ThumbnailSource* _tmp7_; + ThumbnailCacheAsyncFetchJob* _tmp8_; + ThumbnailCache* _tmp9_; + ThumbnailCacheSize _tmp10_; + ThumbnailCacheAsyncFetchJob* _tmp11_; + GdkPixbuf* _tmp12_; #line 423 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = job; + _tmp6_ = job; #line 423 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = _tmp7_->source; + _tmp7_ = _tmp6_->source; #line 423 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp9_ = job; + _tmp8_ = job; #line 423 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp10_ = _tmp9_->cache; + _tmp9_ = _tmp8_->cache; #line 423 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp11_ = _tmp10_->priv->size; + _tmp10_ = _tmp9_->priv->size; #line 423 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp12_ = job; + _tmp11_ = job; #line 423 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp13_ = _tmp12_->unscaled; + _tmp12_ = _tmp11_->unscaled; #line 423 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail_cache_replace (_tmp8_, _tmp11_, _tmp13_, &_inner_error_); + thumbnail_cache_replace (_tmp7_, _tmp10_, _tmp12_, &_inner_error_); #line 423 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2393 "ThumbnailCache.c" +#line 2487 "ThumbnailCache.c" goto __catch249_g_error; } } @@ -2397,26 +2491,26 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back __catch249_g_error: { GError* err = NULL; - ThumbnailCacheAsyncFetchJob* _tmp14_; + ThumbnailCacheAsyncFetchJob* _tmp13_; + GError* _tmp14_; GError* _tmp15_; - GError* _tmp16_; #line 422 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" err = _inner_error_; #line 422 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _inner_error_ = NULL; #line 425 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp14_ = job; + _tmp13_ = job; #line 425 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp15_ = err; + _tmp14_ = err; #line 425 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp16_ = _g_error_copy0 (_tmp15_); + _tmp15_ = _g_error_copy0 (_tmp14_); #line 425 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_error_free0 (_tmp14_->err); + _g_error_free0 (_tmp13_->err); #line 425 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp14_->err = _tmp16_; + _tmp13_->err = _tmp15_; #line 422 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_error_free0 (err); -#line 2420 "ThumbnailCache.c" +#line 2514 "ThumbnailCache.c" } __finally249: #line 422 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2429,170 +2523,152 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back g_clear_error (&_inner_error_); #line 422 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 2433 "ThumbnailCache.c" +#line 2527 "ThumbnailCache.c" } } #line 429 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp17_ = job; + _tmp16_ = job; #line 429 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp18_ = _tmp17_->unscaled; + _tmp17_ = _tmp16_->unscaled; #line 429 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (_tmp18_ != NULL) { -#line 2442 "ThumbnailCache.c" - ThumbnailCacheAsyncFetchJob* _tmp19_; - gboolean _tmp20_; + if (_tmp17_ != NULL) { +#line 2536 "ThumbnailCache.c" + ThumbnailCacheAsyncFetchJob* _tmp18_; + gboolean _tmp19_; #line 430 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp19_ = job; + _tmp18_ = job; #line 430 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp20_ = _tmp19_->fetched; + _tmp19_ = _tmp18_->fetched; #line 430 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (_tmp20_) { -#line 2451 "ThumbnailCache.c" - ThumbnailCacheAsyncFetchJob* _tmp21_; - ThumbnailCache* _tmp22_; - ThumbnailCacheAsyncFetchJob* _tmp23_; - const gchar* _tmp24_; - ThumbnailCacheAsyncFetchJob* _tmp25_; - GdkPixbuf* _tmp26_; - gint _tmp27_; + if (_tmp19_) { +#line 2545 "ThumbnailCache.c" + ThumbnailCacheAsyncFetchJob* _tmp20_; + ThumbnailCache* _tmp21_; + ThumbnailCacheAsyncFetchJob* _tmp22_; + const gchar* _tmp23_; + ThumbnailCacheAsyncFetchJob* _tmp24_; + GdkPixbuf* _tmp25_; + gint _tmp26_; #line 432 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp21_ = job; + _tmp20_ = job; #line 432 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp22_ = _tmp21_->cache; + _tmp21_ = _tmp20_->cache; #line 432 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp23_ = job; + _tmp22_ = job; #line 432 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp24_ = _tmp23_->thumbnail_name; + _tmp23_ = _tmp22_->thumbnail_name; #line 432 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp25_ = job; + _tmp24_ = job; #line 432 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp26_ = _tmp25_->unscaled; + _tmp25_ = _tmp24_->unscaled; #line 432 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail_cache_store_in_memory (_tmp22_, _tmp24_, _tmp26_); + thumbnail_cache_store_in_memory (_tmp21_, _tmp23_, _tmp25_); #line 434 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp27_ = thumbnail_cache_cycle_async_fetched_thumbnails; + _tmp26_ = thumbnail_cache_cycle_async_fetched_thumbnails; #line 434 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail_cache_cycle_async_fetched_thumbnails = _tmp27_ + 1; + thumbnail_cache_cycle_async_fetched_thumbnails = _tmp26_ + 1; #line 435 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_schedule_debug (); -#line 2479 "ThumbnailCache.c" +#line 2573 "ThumbnailCache.c" } else { - gint _tmp28_; + gint _tmp27_; #line 437 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp28_ = thumbnail_cache_cycle_async_resized_thumbnails; + _tmp27_ = thumbnail_cache_cycle_async_resized_thumbnails; #line 437 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail_cache_cycle_async_resized_thumbnails = _tmp28_ + 1; + thumbnail_cache_cycle_async_resized_thumbnails = _tmp27_ + 1; #line 438 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_schedule_debug (); -#line 2488 "ThumbnailCache.c" +#line 2582 "ThumbnailCache.c" } } #line 442 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp29_ = job; + _tmp28_ = job; #line 442 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp30_ = _tmp29_->callback; + _tmp29_ = _tmp28_->callback; #line 442 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp30__target = _tmp29_->callback_target; + _tmp29__target = _tmp28_->callback_target; #line 442 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp31_ = job; + _tmp30_ = job; #line 442 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp32_ = _tmp31_->scaled; + _tmp31_ = _tmp30_->scaled; #line 442 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp33_ = job; + _tmp32_ = job; #line 442 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp34_ = _tmp33_->unscaled; + _tmp33_ = _tmp32_->unscaled; #line 442 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp35_ = job; + _tmp34_ = job; #line 442 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp36_ = _tmp35_->dim; + _tmp35_ = _tmp34_->dim; #line 442 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp37_ = job; + _tmp36_ = job; #line 442 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp38_ = _tmp37_->interp; + _tmp37_ = _tmp36_->interp; #line 442 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp39_ = job; + _tmp38_ = job; #line 442 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp40_ = _tmp39_->err; + _tmp39_ = _tmp38_->err; #line 442 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp30_ (_tmp32_, _tmp34_, &_tmp36_, _tmp38_, _tmp40_, _tmp30__target); + _tmp29_ (_tmp31_, _tmp33_, &_tmp35_, _tmp37_, _tmp39_, _tmp29__target); #line 416 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _background_job_unref0 (job); -#line 2521 "ThumbnailCache.c" +#line 2615 "ThumbnailCache.c" } -static void _thumbnail_cache_import_from_source (ThumbnailCache* self, ThumbnailSource* source, gboolean force, GError** error) { +static void +_thumbnail_cache_import_from_source (ThumbnailCache* self, + ThumbnailSource* source, + gboolean force, + GError** error) +{ GFile* file = NULL; - ThumbnailSource* _tmp0_; - GFile* _tmp1_; - gboolean _tmp2_; + GFile* _tmp0_; LibraryPhoto* photo = NULL; - ThumbnailSource* _tmp6_; - LibraryPhoto* _tmp7_; - GdkPixbuf* _tmp8_ = NULL; - LibraryPhoto* _tmp9_; - ThumbnailCacheSize _tmp10_; - gint _tmp11_; - Scaling _tmp12_ = {0}; - GdkPixbuf* _tmp13_; - GFile* _tmp14_; - ThumbnailSource* _tmp15_; + LibraryPhoto* _tmp1_; + GdkPixbuf* _tmp2_ = NULL; + LibraryPhoto* _tmp3_; + ThumbnailCacheSize _tmp4_; + Scaling _tmp5_ = {0}; + GdkPixbuf* _tmp6_; + GFile* _tmp7_; GError * _inner_error_ = NULL; #line 445 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_CACHE (self)); #line 445 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (source)); #line 447 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = source; -#line 447 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = thumbnail_cache_get_source_cached_file (self, _tmp0_); + _tmp0_ = thumbnail_cache_get_source_cached_file (self, source); #line 447 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - file = _tmp1_; + file = _tmp0_; #line 451 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = force; -#line 451 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (!_tmp2_) { -#line 2556 "ThumbnailCache.c" - ThumbnailSource* _tmp3_; - gboolean _tmp4_; -#line 452 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = source; + if (!force) { #line 452 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = _thumbnail_cache_exists (self, _tmp3_); -#line 452 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (_tmp4_) { + if (_thumbnail_cache_exists (self, source)) { #line 453 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (file); #line 453 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 2569 "ThumbnailCache.c" +#line 2652 "ThumbnailCache.c" } } else { - ThumbnailSource* _tmp5_; -#line 456 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = source; #line 456 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _thumbnail_cache_remove (self, _tmp5_); -#line 2577 "ThumbnailCache.c" + _thumbnail_cache_remove (self, source); +#line 2657 "ThumbnailCache.c" } #line 459 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = source; + _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 459 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 459 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - photo = _tmp7_; -#line 460 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp9_ = photo; + photo = _tmp1_; #line 460 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp10_ = self->priv->size; + _tmp3_ = photo; #line 460 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp11_ = thumbnail_cache_size_get_scale (_tmp10_); + _tmp4_ = self->priv->size; #line 460 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - scaling_for_best_fit (_tmp11_, TRUE, &_tmp12_); + scaling_for_best_fit (thumbnail_cache_size_get_scale (_tmp4_), TRUE, &_tmp5_); #line 460 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp13_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp12_, &_inner_error_); + _tmp6_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp5_, &_inner_error_); #line 460 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = _tmp13_; + _tmp2_ = _tmp6_; #line 460 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 460 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2603,51 +2679,47 @@ static void _thumbnail_cache_import_from_source (ThumbnailCache* self, Thumbnail _g_object_unref0 (file); #line 460 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 2607 "ThumbnailCache.c" +#line 2683 "ThumbnailCache.c" } #line 460 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp14_ = file; -#line 460 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp15_ = source; + _tmp7_ = file; #line 460 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail_cache_save_thumbnail (self, _tmp14_, _tmp8_, _tmp15_, &_inner_error_); + thumbnail_cache_save_thumbnail (self, _tmp7_, _tmp2_, source, &_inner_error_); #line 460 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 460 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_propagate_error (error, _inner_error_); #line 460 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp2_); #line 460 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (photo); #line 460 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (file); #line 460 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 2627 "ThumbnailCache.c" +#line 2701 "ThumbnailCache.c" } #line 445 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp2_); #line 445 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (photo); #line 445 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (file); -#line 2635 "ThumbnailCache.c" +#line 2709 "ThumbnailCache.c" } -static void _thumbnail_cache_import_thumbnail (ThumbnailCache* self, ThumbnailSource* source, GdkPixbuf* scaled, gboolean force, GError** error) { - GdkPixbuf* _tmp0_; - GdkPixbuf* _tmp1_; - Dimensions _tmp2_ = {0}; - ThumbnailCacheSize _tmp3_; - gint _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; - ThumbnailSource* _tmp10_; - GFile* _tmp11_; - GFile* _tmp12_; - GdkPixbuf* _tmp13_; - ThumbnailSource* _tmp14_; +static void +_thumbnail_cache_import_thumbnail (ThumbnailCache* self, + ThumbnailSource* source, + GdkPixbuf* scaled, + gboolean force, + GError** error) +{ + Dimensions _tmp0_ = {0}; + ThumbnailCacheSize _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; GError * _inner_error_ = NULL; #line 466 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_CACHE (self)); @@ -2656,83 +2728,57 @@ static void _thumbnail_cache_import_thumbnail (ThumbnailCache* self, ThumbnailSo #line 466 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail ((scaled == NULL) || GDK_IS_PIXBUF (scaled)); #line 468 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = scaled; -#line 468 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _vala_assert (_tmp0_ != NULL, "scaled != null"); + _vala_assert (scaled != NULL, "scaled != null"); #line 469 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = scaled; + dimensions_for_pixbuf (scaled, &_tmp0_); #line 469 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - dimensions_for_pixbuf (_tmp1_, &_tmp2_); -#line 469 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = self->priv->size; + _tmp1_ = self->priv->size; #line 469 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = thumbnail_cache_size_get_scale (_tmp3_); -#line 469 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = dimensions_approx_scaled (&_tmp2_, _tmp4_, 1); -#line 469 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _vala_assert (_tmp5_, "Dimensions.for_pixbuf(scaled).approx_scaled(size.get_scale())"); + _vala_assert (dimensions_approx_scaled (&_tmp0_, thumbnail_cache_size_get_scale (_tmp1_), 1), "Dimensions.for_pixbuf(scaled).approx_scaled(size.get_scale())"); #line 473 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = force; -#line 473 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (!_tmp6_) { -#line 2679 "ThumbnailCache.c" - ThumbnailSource* _tmp7_; - gboolean _tmp8_; -#line 474 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = source; + if (!force) { #line 474 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = _thumbnail_cache_exists (self, _tmp7_); -#line 474 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (_tmp8_) { + if (_thumbnail_cache_exists (self, source)) { #line 475 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 2690 "ThumbnailCache.c" +#line 2745 "ThumbnailCache.c" } } else { - ThumbnailSource* _tmp9_; -#line 478 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp9_ = source; #line 478 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _thumbnail_cache_remove (self, _tmp9_); -#line 2698 "ThumbnailCache.c" + _thumbnail_cache_remove (self, source); +#line 2750 "ThumbnailCache.c" } #line 481 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp10_ = source; -#line 481 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp11_ = thumbnail_cache_get_source_cached_file (self, _tmp10_); -#line 481 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp12_ = _tmp11_; -#line 481 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp13_ = scaled; + _tmp2_ = thumbnail_cache_get_source_cached_file (self, source); #line 481 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp14_ = source; + _tmp3_ = _tmp2_; #line 481 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail_cache_save_thumbnail (self, _tmp12_, _tmp13_, _tmp14_, &_inner_error_); + thumbnail_cache_save_thumbnail (self, _tmp3_, scaled, source, &_inner_error_); #line 481 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp3_); #line 481 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 481 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_propagate_error (error, _inner_error_); #line 481 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 2720 "ThumbnailCache.c" +#line 2766 "ThumbnailCache.c" } } -static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* src_source, ThumbnailSource* dest_source) { +static void +_thumbnail_cache_duplicate (ThumbnailCache* self, + ThumbnailSource* src_source, + ThumbnailSource* dest_source) +{ GFile* src_file = NULL; - ThumbnailSource* _tmp0_; - GFile* _tmp1_; + GFile* _tmp0_; GFile* dest_file = NULL; - ThumbnailSource* _tmp2_; - gchar* _tmp3_; - gchar* _tmp4_; - ThumbnailSource* _tmp5_; - PhotoFileFormat _tmp6_; - GFile* _tmp7_; - GFile* _tmp8_; + gchar* _tmp1_; + gchar* _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; GError * _inner_error_ = NULL; #line 488 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_CACHE (self)); @@ -2741,36 +2787,28 @@ static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* s #line 488 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (dest_source)); #line 489 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = src_source; -#line 489 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = thumbnail_cache_get_source_cached_file (self, _tmp0_); + _tmp0_ = thumbnail_cache_get_source_cached_file (self, src_source); #line 489 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - src_file = _tmp1_; + src_file = _tmp0_; #line 490 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = dest_source; + _tmp1_ = thumbnail_source_get_representative_id (dest_source); #line 490 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = thumbnail_source_get_representative_id (_tmp2_); -#line 490 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = _tmp3_; -#line 490 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = src_source; -#line 490 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = thumbnail_source_get_preferred_thumbnail_format (_tmp5_); + _tmp2_ = _tmp1_; #line 490 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = thumbnail_cache_get_cached_file (self, _tmp4_, _tmp6_); + _tmp3_ = thumbnail_cache_get_cached_file (self, _tmp2_, thumbnail_source_get_preferred_thumbnail_format (src_source)); #line 490 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = _tmp7_; + _tmp4_ = _tmp3_; #line 490 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp2_); #line 490 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - dest_file = _tmp8_; -#line 2768 "ThumbnailCache.c" + dest_file = _tmp4_; +#line 2806 "ThumbnailCache.c" { #line 494 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_file_copy (src_file, dest_file, G_FILE_COPY_ALL_METADATA | G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, &_inner_error_); #line 494 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2774 "ThumbnailCache.c" +#line 2812 "ThumbnailCache.c" goto __catch250_g_error; } } @@ -2778,29 +2816,29 @@ static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* s __catch250_g_error: { GError* err = NULL; - GError* _tmp9_; - const gchar* _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; + GError* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; #line 493 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" err = _inner_error_; #line 493 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _inner_error_ = NULL; #line 496 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp9_ = err; + _tmp5_ = err; #line 496 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp10_ = _tmp9_->message; + _tmp6_ = _tmp5_->message; #line 496 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp11_ = g_strdup_printf ("%s", _tmp10_); + _tmp7_ = g_strdup_printf ("%s", _tmp6_); #line 496 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 496 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - app_window_panic (_tmp12_); + app_window_panic (_tmp8_); #line 496 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp8_); #line 493 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_error_free0 (err); -#line 2804 "ThumbnailCache.c" +#line 2842 "ThumbnailCache.c" } __finally250: #line 493 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2815,33 +2853,32 @@ static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* s g_clear_error (&_inner_error_); #line 493 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 2819 "ThumbnailCache.c" +#line 2857 "ThumbnailCache.c" } #line 488 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (dest_file); #line 488 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (src_file); -#line 2825 "ThumbnailCache.c" +#line 2863 "ThumbnailCache.c" } -static void _thumbnail_cache_replace (ThumbnailCache* self, ThumbnailSource* source, GdkPixbuf* original, GError** error) { +static void +_thumbnail_cache_replace (ThumbnailCache* self, + ThumbnailSource* source, + GdkPixbuf* original, + GError** error) +{ GFile* file = NULL; - ThumbnailSource* _tmp0_; - GFile* _tmp1_; - ThumbnailSource* _tmp2_; - gchar* _tmp3_; - gchar* _tmp4_; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; GdkPixbuf* scaled = NULL; + ThumbnailCacheSize _tmp3_; + GdkInterpType _tmp4_; GdkPixbuf* _tmp5_; - ThumbnailCacheSize _tmp6_; - gint _tmp7_; - GdkInterpType _tmp8_; - GdkPixbuf* _tmp9_; - ThumbnailSource* _tmp10_; - ThumbnailSource* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; + gchar* _tmp6_; + gchar* _tmp7_; GError * _inner_error_ = NULL; #line 502 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_CACHE (self)); @@ -2850,37 +2887,27 @@ static void _thumbnail_cache_replace (ThumbnailCache* self, ThumbnailSource* sou #line 502 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (GDK_IS_PIXBUF (original)); #line 503 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = source; -#line 503 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = thumbnail_cache_get_source_cached_file (self, _tmp0_); + _tmp0_ = thumbnail_cache_get_source_cached_file (self, source); #line 503 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - file = _tmp1_; -#line 506 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = source; + file = _tmp0_; #line 506 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource)); + _tmp1_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #line 506 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 506 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail_cache_remove_from_memory (self, _tmp4_); + thumbnail_cache_remove_from_memory (self, _tmp2_); #line 506 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_free0 (_tmp4_); -#line 509 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = original; -#line 509 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = self->priv->size; + _g_free0 (_tmp2_); #line 509 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = thumbnail_cache_size_get_scale (_tmp6_); + _tmp3_ = self->priv->size; #line 509 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = self->priv->interp; + _tmp4_ = self->priv->interp; #line 509 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp9_ = scale_pixbuf (_tmp5_, _tmp7_, _tmp8_, TRUE); + _tmp5_ = scale_pixbuf (original, thumbnail_cache_size_get_scale (_tmp3_), _tmp4_, TRUE); #line 509 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - scaled = _tmp9_; + scaled = _tmp5_; #line 512 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp10_ = source; -#line 512 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail_cache_save_thumbnail (self, file, scaled, _tmp10_, &_inner_error_); + thumbnail_cache_save_thumbnail (self, file, scaled, source, &_inner_error_); #line 512 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 512 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2891,61 +2918,56 @@ static void _thumbnail_cache_replace (ThumbnailCache* self, ThumbnailSource* sou _g_object_unref0 (file); #line 512 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 2895 "ThumbnailCache.c" +#line 2922 "ThumbnailCache.c" } #line 518 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp11_ = source; -#line 518 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp12_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_SOURCE, DataSource)); + _tmp6_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #line 518 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp13_ = _tmp12_; + _tmp7_ = _tmp6_; #line 518 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail_cache_store_in_memory (self, _tmp13_, scaled); + thumbnail_cache_store_in_memory (self, _tmp7_, scaled); #line 518 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp7_); #line 502 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (scaled); #line 502 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (file); -#line 2911 "ThumbnailCache.c" +#line 2936 "ThumbnailCache.c" } -static void _thumbnail_cache_remove (ThumbnailCache* self, ThumbnailSource* source) { +static void +_thumbnail_cache_remove (ThumbnailCache* self, + ThumbnailSource* source) +{ GFile* file = NULL; - ThumbnailSource* _tmp0_; - GFile* _tmp1_; - ThumbnailSource* _tmp2_; - gchar* _tmp3_; - gchar* _tmp4_; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; GError * _inner_error_ = NULL; #line 521 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_CACHE (self)); #line 521 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (source)); #line 522 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = source; -#line 522 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = thumbnail_cache_get_source_cached_file (self, _tmp0_); + _tmp0_ = thumbnail_cache_get_source_cached_file (self, source); #line 522 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - file = _tmp1_; -#line 525 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = source; + file = _tmp0_; #line 525 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource)); + _tmp1_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #line 525 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 525 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail_cache_remove_from_memory (self, _tmp4_); + thumbnail_cache_remove_from_memory (self, _tmp2_); #line 525 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_free0 (_tmp4_); -#line 2943 "ThumbnailCache.c" + _g_free0 (_tmp2_); +#line 2965 "ThumbnailCache.c" { #line 529 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_file_delete (file, NULL, &_inner_error_); #line 529 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2949 "ThumbnailCache.c" +#line 2971 "ThumbnailCache.c" goto __catch251_g_error; } } @@ -2959,7 +2981,7 @@ static void _thumbnail_cache_remove (ThumbnailCache* self, ThumbnailSource* sour _inner_error_ = NULL; #line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_error_free0 (err); -#line 2963 "ThumbnailCache.c" +#line 2985 "ThumbnailCache.c" } __finally251: #line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2972,163 +2994,152 @@ static void _thumbnail_cache_remove (ThumbnailCache* self, ThumbnailSource* sour g_clear_error (&_inner_error_); #line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 2976 "ThumbnailCache.c" +#line 2998 "ThumbnailCache.c" } #line 521 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (file); -#line 2980 "ThumbnailCache.c" +#line 3002 "ThumbnailCache.c" } -static gboolean _thumbnail_cache_exists (ThumbnailCache* self, ThumbnailSource* source) { +static gboolean +_thumbnail_cache_exists (ThumbnailCache* self, + ThumbnailSource* source) +{ gboolean result = FALSE; - ThumbnailSource* _tmp0_; + GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; + gboolean _tmp2_; #line 535 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), FALSE); #line 535 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_SOURCE (source), FALSE); #line 536 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = source; -#line 536 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = thumbnail_cache_get_source_cached_file (self, _tmp0_); -#line 536 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = _tmp1_; + _tmp0_ = thumbnail_cache_get_source_cached_file (self, source); #line 536 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = g_file_query_exists (_tmp2_, NULL); + _tmp1_ = _tmp0_; #line 536 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = _tmp3_; + _tmp2_ = g_file_query_exists (_tmp1_, NULL); #line 536 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 536 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - result = _tmp4_; + result = _tmp2_; #line 536 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 3011 "ThumbnailCache.c" +#line 3030 "ThumbnailCache.c" } -static GdkPixbuf* thumbnail_cache_read_pixbuf (ThumbnailCache* self, const gchar* thumbnail_name, PhotoFileFormat format, GError** error) { +static GdkPixbuf* +thumbnail_cache_read_pixbuf (ThumbnailCache* self, + const gchar* thumbnail_name, + PhotoFileFormat format, + GError** error) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; - PhotoFileFormat _tmp1_; - const gchar* _tmp2_; - PhotoFileFormat _tmp3_; - GFile* _tmp4_; - GFile* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - PhotoFileReader* _tmp8_; - PhotoFileReader* _tmp9_; - GdkPixbuf* _tmp10_; - GdkPixbuf* _tmp11_; - GdkPixbuf* _tmp12_; + GFile* _tmp1_; + GFile* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + PhotoFileReader* _tmp5_; + PhotoFileReader* _tmp6_; + GdkPixbuf* _tmp7_; + GdkPixbuf* _tmp8_; + GdkPixbuf* _tmp9_; GError * _inner_error_ = NULL; #line 540 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), NULL); #line 540 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (thumbnail_name != NULL, NULL); #line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = format; -#line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = thumbnail_name; -#line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = format; -#line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = thumbnail_cache_get_cached_file (self, _tmp2_, _tmp3_); + _tmp1_ = thumbnail_cache_get_cached_file (self, thumbnail_name, format); #line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = g_file_get_path (_tmp5_); + _tmp3_ = g_file_get_path (_tmp2_); #line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = photo_file_format_create_reader (_tmp1_, _tmp7_); + _tmp5_ = photo_file_format_create_reader (format, _tmp4_); #line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp10_ = photo_file_reader_unscaled_read (_tmp9_, &_inner_error_); + _tmp7_ = photo_file_reader_unscaled_read (_tmp6_, &_inner_error_); #line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _photo_file_adapter_unref0 (_tmp9_); + _photo_file_adapter_unref0 (_tmp6_); #line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp4_); #line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp2_); #line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = _tmp11_; + _tmp0_ = _tmp8_; #line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_propagate_error (error, _inner_error_); #line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return NULL; -#line 3071 "ThumbnailCache.c" +#line 3086 "ThumbnailCache.c" } #line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp12_ = _tmp0_; + _tmp9_ = _tmp0_; #line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = NULL; #line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - result = _tmp12_; + result = _tmp9_; #line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (_tmp0_); #line 541 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 3083 "ThumbnailCache.c" +#line 3098 "ThumbnailCache.c" } -static GFile* thumbnail_cache_get_source_cached_file (ThumbnailCache* self, ThumbnailSource* source) { +static GFile* +thumbnail_cache_get_source_cached_file (ThumbnailCache* self, + ThumbnailSource* source) +{ GFile* result = NULL; - ThumbnailSource* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - ThumbnailSource* _tmp3_; - PhotoFileFormat _tmp4_; - GFile* _tmp5_; - GFile* _tmp6_; + GFile* _tmp2_; + GFile* _tmp3_; #line 545 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), NULL); #line 545 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_SOURCE (source), NULL); #line 546 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = source; -#line 546 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = thumbnail_source_get_representative_id (_tmp0_); -#line 546 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = _tmp1_; -#line 546 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = source; + _tmp0_ = thumbnail_source_get_representative_id (source); #line 546 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = thumbnail_source_get_preferred_thumbnail_format (_tmp3_); + _tmp1_ = _tmp0_; #line 546 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = thumbnail_cache_get_cached_file (self, _tmp2_, _tmp4_); + _tmp2_ = thumbnail_cache_get_cached_file (self, _tmp1_, thumbnail_source_get_preferred_thumbnail_format (source)); #line 546 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 546 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 546 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - result = _tmp6_; + result = _tmp3_; #line 546 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 3120 "ThumbnailCache.c" +#line 3129 "ThumbnailCache.c" } -static GFile* thumbnail_cache_get_cached_file (ThumbnailCache* self, const gchar* thumbnail_name, PhotoFileFormat thumbnail_format) { +static GFile* +thumbnail_cache_get_cached_file (ThumbnailCache* self, + const gchar* thumbnail_name, + PhotoFileFormat thumbnail_format) +{ GFile* result = NULL; GFile* _tmp0_; - PhotoFileFormat _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_; - gchar* _tmp4_; - GFile* _tmp5_; - GFile* _tmp6_; + gchar* _tmp1_; + gchar* _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; #line 550 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), NULL); #line 550 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3136,36 +3147,34 @@ static GFile* thumbnail_cache_get_cached_file (ThumbnailCache* self, const gchar #line 551 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = self->priv->cache_dir; #line 551 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = thumbnail_format; + _tmp1_ = photo_file_format_get_default_basename (thumbnail_format, thumbnail_name); #line 551 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = thumbnail_name; + _tmp2_ = _tmp1_; #line 551 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = photo_file_format_get_default_basename (_tmp1_, _tmp2_); + _tmp3_ = g_file_get_child (_tmp0_, _tmp2_); #line 551 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp4_ = _tmp3_; #line 551 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = g_file_get_child (_tmp0_, _tmp4_); -#line 551 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = _tmp5_; -#line 551 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp2_); #line 551 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - result = _tmp6_; + result = _tmp4_; #line 551 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 3157 "ThumbnailCache.c" +#line 3164 "ThumbnailCache.c" } -static GdkPixbuf* thumbnail_cache_fetch_from_memory (ThumbnailCache* self, const gchar* thumbnail_name) { +static GdkPixbuf* +thumbnail_cache_fetch_from_memory (ThumbnailCache* self, + const gchar* thumbnail_name) +{ GdkPixbuf* result = NULL; ThumbnailCacheImageData* data = NULL; GeeHashMap* _tmp0_; - const gchar* _tmp1_; - gpointer _tmp2_; - GdkPixbuf* _tmp3_ = NULL; - ThumbnailCacheImageData* _tmp4_; - GdkPixbuf* _tmp7_; + gpointer _tmp1_; + GdkPixbuf* _tmp2_ = NULL; + ThumbnailCacheImageData* _tmp3_; + GdkPixbuf* _tmp6_; #line 554 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), NULL); #line 554 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3173,58 +3182,56 @@ static GdkPixbuf* thumbnail_cache_fetch_from_memory (ThumbnailCache* self, const #line 555 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = self->priv->cache_map; #line 555 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = thumbnail_name; -#line 555 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), thumbnail_name); #line 555 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - data = (ThumbnailCacheImageData*) _tmp2_; + data = (ThumbnailCacheImageData*) _tmp1_; #line 557 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = data; + _tmp3_ = data; #line 557 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (_tmp4_ != NULL) { -#line 3186 "ThumbnailCache.c" - ThumbnailCacheImageData* _tmp5_; - GdkPixbuf* _tmp6_; + if (_tmp3_ != NULL) { +#line 3193 "ThumbnailCache.c" + ThumbnailCacheImageData* _tmp4_; + GdkPixbuf* _tmp5_; #line 557 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = data; + _tmp4_ = data; #line 557 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = _tmp5_->pixbuf; + _tmp5_ = _tmp4_->pixbuf; #line 557 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = _tmp6_; -#line 3195 "ThumbnailCache.c" + _tmp2_ = _tmp5_; +#line 3202 "ThumbnailCache.c" } else { #line 557 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = NULL; -#line 3199 "ThumbnailCache.c" + _tmp2_ = NULL; +#line 3206 "ThumbnailCache.c" } #line 557 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = _g_object_ref0 (_tmp3_); + _tmp6_ = _g_object_ref0 (_tmp2_); #line 557 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - result = _tmp7_; + result = _tmp6_; #line 557 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _thumbnail_cache_image_data_unref0 (data); #line 557 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 3209 "ThumbnailCache.c" +#line 3216 "ThumbnailCache.c" } -static void thumbnail_cache_store_in_memory (ThumbnailCache* self, const gchar* thumbnail_name, GdkPixbuf* thumbnail) { +static void +thumbnail_cache_store_in_memory (ThumbnailCache* self, + const gchar* thumbnail_name, + GdkPixbuf* thumbnail) +{ gulong _tmp0_; - const gchar* _tmp1_; ThumbnailCacheImageData* data = NULL; - GdkPixbuf* _tmp2_; - ThumbnailCacheImageData* _tmp3_; - ThumbnailCacheImageData* _tmp4_; - gulong _tmp5_; - GeeHashMap* _tmp7_; - const gchar* _tmp8_; - ThumbnailCacheImageData* _tmp9_; - GeeArrayList* _tmp10_; - const gchar* _tmp11_; - gulong _tmp12_; - ThumbnailCacheImageData* _tmp13_; - gulong _tmp14_; + ThumbnailCacheImageData* _tmp1_; + ThumbnailCacheImageData* _tmp2_; + gulong _tmp3_; + GeeHashMap* _tmp4_; + ThumbnailCacheImageData* _tmp5_; + GeeArrayList* _tmp6_; + gulong _tmp7_; + ThumbnailCacheImageData* _tmp8_; + gulong _tmp9_; #line 560 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_CACHE (self)); #line 560 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3237,214 +3244,201 @@ static void thumbnail_cache_store_in_memory (ThumbnailCache* self, const gchar* if (_tmp0_ <= ((gulong) 0)) { #line 562 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 3241 "ThumbnailCache.c" +#line 3248 "ThumbnailCache.c" } #line 564 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = thumbnail_name; -#line 564 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail_cache_remove_from_memory (self, _tmp1_); + thumbnail_cache_remove_from_memory (self, thumbnail_name); #line 566 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = thumbnail; + _tmp1_ = thumbnail_cache_image_data_new (thumbnail); #line 566 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = thumbnail_cache_image_data_new (_tmp2_); -#line 566 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - data = _tmp3_; + data = _tmp1_; #line 569 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = data; + _tmp2_ = data; #line 569 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = _tmp4_->bytes; + _tmp3_ = _tmp2_->bytes; #line 569 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (_tmp5_ > ((gulong) THUMBNAIL_CACHE_MAX_INMEMORY_DATA_SIZE)) { -#line 3259 "ThumbnailCache.c" - const gchar* _tmp6_; -#line 570 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = thumbnail_name; + if (_tmp3_ > ((gulong) THUMBNAIL_CACHE_MAX_INMEMORY_DATA_SIZE)) { #line 570 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_debug ("ThumbnailCache.vala:570: Persistent thumbnail [%s] too large to cache " \ -"in memory", _tmp6_); +"in memory", thumbnail_name); #line 572 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _thumbnail_cache_image_data_unref0 (data); #line 572 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 3269 "ThumbnailCache.c" +#line 3268 "ThumbnailCache.c" } #line 575 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = self->priv->cache_map; + _tmp4_ = self->priv->cache_map; #line 575 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = thumbnail_name; -#line 575 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp9_ = data; + _tmp5_ = data; #line 575 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_, _tmp9_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), thumbnail_name, _tmp5_); #line 576 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp10_ = self->priv->cache_lru; + _tmp6_ = self->priv->cache_lru; #line 576 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp11_ = thumbnail_name; -#line 576 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp11_); + gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, thumbnail_name); #line 578 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp12_ = self->priv->cached_bytes; + _tmp7_ = self->priv->cached_bytes; #line 578 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp13_ = data; + _tmp8_ = data; #line 578 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp14_ = _tmp13_->bytes; + _tmp9_ = _tmp8_->bytes; #line 578 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->priv->cached_bytes = _tmp12_ + _tmp14_; + self->priv->cached_bytes = _tmp7_ + _tmp9_; #line 581 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" while (TRUE) { -#line 3295 "ThumbnailCache.c" - gulong _tmp15_; - gulong _tmp16_; - GeeArrayList* _tmp17_; - gint _tmp18_; - gint _tmp19_; +#line 3290 "ThumbnailCache.c" + gulong _tmp10_; + gulong _tmp11_; + GeeArrayList* _tmp12_; + gint _tmp13_; + gint _tmp14_; gint index = 0; - GeeArrayList* _tmp20_; - gint _tmp21_; - gint _tmp22_; + GeeArrayList* _tmp15_; + gint _tmp16_; + gint _tmp17_; gchar* victim_name = NULL; - GeeArrayList* _tmp23_; - gint _tmp24_; - gpointer _tmp25_; - GeeArrayList* _tmp26_; - gint _tmp27_; - gpointer _tmp28_; - gchar* _tmp29_; - GeeHashMap* _tmp30_; - const gchar* _tmp31_; - gpointer _tmp32_; - gint _tmp33_; + GeeArrayList* _tmp18_; + gint _tmp19_; + gpointer _tmp20_; + GeeArrayList* _tmp21_; + gint _tmp22_; + gpointer _tmp23_; + gchar* _tmp24_; + GeeHashMap* _tmp25_; + const gchar* _tmp26_; + gpointer _tmp27_; + gint _tmp28_; gboolean removed = FALSE; - GeeHashMap* _tmp34_; - const gchar* _tmp35_; - gboolean _tmp36_; - gboolean _tmp37_; - ThumbnailCacheImageData* _tmp38_; - gulong _tmp39_; - gulong _tmp40_; - gulong _tmp41_; - ThumbnailCacheImageData* _tmp42_; - gulong _tmp43_; + GeeHashMap* _tmp29_; + const gchar* _tmp30_; + gboolean _tmp31_; + gboolean _tmp32_; + ThumbnailCacheImageData* _tmp33_; + gulong _tmp34_; + gulong _tmp35_; + gulong _tmp36_; + ThumbnailCacheImageData* _tmp37_; + gulong _tmp38_; #line 581 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp15_ = self->priv->cached_bytes; + _tmp10_ = self->priv->cached_bytes; #line 581 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp16_ = self->priv->max_cached_bytes; + _tmp11_ = self->priv->max_cached_bytes; #line 581 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (!(_tmp15_ > _tmp16_)) { + if (!(_tmp10_ > _tmp11_)) { #line 581 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" break; -#line 3336 "ThumbnailCache.c" +#line 3331 "ThumbnailCache.c" } #line 582 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp17_ = self->priv->cache_lru; + _tmp12_ = self->priv->cache_lru; #line 582 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp18_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp13_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 582 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp19_ = _tmp18_; + _tmp14_ = _tmp13_; #line 582 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _vala_assert (_tmp19_ > 0, "cache_lru.size > 0"); + _vala_assert (_tmp14_ > 0, "cache_lru.size > 0"); #line 583 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp20_ = self->priv->cache_lru; + _tmp15_ = self->priv->cache_lru; #line 583 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 583 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp22_ = _tmp21_; + _tmp17_ = _tmp16_; #line 583 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - index = _tmp22_ - 1; + index = _tmp17_ - 1; #line 585 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp23_ = self->priv->cache_lru; + _tmp18_ = self->priv->cache_lru; #line 585 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp24_ = index; + _tmp19_ = index; #line 585 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp25_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp24_); + _tmp20_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp19_); #line 585 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - victim_name = (gchar*) _tmp25_; + victim_name = (gchar*) _tmp20_; #line 586 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp26_ = self->priv->cache_lru; + _tmp21_ = self->priv->cache_lru; #line 586 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp27_ = index; + _tmp22_ = index; #line 586 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp28_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp27_); + _tmp23_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp22_); #line 586 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp29_ = (gchar*) _tmp28_; + _tmp24_ = (gchar*) _tmp23_; #line 586 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_free0 (_tmp29_); + _g_free0 (_tmp24_); #line 588 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp30_ = self->priv->cache_map; + _tmp25_ = self->priv->cache_map; #line 588 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp31_ = victim_name; + _tmp26_ = victim_name; #line 588 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp32_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp31_); + _tmp27_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp26_); #line 588 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _thumbnail_cache_image_data_unref0 (data); #line 588 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - data = (ThumbnailCacheImageData*) _tmp32_; + data = (ThumbnailCacheImageData*) _tmp27_; #line 590 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp33_ = thumbnail_cache_cycle_overflow_thumbnails; + _tmp28_ = thumbnail_cache_cycle_overflow_thumbnails; #line 590 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - thumbnail_cache_cycle_overflow_thumbnails = _tmp33_ + 1; + thumbnail_cache_cycle_overflow_thumbnails = _tmp28_ + 1; #line 591 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_schedule_debug (); #line 593 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp34_ = self->priv->cache_map; + _tmp29_ = self->priv->cache_map; #line 593 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp35_ = victim_name; + _tmp30_ = victim_name; #line 593 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp36_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp35_, NULL); + _tmp31_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp30_, NULL); #line 593 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - removed = _tmp36_; + removed = _tmp31_; #line 594 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp37_ = removed; + _tmp32_ = removed; #line 594 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _vala_assert (_tmp37_, "removed"); + _vala_assert (_tmp32_, "removed"); #line 596 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp38_ = data; + _tmp33_ = data; #line 596 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp39_ = _tmp38_->bytes; + _tmp34_ = _tmp33_->bytes; #line 596 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp40_ = self->priv->cached_bytes; + _tmp35_ = self->priv->cached_bytes; #line 596 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _vala_assert (_tmp39_ <= _tmp40_, "data.bytes <= cached_bytes"); + _vala_assert (_tmp34_ <= _tmp35_, "data.bytes <= cached_bytes"); #line 597 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp41_ = self->priv->cached_bytes; + _tmp36_ = self->priv->cached_bytes; #line 597 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp42_ = data; + _tmp37_ = data; #line 597 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp43_ = _tmp42_->bytes; + _tmp38_ = _tmp37_->bytes; #line 597 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->priv->cached_bytes = _tmp41_ - _tmp43_; + self->priv->cached_bytes = _tmp36_ - _tmp38_; #line 581 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_free0 (victim_name); -#line 3418 "ThumbnailCache.c" +#line 3413 "ThumbnailCache.c" } #line 560 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _thumbnail_cache_image_data_unref0 (data); -#line 3422 "ThumbnailCache.c" +#line 3417 "ThumbnailCache.c" } -static gboolean thumbnail_cache_remove_from_memory (ThumbnailCache* self, const gchar* thumbnail_name) { +static gboolean +thumbnail_cache_remove_from_memory (ThumbnailCache* self, + const gchar* thumbnail_name) +{ gboolean result = FALSE; ThumbnailCacheImageData* data = NULL; GeeHashMap* _tmp0_; - const gchar* _tmp1_; - gpointer _tmp2_; - ThumbnailCacheImageData* _tmp3_; - gulong _tmp4_; - ThumbnailCacheImageData* _tmp5_; + gpointer _tmp1_; + ThumbnailCacheImageData* _tmp2_; + gulong _tmp3_; + ThumbnailCacheImageData* _tmp4_; + gulong _tmp5_; gulong _tmp6_; - gulong _tmp7_; - ThumbnailCacheImageData* _tmp8_; - gulong _tmp9_; + ThumbnailCacheImageData* _tmp7_; + gulong _tmp8_; gboolean removed = FALSE; - GeeHashMap* _tmp10_; - const gchar* _tmp11_; - gboolean _tmp12_; + GeeHashMap* _tmp9_; + gboolean _tmp10_; + gboolean _tmp11_; + GeeArrayList* _tmp12_; gboolean _tmp13_; - GeeArrayList* _tmp14_; - const gchar* _tmp15_; - gboolean _tmp16_; - gboolean _tmp17_; #line 601 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), FALSE); #line 601 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3452,83 +3446,77 @@ static gboolean thumbnail_cache_remove_from_memory (ThumbnailCache* self, const #line 602 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = self->priv->cache_map; #line 602 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = thumbnail_name; -#line 602 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), thumbnail_name); #line 602 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - data = (ThumbnailCacheImageData*) _tmp2_; + data = (ThumbnailCacheImageData*) _tmp1_; #line 603 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = data; + _tmp2_ = data; #line 603 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 604 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" result = FALSE; #line 604 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _thumbnail_cache_image_data_unref0 (data); #line 604 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 3470 "ThumbnailCache.c" +#line 3462 "ThumbnailCache.c" } #line 606 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = self->priv->cached_bytes; + _tmp3_ = self->priv->cached_bytes; #line 606 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = data; + _tmp4_ = data; #line 606 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = _tmp5_->bytes; + _tmp5_ = _tmp4_->bytes; #line 606 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _vala_assert (_tmp4_ >= _tmp6_, "cached_bytes >= data.bytes"); + _vala_assert (_tmp3_ >= _tmp5_, "cached_bytes >= data.bytes"); #line 607 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = self->priv->cached_bytes; + _tmp6_ = self->priv->cached_bytes; #line 607 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = data; + _tmp7_ = data; #line 607 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp9_ = _tmp8_->bytes; + _tmp8_ = _tmp7_->bytes; #line 607 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->priv->cached_bytes = _tmp7_ - _tmp9_; -#line 610 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp10_ = self->priv->cache_map; + self->priv->cached_bytes = _tmp6_ - _tmp8_; #line 610 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp11_ = thumbnail_name; + _tmp9_ = self->priv->cache_map; #line 610 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp12_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL); + _tmp10_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), thumbnail_name, NULL); #line 610 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - removed = _tmp12_; + removed = _tmp10_; #line 611 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp13_ = removed; + _tmp11_ = removed; #line 611 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _vala_assert (_tmp13_, "removed"); -#line 614 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp14_ = self->priv->cache_lru; + _vala_assert (_tmp11_, "removed"); #line 614 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp15_ = thumbnail_name; + _tmp12_ = self->priv->cache_lru; #line 614 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp16_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); -#line 614 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - removed = _tmp16_; + removed = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), thumbnail_name); #line 615 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp17_ = removed; + _tmp13_ = removed; #line 615 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _vala_assert (_tmp17_, "removed"); + _vala_assert (_tmp13_, "removed"); #line 617 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" result = TRUE; #line 617 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _thumbnail_cache_image_data_unref0 (data); #line 617 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 3518 "ThumbnailCache.c" +#line 3504 "ThumbnailCache.c" } -static void thumbnail_cache_save_thumbnail (ThumbnailCache* self, GFile* file, GdkPixbuf* pixbuf, ThumbnailSource* source, GError** error) { +static void +thumbnail_cache_save_thumbnail (ThumbnailCache* self, + GFile* file, + GdkPixbuf* pixbuf, + ThumbnailSource* source, + GError** error) +{ PhotoFileWriter* _tmp0_ = NULL; - ThumbnailSource* _tmp1_; - PhotoFileFormat _tmp2_; - GFile* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - PhotoFileWriter* _tmp6_; - PhotoFileWriter* _tmp7_; - GdkPixbuf* _tmp8_; + gchar* _tmp1_; + gchar* _tmp2_; + PhotoFileWriter* _tmp3_; + PhotoFileWriter* _tmp4_; GError * _inner_error_ = NULL; #line 620 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_CACHE (self)); @@ -3539,35 +3527,27 @@ static void thumbnail_cache_save_thumbnail (ThumbnailCache* self, GFile* file, G #line 620 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (source)); #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = source; -#line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = thumbnail_source_get_preferred_thumbnail_format (_tmp1_); + _tmp1_ = g_file_get_path (file); #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = file; -#line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = g_file_get_path (_tmp3_); -#line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = photo_file_format_create_writer (_tmp2_, _tmp5_, &_inner_error_); + _tmp3_ = photo_file_format_create_writer (thumbnail_source_get_preferred_thumbnail_format (source), _tmp2_, &_inner_error_); #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp2_); #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = _tmp7_; + _tmp0_ = _tmp4_; #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_propagate_error (error, _inner_error_); #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 3565 "ThumbnailCache.c" +#line 3547 "ThumbnailCache.c" } #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = pixbuf; -#line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - photo_file_writer_write (_tmp0_, _tmp8_, THUMBNAIL_CACHE_DEFAULT_QUALITY, &_inner_error_); + photo_file_writer_write (_tmp0_, pixbuf, THUMBNAIL_CACHE_DEFAULT_QUALITY, &_inner_error_); #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3576,155 +3556,170 @@ static void thumbnail_cache_save_thumbnail (ThumbnailCache* self, GFile* file, G _photo_file_adapter_unref0 (_tmp0_); #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 3579 "ThumbnailCache.c" +#line 3559 "ThumbnailCache.c" } #line 620 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _photo_file_adapter_unref0 (_tmp0_); -#line 3583 "ThumbnailCache.c" +#line 3563 "ThumbnailCache.c" } -static ThumbnailCacheImageData* thumbnail_cache_image_data_construct (GType object_type, GdkPixbuf* pixbuf) { +static ThumbnailCacheImageData* +thumbnail_cache_image_data_construct (GType object_type, + GdkPixbuf* pixbuf) +{ ThumbnailCacheImageData* self = NULL; GdkPixbuf* _tmp0_; - GdkPixbuf* _tmp1_; - GdkPixbuf* _tmp2_; - gint _tmp3_; - GdkPixbuf* _tmp4_; - gint _tmp5_; #line 63 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL); #line 63 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self = (ThumbnailCacheImageData*) g_type_create_instance (object_type); #line 64 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = pixbuf; -#line 64 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (pixbuf); #line 64 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (self->pixbuf); #line 64 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->pixbuf = _tmp1_; -#line 68 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = pixbuf; -#line 68 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = gdk_pixbuf_get_rowstride (_tmp2_); + self->pixbuf = _tmp0_; #line 68 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = pixbuf; -#line 68 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = gdk_pixbuf_get_height (_tmp4_); -#line 68 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->bytes = ((gulong) _tmp3_) * ((gulong) _tmp5_); + self->bytes = ((gulong) gdk_pixbuf_get_rowstride (pixbuf)) * ((gulong) gdk_pixbuf_get_height (pixbuf)); #line 63 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return self; -#line 3619 "ThumbnailCache.c" +#line 3587 "ThumbnailCache.c" } -static ThumbnailCacheImageData* thumbnail_cache_image_data_new (GdkPixbuf* pixbuf) { +static ThumbnailCacheImageData* +thumbnail_cache_image_data_new (GdkPixbuf* pixbuf) +{ #line 63 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return thumbnail_cache_image_data_construct (THUMBNAIL_CACHE_TYPE_IMAGE_DATA, pixbuf); -#line 3626 "ThumbnailCache.c" +#line 3596 "ThumbnailCache.c" } -static void thumbnail_cache_value_image_data_init (GValue* value) { +static void +thumbnail_cache_value_image_data_init (GValue* value) +{ #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" value->data[0].v_pointer = NULL; -#line 3633 "ThumbnailCache.c" +#line 3605 "ThumbnailCache.c" } -static void thumbnail_cache_value_image_data_free_value (GValue* value) { +static void +thumbnail_cache_value_image_data_free_value (GValue* value) +{ #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (value->data[0].v_pointer) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_image_data_unref (value->data[0].v_pointer); -#line 3642 "ThumbnailCache.c" +#line 3616 "ThumbnailCache.c" } } -static void thumbnail_cache_value_image_data_copy_value (const GValue* src_value, GValue* dest_value) { +static void +thumbnail_cache_value_image_data_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (src_value->data[0].v_pointer) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" dest_value->data[0].v_pointer = thumbnail_cache_image_data_ref (src_value->data[0].v_pointer); -#line 3652 "ThumbnailCache.c" +#line 3629 "ThumbnailCache.c" } else { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" dest_value->data[0].v_pointer = NULL; -#line 3656 "ThumbnailCache.c" +#line 3633 "ThumbnailCache.c" } } -static gpointer thumbnail_cache_value_image_data_peek_pointer (const GValue* value) { +static gpointer +thumbnail_cache_value_image_data_peek_pointer (const GValue* value) +{ #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return value->data[0].v_pointer; -#line 3664 "ThumbnailCache.c" +#line 3643 "ThumbnailCache.c" } -static gchar* thumbnail_cache_value_image_data_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +thumbnail_cache_value_image_data_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (collect_values[0].v_pointer) { -#line 3671 "ThumbnailCache.c" +#line 3655 "ThumbnailCache.c" ThumbnailCacheImageData * object; object = collect_values[0].v_pointer; #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (object->parent_instance.g_class == NULL) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3678 "ThumbnailCache.c" +#line 3662 "ThumbnailCache.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.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 3682 "ThumbnailCache.c" +#line 3666 "ThumbnailCache.c" } #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" value->data[0].v_pointer = thumbnail_cache_image_data_ref (object); -#line 3686 "ThumbnailCache.c" +#line 3670 "ThumbnailCache.c" } else { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" value->data[0].v_pointer = NULL; -#line 3690 "ThumbnailCache.c" +#line 3674 "ThumbnailCache.c" } #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return NULL; -#line 3694 "ThumbnailCache.c" +#line 3678 "ThumbnailCache.c" } -static gchar* thumbnail_cache_value_image_data_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +thumbnail_cache_value_image_data_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ ThumbnailCacheImageData ** object_p; object_p = collect_values[0].v_pointer; #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (!object_p) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3705 "ThumbnailCache.c" +#line 3694 "ThumbnailCache.c" } #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (!value->data[0].v_pointer) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" *object_p = NULL; -#line 3711 "ThumbnailCache.c" +#line 3700 "ThumbnailCache.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" *object_p = value->data[0].v_pointer; -#line 3715 "ThumbnailCache.c" +#line 3704 "ThumbnailCache.c" } else { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" *object_p = thumbnail_cache_image_data_ref (value->data[0].v_pointer); -#line 3719 "ThumbnailCache.c" +#line 3708 "ThumbnailCache.c" } #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return NULL; -#line 3723 "ThumbnailCache.c" +#line 3712 "ThumbnailCache.c" } -static GParamSpec* thumbnail_cache_param_spec_image_data (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +static GParamSpec* +thumbnail_cache_param_spec_image_data (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ThumbnailCacheParamSpecImageData* spec; #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (g_type_is_a (object_type, THUMBNAIL_CACHE_TYPE_IMAGE_DATA), NULL); @@ -3734,20 +3729,25 @@ static GParamSpec* thumbnail_cache_param_spec_image_data (const gchar* name, con G_PARAM_SPEC (spec)->value_type = object_type; #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return G_PARAM_SPEC (spec); -#line 3737 "ThumbnailCache.c" +#line 3732 "ThumbnailCache.c" } -static gpointer thumbnail_cache_value_get_image_data (const GValue* value) { +static gpointer +thumbnail_cache_value_get_image_data (const GValue* value) +{ #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, THUMBNAIL_CACHE_TYPE_IMAGE_DATA), NULL); #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return value->data[0].v_pointer; -#line 3746 "ThumbnailCache.c" +#line 3743 "ThumbnailCache.c" } -static void thumbnail_cache_value_set_image_data (GValue* value, gpointer v_object) { +static void +thumbnail_cache_value_set_image_data (GValue* value, + gpointer v_object) +{ ThumbnailCacheImageData * old; #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, THUMBNAIL_CACHE_TYPE_IMAGE_DATA)); @@ -3778,7 +3778,10 @@ static void thumbnail_cache_value_set_image_data (GValue* value, gpointer v_obje } -static void thumbnail_cache_value_take_image_data (GValue* value, gpointer v_object) { +static void +thumbnail_cache_value_take_image_data (GValue* value, + gpointer v_object) +{ ThumbnailCacheImageData * old; #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, THUMBNAIL_CACHE_TYPE_IMAGE_DATA)); @@ -3792,38 +3795,44 @@ static void thumbnail_cache_value_take_image_data (GValue* value, gpointer v_obj g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" value->data[0].v_pointer = v_object; -#line 3795 "ThumbnailCache.c" +#line 3798 "ThumbnailCache.c" } else { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" value->data[0].v_pointer = NULL; -#line 3799 "ThumbnailCache.c" +#line 3802 "ThumbnailCache.c" } #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (old) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_image_data_unref (old); -#line 3805 "ThumbnailCache.c" +#line 3808 "ThumbnailCache.c" } } -static void thumbnail_cache_image_data_class_init (ThumbnailCacheImageDataClass * klass) { +static void +thumbnail_cache_image_data_class_init (ThumbnailCacheImageDataClass * klass) +{ #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_image_data_parent_class = g_type_class_peek_parent (klass); #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" ((ThumbnailCacheImageDataClass *) klass)->finalize = thumbnail_cache_image_data_finalize; -#line 3815 "ThumbnailCache.c" +#line 3820 "ThumbnailCache.c" } -static void thumbnail_cache_image_data_instance_init (ThumbnailCacheImageData * self) { +static void +thumbnail_cache_image_data_instance_init (ThumbnailCacheImageData * self) +{ #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self->ref_count = 1; -#line 3822 "ThumbnailCache.c" +#line 3829 "ThumbnailCache.c" } -static void thumbnail_cache_image_data_finalize (ThumbnailCacheImageData * obj) { +static void +thumbnail_cache_image_data_finalize (ThumbnailCacheImageData * obj) +{ ThumbnailCacheImageData * self; gulong _tmp0_; gulong _tmp1_; @@ -3841,11 +3850,13 @@ static void thumbnail_cache_image_data_finalize (ThumbnailCacheImageData * obj) thumbnail_cache_schedule_debug (); #line 60 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (self->pixbuf); -#line 3844 "ThumbnailCache.c" +#line 3853 "ThumbnailCache.c" } -static GType thumbnail_cache_image_data_get_type (void) { +static GType +thumbnail_cache_image_data_get_type (void) +{ static volatile gsize thumbnail_cache_image_data_type_id__volatile = 0; if (g_once_init_enter (&thumbnail_cache_image_data_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { thumbnail_cache_value_image_data_init, thumbnail_cache_value_image_data_free_value, thumbnail_cache_value_image_data_copy_value, thumbnail_cache_value_image_data_peek_pointer, "p", thumbnail_cache_value_image_data_collect_value, "p", thumbnail_cache_value_image_data_lcopy_value }; @@ -3859,18 +3870,22 @@ static GType thumbnail_cache_image_data_get_type (void) { } -static gpointer thumbnail_cache_image_data_ref (gpointer instance) { +static gpointer +thumbnail_cache_image_data_ref (gpointer instance) +{ ThumbnailCacheImageData * self; self = instance; #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_atomic_int_inc (&self->ref_count); #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return instance; -#line 3869 "ThumbnailCache.c" +#line 3882 "ThumbnailCache.c" } -static void thumbnail_cache_image_data_unref (gpointer instance) { +static void +thumbnail_cache_image_data_unref (gpointer instance) +{ ThumbnailCacheImageData * self; self = instance; #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3879,36 +3894,39 @@ static void thumbnail_cache_image_data_unref (gpointer instance) { THUMBNAIL_CACHE_IMAGE_DATA_GET_CLASS (self)->finalize (self); #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3882 "ThumbnailCache.c" +#line 3897 "ThumbnailCache.c" } } -static void _thumbnail_cache_async_fetch_completion_callback_completion_callback (BackgroundJob* job, gpointer self) { +static void +_thumbnail_cache_async_fetch_completion_callback_completion_callback (BackgroundJob* job, + gpointer self) +{ #line 94 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_async_fetch_completion_callback (job); -#line 3890 "ThumbnailCache.c" +#line 3908 "ThumbnailCache.c" } -static ThumbnailCacheAsyncFetchJob* thumbnail_cache_async_fetch_job_construct (GType object_type, ThumbnailCache* cache, const gchar* thumbnail_name, ThumbnailSource* source, GdkPixbuf* prefetched, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable) { +static ThumbnailCacheAsyncFetchJob* +thumbnail_cache_async_fetch_job_construct (GType object_type, + ThumbnailCache* cache, + const gchar* thumbnail_name, + ThumbnailSource* source, + GdkPixbuf* prefetched, + Dimensions* dim, + GdkInterpType interp, + ThumbnailCacheAsyncFetchCallback callback, + void* callback_target, + GCancellable* cancellable) +{ ThumbnailCacheAsyncFetchJob* self = NULL; ThumbnailCache* _tmp0_; - GCancellable* _tmp1_; - ThumbnailCache* _tmp2_; - ThumbnailCache* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; - ThumbnailSource* _tmp6_; - ThumbnailSource* _tmp7_; - ThumbnailSource* _tmp8_; - PhotoFileFormat _tmp9_; - GdkPixbuf* _tmp10_; - GdkPixbuf* _tmp11_; - Dimensions _tmp12_; - GdkInterpType _tmp13_; - ThumbnailCacheAsyncFetchCallback _tmp14_; - void* _tmp14__target; + gchar* _tmp1_; + ThumbnailSource* _tmp2_; + GdkPixbuf* _tmp3_; + Dimensions _tmp4_; #line 91 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_CACHE (cache), NULL); #line 91 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3922,79 +3940,69 @@ static ThumbnailCacheAsyncFetchJob* thumbnail_cache_async_fetch_job_construct (G #line 91 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable), NULL); #line 94 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = cache; -#line 94 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = cancellable; -#line 94 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self = (ThumbnailCacheAsyncFetchJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _thumbnail_cache_async_fetch_completion_callback_completion_callback, NULL, _tmp1_, NULL, NULL, NULL); -#line 96 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp2_ = cache; + self = (ThumbnailCacheAsyncFetchJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (cache, G_TYPE_OBJECT, GObject), _thumbnail_cache_async_fetch_completion_callback_completion_callback, NULL, cancellable, NULL, NULL, NULL); #line 96 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp0_ = _g_object_ref0 (cache); #line 96 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (self->cache); #line 96 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->cache = _tmp3_; + self->cache = _tmp0_; #line 97 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp4_ = thumbnail_name; -#line 97 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp5_ = g_strdup (_tmp4_); + _tmp1_ = g_strdup (thumbnail_name); #line 97 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_free0 (self->thumbnail_name); #line 97 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->thumbnail_name = _tmp5_; -#line 98 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp6_ = source; + self->thumbnail_name = _tmp1_; #line 98 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = _g_object_ref0 (_tmp6_); + _tmp2_ = _g_object_ref0 (source); #line 98 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (self->source); #line 98 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->source = _tmp7_; + self->source = _tmp2_; #line 99 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = source; -#line 99 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp9_ = thumbnail_source_get_preferred_thumbnail_format (_tmp8_); -#line 99 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->source_format = _tmp9_; -#line 100 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp10_ = prefetched; + self->source_format = thumbnail_source_get_preferred_thumbnail_format (source); #line 100 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp11_ = _g_object_ref0 (_tmp10_); + _tmp3_ = _g_object_ref0 (prefetched); #line 100 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (self->unscaled); #line 100 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->unscaled = _tmp11_; + self->unscaled = _tmp3_; #line 101 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp12_ = *dim; + _tmp4_ = *dim; #line 101 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->dim = _tmp12_; + self->dim = _tmp4_; #line 102 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp13_ = interp; -#line 102 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->interp = _tmp13_; -#line 103 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp14_ = callback; + self->interp = interp; #line 103 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp14__target = callback_target; + self->callback = callback; #line 103 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->callback = _tmp14_; -#line 103 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->callback_target = _tmp14__target; + self->callback_target = callback_target; #line 91 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return self; -#line 3986 "ThumbnailCache.c" +#line 3982 "ThumbnailCache.c" } -static ThumbnailCacheAsyncFetchJob* thumbnail_cache_async_fetch_job_new (ThumbnailCache* cache, const gchar* thumbnail_name, ThumbnailSource* source, GdkPixbuf* prefetched, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable) { +static ThumbnailCacheAsyncFetchJob* +thumbnail_cache_async_fetch_job_new (ThumbnailCache* cache, + const gchar* thumbnail_name, + ThumbnailSource* source, + GdkPixbuf* prefetched, + Dimensions* dim, + GdkInterpType interp, + ThumbnailCacheAsyncFetchCallback callback, + void* callback_target, + GCancellable* cancellable) +{ #line 91 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return thumbnail_cache_async_fetch_job_construct (THUMBNAIL_CACHE_TYPE_ASYNC_FETCH_JOB, cache, thumbnail_name, source, prefetched, dim, interp, callback, callback_target, cancellable); -#line 3993 "ThumbnailCache.c" +#line 3999 "ThumbnailCache.c" } -static BackgroundJobJobPriority thumbnail_cache_async_fetch_job_real_get_priority (BackgroundJob* base) { +static BackgroundJobJobPriority +thumbnail_cache_async_fetch_job_real_get_priority (BackgroundJob* base) +{ ThumbnailCacheAsyncFetchJob * self; BackgroundJobJobPriority result = 0; GdkInterpType _tmp0_; @@ -4008,48 +4016,48 @@ static BackgroundJobJobPriority thumbnail_cache_async_fetch_job_real_get_priorit case GDK_INTERP_NEAREST: #line 109 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" case GDK_INTERP_TILES: -#line 4011 "ThumbnailCache.c" +#line 4019 "ThumbnailCache.c" { #line 112 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" result = BACKGROUND_JOB_JOB_PRIORITY_HIGH; #line 112 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 4017 "ThumbnailCache.c" +#line 4025 "ThumbnailCache.c" } default: #line 109 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" case GDK_INTERP_BILINEAR: #line 109 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" case GDK_INTERP_HYPER: -#line 4024 "ThumbnailCache.c" +#line 4032 "ThumbnailCache.c" { #line 117 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" result = BACKGROUND_JOB_JOB_PRIORITY_NORMAL; #line 117 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 4030 "ThumbnailCache.c" +#line 4038 "ThumbnailCache.c" } } } -static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) { +static void +thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) +{ ThumbnailCacheAsyncFetchJob * self; GError * _inner_error_ = NULL; #line 121 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, THUMBNAIL_CACHE_TYPE_ASYNC_FETCH_JOB, ThumbnailCacheAsyncFetchJob); -#line 4041 "ThumbnailCache.c" +#line 4051 "ThumbnailCache.c" { GdkPixbuf* _tmp0_; - gboolean _tmp7_; - GdkPixbuf* _tmp8_ = NULL; - gboolean _tmp9_; - GdkPixbuf* _tmp16_; + GdkPixbuf* _tmp7_ = NULL; + GdkPixbuf* _tmp14_; #line 124 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = self->unscaled; #line 124 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (_tmp0_ == NULL) { -#line 4052 "ThumbnailCache.c" +#line 4060 "ThumbnailCache.c" GdkPixbuf* _tmp1_ = NULL; ThumbnailCache* _tmp2_; const gchar* _tmp3_; @@ -4068,7 +4076,7 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) { _tmp1_ = _tmp5_; #line 125 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4071 "ThumbnailCache.c" +#line 4079 "ThumbnailCache.c" goto __catch252_g_error; } #line 125 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4083,81 +4091,77 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) { self->fetched = TRUE; #line 124 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (_tmp1_); -#line 4086 "ThumbnailCache.c" +#line 4094 "ThumbnailCache.c" } #line 129 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp7_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob)); -#line 129 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (_tmp7_) { + if (background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob))) { #line 130 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 4094 "ThumbnailCache.c" +#line 4100 "ThumbnailCache.c" } #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp9_ = dimensions_has_area (&self->dim); -#line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (_tmp9_) { -#line 4100 "ThumbnailCache.c" - GdkPixbuf* _tmp10_; - Dimensions _tmp11_; - GdkInterpType _tmp12_; - GdkPixbuf* _tmp13_; + if (dimensions_has_area (&self->dim)) { +#line 4104 "ThumbnailCache.c" + GdkPixbuf* _tmp8_; + Dimensions _tmp9_; + GdkInterpType _tmp10_; + GdkPixbuf* _tmp11_; #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp10_ = self->unscaled; + _tmp8_ = self->unscaled; #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp11_ = self->dim; + _tmp9_ = self->dim; #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp12_ = self->interp; + _tmp10_ = self->interp; #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp13_ = resize_pixbuf (_tmp10_, &_tmp11_, _tmp12_); + _tmp11_ = resize_pixbuf (_tmp8_, &_tmp9_, _tmp10_); #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = _tmp13_; -#line 4117 "ThumbnailCache.c" + _tmp7_ = _tmp11_; +#line 4121 "ThumbnailCache.c" } else { - GdkPixbuf* _tmp14_; - GdkPixbuf* _tmp15_; + GdkPixbuf* _tmp12_; + GdkPixbuf* _tmp13_; #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp14_ = self->unscaled; + _tmp12_ = self->unscaled; #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp15_ = _g_object_ref0 (_tmp14_); + _tmp13_ = _g_object_ref0 (_tmp12_); #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = _tmp15_; -#line 4129 "ThumbnailCache.c" + _tmp7_ = _tmp13_; +#line 4133 "ThumbnailCache.c" } #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp16_ = _g_object_ref0 (_tmp8_); + _tmp14_ = _g_object_ref0 (_tmp7_); #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (self->scaled); #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->scaled = _tmp16_; + self->scaled = _tmp14_; #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _g_object_unref0 (_tmp8_); -#line 4139 "ThumbnailCache.c" + _g_object_unref0 (_tmp7_); +#line 4143 "ThumbnailCache.c" } goto __finally252; __catch252_g_error: { GError* err = NULL; - GError* _tmp17_; + GError* _tmp15_; #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" err = _inner_error_; #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _inner_error_ = NULL; #line 135 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp17_ = err; + _tmp15_ = err; #line 135 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - if (_tmp17_->domain == G_FILE_ERROR) { -#line 4154 "ThumbnailCache.c" + if (_tmp15_->domain == G_FILE_ERROR) { +#line 4158 "ThumbnailCache.c" { #line 137 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_async_fetch_job_generate_thumbnail (self, &_inner_error_); #line 137 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4160 "ThumbnailCache.c" +#line 4164 "ThumbnailCache.c" goto __catch253_g_error; } } @@ -4165,23 +4169,23 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) { __catch253_g_error: { GError* generr = NULL; - GError* _tmp18_; - GError* _tmp19_; + GError* _tmp16_; + GError* _tmp17_; #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" generr = _inner_error_; #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _inner_error_ = NULL; #line 140 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp18_ = generr; + _tmp16_ = generr; #line 140 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp19_ = _g_error_copy0 (_tmp18_); + _tmp17_ = _g_error_copy0 (_tmp16_); #line 140 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_error_free0 (err); #line 140 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - err = _tmp19_; + err = _tmp17_; #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_error_free0 (generr); -#line 4184 "ThumbnailCache.c" +#line 4188 "ThumbnailCache.c" } __finally253: #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4196,24 +4200,24 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) { g_clear_error (&_inner_error_); #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 4199 "ThumbnailCache.c" +#line 4203 "ThumbnailCache.c" } } else { - GError* _tmp20_; - GError* _tmp21_; + GError* _tmp18_; + GError* _tmp19_; #line 144 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp20_ = err; + _tmp18_ = err; #line 144 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp21_ = _g_error_copy0 (_tmp20_); + _tmp19_ = _g_error_copy0 (_tmp18_); #line 144 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_error_free0 (self->err); #line 144 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - self->err = _tmp21_; -#line 4212 "ThumbnailCache.c" + self->err = _tmp19_; +#line 4216 "ThumbnailCache.c" } #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_error_free0 (err); -#line 4216 "ThumbnailCache.c" +#line 4220 "ThumbnailCache.c" } __finally252: #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4224,12 +4228,15 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) { g_clear_error (&_inner_error_); #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 4227 "ThumbnailCache.c" +#line 4231 "ThumbnailCache.c" } } -static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAsyncFetchJob* self, GError** error) { +static void +thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAsyncFetchJob* self, + GError** error) +{ Photo* photo = NULL; ThumbnailSource* _tmp0_; Photo* _tmp1_; @@ -4248,7 +4255,7 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs _tmp2_ = photo; #line 151 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (_tmp2_ != NULL) { -#line 4251 "ThumbnailCache.c" +#line 4258 "ThumbnailCache.c" GdkPixbuf* _tmp3_ = NULL; Photo* _tmp4_; Dimensions _tmp5_; @@ -4276,7 +4283,7 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs _g_object_unref0 (photo); #line 152 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 4279 "ThumbnailCache.c" +#line 4286 "ThumbnailCache.c" } #line 152 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp9_ = _tmp3_; @@ -4288,7 +4295,7 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs self->unscaled = _tmp9_; #line 151 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (_tmp3_); -#line 4291 "ThumbnailCache.c" +#line 4298 "ThumbnailCache.c" } else { Video* video = NULL; ThumbnailSource* _tmp10_; @@ -4304,7 +4311,7 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs _tmp12_ = video; #line 155 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (_tmp12_ != NULL) { -#line 4307 "ThumbnailCache.c" +#line 4314 "ThumbnailCache.c" GdkPixbuf* _tmp13_ = NULL; Video* _tmp14_; Dimensions _tmp15_; @@ -4331,7 +4338,7 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs _g_object_unref0 (photo); #line 156 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 4334 "ThumbnailCache.c" +#line 4341 "ThumbnailCache.c" } #line 156 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp18_ = _tmp13_; @@ -4343,17 +4350,17 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs self->unscaled = _tmp18_; #line 155 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (_tmp13_); -#line 4346 "ThumbnailCache.c" +#line 4353 "ThumbnailCache.c" } #line 151 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (video); -#line 4350 "ThumbnailCache.c" +#line 4357 "ThumbnailCache.c" } #line 159 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp19_ = self->unscaled; #line 159 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (_tmp19_ != NULL) { -#line 4356 "ThumbnailCache.c" +#line 4363 "ThumbnailCache.c" GdkPixbuf* _tmp20_; Dimensions _tmp21_; GdkInterpType _tmp22_; @@ -4372,15 +4379,17 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs self->scaled = _tmp23_; #line 161 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self->replace = TRUE; -#line 4375 "ThumbnailCache.c" +#line 4382 "ThumbnailCache.c" } #line 149 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (photo); -#line 4379 "ThumbnailCache.c" +#line 4386 "ThumbnailCache.c" } -static void thumbnail_cache_async_fetch_job_class_init (ThumbnailCacheAsyncFetchJobClass * klass) { +static void +thumbnail_cache_async_fetch_job_class_init (ThumbnailCacheAsyncFetchJobClass * klass) +{ #line 77 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_async_fetch_job_parent_class = g_type_class_peek_parent (klass); #line 77 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4389,11 +4398,13 @@ static void thumbnail_cache_async_fetch_job_class_init (ThumbnailCacheAsyncFetch ((BackgroundJobClass *) klass)->get_priority = (BackgroundJobJobPriority (*) (BackgroundJob *)) thumbnail_cache_async_fetch_job_real_get_priority; #line 77 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) thumbnail_cache_async_fetch_job_real_execute; -#line 4392 "ThumbnailCache.c" +#line 4401 "ThumbnailCache.c" } -static void thumbnail_cache_async_fetch_job_instance_init (ThumbnailCacheAsyncFetchJob * self) { +static void +thumbnail_cache_async_fetch_job_instance_init (ThumbnailCacheAsyncFetchJob * self) +{ #line 86 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self->scaled = NULL; #line 87 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4402,11 +4413,13 @@ static void thumbnail_cache_async_fetch_job_instance_init (ThumbnailCacheAsyncFe self->fetched = FALSE; #line 89 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self->replace = FALSE; -#line 4405 "ThumbnailCache.c" +#line 4416 "ThumbnailCache.c" } -static void thumbnail_cache_async_fetch_job_finalize (BackgroundJob * obj) { +static void +thumbnail_cache_async_fetch_job_finalize (BackgroundJob * obj) +{ ThumbnailCacheAsyncFetchJob * self; #line 77 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, THUMBNAIL_CACHE_TYPE_ASYNC_FETCH_JOB, ThumbnailCacheAsyncFetchJob); @@ -4424,11 +4437,13 @@ static void thumbnail_cache_async_fetch_job_finalize (BackgroundJob * obj) { _g_error_free0 (self->err); #line 77 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" BACKGROUND_JOB_CLASS (thumbnail_cache_async_fetch_job_parent_class)->finalize (obj); -#line 4427 "ThumbnailCache.c" +#line 4440 "ThumbnailCache.c" } -static GType thumbnail_cache_async_fetch_job_get_type (void) { +static GType +thumbnail_cache_async_fetch_job_get_type (void) +{ static volatile gsize thumbnail_cache_async_fetch_job_type_id__volatile = 0; if (g_once_init_enter (&thumbnail_cache_async_fetch_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ThumbnailCacheAsyncFetchJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) thumbnail_cache_async_fetch_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ThumbnailCacheAsyncFetchJob), 0, (GInstanceInitFunc) thumbnail_cache_async_fetch_job_instance_init, NULL }; @@ -4440,7 +4455,9 @@ static GType thumbnail_cache_async_fetch_job_get_type (void) { } -static void thumbnail_cache_class_init (ThumbnailCacheClass * klass) { +static void +thumbnail_cache_class_init (ThumbnailCacheClass * klass) +{ ThumbnailCacheSize* _tmp0_; #line 27 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_parent_class = g_type_class_peek_parent (klass); @@ -4458,11 +4475,13 @@ static void thumbnail_cache_class_init (ThumbnailCacheClass * klass) { thumbnail_cache_ALL_SIZES = _tmp0_; #line 54 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_ALL_SIZES_length1 = 2; -#line 4461 "ThumbnailCache.c" +#line 4478 "ThumbnailCache.c" } -static void thumbnail_cache_instance_init (ThumbnailCache * self) { +static void +thumbnail_cache_instance_init (ThumbnailCache * self) +{ GeeHashMap* _tmp0_; GeeArrayList* _tmp1_; #line 27 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4477,11 +4496,13 @@ static void thumbnail_cache_instance_init (ThumbnailCache * self) { self->priv->cache_lru = _tmp1_; #line 188 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self->priv->cached_bytes = (gulong) 0; -#line 4480 "ThumbnailCache.c" +#line 4499 "ThumbnailCache.c" } -static void thumbnail_cache_finalize (GObject * obj) { +static void +thumbnail_cache_finalize (GObject * obj) +{ ThumbnailCache * self; #line 27 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_THUMBNAIL_CACHE, ThumbnailCache); @@ -4493,11 +4514,13 @@ static void thumbnail_cache_finalize (GObject * obj) { _g_object_unref0 (self->priv->cache_lru); #line 27 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" G_OBJECT_CLASS (thumbnail_cache_parent_class)->finalize (obj); -#line 4496 "ThumbnailCache.c" +#line 4517 "ThumbnailCache.c" } -GType thumbnail_cache_get_type (void) { +GType +thumbnail_cache_get_type (void) +{ static volatile gsize thumbnail_cache_type_id__volatile = 0; if (g_once_init_enter (&thumbnail_cache_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ThumbnailCacheClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) thumbnail_cache_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ThumbnailCache), 0, (GInstanceInitFunc) thumbnail_cache_instance_init, NULL }; diff --git a/src/TimedQueue.c b/src/TimedQueue.c index 7aa045d..8775526 100644 --- a/src/TimedQueue.c +++ b/src/TimedQueue.c @@ -1,4 +1,4 @@ -/* TimedQueue.c generated by valac 0.36.6, the Vala compiler +/* TimedQueue.c generated by valac 0.40.4, the Vala compiler * generated from TimedQueue.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -18,6 +18,7 @@ /* The rate the items come off the queue can be spaced out. Note that this can cause items to back*/ /* up. As of today, TimedQueue makes no effort to combat this.*/ + #include #include #include @@ -62,9 +63,9 @@ typedef struct _TimedQueueParamSpecElement TimedQueueParamSpecElement; typedef struct _ParamSpecTimedQueue ParamSpecTimedQueue; enum { TIMED_QUEUE_PAUSED_SIGNAL, - TIMED_QUEUE_LAST_SIGNAL + TIMED_QUEUE_NUM_SIGNALS }; -static guint timed_queue_signals[TIMED_QUEUE_LAST_SIGNAL] = {0}; +static guint timed_queue_signals[TIMED_QUEUE_NUM_SIGNALS] = {0}; #define TYPE_HASH_TIMED_QUEUE (hash_timed_queue_get_type ()) #define HASH_TIMED_QUEUE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_HASH_TIMED_QUEUE, HashTimedQueue)) @@ -170,111 +171,209 @@ static gpointer hash_timed_queue_parent_class = NULL; gpointer timed_queue_ref (gpointer instance); void timed_queue_unref (gpointer instance); -GParamSpec* param_spec_timed_queue (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_timed_queue (GValue* value, gpointer v_object); -void value_take_timed_queue (GValue* value, gpointer v_object); +GParamSpec* param_spec_timed_queue (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_timed_queue (GValue* value, + gpointer v_object); +void value_take_timed_queue (GValue* value, + gpointer v_object); gpointer value_get_timed_queue (const GValue* value); GType timed_queue_get_type (void) G_GNUC_CONST; GType sorted_list_get_type (void) G_GNUC_CONST; static gpointer timed_queue_element_ref (gpointer instance); static void timed_queue_element_unref (gpointer instance); -static GParamSpec* timed_queue_param_spec_element (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; -static void timed_queue_value_set_element (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void timed_queue_value_take_element (GValue* value, gpointer v_object) G_GNUC_UNUSED; +static GParamSpec* timed_queue_param_spec_element (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) G_GNUC_UNUSED; +static void timed_queue_value_set_element (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void timed_queue_value_take_element (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer timed_queue_value_get_element (const GValue* value) G_GNUC_UNUSED; static GType timed_queue_element_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define TIMED_QUEUE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TIMED_QUEUE, TimedQueuePrivate)) -enum { - TIMED_QUEUE_DUMMY_PROPERTY -}; -TimedQueue* timed_queue_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority); -TimedQueue* timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority); -static gint64 timed_queue_element_comparator (void* a, void* b); -static gint64 _timed_queue_element_comparator_comparator (void* a, void* b, gpointer self); -SortedList* sorted_list_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target); -SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target); +TimedQueue* timed_queue_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + guint hold_msec, + DequeuedCallback callback, + void* callback_target, + GeeEqualDataFunc equal_func, + void* equal_func_target, + GDestroyNotify equal_func_target_destroy_notify, + gint priority); +TimedQueue* timed_queue_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + guint hold_msec, + DequeuedCallback callback, + void* callback_target, + GeeEqualDataFunc equal_func, + void* equal_func_target, + GDestroyNotify equal_func_target_destroy_notify, + gint priority); +static gint64 timed_queue_element_comparator (void* a, + void* b); +static gint64 _timed_queue_element_comparator_comparator (void* a, + void* b, + gpointer self); +SortedList* sorted_list_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + Comparator cmp, + void* cmp_target); +SortedList* sorted_list_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + Comparator cmp, + void* cmp_target); static guint timed_queue_get_heartbeat_timeout (TimedQueue* self); static gboolean timed_queue_on_heartbeat (TimedQueue* self); static gboolean _timed_queue_on_heartbeat_gsource_func (gpointer self); guint timed_queue_get_dequeue_spacing_msec (TimedQueue* self); -void timed_queue_set_dequeue_spacing_msec (TimedQueue* self, guint msec); -void timed_queue_notify_dequeued (TimedQueue* self, gconstpointer item); -static void timed_queue_real_notify_dequeued (TimedQueue* self, gconstpointer item); +void timed_queue_set_dequeue_spacing_msec (TimedQueue* self, + guint msec); +void timed_queue_notify_dequeued (TimedQueue* self, + gconstpointer item); +static void timed_queue_real_notify_dequeued (TimedQueue* self, + gconstpointer item); gboolean timed_queue_is_paused (TimedQueue* self); void timed_queue_pause (TimedQueue* self); void timed_queue_unpause (TimedQueue* self); void timed_queue_clear (TimedQueue* self); static void timed_queue_real_clear (TimedQueue* self); -gboolean timed_queue_contains (TimedQueue* self, gconstpointer item); -static gboolean timed_queue_real_contains (TimedQueue* self, gconstpointer item); -gboolean timed_queue_enqueue (TimedQueue* self, gconstpointer item); -static gboolean timed_queue_real_enqueue (TimedQueue* self, gconstpointer item); +gboolean timed_queue_contains (TimedQueue* self, + gconstpointer item); +static gboolean timed_queue_real_contains (TimedQueue* self, + gconstpointer item); +gboolean timed_queue_enqueue (TimedQueue* self, + gconstpointer item); +static gboolean timed_queue_real_enqueue (TimedQueue* self, + gconstpointer item); static gulong timed_queue_calc_ready_time (TimedQueue* self); -static TimedQueueElement* timed_queue_element_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer item, gulong ready); -static TimedQueueElement* timed_queue_element_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer item, gulong ready); -gboolean timed_queue_enqueue_many (TimedQueue* self, GeeCollection* items); -static gboolean timed_queue_real_enqueue_many (TimedQueue* self, GeeCollection* items); -gboolean sorted_list_add_list (SortedList* self, GeeList* items); -gboolean timed_queue_remove_first (TimedQueue* self, gconstpointer item); -static gboolean timed_queue_real_remove_first (TimedQueue* self, gconstpointer item); +static TimedQueueElement* timed_queue_element_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + gconstpointer item, + gulong ready); +static TimedQueueElement* timed_queue_element_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + gconstpointer item, + gulong ready); +gboolean timed_queue_enqueue_many (TimedQueue* self, + GeeCollection* items); +static gboolean timed_queue_real_enqueue_many (TimedQueue* self, + GeeCollection* items); +gboolean sorted_list_add_list (SortedList* self, + GeeList* items); +gboolean timed_queue_remove_first (TimedQueue* self, + gconstpointer item); +static gboolean timed_queue_real_remove_first (TimedQueue* self, + gconstpointer item); gulong now_ms (void); -gpointer sorted_list_get_at (SortedList* self, gint index); -gpointer sorted_list_remove_at (SortedList* self, gint index); +gpointer sorted_list_get_at (SortedList* self, + gint index); +gpointer sorted_list_remove_at (SortedList* self, + gint index); gint timed_queue_get_size (TimedQueue* self); -static void timed_queue_real_paused (TimedQueue* self, gboolean is_paused); +static void timed_queue_real_paused (TimedQueue* self, + gboolean is_paused); #define TIMED_QUEUE_ELEMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TIMED_QUEUE_TYPE_ELEMENT, TimedQueueElementPrivate)) -enum { - TIMED_QUEUE_ELEMENT_DUMMY_PROPERTY -}; static void timed_queue_element_finalize (TimedQueueElement * obj); static void timed_queue_finalize (TimedQueue * obj); GType hash_timed_queue_get_type (void) G_GNUC_CONST; #define HASH_TIMED_QUEUE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_HASH_TIMED_QUEUE, HashTimedQueuePrivate)) -enum { - HASH_TIMED_QUEUE_DUMMY_PROPERTY -}; -HashTimedQueue* hash_timed_queue_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeHashDataFunc hash_func, void* hash_func_target, GDestroyNotify hash_func_target_destroy_notify, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority); -HashTimedQueue* hash_timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeHashDataFunc hash_func, void* hash_func_target, GDestroyNotify hash_func_target_destroy_notify, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority); -static void hash_timed_queue_real_notify_dequeued (TimedQueue* base, gconstpointer item); -static void hash_timed_queue_removed (HashTimedQueue* self, gconstpointer item); +HashTimedQueue* hash_timed_queue_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + guint hold_msec, + DequeuedCallback callback, + void* callback_target, + GeeHashDataFunc hash_func, + void* hash_func_target, + GDestroyNotify hash_func_target_destroy_notify, + GeeEqualDataFunc equal_func, + void* equal_func_target, + GDestroyNotify equal_func_target_destroy_notify, + gint priority); +HashTimedQueue* hash_timed_queue_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + guint hold_msec, + DequeuedCallback callback, + void* callback_target, + GeeHashDataFunc hash_func, + void* hash_func_target, + GDestroyNotify hash_func_target_destroy_notify, + GeeEqualDataFunc equal_func, + void* equal_func_target, + GDestroyNotify equal_func_target_destroy_notify, + gint priority); +static void hash_timed_queue_real_notify_dequeued (TimedQueue* base, + gconstpointer item); +static void hash_timed_queue_removed (HashTimedQueue* self, + gconstpointer item); static void hash_timed_queue_real_clear (TimedQueue* base); -static gboolean hash_timed_queue_real_contains (TimedQueue* base, gconstpointer item); -static gboolean hash_timed_queue_real_enqueue (TimedQueue* base, gconstpointer item); -static gboolean hash_timed_queue_real_enqueue_many (TimedQueue* base, GeeCollection* items); -static gboolean hash_timed_queue_real_remove_first (TimedQueue* base, gconstpointer item); +static gboolean hash_timed_queue_real_contains (TimedQueue* base, + gconstpointer item); +static gboolean hash_timed_queue_real_enqueue (TimedQueue* base, + gconstpointer item); +static gboolean hash_timed_queue_real_enqueue_many (TimedQueue* base, + GeeCollection* items); +static gboolean hash_timed_queue_real_remove_first (TimedQueue* base, + gconstpointer item); static void hash_timed_queue_finalize (TimedQueue * obj); -static gint64 _timed_queue_element_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_timed_queue_element_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = timed_queue_element_comparator (a, b); #line 64 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 254 "TimedQueue.c" +#line 348 "TimedQueue.c" } -static gboolean _timed_queue_on_heartbeat_gsource_func (gpointer self) { +static gboolean +_timed_queue_on_heartbeat_gsource_func (gpointer self) +{ gboolean result; result = timed_queue_on_heartbeat ((TimedQueue*) self); #line 66 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 263 "TimedQueue.c" -} - - -TimedQueue* timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority) { +#line 359 "TimedQueue.c" +} + + +TimedQueue* +timed_queue_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + guint hold_msec, + DequeuedCallback callback, + void* callback_target, + GeeEqualDataFunc equal_func, + void* equal_func_target, + GDestroyNotify equal_func_target_destroy_notify, + gint priority) +{ TimedQueue* self = NULL; - guint _tmp0_; - DequeuedCallback _tmp1_; - void* _tmp1__target; - GeeEqualDataFunc _tmp2_; - void* _tmp2__target; - gint _tmp7_; - SortedList* _tmp8_; - guint _tmp9_; - gint _tmp10_; - guint _tmp11_; + SortedList* _tmp4_; #line 52 "/home/jens/Source/shotwell/src/TimedQueue.vala" self = (TimedQueue*) g_type_create_instance (object_type); #line 52 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -284,33 +383,23 @@ TimedQueue* timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFu #line 52 "/home/jens/Source/shotwell/src/TimedQueue.vala" self->priv->g_destroy_func = g_destroy_func; #line 54 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp0_ = hold_msec; -#line 54 "/home/jens/Source/shotwell/src/TimedQueue.vala" - self->priv->hold_msec = _tmp0_; + self->priv->hold_msec = hold_msec; #line 55 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp1_ = callback; + self->priv->callback = callback; #line 55 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp1__target = callback_target; -#line 55 "/home/jens/Source/shotwell/src/TimedQueue.vala" - self->priv->callback = _tmp1_; -#line 55 "/home/jens/Source/shotwell/src/TimedQueue.vala" - self->priv->callback_target = _tmp1__target; + self->priv->callback_target = callback_target; #line 57 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp2_ = equal_func; -#line 57 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp2__target = equal_func_target; -#line 57 "/home/jens/Source/shotwell/src/TimedQueue.vala" - if (_tmp2_ != NULL) { -#line 305 "TimedQueue.c" - GeeEqualDataFunc _tmp3_; - void* _tmp3__target; - GDestroyNotify _tmp3__target_destroy_notify; + if (equal_func != NULL) { +#line 394 "TimedQueue.c" + GeeEqualDataFunc _tmp0_; + void* _tmp0__target; + GDestroyNotify _tmp0__target_destroy_notify; #line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp3_ = equal_func; + _tmp0_ = equal_func; #line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp3__target = equal_func_target; + _tmp0__target = equal_func_target; #line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp3__target_destroy_notify = equal_func_target_destroy_notify; + _tmp0__target_destroy_notify = equal_func_target_destroy_notify; #line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala" equal_func = NULL; #line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -326,18 +415,18 @@ TimedQueue* timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFu #line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala" self->priv->equal_func_target_destroy_notify = NULL; #line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala" - self->priv->equal_func = _tmp3_; + self->priv->equal_func = _tmp0_; #line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala" - self->priv->equal_func_target = _tmp3__target; + self->priv->equal_func_target = _tmp0__target; #line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala" - self->priv->equal_func_target_destroy_notify = _tmp3__target_destroy_notify; -#line 335 "TimedQueue.c" + self->priv->equal_func_target_destroy_notify = _tmp0__target_destroy_notify; +#line 424 "TimedQueue.c" } else { - void* _tmp4_; - GDestroyNotify _tmp5_; - GeeEqualDataFunc _tmp6_; + void* _tmp1_; + GDestroyNotify _tmp2_; + GeeEqualDataFunc _tmp3_; #line 60 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp6_ = gee_functions_get_equal_func_for (g_type, &_tmp4_, &_tmp5_); + _tmp3_ = gee_functions_get_equal_func_for (g_type, &_tmp1_, &_tmp2_); #line 60 "/home/jens/Source/shotwell/src/TimedQueue.vala" (self->priv->equal_func_target_destroy_notify == NULL) ? NULL : (self->priv->equal_func_target_destroy_notify (self->priv->equal_func_target), NULL); #line 60 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -347,31 +436,23 @@ TimedQueue* timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFu #line 60 "/home/jens/Source/shotwell/src/TimedQueue.vala" self->priv->equal_func_target_destroy_notify = NULL; #line 60 "/home/jens/Source/shotwell/src/TimedQueue.vala" - self->priv->equal_func = (GeeEqualDataFunc) _tmp6_; + self->priv->equal_func = (GeeEqualDataFunc) _tmp3_; #line 60 "/home/jens/Source/shotwell/src/TimedQueue.vala" - self->priv->equal_func_target = _tmp4_; + self->priv->equal_func_target = _tmp1_; #line 60 "/home/jens/Source/shotwell/src/TimedQueue.vala" - self->priv->equal_func_target_destroy_notify = _tmp5_; -#line 356 "TimedQueue.c" + self->priv->equal_func_target_destroy_notify = _tmp2_; +#line 445 "TimedQueue.c" } #line 62 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp7_ = priority; -#line 62 "/home/jens/Source/shotwell/src/TimedQueue.vala" - self->priv->priority = _tmp7_; + self->priv->priority = priority; #line 64 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp8_ = sorted_list_new (TIMED_QUEUE_TYPE_ELEMENT, (GBoxedCopyFunc) timed_queue_element_ref, (GDestroyNotify) timed_queue_element_unref, _timed_queue_element_comparator_comparator, NULL); + _tmp4_ = sorted_list_new (TIMED_QUEUE_TYPE_ELEMENT, (GBoxedCopyFunc) timed_queue_element_ref, (GDestroyNotify) timed_queue_element_unref, _timed_queue_element_comparator_comparator, NULL); #line 64 "/home/jens/Source/shotwell/src/TimedQueue.vala" _g_object_unref0 (self->priv->queue); #line 64 "/home/jens/Source/shotwell/src/TimedQueue.vala" - self->priv->queue = _tmp8_; -#line 66 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp9_ = timed_queue_get_heartbeat_timeout (self); + self->priv->queue = _tmp4_; #line 66 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp10_ = priority; -#line 66 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp11_ = g_timeout_add_full (_tmp10_, _tmp9_, _timed_queue_on_heartbeat_gsource_func, timed_queue_ref (self), timed_queue_unref); -#line 66 "/home/jens/Source/shotwell/src/TimedQueue.vala" - self->priv->timer_id = _tmp11_; + self->priv->timer_id = g_timeout_add_full (priority, timed_queue_get_heartbeat_timeout (self), _timed_queue_on_heartbeat_gsource_func, timed_queue_ref (self), timed_queue_unref); #line 52 "/home/jens/Source/shotwell/src/TimedQueue.vala" (equal_func_target_destroy_notify == NULL) ? NULL : (equal_func_target_destroy_notify (equal_func_target), NULL); #line 52 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -382,18 +463,31 @@ TimedQueue* timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFu equal_func_target_destroy_notify = NULL; #line 52 "/home/jens/Source/shotwell/src/TimedQueue.vala" return self; -#line 386 "TimedQueue.c" -} - - -TimedQueue* timed_queue_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority) { +#line 467 "TimedQueue.c" +} + + +TimedQueue* +timed_queue_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + guint hold_msec, + DequeuedCallback callback, + void* callback_target, + GeeEqualDataFunc equal_func, + void* equal_func_target, + GDestroyNotify equal_func_target_destroy_notify, + gint priority) +{ #line 52 "/home/jens/Source/shotwell/src/TimedQueue.vala" return timed_queue_construct (TYPE_TIMED_QUEUE, g_type, g_dup_func, g_destroy_func, hold_msec, callback, callback_target, equal_func, equal_func_target, equal_func_target_destroy_notify, priority); -#line 393 "TimedQueue.c" +#line 485 "TimedQueue.c" } -guint timed_queue_get_dequeue_spacing_msec (TimedQueue* self) { +guint +timed_queue_get_dequeue_spacing_msec (TimedQueue* self) +{ guint result = 0U; guint _tmp0_; #line 74 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -404,120 +498,115 @@ guint timed_queue_get_dequeue_spacing_msec (TimedQueue* self) { result = _tmp0_; #line 75 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 408 "TimedQueue.c" +#line 502 "TimedQueue.c" } -void timed_queue_set_dequeue_spacing_msec (TimedQueue* self, guint msec) { +void +timed_queue_set_dequeue_spacing_msec (TimedQueue* self, + guint msec) +{ guint _tmp0_; guint _tmp1_; - guint _tmp2_; - guint _tmp4_; - guint _tmp5_; - gint _tmp6_; - guint _tmp7_; + gint _tmp3_; #line 78 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_if_fail (IS_TIMED_QUEUE (self)); #line 79 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp0_ = msec; -#line 79 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp1_ = self->priv->dequeue_spacing_msec; + _tmp0_ = self->priv->dequeue_spacing_msec; #line 79 "/home/jens/Source/shotwell/src/TimedQueue.vala" - if (_tmp0_ == _tmp1_) { + if (msec == _tmp0_) { #line 80 "/home/jens/Source/shotwell/src/TimedQueue.vala" return; -#line 430 "TimedQueue.c" +#line 521 "TimedQueue.c" } #line 82 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp2_ = self->priv->timer_id; + _tmp1_ = self->priv->timer_id; #line 82 "/home/jens/Source/shotwell/src/TimedQueue.vala" - if (_tmp2_ != ((guint) 0)) { -#line 436 "TimedQueue.c" - guint _tmp3_; + if (_tmp1_ != ((guint) 0)) { +#line 527 "TimedQueue.c" + guint _tmp2_; #line 83 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp3_ = self->priv->timer_id; + _tmp2_ = self->priv->timer_id; #line 83 "/home/jens/Source/shotwell/src/TimedQueue.vala" - g_source_remove (_tmp3_); -#line 442 "TimedQueue.c" + g_source_remove (_tmp2_); +#line 533 "TimedQueue.c" } #line 85 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp4_ = msec; -#line 85 "/home/jens/Source/shotwell/src/TimedQueue.vala" - self->priv->dequeue_spacing_msec = _tmp4_; -#line 87 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp5_ = timed_queue_get_heartbeat_timeout (self); -#line 87 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp6_ = self->priv->priority; + self->priv->dequeue_spacing_msec = msec; #line 87 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp7_ = g_timeout_add_full (_tmp6_, _tmp5_, _timed_queue_on_heartbeat_gsource_func, timed_queue_ref (self), timed_queue_unref); + _tmp3_ = self->priv->priority; #line 87 "/home/jens/Source/shotwell/src/TimedQueue.vala" - self->priv->timer_id = _tmp7_; -#line 456 "TimedQueue.c" + self->priv->timer_id = g_timeout_add_full (_tmp3_, timed_queue_get_heartbeat_timeout (self), _timed_queue_on_heartbeat_gsource_func, timed_queue_ref (self), timed_queue_unref); +#line 541 "TimedQueue.c" } -static guint timed_queue_get_heartbeat_timeout (TimedQueue* self) { +static guint +timed_queue_get_heartbeat_timeout (TimedQueue* self) +{ guint result = 0U; guint _tmp0_ = 0U; guint _tmp1_; - guint _tmp4_; #line 90 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_val_if_fail (IS_TIMED_QUEUE (self), 0U); #line 91 "/home/jens/Source/shotwell/src/TimedQueue.vala" _tmp1_ = self->priv->dequeue_spacing_msec; #line 91 "/home/jens/Source/shotwell/src/TimedQueue.vala" if (_tmp1_ == ((guint) 0)) { -#line 471 "TimedQueue.c" +#line 557 "TimedQueue.c" guint _tmp2_; #line 92 "/home/jens/Source/shotwell/src/TimedQueue.vala" _tmp2_ = self->priv->hold_msec; #line 92 "/home/jens/Source/shotwell/src/TimedQueue.vala" _tmp0_ = _tmp2_ / 10; -#line 477 "TimedQueue.c" +#line 563 "TimedQueue.c" } else { guint _tmp3_; #line 93 "/home/jens/Source/shotwell/src/TimedQueue.vala" _tmp3_ = self->priv->dequeue_spacing_msec; #line 93 "/home/jens/Source/shotwell/src/TimedQueue.vala" _tmp0_ = _tmp3_ / 2; -#line 484 "TimedQueue.c" +#line 570 "TimedQueue.c" } #line 91 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp4_ = CLAMP (_tmp0_, (guint) 10, G_MAXUINT); -#line 91 "/home/jens/Source/shotwell/src/TimedQueue.vala" - result = _tmp4_; + result = CLAMP (_tmp0_, (guint) 10, G_MAXUINT); #line 91 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 492 "TimedQueue.c" +#line 576 "TimedQueue.c" } -static void timed_queue_real_notify_dequeued (TimedQueue* self, gconstpointer item) { +static void +timed_queue_real_notify_dequeued (TimedQueue* self, + gconstpointer item) +{ DequeuedCallback _tmp0_; void* _tmp0__target; - gconstpointer _tmp1_; #line 97 "/home/jens/Source/shotwell/src/TimedQueue.vala" _tmp0_ = self->priv->callback; #line 97 "/home/jens/Source/shotwell/src/TimedQueue.vala" _tmp0__target = self->priv->callback_target; #line 97 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp1_ = item; -#line 97 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp0_ (_tmp1_, _tmp0__target); -#line 508 "TimedQueue.c" + _tmp0_ (item, _tmp0__target); +#line 592 "TimedQueue.c" } -void timed_queue_notify_dequeued (TimedQueue* self, gconstpointer item) { +void +timed_queue_notify_dequeued (TimedQueue* self, + gconstpointer item) +{ #line 96 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_if_fail (IS_TIMED_QUEUE (self)); #line 96 "/home/jens/Source/shotwell/src/TimedQueue.vala" TIMED_QUEUE_GET_CLASS (self)->notify_dequeued (self, item); -#line 517 "TimedQueue.c" +#line 604 "TimedQueue.c" } -gboolean timed_queue_is_paused (TimedQueue* self) { +gboolean +timed_queue_is_paused (TimedQueue* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 100 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -528,11 +617,13 @@ gboolean timed_queue_is_paused (TimedQueue* self) { result = _tmp0_; #line 101 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 532 "TimedQueue.c" +#line 621 "TimedQueue.c" } -void timed_queue_pause (TimedQueue* self) { +void +timed_queue_pause (TimedQueue* self) +{ gboolean _tmp0_; #line 104 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_if_fail (IS_TIMED_QUEUE (self)); @@ -542,17 +633,19 @@ void timed_queue_pause (TimedQueue* self) { if (_tmp0_) { #line 106 "/home/jens/Source/shotwell/src/TimedQueue.vala" return; -#line 546 "TimedQueue.c" +#line 637 "TimedQueue.c" } #line 108 "/home/jens/Source/shotwell/src/TimedQueue.vala" self->priv->paused_state = TRUE; #line 110 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_signal_emit (self, timed_queue_signals[TIMED_QUEUE_PAUSED_SIGNAL], 0, TRUE); -#line 552 "TimedQueue.c" +#line 643 "TimedQueue.c" } -void timed_queue_unpause (TimedQueue* self) { +void +timed_queue_unpause (TimedQueue* self) +{ gboolean _tmp0_; #line 113 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_if_fail (IS_TIMED_QUEUE (self)); @@ -562,36 +655,43 @@ void timed_queue_unpause (TimedQueue* self) { if (!_tmp0_) { #line 115 "/home/jens/Source/shotwell/src/TimedQueue.vala" return; -#line 566 "TimedQueue.c" +#line 659 "TimedQueue.c" } #line 117 "/home/jens/Source/shotwell/src/TimedQueue.vala" self->priv->paused_state = FALSE; #line 119 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_signal_emit (self, timed_queue_signals[TIMED_QUEUE_PAUSED_SIGNAL], 0, FALSE); -#line 572 "TimedQueue.c" +#line 665 "TimedQueue.c" } -static void timed_queue_real_clear (TimedQueue* self) { +static void +timed_queue_real_clear (TimedQueue* self) +{ SortedList* _tmp0_; #line 123 "/home/jens/Source/shotwell/src/TimedQueue.vala" _tmp0_ = self->priv->queue; #line 123 "/home/jens/Source/shotwell/src/TimedQueue.vala" gee_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 582 "TimedQueue.c" +#line 677 "TimedQueue.c" } -void timed_queue_clear (TimedQueue* self) { +void +timed_queue_clear (TimedQueue* self) +{ #line 122 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_if_fail (IS_TIMED_QUEUE (self)); #line 122 "/home/jens/Source/shotwell/src/TimedQueue.vala" TIMED_QUEUE_GET_CLASS (self)->clear (self); -#line 591 "TimedQueue.c" +#line 688 "TimedQueue.c" } -static gboolean timed_queue_real_contains (TimedQueue* self, gconstpointer item) { +static gboolean +timed_queue_real_contains (TimedQueue* self, + gconstpointer item) +{ gboolean result = FALSE; { GeeIterator* _e_it = NULL; @@ -605,48 +705,39 @@ static gboolean timed_queue_real_contains (TimedQueue* self, gconstpointer item) _e_it = _tmp1_; #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala" while (TRUE) { -#line 609 "TimedQueue.c" +#line 709 "TimedQueue.c" GeeIterator* _tmp2_; - gboolean _tmp3_; TimedQueueElement* e = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - GeeEqualDataFunc _tmp6_; - void* _tmp6__target; + GeeIterator* _tmp3_; + gpointer _tmp4_; + GeeEqualDataFunc _tmp5_; + void* _tmp5__target; + TimedQueueElement* _tmp6_; gconstpointer _tmp7_; - TimedQueueElement* _tmp8_; - gconstpointer _tmp9_; - gboolean _tmp10_; #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala" _tmp2_ = _e_it; #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala" break; -#line 629 "TimedQueue.c" +#line 724 "TimedQueue.c" } #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp4_ = _e_it; + _tmp3_ = _e_it; #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala" - e = (TimedQueueElement*) _tmp5_; -#line 128 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp6_ = self->priv->equal_func; -#line 128 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp6__target = self->priv->equal_func_target; + e = (TimedQueueElement*) _tmp4_; #line 128 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp7_ = item; + _tmp5_ = self->priv->equal_func; #line 128 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp8_ = e; + _tmp5__target = self->priv->equal_func_target; #line 128 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp9_ = _tmp8_->item; + _tmp6_ = e; #line 128 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp10_ = _tmp6_ (_tmp7_, _tmp9_, _tmp6__target); + _tmp7_ = _tmp6_->item; #line 128 "/home/jens/Source/shotwell/src/TimedQueue.vala" - if (_tmp10_) { + if (_tmp5_ (item, _tmp7_, _tmp5__target)) { #line 129 "/home/jens/Source/shotwell/src/TimedQueue.vala" result = TRUE; #line 129 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -655,182 +746,179 @@ static gboolean timed_queue_real_contains (TimedQueue* self, gconstpointer item) _g_object_unref0 (_e_it); #line 129 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 659 "TimedQueue.c" +#line 750 "TimedQueue.c" } #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala" _timed_queue_element_unref0 (e); -#line 663 "TimedQueue.c" +#line 754 "TimedQueue.c" } #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala" _g_object_unref0 (_e_it); -#line 667 "TimedQueue.c" +#line 758 "TimedQueue.c" } #line 132 "/home/jens/Source/shotwell/src/TimedQueue.vala" result = FALSE; #line 132 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 673 "TimedQueue.c" +#line 764 "TimedQueue.c" } -gboolean timed_queue_contains (TimedQueue* self, gconstpointer item) { +gboolean +timed_queue_contains (TimedQueue* self, + gconstpointer item) +{ #line 126 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_val_if_fail (IS_TIMED_QUEUE (self), FALSE); #line 126 "/home/jens/Source/shotwell/src/TimedQueue.vala" return TIMED_QUEUE_GET_CLASS (self)->contains (self, item); -#line 682 "TimedQueue.c" +#line 776 "TimedQueue.c" } -static gboolean timed_queue_real_enqueue (TimedQueue* self, gconstpointer item) { +static gboolean +timed_queue_real_enqueue (TimedQueue* self, + gconstpointer item) +{ gboolean result = FALSE; SortedList* _tmp0_; - gconstpointer _tmp1_; - gulong _tmp2_; - TimedQueueElement* _tmp3_; - TimedQueueElement* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; + TimedQueueElement* _tmp1_; + TimedQueueElement* _tmp2_; + gboolean _tmp3_; #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala" _tmp0_ = self->priv->queue; #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp1_ = item; -#line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp2_ = timed_queue_calc_ready_time (self); + _tmp1_ = timed_queue_element_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, (GDestroyNotify) self->priv->g_destroy_func, item, timed_queue_calc_ready_time (self)); #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp3_ = timed_queue_element_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, (GDestroyNotify) self->priv->g_destroy_func, _tmp1_, _tmp2_); -#line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp4_ = _tmp3_; -#line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp5_ = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp4_); + _tmp2_ = _tmp1_; #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp6_ = _tmp5_; + _tmp3_ = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp2_); #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _timed_queue_element_unref0 (_tmp4_); + _timed_queue_element_unref0 (_tmp2_); #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala" - result = _tmp6_; + result = _tmp3_; #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 715 "TimedQueue.c" +#line 803 "TimedQueue.c" } -gboolean timed_queue_enqueue (TimedQueue* self, gconstpointer item) { +gboolean +timed_queue_enqueue (TimedQueue* self, + gconstpointer item) +{ #line 135 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_val_if_fail (IS_TIMED_QUEUE (self), FALSE); #line 135 "/home/jens/Source/shotwell/src/TimedQueue.vala" return TIMED_QUEUE_GET_CLASS (self)->enqueue (self, item); -#line 724 "TimedQueue.c" +#line 815 "TimedQueue.c" } -static gboolean timed_queue_real_enqueue_many (TimedQueue* self, GeeCollection* items) { +static gboolean +timed_queue_real_enqueue_many (TimedQueue* self, + GeeCollection* items) +{ gboolean result = FALSE; gulong ready_time = 0UL; - gulong _tmp0_; GeeArrayList* elements = NULL; - GeeArrayList* _tmp1_; - SortedList* _tmp13_; - GeeArrayList* _tmp14_; - gboolean _tmp15_; + GeeArrayList* _tmp0_; + SortedList* _tmp10_; + GeeArrayList* _tmp11_; #line 139 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_val_if_fail (GEE_IS_COLLECTION (items), FALSE); #line 140 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp0_ = timed_queue_calc_ready_time (self); -#line 140 "/home/jens/Source/shotwell/src/TimedQueue.vala" - ready_time = _tmp0_; + ready_time = timed_queue_calc_ready_time (self); #line 142 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp1_ = gee_array_list_new (TIMED_QUEUE_TYPE_ELEMENT, (GBoxedCopyFunc) timed_queue_element_ref, (GDestroyNotify) timed_queue_element_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TIMED_QUEUE_TYPE_ELEMENT, (GBoxedCopyFunc) timed_queue_element_ref, (GDestroyNotify) timed_queue_element_unref, NULL, NULL, NULL); #line 142 "/home/jens/Source/shotwell/src/TimedQueue.vala" - elements = _tmp1_; -#line 747 "TimedQueue.c" + elements = _tmp0_; +#line 837 "TimedQueue.c" { GeeIterator* _item_it = NULL; - GeeCollection* _tmp2_; - GeeIterator* _tmp3_; -#line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp2_ = items; + GeeIterator* _tmp1_; #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (items, GEE_TYPE_ITERABLE, GeeIterable)); #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _item_it = _tmp3_; + _item_it = _tmp1_; #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala" while (TRUE) { -#line 760 "TimedQueue.c" - GeeIterator* _tmp4_; - gboolean _tmp5_; +#line 847 "TimedQueue.c" + GeeIterator* _tmp2_; gpointer item = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - GeeArrayList* _tmp8_; - gconstpointer _tmp9_; - gulong _tmp10_; - TimedQueueElement* _tmp11_; - TimedQueueElement* _tmp12_; -#line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp4_ = _item_it; + GeeIterator* _tmp3_; + gpointer _tmp4_; + GeeArrayList* _tmp5_; + gconstpointer _tmp6_; + gulong _tmp7_; + TimedQueueElement* _tmp8_; + TimedQueueElement* _tmp9_; #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp5_ = gee_iterator_next (_tmp4_); + _tmp2_ = _item_it; #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp2_)) { #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala" break; -#line 779 "TimedQueue.c" +#line 863 "TimedQueue.c" } #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp6_ = _item_it; + _tmp3_ = _item_it; #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala" - item = _tmp7_; + item = _tmp4_; #line 144 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp8_ = elements; + _tmp5_ = elements; #line 144 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp9_ = item; + _tmp6_ = item; #line 144 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp10_ = ready_time; + _tmp7_ = ready_time; #line 144 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp11_ = timed_queue_element_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, (GDestroyNotify) self->priv->g_destroy_func, _tmp9_, _tmp10_); + _tmp8_ = timed_queue_element_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, (GDestroyNotify) self->priv->g_destroy_func, _tmp6_, _tmp7_); #line 144 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp12_ = _tmp11_; + _tmp9_ = _tmp8_; #line 144 "/home/jens/Source/shotwell/src/TimedQueue.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp12_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_); #line 144 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _timed_queue_element_unref0 (_tmp12_); + _timed_queue_element_unref0 (_tmp9_); #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala" ((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL)); -#line 803 "TimedQueue.c" +#line 887 "TimedQueue.c" } #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala" _g_object_unref0 (_item_it); -#line 807 "TimedQueue.c" +#line 891 "TimedQueue.c" } #line 146 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp13_ = self->priv->queue; -#line 146 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp14_ = elements; + _tmp10_ = self->priv->queue; #line 146 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp15_ = sorted_list_add_list (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_LIST, GeeList)); + _tmp11_ = elements; #line 146 "/home/jens/Source/shotwell/src/TimedQueue.vala" - result = _tmp15_; + result = sorted_list_add_list (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_LIST, GeeList)); #line 146 "/home/jens/Source/shotwell/src/TimedQueue.vala" _g_object_unref0 (elements); #line 146 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 821 "TimedQueue.c" +#line 903 "TimedQueue.c" } -gboolean timed_queue_enqueue_many (TimedQueue* self, GeeCollection* items) { +gboolean +timed_queue_enqueue_many (TimedQueue* self, + GeeCollection* items) +{ #line 139 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_val_if_fail (IS_TIMED_QUEUE (self), FALSE); #line 139 "/home/jens/Source/shotwell/src/TimedQueue.vala" return TIMED_QUEUE_GET_CLASS (self)->enqueue_many (self, items); -#line 830 "TimedQueue.c" +#line 915 "TimedQueue.c" } -static gboolean timed_queue_real_remove_first (TimedQueue* self, gconstpointer item) { +static gboolean +timed_queue_real_remove_first (TimedQueue* self, + gconstpointer item) +{ gboolean result = FALSE; GeeIterator* iter = NULL; SortedList* _tmp0_; @@ -843,54 +931,45 @@ static gboolean timed_queue_real_remove_first (TimedQueue* self, gconstpointer i iter = _tmp1_; #line 151 "/home/jens/Source/shotwell/src/TimedQueue.vala" while (TRUE) { -#line 847 "TimedQueue.c" +#line 935 "TimedQueue.c" GeeIterator* _tmp2_; - gboolean _tmp3_; TimedQueueElement* e = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - GeeEqualDataFunc _tmp6_; - void* _tmp6__target; + GeeIterator* _tmp3_; + gpointer _tmp4_; + GeeEqualDataFunc _tmp5_; + void* _tmp5__target; + TimedQueueElement* _tmp6_; gconstpointer _tmp7_; - TimedQueueElement* _tmp8_; - gconstpointer _tmp9_; - gboolean _tmp10_; #line 151 "/home/jens/Source/shotwell/src/TimedQueue.vala" _tmp2_ = iter; #line 151 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 151 "/home/jens/Source/shotwell/src/TimedQueue.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 151 "/home/jens/Source/shotwell/src/TimedQueue.vala" break; -#line 867 "TimedQueue.c" +#line 950 "TimedQueue.c" } #line 152 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp4_ = iter; + _tmp3_ = iter; #line 152 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 152 "/home/jens/Source/shotwell/src/TimedQueue.vala" - e = (TimedQueueElement*) _tmp5_; -#line 153 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp6_ = self->priv->equal_func; + e = (TimedQueueElement*) _tmp4_; #line 153 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp6__target = self->priv->equal_func_target; + _tmp5_ = self->priv->equal_func; #line 153 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp7_ = item; + _tmp5__target = self->priv->equal_func_target; #line 153 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp8_ = e; + _tmp6_ = e; #line 153 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp9_ = _tmp8_->item; + _tmp7_ = _tmp6_->item; #line 153 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp10_ = _tmp6_ (_tmp7_, _tmp9_, _tmp6__target); -#line 153 "/home/jens/Source/shotwell/src/TimedQueue.vala" - if (_tmp10_) { -#line 889 "TimedQueue.c" - GeeIterator* _tmp11_; + if (_tmp5_ (item, _tmp7_, _tmp5__target)) { +#line 968 "TimedQueue.c" + GeeIterator* _tmp8_; #line 154 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp11_ = iter; + _tmp8_ = iter; #line 154 "/home/jens/Source/shotwell/src/TimedQueue.vala" - gee_iterator_remove (_tmp11_); + gee_iterator_remove (_tmp8_); #line 156 "/home/jens/Source/shotwell/src/TimedQueue.vala" result = TRUE; #line 156 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -899,11 +978,11 @@ static gboolean timed_queue_real_remove_first (TimedQueue* self, gconstpointer i _g_object_unref0 (iter); #line 156 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 903 "TimedQueue.c" +#line 982 "TimedQueue.c" } #line 151 "/home/jens/Source/shotwell/src/TimedQueue.vala" _timed_queue_element_unref0 (e); -#line 907 "TimedQueue.c" +#line 986 "TimedQueue.c" } #line 160 "/home/jens/Source/shotwell/src/TimedQueue.vala" result = FALSE; @@ -911,38 +990,42 @@ static gboolean timed_queue_real_remove_first (TimedQueue* self, gconstpointer i _g_object_unref0 (iter); #line 160 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 915 "TimedQueue.c" +#line 994 "TimedQueue.c" } -gboolean timed_queue_remove_first (TimedQueue* self, gconstpointer item) { +gboolean +timed_queue_remove_first (TimedQueue* self, + gconstpointer item) +{ #line 149 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_val_if_fail (IS_TIMED_QUEUE (self), FALSE); #line 149 "/home/jens/Source/shotwell/src/TimedQueue.vala" return TIMED_QUEUE_GET_CLASS (self)->remove_first (self, item); -#line 924 "TimedQueue.c" +#line 1006 "TimedQueue.c" } -static gulong timed_queue_calc_ready_time (TimedQueue* self) { +static gulong +timed_queue_calc_ready_time (TimedQueue* self) +{ gulong result = 0UL; - gulong _tmp0_; - guint _tmp1_; + guint _tmp0_; #line 169 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_val_if_fail (IS_TIMED_QUEUE (self), 0UL); #line 170 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp0_ = now_ms (); + _tmp0_ = self->priv->hold_msec; #line 170 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp1_ = self->priv->hold_msec; -#line 170 "/home/jens/Source/shotwell/src/TimedQueue.vala" - result = _tmp0_ + ((gulong) _tmp1_); + result = now_ms () + ((gulong) _tmp0_); #line 170 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 942 "TimedQueue.c" +#line 1023 "TimedQueue.c" } -static gboolean timed_queue_on_heartbeat (TimedQueue* self) { +static gboolean +timed_queue_on_heartbeat (TimedQueue* self) +{ gboolean result = FALSE; gboolean _tmp0_; gulong now = 0UL; @@ -956,18 +1039,18 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) { result = TRUE; #line 175 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 960 "TimedQueue.c" +#line 1043 "TimedQueue.c" } #line 177 "/home/jens/Source/shotwell/src/TimedQueue.vala" now = (gulong) 0; -#line 964 "TimedQueue.c" +#line 1047 "TimedQueue.c" { gboolean _tmp1_ = FALSE; #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala" _tmp1_ = TRUE; #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala" while (TRUE) { -#line 971 "TimedQueue.c" +#line 1054 "TimedQueue.c" SortedList* _tmp2_; gint _tmp3_; gint _tmp4_; @@ -976,23 +1059,23 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) { gpointer _tmp6_; TimedQueueElement* _tmp7_; gulong _tmp8_; - TimedQueueElement* _tmp10_; + TimedQueueElement* _tmp9_; + gulong _tmp10_; gulong _tmp11_; - gulong _tmp12_; - gboolean _tmp13_ = FALSE; - guint _tmp14_; + gboolean _tmp12_ = FALSE; + guint _tmp13_; TimedQueueElement* h = NULL; - SortedList* _tmp18_; - gpointer _tmp19_; + SortedList* _tmp17_; + gpointer _tmp18_; + TimedQueueElement* _tmp19_; TimedQueueElement* _tmp20_; TimedQueueElement* _tmp21_; - TimedQueueElement* _tmp22_; - gconstpointer _tmp23_; - gulong _tmp24_; - guint _tmp25_; + gconstpointer _tmp22_; + gulong _tmp23_; + guint _tmp24_; #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala" if (!_tmp1_) { -#line 996 "TimedQueue.c" +#line 1079 "TimedQueue.c" } #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala" _tmp1_ = FALSE; @@ -1006,7 +1089,7 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) { if (_tmp4_ == 0) { #line 181 "/home/jens/Source/shotwell/src/TimedQueue.vala" break; -#line 1010 "TimedQueue.c" +#line 1093 "TimedQueue.c" } #line 183 "/home/jens/Source/shotwell/src/TimedQueue.vala" _tmp5_ = self->priv->queue; @@ -1022,117 +1105,117 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) { _tmp8_ = now; #line 186 "/home/jens/Source/shotwell/src/TimedQueue.vala" if (_tmp8_ == ((gulong) 0)) { -#line 1026 "TimedQueue.c" - gulong _tmp9_; -#line 187 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp9_ = now_ms (); #line 187 "/home/jens/Source/shotwell/src/TimedQueue.vala" - now = _tmp9_; -#line 1032 "TimedQueue.c" + now = now_ms (); +#line 1111 "TimedQueue.c" } #line 189 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp10_ = head; + _tmp9_ = head; #line 189 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp11_ = _tmp10_->ready; + _tmp10_ = _tmp9_->ready; #line 189 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp12_ = now; + _tmp11_ = now; #line 189 "/home/jens/Source/shotwell/src/TimedQueue.vala" - if (_tmp11_ > _tmp12_) { + if (_tmp10_ > _tmp11_) { #line 190 "/home/jens/Source/shotwell/src/TimedQueue.vala" _timed_queue_element_unref0 (head); #line 190 "/home/jens/Source/shotwell/src/TimedQueue.vala" break; -#line 1046 "TimedQueue.c" +#line 1125 "TimedQueue.c" } #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp14_ = self->priv->dequeue_spacing_msec; + _tmp13_ = self->priv->dequeue_spacing_msec; #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala" - if (_tmp14_ != ((guint) 0)) { -#line 1052 "TimedQueue.c" + if (_tmp13_ != ((guint) 0)) { +#line 1131 "TimedQueue.c" + gulong _tmp14_; gulong _tmp15_; - gulong _tmp16_; - guint _tmp17_; + guint _tmp16_; #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp15_ = now; + _tmp14_ = now; #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp16_ = self->priv->last_dequeue; + _tmp15_ = self->priv->last_dequeue; #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp17_ = self->priv->dequeue_spacing_msec; + _tmp16_ = self->priv->dequeue_spacing_msec; #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp13_ = (_tmp15_ - _tmp16_) < ((gulong) _tmp17_); -#line 1064 "TimedQueue.c" + _tmp12_ = (_tmp14_ - _tmp15_) < ((gulong) _tmp16_); +#line 1143 "TimedQueue.c" } else { #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp13_ = FALSE; -#line 1068 "TimedQueue.c" + _tmp12_ = FALSE; +#line 1147 "TimedQueue.c" } #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala" - if (_tmp13_) { + if (_tmp12_) { #line 194 "/home/jens/Source/shotwell/src/TimedQueue.vala" _timed_queue_element_unref0 (head); #line 194 "/home/jens/Source/shotwell/src/TimedQueue.vala" break; -#line 1076 "TimedQueue.c" +#line 1155 "TimedQueue.c" } #line 196 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp18_ = self->priv->queue; + _tmp17_ = self->priv->queue; #line 196 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp19_ = sorted_list_remove_at (_tmp18_, 0); + _tmp18_ = sorted_list_remove_at (_tmp17_, 0); #line 196 "/home/jens/Source/shotwell/src/TimedQueue.vala" - h = (TimedQueueElement*) _tmp19_; + h = (TimedQueueElement*) _tmp18_; #line 197 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp20_ = head; + _tmp19_ = head; #line 197 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp21_ = h; + _tmp20_ = h; #line 197 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _vala_assert (_tmp20_ == _tmp21_, "head == h"); + _vala_assert (_tmp19_ == _tmp20_, "head == h"); #line 199 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp22_ = head; + _tmp21_ = head; #line 199 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp23_ = _tmp22_->item; + _tmp22_ = _tmp21_->item; #line 199 "/home/jens/Source/shotwell/src/TimedQueue.vala" - timed_queue_notify_dequeued (self, _tmp23_); + timed_queue_notify_dequeued (self, _tmp22_); #line 200 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp24_ = now; + _tmp23_ = now; #line 200 "/home/jens/Source/shotwell/src/TimedQueue.vala" - self->priv->last_dequeue = _tmp24_; + self->priv->last_dequeue = _tmp23_; #line 204 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp25_ = self->priv->dequeue_spacing_msec; + _tmp24_ = self->priv->dequeue_spacing_msec; #line 204 "/home/jens/Source/shotwell/src/TimedQueue.vala" - if (_tmp25_ != ((guint) 0)) { + if (_tmp24_ != ((guint) 0)) { #line 205 "/home/jens/Source/shotwell/src/TimedQueue.vala" _timed_queue_element_unref0 (h); #line 205 "/home/jens/Source/shotwell/src/TimedQueue.vala" _timed_queue_element_unref0 (head); #line 205 "/home/jens/Source/shotwell/src/TimedQueue.vala" break; -#line 1110 "TimedQueue.c" +#line 1189 "TimedQueue.c" } #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala" _timed_queue_element_unref0 (h); #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala" _timed_queue_element_unref0 (head); -#line 1116 "TimedQueue.c" +#line 1195 "TimedQueue.c" } } #line 208 "/home/jens/Source/shotwell/src/TimedQueue.vala" result = TRUE; #line 208 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 1123 "TimedQueue.c" +#line 1202 "TimedQueue.c" } -gint timed_queue_get_size (TimedQueue* self) { +gint +timed_queue_get_size (TimedQueue* self) +{ #line 164 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_val_if_fail (IS_TIMED_QUEUE (self), 0); #line 164 "/home/jens/Source/shotwell/src/TimedQueue.vala" return TIMED_QUEUE_GET_CLASS (self)->get_size (self); -#line 1132 "TimedQueue.c" +#line 1213 "TimedQueue.c" } -static gint timed_queue_real_get_size (TimedQueue* base) { +static gint +timed_queue_real_get_size (TimedQueue* base) +{ gint result; TimedQueue* self; SortedList* _tmp0_; @@ -1150,19 +1233,27 @@ static gint timed_queue_real_get_size (TimedQueue* base) { result = _tmp2_; #line 165 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 1154 "TimedQueue.c" +#line 1237 "TimedQueue.c" } -static void timed_queue_real_paused (TimedQueue* self, gboolean is_paused) { +static void +timed_queue_real_paused (TimedQueue* self, + gboolean is_paused) +{ } -static TimedQueueElement* timed_queue_element_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer item, gulong ready) { +static TimedQueueElement* +timed_queue_element_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + gconstpointer item, + gulong ready) +{ TimedQueueElement* self = NULL; - gconstpointer _tmp0_; - gpointer _tmp1_; - gulong _tmp2_; + gpointer _tmp0_; #line 26 "/home/jens/Source/shotwell/src/TimedQueue.vala" self = (TimedQueueElement*) g_type_create_instance (object_type); #line 26 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -1172,150 +1263,174 @@ static TimedQueueElement* timed_queue_element_construct (GType object_type, GTyp #line 26 "/home/jens/Source/shotwell/src/TimedQueue.vala" self->priv->g_destroy_func = g_destroy_func; #line 27 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp0_ = item; -#line 27 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp1_ = ((_tmp0_ != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) _tmp0_) : ((gpointer) _tmp0_); + _tmp0_ = ((item != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) item) : ((gpointer) item); #line 27 "/home/jens/Source/shotwell/src/TimedQueue.vala" _g_destroy_func0 (self->item); #line 27 "/home/jens/Source/shotwell/src/TimedQueue.vala" - self->item = _tmp1_; + self->item = _tmp0_; #line 28 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp2_ = ready; -#line 28 "/home/jens/Source/shotwell/src/TimedQueue.vala" - self->ready = _tmp2_; + self->ready = ready; #line 26 "/home/jens/Source/shotwell/src/TimedQueue.vala" return self; -#line 1189 "TimedQueue.c" +#line 1276 "TimedQueue.c" } -static TimedQueueElement* timed_queue_element_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer item, gulong ready) { +static TimedQueueElement* +timed_queue_element_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + gconstpointer item, + gulong ready) +{ #line 26 "/home/jens/Source/shotwell/src/TimedQueue.vala" return timed_queue_element_construct (TIMED_QUEUE_TYPE_ELEMENT, g_type, g_dup_func, g_destroy_func, item, ready); -#line 1196 "TimedQueue.c" +#line 1289 "TimedQueue.c" } -static gint64 timed_queue_element_comparator (void* a, void* b) { +static gint64 +timed_queue_element_comparator (void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; + gulong _tmp0_; gulong _tmp1_; - void* _tmp2_; - gulong _tmp3_; -#line 32 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp0_ = a; -#line 32 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((TimedQueueElement*) _tmp0_, TIMED_QUEUE_TYPE_ELEMENT, TimedQueueElement)->ready; #line 32 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp2_ = b; + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST ((TimedQueueElement*) a, TIMED_QUEUE_TYPE_ELEMENT, TimedQueueElement)->ready; #line 32 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST ((TimedQueueElement*) _tmp2_, TIMED_QUEUE_TYPE_ELEMENT, TimedQueueElement)->ready; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((TimedQueueElement*) b, TIMED_QUEUE_TYPE_ELEMENT, TimedQueueElement)->ready; #line 32 "/home/jens/Source/shotwell/src/TimedQueue.vala" - result = ((gint64) _tmp1_) - ((gint64) _tmp3_); + result = ((gint64) _tmp0_) - ((gint64) _tmp1_); #line 32 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 1218 "TimedQueue.c" +#line 1308 "TimedQueue.c" } -static void timed_queue_value_element_init (GValue* value) { +static void +timed_queue_value_element_init (GValue* value) +{ #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" value->data[0].v_pointer = NULL; -#line 1225 "TimedQueue.c" +#line 1317 "TimedQueue.c" } -static void timed_queue_value_element_free_value (GValue* value) { +static void +timed_queue_value_element_free_value (GValue* value) +{ #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" if (value->data[0].v_pointer) { #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" timed_queue_element_unref (value->data[0].v_pointer); -#line 1234 "TimedQueue.c" +#line 1328 "TimedQueue.c" } } -static void timed_queue_value_element_copy_value (const GValue* src_value, GValue* dest_value) { +static void +timed_queue_value_element_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" if (src_value->data[0].v_pointer) { #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" dest_value->data[0].v_pointer = timed_queue_element_ref (src_value->data[0].v_pointer); -#line 1244 "TimedQueue.c" +#line 1341 "TimedQueue.c" } else { #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" dest_value->data[0].v_pointer = NULL; -#line 1248 "TimedQueue.c" +#line 1345 "TimedQueue.c" } } -static gpointer timed_queue_value_element_peek_pointer (const GValue* value) { +static gpointer +timed_queue_value_element_peek_pointer (const GValue* value) +{ #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" return value->data[0].v_pointer; -#line 1256 "TimedQueue.c" +#line 1355 "TimedQueue.c" } -static gchar* timed_queue_value_element_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +timed_queue_value_element_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" if (collect_values[0].v_pointer) { -#line 1263 "TimedQueue.c" +#line 1367 "TimedQueue.c" TimedQueueElement * object; object = collect_values[0].v_pointer; #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" if (object->parent_instance.g_class == NULL) { #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1270 "TimedQueue.c" +#line 1374 "TimedQueue.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 22 "/home/jens/Source/shotwell/src/TimedQueue.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 1274 "TimedQueue.c" +#line 1378 "TimedQueue.c" } #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" value->data[0].v_pointer = timed_queue_element_ref (object); -#line 1278 "TimedQueue.c" +#line 1382 "TimedQueue.c" } else { #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" value->data[0].v_pointer = NULL; -#line 1282 "TimedQueue.c" +#line 1386 "TimedQueue.c" } #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" return NULL; -#line 1286 "TimedQueue.c" +#line 1390 "TimedQueue.c" } -static gchar* timed_queue_value_element_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +timed_queue_value_element_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ TimedQueueElement ** object_p; object_p = collect_values[0].v_pointer; #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" if (!object_p) { #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1297 "TimedQueue.c" +#line 1406 "TimedQueue.c" } #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" if (!value->data[0].v_pointer) { #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" *object_p = NULL; -#line 1303 "TimedQueue.c" +#line 1412 "TimedQueue.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" *object_p = value->data[0].v_pointer; -#line 1307 "TimedQueue.c" +#line 1416 "TimedQueue.c" } else { #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" *object_p = timed_queue_element_ref (value->data[0].v_pointer); -#line 1311 "TimedQueue.c" +#line 1420 "TimedQueue.c" } #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" return NULL; -#line 1315 "TimedQueue.c" +#line 1424 "TimedQueue.c" } -static GParamSpec* timed_queue_param_spec_element (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +static GParamSpec* +timed_queue_param_spec_element (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ TimedQueueParamSpecElement* spec; #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_val_if_fail (g_type_is_a (object_type, TIMED_QUEUE_TYPE_ELEMENT), NULL); @@ -1325,20 +1440,25 @@ static GParamSpec* timed_queue_param_spec_element (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" return G_PARAM_SPEC (spec); -#line 1329 "TimedQueue.c" +#line 1444 "TimedQueue.c" } -static gpointer timed_queue_value_get_element (const GValue* value) { +static gpointer +timed_queue_value_get_element (const GValue* value) +{ #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TIMED_QUEUE_TYPE_ELEMENT), NULL); #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" return value->data[0].v_pointer; -#line 1338 "TimedQueue.c" +#line 1455 "TimedQueue.c" } -static void timed_queue_value_set_element (GValue* value, gpointer v_object) { +static void +timed_queue_value_set_element (GValue* value, + gpointer v_object) +{ TimedQueueElement * old; #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TIMED_QUEUE_TYPE_ELEMENT)); @@ -1354,22 +1474,25 @@ static void timed_queue_value_set_element (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" timed_queue_element_ref (value->data[0].v_pointer); -#line 1358 "TimedQueue.c" +#line 1478 "TimedQueue.c" } else { #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" value->data[0].v_pointer = NULL; -#line 1362 "TimedQueue.c" +#line 1482 "TimedQueue.c" } #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" if (old) { #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" timed_queue_element_unref (old); -#line 1368 "TimedQueue.c" +#line 1488 "TimedQueue.c" } } -static void timed_queue_value_take_element (GValue* value, gpointer v_object) { +static void +timed_queue_value_take_element (GValue* value, + gpointer v_object) +{ TimedQueueElement * old; #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TIMED_QUEUE_TYPE_ELEMENT)); @@ -1383,42 +1506,48 @@ static void timed_queue_value_take_element (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" value->data[0].v_pointer = v_object; -#line 1387 "TimedQueue.c" +#line 1510 "TimedQueue.c" } else { #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" value->data[0].v_pointer = NULL; -#line 1391 "TimedQueue.c" +#line 1514 "TimedQueue.c" } #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" if (old) { #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" timed_queue_element_unref (old); -#line 1397 "TimedQueue.c" +#line 1520 "TimedQueue.c" } } -static void timed_queue_element_class_init (TimedQueueElementClass * klass) { +static void +timed_queue_element_class_init (TimedQueueElementClass * klass) +{ #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" timed_queue_element_parent_class = g_type_class_peek_parent (klass); #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" ((TimedQueueElementClass *) klass)->finalize = timed_queue_element_finalize; #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_type_class_add_private (klass, sizeof (TimedQueueElementPrivate)); -#line 1409 "TimedQueue.c" +#line 1534 "TimedQueue.c" } -static void timed_queue_element_instance_init (TimedQueueElement * self) { +static void +timed_queue_element_instance_init (TimedQueueElement * self) +{ #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" self->priv = TIMED_QUEUE_ELEMENT_GET_PRIVATE (self); #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" self->ref_count = 1; -#line 1418 "TimedQueue.c" +#line 1545 "TimedQueue.c" } -static void timed_queue_element_finalize (TimedQueueElement * obj) { +static void +timed_queue_element_finalize (TimedQueueElement * obj) +{ TimedQueueElement * self; #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TIMED_QUEUE_TYPE_ELEMENT, TimedQueueElement); @@ -1426,11 +1555,13 @@ static void timed_queue_element_finalize (TimedQueueElement * obj) { g_signal_handlers_destroy (self); #line 23 "/home/jens/Source/shotwell/src/TimedQueue.vala" ((self->item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (self->item = (self->priv->g_destroy_func (self->item), NULL)); -#line 1430 "TimedQueue.c" +#line 1559 "TimedQueue.c" } -static GType timed_queue_element_get_type (void) { +static GType +timed_queue_element_get_type (void) +{ static volatile gsize timed_queue_element_type_id__volatile = 0; if (g_once_init_enter (&timed_queue_element_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { timed_queue_value_element_init, timed_queue_value_element_free_value, timed_queue_value_element_copy_value, timed_queue_value_element_peek_pointer, "p", timed_queue_value_element_collect_value, "p", timed_queue_value_element_lcopy_value }; @@ -1444,18 +1575,22 @@ static GType timed_queue_element_get_type (void) { } -static gpointer timed_queue_element_ref (gpointer instance) { +static gpointer +timed_queue_element_ref (gpointer instance) +{ TimedQueueElement * self; self = instance; #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_atomic_int_inc (&self->ref_count); #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" return instance; -#line 1455 "TimedQueue.c" +#line 1588 "TimedQueue.c" } -static void timed_queue_element_unref (gpointer instance) { +static void +timed_queue_element_unref (gpointer instance) +{ TimedQueueElement * self; self = instance; #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -1464,109 +1599,134 @@ static void timed_queue_element_unref (gpointer instance) { TIMED_QUEUE_ELEMENT_GET_CLASS (self)->finalize (self); #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1468 "TimedQueue.c" +#line 1603 "TimedQueue.c" } } -static void value_timed_queue_init (GValue* value) { +static void +value_timed_queue_init (GValue* value) +{ #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" value->data[0].v_pointer = NULL; -#line 1476 "TimedQueue.c" +#line 1613 "TimedQueue.c" } -static void value_timed_queue_free_value (GValue* value) { +static void +value_timed_queue_free_value (GValue* value) +{ #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" if (value->data[0].v_pointer) { #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" timed_queue_unref (value->data[0].v_pointer); -#line 1485 "TimedQueue.c" +#line 1624 "TimedQueue.c" } } -static void value_timed_queue_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_timed_queue_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" if (src_value->data[0].v_pointer) { #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" dest_value->data[0].v_pointer = timed_queue_ref (src_value->data[0].v_pointer); -#line 1495 "TimedQueue.c" +#line 1637 "TimedQueue.c" } else { #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" dest_value->data[0].v_pointer = NULL; -#line 1499 "TimedQueue.c" +#line 1641 "TimedQueue.c" } } -static gpointer value_timed_queue_peek_pointer (const GValue* value) { +static gpointer +value_timed_queue_peek_pointer (const GValue* value) +{ #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" return value->data[0].v_pointer; -#line 1507 "TimedQueue.c" +#line 1651 "TimedQueue.c" } -static gchar* value_timed_queue_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_timed_queue_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" if (collect_values[0].v_pointer) { -#line 1514 "TimedQueue.c" +#line 1663 "TimedQueue.c" TimedQueue * object; object = collect_values[0].v_pointer; #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" if (object->parent_instance.g_class == NULL) { #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1521 "TimedQueue.c" +#line 1670 "TimedQueue.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 21 "/home/jens/Source/shotwell/src/TimedQueue.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 1525 "TimedQueue.c" +#line 1674 "TimedQueue.c" } #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" value->data[0].v_pointer = timed_queue_ref (object); -#line 1529 "TimedQueue.c" +#line 1678 "TimedQueue.c" } else { #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" value->data[0].v_pointer = NULL; -#line 1533 "TimedQueue.c" +#line 1682 "TimedQueue.c" } #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" return NULL; -#line 1537 "TimedQueue.c" +#line 1686 "TimedQueue.c" } -static gchar* value_timed_queue_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_timed_queue_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ TimedQueue ** object_p; object_p = collect_values[0].v_pointer; #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" if (!object_p) { #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1548 "TimedQueue.c" +#line 1702 "TimedQueue.c" } #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" if (!value->data[0].v_pointer) { #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" *object_p = NULL; -#line 1554 "TimedQueue.c" +#line 1708 "TimedQueue.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" *object_p = value->data[0].v_pointer; -#line 1558 "TimedQueue.c" +#line 1712 "TimedQueue.c" } else { #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" *object_p = timed_queue_ref (value->data[0].v_pointer); -#line 1562 "TimedQueue.c" +#line 1716 "TimedQueue.c" } #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" return NULL; -#line 1566 "TimedQueue.c" +#line 1720 "TimedQueue.c" } -GParamSpec* param_spec_timed_queue (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_timed_queue (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecTimedQueue* spec; #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_TIMED_QUEUE), NULL); @@ -1576,20 +1736,25 @@ GParamSpec* param_spec_timed_queue (const gchar* name, const gchar* nick, const G_PARAM_SPEC (spec)->value_type = object_type; #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" return G_PARAM_SPEC (spec); -#line 1580 "TimedQueue.c" +#line 1740 "TimedQueue.c" } -gpointer value_get_timed_queue (const GValue* value) { +gpointer +value_get_timed_queue (const GValue* value) +{ #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TIMED_QUEUE), NULL); #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" return value->data[0].v_pointer; -#line 1589 "TimedQueue.c" +#line 1751 "TimedQueue.c" } -void value_set_timed_queue (GValue* value, gpointer v_object) { +void +value_set_timed_queue (GValue* value, + gpointer v_object) +{ TimedQueue * old; #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TIMED_QUEUE)); @@ -1605,22 +1770,25 @@ void value_set_timed_queue (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" timed_queue_ref (value->data[0].v_pointer); -#line 1609 "TimedQueue.c" +#line 1774 "TimedQueue.c" } else { #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" value->data[0].v_pointer = NULL; -#line 1613 "TimedQueue.c" +#line 1778 "TimedQueue.c" } #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" if (old) { #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" timed_queue_unref (old); -#line 1619 "TimedQueue.c" +#line 1784 "TimedQueue.c" } } -void value_take_timed_queue (GValue* value, gpointer v_object) { +void +value_take_timed_queue (GValue* value, + gpointer v_object) +{ TimedQueue * old; #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TIMED_QUEUE)); @@ -1634,22 +1802,24 @@ void value_take_timed_queue (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" value->data[0].v_pointer = v_object; -#line 1638 "TimedQueue.c" +#line 1806 "TimedQueue.c" } else { #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" value->data[0].v_pointer = NULL; -#line 1642 "TimedQueue.c" +#line 1810 "TimedQueue.c" } #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" if (old) { #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" timed_queue_unref (old); -#line 1648 "TimedQueue.c" +#line 1816 "TimedQueue.c" } } -static void timed_queue_class_init (TimedQueueClass * klass) { +static void +timed_queue_class_init (TimedQueueClass * klass) +{ #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" timed_queue_parent_class = g_type_class_peek_parent (klass); #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -1674,11 +1844,13 @@ static void timed_queue_class_init (TimedQueueClass * klass) { TIMED_QUEUE_CLASS (klass)->get_size = timed_queue_real_get_size; #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" timed_queue_signals[TIMED_QUEUE_PAUSED_SIGNAL] = g_signal_new ("paused", TYPE_TIMED_QUEUE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (TimedQueueClass, paused), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); -#line 1678 "TimedQueue.c" +#line 1848 "TimedQueue.c" } -static void timed_queue_instance_init (TimedQueue * self) { +static void +timed_queue_instance_init (TimedQueue * self) +{ #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" self->priv = TIMED_QUEUE_GET_PRIVATE (self); #line 40 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -1691,11 +1863,13 @@ static void timed_queue_instance_init (TimedQueue * self) { self->priv->paused_state = FALSE; #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" self->ref_count = 1; -#line 1695 "TimedQueue.c" +#line 1867 "TimedQueue.c" } -static void timed_queue_finalize (TimedQueue * obj) { +static void +timed_queue_finalize (TimedQueue * obj) +{ TimedQueue * self; guint _tmp0_; #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -1706,13 +1880,13 @@ static void timed_queue_finalize (TimedQueue * obj) { _tmp0_ = self->priv->timer_id; #line 70 "/home/jens/Source/shotwell/src/TimedQueue.vala" if (_tmp0_ != ((guint) 0)) { -#line 1710 "TimedQueue.c" +#line 1884 "TimedQueue.c" guint _tmp1_; #line 71 "/home/jens/Source/shotwell/src/TimedQueue.vala" _tmp1_ = self->priv->timer_id; #line 71 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_source_remove (_tmp1_); -#line 1716 "TimedQueue.c" +#line 1890 "TimedQueue.c" } #line 38 "/home/jens/Source/shotwell/src/TimedQueue.vala" (self->priv->equal_func_target_destroy_notify == NULL) ? NULL : (self->priv->equal_func_target_destroy_notify (self->priv->equal_func_target), NULL); @@ -1724,11 +1898,13 @@ static void timed_queue_finalize (TimedQueue * obj) { self->priv->equal_func_target_destroy_notify = NULL; #line 41 "/home/jens/Source/shotwell/src/TimedQueue.vala" _g_object_unref0 (self->priv->queue); -#line 1728 "TimedQueue.c" +#line 1902 "TimedQueue.c" } -GType timed_queue_get_type (void) { +GType +timed_queue_get_type (void) +{ static volatile gsize timed_queue_type_id__volatile = 0; if (g_once_init_enter (&timed_queue_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_timed_queue_init, value_timed_queue_free_value, value_timed_queue_copy_value, value_timed_queue_peek_pointer, "p", value_timed_queue_collect_value, "p", value_timed_queue_lcopy_value }; @@ -1742,18 +1918,22 @@ GType timed_queue_get_type (void) { } -gpointer timed_queue_ref (gpointer instance) { +gpointer +timed_queue_ref (gpointer instance) +{ TimedQueue * self; self = instance; #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_atomic_int_inc (&self->ref_count); #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" return instance; -#line 1753 "TimedQueue.c" +#line 1931 "TimedQueue.c" } -void timed_queue_unref (gpointer instance) { +void +timed_queue_unref (gpointer instance) +{ TimedQueue * self; self = instance; #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -1762,39 +1942,44 @@ void timed_queue_unref (gpointer instance) { TIMED_QUEUE_GET_CLASS (self)->finalize (self); #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1766 "TimedQueue.c" +#line 1946 "TimedQueue.c" } } -HashTimedQueue* hash_timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeHashDataFunc hash_func, void* hash_func_target, GDestroyNotify hash_func_target_destroy_notify, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority) { +HashTimedQueue* +hash_timed_queue_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + guint hold_msec, + DequeuedCallback callback, + void* callback_target, + GeeHashDataFunc hash_func, + void* hash_func_target, + GDestroyNotify hash_func_target_destroy_notify, + GeeEqualDataFunc equal_func, + void* equal_func_target, + GDestroyNotify equal_func_target_destroy_notify, + gint priority) +{ HashTimedQueue* self = NULL; - guint _tmp0_; - DequeuedCallback _tmp1_; + GeeEqualDataFunc _tmp0_; + void* _tmp0__target; + GDestroyNotify _tmp0__target_destroy_notify; + GeeHashDataFunc _tmp1_; void* _tmp1__target; + GDestroyNotify _tmp1__target_destroy_notify; GeeEqualDataFunc _tmp2_; void* _tmp2__target; GDestroyNotify _tmp2__target_destroy_notify; - gint _tmp3_; - GeeHashDataFunc _tmp4_; - void* _tmp4__target; - GDestroyNotify _tmp4__target_destroy_notify; - GeeEqualDataFunc _tmp5_; - void* _tmp5__target; - GDestroyNotify _tmp5__target_destroy_notify; - GeeHashMap* _tmp6_; -#line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp0_ = hold_msec; -#line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp1_ = callback; + GeeHashMap* _tmp3_; #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp1__target = callback_target; + _tmp0_ = equal_func; #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp2_ = equal_func; + _tmp0__target = equal_func_target; #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp2__target = equal_func_target; -#line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp2__target_destroy_notify = equal_func_target_destroy_notify; + _tmp0__target_destroy_notify = equal_func_target_destroy_notify; #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala" equal_func = NULL; #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -1802,9 +1987,7 @@ HashTimedQueue* hash_timed_queue_construct (GType object_type, GType g_type, GBo #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala" equal_func_target_destroy_notify = NULL; #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp3_ = priority; -#line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala" - self = (HashTimedQueue*) timed_queue_construct (object_type, g_type, (GBoxedCopyFunc) g_dup_func, (GDestroyNotify) g_destroy_func, _tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp2__target, _tmp2__target_destroy_notify, _tmp3_); + self = (HashTimedQueue*) timed_queue_construct (object_type, g_type, (GBoxedCopyFunc) g_dup_func, (GDestroyNotify) g_destroy_func, hold_msec, callback, callback_target, _tmp0_, _tmp0__target, _tmp0__target_destroy_notify, priority); #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala" self->priv->g_type = g_type; #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -1812,11 +1995,11 @@ HashTimedQueue* hash_timed_queue_construct (GType object_type, GType g_type, GBo #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala" self->priv->g_destroy_func = g_destroy_func; #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp4_ = hash_func; + _tmp1_ = hash_func; #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp4__target = hash_func_target; + _tmp1__target = hash_func_target; #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp4__target_destroy_notify = hash_func_target_destroy_notify; + _tmp1__target_destroy_notify = hash_func_target_destroy_notify; #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala" hash_func = NULL; #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -1824,11 +2007,11 @@ HashTimedQueue* hash_timed_queue_construct (GType object_type, GType g_type, GBo #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala" hash_func_target_destroy_notify = NULL; #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp5_ = equal_func; + _tmp2_ = equal_func; #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp5__target = equal_func_target; + _tmp2__target = equal_func_target; #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp5__target_destroy_notify = equal_func_target_destroy_notify; + _tmp2__target_destroy_notify = equal_func_target_destroy_notify; #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala" equal_func = NULL; #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -1836,11 +2019,11 @@ HashTimedQueue* hash_timed_queue_construct (GType object_type, GType g_type, GBo #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala" equal_func_target_destroy_notify = NULL; #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp6_ = gee_hash_map_new (g_type, (GBoxedCopyFunc) g_dup_func, (GDestroyNotify) g_destroy_func, G_TYPE_INT, NULL, NULL, _tmp4_, _tmp4__target, _tmp4__target_destroy_notify, _tmp5_, _tmp5__target, _tmp5__target_destroy_notify, NULL, NULL, NULL); + _tmp3_ = gee_hash_map_new (g_type, (GBoxedCopyFunc) g_dup_func, (GDestroyNotify) g_destroy_func, G_TYPE_INT, NULL, NULL, _tmp1_, _tmp1__target, _tmp1__target_destroy_notify, _tmp2_, _tmp2__target, _tmp2__target_destroy_notify, NULL, NULL, NULL); #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala" _g_object_unref0 (self->priv->item_count); #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala" - self->priv->item_count = _tmp6_; + self->priv->item_count = _tmp3_; #line 217 "/home/jens/Source/shotwell/src/TimedQueue.vala" (hash_func_target_destroy_notify == NULL) ? NULL : (hash_func_target_destroy_notify (hash_func_target), NULL); #line 217 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -1859,36 +2042,49 @@ HashTimedQueue* hash_timed_queue_construct (GType object_type, GType g_type, GBo equal_func_target_destroy_notify = NULL; #line 217 "/home/jens/Source/shotwell/src/TimedQueue.vala" return self; -#line 1863 "TimedQueue.c" -} - - -HashTimedQueue* hash_timed_queue_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeHashDataFunc hash_func, void* hash_func_target, GDestroyNotify hash_func_target_destroy_notify, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority) { +#line 2046 "TimedQueue.c" +} + + +HashTimedQueue* +hash_timed_queue_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + guint hold_msec, + DequeuedCallback callback, + void* callback_target, + GeeHashDataFunc hash_func, + void* hash_func_target, + GDestroyNotify hash_func_target_destroy_notify, + GeeEqualDataFunc equal_func, + void* equal_func_target, + GDestroyNotify equal_func_target_destroy_notify, + gint priority) +{ #line 217 "/home/jens/Source/shotwell/src/TimedQueue.vala" return hash_timed_queue_construct (TYPE_HASH_TIMED_QUEUE, g_type, g_dup_func, g_destroy_func, hold_msec, callback, callback_target, hash_func, hash_func_target, hash_func_target_destroy_notify, equal_func, equal_func_target, equal_func_target_destroy_notify, priority); -#line 1870 "TimedQueue.c" +#line 2067 "TimedQueue.c" } -static void hash_timed_queue_real_notify_dequeued (TimedQueue* base, gconstpointer item) { +static void +hash_timed_queue_real_notify_dequeued (TimedQueue* base, + gconstpointer item) +{ HashTimedQueue * self; - gconstpointer _tmp0_; - gconstpointer _tmp1_; #line 225 "/home/jens/Source/shotwell/src/TimedQueue.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HASH_TIMED_QUEUE, HashTimedQueue); #line 226 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp0_ = item; -#line 226 "/home/jens/Source/shotwell/src/TimedQueue.vala" - hash_timed_queue_removed (self, _tmp0_); -#line 228 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp1_ = item; + hash_timed_queue_removed (self, item); #line 228 "/home/jens/Source/shotwell/src/TimedQueue.vala" - TIMED_QUEUE_CLASS (hash_timed_queue_parent_class)->notify_dequeued (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TIMED_QUEUE, TimedQueue), _tmp1_); -#line 1888 "TimedQueue.c" + TIMED_QUEUE_CLASS (hash_timed_queue_parent_class)->notify_dequeued (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TIMED_QUEUE, TimedQueue), item); +#line 2082 "TimedQueue.c" } -static void hash_timed_queue_real_clear (TimedQueue* base) { +static void +hash_timed_queue_real_clear (TimedQueue* base) +{ HashTimedQueue * self; GeeHashMap* _tmp0_; #line 231 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -1899,311 +2095,265 @@ static void hash_timed_queue_real_clear (TimedQueue* base) { gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 234 "/home/jens/Source/shotwell/src/TimedQueue.vala" TIMED_QUEUE_CLASS (hash_timed_queue_parent_class)->clear (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TIMED_QUEUE, TimedQueue)); -#line 1903 "TimedQueue.c" +#line 2099 "TimedQueue.c" } -static gboolean hash_timed_queue_real_contains (TimedQueue* base, gconstpointer item) { +static gboolean +hash_timed_queue_real_contains (TimedQueue* base, + gconstpointer item) +{ HashTimedQueue * self; gboolean result = FALSE; GeeHashMap* _tmp0_; - gconstpointer _tmp1_; - gboolean _tmp2_; #line 237 "/home/jens/Source/shotwell/src/TimedQueue.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HASH_TIMED_QUEUE, HashTimedQueue); #line 238 "/home/jens/Source/shotwell/src/TimedQueue.vala" _tmp0_ = self->priv->item_count; #line 238 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp1_ = item; -#line 238 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 238 "/home/jens/Source/shotwell/src/TimedQueue.vala" - result = _tmp2_; + result = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), item); #line 238 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 1925 "TimedQueue.c" +#line 2118 "TimedQueue.c" } -static gboolean hash_timed_queue_real_enqueue (TimedQueue* base, gconstpointer item) { +static gboolean +hash_timed_queue_real_enqueue (TimedQueue* base, + gconstpointer item) +{ HashTimedQueue * self; gboolean result = FALSE; - gconstpointer _tmp0_; - gboolean _tmp1_; - gint _tmp2_ = 0; - GeeHashMap* _tmp3_; - gconstpointer _tmp4_; - gboolean _tmp5_; - GeeHashMap* _tmp9_; - gconstpointer _tmp10_; + gint _tmp0_ = 0; + GeeHashMap* _tmp1_; + GeeHashMap* _tmp4_; #line 241 "/home/jens/Source/shotwell/src/TimedQueue.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HASH_TIMED_QUEUE, HashTimedQueue); #line 242 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp0_ = item; -#line 242 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp1_ = TIMED_QUEUE_CLASS (hash_timed_queue_parent_class)->enqueue (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TIMED_QUEUE, TimedQueue), _tmp0_); -#line 242 "/home/jens/Source/shotwell/src/TimedQueue.vala" - if (!_tmp1_) { + if (!TIMED_QUEUE_CLASS (hash_timed_queue_parent_class)->enqueue (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TIMED_QUEUE, TimedQueue), item)) { #line 243 "/home/jens/Source/shotwell/src/TimedQueue.vala" result = FALSE; #line 243 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 1952 "TimedQueue.c" +#line 2139 "TimedQueue.c" } #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp3_ = self->priv->item_count; + _tmp1_ = self->priv->item_count; #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp4_ = item; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), item)) { +#line 2145 "TimedQueue.c" + GeeHashMap* _tmp2_; + gpointer _tmp3_; #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp2_ = self->priv->item_count; #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala" - if (_tmp5_) { -#line 1962 "TimedQueue.c" - GeeHashMap* _tmp6_; - gconstpointer _tmp7_; - gpointer _tmp8_; + _tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), item); #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp6_ = self->priv->item_count; -#line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp7_ = item; -#line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_); -#line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp2_ = ((gint) ((gintptr) _tmp8_)) + 1; -#line 1974 "TimedQueue.c" + _tmp0_ = ((gint) ((gintptr) _tmp3_)) + 1; +#line 2154 "TimedQueue.c" } else { #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp2_ = 1; -#line 1978 "TimedQueue.c" + _tmp0_ = 1; +#line 2158 "TimedQueue.c" } #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp9_ = self->priv->item_count; -#line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp10_ = item; + _tmp4_ = self->priv->item_count; #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_, (gpointer) ((gintptr) _tmp2_)); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), item, (gpointer) ((gintptr) _tmp0_)); #line 247 "/home/jens/Source/shotwell/src/TimedQueue.vala" result = TRUE; #line 247 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 1990 "TimedQueue.c" +#line 2168 "TimedQueue.c" } -static gboolean hash_timed_queue_real_enqueue_many (TimedQueue* base, GeeCollection* items) { +static gboolean +hash_timed_queue_real_enqueue_many (TimedQueue* base, + GeeCollection* items) +{ HashTimedQueue * self; gboolean result = FALSE; - GeeCollection* _tmp0_; - gboolean _tmp1_; #line 250 "/home/jens/Source/shotwell/src/TimedQueue.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HASH_TIMED_QUEUE, HashTimedQueue); #line 250 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_val_if_fail (GEE_IS_COLLECTION (items), FALSE); #line 251 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp0_ = items; -#line 251 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp1_ = TIMED_QUEUE_CLASS (hash_timed_queue_parent_class)->enqueue_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TIMED_QUEUE, TimedQueue), _tmp0_); -#line 251 "/home/jens/Source/shotwell/src/TimedQueue.vala" - if (!_tmp1_) { + if (!TIMED_QUEUE_CLASS (hash_timed_queue_parent_class)->enqueue_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TIMED_QUEUE, TimedQueue), items)) { #line 252 "/home/jens/Source/shotwell/src/TimedQueue.vala" result = FALSE; #line 252 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 2013 "TimedQueue.c" +#line 2188 "TimedQueue.c" } { GeeIterator* _item_it = NULL; - GeeCollection* _tmp2_; - GeeIterator* _tmp3_; -#line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp2_ = items; + GeeIterator* _tmp0_; #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (items, GEE_TYPE_ITERABLE, GeeIterable)); #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _item_it = _tmp3_; + _item_it = _tmp0_; #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala" while (TRUE) { -#line 2027 "TimedQueue.c" - GeeIterator* _tmp4_; - gboolean _tmp5_; +#line 2199 "TimedQueue.c" + GeeIterator* _tmp1_; gpointer item = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - gint _tmp8_ = 0; - GeeHashMap* _tmp9_; - gconstpointer _tmp10_; - gboolean _tmp11_; - GeeHashMap* _tmp15_; - gconstpointer _tmp16_; -#line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp4_ = _item_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + gint _tmp4_ = 0; + GeeHashMap* _tmp5_; + gconstpointer _tmp6_; + GeeHashMap* _tmp10_; + gconstpointer _tmp11_; #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp5_ = gee_iterator_next (_tmp4_); + _tmp1_ = _item_it; #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp1_)) { #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala" break; -#line 2047 "TimedQueue.c" +#line 2215 "TimedQueue.c" } #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp6_ = _item_it; + _tmp2_ = _item_it; #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala" - item = _tmp7_; -#line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp9_ = self->priv->item_count; + item = _tmp3_; #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp10_ = item; + _tmp5_ = self->priv->item_count; #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp11_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_); + _tmp6_ = item; #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala" - if (_tmp11_) { -#line 2063 "TimedQueue.c" - GeeHashMap* _tmp12_; - gconstpointer _tmp13_; - gpointer _tmp14_; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_)) { +#line 2229 "TimedQueue.c" + GeeHashMap* _tmp7_; + gconstpointer _tmp8_; + gpointer _tmp9_; #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp12_ = self->priv->item_count; + _tmp7_ = self->priv->item_count; #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp13_ = item; + _tmp8_ = item; #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp14_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_); + _tmp9_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_); #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp8_ = ((gint) ((gintptr) _tmp14_)) + 1; -#line 2075 "TimedQueue.c" + _tmp4_ = ((gint) ((gintptr) _tmp9_)) + 1; +#line 2241 "TimedQueue.c" } else { #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp8_ = 1; -#line 2079 "TimedQueue.c" + _tmp4_ = 1; +#line 2245 "TimedQueue.c" } #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp15_ = self->priv->item_count; + _tmp10_ = self->priv->item_count; #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp16_ = item; + _tmp11_ = item; #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_, (gpointer) ((gintptr) _tmp8_)); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, (gpointer) ((gintptr) _tmp4_)); #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala" ((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL)); -#line 2089 "TimedQueue.c" +#line 2255 "TimedQueue.c" } #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala" _g_object_unref0 (_item_it); -#line 2093 "TimedQueue.c" +#line 2259 "TimedQueue.c" } #line 257 "/home/jens/Source/shotwell/src/TimedQueue.vala" result = TRUE; #line 257 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 2099 "TimedQueue.c" +#line 2265 "TimedQueue.c" } -static gboolean hash_timed_queue_real_remove_first (TimedQueue* base, gconstpointer item) { +static gboolean +hash_timed_queue_real_remove_first (TimedQueue* base, + gconstpointer item) +{ HashTimedQueue * self; gboolean result = FALSE; - gconstpointer _tmp0_; - gboolean _tmp1_; - gconstpointer _tmp2_; #line 260 "/home/jens/Source/shotwell/src/TimedQueue.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HASH_TIMED_QUEUE, HashTimedQueue); #line 261 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp0_ = item; -#line 261 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp1_ = TIMED_QUEUE_CLASS (hash_timed_queue_parent_class)->remove_first (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TIMED_QUEUE, TimedQueue), _tmp0_); -#line 261 "/home/jens/Source/shotwell/src/TimedQueue.vala" - if (!_tmp1_) { + if (!TIMED_QUEUE_CLASS (hash_timed_queue_parent_class)->remove_first (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TIMED_QUEUE, TimedQueue), item)) { #line 262 "/home/jens/Source/shotwell/src/TimedQueue.vala" result = FALSE; #line 262 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 2121 "TimedQueue.c" +#line 2283 "TimedQueue.c" } #line 264 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp2_ = item; -#line 264 "/home/jens/Source/shotwell/src/TimedQueue.vala" - hash_timed_queue_removed (self, _tmp2_); + hash_timed_queue_removed (self, item); #line 266 "/home/jens/Source/shotwell/src/TimedQueue.vala" result = TRUE; #line 266 "/home/jens/Source/shotwell/src/TimedQueue.vala" return result; -#line 2131 "TimedQueue.c" +#line 2291 "TimedQueue.c" } -static void hash_timed_queue_removed (HashTimedQueue* self, gconstpointer item) { +static void +hash_timed_queue_removed (HashTimedQueue* self, + gconstpointer item) +{ GeeHashMap* _tmp0_; - gconstpointer _tmp1_; - gboolean _tmp2_; gint count = 0; - GeeHashMap* _tmp3_; - gconstpointer _tmp4_; - gpointer _tmp5_; - gint _tmp6_; - gint _tmp7_; - gint _tmp8_; + GeeHashMap* _tmp1_; + gpointer _tmp2_; + gint _tmp3_; + gint _tmp4_; + gint _tmp5_; #line 269 "/home/jens/Source/shotwell/src/TimedQueue.vala" g_return_if_fail (IS_HASH_TIMED_QUEUE (self)); #line 272 "/home/jens/Source/shotwell/src/TimedQueue.vala" _tmp0_ = self->priv->item_count; #line 272 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp1_ = item; -#line 272 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 272 "/home/jens/Source/shotwell/src/TimedQueue.vala" - if (!_tmp2_) { + if (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), item)) { #line 273 "/home/jens/Source/shotwell/src/TimedQueue.vala" return; -#line 2158 "TimedQueue.c" +#line 2314 "TimedQueue.c" } #line 275 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp3_ = self->priv->item_count; + _tmp1_ = self->priv->item_count; #line 275 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp4_ = item; + _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), item); #line 275 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); -#line 275 "/home/jens/Source/shotwell/src/TimedQueue.vala" - count = (gint) ((gintptr) _tmp5_); + count = (gint) ((gintptr) _tmp2_); #line 276 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp6_ = count; + _tmp3_ = count; #line 276 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _vala_assert (_tmp6_ > 0, "count > 0"); + _vala_assert (_tmp3_ > 0, "count > 0"); #line 278 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp7_ = count; + _tmp4_ = count; #line 278 "/home/jens/Source/shotwell/src/TimedQueue.vala" - count = _tmp7_ - 1; + count = _tmp4_ - 1; #line 278 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp8_ = count; + _tmp5_ = count; #line 278 "/home/jens/Source/shotwell/src/TimedQueue.vala" - if (_tmp8_ == 0) { -#line 2180 "TimedQueue.c" - GeeHashMap* _tmp9_; - gconstpointer _tmp10_; -#line 279 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp9_ = self->priv->item_count; + if (_tmp5_ == 0) { +#line 2334 "TimedQueue.c" + GeeHashMap* _tmp6_; #line 279 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp10_ = item; + _tmp6_ = self->priv->item_count; #line 279 "/home/jens/Source/shotwell/src/TimedQueue.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_, NULL); -#line 2189 "TimedQueue.c" + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), item, NULL); +#line 2340 "TimedQueue.c" } else { - GeeHashMap* _tmp11_; - gconstpointer _tmp12_; - gint _tmp13_; + GeeHashMap* _tmp7_; + gint _tmp8_; #line 281 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp11_ = self->priv->item_count; + _tmp7_ = self->priv->item_count; #line 281 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp12_ = item; + _tmp8_ = count; #line 281 "/home/jens/Source/shotwell/src/TimedQueue.vala" - _tmp13_ = count; -#line 281 "/home/jens/Source/shotwell/src/TimedQueue.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_, (gpointer) ((gintptr) _tmp13_)); -#line 2202 "TimedQueue.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), item, (gpointer) ((gintptr) _tmp8_)); +#line 2350 "TimedQueue.c" } } -static void hash_timed_queue_class_init (HashTimedQueueClass * klass) { +static void +hash_timed_queue_class_init (HashTimedQueueClass * klass) +{ #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala" hash_timed_queue_parent_class = g_type_class_peek_parent (klass); #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala" @@ -2222,18 +2372,22 @@ static void hash_timed_queue_class_init (HashTimedQueueClass * klass) { ((TimedQueueClass *) klass)->enqueue_many = (gboolean (*) (TimedQueue *, GeeCollection*)) hash_timed_queue_real_enqueue_many; #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala" ((TimedQueueClass *) klass)->remove_first = (gboolean (*) (TimedQueue *, gconstpointer)) hash_timed_queue_real_remove_first; -#line 2226 "TimedQueue.c" +#line 2376 "TimedQueue.c" } -static void hash_timed_queue_instance_init (HashTimedQueue * self) { +static void +hash_timed_queue_instance_init (HashTimedQueue * self) +{ #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala" self->priv = HASH_TIMED_QUEUE_GET_PRIVATE (self); -#line 2233 "TimedQueue.c" +#line 2385 "TimedQueue.c" } -static void hash_timed_queue_finalize (TimedQueue * obj) { +static void +hash_timed_queue_finalize (TimedQueue * obj) +{ HashTimedQueue * self; #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HASH_TIMED_QUEUE, HashTimedQueue); @@ -2241,11 +2395,13 @@ static void hash_timed_queue_finalize (TimedQueue * obj) { _g_object_unref0 (self->priv->item_count); #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala" TIMED_QUEUE_CLASS (hash_timed_queue_parent_class)->finalize (obj); -#line 2245 "TimedQueue.c" +#line 2399 "TimedQueue.c" } -GType hash_timed_queue_get_type (void) { +GType +hash_timed_queue_get_type (void) +{ static volatile gsize hash_timed_queue_type_id__volatile = 0; if (g_once_init_enter (&hash_timed_queue_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (HashTimedQueueClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) hash_timed_queue_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (HashTimedQueue), 0, (GInstanceInitFunc) hash_timed_queue_instance_init, NULL }; diff --git a/src/Tombstone.c b/src/Tombstone.c index 0f09e21..4f221d3 100644 --- a/src/Tombstone.c +++ b/src/Tombstone.c @@ -1,4 +1,4 @@ -/* Tombstone.c generated by valac 0.36.6, the Vala compiler +/* Tombstone.c generated by valac 0.40.4, the Vala compiler * generated from Tombstone.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -202,6 +203,11 @@ typedef struct _TombstonePrivate TombstonePrivate; typedef struct _TombstoneRow TombstoneRow; typedef struct _TombstoneRowClass TombstoneRowClass; +enum { + TOMBSTONE_0_PROPERTY, + TOMBSTONE_NUM_PROPERTIES +}; +static GParamSpec* tombstone_properties[TOMBSTONE_NUM_PROPERTIES]; #define TOMBSTONE_TYPE_REASON (tombstone_reason_get_type ()) #define _tombstone_row_unref0(var) ((var == NULL) ? NULL : (var = (tombstone_row_unref (var), NULL))) @@ -381,45 +387,39 @@ struct _TombstoneSourceCollectionAsyncScanData { GeeIterator* _tmp3_; GeeIterator* _tmp4_; GeeIterator* _tmp5_; - gboolean _tmp6_; DataObject* object; - GeeIterator* _tmp7_; - gpointer _tmp8_; + GeeIterator* _tmp6_; + gpointer _tmp7_; Tombstone* tombstone; - DataObject* _tmp9_; - Tombstone* _tmp10_; + DataObject* _tmp8_; + Tombstone* _tmp9_; GFile* file; - Tombstone* _tmp11_; - GFile* _tmp12_; + Tombstone* _tmp10_; + GFile* _tmp11_; GFileInfo* info; - DirectoryMonitor* _tmp13_; - DirectoryMonitor* _tmp14_; - GFile* _tmp15_; - GFileInfo* _tmp16_; + GFile* _tmp12_; + GFileInfo* _tmp13_; + GFileInfo* _tmp14_; + GFileInfo* _tmp15_; + GFile* _tmp16_; GFileInfo* _tmp17_; GFileInfo* _tmp18_; - GFile* _tmp19_; - GCancellable* _tmp20_; - GFileInfo* _tmp21_; - GFileInfo* _tmp22_; GError* err; - GError* _tmp23_; + GError* _tmp19_; + GError* _tmp20_; + GFile* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; GError* _tmp24_; - GFile* _tmp25_; - gchar* _tmp26_; - gchar* _tmp27_; - GError* _tmp28_; - const gchar* _tmp29_; - GFileInfo* _tmp30_; + const gchar* _tmp25_; + GFileInfo* _tmp26_; + Marker* _tmp27_; + Tombstone* _tmp28_; + Marker* _tmp29_; + Marker* _tmp30_; Marker* _tmp31_; - Tombstone* _tmp32_; - Marker* _tmp33_; - gint _tmp34_; - Marker* _tmp35_; - gint _tmp36_; - Marker* _tmp37_; GError* err2; - GError* _tmp38_; + GError* _tmp32_; GError * _inner_error_; }; @@ -541,17 +541,29 @@ TombstoneSourceCollection* tombstone_global = NULL; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType marker_get_type (void) G_GNUC_CONST; @@ -559,47 +571,78 @@ GType source_collection_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType tombstone_source_collection_get_type (void) G_GNUC_CONST; GType tombstone_get_type (void) G_GNUC_CONST; #define TOMBSTONE_SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TOMBSTONE_SOURCE_COLLECTION, TombstoneSourceCollectionPrivate)) -enum { - TOMBSTONE_SOURCE_COLLECTION_DUMMY_PROPERTY -}; guint file_hash (GFile* file); -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self); -gboolean file_equal (GFile* a, GFile* b); -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); +static guint _file_hash_gee_hash_data_func (gconstpointer v, + gpointer self); +gboolean file_equal (GFile* a, + GFile* b); +static gboolean _file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); TombstoneSourceCollection* tombstone_source_collection_new (void); TombstoneSourceCollection* tombstone_source_collection_construct (GType object_type); static gint64 tombstone_source_collection_get_tombstone_id (DataSource* source); -static gint64 _tombstone_source_collection_get_tombstone_id_get_source_database_key (DataSource* source, gpointer self); -DatabaseSourceCollection* database_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target); -static gboolean tombstone_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source); +static gint64 _tombstone_source_collection_get_tombstone_id_get_source_database_key (DataSource* source, + gpointer self); +DatabaseSourceCollection* database_source_collection_construct (GType object_type, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target); +static gboolean tombstone_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source); GType tombstone_id_get_type (void) G_GNUC_CONST; TombstoneID* tombstone_id_dup (const TombstoneID* self); void tombstone_id_free (TombstoneID* self); -void tombstone_get_tombstone_id (Tombstone* self, TombstoneID* result); -static void tombstone_source_collection_real_notify_contents_altered (DataCollection* base, GeeIterable* added, GeeIterable* removed); +void tombstone_get_tombstone_id (Tombstone* self, + TombstoneID* result); +static void tombstone_source_collection_real_notify_contents_altered (DataCollection* base, + GeeIterable* added, + GeeIterable* removed); GFile* tombstone_get_file (Tombstone* self); -void data_collection_notify_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed); -static void tombstone_source_collection_real_notify_items_altered (DataCollection* base, GeeMap* items); -gboolean alteration_has_subject (Alteration* self, const gchar* subject); -GeeCollection* alteration_get_details (Alteration* self, const gchar* subject); -Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self, GFile* file); -gboolean tombstone_source_collection_matches (TombstoneSourceCollection* self, GFile* file); -void tombstone_source_collection_resurrect (TombstoneSourceCollection* self, Tombstone* tombstone); +void data_collection_notify_contents_altered (DataCollection* self, + GeeIterable* added, + GeeIterable* removed); +static void tombstone_source_collection_real_notify_items_altered (DataCollection* base, + GeeMap* items); +gboolean alteration_has_subject (Alteration* self, + const gchar* subject); +GeeCollection* alteration_get_details (Alteration* self, + const gchar* subject); +Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self, + GFile* file); +gboolean tombstone_source_collection_matches (TombstoneSourceCollection* self, + GFile* file); +void tombstone_source_collection_resurrect (TombstoneSourceCollection* self, + Tombstone* tombstone); GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; -gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed); -Marker* data_collection_mark (DataCollection* self, DataObject* object); -void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self, GeeCollection* tombstones); -Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects); +gint source_collection_destroy_marked (SourceCollection* self, + Marker* marker, + gboolean delete_backing, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_removed); +Marker* data_collection_mark (DataCollection* self, + DataObject* object); +void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self, + GeeCollection* tombstones); +Marker* data_collection_mark_many (DataCollection* self, + GeeCollection* objects); void data_collection_freeze_notifications (DataCollection* self); void database_table_begin_transaction (void); GQuark database_error_quark (void); @@ -607,90 +650,155 @@ void database_table_commit_transaction (GError** error); void app_window_database_error (GError* err); void data_collection_thaw_notifications (DataCollection* self); GType directory_monitor_get_type (void) G_GNUC_CONST; -void tombstone_source_collection_launch_scan (TombstoneSourceCollection* self, DirectoryMonitor* monitor, GCancellable* cancellable); -static void tombstone_source_collection_async_scan (TombstoneSourceCollection* self, DirectoryMonitor* monitor, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_); -static void tombstone_source_collection_async_scan_finish (TombstoneSourceCollection* self, GAsyncResult* _res_); +void tombstone_source_collection_launch_scan (TombstoneSourceCollection* self, + DirectoryMonitor* monitor, + GCancellable* cancellable); +static void tombstone_source_collection_async_scan (TombstoneSourceCollection* self, + DirectoryMonitor* monitor, + GCancellable* cancellable, + GAsyncReadyCallback _callback_, + gpointer _user_data_); +static void tombstone_source_collection_async_scan_finish (TombstoneSourceCollection* self, + GAsyncResult* _res_); static void tombstone_source_collection_async_scan_data_free (gpointer _data); -static void tombstone_source_collection_async_scan_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data); +static void tombstone_source_collection_async_scan_async_ready_wrapper (GObject *source_object, + GAsyncResult *res, + void *user_data); static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollectionAsyncScanData* _data_); Marker* data_collection_start_marking (DataCollection* self); GeeCollection* data_collection_get_all (DataCollection* self); -GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, GFile* file); -static void tombstone_source_collection_async_scan_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); -void marker_mark (Marker* self, DataObject* object); +GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, + GFile* file); +static void tombstone_source_collection_async_scan_ready (GObject* source_object, + GAsyncResult* _res_, + gpointer _user_data_); +void marker_mark (Marker* self, + DataObject* object); static gboolean _tombstone_source_collection_async_scan_co_gsource_func (gpointer self); gint marker_get_count (Marker* self); static void tombstone_source_collection_finalize (DataCollection * obj); gpointer tombstoned_file_ref (gpointer instance); void tombstoned_file_unref (gpointer instance); -GParamSpec* param_spec_tombstoned_file (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_tombstoned_file (GValue* value, gpointer v_object); -void value_take_tombstoned_file (GValue* value, gpointer v_object); +GParamSpec* param_spec_tombstoned_file (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_tombstoned_file (GValue* value, + gpointer v_object); +void value_take_tombstoned_file (GValue* value, + gpointer v_object); gpointer value_get_tombstoned_file (const GValue* value); GType tombstoned_file_get_type (void) G_GNUC_CONST; -enum { - TOMBSTONED_FILE_DUMMY_PROPERTY -}; -TombstonedFile* tombstoned_file_new (GFile* file, gint64 filesize, const gchar* md5); -TombstonedFile* tombstoned_file_construct (GType object_type, GFile* file, gint64 filesize, const gchar* md5); +TombstonedFile* tombstoned_file_new (GFile* file, + gint64 filesize, + const gchar* md5); +TombstonedFile* tombstoned_file_construct (GType object_type, + GFile* file, + gint64 filesize, + const gchar* md5); static void tombstoned_file_finalize (TombstonedFile * obj); gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; gpointer source_snapshot_ref (gpointer instance); void source_snapshot_unref (gpointer instance); -GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_snapshot (GValue* value, gpointer v_object); -void value_take_source_snapshot (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_snapshot (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_snapshot (GValue* value, + gpointer v_object); +void value_take_source_snapshot (GValue* value, + gpointer v_object); gpointer value_get_source_snapshot (const GValue* value); GType source_snapshot_get_type (void) G_GNUC_CONST; gpointer tombstone_row_ref (gpointer instance); void tombstone_row_unref (gpointer instance); -GParamSpec* param_spec_tombstone_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_tombstone_row (GValue* value, gpointer v_object); -void value_take_tombstone_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_tombstone_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_tombstone_row (GValue* value, + gpointer v_object); +void value_take_tombstone_row (GValue* value, + gpointer v_object); gpointer value_get_tombstone_row (const GValue* value); GType tombstone_row_get_type (void) G_GNUC_CONST; #define TOMBSTONE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TOMBSTONE, TombstonePrivate)) -enum { - TOMBSTONE_DUMMY_PROPERTY -}; GType tombstone_reason_get_type (void) G_GNUC_CONST; gint tombstone_reason_serialize (TombstoneReason self); TombstoneReason tombstone_reason_unserialize (gint value); static Tombstone* tombstone_new (TombstoneRow* row); -static Tombstone* tombstone_construct (GType object_type, TombstoneRow* row); +static Tombstone* tombstone_construct (GType object_type, + TombstoneRow* row); #define DATA_OBJECT_INVALID_OBJECT_ID ((gint64) -1) -DataSource* data_source_construct (GType object_type, gint64 object_id); +DataSource* data_source_construct (GType object_type, + gint64 object_id); void tombstone_init (void); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType tombstone_table_get_type (void) G_GNUC_CONST; TombstoneTable* tombstone_table_get_instance (void); -TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, int* result_length1, GError** error); -GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); +TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, + int* result_length1, + GError** error); +GeeCollection* data_collection_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); void tombstone_terminate (void); -void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reason, GError** error); +void tombstone_entomb_many_sources (GeeCollection* sources, + TombstoneReason reason, + GError** error); gpointer backing_file_state_ref (gpointer instance); void backing_file_state_unref (gpointer instance); -GParamSpec* param_spec_backing_file_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_file_state (GValue* value, gpointer v_object); -void value_take_backing_file_state (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_file_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_file_state (GValue* value, + gpointer v_object); +void value_take_backing_file_state (GValue* value, + gpointer v_object); gpointer value_get_backing_file_state (const GValue* value); GType backing_file_state_get_type (void) G_GNUC_CONST; -BackingFileState** media_source_get_backing_files_state (MediaSource* self, int* result_length1); +BackingFileState** media_source_get_backing_files_state (MediaSource* self, + int* result_length1); GFile* backing_file_state_get_file (BackingFileState* self); -void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason, GError** error); -TombstoneRow* tombstone_table_add (TombstoneTable* self, const gchar* filepath, gint64 filesize, const gchar* md5, TombstoneReason reason, GError** error); +void tombstone_entomb_many_files (GeeCollection* files, + TombstoneReason reason, + GError** error); +TombstoneRow* tombstone_table_add (TombstoneTable* self, + const gchar* filepath, + gint64 filesize, + const gchar* md5, + TombstoneReason reason, + GError** error); static gchar* tombstone_real_get_typename (DataSource* base); static gint64 tombstone_real_get_instance_id (DataSource* base); static gchar* tombstone_real_get_name (DataObject* base); @@ -699,116 +807,148 @@ gchar* data_object_get_name (DataObject* self); gchar* tombstone_get_md5 (Tombstone* self); gboolean is_string_empty (const gchar* s); TombstoneReason tombstone_get_reason (Tombstone* self); -void tombstone_move (Tombstone* self, GFile* file); -void tombstone_table_update_file (TombstoneTable* self, TombstoneID* tombstone_id, const gchar* filepath, GError** error); -void data_object_notify_altered (DataObject* self, Alteration* alteration); -Alteration* alteration_new (const gchar* subject, const gchar* detail); -Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail); -gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const gchar* md5); +void tombstone_move (Tombstone* self, + GFile* file); +void tombstone_table_update_file (TombstoneTable* self, + TombstoneID* tombstone_id, + const gchar* filepath, + GError** error); +void data_object_notify_altered (DataObject* self, + Alteration* alteration); +Alteration* alteration_new (const gchar* subject, + const gchar* detail); +Alteration* alteration_construct (GType object_type, + const gchar* subject, + const gchar* detail); +gboolean tombstone_matches (Tombstone* self, + GFile* file, + gint64 filesize, + const gchar* md5); static void tombstone_real_destroy (DataSource* base); -void tombstone_table_remove (TombstoneTable* self, TombstoneID* tombstone_id, GError** error); +void tombstone_table_remove (TombstoneTable* self, + TombstoneID* tombstone_id, + GError** error); void data_source_destroy (DataSource* self); static void tombstone_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); + + +static guint +_file_hash_gee_hash_data_func (gconstpointer v, + gpointer self) +{ guint result; result = file_hash ((GFile*) v); #line 8 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 722 "Tombstone.c" +#line 850 "Tombstone.c" } -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = file_equal ((GFile*) a, (GFile*) b); #line 8 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 731 "Tombstone.c" +#line 863 "Tombstone.c" } -static gint64 _tombstone_source_collection_get_tombstone_id_get_source_database_key (DataSource* source, gpointer self) { +static gint64 +_tombstone_source_collection_get_tombstone_id_get_source_database_key (DataSource* source, + gpointer self) +{ gint64 result; result = tombstone_source_collection_get_tombstone_id (source); #line 12 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 740 "Tombstone.c" +#line 875 "Tombstone.c" } -TombstoneSourceCollection* tombstone_source_collection_construct (GType object_type) { +TombstoneSourceCollection* +tombstone_source_collection_construct (GType object_type) +{ TombstoneSourceCollection* self = NULL; #line 12 "/home/jens/Source/shotwell/src/Tombstone.vala" self = (TombstoneSourceCollection*) database_source_collection_construct (object_type, "Tombstones", _tombstone_source_collection_get_tombstone_id_get_source_database_key, NULL); #line 11 "/home/jens/Source/shotwell/src/Tombstone.vala" return self; -#line 750 "Tombstone.c" +#line 887 "Tombstone.c" } -TombstoneSourceCollection* tombstone_source_collection_new (void) { +TombstoneSourceCollection* +tombstone_source_collection_new (void) +{ #line 11 "/home/jens/Source/shotwell/src/Tombstone.vala" return tombstone_source_collection_construct (TYPE_TOMBSTONE_SOURCE_COLLECTION); -#line 757 "Tombstone.c" +#line 896 "Tombstone.c" } -static gboolean tombstone_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) { +static gboolean +tombstone_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source) +{ TombstoneSourceCollection * self; gboolean result = FALSE; - DataSource* _tmp0_; #line 15 "/home/jens/Source/shotwell/src/Tombstone.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE_SOURCE_COLLECTION, TombstoneSourceCollection); #line 15 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 16 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = source; -#line 16 "/home/jens/Source/shotwell/src/Tombstone.vala" - result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_TOMBSTONE); + result = G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_TOMBSTONE); #line 16 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 775 "Tombstone.c" +#line 914 "Tombstone.c" } -static gint64 tombstone_source_collection_get_tombstone_id (DataSource* source) { +static gint64 +tombstone_source_collection_get_tombstone_id (DataSource* source) +{ gint64 result = 0LL; - DataSource* _tmp0_; - TombstoneID _tmp1_ = {0}; - gint64 _tmp2_; + TombstoneID _tmp0_ = {0}; + gint64 _tmp1_; #line 19 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL); #line 20 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = source; -#line 20 "/home/jens/Source/shotwell/src/Tombstone.vala" - tombstone_get_tombstone_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TOMBSTONE, Tombstone), &_tmp1_); + tombstone_get_tombstone_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_TOMBSTONE, Tombstone), &_tmp0_); #line 20 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = _tmp1_.id; + _tmp1_ = _tmp0_.id; #line 20 "/home/jens/Source/shotwell/src/Tombstone.vala" - result = _tmp2_; + result = _tmp1_; #line 20 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 796 "Tombstone.c" +#line 934 "Tombstone.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 27 "/home/jens/Source/shotwell/src/Tombstone.vala" return self ? g_object_ref (self) : NULL; -#line 803 "Tombstone.c" +#line 943 "Tombstone.c" } -static void tombstone_source_collection_real_notify_contents_altered (DataCollection* base, GeeIterable* added, GeeIterable* removed) { +static void +tombstone_source_collection_real_notify_contents_altered (DataCollection* base, + GeeIterable* added, + GeeIterable* removed) +{ TombstoneSourceCollection * self; - GeeIterable* _tmp0_; - GeeIterable* _tmp14_; - GeeIterable* _tmp36_; - GeeIterable* _tmp37_; #line 23 "/home/jens/Source/shotwell/src/Tombstone.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE_SOURCE_COLLECTION, TombstoneSourceCollection); #line 23 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -816,399 +956,364 @@ static void tombstone_source_collection_real_notify_contents_altered (DataCollec #line 23 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); #line 25 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = added; -#line 25 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_tmp0_ != NULL) { -#line 823 "Tombstone.c" + if (added != NULL) { +#line 961 "Tombstone.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp0_; #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = added; + _tmp0_ = gee_iterable_iterator (added); #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = gee_iterable_iterator (_tmp1_); -#line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" - _object_it = _tmp2_; + _object_it = _tmp0_; #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" while (TRUE) { -#line 836 "Tombstone.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 971 "Tombstone.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp2_; + gpointer _tmp3_; Tombstone* tombstone = NULL; - DataObject* _tmp7_; - Tombstone* _tmp8_; - GeeHashMap* _tmp9_; + DataObject* _tmp4_; + Tombstone* _tmp5_; + GeeHashMap* _tmp6_; + Tombstone* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; Tombstone* _tmp10_; - GFile* _tmp11_; - GFile* _tmp12_; - Tombstone* _tmp13_; -#line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp3_ = _object_it; #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp1_ = _object_it; #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" break; -#line 858 "Tombstone.c" +#line 990 "Tombstone.c" } #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp5_ = _object_it; + _tmp2_ = _object_it; #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" - object = (DataObject*) _tmp6_; + object = (DataObject*) _tmp3_; #line 27 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp7_ = object; + _tmp4_ = object; #line 27 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_TOMBSTONE, Tombstone)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_TOMBSTONE, Tombstone)); #line 27 "/home/jens/Source/shotwell/src/Tombstone.vala" - tombstone = _tmp8_; + tombstone = _tmp5_; #line 29 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp9_ = self->priv->file_map; + _tmp6_ = self->priv->file_map; #line 29 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp10_ = tombstone; + _tmp7_ = tombstone; #line 29 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp11_ = tombstone_get_file (_tmp10_); + _tmp8_ = tombstone_get_file (_tmp7_); #line 29 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp12_ = _tmp11_; + _tmp9_ = _tmp8_; #line 29 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp13_ = tombstone; + _tmp10_ = tombstone; #line 29 "/home/jens/Source/shotwell/src/Tombstone.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_, _tmp13_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, _tmp10_); #line 29 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp9_); #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (tombstone); #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (object); -#line 890 "Tombstone.c" +#line 1022 "Tombstone.c" } #line 26 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_object_it); -#line 894 "Tombstone.c" +#line 1026 "Tombstone.c" } } #line 33 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp14_ = removed; -#line 33 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_tmp14_ != NULL) { -#line 901 "Tombstone.c" + if (removed != NULL) { +#line 1031 "Tombstone.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp15_; - GeeIterator* _tmp16_; + GeeIterator* _tmp11_; #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp15_ = removed; + _tmp11_ = gee_iterable_iterator (removed); #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp16_ = gee_iterable_iterator (_tmp15_); -#line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" - _object_it = _tmp16_; + _object_it = _tmp11_; #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" while (TRUE) { -#line 914 "Tombstone.c" - GeeIterator* _tmp17_; - gboolean _tmp18_; +#line 1041 "Tombstone.c" + GeeIterator* _tmp12_; DataObject* object = NULL; - GeeIterator* _tmp19_; - gpointer _tmp20_; + GeeIterator* _tmp13_; + gpointer _tmp14_; Tombstone* tombstone = NULL; - DataObject* _tmp21_; - Tombstone* _tmp22_; - GeeHashMap* _tmp23_; - Tombstone* _tmp24_; - GFile* _tmp25_; - GFile* _tmp26_; - gboolean _tmp27_; - gboolean _tmp28_; + DataObject* _tmp15_; + Tombstone* _tmp16_; + GeeHashMap* _tmp17_; + Tombstone* _tmp18_; + GFile* _tmp19_; + GFile* _tmp20_; + gboolean _tmp21_; #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp17_ = _object_it; + _tmp12_ = _object_it; #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp18_ = gee_iterator_next (_tmp17_); -#line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (!_tmp18_) { + if (!gee_iterator_next (_tmp12_)) { #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" break; -#line 937 "Tombstone.c" +#line 1060 "Tombstone.c" } #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp19_ = _object_it; + _tmp13_ = _object_it; #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp20_ = gee_iterator_get (_tmp19_); + _tmp14_ = gee_iterator_get (_tmp13_); #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" - object = (DataObject*) _tmp20_; + object = (DataObject*) _tmp14_; #line 35 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp21_ = object; + _tmp15_ = object; #line 35 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_TOMBSTONE, Tombstone)); + _tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_TOMBSTONE, Tombstone)); #line 35 "/home/jens/Source/shotwell/src/Tombstone.vala" - tombstone = _tmp22_; -#line 38 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp23_ = self->priv->file_map; + tombstone = _tmp16_; #line 38 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp24_ = tombstone; + _tmp17_ = self->priv->file_map; #line 38 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp25_ = tombstone_get_file (_tmp24_); + _tmp18_ = tombstone; #line 38 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp26_ = _tmp25_; + _tmp19_ = tombstone_get_file (_tmp18_); #line 38 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp27_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp26_); + _tmp20_ = _tmp19_; #line 38 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp28_ = _tmp27_; + _tmp21_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_); #line 38 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp26_); + _g_object_unref0 (_tmp20_); #line 38 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_tmp28_) { -#line 967 "Tombstone.c" + if (_tmp21_) { +#line 1088 "Tombstone.c" gboolean is_removed = FALSE; - GeeHashMap* _tmp29_; - Tombstone* _tmp30_; - GFile* _tmp31_; - GFile* _tmp32_; - gboolean _tmp33_; - gboolean _tmp34_; - gboolean _tmp35_; + GeeHashMap* _tmp22_; + Tombstone* _tmp23_; + GFile* _tmp24_; + GFile* _tmp25_; + gboolean _tmp26_; + gboolean _tmp27_; + gboolean _tmp28_; #line 40 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp29_ = self->priv->file_map; + _tmp22_ = self->priv->file_map; #line 40 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp30_ = tombstone; + _tmp23_ = tombstone; #line 40 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp31_ = tombstone_get_file (_tmp30_); + _tmp24_ = tombstone_get_file (_tmp23_); #line 40 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp32_ = _tmp31_; + _tmp25_ = _tmp24_; #line 40 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp33_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp32_, NULL); + _tmp26_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp25_, NULL); #line 40 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp34_ = _tmp33_; + _tmp27_ = _tmp26_; #line 40 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp32_); + _g_object_unref0 (_tmp25_); #line 40 "/home/jens/Source/shotwell/src/Tombstone.vala" - is_removed = _tmp34_; + is_removed = _tmp27_; #line 41 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp35_ = is_removed; + _tmp28_ = is_removed; #line 41 "/home/jens/Source/shotwell/src/Tombstone.vala" - _vala_assert (_tmp35_, "is_removed"); -#line 996 "Tombstone.c" + _vala_assert (_tmp28_, "is_removed"); +#line 1117 "Tombstone.c" } #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (tombstone); #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (object); -#line 1002 "Tombstone.c" +#line 1123 "Tombstone.c" } #line 34 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_object_it); -#line 1006 "Tombstone.c" +#line 1127 "Tombstone.c" } } #line 49 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp36_ = added; -#line 49 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp37_ = removed; -#line 49 "/home/jens/Source/shotwell/src/Tombstone.vala" - DATA_COLLECTION_CLASS (tombstone_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp36_, _tmp37_); -#line 1015 "Tombstone.c" + DATA_COLLECTION_CLASS (tombstone_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), added, removed); +#line 1132 "Tombstone.c" } -static void tombstone_source_collection_real_notify_items_altered (DataCollection* base, GeeMap* items) { +static void +tombstone_source_collection_real_notify_items_altered (DataCollection* base, + GeeMap* items) +{ TombstoneSourceCollection * self; #line 52 "/home/jens/Source/shotwell/src/Tombstone.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE_SOURCE_COLLECTION, TombstoneSourceCollection); #line 52 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (GEE_IS_MAP (items)); -#line 1025 "Tombstone.c" +#line 1145 "Tombstone.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = items; + _tmp0_ = gee_map_get_keys (items); #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp2_ = _tmp1_; #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp3_ = _tmp2_; -#line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" while (TRUE) { -#line 1052 "Tombstone.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 1169 "Tombstone.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp6_; + gpointer _tmp7_; Alteration* alteration = NULL; - GeeMap* _tmp10_; - DataObject* _tmp11_; - gpointer _tmp12_; - Alteration* _tmp13_; - gboolean _tmp14_; + DataObject* _tmp8_; + gpointer _tmp9_; + Alteration* _tmp10_; Tombstone* tombstone = NULL; - DataObject* _tmp15_; - Tombstone* _tmp16_; -#line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp6_ = _object_it; + DataObject* _tmp11_; + Tombstone* _tmp12_; #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" break; -#line 1075 "Tombstone.c" +#line 1187 "Tombstone.c" } #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" - object = (DataObject*) _tmp9_; -#line 54 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp10_ = items; + object = (DataObject*) _tmp7_; #line 54 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp11_ = object; + _tmp8_ = object; #line 54 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp12_ = gee_map_get (_tmp10_, _tmp11_); + _tmp9_ = gee_map_get (items, _tmp8_); #line 54 "/home/jens/Source/shotwell/src/Tombstone.vala" - alteration = (Alteration*) _tmp12_; + alteration = (Alteration*) _tmp9_; #line 55 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp13_ = alteration; + _tmp10_ = alteration; #line 55 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp14_ = alteration_has_subject (_tmp13_, "file"); -#line 55 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (!_tmp14_) { + if (!alteration_has_subject (_tmp10_, "file")) { #line 56 "/home/jens/Source/shotwell/src/Tombstone.vala" _alteration_unref0 (alteration); #line 56 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (object); #line 56 "/home/jens/Source/shotwell/src/Tombstone.vala" continue; -#line 1103 "Tombstone.c" +#line 1211 "Tombstone.c" } #line 58 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp15_ = object; + _tmp11_ = object; #line 58 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_TOMBSTONE, Tombstone)); + _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_TOMBSTONE, Tombstone)); #line 58 "/home/jens/Source/shotwell/src/Tombstone.vala" - tombstone = _tmp16_; -#line 1111 "Tombstone.c" + tombstone = _tmp12_; +#line 1219 "Tombstone.c" { GeeIterator* _detail_it = NULL; - Alteration* _tmp17_; - GeeCollection* _tmp18_; - GeeCollection* _tmp19_; - GeeIterator* _tmp20_; - GeeIterator* _tmp21_; + Alteration* _tmp13_; + GeeCollection* _tmp14_; + GeeCollection* _tmp15_; + GeeIterator* _tmp16_; + GeeIterator* _tmp17_; #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp17_ = alteration; + _tmp13_ = alteration; #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp18_ = alteration_get_details (_tmp17_, "file"); + _tmp14_ = alteration_get_details (_tmp13_, "file"); #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp19_ = _tmp18_; + _tmp15_ = _tmp14_; #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable)); #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp21_ = _tmp20_; + _tmp17_ = _tmp16_; #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp19_); + _g_object_unref0 (_tmp15_); #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _detail_it = _tmp21_; + _detail_it = _tmp17_; #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" while (TRUE) { -#line 1135 "Tombstone.c" - GeeIterator* _tmp22_; - gboolean _tmp23_; +#line 1243 "Tombstone.c" + GeeIterator* _tmp18_; gchar* detail = NULL; - GeeIterator* _tmp24_; - gpointer _tmp25_; + GeeIterator* _tmp19_; + gpointer _tmp20_; GFile* old_file = NULL; - const gchar* _tmp26_; - GFile* _tmp27_; + const gchar* _tmp21_; + GFile* _tmp22_; gboolean removed = FALSE; - GeeHashMap* _tmp28_; + GeeHashMap* _tmp23_; + GFile* _tmp24_; + gboolean _tmp25_; + gboolean _tmp26_; + GeeHashMap* _tmp27_; + Tombstone* _tmp28_; GFile* _tmp29_; - gboolean _tmp30_; - gboolean _tmp31_; - GeeHashMap* _tmp32_; - Tombstone* _tmp33_; - GFile* _tmp34_; - GFile* _tmp35_; - Tombstone* _tmp36_; -#line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp22_ = _detail_it; + GFile* _tmp30_; + Tombstone* _tmp31_; #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp23_ = gee_iterator_next (_tmp22_); + _tmp18_ = _detail_it; #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (!_tmp23_) { + if (!gee_iterator_next (_tmp18_)) { #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" break; -#line 1162 "Tombstone.c" +#line 1267 "Tombstone.c" } #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp24_ = _detail_it; + _tmp19_ = _detail_it; #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp25_ = gee_iterator_get (_tmp24_); + _tmp20_ = gee_iterator_get (_tmp19_); #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" - detail = (gchar*) _tmp25_; + detail = (gchar*) _tmp20_; #line 61 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp26_ = detail; + _tmp21_ = detail; #line 61 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp27_ = g_file_new_for_path (_tmp26_); + _tmp22_ = g_file_new_for_path (_tmp21_); #line 61 "/home/jens/Source/shotwell/src/Tombstone.vala" - old_file = _tmp27_; + old_file = _tmp22_; #line 63 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp28_ = self->priv->file_map; + _tmp23_ = self->priv->file_map; #line 63 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp29_ = old_file; + _tmp24_ = old_file; #line 63 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp30_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp29_, NULL); + _tmp25_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_, NULL); #line 63 "/home/jens/Source/shotwell/src/Tombstone.vala" - removed = _tmp30_; + removed = _tmp25_; #line 64 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp31_ = removed; + _tmp26_ = removed; #line 64 "/home/jens/Source/shotwell/src/Tombstone.vala" - _vala_assert (_tmp31_, "removed"); + _vala_assert (_tmp26_, "removed"); #line 66 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp32_ = self->priv->file_map; + _tmp27_ = self->priv->file_map; #line 66 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp33_ = tombstone; + _tmp28_ = tombstone; #line 66 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp34_ = tombstone_get_file (_tmp33_); + _tmp29_ = tombstone_get_file (_tmp28_); #line 66 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp35_ = _tmp34_; + _tmp30_ = _tmp29_; #line 66 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp36_ = tombstone; + _tmp31_ = tombstone; #line 66 "/home/jens/Source/shotwell/src/Tombstone.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp35_, _tmp36_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp30_, _tmp31_); #line 66 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp35_); + _g_object_unref0 (_tmp30_); #line 68 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (old_file); #line 68 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_free0 (detail); #line 68 "/home/jens/Source/shotwell/src/Tombstone.vala" break; -#line 1208 "Tombstone.c" +#line 1313 "Tombstone.c" } #line 60 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_detail_it); -#line 1212 "Tombstone.c" +#line 1317 "Tombstone.c" } #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (tombstone); @@ -1216,20 +1321,22 @@ static void tombstone_source_collection_real_notify_items_altered (DataCollectio _alteration_unref0 (alteration); #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (object); -#line 1220 "Tombstone.c" +#line 1325 "Tombstone.c" } #line 53 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_object_it); -#line 1224 "Tombstone.c" +#line 1329 "Tombstone.c" } } -Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self, GFile* file) { +Tombstone* +tombstone_source_collection_locate (TombstoneSourceCollection* self, + GFile* file) +{ Tombstone* result = NULL; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 73 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_val_if_fail (IS_TOMBSTONE_SOURCE_COLLECTION (self), NULL); #line 73 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1237,22 +1344,21 @@ Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self, #line 74 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp0_ = self->priv->file_map; #line 74 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = file; -#line 74 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 74 "/home/jens/Source/shotwell/src/Tombstone.vala" - result = (Tombstone*) _tmp2_; + result = (Tombstone*) _tmp1_; #line 74 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 1248 "Tombstone.c" +#line 1353 "Tombstone.c" } -gboolean tombstone_source_collection_matches (TombstoneSourceCollection* self, GFile* file) { +gboolean +tombstone_source_collection_matches (TombstoneSourceCollection* self, + GFile* file) +{ gboolean result = FALSE; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gboolean _tmp2_; #line 77 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_val_if_fail (IS_TOMBSTONE_SOURCE_COLLECTION (self), FALSE); #line 77 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1260,61 +1366,57 @@ gboolean tombstone_source_collection_matches (TombstoneSourceCollection* self, G #line 78 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp0_ = self->priv->file_map; #line 78 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = file; -#line 78 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 78 "/home/jens/Source/shotwell/src/Tombstone.vala" - result = _tmp2_; + result = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 78 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 1271 "Tombstone.c" +#line 1373 "Tombstone.c" } -void tombstone_source_collection_resurrect (TombstoneSourceCollection* self, Tombstone* tombstone) { - Tombstone* _tmp0_; +void +tombstone_source_collection_resurrect (TombstoneSourceCollection* self, + Tombstone* tombstone) +{ + Marker* _tmp0_; Marker* _tmp1_; - Marker* _tmp2_; #line 81 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (IS_TOMBSTONE_SOURCE_COLLECTION (self)); #line 81 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (IS_TOMBSTONE (tombstone)); #line 82 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = tombstone; -#line 82 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (tombstone, TYPE_DATA_OBJECT, DataObject)); #line 82 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 82 "/home/jens/Source/shotwell/src/Tombstone.vala" - source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp2_, FALSE, NULL, NULL, NULL); + source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp1_, FALSE, NULL, NULL, NULL); #line 82 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp2_); -#line 1293 "Tombstone.c" + _g_object_unref0 (_tmp1_); +#line 1395 "Tombstone.c" } -void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self, GeeCollection* tombstones) { +void +tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self, + GeeCollection* tombstones) +{ Marker* marker = NULL; - GeeCollection* _tmp0_; - Marker* _tmp1_; + Marker* _tmp0_; GError * _inner_error_ = NULL; #line 85 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (IS_TOMBSTONE_SOURCE_COLLECTION (self)); #line 85 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (GEE_IS_COLLECTION (tombstones)); #line 86 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = tombstones; -#line 86 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp0_); + _tmp0_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), tombstones); #line 86 "/home/jens/Source/shotwell/src/Tombstone.vala" - marker = _tmp1_; + marker = _tmp0_; #line 88 "/home/jens/Source/shotwell/src/Tombstone.vala" data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 89 "/home/jens/Source/shotwell/src/Tombstone.vala" database_table_begin_transaction (); #line 91 "/home/jens/Source/shotwell/src/Tombstone.vala" source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), marker, FALSE, NULL, NULL, NULL); -#line 1318 "Tombstone.c" +#line 1420 "Tombstone.c" { #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala" database_table_commit_transaction (&_inner_error_); @@ -1322,7 +1424,7 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self if (G_UNLIKELY (_inner_error_ != NULL)) { #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1326 "Tombstone.c" +#line 1428 "Tombstone.c" goto __catch557_database_error; } #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1333,25 +1435,25 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self g_clear_error (&_inner_error_); #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 1337 "Tombstone.c" +#line 1439 "Tombstone.c" } } goto __finally557; __catch557_database_error: { GError* err = NULL; - GError* _tmp2_; + GError* _tmp1_; #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala" err = _inner_error_; #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala" _inner_error_ = NULL; #line 96 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = err; + _tmp1_ = err; #line 96 "/home/jens/Source/shotwell/src/Tombstone.vala" - app_window_database_error (_tmp2_); + app_window_database_error (_tmp1_); #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_error_free0 (err); -#line 1355 "Tombstone.c" +#line 1457 "Tombstone.c" } __finally557: #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1364,19 +1466,21 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self g_clear_error (&_inner_error_); #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 1368 "Tombstone.c" +#line 1470 "Tombstone.c" } #line 99 "/home/jens/Source/shotwell/src/Tombstone.vala" data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 85 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (marker); -#line 1374 "Tombstone.c" +#line 1476 "Tombstone.c" } -void tombstone_source_collection_launch_scan (TombstoneSourceCollection* self, DirectoryMonitor* monitor, GCancellable* cancellable) { - DirectoryMonitor* _tmp0_; - GCancellable* _tmp1_; +void +tombstone_source_collection_launch_scan (TombstoneSourceCollection* self, + DirectoryMonitor* monitor, + GCancellable* cancellable) +{ #line 108 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (IS_TOMBSTONE_SOURCE_COLLECTION (self)); #line 108 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1384,16 +1488,14 @@ void tombstone_source_collection_launch_scan (TombstoneSourceCollection* self, D #line 108 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable)); #line 109 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = monitor; -#line 109 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = cancellable; -#line 109 "/home/jens/Source/shotwell/src/Tombstone.vala" - tombstone_source_collection_async_scan (self, _tmp0_, _tmp1_, NULL, NULL); -#line 1393 "Tombstone.c" + tombstone_source_collection_async_scan (self, monitor, cancellable, NULL, NULL); +#line 1493 "Tombstone.c" } -static void tombstone_source_collection_async_scan_data_free (gpointer _data) { +static void +tombstone_source_collection_async_scan_data_free (gpointer _data) +{ TombstoneSourceCollectionAsyncScanData* _data_; _data_ = _data; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1404,11 +1506,15 @@ static void tombstone_source_collection_async_scan_data_free (gpointer _data) { _data_collection_unref0 (_data_->self); #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" g_slice_free (TombstoneSourceCollectionAsyncScanData, _data_); -#line 1408 "Tombstone.c" +#line 1510 "Tombstone.c" } -static void tombstone_source_collection_async_scan_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) { +static void +tombstone_source_collection_async_scan_async_ready_wrapper (GObject *source_object, + GAsyncResult *res, + void *user_data) +{ TombstoneSourceCollectionAsyncScanData* _task_data_; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" _task_data_ = g_task_get_task_data (G_TASK (res)); @@ -1416,28 +1522,34 @@ static void tombstone_source_collection_async_scan_async_ready_wrapper (GObject if (_task_data_->_callback_ != NULL) { #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" _task_data_->_callback_ (source_object, res, user_data); -#line 1420 "Tombstone.c" +#line 1526 "Tombstone.c" } #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" _task_data_->_task_complete_ = TRUE; -#line 1424 "Tombstone.c" +#line 1530 "Tombstone.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" return self ? data_collection_ref (self) : NULL; -#line 1431 "Tombstone.c" +#line 1539 "Tombstone.c" } -static void tombstone_source_collection_async_scan (TombstoneSourceCollection* self, DirectoryMonitor* monitor, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_) { +static void +tombstone_source_collection_async_scan (TombstoneSourceCollection* self, + DirectoryMonitor* monitor, + GCancellable* cancellable, + GAsyncReadyCallback _callback_, + gpointer _user_data_) +{ TombstoneSourceCollectionAsyncScanData* _data_; TombstoneSourceCollection* _tmp0_; DirectoryMonitor* _tmp1_; - DirectoryMonitor* _tmp2_; - GCancellable* _tmp3_; - GCancellable* _tmp4_; + GCancellable* _tmp2_; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_ = g_slice_new0 (TombstoneSourceCollectionAsyncScanData); #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1448,7 +1560,7 @@ static void tombstone_source_collection_async_scan (TombstoneSourceCollection* s if (_callback_ == NULL) { #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->_task_complete_ = TRUE; -#line 1452 "Tombstone.c" +#line 1564 "Tombstone.c" } #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" g_task_set_task_data (_data_->_async_result, _data_, tombstone_source_collection_async_scan_data_free); @@ -1457,28 +1569,27 @@ static void tombstone_source_collection_async_scan (TombstoneSourceCollection* s #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->self = _tmp0_; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = monitor; -#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (monitor); #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_data_->monitor); #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->monitor = _tmp2_; + _data_->monitor = _tmp1_; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp3_ = cancellable; -#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp2_ = _g_object_ref0 (cancellable); #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_data_->cancellable); #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->cancellable = _tmp4_; + _data_->cancellable = _tmp2_; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" tombstone_source_collection_async_scan_co (_data_); -#line 1478 "Tombstone.c" +#line 1586 "Tombstone.c" } -static void tombstone_source_collection_async_scan_finish (TombstoneSourceCollection* self, GAsyncResult* _res_) { +static void +tombstone_source_collection_async_scan_finish (TombstoneSourceCollection* self, + GAsyncResult* _res_) +{ TombstoneSourceCollectionAsyncScanData* _data_; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_ = g_task_propagate_pointer (G_TASK (_res_), NULL); @@ -1486,12 +1597,16 @@ static void tombstone_source_collection_async_scan_finish (TombstoneSourceCollec if (NULL == _data_) { #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 1490 "Tombstone.c" +#line 1601 "Tombstone.c" } } -static void tombstone_source_collection_async_scan_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { +static void +tombstone_source_collection_async_scan_ready (GObject* source_object, + GAsyncResult* _res_, + gpointer _user_data_) +{ TombstoneSourceCollectionAsyncScanData* _data_; #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_ = _user_data_; @@ -1503,45 +1618,49 @@ static void tombstone_source_collection_async_scan_ready (GObject* source_object _data_->_task_complete_ = TRUE; #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" tombstone_source_collection_async_scan_co (_data_); -#line 1507 "Tombstone.c" +#line 1622 "Tombstone.c" } -static gboolean _tombstone_source_collection_async_scan_co_gsource_func (gpointer self) { +static gboolean +_tombstone_source_collection_async_scan_co_gsource_func (gpointer self) +{ gboolean result; result = tombstone_source_collection_async_scan_co (self); #line 145 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 1516 "Tombstone.c" +#line 1633 "Tombstone.c" } -static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollectionAsyncScanData* _data_) { +static gboolean +tombstone_source_collection_async_scan_co (TombstoneSourceCollectionAsyncScanData* _data_) +{ #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala" switch (_data_->_state_) { #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala" case 0: -#line 1525 "Tombstone.c" +#line 1644 "Tombstone.c" goto _state_0; #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala" case 1: -#line 1529 "Tombstone.c" +#line 1648 "Tombstone.c" goto _state_1; #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala" case 2: -#line 1533 "Tombstone.c" +#line 1652 "Tombstone.c" goto _state_2; default: #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala" g_assert_not_reached (); -#line 1538 "Tombstone.c" +#line 1657 "Tombstone.c" } _state_0: #line 114 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->_tmp0_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_DATA_COLLECTION, DataCollection)); #line 114 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->marker = _data_->_tmp0_; -#line 1545 "Tombstone.c" +#line 1664 "Tombstone.c" { #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->_tmp1_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_DATA_COLLECTION, DataCollection)); @@ -1560,87 +1679,79 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->_tmp5_ = _data_->_object_it; #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp6_ = gee_iterator_next (_data_->_tmp5_); -#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (!_data_->_tmp6_) { + if (!gee_iterator_next (_data_->_tmp5_)) { #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" break; -#line 1569 "Tombstone.c" +#line 1686 "Tombstone.c" } #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp7_ = _data_->_object_it; + _data_->_tmp6_ = _data_->_object_it; #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp8_ = gee_iterator_get (_data_->_tmp7_); + _data_->_tmp7_ = gee_iterator_get (_data_->_tmp6_); #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->object = (DataObject*) _data_->_tmp8_; + _data_->object = (DataObject*) _data_->_tmp7_; #line 116 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp9_ = _data_->object; + _data_->_tmp8_ = _data_->object; #line 116 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp9_, TYPE_TOMBSTONE, Tombstone)); + _data_->_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp8_, TYPE_TOMBSTONE, Tombstone)); #line 116 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->tombstone = _data_->_tmp10_; + _data_->tombstone = _data_->_tmp9_; #line 117 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp11_ = _data_->tombstone; + _data_->_tmp10_ = _data_->tombstone; #line 117 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp12_ = tombstone_get_file (_data_->_tmp11_); + _data_->_tmp11_ = tombstone_get_file (_data_->_tmp10_); #line 117 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->file = _data_->_tmp12_; + _data_->file = _data_->_tmp11_; #line 119 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->info = NULL; #line 120 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp13_ = _data_->monitor; -#line 120 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_data_->_tmp13_ != NULL) { -#line 121 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp14_ = _data_->monitor; + if (_data_->monitor != NULL) { #line 121 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp15_ = _data_->file; + _data_->_tmp12_ = _data_->file; #line 121 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp16_ = directory_monitor_get_file_info (_data_->_tmp14_, _data_->_tmp15_); + _data_->_tmp13_ = directory_monitor_get_file_info (_data_->monitor, _data_->_tmp12_); #line 121 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_data_->info); #line 121 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->info = _data_->_tmp16_; -#line 1605 "Tombstone.c" + _data_->info = _data_->_tmp13_; +#line 1718 "Tombstone.c" } #line 125 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp17_ = _data_->info; + _data_->_tmp14_ = _data_->info; #line 125 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_data_->_tmp17_ == NULL) { -#line 1611 "Tombstone.c" + if (_data_->_tmp14_ == NULL) { +#line 1724 "Tombstone.c" { #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp19_ = _data_->file; -#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp20_ = _data_->cancellable; + _data_->_tmp16_ = _data_->file; #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->_state_ = 1; #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" - g_file_query_info_async (_data_->_tmp19_, G_FILE_ATTRIBUTE_STANDARD_NAME, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, G_PRIORITY_LOW, _data_->_tmp20_, tombstone_source_collection_async_scan_ready, _data_); + g_file_query_info_async (_data_->_tmp16_, G_FILE_ATTRIBUTE_STANDARD_NAME, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, G_PRIORITY_LOW, _data_->cancellable, tombstone_source_collection_async_scan_ready, _data_); #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" return FALSE; -#line 1623 "Tombstone.c" +#line 1734 "Tombstone.c" _state_1: #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp21_ = g_file_query_info_finish (_data_->_tmp19_, _data_->_res_, &_data_->_inner_error_); + _data_->_tmp17_ = g_file_query_info_finish (_data_->_tmp16_, _data_->_res_, &_data_->_inner_error_); #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp18_ = _data_->_tmp21_; + _data_->_tmp15_ = _data_->_tmp17_; #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 1631 "Tombstone.c" +#line 1742 "Tombstone.c" goto __catch558_g_error; } #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp22_ = _data_->_tmp18_; + _data_->_tmp18_ = _data_->_tmp15_; #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp18_ = NULL; + _data_->_tmp15_ = NULL; #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_data_->info); #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->info = _data_->_tmp22_; + _data_->info = _data_->_tmp18_; #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_data_->_tmp18_); -#line 1644 "Tombstone.c" + _g_object_unref0 (_data_->_tmp15_); +#line 1755 "Tombstone.c" } goto __finally558; __catch558_g_error: @@ -1650,9 +1761,9 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->_inner_error_ = NULL; #line 131 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp23_ = _data_->err; + _data_->_tmp19_ = _data_->err; #line 131 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (g_error_matches (_data_->_tmp23_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { + if (g_error_matches (_data_->_tmp19_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { #line 132 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_error_free0 (_data_->err); #line 132 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1665,32 +1776,32 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec _g_object_unref0 (_data_->object); #line 132 "/home/jens/Source/shotwell/src/Tombstone.vala" break; -#line 1669 "Tombstone.c" +#line 1780 "Tombstone.c" } #line 134 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp24_ = _data_->err; + _data_->_tmp20_ = _data_->err; #line 134 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (!g_error_matches (_data_->_tmp24_, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) { + if (!g_error_matches (_data_->_tmp20_, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) { #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp25_ = _data_->file; + _data_->_tmp21_ = _data_->file; #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp26_ = g_file_get_path (_data_->_tmp25_); + _data_->_tmp22_ = g_file_get_path (_data_->_tmp21_); #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp27_ = _data_->_tmp26_; + _data_->_tmp23_ = _data_->_tmp22_; #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp28_ = _data_->err; + _data_->_tmp24_ = _data_->err; #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp29_ = _data_->_tmp28_->message; + _data_->_tmp25_ = _data_->_tmp24_->message; #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala" g_warning ("Tombstone.vala:135: Unable to check for existence of tombstoned file %" \ -"s: %s", _data_->_tmp27_, _data_->_tmp29_); +"s: %s", _data_->_tmp23_, _data_->_tmp25_); #line 135 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_free0 (_data_->_tmp27_); -#line 1689 "Tombstone.c" + _g_free0 (_data_->_tmp23_); +#line 1800 "Tombstone.c" } #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_error_free0 (_data_->err); -#line 1693 "Tombstone.c" +#line 1804 "Tombstone.c" } __finally558: #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1715,20 +1826,20 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec g_object_unref (_data_->_async_result); #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala" return FALSE; -#line 1718 "Tombstone.c" +#line 1829 "Tombstone.c" } } #line 142 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp30_ = _data_->info; + _data_->_tmp26_ = _data_->info; #line 142 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_data_->_tmp30_ == NULL) { + if (_data_->_tmp26_ == NULL) { #line 143 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp31_ = _data_->marker; + _data_->_tmp27_ = _data_->marker; #line 143 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp32_ = _data_->tombstone; + _data_->_tmp28_ = _data_->tombstone; #line 143 "/home/jens/Source/shotwell/src/Tombstone.vala" - marker_mark (_data_->_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp32_, TYPE_DATA_OBJECT, DataObject)); -#line 1731 "Tombstone.c" + marker_mark (_data_->_tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp28_, TYPE_DATA_OBJECT, DataObject)); +#line 1842 "Tombstone.c" } #line 145 "/home/jens/Source/shotwell/src/Tombstone.vala" g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _tombstone_source_collection_async_scan_co_gsource_func, _data_, NULL); @@ -1736,7 +1847,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec _data_->_state_ = 2; #line 146 "/home/jens/Source/shotwell/src/Tombstone.vala" return FALSE; -#line 1739 "Tombstone.c" +#line 1850 "Tombstone.c" _state_2: ; #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1747,31 +1858,27 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec _g_object_unref0 (_data_->tombstone); #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_data_->object); -#line 1750 "Tombstone.c" +#line 1861 "Tombstone.c" } #line 115 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_data_->_object_it); -#line 1754 "Tombstone.c" +#line 1865 "Tombstone.c" } #line 149 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp33_ = _data_->marker; -#line 149 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp34_ = marker_get_count (_data_->_tmp33_); + _data_->_tmp29_ = _data_->marker; #line 149 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_data_->_tmp34_ > 0) { + if (marker_get_count (_data_->_tmp29_) > 0) { #line 150 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp35_ = _data_->marker; + _data_->_tmp30_ = _data_->marker; #line 150 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp36_ = marker_get_count (_data_->_tmp35_); -#line 150 "/home/jens/Source/shotwell/src/Tombstone.vala" - g_debug ("Tombstone.vala:150: Resurrecting %d tombstones with no backing file", _data_->_tmp36_); + g_debug ("Tombstone.vala:150: Resurrecting %d tombstones with no backing file", marker_get_count (_data_->_tmp30_)); #line 151 "/home/jens/Source/shotwell/src/Tombstone.vala" database_table_begin_transaction (); #line 152 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp37_ = _data_->marker; + _data_->_tmp31_ = _data_->marker; #line 152 "/home/jens/Source/shotwell/src/Tombstone.vala" - source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_SOURCE_COLLECTION, SourceCollection), _data_->_tmp37_, FALSE, NULL, NULL, NULL); -#line 1774 "Tombstone.c" + source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_SOURCE_COLLECTION, SourceCollection), _data_->_tmp31_, FALSE, NULL, NULL, NULL); +#line 1881 "Tombstone.c" { #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala" database_table_commit_transaction (&_data_->_inner_error_); @@ -1779,7 +1886,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala" if (_data_->_inner_error_->domain == DATABASE_ERROR) { -#line 1782 "Tombstone.c" +#line 1889 "Tombstone.c" goto __catch559_database_error; } #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1792,7 +1899,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec g_object_unref (_data_->_async_result); #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala" return FALSE; -#line 1795 "Tombstone.c" +#line 1902 "Tombstone.c" } } goto __finally559; @@ -1803,12 +1910,12 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->_inner_error_ = NULL; #line 156 "/home/jens/Source/shotwell/src/Tombstone.vala" - _data_->_tmp38_ = _data_->err2; + _data_->_tmp32_ = _data_->err2; #line 156 "/home/jens/Source/shotwell/src/Tombstone.vala" - app_window_database_error (_data_->_tmp38_); + app_window_database_error (_data_->_tmp32_); #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_error_free0 (_data_->err2); -#line 1811 "Tombstone.c" +#line 1918 "Tombstone.c" } __finally559: #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1823,7 +1930,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec g_object_unref (_data_->_async_result); #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala" return FALSE; -#line 1826 "Tombstone.c" +#line 1933 "Tombstone.c" } } #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1836,18 +1943,20 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec while (_data_->_task_complete_ != TRUE) { #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala" g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); -#line 1839 "Tombstone.c" +#line 1946 "Tombstone.c" } } #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala" g_object_unref (_data_->_async_result); #line 112 "/home/jens/Source/shotwell/src/Tombstone.vala" return FALSE; -#line 1846 "Tombstone.c" +#line 1953 "Tombstone.c" } -static void tombstone_source_collection_class_init (TombstoneSourceCollectionClass * klass) { +static void +tombstone_source_collection_class_init (TombstoneSourceCollectionClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" tombstone_source_collection_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1860,11 +1969,13 @@ static void tombstone_source_collection_class_init (TombstoneSourceCollectionCla ((DataCollectionClass *) klass)->notify_contents_altered = (void (*) (DataCollection *, GeeIterable*, GeeIterable*)) tombstone_source_collection_real_notify_contents_altered; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" ((DataCollectionClass *) klass)->notify_items_altered = (void (*) (DataCollection *, GeeMap*)) tombstone_source_collection_real_notify_items_altered; -#line 1863 "Tombstone.c" +#line 1972 "Tombstone.c" } -static void tombstone_source_collection_instance_init (TombstoneSourceCollection * self) { +static void +tombstone_source_collection_instance_init (TombstoneSourceCollection * self) +{ GeeHashMap* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" self->priv = TOMBSTONE_SOURCE_COLLECTION_GET_PRIVATE (self); @@ -1872,11 +1983,13 @@ static void tombstone_source_collection_instance_init (TombstoneSourceCollection _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 8 "/home/jens/Source/shotwell/src/Tombstone.vala" self->priv->file_map = _tmp0_; -#line 1875 "Tombstone.c" +#line 1986 "Tombstone.c" } -static void tombstone_source_collection_finalize (DataCollection * obj) { +static void +tombstone_source_collection_finalize (DataCollection * obj) +{ TombstoneSourceCollection * self; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONE_SOURCE_COLLECTION, TombstoneSourceCollection); @@ -1884,11 +1997,13 @@ static void tombstone_source_collection_finalize (DataCollection * obj) { _g_object_unref0 (self->priv->file_map); #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" DATA_COLLECTION_CLASS (tombstone_source_collection_parent_class)->finalize (obj); -#line 1887 "Tombstone.c" +#line 2000 "Tombstone.c" } -GType tombstone_source_collection_get_type (void) { +GType +tombstone_source_collection_get_type (void) +{ static volatile gsize tombstone_source_collection_type_id__volatile = 0; if (g_once_init_enter (&tombstone_source_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TombstoneSourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tombstone_source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TombstoneSourceCollection), 0, (GInstanceInitFunc) tombstone_source_collection_instance_init, NULL }; @@ -1900,148 +2015,173 @@ GType tombstone_source_collection_get_type (void) { } -TombstonedFile* tombstoned_file_construct (GType object_type, GFile* file, gint64 filesize, const gchar* md5) { +TombstonedFile* +tombstoned_file_construct (GType object_type, + GFile* file, + gint64 filesize, + const gchar* md5) +{ TombstonedFile* self = NULL; GFile* _tmp0_; - GFile* _tmp1_; - gint64 _tmp2_; - const gchar* _tmp3_; - gchar* _tmp4_; + gchar* _tmp1_; #line 167 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 167 "/home/jens/Source/shotwell/src/Tombstone.vala" self = (TombstonedFile*) g_type_create_instance (object_type); #line 168 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = file; -#line 168 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (file); #line 168 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (self->file); #line 168 "/home/jens/Source/shotwell/src/Tombstone.vala" - self->file = _tmp1_; -#line 169 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = filesize; + self->file = _tmp0_; #line 169 "/home/jens/Source/shotwell/src/Tombstone.vala" - self->filesize = _tmp2_; -#line 170 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp3_ = md5; + self->filesize = filesize; #line 170 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp4_ = g_strdup (_tmp3_); + _tmp1_ = g_strdup (md5); #line 170 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_free0 (self->md5); #line 170 "/home/jens/Source/shotwell/src/Tombstone.vala" - self->md5 = _tmp4_; + self->md5 = _tmp1_; #line 167 "/home/jens/Source/shotwell/src/Tombstone.vala" return self; -#line 1936 "Tombstone.c" +#line 2047 "Tombstone.c" } -TombstonedFile* tombstoned_file_new (GFile* file, gint64 filesize, const gchar* md5) { +TombstonedFile* +tombstoned_file_new (GFile* file, + gint64 filesize, + const gchar* md5) +{ #line 167 "/home/jens/Source/shotwell/src/Tombstone.vala" return tombstoned_file_construct (TYPE_TOMBSTONED_FILE, file, filesize, md5); -#line 1943 "Tombstone.c" +#line 2058 "Tombstone.c" } -static void value_tombstoned_file_init (GValue* value) { +static void +value_tombstoned_file_init (GValue* value) +{ #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" value->data[0].v_pointer = NULL; -#line 1950 "Tombstone.c" +#line 2067 "Tombstone.c" } -static void value_tombstoned_file_free_value (GValue* value) { +static void +value_tombstoned_file_free_value (GValue* value) +{ #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" if (value->data[0].v_pointer) { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" tombstoned_file_unref (value->data[0].v_pointer); -#line 1959 "Tombstone.c" +#line 2078 "Tombstone.c" } } -static void value_tombstoned_file_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_tombstoned_file_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" if (src_value->data[0].v_pointer) { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" dest_value->data[0].v_pointer = tombstoned_file_ref (src_value->data[0].v_pointer); -#line 1969 "Tombstone.c" +#line 2091 "Tombstone.c" } else { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" dest_value->data[0].v_pointer = NULL; -#line 1973 "Tombstone.c" +#line 2095 "Tombstone.c" } } -static gpointer value_tombstoned_file_peek_pointer (const GValue* value) { +static gpointer +value_tombstoned_file_peek_pointer (const GValue* value) +{ #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" return value->data[0].v_pointer; -#line 1981 "Tombstone.c" +#line 2105 "Tombstone.c" } -static gchar* value_tombstoned_file_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_tombstoned_file_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" if (collect_values[0].v_pointer) { -#line 1988 "Tombstone.c" +#line 2117 "Tombstone.c" TombstonedFile * object; object = collect_values[0].v_pointer; #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" if (object->parent_instance.g_class == NULL) { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1995 "Tombstone.c" +#line 2124 "Tombstone.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 162 "/home/jens/Source/shotwell/src/Tombstone.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 1999 "Tombstone.c" +#line 2128 "Tombstone.c" } #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" value->data[0].v_pointer = tombstoned_file_ref (object); -#line 2003 "Tombstone.c" +#line 2132 "Tombstone.c" } else { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" value->data[0].v_pointer = NULL; -#line 2007 "Tombstone.c" +#line 2136 "Tombstone.c" } #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" return NULL; -#line 2011 "Tombstone.c" +#line 2140 "Tombstone.c" } -static gchar* value_tombstoned_file_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_tombstoned_file_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ TombstonedFile ** object_p; object_p = collect_values[0].v_pointer; #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" if (!object_p) { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2022 "Tombstone.c" +#line 2156 "Tombstone.c" } #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" if (!value->data[0].v_pointer) { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" *object_p = NULL; -#line 2028 "Tombstone.c" +#line 2162 "Tombstone.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" *object_p = value->data[0].v_pointer; -#line 2032 "Tombstone.c" +#line 2166 "Tombstone.c" } else { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" *object_p = tombstoned_file_ref (value->data[0].v_pointer); -#line 2036 "Tombstone.c" +#line 2170 "Tombstone.c" } #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" return NULL; -#line 2040 "Tombstone.c" +#line 2174 "Tombstone.c" } -GParamSpec* param_spec_tombstoned_file (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_tombstoned_file (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecTombstonedFile* spec; #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_TOMBSTONED_FILE), NULL); @@ -2051,20 +2191,25 @@ GParamSpec* param_spec_tombstoned_file (const gchar* name, const gchar* nick, co G_PARAM_SPEC (spec)->value_type = object_type; #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" return G_PARAM_SPEC (spec); -#line 2054 "Tombstone.c" +#line 2194 "Tombstone.c" } -gpointer value_get_tombstoned_file (const GValue* value) { +gpointer +value_get_tombstoned_file (const GValue* value) +{ #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONED_FILE), NULL); #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" return value->data[0].v_pointer; -#line 2063 "Tombstone.c" +#line 2205 "Tombstone.c" } -void value_set_tombstoned_file (GValue* value, gpointer v_object) { +void +value_set_tombstoned_file (GValue* value, + gpointer v_object) +{ TombstonedFile * old; #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONED_FILE)); @@ -2080,22 +2225,25 @@ void value_set_tombstoned_file (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" tombstoned_file_ref (value->data[0].v_pointer); -#line 2083 "Tombstone.c" +#line 2228 "Tombstone.c" } else { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" value->data[0].v_pointer = NULL; -#line 2087 "Tombstone.c" +#line 2232 "Tombstone.c" } #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" if (old) { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" tombstoned_file_unref (old); -#line 2093 "Tombstone.c" +#line 2238 "Tombstone.c" } } -void value_take_tombstoned_file (GValue* value, gpointer v_object) { +void +value_take_tombstoned_file (GValue* value, + gpointer v_object) +{ TombstonedFile * old; #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONED_FILE)); @@ -2109,38 +2257,44 @@ void value_take_tombstoned_file (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" value->data[0].v_pointer = v_object; -#line 2112 "Tombstone.c" +#line 2260 "Tombstone.c" } else { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" value->data[0].v_pointer = NULL; -#line 2116 "Tombstone.c" +#line 2264 "Tombstone.c" } #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" if (old) { #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" tombstoned_file_unref (old); -#line 2122 "Tombstone.c" +#line 2270 "Tombstone.c" } } -static void tombstoned_file_class_init (TombstonedFileClass * klass) { +static void +tombstoned_file_class_init (TombstonedFileClass * klass) +{ #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" tombstoned_file_parent_class = g_type_class_peek_parent (klass); #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" ((TombstonedFileClass *) klass)->finalize = tombstoned_file_finalize; -#line 2132 "Tombstone.c" +#line 2282 "Tombstone.c" } -static void tombstoned_file_instance_init (TombstonedFile * self) { +static void +tombstoned_file_instance_init (TombstonedFile * self) +{ #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" self->ref_count = 1; -#line 2139 "Tombstone.c" +#line 2291 "Tombstone.c" } -static void tombstoned_file_finalize (TombstonedFile * obj) { +static void +tombstoned_file_finalize (TombstonedFile * obj) +{ TombstonedFile * self; #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONED_FILE, TombstonedFile); @@ -2150,11 +2304,13 @@ static void tombstoned_file_finalize (TombstonedFile * obj) { _g_object_unref0 (self->file); #line 165 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_free0 (self->md5); -#line 2153 "Tombstone.c" +#line 2307 "Tombstone.c" } -GType tombstoned_file_get_type (void) { +GType +tombstoned_file_get_type (void) +{ static volatile gsize tombstoned_file_type_id__volatile = 0; if (g_once_init_enter (&tombstoned_file_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_tombstoned_file_init, value_tombstoned_file_free_value, value_tombstoned_file_copy_value, value_tombstoned_file_peek_pointer, "p", value_tombstoned_file_collect_value, "p", value_tombstoned_file_lcopy_value }; @@ -2168,18 +2324,22 @@ GType tombstoned_file_get_type (void) { } -gpointer tombstoned_file_ref (gpointer instance) { +gpointer +tombstoned_file_ref (gpointer instance) +{ TombstonedFile * self; self = instance; #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" g_atomic_int_inc (&self->ref_count); #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" return instance; -#line 2178 "Tombstone.c" +#line 2336 "Tombstone.c" } -void tombstoned_file_unref (gpointer instance) { +void +tombstoned_file_unref (gpointer instance) +{ TombstonedFile * self; self = instance; #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -2188,54 +2348,57 @@ void tombstoned_file_unref (gpointer instance) { TOMBSTONED_FILE_GET_CLASS (self)->finalize (self); #line 162 "/home/jens/Source/shotwell/src/Tombstone.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2191 "Tombstone.c" +#line 2351 "Tombstone.c" } } -gint tombstone_reason_serialize (TombstoneReason self) { +gint +tombstone_reason_serialize (TombstoneReason self) +{ gint result = 0; #line 181 "/home/jens/Source/shotwell/src/Tombstone.vala" result = (gint) self; #line 181 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 2202 "Tombstone.c" +#line 2364 "Tombstone.c" } -TombstoneReason tombstone_reason_unserialize (gint value) { +TombstoneReason +tombstone_reason_unserialize (gint value) +{ TombstoneReason result = 0; - gint _tmp0_; -#line 185 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = value; #line 185 "/home/jens/Source/shotwell/src/Tombstone.vala" - switch ((TombstoneReason) _tmp0_) { + switch ((TombstoneReason) value) { #line 185 "/home/jens/Source/shotwell/src/Tombstone.vala" case TOMBSTONE_REASON_AUTO_DETECTED_DUPLICATE: -#line 2215 "Tombstone.c" +#line 2376 "Tombstone.c" { #line 187 "/home/jens/Source/shotwell/src/Tombstone.vala" result = TOMBSTONE_REASON_AUTO_DETECTED_DUPLICATE; #line 187 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 2221 "Tombstone.c" +#line 2382 "Tombstone.c" } default: #line 185 "/home/jens/Source/shotwell/src/Tombstone.vala" case TOMBSTONE_REASON_REMOVED_BY_USER: -#line 2226 "Tombstone.c" +#line 2387 "Tombstone.c" { #line 192 "/home/jens/Source/shotwell/src/Tombstone.vala" result = TOMBSTONE_REASON_REMOVED_BY_USER; #line 192 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 2232 "Tombstone.c" +#line 2393 "Tombstone.c" } } } -GType tombstone_reason_get_type (void) { +GType +tombstone_reason_get_type (void) +{ static volatile gsize tombstone_reason_type_id__volatile = 0; if (g_once_init_enter (&tombstone_reason_type_id__volatile)) { static const GEnumValue values[] = {{TOMBSTONE_REASON_REMOVED_BY_USER, "TOMBSTONE_REASON_REMOVED_BY_USER", "removed-by-user"}, {TOMBSTONE_REASON_AUTO_DETECTED_DUPLICATE, "TOMBSTONE_REASON_AUTO_DETECTED_DUPLICATE", "auto-detected-duplicate"}, {0, NULL, NULL}}; @@ -2247,43 +2410,49 @@ GType tombstone_reason_get_type (void) { } -static gpointer _tombstone_row_ref0 (gpointer self) { +static gpointer +_tombstone_row_ref0 (gpointer self) +{ #line 203 "/home/jens/Source/shotwell/src/Tombstone.vala" return self ? tombstone_row_ref (self) : NULL; -#line 2253 "Tombstone.c" +#line 2418 "Tombstone.c" } -static Tombstone* tombstone_construct (GType object_type, TombstoneRow* row) { +static Tombstone* +tombstone_construct (GType object_type, + TombstoneRow* row) +{ Tombstone * self = NULL; TombstoneRow* _tmp0_; - TombstoneRow* _tmp1_; #line 202 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_val_if_fail (IS_TOMBSTONE_ROW (row), NULL); #line 202 "/home/jens/Source/shotwell/src/Tombstone.vala" self = (Tombstone*) data_source_construct (object_type, DATA_OBJECT_INVALID_OBJECT_ID); #line 203 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = row; -#line 203 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = _tombstone_row_ref0 (_tmp0_); + _tmp0_ = _tombstone_row_ref0 (row); #line 203 "/home/jens/Source/shotwell/src/Tombstone.vala" _tombstone_row_unref0 (self->priv->row); #line 203 "/home/jens/Source/shotwell/src/Tombstone.vala" - self->priv->row = _tmp1_; + self->priv->row = _tmp0_; #line 202 "/home/jens/Source/shotwell/src/Tombstone.vala" return self; -#line 2275 "Tombstone.c" +#line 2440 "Tombstone.c" } -static Tombstone* tombstone_new (TombstoneRow* row) { +static Tombstone* +tombstone_new (TombstoneRow* row) +{ #line 202 "/home/jens/Source/shotwell/src/Tombstone.vala" return tombstone_construct (TYPE_TOMBSTONE, row); -#line 2282 "Tombstone.c" +#line 2449 "Tombstone.c" } -void tombstone_init (void) { +void +tombstone_init (void) +{ TombstoneSourceCollection* _tmp0_; TombstoneRow** rows = NULL; gint rows_length1; @@ -2303,7 +2472,7 @@ void tombstone_init (void) { rows_length1 = 0; #line 209 "/home/jens/Source/shotwell/src/Tombstone.vala" _rows_size_ = rows_length1; -#line 2306 "Tombstone.c" +#line 2475 "Tombstone.c" { TombstoneRow** _tmp1_ = NULL; TombstoneTable* _tmp2_; @@ -2338,7 +2507,7 @@ void tombstone_init (void) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 2341 "Tombstone.c" +#line 2510 "Tombstone.c" goto __catch560_database_error; } #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -2349,7 +2518,7 @@ void tombstone_init (void) { g_clear_error (&_inner_error_); #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 2352 "Tombstone.c" +#line 2521 "Tombstone.c" } #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp7_ = _tmp1_; @@ -2369,7 +2538,7 @@ void tombstone_init (void) { _rows_size_ = rows_length1; #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp1_ = (_vala_array_free (_tmp1_, _tmp1__length1, (GDestroyNotify) tombstone_row_unref), NULL); -#line 2372 "Tombstone.c" +#line 2541 "Tombstone.c" } goto __finally560; __catch560_database_error: @@ -2386,7 +2555,7 @@ void tombstone_init (void) { app_window_database_error (_tmp8_); #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_error_free0 (err); -#line 2389 "Tombstone.c" +#line 2558 "Tombstone.c" } __finally560: #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -2399,7 +2568,7 @@ void tombstone_init (void) { g_clear_error (&_inner_error_); #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 2402 "Tombstone.c" +#line 2571 "Tombstone.c" } #line 216 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp9_ = rows; @@ -2407,7 +2576,7 @@ void tombstone_init (void) { _tmp9__length1 = rows_length1; #line 216 "/home/jens/Source/shotwell/src/Tombstone.vala" if (_tmp9_ != NULL) { -#line 2410 "Tombstone.c" +#line 2579 "Tombstone.c" GeeArrayList* tombstones = NULL; GeeArrayList* _tmp10_; TombstoneRow** _tmp11_; @@ -2424,7 +2593,7 @@ void tombstone_init (void) { _tmp11_ = rows; #line 218 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp11__length1 = rows_length1; -#line 2427 "Tombstone.c" +#line 2596 "Tombstone.c" { TombstoneRow** row_collection = NULL; gint row_collection_length1 = 0; @@ -2436,14 +2605,14 @@ void tombstone_init (void) { row_collection_length1 = _tmp11__length1; #line 218 "/home/jens/Source/shotwell/src/Tombstone.vala" for (row_it = 0; row_it < _tmp11__length1; row_it = row_it + 1) { -#line 2439 "Tombstone.c" +#line 2608 "Tombstone.c" TombstoneRow* _tmp12_; TombstoneRow* row = NULL; #line 218 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp12_ = _tombstone_row_ref0 (row_collection[row_it]); #line 218 "/home/jens/Source/shotwell/src/Tombstone.vala" row = _tmp12_; -#line 2446 "Tombstone.c" +#line 2615 "Tombstone.c" { GeeArrayList* _tmp13_; TombstoneRow* _tmp14_; @@ -2463,7 +2632,7 @@ void tombstone_init (void) { _g_object_unref0 (_tmp16_); #line 218 "/home/jens/Source/shotwell/src/Tombstone.vala" _tombstone_row_unref0 (row); -#line 2466 "Tombstone.c" +#line 2635 "Tombstone.c" } } } @@ -2479,30 +2648,37 @@ void tombstone_init (void) { _g_object_unref0 (_tmp20_); #line 216 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (tombstones); -#line 2482 "Tombstone.c" +#line 2651 "Tombstone.c" } #line 206 "/home/jens/Source/shotwell/src/Tombstone.vala" rows = (_vala_array_free (rows, rows_length1, (GDestroyNotify) tombstone_row_unref), NULL); -#line 2486 "Tombstone.c" +#line 2655 "Tombstone.c" } -void tombstone_terminate (void) { +void +tombstone_terminate (void) +{ } -static gpointer _backing_file_state_ref0 (gpointer self) { +static gpointer +_backing_file_state_ref0 (gpointer self) +{ #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala" return self ? backing_file_state_ref (self) : NULL; -#line 2497 "Tombstone.c" +#line 2670 "Tombstone.c" } -void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reason, GError** error) { +void +tombstone_entomb_many_sources (GeeCollection* sources, + TombstoneReason reason, + GError** error) +{ GeeCollection* files = NULL; GeeArrayList* _tmp0_; - GeeCollection* _tmp21_; - TombstoneReason _tmp22_; + GeeCollection* _tmp19_; GError * _inner_error_ = NULL; #line 228 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); @@ -2510,128 +2686,120 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas _tmp0_ = gee_array_list_new (TYPE_TOMBSTONED_FILE, (GBoxedCopyFunc) tombstoned_file_ref, (GDestroyNotify) tombstoned_file_unref, NULL, NULL, NULL); #line 230 "/home/jens/Source/shotwell/src/Tombstone.vala" files = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); -#line 2513 "Tombstone.c" +#line 2689 "Tombstone.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; -#line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp1_ = sources; + GeeIterator* _tmp1_; #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" - _source_it = _tmp2_; + _source_it = _tmp1_; #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" while (TRUE) { -#line 2526 "Tombstone.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 2699 "Tombstone.c" + GeeIterator* _tmp2_; MediaSource* source = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - MediaSource* _tmp7_; - gint _tmp8_; - BackingFileState** _tmp9_; -#line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp3_ = _source_it; + GeeIterator* _tmp3_; + gpointer _tmp4_; + MediaSource* _tmp5_; + gint _tmp6_; + BackingFileState** _tmp7_; #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _source_it; #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" break; -#line 2543 "Tombstone.c" +#line 2713 "Tombstone.c" } #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp5_ = _source_it; + _tmp3_ = _source_it; #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" - source = (MediaSource*) _tmp6_; + source = (MediaSource*) _tmp4_; #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp7_ = source; + _tmp5_ = source; #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp9_ = media_source_get_backing_files_state (_tmp7_, &_tmp8_); -#line 2555 "Tombstone.c" + _tmp7_ = media_source_get_backing_files_state (_tmp5_, &_tmp6_); +#line 2725 "Tombstone.c" { BackingFileState** state_collection = NULL; gint state_collection_length1 = 0; gint _state_collection_size_ = 0; gint state_it = 0; #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala" - state_collection = _tmp9_; + state_collection = _tmp7_; #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala" - state_collection_length1 = _tmp8_; + state_collection_length1 = _tmp6_; #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala" - for (state_it = 0; state_it < _tmp8_; state_it = state_it + 1) { -#line 2567 "Tombstone.c" - BackingFileState* _tmp10_; + for (state_it = 0; state_it < _tmp6_; state_it = state_it + 1) { +#line 2737 "Tombstone.c" + BackingFileState* _tmp8_; BackingFileState* state = NULL; #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp10_ = _backing_file_state_ref0 (state_collection[state_it]); + _tmp8_ = _backing_file_state_ref0 (state_collection[state_it]); #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala" - state = _tmp10_; -#line 2574 "Tombstone.c" + state = _tmp8_; +#line 2744 "Tombstone.c" { - GeeCollection* _tmp11_; - BackingFileState* _tmp12_; - GFile* _tmp13_; - GFile* _tmp14_; + GeeCollection* _tmp9_; + BackingFileState* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; + BackingFileState* _tmp13_; + gint64 _tmp14_; BackingFileState* _tmp15_; - gint64 _tmp16_; - BackingFileState* _tmp17_; - const gchar* _tmp18_; - TombstonedFile* _tmp19_; - TombstonedFile* _tmp20_; + const gchar* _tmp16_; + TombstonedFile* _tmp17_; + TombstonedFile* _tmp18_; #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp11_ = files; + _tmp9_ = files; #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp12_ = state; + _tmp10_ = state; #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp13_ = backing_file_state_get_file (_tmp12_); + _tmp11_ = backing_file_state_get_file (_tmp10_); #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp15_ = state; + _tmp13_ = state; #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp16_ = _tmp15_->filesize; + _tmp14_ = _tmp13_->filesize; #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp17_ = state; + _tmp15_ = state; #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp18_ = _tmp17_->md5; + _tmp16_ = _tmp15_->md5; #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp19_ = tombstoned_file_new (_tmp14_, _tmp16_, _tmp18_); + _tmp17_ = tombstoned_file_new (_tmp12_, _tmp14_, _tmp16_); #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp20_ = _tmp19_; + _tmp18_ = _tmp17_; #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - gee_collection_add (_tmp11_, _tmp20_); + gee_collection_add (_tmp9_, _tmp18_); #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tombstoned_file_unref0 (_tmp20_); + _tombstoned_file_unref0 (_tmp18_); #line 233 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp12_); #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala" _backing_file_state_unref0 (state); -#line 2614 "Tombstone.c" +#line 2784 "Tombstone.c" } } #line 232 "/home/jens/Source/shotwell/src/Tombstone.vala" state_collection = (_vala_array_free (state_collection, state_collection_length1, (GDestroyNotify) backing_file_state_unref), NULL); -#line 2619 "Tombstone.c" +#line 2789 "Tombstone.c" } #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (source); -#line 2623 "Tombstone.c" +#line 2793 "Tombstone.c" } #line 231 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_source_it); -#line 2627 "Tombstone.c" +#line 2797 "Tombstone.c" } #line 236 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp21_ = files; + _tmp19_ = files; #line 236 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp22_ = reason; -#line 236 "/home/jens/Source/shotwell/src/Tombstone.vala" - tombstone_entomb_many_files (_tmp21_, _tmp22_, &_inner_error_); + tombstone_entomb_many_files (_tmp19_, reason, &_inner_error_); #line 236 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 236 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -2642,7 +2810,7 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas _g_object_unref0 (files); #line 236 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 2645 "Tombstone.c" +#line 2813 "Tombstone.c" } else { #line 236 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (files); @@ -2652,27 +2820,31 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas g_clear_error (&_inner_error_); #line 236 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 2655 "Tombstone.c" +#line 2823 "Tombstone.c" } } #line 228 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (files); -#line 2660 "Tombstone.c" +#line 2828 "Tombstone.c" } -void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason, GError** error) { +void +tombstone_entomb_many_files (GeeCollection* files, + TombstoneReason reason, + GError** error) +{ Marker* to_destroy = NULL; TombstoneSourceCollection* _tmp0_; Marker* _tmp1_; - TombstoneSourceCollection* _tmp15_; - Marker* _tmp16_; + TombstoneSourceCollection* _tmp13_; + Marker* _tmp14_; GeeArrayList* tombstones = NULL; - GeeArrayList* _tmp17_; - TombstoneSourceCollection* _tmp41_; - GeeArrayList* _tmp42_; - GeeCollection* _tmp43_; - GeeCollection* _tmp44_; + GeeArrayList* _tmp15_; + TombstoneSourceCollection* _tmp36_; + GeeArrayList* _tmp37_; + GeeCollection* _tmp38_; + GeeCollection* _tmp39_; GError * _inner_error_ = NULL; #line 239 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (GEE_IS_COLLECTION (files)); @@ -2682,176 +2854,161 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason, _tmp1_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); #line 242 "/home/jens/Source/shotwell/src/Tombstone.vala" to_destroy = _tmp1_; -#line 2685 "Tombstone.c" +#line 2857 "Tombstone.c" { GeeIterator* _file_it = NULL; - GeeCollection* _tmp2_; - GeeIterator* _tmp3_; + GeeIterator* _tmp2_; #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = files; + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (files, GEE_TYPE_ITERABLE, GeeIterable)); #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" - _file_it = _tmp3_; + _file_it = _tmp2_; #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" while (TRUE) { -#line 2698 "Tombstone.c" - GeeIterator* _tmp4_; - gboolean _tmp5_; +#line 2867 "Tombstone.c" + GeeIterator* _tmp3_; TombstonedFile* file = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; + GeeIterator* _tmp4_; + gpointer _tmp5_; Tombstone* tombstone = NULL; - TombstoneSourceCollection* _tmp8_; - TombstonedFile* _tmp9_; - GFile* _tmp10_; - Tombstone* _tmp11_; - Tombstone* _tmp12_; + TombstoneSourceCollection* _tmp6_; + TombstonedFile* _tmp7_; + GFile* _tmp8_; + Tombstone* _tmp9_; + Tombstone* _tmp10_; #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp4_ = _file_it; + _tmp3_ = _file_it; #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp3_)) { #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" break; -#line 2718 "Tombstone.c" +#line 2884 "Tombstone.c" } #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp6_ = _file_it; + _tmp4_ = _file_it; #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" - file = (TombstonedFile*) _tmp7_; + file = (TombstonedFile*) _tmp5_; #line 244 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp8_ = tombstone_global; + _tmp6_ = tombstone_global; #line 244 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp9_ = file; + _tmp7_ = file; #line 244 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp10_ = _tmp9_->file; + _tmp8_ = _tmp7_->file; #line 244 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp11_ = tombstone_source_collection_locate (_tmp8_, _tmp10_); + _tmp9_ = tombstone_source_collection_locate (_tmp6_, _tmp8_); #line 244 "/home/jens/Source/shotwell/src/Tombstone.vala" - tombstone = _tmp11_; + tombstone = _tmp9_; #line 245 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp12_ = tombstone; + _tmp10_ = tombstone; #line 245 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_tmp12_ != NULL) { -#line 2740 "Tombstone.c" - Marker* _tmp13_; - Tombstone* _tmp14_; + if (_tmp10_ != NULL) { +#line 2906 "Tombstone.c" + Marker* _tmp11_; + Tombstone* _tmp12_; #line 246 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp13_ = to_destroy; + _tmp11_ = to_destroy; #line 246 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp14_ = tombstone; + _tmp12_ = tombstone; #line 246 "/home/jens/Source/shotwell/src/Tombstone.vala" - marker_mark (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); -#line 2749 "Tombstone.c" + marker_mark (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject)); +#line 2915 "Tombstone.c" } #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (tombstone); #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" _tombstoned_file_unref0 (file); -#line 2755 "Tombstone.c" +#line 2921 "Tombstone.c" } #line 243 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_file_it); -#line 2759 "Tombstone.c" +#line 2925 "Tombstone.c" } #line 249 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp15_ = tombstone_global; + _tmp13_ = tombstone_global; #line 249 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp16_ = to_destroy; + _tmp14_ = to_destroy; #line 249 "/home/jens/Source/shotwell/src/Tombstone.vala" - source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp16_, FALSE, NULL, NULL, NULL); + source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp14_, FALSE, NULL, NULL, NULL); #line 251 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp17_ = gee_array_list_new (TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp15_ = gee_array_list_new (TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 251 "/home/jens/Source/shotwell/src/Tombstone.vala" - tombstones = _tmp17_; -#line 2771 "Tombstone.c" + tombstones = _tmp15_; +#line 2937 "Tombstone.c" { GeeIterator* _file_it = NULL; - GeeCollection* _tmp18_; - GeeIterator* _tmp19_; -#line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp18_ = files; + GeeIterator* _tmp16_; #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (files, GEE_TYPE_ITERABLE, GeeIterable)); #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" - _file_it = _tmp19_; + _file_it = _tmp16_; #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" while (TRUE) { -#line 2784 "Tombstone.c" - GeeIterator* _tmp20_; - gboolean _tmp21_; +#line 2947 "Tombstone.c" + GeeIterator* _tmp17_; TombstonedFile* file = NULL; - GeeIterator* _tmp22_; - gpointer _tmp23_; - TombstoneRow* _tmp24_ = NULL; - TombstoneTable* _tmp25_; - TombstoneTable* _tmp26_; + GeeIterator* _tmp18_; + gpointer _tmp19_; + TombstoneRow* _tmp20_ = NULL; + TombstoneTable* _tmp21_; + TombstoneTable* _tmp22_; + TombstonedFile* _tmp23_; + GFile* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; TombstonedFile* _tmp27_; - GFile* _tmp28_; - gchar* _tmp29_; - gchar* _tmp30_; - TombstonedFile* _tmp31_; - gint64 _tmp32_; - TombstonedFile* _tmp33_; - const gchar* _tmp34_; - TombstoneReason _tmp35_; - TombstoneRow* _tmp36_; - TombstoneRow* _tmp37_; - GeeArrayList* _tmp38_; - Tombstone* _tmp39_; - Tombstone* _tmp40_; + gint64 _tmp28_; + TombstonedFile* _tmp29_; + const gchar* _tmp30_; + TombstoneRow* _tmp31_; + TombstoneRow* _tmp32_; + GeeArrayList* _tmp33_; + Tombstone* _tmp34_; + Tombstone* _tmp35_; #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp20_ = _file_it; + _tmp17_ = _file_it; #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp21_ = gee_iterator_next (_tmp20_); -#line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (!_tmp21_) { + if (!gee_iterator_next (_tmp17_)) { #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" break; -#line 2815 "Tombstone.c" +#line 2974 "Tombstone.c" } #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp22_ = _file_it; + _tmp18_ = _file_it; #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp23_ = gee_iterator_get (_tmp22_); + _tmp19_ = gee_iterator_get (_tmp18_); #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" - file = (TombstonedFile*) _tmp23_; -#line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp25_ = tombstone_table_get_instance (); + file = (TombstonedFile*) _tmp19_; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp26_ = _tmp25_; + _tmp21_ = tombstone_table_get_instance (); #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp27_ = file; + _tmp22_ = _tmp21_; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp28_ = _tmp27_->file; + _tmp23_ = file; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp29_ = g_file_get_path (_tmp28_); + _tmp24_ = _tmp23_->file; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp30_ = _tmp29_; + _tmp25_ = g_file_get_path (_tmp24_); #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp31_ = file; + _tmp26_ = _tmp25_; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp32_ = _tmp31_->filesize; + _tmp27_ = file; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp33_ = file; + _tmp28_ = _tmp27_->filesize; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp34_ = _tmp33_->md5; + _tmp29_ = file; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp35_ = reason; + _tmp30_ = _tmp29_->md5; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp36_ = tombstone_table_add (_tmp26_, _tmp30_, _tmp32_, _tmp34_, _tmp35_, &_inner_error_); + _tmp31_ = tombstone_table_add (_tmp22_, _tmp26_, _tmp28_, _tmp30_, reason, &_inner_error_); #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp37_ = _tmp36_; + _tmp32_ = _tmp31_; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_free0 (_tmp30_); + _g_free0 (_tmp26_); #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _database_table_unref0 (_tmp26_); + _database_table_unref0 (_tmp22_); #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp24_ = _tmp37_; + _tmp20_ = _tmp32_; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -2868,7 +3025,7 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason, _g_object_unref0 (to_destroy); #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 2871 "Tombstone.c" +#line 3028 "Tombstone.c" } else { #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" _tombstoned_file_unref0 (file); @@ -2884,48 +3041,50 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason, g_clear_error (&_inner_error_); #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 2887 "Tombstone.c" +#line 3044 "Tombstone.c" } } #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp38_ = tombstones; + _tmp33_ = tombstones; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp39_ = tombstone_new (_tmp24_); + _tmp34_ = tombstone_new (_tmp20_); #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp40_ = _tmp39_; + _tmp35_ = _tmp34_; #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp40_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp35_); #line 253 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp40_); + _g_object_unref0 (_tmp35_); #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tombstone_row_unref0 (_tmp24_); + _tombstone_row_unref0 (_tmp20_); #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" _tombstoned_file_unref0 (file); -#line 2904 "Tombstone.c" +#line 3061 "Tombstone.c" } #line 252 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_file_it); -#line 2908 "Tombstone.c" +#line 3065 "Tombstone.c" } #line 257 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp41_ = tombstone_global; + _tmp36_ = tombstone_global; #line 257 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp42_ = tombstones; + _tmp37_ = tombstones; #line 257 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp43_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); + _tmp38_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); #line 257 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp44_ = _tmp43_; + _tmp39_ = _tmp38_; #line 257 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp44_); + _g_object_unref0 (_tmp39_); #line 239 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (tombstones); #line 239 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (to_destroy); -#line 2924 "Tombstone.c" +#line 3081 "Tombstone.c" } -static gchar* tombstone_real_get_typename (DataSource* base) { +static gchar* +tombstone_real_get_typename (DataSource* base) +{ Tombstone * self; gchar* result = NULL; gchar* _tmp0_; @@ -2937,11 +3096,13 @@ static gchar* tombstone_real_get_typename (DataSource* base) { result = _tmp0_; #line 261 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 2940 "Tombstone.c" +#line 3099 "Tombstone.c" } -static gint64 tombstone_real_get_instance_id (DataSource* base) { +static gint64 +tombstone_real_get_instance_id (DataSource* base) +{ Tombstone * self; gint64 result = 0LL; TombstoneID _tmp0_ = {0}; @@ -2956,11 +3117,13 @@ static gint64 tombstone_real_get_instance_id (DataSource* base) { result = _tmp1_; #line 265 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 2959 "Tombstone.c" +#line 3120 "Tombstone.c" } -static gchar* tombstone_real_get_name (DataObject* base) { +static gchar* +tombstone_real_get_name (DataObject* base) +{ Tombstone * self; gchar* result = NULL; TombstoneRow* _tmp0_; @@ -2978,11 +3141,13 @@ static gchar* tombstone_real_get_name (DataObject* base) { result = _tmp2_; #line 269 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 2981 "Tombstone.c" +#line 3144 "Tombstone.c" } -static gchar* tombstone_real_to_string (DataObject* base) { +static gchar* +tombstone_real_to_string (DataObject* base) +{ Tombstone * self; gchar* result = NULL; gchar* _tmp0_; @@ -3005,11 +3170,14 @@ static gchar* tombstone_real_to_string (DataObject* base) { result = _tmp3_; #line 273 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 3008 "Tombstone.c" +#line 3173 "Tombstone.c" } -void tombstone_get_tombstone_id (Tombstone* self, TombstoneID* result) { +void +tombstone_get_tombstone_id (Tombstone* self, + TombstoneID* result) +{ TombstoneRow* _tmp0_; TombstoneID _tmp1_; #line 276 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3022,11 +3190,13 @@ void tombstone_get_tombstone_id (Tombstone* self, TombstoneID* result) { *result = _tmp1_; #line 277 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 3025 "Tombstone.c" +#line 3193 "Tombstone.c" } -GFile* tombstone_get_file (Tombstone* self) { +GFile* +tombstone_get_file (Tombstone* self) +{ GFile* result = NULL; GFile* _tmp0_; GFile* _tmp4_; @@ -3037,7 +3207,7 @@ GFile* tombstone_get_file (Tombstone* self) { _tmp0_ = self->priv->file; #line 281 "/home/jens/Source/shotwell/src/Tombstone.vala" if (_tmp0_ == NULL) { -#line 3040 "Tombstone.c" +#line 3210 "Tombstone.c" TombstoneRow* _tmp1_; const gchar* _tmp2_; GFile* _tmp3_; @@ -3051,7 +3221,7 @@ GFile* tombstone_get_file (Tombstone* self) { _g_object_unref0 (self->priv->file); #line 282 "/home/jens/Source/shotwell/src/Tombstone.vala" self->priv->file = _tmp3_; -#line 3054 "Tombstone.c" +#line 3224 "Tombstone.c" } #line 284 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp4_ = self->priv->file; @@ -3061,17 +3231,18 @@ GFile* tombstone_get_file (Tombstone* self) { result = _tmp5_; #line 284 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 3064 "Tombstone.c" +#line 3234 "Tombstone.c" } -gchar* tombstone_get_md5 (Tombstone* self) { +gchar* +tombstone_get_md5 (Tombstone* self) +{ gchar* result = NULL; const gchar* _tmp0_ = NULL; TombstoneRow* _tmp1_; const gchar* _tmp2_; - gboolean _tmp3_; - gchar* _tmp6_; + gchar* _tmp5_; #line 287 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_val_if_fail (IS_TOMBSTONE (self), NULL); #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3079,34 +3250,34 @@ gchar* tombstone_get_md5 (Tombstone* self) { #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp2_ = _tmp1_->md5; #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp3_ = is_string_empty (_tmp2_); -#line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_tmp3_) { + if (is_string_empty (_tmp2_)) { #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp0_ = NULL; -#line 3087 "Tombstone.c" +#line 3256 "Tombstone.c" } else { - TombstoneRow* _tmp4_; - const gchar* _tmp5_; + TombstoneRow* _tmp3_; + const gchar* _tmp4_; #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp4_ = self->priv->row; + _tmp3_ = self->priv->row; #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp5_ = _tmp4_->md5; + _tmp4_ = _tmp3_->md5; #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = _tmp5_; -#line 3097 "Tombstone.c" + _tmp0_ = _tmp4_; +#line 3266 "Tombstone.c" } #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp6_ = g_strdup (_tmp0_); + _tmp5_ = g_strdup (_tmp0_); #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" - result = _tmp6_; + result = _tmp5_; #line 288 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 3105 "Tombstone.c" +#line 3274 "Tombstone.c" } -TombstoneReason tombstone_get_reason (Tombstone* self) { +TombstoneReason +tombstone_get_reason (Tombstone* self) +{ TombstoneReason result = 0; TombstoneRow* _tmp0_; TombstoneReason _tmp1_; @@ -3120,36 +3291,36 @@ TombstoneReason tombstone_get_reason (Tombstone* self) { result = _tmp1_; #line 292 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 3123 "Tombstone.c" +#line 3294 "Tombstone.c" } -void tombstone_move (Tombstone* self, GFile* file) { +void +tombstone_move (Tombstone* self, + GFile* file) +{ gchar* old_filepath = NULL; - TombstoneRow* _tmp8_; - const gchar* _tmp9_; - gchar* _tmp10_; - TombstoneRow* _tmp11_; + TombstoneRow* _tmp7_; + const gchar* _tmp8_; + gchar* _tmp9_; + TombstoneRow* _tmp10_; + gchar* _tmp11_; GFile* _tmp12_; - gchar* _tmp13_; - GFile* _tmp14_; - GFile* _tmp15_; - Alteration* _tmp16_; - Alteration* _tmp17_; + Alteration* _tmp13_; + Alteration* _tmp14_; GError * _inner_error_ = NULL; #line 295 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (IS_TOMBSTONE (self)); #line 295 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (G_IS_FILE (file)); -#line 3144 "Tombstone.c" +#line 3316 "Tombstone.c" { TombstoneTable* _tmp0_; TombstoneTable* _tmp1_; TombstoneRow* _tmp2_; TombstoneID _tmp3_; - GFile* _tmp4_; + gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp0_ = tombstone_table_get_instance (); #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3159,22 +3330,20 @@ void tombstone_move (Tombstone* self, GFile* file) { #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp3_ = _tmp2_->id; #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp4_ = file; -#line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp5_ = g_file_get_path (_tmp4_); + _tmp4_ = g_file_get_path (file); #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" - tombstone_table_update_file (_tmp1_, &_tmp3_, _tmp6_, &_inner_error_); + tombstone_table_update_file (_tmp1_, &_tmp3_, _tmp5_, &_inner_error_); #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" _database_table_unref0 (_tmp1_); #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 3177 "Tombstone.c" +#line 3346 "Tombstone.c" goto __catch561_database_error; } #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3183,25 +3352,25 @@ void tombstone_move (Tombstone* self, GFile* file) { g_clear_error (&_inner_error_); #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 3186 "Tombstone.c" +#line 3355 "Tombstone.c" } } goto __finally561; __catch561_database_error: { GError* err = NULL; - GError* _tmp7_; + GError* _tmp6_; #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala" err = _inner_error_; #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala" _inner_error_ = NULL; #line 299 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp7_ = err; + _tmp6_ = err; #line 299 "/home/jens/Source/shotwell/src/Tombstone.vala" - app_window_database_error (_tmp7_); + app_window_database_error (_tmp6_); #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_error_free0 (err); -#line 3204 "Tombstone.c" +#line 3373 "Tombstone.c" } __finally561: #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3212,71 +3381,66 @@ void tombstone_move (Tombstone* self, GFile* file) { g_clear_error (&_inner_error_); #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 3215 "Tombstone.c" +#line 3384 "Tombstone.c" } #line 302 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp8_ = self->priv->row; + _tmp7_ = self->priv->row; #line 302 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp9_ = _tmp8_->filepath; + _tmp8_ = _tmp7_->filepath; #line 302 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp10_ = g_strdup (_tmp9_); + _tmp9_ = g_strdup (_tmp8_); #line 302 "/home/jens/Source/shotwell/src/Tombstone.vala" - old_filepath = _tmp10_; -#line 303 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp11_ = self->priv->row; + old_filepath = _tmp9_; #line 303 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp12_ = file; + _tmp10_ = self->priv->row; #line 303 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp13_ = g_file_get_path (_tmp12_); + _tmp11_ = g_file_get_path (file); #line 303 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_free0 (_tmp11_->filepath); + _g_free0 (_tmp10_->filepath); #line 303 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp11_->filepath = _tmp13_; + _tmp10_->filepath = _tmp11_; #line 304 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp14_ = file; -#line 304 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp15_ = _g_object_ref0 (_tmp14_); + _tmp12_ = _g_object_ref0 (file); #line 304 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (self->priv->file); #line 304 "/home/jens/Source/shotwell/src/Tombstone.vala" - self->priv->file = _tmp15_; + self->priv->file = _tmp12_; #line 306 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp16_ = alteration_new ("file", old_filepath); + _tmp13_ = alteration_new ("file", old_filepath); #line 306 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp17_ = _tmp16_; + _tmp14_ = _tmp13_; #line 306 "/home/jens/Source/shotwell/src/Tombstone.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp17_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp14_); #line 306 "/home/jens/Source/shotwell/src/Tombstone.vala" - _alteration_unref0 (_tmp17_); + _alteration_unref0 (_tmp14_); #line 295 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_free0 (old_filepath); -#line 3253 "Tombstone.c" +#line 3418 "Tombstone.c" } -gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const gchar* md5) { +gboolean +tombstone_matches (Tombstone* self, + GFile* file, + gint64 filesize, + const gchar* md5) +{ gboolean result = FALSE; TombstoneRow* _tmp0_; gint64 _tmp1_; - gint64 _tmp2_; - const gchar* _tmp3_ = NULL; - TombstoneRow* _tmp4_; - const gchar* _tmp5_; - gboolean _tmp6_; + const gchar* _tmp2_ = NULL; + TombstoneRow* _tmp3_; + const gchar* _tmp4_; gchar* this_md5 = NULL; + gchar* _tmp7_; + const gchar* _tmp8_ = NULL; + gchar* other_md5 = NULL; gchar* _tmp9_; - const gchar* _tmp10_ = NULL; + const gchar* _tmp10_; const gchar* _tmp11_; - gboolean _tmp12_; - gchar* other_md5 = NULL; - gchar* _tmp14_; - const gchar* _tmp15_; - const gchar* _tmp16_; - GFile* _tmp17_; - GFile* _tmp18_; - GFile* _tmp19_; - gboolean _tmp20_; - gboolean _tmp21_; + GFile* _tmp12_; + GFile* _tmp13_; + gboolean _tmp14_; #line 309 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_val_if_fail (IS_TOMBSTONE (self), FALSE); #line 309 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3286,68 +3450,57 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const #line 310 "/home/jens/Source/shotwell/src/Tombstone.vala" _tmp1_ = _tmp0_->filesize; #line 310 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp2_ = filesize; -#line 310 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_tmp1_ != _tmp2_) { + if (_tmp1_ != filesize) { #line 311 "/home/jens/Source/shotwell/src/Tombstone.vala" result = FALSE; #line 311 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 3296 "Tombstone.c" +#line 3458 "Tombstone.c" } #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp4_ = self->priv->row; + _tmp3_ = self->priv->row; #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp5_ = _tmp4_->md5; + _tmp4_ = _tmp3_->md5; #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp6_ = is_string_empty (_tmp5_); + if (is_string_empty (_tmp4_)) { #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_tmp6_) { -#line 314 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp3_ = NULL; -#line 3308 "Tombstone.c" + _tmp2_ = NULL; +#line 3468 "Tombstone.c" } else { - TombstoneRow* _tmp7_; - const gchar* _tmp8_; + TombstoneRow* _tmp5_; + const gchar* _tmp6_; #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp7_ = self->priv->row; + _tmp5_ = self->priv->row; #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp8_ = _tmp7_->md5; + _tmp6_ = _tmp5_->md5; #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp3_ = _tmp8_; -#line 3318 "Tombstone.c" + _tmp2_ = _tmp6_; +#line 3478 "Tombstone.c" } #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp9_ = g_strdup (_tmp3_); + _tmp7_ = g_strdup (_tmp2_); #line 314 "/home/jens/Source/shotwell/src/Tombstone.vala" - this_md5 = _tmp9_; -#line 315 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp11_ = md5; + this_md5 = _tmp7_; #line 315 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp12_ = is_string_empty (_tmp11_); + if (is_string_empty (md5)) { #line 315 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_tmp12_) { -#line 315 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp10_ = NULL; -#line 3332 "Tombstone.c" + _tmp8_ = NULL; +#line 3488 "Tombstone.c" } else { - const gchar* _tmp13_; -#line 315 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp13_ = md5; #line 315 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp10_ = _tmp13_; -#line 3339 "Tombstone.c" + _tmp8_ = md5; +#line 3492 "Tombstone.c" } #line 315 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp14_ = g_strdup (_tmp10_); + _tmp9_ = g_strdup (_tmp8_); #line 315 "/home/jens/Source/shotwell/src/Tombstone.vala" - other_md5 = _tmp14_; + other_md5 = _tmp9_; #line 317 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp15_ = this_md5; + _tmp10_ = this_md5; #line 317 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp16_ = other_md5; + _tmp11_ = other_md5; #line 317 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (g_strcmp0 (_tmp15_, _tmp16_) != 0) { + if (g_strcmp0 (_tmp10_, _tmp11_) != 0) { #line 318 "/home/jens/Source/shotwell/src/Tombstone.vala" result = FALSE; #line 318 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3356,22 +3509,18 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const _g_free0 (this_md5); #line 318 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 3359 "Tombstone.c" +#line 3512 "Tombstone.c" } #line 320 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp17_ = tombstone_get_file (self); -#line 320 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp18_ = _tmp17_; -#line 320 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp19_ = file; + _tmp12_ = tombstone_get_file (self); #line 320 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp20_ = g_file_equal (_tmp18_, _tmp19_); + _tmp13_ = _tmp12_; #line 320 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp21_ = !_tmp20_; + _tmp14_ = !g_file_equal (_tmp13_, file); #line 320 "/home/jens/Source/shotwell/src/Tombstone.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp13_); #line 320 "/home/jens/Source/shotwell/src/Tombstone.vala" - if (_tmp21_) { + if (_tmp14_) { #line 321 "/home/jens/Source/shotwell/src/Tombstone.vala" result = FALSE; #line 321 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3380,7 +3529,7 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const _g_free0 (this_md5); #line 321 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 3383 "Tombstone.c" +#line 3532 "Tombstone.c" } #line 323 "/home/jens/Source/shotwell/src/Tombstone.vala" result = TRUE; @@ -3390,16 +3539,18 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const _g_free0 (this_md5); #line 323 "/home/jens/Source/shotwell/src/Tombstone.vala" return result; -#line 3393 "Tombstone.c" +#line 3542 "Tombstone.c" } -static void tombstone_real_destroy (DataSource* base) { +static void +tombstone_real_destroy (DataSource* base) +{ Tombstone * self; GError * _inner_error_ = NULL; #line 326 "/home/jens/Source/shotwell/src/Tombstone.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE, Tombstone); -#line 3402 "Tombstone.c" +#line 3553 "Tombstone.c" { TombstoneTable* _tmp0_; TombstoneTable* _tmp1_; @@ -3421,7 +3572,7 @@ static void tombstone_real_destroy (DataSource* base) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 328 "/home/jens/Source/shotwell/src/Tombstone.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 3424 "Tombstone.c" +#line 3575 "Tombstone.c" goto __catch562_database_error; } #line 328 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3430,7 +3581,7 @@ static void tombstone_real_destroy (DataSource* base) { g_clear_error (&_inner_error_); #line 328 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 3433 "Tombstone.c" +#line 3584 "Tombstone.c" } } goto __finally562; @@ -3448,7 +3599,7 @@ static void tombstone_real_destroy (DataSource* base) { app_window_database_error (_tmp4_); #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_error_free0 (err); -#line 3451 "Tombstone.c" +#line 3602 "Tombstone.c" } __finally562: #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3459,15 +3610,17 @@ static void tombstone_real_destroy (DataSource* base) { g_clear_error (&_inner_error_); #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala" return; -#line 3462 "Tombstone.c" +#line 3613 "Tombstone.c" } #line 333 "/home/jens/Source/shotwell/src/Tombstone.vala" DATA_SOURCE_CLASS (tombstone_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource)); -#line 3466 "Tombstone.c" +#line 3617 "Tombstone.c" } -static void tombstone_class_init (TombstoneClass * klass) { +static void +tombstone_class_init (TombstoneClass * klass) +{ #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala" tombstone_parent_class = g_type_class_peek_parent (klass); #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3484,20 +3637,24 @@ static void tombstone_class_init (TombstoneClass * klass) { ((DataSourceClass *) klass)->destroy = (void (*) (DataSource *)) tombstone_real_destroy; #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala" G_OBJECT_CLASS (klass)->finalize = tombstone_finalize; -#line 3487 "Tombstone.c" +#line 3640 "Tombstone.c" } -static void tombstone_instance_init (Tombstone * self) { +static void +tombstone_instance_init (Tombstone * self) +{ #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala" self->priv = TOMBSTONE_GET_PRIVATE (self); #line 200 "/home/jens/Source/shotwell/src/Tombstone.vala" self->priv->file = NULL; -#line 3496 "Tombstone.c" +#line 3651 "Tombstone.c" } -static void tombstone_finalize (GObject * obj) { +static void +tombstone_finalize (GObject * obj) +{ Tombstone * self; #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONE, Tombstone); @@ -3507,11 +3664,13 @@ static void tombstone_finalize (GObject * obj) { _g_object_unref0 (self->priv->file); #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala" G_OBJECT_CLASS (tombstone_parent_class)->finalize (obj); -#line 3510 "Tombstone.c" +#line 3667 "Tombstone.c" } -GType tombstone_get_type (void) { +GType +tombstone_get_type (void) +{ static volatile gsize tombstone_type_id__volatile = 0; if (g_once_init_enter (&tombstone_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TombstoneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tombstone_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Tombstone), 0, (GInstanceInitFunc) tombstone_instance_init, NULL }; @@ -3523,7 +3682,11 @@ GType tombstone_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -3535,7 +3698,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/UnityProgressBar.c b/src/UnityProgressBar.c index 442cc3a..609947c 100644 --- a/src/UnityProgressBar.c +++ b/src/UnityProgressBar.c @@ -1,4 +1,4 @@ -/* UnityProgressBar.c generated by valac 0.36.6, the Vala compiler +/* UnityProgressBar.c generated by valac 0.40.4, the Vala compiler * generated from UnityProgressBar.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include diff --git a/src/Upgrades.c b/src/Upgrades.c index 0c4acc4..f8844af 100644 --- a/src/Upgrades.c +++ b/src/Upgrades.c @@ -1,4 +1,4 @@ -/* Upgrades.c generated by valac 0.36.6, the Vala compiler +/* Upgrades.c generated by valac 0.40.4, the Vala compiler * generated from Upgrades.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -10,6 +10,7 @@ /* moving or deleting files. This occurs after the UI is shown, so it's not appropriate*/ /* for database updates and such.*/ + #include #include #include @@ -74,8 +75,18 @@ typedef struct _FixupRawThumbnailsTaskClass FixupRawThumbnailsTaskClass; #define _upgrades_unref0(var) ((var == NULL) ? NULL : (var = (upgrades_unref (var), NULL))) typedef struct _ParamSpecUpgrades ParamSpecUpgrades; typedef struct _MimicsRemovalTaskPrivate MimicsRemovalTaskPrivate; +enum { + MIMICS_REMOVAL_TASK_0_PROPERTY, + MIMICS_REMOVAL_TASK_NUM_PROPERTIES +}; +static GParamSpec* mimics_removal_task_properties[MIMICS_REMOVAL_TASK_NUM_PROPERTIES]; #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) typedef struct _FixupRawThumbnailsTaskPrivate FixupRawThumbnailsTaskPrivate; +enum { + FIXUP_RAW_THUMBNAILS_TASK_0_PROPERTY, + FIXUP_RAW_THUMBNAILS_TASK_NUM_PROPERTIES +}; +static GParamSpec* fixup_raw_thumbnails_task_properties[FIXUP_RAW_THUMBNAILS_TASK_NUM_PROPERTIES]; #define TYPE_PHOTO_ROW (photo_row_get_type ()) #define PHOTO_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_ROW, PhotoRow)) @@ -441,27 +452,37 @@ static UpgradeTaskIface * fixup_raw_thumbnails_task_upgrade_task_parent_iface = gpointer upgrades_ref (gpointer instance); void upgrades_unref (gpointer instance); -GParamSpec* param_spec_upgrades (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_upgrades (GValue* value, gpointer v_object); -void value_take_upgrades (GValue* value, gpointer v_object); +GParamSpec* param_spec_upgrades (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_upgrades (GValue* value, + gpointer v_object); +void value_take_upgrades (GValue* value, + gpointer v_object); gpointer value_get_upgrades (const GValue* value); GType upgrades_get_type (void) G_GNUC_CONST; GType upgrade_task_get_type (void) G_GNUC_CONST; #define UPGRADES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_UPGRADES, UpgradesPrivate)) -enum { - UPGRADES_DUMMY_PROPERTY -}; static Upgrades* upgrades_new (void); static Upgrades* upgrades_construct (GType object_type); -static void upgrades_add (Upgrades* self, UpgradeTask* task); +static void upgrades_add (Upgrades* self, + UpgradeTask* task); MimicsRemovalTask* mimics_removal_task_new (void); MimicsRemovalTask* mimics_removal_task_construct (GType object_type); GType mimics_removal_task_get_type (void) G_GNUC_CONST; gpointer application_ref (gpointer instance); void application_unref (gpointer instance); -GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_application (GValue* value, gpointer v_object); -void value_take_application (GValue* value, gpointer v_object); +GParamSpec* param_spec_application (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_application (GValue* value, + gpointer v_object); +void value_take_application (GValue* value, + gpointer v_object); gpointer value_get_application (const GValue* value); GType application_get_type (void) G_GNUC_CONST; Application* application_get_instance (void); @@ -472,36 +493,55 @@ GType fixup_raw_thumbnails_task_get_type (void) G_GNUC_CONST; void upgrades_init (void); Upgrades* upgrades_get_instance (void); guint64 upgrades_get_step_count (Upgrades* self); -void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_target); -void upgrade_task_execute (UpgradeTask* self, ProgressMonitor monitor, void* monitor_target); +void upgrades_execute (Upgrades* self, + ProgressMonitor monitor, + void* monitor_target); +void upgrade_task_execute (UpgradeTask* self, + ProgressMonitor monitor, + void* monitor_target); guint64 upgrade_task_get_step_count (UpgradeTask* self); static void upgrades_finalize (Upgrades * obj); #define MIMICS_REMOVAL_TASK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTaskPrivate)) -enum { - MIMICS_REMOVAL_TASK_DUMMY_PROPERTY -}; GFile* app_dirs_get_data_dir (void); static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base); -guint64 count_files_in_directory (GFile* dir, GError** error); -static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor monitor, void* monitor_target); -void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor, void* monitor_target, guint64 file_count, GCancellable* cancellable, GError** error); +guint64 count_files_in_directory (GFile* dir, + GError** error); +static void mimics_removal_task_real_execute (UpgradeTask* base, + ProgressMonitor monitor, + void* monitor_target); +void delete_all_files (GFile* dir, + GeeSet* exceptions, + ProgressMonitor monitor, + void* monitor_target, + guint64 file_count, + GCancellable* cancellable, + GError** error); static void mimics_removal_task_finalize (GObject * obj); -enum { - FIXUP_RAW_THUMBNAILS_TASK_DUMMY_PROPERTY -}; static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base); gpointer photo_row_ref (gpointer instance); void photo_row_unref (gpointer instance); -GParamSpec* param_spec_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_row (GValue* value, gpointer v_object); -void value_take_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_row (GValue* value, + gpointer v_object); +void value_take_photo_row (GValue* value, + gpointer v_object); gpointer value_get_photo_row (const GValue* value); GType photo_row_get_type (void) G_GNUC_CONST; gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType photo_table_get_type (void) G_GNUC_CONST; @@ -512,9 +552,15 @@ PhotoID* photo_id_dup (const PhotoID* self); void photo_id_free (PhotoID* self); gpointer backing_photo_row_ref (gpointer instance); void backing_photo_row_unref (gpointer instance); -GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_photo_row (GValue* value, gpointer v_object); -void value_take_backing_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_photo_row (GValue* value, + gpointer v_object); +void value_take_backing_photo_row (GValue* value, + gpointer v_object); gpointer value_get_backing_photo_row (const GValue* value); GType backing_photo_row_get_type (void) G_GNUC_CONST; GType import_id_get_type (void) G_GNUC_CONST; @@ -533,16 +579,24 @@ GType photo_file_format_get_type (void) G_GNUC_CONST; GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); -static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressMonitor monitor, void* monitor_target); +static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, + ProgressMonitor monitor, + void* monitor_target); GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; void thumbnail_cache_remove (ThumbnailSource* source); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -553,17 +607,19 @@ GType media_source_get_type (void) G_GNUC_CONST; GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; -LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, PhotoID* photo_id); +LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, + PhotoID* photo_id); -static Upgrades* upgrades_construct (GType object_type) { +static Upgrades* +upgrades_construct (GType object_type) +{ Upgrades* self = NULL; MimicsRemovalTask* _tmp0_; MimicsRemovalTask* _tmp1_; Application* _tmp2_; Application* _tmp3_; gboolean _tmp4_; - gboolean _tmp5_; #line 15 "/home/jens/Source/shotwell/src/Upgrades.vala" self = (Upgrades*) g_type_create_instance (object_type); #line 17 "/home/jens/Source/shotwell/src/Upgrades.vala" @@ -580,39 +636,41 @@ static Upgrades* upgrades_construct (GType object_type) { _tmp3_ = _tmp2_; #line 19 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp4_ = application_get_raw_thumbs_fix_required (_tmp3_); -#line 19 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp5_ = _tmp4_; #line 19 "/home/jens/Source/shotwell/src/Upgrades.vala" _application_unref0 (_tmp3_); #line 19 "/home/jens/Source/shotwell/src/Upgrades.vala" - if (_tmp5_) { -#line 590 "Upgrades.c" + if (_tmp4_) { +#line 644 "Upgrades.c" + FixupRawThumbnailsTask* _tmp5_; FixupRawThumbnailsTask* _tmp6_; - FixupRawThumbnailsTask* _tmp7_; #line 20 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp6_ = fixup_raw_thumbnails_task_new (); + _tmp5_ = fixup_raw_thumbnails_task_new (); #line 20 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 20 "/home/jens/Source/shotwell/src/Upgrades.vala" - upgrades_add (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_UPGRADE_TASK, UpgradeTask)); + upgrades_add (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_UPGRADE_TASK, UpgradeTask)); #line 20 "/home/jens/Source/shotwell/src/Upgrades.vala" - _g_object_unref0 (_tmp7_); -#line 601 "Upgrades.c" + _g_object_unref0 (_tmp6_); +#line 655 "Upgrades.c" } #line 15 "/home/jens/Source/shotwell/src/Upgrades.vala" return self; -#line 605 "Upgrades.c" +#line 659 "Upgrades.c" } -static Upgrades* upgrades_new (void) { +static Upgrades* +upgrades_new (void) +{ #line 15 "/home/jens/Source/shotwell/src/Upgrades.vala" return upgrades_construct (TYPE_UPGRADES); -#line 612 "Upgrades.c" +#line 668 "Upgrades.c" } -void upgrades_init (void) { +void +upgrades_init (void) +{ Upgrades* _tmp0_; Upgrades* _tmp1_; #line 25 "/home/jens/Source/shotwell/src/Upgrades.vala" @@ -625,18 +683,22 @@ void upgrades_init (void) { _upgrades_unref0 (upgrades_instance); #line 26 "/home/jens/Source/shotwell/src/Upgrades.vala" upgrades_instance = _tmp1_; -#line 629 "Upgrades.c" +#line 687 "Upgrades.c" } -static gpointer _upgrades_ref0 (gpointer self) { +static gpointer +_upgrades_ref0 (gpointer self) +{ #line 30 "/home/jens/Source/shotwell/src/Upgrades.vala" return self ? upgrades_ref (self) : NULL; -#line 636 "Upgrades.c" +#line 696 "Upgrades.c" } -Upgrades* upgrades_get_instance (void) { +Upgrades* +upgrades_get_instance (void) +{ Upgrades* result = NULL; Upgrades* _tmp0_; Upgrades* _tmp1_; @@ -648,11 +710,13 @@ Upgrades* upgrades_get_instance (void) { result = _tmp1_; #line 30 "/home/jens/Source/shotwell/src/Upgrades.vala" return result; -#line 652 "Upgrades.c" +#line 714 "Upgrades.c" } -guint64 upgrades_get_step_count (Upgrades* self) { +guint64 +upgrades_get_step_count (Upgrades* self) +{ guint64 result = 0ULL; guint64 _tmp0_; #line 34 "/home/jens/Source/shotwell/src/Upgrades.vala" @@ -663,21 +727,27 @@ guint64 upgrades_get_step_count (Upgrades* self) { result = _tmp0_; #line 35 "/home/jens/Source/shotwell/src/Upgrades.vala" return result; -#line 667 "Upgrades.c" +#line 731 "Upgrades.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala" return self ? g_object_ref (self) : NULL; -#line 674 "Upgrades.c" +#line 740 "Upgrades.c" } -void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_target) { +void +upgrades_execute (Upgrades* self, + ProgressMonitor monitor, + void* monitor_target) +{ #line 39 "/home/jens/Source/shotwell/src/Upgrades.vala" g_return_if_fail (IS_UPGRADES (self)); -#line 681 "Upgrades.c" +#line 751 "Upgrades.c" { GeeLinkedList* _task_list = NULL; GeeLinkedList* _tmp0_; @@ -705,7 +775,7 @@ void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_ta _task_index = -1; #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala" while (TRUE) { -#line 709 "Upgrades.c" +#line 779 "Upgrades.c" gint _tmp5_; gint _tmp6_; gint _tmp7_; @@ -714,8 +784,6 @@ void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_ta gint _tmp9_; gpointer _tmp10_; UpgradeTask* _tmp11_; - ProgressMonitor _tmp12_; - void* _tmp12__target; #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp5_ = _task_index; #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala" @@ -728,7 +796,7 @@ void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_ta if (!(_tmp6_ < _tmp7_)) { #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala" break; -#line 732 "Upgrades.c" +#line 800 "Upgrades.c" } #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp8_ = _task_list; @@ -741,28 +809,24 @@ void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_ta #line 41 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp11_ = task; #line 41 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp12_ = monitor; -#line 41 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp12__target = monitor_target; -#line 41 "/home/jens/Source/shotwell/src/Upgrades.vala" - upgrade_task_execute (_tmp11_, _tmp12_, _tmp12__target); + upgrade_task_execute (_tmp11_, monitor, monitor_target); #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_object_unref0 (task); -#line 752 "Upgrades.c" +#line 816 "Upgrades.c" } #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_object_unref0 (_task_list); -#line 756 "Upgrades.c" +#line 820 "Upgrades.c" } } -static void upgrades_add (Upgrades* self, UpgradeTask* task) { +static void +upgrades_add (Upgrades* self, + UpgradeTask* task) +{ guint64 _tmp0_; - UpgradeTask* _tmp1_; - guint64 _tmp2_; - GeeLinkedList* _tmp3_; - UpgradeTask* _tmp4_; + GeeLinkedList* _tmp1_; #line 44 "/home/jens/Source/shotwell/src/Upgrades.vala" g_return_if_fail (IS_UPGRADES (self)); #line 44 "/home/jens/Source/shotwell/src/Upgrades.vala" @@ -770,119 +834,138 @@ static void upgrades_add (Upgrades* self, UpgradeTask* task) { #line 45 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp0_ = self->priv->total_steps; #line 45 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp1_ = task; -#line 45 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp2_ = upgrade_task_get_step_count (_tmp1_); -#line 45 "/home/jens/Source/shotwell/src/Upgrades.vala" - self->priv->total_steps = _tmp0_ + _tmp2_; + self->priv->total_steps = _tmp0_ + upgrade_task_get_step_count (task); #line 46 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp3_ = self->priv->task_list; + _tmp1_ = self->priv->task_list; #line 46 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp4_ = task; -#line 46 "/home/jens/Source/shotwell/src/Upgrades.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); -#line 785 "Upgrades.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), task); +#line 843 "Upgrades.c" } -static void value_upgrades_init (GValue* value) { +static void +value_upgrades_init (GValue* value) +{ #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" value->data[0].v_pointer = NULL; -#line 792 "Upgrades.c" +#line 852 "Upgrades.c" } -static void value_upgrades_free_value (GValue* value) { +static void +value_upgrades_free_value (GValue* value) +{ #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" if (value->data[0].v_pointer) { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" upgrades_unref (value->data[0].v_pointer); -#line 801 "Upgrades.c" +#line 863 "Upgrades.c" } } -static void value_upgrades_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_upgrades_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" if (src_value->data[0].v_pointer) { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" dest_value->data[0].v_pointer = upgrades_ref (src_value->data[0].v_pointer); -#line 811 "Upgrades.c" +#line 876 "Upgrades.c" } else { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" dest_value->data[0].v_pointer = NULL; -#line 815 "Upgrades.c" +#line 880 "Upgrades.c" } } -static gpointer value_upgrades_peek_pointer (const GValue* value) { +static gpointer +value_upgrades_peek_pointer (const GValue* value) +{ #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" return value->data[0].v_pointer; -#line 823 "Upgrades.c" +#line 890 "Upgrades.c" } -static gchar* value_upgrades_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_upgrades_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" if (collect_values[0].v_pointer) { -#line 830 "Upgrades.c" +#line 902 "Upgrades.c" Upgrades * object; object = collect_values[0].v_pointer; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" if (object->parent_instance.g_class == NULL) { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 837 "Upgrades.c" +#line 909 "Upgrades.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 841 "Upgrades.c" +#line 913 "Upgrades.c" } #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" value->data[0].v_pointer = upgrades_ref (object); -#line 845 "Upgrades.c" +#line 917 "Upgrades.c" } else { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" value->data[0].v_pointer = NULL; -#line 849 "Upgrades.c" +#line 921 "Upgrades.c" } #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" return NULL; -#line 853 "Upgrades.c" +#line 925 "Upgrades.c" } -static gchar* value_upgrades_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_upgrades_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ Upgrades ** object_p; object_p = collect_values[0].v_pointer; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" if (!object_p) { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 864 "Upgrades.c" +#line 941 "Upgrades.c" } #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" if (!value->data[0].v_pointer) { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" *object_p = NULL; -#line 870 "Upgrades.c" +#line 947 "Upgrades.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" *object_p = value->data[0].v_pointer; -#line 874 "Upgrades.c" +#line 951 "Upgrades.c" } else { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" *object_p = upgrades_ref (value->data[0].v_pointer); -#line 878 "Upgrades.c" +#line 955 "Upgrades.c" } #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" return NULL; -#line 882 "Upgrades.c" +#line 959 "Upgrades.c" } -GParamSpec* param_spec_upgrades (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_upgrades (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecUpgrades* spec; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_UPGRADES), NULL); @@ -892,20 +975,25 @@ GParamSpec* param_spec_upgrades (const gchar* name, const gchar* nick, const gch G_PARAM_SPEC (spec)->value_type = object_type; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" return G_PARAM_SPEC (spec); -#line 896 "Upgrades.c" +#line 979 "Upgrades.c" } -gpointer value_get_upgrades (const GValue* value) { +gpointer +value_get_upgrades (const GValue* value) +{ #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UPGRADES), NULL); #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" return value->data[0].v_pointer; -#line 905 "Upgrades.c" +#line 990 "Upgrades.c" } -void value_set_upgrades (GValue* value, gpointer v_object) { +void +value_set_upgrades (GValue* value, + gpointer v_object) +{ Upgrades * old; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UPGRADES)); @@ -921,22 +1009,25 @@ void value_set_upgrades (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" upgrades_ref (value->data[0].v_pointer); -#line 925 "Upgrades.c" +#line 1013 "Upgrades.c" } else { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" value->data[0].v_pointer = NULL; -#line 929 "Upgrades.c" +#line 1017 "Upgrades.c" } #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" if (old) { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" upgrades_unref (old); -#line 935 "Upgrades.c" +#line 1023 "Upgrades.c" } } -void value_take_upgrades (GValue* value, gpointer v_object) { +void +value_take_upgrades (GValue* value, + gpointer v_object) +{ Upgrades * old; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UPGRADES)); @@ -950,33 +1041,37 @@ void value_take_upgrades (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" value->data[0].v_pointer = v_object; -#line 954 "Upgrades.c" +#line 1045 "Upgrades.c" } else { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" value->data[0].v_pointer = NULL; -#line 958 "Upgrades.c" +#line 1049 "Upgrades.c" } #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" if (old) { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" upgrades_unref (old); -#line 964 "Upgrades.c" +#line 1055 "Upgrades.c" } } -static void upgrades_class_init (UpgradesClass * klass) { +static void +upgrades_class_init (UpgradesClass * klass) +{ #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" upgrades_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" ((UpgradesClass *) klass)->finalize = upgrades_finalize; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" g_type_class_add_private (klass, sizeof (UpgradesPrivate)); -#line 976 "Upgrades.c" +#line 1069 "Upgrades.c" } -static void upgrades_instance_init (Upgrades * self) { +static void +upgrades_instance_init (Upgrades * self) +{ GeeLinkedList* _tmp0_; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" self->priv = UPGRADES_GET_PRIVATE (self); @@ -988,11 +1083,13 @@ static void upgrades_instance_init (Upgrades * self) { self->priv->task_list = _tmp0_; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" self->ref_count = 1; -#line 992 "Upgrades.c" +#line 1087 "Upgrades.c" } -static void upgrades_finalize (Upgrades * obj) { +static void +upgrades_finalize (Upgrades * obj) +{ Upgrades * self; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_UPGRADES, Upgrades); @@ -1000,11 +1097,13 @@ static void upgrades_finalize (Upgrades * obj) { g_signal_handlers_destroy (self); #line 13 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_object_unref0 (self->priv->task_list); -#line 1004 "Upgrades.c" +#line 1101 "Upgrades.c" } -GType upgrades_get_type (void) { +GType +upgrades_get_type (void) +{ static volatile gsize upgrades_type_id__volatile = 0; if (g_once_init_enter (&upgrades_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_upgrades_init, value_upgrades_free_value, value_upgrades_copy_value, value_upgrades_peek_pointer, "p", value_upgrades_collect_value, "p", value_upgrades_lcopy_value }; @@ -1018,18 +1117,22 @@ GType upgrades_get_type (void) { } -gpointer upgrades_ref (gpointer instance) { +gpointer +upgrades_ref (gpointer instance) +{ Upgrades * self; self = instance; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" g_atomic_int_inc (&self->ref_count); #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" return instance; -#line 1029 "Upgrades.c" +#line 1130 "Upgrades.c" } -void upgrades_unref (gpointer instance) { +void +upgrades_unref (gpointer instance) +{ Upgrades * self; self = instance; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" @@ -1038,42 +1141,52 @@ void upgrades_unref (gpointer instance) { UPGRADES_GET_CLASS (self)->finalize (self); #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1042 "Upgrades.c" +#line 1145 "Upgrades.c" } } -guint64 upgrade_task_get_step_count (UpgradeTask* self) { +guint64 +upgrade_task_get_step_count (UpgradeTask* self) +{ #line 55 "/home/jens/Source/shotwell/src/Upgrades.vala" g_return_val_if_fail (IS_UPGRADE_TASK (self), 0ULL); #line 55 "/home/jens/Source/shotwell/src/Upgrades.vala" return UPGRADE_TASK_GET_INTERFACE (self)->get_step_count (self); -#line 1052 "Upgrades.c" +#line 1157 "Upgrades.c" } -void upgrade_task_execute (UpgradeTask* self, ProgressMonitor monitor, void* monitor_target) { +void +upgrade_task_execute (UpgradeTask* self, + ProgressMonitor monitor, + void* monitor_target) +{ #line 60 "/home/jens/Source/shotwell/src/Upgrades.vala" g_return_if_fail (IS_UPGRADE_TASK (self)); #line 60 "/home/jens/Source/shotwell/src/Upgrades.vala" UPGRADE_TASK_GET_INTERFACE (self)->execute (self, monitor, monitor_target); -#line 1061 "Upgrades.c" +#line 1170 "Upgrades.c" } -static void upgrade_task_base_init (UpgradeTaskIface * iface) { +static void +upgrade_task_base_init (UpgradeTaskIface * iface) +{ #line 53 "/home/jens/Source/shotwell/src/Upgrades.vala" static gboolean initialized = FALSE; #line 53 "/home/jens/Source/shotwell/src/Upgrades.vala" if (!initialized) { #line 53 "/home/jens/Source/shotwell/src/Upgrades.vala" initialized = TRUE; -#line 1072 "Upgrades.c" +#line 1183 "Upgrades.c" } } -GType upgrade_task_get_type (void) { +GType +upgrade_task_get_type (void) +{ static volatile gsize upgrade_task_type_id__volatile = 0; if (g_once_init_enter (&upgrade_task_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (UpgradeTaskIface), (GBaseInitFunc) upgrade_task_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -1086,110 +1199,107 @@ GType upgrade_task_get_type (void) { } -static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) { +static guint64 +mimics_removal_task_real_get_step_count (UpgradeTask* base) +{ MimicsRemovalTask * self; guint64 result = 0ULL; - guint64 _tmp6_; + guint64 _tmp5_; GError * _inner_error_ = NULL; #line 71 "/home/jens/Source/shotwell/src/Upgrades.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTask); -#line 1097 "Upgrades.c" +#line 1212 "Upgrades.c" { guint64 _tmp0_ = 0ULL; GFile* _tmp1_; - guint64 _tmp2_; #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp1_ = self->priv->mimic_dir; #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp2_ = count_files_in_directory (_tmp1_, &_inner_error_); -#line 73 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp0_ = _tmp2_; + _tmp0_ = count_files_in_directory (_tmp1_, &_inner_error_); #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1110 "Upgrades.c" +#line 1222 "Upgrades.c" goto __catch604_g_error; } #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala" self->priv->num_mimics = _tmp0_; -#line 1115 "Upgrades.c" +#line 1227 "Upgrades.c" } goto __finally604; __catch604_g_error: { GError* e = NULL; - GError* _tmp3_; - const gchar* _tmp4_; + GError* _tmp2_; + const gchar* _tmp3_; #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala" e = _inner_error_; #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala" _inner_error_ = NULL; #line 75 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp3_ = e; + _tmp2_ = e; #line 75 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp4_ = _tmp3_->message; + _tmp3_ = _tmp2_->message; #line 75 "/home/jens/Source/shotwell/src/Upgrades.vala" - g_debug ("Upgrades.vala:75: Error on deleting mimics: %s", _tmp4_); + g_debug ("Upgrades.vala:75: Error on deleting mimics: %s", _tmp3_); #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_error_free0 (e); -#line 1135 "Upgrades.c" +#line 1247 "Upgrades.c" } __finally604: #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1140 "Upgrades.c" - guint64 _tmp5_ = 0ULL; +#line 1252 "Upgrades.c" + guint64 _tmp4_ = 0ULL; #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala" g_clear_error (&_inner_error_); #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala" - return _tmp5_; -#line 1148 "Upgrades.c" + return _tmp4_; +#line 1260 "Upgrades.c" } #line 77 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp6_ = self->priv->num_mimics; + _tmp5_ = self->priv->num_mimics; #line 77 "/home/jens/Source/shotwell/src/Upgrades.vala" - result = _tmp6_; + result = _tmp5_; #line 77 "/home/jens/Source/shotwell/src/Upgrades.vala" return result; -#line 1156 "Upgrades.c" +#line 1268 "Upgrades.c" } -static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor monitor, void* monitor_target) { +static void +mimics_removal_task_real_execute (UpgradeTask* base, + ProgressMonitor monitor, + void* monitor_target) +{ MimicsRemovalTask * self; GError * _inner_error_ = NULL; #line 80 "/home/jens/Source/shotwell/src/Upgrades.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTask); -#line 1165 "Upgrades.c" +#line 1281 "Upgrades.c" { GFile* _tmp0_; - ProgressMonitor _tmp1_; - void* _tmp1__target; - guint64 _tmp2_; - GFile* _tmp3_; + guint64 _tmp1_; + GFile* _tmp2_; #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp0_ = self->priv->mimic_dir; #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp1_ = monitor; + _tmp1_ = self->priv->num_mimics; #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp1__target = monitor_target; -#line 82 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp2_ = self->priv->num_mimics; -#line 82 "/home/jens/Source/shotwell/src/Upgrades.vala" - delete_all_files (_tmp0_, NULL, _tmp1_, _tmp1__target, _tmp2_, NULL, &_inner_error_); + delete_all_files (_tmp0_, NULL, monitor, monitor_target, _tmp1_, NULL, &_inner_error_); #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1184 "Upgrades.c" +#line 1294 "Upgrades.c" goto __catch605_g_error; } #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp3_ = self->priv->mimic_dir; + _tmp2_ = self->priv->mimic_dir; #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala" - g_file_delete (_tmp3_, NULL, &_inner_error_); + g_file_delete (_tmp2_, NULL, &_inner_error_); #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1193 "Upgrades.c" +#line 1303 "Upgrades.c" goto __catch605_g_error; } } @@ -1197,21 +1307,21 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor __catch605_g_error: { GError* e = NULL; - GError* _tmp4_; - const gchar* _tmp5_; + GError* _tmp3_; + const gchar* _tmp4_; #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala" e = _inner_error_; #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala" _inner_error_ = NULL; #line 85 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp4_ = e; + _tmp3_ = e; #line 85 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp5_ = _tmp4_->message; + _tmp4_ = _tmp3_->message; #line 85 "/home/jens/Source/shotwell/src/Upgrades.vala" - g_debug ("Upgrades.vala:85: Could not delete mimics: %s", _tmp5_); + g_debug ("Upgrades.vala:85: Could not delete mimics: %s", _tmp4_); #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_error_free0 (e); -#line 1215 "Upgrades.c" +#line 1325 "Upgrades.c" } __finally605: #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala" @@ -1222,51 +1332,61 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor g_clear_error (&_inner_error_); #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala" return; -#line 1226 "Upgrades.c" +#line 1336 "Upgrades.c" } } -MimicsRemovalTask* mimics_removal_task_construct (GType object_type) { +MimicsRemovalTask* +mimics_removal_task_construct (GType object_type) +{ MimicsRemovalTask * self = NULL; #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" self = (MimicsRemovalTask*) g_object_new (object_type, NULL); #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" return self; -#line 1237 "Upgrades.c" +#line 1349 "Upgrades.c" } -MimicsRemovalTask* mimics_removal_task_new (void) { +MimicsRemovalTask* +mimics_removal_task_new (void) +{ #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" return mimics_removal_task_construct (TYPE_MIMICS_REMOVAL_TASK); -#line 1244 "Upgrades.c" +#line 1358 "Upgrades.c" } -static void mimics_removal_task_class_init (MimicsRemovalTaskClass * klass) { +static void +mimics_removal_task_class_init (MimicsRemovalTaskClass * klass) +{ #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" mimics_removal_task_parent_class = g_type_class_peek_parent (klass); #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" g_type_class_add_private (klass, sizeof (MimicsRemovalTaskPrivate)); #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" G_OBJECT_CLASS (klass)->finalize = mimics_removal_task_finalize; -#line 1255 "Upgrades.c" +#line 1371 "Upgrades.c" } -static void mimics_removal_task_upgrade_task_interface_init (UpgradeTaskIface * iface) { +static void +mimics_removal_task_upgrade_task_interface_init (UpgradeTaskIface * iface) +{ #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" mimics_removal_task_upgrade_task_parent_iface = g_type_interface_peek_parent (iface); #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" iface->get_step_count = (guint64 (*) (UpgradeTask *)) mimics_removal_task_real_get_step_count; #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" iface->execute = (void (*) (UpgradeTask *, ProgressMonitor, void*)) mimics_removal_task_real_execute; -#line 1266 "Upgrades.c" +#line 1384 "Upgrades.c" } -static void mimics_removal_task_instance_init (MimicsRemovalTask * self) { +static void +mimics_removal_task_instance_init (MimicsRemovalTask * self) +{ GFile* _tmp0_; GFile* _tmp1_; GFile* _tmp2_; @@ -1284,11 +1404,13 @@ static void mimics_removal_task_instance_init (MimicsRemovalTask * self) { _g_object_unref0 (_tmp1_); #line 69 "/home/jens/Source/shotwell/src/Upgrades.vala" self->priv->num_mimics = (guint64) 0; -#line 1288 "Upgrades.c" +#line 1408 "Upgrades.c" } -static void mimics_removal_task_finalize (GObject * obj) { +static void +mimics_removal_task_finalize (GObject * obj) +{ MimicsRemovalTask * self; #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTask); @@ -1296,11 +1418,13 @@ static void mimics_removal_task_finalize (GObject * obj) { _g_object_unref0 (self->priv->mimic_dir); #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" G_OBJECT_CLASS (mimics_removal_task_parent_class)->finalize (obj); -#line 1300 "Upgrades.c" +#line 1422 "Upgrades.c" } -GType mimics_removal_task_get_type (void) { +GType +mimics_removal_task_get_type (void) +{ static volatile gsize mimics_removal_task_type_id__volatile = 0; if (g_once_init_enter (&mimics_removal_task_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MimicsRemovalTaskClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) mimics_removal_task_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MimicsRemovalTask), 0, (GInstanceInitFunc) mimics_removal_task_instance_init, NULL }; @@ -1314,7 +1438,9 @@ GType mimics_removal_task_get_type (void) { } -static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base) { +static guint64 +fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base) +{ FixupRawThumbnailsTask * self; guint64 result = 0ULL; gint num_raw_files = 0; @@ -1322,7 +1448,7 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base) self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FIXUP_RAW_THUMBNAILS_TASK, FixupRawThumbnailsTask); #line 95 "/home/jens/Source/shotwell/src/Upgrades.vala" num_raw_files = 0; -#line 1326 "Upgrades.c" +#line 1452 "Upgrades.c" { GeeArrayList* _phr_list = NULL; PhotoTable* _tmp0_; @@ -1358,7 +1484,7 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base) _phr_index = -1; #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala" while (TRUE) { -#line 1362 "Upgrades.c" +#line 1488 "Upgrades.c" gint _tmp7_; gint _tmp8_; gint _tmp9_; @@ -1381,7 +1507,7 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base) if (!(_tmp8_ < _tmp9_)) { #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala" break; -#line 1385 "Upgrades.c" +#line 1511 "Upgrades.c" } #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp10_ = _phr_list; @@ -1399,37 +1525,41 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base) _tmp15_ = _tmp14_->file_format; #line 98 "/home/jens/Source/shotwell/src/Upgrades.vala" if (_tmp15_ == PHOTO_FILE_FORMAT_RAW) { -#line 1403 "Upgrades.c" +#line 1529 "Upgrades.c" gint _tmp16_; #line 99 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp16_ = num_raw_files; #line 99 "/home/jens/Source/shotwell/src/Upgrades.vala" num_raw_files = _tmp16_ + 1; -#line 1409 "Upgrades.c" +#line 1535 "Upgrades.c" } #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala" _photo_row_unref0 (phr); -#line 1413 "Upgrades.c" +#line 1539 "Upgrades.c" } #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_object_unref0 (_phr_list); -#line 1417 "Upgrades.c" +#line 1543 "Upgrades.c" } #line 101 "/home/jens/Source/shotwell/src/Upgrades.vala" result = (guint64) num_raw_files; #line 101 "/home/jens/Source/shotwell/src/Upgrades.vala" return result; -#line 1423 "Upgrades.c" +#line 1549 "Upgrades.c" } -static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressMonitor monitor, void* monitor_target) { +static void +fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, + ProgressMonitor monitor, + void* monitor_target) +{ FixupRawThumbnailsTask * self; #line 104 "/home/jens/Source/shotwell/src/Upgrades.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FIXUP_RAW_THUMBNAILS_TASK, FixupRawThumbnailsTask); #line 105 "/home/jens/Source/shotwell/src/Upgrades.vala" g_debug ("Upgrades.vala:105: Executing thumbnail deletion and fixup"); -#line 1433 "Upgrades.c" +#line 1563 "Upgrades.c" { GeeArrayList* _phr_list = NULL; PhotoTable* _tmp0_; @@ -1465,7 +1595,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM _phr_index = -1; #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala" while (TRUE) { -#line 1469 "Upgrades.c" +#line 1599 "Upgrades.c" gint _tmp7_; gint _tmp8_; gint _tmp9_; @@ -1489,7 +1619,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM if (!(_tmp8_ < _tmp9_)) { #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala" break; -#line 1493 "Upgrades.c" +#line 1623 "Upgrades.c" } #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp10_ = _phr_list; @@ -1507,7 +1637,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM _tmp16_ = _tmp15_->file_format; #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala" if (_tmp16_ == PHOTO_FILE_FORMAT_RAW) { -#line 1511 "Upgrades.c" +#line 1641 "Upgrades.c" PhotoRow* _tmp17_; RawDeveloper _tmp18_; #line 109 "/home/jens/Source/shotwell/src/Upgrades.vala" @@ -1516,15 +1646,15 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM _tmp18_ = _tmp17_->developer; #line 109 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp13_ = _tmp18_ == RAW_DEVELOPER_CAMERA; -#line 1520 "Upgrades.c" +#line 1650 "Upgrades.c" } else { #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp13_ = FALSE; -#line 1524 "Upgrades.c" +#line 1654 "Upgrades.c" } #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala" if (_tmp13_) { -#line 1528 "Upgrades.c" +#line 1658 "Upgrades.c" LibraryPhotoSourceCollection* _tmp19_; PhotoRow* _tmp20_; PhotoID _tmp21_; @@ -1544,59 +1674,71 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 110 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_object_unref0 (_tmp23_); -#line 1548 "Upgrades.c" +#line 1678 "Upgrades.c" } #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala" _photo_row_unref0 (phr); -#line 1552 "Upgrades.c" +#line 1682 "Upgrades.c" } #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_object_unref0 (_phr_list); -#line 1556 "Upgrades.c" +#line 1686 "Upgrades.c" } } -FixupRawThumbnailsTask* fixup_raw_thumbnails_task_construct (GType object_type) { +FixupRawThumbnailsTask* +fixup_raw_thumbnails_task_construct (GType object_type) +{ FixupRawThumbnailsTask * self = NULL; #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala" self = (FixupRawThumbnailsTask*) g_object_new (object_type, NULL); #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala" return self; -#line 1567 "Upgrades.c" +#line 1699 "Upgrades.c" } -FixupRawThumbnailsTask* fixup_raw_thumbnails_task_new (void) { +FixupRawThumbnailsTask* +fixup_raw_thumbnails_task_new (void) +{ #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala" return fixup_raw_thumbnails_task_construct (TYPE_FIXUP_RAW_THUMBNAILS_TASK); -#line 1574 "Upgrades.c" +#line 1708 "Upgrades.c" } -static void fixup_raw_thumbnails_task_class_init (FixupRawThumbnailsTaskClass * klass) { +static void +fixup_raw_thumbnails_task_class_init (FixupRawThumbnailsTaskClass * klass) +{ #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala" fixup_raw_thumbnails_task_parent_class = g_type_class_peek_parent (klass); -#line 1581 "Upgrades.c" +#line 1717 "Upgrades.c" } -static void fixup_raw_thumbnails_task_upgrade_task_interface_init (UpgradeTaskIface * iface) { +static void +fixup_raw_thumbnails_task_upgrade_task_interface_init (UpgradeTaskIface * iface) +{ #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala" fixup_raw_thumbnails_task_upgrade_task_parent_iface = g_type_interface_peek_parent (iface); #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala" iface->get_step_count = (guint64 (*) (UpgradeTask *)) fixup_raw_thumbnails_task_real_get_step_count; #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala" iface->execute = (void (*) (UpgradeTask *, ProgressMonitor, void*)) fixup_raw_thumbnails_task_real_execute; -#line 1592 "Upgrades.c" +#line 1730 "Upgrades.c" } -static void fixup_raw_thumbnails_task_instance_init (FixupRawThumbnailsTask * self) { +static void +fixup_raw_thumbnails_task_instance_init (FixupRawThumbnailsTask * self) +{ } -GType fixup_raw_thumbnails_task_get_type (void) { +GType +fixup_raw_thumbnails_task_get_type (void) +{ static volatile gsize fixup_raw_thumbnails_task_type_id__volatile = 0; if (g_once_init_enter (&fixup_raw_thumbnails_task_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (FixupRawThumbnailsTaskClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) fixup_raw_thumbnails_task_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FixupRawThumbnailsTask), 0, (GInstanceInitFunc) fixup_raw_thumbnails_task_instance_init, NULL }; diff --git a/src/VideoMetadata.c b/src/VideoMetadata.c index dbdd25c..0befb0a 100644 --- a/src/VideoMetadata.c +++ b/src/VideoMetadata.c @@ -1,4 +1,4 @@ -/* VideoMetadata.c generated by valac 0.36.6, the Vala compiler +/* VideoMetadata.c generated by valac 0.40.4, the Vala compiler * generated from VideoMetadata.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -235,48 +236,73 @@ static gpointer avi_chunk_parent_class = NULL; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; gpointer metadata_date_time_ref (gpointer instance); void metadata_date_time_unref (gpointer instance); -GParamSpec* param_spec_metadata_date_time (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_metadata_date_time (GValue* value, gpointer v_object); -void value_take_metadata_date_time (GValue* value, gpointer v_object); +GParamSpec* param_spec_metadata_date_time (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_metadata_date_time (GValue* value, + gpointer v_object); +void value_take_metadata_date_time (GValue* value, + gpointer v_object); gpointer value_get_metadata_date_time (const GValue* value); GType metadata_date_time_get_type (void) G_GNUC_CONST; GType video_metadata_get_type (void) G_GNUC_CONST; #define VIDEO_METADATA_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_VIDEO_METADATA, VideoMetadataPrivate)) -enum { - VIDEO_METADATA_DUMMY_PROPERTY -}; VideoMetadata* video_metadata_new (void); VideoMetadata* video_metadata_construct (GType object_type); MediaMetadata* media_metadata_construct (GType object_type); -static void video_metadata_real_read_from_file (MediaMetadata* base, GFile* file, GError** error); +static void video_metadata_real_read_from_file (MediaMetadata* base, + GFile* file, + GError** error); gpointer quick_time_metadata_loader_ref (gpointer instance); void quick_time_metadata_loader_unref (gpointer instance); -GParamSpec* param_spec_quick_time_metadata_loader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_quick_time_metadata_loader (GValue* value, gpointer v_object); -void value_take_quick_time_metadata_loader (GValue* value, gpointer v_object); +GParamSpec* param_spec_quick_time_metadata_loader (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_quick_time_metadata_loader (GValue* value, + gpointer v_object); +void value_take_quick_time_metadata_loader (GValue* value, + gpointer v_object); gpointer value_get_quick_time_metadata_loader (const GValue* value); GType quick_time_metadata_loader_get_type (void) G_GNUC_CONST; QuickTimeMetadataLoader* quick_time_metadata_loader_new (GFile* file); -QuickTimeMetadataLoader* quick_time_metadata_loader_construct (GType object_type, GFile* file); +QuickTimeMetadataLoader* quick_time_metadata_loader_construct (GType object_type, + GFile* file); gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self); MetadataDateTime* quick_time_metadata_loader_get_creation_date_time (QuickTimeMetadataLoader* self); gchar* quick_time_metadata_loader_get_title (QuickTimeMetadataLoader* self); gpointer avi_metadata_loader_ref (gpointer instance); void avi_metadata_loader_unref (gpointer instance); -GParamSpec* param_spec_avi_metadata_loader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_avi_metadata_loader (GValue* value, gpointer v_object); -void value_take_avi_metadata_loader (GValue* value, gpointer v_object); +GParamSpec* param_spec_avi_metadata_loader (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_avi_metadata_loader (GValue* value, + gpointer v_object); +void value_take_avi_metadata_loader (GValue* value, + gpointer v_object); gpointer value_get_avi_metadata_loader (const GValue* value); GType avi_metadata_loader_get_type (void) G_GNUC_CONST; AVIMetadataLoader* avi_metadata_loader_new (GFile* file); -AVIMetadataLoader* avi_metadata_loader_construct (GType object_type, GFile* file); +AVIMetadataLoader* avi_metadata_loader_construct (GType object_type, + GFile* file); gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self); MetadataDateTime* avi_metadata_loader_get_creation_date_time (AVIMetadataLoader* self); gchar* avi_metadata_loader_get_title (AVIMetadataLoader* self); @@ -285,164 +311,205 @@ static gchar* video_metadata_real_get_title (MediaMetadata* base); static gchar* video_metadata_real_get_comment (MediaMetadata* base); static void video_metadata_finalize (MediaMetadata * obj); #define QUICK_TIME_METADATA_LOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_QUICK_TIME_METADATA_LOADER, QuickTimeMetadataLoaderPrivate)) -enum { - QUICK_TIME_METADATA_LOADER_DUMMY_PROPERTY -}; #define QUICK_TIME_METADATA_LOADER_QUICKTIME_EPOCH_ADJUSTMENT ((time_t) 2082844800) static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (QuickTimeMetadataLoader* self); MetadataDateTime* metadata_date_time_new (time_t timestamp); -MetadataDateTime* metadata_date_time_construct (GType object_type, time_t timestamp); +MetadataDateTime* metadata_date_time_construct (GType object_type, + time_t timestamp); gpointer quick_time_atom_ref (gpointer instance); void quick_time_atom_unref (gpointer instance); -GParamSpec* param_spec_quick_time_atom (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_quick_time_atom (GValue* value, gpointer v_object); -void value_take_quick_time_atom (GValue* value, gpointer v_object); +GParamSpec* param_spec_quick_time_atom (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_quick_time_atom (GValue* value, + gpointer v_object); +void value_take_quick_time_atom (GValue* value, + gpointer v_object); gpointer value_get_quick_time_atom (const GValue* value); GType quick_time_atom_get_type (void) G_GNUC_CONST; QuickTimeAtom* quick_time_atom_new (GFile* file); -QuickTimeAtom* quick_time_atom_construct (GType object_type, GFile* file); -void quick_time_atom_open_file (QuickTimeAtom* self, GError** error); -void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error); +QuickTimeAtom* quick_time_atom_construct (GType object_type, + GFile* file); +void quick_time_atom_open_file (QuickTimeAtom* self, + GError** error); +void quick_time_atom_read_atom (QuickTimeAtom* self, + GError** error); gchar* quick_time_atom_get_current_atom_name (QuickTimeAtom* self); -void quick_time_atom_next_atom (QuickTimeAtom* self, GError** error); +void quick_time_atom_next_atom (QuickTimeAtom* self, + GError** error); gboolean quick_time_atom_is_last_atom (QuickTimeAtom* self); -void quick_time_atom_close_file (QuickTimeAtom* self, GError** error); +void quick_time_atom_close_file (QuickTimeAtom* self, + GError** error); QuickTimeAtom* quick_time_atom_get_first_child_atom (QuickTimeAtom* self); guint64 quick_time_atom_section_size_remaining (QuickTimeAtom* self); -guint32 quick_time_atom_read_uint32 (QuickTimeAtom* self, GError** error); +guint32 quick_time_atom_read_uint32 (QuickTimeAtom* self, + GError** error); static void quick_time_metadata_loader_finalize (QuickTimeMetadataLoader * obj); #define QUICK_TIME_ATOM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_QUICK_TIME_ATOM, QuickTimeAtomPrivate)) -enum { - QUICK_TIME_ATOM_DUMMY_PROPERTY -}; -static QuickTimeAtom* quick_time_atom_new_with_input_stream (GDataInputStream* input, QuickTimeAtom* parent); -static QuickTimeAtom* quick_time_atom_construct_with_input_stream (GType object_type, GDataInputStream* input, QuickTimeAtom* parent); -static void quick_time_atom_advance_section_offset (QuickTimeAtom* self, guint64 amount); -guchar quick_time_atom_read_byte (QuickTimeAtom* self, GError** error); -guint64 quick_time_atom_read_uint64 (QuickTimeAtom* self, GError** error); -static void quick_time_atom_skip (QuickTimeAtom* self, guint64 skip_amount, GError** error); -void skip_uint64 (GInputStream* input, guint64 skip_amount, GError** error); +static QuickTimeAtom* quick_time_atom_new_with_input_stream (GDataInputStream* input, + QuickTimeAtom* parent); +static QuickTimeAtom* quick_time_atom_construct_with_input_stream (GType object_type, + GDataInputStream* input, + QuickTimeAtom* parent); +static void quick_time_atom_advance_section_offset (QuickTimeAtom* self, + guint64 amount); +guchar quick_time_atom_read_byte (QuickTimeAtom* self, + GError** error); +guint64 quick_time_atom_read_uint64 (QuickTimeAtom* self, + GError** error); +static void quick_time_atom_skip (QuickTimeAtom* self, + guint64 skip_amount, + GError** error); +void skip_uint64 (GInputStream* input, + guint64 skip_amount, + GError** error); static void quick_time_atom_finalize (QuickTimeAtom * obj); #define AVI_METADATA_LOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_AVI_METADATA_LOADER, AVIMetadataLoaderPrivate)) -enum { - AVI_METADATA_LOADER_DUMMY_PROPERTY -}; #define AVI_METADATA_LOADER_NUMERICAL_DATE_LENGTH 19 #define AVI_METADATA_LOADER_NIKON_NCTG_TIMESTAMP_MARKER ((guint16) 0x13) #define AVI_METADATA_LOADER_MAX_STRD_LENGTH 100 static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoader* self); gpointer avi_chunk_ref (gpointer instance); void avi_chunk_unref (gpointer instance); -GParamSpec* param_spec_avi_chunk (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_avi_chunk (GValue* value, gpointer v_object); -void value_take_avi_chunk (GValue* value, gpointer v_object); +GParamSpec* param_spec_avi_chunk (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_avi_chunk (GValue* value, + gpointer v_object); +void value_take_avi_chunk (GValue* value, + gpointer v_object); gpointer value_get_avi_chunk (const GValue* value); GType avi_chunk_get_type (void) G_GNUC_CONST; AVIChunk* avi_chunk_new (GFile* file); -AVIChunk* avi_chunk_construct (GType object_type, GFile* file); -void avi_chunk_open_file (AVIChunk* self, GError** error); -void avi_chunk_read_chunk (AVIChunk* self, GError** error); +AVIChunk* avi_chunk_construct (GType object_type, + GFile* file); +void avi_chunk_open_file (AVIChunk* self, + GError** error); +void avi_chunk_read_chunk (AVIChunk* self, + GError** error); gchar* avi_chunk_get_current_chunk_name (AVIChunk* self); -gchar* avi_chunk_read_name (AVIChunk* self, GError** error); -void avi_chunk_close_file (AVIChunk* self, GError** error); -static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self, AVIChunk* chunk, GError** error); +gchar* avi_chunk_read_name (AVIChunk* self, + GError** error); +void avi_chunk_close_file (AVIChunk* self, + GError** error); +static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self, + AVIChunk* chunk, + GError** error); guint64 avi_chunk_section_size_remaining (AVIChunk* self); -guint16 avi_chunk_read_uint16 (AVIChunk* self, GError** error); -void avi_chunk_skip (AVIChunk* self, guint64 skip_amount, GError** error); -guchar avi_chunk_read_byte (AVIChunk* self, GError** error); -static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, AVIChunk* chunk, GError** error); -static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChunk* chunk, GError** error); -gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error); +guint16 avi_chunk_read_uint16 (AVIChunk* self, + GError** error); +void avi_chunk_skip (AVIChunk* self, + guint64 skip_amount, + GError** error); +guchar avi_chunk_read_byte (AVIChunk* self, + GError** error); +static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, + AVIChunk* chunk, + GError** error); +static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, + AVIChunk* chunk, + GError** error); +gchar* avi_chunk_section_to_string (AVIChunk* self, + GError** error); AVIChunk* avi_chunk_get_first_child_chunk (AVIChunk* self); gboolean avi_chunk_is_last_chunk (AVIChunk* self); -void avi_chunk_next_chunk (AVIChunk* self, GError** error); -static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gchar* sdate); -static GDateMonth avi_metadata_loader_month_from_string (AVIMetadataLoader* self, const gchar* s); -void avi_chunk_nonsection_skip (AVIChunk* self, guint64 skip_amount, GError** error); +void avi_chunk_next_chunk (AVIChunk* self, + GError** error); +static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, + const gchar* sdate); +static GDateMonth avi_metadata_loader_month_from_string (AVIMetadataLoader* self, + const gchar* s); +void avi_chunk_nonsection_skip (AVIChunk* self, + guint64 skip_amount, + GError** error); static void avi_metadata_loader_finalize (AVIMetadataLoader * obj); #define AVI_CHUNK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_AVI_CHUNK, AVIChunkPrivate)) -enum { - AVI_CHUNK_DUMMY_PROPERTY -}; #define AVI_CHUNK_MAX_STRING_TO_SECTION_LENGTH 1024 -static AVIChunk* avi_chunk_new_with_input_stream (GDataInputStream* input, AVIChunk* parent); -static AVIChunk* avi_chunk_construct_with_input_stream (GType object_type, GDataInputStream* input, AVIChunk* parent); -static void avi_chunk_advance_section_offset (AVIChunk* self, guint64 amount); +static AVIChunk* avi_chunk_new_with_input_stream (GDataInputStream* input, + AVIChunk* parent); +static AVIChunk* avi_chunk_construct_with_input_stream (GType object_type, + GDataInputStream* input, + AVIChunk* parent); +static void avi_chunk_advance_section_offset (AVIChunk* self, + guint64 amount); static void avi_chunk_finalize (AVIChunk * obj); -VideoMetadata* video_metadata_construct (GType object_type) { +VideoMetadata* +video_metadata_construct (GType object_type) +{ VideoMetadata* self = NULL; #line 13 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self = (VideoMetadata*) media_metadata_construct (object_type); #line 13 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return self; -#line 381 "VideoMetadata.c" +#line 451 "VideoMetadata.c" } -VideoMetadata* video_metadata_new (void) { +VideoMetadata* +video_metadata_new (void) +{ #line 13 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return video_metadata_construct (TYPE_VIDEO_METADATA); -#line 388 "VideoMetadata.c" +#line 460 "VideoMetadata.c" } -static void video_metadata_real_read_from_file (MediaMetadata* base, GFile* file, GError** error) { +static void +video_metadata_real_read_from_file (MediaMetadata* base, + GFile* file, + GError** error) +{ VideoMetadata * self; QuickTimeMetadataLoader* quicktime = NULL; - GFile* _tmp0_; + QuickTimeMetadataLoader* _tmp0_; QuickTimeMetadataLoader* _tmp1_; - QuickTimeMetadataLoader* _tmp2_; - gboolean _tmp3_; AVIMetadataLoader* avi = NULL; - GFile* _tmp8_; - AVIMetadataLoader* _tmp9_; - AVIMetadataLoader* _tmp10_; - gboolean _tmp11_; - GFile* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; - GError* _tmp19_; - GError* _tmp20_; + AVIMetadataLoader* _tmp6_; + AVIMetadataLoader* _tmp7_; + gchar* _tmp12_; + gchar* _tmp13_; + GError* _tmp14_; + GError* _tmp15_; GError * _inner_error_ = NULL; #line 19 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_METADATA, VideoMetadata); #line 19 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_if_fail (G_IS_FILE (file)); #line 20 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = file; -#line 20 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp1_ = quick_time_metadata_loader_new (_tmp0_); + _tmp0_ = quick_time_metadata_loader_new (file); #line 20 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - quicktime = _tmp1_; + quicktime = _tmp0_; #line 21 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp2_ = quicktime; + _tmp1_ = quicktime; #line 21 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp3_ = quick_time_metadata_loader_is_supported (_tmp2_); -#line 21 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp3_) { -#line 426 "VideoMetadata.c" + if (quick_time_metadata_loader_is_supported (_tmp1_)) { +#line 493 "VideoMetadata.c" + QuickTimeMetadataLoader* _tmp2_; + MetadataDateTime* _tmp3_; QuickTimeMetadataLoader* _tmp4_; - MetadataDateTime* _tmp5_; - QuickTimeMetadataLoader* _tmp6_; - gchar* _tmp7_; + gchar* _tmp5_; #line 22 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp4_ = quicktime; + _tmp2_ = quicktime; #line 22 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp5_ = quick_time_metadata_loader_get_creation_date_time (_tmp4_); + _tmp3_ = quick_time_metadata_loader_get_creation_date_time (_tmp2_); #line 22 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _metadata_date_time_unref0 (self->priv->timestamp); #line 22 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - self->priv->timestamp = _tmp5_; + self->priv->timestamp = _tmp3_; #line 23 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp6_ = quicktime; + _tmp4_ = quicktime; #line 23 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp7_ = quick_time_metadata_loader_get_title (_tmp6_); + _tmp5_ = quick_time_metadata_loader_get_title (_tmp4_); #line 23 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (self->priv->title); #line 23 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - self->priv->title = _tmp7_; + self->priv->title = _tmp5_; #line 25 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (self->priv->comment); #line 25 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -451,41 +518,37 @@ static void video_metadata_real_read_from_file (MediaMetadata* base, GFile* file _quick_time_metadata_loader_unref0 (quicktime); #line 26 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 455 "VideoMetadata.c" +#line 522 "VideoMetadata.c" } #line 28 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp8_ = file; -#line 28 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp9_ = avi_metadata_loader_new (_tmp8_); + _tmp6_ = avi_metadata_loader_new (file); #line 28 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - avi = _tmp9_; + avi = _tmp6_; #line 29 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp10_ = avi; + _tmp7_ = avi; #line 29 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp11_ = avi_metadata_loader_is_supported (_tmp10_); -#line 29 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp11_) { -#line 469 "VideoMetadata.c" - AVIMetadataLoader* _tmp12_; - MetadataDateTime* _tmp13_; - AVIMetadataLoader* _tmp14_; - gchar* _tmp15_; + if (avi_metadata_loader_is_supported (_tmp7_)) { +#line 532 "VideoMetadata.c" + AVIMetadataLoader* _tmp8_; + MetadataDateTime* _tmp9_; + AVIMetadataLoader* _tmp10_; + gchar* _tmp11_; #line 30 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp12_ = avi; + _tmp8_ = avi; #line 30 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp13_ = avi_metadata_loader_get_creation_date_time (_tmp12_); + _tmp9_ = avi_metadata_loader_get_creation_date_time (_tmp8_); #line 30 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _metadata_date_time_unref0 (self->priv->timestamp); #line 30 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - self->priv->timestamp = _tmp13_; + self->priv->timestamp = _tmp9_; #line 31 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp14_ = avi; + _tmp10_ = avi; #line 31 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp15_ = avi_metadata_loader_get_title (_tmp14_); + _tmp11_ = avi_metadata_loader_get_title (_tmp10_); #line 31 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (self->priv->title); #line 31 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - self->priv->title = _tmp15_; + self->priv->title = _tmp11_; #line 32 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (self->priv->comment); #line 32 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -496,22 +559,20 @@ static void video_metadata_real_read_from_file (MediaMetadata* base, GFile* file _quick_time_metadata_loader_unref0 (quicktime); #line 33 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 500 "VideoMetadata.c" +#line 563 "VideoMetadata.c" } #line 36 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp16_ = file; -#line 36 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp17_ = g_file_get_path (_tmp16_); + _tmp12_ = g_file_get_path (file); #line 36 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp18_ = _tmp17_; + _tmp13_ = _tmp12_; #line 36 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp19_ = g_error_new (G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "File %s is not a supported video format", _tmp18_); + _tmp14_ = g_error_new (G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "File %s is not a supported video format", _tmp13_); #line 36 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp20_ = _tmp19_; + _tmp15_ = _tmp14_; #line 36 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp13_); #line 36 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _inner_error_ = _tmp20_; + _inner_error_ = _tmp15_; #line 36 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 36 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -520,18 +581,22 @@ static void video_metadata_real_read_from_file (MediaMetadata* base, GFile* file _quick_time_metadata_loader_unref0 (quicktime); #line 36 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 524 "VideoMetadata.c" +#line 585 "VideoMetadata.c" } -static gpointer _metadata_date_time_ref0 (gpointer self) { +static gpointer +_metadata_date_time_ref0 (gpointer self) +{ #line 40 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return self ? metadata_date_time_ref (self) : NULL; -#line 531 "VideoMetadata.c" +#line 594 "VideoMetadata.c" } -static MetadataDateTime* video_metadata_real_get_creation_date_time (MediaMetadata* base) { +static MetadataDateTime* +video_metadata_real_get_creation_date_time (MediaMetadata* base) +{ VideoMetadata * self; MetadataDateTime* result = NULL; MetadataDateTime* _tmp0_; @@ -546,11 +611,13 @@ static MetadataDateTime* video_metadata_real_get_creation_date_time (MediaMetada result = _tmp1_; #line 40 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 550 "VideoMetadata.c" +#line 615 "VideoMetadata.c" } -static gchar* video_metadata_real_get_title (MediaMetadata* base) { +static gchar* +video_metadata_real_get_title (MediaMetadata* base) +{ VideoMetadata * self; gchar* result = NULL; const gchar* _tmp0_; @@ -565,11 +632,13 @@ static gchar* video_metadata_real_get_title (MediaMetadata* base) { result = _tmp1_; #line 44 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 569 "VideoMetadata.c" +#line 636 "VideoMetadata.c" } -static gchar* video_metadata_real_get_comment (MediaMetadata* base) { +static gchar* +video_metadata_real_get_comment (MediaMetadata* base) +{ VideoMetadata * self; gchar* result = NULL; const gchar* _tmp0_; @@ -584,11 +653,13 @@ static gchar* video_metadata_real_get_comment (MediaMetadata* base) { result = _tmp1_; #line 48 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 588 "VideoMetadata.c" +#line 657 "VideoMetadata.c" } -static void video_metadata_class_init (VideoMetadataClass * klass) { +static void +video_metadata_class_init (VideoMetadataClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/VideoMetadata.vala" video_metadata_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -603,11 +674,13 @@ static void video_metadata_class_init (VideoMetadataClass * klass) { ((MediaMetadataClass *) klass)->get_title = (gchar* (*) (MediaMetadata *)) video_metadata_real_get_title; #line 7 "/home/jens/Source/shotwell/src/VideoMetadata.vala" ((MediaMetadataClass *) klass)->get_comment = (gchar* (*) (MediaMetadata *)) video_metadata_real_get_comment; -#line 607 "VideoMetadata.c" +#line 678 "VideoMetadata.c" } -static void video_metadata_instance_init (VideoMetadata * self) { +static void +video_metadata_instance_init (VideoMetadata * self) +{ #line 7 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv = VIDEO_METADATA_GET_PRIVATE (self); #line 9 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -616,11 +689,13 @@ static void video_metadata_instance_init (VideoMetadata * self) { self->priv->title = NULL; #line 11 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv->comment = NULL; -#line 620 "VideoMetadata.c" +#line 693 "VideoMetadata.c" } -static void video_metadata_finalize (MediaMetadata * obj) { +static void +video_metadata_finalize (MediaMetadata * obj) +{ VideoMetadata * self; #line 7 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_METADATA, VideoMetadata); @@ -632,11 +707,13 @@ static void video_metadata_finalize (MediaMetadata * obj) { _g_free0 (self->priv->comment); #line 7 "/home/jens/Source/shotwell/src/VideoMetadata.vala" MEDIA_METADATA_CLASS (video_metadata_parent_class)->finalize (obj); -#line 636 "VideoMetadata.c" +#line 711 "VideoMetadata.c" } -GType video_metadata_get_type (void) { +GType +video_metadata_get_type (void) +{ static volatile gsize video_metadata_type_id__volatile = 0; if (g_once_init_enter (&video_metadata_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (VideoMetadataClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) video_metadata_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (VideoMetadata), 0, (GInstanceInitFunc) video_metadata_instance_init, NULL }; @@ -648,61 +725,66 @@ GType video_metadata_get_type (void) { } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 62 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return self ? g_object_ref (self) : NULL; -#line 655 "VideoMetadata.c" +#line 734 "VideoMetadata.c" } -QuickTimeMetadataLoader* quick_time_metadata_loader_construct (GType object_type, GFile* file) { +QuickTimeMetadataLoader* +quick_time_metadata_loader_construct (GType object_type, + GFile* file) +{ QuickTimeMetadataLoader* self = NULL; GFile* _tmp0_; - GFile* _tmp1_; #line 61 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 61 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self = (QuickTimeMetadataLoader*) g_type_create_instance (object_type); #line 62 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = file; -#line 62 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (file); #line 62 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_object_unref0 (self->priv->file); #line 62 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - self->priv->file = _tmp1_; + self->priv->file = _tmp0_; #line 61 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return self; -#line 677 "VideoMetadata.c" +#line 756 "VideoMetadata.c" } -QuickTimeMetadataLoader* quick_time_metadata_loader_new (GFile* file) { +QuickTimeMetadataLoader* +quick_time_metadata_loader_new (GFile* file) +{ #line 61 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return quick_time_metadata_loader_construct (TYPE_QUICK_TIME_METADATA_LOADER, file); -#line 684 "VideoMetadata.c" +#line 765 "VideoMetadata.c" } -MetadataDateTime* quick_time_metadata_loader_get_creation_date_time (QuickTimeMetadataLoader* self) { +MetadataDateTime* +quick_time_metadata_loader_get_creation_date_time (QuickTimeMetadataLoader* self) +{ MetadataDateTime* result = NULL; - gulong _tmp0_; - MetadataDateTime* _tmp1_; + MetadataDateTime* _tmp0_; #line 65 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (IS_QUICK_TIME_METADATA_LOADER (self), NULL); #line 66 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = quick_time_metadata_loader_get_creation_date_time_for_quicktime (self); + _tmp0_ = metadata_date_time_new ((time_t) quick_time_metadata_loader_get_creation_date_time_for_quicktime (self)); #line 66 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp1_ = metadata_date_time_new ((time_t) _tmp0_); -#line 66 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - result = _tmp1_; + result = _tmp0_; #line 66 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 702 "VideoMetadata.c" +#line 782 "VideoMetadata.c" } -gchar* quick_time_metadata_loader_get_title (QuickTimeMetadataLoader* self) { +gchar* +quick_time_metadata_loader_get_title (QuickTimeMetadataLoader* self) +{ gchar* result = NULL; #line 69 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (IS_QUICK_TIME_METADATA_LOADER (self), NULL); @@ -710,11 +792,13 @@ gchar* quick_time_metadata_loader_get_title (QuickTimeMetadataLoader* self) { result = NULL; #line 71 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 714 "VideoMetadata.c" +#line 796 "VideoMetadata.c" } -gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) { +gboolean +quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) +{ gboolean result = FALSE; QuickTimeAtom* test = NULL; GFile* _tmp0_; @@ -731,7 +815,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) test = _tmp1_; #line 78 "/home/jens/Source/shotwell/src/VideoMetadata.vala" ret = FALSE; -#line 735 "VideoMetadata.c" +#line 819 "VideoMetadata.c" { QuickTimeAtom* _tmp2_; QuickTimeAtom* _tmp3_; @@ -745,7 +829,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) quick_time_atom_open_file (_tmp2_, &_inner_error_); #line 80 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 749 "VideoMetadata.c" +#line 833 "VideoMetadata.c" goto __catch586_g_error; } #line 81 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -754,7 +838,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) quick_time_atom_read_atom (_tmp3_, &_inner_error_); #line 81 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 758 "VideoMetadata.c" +#line 842 "VideoMetadata.c" goto __catch586_g_error; } #line 84 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -771,11 +855,11 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) if (_tmp7_) { #line 85 "/home/jens/Source/shotwell/src/VideoMetadata.vala" ret = TRUE; -#line 775 "VideoMetadata.c" +#line 859 "VideoMetadata.c" } else { #line 90 "/home/jens/Source/shotwell/src/VideoMetadata.vala" while (TRUE) { -#line 779 "VideoMetadata.c" +#line 863 "VideoMetadata.c" QuickTimeAtom* _tmp8_; gchar* _tmp9_; gchar* _tmp10_; @@ -783,7 +867,6 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) QuickTimeAtom* _tmp12_; QuickTimeAtom* _tmp13_; QuickTimeAtom* _tmp14_; - gboolean _tmp15_; #line 91 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp8_ = test; #line 91 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -800,7 +883,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) ret = TRUE; #line 93 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 804 "VideoMetadata.c" +#line 887 "VideoMetadata.c" } #line 95 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp12_ = test; @@ -808,7 +891,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) quick_time_atom_next_atom (_tmp12_, &_inner_error_); #line 95 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 812 "VideoMetadata.c" +#line 895 "VideoMetadata.c" goto __catch586_g_error; } #line 96 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -817,18 +900,16 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) quick_time_atom_read_atom (_tmp13_, &_inner_error_); #line 96 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 821 "VideoMetadata.c" +#line 904 "VideoMetadata.c" goto __catch586_g_error; } #line 97 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp14_ = test; #line 97 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp15_ = quick_time_atom_is_last_atom (_tmp14_); -#line 97 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp15_) { + if (quick_time_atom_is_last_atom (_tmp14_)) { #line 98 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 832 "VideoMetadata.c" +#line 913 "VideoMetadata.c" } } } @@ -837,39 +918,39 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) __catch586_g_error: { GError* e = NULL; - GFile* _tmp16_; + GFile* _tmp15_; + gchar* _tmp16_; gchar* _tmp17_; - gchar* _tmp18_; - GError* _tmp19_; - const gchar* _tmp20_; + GError* _tmp18_; + const gchar* _tmp19_; #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala" e = _inner_error_; #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _inner_error_ = NULL; #line 103 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp16_ = self->priv->file; + _tmp15_ = self->priv->file; #line 103 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp17_ = g_file_get_path (_tmp16_); + _tmp16_ = g_file_get_path (_tmp15_); #line 103 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 103 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp19_ = e; + _tmp18_ = e; #line 103 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp20_ = _tmp19_->message; + _tmp19_ = _tmp18_->message; #line 103 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_debug ("VideoMetadata.vala:103: Error while testing for QuickTime file for %s:" \ -" %s", _tmp18_, _tmp20_); +" %s", _tmp17_, _tmp19_); #line 103 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp17_); #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_error_free0 (e); -#line 866 "VideoMetadata.c" +#line 947 "VideoMetadata.c" } __finally586: #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 871 "VideoMetadata.c" - gboolean _tmp21_ = FALSE; +#line 952 "VideoMetadata.c" + gboolean _tmp20_ = FALSE; #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (test); #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -877,18 +958,18 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_clear_error (&_inner_error_); #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return _tmp21_; -#line 881 "VideoMetadata.c" + return _tmp20_; +#line 962 "VideoMetadata.c" } { - QuickTimeAtom* _tmp22_; + QuickTimeAtom* _tmp21_; #line 107 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp22_ = test; + _tmp21_ = test; #line 107 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - quick_time_atom_close_file (_tmp22_, &_inner_error_); + quick_time_atom_close_file (_tmp21_, &_inner_error_); #line 107 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 891 "VideoMetadata.c" +#line 972 "VideoMetadata.c" goto __catch587_g_error; } } @@ -896,27 +977,27 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) __catch587_g_error: { GError* e = NULL; - GError* _tmp23_; - const gchar* _tmp24_; + GError* _tmp22_; + const gchar* _tmp23_; #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala" e = _inner_error_; #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _inner_error_ = NULL; #line 109 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp23_ = e; + _tmp22_ = e; #line 109 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp24_ = _tmp23_->message; + _tmp23_ = _tmp22_->message; #line 109 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_debug ("VideoMetadata.vala:109: Error while closing Quicktime file: %s", _tmp24_); + g_debug ("VideoMetadata.vala:109: Error while closing Quicktime file: %s", _tmp23_); #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_error_free0 (e); -#line 913 "VideoMetadata.c" +#line 994 "VideoMetadata.c" } __finally587: #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 918 "VideoMetadata.c" - gboolean _tmp25_ = FALSE; +#line 999 "VideoMetadata.c" + gboolean _tmp24_ = FALSE; #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (test); #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -924,8 +1005,8 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_clear_error (&_inner_error_); #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return _tmp25_; -#line 928 "VideoMetadata.c" + return _tmp24_; +#line 1009 "VideoMetadata.c" } #line 111 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = ret; @@ -933,18 +1014,20 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) _quick_time_atom_unref0 (test); #line 111 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 936 "VideoMetadata.c" +#line 1017 "VideoMetadata.c" } -static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (QuickTimeMetadataLoader* self) { +static gulong +quick_time_metadata_loader_get_creation_date_time_for_quicktime (QuickTimeMetadataLoader* self) +{ gulong result = 0UL; QuickTimeAtom* test = NULL; GFile* _tmp0_; QuickTimeAtom* _tmp1_; time_t timestamp = 0; - time_t _tmp37_; - time_t _tmp39_; + time_t _tmp33_; + time_t _tmp35_; GError * _inner_error_ = NULL; #line 114 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (IS_QUICK_TIME_METADATA_LOADER (self), 0UL); @@ -956,7 +1039,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q test = _tmp1_; #line 116 "/home/jens/Source/shotwell/src/VideoMetadata.vala" timestamp = (time_t) 0; -#line 959 "VideoMetadata.c" +#line 1042 "VideoMetadata.c" { QuickTimeAtom* _tmp2_; gboolean done = FALSE; @@ -966,30 +1049,29 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q quick_time_atom_open_file (_tmp2_, &_inner_error_); #line 119 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 969 "VideoMetadata.c" +#line 1052 "VideoMetadata.c" goto __catch588_g_error; } #line 120 "/home/jens/Source/shotwell/src/VideoMetadata.vala" done = FALSE; #line 121 "/home/jens/Source/shotwell/src/VideoMetadata.vala" while (TRUE) { -#line 976 "VideoMetadata.c" +#line 1059 "VideoMetadata.c" gboolean _tmp3_; QuickTimeAtom* _tmp4_; QuickTimeAtom* _tmp5_; - gboolean _tmp6_; - QuickTimeAtom* _tmp7_; + QuickTimeAtom* _tmp6_; + gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; - gboolean _tmp10_; - QuickTimeAtom* _tmp29_; + gboolean _tmp9_; + QuickTimeAtom* _tmp25_; #line 121 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp3_ = done; #line 121 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (!(!_tmp3_)) { #line 121 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 992 "VideoMetadata.c" +#line 1074 "VideoMetadata.c" } #line 123 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp4_ = test; @@ -997,173 +1079,162 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q quick_time_atom_read_atom (_tmp4_, &_inner_error_); #line 123 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1000 "VideoMetadata.c" +#line 1082 "VideoMetadata.c" goto __catch588_g_error; } #line 124 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp5_ = test; #line 124 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp6_ = quick_time_atom_is_last_atom (_tmp5_); -#line 124 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp6_) { + if (quick_time_atom_is_last_atom (_tmp5_)) { #line 124 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 1011 "VideoMetadata.c" +#line 1091 "VideoMetadata.c" } #line 125 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp7_ = test; + _tmp6_ = test; #line 125 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp8_ = quick_time_atom_get_current_atom_name (_tmp7_); + _tmp7_ = quick_time_atom_get_current_atom_name (_tmp6_); #line 125 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 125 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp10_ = g_strcmp0 ("moov", _tmp9_) == 0; + _tmp9_ = g_strcmp0 ("moov", _tmp8_) == 0; #line 125 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp8_); #line 125 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp10_) { -#line 1025 "VideoMetadata.c" + if (_tmp9_) { +#line 1105 "VideoMetadata.c" QuickTimeAtom* child = NULL; + QuickTimeAtom* _tmp10_; QuickTimeAtom* _tmp11_; - QuickTimeAtom* _tmp12_; #line 126 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp11_ = test; + _tmp10_ = test; #line 126 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp12_ = quick_time_atom_get_first_child_atom (_tmp11_); + _tmp11_ = quick_time_atom_get_first_child_atom (_tmp10_); #line 126 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - child = _tmp12_; + child = _tmp11_; #line 127 "/home/jens/Source/shotwell/src/VideoMetadata.vala" while (TRUE) { -#line 1037 "VideoMetadata.c" - gboolean _tmp13_; - QuickTimeAtom* _tmp14_; - gboolean _tmp15_ = FALSE; - QuickTimeAtom* _tmp16_; - gboolean _tmp17_; - QuickTimeAtom* _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; - gboolean _tmp23_; - QuickTimeAtom* _tmp28_; +#line 1117 "VideoMetadata.c" + gboolean _tmp12_; + QuickTimeAtom* _tmp13_; + gboolean _tmp14_ = FALSE; + QuickTimeAtom* _tmp15_; + QuickTimeAtom* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + gboolean _tmp20_; + QuickTimeAtom* _tmp24_; #line 127 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp13_ = done; + _tmp12_ = done; #line 127 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (!(!_tmp13_)) { + if (!(!_tmp12_)) { #line 127 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 1054 "VideoMetadata.c" +#line 1133 "VideoMetadata.c" } #line 129 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp14_ = child; + _tmp13_ = child; #line 129 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - quick_time_atom_read_atom (_tmp14_, &_inner_error_); + quick_time_atom_read_atom (_tmp13_, &_inner_error_); #line 129 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 129 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (child); -#line 1064 "VideoMetadata.c" +#line 1143 "VideoMetadata.c" goto __catch588_g_error; } #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp16_ = child; + _tmp15_ = child; #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp17_ = quick_time_atom_is_last_atom (_tmp16_); + if (quick_time_atom_is_last_atom (_tmp15_)) { #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp17_) { -#line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp15_ = TRUE; -#line 1075 "VideoMetadata.c" + _tmp14_ = TRUE; +#line 1152 "VideoMetadata.c" } else { - QuickTimeAtom* _tmp18_; - guint64 _tmp19_; -#line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp18_ = child; + QuickTimeAtom* _tmp16_; #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp19_ = quick_time_atom_section_size_remaining (_tmp18_); + _tmp16_ = child; #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp15_ = ((guint64) 0) == _tmp19_; -#line 1085 "VideoMetadata.c" + _tmp14_ = ((guint64) 0) == quick_time_atom_section_size_remaining (_tmp16_); +#line 1159 "VideoMetadata.c" } #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp15_) { + if (_tmp14_) { #line 131 "/home/jens/Source/shotwell/src/VideoMetadata.vala" done = TRUE; #line 132 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 1093 "VideoMetadata.c" +#line 1167 "VideoMetadata.c" } #line 135 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp20_ = child; + _tmp17_ = child; #line 135 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp21_ = quick_time_atom_get_current_atom_name (_tmp20_); + _tmp18_ = quick_time_atom_get_current_atom_name (_tmp17_); #line 135 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp22_ = _tmp21_; + _tmp19_ = _tmp18_; #line 135 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp23_ = g_strcmp0 ("mvhd", _tmp22_) == 0; + _tmp20_ = g_strcmp0 ("mvhd", _tmp19_) == 0; #line 135 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp19_); #line 135 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp23_) { -#line 1107 "VideoMetadata.c" - QuickTimeAtom* _tmp24_; - guint32 _tmp25_ = 0U; - QuickTimeAtom* _tmp26_; - guint32 _tmp27_; + if (_tmp20_) { +#line 1181 "VideoMetadata.c" + QuickTimeAtom* _tmp21_; + guint32 _tmp22_ = 0U; + QuickTimeAtom* _tmp23_; #line 137 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp24_ = child; + _tmp21_ = child; #line 137 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - quick_time_atom_read_uint32 (_tmp24_, &_inner_error_); + quick_time_atom_read_uint32 (_tmp21_, &_inner_error_); #line 137 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 137 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (child); -#line 1120 "VideoMetadata.c" +#line 1193 "VideoMetadata.c" goto __catch588_g_error; } #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp26_ = child; + _tmp23_ = child; #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp27_ = quick_time_atom_read_uint32 (_tmp26_, &_inner_error_); -#line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp25_ = _tmp27_; + _tmp22_ = quick_time_atom_read_uint32 (_tmp23_, &_inner_error_); #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (child); -#line 1133 "VideoMetadata.c" +#line 1204 "VideoMetadata.c" goto __catch588_g_error; } #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - timestamp = _tmp25_ - QUICK_TIME_METADATA_LOADER_QUICKTIME_EPOCH_ADJUSTMENT; + timestamp = _tmp22_ - QUICK_TIME_METADATA_LOADER_QUICKTIME_EPOCH_ADJUSTMENT; #line 140 "/home/jens/Source/shotwell/src/VideoMetadata.vala" done = TRUE; #line 141 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 1142 "VideoMetadata.c" +#line 1213 "VideoMetadata.c" } #line 143 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp28_ = child; + _tmp24_ = child; #line 143 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - quick_time_atom_next_atom (_tmp28_, &_inner_error_); + quick_time_atom_next_atom (_tmp24_, &_inner_error_); #line 143 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 143 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (child); -#line 1152 "VideoMetadata.c" +#line 1223 "VideoMetadata.c" goto __catch588_g_error; } } #line 125 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (child); -#line 1158 "VideoMetadata.c" +#line 1229 "VideoMetadata.c" } #line 146 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp29_ = test; + _tmp25_ = test; #line 146 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - quick_time_atom_next_atom (_tmp29_, &_inner_error_); + quick_time_atom_next_atom (_tmp25_, &_inner_error_); #line 146 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1166 "VideoMetadata.c" +#line 1237 "VideoMetadata.c" goto __catch588_g_error; } } @@ -1172,27 +1243,27 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q __catch588_g_error: { GError* e = NULL; - GError* _tmp30_; - const gchar* _tmp31_; + GError* _tmp26_; + const gchar* _tmp27_; #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala" e = _inner_error_; #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _inner_error_ = NULL; #line 149 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp30_ = e; + _tmp26_ = e; #line 149 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp31_ = _tmp30_->message; + _tmp27_ = _tmp26_->message; #line 149 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_debug ("VideoMetadata.vala:149: Error while testing for QuickTime file: %s", _tmp31_); + g_debug ("VideoMetadata.vala:149: Error while testing for QuickTime file: %s", _tmp27_); #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_error_free0 (e); -#line 1189 "VideoMetadata.c" +#line 1260 "VideoMetadata.c" } __finally588: #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1194 "VideoMetadata.c" - gulong _tmp32_ = 0UL; +#line 1265 "VideoMetadata.c" + gulong _tmp28_ = 0UL; #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (test); #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -1200,18 +1271,18 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_clear_error (&_inner_error_); #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return _tmp32_; -#line 1204 "VideoMetadata.c" + return _tmp28_; +#line 1275 "VideoMetadata.c" } { - QuickTimeAtom* _tmp33_; + QuickTimeAtom* _tmp29_; #line 153 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp33_ = test; + _tmp29_ = test; #line 153 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - quick_time_atom_close_file (_tmp33_, &_inner_error_); + quick_time_atom_close_file (_tmp29_, &_inner_error_); #line 153 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1214 "VideoMetadata.c" +#line 1285 "VideoMetadata.c" goto __catch589_g_error; } } @@ -1219,27 +1290,27 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q __catch589_g_error: { GError* e = NULL; - GError* _tmp34_; - const gchar* _tmp35_; + GError* _tmp30_; + const gchar* _tmp31_; #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala" e = _inner_error_; #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _inner_error_ = NULL; #line 155 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp34_ = e; + _tmp30_ = e; #line 155 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp35_ = _tmp34_->message; + _tmp31_ = _tmp30_->message; #line 155 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_debug ("VideoMetadata.vala:155: Error while closing Quicktime file: %s", _tmp35_); + g_debug ("VideoMetadata.vala:155: Error while closing Quicktime file: %s", _tmp31_); #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_error_free0 (e); -#line 1236 "VideoMetadata.c" +#line 1307 "VideoMetadata.c" } __finally589: #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1241 "VideoMetadata.c" - gulong _tmp36_ = 0UL; +#line 1312 "VideoMetadata.c" + gulong _tmp32_ = 0UL; #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (test); #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -1247,131 +1318,156 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_clear_error (&_inner_error_); #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return _tmp36_; -#line 1251 "VideoMetadata.c" + return _tmp32_; +#line 1322 "VideoMetadata.c" } #line 166 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp37_ = timestamp; + _tmp33_ = timestamp; #line 166 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp37_ < ((time_t) 0)) { -#line 1257 "VideoMetadata.c" - time_t _tmp38_; + if (_tmp33_ < ((time_t) 0)) { +#line 1328 "VideoMetadata.c" + time_t _tmp34_; #line 167 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp38_ = timestamp; + _tmp34_ = timestamp; #line 167 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - timestamp = _tmp38_ + QUICK_TIME_METADATA_LOADER_QUICKTIME_EPOCH_ADJUSTMENT; -#line 1263 "VideoMetadata.c" + timestamp = _tmp34_ + QUICK_TIME_METADATA_LOADER_QUICKTIME_EPOCH_ADJUSTMENT; +#line 1334 "VideoMetadata.c" } #line 169 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp39_ = timestamp; + _tmp35_ = timestamp; #line 169 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - result = (gulong) _tmp39_; + result = (gulong) _tmp35_; #line 169 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (test); #line 169 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 1273 "VideoMetadata.c" +#line 1344 "VideoMetadata.c" } -static void value_quick_time_metadata_loader_init (GValue* value) { +static void +value_quick_time_metadata_loader_init (GValue* value) +{ #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1280 "VideoMetadata.c" +#line 1353 "VideoMetadata.c" } -static void value_quick_time_metadata_loader_free_value (GValue* value) { +static void +value_quick_time_metadata_loader_free_value (GValue* value) +{ #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (value->data[0].v_pointer) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" quick_time_metadata_loader_unref (value->data[0].v_pointer); -#line 1289 "VideoMetadata.c" +#line 1364 "VideoMetadata.c" } } -static void value_quick_time_metadata_loader_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_quick_time_metadata_loader_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (src_value->data[0].v_pointer) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" dest_value->data[0].v_pointer = quick_time_metadata_loader_ref (src_value->data[0].v_pointer); -#line 1299 "VideoMetadata.c" +#line 1377 "VideoMetadata.c" } else { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 1303 "VideoMetadata.c" +#line 1381 "VideoMetadata.c" } } -static gpointer value_quick_time_metadata_loader_peek_pointer (const GValue* value) { +static gpointer +value_quick_time_metadata_loader_peek_pointer (const GValue* value) +{ #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return value->data[0].v_pointer; -#line 1311 "VideoMetadata.c" +#line 1391 "VideoMetadata.c" } -static gchar* value_quick_time_metadata_loader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_quick_time_metadata_loader_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (collect_values[0].v_pointer) { -#line 1318 "VideoMetadata.c" +#line 1403 "VideoMetadata.c" QuickTimeMetadataLoader * object; object = collect_values[0].v_pointer; #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (object->parent_instance.g_class == NULL) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1325 "VideoMetadata.c" +#line 1410 "VideoMetadata.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.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 1329 "VideoMetadata.c" +#line 1414 "VideoMetadata.c" } #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = quick_time_metadata_loader_ref (object); -#line 1333 "VideoMetadata.c" +#line 1418 "VideoMetadata.c" } else { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1337 "VideoMetadata.c" +#line 1422 "VideoMetadata.c" } #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 1341 "VideoMetadata.c" +#line 1426 "VideoMetadata.c" } -static gchar* value_quick_time_metadata_loader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_quick_time_metadata_loader_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ QuickTimeMetadataLoader ** object_p; object_p = collect_values[0].v_pointer; #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (!object_p) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1352 "VideoMetadata.c" +#line 1442 "VideoMetadata.c" } #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (!value->data[0].v_pointer) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = NULL; -#line 1358 "VideoMetadata.c" +#line 1448 "VideoMetadata.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = value->data[0].v_pointer; -#line 1362 "VideoMetadata.c" +#line 1452 "VideoMetadata.c" } else { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = quick_time_metadata_loader_ref (value->data[0].v_pointer); -#line 1366 "VideoMetadata.c" +#line 1456 "VideoMetadata.c" } #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 1370 "VideoMetadata.c" +#line 1460 "VideoMetadata.c" } -GParamSpec* param_spec_quick_time_metadata_loader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_quick_time_metadata_loader (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecQuickTimeMetadataLoader* spec; #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_QUICK_TIME_METADATA_LOADER), NULL); @@ -1381,20 +1477,25 @@ GParamSpec* param_spec_quick_time_metadata_loader (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return G_PARAM_SPEC (spec); -#line 1384 "VideoMetadata.c" +#line 1480 "VideoMetadata.c" } -gpointer value_get_quick_time_metadata_loader (const GValue* value) { +gpointer +value_get_quick_time_metadata_loader (const GValue* value) +{ #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_QUICK_TIME_METADATA_LOADER), NULL); #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return value->data[0].v_pointer; -#line 1393 "VideoMetadata.c" +#line 1491 "VideoMetadata.c" } -void value_set_quick_time_metadata_loader (GValue* value, gpointer v_object) { +void +value_set_quick_time_metadata_loader (GValue* value, + gpointer v_object) +{ QuickTimeMetadataLoader * old; #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_QUICK_TIME_METADATA_LOADER)); @@ -1410,22 +1511,25 @@ void value_set_quick_time_metadata_loader (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" quick_time_metadata_loader_ref (value->data[0].v_pointer); -#line 1413 "VideoMetadata.c" +#line 1514 "VideoMetadata.c" } else { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1417 "VideoMetadata.c" +#line 1518 "VideoMetadata.c" } #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (old) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" quick_time_metadata_loader_unref (old); -#line 1423 "VideoMetadata.c" +#line 1524 "VideoMetadata.c" } } -void value_take_quick_time_metadata_loader (GValue* value, gpointer v_object) { +void +value_take_quick_time_metadata_loader (GValue* value, + gpointer v_object) +{ QuickTimeMetadataLoader * old; #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_QUICK_TIME_METADATA_LOADER)); @@ -1439,44 +1543,50 @@ void value_take_quick_time_metadata_loader (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = v_object; -#line 1442 "VideoMetadata.c" +#line 1546 "VideoMetadata.c" } else { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1446 "VideoMetadata.c" +#line 1550 "VideoMetadata.c" } #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (old) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" quick_time_metadata_loader_unref (old); -#line 1452 "VideoMetadata.c" +#line 1556 "VideoMetadata.c" } } -static void quick_time_metadata_loader_class_init (QuickTimeMetadataLoaderClass * klass) { +static void +quick_time_metadata_loader_class_init (QuickTimeMetadataLoaderClass * klass) +{ #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" quick_time_metadata_loader_parent_class = g_type_class_peek_parent (klass); #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" ((QuickTimeMetadataLoaderClass *) klass)->finalize = quick_time_metadata_loader_finalize; #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_type_class_add_private (klass, sizeof (QuickTimeMetadataLoaderPrivate)); -#line 1464 "VideoMetadata.c" +#line 1570 "VideoMetadata.c" } -static void quick_time_metadata_loader_instance_init (QuickTimeMetadataLoader * self) { +static void +quick_time_metadata_loader_instance_init (QuickTimeMetadataLoader * self) +{ #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv = QUICK_TIME_METADATA_LOADER_GET_PRIVATE (self); #line 59 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv->file = NULL; #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->ref_count = 1; -#line 1475 "VideoMetadata.c" +#line 1583 "VideoMetadata.c" } -static void quick_time_metadata_loader_finalize (QuickTimeMetadataLoader * obj) { +static void +quick_time_metadata_loader_finalize (QuickTimeMetadataLoader * obj) +{ QuickTimeMetadataLoader * self; #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_QUICK_TIME_METADATA_LOADER, QuickTimeMetadataLoader); @@ -1484,11 +1594,13 @@ static void quick_time_metadata_loader_finalize (QuickTimeMetadataLoader * obj) g_signal_handlers_destroy (self); #line 59 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_object_unref0 (self->priv->file); -#line 1487 "VideoMetadata.c" +#line 1597 "VideoMetadata.c" } -GType quick_time_metadata_loader_get_type (void) { +GType +quick_time_metadata_loader_get_type (void) +{ static volatile gsize quick_time_metadata_loader_type_id__volatile = 0; if (g_once_init_enter (&quick_time_metadata_loader_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_quick_time_metadata_loader_init, value_quick_time_metadata_loader_free_value, value_quick_time_metadata_loader_copy_value, value_quick_time_metadata_loader_peek_pointer, "p", value_quick_time_metadata_loader_collect_value, "p", value_quick_time_metadata_loader_lcopy_value }; @@ -1502,18 +1614,22 @@ GType quick_time_metadata_loader_get_type (void) { } -gpointer quick_time_metadata_loader_ref (gpointer instance) { +gpointer +quick_time_metadata_loader_ref (gpointer instance) +{ QuickTimeMetadataLoader * self; self = instance; #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_atomic_int_inc (&self->ref_count); #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return instance; -#line 1512 "VideoMetadata.c" +#line 1626 "VideoMetadata.c" } -void quick_time_metadata_loader_unref (gpointer instance) { +void +quick_time_metadata_loader_unref (gpointer instance) +{ QuickTimeMetadataLoader * self; self = instance; #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -1522,53 +1638,59 @@ void quick_time_metadata_loader_unref (gpointer instance) { QUICK_TIME_METADATA_LOADER_GET_CLASS (self)->finalize (self); #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1525 "VideoMetadata.c" +#line 1641 "VideoMetadata.c" } } -QuickTimeAtom* quick_time_atom_construct (GType object_type, GFile* file) { +QuickTimeAtom* +quick_time_atom_construct (GType object_type, + GFile* file) +{ QuickTimeAtom* self = NULL; GFile* _tmp0_; - GFile* _tmp1_; #line 181 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 181 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self = (QuickTimeAtom*) g_type_create_instance (object_type); #line 182 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = file; -#line 182 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (file); #line 182 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_object_unref0 (self->priv->file); #line 182 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - self->priv->file = _tmp1_; + self->priv->file = _tmp0_; #line 181 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return self; -#line 1548 "VideoMetadata.c" +#line 1664 "VideoMetadata.c" } -QuickTimeAtom* quick_time_atom_new (GFile* file) { +QuickTimeAtom* +quick_time_atom_new (GFile* file) +{ #line 181 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return quick_time_atom_construct (TYPE_QUICK_TIME_ATOM, file); -#line 1555 "VideoMetadata.c" +#line 1673 "VideoMetadata.c" } -static gpointer _quick_time_atom_ref0 (gpointer self) { +static gpointer +_quick_time_atom_ref0 (gpointer self) +{ #line 187 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return self ? quick_time_atom_ref (self) : NULL; -#line 1562 "VideoMetadata.c" +#line 1682 "VideoMetadata.c" } -static QuickTimeAtom* quick_time_atom_construct_with_input_stream (GType object_type, GDataInputStream* input, QuickTimeAtom* parent) { +static QuickTimeAtom* +quick_time_atom_construct_with_input_stream (GType object_type, + GDataInputStream* input, + QuickTimeAtom* parent) +{ QuickTimeAtom* self = NULL; GDataInputStream* _tmp0_; - GDataInputStream* _tmp1_; - QuickTimeAtom* _tmp2_; - QuickTimeAtom* _tmp3_; + QuickTimeAtom* _tmp1_; #line 185 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (G_IS_DATA_INPUT_STREAM (input), NULL); #line 185 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -1576,35 +1698,37 @@ static QuickTimeAtom* quick_time_atom_construct_with_input_stream (GType object_ #line 185 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self = (QuickTimeAtom*) g_type_create_instance (object_type); #line 186 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = input; -#line 186 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (input); #line 186 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_object_unref0 (self->priv->input); #line 186 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - self->priv->input = _tmp1_; -#line 187 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp2_ = parent; + self->priv->input = _tmp0_; #line 187 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp3_ = _quick_time_atom_ref0 (_tmp2_); + _tmp1_ = _quick_time_atom_ref0 (parent); #line 187 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (self->priv->parent); #line 187 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - self->priv->parent = _tmp3_; + self->priv->parent = _tmp1_; #line 185 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return self; -#line 1596 "VideoMetadata.c" +#line 1714 "VideoMetadata.c" } -static QuickTimeAtom* quick_time_atom_new_with_input_stream (GDataInputStream* input, QuickTimeAtom* parent) { +static QuickTimeAtom* +quick_time_atom_new_with_input_stream (GDataInputStream* input, + QuickTimeAtom* parent) +{ #line 185 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return quick_time_atom_construct_with_input_stream (TYPE_QUICK_TIME_ATOM, input, parent); -#line 1603 "VideoMetadata.c" +#line 1724 "VideoMetadata.c" } -void quick_time_atom_open_file (QuickTimeAtom* self, GError** error) { +void +quick_time_atom_open_file (QuickTimeAtom* self, + GError** error) +{ GFileInputStream* _tmp0_ = NULL; GFile* _tmp1_; GFileInputStream* _tmp2_; @@ -1622,7 +1746,7 @@ void quick_time_atom_open_file (QuickTimeAtom* self, GError** error) { g_propagate_error (error, _inner_error_); #line 191 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 1625 "VideoMetadata.c" +#line 1749 "VideoMetadata.c" } #line 192 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp1_ = self->priv->file; @@ -1636,7 +1760,7 @@ void quick_time_atom_open_file (QuickTimeAtom* self, GError** error) { g_propagate_error (error, _inner_error_); #line 192 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 1639 "VideoMetadata.c" +#line 1763 "VideoMetadata.c" } #line 192 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream)); @@ -1660,11 +1784,14 @@ void quick_time_atom_open_file (QuickTimeAtom* self, GError** error) { self->priv->section_name = _tmp5_; #line 190 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_object_unref0 (_tmp0_); -#line 1663 "VideoMetadata.c" +#line 1787 "VideoMetadata.c" } -void quick_time_atom_close_file (QuickTimeAtom* self, GError** error) { +void +quick_time_atom_close_file (QuickTimeAtom* self, + GError** error) +{ GDataInputStream* _tmp0_; GError * _inner_error_ = NULL; #line 199 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -1673,7 +1800,7 @@ void quick_time_atom_close_file (QuickTimeAtom* self, GError** error) { _tmp0_ = self->priv->input; #line 200 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (NULL != _tmp0_) { -#line 1676 "VideoMetadata.c" +#line 1803 "VideoMetadata.c" GDataInputStream* _tmp1_; #line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp1_ = self->priv->input; @@ -1685,48 +1812,47 @@ void quick_time_atom_close_file (QuickTimeAtom* self, GError** error) { g_propagate_error (error, _inner_error_); #line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 1688 "VideoMetadata.c" +#line 1815 "VideoMetadata.c" } #line 202 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_object_unref0 (self->priv->input); #line 202 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv->input = NULL; -#line 1694 "VideoMetadata.c" +#line 1821 "VideoMetadata.c" } } -static void quick_time_atom_advance_section_offset (QuickTimeAtom* self, guint64 amount) { +static void +quick_time_atom_advance_section_offset (QuickTimeAtom* self, + guint64 amount) +{ guint64 _tmp0_; - guint64 _tmp1_; - QuickTimeAtom* _tmp2_; + QuickTimeAtom* _tmp1_; #line 206 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_if_fail (IS_QUICK_TIME_ATOM (self)); #line 207 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp0_ = self->priv->section_offset; #line 207 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp1_ = amount; -#line 207 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - self->priv->section_offset = _tmp0_ + _tmp1_; + self->priv->section_offset = _tmp0_ + amount; #line 208 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp2_ = self->priv->parent; + _tmp1_ = self->priv->parent; #line 208 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (NULL != _tmp2_) { -#line 1715 "VideoMetadata.c" - QuickTimeAtom* _tmp3_; - guint64 _tmp4_; -#line 209 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp3_ = self->priv->parent; + if (NULL != _tmp1_) { +#line 1842 "VideoMetadata.c" + QuickTimeAtom* _tmp2_; #line 209 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp4_ = amount; + _tmp2_ = self->priv->parent; #line 209 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - quick_time_atom_advance_section_offset (_tmp3_, _tmp4_); -#line 1724 "VideoMetadata.c" + quick_time_atom_advance_section_offset (_tmp2_, amount); +#line 1848 "VideoMetadata.c" } } -QuickTimeAtom* quick_time_atom_get_first_child_atom (QuickTimeAtom* self) { +QuickTimeAtom* +quick_time_atom_get_first_child_atom (QuickTimeAtom* self) +{ QuickTimeAtom* result = NULL; GDataInputStream* _tmp0_; QuickTimeAtom* _tmp1_; @@ -1740,15 +1866,17 @@ QuickTimeAtom* quick_time_atom_get_first_child_atom (QuickTimeAtom* self) { result = _tmp1_; #line 219 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 1743 "VideoMetadata.c" +#line 1869 "VideoMetadata.c" } -guchar quick_time_atom_read_byte (QuickTimeAtom* self, GError** error) { +guchar +quick_time_atom_read_byte (QuickTimeAtom* self, + GError** error) +{ guchar result = '\0'; guint8 _tmp0_ = 0U; GDataInputStream* _tmp1_; - guint8 _tmp2_; GError * _inner_error_ = NULL; #line 222 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (IS_QUICK_TIME_ATOM (self), '\0'); @@ -1757,32 +1885,32 @@ guchar quick_time_atom_read_byte (QuickTimeAtom* self, GError** error) { #line 224 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp1_ = self->priv->input; #line 224 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp2_ = g_data_input_stream_read_byte (_tmp1_, NULL, &_inner_error_); -#line 224 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = _tmp2_; + _tmp0_ = g_data_input_stream_read_byte (_tmp1_, NULL, &_inner_error_); #line 224 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1765 "VideoMetadata.c" - guchar _tmp3_ = '\0'; +#line 1891 "VideoMetadata.c" + guchar _tmp2_ = '\0'; #line 224 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 224 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return _tmp3_; -#line 1771 "VideoMetadata.c" + return _tmp2_; +#line 1897 "VideoMetadata.c" } #line 224 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = (guchar) _tmp0_; #line 224 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 1777 "VideoMetadata.c" +#line 1903 "VideoMetadata.c" } -guint32 quick_time_atom_read_uint32 (QuickTimeAtom* self, GError** error) { +guint32 +quick_time_atom_read_uint32 (QuickTimeAtom* self, + GError** error) +{ guint32 result = 0U; guint32 _tmp0_ = 0U; GDataInputStream* _tmp1_; - guint32 _tmp2_; GError * _inner_error_ = NULL; #line 227 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (IS_QUICK_TIME_ATOM (self), 0U); @@ -1791,32 +1919,32 @@ guint32 quick_time_atom_read_uint32 (QuickTimeAtom* self, GError** error) { #line 229 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp1_ = self->priv->input; #line 229 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp2_ = g_data_input_stream_read_uint32 (_tmp1_, NULL, &_inner_error_); -#line 229 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = _tmp2_; + _tmp0_ = g_data_input_stream_read_uint32 (_tmp1_, NULL, &_inner_error_); #line 229 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1799 "VideoMetadata.c" - guint32 _tmp3_ = 0U; +#line 1925 "VideoMetadata.c" + guint32 _tmp2_ = 0U; #line 229 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 229 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return _tmp3_; -#line 1805 "VideoMetadata.c" + return _tmp2_; +#line 1931 "VideoMetadata.c" } #line 229 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = _tmp0_; #line 229 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 1811 "VideoMetadata.c" +#line 1937 "VideoMetadata.c" } -guint64 quick_time_atom_read_uint64 (QuickTimeAtom* self, GError** error) { +guint64 +quick_time_atom_read_uint64 (QuickTimeAtom* self, + GError** error) +{ guint64 result = 0ULL; guint64 _tmp0_ = 0ULL; GDataInputStream* _tmp1_; - guint64 _tmp2_; GError * _inner_error_ = NULL; #line 232 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (IS_QUICK_TIME_ATOM (self), 0ULL); @@ -1825,94 +1953,86 @@ guint64 quick_time_atom_read_uint64 (QuickTimeAtom* self, GError** error) { #line 234 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp1_ = self->priv->input; #line 234 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp2_ = g_data_input_stream_read_uint64 (_tmp1_, NULL, &_inner_error_); -#line 234 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = _tmp2_; + _tmp0_ = g_data_input_stream_read_uint64 (_tmp1_, NULL, &_inner_error_); #line 234 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1833 "VideoMetadata.c" - guint64 _tmp3_ = 0ULL; +#line 1959 "VideoMetadata.c" + guint64 _tmp2_ = 0ULL; #line 234 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 234 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return _tmp3_; -#line 1839 "VideoMetadata.c" + return _tmp2_; +#line 1965 "VideoMetadata.c" } #line 234 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = _tmp0_; #line 234 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 1845 "VideoMetadata.c" +#line 1971 "VideoMetadata.c" } -static gchar string_get (const gchar* self, glong index) { +static gchar +string_get (const gchar* self, + glong index) +{ gchar result = '\0'; - glong _tmp0_; - gchar _tmp1_; -#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar _tmp0_; +#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = index; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = ((gchar*) self)[index]; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1863 "VideoMetadata.c" +#line 1989 "VideoMetadata.c" } -void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) { +void +quick_time_atom_read_atom (QuickTimeAtom* self, + GError** error) +{ guint32 _tmp0_ = 0U; - guint32 _tmp1_; GString* sb = NULL; - GString* _tmp2_; - guchar _tmp3_ = '\0'; - guchar _tmp4_; + GString* _tmp1_; + guchar _tmp2_ = '\0'; + GString* _tmp3_; + guchar _tmp4_ = '\0'; GString* _tmp5_; guchar _tmp6_ = '\0'; - guchar _tmp7_; - GString* _tmp8_; - guchar _tmp9_ = '\0'; - guchar _tmp10_; - GString* _tmp11_; - guchar _tmp12_ = '\0'; - guchar _tmp13_; - GString* _tmp14_; - GString* _tmp15_; - const gchar* _tmp16_; - gchar* _tmp17_; - const gchar* _tmp18_; - gint _tmp19_; - gint _tmp20_; - guint64 _tmp41_; + GString* _tmp7_; + guchar _tmp8_ = '\0'; + GString* _tmp9_; + GString* _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + const gchar* _tmp13_; + gint _tmp14_; + gint _tmp15_; + guint64 _tmp34_; GError * _inner_error_ = NULL; #line 237 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_if_fail (IS_QUICK_TIME_ATOM (self)); #line 239 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp1_ = quick_time_atom_read_uint32 (self, &_inner_error_); -#line 239 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = _tmp1_; + _tmp0_ = quick_time_atom_read_uint32 (self, &_inner_error_); #line 239 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 239 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 239 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 1904 "VideoMetadata.c" +#line 2026 "VideoMetadata.c" } #line 239 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv->section_size = (guint64) _tmp0_; #line 242 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp2_ = g_string_new (""); + _tmp1_ = g_string_new (""); #line 242 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - sb = _tmp2_; + sb = _tmp1_; #line 243 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp4_ = quick_time_atom_read_byte (self, &_inner_error_); -#line 243 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp3_ = _tmp4_; + _tmp2_ = quick_time_atom_read_byte (self, &_inner_error_); #line 243 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 243 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -1921,16 +2041,14 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) { _g_string_free0 (sb); #line 243 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 1924 "VideoMetadata.c" +#line 2044 "VideoMetadata.c" } #line 243 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp5_ = sb; + _tmp3_ = sb; #line 243 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_string_append_c (_tmp5_, (gchar) _tmp3_); -#line 244 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp7_ = quick_time_atom_read_byte (self, &_inner_error_); + g_string_append_c (_tmp3_, (gchar) _tmp2_); #line 244 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp6_ = _tmp7_; + _tmp4_ = quick_time_atom_read_byte (self, &_inner_error_); #line 244 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 244 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -1939,16 +2057,14 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) { _g_string_free0 (sb); #line 244 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 1942 "VideoMetadata.c" +#line 2060 "VideoMetadata.c" } #line 244 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp8_ = sb; + _tmp5_ = sb; #line 244 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_string_append_c (_tmp8_, (gchar) _tmp6_); -#line 245 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp10_ = quick_time_atom_read_byte (self, &_inner_error_); + g_string_append_c (_tmp5_, (gchar) _tmp4_); #line 245 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp9_ = _tmp10_; + _tmp6_ = quick_time_atom_read_byte (self, &_inner_error_); #line 245 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 245 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -1957,16 +2073,14 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) { _g_string_free0 (sb); #line 245 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 1960 "VideoMetadata.c" +#line 2076 "VideoMetadata.c" } #line 245 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp11_ = sb; + _tmp7_ = sb; #line 245 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_string_append_c (_tmp11_, (gchar) _tmp9_); + g_string_append_c (_tmp7_, (gchar) _tmp6_); #line 246 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp13_ = quick_time_atom_read_byte (self, &_inner_error_); -#line 246 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp12_ = _tmp13_; + _tmp8_ = quick_time_atom_read_byte (self, &_inner_error_); #line 246 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 246 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -1975,156 +2089,147 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) { _g_string_free0 (sb); #line 246 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 1978 "VideoMetadata.c" +#line 2092 "VideoMetadata.c" } #line 246 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp14_ = sb; + _tmp9_ = sb; #line 246 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_string_append_c (_tmp14_, (gchar) _tmp12_); + g_string_append_c (_tmp9_, (gchar) _tmp8_); #line 247 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp15_ = sb; + _tmp10_ = sb; #line 247 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp16_ = _tmp15_->str; + _tmp11_ = _tmp10_->str; #line 247 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp17_ = g_strdup (_tmp16_); + _tmp12_ = g_strdup (_tmp11_); #line 247 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (self->priv->section_name); #line 247 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - self->priv->section_name = _tmp17_; + self->priv->section_name = _tmp12_; #line 250 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp18_ = self->priv->section_name; + _tmp13_ = self->priv->section_name; #line 250 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp19_ = strlen (_tmp18_); + _tmp14_ = strlen (_tmp13_); #line 250 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp20_ = _tmp19_; + _tmp15_ = _tmp14_; #line 250 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp20_ != 4) { -#line 2002 "VideoMetadata.c" - GFile* _tmp21_; - gchar* _tmp22_; - gchar* _tmp23_; - GError* _tmp24_; - GError* _tmp25_; + if (_tmp15_ != 4) { +#line 2116 "VideoMetadata.c" + GFile* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + GError* _tmp19_; + GError* _tmp20_; #line 251 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp21_ = self->priv->file; + _tmp16_ = self->priv->file; #line 251 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp22_ = g_file_get_path (_tmp21_); + _tmp17_ = g_file_get_path (_tmp16_); #line 251 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp23_ = _tmp22_; + _tmp18_ = _tmp17_; #line 251 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp24_ = g_error_new (G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "QuickTime atom name length is invalid for %s", _tmp23_); + _tmp19_ = g_error_new (G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "QuickTime atom name length is invalid for %s", _tmp18_); #line 251 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp25_ = _tmp24_; + _tmp20_ = _tmp19_; #line 251 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _g_free0 (_tmp23_); + _g_free0 (_tmp18_); #line 251 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _inner_error_ = _tmp25_; + _inner_error_ = _tmp20_; #line 251 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 251 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_string_free0 (sb); #line 251 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 2028 "VideoMetadata.c" +#line 2142 "VideoMetadata.c" } { gint i = 0; #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" i = 0; -#line 2034 "VideoMetadata.c" +#line 2148 "VideoMetadata.c" { - gboolean _tmp26_ = FALSE; + gboolean _tmp21_ = FALSE; #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp26_ = TRUE; + _tmp21_ = TRUE; #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" while (TRUE) { -#line 2041 "VideoMetadata.c" +#line 2155 "VideoMetadata.c" + gint _tmp23_; + const gchar* _tmp24_; + gint _tmp25_; + gint _tmp26_; + const gchar* _tmp27_; gint _tmp28_; - const gchar* _tmp29_; - gint _tmp30_; - gint _tmp31_; - const gchar* _tmp32_; - gint _tmp33_; - gchar _tmp34_; - gboolean _tmp35_; #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (!_tmp26_) { -#line 2052 "VideoMetadata.c" - gint _tmp27_; + if (!_tmp21_) { +#line 2164 "VideoMetadata.c" + gint _tmp22_; #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp27_ = i; + _tmp22_ = i; #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - i = _tmp27_ + 1; -#line 2058 "VideoMetadata.c" + i = _tmp22_ + 1; +#line 2170 "VideoMetadata.c" } #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp26_ = FALSE; + _tmp21_ = FALSE; #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp28_ = i; + _tmp23_ = i; #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp29_ = self->priv->section_name; + _tmp24_ = self->priv->section_name; #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp30_ = strlen (_tmp29_); + _tmp25_ = strlen (_tmp24_); #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp31_ = _tmp30_; + _tmp26_ = _tmp25_; #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (!(_tmp28_ < _tmp31_)) { + if (!(_tmp23_ < _tmp26_)) { #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 2074 "VideoMetadata.c" +#line 2186 "VideoMetadata.c" } #line 255 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp32_ = self->priv->section_name; -#line 255 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp33_ = i; + _tmp27_ = self->priv->section_name; #line 255 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp34_ = string_get (_tmp32_, (glong) _tmp33_); -#line 255 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp35_ = g_ascii_isprint (_tmp34_); + _tmp28_ = i; #line 255 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (!_tmp35_) { -#line 2086 "VideoMetadata.c" - GFile* _tmp36_; - gchar* _tmp37_; - gchar* _tmp38_; - GError* _tmp39_; - GError* _tmp40_; + if (!g_ascii_isprint (string_get (_tmp27_, (glong) _tmp28_))) { +#line 2194 "VideoMetadata.c" + GFile* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + GError* _tmp32_; + GError* _tmp33_; #line 256 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp36_ = self->priv->file; + _tmp29_ = self->priv->file; #line 256 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp37_ = g_file_get_path (_tmp36_); + _tmp30_ = g_file_get_path (_tmp29_); #line 256 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp38_ = _tmp37_; + _tmp31_ = _tmp30_; #line 256 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp39_ = g_error_new (G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "Bad QuickTime atom in file %s", _tmp38_); + _tmp32_ = g_error_new (G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "Bad QuickTime atom in file %s", _tmp31_); #line 256 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp40_ = _tmp39_; + _tmp33_ = _tmp32_; #line 256 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _g_free0 (_tmp38_); + _g_free0 (_tmp31_); #line 256 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _inner_error_ = _tmp40_; + _inner_error_ = _tmp33_; #line 256 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 256 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_string_free0 (sb); #line 256 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 2112 "VideoMetadata.c" +#line 2220 "VideoMetadata.c" } } } } #line 260 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp41_ = self->priv->section_size; + _tmp34_ = self->priv->section_size; #line 260 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (((guint64) 1) == _tmp41_) { -#line 2121 "VideoMetadata.c" - guint64 _tmp42_ = 0ULL; - guint64 _tmp43_; -#line 263 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp43_ = quick_time_atom_read_uint64 (self, &_inner_error_); + if (((guint64) 1) == _tmp34_) { +#line 2229 "VideoMetadata.c" + guint64 _tmp35_ = 0ULL; #line 263 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp42_ = _tmp43_; + _tmp35_ = quick_time_atom_read_uint64 (self, &_inner_error_); #line 263 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 263 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -2133,42 +2238,45 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) { _g_string_free0 (sb); #line 263 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 2136 "VideoMetadata.c" +#line 2241 "VideoMetadata.c" } #line 263 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - self->priv->section_size = _tmp42_; -#line 2140 "VideoMetadata.c" + self->priv->section_size = _tmp35_; +#line 2245 "VideoMetadata.c" } #line 237 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_string_free0 (sb); -#line 2144 "VideoMetadata.c" +#line 2249 "VideoMetadata.c" } -static void quick_time_atom_skip (QuickTimeAtom* self, guint64 skip_amount, GError** error) { +static void +quick_time_atom_skip (QuickTimeAtom* self, + guint64 skip_amount, + GError** error) +{ GDataInputStream* _tmp0_; - guint64 _tmp1_; GError * _inner_error_ = NULL; #line 267 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_if_fail (IS_QUICK_TIME_ATOM (self)); #line 268 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp0_ = self->priv->input; #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_input_stream_get_type (), GInputStream), _tmp1_, &_inner_error_); + skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream), skip_amount, &_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" g_propagate_error (error, _inner_error_); #line 268 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 2166 "VideoMetadata.c" +#line 2272 "VideoMetadata.c" } } -guint64 quick_time_atom_section_size_remaining (QuickTimeAtom* self) { +guint64 +quick_time_atom_section_size_remaining (QuickTimeAtom* self) +{ guint64 result = 0ULL; guint64 _tmp0_; guint64 _tmp1_; @@ -2190,36 +2298,38 @@ guint64 quick_time_atom_section_size_remaining (QuickTimeAtom* self) { result = _tmp2_ - _tmp3_; #line 273 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 2193 "VideoMetadata.c" +#line 2301 "VideoMetadata.c" } -void quick_time_atom_next_atom (QuickTimeAtom* self, GError** error) { - guint64 _tmp0_; +void +quick_time_atom_next_atom (QuickTimeAtom* self, + GError** error) +{ GError * _inner_error_ = NULL; #line 276 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_if_fail (IS_QUICK_TIME_ATOM (self)); #line 277 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = quick_time_atom_section_size_remaining (self); -#line 277 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - quick_time_atom_skip (self, _tmp0_, &_inner_error_); + quick_time_atom_skip (self, quick_time_atom_section_size_remaining (self), &_inner_error_); #line 277 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 277 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 277 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 2212 "VideoMetadata.c" +#line 2320 "VideoMetadata.c" } #line 278 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv->section_size = (guint64) 0; #line 279 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv->section_offset = (guint64) 0; -#line 2218 "VideoMetadata.c" +#line 2326 "VideoMetadata.c" } -gchar* quick_time_atom_get_current_atom_name (QuickTimeAtom* self) { +gchar* +quick_time_atom_get_current_atom_name (QuickTimeAtom* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -2233,11 +2343,13 @@ gchar* quick_time_atom_get_current_atom_name (QuickTimeAtom* self) { result = _tmp1_; #line 283 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 2236 "VideoMetadata.c" +#line 2346 "VideoMetadata.c" } -gboolean quick_time_atom_is_last_atom (QuickTimeAtom* self) { +gboolean +quick_time_atom_is_last_atom (QuickTimeAtom* self) +{ gboolean result = FALSE; guint64 _tmp0_; #line 286 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -2248,108 +2360,133 @@ gboolean quick_time_atom_is_last_atom (QuickTimeAtom* self) { result = ((guint64) 0) == _tmp0_; #line 287 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 2251 "VideoMetadata.c" +#line 2363 "VideoMetadata.c" } -static void value_quick_time_atom_init (GValue* value) { +static void +value_quick_time_atom_init (GValue* value) +{ #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2258 "VideoMetadata.c" +#line 2372 "VideoMetadata.c" } -static void value_quick_time_atom_free_value (GValue* value) { +static void +value_quick_time_atom_free_value (GValue* value) +{ #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (value->data[0].v_pointer) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" quick_time_atom_unref (value->data[0].v_pointer); -#line 2267 "VideoMetadata.c" +#line 2383 "VideoMetadata.c" } } -static void value_quick_time_atom_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_quick_time_atom_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (src_value->data[0].v_pointer) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" dest_value->data[0].v_pointer = quick_time_atom_ref (src_value->data[0].v_pointer); -#line 2277 "VideoMetadata.c" +#line 2396 "VideoMetadata.c" } else { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 2281 "VideoMetadata.c" +#line 2400 "VideoMetadata.c" } } -static gpointer value_quick_time_atom_peek_pointer (const GValue* value) { +static gpointer +value_quick_time_atom_peek_pointer (const GValue* value) +{ #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return value->data[0].v_pointer; -#line 2289 "VideoMetadata.c" +#line 2410 "VideoMetadata.c" } -static gchar* value_quick_time_atom_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_quick_time_atom_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (collect_values[0].v_pointer) { -#line 2296 "VideoMetadata.c" +#line 2422 "VideoMetadata.c" QuickTimeAtom * object; object = collect_values[0].v_pointer; #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (object->parent_instance.g_class == NULL) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2303 "VideoMetadata.c" +#line 2429 "VideoMetadata.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.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 2307 "VideoMetadata.c" +#line 2433 "VideoMetadata.c" } #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = quick_time_atom_ref (object); -#line 2311 "VideoMetadata.c" +#line 2437 "VideoMetadata.c" } else { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2315 "VideoMetadata.c" +#line 2441 "VideoMetadata.c" } #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 2319 "VideoMetadata.c" +#line 2445 "VideoMetadata.c" } -static gchar* value_quick_time_atom_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_quick_time_atom_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ QuickTimeAtom ** object_p; object_p = collect_values[0].v_pointer; #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (!object_p) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2330 "VideoMetadata.c" +#line 2461 "VideoMetadata.c" } #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (!value->data[0].v_pointer) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = NULL; -#line 2336 "VideoMetadata.c" +#line 2467 "VideoMetadata.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = value->data[0].v_pointer; -#line 2340 "VideoMetadata.c" +#line 2471 "VideoMetadata.c" } else { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = quick_time_atom_ref (value->data[0].v_pointer); -#line 2344 "VideoMetadata.c" +#line 2475 "VideoMetadata.c" } #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 2348 "VideoMetadata.c" +#line 2479 "VideoMetadata.c" } -GParamSpec* param_spec_quick_time_atom (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_quick_time_atom (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecQuickTimeAtom* spec; #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_QUICK_TIME_ATOM), NULL); @@ -2359,20 +2496,25 @@ GParamSpec* param_spec_quick_time_atom (const gchar* name, const gchar* nick, co G_PARAM_SPEC (spec)->value_type = object_type; #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return G_PARAM_SPEC (spec); -#line 2362 "VideoMetadata.c" +#line 2499 "VideoMetadata.c" } -gpointer value_get_quick_time_atom (const GValue* value) { +gpointer +value_get_quick_time_atom (const GValue* value) +{ #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_QUICK_TIME_ATOM), NULL); #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return value->data[0].v_pointer; -#line 2371 "VideoMetadata.c" +#line 2510 "VideoMetadata.c" } -void value_set_quick_time_atom (GValue* value, gpointer v_object) { +void +value_set_quick_time_atom (GValue* value, + gpointer v_object) +{ QuickTimeAtom * old; #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_QUICK_TIME_ATOM)); @@ -2388,22 +2530,25 @@ void value_set_quick_time_atom (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" quick_time_atom_ref (value->data[0].v_pointer); -#line 2391 "VideoMetadata.c" +#line 2533 "VideoMetadata.c" } else { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2395 "VideoMetadata.c" +#line 2537 "VideoMetadata.c" } #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (old) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" quick_time_atom_unref (old); -#line 2401 "VideoMetadata.c" +#line 2543 "VideoMetadata.c" } } -void value_take_quick_time_atom (GValue* value, gpointer v_object) { +void +value_take_quick_time_atom (GValue* value, + gpointer v_object) +{ QuickTimeAtom * old; #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_QUICK_TIME_ATOM)); @@ -2417,33 +2562,37 @@ void value_take_quick_time_atom (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = v_object; -#line 2420 "VideoMetadata.c" +#line 2565 "VideoMetadata.c" } else { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2424 "VideoMetadata.c" +#line 2569 "VideoMetadata.c" } #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (old) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" quick_time_atom_unref (old); -#line 2430 "VideoMetadata.c" +#line 2575 "VideoMetadata.c" } } -static void quick_time_atom_class_init (QuickTimeAtomClass * klass) { +static void +quick_time_atom_class_init (QuickTimeAtomClass * klass) +{ #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" quick_time_atom_parent_class = g_type_class_peek_parent (klass); #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" ((QuickTimeAtomClass *) klass)->finalize = quick_time_atom_finalize; #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_type_class_add_private (klass, sizeof (QuickTimeAtomPrivate)); -#line 2442 "VideoMetadata.c" +#line 2589 "VideoMetadata.c" } -static void quick_time_atom_instance_init (QuickTimeAtom * self) { +static void +quick_time_atom_instance_init (QuickTimeAtom * self) +{ gchar* _tmp0_; #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv = QUICK_TIME_ATOM_GET_PRIVATE (self); @@ -2463,11 +2612,13 @@ static void quick_time_atom_instance_init (QuickTimeAtom * self) { self->priv->parent = NULL; #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->ref_count = 1; -#line 2466 "VideoMetadata.c" +#line 2615 "VideoMetadata.c" } -static void quick_time_atom_finalize (QuickTimeAtom * obj) { +static void +quick_time_atom_finalize (QuickTimeAtom * obj) +{ QuickTimeAtom * self; #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_QUICK_TIME_ATOM, QuickTimeAtom); @@ -2481,11 +2632,13 @@ static void quick_time_atom_finalize (QuickTimeAtom * obj) { _g_object_unref0 (self->priv->input); #line 179 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (self->priv->parent); -#line 2484 "VideoMetadata.c" +#line 2635 "VideoMetadata.c" } -GType quick_time_atom_get_type (void) { +GType +quick_time_atom_get_type (void) +{ static volatile gsize quick_time_atom_type_id__volatile = 0; if (g_once_init_enter (&quick_time_atom_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_quick_time_atom_init, value_quick_time_atom_free_value, value_quick_time_atom_copy_value, value_quick_time_atom_peek_pointer, "p", value_quick_time_atom_collect_value, "p", value_quick_time_atom_lcopy_value }; @@ -2499,18 +2652,22 @@ GType quick_time_atom_get_type (void) { } -gpointer quick_time_atom_ref (gpointer instance) { +gpointer +quick_time_atom_ref (gpointer instance) +{ QuickTimeAtom * self; self = instance; #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_atomic_int_inc (&self->ref_count); #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return instance; -#line 2509 "VideoMetadata.c" +#line 2664 "VideoMetadata.c" } -void quick_time_atom_unref (gpointer instance) { +void +quick_time_atom_unref (gpointer instance) +{ QuickTimeAtom * self; self = instance; #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -2519,59 +2676,62 @@ void quick_time_atom_unref (gpointer instance) { QUICK_TIME_ATOM_GET_CLASS (self)->finalize (self); #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2522 "VideoMetadata.c" +#line 2679 "VideoMetadata.c" } } -AVIMetadataLoader* avi_metadata_loader_construct (GType object_type, GFile* file) { +AVIMetadataLoader* +avi_metadata_loader_construct (GType object_type, + GFile* file) +{ AVIMetadataLoader* self = NULL; GFile* _tmp0_; - GFile* _tmp1_; #line 305 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 305 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self = (AVIMetadataLoader*) g_type_create_instance (object_type); #line 306 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = file; -#line 306 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (file); #line 306 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_object_unref0 (self->priv->file); #line 306 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - self->priv->file = _tmp1_; + self->priv->file = _tmp0_; #line 305 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return self; -#line 2545 "VideoMetadata.c" +#line 2702 "VideoMetadata.c" } -AVIMetadataLoader* avi_metadata_loader_new (GFile* file) { +AVIMetadataLoader* +avi_metadata_loader_new (GFile* file) +{ #line 305 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return avi_metadata_loader_construct (TYPE_AVI_METADATA_LOADER, file); -#line 2552 "VideoMetadata.c" +#line 2711 "VideoMetadata.c" } -MetadataDateTime* avi_metadata_loader_get_creation_date_time (AVIMetadataLoader* self) { +MetadataDateTime* +avi_metadata_loader_get_creation_date_time (AVIMetadataLoader* self) +{ MetadataDateTime* result = NULL; - gulong _tmp0_; - MetadataDateTime* _tmp1_; + MetadataDateTime* _tmp0_; #line 309 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (IS_AVI_METADATA_LOADER (self), NULL); #line 310 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = avi_metadata_loader_get_creation_date_time_for_avi (self); -#line 310 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp1_ = metadata_date_time_new ((time_t) _tmp0_); + _tmp0_ = metadata_date_time_new ((time_t) avi_metadata_loader_get_creation_date_time_for_avi (self)); #line 310 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - result = _tmp1_; + result = _tmp0_; #line 310 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 2570 "VideoMetadata.c" +#line 2728 "VideoMetadata.c" } -gchar* avi_metadata_loader_get_title (AVIMetadataLoader* self) { +gchar* +avi_metadata_loader_get_title (AVIMetadataLoader* self) +{ gchar* result = NULL; #line 313 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (IS_AVI_METADATA_LOADER (self), NULL); @@ -2579,11 +2739,13 @@ gchar* avi_metadata_loader_get_title (AVIMetadataLoader* self) { result = NULL; #line 315 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 2582 "VideoMetadata.c" +#line 2742 "VideoMetadata.c" } -gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { +gboolean +avi_metadata_loader_is_supported (AVIMetadataLoader* self) +{ gboolean result = FALSE; AVIChunk* chunk = NULL; GFile* _tmp0_; @@ -2600,7 +2762,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { chunk = _tmp1_; #line 321 "/home/jens/Source/shotwell/src/VideoMetadata.vala" ret = FALSE; -#line 2603 "VideoMetadata.c" +#line 2765 "VideoMetadata.c" { AVIChunk* _tmp2_; AVIChunk* _tmp3_; @@ -2615,7 +2777,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { avi_chunk_open_file (_tmp2_, &_inner_error_); #line 323 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2618 "VideoMetadata.c" +#line 2780 "VideoMetadata.c" goto __catch590_g_error; } #line 324 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -2624,7 +2786,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { avi_chunk_read_chunk (_tmp3_, &_inner_error_); #line 324 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2627 "VideoMetadata.c" +#line 2789 "VideoMetadata.c" goto __catch590_g_error; } #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -2639,7 +2801,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { _g_free0 (_tmp7_); #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (_tmp8_) { -#line 2642 "VideoMetadata.c" +#line 2804 "VideoMetadata.c" gchar* _tmp9_ = NULL; AVIChunk* _tmp10_; gchar* _tmp11_; @@ -2651,24 +2813,24 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { _tmp9_ = _tmp11_; #line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2654 "VideoMetadata.c" +#line 2816 "VideoMetadata.c" goto __catch590_g_error; } #line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp4_ = g_strcmp0 ("AVI ", _tmp9_) == 0; #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (_tmp9_); -#line 2661 "VideoMetadata.c" +#line 2823 "VideoMetadata.c" } else { #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp4_ = FALSE; -#line 2665 "VideoMetadata.c" +#line 2827 "VideoMetadata.c" } #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (_tmp4_) { #line 328 "/home/jens/Source/shotwell/src/VideoMetadata.vala" ret = TRUE; -#line 2671 "VideoMetadata.c" +#line 2833 "VideoMetadata.c" } } goto __finally590; @@ -2689,12 +2851,12 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { g_debug ("VideoMetadata.vala:331: Error while testing for AVI file: %s", _tmp13_); #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_error_free0 (e); -#line 2692 "VideoMetadata.c" +#line 2854 "VideoMetadata.c" } __finally590: #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2697 "VideoMetadata.c" +#line 2859 "VideoMetadata.c" gboolean _tmp14_ = FALSE; #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _avi_chunk_unref0 (chunk); @@ -2704,7 +2866,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { g_clear_error (&_inner_error_); #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return _tmp14_; -#line 2707 "VideoMetadata.c" +#line 2869 "VideoMetadata.c" } { AVIChunk* _tmp15_; @@ -2714,7 +2876,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { avi_chunk_close_file (_tmp15_, &_inner_error_); #line 335 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2717 "VideoMetadata.c" +#line 2879 "VideoMetadata.c" goto __catch591_g_error; } } @@ -2736,12 +2898,12 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { g_debug ("VideoMetadata.vala:337: Error while closing AVI file: %s", _tmp17_); #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_error_free0 (e); -#line 2739 "VideoMetadata.c" +#line 2901 "VideoMetadata.c" } __finally591: #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2744 "VideoMetadata.c" +#line 2906 "VideoMetadata.c" gboolean _tmp18_ = FALSE; #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _avi_chunk_unref0 (chunk); @@ -2751,7 +2913,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { g_clear_error (&_inner_error_); #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return _tmp18_; -#line 2754 "VideoMetadata.c" +#line 2916 "VideoMetadata.c" } #line 339 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = ret; @@ -2759,15 +2921,19 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { _avi_chunk_unref0 (chunk); #line 339 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 2762 "VideoMetadata.c" +#line 2924 "VideoMetadata.c" } -static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self, AVIChunk* chunk, GError** error) { +static gchar* +avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self, + AVIChunk* chunk, + GError** error) +{ gchar* result = NULL; gboolean found_date = FALSE; - gboolean _tmp9_; - gchar* _tmp21_; + gboolean _tmp2_; + gchar* _tmp12_; GError * _inner_error_ = NULL; #line 343 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (IS_AVI_METADATA_LOADER (self), NULL); @@ -2777,139 +2943,112 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self, found_date = FALSE; #line 345 "/home/jens/Source/shotwell/src/VideoMetadata.vala" while (TRUE) { -#line 2780 "VideoMetadata.c" - AVIChunk* _tmp0_; - guint64 _tmp1_; +#line 2946 "VideoMetadata.c" guint16 tag = 0U; - AVIChunk* _tmp2_; - guint16 _tmp3_; guint16 size = 0U; - AVIChunk* _tmp4_; - guint16 _tmp5_; - guint16 _tmp6_; - AVIChunk* _tmp7_; - guint16 _tmp8_; + guint16 _tmp0_; + guint16 _tmp1_; #line 345 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = chunk; -#line 345 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp1_ = avi_chunk_section_size_remaining (_tmp0_); -#line 345 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (!(_tmp1_ > ((guint64) (sizeof (guint16) * 2)))) { + if (!(avi_chunk_section_size_remaining (chunk) > ((guint64) (sizeof (guint16) * 2)))) { #line 345 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 2800 "VideoMetadata.c" +#line 2955 "VideoMetadata.c" } #line 346 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp2_ = chunk; -#line 346 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp3_ = avi_chunk_read_uint16 (_tmp2_, &_inner_error_); -#line 346 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - tag = _tmp3_; + tag = avi_chunk_read_uint16 (chunk, &_inner_error_); #line 346 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 346 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 346 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 2814 "VideoMetadata.c" +#line 2965 "VideoMetadata.c" } #line 347 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp4_ = chunk; -#line 347 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp5_ = avi_chunk_read_uint16 (_tmp4_, &_inner_error_); -#line 347 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - size = _tmp5_; + size = avi_chunk_read_uint16 (chunk, &_inner_error_); #line 347 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 347 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 347 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 2828 "VideoMetadata.c" +#line 2975 "VideoMetadata.c" } #line 348 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp6_ = tag; + _tmp0_ = tag; #line 348 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (AVI_METADATA_LOADER_NIKON_NCTG_TIMESTAMP_MARKER == _tmp6_) { + if (AVI_METADATA_LOADER_NIKON_NCTG_TIMESTAMP_MARKER == _tmp0_) { #line 349 "/home/jens/Source/shotwell/src/VideoMetadata.vala" found_date = TRUE; #line 350 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 2838 "VideoMetadata.c" +#line 2985 "VideoMetadata.c" } #line 352 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp7_ = chunk; -#line 352 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp8_ = size; + _tmp1_ = size; #line 352 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - avi_chunk_skip (_tmp7_, (guint64) _tmp8_, &_inner_error_); + avi_chunk_skip (chunk, (guint64) _tmp1_, &_inner_error_); #line 352 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 352 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 352 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 2852 "VideoMetadata.c" +#line 2997 "VideoMetadata.c" } } #line 355 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp9_ = found_date; + _tmp2_ = found_date; #line 355 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp9_) { -#line 2859 "VideoMetadata.c" + if (_tmp2_) { +#line 3004 "VideoMetadata.c" GString* sb = NULL; - GString* _tmp10_; - GString* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; + GString* _tmp3_; + GString* _tmp9_; + const gchar* _tmp10_; + gchar* _tmp11_; #line 357 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp10_ = g_string_new (""); + _tmp3_ = g_string_new (""); #line 357 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - sb = _tmp10_; -#line 2869 "VideoMetadata.c" + sb = _tmp3_; +#line 3014 "VideoMetadata.c" { gint i = 0; #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala" i = 0; -#line 2874 "VideoMetadata.c" +#line 3019 "VideoMetadata.c" { - gboolean _tmp11_ = FALSE; + gboolean _tmp4_ = FALSE; #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp11_ = TRUE; + _tmp4_ = TRUE; #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala" while (TRUE) { -#line 2881 "VideoMetadata.c" - gint _tmp13_; - guchar _tmp14_ = '\0'; - AVIChunk* _tmp15_; - guchar _tmp16_; - GString* _tmp17_; +#line 3026 "VideoMetadata.c" + gint _tmp6_; + guchar _tmp7_ = '\0'; + GString* _tmp8_; #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (!_tmp11_) { -#line 2889 "VideoMetadata.c" - gint _tmp12_; + if (!_tmp4_) { +#line 3032 "VideoMetadata.c" + gint _tmp5_; #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp12_ = i; + _tmp5_ = i; #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - i = _tmp12_ + 1; -#line 2895 "VideoMetadata.c" + i = _tmp5_ + 1; +#line 3038 "VideoMetadata.c" } #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp11_ = FALSE; + _tmp4_ = FALSE; #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp13_ = i; + _tmp6_ = i; #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (!(_tmp13_ < AVI_METADATA_LOADER_NUMERICAL_DATE_LENGTH)) { + if (!(_tmp6_ < AVI_METADATA_LOADER_NUMERICAL_DATE_LENGTH)) { #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 2905 "VideoMetadata.c" +#line 3048 "VideoMetadata.c" } #line 359 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp15_ = chunk; -#line 359 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp16_ = avi_chunk_read_byte (_tmp15_, &_inner_error_); -#line 359 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp14_ = _tmp16_; + _tmp7_ = avi_chunk_read_byte (chunk, &_inner_error_); #line 359 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 359 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -2918,307 +3057,245 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self, _g_string_free0 (sb); #line 359 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 2921 "VideoMetadata.c" +#line 3060 "VideoMetadata.c" } #line 359 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp17_ = sb; + _tmp8_ = sb; #line 359 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_string_append_c (_tmp17_, (gchar) _tmp14_); -#line 2927 "VideoMetadata.c" + g_string_append_c (_tmp8_, (gchar) _tmp7_); +#line 3066 "VideoMetadata.c" } } } #line 361 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp18_ = sb; + _tmp9_ = sb; #line 361 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp19_ = _tmp18_->str; + _tmp10_ = _tmp9_->str; #line 361 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp20_ = g_strdup (_tmp19_); + _tmp11_ = g_strdup (_tmp10_); #line 361 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - result = _tmp20_; + result = _tmp11_; #line 361 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_string_free0 (sb); #line 361 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 2943 "VideoMetadata.c" +#line 3082 "VideoMetadata.c" } #line 363 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp21_ = g_strdup (""); + _tmp12_ = g_strdup (""); #line 363 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - result = _tmp21_; + result = _tmp12_; #line 363 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 2951 "VideoMetadata.c" +#line 3090 "VideoMetadata.c" } -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, + glong maxlen) +{ glong result = 0L; gchar* end = NULL; gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 2974 "VideoMetadata.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2982 "VideoMetadata.c" +#line 3114 "VideoMetadata.c" } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2994 "VideoMetadata.c" +#line 3123 "VideoMetadata.c" } } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, + glong offset, + glong len) +{ gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + glong _tmp6_; + gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#line 3018 "VideoMetadata.c" - glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = _tmp2_ >= ((glong) 0); -#line 3024 "VideoMetadata.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = len >= ((glong) 0); +#line 3144 "VideoMetadata.c" } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 3028 "VideoMetadata.c" +#line 3148 "VideoMetadata.c" } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 3032 "VideoMetadata.c" - glong _tmp3_; - glong _tmp4_; - glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 3044 "VideoMetadata.c" +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = string_strnlen ((gchar*) self, offset + len); +#line 3154 "VideoMetadata.c" } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#line 3054 "VideoMetadata.c" + gint _tmp1_; + gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = (glong) _tmp2_; +#line 3164 "VideoMetadata.c" } -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp8_ < ((glong) 0)) { -#line 3060 "VideoMetadata.c" - glong _tmp9_; - glong _tmp10_; - glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 3074 "VideoMetadata.c" +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset < ((glong) 0)) { +#line 3168 "VideoMetadata.c" + glong _tmp3_; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 3176 "VideoMetadata.c" } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 3084 "VideoMetadata.c" + glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 3183 "VideoMetadata.c" } -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp14_ < ((glong) 0)) { -#line 3090 "VideoMetadata.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 3099 "VideoMetadata.c" +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (len < ((glong) 0)) { +#line 3187 "VideoMetadata.c" + glong _tmp5_; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp5_ - offset; +#line 3193 "VideoMetadata.c" } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 3119 "VideoMetadata.c" +#line 3205 "VideoMetadata.c" } -static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, AVIChunk* chunk, GError** error) { +static gchar* +avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, + AVIChunk* chunk, + GError** error) +{ gchar* result = NULL; - AVIChunk* _tmp0_; - AVIChunk* _tmp1_; gint colons = 0; gint post_colons = 0; GString* sb = NULL; - GString* _tmp2_; + GString* _tmp0_; + GString* _tmp15_; + const gchar* _tmp16_; + gint _tmp17_; + gint _tmp18_; GString* _tmp20_; const gchar* _tmp21_; - gint _tmp22_; - gint _tmp23_; - GString* _tmp25_; - const gchar* _tmp26_; - GString* _tmp27_; - const gchar* _tmp28_; - gint _tmp29_; - gint _tmp30_; - gchar* _tmp31_; + GString* _tmp22_; + const gchar* _tmp23_; + gint _tmp24_; + gint _tmp25_; + gchar* _tmp26_; GError * _inner_error_ = NULL; #line 368 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (IS_AVI_METADATA_LOADER (self), NULL); #line 368 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (IS_AVI_CHUNK (chunk), NULL); #line 369 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = chunk; -#line 369 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - avi_chunk_skip (_tmp0_, (guint64) 98, &_inner_error_); + avi_chunk_skip (chunk, (guint64) 98, &_inner_error_); #line 369 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 369 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 369 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 3157 "VideoMetadata.c" +#line 3243 "VideoMetadata.c" } #line 370 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp1_ = chunk; -#line 370 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - avi_chunk_skip (_tmp1_, (guint64) 8, &_inner_error_); + avi_chunk_skip (chunk, (guint64) 8, &_inner_error_); #line 370 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 370 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 370 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 3169 "VideoMetadata.c" +#line 3253 "VideoMetadata.c" } #line 372 "/home/jens/Source/shotwell/src/VideoMetadata.vala" colons = 0; #line 373 "/home/jens/Source/shotwell/src/VideoMetadata.vala" post_colons = 0; #line 374 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp2_ = g_string_new (""); + _tmp0_ = g_string_new (""); #line 374 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - sb = _tmp2_; + sb = _tmp0_; #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala" while (TRUE) { -#line 3181 "VideoMetadata.c" - gboolean _tmp3_ = FALSE; - gint _tmp4_; - guchar _tmp6_ = '\0'; - AVIChunk* _tmp7_; - guchar _tmp8_; +#line 3265 "VideoMetadata.c" + gboolean _tmp1_ = FALSE; + gint _tmp2_; + guchar _tmp4_ = '\0'; gchar c = '\0'; - gint _tmp9_; - gchar _tmp11_; - gchar _tmp13_; - gboolean _tmp14_; - GString* _tmp17_; - gssize _tmp18_; + gint _tmp5_; + gchar _tmp7_; + gchar _tmp9_; + GString* _tmp12_; + gssize _tmp13_; #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp4_ = colons; + _tmp2_ = colons; #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp4_ <= 4) { -#line 3198 "VideoMetadata.c" - gint _tmp5_; + if (_tmp2_ <= 4) { +#line 3279 "VideoMetadata.c" + gint _tmp3_; #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp5_ = post_colons; + _tmp3_ = post_colons; #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp3_ = _tmp5_ < 2; -#line 3204 "VideoMetadata.c" + _tmp1_ = _tmp3_ < 2; +#line 3285 "VideoMetadata.c" } else { #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp3_ = FALSE; -#line 3208 "VideoMetadata.c" + _tmp1_ = FALSE; +#line 3289 "VideoMetadata.c" } #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (!_tmp3_) { + if (!_tmp1_) { #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 3214 "VideoMetadata.c" +#line 3295 "VideoMetadata.c" } #line 377 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp7_ = chunk; -#line 377 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp8_ = avi_chunk_read_byte (_tmp7_, &_inner_error_); -#line 377 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp6_ = _tmp8_; + _tmp4_ = avi_chunk_read_byte (chunk, &_inner_error_); #line 377 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 377 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -3227,117 +3304,119 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A _g_string_free0 (sb); #line 377 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 3230 "VideoMetadata.c" +#line 3307 "VideoMetadata.c" } #line 377 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - c = (gchar) _tmp6_; + c = (gchar) _tmp4_; #line 378 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp9_ = colons; + _tmp5_ = colons; #line 378 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (4 == _tmp9_) { -#line 3238 "VideoMetadata.c" - gint _tmp10_; + if (4 == _tmp5_) { +#line 3315 "VideoMetadata.c" + gint _tmp6_; #line 379 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp10_ = post_colons; + _tmp6_ = post_colons; #line 379 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - post_colons = _tmp10_ + 1; -#line 3244 "VideoMetadata.c" + post_colons = _tmp6_ + 1; +#line 3321 "VideoMetadata.c" } #line 381 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp11_ = c; + _tmp7_ = c; #line 381 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (':' == _tmp11_) { -#line 3250 "VideoMetadata.c" - gint _tmp12_; + if (':' == _tmp7_) { +#line 3327 "VideoMetadata.c" + gint _tmp8_; #line 382 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp12_ = colons; + _tmp8_ = colons; #line 382 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - colons = _tmp12_ + 1; -#line 3256 "VideoMetadata.c" + colons = _tmp8_ + 1; +#line 3333 "VideoMetadata.c" } #line 384 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp13_ = c; -#line 384 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp14_ = g_ascii_isprint (_tmp13_); + _tmp9_ = c; #line 384 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp14_) { -#line 3264 "VideoMetadata.c" - GString* _tmp15_; - gchar _tmp16_; + if (g_ascii_isprint (_tmp9_)) { +#line 3339 "VideoMetadata.c" + GString* _tmp10_; + gchar _tmp11_; #line 385 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp15_ = sb; + _tmp10_ = sb; #line 385 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp16_ = c; + _tmp11_ = c; #line 385 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_string_append_c (_tmp15_, _tmp16_); -#line 3273 "VideoMetadata.c" + g_string_append_c (_tmp10_, _tmp11_); +#line 3348 "VideoMetadata.c" } #line 387 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp17_ = sb; + _tmp12_ = sb; #line 387 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp18_ = _tmp17_->len; + _tmp13_ = _tmp12_->len; #line 387 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp18_ > ((gssize) AVI_METADATA_LOADER_MAX_STRD_LENGTH)) { -#line 3281 "VideoMetadata.c" - gchar* _tmp19_; + if (_tmp13_ > ((gssize) AVI_METADATA_LOADER_MAX_STRD_LENGTH)) { +#line 3356 "VideoMetadata.c" + gchar* _tmp14_; #line 388 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp19_ = g_strdup (""); + _tmp14_ = g_strdup (""); #line 388 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - result = _tmp19_; + result = _tmp14_; #line 388 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_string_free0 (sb); #line 388 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3291 "VideoMetadata.c" +#line 3366 "VideoMetadata.c" } } #line 392 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp20_ = sb; + _tmp15_ = sb; #line 392 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp21_ = _tmp20_->str; + _tmp16_ = _tmp15_->str; #line 392 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp22_ = strlen (_tmp21_); + _tmp17_ = strlen (_tmp16_); #line 392 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp23_ = _tmp22_; + _tmp18_ = _tmp17_; #line 392 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp23_ < AVI_METADATA_LOADER_NUMERICAL_DATE_LENGTH) { -#line 3304 "VideoMetadata.c" - gchar* _tmp24_; + if (_tmp18_ < AVI_METADATA_LOADER_NUMERICAL_DATE_LENGTH) { +#line 3379 "VideoMetadata.c" + gchar* _tmp19_; #line 393 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp24_ = g_strdup (""); + _tmp19_ = g_strdup (""); #line 393 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - result = _tmp24_; + result = _tmp19_; #line 393 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_string_free0 (sb); #line 393 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3314 "VideoMetadata.c" +#line 3389 "VideoMetadata.c" } #line 396 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp25_ = sb; + _tmp20_ = sb; #line 396 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp26_ = _tmp25_->str; + _tmp21_ = _tmp20_->str; #line 396 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp27_ = sb; + _tmp22_ = sb; #line 396 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp28_ = _tmp27_->str; + _tmp23_ = _tmp22_->str; #line 396 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp29_ = strlen (_tmp28_); + _tmp24_ = strlen (_tmp23_); #line 396 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp30_ = _tmp29_; + _tmp25_ = _tmp24_; #line 396 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp31_ = string_substring (_tmp26_, (glong) (_tmp30_ - AVI_METADATA_LOADER_NUMERICAL_DATE_LENGTH), (glong) -1); + _tmp26_ = string_substring (_tmp21_, (glong) (_tmp25_ - AVI_METADATA_LOADER_NUMERICAL_DATE_LENGTH), (glong) -1); #line 396 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - result = _tmp31_; + result = _tmp26_; #line 396 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_string_free0 (sb); #line 396 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3336 "VideoMetadata.c" +#line 3411 "VideoMetadata.c" } -static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChunk* chunk, GError** error) { +static gchar* +avi_metadata_loader_read_section (AVIMetadataLoader* self, + AVIChunk* chunk, + GError** error) +{ gchar* result = NULL; GError * _inner_error_ = NULL; #line 400 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -3346,49 +3425,37 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun g_return_val_if_fail (IS_AVI_CHUNK (chunk), NULL); #line 401 "/home/jens/Source/shotwell/src/VideoMetadata.vala" while (TRUE) { -#line 3349 "VideoMetadata.c" - AVIChunk* _tmp0_; +#line 3428 "VideoMetadata.c" gchar* name = NULL; - AVIChunk* _tmp1_; - gchar* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp18_; - AVIChunk* _tmp28_; - gboolean _tmp29_; - AVIChunk* _tmp30_; -#line 402 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = chunk; + gchar* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp13_; #line 402 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - avi_chunk_read_chunk (_tmp0_, &_inner_error_); + avi_chunk_read_chunk (chunk, &_inner_error_); #line 402 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 402 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 402 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 3369 "VideoMetadata.c" +#line 3441 "VideoMetadata.c" } #line 403 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp1_ = chunk; -#line 403 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp2_ = avi_chunk_get_current_chunk_name (_tmp1_); + _tmp0_ = avi_chunk_get_current_chunk_name (chunk); #line 403 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - name = _tmp2_; + name = _tmp0_; #line 404 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp3_ = name; + _tmp1_ = name; #line 404 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (g_strcmp0 ("IDIT", _tmp3_) == 0) { -#line 3381 "VideoMetadata.c" - gchar* _tmp4_ = NULL; - AVIChunk* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; + if (g_strcmp0 ("IDIT", _tmp1_) == 0) { +#line 3451 "VideoMetadata.c" + gchar* _tmp2_ = NULL; + gchar* _tmp3_; + gchar* _tmp4_; #line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp5_ = chunk; + _tmp3_ = avi_chunk_section_to_string (chunk, &_inner_error_); #line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp6_ = avi_chunk_section_to_string (_tmp5_, &_inner_error_); -#line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp4_ = _tmp6_; + _tmp2_ = _tmp3_; #line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -3397,38 +3464,35 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun _g_free0 (name); #line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 3400 "VideoMetadata.c" +#line 3467 "VideoMetadata.c" } #line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp7_ = _tmp4_; + _tmp4_ = _tmp2_; #line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp4_ = NULL; + _tmp2_ = NULL; #line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - result = _tmp7_; + result = _tmp4_; #line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp2_); #line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (name); #line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3414 "VideoMetadata.c" +#line 3481 "VideoMetadata.c" } else { - const gchar* _tmp8_; + const gchar* _tmp5_; #line 406 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp8_ = name; + _tmp5_ = name; #line 406 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (g_strcmp0 ("nctg", _tmp8_) == 0) { -#line 3421 "VideoMetadata.c" - gchar* _tmp9_ = NULL; - AVIChunk* _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; -#line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp10_ = chunk; + if (g_strcmp0 ("nctg", _tmp5_) == 0) { +#line 3488 "VideoMetadata.c" + gchar* _tmp6_ = NULL; + gchar* _tmp7_; + gchar* _tmp8_; #line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp11_ = avi_metadata_loader_read_nikon_nctg_tag (self, _tmp10_, &_inner_error_); + _tmp7_ = avi_metadata_loader_read_nikon_nctg_tag (self, chunk, &_inner_error_); #line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp9_ = _tmp11_; + _tmp6_ = _tmp7_; #line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -3437,38 +3501,35 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun _g_free0 (name); #line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 3440 "VideoMetadata.c" +#line 3504 "VideoMetadata.c" } #line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp12_ = _tmp9_; + _tmp8_ = _tmp6_; #line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp9_ = NULL; + _tmp6_ = NULL; #line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - result = _tmp12_; + result = _tmp8_; #line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp6_); #line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (name); #line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3454 "VideoMetadata.c" +#line 3518 "VideoMetadata.c" } else { - const gchar* _tmp13_; + const gchar* _tmp9_; #line 408 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp13_ = name; + _tmp9_ = name; #line 408 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (g_strcmp0 ("strd", _tmp13_) == 0) { -#line 3461 "VideoMetadata.c" - gchar* _tmp14_ = NULL; - AVIChunk* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; + if (g_strcmp0 ("strd", _tmp9_) == 0) { +#line 3525 "VideoMetadata.c" + gchar* _tmp10_ = NULL; + gchar* _tmp11_; + gchar* _tmp12_; #line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp15_ = chunk; + _tmp11_ = avi_metadata_loader_read_fuji_strd_tag (self, chunk, &_inner_error_); #line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp16_ = avi_metadata_loader_read_fuji_strd_tag (self, _tmp15_, &_inner_error_); -#line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp14_ = _tmp16_; + _tmp10_ = _tmp11_; #line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -3477,47 +3538,43 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun _g_free0 (name); #line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 3480 "VideoMetadata.c" +#line 3541 "VideoMetadata.c" } #line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp17_ = _tmp14_; + _tmp12_ = _tmp10_; #line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp14_ = NULL; + _tmp10_ = NULL; #line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - result = _tmp17_; + result = _tmp12_; #line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _g_free0 (_tmp14_); + _g_free0 (_tmp10_); #line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (name); #line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3494 "VideoMetadata.c" +#line 3555 "VideoMetadata.c" } } } #line 412 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp18_ = name; + _tmp13_ = name; #line 412 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (g_strcmp0 ("LIST", _tmp18_) == 0) { -#line 3502 "VideoMetadata.c" - AVIChunk* _tmp19_; - gchar* _tmp20_; - gchar* _tmp21_; + if (g_strcmp0 ("LIST", _tmp13_) == 0) { +#line 3563 "VideoMetadata.c" + gchar* _tmp14_; + gchar* _tmp15_; gchar* _result_ = NULL; - AVIChunk* _tmp22_; - AVIChunk* _tmp23_; - AVIChunk* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; - const gchar* _tmp27_; -#line 413 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp19_ = chunk; + AVIChunk* _tmp16_; + AVIChunk* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + const gchar* _tmp20_; #line 413 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp20_ = avi_chunk_read_name (_tmp19_, &_inner_error_); + _tmp14_ = avi_chunk_read_name (chunk, &_inner_error_); #line 413 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp21_ = _tmp20_; + _tmp15_ = _tmp14_; #line 413 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _g_free0 (_tmp21_); + _g_free0 (_tmp15_); #line 413 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 413 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -3526,22 +3583,20 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun _g_free0 (name); #line 413 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 3529 "VideoMetadata.c" +#line 3586 "VideoMetadata.c" } #line 414 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp22_ = chunk; + _tmp16_ = avi_chunk_get_first_child_chunk (chunk); #line 414 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp23_ = avi_chunk_get_first_child_chunk (_tmp22_); + _tmp17_ = _tmp16_; #line 414 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp24_ = _tmp23_; + _tmp18_ = avi_metadata_loader_read_section (self, _tmp17_, &_inner_error_); #line 414 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp25_ = avi_metadata_loader_read_section (self, _tmp24_, &_inner_error_); + _tmp19_ = _tmp18_; #line 414 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp26_ = _tmp25_; + _avi_chunk_unref0 (_tmp17_); #line 414 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _avi_chunk_unref0 (_tmp24_); -#line 414 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _result_ = _tmp26_; + _result_ = _tmp19_; #line 414 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 414 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -3550,40 +3605,34 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun _g_free0 (name); #line 414 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 3553 "VideoMetadata.c" +#line 3608 "VideoMetadata.c" } #line 415 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp27_ = _result_; + _tmp20_ = _result_; #line 415 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (NULL != _tmp27_) { + if (NULL != _tmp20_) { #line 416 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = _result_; #line 416 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (name); #line 416 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3565 "VideoMetadata.c" +#line 3620 "VideoMetadata.c" } #line 412 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (_result_); -#line 3569 "VideoMetadata.c" +#line 3624 "VideoMetadata.c" } #line 420 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp28_ = chunk; -#line 420 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp29_ = avi_chunk_is_last_chunk (_tmp28_); -#line 420 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp29_) { + if (avi_chunk_is_last_chunk (chunk)) { #line 421 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (name); #line 421 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 3581 "VideoMetadata.c" +#line 3632 "VideoMetadata.c" } #line 423 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp30_ = chunk; -#line 423 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - avi_chunk_next_chunk (_tmp30_, &_inner_error_); + avi_chunk_next_chunk (chunk, &_inner_error_); #line 423 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 423 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -3592,25 +3641,27 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun _g_free0 (name); #line 423 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 3595 "VideoMetadata.c" +#line 3644 "VideoMetadata.c" } #line 401 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (name); -#line 3599 "VideoMetadata.c" +#line 3648 "VideoMetadata.c" } #line 425 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = NULL; #line 425 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3605 "VideoMetadata.c" +#line 3654 "VideoMetadata.c" } -static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gchar* sdate) { +static gulong +avi_metadata_loader_parse_date (AVIMetadataLoader* self, + const gchar* sdate) +{ gulong result = 0UL; - const gchar* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; GDate date = {0}; guint seconds = 0U; gint year = 0; @@ -3621,400 +3672,371 @@ static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gch gint sec = 0; gchar weekday[4] = {0}; gchar monthstr[4] = {0}; - const gchar* _tmp3_; - gchar _tmp4_; - gboolean _tmp5_; struct tm time = {0}; - struct tm _tmp26_ = {0}; + struct tm _tmp17_ = {0}; time_t tm = 0; - time_t _tmp27_; gulong _result_ = 0UL; - time_t _tmp28_; - guint _tmp29_; - gulong _tmp30_; - time_t _tmp31_; + time_t _tmp18_; + guint _tmp19_; + gulong _tmp20_; + time_t _tmp21_; #line 432 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (IS_AVI_METADATA_LOADER (self), 0UL); #line 432 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (sdate != NULL, 0UL); #line 433 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = sdate; -#line 433 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp1_ = strlen (_tmp0_); + _tmp0_ = strlen (sdate); #line 433 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 433 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 434 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = (gulong) 0; #line 434 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3652 "VideoMetadata.c" +#line 3697 "VideoMetadata.c" } #line 437 "/home/jens/Source/shotwell/src/VideoMetadata.vala" memset (&date, 0, sizeof (GDate)); #line 438 "/home/jens/Source/shotwell/src/VideoMetadata.vala" seconds = (guint) 0; #line 443 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp3_ = sdate; -#line 443 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp4_ = string_get (_tmp3_, (glong) 0); -#line 443 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp5_ = g_ascii_isdigit (_tmp4_); -#line 443 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp5_) { -#line 3666 "VideoMetadata.c" + if (g_ascii_isdigit (string_get (sdate, (glong) 0))) { +#line 3705 "VideoMetadata.c" gchar* tmp = NULL; - const gchar* _tmp6_; - gchar* _tmp7_; - const gchar* _tmp8_; + gchar* _tmp2_; + const gchar* _tmp3_; gint _result_ = 0; - const gchar* _tmp9_; + const gchar* _tmp4_; + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; + gint _tmp8_; + gint _tmp9_; gint _tmp10_; gint _tmp11_; - gint _tmp12_; - gint _tmp13_; - gint _tmp14_; - gint _tmp15_; - gint _tmp16_; - gint _tmp17_; #line 447 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp6_ = sdate; -#line 447 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp2_ = g_strdup (sdate); #line 447 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - tmp = _tmp7_; + tmp = _tmp2_; #line 448 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp8_ = tmp; + _tmp3_ = tmp; #line 448 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_strcanon (_tmp8_, "0123456789 ", ' '); + g_strcanon (_tmp3_, "0123456789 ", ' '); #line 449 "/home/jens/Source/shotwell/src/VideoMetadata.vala" sec = 0; #line 450 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp9_ = tmp; -#line 450 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp10_ = sscanf (_tmp9_, "%d %d %d %d %d %d", &year, &month, &day, &hour, &min, &sec); + _tmp4_ = tmp; #line 450 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _result_ = _tmp10_; + _result_ = sscanf (_tmp4_, "%d %d %d %d %d %d", &year, &month, &day, &hour, &min, &sec); #line 451 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp11_ = _result_; + _tmp5_ = _result_; #line 451 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp11_ < 5) { + if (_tmp5_ < 5) { #line 452 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = (gulong) 0; #line 452 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (tmp); #line 452 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3709 "VideoMetadata.c" +#line 3742 "VideoMetadata.c" } #line 454 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp12_ = day; + _tmp6_ = day; #line 454 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp13_ = month; + _tmp7_ = month; #line 454 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp14_ = year; + _tmp8_ = year; #line 454 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_date_set_dmy (&date, (GDateDay) _tmp12_, (gint) ((GDateMonth) _tmp13_), (GDateYear) _tmp14_); + g_date_set_dmy (&date, (GDateDay) _tmp6_, (gint) ((GDateMonth) _tmp7_), (GDateYear) _tmp8_); #line 455 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp15_ = sec; + _tmp9_ = sec; #line 455 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp16_ = min; + _tmp10_ = min; #line 455 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp17_ = hour; + _tmp11_ = hour; #line 455 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - seconds = (guint) ((_tmp15_ + (_tmp16_ * 60)) + (_tmp17_ * 3600)); + seconds = (guint) ((_tmp9_ + (_tmp10_ * 60)) + (_tmp11_ * 3600)); #line 443 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (tmp); -#line 3729 "VideoMetadata.c" +#line 3762 "VideoMetadata.c" } else { - const gchar* _tmp18_; - gint _tmp19_; - gint _tmp20_; - GDateMonth _tmp21_; - gint _tmp22_; - gint _tmp23_; - gint _tmp24_; - gint _tmp25_; -#line 458 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp18_ = sdate; -#line 458 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp19_ = sscanf (_tmp18_, "%3s %3s %d %d:%d:%d %d", weekday, monthstr, &day, &hour, &min, &sec, &year); + gint _tmp12_; + gint _tmp13_; + gint _tmp14_; + gint _tmp15_; + gint _tmp16_; #line 458 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (7 != _tmp19_) { + if (7 != sscanf (sdate, "%3s %3s %d %d:%d:%d %d", weekday, monthstr, &day, &hour, &min, &sec, &year)) { #line 460 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = (gulong) 0; #line 460 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3749 "VideoMetadata.c" +#line 3775 "VideoMetadata.c" } #line 462 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp20_ = day; -#line 462 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp21_ = avi_metadata_loader_month_from_string (self, (const gchar*) monthstr); + _tmp12_ = day; #line 462 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp22_ = year; + _tmp13_ = year; #line 462 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_date_set_dmy (&date, (GDateDay) _tmp20_, (gint) _tmp21_, (GDateYear) _tmp22_); + g_date_set_dmy (&date, (GDateDay) _tmp12_, (gint) avi_metadata_loader_month_from_string (self, (const gchar*) monthstr), (GDateYear) _tmp13_); #line 463 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp23_ = sec; + _tmp14_ = sec; #line 463 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp24_ = min; + _tmp15_ = min; #line 463 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp25_ = hour; + _tmp16_ = hour; #line 463 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - seconds = (guint) ((_tmp23_ + (_tmp24_ * 60)) + (_tmp25_ * 3600)); -#line 3767 "VideoMetadata.c" + seconds = (guint) ((_tmp14_ + (_tmp15_ * 60)) + (_tmp16_ * 3600)); +#line 3791 "VideoMetadata.c" } #line 466 "/home/jens/Source/shotwell/src/VideoMetadata.vala" memset (&time, 0, sizeof (struct tm)); #line 467 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_date_to_struct_tm (&date, &_tmp26_); + g_date_to_struct_tm (&date, &_tmp17_); #line 467 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - time = _tmp26_; -#line 470 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp27_ = mktime (&time); + time = _tmp17_; #line 470 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - tm = _tmp27_; + tm = mktime (&time); #line 471 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp28_ = tm; + _tmp18_ = tm; #line 471 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp29_ = seconds; + _tmp19_ = seconds; #line 471 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _result_ = (gulong) (_tmp28_ + _tmp29_); + _result_ = (gulong) (_tmp18_ + _tmp19_); #line 472 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp30_ = _result_; + _tmp20_ = _result_; #line 472 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp31_ = tm; + _tmp21_ = tm; #line 472 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp30_ < ((gulong) _tmp31_)) { -#line 3791 "VideoMetadata.c" - GFile* _tmp32_; - gchar* _tmp33_; - gchar* _tmp34_; + if (_tmp20_ < ((gulong) _tmp21_)) { +#line 3813 "VideoMetadata.c" + GFile* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; #line 473 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp32_ = self->priv->file; + _tmp22_ = self->priv->file; #line 473 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp33_ = g_file_get_path (_tmp32_); + _tmp23_ = g_file_get_path (_tmp22_); #line 473 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp34_ = _tmp33_; + _tmp24_ = _tmp23_; #line 473 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_debug ("VideoMetadata.vala:473: Overflow for timestamp in video file %s", _tmp34_); + g_debug ("VideoMetadata.vala:473: Overflow for timestamp in video file %s", _tmp24_); #line 473 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _g_free0 (_tmp34_); + _g_free0 (_tmp24_); #line 475 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = (gulong) 0; #line 475 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3809 "VideoMetadata.c" +#line 3831 "VideoMetadata.c" } #line 478 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = _result_; #line 478 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3815 "VideoMetadata.c" +#line 3837 "VideoMetadata.c" } -static GDateMonth avi_metadata_loader_month_from_string (AVIMetadataLoader* self, const gchar* s) { +static GDateMonth +avi_metadata_loader_month_from_string (AVIMetadataLoader* self, + const gchar* s) +{ GDateMonth result = 0; - const gchar* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - GQuark _tmp4_ = 0U; + GQuark _tmp3_ = 0U; #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - static GQuark _tmp3_label0 = 0; + static GQuark _tmp2_label0 = 0; #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - static GQuark _tmp3_label1 = 0; + static GQuark _tmp2_label1 = 0; #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - static GQuark _tmp3_label2 = 0; + static GQuark _tmp2_label2 = 0; #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - static GQuark _tmp3_label3 = 0; + static GQuark _tmp2_label3 = 0; #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - static GQuark _tmp3_label4 = 0; + static GQuark _tmp2_label4 = 0; #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - static GQuark _tmp3_label5 = 0; + static GQuark _tmp2_label5 = 0; #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - static GQuark _tmp3_label6 = 0; + static GQuark _tmp2_label6 = 0; #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - static GQuark _tmp3_label7 = 0; + static GQuark _tmp2_label7 = 0; #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - static GQuark _tmp3_label8 = 0; + static GQuark _tmp2_label8 = 0; #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - static GQuark _tmp3_label9 = 0; + static GQuark _tmp2_label9 = 0; #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - static GQuark _tmp3_label10 = 0; + static GQuark _tmp2_label10 = 0; #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - static GQuark _tmp3_label11 = 0; + static GQuark _tmp2_label11 = 0; #line 481 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (IS_AVI_METADATA_LOADER (self), 0); #line 481 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (s != NULL, 0); #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = s; -#line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp1_ = g_utf8_strdown (_tmp0_, (gssize) -1); + _tmp0_ = g_utf8_strdown (s, (gssize) -1); #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_); + _tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_); #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_free (_tmp2_); + g_free (_tmp1_); #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("jan")))) { + if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("jan")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3867 "VideoMetadata.c" +#line 3889 "VideoMetadata.c" default: { #line 484 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_JANUARY; #line 484 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3874 "VideoMetadata.c" +#line 3896 "VideoMetadata.c" } } - } else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("feb")))) { + } else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("feb")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3880 "VideoMetadata.c" +#line 3902 "VideoMetadata.c" default: { #line 486 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_FEBRUARY; #line 486 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3887 "VideoMetadata.c" +#line 3909 "VideoMetadata.c" } } - } else if (_tmp4_ == ((0 != _tmp3_label2) ? _tmp3_label2 : (_tmp3_label2 = g_quark_from_static_string ("mar")))) { + } else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("mar")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3893 "VideoMetadata.c" +#line 3915 "VideoMetadata.c" default: { #line 488 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_MARCH; #line 488 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3900 "VideoMetadata.c" +#line 3922 "VideoMetadata.c" } } - } else if (_tmp4_ == ((0 != _tmp3_label3) ? _tmp3_label3 : (_tmp3_label3 = g_quark_from_static_string ("apr")))) { + } else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("apr")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3906 "VideoMetadata.c" +#line 3928 "VideoMetadata.c" default: { #line 490 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_APRIL; #line 490 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3913 "VideoMetadata.c" +#line 3935 "VideoMetadata.c" } } - } else if (_tmp4_ == ((0 != _tmp3_label4) ? _tmp3_label4 : (_tmp3_label4 = g_quark_from_static_string ("may")))) { + } else if (_tmp3_ == ((0 != _tmp2_label4) ? _tmp2_label4 : (_tmp2_label4 = g_quark_from_static_string ("may")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3919 "VideoMetadata.c" +#line 3941 "VideoMetadata.c" default: { #line 492 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_MAY; #line 492 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3926 "VideoMetadata.c" +#line 3948 "VideoMetadata.c" } } - } else if (_tmp4_ == ((0 != _tmp3_label5) ? _tmp3_label5 : (_tmp3_label5 = g_quark_from_static_string ("jun")))) { + } else if (_tmp3_ == ((0 != _tmp2_label5) ? _tmp2_label5 : (_tmp2_label5 = g_quark_from_static_string ("jun")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3932 "VideoMetadata.c" +#line 3954 "VideoMetadata.c" default: { #line 494 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_JUNE; #line 494 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3939 "VideoMetadata.c" +#line 3961 "VideoMetadata.c" } } - } else if (_tmp4_ == ((0 != _tmp3_label6) ? _tmp3_label6 : (_tmp3_label6 = g_quark_from_static_string ("jul")))) { + } else if (_tmp3_ == ((0 != _tmp2_label6) ? _tmp2_label6 : (_tmp2_label6 = g_quark_from_static_string ("jul")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3945 "VideoMetadata.c" +#line 3967 "VideoMetadata.c" default: { #line 496 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_JULY; #line 496 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3952 "VideoMetadata.c" +#line 3974 "VideoMetadata.c" } } - } else if (_tmp4_ == ((0 != _tmp3_label7) ? _tmp3_label7 : (_tmp3_label7 = g_quark_from_static_string ("aug")))) { + } else if (_tmp3_ == ((0 != _tmp2_label7) ? _tmp2_label7 : (_tmp2_label7 = g_quark_from_static_string ("aug")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3958 "VideoMetadata.c" +#line 3980 "VideoMetadata.c" default: { #line 498 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_AUGUST; #line 498 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3965 "VideoMetadata.c" +#line 3987 "VideoMetadata.c" } } - } else if (_tmp4_ == ((0 != _tmp3_label8) ? _tmp3_label8 : (_tmp3_label8 = g_quark_from_static_string ("sep")))) { + } else if (_tmp3_ == ((0 != _tmp2_label8) ? _tmp2_label8 : (_tmp2_label8 = g_quark_from_static_string ("sep")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3971 "VideoMetadata.c" +#line 3993 "VideoMetadata.c" default: { #line 500 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_SEPTEMBER; #line 500 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3978 "VideoMetadata.c" +#line 4000 "VideoMetadata.c" } } - } else if (_tmp4_ == ((0 != _tmp3_label9) ? _tmp3_label9 : (_tmp3_label9 = g_quark_from_static_string ("oct")))) { + } else if (_tmp3_ == ((0 != _tmp2_label9) ? _tmp2_label9 : (_tmp2_label9 = g_quark_from_static_string ("oct")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3984 "VideoMetadata.c" +#line 4006 "VideoMetadata.c" default: { #line 502 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_OCTOBER; #line 502 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3991 "VideoMetadata.c" +#line 4013 "VideoMetadata.c" } } - } else if (_tmp4_ == ((0 != _tmp3_label10) ? _tmp3_label10 : (_tmp3_label10 = g_quark_from_static_string ("nov")))) { + } else if (_tmp3_ == ((0 != _tmp2_label10) ? _tmp2_label10 : (_tmp2_label10 = g_quark_from_static_string ("nov")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3997 "VideoMetadata.c" +#line 4019 "VideoMetadata.c" default: { #line 504 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_NOVEMBER; #line 504 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 4004 "VideoMetadata.c" +#line 4026 "VideoMetadata.c" } } - } else if (_tmp4_ == ((0 != _tmp3_label11) ? _tmp3_label11 : (_tmp3_label11 = g_quark_from_static_string ("dec")))) { + } else if (_tmp3_ == ((0 != _tmp2_label11) ? _tmp2_label11 : (_tmp2_label11 = g_quark_from_static_string ("dec")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 4010 "VideoMetadata.c" +#line 4032 "VideoMetadata.c" default: { #line 506 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_DECEMBER; #line 506 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 4017 "VideoMetadata.c" +#line 4039 "VideoMetadata.c" } } } @@ -4022,34 +4044,38 @@ static GDateMonth avi_metadata_loader_month_from_string (AVIMetadataLoader* self result = G_DATE_BAD_MONTH; #line 508 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 4025 "VideoMetadata.c" +#line 4047 "VideoMetadata.c" } -static gchar* string_strip (const gchar* self) { +static gchar* +string_strip (const gchar* self) +{ gchar* result = NULL; gchar* _result_ = NULL; gchar* _tmp0_; const gchar* _tmp1_; -#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1248 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _result_; -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 4048 "VideoMetadata.c" +#line 4072 "VideoMetadata.c" } -static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoader* self) { +static gulong +avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoader* self) +{ gulong result = 0UL; AVIChunk* chunk = NULL; GFile* _tmp0_; @@ -4066,7 +4092,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa chunk = _tmp1_; #line 513 "/home/jens/Source/shotwell/src/VideoMetadata.vala" timestamp = (gulong) 0; -#line 4069 "VideoMetadata.c" +#line 4095 "VideoMetadata.c" { AVIChunk* _tmp2_; AVIChunk* _tmp3_; @@ -4080,7 +4106,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa avi_chunk_open_file (_tmp2_, &_inner_error_); #line 515 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4083 "VideoMetadata.c" +#line 4109 "VideoMetadata.c" goto __catch592_g_error; } #line 516 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -4089,7 +4115,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa avi_chunk_nonsection_skip (_tmp3_, (guint64) 12, &_inner_error_); #line 516 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4092 "VideoMetadata.c" +#line 4118 "VideoMetadata.c" goto __catch592_g_error; } #line 517 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -4100,18 +4126,17 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa sdate = _tmp5_; #line 517 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4103 "VideoMetadata.c" +#line 4129 "VideoMetadata.c" goto __catch592_g_error; } #line 518 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp6_ = sdate; #line 518 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (NULL != _tmp6_) { -#line 4110 "VideoMetadata.c" +#line 4136 "VideoMetadata.c" const gchar* _tmp7_; gchar* _tmp8_; gchar* _tmp9_; - gulong _tmp10_; #line 519 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp7_ = sdate; #line 519 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -4119,42 +4144,40 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa #line 519 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp9_ = _tmp8_; #line 519 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp10_ = avi_metadata_loader_parse_date (self, _tmp9_); -#line 519 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - timestamp = _tmp10_; + timestamp = avi_metadata_loader_parse_date (self, _tmp9_); #line 519 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (_tmp9_); -#line 4127 "VideoMetadata.c" +#line 4150 "VideoMetadata.c" } #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (sdate); -#line 4131 "VideoMetadata.c" +#line 4154 "VideoMetadata.c" } goto __finally592; __catch592_g_error: { GError* e = NULL; - GError* _tmp11_; - const gchar* _tmp12_; + GError* _tmp10_; + const gchar* _tmp11_; #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala" e = _inner_error_; #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _inner_error_ = NULL; #line 522 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp11_ = e; + _tmp10_ = e; #line 522 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp12_ = _tmp11_->message; + _tmp11_ = _tmp10_->message; #line 522 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_debug ("VideoMetadata.vala:522: Error while reading AVI file: %s", _tmp12_); + g_debug ("VideoMetadata.vala:522: Error while reading AVI file: %s", _tmp11_); #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_error_free0 (e); -#line 4151 "VideoMetadata.c" +#line 4174 "VideoMetadata.c" } __finally592: #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4156 "VideoMetadata.c" - gulong _tmp13_ = 0UL; +#line 4179 "VideoMetadata.c" + gulong _tmp12_ = 0UL; #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _avi_chunk_unref0 (chunk); #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -4162,18 +4185,18 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_clear_error (&_inner_error_); #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return _tmp13_; -#line 4166 "VideoMetadata.c" + return _tmp12_; +#line 4189 "VideoMetadata.c" } { - AVIChunk* _tmp14_; + AVIChunk* _tmp13_; #line 526 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp14_ = chunk; + _tmp13_ = chunk; #line 526 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - avi_chunk_close_file (_tmp14_, &_inner_error_); + avi_chunk_close_file (_tmp13_, &_inner_error_); #line 526 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4176 "VideoMetadata.c" +#line 4199 "VideoMetadata.c" goto __catch593_g_error; } } @@ -4181,27 +4204,27 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa __catch593_g_error: { GError* e = NULL; - GError* _tmp15_; - const gchar* _tmp16_; + GError* _tmp14_; + const gchar* _tmp15_; #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala" e = _inner_error_; #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _inner_error_ = NULL; #line 528 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp15_ = e; + _tmp14_ = e; #line 528 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp16_ = _tmp15_->message; + _tmp15_ = _tmp14_->message; #line 528 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_debug ("VideoMetadata.vala:528: Error while closing AVI file: %s", _tmp16_); + g_debug ("VideoMetadata.vala:528: Error while closing AVI file: %s", _tmp15_); #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_error_free0 (e); -#line 4198 "VideoMetadata.c" +#line 4221 "VideoMetadata.c" } __finally593: #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4203 "VideoMetadata.c" - gulong _tmp17_ = 0UL; +#line 4226 "VideoMetadata.c" + gulong _tmp16_ = 0UL; #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _avi_chunk_unref0 (chunk); #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -4209,8 +4232,8 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_clear_error (&_inner_error_); #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return _tmp17_; -#line 4213 "VideoMetadata.c" + return _tmp16_; +#line 4236 "VideoMetadata.c" } #line 530 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = timestamp; @@ -4218,108 +4241,133 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa _avi_chunk_unref0 (chunk); #line 530 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 4221 "VideoMetadata.c" +#line 4244 "VideoMetadata.c" } -static void value_avi_metadata_loader_init (GValue* value) { +static void +value_avi_metadata_loader_init (GValue* value) +{ #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 4228 "VideoMetadata.c" +#line 4253 "VideoMetadata.c" } -static void value_avi_metadata_loader_free_value (GValue* value) { +static void +value_avi_metadata_loader_free_value (GValue* value) +{ #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (value->data[0].v_pointer) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" avi_metadata_loader_unref (value->data[0].v_pointer); -#line 4237 "VideoMetadata.c" +#line 4264 "VideoMetadata.c" } } -static void value_avi_metadata_loader_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_avi_metadata_loader_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (src_value->data[0].v_pointer) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" dest_value->data[0].v_pointer = avi_metadata_loader_ref (src_value->data[0].v_pointer); -#line 4247 "VideoMetadata.c" +#line 4277 "VideoMetadata.c" } else { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 4251 "VideoMetadata.c" +#line 4281 "VideoMetadata.c" } } -static gpointer value_avi_metadata_loader_peek_pointer (const GValue* value) { +static gpointer +value_avi_metadata_loader_peek_pointer (const GValue* value) +{ #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return value->data[0].v_pointer; -#line 4259 "VideoMetadata.c" +#line 4291 "VideoMetadata.c" } -static gchar* value_avi_metadata_loader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_avi_metadata_loader_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (collect_values[0].v_pointer) { -#line 4266 "VideoMetadata.c" +#line 4303 "VideoMetadata.c" AVIMetadataLoader * object; object = collect_values[0].v_pointer; #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (object->parent_instance.g_class == NULL) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4273 "VideoMetadata.c" +#line 4310 "VideoMetadata.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.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 4277 "VideoMetadata.c" +#line 4314 "VideoMetadata.c" } #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = avi_metadata_loader_ref (object); -#line 4281 "VideoMetadata.c" +#line 4318 "VideoMetadata.c" } else { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 4285 "VideoMetadata.c" +#line 4322 "VideoMetadata.c" } #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 4289 "VideoMetadata.c" +#line 4326 "VideoMetadata.c" } -static gchar* value_avi_metadata_loader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_avi_metadata_loader_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ AVIMetadataLoader ** object_p; object_p = collect_values[0].v_pointer; #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (!object_p) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 4300 "VideoMetadata.c" +#line 4342 "VideoMetadata.c" } #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (!value->data[0].v_pointer) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = NULL; -#line 4306 "VideoMetadata.c" +#line 4348 "VideoMetadata.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = value->data[0].v_pointer; -#line 4310 "VideoMetadata.c" +#line 4352 "VideoMetadata.c" } else { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = avi_metadata_loader_ref (value->data[0].v_pointer); -#line 4314 "VideoMetadata.c" +#line 4356 "VideoMetadata.c" } #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 4318 "VideoMetadata.c" +#line 4360 "VideoMetadata.c" } -GParamSpec* param_spec_avi_metadata_loader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_avi_metadata_loader (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecAVIMetadataLoader* spec; #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_AVI_METADATA_LOADER), NULL); @@ -4329,20 +4377,25 @@ GParamSpec* param_spec_avi_metadata_loader (const gchar* name, const gchar* nick G_PARAM_SPEC (spec)->value_type = object_type; #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return G_PARAM_SPEC (spec); -#line 4332 "VideoMetadata.c" +#line 4380 "VideoMetadata.c" } -gpointer value_get_avi_metadata_loader (const GValue* value) { +gpointer +value_get_avi_metadata_loader (const GValue* value) +{ #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AVI_METADATA_LOADER), NULL); #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return value->data[0].v_pointer; -#line 4341 "VideoMetadata.c" +#line 4391 "VideoMetadata.c" } -void value_set_avi_metadata_loader (GValue* value, gpointer v_object) { +void +value_set_avi_metadata_loader (GValue* value, + gpointer v_object) +{ AVIMetadataLoader * old; #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AVI_METADATA_LOADER)); @@ -4358,22 +4411,25 @@ void value_set_avi_metadata_loader (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" avi_metadata_loader_ref (value->data[0].v_pointer); -#line 4361 "VideoMetadata.c" +#line 4414 "VideoMetadata.c" } else { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 4365 "VideoMetadata.c" +#line 4418 "VideoMetadata.c" } #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (old) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" avi_metadata_loader_unref (old); -#line 4371 "VideoMetadata.c" +#line 4424 "VideoMetadata.c" } } -void value_take_avi_metadata_loader (GValue* value, gpointer v_object) { +void +value_take_avi_metadata_loader (GValue* value, + gpointer v_object) +{ AVIMetadataLoader * old; #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AVI_METADATA_LOADER)); @@ -4387,44 +4443,50 @@ void value_take_avi_metadata_loader (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = v_object; -#line 4390 "VideoMetadata.c" +#line 4446 "VideoMetadata.c" } else { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 4394 "VideoMetadata.c" +#line 4450 "VideoMetadata.c" } #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (old) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" avi_metadata_loader_unref (old); -#line 4400 "VideoMetadata.c" +#line 4456 "VideoMetadata.c" } } -static void avi_metadata_loader_class_init (AVIMetadataLoaderClass * klass) { +static void +avi_metadata_loader_class_init (AVIMetadataLoaderClass * klass) +{ #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" avi_metadata_loader_parent_class = g_type_class_peek_parent (klass); #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" ((AVIMetadataLoaderClass *) klass)->finalize = avi_metadata_loader_finalize; #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_type_class_add_private (klass, sizeof (AVIMetadataLoaderPrivate)); -#line 4412 "VideoMetadata.c" +#line 4470 "VideoMetadata.c" } -static void avi_metadata_loader_instance_init (AVIMetadataLoader * self) { +static void +avi_metadata_loader_instance_init (AVIMetadataLoader * self) +{ #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv = AVI_METADATA_LOADER_GET_PRIVATE (self); #line 294 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv->file = NULL; #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->ref_count = 1; -#line 4423 "VideoMetadata.c" +#line 4483 "VideoMetadata.c" } -static void avi_metadata_loader_finalize (AVIMetadataLoader * obj) { +static void +avi_metadata_loader_finalize (AVIMetadataLoader * obj) +{ AVIMetadataLoader * self; #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_AVI_METADATA_LOADER, AVIMetadataLoader); @@ -4432,11 +4494,13 @@ static void avi_metadata_loader_finalize (AVIMetadataLoader * obj) { g_signal_handlers_destroy (self); #line 294 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_object_unref0 (self->priv->file); -#line 4435 "VideoMetadata.c" +#line 4497 "VideoMetadata.c" } -GType avi_metadata_loader_get_type (void) { +GType +avi_metadata_loader_get_type (void) +{ static volatile gsize avi_metadata_loader_type_id__volatile = 0; if (g_once_init_enter (&avi_metadata_loader_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_avi_metadata_loader_init, value_avi_metadata_loader_free_value, value_avi_metadata_loader_copy_value, value_avi_metadata_loader_peek_pointer, "p", value_avi_metadata_loader_collect_value, "p", value_avi_metadata_loader_lcopy_value }; @@ -4450,18 +4514,22 @@ GType avi_metadata_loader_get_type (void) { } -gpointer avi_metadata_loader_ref (gpointer instance) { +gpointer +avi_metadata_loader_ref (gpointer instance) +{ AVIMetadataLoader * self; self = instance; #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_atomic_int_inc (&self->ref_count); #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return instance; -#line 4460 "VideoMetadata.c" +#line 4526 "VideoMetadata.c" } -void avi_metadata_loader_unref (gpointer instance) { +void +avi_metadata_loader_unref (gpointer instance) +{ AVIMetadataLoader * self; self = instance; #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -4470,53 +4538,59 @@ void avi_metadata_loader_unref (gpointer instance) { AVI_METADATA_LOADER_GET_CLASS (self)->finalize (self); #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_type_free_instance ((GTypeInstance *) self); -#line 4473 "VideoMetadata.c" +#line 4541 "VideoMetadata.c" } } -AVIChunk* avi_chunk_construct (GType object_type, GFile* file) { +AVIChunk* +avi_chunk_construct (GType object_type, + GFile* file) +{ AVIChunk* self = NULL; GFile* _tmp0_; - GFile* _tmp1_; #line 543 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 543 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self = (AVIChunk*) g_type_create_instance (object_type); #line 544 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = file; -#line 544 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (file); #line 544 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_object_unref0 (self->priv->file); #line 544 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - self->priv->file = _tmp1_; + self->priv->file = _tmp0_; #line 543 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return self; -#line 4496 "VideoMetadata.c" +#line 4564 "VideoMetadata.c" } -AVIChunk* avi_chunk_new (GFile* file) { +AVIChunk* +avi_chunk_new (GFile* file) +{ #line 543 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return avi_chunk_construct (TYPE_AVI_CHUNK, file); -#line 4503 "VideoMetadata.c" +#line 4573 "VideoMetadata.c" } -static gpointer _avi_chunk_ref0 (gpointer self) { +static gpointer +_avi_chunk_ref0 (gpointer self) +{ #line 549 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return self ? avi_chunk_ref (self) : NULL; -#line 4510 "VideoMetadata.c" +#line 4582 "VideoMetadata.c" } -static AVIChunk* avi_chunk_construct_with_input_stream (GType object_type, GDataInputStream* input, AVIChunk* parent) { +static AVIChunk* +avi_chunk_construct_with_input_stream (GType object_type, + GDataInputStream* input, + AVIChunk* parent) +{ AVIChunk* self = NULL; GDataInputStream* _tmp0_; - GDataInputStream* _tmp1_; - AVIChunk* _tmp2_; - AVIChunk* _tmp3_; + AVIChunk* _tmp1_; #line 547 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (G_IS_DATA_INPUT_STREAM (input), NULL); #line 547 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -4524,35 +4598,37 @@ static AVIChunk* avi_chunk_construct_with_input_stream (GType object_type, GData #line 547 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self = (AVIChunk*) g_type_create_instance (object_type); #line 548 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = input; -#line 548 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (input); #line 548 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_object_unref0 (self->priv->input); #line 548 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - self->priv->input = _tmp1_; -#line 549 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp2_ = parent; + self->priv->input = _tmp0_; #line 549 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp3_ = _avi_chunk_ref0 (_tmp2_); + _tmp1_ = _avi_chunk_ref0 (parent); #line 549 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _avi_chunk_unref0 (self->priv->parent); #line 549 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - self->priv->parent = _tmp3_; + self->priv->parent = _tmp1_; #line 547 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return self; -#line 4544 "VideoMetadata.c" +#line 4614 "VideoMetadata.c" } -static AVIChunk* avi_chunk_new_with_input_stream (GDataInputStream* input, AVIChunk* parent) { +static AVIChunk* +avi_chunk_new_with_input_stream (GDataInputStream* input, + AVIChunk* parent) +{ #line 547 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return avi_chunk_construct_with_input_stream (TYPE_AVI_CHUNK, input, parent); -#line 4551 "VideoMetadata.c" +#line 4624 "VideoMetadata.c" } -void avi_chunk_open_file (AVIChunk* self, GError** error) { +void +avi_chunk_open_file (AVIChunk* self, + GError** error) +{ GFileInputStream* _tmp0_ = NULL; GFile* _tmp1_; GFileInputStream* _tmp2_; @@ -4570,7 +4646,7 @@ void avi_chunk_open_file (AVIChunk* self, GError** error) { g_propagate_error (error, _inner_error_); #line 553 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 4573 "VideoMetadata.c" +#line 4649 "VideoMetadata.c" } #line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp1_ = self->priv->file; @@ -4584,7 +4660,7 @@ void avi_chunk_open_file (AVIChunk* self, GError** error) { g_propagate_error (error, _inner_error_); #line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 4587 "VideoMetadata.c" +#line 4663 "VideoMetadata.c" } #line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream)); @@ -4608,11 +4684,14 @@ void avi_chunk_open_file (AVIChunk* self, GError** error) { self->priv->section_name = _tmp5_; #line 552 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_object_unref0 (_tmp0_); -#line 4611 "VideoMetadata.c" +#line 4687 "VideoMetadata.c" } -void avi_chunk_close_file (AVIChunk* self, GError** error) { +void +avi_chunk_close_file (AVIChunk* self, + GError** error) +{ GDataInputStream* _tmp0_; GError * _inner_error_ = NULL; #line 561 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -4621,7 +4700,7 @@ void avi_chunk_close_file (AVIChunk* self, GError** error) { _tmp0_ = self->priv->input; #line 562 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (NULL != _tmp0_) { -#line 4624 "VideoMetadata.c" +#line 4703 "VideoMetadata.c" GDataInputStream* _tmp1_; #line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp1_ = self->priv->input; @@ -4633,69 +4712,70 @@ void avi_chunk_close_file (AVIChunk* self, GError** error) { g_propagate_error (error, _inner_error_); #line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 4636 "VideoMetadata.c" +#line 4715 "VideoMetadata.c" } #line 564 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_object_unref0 (self->priv->input); #line 564 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv->input = NULL; -#line 4642 "VideoMetadata.c" +#line 4721 "VideoMetadata.c" } } -void avi_chunk_nonsection_skip (AVIChunk* self, guint64 skip_amount, GError** error) { +void +avi_chunk_nonsection_skip (AVIChunk* self, + guint64 skip_amount, + GError** error) +{ GDataInputStream* _tmp0_; - guint64 _tmp1_; GError * _inner_error_ = NULL; #line 568 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_if_fail (IS_AVI_CHUNK (self)); #line 569 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp0_ = self->priv->input; #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_input_stream_get_type (), GInputStream), _tmp1_, &_inner_error_); + skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream), skip_amount, &_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" g_propagate_error (error, _inner_error_); #line 569 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 4665 "VideoMetadata.c" +#line 4745 "VideoMetadata.c" } } -void avi_chunk_skip (AVIChunk* self, guint64 skip_amount, GError** error) { - guint64 _tmp0_; - GDataInputStream* _tmp1_; - guint64 _tmp2_; +void +avi_chunk_skip (AVIChunk* self, + guint64 skip_amount, + GError** error) +{ + GDataInputStream* _tmp0_; GError * _inner_error_ = NULL; #line 572 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_if_fail (IS_AVI_CHUNK (self)); #line 573 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = skip_amount; -#line 573 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - avi_chunk_advance_section_offset (self, _tmp0_); + avi_chunk_advance_section_offset (self, skip_amount); #line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp1_ = self->priv->input; -#line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp2_ = skip_amount; + _tmp0_ = self->priv->input; #line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_input_stream_get_type (), GInputStream), _tmp2_, &_inner_error_); + skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream), skip_amount, &_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" g_propagate_error (error, _inner_error_); #line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 4693 "VideoMetadata.c" +#line 4771 "VideoMetadata.c" } } -AVIChunk* avi_chunk_get_first_child_chunk (AVIChunk* self) { +AVIChunk* +avi_chunk_get_first_child_chunk (AVIChunk* self) +{ AVIChunk* result = NULL; GDataInputStream* _tmp0_; AVIChunk* _tmp1_; @@ -4709,67 +4789,63 @@ AVIChunk* avi_chunk_get_first_child_chunk (AVIChunk* self) { result = _tmp1_; #line 578 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 4712 "VideoMetadata.c" +#line 4792 "VideoMetadata.c" } -static void avi_chunk_advance_section_offset (AVIChunk* self, guint64 amount) { +static void +avi_chunk_advance_section_offset (AVIChunk* self, + guint64 amount) +{ guint64 _tmp0_; guint64 _tmp1_; - guint64 _tmp2_; - guint64 _tmp5_; - guint64 _tmp6_; - AVIChunk* _tmp7_; + guint64 _tmp4_; + AVIChunk* _tmp5_; #line 581 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_if_fail (IS_AVI_CHUNK (self)); #line 582 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp0_ = self->priv->section_offset; #line 582 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp1_ = amount; -#line 582 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp2_ = self->priv->section_size; + _tmp1_ = self->priv->section_size; #line 582 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if ((_tmp0_ + _tmp1_) > _tmp2_) { -#line 4733 "VideoMetadata.c" + if ((_tmp0_ + amount) > _tmp1_) { +#line 4812 "VideoMetadata.c" + guint64 _tmp2_; guint64 _tmp3_; - guint64 _tmp4_; #line 583 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp3_ = self->priv->section_size; + _tmp2_ = self->priv->section_size; #line 583 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp4_ = self->priv->section_offset; + _tmp3_ = self->priv->section_offset; #line 583 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - amount = _tmp3_ - _tmp4_; -#line 4742 "VideoMetadata.c" + amount = _tmp2_ - _tmp3_; +#line 4821 "VideoMetadata.c" } #line 585 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp5_ = self->priv->section_offset; + _tmp4_ = self->priv->section_offset; #line 585 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp6_ = amount; -#line 585 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - self->priv->section_offset = _tmp5_ + _tmp6_; + self->priv->section_offset = _tmp4_ + amount; #line 586 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp7_ = self->priv->parent; + _tmp5_ = self->priv->parent; #line 586 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (NULL != _tmp7_) { -#line 4754 "VideoMetadata.c" - AVIChunk* _tmp8_; - guint64 _tmp9_; -#line 587 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp8_ = self->priv->parent; + if (NULL != _tmp5_) { +#line 4831 "VideoMetadata.c" + AVIChunk* _tmp6_; #line 587 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp9_ = amount; + _tmp6_ = self->priv->parent; #line 587 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - avi_chunk_advance_section_offset (_tmp8_, _tmp9_); -#line 4763 "VideoMetadata.c" + avi_chunk_advance_section_offset (_tmp6_, amount); +#line 4837 "VideoMetadata.c" } } -guchar avi_chunk_read_byte (AVIChunk* self, GError** error) { +guchar +avi_chunk_read_byte (AVIChunk* self, + GError** error) +{ guchar result = '\0'; guint8 _tmp0_ = 0U; GDataInputStream* _tmp1_; - guint8 _tmp2_; GError * _inner_error_ = NULL; #line 591 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (IS_AVI_CHUNK (self), '\0'); @@ -4778,32 +4854,32 @@ guchar avi_chunk_read_byte (AVIChunk* self, GError** error) { #line 593 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp1_ = self->priv->input; #line 593 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp2_ = g_data_input_stream_read_byte (_tmp1_, NULL, &_inner_error_); -#line 593 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = _tmp2_; + _tmp0_ = g_data_input_stream_read_byte (_tmp1_, NULL, &_inner_error_); #line 593 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4786 "VideoMetadata.c" - guchar _tmp3_ = '\0'; +#line 4860 "VideoMetadata.c" + guchar _tmp2_ = '\0'; #line 593 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 593 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return _tmp3_; -#line 4792 "VideoMetadata.c" + return _tmp2_; +#line 4866 "VideoMetadata.c" } #line 593 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = (guchar) _tmp0_; #line 593 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 4798 "VideoMetadata.c" +#line 4872 "VideoMetadata.c" } -guint16 avi_chunk_read_uint16 (AVIChunk* self, GError** error) { +guint16 +avi_chunk_read_uint16 (AVIChunk* self, + GError** error) +{ guint16 result = 0U; guint16 _tmp0_ = 0U; GDataInputStream* _tmp1_; - guint16 _tmp2_; GError * _inner_error_ = NULL; #line 596 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (IS_AVI_CHUNK (self), 0U); @@ -4812,52 +4888,48 @@ guint16 avi_chunk_read_uint16 (AVIChunk* self, GError** error) { #line 598 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp1_ = self->priv->input; #line 598 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp2_ = g_data_input_stream_read_uint16 (_tmp1_, NULL, &_inner_error_); -#line 598 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = _tmp2_; + _tmp0_ = g_data_input_stream_read_uint16 (_tmp1_, NULL, &_inner_error_); #line 598 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4820 "VideoMetadata.c" - guint16 _tmp3_ = 0U; +#line 4894 "VideoMetadata.c" + guint16 _tmp2_ = 0U; #line 598 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 598 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return _tmp3_; -#line 4826 "VideoMetadata.c" + return _tmp2_; +#line 4900 "VideoMetadata.c" } #line 598 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = _tmp0_; #line 598 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 4832 "VideoMetadata.c" +#line 4906 "VideoMetadata.c" } -void avi_chunk_read_chunk (AVIChunk* self, GError** error) { +void +avi_chunk_read_chunk (AVIChunk* self, + GError** error) +{ GString* sb = NULL; GString* _tmp0_; guint8 _tmp1_ = 0U; GDataInputStream* _tmp2_; - guint8 _tmp3_; - GString* _tmp4_; - guint8 _tmp5_ = 0U; - GDataInputStream* _tmp6_; - guint8 _tmp7_; - GString* _tmp8_; - guint8 _tmp9_ = 0U; - GDataInputStream* _tmp10_; - guint8 _tmp11_; + GString* _tmp3_; + guint8 _tmp4_ = 0U; + GDataInputStream* _tmp5_; + GString* _tmp6_; + guint8 _tmp7_ = 0U; + GDataInputStream* _tmp8_; + GString* _tmp9_; + guint8 _tmp10_ = 0U; + GDataInputStream* _tmp11_; GString* _tmp12_; - guint8 _tmp13_ = 0U; - GDataInputStream* _tmp14_; - guint8 _tmp15_; - GString* _tmp16_; - GString* _tmp17_; - const gchar* _tmp18_; - gchar* _tmp19_; - guint32 _tmp20_ = 0U; - GDataInputStream* _tmp21_; - guint32 _tmp22_; + GString* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_; + guint32 _tmp16_ = 0U; + GDataInputStream* _tmp17_; GError * _inner_error_ = NULL; #line 601 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_if_fail (IS_AVI_CHUNK (self)); @@ -4868,9 +4940,7 @@ void avi_chunk_read_chunk (AVIChunk* self, GError** error) { #line 605 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp2_ = self->priv->input; #line 605 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp3_ = g_data_input_stream_read_byte (_tmp2_, NULL, &_inner_error_); -#line 605 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp1_ = _tmp3_; + _tmp1_ = g_data_input_stream_read_byte (_tmp2_, NULL, &_inner_error_); #line 605 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 605 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -4879,18 +4949,16 @@ void avi_chunk_read_chunk (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 605 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 4882 "VideoMetadata.c" +#line 4952 "VideoMetadata.c" } #line 605 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp4_ = sb; + _tmp3_ = sb; #line 605 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_string_append_c (_tmp4_, (gchar) _tmp1_); -#line 606 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp6_ = self->priv->input; + g_string_append_c (_tmp3_, (gchar) _tmp1_); #line 606 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp7_ = g_data_input_stream_read_byte (_tmp6_, NULL, &_inner_error_); + _tmp5_ = self->priv->input; #line 606 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp5_ = _tmp7_; + _tmp4_ = g_data_input_stream_read_byte (_tmp5_, NULL, &_inner_error_); #line 606 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 606 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -4899,18 +4967,16 @@ void avi_chunk_read_chunk (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 606 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 4902 "VideoMetadata.c" +#line 4970 "VideoMetadata.c" } #line 606 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp8_ = sb; + _tmp6_ = sb; #line 606 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_string_append_c (_tmp8_, (gchar) _tmp5_); -#line 607 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp10_ = self->priv->input; + g_string_append_c (_tmp6_, (gchar) _tmp4_); #line 607 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp11_ = g_data_input_stream_read_byte (_tmp10_, NULL, &_inner_error_); + _tmp8_ = self->priv->input; #line 607 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp9_ = _tmp11_; + _tmp7_ = g_data_input_stream_read_byte (_tmp8_, NULL, &_inner_error_); #line 607 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 607 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -4919,18 +4985,16 @@ void avi_chunk_read_chunk (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 607 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 4922 "VideoMetadata.c" +#line 4988 "VideoMetadata.c" } #line 607 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp12_ = sb; + _tmp9_ = sb; #line 607 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_string_append_c (_tmp12_, (gchar) _tmp9_); -#line 608 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp14_ = self->priv->input; + g_string_append_c (_tmp9_, (gchar) _tmp7_); #line 608 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp15_ = g_data_input_stream_read_byte (_tmp14_, NULL, &_inner_error_); + _tmp11_ = self->priv->input; #line 608 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp13_ = _tmp15_; + _tmp10_ = g_data_input_stream_read_byte (_tmp11_, NULL, &_inner_error_); #line 608 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 608 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -4939,28 +5003,26 @@ void avi_chunk_read_chunk (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 608 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 4942 "VideoMetadata.c" +#line 5006 "VideoMetadata.c" } #line 608 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp16_ = sb; + _tmp12_ = sb; #line 608 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_string_append_c (_tmp16_, (gchar) _tmp13_); + g_string_append_c (_tmp12_, (gchar) _tmp10_); #line 609 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp17_ = sb; + _tmp13_ = sb; #line 609 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp18_ = _tmp17_->str; + _tmp14_ = _tmp13_->str; #line 609 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp19_ = g_strdup (_tmp18_); + _tmp15_ = g_strdup (_tmp14_); #line 609 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (self->priv->section_name); #line 609 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - self->priv->section_name = _tmp19_; -#line 610 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp21_ = self->priv->input; + self->priv->section_name = _tmp15_; #line 610 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp22_ = g_data_input_stream_read_uint32 (_tmp21_, NULL, &_inner_error_); + _tmp17_ = self->priv->input; #line 610 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp20_ = _tmp22_; + _tmp16_ = g_data_input_stream_read_uint32 (_tmp17_, NULL, &_inner_error_); #line 610 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 610 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -4969,37 +5031,36 @@ void avi_chunk_read_chunk (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 610 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 4972 "VideoMetadata.c" +#line 5034 "VideoMetadata.c" } #line 610 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - self->priv->section_size = (guint64) _tmp20_; + self->priv->section_size = (guint64) _tmp16_; #line 611 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv->section_offset = (guint64) 0; #line 601 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_string_free0 (sb); -#line 4980 "VideoMetadata.c" +#line 5042 "VideoMetadata.c" } -gchar* avi_chunk_read_name (AVIChunk* self, GError** error) { +gchar* +avi_chunk_read_name (AVIChunk* self, + GError** error) +{ gchar* result = NULL; GString* sb = NULL; GString* _tmp0_; guchar _tmp1_ = '\0'; - guchar _tmp2_; - GString* _tmp3_; - guchar _tmp4_ = '\0'; - guchar _tmp5_; + GString* _tmp2_; + guchar _tmp3_ = '\0'; + GString* _tmp4_; + guchar _tmp5_ = '\0'; GString* _tmp6_; guchar _tmp7_ = '\0'; - guchar _tmp8_; + GString* _tmp8_; GString* _tmp9_; - guchar _tmp10_ = '\0'; - guchar _tmp11_; - GString* _tmp12_; - GString* _tmp13_; - const gchar* _tmp14_; - gchar* _tmp15_; + const gchar* _tmp10_; + gchar* _tmp11_; GError * _inner_error_ = NULL; #line 614 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (IS_AVI_CHUNK (self), NULL); @@ -5008,9 +5069,7 @@ gchar* avi_chunk_read_name (AVIChunk* self, GError** error) { #line 615 "/home/jens/Source/shotwell/src/VideoMetadata.vala" sb = _tmp0_; #line 616 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp2_ = avi_chunk_read_byte (self, &_inner_error_); -#line 616 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp1_ = _tmp2_; + _tmp1_ = avi_chunk_read_byte (self, &_inner_error_); #line 616 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 616 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -5019,16 +5078,14 @@ gchar* avi_chunk_read_name (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 616 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 5022 "VideoMetadata.c" +#line 5081 "VideoMetadata.c" } #line 616 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp3_ = sb; + _tmp2_ = sb; #line 616 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_string_append_c (_tmp3_, (gchar) _tmp1_); + g_string_append_c (_tmp2_, (gchar) _tmp1_); #line 617 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp5_ = avi_chunk_read_byte (self, &_inner_error_); -#line 617 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp4_ = _tmp5_; + _tmp3_ = avi_chunk_read_byte (self, &_inner_error_); #line 617 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 617 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -5037,16 +5094,14 @@ gchar* avi_chunk_read_name (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 617 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 5040 "VideoMetadata.c" +#line 5097 "VideoMetadata.c" } #line 617 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp6_ = sb; + _tmp4_ = sb; #line 617 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_string_append_c (_tmp6_, (gchar) _tmp4_); -#line 618 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp8_ = avi_chunk_read_byte (self, &_inner_error_); + g_string_append_c (_tmp4_, (gchar) _tmp3_); #line 618 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp7_ = _tmp8_; + _tmp5_ = avi_chunk_read_byte (self, &_inner_error_); #line 618 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 618 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -5055,16 +5110,14 @@ gchar* avi_chunk_read_name (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 618 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 5058 "VideoMetadata.c" +#line 5113 "VideoMetadata.c" } #line 618 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp9_ = sb; + _tmp6_ = sb; #line 618 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_string_append_c (_tmp9_, (gchar) _tmp7_); -#line 619 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp11_ = avi_chunk_read_byte (self, &_inner_error_); + g_string_append_c (_tmp6_, (gchar) _tmp5_); #line 619 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp10_ = _tmp11_; + _tmp7_ = avi_chunk_read_byte (self, &_inner_error_); #line 619 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 619 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -5073,54 +5126,56 @@ gchar* avi_chunk_read_name (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 619 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 5076 "VideoMetadata.c" +#line 5129 "VideoMetadata.c" } #line 619 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp12_ = sb; + _tmp8_ = sb; #line 619 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_string_append_c (_tmp12_, (gchar) _tmp10_); + g_string_append_c (_tmp8_, (gchar) _tmp7_); #line 620 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp13_ = sb; + _tmp9_ = sb; #line 620 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp14_ = _tmp13_->str; + _tmp10_ = _tmp9_->str; #line 620 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp15_ = g_strdup (_tmp14_); + _tmp11_ = g_strdup (_tmp10_); #line 620 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - result = _tmp15_; + result = _tmp11_; #line 620 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_string_free0 (sb); #line 620 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 5094 "VideoMetadata.c" +#line 5147 "VideoMetadata.c" } -void avi_chunk_next_chunk (AVIChunk* self, GError** error) { - guint64 _tmp0_; +void +avi_chunk_next_chunk (AVIChunk* self, + GError** error) +{ GError * _inner_error_ = NULL; #line 623 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_if_fail (IS_AVI_CHUNK (self)); #line 624 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp0_ = avi_chunk_section_size_remaining (self); -#line 624 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - avi_chunk_skip (self, _tmp0_, &_inner_error_); + avi_chunk_skip (self, avi_chunk_section_size_remaining (self), &_inner_error_); #line 624 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 624 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 624 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 5113 "VideoMetadata.c" +#line 5166 "VideoMetadata.c" } #line 625 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv->section_size = (guint64) 0; #line 626 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv->section_offset = (guint64) 0; -#line 5119 "VideoMetadata.c" +#line 5172 "VideoMetadata.c" } -gchar* avi_chunk_get_current_chunk_name (AVIChunk* self) { +gchar* +avi_chunk_get_current_chunk_name (AVIChunk* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -5134,11 +5189,13 @@ gchar* avi_chunk_get_current_chunk_name (AVIChunk* self) { result = _tmp1_; #line 630 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 5137 "VideoMetadata.c" +#line 5192 "VideoMetadata.c" } -gboolean avi_chunk_is_last_chunk (AVIChunk* self) { +gboolean +avi_chunk_is_last_chunk (AVIChunk* self) +{ gboolean result = FALSE; guint64 _tmp0_; #line 633 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -5149,11 +5206,13 @@ gboolean avi_chunk_is_last_chunk (AVIChunk* self) { result = _tmp0_ == ((guint64) 0); #line 634 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 5152 "VideoMetadata.c" +#line 5209 "VideoMetadata.c" } -guint64 avi_chunk_section_size_remaining (AVIChunk* self) { +guint64 +avi_chunk_section_size_remaining (AVIChunk* self) +{ guint64 result = 0ULL; guint64 _tmp0_; guint64 _tmp1_; @@ -5175,17 +5234,20 @@ guint64 avi_chunk_section_size_remaining (AVIChunk* self) { result = _tmp2_ - _tmp3_; #line 639 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 5178 "VideoMetadata.c" +#line 5237 "VideoMetadata.c" } -gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error) { +gchar* +avi_chunk_section_to_string (AVIChunk* self, + GError** error) +{ gchar* result = NULL; GString* sb = NULL; GString* _tmp0_; - GString* _tmp11_; - const gchar* _tmp12_; - gchar* _tmp13_; + GString* _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; GError * _inner_error_ = NULL; #line 643 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (IS_AVI_CHUNK (self), NULL); @@ -5195,14 +5257,13 @@ gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error) { sb = _tmp0_; #line 645 "/home/jens/Source/shotwell/src/VideoMetadata.vala" while (TRUE) { -#line 5198 "VideoMetadata.c" +#line 5260 "VideoMetadata.c" guint64 _tmp1_; guint64 _tmp2_; guchar _tmp3_ = '\0'; - guchar _tmp4_; + GString* _tmp4_; GString* _tmp5_; - GString* _tmp6_; - gssize _tmp7_; + gssize _tmp6_; #line 645 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp1_ = self->priv->section_offset; #line 645 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -5211,12 +5272,10 @@ gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error) { if (!(_tmp1_ < _tmp2_)) { #line 645 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 5214 "VideoMetadata.c" +#line 5275 "VideoMetadata.c" } #line 646 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp4_ = avi_chunk_read_byte (self, &_inner_error_); -#line 646 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp3_ = _tmp4_; + _tmp3_ = avi_chunk_read_byte (self, &_inner_error_); #line 646 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 646 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -5225,151 +5284,176 @@ gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 646 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 5228 "VideoMetadata.c" +#line 5287 "VideoMetadata.c" } #line 646 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp5_ = sb; + _tmp4_ = sb; #line 646 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_string_append_c (_tmp5_, (gchar) _tmp3_); + g_string_append_c (_tmp4_, (gchar) _tmp3_); #line 647 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp6_ = sb; + _tmp5_ = sb; #line 647 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp7_ = _tmp6_->len; + _tmp6_ = _tmp5_->len; #line 647 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp7_ > ((gssize) AVI_CHUNK_MAX_STRING_TO_SECTION_LENGTH)) { -#line 5240 "VideoMetadata.c" - GString* _tmp8_; - const gchar* _tmp9_; - gchar* _tmp10_; + if (_tmp6_ > ((gssize) AVI_CHUNK_MAX_STRING_TO_SECTION_LENGTH)) { +#line 5299 "VideoMetadata.c" + GString* _tmp7_; + const gchar* _tmp8_; + gchar* _tmp9_; #line 648 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp8_ = sb; + _tmp7_ = sb; #line 648 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp9_ = _tmp8_->str; + _tmp8_ = _tmp7_->str; #line 648 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp10_ = g_strdup (_tmp9_); + _tmp9_ = g_strdup (_tmp8_); #line 648 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - result = _tmp10_; + result = _tmp9_; #line 648 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_string_free0 (sb); #line 648 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 5256 "VideoMetadata.c" +#line 5315 "VideoMetadata.c" } } #line 651 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp11_ = sb; + _tmp10_ = sb; #line 651 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp12_ = _tmp11_->str; + _tmp11_ = _tmp10_->str; #line 651 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp13_ = g_strdup (_tmp12_); + _tmp12_ = g_strdup (_tmp11_); #line 651 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - result = _tmp13_; + result = _tmp12_; #line 651 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_string_free0 (sb); #line 651 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 5271 "VideoMetadata.c" +#line 5330 "VideoMetadata.c" } -static void value_avi_chunk_init (GValue* value) { +static void +value_avi_chunk_init (GValue* value) +{ #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 5278 "VideoMetadata.c" +#line 5339 "VideoMetadata.c" } -static void value_avi_chunk_free_value (GValue* value) { +static void +value_avi_chunk_free_value (GValue* value) +{ #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (value->data[0].v_pointer) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" avi_chunk_unref (value->data[0].v_pointer); -#line 5287 "VideoMetadata.c" +#line 5350 "VideoMetadata.c" } } -static void value_avi_chunk_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_avi_chunk_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (src_value->data[0].v_pointer) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" dest_value->data[0].v_pointer = avi_chunk_ref (src_value->data[0].v_pointer); -#line 5297 "VideoMetadata.c" +#line 5363 "VideoMetadata.c" } else { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 5301 "VideoMetadata.c" +#line 5367 "VideoMetadata.c" } } -static gpointer value_avi_chunk_peek_pointer (const GValue* value) { +static gpointer +value_avi_chunk_peek_pointer (const GValue* value) +{ #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return value->data[0].v_pointer; -#line 5309 "VideoMetadata.c" +#line 5377 "VideoMetadata.c" } -static gchar* value_avi_chunk_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_avi_chunk_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (collect_values[0].v_pointer) { -#line 5316 "VideoMetadata.c" +#line 5389 "VideoMetadata.c" AVIChunk * object; object = collect_values[0].v_pointer; #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (object->parent_instance.g_class == NULL) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 5323 "VideoMetadata.c" +#line 5396 "VideoMetadata.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.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 5327 "VideoMetadata.c" +#line 5400 "VideoMetadata.c" } #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = avi_chunk_ref (object); -#line 5331 "VideoMetadata.c" +#line 5404 "VideoMetadata.c" } else { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 5335 "VideoMetadata.c" +#line 5408 "VideoMetadata.c" } #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 5339 "VideoMetadata.c" +#line 5412 "VideoMetadata.c" } -static gchar* value_avi_chunk_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_avi_chunk_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ AVIChunk ** object_p; object_p = collect_values[0].v_pointer; #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (!object_p) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 5350 "VideoMetadata.c" +#line 5428 "VideoMetadata.c" } #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (!value->data[0].v_pointer) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = NULL; -#line 5356 "VideoMetadata.c" +#line 5434 "VideoMetadata.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = value->data[0].v_pointer; -#line 5360 "VideoMetadata.c" +#line 5438 "VideoMetadata.c" } else { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = avi_chunk_ref (value->data[0].v_pointer); -#line 5364 "VideoMetadata.c" +#line 5442 "VideoMetadata.c" } #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 5368 "VideoMetadata.c" +#line 5446 "VideoMetadata.c" } -GParamSpec* param_spec_avi_chunk (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_avi_chunk (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecAVIChunk* spec; #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_AVI_CHUNK), NULL); @@ -5379,20 +5463,25 @@ GParamSpec* param_spec_avi_chunk (const gchar* name, const gchar* nick, const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return G_PARAM_SPEC (spec); -#line 5382 "VideoMetadata.c" +#line 5466 "VideoMetadata.c" } -gpointer value_get_avi_chunk (const GValue* value) { +gpointer +value_get_avi_chunk (const GValue* value) +{ #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AVI_CHUNK), NULL); #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return value->data[0].v_pointer; -#line 5391 "VideoMetadata.c" +#line 5477 "VideoMetadata.c" } -void value_set_avi_chunk (GValue* value, gpointer v_object) { +void +value_set_avi_chunk (GValue* value, + gpointer v_object) +{ AVIChunk * old; #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AVI_CHUNK)); @@ -5408,22 +5497,25 @@ void value_set_avi_chunk (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" avi_chunk_ref (value->data[0].v_pointer); -#line 5411 "VideoMetadata.c" +#line 5500 "VideoMetadata.c" } else { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 5415 "VideoMetadata.c" +#line 5504 "VideoMetadata.c" } #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (old) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" avi_chunk_unref (old); -#line 5421 "VideoMetadata.c" +#line 5510 "VideoMetadata.c" } } -void value_take_avi_chunk (GValue* value, gpointer v_object) { +void +value_take_avi_chunk (GValue* value, + gpointer v_object) +{ AVIChunk * old; #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AVI_CHUNK)); @@ -5437,33 +5529,37 @@ void value_take_avi_chunk (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = v_object; -#line 5440 "VideoMetadata.c" +#line 5532 "VideoMetadata.c" } else { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 5444 "VideoMetadata.c" +#line 5536 "VideoMetadata.c" } #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (old) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" avi_chunk_unref (old); -#line 5450 "VideoMetadata.c" +#line 5542 "VideoMetadata.c" } } -static void avi_chunk_class_init (AVIChunkClass * klass) { +static void +avi_chunk_class_init (AVIChunkClass * klass) +{ #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" avi_chunk_parent_class = g_type_class_peek_parent (klass); #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" ((AVIChunkClass *) klass)->finalize = avi_chunk_finalize; #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_type_class_add_private (klass, sizeof (AVIChunkPrivate)); -#line 5462 "VideoMetadata.c" +#line 5556 "VideoMetadata.c" } -static void avi_chunk_instance_init (AVIChunk * self) { +static void +avi_chunk_instance_init (AVIChunk * self) +{ gchar* _tmp0_; #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv = AVI_CHUNK_GET_PRIVATE (self); @@ -5483,11 +5579,13 @@ static void avi_chunk_instance_init (AVIChunk * self) { self->priv->parent = NULL; #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->ref_count = 1; -#line 5486 "VideoMetadata.c" +#line 5582 "VideoMetadata.c" } -static void avi_chunk_finalize (AVIChunk * obj) { +static void +avi_chunk_finalize (AVIChunk * obj) +{ AVIChunk * self; #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_AVI_CHUNK, AVIChunk); @@ -5501,11 +5599,13 @@ static void avi_chunk_finalize (AVIChunk * obj) { _g_object_unref0 (self->priv->input); #line 540 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _avi_chunk_unref0 (self->priv->parent); -#line 5504 "VideoMetadata.c" +#line 5602 "VideoMetadata.c" } -GType avi_chunk_get_type (void) { +GType +avi_chunk_get_type (void) +{ static volatile gsize avi_chunk_type_id__volatile = 0; if (g_once_init_enter (&avi_chunk_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_avi_chunk_init, value_avi_chunk_free_value, value_avi_chunk_copy_value, value_avi_chunk_peek_pointer, "p", value_avi_chunk_collect_value, "p", value_avi_chunk_lcopy_value }; @@ -5519,18 +5619,22 @@ GType avi_chunk_get_type (void) { } -gpointer avi_chunk_ref (gpointer instance) { +gpointer +avi_chunk_ref (gpointer instance) +{ AVIChunk * self; self = instance; #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_atomic_int_inc (&self->ref_count); #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return instance; -#line 5529 "VideoMetadata.c" +#line 5631 "VideoMetadata.c" } -void avi_chunk_unref (gpointer instance) { +void +avi_chunk_unref (gpointer instance) +{ AVIChunk * self; self = instance; #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -5539,7 +5643,7 @@ void avi_chunk_unref (gpointer instance) { AVI_CHUNK_GET_CLASS (self)->finalize (self); #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_type_free_instance ((GTypeInstance *) self); -#line 5542 "VideoMetadata.c" +#line 5646 "VideoMetadata.c" } } diff --git a/src/VideoMonitor.c b/src/VideoMonitor.c index 5edd809..a3f8a75 100644 --- a/src/VideoMonitor.c +++ b/src/VideoMonitor.c @@ -1,4 +1,4 @@ -/* VideoMonitor.c generated by valac 0.36.6, the Vala compiler +/* VideoMonitor.c generated by valac 0.40.4, the Vala compiler * generated from VideoMonitor.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -189,6 +190,11 @@ typedef struct _VideoMonitorPrivate VideoMonitorPrivate; typedef struct _Workers Workers; typedef struct _WorkersClass WorkersClass; +enum { + VIDEO_MONITOR_0_PROPERTY, + VIDEO_MONITOR_NUM_PROPERTIES +}; +static GParamSpec* video_monitor_properties[VIDEO_MONITOR_NUM_PROPERTIES]; #define _workers_unref0(var) ((var == NULL) ? NULL : (var = (workers_unref (var), NULL))) #define TYPE_VIDEO_SOURCE_COLLECTION (video_source_collection_get_type ()) @@ -398,9 +404,15 @@ static gpointer video_monitor_video_interpretable_check_job_parent_class = NULL; gpointer monitorable_updates_ref (gpointer instance); void monitorable_updates_unref (gpointer instance); -GParamSpec* param_spec_monitorable_updates (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_monitorable_updates (GValue* value, gpointer v_object); -void value_take_monitorable_updates (GValue* value, gpointer v_object); +GParamSpec* param_spec_monitorable_updates (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_monitorable_updates (GValue* value, + gpointer v_object); +void value_take_monitorable_updates (GValue* value, + gpointer v_object); gpointer value_get_monitorable_updates (const GValue* value); GType monitorable_updates_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; @@ -412,15 +424,16 @@ GType video_updates_get_type (void) G_GNUC_CONST; GType video_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; #define VIDEO_UPDATES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_VIDEO_UPDATES, VideoUpdatesPrivate)) -enum { - VIDEO_UPDATES_DUMMY_PROPERTY -}; VideoUpdates* video_updates_new (Video* video); -VideoUpdates* video_updates_construct (GType object_type, Video* video); +VideoUpdates* video_updates_construct (GType object_type, + Video* video); MonitorableUpdates* monitorable_updates_new (Monitorable* monitorable); -MonitorableUpdates* monitorable_updates_construct (GType object_type, Monitorable* monitorable); -void video_updates_set_check_interpretable (VideoUpdates* self, gboolean check); -static void video_updates_real_set_check_interpretable (VideoUpdates* self, gboolean check); +MonitorableUpdates* monitorable_updates_construct (GType object_type, + Monitorable* monitorable); +void video_updates_set_check_interpretable (VideoUpdates* self, + gboolean check); +static void video_updates_real_set_check_interpretable (VideoUpdates* self, + gboolean check); static void video_updates_real_mark_online (MonitorableUpdates* base); void monitorable_updates_mark_online (MonitorableUpdates* self); gboolean video_updates_is_check_interpretable (VideoUpdates* self); @@ -430,9 +443,15 @@ static void video_updates_finalize (MonitorableUpdates * obj); GType media_monitor_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -441,165 +460,263 @@ GType media_source_collection_get_type (void) G_GNUC_CONST; GType media_monitor_discovered_file_get_type (void) G_GNUC_CONST; gpointer transaction_controller_ref (gpointer instance); void transaction_controller_unref (gpointer instance); -GParamSpec* param_spec_transaction_controller (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_transaction_controller (GValue* value, gpointer v_object); -void value_take_transaction_controller (GValue* value, gpointer v_object); +GParamSpec* param_spec_transaction_controller (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_transaction_controller (GValue* value, + gpointer v_object); +void value_take_transaction_controller (GValue* value, + gpointer v_object); gpointer value_get_transaction_controller (const GValue* value); GType transaction_controller_get_type (void) G_GNUC_CONST; GType video_monitor_get_type (void) G_GNUC_CONST; gpointer workers_ref (gpointer instance); void workers_unref (gpointer instance); -GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_workers (GValue* value, gpointer v_object); -void value_take_workers (GValue* value, gpointer v_object); +GParamSpec* param_spec_workers (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_workers (GValue* value, + gpointer v_object); +void value_take_workers (GValue* value, + gpointer v_object); gpointer value_get_workers (const GValue* value); GType workers_get_type (void) G_GNUC_CONST; #define VIDEO_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_VIDEO_MONITOR, VideoMonitorPrivate)) -enum { - VIDEO_MONITOR_DUMMY_PROPERTY -}; -Workers* workers_new (guint max_threads, gboolean exclusive); -Workers* workers_construct (GType object_type, guint max_threads, gboolean exclusive); +Workers* workers_new (guint max_threads, + gboolean exclusive); +Workers* workers_construct (GType object_type, + guint max_threads, + gboolean exclusive); #define VIDEO_MONITOR_MAX_INTERPRETABLE_CHECKS_PER_CYCLE 5 VideoMonitor* video_monitor_new (GCancellable* cancellable); -VideoMonitor* video_monitor_construct (GType object_type, GCancellable* cancellable); +VideoMonitor* video_monitor_construct (GType object_type, + GCancellable* cancellable); GType video_source_collection_get_type (void) G_GNUC_CONST; -MediaMonitor* media_monitor_construct (GType object_type, MediaSourceCollection* sources, GCancellable* cancellable); +MediaMonitor* media_monitor_construct (GType object_type, + MediaSourceCollection* sources, + GCancellable* cancellable); GeeCollection* data_collection_get_all (DataCollection* self); gboolean video_get_is_interpretable (Video* self); -void video_monitor_set_check_interpretable (VideoMonitor* self, Video* video, gboolean check); -static MonitorableUpdates* video_monitor_real_create_updates (MediaMonitor* base, Monitorable* monitorable); +void video_monitor_set_check_interpretable (VideoMonitor* self, + Video* video, + gboolean check); +static MonitorableUpdates* video_monitor_real_create_updates (MediaMonitor* base, + Monitorable* monitorable); static MediaSourceCollection* video_monitor_real_get_media_source_collection (MediaMonitor* base); -static gboolean video_monitor_real_is_file_represented (MediaMonitor* base, GFile* file); +static gboolean video_monitor_real_is_file_represented (MediaMonitor* base, + GFile* file); GType video_source_collection_state_get_type (void) G_GNUC_CONST; -static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSourceCollectionState* state); -static MediaMonitorDiscoveredFile video_monitor_real_notify_file_discovered (MediaMonitor* base, GFile* file, GFileInfo* info, Monitorable* * monitorable); -static GeeCollection* video_monitor_real_candidates_for_unknown_file (MediaMonitor* base, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_); -void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* self, GFileInfo* info, GeeCollection* matching_master); -static gboolean video_monitor_real_notify_file_created (MediaMonitor* base, GFile* file, GFileInfo* info); -void media_monitor_update_online (MediaMonitor* self, Monitorable* monitorable); -static gboolean video_monitor_real_notify_file_moved (MediaMonitor* base, GFile* old_file, GFile* new_file, GFileInfo* new_file_info); -void media_monitor_update_master_file (MediaMonitor* self, Monitorable* monitorable, GFile* file); -void media_monitor_update_offline (MediaMonitor* self, Monitorable* monitorable); -static gboolean video_monitor_real_notify_file_altered (MediaMonitor* base, GFile* file); -static gboolean video_monitor_real_notify_file_attributes_altered (MediaMonitor* base, GFile* file); -void media_monitor_update_master_file_info_altered (MediaMonitor* self, Monitorable* monitorable); -void media_monitor_update_master_file_in_alteration (MediaMonitor* self, Monitorable* monitorable, gboolean in_alteration); -static gboolean video_monitor_real_notify_file_alteration_completed (MediaMonitor* base, GFile* file, GFileInfo* info); -void media_monitor_update_master_file_alterations_completed (MediaMonitor* self, Monitorable* monitorable, GFileInfo* info); -static gboolean video_monitor_real_notify_file_deleted (MediaMonitor* base, GFile* file); +static Video* video_monitor_get_state (VideoMonitor* self, + GFile* file, + VideoSourceCollectionState* state); +static MediaMonitorDiscoveredFile video_monitor_real_notify_file_discovered (MediaMonitor* base, + GFile* file, + GFileInfo* info, + Monitorable* * monitorable); +static GeeCollection* video_monitor_real_candidates_for_unknown_file (MediaMonitor* base, + GFile* file, + GFileInfo* info, + MediaMonitorDiscoveredFile* _result_); +void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* self, + GFileInfo* info, + GeeCollection* matching_master); +static gboolean video_monitor_real_notify_file_created (MediaMonitor* base, + GFile* file, + GFileInfo* info); +void media_monitor_update_online (MediaMonitor* self, + Monitorable* monitorable); +static gboolean video_monitor_real_notify_file_moved (MediaMonitor* base, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info); +void media_monitor_update_master_file (MediaMonitor* self, + Monitorable* monitorable, + GFile* file); +void media_monitor_update_offline (MediaMonitor* self, + Monitorable* monitorable); +static gboolean video_monitor_real_notify_file_altered (MediaMonitor* base, + GFile* file); +static gboolean video_monitor_real_notify_file_attributes_altered (MediaMonitor* base, + GFile* file); +void media_monitor_update_master_file_info_altered (MediaMonitor* self, + Monitorable* monitorable); +void media_monitor_update_master_file_in_alteration (MediaMonitor* self, + Monitorable* monitorable, + gboolean in_alteration); +static gboolean video_monitor_real_notify_file_alteration_completed (MediaMonitor* base, + GFile* file, + GFileInfo* info); +void media_monitor_update_master_file_alterations_completed (MediaMonitor* self, + Monitorable* monitorable, + GFileInfo* info); +static gboolean video_monitor_real_notify_file_deleted (MediaMonitor* base, + GFile* file); GeeCollection* media_monitor_get_monitorables (MediaMonitor* self); -VideoUpdates* video_monitor_get_existing_video_updates (VideoMonitor* self, Video* video); +VideoUpdates* video_monitor_get_existing_video_updates (VideoMonitor* self, + Video* video); GFile* monitorable_updates_get_master_file (MonitorableUpdates* self); GFile* media_source_get_master_file (MediaSource* self); -Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, GFile* file, VideoSourceCollectionState* state); -VideoUpdates* video_monitor_fetch_video_updates (VideoMonitor* self, Video* video); -MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, Monitorable* monitorable); -MonitorableUpdates* media_monitor_get_existing_updates (MediaMonitor* self, Monitorable* monitorable); -static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollection* all_updates, TransactionController* controller, gint* op_count, GError** error); -void media_monitor_process_updates (MediaMonitor* self, GeeCollection* all_updates, TransactionController* controller, gint* op_count, GError** error); +Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, + GFile* file, + VideoSourceCollectionState* state); +VideoUpdates* video_monitor_fetch_video_updates (VideoMonitor* self, + Video* video); +MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, + Monitorable* monitorable); +MonitorableUpdates* media_monitor_get_existing_updates (MediaMonitor* self, + Monitorable* monitorable); +static void video_monitor_real_process_updates (MediaMonitor* base, + GeeCollection* all_updates, + TransactionController* controller, + gint* op_count, + GError** error); +void media_monitor_process_updates (MediaMonitor* self, + GeeCollection* all_updates, + TransactionController* controller, + gint* op_count, + GError** error); #define MEDIA_MONITOR_MAX_OPERATIONS_PER_CYCLE 100 void media_monitor_mdbg (const gchar* msg); void video_notify_offline_thumbs_regenerated (void); gpointer background_job_ref (gpointer instance); void background_job_unref (gpointer instance); -GParamSpec* param_spec_background_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_background_job (GValue* value, gpointer v_object); -void value_take_background_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_background_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_background_job (GValue* value, + gpointer v_object); +void value_take_background_job (GValue* value, + gpointer v_object); gpointer value_get_background_job (const GValue* value); GType background_job_get_type (void) G_GNUC_CONST; -void workers_enqueue (Workers* self, BackgroundJob* job); -static void video_monitor_on_interpretable_check_complete (VideoMonitor* self, BackgroundJob* j); -static void _video_monitor_on_interpretable_check_complete_completion_callback (BackgroundJob* job, gpointer self); -static VideoMonitorVideoInterpretableCheckJob* video_monitor_video_interpretable_check_job_new (Video* video, CompletionCallback callback, void* callback_target); -static VideoMonitorVideoInterpretableCheckJob* video_monitor_video_interpretable_check_job_construct (GType object_type, Video* video, CompletionCallback callback, void* callback_target); +void workers_enqueue (Workers* self, + BackgroundJob* job); +static void video_monitor_on_interpretable_check_complete (VideoMonitor* self, + BackgroundJob* j); +static void _video_monitor_on_interpretable_check_complete_completion_callback (BackgroundJob* job, + gpointer self); +static VideoMonitorVideoInterpretableCheckJob* video_monitor_video_interpretable_check_job_new (Video* video, + CompletionCallback callback, + void* callback_target); +static VideoMonitorVideoInterpretableCheckJob* video_monitor_video_interpretable_check_job_construct (GType object_type, + Video* video, + CompletionCallback callback, + void* callback_target); static GType video_monitor_video_interpretable_check_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; GType background_job_job_priority_get_type (void) G_GNUC_CONST; gpointer video_interpretable_results_ref (gpointer instance); void video_interpretable_results_unref (gpointer instance); -GParamSpec* video_param_spec_interpretable_results (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void video_value_set_interpretable_results (GValue* value, gpointer v_object); -void video_value_take_interpretable_results (GValue* value, gpointer v_object); +GParamSpec* video_param_spec_interpretable_results (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void video_value_set_interpretable_results (GValue* value, + gpointer v_object); +void video_value_take_interpretable_results (GValue* value, + gpointer v_object); gpointer video_value_get_interpretable_results (const GValue* value); GType video_interpretable_results_get_type (void) G_GNUC_CONST; void video_interpretable_results_foreground_finish (VideoInterpretableResults* self); void video_notify_normal_thumbs_regenerated (void); -enum { - VIDEO_MONITOR_VIDEO_INTERPRETABLE_CHECK_JOB_DUMMY_PROPERTY -}; gpointer abstract_semaphore_ref (gpointer instance); void abstract_semaphore_unref (gpointer instance); -GParamSpec* param_spec_abstract_semaphore (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_abstract_semaphore (GValue* value, gpointer v_object); -void value_take_abstract_semaphore (GValue* value, gpointer v_object); +GParamSpec* param_spec_abstract_semaphore (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_abstract_semaphore (GValue* value, + gpointer v_object); +void value_take_abstract_semaphore (GValue* value, + gpointer v_object); gpointer value_get_abstract_semaphore (const GValue* value); GType abstract_semaphore_get_type (void) G_GNUC_CONST; -BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore); +BackgroundJob* background_job_construct (GType object_type, + GObject* owner, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target, + AbstractSemaphore* completion_semaphore); static void video_monitor_video_interpretable_check_job_real_execute (BackgroundJob* base); VideoInterpretableResults* video_check_is_interpretable (Video* self); static void video_monitor_video_interpretable_check_job_finalize (BackgroundJob * obj); static void video_monitor_finalize (GObject * obj); -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 15 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return self ? g_object_ref (self) : NULL; -#line 548 "VideoMonitor.c" +#line 661 "VideoMonitor.c" } -VideoUpdates* video_updates_construct (GType object_type, Video* video) { +VideoUpdates* +video_updates_construct (GType object_type, + Video* video) +{ VideoUpdates* self = NULL; Video* _tmp0_; - Video* _tmp1_; - Video* _tmp2_; #line 12 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_val_if_fail (IS_VIDEO (video), NULL); #line 13 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp0_ = video; -#line 13 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - self = (VideoUpdates*) monitorable_updates_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MONITORABLE, Monitorable)); -#line 15 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp1_ = video; + self = (VideoUpdates*) monitorable_updates_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (video, TYPE_MONITORABLE, Monitorable)); #line 15 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp0_ = _g_object_ref0 (video); #line 15 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (self->video); #line 15 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - self->video = _tmp2_; + self->video = _tmp0_; #line 12 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return self; -#line 573 "VideoMonitor.c" +#line 683 "VideoMonitor.c" } -VideoUpdates* video_updates_new (Video* video) { +VideoUpdates* +video_updates_new (Video* video) +{ #line 12 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return video_updates_construct (TYPE_VIDEO_UPDATES, video); -#line 580 "VideoMonitor.c" +#line 692 "VideoMonitor.c" } -static void video_updates_real_set_check_interpretable (VideoUpdates* self, gboolean check) { - gboolean _tmp0_; -#line 19 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp0_ = check; +static void +video_updates_real_set_check_interpretable (VideoUpdates* self, + gboolean check) +{ #line 19 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - self->priv->check_interpretable = _tmp0_; -#line 590 "VideoMonitor.c" + self->priv->check_interpretable = check; +#line 702 "VideoMonitor.c" } -void video_updates_set_check_interpretable (VideoUpdates* self, gboolean check) { +void +video_updates_set_check_interpretable (VideoUpdates* self, + gboolean check) +{ #line 18 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_if_fail (IS_VIDEO_UPDATES (self)); #line 18 "/home/jens/Source/shotwell/src/VideoMonitor.vala" VIDEO_UPDATES_GET_CLASS (self)->set_check_interpretable (self, check); -#line 599 "VideoMonitor.c" +#line 714 "VideoMonitor.c" } -static void video_updates_real_mark_online (MonitorableUpdates* base) { +static void +video_updates_real_mark_online (MonitorableUpdates* base) +{ VideoUpdates * self; #line 22 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_UPDATES, VideoUpdates); @@ -607,11 +724,13 @@ static void video_updates_real_mark_online (MonitorableUpdates* base) { MONITORABLE_UPDATES_CLASS (video_updates_parent_class)->mark_online (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); #line 25 "/home/jens/Source/shotwell/src/VideoMonitor.vala" video_updates_set_check_interpretable (self, TRUE); -#line 611 "VideoMonitor.c" +#line 728 "VideoMonitor.c" } -gboolean video_updates_is_check_interpretable (VideoUpdates* self) { +gboolean +video_updates_is_check_interpretable (VideoUpdates* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 28 "/home/jens/Source/shotwell/src/VideoMonitor.vala" @@ -622,11 +741,13 @@ gboolean video_updates_is_check_interpretable (VideoUpdates* self) { result = _tmp0_; #line 29 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 626 "VideoMonitor.c" +#line 745 "VideoMonitor.c" } -static gboolean video_updates_real_is_all_updated (MonitorableUpdates* base) { +static gboolean +video_updates_real_is_all_updated (MonitorableUpdates* base) +{ VideoUpdates * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; @@ -637,27 +758,25 @@ static gboolean video_updates_real_is_all_updated (MonitorableUpdates* base) { _tmp1_ = self->priv->check_interpretable; #line 33 "/home/jens/Source/shotwell/src/VideoMonitor.vala" if (_tmp1_ == FALSE) { -#line 641 "VideoMonitor.c" - gboolean _tmp2_; #line 33 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp2_ = MONITORABLE_UPDATES_CLASS (video_updates_parent_class)->is_all_updated (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); -#line 33 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp0_ = _tmp2_; -#line 647 "VideoMonitor.c" + _tmp0_ = MONITORABLE_UPDATES_CLASS (video_updates_parent_class)->is_all_updated (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); +#line 764 "VideoMonitor.c" } else { #line 33 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _tmp0_ = FALSE; -#line 651 "VideoMonitor.c" +#line 768 "VideoMonitor.c" } #line 33 "/home/jens/Source/shotwell/src/VideoMonitor.vala" result = _tmp0_; #line 33 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 657 "VideoMonitor.c" +#line 774 "VideoMonitor.c" } -static void video_updates_class_init (VideoUpdatesClass * klass) { +static void +video_updates_class_init (VideoUpdatesClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/VideoMonitor.vala" video_updates_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/VideoMonitor.vala" @@ -670,20 +789,24 @@ static void video_updates_class_init (VideoUpdatesClass * klass) { ((MonitorableUpdatesClass *) klass)->mark_online = (void (*) (MonitorableUpdates *)) video_updates_real_mark_online; #line 7 "/home/jens/Source/shotwell/src/VideoMonitor.vala" ((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*) (MonitorableUpdates *)) video_updates_real_is_all_updated; -#line 674 "VideoMonitor.c" +#line 793 "VideoMonitor.c" } -static void video_updates_instance_init (VideoUpdates * self) { +static void +video_updates_instance_init (VideoUpdates * self) +{ #line 7 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self->priv = VIDEO_UPDATES_GET_PRIVATE (self); #line 10 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self->priv->check_interpretable = FALSE; -#line 683 "VideoMonitor.c" +#line 804 "VideoMonitor.c" } -static void video_updates_finalize (MonitorableUpdates * obj) { +static void +video_updates_finalize (MonitorableUpdates * obj) +{ VideoUpdates * self; #line 7 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_UPDATES, VideoUpdates); @@ -691,11 +814,13 @@ static void video_updates_finalize (MonitorableUpdates * obj) { _g_object_unref0 (self->video); #line 7 "/home/jens/Source/shotwell/src/VideoMonitor.vala" MONITORABLE_UPDATES_CLASS (video_updates_parent_class)->finalize (obj); -#line 695 "VideoMonitor.c" +#line 818 "VideoMonitor.c" } -GType video_updates_get_type (void) { +GType +video_updates_get_type (void) +{ static volatile gsize video_updates_type_id__volatile = 0; if (g_once_init_enter (&video_updates_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (VideoUpdatesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) video_updates_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (VideoUpdates), 0, (GInstanceInitFunc) video_updates_instance_init, NULL }; @@ -707,151 +832,148 @@ GType video_updates_get_type (void) { } -VideoMonitor* video_monitor_construct (GType object_type, GCancellable* cancellable) { +VideoMonitor* +video_monitor_construct (GType object_type, + GCancellable* cancellable) +{ VideoMonitor * self = NULL; VideoSourceCollection* _tmp0_; - GCancellable* _tmp1_; #line 65 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL); #line 66 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _tmp0_ = video_global; #line 66 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp1_ = cancellable; -#line 66 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - self = (VideoMonitor*) media_monitor_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp1_); -#line 723 "VideoMonitor.c" + self = (VideoMonitor*) media_monitor_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), cancellable); +#line 848 "VideoMonitor.c" { GeeIterator* _obj_it = NULL; - VideoSourceCollection* _tmp2_; + VideoSourceCollection* _tmp1_; + GeeCollection* _tmp2_; GeeCollection* _tmp3_; - GeeCollection* _tmp4_; + GeeIterator* _tmp4_; GeeIterator* _tmp5_; - GeeIterator* _tmp6_; #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp2_ = video_global; + _tmp1_ = video_global; #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp3_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp2_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)); #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _obj_it = _tmp6_; + _obj_it = _tmp5_; #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala" while (TRUE) { -#line 747 "VideoMonitor.c" - GeeIterator* _tmp7_; - gboolean _tmp8_; +#line 872 "VideoMonitor.c" + GeeIterator* _tmp6_; DataObject* obj = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; + GeeIterator* _tmp7_; + gpointer _tmp8_; Video* video = NULL; - DataObject* _tmp11_; + DataObject* _tmp9_; + Video* _tmp10_; + Video* _tmp11_; Video* _tmp12_; - Video* _tmp13_; - Video* _tmp14_; - gboolean _tmp15_; -#line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp7_ = _obj_it; #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp8_ = gee_iterator_next (_tmp7_); + _tmp6_ = _obj_it; #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp6_)) { #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala" break; -#line 767 "VideoMonitor.c" +#line 888 "VideoMonitor.c" } #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp9_ = _obj_it; + _tmp7_ = _obj_it; #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - obj = (DataObject*) _tmp10_; + obj = (DataObject*) _tmp8_; #line 69 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp11_ = obj; + _tmp9_ = obj; #line 69 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_VIDEO) ? ((Video*) _tmp11_) : NULL); + _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_VIDEO) ? ((Video*) _tmp9_) : NULL); #line 69 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - video = _tmp12_; + video = _tmp10_; #line 70 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp13_ = video; + _tmp11_ = video; #line 70 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _vala_assert (_tmp13_ != NULL, "video != null"); -#line 71 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp14_ = video; + _vala_assert (_tmp11_ != NULL, "video != null"); #line 71 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp15_ = video_get_is_interpretable (_tmp14_); + _tmp12_ = video; #line 71 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (!_tmp15_) { -#line 791 "VideoMonitor.c" - Video* _tmp16_; + if (!video_get_is_interpretable (_tmp12_)) { +#line 910 "VideoMonitor.c" + Video* _tmp13_; #line 72 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp16_ = video; + _tmp13_ = video; #line 72 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - video_monitor_set_check_interpretable (self, _tmp16_, TRUE); -#line 797 "VideoMonitor.c" + video_monitor_set_check_interpretable (self, _tmp13_, TRUE); +#line 916 "VideoMonitor.c" } #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (video); #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (obj); -#line 803 "VideoMonitor.c" +#line 922 "VideoMonitor.c" } #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (_obj_it); -#line 807 "VideoMonitor.c" +#line 926 "VideoMonitor.c" } #line 65 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return self; -#line 811 "VideoMonitor.c" +#line 930 "VideoMonitor.c" } -VideoMonitor* video_monitor_new (GCancellable* cancellable) { +VideoMonitor* +video_monitor_new (GCancellable* cancellable) +{ #line 65 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return video_monitor_construct (TYPE_VIDEO_MONITOR, cancellable); -#line 818 "VideoMonitor.c" +#line 939 "VideoMonitor.c" } -static MonitorableUpdates* video_monitor_real_create_updates (MediaMonitor* base, Monitorable* monitorable) { +static MonitorableUpdates* +video_monitor_real_create_updates (MediaMonitor* base, + Monitorable* monitorable) +{ VideoMonitor * self; MonitorableUpdates* result = NULL; - Monitorable* _tmp0_; - Monitorable* _tmp1_; - VideoUpdates* _tmp2_; + VideoUpdates* _tmp0_; #line 76 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor); #line 76 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL); #line 77 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp0_ = monitorable; -#line 77 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_VIDEO), "monitorable is Video"); + _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (monitorable, TYPE_VIDEO), "monitorable is Video"); #line 79 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp1_ = monitorable; + _tmp0_ = video_updates_new (G_TYPE_CHECK_INSTANCE_CAST (monitorable, TYPE_VIDEO, Video)); #line 79 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp2_ = video_updates_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_VIDEO, Video)); -#line 79 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MONITORABLE_UPDATES, MonitorableUpdates); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MONITORABLE_UPDATES, MonitorableUpdates); #line 79 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 844 "VideoMonitor.c" +#line 962 "VideoMonitor.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 83 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return self ? data_collection_ref (self) : NULL; -#line 851 "VideoMonitor.c" +#line 971 "VideoMonitor.c" } -static MediaSourceCollection* video_monitor_real_get_media_source_collection (MediaMonitor* base) { +static MediaSourceCollection* +video_monitor_real_get_media_source_collection (MediaMonitor* base) +{ VideoMonitor * self; MediaSourceCollection* result = NULL; VideoSourceCollection* _tmp0_; @@ -866,54 +988,58 @@ static MediaSourceCollection* video_monitor_real_get_media_source_collection (Me result = _tmp1_; #line 83 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 870 "VideoMonitor.c" +#line 992 "VideoMonitor.c" } -static gboolean video_monitor_real_is_file_represented (MediaMonitor* base, GFile* file) { +static gboolean +video_monitor_real_is_file_represented (MediaMonitor* base, + GFile* file) +{ VideoMonitor * self; gboolean result = FALSE; VideoSourceCollectionState state = 0; - GFile* _tmp0_; - VideoSourceCollectionState _tmp1_ = 0; + VideoSourceCollectionState _tmp0_ = 0; + Video* _tmp1_; Video* _tmp2_; - Video* _tmp3_; - gboolean _tmp4_; + gboolean _tmp3_; #line 86 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor); #line 86 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 88 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp0_ = file; -#line 88 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp2_ = video_monitor_get_state (self, _tmp0_, &_tmp1_); + _tmp1_ = video_monitor_get_state (self, file, &_tmp0_); #line 88 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - state = _tmp1_; + state = _tmp0_; #line 88 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 88 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp4_ = _tmp3_ != NULL; + _tmp3_ = _tmp2_ != NULL; #line 88 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 88 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - result = _tmp4_; + result = _tmp3_; #line 88 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 903 "VideoMonitor.c" +#line 1025 "VideoMonitor.c" } -static MediaMonitorDiscoveredFile video_monitor_real_notify_file_discovered (MediaMonitor* base, GFile* file, GFileInfo* info, Monitorable* * monitorable) { +static MediaMonitorDiscoveredFile +video_monitor_real_notify_file_discovered (MediaMonitor* base, + GFile* file, + GFileInfo* info, + Monitorable* * monitorable) +{ VideoMonitor * self; Monitorable* _vala_monitorable = NULL; MediaMonitorDiscoveredFile result = 0; VideoSourceCollectionState state = 0; Video* video = NULL; - GFile* _tmp0_; - VideoSourceCollectionState _tmp1_ = 0; + VideoSourceCollectionState _tmp0_ = 0; + Video* _tmp1_; Video* _tmp2_; - Video* _tmp3_; - VideoSourceCollectionState _tmp4_; + VideoSourceCollectionState _tmp3_; #line 91 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor); #line 91 "/home/jens/Source/shotwell/src/VideoMonitor.vala" @@ -921,17 +1047,15 @@ static MediaMonitorDiscoveredFile video_monitor_real_notify_file_discovered (Med #line 91 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), 0); #line 94 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp0_ = file; -#line 94 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp2_ = video_monitor_get_state (self, _tmp0_, &_tmp1_); + _tmp1_ = video_monitor_get_state (self, file, &_tmp0_); #line 94 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - state = _tmp1_; + state = _tmp0_; #line 94 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - video = _tmp2_; + video = _tmp1_; #line 95 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp3_ = video; + _tmp2_ = video; #line 95 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 96 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (_vala_monitorable); #line 96 "/home/jens/Source/shotwell/src/VideoMonitor.vala" @@ -944,36 +1068,36 @@ static MediaMonitorDiscoveredFile video_monitor_real_notify_file_discovered (Med if (monitorable) { #line 98 "/home/jens/Source/shotwell/src/VideoMonitor.vala" *monitorable = _vala_monitorable; -#line 948 "VideoMonitor.c" +#line 1072 "VideoMonitor.c" } else { #line 98 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (_vala_monitorable); -#line 952 "VideoMonitor.c" +#line 1076 "VideoMonitor.c" } #line 98 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 956 "VideoMonitor.c" +#line 1080 "VideoMonitor.c" } #line 101 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp4_ = state; + _tmp3_ = state; #line 101 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - switch (_tmp4_) { + switch (_tmp3_) { #line 101 "/home/jens/Source/shotwell/src/VideoMonitor.vala" case VIDEO_SOURCE_COLLECTION_STATE_ONLINE: #line 101 "/home/jens/Source/shotwell/src/VideoMonitor.vala" case VIDEO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 966 "VideoMonitor.c" +#line 1090 "VideoMonitor.c" { - Video* _tmp5_; - Monitorable* _tmp6_; + Video* _tmp4_; + Monitorable* _tmp5_; #line 104 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp5_ = video; + _tmp4_ = video; #line 104 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MONITORABLE, Monitorable)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MONITORABLE, Monitorable)); #line 104 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (_vala_monitorable); #line 104 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _vala_monitorable = _tmp6_; + _vala_monitorable = _tmp5_; #line 106 "/home/jens/Source/shotwell/src/VideoMonitor.vala" result = MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED; #line 106 "/home/jens/Source/shotwell/src/VideoMonitor.vala" @@ -982,20 +1106,20 @@ static MediaMonitorDiscoveredFile video_monitor_real_notify_file_discovered (Med if (monitorable) { #line 106 "/home/jens/Source/shotwell/src/VideoMonitor.vala" *monitorable = _vala_monitorable; -#line 986 "VideoMonitor.c" +#line 1110 "VideoMonitor.c" } else { #line 106 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (_vala_monitorable); -#line 990 "VideoMonitor.c" +#line 1114 "VideoMonitor.c" } #line 106 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 994 "VideoMonitor.c" +#line 1118 "VideoMonitor.c" } default: #line 101 "/home/jens/Source/shotwell/src/VideoMonitor.vala" case VIDEO_SOURCE_COLLECTION_STATE_TRASH: -#line 999 "VideoMonitor.c" +#line 1123 "VideoMonitor.c" { #line 111 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (_vala_monitorable); @@ -1009,15 +1133,15 @@ static MediaMonitorDiscoveredFile video_monitor_real_notify_file_discovered (Med if (monitorable) { #line 113 "/home/jens/Source/shotwell/src/VideoMonitor.vala" *monitorable = _vala_monitorable; -#line 1013 "VideoMonitor.c" +#line 1137 "VideoMonitor.c" } else { #line 113 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (_vala_monitorable); -#line 1017 "VideoMonitor.c" +#line 1141 "VideoMonitor.c" } #line 113 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 1021 "VideoMonitor.c" +#line 1145 "VideoMonitor.c" } } #line 91 "/home/jens/Source/shotwell/src/VideoMonitor.vala" @@ -1026,23 +1150,27 @@ static MediaMonitorDiscoveredFile video_monitor_real_notify_file_discovered (Med if (monitorable) { #line 91 "/home/jens/Source/shotwell/src/VideoMonitor.vala" *monitorable = _vala_monitorable; -#line 1030 "VideoMonitor.c" +#line 1154 "VideoMonitor.c" } else { #line 91 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (_vala_monitorable); -#line 1034 "VideoMonitor.c" +#line 1158 "VideoMonitor.c" } } -static GeeCollection* video_monitor_real_candidates_for_unknown_file (MediaMonitor* base, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_) { +static GeeCollection* +video_monitor_real_candidates_for_unknown_file (MediaMonitor* base, + GFile* file, + GFileInfo* info, + MediaMonitorDiscoveredFile* _result_) +{ VideoMonitor * self; MediaMonitorDiscoveredFile _vala_result = 0; GeeCollection* result = NULL; GeeCollection* matched = NULL; GeeArrayList* _tmp0_; VideoSourceCollection* _tmp1_; - GFileInfo* _tmp2_; #line 117 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor); #line 117 "/home/jens/Source/shotwell/src/VideoMonitor.vala" @@ -1056,9 +1184,7 @@ static GeeCollection* video_monitor_real_candidates_for_unknown_file (MediaMonit #line 120 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _tmp1_ = video_global; #line 120 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp2_ = info; -#line 120 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - video_source_collection_fetch_by_matching_backing (_tmp1_, _tmp2_, matched); + video_source_collection_fetch_by_matching_backing (_tmp1_, info, matched); #line 122 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _vala_result = MEDIA_MONITOR_DISCOVERED_FILE_UNKNOWN; #line 124 "/home/jens/Source/shotwell/src/VideoMonitor.vala" @@ -1067,24 +1193,27 @@ static GeeCollection* video_monitor_real_candidates_for_unknown_file (MediaMonit if (_result_) { #line 124 "/home/jens/Source/shotwell/src/VideoMonitor.vala" *_result_ = _vala_result; -#line 1071 "VideoMonitor.c" +#line 1197 "VideoMonitor.c" } #line 124 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 1075 "VideoMonitor.c" +#line 1201 "VideoMonitor.c" } -static gboolean video_monitor_real_notify_file_created (MediaMonitor* base, GFile* file, GFileInfo* info) { +static gboolean +video_monitor_real_notify_file_created (MediaMonitor* base, + GFile* file, + GFileInfo* info) +{ VideoMonitor * self; gboolean result = FALSE; VideoSourceCollectionState state = 0; Video* video = NULL; - GFile* _tmp0_; - VideoSourceCollectionState _tmp1_ = 0; + VideoSourceCollectionState _tmp0_ = 0; + Video* _tmp1_; Video* _tmp2_; Video* _tmp3_; - Video* _tmp4_; #line 127 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor); #line 127 "/home/jens/Source/shotwell/src/VideoMonitor.vala" @@ -1092,54 +1221,55 @@ static gboolean video_monitor_real_notify_file_created (MediaMonitor* base, GFil #line 127 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); #line 129 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp0_ = file; -#line 129 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp2_ = video_monitor_get_state (self, _tmp0_, &_tmp1_); + _tmp1_ = video_monitor_get_state (self, file, &_tmp0_); #line 129 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - state = _tmp1_; + state = _tmp0_; #line 129 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - video = _tmp2_; + video = _tmp1_; #line 130 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp3_ = video; + _tmp2_ = video; #line 130 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 131 "/home/jens/Source/shotwell/src/VideoMonitor.vala" result = FALSE; #line 131 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (video); #line 131 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 1113 "VideoMonitor.c" +#line 1240 "VideoMonitor.c" } #line 133 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp4_ = video; + _tmp3_ = video; #line 133 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - media_monitor_update_online (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MONITORABLE, Monitorable)); + media_monitor_update_online (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MONITORABLE, Monitorable)); #line 135 "/home/jens/Source/shotwell/src/VideoMonitor.vala" result = TRUE; #line 135 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (video); #line 135 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 1125 "VideoMonitor.c" +#line 1252 "VideoMonitor.c" } -static gboolean video_monitor_real_notify_file_moved (MediaMonitor* base, GFile* old_file, GFile* new_file, GFileInfo* new_file_info) { +static gboolean +video_monitor_real_notify_file_moved (MediaMonitor* base, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info) +{ VideoMonitor * self; gboolean result = FALSE; VideoSourceCollectionState old_state = 0; Video* old_video = NULL; - GFile* _tmp0_; - VideoSourceCollectionState _tmp1_ = 0; - Video* _tmp2_; + VideoSourceCollectionState _tmp0_ = 0; + Video* _tmp1_; VideoSourceCollectionState new_state = 0; Video* new_video = NULL; - GFile* _tmp3_; - VideoSourceCollectionState _tmp4_ = 0; + VideoSourceCollectionState _tmp2_ = 0; + Video* _tmp3_; + gboolean _tmp4_ = FALSE; Video* _tmp5_; - gboolean _tmp6_ = FALSE; - Video* _tmp7_; #line 138 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor); #line 138 "/home/jens/Source/shotwell/src/VideoMonitor.vala" @@ -1149,98 +1279,91 @@ static gboolean video_monitor_real_notify_file_moved (MediaMonitor* base, GFile* #line 138 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (new_file_info), FALSE); #line 140 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp0_ = old_file; -#line 140 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp2_ = video_monitor_get_state (self, _tmp0_, &_tmp1_); + _tmp1_ = video_monitor_get_state (self, old_file, &_tmp0_); #line 140 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - old_state = _tmp1_; + old_state = _tmp0_; #line 140 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - old_video = _tmp2_; -#line 143 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp3_ = new_file; + old_video = _tmp1_; #line 143 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp5_ = video_monitor_get_state (self, _tmp3_, &_tmp4_); + _tmp3_ = video_monitor_get_state (self, new_file, &_tmp2_); #line 143 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - new_state = _tmp4_; + new_state = _tmp2_; #line 143 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - new_video = _tmp5_; + new_video = _tmp3_; #line 157 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp7_ = old_video; + _tmp5_ = old_video; #line 157 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp7_ != NULL) { -#line 1172 "VideoMonitor.c" - Video* _tmp8_; + if (_tmp5_ != NULL) { +#line 1298 "VideoMonitor.c" + Video* _tmp6_; #line 157 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp8_ = new_video; + _tmp6_ = new_video; #line 157 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp6_ = _tmp8_ == NULL; -#line 1178 "VideoMonitor.c" + _tmp4_ = _tmp6_ == NULL; +#line 1304 "VideoMonitor.c" } else { #line 157 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp6_ = FALSE; -#line 1182 "VideoMonitor.c" + _tmp4_ = FALSE; +#line 1308 "VideoMonitor.c" } #line 157 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp6_) { -#line 1186 "VideoMonitor.c" - Video* _tmp9_; - GFile* _tmp10_; + if (_tmp4_) { +#line 1312 "VideoMonitor.c" + Video* _tmp7_; #line 159 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp9_ = old_video; + _tmp7_ = old_video; #line 159 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp10_ = new_file; -#line 159 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - media_monitor_update_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MONITORABLE, Monitorable), _tmp10_); -#line 1195 "VideoMonitor.c" + media_monitor_update_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MONITORABLE, Monitorable), new_file); +#line 1318 "VideoMonitor.c" } else { - gboolean _tmp11_ = FALSE; - Video* _tmp12_; + gboolean _tmp8_ = FALSE; + Video* _tmp9_; #line 160 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp12_ = old_video; + _tmp9_ = old_video; #line 160 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp12_ == NULL) { -#line 1203 "VideoMonitor.c" - Video* _tmp13_; + if (_tmp9_ == NULL) { +#line 1326 "VideoMonitor.c" + Video* _tmp10_; #line 160 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp13_ = new_video; + _tmp10_ = new_video; #line 160 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp11_ = _tmp13_ != NULL; -#line 1209 "VideoMonitor.c" + _tmp8_ = _tmp10_ != NULL; +#line 1332 "VideoMonitor.c" } else { #line 160 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp11_ = FALSE; -#line 1213 "VideoMonitor.c" + _tmp8_ = FALSE; +#line 1336 "VideoMonitor.c" } #line 160 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp11_) { -#line 1217 "VideoMonitor.c" - Video* _tmp14_; + if (_tmp8_) { +#line 1340 "VideoMonitor.c" + Video* _tmp11_; #line 162 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp14_ = new_video; + _tmp11_ = new_video; #line 162 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - video_monitor_set_check_interpretable (self, _tmp14_, TRUE); -#line 1223 "VideoMonitor.c" + video_monitor_set_check_interpretable (self, _tmp11_, TRUE); +#line 1346 "VideoMonitor.c" } else { - gboolean _tmp15_ = FALSE; - Video* _tmp16_; + gboolean _tmp12_ = FALSE; + Video* _tmp13_; #line 163 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp16_ = old_video; + _tmp13_ = old_video; #line 163 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp16_ == NULL) { -#line 1231 "VideoMonitor.c" - Video* _tmp17_; + if (_tmp13_ == NULL) { +#line 1354 "VideoMonitor.c" + Video* _tmp14_; #line 163 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp17_ = new_video; + _tmp14_ = new_video; #line 163 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp15_ = _tmp17_ == NULL; -#line 1237 "VideoMonitor.c" + _tmp12_ = _tmp14_ == NULL; +#line 1360 "VideoMonitor.c" } else { #line 163 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp15_ = FALSE; -#line 1241 "VideoMonitor.c" + _tmp12_ = FALSE; +#line 1364 "VideoMonitor.c" } #line 163 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp15_) { + if (_tmp12_) { #line 165 "/home/jens/Source/shotwell/src/VideoMonitor.vala" result = FALSE; #line 165 "/home/jens/Source/shotwell/src/VideoMonitor.vala" @@ -1249,39 +1372,39 @@ static gboolean video_monitor_real_notify_file_moved (MediaMonitor* base, GFile* _g_object_unref0 (old_video); #line 165 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 1253 "VideoMonitor.c" +#line 1376 "VideoMonitor.c" } else { - gboolean _tmp18_ = FALSE; + gboolean _tmp15_ = FALSE; + Video* _tmp16_; + Video* _tmp18_; Video* _tmp19_; - Video* _tmp21_; - Video* _tmp22_; #line 167 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp19_ = old_video; + _tmp16_ = old_video; #line 167 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp19_ != NULL) { -#line 1263 "VideoMonitor.c" - Video* _tmp20_; + if (_tmp16_ != NULL) { +#line 1386 "VideoMonitor.c" + Video* _tmp17_; #line 167 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp20_ = new_video; + _tmp17_ = new_video; #line 167 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp18_ = _tmp20_ != NULL; -#line 1269 "VideoMonitor.c" + _tmp15_ = _tmp17_ != NULL; +#line 1392 "VideoMonitor.c" } else { #line 167 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp18_ = FALSE; -#line 1273 "VideoMonitor.c" + _tmp15_ = FALSE; +#line 1396 "VideoMonitor.c" } #line 167 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _vala_assert (_tmp18_, "old_video != null && new_video != null"); + _vala_assert (_tmp15_, "old_video != null && new_video != null"); #line 170 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp21_ = old_video; + _tmp18_ = old_video; #line 170 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - media_monitor_update_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_MONITORABLE, Monitorable)); + media_monitor_update_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_MONITORABLE, Monitorable)); #line 171 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp22_ = new_video; + _tmp19_ = new_video; #line 171 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - video_monitor_set_check_interpretable (self, _tmp22_, TRUE); -#line 1285 "VideoMonitor.c" + video_monitor_set_check_interpretable (self, _tmp19_, TRUE); +#line 1408 "VideoMonitor.c" } } } @@ -1293,107 +1416,109 @@ static gboolean video_monitor_real_notify_file_moved (MediaMonitor* base, GFile* _g_object_unref0 (old_video); #line 174 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 1297 "VideoMonitor.c" +#line 1420 "VideoMonitor.c" } -static gboolean video_monitor_real_notify_file_altered (MediaMonitor* base, GFile* file) { +static gboolean +video_monitor_real_notify_file_altered (MediaMonitor* base, + GFile* file) +{ VideoMonitor * self; gboolean result = FALSE; VideoSourceCollectionState state = 0; - GFile* _tmp0_; - VideoSourceCollectionState _tmp1_ = 0; + VideoSourceCollectionState _tmp0_ = 0; + Video* _tmp1_; Video* _tmp2_; - Video* _tmp3_; - gboolean _tmp4_; + gboolean _tmp3_; #line 177 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor); #line 177 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 179 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp0_ = file; -#line 179 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp2_ = video_monitor_get_state (self, _tmp0_, &_tmp1_); + _tmp1_ = video_monitor_get_state (self, file, &_tmp0_); #line 179 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - state = _tmp1_; + state = _tmp0_; #line 179 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 179 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp4_ = _tmp3_ != NULL; + _tmp3_ = _tmp2_ != NULL; #line 179 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 179 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - result = _tmp4_; + result = _tmp3_; #line 179 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 1330 "VideoMonitor.c" +#line 1453 "VideoMonitor.c" } -static gboolean video_monitor_real_notify_file_attributes_altered (MediaMonitor* base, GFile* file) { +static gboolean +video_monitor_real_notify_file_attributes_altered (MediaMonitor* base, + GFile* file) +{ VideoMonitor * self; gboolean result = FALSE; VideoSourceCollectionState state = 0; Video* video = NULL; - GFile* _tmp0_; - VideoSourceCollectionState _tmp1_ = 0; + VideoSourceCollectionState _tmp0_ = 0; + Video* _tmp1_; Video* _tmp2_; Video* _tmp3_; Video* _tmp4_; - Video* _tmp5_; #line 182 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor); #line 182 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 184 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp0_ = file; + _tmp1_ = video_monitor_get_state (self, file, &_tmp0_); #line 184 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp2_ = video_monitor_get_state (self, _tmp0_, &_tmp1_); + state = _tmp0_; #line 184 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - state = _tmp1_; -#line 184 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - video = _tmp2_; + video = _tmp1_; #line 185 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp3_ = video; + _tmp2_ = video; #line 185 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 186 "/home/jens/Source/shotwell/src/VideoMonitor.vala" result = FALSE; #line 186 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (video); #line 186 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 1367 "VideoMonitor.c" +#line 1490 "VideoMonitor.c" } #line 188 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp4_ = video; + _tmp3_ = video; #line 188 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - media_monitor_update_master_file_info_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MONITORABLE, Monitorable)); + media_monitor_update_master_file_info_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MONITORABLE, Monitorable)); #line 189 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp5_ = video; + _tmp4_ = video; #line 189 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MONITORABLE, Monitorable), TRUE); + media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MONITORABLE, Monitorable), TRUE); #line 191 "/home/jens/Source/shotwell/src/VideoMonitor.vala" result = TRUE; #line 191 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (video); #line 191 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 1383 "VideoMonitor.c" +#line 1506 "VideoMonitor.c" } -static gboolean video_monitor_real_notify_file_alteration_completed (MediaMonitor* base, GFile* file, GFileInfo* info) { +static gboolean +video_monitor_real_notify_file_alteration_completed (MediaMonitor* base, + GFile* file, + GFileInfo* info) +{ VideoMonitor * self; gboolean result = FALSE; VideoSourceCollectionState state = 0; Video* video = NULL; - GFile* _tmp0_; - VideoSourceCollectionState _tmp1_ = 0; + VideoSourceCollectionState _tmp0_ = 0; + Video* _tmp1_; Video* _tmp2_; Video* _tmp3_; - Video* _tmp4_; - GFileInfo* _tmp5_; #line 194 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor); #line 194 "/home/jens/Source/shotwell/src/VideoMonitor.vala" @@ -1401,110 +1526,110 @@ static gboolean video_monitor_real_notify_file_alteration_completed (MediaMonito #line 194 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); #line 196 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp0_ = file; -#line 196 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp2_ = video_monitor_get_state (self, _tmp0_, &_tmp1_); + _tmp1_ = video_monitor_get_state (self, file, &_tmp0_); #line 196 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - state = _tmp1_; + state = _tmp0_; #line 196 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - video = _tmp2_; + video = _tmp1_; #line 197 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp3_ = video; + _tmp2_ = video; #line 197 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 198 "/home/jens/Source/shotwell/src/VideoMonitor.vala" result = FALSE; #line 198 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (video); #line 198 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 1422 "VideoMonitor.c" +#line 1545 "VideoMonitor.c" } #line 200 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp4_ = video; -#line 200 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp5_ = info; + _tmp3_ = video; #line 200 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - media_monitor_update_master_file_alterations_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MONITORABLE, Monitorable), _tmp5_); + media_monitor_update_master_file_alterations_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MONITORABLE, Monitorable), info); #line 202 "/home/jens/Source/shotwell/src/VideoMonitor.vala" result = TRUE; #line 202 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (video); #line 202 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 1436 "VideoMonitor.c" +#line 1557 "VideoMonitor.c" } -static gboolean video_monitor_real_notify_file_deleted (MediaMonitor* base, GFile* file) { +static gboolean +video_monitor_real_notify_file_deleted (MediaMonitor* base, + GFile* file) +{ VideoMonitor * self; gboolean result = FALSE; VideoSourceCollectionState state = 0; Video* video = NULL; - GFile* _tmp0_; - VideoSourceCollectionState _tmp1_ = 0; + VideoSourceCollectionState _tmp0_ = 0; + Video* _tmp1_; Video* _tmp2_; Video* _tmp3_; Video* _tmp4_; - Video* _tmp5_; #line 205 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor); #line 205 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 207 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp0_ = file; -#line 207 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp2_ = video_monitor_get_state (self, _tmp0_, &_tmp1_); + _tmp1_ = video_monitor_get_state (self, file, &_tmp0_); #line 207 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - state = _tmp1_; + state = _tmp0_; #line 207 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - video = _tmp2_; + video = _tmp1_; #line 208 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp3_ = video; + _tmp2_ = video; #line 208 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 209 "/home/jens/Source/shotwell/src/VideoMonitor.vala" result = FALSE; #line 209 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (video); #line 209 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 1473 "VideoMonitor.c" +#line 1594 "VideoMonitor.c" } #line 211 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp4_ = video; + _tmp3_ = video; #line 211 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MONITORABLE, Monitorable), FALSE); + media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MONITORABLE, Monitorable), FALSE); #line 212 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp5_ = video; + _tmp4_ = video; #line 212 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - media_monitor_update_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MONITORABLE, Monitorable)); + media_monitor_update_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MONITORABLE, Monitorable)); #line 214 "/home/jens/Source/shotwell/src/VideoMonitor.vala" result = TRUE; #line 214 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (video); #line 214 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 1489 "VideoMonitor.c" +#line 1610 "VideoMonitor.c" } -static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSourceCollectionState* state) { +static Video* +video_monitor_get_state (VideoMonitor* self, + GFile* file, + VideoSourceCollectionState* state) +{ VideoSourceCollectionState _vala_state = 0; Video* result = NULL; GFile* real_file = NULL; - GFile* _tmp25_ = NULL; - GFile* _tmp26_; - VideoSourceCollection* _tmp28_; - VideoSourceCollectionState _tmp29_ = 0; - Video* _tmp30_; + GFile* _tmp22_ = NULL; + GFile* _tmp23_; + VideoSourceCollection* _tmp24_; + VideoSourceCollectionState _tmp25_ = 0; + Video* _tmp26_; #line 217 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_val_if_fail (IS_VIDEO_MONITOR (self), NULL); #line 217 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 218 "/home/jens/Source/shotwell/src/VideoMonitor.vala" real_file = NULL; -#line 1508 "VideoMonitor.c" +#line 1633 "VideoMonitor.c" { GeeIterator* _monitorable_it = NULL; GeeCollection* _tmp0_; @@ -1525,56 +1650,53 @@ static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSou _monitorable_it = _tmp3_; #line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala" while (TRUE) { -#line 1529 "VideoMonitor.c" +#line 1654 "VideoMonitor.c" GeeIterator* _tmp4_; - gboolean _tmp5_; Monitorable* monitorable = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; + GeeIterator* _tmp5_; + gpointer _tmp6_; Video* video = NULL; - Monitorable* _tmp8_; - Video* _tmp9_; + Monitorable* _tmp7_; + Video* _tmp8_; VideoUpdates* updates = NULL; - Video* _tmp10_; + Video* _tmp9_; + VideoUpdates* _tmp10_; VideoUpdates* _tmp11_; - VideoUpdates* _tmp12_; - gboolean _tmp13_ = FALSE; - VideoUpdates* _tmp14_; + gboolean _tmp12_ = FALSE; + VideoUpdates* _tmp13_; + GFile* _tmp14_; GFile* _tmp15_; - GFile* _tmp16_; - gboolean _tmp17_; + gboolean _tmp16_; #line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _tmp4_ = _monitorable_it; #line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp4_)) { #line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala" break; -#line 1555 "VideoMonitor.c" +#line 1677 "VideoMonitor.c" } #line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp6_ = _monitorable_it; + _tmp5_ = _monitorable_it; #line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - monitorable = (Monitorable*) _tmp7_; + monitorable = (Monitorable*) _tmp6_; #line 220 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp8_ = monitorable; + _tmp7_ = monitorable; #line 220 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_VIDEO, Video)); + _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIDEO, Video)); #line 220 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - video = _tmp9_; + video = _tmp8_; #line 222 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp10_ = video; + _tmp9_ = video; #line 222 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp11_ = video_monitor_get_existing_video_updates (self, _tmp10_); + _tmp10_ = video_monitor_get_existing_video_updates (self, _tmp9_); #line 222 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - updates = _tmp11_; + updates = _tmp10_; #line 223 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp12_ = updates; + _tmp11_ = updates; #line 223 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp12_ == NULL) { + if (_tmp11_ == NULL) { #line 224 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _monitorable_updates_unref0 (updates); #line 224 "/home/jens/Source/shotwell/src/VideoMonitor.vala" @@ -1583,59 +1705,53 @@ static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSou _g_object_unref0 (monitorable); #line 224 "/home/jens/Source/shotwell/src/VideoMonitor.vala" continue; -#line 1587 "VideoMonitor.c" +#line 1709 "VideoMonitor.c" } #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp14_ = updates; + _tmp13_ = updates; #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp15_ = monitorable_updates_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); + _tmp14_ = monitorable_updates_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp17_ = _tmp16_ != NULL; + _tmp16_ = _tmp15_ != NULL; #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp15_); #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp17_) { -#line 1601 "VideoMonitor.c" - VideoUpdates* _tmp18_; + if (_tmp16_) { +#line 1723 "VideoMonitor.c" + VideoUpdates* _tmp17_; + GFile* _tmp18_; GFile* _tmp19_; - GFile* _tmp20_; - GFile* _tmp21_; - gboolean _tmp22_; -#line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp18_ = updates; #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp19_ = monitorable_updates_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); + _tmp17_ = updates; #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp20_ = _tmp19_; + _tmp18_ = monitorable_updates_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp21_ = file; + _tmp19_ = _tmp18_; #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp22_ = g_file_equal (_tmp20_, _tmp21_); + _tmp12_ = g_file_equal (_tmp19_, file); #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp13_ = _tmp22_; -#line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _g_object_unref0 (_tmp20_); -#line 1621 "VideoMonitor.c" + _g_object_unref0 (_tmp19_); +#line 1737 "VideoMonitor.c" } else { #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp13_ = FALSE; -#line 1625 "VideoMonitor.c" + _tmp12_ = FALSE; +#line 1741 "VideoMonitor.c" } #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp13_) { -#line 1629 "VideoMonitor.c" - Video* _tmp23_; - GFile* _tmp24_; + if (_tmp12_) { +#line 1745 "VideoMonitor.c" + Video* _tmp20_; + GFile* _tmp21_; #line 227 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp23_ = video; + _tmp20_ = video; #line 227 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp24_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp21_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_MEDIA_SOURCE, MediaSource)); #line 227 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (real_file); #line 227 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - real_file = _tmp24_; + real_file = _tmp21_; #line 229 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _monitorable_updates_unref0 (updates); #line 229 "/home/jens/Source/shotwell/src/VideoMonitor.vala" @@ -1644,7 +1760,7 @@ static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSou _g_object_unref0 (monitorable); #line 229 "/home/jens/Source/shotwell/src/VideoMonitor.vala" break; -#line 1648 "VideoMonitor.c" +#line 1764 "VideoMonitor.c" } #line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _monitorable_updates_unref0 (updates); @@ -1652,156 +1768,159 @@ static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSou _g_object_unref0 (video); #line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (monitorable); -#line 1656 "VideoMonitor.c" +#line 1772 "VideoMonitor.c" } #line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (_monitorable_it); -#line 1660 "VideoMonitor.c" +#line 1776 "VideoMonitor.c" } #line 233 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp26_ = real_file; -#line 233 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp25_ = _tmp26_; + _tmp23_ = real_file; #line 233 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp25_ == NULL) { -#line 1668 "VideoMonitor.c" - GFile* _tmp27_; + _tmp22_ = _tmp23_; #line 233 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp27_ = file; + if (_tmp22_ == NULL) { #line 233 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp25_ = _tmp27_; -#line 1674 "VideoMonitor.c" + _tmp22_ = file; +#line 1786 "VideoMonitor.c" } #line 233 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp28_ = video_global; + _tmp24_ = video_global; #line 233 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp30_ = video_source_collection_get_state_by_file (_tmp28_, _tmp25_, &_tmp29_); + _tmp26_ = video_source_collection_get_state_by_file (_tmp24_, _tmp22_, &_tmp25_); #line 233 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _vala_state = _tmp29_; + _vala_state = _tmp25_; #line 233 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - result = _tmp30_; + result = _tmp26_; #line 233 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (real_file); #line 233 "/home/jens/Source/shotwell/src/VideoMonitor.vala" if (state) { #line 233 "/home/jens/Source/shotwell/src/VideoMonitor.vala" *state = _vala_state; -#line 1690 "VideoMonitor.c" +#line 1802 "VideoMonitor.c" } #line 233 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 1694 "VideoMonitor.c" +#line 1806 "VideoMonitor.c" } -VideoUpdates* video_monitor_fetch_video_updates (VideoMonitor* self, Video* video) { +VideoUpdates* +video_monitor_fetch_video_updates (VideoMonitor* self, + Video* video) +{ VideoUpdates* result = NULL; VideoUpdates* updates = NULL; - Video* _tmp0_; - MonitorableUpdates* _tmp1_; - VideoUpdates* _tmp2_; + MonitorableUpdates* _tmp0_; + VideoUpdates* _tmp1_; #line 236 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_val_if_fail (IS_VIDEO_MONITOR (self), NULL); #line 236 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_val_if_fail (IS_VIDEO (video), NULL); #line 237 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp0_ = video; + _tmp0_ = media_monitor_fetch_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (video, TYPE_MONITORABLE, Monitorable)); #line 237 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp1_ = media_monitor_fetch_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MONITORABLE, Monitorable)); + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_VIDEO_UPDATES) ? ((VideoUpdates*) _tmp0_) : NULL; #line 237 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_VIDEO_UPDATES) ? ((VideoUpdates*) _tmp1_) : NULL; + if (_tmp1_ == NULL) { #line 237 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp2_ == NULL) { -#line 237 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _monitorable_updates_unref0 (_tmp1_); -#line 1718 "VideoMonitor.c" + _monitorable_updates_unref0 (_tmp0_); +#line 1830 "VideoMonitor.c" } #line 237 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - updates = _tmp2_; + updates = _tmp1_; #line 238 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _vala_assert (updates != NULL, "updates != null"); #line 240 "/home/jens/Source/shotwell/src/VideoMonitor.vala" result = updates; #line 240 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 1728 "VideoMonitor.c" +#line 1840 "VideoMonitor.c" } -VideoUpdates* video_monitor_get_existing_video_updates (VideoMonitor* self, Video* video) { +VideoUpdates* +video_monitor_get_existing_video_updates (VideoMonitor* self, + Video* video) +{ VideoUpdates* result = NULL; - Video* _tmp0_; - MonitorableUpdates* _tmp1_; - VideoUpdates* _tmp2_; + MonitorableUpdates* _tmp0_; + VideoUpdates* _tmp1_; #line 243 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_val_if_fail (IS_VIDEO_MONITOR (self), NULL); #line 243 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_val_if_fail (IS_VIDEO (video), NULL); #line 244 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp0_ = video; -#line 244 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp1_ = media_monitor_get_existing_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MONITORABLE, Monitorable)); + _tmp0_ = media_monitor_get_existing_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (video, TYPE_MONITORABLE, Monitorable)); #line 244 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_VIDEO_UPDATES) ? ((VideoUpdates*) _tmp1_) : NULL; + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_VIDEO_UPDATES) ? ((VideoUpdates*) _tmp0_) : NULL; #line 244 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 244 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _monitorable_updates_unref0 (_tmp1_); -#line 1751 "VideoMonitor.c" + _monitorable_updates_unref0 (_tmp0_); +#line 1863 "VideoMonitor.c" } #line 244 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - result = _tmp2_; + result = _tmp1_; #line 244 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return result; -#line 1757 "VideoMonitor.c" +#line 1869 "VideoMonitor.c" } -void video_monitor_set_check_interpretable (VideoMonitor* self, Video* video, gboolean check) { - Video* _tmp0_; +void +video_monitor_set_check_interpretable (VideoMonitor* self, + Video* video, + gboolean check) +{ + VideoUpdates* _tmp0_; VideoUpdates* _tmp1_; - VideoUpdates* _tmp2_; - gboolean _tmp3_; #line 247 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_if_fail (IS_VIDEO_MONITOR (self)); #line 247 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_if_fail (IS_VIDEO (video)); #line 248 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp0_ = video; -#line 248 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp1_ = video_monitor_fetch_video_updates (self, _tmp0_); + _tmp0_ = video_monitor_fetch_video_updates (self, video); #line 248 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 248 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp3_ = check; + video_updates_set_check_interpretable (_tmp1_, check); #line 248 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - video_updates_set_check_interpretable (_tmp2_, _tmp3_); -#line 248 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 1782 "VideoMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 1892 "VideoMonitor.c" } -static gpointer _monitorable_updates_ref0 (gpointer self) { +static gpointer +_monitorable_updates_ref0 (gpointer self) +{ #line 266 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return self ? monitorable_updates_ref (self) : NULL; -#line 1789 "VideoMonitor.c" +#line 1901 "VideoMonitor.c" } -static void _video_monitor_on_interpretable_check_complete_completion_callback (BackgroundJob* job, gpointer self) { +static void +_video_monitor_on_interpretable_check_complete_completion_callback (BackgroundJob* job, + gpointer self) +{ #line 287 "/home/jens/Source/shotwell/src/VideoMonitor.vala" video_monitor_on_interpretable_check_complete ((VideoMonitor*) self, job); -#line 1796 "VideoMonitor.c" +#line 1911 "VideoMonitor.c" } -static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollection* all_updates, TransactionController* controller, gint* op_count, GError** error) { +static void +video_monitor_real_process_updates (MediaMonitor* base, + GeeCollection* all_updates, + TransactionController* controller, + gint* op_count, + GError** error) +{ VideoMonitor * self; - GeeCollection* _tmp0_; - TransactionController* _tmp1_; GeeArrayList* check = NULL; - GeeArrayList* _tmp26_; + GeeArrayList* _tmp20_; GError * _inner_error_ = NULL; #line 251 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor); @@ -1810,395 +1929,380 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio #line 251 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_if_fail (IS_TRANSACTION_CONTROLLER (controller)); #line 253 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp0_ = all_updates; -#line 253 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp1_ = controller; -#line 253 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - MEDIA_MONITOR_CLASS (video_monitor_parent_class)->process_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), _tmp0_, _tmp1_, op_count, &_inner_error_); + MEDIA_MONITOR_CLASS (video_monitor_parent_class)->process_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), all_updates, controller, op_count, &_inner_error_); #line 253 "/home/jens/Source/shotwell/src/VideoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 253 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_propagate_error (error, _inner_error_); #line 253 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return; -#line 1825 "VideoMonitor.c" +#line 1940 "VideoMonitor.c" } #line 255 "/home/jens/Source/shotwell/src/VideoMonitor.vala" check = NULL; -#line 1829 "VideoMonitor.c" +#line 1944 "VideoMonitor.c" { GeeIterator* _monitorable_updates_it = NULL; - GeeCollection* _tmp2_; - GeeIterator* _tmp3_; -#line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp2_ = all_updates; + GeeIterator* _tmp0_; #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (all_updates, GEE_TYPE_ITERABLE, GeeIterable)); #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _monitorable_updates_it = _tmp3_; + _monitorable_updates_it = _tmp0_; #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala" while (TRUE) { -#line 1842 "VideoMonitor.c" - GeeIterator* _tmp4_; - gboolean _tmp5_; +#line 1954 "VideoMonitor.c" + GeeIterator* _tmp1_; MonitorableUpdates* monitorable_updates = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - gint _tmp8_; - gboolean _tmp9_ = FALSE; - GeeArrayList* _tmp10_; + GeeIterator* _tmp2_; + gpointer _tmp3_; + gboolean _tmp4_ = FALSE; + GeeArrayList* _tmp5_; VideoUpdates* updates = NULL; - MonitorableUpdates* _tmp14_; - VideoUpdates* _tmp15_; - VideoUpdates* _tmp16_; - VideoUpdates* _tmp17_; - gboolean _tmp18_; -#line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp4_ = _monitorable_updates_it; + MonitorableUpdates* _tmp9_; + VideoUpdates* _tmp10_; + VideoUpdates* _tmp11_; + VideoUpdates* _tmp12_; #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp5_ = gee_iterator_next (_tmp4_); + _tmp1_ = _monitorable_updates_it; #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp1_)) { #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala" break; -#line 1865 "VideoMonitor.c" +#line 1972 "VideoMonitor.c" } #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp6_ = _monitorable_updates_it; + _tmp2_ = _monitorable_updates_it; #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - monitorable_updates = (MonitorableUpdates*) _tmp7_; -#line 258 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp8_ = *op_count; + monitorable_updates = (MonitorableUpdates*) _tmp3_; #line 258 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp8_ >= MEDIA_MONITOR_MAX_OPERATIONS_PER_CYCLE) { + if ((*op_count) >= MEDIA_MONITOR_MAX_OPERATIONS_PER_CYCLE) { #line 259 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _monitorable_updates_unref0 (monitorable_updates); #line 259 "/home/jens/Source/shotwell/src/VideoMonitor.vala" break; -#line 1881 "VideoMonitor.c" +#line 1986 "VideoMonitor.c" } #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp10_ = check; + _tmp5_ = check; #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp10_ != NULL) { -#line 1887 "VideoMonitor.c" - GeeArrayList* _tmp11_; - gint _tmp12_; - gint _tmp13_; + if (_tmp5_ != NULL) { +#line 1992 "VideoMonitor.c" + GeeArrayList* _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp11_ = check; + _tmp6_ = check; #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp13_ = _tmp12_; + _tmp8_ = _tmp7_; #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp9_ = _tmp13_ >= VIDEO_MONITOR_MAX_INTERPRETABLE_CHECKS_PER_CYCLE; -#line 1899 "VideoMonitor.c" + _tmp4_ = _tmp8_ >= VIDEO_MONITOR_MAX_INTERPRETABLE_CHECKS_PER_CYCLE; +#line 2004 "VideoMonitor.c" } else { #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp9_ = FALSE; -#line 1903 "VideoMonitor.c" + _tmp4_ = FALSE; +#line 2008 "VideoMonitor.c" } #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp9_) { + if (_tmp4_) { #line 264 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _monitorable_updates_unref0 (monitorable_updates); #line 264 "/home/jens/Source/shotwell/src/VideoMonitor.vala" break; -#line 1911 "VideoMonitor.c" +#line 2016 "VideoMonitor.c" } #line 266 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp14_ = monitorable_updates; + _tmp9_ = monitorable_updates; #line 266 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp15_ = _monitorable_updates_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_VIDEO_UPDATES) ? ((VideoUpdates*) _tmp14_) : NULL); + _tmp10_ = _monitorable_updates_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_VIDEO_UPDATES) ? ((VideoUpdates*) _tmp9_) : NULL); #line 266 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - updates = _tmp15_; + updates = _tmp10_; #line 267 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp16_ = updates; + _tmp11_ = updates; #line 267 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp16_ == NULL) { + if (_tmp11_ == NULL) { #line 268 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _monitorable_updates_unref0 (updates); #line 268 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _monitorable_updates_unref0 (monitorable_updates); #line 268 "/home/jens/Source/shotwell/src/VideoMonitor.vala" continue; -#line 1929 "VideoMonitor.c" +#line 2034 "VideoMonitor.c" } #line 270 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp17_ = updates; -#line 270 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp18_ = video_updates_is_check_interpretable (_tmp17_); + _tmp12_ = updates; #line 270 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp18_) { -#line 1937 "VideoMonitor.c" - GeeArrayList* _tmp19_; - GeeArrayList* _tmp21_; - VideoUpdates* _tmp22_; - Video* _tmp23_; - VideoUpdates* _tmp24_; - gint _tmp25_; + if (video_updates_is_check_interpretable (_tmp12_)) { +#line 2040 "VideoMonitor.c" + GeeArrayList* _tmp13_; + GeeArrayList* _tmp15_; + VideoUpdates* _tmp16_; + Video* _tmp17_; + VideoUpdates* _tmp18_; + gint _tmp19_; #line 271 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp19_ = check; + _tmp13_ = check; #line 271 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp19_ == NULL) { -#line 1948 "VideoMonitor.c" - GeeArrayList* _tmp20_; + if (_tmp13_ == NULL) { +#line 2051 "VideoMonitor.c" + GeeArrayList* _tmp14_; #line 272 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp20_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp14_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 272 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (check); #line 272 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - check = _tmp20_; -#line 1956 "VideoMonitor.c" + check = _tmp14_; +#line 2059 "VideoMonitor.c" } #line 274 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp21_ = check; + _tmp15_ = check; #line 274 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp22_ = updates; + _tmp16_ = updates; #line 274 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp23_ = _tmp22_->video; + _tmp17_ = _tmp16_->video; #line 274 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp23_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); #line 275 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp24_ = updates; + _tmp18_ = updates; #line 275 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - video_updates_set_check_interpretable (_tmp24_, FALSE); + video_updates_set_check_interpretable (_tmp18_, FALSE); #line 276 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp25_ = *op_count; + _tmp19_ = *op_count; #line 276 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - *op_count = _tmp25_ + 1; -#line 1974 "VideoMonitor.c" + *op_count = _tmp19_ + 1; +#line 2077 "VideoMonitor.c" } #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _monitorable_updates_unref0 (updates); #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _monitorable_updates_unref0 (monitorable_updates); -#line 1980 "VideoMonitor.c" +#line 2083 "VideoMonitor.c" } #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (_monitorable_updates_it); -#line 1984 "VideoMonitor.c" +#line 2087 "VideoMonitor.c" } #line 280 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp26_ = check; + _tmp20_ = check; #line 280 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp26_ != NULL) { -#line 1990 "VideoMonitor.c" + if (_tmp20_ != NULL) { +#line 2093 "VideoMonitor.c" + GeeArrayList* _tmp21_; + gint _tmp22_; + gint _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; + guint64 _tmp26_; GeeArrayList* _tmp27_; gint _tmp28_; gint _tmp29_; - gchar* _tmp30_; - gchar* _tmp31_; - guint64 _tmp32_; - GeeArrayList* _tmp33_; - gint _tmp34_; - gint _tmp35_; #line 281 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp27_ = check; + _tmp21_ = check; #line 281 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp22_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 281 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp29_ = _tmp28_; + _tmp23_ = _tmp22_; #line 281 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp30_ = g_strdup_printf ("Checking interpretable for %d videos", _tmp29_); + _tmp24_ = g_strdup_printf ("Checking interpretable for %d videos", _tmp23_); #line 281 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp31_ = _tmp30_; + _tmp25_ = _tmp24_; #line 281 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - media_monitor_mdbg (_tmp31_); + media_monitor_mdbg (_tmp25_); #line 281 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _g_free0 (_tmp31_); + _g_free0 (_tmp25_); #line 283 "/home/jens/Source/shotwell/src/VideoMonitor.vala" video_notify_offline_thumbs_regenerated (); #line 285 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp32_ = self->priv->background_jobs; + _tmp26_ = self->priv->background_jobs; #line 285 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp33_ = check; + _tmp27_ = check; #line 285 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 285 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp35_ = _tmp34_; + _tmp29_ = _tmp28_; #line 285 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - self->priv->background_jobs = _tmp32_ + _tmp35_; -#line 2026 "VideoMonitor.c" + self->priv->background_jobs = _tmp26_ + _tmp29_; +#line 2129 "VideoMonitor.c" { GeeArrayList* _video_list = NULL; - GeeArrayList* _tmp36_; - GeeArrayList* _tmp37_; + GeeArrayList* _tmp30_; + GeeArrayList* _tmp31_; gint _video_size = 0; - GeeArrayList* _tmp38_; - gint _tmp39_; - gint _tmp40_; + GeeArrayList* _tmp32_; + gint _tmp33_; + gint _tmp34_; gint _video_index = 0; #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp36_ = check; + _tmp30_ = check; #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp37_ = _g_object_ref0 (_tmp36_); + _tmp31_ = _g_object_ref0 (_tmp30_); #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _video_list = _tmp37_; + _video_list = _tmp31_; #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp38_ = _video_list; + _tmp32_ = _video_list; #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp39_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp33_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp40_ = _tmp39_; + _tmp34_ = _tmp33_; #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _video_size = _tmp40_; + _video_size = _tmp34_; #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _video_index = -1; #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" while (TRUE) { -#line 2054 "VideoMonitor.c" - gint _tmp41_; - gint _tmp42_; - gint _tmp43_; +#line 2157 "VideoMonitor.c" + gint _tmp35_; + gint _tmp36_; + gint _tmp37_; Video* video = NULL; - GeeArrayList* _tmp44_; - gint _tmp45_; - gpointer _tmp46_; - Workers* _tmp47_; - Video* _tmp48_; - VideoMonitorVideoInterpretableCheckJob* _tmp49_; - VideoMonitorVideoInterpretableCheckJob* _tmp50_; + GeeArrayList* _tmp38_; + gint _tmp39_; + gpointer _tmp40_; + Workers* _tmp41_; + Video* _tmp42_; + VideoMonitorVideoInterpretableCheckJob* _tmp43_; + VideoMonitorVideoInterpretableCheckJob* _tmp44_; #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp41_ = _video_index; + _tmp35_ = _video_index; #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _video_index = _tmp41_ + 1; + _video_index = _tmp35_ + 1; #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp42_ = _video_index; + _tmp36_ = _video_index; #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp43_ = _video_size; + _tmp37_ = _video_size; #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (!(_tmp42_ < _tmp43_)) { + if (!(_tmp36_ < _tmp37_)) { #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" break; -#line 2078 "VideoMonitor.c" +#line 2181 "VideoMonitor.c" } #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp44_ = _video_list; + _tmp38_ = _video_list; #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp45_ = _video_index; + _tmp39_ = _video_index; #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp46_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp45_); + _tmp40_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp39_); #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - video = (Video*) _tmp46_; + video = (Video*) _tmp40_; #line 287 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp47_ = self->priv->workers; + _tmp41_ = self->priv->workers; #line 287 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp48_ = video; + _tmp42_ = video; #line 287 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp49_ = video_monitor_video_interpretable_check_job_new (_tmp48_, _video_monitor_on_interpretable_check_complete_completion_callback, self); + _tmp43_ = video_monitor_video_interpretable_check_job_new (_tmp42_, _video_monitor_on_interpretable_check_complete_completion_callback, self); #line 287 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp50_ = _tmp49_; + _tmp44_ = _tmp43_; #line 287 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - workers_enqueue (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_BACKGROUND_JOB, BackgroundJob)); + workers_enqueue (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 287 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _background_job_unref0 (_tmp50_); + _background_job_unref0 (_tmp44_); #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (video); -#line 2102 "VideoMonitor.c" +#line 2205 "VideoMonitor.c" } #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (_video_list); -#line 2106 "VideoMonitor.c" +#line 2209 "VideoMonitor.c" } } #line 251 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (check); -#line 2111 "VideoMonitor.c" +#line 2214 "VideoMonitor.c" } -static gpointer _background_job_ref0 (gpointer self) { +static gpointer +_background_job_ref0 (gpointer self) +{ #line 292 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return self ? background_job_ref (self) : NULL; -#line 2118 "VideoMonitor.c" +#line 2223 "VideoMonitor.c" } -static void video_monitor_on_interpretable_check_complete (VideoMonitor* self, BackgroundJob* j) { +static void +video_monitor_on_interpretable_check_complete (VideoMonitor* self, + BackgroundJob* j) +{ VideoMonitorVideoInterpretableCheckJob* job = NULL; - BackgroundJob* _tmp0_; + VideoMonitorVideoInterpretableCheckJob* _tmp0_; VideoMonitorVideoInterpretableCheckJob* _tmp1_; - VideoMonitorVideoInterpretableCheckJob* _tmp2_; - VideoInterpretableResults* _tmp3_; + VideoInterpretableResults* _tmp2_; + guint64 _tmp3_; guint64 _tmp4_; - guint64 _tmp5_; #line 291 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_if_fail (IS_VIDEO_MONITOR (self)); #line 291 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_if_fail (IS_BACKGROUND_JOB (j)); #line 292 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp0_ = j; + _tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, VIDEO_MONITOR_TYPE_VIDEO_INTERPRETABLE_CHECK_JOB, VideoMonitorVideoInterpretableCheckJob)); #line 292 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, VIDEO_MONITOR_TYPE_VIDEO_INTERPRETABLE_CHECK_JOB, VideoMonitorVideoInterpretableCheckJob)); -#line 292 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - job = _tmp1_; + job = _tmp0_; #line 294 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp2_ = job; + _tmp1_ = job; #line 294 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp3_ = _tmp2_->results; + _tmp2_ = _tmp1_->results; #line 294 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - video_interpretable_results_foreground_finish (_tmp3_); + video_interpretable_results_foreground_finish (_tmp2_); #line 296 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp4_ = self->priv->background_jobs; + _tmp3_ = self->priv->background_jobs; #line 296 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - self->priv->background_jobs = _tmp4_ - 1; + self->priv->background_jobs = _tmp3_ - 1; #line 297 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp5_ = self->priv->background_jobs; + _tmp4_ = self->priv->background_jobs; #line 297 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - if (_tmp5_ <= ((guint64) 0)) { + if (_tmp4_ <= ((guint64) 0)) { #line 298 "/home/jens/Source/shotwell/src/VideoMonitor.vala" video_notify_normal_thumbs_regenerated (); -#line 2156 "VideoMonitor.c" +#line 2261 "VideoMonitor.c" } #line 291 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _background_job_unref0 (job); -#line 2160 "VideoMonitor.c" +#line 2265 "VideoMonitor.c" } -static VideoMonitorVideoInterpretableCheckJob* video_monitor_video_interpretable_check_job_construct (GType object_type, Video* video, CompletionCallback callback, void* callback_target) { +static VideoMonitorVideoInterpretableCheckJob* +video_monitor_video_interpretable_check_job_construct (GType object_type, + Video* video, + CompletionCallback callback, + void* callback_target) +{ VideoMonitorVideoInterpretableCheckJob* self = NULL; Video* _tmp0_; - CompletionCallback _tmp1_; - void* _tmp1__target; - Video* _tmp2_; - Video* _tmp3_; #line 49 "/home/jens/Source/shotwell/src/VideoMonitor.vala" g_return_val_if_fail (IS_VIDEO (video), NULL); #line 50 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp0_ = video; -#line 50 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp1_ = callback; -#line 50 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp1__target = callback_target; -#line 50 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - self = (VideoMonitorVideoInterpretableCheckJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _tmp1_, _tmp1__target, NULL, NULL, NULL, NULL); -#line 51 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp2_ = video; + self = (VideoMonitorVideoInterpretableCheckJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (video, G_TYPE_OBJECT, GObject), callback, callback_target, NULL, NULL, NULL, NULL); #line 51 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp0_ = _g_object_ref0 (video); #line 51 "/home/jens/Source/shotwell/src/VideoMonitor.vala" _g_object_unref0 (self->video); #line 51 "/home/jens/Source/shotwell/src/VideoMonitor.vala" - self->video = _tmp3_; + self->video = _tmp0_; #line 49 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return self; -#line 2191 "VideoMonitor.c" +#line 2289 "VideoMonitor.c" } -static VideoMonitorVideoInterpretableCheckJob* video_monitor_video_interpretable_check_job_new (Video* video, CompletionCallback callback, void* callback_target) { +static VideoMonitorVideoInterpretableCheckJob* +video_monitor_video_interpretable_check_job_new (Video* video, + CompletionCallback callback, + void* callback_target) +{ #line 49 "/home/jens/Source/shotwell/src/VideoMonitor.vala" return video_monitor_video_interpretable_check_job_construct (VIDEO_MONITOR_TYPE_VIDEO_INTERPRETABLE_CHECK_JOB, video, callback, callback_target); -#line 2198 "VideoMonitor.c" +#line 2300 "VideoMonitor.c" } -static void video_monitor_video_interpretable_check_job_real_execute (BackgroundJob* base) { +static void +video_monitor_video_interpretable_check_job_real_execute (BackgroundJob* base) +{ VideoMonitorVideoInterpretableCheckJob * self; Video* _tmp0_; VideoInterpretableResults* _tmp1_; @@ -2212,29 +2316,35 @@ static void video_monitor_video_interpretable_check_job_real_execute (Background _video_interpretable_results_unref0 (self->results); #line 55 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self->results = _tmp1_; -#line 2216 "VideoMonitor.c" +#line 2320 "VideoMonitor.c" } -static void video_monitor_video_interpretable_check_job_class_init (VideoMonitorVideoInterpretableCheckJobClass * klass) { +static void +video_monitor_video_interpretable_check_job_class_init (VideoMonitorVideoInterpretableCheckJobClass * klass) +{ #line 42 "/home/jens/Source/shotwell/src/VideoMonitor.vala" video_monitor_video_interpretable_check_job_parent_class = g_type_class_peek_parent (klass); #line 42 "/home/jens/Source/shotwell/src/VideoMonitor.vala" ((BackgroundJobClass *) klass)->finalize = video_monitor_video_interpretable_check_job_finalize; #line 42 "/home/jens/Source/shotwell/src/VideoMonitor.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) video_monitor_video_interpretable_check_job_real_execute; -#line 2227 "VideoMonitor.c" +#line 2333 "VideoMonitor.c" } -static void video_monitor_video_interpretable_check_job_instance_init (VideoMonitorVideoInterpretableCheckJob * self) { +static void +video_monitor_video_interpretable_check_job_instance_init (VideoMonitorVideoInterpretableCheckJob * self) +{ #line 47 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self->results = NULL; -#line 2234 "VideoMonitor.c" +#line 2342 "VideoMonitor.c" } -static void video_monitor_video_interpretable_check_job_finalize (BackgroundJob * obj) { +static void +video_monitor_video_interpretable_check_job_finalize (BackgroundJob * obj) +{ VideoMonitorVideoInterpretableCheckJob * self; #line 42 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, VIDEO_MONITOR_TYPE_VIDEO_INTERPRETABLE_CHECK_JOB, VideoMonitorVideoInterpretableCheckJob); @@ -2244,11 +2354,13 @@ static void video_monitor_video_interpretable_check_job_finalize (BackgroundJob _video_interpretable_results_unref0 (self->results); #line 42 "/home/jens/Source/shotwell/src/VideoMonitor.vala" BACKGROUND_JOB_CLASS (video_monitor_video_interpretable_check_job_parent_class)->finalize (obj); -#line 2248 "VideoMonitor.c" +#line 2358 "VideoMonitor.c" } -static GType video_monitor_video_interpretable_check_job_get_type (void) { +static GType +video_monitor_video_interpretable_check_job_get_type (void) +{ static volatile gsize video_monitor_video_interpretable_check_job_type_id__volatile = 0; if (g_once_init_enter (&video_monitor_video_interpretable_check_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (VideoMonitorVideoInterpretableCheckJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) video_monitor_video_interpretable_check_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (VideoMonitorVideoInterpretableCheckJob), 0, (GInstanceInitFunc) video_monitor_video_interpretable_check_job_instance_init, NULL }; @@ -2260,7 +2372,9 @@ static GType video_monitor_video_interpretable_check_job_get_type (void) { } -static void video_monitor_class_init (VideoMonitorClass * klass) { +static void +video_monitor_class_init (VideoMonitorClass * klass) +{ #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala" video_monitor_parent_class = g_type_class_peek_parent (klass); #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala" @@ -2291,11 +2405,13 @@ static void video_monitor_class_init (VideoMonitorClass * klass) { ((MediaMonitorClass *) klass)->process_updates = (void (*) (MediaMonitor *, GeeCollection*, TransactionController*, gint*, GError**)) video_monitor_real_process_updates; #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala" G_OBJECT_CLASS (klass)->finalize = video_monitor_finalize; -#line 2295 "VideoMonitor.c" +#line 2409 "VideoMonitor.c" } -static void video_monitor_instance_init (VideoMonitor * self) { +static void +video_monitor_instance_init (VideoMonitor * self) +{ Workers* _tmp0_; #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self->priv = VIDEO_MONITOR_GET_PRIVATE (self); @@ -2305,11 +2421,13 @@ static void video_monitor_instance_init (VideoMonitor * self) { self->priv->workers = _tmp0_; #line 63 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self->priv->background_jobs = (guint64) 0; -#line 2309 "VideoMonitor.c" +#line 2425 "VideoMonitor.c" } -static void video_monitor_finalize (GObject * obj) { +static void +video_monitor_finalize (GObject * obj) +{ VideoMonitor * self; #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_MONITOR, VideoMonitor); @@ -2317,11 +2435,13 @@ static void video_monitor_finalize (GObject * obj) { _workers_unref0 (self->priv->workers); #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala" G_OBJECT_CLASS (video_monitor_parent_class)->finalize (obj); -#line 2321 "VideoMonitor.c" +#line 2439 "VideoMonitor.c" } -GType video_monitor_get_type (void) { +GType +video_monitor_get_type (void) +{ static volatile gsize video_monitor_type_id__volatile = 0; if (g_once_init_enter (&video_monitor_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (VideoMonitorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) video_monitor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (VideoMonitor), 0, (GInstanceInitFunc) video_monitor_instance_init, NULL }; diff --git a/src/VideoSupport.c b/src/VideoSupport.c index 7dbbcda..ddc760b 100644 --- a/src/VideoSupport.c +++ b/src/VideoSupport.c @@ -1,4 +1,4 @@ -/* VideoSupport.c generated by valac 0.36.6, the Vala compiler +/* VideoSupport.c generated by valac 0.40.4, the Vala compiler * generated from VideoSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -295,6 +296,11 @@ typedef struct _DateableIface DateableIface; typedef struct _Video Video; typedef struct _VideoClass VideoClass; typedef struct _VideoPrivate VideoPrivate; +enum { + VIDEO_0_PROPERTY, + VIDEO_NUM_PROPERTIES +}; +static GParamSpec* video_properties[VIDEO_NUM_PROPERTIES]; #define TYPE_DATABASE_SOURCE_COLLECTION (database_source_collection_get_type ()) #define DATABASE_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection)) @@ -1061,9 +1067,15 @@ static gpointer video_source_collection_parent_class = NULL; GQuark video_error_quark (void); gpointer video_import_params_ref (gpointer instance); void video_import_params_unref (gpointer instance); -GParamSpec* param_spec_video_import_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_video_import_params (GValue* value, gpointer v_object); -void value_take_video_import_params (GValue* value, gpointer v_object); +GParamSpec* param_spec_video_import_params (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_video_import_params (GValue* value, + gpointer v_object); +void value_take_video_import_params (GValue* value, + gpointer v_object); gpointer value_get_video_import_params (const GValue* value); GType video_import_params_get_type (void) G_GNUC_CONST; GType import_id_get_type (void) G_GNUC_CONST; @@ -1071,67 +1083,107 @@ ImportID* import_id_dup (const ImportID* self); void import_id_free (ImportID* self); gpointer thumbnails_ref (gpointer instance); void thumbnails_unref (gpointer instance); -GParamSpec* param_spec_thumbnails (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_thumbnails (GValue* value, gpointer v_object); -void value_take_thumbnails (GValue* value, gpointer v_object); +GParamSpec* param_spec_thumbnails (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_thumbnails (GValue* value, + gpointer v_object); +void value_take_thumbnails (GValue* value, + gpointer v_object); gpointer value_get_thumbnails (const GValue* value); GType thumbnails_get_type (void) G_GNUC_CONST; gpointer video_row_ref (gpointer instance); void video_row_unref (gpointer instance); -GParamSpec* param_spec_video_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_video_row (GValue* value, gpointer v_object); -void value_take_video_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_video_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_video_row (GValue* value, + gpointer v_object); +void value_take_video_row (GValue* value, + gpointer v_object); gpointer value_get_video_row (const GValue* value); GType video_row_get_type (void) G_GNUC_CONST; -enum { - VIDEO_IMPORT_PARAMS_DUMMY_PROPERTY -}; #define IMPORT_ID_INVALID ((gint64) 0) -void import_id_init (ImportID *self, gint64 id); +void import_id_init (ImportID *self, + gint64 id); VideoRow* video_row_new (void); VideoRow* video_row_construct (GType object_type); -VideoImportParams* video_import_params_new (GFile* file, ImportID* import_id, const gchar* md5, Thumbnails* thumbnails, time_t exposure_time_override); -VideoImportParams* video_import_params_construct (GType object_type, GFile* file, ImportID* import_id, const gchar* md5, Thumbnails* thumbnails, time_t exposure_time_override); +VideoImportParams* video_import_params_new (GFile* file, + ImportID* import_id, + const gchar* md5, + Thumbnails* thumbnails, + time_t exposure_time_override); +VideoImportParams* video_import_params_construct (GType object_type, + GFile* file, + ImportID* import_id, + const gchar* md5, + Thumbnails* thumbnails, + time_t exposure_time_override); static void video_import_params_finalize (VideoImportParams * obj); gpointer video_reader_ref (gpointer instance); void video_reader_unref (gpointer instance); -GParamSpec* param_spec_video_reader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_video_reader (GValue* value, gpointer v_object); -void value_take_video_reader (GValue* value, gpointer v_object); +GParamSpec* param_spec_video_reader (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_video_reader (GValue* value, + gpointer v_object); +void value_take_video_reader (GValue* value, + gpointer v_object); gpointer value_get_video_reader (const GValue* value); GType video_reader_get_type (void) G_GNUC_CONST; #define VIDEO_READER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_VIDEO_READER, VideoReaderPrivate)) -enum { - VIDEO_READER_DUMMY_PROPERTY -}; #define VIDEO_READER_UNKNOWN_CLIP_DURATION (-1.0) #define VIDEO_READER_THUMBNAILER_TIMEOUT ((guint) 10000) VideoReader* video_reader_new (GFile* file); -VideoReader* video_reader_construct (GType object_type, GFile* file); +VideoReader* video_reader_construct (GType object_type, + GFile* file); gboolean video_reader_is_supported_video_file (GFile* file); gboolean video_reader_is_supported_video_filename (const gchar* filename); -void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext); -gint utf8_ci_compare (void* a, void* b); +void disassemble_filename (const gchar* basename, + gchar* * name, + gchar* * ext); +gint utf8_ci_compare (void* a, + void* b); GType import_result_get_type (void) G_GNUC_CONST; ImportResult video_reader_prepare_for_import (VideoImportParams* params); #define UTIL_FILE_ATTRIBUTES "standard::*,time::*,id::file,id::filesystem,etag::value" #define DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES UTIL_FILE_ATTRIBUTES GdkPixbuf* video_reader_read_preview_frame (VideoReader* self); -gdouble video_reader_read_clip_duration (VideoReader* self, GError** error); +gdouble video_reader_read_clip_duration (VideoReader* self, + GError** error); gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType video_metadata_get_type (void) G_GNUC_CONST; -VideoMetadata* video_reader_read_metadata (VideoReader* self, GError** error); +VideoMetadata* video_reader_read_metadata (VideoReader* self, + GError** error); gpointer metadata_date_time_ref (gpointer instance); void metadata_date_time_unref (gpointer instance); -GParamSpec* param_spec_metadata_date_time (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_metadata_date_time (GValue* value, gpointer v_object); -void value_take_metadata_date_time (GValue* value, gpointer v_object); +GParamSpec* param_spec_metadata_date_time (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_metadata_date_time (GValue* value, + gpointer v_object); +void value_take_metadata_date_time (GValue* value, + gpointer v_object); gpointer value_get_metadata_date_time (const GValue* value); GType metadata_date_time_get_type (void) G_GNUC_CONST; MetadataDateTime* media_metadata_get_creation_date_time (MediaMetadata* self); @@ -1147,54 +1199,86 @@ EventID* event_id_dup (const EventID* self); void event_id_free (EventID* self); GType rating_get_type (void) G_GNUC_CONST; #define VIDEO_ID_INVALID ((gint64) -1) -void video_id_init (VideoID *self, gint64 id); +void video_id_init (VideoID *self, + gint64 id); #define EVENT_ID_INVALID ((gint64) -1) -void event_id_init (EventID *self, gint64 id); +void event_id_init (EventID *self, + gint64 id); Thumbnails* thumbnails_new (void); Thumbnails* thumbnails_construct (GType object_type); -void thumbnail_cache_generate_for_video_frame (Thumbnails* thumbnails, GdkPixbuf* preview_frame); -static void video_reader_read_internal (VideoReader* self, GError** error); +void thumbnail_cache_generate_for_video_frame (Thumbnails* thumbnails, + GdkPixbuf* preview_frame); +static void video_reader_read_internal (VideoReader* self, + GError** error); static gboolean video_reader_does_file_exist (VideoReader* self); static GDate* _g_date_dup (GDate* self); -static void video_reader_set_timestamp (VideoReader* self, GDateTime* value); +static void video_reader_set_timestamp (VideoReader* self, + GDateTime* value); static gboolean video_reader_on_thumbnailer_timer (VideoReader* self); -static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* video_file); +static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, + const gchar* video_file); GFile* app_dirs_get_thumbnailer_bin (void); static gboolean _video_reader_on_thumbnailer_timer_gsource_func (gpointer self); GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void); VideoMetadata* video_metadata_new (void); VideoMetadata* video_metadata_construct (GType object_type); -void media_metadata_read_from_file (MediaMetadata* self, GFile* file, GError** error); +void media_metadata_read_from_file (MediaMetadata* self, + GFile* file, + GError** error); static void video_reader_finalize (VideoReader * obj); GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; gpointer source_snapshot_ref (gpointer instance); void source_snapshot_unref (gpointer instance); -GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_snapshot (GValue* value, gpointer v_object); -void value_take_source_snapshot (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_snapshot (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_snapshot (GValue* value, + gpointer v_object); +void value_take_source_snapshot (GValue* value, + gpointer v_object); gpointer value_get_source_snapshot (const GValue* value); GType source_snapshot_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; @@ -1203,9 +1287,15 @@ GType indexable_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; gpointer backing_file_state_ref (gpointer instance); void backing_file_state_unref (gpointer instance); -GParamSpec* param_spec_backing_file_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_file_state (GValue* value, gpointer v_object); -void value_take_backing_file_state (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_file_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_file_state (GValue* value, + gpointer v_object); +void value_take_backing_file_state (GValue* value, + gpointer v_object); gpointer value_get_backing_file_state (const GValue* value); GType backing_file_state_get_type (void) G_GNUC_CONST; GType photo_exception_get_type (void) G_GNUC_CONST; @@ -1222,9 +1312,6 @@ GType monitorable_get_type (void) G_GNUC_CONST; GType dateable_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; #define VIDEO_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_VIDEO, VideoPrivate)) -enum { - VIDEO_DUMMY_PROPERTY -}; GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; GType video_source_collection_get_type (void) G_GNUC_CONST; @@ -1233,53 +1320,80 @@ GType video_source_collection_get_type (void) G_GNUC_CONST; #define VIDEO_FLAG_OFFLINE ((guint64) 0x0000000000000002) #define VIDEO_FLAG_FLAGGED ((guint64) 0x0000000000000004) Video* video_new (VideoRow* row); -Video* video_construct (GType object_type, VideoRow* row); +Video* video_construct (GType object_type, + VideoRow* row); VideoSource* video_source_construct (GType object_type); gchar* media_source_prep_title (const gchar* title); -void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlinked_from, const gchar* dehydrated); -void video_init (ProgressMonitor monitor, void* monitor_target); +void data_source_rehydrate_backlinks (DataSource* self, + SourceCollection* unlinked_from, + const gchar* dehydrated); +void video_init (ProgressMonitor monitor, + void* monitor_target); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); gint configuration_facade_get_video_interpreter_state_cookie (ConfigurationFacade* self); #define CONFIG_FACADE_NO_VIDEO_INTERPRETER_STATE -1 static gboolean __lambda12_ (GstPluginFeature* f); -static gboolean ___lambda12__gst_plugin_feature_filter (GstPluginFeature* feature, gpointer self); +static gboolean ___lambda12__gst_plugin_feature_filter (GstPluginFeature* feature, + gpointer self); VideoSourceCollection* video_source_collection_new (void); VideoSourceCollection* video_source_collection_construct (GType object_type); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType video_table_get_type (void) G_GNUC_CONST; VideoTable* video_table_get_instance (void); GeeArrayList* video_table_get_all (VideoTable* self); -static void video_set_is_interpretable (Video* self, gboolean is_interpretable); +static void video_set_is_interpretable (Video* self, + gboolean is_interpretable); gboolean media_source_is_trashed (MediaSource* self); gboolean media_source_is_offline (MediaSource* self); -void media_source_collection_add_many_to_trash (MediaSourceCollection* self, GeeCollection* sources); -void media_source_collection_add_many_to_offline (MediaSourceCollection* self, GeeCollection* sources); -GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); +void media_source_collection_add_many_to_trash (MediaSourceCollection* self, + GeeCollection* sources); +void media_source_collection_add_many_to_offline (MediaSourceCollection* self, + GeeCollection* sources); +GeeCollection* data_collection_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); static void _g_object_unref0_ (gpointer var); -static void _g_list_free__g_object_unref0_ (GList* self); +static inline void _g_list_free__g_object_unref0_ (GList* self); gboolean video_has_interpreter_state_changed (void); void video_notify_normal_thumbs_regenerated (void); static void video_save_interpreter_state (void); void video_notify_offline_thumbs_regenerated (void); -void configuration_facade_set_video_interpreter_state_cookie (ConfigurationFacade* self, gint state_cookie); +void configuration_facade_set_video_interpreter_state_cookie (ConfigurationFacade* self, + gint state_cookie); void video_terminate (void); GType exporter_get_type (void) G_GNUC_CONST; gpointer exporter_ui_ref (gpointer instance); void exporter_ui_unref (gpointer instance); -GParamSpec* param_spec_exporter_ui (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_exporter_ui (GValue* value, gpointer v_object); -void value_take_exporter_ui (GValue* value, gpointer v_object); +GParamSpec* param_spec_exporter_ui (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_exporter_ui (GValue* value, + gpointer v_object); +void value_take_exporter_ui (GValue* value, + gpointer v_object); gpointer value_get_exporter_ui (const GValue* value); GType exporter_ui_get_type (void) G_GNUC_CONST; -ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback done, void* done_target, gboolean export_in_place); +ExporterUI* video_export_many (GeeCollection* videos, + ExporterCompletionCallback done, + void* done_target, + gboolean export_in_place); void scaling_for_original (Scaling* result); GType export_format_parameters_get_type (void) G_GNUC_CONST; GType export_format_mode_get_type (void) G_GNUC_CONST; @@ -1287,86 +1401,174 @@ GType jpeg_quality_get_type (void) G_GNUC_CONST; ExportFormatParameters* export_format_parameters_dup (const ExportFormatParameters* self); void export_format_parameters_free (ExportFormatParameters* self); void export_format_parameters_unmodified (ExportFormatParameters* result); -Exporter* exporter_new_for_temp_file (GeeCollection* to_export, Scaling* scaling, ExportFormatParameters* export_params); -Exporter* exporter_construct_for_temp_file (GType object_type, GeeCollection* to_export, Scaling* scaling, ExportFormatParameters* export_params); +Exporter* exporter_new_for_temp_file (GeeCollection* to_export, + Scaling* scaling, + ExportFormatParameters* export_params); +Exporter* exporter_construct_for_temp_file (GType object_type, + GeeCollection* to_export, + Scaling* scaling, + ExportFormatParameters* export_params); ExporterUI* exporter_ui_new (Exporter* exporter); -ExporterUI* exporter_ui_construct (GType object_type, Exporter* exporter); -void exporter_ui_export (ExporterUI* self, ExporterCompletionCallback completion_callback, void* completion_callback_target); +ExporterUI* exporter_ui_construct (GType object_type, + Exporter* exporter); +void exporter_ui_export (ExporterUI* self, + ExporterCompletionCallback completion_callback, + void* completion_callback_target); GFile* export_ui_choose_file (const gchar* current_file_basename); gchar* media_source_get_basename (MediaSource* self); GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); void page_window_set_busy_cursor (PageWindow* self); -void video_export (Video* self, GFile* dest_file, GError** error); +void video_export (Video* self, + GFile* dest_file, + GError** error); void page_window_set_normal_cursor (PageWindow* self); -GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining); +GtkResponseType export_error_dialog (GFile* dest, + gboolean photos_remaining); GFile* export_ui_choose_dir (const gchar* user_title); -Exporter* exporter_new (GeeCollection* to_export, GFile* dir, Scaling* scaling, ExportFormatParameters* export_params, gboolean auto_replace_all); -Exporter* exporter_construct (GType object_type, GeeCollection* to_export, GFile* dir, Scaling* scaling, ExportFormatParameters* export_params, gboolean auto_replace_all); -static void video_real_commit_backlinks (DataSource* base, SourceCollection* sources, const gchar* backlinks); +Exporter* exporter_new (GeeCollection* to_export, + GFile* dir, + Scaling* scaling, + ExportFormatParameters* export_params, + gboolean auto_replace_all); +Exporter* exporter_construct (GType object_type, + GeeCollection* to_export, + GFile* dir, + Scaling* scaling, + ExportFormatParameters* export_params, + gboolean auto_replace_all); +static void video_real_commit_backlinks (DataSource* base, + SourceCollection* sources, + const gchar* backlinks); GQuark database_error_quark (void); -void video_table_update_backlinks (VideoTable* self, VideoID* video_id, const gchar* backlinks, GError** error); -void video_get_video_id (Video* self, VideoID* result); +void video_table_update_backlinks (VideoTable* self, + VideoID* video_id, + const gchar* backlinks, + GError** error); +void video_get_video_id (Video* self, + VideoID* result); gchar* data_object_to_string (DataObject* self); -static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id); -gboolean video_table_set_event (VideoTable* self, VideoID* video_id, EventID* event_id); -gboolean video_is_duplicate (GFile* file, const gchar* full_md5); -gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar* md5); -ImportResult video_import_create (VideoImportParams* params, Video* * video); -void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* result, GError** error); +static gboolean video_real_set_event_id (MediaSource* base, + EventID* event_id); +gboolean video_table_set_event (VideoTable* self, + VideoID* video_id, + EventID* event_id); +gboolean video_is_duplicate (GFile* file, + const gchar* full_md5); +gboolean video_table_has_duplicate (VideoTable* self, + GFile* file, + const gchar* md5); +ImportResult video_import_create (VideoImportParams* params, + Video* * video); +void video_table_add (VideoTable* self, + VideoRow* video_row, + VideoID* result, + GError** error); gboolean video_id_is_invalid (VideoID *self); void video_import_failed (Video* video); -void video_table_remove (VideoTable* self, VideoID* videoID, GError** error); +void video_table_remove (VideoTable* self, + VideoID* videoID, + GError** error); void app_window_database_error (GError* err); -static BackingFileState** video_real_get_backing_files_state (MediaSource* base, int* result_length1); -BackingFileState* backing_file_state_new (const gchar* filepath, gint64 filesize, time_t modification_time, const gchar* md5); -BackingFileState* backing_file_state_construct (GType object_type, const gchar* filepath, gint64 filesize, time_t modification_time, const gchar* md5); -static GdkPixbuf* video_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error); -GdkPixbuf* thumbnail_cache_fetch (ThumbnailSource* source, gint scale, GError** error); +static BackingFileState** video_real_get_backing_files_state (MediaSource* base, + int* result_length1); +BackingFileState* backing_file_state_new (const gchar* filepath, + gint64 filesize, + time_t modification_time, + const gchar* md5); +BackingFileState* backing_file_state_construct (GType object_type, + const gchar* filepath, + gint64 filesize, + time_t modification_time, + const gchar* md5); +static GdkPixbuf* video_real_get_thumbnail (ThumbnailSource* base, + gint scale, + GError** error); +GdkPixbuf* thumbnail_cache_fetch (ThumbnailSource* source, + gint scale, + GError** error); static gchar* video_real_get_master_md5 (MediaSource* base); -static GdkPixbuf* video_real_get_preview_pixbuf (MediaSource* base, Scaling* scaling, GError** error); -GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GError** error); +static GdkPixbuf* video_real_get_preview_pixbuf (MediaSource* base, + Scaling* scaling, + GError** error); +GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); GType thumbnail_cache_size_get_type (void) G_GNUC_CONST; -GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInterpType interp, gboolean scale_up); -static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error); +GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, + GdkPixbuf* pixbuf, + GdkInterpType interp, + gboolean scale_up); +static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, + gint scale, + GError** error); GFile* media_source_get_file (MediaSource* self); static gchar* video_real_get_typename (DataSource* base); static gint64 video_real_get_instance_id (DataSource* base); -static void video_real_get_import_id (MediaSource* base, ImportID* result); +static void video_real_get_import_id (MediaSource* base, + ImportID* result); static PhotoFileFormat video_real_get_preferred_thumbnail_format (ThumbnailSource* base); PhotoFileFormat photo_file_format_get_system_default_format (void); static gchar* video_real_get_title (MediaSource* base); -static void video_real_set_title (MediaSource* base, const gchar* title); -void video_table_set_title (VideoTable* self, VideoID* video_id, const gchar* new_title, GError** error); -void data_object_notify_altered (DataObject* self, Alteration* alteration); -Alteration* alteration_new (const gchar* subject, const gchar* detail); -Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail); +static void video_real_set_title (MediaSource* base, + const gchar* title); +void video_table_set_title (VideoTable* self, + VideoID* video_id, + const gchar* new_title, + GError** error); +void data_object_notify_altered (DataObject* self, + Alteration* alteration); +Alteration* alteration_new (const gchar* subject, + const gchar* detail); +Alteration* alteration_construct (GType object_type, + const gchar* subject, + const gchar* detail); static gchar* video_real_get_comment (MediaSource* base); -static gboolean video_real_set_comment (MediaSource* base, const gchar* comment); -void video_table_set_comment (VideoTable* self, VideoID* video_id, const gchar* new_comment, GError** error); +static gboolean video_real_set_comment (MediaSource* base, + const gchar* comment); +void video_table_set_comment (VideoTable* self, + VideoID* video_id, + const gchar* new_comment, + GError** error); static Rating video_real_get_rating (MediaSource* base); -static void video_real_set_rating (MediaSource* base, Rating rating); +static void video_real_set_rating (MediaSource* base, + Rating rating); gboolean rating_is_valid (Rating self); -void video_table_set_rating (VideoTable* self, VideoID* video_id, Rating rating, GError** error); +void video_table_set_rating (VideoTable* self, + VideoID* video_id, + Rating rating, + GError** error); static void video_real_increase_rating (MediaSource* base); -void media_source_set_rating (MediaSource* self, Rating rating); +void media_source_set_rating (MediaSource* self, + Rating rating); Rating rating_increase (Rating self); static void video_real_decrease_rating (MediaSource* base); Rating rating_decrease (Rating self); static gboolean video_real_is_trashed (MediaSource* base); -gboolean video_is_flag_set (Video* self, guint64 flag); +gboolean video_is_flag_set (Video* self, + guint64 flag); static gboolean video_real_is_offline (Monitorable* base); static void video_real_mark_offline (Monitorable* base); -guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* additional_alteration); +guint64 video_add_flags (Video* self, + guint64 flags_to_add, + Alteration* additional_alteration); static void video_real_mark_online (Monitorable* base); -guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* additional_alteration); +guint64 video_remove_flags (Video* self, + guint64 flags_to_remove, + Alteration* additional_alteration); gboolean video_get_is_interpretable (Video* self); gpointer video_interpretable_results_ref (gpointer instance); void video_interpretable_results_unref (gpointer instance); -GParamSpec* video_param_spec_interpretable_results (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void video_value_set_interpretable_results (GValue* value, gpointer v_object); -void video_value_take_interpretable_results (GValue* value, gpointer v_object); +GParamSpec* video_param_spec_interpretable_results (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void video_value_set_interpretable_results (GValue* value, + gpointer v_object); +void video_value_take_interpretable_results (GValue* value, + gpointer v_object); gpointer video_value_get_interpretable_results (const GValue* value); GType video_interpretable_results_get_type (void) G_GNUC_CONST; VideoInterpretableResults* video_check_is_interpretable (Video* self); @@ -1376,167 +1578,290 @@ static void video_real_untrash (MediaSource* base); static gboolean video_real_is_flagged (Flaggable* base); static void video_real_mark_flagged (Flaggable* base); static void video_real_mark_unflagged (Flaggable* base); -static void video_real_get_event_id (MediaSource* base, EventID* result); +static void video_real_get_event_id (MediaSource* base, + EventID* result); static gchar* video_real_to_string (DataObject* base); static time_t video_real_get_exposure_time (Dateable* base); -static void video_real_set_exposure_time (Dateable* base, time_t time); -void video_table_set_exposure_time (VideoTable* self, VideoID* video_id, time_t time, GError** error); -void video_get_frame_dimensions (Video* self, Dimensions* result); -void dimensions_init (Dimensions *self, gint width, gint height); -static void video_real_get_dimensions (MediaSource* base, PhotoException disallowed_steps, Dimensions* result); +static void video_real_set_exposure_time (Dateable* base, + time_t time); +void video_table_set_exposure_time (VideoTable* self, + VideoID* video_id, + time_t time, + GError** error); +void video_get_frame_dimensions (Video* self, + Dimensions* result); +void dimensions_init (Dimensions *self, + gint width, + gint height); +static void video_real_get_dimensions (MediaSource* base, + PhotoException disallowed_steps, + Dimensions* result); static guint64 video_real_get_filesize (MediaSource* base); guint64 media_source_get_master_filesize (MediaSource* self); static guint64 video_real_get_master_filesize (MediaSource* base); static time_t video_real_get_timestamp (MediaSource* base); -static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info); -void video_table_set_timestamp (VideoTable* self, VideoID* video_id, time_t timestamp, GError** error); +static void video_real_set_master_timestamp (Monitorable* base, + GFileInfo* info); +void video_table_set_timestamp (VideoTable* self, + VideoID* video_id, + time_t timestamp, + GError** error); gchar* video_get_filename (Video* self); static GFile* video_real_get_file (MediaSource* base); static GFile* video_real_get_master_file (MediaSource* base); gdouble video_get_clip_duration (Video* self); -void video_table_update_is_interpretable (VideoTable* self, VideoID* video_id, gboolean is_interpretable, GError** error); +void video_table_update_is_interpretable (VideoTable* self, + VideoID* video_id, + gboolean is_interpretable, + GError** error); VideoInterpretableResults* video_interpretable_results_new (Video* video); -VideoInterpretableResults* video_interpretable_results_construct (GType object_type, Video* video); +VideoInterpretableResults* video_interpretable_results_construct (GType object_type, + Video* video); static void video_real_destroy (DataSource* base); void thumbnail_cache_remove (ThumbnailSource* source); void data_source_destroy (DataSource* self); -static gboolean video_real_internal_delete_backing (DataSource* base, GError** error); +static gboolean video_real_internal_delete_backing (DataSource* base, + GError** error); gboolean media_source_delete_original_file (MediaSource* self); -gboolean data_source_internal_delete_backing (DataSource* self, GError** error); -static void video_notify_flags_altered (Video* self, Alteration* additional_alteration); -Alteration* alteration_compress (Alteration* self, Alteration* other); -guint64 media_source_internal_add_flags (guint64 flags, guint64 selector); -void video_table_set_flags (VideoTable* self, VideoID* video_id, guint64 flags, GError** error); -guint64 media_source_internal_remove_flags (guint64 flags, guint64 selector); -gboolean media_source_internal_is_flag_set (guint64 flags, guint64 selector); -static void video_real_set_master_file (Monitorable* base, GFile* file); -void video_table_set_filepath (VideoTable* self, VideoID* video_id, const gchar* filepath, GError** error); -void media_source_notify_master_replaced (MediaSource* self, GFile* old_file, GFile* new_file); +gboolean data_source_internal_delete_backing (DataSource* self, + GError** error); +static void video_notify_flags_altered (Video* self, + Alteration* additional_alteration); +Alteration* alteration_compress (Alteration* self, + Alteration* other); +guint64 media_source_internal_add_flags (guint64 flags, + guint64 selector); +void video_table_set_flags (VideoTable* self, + VideoID* video_id, + guint64 flags, + GError** error); +guint64 media_source_internal_remove_flags (guint64 flags, + guint64 selector); +gboolean media_source_internal_is_flag_set (guint64 flags, + guint64 selector); +static void video_real_set_master_file (Monitorable* base, + GFile* file); +void video_table_set_filepath (VideoTable* self, + VideoID* video_id, + const gchar* filepath, + GError** error); +void media_source_notify_master_replaced (MediaSource* self, + GFile* old_file, + GFile* new_file); Alteration* alteration_new_from_list (const gchar* list); -Alteration* alteration_construct_from_list (GType object_type, const gchar* list); -VideoMetadata* video_read_metadata (Video* self, GError** error); -enum { - VIDEO_INTERPRETABLE_RESULTS_DUMMY_PROPERTY -}; -void thumbnail_cache_replace (ThumbnailSource* source, ThumbnailCacheSize size, GdkPixbuf* replacement, GError** error); +Alteration* alteration_construct_from_list (GType object_type, + const gchar* list); +VideoMetadata* video_read_metadata (Video* self, + GError** error); +void thumbnail_cache_replace (ThumbnailSource* source, + ThumbnailCacheSize size, + GdkPixbuf* replacement, + GError** error); void thumbnail_source_notify_thumbnail_altered (ThumbnailSource* self); static void video_interpretable_results_finalize (VideoInterpretableResults * obj); static void video_finalize (GObject * obj); GType marker_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; GType database_source_holding_tank_get_type (void) G_GNUC_CONST; GType media_source_holding_tank_get_type (void) G_GNUC_CONST; gpointer workers_ref (gpointer instance); void workers_unref (gpointer instance); -GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_workers (GValue* value, gpointer v_object); -void value_take_workers (GValue* value, gpointer v_object); +GParamSpec* param_spec_workers (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_workers (GValue* value, + gpointer v_object); +void value_take_workers (GValue* value, + gpointer v_object); gpointer value_get_workers (const GValue* value); GType workers_get_type (void) G_GNUC_CONST; GType media_monitor_get_type (void) G_GNUC_CONST; gpointer transaction_controller_ref (gpointer instance); void transaction_controller_unref (gpointer instance); -GParamSpec* param_spec_transaction_controller (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_transaction_controller (GValue* value, gpointer v_object); -void value_take_transaction_controller (GValue* value, gpointer v_object); +GParamSpec* param_spec_transaction_controller (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_transaction_controller (GValue* value, + gpointer v_object); +void value_take_transaction_controller (GValue* value, + gpointer v_object); gpointer value_get_transaction_controller (const GValue* value); GType transaction_controller_get_type (void) G_GNUC_CONST; #define VIDEO_SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollectionPrivate)) -enum { - VIDEO_SOURCE_COLLECTION_DUMMY_PROPERTY -}; GType video_source_collection_state_get_type (void) G_GNUC_CONST; -gint uint64_compare (guint64* a, guint64* b); -static gint _uint64_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); +gint uint64_compare (guint64* a, + guint64* b); +static gint _uint64_compare_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self); static guint64* _uint64_dup (guint64* self); gint64 video_source_collection_get_video_key (DataSource* source); -static gint64 _video_source_collection_get_video_key_get_source_database_key (DataSource* source, gpointer self); -MediaSourceCollection* media_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target); +static gint64 _video_source_collection_get_video_key_get_source_database_key (DataSource* source, + gpointer self); +MediaSourceCollection* media_source_collection_construct (GType object_type, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target); MediaSourceHoldingTank* media_source_collection_get_trashcan (MediaSourceCollection* self); -static void video_source_collection_on_trashcan_contents_altered (VideoSourceCollection* self, GeeCollection* added, GeeCollection* removed); -static void _video_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self); +static void video_source_collection_on_trashcan_contents_altered (VideoSourceCollection* self, + GeeCollection* added, + GeeCollection* removed); +static void _video_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self); MediaSourceHoldingTank* media_source_collection_get_offline_bin (MediaSourceCollection* self); -static void video_source_collection_on_offline_contents_altered (VideoSourceCollection* self, GeeCollection* added, GeeCollection* removed); -static void _video_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self); +static void video_source_collection_on_offline_contents_altered (VideoSourceCollection* self, + GeeCollection* added, + GeeCollection* removed); +static void _video_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self); static MediaSourceHoldingTank* video_source_collection_real_create_trashcan (MediaSourceCollection* base); gboolean video_source_collection_is_video_trashed (DataSource* source); -static gboolean _video_source_collection_is_video_trashed_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self); -MediaSourceHoldingTank* media_source_holding_tank_new (MediaSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target); -MediaSourceHoldingTank* media_source_holding_tank_construct (GType object_type, MediaSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target); +static gboolean _video_source_collection_is_video_trashed_source_holding_tank_check_to_keep (DataSource* source, + Alteration* alteration, + gpointer self); +MediaSourceHoldingTank* media_source_holding_tank_new (MediaSourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target); +MediaSourceHoldingTank* media_source_holding_tank_construct (GType object_type, + MediaSourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target); static MediaSourceHoldingTank* video_source_collection_real_create_offline_bin (MediaSourceCollection* base); gboolean video_source_collection_is_video_offline (DataSource* source); -static gboolean _video_source_collection_is_video_offline_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self); -static MediaMonitor* video_source_collection_real_create_media_monitor (MediaSourceCollection* base, Workers* workers, GCancellable* cancellable); +static gboolean _video_source_collection_is_video_offline_source_holding_tank_check_to_keep (DataSource* source, + Alteration* alteration, + gpointer self); +static MediaMonitor* video_source_collection_real_create_media_monitor (MediaSourceCollection* base, + Workers* workers, + GCancellable* cancellable); VideoMonitor* video_monitor_new (GCancellable* cancellable); -VideoMonitor* video_monitor_construct (GType object_type, GCancellable* cancellable); +VideoMonitor* video_monitor_construct (GType object_type, + GCancellable* cancellable); GType video_monitor_get_type (void) G_GNUC_CONST; -static gboolean video_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source); +static gboolean video_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source); static gchar* video_source_collection_real_get_typename (MediaSourceCollection* base); -static gboolean video_source_collection_real_is_file_recognized (MediaSourceCollection* base, GFile* file); -static MediaSource* video_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* base, gint64 numeric_id); -Video* video_source_collection_fetch (VideoSourceCollection* self, VideoID* video_id); -DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, gint64 key); -static GeeCollection* video_source_collection_real_get_event_source_ids (MediaSourceCollection* base, EventID* event_id); -GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event_id); -Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, GFile* file, VideoSourceCollectionState* state); -MediaSource* media_source_collection_fetch_by_master_file (MediaSourceCollection* self, GFile* file); -MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingTank* self, GFile* file); -static void video_source_collection_compare_backing (VideoSourceCollection* self, Video* video, GFileInfo* info, GeeCollection* matching_master); +static gboolean video_source_collection_real_is_file_recognized (MediaSourceCollection* base, + GFile* file); +static MediaSource* video_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* base, + gint64 numeric_id); +Video* video_source_collection_fetch (VideoSourceCollection* self, + VideoID* video_id); +DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, + gint64 key); +static GeeCollection* video_source_collection_real_get_event_source_ids (MediaSourceCollection* base, + EventID* event_id); +GeeArrayList* video_table_get_event_source_ids (VideoTable* self, + EventID* event_id); +Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, + GFile* file, + VideoSourceCollectionState* state); +MediaSource* media_source_collection_fetch_by_master_file (MediaSourceCollection* self, + GFile* file); +MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingTank* self, + GFile* file); +static void video_source_collection_compare_backing (VideoSourceCollection* self, + Video* video, + GFileInfo* info, + GeeCollection* matching_master); guint64 media_source_get_filesize (MediaSource* self); time_t media_source_get_timestamp (MediaSource* self); -void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* self, GFileInfo* info, GeeCollection* matching_master); +void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* self, + GFileInfo* info, + GeeCollection* matching_master); GeeCollection* data_collection_get_all (DataCollection* self); GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceCollection* self); -static void video_source_collection_real_notify_contents_altered (DataCollection* base, GeeIterable* added, GeeIterable* removed); -void data_collection_notify_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed); -void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize, VideoID* result); +static void video_source_collection_real_notify_contents_altered (DataCollection* base, + GeeIterable* added, + GeeIterable* removed); +void data_collection_notify_contents_altered (DataCollection* self, + GeeIterable* added, + GeeIterable* removed); +void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollection* self, + const gchar* basename, + guint64 filesize, + VideoID* result); GFile* media_source_get_master_file (MediaSource* self); -gboolean video_source_collection_has_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize); +gboolean video_source_collection_has_basename_filesize_duplicate (VideoSourceCollection* self, + const gchar* basename, + guint64 filesize); gboolean video_id_is_valid (VideoID *self); MediaSourceTransactionController* media_source_transaction_controller_new (MediaSourceCollection* sources); -MediaSourceTransactionController* media_source_transaction_controller_construct (GType object_type, MediaSourceCollection* sources); +MediaSourceTransactionController* media_source_transaction_controller_construct (GType object_type, + MediaSourceCollection* sources); GType media_source_transaction_controller_get_type (void) G_GNUC_CONST; static void video_source_collection_finalize (DataCollection * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static const gchar* VIDEO_READER_METADATA_ONLY_FILE_EXTENSIONS[4] = {"bdm", "bdmv", "cpi", "mpl"}; -GQuark video_error_quark (void) { +GQuark +video_error_quark (void) +{ return g_quark_from_static_string ("video_error-quark"); } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 30 "/home/jens/Source/shotwell/src/VideoSupport.vala" return self ? g_object_ref (self) : NULL; -#line 1520 "VideoSupport.c" +#line 1840 "VideoSupport.c" } -static gpointer _thumbnails_ref0 (gpointer self) { +static gpointer +_thumbnails_ref0 (gpointer self) +{ #line 33 "/home/jens/Source/shotwell/src/VideoSupport.vala" return self ? thumbnails_ref (self) : NULL; -#line 1527 "VideoSupport.c" +#line 1849 "VideoSupport.c" } -VideoImportParams* video_import_params_construct (GType object_type, GFile* file, ImportID* import_id, const gchar* md5, Thumbnails* thumbnails, time_t exposure_time_override) { +VideoImportParams* +video_import_params_construct (GType object_type, + GFile* file, + ImportID* import_id, + const gchar* md5, + Thumbnails* thumbnails, + time_t exposure_time_override) +{ VideoImportParams* self = NULL; GFile* _tmp0_; - GFile* _tmp1_; - ImportID _tmp2_; - const gchar* _tmp3_; - gchar* _tmp4_; - Thumbnails* _tmp5_; - Thumbnails* _tmp6_; - time_t _tmp7_; + ImportID _tmp1_; + gchar* _tmp2_; + Thumbnails* _tmp3_; #line 28 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 28 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -1546,148 +1871,171 @@ VideoImportParams* video_import_params_construct (GType object_type, GFile* file #line 28 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = (VideoImportParams*) g_type_create_instance (object_type); #line 30 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = file; -#line 30 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (file); #line 30 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (self->file); #line 30 "/home/jens/Source/shotwell/src/VideoSupport.vala" - self->file = _tmp1_; + self->file = _tmp0_; #line 31 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = *import_id; + _tmp1_ = *import_id; #line 31 "/home/jens/Source/shotwell/src/VideoSupport.vala" - self->import_id = _tmp2_; + self->import_id = _tmp1_; #line 32 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = md5; -#line 32 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = g_strdup (_tmp3_); + _tmp2_ = g_strdup (md5); #line 32 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (self->md5); #line 32 "/home/jens/Source/shotwell/src/VideoSupport.vala" - self->md5 = _tmp4_; -#line 33 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = thumbnails; + self->md5 = _tmp2_; #line 33 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = _thumbnails_ref0 (_tmp5_); + _tmp3_ = _thumbnails_ref0 (thumbnails); #line 33 "/home/jens/Source/shotwell/src/VideoSupport.vala" _thumbnails_unref0 (self->thumbnails); #line 33 "/home/jens/Source/shotwell/src/VideoSupport.vala" - self->thumbnails = _tmp6_; + self->thumbnails = _tmp3_; #line 34 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = exposure_time_override; -#line 34 "/home/jens/Source/shotwell/src/VideoSupport.vala" - self->exposure_time_override = _tmp7_; + self->exposure_time_override = exposure_time_override; #line 28 "/home/jens/Source/shotwell/src/VideoSupport.vala" return self; -#line 1583 "VideoSupport.c" +#line 1900 "VideoSupport.c" } -VideoImportParams* video_import_params_new (GFile* file, ImportID* import_id, const gchar* md5, Thumbnails* thumbnails, time_t exposure_time_override) { +VideoImportParams* +video_import_params_new (GFile* file, + ImportID* import_id, + const gchar* md5, + Thumbnails* thumbnails, + time_t exposure_time_override) +{ #line 28 "/home/jens/Source/shotwell/src/VideoSupport.vala" return video_import_params_construct (TYPE_VIDEO_IMPORT_PARAMS, file, import_id, md5, thumbnails, exposure_time_override); -#line 1590 "VideoSupport.c" +#line 1913 "VideoSupport.c" } -static void value_video_import_params_init (GValue* value) { +static void +value_video_import_params_init (GValue* value) +{ #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" value->data[0].v_pointer = NULL; -#line 1597 "VideoSupport.c" +#line 1922 "VideoSupport.c" } -static void value_video_import_params_free_value (GValue* value) { +static void +value_video_import_params_free_value (GValue* value) +{ #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (value->data[0].v_pointer) { #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_import_params_unref (value->data[0].v_pointer); -#line 1606 "VideoSupport.c" +#line 1933 "VideoSupport.c" } } -static void value_video_import_params_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_video_import_params_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (src_value->data[0].v_pointer) { #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" dest_value->data[0].v_pointer = video_import_params_ref (src_value->data[0].v_pointer); -#line 1616 "VideoSupport.c" +#line 1946 "VideoSupport.c" } else { #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" dest_value->data[0].v_pointer = NULL; -#line 1620 "VideoSupport.c" +#line 1950 "VideoSupport.c" } } -static gpointer value_video_import_params_peek_pointer (const GValue* value) { +static gpointer +value_video_import_params_peek_pointer (const GValue* value) +{ #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" return value->data[0].v_pointer; -#line 1628 "VideoSupport.c" +#line 1960 "VideoSupport.c" } -static gchar* value_video_import_params_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_video_import_params_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (collect_values[0].v_pointer) { -#line 1635 "VideoSupport.c" +#line 1972 "VideoSupport.c" VideoImportParams * object; object = collect_values[0].v_pointer; #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (object->parent_instance.g_class == NULL) { #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1642 "VideoSupport.c" +#line 1979 "VideoSupport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1646 "VideoSupport.c" +#line 1983 "VideoSupport.c" } #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" value->data[0].v_pointer = video_import_params_ref (object); -#line 1650 "VideoSupport.c" +#line 1987 "VideoSupport.c" } else { #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" value->data[0].v_pointer = NULL; -#line 1654 "VideoSupport.c" +#line 1991 "VideoSupport.c" } #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 1658 "VideoSupport.c" +#line 1995 "VideoSupport.c" } -static gchar* value_video_import_params_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_video_import_params_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ VideoImportParams ** object_p; object_p = collect_values[0].v_pointer; #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (!object_p) { #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1669 "VideoSupport.c" +#line 2011 "VideoSupport.c" } #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (!value->data[0].v_pointer) { #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" *object_p = NULL; -#line 1675 "VideoSupport.c" +#line 2017 "VideoSupport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" *object_p = value->data[0].v_pointer; -#line 1679 "VideoSupport.c" +#line 2021 "VideoSupport.c" } else { #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" *object_p = video_import_params_ref (value->data[0].v_pointer); -#line 1683 "VideoSupport.c" +#line 2025 "VideoSupport.c" } #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 1687 "VideoSupport.c" +#line 2029 "VideoSupport.c" } -GParamSpec* param_spec_video_import_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_video_import_params (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecVideoImportParams* spec; #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_VIDEO_IMPORT_PARAMS), NULL); @@ -1697,20 +2045,25 @@ GParamSpec* param_spec_video_import_params (const gchar* name, const gchar* nick G_PARAM_SPEC (spec)->value_type = object_type; #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" return G_PARAM_SPEC (spec); -#line 1701 "VideoSupport.c" +#line 2049 "VideoSupport.c" } -gpointer value_get_video_import_params (const GValue* value) { +gpointer +value_get_video_import_params (const GValue* value) +{ #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_IMPORT_PARAMS), NULL); #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" return value->data[0].v_pointer; -#line 1710 "VideoSupport.c" +#line 2060 "VideoSupport.c" } -void value_set_video_import_params (GValue* value, gpointer v_object) { +void +value_set_video_import_params (GValue* value, + gpointer v_object) +{ VideoImportParams * old; #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_IMPORT_PARAMS)); @@ -1726,22 +2079,25 @@ void value_set_video_import_params (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_import_params_ref (value->data[0].v_pointer); -#line 1730 "VideoSupport.c" +#line 2083 "VideoSupport.c" } else { #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" value->data[0].v_pointer = NULL; -#line 1734 "VideoSupport.c" +#line 2087 "VideoSupport.c" } #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (old) { #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_import_params_unref (old); -#line 1740 "VideoSupport.c" +#line 2093 "VideoSupport.c" } } -void value_take_video_import_params (GValue* value, gpointer v_object) { +void +value_take_video_import_params (GValue* value, + gpointer v_object) +{ VideoImportParams * old; #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_IMPORT_PARAMS)); @@ -1755,31 +2111,35 @@ void value_take_video_import_params (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" value->data[0].v_pointer = v_object; -#line 1759 "VideoSupport.c" +#line 2115 "VideoSupport.c" } else { #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" value->data[0].v_pointer = NULL; -#line 1763 "VideoSupport.c" +#line 2119 "VideoSupport.c" } #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (old) { #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_import_params_unref (old); -#line 1769 "VideoSupport.c" +#line 2125 "VideoSupport.c" } } -static void video_import_params_class_init (VideoImportParamsClass * klass) { +static void +video_import_params_class_init (VideoImportParamsClass * klass) +{ #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_import_params_parent_class = g_type_class_peek_parent (klass); #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" ((VideoImportParamsClass *) klass)->finalize = video_import_params_finalize; -#line 1779 "VideoSupport.c" +#line 2137 "VideoSupport.c" } -static void video_import_params_instance_init (VideoImportParams * self) { +static void +video_import_params_instance_init (VideoImportParams * self) +{ VideoRow* _tmp0_; #line 18 "/home/jens/Source/shotwell/src/VideoSupport.vala" import_id_init (&self->import_id, IMPORT_ID_INVALID); @@ -1789,11 +2149,13 @@ static void video_import_params_instance_init (VideoImportParams * self) { self->row = _tmp0_; #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" self->ref_count = 1; -#line 1793 "VideoSupport.c" +#line 2153 "VideoSupport.c" } -static void video_import_params_finalize (VideoImportParams * obj) { +static void +video_import_params_finalize (VideoImportParams * obj) +{ VideoImportParams * self; #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_IMPORT_PARAMS, VideoImportParams); @@ -1807,11 +2169,13 @@ static void video_import_params_finalize (VideoImportParams * obj) { _thumbnails_unref0 (self->thumbnails); #line 26 "/home/jens/Source/shotwell/src/VideoSupport.vala" _video_row_unref0 (self->row); -#line 1811 "VideoSupport.c" +#line 2173 "VideoSupport.c" } -GType video_import_params_get_type (void) { +GType +video_import_params_get_type (void) +{ static volatile gsize video_import_params_type_id__volatile = 0; if (g_once_init_enter (&video_import_params_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_video_import_params_init, value_video_import_params_free_value, value_video_import_params_copy_value, value_video_import_params_peek_pointer, "p", value_video_import_params_collect_value, "p", value_video_import_params_lcopy_value }; @@ -1825,18 +2189,22 @@ GType video_import_params_get_type (void) { } -gpointer video_import_params_ref (gpointer instance) { +gpointer +video_import_params_ref (gpointer instance) +{ VideoImportParams * self; self = instance; #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_atomic_int_inc (&self->ref_count); #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" return instance; -#line 1836 "VideoSupport.c" +#line 2202 "VideoSupport.c" } -void video_import_params_unref (gpointer instance) { +void +video_import_params_unref (gpointer instance) +{ VideoImportParams * self; self = instance; #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -1845,155 +2213,141 @@ void video_import_params_unref (gpointer instance) { VIDEO_IMPORT_PARAMS_GET_CLASS (self)->finalize (self); #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1849 "VideoSupport.c" +#line 2217 "VideoSupport.c" } } -VideoReader* video_reader_construct (GType object_type, GFile* file) { +VideoReader* +video_reader_construct (GType object_type, + GFile* file) +{ VideoReader* self = NULL; GFile* _tmp0_; - GFile* _tmp1_; #line 51 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 51 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = (VideoReader*) g_type_create_instance (object_type); #line 52 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = file; -#line 52 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (file); #line 52 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (self->priv->file); #line 52 "/home/jens/Source/shotwell/src/VideoSupport.vala" - self->priv->file = _tmp1_; + self->priv->file = _tmp0_; #line 51 "/home/jens/Source/shotwell/src/VideoSupport.vala" return self; -#line 1872 "VideoSupport.c" +#line 2240 "VideoSupport.c" } -VideoReader* video_reader_new (GFile* file) { +VideoReader* +video_reader_new (GFile* file) +{ #line 51 "/home/jens/Source/shotwell/src/VideoSupport.vala" return video_reader_construct (TYPE_VIDEO_READER, file); -#line 1879 "VideoSupport.c" +#line 2249 "VideoSupport.c" } -gboolean video_reader_is_supported_video_file (GFile* file) { +gboolean +video_reader_is_supported_video_file (GFile* file) +{ gboolean result = FALSE; gchar* mime_type = NULL; - GFile* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; + guchar* _tmp2_; guchar* _tmp3_; - guchar* _tmp4_; - gint _tmp4__length1; + gint _tmp3__length1; + gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; - gboolean _tmp7_ = FALSE; - const gchar* _tmp8_; - GFile* _tmp23_; - gchar* _tmp24_; - gchar* _tmp25_; - gboolean _tmp26_; - gboolean _tmp27_; + gboolean _tmp6_ = FALSE; + const gchar* _tmp7_; + gchar* _tmp18_; + gchar* _tmp19_; + gboolean _tmp20_; GError * _inner_error_ = NULL; #line 55 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = file; -#line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = g_file_get_basename (_tmp0_); + _tmp0_ = g_file_get_basename (file); #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = g_new0 (guchar, 0); + _tmp2_ = g_new0 (guchar, 0); #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4__length1 = 0; + _tmp3__length1 = 0; #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = g_content_type_guess (_tmp2_, _tmp4_, (gsize) 0, NULL); + _tmp4_ = g_content_type_guess (_tmp1_, _tmp3_, (gsize) 0, NULL); #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = (g_free (_tmp4_), NULL); + _tmp3_ = (g_free (_tmp3_), NULL); #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala" - mime_type = _tmp6_; + mime_type = _tmp5_; #line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = mime_type; + _tmp7_ = mime_type; #line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (g_strcmp0 (_tmp8_, "audio/ogg") == 0) { -#line 1930 "VideoSupport.c" - GFile* _tmp9_; - gboolean _tmp10_; -#line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = file; + if (g_strcmp0 (_tmp7_, "audio/ogg") == 0) { #line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = g_file_has_uri_scheme (_tmp9_, "file"); -#line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = _tmp10_; -#line 1939 "VideoSupport.c" + _tmp6_ = g_file_has_uri_scheme (file, "file"); +#line 2299 "VideoSupport.c" } else { #line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = FALSE; -#line 1943 "VideoSupport.c" + _tmp6_ = FALSE; +#line 2303 "VideoSupport.c" } #line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp7_) { -#line 1947 "VideoSupport.c" + if (_tmp6_) { +#line 2307 "VideoSupport.c" { GFileInfo* info = NULL; - GFile* _tmp11_; - GFileInfo* _tmp12_; + GFileInfo* _tmp8_; gchar* content_type = NULL; - GFileInfo* _tmp13_; - const gchar* _tmp14_; - gchar* _tmp15_; - gboolean _tmp16_ = FALSE; - const gchar* _tmp17_; -#line 60 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = file; + GFileInfo* _tmp9_; + const gchar* _tmp10_; + gchar* _tmp11_; + gboolean _tmp12_ = FALSE; + const gchar* _tmp13_; #line 60 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = g_file_query_info (_tmp11_, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); + _tmp8_ = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); #line 60 "/home/jens/Source/shotwell/src/VideoSupport.vala" - info = _tmp12_; + info = _tmp8_; #line 60 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1966 "VideoSupport.c" +#line 2323 "VideoSupport.c" goto __catch503_g_error; } #line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp13_ = info; + _tmp9_ = info; #line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp14_ = g_file_info_get_content_type (_tmp13_); + _tmp10_ = g_file_info_get_content_type (_tmp9_); #line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp15_ = g_strdup (_tmp14_); + _tmp11_ = g_strdup (_tmp10_); #line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala" - content_type = _tmp15_; -#line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp17_ = content_type; + content_type = _tmp11_; #line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp17_ != NULL) { -#line 1981 "VideoSupport.c" - const gchar* _tmp18_; - gboolean _tmp19_; + _tmp13_ = content_type; #line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp18_ = content_type; + if (_tmp13_ != NULL) { +#line 2338 "VideoSupport.c" + const gchar* _tmp14_; #line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp19_ = g_str_has_prefix (_tmp18_, "video/"); + _tmp14_ = content_type; #line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp16_ = _tmp19_; -#line 1990 "VideoSupport.c" + _tmp12_ = g_str_has_prefix (_tmp14_, "video/"); +#line 2344 "VideoSupport.c" } else { #line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp16_ = FALSE; -#line 1994 "VideoSupport.c" + _tmp12_ = FALSE; +#line 2348 "VideoSupport.c" } #line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp16_) { + if (_tmp12_) { #line 64 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = TRUE; #line 64 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -2004,39 +2358,39 @@ gboolean video_reader_is_supported_video_file (GFile* file) { _g_free0 (mime_type); #line 64 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 2008 "VideoSupport.c" +#line 2362 "VideoSupport.c" } #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (content_type); #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (info); -#line 2014 "VideoSupport.c" +#line 2368 "VideoSupport.c" } goto __finally503; __catch503_g_error: { GError* _error_ = NULL; - GError* _tmp20_; - const gchar* _tmp21_; + GError* _tmp15_; + const gchar* _tmp16_; #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala" _error_ = _inner_error_; #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala" _inner_error_ = NULL; #line 67 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp20_ = _error_; + _tmp15_ = _error_; #line 67 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp21_ = _tmp20_->message; + _tmp16_ = _tmp15_->message; #line 67 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_debug ("VideoSupport.vala:67: Failed to query content type: %s", _tmp21_); + g_debug ("VideoSupport.vala:67: Failed to query content type: %s", _tmp16_); #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_error_free0 (_error_); -#line 2034 "VideoSupport.c" +#line 2388 "VideoSupport.c" } __finally503: #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2039 "VideoSupport.c" - gboolean _tmp22_ = FALSE; +#line 2393 "VideoSupport.c" + gboolean _tmp17_ = FALSE; #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (mime_type); #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -2044,110 +2398,96 @@ gboolean video_reader_is_supported_video_file (GFile* file) { #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_clear_error (&_inner_error_); #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala" - return _tmp22_; -#line 2049 "VideoSupport.c" + return _tmp17_; +#line 2403 "VideoSupport.c" } } #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp23_ = file; + _tmp18_ = g_file_get_basename (file); #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp24_ = g_file_get_basename (_tmp23_); -#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp25_ = _tmp24_; -#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp26_ = video_reader_is_supported_video_filename (_tmp25_); + _tmp19_ = _tmp18_; #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp27_ = _tmp26_; + _tmp20_ = video_reader_is_supported_video_filename (_tmp19_); #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp25_); + _g_free0 (_tmp19_); #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp27_; + result = _tmp20_; #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (mime_type); #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 2070 "VideoSupport.c" +#line 2420 "VideoSupport.c" } -gboolean video_reader_is_supported_video_filename (const gchar* filename) { +gboolean +video_reader_is_supported_video_filename (const gchar* filename) +{ gboolean result = FALSE; gchar* mime_type = NULL; - const gchar* _tmp0_; + guchar* _tmp0_; guchar* _tmp1_; - guchar* _tmp2_; - gint _tmp2__length1; - gchar* _tmp3_; - gboolean _tmp4_ = FALSE; - const gchar* _tmp5_; - gboolean _tmp6_; + gint _tmp1__length1; + gchar* _tmp2_; + gboolean _tmp3_ = FALSE; + const gchar* _tmp4_; #line 74 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (filename != NULL, FALSE); #line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = filename; + _tmp0_ = g_new0 (guchar, 0); #line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = g_new0 (guchar, 0); -#line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2__length1 = 0; + _tmp1__length1 = 0; #line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = g_content_type_guess (_tmp0_, _tmp2_, (gsize) 0, NULL); + _tmp2_ = g_content_type_guess (filename, _tmp1_, (gsize) 0, NULL); #line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (mime_type); #line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala" - mime_type = _tmp3_; + mime_type = _tmp2_; #line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = (g_free (_tmp2_), NULL); -#line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = mime_type; + _tmp1_ = (g_free (_tmp1_), NULL); #line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = g_str_has_prefix (_tmp5_, "video/"); + _tmp4_ = mime_type; #line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp6_) { + if (g_str_has_prefix (_tmp4_, "video/")) { #line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = TRUE; -#line 2111 "VideoSupport.c" + _tmp3_ = TRUE; +#line 2457 "VideoSupport.c" } else { - const gchar* _tmp7_; - gboolean _tmp8_; -#line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = mime_type; + const gchar* _tmp5_; #line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = g_str_has_suffix (_tmp7_, "mp4"); + _tmp5_ = mime_type; #line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = _tmp8_; -#line 2121 "VideoSupport.c" + _tmp3_ = g_str_has_suffix (_tmp5_, "mp4"); +#line 2464 "VideoSupport.c" } #line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp4_) { -#line 2125 "VideoSupport.c" + if (_tmp3_) { +#line 2468 "VideoSupport.c" gchar* extension = NULL; gchar* name = NULL; - const gchar* _tmp9_; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - const gchar* _tmp12_; + gchar* _tmp6_ = NULL; + gchar* _tmp7_ = NULL; + const gchar* _tmp8_; #line 79 "/home/jens/Source/shotwell/src/VideoSupport.vala" extension = NULL; #line 80 "/home/jens/Source/shotwell/src/VideoSupport.vala" name = NULL; #line 81 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = filename; -#line 81 "/home/jens/Source/shotwell/src/VideoSupport.vala" - disassemble_filename (_tmp9_, &_tmp10_, &_tmp11_); + disassemble_filename (filename, &_tmp6_, &_tmp7_); #line 81 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (name); #line 81 "/home/jens/Source/shotwell/src/VideoSupport.vala" - name = _tmp10_; + name = _tmp6_; #line 81 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (extension); #line 81 "/home/jens/Source/shotwell/src/VideoSupport.vala" - extension = _tmp11_; + extension = _tmp7_; #line 83 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = extension; + _tmp8_ = extension; #line 83 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp12_ == NULL) { + if (_tmp8_ == NULL) { #line 84 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = TRUE; #line 84 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -2158,7 +2498,7 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) { _g_free0 (mime_type); #line 84 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 2162 "VideoSupport.c" +#line 2502 "VideoSupport.c" } { const gchar** s_collection = NULL; @@ -2171,26 +2511,23 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) { s_collection_length1 = G_N_ELEMENTS (VIDEO_READER_METADATA_ONLY_FILE_EXTENSIONS); #line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala" for (s_it = 0; s_it < G_N_ELEMENTS (VIDEO_READER_METADATA_ONLY_FILE_EXTENSIONS); s_it = s_it + 1) { -#line 2175 "VideoSupport.c" - gchar* _tmp13_; +#line 2515 "VideoSupport.c" + gchar* _tmp9_; gchar* s = NULL; #line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp13_ = g_strdup (s_collection[s_it]); + _tmp9_ = g_strdup (s_collection[s_it]); #line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala" - s = _tmp13_; -#line 2182 "VideoSupport.c" + s = _tmp9_; +#line 2522 "VideoSupport.c" { - const gchar* _tmp14_; - const gchar* _tmp15_; - gint _tmp16_; + const gchar* _tmp10_; + const gchar* _tmp11_; #line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp14_ = s; + _tmp10_ = s; #line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp15_ = extension; + _tmp11_ = extension; #line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp16_ = utf8_ci_compare (_tmp14_, _tmp15_); -#line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp16_ == 0) { + if (utf8_ci_compare (_tmp10_, _tmp11_) == 0) { #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = FALSE; #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -2203,11 +2540,11 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) { _g_free0 (mime_type); #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 2207 "VideoSupport.c" +#line 2544 "VideoSupport.c" } #line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (s); -#line 2211 "VideoSupport.c" +#line 2548 "VideoSupport.c" } } } @@ -2221,166 +2558,136 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) { _g_free0 (mime_type); #line 91 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 2225 "VideoSupport.c" +#line 2562 "VideoSupport.c" } else { - const gchar* _tmp17_; - const gchar* _tmp18_; -#line 93 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp17_ = filename; + const gchar* _tmp12_; #line 93 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp18_ = mime_type; + _tmp12_ = mime_type; #line 93 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_debug ("VideoSupport.vala:93: Skipping %s, unsupported mime type %s", _tmp17_, _tmp18_); + g_debug ("VideoSupport.vala:93: Skipping %s, unsupported mime type %s", filename, _tmp12_); #line 94 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = FALSE; #line 94 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (mime_type); #line 94 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 2241 "VideoSupport.c" +#line 2575 "VideoSupport.c" } #line 74 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (mime_type); -#line 2245 "VideoSupport.c" +#line 2579 "VideoSupport.c" } -ImportResult video_reader_prepare_for_import (VideoImportParams* params) { +ImportResult +video_reader_prepare_for_import (VideoImportParams* params) +{ ImportResult result = 0; GFile* file = NULL; - VideoImportParams* _tmp0_; + GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; GFileInfo* info = NULL; - GFileInfo* _tmp7_; - GFileType _tmp8_; - GFile* _tmp9_; - gboolean _tmp10_; + GFileInfo* _tmp6_; + GFile* _tmp7_; GTimeVal timestamp = {0}; - GFileInfo* _tmp14_; - GTimeVal _tmp15_ = {0}; - VideoImportParams* _tmp16_; - const gchar* _tmp17_; + GFileInfo* _tmp11_; + GTimeVal _tmp12_ = {0}; + const gchar* _tmp13_; time_t exposure_time = 0; - VideoImportParams* _tmp18_; - time_t _tmp19_; + time_t _tmp14_; gchar* title = NULL; - gchar* _tmp20_; + gchar* _tmp15_; gchar* comment = NULL; - gchar* _tmp21_; + gchar* _tmp16_; VideoReader* reader = NULL; - GFile* _tmp22_; - VideoReader* _tmp23_; + GFile* _tmp17_; + VideoReader* _tmp18_; gboolean is_interpretable = FALSE; gdouble clip_duration = 0.0; GdkPixbuf* preview_frame = NULL; - VideoReader* _tmp24_; - GdkPixbuf* _tmp25_; - time_t _tmp53_; - VideoImportParams* _tmp60_; - VideoRow* _tmp61_; - VideoImportParams* _tmp62_; - VideoRow* _tmp63_; - GFile* _tmp64_; - gchar* _tmp65_; - VideoImportParams* _tmp66_; - VideoRow* _tmp67_; - GFileInfo* _tmp68_; - gint64 _tmp69_; - VideoImportParams* _tmp70_; - VideoRow* _tmp71_; - GTimeVal _tmp72_; - glong _tmp73_; - VideoImportParams* _tmp74_; - VideoRow* _tmp75_; - GdkPixbuf* _tmp76_; - gint _tmp77_; - gint _tmp78_; - VideoImportParams* _tmp79_; + VideoReader* _tmp19_; + GdkPixbuf* _tmp20_; + time_t _tmp45_; + VideoRow* _tmp51_; + VideoRow* _tmp52_; + GFile* _tmp53_; + gchar* _tmp54_; + VideoRow* _tmp55_; + GFileInfo* _tmp56_; + VideoRow* _tmp57_; + GTimeVal _tmp58_; + glong _tmp59_; + VideoRow* _tmp60_; + GdkPixbuf* _tmp61_; + gint _tmp62_; + gint _tmp63_; + VideoRow* _tmp64_; + GdkPixbuf* _tmp65_; + gint _tmp66_; + gint _tmp67_; + VideoRow* _tmp68_; + gdouble _tmp69_; + VideoRow* _tmp70_; + gboolean _tmp71_; + VideoRow* _tmp72_; + time_t _tmp73_; + VideoRow* _tmp74_; + ImportID _tmp75_; + VideoRow* _tmp76_; + VideoRow* _tmp77_; + const gchar* _tmp78_; + gchar* _tmp79_; VideoRow* _tmp80_; - GdkPixbuf* _tmp81_; - gint _tmp82_; - gint _tmp83_; - VideoImportParams* _tmp84_; - VideoRow* _tmp85_; - gdouble _tmp86_; - VideoImportParams* _tmp87_; - VideoRow* _tmp88_; - gboolean _tmp89_; - VideoImportParams* _tmp90_; - VideoRow* _tmp91_; - time_t _tmp92_; - VideoImportParams* _tmp93_; - VideoRow* _tmp94_; - VideoImportParams* _tmp95_; - ImportID _tmp96_; - VideoImportParams* _tmp97_; - VideoRow* _tmp98_; - VideoImportParams* _tmp99_; - VideoRow* _tmp100_; - VideoImportParams* _tmp101_; - const gchar* _tmp102_; - gchar* _tmp103_; - VideoImportParams* _tmp104_; - VideoRow* _tmp105_; - VideoImportParams* _tmp106_; - VideoRow* _tmp107_; - const gchar* _tmp108_; - gchar* _tmp109_; - VideoImportParams* _tmp110_; - VideoRow* _tmp111_; - const gchar* _tmp112_; - gchar* _tmp113_; - VideoImportParams* _tmp114_; - VideoRow* _tmp115_; - gchar* _tmp116_; - VideoImportParams* _tmp117_; - VideoRow* _tmp118_; - VideoImportParams* _tmp119_; - VideoRow* _tmp120_; - VideoImportParams* _tmp121_; - Thumbnails* _tmp122_; + VideoRow* _tmp81_; + const gchar* _tmp82_; + gchar* _tmp83_; + VideoRow* _tmp84_; + const gchar* _tmp85_; + gchar* _tmp86_; + VideoRow* _tmp87_; + gchar* _tmp88_; + VideoRow* _tmp89_; + VideoRow* _tmp90_; + Thumbnails* _tmp91_; GError * _inner_error_ = NULL; #line 98 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (IS_VIDEO_IMPORT_PARAMS (params), 0); #line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = params; -#line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = _tmp0_->file; + _tmp0_ = params->file; #line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala" - file = _tmp2_; + file = _tmp1_; #line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala" info = NULL; -#line 2357 "VideoSupport.c" +#line 2664 "VideoSupport.c" { - GFileInfo* _tmp3_ = NULL; - GFile* _tmp4_; + GFileInfo* _tmp2_ = NULL; + GFile* _tmp3_; + GFileInfo* _tmp4_; GFileInfo* _tmp5_; - GFileInfo* _tmp6_; #line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = file; + _tmp3_ = file; #line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = g_file_query_info (_tmp4_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); + _tmp4_ = g_file_query_info (_tmp3_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); #line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = _tmp5_; + _tmp2_ = _tmp4_; #line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2371 "VideoSupport.c" +#line 2678 "VideoSupport.c" goto __catch504_g_error; } #line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = _tmp3_; + _tmp5_ = _tmp2_; #line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = NULL; + _tmp2_ = NULL; #line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (info); #line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala" - info = _tmp6_; + info = _tmp5_; #line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_object_unref0 (_tmp3_); -#line 2384 "VideoSupport.c" + _g_object_unref0 (_tmp2_); +#line 2691 "VideoSupport.c" } goto __finally504; __catch504_g_error: @@ -2400,7 +2707,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) { _g_object_unref0 (file); #line 109 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 2404 "VideoSupport.c" +#line 2711 "VideoSupport.c" } __finally504: #line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -2415,14 +2722,12 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) { g_clear_error (&_inner_error_); #line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala" return 0; -#line 2419 "VideoSupport.c" +#line 2726 "VideoSupport.c" } #line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = info; -#line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = g_file_info_get_file_type (_tmp7_); + _tmp6_ = info; #line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp8_ != G_FILE_TYPE_REGULAR) { + if (g_file_info_get_file_type (_tmp6_) != G_FILE_TYPE_REGULAR) { #line 113 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = IMPORT_RESULT_NOT_A_FILE; #line 113 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -2431,28 +2736,26 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) { _g_object_unref0 (file); #line 113 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 2435 "VideoSupport.c" +#line 2740 "VideoSupport.c" } #line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = file; -#line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = video_reader_is_supported_video_file (_tmp9_); + _tmp7_ = file; #line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (!_tmp10_) { -#line 2443 "VideoSupport.c" - GFile* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; + if (!video_reader_is_supported_video_file (_tmp7_)) { +#line 2746 "VideoSupport.c" + GFile* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; #line 116 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = file; + _tmp8_ = file; #line 116 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = g_file_get_path (_tmp11_); + _tmp9_ = g_file_get_path (_tmp8_); #line 116 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp13_ = _tmp12_; + _tmp10_ = _tmp9_; #line 116 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_message ("Not importing %s: file is marked as a video file but doesn't have a" "supported extension", _tmp13_); + g_message ("Not importing %s: file is marked as a video file but doesn't have a" "supported extension", _tmp10_); #line 116 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp10_); #line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = IMPORT_RESULT_UNSUPPORTED_FORMAT; #line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -2461,66 +2764,59 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) { _g_object_unref0 (file); #line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 2465 "VideoSupport.c" +#line 2768 "VideoSupport.c" } #line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp14_ = info; + _tmp11_ = info; #line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_file_info_get_modification_time (_tmp14_, &_tmp15_); + g_file_info_get_modification_time (_tmp11_, &_tmp12_); #line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala" - timestamp = _tmp15_; -#line 125 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp16_ = params; + timestamp = _tmp12_; #line 125 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp17_ = _tmp16_->md5; + _tmp13_ = params->md5; #line 125 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _vala_assert (_tmp17_ != NULL, "params.md5 != null"); + _vala_assert (_tmp13_ != NULL, "params.md5 != null"); #line 127 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp18_ = params; + _tmp14_ = params->exposure_time_override; #line 127 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp19_ = _tmp18_->exposure_time_override; -#line 127 "/home/jens/Source/shotwell/src/VideoSupport.vala" - exposure_time = _tmp19_; + exposure_time = _tmp14_; #line 128 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp20_ = g_strdup (""); + _tmp15_ = g_strdup (""); #line 128 "/home/jens/Source/shotwell/src/VideoSupport.vala" - title = _tmp20_; + title = _tmp15_; #line 129 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp21_ = g_strdup (""); + _tmp16_ = g_strdup (""); #line 129 "/home/jens/Source/shotwell/src/VideoSupport.vala" - comment = _tmp21_; + comment = _tmp16_; #line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp22_ = file; + _tmp17_ = file; #line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp23_ = video_reader_new (_tmp22_); + _tmp18_ = video_reader_new (_tmp17_); #line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala" - reader = _tmp23_; + reader = _tmp18_; #line 132 "/home/jens/Source/shotwell/src/VideoSupport.vala" is_interpretable = TRUE; #line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala" clip_duration = 0.0; #line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp24_ = reader; + _tmp19_ = reader; #line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp25_ = video_reader_read_preview_frame (_tmp24_); + _tmp20_ = video_reader_read_preview_frame (_tmp19_); #line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala" - preview_frame = _tmp25_; -#line 2509 "VideoSupport.c" + preview_frame = _tmp20_; +#line 2808 "VideoSupport.c" { - gdouble _tmp26_ = 0.0; - VideoReader* _tmp27_; - gdouble _tmp28_; -#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp27_ = reader; + gdouble _tmp21_ = 0.0; + VideoReader* _tmp22_; #line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp28_ = video_reader_read_clip_duration (_tmp27_, &_inner_error_); + _tmp22_ = reader; #line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp26_ = _tmp28_; + _tmp21_ = video_reader_read_clip_duration (_tmp22_, &_inner_error_); #line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_inner_error_->domain == VIDEO_ERROR) { -#line 2524 "VideoSupport.c" +#line 2820 "VideoSupport.c" goto __catch505_video_error; } #line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -2541,25 +2837,25 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) { g_clear_error (&_inner_error_); #line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala" return 0; -#line 2545 "VideoSupport.c" +#line 2841 "VideoSupport.c" } #line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala" - clip_duration = _tmp26_; -#line 2549 "VideoSupport.c" + clip_duration = _tmp21_; +#line 2845 "VideoSupport.c" } goto __finally505; __catch505_video_error: { GError* err = NULL; - GError* _tmp29_; + GError* _tmp23_; #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala" err = _inner_error_; #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala" _inner_error_ = NULL; #line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp29_ = err; + _tmp23_ = err; #line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (g_error_matches (_tmp29_, VIDEO_ERROR, VIDEO_ERROR_FILE)) { + if (g_error_matches (_tmp23_, VIDEO_ERROR, VIDEO_ERROR_FILE)) { #line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = IMPORT_RESULT_FILE_ERROR; #line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -2578,28 +2874,28 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) { _g_object_unref0 (file); #line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 2582 "VideoSupport.c" +#line 2878 "VideoSupport.c" } else { - GError* _tmp30_; + GError* _tmp24_; #line 140 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp30_ = err; + _tmp24_ = err; #line 140 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (g_error_matches (_tmp30_, VIDEO_ERROR, VIDEO_ERROR_CONTENTS)) { + if (g_error_matches (_tmp24_, VIDEO_ERROR, VIDEO_ERROR_CONTENTS)) { #line 141 "/home/jens/Source/shotwell/src/VideoSupport.vala" is_interpretable = FALSE; #line 142 "/home/jens/Source/shotwell/src/VideoSupport.vala" clip_duration = 0.0; -#line 2593 "VideoSupport.c" +#line 2889 "VideoSupport.c" } else { #line 144 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_error ("VideoSupport.vala:144: can't prepare video for import: an unknown kind" \ " of video error occurred"); -#line 2597 "VideoSupport.c" +#line 2893 "VideoSupport.c" } } #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_error_free0 (err); -#line 2602 "VideoSupport.c" +#line 2898 "VideoSupport.c" } __finally505: #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -2622,119 +2918,113 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) { g_clear_error (&_inner_error_); #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala" return 0; -#line 2625 "VideoSupport.c" +#line 2921 "VideoSupport.c" } { VideoMetadata* metadata = NULL; - VideoReader* _tmp31_; - VideoMetadata* _tmp32_; + VideoReader* _tmp25_; + VideoMetadata* _tmp26_; MetadataDateTime* creation_date_time = NULL; - VideoMetadata* _tmp33_; - MetadataDateTime* _tmp34_; - gboolean _tmp35_ = FALSE; - MetadataDateTime* _tmp36_; + VideoMetadata* _tmp27_; + MetadataDateTime* _tmp28_; + gboolean _tmp29_ = FALSE; + MetadataDateTime* _tmp30_; gchar* video_title = NULL; - VideoMetadata* _tmp41_; - gchar* _tmp42_; + VideoMetadata* _tmp33_; + gchar* _tmp34_; gchar* video_comment = NULL; - VideoMetadata* _tmp43_; - gchar* _tmp44_; - const gchar* _tmp45_; - const gchar* _tmp48_; + VideoMetadata* _tmp35_; + gchar* _tmp36_; + const gchar* _tmp37_; + const gchar* _tmp40_; #line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp31_ = reader; + _tmp25_ = reader; #line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp32_ = video_reader_read_metadata (_tmp31_, &_inner_error_); + _tmp26_ = video_reader_read_metadata (_tmp25_, &_inner_error_); #line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala" - metadata = _tmp32_; + metadata = _tmp26_; #line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2652 "VideoSupport.c" +#line 2948 "VideoSupport.c" goto __catch506_g_error; } #line 150 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp33_ = metadata; + _tmp27_ = metadata; #line 150 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp34_ = media_metadata_get_creation_date_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp28_ = media_metadata_get_creation_date_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 150 "/home/jens/Source/shotwell/src/VideoSupport.vala" - creation_date_time = _tmp34_; -#line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp36_ = creation_date_time; + creation_date_time = _tmp28_; #line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp36_ != NULL) { -#line 2665 "VideoSupport.c" - MetadataDateTime* _tmp37_; - time_t _tmp38_; + _tmp30_ = creation_date_time; #line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp37_ = creation_date_time; + if (_tmp30_ != NULL) { +#line 2961 "VideoSupport.c" + MetadataDateTime* _tmp31_; #line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp38_ = metadata_date_time_get_timestamp (_tmp37_); + _tmp31_ = creation_date_time; #line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp35_ = _tmp38_ != ((time_t) 0); -#line 2674 "VideoSupport.c" + _tmp29_ = metadata_date_time_get_timestamp (_tmp31_) != ((time_t) 0); +#line 2967 "VideoSupport.c" } else { #line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp35_ = FALSE; -#line 2678 "VideoSupport.c" + _tmp29_ = FALSE; +#line 2971 "VideoSupport.c" } #line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp35_) { -#line 2682 "VideoSupport.c" - MetadataDateTime* _tmp39_; - time_t _tmp40_; -#line 153 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp39_ = creation_date_time; + if (_tmp29_) { +#line 2975 "VideoSupport.c" + MetadataDateTime* _tmp32_; #line 153 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp40_ = metadata_date_time_get_timestamp (_tmp39_); + _tmp32_ = creation_date_time; #line 153 "/home/jens/Source/shotwell/src/VideoSupport.vala" - exposure_time = _tmp40_; -#line 2691 "VideoSupport.c" + exposure_time = metadata_date_time_get_timestamp (_tmp32_); +#line 2981 "VideoSupport.c" } #line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp41_ = metadata; + _tmp33_ = metadata; #line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp42_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp34_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_title = _tmp42_; + video_title = _tmp34_; #line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp43_ = metadata; + _tmp35_ = metadata; #line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp44_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp36_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_comment = _tmp44_; + video_comment = _tmp36_; #line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp45_ = video_title; + _tmp37_ = video_title; #line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp45_ != NULL) { -#line 2709 "VideoSupport.c" - const gchar* _tmp46_; - gchar* _tmp47_; + if (_tmp37_ != NULL) { +#line 2999 "VideoSupport.c" + const gchar* _tmp38_; + gchar* _tmp39_; #line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp46_ = video_title; + _tmp38_ = video_title; #line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp47_ = g_strdup (_tmp46_); + _tmp39_ = g_strdup (_tmp38_); #line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (title); #line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala" - title = _tmp47_; -#line 2720 "VideoSupport.c" + title = _tmp39_; +#line 3010 "VideoSupport.c" } #line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp48_ = video_comment; + _tmp40_ = video_comment; #line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp48_ != NULL) { -#line 2726 "VideoSupport.c" - const gchar* _tmp49_; - gchar* _tmp50_; + if (_tmp40_ != NULL) { +#line 3016 "VideoSupport.c" + const gchar* _tmp41_; + gchar* _tmp42_; #line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp49_ = video_comment; + _tmp41_ = video_comment; #line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp50_ = g_strdup (_tmp49_); + _tmp42_ = g_strdup (_tmp41_); #line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (comment); #line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala" - comment = _tmp50_; -#line 2737 "VideoSupport.c" + comment = _tmp42_; +#line 3027 "VideoSupport.c" } #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (video_comment); @@ -2744,27 +3034,27 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) { _metadata_date_time_unref0 (creation_date_time); #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala" _media_metadata_unref0 (metadata); -#line 2747 "VideoSupport.c" +#line 3037 "VideoSupport.c" } goto __finally506; __catch506_g_error: { GError* err = NULL; - GError* _tmp51_; - const gchar* _tmp52_; + GError* _tmp43_; + const gchar* _tmp44_; #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala" err = _inner_error_; #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala" _inner_error_ = NULL; #line 162 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp51_ = err; + _tmp43_ = err; #line 162 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp52_ = _tmp51_->message; + _tmp44_ = _tmp43_->message; #line 162 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_warning ("VideoSupport.vala:162: Unable to read video metadata: %s", _tmp52_); + g_warning ("VideoSupport.vala:162: Unable to read video metadata: %s", _tmp44_); #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_error_free0 (err); -#line 2767 "VideoSupport.c" +#line 3057 "VideoSupport.c" } __finally506: #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -2787,241 +3077,188 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) { g_clear_error (&_inner_error_); #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala" return 0; -#line 2790 "VideoSupport.c" +#line 3080 "VideoSupport.c" } #line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp53_ = exposure_time; + _tmp45_ = exposure_time; #line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp53_ == ((time_t) 0)) { -#line 2796 "VideoSupport.c" - gint64 _tmp54_ = 0LL; - VideoReader* _tmp55_; - GDateTime* _tmp56_; + if (_tmp45_ == ((time_t) 0)) { +#line 3086 "VideoSupport.c" + gint64 _tmp46_ = 0LL; + VideoReader* _tmp47_; + GDateTime* _tmp48_; #line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp55_ = reader; + _tmp47_ = reader; #line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp56_ = _tmp55_->priv->_timestamp; + _tmp48_ = _tmp47_->priv->_timestamp; #line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp56_ != NULL) { -#line 2806 "VideoSupport.c" - VideoReader* _tmp57_; - GDateTime* _tmp58_; - gint64 _tmp59_; -#line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp57_ = reader; + if (_tmp48_ != NULL) { +#line 3096 "VideoSupport.c" + VideoReader* _tmp49_; + GDateTime* _tmp50_; #line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp58_ = _tmp57_->priv->_timestamp; + _tmp49_ = reader; #line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp59_ = g_date_time_to_unix (_tmp58_); + _tmp50_ = _tmp49_->priv->_timestamp; #line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp54_ = _tmp59_; -#line 2818 "VideoSupport.c" + _tmp46_ = g_date_time_to_unix (_tmp50_); +#line 3105 "VideoSupport.c" } else { #line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp54_ = (gint64) 0; -#line 2822 "VideoSupport.c" + _tmp46_ = (gint64) 0; +#line 3109 "VideoSupport.c" } #line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala" - exposure_time = (time_t) _tmp54_; -#line 2826 "VideoSupport.c" + exposure_time = (time_t) _tmp46_; +#line 3113 "VideoSupport.c" } #line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp60_ = params; + _tmp51_ = params->row; #line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp61_ = _tmp60_->row; -#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_id_init (&_tmp61_->video_id, VIDEO_ID_INVALID); -#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp62_ = params; + video_id_init (&_tmp51_->video_id, VIDEO_ID_INVALID); #line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp63_ = _tmp62_->row; + _tmp52_ = params->row; #line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp64_ = file; + _tmp53_ = file; #line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp65_ = g_file_get_path (_tmp64_); + _tmp54_ = g_file_get_path (_tmp53_); #line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp63_->filepath); + _g_free0 (_tmp52_->filepath); #line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp63_->filepath = _tmp65_; + _tmp52_->filepath = _tmp54_; #line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp66_ = params; + _tmp55_ = params->row; #line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp67_ = _tmp66_->row; + _tmp56_ = info; #line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp68_ = info; -#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp69_ = g_file_info_get_size (_tmp68_); -#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp67_->filesize = _tmp69_; + _tmp55_->filesize = g_file_info_get_size (_tmp56_); #line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp70_ = params; + _tmp57_ = params->row; #line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp71_ = _tmp70_->row; + _tmp58_ = timestamp; #line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp72_ = timestamp; + _tmp59_ = _tmp58_.tv_sec; #line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp73_ = _tmp72_.tv_sec; -#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp71_->timestamp = (time_t) _tmp73_; -#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp74_ = params; + _tmp57_->timestamp = (time_t) _tmp59_; #line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp75_ = _tmp74_->row; + _tmp60_ = params->row; #line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp76_ = preview_frame; + _tmp61_ = preview_frame; #line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp77_ = gdk_pixbuf_get_width (_tmp76_); + _tmp62_ = gdk_pixbuf_get_width (_tmp61_); #line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp78_ = _tmp77_; + _tmp63_ = _tmp62_; #line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp75_->width = _tmp78_; + _tmp60_->width = _tmp63_; #line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp79_ = params; + _tmp64_ = params->row; #line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp80_ = _tmp79_->row; + _tmp65_ = preview_frame; #line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp81_ = preview_frame; + _tmp66_ = gdk_pixbuf_get_height (_tmp65_); #line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp82_ = gdk_pixbuf_get_height (_tmp81_); + _tmp67_ = _tmp66_; #line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp83_ = _tmp82_; -#line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp80_->height = _tmp83_; -#line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp84_ = params; + _tmp64_->height = _tmp67_; #line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp85_ = _tmp84_->row; + _tmp68_ = params->row; #line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp86_ = clip_duration; + _tmp69_ = clip_duration; #line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp85_->clip_duration = _tmp86_; + _tmp68_->clip_duration = _tmp69_; #line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp87_ = params; + _tmp70_ = params->row; #line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp88_ = _tmp87_->row; + _tmp71_ = is_interpretable; #line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp89_ = is_interpretable; -#line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp88_->is_interpretable = _tmp89_; -#line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp90_ = params; + _tmp70_->is_interpretable = _tmp71_; #line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp91_ = _tmp90_->row; + _tmp72_ = params->row; #line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp92_ = exposure_time; + _tmp73_ = exposure_time; #line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp91_->exposure_time = _tmp92_; + _tmp72_->exposure_time = _tmp73_; #line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp93_ = params; + _tmp74_ = params->row; #line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp94_ = _tmp93_->row; + _tmp75_ = params->import_id; #line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp95_ = params; -#line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp96_ = _tmp95_->import_id; -#line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp94_->import_id = _tmp96_; + _tmp74_->import_id = _tmp75_; #line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp97_ = params; + _tmp76_ = params->row; #line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp98_ = _tmp97_->row; -#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala" - event_id_init (&_tmp98_->event_id, EVENT_ID_INVALID); -#line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp99_ = params; + event_id_init (&_tmp76_->event_id, EVENT_ID_INVALID); #line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp100_ = _tmp99_->row; + _tmp77_ = params->row; #line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp101_ = params; + _tmp78_ = params->md5; #line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp102_ = _tmp101_->md5; + _tmp79_ = g_strdup (_tmp78_); #line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp103_ = g_strdup (_tmp102_); + _g_free0 (_tmp77_->md5); #line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp100_->md5); -#line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp100_->md5 = _tmp103_; -#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp104_ = params; + _tmp77_->md5 = _tmp79_; #line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp105_ = _tmp104_->row; + _tmp80_ = params->row; #line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp105_->time_created = (time_t) 0; + _tmp80_->time_created = (time_t) 0; #line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp106_ = params; + _tmp81_ = params->row; #line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp107_ = _tmp106_->row; + _tmp82_ = title; #line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp108_ = title; + _tmp83_ = g_strdup (_tmp82_); #line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp109_ = g_strdup (_tmp108_); + _g_free0 (_tmp81_->title); #line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp107_->title); -#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp107_->title = _tmp109_; -#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp110_ = params; + _tmp81_->title = _tmp83_; #line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp111_ = _tmp110_->row; + _tmp84_ = params->row; #line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp112_ = comment; + _tmp85_ = comment; #line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp113_ = g_strdup (_tmp112_); + _tmp86_ = g_strdup (_tmp85_); #line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp111_->comment); + _g_free0 (_tmp84_->comment); #line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp111_->comment = _tmp113_; + _tmp84_->comment = _tmp86_; #line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp114_ = params; + _tmp87_ = params->row; #line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp115_ = _tmp114_->row; + _tmp88_ = g_strdup (""); #line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp116_ = g_strdup (""); + _g_free0 (_tmp87_->backlinks); #line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp115_->backlinks); -#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp115_->backlinks = _tmp116_; -#line 187 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp117_ = params; + _tmp87_->backlinks = _tmp88_; #line 187 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp118_ = _tmp117_->row; + _tmp89_ = params->row; #line 187 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp118_->time_reimported = (time_t) 0; + _tmp89_->time_reimported = (time_t) 0; #line 188 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp119_ = params; + _tmp90_ = params->row; #line 188 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp120_ = _tmp119_->row; -#line 188 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp120_->flags = (guint64) 0; -#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp121_ = params; + _tmp90_->flags = (guint64) 0; #line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp122_ = _tmp121_->thumbnails; + _tmp91_ = params->thumbnails; #line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp122_ != NULL) { -#line 3002 "VideoSupport.c" - VideoImportParams* _tmp123_; - Thumbnails* _tmp124_; - VideoImportParams* _tmp125_; - Thumbnails* _tmp126_; - GdkPixbuf* _tmp127_; + if (_tmp91_ != NULL) { +#line 3245 "VideoSupport.c" + Thumbnails* _tmp92_; + Thumbnails* _tmp93_; + GdkPixbuf* _tmp94_; #line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp123_ = params; + _tmp92_ = thumbnails_new (); #line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp124_ = thumbnails_new (); + _thumbnails_unref0 (params->thumbnails); #line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _thumbnails_unref0 (_tmp123_->thumbnails); -#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp123_->thumbnails = _tmp124_; -#line 192 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp125_ = params; + params->thumbnails = _tmp92_; #line 192 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp126_ = _tmp125_->thumbnails; + _tmp93_ = params->thumbnails; #line 192 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp127_ = preview_frame; + _tmp94_ = preview_frame; #line 192 "/home/jens/Source/shotwell/src/VideoSupport.vala" - thumbnail_cache_generate_for_video_frame (_tmp126_, _tmp127_); -#line 3024 "VideoSupport.c" + thumbnail_cache_generate_for_video_frame (_tmp93_, _tmp94_); +#line 3261 "VideoSupport.c" } #line 198 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = IMPORT_RESULT_SUCCESS; @@ -3039,11 +3276,13 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) { _g_object_unref0 (file); #line 198 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 3042 "VideoSupport.c" +#line 3279 "VideoSupport.c" } -static GDate* _g_date_dup (GDate* self) { +static GDate* +_g_date_dup (GDate* self) +{ GDate* dup; #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala" dup = g_new0 (GDate, 1); @@ -3051,61 +3290,63 @@ static GDate* _g_date_dup (GDate* self) { memcpy (dup, self, sizeof (GDate)); #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala" return dup; -#line 3054 "VideoSupport.c" +#line 3293 "VideoSupport.c" } -static gpointer __g_date_dup0 (gpointer self) { +static gpointer +__g_date_dup0 (gpointer self) +{ #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala" return self ? _g_date_dup (self) : NULL; -#line 3061 "VideoSupport.c" +#line 3302 "VideoSupport.c" } -static void video_reader_read_internal (VideoReader* self, GError** error) { - gboolean _tmp0_; +static void +video_reader_read_internal (VideoReader* self, + GError** error) +{ GError * _inner_error_ = NULL; #line 201 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (IS_VIDEO_READER (self)); #line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = video_reader_does_file_exist (self); -#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (!_tmp0_) { -#line 3074 "VideoSupport.c" - GFile* _tmp1_; + if (!video_reader_does_file_exist (self)) { +#line 3315 "VideoSupport.c" + GFile* _tmp0_; + gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; + GError* _tmp5_; GError* _tmp6_; - GError* _tmp7_; #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = self->priv->file; + _tmp0_ = self->priv->file; #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = g_file_get_path (_tmp1_); + _tmp1_ = g_file_get_path (_tmp0_); #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = g_strdup_printf ("video file '%s' does not exist or is inaccessible", _tmp3_); + _tmp3_ = g_strdup_printf ("video file '%s' does not exist or is inaccessible", _tmp2_); #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = g_error_new_literal (VIDEO_ERROR, VIDEO_ERROR_FILE, _tmp5_); + _tmp5_ = g_error_new_literal (VIDEO_ERROR, VIDEO_ERROR_FILE, _tmp4_); #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp4_); #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _inner_error_ = _tmp7_; + _inner_error_ = _tmp6_; #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_inner_error_->domain == VIDEO_ERROR) { #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_propagate_error (error, _inner_error_); #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 3108 "VideoSupport.c" +#line 3349 "VideoSupport.c" } else { #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3113,138 +3354,126 @@ static void video_reader_read_internal (VideoReader* self, GError** error) { g_clear_error (&_inner_error_); #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 3116 "VideoSupport.c" +#line 3357 "VideoSupport.c" } } { GstDiscoverer* d = NULL; - GstDiscoverer* _tmp8_; + GstDiscoverer* _tmp7_; GstDiscovererInfo* info = NULL; - GstDiscoverer* _tmp9_; - GFile* _tmp10_; + GstDiscoverer* _tmp8_; + GFile* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; + GstDiscovererInfo* _tmp12_; GstDiscovererInfo* _tmp13_; GstDiscovererInfo* _tmp14_; - GstDiscovererInfo* _tmp15_; - GstClockTime _tmp16_; GDate* video_date = NULL; - gboolean _tmp17_ = FALSE; - GstDiscovererInfo* _tmp18_; - GstTagList* _tmp19_; + gboolean _tmp15_ = FALSE; + GstDiscovererInfo* _tmp16_; + GstTagList* _tmp17_; #line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = gst_discoverer_new ((GstClockTime) (GST_SECOND * 5), &_inner_error_); + _tmp7_ = gst_discoverer_new ((GstClockTime) (GST_SECOND * 5), &_inner_error_); #line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala" - d = _tmp8_; + d = _tmp7_; #line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3141 "VideoSupport.c" +#line 3381 "VideoSupport.c" goto __catch507_g_error; } #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = d; + _tmp8_ = d; #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = self->priv->file; + _tmp9_ = self->priv->file; #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = g_file_get_uri (_tmp10_); + _tmp10_ = g_file_get_uri (_tmp9_); #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp13_ = gst_discoverer_discover_uri (_tmp9_, _tmp12_, &_inner_error_); + _tmp12_ = gst_discoverer_discover_uri (_tmp8_, _tmp11_, &_inner_error_); #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp11_); #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala" - info = _tmp14_; + info = _tmp13_; #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (d); -#line 3164 "VideoSupport.c" +#line 3404 "VideoSupport.c" goto __catch507_g_error; } #line 210 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp15_ = info; + _tmp14_ = info; #line 210 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp16_ = gst_discoverer_info_get_duration (_tmp15_); -#line 210 "/home/jens/Source/shotwell/src/VideoSupport.vala" - self->priv->clip_duration = ((gdouble) _tmp16_) / 1000000000.0; + self->priv->clip_duration = ((gdouble) gst_discoverer_info_get_duration (_tmp14_)) / 1000000000.0; #line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_date = NULL; #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp18_ = info; + _tmp16_ = info; #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp19_ = gst_discoverer_info_get_tags (_tmp18_); + _tmp17_ = gst_discoverer_info_get_tags (_tmp16_); #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp19_ != NULL) { -#line 3181 "VideoSupport.c" - GstDiscovererInfo* _tmp20_; - GstTagList* _tmp21_; - GDate _tmp22_ = {0}; - gboolean _tmp23_; - GDate _tmp24_; - GDate* _tmp25_; + if (_tmp17_ != NULL) { +#line 3419 "VideoSupport.c" + GstDiscovererInfo* _tmp18_; + GstTagList* _tmp19_; + GDate _tmp20_ = {0}; + gboolean _tmp21_; + GDate _tmp22_; + GDate* _tmp23_; #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp20_ = info; + _tmp18_ = info; #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp21_ = gst_discoverer_info_get_tags (_tmp20_); + _tmp19_ = gst_discoverer_info_get_tags (_tmp18_); #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp23_ = gst_tag_list_get_date (_tmp21_, GST_TAG_DATE, &_tmp22_); + _tmp21_ = gst_tag_list_get_date (_tmp19_, GST_TAG_DATE, &_tmp20_); #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (video_date); #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp24_ = _tmp22_; + _tmp22_ = _tmp20_; #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp25_ = __g_date_dup0 (&_tmp24_); + _tmp23_ = __g_date_dup0 (&_tmp22_); #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_date = _tmp25_; + video_date = _tmp23_; #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp17_ = _tmp23_; -#line 3204 "VideoSupport.c" + _tmp15_ = _tmp21_; +#line 3442 "VideoSupport.c" } else { #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp17_ = FALSE; -#line 3208 "VideoSupport.c" + _tmp15_ = FALSE; +#line 3446 "VideoSupport.c" } #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp17_) { -#line 3212 "VideoSupport.c" - GDate* _tmp26_; + if (_tmp15_) { +#line 3450 "VideoSupport.c" + GDate* _tmp24_; #line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp26_ = video_date; + _tmp24_ = video_date; #line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp26_ != NULL) { -#line 3218 "VideoSupport.c" + if (_tmp24_ != NULL) { +#line 3456 "VideoSupport.c" + GDate* _tmp25_; + GDate* _tmp26_; GDate* _tmp27_; - GDateYear _tmp28_; - GDate* _tmp29_; - GDateMonth _tmp30_; - GDate* _tmp31_; - GDateDay _tmp32_; - GDateTime* _tmp33_; - GDateTime* _tmp34_; -#line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp27_ = video_date; -#line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp28_ = g_date_get_year (_tmp27_); + GDateTime* _tmp28_; + GDateTime* _tmp29_; #line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp29_ = video_date; + _tmp25_ = video_date; #line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp30_ = g_date_get_month (_tmp29_); + _tmp26_ = video_date; #line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp31_ = video_date; -#line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp32_ = g_date_get_day (_tmp31_); + _tmp27_ = video_date; #line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp33_ = g_date_time_new_local ((gint) _tmp28_, (gint) _tmp30_, (gint) _tmp32_, 0, 0, (gdouble) 0); + _tmp28_ = g_date_time_new_local ((gint) g_date_get_year (_tmp25_), (gint) g_date_get_month (_tmp26_), (gint) g_date_get_day (_tmp27_), 0, 0, (gdouble) 0); #line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp34_ = _tmp33_; + _tmp29_ = _tmp28_; #line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_reader_set_timestamp (self, _tmp34_); + video_reader_set_timestamp (self, _tmp29_); #line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_date_time_unref0 (_tmp34_); -#line 3247 "VideoSupport.c" + _g_date_time_unref0 (_tmp29_); +#line 3476 "VideoSupport.c" } } #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -3253,49 +3482,49 @@ static void video_reader_read_internal (VideoReader* self, GError** error) { _g_object_unref0 (info); #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (d); -#line 3256 "VideoSupport.c" +#line 3485 "VideoSupport.c" } goto __finally507; __catch507_g_error: { GError* e = NULL; - GError* _tmp35_; - const gchar* _tmp36_; + GError* _tmp30_; + const gchar* _tmp31_; + GError* _tmp32_; + const gchar* _tmp33_; + gchar* _tmp34_; + gchar* _tmp35_; + GError* _tmp36_; GError* _tmp37_; - const gchar* _tmp38_; - gchar* _tmp39_; - gchar* _tmp40_; - GError* _tmp41_; - GError* _tmp42_; #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala" e = _inner_error_; #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala" _inner_error_ = NULL; #line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp35_ = e; + _tmp30_ = e; #line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp36_ = _tmp35_->message; + _tmp31_ = _tmp30_->message; #line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_debug ("VideoSupport.vala:224: Video read error: %s", _tmp36_); + g_debug ("VideoSupport.vala:224: Video read error: %s", _tmp31_); #line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp37_ = e; + _tmp32_ = e; #line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp38_ = _tmp37_->message; + _tmp33_ = _tmp32_->message; #line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp39_ = g_strdup_printf ("GStreamer couldn't extract clip information: %s", _tmp38_); + _tmp34_ = g_strdup_printf ("GStreamer couldn't extract clip information: %s", _tmp33_); #line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp40_ = _tmp39_; + _tmp35_ = _tmp34_; #line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp41_ = g_error_new_literal (VIDEO_ERROR, VIDEO_ERROR_CONTENTS, _tmp40_); + _tmp36_ = g_error_new_literal (VIDEO_ERROR, VIDEO_ERROR_CONTENTS, _tmp35_); #line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp42_ = _tmp41_; + _tmp37_ = _tmp36_; #line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp40_); + _g_free0 (_tmp35_); #line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _inner_error_ = _tmp42_; + _inner_error_ = _tmp37_; #line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_error_free0 (e); -#line 3298 "VideoSupport.c" +#line 3527 "VideoSupport.c" goto __finally507; } __finally507: @@ -3307,7 +3536,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) { g_propagate_error (error, _inner_error_); #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 3310 "VideoSupport.c" +#line 3539 "VideoSupport.c" } else { #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3315,13 +3544,15 @@ static void video_reader_read_internal (VideoReader* self, GError** error) { g_clear_error (&_inner_error_); #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 3318 "VideoSupport.c" +#line 3547 "VideoSupport.c" } } } -static gboolean video_reader_on_thumbnailer_timer (VideoReader* self) { +static gboolean +video_reader_on_thumbnailer_timer (VideoReader* self) +{ gboolean result = FALSE; GPid _tmp0_; #line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -3332,7 +3563,7 @@ static gboolean video_reader_on_thumbnailer_timer (VideoReader* self) { _tmp0_ = self->priv->thumbnailer_pid; #line 233 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_tmp0_ != ((GPid) 0)) { -#line 3335 "VideoSupport.c" +#line 3566 "VideoSupport.c" GPid _tmp1_; GPid _tmp2_; #line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -3343,26 +3574,31 @@ static gboolean video_reader_on_thumbnailer_timer (VideoReader* self) { _tmp2_ = self->priv->thumbnailer_pid; #line 235 "/home/jens/Source/shotwell/src/VideoSupport.vala" kill ((pid_t) _tmp2_, SIGKILL); -#line 3346 "VideoSupport.c" +#line 3577 "VideoSupport.c" } #line 237 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = FALSE; #line 237 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 3352 "VideoSupport.c" +#line 3583 "VideoSupport.c" } -static gboolean _video_reader_on_thumbnailer_timer_gsource_func (gpointer self) { +static gboolean +_video_reader_on_thumbnailer_timer_gsource_func (gpointer self) +{ gboolean result; result = video_reader_on_thumbnailer_timer ((VideoReader*) self); #line 260 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 3361 "VideoSupport.c" +#line 3594 "VideoSupport.c" } -static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* video_file) { +static GdkPixbuf* +video_reader_thumbnailer (VideoReader* self, + const gchar* video_file) +{ GdkPixbuf* result = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -3372,22 +3608,21 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide GFile* _tmp4_; GFile* _tmp5_; gchar* _tmp6_; - const gchar* _tmp7_; - gchar* _tmp8_; + gchar* _tmp7_; + gchar** _tmp8_; gchar** _tmp9_; - gchar** _tmp10_; - gint _tmp10__length1; + gint _tmp9__length1; gint argv_length1; gint _argv_size_; gint child_stdout = 0; GdkPixbuf* buf = NULL; gint child_status = 0; gint ret_waitpid = 0; - GPid _tmp27_; - gint _tmp28_ = 0; - pid_t _tmp29_; - gint _tmp30_; - GPid _tmp36_; + GPid _tmp26_; + gint _tmp27_ = 0; + pid_t _tmp28_; + gint _tmp29_; + GPid _tmp33_; GError * _inner_error_ = NULL; #line 242 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (IS_VIDEO_READER (self), NULL); @@ -3414,83 +3649,81 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp6_ = g_file_get_path (_tmp5_); #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = video_file; -#line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = g_strdup (_tmp7_); + _tmp7_ = g_strdup (video_file); #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = g_new0 (gchar*, 2 + 1); + _tmp8_ = g_new0 (gchar*, 2 + 1); #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_[0] = _tmp6_; + _tmp8_[0] = _tmp6_; #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_[1] = _tmp8_; + _tmp8_[1] = _tmp7_; #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10__length1 = 2; + _tmp9__length1 = 2; #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (_tmp5_); #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala" - argv = _tmp10_; + argv = _tmp9_; #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala" - argv_length1 = _tmp10__length1; + argv_length1 = _tmp9__length1; #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala" _argv_size_ = argv_length1; -#line 3438 "VideoSupport.c" +#line 3671 "VideoSupport.c" { - gchar** _tmp11_; - gint _tmp11__length1; - GPid _tmp12_ = 0; - gint _tmp13_ = 0; - GPid _tmp14_; + gchar** _tmp10_; + gint _tmp10__length1; + GPid _tmp11_ = 0; + gint _tmp12_ = 0; + GPid _tmp13_; #line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = argv; + _tmp10_ = argv; #line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11__length1 = argv_length1; + _tmp10__length1 = argv_length1; #line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_spawn_async_with_pipes (NULL, _tmp11_, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &_tmp12_, NULL, &_tmp13_, NULL, &_inner_error_); + g_spawn_async_with_pipes (NULL, _tmp10_, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &_tmp11_, NULL, &_tmp12_, NULL, &_inner_error_); #line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala" - self->priv->thumbnailer_pid = _tmp12_; + self->priv->thumbnailer_pid = _tmp11_; #line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala" - child_stdout = _tmp13_; + child_stdout = _tmp12_; #line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3457 "VideoSupport.c" +#line 3690 "VideoSupport.c" goto __catch508_g_error; } #line 251 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp14_ = self->priv->thumbnailer_pid; + _tmp13_ = self->priv->thumbnailer_pid; #line 251 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_debug ("VideoSupport.vala:251: Spawned thumbnailer, child pid: %d", (gint) _tmp14_); -#line 3464 "VideoSupport.c" + g_debug ("VideoSupport.vala:251: Spawned thumbnailer, child pid: %d", (gint) _tmp13_); +#line 3697 "VideoSupport.c" } goto __finally508; __catch508_g_error: { GError* e = NULL; - GError* _tmp15_; - const gchar* _tmp16_; - GPid _tmp17_; + GError* _tmp14_; + const gchar* _tmp15_; + GPid _tmp16_; #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala" e = _inner_error_; #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala" _inner_error_ = NULL; #line 253 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp15_ = e; + _tmp14_ = e; #line 253 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp16_ = _tmp15_->message; + _tmp15_ = _tmp14_->message; #line 253 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_debug ("VideoSupport.vala:253: Error spawning process: %s", _tmp16_); + g_debug ("VideoSupport.vala:253: Error spawning process: %s", _tmp15_); #line 254 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp17_ = self->priv->thumbnailer_pid; + _tmp16_ = self->priv->thumbnailer_pid; #line 254 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp17_ != ((GPid) 0)) { -#line 3487 "VideoSupport.c" - GPid _tmp18_; + if (_tmp16_ != ((GPid) 0)) { +#line 3720 "VideoSupport.c" + GPid _tmp17_; #line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp18_ = self->priv->thumbnailer_pid; + _tmp17_ = self->priv->thumbnailer_pid; #line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_spawn_close_pid (_tmp18_); -#line 3493 "VideoSupport.c" + g_spawn_close_pid (_tmp17_); +#line 3726 "VideoSupport.c" } #line 256 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = NULL; @@ -3500,7 +3733,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL); #line 256 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 3503 "VideoSupport.c" +#line 3736 "VideoSupport.c" } __finally508: #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -3513,77 +3746,77 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide g_clear_error (&_inner_error_); #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 3516 "VideoSupport.c" +#line 3749 "VideoSupport.c" } #line 260 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_timeout_add_full (G_PRIORITY_DEFAULT, VIDEO_READER_THUMBNAILER_TIMEOUT, _video_reader_on_thumbnailer_timer_gsource_func, video_reader_ref (self), video_reader_unref); #line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala" buf = NULL; -#line 3522 "VideoSupport.c" +#line 3755 "VideoSupport.c" { GUnixInputStream* unix_input = NULL; - gint _tmp19_; - GUnixInputStream* _tmp20_; - GdkPixbuf* _tmp21_ = NULL; - GUnixInputStream* _tmp22_; + gint _tmp18_; + GUnixInputStream* _tmp19_; + GdkPixbuf* _tmp20_ = NULL; + GUnixInputStream* _tmp21_; + GdkPixbuf* _tmp22_; GdkPixbuf* _tmp23_; - GdkPixbuf* _tmp24_; #line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp19_ = child_stdout; + _tmp18_ = child_stdout; #line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp20_ = (GUnixInputStream*) g_unix_input_stream_new (_tmp19_, TRUE); + _tmp19_ = (GUnixInputStream*) g_unix_input_stream_new (_tmp18_, TRUE); #line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala" - unix_input = _tmp20_; + unix_input = _tmp19_; #line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp22_ = unix_input; + _tmp21_ = unix_input; #line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp23_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); + _tmp22_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); #line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp21_ = _tmp23_; + _tmp20_ = _tmp22_; #line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (unix_input); -#line 3547 "VideoSupport.c" +#line 3780 "VideoSupport.c" goto __catch509_g_error; } #line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp24_ = _tmp21_; + _tmp23_ = _tmp20_; #line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp21_ = NULL; + _tmp20_ = NULL; #line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (buf); #line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala" - buf = _tmp24_; + buf = _tmp23_; #line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_object_unref0 (_tmp21_); + _g_object_unref0 (_tmp20_); #line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (unix_input); -#line 3562 "VideoSupport.c" +#line 3795 "VideoSupport.c" } goto __finally509; __catch509_g_error: { GError* e = NULL; - GError* _tmp25_; - const gchar* _tmp26_; + GError* _tmp24_; + const gchar* _tmp25_; #line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala" e = _inner_error_; #line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala" _inner_error_ = NULL; #line 268 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp25_ = e; + _tmp24_ = e; #line 268 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp26_ = _tmp25_->message; + _tmp25_ = _tmp24_->message; #line 268 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_debug ("VideoSupport.vala:268: Error creating pixbuf: %s", _tmp26_); + g_debug ("VideoSupport.vala:268: Error creating pixbuf: %s", _tmp25_); #line 269 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (buf); #line 269 "/home/jens/Source/shotwell/src/VideoSupport.vala" buf = NULL; #line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_error_free0 (e); -#line 3586 "VideoSupport.c" +#line 3819 "VideoSupport.c" } __finally509: #line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -3598,62 +3831,56 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide g_clear_error (&_inner_error_); #line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 3601 "VideoSupport.c" +#line 3834 "VideoSupport.c" } #line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala" child_status = 0; #line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp27_ = self->priv->thumbnailer_pid; + _tmp26_ = self->priv->thumbnailer_pid; #line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp29_ = waitpid ((pid_t) _tmp27_, &_tmp28_, 0); + _tmp28_ = waitpid ((pid_t) _tmp26_, &_tmp27_, 0); #line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala" - child_status = _tmp28_; + child_status = _tmp27_; #line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala" - ret_waitpid = (gint) _tmp29_; + ret_waitpid = (gint) _tmp28_; #line 275 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp30_ = ret_waitpid; + _tmp29_ = ret_waitpid; #line 275 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp30_ < 0) { -#line 3617 "VideoSupport.c" - gint _tmp31_; + if (_tmp29_ < 0) { +#line 3850 "VideoSupport.c" + gint _tmp30_; #line 276 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp31_ = ret_waitpid; + _tmp30_ = ret_waitpid; #line 276 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_debug ("VideoSupport.vala:276: waitpid returned error code: %d", _tmp31_); + g_debug ("VideoSupport.vala:276: waitpid returned error code: %d", _tmp30_); #line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (buf); #line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala" buf = NULL; -#line 3627 "VideoSupport.c" +#line 3860 "VideoSupport.c" } else { - gint _tmp32_; - gint _tmp33_; -#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp32_ = child_status; + gint _tmp31_; #line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp33_ = WEXITSTATUS (_tmp32_); + _tmp31_ = child_status; #line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (0 != _tmp33_) { -#line 3637 "VideoSupport.c" - gint _tmp34_; - gint _tmp35_; -#line 279 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp34_ = child_status; + if (0 != WEXITSTATUS (_tmp31_)) { +#line 3867 "VideoSupport.c" + gint _tmp32_; #line 279 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp35_ = WEXITSTATUS (_tmp34_); + _tmp32_ = child_status; #line 279 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_debug ("VideoSupport.vala:279: Thumbnailer exited with error code: %d", _tmp35_); + g_debug ("VideoSupport.vala:279: Thumbnailer exited with error code: %d", WEXITSTATUS (_tmp32_)); #line 281 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (buf); #line 281 "/home/jens/Source/shotwell/src/VideoSupport.vala" buf = NULL; -#line 3650 "VideoSupport.c" +#line 3877 "VideoSupport.c" } } #line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp36_ = self->priv->thumbnailer_pid; + _tmp33_ = self->priv->thumbnailer_pid; #line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_spawn_close_pid (_tmp36_); + g_spawn_close_pid (_tmp33_); #line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala" self->priv->thumbnailer_pid = (GPid) 0; #line 286 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -3662,17 +3889,18 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL); #line 286 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 3665 "VideoSupport.c" +#line 3892 "VideoSupport.c" } -static gboolean video_reader_does_file_exist (VideoReader* self) { +static gboolean +video_reader_does_file_exist (VideoReader* self) +{ gboolean result = FALSE; GFile* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (IS_VIDEO_READER (self), FALSE); #line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -3683,36 +3911,35 @@ static gboolean video_reader_does_file_exist (VideoReader* self) { _tmp2_ = _tmp1_; #line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp3_ = g_file_test (_tmp2_, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR); -#line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = _tmp3_; #line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (_tmp2_); #line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp4_; + result = _tmp3_; #line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 3694 "VideoSupport.c" +#line 3920 "VideoSupport.c" } -GdkPixbuf* video_reader_read_preview_frame (VideoReader* self) { +GdkPixbuf* +video_reader_read_preview_frame (VideoReader* self) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_; - gboolean _tmp3_; - GFile* _tmp4_; + GFile* _tmp3_; + gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; + GdkPixbuf* _tmp6_; GdkPixbuf* _tmp7_; - GdkPixbuf* _tmp8_; + GdkPixbuf* _tmp9_; GdkPixbuf* _tmp10_; - GdkPixbuf* _tmp11_; #line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (IS_VIDEO_READER (self), NULL); #line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->preview_frame; #line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_tmp0_ != NULL) { -#line 3715 "VideoSupport.c" +#line 3942 "VideoSupport.c" GdkPixbuf* _tmp1_; GdkPixbuf* _tmp2_; #line 295 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -3723,59 +3950,60 @@ GdkPixbuf* video_reader_read_preview_frame (VideoReader* self) { result = _tmp2_; #line 295 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 3726 "VideoSupport.c" +#line 3953 "VideoSupport.c" } #line 297 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = video_reader_does_file_exist (self); -#line 297 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (!_tmp3_) { + if (!video_reader_does_file_exist (self)) { #line 298 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = NULL; #line 298 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 3736 "VideoSupport.c" +#line 3961 "VideoSupport.c" } #line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = self->priv->file; + _tmp3_ = self->priv->file; #line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = g_file_get_path (_tmp4_); + _tmp4_ = g_file_get_path (_tmp3_); #line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = video_reader_thumbnailer (self, _tmp6_); + _tmp6_ = video_reader_thumbnailer (self, _tmp5_); #line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (self->priv->preview_frame); #line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala" - self->priv->preview_frame = _tmp7_; + self->priv->preview_frame = _tmp6_; #line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = self->priv->preview_frame; + _tmp7_ = self->priv->preview_frame; #line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (NULL == _tmp8_) { -#line 3756 "VideoSupport.c" - GdkPixbuf* _tmp9_; + if (NULL == _tmp7_) { +#line 3981 "VideoSupport.c" + GdkPixbuf* _tmp8_; #line 303 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = resources_get_noninterpretable_badge_pixbuf (); + _tmp8_ = resources_get_noninterpretable_badge_pixbuf (); #line 303 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (self->priv->preview_frame); #line 303 "/home/jens/Source/shotwell/src/VideoSupport.vala" - self->priv->preview_frame = _tmp9_; -#line 3764 "VideoSupport.c" + self->priv->preview_frame = _tmp8_; +#line 3989 "VideoSupport.c" } #line 305 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = self->priv->preview_frame; + _tmp9_ = self->priv->preview_frame; #line 305 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = _g_object_ref0 (_tmp10_); + _tmp10_ = _g_object_ref0 (_tmp9_); #line 305 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp11_; + result = _tmp10_; #line 305 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 3774 "VideoSupport.c" +#line 3999 "VideoSupport.c" } -gdouble video_reader_read_clip_duration (VideoReader* self, GError** error) { +gdouble +video_reader_read_clip_duration (VideoReader* self, + GError** error) +{ gdouble result = 0.0; gdouble _tmp0_; gdouble _tmp3_; @@ -3792,13 +4020,13 @@ gdouble video_reader_read_clip_duration (VideoReader* self, GError** error) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_inner_error_->domain == VIDEO_ERROR) { -#line 3795 "VideoSupport.c" +#line 4023 "VideoSupport.c" gdouble _tmp1_ = 0.0; #line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_propagate_error (error, _inner_error_); #line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala" return _tmp1_; -#line 3801 "VideoSupport.c" +#line 4029 "VideoSupport.c" } else { gdouble _tmp2_ = 0.0; #line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -3807,7 +4035,7 @@ gdouble video_reader_read_clip_duration (VideoReader* self, GError** error) { g_clear_error (&_inner_error_); #line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala" return _tmp2_; -#line 3810 "VideoSupport.c" +#line 4038 "VideoSupport.c" } } } @@ -3817,11 +4045,14 @@ gdouble video_reader_read_clip_duration (VideoReader* self, GError** error) { result = _tmp3_; #line 312 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 3820 "VideoSupport.c" +#line 4048 "VideoSupport.c" } -VideoMetadata* video_reader_read_metadata (VideoReader* self, GError** error) { +VideoMetadata* +video_reader_read_metadata (VideoReader* self, + GError** error) +{ VideoMetadata* result = NULL; VideoMetadata* metadata = NULL; VideoMetadata* _tmp0_; @@ -3861,17 +4092,19 @@ VideoMetadata* video_reader_read_metadata (VideoReader* self, GError** error) { _media_metadata_unref0 (metadata); #line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 3864 "VideoSupport.c" +#line 4095 "VideoSupport.c" } #line 319 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = metadata; #line 319 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 3870 "VideoSupport.c" +#line 4101 "VideoSupport.c" } -GDateTime* video_reader_get_timestamp (VideoReader* self) { +GDateTime* +video_reader_get_timestamp (VideoReader* self) +{ GDateTime* result; GDateTime* _tmp0_; #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -3882,132 +4115,159 @@ GDateTime* video_reader_get_timestamp (VideoReader* self) { result = _tmp0_; #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 3885 "VideoSupport.c" +#line 4118 "VideoSupport.c" } -static gpointer _g_date_time_ref0 (gpointer self) { +static gpointer +_g_date_time_ref0 (gpointer self) +{ #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala" return self ? g_date_time_ref (self) : NULL; -#line 3892 "VideoSupport.c" +#line 4127 "VideoSupport.c" } -static void video_reader_set_timestamp (VideoReader* self, GDateTime* value) { +static void +video_reader_set_timestamp (VideoReader* self, + GDateTime* value) +{ GDateTime* _tmp0_; - GDateTime* _tmp1_; #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (IS_VIDEO_READER (self)); #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = value; -#line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = _g_date_time_ref0 (_tmp0_); + _tmp0_ = _g_date_time_ref0 (value); #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_date_time_unref0 (self->priv->_timestamp); #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala" - self->priv->_timestamp = _tmp1_; -#line 3909 "VideoSupport.c" + self->priv->_timestamp = _tmp0_; +#line 4144 "VideoSupport.c" } -static void value_video_reader_init (GValue* value) { +static void +value_video_reader_init (GValue* value) +{ #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" value->data[0].v_pointer = NULL; -#line 3916 "VideoSupport.c" +#line 4153 "VideoSupport.c" } -static void value_video_reader_free_value (GValue* value) { +static void +value_video_reader_free_value (GValue* value) +{ #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (value->data[0].v_pointer) { #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_reader_unref (value->data[0].v_pointer); -#line 3925 "VideoSupport.c" +#line 4164 "VideoSupport.c" } } -static void value_video_reader_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_video_reader_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (src_value->data[0].v_pointer) { #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" dest_value->data[0].v_pointer = video_reader_ref (src_value->data[0].v_pointer); -#line 3935 "VideoSupport.c" +#line 4177 "VideoSupport.c" } else { #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" dest_value->data[0].v_pointer = NULL; -#line 3939 "VideoSupport.c" +#line 4181 "VideoSupport.c" } } -static gpointer value_video_reader_peek_pointer (const GValue* value) { +static gpointer +value_video_reader_peek_pointer (const GValue* value) +{ #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" return value->data[0].v_pointer; -#line 3947 "VideoSupport.c" +#line 4191 "VideoSupport.c" } -static gchar* value_video_reader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_video_reader_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (collect_values[0].v_pointer) { -#line 3954 "VideoSupport.c" +#line 4203 "VideoSupport.c" VideoReader * object; object = collect_values[0].v_pointer; #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (object->parent_instance.g_class == NULL) { #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3961 "VideoSupport.c" +#line 4210 "VideoSupport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3965 "VideoSupport.c" +#line 4214 "VideoSupport.c" } #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" value->data[0].v_pointer = video_reader_ref (object); -#line 3969 "VideoSupport.c" +#line 4218 "VideoSupport.c" } else { #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" value->data[0].v_pointer = NULL; -#line 3973 "VideoSupport.c" +#line 4222 "VideoSupport.c" } #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 3977 "VideoSupport.c" +#line 4226 "VideoSupport.c" } -static gchar* value_video_reader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_video_reader_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ VideoReader ** object_p; object_p = collect_values[0].v_pointer; #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (!object_p) { #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3988 "VideoSupport.c" +#line 4242 "VideoSupport.c" } #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (!value->data[0].v_pointer) { #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" *object_p = NULL; -#line 3994 "VideoSupport.c" +#line 4248 "VideoSupport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" *object_p = value->data[0].v_pointer; -#line 3998 "VideoSupport.c" +#line 4252 "VideoSupport.c" } else { #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" *object_p = video_reader_ref (value->data[0].v_pointer); -#line 4002 "VideoSupport.c" +#line 4256 "VideoSupport.c" } #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 4006 "VideoSupport.c" +#line 4260 "VideoSupport.c" } -GParamSpec* param_spec_video_reader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_video_reader (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecVideoReader* spec; #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_VIDEO_READER), NULL); @@ -4017,20 +4277,25 @@ GParamSpec* param_spec_video_reader (const gchar* name, const gchar* nick, const G_PARAM_SPEC (spec)->value_type = object_type; #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" return G_PARAM_SPEC (spec); -#line 4020 "VideoSupport.c" +#line 4280 "VideoSupport.c" } -gpointer value_get_video_reader (const GValue* value) { +gpointer +value_get_video_reader (const GValue* value) +{ #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_READER), NULL); #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" return value->data[0].v_pointer; -#line 4029 "VideoSupport.c" +#line 4291 "VideoSupport.c" } -void value_set_video_reader (GValue* value, gpointer v_object) { +void +value_set_video_reader (GValue* value, + gpointer v_object) +{ VideoReader * old; #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_READER)); @@ -4046,22 +4311,25 @@ void value_set_video_reader (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_reader_ref (value->data[0].v_pointer); -#line 4049 "VideoSupport.c" +#line 4314 "VideoSupport.c" } else { #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" value->data[0].v_pointer = NULL; -#line 4053 "VideoSupport.c" +#line 4318 "VideoSupport.c" } #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (old) { #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_reader_unref (old); -#line 4059 "VideoSupport.c" +#line 4324 "VideoSupport.c" } } -void value_take_video_reader (GValue* value, gpointer v_object) { +void +value_take_video_reader (GValue* value, + gpointer v_object) +{ VideoReader * old; #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_READER)); @@ -4075,33 +4343,37 @@ void value_take_video_reader (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" value->data[0].v_pointer = v_object; -#line 4078 "VideoSupport.c" +#line 4346 "VideoSupport.c" } else { #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" value->data[0].v_pointer = NULL; -#line 4082 "VideoSupport.c" +#line 4350 "VideoSupport.c" } #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (old) { #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_reader_unref (old); -#line 4088 "VideoSupport.c" +#line 4356 "VideoSupport.c" } } -static void video_reader_class_init (VideoReaderClass * klass) { +static void +video_reader_class_init (VideoReaderClass * klass) +{ #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_reader_parent_class = g_type_class_peek_parent (klass); #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" ((VideoReaderClass *) klass)->finalize = video_reader_finalize; #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_type_class_add_private (klass, sizeof (VideoReaderPrivate)); -#line 4100 "VideoSupport.c" +#line 4370 "VideoSupport.c" } -static void video_reader_instance_init (VideoReader * self) { +static void +video_reader_instance_init (VideoReader * self) +{ #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" self->priv = VIDEO_READER_GET_PRIVATE (self); #line 45 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -4116,11 +4388,13 @@ static void video_reader_instance_init (VideoReader * self) { self->priv->_timestamp = NULL; #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" self->ref_count = 1; -#line 4119 "VideoSupport.c" +#line 4391 "VideoSupport.c" } -static void video_reader_finalize (VideoReader * obj) { +static void +video_reader_finalize (VideoReader * obj) +{ VideoReader * self; #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_READER, VideoReader); @@ -4132,11 +4406,13 @@ static void video_reader_finalize (VideoReader * obj) { _g_object_unref0 (self->priv->file); #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_date_time_unref0 (self->priv->_timestamp); -#line 4135 "VideoSupport.c" +#line 4409 "VideoSupport.c" } -GType video_reader_get_type (void) { +GType +video_reader_get_type (void) +{ static volatile gsize video_reader_type_id__volatile = 0; if (g_once_init_enter (&video_reader_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_video_reader_init, value_video_reader_free_value, value_video_reader_copy_value, value_video_reader_peek_pointer, "p", value_video_reader_collect_value, "p", value_video_reader_lcopy_value }; @@ -4150,18 +4426,22 @@ GType video_reader_get_type (void) { } -gpointer video_reader_ref (gpointer instance) { +gpointer +video_reader_ref (gpointer instance) +{ VideoReader * self; self = instance; #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_atomic_int_inc (&self->ref_count); #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" return instance; -#line 4160 "VideoSupport.c" +#line 4438 "VideoSupport.c" } -void video_reader_unref (gpointer instance) { +void +video_reader_unref (gpointer instance) +{ VideoReader * self; self = instance; #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -4170,157 +4450,156 @@ void video_reader_unref (gpointer instance) { VIDEO_READER_GET_CLASS (self)->finalize (self); #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 4173 "VideoSupport.c" +#line 4453 "VideoSupport.c" } } -static gpointer _video_row_ref0 (gpointer self) { +static gpointer +_video_row_ref0 (gpointer self) +{ #line 367 "/home/jens/Source/shotwell/src/VideoSupport.vala" return self ? video_row_ref (self) : NULL; -#line 4181 "VideoSupport.c" +#line 4463 "VideoSupport.c" } -Video* video_construct (GType object_type, VideoRow* row) { +Video* +video_construct (GType object_type, + VideoRow* row) +{ Video * self = NULL; VideoRow* _tmp0_; VideoRow* _tmp1_; VideoRow* _tmp2_; - VideoRow* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; - gboolean _tmp6_ = FALSE; - VideoRow* _tmp7_; - guint64 _tmp8_; + const gchar* _tmp3_; + gchar* _tmp4_; + gboolean _tmp5_ = FALSE; + guint64 _tmp6_; #line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (IS_VIDEO_ROW (row), NULL); #line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = (Video*) video_source_construct (object_type); #line 367 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = row; -#line 367 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = _video_row_ref0 (_tmp0_); + _tmp0_ = _video_row_ref0 (row); #line 367 "/home/jens/Source/shotwell/src/VideoSupport.vala" _video_row_unref0 (self->priv->backing_row); #line 367 "/home/jens/Source/shotwell/src/VideoSupport.vala" - self->priv->backing_row = _tmp1_; + self->priv->backing_row = _tmp0_; #line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = self->priv->backing_row; + _tmp1_ = self->priv->backing_row; #line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = self->priv->backing_row; + _tmp2_ = self->priv->backing_row; #line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = _tmp3_->title; + _tmp3_ = _tmp2_->title; #line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = media_source_prep_title (_tmp4_); + _tmp4_ = media_source_prep_title (_tmp3_); #line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp2_->title); + _g_free0 (_tmp1_->title); #line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_->title = _tmp5_; -#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = row; + _tmp1_->title = _tmp4_; #line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = _tmp7_->flags; + _tmp6_ = row->flags; #line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if ((_tmp8_ & VIDEO_FLAG_TRASH) != ((guint64) 0)) { + if ((_tmp6_ & VIDEO_FLAG_TRASH) != ((guint64) 0)) { #line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = TRUE; -#line 4228 "VideoSupport.c" + _tmp5_ = TRUE; +#line 4507 "VideoSupport.c" } else { - VideoRow* _tmp9_; - guint64 _tmp10_; + guint64 _tmp7_; #line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = row; + _tmp7_ = row->flags; #line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = _tmp9_->flags; -#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = (_tmp10_ & VIDEO_FLAG_OFFLINE) != ((guint64) 0); -#line 4238 "VideoSupport.c" + _tmp5_ = (_tmp7_ & VIDEO_FLAG_OFFLINE) != ((guint64) 0); +#line 4514 "VideoSupport.c" } #line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp6_) { -#line 4242 "VideoSupport.c" - VideoSourceCollection* _tmp11_; - VideoRow* _tmp12_; - const gchar* _tmp13_; -#line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = video_global; + if (_tmp5_) { +#line 4518 "VideoSupport.c" + VideoSourceCollection* _tmp8_; + const gchar* _tmp9_; #line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = row; + _tmp8_ = video_global; #line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp13_ = _tmp12_->backlinks; + _tmp9_ = row->backlinks; #line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala" - data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp13_); -#line 4254 "VideoSupport.c" + data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp9_); +#line 4527 "VideoSupport.c" } #line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala" return self; -#line 4258 "VideoSupport.c" +#line 4531 "VideoSupport.c" } -Video* video_new (VideoRow* row) { +Video* +video_new (VideoRow* row) +{ #line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala" return video_construct (TYPE_VIDEO, row); -#line 4265 "VideoSupport.c" +#line 4540 "VideoSupport.c" } -static gboolean __lambda12_ (GstPluginFeature* f) { +static gboolean +__lambda12_ (GstPluginFeature* f) +{ gboolean result = FALSE; - GstPluginFeature* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; + gboolean _tmp2_; #line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (GST_IS_PLUGIN_FEATURE (f), FALSE); #line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = f; -#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = gst_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gst_object_get_type (), GstObject)); + _tmp0_ = gst_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (f, gst_object_get_type (), GstObject)); #line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = _tmp1_; -#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = g_str_has_prefix (_tmp2_, "vaapi"); + _tmp1_ = _tmp0_; #line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = _tmp3_; + _tmp2_ = g_str_has_prefix (_tmp1_, "vaapi"); #line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp4_; + result = _tmp2_; #line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 4294 "VideoSupport.c" +#line 4565 "VideoSupport.c" } -static gboolean ___lambda12__gst_plugin_feature_filter (GstPluginFeature* feature, gpointer self) { +static gboolean +___lambda12__gst_plugin_feature_filter (GstPluginFeature* feature, + gpointer self) +{ gboolean result; result = __lambda12_ (feature); #line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 4303 "VideoSupport.c" +#line 4577 "VideoSupport.c" } -static void _g_object_unref0_ (gpointer var) { +static void +_g_object_unref0_ (gpointer var) +{ #line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala" (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); -#line 4310 "VideoSupport.c" +#line 4586 "VideoSupport.c" } -static void _g_list_free__g_object_unref0_ (GList* self) { +static inline void +_g_list_free__g_object_unref0_ (GList* self) +{ #line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_list_foreach (self, (GFunc) _g_object_unref0_, NULL); -#line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_list_free (self); -#line 4319 "VideoSupport.c" + g_list_free_full (self, (GDestroyNotify) _g_object_unref0_); +#line 4595 "VideoSupport.c" } -void video_init (ProgressMonitor monitor, void* monitor_target) { +void +video_init (ProgressMonitor monitor, + void* monitor_target) +{ gchar** args = NULL; gint args_length1; gint _args_size_; @@ -4331,38 +4610,36 @@ void video_init (ProgressMonitor monitor, void* monitor_target) { ConfigFacade* _tmp2_; ConfigFacade* _tmp3_; gint _tmp4_; - gint _tmp5_; - GstRegistry* _tmp6_; - guint32 _tmp7_; - gint _tmp8_; + GstRegistry* _tmp5_; + gint _tmp6_; GList* features = NULL; - GstRegistry* _tmp11_; - GList* _tmp12_; - GList* _tmp13_; - VideoSourceCollection* _tmp20_; + GstRegistry* _tmp9_; + GList* _tmp10_; + GList* _tmp11_; + VideoSourceCollection* _tmp18_; GeeArrayList* all = NULL; - VideoTable* _tmp21_; - VideoTable* _tmp22_; - GeeArrayList* _tmp23_; - GeeArrayList* _tmp24_; + VideoTable* _tmp19_; + VideoTable* _tmp20_; + GeeArrayList* _tmp21_; + GeeArrayList* _tmp22_; GeeArrayList* all_videos = NULL; - GeeArrayList* _tmp25_; + GeeArrayList* _tmp23_; GeeArrayList* trashed_videos = NULL; - GeeArrayList* _tmp26_; + GeeArrayList* _tmp24_; GeeArrayList* offline_videos = NULL; - GeeArrayList* _tmp27_; + GeeArrayList* _tmp25_; gint count = 0; - GeeArrayList* _tmp28_; - gint _tmp29_; - gint _tmp30_; - VideoSourceCollection* _tmp57_; - GeeArrayList* _tmp58_; - VideoSourceCollection* _tmp59_; - GeeArrayList* _tmp60_; - VideoSourceCollection* _tmp61_; - GeeArrayList* _tmp62_; - GeeCollection* _tmp63_; - GeeCollection* _tmp64_; + GeeArrayList* _tmp26_; + gint _tmp27_; + gint _tmp28_; + VideoSourceCollection* _tmp51_; + GeeArrayList* _tmp52_; + VideoSourceCollection* _tmp53_; + GeeArrayList* _tmp54_; + VideoSourceCollection* _tmp55_; + GeeArrayList* _tmp56_; + GeeCollection* _tmp57_; + GeeCollection* _tmp58_; #line 380 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_interpreter_state_changed = FALSE; #line 381 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -4391,310 +4668,288 @@ void video_init (ProgressMonitor monitor, void* monitor_target) { _tmp3_ = _tmp2_; #line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp4_ = configuration_facade_get_video_interpreter_state_cookie (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = _tmp4_; #line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (_tmp3_); #line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala" - saved_state = _tmp5_; + saved_state = _tmp4_; #line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = registry; + _tmp5_ = registry; #line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = gst_registry_get_feature_list_cookie (_tmp6_); -#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_current_state = (gint) _tmp7_; + video_current_state = (gint) gst_registry_get_feature_list_cookie (_tmp5_); #line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = saved_state; + _tmp6_ = saved_state; #line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp8_ == CONFIG_FACADE_NO_VIDEO_INTERPRETER_STATE) { + if (_tmp6_ == CONFIG_FACADE_NO_VIDEO_INTERPRETER_STATE) { #line 394 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_message ("VideoSupport.vala:394: interpreter state cookie not found; assuming al" \ "l video thumbnails are out of date"); #line 395 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_interpreter_state_changed = TRUE; -#line 4414 "VideoSupport.c" +#line 4687 "VideoSupport.c" } else { - gint _tmp9_; - gint _tmp10_; + gint _tmp7_; + gint _tmp8_; #line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = saved_state; + _tmp7_ = saved_state; #line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = video_current_state; + _tmp8_ = video_current_state; #line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp9_ != _tmp10_) { + if (_tmp7_ != _tmp8_) { #line 397 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_message ("VideoSupport.vala:397: interpreter state has changed; video thumbnails" \ " may be out of date"); #line 398 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_interpreter_state_changed = TRUE; -#line 4428 "VideoSupport.c" +#line 4701 "VideoSupport.c" } } #line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = registry; + _tmp9_ = registry; #line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = gst_registry_feature_filter (_tmp11_, ___lambda12__gst_plugin_feature_filter, FALSE, NULL); + _tmp10_ = gst_registry_feature_filter (_tmp9_, ___lambda12__gst_plugin_feature_filter, FALSE, NULL); #line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala" - features = _tmp12_; + features = _tmp10_; #line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp13_ = features; -#line 4439 "VideoSupport.c" + _tmp11_ = features; +#line 4712 "VideoSupport.c" { GList* feature_collection = NULL; GList* feature_it = NULL; #line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala" - feature_collection = _tmp13_; + feature_collection = _tmp11_; #line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala" for (feature_it = feature_collection; feature_it != NULL; feature_it = feature_it->next) { -#line 4447 "VideoSupport.c" - GstPluginFeature* _tmp14_; +#line 4720 "VideoSupport.c" + GstPluginFeature* _tmp12_; GstPluginFeature* feature = NULL; #line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp14_ = _g_object_ref0 ((GstPluginFeature*) feature_it->data); + _tmp12_ = _g_object_ref0 ((GstPluginFeature*) feature_it->data); #line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala" - feature = _tmp14_; -#line 4454 "VideoSupport.c" + feature = _tmp12_; +#line 4727 "VideoSupport.c" { - GstPluginFeature* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; - GstRegistry* _tmp18_; - GstPluginFeature* _tmp19_; + GstPluginFeature* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + GstRegistry* _tmp16_; + GstPluginFeature* _tmp17_; #line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp15_ = feature; + _tmp13_ = feature; #line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp16_ = gst_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gst_object_get_type (), GstObject)); + _tmp14_ = gst_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gst_object_get_type (), GstObject)); #line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp17_ = _tmp16_; + _tmp15_ = _tmp14_; #line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_debug ("VideoSupport.vala:412: Removing registry feature %s", _tmp17_); + g_debug ("VideoSupport.vala:412: Removing registry feature %s", _tmp15_); #line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp15_); #line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp18_ = registry; + _tmp16_ = registry; #line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp19_ = feature; + _tmp17_ = feature; #line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala" - gst_registry_remove_feature (_tmp18_, _tmp19_); + gst_registry_remove_feature (_tmp16_, _tmp17_); #line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (feature); -#line 4479 "VideoSupport.c" +#line 4752 "VideoSupport.c" } } } #line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp20_ = video_source_collection_new (); + _tmp18_ = video_source_collection_new (); #line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala" _data_collection_unref0 (video_global); #line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_global = _tmp20_; + video_global = _tmp18_; #line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp21_ = video_table_get_instance (); + _tmp19_ = video_table_get_instance (); #line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp22_ = _tmp21_; + _tmp20_ = _tmp19_; #line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp23_ = video_table_get_all (_tmp22_); + _tmp21_ = video_table_get_all (_tmp20_); #line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp24_ = _tmp23_; + _tmp22_ = _tmp21_; #line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _database_table_unref0 (_tmp22_); + _database_table_unref0 (_tmp20_); #line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala" - all = _tmp24_; + all = _tmp22_; #line 419 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp25_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp23_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 419 "/home/jens/Source/shotwell/src/VideoSupport.vala" - all_videos = _tmp25_; + all_videos = _tmp23_; #line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp26_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp24_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala" - trashed_videos = _tmp26_; + trashed_videos = _tmp24_; #line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp27_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp25_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala" - offline_videos = _tmp27_; + offline_videos = _tmp25_; #line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp28_ = all; + _tmp26_ = all; #line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp29_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp30_ = _tmp29_; + _tmp28_ = _tmp27_; #line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala" - count = _tmp30_; -#line 4521 "VideoSupport.c" + count = _tmp28_; +#line 4794 "VideoSupport.c" { gint ctr = 0; #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala" ctr = 0; -#line 4526 "VideoSupport.c" +#line 4799 "VideoSupport.c" { - gboolean _tmp31_ = FALSE; + gboolean _tmp29_ = FALSE; #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp31_ = TRUE; + _tmp29_ = TRUE; #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala" while (TRUE) { -#line 4533 "VideoSupport.c" - gint _tmp33_; - gint _tmp34_; +#line 4806 "VideoSupport.c" + gint _tmp31_; + gint _tmp32_; Video* video = NULL; - GeeArrayList* _tmp35_; - gint _tmp36_; - gpointer _tmp37_; - VideoRow* _tmp38_; - Video* _tmp39_; - Video* _tmp40_; - gboolean _tmp41_; - Video* _tmp43_; - gboolean _tmp44_; - ProgressMonitor _tmp53_; - void* _tmp53__target; + GeeArrayList* _tmp33_; + gint _tmp34_; + gpointer _tmp35_; + VideoRow* _tmp36_; + Video* _tmp37_; + Video* _tmp38_; + gboolean _tmp39_; + Video* _tmp41_; #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (!_tmp31_) { -#line 4550 "VideoSupport.c" - gint _tmp32_; + if (!_tmp29_) { +#line 4820 "VideoSupport.c" + gint _tmp30_; #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp32_ = ctr; + _tmp30_ = ctr; #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala" - ctr = _tmp32_ + 1; -#line 4556 "VideoSupport.c" + ctr = _tmp30_ + 1; +#line 4826 "VideoSupport.c" } #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp31_ = FALSE; + _tmp29_ = FALSE; #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp33_ = ctr; + _tmp31_ = ctr; #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp34_ = count; + _tmp32_ = count; #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (!(_tmp33_ < _tmp34_)) { + if (!(_tmp31_ < _tmp32_)) { #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala" break; -#line 4568 "VideoSupport.c" +#line 4838 "VideoSupport.c" } #line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp35_ = all; + _tmp33_ = all; #line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp36_ = ctr; + _tmp34_ = ctr; #line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp37_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp36_); + _tmp35_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp34_); #line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp38_ = (VideoRow*) _tmp37_; + _tmp36_ = (VideoRow*) _tmp35_; #line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp39_ = video_new (_tmp38_); + _tmp37_ = video_new (_tmp36_); #line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp40_ = _tmp39_; + _tmp38_ = _tmp37_; #line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _video_row_unref0 (_tmp38_); + _video_row_unref0 (_tmp36_); #line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video = _tmp40_; + video = _tmp38_; #line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp41_ = video_interpreter_state_changed; + _tmp39_ = video_interpreter_state_changed; #line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp41_) { -#line 4590 "VideoSupport.c" - Video* _tmp42_; + if (_tmp39_) { +#line 4860 "VideoSupport.c" + Video* _tmp40_; #line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp42_ = video; + _tmp40_ = video; #line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_set_is_interpretable (_tmp42_, FALSE); -#line 4596 "VideoSupport.c" + video_set_is_interpretable (_tmp40_, FALSE); +#line 4866 "VideoSupport.c" } #line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp43_ = video; + _tmp41_ = video; #line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp44_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp44_) { -#line 4604 "VideoSupport.c" - GeeArrayList* _tmp45_; - Video* _tmp46_; + if (media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_MEDIA_SOURCE, MediaSource))) { +#line 4872 "VideoSupport.c" + GeeArrayList* _tmp42_; + Video* _tmp43_; #line 430 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp45_ = trashed_videos; + _tmp42_ = trashed_videos; #line 430 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp46_ = video; + _tmp43_ = video; #line 430 "/home/jens/Source/shotwell/src/VideoSupport.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp46_); -#line 4613 "VideoSupport.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp43_); +#line 4881 "VideoSupport.c" } else { - Video* _tmp47_; - gboolean _tmp48_; -#line 431 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp47_ = video; + Video* _tmp44_; #line 431 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp48_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp44_ = video; #line 431 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp48_) { -#line 4623 "VideoSupport.c" - GeeArrayList* _tmp49_; - Video* _tmp50_; + if (media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_MEDIA_SOURCE, MediaSource))) { +#line 4888 "VideoSupport.c" + GeeArrayList* _tmp45_; + Video* _tmp46_; #line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp49_ = offline_videos; + _tmp45_ = offline_videos; #line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp50_ = video; + _tmp46_ = video; #line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp50_); -#line 4632 "VideoSupport.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp46_); +#line 4897 "VideoSupport.c" } else { - GeeArrayList* _tmp51_; - Video* _tmp52_; + GeeArrayList* _tmp47_; + Video* _tmp48_; #line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp51_ = all_videos; + _tmp47_ = all_videos; #line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp52_ = video; + _tmp48_ = video; #line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp52_); -#line 4642 "VideoSupport.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp48_); +#line 4907 "VideoSupport.c" } } #line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp53_ = monitor; -#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp53__target = monitor_target; -#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp53_ != NULL) { -#line 4651 "VideoSupport.c" - ProgressMonitor _tmp54_; - void* _tmp54__target; - gint _tmp55_; - gint _tmp56_; -#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp54_ = monitor; -#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp54__target = monitor_target; + if (monitor != NULL) { +#line 4912 "VideoSupport.c" + gint _tmp49_; + gint _tmp50_; #line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp55_ = ctr; + _tmp49_ = ctr; #line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp56_ = count; + _tmp50_ = count; #line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp54_ ((guint64) _tmp55_, (guint64) _tmp56_, TRUE, _tmp54__target); -#line 4666 "VideoSupport.c" + monitor ((guint64) _tmp49_, (guint64) _tmp50_, TRUE, monitor_target); +#line 4921 "VideoSupport.c" } #line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (video); -#line 4670 "VideoSupport.c" +#line 4925 "VideoSupport.c" } } } #line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp57_ = video_global; + _tmp51_ = video_global; #line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp58_ = trashed_videos; + _tmp52_ = trashed_videos; #line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala" - media_source_collection_add_many_to_trash (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_COLLECTION, GeeCollection)); + media_source_collection_add_many_to_trash (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection)); #line 441 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp59_ = video_global; + _tmp53_ = video_global; #line 441 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp60_ = offline_videos; + _tmp54_ = offline_videos; #line 441 "/home/jens/Source/shotwell/src/VideoSupport.vala" - media_source_collection_add_many_to_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_COLLECTION, GeeCollection)); + media_source_collection_add_many_to_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection)); #line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp61_ = video_global; + _tmp55_ = video_global; #line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp62_ = all_videos; + _tmp56_ = all_videos; #line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp63_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); + _tmp57_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); #line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp64_ = _tmp63_; + _tmp58_ = _tmp57_; #line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_object_unref0 (_tmp64_); + _g_object_unref0 (_tmp58_); #line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (offline_videos); #line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -4707,11 +4962,13 @@ void video_init (ProgressMonitor monitor, void* monitor_target) { __g_list_free__g_object_unref0_0 (features); #line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (registry); -#line 4708 "VideoSupport.c" +#line 4963 "VideoSupport.c" } -gboolean video_has_interpreter_state_changed (void) { +gboolean +video_has_interpreter_state_changed (void) +{ gboolean result = FALSE; gboolean _tmp0_; #line 446 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -4720,11 +4977,13 @@ gboolean video_has_interpreter_state_changed (void) { result = _tmp0_; #line 446 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 4721 "VideoSupport.c" +#line 4978 "VideoSupport.c" } -void video_notify_normal_thumbs_regenerated (void) { +void +video_notify_normal_thumbs_regenerated (void) +{ gboolean _tmp0_; gboolean _tmp1_ = FALSE; gboolean _tmp2_; @@ -4734,7 +4993,7 @@ void video_notify_normal_thumbs_regenerated (void) { if (_tmp0_) { #line 451 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 4735 "VideoSupport.c" +#line 4994 "VideoSupport.c" } #line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_message ("VideoSupport.vala:453: normal video thumbnail regeneration completed"); @@ -4744,28 +5003,30 @@ void video_notify_normal_thumbs_regenerated (void) { _tmp2_ = video_normal_regen_complete; #line 456 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_tmp2_) { -#line 4745 "VideoSupport.c" +#line 5004 "VideoSupport.c" gboolean _tmp3_; #line 456 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp3_ = video_offline_regen_complete; #line 456 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp1_ = _tmp3_; -#line 4751 "VideoSupport.c" +#line 5010 "VideoSupport.c" } else { #line 456 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp1_ = FALSE; -#line 4755 "VideoSupport.c" +#line 5014 "VideoSupport.c" } #line 456 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_tmp1_) { #line 457 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_save_interpreter_state (); -#line 4761 "VideoSupport.c" +#line 5020 "VideoSupport.c" } } -void video_notify_offline_thumbs_regenerated (void) { +void +video_notify_offline_thumbs_regenerated (void) +{ gboolean _tmp0_; gboolean _tmp1_ = FALSE; gboolean _tmp2_; @@ -4775,7 +5036,7 @@ void video_notify_offline_thumbs_regenerated (void) { if (_tmp0_) { #line 462 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 4776 "VideoSupport.c" +#line 5037 "VideoSupport.c" } #line 464 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_message ("VideoSupport.vala:464: offline video thumbnail regeneration completed"); @@ -4785,34 +5046,36 @@ void video_notify_offline_thumbs_regenerated (void) { _tmp2_ = video_normal_regen_complete; #line 467 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_tmp2_) { -#line 4786 "VideoSupport.c" +#line 5047 "VideoSupport.c" gboolean _tmp3_; #line 467 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp3_ = video_offline_regen_complete; #line 467 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp1_ = _tmp3_; -#line 4792 "VideoSupport.c" +#line 5053 "VideoSupport.c" } else { #line 467 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp1_ = FALSE; -#line 4796 "VideoSupport.c" +#line 5057 "VideoSupport.c" } #line 467 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_tmp1_) { #line 468 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_save_interpreter_state (); -#line 4802 "VideoSupport.c" +#line 5063 "VideoSupport.c" } } -static void video_save_interpreter_state (void) { +static void +video_save_interpreter_state (void) +{ gboolean _tmp0_; #line 472 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = video_interpreter_state_changed; #line 472 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_tmp0_) { -#line 4813 "VideoSupport.c" +#line 5076 "VideoSupport.c" ConfigFacade* _tmp1_; ConfigFacade* _tmp2_; gint _tmp3_; @@ -4831,196 +5094,176 @@ static void video_save_interpreter_state (void) { _g_object_unref0 (_tmp2_); #line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_interpreter_state_changed = FALSE; -#line 4831 "VideoSupport.c" +#line 5094 "VideoSupport.c" } } -void video_terminate (void) { +void +video_terminate (void) +{ } -ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback done, void* done_target, gboolean export_in_place) { +ExporterUI* +video_export_many (GeeCollection* videos, + ExporterCompletionCallback done, + void* done_target, + gboolean export_in_place) +{ ExporterUI* result = NULL; - GeeCollection* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; - gboolean _tmp3_; - GeeCollection* _tmp13_; - gint _tmp14_; - gint _tmp15_; + gint _tmp9_; + gint _tmp10_; GFile* export_dir = NULL; - GFile* _tmp39_; - GFile* _tmp40_; + GFile* _tmp32_; + GFile* _tmp33_; ExporterUI* exporter = NULL; - GeeCollection* _tmp41_; - GFile* _tmp42_; - Scaling _tmp43_ = {0}; - ExportFormatParameters _tmp44_ = {0}; - Exporter* _tmp45_; - Exporter* _tmp46_; - ExporterUI* _tmp47_; - ExporterUI* _tmp48_; - ExporterUI* _tmp49_; - ExporterCompletionCallback _tmp50_; - void* _tmp50__target; + GFile* _tmp34_; + Scaling _tmp35_ = {0}; + ExportFormatParameters _tmp36_ = {0}; + Exporter* _tmp37_; + Exporter* _tmp38_; + ExporterUI* _tmp39_; + ExporterUI* _tmp40_; + ExporterUI* _tmp41_; GError * _inner_error_ = NULL; #line 483 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (GEE_IS_COLLECTION (videos), NULL); #line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = videos; -#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp0_ = gee_collection_get_size (videos); #line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = NULL; #line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 4879 "VideoSupport.c" +#line 5141 "VideoSupport.c" } #line 489 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = export_in_place; -#line 489 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp3_) { -#line 4885 "VideoSupport.c" + if (export_in_place) { +#line 5145 "VideoSupport.c" ExporterUI* temp_exporter = NULL; - GeeCollection* _tmp4_; - Scaling _tmp5_ = {0}; - ExportFormatParameters _tmp6_ = {0}; - Exporter* _tmp7_; - Exporter* _tmp8_; - ExporterUI* _tmp9_; - ExporterUI* _tmp10_; - ExporterUI* _tmp11_; - ExporterCompletionCallback _tmp12_; - void* _tmp12__target; + Scaling _tmp2_ = {0}; + ExportFormatParameters _tmp3_ = {0}; + Exporter* _tmp4_; + Exporter* _tmp5_; + ExporterUI* _tmp6_; + ExporterUI* _tmp7_; + ExporterUI* _tmp8_; #line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = videos; + scaling_for_original (&_tmp2_); #line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala" - scaling_for_original (&_tmp5_); + export_format_parameters_unmodified (&_tmp3_); #line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala" - export_format_parameters_unmodified (&_tmp6_); + _tmp4_ = exporter_new_for_temp_file (videos, &_tmp2_, &_tmp3_); #line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = exporter_new_for_temp_file (_tmp4_, &_tmp5_, &_tmp6_); -#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = _tmp7_; + _tmp5_ = _tmp4_; #line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = exporter_ui_new (_tmp8_); + _tmp6_ = exporter_ui_new (_tmp5_); #line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = _tmp9_; + _tmp7_ = _tmp6_; #line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp5_); #line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala" - temp_exporter = _tmp10_; -#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = temp_exporter; + temp_exporter = _tmp7_; #line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = done; + _tmp8_ = temp_exporter; #line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12__target = done_target; -#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala" - exporter_ui_export (_tmp11_, _tmp12_, _tmp12__target); + exporter_ui_export (_tmp8_, done, done_target); #line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = temp_exporter; #line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 4927 "VideoSupport.c" +#line 5178 "VideoSupport.c" } #line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp13_ = videos; -#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp14_ = gee_collection_get_size (_tmp13_); + _tmp9_ = gee_collection_get_size (videos); #line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp15_ = _tmp14_; + _tmp10_ = _tmp9_; #line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp15_ == 1) { -#line 4937 "VideoSupport.c" + if (_tmp10_ == 1) { +#line 5186 "VideoSupport.c" Video* video = NULL; GFile* save_as = NULL; - Video* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; - GFile* _tmp27_; - GFile* _tmp28_; - GFile* _tmp29_; + Video* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + GFile* _tmp20_; + GFile* _tmp21_; + GFile* _tmp22_; #line 498 "/home/jens/Source/shotwell/src/VideoSupport.vala" video = NULL; -#line 4948 "VideoSupport.c" +#line 5197 "VideoSupport.c" { GeeIterator* _v_it = NULL; - GeeCollection* _tmp16_; - GeeIterator* _tmp17_; + GeeIterator* _tmp11_; #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp16_ = videos; + _tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_ITERABLE, GeeIterable)); #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp17_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _v_it = _tmp17_; + _v_it = _tmp11_; #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala" while (TRUE) { -#line 4961 "VideoSupport.c" - GeeIterator* _tmp18_; - gboolean _tmp19_; +#line 5207 "VideoSupport.c" + GeeIterator* _tmp12_; Video* v = NULL; - GeeIterator* _tmp20_; - gpointer _tmp21_; - Video* _tmp22_; - Video* _tmp23_; -#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp18_ = _v_it; + GeeIterator* _tmp13_; + gpointer _tmp14_; + Video* _tmp15_; + Video* _tmp16_; #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp19_ = gee_iterator_next (_tmp18_); + _tmp12_ = _v_it; #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (!_tmp19_) { + if (!gee_iterator_next (_tmp12_)) { #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala" break; -#line 4977 "VideoSupport.c" +#line 5220 "VideoSupport.c" } #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp20_ = _v_it; + _tmp13_ = _v_it; #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp21_ = gee_iterator_get (_tmp20_); + _tmp14_ = gee_iterator_get (_tmp13_); #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala" - v = (Video*) _tmp21_; + v = (Video*) _tmp14_; #line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp22_ = v; + _tmp15_ = v; #line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp23_ = _g_object_ref0 (_tmp22_); + _tmp16_ = _g_object_ref0 (_tmp15_); #line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (video); #line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video = _tmp23_; + video = _tmp16_; #line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (v); #line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala" break; -#line 4997 "VideoSupport.c" +#line 5240 "VideoSupport.c" } #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (_v_it); -#line 5001 "VideoSupport.c" +#line 5244 "VideoSupport.c" } #line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp24_ = video; + _tmp17_ = video; #line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp25_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp18_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MEDIA_SOURCE, MediaSource)); #line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp26_ = _tmp25_; + _tmp19_ = _tmp18_; #line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp27_ = export_ui_choose_file (_tmp26_); + _tmp20_ = export_ui_choose_file (_tmp19_); #line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp28_ = _tmp27_; + _tmp21_ = _tmp20_; #line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp19_); #line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala" - save_as = _tmp28_; + save_as = _tmp21_; #line 505 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp29_ = save_as; + _tmp22_ = save_as; #line 505 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp29_ == NULL) { + if (_tmp22_ == NULL) { #line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = NULL; #line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -5029,70 +5272,70 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback _g_object_unref0 (video); #line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 5029 "VideoSupport.c" +#line 5272 "VideoSupport.c" } { - AppWindow* _tmp30_; - AppWindow* _tmp31_; - Video* _tmp32_; - GFile* _tmp33_; - AppWindow* _tmp34_; - AppWindow* _tmp35_; + AppWindow* _tmp23_; + AppWindow* _tmp24_; + Video* _tmp25_; + GFile* _tmp26_; + AppWindow* _tmp27_; + AppWindow* _tmp28_; #line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp30_ = app_window_get_instance (); + _tmp23_ = app_window_get_instance (); #line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp31_ = _tmp30_; + _tmp24_ = _tmp23_; #line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala" - page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PAGE_WINDOW, PageWindow)); #line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_object_unref0 (_tmp31_); + _g_object_unref0 (_tmp24_); #line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp32_ = video; + _tmp25_ = video; #line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp33_ = save_as; + _tmp26_ = save_as; #line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_export (_tmp32_, _tmp33_, &_inner_error_); + video_export (_tmp25_, _tmp26_, &_inner_error_); #line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5054 "VideoSupport.c" +#line 5297 "VideoSupport.c" goto __catch510_g_error; } #line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp34_ = app_window_get_instance (); + _tmp27_ = app_window_get_instance (); #line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp35_ = _tmp34_; + _tmp28_ = _tmp27_; #line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_PAGE_WINDOW, PageWindow)); #line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_object_unref0 (_tmp35_); -#line 5065 "VideoSupport.c" + _g_object_unref0 (_tmp28_); +#line 5308 "VideoSupport.c" } goto __finally510; __catch510_g_error: { GError* err = NULL; - AppWindow* _tmp36_; - AppWindow* _tmp37_; - GFile* _tmp38_; + AppWindow* _tmp29_; + AppWindow* _tmp30_; + GFile* _tmp31_; #line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala" err = _inner_error_; #line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala" _inner_error_ = NULL; #line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp36_ = app_window_get_instance (); + _tmp29_ = app_window_get_instance (); #line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp37_ = _tmp36_; + _tmp30_ = _tmp29_; #line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_PAGE_WINDOW, PageWindow)); #line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_object_unref0 (_tmp37_); + _g_object_unref0 (_tmp30_); #line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp38_ = save_as; + _tmp31_ = save_as; #line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala" - export_error_dialog (_tmp38_, FALSE); + export_error_dialog (_tmp31_, FALSE); #line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_error_free0 (err); -#line 5092 "VideoSupport.c" +#line 5335 "VideoSupport.c" } __finally510: #line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -5107,7 +5350,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback g_clear_error (&_inner_error_); #line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 5107 "VideoSupport.c" +#line 5350 "VideoSupport.c" } #line 517 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = NULL; @@ -5117,75 +5360,72 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback _g_object_unref0 (video); #line 517 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 5117 "VideoSupport.c" +#line 5360 "VideoSupport.c" } #line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp39_ = export_ui_choose_dir (_ ("Export Videos")); + _tmp32_ = export_ui_choose_dir (_ ("Export Videos")); #line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala" - export_dir = _tmp39_; + export_dir = _tmp32_; #line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp40_ = export_dir; + _tmp33_ = export_dir; #line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp40_ == NULL) { + if (_tmp33_ == NULL) { #line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = NULL; #line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (export_dir); #line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 5133 "VideoSupport.c" +#line 5376 "VideoSupport.c" } #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp41_ = videos; + _tmp34_ = export_dir; #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp42_ = export_dir; + scaling_for_original (&_tmp35_); #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala" - scaling_for_original (&_tmp43_); + export_format_parameters_unmodified (&_tmp36_); #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala" - export_format_parameters_unmodified (&_tmp44_); + _tmp37_ = exporter_new (videos, _tmp34_, &_tmp35_, &_tmp36_, FALSE); #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp45_ = exporter_new (_tmp41_, _tmp42_, &_tmp43_, &_tmp44_, FALSE); + _tmp38_ = _tmp37_; #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp46_ = _tmp45_; + _tmp39_ = exporter_ui_new (_tmp38_); #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp47_ = exporter_ui_new (_tmp46_); + _tmp40_ = _tmp39_; #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp48_ = _tmp47_; + _g_object_unref0 (_tmp38_); #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_object_unref0 (_tmp46_); -#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala" - exporter = _tmp48_; -#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp49_ = exporter; + exporter = _tmp40_; #line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp50_ = done; + _tmp41_ = exporter; #line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp50__target = done_target; -#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala" - exporter_ui_export (_tmp49_, _tmp50_, _tmp50__target); + exporter_ui_export (_tmp41_, done, done_target); #line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = exporter; #line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (export_dir); #line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 5169 "VideoSupport.c" +#line 5406 "VideoSupport.c" } -static void video_real_commit_backlinks (DataSource* base, SourceCollection* sources, const gchar* backlinks) { +static void +video_real_commit_backlinks (DataSource* base, + SourceCollection* sources, + const gchar* backlinks) +{ Video * self; GError * _inner_error_ = NULL; #line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); #line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources)); -#line 5180 "VideoSupport.c" +#line 5421 "VideoSupport.c" { VideoTable* _tmp0_; VideoTable* _tmp1_; VideoID _tmp2_ = {0}; - const gchar* _tmp3_; #line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = video_table_get_instance (); #line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -5193,16 +5433,14 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou #line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_get_video_id (self, &_tmp2_); #line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = backlinks; -#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_table_update_backlinks (_tmp1_, &_tmp2_, _tmp3_, &_inner_error_); + video_table_update_backlinks (_tmp1_, &_tmp2_, backlinks, &_inner_error_); #line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala" _database_table_unref0 (_tmp1_); #line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 5202 "VideoSupport.c" +#line 5440 "VideoSupport.c" goto __catch511_database_error; } #line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -5211,45 +5449,42 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou g_clear_error (&_inner_error_); #line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 5211 "VideoSupport.c" +#line 5449 "VideoSupport.c" } { - VideoRow* _tmp4_; + VideoRow* _tmp3_; #line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = self->priv->backing_row; + _tmp3_ = self->priv->backing_row; #line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 5219 "VideoSupport.c" +#line 5457 "VideoSupport.c" { - VideoRow* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; -#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = self->priv->backing_row; + VideoRow* _tmp4_; + gchar* _tmp5_; #line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = backlinks; + _tmp4_ = self->priv->backing_row; #line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp5_ = g_strdup (backlinks); #line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp5_->backlinks); + _g_free0 (_tmp4_->backlinks); #line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_->backlinks = _tmp7_; -#line 5234 "VideoSupport.c" + _tmp4_->backlinks = _tmp5_; +#line 5469 "VideoSupport.c" } __finally512: { - VideoRow* _tmp8_; + VideoRow* _tmp6_; #line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = self->priv->backing_row; + _tmp6_ = self->priv->backing_row; #line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 5243 "VideoSupport.c" +#line 5478 "VideoSupport.c" } #line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 5249 "VideoSupport.c" +#line 5484 "VideoSupport.c" goto __catch511_database_error; } #line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -5258,7 +5493,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou g_clear_error (&_inner_error_); #line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 5258 "VideoSupport.c" +#line 5493 "VideoSupport.c" } } } @@ -5266,29 +5501,29 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou __catch511_database_error: { GError* err = NULL; - gchar* _tmp9_; - gchar* _tmp10_; - GError* _tmp11_; - const gchar* _tmp12_; + gchar* _tmp7_; + gchar* _tmp8_; + GError* _tmp9_; + const gchar* _tmp10_; #line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala" err = _inner_error_; #line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala" _inner_error_ = NULL; #line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp7_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = err; + _tmp9_ = err; #line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = _tmp11_->message; + _tmp10_ = _tmp9_->message; #line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_warning ("VideoSupport.vala:539: Unable to update link state for %s: %s", _tmp10_, _tmp12_); + g_warning ("VideoSupport.vala:539: Unable to update link state for %s: %s", _tmp8_, _tmp10_); #line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp8_); #line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_error_free0 (err); -#line 5288 "VideoSupport.c" +#line 5523 "VideoSupport.c" } __finally511: #line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -5299,12 +5534,15 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou g_clear_error (&_inner_error_); #line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 5299 "VideoSupport.c" +#line 5534 "VideoSupport.c" } } -static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) { +static gboolean +video_real_set_event_id (MediaSource* base, + EventID* event_id) +{ Video * self; gboolean result = FALSE; GError * _inner_error_ = NULL; @@ -5312,15 +5550,15 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) { self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); #line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (event_id != NULL, FALSE); -#line 5312 "VideoSupport.c" +#line 5550 "VideoSupport.c" { VideoRow* _tmp0_; - gboolean _tmp13_ = FALSE; + gboolean _tmp12_ = FALSE; #line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->backing_row; #line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 5320 "VideoSupport.c" +#line 5558 "VideoSupport.c" { gboolean committed = FALSE; VideoTable* _tmp1_; @@ -5330,7 +5568,6 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) { EventID _tmp5_; gboolean _tmp6_; gboolean _tmp7_; - gboolean _tmp8_; #line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp1_ = video_table_get_instance (); #line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -5343,119 +5580,107 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) { _tmp5_ = *event_id; #line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp6_ = video_table_set_event (_tmp2_, &_tmp4_, &_tmp5_); -#line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = _tmp6_; #line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala" _database_table_unref0 (_tmp2_); #line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala" - committed = _tmp7_; + committed = _tmp6_; #line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = committed; + _tmp7_ = committed; #line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp8_) { -#line 5353 "VideoSupport.c" - VideoRow* _tmp9_; - EventID _tmp10_; + if (_tmp7_) { +#line 5588 "VideoSupport.c" + VideoRow* _tmp8_; + EventID _tmp9_; #line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = self->priv->backing_row; + _tmp8_ = self->priv->backing_row; #line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = *event_id; + _tmp9_ = *event_id; #line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_->event_id = _tmp10_; -#line 5362 "VideoSupport.c" + _tmp8_->event_id = _tmp9_; +#line 5597 "VideoSupport.c" } #line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = committed; -#line 5366 "VideoSupport.c" +#line 5601 "VideoSupport.c" { - VideoRow* _tmp11_; + VideoRow* _tmp10_; #line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = self->priv->backing_row; + _tmp10_ = self->priv->backing_row; #line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 5373 "VideoSupport.c" +#line 5608 "VideoSupport.c" } #line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 5377 "VideoSupport.c" +#line 5612 "VideoSupport.c" } __finally513: { - VideoRow* _tmp12_; + VideoRow* _tmp11_; #line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = self->priv->backing_row; + _tmp11_ = self->priv->backing_row; #line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 5386 "VideoSupport.c" +#line 5621 "VideoSupport.c" } #line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_clear_error (&_inner_error_); #line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala" - return _tmp13_; -#line 5394 "VideoSupport.c" + return _tmp12_; +#line 5629 "VideoSupport.c" } } -gboolean video_is_duplicate (GFile* file, const gchar* full_md5) { +gboolean +video_is_duplicate (GFile* file, + const gchar* full_md5) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; - GFile* _tmp1_; - VideoTable* _tmp3_; - VideoTable* _tmp4_; - GFile* _tmp5_; - const gchar* _tmp6_; - gboolean _tmp7_; - gboolean _tmp8_; + VideoTable* _tmp1_; + VideoTable* _tmp2_; + gboolean _tmp3_; #line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE); #line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = file; -#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp1_ != NULL) { + if (file != NULL) { #line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = TRUE; -#line 5417 "VideoSupport.c" +#line 5649 "VideoSupport.c" } else { - const gchar* _tmp2_; #line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = full_md5; -#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = _tmp2_ != NULL; -#line 5424 "VideoSupport.c" + _tmp0_ = full_md5 != NULL; +#line 5653 "VideoSupport.c" } #line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala" _vala_assert (_tmp0_, "file != null || full_md5 != null"); #line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = video_table_get_instance (); -#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = _tmp3_; -#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = file; + _tmp1_ = video_table_get_instance (); #line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = full_md5; -#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = video_table_has_duplicate (_tmp4_, _tmp5_, _tmp6_); + _tmp2_ = _tmp1_; #line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = _tmp7_; + _tmp3_ = video_table_has_duplicate (_tmp2_, file, full_md5); #line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _database_table_unref0 (_tmp4_); + _database_table_unref0 (_tmp2_); #line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp8_; + result = _tmp3_; #line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 5446 "VideoSupport.c" +#line 5669 "VideoSupport.c" } -ImportResult video_import_create (VideoImportParams* params, Video* * video) { +ImportResult +video_import_create (VideoImportParams* params, + Video* * video) +{ Video* _vala_video = NULL; ImportResult result = 0; - VideoImportParams* _tmp8_; - VideoRow* _tmp9_; - Video* _tmp10_; + VideoRow* _tmp6_; + Video* _tmp7_; GError * _inner_error_ = NULL; #line 563 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (IS_VIDEO_IMPORT_PARAMS (params), 0); @@ -5463,37 +5688,33 @@ ImportResult video_import_create (VideoImportParams* params, Video* * video) { _g_object_unref0 (_vala_video); #line 564 "/home/jens/Source/shotwell/src/VideoSupport.vala" _vala_video = NULL; -#line 5463 "VideoSupport.c" +#line 5688 "VideoSupport.c" { VideoID _tmp0_ = {0}; VideoTable* _tmp1_; VideoTable* _tmp2_; - VideoImportParams* _tmp3_; - VideoRow* _tmp4_; - VideoID _tmp5_ = {0}; - VideoID _tmp6_; - gboolean _tmp7_; + VideoRow* _tmp3_; + VideoID _tmp4_ = {0}; + VideoID _tmp5_; #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp1_ = video_table_get_instance (); #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp2_ = _tmp1_; #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = params; + _tmp3_ = params->row; #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = _tmp3_->row; + video_table_add (_tmp2_, _tmp3_, &_tmp4_, &_inner_error_); #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_table_add (_tmp2_, _tmp4_, &_tmp5_, &_inner_error_); -#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala" _database_table_unref0 (_tmp2_); #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = _tmp6_; + _tmp0_ = _tmp5_; #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 5493 "VideoSupport.c" +#line 5714 "VideoSupport.c" goto __catch514_database_error; } #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -5502,27 +5723,25 @@ ImportResult video_import_create (VideoImportParams* params, Video* * video) { g_clear_error (&_inner_error_); #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala" return 0; -#line 5502 "VideoSupport.c" +#line 5723 "VideoSupport.c" } #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = video_id_is_invalid (&_tmp0_); -#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp7_) { + if (video_id_is_invalid (&_tmp0_)) { #line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = IMPORT_RESULT_DATABASE_ERROR; #line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (video) { #line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala" *video = _vala_video; -#line 5514 "VideoSupport.c" +#line 5733 "VideoSupport.c" } else { #line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (_vala_video); -#line 5518 "VideoSupport.c" +#line 5737 "VideoSupport.c" } #line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 5522 "VideoSupport.c" +#line 5741 "VideoSupport.c" } } goto __finally514; @@ -5541,15 +5760,15 @@ ImportResult video_import_create (VideoImportParams* params, Video* * video) { if (video) { #line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala" *video = _vala_video; -#line 5541 "VideoSupport.c" +#line 5760 "VideoSupport.c" } else { #line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (_vala_video); -#line 5545 "VideoSupport.c" +#line 5764 "VideoSupport.c" } #line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 5549 "VideoSupport.c" +#line 5768 "VideoSupport.c" } __finally514: #line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -5560,63 +5779,60 @@ ImportResult video_import_create (VideoImportParams* params, Video* * video) { g_clear_error (&_inner_error_); #line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala" return 0; -#line 5560 "VideoSupport.c" +#line 5779 "VideoSupport.c" } #line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = params; + _tmp6_ = params->row; #line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = _tmp8_->row; -#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = video_new (_tmp9_); + _tmp7_ = video_new (_tmp6_); #line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (_vala_video); #line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _vala_video = _tmp10_; + _vala_video = _tmp7_; #line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = IMPORT_RESULT_SUCCESS; #line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (video) { #line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala" *video = _vala_video; -#line 5578 "VideoSupport.c" +#line 5795 "VideoSupport.c" } else { #line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (_vala_video); -#line 5582 "VideoSupport.c" +#line 5799 "VideoSupport.c" } #line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 5586 "VideoSupport.c" +#line 5803 "VideoSupport.c" } -void video_import_failed (Video* video) { +void +video_import_failed (Video* video) +{ GError * _inner_error_ = NULL; #line 580 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (IS_VIDEO (video)); -#line 5594 "VideoSupport.c" +#line 5813 "VideoSupport.c" { VideoTable* _tmp0_; VideoTable* _tmp1_; - Video* _tmp2_; - VideoID _tmp3_ = {0}; + VideoID _tmp2_ = {0}; #line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = video_table_get_instance (); #line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp1_ = _tmp0_; #line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = video; + video_get_video_id (video, &_tmp2_); #line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_get_video_id (_tmp2_, &_tmp3_); -#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_table_remove (_tmp1_, &_tmp3_, &_inner_error_); + video_table_remove (_tmp1_, &_tmp2_, &_inner_error_); #line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala" _database_table_unref0 (_tmp1_); #line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 5616 "VideoSupport.c" +#line 5832 "VideoSupport.c" goto __catch515_database_error; } #line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -5625,25 +5841,25 @@ void video_import_failed (Video* video) { g_clear_error (&_inner_error_); #line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 5625 "VideoSupport.c" +#line 5841 "VideoSupport.c" } } goto __finally515; __catch515_database_error: { GError* err = NULL; - GError* _tmp4_; + GError* _tmp3_; #line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala" err = _inner_error_; #line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala" _inner_error_ = NULL; #line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = err; + _tmp3_ = err; #line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala" - app_window_database_error (_tmp4_); + app_window_database_error (_tmp3_); #line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_error_free0 (err); -#line 5643 "VideoSupport.c" +#line 5859 "VideoSupport.c" } __finally515: #line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -5654,12 +5870,15 @@ void video_import_failed (Video* video) { g_clear_error (&_inner_error_); #line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 5654 "VideoSupport.c" +#line 5870 "VideoSupport.c" } } -static BackingFileState** video_real_get_backing_files_state (MediaSource* base, int* result_length1) { +static BackingFileState** +video_real_get_backing_files_state (MediaSource* base, + int* result_length1) +{ Video * self; BackingFileState** result = NULL; BackingFileState** backing = NULL; @@ -5679,14 +5898,14 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base, backing_length1 = 1; #line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala" _backing_size_ = backing_length1; -#line 5679 "VideoSupport.c" +#line 5898 "VideoSupport.c" { VideoRow* _tmp1_; #line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp1_ = self->priv->backing_row; #line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 5686 "VideoSupport.c" +#line 5905 "VideoSupport.c" { VideoRow* _tmp2_; const gchar* _tmp3_; @@ -5722,7 +5941,7 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base, backing[0] = _tmp10_; #line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp11_ = backing[0]; -#line 5722 "VideoSupport.c" +#line 5941 "VideoSupport.c" } __finally516: { @@ -5731,7 +5950,7 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base, _tmp12_ = self->priv->backing_row; #line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 5731 "VideoSupport.c" +#line 5950 "VideoSupport.c" } #line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5743,7 +5962,7 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base, g_clear_error (&_inner_error_); #line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 5743 "VideoSupport.c" +#line 5962 "VideoSupport.c" } } #line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -5754,68 +5973,71 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base, if (result_length1) { #line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala" *result_length1 = _tmp13__length1; -#line 5754 "VideoSupport.c" +#line 5973 "VideoSupport.c" } #line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = _tmp13_; #line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 5760 "VideoSupport.c" +#line 5979 "VideoSupport.c" } -static GdkPixbuf* video_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error) { +static GdkPixbuf* +video_real_get_thumbnail (ThumbnailSource* base, + gint scale, + GError** error) +{ Video * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; - gint _tmp1_; + GdkPixbuf* _tmp1_; GdkPixbuf* _tmp2_; - GdkPixbuf* _tmp3_; GError * _inner_error_ = NULL; #line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); #line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = scale; -#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = thumbnail_cache_fetch (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_); + _tmp1_ = thumbnail_cache_fetch (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), scale, &_inner_error_); #line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = _tmp2_; + _tmp0_ = _tmp1_; #line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_propagate_error (error, _inner_error_); #line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 5786 "VideoSupport.c" +#line 6006 "VideoSupport.c" } #line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = _tmp0_; + _tmp2_ = _tmp0_; #line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = NULL; #line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp3_; + result = _tmp2_; #line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (_tmp0_); #line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 5798 "VideoSupport.c" +#line 6018 "VideoSupport.c" } -static gchar* video_real_get_master_md5 (MediaSource* base) { +static gchar* +video_real_get_master_md5 (MediaSource* base) +{ Video * self; gchar* result = NULL; GError * _inner_error_ = NULL; #line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); -#line 5808 "VideoSupport.c" +#line 6030 "VideoSupport.c" { VideoRow* _tmp0_; #line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->backing_row; #line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 5815 "VideoSupport.c" +#line 6037 "VideoSupport.c" { VideoRow* _tmp1_; const gchar* _tmp2_; @@ -5828,18 +6050,18 @@ static gchar* video_real_get_master_md5 (MediaSource* base) { _tmp3_ = g_strdup (_tmp2_); #line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = _tmp3_; -#line 5828 "VideoSupport.c" +#line 6050 "VideoSupport.c" { VideoRow* _tmp4_; #line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp4_ = self->priv->backing_row; #line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 5835 "VideoSupport.c" +#line 6057 "VideoSupport.c" } #line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 5839 "VideoSupport.c" +#line 6061 "VideoSupport.c" } __finally517: { @@ -5848,7 +6070,7 @@ static gchar* video_real_get_master_md5 (MediaSource* base) { _tmp5_ = self->priv->backing_row; #line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 5848 "VideoSupport.c" +#line 6070 "VideoSupport.c" } #line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -5856,12 +6078,16 @@ static gchar* video_real_get_master_md5 (MediaSource* base) { g_clear_error (&_inner_error_); #line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 5856 "VideoSupport.c" +#line 6078 "VideoSupport.c" } } -static GdkPixbuf* video_real_get_preview_pixbuf (MediaSource* base, Scaling* scaling, GError** error) { +static GdkPixbuf* +video_real_get_preview_pixbuf (MediaSource* base, + Scaling* scaling, + GError** error) +{ Video * self; GdkPixbuf* result = NULL; GdkPixbuf* pixbuf = NULL; @@ -5882,7 +6108,7 @@ static GdkPixbuf* video_real_get_preview_pixbuf (MediaSource* base, Scaling* sca g_propagate_error (error, _inner_error_); #line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 5882 "VideoSupport.c" +#line 6108 "VideoSupport.c" } #line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_NEAREST, TRUE); @@ -5892,11 +6118,15 @@ static GdkPixbuf* video_real_get_preview_pixbuf (MediaSource* base, Scaling* sca _g_object_unref0 (pixbuf); #line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 5892 "VideoSupport.c" +#line 6118 "VideoSupport.c" } -static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error) { +static GdkPixbuf* +video_real_create_thumbnail (ThumbnailSource* base, + gint scale, + GError** error) +{ Video * self; GdkPixbuf* result = NULL; VideoReader* reader = NULL; @@ -5933,7 +6163,7 @@ static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale _tmp7_ = frame; #line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_tmp7_ != NULL) { -#line 5933 "VideoSupport.c" +#line 6163 "VideoSupport.c" GdkPixbuf* _tmp8_; GdkPixbuf* _tmp9_; #line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -5944,7 +6174,7 @@ static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale _g_object_unref0 (_tmp6_); #line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp6_ = _tmp9_; -#line 5944 "VideoSupport.c" +#line 6174 "VideoSupport.c" } else { GdkPixbuf* _tmp10_; GdkPixbuf* _tmp11_; @@ -5961,7 +6191,7 @@ static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale _tmp6_ = _tmp12_; #line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (_tmp11_); -#line 5961 "VideoSupport.c" +#line 6191 "VideoSupport.c" } #line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = _tmp6_; @@ -5971,11 +6201,13 @@ static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale _video_reader_unref0 (reader); #line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 5971 "VideoSupport.c" +#line 6201 "VideoSupport.c" } -static gchar* video_real_get_typename (DataSource* base) { +static gchar* +video_real_get_typename (DataSource* base) +{ Video * self; gchar* result = NULL; gchar* _tmp0_; @@ -5987,11 +6219,13 @@ static gchar* video_real_get_typename (DataSource* base) { result = _tmp0_; #line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 5987 "VideoSupport.c" +#line 6219 "VideoSupport.c" } -static gint64 video_real_get_instance_id (DataSource* base) { +static gint64 +video_real_get_instance_id (DataSource* base) +{ Video * self; gint64 result = 0LL; VideoID _tmp0_ = {0}; @@ -6006,23 +6240,26 @@ static gint64 video_real_get_instance_id (DataSource* base) { result = _tmp1_; #line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 6006 "VideoSupport.c" +#line 6240 "VideoSupport.c" } -static void video_real_get_import_id (MediaSource* base, ImportID* result) { +static void +video_real_get_import_id (MediaSource* base, + ImportID* result) +{ Video * self; GError * _inner_error_ = NULL; #line 629 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); -#line 6015 "VideoSupport.c" +#line 6252 "VideoSupport.c" { VideoRow* _tmp0_; #line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->backing_row; #line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 6022 "VideoSupport.c" +#line 6259 "VideoSupport.c" { VideoRow* _tmp1_; ImportID _tmp2_; @@ -6032,18 +6269,18 @@ static void video_real_get_import_id (MediaSource* base, ImportID* result) { _tmp2_ = _tmp1_->import_id; #line 631 "/home/jens/Source/shotwell/src/VideoSupport.vala" *result = _tmp2_; -#line 6032 "VideoSupport.c" +#line 6269 "VideoSupport.c" { VideoRow* _tmp3_; #line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp3_ = self->priv->backing_row; #line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6039 "VideoSupport.c" +#line 6276 "VideoSupport.c" } #line 631 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 6043 "VideoSupport.c" +#line 6280 "VideoSupport.c" } __finally518: { @@ -6052,7 +6289,7 @@ static void video_real_get_import_id (MediaSource* base, ImportID* result) { _tmp4_ = self->priv->backing_row; #line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6052 "VideoSupport.c" +#line 6289 "VideoSupport.c" } #line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -6060,41 +6297,42 @@ static void video_real_get_import_id (MediaSource* base, ImportID* result) { g_clear_error (&_inner_error_); #line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 6060 "VideoSupport.c" +#line 6297 "VideoSupport.c" } } -static PhotoFileFormat video_real_get_preferred_thumbnail_format (ThumbnailSource* base) { +static PhotoFileFormat +video_real_get_preferred_thumbnail_format (ThumbnailSource* base) +{ Video * self; PhotoFileFormat result = 0; - PhotoFileFormat _tmp0_; #line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); #line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = photo_file_format_get_system_default_format (); -#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp0_; + result = photo_file_format_get_system_default_format (); #line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 6077 "VideoSupport.c" +#line 6313 "VideoSupport.c" } -static gchar* video_real_get_title (MediaSource* base) { +static gchar* +video_real_get_title (MediaSource* base) +{ Video * self; gchar* result = NULL; GError * _inner_error_ = NULL; #line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); -#line 6087 "VideoSupport.c" +#line 6325 "VideoSupport.c" { VideoRow* _tmp0_; #line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->backing_row; #line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 6094 "VideoSupport.c" +#line 6332 "VideoSupport.c" { VideoRow* _tmp1_; const gchar* _tmp2_; @@ -6107,18 +6345,18 @@ static gchar* video_real_get_title (MediaSource* base) { _tmp3_ = g_strdup (_tmp2_); #line 641 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = _tmp3_; -#line 6107 "VideoSupport.c" +#line 6345 "VideoSupport.c" { VideoRow* _tmp4_; #line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp4_ = self->priv->backing_row; #line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6114 "VideoSupport.c" +#line 6352 "VideoSupport.c" } #line 641 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 6118 "VideoSupport.c" +#line 6356 "VideoSupport.c" } __finally519: { @@ -6127,7 +6365,7 @@ static gchar* video_real_get_title (MediaSource* base) { _tmp5_ = self->priv->backing_row; #line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6127 "VideoSupport.c" +#line 6365 "VideoSupport.c" } #line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -6135,99 +6373,99 @@ static gchar* video_real_get_title (MediaSource* base) { g_clear_error (&_inner_error_); #line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 6135 "VideoSupport.c" +#line 6373 "VideoSupport.c" } } -static void video_real_set_title (MediaSource* base, const gchar* title) { +static void +video_real_set_title (MediaSource* base, + const gchar* title) +{ Video * self; gchar* new_title = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; + Alteration* _tmp19_; Alteration* _tmp20_; - Alteration* _tmp21_; GError * _inner_error_ = NULL; #line 645 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); #line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = title; + _tmp0_ = media_source_prep_title (title); #line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = media_source_prep_title (_tmp0_); -#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala" - new_title = _tmp1_; -#line 6156 "VideoSupport.c" + new_title = _tmp0_; +#line 6394 "VideoSupport.c" { - VideoRow* _tmp2_; + VideoRow* _tmp1_; #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = self->priv->backing_row; + _tmp1_ = self->priv->backing_row; #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 6163 "VideoSupport.c" +#line 6401 "VideoSupport.c" { - VideoRow* _tmp3_; + VideoRow* _tmp2_; + const gchar* _tmp3_; const gchar* _tmp4_; - const gchar* _tmp5_; - VideoRow* _tmp16_; - const gchar* _tmp17_; - gchar* _tmp18_; + VideoRow* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; #line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = self->priv->backing_row; + _tmp2_ = self->priv->backing_row; #line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = _tmp3_->title; + _tmp3_ = _tmp2_->title; #line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = new_title; + _tmp4_ = new_title; #line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (g_strcmp0 (_tmp4_, _tmp5_) == 0) { -#line 6179 "VideoSupport.c" + if (g_strcmp0 (_tmp3_, _tmp4_) == 0) { +#line 6417 "VideoSupport.c" { - VideoRow* _tmp6_; + VideoRow* _tmp5_; #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = self->priv->backing_row; + _tmp5_ = self->priv->backing_row; #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6186 "VideoSupport.c" +#line 6424 "VideoSupport.c" } #line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (new_title); #line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 6192 "VideoSupport.c" +#line 6430 "VideoSupport.c" } { + VideoTable* _tmp6_; VideoTable* _tmp7_; - VideoTable* _tmp8_; - VideoRow* _tmp9_; - VideoID _tmp10_; - const gchar* _tmp11_; + VideoRow* _tmp8_; + VideoID _tmp9_; + const gchar* _tmp10_; #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = video_table_get_instance (); + _tmp6_ = video_table_get_instance (); #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = self->priv->backing_row; + _tmp8_ = self->priv->backing_row; #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = _tmp9_->video_id; + _tmp9_ = _tmp8_->video_id; #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = new_title; + _tmp10_ = new_title; #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_table_set_title (_tmp8_, &_tmp10_, _tmp11_, &_inner_error_); + video_table_set_title (_tmp7_, &_tmp9_, _tmp10_, &_inner_error_); #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _database_table_unref0 (_tmp8_); + _database_table_unref0 (_tmp7_); #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6218 "VideoSupport.c" +#line 6456 "VideoSupport.c" goto __catch521_database_error; } { - VideoRow* _tmp12_; + VideoRow* _tmp11_; #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = self->priv->backing_row; + _tmp11_ = self->priv->backing_row; #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6227 "VideoSupport.c" +#line 6465 "VideoSupport.c" } #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (new_title); @@ -6237,50 +6475,50 @@ static void video_real_set_title (MediaSource* base, const gchar* title) { g_clear_error (&_inner_error_); #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 6237 "VideoSupport.c" +#line 6475 "VideoSupport.c" } } goto __finally521; __catch521_database_error: { GError* e = NULL; - GError* _tmp13_; + GError* _tmp12_; #line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala" e = _inner_error_; #line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala" _inner_error_ = NULL; #line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp13_ = e; + _tmp12_ = e; #line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala" - app_window_database_error (_tmp13_); + app_window_database_error (_tmp12_); #line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_error_free0 (e); -#line 6255 "VideoSupport.c" +#line 6493 "VideoSupport.c" { - VideoRow* _tmp14_; + VideoRow* _tmp13_; #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp14_ = self->priv->backing_row; + _tmp13_ = self->priv->backing_row; #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6262 "VideoSupport.c" +#line 6500 "VideoSupport.c" } #line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (new_title); #line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 6268 "VideoSupport.c" +#line 6506 "VideoSupport.c" } __finally521: #line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6273 "VideoSupport.c" +#line 6511 "VideoSupport.c" { - VideoRow* _tmp15_; + VideoRow* _tmp14_; #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp15_ = self->priv->backing_row; + _tmp14_ = self->priv->backing_row; #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6280 "VideoSupport.c" +#line 6518 "VideoSupport.c" } #line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (new_title); @@ -6290,28 +6528,28 @@ static void video_real_set_title (MediaSource* base, const gchar* title) { g_clear_error (&_inner_error_); #line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 6290 "VideoSupport.c" +#line 6528 "VideoSupport.c" } #line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp16_ = self->priv->backing_row; + _tmp15_ = self->priv->backing_row; #line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp17_ = new_title; + _tmp16_ = new_title; #line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp18_ = g_strdup (_tmp17_); + _tmp17_ = g_strdup (_tmp16_); #line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp16_->title); + _g_free0 (_tmp15_->title); #line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp16_->title = _tmp18_; -#line 6302 "VideoSupport.c" + _tmp15_->title = _tmp17_; +#line 6540 "VideoSupport.c" } __finally520: { - VideoRow* _tmp19_; + VideoRow* _tmp18_; #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp19_ = self->priv->backing_row; + _tmp18_ = self->priv->backing_row; #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6311 "VideoSupport.c" +#line 6549 "VideoSupport.c" } #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -6323,37 +6561,39 @@ static void video_real_set_title (MediaSource* base, const gchar* title) { g_clear_error (&_inner_error_); #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 6323 "VideoSupport.c" +#line 6561 "VideoSupport.c" } } #line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp20_ = alteration_new ("metadata", "name"); + _tmp19_ = alteration_new ("metadata", "name"); #line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp21_ = _tmp20_; + _tmp20_ = _tmp19_; #line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_); #line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _alteration_unref0 (_tmp21_); + _alteration_unref0 (_tmp20_); #line 645 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (new_title); -#line 6336 "VideoSupport.c" +#line 6574 "VideoSupport.c" } -static gchar* video_real_get_comment (MediaSource* base) { +static gchar* +video_real_get_comment (MediaSource* base) +{ Video * self; gchar* result = NULL; GError * _inner_error_ = NULL; #line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); -#line 6346 "VideoSupport.c" +#line 6586 "VideoSupport.c" { VideoRow* _tmp0_; #line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->backing_row; #line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 6353 "VideoSupport.c" +#line 6593 "VideoSupport.c" { VideoRow* _tmp1_; const gchar* _tmp2_; @@ -6366,18 +6606,18 @@ static gchar* video_real_get_comment (MediaSource* base) { _tmp3_ = g_strdup (_tmp2_); #line 668 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = _tmp3_; -#line 6366 "VideoSupport.c" +#line 6606 "VideoSupport.c" { VideoRow* _tmp4_; #line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp4_ = self->priv->backing_row; #line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6373 "VideoSupport.c" +#line 6613 "VideoSupport.c" } #line 668 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 6377 "VideoSupport.c" +#line 6617 "VideoSupport.c" } __finally522: { @@ -6386,7 +6626,7 @@ static gchar* video_real_get_comment (MediaSource* base) { _tmp5_ = self->priv->backing_row; #line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6386 "VideoSupport.c" +#line 6626 "VideoSupport.c" } #line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -6394,104 +6634,104 @@ static gchar* video_real_get_comment (MediaSource* base) { g_clear_error (&_inner_error_); #line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 6394 "VideoSupport.c" +#line 6634 "VideoSupport.c" } } -static gboolean video_real_set_comment (MediaSource* base, const gchar* comment) { +static gboolean +video_real_set_comment (MediaSource* base, + const gchar* comment) +{ Video * self; gboolean result = FALSE; gchar* new_comment = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; + Alteration* _tmp22_; Alteration* _tmp23_; - Alteration* _tmp24_; GError * _inner_error_ = NULL; #line 672 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); #line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = comment; + _tmp0_ = media_source_prep_title (comment); #line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = media_source_prep_title (_tmp0_); -#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala" - new_comment = _tmp1_; -#line 6416 "VideoSupport.c" + new_comment = _tmp0_; +#line 6656 "VideoSupport.c" { - VideoRow* _tmp2_; + VideoRow* _tmp1_; #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = self->priv->backing_row; + _tmp1_ = self->priv->backing_row; #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 6423 "VideoSupport.c" +#line 6663 "VideoSupport.c" { - VideoRow* _tmp3_; + VideoRow* _tmp2_; + const gchar* _tmp3_; const gchar* _tmp4_; - const gchar* _tmp5_; - VideoRow* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; + VideoRow* _tmp17_; + const gchar* _tmp18_; + gchar* _tmp19_; #line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = self->priv->backing_row; + _tmp2_ = self->priv->backing_row; #line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = _tmp3_->comment; + _tmp3_ = _tmp2_->comment; #line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = new_comment; + _tmp4_ = new_comment; #line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (g_strcmp0 (_tmp4_, _tmp5_) == 0) { + if (g_strcmp0 (_tmp3_, _tmp4_) == 0) { #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = TRUE; -#line 6441 "VideoSupport.c" +#line 6681 "VideoSupport.c" { - VideoRow* _tmp6_; + VideoRow* _tmp5_; #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = self->priv->backing_row; + _tmp5_ = self->priv->backing_row; #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6448 "VideoSupport.c" +#line 6688 "VideoSupport.c" } #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (new_comment); #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 6454 "VideoSupport.c" +#line 6694 "VideoSupport.c" } { + VideoTable* _tmp6_; VideoTable* _tmp7_; - VideoTable* _tmp8_; - VideoRow* _tmp9_; - VideoID _tmp10_; - const gchar* _tmp11_; + VideoRow* _tmp8_; + VideoID _tmp9_; + const gchar* _tmp10_; #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = video_table_get_instance (); + _tmp6_ = video_table_get_instance (); #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = self->priv->backing_row; + _tmp8_ = self->priv->backing_row; #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = _tmp9_->video_id; + _tmp9_ = _tmp8_->video_id; #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = new_comment; + _tmp10_ = new_comment; #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_table_set_comment (_tmp8_, &_tmp10_, _tmp11_, &_inner_error_); + video_table_set_comment (_tmp7_, &_tmp9_, _tmp10_, &_inner_error_); #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _database_table_unref0 (_tmp8_); + _database_table_unref0 (_tmp7_); #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6478 "VideoSupport.c" - gboolean _tmp13_ = FALSE; +#line 6718 "VideoSupport.c" + gboolean _tmp12_ = FALSE; #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6482 "VideoSupport.c" +#line 6722 "VideoSupport.c" goto __catch524_database_error; } { - VideoRow* _tmp12_; + VideoRow* _tmp11_; #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = self->priv->backing_row; + _tmp11_ = self->priv->backing_row; #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6491 "VideoSupport.c" +#line 6731 "VideoSupport.c" } #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (new_comment); @@ -6500,54 +6740,54 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment) #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_clear_error (&_inner_error_); #line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala" - return _tmp13_; -#line 6501 "VideoSupport.c" + return _tmp12_; +#line 6741 "VideoSupport.c" } } goto __finally524; __catch524_database_error: { GError* e = NULL; - GError* _tmp14_; + GError* _tmp13_; #line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala" e = _inner_error_; #line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala" _inner_error_ = NULL; #line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp14_ = e; + _tmp13_ = e; #line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala" - app_window_database_error (_tmp14_); + app_window_database_error (_tmp13_); #line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = FALSE; #line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_error_free0 (e); -#line 6521 "VideoSupport.c" +#line 6761 "VideoSupport.c" { - VideoRow* _tmp15_; + VideoRow* _tmp14_; #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp15_ = self->priv->backing_row; + _tmp14_ = self->priv->backing_row; #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6528 "VideoSupport.c" +#line 6768 "VideoSupport.c" } #line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (new_comment); #line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 6534 "VideoSupport.c" +#line 6774 "VideoSupport.c" } __finally524: #line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6539 "VideoSupport.c" - gboolean _tmp17_ = FALSE; +#line 6779 "VideoSupport.c" + gboolean _tmp16_ = FALSE; { - VideoRow* _tmp16_; + VideoRow* _tmp15_; #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp16_ = self->priv->backing_row; + _tmp15_ = self->priv->backing_row; #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6547 "VideoSupport.c" +#line 6787 "VideoSupport.c" } #line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (new_comment); @@ -6556,34 +6796,34 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment) #line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_clear_error (&_inner_error_); #line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala" - return _tmp17_; -#line 6557 "VideoSupport.c" + return _tmp16_; +#line 6797 "VideoSupport.c" } #line 687 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp18_ = self->priv->backing_row; + _tmp17_ = self->priv->backing_row; #line 687 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp19_ = new_comment; + _tmp18_ = new_comment; #line 687 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp20_ = g_strdup (_tmp19_); + _tmp19_ = g_strdup (_tmp18_); #line 687 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp18_->comment); + _g_free0 (_tmp17_->comment); #line 687 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp18_->comment = _tmp20_; -#line 6569 "VideoSupport.c" + _tmp17_->comment = _tmp19_; +#line 6809 "VideoSupport.c" } __finally523: { - VideoRow* _tmp21_; + VideoRow* _tmp20_; #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp21_ = self->priv->backing_row; + _tmp20_ = self->priv->backing_row; #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6578 "VideoSupport.c" +#line 6818 "VideoSupport.c" } #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6582 "VideoSupport.c" - gboolean _tmp22_ = FALSE; +#line 6822 "VideoSupport.c" + gboolean _tmp21_ = FALSE; #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (new_comment); #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -6591,42 +6831,44 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment) #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_clear_error (&_inner_error_); #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala" - return _tmp22_; -#line 6592 "VideoSupport.c" + return _tmp21_; +#line 6832 "VideoSupport.c" } } #line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp23_ = alteration_new ("metadata", "comment"); + _tmp22_ = alteration_new ("metadata", "comment"); #line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp24_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp23_); #line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _alteration_unref0 (_tmp24_); + _alteration_unref0 (_tmp23_); #line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = TRUE; #line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (new_comment); #line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 6609 "VideoSupport.c" +#line 6849 "VideoSupport.c" } -static Rating video_real_get_rating (MediaSource* base) { +static Rating +video_real_get_rating (MediaSource* base) +{ Video * self; Rating result = 0; GError * _inner_error_ = NULL; #line 696 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); -#line 6619 "VideoSupport.c" +#line 6861 "VideoSupport.c" { VideoRow* _tmp0_; #line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->backing_row; #line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 6626 "VideoSupport.c" +#line 6868 "VideoSupport.c" { VideoRow* _tmp1_; Rating _tmp2_; @@ -6636,18 +6878,18 @@ static Rating video_real_get_rating (MediaSource* base) { _tmp2_ = _tmp1_->rating; #line 698 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = _tmp2_; -#line 6636 "VideoSupport.c" +#line 6878 "VideoSupport.c" { VideoRow* _tmp3_; #line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp3_ = self->priv->backing_row; #line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6643 "VideoSupport.c" +#line 6885 "VideoSupport.c" } #line 698 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 6647 "VideoSupport.c" +#line 6889 "VideoSupport.c" } __finally525: { @@ -6656,7 +6898,7 @@ static Rating video_real_get_rating (MediaSource* base) { _tmp4_ = self->priv->backing_row; #line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6656 "VideoSupport.c" +#line 6898 "VideoSupport.c" } #line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -6664,101 +6906,91 @@ static Rating video_real_get_rating (MediaSource* base) { g_clear_error (&_inner_error_); #line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala" return 0; -#line 6664 "VideoSupport.c" +#line 6906 "VideoSupport.c" } } -static void video_real_set_rating (MediaSource* base, Rating rating) { +static void +video_real_set_rating (MediaSource* base, + Rating rating) +{ Video * self; - Alteration* _tmp19_; - Alteration* _tmp20_; + Alteration* _tmp14_; + Alteration* _tmp15_; GError * _inner_error_ = NULL; #line 702 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); -#line 6676 "VideoSupport.c" +#line 6921 "VideoSupport.c" { VideoRow* _tmp0_; #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->backing_row; #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 6683 "VideoSupport.c" +#line 6928 "VideoSupport.c" { gboolean _tmp1_ = FALSE; - Rating _tmp2_; - gboolean _tmp3_; - VideoRow* _tmp16_; - Rating _tmp17_; -#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = rating; -#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = rating_is_valid (_tmp2_); + VideoRow* _tmp12_; #line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (!_tmp3_) { + if (!rating_is_valid (rating)) { #line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp1_ = TRUE; -#line 6698 "VideoSupport.c" +#line 6936 "VideoSupport.c" } else { - Rating _tmp4_; - VideoRow* _tmp5_; - Rating _tmp6_; -#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = rating; + VideoRow* _tmp2_; + Rating _tmp3_; #line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = self->priv->backing_row; + _tmp2_ = self->priv->backing_row; #line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = _tmp5_->rating; + _tmp3_ = _tmp2_->rating; #line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = _tmp4_ == _tmp6_; -#line 6711 "VideoSupport.c" + _tmp1_ = rating == _tmp3_; +#line 6946 "VideoSupport.c" } #line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_tmp1_) { -#line 6715 "VideoSupport.c" +#line 6950 "VideoSupport.c" { - VideoRow* _tmp7_; + VideoRow* _tmp4_; #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = self->priv->backing_row; + _tmp4_ = self->priv->backing_row; #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6722 "VideoSupport.c" +#line 6957 "VideoSupport.c" } #line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 6726 "VideoSupport.c" +#line 6961 "VideoSupport.c" } { - VideoTable* _tmp8_; - VideoTable* _tmp9_; - VideoID _tmp10_ = {0}; - Rating _tmp11_; -#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = video_table_get_instance (); + VideoTable* _tmp5_; + VideoTable* _tmp6_; + VideoID _tmp7_ = {0}; #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = _tmp8_; + _tmp5_ = video_table_get_instance (); #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_get_video_id (self, &_tmp10_); + _tmp6_ = _tmp5_; #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = rating; + video_get_video_id (self, &_tmp7_); #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_table_set_rating (_tmp9_, &_tmp10_, _tmp11_, &_inner_error_); + video_table_set_rating (_tmp6_, &_tmp7_, rating, &_inner_error_); #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _database_table_unref0 (_tmp9_); + _database_table_unref0 (_tmp6_); #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6749 "VideoSupport.c" +#line 6981 "VideoSupport.c" goto __catch527_database_error; } { - VideoRow* _tmp12_; + VideoRow* _tmp8_; #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = self->priv->backing_row; + _tmp8_ = self->priv->backing_row; #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6758 "VideoSupport.c" +#line 6990 "VideoSupport.c" } #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -6766,48 +6998,48 @@ static void video_real_set_rating (MediaSource* base, Rating rating) { g_clear_error (&_inner_error_); #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 6766 "VideoSupport.c" +#line 6998 "VideoSupport.c" } } goto __finally527; __catch527_database_error: { GError* e = NULL; - GError* _tmp13_; + GError* _tmp9_; #line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala" e = _inner_error_; #line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala" _inner_error_ = NULL; #line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp13_ = e; + _tmp9_ = e; #line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala" - app_window_database_error (_tmp13_); + app_window_database_error (_tmp9_); #line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_error_free0 (e); -#line 6784 "VideoSupport.c" +#line 7016 "VideoSupport.c" { - VideoRow* _tmp14_; + VideoRow* _tmp10_; #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp14_ = self->priv->backing_row; + _tmp10_ = self->priv->backing_row; #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6791 "VideoSupport.c" +#line 7023 "VideoSupport.c" } #line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 6795 "VideoSupport.c" +#line 7027 "VideoSupport.c" } __finally527: #line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6800 "VideoSupport.c" +#line 7032 "VideoSupport.c" { - VideoRow* _tmp15_; + VideoRow* _tmp11_; #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp15_ = self->priv->backing_row; + _tmp11_ = self->priv->backing_row; #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6807 "VideoSupport.c" +#line 7039 "VideoSupport.c" } #line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -6815,24 +7047,22 @@ static void video_real_set_rating (MediaSource* base, Rating rating) { g_clear_error (&_inner_error_); #line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 6815 "VideoSupport.c" +#line 7047 "VideoSupport.c" } #line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp16_ = self->priv->backing_row; -#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp17_ = rating; + _tmp12_ = self->priv->backing_row; #line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp16_->rating = _tmp17_; -#line 6823 "VideoSupport.c" + _tmp12_->rating = rating; +#line 7053 "VideoSupport.c" } __finally526: { - VideoRow* _tmp18_; + VideoRow* _tmp13_; #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp18_ = self->priv->backing_row; + _tmp13_ = self->priv->backing_row; #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6832 "VideoSupport.c" +#line 7062 "VideoSupport.c" } #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -6842,56 +7072,55 @@ static void video_real_set_rating (MediaSource* base, Rating rating) { g_clear_error (&_inner_error_); #line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 6842 "VideoSupport.c" +#line 7072 "VideoSupport.c" } } #line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp19_ = alteration_new ("metadata", "rating"); + _tmp14_ = alteration_new ("metadata", "rating"); #line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp20_ = _tmp19_; + _tmp15_ = _tmp14_; #line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_); #line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _alteration_unref0 (_tmp20_); -#line 6853 "VideoSupport.c" + _alteration_unref0 (_tmp15_); +#line 7083 "VideoSupport.c" } -static void video_real_increase_rating (MediaSource* base) { +static void +video_real_increase_rating (MediaSource* base) +{ Video * self; GError * _inner_error_ = NULL; #line 721 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); -#line 6862 "VideoSupport.c" +#line 7094 "VideoSupport.c" { VideoRow* _tmp0_; #line 722 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->backing_row; #line 722 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 6869 "VideoSupport.c" +#line 7101 "VideoSupport.c" { VideoRow* _tmp1_; Rating _tmp2_; - Rating _tmp3_; #line 723 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp1_ = self->priv->backing_row; #line 723 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp2_ = _tmp1_->rating; #line 723 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = rating_increase (_tmp2_); -#line 723 "/home/jens/Source/shotwell/src/VideoSupport.vala" - media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_); -#line 6882 "VideoSupport.c" + media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), rating_increase (_tmp2_)); +#line 7111 "VideoSupport.c" } __finally528: { - VideoRow* _tmp4_; + VideoRow* _tmp3_; #line 722 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = self->priv->backing_row; + _tmp3_ = self->priv->backing_row; #line 722 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6891 "VideoSupport.c" +#line 7120 "VideoSupport.c" } #line 722 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -6901,47 +7130,46 @@ static void video_real_increase_rating (MediaSource* base) { g_clear_error (&_inner_error_); #line 722 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 6901 "VideoSupport.c" +#line 7130 "VideoSupport.c" } } } -static void video_real_decrease_rating (MediaSource* base) { +static void +video_real_decrease_rating (MediaSource* base) +{ Video * self; GError * _inner_error_ = NULL; #line 727 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); -#line 6912 "VideoSupport.c" +#line 7143 "VideoSupport.c" { VideoRow* _tmp0_; #line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->backing_row; #line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 6919 "VideoSupport.c" +#line 7150 "VideoSupport.c" { VideoRow* _tmp1_; Rating _tmp2_; - Rating _tmp3_; #line 729 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp1_ = self->priv->backing_row; #line 729 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp2_ = _tmp1_->rating; #line 729 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = rating_decrease (_tmp2_); -#line 729 "/home/jens/Source/shotwell/src/VideoSupport.vala" - media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_); -#line 6932 "VideoSupport.c" + media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), rating_decrease (_tmp2_)); +#line 7160 "VideoSupport.c" } __finally529: { - VideoRow* _tmp4_; + VideoRow* _tmp3_; #line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = self->priv->backing_row; + _tmp3_ = self->priv->backing_row; #line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 6941 "VideoSupport.c" +#line 7169 "VideoSupport.c" } #line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -6951,133 +7179,133 @@ static void video_real_decrease_rating (MediaSource* base) { g_clear_error (&_inner_error_); #line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 6951 "VideoSupport.c" +#line 7179 "VideoSupport.c" } } } -static gboolean video_real_is_trashed (MediaSource* base) { +static gboolean +video_real_is_trashed (MediaSource* base) +{ Video * self; gboolean result = FALSE; - gboolean _tmp0_; #line 733 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); #line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = video_is_flag_set (self, VIDEO_FLAG_TRASH); -#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp0_; + result = video_is_flag_set (self, VIDEO_FLAG_TRASH); #line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 6969 "VideoSupport.c" +#line 7196 "VideoSupport.c" } -static gboolean video_real_is_offline (Monitorable* base) { +static gboolean +video_real_is_offline (Monitorable* base) +{ Video * self; gboolean result = FALSE; - gboolean _tmp0_; #line 737 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); #line 738 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = video_is_flag_set (self, VIDEO_FLAG_OFFLINE); -#line 738 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp0_; + result = video_is_flag_set (self, VIDEO_FLAG_OFFLINE); #line 738 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 6985 "VideoSupport.c" +#line 7211 "VideoSupport.c" } -static void video_real_mark_offline (Monitorable* base) { +static void +video_real_mark_offline (Monitorable* base) +{ Video * self; #line 741 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); #line 742 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_add_flags (self, VIDEO_FLAG_OFFLINE, NULL); -#line 6995 "VideoSupport.c" +#line 7223 "VideoSupport.c" } -static void video_real_mark_online (Monitorable* base) { +static void +video_real_mark_online (Monitorable* base) +{ Video * self; gboolean _tmp0_ = FALSE; - gboolean _tmp1_; #line 745 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); #line 746 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_remove_flags (self, VIDEO_FLAG_OFFLINE, NULL); #line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = video_get_is_interpretable (self); -#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (!_tmp1_) { -#line 7011 "VideoSupport.c" - gboolean _tmp2_; -#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = video_has_interpreter_state_changed (); + if (!video_get_is_interpretable (self)) { #line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = _tmp2_; -#line 7017 "VideoSupport.c" + _tmp0_ = video_has_interpreter_state_changed (); +#line 7240 "VideoSupport.c" } else { #line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = FALSE; -#line 7021 "VideoSupport.c" +#line 7244 "VideoSupport.c" } #line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_tmp0_) { -#line 7025 "VideoSupport.c" - VideoInterpretableResults* _tmp3_; - VideoInterpretableResults* _tmp4_; +#line 7248 "VideoSupport.c" + VideoInterpretableResults* _tmp1_; + VideoInterpretableResults* _tmp2_; #line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = video_check_is_interpretable (self); + _tmp1_ = video_check_is_interpretable (self); #line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_interpretable_results_foreground_finish (_tmp4_); + video_interpretable_results_foreground_finish (_tmp2_); #line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _video_interpretable_results_unref0 (_tmp4_); -#line 7036 "VideoSupport.c" + _video_interpretable_results_unref0 (_tmp2_); +#line 7259 "VideoSupport.c" } } -static void video_real_trash (MediaSource* base) { +static void +video_real_trash (MediaSource* base) +{ Video * self; #line 752 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); #line 753 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_add_flags (self, VIDEO_FLAG_TRASH, NULL); -#line 7047 "VideoSupport.c" +#line 7272 "VideoSupport.c" } -static void video_real_untrash (MediaSource* base) { +static void +video_real_untrash (MediaSource* base) +{ Video * self; #line 756 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); #line 757 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_remove_flags (self, VIDEO_FLAG_TRASH, NULL); -#line 7057 "VideoSupport.c" +#line 7284 "VideoSupport.c" } -static gboolean video_real_is_flagged (Flaggable* base) { +static gboolean +video_real_is_flagged (Flaggable* base) +{ Video * self; gboolean result = FALSE; - gboolean _tmp0_; #line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); #line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = video_is_flag_set (self, VIDEO_FLAG_FLAGGED); -#line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp0_; + result = video_is_flag_set (self, VIDEO_FLAG_FLAGGED); #line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 7073 "VideoSupport.c" +#line 7299 "VideoSupport.c" } -static void video_real_mark_flagged (Flaggable* base) { +static void +video_real_mark_flagged (Flaggable* base) +{ Video * self; Alteration* _tmp0_; Alteration* _tmp1_; @@ -7091,11 +7319,13 @@ static void video_real_mark_flagged (Flaggable* base) { video_add_flags (self, VIDEO_FLAG_FLAGGED, _tmp1_); #line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala" _alteration_unref0 (_tmp1_); -#line 7091 "VideoSupport.c" +#line 7319 "VideoSupport.c" } -static void video_real_mark_unflagged (Flaggable* base) { +static void +video_real_mark_unflagged (Flaggable* base) +{ Video * self; Alteration* _tmp0_; Alteration* _tmp1_; @@ -7109,23 +7339,26 @@ static void video_real_mark_unflagged (Flaggable* base) { video_remove_flags (self, VIDEO_FLAG_FLAGGED, _tmp1_); #line 769 "/home/jens/Source/shotwell/src/VideoSupport.vala" _alteration_unref0 (_tmp1_); -#line 7109 "VideoSupport.c" +#line 7339 "VideoSupport.c" } -static void video_real_get_event_id (MediaSource* base, EventID* result) { +static void +video_real_get_event_id (MediaSource* base, + EventID* result) +{ Video * self; GError * _inner_error_ = NULL; #line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); -#line 7118 "VideoSupport.c" +#line 7351 "VideoSupport.c" { VideoRow* _tmp0_; #line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->backing_row; #line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 7125 "VideoSupport.c" +#line 7358 "VideoSupport.c" { VideoRow* _tmp1_; EventID _tmp2_; @@ -7135,18 +7368,18 @@ static void video_real_get_event_id (MediaSource* base, EventID* result) { _tmp2_ = _tmp1_->event_id; #line 774 "/home/jens/Source/shotwell/src/VideoSupport.vala" *result = _tmp2_; -#line 7135 "VideoSupport.c" +#line 7368 "VideoSupport.c" { VideoRow* _tmp3_; #line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp3_ = self->priv->backing_row; #line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 7142 "VideoSupport.c" +#line 7375 "VideoSupport.c" } #line 774 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 7146 "VideoSupport.c" +#line 7379 "VideoSupport.c" } __finally530: { @@ -7155,7 +7388,7 @@ static void video_real_get_event_id (MediaSource* base, EventID* result) { _tmp4_ = self->priv->backing_row; #line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 7155 "VideoSupport.c" +#line 7388 "VideoSupport.c" } #line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7163,25 +7396,27 @@ static void video_real_get_event_id (MediaSource* base, EventID* result) { g_clear_error (&_inner_error_); #line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 7163 "VideoSupport.c" +#line 7396 "VideoSupport.c" } } -static gchar* video_real_to_string (DataObject* base) { +static gchar* +video_real_to_string (DataObject* base) +{ Video * self; gchar* result = NULL; GError * _inner_error_ = NULL; #line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); -#line 7174 "VideoSupport.c" +#line 7409 "VideoSupport.c" { VideoRow* _tmp0_; #line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->backing_row; #line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 7181 "VideoSupport.c" +#line 7416 "VideoSupport.c" { VideoRow* _tmp1_; VideoID _tmp2_; @@ -7214,18 +7449,18 @@ static gchar* video_real_to_string (DataObject* base) { _g_free0 (_tmp5_); #line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = _tmp9_; -#line 7214 "VideoSupport.c" +#line 7449 "VideoSupport.c" { VideoRow* _tmp10_; #line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp10_ = self->priv->backing_row; #line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 7221 "VideoSupport.c" +#line 7456 "VideoSupport.c" } #line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 7225 "VideoSupport.c" +#line 7460 "VideoSupport.c" } __finally531: { @@ -7234,7 +7469,7 @@ static gchar* video_real_to_string (DataObject* base) { _tmp11_ = self->priv->backing_row; #line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 7234 "VideoSupport.c" +#line 7469 "VideoSupport.c" } #line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7242,23 +7477,26 @@ static gchar* video_real_to_string (DataObject* base) { g_clear_error (&_inner_error_); #line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 7242 "VideoSupport.c" +#line 7477 "VideoSupport.c" } } -void video_get_video_id (Video* self, VideoID* result) { +void +video_get_video_id (Video* self, + VideoID* result) +{ GError * _inner_error_ = NULL; #line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (IS_VIDEO (self)); -#line 7251 "VideoSupport.c" +#line 7489 "VideoSupport.c" { VideoRow* _tmp0_; #line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->backing_row; #line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 7258 "VideoSupport.c" +#line 7496 "VideoSupport.c" { VideoRow* _tmp1_; VideoID _tmp2_; @@ -7268,18 +7506,18 @@ void video_get_video_id (Video* self, VideoID* result) { _tmp2_ = _tmp1_->video_id; #line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala" *result = _tmp2_; -#line 7268 "VideoSupport.c" +#line 7506 "VideoSupport.c" { VideoRow* _tmp3_; #line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp3_ = self->priv->backing_row; #line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 7275 "VideoSupport.c" +#line 7513 "VideoSupport.c" } #line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 7279 "VideoSupport.c" +#line 7517 "VideoSupport.c" } __finally532: { @@ -7288,7 +7526,7 @@ void video_get_video_id (Video* self, VideoID* result) { _tmp4_ = self->priv->backing_row; #line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 7288 "VideoSupport.c" +#line 7526 "VideoSupport.c" } #line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7296,18 +7534,20 @@ void video_get_video_id (Video* self, VideoID* result) { g_clear_error (&_inner_error_); #line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 7296 "VideoSupport.c" +#line 7534 "VideoSupport.c" } } -static time_t video_real_get_exposure_time (Dateable* base) { +static time_t +video_real_get_exposure_time (Dateable* base) +{ Video * self; time_t result = 0; GError * _inner_error_ = NULL; #line 790 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); -#line 7307 "VideoSupport.c" +#line 7547 "VideoSupport.c" { VideoRow* _tmp0_; time_t _tmp5_ = 0; @@ -7315,7 +7555,7 @@ static time_t video_real_get_exposure_time (Dateable* base) { _tmp0_ = self->priv->backing_row; #line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 7315 "VideoSupport.c" +#line 7555 "VideoSupport.c" { VideoRow* _tmp1_; time_t _tmp2_; @@ -7325,18 +7565,18 @@ static time_t video_real_get_exposure_time (Dateable* base) { _tmp2_ = _tmp1_->exposure_time; #line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = _tmp2_; -#line 7325 "VideoSupport.c" +#line 7565 "VideoSupport.c" { VideoRow* _tmp3_; #line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp3_ = self->priv->backing_row; #line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 7332 "VideoSupport.c" +#line 7572 "VideoSupport.c" } #line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 7336 "VideoSupport.c" +#line 7576 "VideoSupport.c" } __finally533: { @@ -7345,7 +7585,7 @@ static time_t video_real_get_exposure_time (Dateable* base) { _tmp4_ = self->priv->backing_row; #line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 7345 "VideoSupport.c" +#line 7585 "VideoSupport.c" } #line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7353,35 +7593,36 @@ static time_t video_real_get_exposure_time (Dateable* base) { g_clear_error (&_inner_error_); #line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala" return _tmp5_; -#line 7353 "VideoSupport.c" +#line 7593 "VideoSupport.c" } } -static void video_real_set_exposure_time (Dateable* base, time_t time) { +static void +video_real_set_exposure_time (Dateable* base, + time_t time) +{ Video * self; - Alteration* _tmp12_; - Alteration* _tmp13_; + Alteration* _tmp10_; + Alteration* _tmp11_; GError * _inner_error_ = NULL; #line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); -#line 7365 "VideoSupport.c" +#line 7608 "VideoSupport.c" { VideoRow* _tmp0_; #line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->backing_row; #line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 7372 "VideoSupport.c" +#line 7615 "VideoSupport.c" { - VideoRow* _tmp9_; - time_t _tmp10_; + VideoRow* _tmp8_; { VideoTable* _tmp1_; VideoTable* _tmp2_; VideoRow* _tmp3_; VideoID _tmp4_; - time_t _tmp5_; #line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp1_ = video_table_get_instance (); #line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -7391,14 +7632,12 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) { #line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp4_ = _tmp3_->video_id; #line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = time; -#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_table_set_exposure_time (_tmp2_, &_tmp4_, _tmp5_, &_inner_error_); + video_table_set_exposure_time (_tmp2_, &_tmp4_, time, &_inner_error_); #line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala" _database_table_unref0 (_tmp2_); #line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7398 "VideoSupport.c" +#line 7637 "VideoSupport.c" goto __catch535_g_error; } } @@ -7406,33 +7645,33 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) { __catch535_g_error: { GError* e = NULL; - GError* _tmp6_; - const gchar* _tmp7_; + GError* _tmp5_; + const gchar* _tmp6_; #line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala" e = _inner_error_; #line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala" _inner_error_ = NULL; #line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = e; + _tmp5_ = e; #line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = _tmp6_->message; + _tmp6_ = _tmp5_->message; #line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_debug ("VideoSupport.vala:801: Warning - %s", _tmp7_); + g_debug ("VideoSupport.vala:801: Warning - %s", _tmp6_); #line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_error_free0 (e); -#line 7420 "VideoSupport.c" +#line 7659 "VideoSupport.c" } __finally535: #line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7425 "VideoSupport.c" +#line 7664 "VideoSupport.c" { - VideoRow* _tmp8_; + VideoRow* _tmp7_; #line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = self->priv->backing_row; + _tmp7_ = self->priv->backing_row; #line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 7432 "VideoSupport.c" +#line 7671 "VideoSupport.c" } #line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7440,24 +7679,22 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) { g_clear_error (&_inner_error_); #line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 7440 "VideoSupport.c" +#line 7679 "VideoSupport.c" } #line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = self->priv->backing_row; -#line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = time; + _tmp8_ = self->priv->backing_row; #line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_->exposure_time = _tmp10_; -#line 7448 "VideoSupport.c" + _tmp8_->exposure_time = time; +#line 7685 "VideoSupport.c" } __finally534: { - VideoRow* _tmp11_; + VideoRow* _tmp9_; #line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = self->priv->backing_row; + _tmp9_ = self->priv->backing_row; #line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 7457 "VideoSupport.c" +#line 7694 "VideoSupport.c" } #line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -7467,33 +7704,36 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) { g_clear_error (&_inner_error_); #line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 7467 "VideoSupport.c" +#line 7704 "VideoSupport.c" } } #line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = alteration_new ("metadata", "exposure-time"); + _tmp10_ = alteration_new ("metadata", "exposure-time"); #line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp11_); #line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _alteration_unref0 (_tmp13_); -#line 7478 "VideoSupport.c" + _alteration_unref0 (_tmp11_); +#line 7715 "VideoSupport.c" } -void video_get_frame_dimensions (Video* self, Dimensions* result) { +void +video_get_frame_dimensions (Video* self, + Dimensions* result) +{ GError * _inner_error_ = NULL; #line 809 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (IS_VIDEO (self)); -#line 7486 "VideoSupport.c" +#line 7726 "VideoSupport.c" { VideoRow* _tmp0_; #line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->backing_row; #line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 7493 "VideoSupport.c" +#line 7733 "VideoSupport.c" { VideoRow* _tmp1_; gint _tmp2_; @@ -7512,18 +7752,18 @@ void video_get_frame_dimensions (Video* self, Dimensions* result) { dimensions_init (&_tmp5_, _tmp2_, _tmp4_); #line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala" *result = _tmp5_; -#line 7512 "VideoSupport.c" +#line 7752 "VideoSupport.c" { VideoRow* _tmp6_; #line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp6_ = self->priv->backing_row; #line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 7519 "VideoSupport.c" +#line 7759 "VideoSupport.c" } #line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 7523 "VideoSupport.c" +#line 7763 "VideoSupport.c" } __finally536: { @@ -7532,7 +7772,7 @@ void video_get_frame_dimensions (Video* self, Dimensions* result) { _tmp7_ = self->priv->backing_row; #line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 7532 "VideoSupport.c" +#line 7772 "VideoSupport.c" } #line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7540,12 +7780,16 @@ void video_get_frame_dimensions (Video* self, Dimensions* result) { g_clear_error (&_inner_error_); #line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 7540 "VideoSupport.c" +#line 7780 "VideoSupport.c" } } -static void video_real_get_dimensions (MediaSource* base, PhotoException disallowed_steps, Dimensions* result) { +static void +video_real_get_dimensions (MediaSource* base, + PhotoException disallowed_steps, + Dimensions* result) +{ Video * self; Dimensions _tmp0_ = {0}; #line 815 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -7556,33 +7800,34 @@ static void video_real_get_dimensions (MediaSource* base, PhotoException disallo *result = _tmp0_; #line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 7556 "VideoSupport.c" +#line 7800 "VideoSupport.c" } -static guint64 video_real_get_filesize (MediaSource* base) { +static guint64 +video_real_get_filesize (MediaSource* base) +{ Video * self; guint64 result = 0ULL; - guint64 _tmp0_; #line 819 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); #line 820 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 820 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp0_; + result = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 820 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 7572 "VideoSupport.c" +#line 7815 "VideoSupport.c" } -static guint64 video_real_get_master_filesize (MediaSource* base) { +static guint64 +video_real_get_master_filesize (MediaSource* base) +{ Video * self; guint64 result = 0ULL; GError * _inner_error_ = NULL; #line 823 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); -#line 7582 "VideoSupport.c" +#line 7827 "VideoSupport.c" { VideoRow* _tmp0_; guint64 _tmp5_ = 0ULL; @@ -7590,7 +7835,7 @@ static guint64 video_real_get_master_filesize (MediaSource* base) { _tmp0_ = self->priv->backing_row; #line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 7590 "VideoSupport.c" +#line 7835 "VideoSupport.c" { VideoRow* _tmp1_; gint64 _tmp2_; @@ -7600,18 +7845,18 @@ static guint64 video_real_get_master_filesize (MediaSource* base) { _tmp2_ = _tmp1_->filesize; #line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = (guint64) _tmp2_; -#line 7600 "VideoSupport.c" +#line 7845 "VideoSupport.c" { VideoRow* _tmp3_; #line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp3_ = self->priv->backing_row; #line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 7607 "VideoSupport.c" +#line 7852 "VideoSupport.c" } #line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 7611 "VideoSupport.c" +#line 7856 "VideoSupport.c" } __finally537: { @@ -7620,7 +7865,7 @@ static guint64 video_real_get_master_filesize (MediaSource* base) { _tmp4_ = self->priv->backing_row; #line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 7620 "VideoSupport.c" +#line 7865 "VideoSupport.c" } #line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7628,18 +7873,20 @@ static guint64 video_real_get_master_filesize (MediaSource* base) { g_clear_error (&_inner_error_); #line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala" return _tmp5_; -#line 7628 "VideoSupport.c" +#line 7873 "VideoSupport.c" } } -static time_t video_real_get_timestamp (MediaSource* base) { +static time_t +video_real_get_timestamp (MediaSource* base) +{ Video * self; time_t result = 0; GError * _inner_error_ = NULL; #line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); -#line 7639 "VideoSupport.c" +#line 7886 "VideoSupport.c" { VideoRow* _tmp0_; time_t _tmp5_ = 0; @@ -7647,7 +7894,7 @@ static time_t video_real_get_timestamp (MediaSource* base) { _tmp0_ = self->priv->backing_row; #line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 7647 "VideoSupport.c" +#line 7894 "VideoSupport.c" { VideoRow* _tmp1_; time_t _tmp2_; @@ -7657,18 +7904,18 @@ static time_t video_real_get_timestamp (MediaSource* base) { _tmp2_ = _tmp1_->timestamp; #line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = _tmp2_; -#line 7657 "VideoSupport.c" +#line 7904 "VideoSupport.c" { VideoRow* _tmp3_; #line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp3_ = self->priv->backing_row; #line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 7664 "VideoSupport.c" +#line 7911 "VideoSupport.c" } #line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 7668 "VideoSupport.c" +#line 7915 "VideoSupport.c" } __finally538: { @@ -7677,7 +7924,7 @@ static time_t video_real_get_timestamp (MediaSource* base) { _tmp4_ = self->priv->backing_row; #line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 7677 "VideoSupport.c" +#line 7924 "VideoSupport.c" } #line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7685,120 +7932,120 @@ static time_t video_real_get_timestamp (MediaSource* base) { g_clear_error (&_inner_error_); #line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala" return _tmp5_; -#line 7685 "VideoSupport.c" +#line 7932 "VideoSupport.c" } } -static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info) { +static void +video_real_set_master_timestamp (Monitorable* base, + GFileInfo* info) +{ Video * self; GTimeVal time_val = {0}; - GFileInfo* _tmp0_; - GTimeVal _tmp1_ = {0}; + GTimeVal _tmp0_ = {0}; + Alteration* _tmp18_; Alteration* _tmp19_; - Alteration* _tmp20_; GError * _inner_error_ = NULL; #line 835 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); #line 835 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 836 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = info; -#line 836 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_file_info_get_modification_time (_tmp0_, &_tmp1_); + g_file_info_get_modification_time (info, &_tmp0_); #line 836 "/home/jens/Source/shotwell/src/VideoSupport.vala" - time_val = _tmp1_; -#line 7708 "VideoSupport.c" + time_val = _tmp0_; +#line 7955 "VideoSupport.c" { { - VideoRow* _tmp2_; + VideoRow* _tmp1_; #line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = self->priv->backing_row; + _tmp1_ = self->priv->backing_row; #line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 7716 "VideoSupport.c" +#line 7963 "VideoSupport.c" { - VideoRow* _tmp3_; - time_t _tmp4_; - GTimeVal _tmp5_; - glong _tmp6_; + VideoRow* _tmp2_; + time_t _tmp3_; + GTimeVal _tmp4_; + glong _tmp5_; + VideoTable* _tmp7_; VideoTable* _tmp8_; - VideoTable* _tmp9_; - VideoRow* _tmp10_; - VideoID _tmp11_; - GTimeVal _tmp12_; - glong _tmp13_; - VideoRow* _tmp14_; - GTimeVal _tmp15_; - glong _tmp16_; + VideoRow* _tmp9_; + VideoID _tmp10_; + GTimeVal _tmp11_; + glong _tmp12_; + VideoRow* _tmp13_; + GTimeVal _tmp14_; + glong _tmp15_; #line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = self->priv->backing_row; + _tmp2_ = self->priv->backing_row; #line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = _tmp3_->timestamp; + _tmp3_ = _tmp2_->timestamp; #line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = time_val; + _tmp4_ = time_val; #line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = _tmp5_.tv_sec; + _tmp5_ = _tmp4_.tv_sec; #line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp4_ == ((time_t) _tmp6_)) { -#line 7741 "VideoSupport.c" + if (_tmp3_ == ((time_t) _tmp5_)) { +#line 7988 "VideoSupport.c" { - VideoRow* _tmp7_; + VideoRow* _tmp6_; #line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = self->priv->backing_row; + _tmp6_ = self->priv->backing_row; #line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 7748 "VideoSupport.c" +#line 7995 "VideoSupport.c" } #line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 7752 "VideoSupport.c" +#line 7999 "VideoSupport.c" } #line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = video_table_get_instance (); + _tmp7_ = video_table_get_instance (); #line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = self->priv->backing_row; + _tmp9_ = self->priv->backing_row; #line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = _tmp10_->video_id; + _tmp10_ = _tmp9_->video_id; #line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = time_val; + _tmp11_ = time_val; #line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp13_ = _tmp12_.tv_sec; + _tmp12_ = _tmp11_.tv_sec; #line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_table_set_timestamp (_tmp9_, &_tmp11_, (time_t) _tmp13_, &_inner_error_); + video_table_set_timestamp (_tmp8_, &_tmp10_, (time_t) _tmp12_, &_inner_error_); #line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _database_table_unref0 (_tmp9_); + _database_table_unref0 (_tmp8_); #line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7772 "VideoSupport.c" +#line 8019 "VideoSupport.c" goto __finally540; } #line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp14_ = self->priv->backing_row; + _tmp13_ = self->priv->backing_row; #line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp15_ = time_val; + _tmp14_ = time_val; #line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp16_ = _tmp15_.tv_sec; + _tmp15_ = _tmp14_.tv_sec; #line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp14_->timestamp = (time_t) _tmp16_; -#line 7783 "VideoSupport.c" + _tmp13_->timestamp = (time_t) _tmp15_; +#line 8030 "VideoSupport.c" } __finally540: { - VideoRow* _tmp17_; + VideoRow* _tmp16_; #line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp17_ = self->priv->backing_row; + _tmp16_ = self->priv->backing_row; #line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 7792 "VideoSupport.c" +#line 8039 "VideoSupport.c" } #line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 7798 "VideoSupport.c" +#line 8045 "VideoSupport.c" goto __catch539_database_error; } #line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -7807,7 +8054,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info) g_clear_error (&_inner_error_); #line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 7807 "VideoSupport.c" +#line 8054 "VideoSupport.c" } } } @@ -7815,20 +8062,20 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info) __catch539_database_error: { GError* err = NULL; - GError* _tmp18_; + GError* _tmp17_; #line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala" err = _inner_error_; #line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala" _inner_error_ = NULL; #line 847 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp18_ = err; + _tmp17_ = err; #line 847 "/home/jens/Source/shotwell/src/VideoSupport.vala" - app_window_database_error (_tmp18_); + app_window_database_error (_tmp17_); #line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_error_free0 (err); #line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 7828 "VideoSupport.c" +#line 8075 "VideoSupport.c" } __finally539: #line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -7839,33 +8086,35 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info) g_clear_error (&_inner_error_); #line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 7839 "VideoSupport.c" +#line 8086 "VideoSupport.c" } #line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp19_ = alteration_new ("metadata", "master-timestamp"); + _tmp18_ = alteration_new ("metadata", "master-timestamp"); #line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp19_); #line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _alteration_unref0 (_tmp20_); -#line 7849 "VideoSupport.c" + _alteration_unref0 (_tmp19_); +#line 8096 "VideoSupport.c" } -gchar* video_get_filename (Video* self) { +gchar* +video_get_filename (Video* self) +{ gchar* result = NULL; GError * _inner_error_ = NULL; #line 855 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (IS_VIDEO (self), NULL); -#line 7858 "VideoSupport.c" +#line 8107 "VideoSupport.c" { VideoRow* _tmp0_; #line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->backing_row; #line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 7865 "VideoSupport.c" +#line 8114 "VideoSupport.c" { VideoRow* _tmp1_; const gchar* _tmp2_; @@ -7878,18 +8127,18 @@ gchar* video_get_filename (Video* self) { _tmp3_ = g_strdup (_tmp2_); #line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = _tmp3_; -#line 7878 "VideoSupport.c" +#line 8127 "VideoSupport.c" { VideoRow* _tmp4_; #line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp4_ = self->priv->backing_row; #line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 7885 "VideoSupport.c" +#line 8134 "VideoSupport.c" } #line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 7889 "VideoSupport.c" +#line 8138 "VideoSupport.c" } __finally541: { @@ -7898,7 +8147,7 @@ gchar* video_get_filename (Video* self) { _tmp5_ = self->priv->backing_row; #line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 7898 "VideoSupport.c" +#line 8147 "VideoSupport.c" } #line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7906,12 +8155,14 @@ gchar* video_get_filename (Video* self) { g_clear_error (&_inner_error_); #line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 7906 "VideoSupport.c" +#line 8155 "VideoSupport.c" } } -static GFile* video_real_get_file (MediaSource* base) { +static GFile* +video_real_get_file (MediaSource* base) +{ Video * self; GFile* result = NULL; gchar* _tmp0_; @@ -7934,11 +8185,13 @@ static GFile* video_real_get_file (MediaSource* base) { result = _tmp3_; #line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 7934 "VideoSupport.c" +#line 8185 "VideoSupport.c" } -static GFile* video_real_get_master_file (MediaSource* base) { +static GFile* +video_real_get_master_file (MediaSource* base) +{ Video * self; GFile* result = NULL; GFile* _tmp0_; @@ -7950,17 +8203,20 @@ static GFile* video_real_get_master_file (MediaSource* base) { result = _tmp0_; #line 866 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 7950 "VideoSupport.c" +#line 8203 "VideoSupport.c" } -void video_export (Video* self, GFile* dest_file, GError** error) { +void +video_export (Video* self, + GFile* dest_file, + GError** error) +{ GFile* source_file = NULL; gchar* _tmp0_; gchar* _tmp1_; GFile* _tmp2_; GFile* _tmp3_; - GFile* _tmp4_; GError * _inner_error_ = NULL; #line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (IS_VIDEO (self)); @@ -7979,9 +8235,7 @@ void video_export (Video* self, GFile* dest_file, GError** error) { #line 870 "/home/jens/Source/shotwell/src/VideoSupport.vala" source_file = _tmp3_; #line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = dest_file; -#line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_file_copy (source_file, _tmp4_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_); + g_file_copy (source_file, dest_file, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_); #line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -7990,20 +8244,22 @@ void video_export (Video* self, GFile* dest_file, GError** error) { _g_object_unref0 (source_file); #line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 7990 "VideoSupport.c" +#line 8244 "VideoSupport.c" } #line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (source_file); -#line 7994 "VideoSupport.c" +#line 8248 "VideoSupport.c" } -gdouble video_get_clip_duration (Video* self) { +gdouble +video_get_clip_duration (Video* self) +{ gdouble result = 0.0; GError * _inner_error_ = NULL; #line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (IS_VIDEO (self), 0.0); -#line 8003 "VideoSupport.c" +#line 8259 "VideoSupport.c" { VideoRow* _tmp0_; gdouble _tmp5_ = 0.0; @@ -8011,7 +8267,7 @@ gdouble video_get_clip_duration (Video* self) { _tmp0_ = self->priv->backing_row; #line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 8011 "VideoSupport.c" +#line 8267 "VideoSupport.c" { VideoRow* _tmp1_; gdouble _tmp2_; @@ -8021,18 +8277,18 @@ gdouble video_get_clip_duration (Video* self) { _tmp2_ = _tmp1_->clip_duration; #line 877 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = _tmp2_; -#line 8021 "VideoSupport.c" +#line 8277 "VideoSupport.c" { VideoRow* _tmp3_; #line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp3_ = self->priv->backing_row; #line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 8028 "VideoSupport.c" +#line 8284 "VideoSupport.c" } #line 877 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 8032 "VideoSupport.c" +#line 8288 "VideoSupport.c" } __finally542: { @@ -8041,7 +8297,7 @@ gdouble video_get_clip_duration (Video* self) { _tmp4_ = self->priv->backing_row; #line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 8041 "VideoSupport.c" +#line 8297 "VideoSupport.c" } #line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8049,17 +8305,19 @@ gdouble video_get_clip_duration (Video* self) { g_clear_error (&_inner_error_); #line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala" return _tmp5_; -#line 8049 "VideoSupport.c" +#line 8305 "VideoSupport.c" } } -gboolean video_get_is_interpretable (Video* self) { +gboolean +video_get_is_interpretable (Video* self) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (IS_VIDEO (self), FALSE); -#line 8059 "VideoSupport.c" +#line 8317 "VideoSupport.c" { VideoRow* _tmp0_; gboolean _tmp5_ = FALSE; @@ -8067,7 +8325,7 @@ gboolean video_get_is_interpretable (Video* self) { _tmp0_ = self->priv->backing_row; #line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 8067 "VideoSupport.c" +#line 8325 "VideoSupport.c" { VideoRow* _tmp1_; gboolean _tmp2_; @@ -8077,18 +8335,18 @@ gboolean video_get_is_interpretable (Video* self) { _tmp2_ = _tmp1_->is_interpretable; #line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = _tmp2_; -#line 8077 "VideoSupport.c" +#line 8335 "VideoSupport.c" { VideoRow* _tmp3_; #line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp3_ = self->priv->backing_row; #line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 8084 "VideoSupport.c" +#line 8342 "VideoSupport.c" } #line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 8088 "VideoSupport.c" +#line 8346 "VideoSupport.c" } __finally543: { @@ -8097,7 +8355,7 @@ gboolean video_get_is_interpretable (Video* self) { _tmp4_ = self->priv->backing_row; #line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 8097 "VideoSupport.c" +#line 8355 "VideoSupport.c" } #line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8105,66 +8363,63 @@ gboolean video_get_is_interpretable (Video* self) { g_clear_error (&_inner_error_); #line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala" return _tmp5_; -#line 8105 "VideoSupport.c" +#line 8363 "VideoSupport.c" } } -static void video_set_is_interpretable (Video* self, gboolean is_interpretable) { +static void +video_set_is_interpretable (Video* self, + gboolean is_interpretable) +{ GError * _inner_error_ = NULL; #line 887 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (IS_VIDEO (self)); -#line 8114 "VideoSupport.c" +#line 8375 "VideoSupport.c" { VideoRow* _tmp0_; #line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->backing_row; #line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 8121 "VideoSupport.c" +#line 8382 "VideoSupport.c" { VideoRow* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; - VideoRow* _tmp5_; - gboolean _tmp6_; + VideoRow* _tmp4_; #line 889 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp1_ = self->priv->backing_row; #line 889 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp2_ = _tmp1_->is_interpretable; #line 889 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = is_interpretable; -#line 889 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp2_ == _tmp3_) { -#line 8136 "VideoSupport.c" + if (_tmp2_ == is_interpretable) { +#line 8393 "VideoSupport.c" { - VideoRow* _tmp4_; + VideoRow* _tmp3_; #line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = self->priv->backing_row; + _tmp3_ = self->priv->backing_row; #line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 8143 "VideoSupport.c" +#line 8400 "VideoSupport.c" } #line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 8147 "VideoSupport.c" +#line 8404 "VideoSupport.c" } #line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = self->priv->backing_row; -#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = is_interpretable; + _tmp4_ = self->priv->backing_row; #line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_->is_interpretable = _tmp6_; -#line 8155 "VideoSupport.c" + _tmp4_->is_interpretable = is_interpretable; +#line 8410 "VideoSupport.c" } __finally544: { - VideoRow* _tmp7_; + VideoRow* _tmp5_; #line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = self->priv->backing_row; + _tmp5_ = self->priv->backing_row; #line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 8164 "VideoSupport.c" +#line 8419 "VideoSupport.c" } #line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -8174,31 +8429,28 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable) g_clear_error (&_inner_error_); #line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 8174 "VideoSupport.c" +#line 8429 "VideoSupport.c" } } { - VideoTable* _tmp8_; - VideoTable* _tmp9_; - VideoID _tmp10_ = {0}; - gboolean _tmp11_; + VideoTable* _tmp6_; + VideoTable* _tmp7_; + VideoID _tmp8_ = {0}; #line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = video_table_get_instance (); + _tmp6_ = video_table_get_instance (); #line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = _tmp8_; -#line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_get_video_id (self, &_tmp10_); + _tmp7_ = _tmp6_; #line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = is_interpretable; + video_get_video_id (self, &_tmp8_); #line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_table_update_is_interpretable (_tmp9_, &_tmp10_, _tmp11_, &_inner_error_); + video_table_update_is_interpretable (_tmp7_, &_tmp8_, is_interpretable, &_inner_error_); #line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _database_table_unref0 (_tmp9_); + _database_table_unref0 (_tmp7_); #line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 8198 "VideoSupport.c" +#line 8450 "VideoSupport.c" goto __catch545_database_error; } #line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -8207,25 +8459,25 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable) g_clear_error (&_inner_error_); #line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 8207 "VideoSupport.c" +#line 8459 "VideoSupport.c" } } goto __finally545; __catch545_database_error: { GError* e = NULL; - GError* _tmp12_; + GError* _tmp9_; #line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala" e = _inner_error_; #line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala" _inner_error_ = NULL; #line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = e; + _tmp9_ = e; #line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala" - app_window_database_error (_tmp12_); + app_window_database_error (_tmp9_); #line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_error_free0 (e); -#line 8225 "VideoSupport.c" +#line 8477 "VideoSupport.c" } __finally545: #line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -8236,12 +8488,14 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable) g_clear_error (&_inner_error_); #line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 8236 "VideoSupport.c" +#line 8488 "VideoSupport.c" } } -VideoInterpretableResults* video_check_is_interpretable (Video* self) { +VideoInterpretableResults* +video_check_is_interpretable (Video* self) +{ VideoInterpretableResults* result = NULL; VideoInterpretableResults* results = NULL; VideoInterpretableResults* _tmp0_; @@ -8252,16 +8506,15 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) { GFile* _tmp2_; VideoReader* _tmp3_; VideoReader* _tmp4_; - gboolean _tmp13_; - GFile* _tmp16_; - GFile* _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; - VideoInterpretableResults* _tmp24_; - VideoInterpretableResults* _tmp25_; - VideoInterpretableResults* _tmp26_; - GdkPixbuf* _tmp27_; - GdkPixbuf* _tmp28_; + GFile* _tmp13_; + GFile* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + VideoInterpretableResults* _tmp21_; + VideoInterpretableResults* _tmp22_; + VideoInterpretableResults* _tmp23_; + GdkPixbuf* _tmp24_; + GdkPixbuf* _tmp25_; GError * _inner_error_ = NULL; #line 905 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (IS_VIDEO (self), NULL); @@ -8285,24 +8538,21 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) { _g_object_unref0 (_tmp2_); #line 911 "/home/jens/Source/shotwell/src/VideoSupport.vala" backing_file_reader = _tmp4_; -#line 8285 "VideoSupport.c" +#line 8538 "VideoSupport.c" { gdouble _tmp5_ = 0.0; VideoReader* _tmp6_; - gdouble _tmp7_; - VideoReader* _tmp8_; - GdkPixbuf* _tmp9_; + VideoReader* _tmp7_; + GdkPixbuf* _tmp8_; #line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp6_ = backing_file_reader; #line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = video_reader_read_clip_duration (_tmp6_, &_inner_error_); -#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = _tmp7_; + _tmp5_ = video_reader_read_clip_duration (_tmp6_, &_inner_error_); #line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_inner_error_->domain == VIDEO_ERROR) { -#line 8302 "VideoSupport.c" +#line 8552 "VideoSupport.c" goto __catch546_video_error; } #line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -8317,41 +8567,38 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) { g_clear_error (&_inner_error_); #line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 8317 "VideoSupport.c" +#line 8567 "VideoSupport.c" } #line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala" clip_duration = _tmp5_; #line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = backing_file_reader; + _tmp7_ = backing_file_reader; #line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = video_reader_read_preview_frame (_tmp8_); + _tmp8_ = video_reader_read_preview_frame (_tmp7_); #line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (preview_frame); #line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala" - preview_frame = _tmp9_; -#line 8329 "VideoSupport.c" + preview_frame = _tmp8_; +#line 8579 "VideoSupport.c" } goto __finally546; __catch546_video_error: { GError* e = NULL; + VideoInterpretableResults* _tmp9_; VideoInterpretableResults* _tmp10_; - gboolean _tmp11_; - VideoInterpretableResults* _tmp12_; #line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala" e = _inner_error_; #line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala" _inner_error_ = NULL; #line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = results; -#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = video_get_is_interpretable (self); + _tmp9_ = results; #line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_->update_interpretable = _tmp11_; + _tmp9_->update_interpretable = video_get_is_interpretable (self); #line 919 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = results; + _tmp10_ = results; #line 919 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_->is_interpretable = FALSE; + _tmp10_->is_interpretable = FALSE; #line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = results; #line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -8362,7 +8609,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) { _g_object_unref0 (preview_frame); #line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 8362 "VideoSupport.c" +#line 8609 "VideoSupport.c" } __finally546: #line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -8379,23 +8626,21 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) { g_clear_error (&_inner_error_); #line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 8379 "VideoSupport.c" +#line 8626 "VideoSupport.c" } #line 925 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp13_ = video_get_is_interpretable (self); -#line 925 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp13_) { -#line 8385 "VideoSupport.c" - VideoInterpretableResults* _tmp14_; - VideoInterpretableResults* _tmp15_; + if (video_get_is_interpretable (self)) { +#line 8630 "VideoSupport.c" + VideoInterpretableResults* _tmp11_; + VideoInterpretableResults* _tmp12_; #line 926 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp14_ = results; + _tmp11_ = results; #line 926 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp14_->update_interpretable = FALSE; + _tmp11_->update_interpretable = FALSE; #line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp15_ = results; + _tmp12_ = results; #line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp15_->is_interpretable = TRUE; + _tmp12_->is_interpretable = TRUE; #line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = results; #line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -8404,49 +8649,49 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) { _g_object_unref0 (preview_frame); #line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 8404 "VideoSupport.c" +#line 8649 "VideoSupport.c" } #line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp16_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp13_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp17_ = _tmp16_; + _tmp14_ = _tmp13_; #line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp18_ = g_file_get_basename (_tmp17_); + _tmp15_ = g_file_get_basename (_tmp14_); #line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp19_ = _tmp18_; + _tmp16_ = _tmp15_; #line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_debug ("VideoSupport.vala:932: video %s has become interpretable", _tmp19_); + g_debug ("VideoSupport.vala:932: video %s has become interpretable", _tmp16_); #line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp19_); + _g_free0 (_tmp16_); #line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_object_unref0 (_tmp17_); -#line 8420 "VideoSupport.c" + _g_object_unref0 (_tmp14_); +#line 8665 "VideoSupport.c" { - VideoRow* _tmp20_; + VideoRow* _tmp17_; #line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp20_ = self->priv->backing_row; + _tmp17_ = self->priv->backing_row; #line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 8427 "VideoSupport.c" +#line 8672 "VideoSupport.c" { - VideoRow* _tmp21_; - gdouble _tmp22_; + VideoRow* _tmp18_; + gdouble _tmp19_; #line 936 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp21_ = self->priv->backing_row; + _tmp18_ = self->priv->backing_row; #line 936 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp22_ = clip_duration; + _tmp19_ = clip_duration; #line 936 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp21_->clip_duration = _tmp22_; -#line 8437 "VideoSupport.c" + _tmp18_->clip_duration = _tmp19_; +#line 8682 "VideoSupport.c" } __finally547: { - VideoRow* _tmp23_; + VideoRow* _tmp20_; #line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp23_ = self->priv->backing_row; + _tmp20_ = self->priv->backing_row; #line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 8446 "VideoSupport.c" +#line 8691 "VideoSupport.c" } #line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -8462,27 +8707,27 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) { g_clear_error (&_inner_error_); #line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 8462 "VideoSupport.c" +#line 8707 "VideoSupport.c" } } #line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp24_ = results; + _tmp21_ = results; #line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp24_->update_interpretable = TRUE; + _tmp21_->update_interpretable = TRUE; #line 940 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp25_ = results; + _tmp22_ = results; #line 940 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp25_->is_interpretable = TRUE; + _tmp22_->is_interpretable = TRUE; #line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp26_ = results; + _tmp23_ = results; #line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp27_ = preview_frame; + _tmp24_ = preview_frame; #line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp28_ = _g_object_ref0 (_tmp27_); + _tmp25_ = _g_object_ref0 (_tmp24_); #line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_object_unref0 (_tmp26_->new_thumbnail); + _g_object_unref0 (_tmp23_->new_thumbnail); #line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp26_->new_thumbnail = _tmp28_; + _tmp23_->new_thumbnail = _tmp25_; #line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = results; #line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -8491,11 +8736,13 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) { _g_object_unref0 (preview_frame); #line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 8491 "VideoSupport.c" +#line 8736 "VideoSupport.c" } -static void video_real_destroy (DataSource* base) { +static void +video_real_destroy (DataSource* base) +{ Video * self; VideoID video_id = {0}; VideoID _tmp0_ = {0}; @@ -8508,7 +8755,7 @@ static void video_real_destroy (DataSource* base) { video_id = _tmp0_; #line 949 "/home/jens/Source/shotwell/src/VideoSupport.vala" thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 8508 "VideoSupport.c" +#line 8755 "VideoSupport.c" { VideoTable* _tmp1_; VideoTable* _tmp2_; @@ -8527,7 +8774,7 @@ static void video_real_destroy (DataSource* base) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 8527 "VideoSupport.c" +#line 8774 "VideoSupport.c" goto __catch548_database_error; } #line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -8536,7 +8783,7 @@ static void video_real_destroy (DataSource* base) { g_clear_error (&_inner_error_); #line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 8536 "VideoSupport.c" +#line 8783 "VideoSupport.c" } } goto __finally548; @@ -8559,7 +8806,7 @@ static void video_real_destroy (DataSource* base) { _g_free0 (_tmp5_); #line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_error_free0 (err); -#line 8559 "VideoSupport.c" +#line 8806 "VideoSupport.c" } __finally548: #line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -8570,66 +8817,65 @@ static void video_real_destroy (DataSource* base) { g_clear_error (&_inner_error_); #line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 8570 "VideoSupport.c" +#line 8817 "VideoSupport.c" } #line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala" DATA_SOURCE_CLASS (video_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_VIDEO_SOURCE, VideoSource), TYPE_DATA_SOURCE, DataSource)); -#line 8574 "VideoSupport.c" +#line 8821 "VideoSupport.c" } -static gboolean video_real_internal_delete_backing (DataSource* base, GError** error) { +static gboolean +video_real_internal_delete_backing (DataSource* base, + GError** error) +{ Video * self; gboolean result = FALSE; gboolean ret = FALSE; - gboolean _tmp0_; + gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_; GError * _inner_error_ = NULL; #line 960 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); #line 961 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 961 "/home/jens/Source/shotwell/src/VideoSupport.vala" - ret = _tmp0_; + ret = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = DATA_SOURCE_CLASS (video_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_VIDEO_SOURCE, VideoSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_); -#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = _tmp3_; + _tmp1_ = DATA_SOURCE_CLASS (video_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_VIDEO_SOURCE, VideoSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_); #line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8599 "VideoSupport.c" - gboolean _tmp4_ = FALSE; +#line 8843 "VideoSupport.c" + gboolean _tmp2_ = FALSE; #line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_propagate_error (error, _inner_error_); #line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala" - return _tmp4_; -#line 8605 "VideoSupport.c" + return _tmp2_; +#line 8849 "VideoSupport.c" } #line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp2_) { + if (_tmp1_) { #line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = ret; -#line 8611 "VideoSupport.c" + _tmp0_ = ret; +#line 8855 "VideoSupport.c" } else { #line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = FALSE; -#line 8615 "VideoSupport.c" + _tmp0_ = FALSE; +#line 8859 "VideoSupport.c" } #line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp1_; + result = _tmp0_; #line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 8621 "VideoSupport.c" +#line 8865 "VideoSupport.c" } -static void video_notify_flags_altered (Video* self, Alteration* additional_alteration) { +static void +video_notify_flags_altered (Video* self, + Alteration* additional_alteration) +{ Alteration* alteration = NULL; Alteration* _tmp0_; - Alteration* _tmp1_; - Alteration* _tmp5_; + Alteration* _tmp3_; #line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (IS_VIDEO (self)); #line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -8639,581 +8885,562 @@ static void video_notify_flags_altered (Video* self, Alteration* additional_alte #line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala" alteration = _tmp0_; #line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = additional_alteration; -#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp1_ != NULL) { -#line 8642 "VideoSupport.c" + if (additional_alteration != NULL) { +#line 8886 "VideoSupport.c" + Alteration* _tmp1_; Alteration* _tmp2_; - Alteration* _tmp3_; - Alteration* _tmp4_; #line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = alteration; + _tmp1_ = alteration; #line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = additional_alteration; -#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = alteration_compress (_tmp2_, _tmp3_); + _tmp2_ = alteration_compress (_tmp1_, additional_alteration); #line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala" _alteration_unref0 (alteration); #line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala" - alteration = _tmp4_; -#line 8656 "VideoSupport.c" + alteration = _tmp2_; +#line 8897 "VideoSupport.c" } #line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = alteration; + _tmp3_ = alteration; #line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp3_); #line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala" _alteration_unref0 (alteration); -#line 8664 "VideoSupport.c" +#line 8905 "VideoSupport.c" } -guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* additional_alteration) { +guint64 +video_add_flags (Video* self, + guint64 flags_to_add, + Alteration* additional_alteration) +{ guint64 result = 0ULL; guint64 new_flags = 0ULL; - Alteration* _tmp27_; GError * _inner_error_ = NULL; #line 975 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (IS_VIDEO (self), 0ULL); #line 975 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL); -#line 8677 "VideoSupport.c" +#line 8921 "VideoSupport.c" { VideoRow* _tmp0_; #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->backing_row; #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 8684 "VideoSupport.c" +#line 8928 "VideoSupport.c" { VideoRow* _tmp1_; guint64 _tmp2_; - guint64 _tmp3_; + VideoRow* _tmp3_; guint64 _tmp4_; - VideoRow* _tmp5_; - guint64 _tmp6_; - guint64 _tmp7_; - VideoRow* _tmp23_; - guint64 _tmp24_; + guint64 _tmp5_; + VideoRow* _tmp21_; + guint64 _tmp22_; #line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp1_ = self->priv->backing_row; #line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp2_ = _tmp1_->flags; #line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = flags_to_add; -#line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = media_source_internal_add_flags (_tmp2_, _tmp3_); -#line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala" - new_flags = _tmp4_; + new_flags = media_source_internal_add_flags (_tmp2_, flags_to_add); #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = self->priv->backing_row; + _tmp3_ = self->priv->backing_row; #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = _tmp5_->flags; + _tmp4_ = _tmp3_->flags; #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = new_flags; + _tmp5_ = new_flags; #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp6_ == _tmp7_) { -#line 8713 "VideoSupport.c" - VideoRow* _tmp8_; - guint64 _tmp9_; + if (_tmp4_ == _tmp5_) { +#line 8951 "VideoSupport.c" + VideoRow* _tmp6_; + guint64 _tmp7_; #line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = self->priv->backing_row; + _tmp6_ = self->priv->backing_row; #line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = _tmp8_->flags; + _tmp7_ = _tmp6_->flags; #line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp9_; -#line 8722 "VideoSupport.c" + result = _tmp7_; +#line 8960 "VideoSupport.c" { - VideoRow* _tmp10_; + VideoRow* _tmp8_; #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = self->priv->backing_row; + _tmp8_ = self->priv->backing_row; #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 8729 "VideoSupport.c" +#line 8967 "VideoSupport.c" } #line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 8733 "VideoSupport.c" +#line 8971 "VideoSupport.c" } { - VideoTable* _tmp11_; - VideoTable* _tmp12_; - VideoID _tmp13_ = {0}; - guint64 _tmp14_; + VideoTable* _tmp9_; + VideoTable* _tmp10_; + VideoID _tmp11_ = {0}; + guint64 _tmp12_; #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = video_table_get_instance (); + _tmp9_ = video_table_get_instance (); #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_get_video_id (self, &_tmp13_); + video_get_video_id (self, &_tmp11_); #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp14_ = new_flags; + _tmp12_ = new_flags; #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_table_set_flags (_tmp12_, &_tmp13_, _tmp14_, &_inner_error_); + video_table_set_flags (_tmp10_, &_tmp11_, _tmp12_, &_inner_error_); #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _database_table_unref0 (_tmp12_); + _database_table_unref0 (_tmp10_); #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8754 "VideoSupport.c" - guint64 _tmp16_ = 0ULL; +#line 8992 "VideoSupport.c" + guint64 _tmp14_ = 0ULL; #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 8758 "VideoSupport.c" +#line 8996 "VideoSupport.c" goto __catch550_database_error; } { - VideoRow* _tmp15_; + VideoRow* _tmp13_; #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp15_ = self->priv->backing_row; + _tmp13_ = self->priv->backing_row; #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 8767 "VideoSupport.c" +#line 9005 "VideoSupport.c" } #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_clear_error (&_inner_error_); #line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala" - return _tmp16_; -#line 8775 "VideoSupport.c" + return _tmp14_; +#line 9013 "VideoSupport.c" } } goto __finally550; __catch550_database_error: { GError* e = NULL; - GError* _tmp17_; - VideoRow* _tmp18_; - guint64 _tmp19_; + GError* _tmp15_; + VideoRow* _tmp16_; + guint64 _tmp17_; #line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala" e = _inner_error_; #line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala" _inner_error_ = NULL; #line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp17_ = e; + _tmp15_ = e; #line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala" - app_window_database_error (_tmp17_); + app_window_database_error (_tmp15_); #line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp18_ = self->priv->backing_row; + _tmp16_ = self->priv->backing_row; #line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp19_ = _tmp18_->flags; + _tmp17_ = _tmp16_->flags; #line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp19_; + result = _tmp17_; #line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_error_free0 (e); -#line 8801 "VideoSupport.c" +#line 9039 "VideoSupport.c" { - VideoRow* _tmp20_; + VideoRow* _tmp18_; #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp20_ = self->priv->backing_row; + _tmp18_ = self->priv->backing_row; #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 8808 "VideoSupport.c" +#line 9046 "VideoSupport.c" } #line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 8812 "VideoSupport.c" +#line 9050 "VideoSupport.c" } __finally550: #line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8817 "VideoSupport.c" - guint64 _tmp22_ = 0ULL; +#line 9055 "VideoSupport.c" + guint64 _tmp20_ = 0ULL; { - VideoRow* _tmp21_; + VideoRow* _tmp19_; #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp21_ = self->priv->backing_row; + _tmp19_ = self->priv->backing_row; #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 8825 "VideoSupport.c" +#line 9063 "VideoSupport.c" } #line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_clear_error (&_inner_error_); #line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala" - return _tmp22_; -#line 8833 "VideoSupport.c" + return _tmp20_; +#line 9071 "VideoSupport.c" } #line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp23_ = self->priv->backing_row; + _tmp21_ = self->priv->backing_row; #line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp24_ = new_flags; + _tmp22_ = new_flags; #line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp23_->flags = _tmp24_; -#line 8841 "VideoSupport.c" + _tmp21_->flags = _tmp22_; +#line 9079 "VideoSupport.c" } __finally549: { - VideoRow* _tmp25_; + VideoRow* _tmp23_; #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp25_ = self->priv->backing_row; + _tmp23_ = self->priv->backing_row; #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 8850 "VideoSupport.c" +#line 9088 "VideoSupport.c" } #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8854 "VideoSupport.c" - guint64 _tmp26_ = 0ULL; +#line 9092 "VideoSupport.c" + guint64 _tmp24_ = 0ULL; #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_clear_error (&_inner_error_); #line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala" - return _tmp26_; -#line 8862 "VideoSupport.c" + return _tmp24_; +#line 9100 "VideoSupport.c" } } #line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp27_ = additional_alteration; -#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_notify_flags_altered (self, _tmp27_); + video_notify_flags_altered (self, additional_alteration); #line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = new_flags; #line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 8873 "VideoSupport.c" +#line 9109 "VideoSupport.c" } -guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* additional_alteration) { +guint64 +video_remove_flags (Video* self, + guint64 flags_to_remove, + Alteration* additional_alteration) +{ guint64 result = 0ULL; guint64 new_flags = 0ULL; - Alteration* _tmp27_; GError * _inner_error_ = NULL; #line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (IS_VIDEO (self), 0ULL); #line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL); -#line 8886 "VideoSupport.c" +#line 9125 "VideoSupport.c" { VideoRow* _tmp0_; #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->backing_row; #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 8893 "VideoSupport.c" +#line 9132 "VideoSupport.c" { VideoRow* _tmp1_; guint64 _tmp2_; - guint64 _tmp3_; + VideoRow* _tmp3_; guint64 _tmp4_; - VideoRow* _tmp5_; - guint64 _tmp6_; - guint64 _tmp7_; - VideoRow* _tmp23_; - guint64 _tmp24_; + guint64 _tmp5_; + VideoRow* _tmp21_; + guint64 _tmp22_; #line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp1_ = self->priv->backing_row; #line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp2_ = _tmp1_->flags; #line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = flags_to_remove; -#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = media_source_internal_remove_flags (_tmp2_, _tmp3_); -#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala" - new_flags = _tmp4_; + new_flags = media_source_internal_remove_flags (_tmp2_, flags_to_remove); #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = self->priv->backing_row; + _tmp3_ = self->priv->backing_row; #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = _tmp5_->flags; + _tmp4_ = _tmp3_->flags; #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = new_flags; + _tmp5_ = new_flags; #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp6_ == _tmp7_) { -#line 8922 "VideoSupport.c" - VideoRow* _tmp8_; - guint64 _tmp9_; + if (_tmp4_ == _tmp5_) { +#line 9155 "VideoSupport.c" + VideoRow* _tmp6_; + guint64 _tmp7_; #line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = self->priv->backing_row; + _tmp6_ = self->priv->backing_row; #line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = _tmp8_->flags; + _tmp7_ = _tmp6_->flags; #line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp9_; -#line 8931 "VideoSupport.c" + result = _tmp7_; +#line 9164 "VideoSupport.c" { - VideoRow* _tmp10_; + VideoRow* _tmp8_; #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = self->priv->backing_row; + _tmp8_ = self->priv->backing_row; #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 8938 "VideoSupport.c" +#line 9171 "VideoSupport.c" } #line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 8942 "VideoSupport.c" +#line 9175 "VideoSupport.c" } { - VideoTable* _tmp11_; - VideoTable* _tmp12_; - VideoID _tmp13_ = {0}; - guint64 _tmp14_; + VideoTable* _tmp9_; + VideoTable* _tmp10_; + VideoID _tmp11_ = {0}; + guint64 _tmp12_; #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = video_table_get_instance (); + _tmp9_ = video_table_get_instance (); #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_get_video_id (self, &_tmp13_); + video_get_video_id (self, &_tmp11_); #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp14_ = new_flags; + _tmp12_ = new_flags; #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_table_set_flags (_tmp12_, &_tmp13_, _tmp14_, &_inner_error_); + video_table_set_flags (_tmp10_, &_tmp11_, _tmp12_, &_inner_error_); #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _database_table_unref0 (_tmp12_); + _database_table_unref0 (_tmp10_); #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8963 "VideoSupport.c" - guint64 _tmp16_ = 0ULL; +#line 9196 "VideoSupport.c" + guint64 _tmp14_ = 0ULL; #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 8967 "VideoSupport.c" +#line 9200 "VideoSupport.c" goto __catch552_database_error; } { - VideoRow* _tmp15_; + VideoRow* _tmp13_; #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp15_ = self->priv->backing_row; + _tmp13_ = self->priv->backing_row; #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 8976 "VideoSupport.c" +#line 9209 "VideoSupport.c" } #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_clear_error (&_inner_error_); #line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala" - return _tmp16_; -#line 8984 "VideoSupport.c" + return _tmp14_; +#line 9217 "VideoSupport.c" } } goto __finally552; __catch552_database_error: { GError* e = NULL; - GError* _tmp17_; - VideoRow* _tmp18_; - guint64 _tmp19_; + GError* _tmp15_; + VideoRow* _tmp16_; + guint64 _tmp17_; #line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala" e = _inner_error_; #line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala" _inner_error_ = NULL; #line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp17_ = e; + _tmp15_ = e; #line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala" - app_window_database_error (_tmp17_); + app_window_database_error (_tmp15_); #line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp18_ = self->priv->backing_row; + _tmp16_ = self->priv->backing_row; #line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp19_ = _tmp18_->flags; + _tmp17_ = _tmp16_->flags; #line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp19_; + result = _tmp17_; #line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_error_free0 (e); -#line 9010 "VideoSupport.c" +#line 9243 "VideoSupport.c" { - VideoRow* _tmp20_; + VideoRow* _tmp18_; #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp20_ = self->priv->backing_row; + _tmp18_ = self->priv->backing_row; #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 9017 "VideoSupport.c" +#line 9250 "VideoSupport.c" } #line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 9021 "VideoSupport.c" +#line 9254 "VideoSupport.c" } __finally552: #line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9026 "VideoSupport.c" - guint64 _tmp22_ = 0ULL; +#line 9259 "VideoSupport.c" + guint64 _tmp20_ = 0ULL; { - VideoRow* _tmp21_; + VideoRow* _tmp19_; #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp21_ = self->priv->backing_row; + _tmp19_ = self->priv->backing_row; #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 9034 "VideoSupport.c" +#line 9267 "VideoSupport.c" } #line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_clear_error (&_inner_error_); #line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala" - return _tmp22_; -#line 9042 "VideoSupport.c" + return _tmp20_; +#line 9275 "VideoSupport.c" } #line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp23_ = self->priv->backing_row; + _tmp21_ = self->priv->backing_row; #line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp24_ = new_flags; + _tmp22_ = new_flags; #line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp23_->flags = _tmp24_; -#line 9050 "VideoSupport.c" + _tmp21_->flags = _tmp22_; +#line 9283 "VideoSupport.c" } __finally551: { - VideoRow* _tmp25_; + VideoRow* _tmp23_; #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp25_ = self->priv->backing_row; + _tmp23_ = self->priv->backing_row; #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 9059 "VideoSupport.c" +#line 9292 "VideoSupport.c" } #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9063 "VideoSupport.c" - guint64 _tmp26_ = 0ULL; +#line 9296 "VideoSupport.c" + guint64 _tmp24_ = 0ULL; #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_clear_error (&_inner_error_); #line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala" - return _tmp26_; -#line 9071 "VideoSupport.c" + return _tmp24_; +#line 9304 "VideoSupport.c" } } #line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp27_ = additional_alteration; -#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_notify_flags_altered (self, _tmp27_); + video_notify_flags_altered (self, additional_alteration); #line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala" result = new_flags; #line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 9082 "VideoSupport.c" +#line 9313 "VideoSupport.c" } -gboolean video_is_flag_set (Video* self, guint64 flag) { +gboolean +video_is_flag_set (Video* self, + guint64 flag) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (IS_VIDEO (self), FALSE); -#line 9091 "VideoSupport.c" +#line 9325 "VideoSupport.c" { VideoRow* _tmp0_; - gboolean _tmp7_ = FALSE; + gboolean _tmp5_ = FALSE; #line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->backing_row; #line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 9099 "VideoSupport.c" +#line 9333 "VideoSupport.c" { VideoRow* _tmp1_; guint64 _tmp2_; - guint64 _tmp3_; - gboolean _tmp4_; #line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp1_ = self->priv->backing_row; #line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp2_ = _tmp1_->flags; #line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = flag; -#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = media_source_internal_is_flag_set (_tmp2_, _tmp3_); -#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp4_; -#line 9115 "VideoSupport.c" + result = media_source_internal_is_flag_set (_tmp2_, flag); +#line 9343 "VideoSupport.c" { - VideoRow* _tmp5_; + VideoRow* _tmp3_; #line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = self->priv->backing_row; + _tmp3_ = self->priv->backing_row; #line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 9122 "VideoSupport.c" +#line 9350 "VideoSupport.c" } #line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 9126 "VideoSupport.c" +#line 9354 "VideoSupport.c" } __finally553: { - VideoRow* _tmp6_; + VideoRow* _tmp4_; #line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = self->priv->backing_row; + _tmp4_ = self->priv->backing_row; #line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 9135 "VideoSupport.c" +#line 9363 "VideoSupport.c" } #line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_clear_error (&_inner_error_); #line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala" - return _tmp7_; -#line 9143 "VideoSupport.c" + return _tmp5_; +#line 9371 "VideoSupport.c" } } -static void video_real_set_master_file (Monitorable* base, GFile* file) { +static void +video_real_set_master_file (Monitorable* base, + GFile* file) +{ Video * self; gchar* new_filepath = NULL; - GFile* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; gchar* old_filepath = NULL; + const gchar* _tmp19_; const gchar* _tmp20_; - const gchar* _tmp21_; + GFile* _tmp21_; GFile* _tmp22_; - GFile* _tmp23_; - GFile* _tmp24_; - Alteration* _tmp25_; - Alteration* _tmp26_; + Alteration* _tmp23_; + Alteration* _tmp24_; GError * _inner_error_ = NULL; #line 1025 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video); #line 1025 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (G_IS_FILE (file)); #line 1026 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = file; + _tmp0_ = g_file_get_path (file); #line 1026 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = g_file_get_path (_tmp0_); -#line 1026 "/home/jens/Source/shotwell/src/VideoSupport.vala" - new_filepath = _tmp1_; + new_filepath = _tmp0_; #line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala" old_filepath = NULL; -#line 9174 "VideoSupport.c" +#line 9401 "VideoSupport.c" { { - VideoRow* _tmp2_; + VideoRow* _tmp1_; #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = self->priv->backing_row; + _tmp1_ = self->priv->backing_row; #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_lock (&self->priv->__lock_backing_row); -#line 9182 "VideoSupport.c" +#line 9409 "VideoSupport.c" { - VideoRow* _tmp3_; + VideoRow* _tmp2_; + const gchar* _tmp3_; const gchar* _tmp4_; - const gchar* _tmp5_; - VideoRow* _tmp7_; - const gchar* _tmp8_; - gchar* _tmp9_; + VideoRow* _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_; + VideoTable* _tmp9_; VideoTable* _tmp10_; - VideoTable* _tmp11_; - VideoRow* _tmp12_; - VideoID _tmp13_; - const gchar* _tmp14_; - VideoRow* _tmp15_; - const gchar* _tmp16_; - gchar* _tmp17_; + VideoRow* _tmp11_; + VideoID _tmp12_; + const gchar* _tmp13_; + VideoRow* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; #line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = self->priv->backing_row; + _tmp2_ = self->priv->backing_row; #line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = _tmp3_->filepath; + _tmp3_ = _tmp2_->filepath; #line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = new_filepath; + _tmp4_ = new_filepath; #line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (g_strcmp0 (_tmp4_, _tmp5_) == 0) { -#line 9206 "VideoSupport.c" + if (g_strcmp0 (_tmp3_, _tmp4_) == 0) { +#line 9433 "VideoSupport.c" { - VideoRow* _tmp6_; + VideoRow* _tmp5_; #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = self->priv->backing_row; + _tmp5_ = self->priv->backing_row; #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 9213 "VideoSupport.c" +#line 9440 "VideoSupport.c" } #line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (old_filepath); @@ -9221,63 +9448,63 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) { _g_free0 (new_filepath); #line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 9221 "VideoSupport.c" +#line 9448 "VideoSupport.c" } #line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = self->priv->backing_row; + _tmp6_ = self->priv->backing_row; #line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = _tmp7_->filepath; + _tmp7_ = _tmp6_->filepath; #line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = g_strdup (_tmp8_); + _tmp8_ = g_strdup (_tmp7_); #line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (old_filepath); #line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala" - old_filepath = _tmp9_; + old_filepath = _tmp8_; #line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = video_table_get_instance (); + _tmp9_ = video_table_get_instance (); #line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = self->priv->backing_row; + _tmp11_ = self->priv->backing_row; #line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp13_ = _tmp12_->video_id; + _tmp12_ = _tmp11_->video_id; #line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp14_ = new_filepath; + _tmp13_ = new_filepath; #line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_table_set_filepath (_tmp11_, &_tmp13_, _tmp14_, &_inner_error_); + video_table_set_filepath (_tmp10_, &_tmp12_, _tmp13_, &_inner_error_); #line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _database_table_unref0 (_tmp11_); + _database_table_unref0 (_tmp10_); #line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9249 "VideoSupport.c" +#line 9476 "VideoSupport.c" goto __finally555; } #line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp15_ = self->priv->backing_row; + _tmp14_ = self->priv->backing_row; #line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp16_ = new_filepath; + _tmp15_ = new_filepath; #line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp17_ = g_strdup (_tmp16_); + _tmp16_ = g_strdup (_tmp15_); #line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_free0 (_tmp15_->filepath); + _g_free0 (_tmp14_->filepath); #line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp15_->filepath = _tmp17_; -#line 9262 "VideoSupport.c" + _tmp14_->filepath = _tmp16_; +#line 9489 "VideoSupport.c" } __finally555: { - VideoRow* _tmp18_; + VideoRow* _tmp17_; #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp18_ = self->priv->backing_row; + _tmp17_ = self->priv->backing_row; #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_unlock (&self->priv->__lock_backing_row); -#line 9271 "VideoSupport.c" +#line 9498 "VideoSupport.c" } #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 9277 "VideoSupport.c" +#line 9504 "VideoSupport.c" goto __catch554_database_error; } #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -9290,7 +9517,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) { g_clear_error (&_inner_error_); #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 9290 "VideoSupport.c" +#line 9517 "VideoSupport.c" } } } @@ -9298,15 +9525,15 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) { __catch554_database_error: { GError* err = NULL; - GError* _tmp19_; + GError* _tmp18_; #line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala" err = _inner_error_; #line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala" _inner_error_ = NULL; #line 1039 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp19_ = err; + _tmp18_ = err; #line 1039 "/home/jens/Source/shotwell/src/VideoSupport.vala" - app_window_database_error (_tmp19_); + app_window_database_error (_tmp18_); #line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_error_free0 (err); #line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -9315,7 +9542,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) { _g_free0 (new_filepath); #line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 9315 "VideoSupport.c" +#line 9542 "VideoSupport.c" } __finally554: #line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -9330,41 +9557,42 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) { g_clear_error (&_inner_error_); #line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 9330 "VideoSupport.c" +#line 9557 "VideoSupport.c" } #line 1044 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp20_ = old_filepath; + _tmp19_ = old_filepath; #line 1044 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _vala_assert (_tmp20_ != NULL, "old_filepath != null"); + _vala_assert (_tmp19_ != NULL, "old_filepath != null"); #line 1045 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp21_ = old_filepath; + _tmp20_ = old_filepath; #line 1045 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp22_ = g_file_new_for_path (_tmp21_); + _tmp21_ = g_file_new_for_path (_tmp20_); #line 1045 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp23_ = _tmp22_; -#line 1045 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp24_ = file; + _tmp22_ = _tmp21_; #line 1045 "/home/jens/Source/shotwell/src/VideoSupport.vala" - media_source_notify_master_replaced (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp23_, _tmp24_); + media_source_notify_master_replaced (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp22_, file); #line 1045 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp22_); #line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp25_ = alteration_new_from_list ("backing:master,metadata:name"); + _tmp23_ = alteration_new_from_list ("backing:master,metadata:name"); #line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp26_ = _tmp25_; + _tmp24_ = _tmp23_; #line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp26_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp24_); #line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _alteration_unref0 (_tmp26_); + _alteration_unref0 (_tmp24_); #line 1025 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (old_filepath); #line 1025 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_free0 (new_filepath); -#line 9360 "VideoSupport.c" +#line 9585 "VideoSupport.c" } -VideoMetadata* video_read_metadata (Video* self, GError** error) { +VideoMetadata* +video_read_metadata (Video* self, + GError** error) +{ VideoMetadata* result = NULL; VideoMetadata* _tmp0_ = NULL; GFile* _tmp1_; @@ -9401,7 +9629,7 @@ VideoMetadata* video_read_metadata (Video* self, GError** error) { g_propagate_error (error, _inner_error_); #line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 9401 "VideoSupport.c" +#line 9629 "VideoSupport.c" } #line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp7_ = _tmp0_; @@ -9413,40 +9641,44 @@ VideoMetadata* video_read_metadata (Video* self, GError** error) { _media_metadata_unref0 (_tmp0_); #line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 9413 "VideoSupport.c" +#line 9641 "VideoSupport.c" } -VideoInterpretableResults* video_interpretable_results_construct (GType object_type, Video* video) { +VideoInterpretableResults* +video_interpretable_results_construct (GType object_type, + Video* video) +{ VideoInterpretableResults* self = NULL; Video* _tmp0_; - Video* _tmp1_; #line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (IS_VIDEO (video), NULL); #line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = (VideoInterpretableResults*) g_type_create_instance (object_type); #line 337 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = video; -#line 337 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (video); #line 337 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (self->video); #line 337 "/home/jens/Source/shotwell/src/VideoSupport.vala" - self->video = _tmp1_; + self->video = _tmp0_; #line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala" return self; -#line 9435 "VideoSupport.c" +#line 9663 "VideoSupport.c" } -VideoInterpretableResults* video_interpretable_results_new (Video* video) { +VideoInterpretableResults* +video_interpretable_results_new (Video* video) +{ #line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala" return video_interpretable_results_construct (VIDEO_TYPE_INTERPRETABLE_RESULTS, video); -#line 9442 "VideoSupport.c" +#line 9672 "VideoSupport.c" } -void video_interpretable_results_foreground_finish (VideoInterpretableResults* self) { +void +video_interpretable_results_foreground_finish (VideoInterpretableResults* self) +{ gboolean _tmp0_; GdkPixbuf* _tmp3_; GError * _inner_error_ = NULL; @@ -9456,7 +9688,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s _tmp0_ = self->update_interpretable; #line 341 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_tmp0_) { -#line 9456 "VideoSupport.c" +#line 9688 "VideoSupport.c" Video* _tmp1_; gboolean _tmp2_; #line 342 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -9465,13 +9697,13 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s _tmp2_ = self->is_interpretable; #line 342 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_set_is_interpretable (_tmp1_, _tmp2_); -#line 9465 "VideoSupport.c" +#line 9697 "VideoSupport.c" } #line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp3_ = self->new_thumbnail; #line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_tmp3_ != NULL) { -#line 9471 "VideoSupport.c" +#line 9703 "VideoSupport.c" { Video* _tmp4_; GdkPixbuf* _tmp5_; @@ -9486,7 +9718,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s thumbnail_cache_replace (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), THUMBNAIL_CACHE_SIZE_BIG, _tmp5_, &_inner_error_); #line 346 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9486 "VideoSupport.c" +#line 9718 "VideoSupport.c" goto __catch556_g_error; } #line 347 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -9497,14 +9729,14 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s thumbnail_cache_replace (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), THUMBNAIL_CACHE_SIZE_MEDIUM, _tmp7_, &_inner_error_); #line 347 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9497 "VideoSupport.c" +#line 9729 "VideoSupport.c" goto __catch556_g_error; } #line 349 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp8_ = self->video; #line 349 "/home/jens/Source/shotwell/src/VideoSupport.vala" thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 9504 "VideoSupport.c" +#line 9736 "VideoSupport.c" } goto __finally556; __catch556_g_error: @@ -9535,7 +9767,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s _g_free0 (_tmp11_); #line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_error_free0 (err); -#line 9535 "VideoSupport.c" +#line 9767 "VideoSupport.c" } __finally556: #line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -9546,110 +9778,135 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s g_clear_error (&_inner_error_); #line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 9546 "VideoSupport.c" +#line 9778 "VideoSupport.c" } } } -static void video_value_interpretable_results_init (GValue* value) { +static void +video_value_interpretable_results_init (GValue* value) +{ #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" value->data[0].v_pointer = NULL; -#line 9555 "VideoSupport.c" +#line 9789 "VideoSupport.c" } -static void video_value_interpretable_results_free_value (GValue* value) { +static void +video_value_interpretable_results_free_value (GValue* value) +{ #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (value->data[0].v_pointer) { #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_interpretable_results_unref (value->data[0].v_pointer); -#line 9564 "VideoSupport.c" +#line 9800 "VideoSupport.c" } } -static void video_value_interpretable_results_copy_value (const GValue* src_value, GValue* dest_value) { +static void +video_value_interpretable_results_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (src_value->data[0].v_pointer) { #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" dest_value->data[0].v_pointer = video_interpretable_results_ref (src_value->data[0].v_pointer); -#line 9574 "VideoSupport.c" +#line 9813 "VideoSupport.c" } else { #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" dest_value->data[0].v_pointer = NULL; -#line 9578 "VideoSupport.c" +#line 9817 "VideoSupport.c" } } -static gpointer video_value_interpretable_results_peek_pointer (const GValue* value) { +static gpointer +video_value_interpretable_results_peek_pointer (const GValue* value) +{ #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" return value->data[0].v_pointer; -#line 9586 "VideoSupport.c" +#line 9827 "VideoSupport.c" } -static gchar* video_value_interpretable_results_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +video_value_interpretable_results_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (collect_values[0].v_pointer) { -#line 9593 "VideoSupport.c" +#line 9839 "VideoSupport.c" VideoInterpretableResults * object; object = collect_values[0].v_pointer; #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (object->parent_instance.g_class == NULL) { #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9600 "VideoSupport.c" +#line 9846 "VideoSupport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9604 "VideoSupport.c" +#line 9850 "VideoSupport.c" } #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" value->data[0].v_pointer = video_interpretable_results_ref (object); -#line 9608 "VideoSupport.c" +#line 9854 "VideoSupport.c" } else { #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" value->data[0].v_pointer = NULL; -#line 9612 "VideoSupport.c" +#line 9858 "VideoSupport.c" } #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 9616 "VideoSupport.c" +#line 9862 "VideoSupport.c" } -static gchar* video_value_interpretable_results_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +video_value_interpretable_results_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ VideoInterpretableResults ** object_p; object_p = collect_values[0].v_pointer; #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (!object_p) { #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 9627 "VideoSupport.c" +#line 9878 "VideoSupport.c" } #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (!value->data[0].v_pointer) { #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" *object_p = NULL; -#line 9633 "VideoSupport.c" +#line 9884 "VideoSupport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" *object_p = value->data[0].v_pointer; -#line 9637 "VideoSupport.c" +#line 9888 "VideoSupport.c" } else { #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" *object_p = video_interpretable_results_ref (value->data[0].v_pointer); -#line 9641 "VideoSupport.c" +#line 9892 "VideoSupport.c" } #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" return NULL; -#line 9645 "VideoSupport.c" +#line 9896 "VideoSupport.c" } -GParamSpec* video_param_spec_interpretable_results (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +video_param_spec_interpretable_results (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ VideoParamSpecInterpretableResults* spec; #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (g_type_is_a (object_type, VIDEO_TYPE_INTERPRETABLE_RESULTS), NULL); @@ -9659,20 +9916,25 @@ GParamSpec* video_param_spec_interpretable_results (const gchar* name, const gch G_PARAM_SPEC (spec)->value_type = object_type; #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" return G_PARAM_SPEC (spec); -#line 9659 "VideoSupport.c" +#line 9916 "VideoSupport.c" } -gpointer video_value_get_interpretable_results (const GValue* value) { +gpointer +video_value_get_interpretable_results (const GValue* value) +{ #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIDEO_TYPE_INTERPRETABLE_RESULTS), NULL); #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" return value->data[0].v_pointer; -#line 9668 "VideoSupport.c" +#line 9927 "VideoSupport.c" } -void video_value_set_interpretable_results (GValue* value, gpointer v_object) { +void +video_value_set_interpretable_results (GValue* value, + gpointer v_object) +{ VideoInterpretableResults * old; #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIDEO_TYPE_INTERPRETABLE_RESULTS)); @@ -9688,22 +9950,25 @@ void video_value_set_interpretable_results (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_interpretable_results_ref (value->data[0].v_pointer); -#line 9688 "VideoSupport.c" +#line 9950 "VideoSupport.c" } else { #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" value->data[0].v_pointer = NULL; -#line 9692 "VideoSupport.c" +#line 9954 "VideoSupport.c" } #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (old) { #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_interpretable_results_unref (old); -#line 9698 "VideoSupport.c" +#line 9960 "VideoSupport.c" } } -void video_value_take_interpretable_results (GValue* value, gpointer v_object) { +void +video_value_take_interpretable_results (GValue* value, + gpointer v_object) +{ VideoInterpretableResults * old; #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIDEO_TYPE_INTERPRETABLE_RESULTS)); @@ -9717,31 +9982,35 @@ void video_value_take_interpretable_results (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" value->data[0].v_pointer = v_object; -#line 9717 "VideoSupport.c" +#line 9982 "VideoSupport.c" } else { #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" value->data[0].v_pointer = NULL; -#line 9721 "VideoSupport.c" +#line 9986 "VideoSupport.c" } #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (old) { #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_interpretable_results_unref (old); -#line 9727 "VideoSupport.c" +#line 9992 "VideoSupport.c" } } -static void video_interpretable_results_class_init (VideoInterpretableResultsClass * klass) { +static void +video_interpretable_results_class_init (VideoInterpretableResultsClass * klass) +{ #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_interpretable_results_parent_class = g_type_class_peek_parent (klass); #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" ((VideoInterpretableResultsClass *) klass)->finalize = video_interpretable_results_finalize; -#line 9737 "VideoSupport.c" +#line 10004 "VideoSupport.c" } -static void video_interpretable_results_instance_init (VideoInterpretableResults * self) { +static void +video_interpretable_results_instance_init (VideoInterpretableResults * self) +{ #line 332 "/home/jens/Source/shotwell/src/VideoSupport.vala" self->update_interpretable = FALSE; #line 333 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -9750,11 +10019,13 @@ static void video_interpretable_results_instance_init (VideoInterpretableResults self->new_thumbnail = NULL; #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" self->ref_count = 1; -#line 9750 "VideoSupport.c" +#line 10019 "VideoSupport.c" } -static void video_interpretable_results_finalize (VideoInterpretableResults * obj) { +static void +video_interpretable_results_finalize (VideoInterpretableResults * obj) +{ VideoInterpretableResults * self; #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, VIDEO_TYPE_INTERPRETABLE_RESULTS, VideoInterpretableResults); @@ -9764,11 +10035,13 @@ static void video_interpretable_results_finalize (VideoInterpretableResults * ob _g_object_unref0 (self->video); #line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (self->new_thumbnail); -#line 9764 "VideoSupport.c" +#line 10035 "VideoSupport.c" } -GType video_interpretable_results_get_type (void) { +GType +video_interpretable_results_get_type (void) +{ static volatile gsize video_interpretable_results_type_id__volatile = 0; if (g_once_init_enter (&video_interpretable_results_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { video_value_interpretable_results_init, video_value_interpretable_results_free_value, video_value_interpretable_results_copy_value, video_value_interpretable_results_peek_pointer, "p", video_value_interpretable_results_collect_value, "p", video_value_interpretable_results_lcopy_value }; @@ -9782,18 +10055,22 @@ GType video_interpretable_results_get_type (void) { } -gpointer video_interpretable_results_ref (gpointer instance) { +gpointer +video_interpretable_results_ref (gpointer instance) +{ VideoInterpretableResults * self; self = instance; #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_atomic_int_inc (&self->ref_count); #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" return instance; -#line 9789 "VideoSupport.c" +#line 10064 "VideoSupport.c" } -void video_interpretable_results_unref (gpointer instance) { +void +video_interpretable_results_unref (gpointer instance) +{ VideoInterpretableResults * self; self = instance; #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -9802,12 +10079,14 @@ void video_interpretable_results_unref (gpointer instance) { VIDEO_INTERPRETABLE_RESULTS_GET_CLASS (self)->finalize (self); #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 9802 "VideoSupport.c" +#line 10079 "VideoSupport.c" } } -static void video_class_init (VideoClass * klass) { +static void +video_class_init (VideoClass * klass) +{ #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_parent_class = g_type_class_peek_parent (klass); #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -9886,11 +10165,13 @@ static void video_class_init (VideoClass * klass) { ((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) video_real_internal_delete_backing; #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala" G_OBJECT_CLASS (klass)->finalize = video_finalize; -#line 9886 "VideoSupport.c" +#line 10165 "VideoSupport.c" } -static void video_flaggable_interface_init (FlaggableIface * iface) { +static void +video_flaggable_interface_init (FlaggableIface * iface) +{ #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_flaggable_parent_iface = g_type_interface_peek_parent (iface); #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -9899,11 +10180,13 @@ static void video_flaggable_interface_init (FlaggableIface * iface) { iface->mark_flagged = (void (*) (Flaggable *)) video_real_mark_flagged; #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala" iface->mark_unflagged = (void (*) (Flaggable *)) video_real_mark_unflagged; -#line 9899 "VideoSupport.c" +#line 10180 "VideoSupport.c" } -static void video_monitorable_interface_init (MonitorableIface * iface) { +static void +video_monitorable_interface_init (MonitorableIface * iface) +{ #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_monitorable_parent_iface = g_type_interface_peek_parent (iface); #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -9916,31 +10199,37 @@ static void video_monitorable_interface_init (MonitorableIface * iface) { iface->set_master_timestamp = (void (*) (Monitorable *, GFileInfo*)) video_real_set_master_timestamp; #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala" iface->set_master_file = (void (*) (Monitorable *, GFile*)) video_real_set_master_file; -#line 9916 "VideoSupport.c" +#line 10199 "VideoSupport.c" } -static void video_dateable_interface_init (DateableIface * iface) { +static void +video_dateable_interface_init (DateableIface * iface) +{ #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_dateable_parent_iface = g_type_interface_peek_parent (iface); #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala" iface->get_exposure_time = (time_t (*) (Dateable *)) video_real_get_exposure_time; #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala" iface->set_exposure_time = (void (*) (Dateable *, time_t)) video_real_set_exposure_time; -#line 9927 "VideoSupport.c" +#line 10212 "VideoSupport.c" } -static void video_instance_init (Video * self) { +static void +video_instance_init (Video * self) +{ #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala" self->priv = VIDEO_GET_PRIVATE (self); #line 364 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_rec_mutex_init (&self->priv->__lock_backing_row); -#line 9936 "VideoSupport.c" +#line 10223 "VideoSupport.c" } -static void video_finalize (GObject * obj) { +static void +video_finalize (GObject * obj) +{ Video * self; #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO, Video); @@ -9950,11 +10239,13 @@ static void video_finalize (GObject * obj) { _video_row_unref0 (self->priv->backing_row); #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala" G_OBJECT_CLASS (video_parent_class)->finalize (obj); -#line 9950 "VideoSupport.c" +#line 10239 "VideoSupport.c" } -GType video_get_type (void) { +GType +video_get_type (void) +{ static volatile gsize video_type_id__volatile = 0; if (g_once_init_enter (&video_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (VideoClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) video_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Video), 0, (GInstanceInitFunc) video_instance_init, NULL }; @@ -9972,7 +10263,9 @@ GType video_get_type (void) { } -GType video_source_collection_state_get_type (void) { +GType +video_source_collection_state_get_type (void) +{ static volatile gsize video_source_collection_state_type_id__volatile = 0; if (g_once_init_enter (&video_source_collection_state_type_id__volatile)) { static const GEnumValue values[] = {{VIDEO_SOURCE_COLLECTION_STATE_UNKNOWN, "VIDEO_SOURCE_COLLECTION_STATE_UNKNOWN", "unknown"}, {VIDEO_SOURCE_COLLECTION_STATE_ONLINE, "VIDEO_SOURCE_COLLECTION_STATE_ONLINE", "online"}, {VIDEO_SOURCE_COLLECTION_STATE_OFFLINE, "VIDEO_SOURCE_COLLECTION_STATE_OFFLINE", "offline"}, {VIDEO_SOURCE_COLLECTION_STATE_TRASH, "VIDEO_SOURCE_COLLECTION_STATE_TRASH", "trash"}, {0, NULL, NULL}}; @@ -9984,16 +10277,22 @@ GType video_source_collection_state_get_type (void) { } -static gint _uint64_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gint +_uint64_compare_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gint result; result = uint64_compare ((guint64*) a, (guint64*) b); #line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 9989 "VideoSupport.c" +#line 10286 "VideoSupport.c" } -static guint64* _uint64_dup (guint64* self) { +static guint64* +_uint64_dup (guint64* self) +{ guint64* dup; #line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala" dup = g_new0 (guint64, 1); @@ -10001,34 +10300,49 @@ static guint64* _uint64_dup (guint64* self) { memcpy (dup, self, sizeof (guint64)); #line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala" return dup; -#line 10001 "VideoSupport.c" +#line 10300 "VideoSupport.c" } -static gint64 _video_source_collection_get_video_key_get_source_database_key (DataSource* source, gpointer self) { +static gint64 +_video_source_collection_get_video_key_get_source_database_key (DataSource* source, + gpointer self) +{ gint64 result; result = video_source_collection_get_video_key (source); #line 1077 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 10010 "VideoSupport.c" +#line 10312 "VideoSupport.c" } -static void _video_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { +static void +_video_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self) +{ #line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_source_collection_on_trashcan_contents_altered ((VideoSourceCollection*) self, added, removed); -#line 10017 "VideoSupport.c" +#line 10324 "VideoSupport.c" } -static void _video_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { +static void +_video_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self) +{ #line 1080 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_source_collection_on_offline_contents_altered ((VideoSourceCollection*) self, added, removed); -#line 10024 "VideoSupport.c" +#line 10336 "VideoSupport.c" } -VideoSourceCollection* video_source_collection_construct (GType object_type) { +VideoSourceCollection* +video_source_collection_construct (GType object_type) +{ VideoSourceCollection* self = NULL; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; @@ -10054,27 +10368,35 @@ VideoSourceCollection* video_source_collection_construct (GType object_type) { _source_holding_tank_unref0 (_tmp3_); #line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala" return self; -#line 10054 "VideoSupport.c" +#line 10368 "VideoSupport.c" } -VideoSourceCollection* video_source_collection_new (void) { +VideoSourceCollection* +video_source_collection_new (void) +{ #line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala" return video_source_collection_construct (TYPE_VIDEO_SOURCE_COLLECTION); -#line 10061 "VideoSupport.c" +#line 10377 "VideoSupport.c" } -static gboolean _video_source_collection_is_video_trashed_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) { +static gboolean +_video_source_collection_is_video_trashed_source_holding_tank_check_to_keep (DataSource* source, + Alteration* alteration, + gpointer self) +{ gboolean result; result = video_source_collection_is_video_trashed (source); #line 1084 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 10070 "VideoSupport.c" +#line 10390 "VideoSupport.c" } -static MediaSourceHoldingTank* video_source_collection_real_create_trashcan (MediaSourceCollection* base) { +static MediaSourceHoldingTank* +video_source_collection_real_create_trashcan (MediaSourceCollection* base) +{ VideoSourceCollection * self; MediaSourceHoldingTank* result = NULL; MediaSourceHoldingTank* _tmp0_; @@ -10086,20 +10408,26 @@ static MediaSourceHoldingTank* video_source_collection_real_create_trashcan (Med result = _tmp0_; #line 1084 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 10086 "VideoSupport.c" +#line 10408 "VideoSupport.c" } -static gboolean _video_source_collection_is_video_offline_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) { +static gboolean +_video_source_collection_is_video_offline_source_holding_tank_check_to_keep (DataSource* source, + Alteration* alteration, + gpointer self) +{ gboolean result; result = video_source_collection_is_video_offline (source); #line 1088 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 10095 "VideoSupport.c" +#line 10421 "VideoSupport.c" } -static MediaSourceHoldingTank* video_source_collection_real_create_offline_bin (MediaSourceCollection* base) { +static MediaSourceHoldingTank* +video_source_collection_real_create_offline_bin (MediaSourceCollection* base) +{ VideoSourceCollection * self; MediaSourceHoldingTank* result = NULL; MediaSourceHoldingTank* _tmp0_; @@ -10111,15 +10439,18 @@ static MediaSourceHoldingTank* video_source_collection_real_create_offline_bin ( result = _tmp0_; #line 1088 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 10111 "VideoSupport.c" +#line 10439 "VideoSupport.c" } -static MediaMonitor* video_source_collection_real_create_media_monitor (MediaSourceCollection* base, Workers* workers, GCancellable* cancellable) { +static MediaMonitor* +video_source_collection_real_create_media_monitor (MediaSourceCollection* base, + Workers* workers, + GCancellable* cancellable) +{ VideoSourceCollection * self; MediaMonitor* result = NULL; - GCancellable* _tmp0_; - VideoMonitor* _tmp1_; + VideoMonitor* _tmp0_; #line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection); #line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -10127,36 +10458,36 @@ static MediaMonitor* video_source_collection_real_create_media_monitor (MediaSou #line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL); #line 1092 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = cancellable; + _tmp0_ = video_monitor_new (cancellable); #line 1092 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = video_monitor_new (_tmp0_); -#line 1092 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_MONITOR, MediaMonitor); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_MONITOR, MediaMonitor); #line 1092 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 10134 "VideoSupport.c" +#line 10463 "VideoSupport.c" } -static gboolean video_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) { +static gboolean +video_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source) +{ VideoSourceCollection * self; gboolean result = FALSE; - DataSource* _tmp0_; #line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection); #line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 1096 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = source; -#line 1096 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_VIDEO); + result = G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_VIDEO); #line 1096 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 10152 "VideoSupport.c" +#line 10481 "VideoSupport.c" } -static gchar* video_source_collection_real_get_typename (MediaSourceCollection* base) { +static gchar* +video_source_collection_real_get_typename (MediaSourceCollection* base) +{ VideoSourceCollection * self; gchar* result = NULL; gchar* _tmp0_; @@ -10168,34 +10499,33 @@ static gchar* video_source_collection_real_get_typename (MediaSourceCollection* result = _tmp0_; #line 1100 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 10168 "VideoSupport.c" +#line 10499 "VideoSupport.c" } -static gboolean video_source_collection_real_is_file_recognized (MediaSourceCollection* base, GFile* file) { +static gboolean +video_source_collection_real_is_file_recognized (MediaSourceCollection* base, + GFile* file) +{ VideoSourceCollection * self; gboolean result = FALSE; - GFile* _tmp0_; - gboolean _tmp1_; #line 1103 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection); #line 1103 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 1104 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = file; -#line 1104 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = video_reader_is_supported_video_file (_tmp0_); -#line 1104 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp1_; + result = video_reader_is_supported_video_file (file); #line 1104 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 10189 "VideoSupport.c" +#line 10517 "VideoSupport.c" } -static void video_source_collection_on_trashcan_contents_altered (VideoSourceCollection* self, GeeCollection* added, GeeCollection* removed) { - GeeCollection* _tmp0_; - GeeCollection* _tmp1_; +static void +video_source_collection_on_trashcan_contents_altered (VideoSourceCollection* self, + GeeCollection* added, + GeeCollection* removed) +{ #line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self)); #line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -10203,18 +10533,16 @@ static void video_source_collection_on_trashcan_contents_altered (VideoSourceCol #line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = added; -#line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = removed; -#line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "trashcan-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 10208 "VideoSupport.c" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "trashcan-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_COLLECTION, GeeCollection)); +#line 10534 "VideoSupport.c" } -static void video_source_collection_on_offline_contents_altered (VideoSourceCollection* self, GeeCollection* added, GeeCollection* removed) { - GeeCollection* _tmp0_; - GeeCollection* _tmp1_; +static void +video_source_collection_on_offline_contents_altered (VideoSourceCollection* self, + GeeCollection* added, + GeeCollection* removed) +{ #line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self)); #line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -10222,109 +10550,99 @@ static void video_source_collection_on_offline_contents_altered (VideoSourceColl #line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 1115 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = added; -#line 1115 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = removed; -#line 1115 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "offline-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 10227 "VideoSupport.c" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "offline-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_COLLECTION, GeeCollection)); +#line 10551 "VideoSupport.c" } -static MediaSource* video_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* base, gint64 numeric_id) { +static MediaSource* +video_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* base, + gint64 numeric_id) +{ VideoSourceCollection * self; MediaSource* result = NULL; - gint64 _tmp0_; - VideoID _tmp1_ = {0}; - Video* _tmp2_; + VideoID _tmp0_ = {0}; + Video* _tmp1_; #line 1119 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection); #line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = numeric_id; + video_id_init (&_tmp0_, numeric_id); #line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_id_init (&_tmp1_, _tmp0_); + _tmp1_ = video_source_collection_fetch (self, &_tmp0_); #line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = video_source_collection_fetch (self, &_tmp1_); -#line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource); #line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 10249 "VideoSupport.c" +#line 10573 "VideoSupport.c" } -gint64 video_source_collection_get_video_key (DataSource* source) { +gint64 +video_source_collection_get_video_key (DataSource* source) +{ gint64 result = 0LL; Video* video = NULL; - DataSource* _tmp0_; - Video* _tmp1_; + Video* _tmp0_; VideoID video_id = {0}; - VideoID _tmp2_ = {0}; - VideoID _tmp3_; - gint64 _tmp4_; + VideoID _tmp1_ = {0}; + VideoID _tmp2_; + gint64 _tmp3_; #line 1123 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL); #line 1124 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = source; -#line 1124 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_VIDEO, Video)); #line 1124 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video = _tmp1_; + video = _tmp0_; #line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_get_video_id (video, &_tmp2_); + video_get_video_id (video, &_tmp1_); #line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_id = _tmp2_; + video_id = _tmp1_; #line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = video_id; + _tmp2_ = video_id; #line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = _tmp3_.id; + _tmp3_ = _tmp2_.id; #line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp4_; + result = _tmp3_; #line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (video); #line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 10284 "VideoSupport.c" +#line 10607 "VideoSupport.c" } -gboolean video_source_collection_is_video_trashed (DataSource* source) { +gboolean +video_source_collection_is_video_trashed (DataSource* source) +{ gboolean result = FALSE; - DataSource* _tmp0_; - gboolean _tmp1_; #line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 1131 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = source; -#line 1131 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video), TYPE_MEDIA_SOURCE, MediaSource)); -#line 1131 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp1_; + result = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_VIDEO, Video), TYPE_MEDIA_SOURCE, MediaSource)); #line 1131 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 10302 "VideoSupport.c" +#line 10621 "VideoSupport.c" } -gboolean video_source_collection_is_video_offline (DataSource* source) { +gboolean +video_source_collection_is_video_offline (DataSource* source) +{ gboolean result = FALSE; - DataSource* _tmp0_; - gboolean _tmp1_; #line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 1135 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = source; -#line 1135 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video), TYPE_MEDIA_SOURCE, MediaSource)); -#line 1135 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp1_; + result = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_VIDEO, Video), TYPE_MEDIA_SOURCE, MediaSource)); #line 1135 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 10320 "VideoSupport.c" +#line 10635 "VideoSupport.c" } -Video* video_source_collection_fetch (VideoSourceCollection* self, VideoID* video_id) { +Video* +video_source_collection_fetch (VideoSourceCollection* self, + VideoID* video_id) +{ Video* result = NULL; VideoID _tmp0_; gint64 _tmp1_; @@ -10343,11 +10661,14 @@ Video* video_source_collection_fetch (VideoSourceCollection* self, VideoID* vide result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_VIDEO, Video); #line 1139 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 10343 "VideoSupport.c" +#line 10661 "VideoSupport.c" } -static GeeCollection* video_source_collection_real_get_event_source_ids (MediaSourceCollection* base, EventID* event_id) { +static GeeCollection* +video_source_collection_real_get_event_source_ids (MediaSourceCollection* base, + EventID* event_id) +{ VideoSourceCollection * self; GeeCollection* result = NULL; VideoTable* _tmp0_; @@ -10375,41 +10696,40 @@ static GeeCollection* video_source_collection_real_get_event_source_ids (MediaSo result = _tmp4_; #line 1143 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 10375 "VideoSupport.c" +#line 10696 "VideoSupport.c" } -Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, GFile* file, VideoSourceCollectionState* state) { +Video* +video_source_collection_get_state_by_file (VideoSourceCollection* self, + GFile* file, + VideoSourceCollectionState* state) +{ VideoSourceCollectionState _vala_state = 0; Video* result = NULL; Video* video = NULL; - GFile* _tmp0_; - MediaSource* _tmp1_; - Video* _tmp2_; + MediaSource* _tmp0_; + Video* _tmp1_; + MediaSourceHoldingTank* _tmp2_; MediaSourceHoldingTank* _tmp3_; - MediaSourceHoldingTank* _tmp4_; - GFile* _tmp5_; - MediaSource* _tmp6_; - Video* _tmp7_; - MediaSourceHoldingTank* _tmp8_; - MediaSourceHoldingTank* _tmp9_; - GFile* _tmp10_; - MediaSource* _tmp11_; - Video* _tmp12_; + MediaSource* _tmp4_; + Video* _tmp5_; + MediaSourceHoldingTank* _tmp6_; + MediaSourceHoldingTank* _tmp7_; + MediaSource* _tmp8_; + Video* _tmp9_; #line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), NULL); #line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = file; -#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = media_source_collection_fetch_by_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp0_); + _tmp0_ = media_source_collection_fetch_by_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), file); #line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_VIDEO, Video); + video = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video); #line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = video; + _tmp1_ = video; #line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp2_ != NULL) { + if (_tmp1_ != NULL) { #line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala" _vala_state = VIDEO_SOURCE_COLLECTION_STATE_ONLINE; #line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -10418,30 +10738,28 @@ Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, G if (state) { #line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala" *state = _vala_state; -#line 10418 "VideoSupport.c" +#line 10738 "VideoSupport.c" } #line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 10422 "VideoSupport.c" +#line 10742 "VideoSupport.c" } #line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = _tmp3_; + _tmp2_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = file; + _tmp3_ = _tmp2_; #line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = media_source_holding_tank_fetch_by_master_file (_tmp4_, _tmp5_); + _tmp4_ = media_source_holding_tank_fetch_by_master_file (_tmp3_, file); #line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (video); #line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_VIDEO, Video); + video = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_VIDEO, Video); #line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _source_holding_tank_unref0 (_tmp4_); + _source_holding_tank_unref0 (_tmp3_); #line 1155 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = video; + _tmp5_ = video; #line 1155 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp7_ != NULL) { + if (_tmp5_ != NULL) { #line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala" _vala_state = VIDEO_SOURCE_COLLECTION_STATE_TRASH; #line 1158 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -10450,30 +10768,28 @@ Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, G if (state) { #line 1158 "/home/jens/Source/shotwell/src/VideoSupport.vala" *state = _vala_state; -#line 10450 "VideoSupport.c" +#line 10768 "VideoSupport.c" } #line 1158 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 10454 "VideoSupport.c" +#line 10772 "VideoSupport.c" } #line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = _tmp8_; + _tmp6_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = file; + _tmp7_ = _tmp6_; #line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = media_source_holding_tank_fetch_by_master_file (_tmp9_, _tmp10_); + _tmp8_ = media_source_holding_tank_fetch_by_master_file (_tmp7_, file); #line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (video); #line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_VIDEO, Video); + video = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_VIDEO, Video); #line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _source_holding_tank_unref0 (_tmp9_); + _source_holding_tank_unref0 (_tmp7_); #line 1162 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = video; + _tmp9_ = video; #line 1162 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp12_ != NULL) { + if (_tmp9_ != NULL) { #line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala" _vala_state = VIDEO_SOURCE_COLLECTION_STATE_OFFLINE; #line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -10482,11 +10798,11 @@ Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, G if (state) { #line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala" *state = _vala_state; -#line 10482 "VideoSupport.c" +#line 10798 "VideoSupport.c" } #line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 10486 "VideoSupport.c" +#line 10802 "VideoSupport.c" } #line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala" _vala_state = VIDEO_SOURCE_COLLECTION_STATE_UNKNOWN; @@ -10498,24 +10814,22 @@ Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, G if (state) { #line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala" *state = _vala_state; -#line 10498 "VideoSupport.c" +#line 10814 "VideoSupport.c" } #line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 10502 "VideoSupport.c" +#line 10818 "VideoSupport.c" } -static void video_source_collection_compare_backing (VideoSourceCollection* self, Video* video, GFileInfo* info, GeeCollection* matching_master) { - Video* _tmp0_; - guint64 _tmp1_; - GFileInfo* _tmp2_; - gint64 _tmp3_; - Video* _tmp4_; - time_t _tmp5_; - GFileInfo* _tmp6_; - GTimeVal _tmp7_ = {0}; - glong _tmp8_; +static void +video_source_collection_compare_backing (VideoSourceCollection* self, + Video* video, + GFileInfo* info, + GeeCollection* matching_master) +{ + GTimeVal _tmp0_ = {0}; + glong _tmp1_; #line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self)); #line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -10525,53 +10839,36 @@ static void video_source_collection_compare_backing (VideoSourceCollection* self #line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (GEE_IS_COLLECTION (matching_master)); #line 1174 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = video; -#line 1174 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 1174 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = info; -#line 1174 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = g_file_info_get_size (_tmp2_); -#line 1174 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp1_ != ((guint64) _tmp3_)) { + if (media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (video, TYPE_MEDIA_SOURCE, MediaSource)) != ((guint64) g_file_info_get_size (info))) { #line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 10536 "VideoSupport.c" +#line 10842 "VideoSupport.c" } #line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = video; -#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = media_source_get_timestamp (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = info; -#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala" - g_file_info_get_modification_time (_tmp6_, &_tmp7_); + g_file_info_get_modification_time (info, &_tmp0_); #line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = _tmp7_.tv_sec; + _tmp1_ = _tmp0_.tv_sec; #line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp5_ == ((time_t) _tmp8_)) { -#line 10550 "VideoSupport.c" - GeeCollection* _tmp9_; - Video* _tmp10_; -#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = matching_master; -#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = video; + if (media_source_get_timestamp (G_TYPE_CHECK_INSTANCE_CAST (video, TYPE_MEDIA_SOURCE, MediaSource)) == ((time_t) _tmp1_)) { #line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala" - gee_collection_add (_tmp9_, _tmp10_); -#line 10559 "VideoSupport.c" + gee_collection_add (matching_master, video); +#line 10852 "VideoSupport.c" } } -void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* self, GFileInfo* info, GeeCollection* matching_master) { +void +video_source_collection_fetch_by_matching_backing (VideoSourceCollection* self, + GFileInfo* info, + GeeCollection* matching_master) +{ #line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self)); #line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (GEE_IS_COLLECTION (matching_master)); -#line 10571 "VideoSupport.c" +#line 10868 "VideoSupport.c" { GeeIterator* _object_it = NULL; GeeCollection* _tmp0_; @@ -10592,117 +10889,99 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s _object_it = _tmp3_; #line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala" while (TRUE) { -#line 10592 "VideoSupport.c" +#line 10889 "VideoSupport.c" GeeIterator* _tmp4_; - gboolean _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - DataObject* _tmp8_; - GFileInfo* _tmp9_; - GeeCollection* _tmp10_; + GeeIterator* _tmp5_; + gpointer _tmp6_; + DataObject* _tmp7_; #line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp4_ = _object_it; #line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp4_)) { #line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala" break; -#line 10609 "VideoSupport.c" +#line 10901 "VideoSupport.c" } #line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = _object_it; + _tmp5_ = _object_it; #line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala" - object = (DataObject*) _tmp7_; -#line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = object; + object = (DataObject*) _tmp6_; #line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = info; + _tmp7_ = object; #line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = matching_master; -#line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_VIDEO, Video), _tmp9_, _tmp10_); + video_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIDEO, Video), info, matching_master); #line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (object); -#line 10627 "VideoSupport.c" +#line 10915 "VideoSupport.c" } #line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (_object_it); -#line 10631 "VideoSupport.c" +#line 10919 "VideoSupport.c" } { GeeIterator* _media_it = NULL; - GeeCollection* _tmp11_; - GeeCollection* _tmp12_; - GeeIterator* _tmp13_; - GeeIterator* _tmp14_; + GeeCollection* _tmp8_; + GeeCollection* _tmp9_; + GeeIterator* _tmp10_; + GeeIterator* _tmp11_; #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = media_source_collection_get_offline_bin_contents (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _tmp8_ = media_source_collection_get_offline_bin_contents (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = _tmp11_; + _tmp9_ = _tmp8_; #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp14_ = _tmp13_; + _tmp11_ = _tmp10_; #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp9_); #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _media_it = _tmp14_; + _media_it = _tmp11_; #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala" while (TRUE) { -#line 10653 "VideoSupport.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 10941 "VideoSupport.c" + GeeIterator* _tmp12_; MediaSource* media = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; - MediaSource* _tmp19_; - GFileInfo* _tmp20_; - GeeCollection* _tmp21_; + GeeIterator* _tmp13_; + gpointer _tmp14_; + MediaSource* _tmp15_; #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp15_ = _media_it; + _tmp12_ = _media_it; #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp16_ = gee_iterator_next (_tmp15_); -#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp12_)) { #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala" break; -#line 10670 "VideoSupport.c" +#line 10953 "VideoSupport.c" } #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp17_ = _media_it; + _tmp13_ = _media_it; #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp14_ = gee_iterator_get (_tmp13_); #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala" - media = (MediaSource*) _tmp18_; -#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp19_ = media; -#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp20_ = info; + media = (MediaSource*) _tmp14_; #line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp21_ = matching_master; + _tmp15_ = media; #line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_VIDEO, Video), _tmp20_, _tmp21_); + video_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_VIDEO, Video), info, matching_master); #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (media); -#line 10688 "VideoSupport.c" +#line 10967 "VideoSupport.c" } #line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (_media_it); -#line 10692 "VideoSupport.c" +#line 10971 "VideoSupport.c" } } -static void video_source_collection_real_notify_contents_altered (DataCollection* base, GeeIterable* added, GeeIterable* removed) { +static void +video_source_collection_real_notify_contents_altered (DataCollection* base, + GeeIterable* added, + GeeIterable* removed) +{ VideoSourceCollection * self; - GeeIterable* _tmp0_; - GeeIterable* _tmp13_; - GeeIterable* _tmp26_; - GeeIterable* _tmp27_; #line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection); #line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -10710,303 +10989,273 @@ static void video_source_collection_real_notify_contents_altered (DataCollection #line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); #line 1191 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = added; -#line 1191 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp0_ != NULL) { -#line 10713 "VideoSupport.c" + if (added != NULL) { +#line 10990 "VideoSupport.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_; - GeeIterator* _tmp2_; -#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = added; + GeeIterator* _tmp0_; #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = gee_iterable_iterator (_tmp1_); + _tmp0_ = gee_iterable_iterator (added); #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _object_it = _tmp2_; + _object_it = _tmp0_; #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala" while (TRUE) { -#line 10726 "VideoSupport.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 11000 "VideoSupport.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp2_; + gpointer _tmp3_; Video* video = NULL; - DataObject* _tmp7_; - Video* _tmp8_; - GeeMultiMap* _tmp9_; - Video* _tmp10_; - guint64 _tmp11_; - Video* _tmp12_; + DataObject* _tmp4_; + Video* _tmp5_; + GeeMultiMap* _tmp6_; + Video* _tmp7_; + guint64 _tmp8_; + Video* _tmp9_; #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = _object_it; + _tmp1_ = _object_it; #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = gee_iterator_next (_tmp3_); -#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala" break; -#line 10747 "VideoSupport.c" +#line 11018 "VideoSupport.c" } #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = _object_it; + _tmp2_ = _object_it; #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala" - object = (DataObject*) _tmp6_; + object = (DataObject*) _tmp3_; #line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = object; + _tmp4_ = object; #line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIDEO, Video)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_VIDEO, Video)); #line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video = _tmp8_; + video = _tmp5_; #line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = self->priv->filesize_to_video; + _tmp6_ = self->priv->filesize_to_video; #line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = video; + _tmp7_ = video; #line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp8_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource)); #line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = video; + _tmp9_ = video; #line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala" - gee_multi_map_set (_tmp9_, &_tmp11_, _tmp12_); + gee_multi_map_set (_tmp6_, &_tmp8_, _tmp9_); #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (video); #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (object); -#line 10775 "VideoSupport.c" +#line 11046 "VideoSupport.c" } #line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (_object_it); -#line 10779 "VideoSupport.c" +#line 11050 "VideoSupport.c" } } #line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp13_ = removed; -#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp13_ != NULL) { -#line 10786 "VideoSupport.c" + if (removed != NULL) { +#line 11055 "VideoSupport.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp14_; - GeeIterator* _tmp15_; -#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp14_ = removed; + GeeIterator* _tmp10_; #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp15_ = gee_iterable_iterator (_tmp14_); + _tmp10_ = gee_iterable_iterator (removed); #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _object_it = _tmp15_; + _object_it = _tmp10_; #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala" while (TRUE) { -#line 10799 "VideoSupport.c" - GeeIterator* _tmp16_; - gboolean _tmp17_; +#line 11065 "VideoSupport.c" + GeeIterator* _tmp11_; DataObject* object = NULL; - GeeIterator* _tmp18_; - gpointer _tmp19_; + GeeIterator* _tmp12_; + gpointer _tmp13_; Video* video = NULL; - DataObject* _tmp20_; - Video* _tmp21_; - GeeMultiMap* _tmp22_; - Video* _tmp23_; - guint64 _tmp24_; - Video* _tmp25_; -#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp16_ = _object_it; + DataObject* _tmp14_; + Video* _tmp15_; + GeeMultiMap* _tmp16_; + Video* _tmp17_; + guint64 _tmp18_; + Video* _tmp19_; #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp17_ = gee_iterator_next (_tmp16_); + _tmp11_ = _object_it; #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (!_tmp17_) { + if (!gee_iterator_next (_tmp11_)) { #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala" break; -#line 10820 "VideoSupport.c" +#line 11083 "VideoSupport.c" } #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp18_ = _object_it; + _tmp12_ = _object_it; #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp19_ = gee_iterator_get (_tmp18_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala" - object = (DataObject*) _tmp19_; + object = (DataObject*) _tmp13_; #line 1201 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp20_ = object; + _tmp14_ = object; #line 1201 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_VIDEO, Video)); + _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_VIDEO, Video)); #line 1201 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video = _tmp21_; + video = _tmp15_; #line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp22_ = self->priv->filesize_to_video; + _tmp16_ = self->priv->filesize_to_video; #line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp23_ = video; + _tmp17_ = video; #line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp24_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp18_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MEDIA_SOURCE, MediaSource)); #line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp25_ = video; + _tmp19_ = video; #line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala" - gee_multi_map_remove (_tmp22_, &_tmp24_, _tmp25_); + gee_multi_map_remove (_tmp16_, &_tmp18_, _tmp19_); #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (video); #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (object); -#line 10848 "VideoSupport.c" +#line 11111 "VideoSupport.c" } #line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (_object_it); -#line 10852 "VideoSupport.c" +#line 11115 "VideoSupport.c" } } #line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp26_ = added; -#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp27_ = removed; -#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala" - DATA_COLLECTION_CLASS (video_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp26_, _tmp27_); -#line 10861 "VideoSupport.c" + DATA_COLLECTION_CLASS (video_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), added, removed); +#line 11120 "VideoSupport.c" } -void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize, VideoID* result) { - VideoID _tmp19_ = {0}; +void +video_source_collection_get_basename_filesize_duplicate (VideoSourceCollection* self, + const gchar* basename, + guint64 filesize, + VideoID* result) +{ + VideoID _tmp15_ = {0}; #line 1210 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self)); #line 1210 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_if_fail (basename != NULL); -#line 10871 "VideoSupport.c" +#line 11135 "VideoSupport.c" { GeeIterator* _video_it = NULL; GeeMultiMap* _tmp0_; - guint64 _tmp1_; + GeeCollection* _tmp1_; GeeCollection* _tmp2_; - GeeCollection* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp0_ = self->priv->filesize_to_video; #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = filesize; + _tmp1_ = gee_multi_map_get (_tmp0_, &filesize); #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp2_ = gee_multi_map_get (_tmp0_, &_tmp1_); -#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _video_it = _tmp5_; + _video_it = _tmp4_; #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala" while (TRUE) { -#line 10898 "VideoSupport.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 11159 "VideoSupport.c" + GeeIterator* _tmp5_; Video* video = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - Video* _tmp10_; - GFile* _tmp11_; - GFile* _tmp12_; - gchar* _tmp13_; - const gchar* _tmp14_; - gint _tmp15_; - gboolean _tmp16_; -#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp6_ = _video_it; + GeeIterator* _tmp6_; + gpointer _tmp7_; + Video* _tmp8_; + GFile* _tmp9_; + GFile* _tmp10_; + gchar* _tmp11_; + gboolean _tmp12_; #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _video_it; #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala" break; -#line 10919 "VideoSupport.c" +#line 11175 "VideoSupport.c" } #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp8_ = _video_it; + _tmp6_ = _video_it; #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video = (Video*) _tmp9_; -#line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp10_ = video; -#line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp11_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource)); + video = (Video*) _tmp7_; #line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp12_ = _tmp11_; + _tmp8_ = video; #line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp13_ = g_file_get_basename (_tmp12_); + _tmp9_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource)); #line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp14_ = basename; + _tmp10_ = _tmp9_; #line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp15_ = utf8_ci_compare (_tmp13_, _tmp14_); + _tmp11_ = g_file_get_basename (_tmp10_); #line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp16_ = _tmp15_ == 0; + _tmp12_ = utf8_ci_compare (_tmp11_, basename) == 0; #line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp10_); #line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala" - if (_tmp16_) { -#line 10945 "VideoSupport.c" - Video* _tmp17_; - VideoID _tmp18_ = {0}; + if (_tmp12_) { +#line 11197 "VideoSupport.c" + Video* _tmp13_; + VideoID _tmp14_ = {0}; #line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp17_ = video; + _tmp13_ = video; #line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_get_video_id (_tmp17_, &_tmp18_); + video_get_video_id (_tmp13_, &_tmp14_); #line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala" - *result = _tmp18_; + *result = _tmp14_; #line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (video); #line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (_video_it); #line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 10960 "VideoSupport.c" +#line 11212 "VideoSupport.c" } #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (video); -#line 10964 "VideoSupport.c" +#line 11216 "VideoSupport.c" } #line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala" _g_object_unref0 (_video_it); -#line 10968 "VideoSupport.c" +#line 11220 "VideoSupport.c" } #line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_id_init (&_tmp19_, VIDEO_ID_INVALID); + video_id_init (&_tmp15_, VIDEO_ID_INVALID); #line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala" - *result = _tmp19_; + *result = _tmp15_; #line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala" return; -#line 10976 "VideoSupport.c" +#line 11228 "VideoSupport.c" } -gboolean video_source_collection_has_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize) { +gboolean +video_source_collection_has_basename_filesize_duplicate (VideoSourceCollection* self, + const gchar* basename, + guint64 filesize) +{ gboolean result = FALSE; - const gchar* _tmp0_; - guint64 _tmp1_; - VideoID _tmp2_ = {0}; - gboolean _tmp3_; + VideoID _tmp0_ = {0}; #line 1220 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), FALSE); #line 1220 "/home/jens/Source/shotwell/src/VideoSupport.vala" g_return_val_if_fail (basename != NULL, FALSE); #line 1221 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp0_ = basename; -#line 1221 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp1_ = filesize; -#line 1221 "/home/jens/Source/shotwell/src/VideoSupport.vala" - video_source_collection_get_basename_filesize_duplicate (self, _tmp0_, _tmp1_, &_tmp2_); + video_source_collection_get_basename_filesize_duplicate (self, basename, filesize, &_tmp0_); #line 1221 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp3_ = video_id_is_valid (&_tmp2_); -#line 1221 "/home/jens/Source/shotwell/src/VideoSupport.vala" - result = _tmp3_; + result = video_id_is_valid (&_tmp0_); #line 1221 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 11002 "VideoSupport.c" +#line 11249 "VideoSupport.c" } -static TransactionController* video_source_collection_real_get_transaction_controller (MediaSourceCollection* base) { +static TransactionController* +video_source_collection_real_get_transaction_controller (MediaSourceCollection* base) +{ TransactionController* result; VideoSourceCollection* self; TransactionController* _tmp0_; @@ -11017,7 +11266,7 @@ static TransactionController* video_source_collection_real_get_transaction_contr _tmp0_ = self->priv->_transaction_controller; #line 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala" if (_tmp0_ == NULL) { -#line 11017 "VideoSupport.c" +#line 11266 "VideoSupport.c" MediaSourceTransactionController* _tmp1_; #line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp1_ = media_source_transaction_controller_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); @@ -11025,7 +11274,7 @@ static TransactionController* video_source_collection_real_get_transaction_contr _transaction_controller_unref0 (self->priv->_transaction_controller); #line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala" self->priv->_transaction_controller = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TRANSACTION_CONTROLLER, TransactionController); -#line 11025 "VideoSupport.c" +#line 11274 "VideoSupport.c" } #line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp2_ = self->priv->_transaction_controller; @@ -11033,11 +11282,13 @@ static TransactionController* video_source_collection_real_get_transaction_contr result = _tmp2_; #line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala" return result; -#line 11033 "VideoSupport.c" +#line 11282 "VideoSupport.c" } -static void video_source_collection_class_init (VideoSourceCollectionClass * klass) { +static void +video_source_collection_class_init (VideoSourceCollectionClass * klass) +{ #line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala" video_source_collection_parent_class = g_type_class_peek_parent (klass); #line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala" @@ -11064,11 +11315,13 @@ static void video_source_collection_class_init (VideoSourceCollectionClass * kla ((DataCollectionClass *) klass)->notify_contents_altered = (void (*) (DataCollection *, GeeIterable*, GeeIterable*)) video_source_collection_real_notify_contents_altered; #line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala" MEDIA_SOURCE_COLLECTION_CLASS (klass)->get_transaction_controller = video_source_collection_real_get_transaction_controller; -#line 11064 "VideoSupport.c" +#line 11315 "VideoSupport.c" } -static void video_source_collection_instance_init (VideoSourceCollection * self) { +static void +video_source_collection_instance_init (VideoSourceCollection * self) +{ GeeTreeMultiMap* _tmp0_; #line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala" self->priv = VIDEO_SOURCE_COLLECTION_GET_PRIVATE (self); @@ -11078,11 +11331,13 @@ static void video_source_collection_instance_init (VideoSourceCollection * self) _tmp0_ = gee_tree_multi_map_new (G_TYPE_UINT64, (GBoxedCopyFunc) _uint64_dup, (GDestroyNotify) g_free, TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _uint64_compare_gcompare_data_func, NULL, NULL, NULL, NULL, NULL); #line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala" self->priv->filesize_to_video = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap); -#line 11078 "VideoSupport.c" +#line 11331 "VideoSupport.c" } -static void video_source_collection_finalize (DataCollection * obj) { +static void +video_source_collection_finalize (DataCollection * obj) +{ VideoSourceCollection * self; #line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection); @@ -11092,11 +11347,13 @@ static void video_source_collection_finalize (DataCollection * obj) { _g_object_unref0 (self->priv->filesize_to_video); #line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala" DATA_COLLECTION_CLASS (video_source_collection_parent_class)->finalize (obj); -#line 11092 "VideoSupport.c" +#line 11347 "VideoSupport.c" } -GType video_source_collection_get_type (void) { +GType +video_source_collection_get_type (void) +{ static volatile gsize video_source_collection_type_id__volatile = 0; if (g_once_init_enter (&video_source_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (VideoSourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) video_source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (VideoSourceCollection), 0, (GInstanceInitFunc) video_source_collection_instance_init, NULL }; @@ -11108,7 +11365,11 @@ GType video_source_collection_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -11120,7 +11381,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/camera/Camera.c b/src/camera/Camera.c index 0d6d3ce..6decca0 100644 --- a/src/camera/Camera.c +++ b/src/camera/Camera.c @@ -1,4 +1,4 @@ -/* Camera.c generated by valac 0.36.6, the Vala compiler +/* Camera.c generated by valac 0.40.4, the Vala compiler * generated from Camera.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include @@ -19,17 +20,21 @@ void camera_terminate (void); void camera_branch_terminate (void); -void camera_init (GError** error) { +void +camera_init (GError** error) +{ #line 10 "/home/jens/Source/shotwell/src/camera/Camera.vala" camera_branch_init (); -#line 26 "Camera.c" +#line 29 "Camera.c" } -void camera_terminate (void) { +void +camera_terminate (void) +{ #line 14 "/home/jens/Source/shotwell/src/camera/Camera.vala" camera_branch_terminate (); -#line 33 "Camera.c" +#line 38 "Camera.c" } diff --git a/src/camera/CameraBranch.c b/src/camera/CameraBranch.c index 9ac4b11..17c9f52 100644 --- a/src/camera/CameraBranch.c +++ b/src/camera/CameraBranch.c @@ -1,4 +1,4 @@ -/* CameraBranch.c generated by valac 0.36.6, the Vala compiler +/* CameraBranch.c generated by valac 0.40.4, the Vala compiler * generated from CameraBranch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -70,6 +71,11 @@ typedef struct _SidebarSimplePageEntryClass SidebarSimplePageEntryClass; typedef struct _CameraSidebarEntry CameraSidebarEntry; typedef struct _CameraSidebarEntryClass CameraSidebarEntryClass; +enum { + CAMERA_BRANCH_0_PROPERTY, + CAMERA_BRANCH_NUM_PROPERTIES +}; +static GParamSpec* camera_branch_properties[CAMERA_BRANCH_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define SIDEBAR_TYPE_GROUPING (sidebar_grouping_get_type ()) @@ -161,6 +167,11 @@ typedef struct _SidebarEmphasizableEntry SidebarEmphasizableEntry; typedef struct _SidebarEmphasizableEntryIface SidebarEmphasizableEntryIface; typedef struct _SidebarHeaderPrivate SidebarHeaderPrivate; typedef struct _CameraHeaderPrivate CameraHeaderPrivate; +enum { + CAMERA_HEADER_0_PROPERTY, + CAMERA_HEADER_NUM_PROPERTIES +}; +static GParamSpec* camera_header_properties[CAMERA_HEADER_NUM_PROPERTIES]; #define SIDEBAR_TYPE_SELECTABLE_ENTRY (sidebar_selectable_entry_get_type ()) #define SIDEBAR_SELECTABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY, SidebarSelectableEntry)) @@ -197,6 +208,11 @@ typedef struct _SidebarContextable SidebarContextable; typedef struct _SidebarContextableIface SidebarContextableIface; typedef struct _SidebarSimplePageEntryPrivate SidebarSimplePageEntryPrivate; typedef struct _CameraSidebarEntryPrivate CameraSidebarEntryPrivate; +enum { + CAMERA_SIDEBAR_ENTRY_0_PROPERTY, + CAMERA_SIDEBAR_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* camera_sidebar_entry_properties[CAMERA_SIDEBAR_ENTRY_NUM_PROPERTIES]; typedef struct _DiscoveredCameraPrivate DiscoveredCameraPrivate; #define TYPE_CHECKERBOARD_PAGE (checkerboard_page_get_type ()) @@ -375,17 +391,20 @@ GType sidebar_branch_get_type (void) G_GNUC_CONST; GType camera_branch_get_type (void) G_GNUC_CONST; gpointer discovered_camera_ref (gpointer instance); void discovered_camera_unref (gpointer instance); -GParamSpec* param_spec_discovered_camera (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_discovered_camera (GValue* value, gpointer v_object); -void value_take_discovered_camera (GValue* value, gpointer v_object); +GParamSpec* param_spec_discovered_camera (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_discovered_camera (GValue* value, + gpointer v_object); +void value_take_discovered_camera (GValue* value, + gpointer v_object); gpointer value_get_discovered_camera (const GValue* value); GType discovered_camera_get_type (void) G_GNUC_CONST; GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST; GType camera_sidebar_entry_get_type (void) G_GNUC_CONST; #define CAMERA_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CAMERA_TYPE_BRANCH, CameraBranchPrivate)) -enum { - CAMERA_BRANCH_DUMMY_PROPERTY -}; #define RESOURCES_ICON_CAMERAS "camera-photo" CameraBranch* camera_branch_new (void); CameraBranch* camera_branch_construct (GType object_type); @@ -397,96 +416,144 @@ GType camera_header_get_type (void) G_GNUC_CONST; GType sidebar_tree_get_type (void) G_GNUC_CONST; GType sidebar_entry_get_type (void) G_GNUC_CONST; GType sidebar_branch_options_get_type (void) G_GNUC_CONST; -static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b); -static gint _camera_branch_camera_comparator_gcompare_func (gconstpointer a, gconstpointer b); -SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator); -SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator); +static gint camera_branch_camera_comparator (SidebarEntry* a, + SidebarEntry* b); +static gint _camera_branch_camera_comparator_gcompare_func (gconstpointer a, + gconstpointer b); +SidebarBranch* sidebar_branch_new (SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator); +SidebarBranch* sidebar_branch_construct (GType object_type, + SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator); gpointer camera_table_ref (gpointer instance); void camera_table_unref (gpointer instance); -GParamSpec* param_spec_camera_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_camera_table (GValue* value, gpointer v_object); -void value_take_camera_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_camera_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_camera_table (GValue* value, + gpointer v_object); +void value_take_camera_table (GValue* value, + gpointer v_object); gpointer value_get_camera_table (const GValue* value); GType camera_table_get_type (void) G_GNUC_CONST; CameraTable* camera_table_get_instance (void); GeeIterable* camera_table_get_cameras (CameraTable* self); -static void camera_branch_add_camera (CameraBranch* self, DiscoveredCamera* camera); -static void camera_branch_on_camera_added (CameraBranch* self, DiscoveredCamera* camera); -static void _camera_branch_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self); -static void camera_branch_on_camera_removed (CameraBranch* self, DiscoveredCamera* camera); -static void _camera_branch_on_camera_removed_camera_table_camera_removed (CameraTable* _sender, DiscoveredCamera* camera, gpointer self); +static void camera_branch_add_camera (CameraBranch* self, + DiscoveredCamera* camera); +static void camera_branch_on_camera_added (CameraBranch* self, + DiscoveredCamera* camera); +static void _camera_branch_on_camera_added_camera_table_camera_added (CameraTable* _sender, + DiscoveredCamera* camera, + gpointer self); +static void camera_branch_on_camera_removed (CameraBranch* self, + DiscoveredCamera* camera); +static void _camera_branch_on_camera_removed_camera_table_camera_removed (CameraTable* _sender, + DiscoveredCamera* camera, + gpointer self); void camera_branch_init (void); void camera_branch_terminate (void); gchar* sidebar_entry_get_sidebar_name (SidebarEntry* self); gchar* camera_sidebar_entry_get_uri (CameraSidebarEntry* self); -CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, DiscoveredCamera* camera); -static void camera_branch_remove_camera (CameraBranch* self, DiscoveredCamera* camera); +CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, + DiscoveredCamera* camera); +static void camera_branch_remove_camera (CameraBranch* self, + DiscoveredCamera* camera); CameraSidebarEntry* camera_sidebar_entry_new (DiscoveredCamera* camera); -CameraSidebarEntry* camera_sidebar_entry_construct (GType object_type, DiscoveredCamera* camera); -void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator); +CameraSidebarEntry* camera_sidebar_entry_construct (GType object_type, + DiscoveredCamera* camera); +void sidebar_branch_graft (SidebarBranch* self, + SidebarEntry* parent, + SidebarEntry* entry, + GCompareFunc comparator); SidebarEntry* sidebar_branch_get_root (SidebarBranch* self); -void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry); +void sidebar_branch_prune (SidebarBranch* self, + SidebarEntry* entry); static void camera_branch_finalize (GObject * obj); GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST; GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST; GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST; -enum { - CAMERA_HEADER_DUMMY_PROPERTY -}; -SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized); -SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized); +SidebarHeader* sidebar_header_new (const gchar* name, + const gchar* tooltip, + gboolean emphasized); +SidebarHeader* sidebar_header_construct (GType object_type, + const gchar* name, + const gchar* tooltip, + gboolean emphasized); GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST; GType page_get_type (void) G_GNUC_CONST; GType sidebar_page_representative_get_type (void) G_GNUC_CONST; GType sidebar_contextable_get_type (void) G_GNUC_CONST; #define CAMERA_SIDEBAR_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntryPrivate)) -enum { - CAMERA_SIDEBAR_ENTRY_DUMMY_PROPERTY -}; SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type); static gchar* camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base); static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base); static Page* camera_sidebar_entry_real_create_page (SidebarSimplePageEntry* base); gchar* sidebar_simple_page_entry_get_sidebar_name (SidebarSimplePageEntry* self); gchar* sidebar_simple_page_entry_get_sidebar_icon (SidebarSimplePageEntry* self); -ImportPage* import_page_new (Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon); -ImportPage* import_page_construct (GType object_type, Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon); +ImportPage* import_page_new (Camera* camera, + const gchar* uri, + const gchar* display_name, + const gchar* icon); +ImportPage* import_page_construct (GType object_type, + Camera* camera, + const gchar* uri, + const gchar* display_name, + const gchar* icon); GType checkerboard_page_get_type (void) G_GNUC_CONST; GType import_page_get_type (void) G_GNUC_CONST; static void camera_sidebar_entry_finalize (GObject * obj); -static gint _camera_branch_camera_comparator_gcompare_func (gconstpointer a, gconstpointer b) { +static gint +_camera_branch_camera_comparator_gcompare_func (gconstpointer a, + gconstpointer b) +{ gint result; result = camera_branch_camera_comparator ((SidebarEntry*) a, (SidebarEntry*) b); #line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" return result; -#line 465 "CameraBranch.c" +#line 522 "CameraBranch.c" } -static void _camera_branch_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) { +static void +_camera_branch_on_camera_added_camera_table_camera_added (CameraTable* _sender, + DiscoveredCamera* camera, + gpointer self) +{ #line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" camera_branch_on_camera_added ((CameraBranch*) self, camera); -#line 472 "CameraBranch.c" +#line 533 "CameraBranch.c" } -static void _camera_branch_on_camera_removed_camera_table_camera_removed (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) { +static void +_camera_branch_on_camera_removed_camera_table_camera_removed (CameraTable* _sender, + DiscoveredCamera* camera, + gpointer self) +{ #line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" camera_branch_on_camera_removed ((CameraBranch*) self, camera); -#line 479 "CameraBranch.c" +#line 544 "CameraBranch.c" } -CameraBranch* camera_branch_construct (GType object_type) { +CameraBranch* +camera_branch_construct (GType object_type) +{ CameraBranch * self = NULL; CameraHeader* _tmp0_; CameraHeader* _tmp1_; + CameraTable* _tmp12_; CameraTable* _tmp13_; CameraTable* _tmp14_; CameraTable* _tmp15_; - CameraTable* _tmp16_; #line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _tmp0_ = camera_header_new (); #line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" @@ -495,7 +562,7 @@ CameraBranch* camera_branch_construct (GType object_type) { self = (CameraBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY | SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD, _camera_branch_camera_comparator_gcompare_func, NULL); #line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _g_object_unref0 (_tmp1_); -#line 499 "CameraBranch.c" +#line 566 "CameraBranch.c" { GeeIterator* _camera_it = NULL; CameraTable* _tmp2_; @@ -524,226 +591,212 @@ CameraBranch* camera_branch_construct (GType object_type) { _camera_it = _tmp7_; #line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" while (TRUE) { -#line 528 "CameraBranch.c" +#line 595 "CameraBranch.c" GeeIterator* _tmp8_; - gboolean _tmp9_; DiscoveredCamera* camera = NULL; - GeeIterator* _tmp10_; - gpointer _tmp11_; - DiscoveredCamera* _tmp12_; + GeeIterator* _tmp9_; + gpointer _tmp10_; + DiscoveredCamera* _tmp11_; #line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _tmp8_ = _camera_it; #line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp9_ = gee_iterator_next (_tmp8_); -#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - if (!_tmp9_) { + if (!gee_iterator_next (_tmp8_)) { #line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" break; -#line 543 "CameraBranch.c" +#line 607 "CameraBranch.c" } #line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp10_ = _camera_it; + _tmp9_ = _camera_it; #line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp11_ = gee_iterator_get (_tmp10_); + _tmp10_ = gee_iterator_get (_tmp9_); #line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - camera = (DiscoveredCamera*) _tmp11_; + camera = (DiscoveredCamera*) _tmp10_; #line 19 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp12_ = camera; + _tmp11_ = camera; #line 19 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - camera_branch_add_camera (self, _tmp12_); + camera_branch_add_camera (self, _tmp11_); #line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _discovered_camera_unref0 (camera); -#line 557 "CameraBranch.c" +#line 621 "CameraBranch.c" } #line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _g_object_unref0 (_camera_it); -#line 561 "CameraBranch.c" +#line 625 "CameraBranch.c" } #line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp13_ = camera_table_get_instance (); + _tmp12_ = camera_table_get_instance (); #line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - g_signal_connect_object (_tmp14_, "camera-added", (GCallback) _camera_branch_on_camera_added_camera_table_camera_added, self, 0); + g_signal_connect_object (_tmp13_, "camera-added", (GCallback) _camera_branch_on_camera_added_camera_table_camera_added, self, 0); #line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _camera_table_unref0 (_tmp14_); + _camera_table_unref0 (_tmp13_); #line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp15_ = camera_table_get_instance (); + _tmp14_ = camera_table_get_instance (); #line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - g_signal_connect_object (_tmp16_, "camera-removed", (GCallback) _camera_branch_on_camera_removed_camera_table_camera_removed, self, 0); + g_signal_connect_object (_tmp15_, "camera-removed", (GCallback) _camera_branch_on_camera_removed_camera_table_camera_removed, self, 0); #line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _camera_table_unref0 (_tmp16_); + _camera_table_unref0 (_tmp15_); #line 13 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" return self; -#line 581 "CameraBranch.c" +#line 645 "CameraBranch.c" } -CameraBranch* camera_branch_new (void) { +CameraBranch* +camera_branch_new (void) +{ #line 13 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" return camera_branch_construct (CAMERA_TYPE_BRANCH); -#line 588 "CameraBranch.c" +#line 654 "CameraBranch.c" } -void camera_branch_init (void) { +void +camera_branch_init (void) +{ } -void camera_branch_terminate (void) { +void +camera_branch_terminate (void) +{ } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 39 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" return self ? g_object_ref (self) : NULL; -#line 603 "CameraBranch.c" +#line 675 "CameraBranch.c" } -static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b) { +static gint +camera_branch_camera_comparator (SidebarEntry* a, + SidebarEntry* b) +{ gint result = 0; - SidebarEntry* _tmp0_; - SidebarEntry* _tmp1_; gint ret = 0; - SidebarEntry* _tmp2_; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - SidebarEntry* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - gint _tmp8_; - gint _tmp9_; - gint _tmp10_; + gint _tmp4_; + gint _tmp5_; #line 31 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 31 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0); #line 32 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp0_ = a; -#line 32 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp1_ = b; -#line 32 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - if (_tmp0_ == _tmp1_) { + if (a == b) { #line 33 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" result = 0; #line 33 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" return result; -#line 635 "CameraBranch.c" +#line 701 "CameraBranch.c" } #line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp2_ = a; -#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp3_ = sidebar_entry_get_sidebar_name (_tmp2_); -#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp4_ = _tmp3_; + _tmp0_ = sidebar_entry_get_sidebar_name (a); #line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp5_ = b; -#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp6_ = sidebar_entry_get_sidebar_name (_tmp5_); + _tmp1_ = _tmp0_; #line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp7_ = _tmp6_; + _tmp2_ = sidebar_entry_get_sidebar_name (b); #line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp8_ = g_utf8_collate (_tmp4_, _tmp7_); + _tmp3_ = _tmp2_; #line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp9_ = _tmp8_; + _tmp4_ = g_utf8_collate (_tmp1_, _tmp3_); #line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp3_); #line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp1_); #line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - ret = _tmp9_; + ret = _tmp4_; #line 37 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp10_ = ret; + _tmp5_ = ret; #line 37 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - if (_tmp10_ == 0) { -#line 663 "CameraBranch.c" + if (_tmp5_ == 0) { +#line 723 "CameraBranch.c" CameraSidebarEntry* cam_a = NULL; - SidebarEntry* _tmp11_; - CameraSidebarEntry* _tmp12_; + CameraSidebarEntry* _tmp6_; CameraSidebarEntry* cam_b = NULL; - SidebarEntry* _tmp13_; + CameraSidebarEntry* _tmp7_; + gboolean _tmp8_ = FALSE; + CameraSidebarEntry* _tmp9_; + CameraSidebarEntry* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; CameraSidebarEntry* _tmp14_; - gboolean _tmp15_ = FALSE; - CameraSidebarEntry* _tmp16_; - CameraSidebarEntry* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; - CameraSidebarEntry* _tmp21_; - gchar* _tmp22_; - gchar* _tmp23_; - gint _tmp24_; -#line 39 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp11_ = a; + gchar* _tmp15_; + gchar* _tmp16_; #line 39 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, CAMERA_TYPE_SIDEBAR_ENTRY) ? ((CameraSidebarEntry*) _tmp11_) : NULL); + _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (a, CAMERA_TYPE_SIDEBAR_ENTRY) ? ((CameraSidebarEntry*) a) : NULL); #line 39 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - cam_a = _tmp12_; + cam_a = _tmp6_; #line 40 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp13_ = b; + _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (b, CAMERA_TYPE_SIDEBAR_ENTRY) ? ((CameraSidebarEntry*) b) : NULL); #line 40 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, CAMERA_TYPE_SIDEBAR_ENTRY) ? ((CameraSidebarEntry*) _tmp13_) : NULL); -#line 40 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - cam_b = _tmp14_; + cam_b = _tmp7_; #line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp16_ = cam_a; + _tmp9_ = cam_a; #line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - if (_tmp16_ != NULL) { -#line 695 "CameraBranch.c" - CameraSidebarEntry* _tmp17_; + if (_tmp9_ != NULL) { +#line 748 "CameraBranch.c" + CameraSidebarEntry* _tmp10_; #line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp17_ = cam_b; + _tmp10_ = cam_b; #line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp15_ = _tmp17_ != NULL; -#line 701 "CameraBranch.c" + _tmp8_ = _tmp10_ != NULL; +#line 754 "CameraBranch.c" } else { #line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp15_ = FALSE; -#line 705 "CameraBranch.c" + _tmp8_ = FALSE; +#line 758 "CameraBranch.c" } #line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _vala_assert (_tmp15_, "cam_a != null && cam_b != null"); -#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp18_ = cam_a; + _vala_assert (_tmp8_, "cam_a != null && cam_b != null"); #line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp19_ = camera_sidebar_entry_get_uri (_tmp18_); + _tmp11_ = cam_a; #line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp20_ = _tmp19_; + _tmp12_ = camera_sidebar_entry_get_uri (_tmp11_); #line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp21_ = cam_b; + _tmp13_ = _tmp12_; #line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp22_ = camera_sidebar_entry_get_uri (_tmp21_); + _tmp14_ = cam_b; #line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp23_ = _tmp22_; + _tmp15_ = camera_sidebar_entry_get_uri (_tmp14_); #line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp24_ = g_utf8_collate (_tmp20_, _tmp23_); + _tmp16_ = _tmp15_; #line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - ret = _tmp24_; + ret = g_utf8_collate (_tmp13_, _tmp16_); #line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _g_free0 (_tmp23_); + _g_free0 (_tmp16_); #line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp13_); #line 37 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _g_object_unref0 (cam_b); #line 37 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _g_object_unref0 (cam_a); -#line 733 "CameraBranch.c" +#line 784 "CameraBranch.c" } #line 45 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" result = ret; #line 45 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" return result; -#line 739 "CameraBranch.c" +#line 790 "CameraBranch.c" } -CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, DiscoveredCamera* camera) { +CameraSidebarEntry* +camera_branch_get_entry_for_camera (CameraBranch* self, + DiscoveredCamera* camera) +{ CameraSidebarEntry* result = NULL; GeeHashMap* _tmp0_; - DiscoveredCamera* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 48 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" g_return_val_if_fail (CAMERA_IS_BRANCH (self), NULL); #line 48 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" @@ -751,56 +804,53 @@ CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, Disc #line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _tmp0_ = self->priv->camera_map; #line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp1_ = camera; -#line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), camera); #line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - result = (CameraSidebarEntry*) _tmp2_; + result = (CameraSidebarEntry*) _tmp1_; #line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" return result; -#line 762 "CameraBranch.c" +#line 813 "CameraBranch.c" } -static void camera_branch_on_camera_added (CameraBranch* self, DiscoveredCamera* camera) { - DiscoveredCamera* _tmp0_; +static void +camera_branch_on_camera_added (CameraBranch* self, + DiscoveredCamera* camera) +{ #line 52 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" g_return_if_fail (CAMERA_IS_BRANCH (self)); #line 52 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" g_return_if_fail (IS_DISCOVERED_CAMERA (camera)); #line 53 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp0_ = camera; -#line 53 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - camera_branch_add_camera (self, _tmp0_); -#line 776 "CameraBranch.c" + camera_branch_add_camera (self, camera); +#line 827 "CameraBranch.c" } -static void camera_branch_on_camera_removed (CameraBranch* self, DiscoveredCamera* camera) { - DiscoveredCamera* _tmp0_; +static void +camera_branch_on_camera_removed (CameraBranch* self, + DiscoveredCamera* camera) +{ #line 56 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" g_return_if_fail (CAMERA_IS_BRANCH (self)); #line 56 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" g_return_if_fail (IS_DISCOVERED_CAMERA (camera)); #line 57 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp0_ = camera; -#line 57 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - camera_branch_remove_camera (self, _tmp0_); -#line 790 "CameraBranch.c" + camera_branch_remove_camera (self, camera); +#line 841 "CameraBranch.c" } -static void camera_branch_add_camera (CameraBranch* self, DiscoveredCamera* camera) { +static void +camera_branch_add_camera (CameraBranch* self, + DiscoveredCamera* camera) +{ GeeHashMap* _tmp0_; - DiscoveredCamera* _tmp1_; - gboolean _tmp2_; CameraSidebarEntry* entry = NULL; - DiscoveredCamera* _tmp3_; - CameraSidebarEntry* _tmp4_; - GeeHashMap* _tmp5_; - DiscoveredCamera* _tmp6_; - SidebarEntry* _tmp7_; - SidebarEntry* _tmp8_; + CameraSidebarEntry* _tmp1_; + GeeHashMap* _tmp2_; + SidebarEntry* _tmp3_; + SidebarEntry* _tmp4_; #line 60 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" g_return_if_fail (CAMERA_IS_BRANCH (self)); #line 60 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" @@ -808,49 +858,40 @@ static void camera_branch_add_camera (CameraBranch* self, DiscoveredCamera* came #line 61 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _tmp0_ = self->priv->camera_map; #line 61 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp1_ = camera; -#line 61 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 61 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _vala_assert (!_tmp2_, "!camera_map.has_key(camera)"); + _vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), camera), "!camera_map.has_key(camera)"); #line 63 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp3_ = camera; + _tmp1_ = camera_sidebar_entry_new (camera); #line 63 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp4_ = camera_sidebar_entry_new (_tmp3_); -#line 63 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - entry = _tmp4_; -#line 64 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp5_ = self->priv->camera_map; + entry = _tmp1_; #line 64 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp6_ = camera; + _tmp2_ = self->priv->camera_map; #line 64 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_, entry); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), camera, entry); #line 67 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp7_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp3_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 67 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp8_ = _tmp7_; + _tmp4_ = _tmp3_; #line 67 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp8_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); #line 67 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp4_); #line 60 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _g_object_unref0 (entry); -#line 839 "CameraBranch.c" +#line 881 "CameraBranch.c" } -static void camera_branch_remove_camera (CameraBranch* self, DiscoveredCamera* camera) { +static void +camera_branch_remove_camera (CameraBranch* self, + DiscoveredCamera* camera) +{ GeeHashMap* _tmp0_; - DiscoveredCamera* _tmp1_; - gboolean _tmp2_; CameraSidebarEntry* entry = NULL; - GeeHashMap* _tmp3_; - DiscoveredCamera* _tmp4_; - gpointer _tmp5_; + GeeHashMap* _tmp1_; + gpointer _tmp2_; gboolean removed = FALSE; - GeeHashMap* _tmp6_; - DiscoveredCamera* _tmp7_; - gboolean _tmp8_; + GeeHashMap* _tmp3_; + gboolean _tmp4_; #line 70 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" g_return_if_fail (CAMERA_IS_BRANCH (self)); #line 70 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" @@ -858,40 +899,34 @@ static void camera_branch_remove_camera (CameraBranch* self, DiscoveredCamera* c #line 71 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _tmp0_ = self->priv->camera_map; #line 71 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp1_ = camera; -#line 71 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 71 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _vala_assert (_tmp2_, "camera_map.has_key(camera)"); -#line 73 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp3_ = self->priv->camera_map; + _vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), camera), "camera_map.has_key(camera)"); #line 73 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp4_ = camera; + _tmp1_ = self->priv->camera_map; #line 73 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), camera); #line 73 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - entry = (CameraSidebarEntry*) _tmp5_; + entry = (CameraSidebarEntry*) _tmp2_; #line 74 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _vala_assert (entry != NULL, "entry != null"); #line 76 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp6_ = self->priv->camera_map; -#line 76 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp7_ = camera; + _tmp3_ = self->priv->camera_map; #line 76 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp8_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, NULL); + _tmp4_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), camera, NULL); #line 76 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - removed = _tmp8_; + removed = _tmp4_; #line 77 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _vala_assert (removed, "removed"); #line 79 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry)); #line 70 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _g_object_unref0 (entry); -#line 891 "CameraBranch.c" +#line 924 "CameraBranch.c" } -static void camera_branch_class_init (CameraBranchClass * klass) { +static void +camera_branch_class_init (CameraBranchClass * klass) +{ gchar* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" camera_branch_parent_class = g_type_class_peek_parent (klass); @@ -903,11 +938,13 @@ static void camera_branch_class_init (CameraBranchClass * klass) { _tmp0_ = g_strdup (RESOURCES_ICON_CAMERAS); #line 8 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" camera_branch_cameras_icon = _tmp0_; -#line 907 "CameraBranch.c" +#line 942 "CameraBranch.c" } -static void camera_branch_instance_init (CameraBranch * self) { +static void +camera_branch_instance_init (CameraBranch * self) +{ GeeHashMap* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" self->priv = CAMERA_BRANCH_GET_PRIVATE (self); @@ -915,11 +952,13 @@ static void camera_branch_instance_init (CameraBranch * self) { _tmp0_ = gee_hash_map_new (TYPE_DISCOVERED_CAMERA, (GBoxedCopyFunc) discovered_camera_ref, (GDestroyNotify) discovered_camera_unref, CAMERA_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 10 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" self->priv->camera_map = _tmp0_; -#line 919 "CameraBranch.c" +#line 956 "CameraBranch.c" } -static void camera_branch_finalize (GObject * obj) { +static void +camera_branch_finalize (GObject * obj) +{ CameraBranch * self; #line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, CAMERA_TYPE_BRANCH, CameraBranch); @@ -927,11 +966,13 @@ static void camera_branch_finalize (GObject * obj) { _g_object_unref0 (self->priv->camera_map); #line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" G_OBJECT_CLASS (camera_branch_parent_class)->finalize (obj); -#line 931 "CameraBranch.c" +#line 970 "CameraBranch.c" } -GType camera_branch_get_type (void) { +GType +camera_branch_get_type (void) +{ static volatile gsize camera_branch_type_id__volatile = 0; if (g_once_init_enter (&camera_branch_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CameraBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) camera_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CameraBranch), 0, (GInstanceInitFunc) camera_branch_instance_init, NULL }; @@ -943,35 +984,45 @@ GType camera_branch_get_type (void) { } -CameraHeader* camera_header_construct (GType object_type) { +CameraHeader* +camera_header_construct (GType object_type) +{ CameraHeader * self = NULL; #line 85 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" self = (CameraHeader*) sidebar_header_construct (object_type, _ ("Cameras"), _ ("List of all discovered camera devices"), TRUE); #line 84 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" return self; -#line 953 "CameraBranch.c" +#line 996 "CameraBranch.c" } -CameraHeader* camera_header_new (void) { +CameraHeader* +camera_header_new (void) +{ #line 84 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" return camera_header_construct (CAMERA_TYPE_HEADER); -#line 960 "CameraBranch.c" +#line 1005 "CameraBranch.c" } -static void camera_header_class_init (CameraHeaderClass * klass) { +static void +camera_header_class_init (CameraHeaderClass * klass) +{ #line 83 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" camera_header_parent_class = g_type_class_peek_parent (klass); -#line 967 "CameraBranch.c" +#line 1014 "CameraBranch.c" } -static void camera_header_instance_init (CameraHeader * self) { +static void +camera_header_instance_init (CameraHeader * self) +{ } -GType camera_header_get_type (void) { +GType +camera_header_get_type (void) +{ static volatile gsize camera_header_type_id__volatile = 0; if (g_once_init_enter (&camera_header_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CameraHeaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) camera_header_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CameraHeader), 0, (GInstanceInitFunc) camera_header_instance_init, NULL }; @@ -983,56 +1034,59 @@ GType camera_header_get_type (void) { } -static gpointer _discovered_camera_ref0 (gpointer self) { +static gpointer +_discovered_camera_ref0 (gpointer self) +{ #line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" return self ? discovered_camera_ref (self) : NULL; -#line 990 "CameraBranch.c" +#line 1043 "CameraBranch.c" } -CameraSidebarEntry* camera_sidebar_entry_construct (GType object_type, DiscoveredCamera* camera) { +CameraSidebarEntry* +camera_sidebar_entry_construct (GType object_type, + DiscoveredCamera* camera) +{ CameraSidebarEntry * self = NULL; DiscoveredCamera* _tmp0_; - DiscoveredCamera* _tmp1_; - DiscoveredCamera* _tmp2_; - const gchar* _tmp3_; - gchar* _tmp4_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 93 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" g_return_val_if_fail (IS_DISCOVERED_CAMERA (camera), NULL); #line 93 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" self = (CameraSidebarEntry*) sidebar_simple_page_entry_construct (object_type); #line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp0_ = camera; -#line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp1_ = _discovered_camera_ref0 (_tmp0_); + _tmp0_ = _discovered_camera_ref0 (camera); #line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _discovered_camera_unref0 (self->priv->camera); #line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - self->priv->camera = _tmp1_; + self->priv->camera = _tmp0_; #line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp2_ = camera; + _tmp1_ = camera->uri; #line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp3_ = _tmp2_->uri; -#line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - _tmp4_ = g_strdup (_tmp3_); + _tmp2_ = g_strdup (_tmp1_); #line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _g_free0 (self->priv->uri); #line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" - self->priv->uri = _tmp4_; + self->priv->uri = _tmp2_; #line 93 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" return self; -#line 1025 "CameraBranch.c" +#line 1075 "CameraBranch.c" } -CameraSidebarEntry* camera_sidebar_entry_new (DiscoveredCamera* camera) { +CameraSidebarEntry* +camera_sidebar_entry_new (DiscoveredCamera* camera) +{ #line 93 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" return camera_sidebar_entry_construct (CAMERA_TYPE_SIDEBAR_ENTRY, camera); -#line 1032 "CameraBranch.c" +#line 1084 "CameraBranch.c" } -static gchar* camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ CameraSidebarEntry * self; gchar* result = NULL; const gchar* _tmp0_ = NULL; @@ -1051,7 +1105,7 @@ static gchar* camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry if (_tmp0_ == NULL) { #line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _tmp0_ = _ ("Camera"); -#line 1055 "CameraBranch.c" +#line 1109 "CameraBranch.c" } #line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _tmp3_ = g_strdup (_tmp0_); @@ -1059,11 +1113,13 @@ static gchar* camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry result = _tmp3_; #line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" return result; -#line 1063 "CameraBranch.c" +#line 1117 "CameraBranch.c" } -static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { +static gchar* +camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) +{ CameraSidebarEntry * self; gchar* result = NULL; const gchar* _tmp0_ = NULL; @@ -1080,13 +1136,13 @@ static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry _tmp0_ = _tmp2_; #line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" if (_tmp0_ == NULL) { -#line 1084 "CameraBranch.c" +#line 1140 "CameraBranch.c" const gchar* _tmp3_; #line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _tmp3_ = camera_branch_cameras_icon; #line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _tmp0_ = _tmp3_; -#line 1090 "CameraBranch.c" +#line 1146 "CameraBranch.c" } #line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" _tmp4_ = g_strdup (_tmp0_); @@ -1094,11 +1150,13 @@ static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry result = _tmp4_; #line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" return result; -#line 1098 "CameraBranch.c" +#line 1154 "CameraBranch.c" } -static Page* camera_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +camera_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) +{ CameraSidebarEntry * self; Page* result = NULL; DiscoveredCamera* _tmp0_; @@ -1140,11 +1198,13 @@ static Page* camera_sidebar_entry_real_create_page (SidebarSimplePageEntry* base result = _tmp8_; #line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" return result; -#line 1144 "CameraBranch.c" +#line 1202 "CameraBranch.c" } -gchar* camera_sidebar_entry_get_uri (CameraSidebarEntry* self) { +gchar* +camera_sidebar_entry_get_uri (CameraSidebarEntry* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -1158,11 +1218,13 @@ gchar* camera_sidebar_entry_get_uri (CameraSidebarEntry* self) { result = _tmp1_; #line 111 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" return result; -#line 1162 "CameraBranch.c" +#line 1222 "CameraBranch.c" } -static void camera_sidebar_entry_class_init (CameraSidebarEntryClass * klass) { +static void +camera_sidebar_entry_class_init (CameraSidebarEntryClass * klass) +{ #line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" camera_sidebar_entry_parent_class = g_type_class_peek_parent (klass); #line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" @@ -1175,18 +1237,22 @@ static void camera_sidebar_entry_class_init (CameraSidebarEntryClass * klass) { ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) camera_sidebar_entry_real_create_page; #line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" G_OBJECT_CLASS (klass)->finalize = camera_sidebar_entry_finalize; -#line 1179 "CameraBranch.c" +#line 1241 "CameraBranch.c" } -static void camera_sidebar_entry_instance_init (CameraSidebarEntry * self) { +static void +camera_sidebar_entry_instance_init (CameraSidebarEntry * self) +{ #line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" self->priv = CAMERA_SIDEBAR_ENTRY_GET_PRIVATE (self); -#line 1186 "CameraBranch.c" +#line 1250 "CameraBranch.c" } -static void camera_sidebar_entry_finalize (GObject * obj) { +static void +camera_sidebar_entry_finalize (GObject * obj) +{ CameraSidebarEntry * self; #line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry); @@ -1196,11 +1262,13 @@ static void camera_sidebar_entry_finalize (GObject * obj) { _g_free0 (self->priv->uri); #line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala" G_OBJECT_CLASS (camera_sidebar_entry_parent_class)->finalize (obj); -#line 1200 "CameraBranch.c" +#line 1266 "CameraBranch.c" } -GType camera_sidebar_entry_get_type (void) { +GType +camera_sidebar_entry_get_type (void) +{ static volatile gsize camera_sidebar_entry_type_id__volatile = 0; if (g_once_init_enter (&camera_sidebar_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CameraSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) camera_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CameraSidebarEntry), 0, (GInstanceInitFunc) camera_sidebar_entry_instance_init, NULL }; diff --git a/src/camera/CameraTable.c b/src/camera/CameraTable.c index 5c3c502..f0f37e6 100644 --- a/src/camera/CameraTable.c +++ b/src/camera/CameraTable.c @@ -1,4 +1,4 @@ -/* CameraTable.c generated by valac 0.36.6, the Vala compiler +/* CameraTable.c generated by valac 0.40.4, the Vala compiler * generated from CameraTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -107,9 +108,9 @@ typedef struct _ParamSpecCameraTable ParamSpecCameraTable; enum { CAMERA_TABLE_CAMERA_ADDED_SIGNAL, CAMERA_TABLE_CAMERA_REMOVED_SIGNAL, - CAMERA_TABLE_LAST_SIGNAL + CAMERA_TABLE_NUM_SIGNALS }; -static guint camera_table_signals[CAMERA_TABLE_LAST_SIGNAL] = {0}; +static guint camera_table_signals[CAMERA_TABLE_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -171,97 +172,167 @@ static CameraTable* camera_table_instance = NULL; gpointer discovered_camera_ref (gpointer instance); void discovered_camera_unref (gpointer instance); -GParamSpec* param_spec_discovered_camera (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_discovered_camera (GValue* value, gpointer v_object); -void value_take_discovered_camera (GValue* value, gpointer v_object); +GParamSpec* param_spec_discovered_camera (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_discovered_camera (GValue* value, + gpointer v_object); +void value_take_discovered_camera (GValue* value, + gpointer v_object); gpointer value_get_discovered_camera (const GValue* value); GType discovered_camera_get_type (void) G_GNUC_CONST; -enum { - DISCOVERED_CAMERA_DUMMY_PROPERTY -}; -DiscoveredCamera* discovered_camera_new (Camera* gcamera, const gchar* uri, const gchar* display_name, const gchar* icon); -DiscoveredCamera* discovered_camera_construct (GType object_type, Camera* gcamera, const gchar* uri, const gchar* display_name, const gchar* icon); +DiscoveredCamera* discovered_camera_new (Camera* gcamera, + const gchar* uri, + const gchar* display_name, + const gchar* icon); +DiscoveredCamera* discovered_camera_construct (GType object_type, + Camera* gcamera, + const gchar* uri, + const gchar* display_name, + const gchar* icon); static void discovered_camera_finalize (DiscoveredCamera * obj); gpointer camera_table_ref (gpointer instance); void camera_table_unref (gpointer instance); -GParamSpec* param_spec_camera_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_camera_table (GValue* value, gpointer v_object); -void value_take_camera_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_camera_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_camera_table (GValue* value, + gpointer v_object); +void value_take_camera_table (GValue* value, + gpointer v_object); gpointer value_get_camera_table (const GValue* value); GType camera_table_get_type (void) G_GNUC_CONST; gpointer one_shot_scheduler_ref (gpointer instance); void one_shot_scheduler_unref (gpointer instance); -GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_one_shot_scheduler (GValue* value, gpointer v_object); -void value_take_one_shot_scheduler (GValue* value, gpointer v_object); +GParamSpec* param_spec_one_shot_scheduler (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_one_shot_scheduler (GValue* value, + gpointer v_object); +void value_take_one_shot_scheduler (GValue* value, + gpointer v_object); gpointer value_get_one_shot_scheduler (const GValue* value); GType one_shot_scheduler_get_type (void) G_GNUC_CONST; #define CAMERA_TABLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CAMERA_TABLE, CameraTablePrivate)) -enum { - CAMERA_TABLE_DUMMY_PROPERTY -}; #define CAMERA_TABLE_UPDATE_DELAY_MSEC 1000 static CameraTable* camera_table_new (void); static CameraTable* camera_table_construct (GType object_type); static void camera_table_on_update_cameras (CameraTable* self); static void _camera_table_on_update_cameras_one_shot_callback (gpointer self); -OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target); -OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target); -static void camera_table_on_udev_event (CameraTable* self, const gchar* action, GUdevDevice* device); -static void _camera_table_on_udev_event_g_udev_client_uevent (GUdevClient* _sender, const gchar* action, GUdevDevice* device, gpointer self); -void camera_table_on_volume_changed (CameraTable* self, GVolume* volume); -static void _camera_table_on_volume_changed_g_volume_monitor_volume_changed (GVolumeMonitor* _sender, GVolume* volume, gpointer self); -static void _camera_table_on_volume_changed_g_volume_monitor_volume_added (GVolumeMonitor* _sender, GVolume* volume, gpointer self); +OneShotScheduler* one_shot_scheduler_new (const gchar* name, + OneShotCallback callback, + void* callback_target); +OneShotScheduler* one_shot_scheduler_construct (GType object_type, + const gchar* name, + OneShotCallback callback, + void* callback_target); +static void camera_table_on_udev_event (CameraTable* self, + const gchar* action, + GUdevDevice* device); +static void _camera_table_on_udev_event_g_udev_client_uevent (GUdevClient* _sender, + const gchar* action, + GUdevDevice* device, + gpointer self); +void camera_table_on_volume_changed (CameraTable* self, + GVolume* volume); +static void _camera_table_on_volume_changed_g_volume_monitor_volume_changed (GVolumeMonitor* _sender, + GVolume* volume, + gpointer self); +static void _camera_table_on_volume_changed_g_volume_monitor_volume_added (GVolumeMonitor* _sender, + GVolume* volume, + gpointer self); static gboolean camera_table_delayed_init (CameraTable* self); static gboolean _camera_table_delayed_init_gsource_func (gpointer self); GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); GType library_window_get_type (void) G_GNUC_CONST; -void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable); +void library_window_set_page_switching_enabled (LibraryWindow* self, + gboolean should_enable); GQuark gphoto_error_quark (void); -static void camera_table_init_camera_table (CameraTable* self, GError** error); -static void camera_table_update_camera_table (CameraTable* self, GError** error); +static void camera_table_init_camera_table (CameraTable* self, + GError** error); +static void camera_table_update_camera_table (CameraTable* self, + GError** error); CameraTable* camera_table_get_instance (void); GeeIterable* camera_table_get_cameras (CameraTable* self); gint camera_table_get_count (CameraTable* self); -DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, const gchar* uri); -static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GError** error); -static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_length1); -static void _vala_array_add69 (gchar** * array, int* length, int* size, gchar* value); +DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, + const gchar* uri); +static void camera_table_do_op (CameraTable* self, + int res, + const gchar* op, + GError** error); +static gchar** camera_table_get_all_usb_cameras (CameraTable* self, + int* result_length1); +static void _vala_array_add69 (gchar** * array, + int* length, + int* size, + gchar* value); static void _g_object_unref0_ (gpointer var); -static void _g_list_free__g_object_unref0_ (GList* self); -static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_count, gchar** usb_cameras, int usb_cameras_length1, const gchar* port, gchar* * full_port); +static inline void _g_list_free__g_object_unref0_ (GList* self); +static gboolean camera_table_usb_esp (CameraTable* self, + gint current_camera_count, + gchar** usb_cameras, + int usb_cameras_length1, + const gchar* port, + gchar* * full_port); gchar* camera_table_get_port_uri (const gchar* port); gchar* camera_table_get_port_path (const gchar* port); -static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uuid); -static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uuid); -static void _vala_array_add70 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value); -void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule); -static void g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); +static gchar* camera_table_get_name_for_uuid (CameraTable* self, + const gchar* uuid); +static gchar* camera_table_get_icon_for_uuid (CameraTable* self, + const gchar* uuid); +static void _vala_array_add70 (DiscoveredCamera** * array, + int* length, + int* size, + DiscoveredCamera* value); +void one_shot_scheduler_after_timeout (OneShotScheduler* self, + guint msec, + gboolean reschedule); +static void g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); static void camera_table_finalize (CameraTable * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static const gchar* CAMERA_TABLE_SUBSYSTEMS[3] = {"usb", "block", NULL}; -static gpointer _GPHOTO_REF_CAMERA0 (gpointer self) { +static gpointer +_GPHOTO_REF_CAMERA0 (gpointer self) +{ #line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return self ? GPHOTO_REF_CAMERA (self) : NULL; -#line 252 "CameraTable.c" +#line 321 "CameraTable.c" } -DiscoveredCamera* discovered_camera_construct (GType object_type, Camera* gcamera, const gchar* uri, const gchar* display_name, const gchar* icon) { +DiscoveredCamera* +discovered_camera_construct (GType object_type, + Camera* gcamera, + const gchar* uri, + const gchar* display_name, + const gchar* icon) +{ DiscoveredCamera* self = NULL; Camera* _tmp0_; - Camera* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp1_; + gchar* _tmp2_; gchar* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; #line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_val_if_fail (gcamera != NULL, NULL); #line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -271,148 +342,170 @@ DiscoveredCamera* discovered_camera_construct (GType object_type, Camera* gcamer #line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" self = (DiscoveredCamera*) g_type_create_instance (object_type); #line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp0_ = gcamera; -#line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp1_ = _GPHOTO_REF_CAMERA0 (_tmp0_); + _tmp0_ = _GPHOTO_REF_CAMERA0 (gcamera); #line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_camera_unref0 (self->gcamera); #line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - self->gcamera = _tmp1_; + self->gcamera = _tmp0_; #line 15 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp2_ = uri; -#line 15 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (uri); #line 15 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (self->uri); #line 15 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - self->uri = _tmp3_; -#line 16 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp4_ = display_name; + self->uri = _tmp1_; #line 16 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp5_ = g_strdup (_tmp4_); + _tmp2_ = g_strdup (display_name); #line 16 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (self->display_name); #line 16 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - self->display_name = _tmp5_; -#line 17 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp6_ = icon; + self->display_name = _tmp2_; #line 17 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp3_ = g_strdup (icon); #line 17 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (self->icon); #line 17 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - self->icon = _tmp7_; + self->icon = _tmp3_; #line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return self; -#line 308 "CameraTable.c" +#line 371 "CameraTable.c" } -DiscoveredCamera* discovered_camera_new (Camera* gcamera, const gchar* uri, const gchar* display_name, const gchar* icon) { +DiscoveredCamera* +discovered_camera_new (Camera* gcamera, + const gchar* uri, + const gchar* display_name, + const gchar* icon) +{ #line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return discovered_camera_construct (TYPE_DISCOVERED_CAMERA, gcamera, uri, display_name, icon); -#line 315 "CameraTable.c" +#line 383 "CameraTable.c" } -static void value_discovered_camera_init (GValue* value) { +static void +value_discovered_camera_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" value->data[0].v_pointer = NULL; -#line 322 "CameraTable.c" +#line 392 "CameraTable.c" } -static void value_discovered_camera_free_value (GValue* value) { +static void +value_discovered_camera_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" discovered_camera_unref (value->data[0].v_pointer); -#line 331 "CameraTable.c" +#line 403 "CameraTable.c" } } -static void value_discovered_camera_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_discovered_camera_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" dest_value->data[0].v_pointer = discovered_camera_ref (src_value->data[0].v_pointer); -#line 341 "CameraTable.c" +#line 416 "CameraTable.c" } else { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" dest_value->data[0].v_pointer = NULL; -#line 345 "CameraTable.c" +#line 420 "CameraTable.c" } } -static gpointer value_discovered_camera_peek_pointer (const GValue* value) { +static gpointer +value_discovered_camera_peek_pointer (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return value->data[0].v_pointer; -#line 353 "CameraTable.c" +#line 430 "CameraTable.c" } -static gchar* value_discovered_camera_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_discovered_camera_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (collect_values[0].v_pointer) { -#line 360 "CameraTable.c" +#line 442 "CameraTable.c" DiscoveredCamera * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 367 "CameraTable.c" +#line 449 "CameraTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 371 "CameraTable.c" +#line 453 "CameraTable.c" } #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" value->data[0].v_pointer = discovered_camera_ref (object); -#line 375 "CameraTable.c" +#line 457 "CameraTable.c" } else { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" value->data[0].v_pointer = NULL; -#line 379 "CameraTable.c" +#line 461 "CameraTable.c" } #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return NULL; -#line 383 "CameraTable.c" +#line 465 "CameraTable.c" } -static gchar* value_discovered_camera_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_discovered_camera_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ DiscoveredCamera ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 394 "CameraTable.c" +#line 481 "CameraTable.c" } #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" *object_p = NULL; -#line 400 "CameraTable.c" +#line 487 "CameraTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" *object_p = value->data[0].v_pointer; -#line 404 "CameraTable.c" +#line 491 "CameraTable.c" } else { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" *object_p = discovered_camera_ref (value->data[0].v_pointer); -#line 408 "CameraTable.c" +#line 495 "CameraTable.c" } #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return NULL; -#line 412 "CameraTable.c" +#line 499 "CameraTable.c" } -GParamSpec* param_spec_discovered_camera (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_discovered_camera (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecDiscoveredCamera* spec; #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_DISCOVERED_CAMERA), NULL); @@ -422,20 +515,25 @@ GParamSpec* param_spec_discovered_camera (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return G_PARAM_SPEC (spec); -#line 426 "CameraTable.c" +#line 519 "CameraTable.c" } -gpointer value_get_discovered_camera (const GValue* value) { +gpointer +value_get_discovered_camera (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DISCOVERED_CAMERA), NULL); #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return value->data[0].v_pointer; -#line 435 "CameraTable.c" +#line 530 "CameraTable.c" } -void value_set_discovered_camera (GValue* value, gpointer v_object) { +void +value_set_discovered_camera (GValue* value, + gpointer v_object) +{ DiscoveredCamera * old; #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DISCOVERED_CAMERA)); @@ -451,22 +549,25 @@ void value_set_discovered_camera (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" discovered_camera_ref (value->data[0].v_pointer); -#line 455 "CameraTable.c" +#line 553 "CameraTable.c" } else { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" value->data[0].v_pointer = NULL; -#line 459 "CameraTable.c" +#line 557 "CameraTable.c" } #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" discovered_camera_unref (old); -#line 465 "CameraTable.c" +#line 563 "CameraTable.c" } } -void value_take_discovered_camera (GValue* value, gpointer v_object) { +void +value_take_discovered_camera (GValue* value, + gpointer v_object) +{ DiscoveredCamera * old; #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DISCOVERED_CAMERA)); @@ -480,38 +581,44 @@ void value_take_discovered_camera (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" value->data[0].v_pointer = v_object; -#line 484 "CameraTable.c" +#line 585 "CameraTable.c" } else { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" value->data[0].v_pointer = NULL; -#line 488 "CameraTable.c" +#line 589 "CameraTable.c" } #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" discovered_camera_unref (old); -#line 494 "CameraTable.c" +#line 595 "CameraTable.c" } } -static void discovered_camera_class_init (DiscoveredCameraClass * klass) { +static void +discovered_camera_class_init (DiscoveredCameraClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" discovered_camera_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" ((DiscoveredCameraClass *) klass)->finalize = discovered_camera_finalize; -#line 504 "CameraTable.c" +#line 607 "CameraTable.c" } -static void discovered_camera_instance_init (DiscoveredCamera * self) { +static void +discovered_camera_instance_init (DiscoveredCamera * self) +{ #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" self->ref_count = 1; -#line 511 "CameraTable.c" +#line 616 "CameraTable.c" } -static void discovered_camera_finalize (DiscoveredCamera * obj) { +static void +discovered_camera_finalize (DiscoveredCamera * obj) +{ DiscoveredCamera * self; #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DISCOVERED_CAMERA, DiscoveredCamera); @@ -525,11 +632,13 @@ static void discovered_camera_finalize (DiscoveredCamera * obj) { _g_free0 (self->display_name); #line 11 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (self->icon); -#line 529 "CameraTable.c" +#line 636 "CameraTable.c" } -GType discovered_camera_get_type (void) { +GType +discovered_camera_get_type (void) +{ static volatile gsize discovered_camera_type_id__volatile = 0; if (g_once_init_enter (&discovered_camera_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_discovered_camera_init, value_discovered_camera_free_value, value_discovered_camera_copy_value, value_discovered_camera_peek_pointer, "p", value_discovered_camera_collect_value, "p", value_discovered_camera_lcopy_value }; @@ -543,18 +652,22 @@ GType discovered_camera_get_type (void) { } -gpointer discovered_camera_ref (gpointer instance) { +gpointer +discovered_camera_ref (gpointer instance) +{ DiscoveredCamera * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return instance; -#line 554 "CameraTable.c" +#line 665 "CameraTable.c" } -void discovered_camera_unref (gpointer instance) { +void +discovered_camera_unref (gpointer instance) +{ DiscoveredCamera * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -563,49 +676,68 @@ void discovered_camera_unref (gpointer instance) { DISCOVERED_CAMERA_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 567 "CameraTable.c" +#line 680 "CameraTable.c" } } -static void _camera_table_on_update_cameras_one_shot_callback (gpointer self) { +static void +_camera_table_on_update_cameras_one_shot_callback (gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_on_update_cameras ((CameraTable*) self); -#line 575 "CameraTable.c" +#line 690 "CameraTable.c" } -static void _camera_table_on_udev_event_g_udev_client_uevent (GUdevClient* _sender, const gchar* action, GUdevDevice* device, gpointer self) { +static void +_camera_table_on_udev_event_g_udev_client_uevent (GUdevClient* _sender, + const gchar* action, + GUdevDevice* device, + gpointer self) +{ #line 46 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_on_udev_event ((CameraTable*) self, action, device); -#line 582 "CameraTable.c" +#line 702 "CameraTable.c" } -static void _camera_table_on_volume_changed_g_volume_monitor_volume_changed (GVolumeMonitor* _sender, GVolume* volume, gpointer self) { +static void +_camera_table_on_volume_changed_g_volume_monitor_volume_changed (GVolumeMonitor* _sender, + GVolume* volume, + gpointer self) +{ #line 48 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_on_volume_changed ((CameraTable*) self, volume); -#line 589 "CameraTable.c" +#line 713 "CameraTable.c" } -static void _camera_table_on_volume_changed_g_volume_monitor_volume_added (GVolumeMonitor* _sender, GVolume* volume, gpointer self) { +static void +_camera_table_on_volume_changed_g_volume_monitor_volume_added (GVolumeMonitor* _sender, + GVolume* volume, + gpointer self) +{ #line 49 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_on_volume_changed ((CameraTable*) self, volume); -#line 596 "CameraTable.c" +#line 724 "CameraTable.c" } -static gboolean _camera_table_delayed_init_gsource_func (gpointer self) { +static gboolean +_camera_table_delayed_init_gsource_func (gpointer self) +{ gboolean result; result = camera_table_delayed_init ((CameraTable*) self); #line 54 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 605 "CameraTable.c" +#line 735 "CameraTable.c" } -static CameraTable* camera_table_construct (GType object_type) { +static CameraTable* +camera_table_construct (GType object_type) +{ CameraTable* self = NULL; OneShotScheduler* _tmp0_; GUdevClient* _tmp1_; @@ -642,18 +774,22 @@ static CameraTable* camera_table_construct (GType object_type) { g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, _camera_table_delayed_init_gsource_func, camera_table_ref (self), camera_table_unref); #line 41 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return self; -#line 646 "CameraTable.c" +#line 778 "CameraTable.c" } -static CameraTable* camera_table_new (void) { +static CameraTable* +camera_table_new (void) +{ #line 41 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return camera_table_construct (TYPE_CAMERA_TABLE); -#line 653 "CameraTable.c" +#line 787 "CameraTable.c" } -static gboolean camera_table_delayed_init (CameraTable* self) { +static gboolean +camera_table_delayed_init (CameraTable* self) +{ gboolean result = FALSE; AppWindow* _tmp0_; LibraryWindow* _tmp1_; @@ -670,17 +806,17 @@ static gboolean camera_table_delayed_init (CameraTable* self) { library_window_set_page_switching_enabled (_tmp1_, FALSE); #line 60 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_tmp1_); -#line 674 "CameraTable.c" +#line 810 "CameraTable.c" { #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_init_camera_table (self, &_inner_error_); #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 680 "CameraTable.c" +#line 816 "CameraTable.c" gboolean _tmp2_ = FALSE; #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 684 "CameraTable.c" +#line 820 "CameraTable.c" goto __catch64_gphoto_error; } #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -689,7 +825,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) { g_clear_error (&_inner_error_); #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return _tmp2_; -#line 693 "CameraTable.c" +#line 829 "CameraTable.c" } } goto __finally64; @@ -714,12 +850,12 @@ static gboolean camera_table_delayed_init (CameraTable* self) { _g_error_free0 (err); #line 67 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 718 "CameraTable.c" +#line 854 "CameraTable.c" } __finally64: #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 723 "CameraTable.c" +#line 859 "CameraTable.c" gboolean _tmp5_ = FALSE; #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -727,18 +863,18 @@ static gboolean camera_table_delayed_init (CameraTable* self) { g_clear_error (&_inner_error_); #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return _tmp5_; -#line 731 "CameraTable.c" +#line 867 "CameraTable.c" } { #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_update_camera_table (self, &_inner_error_); #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 738 "CameraTable.c" +#line 874 "CameraTable.c" gboolean _tmp6_ = FALSE; #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 742 "CameraTable.c" +#line 878 "CameraTable.c" goto __catch65_gphoto_error; } #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -747,7 +883,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) { g_clear_error (&_inner_error_); #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return _tmp6_; -#line 751 "CameraTable.c" +#line 887 "CameraTable.c" } } goto __finally65; @@ -768,12 +904,12 @@ static gboolean camera_table_delayed_init (CameraTable* self) { g_warning ("CameraTable.vala:73: Unable to update camera table: %s", _tmp8_); #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_error_free0 (err); -#line 772 "CameraTable.c" +#line 908 "CameraTable.c" } __finally65: #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 777 "CameraTable.c" +#line 913 "CameraTable.c" gboolean _tmp9_ = FALSE; #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -781,7 +917,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) { g_clear_error (&_inner_error_); #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return _tmp9_; -#line 785 "CameraTable.c" +#line 921 "CameraTable.c" } #line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp10_ = app_window_get_instance (); @@ -795,18 +931,22 @@ static gboolean camera_table_delayed_init (CameraTable* self) { result = FALSE; #line 79 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 799 "CameraTable.c" +#line 935 "CameraTable.c" } -static gpointer _camera_table_ref0 (gpointer self) { +static gpointer +_camera_table_ref0 (gpointer self) +{ #line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return self ? camera_table_ref (self) : NULL; -#line 806 "CameraTable.c" +#line 944 "CameraTable.c" } -CameraTable* camera_table_get_instance (void) { +CameraTable* +camera_table_get_instance (void) +{ CameraTable* result = NULL; CameraTable* _tmp0_; CameraTable* _tmp2_; @@ -815,7 +955,7 @@ CameraTable* camera_table_get_instance (void) { _tmp0_ = camera_table_instance; #line 83 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_tmp0_ == NULL) { -#line 819 "CameraTable.c" +#line 959 "CameraTable.c" CameraTable* _tmp1_; #line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp1_ = camera_table_new (); @@ -823,7 +963,7 @@ CameraTable* camera_table_get_instance (void) { _camera_table_unref0 (camera_table_instance); #line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_instance = _tmp1_; -#line 827 "CameraTable.c" +#line 967 "CameraTable.c" } #line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp2_ = camera_table_instance; @@ -833,11 +973,13 @@ CameraTable* camera_table_get_instance (void) { result = _tmp3_; #line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 837 "CameraTable.c" +#line 977 "CameraTable.c" } -GeeIterable* camera_table_get_cameras (CameraTable* self) { +GeeIterable* +camera_table_get_cameras (CameraTable* self) +{ GeeIterable* result = NULL; GeeHashMap* _tmp0_; GeeCollection* _tmp1_; @@ -854,11 +996,13 @@ GeeIterable* camera_table_get_cameras (CameraTable* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable); #line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 858 "CameraTable.c" +#line 1000 "CameraTable.c" } -gint camera_table_get_count (CameraTable* self) { +gint +camera_table_get_count (CameraTable* self) +{ gint result = 0; GeeHashMap* _tmp0_; gint _tmp1_; @@ -875,15 +1019,17 @@ gint camera_table_get_count (CameraTable* self) { result = _tmp2_; #line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 879 "CameraTable.c" +#line 1023 "CameraTable.c" } -DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, const gchar* uri) { +DiscoveredCamera* +camera_table_get_for_uri (CameraTable* self, + const gchar* uri) +{ DiscoveredCamera* result = NULL; GeeHashMap* _tmp0_; - const gchar* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 97 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_val_if_fail (IS_CAMERA_TABLE (self), NULL); #line 97 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -891,53 +1037,44 @@ DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, const gchar* uri) #line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp0_ = self->priv->camera_map; #line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp1_ = uri; -#line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), uri); #line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - result = (DiscoveredCamera*) _tmp2_; + result = (DiscoveredCamera*) _tmp1_; #line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 902 "CameraTable.c" +#line 1046 "CameraTable.c" } -static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GError** error) { - int _tmp0_; +static void +camera_table_do_op (CameraTable* self, + int res, + const gchar* op, + GError** error) +{ GError * _inner_error_ = NULL; #line 101 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_if_fail (IS_CAMERA_TABLE (self)); #line 101 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_if_fail (op != NULL); #line 102 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp0_ = res; -#line 102 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp0_ != GP_OK) { -#line 917 "CameraTable.c" - int _tmp1_; - const gchar* _tmp2_; - int _tmp3_; - const gchar* _tmp4_; - GError* _tmp5_; -#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp1_ = res; + if (res != GP_OK) { +#line 1063 "CameraTable.c" + const gchar* _tmp0_; + GError* _tmp1_; #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp2_ = op; + _tmp0_ = gp_port_result_as_string (res); #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp3_ = res; + _tmp1_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Unable to %s: %s", (gint) res, op, _tmp0_); #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp4_ = gp_port_result_as_string (_tmp3_); -#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp5_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Unable to %s: %s", (gint) _tmp1_, _tmp2_, _tmp4_); -#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _inner_error_ = _tmp5_; + _inner_error_ = _tmp1_; #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_propagate_error (error, _inner_error_); #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 941 "CameraTable.c" +#line 1078 "CameraTable.c" } else { #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -945,18 +1082,20 @@ static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GEr g_clear_error (&_inner_error_); #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 949 "CameraTable.c" +#line 1086 "CameraTable.c" } } } -static void camera_table_init_camera_table (CameraTable* self, GError** error) { +static void +camera_table_init_camera_table (CameraTable* self, + GError** error) +{ CameraAbilitiesList* _tmp0_ = NULL; int _tmp1_; CameraAbilitiesList* _tmp2_; GPContext* _tmp3_; - int _tmp4_; GError * _inner_error_ = NULL; #line 106 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_if_fail (IS_CAMERA_TABLE (self)); @@ -976,7 +1115,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) { g_propagate_error (error, _inner_error_); #line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 980 "CameraTable.c" +#line 1119 "CameraTable.c" } else { #line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -984,7 +1123,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) { g_clear_error (&_inner_error_); #line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 988 "CameraTable.c" +#line 1127 "CameraTable.c" } } #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -992,9 +1131,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) { #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp3_ = self->priv->null_context; #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp4_ = gp_abilities_list_load (_tmp2_, _tmp3_); -#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp4_, "load camera abilities list", &_inner_error_); + camera_table_do_op (self, gp_abilities_list_load (_tmp2_, _tmp3_), "load camera abilities list", &_inner_error_); #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -1003,7 +1140,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) { g_propagate_error (error, _inner_error_); #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 1007 "CameraTable.c" +#line 1144 "CameraTable.c" } else { #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1011,53 +1148,65 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) { g_clear_error (&_inner_error_); #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 1015 "CameraTable.c" +#line 1152 "CameraTable.c" } } } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return self ? g_object_ref (self) : NULL; -#line 1024 "CameraTable.c" +#line 1163 "CameraTable.c" } -static void _vala_array_add69 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add69 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if ((*length) == (*size)) { #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" *size = (*size) ? (2 * (*size)) : 4; #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 1035 "CameraTable.c" +#line 1179 "CameraTable.c" } #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (*array)[(*length)++] = value; #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (*array)[*length] = NULL; -#line 1041 "CameraTable.c" +#line 1185 "CameraTable.c" } -static void _g_object_unref0_ (gpointer var) { +static void +_g_object_unref0_ (gpointer var) +{ #line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); -#line 1048 "CameraTable.c" +#line 1194 "CameraTable.c" } -static void _g_list_free__g_object_unref0_ (GList* self) { +static inline void +_g_list_free__g_object_unref0_ (GList* self) +{ #line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_list_foreach (self, (GFunc) _g_object_unref0_, NULL); -#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_list_free (self); -#line 1057 "CameraTable.c" + g_list_free_full (self, (GDestroyNotify) _g_object_unref0_); +#line 1203 "CameraTable.c" } -static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_length1) { +static gchar** +camera_table_get_all_usb_cameras (CameraTable* self, + int* result_length1) +{ gchar** result = NULL; gchar** cameras = NULL; gchar** _tmp0_; @@ -1067,8 +1216,8 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_ GUdevClient* _tmp1_; GList* _tmp2_; GList* _tmp3_; - gchar** _tmp25_; - gint _tmp25__length1; + gchar** _tmp22_; + gint _tmp22__length1; #line 111 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_val_if_fail (IS_CAMERA_TABLE (self), NULL); #line 112 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -1087,7 +1236,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_ device_list = _tmp2_; #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp3_ = device_list; -#line 1091 "CameraTable.c" +#line 1240 "CameraTable.c" { GList* device_collection = NULL; GList* device_it = NULL; @@ -1095,14 +1244,14 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_ device_collection = _tmp3_; #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" for (device_it = device_collection; device_it != NULL; device_it = device_it->next) { -#line 1099 "CameraTable.c" +#line 1248 "CameraTable.c" GUdevDevice* _tmp4_; GUdevDevice* device = NULL; #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp4_ = _g_object_ref0 ((GUdevDevice*) device_it->data); #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" device = _tmp4_; -#line 1106 "CameraTable.c" +#line 1255 "CameraTable.c" { gchar* device_file = NULL; GUdevDevice* _tmp5_; @@ -1123,371 +1272,307 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_ _tmp10_ = device_file; #line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_tmp10_ != NULL) { -#line 1127 "CameraTable.c" +#line 1276 "CameraTable.c" GUdevDevice* _tmp11_; - gboolean _tmp12_; #line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp11_ = device; #line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp12_ = g_udev_device_has_property (_tmp11_, "ID_GPHOTO2"); -#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp9_ = _tmp12_; -#line 1136 "CameraTable.c" + _tmp9_ = g_udev_device_has_property (_tmp11_, "ID_GPHOTO2"); +#line 1282 "CameraTable.c" } else { #line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp9_ = FALSE; -#line 1140 "CameraTable.c" +#line 1286 "CameraTable.c" } #line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_tmp9_) { -#line 1144 "CameraTable.c" - GUdevDevice* _tmp13_; - gboolean _tmp14_; -#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp13_ = device; +#line 1290 "CameraTable.c" + GUdevDevice* _tmp12_; #line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp14_ = g_udev_device_has_property (_tmp13_, "GPHOTO2_DRIVER"); + _tmp12_ = device; #line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp8_ = _tmp14_; -#line 1153 "CameraTable.c" + _tmp8_ = g_udev_device_has_property (_tmp12_, "GPHOTO2_DRIVER"); +#line 1296 "CameraTable.c" } else { #line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp8_ = FALSE; -#line 1157 "CameraTable.c" +#line 1300 "CameraTable.c" } #line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_tmp8_) { -#line 1161 "CameraTable.c" +#line 1304 "CameraTable.c" gint camera_bus = 0; gint camera_device = 0; - const gchar* _tmp15_; - gint _tmp16_; + const gchar* _tmp13_; gchar* camera = NULL; - gint _tmp18_; - gint _tmp19_; - gchar* _tmp20_; - const gchar* _tmp21_; - gchar** _tmp22_; - gint _tmp22__length1; - const gchar* _tmp23_; - gchar* _tmp24_; -#line 128 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp15_ = device_file; + gint _tmp15_; + gint _tmp16_; + gchar* _tmp17_; + const gchar* _tmp18_; + gchar** _tmp19_; + gint _tmp19__length1; + const gchar* _tmp20_; + gchar* _tmp21_; #line 128 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp16_ = sscanf (_tmp15_, "/dev/bus/usb/%d/%d", &camera_bus, &camera_device); + _tmp13_ = device_file; #line 128 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp16_ < 2) { -#line 1181 "CameraTable.c" - const gchar* _tmp17_; + if (sscanf (_tmp13_, "/dev/bus/usb/%d/%d", &camera_bus, &camera_device) < 2) { +#line 1321 "CameraTable.c" + const gchar* _tmp14_; #line 129 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp17_ = device_file; + _tmp14_ = device_file; #line 129 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_critical ("CameraTable.vala:129: get_all_usb_cameras: Failed to scanf device file" \ -" %s", _tmp17_); +" %s", _tmp14_); #line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (device_file); #line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (device); #line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" continue; -#line 1193 "CameraTable.c" +#line 1333 "CameraTable.c" } #line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp18_ = camera_bus; + _tmp15_ = camera_bus; #line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp19_ = camera_device; + _tmp16_ = camera_device; #line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp20_ = g_strdup_printf ("usb:%.3d,%.3d", _tmp18_, _tmp19_); + _tmp17_ = g_strdup_printf ("usb:%.3d,%.3d", _tmp15_, _tmp16_); #line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera = _tmp20_; + camera = _tmp17_; #line 134 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp21_ = camera; + _tmp18_ = camera; #line 134 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:134: USB camera detected at %s", _tmp21_); + g_debug ("CameraTable.vala:134: USB camera detected at %s", _tmp18_); #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp22_ = cameras; + _tmp19_ = cameras; #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp22__length1 = cameras_length1; + _tmp19__length1 = cameras_length1; #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp23_ = camera; + _tmp20_ = camera; #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp24_ = g_strdup (_tmp23_); + _tmp21_ = g_strdup (_tmp20_); #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _vala_array_add69 (&cameras, &cameras_length1, &_cameras_size_, _tmp24_); + _vala_array_add69 (&cameras, &cameras_length1, &_cameras_size_, _tmp21_); #line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (camera); -#line 1219 "CameraTable.c" +#line 1359 "CameraTable.c" } #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (device_file); #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (device); -#line 1225 "CameraTable.c" +#line 1365 "CameraTable.c" } } } #line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp25_ = cameras; + _tmp22_ = cameras; #line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp25__length1 = cameras_length1; + _tmp22__length1 = cameras_length1; #line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (result_length1) { #line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - *result_length1 = _tmp25__length1; -#line 1237 "CameraTable.c" + *result_length1 = _tmp22__length1; +#line 1377 "CameraTable.c" } #line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - result = _tmp25_; + result = _tmp22_; #line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" __g_list_free__g_object_unref0_0 (device_list); #line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 1245 "CameraTable.c" +#line 1385 "CameraTable.c" } -static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_count, gchar** usb_cameras, int usb_cameras_length1, const gchar* port, gchar* * full_port) { +static gboolean +camera_table_usb_esp (CameraTable* self, + gint current_camera_count, + gchar** usb_cameras, + int usb_cameras_length1, + const gchar* port, + gchar* * full_port) +{ gchar* _vala_full_port = NULL; gboolean result = FALSE; - gint _tmp0_; - gint _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_ = FALSE; - gint _tmp4_; - const gchar* _tmp11_; + gboolean _tmp0_ = FALSE; gint bus = 0; gint device = 0; - const gchar* _tmp13_; - gint _tmp14_; - gchar** _tmp16_; - gint _tmp16__length1; - const gchar* _tmp30_; #line 150 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_val_if_fail (IS_CAMERA_TABLE (self), FALSE); #line 150 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_val_if_fail (port != NULL, FALSE); #line 153 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp0_ = current_camera_count; -#line 153 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _vala_assert (_tmp0_ > 0, "current_camera_count > 0"); -#line 155 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp1_ = current_camera_count; + _vala_assert (current_camera_count > 0, "current_camera_count > 0"); #line 155 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp2_ = port; -#line 155 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:155: USB ESP: current_camera_count=%d port=%s", _tmp1_, _tmp2_); + g_debug ("CameraTable.vala:155: USB ESP: current_camera_count=%d port=%s", current_camera_count, port); #line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (_vala_full_port); #line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _vala_full_port = NULL; #line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp4_ = current_camera_count; -#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp4_ == 1) { -#line 1287 "CameraTable.c" - gchar** _tmp5_; - gint _tmp5__length1; -#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp5_ = usb_cameras; + if (current_camera_count == 1) { #line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp5__length1 = usb_cameras_length1; -#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp3_ = _tmp5__length1 == 1; -#line 1296 "CameraTable.c" + _tmp0_ = usb_cameras_length1 == 1; +#line 1418 "CameraTable.c" } else { #line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp3_ = FALSE; -#line 1300 "CameraTable.c" + _tmp0_ = FALSE; +#line 1422 "CameraTable.c" } #line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp3_) { -#line 1304 "CameraTable.c" - gchar** _tmp6_; - gint _tmp6__length1; - const gchar* _tmp7_; - gchar* _tmp8_; - const gchar* _tmp9_; - const gchar* _tmp10_; -#line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp6_ = usb_cameras; -#line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp6__length1 = usb_cameras_length1; + if (_tmp0_) { +#line 1426 "CameraTable.c" + const gchar* _tmp1_; + gchar* _tmp2_; + const gchar* _tmp3_; #line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp7_ = _tmp6_[0]; + _tmp1_ = usb_cameras[0]; #line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp8_ = g_strdup (_tmp7_); + _tmp2_ = g_strdup (_tmp1_); #line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (_vala_full_port); #line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _vala_full_port = _tmp8_; -#line 163 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp9_ = port; + _vala_full_port = _tmp2_; #line 163 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp10_ = _vala_full_port; + _tmp3_ = _vala_full_port; #line 163 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:163: USB ESP: port=%s full_port=%s", _tmp9_, _tmp10_); + g_debug ("CameraTable.vala:163: USB ESP: port=%s full_port=%s", port, _tmp3_); #line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" result = TRUE; #line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (full_port) { #line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" *full_port = _vala_full_port; -#line 1335 "CameraTable.c" +#line 1448 "CameraTable.c" } else { #line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (_vala_full_port); -#line 1339 "CameraTable.c" +#line 1452 "CameraTable.c" } #line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 1343 "CameraTable.c" +#line 1456 "CameraTable.c" } #line 169 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp11_ = port; -#line 169 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (g_strcmp0 (_tmp11_, "usb:") == 0) { -#line 1349 "CameraTable.c" - const gchar* _tmp12_; + if (g_strcmp0 (port, "usb:") == 0) { #line 170 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp12_ = port; -#line 170 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:170: USB ESP: Skipping %s", _tmp12_); + g_debug ("CameraTable.vala:170: USB ESP: Skipping %s", port); #line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" result = FALSE; #line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (full_port) { #line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" *full_port = _vala_full_port; -#line 1361 "CameraTable.c" +#line 1468 "CameraTable.c" } else { #line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (_vala_full_port); -#line 1365 "CameraTable.c" +#line 1472 "CameraTable.c" } #line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 1369 "CameraTable.c" +#line 1476 "CameraTable.c" } #line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp13_ = port; -#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp14_ = sscanf (_tmp13_, "usb:%d,%d", &bus, &device); -#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp14_ < 2) { -#line 1377 "CameraTable.c" - const gchar* _tmp15_; -#line 178 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp15_ = port; + if (sscanf (port, "usb:%d,%d", &bus, &device) < 2) { #line 178 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_critical ("CameraTable.vala:178: USB ESP: Failed to scanf %s", _tmp15_); + g_critical ("CameraTable.vala:178: USB ESP: Failed to scanf %s", port); #line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" result = FALSE; #line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (full_port) { #line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" *full_port = _vala_full_port; -#line 1389 "CameraTable.c" +#line 1488 "CameraTable.c" } else { #line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (_vala_full_port); -#line 1393 "CameraTable.c" +#line 1492 "CameraTable.c" } #line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 1397 "CameraTable.c" +#line 1496 "CameraTable.c" } -#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp16_ = usb_cameras; -#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp16__length1 = usb_cameras_length1; -#line 1403 "CameraTable.c" { gchar** usb_camera_collection = NULL; gint usb_camera_collection_length1 = 0; gint _usb_camera_collection_size_ = 0; gint usb_camera_it = 0; #line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_camera_collection = _tmp16_; + usb_camera_collection = usb_cameras; #line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_camera_collection_length1 = _tmp16__length1; + usb_camera_collection_length1 = usb_cameras_length1; #line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - for (usb_camera_it = 0; usb_camera_it < _tmp16__length1; usb_camera_it = usb_camera_it + 1) { -#line 1415 "CameraTable.c" - gchar* _tmp17_; + for (usb_camera_it = 0; usb_camera_it < usb_cameras_length1; usb_camera_it = usb_camera_it + 1) { +#line 1509 "CameraTable.c" + gchar* _tmp4_; gchar* usb_camera = NULL; #line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp17_ = g_strdup (usb_camera_collection[usb_camera_it]); + _tmp4_ = g_strdup (usb_camera_collection[usb_camera_it]); #line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_camera = _tmp17_; -#line 1422 "CameraTable.c" + usb_camera = _tmp4_; +#line 1516 "CameraTable.c" { gint camera_bus = 0; gint camera_device = 0; - const gchar* _tmp18_; - gint _tmp19_; - gboolean _tmp21_ = FALSE; - gint _tmp22_; - gint _tmp23_; -#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp18_ = usb_camera; + const gchar* _tmp5_; + gboolean _tmp7_ = FALSE; + gint _tmp8_; + gint _tmp9_; #line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp19_ = sscanf (_tmp18_, "usb:%d,%d", &camera_bus, &camera_device); + _tmp5_ = usb_camera; #line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp19_ < 2) { -#line 1437 "CameraTable.c" - const gchar* _tmp20_; + if (sscanf (_tmp5_, "usb:%d,%d", &camera_bus, &camera_device) < 2) { +#line 1528 "CameraTable.c" + const gchar* _tmp6_; #line 186 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp20_ = usb_camera; + _tmp6_ = usb_camera; #line 186 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_critical ("CameraTable.vala:186: USB ESP: Failed to scanf %s", _tmp20_); + g_critical ("CameraTable.vala:186: USB ESP: Failed to scanf %s", _tmp6_); #line 188 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (usb_camera); #line 188 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" continue; -#line 1447 "CameraTable.c" +#line 1538 "CameraTable.c" } #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp22_ = bus; + _tmp8_ = bus; #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp23_ = camera_bus; + _tmp9_ = camera_bus; #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp22_ == _tmp23_) { -#line 1455 "CameraTable.c" - gint _tmp24_; - gint _tmp25_; + if (_tmp8_ == _tmp9_) { +#line 1546 "CameraTable.c" + gint _tmp10_; + gint _tmp11_; #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp24_ = device; + _tmp10_ = device; #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp25_ = camera_device; + _tmp11_ = camera_device; #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp21_ = _tmp24_ == _tmp25_; -#line 1464 "CameraTable.c" + _tmp7_ = _tmp10_ == _tmp11_; +#line 1555 "CameraTable.c" } else { #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp21_ = FALSE; -#line 1468 "CameraTable.c" + _tmp7_ = FALSE; +#line 1559 "CameraTable.c" } #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp21_) { -#line 1472 "CameraTable.c" - const gchar* _tmp26_; - gchar* _tmp27_; - const gchar* _tmp28_; - const gchar* _tmp29_; -#line 192 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp26_ = port; + if (_tmp7_) { +#line 1563 "CameraTable.c" + gchar* _tmp12_; + const gchar* _tmp13_; #line 192 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp27_ = g_strdup (_tmp26_); + _tmp12_ = g_strdup (port); #line 192 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (_vala_full_port); #line 192 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _vala_full_port = _tmp27_; -#line 194 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp28_ = port; + _vala_full_port = _tmp12_; #line 194 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp29_ = _vala_full_port; + _tmp13_ = _vala_full_port; #line 194 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:194: USB ESP: port=%s full_port=%s", _tmp28_, _tmp29_); + g_debug ("CameraTable.vala:194: USB ESP: port=%s full_port=%s", port, _tmp13_); #line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" result = TRUE; #line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -1496,450 +1581,379 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou if (full_port) { #line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" *full_port = _vala_full_port; -#line 1499 "CameraTable.c" +#line 1584 "CameraTable.c" } else { #line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (_vala_full_port); -#line 1503 "CameraTable.c" +#line 1588 "CameraTable.c" } #line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 1507 "CameraTable.c" +#line 1592 "CameraTable.c" } #line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (usb_camera); -#line 1511 "CameraTable.c" +#line 1596 "CameraTable.c" } } } -#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp30_ = port; #line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_debug ("CameraTable.vala:200: USB ESP: No matching bus/device found for port=%" \ -"s", _tmp30_); +"s", port); #line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" result = FALSE; #line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (full_port) { #line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" *full_port = _vala_full_port; -#line 1525 "CameraTable.c" +#line 1608 "CameraTable.c" } else { #line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (_vala_full_port); -#line 1529 "CameraTable.c" +#line 1612 "CameraTable.c" } #line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 1533 "CameraTable.c" +#line 1616 "CameraTable.c" } -gchar* camera_table_get_port_uri (const gchar* port) { +gchar* +camera_table_get_port_uri (const gchar* port) +{ gchar* result = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; #line 205 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_val_if_fail (port != NULL, NULL); #line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp0_ = port; -#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp1_ = g_strdup_printf ("gphoto2://[%s]/", _tmp0_); + _tmp0_ = g_strdup_printf ("gphoto2://[%s]/", port); #line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - result = _tmp1_; + result = _tmp0_; #line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 1551 "CameraTable.c" +#line 1633 "CameraTable.c" } -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, + glong maxlen) +{ glong result = 0L; gchar* end = NULL; gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 1574 "CameraTable.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1582 "CameraTable.c" +#line 1657 "CameraTable.c" } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1594 "CameraTable.c" +#line 1666 "CameraTable.c" } } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, + glong offset, + glong len) +{ gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + glong _tmp6_; + gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#line 1618 "CameraTable.c" - glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = _tmp2_ >= ((glong) 0); -#line 1624 "CameraTable.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = len >= ((glong) 0); +#line 1687 "CameraTable.c" } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 1628 "CameraTable.c" +#line 1691 "CameraTable.c" } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 1632 "CameraTable.c" - glong _tmp3_; - glong _tmp4_; - glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 1644 "CameraTable.c" +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = string_strnlen ((gchar*) self, offset + len); +#line 1697 "CameraTable.c" } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#line 1654 "CameraTable.c" + gint _tmp1_; + gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = (glong) _tmp2_; +#line 1707 "CameraTable.c" } -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp8_ < ((glong) 0)) { -#line 1660 "CameraTable.c" - glong _tmp9_; - glong _tmp10_; - glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 1674 "CameraTable.c" +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset < ((glong) 0)) { +#line 1711 "CameraTable.c" + glong _tmp3_; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 1719 "CameraTable.c" } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 1684 "CameraTable.c" + glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 1726 "CameraTable.c" } -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp14_ < ((glong) 0)) { -#line 1690 "CameraTable.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 1699 "CameraTable.c" +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (len < ((glong) 0)) { +#line 1730 "CameraTable.c" + glong _tmp5_; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp5_ - offset; +#line 1736 "CameraTable.c" } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1719 "CameraTable.c" +#line 1748 "CameraTable.c" } -static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { +static gchar* +string_replace (const gchar* self, + const gchar* old, + const gchar* replacement) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if ((*((gchar*) self)) == '\0') { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 1738 "CameraTable.c" +#line 1771 "CameraTable.c" } else { - const gchar* _tmp2_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; -#line 1745 "CameraTable.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) old)) == '\0'; +#line 1775 "CameraTable.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = TRUE; -#line 1751 "CameraTable.c" +#line 1781 "CameraTable.c" } else { - const gchar* _tmp3_; - const gchar* _tmp4_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = replacement; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; -#line 1761 "CameraTable.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (old, replacement) == 0; +#line 1785 "CameraTable.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 1765 "CameraTable.c" - gchar* _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = g_strdup (self); -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1789 "CameraTable.c" + gchar* _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = g_strdup (self); +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1773 "CameraTable.c" +#line 1797 "CameraTable.c" } { GRegex* regex = NULL; - const gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - GRegex* _tmp9_; - GRegex* _tmp10_; - gchar* _tmp11_ = NULL; - GRegex* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = old; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = g_regex_escape_string (_tmp6_, -1); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = _tmp9_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp8_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - regex = _tmp10_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp3_; + gchar* _tmp4_; + GRegex* _tmp5_; + GRegex* _tmp6_; + gchar* _tmp7_ = NULL; + GRegex* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_regex_escape_string (old, -1); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = _tmp3_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp5_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp4_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + regex = _tmp6_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 1805 "CameraTable.c" +#line 1825 "CameraTable.c" goto __catch66_g_regex_error; } -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 1814 "CameraTable.c" +#line 1834 "CameraTable.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = regex; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = replacement; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp14_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = regex; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp9_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 1830 "CameraTable.c" +#line 1848 "CameraTable.c" goto __catch66_g_regex_error; } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 1841 "CameraTable.c" +#line 1859 "CameraTable.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = _tmp11_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = NULL; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp15_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp11_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = _tmp7_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = NULL; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp10_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp7_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1855 "CameraTable.c" +#line 1873 "CameraTable.c" } goto __finally66; __catch66_g_regex_error: { GError* e = NULL; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 1869 "CameraTable.c" +#line 1887 "CameraTable.c" } __finally66: -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 1880 "CameraTable.c" +#line 1898 "CameraTable.c" } } -gchar* camera_table_get_port_path (const gchar* port) { +gchar* +camera_table_get_port_path (const gchar* port) +{ gchar* result = NULL; gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - gboolean _tmp2_; #line 209 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_val_if_fail (port != NULL, NULL); #line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp1_ = port; -#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp2_ = g_str_has_prefix (_tmp1_, "usb:"); -#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp2_) { -#line 1898 "CameraTable.c" - const gchar* _tmp3_; + if (g_str_has_prefix (port, "usb:")) { +#line 1912 "CameraTable.c" + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; #line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp3_ = port; + _tmp1_ = string_substring (port, (glong) 4, (glong) -1); #line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp4_ = string_substring (_tmp3_, (glong) 4, (glong) -1); + _tmp2_ = _tmp1_; #line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp5_ = _tmp4_; + _tmp3_ = string_replace (_tmp2_, ",", "/"); #line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp6_ = string_replace (_tmp5_, ",", "/"); + _tmp4_ = _tmp3_; #line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp7_ = _tmp6_; -#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp8_ = g_strdup_printf ("/dev/bus/usb/%s", _tmp7_); + _tmp5_ = g_strdup_printf ("/dev/bus/usb/%s", _tmp4_); #line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (_tmp0_); #line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp0_ = _tmp8_; + _tmp0_ = _tmp5_; #line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp4_); #line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp5_); -#line 1925 "CameraTable.c" + _g_free0 (_tmp2_); +#line 1936 "CameraTable.c" } else { #line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (_tmp0_); #line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp0_ = NULL; -#line 1931 "CameraTable.c" +#line 1942 "CameraTable.c" } #line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" result = _tmp0_; #line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 1937 "CameraTable.c" +#line 1948 "CameraTable.c" } -static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uuid) { +static gchar* +camera_table_get_name_for_uuid (CameraTable* self, + const gchar* uuid) +{ gchar* result = NULL; GVolumeMonitor* _tmp0_; GList* _tmp1_; @@ -1951,7 +1965,7 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu _tmp0_ = self->priv->volume_monitor; #line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp1_ = g_volume_monitor_get_volumes (_tmp0_); -#line 1953 "CameraTable.c" +#line 1967 "CameraTable.c" { GList* volume_collection = NULL; GList* volume_it = NULL; @@ -1959,20 +1973,19 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu volume_collection = _tmp1_; #line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" for (volume_it = volume_collection; volume_it != NULL; volume_it = volume_it->next) { -#line 1961 "CameraTable.c" +#line 1975 "CameraTable.c" GVolume* _tmp2_; GVolume* volume = NULL; #line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp2_ = _g_object_ref0 ((GVolume*) volume_it->data); #line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" volume = _tmp2_; -#line 1968 "CameraTable.c" +#line 1982 "CameraTable.c" { GVolume* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; - const gchar* _tmp6_; - gboolean _tmp7_; + gboolean _tmp6_; #line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp3_ = volume; #line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -1980,48 +1993,49 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu #line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp5_ = _tmp4_; #line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp6_ = uuid; -#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp7_ = g_strcmp0 (_tmp5_, _tmp6_) == 0; + _tmp6_ = g_strcmp0 (_tmp5_, uuid) == 0; #line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (_tmp5_); #line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp7_) { -#line 1989 "CameraTable.c" - GVolume* _tmp8_; - gchar* _tmp9_; + if (_tmp6_) { +#line 2000 "CameraTable.c" + GVolume* _tmp7_; + gchar* _tmp8_; #line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp8_ = volume; + _tmp7_ = volume; #line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp9_ = g_volume_get_name (_tmp8_); + _tmp8_ = g_volume_get_name (_tmp7_); #line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - result = _tmp9_; + result = _tmp8_; #line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (volume); #line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" __g_list_free__g_object_unref0_0 (volume_collection); #line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 2004 "CameraTable.c" +#line 2015 "CameraTable.c" } #line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (volume); -#line 2008 "CameraTable.c" +#line 2019 "CameraTable.c" } } #line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" __g_list_free__g_object_unref0_0 (volume_collection); -#line 2013 "CameraTable.c" +#line 2024 "CameraTable.c" } #line 221 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" result = NULL; #line 221 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 2019 "CameraTable.c" +#line 2030 "CameraTable.c" } -static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uuid) { +static gchar* +camera_table_get_icon_for_uuid (CameraTable* self, + const gchar* uuid) +{ gchar* result = NULL; GVolumeMonitor* _tmp0_; GList* _tmp1_; @@ -2033,7 +2047,7 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu _tmp0_ = self->priv->volume_monitor; #line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp1_ = g_volume_monitor_get_volumes (_tmp0_); -#line 2035 "CameraTable.c" +#line 2049 "CameraTable.c" { GList* volume_collection = NULL; GList* volume_it = NULL; @@ -2041,20 +2055,19 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu volume_collection = _tmp1_; #line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" for (volume_it = volume_collection; volume_it != NULL; volume_it = volume_it->next) { -#line 2043 "CameraTable.c" +#line 2057 "CameraTable.c" GVolume* _tmp2_; GVolume* volume = NULL; #line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp2_ = _g_object_ref0 ((GVolume*) volume_it->data); #line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" volume = _tmp2_; -#line 2050 "CameraTable.c" +#line 2064 "CameraTable.c" { GVolume* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; - const gchar* _tmp6_; - gboolean _tmp7_; + gboolean _tmp6_; #line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp3_ = volume; #line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -2062,109 +2075,115 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu #line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp5_ = _tmp4_; #line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp6_ = uuid; -#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp7_ = g_strcmp0 (_tmp5_, _tmp6_) == 0; + _tmp6_ = g_strcmp0 (_tmp5_, uuid) == 0; #line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (_tmp5_); #line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp7_) { -#line 2071 "CameraTable.c" - GVolume* _tmp8_; + if (_tmp6_) { +#line 2082 "CameraTable.c" + GVolume* _tmp7_; + GIcon* _tmp8_; GIcon* _tmp9_; - GIcon* _tmp10_; + gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; #line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp8_ = volume; + _tmp7_ = volume; #line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp9_ = g_volume_get_icon (_tmp8_); + _tmp8_ = g_volume_get_icon (_tmp7_); #line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp11_ = g_icon_to_string (_tmp10_); + _tmp10_ = g_icon_to_string (_tmp9_); #line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp9_); #line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - result = _tmp12_; + result = _tmp11_; #line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (volume); #line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" __g_list_free__g_object_unref0_0 (volume_collection); #line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 2097 "CameraTable.c" +#line 2108 "CameraTable.c" } #line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (volume); -#line 2101 "CameraTable.c" +#line 2112 "CameraTable.c" } } #line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" __g_list_free__g_object_unref0_0 (volume_collection); -#line 2106 "CameraTable.c" +#line 2117 "CameraTable.c" } #line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" result = NULL; #line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 2112 "CameraTable.c" +#line 2123 "CameraTable.c" } -static gpointer _discovered_camera_ref0 (gpointer self) { +static gpointer +_discovered_camera_ref0 (gpointer self) +{ #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return self ? discovered_camera_ref (self) : NULL; -#line 2119 "CameraTable.c" +#line 2132 "CameraTable.c" } -static void _vala_array_add70 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value) { +static void +_vala_array_add70 (DiscoveredCamera** * array, + int* length, + int* size, + DiscoveredCamera* value) +{ #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if ((*length) == (*size)) { #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" *size = (*size) ? (2 * (*size)) : 4; #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" *array = g_renew (DiscoveredCamera*, *array, (*size) + 1); -#line 2130 "CameraTable.c" +#line 2148 "CameraTable.c" } #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (*array)[(*length)++] = value; #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (*array)[*length] = NULL; -#line 2136 "CameraTable.c" +#line 2154 "CameraTable.c" } -static void camera_table_update_camera_table (CameraTable* self, GError** error) { +static void +camera_table_update_camera_table (CameraTable* self, + GError** error) +{ GPPortInfoList* port_info_list = NULL; GPPortInfoList* _tmp0_ = NULL; int _tmp1_; GPPortInfoList* _tmp2_; - int _tmp3_; CameraList* camera_list = NULL; - CameraList* _tmp4_ = NULL; - int _tmp5_; - CameraAbilitiesList* _tmp6_; - GPPortInfoList* _tmp7_; - CameraList* _tmp8_; - GPContext* _tmp9_; - int _tmp10_; + CameraList* _tmp3_ = NULL; + int _tmp4_; + CameraAbilitiesList* _tmp5_; + GPPortInfoList* _tmp6_; + CameraList* _tmp7_; + GPContext* _tmp8_; GeeHashMap* detected_map = NULL; - GeeHashMap* _tmp11_; + GeeHashMap* _tmp9_; gchar** usb_cameras = NULL; - gint _tmp12_; - gchar** _tmp13_; + gint _tmp10_; + gchar** _tmp11_; gint usb_cameras_length1; gint _usb_cameras_size_; DiscoveredCamera** missing = NULL; - DiscoveredCamera** _tmp47_; + DiscoveredCamera** _tmp41_; gint missing_length1; gint _missing_size_; - DiscoveredCamera** _tmp80_; - gint _tmp80__length1; + DiscoveredCamera** _tmp72_; + gint _tmp72__length1; GError * _inner_error_ = NULL; #line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_if_fail (IS_CAMERA_TABLE (self)); @@ -2186,7 +2205,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _gp_port_info_list_free0 (port_info_list); #line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2188 "CameraTable.c" +#line 2207 "CameraTable.c" } else { #line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); @@ -2196,15 +2215,13 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) g_clear_error (&_inner_error_); #line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2198 "CameraTable.c" +#line 2217 "CameraTable.c" } } #line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp2_ = port_info_list; #line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp3_ = gp_port_info_list_load (_tmp2_); -#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp3_, "load port list", &_inner_error_); + camera_table_do_op (self, gp_port_info_list_load (_tmp2_), "load port list", &_inner_error_); #line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -2215,7 +2232,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _gp_port_info_list_free0 (port_info_list); #line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2217 "CameraTable.c" +#line 2234 "CameraTable.c" } else { #line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); @@ -2225,17 +2242,17 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) g_clear_error (&_inner_error_); #line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2227 "CameraTable.c" +#line 2244 "CameraTable.c" } } #line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp5_ = gp_list_new (&_tmp4_); + _tmp4_ = gp_list_new (&_tmp3_); #line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); #line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_list = _tmp4_; + camera_list = _tmp3_; #line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp5_, "create camera list", &_inner_error_); + camera_table_do_op (self, _tmp4_, "create camera list", &_inner_error_); #line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -2248,7 +2265,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _gp_port_info_list_free0 (port_info_list); #line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2250 "CameraTable.c" +#line 2267 "CameraTable.c" } else { #line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); @@ -2260,21 +2277,19 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) g_clear_error (&_inner_error_); #line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2262 "CameraTable.c" +#line 2279 "CameraTable.c" } } #line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp6_ = self->priv->abilities_list; -#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp7_ = port_info_list; + _tmp5_ = self->priv->abilities_list; #line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp8_ = camera_list; + _tmp6_ = port_info_list; #line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp9_ = self->priv->null_context; + _tmp7_ = camera_list; #line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp10_ = gp_abilities_list_detect (_tmp6_, _tmp7_, _tmp8_, _tmp9_); + _tmp8_ = self->priv->null_context; #line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp10_, "detect cameras", &_inner_error_); + camera_table_do_op (self, gp_abilities_list_detect (_tmp5_, _tmp6_, _tmp7_, _tmp8_), "detect cameras", &_inner_error_); #line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -2287,7 +2302,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _gp_port_info_list_free0 (port_info_list); #line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2289 "CameraTable.c" +#line 2304 "CameraTable.c" } else { #line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); @@ -2299,97 +2314,92 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) g_clear_error (&_inner_error_); #line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2301 "CameraTable.c" +#line 2316 "CameraTable.c" } } #line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp9_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - detected_map = _tmp11_; + detected_map = _tmp9_; #line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp13_ = camera_table_get_all_usb_cameras (self, &_tmp12_); + _tmp11_ = camera_table_get_all_usb_cameras (self, &_tmp10_); #line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_cameras = _tmp13_; + usb_cameras = _tmp11_; #line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_cameras_length1 = _tmp12_; + usb_cameras_length1 = _tmp10_; #line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _usb_cameras_size_ = usb_cameras_length1; -#line 2316 "CameraTable.c" +#line 2331 "CameraTable.c" { gint ctr = 0; #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" ctr = 0; -#line 2321 "CameraTable.c" +#line 2336 "CameraTable.c" { - gboolean _tmp14_ = FALSE; + gboolean _tmp12_ = FALSE; #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp14_ = TRUE; + _tmp12_ = TRUE; #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" while (TRUE) { -#line 2328 "CameraTable.c" - gint _tmp16_; - CameraList* _tmp17_; - gint _tmp18_; +#line 2343 "CameraTable.c" + gint _tmp14_; + CameraList* _tmp15_; gchar* name = NULL; - CameraList* _tmp19_; - gint _tmp20_; - const gchar* _tmp21_ = NULL; - int _tmp22_; - gchar* _tmp23_; + CameraList* _tmp16_; + gint _tmp17_; + const gchar* _tmp18_ = NULL; + int _tmp19_; + gchar* _tmp20_; gchar* port = NULL; - CameraList* _tmp24_; - gint _tmp25_; - const gchar* _tmp26_ = NULL; - int _tmp27_; - gchar* _tmp28_; - gint _tmp29_; - CameraList* _tmp30_; - gint _tmp31_; - const gchar* _tmp32_; - const gchar* _tmp33_; - const gchar* _tmp34_; - gboolean _tmp35_; - GeeHashMap* _tmp44_; - const gchar* _tmp45_; - const gchar* _tmp46_; + CameraList* _tmp21_; + gint _tmp22_; + const gchar* _tmp23_ = NULL; + int _tmp24_; + gchar* _tmp25_; + gint _tmp26_; + CameraList* _tmp27_; + const gchar* _tmp28_; + const gchar* _tmp29_; + const gchar* _tmp30_; + GeeHashMap* _tmp38_; + const gchar* _tmp39_; + const gchar* _tmp40_; #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (!_tmp14_) { -#line 2356 "CameraTable.c" - gint _tmp15_; + if (!_tmp12_) { +#line 2368 "CameraTable.c" + gint _tmp13_; #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp15_ = ctr; + _tmp13_ = ctr; #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - ctr = _tmp15_ + 1; -#line 2362 "CameraTable.c" + ctr = _tmp13_ + 1; +#line 2374 "CameraTable.c" } #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp14_ = FALSE; -#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp16_ = ctr; + _tmp12_ = FALSE; #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp17_ = camera_list; + _tmp14_ = ctr; #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp18_ = gp_list_count (_tmp17_); + _tmp15_ = camera_list; #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (!(_tmp16_ < _tmp18_)) { + if (!(_tmp14_ < gp_list_count (_tmp15_))) { #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" break; -#line 2376 "CameraTable.c" +#line 2386 "CameraTable.c" } #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp19_ = camera_list; + _tmp16_ = camera_list; #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp20_ = ctr; + _tmp17_ = ctr; #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp22_ = gp_list_get_name (_tmp19_, _tmp20_, &_tmp21_); + _tmp19_ = gp_list_get_name (_tmp16_, _tmp17_, &_tmp18_); #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp23_ = g_strdup (_tmp21_); + _tmp20_ = g_strdup (_tmp18_); #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - name = _tmp23_; + name = _tmp20_; #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp22_, "get detected camera name", &_inner_error_); + camera_table_do_op (self, _tmp19_, "get detected camera name", &_inner_error_); #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -2408,7 +2418,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _gp_port_info_list_free0 (port_info_list); #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2410 "CameraTable.c" +#line 2420 "CameraTable.c" } else { #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); @@ -2426,23 +2436,23 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) g_clear_error (&_inner_error_); #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2428 "CameraTable.c" +#line 2438 "CameraTable.c" } } #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp24_ = camera_list; + _tmp21_ = camera_list; #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp25_ = ctr; + _tmp22_ = ctr; #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp27_ = gp_list_get_value (_tmp24_, _tmp25_, &_tmp26_); + _tmp24_ = gp_list_get_value (_tmp21_, _tmp22_, &_tmp23_); #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp28_ = g_strdup (_tmp26_); + _tmp25_ = g_strdup (_tmp23_); #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - port = _tmp28_; + port = _tmp25_; #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp27_, "get detected camera port", &_inner_error_); + camera_table_do_op (self, _tmp24_, "get detected camera port", &_inner_error_); #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -2463,7 +2473,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _gp_port_info_list_free0 (port_info_list); #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2465 "CameraTable.c" +#line 2475 "CameraTable.c" } else { #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); @@ -2483,56 +2493,49 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) g_clear_error (&_inner_error_); #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2485 "CameraTable.c" +#line 2495 "CameraTable.c" } } #line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp29_ = ctr; + _tmp26_ = ctr; #line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp30_ = camera_list; + _tmp27_ = camera_list; #line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp31_ = gp_list_count (_tmp30_); + _tmp28_ = name; #line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp32_ = name; + _tmp29_ = port; #line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp33_ = port; -#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:256: Detected %d/%d %s @ %s", _tmp29_ + 1, _tmp31_, _tmp32_, _tmp33_); -#line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp34_ = port; + g_debug ("CameraTable.vala:256: Detected %d/%d %s @ %s", _tmp26_ + 1, gp_list_count (_tmp27_), _tmp28_, _tmp29_); #line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp35_ = g_str_has_prefix (_tmp34_, "usb:"); + _tmp30_ = port; #line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp35_) { -#line 2506 "CameraTable.c" + if (g_str_has_prefix (_tmp30_, "usb:")) { +#line 2512 "CameraTable.c" gchar* full_port = NULL; - CameraList* _tmp36_; - gint _tmp37_; - gchar** _tmp38_; - gint _tmp38__length1; - const gchar* _tmp39_; - gchar* _tmp40_ = NULL; - gboolean _tmp41_; - const gchar* _tmp42_; - gchar* _tmp43_; -#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp36_ = camera_list; + CameraList* _tmp31_; + gchar** _tmp32_; + gint _tmp32__length1; + const gchar* _tmp33_; + gchar* _tmp34_ = NULL; + gboolean _tmp35_; + const gchar* _tmp36_; + gchar* _tmp37_; #line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp37_ = gp_list_count (_tmp36_); + _tmp31_ = camera_list; #line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp38_ = usb_cameras; + _tmp32_ = usb_cameras; #line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp38__length1 = usb_cameras_length1; + _tmp32__length1 = usb_cameras_length1; #line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp39_ = port; + _tmp33_ = port; #line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp41_ = camera_table_usb_esp (self, _tmp37_, _tmp38_, _tmp38__length1, _tmp39_, &_tmp40_); + _tmp35_ = camera_table_usb_esp (self, gp_list_count (_tmp31_), _tmp32_, _tmp32__length1, _tmp33_, &_tmp34_); #line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (full_port); #line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - full_port = _tmp40_; + full_port = _tmp34_; #line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (!_tmp41_) { + if (!_tmp35_) { #line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (full_port); #line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -2541,128 +2544,124 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _g_free0 (name); #line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" continue; -#line 2543 "CameraTable.c" +#line 2546 "CameraTable.c" } #line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp42_ = full_port; + _tmp36_ = full_port; #line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp43_ = g_strdup (_tmp42_); + _tmp37_ = g_strdup (_tmp36_); #line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); #line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - port = _tmp43_; + port = _tmp37_; #line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (full_port); -#line 2555 "CameraTable.c" +#line 2558 "CameraTable.c" } #line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp44_ = detected_map; + _tmp38_ = detected_map; #line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp45_ = port; + _tmp39_ = port; #line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp46_ = name; + _tmp40_ = name; #line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp45_, _tmp46_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp39_, _tmp40_); #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 2569 "CameraTable.c" +#line 2572 "CameraTable.c" } } } #line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp47_ = g_new0 (DiscoveredCamera*, 0 + 1); + _tmp41_ = g_new0 (DiscoveredCamera*, 0 + 1); #line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - missing = _tmp47_; + missing = _tmp41_; #line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing_length1 = 0; #line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _missing_size_ = missing_length1; -#line 2581 "CameraTable.c" +#line 2584 "CameraTable.c" { GeeIterator* _camera_it = NULL; - GeeHashMap* _tmp48_; - GeeCollection* _tmp49_; - GeeCollection* _tmp50_; - GeeCollection* _tmp51_; - GeeIterator* _tmp52_; - GeeIterator* _tmp53_; + GeeHashMap* _tmp42_; + GeeCollection* _tmp43_; + GeeCollection* _tmp44_; + GeeCollection* _tmp45_; + GeeIterator* _tmp46_; + GeeIterator* _tmp47_; #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp48_ = self->priv->camera_map; + _tmp42_ = self->priv->camera_map; #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp49_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp43_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp50_ = _tmp49_; + _tmp44_ = _tmp43_; #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp51_ = _tmp50_; + _tmp45_ = _tmp44_; #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp52_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp46_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ITERABLE, GeeIterable)); #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp53_ = _tmp52_; + _tmp47_ = _tmp46_; #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_object_unref0 (_tmp51_); + _g_object_unref0 (_tmp45_); #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _camera_it = _tmp53_; + _camera_it = _tmp47_; #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" while (TRUE) { -#line 2608 "CameraTable.c" - GeeIterator* _tmp54_; - gboolean _tmp55_; +#line 2611 "CameraTable.c" + GeeIterator* _tmp48_; DiscoveredCamera* camera = NULL; - GeeIterator* _tmp56_; - gpointer _tmp57_; + GeeIterator* _tmp49_; + gpointer _tmp50_; GPPortInfo port_info = {0}; gchar* tmp_path = NULL; - DiscoveredCamera* _tmp58_; - Camera* _tmp59_; - GPPortInfo _tmp60_ = {0}; - int _tmp61_; - const gchar* _tmp62_ = NULL; - gchar* _tmp63_; + DiscoveredCamera* _tmp51_; + Camera* _tmp52_; + GPPortInfo _tmp53_ = {0}; + int _tmp54_; + const gchar* _tmp55_ = NULL; + gchar* _tmp56_; CameraAbilities abilities = {0}; - DiscoveredCamera* _tmp64_; - Camera* _tmp65_; - CameraAbilities _tmp66_ = {0}; - int _tmp67_; - GeeHashMap* _tmp68_; - const gchar* _tmp69_; - gboolean _tmp70_; - CameraAbilities _tmp74_; - const gchar* _tmp75_; - const gchar* _tmp76_; - DiscoveredCamera** _tmp77_; - gint _tmp77__length1; - DiscoveredCamera* _tmp78_; - DiscoveredCamera* _tmp79_; + DiscoveredCamera* _tmp57_; + Camera* _tmp58_; + CameraAbilities _tmp59_ = {0}; + int _tmp60_; + GeeHashMap* _tmp61_; + const gchar* _tmp62_; + CameraAbilities _tmp66_; + const gchar* _tmp67_; + const gchar* _tmp68_; + DiscoveredCamera** _tmp69_; + gint _tmp69__length1; + DiscoveredCamera* _tmp70_; + DiscoveredCamera* _tmp71_; #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp54_ = _camera_it; + _tmp48_ = _camera_it; #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp55_ = gee_iterator_next (_tmp54_); -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (!_tmp55_) { + if (!gee_iterator_next (_tmp48_)) { #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" break; -#line 2645 "CameraTable.c" +#line 2644 "CameraTable.c" } #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp56_ = _camera_it; + _tmp49_ = _camera_it; #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp57_ = gee_iterator_get (_tmp56_); + _tmp50_ = gee_iterator_get (_tmp49_); #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera = (DiscoveredCamera*) _tmp57_; + camera = (DiscoveredCamera*) _tmp50_; #line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp58_ = camera; + _tmp51_ = camera; #line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp59_ = _tmp58_->gcamera; + _tmp52_ = _tmp51_->gcamera; #line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp61_ = gp_camera_get_port_info (_tmp59_, &_tmp60_); + _tmp54_ = gp_camera_get_port_info (_tmp52_, &_tmp53_); #line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); #line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - port_info = _tmp60_; + port_info = _tmp53_; #line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp61_, "retrieve missing camera port information", &_inner_error_); + camera_table_do_op (self, _tmp54_, "retrieve missing camera port information", &_inner_error_); #line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -2689,7 +2688,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _gp_port_info_list_free0 (port_info_list); #line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2691 "CameraTable.c" +#line 2690 "CameraTable.c" } else { #line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); @@ -2715,29 +2714,29 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) g_clear_error (&_inner_error_); #line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2717 "CameraTable.c" +#line 2716 "CameraTable.c" } } #line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - gp_port_info_get_path (port_info, &_tmp62_); + gp_port_info_get_path (port_info, &_tmp55_); #line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); #line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp63_ = g_strdup (_tmp62_); + _tmp56_ = g_strdup (_tmp55_); #line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - tmp_path = _tmp63_; + tmp_path = _tmp56_; #line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp64_ = camera; + _tmp57_ = camera; #line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp65_ = _tmp64_->gcamera; + _tmp58_ = _tmp57_->gcamera; #line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp67_ = gp_camera_get_abilities (_tmp65_, &_tmp66_); + _tmp60_ = gp_camera_get_abilities (_tmp58_, &_tmp59_); #line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (abilities); #line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - abilities = _tmp66_; + abilities = _tmp59_; #line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp67_, "retrieve camera abilities", &_inner_error_); + camera_table_do_op (self, _tmp60_, "retrieve camera abilities", &_inner_error_); #line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -2766,7 +2765,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _gp_port_info_list_free0 (port_info_list); #line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2768 "CameraTable.c" +#line 2767 "CameraTable.c" } else { #line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (abilities); @@ -2794,29 +2793,27 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) g_clear_error (&_inner_error_); #line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2796 "CameraTable.c" +#line 2795 "CameraTable.c" } } #line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp68_ = detected_map; -#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp69_ = tmp_path; + _tmp61_ = detected_map; #line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp70_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp69_); + _tmp62_ = tmp_path; #line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp70_) { -#line 2807 "CameraTable.c" - CameraAbilities _tmp71_; - const gchar* _tmp72_; - const gchar* _tmp73_; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp62_)) { +#line 2804 "CameraTable.c" + CameraAbilities _tmp63_; + const gchar* _tmp64_; + const gchar* _tmp65_; #line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp71_ = abilities; + _tmp63_ = abilities; #line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp72_ = _tmp71_.model; + _tmp64_ = _tmp63_.model; #line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp73_ = tmp_path; + _tmp65_ = tmp_path; #line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:285: Found camera for %s @ %s in detected map", _tmp72_, _tmp73_); + g_debug ("CameraTable.vala:285: Found camera for %s @ %s in detected map", _tmp64_, _tmp65_); #line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (abilities); #line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -2827,26 +2824,26 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _discovered_camera_unref0 (camera); #line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" continue; -#line 2829 "CameraTable.c" +#line 2826 "CameraTable.c" } #line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp74_ = abilities; + _tmp66_ = abilities; #line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp75_ = _tmp74_.model; + _tmp67_ = _tmp66_.model; #line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp76_ = tmp_path; + _tmp68_ = tmp_path; #line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:290: %s @ %s missing", _tmp75_, _tmp76_); + g_debug ("CameraTable.vala:290: %s @ %s missing", _tmp67_, _tmp68_); #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp77_ = missing; + _tmp69_ = missing; #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp77__length1 = missing_length1; + _tmp69__length1 = missing_length1; #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp78_ = camera; + _tmp70_ = camera; #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp79_ = _discovered_camera_ref0 (_tmp78_); + _tmp71_ = _discovered_camera_ref0 (_tmp70_); #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _vala_array_add70 (&missing, &missing_length1, &_missing_size_, _tmp79_); + _vala_array_add70 (&missing, &missing_length1, &_missing_size_, _tmp71_); #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (abilities); #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -2855,70 +2852,70 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) (port_info); #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _discovered_camera_unref0 (camera); -#line 2857 "CameraTable.c" +#line 2854 "CameraTable.c" } #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_camera_it); -#line 2861 "CameraTable.c" +#line 2858 "CameraTable.c" } #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp80_ = missing; + _tmp72_ = missing; #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp80__length1 = missing_length1; -#line 2867 "CameraTable.c" + _tmp72__length1 = missing_length1; +#line 2864 "CameraTable.c" { DiscoveredCamera** camera_collection = NULL; gint camera_collection_length1 = 0; gint _camera_collection_size_ = 0; gint camera_it = 0; #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_collection = _tmp80_; + camera_collection = _tmp72_; #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_collection_length1 = _tmp80__length1; + camera_collection_length1 = _tmp72__length1; #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - for (camera_it = 0; camera_it < _tmp80__length1; camera_it = camera_it + 1) { -#line 2879 "CameraTable.c" - DiscoveredCamera* _tmp81_; + for (camera_it = 0; camera_it < _tmp72__length1; camera_it = camera_it + 1) { +#line 2876 "CameraTable.c" + DiscoveredCamera* _tmp73_; DiscoveredCamera* camera = NULL; #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp81_ = _discovered_camera_ref0 (camera_collection[camera_it]); + _tmp73_ = _discovered_camera_ref0 (camera_collection[camera_it]); #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera = _tmp81_; -#line 2886 "CameraTable.c" + camera = _tmp73_; +#line 2883 "CameraTable.c" { GPPortInfo port_info = {0}; gchar* tmp_path = NULL; - DiscoveredCamera* _tmp82_; - Camera* _tmp83_; - GPPortInfo _tmp84_ = {0}; - int _tmp85_; - const gchar* _tmp86_ = NULL; - gchar* _tmp87_; + DiscoveredCamera* _tmp74_; + Camera* _tmp75_; + GPPortInfo _tmp76_ = {0}; + int _tmp77_; + const gchar* _tmp78_ = NULL; + gchar* _tmp79_; CameraAbilities abilities = {0}; - DiscoveredCamera* _tmp88_; - Camera* _tmp89_; - CameraAbilities _tmp90_ = {0}; - int _tmp91_; - CameraAbilities _tmp92_; - const gchar* _tmp93_; - const gchar* _tmp94_; - GeeHashMap* _tmp95_; - const gchar* _tmp96_; - gchar* _tmp97_; - gchar* _tmp98_; - DiscoveredCamera* _tmp99_; + DiscoveredCamera* _tmp80_; + Camera* _tmp81_; + CameraAbilities _tmp82_ = {0}; + int _tmp83_; + CameraAbilities _tmp84_; + const gchar* _tmp85_; + const gchar* _tmp86_; + GeeHashMap* _tmp87_; + const gchar* _tmp88_; + gchar* _tmp89_; + gchar* _tmp90_; + DiscoveredCamera* _tmp91_; #line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp82_ = camera; + _tmp74_ = camera; #line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp83_ = _tmp82_->gcamera; + _tmp75_ = _tmp74_->gcamera; #line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp85_ = gp_camera_get_port_info (_tmp83_, &_tmp84_); + _tmp77_ = gp_camera_get_port_info (_tmp75_, &_tmp76_); #line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); #line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - port_info = _tmp84_; + port_info = _tmp76_; #line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp85_, "retrieve missing camera port information", &_inner_error_); + camera_table_do_op (self, _tmp77_, "retrieve missing camera port information", &_inner_error_); #line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -2943,7 +2940,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _gp_port_info_list_free0 (port_info_list); #line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2945 "CameraTable.c" +#line 2942 "CameraTable.c" } else { #line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); @@ -2967,29 +2964,29 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) g_clear_error (&_inner_error_); #line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2969 "CameraTable.c" +#line 2966 "CameraTable.c" } } #line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - gp_port_info_get_path (port_info, &_tmp86_); + gp_port_info_get_path (port_info, &_tmp78_); #line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); #line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp87_ = g_strdup (_tmp86_); + _tmp79_ = g_strdup (_tmp78_); #line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - tmp_path = _tmp87_; + tmp_path = _tmp79_; #line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp88_ = camera; + _tmp80_ = camera; #line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp89_ = _tmp88_->gcamera; + _tmp81_ = _tmp80_->gcamera; #line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp91_ = gp_camera_get_abilities (_tmp89_, &_tmp90_); + _tmp83_ = gp_camera_get_abilities (_tmp81_, &_tmp82_); #line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (abilities); #line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - abilities = _tmp90_; + abilities = _tmp82_; #line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp91_, "retrieve missing camera abilities", &_inner_error_); + camera_table_do_op (self, _tmp83_, "retrieve missing camera abilities", &_inner_error_); #line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -3016,7 +3013,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _gp_port_info_list_free0 (port_info_list); #line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3018 "CameraTable.c" +#line 3015 "CameraTable.c" } else { #line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (abilities); @@ -3042,33 +3039,33 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) g_clear_error (&_inner_error_); #line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3044 "CameraTable.c" +#line 3041 "CameraTable.c" } } #line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp92_ = abilities; + _tmp84_ = abilities; #line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp93_ = _tmp92_.model; + _tmp85_ = _tmp84_.model; #line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp94_ = tmp_path; + _tmp86_ = tmp_path; #line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:307: Removing from camera table: %s @ %s", _tmp93_, _tmp94_); + g_debug ("CameraTable.vala:307: Removing from camera table: %s @ %s", _tmp85_, _tmp86_); #line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp95_ = self->priv->camera_map; + _tmp87_ = self->priv->camera_map; #line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp96_ = tmp_path; + _tmp88_ = tmp_path; #line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp97_ = camera_table_get_port_uri (_tmp96_); + _tmp89_ = camera_table_get_port_uri (_tmp88_); #line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp98_ = _tmp97_; + _tmp90_ = _tmp89_; #line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp98_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp90_, NULL); #line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp98_); + _g_free0 (_tmp90_); #line 311 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp99_ = camera; + _tmp91_ = camera; #line 311 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_REMOVED_SIGNAL], 0, _tmp99_); + g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_REMOVED_SIGNAL], 0, _tmp91_); #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (abilities); #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -3077,173 +3074,162 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) (port_info); #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _discovered_camera_unref0 (camera); -#line 3079 "CameraTable.c" +#line 3076 "CameraTable.c" } } } { GeeIterator* _port_it = NULL; - GeeHashMap* _tmp100_; - GeeSet* _tmp101_; - GeeSet* _tmp102_; - GeeSet* _tmp103_; - GeeIterator* _tmp104_; - GeeIterator* _tmp105_; + GeeHashMap* _tmp92_; + GeeSet* _tmp93_; + GeeSet* _tmp94_; + GeeSet* _tmp95_; + GeeIterator* _tmp96_; + GeeIterator* _tmp97_; #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp100_ = detected_map; + _tmp92_ = detected_map; #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp101_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp93_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp102_ = _tmp101_; + _tmp94_ = _tmp93_; #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp103_ = _tmp102_; + _tmp95_ = _tmp94_; #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp104_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp96_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, GEE_TYPE_ITERABLE, GeeIterable)); #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp105_ = _tmp104_; + _tmp97_ = _tmp96_; #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_object_unref0 (_tmp103_); + _g_object_unref0 (_tmp95_); #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _port_it = _tmp105_; + _port_it = _tmp97_; #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" while (TRUE) { -#line 3109 "CameraTable.c" - GeeIterator* _tmp106_; - gboolean _tmp107_; +#line 3106 "CameraTable.c" + GeeIterator* _tmp98_; gchar* port = NULL; - GeeIterator* _tmp108_; - gpointer _tmp109_; + GeeIterator* _tmp99_; + gpointer _tmp100_; gchar* name = NULL; - GeeHashMap* _tmp110_; - const gchar* _tmp111_; - gpointer _tmp112_; + GeeHashMap* _tmp101_; + const gchar* _tmp102_; + gpointer _tmp103_; gchar* display_name = NULL; gchar* icon = NULL; gchar* uri = NULL; - const gchar* _tmp113_; - gchar* _tmp114_; - GeeHashMap* _tmp115_; - const gchar* _tmp116_; - gboolean _tmp117_; + const gchar* _tmp104_; + gchar* _tmp105_; + GeeHashMap* _tmp106_; + const gchar* _tmp107_; gchar* path = NULL; - const gchar* _tmp120_; - gchar* _tmp121_; - const gchar* _tmp122_; - const gchar* _tmp142_; - gboolean _tmp143_; - const gchar* _tmp162_; + const gchar* _tmp110_; + gchar* _tmp111_; + const gchar* _tmp112_; + const gchar* _tmp132_; + const gchar* _tmp151_; gint index = 0; - GPPortInfoList* _tmp165_; - const gchar* _tmp166_; - gint _tmp167_; - gint _tmp168_; + GPPortInfoList* _tmp154_; + const gchar* _tmp155_; + gint _tmp156_; GPPortInfo port_info = {0}; gchar* tmp_path = NULL; - GPPortInfoList* _tmp173_; + GPPortInfoList* _tmp161_; + gint _tmp162_; + GPPortInfo _tmp163_ = {0}; + int _tmp164_; + const gchar* _tmp165_; + gchar* _tmp166_; + gchar* _tmp167_; + const gchar* _tmp168_ = NULL; + gchar* _tmp169_; + const gchar* _tmp170_; + const gchar* _tmp171_; + CameraAbilitiesList* _tmp172_; + const gchar* _tmp173_; gint _tmp174_; - GPPortInfo _tmp175_ = {0}; - int _tmp176_; - const gchar* _tmp177_; - gchar* _tmp178_; - gchar* _tmp179_; - const gchar* _tmp180_ = NULL; - gchar* _tmp181_; - const gchar* _tmp182_; - const gchar* _tmp183_; - CameraAbilitiesList* _tmp184_; - const gchar* _tmp185_; - gint _tmp186_; - gint _tmp187_; CameraAbilities camera_abilities = {0}; - CameraAbilitiesList* _tmp192_; - gint _tmp193_; - CameraAbilities _tmp194_ = {0}; - int _tmp195_; - const gchar* _tmp196_; - gchar* _tmp197_; - gchar* _tmp198_; + CameraAbilitiesList* _tmp179_; + gint _tmp180_; + CameraAbilities _tmp181_ = {0}; + int _tmp182_; + const gchar* _tmp183_; + gchar* _tmp184_; + gchar* _tmp185_; Camera* gcamera = NULL; - Camera* _tmp199_ = NULL; - int _tmp200_; - const gchar* _tmp201_; - gchar* _tmp202_; - gchar* _tmp203_; + Camera* _tmp186_ = NULL; + int _tmp187_; + const gchar* _tmp188_; + gchar* _tmp189_; + gchar* _tmp190_; + Camera* _tmp191_; + CameraAbilities _tmp192_; + const gchar* _tmp193_; + gchar* _tmp194_; + gchar* _tmp195_; + Camera* _tmp196_; + GPPortInfo _tmp197_; + const gchar* _tmp198_; + const gchar* _tmp199_; + gchar* _tmp200_; + gchar* _tmp201_; + const gchar* _tmp202_; + const gchar* _tmp203_; + DiscoveredCamera* camera = NULL; Camera* _tmp204_; - CameraAbilities _tmp205_; - int _tmp206_; + const gchar* _tmp205_; + const gchar* _tmp206_; const gchar* _tmp207_; - gchar* _tmp208_; - gchar* _tmp209_; - Camera* _tmp210_; - GPPortInfo _tmp211_; - int _tmp212_; - const gchar* _tmp213_; - const gchar* _tmp214_; - gchar* _tmp215_; - gchar* _tmp216_; - const gchar* _tmp217_; - const gchar* _tmp218_; - DiscoveredCamera* camera = NULL; - Camera* _tmp219_; - const gchar* _tmp220_; - const gchar* _tmp221_; - const gchar* _tmp222_; - DiscoveredCamera* _tmp223_; - GeeHashMap* _tmp224_; - const gchar* _tmp225_; - DiscoveredCamera* _tmp226_; - DiscoveredCamera* _tmp227_; + DiscoveredCamera* _tmp208_; + GeeHashMap* _tmp209_; + const gchar* _tmp210_; + DiscoveredCamera* _tmp211_; + DiscoveredCamera* _tmp212_; #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp106_ = _port_it; + _tmp98_ = _port_it; #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp107_ = gee_iterator_next (_tmp106_); -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (!_tmp107_) { + if (!gee_iterator_next (_tmp98_)) { #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" break; -#line 3203 "CameraTable.c" +#line 3191 "CameraTable.c" } #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp108_ = _port_it; + _tmp99_ = _port_it; #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp109_ = gee_iterator_get (_tmp108_); + _tmp100_ = gee_iterator_get (_tmp99_); #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - port = (gchar*) _tmp109_; + port = (gchar*) _tmp100_; #line 316 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp110_ = detected_map; + _tmp101_ = detected_map; #line 316 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp111_ = port; + _tmp102_ = port; #line 316 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp112_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp111_); + _tmp103_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp102_); #line 316 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - name = (gchar*) _tmp112_; + name = (gchar*) _tmp103_; #line 317 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" display_name = NULL; #line 318 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" icon = NULL; #line 319 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp113_ = port; + _tmp104_ = port; #line 319 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp114_ = camera_table_get_port_uri (_tmp113_); + _tmp105_ = camera_table_get_port_uri (_tmp104_); #line 319 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - uri = _tmp114_; -#line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp115_ = self->priv->camera_map; + uri = _tmp105_; #line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp116_ = uri; + _tmp106_ = self->priv->camera_map; #line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp117_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp116_); + _tmp107_ = uri; #line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp117_) { -#line 3237 "CameraTable.c" - const gchar* _tmp118_; - const gchar* _tmp119_; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp107_)) { +#line 3223 "CameraTable.c" + const gchar* _tmp108_; + const gchar* _tmp109_; #line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp118_ = name; + _tmp108_ = name; #line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp119_ = port; + _tmp109_ = port; #line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:323: %s @ %s already registered, skipping", _tmp118_, _tmp119_); + g_debug ("CameraTable.vala:323: %s @ %s already registered, skipping", _tmp108_, _tmp109_); #line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (uri); #line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -3256,213 +3242,211 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _g_free0 (port); #line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" continue; -#line 3258 "CameraTable.c" +#line 3244 "CameraTable.c" } #line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp120_ = port; + _tmp110_ = port; #line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp121_ = camera_table_get_port_path (_tmp120_); + _tmp111_ = camera_table_get_port_path (_tmp110_); #line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - path = _tmp121_; + path = _tmp111_; #line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp122_ = path; + _tmp112_ = path; #line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (NULL != _tmp122_) { -#line 3270 "CameraTable.c" + if (NULL != _tmp112_) { +#line 3256 "CameraTable.c" GUdevDevice* device = NULL; - GUdevClient* _tmp123_; - const gchar* _tmp124_; - GUdevDevice* _tmp125_; + GUdevClient* _tmp113_; + const gchar* _tmp114_; + GUdevDevice* _tmp115_; gchar* serial = NULL; - GUdevDevice* _tmp126_; - const gchar* _tmp127_; - gchar* _tmp128_; - const gchar* _tmp129_; - const gchar* _tmp134_; - const gchar* _tmp138_; + GUdevDevice* _tmp116_; + const gchar* _tmp117_; + gchar* _tmp118_; + const gchar* _tmp119_; + const gchar* _tmp124_; + const gchar* _tmp128_; #line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp123_ = self->priv->client; + _tmp113_ = self->priv->client; #line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp124_ = path; + _tmp114_ = path; #line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp125_ = g_udev_client_query_by_device_file (_tmp123_, _tmp124_); + _tmp115_ = g_udev_client_query_by_device_file (_tmp113_, _tmp114_); #line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - device = _tmp125_; + device = _tmp115_; #line 332 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp126_ = device; + _tmp116_ = device; #line 332 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp127_ = g_udev_device_get_property (_tmp126_, "ID_SERIAL_SHORT"); + _tmp117_ = g_udev_device_get_property (_tmp116_, "ID_SERIAL_SHORT"); #line 332 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp128_ = g_strdup (_tmp127_); + _tmp118_ = g_strdup (_tmp117_); #line 332 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - serial = _tmp128_; + serial = _tmp118_; #line 333 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp129_ = serial; + _tmp119_ = serial; #line 333 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (NULL != _tmp129_) { -#line 3302 "CameraTable.c" - const gchar* _tmp130_; - gchar* _tmp131_; - const gchar* _tmp132_; - gchar* _tmp133_; + if (NULL != _tmp119_) { +#line 3288 "CameraTable.c" + const gchar* _tmp120_; + gchar* _tmp121_; + const gchar* _tmp122_; + gchar* _tmp123_; #line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp130_ = serial; + _tmp120_ = serial; #line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp131_ = camera_table_get_name_for_uuid (self, _tmp130_); + _tmp121_ = camera_table_get_name_for_uuid (self, _tmp120_); #line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); #line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - display_name = _tmp131_; + display_name = _tmp121_; #line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp132_ = serial; + _tmp122_ = serial; #line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp133_ = camera_table_get_icon_for_uuid (self, _tmp132_); + _tmp123_ = camera_table_get_icon_for_uuid (self, _tmp122_); #line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); #line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - icon = _tmp133_; -#line 3323 "CameraTable.c" + icon = _tmp123_; +#line 3309 "CameraTable.c" } #line 338 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp134_ = display_name; + _tmp124_ = display_name; #line 338 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (NULL == _tmp134_) { -#line 3329 "CameraTable.c" - GUdevDevice* _tmp135_; - const gchar* _tmp136_; - gchar* _tmp137_; + if (NULL == _tmp124_) { +#line 3315 "CameraTable.c" + GUdevDevice* _tmp125_; + const gchar* _tmp126_; + gchar* _tmp127_; #line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp135_ = device; + _tmp125_ = device; #line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp136_ = g_udev_device_get_sysfs_attr (_tmp135_, "product"); + _tmp126_ = g_udev_device_get_sysfs_attr (_tmp125_, "product"); #line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp137_ = g_strdup (_tmp136_); + _tmp127_ = g_strdup (_tmp126_); #line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); #line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - display_name = _tmp137_; -#line 3343 "CameraTable.c" + display_name = _tmp127_; +#line 3329 "CameraTable.c" } #line 341 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp138_ = display_name; + _tmp128_ = display_name; #line 341 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (NULL == _tmp138_) { -#line 3349 "CameraTable.c" - GUdevDevice* _tmp139_; - const gchar* _tmp140_; - gchar* _tmp141_; + if (NULL == _tmp128_) { +#line 3335 "CameraTable.c" + GUdevDevice* _tmp129_; + const gchar* _tmp130_; + gchar* _tmp131_; #line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp139_ = device; + _tmp129_ = device; #line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp140_ = g_udev_device_get_property (_tmp139_, "ID_MODEL"); + _tmp130_ = g_udev_device_get_property (_tmp129_, "ID_MODEL"); #line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp141_ = g_strdup (_tmp140_); + _tmp131_ = g_strdup (_tmp130_); #line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); #line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - display_name = _tmp141_; -#line 3363 "CameraTable.c" + display_name = _tmp131_; +#line 3349 "CameraTable.c" } #line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (serial); #line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (device); -#line 3369 "CameraTable.c" +#line 3355 "CameraTable.c" } #line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp142_ = port; -#line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp143_ = g_str_has_prefix (_tmp142_, "disk:"); + _tmp132_ = port; #line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp143_) { -#line 3377 "CameraTable.c" + if (g_str_has_prefix (_tmp132_, "disk:")) { +#line 3361 "CameraTable.c" { GMount* mount = NULL; - const gchar* _tmp144_; + const gchar* _tmp133_; + gchar* _tmp134_; + gchar* _tmp135_; + GFile* _tmp136_; + GFile* _tmp137_; + GMount* _tmp138_; + GMount* _tmp139_; + GVolume* volume = NULL; + GMount* _tmp140_; + GVolume* _tmp141_; + const gchar* _tmp142_; + GVolume* _tmp143_; + gchar* _tmp144_; gchar* _tmp145_; gchar* _tmp146_; - GFile* _tmp147_; - GFile* _tmp148_; - GMount* _tmp149_; - GMount* _tmp150_; - GVolume* volume = NULL; - GMount* _tmp151_; - GVolume* _tmp152_; - const gchar* _tmp153_; - GVolume* _tmp154_; - gchar* _tmp155_; - gchar* _tmp156_; - gchar* _tmp157_; - GVolume* _tmp158_; - GIcon* _tmp159_; - GIcon* _tmp160_; - gchar* _tmp161_; + GVolume* _tmp147_; + GIcon* _tmp148_; + GIcon* _tmp149_; + gchar* _tmp150_; #line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp144_ = port; + _tmp133_ = port; #line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp145_ = string_substring (_tmp144_, (glong) 5, (glong) -1); + _tmp134_ = string_substring (_tmp133_, (glong) 5, (glong) -1); #line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp146_ = _tmp145_; + _tmp135_ = _tmp134_; #line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp147_ = g_file_new_for_path (_tmp146_); + _tmp136_ = g_file_new_for_path (_tmp135_); #line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp148_ = _tmp147_; + _tmp137_ = _tmp136_; #line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp149_ = g_file_find_enclosing_mount (_tmp148_, NULL, &_inner_error_); + _tmp138_ = g_file_find_enclosing_mount (_tmp137_, NULL, &_inner_error_); #line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp150_ = _tmp149_; + _tmp139_ = _tmp138_; #line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_object_unref0 (_tmp148_); + _g_object_unref0 (_tmp137_); #line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp146_); + _g_free0 (_tmp135_); #line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - mount = _tmp150_; + mount = _tmp139_; #line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3421 "CameraTable.c" +#line 3405 "CameraTable.c" goto __catch67_g_error; } #line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp151_ = mount; + _tmp140_ = mount; #line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp152_ = g_mount_get_volume (_tmp151_); + _tmp141_ = g_mount_get_volume (_tmp140_); #line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - volume = _tmp152_; + volume = _tmp141_; #line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp153_ = name; + _tmp142_ = name; #line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp154_ = volume; + _tmp143_ = volume; #line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp155_ = g_volume_get_name (_tmp154_); + _tmp144_ = g_volume_get_name (_tmp143_); #line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp156_ = _tmp155_; + _tmp145_ = _tmp144_; #line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp157_ = g_strdup_printf (_ ("%s (%s)"), _tmp153_, _tmp156_); + _tmp146_ = g_strdup_printf (_ ("%s (%s)"), _tmp142_, _tmp145_); #line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); #line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - display_name = _tmp157_; + display_name = _tmp146_; #line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp156_); + _g_free0 (_tmp145_); #line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp158_ = volume; + _tmp147_ = volume; #line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp159_ = g_volume_get_icon (_tmp158_); + _tmp148_ = g_volume_get_icon (_tmp147_); #line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp160_ = _tmp159_; + _tmp149_ = _tmp148_; #line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp161_ = g_icon_to_string (_tmp160_); + _tmp150_ = g_icon_to_string (_tmp149_); #line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); #line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - icon = _tmp161_; + icon = _tmp150_; #line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_object_unref0 (_tmp160_); + _g_object_unref0 (_tmp149_); #line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (volume); #line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (mount); -#line 3464 "CameraTable.c" +#line 3448 "CameraTable.c" } goto __finally67; __catch67_g_error: @@ -3474,7 +3458,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _inner_error_ = NULL; #line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_error_free0 (e); -#line 3476 "CameraTable.c" +#line 3460 "CameraTable.c" } __finally67: #line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -3509,7 +3493,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _gp_port_info_list_free0 (port_info_list); #line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3511 "CameraTable.c" +#line 3495 "CameraTable.c" } else { #line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (path); @@ -3541,56 +3525,54 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) g_clear_error (&_inner_error_); #line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3543 "CameraTable.c" +#line 3527 "CameraTable.c" } } } #line 356 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp162_ = display_name; + _tmp151_ = display_name; #line 356 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (NULL == _tmp162_) { -#line 3551 "CameraTable.c" - const gchar* _tmp163_; - gchar* _tmp164_; + if (NULL == _tmp151_) { +#line 3535 "CameraTable.c" + const gchar* _tmp152_; + gchar* _tmp153_; #line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp163_ = name; + _tmp152_ = name; #line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp164_ = g_strdup (_tmp163_); + _tmp153_ = g_strdup (_tmp152_); #line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); #line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - display_name = _tmp164_; -#line 3562 "CameraTable.c" + display_name = _tmp153_; +#line 3546 "CameraTable.c" } #line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp165_ = port_info_list; -#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp166_ = port; + _tmp154_ = port_info_list; #line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp167_ = gp_port_info_list_lookup_path (_tmp165_, _tmp166_); + _tmp155_ = port; #line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - index = _tmp167_; + index = gp_port_info_list_lookup_path (_tmp154_, _tmp155_); #line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp168_ = index; + _tmp156_ = index; #line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp168_ < 0) { -#line 3576 "CameraTable.c" - gint _tmp169_; - const gchar* _tmp170_; - gchar* _tmp171_; - gchar* _tmp172_; + if (_tmp156_ < 0) { +#line 3558 "CameraTable.c" + gint _tmp157_; + const gchar* _tmp158_; + gchar* _tmp159_; + gchar* _tmp160_; #line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp169_ = index; + _tmp157_ = index; #line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp170_ = port; + _tmp158_ = port; #line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp171_ = g_strdup_printf ("lookup port %s", _tmp170_); + _tmp159_ = g_strdup_printf ("lookup port %s", _tmp158_); #line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp172_ = _tmp171_; + _tmp160_ = _tmp159_; #line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, (int) _tmp169_, _tmp172_, &_inner_error_); + camera_table_do_op (self, (int) _tmp157_, _tmp160_, &_inner_error_); #line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp172_); + _g_free0 (_tmp160_); #line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -3623,7 +3605,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _gp_port_info_list_free0 (port_info_list); #line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3625 "CameraTable.c" +#line 3607 "CameraTable.c" } else { #line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (path); @@ -3655,30 +3637,30 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) g_clear_error (&_inner_error_); #line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3657 "CameraTable.c" +#line 3639 "CameraTable.c" } } } #line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp173_ = port_info_list; + _tmp161_ = port_info_list; #line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp174_ = index; + _tmp162_ = index; #line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp176_ = gp_port_info_list_get_info (_tmp173_, _tmp174_, &_tmp175_); + _tmp164_ = gp_port_info_list_get_info (_tmp161_, _tmp162_, &_tmp163_); #line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); #line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - port_info = _tmp175_; + port_info = _tmp163_; #line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp177_ = port; + _tmp165_ = port; #line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp178_ = g_strdup_printf ("get port info for %s", _tmp177_); + _tmp166_ = g_strdup_printf ("get port info for %s", _tmp165_); #line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp179_ = _tmp178_; + _tmp167_ = _tmp166_; #line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp176_, _tmp179_, &_inner_error_); + camera_table_do_op (self, _tmp164_, _tmp167_, &_inner_error_); #line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp179_); + _g_free0 (_tmp167_); #line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -3715,7 +3697,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _gp_port_info_list_free0 (port_info_list); #line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3717 "CameraTable.c" +#line 3699 "CameraTable.c" } else { #line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); @@ -3751,52 +3733,50 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) g_clear_error (&_inner_error_); #line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3753 "CameraTable.c" +#line 3735 "CameraTable.c" } } #line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - gp_port_info_get_path (port_info, &_tmp180_); + gp_port_info_get_path (port_info, &_tmp168_); #line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); #line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp181_ = g_strdup (_tmp180_); + _tmp169_ = g_strdup (_tmp168_); #line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - tmp_path = _tmp181_; + tmp_path = _tmp169_; #line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp182_ = port; + _tmp170_ = port; #line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp183_ = tmp_path; + _tmp171_ = tmp_path; #line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _vala_assert (g_strcmp0 (_tmp182_, _tmp183_) == 0, "port == tmp_path"); -#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp184_ = self->priv->abilities_list; + _vala_assert (g_strcmp0 (_tmp170_, _tmp171_) == 0, "port == tmp_path"); #line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp185_ = name; + _tmp172_ = self->priv->abilities_list; #line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp186_ = gp_abilities_list_lookup_model (_tmp184_, _tmp185_); + _tmp173_ = name; #line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - index = _tmp186_; + index = gp_abilities_list_lookup_model (_tmp172_, _tmp173_); #line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp187_ = index; + _tmp174_ = index; #line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp187_ < 0) { -#line 3782 "CameraTable.c" - gint _tmp188_; - const gchar* _tmp189_; - gchar* _tmp190_; - gchar* _tmp191_; + if (_tmp174_ < 0) { +#line 3762 "CameraTable.c" + gint _tmp175_; + const gchar* _tmp176_; + gchar* _tmp177_; + gchar* _tmp178_; #line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp188_ = index; + _tmp175_ = index; #line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp189_ = name; + _tmp176_ = name; #line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp190_ = g_strdup_printf ("lookup camera model %s", _tmp189_); + _tmp177_ = g_strdup_printf ("lookup camera model %s", _tmp176_); #line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp191_ = _tmp190_; + _tmp178_ = _tmp177_; #line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, (int) _tmp188_, _tmp191_, &_inner_error_); + camera_table_do_op (self, (int) _tmp175_, _tmp178_, &_inner_error_); #line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp191_); + _g_free0 (_tmp178_); #line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -3833,7 +3813,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _gp_port_info_list_free0 (port_info_list); #line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3835 "CameraTable.c" +#line 3815 "CameraTable.c" } else { #line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); @@ -3869,30 +3849,30 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) g_clear_error (&_inner_error_); #line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3871 "CameraTable.c" +#line 3851 "CameraTable.c" } } } #line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp192_ = self->priv->abilities_list; + _tmp179_ = self->priv->abilities_list; #line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp193_ = index; + _tmp180_ = index; #line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp195_ = gp_abilities_list_get_abilities (_tmp192_, _tmp193_, &_tmp194_); + _tmp182_ = gp_abilities_list_get_abilities (_tmp179_, _tmp180_, &_tmp181_); #line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (camera_abilities); #line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_abilities = _tmp194_; + camera_abilities = _tmp181_; #line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp196_ = name; + _tmp183_ = name; #line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp197_ = g_strdup_printf ("lookup camera abilities for %s", _tmp196_); + _tmp184_ = g_strdup_printf ("lookup camera abilities for %s", _tmp183_); #line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp198_ = _tmp197_; + _tmp185_ = _tmp184_; #line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp195_, _tmp198_, &_inner_error_); + camera_table_do_op (self, _tmp182_, _tmp185_, &_inner_error_); #line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp198_); + _g_free0 (_tmp185_); #line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -3931,7 +3911,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _gp_port_info_list_free0 (port_info_list); #line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3933 "CameraTable.c" +#line 3913 "CameraTable.c" } else { #line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (camera_abilities); @@ -3969,25 +3949,25 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) g_clear_error (&_inner_error_); #line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3971 "CameraTable.c" +#line 3951 "CameraTable.c" } } #line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp200_ = gp_camera_new (&_tmp199_); + _tmp187_ = gp_camera_new (&_tmp186_); #line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_camera_unref0 (gcamera); #line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - gcamera = _tmp199_; + gcamera = _tmp186_; #line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp201_ = name; + _tmp188_ = name; #line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp202_ = g_strdup_printf ("create camera object for %s", _tmp201_); + _tmp189_ = g_strdup_printf ("create camera object for %s", _tmp188_); #line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp203_ = _tmp202_; + _tmp190_ = _tmp189_; #line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp200_, _tmp203_, &_inner_error_); + camera_table_do_op (self, _tmp187_, _tmp190_, &_inner_error_); #line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp203_); + _g_free0 (_tmp190_); #line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -4028,7 +4008,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _gp_port_info_list_free0 (port_info_list); #line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 4030 "CameraTable.c" +#line 4010 "CameraTable.c" } else { #line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_camera_unref0 (gcamera); @@ -4068,25 +4048,23 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) g_clear_error (&_inner_error_); #line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 4070 "CameraTable.c" +#line 4050 "CameraTable.c" } } #line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp204_ = gcamera; -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp205_ = camera_abilities; + _tmp191_ = gcamera; #line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp206_ = gp_camera_set_abilities (_tmp204_, _tmp205_); + _tmp192_ = camera_abilities; #line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp207_ = name; + _tmp193_ = name; #line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp208_ = g_strdup_printf ("set camera abilities for %s", _tmp207_); + _tmp194_ = g_strdup_printf ("set camera abilities for %s", _tmp193_); #line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp209_ = _tmp208_; + _tmp195_ = _tmp194_; #line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp206_, _tmp209_, &_inner_error_); + camera_table_do_op (self, gp_camera_set_abilities (_tmp191_, _tmp192_), _tmp195_, &_inner_error_); #line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp209_); + _g_free0 (_tmp195_); #line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -4127,7 +4105,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _gp_port_info_list_free0 (port_info_list); #line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 4129 "CameraTable.c" +#line 4107 "CameraTable.c" } else { #line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_camera_unref0 (gcamera); @@ -4167,27 +4145,25 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) g_clear_error (&_inner_error_); #line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 4169 "CameraTable.c" +#line 4147 "CameraTable.c" } } #line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp210_ = gcamera; + _tmp196_ = gcamera; #line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp211_ = port_info; + _tmp197_ = port_info; #line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp212_ = gp_camera_set_port_info (_tmp210_, _tmp211_); + _tmp198_ = name; #line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp213_ = name; + _tmp199_ = port; #line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp214_ = port; + _tmp200_ = g_strdup_printf ("set port info for %s on %s", _tmp198_, _tmp199_); #line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp215_ = g_strdup_printf ("set port info for %s on %s", _tmp213_, _tmp214_); + _tmp201_ = _tmp200_; #line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp216_ = _tmp215_; + camera_table_do_op (self, gp_camera_set_port_info (_tmp196_, _tmp197_), _tmp201_, &_inner_error_); #line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp212_, _tmp216_, &_inner_error_); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp216_); + _g_free0 (_tmp201_); #line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -4228,7 +4204,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _gp_port_info_list_free0 (port_info_list); #line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 4230 "CameraTable.c" +#line 4206 "CameraTable.c" } else { #line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_camera_unref0 (gcamera); @@ -4268,39 +4244,39 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) g_clear_error (&_inner_error_); #line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 4270 "CameraTable.c" +#line 4246 "CameraTable.c" } } #line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp217_ = name; + _tmp202_ = name; #line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp218_ = port; + _tmp203_ = port; #line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:386: Adding to camera table: %s @ %s", _tmp217_, _tmp218_); + g_debug ("CameraTable.vala:386: Adding to camera table: %s @ %s", _tmp202_, _tmp203_); #line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp219_ = gcamera; + _tmp204_ = gcamera; #line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp220_ = uri; + _tmp205_ = uri; #line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp221_ = display_name; + _tmp206_ = display_name; #line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp222_ = icon; + _tmp207_ = icon; #line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp223_ = discovered_camera_new (_tmp219_, _tmp220_, _tmp221_, _tmp222_); + _tmp208_ = discovered_camera_new (_tmp204_, _tmp205_, _tmp206_, _tmp207_); #line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera = _tmp223_; + camera = _tmp208_; #line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp224_ = self->priv->camera_map; + _tmp209_ = self->priv->camera_map; #line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp225_ = uri; + _tmp210_ = uri; #line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp226_ = camera; + _tmp211_ = camera; #line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp224_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp225_, _tmp226_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp209_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp210_, _tmp211_); #line 391 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp227_ = camera; + _tmp212_ = camera; #line 391 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL], 0, _tmp227_); + g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL], 0, _tmp212_); #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _discovered_camera_unref0 (camera); #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -4323,11 +4299,11 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _g_free0 (name); #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 4325 "CameraTable.c" +#line 4301 "CameraTable.c" } #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_port_it); -#line 4329 "CameraTable.c" +#line 4305 "CameraTable.c" } #line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); @@ -4339,15 +4315,17 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error) _gp_list_unref0 (camera_list); #line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 4341 "CameraTable.c" +#line 4317 "CameraTable.c" } -static void camera_table_on_udev_event (CameraTable* self, const gchar* action, GUdevDevice* device) { +static void +camera_table_on_udev_event (CameraTable* self, + const gchar* action, + GUdevDevice* device) +{ const gchar* _tmp0_; - GUdevDevice* _tmp1_; - const gchar* _tmp2_; - OneShotScheduler* _tmp3_; + OneShotScheduler* _tmp1_; #line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_if_fail (IS_CAMERA_TABLE (self)); #line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -4355,22 +4333,21 @@ static void camera_table_on_udev_event (CameraTable* self, const gchar* action, #line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_if_fail (G_UDEV_IS_DEVICE (device)); #line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp0_ = action; -#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp1_ = device; + _tmp0_ = g_udev_device_get_name (device); #line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp2_ = g_udev_device_get_name (_tmp1_); -#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:396: udev event: %s on %s", _tmp0_, _tmp2_); + g_debug ("CameraTable.vala:396: udev event: %s on %s", action, _tmp0_); #line 400 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp3_ = self->priv->camera_update_scheduler; + _tmp1_ = self->priv->camera_update_scheduler; #line 400 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - one_shot_scheduler_after_timeout (_tmp3_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE); -#line 4368 "CameraTable.c" + one_shot_scheduler_after_timeout (_tmp1_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE); +#line 4342 "CameraTable.c" } -void camera_table_on_volume_changed (CameraTable* self, GVolume* volume) { +void +camera_table_on_volume_changed (CameraTable* self, + GVolume* volume) +{ OneShotScheduler* _tmp0_; #line 403 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_if_fail (IS_CAMERA_TABLE (self)); @@ -4380,15 +4357,17 @@ void camera_table_on_volume_changed (CameraTable* self, GVolume* volume) { _tmp0_ = self->priv->camera_update_scheduler; #line 404 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" one_shot_scheduler_after_timeout (_tmp0_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE); -#line 4382 "CameraTable.c" +#line 4359 "CameraTable.c" } -static void camera_table_on_update_cameras (CameraTable* self) { +static void +camera_table_on_update_cameras (CameraTable* self) +{ GError * _inner_error_ = NULL; #line 407 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_if_fail (IS_CAMERA_TABLE (self)); -#line 4390 "CameraTable.c" +#line 4369 "CameraTable.c" { CameraTable* _tmp0_; CameraTable* _tmp1_; @@ -4404,7 +4383,7 @@ static void camera_table_on_update_cameras (CameraTable* self) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 4406 "CameraTable.c" +#line 4385 "CameraTable.c" goto __catch68_gphoto_error; } #line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -4413,7 +4392,7 @@ static void camera_table_on_update_cameras (CameraTable* self) { g_clear_error (&_inner_error_); #line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 4415 "CameraTable.c" +#line 4394 "CameraTable.c" } } goto __finally68; @@ -4434,7 +4413,7 @@ static void camera_table_on_update_cameras (CameraTable* self) { g_warning ("CameraTable.vala:411: Error updating camera table: %s", _tmp3_); #line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_error_free0 (err); -#line 4436 "CameraTable.c" +#line 4415 "CameraTable.c" } __finally68: #line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -4445,12 +4424,19 @@ static void camera_table_on_update_cameras (CameraTable* self) { g_clear_error (&_inner_error_); #line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 4447 "CameraTable.c" +#line 4426 "CameraTable.c" } } -static void g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__DISCOVERED_CAMERA) (gpointer data1, gpointer arg_1, gpointer data2); register GMarshalFunc_VOID__DISCOVERED_CAMERA callback; register GCClosure * cc; @@ -4465,61 +4451,75 @@ static void g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure, data1 = closure->data; #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" data2 = param_values->data[0].v_pointer; -#line 4467 "CameraTable.c" +#line 4453 "CameraTable.c" } else { #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" data1 = param_values->data[0].v_pointer; #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" data2 = closure->data; -#line 4473 "CameraTable.c" +#line 4459 "CameraTable.c" } #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" callback = (GMarshalFunc_VOID__DISCOVERED_CAMERA) (marshal_data ? marshal_data : cc->callback); #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" callback (data1, value_get_discovered_camera (param_values + 1), data2); -#line 4479 "CameraTable.c" +#line 4465 "CameraTable.c" } -static void value_camera_table_init (GValue* value) { +static void +value_camera_table_init (GValue* value) +{ #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" value->data[0].v_pointer = NULL; -#line 4486 "CameraTable.c" +#line 4474 "CameraTable.c" } -static void value_camera_table_free_value (GValue* value) { +static void +value_camera_table_free_value (GValue* value) +{ #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (value->data[0].v_pointer) { #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_unref (value->data[0].v_pointer); -#line 4495 "CameraTable.c" +#line 4485 "CameraTable.c" } } -static void value_camera_table_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_camera_table_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (src_value->data[0].v_pointer) { #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" dest_value->data[0].v_pointer = camera_table_ref (src_value->data[0].v_pointer); -#line 4505 "CameraTable.c" +#line 4498 "CameraTable.c" } else { #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" dest_value->data[0].v_pointer = NULL; -#line 4509 "CameraTable.c" +#line 4502 "CameraTable.c" } } -static gpointer value_camera_table_peek_pointer (const GValue* value) { +static gpointer +value_camera_table_peek_pointer (const GValue* value) +{ #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return value->data[0].v_pointer; -#line 4517 "CameraTable.c" +#line 4512 "CameraTable.c" } -static gchar* value_camera_table_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_camera_table_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (collect_values[0].v_pointer) { #line 4524 "CameraTable.c" @@ -4549,36 +4549,47 @@ static gchar* value_camera_table_collect_value (GValue* value, guint n_collect_v } -static gchar* value_camera_table_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_camera_table_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ CameraTable ** object_p; object_p = collect_values[0].v_pointer; #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (!object_p) { #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 4558 "CameraTable.c" +#line 4563 "CameraTable.c" } #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (!value->data[0].v_pointer) { #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" *object_p = NULL; -#line 4564 "CameraTable.c" +#line 4569 "CameraTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" *object_p = value->data[0].v_pointer; -#line 4568 "CameraTable.c" +#line 4573 "CameraTable.c" } else { #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" *object_p = camera_table_ref (value->data[0].v_pointer); -#line 4572 "CameraTable.c" +#line 4577 "CameraTable.c" } #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return NULL; -#line 4576 "CameraTable.c" +#line 4581 "CameraTable.c" } -GParamSpec* param_spec_camera_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_camera_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecCameraTable* spec; #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_CAMERA_TABLE), NULL); @@ -4588,20 +4599,25 @@ GParamSpec* param_spec_camera_table (const gchar* name, const gchar* nick, const G_PARAM_SPEC (spec)->value_type = object_type; #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return G_PARAM_SPEC (spec); -#line 4590 "CameraTable.c" +#line 4601 "CameraTable.c" } -gpointer value_get_camera_table (const GValue* value) { +gpointer +value_get_camera_table (const GValue* value) +{ #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CAMERA_TABLE), NULL); #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return value->data[0].v_pointer; -#line 4599 "CameraTable.c" +#line 4612 "CameraTable.c" } -void value_set_camera_table (GValue* value, gpointer v_object) { +void +value_set_camera_table (GValue* value, + gpointer v_object) +{ CameraTable * old; #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CAMERA_TABLE)); @@ -4617,22 +4633,25 @@ void value_set_camera_table (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_ref (value->data[0].v_pointer); -#line 4619 "CameraTable.c" +#line 4635 "CameraTable.c" } else { #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" value->data[0].v_pointer = NULL; -#line 4623 "CameraTable.c" +#line 4639 "CameraTable.c" } #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (old) { #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_unref (old); -#line 4629 "CameraTable.c" +#line 4645 "CameraTable.c" } } -void value_take_camera_table (GValue* value, gpointer v_object) { +void +value_take_camera_table (GValue* value, + gpointer v_object) +{ CameraTable * old; #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CAMERA_TABLE)); @@ -4646,22 +4665,24 @@ void value_take_camera_table (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" value->data[0].v_pointer = v_object; -#line 4648 "CameraTable.c" +#line 4667 "CameraTable.c" } else { #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" value->data[0].v_pointer = NULL; -#line 4652 "CameraTable.c" +#line 4671 "CameraTable.c" } #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (old) { #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_unref (old); -#line 4658 "CameraTable.c" +#line 4677 "CameraTable.c" } } -static void camera_table_class_init (CameraTableClass * klass) { +static void +camera_table_class_init (CameraTableClass * klass) +{ #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_parent_class = g_type_class_peek_parent (klass); #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -4672,11 +4693,13 @@ static void camera_table_class_init (CameraTableClass * klass) { camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL] = g_signal_new ("camera-added", TYPE_CAMERA_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA, G_TYPE_NONE, 1, TYPE_DISCOVERED_CAMERA); #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_signals[CAMERA_TABLE_CAMERA_REMOVED_SIGNAL] = g_signal_new ("camera-removed", TYPE_CAMERA_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA, G_TYPE_NONE, 1, TYPE_DISCOVERED_CAMERA); -#line 4674 "CameraTable.c" +#line 4695 "CameraTable.c" } -static void camera_table_instance_init (CameraTable * self) { +static void +camera_table_instance_init (CameraTable * self) +{ GUdevClient* _tmp0_; GPContext* _tmp1_; GeeHashMap* _tmp2_; @@ -4698,11 +4721,13 @@ static void camera_table_instance_init (CameraTable * self) { self->priv->camera_map = _tmp2_; #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" self->ref_count = 1; -#line 4700 "CameraTable.c" +#line 4723 "CameraTable.c" } -static void camera_table_finalize (CameraTable * obj) { +static void +camera_table_finalize (CameraTable * obj) +{ CameraTable * self; #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CAMERA_TABLE, CameraTable); @@ -4720,11 +4745,13 @@ static void camera_table_finalize (CameraTable * obj) { _g_object_unref0 (self->priv->volume_monitor); #line 35 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (self->priv->camera_map); -#line 4722 "CameraTable.c" +#line 4747 "CameraTable.c" } -GType camera_table_get_type (void) { +GType +camera_table_get_type (void) +{ static volatile gsize camera_table_type_id__volatile = 0; if (g_once_init_enter (&camera_table_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_camera_table_init, value_camera_table_free_value, value_camera_table_copy_value, value_camera_table_peek_pointer, "p", value_camera_table_collect_value, "p", value_camera_table_lcopy_value }; @@ -4738,18 +4765,22 @@ GType camera_table_get_type (void) { } -gpointer camera_table_ref (gpointer instance) { +gpointer +camera_table_ref (gpointer instance) +{ CameraTable * self; self = instance; #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_atomic_int_inc (&self->ref_count); #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return instance; -#line 4747 "CameraTable.c" +#line 4776 "CameraTable.c" } -void camera_table_unref (gpointer instance) { +void +camera_table_unref (gpointer instance) +{ CameraTable * self; self = instance; #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -4758,12 +4789,16 @@ void camera_table_unref (gpointer instance) { CAMERA_TABLE_GET_CLASS (self)->finalize (self); #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 4760 "CameraTable.c" +#line 4791 "CameraTable.c" } } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -4775,7 +4810,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/camera/GPhoto.c b/src/camera/GPhoto.c index b1865ed..773ab4e 100644 --- a/src/camera/GPhoto.c +++ b/src/camera/GPhoto.c @@ -1,4 +1,4 @@ -/* GPhoto.c generated by valac 0.36.6, the Vala compiler +/* GPhoto.c generated by valac 0.40.4, the Vala compiler * generated from GPhoto.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -132,148 +133,290 @@ static gpointer gp_spin_idle_wrapper_parent_class = NULL; GQuark gphoto_error_quark (void); gpointer gp_context_wrapper_ref (gpointer instance); void gp_context_wrapper_unref (gpointer instance); -GParamSpec* gp_param_spec_context_wrapper (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void gp_value_set_context_wrapper (GValue* value, gpointer v_object); -void gp_value_take_context_wrapper (GValue* value, gpointer v_object); +GParamSpec* gp_param_spec_context_wrapper (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void gp_value_set_context_wrapper (GValue* value, + gpointer v_object); +void gp_value_take_context_wrapper (GValue* value, + gpointer v_object); gpointer gp_value_get_context_wrapper (const GValue* value); GType gp_context_wrapper_get_type (void) G_GNUC_CONST; -enum { - GP_CONTEXT_WRAPPER_DUMMY_PROPERTY -}; GPContextWrapper* gp_context_wrapper_new (void); GPContextWrapper* gp_context_wrapper_construct (GType object_type); -static void gp_context_wrapper_on_idle (GPContextWrapper* self, GPContext* context); -static void _gp_context_wrapper_on_idle_gp_context_idle_func (GPContext* context, gpointer self); -static void gp_context_wrapper_on_error (GPContextWrapper* self, GPContext* context, const gchar* text); -static void _gp_context_wrapper_on_error_gp_context_error_func (GPContext* context, const gchar* text, gpointer self); -static void gp_context_wrapper_on_status (GPContextWrapper* self, GPContext* context, const gchar* text); -static void _gp_context_wrapper_on_status_gp_context_status_func (GPContext* context, const gchar* text, gpointer self); -static void gp_context_wrapper_on_message (GPContextWrapper* self, GPContext* context, const gchar* text); -static void _gp_context_wrapper_on_message_gp_context_message_func (GPContext* context, const gchar* text, gpointer self); -static guint gp_context_wrapper_on_progress_start (GPContextWrapper* self, GPContext* context, gfloat target, const gchar* text); -static guint _gp_context_wrapper_on_progress_start_gp_context_progress_start_func (GPContext* context, gfloat target, const gchar* text, gpointer self); -static void gp_context_wrapper_on_progress_update (GPContextWrapper* self, GPContext* context, guint id, gfloat current); -static void _gp_context_wrapper_on_progress_update_gp_context_progress_update_func (GPContext* context, guint id, gfloat current, gpointer self); -static void gp_context_wrapper_on_progress_stop (GPContextWrapper* self, GPContext* context, guint id); -static void _gp_context_wrapper_on_progress_stop_gp_context_progress_stop_func (GPContext* context, guint id, gpointer self); +static void gp_context_wrapper_on_idle (GPContextWrapper* self, + GPContext* context); +static void _gp_context_wrapper_on_idle_gp_context_idle_func (GPContext* context, + gpointer self); +static void gp_context_wrapper_on_error (GPContextWrapper* self, + GPContext* context, + const gchar* text); +static void _gp_context_wrapper_on_error_gp_context_error_func (GPContext* context, + const gchar* text, + gpointer self); +static void gp_context_wrapper_on_status (GPContextWrapper* self, + GPContext* context, + const gchar* text); +static void _gp_context_wrapper_on_status_gp_context_status_func (GPContext* context, + const gchar* text, + gpointer self); +static void gp_context_wrapper_on_message (GPContextWrapper* self, + GPContext* context, + const gchar* text); +static void _gp_context_wrapper_on_message_gp_context_message_func (GPContext* context, + const gchar* text, + gpointer self); +static guint gp_context_wrapper_on_progress_start (GPContextWrapper* self, + GPContext* context, + gfloat target, + const gchar* text); +static guint _gp_context_wrapper_on_progress_start_gp_context_progress_start_func (GPContext* context, + gfloat target, + const gchar* text, + gpointer self); +static void gp_context_wrapper_on_progress_update (GPContextWrapper* self, + GPContext* context, + guint id, + gfloat current); +static void _gp_context_wrapper_on_progress_update_gp_context_progress_update_func (GPContext* context, + guint id, + gfloat current, + gpointer self); +static void gp_context_wrapper_on_progress_stop (GPContextWrapper* self, + GPContext* context, + guint id); +static void _gp_context_wrapper_on_progress_stop_gp_context_progress_stop_func (GPContext* context, + guint id, + gpointer self); void gp_context_wrapper_idle (GPContextWrapper* self); static void gp_context_wrapper_real_idle (GPContextWrapper* self); -void gp_context_wrapper_error (GPContextWrapper* self, const gchar* text, void* data); -static void gp_context_wrapper_real_error (GPContextWrapper* self, const gchar* text, void* data); -void gp_context_wrapper_status (GPContextWrapper* self, const gchar* text, void* data); -static void gp_context_wrapper_real_status (GPContextWrapper* self, const gchar* text, void* data); -void gp_context_wrapper_message (GPContextWrapper* self, const gchar* text, void* data); -static void gp_context_wrapper_real_message (GPContextWrapper* self, const gchar* text, void* data); -void gp_context_wrapper_progress_start (GPContextWrapper* self, gfloat current, const gchar* text, void* data); -static void gp_context_wrapper_real_progress_start (GPContextWrapper* self, gfloat current, const gchar* text, void* data); -void gp_context_wrapper_progress_update (GPContextWrapper* self, gfloat current, void* data); -static void gp_context_wrapper_real_progress_update (GPContextWrapper* self, gfloat current, void* data); +void gp_context_wrapper_error (GPContextWrapper* self, + const gchar* text, + void* data); +static void gp_context_wrapper_real_error (GPContextWrapper* self, + const gchar* text, + void* data); +void gp_context_wrapper_status (GPContextWrapper* self, + const gchar* text, + void* data); +static void gp_context_wrapper_real_status (GPContextWrapper* self, + const gchar* text, + void* data); +void gp_context_wrapper_message (GPContextWrapper* self, + const gchar* text, + void* data); +static void gp_context_wrapper_real_message (GPContextWrapper* self, + const gchar* text, + void* data); +void gp_context_wrapper_progress_start (GPContextWrapper* self, + gfloat current, + const gchar* text, + void* data); +static void gp_context_wrapper_real_progress_start (GPContextWrapper* self, + gfloat current, + const gchar* text, + void* data); +void gp_context_wrapper_progress_update (GPContextWrapper* self, + gfloat current, + void* data); +static void gp_context_wrapper_real_progress_update (GPContextWrapper* self, + gfloat current, + void* data); void gp_context_wrapper_progress_stop (GPContextWrapper* self); static void gp_context_wrapper_real_progress_stop (GPContextWrapper* self); static void gp_context_wrapper_finalize (GPContextWrapper * obj); GType gp_spin_idle_wrapper_get_type (void) G_GNUC_CONST; -enum { - GP_SPIN_IDLE_WRAPPER_DUMMY_PROPERTY -}; GPSpinIdleWrapper* gp_spin_idle_wrapper_new (void); GPSpinIdleWrapper* gp_spin_idle_wrapper_construct (GType object_type); static void gp_spin_idle_wrapper_real_idle (GPContextWrapper* base); void spin_event_loop (void); -static void gp_spin_idle_wrapper_real_progress_update (GPContextWrapper* base, gfloat current, void* data); +static void gp_spin_idle_wrapper_real_progress_update (GPContextWrapper* base, + gfloat current, + void* data); #define GP_MAX_FILENAME_LENGTH 63 #define GP_MAX_BASEDIR_LENGTH 255 -gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileInfo* info, GError** error); -GBytes* gp_camera_file_to_bytes (GPContext* context, CameraFile* file); +gboolean gp_get_info (GPContext* context, + Camera* camera, + const gchar* folder, + const gchar* filename, + CameraFileInfo* info, + GError** error); +GBytes* gp_camera_file_to_bytes (GPContext* context, + CameraFile* file); gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; -PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, const gchar* folder, const gchar* filename); +PhotoMetadata* gp_get_fallback_metadata (Camera* camera, + GPContext* context, + const gchar* folder, + const gchar* filename); PhotoMetadata* photo_metadata_new (void); PhotoMetadata* photo_metadata_construct (GType object_type); -void media_metadata_read_from_file (MediaMetadata* self, GFile* file, GError** error); -GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, gchar* * preview_md5, GError** error); -GBytes* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileType filetype, GError** error); +void media_metadata_read_from_file (MediaMetadata* self, + GFile* file, + GError** error); +GdkPixbuf* gp_load_preview (GPContext* context, + Camera* camera, + const gchar* folder, + const gchar* filename, + gchar* * preview_md5, + GError** error); +GBytes* gp_load_file_into_buffer (GPContext* context, + Camera* camera, + const gchar* folder, + const gchar* filename, + CameraFileType filetype, + GError** error); guint photo_metadata_get_preview_count (PhotoMetadata* self); gpointer photo_preview_ref (gpointer instance); void photo_preview_unref (gpointer instance); -GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_preview (GValue* value, gpointer v_object); -void value_take_photo_preview (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_preview (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_preview (GValue* value, + gpointer v_object); +void value_take_photo_preview (GValue* value, + gpointer v_object); gpointer value_get_photo_preview (const GValue* value); GType photo_preview_get_type (void) G_GNUC_CONST; -PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number); -GBytes* photo_preview_flatten (PhotoPreview* self, GError** error); +PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, + guint number); +GBytes* photo_preview_flatten (PhotoPreview* self, + GError** error); #define IMPORT_PREVIEW_MAX_SCALE 128 -GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error); -GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileType filetype, GError** error); -void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GFile* dest_file, GError** error); -PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error); -void photo_metadata_read_from_app1_segment (PhotoMetadata* self, GBytes* buffer, GError** error); +GdkPixbuf* gp_load_image (GPContext* context, + Camera* camera, + const gchar* folder, + const gchar* filename, + GError** error); +GInputStream* gp_load_file_into_stream (GPContext* context, + Camera* camera, + const gchar* folder, + const gchar* filename, + CameraFileType filetype, + GError** error); +void gp_save_image (GPContext* context, + Camera* camera, + const gchar* folder, + const gchar* filename, + GFile* dest_file, + GError** error); +PhotoMetadata* gp_load_metadata (GPContext* context, + Camera* camera, + const gchar* folder, + const gchar* filename, + GError** error); +void photo_metadata_read_from_app1_segment (PhotoMetadata* self, + GBytes* buffer, + GError** error); GFile* app_dirs_get_temp_dir (void); -GQuark gphoto_error_quark (void) { +GQuark +gphoto_error_quark (void) +{ return g_quark_from_static_string ("gphoto_error-quark"); } -static void _gp_context_wrapper_on_idle_gp_context_idle_func (GPContext* context, gpointer self) { +static void +_gp_context_wrapper_on_idle_gp_context_idle_func (GPContext* context, + gpointer self) +{ #line 18 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" gp_context_wrapper_on_idle ((GPContextWrapper*) self, context); -#line 229 "GPhoto.c" +#line 344 "GPhoto.c" } -static void _gp_context_wrapper_on_error_gp_context_error_func (GPContext* context, const gchar* text, gpointer self) { +static void +_gp_context_wrapper_on_error_gp_context_error_func (GPContext* context, + const gchar* text, + gpointer self) +{ #line 19 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" gp_context_wrapper_on_error ((GPContextWrapper*) self, context, text); -#line 236 "GPhoto.c" +#line 355 "GPhoto.c" } -static void _gp_context_wrapper_on_status_gp_context_status_func (GPContext* context, const gchar* text, gpointer self) { +static void +_gp_context_wrapper_on_status_gp_context_status_func (GPContext* context, + const gchar* text, + gpointer self) +{ #line 20 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" gp_context_wrapper_on_status ((GPContextWrapper*) self, context, text); -#line 243 "GPhoto.c" +#line 366 "GPhoto.c" } -static void _gp_context_wrapper_on_message_gp_context_message_func (GPContext* context, const gchar* text, gpointer self) { +static void +_gp_context_wrapper_on_message_gp_context_message_func (GPContext* context, + const gchar* text, + gpointer self) +{ #line 21 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" gp_context_wrapper_on_message ((GPContextWrapper*) self, context, text); -#line 250 "GPhoto.c" +#line 377 "GPhoto.c" } -static guint _gp_context_wrapper_on_progress_start_gp_context_progress_start_func (GPContext* context, gfloat target, const gchar* text, gpointer self) { +static guint +_gp_context_wrapper_on_progress_start_gp_context_progress_start_func (GPContext* context, + gfloat target, + const gchar* text, + gpointer self) +{ guint result; result = gp_context_wrapper_on_progress_start ((GPContextWrapper*) self, context, target, text); #line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 259 "GPhoto.c" +#line 391 "GPhoto.c" } -static void _gp_context_wrapper_on_progress_update_gp_context_progress_update_func (GPContext* context, guint id, gfloat current, gpointer self) { +static void +_gp_context_wrapper_on_progress_update_gp_context_progress_update_func (GPContext* context, + guint id, + gfloat current, + gpointer self) +{ #line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" gp_context_wrapper_on_progress_update ((GPContextWrapper*) self, context, id, current); -#line 266 "GPhoto.c" +#line 403 "GPhoto.c" } -static void _gp_context_wrapper_on_progress_stop_gp_context_progress_stop_func (GPContext* context, guint id, gpointer self) { +static void +_gp_context_wrapper_on_progress_stop_gp_context_progress_stop_func (GPContext* context, + guint id, + gpointer self) +{ #line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" gp_context_wrapper_on_progress_stop ((GPContextWrapper*) self, context, id); -#line 273 "GPhoto.c" +#line 414 "GPhoto.c" } -GPContextWrapper* gp_context_wrapper_construct (GType object_type) { +GPContextWrapper* +gp_context_wrapper_construct (GType object_type) +{ GPContextWrapper* self = NULL; GPContext* _tmp0_; GPContext* _tmp1_; @@ -304,133 +447,191 @@ GPContextWrapper* gp_context_wrapper_construct (GType object_type) { gp_context_set_progress_funcs (_tmp4_, _gp_context_wrapper_on_progress_start_gp_context_progress_start_func, _gp_context_wrapper_on_progress_update_gp_context_progress_update_func, _gp_context_wrapper_on_progress_stop_gp_context_progress_stop_func, self); #line 17 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return self; -#line 308 "GPhoto.c" +#line 451 "GPhoto.c" } -GPContextWrapper* gp_context_wrapper_new (void) { +GPContextWrapper* +gp_context_wrapper_new (void) +{ #line 17 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return gp_context_wrapper_construct (GP_TYPE_CONTEXT_WRAPPER); -#line 315 "GPhoto.c" +#line 460 "GPhoto.c" } -static void gp_context_wrapper_real_idle (GPContextWrapper* self) { +static void +gp_context_wrapper_real_idle (GPContextWrapper* self) +{ } -void gp_context_wrapper_idle (GPContextWrapper* self) { +void +gp_context_wrapper_idle (GPContextWrapper* self) +{ #line 25 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self)); #line 25 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" GP_CONTEXT_WRAPPER_GET_CLASS (self)->idle (self); -#line 328 "GPhoto.c" +#line 477 "GPhoto.c" } -static void gp_context_wrapper_real_error (GPContextWrapper* self, const gchar* text, void* data) { +static void +gp_context_wrapper_real_error (GPContextWrapper* self, + const gchar* text, + void* data) +{ #line 28 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (text != NULL); -#line 335 "GPhoto.c" +#line 488 "GPhoto.c" } -void gp_context_wrapper_error (GPContextWrapper* self, const gchar* text, void* data) { +void +gp_context_wrapper_error (GPContextWrapper* self, + const gchar* text, + void* data) +{ #line 28 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self)); #line 28 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" GP_CONTEXT_WRAPPER_GET_CLASS (self)->error (self, text, data); -#line 344 "GPhoto.c" +#line 501 "GPhoto.c" } -static void gp_context_wrapper_real_status (GPContextWrapper* self, const gchar* text, void* data) { +static void +gp_context_wrapper_real_status (GPContextWrapper* self, + const gchar* text, + void* data) +{ #line 31 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (text != NULL); -#line 351 "GPhoto.c" +#line 512 "GPhoto.c" } -void gp_context_wrapper_status (GPContextWrapper* self, const gchar* text, void* data) { +void +gp_context_wrapper_status (GPContextWrapper* self, + const gchar* text, + void* data) +{ #line 31 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self)); #line 31 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" GP_CONTEXT_WRAPPER_GET_CLASS (self)->status (self, text, data); -#line 360 "GPhoto.c" +#line 525 "GPhoto.c" } -static void gp_context_wrapper_real_message (GPContextWrapper* self, const gchar* text, void* data) { +static void +gp_context_wrapper_real_message (GPContextWrapper* self, + const gchar* text, + void* data) +{ #line 34 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (text != NULL); -#line 367 "GPhoto.c" +#line 536 "GPhoto.c" } -void gp_context_wrapper_message (GPContextWrapper* self, const gchar* text, void* data) { +void +gp_context_wrapper_message (GPContextWrapper* self, + const gchar* text, + void* data) +{ #line 34 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self)); #line 34 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" GP_CONTEXT_WRAPPER_GET_CLASS (self)->message (self, text, data); -#line 376 "GPhoto.c" +#line 549 "GPhoto.c" } -static void gp_context_wrapper_real_progress_start (GPContextWrapper* self, gfloat current, const gchar* text, void* data) { +static void +gp_context_wrapper_real_progress_start (GPContextWrapper* self, + gfloat current, + const gchar* text, + void* data) +{ #line 37 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (text != NULL); -#line 383 "GPhoto.c" +#line 561 "GPhoto.c" } -void gp_context_wrapper_progress_start (GPContextWrapper* self, gfloat current, const gchar* text, void* data) { +void +gp_context_wrapper_progress_start (GPContextWrapper* self, + gfloat current, + const gchar* text, + void* data) +{ #line 37 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self)); #line 37 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_start (self, current, text, data); -#line 392 "GPhoto.c" +#line 575 "GPhoto.c" } -static void gp_context_wrapper_real_progress_update (GPContextWrapper* self, gfloat current, void* data) { +static void +gp_context_wrapper_real_progress_update (GPContextWrapper* self, + gfloat current, + void* data) +{ } -void gp_context_wrapper_progress_update (GPContextWrapper* self, gfloat current, void* data) { +void +gp_context_wrapper_progress_update (GPContextWrapper* self, + gfloat current, + void* data) +{ #line 40 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self)); #line 40 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_update (self, current, data); -#line 405 "GPhoto.c" +#line 596 "GPhoto.c" } -static void gp_context_wrapper_real_progress_stop (GPContextWrapper* self) { +static void +gp_context_wrapper_real_progress_stop (GPContextWrapper* self) +{ } -void gp_context_wrapper_progress_stop (GPContextWrapper* self) { +void +gp_context_wrapper_progress_stop (GPContextWrapper* self) +{ #line 43 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self)); #line 43 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_stop (self); -#line 418 "GPhoto.c" +#line 613 "GPhoto.c" } -static void gp_context_wrapper_on_idle (GPContextWrapper* self, GPContext* context) { +static void +gp_context_wrapper_on_idle (GPContextWrapper* self, + GPContext* context) +{ #line 46 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self)); #line 46 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (context != NULL); #line 47 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" gp_context_wrapper_idle (self); -#line 429 "GPhoto.c" +#line 627 "GPhoto.c" } -static void gp_context_wrapper_on_error (GPContextWrapper* self, GPContext* context, const gchar* text) { - const gchar* _tmp0_; +static void +gp_context_wrapper_on_error (GPContextWrapper* self, + GPContext* context, + const gchar* text) +{ #line 50 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self)); #line 50 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -438,15 +639,16 @@ static void gp_context_wrapper_on_error (GPContextWrapper* self, GPContext* cont #line 50 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (text != NULL); #line 51 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp0_ = text; -#line 51 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - gp_context_wrapper_error (self, _tmp0_, NULL); -#line 445 "GPhoto.c" + gp_context_wrapper_error (self, text, NULL); +#line 644 "GPhoto.c" } -static void gp_context_wrapper_on_status (GPContextWrapper* self, GPContext* context, const gchar* text) { - const gchar* _tmp0_; +static void +gp_context_wrapper_on_status (GPContextWrapper* self, + GPContext* context, + const gchar* text) +{ #line 54 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self)); #line 54 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -454,15 +656,16 @@ static void gp_context_wrapper_on_status (GPContextWrapper* self, GPContext* con #line 54 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (text != NULL); #line 55 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp0_ = text; -#line 55 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - gp_context_wrapper_status (self, _tmp0_, NULL); -#line 461 "GPhoto.c" + gp_context_wrapper_status (self, text, NULL); +#line 661 "GPhoto.c" } -static void gp_context_wrapper_on_message (GPContextWrapper* self, GPContext* context, const gchar* text) { - const gchar* _tmp0_; +static void +gp_context_wrapper_on_message (GPContextWrapper* self, + GPContext* context, + const gchar* text) +{ #line 58 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self)); #line 58 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -470,17 +673,18 @@ static void gp_context_wrapper_on_message (GPContextWrapper* self, GPContext* co #line 58 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (text != NULL); #line 59 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp0_ = text; -#line 59 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - gp_context_wrapper_message (self, _tmp0_, NULL); -#line 477 "GPhoto.c" + gp_context_wrapper_message (self, text, NULL); +#line 678 "GPhoto.c" } -static guint gp_context_wrapper_on_progress_start (GPContextWrapper* self, GPContext* context, gfloat target, const gchar* text) { +static guint +gp_context_wrapper_on_progress_start (GPContextWrapper* self, + GPContext* context, + gfloat target, + const gchar* text) +{ guint result = 0U; - gfloat _tmp0_; - const gchar* _tmp1_; #line 62 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_val_if_fail (GP_IS_CONTEXT_WRAPPER (self), 0U); #line 62 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -488,142 +692,169 @@ static guint gp_context_wrapper_on_progress_start (GPContextWrapper* self, GPCon #line 62 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_val_if_fail (text != NULL, 0U); #line 63 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp0_ = target; -#line 63 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp1_ = text; -#line 63 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - gp_context_wrapper_progress_start (self, _tmp0_, _tmp1_, NULL); + gp_context_wrapper_progress_start (self, target, text, NULL); #line 65 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" result = (guint) 0; #line 65 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 501 "GPhoto.c" +#line 701 "GPhoto.c" } -static void gp_context_wrapper_on_progress_update (GPContextWrapper* self, GPContext* context, guint id, gfloat current) { - gfloat _tmp0_; +static void +gp_context_wrapper_on_progress_update (GPContextWrapper* self, + GPContext* context, + guint id, + gfloat current) +{ #line 68 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self)); #line 68 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (context != NULL); #line 69 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp0_ = current; -#line 69 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - gp_context_wrapper_progress_update (self, _tmp0_, NULL); -#line 515 "GPhoto.c" + gp_context_wrapper_progress_update (self, current, NULL); +#line 717 "GPhoto.c" } -static void gp_context_wrapper_on_progress_stop (GPContextWrapper* self, GPContext* context, guint id) { +static void +gp_context_wrapper_on_progress_stop (GPContextWrapper* self, + GPContext* context, + guint id) +{ #line 72 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self)); #line 72 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (context != NULL); #line 73 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" gp_context_wrapper_progress_stop (self); -#line 526 "GPhoto.c" +#line 732 "GPhoto.c" } -static void gp_value_context_wrapper_init (GValue* value) { +static void +gp_value_context_wrapper_init (GValue* value) +{ #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" value->data[0].v_pointer = NULL; -#line 533 "GPhoto.c" +#line 741 "GPhoto.c" } -static void gp_value_context_wrapper_free_value (GValue* value) { +static void +gp_value_context_wrapper_free_value (GValue* value) +{ #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (value->data[0].v_pointer) { #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" gp_context_wrapper_unref (value->data[0].v_pointer); -#line 542 "GPhoto.c" +#line 752 "GPhoto.c" } } -static void gp_value_context_wrapper_copy_value (const GValue* src_value, GValue* dest_value) { +static void +gp_value_context_wrapper_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (src_value->data[0].v_pointer) { #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" dest_value->data[0].v_pointer = gp_context_wrapper_ref (src_value->data[0].v_pointer); -#line 552 "GPhoto.c" +#line 765 "GPhoto.c" } else { #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" dest_value->data[0].v_pointer = NULL; -#line 556 "GPhoto.c" +#line 769 "GPhoto.c" } } -static gpointer gp_value_context_wrapper_peek_pointer (const GValue* value) { +static gpointer +gp_value_context_wrapper_peek_pointer (const GValue* value) +{ #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return value->data[0].v_pointer; -#line 564 "GPhoto.c" +#line 779 "GPhoto.c" } -static gchar* gp_value_context_wrapper_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +gp_value_context_wrapper_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (collect_values[0].v_pointer) { -#line 571 "GPhoto.c" +#line 791 "GPhoto.c" GPContextWrapper * object; object = collect_values[0].v_pointer; #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (object->parent_instance.g_class == NULL) { #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 578 "GPhoto.c" +#line 798 "GPhoto.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 582 "GPhoto.c" +#line 802 "GPhoto.c" } #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" value->data[0].v_pointer = gp_context_wrapper_ref (object); -#line 586 "GPhoto.c" +#line 806 "GPhoto.c" } else { #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" value->data[0].v_pointer = NULL; -#line 590 "GPhoto.c" +#line 810 "GPhoto.c" } #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 594 "GPhoto.c" +#line 814 "GPhoto.c" } -static gchar* gp_value_context_wrapper_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +gp_value_context_wrapper_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ GPContextWrapper ** object_p; object_p = collect_values[0].v_pointer; #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (!object_p) { #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 605 "GPhoto.c" +#line 830 "GPhoto.c" } #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (!value->data[0].v_pointer) { #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *object_p = NULL; -#line 611 "GPhoto.c" +#line 836 "GPhoto.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *object_p = value->data[0].v_pointer; -#line 615 "GPhoto.c" +#line 840 "GPhoto.c" } else { #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *object_p = gp_context_wrapper_ref (value->data[0].v_pointer); -#line 619 "GPhoto.c" +#line 844 "GPhoto.c" } #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 623 "GPhoto.c" +#line 848 "GPhoto.c" } -GParamSpec* gp_param_spec_context_wrapper (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +gp_param_spec_context_wrapper (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ GPParamSpecContextWrapper* spec; #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_val_if_fail (g_type_is_a (object_type, GP_TYPE_CONTEXT_WRAPPER), NULL); @@ -633,20 +864,25 @@ GParamSpec* gp_param_spec_context_wrapper (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return G_PARAM_SPEC (spec); -#line 637 "GPhoto.c" +#line 868 "GPhoto.c" } -gpointer gp_value_get_context_wrapper (const GValue* value) { +gpointer +gp_value_get_context_wrapper (const GValue* value) +{ #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GP_TYPE_CONTEXT_WRAPPER), NULL); #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return value->data[0].v_pointer; -#line 646 "GPhoto.c" +#line 879 "GPhoto.c" } -void gp_value_set_context_wrapper (GValue* value, gpointer v_object) { +void +gp_value_set_context_wrapper (GValue* value, + gpointer v_object) +{ GPContextWrapper * old; #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GP_TYPE_CONTEXT_WRAPPER)); @@ -662,22 +898,25 @@ void gp_value_set_context_wrapper (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" gp_context_wrapper_ref (value->data[0].v_pointer); -#line 666 "GPhoto.c" +#line 902 "GPhoto.c" } else { #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" value->data[0].v_pointer = NULL; -#line 670 "GPhoto.c" +#line 906 "GPhoto.c" } #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (old) { #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" gp_context_wrapper_unref (old); -#line 676 "GPhoto.c" +#line 912 "GPhoto.c" } } -void gp_value_take_context_wrapper (GValue* value, gpointer v_object) { +void +gp_value_take_context_wrapper (GValue* value, + gpointer v_object) +{ GPContextWrapper * old; #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GP_TYPE_CONTEXT_WRAPPER)); @@ -691,22 +930,24 @@ void gp_value_take_context_wrapper (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" value->data[0].v_pointer = v_object; -#line 695 "GPhoto.c" +#line 934 "GPhoto.c" } else { #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" value->data[0].v_pointer = NULL; -#line 699 "GPhoto.c" +#line 938 "GPhoto.c" } #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (old) { #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" gp_context_wrapper_unref (old); -#line 705 "GPhoto.c" +#line 944 "GPhoto.c" } } -static void gp_context_wrapper_class_init (GPContextWrapperClass * klass) { +static void +gp_context_wrapper_class_init (GPContextWrapperClass * klass) +{ #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" gp_context_wrapper_parent_class = g_type_class_peek_parent (klass); #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -725,11 +966,13 @@ static void gp_context_wrapper_class_init (GPContextWrapperClass * klass) { ((GPContextWrapperClass *) klass)->progress_update = (void (*) (GPContextWrapper *, gfloat, void*)) gp_context_wrapper_real_progress_update; #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" ((GPContextWrapperClass *) klass)->progress_stop = (void (*) (GPContextWrapper *)) gp_context_wrapper_real_progress_stop; -#line 729 "GPhoto.c" +#line 970 "GPhoto.c" } -static void gp_context_wrapper_instance_init (GPContextWrapper * self) { +static void +gp_context_wrapper_instance_init (GPContextWrapper * self) +{ GPContext* _tmp0_; #line 15 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp0_ = gp_context_new (); @@ -737,11 +980,13 @@ static void gp_context_wrapper_instance_init (GPContextWrapper * self) { self->context = _tmp0_; #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" self->ref_count = 1; -#line 741 "GPhoto.c" +#line 984 "GPhoto.c" } -static void gp_context_wrapper_finalize (GPContextWrapper * obj) { +static void +gp_context_wrapper_finalize (GPContextWrapper * obj) +{ GPContextWrapper * self; #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper); @@ -749,11 +994,13 @@ static void gp_context_wrapper_finalize (GPContextWrapper * obj) { g_signal_handlers_destroy (self); #line 15 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _gp_context_unref0 (self->context); -#line 753 "GPhoto.c" +#line 998 "GPhoto.c" } -GType gp_context_wrapper_get_type (void) { +GType +gp_context_wrapper_get_type (void) +{ static volatile gsize gp_context_wrapper_type_id__volatile = 0; if (g_once_init_enter (&gp_context_wrapper_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { gp_value_context_wrapper_init, gp_value_context_wrapper_free_value, gp_value_context_wrapper_copy_value, gp_value_context_wrapper_peek_pointer, "p", gp_value_context_wrapper_collect_value, "p", gp_value_context_wrapper_lcopy_value }; @@ -767,18 +1014,22 @@ GType gp_context_wrapper_get_type (void) { } -gpointer gp_context_wrapper_ref (gpointer instance) { +gpointer +gp_context_wrapper_ref (gpointer instance) +{ GPContextWrapper * self; self = instance; #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_atomic_int_inc (&self->ref_count); #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return instance; -#line 778 "GPhoto.c" +#line 1027 "GPhoto.c" } -void gp_context_wrapper_unref (gpointer instance) { +void +gp_context_wrapper_unref (gpointer instance) +{ GPContextWrapper * self; self = instance; #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -787,29 +1038,35 @@ void gp_context_wrapper_unref (gpointer instance) { GP_CONTEXT_WRAPPER_GET_CLASS (self)->finalize (self); #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_type_free_instance ((GTypeInstance *) self); -#line 791 "GPhoto.c" +#line 1042 "GPhoto.c" } } -GPSpinIdleWrapper* gp_spin_idle_wrapper_construct (GType object_type) { +GPSpinIdleWrapper* +gp_spin_idle_wrapper_construct (GType object_type) +{ GPSpinIdleWrapper* self = NULL; #line 79 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" self = (GPSpinIdleWrapper*) gp_context_wrapper_construct (object_type); #line 79 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return self; -#line 802 "GPhoto.c" +#line 1055 "GPhoto.c" } -GPSpinIdleWrapper* gp_spin_idle_wrapper_new (void) { +GPSpinIdleWrapper* +gp_spin_idle_wrapper_new (void) +{ #line 79 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return gp_spin_idle_wrapper_construct (GP_TYPE_SPIN_IDLE_WRAPPER); -#line 809 "GPhoto.c" +#line 1064 "GPhoto.c" } -static void gp_spin_idle_wrapper_real_idle (GPContextWrapper* base) { +static void +gp_spin_idle_wrapper_real_idle (GPContextWrapper* base) +{ GPSpinIdleWrapper * self; #line 82 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, GP_TYPE_SPIN_IDLE_WRAPPER, GPSpinIdleWrapper); @@ -817,44 +1074,48 @@ static void gp_spin_idle_wrapper_real_idle (GPContextWrapper* base) { GP_CONTEXT_WRAPPER_CLASS (gp_spin_idle_wrapper_parent_class)->idle (G_TYPE_CHECK_INSTANCE_CAST (self, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)); #line 85 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" spin_event_loop (); -#line 821 "GPhoto.c" +#line 1078 "GPhoto.c" } -static void gp_spin_idle_wrapper_real_progress_update (GPContextWrapper* base, gfloat current, void* data) { +static void +gp_spin_idle_wrapper_real_progress_update (GPContextWrapper* base, + gfloat current, + void* data) +{ GPSpinIdleWrapper * self; - gfloat _tmp0_; - void* _tmp1_; #line 88 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, GP_TYPE_SPIN_IDLE_WRAPPER, GPSpinIdleWrapper); #line 89 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp0_ = current; -#line 89 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp1_ = data; -#line 89 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - GP_CONTEXT_WRAPPER_CLASS (gp_spin_idle_wrapper_parent_class)->progress_update (G_TYPE_CHECK_INSTANCE_CAST (self, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper), _tmp0_, _tmp1_); + GP_CONTEXT_WRAPPER_CLASS (gp_spin_idle_wrapper_parent_class)->progress_update (G_TYPE_CHECK_INSTANCE_CAST (self, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper), current, data); #line 91 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" spin_event_loop (); -#line 839 "GPhoto.c" +#line 1094 "GPhoto.c" } -static void gp_spin_idle_wrapper_class_init (GPSpinIdleWrapperClass * klass) { +static void +gp_spin_idle_wrapper_class_init (GPSpinIdleWrapperClass * klass) +{ #line 78 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" gp_spin_idle_wrapper_parent_class = g_type_class_peek_parent (klass); #line 78 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" ((GPContextWrapperClass *) klass)->idle = (void (*) (GPContextWrapper *)) gp_spin_idle_wrapper_real_idle; #line 78 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" ((GPContextWrapperClass *) klass)->progress_update = (void (*) (GPContextWrapper *, gfloat, void*)) gp_spin_idle_wrapper_real_progress_update; -#line 850 "GPhoto.c" +#line 1107 "GPhoto.c" } -static void gp_spin_idle_wrapper_instance_init (GPSpinIdleWrapper * self) { +static void +gp_spin_idle_wrapper_instance_init (GPSpinIdleWrapper * self) +{ } -GType gp_spin_idle_wrapper_get_type (void) { +GType +gp_spin_idle_wrapper_get_type (void) +{ static volatile gsize gp_spin_idle_wrapper_type_id__volatile = 0; if (g_once_init_enter (&gp_spin_idle_wrapper_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (GPSpinIdleWrapperClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gp_spin_idle_wrapper_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (GPSpinIdleWrapper), 0, (GInstanceInitFunc) gp_spin_idle_wrapper_instance_init, NULL }; @@ -866,21 +1127,23 @@ GType gp_spin_idle_wrapper_get_type (void) { } -gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileInfo* info, GError** error) { +gboolean +gp_get_info (GPContext* context, + Camera* camera, + const gchar* folder, + const gchar* filename, + CameraFileInfo* info, + GError** error) +{ CameraFileInfo _vala_info = {0}; gboolean result = FALSE; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_; + gint _tmp1_; gint _tmp2_; - gint _tmp3_; int res = 0; - Camera* _tmp8_; - const gchar* _tmp9_; - const gchar* _tmp10_; - GPContext* _tmp11_; - CameraFileInfo _tmp12_ = {0}; - int _tmp13_; - int _tmp14_; + CameraFileInfo _tmp6_ = {0}; + int _tmp7_; + int _tmp8_; GError * _inner_error_ = NULL; #line 102 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_val_if_fail (context != NULL, FALSE); @@ -891,101 +1154,82 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c #line 102 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_val_if_fail (filename != NULL, FALSE); #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp1_ = folder; -#line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp2_ = strlen (_tmp1_); + _tmp1_ = strlen (folder); #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - if (_tmp3_ > GP_MAX_BASEDIR_LENGTH) { + if (_tmp2_ > GP_MAX_BASEDIR_LENGTH) { #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp0_ = TRUE; -#line 904 "GPhoto.c" +#line 1165 "GPhoto.c" } else { - const gchar* _tmp4_; - gint _tmp5_; - gint _tmp6_; -#line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp4_ = filename; + gint _tmp3_; + gint _tmp4_; #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp5_ = strlen (_tmp4_); + _tmp3_ = strlen (filename); #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp0_ = _tmp6_ > GP_MAX_FILENAME_LENGTH; -#line 917 "GPhoto.c" + _tmp0_ = _tmp4_ > GP_MAX_FILENAME_LENGTH; +#line 1175 "GPhoto.c" } #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (_tmp0_) { -#line 921 "GPhoto.c" - CameraFileInfo _tmp7_ = {0}; +#line 1179 "GPhoto.c" + CameraFileInfo _tmp5_ = {0}; #line 105 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" (_vala_info); #line 105 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _vala_info = _tmp7_; + _vala_info = _tmp5_; #line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" result = FALSE; #line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (info) { #line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *info = _vala_info; -#line 933 "GPhoto.c" +#line 1191 "GPhoto.c" } else { #line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" (_vala_info); -#line 937 "GPhoto.c" +#line 1195 "GPhoto.c" } #line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 941 "GPhoto.c" +#line 1199 "GPhoto.c" } #line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp8_ = camera; -#line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp9_ = folder; -#line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp10_ = filename; -#line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp11_ = context; -#line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp13_ = gp_camera_file_get_info (_tmp8_, _tmp9_, _tmp10_, &_tmp12_, _tmp11_); + _tmp7_ = gp_camera_file_get_info (camera, folder, filename, &_tmp6_, context); #line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" (_vala_info); #line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _vala_info = _tmp12_; + _vala_info = _tmp6_; #line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - res = _tmp13_; + res = _tmp7_; #line 111 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp14_ = res; + _tmp8_ = res; #line 111 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - if (_tmp14_ != GP_OK) { -#line 963 "GPhoto.c" - int _tmp15_; - const gchar* _tmp16_; - const gchar* _tmp17_; - int _tmp18_; - const gchar* _tmp19_; - GError* _tmp20_; - gboolean _tmp21_ = FALSE; -#line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp15_ = res; + if (_tmp8_ != GP_OK) { +#line 1213 "GPhoto.c" + int _tmp9_; + int _tmp10_; + const gchar* _tmp11_; + GError* _tmp12_; + gboolean _tmp13_ = FALSE; #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp16_ = folder; + _tmp9_ = res; #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp17_ = filename; + _tmp10_ = res; #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp18_ = res; + _tmp11_ = gp_port_result_as_string (_tmp10_); #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp19_ = gp_port_result_as_string (_tmp18_); + _tmp12_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file information for %s/%s: %s", (gint) _tmp9_, folder, filename, _tmp11_); #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp20_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file information for %s/%s: %s", (gint) _tmp15_, _tmp16_, _tmp17_, _tmp19_); -#line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _inner_error_ = _tmp20_; + _inner_error_ = _tmp12_; #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_propagate_error (error, _inner_error_); #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - return _tmp21_; -#line 989 "GPhoto.c" + return _tmp13_; +#line 1233 "GPhoto.c" } #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" result = TRUE; @@ -993,240 +1237,205 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c if (info) { #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *info = _vala_info; -#line 997 "GPhoto.c" +#line 1241 "GPhoto.c" } else { #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" (_vala_info); -#line 1001 "GPhoto.c" +#line 1245 "GPhoto.c" } #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 1005 "GPhoto.c" +#line 1249 "GPhoto.c" } -static gpointer _GPHOTO_REF_FILE0 (gpointer self) { +static gpointer +_GPHOTO_REF_FILE0 (gpointer self) +{ #line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return self ? GPHOTO_REF_FILE (self) : NULL; -#line 1012 "GPhoto.c" +#line 1258 "GPhoto.c" } -GBytes* gp_camera_file_to_bytes (GPContext* context, CameraFile* file) { +GBytes* +gp_camera_file_to_bytes (GPContext* context, + CameraFile* file) +{ GBytes* result = NULL; guint8* data = NULL; gulong data_len = 0UL; int res = 0; - CameraFile* _tmp0_; - guint8* _tmp1_ = NULL; - gulong _tmp2_ = 0UL; + guint8* _tmp0_ = NULL; + gulong _tmp1_ = 0UL; + int _tmp2_; int _tmp3_; - int _tmp4_; guint8* buffer = NULL; - guint8* _tmp5_; + guint8* _tmp4_; gint buffer_length1; gint _buffer_size_; - gulong _tmp6_; - gint _tmp7_; - guint8* _tmp8_; - gint _tmp8__length1; - CameraFile* _tmp9_; - CameraFile* _tmp10_; - GBytes* _tmp11_; + gulong _tmp5_; + gint _tmp6_; + guint8* _tmp7_; + gint _tmp7__length1; + CameraFile* _tmp8_; + GBytes* _tmp9_; #line 118 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_val_if_fail (context != NULL, NULL); #line 118 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_val_if_fail (file != NULL, NULL); #line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp0_ = file; -#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp3_ = gp_file_get_data_and_size (_tmp0_, &_tmp1_, &_tmp2_); + _tmp2_ = gp_file_get_data_and_size (file, &_tmp0_, &_tmp1_); #line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - data = _tmp1_; + data = _tmp0_; #line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - data_len = _tmp2_; + data_len = _tmp1_; #line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - res = _tmp3_; + res = _tmp2_; #line 125 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp4_ = res; + _tmp3_ = res; #line 125 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - if (_tmp4_ != GP_OK) { + if (_tmp3_ != GP_OK) { #line 126 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" result = NULL; #line 126 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 1059 "GPhoto.c" +#line 1304 "GPhoto.c" } #line 128 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp5_ = data; + _tmp4_ = data; #line 128 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - buffer = (guint8*) _tmp5_; + buffer = (guint8*) _tmp4_; #line 128 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" buffer_length1 = sizeof (guint8) / sizeof (guint8); #line 128 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _buffer_size_ = buffer_length1; #line 129 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp6_ = data_len; + _tmp5_ = data_len; #line 129 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - buffer_length1 = (gint) _tmp6_; + buffer_length1 = (gint) _tmp5_; #line 129 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp7_ = buffer_length1; + _tmp6_ = buffer_length1; #line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp8_ = buffer; + _tmp7_ = buffer; #line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp8__length1 = buffer_length1; + _tmp7__length1 = buffer_length1; #line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp9_ = file; + _tmp8_ = _GPHOTO_REF_FILE0 (file); #line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp10_ = _GPHOTO_REF_FILE0 (_tmp9_); + _tmp9_ = g_bytes_new_with_free_func (_tmp7_, (gsize) _tmp7__length1, gp_file_unref, _tmp8_); #line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp11_ = g_bytes_new_with_free_func (_tmp8_, (gsize) _tmp8__length1, gp_file_unref, _tmp10_); -#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - result = _tmp11_; + result = _tmp9_; #line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 1089 "GPhoto.c" +#line 1332 "GPhoto.c" } -static gchar* string_slice (const gchar* self, glong start, glong end) { +static gchar* +string_slice (const gchar* self, + glong start, + glong end) +{ gchar* result = NULL; glong string_length = 0L; gint _tmp0_; gint _tmp1_; - glong _tmp2_; - glong _tmp5_; - gboolean _tmp8_ = FALSE; - glong _tmp9_; - gboolean _tmp12_ = FALSE; - glong _tmp13_; - glong _tmp16_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - gchar* _tmp21_; -#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gboolean _tmp4_ = FALSE; + gboolean _tmp6_ = FALSE; + gchar* _tmp8_; +#line 1369 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = start; -#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp2_ < ((glong) 0)) { -#line 1122 "GPhoto.c" +#line 1371 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (start < ((glong) 0)) { +#line 1358 "GPhoto.c" + glong _tmp2_; +#line 1372 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = string_length; +#line 1372 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + start = _tmp2_ + start; +#line 1364 "GPhoto.c" + } +#line 1374 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (end < ((glong) 0)) { +#line 1368 "GPhoto.c" glong _tmp3_; - glong _tmp4_; -#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1375 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = start; -#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - start = _tmp3_ + _tmp4_; -#line 1131 "GPhoto.c" - } -#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp5_ < ((glong) 0)) { -#line 1137 "GPhoto.c" - glong _tmp6_; - glong _tmp7_; -#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = string_length; -#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = end; -#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp6_ + _tmp7_; -#line 1146 "GPhoto.c" +#line 1375 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp3_ + end; +#line 1374 "GPhoto.c" } -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = start; -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp9_ >= ((glong) 0)) { -#line 1152 "GPhoto.c" - glong _tmp10_; - glong _tmp11_; -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = start; -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = string_length; -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp10_ <= _tmp11_; -#line 1161 "GPhoto.c" +#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (start >= ((glong) 0)) { +#line 1378 "GPhoto.c" + glong _tmp5_; +#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = start <= _tmp5_; +#line 1384 "GPhoto.c" } else { -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = FALSE; -#line 1165 "GPhoto.c" +#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = FALSE; +#line 1388 "GPhoto.c" } -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp8_, NULL); -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = end; -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp13_ >= ((glong) 0)) { -#line 1173 "GPhoto.c" - glong _tmp14_; - glong _tmp15_; -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = end; -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = _tmp14_ <= _tmp15_; -#line 1182 "GPhoto.c" +#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (_tmp4_, NULL); +#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (end >= ((glong) 0)) { +#line 1394 "GPhoto.c" + glong _tmp7_; +#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = string_length; +#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = end <= _tmp7_; +#line 1400 "GPhoto.c" } else { -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = FALSE; -#line 1186 "GPhoto.c" +#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = FALSE; +#line 1404 "GPhoto.c" } -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_, NULL); -#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = start; -#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = end; -#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = start; -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = end; -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = start; -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp21_; -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (_tmp6_, NULL); +#line 1379 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (start <= end, NULL); +#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = g_strndup (((gchar*) self) + start, (gsize) (end - start)); +#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp8_; +#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1208 "GPhoto.c" +#line 1416 "GPhoto.c" } -PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, const gchar* folder, const gchar* filename) { +PhotoMetadata* +gp_get_fallback_metadata (Camera* camera, + GPContext* context, + const gchar* folder, + const gchar* filename) +{ PhotoMetadata* result = NULL; CameraStorageInformation* sifs = NULL; gint count = 0; - Camera* _tmp0_; - GPContext* _tmp1_; - gint _tmp2_ = 0; + gint _tmp0_ = 0; GPPortInfo port_info = {0}; - Camera* _tmp3_; - GPPortInfo _tmp4_ = {0}; + GPPortInfo _tmp1_ = {0}; gchar* path = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_; + const gchar* _tmp2_ = NULL; + gchar* _tmp3_; gchar* prefix = NULL; - gchar* _tmp7_; - const gchar* _tmp8_; - gboolean _tmp9_; + gchar* _tmp4_; + const gchar* _tmp5_; PhotoMetadata* metadata = NULL; - PhotoMetadata* _tmp17_; + PhotoMetadata* _tmp13_; GError * _inner_error_ = NULL; #line 137 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_val_if_fail (camera != NULL, NULL); @@ -1241,66 +1450,58 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" count = 0; #line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp0_ = camera; -#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp1_ = context; -#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - gp_camera_get_storageinfo (_tmp0_, &sifs, &_tmp2_, _tmp1_); + gp_camera_get_storageinfo (camera, &sifs, &_tmp0_, context); #line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - count = _tmp2_; + count = _tmp0_; #line 143 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp3_ = camera; -#line 143 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - gp_camera_get_port_info (_tmp3_, &_tmp4_); + gp_camera_get_port_info (camera, &_tmp1_); #line 143 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" (port_info); #line 143 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - port_info = _tmp4_; + port_info = _tmp1_; #line 146 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - gp_port_info_get_path (port_info, &_tmp5_); + gp_port_info_get_path (port_info, &_tmp2_); #line 146 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_free0 (path); #line 146 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp6_ = g_strdup (_tmp5_); + _tmp3_ = g_strdup (_tmp2_); #line 146 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - path = _tmp6_; + path = _tmp3_; #line 148 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp7_ = g_strdup ("disk:"); + _tmp4_ = g_strdup ("disk:"); #line 148 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - prefix = _tmp7_; -#line 149 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp8_ = path; + prefix = _tmp4_; #line 149 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp9_ = g_str_has_prefix (_tmp8_, prefix); + _tmp5_ = path; #line 149 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - if (_tmp9_) { -#line 1278 "GPhoto.c" - const gchar* _tmp10_; + if (g_str_has_prefix (_tmp5_, prefix)) { +#line 1479 "GPhoto.c" + const gchar* _tmp6_; + gint _tmp7_; + gint _tmp8_; + const gchar* _tmp9_; + gint _tmp10_; gint _tmp11_; - gint _tmp12_; - const gchar* _tmp13_; - gint _tmp14_; - gint _tmp15_; - gchar* _tmp16_; + gchar* _tmp12_; #line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp10_ = path; + _tmp6_ = path; #line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp11_ = strlen (prefix); + _tmp7_ = strlen (prefix); #line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp13_ = path; + _tmp9_ = path; #line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp14_ = strlen (_tmp13_); + _tmp10_ = strlen (_tmp9_); #line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp15_ = _tmp14_; + _tmp11_ = _tmp10_; #line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp16_ = string_slice (_tmp10_, (glong) _tmp12_, (glong) _tmp15_); + _tmp12_ = string_slice (_tmp6_, (glong) _tmp8_, (glong) _tmp11_); #line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_free0 (path); #line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - path = _tmp16_; -#line 1304 "GPhoto.c" + path = _tmp12_; +#line 1505 "GPhoto.c" } else { #line 152 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" result = NULL; @@ -1312,63 +1513,57 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con (port_info); #line 152 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 1316 "GPhoto.c" +#line 1517 "GPhoto.c" } #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp17_ = photo_metadata_new (); + _tmp13_ = photo_metadata_new (); #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - metadata = _tmp17_; -#line 1322 "GPhoto.c" + metadata = _tmp13_; +#line 1523 "GPhoto.c" { - PhotoMetadata* _tmp18_; - const gchar* _tmp19_; - const gchar* _tmp20_; + PhotoMetadata* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; gchar* _tmp21_; - gchar* _tmp22_; - gchar* _tmp23_; - gchar* _tmp24_; - const gchar* _tmp25_; - gchar* _tmp26_; - gchar* _tmp27_; - GFile* _tmp28_; - GFile* _tmp29_; -#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp18_ = metadata; + GFile* _tmp22_; + GFile* _tmp23_; #line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp19_ = path; + _tmp14_ = metadata; #line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp20_ = folder; + _tmp15_ = path; #line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp21_ = g_strconcat (_tmp19_, _tmp20_, NULL); + _tmp16_ = g_strconcat (_tmp15_, folder, NULL); #line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp22_ = _tmp21_; + _tmp17_ = _tmp16_; #line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp23_ = g_strconcat (_tmp22_, "/", NULL); + _tmp18_ = g_strconcat (_tmp17_, "/", NULL); #line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp24_ = _tmp23_; + _tmp19_ = _tmp18_; #line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp25_ = filename; + _tmp20_ = g_strconcat (_tmp19_, filename, NULL); #line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp26_ = g_strconcat (_tmp24_, _tmp25_, NULL); + _tmp21_ = _tmp20_; #line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp27_ = _tmp26_; -#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp28_ = g_file_new_for_path (_tmp27_); + _tmp22_ = g_file_new_for_path (_tmp21_); #line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp29_ = _tmp28_; + _tmp23_ = _tmp22_; #line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_MEDIA_METADATA, MediaMetadata), _tmp29_, &_inner_error_); + media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_MEDIA_METADATA, MediaMetadata), _tmp23_, &_inner_error_); #line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _g_object_unref0 (_tmp29_); + _g_object_unref0 (_tmp23_); #line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _g_free0 (_tmp27_); + _g_free0 (_tmp21_); #line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _g_free0 (_tmp24_); + _g_free0 (_tmp19_); #line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp17_); #line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1372 "GPhoto.c" +#line 1567 "GPhoto.c" goto __catch69_g_error; } } @@ -1383,7 +1578,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con _media_metadata_unref0 (metadata); #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" metadata = NULL; -#line 1387 "GPhoto.c" +#line 1582 "GPhoto.c" } __finally69: #line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -1402,7 +1597,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con g_clear_error (&_inner_error_); #line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 1406 "GPhoto.c" +#line 1601 "GPhoto.c" } #line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" result = metadata; @@ -1414,33 +1609,42 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con (port_info); #line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 1418 "GPhoto.c" +#line 1613 "GPhoto.c" } -static gpointer _g_bytes_ref0 (gpointer self) { +static gpointer +_g_bytes_ref0 (gpointer self) +{ #line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return self ? g_bytes_ref (self) : NULL; -#line 1425 "GPhoto.c" +#line 1622 "GPhoto.c" } -GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, gchar* * preview_md5, GError** error) { +GdkPixbuf* +gp_load_preview (GPContext* context, + Camera* camera, + const gchar* folder, + const gchar* filename, + gchar* * preview_md5, + GError** error) +{ gchar* _vala_preview_md5 = NULL; GdkPixbuf* result = NULL; GBytes* raw = NULL; GBytes* out_bytes = NULL; - GBytes* _tmp25_; - GBytes* _tmp26_; - GBytes* _tmp27_; - gchar* _tmp28_; + GBytes* _tmp15_; + GBytes* _tmp16_; + GBytes* _tmp17_; + gchar* _tmp18_; GMemoryInputStream* mins = NULL; - GBytes* _tmp29_; - GMemoryInputStream* _tmp30_; - GdkPixbuf* _tmp31_ = NULL; - GMemoryInputStream* _tmp32_; - GdkPixbuf* _tmp33_; - GdkPixbuf* _tmp34_; + GBytes* _tmp19_; + GMemoryInputStream* _tmp20_; + GdkPixbuf* _tmp21_ = NULL; + GMemoryInputStream* _tmp22_; + GdkPixbuf* _tmp23_; + GdkPixbuf* _tmp24_; GError * _inner_error_ = NULL; #line 164 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_val_if_fail (context != NULL, NULL); @@ -1458,87 +1662,61 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol _g_free0 (_vala_preview_md5); #line 168 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _vala_preview_md5 = NULL; -#line 1462 "GPhoto.c" +#line 1666 "GPhoto.c" { GBytes* _tmp0_ = NULL; - GPContext* _tmp1_; - Camera* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - GBytes* _tmp5_; - GBytes* _tmp6_; -#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp1_ = context; + GBytes* _tmp1_; + GBytes* _tmp2_; #line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp2_ = camera; + _tmp1_ = gp_load_file_into_buffer (context, camera, folder, filename, GP_FILE_TYPE_PREVIEW, &_inner_error_); #line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp3_ = folder; -#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp4_ = filename; -#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp5_ = gp_load_file_into_buffer (_tmp1_, _tmp2_, _tmp3_, _tmp4_, GP_FILE_TYPE_PREVIEW, &_inner_error_); -#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp0_ = _tmp5_; + _tmp0_ = _tmp1_; #line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1485 "GPhoto.c" +#line 1677 "GPhoto.c" goto __catch70_g_error; } #line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp6_ = _tmp0_; + _tmp2_ = _tmp0_; #line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp0_ = NULL; #line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_bytes_unref0 (raw); #line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - raw = _tmp6_; + raw = _tmp2_; #line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_bytes_unref0 (_tmp0_); -#line 1498 "GPhoto.c" +#line 1690 "GPhoto.c" } goto __finally70; __catch70_g_error: { PhotoMetadata* metadata = NULL; - Camera* _tmp7_; - GPContext* _tmp8_; - const gchar* _tmp9_; - const gchar* _tmp10_; - PhotoMetadata* _tmp11_; - PhotoMetadata* _tmp12_; - PhotoMetadata* _tmp13_; - guint _tmp14_; + PhotoMetadata* _tmp3_; + PhotoMetadata* _tmp4_; + PhotoMetadata* _tmp5_; PhotoPreview* preview = NULL; - PhotoMetadata* _tmp15_; - PhotoMetadata* _tmp16_; - guint _tmp17_; - PhotoPreview* _tmp18_; - GBytes* _tmp19_ = NULL; - PhotoPreview* _tmp20_; - GBytes* _tmp21_; - GBytes* _tmp22_; - GBytes* _tmp23_; - gchar* _tmp24_; + PhotoMetadata* _tmp6_; + PhotoMetadata* _tmp7_; + PhotoPreview* _tmp8_; + GBytes* _tmp9_ = NULL; + PhotoPreview* _tmp10_; + GBytes* _tmp11_; + GBytes* _tmp12_; + GBytes* _tmp13_; + gchar* _tmp14_; #line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_clear_error (&_inner_error_); #line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _inner_error_ = NULL; #line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp7_ = camera; + _tmp3_ = gp_get_fallback_metadata (camera, context, folder, filename); #line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp8_ = context; -#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp9_ = folder; -#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp10_ = filename; -#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp11_ = gp_get_fallback_metadata (_tmp7_, _tmp8_, _tmp9_, _tmp10_); -#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - metadata = _tmp11_; + metadata = _tmp3_; #line 174 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp12_ = metadata; + _tmp4_ = metadata; #line 174 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - if (NULL == _tmp12_) { + if (NULL == _tmp4_) { #line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" result = NULL; #line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -1551,22 +1729,20 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol if (preview_md5) { #line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *preview_md5 = _vala_preview_md5; -#line 1555 "GPhoto.c" +#line 1733 "GPhoto.c" } else { #line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_free0 (_vala_preview_md5); -#line 1559 "GPhoto.c" +#line 1737 "GPhoto.c" } #line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 1563 "GPhoto.c" +#line 1741 "GPhoto.c" } #line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp13_ = metadata; -#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp14_ = photo_metadata_get_preview_count (_tmp13_); + _tmp5_ = metadata; #line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - if (((guint) 0) == _tmp14_) { + if (((guint) 0) == photo_metadata_get_preview_count (_tmp5_)) { #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" result = NULL; #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -1579,64 +1755,62 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol if (preview_md5) { #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *preview_md5 = _vala_preview_md5; -#line 1583 "GPhoto.c" +#line 1759 "GPhoto.c" } else { #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_free0 (_vala_preview_md5); -#line 1587 "GPhoto.c" +#line 1763 "GPhoto.c" } #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 1591 "GPhoto.c" +#line 1767 "GPhoto.c" } #line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp15_ = metadata; -#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp16_ = metadata; + _tmp6_ = metadata; #line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp17_ = photo_metadata_get_preview_count (_tmp16_); + _tmp7_ = metadata; #line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp18_ = photo_metadata_get_preview (_tmp15_, _tmp17_ - 1); + _tmp8_ = photo_metadata_get_preview (_tmp6_, photo_metadata_get_preview_count (_tmp7_) - 1); #line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - preview = _tmp18_; + preview = _tmp8_; #line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp20_ = preview; + _tmp10_ = preview; #line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp21_ = photo_preview_flatten (_tmp20_, &_inner_error_); + _tmp11_ = photo_preview_flatten (_tmp10_, &_inner_error_); #line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp19_ = _tmp21_; + _tmp9_ = _tmp11_; #line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _photo_preview_unref0 (preview); #line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _media_metadata_unref0 (metadata); -#line 1615 "GPhoto.c" +#line 1789 "GPhoto.c" goto __finally70; } #line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp22_ = _tmp19_; + _tmp12_ = _tmp9_; #line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp19_ = NULL; + _tmp9_ = NULL; #line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_bytes_unref0 (raw); #line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - raw = _tmp22_; + raw = _tmp12_; #line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp23_ = raw; + _tmp13_ = raw; #line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp24_ = g_compute_checksum_for_bytes (G_CHECKSUM_MD5, _tmp23_); + _tmp14_ = g_compute_checksum_for_bytes (G_CHECKSUM_MD5, _tmp13_); #line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_free0 (_vala_preview_md5); #line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _vala_preview_md5 = _tmp24_; + _vala_preview_md5 = _tmp14_; #line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _g_bytes_unref0 (_tmp19_); + _g_bytes_unref0 (_tmp9_); #line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _photo_preview_unref0 (preview); #line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _media_metadata_unref0 (metadata); -#line 1640 "GPhoto.c" +#line 1814 "GPhoto.c" } __finally70: #line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -1649,36 +1823,36 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol _g_bytes_unref0 (raw); #line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 1653 "GPhoto.c" +#line 1827 "GPhoto.c" } #line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp25_ = raw; + _tmp15_ = raw; #line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp26_ = _g_bytes_ref0 (_tmp25_); + _tmp16_ = _g_bytes_ref0 (_tmp15_); #line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_bytes_unref0 (out_bytes); #line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - out_bytes = _tmp26_; + out_bytes = _tmp16_; #line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp27_ = out_bytes; + _tmp17_ = out_bytes; #line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp28_ = g_compute_checksum_for_bytes (G_CHECKSUM_MD5, _tmp27_); + _tmp18_ = g_compute_checksum_for_bytes (G_CHECKSUM_MD5, _tmp17_); #line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_free0 (_vala_preview_md5); #line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _vala_preview_md5 = _tmp28_; + _vala_preview_md5 = _tmp18_; #line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp29_ = raw; + _tmp19_ = raw; #line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp30_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp29_); + _tmp20_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp19_); #line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - mins = _tmp30_; + mins = _tmp20_; #line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp32_ = mins; + _tmp22_ = mins; #line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp33_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, g_input_stream_get_type (), GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_); + _tmp23_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, g_input_stream_get_type (), GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_); #line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp31_ = _tmp33_; + _tmp21_ = _tmp23_; #line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -1691,16 +1865,16 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol _g_bytes_unref0 (raw); #line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 1695 "GPhoto.c" +#line 1869 "GPhoto.c" } #line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp34_ = _tmp31_; + _tmp24_ = _tmp21_; #line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp31_ = NULL; + _tmp21_ = NULL; #line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - result = _tmp34_; + result = _tmp24_; #line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _g_object_unref0 (_tmp31_); + _g_object_unref0 (_tmp21_); #line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_object_unref0 (mins); #line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -1711,31 +1885,33 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol if (preview_md5) { #line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *preview_md5 = _vala_preview_md5; -#line 1715 "GPhoto.c" +#line 1889 "GPhoto.c" } else { #line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_free0 (_vala_preview_md5); -#line 1719 "GPhoto.c" +#line 1893 "GPhoto.c" } #line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 1723 "GPhoto.c" +#line 1897 "GPhoto.c" } -GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error) { +GdkPixbuf* +gp_load_image (GPContext* context, + Camera* camera, + const gchar* folder, + const gchar* filename, + GError** error) +{ GdkPixbuf* result = NULL; GInputStream* ins = NULL; - GPContext* _tmp0_; - Camera* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - GInputStream* _tmp4_; - GInputStream* _tmp5_; - GdkPixbuf* _tmp6_ = NULL; - GInputStream* _tmp7_; - GdkPixbuf* _tmp8_; - GdkPixbuf* _tmp9_; + GInputStream* _tmp0_; + GInputStream* _tmp1_; + GdkPixbuf* _tmp2_ = NULL; + GInputStream* _tmp3_; + GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp5_; GError * _inner_error_ = NULL; #line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_val_if_fail (context != NULL, NULL); @@ -1746,43 +1922,35 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde #line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_val_if_fail (filename != NULL, NULL); #line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp0_ = context; -#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp1_ = camera; -#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp2_ = folder; + _tmp0_ = gp_load_file_into_stream (context, camera, folder, filename, GP_FILE_TYPE_NORMAL, &_inner_error_); #line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp3_ = filename; -#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp4_ = gp_load_file_into_stream (_tmp0_, _tmp1_, _tmp2_, _tmp3_, GP_FILE_TYPE_NORMAL, &_inner_error_); -#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - ins = _tmp4_; + ins = _tmp0_; #line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_propagate_error (error, _inner_error_); #line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 1767 "GPhoto.c" +#line 1935 "GPhoto.c" } #line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp5_ = ins; + _tmp1_ = ins; #line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - if (_tmp5_ == NULL) { + if (_tmp1_ == NULL) { #line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" result = NULL; #line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_object_unref0 (ins); #line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 1779 "GPhoto.c" +#line 1947 "GPhoto.c" } #line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp7_ = ins; + _tmp3_ = ins; #line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp8_ = gdk_pixbuf_new_from_stream (_tmp7_, NULL, &_inner_error_); + _tmp4_ = gdk_pixbuf_new_from_stream (_tmp3_, NULL, &_inner_error_); #line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp6_ = _tmp8_; + _tmp2_ = _tmp4_; #line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -1791,45 +1959,45 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde _g_object_unref0 (ins); #line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 1795 "GPhoto.c" +#line 1963 "GPhoto.c" } #line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp9_ = _tmp6_; + _tmp5_ = _tmp2_; #line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp6_ = NULL; + _tmp2_ = NULL; #line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - result = _tmp9_; + result = _tmp5_; #line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp2_); #line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_object_unref0 (ins); #line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 1809 "GPhoto.c" +#line 1977 "GPhoto.c" } -void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GFile* dest_file, GError** error) { +void +gp_save_image (GPContext* context, + Camera* camera, + const gchar* folder, + const gchar* filename, + GFile* dest_file, + GError** error) +{ gint fd = 0; - GFile* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; - gint _tmp5_; CameraFile* camera_file = NULL; int res = 0; - gint _tmp12_; - CameraFile* _tmp13_ = NULL; - int _tmp14_; - int _tmp15_; - Camera* _tmp20_; - const gchar* _tmp21_; - const gchar* _tmp22_; - CameraFile* _tmp23_; - GPContext* _tmp24_; - int _tmp25_; - int _tmp26_; + gint _tmp9_; + CameraFile* _tmp10_ = NULL; + int _tmp11_; + int _tmp12_; + CameraFile* _tmp17_; + int _tmp18_; GError * _inner_error_ = NULL; #line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (context != NULL); @@ -1842,166 +2010,148 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con #line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_if_fail (G_IS_FILE (dest_file)); #line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp0_ = dest_file; -#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp1_ = g_file_get_path (_tmp0_); -#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp2_ = _tmp1_; + _tmp0_ = g_file_get_path (dest_file); #line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp3_ = creat (_tmp2_, (mode_t) 0640); + _tmp1_ = _tmp0_; #line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp4_ = _tmp3_; + _tmp2_ = creat (_tmp1_, (mode_t) 0640); #line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - fd = _tmp4_; + fd = _tmp2_; #line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp5_ = fd; + _tmp3_ = fd; #line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - if (_tmp5_ < 0) { -#line 1863 "GPhoto.c" - gint _tmp6_; - GFile* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - GError* _tmp10_; - GError* _tmp11_; -#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp6_ = errno; + if (_tmp3_ < 0) { +#line 2027 "GPhoto.c" + gint _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GError* _tmp7_; + GError* _tmp8_; #line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp7_ = dest_file; + _tmp4_ = errno; #line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp8_ = g_file_get_path (_tmp7_); + _tmp5_ = g_file_get_path (dest_file); #line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp10_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "[%d] Error creating file %s: %m", _tmp6_, _tmp9_); + _tmp7_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "[%d] Error creating file %s: %m", _tmp4_, _tmp6_); #line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp6_); #line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _inner_error_ = _tmp11_; + _inner_error_ = _tmp8_; #line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_propagate_error (error, _inner_error_); #line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return; -#line 1890 "GPhoto.c" +#line 2051 "GPhoto.c" } #line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp12_ = fd; + _tmp9_ = fd; #line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp14_ = gp_file_new_from_fd (&_tmp13_, _tmp12_); + _tmp11_ = gp_file_new_from_fd (&_tmp10_, _tmp9_); #line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _gp_file_unref0 (camera_file); #line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - camera_file = _tmp13_; + camera_file = _tmp10_; #line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - res = _tmp14_; + res = _tmp11_; #line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp15_ = res; + _tmp12_ = res; #line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - if (_tmp15_ != GP_OK) { -#line 1906 "GPhoto.c" - int _tmp16_; - int _tmp17_; - const gchar* _tmp18_; - GError* _tmp19_; + if (_tmp12_ != GP_OK) { +#line 2067 "GPhoto.c" + int _tmp13_; + int _tmp14_; + const gchar* _tmp15_; + GError* _tmp16_; #line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp16_ = res; + _tmp13_ = res; #line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp17_ = res; + _tmp14_ = res; #line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp18_ = gp_port_result_as_string (_tmp17_); + _tmp15_ = gp_port_result_as_string (_tmp14_); #line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp19_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp16_, _tmp18_); + _tmp16_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp13_, _tmp15_); #line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _inner_error_ = _tmp19_; + _inner_error_ = _tmp16_; #line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_propagate_error (error, _inner_error_); #line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _gp_file_unref0 (camera_file); #line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return; -#line 1927 "GPhoto.c" +#line 2088 "GPhoto.c" } #line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp20_ = camera; -#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp21_ = folder; + _tmp17_ = camera_file; #line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp22_ = filename; -#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp23_ = camera_file; -#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp24_ = context; -#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp25_ = gp_camera_file_get (_tmp20_, _tmp21_, _tmp22_, GP_FILE_TYPE_NORMAL, _tmp23_, _tmp24_); -#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - res = _tmp25_; + res = gp_camera_file_get (camera, folder, filename, GP_FILE_TYPE_NORMAL, _tmp17_, context); #line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp26_ = res; + _tmp18_ = res; #line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - if (_tmp26_ != GP_OK) { -#line 1947 "GPhoto.c" - int _tmp27_; - const gchar* _tmp28_; - const gchar* _tmp29_; - int _tmp30_; - const gchar* _tmp31_; - GError* _tmp32_; + if (_tmp18_ != GP_OK) { +#line 2098 "GPhoto.c" + int _tmp19_; + int _tmp20_; + const gchar* _tmp21_; + GError* _tmp22_; #line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp27_ = res; + _tmp19_ = res; #line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp28_ = folder; + _tmp20_ = res; #line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp29_ = filename; + _tmp21_ = gp_port_result_as_string (_tmp20_); #line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp30_ = res; + _tmp22_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp19_, folder, filename, _tmp21_); #line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp31_ = gp_port_result_as_string (_tmp30_); -#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp32_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp27_, _tmp28_, _tmp29_, _tmp31_); -#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _inner_error_ = _tmp32_; + _inner_error_ = _tmp22_; #line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_propagate_error (error, _inner_error_); #line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _gp_file_unref0 (camera_file); #line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return; -#line 1974 "GPhoto.c" +#line 2119 "GPhoto.c" } #line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _gp_file_unref0 (camera_file); -#line 1978 "GPhoto.c" +#line 2123 "GPhoto.c" } -static gint _vala_g_bytes_get_length (GBytes* self) { +static gint +_vala_g_bytes_get_length (GBytes* self) +{ gint result; - gsize _tmp0_; -#line 5013 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 5049 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 5015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = g_bytes_get_size (self); -#line 5015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (gint) _tmp0_; -#line 5015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 5051 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (gint) g_bytes_get_size (self); +#line 5051 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1993 "GPhoto.c" +#line 2137 "GPhoto.c" } -PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error) { +PhotoMetadata* +gp_load_metadata (GPContext* context, + Camera* camera, + const gchar* folder, + const gchar* filename, + GError** error) +{ PhotoMetadata* result = NULL; GBytes* camera_raw = NULL; - gboolean _tmp12_ = FALSE; - GBytes* _tmp13_; + gboolean _tmp4_ = FALSE; + GBytes* _tmp5_; PhotoMetadata* metadata = NULL; - PhotoMetadata* _tmp17_; - PhotoMetadata* _tmp18_; - GBytes* _tmp19_; + PhotoMetadata* _tmp9_; + PhotoMetadata* _tmp10_; + GBytes* _tmp11_; GError * _inner_error_ = NULL; #line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_val_if_fail (context != NULL, NULL); @@ -2013,73 +2163,49 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar g_return_val_if_fail (filename != NULL, NULL); #line 223 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" camera_raw = NULL; -#line 2017 "GPhoto.c" +#line 2167 "GPhoto.c" { GBytes* _tmp0_ = NULL; - GPContext* _tmp1_; - Camera* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - GBytes* _tmp5_; - GBytes* _tmp6_; -#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp1_ = context; -#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp2_ = camera; -#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp3_ = folder; -#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp4_ = filename; + GBytes* _tmp1_; + GBytes* _tmp2_; #line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp5_ = gp_load_file_into_buffer (_tmp1_, _tmp2_, _tmp3_, _tmp4_, GP_FILE_TYPE_EXIF, &_inner_error_); + _tmp1_ = gp_load_file_into_buffer (context, camera, folder, filename, GP_FILE_TYPE_EXIF, &_inner_error_); #line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp0_ = _tmp5_; + _tmp0_ = _tmp1_; #line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2040 "GPhoto.c" +#line 2178 "GPhoto.c" goto __catch71_g_error; } #line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp6_ = _tmp0_; + _tmp2_ = _tmp0_; #line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp0_ = NULL; #line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_bytes_unref0 (camera_raw); #line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - camera_raw = _tmp6_; + camera_raw = _tmp2_; #line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_bytes_unref0 (_tmp0_); -#line 2053 "GPhoto.c" +#line 2191 "GPhoto.c" } goto __finally71; __catch71_g_error: { - Camera* _tmp7_; - GPContext* _tmp8_; - const gchar* _tmp9_; - const gchar* _tmp10_; - PhotoMetadata* _tmp11_; + PhotoMetadata* _tmp3_; #line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_clear_error (&_inner_error_); #line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _inner_error_ = NULL; #line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp7_ = camera; -#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp8_ = context; -#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp9_ = folder; -#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp10_ = filename; + _tmp3_ = gp_get_fallback_metadata (camera, context, folder, filename); #line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp11_ = gp_get_fallback_metadata (_tmp7_, _tmp8_, _tmp9_, _tmp10_); -#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - result = _tmp11_; + result = _tmp3_; #line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_bytes_unref0 (camera_raw); #line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 2083 "GPhoto.c" +#line 2209 "GPhoto.c" } __finally71: #line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -2090,49 +2216,49 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar _g_bytes_unref0 (camera_raw); #line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 2094 "GPhoto.c" +#line 2220 "GPhoto.c" } #line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp13_ = camera_raw; + _tmp5_ = camera_raw; #line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - if (_tmp13_ == NULL) { + if (_tmp5_ == NULL) { #line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp12_ = TRUE; -#line 2102 "GPhoto.c" + _tmp4_ = TRUE; +#line 2228 "GPhoto.c" } else { - GBytes* _tmp14_; - gint _tmp15_; - gint _tmp16_; + GBytes* _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp14_ = camera_raw; + _tmp6_ = camera_raw; #line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp15_ = _vala_g_bytes_get_length (_tmp14_); + _tmp7_ = _vala_g_bytes_get_length (_tmp6_); #line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp16_ = _tmp15_; + _tmp8_ = _tmp7_; #line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp12_ = _tmp16_ == 0; -#line 2115 "GPhoto.c" + _tmp4_ = _tmp8_ == 0; +#line 2241 "GPhoto.c" } #line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - if (_tmp12_) { + if (_tmp4_) { #line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" result = NULL; #line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_bytes_unref0 (camera_raw); #line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 2125 "GPhoto.c" +#line 2251 "GPhoto.c" } #line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp17_ = photo_metadata_new (); + _tmp9_ = photo_metadata_new (); #line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - metadata = _tmp17_; + metadata = _tmp9_; #line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp18_ = metadata; + _tmp10_ = metadata; #line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp19_ = camera_raw; + _tmp11_ = camera_raw; #line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - photo_metadata_read_from_app1_segment (_tmp18_, _tmp19_, &_inner_error_); + photo_metadata_read_from_app1_segment (_tmp10_, _tmp11_, &_inner_error_); #line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -2143,7 +2269,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar _g_bytes_unref0 (camera_raw); #line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 2147 "GPhoto.c" +#line 2273 "GPhoto.c" } #line 236 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" result = metadata; @@ -2151,42 +2277,41 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar _g_bytes_unref0 (camera_raw); #line 236 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 2155 "GPhoto.c" +#line 2281 "GPhoto.c" } -GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileType filetype, GError** error) { +GInputStream* +gp_load_file_into_stream (GPContext* context, + Camera* camera, + const gchar* folder, + const gchar* filename, + CameraFileType filetype, + GError** error) +{ GInputStream* result = NULL; CameraFile* camera_file = NULL; int res = 0; CameraFile* _tmp0_ = NULL; int _tmp1_; int _tmp2_; - Camera* _tmp7_; - const gchar* _tmp8_; - const gchar* _tmp9_; - CameraFileType _tmp10_; - GPContext* _tmp11_; - int _tmp12_; - int _tmp13_; + int _tmp7_; GBytes* bytes = NULL; - GPContext* _tmp20_; - GBytes* _tmp21_; - GBytes* _tmp22_; + GBytes* _tmp12_; + GBytes* _tmp13_; GFile* temp = NULL; - GFile* _tmp25_; - GFile* _tmp26_; - GFile* _tmp27_; - GFile* _tmp28_; - GFile* _tmp29_; - gchar* _tmp30_; - gchar* _tmp31_; - int _tmp32_; - int _tmp33_; - GFileInputStream* _tmp44_ = NULL; - GFile* _tmp45_; - GFileInputStream* _tmp46_; - GFileInputStream* _tmp47_; + GFile* _tmp16_; + GFile* _tmp17_; + GFile* _tmp18_; + GFile* _tmp19_; + GFile* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + int _tmp23_; + GFileInputStream* _tmp32_ = NULL; + GFile* _tmp33_; + GFileInputStream* _tmp34_; + GFileInputStream* _tmp35_; GError * _inner_error_ = NULL; #line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_val_if_fail (context != NULL, NULL); @@ -2208,7 +2333,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons _tmp2_ = res; #line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (_tmp2_ != GP_OK) { -#line 2212 "GPhoto.c" +#line 2337 "GPhoto.c" int _tmp3_; int _tmp4_; const gchar* _tmp5_; @@ -2229,145 +2354,117 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons _gp_file_unref0 (camera_file); #line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 2233 "GPhoto.c" +#line 2358 "GPhoto.c" } #line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp7_ = camera; -#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp8_ = folder; -#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp9_ = filename; -#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp10_ = filetype; -#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp11_ = context; -#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp12_ = gp_camera_file_get (_tmp7_, _tmp8_, _tmp9_, _tmp10_, camera_file, _tmp11_); -#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - res = _tmp12_; + res = gp_camera_file_get (camera, folder, filename, filetype, camera_file, context); #line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp13_ = res; + _tmp7_ = res; #line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - if (_tmp13_ != GP_OK) { -#line 2253 "GPhoto.c" - int _tmp14_; - const gchar* _tmp15_; - const gchar* _tmp16_; - int _tmp17_; - const gchar* _tmp18_; - GError* _tmp19_; -#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp14_ = res; -#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp15_ = folder; + if (_tmp7_ != GP_OK) { +#line 2366 "GPhoto.c" + int _tmp8_; + int _tmp9_; + const gchar* _tmp10_; + GError* _tmp11_; #line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp16_ = filename; + _tmp8_ = res; #line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp17_ = res; + _tmp9_ = res; #line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp18_ = gp_port_result_as_string (_tmp17_); + _tmp10_ = gp_port_result_as_string (_tmp9_); #line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp19_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp14_, _tmp15_, _tmp16_, _tmp18_); + _tmp11_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp8_, folder, filename, _tmp10_); #line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _inner_error_ = _tmp19_; + _inner_error_ = _tmp11_; #line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_propagate_error (error, _inner_error_); #line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _gp_file_unref0 (camera_file); #line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 2280 "GPhoto.c" +#line 2387 "GPhoto.c" } #line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp20_ = context; -#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp21_ = gp_camera_file_to_bytes (_tmp20_, camera_file); + _tmp12_ = gp_camera_file_to_bytes (context, camera_file); #line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - bytes = _tmp21_; + bytes = _tmp12_; #line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp22_ = bytes; + _tmp13_ = bytes; #line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - if (_tmp22_ != NULL) { -#line 2292 "GPhoto.c" - GBytes* _tmp23_; - GMemoryInputStream* _tmp24_; + if (_tmp13_ != NULL) { +#line 2397 "GPhoto.c" + GBytes* _tmp14_; + GMemoryInputStream* _tmp15_; #line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp23_ = bytes; + _tmp14_ = bytes; #line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp24_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp23_); + _tmp15_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp14_); #line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, g_input_stream_get_type (), GInputStream); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, g_input_stream_get_type (), GInputStream); #line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_bytes_unref0 (bytes); #line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _gp_file_unref0 (camera_file); #line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 2307 "GPhoto.c" +#line 2412 "GPhoto.c" } #line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp25_ = app_dirs_get_temp_dir (); + _tmp16_ = app_dirs_get_temp_dir (); #line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp26_ = _tmp25_; + _tmp17_ = _tmp16_; #line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp27_ = g_file_get_child (_tmp26_, "import.tmp"); + _tmp18_ = g_file_get_child (_tmp17_, "import.tmp"); #line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp28_ = _tmp27_; + _tmp19_ = _tmp18_; #line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _g_object_unref0 (_tmp26_); + _g_object_unref0 (_tmp17_); #line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - temp = _tmp28_; + temp = _tmp19_; #line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp29_ = temp; + _tmp20_ = temp; #line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp30_ = g_file_get_path (_tmp29_); + _tmp21_ = g_file_get_path (_tmp20_); #line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp31_ = _tmp30_; + _tmp22_ = _tmp21_; #line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp32_ = gp_file_save (camera_file, _tmp31_); + res = gp_file_save (camera_file, _tmp22_); #line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - res = _tmp32_; -#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _g_free0 (_tmp31_); + _g_free0 (_tmp22_); #line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp33_ = res; + _tmp23_ = res; #line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - if (_tmp33_ != GP_OK) { -#line 2337 "GPhoto.c" - int _tmp34_; - const gchar* _tmp35_; - const gchar* _tmp36_; - GFile* _tmp37_; - gchar* _tmp38_; - gchar* _tmp39_; - int _tmp40_; - const gchar* _tmp41_; - GError* _tmp42_; - GError* _tmp43_; -#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp34_ = res; -#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp35_ = folder; + if (_tmp23_ != GP_OK) { +#line 2440 "GPhoto.c" + int _tmp24_; + GFile* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + int _tmp28_; + const gchar* _tmp29_; + GError* _tmp30_; + GError* _tmp31_; #line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp36_ = filename; + _tmp24_ = res; #line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp37_ = temp; + _tmp25_ = temp; #line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp38_ = g_file_get_path (_tmp37_); + _tmp26_ = g_file_get_path (_tmp25_); #line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp39_ = _tmp38_; + _tmp27_ = _tmp26_; #line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp40_ = res; + _tmp28_ = res; #line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp41_ = gp_port_result_as_string (_tmp40_); + _tmp29_ = gp_port_result_as_string (_tmp28_); #line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp42_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error copying file %s/%s to %s: %s", (gint) _tmp34_, _tmp35_, _tmp36_, _tmp39_, _tmp41_); + _tmp30_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error copying file %s/%s to %s: %s", (gint) _tmp24_, folder, filename, _tmp27_, _tmp29_); #line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp43_ = _tmp42_; + _tmp31_ = _tmp30_; #line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _g_free0 (_tmp39_); + _g_free0 (_tmp27_); #line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _inner_error_ = _tmp43_; + _inner_error_ = _tmp31_; #line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_propagate_error (error, _inner_error_); #line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -2378,14 +2475,14 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons _gp_file_unref0 (camera_file); #line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 2382 "GPhoto.c" +#line 2479 "GPhoto.c" } #line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp45_ = temp; + _tmp33_ = temp; #line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp46_ = g_file_read (_tmp45_, NULL, &_inner_error_); + _tmp34_ = g_file_read (_tmp33_, NULL, &_inner_error_); #line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp44_ = _tmp46_; + _tmp32_ = _tmp34_; #line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -2398,16 +2495,16 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons _gp_file_unref0 (camera_file); #line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 2402 "GPhoto.c" +#line 2499 "GPhoto.c" } #line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp47_ = _tmp44_; + _tmp35_ = _tmp32_; #line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp44_ = NULL; + _tmp32_ = NULL; #line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, g_input_stream_get_type (), GInputStream); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, g_input_stream_get_type (), GInputStream); #line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _g_object_unref0 (_tmp44_); + _g_object_unref0 (_tmp32_); #line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_object_unref0 (temp); #line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -2416,28 +2513,28 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons _gp_file_unref0 (camera_file); #line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 2420 "GPhoto.c" +#line 2517 "GPhoto.c" } -GBytes* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileType filetype, GError** error) { +GBytes* +gp_load_file_into_buffer (GPContext* context, + Camera* camera, + const gchar* folder, + const gchar* filename, + CameraFileType filetype, + GError** error) +{ GBytes* result = NULL; CameraFile* camera_file = NULL; int res = 0; CameraFile* _tmp0_ = NULL; int _tmp1_; int _tmp2_; - Camera* _tmp7_; - const gchar* _tmp8_; - const gchar* _tmp9_; - CameraFileType _tmp10_; - CameraFile* _tmp11_; - GPContext* _tmp12_; - int _tmp13_; - int _tmp14_; - GPContext* _tmp21_; - CameraFile* _tmp22_; - GBytes* _tmp23_; + CameraFile* _tmp7_; + int _tmp8_; + CameraFile* _tmp13_; + GBytes* _tmp14_; GError * _inner_error_ = NULL; #line 272 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_return_val_if_fail (context != NULL, NULL); @@ -2459,7 +2556,7 @@ GBytes* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha _tmp2_ = res; #line 276 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (_tmp2_ != GP_OK) { -#line 2463 "GPhoto.c" +#line 2560 "GPhoto.c" int _tmp3_; int _tmp4_; const gchar* _tmp5_; @@ -2480,70 +2577,50 @@ GBytes* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha _gp_file_unref0 (camera_file); #line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 2484 "GPhoto.c" +#line 2581 "GPhoto.c" } #line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp7_ = camera; -#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp8_ = folder; -#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp9_ = filename; -#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp10_ = filetype; -#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp11_ = camera_file; + _tmp7_ = camera_file; #line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp12_ = context; -#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp13_ = gp_camera_file_get (_tmp7_, _tmp8_, _tmp9_, _tmp10_, _tmp11_, _tmp12_); -#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - res = _tmp13_; + res = gp_camera_file_get (camera, folder, filename, filetype, _tmp7_, context); #line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp14_ = res; + _tmp8_ = res; #line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - if (_tmp14_ != GP_OK) { -#line 2506 "GPhoto.c" - int _tmp15_; - const gchar* _tmp16_; - const gchar* _tmp17_; - int _tmp18_; - const gchar* _tmp19_; - GError* _tmp20_; -#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp15_ = res; + if (_tmp8_ != GP_OK) { +#line 2591 "GPhoto.c" + int _tmp9_; + int _tmp10_; + const gchar* _tmp11_; + GError* _tmp12_; #line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp16_ = folder; + _tmp9_ = res; #line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp17_ = filename; + _tmp10_ = res; #line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp18_ = res; + _tmp11_ = gp_port_result_as_string (_tmp10_); #line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp19_ = gp_port_result_as_string (_tmp18_); + _tmp12_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp9_, folder, filename, _tmp11_); #line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp20_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp15_, _tmp16_, _tmp17_, _tmp19_); -#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _inner_error_ = _tmp20_; + _inner_error_ = _tmp12_; #line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_propagate_error (error, _inner_error_); #line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _gp_file_unref0 (camera_file); #line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 2533 "GPhoto.c" +#line 2612 "GPhoto.c" } #line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp21_ = context; -#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp22_ = camera_file; + _tmp13_ = camera_file; #line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp23_ = gp_camera_file_to_bytes (_tmp21_, _tmp22_); + _tmp14_ = gp_camera_file_to_bytes (context, _tmp13_); #line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - result = _tmp23_; + result = _tmp14_; #line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _gp_file_unref0 (camera_file); #line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 2547 "GPhoto.c" +#line 2624 "GPhoto.c" } diff --git a/src/camera/ImportPage.c b/src/camera/ImportPage.c index a1593ef..7287f44 100644 --- a/src/camera/ImportPage.c +++ b/src/camera/ImportPage.c @@ -1,4 +1,4 @@ -/* ImportPage.c generated by valac 0.36.6, the Vala compiler +/* ImportPage.c generated by valac 0.40.4, the Vala compiler * generated from ImportPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -166,6 +167,11 @@ typedef struct _ThumbnailSourcePrivate ThumbnailSourcePrivate; typedef struct _Indexable Indexable; typedef struct _IndexableIface IndexableIface; typedef struct _ImportSourcePrivate ImportSourcePrivate; +enum { + IMPORT_SOURCE_0_PROPERTY, + IMPORT_SOURCE_NUM_PROPERTIES +}; +static GParamSpec* import_source_properties[IMPORT_SOURCE_NUM_PROPERTIES]; #define _g_free0(var) (var = (g_free (var), NULL)) #define _gp_camera_unref0(var) ((var == NULL) ? NULL : (var = (gp_camera_unref (var), NULL))) #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) @@ -201,6 +207,11 @@ typedef struct _GPContextWrapperPrivate GPContextWrapperPrivate; typedef struct _VideoImportSource VideoImportSource; typedef struct _VideoImportSourceClass VideoImportSourceClass; typedef struct _VideoImportSourcePrivate VideoImportSourcePrivate; +enum { + VIDEO_IMPORT_SOURCE_0_PROPERTY, + VIDEO_IMPORT_SOURCE_NUM_PROPERTIES +}; +static GParamSpec* video_import_source_properties[VIDEO_IMPORT_SOURCE_NUM_PROPERTIES]; #define TYPE_PHOTO_IMPORT_SOURCE (photo_import_source_get_type ()) #define PHOTO_IMPORT_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource)) @@ -232,6 +243,11 @@ typedef struct _MediaMetadataClass MediaMetadataClass; typedef struct _PhotoMetadata PhotoMetadata; typedef struct _PhotoMetadataClass PhotoMetadataClass; +enum { + PHOTO_IMPORT_SOURCE_0_PROPERTY, + PHOTO_IMPORT_SOURCE_NUM_PROPERTIES +}; +static GParamSpec* photo_import_source_properties[PHOTO_IMPORT_SOURCE_NUM_PROPERTIES]; #define _media_metadata_unref0(var) ((var == NULL) ? NULL : (var = (media_metadata_unref (var), NULL))) #define TYPE_METADATA_DATE_TIME (metadata_date_time_get_type ()) @@ -312,6 +328,11 @@ typedef struct _ImportPreviewPrivate ImportPreviewPrivate; typedef struct _DuplicatedFile DuplicatedFile; typedef struct _DuplicatedFileClass DuplicatedFileClass; +enum { + IMPORT_PREVIEW_0_PROPERTY, + IMPORT_PREVIEW_NUM_PROPERTIES +}; +static GParamSpec* import_preview_properties[IMPORT_PREVIEW_NUM_PROPERTIES]; #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) #define TYPE_ORIENTATION (orientation_get_type ()) @@ -463,6 +484,15 @@ typedef struct _ViewCollectionClass ViewCollectionClass; typedef struct _CoreTrackerAccumulator CoreTrackerAccumulator; typedef struct _CoreTrackerAccumulatorIface CoreTrackerAccumulatorIface; typedef struct _CameraAccumulatorPrivate CameraAccumulatorPrivate; +enum { + CAMERA_ACCUMULATOR_0_PROPERTY, + CAMERA_ACCUMULATOR_TOTAL_PROPERTY, + CAMERA_ACCUMULATOR_PHOTOS_PROPERTY, + CAMERA_ACCUMULATOR_VIDEOS_PROPERTY, + CAMERA_ACCUMULATOR_RAW_PROPERTY, + CAMERA_ACCUMULATOR_NUM_PROPERTIES +}; +static GParamSpec* camera_accumulator_properties[CAMERA_ACCUMULATOR_NUM_PROPERTIES]; #define TYPE_PAGE (page_get_type ()) #define PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE, Page)) @@ -571,6 +601,11 @@ typedef struct _ImportPageImportPageSearchViewFilterClass ImportPageImportPageSe typedef struct _ImportPageHideImportedViewFilter ImportPageHideImportedViewFilter; typedef struct _ImportPageHideImportedViewFilterClass ImportPageHideImportedViewFilterClass; +enum { + IMPORT_PAGE_0_PROPERTY, + IMPORT_PAGE_NUM_PROPERTIES +}; +static GParamSpec* import_page_properties[IMPORT_PAGE_NUM_PROPERTIES]; #define IMPORT_PAGE_TYPE_REFRESH_RESULT (import_page_refresh_result_get_type ()) #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL))) @@ -1533,17 +1568,29 @@ static gpointer import_page_hide_imported_view_filter_parent_class = NULL; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType marker_get_type (void) G_GNUC_CONST; @@ -1551,46 +1598,70 @@ GType source_collection_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; GType import_source_collection_get_type (void) G_GNUC_CONST; -enum { - IMPORT_SOURCE_COLLECTION_DUMMY_PROPERTY -}; ImportSourceCollection* import_source_collection_new (const gchar* name); -ImportSourceCollection* import_source_collection_construct (GType object_type, const gchar* name); -SourceCollection* source_collection_construct (GType object_type, const gchar* name); -static gboolean import_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source); +ImportSourceCollection* import_source_collection_construct (GType object_type, + const gchar* name); +SourceCollection* source_collection_construct (GType object_type, + const gchar* name); +static gboolean import_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source); GType thumbnail_source_get_type (void) G_GNUC_CONST; GType import_source_get_type (void) G_GNUC_CONST; gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; gpointer source_snapshot_ref (gpointer instance); void source_snapshot_unref (gpointer instance); -GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_snapshot (GValue* value, gpointer v_object); -void value_take_source_snapshot (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_snapshot (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_snapshot (GValue* value, + gpointer v_object); +void value_take_source_snapshot (GValue* value, + gpointer v_object); gpointer value_get_source_snapshot (const GValue* value); GType source_snapshot_get_type (void) G_GNUC_CONST; GType photo_file_format_get_type (void) G_GNUC_CONST; GType indexable_get_type (void) G_GNUC_CONST; #define IMPORT_SOURCE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_IMPORT_SOURCE, ImportSourcePrivate)) -enum { - IMPORT_SOURCE_DUMMY_PROPERTY -}; -ImportSource* import_source_construct (GType object_type, const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time); +ImportSource* import_source_construct (GType object_type, + const gchar* camera_name, + Camera* camera, + gint fsid, + const gchar* folder, + const gchar* filename, + gulong file_size, + time_t modification_time); #define DATA_OBJECT_INVALID_OBJECT_ID ((gint64) -1) -ThumbnailSource* thumbnail_source_construct (GType object_type, gint64 object_id); +ThumbnailSource* thumbnail_source_construct (GType object_type, + gint64 object_id); gchar* indexable_prepare_indexable_string (const gchar* str); -void import_source_set_preview (ImportSource* self, GdkPixbuf* preview); +void import_source_set_preview (ImportSource* self, + GdkPixbuf* preview); gchar* import_source_get_camera_name (ImportSource* self); Camera* import_source_get_camera (ImportSource* self); gint import_source_get_fsid (ImportSource* self); @@ -1603,55 +1674,104 @@ static GdkPixbuf* import_source_real_get_preview (ImportSource* self); time_t import_source_get_exposure_time (ImportSource* self); static time_t import_source_real_get_exposure_time (ImportSource* self); gchar* import_source_get_fulldir (ImportSource* self); -gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint fsid, const gchar* folder); +gchar* import_page_get_fulldir (Camera* camera, + const gchar* camera_name, + gint fsid, + const gchar* folder); static gchar* import_source_real_to_string (DataObject* base); -static gboolean import_source_real_internal_delete_backing (DataSource* base, GError** error); +static gboolean import_source_real_internal_delete_backing (DataSource* base, + GError** error); gchar* data_object_to_string (DataObject* self); -gboolean data_source_internal_delete_backing (DataSource* self, GError** error); +gboolean data_source_internal_delete_backing (DataSource* self, + GError** error); gpointer gp_context_wrapper_ref (gpointer instance); void gp_context_wrapper_unref (gpointer instance); -GParamSpec* gp_param_spec_context_wrapper (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void gp_value_set_context_wrapper (GValue* value, gpointer v_object); -void gp_value_take_context_wrapper (GValue* value, gpointer v_object); +GParamSpec* gp_param_spec_context_wrapper (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void gp_value_set_context_wrapper (GValue* value, + gpointer v_object); +void gp_value_take_context_wrapper (GValue* value, + gpointer v_object); gpointer gp_value_get_context_wrapper (const GValue* value); GType gp_context_wrapper_get_type (void) G_GNUC_CONST; GType gp_spin_idle_wrapper_get_type (void) G_GNUC_CONST; static const gchar* import_source_real_get_indexable_keywords (Indexable* base); static void import_source_finalize (GObject * obj); GType video_import_source_get_type (void) G_GNUC_CONST; -enum { - VIDEO_IMPORT_SOURCE_DUMMY_PROPERTY -}; -VideoImportSource* video_import_source_new (const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time); -VideoImportSource* video_import_source_construct (GType object_type, const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time); -static GdkPixbuf* video_import_source_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error); -GdkPixbuf* thumbnail_source_create_thumbnail (ThumbnailSource* self, gint scale, GError** error); -static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error); -GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gboolean scale_up); +VideoImportSource* video_import_source_new (const gchar* camera_name, + Camera* camera, + gint fsid, + const gchar* folder, + const gchar* filename, + gulong file_size, + time_t modification_time); +VideoImportSource* video_import_source_construct (GType object_type, + const gchar* camera_name, + Camera* camera, + gint fsid, + const gchar* folder, + const gchar* filename, + gulong file_size, + time_t modification_time); +static GdkPixbuf* video_import_source_real_get_thumbnail (ThumbnailSource* base, + gint scale, + GError** error); +GdkPixbuf* thumbnail_source_create_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); +static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* base, + gint scale, + GError** error); +GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, + gint scale, + GdkInterpType interp, + gboolean scale_up); static gchar* video_import_source_real_get_typename (DataSource* base); static gint64 video_import_source_real_get_instance_id (DataSource* base); gint64 data_object_get_object_id (DataObject* self); static PhotoFileFormat video_import_source_real_get_preferred_thumbnail_format (ThumbnailSource* base); PhotoFileFormat photo_file_format_get_system_default_format (void); static gchar* video_import_source_real_get_name (DataObject* base); -void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview); +void video_import_source_update (VideoImportSource* self, + GdkPixbuf* preview); GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void); GType photo_import_source_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; #define PHOTO_IMPORT_SOURCE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSourcePrivate)) -enum { - PHOTO_IMPORT_SOURCE_DUMMY_PROPERTY -}; #define PHOTO_IMPORT_SOURCE_INTERP GDK_INTERP_BILINEAR -PhotoImportSource* photo_import_source_new (const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time, PhotoFileFormat file_format); -PhotoImportSource* photo_import_source_construct (GType object_type, const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time, PhotoFileFormat file_format); +PhotoImportSource* photo_import_source_new (const gchar* camera_name, + Camera* camera, + gint fsid, + const gchar* folder, + const gchar* filename, + gulong file_size, + time_t modification_time, + PhotoFileFormat file_format); +PhotoImportSource* photo_import_source_construct (GType object_type, + const gchar* camera_name, + Camera* camera, + gint fsid, + const gchar* folder, + const gchar* filename, + gulong file_size, + time_t modification_time, + PhotoFileFormat file_format); static gchar* photo_import_source_real_get_name (DataObject* base); gchar* photo_import_source_get_title (PhotoImportSource* self); gboolean is_string_empty (const gchar* s); @@ -1659,14 +1779,26 @@ static gchar* photo_import_source_real_get_typename (DataSource* base); static gint64 photo_import_source_real_get_instance_id (DataSource* base); static PhotoFileFormat photo_import_source_real_get_preferred_thumbnail_format (ThumbnailSource* base); gboolean photo_file_format_can_write (PhotoFileFormat self); -static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error); -void photo_import_source_update (PhotoImportSource* self, GdkPixbuf* preview, const gchar* preview_md5, PhotoMetadata* metadata, const gchar* exif_md5); +static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* base, + gint scale, + GError** error); +void photo_import_source_update (PhotoImportSource* self, + GdkPixbuf* preview, + const gchar* preview_md5, + PhotoMetadata* metadata, + const gchar* exif_md5); static time_t photo_import_source_real_get_exposure_time (ImportSource* base); gpointer metadata_date_time_ref (gpointer instance); void metadata_date_time_unref (gpointer instance); -GParamSpec* param_spec_metadata_date_time (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_metadata_date_time (GValue* value, gpointer v_object); -void value_take_metadata_date_time (GValue* value, gpointer v_object); +GParamSpec* param_spec_metadata_date_time (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_metadata_date_time (GValue* value, + gpointer v_object); +void value_take_metadata_date_time (GValue* value, + gpointer v_object); gpointer value_get_metadata_date_time (const GValue* value); GType metadata_date_time_get_type (void) G_GNUC_CONST; MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self); @@ -1674,12 +1806,16 @@ time_t metadata_date_time_get_timestamp (MetadataDateTime* self); gchar* media_metadata_get_title (MediaMetadata* self); PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self); static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base); -static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error); +static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base, + gint scale, + GError** error); PhotoFileFormat photo_import_source_get_file_format (PhotoImportSource* self); gchar* photo_import_source_get_preview_md5 (PhotoImportSource* self); -void photo_import_source_set_associated (PhotoImportSource* self, PhotoImportSource* associated); +void photo_import_source_set_associated (PhotoImportSource* self, + PhotoImportSource* associated); PhotoImportSource* photo_import_source_get_associated (PhotoImportSource* self); -static gboolean photo_import_source_real_internal_delete_backing (DataSource* base, GError** error); +static gboolean photo_import_source_real_internal_delete_backing (DataSource* base, + GError** error); static void photo_import_source_finalize (GObject * obj); GType data_view_get_type (void) G_GNUC_CONST; GType thumbnail_view_get_type (void) G_GNUC_CONST; @@ -1691,107 +1827,163 @@ GType media_source_item_get_type (void) G_GNUC_CONST; GType import_preview_get_type (void) G_GNUC_CONST; GType duplicated_file_get_type (void) G_GNUC_CONST; #define IMPORT_PREVIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_IMPORT_PREVIEW, ImportPreviewPrivate)) -enum { - IMPORT_PREVIEW_DUMMY_PROPERTY -}; #define IMPORT_PREVIEW_MAX_SCALE 128 ImportPreview* import_preview_new (ImportSource* source); -ImportPreview* import_preview_construct (GType object_type, ImportSource* source); -void dimensions_init (Dimensions *self, gint width, gint height); +ImportPreview* import_preview_construct (GType object_type, + ImportSource* source); +void dimensions_init (Dimensions *self, + gint width, + gint height); gchar* data_object_get_name (DataObject* self); -MediaSourceItem* media_source_item_new (ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment); -MediaSourceItem* media_source_item_construct (GType object_type, ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment); -void media_source_item_set_enable_sprockets (MediaSourceItem* self, gboolean enable_sprockets); -GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GError** error); +MediaSourceItem* media_source_item_new (ThumbnailSource* source, + Dimensions* initial_pixbuf_dim, + const gchar* title, + const gchar* comment, + gboolean marked_up, + PangoAlignment alignment); +MediaSourceItem* media_source_item_construct (GType object_type, + ThumbnailSource* source, + Dimensions* initial_pixbuf_dim, + const gchar* title, + const gchar* comment, + gboolean marked_up, + PangoAlignment alignment); +void media_source_item_set_enable_sprockets (MediaSourceItem* self, + gboolean enable_sprockets); +GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); GdkPixbuf* get_placeholder_pixbuf (void); GType orientation_get_type (void) G_GNUC_CONST; Orientation photo_metadata_get_orientation (PhotoMetadata* self); -GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf); -void checkerboard_item_set_subtitle (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment); -void checkerboard_item_set_image (CheckerboardItem* self, GdkPixbuf* pixbuf); +GdkPixbuf* orientation_rotate_pixbuf (Orientation self, + GdkPixbuf* pixbuf); +void checkerboard_item_set_subtitle (CheckerboardItem* self, + const gchar* text, + gboolean marked_up, + PangoAlignment alignment); +void checkerboard_item_set_image (CheckerboardItem* self, + GdkPixbuf* pixbuf); gboolean import_preview_is_already_imported (ImportPreview* self); ImportSource* import_preview_get_import_source (ImportPreview* self); -gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format); +gboolean library_photo_has_nontrash_duplicate (GFile* file, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format); GType photo_id_get_type (void) G_GNUC_CONST; PhotoID* photo_id_dup (const PhotoID* self); void photo_id_free (PhotoID* self); DuplicatedFile* duplicated_file_create_from_photo_id (PhotoID* photo_id); -void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, PhotoID* result); +void library_photo_get_nontrash_duplicate (GFile* file, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format, + PhotoID* result); GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; GType library_photo_source_collection_get_type (void) G_GNUC_CONST; -void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize, PhotoID* result); +void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, + const gchar* basename, + gint64 filesize, + PhotoID* result); gboolean photo_id_is_valid (PhotoID *self); GType media_source_get_type (void) G_GNUC_CONST; GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; -LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, PhotoID* photo_id); +LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, + PhotoID* photo_id); time_t media_source_get_exposure_time (MediaSource* self); GType video_source_collection_get_type (void) G_GNUC_CONST; -gboolean video_source_collection_has_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize); +gboolean video_source_collection_has_basename_filesize_duplicate (VideoSourceCollection* self, + const gchar* basename, + guint64 filesize); GType video_id_get_type (void) G_GNUC_CONST; VideoID* video_id_dup (const VideoID* self); void video_id_free (VideoID* self); DuplicatedFile* duplicated_file_create_from_video_id (VideoID* video_id); -void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize, VideoID* result); +void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollection* self, + const gchar* basename, + guint64 filesize, + VideoID* result); DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self); DataSource* data_view_get_source (DataView* self); static void import_preview_finalize (GObject * obj); gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; GType camera_view_tracker_get_type (void) G_GNUC_CONST; GType camera_accumulator_get_type (void) G_GNUC_CONST; -enum { - CAMERA_VIEW_TRACKER_DUMMY_PROPERTY -}; CameraAccumulator* camera_accumulator_new (void); CameraAccumulator* camera_accumulator_construct (GType object_type); GType view_collection_get_type (void) G_GNUC_CONST; CameraViewTracker* camera_view_tracker_new (ViewCollection* collection); -CameraViewTracker* camera_view_tracker_construct (GType object_type, ViewCollection* collection); +CameraViewTracker* camera_view_tracker_construct (GType object_type, + ViewCollection* collection); CoreViewTracker* core_view_tracker_new (ViewCollection* collection); -CoreViewTracker* core_view_tracker_construct (GType object_type, ViewCollection* collection); +CoreViewTracker* core_view_tracker_construct (GType object_type, + ViewCollection* collection); GType core_tracker_accumulator_get_type (void) G_GNUC_CONST; -void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected); +void core_view_tracker_start (CoreViewTracker* self, + CoreTrackerAccumulator* all, + CoreTrackerAccumulator* visible, + CoreTrackerAccumulator* selected); static void camera_view_tracker_finalize (CoreTracker * obj); #define CAMERA_ACCUMULATOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CAMERA_ACCUMULATOR, CameraAccumulatorPrivate)) -enum { - CAMERA_ACCUMULATOR_DUMMY_PROPERTY, - CAMERA_ACCUMULATOR_TOTAL_PROPERTY, - CAMERA_ACCUMULATOR_PHOTOS_PROPERTY, - CAMERA_ACCUMULATOR_VIDEOS_PROPERTY, - CAMERA_ACCUMULATOR_RAW_PROPERTY -}; -static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, DataObject* object); +static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, + DataObject* object); gint camera_accumulator_get_total (CameraAccumulator* self); -static void camera_accumulator_set_total (CameraAccumulator* self, gint value); +static void camera_accumulator_set_total (CameraAccumulator* self, + gint value); gint camera_accumulator_get_photos (CameraAccumulator* self); -static void camera_accumulator_set_photos (CameraAccumulator* self, gint value); +static void camera_accumulator_set_photos (CameraAccumulator* self, + gint value); gint camera_accumulator_get_raw (CameraAccumulator* self); -static void camera_accumulator_set_raw (CameraAccumulator* self, gint value); +static void camera_accumulator_set_raw (CameraAccumulator* self, + gint value); gint camera_accumulator_get_videos (CameraAccumulator* self); -static void camera_accumulator_set_videos (CameraAccumulator* self, gint value); -static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base, DataObject* object); -static gboolean camera_accumulator_real_altered (CoreTrackerAccumulator* base, DataObject* object, Alteration* alteration); +static void camera_accumulator_set_videos (CameraAccumulator* self, + gint value); +static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base, + DataObject* object); +static gboolean camera_accumulator_real_altered (CoreTrackerAccumulator* base, + DataObject* object, + Alteration* alteration); gchar* camera_accumulator_to_string (CameraAccumulator* self); static void camera_accumulator_finalize (GObject * obj); -static void _vala_camera_accumulator_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void _vala_camera_accumulator_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); +static void _vala_camera_accumulator_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); +static void _vala_camera_accumulator_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec); GType page_get_type (void) G_GNUC_CONST; GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType checkerboard_page_get_type (void) G_GNUC_CONST; @@ -1801,9 +1993,15 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self); gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType search_view_filter_get_type (void) G_GNUC_CONST; @@ -1811,11 +2009,11 @@ GType import_page_get_type (void) G_GNUC_CONST; static GType import_page_import_page_search_view_filter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static GType import_page_hide_imported_view_filter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define IMPORT_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_IMPORT_PAGE, ImportPagePrivate)) -enum { - IMPORT_PAGE_DUMMY_PROPERTY -}; static void import_page_on_media_added_removed (ImportPage* self); -static void _import_page_on_media_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self); +static void _import_page_on_media_added_removed_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self); GType import_page_refresh_result_get_type (void) G_GNUC_CONST; static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_new (void); static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_construct (GType object_type); @@ -1824,57 +2022,121 @@ static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_c #define IMPORT_PAGE_UNMOUNT_FAILED_MSG _ ("Unable to unmount camera. Try unmounting the camera from the file mana" \ "ger.") static void import_page_on_import_selected (ImportPage* self); -static void _import_page_on_import_selected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _import_page_on_import_selected_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void import_page_on_import_all (ImportPage* self); -static void _import_page_on_import_all_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -void page_on_action_toggle (Page* self, GAction* action, GVariant* value); -static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void import_page_on_display_titles (ImportPage* self, GSimpleAction* action, GVariant* value); -static void _import_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); -ImportPage* import_page_new (Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon); -ImportPage* import_page_construct (GType object_type, Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon); -CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name); +static void _import_page_on_import_all_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +void page_on_action_toggle (Page* self, + GAction* action, + GVariant* value); +static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void import_page_on_display_titles (ImportPage* self, + GSimpleAction* action, + GVariant* value); +static void _import_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); +ImportPage* import_page_new (Camera* camera, + const gchar* uri, + const gchar* display_name, + const gchar* icon); +ImportPage* import_page_construct (GType object_type, + Camera* camera, + const gchar* uri, + const gchar* display_name, + const gchar* icon); +CheckerboardPage* checkerboard_page_construct (GType object_type, + const gchar* page_name); ViewCollection* page_get_view (Page* self); -void page_set_page_name (Page* self, const gchar* page_name); +void page_set_page_name (Page* self, + const gchar* page_name); GPContextWrapper* gp_context_wrapper_new (void); GPContextWrapper* gp_context_wrapper_construct (GType object_type); GPSpinIdleWrapper* gp_spin_idle_wrapper_new (void); GPSpinIdleWrapper* gp_spin_idle_wrapper_construct (GType object_type); gpointer view_manager_ref (gpointer instance); void view_manager_unref (gpointer instance); -GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_manager (GValue* value, gpointer v_object); -void value_take_view_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_manager (GValue* value, + gpointer v_object); +void value_take_view_manager (GValue* value, + gpointer v_object); gpointer value_get_view_manager (const GValue* value); GType view_manager_get_type (void) G_GNUC_CONST; gpointer view_collection_monitor_ref (gpointer instance); void view_collection_monitor_unref (gpointer instance); -GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void view_collection_value_set_monitor (GValue* value, gpointer v_object); -void view_collection_value_take_monitor (GValue* value, gpointer v_object); +GParamSpec* view_collection_param_spec_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void view_collection_value_set_monitor (GValue* value, + gpointer v_object); +void view_collection_value_take_monitor (GValue* value, + gpointer v_object); gpointer view_collection_value_get_monitor (const GValue* value); GType view_collection_monitor_get_type (void) G_GNUC_CONST; -ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target); +ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq, + GeeCollection* initial, + ProgressMonitor progress_monitor, + void* progress_monitor_target); static ImportPageImportViewManager* import_page_import_view_manager_new (ImportPage* owner); -static ImportPageImportViewManager* import_page_import_view_manager_construct (GType object_type, ImportPage* owner); +static ImportPageImportViewManager* import_page_import_view_manager_construct (GType object_type, + ImportPage* owner); static GType import_page_import_view_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -void data_collection_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target); -static gint64 import_page_preview_comparator (void* a, void* b); -static gint64 _import_page_preview_comparator_comparator (void* a, void* b, gpointer self); -static gboolean import_page_preview_comparator_predicate (DataObject* object, Alteration* alteration); -static gboolean _import_page_preview_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self); +void data_collection_set_comparator (DataCollection* self, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target); +static gint64 import_page_preview_comparator (void* a, + void* b); +static gint64 _import_page_preview_comparator_comparator (void* a, + void* b, + gpointer self); +static gboolean import_page_preview_comparator_predicate (DataObject* object, + Alteration* alteration); +static gboolean _import_page_preview_comparator_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self); static void import_page_on_view_changed (ImportPage* self); -static void _import_page_on_view_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self); -static void _import_page_on_view_changed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self); -static void _import_page_on_view_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self); -void data_collection_set_property (DataCollection* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target); +static void _import_page_on_view_changed_view_collection_items_state_changed (ViewCollection* _sender, + GeeIterable* changed, + gpointer self); +static void _import_page_on_view_changed_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self); +static void _import_page_on_view_changed_view_collection_items_visibility_changed (ViewCollection* _sender, + GeeCollection* changed, + gpointer self); +void data_collection_set_property (DataCollection* self, + const gchar* name, + GValue* val, + ValueEqualFunc value_equals, + void* value_equals_target); #define CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES "show-subtitles" -void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path); -void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path); +void checkerboard_page_init_item_context_menu (CheckerboardPage* self, + const gchar* path); +void checkerboard_page_init_page_context_menu (CheckerboardPage* self, + const gchar* path); static GtkToolbar* import_page_real_get_toolbar (Page* base); GtkToolbar* page_get_toolbar (Page* self); static void import_page_on_hide_imported (ImportPage* self); -static void _import_page_on_hide_imported_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void _import_page_on_hide_imported_gtk_button_clicked (GtkButton* _sender, + gpointer self); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); @@ -1883,171 +2145,344 @@ static void import_page_update_toolbar_state (ImportPage* self); static CoreViewTracker* import_page_real_get_view_tracker (CheckerboardPage* base); static gchar* import_page_real_get_view_empty_message (CheckerboardPage* base); static gchar* import_page_real_get_filter_no_match_message (CheckerboardPage* base); -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail); -static gint64 import_page_import_job_comparator (ImportPage* self, void* a, void* b); +gboolean alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail); +static gint64 import_page_import_job_comparator (ImportPage* self, + void* a, + void* b); gpointer batch_import_job_ref (gpointer instance); void batch_import_job_unref (gpointer instance); -GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_job (GValue* value, gpointer v_object); -void value_take_batch_import_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_job (GValue* value, + gpointer v_object); +void value_take_batch_import_job (GValue* value, + gpointer v_object); gpointer value_get_batch_import_job (const GValue* value); GType batch_import_job_get_type (void) G_GNUC_CONST; static GType import_page_camera_import_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static time_t import_page_camera_import_job_get_exposure_time (ImportPageCameraImportJob* self); -static void import_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); -void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static void import_page_real_add_actions (Page* base, GActionMap* map); -void page_add_actions (Page* self, GActionMap* map); -GAction* page_get_action (Page* self, const gchar* name); +static void import_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames); +void page_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames); +static void import_page_real_add_actions (Page* base, + GActionMap* map); +void page_add_actions (Page* self, + GActionMap* map); +GAction* page_get_action (Page* self, + const gchar* name); gboolean configuration_facade_get_display_photo_titles (ConfigurationFacade* self); static GVariant* _variant_new15 (gboolean value); -static void import_page_real_remove_actions (Page* base, GActionMap* map); -void page_remove_actions (Page* self, GActionMap* map); +static void import_page_real_remove_actions (Page* base, + GActionMap* map); +void page_remove_actions (Page* self, + GActionMap* map); Camera* import_page_get_camera (ImportPage* self); gchar* import_page_get_uri (ImportPage* self); gboolean import_page_is_busy (ImportPage* self); -static void import_page_real_init_actions (Page* base, gint selected_count, gint count); -void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); -void page_init_actions (Page* self, gint selected_count, gint count); +static void import_page_real_init_actions (Page* base, + gint selected_count, + gint count); +void page_set_action_sensitive (Page* self, + const gchar* name, + gboolean sensitive); +void page_init_actions (Page* self, + gint selected_count, + gint count); gboolean import_page_is_refreshed (ImportPage* self); gchar* import_page_get_refresh_message (ImportPage* self); -static void import_page_update_status (ImportPage* self, gboolean busy, gboolean refreshed); +static void import_page_update_status (ImportPage* self, + gboolean busy, + gboolean refreshed); gint view_collection_get_unfiltered_count (ViewCollection* self); gint view_collection_get_selected_count (ViewCollection* self); gint data_collection_get_count (DataCollection* self); -void checkerboard_page_set_display_titles (CheckerboardPage* self, gboolean display); -void configuration_facade_set_display_photo_titles (ConfigurationFacade* self, gboolean display); +void checkerboard_page_set_display_titles (CheckerboardPage* self, + gboolean display); +void configuration_facade_set_display_photo_titles (ConfigurationFacade* self, + gboolean display); static void import_page_real_switched_to (Page* base); void page_switched_to (Page* self); static void import_page_real_ready (Page* base); -static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_on_locked); +static void import_page_try_refreshing_camera (ImportPage* self, + gboolean fail_on_locked); static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self); -void app_window_error_message (const gchar* message, GtkWindow* parent); +void app_window_error_message (const gchar* message, + GtkWindow* parent); GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); #define RESOURCES_APP_TITLE "Shotwell" -void checkerboard_page_set_page_message (CheckerboardPage* self, const gchar* message); -gboolean import_page_unmount_camera (ImportPage* self, GMount* mount); -static void import_page_on_unmounted (ImportPage* self, GMount* mount); -static void _import_page_on_unmounted_g_mount_unmounted (GMount* _sender, gpointer self); -static void import_page_on_unmount_finished (ImportPage* self, GObject* source, GAsyncResult* aresult); -static void _import_page_on_unmount_finished_gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); +void checkerboard_page_set_page_message (CheckerboardPage* self, + const gchar* message); +gboolean import_page_unmount_camera (ImportPage* self, + GMount* mount); +static void import_page_on_unmounted (ImportPage* self, + GMount* mount); +static void _import_page_on_unmounted_g_mount_unmounted (GMount* _sender, + gpointer self); +static void import_page_on_unmount_finished (ImportPage* self, + GObject* source, + GAsyncResult* aresult); +static void _import_page_on_unmount_finished_gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); static void import_page_clear_all_import_sources (ImportPage* self); Marker* data_collection_start_marking (DataCollection* self); void marker_mark_all (Marker* self); -gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed); -static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, const gchar* dir, const gchar* search_target); +gint source_collection_destroy_marked (SourceCollection* self, + Marker* marker, + gboolean delete_backing, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_removed); +static gboolean import_page_check_directory_exists (ImportPage* self, + gint fsid, + const gchar* dir, + const gchar* search_target); static gboolean ____lambda18_ (ImportPage* self); static gboolean _____lambda18__gsource_func (gpointer self); -static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const gchar* dir, GeeArrayList* import_list); -static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* import_list); -static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* import_list); +static gboolean import_page_enumerate_files (ImportPage* self, + gint fsid, + const gchar* dir, + GeeArrayList* import_list); +static void import_page_auto_match_raw_jpeg (ImportPage* self, + GeeArrayList* import_list); +static void import_page_load_previews_and_metadata (ImportPage* self, + GeeList* import_list); gchar* checkerboard_page_get_view_empty_message (CheckerboardPage* self); -static gchar* import_page_chomp_ch (const gchar* str, gchar ch); -gchar* import_page_append_path (const gchar* basepath, const gchar* addition); -gchar* import_page_get_fs_basedir (Camera* camera, gint fsid); +static gchar* import_page_chomp_ch (const gchar* str, + gchar ch); +gchar* import_page_append_path (const gchar* basepath, + const gchar* addition); +gchar* import_page_get_fs_basedir (Camera* camera, + gint fsid); #define GP_MAX_BASEDIR_LENGTH 255 -gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileInfo* info, GError** error); +gboolean gp_get_info (GPContext* context, + Camera* camera, + const gchar* folder, + const gchar* filename, + CameraFileInfo* info, + GError** error); gboolean video_reader_is_supported_video_filename (const gchar* filename); PhotoFileFormat photo_file_format_from_gphoto_type (const gchar* type); PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basename); void spin_event_loop (void); -void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext); -PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error); +void disassemble_filename (const gchar* basename, + gchar* * name, + gchar* * ext); +PhotoMetadata* gp_load_metadata (GPContext* context, + Camera* camera, + const gchar* folder, + const gchar* filename, + GError** error); gchar* photo_metadata_exif_hash (PhotoMetadata* self); -GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, gchar* * preview_md5, GError** error); -gboolean data_collection_add (DataCollection* self, DataObject* object); -void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f); -void view_collection_remove_view_filter (ViewCollection* self, ViewFilter* f); -void configuration_facade_set_hide_photos_already_imported (ConfigurationFacade* self, gboolean hide_imported); -static void import_page_import (ImportPage* self, GeeIterable* items); +GdkPixbuf* gp_load_preview (GPContext* context, + Camera* camera, + const gchar* folder, + const gchar* filename, + gchar* * preview_md5, + GError** error); +gboolean data_collection_add (DataCollection* self, + DataObject* object); +void view_collection_install_view_filter (ViewCollection* self, + ViewFilter* f); +void view_collection_remove_view_filter (ViewCollection* self, + ViewFilter* f); +void configuration_facade_set_hide_photos_already_imported (ConfigurationFacade* self, + gboolean hide_imported); +static void import_page_import (ImportPage* self, + GeeIterable* items); GeeList* view_collection_get_selected (ViewCollection* self); GeeCollection* data_collection_get_all (DataCollection* self); GType sorted_list_get_type (void) G_GNUC_CONST; -static gint64 _import_page_import_job_comparator_comparator (void* a, void* b, gpointer self); -SortedList* sorted_list_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target); -SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target); -static ImportPageCameraImportJob* import_page_camera_import_job_new (GPContextWrapper* context, ImportSource* import_file, DuplicatedFile* duplicated_file); -static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType object_type, GPContextWrapper* context, ImportSource* import_file, DuplicatedFile* duplicated_file); -void batch_import_job_set_associated (BatchImportJob* self, BatchImportJob* associated); +static gint64 _import_page_import_job_comparator_comparator (void* a, + void* b, + gpointer self); +SortedList* sorted_list_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + Comparator cmp, + void* cmp_target); +SortedList* sorted_list_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + Comparator cmp, + void* cmp_target); +static ImportPageCameraImportJob* import_page_camera_import_job_new (GPContextWrapper* context, + ImportSource* import_file, + DuplicatedFile* duplicated_file); +static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType object_type, + GPContextWrapper* context, + ImportSource* import_file, + DuplicatedFile* duplicated_file); +void batch_import_job_set_associated (BatchImportJob* self, + BatchImportJob* associated); GType batch_import_get_type (void) G_GNUC_CONST; gpointer import_manifest_ref (gpointer instance); void import_manifest_unref (gpointer instance); -GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_import_manifest (GValue* value, gpointer v_object); -void value_take_import_manifest (GValue* value, gpointer v_object); +GParamSpec* param_spec_import_manifest (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_import_manifest (GValue* value, + gpointer v_object); +void value_take_import_manifest (GValue* value, + gpointer v_object); gpointer value_get_import_manifest (const GValue* value); GType import_manifest_get_type (void) G_GNUC_CONST; -static void import_page_import_reporter (ImportPage* self, ImportManifest* manifest); +static void import_page_import_reporter (ImportPage* self, + ImportManifest* manifest); gpointer batch_import_roll_ref (gpointer instance); void batch_import_roll_unref (gpointer instance); -GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_roll (GValue* value, gpointer v_object); -void value_take_batch_import_roll (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_roll (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_roll (GValue* value, + gpointer v_object); +void value_take_batch_import_roll (GValue* value, + gpointer v_object); gpointer value_get_batch_import_roll (const GValue* value); GType batch_import_roll_get_type (void) G_GNUC_CONST; -static void _import_page_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self); -BatchImport* batch_import_new (GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest); -BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest); +static void _import_page_import_reporter_batch_import_import_reporter (ImportManifest* manifest, + BatchImportRoll* import_roll, + gpointer self); +BatchImport* batch_import_new (GeeIterable* jobs, + const gchar* name, + BatchImportImportReporter reporter, + void* reporter_target, + GeeArrayList* prefailed, + GeeArrayList* pre_already_imported, + GCancellable* cancellable, + BatchImportRoll* import_roll, + ImportManifest* skip_manifest); +BatchImport* batch_import_construct (GType object_type, + GeeIterable* jobs, + const gchar* name, + BatchImportImportReporter reporter, + void* reporter_target, + GeeArrayList* prefailed, + GeeArrayList* pre_already_imported, + GCancellable* cancellable, + BatchImportRoll* import_roll, + ImportManifest* skip_manifest); gpointer batch_import_result_ref (gpointer instance); void batch_import_result_unref (gpointer instance); -GParamSpec* param_spec_batch_import_result (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_result (GValue* value, gpointer v_object); -void value_take_batch_import_result (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_result (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_result (GValue* value, + gpointer v_object); +void value_take_batch_import_result (GValue* value, + gpointer v_object); gpointer value_get_batch_import_result (const GValue* value); GType batch_import_result_get_type (void) G_GNUC_CONST; -static void import_page_on_import_job_failed (ImportPage* self, BatchImportResult* _result_); -static void _import_page_on_import_job_failed_batch_import_import_job_failed (BatchImport* _sender, BatchImportResult* _result_, gpointer self); +static void import_page_on_import_job_failed (ImportPage* self, + BatchImportResult* _result_); +static void _import_page_on_import_job_failed_batch_import_import_job_failed (BatchImport* _sender, + BatchImportResult* _result_, + gpointer self); static void import_page_close_import (ImportPage* self); -static void _import_page_close_import_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self); +static void _import_page_close_import_batch_import_import_complete (BatchImport* _sender, + ImportManifest* manifest, + BatchImportRoll* import_roll, + gpointer self); GType library_window_get_type (void) G_GNUC_CONST; LibraryWindow* library_window_get_app (void); -void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batch_import, gboolean allow_user_cancel); +void library_window_enqueue_batch_import (LibraryWindow* self, + BatchImport* batch_import, + gboolean allow_user_cancel); void library_window_switch_to_import_queue_page (LibraryWindow* self); -ImportManifest* import_manifest_new (GeeList* prefailed, GeeList* pre_already_imported); -ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed, GeeList* pre_already_imported); +ImportManifest* import_manifest_new (GeeList* prefailed, + GeeList* pre_already_imported); +ImportManifest* import_manifest_construct (GType object_type, + GeeList* prefailed, + GeeList* pre_already_imported); GType import_result_get_type (void) G_GNUC_CONST; -gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, const gchar* photos_msg, const gchar* videos_msg, const gchar* both_msg, const gchar* neither_msg); +gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, + const gchar* photos_msg, + const gchar* videos_msg, + const gchar* both_msg, + const gchar* neither_msg); gpointer import_ui_question_params_ref (gpointer instance); void import_ui_question_params_unref (gpointer instance); -GParamSpec* import_ui_param_spec_question_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void import_ui_value_set_question_params (GValue* value, gpointer v_object); -void import_ui_value_take_question_params (GValue* value, gpointer v_object); +GParamSpec* import_ui_param_spec_question_params (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void import_ui_value_set_question_params (GValue* value, + gpointer v_object); +void import_ui_value_take_question_params (GValue* value, + gpointer v_object); gpointer import_ui_value_get_question_params (const GValue* value); GType import_ui_question_params_get_type (void) G_GNUC_CONST; #define RESOURCES_DELETE_LABEL _ ("_Delete") -ImportUIQuestionParams* import_ui_question_params_new (const gchar* question, const gchar* yes_button, const gchar* no_button); -ImportUIQuestionParams* import_ui_question_params_construct (GType object_type, const gchar* question, const gchar* yes_button, const gchar* no_button); -gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest_id, ImportUIQuestionParams* question); -void marker_mark (Marker* self, DataObject* object); +ImportUIQuestionParams* import_ui_question_params_new (const gchar* question, + const gchar* yes_button, + const gchar* no_button); +ImportUIQuestionParams* import_ui_question_params_construct (GType object_type, + const gchar* question, + const gchar* yes_button, + const gchar* no_button); +gboolean import_ui_report_manifest (ImportManifest* manifest, + gboolean show_dest_id, + ImportUIQuestionParams* question); +void marker_mark (Marker* self, + DataObject* object); static ImportSource* import_page_camera_import_job_get_source (ImportPageCameraImportJob* self); GType progress_dialog_get_type (void) G_GNUC_CONST; -ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable); -ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable); -gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop); -static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self); +ProgressDialog* progress_dialog_new (GtkWindow* owner, + const gchar* text, + GCancellable* cancellable); +ProgressDialog* progress_dialog_construct (GType object_type, + GtkWindow* owner, + const gchar* text, + GCancellable* cancellable); +gboolean progress_dialog_monitor (ProgressDialog* self, + guint64 count, + guint64 total, + gboolean do_event_loop); +static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, + guint64 total, + gboolean do_event_loop, + gpointer self); void progress_dialog_close (ProgressDialog* self); -static void import_page_real_set_display_titles (CheckerboardPage* base, gboolean display); -void page_set_action_active (Page* self, const gchar* name, gboolean active); +static void import_page_real_set_display_titles (CheckerboardPage* base, + gboolean display); +void page_set_action_active (Page* self, + const gchar* name, + gboolean active); static SearchViewFilter* import_page_real_get_search_view_filter (CheckerboardPage* base); #define IMPORT_PAGE_IMPORT_VIEW_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, ImportPageImportViewManagerPrivate)) -enum { - IMPORT_PAGE_IMPORT_VIEW_MANAGER_DUMMY_PROPERTY -}; ViewManager* view_manager_construct (GType object_type); -static DataView* import_page_import_view_manager_real_create_view (ViewManager* base, DataSource* source); +static DataView* import_page_import_view_manager_real_create_view (ViewManager* base, + DataSource* source); static void import_page_import_view_manager_finalize (ViewManager * obj); gpointer backing_photo_row_ref (gpointer instance); void backing_photo_row_unref (gpointer instance); -GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_photo_row (GValue* value, gpointer v_object); -void value_take_backing_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_photo_row (GValue* value, + gpointer v_object); +void value_take_backing_photo_row (GValue* value, + gpointer v_object); gpointer value_get_backing_photo_row (const GValue* value); GType backing_photo_row_get_type (void) G_GNUC_CONST; #define IMPORT_PAGE_CAMERA_IMPORT_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJobPrivate)) -enum { - IMPORT_PAGE_CAMERA_IMPORT_JOB_DUMMY_PROPERTY -}; BatchImportJob* batch_import_job_construct (GType object_type); static DuplicatedFile* import_page_camera_import_job_real_get_duplicated_file (BatchImportJob* base); static time_t import_page_camera_import_job_real_get_exposure_time_override (BatchImportJob* base); @@ -2055,99 +2490,123 @@ static gchar* import_page_camera_import_job_real_get_dest_identifier (BatchImpor static gchar* import_page_camera_import_job_real_get_source_identifier (BatchImportJob* base); static gchar* import_page_camera_import_job_real_get_basename (BatchImportJob* base); static gchar* import_page_camera_import_job_real_get_path (BatchImportJob* base); -static void import_page_camera_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated); +static void import_page_camera_import_job_real_set_associated (BatchImportJob* base, + BatchImportJob* associated); static gboolean import_page_camera_import_job_real_is_directory (BatchImportJob* base); -static gboolean import_page_camera_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file); -static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy_to_library, GError** error); -GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata* metadata, time_t ts, gboolean* collision, GError** error); -void library_monitor_blacklist_file (GFile* file, const gchar* reason); -void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GFile* dest_file, GError** error); +static gboolean import_page_camera_import_job_real_determine_file_size (BatchImportJob* base, + guint64* filesize, + GFile* * file); +static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base, + GFile* * file_to_import, + gboolean* copy_to_library, + GError** error); +GFile* library_files_generate_unique_file (const gchar* basename, + MediaMetadata* metadata, + time_t ts, + gboolean* collision, + GError** error); +void library_monitor_blacklist_file (GFile* file, + const gchar* reason); +void gp_save_image (GPContext* context, + Camera* camera, + const gchar* folder, + const gchar* filename, + GFile* dest_file, + GError** error); void library_monitor_unblacklist_file (GFile* file); GType raw_developer_get_type (void) G_GNUC_CONST; -BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, const gchar* raw_filepath, const gchar* camera_development_filename, GError** error); +BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, + const gchar* raw_filepath, + const gchar* camera_development_filename, + GError** error); gchar* batch_import_job_get_basename (BatchImportJob* self); GType backing_photo_id_get_type (void) G_GNUC_CONST; BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self); void backing_photo_id_free (BackingPhotoID* self); static GFile* import_page_camera_import_job_real_get_associated_file (BatchImportJob* base); static void import_page_camera_import_job_finalize (BatchImportJob * obj); -enum { - IMPORT_PAGE_IMPORT_PAGE_SEARCH_VIEW_FILTER_DUMMY_PROPERTY -}; static guint import_page_import_page_search_view_filter_real_get_criteria (SearchViewFilter* base); GType search_filter_criteria_get_type (void) G_GNUC_CONST; -static gboolean import_page_import_page_search_view_filter_real_predicate (ViewFilter* base, DataView* view); +static gboolean import_page_import_page_search_view_filter_real_predicate (ViewFilter* base, + DataView* view); guint search_view_filter_get_criteria (SearchViewFilter* self); gboolean search_view_filter_filter_by_media_type (SearchViewFilter* self); gboolean search_view_filter_get_show_media_video (SearchViewFilter* self); gboolean search_view_filter_get_show_media_photos (SearchViewFilter* self); gboolean search_view_filter_get_show_media_raw (SearchViewFilter* self); const gchar* indexable_get_indexable_keywords (Indexable* self); -gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, int* result_length1); +gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, + int* result_length1); SearchViewFilter* search_view_filter_construct (GType object_type); -enum { - IMPORT_PAGE_HIDE_IMPORTED_VIEW_FILTER_DUMMY_PROPERTY -}; -static gboolean import_page_hide_imported_view_filter_real_predicate (ViewFilter* base, DataView* view); +static gboolean import_page_hide_imported_view_filter_real_predicate (ViewFilter* base, + DataView* view); ViewFilter* view_filter_construct (GType object_type); static void import_page_finalize (GObject * obj); static const GActionEntry IMPORT_PAGE_entries[3] = {{"ImportSelected", _import_page_on_import_selected_gsimple_action_activate_callback}, {"ImportAll", _import_page_on_import_all_gsimple_action_activate_callback}, {"ViewTitle", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _import_page_on_display_titles_gsimple_action_change_state_callback}}; -ImportSourceCollection* import_source_collection_construct (GType object_type, const gchar* name) { +ImportSourceCollection* +import_source_collection_construct (GType object_type, + const gchar* name) +{ ImportSourceCollection* self = NULL; - const gchar* _tmp0_; #line 8 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (name != NULL, NULL); #line 9 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = name; -#line 9 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self = (ImportSourceCollection*) source_collection_construct (object_type, _tmp0_); + self = (ImportSourceCollection*) source_collection_construct (object_type, name); #line 8 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 2108 "ImportPage.c" +#line 2559 "ImportPage.c" } -ImportSourceCollection* import_source_collection_new (const gchar* name) { +ImportSourceCollection* +import_source_collection_new (const gchar* name) +{ #line 8 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return import_source_collection_construct (TYPE_IMPORT_SOURCE_COLLECTION, name); -#line 2115 "ImportPage.c" +#line 2568 "ImportPage.c" } -static gboolean import_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) { +static gboolean +import_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source) +{ ImportSourceCollection * self; gboolean result = FALSE; - DataSource* _tmp0_; #line 12 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_SOURCE_COLLECTION, ImportSourceCollection); #line 12 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 13 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = source; -#line 13 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_IMPORT_SOURCE); + result = G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_IMPORT_SOURCE); #line 13 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2133 "ImportPage.c" +#line 2586 "ImportPage.c" } -static void import_source_collection_class_init (ImportSourceCollectionClass * klass) { +static void +import_source_collection_class_init (ImportSourceCollectionClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_source_collection_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*) (SourceCollection *, DataSource*)) import_source_collection_real_holds_type_of_source; -#line 2142 "ImportPage.c" +#line 2597 "ImportPage.c" } -static void import_source_collection_instance_init (ImportSourceCollection * self) { +static void +import_source_collection_instance_init (ImportSourceCollection * self) +{ } -GType import_source_collection_get_type (void) { +GType +import_source_collection_get_type (void) +{ static volatile gsize import_source_collection_type_id__volatile = 0; if (g_once_init_enter (&import_source_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ImportSourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) import_source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ImportSourceCollection), 0, (GInstanceInitFunc) import_source_collection_instance_init, NULL }; @@ -2159,28 +2618,31 @@ GType import_source_collection_get_type (void) { } -static gpointer _GPHOTO_REF_CAMERA0 (gpointer self) { +static gpointer +_GPHOTO_REF_CAMERA0 (gpointer self) +{ #line 31 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self ? GPHOTO_REF_CAMERA (self) : NULL; -#line 2165 "ImportPage.c" +#line 2626 "ImportPage.c" } -ImportSource* import_source_construct (GType object_type, const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time) { +ImportSource* +import_source_construct (GType object_type, + const gchar* camera_name, + Camera* camera, + gint fsid, + const gchar* folder, + const gchar* filename, + gulong file_size, + time_t modification_time) +{ ImportSource * self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - Camera* _tmp2_; - Camera* _tmp3_; - gint _tmp4_; - const gchar* _tmp5_; - gchar* _tmp6_; - const gchar* _tmp7_; - gchar* _tmp8_; - gulong _tmp9_; - time_t _tmp10_; - const gchar* _tmp11_; - gchar* _tmp12_; + gchar* _tmp0_; + Camera* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 28 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (camera_name != NULL, NULL); #line 28 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -2192,90 +2654,78 @@ ImportSource* import_source_construct (GType object_type, const gchar* camera_na #line 28 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = (ImportSource*) thumbnail_source_construct (object_type, DATA_OBJECT_INVALID_OBJECT_ID); #line 30 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = camera_name; -#line 30 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (camera_name); #line 30 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->camera_name); #line 30 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->camera_name = _tmp1_; -#line 31 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = camera; + self->priv->camera_name = _tmp0_; #line 31 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = _GPHOTO_REF_CAMERA0 (_tmp2_); + _tmp1_ = _GPHOTO_REF_CAMERA0 (camera); #line 31 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_camera_unref0 (self->priv->camera); #line 31 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->camera = _tmp3_; -#line 32 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = fsid; + self->priv->camera = _tmp1_; #line 32 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->fsid = _tmp4_; -#line 33 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = folder; + self->priv->fsid = fsid; #line 33 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = g_strdup (_tmp5_); + _tmp2_ = g_strdup (folder); #line 33 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->folder); #line 33 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->folder = _tmp6_; + self->priv->folder = _tmp2_; #line 34 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = filename; -#line 34 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = g_strdup (_tmp7_); + _tmp3_ = g_strdup (filename); #line 34 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->filename); #line 34 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->filename = _tmp8_; -#line 35 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = file_size; + self->priv->filename = _tmp3_; #line 35 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->file_size = _tmp9_; + self->priv->file_size = file_size; #line 36 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = modification_time; -#line 36 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->modification_time = _tmp10_; -#line 37 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = filename; + self->priv->modification_time = modification_time; #line 37 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = indexable_prepare_indexable_string (_tmp11_); + _tmp4_ = indexable_prepare_indexable_string (filename); #line 37 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->indexable_keywords); #line 37 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->indexable_keywords = _tmp12_; + self->priv->indexable_keywords = _tmp4_; #line 28 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 2248 "ImportPage.c" +#line 2694 "ImportPage.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 41 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self ? g_object_ref (self) : NULL; -#line 2255 "ImportPage.c" +#line 2703 "ImportPage.c" } -void import_source_set_preview (ImportSource* self, GdkPixbuf* preview) { +void +import_source_set_preview (ImportSource* self, + GdkPixbuf* preview) +{ GdkPixbuf* _tmp0_; - GdkPixbuf* _tmp1_; #line 40 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_SOURCE (self)); #line 40 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail ((preview == NULL) || GDK_IS_PIXBUF (preview)); #line 41 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = preview; -#line 41 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (preview); #line 41 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->preview); #line 41 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->preview = _tmp1_; -#line 2274 "ImportPage.c" + self->priv->preview = _tmp0_; +#line 2722 "ImportPage.c" } -gchar* import_source_get_camera_name (ImportSource* self) { +gchar* +import_source_get_camera_name (ImportSource* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -2289,11 +2739,13 @@ gchar* import_source_get_camera_name (ImportSource* self) { result = _tmp1_; #line 45 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2292 "ImportPage.c" +#line 2742 "ImportPage.c" } -Camera* import_source_get_camera (ImportSource* self) { +Camera* +import_source_get_camera (ImportSource* self) +{ Camera* result = NULL; Camera* _tmp0_; Camera* _tmp1_; @@ -2307,11 +2759,13 @@ Camera* import_source_get_camera (ImportSource* self) { result = _tmp1_; #line 49 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2310 "ImportPage.c" +#line 2762 "ImportPage.c" } -gint import_source_get_fsid (ImportSource* self) { +gint +import_source_get_fsid (ImportSource* self) +{ gint result = 0; gint _tmp0_; #line 52 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -2322,11 +2776,13 @@ gint import_source_get_fsid (ImportSource* self) { result = _tmp0_; #line 53 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2325 "ImportPage.c" +#line 2779 "ImportPage.c" } -gchar* import_source_get_folder (ImportSource* self) { +gchar* +import_source_get_folder (ImportSource* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -2340,11 +2796,13 @@ gchar* import_source_get_folder (ImportSource* self) { result = _tmp1_; #line 57 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2343 "ImportPage.c" +#line 2799 "ImportPage.c" } -gchar* import_source_get_filename (ImportSource* self) { +gchar* +import_source_get_filename (ImportSource* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -2358,11 +2816,13 @@ gchar* import_source_get_filename (ImportSource* self) { result = _tmp1_; #line 61 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2361 "ImportPage.c" +#line 2819 "ImportPage.c" } -gulong import_source_get_filesize (ImportSource* self) { +gulong +import_source_get_filesize (ImportSource* self) +{ gulong result = 0UL; gulong _tmp0_; #line 64 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -2373,11 +2833,13 @@ gulong import_source_get_filesize (ImportSource* self) { result = _tmp0_; #line 65 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2376 "ImportPage.c" +#line 2836 "ImportPage.c" } -time_t import_source_get_modification_time (ImportSource* self) { +time_t +import_source_get_modification_time (ImportSource* self) +{ time_t result = 0; time_t _tmp0_; #line 68 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -2388,11 +2850,13 @@ time_t import_source_get_modification_time (ImportSource* self) { result = _tmp0_; #line 69 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2391 "ImportPage.c" +#line 2853 "ImportPage.c" } -static GdkPixbuf* import_source_real_get_preview (ImportSource* self) { +static GdkPixbuf* +import_source_real_get_preview (ImportSource* self) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_; GdkPixbuf* _tmp1_; @@ -2404,52 +2868,56 @@ static GdkPixbuf* import_source_real_get_preview (ImportSource* self) { result = _tmp1_; #line 73 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2407 "ImportPage.c" +#line 2871 "ImportPage.c" } -GdkPixbuf* import_source_get_preview (ImportSource* self) { +GdkPixbuf* +import_source_get_preview (ImportSource* self) +{ #line 72 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_SOURCE (self), NULL); #line 72 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return IMPORT_SOURCE_GET_CLASS (self)->get_preview (self); -#line 2416 "ImportPage.c" +#line 2882 "ImportPage.c" } -static time_t import_source_real_get_exposure_time (ImportSource* self) { +static time_t +import_source_real_get_exposure_time (ImportSource* self) +{ time_t result = 0; - time_t _tmp0_; -#line 77 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = import_source_get_modification_time (self); #line 77 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp0_; + result = import_source_get_modification_time (self); #line 77 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2429 "ImportPage.c" +#line 2894 "ImportPage.c" } -time_t import_source_get_exposure_time (ImportSource* self) { +time_t +import_source_get_exposure_time (ImportSource* self) +{ #line 76 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_SOURCE (self), 0); #line 76 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return IMPORT_SOURCE_GET_CLASS (self)->get_exposure_time (self); -#line 2438 "ImportPage.c" +#line 2905 "ImportPage.c" } -gchar* import_source_get_fulldir (ImportSource* self) { +gchar* +import_source_get_fulldir (ImportSource* self) +{ gchar* result = NULL; Camera* _tmp0_; Camera* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gint _tmp4_; + gchar* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; - gchar* _tmp8_; #line 80 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_SOURCE (self), NULL); #line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -2461,30 +2929,30 @@ gchar* import_source_get_fulldir (ImportSource* self) { #line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = _tmp2_; #line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = import_source_get_fsid (self); + _tmp4_ = import_source_get_folder (self); #line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = import_source_get_folder (self); -#line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = import_page_get_fulldir (_tmp1_, _tmp3_, _tmp4_, _tmp6_); + _tmp6_ = import_page_get_fulldir (_tmp1_, _tmp3_, import_source_get_fsid (self), _tmp5_); #line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp3_); #line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_camera_unref0 (_tmp1_); #line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp8_; + result = _tmp7_; #line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2483 "ImportPage.c" +#line 2949 "ImportPage.c" } -static gchar* import_source_real_to_string (DataObject* base) { +static gchar* +import_source_real_to_string (DataObject* base) +{ ImportSource * self; gchar* result = NULL; gchar* _tmp0_; @@ -2523,11 +2991,13 @@ static gchar* import_source_real_to_string (DataObject* base) { result = _tmp7_; #line 85 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2526 "ImportPage.c" +#line 2994 "ImportPage.c" } -static gchar* gp_result_to_full_string (int self) { +static gchar* +gp_result_to_full_string (int self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -2539,11 +3009,14 @@ static gchar* gp_result_to_full_string (int self) { result = _tmp1_; #line 482 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi" return result; -#line 2542 "ImportPage.c" +#line 3012 "ImportPage.c" } -static gboolean import_source_real_internal_delete_backing (DataSource* base, GError** error) { +static gboolean +import_source_real_internal_delete_backing (DataSource* base, + GError** error) +{ ImportSource * self; gboolean result = FALSE; gchar* _tmp0_; @@ -2553,19 +3026,17 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE gchar* _tmp3_; const gchar* _tmp4_; int _result_ = 0; + Camera* _tmp10_; Camera* _tmp11_; - Camera* _tmp12_; - const gchar* _tmp13_; + const gchar* _tmp12_; + gchar* _tmp13_; gchar* _tmp14_; - gchar* _tmp15_; - GPSpinIdleWrapper* _tmp16_; - GPContext* _tmp17_; + GPSpinIdleWrapper* _tmp15_; + GPContext* _tmp16_; + int _tmp17_; int _tmp18_; - int _tmp19_; - int _tmp20_; - gboolean _tmp27_ = FALSE; - gboolean _tmp28_ = FALSE; - gboolean _tmp29_; + gboolean _tmp25_ = FALSE; + gboolean _tmp26_ = FALSE; GError * _inner_error_ = NULL; #line 88 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_SOURCE, ImportSource); @@ -2587,12 +3058,11 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE _tmp4_ = fulldir; #line 92 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp4_ == NULL) { -#line 2590 "ImportPage.c" +#line 3061 "ImportPage.c" gchar* _tmp5_; gchar* _tmp6_; const gchar* _tmp7_; gboolean _tmp8_ = FALSE; - gboolean _tmp9_; #line 93 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 93 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -2604,20 +3074,18 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE #line 93 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp6_); #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = DATA_SOURCE_CLASS (import_source_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_); -#line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = _tmp9_; + _tmp8_ = DATA_SOURCE_CLASS (import_source_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_); #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2612 "ImportPage.c" - gboolean _tmp10_ = FALSE; +#line 3080 "ImportPage.c" + gboolean _tmp9_ = FALSE; #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_propagate_error (error, _inner_error_); #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - return _tmp10_; -#line 2620 "ImportPage.c" + return _tmp9_; +#line 3088 "ImportPage.c" } #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp8_; @@ -2625,104 +3093,102 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE _g_free0 (fulldir); #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2628 "ImportPage.c" +#line 3096 "ImportPage.c" } #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = import_source_get_camera (self); -#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = _tmp11_; + _tmp10_ = import_source_get_camera (self); #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = fulldir; + _tmp11_ = _tmp10_; #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = import_source_get_filename (self); + _tmp12_ = fulldir; #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp15_ = _tmp14_; + _tmp13_ = import_source_get_filename (self); #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp16_ = import_page_spin_idle_context; + _tmp14_ = _tmp13_; #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; + _tmp15_ = import_page_spin_idle_context; #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp18_ = gp_camera_file_delete (_tmp12_, _tmp13_, _tmp15_, _tmp17_); + _tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp19_ = _tmp18_; + _tmp17_ = gp_camera_file_delete (_tmp11_, _tmp12_, _tmp14_, _tmp16_); #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp14_); #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _gp_camera_unref0 (_tmp12_); + _gp_camera_unref0 (_tmp11_); #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _result_ = _tmp19_; + _result_ = _tmp17_; #line 100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp20_ = _result_; + _tmp18_ = _result_; #line 100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp20_ != GP_OK) { -#line 2658 "ImportPage.c" - gchar* _tmp21_; - gchar* _tmp22_; - const gchar* _tmp23_; - int _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; + if (_tmp18_ != GP_OK) { +#line 3124 "ImportPage.c" + gchar* _tmp19_; + gchar* _tmp20_; + const gchar* _tmp21_; + int _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp21_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp19_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp22_ = _tmp21_; + _tmp20_ = _tmp19_; #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp23_ = self->priv->camera_name; + _tmp21_ = self->priv->camera_name; #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp24_ = _result_; + _tmp22_ = _result_; #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp25_ = gp_result_to_full_string (_tmp24_); + _tmp23_ = gp_result_to_full_string (_tmp22_); #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp26_ = _tmp25_; + _tmp24_ = _tmp23_; #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:101: Error deleting %s from %s: %s", _tmp22_, _tmp23_, _tmp26_); + g_warning ("ImportPage.vala:101: Error deleting %s from %s: %s", _tmp20_, _tmp21_, _tmp24_); #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp24_); #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp22_); -#line 2683 "ImportPage.c" + _g_free0 (_tmp20_); +#line 3149 "ImportPage.c" } #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp29_ = DATA_SOURCE_CLASS (import_source_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_); -#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp28_ = _tmp29_; + _tmp26_ = DATA_SOURCE_CLASS (import_source_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_); #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2691 "ImportPage.c" - gboolean _tmp30_ = FALSE; +#line 3155 "ImportPage.c" + gboolean _tmp27_ = FALSE; #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_propagate_error (error, _inner_error_); #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - return _tmp30_; -#line 2699 "ImportPage.c" + return _tmp27_; +#line 3163 "ImportPage.c" } #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp28_) { -#line 2703 "ImportPage.c" - int _tmp31_; + if (_tmp26_) { +#line 3167 "ImportPage.c" + int _tmp28_; #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp31_ = _result_; + _tmp28_ = _result_; #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp27_ = _tmp31_ == GP_OK; -#line 2709 "ImportPage.c" + _tmp25_ = _tmp28_ == GP_OK; +#line 3173 "ImportPage.c" } else { #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp27_ = FALSE; -#line 2713 "ImportPage.c" + _tmp25_ = FALSE; +#line 3177 "ImportPage.c" } #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp27_; + result = _tmp25_; #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2721 "ImportPage.c" +#line 3185 "ImportPage.c" } -static const gchar* import_source_real_get_indexable_keywords (Indexable* base) { +static const gchar* +import_source_real_get_indexable_keywords (Indexable* base) +{ ImportSource * self; const gchar* result = NULL; const gchar* _tmp0_; @@ -2734,11 +3200,13 @@ static const gchar* import_source_real_get_indexable_keywords (Indexable* base) result = _tmp0_; #line 107 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2737 "ImportPage.c" +#line 3203 "ImportPage.c" } -static void import_source_class_init (ImportSourceClass * klass) { +static void +import_source_class_init (ImportSourceClass * klass) +{ #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_source_parent_class = g_type_class_peek_parent (klass); #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -2753,31 +3221,37 @@ static void import_source_class_init (ImportSourceClass * klass) { ((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) import_source_real_internal_delete_backing; #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (klass)->finalize = import_source_finalize; -#line 2756 "ImportPage.c" +#line 3224 "ImportPage.c" } -static void import_source_indexable_interface_init (IndexableIface * iface) { +static void +import_source_indexable_interface_init (IndexableIface * iface) +{ #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_source_indexable_parent_iface = g_type_interface_peek_parent (iface); #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" iface->get_indexable_keywords = (const gchar* (*) (Indexable *)) import_source_real_get_indexable_keywords; -#line 2765 "ImportPage.c" +#line 3235 "ImportPage.c" } -static void import_source_instance_init (ImportSource * self) { +static void +import_source_instance_init (ImportSource * self) +{ #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv = IMPORT_SOURCE_GET_PRIVATE (self); #line 25 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->preview = NULL; #line 26 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->indexable_keywords = NULL; -#line 2776 "ImportPage.c" +#line 3248 "ImportPage.c" } -static void import_source_finalize (GObject * obj) { +static void +import_source_finalize (GObject * obj) +{ ImportSource * self; #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_SOURCE, ImportSource); @@ -2795,11 +3269,13 @@ static void import_source_finalize (GObject * obj) { _g_free0 (self->priv->indexable_keywords); #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (import_source_parent_class)->finalize (obj); -#line 2798 "ImportPage.c" +#line 3272 "ImportPage.c" } -GType import_source_get_type (void) { +GType +import_source_get_type (void) +{ static volatile gsize import_source_type_id__volatile = 0; if (g_once_init_enter (&import_source_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ImportSourceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) import_source_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ImportSource), 0, (GInstanceInitFunc) import_source_instance_init, NULL }; @@ -2813,15 +3289,17 @@ GType import_source_get_type (void) { } -VideoImportSource* video_import_source_construct (GType object_type, const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time) { +VideoImportSource* +video_import_source_construct (GType object_type, + const gchar* camera_name, + Camera* camera, + gint fsid, + const gchar* folder, + const gchar* filename, + gulong file_size, + time_t modification_time) +{ VideoImportSource * self = NULL; - const gchar* _tmp0_; - Camera* _tmp1_; - gint _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - gulong _tmp5_; - time_t _tmp6_; #line 112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (camera_name != NULL, NULL); #line 112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -2831,80 +3309,78 @@ VideoImportSource* video_import_source_construct (GType object_type, const gchar #line 112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (filename != NULL, NULL); #line 114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = camera_name; -#line 114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = camera; -#line 114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = fsid; -#line 114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = folder; -#line 114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = filename; -#line 114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = file_size; -#line 114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = modification_time; -#line 114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self = (VideoImportSource*) import_source_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_); + self = (VideoImportSource*) import_source_construct (object_type, camera_name, camera, fsid, folder, filename, file_size, modification_time); #line 112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 2851 "ImportPage.c" +#line 3315 "ImportPage.c" } -VideoImportSource* video_import_source_new (const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time) { +VideoImportSource* +video_import_source_new (const gchar* camera_name, + Camera* camera, + gint fsid, + const gchar* folder, + const gchar* filename, + gulong file_size, + time_t modification_time) +{ #line 112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return video_import_source_construct (TYPE_VIDEO_IMPORT_SOURCE, camera_name, camera, fsid, folder, filename, file_size, modification_time); -#line 2858 "ImportPage.c" +#line 3330 "ImportPage.c" } -static GdkPixbuf* video_import_source_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error) { +static GdkPixbuf* +video_import_source_real_get_thumbnail (ThumbnailSource* base, + gint scale, + GError** error) +{ VideoImportSource * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; - gint _tmp1_; + GdkPixbuf* _tmp1_; GdkPixbuf* _tmp2_; - GdkPixbuf* _tmp3_; GError * _inner_error_ = NULL; #line 117 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource); #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = scale; -#line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = thumbnail_source_create_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_); + _tmp1_ = thumbnail_source_create_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), scale, &_inner_error_); #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = _tmp2_; + _tmp0_ = _tmp1_; #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_propagate_error (error, _inner_error_); #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return NULL; -#line 2884 "ImportPage.c" +#line 3357 "ImportPage.c" } #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = _tmp0_; + _tmp2_ = _tmp0_; #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = NULL; #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp3_; + result = _tmp2_; #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp0_); #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2896 "ImportPage.c" +#line 3369 "ImportPage.c" } -static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error) { +static GdkPixbuf* +video_import_source_real_create_thumbnail (ThumbnailSource* base, + gint scale, + GError** error) +{ VideoImportSource * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_; GdkPixbuf* _tmp1_; gboolean _tmp2_; GdkPixbuf* _tmp3_ = NULL; - gint _tmp4_; #line 121 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource); #line 122 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -2921,51 +3397,48 @@ static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* ba result = NULL; #line 123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2924 "ImportPage.c" +#line 3400 "ImportPage.c" } #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = scale; -#line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp4_ > 0) { -#line 2930 "ImportPage.c" + if (scale > 0) { +#line 3404 "ImportPage.c" + GdkPixbuf* _tmp4_; GdkPixbuf* _tmp5_; GdkPixbuf* _tmp6_; - gint _tmp7_; - GdkPixbuf* _tmp8_; -#line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = _tmp5_; + _tmp4_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = scale; + _tmp5_ = _tmp4_; #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = scale_pixbuf (_tmp6_, _tmp7_, GDK_INTERP_BILINEAR, TRUE); + _tmp6_ = scale_pixbuf (_tmp5_, scale, GDK_INTERP_BILINEAR, TRUE); #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp3_); #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = _tmp8_; + _tmp3_ = _tmp6_; #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp6_); -#line 2949 "ImportPage.c" + _g_object_unref0 (_tmp5_); +#line 3420 "ImportPage.c" } else { - GdkPixbuf* _tmp9_; + GdkPixbuf* _tmp7_; #line 128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp7_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); #line 128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp3_); #line 128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = _tmp9_; -#line 2958 "ImportPage.c" + _tmp3_ = _tmp7_; +#line 3429 "ImportPage.c" } #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp3_; #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2964 "ImportPage.c" +#line 3435 "ImportPage.c" } -static gchar* video_import_source_real_get_typename (DataSource* base) { +static gchar* +video_import_source_real_get_typename (DataSource* base) +{ VideoImportSource * self; gchar* result = NULL; gchar* _tmp0_; @@ -2977,43 +3450,43 @@ static gchar* video_import_source_real_get_typename (DataSource* base) { result = _tmp0_; #line 132 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2980 "ImportPage.c" +#line 3453 "ImportPage.c" } -static gint64 video_import_source_real_get_instance_id (DataSource* base) { +static gint64 +video_import_source_real_get_instance_id (DataSource* base) +{ VideoImportSource * self; gint64 result = 0LL; - gint64 _tmp0_; #line 135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource); #line 136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp0_; + result = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 2996 "ImportPage.c" +#line 3468 "ImportPage.c" } -static PhotoFileFormat video_import_source_real_get_preferred_thumbnail_format (ThumbnailSource* base) { +static PhotoFileFormat +video_import_source_real_get_preferred_thumbnail_format (ThumbnailSource* base) +{ VideoImportSource * self; PhotoFileFormat result = 0; - PhotoFileFormat _tmp0_; #line 139 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource); #line 140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = photo_file_format_get_system_default_format (); -#line 140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp0_; + result = photo_file_format_get_system_default_format (); #line 140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3012 "ImportPage.c" +#line 3483 "ImportPage.c" } -static gchar* video_import_source_real_get_name (DataObject* base) { +static gchar* +video_import_source_real_get_name (DataObject* base) +{ VideoImportSource * self; gchar* result = NULL; gchar* _tmp0_; @@ -3025,52 +3498,51 @@ static gchar* video_import_source_real_get_name (DataObject* base) { result = _tmp0_; #line 144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3028 "ImportPage.c" +#line 3501 "ImportPage.c" } -void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview) { +void +video_import_source_update (VideoImportSource* self, + GdkPixbuf* preview) +{ GdkPixbuf* _tmp0_ = NULL; - GdkPixbuf* _tmp1_; #line 147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_VIDEO_IMPORT_SOURCE (self)); #line 147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail ((preview == NULL) || GDK_IS_PIXBUF (preview)); #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = preview; -#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp1_ != NULL) { -#line 3043 "ImportPage.c" - GdkPixbuf* _tmp2_; - GdkPixbuf* _tmp3_; -#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = preview; + if (preview != NULL) { +#line 3516 "ImportPage.c" + GdkPixbuf* _tmp1_; #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (preview); #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp0_); #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = _tmp3_; -#line 3054 "ImportPage.c" + _tmp0_ = _tmp1_; +#line 3524 "ImportPage.c" } else { - GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp2_; #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = resources_get_noninterpretable_badge_pixbuf (); + _tmp2_ = resources_get_noninterpretable_badge_pixbuf (); #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp0_); #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = _tmp4_; -#line 3063 "ImportPage.c" + _tmp0_ = _tmp2_; +#line 3533 "ImportPage.c" } #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_source_set_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource), _tmp0_); #line 147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp0_); -#line 3069 "ImportPage.c" +#line 3539 "ImportPage.c" } -static void video_import_source_class_init (VideoImportSourceClass * klass) { +static void +video_import_source_class_init (VideoImportSourceClass * klass) +{ #line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" video_import_source_parent_class = g_type_class_peek_parent (klass); #line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3085,15 +3557,19 @@ static void video_import_source_class_init (VideoImportSourceClass * klass) { ((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*) (ThumbnailSource *)) video_import_source_real_get_preferred_thumbnail_format; #line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) video_import_source_real_get_name; -#line 3088 "ImportPage.c" +#line 3560 "ImportPage.c" } -static void video_import_source_instance_init (VideoImportSource * self) { +static void +video_import_source_instance_init (VideoImportSource * self) +{ } -GType video_import_source_get_type (void) { +GType +video_import_source_get_type (void) +{ static volatile gsize video_import_source_type_id__volatile = 0; if (g_once_init_enter (&video_import_source_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (VideoImportSourceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) video_import_source_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (VideoImportSource), 0, (GInstanceInitFunc) video_import_source_instance_init, NULL }; @@ -3105,16 +3581,18 @@ GType video_import_source_get_type (void) { } -PhotoImportSource* photo_import_source_construct (GType object_type, const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time, PhotoFileFormat file_format) { +PhotoImportSource* +photo_import_source_construct (GType object_type, + const gchar* camera_name, + Camera* camera, + gint fsid, + const gchar* folder, + const gchar* filename, + gulong file_size, + time_t modification_time, + PhotoFileFormat file_format) +{ PhotoImportSource * self = NULL; - const gchar* _tmp0_; - Camera* _tmp1_; - gint _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - gulong _tmp5_; - time_t _tmp6_; - PhotoFileFormat _tmp7_; #line 161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (camera_name != NULL, NULL); #line 161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3124,46 +3602,40 @@ PhotoImportSource* photo_import_source_construct (GType object_type, const gchar #line 161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (filename != NULL, NULL); #line 163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = camera_name; -#line 163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = camera; -#line 163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = fsid; -#line 163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = folder; -#line 163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = filename; -#line 163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = file_size; -#line 163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = modification_time; -#line 163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self = (PhotoImportSource*) import_source_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_); + self = (PhotoImportSource*) import_source_construct (object_type, camera_name, camera, fsid, folder, filename, file_size, modification_time); #line 164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = file_format; -#line 164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->file_format = _tmp7_; + self->priv->file_format = file_format; #line 161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 3148 "ImportPage.c" +#line 3610 "ImportPage.c" } -PhotoImportSource* photo_import_source_new (const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time, PhotoFileFormat file_format) { +PhotoImportSource* +photo_import_source_new (const gchar* camera_name, + Camera* camera, + gint fsid, + const gchar* folder, + const gchar* filename, + gulong file_size, + time_t modification_time, + PhotoFileFormat file_format) +{ #line 161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return photo_import_source_construct (TYPE_PHOTO_IMPORT_SOURCE, camera_name, camera, fsid, folder, filename, file_size, modification_time, file_format); -#line 3155 "ImportPage.c" +#line 3626 "ImportPage.c" } -static gchar* photo_import_source_real_get_name (DataObject* base) { +static gchar* +photo_import_source_real_get_name (DataObject* base) +{ PhotoImportSource * self; gchar* result = NULL; gchar* title = NULL; gchar* _tmp0_; gchar* _tmp1_ = NULL; const gchar* _tmp2_; - gboolean _tmp3_; #line 167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource); #line 168 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3173,30 +3645,28 @@ static gchar* photo_import_source_real_get_name (DataObject* base) { #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = title; #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = is_string_empty (_tmp2_); -#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp3_) { -#line 3179 "ImportPage.c" - const gchar* _tmp4_; - gchar* _tmp5_; + if (!is_string_empty (_tmp2_)) { +#line 3649 "ImportPage.c" + const gchar* _tmp3_; + gchar* _tmp4_; #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = title; + _tmp3_ = title; #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = g_strdup (_tmp4_); + _tmp4_ = g_strdup (_tmp3_); #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp1_); #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = _tmp5_; -#line 3190 "ImportPage.c" + _tmp1_ = _tmp4_; +#line 3660 "ImportPage.c" } else { - gchar* _tmp6_; + gchar* _tmp5_; #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp5_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp1_); #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = _tmp6_; -#line 3199 "ImportPage.c" + _tmp1_ = _tmp5_; +#line 3669 "ImportPage.c" } #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp1_; @@ -3204,11 +3674,13 @@ static gchar* photo_import_source_real_get_name (DataObject* base) { _g_free0 (title); #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3207 "ImportPage.c" +#line 3677 "ImportPage.c" } -static gchar* photo_import_source_real_get_typename (DataSource* base) { +static gchar* +photo_import_source_real_get_typename (DataSource* base) +{ PhotoImportSource * self; gchar* result = NULL; gchar* _tmp0_; @@ -3220,71 +3692,69 @@ static gchar* photo_import_source_real_get_typename (DataSource* base) { result = _tmp0_; #line 174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3223 "ImportPage.c" +#line 3695 "ImportPage.c" } -static gint64 photo_import_source_real_get_instance_id (DataSource* base) { +static gint64 +photo_import_source_real_get_instance_id (DataSource* base) +{ PhotoImportSource * self; gint64 result = 0LL; - gint64 _tmp0_; #line 177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource); #line 178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp0_; + result = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3239 "ImportPage.c" +#line 3710 "ImportPage.c" } -static PhotoFileFormat photo_import_source_real_get_preferred_thumbnail_format (ThumbnailSource* base) { +static PhotoFileFormat +photo_import_source_real_get_preferred_thumbnail_format (ThumbnailSource* base) +{ PhotoImportSource * self; PhotoFileFormat result = 0; PhotoFileFormat _tmp0_ = 0; PhotoFileFormat _tmp1_; - gboolean _tmp2_; #line 181 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource); #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = self->priv->file_format; #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = photo_file_format_can_write (_tmp1_); -#line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp2_) { -#line 3257 "ImportPage.c" - PhotoFileFormat _tmp3_; + if (photo_file_format_can_write (_tmp1_)) { +#line 3727 "ImportPage.c" + PhotoFileFormat _tmp2_; #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = self->priv->file_format; + _tmp2_ = self->priv->file_format; #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = _tmp3_; -#line 3263 "ImportPage.c" + _tmp0_ = _tmp2_; +#line 3733 "ImportPage.c" } else { - PhotoFileFormat _tmp4_; #line 183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = photo_file_format_get_system_default_format (); -#line 183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = _tmp4_; -#line 3270 "ImportPage.c" + _tmp0_ = photo_file_format_get_system_default_format (); +#line 3737 "ImportPage.c" } #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp0_; #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3276 "ImportPage.c" +#line 3743 "ImportPage.c" } -static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error) { +static GdkPixbuf* +photo_import_source_real_create_thumbnail (ThumbnailSource* base, + gint scale, + GError** error) +{ PhotoImportSource * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_; GdkPixbuf* _tmp1_; gboolean _tmp2_; GdkPixbuf* _tmp3_ = NULL; - gint _tmp4_; #line 186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource); #line 187 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3301,65 +3771,64 @@ static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* ba result = NULL; #line 188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3304 "ImportPage.c" +#line 3774 "ImportPage.c" } #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = scale; -#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp4_ > 0) { -#line 3310 "ImportPage.c" + if (scale > 0) { +#line 3778 "ImportPage.c" + GdkPixbuf* _tmp4_; GdkPixbuf* _tmp5_; GdkPixbuf* _tmp6_; - gint _tmp7_; - GdkPixbuf* _tmp8_; #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp4_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = _tmp5_; -#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = scale; + _tmp5_ = _tmp4_; #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = scale_pixbuf (_tmp6_, _tmp7_, PHOTO_IMPORT_SOURCE_INTERP, TRUE); + _tmp6_ = scale_pixbuf (_tmp5_, scale, PHOTO_IMPORT_SOURCE_INTERP, TRUE); #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp3_); #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = _tmp8_; + _tmp3_ = _tmp6_; #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp6_); -#line 3329 "ImportPage.c" + _g_object_unref0 (_tmp5_); +#line 3794 "ImportPage.c" } else { - GdkPixbuf* _tmp9_; + GdkPixbuf* _tmp7_; #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp7_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp3_); #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = _tmp9_; -#line 3338 "ImportPage.c" + _tmp3_ = _tmp7_; +#line 3803 "ImportPage.c" } #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp3_; #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3344 "ImportPage.c" +#line 3809 "ImportPage.c" } -static gpointer _media_metadata_ref0 (gpointer self) { +static gpointer +_media_metadata_ref0 (gpointer self) +{ #line 199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self ? media_metadata_ref (self) : NULL; -#line 3351 "ImportPage.c" +#line 3818 "ImportPage.c" } -void photo_import_source_update (PhotoImportSource* self, GdkPixbuf* preview, const gchar* preview_md5, PhotoMetadata* metadata, const gchar* exif_md5) { - GdkPixbuf* _tmp0_; - const gchar* _tmp1_; +void +photo_import_source_update (PhotoImportSource* self, + GdkPixbuf* preview, + const gchar* preview_md5, + PhotoMetadata* metadata, + const gchar* exif_md5) +{ + gchar* _tmp0_; + PhotoMetadata* _tmp1_; gchar* _tmp2_; - PhotoMetadata* _tmp3_; - PhotoMetadata* _tmp4_; - const gchar* _tmp5_; - gchar* _tmp6_; #line 196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_PHOTO_IMPORT_SOURCE (self)); #line 196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3367,101 +3836,87 @@ void photo_import_source_update (PhotoImportSource* self, GdkPixbuf* preview, co #line 196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = preview; -#line 197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_source_set_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource), _tmp0_); -#line 198 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = preview_md5; + import_source_set_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource), preview); #line 198 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp0_ = g_strdup (preview_md5); #line 198 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->preview_md5); #line 198 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->preview_md5 = _tmp2_; + self->priv->preview_md5 = _tmp0_; #line 199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = metadata; -#line 199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = _media_metadata_ref0 (_tmp3_); + _tmp1_ = _media_metadata_ref0 (metadata); #line 199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (self->priv->metadata); #line 199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->metadata = _tmp4_; + self->priv->metadata = _tmp1_; #line 200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = exif_md5; -#line 200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = g_strdup (_tmp5_); + _tmp2_ = g_strdup (exif_md5); #line 200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->exif_md5); #line 200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->exif_md5 = _tmp6_; -#line 3397 "ImportPage.c" + self->priv->exif_md5 = _tmp2_; +#line 3858 "ImportPage.c" } -static time_t photo_import_source_real_get_exposure_time (ImportSource* base) { +static time_t +photo_import_source_real_get_exposure_time (ImportSource* base) +{ PhotoImportSource * self; time_t result = 0; PhotoMetadata* _tmp0_; MetadataDateTime* date_time = NULL; - PhotoMetadata* _tmp2_; - MetadataDateTime* _tmp3_; - time_t _tmp4_ = 0; - MetadataDateTime* _tmp5_; + PhotoMetadata* _tmp1_; + MetadataDateTime* _tmp2_; + time_t _tmp3_ = 0; + MetadataDateTime* _tmp4_; #line 203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource); #line 204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->metadata; #line 204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_ == NULL) { -#line 3416 "ImportPage.c" - time_t _tmp1_; #line 205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = import_source_get_modification_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); -#line 205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp1_; + result = import_source_get_modification_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); #line 205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3424 "ImportPage.c" +#line 3883 "ImportPage.c" } #line 207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = self->priv->metadata; + _tmp1_ = self->priv->metadata; #line 207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = photo_metadata_get_exposure_date_time (_tmp2_); + _tmp2_ = photo_metadata_get_exposure_date_time (_tmp1_); #line 207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - date_time = _tmp3_; + date_time = _tmp2_; #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = date_time; + _tmp4_ = date_time; #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp5_ != NULL) { -#line 3436 "ImportPage.c" - MetadataDateTime* _tmp6_; - time_t _tmp7_; -#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = date_time; + if (_tmp4_ != NULL) { +#line 3895 "ImportPage.c" + MetadataDateTime* _tmp5_; #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = metadata_date_time_get_timestamp (_tmp6_); + _tmp5_ = date_time; #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = _tmp7_; -#line 3445 "ImportPage.c" + _tmp3_ = metadata_date_time_get_timestamp (_tmp5_); +#line 3901 "ImportPage.c" } else { - time_t _tmp8_; #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = import_source_get_modification_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); -#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = _tmp8_; -#line 3452 "ImportPage.c" + _tmp3_ = import_source_get_modification_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); +#line 3905 "ImportPage.c" } #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp4_; + result = _tmp3_; #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _metadata_date_time_unref0 (date_time); #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3460 "ImportPage.c" +#line 3913 "ImportPage.c" } -gchar* photo_import_source_get_title (PhotoImportSource* self) { +gchar* +photo_import_source_get_title (PhotoImportSource* self) +{ gchar* result = NULL; gchar* _tmp0_ = NULL; PhotoMetadata* _tmp1_; @@ -3471,7 +3926,7 @@ gchar* photo_import_source_get_title (PhotoImportSource* self) { _tmp1_ = self->priv->metadata; #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp1_ != NULL) { -#line 3474 "ImportPage.c" +#line 3929 "ImportPage.c" PhotoMetadata* _tmp2_; gchar* _tmp3_; #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3482,23 +3937,25 @@ gchar* photo_import_source_get_title (PhotoImportSource* self) { _g_free0 (_tmp0_); #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = _tmp3_; -#line 3485 "ImportPage.c" +#line 3940 "ImportPage.c" } else { #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp0_); #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = NULL; -#line 3491 "ImportPage.c" +#line 3946 "ImportPage.c" } #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp0_; #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3497 "ImportPage.c" +#line 3952 "ImportPage.c" } -PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) { +PhotoMetadata* +photo_import_source_get_metadata (PhotoImportSource* self) +{ PhotoMetadata* result = NULL; PhotoImportSource* _tmp0_; PhotoMetadata* _tmp3_; @@ -3509,7 +3966,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) { _tmp0_ = self->priv->associated; #line 217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_ != NULL) { -#line 3512 "ImportPage.c" +#line 3969 "ImportPage.c" PhotoImportSource* _tmp1_; PhotoMetadata* _tmp2_; #line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3520,7 +3977,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) { result = _tmp2_; #line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3523 "ImportPage.c" +#line 3980 "ImportPage.c" } #line 220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = self->priv->metadata; @@ -3530,11 +3987,13 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) { result = _tmp4_; #line 220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3533 "ImportPage.c" +#line 3990 "ImportPage.c" } -static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) { +static GdkPixbuf* +photo_import_source_real_get_preview (ImportSource* base) +{ PhotoImportSource * self; GdkPixbuf* result = NULL; PhotoImportSource* _tmp0_; @@ -3547,7 +4006,7 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) { _tmp0_ = self->priv->associated; #line 224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_ != NULL) { -#line 3550 "ImportPage.c" +#line 4009 "ImportPage.c" PhotoImportSource* _tmp1_; GdkPixbuf* _tmp2_; #line 225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3558,7 +4017,7 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) { result = _tmp2_; #line 225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3561 "ImportPage.c" +#line 4020 "ImportPage.c" } #line 227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = IMPORT_SOURCE_CLASS (photo_import_source_parent_class)->get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); @@ -3570,7 +4029,7 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) { _g_object_unref0 (_tmp4_); #line 227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp5_) { -#line 3573 "ImportPage.c" +#line 4032 "ImportPage.c" GdkPixbuf* _tmp6_; #line 228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = IMPORT_SOURCE_CLASS (photo_import_source_parent_class)->get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); @@ -3578,24 +4037,27 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) { result = _tmp6_; #line 228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3581 "ImportPage.c" +#line 4040 "ImportPage.c" } #line 230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = NULL; #line 230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3587 "ImportPage.c" +#line 4046 "ImportPage.c" } -static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error) { +static GdkPixbuf* +photo_import_source_real_get_thumbnail (ThumbnailSource* base, + gint scale, + GError** error) +{ PhotoImportSource * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_; GdkPixbuf* _tmp1_; gboolean _tmp2_; GdkPixbuf* _tmp3_ = NULL; - gint _tmp4_; #line 233 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource); #line 234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3612,51 +4074,48 @@ static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base, result = NULL; #line 235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3615 "ImportPage.c" +#line 4077 "ImportPage.c" } #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = scale; -#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp4_ > 0) { -#line 3621 "ImportPage.c" + if (scale > 0) { +#line 4081 "ImportPage.c" + GdkPixbuf* _tmp4_; GdkPixbuf* _tmp5_; GdkPixbuf* _tmp6_; - gint _tmp7_; - GdkPixbuf* _tmp8_; -#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = _tmp5_; + _tmp4_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = scale; + _tmp5_ = _tmp4_; #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = scale_pixbuf (_tmp6_, _tmp7_, PHOTO_IMPORT_SOURCE_INTERP, TRUE); + _tmp6_ = scale_pixbuf (_tmp5_, scale, PHOTO_IMPORT_SOURCE_INTERP, TRUE); #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp3_); #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = _tmp8_; + _tmp3_ = _tmp6_; #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp6_); -#line 3640 "ImportPage.c" + _g_object_unref0 (_tmp5_); +#line 4097 "ImportPage.c" } else { - GdkPixbuf* _tmp9_; + GdkPixbuf* _tmp7_; #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp7_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource)); #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp3_); #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = _tmp9_; -#line 3649 "ImportPage.c" + _tmp3_ = _tmp7_; +#line 4106 "ImportPage.c" } #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp3_; #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3655 "ImportPage.c" +#line 4112 "ImportPage.c" } -PhotoFileFormat photo_import_source_get_file_format (PhotoImportSource* self) { +PhotoFileFormat +photo_import_source_get_file_format (PhotoImportSource* self) +{ PhotoFileFormat result = 0; PhotoFileFormat _tmp0_; #line 240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3667,11 +4126,13 @@ PhotoFileFormat photo_import_source_get_file_format (PhotoImportSource* self) { result = _tmp0_; #line 241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3670 "ImportPage.c" +#line 4129 "ImportPage.c" } -gchar* photo_import_source_get_preview_md5 (PhotoImportSource* self) { +gchar* +photo_import_source_get_preview_md5 (PhotoImportSource* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -3685,30 +4146,32 @@ gchar* photo_import_source_get_preview_md5 (PhotoImportSource* self) { result = _tmp1_; #line 245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3688 "ImportPage.c" +#line 4149 "ImportPage.c" } -void photo_import_source_set_associated (PhotoImportSource* self, PhotoImportSource* associated) { +void +photo_import_source_set_associated (PhotoImportSource* self, + PhotoImportSource* associated) +{ PhotoImportSource* _tmp0_; - PhotoImportSource* _tmp1_; #line 248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_PHOTO_IMPORT_SOURCE (self)); #line 248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail ((associated == NULL) || IS_PHOTO_IMPORT_SOURCE (associated)); #line 249 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = associated; -#line 249 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (associated); #line 249 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->associated); #line 249 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->associated = _tmp1_; -#line 3707 "ImportPage.c" + self->priv->associated = _tmp0_; +#line 4168 "ImportPage.c" } -PhotoImportSource* photo_import_source_get_associated (PhotoImportSource* self) { +PhotoImportSource* +photo_import_source_get_associated (PhotoImportSource* self) +{ PhotoImportSource* result = NULL; PhotoImportSource* _tmp0_; PhotoImportSource* _tmp1_; @@ -3722,73 +4185,72 @@ PhotoImportSource* photo_import_source_get_associated (PhotoImportSource* self) result = _tmp1_; #line 253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3725 "ImportPage.c" +#line 4188 "ImportPage.c" } -static gboolean photo_import_source_real_internal_delete_backing (DataSource* base, GError** error) { +static gboolean +photo_import_source_real_internal_delete_backing (DataSource* base, + GError** error) +{ PhotoImportSource * self; gboolean result = FALSE; gboolean ret = FALSE; - gboolean _tmp0_; - PhotoImportSource* _tmp2_; + PhotoImportSource* _tmp1_; GError * _inner_error_ = NULL; #line 256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource); #line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = DATA_SOURCE_CLASS (photo_import_source_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_); -#line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - ret = _tmp0_; + ret = DATA_SOURCE_CLASS (photo_import_source_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_); #line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3744 "ImportPage.c" - gboolean _tmp1_ = FALSE; +#line 4207 "ImportPage.c" + gboolean _tmp0_ = FALSE; #line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_propagate_error (error, _inner_error_); #line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - return _tmp1_; -#line 3750 "ImportPage.c" + return _tmp0_; +#line 4213 "ImportPage.c" } #line 258 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = self->priv->associated; + _tmp1_ = self->priv->associated; #line 258 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp2_ != NULL) { -#line 3756 "ImportPage.c" - gboolean _tmp3_ = FALSE; - PhotoImportSource* _tmp4_; + if (_tmp1_ != NULL) { +#line 4219 "ImportPage.c" + gboolean _tmp2_ = FALSE; + PhotoImportSource* _tmp3_; gboolean _tmp5_; - gboolean _tmp7_; #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = self->priv->associated; + _tmp3_ = self->priv->associated; #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = data_source_internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), &_inner_error_); -#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = _tmp5_; + _tmp2_ = data_source_internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource), &_inner_error_); #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3769 "ImportPage.c" - gboolean _tmp6_ = FALSE; +#line 4229 "ImportPage.c" + gboolean _tmp4_ = FALSE; #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_propagate_error (error, _inner_error_); #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - return _tmp6_; -#line 3775 "ImportPage.c" + return _tmp4_; +#line 4235 "ImportPage.c" } #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = ret; + _tmp5_ = ret; #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - ret = _tmp7_ & _tmp3_; -#line 3781 "ImportPage.c" + ret = _tmp5_ & _tmp2_; +#line 4241 "ImportPage.c" } #line 260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = ret; #line 260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 3787 "ImportPage.c" +#line 4247 "ImportPage.c" } -static void photo_import_source_class_init (PhotoImportSourceClass * klass) { +static void +photo_import_source_class_init (PhotoImportSourceClass * klass) +{ #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" photo_import_source_parent_class = g_type_class_peek_parent (klass); #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3813,11 +4275,13 @@ static void photo_import_source_class_init (PhotoImportSourceClass * klass) { ((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) photo_import_source_real_internal_delete_backing; #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (klass)->finalize = photo_import_source_finalize; -#line 3816 "ImportPage.c" +#line 4278 "ImportPage.c" } -static void photo_import_source_instance_init (PhotoImportSource * self) { +static void +photo_import_source_instance_init (PhotoImportSource * self) +{ #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv = PHOTO_IMPORT_SOURCE_GET_PRIVATE (self); #line 156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3828,11 +4292,13 @@ static void photo_import_source_instance_init (PhotoImportSource * self) { self->priv->exif_md5 = NULL; #line 159 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->associated = NULL; -#line 3831 "ImportPage.c" +#line 4295 "ImportPage.c" } -static void photo_import_source_finalize (GObject * obj) { +static void +photo_import_source_finalize (GObject * obj) +{ PhotoImportSource * self; #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource); @@ -3846,11 +4312,13 @@ static void photo_import_source_finalize (GObject * obj) { _g_object_unref0 (self->priv->associated); #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (photo_import_source_parent_class)->finalize (obj); -#line 3849 "ImportPage.c" +#line 4315 "ImportPage.c" } -GType photo_import_source_get_type (void) { +GType +photo_import_source_get_type (void) +{ static volatile gsize photo_import_source_type_id__volatile = 0; if (g_once_init_enter (&photo_import_source_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoImportSourceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_import_source_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoImportSource), 0, (GInstanceInitFunc) photo_import_source_instance_init, NULL }; @@ -3862,110 +4330,99 @@ GType photo_import_source_get_type (void) { } -ImportPreview* import_preview_construct (GType object_type, ImportSource* source) { +ImportPreview* +import_preview_construct (GType object_type, + ImportSource* source) +{ ImportPreview * self = NULL; - ImportSource* _tmp0_; - Dimensions _tmp1_ = {0}; - ImportSource* _tmp2_; - gchar* _tmp3_; - gchar* _tmp4_; - ImportSource* _tmp5_; + Dimensions _tmp0_ = {0}; + gchar* _tmp1_; + gchar* _tmp2_; GdkPixbuf* pixbuf = NULL; gboolean using_placeholder = FALSE; - GdkPixbuf* _tmp14_; - GdkPixbuf* _tmp15_; - gboolean _tmp22_ = FALSE; - GdkPixbuf* _tmp23_; - gint _tmp24_; - ImportSource* _tmp29_; - GdkPixbuf* _tmp49_; + GdkPixbuf* _tmp10_; + GdkPixbuf* _tmp11_; + gboolean _tmp18_ = FALSE; + GdkPixbuf* _tmp19_; + GdkPixbuf* _tmp40_; GError * _inner_error_ = NULL; #line 271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_SOURCE (source), NULL); #line 272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = source; -#line 272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - dimensions_init (&_tmp1_, 0, 0); + dimensions_init (&_tmp0_, 0, 0); #line 272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = source; -#line 272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject)); + _tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self = (ImportPreview*) media_source_item_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), &_tmp1_, _tmp4_, NULL, FALSE, PANGO_ALIGN_LEFT); + self = (ImportPreview*) media_source_item_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), &_tmp0_, _tmp2_, NULL, FALSE, PANGO_ALIGN_LEFT); #line 272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp2_); #line 274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->duplicated_file); #line 274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->duplicated_file = NULL; #line 277 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = source; -#line 277 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_VIDEO_IMPORT_SOURCE)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_VIDEO_IMPORT_SOURCE)) { #line 278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" media_source_item_set_enable_sprockets (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TRUE); -#line 3909 "ImportPage.c" +#line 4369 "ImportPage.c" } #line 281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" pixbuf = NULL; -#line 3913 "ImportPage.c" +#line 4373 "ImportPage.c" { - GdkPixbuf* _tmp6_ = NULL; - ImportSource* _tmp7_; - GdkPixbuf* _tmp8_; - GdkPixbuf* _tmp9_; -#line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = source; + GdkPixbuf* _tmp3_ = NULL; + GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp5_; #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), 0, &_inner_error_); + _tmp4_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), 0, &_inner_error_); #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = _tmp8_; + _tmp3_ = _tmp4_; #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3927 "ImportPage.c" +#line 4384 "ImportPage.c" goto __catch72_g_error; } #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = _tmp6_; + _tmp5_ = _tmp3_; #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = NULL; + _tmp3_ = NULL; #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (pixbuf); #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - pixbuf = _tmp9_; + pixbuf = _tmp5_; #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp6_); -#line 3940 "ImportPage.c" + _g_object_unref0 (_tmp3_); +#line 4397 "ImportPage.c" } goto __finally72; __catch72_g_error: { GError* err = NULL; - gchar* _tmp10_; - gchar* _tmp11_; - GError* _tmp12_; - const gchar* _tmp13_; + gchar* _tmp6_; + gchar* _tmp7_; + GError* _tmp8_; + const gchar* _tmp9_; #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" err = _inner_error_; #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _inner_error_ = NULL; #line 285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = _tmp10_; + _tmp7_ = _tmp6_; #line 285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = err; + _tmp8_ = err; #line 285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = _tmp12_->message; + _tmp9_ = _tmp8_->message; #line 285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:285: Unable to fetch loaded import preview for %s: %s", _tmp11_, _tmp13_); + g_warning ("ImportPage.vala:285: Unable to fetch loaded import preview for %s: %s", _tmp7_, _tmp9_); #line 285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp7_); #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 3968 "ImportPage.c" +#line 4425 "ImportPage.c" } __finally72: #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -3978,220 +4435,211 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source g_clear_error (&_inner_error_); #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return NULL; -#line 3981 "ImportPage.c" +#line 4438 "ImportPage.c" } #line 289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = pixbuf; + _tmp10_ = pixbuf; #line 289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - using_placeholder = _tmp14_ == NULL; + using_placeholder = _tmp10_ == NULL; #line 290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp15_ = pixbuf; + _tmp11_ = pixbuf; #line 290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp15_ == NULL) { -#line 3991 "ImportPage.c" + if (_tmp11_ == NULL) { +#line 4448 "ImportPage.c" + GdkPixbuf* _tmp12_; GdkPixbuf* _tmp16_; - GdkPixbuf* _tmp20_; - GdkPixbuf* _tmp21_; + GdkPixbuf* _tmp17_; #line 291 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp16_ = import_preview_placeholder_preview; + _tmp12_ = import_preview_placeholder_preview; #line 291 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp16_ == NULL) { -#line 3999 "ImportPage.c" - GdkPixbuf* _tmp17_; - GdkPixbuf* _tmp18_; - GdkPixbuf* _tmp19_; + if (_tmp12_ == NULL) { +#line 4456 "ImportPage.c" + GdkPixbuf* _tmp13_; + GdkPixbuf* _tmp14_; + GdkPixbuf* _tmp15_; #line 292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp17_ = get_placeholder_pixbuf (); + _tmp13_ = get_placeholder_pixbuf (); #line 292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (import_preview_placeholder_preview); #line 292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_preview_placeholder_preview = _tmp17_; + import_preview_placeholder_preview = _tmp13_; #line 293 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp18_ = import_preview_placeholder_preview; + _tmp14_ = import_preview_placeholder_preview; #line 293 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp19_ = scale_pixbuf (_tmp18_, IMPORT_PREVIEW_MAX_SCALE, GDK_INTERP_BILINEAR, TRUE); + _tmp15_ = scale_pixbuf (_tmp14_, IMPORT_PREVIEW_MAX_SCALE, GDK_INTERP_BILINEAR, TRUE); #line 293 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (import_preview_placeholder_preview); #line 293 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_preview_placeholder_preview = _tmp19_; -#line 4017 "ImportPage.c" + import_preview_placeholder_preview = _tmp15_; +#line 4474 "ImportPage.c" } #line 297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp20_ = import_preview_placeholder_preview; + _tmp16_ = import_preview_placeholder_preview; #line 297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp21_ = _g_object_ref0 (_tmp20_); + _tmp17_ = _g_object_ref0 (_tmp16_); #line 297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (pixbuf); #line 297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - pixbuf = _tmp21_; -#line 4027 "ImportPage.c" + pixbuf = _tmp17_; +#line 4484 "ImportPage.c" } #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp23_ = pixbuf; -#line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp24_ = gdk_pixbuf_get_width (_tmp23_); + _tmp19_ = pixbuf; #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp24_ > IMPORT_PREVIEW_MAX_SCALE) { + if (gdk_pixbuf_get_width (_tmp19_) > IMPORT_PREVIEW_MAX_SCALE) { #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp22_ = TRUE; -#line 4037 "ImportPage.c" + _tmp18_ = TRUE; +#line 4492 "ImportPage.c" } else { - GdkPixbuf* _tmp25_; - gint _tmp26_; -#line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp25_ = pixbuf; + GdkPixbuf* _tmp20_; #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp26_ = gdk_pixbuf_get_height (_tmp25_); + _tmp20_ = pixbuf; #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp22_ = _tmp26_ > IMPORT_PREVIEW_MAX_SCALE; -#line 4047 "ImportPage.c" + _tmp18_ = gdk_pixbuf_get_height (_tmp20_) > IMPORT_PREVIEW_MAX_SCALE; +#line 4499 "ImportPage.c" } #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp22_) { -#line 4051 "ImportPage.c" - GdkPixbuf* _tmp27_; - GdkPixbuf* _tmp28_; + if (_tmp18_) { +#line 4503 "ImportPage.c" + GdkPixbuf* _tmp21_; + GdkPixbuf* _tmp22_; #line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp27_ = pixbuf; + _tmp21_ = pixbuf; #line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp28_ = scale_pixbuf (_tmp27_, IMPORT_PREVIEW_MAX_SCALE, PHOTO_IMPORT_SOURCE_INTERP, FALSE); + _tmp22_ = scale_pixbuf (_tmp21_, IMPORT_PREVIEW_MAX_SCALE, PHOTO_IMPORT_SOURCE_INTERP, FALSE); #line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (pixbuf); #line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - pixbuf = _tmp28_; -#line 4062 "ImportPage.c" + pixbuf = _tmp22_; +#line 4514 "ImportPage.c" } #line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp29_ = source; -#line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, TYPE_PHOTO_IMPORT_SOURCE)) { -#line 4068 "ImportPage.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_PHOTO_IMPORT_SOURCE)) { +#line 4518 "ImportPage.c" PhotoImportSource* photo_import_source = NULL; - ImportSource* _tmp30_; - PhotoImportSource* _tmp31_; - gboolean _tmp32_ = FALSE; - gboolean _tmp33_; - PhotoImportSource* _tmp43_; - PhotoImportSource* _tmp44_; - PhotoImportSource* _tmp45_; - gboolean _tmp46_; + PhotoImportSource* _tmp23_; + gboolean _tmp24_ = FALSE; + gboolean _tmp25_; + PhotoImportSource* _tmp34_; + PhotoImportSource* _tmp35_; + PhotoImportSource* _tmp36_; + gboolean _tmp37_; #line 306 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp30_ = source; + _tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) source) : NULL); #line 306 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp30_) : NULL); -#line 306 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - photo_import_source = _tmp31_; + photo_import_source = _tmp23_; #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp33_ = using_placeholder; + _tmp25_ = using_placeholder; #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp33_) { -#line 4088 "ImportPage.c" - PhotoImportSource* _tmp34_; - PhotoMetadata* _tmp35_; - PhotoMetadata* _tmp36_; + if (!_tmp25_) { +#line 4535 "ImportPage.c" + PhotoImportSource* _tmp26_; + PhotoMetadata* _tmp27_; + PhotoMetadata* _tmp28_; #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp34_ = photo_import_source; + _tmp26_ = photo_import_source; #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp35_ = photo_import_source_get_metadata (_tmp34_); + _tmp27_ = photo_import_source_get_metadata (_tmp26_); #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp36_ = _tmp35_; + _tmp28_ = _tmp27_; #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp32_ = _tmp36_ != NULL; + _tmp24_ = _tmp28_ != NULL; #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _media_metadata_unref0 (_tmp36_); -#line 4102 "ImportPage.c" + _media_metadata_unref0 (_tmp28_); +#line 4549 "ImportPage.c" } else { #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp32_ = FALSE; -#line 4106 "ImportPage.c" + _tmp24_ = FALSE; +#line 4553 "ImportPage.c" } #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp32_) { -#line 4110 "ImportPage.c" - PhotoImportSource* _tmp37_; - PhotoMetadata* _tmp38_; - PhotoMetadata* _tmp39_; - Orientation _tmp40_; - GdkPixbuf* _tmp41_; - GdkPixbuf* _tmp42_; -#line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp37_ = photo_import_source; + if (_tmp24_) { +#line 4557 "ImportPage.c" + PhotoImportSource* _tmp29_; + PhotoMetadata* _tmp30_; + PhotoMetadata* _tmp31_; + GdkPixbuf* _tmp32_; + GdkPixbuf* _tmp33_; #line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp38_ = photo_import_source_get_metadata (_tmp37_); + _tmp29_ = photo_import_source; #line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp39_ = _tmp38_; + _tmp30_ = photo_import_source_get_metadata (_tmp29_); #line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp40_ = photo_metadata_get_orientation (_tmp39_); + _tmp31_ = _tmp30_; #line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp41_ = pixbuf; + _tmp32_ = pixbuf; #line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp42_ = orientation_rotate_pixbuf (_tmp40_, _tmp41_); + _tmp33_ = orientation_rotate_pixbuf (photo_metadata_get_orientation (_tmp31_), _tmp32_); #line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (pixbuf); #line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - pixbuf = _tmp42_; + pixbuf = _tmp33_; #line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _media_metadata_unref0 (_tmp39_); -#line 4135 "ImportPage.c" + _media_metadata_unref0 (_tmp31_); +#line 4579 "ImportPage.c" } #line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp43_ = photo_import_source; + _tmp34_ = photo_import_source; #line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp44_ = photo_import_source_get_associated (_tmp43_); + _tmp35_ = photo_import_source_get_associated (_tmp34_); #line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp45_ = _tmp44_; + _tmp36_ = _tmp35_; #line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp46_ = _tmp45_ != NULL; + _tmp37_ = _tmp36_ != NULL; #line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp45_); + _g_object_unref0 (_tmp36_); #line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp46_) { -#line 4149 "ImportPage.c" - gchar* _tmp47_; - gchar* _tmp48_; + if (_tmp37_) { +#line 4593 "ImportPage.c" + gchar* _tmp38_; + gchar* _tmp39_; #line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp47_ = g_strdup_printf ("%s", _ ("RAW+JPEG")); + _tmp38_ = g_strdup_printf ("%s", _ ("RAW+JPEG")); #line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp48_ = _tmp47_; + _tmp39_ = _tmp38_; #line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - checkerboard_item_set_subtitle (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp48_, TRUE, PANGO_ALIGN_LEFT); + checkerboard_item_set_subtitle (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp39_, TRUE, PANGO_ALIGN_LEFT); #line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp48_); -#line 4160 "ImportPage.c" + _g_free0 (_tmp39_); +#line 4604 "ImportPage.c" } #line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (photo_import_source); -#line 4164 "ImportPage.c" +#line 4608 "ImportPage.c" } #line 315 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp49_ = pixbuf; + _tmp40_ = pixbuf; #line 315 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp49_); + checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp40_); #line 271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (pixbuf); #line 271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 4174 "ImportPage.c" +#line 4618 "ImportPage.c" } -ImportPreview* import_preview_new (ImportSource* source) { +ImportPreview* +import_preview_new (ImportSource* source) +{ #line 271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return import_preview_construct (TYPE_IMPORT_PREVIEW, source); -#line 4181 "ImportPage.c" +#line 4627 "ImportPage.c" } -gboolean import_preview_is_already_imported (ImportPreview* self) { +gboolean +import_preview_is_already_imported (ImportPreview* self) +{ gboolean result = FALSE; PhotoImportSource* photo_import_source = NULL; ImportSource* _tmp0_; PhotoImportSource* _tmp1_; PhotoImportSource* _tmp2_; VideoImportSource* video_import_source = NULL; - ImportSource* _tmp49_; - VideoImportSource* _tmp50_; - VideoImportSource* _tmp51_; + ImportSource* _tmp42_; + VideoImportSource* _tmp43_; + VideoImportSource* _tmp44_; #line 318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PREVIEW (self), FALSE); #line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -4202,7 +4650,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) { if (_tmp1_ == NULL) { #line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp0_); -#line 4205 "ImportPage.c" +#line 4653 "ImportPage.c" } #line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" photo_import_source = _tmp1_; @@ -4210,17 +4658,15 @@ gboolean import_preview_is_already_imported (ImportPreview* self) { _tmp2_ = photo_import_source; #line 320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp2_ != NULL) { -#line 4213 "ImportPage.c" +#line 4661 "ImportPage.c" gchar* preview_md5 = NULL; PhotoImportSource* _tmp3_; gchar* _tmp4_; PhotoFileFormat file_format = 0; PhotoImportSource* _tmp5_; - PhotoFileFormat _tmp6_; - gboolean _tmp7_ = FALSE; - const gchar* _tmp8_; - gboolean _tmp9_; - PhotoFileFormat _tmp17_; + gboolean _tmp6_ = FALSE; + const gchar* _tmp7_; + PhotoFileFormat _tmp14_; #line 321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = photo_import_source; #line 321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -4230,52 +4676,45 @@ gboolean import_preview_is_already_imported (ImportPreview* self) { #line 322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = photo_import_source; #line 322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = photo_import_source_get_file_format (_tmp5_); -#line 322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - file_format = _tmp6_; -#line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = preview_md5; + file_format = photo_import_source_get_file_format (_tmp5_); #line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = is_string_empty (_tmp8_); + _tmp7_ = preview_md5; #line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp9_) { -#line 4242 "ImportPage.c" - const gchar* _tmp10_; - PhotoFileFormat _tmp11_; - gboolean _tmp12_; -#line 326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = preview_md5; + if (!is_string_empty (_tmp7_)) { +#line 4684 "ImportPage.c" + const gchar* _tmp8_; + PhotoFileFormat _tmp9_; #line 326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = file_format; + _tmp8_ = preview_md5; #line 326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = library_photo_has_nontrash_duplicate (NULL, _tmp10_, NULL, _tmp11_); + _tmp9_ = file_format; #line 326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = _tmp12_; -#line 4254 "ImportPage.c" + _tmp6_ = library_photo_has_nontrash_duplicate (NULL, _tmp8_, NULL, _tmp9_); +#line 4693 "ImportPage.c" } else { #line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = FALSE; -#line 4258 "ImportPage.c" + _tmp6_ = FALSE; +#line 4697 "ImportPage.c" } #line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp7_) { -#line 4262 "ImportPage.c" - const gchar* _tmp13_; - PhotoFileFormat _tmp14_; - PhotoID _tmp15_ = {0}; - DuplicatedFile* _tmp16_; + if (_tmp6_) { +#line 4701 "ImportPage.c" + const gchar* _tmp10_; + PhotoFileFormat _tmp11_; + PhotoID _tmp12_ = {0}; + DuplicatedFile* _tmp13_; #line 328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = preview_md5; + _tmp10_ = preview_md5; #line 328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = file_format; + _tmp11_ = file_format; #line 328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - library_photo_get_nontrash_duplicate (NULL, _tmp13_, NULL, _tmp14_, &_tmp15_); + library_photo_get_nontrash_duplicate (NULL, _tmp10_, NULL, _tmp11_, &_tmp12_); #line 328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp16_ = duplicated_file_create_from_photo_id (&_tmp15_); + _tmp13_ = duplicated_file_create_from_photo_id (&_tmp12_); #line 328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->duplicated_file); #line 328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->duplicated_file = _tmp16_; + self->priv->duplicated_file = _tmp13_; #line 331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = TRUE; #line 331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -4284,144 +4723,132 @@ gboolean import_preview_is_already_imported (ImportPreview* self) { _g_object_unref0 (photo_import_source); #line 331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4287 "ImportPage.c" +#line 4726 "ImportPage.c" } #line 337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp17_ = file_format; + _tmp14_ = file_format; #line 337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp17_ == PHOTO_FILE_FORMAT_RAW) { -#line 4293 "ImportPage.c" + if (_tmp14_ == PHOTO_FILE_FORMAT_RAW) { +#line 4732 "ImportPage.c" guint64 filesize = 0ULL; - ImportSource* _tmp18_; - ImportSource* _tmp19_; - gulong _tmp20_; - guint64 _tmp21_; - guint64 _tmp22_; -#line 338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp18_ = import_preview_get_import_source (self); + ImportSource* _tmp15_; + ImportSource* _tmp16_; + guint64 _tmp17_; + guint64 _tmp18_; #line 338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp19_ = _tmp18_; + _tmp15_ = import_preview_get_import_source (self); #line 338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp20_ = import_source_get_filesize (_tmp19_); + _tmp16_ = _tmp15_; #line 338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp21_ = (guint64) _tmp20_; + _tmp17_ = (guint64) import_source_get_filesize (_tmp16_); #line 338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp19_); + _g_object_unref0 (_tmp16_); #line 338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - filesize = _tmp21_; + filesize = _tmp17_; #line 340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp22_ = filesize; + _tmp18_ = filesize; #line 340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp22_ <= ((guint64) G_MAXINT64)) { -#line 4316 "ImportPage.c" + if (_tmp18_ <= ((guint64) G_MAXINT64)) { +#line 4752 "ImportPage.c" PhotoID duplicated_photo_id = {0}; - LibraryPhotoSourceCollection* _tmp23_; - ImportSource* _tmp24_; - ImportSource* _tmp25_; - gchar* _tmp26_; - gchar* _tmp27_; - guint64 _tmp28_; - PhotoID _tmp29_ = {0}; - PhotoID _tmp30_; - gboolean _tmp31_; + LibraryPhotoSourceCollection* _tmp19_; + ImportSource* _tmp20_; + ImportSource* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + guint64 _tmp24_; + PhotoID _tmp25_ = {0}; + PhotoID _tmp26_; #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp23_ = library_photo_global; + _tmp19_ = library_photo_global; #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp24_ = import_preview_get_import_source (self); + _tmp20_ = import_preview_get_import_source (self); #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp25_ = _tmp24_; + _tmp21_ = _tmp20_; #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp26_ = import_source_get_filename (_tmp25_); + _tmp22_ = import_source_get_filename (_tmp21_); #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp27_ = _tmp26_; + _tmp23_ = _tmp22_; #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp28_ = filesize; + _tmp24_ = filesize; #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - library_photo_source_collection_get_basename_filesize_duplicate (_tmp23_, _tmp27_, (gint64) _tmp28_, &_tmp29_); + library_photo_source_collection_get_basename_filesize_duplicate (_tmp19_, _tmp23_, (gint64) _tmp24_, &_tmp25_); #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp30_ = _tmp29_; + _tmp26_ = _tmp25_; #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp27_); + _g_free0 (_tmp23_); #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp25_); + _g_object_unref0 (_tmp21_); #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - duplicated_photo_id = _tmp30_; -#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp31_ = photo_id_is_valid (&duplicated_photo_id); + duplicated_photo_id = _tmp26_; #line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp31_) { -#line 4353 "ImportPage.c" + if (photo_id_is_valid (&duplicated_photo_id)) { +#line 4786 "ImportPage.c" LibraryPhoto* duplicated_photo = NULL; - LibraryPhotoSourceCollection* _tmp32_; - PhotoID _tmp33_; - LibraryPhoto* _tmp34_; + LibraryPhotoSourceCollection* _tmp27_; + PhotoID _tmp28_; + LibraryPhoto* _tmp29_; time_t photo_exposure_time = 0; - PhotoImportSource* _tmp35_; - time_t _tmp36_; + PhotoImportSource* _tmp30_; time_t duplicated_photo_exposure_time = 0; - LibraryPhoto* _tmp37_; - time_t _tmp38_; - time_t _tmp39_; - time_t _tmp40_; + LibraryPhoto* _tmp31_; + time_t _tmp32_; + time_t _tmp33_; #line 346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp32_ = library_photo_global; + _tmp27_ = library_photo_global; #line 346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp33_ = duplicated_photo_id; + _tmp28_ = duplicated_photo_id; #line 346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp34_ = library_photo_source_collection_fetch (_tmp32_, &_tmp33_); + _tmp29_ = library_photo_source_collection_fetch (_tmp27_, &_tmp28_); #line 346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - duplicated_photo = _tmp34_; -#line 347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp35_ = photo_import_source; + duplicated_photo = _tmp29_; #line 347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp36_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp30_ = photo_import_source; #line 347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - photo_exposure_time = _tmp36_; + photo_exposure_time = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_IMPORT_SOURCE, ImportSource)); #line 348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp37_ = duplicated_photo; + _tmp31_ = duplicated_photo; #line 348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp38_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - duplicated_photo_exposure_time = _tmp38_; + duplicated_photo_exposure_time = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_MEDIA_SOURCE, MediaSource)); #line 350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp39_ = photo_exposure_time; + _tmp32_ = photo_exposure_time; #line 350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp40_ = duplicated_photo_exposure_time; + _tmp33_ = duplicated_photo_exposure_time; #line 350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp39_ == _tmp40_) { -#line 4392 "ImportPage.c" - LibraryPhotoSourceCollection* _tmp41_; - ImportSource* _tmp42_; - ImportSource* _tmp43_; - gchar* _tmp44_; - gchar* _tmp45_; - guint64 _tmp46_; - PhotoID _tmp47_ = {0}; - DuplicatedFile* _tmp48_; + if (_tmp32_ == _tmp33_) { +#line 4819 "ImportPage.c" + LibraryPhotoSourceCollection* _tmp34_; + ImportSource* _tmp35_; + ImportSource* _tmp36_; + gchar* _tmp37_; + gchar* _tmp38_; + guint64 _tmp39_; + PhotoID _tmp40_ = {0}; + DuplicatedFile* _tmp41_; #line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp41_ = library_photo_global; + _tmp34_ = library_photo_global; #line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp42_ = import_preview_get_import_source (self); + _tmp35_ = import_preview_get_import_source (self); #line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp43_ = _tmp42_; + _tmp36_ = _tmp35_; #line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp44_ = import_source_get_filename (_tmp43_); + _tmp37_ = import_source_get_filename (_tmp36_); #line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp45_ = _tmp44_; + _tmp38_ = _tmp37_; #line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp46_ = filesize; + _tmp39_ = filesize; #line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - library_photo_source_collection_get_basename_filesize_duplicate (_tmp41_, _tmp45_, (gint64) _tmp46_, &_tmp47_); + library_photo_source_collection_get_basename_filesize_duplicate (_tmp34_, _tmp38_, (gint64) _tmp39_, &_tmp40_); #line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp48_ = duplicated_file_create_from_photo_id (&_tmp47_); + _tmp41_ = duplicated_file_create_from_photo_id (&_tmp40_); #line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->duplicated_file); #line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->duplicated_file = _tmp48_; + self->priv->duplicated_file = _tmp41_; #line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp45_); + _g_free0 (_tmp38_); #line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp43_); + _g_object_unref0 (_tmp36_); #line 355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = TRUE; #line 355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -4432,11 +4859,11 @@ gboolean import_preview_is_already_imported (ImportPreview* self) { _g_object_unref0 (photo_import_source); #line 355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4435 "ImportPage.c" +#line 4862 "ImportPage.c" } #line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (duplicated_photo); -#line 4439 "ImportPage.c" +#line 4866 "ImportPage.c" } } } @@ -4448,84 +4875,75 @@ gboolean import_preview_is_already_imported (ImportPreview* self) { _g_object_unref0 (photo_import_source); #line 361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4451 "ImportPage.c" +#line 4878 "ImportPage.c" } #line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp49_ = import_preview_get_import_source (self); + _tmp42_ = import_preview_get_import_source (self); #line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp50_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp49_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp49_) : NULL; + _tmp43_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp42_) : NULL; #line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp50_ == NULL) { + if (_tmp43_ == NULL) { #line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp49_); -#line 4461 "ImportPage.c" + _g_object_unref0 (_tmp42_); +#line 4888 "ImportPage.c" } #line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - video_import_source = _tmp50_; + video_import_source = _tmp43_; #line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp51_ = video_import_source; + _tmp44_ = video_import_source; #line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp51_ != NULL) { -#line 4469 "ImportPage.c" - VideoSourceCollection* _tmp52_; - VideoImportSource* _tmp53_; - gchar* _tmp54_; - gchar* _tmp55_; - VideoImportSource* _tmp56_; - gulong _tmp57_; - gboolean _tmp58_; - gboolean _tmp59_; -#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp52_ = video_global; -#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp53_ = video_import_source; + if (_tmp44_ != NULL) { +#line 4896 "ImportPage.c" + VideoSourceCollection* _tmp45_; + VideoImportSource* _tmp46_; + gchar* _tmp47_; + gchar* _tmp48_; + VideoImportSource* _tmp49_; + gboolean _tmp50_; #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp54_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp45_ = video_global; #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp55_ = _tmp54_; + _tmp46_ = video_import_source; #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp56_ = video_import_source; + _tmp47_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_IMPORT_SOURCE, ImportSource)); #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp57_ = import_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp48_ = _tmp47_; #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp58_ = video_source_collection_has_basename_filesize_duplicate (_tmp52_, _tmp55_, (guint64) _tmp57_); + _tmp49_ = video_import_source; #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp59_ = _tmp58_; + _tmp50_ = video_source_collection_has_basename_filesize_duplicate (_tmp45_, _tmp48_, (guint64) import_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_IMPORT_SOURCE, ImportSource))); #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp55_); + _g_free0 (_tmp48_); #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp59_) { -#line 4498 "ImportPage.c" - VideoSourceCollection* _tmp60_; - VideoImportSource* _tmp61_; - gchar* _tmp62_; - gchar* _tmp63_; - VideoImportSource* _tmp64_; - gulong _tmp65_; - VideoID _tmp66_ = {0}; - DuplicatedFile* _tmp67_; -#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp60_ = video_global; + if (_tmp50_) { +#line 4919 "ImportPage.c" + VideoSourceCollection* _tmp51_; + VideoImportSource* _tmp52_; + gchar* _tmp53_; + gchar* _tmp54_; + VideoImportSource* _tmp55_; + VideoID _tmp56_ = {0}; + DuplicatedFile* _tmp57_; #line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp61_ = video_import_source; + _tmp51_ = video_global; #line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp62_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp52_ = video_import_source; #line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp63_ = _tmp62_; + _tmp53_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_IMPORT_SOURCE, ImportSource)); #line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp64_ = video_import_source; + _tmp54_ = _tmp53_; #line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp65_ = import_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp55_ = video_import_source; #line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - video_source_collection_get_basename_filesize_duplicate (_tmp60_, _tmp63_, (guint64) _tmp65_, &_tmp66_); + video_source_collection_get_basename_filesize_duplicate (_tmp51_, _tmp54_, (guint64) import_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_IMPORT_SOURCE, ImportSource)), &_tmp56_); #line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp67_ = duplicated_file_create_from_video_id (&_tmp66_); + _tmp57_ = duplicated_file_create_from_video_id (&_tmp56_); #line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->duplicated_file); #line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->duplicated_file = _tmp67_; + self->priv->duplicated_file = _tmp57_; #line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp63_); + _g_free0 (_tmp54_); #line 378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = TRUE; #line 378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -4534,7 +4952,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) { _g_object_unref0 (photo_import_source); #line 378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4537 "ImportPage.c" +#line 4955 "ImportPage.c" } #line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; @@ -4544,7 +4962,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) { _g_object_unref0 (photo_import_source); #line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4547 "ImportPage.c" +#line 4965 "ImportPage.c" } #line 384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; @@ -4554,40 +4972,41 @@ gboolean import_preview_is_already_imported (ImportPreview* self) { _g_object_unref0 (photo_import_source); #line 384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4557 "ImportPage.c" +#line 4975 "ImportPage.c" } -DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self) { +DuplicatedFile* +import_preview_get_duplicated_file (ImportPreview* self) +{ DuplicatedFile* result = NULL; - gboolean _tmp0_; + DuplicatedFile* _tmp0_; DuplicatedFile* _tmp1_; - DuplicatedFile* _tmp2_; #line 387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PREVIEW (self), NULL); #line 388 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = import_preview_is_already_imported (self); -#line 388 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp0_) { + if (!import_preview_is_already_imported (self)) { #line 389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = NULL; #line 389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4576 "ImportPage.c" +#line 4993 "ImportPage.c" } #line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = self->priv->duplicated_file; + _tmp0_ = self->priv->duplicated_file; #line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp2_; + result = _tmp1_; #line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4586 "ImportPage.c" +#line 5003 "ImportPage.c" } -ImportSource* import_preview_get_import_source (ImportPreview* self) { +ImportSource* +import_preview_get_import_source (ImportPreview* self) +{ ImportSource* result = NULL; DataSource* _tmp0_; #line 394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -4598,29 +5017,35 @@ ImportSource* import_preview_get_import_source (ImportPreview* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_SOURCE, ImportSource); #line 395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4601 "ImportPage.c" +#line 5020 "ImportPage.c" } -static void import_preview_class_init (ImportPreviewClass * klass) { +static void +import_preview_class_init (ImportPreviewClass * klass) +{ #line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_preview_parent_class = g_type_class_peek_parent (klass); #line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_type_class_add_private (klass, sizeof (ImportPreviewPrivate)); #line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (klass)->finalize = import_preview_finalize; -#line 4612 "ImportPage.c" +#line 5033 "ImportPage.c" } -static void import_preview_instance_init (ImportPreview * self) { +static void +import_preview_instance_init (ImportPreview * self) +{ #line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv = IMPORT_PREVIEW_GET_PRIVATE (self); -#line 4619 "ImportPage.c" +#line 5042 "ImportPage.c" } -static void import_preview_finalize (GObject * obj) { +static void +import_preview_finalize (GObject * obj) +{ ImportPreview * self; #line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_PREVIEW, ImportPreview); @@ -4628,11 +5053,13 @@ static void import_preview_finalize (GObject * obj) { _g_object_unref0 (self->priv->duplicated_file); #line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (import_preview_parent_class)->finalize (obj); -#line 4631 "ImportPage.c" +#line 5056 "ImportPage.c" } -GType import_preview_get_type (void) { +GType +import_preview_get_type (void) +{ static volatile gsize import_preview_type_id__volatile = 0; if (g_once_init_enter (&import_preview_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ImportPreviewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) import_preview_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ImportPreview), 0, (GInstanceInitFunc) import_preview_instance_init, NULL }; @@ -4644,49 +5071,55 @@ GType import_preview_get_type (void) { } -CameraViewTracker* camera_view_tracker_construct (GType object_type, ViewCollection* collection) { +CameraViewTracker* +camera_view_tracker_construct (GType object_type, + ViewCollection* collection) +{ CameraViewTracker* self = NULL; - ViewCollection* _tmp0_; + CameraAccumulator* _tmp0_; CameraAccumulator* _tmp1_; CameraAccumulator* _tmp2_; - CameraAccumulator* _tmp3_; #line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (collection), NULL); #line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = collection; -#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self = (CameraViewTracker*) core_view_tracker_construct (object_type, _tmp0_); + self = (CameraViewTracker*) core_view_tracker_construct (object_type, collection); #line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = self->all; + _tmp0_ = self->all; #line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = self->visible; + _tmp1_ = self->visible; #line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = self->selected; + _tmp2_ = self->selected; #line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - core_view_tracker_start (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_VIEW_TRACKER, CoreViewTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator)); + core_view_tracker_start (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_VIEW_TRACKER, CoreViewTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator)); #line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 4669 "ImportPage.c" +#line 5096 "ImportPage.c" } -CameraViewTracker* camera_view_tracker_new (ViewCollection* collection) { +CameraViewTracker* +camera_view_tracker_new (ViewCollection* collection) +{ #line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return camera_view_tracker_construct (TYPE_CAMERA_VIEW_TRACKER, collection); -#line 4676 "ImportPage.c" +#line 5105 "ImportPage.c" } -static void camera_view_tracker_class_init (CameraViewTrackerClass * klass) { +static void +camera_view_tracker_class_init (CameraViewTrackerClass * klass) +{ #line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" camera_view_tracker_parent_class = g_type_class_peek_parent (klass); #line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((CoreTrackerClass *) klass)->finalize = camera_view_tracker_finalize; -#line 4685 "ImportPage.c" +#line 5116 "ImportPage.c" } -static void camera_view_tracker_instance_init (CameraViewTracker * self) { +static void +camera_view_tracker_instance_init (CameraViewTracker * self) +{ CameraAccumulator* _tmp0_; CameraAccumulator* _tmp1_; CameraAccumulator* _tmp2_; @@ -4702,11 +5135,13 @@ static void camera_view_tracker_instance_init (CameraViewTracker * self) { _tmp2_ = camera_accumulator_new (); #line 402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->selected = _tmp2_; -#line 4705 "ImportPage.c" +#line 5138 "ImportPage.c" } -static void camera_view_tracker_finalize (CoreTracker * obj) { +static void +camera_view_tracker_finalize (CoreTracker * obj) +{ CameraViewTracker * self; #line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CAMERA_VIEW_TRACKER, CameraViewTracker); @@ -4718,11 +5153,13 @@ static void camera_view_tracker_finalize (CoreTracker * obj) { _g_object_unref0 (self->selected); #line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" CORE_TRACKER_CLASS (camera_view_tracker_parent_class)->finalize (obj); -#line 4721 "ImportPage.c" +#line 5156 "ImportPage.c" } -GType camera_view_tracker_get_type (void) { +GType +camera_view_tracker_get_type (void) +{ static volatile gsize camera_view_tracker_type_id__volatile = 0; if (g_once_init_enter (&camera_view_tracker_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CameraViewTrackerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) camera_view_tracker_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CameraViewTracker), 0, (GInstanceInitFunc) camera_view_tracker_instance_init, NULL }; @@ -4734,110 +5171,104 @@ GType camera_view_tracker_get_type (void) { } -static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, DataObject* object) { +static gboolean +camera_accumulator_real_include (CoreTrackerAccumulator* base, + DataObject* object) +{ CameraAccumulator * self; gboolean result = FALSE; ImportSource* source = NULL; - DataObject* _tmp0_; - DataSource* _tmp1_; - gint _tmp2_; + DataSource* _tmp0_; + gint _tmp1_; PhotoImportSource* photo = NULL; - ImportSource* _tmp3_; - PhotoImportSource* _tmp4_; - gboolean _tmp5_ = FALSE; - PhotoImportSource* _tmp6_; + ImportSource* _tmp2_; + PhotoImportSource* _tmp3_; + gboolean _tmp4_ = FALSE; + PhotoImportSource* _tmp5_; #line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator); #line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = object; + _tmp0_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView)); #line 418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView)); -#line 418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - source = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_IMPORT_SOURCE, ImportSource); + source = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_SOURCE, ImportSource); #line 420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = self->priv->_total; + _tmp1_ = self->priv->_total; #line 420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - camera_accumulator_set_total (self, _tmp2_ + 1); + camera_accumulator_set_total (self, _tmp1_ + 1); #line 422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = source; + _tmp2_ = source; #line 422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp3_) : NULL); + _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp2_) : NULL); #line 422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - photo = _tmp4_; + photo = _tmp3_; #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = photo; + _tmp5_ = photo; #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp6_ != NULL) { -#line 4773 "ImportPage.c" - PhotoImportSource* _tmp7_; - PhotoFileFormat _tmp8_; -#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = photo; + if (_tmp5_ != NULL) { +#line 5210 "ImportPage.c" + PhotoImportSource* _tmp6_; #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = photo_import_source_get_file_format (_tmp7_); + _tmp6_ = photo; #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = _tmp8_ != PHOTO_FILE_FORMAT_RAW; -#line 4782 "ImportPage.c" + _tmp4_ = photo_import_source_get_file_format (_tmp6_) != PHOTO_FILE_FORMAT_RAW; +#line 5216 "ImportPage.c" } else { #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = FALSE; -#line 4786 "ImportPage.c" + _tmp4_ = FALSE; +#line 5220 "ImportPage.c" } #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp5_) { -#line 4790 "ImportPage.c" - gint _tmp9_; + if (_tmp4_) { +#line 5224 "ImportPage.c" + gint _tmp7_; #line 424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = self->priv->_photos; + _tmp7_ = self->priv->_photos; #line 424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - camera_accumulator_set_photos (self, _tmp9_ + 1); -#line 4796 "ImportPage.c" + camera_accumulator_set_photos (self, _tmp7_ + 1); +#line 5230 "ImportPage.c" } else { - gboolean _tmp10_ = FALSE; - PhotoImportSource* _tmp11_; -#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = photo; + gboolean _tmp8_ = FALSE; + PhotoImportSource* _tmp9_; #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp11_ != NULL) { -#line 4804 "ImportPage.c" - PhotoImportSource* _tmp12_; - PhotoFileFormat _tmp13_; + _tmp9_ = photo; #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = photo; + if (_tmp9_ != NULL) { +#line 5238 "ImportPage.c" + PhotoImportSource* _tmp10_; #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = photo_import_source_get_file_format (_tmp12_); + _tmp10_ = photo; #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW; -#line 4813 "ImportPage.c" + _tmp8_ = photo_import_source_get_file_format (_tmp10_) == PHOTO_FILE_FORMAT_RAW; +#line 5244 "ImportPage.c" } else { #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = FALSE; -#line 4817 "ImportPage.c" + _tmp8_ = FALSE; +#line 5248 "ImportPage.c" } #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp10_) { -#line 4821 "ImportPage.c" - gint _tmp14_; + if (_tmp8_) { +#line 5252 "ImportPage.c" + gint _tmp11_; #line 426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = self->priv->_raw; + _tmp11_ = self->priv->_raw; #line 426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - camera_accumulator_set_raw (self, _tmp14_ + 1); -#line 4827 "ImportPage.c" + camera_accumulator_set_raw (self, _tmp11_ + 1); +#line 5258 "ImportPage.c" } else { - ImportSource* _tmp15_; + ImportSource* _tmp12_; #line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp15_ = source; + _tmp12_ = source; #line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_VIDEO_IMPORT_SOURCE)) { -#line 4834 "ImportPage.c" - gint _tmp16_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_VIDEO_IMPORT_SOURCE)) { +#line 5265 "ImportPage.c" + gint _tmp13_; #line 428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp16_ = self->priv->_videos; + _tmp13_ = self->priv->_videos; #line 428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - camera_accumulator_set_videos (self, _tmp16_ + 1); -#line 4840 "ImportPage.c" + camera_accumulator_set_videos (self, _tmp13_ + 1); +#line 5271 "ImportPage.c" } } } @@ -4849,129 +5280,123 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D _g_object_unref0 (source); #line 431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4852 "ImportPage.c" +#line 5283 "ImportPage.c" } -static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base, DataObject* object) { +static gboolean +camera_accumulator_real_uninclude (CoreTrackerAccumulator* base, + DataObject* object) +{ CameraAccumulator * self; gboolean result = FALSE; ImportSource* source = NULL; - DataObject* _tmp0_; - DataSource* _tmp1_; - gint _tmp2_; + DataSource* _tmp0_; + gint _tmp1_; PhotoImportSource* photo = NULL; - ImportSource* _tmp3_; - PhotoImportSource* _tmp4_; - gboolean _tmp5_ = FALSE; - PhotoImportSource* _tmp6_; + ImportSource* _tmp2_; + PhotoImportSource* _tmp3_; + gboolean _tmp4_ = FALSE; + PhotoImportSource* _tmp5_; #line 434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator); #line 434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = object; -#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView)); + _tmp0_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView)); #line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - source = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_IMPORT_SOURCE, ImportSource); + source = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_SOURCE, ImportSource); #line 437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = self->priv->_total; + _tmp1_ = self->priv->_total; #line 437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - camera_accumulator_set_total (self, _tmp2_ + 1); + camera_accumulator_set_total (self, _tmp1_ + 1); #line 439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = source; + _tmp2_ = source; #line 439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp3_) : NULL); + _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp2_) : NULL); #line 439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - photo = _tmp4_; -#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = photo; + photo = _tmp3_; #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp6_ != NULL) { -#line 4892 "ImportPage.c" - PhotoImportSource* _tmp7_; - PhotoFileFormat _tmp8_; + _tmp5_ = photo; #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = photo; + if (_tmp5_ != NULL) { +#line 5323 "ImportPage.c" + PhotoImportSource* _tmp6_; #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = photo_import_source_get_file_format (_tmp7_); + _tmp6_ = photo; #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = _tmp8_ != PHOTO_FILE_FORMAT_RAW; -#line 4901 "ImportPage.c" + _tmp4_ = photo_import_source_get_file_format (_tmp6_) != PHOTO_FILE_FORMAT_RAW; +#line 5329 "ImportPage.c" } else { #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = FALSE; -#line 4905 "ImportPage.c" + _tmp4_ = FALSE; +#line 5333 "ImportPage.c" } #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp5_) { -#line 4909 "ImportPage.c" - gint _tmp9_; - gint _tmp10_; + if (_tmp4_) { +#line 5337 "ImportPage.c" + gint _tmp7_; + gint _tmp8_; #line 441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = self->priv->_photos; + _tmp7_ = self->priv->_photos; #line 441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _vala_assert (_tmp9_ > 0, "photos > 0"); + _vala_assert (_tmp7_ > 0, "photos > 0"); #line 442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = self->priv->_photos; + _tmp8_ = self->priv->_photos; #line 442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - camera_accumulator_set_photos (self, _tmp10_ - 1); -#line 4920 "ImportPage.c" + camera_accumulator_set_photos (self, _tmp8_ - 1); +#line 5348 "ImportPage.c" } else { - gboolean _tmp11_ = FALSE; - PhotoImportSource* _tmp12_; -#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = photo; + gboolean _tmp9_ = FALSE; + PhotoImportSource* _tmp10_; #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp12_ != NULL) { -#line 4928 "ImportPage.c" - PhotoImportSource* _tmp13_; - PhotoFileFormat _tmp14_; + _tmp10_ = photo; #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = photo; + if (_tmp10_ != NULL) { +#line 5356 "ImportPage.c" + PhotoImportSource* _tmp11_; #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = photo_import_source_get_file_format (_tmp13_); + _tmp11_ = photo; #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = _tmp14_ == PHOTO_FILE_FORMAT_RAW; -#line 4937 "ImportPage.c" + _tmp9_ = photo_import_source_get_file_format (_tmp11_) == PHOTO_FILE_FORMAT_RAW; +#line 5362 "ImportPage.c" } else { #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = FALSE; -#line 4941 "ImportPage.c" + _tmp9_ = FALSE; +#line 5366 "ImportPage.c" } #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp11_) { -#line 4945 "ImportPage.c" - gint _tmp15_; - gint _tmp16_; + if (_tmp9_) { +#line 5370 "ImportPage.c" + gint _tmp12_; + gint _tmp13_; #line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp15_ = self->priv->_raw; + _tmp12_ = self->priv->_raw; #line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _vala_assert (_tmp15_ > 0, "raw > 0"); + _vala_assert (_tmp12_ > 0, "raw > 0"); #line 445 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp16_ = self->priv->_raw; + _tmp13_ = self->priv->_raw; #line 445 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - camera_accumulator_set_raw (self, _tmp16_ - 1); -#line 4956 "ImportPage.c" + camera_accumulator_set_raw (self, _tmp13_ - 1); +#line 5381 "ImportPage.c" } else { - ImportSource* _tmp17_; + ImportSource* _tmp14_; #line 446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp17_ = source; + _tmp14_ = source; #line 446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_VIDEO_IMPORT_SOURCE)) { -#line 4963 "ImportPage.c" - gint _tmp18_; - gint _tmp19_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_VIDEO_IMPORT_SOURCE)) { +#line 5388 "ImportPage.c" + gint _tmp15_; + gint _tmp16_; #line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp18_ = self->priv->_videos; + _tmp15_ = self->priv->_videos; #line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _vala_assert (_tmp18_ > 0, "videos > 0"); + _vala_assert (_tmp15_ > 0, "videos > 0"); #line 448 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp19_ = self->priv->_videos; + _tmp16_ = self->priv->_videos; #line 448 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - camera_accumulator_set_videos (self, _tmp19_ - 1); -#line 4974 "ImportPage.c" + camera_accumulator_set_videos (self, _tmp16_ - 1); +#line 5399 "ImportPage.c" } } } @@ -4983,11 +5408,15 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base, _g_object_unref0 (source); #line 452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 4986 "ImportPage.c" +#line 5411 "ImportPage.c" } -static gboolean camera_accumulator_real_altered (CoreTrackerAccumulator* base, DataObject* object, Alteration* alteration) { +static gboolean +camera_accumulator_real_altered (CoreTrackerAccumulator* base, + DataObject* object, + Alteration* alteration) +{ CameraAccumulator * self; gboolean result = FALSE; #line 455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -5000,11 +5429,13 @@ static gboolean camera_accumulator_real_altered (CoreTrackerAccumulator* base, D result = FALSE; #line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 5003 "ImportPage.c" +#line 5432 "ImportPage.c" } -gchar* camera_accumulator_to_string (CameraAccumulator* self) { +gchar* +camera_accumulator_to_string (CameraAccumulator* self) +{ gchar* result = NULL; gint _tmp0_; gint _tmp1_; @@ -5027,28 +5458,34 @@ gchar* camera_accumulator_to_string (CameraAccumulator* self) { result = _tmp4_; #line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 5030 "ImportPage.c" +#line 5461 "ImportPage.c" } -CameraAccumulator* camera_accumulator_construct (GType object_type) { +CameraAccumulator* +camera_accumulator_construct (GType object_type) +{ CameraAccumulator * self = NULL; #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = (CameraAccumulator*) g_object_new (object_type, NULL); #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 5040 "ImportPage.c" +#line 5473 "ImportPage.c" } -CameraAccumulator* camera_accumulator_new (void) { +CameraAccumulator* +camera_accumulator_new (void) +{ #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return camera_accumulator_construct (TYPE_CAMERA_ACCUMULATOR); -#line 5047 "ImportPage.c" +#line 5482 "ImportPage.c" } -gint camera_accumulator_get_total (CameraAccumulator* self) { +gint +camera_accumulator_get_total (CameraAccumulator* self) +{ gint result; gint _tmp0_; #line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -5059,29 +5496,30 @@ gint camera_accumulator_get_total (CameraAccumulator* self) { result = _tmp0_; #line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 5062 "ImportPage.c" +#line 5499 "ImportPage.c" } -static void camera_accumulator_set_total (CameraAccumulator* self, gint value) { +static void +camera_accumulator_set_total (CameraAccumulator* self, + gint value) +{ #line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_CAMERA_ACCUMULATOR (self)); #line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (camera_accumulator_get_total (self) != value) { -#line 5071 "ImportPage.c" - gint _tmp0_; #line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = value; + self->priv->_total = value; #line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->_total = _tmp0_; -#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_notify ((GObject *) self, "total"); -#line 5079 "ImportPage.c" + g_object_notify_by_pspec ((GObject *) self, camera_accumulator_properties[CAMERA_ACCUMULATOR_TOTAL_PROPERTY]); +#line 5515 "ImportPage.c" } } -gint camera_accumulator_get_photos (CameraAccumulator* self) { +gint +camera_accumulator_get_photos (CameraAccumulator* self) +{ gint result; gint _tmp0_; #line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -5092,29 +5530,30 @@ gint camera_accumulator_get_photos (CameraAccumulator* self) { result = _tmp0_; #line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 5095 "ImportPage.c" +#line 5533 "ImportPage.c" } -static void camera_accumulator_set_photos (CameraAccumulator* self, gint value) { +static void +camera_accumulator_set_photos (CameraAccumulator* self, + gint value) +{ #line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_CAMERA_ACCUMULATOR (self)); #line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (camera_accumulator_get_photos (self) != value) { -#line 5104 "ImportPage.c" - gint _tmp0_; -#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = value; #line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->_photos = _tmp0_; + self->priv->_photos = value; #line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_notify ((GObject *) self, "photos"); -#line 5112 "ImportPage.c" + g_object_notify_by_pspec ((GObject *) self, camera_accumulator_properties[CAMERA_ACCUMULATOR_PHOTOS_PROPERTY]); +#line 5549 "ImportPage.c" } } -gint camera_accumulator_get_videos (CameraAccumulator* self) { +gint +camera_accumulator_get_videos (CameraAccumulator* self) +{ gint result; gint _tmp0_; #line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -5125,29 +5564,30 @@ gint camera_accumulator_get_videos (CameraAccumulator* self) { result = _tmp0_; #line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 5128 "ImportPage.c" +#line 5567 "ImportPage.c" } -static void camera_accumulator_set_videos (CameraAccumulator* self, gint value) { +static void +camera_accumulator_set_videos (CameraAccumulator* self, + gint value) +{ #line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_CAMERA_ACCUMULATOR (self)); #line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (camera_accumulator_get_videos (self) != value) { -#line 5137 "ImportPage.c" - gint _tmp0_; #line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = value; + self->priv->_videos = value; #line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->_videos = _tmp0_; -#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_notify ((GObject *) self, "videos"); -#line 5145 "ImportPage.c" + g_object_notify_by_pspec ((GObject *) self, camera_accumulator_properties[CAMERA_ACCUMULATOR_VIDEOS_PROPERTY]); +#line 5583 "ImportPage.c" } } -gint camera_accumulator_get_raw (CameraAccumulator* self) { +gint +camera_accumulator_get_raw (CameraAccumulator* self) +{ gint result; gint _tmp0_; #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -5158,29 +5598,30 @@ gint camera_accumulator_get_raw (CameraAccumulator* self) { result = _tmp0_; #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 5161 "ImportPage.c" +#line 5601 "ImportPage.c" } -static void camera_accumulator_set_raw (CameraAccumulator* self, gint value) { +static void +camera_accumulator_set_raw (CameraAccumulator* self, + gint value) +{ #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_CAMERA_ACCUMULATOR (self)); #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (camera_accumulator_get_raw (self) != value) { -#line 5170 "ImportPage.c" - gint _tmp0_; -#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = value; #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->_raw = _tmp0_; + self->priv->_raw = value; #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_notify ((GObject *) self, "raw"); -#line 5178 "ImportPage.c" + g_object_notify_by_pspec ((GObject *) self, camera_accumulator_properties[CAMERA_ACCUMULATOR_RAW_PROPERTY]); +#line 5617 "ImportPage.c" } } -static void camera_accumulator_class_init (CameraAccumulatorClass * klass) { +static void +camera_accumulator_class_init (CameraAccumulatorClass * klass) +{ #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" camera_accumulator_parent_class = g_type_class_peek_parent (klass); #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -5192,18 +5633,20 @@ static void camera_accumulator_class_init (CameraAccumulatorClass * klass) { #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (klass)->finalize = camera_accumulator_finalize; #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_TOTAL_PROPERTY, g_param_spec_int ("total", "total", "total", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_TOTAL_PROPERTY, camera_accumulator_properties[CAMERA_ACCUMULATOR_TOTAL_PROPERTY] = g_param_spec_int ("total", "total", "total", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_PHOTOS_PROPERTY, g_param_spec_int ("photos", "photos", "photos", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_PHOTOS_PROPERTY, camera_accumulator_properties[CAMERA_ACCUMULATOR_PHOTOS_PROPERTY] = g_param_spec_int ("photos", "photos", "photos", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_VIDEOS_PROPERTY, g_param_spec_int ("videos", "videos", "videos", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_VIDEOS_PROPERTY, camera_accumulator_properties[CAMERA_ACCUMULATOR_VIDEOS_PROPERTY] = g_param_spec_int ("videos", "videos", "videos", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_RAW_PROPERTY, g_param_spec_int ("raw", "raw", "raw", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 5202 "ImportPage.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_RAW_PROPERTY, camera_accumulator_properties[CAMERA_ACCUMULATOR_RAW_PROPERTY] = g_param_spec_int ("raw", "raw", "raw", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 5643 "ImportPage.c" } -static void camera_accumulator_core_tracker_accumulator_interface_init (CoreTrackerAccumulatorIface * iface) { +static void +camera_accumulator_core_tracker_accumulator_interface_init (CoreTrackerAccumulatorIface * iface) +{ #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" camera_accumulator_core_tracker_accumulator_parent_iface = g_type_interface_peek_parent (iface); #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -5212,11 +5655,13 @@ static void camera_accumulator_core_tracker_accumulator_interface_init (CoreTrac iface->uninclude = (gboolean (*) (CoreTrackerAccumulator *, DataObject*)) camera_accumulator_real_uninclude; #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" iface->altered = (gboolean (*) (CoreTrackerAccumulator *, DataObject*, Alteration*)) camera_accumulator_real_altered; -#line 5215 "ImportPage.c" +#line 5658 "ImportPage.c" } -static void camera_accumulator_instance_init (CameraAccumulator * self) { +static void +camera_accumulator_instance_init (CameraAccumulator * self) +{ #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv = CAMERA_ACCUMULATOR_GET_PRIVATE (self); #line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -5227,21 +5672,25 @@ static void camera_accumulator_instance_init (CameraAccumulator * self) { self->priv->_videos = 0; #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->_raw = 0; -#line 5230 "ImportPage.c" +#line 5675 "ImportPage.c" } -static void camera_accumulator_finalize (GObject * obj) { +static void +camera_accumulator_finalize (GObject * obj) +{ CameraAccumulator * self; #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator); #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (camera_accumulator_parent_class)->finalize (obj); -#line 5240 "ImportPage.c" +#line 5687 "ImportPage.c" } -GType camera_accumulator_get_type (void) { +GType +camera_accumulator_get_type (void) +{ static volatile gsize camera_accumulator_type_id__volatile = 0; if (g_once_init_enter (&camera_accumulator_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CameraAccumulatorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) camera_accumulator_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CameraAccumulator), 0, (GInstanceInitFunc) camera_accumulator_instance_init, NULL }; @@ -5255,7 +5704,12 @@ GType camera_accumulator_get_type (void) { } -static void _vala_camera_accumulator_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_camera_accumulator_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ CameraAccumulator * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator); #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -5284,18 +5738,23 @@ static void _vala_camera_accumulator_get_property (GObject * object, guint prope g_value_set_int (value, camera_accumulator_get_raw (self)); #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 5287 "ImportPage.c" +#line 5741 "ImportPage.c" default: #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 5293 "ImportPage.c" +#line 5747 "ImportPage.c" } } -static void _vala_camera_accumulator_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { +static void +_vala_camera_accumulator_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec) +{ CameraAccumulator * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator); #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -5324,25 +5783,32 @@ static void _vala_camera_accumulator_set_property (GObject * object, guint prope camera_accumulator_set_raw (self, g_value_get_int (value)); #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 5327 "ImportPage.c" +#line 5786 "ImportPage.c" default: #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 5333 "ImportPage.c" +#line 5792 "ImportPage.c" } } -static void _import_page_on_media_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { +static void +_import_page_on_media_added_removed_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self) +{ #line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_media_added_removed ((ImportPage*) self); -#line 5341 "ImportPage.c" +#line 5805 "ImportPage.c" } -GType import_page_refresh_result_get_type (void) { +GType +import_page_refresh_result_get_type (void) +{ static volatile gsize import_page_refresh_result_type_id__volatile = 0; if (g_once_init_enter (&import_page_refresh_result_type_id__volatile)) { static const GEnumValue values[] = {{IMPORT_PAGE_REFRESH_RESULT_OK, "IMPORT_PAGE_REFRESH_RESULT_OK", "ok"}, {IMPORT_PAGE_REFRESH_RESULT_BUSY, "IMPORT_PAGE_REFRESH_RESULT_BUSY", "busy"}, {IMPORT_PAGE_REFRESH_RESULT_LOCKED, "IMPORT_PAGE_REFRESH_RESULT_LOCKED", "locked"}, {IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR, "IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR", "library-error"}, {0, NULL, NULL}}; @@ -5354,115 +5820,153 @@ GType import_page_refresh_result_get_type (void) { } -static void _import_page_on_import_selected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_import_page_on_import_selected_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 876 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_import_selected ((ImportPage*) self); -#line 5360 "ImportPage.c" +#line 5830 "ImportPage.c" } -static void _import_page_on_import_all_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_import_page_on_import_all_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 876 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_import_all ((ImportPage*) self); -#line 5367 "ImportPage.c" +#line 5841 "ImportPage.c" } -static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 876 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" page_on_action_toggle ((Page*) self, action, parameter); -#line 5374 "ImportPage.c" +#line 5852 "ImportPage.c" } -static void _import_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_import_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 876 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_display_titles ((ImportPage*) self, action, value); -#line 5381 "ImportPage.c" +#line 5863 "ImportPage.c" } -static gint64 _import_page_preview_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_import_page_preview_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = import_page_preview_comparator (a, b); #line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 5390 "ImportPage.c" +#line 5876 "ImportPage.c" } -static gboolean _import_page_preview_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) { +static gboolean +_import_page_preview_comparator_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self) +{ gboolean result; result = import_page_preview_comparator_predicate (object, alteration); #line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 5399 "ImportPage.c" +#line 5889 "ImportPage.c" } -static void _import_page_on_view_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) { +static void +_import_page_on_view_changed_view_collection_items_state_changed (ViewCollection* _sender, + GeeIterable* changed, + gpointer self) +{ #line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_view_changed ((ImportPage*) self); -#line 5406 "ImportPage.c" +#line 5900 "ImportPage.c" } -static void _import_page_on_view_changed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { +static void +_import_page_on_view_changed_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self) +{ #line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_view_changed ((ImportPage*) self); -#line 5413 "ImportPage.c" +#line 5912 "ImportPage.c" } -static void _import_page_on_view_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) { +static void +_import_page_on_view_changed_view_collection_items_visibility_changed (ViewCollection* _sender, + GeeCollection* changed, + gpointer self) +{ #line 753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_view_changed ((ImportPage*) self); -#line 5420 "ImportPage.c" +#line 5923 "ImportPage.c" } -ImportPage* import_page_construct (GType object_type, Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon) { +ImportPage* +import_page_construct (GType object_type, + Camera* camera, + const gchar* uri, + const gchar* display_name, + const gchar* icon) +{ ImportPage * self = NULL; Camera* _tmp0_; - Camera* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp1_; + gchar* _tmp2_; gchar* _tmp3_; - const gchar* _tmp4_; + ImportSourceCollection* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; - ImportSourceCollection* _tmp7_; - const gchar* _tmp8_; - gchar* _tmp9_; - ViewCollection* _tmp10_; - ViewCollection* _tmp11_; - CameraViewTracker* _tmp12_; - const gchar* _tmp13_; - GtkLabel* _tmp24_; - const gchar* _tmp25_; - const gchar* _tmp26_; - GVolumeMonitor* _tmp27_; - GPContextWrapper* _tmp28_; - GPSpinIdleWrapper* _tmp30_; + ViewCollection* _tmp6_; + ViewCollection* _tmp7_; + CameraViewTracker* _tmp8_; + GtkLabel* _tmp17_; + const gchar* _tmp18_; + const gchar* _tmp19_; + GVolumeMonitor* _tmp20_; + GPContextWrapper* _tmp21_; + GPSpinIdleWrapper* _tmp23_; + ViewCollection* _tmp25_; + ViewCollection* _tmp26_; + SourceCollection* _tmp27_; + ImportPageImportViewManager* _tmp28_; + ImportPageImportViewManager* _tmp29_; + ViewCollectionMonitor* _tmp30_; + ViewCollectionMonitor* _tmp31_; ViewCollection* _tmp32_; ViewCollection* _tmp33_; - SourceCollection* _tmp34_; - ImportPageImportViewManager* _tmp35_; - ImportPageImportViewManager* _tmp36_; - ViewCollectionMonitor* _tmp37_; - ViewCollectionMonitor* _tmp38_; + ViewCollection* _tmp34_; + ViewCollection* _tmp35_; + ViewCollection* _tmp36_; + ViewCollection* _tmp37_; + ViewCollection* _tmp38_; ViewCollection* _tmp39_; ViewCollection* _tmp40_; ViewCollection* _tmp41_; - ViewCollection* _tmp42_; - ViewCollection* _tmp43_; - ViewCollection* _tmp44_; - ViewCollection* _tmp45_; - ViewCollection* _tmp46_; - ViewCollection* _tmp47_; - ViewCollection* _tmp48_; - GValue _tmp49_ = {0}; - LibraryPhotoSourceCollection* _tmp50_; - VideoSourceCollection* _tmp51_; + GValue _tmp42_ = {0}; + LibraryPhotoSourceCollection* _tmp43_; + VideoSourceCollection* _tmp44_; #line 710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (camera != NULL, NULL); #line 710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -5470,274 +5974,268 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha #line 711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = (ImportPage*) checkerboard_page_construct (object_type, _ ("Camera")); #line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = camera; -#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = _GPHOTO_REF_CAMERA0 (_tmp0_); + _tmp0_ = _GPHOTO_REF_CAMERA0 (camera); #line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_camera_unref0 (self->priv->camera); #line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->camera = _tmp1_; -#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = uri; + self->priv->camera = _tmp0_; #line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (uri); #line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->uri); #line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->uri = _tmp3_; + self->priv->uri = _tmp1_; #line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = uri; + _tmp2_ = g_strdup_printf ("ImportSources for %s", uri); #line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = g_strdup_printf ("ImportSources for %s", _tmp4_); -#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = import_source_collection_new (_tmp6_); + _tmp4_ = import_source_collection_new (_tmp3_); #line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (self->priv->import_sources); #line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->import_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_SOURCE_COLLECTION, SourceCollection); + self->priv->import_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_COLLECTION, SourceCollection); #line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp6_); -#line 715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = icon; + _g_free0 (_tmp3_); #line 715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = g_strdup (_tmp8_); + _tmp5_ = g_strdup (icon); #line 715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->icon); #line 715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->icon = _tmp9_; + self->priv->icon = _tmp5_; #line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = _tmp10_; + _tmp7_ = _tmp6_; #line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = camera_view_tracker_new (_tmp11_); + _tmp8_ = camera_view_tracker_new (_tmp7_); #line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _core_tracker_unref0 (self->priv->tracker); #line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->tracker = _tmp12_; + self->priv->tracker = _tmp8_; #line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _data_collection_unref0 (_tmp11_); -#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = display_name; + _data_collection_unref0 (_tmp7_); #line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (NULL != _tmp13_) { -#line 5526 "ImportPage.c" - const gchar* _tmp14_; - gchar* _tmp15_; -#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = display_name; + if (NULL != display_name) { +#line 6020 "ImportPage.c" + gchar* _tmp9_; #line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp15_ = g_strdup (_tmp14_); + _tmp9_ = g_strdup (display_name); #line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->camera_name); #line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->camera_name = _tmp15_; -#line 5537 "ImportPage.c" + self->priv->camera_name = _tmp9_; +#line 6028 "ImportPage.c" } else { CameraAbilities abilities = {0}; int res = 0; - Camera* _tmp16_; - CameraAbilities _tmp17_ = {0}; - int _tmp18_; - int _tmp19_; -#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp16_ = camera; + CameraAbilities _tmp10_ = {0}; + int _tmp11_; + int _tmp12_; #line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp18_ = gp_camera_get_abilities (_tmp16_, &_tmp17_); + _tmp11_ = gp_camera_get_abilities (camera, &_tmp10_); #line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" (abilities); #line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - abilities = _tmp17_; + abilities = _tmp10_; #line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - res = _tmp18_; + res = _tmp11_; #line 725 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp19_ = res; + _tmp12_ = res; #line 725 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp19_ != GP_OK) { -#line 5559 "ImportPage.c" - int _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; - gchar* _tmp23_; + if (_tmp12_ != GP_OK) { +#line 6047 "ImportPage.c" + int _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; #line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp20_ = res; + _tmp13_ = res; #line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp21_ = gp_result_to_full_string (_tmp20_); + _tmp14_ = gp_result_to_full_string (_tmp13_); #line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp22_ = _tmp21_; + _tmp15_ = _tmp14_; #line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_debug ("ImportPage.vala:726: Unable to get camera abilities: %s", _tmp22_); + g_debug ("ImportPage.vala:726: Unable to get camera abilities: %s", _tmp15_); #line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp15_); #line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp23_ = g_strdup (_ ("Camera")); + _tmp16_ = g_strdup (_ ("Camera")); #line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->camera_name); #line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->camera_name = _tmp23_; -#line 5580 "ImportPage.c" + self->priv->camera_name = _tmp16_; +#line 6068 "ImportPage.c" } #line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" (abilities); -#line 5584 "ImportPage.c" +#line 6072 "ImportPage.c" } #line 730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp24_ = self->priv->camera_label; + _tmp17_ = self->priv->camera_label; #line 730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp25_ = self->priv->camera_name; + _tmp18_ = self->priv->camera_name; #line 730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_label_set_text (_tmp24_, _tmp25_); + gtk_label_set_text (_tmp17_, _tmp18_); #line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp26_ = self->priv->camera_name; + _tmp19_ = self->priv->camera_name; #line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp26_); + page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp19_); #line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp27_ = g_volume_monitor_get (); + _tmp20_ = g_volume_monitor_get (); #line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->volume_monitor); #line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->volume_monitor = _tmp27_; + self->priv->volume_monitor = _tmp20_; #line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp28_ = import_page_null_context; + _tmp21_ = import_page_null_context; #line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp28_ == NULL) { -#line 5606 "ImportPage.c" - GPContextWrapper* _tmp29_; + if (_tmp21_ == NULL) { +#line 6094 "ImportPage.c" + GPContextWrapper* _tmp22_; #line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp29_ = gp_context_wrapper_new (); + _tmp22_ = gp_context_wrapper_new (); #line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_context_wrapper_unref0 (import_page_null_context); #line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_null_context = _tmp29_; -#line 5614 "ImportPage.c" + import_page_null_context = _tmp22_; +#line 6102 "ImportPage.c" } #line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp30_ = import_page_spin_idle_context; + _tmp23_ = import_page_spin_idle_context; #line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp30_ == NULL) { -#line 5620 "ImportPage.c" - GPSpinIdleWrapper* _tmp31_; + if (_tmp23_ == NULL) { +#line 6108 "ImportPage.c" + GPSpinIdleWrapper* _tmp24_; #line 742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp31_ = gp_spin_idle_wrapper_new (); + _tmp24_ = gp_spin_idle_wrapper_new (); #line 742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_context_wrapper_unref0 (import_page_spin_idle_context); #line 742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_spin_idle_context = _tmp31_; -#line 5628 "ImportPage.c" + import_page_spin_idle_context = _tmp24_; +#line 6116 "ImportPage.c" } #line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp32_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp25_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp33_ = _tmp32_; + _tmp26_ = _tmp25_; #line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp34_ = self->priv->import_sources; + _tmp27_ = self->priv->import_sources; #line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp35_ = import_page_import_view_manager_new (self); + _tmp28_ = import_page_import_view_manager_new (self); #line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp36_ = _tmp35_; + _tmp29_ = _tmp28_; #line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp37_ = view_collection_monitor_source_collection (_tmp33_, _tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL); + _tmp30_ = view_collection_monitor_source_collection (_tmp26_, _tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL); #line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp38_ = _tmp37_; + _tmp31_ = _tmp30_; #line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _view_collection_monitor_unref0 (_tmp38_); + _view_collection_monitor_unref0 (_tmp31_); #line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _view_manager_unref0 (_tmp36_); + _view_manager_unref0 (_tmp29_); #line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _data_collection_unref0 (_tmp33_); + _data_collection_unref0 (_tmp26_); #line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp39_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp32_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp40_ = _tmp39_; + _tmp33_ = _tmp32_; #line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_COLLECTION, DataCollection), _import_page_preview_comparator_comparator, NULL, _import_page_preview_comparator_predicate_comparator_predicate, NULL); + data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_COLLECTION, DataCollection), _import_page_preview_comparator_comparator, NULL, _import_page_preview_comparator_predicate_comparator_predicate, NULL); #line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _data_collection_unref0 (_tmp40_); + _data_collection_unref0 (_tmp33_); #line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp41_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp34_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp42_ = _tmp41_; + _tmp35_ = _tmp34_; #line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_signal_connect_object (_tmp42_, "items-state-changed", (GCallback) _import_page_on_view_changed_view_collection_items_state_changed, self, 0); + g_signal_connect_object (_tmp35_, "items-state-changed", (GCallback) _import_page_on_view_changed_view_collection_items_state_changed, self, 0); #line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _data_collection_unref0 (_tmp42_); + _data_collection_unref0 (_tmp35_); #line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp43_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp36_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp44_ = _tmp43_; + _tmp37_ = _tmp36_; #line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_view_changed_data_collection_contents_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_view_changed_data_collection_contents_altered, self, 0); #line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _data_collection_unref0 (_tmp44_); + _data_collection_unref0 (_tmp37_); #line 753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp45_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp38_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp46_ = _tmp45_; + _tmp39_ = _tmp38_; #line 753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_signal_connect_object (_tmp46_, "items-visibility-changed", (GCallback) _import_page_on_view_changed_view_collection_items_visibility_changed, self, 0); + g_signal_connect_object (_tmp39_, "items-visibility-changed", (GCallback) _import_page_on_view_changed_view_collection_items_visibility_changed, self, 0); #line 753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _data_collection_unref0 (_tmp46_); + _data_collection_unref0 (_tmp39_); #line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp47_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp40_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp48_ = _tmp47_; + _tmp41_ = _tmp40_; #line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_value_init (&_tmp49_, G_TYPE_BOOLEAN); + g_value_init (&_tmp42_, G_TYPE_BOOLEAN); #line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_value_set_boolean (&_tmp49_, TRUE); + g_value_set_boolean (&_tmp42_, TRUE); #line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES, &_tmp49_, NULL, NULL); + data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES, &_tmp42_, NULL, NULL); #line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - G_IS_VALUE (&_tmp49_) ? (g_value_unset (&_tmp49_), NULL) : NULL; + G_IS_VALUE (&_tmp42_) ? (g_value_unset (&_tmp42_), NULL) : NULL; #line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _data_collection_unref0 (_tmp48_); + _data_collection_unref0 (_tmp41_); #line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp50_ = library_photo_global; + _tmp43_ = library_photo_global; #line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0); #line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp51_ = video_global; + _tmp44_ = video_global; #line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0); #line 762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "ImportContextMenu"); #line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "ImportContextMenu"); #line 710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 5710 "ImportPage.c" +#line 6198 "ImportPage.c" } -ImportPage* import_page_new (Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon) { +ImportPage* +import_page_new (Camera* camera, + const gchar* uri, + const gchar* display_name, + const gchar* icon) +{ #line 710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return import_page_construct (TYPE_IMPORT_PAGE, camera, uri, display_name, icon); -#line 5717 "ImportPage.c" +#line 6210 "ImportPage.c" } -static void _import_page_on_hide_imported_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_import_page_on_hide_imported_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_hide_imported ((ImportPage*) self); -#line 5724 "ImportPage.c" +#line 6220 "ImportPage.c" } -static GtkToolbar* import_page_real_get_toolbar (Page* base) { +static GtkToolbar* +import_page_real_get_toolbar (Page* base) +{ ImportPage * self; GtkToolbar* result = NULL; GtkToolbar* _tmp0_; + GtkToolbar* _tmp54_; GtkToolbar* _tmp55_; - GtkToolbar* _tmp56_; #line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage); #line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; #line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_ == NULL) { -#line 5740 "ImportPage.c" +#line 6238 "ImportPage.c" GtkToolbar* _tmp1_; GtkToolbar* _tmp2_; GtkCheckButton* _tmp3_; @@ -5747,57 +6245,56 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) { GtkCheckButton* _tmp7_; ConfigFacade* _tmp8_; ConfigFacade* _tmp9_; - gboolean _tmp10_; GtkToolItem* hide_item = NULL; + GtkToolItem* _tmp10_; GtkToolItem* _tmp11_; GtkToolItem* _tmp12_; - GtkToolItem* _tmp13_; - GtkCheckButton* _tmp14_; - GtkToolbar* _tmp15_; - GtkToolItem* _tmp16_; + GtkCheckButton* _tmp13_; + GtkToolbar* _tmp14_; + GtkToolItem* _tmp15_; GtkSeparatorToolItem* separator = NULL; + GtkSeparatorToolItem* _tmp16_; GtkSeparatorToolItem* _tmp17_; - GtkSeparatorToolItem* _tmp18_; - GtkToolbar* _tmp19_; - GtkSeparatorToolItem* _tmp20_; + GtkToolbar* _tmp18_; + GtkSeparatorToolItem* _tmp19_; + GtkProgressBar* _tmp20_; GtkProgressBar* _tmp21_; - GtkProgressBar* _tmp22_; GtkToolItem* progress_item = NULL; + GtkToolItem* _tmp22_; GtkToolItem* _tmp23_; GtkToolItem* _tmp24_; - GtkToolItem* _tmp25_; + GtkProgressBar* _tmp25_; GtkProgressBar* _tmp26_; - GtkProgressBar* _tmp27_; - GtkToolbar* _tmp28_; - GtkToolItem* _tmp29_; + GtkToolbar* _tmp27_; + GtkToolItem* _tmp28_; GtkToggleToolButton* find_button = NULL; + GtkToggleToolButton* _tmp29_; GtkToggleToolButton* _tmp30_; GtkToggleToolButton* _tmp31_; - GtkToggleToolButton* _tmp32_; - GtkToolbar* _tmp33_; - GtkToggleToolButton* _tmp34_; - GtkToolbar* _tmp35_; + GtkToolbar* _tmp32_; + GtkToggleToolButton* _tmp33_; + GtkToolbar* _tmp34_; + GtkSeparatorToolItem* _tmp35_; GtkSeparatorToolItem* _tmp36_; - GtkSeparatorToolItem* _tmp37_; GtkToolButton* import_selected_button = NULL; + GtkToolButton* _tmp37_; GtkToolButton* _tmp38_; GtkToolButton* _tmp39_; GtkToolButton* _tmp40_; GtkToolButton* _tmp41_; GtkToolButton* _tmp42_; - GtkToolButton* _tmp43_; - GtkToolbar* _tmp44_; - GtkToolButton* _tmp45_; + GtkToolbar* _tmp43_; + GtkToolButton* _tmp44_; GtkToolButton* import_all_button = NULL; + GtkToolButton* _tmp45_; GtkToolButton* _tmp46_; GtkToolButton* _tmp47_; GtkToolButton* _tmp48_; GtkToolButton* _tmp49_; GtkToolButton* _tmp50_; - GtkToolButton* _tmp51_; - GtkToolbar* _tmp52_; - GtkToolButton* _tmp53_; - GtkProgressBar* _tmp54_; + GtkToolbar* _tmp51_; + GtkToolButton* _tmp52_; + GtkProgressBar* _tmp53_; #line 773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = PAGE_CLASS (import_page_parent_class)->get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page)); #line 773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -5831,183 +6328,181 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) { #line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp9_ = _tmp8_; #line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = configuration_facade_get_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp10_); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_toggle_button_get_type (), GtkToggleButton), configuration_facade_get_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp9_); #line 781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = gtk_tool_item_new (); + _tmp10_ = gtk_tool_item_new (); #line 781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_ref_sink (_tmp11_); + g_object_ref_sink (_tmp10_); #line 781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - hide_item = _tmp11_; + hide_item = _tmp10_; #line 782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = hide_item; + _tmp11_ = hide_item; #line 782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_tool_item_set_is_important (_tmp12_, TRUE); + gtk_tool_item_set_is_important (_tmp11_, TRUE); #line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = hide_item; + _tmp12_ = hide_item; #line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = self->priv->hide_imported; + _tmp13_ = self->priv->hide_imported; #line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget)); #line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; + _tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; #line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp16_ = hide_item; + _tmp15_ = hide_item; #line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_toolbar_insert (_tmp15_, _tmp16_, -1); + gtk_toolbar_insert (_tmp14_, _tmp15_, -1); #line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp17_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); + _tmp16_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); #line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_ref_sink (_tmp17_); + g_object_ref_sink (_tmp16_); #line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - separator = _tmp17_; + separator = _tmp16_; #line 789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp18_ = separator; + _tmp17_ = separator; #line 789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_separator_tool_item_set_draw (_tmp18_, FALSE); + gtk_separator_tool_item_set_draw (_tmp17_, FALSE); #line 791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; + _tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; #line 791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp20_ = separator; + _tmp19_ = separator; #line 791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_toolbar_insert (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_tool_item_get_type (), GtkToolItem), -1); + gtk_toolbar_insert (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp21_ = self->priv->progress_bar; + _tmp20_ = self->priv->progress_bar; #line 794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_orientable_set_orientation (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_ORIENTABLE, GtkOrientable), GTK_ORIENTATION_HORIZONTAL); + gtk_orientable_set_orientation (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_orientable_get_type (), GtkOrientable), GTK_ORIENTATION_HORIZONTAL); #line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp22_ = self->priv->progress_bar; + _tmp21_ = self->priv->progress_bar; #line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE); #line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp23_ = gtk_tool_item_new (); + _tmp22_ = gtk_tool_item_new (); #line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_ref_sink (_tmp23_); + g_object_ref_sink (_tmp22_); #line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - progress_item = _tmp23_; + progress_item = _tmp22_; #line 797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp24_ = progress_item; + _tmp23_ = progress_item; #line 797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_tool_item_set_expand (_tmp24_, TRUE); + gtk_tool_item_set_expand (_tmp23_, TRUE); #line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp25_ = progress_item; + _tmp24_ = progress_item; #line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp26_ = self->priv->progress_bar; + _tmp25_ = self->priv->progress_bar; #line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget)); #line 799 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp27_ = self->priv->progress_bar; + _tmp26_ = self->priv->progress_bar; #line 799 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_progress_bar_set_show_text (_tmp27_, TRUE); + gtk_progress_bar_set_show_text (_tmp26_, TRUE); #line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp28_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; + _tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; #line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp29_ = progress_item; + _tmp28_ = progress_item; #line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_toolbar_insert (_tmp28_, _tmp29_, -1); + gtk_toolbar_insert (_tmp27_, _tmp28_, -1); #line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp30_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new (); + _tmp29_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new (); #line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_ref_sink (_tmp30_); + g_object_ref_sink (_tmp29_); #line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - find_button = _tmp30_; + find_button = _tmp29_; #line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp31_ = find_button; + _tmp30_ = find_button; #line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_button_get_type (), GtkToolButton), "edit-find"); + gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_tool_button_get_type (), GtkToolButton), "edit-find"); #line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp32_ = find_button; + _tmp31_ = find_button; #line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.CommonDisplaySearchbar"); + gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_actionable_get_type (), GtkActionable), "win.CommonDisplaySearchbar"); #line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; + _tmp32_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; #line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp34_ = find_button; + _tmp33_ = find_button; #line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_toolbar_insert (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_tool_item_get_type (), GtkToolItem), -1); + gtk_toolbar_insert (_tmp32_, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; + _tmp34_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; #line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp36_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); + _tmp35_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); #line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_ref_sink (_tmp36_); + g_object_ref_sink (_tmp35_); #line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp37_ = _tmp36_; + _tmp36_ = _tmp35_; #line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_toolbar_insert (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_tool_item_get_type (), GtkToolItem), -1); + gtk_toolbar_insert (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp37_); + _g_object_unref0 (_tmp36_); #line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp38_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL); + _tmp37_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL); #line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_ref_sink (_tmp38_); + g_object_ref_sink (_tmp37_); #line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_selected_button = _tmp38_; + import_selected_button = _tmp37_; #line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp39_ = import_selected_button; + _tmp38_ = import_selected_button; #line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_tool_button_set_icon_name (_tmp39_, "import"); + gtk_tool_button_set_icon_name (_tmp38_, "import"); #line 816 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp40_ = import_selected_button; + _tmp39_ = import_selected_button; #line 816 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_tool_button_set_label (_tmp40_, _ ("Import _Selected")); + gtk_tool_button_set_label (_tmp39_, _ ("Import _Selected")); #line 817 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp41_ = import_selected_button; + _tmp40_ = import_selected_button; #line 817 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_tool_item_get_type (), GtkToolItem), TRUE); + gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_tool_item_get_type (), GtkToolItem), TRUE); #line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp42_ = import_selected_button; + _tmp41_ = import_selected_button; #line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_tool_button_set_use_underline (_tmp42_, TRUE); + gtk_tool_button_set_use_underline (_tmp41_, TRUE); #line 819 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp43_ = import_selected_button; + _tmp42_ = import_selected_button; #line 819 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportSelected"); + gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_actionable_get_type (), GtkActionable), "win.ImportSelected"); #line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp44_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; + _tmp43_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; #line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp45_ = import_selected_button; + _tmp44_ = import_selected_button; #line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_toolbar_insert (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_tool_item_get_type (), GtkToolItem), -1); + gtk_toolbar_insert (_tmp43_, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp46_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL); + _tmp45_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL); #line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_ref_sink (_tmp46_); + g_object_ref_sink (_tmp45_); #line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_all_button = _tmp46_; + import_all_button = _tmp45_; #line 825 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp47_ = import_all_button; + _tmp46_ = import_all_button; #line 825 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_tool_button_set_icon_name (_tmp47_, "import-all"); + gtk_tool_button_set_icon_name (_tmp46_, "import-all"); #line 826 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp48_ = import_all_button; + _tmp47_ = import_all_button; #line 826 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_tool_button_set_label (_tmp48_, _ ("Import _All")); + gtk_tool_button_set_label (_tmp47_, _ ("Import _All")); #line 827 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp49_ = import_all_button; + _tmp48_ = import_all_button; #line 827 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_tool_item_get_type (), GtkToolItem), TRUE); + gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_tool_item_get_type (), GtkToolItem), TRUE); #line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp50_ = import_all_button; + _tmp49_ = import_all_button; #line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_tool_button_set_use_underline (_tmp50_, TRUE); + gtk_tool_button_set_use_underline (_tmp49_, TRUE); #line 829 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp51_ = import_all_button; + _tmp50_ = import_all_button; #line 829 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportAll"); + gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_actionable_get_type (), GtkActionable), "win.ImportAll"); #line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp52_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; + _tmp51_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; #line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp53_ = import_all_button; + _tmp52_ = import_all_button; #line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_toolbar_insert (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_tool_item_get_type (), GtkToolItem), -1); + gtk_toolbar_insert (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 835 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp54_ = self->priv->progress_bar; + _tmp53_ = self->priv->progress_bar; #line 835 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_widget_set_no_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_no_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_widget_get_type (), GtkWidget), TRUE); #line 837 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_update_toolbar_state (self); #line 839 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -6024,28 +6519,32 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) { _g_object_unref0 (separator); #line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (hide_item); -#line 6027 "ImportPage.c" +#line 6522 "ImportPage.c" } #line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp55_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; + _tmp54_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar; #line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp56_ = _g_object_ref0 (_tmp55_); + _tmp55_ = _g_object_ref0 (_tmp54_); #line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp56_; + result = _tmp55_; #line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6037 "ImportPage.c" +#line 6532 "ImportPage.c" } -static gpointer _core_tracker_ref0 (gpointer self) { +static gpointer +_core_tracker_ref0 (gpointer self) +{ #line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self ? core_tracker_ref (self) : NULL; -#line 6044 "ImportPage.c" +#line 6541 "ImportPage.c" } -static CoreViewTracker* import_page_real_get_view_tracker (CheckerboardPage* base) { +static CoreViewTracker* +import_page_real_get_view_tracker (CheckerboardPage* base) +{ ImportPage * self; CoreViewTracker* result = NULL; CameraViewTracker* _tmp0_; @@ -6060,11 +6559,13 @@ static CoreViewTracker* import_page_real_get_view_tracker (CheckerboardPage* bas result = _tmp1_; #line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6063 "ImportPage.c" +#line 6562 "ImportPage.c" } -static gchar* import_page_real_get_view_empty_message (CheckerboardPage* base) { +static gchar* +import_page_real_get_view_empty_message (CheckerboardPage* base) +{ ImportPage * self; gchar* result = NULL; gchar* _tmp0_; @@ -6076,11 +6577,13 @@ static gchar* import_page_real_get_view_empty_message (CheckerboardPage* base) { result = _tmp0_; #line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6079 "ImportPage.c" +#line 6580 "ImportPage.c" } -static gchar* import_page_real_get_filter_no_match_message (CheckerboardPage* base) { +static gchar* +import_page_real_get_filter_no_match_message (CheckerboardPage* base) +{ ImportPage * self; gchar* result = NULL; gchar* _tmp0_; @@ -6092,180 +6595,153 @@ static gchar* import_page_real_get_filter_no_match_message (CheckerboardPage* ba result = _tmp0_; #line 854 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6095 "ImportPage.c" +#line 6598 "ImportPage.c" } -static gint64 import_page_preview_comparator (void* a, void* b) { +static gint64 +import_page_preview_comparator (void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; + ImportSource* _tmp0_; ImportSource* _tmp1_; ImportSource* _tmp2_; - time_t _tmp3_; - void* _tmp4_; - ImportSource* _tmp5_; - ImportSource* _tmp6_; - time_t _tmp7_; - gint64 _tmp8_; -#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = a; -#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST ((ImportPreview*) _tmp0_, TYPE_IMPORT_PREVIEW, ImportPreview)); -#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = _tmp1_; -#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = import_source_get_exposure_time (_tmp2_); + ImportSource* _tmp3_; + gint64 _tmp4_; #line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = b; + _tmp0_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST ((ImportPreview*) a, TYPE_IMPORT_PREVIEW, ImportPreview)); #line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST ((ImportPreview*) _tmp4_, TYPE_IMPORT_PREVIEW, ImportPreview)); + _tmp1_ = _tmp0_; #line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = _tmp5_; + _tmp2_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST ((ImportPreview*) b, TYPE_IMPORT_PREVIEW, ImportPreview)); #line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = import_source_get_exposure_time (_tmp6_); + _tmp3_ = _tmp2_; #line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = (gint64) (_tmp3_ - _tmp7_); + _tmp4_ = (gint64) (import_source_get_exposure_time (_tmp1_) - import_source_get_exposure_time (_tmp3_)); #line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp3_); #line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp8_; + result = _tmp4_; #line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6136 "ImportPage.c" +#line 6630 "ImportPage.c" } -static gboolean import_page_preview_comparator_predicate (DataObject* object, Alteration* alteration) { +static gboolean +import_page_preview_comparator_predicate (DataObject* object, + Alteration* alteration) +{ gboolean result = FALSE; - Alteration* _tmp0_; - gboolean _tmp1_; #line 862 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 862 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 863 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = alteration; -#line 863 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "exposure-time"); -#line 863 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp1_; + result = alteration_has_detail (alteration, "metadata", "exposure-time"); #line 863 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6156 "ImportPage.c" +#line 6647 "ImportPage.c" } -static gint64 import_page_import_job_comparator (ImportPage* self, void* a, void* b) { +static gint64 +import_page_import_job_comparator (ImportPage* self, + void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; - time_t _tmp1_; - void* _tmp2_; - time_t _tmp3_; #line 866 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PAGE (self), 0LL); #line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = a; -#line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = import_page_camera_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((ImportPageCameraImportJob*) _tmp0_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob)); -#line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = b; -#line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = import_page_camera_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((ImportPageCameraImportJob*) _tmp2_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob)); -#line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = (gint64) (_tmp1_ - _tmp3_); + result = (gint64) (import_page_camera_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((ImportPageCameraImportJob*) a, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob)) - import_page_camera_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((ImportPageCameraImportJob*) b, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob))); #line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6180 "ImportPage.c" +#line 6663 "ImportPage.c" } -static void import_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { +static void +import_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames) +{ ImportPage * self; - GeeList* _tmp0_; - GeeList* _tmp1_; #line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage); #line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); #line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = ui_filenames; -#line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - PAGE_CLASS (import_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); + PAGE_CLASS (import_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), ui_filenames); #line 873 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = ui_filenames; -#line 873 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "import.ui"); -#line 6200 "ImportPage.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "import.ui"); +#line 6680 "ImportPage.c" } -static GVariant* _variant_new15 (gboolean value) { +static GVariant* +_variant_new15 (gboolean value) +{ #line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 6207 "ImportPage.c" +#line 6689 "ImportPage.c" } -static void import_page_real_add_actions (Page* base, GActionMap* map) { +static void +import_page_real_add_actions (Page* base, + GActionMap* map) +{ ImportPage * self; - GActionMap* _tmp0_; - GActionMap* _tmp1_; - GAction* _tmp2_; - GAction* _tmp3_; - ConfigFacade* _tmp4_; - ConfigFacade* _tmp5_; - gboolean _tmp6_; - GVariant* _tmp7_; + GAction* _tmp0_; + GAction* _tmp1_; + ConfigFacade* _tmp2_; + ConfigFacade* _tmp3_; + GVariant* _tmp4_; #line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage); #line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = map; -#line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - PAGE_CLASS (import_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); + PAGE_CLASS (import_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map); #line 886 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = map; -#line 886 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_action_map_add_action_entries (_tmp1_, IMPORT_PAGE_entries, G_N_ELEMENTS (IMPORT_PAGE_entries), self); -#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle"); + g_action_map_add_action_entries (map, IMPORT_PAGE_entries, G_N_ELEMENTS (IMPORT_PAGE_entries), self); #line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = _tmp2_; -#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = config_facade_get_instance (); + _tmp0_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle"); #line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = _tmp4_; + _tmp1_ = _tmp0_; #line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp2_ = config_facade_get_instance (); #line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = _variant_new15 (_tmp6_); + _tmp3_ = _tmp2_; #line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_action_change_state (_tmp3_, _tmp7_); + _tmp4_ = _variant_new15 (configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_variant_unref0 (_tmp7_); + g_action_change_state (_tmp1_, _tmp4_); #line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp5_); + _g_variant_unref0 (_tmp4_); #line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp3_); -#line 6253 "ImportPage.c" +#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _g_object_unref0 (_tmp1_); +#line 6729 "ImportPage.c" } -static void import_page_real_remove_actions (Page* base, GActionMap* map) { +static void +import_page_real_remove_actions (Page* base, + GActionMap* map) +{ ImportPage * self; - GActionMap* _tmp0_; #line 891 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage); #line 891 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 892 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = map; -#line 892 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - PAGE_CLASS (import_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); -#line 6268 "ImportPage.c" + PAGE_CLASS (import_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map); +#line 6744 "ImportPage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -6277,31 +6753,30 @@ static void import_page_real_remove_actions (Page* base, GActionMap* map) { entry_collection_length1 = G_N_ELEMENTS (IMPORT_PAGE_entries); #line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (IMPORT_PAGE_entries); entry_it = entry_it + 1) { -#line 6280 "ImportPage.c" +#line 6756 "ImportPage.c" GActionEntry entry = {0}; #line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" entry = entry_collection[entry_it]; -#line 6284 "ImportPage.c" +#line 6760 "ImportPage.c" { - GActionMap* _tmp1_; - GActionEntry _tmp2_; - const gchar* _tmp3_; -#line 894 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = map; + GActionEntry _tmp0_; + const gchar* _tmp1_; #line 894 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = entry; + _tmp0_ = entry; #line 894 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = _tmp2_.name; + _tmp1_ = _tmp0_.name; #line 894 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_action_map_remove_action (_tmp1_, _tmp3_); -#line 6297 "ImportPage.c" + g_action_map_remove_action (map, _tmp1_); +#line 6770 "ImportPage.c" } } } } -Camera* import_page_get_camera (ImportPage* self) { +Camera* +import_page_get_camera (ImportPage* self) +{ Camera* result = NULL; Camera* _tmp0_; Camera* _tmp1_; @@ -6315,11 +6790,13 @@ Camera* import_page_get_camera (ImportPage* self) { result = _tmp1_; #line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6318 "ImportPage.c" +#line 6793 "ImportPage.c" } -gchar* import_page_get_uri (ImportPage* self) { +gchar* +import_page_get_uri (ImportPage* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -6333,11 +6810,13 @@ gchar* import_page_get_uri (ImportPage* self) { result = _tmp1_; #line 903 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6336 "ImportPage.c" +#line 6813 "ImportPage.c" } -gboolean import_page_is_busy (ImportPage* self) { +gboolean +import_page_is_busy (ImportPage* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -6348,14 +6827,16 @@ gboolean import_page_is_busy (ImportPage* self) { result = _tmp0_; #line 907 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6351 "ImportPage.c" +#line 6830 "ImportPage.c" } -static void import_page_real_init_actions (Page* base, gint selected_count, gint count) { +static void +import_page_real_init_actions (Page* base, + gint selected_count, + gint count) +{ ImportPage * self; - gint _tmp0_; - gint _tmp1_; #line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage); #line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -6365,16 +6846,14 @@ static void import_page_real_init_actions (Page* base, gint selected_count, gint #line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", TRUE); #line 916 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = selected_count; -#line 916 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = count; -#line 916 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - PAGE_CLASS (import_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_, _tmp1_); -#line 6373 "ImportPage.c" + PAGE_CLASS (import_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), selected_count, count); +#line 6850 "ImportPage.c" } -gboolean import_page_is_refreshed (ImportPage* self) { +gboolean +import_page_is_refreshed (ImportPage* self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_; @@ -6384,27 +6863,29 @@ gboolean import_page_is_refreshed (ImportPage* self) { _tmp1_ = self->priv->refreshed; #line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp1_) { -#line 6387 "ImportPage.c" +#line 6866 "ImportPage.c" gboolean _tmp2_; #line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = self->priv->busy; #line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = !_tmp2_; -#line 6393 "ImportPage.c" +#line 6872 "ImportPage.c" } else { #line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = FALSE; -#line 6397 "ImportPage.c" +#line 6876 "ImportPage.c" } #line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp0_; #line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6403 "ImportPage.c" +#line 6882 "ImportPage.c" } -gchar* import_page_get_refresh_message (ImportPage* self) { +gchar* +import_page_get_refresh_message (ImportPage* self) +{ gchar* result = NULL; gchar* msg = NULL; const gchar* _tmp0_; @@ -6416,7 +6897,7 @@ gchar* import_page_get_refresh_message (ImportPage* self) { _tmp0_ = self->priv->refresh_error; #line 925 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_ != NULL) { -#line 6419 "ImportPage.c" +#line 6900 "ImportPage.c" const gchar* _tmp1_; gchar* _tmp2_; #line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -6427,14 +6908,14 @@ gchar* import_page_get_refresh_message (ImportPage* self) { _g_free0 (msg); #line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" msg = _tmp2_; -#line 6430 "ImportPage.c" +#line 6911 "ImportPage.c" } else { int _tmp3_; #line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = self->priv->refresh_result; #line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp3_ == GP_OK) { -#line 6437 "ImportPage.c" +#line 6918 "ImportPage.c" } else { int _tmp4_; gchar* _tmp5_; @@ -6446,37 +6927,37 @@ gchar* import_page_get_refresh_message (ImportPage* self) { _g_free0 (msg); #line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" msg = _tmp5_; -#line 6449 "ImportPage.c" +#line 6930 "ImportPage.c" } } #line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = msg; #line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6456 "ImportPage.c" +#line 6937 "ImportPage.c" } -static void import_page_update_status (ImportPage* self, gboolean busy, gboolean refreshed) { - gboolean _tmp0_; - gboolean _tmp1_; +static void +import_page_update_status (ImportPage* self, + gboolean busy, + gboolean refreshed) +{ #line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); #line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = busy; -#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->busy = _tmp0_; + self->priv->busy = busy; #line 938 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = refreshed; -#line 938 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->refreshed = _tmp1_; + self->priv->refreshed = refreshed; #line 940 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_view_changed (self); -#line 6475 "ImportPage.c" +#line 6954 "ImportPage.c" } -static void import_page_update_toolbar_state (ImportPage* self) { +static void +import_page_update_toolbar_state (ImportPage* self) +{ GtkCheckButton* _tmp0_; #line 943 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); @@ -6484,182 +6965,174 @@ static void import_page_update_toolbar_state (ImportPage* self) { _tmp0_ = self->priv->hide_imported; #line 944 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_ != NULL) { -#line 6487 "ImportPage.c" +#line 6968 "ImportPage.c" gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; gboolean _tmp3_; - GtkCheckButton* _tmp8_; + GtkCheckButton* _tmp7_; #line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = self->priv->busy; #line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp3_) { -#line 6496 "ImportPage.c" +#line 6977 "ImportPage.c" gboolean _tmp4_; #line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = self->priv->refreshed; #line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = _tmp4_; -#line 6502 "ImportPage.c" +#line 6983 "ImportPage.c" } else { #line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = FALSE; -#line 6506 "ImportPage.c" +#line 6987 "ImportPage.c" } #line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp2_) { -#line 6510 "ImportPage.c" +#line 6991 "ImportPage.c" ViewCollection* _tmp5_; ViewCollection* _tmp6_; - gint _tmp7_; #line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = _tmp5_; #line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = view_collection_get_unfiltered_count (_tmp6_); -#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = _tmp7_ > 0; + _tmp1_ = view_collection_get_unfiltered_count (_tmp6_) > 0; #line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp6_); -#line 6524 "ImportPage.c" +#line 7002 "ImportPage.c" } else { #line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = FALSE; -#line 6528 "ImportPage.c" +#line 7006 "ImportPage.c" } #line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = self->priv->hide_imported; + _tmp7_ = self->priv->hide_imported; #line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp1_); -#line 6534 "ImportPage.c" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp1_); +#line 7012 "ImportPage.c" } } -static void import_page_on_view_changed (ImportPage* self) { +static void +import_page_on_view_changed (ImportPage* self) +{ gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; gboolean _tmp2_; + gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; - gboolean _tmp8_ = FALSE; - gboolean _tmp9_; - gboolean _tmp14_ = FALSE; - gboolean _tmp15_; + gboolean _tmp8_; + gboolean _tmp12_ = FALSE; + gboolean _tmp13_; #line 948 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); #line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = self->priv->busy; #line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp2_) { -#line 6554 "ImportPage.c" +#line 7034 "ImportPage.c" gboolean _tmp3_; #line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = self->priv->refreshed; #line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _tmp3_; -#line 6560 "ImportPage.c" +#line 7040 "ImportPage.c" } else { #line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = FALSE; -#line 6564 "ImportPage.c" +#line 7044 "ImportPage.c" } #line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp1_) { -#line 6568 "ImportPage.c" +#line 7048 "ImportPage.c" ViewCollection* _tmp4_; ViewCollection* _tmp5_; - gint _tmp6_; #line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = _tmp4_; #line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = view_collection_get_selected_count (_tmp5_); -#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = _tmp6_ > 0; + _tmp0_ = view_collection_get_selected_count (_tmp5_) > 0; #line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp5_); -#line 6582 "ImportPage.c" +#line 7059 "ImportPage.c" } else { #line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = FALSE; -#line 6586 "ImportPage.c" +#line 7063 "ImportPage.c" } #line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportSelected", _tmp0_); #line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = self->priv->busy; + _tmp8_ = self->priv->busy; #line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp9_) { -#line 6594 "ImportPage.c" - gboolean _tmp10_; + if (!_tmp8_) { +#line 7071 "ImportPage.c" + gboolean _tmp9_; #line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = self->priv->refreshed; + _tmp9_ = self->priv->refreshed; #line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = _tmp10_; -#line 6600 "ImportPage.c" + _tmp7_ = _tmp9_; +#line 7077 "ImportPage.c" } else { #line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = FALSE; -#line 6604 "ImportPage.c" + _tmp7_ = FALSE; +#line 7081 "ImportPage.c" } #line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp8_) { -#line 6608 "ImportPage.c" + if (_tmp7_) { +#line 7085 "ImportPage.c" + ViewCollection* _tmp10_; ViewCollection* _tmp11_; - ViewCollection* _tmp12_; - gint _tmp13_; -#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = _tmp11_; + _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp11_ = _tmp10_; #line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = _tmp13_ > 0; + _tmp6_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection)) > 0; #line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _data_collection_unref0 (_tmp12_); -#line 6622 "ImportPage.c" + _data_collection_unref0 (_tmp11_); +#line 7096 "ImportPage.c" } else { #line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = FALSE; -#line 6626 "ImportPage.c" + _tmp6_ = FALSE; +#line 7100 "ImportPage.c" } #line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", _tmp7_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", _tmp6_); #line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp15_ = self->priv->busy; + _tmp13_ = self->priv->busy; #line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp15_) { -#line 6634 "ImportPage.c" - ViewCollection* _tmp16_; - ViewCollection* _tmp17_; - gint _tmp18_; + if (!_tmp13_) { +#line 7108 "ImportPage.c" + ViewCollection* _tmp14_; + ViewCollection* _tmp15_; #line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp17_ = _tmp16_; + _tmp15_ = _tmp14_; #line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp18_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp12_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_COLLECTION, DataCollection)) > 0; #line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = _tmp18_ > 0; -#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _data_collection_unref0 (_tmp17_); -#line 6648 "ImportPage.c" + _data_collection_unref0 (_tmp15_); +#line 7119 "ImportPage.c" } else { #line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = FALSE; -#line 6652 "ImportPage.c" + _tmp12_ = FALSE; +#line 7123 "ImportPage.c" } #line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSelectAll", _tmp14_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSelectAll", _tmp12_); #line 953 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_update_toolbar_state (self); -#line 6658 "ImportPage.c" +#line 7129 "ImportPage.c" } -static void import_page_on_media_added_removed (ImportPage* self) { +static void +import_page_on_media_added_removed (ImportPage* self) +{ ImportPageImportPageSearchViewFilter* _tmp0_; #line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); @@ -6667,53 +7140,46 @@ static void import_page_on_media_added_removed (ImportPage* self) { _tmp0_ = self->priv->search_filter; #line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh"); -#line 6670 "ImportPage.c" +#line 7143 "ImportPage.c" } -static void import_page_on_display_titles (ImportPage* self, GSimpleAction* action, GVariant* value) { +static void +import_page_on_display_titles (ImportPage* self, + GSimpleAction* action, + GVariant* value) +{ gboolean display = FALSE; - GVariant* _tmp0_; - gboolean _tmp1_; - ConfigFacade* _tmp2_; - ConfigFacade* _tmp3_; - GSimpleAction* _tmp4_; - GVariant* _tmp5_; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; #line 960 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); #line 960 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); #line 961 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = value; -#line 961 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 961 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - display = _tmp1_; + display = g_variant_get_boolean (value); #line 963 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display); #line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = config_facade_get_instance (); + _tmp0_ = config_facade_get_instance (); #line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - configuration_facade_set_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display); + configuration_facade_set_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display); #line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp3_); -#line 966 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = action; -#line 966 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = value; + _g_object_unref0 (_tmp1_); #line 966 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_simple_action_set_state (_tmp4_, _tmp5_); -#line 6708 "ImportPage.c" + g_simple_action_set_state (action, value); +#line 7173 "ImportPage.c" } -static void import_page_real_switched_to (Page* base) { +static void +import_page_real_switched_to (Page* base) +{ ImportPage * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - gboolean _tmp2_; #line 969 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage); #line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -6721,18 +7187,18 @@ static void import_page_real_switched_to (Page* base) { #line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _tmp0_; #line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp2_); + checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp1_); #line 972 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" PAGE_CLASS (import_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page)); -#line 6731 "ImportPage.c" +#line 7195 "ImportPage.c" } -static void import_page_real_ready (Page* base) { +static void +import_page_real_ready (Page* base) +{ ImportPage * self; ImportPageHideImportedViewFilter* _tmp0_; #line 975 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -6743,184 +7209,133 @@ static void import_page_real_ready (Page* base) { _tmp0_ = self->priv->hide_imported_filter; #line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh"); -#line 6746 "ImportPage.c" +#line 7212 "ImportPage.c" } -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, + glong maxlen) +{ glong result = 0L; gchar* end = NULL; gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 6769 "ImportPage.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 6777 "ImportPage.c" +#line 7236 "ImportPage.c" } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 6789 "ImportPage.c" +#line 7245 "ImportPage.c" } } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, + glong offset, + glong len) +{ gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + glong _tmp6_; + gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#line 6813 "ImportPage.c" - glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = _tmp2_ >= ((glong) 0); -#line 6819 "ImportPage.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = len >= ((glong) 0); +#line 7266 "ImportPage.c" } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 6823 "ImportPage.c" +#line 7270 "ImportPage.c" } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 6827 "ImportPage.c" +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = string_strnlen ((gchar*) self, offset + len); +#line 7276 "ImportPage.c" + } else { + gint _tmp1_; + gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = (glong) _tmp2_; +#line 7286 "ImportPage.c" + } +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset < ((glong) 0)) { +#line 7290 "ImportPage.c" glong _tmp3_; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 7298 "ImportPage.c" + } else { glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 7305 "ImportPage.c" + } +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (len < ((glong) 0)) { +#line 7309 "ImportPage.c" glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 6839 "ImportPage.c" - } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#line 6849 "ImportPage.c" - } -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp8_ < ((glong) 0)) { -#line 6855 "ImportPage.c" - glong _tmp9_; - glong _tmp10_; - glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 6869 "ImportPage.c" - } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 6879 "ImportPage.c" - } -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp14_ < ((glong) 0)) { -#line 6885 "ImportPage.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 6894 "ImportPage.c" - } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp5_ - offset; +#line 7315 "ImportPage.c" + } +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 6914 "ImportPage.c" +#line 7327 "ImportPage.c" } -static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_on_locked) { +static void +import_page_try_refreshing_camera (ImportPage* self, + gboolean fail_on_locked) +{ gboolean _tmp0_ = FALSE; gboolean _tmp1_; ImportPageRefreshResult res = 0; ImportPageRefreshResult _tmp3_; - ImportPageRefreshResult _tmp4_; GError * _inner_error_ = NULL; #line 980 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); @@ -6930,102 +7345,97 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o if (_tmp1_) { #line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = TRUE; -#line 6933 "ImportPage.c" +#line 7348 "ImportPage.c" } else { gboolean _tmp2_; #line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = self->priv->busy; #line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = _tmp2_; -#line 6940 "ImportPage.c" +#line 7355 "ImportPage.c" } #line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_) { #line 983 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 6946 "ImportPage.c" +#line 7361 "ImportPage.c" } #line 985 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = import_page_refresh_camera (self); -#line 985 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - res = _tmp3_; + res = import_page_refresh_camera (self); #line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = res; + _tmp3_ = res; #line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - switch (_tmp4_) { + switch (_tmp3_) { #line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case IMPORT_PAGE_REFRESH_RESULT_OK: #line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case IMPORT_PAGE_REFRESH_RESULT_BUSY: -#line 6960 "ImportPage.c" +#line 7373 "ImportPage.c" { #line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 6964 "ImportPage.c" +#line 7377 "ImportPage.c" } #line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case IMPORT_PAGE_REFRESH_RESULT_LOCKED: -#line 6968 "ImportPage.c" +#line 7381 "ImportPage.c" { - gboolean _tmp5_; - const gchar* _tmp6_; + const gchar* _tmp4_; GFile* uri = NULL; - const gchar* _tmp7_; - GFile* _tmp8_; + const gchar* _tmp5_; + GFile* _tmp6_; GMount* mount = NULL; - gboolean _tmp13_ = FALSE; - GMount* _tmp14_; - GMount* _tmp27_; + gboolean _tmp11_ = FALSE; + GMount* _tmp12_; + GMount* _tmp24_; #line 994 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = fail_on_locked; -#line 994 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp5_) { + if (fail_on_locked) { #line 995 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" app_window_error_message (IMPORT_PAGE_UNMOUNT_FAILED_MSG, NULL); #line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 6987 "ImportPage.c" +#line 7397 "ImportPage.c" } #line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = self->priv->uri; + _tmp4_ = self->priv->uri; #line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_debug ("ImportPage.vala:1001: Checking if %s is mounted…", _tmp6_); + g_debug ("ImportPage.vala:1001: Checking if %s is mounted…", _tmp4_); #line 1003 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = self->priv->uri; + _tmp5_ = self->priv->uri; #line 1003 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = g_file_new_for_uri (_tmp7_); + _tmp6_ = g_file_new_for_uri (_tmp5_); #line 1003 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - uri = _tmp8_; + uri = _tmp6_; #line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" mount = NULL; -#line 7001 "ImportPage.c" +#line 7411 "ImportPage.c" { - GMount* _tmp9_ = NULL; - GFile* _tmp10_; - GMount* _tmp11_; - GMount* _tmp12_; + GMount* _tmp7_ = NULL; + GFile* _tmp8_; + GMount* _tmp9_; + GMount* _tmp10_; #line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = uri; + _tmp8_ = uri; #line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = g_file_find_enclosing_mount (_tmp10_, NULL, &_inner_error_); + _tmp9_ = g_file_find_enclosing_mount (_tmp8_, NULL, &_inner_error_); #line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = _tmp11_; + _tmp7_ = _tmp9_; #line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7015 "ImportPage.c" +#line 7425 "ImportPage.c" goto __catch73_g_error; } #line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = _tmp9_; + _tmp10_ = _tmp7_; #line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = NULL; + _tmp7_ = NULL; #line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (mount); #line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - mount = _tmp12_; + mount = _tmp10_; #line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp9_); -#line 7028 "ImportPage.c" + _g_object_unref0 (_tmp7_); +#line 7438 "ImportPage.c" } goto __finally73; __catch73_g_error: @@ -7037,7 +7447,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o _inner_error_ = NULL; #line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 7040 "ImportPage.c" +#line 7450 "ImportPage.c" } __finally73: #line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7052,84 +7462,81 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o g_clear_error (&_inner_error_); #line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 7055 "ImportPage.c" +#line 7465 "ImportPage.c" } #line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = mount; -#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp14_ == NULL) { -#line 7061 "ImportPage.c" - const gchar* _tmp15_; - gboolean _tmp16_; + _tmp12_ = mount; #line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp15_ = self->priv->uri; + if (_tmp12_ == NULL) { +#line 7471 "ImportPage.c" + const gchar* _tmp13_; #line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp16_ = g_str_has_prefix (_tmp15_, "gphoto2"); + _tmp13_ = self->priv->uri; #line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = _tmp16_; -#line 7070 "ImportPage.c" + _tmp11_ = g_str_has_prefix (_tmp13_, "gphoto2"); +#line 7477 "ImportPage.c" } else { #line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = FALSE; -#line 7074 "ImportPage.c" + _tmp11_ = FALSE; +#line 7481 "ImportPage.c" } #line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp13_) { -#line 7078 "ImportPage.c" - const gchar* _tmp17_; + if (_tmp11_) { +#line 7485 "ImportPage.c" + const gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; gchar* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; - gchar* _tmp21_; - GFile* _tmp22_; + GFile* _tmp19_; #line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp17_ = self->priv->uri; + _tmp14_ = self->priv->uri; #line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp18_ = string_substring (_tmp17_, (glong) 7, (glong) -1); + _tmp15_ = string_substring (_tmp14_, (glong) 7, (glong) -1); #line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp19_ = _tmp18_; + _tmp16_ = _tmp15_; #line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp20_ = g_strconcat ("mtp", _tmp19_, NULL); + _tmp17_ = g_strconcat ("mtp", _tmp16_, NULL); #line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp21_ = _tmp20_; + _tmp18_ = _tmp17_; #line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp22_ = g_file_new_for_uri (_tmp21_); + _tmp19_ = g_file_new_for_uri (_tmp18_); #line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (uri); #line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - uri = _tmp22_; + uri = _tmp19_; #line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp21_); + _g_free0 (_tmp18_); #line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp19_); -#line 7105 "ImportPage.c" + _g_free0 (_tmp16_); +#line 7512 "ImportPage.c" { - GMount* _tmp23_ = NULL; - GFile* _tmp24_; - GMount* _tmp25_; - GMount* _tmp26_; + GMount* _tmp20_ = NULL; + GFile* _tmp21_; + GMount* _tmp22_; + GMount* _tmp23_; #line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp24_ = uri; + _tmp21_ = uri; #line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp25_ = g_file_find_enclosing_mount (_tmp24_, NULL, &_inner_error_); + _tmp22_ = g_file_find_enclosing_mount (_tmp21_, NULL, &_inner_error_); #line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp23_ = _tmp25_; + _tmp20_ = _tmp22_; #line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7119 "ImportPage.c" +#line 7526 "ImportPage.c" goto __catch74_g_error; } #line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp26_ = _tmp23_; + _tmp23_ = _tmp20_; #line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp23_ = NULL; + _tmp20_ = NULL; #line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (mount); #line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - mount = _tmp26_; + mount = _tmp23_; #line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp23_); -#line 7132 "ImportPage.c" + _g_object_unref0 (_tmp20_); +#line 7539 "ImportPage.c" } goto __finally74; __catch74_g_error: @@ -7141,7 +7548,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o _inner_error_ = NULL; #line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 7144 "ImportPage.c" +#line 7551 "ImportPage.c" } __finally74: #line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7156,141 +7563,138 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o g_clear_error (&_inner_error_); #line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 7159 "ImportPage.c" +#line 7566 "ImportPage.c" } } #line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp27_ = mount; + _tmp24_ = mount; #line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp27_ != NULL) { -#line 7166 "ImportPage.c" + if (_tmp24_ != NULL) { +#line 7573 "ImportPage.c" gchar* mounted_message = NULL; - gchar* _tmp28_; + gchar* _tmp25_; GtkMessageDialog* dialog = NULL; - AppWindow* _tmp29_; - AppWindow* _tmp30_; - const gchar* _tmp31_; + AppWindow* _tmp26_; + AppWindow* _tmp27_; + const gchar* _tmp28_; + GtkMessageDialog* _tmp29_; + GtkMessageDialog* _tmp30_; + GtkMessageDialog* _tmp31_; GtkMessageDialog* _tmp32_; + gint dialog_res = 0; GtkMessageDialog* _tmp33_; GtkMessageDialog* _tmp34_; - GtkMessageDialog* _tmp35_; - gint dialog_res = 0; - GtkMessageDialog* _tmp36_; - gint _tmp37_; - GtkMessageDialog* _tmp38_; - gint _tmp39_; + gint _tmp35_; #line 1025 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp28_ = g_strdup (_ ("Shotwell needs to unmount the camera from the filesystem in order to a" \ + _tmp25_ = g_strdup (_ ("Shotwell needs to unmount the camera from the filesystem in order to a" \ "ccess it. Continue?")); #line 1025 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - mounted_message = _tmp28_; + mounted_message = _tmp25_; #line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp29_ = app_window_get_instance (); + _tmp26_ = app_window_get_instance (); #line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp30_ = _tmp29_; + _tmp27_ = _tmp26_; #line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp31_ = mounted_message; + _tmp28_ = mounted_message; #line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp32_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", _tmp31_); + _tmp29_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", _tmp28_); #line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_ref_sink (_tmp32_); + g_object_ref_sink (_tmp29_); #line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp33_ = _tmp32_; + _tmp30_ = _tmp29_; #line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp30_); + _g_object_unref0 (_tmp27_); #line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - dialog = _tmp33_; + dialog = _tmp30_; #line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp34_ = dialog; + _tmp31_ = dialog; #line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE); + gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE); #line 1031 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp35_ = dialog; + _tmp32_ = dialog; #line 1031 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_dialog_get_type (), GtkDialog), _ ("_Unmount"), (gint) GTK_RESPONSE_YES); -#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp36_ = dialog; + gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_dialog_get_type (), GtkDialog), _ ("_Unmount"), (gint) GTK_RESPONSE_YES); #line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp37_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_dialog_get_type (), GtkDialog)); + _tmp33_ = dialog; #line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - dialog_res = _tmp37_; + dialog_res = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_dialog_get_type (), GtkDialog)); #line 1033 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp38_ = dialog; + _tmp34_ = dialog; #line 1033 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget)); #line 1035 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp39_ = dialog_res; + _tmp35_ = dialog_res; #line 1035 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp39_ != ((gint) GTK_RESPONSE_YES)) { + if (_tmp35_ != ((gint) GTK_RESPONSE_YES)) { #line 1036 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Please unmount the camera.")); -#line 7226 "ImportPage.c" +#line 7630 "ImportPage.c" } else { - GMount* _tmp40_; + GMount* _tmp36_; #line 1038 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp40_ = mount; + _tmp36_ = mount; #line 1038 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_unmount_camera (self, _tmp40_); -#line 7233 "ImportPage.c" + import_page_unmount_camera (self, _tmp36_); +#line 7637 "ImportPage.c" } #line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (dialog); #line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (mounted_message); -#line 7239 "ImportPage.c" +#line 7643 "ImportPage.c" } else { gchar* locked_message = NULL; - gchar* _tmp41_; + gchar* _tmp37_; GtkMessageDialog* dialog = NULL; - AppWindow* _tmp42_; - AppWindow* _tmp43_; - const gchar* _tmp44_; + AppWindow* _tmp38_; + AppWindow* _tmp39_; + const gchar* _tmp40_; + GtkMessageDialog* _tmp41_; + GtkMessageDialog* _tmp42_; + GtkMessageDialog* _tmp43_; + GtkMessageDialog* _tmp44_; GtkMessageDialog* _tmp45_; - GtkMessageDialog* _tmp46_; - GtkMessageDialog* _tmp47_; - GtkMessageDialog* _tmp48_; - GtkMessageDialog* _tmp49_; #line 1041 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp41_ = g_strdup (_ ("The camera is locked by another application. Shotwell can only access " \ + _tmp37_ = g_strdup (_ ("The camera is locked by another application. Shotwell can only access " \ "the camera when it’s unlocked. Please close any other application usin" \ "g the camera and try again.")); #line 1041 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - locked_message = _tmp41_; + locked_message = _tmp37_; #line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp42_ = app_window_get_instance (); + _tmp38_ = app_window_get_instance (); #line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp43_ = _tmp42_; + _tmp39_ = _tmp38_; #line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp44_ = locked_message; + _tmp40_ = locked_message; #line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp45_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", _tmp44_); + _tmp41_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", _tmp40_); #line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_ref_sink (_tmp45_); + g_object_ref_sink (_tmp41_); #line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp46_ = _tmp45_; + _tmp42_ = _tmp41_; #line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp43_); + _g_object_unref0 (_tmp39_); #line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - dialog = _tmp46_; + dialog = _tmp42_; #line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp47_ = dialog; + _tmp43_ = dialog; #line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE); + gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE); #line 1048 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp48_ = dialog; + _tmp44_ = dialog; #line 1048 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_dialog_get_type (), GtkDialog)); + gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_dialog_get_type (), GtkDialog)); #line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp49_ = dialog; + _tmp45_ = dialog; #line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget)); #line 1051 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Please close any other application using the camera.")); #line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (dialog); #line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (locked_message); -#line 7290 "ImportPage.c" +#line 7694 "ImportPage.c" } #line 1053 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (mount); @@ -7298,76 +7702,84 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o _g_object_unref0 (uri); #line 1053 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 7298 "ImportPage.c" +#line 7702 "ImportPage.c" } #line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR: -#line 7302 "ImportPage.c" +#line 7706 "ImportPage.c" { - gchar* _tmp50_; - gchar* _tmp51_; - gchar* _tmp52_; - gchar* _tmp53_; + gchar* _tmp46_; + gchar* _tmp47_; + gchar* _tmp48_; + gchar* _tmp49_; #line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp50_ = import_page_get_refresh_message (self); + _tmp46_ = import_page_get_refresh_message (self); #line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp51_ = _tmp50_; + _tmp47_ = _tmp46_; #line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp52_ = g_strdup_printf (_ ("Unable to fetch previews from the camera:\n%s"), _tmp51_); + _tmp48_ = g_strdup_printf (_ ("Unable to fetch previews from the camera:\n%s"), _tmp47_); #line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp53_ = _tmp52_; + _tmp49_ = _tmp48_; #line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - app_window_error_message (_tmp53_, NULL); + app_window_error_message (_tmp49_, NULL); #line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp53_); + _g_free0 (_tmp49_); #line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp51_); + _g_free0 (_tmp47_); #line 1058 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 7324 "ImportPage.c" +#line 7728 "ImportPage.c" } default: { - ImportPageRefreshResult _tmp54_; + ImportPageRefreshResult _tmp50_; #line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp54_ = res; + _tmp50_ = res; #line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_error ("ImportPage.vala:1061: Unknown result type %d", (gint) _tmp54_); -#line 7333 "ImportPage.c" + g_error ("ImportPage.vala:1061: Unknown result type %d", (gint) _tmp50_); +#line 7737 "ImportPage.c" } } } -static void _import_page_on_unmounted_g_mount_unmounted (GMount* _sender, gpointer self) { +static void +_import_page_on_unmounted_g_mount_unmounted (GMount* _sender, + gpointer self) +{ #line 1078 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_unmounted ((ImportPage*) self, _sender); -#line 7342 "ImportPage.c" +#line 7749 "ImportPage.c" } -static void _import_page_on_unmount_finished_gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { +static void +_import_page_on_unmount_finished_gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self) +{ #line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_unmount_finished ((ImportPage*) self, source_object, res); #line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_unref (self); -#line 7351 "ImportPage.c" +#line 7762 "ImportPage.c" } -gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) { +gboolean +import_page_unmount_camera (ImportPage* self, + GMount* mount) +{ gboolean result = FALSE; gboolean _tmp0_; GtkProgressBar* _tmp1_; GtkProgressBar* _tmp2_; GtkProgressBar* _tmp3_; GtkProgressBar* _tmp4_; - GMount* _tmp5_; - GMount* _tmp6_; - AppWindow* _tmp7_; - AppWindow* _tmp8_; - GtkMountOperation* _tmp9_; - GtkMountOperation* _tmp10_; + AppWindow* _tmp5_; + AppWindow* _tmp6_; + GtkMountOperation* _tmp7_; + GtkMountOperation* _tmp8_; #line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE); #line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7380,7 +7792,7 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) { result = FALSE; #line 1067 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7380 "ImportPage.c" +#line 7792 "ImportPage.c" } #line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_update_status (self, TRUE, FALSE); @@ -7401,39 +7813,38 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) { #line 1073 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_progress_bar_set_text (_tmp4_, _ ("Unmounting…")); #line 1078 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = mount; -#line 1078 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_signal_connect_object (_tmp5_, "unmounted", (GCallback) _import_page_on_unmounted_g_mount_unmounted, self, 0); + g_signal_connect_object (mount, "unmounted", (GCallback) _import_page_on_unmounted_g_mount_unmounted, self, 0); #line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_debug ("ImportPage.vala:1080: Unmounting camera…"); #line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = mount; -#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = app_window_get_instance (); -#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = _tmp7_; + _tmp5_ = app_window_get_instance (); #line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = (GtkMountOperation*) gtk_mount_operation_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow)); + _tmp6_ = _tmp5_; #line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = _tmp9_; + _tmp7_ = (GtkMountOperation*) gtk_mount_operation_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow)); #line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_mount_unmount_with_operation (_tmp6_, G_MOUNT_UNMOUNT_NONE, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_mount_operation_get_type (), GMountOperation), NULL, _import_page_on_unmount_finished_gasync_ready_callback, g_object_ref (self)); + _tmp8_ = _tmp7_; #line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp10_); + g_mount_unmount_with_operation (mount, G_MOUNT_UNMOUNT_NONE, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, g_mount_operation_get_type (), GMountOperation), NULL, _import_page_on_unmount_finished_gasync_ready_callback, g_object_ref (self)); #line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp8_); +#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _g_object_unref0 (_tmp6_); #line 1084 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = TRUE; #line 1084 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7426 "ImportPage.c" +#line 7834 "ImportPage.c" } -static void import_page_on_unmount_finished (ImportPage* self, GObject* source, GAsyncResult* aresult) { +static void +import_page_on_unmount_finished (ImportPage* self, + GObject* source, + GAsyncResult* aresult) +{ GMount* mount = NULL; - GObject* _tmp0_; - GMount* _tmp1_; + GMount* _tmp0_; GError * _inner_error_ = NULL; #line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); @@ -7444,21 +7855,16 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source, #line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_debug ("ImportPage.vala:1088: Async unmount finished"); #line 1090 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = source; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, g_mount_get_type (), GMount)); #line 1090 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_mount_get_type (), GMount)); -#line 1090 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - mount = _tmp1_; -#line 7449 "ImportPage.c" + mount = _tmp0_; +#line 7858 "ImportPage.c" { - GAsyncResult* _tmp2_; -#line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = aresult; #line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_mount_unmount_with_operation_finish (mount, _tmp2_, &_inner_error_); + g_mount_unmount_with_operation_finish (mount, aresult, &_inner_error_); #line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7458 "ImportPage.c" +#line 7864 "ImportPage.c" goto __catch75_g_error; } } @@ -7466,11 +7872,11 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source, __catch75_g_error: { GError* err = NULL; - guint _tmp3_; - gboolean _tmp4_; + guint _tmp1_; + gboolean _tmp2_; + GtkProgressBar* _tmp3_; + GtkProgressBar* _tmp4_; GtkProgressBar* _tmp5_; - GtkProgressBar* _tmp6_; - GtkProgressBar* _tmp7_; #line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" err = _inner_error_; #line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7478,28 +7884,28 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source, #line 1094 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" app_window_error_message (IMPORT_PAGE_UNMOUNT_FAILED_MSG, NULL); #line 1097 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_signal_parse_name ("unmounted", g_mount_get_type (), &_tmp3_, NULL, FALSE); + g_signal_parse_name ("unmounted", g_mount_get_type (), &_tmp1_, NULL, FALSE); #line 1097 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_signal_handlers_disconnect_matched (mount, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _import_page_on_unmounted_g_mount_unmounted, self); + g_signal_handlers_disconnect_matched (mount, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _import_page_on_unmounted_g_mount_unmounted, self); #line 1099 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = self->priv->refreshed; + _tmp2_ = self->priv->refreshed; #line 1099 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_update_status (self, FALSE, _tmp4_); + import_page_update_status (self, FALSE, _tmp2_); #line 1100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = self->priv->progress_bar; + _tmp3_ = self->priv->progress_bar; #line 1100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_progress_bar_set_ellipsize (_tmp5_, PANGO_ELLIPSIZE_NONE); + gtk_progress_bar_set_ellipsize (_tmp3_, PANGO_ELLIPSIZE_NONE); #line 1101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = self->priv->progress_bar; + _tmp4_ = self->priv->progress_bar; #line 1101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_progress_bar_set_text (_tmp6_, ""); + gtk_progress_bar_set_text (_tmp4_, ""); #line 1102 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = self->priv->progress_bar; + _tmp5_ = self->priv->progress_bar; #line 1102 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), FALSE); #line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 7499 "ImportPage.c" +#line 7905 "ImportPage.c" } __finally75: #line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7512,15 +7918,18 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source, g_clear_error (&_inner_error_); #line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 7512 "ImportPage.c" +#line 7918 "ImportPage.c" } #line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (mount); -#line 7516 "ImportPage.c" +#line 7922 "ImportPage.c" } -static void import_page_on_unmounted (ImportPage* self, GMount* mount) { +static void +import_page_on_unmounted (ImportPage* self, + GMount* mount) +{ gboolean _tmp0_; GtkProgressBar* _tmp1_; GtkProgressBar* _tmp2_; @@ -7549,11 +7958,13 @@ static void import_page_on_unmounted (ImportPage* self, GMount* mount) { gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE); #line 1114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_try_refreshing_camera (self, TRUE); -#line 7549 "ImportPage.c" +#line 7958 "ImportPage.c" } -static void import_page_clear_all_import_sources (ImportPage* self) { +static void +import_page_clear_all_import_sources (ImportPage* self) +{ Marker* marker = NULL; SourceCollection* _tmp0_; Marker* _tmp1_; @@ -7574,7 +7985,7 @@ static void import_page_clear_all_import_sources (ImportPage* self) { source_collection_destroy_marked (_tmp2_, marker, FALSE, NULL, NULL, NULL); #line 1117 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (marker); -#line 7574 "ImportPage.c" +#line 7985 "ImportPage.c" } @@ -7585,29 +7996,30 @@ static void import_page_clear_all_import_sources (ImportPage* self) { * @param dir The path to start searching from. * @param search_target The name of the directory to look for. */ -static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, const gchar* dir, const gchar* search_target) { +static gboolean +import_page_check_directory_exists (ImportPage* self, + gint fsid, + const gchar* dir, + const gchar* search_target) +{ gboolean result = FALSE; gchar* fulldir = NULL; Camera* _tmp0_; const gchar* _tmp1_; - gint _tmp2_; - const gchar* _tmp3_; - gchar* _tmp4_; + gchar* _tmp2_; int _result_ = 0; CameraList* folders = NULL; - CameraList* _tmp5_ = NULL; - int _tmp6_; - int _tmp7_; - Camera* _tmp8_; - const gchar* _tmp9_; - CameraList* _tmp10_; - GPSpinIdleWrapper* _tmp11_; - GPContext* _tmp12_; - int _tmp13_; - int _tmp14_; + CameraList* _tmp3_ = NULL; + int _tmp4_; + int _tmp5_; + Camera* _tmp6_; + const gchar* _tmp7_; + CameraList* _tmp8_; + GPSpinIdleWrapper* _tmp9_; + GPContext* _tmp10_; + int _tmp11_; gint list_len = 0; - CameraList* _tmp15_; - gint _tmp16_; + CameraList* _tmp12_; #line 1130 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE); #line 1130 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7619,25 +8031,21 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, #line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = self->priv->camera_name; #line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = fsid; + _tmp2_ = import_page_get_fulldir (_tmp0_, _tmp1_, fsid, dir); #line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = dir; -#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = import_page_get_fulldir (_tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - fulldir = _tmp4_; + fulldir = _tmp2_; #line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = gp_list_new (&_tmp5_); + _tmp4_ = gp_list_new (&_tmp3_); #line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (folders); #line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - folders = _tmp5_; + folders = _tmp3_; #line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _result_ = _tmp6_; + _result_ = _tmp4_; #line 1136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = _result_; + _tmp5_ = _result_; #line 1136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp7_ != GP_OK) { + if (_tmp5_ != GP_OK) { #line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; #line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7646,26 +8054,24 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, _g_free0 (fulldir); #line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7646 "ImportPage.c" +#line 8054 "ImportPage.c" } #line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = self->priv->camera; -#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = fulldir; + _tmp6_ = self->priv->camera; #line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = folders; + _tmp7_ = fulldir; #line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = import_page_spin_idle_context; + _tmp8_ = folders; #line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; + _tmp9_ = import_page_spin_idle_context; #line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = gp_camera_folder_list_folders (_tmp8_, _tmp9_, _tmp10_, _tmp12_); + _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; #line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _result_ = _tmp13_; + _result_ = gp_camera_folder_list_folders (_tmp6_, _tmp7_, _tmp8_, _tmp10_); #line 1142 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = _result_; + _tmp11_ = _result_; #line 1142 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp14_ != GP_OK) { + if (_tmp11_ != GP_OK) { #line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; #line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7674,76 +8080,71 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, _g_free0 (fulldir); #line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7674 "ImportPage.c" +#line 8080 "ImportPage.c" } #line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp15_ = folders; + _tmp12_ = folders; #line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp16_ = gp_list_count (_tmp15_); -#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - list_len = _tmp16_; -#line 7682 "ImportPage.c" + list_len = gp_list_count (_tmp12_); +#line 8086 "ImportPage.c" { gint list_index = 0; #line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" list_index = 0; -#line 7687 "ImportPage.c" +#line 8091 "ImportPage.c" { - gboolean _tmp17_ = FALSE; + gboolean _tmp13_ = FALSE; #line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp17_ = TRUE; + _tmp13_ = TRUE; #line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 7694 "ImportPage.c" - gint _tmp19_; - gint _tmp20_; +#line 8098 "ImportPage.c" + gint _tmp15_; + gint _tmp16_; gchar* tmp = NULL; - CameraList* _tmp21_; - gint _tmp22_; - const gchar* _tmp23_ = NULL; - gchar* _tmp24_; - const gchar* _tmp25_; - const gchar* _tmp26_; + CameraList* _tmp17_; + gint _tmp18_; + const gchar* _tmp19_ = NULL; + gchar* _tmp20_; + const gchar* _tmp21_; #line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp17_) { -#line 7706 "ImportPage.c" - gint _tmp18_; + if (!_tmp13_) { +#line 8109 "ImportPage.c" + gint _tmp14_; #line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp18_ = list_index; + _tmp14_ = list_index; #line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - list_index = _tmp18_ + 1; -#line 7712 "ImportPage.c" + list_index = _tmp14_ + 1; +#line 8115 "ImportPage.c" } #line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp17_ = FALSE; + _tmp13_ = FALSE; #line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp19_ = list_index; + _tmp15_ = list_index; #line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp20_ = list_len; + _tmp16_ = list_len; #line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!(_tmp19_ < _tmp20_)) { + if (!(_tmp15_ < _tmp16_)) { #line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 7724 "ImportPage.c" +#line 8127 "ImportPage.c" } #line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp21_ = folders; + _tmp17_ = folders; #line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp22_ = list_index; + _tmp18_ = list_index; #line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gp_list_get_name (_tmp21_, _tmp22_, &_tmp23_); + gp_list_get_name (_tmp17_, _tmp18_, &_tmp19_); #line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (tmp); #line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp24_ = g_strdup (_tmp23_); + _tmp20_ = g_strdup (_tmp19_); #line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - tmp = _tmp24_; + tmp = _tmp20_; #line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp25_ = tmp; + _tmp21_ = tmp; #line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp26_ = search_target; -#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (g_strcmp0 (_tmp25_, _tmp26_) == 0) { + if (g_strcmp0 (_tmp21_, search_target) == 0) { #line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = TRUE; #line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7754,11 +8155,11 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, _g_free0 (fulldir); #line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7754 "ImportPage.c" +#line 8155 "ImportPage.c" } #line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (tmp); -#line 7758 "ImportPage.c" +#line 8159 "ImportPage.c" } } } @@ -7770,11 +8171,13 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, _g_free0 (fulldir); #line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7770 "ImportPage.c" +#line 8171 "ImportPage.c" } -static gboolean ____lambda18_ (ImportPage* self) { +static gboolean +____lambda18_ (ImportPage* self) +{ gboolean result = FALSE; #line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_refresh_camera (self); @@ -7782,20 +8185,24 @@ static gboolean ____lambda18_ (ImportPage* self) { result = FALSE; #line 1181 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7782 "ImportPage.c" +#line 8185 "ImportPage.c" } -static gboolean _____lambda18__gsource_func (gpointer self) { +static gboolean +_____lambda18__gsource_func (gpointer self) +{ gboolean result; result = ____lambda18_ ((ImportPage*) self); #line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7791 "ImportPage.c" +#line 8196 "ImportPage.c" } -static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { +static ImportPageRefreshResult +import_page_refresh_camera (ImportPage* self) +{ ImportPageRefreshResult result = 0; gboolean _tmp0_; gboolean _tmp1_; @@ -7803,38 +8210,36 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { GPSpinIdleWrapper* _tmp3_; GPContext* _tmp4_; int _tmp5_; - int _tmp6_; - int _tmp10_; - gboolean _tmp16_; + int _tmp9_; + gboolean _tmp15_; + GtkProgressBar* _tmp16_; GtkProgressBar* _tmp17_; GtkProgressBar* _tmp18_; GtkProgressBar* _tmp19_; GtkProgressBar* _tmp20_; - GtkProgressBar* _tmp21_; GeeArrayList* import_list = NULL; - GeeArrayList* _tmp22_; + GeeArrayList* _tmp21_; CameraStorageInformation* sifs = NULL; gint count = 0; - Camera* _tmp23_; - GPSpinIdleWrapper* _tmp24_; - GPContext* _tmp25_; - gint _tmp26_ = 0; + Camera* _tmp22_; + GPSpinIdleWrapper* _tmp23_; + GPContext* _tmp24_; + gint _tmp25_ = 0; + int _tmp26_; int _tmp27_; - int _tmp28_; - GeeArrayList* _tmp77_; - GeeArrayList* _tmp78_; - GtkProgressBar* _tmp79_; - GtkProgressBar* _tmp80_; - GtkProgressBar* _tmp81_; - GtkProgressBar* _tmp82_; + GeeArrayList* _tmp65_; + GeeArrayList* _tmp66_; + GtkProgressBar* _tmp67_; + GtkProgressBar* _tmp68_; + GtkProgressBar* _tmp69_; + GtkProgressBar* _tmp70_; int res = 0; - Camera* _tmp83_; - GPSpinIdleWrapper* _tmp84_; - GPContext* _tmp85_; - int _tmp86_; - int _tmp87_; - int _tmp91_; - int _tmp96_; + Camera* _tmp71_; + GPSpinIdleWrapper* _tmp72_; + GPContext* _tmp73_; + int _tmp74_; + int _tmp78_; + int _tmp82_; #line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PAGE (self), 0); #line 1163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7845,7 +8250,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { result = IMPORT_PAGE_REFRESH_RESULT_BUSY; #line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7845 "ImportPage.c" +#line 8250 "ImportPage.c" } #line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Connecting to camera, please wait…")); @@ -7864,399 +8269,364 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { #line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; #line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = gp_camera_init (_tmp2_, _tmp4_); -#line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->refresh_result = _tmp5_; + self->priv->refresh_result = gp_camera_init (_tmp2_, _tmp4_); #line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = self->priv->refresh_result; + _tmp5_ = self->priv->refresh_result; #line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp6_ == GP_ERROR_IO_USB_CLAIM) { -#line 7871 "ImportPage.c" - gint _tmp7_; + if (_tmp5_ == GP_ERROR_IO_USB_CLAIM) { +#line 8274 "ImportPage.c" + gint _tmp6_; #line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = self->priv->claim_timeout; + _tmp6_ = self->priv->claim_timeout; #line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp7_ < 4000) { -#line 7877 "ImportPage.c" + if (_tmp6_ < 4000) { +#line 8280 "ImportPage.c" + gint _tmp7_; gint _tmp8_; - gint _tmp9_; #line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = self->priv->claim_timeout; + _tmp7_ = self->priv->claim_timeout; #line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) _tmp8_, _____lambda18__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) _tmp7_, _____lambda18__gsource_func, g_object_ref (self), g_object_unref); #line 1183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = self->priv->claim_timeout; + _tmp8_ = self->priv->claim_timeout; #line 1183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->claim_timeout = _tmp9_ * 2; + self->priv->claim_timeout = _tmp8_ * 2; #line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = IMPORT_PAGE_REFRESH_RESULT_LOCKED; #line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7892 "ImportPage.c" +#line 8295 "ImportPage.c" } } #line 1190 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->claim_timeout = 500; #line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = self->priv->refresh_result; + _tmp9_ = self->priv->refresh_result; #line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp10_ != GP_OK) { -#line 7901 "ImportPage.c" - int _tmp11_; + if (_tmp9_ != GP_OK) { +#line 8304 "ImportPage.c" + int _tmp10_; + gchar* _tmp11_; gchar* _tmp12_; - gchar* _tmp13_; - ImportPageRefreshResult _tmp14_ = 0; - int _tmp15_; + ImportPageRefreshResult _tmp13_ = 0; + int _tmp14_; #line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = self->priv->refresh_result; + _tmp10_ = self->priv->refresh_result; #line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = gp_result_to_full_string (_tmp11_); + _tmp11_ = gp_result_to_full_string (_tmp10_); #line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1193: Unable to initialize camera: %s", _tmp13_); + g_warning ("ImportPage.vala:1193: Unable to initialize camera: %s", _tmp12_); #line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp12_); #line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp15_ = self->priv->refresh_result; + _tmp14_ = self->priv->refresh_result; #line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp15_ == GP_ERROR_IO_LOCK) { + if (_tmp14_ == GP_ERROR_IO_LOCK) { #line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = IMPORT_PAGE_REFRESH_RESULT_LOCKED; -#line 7923 "ImportPage.c" + _tmp13_ = IMPORT_PAGE_REFRESH_RESULT_LOCKED; +#line 8326 "ImportPage.c" } else { #line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR; -#line 7927 "ImportPage.c" + _tmp13_ = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR; +#line 8330 "ImportPage.c" } #line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp14_; + result = _tmp13_; #line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7933 "ImportPage.c" +#line 8336 "ImportPage.c" } #line 1198 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Starting import, please wait…")); #line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp16_ = self->priv->refreshed; + _tmp15_ = self->priv->refreshed; #line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_update_status (self, TRUE, _tmp16_); + import_page_update_status (self, TRUE, _tmp15_); #line 1201 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_view_changed (self); #line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp17_ = self->priv->progress_bar; + _tmp16_ = self->priv->progress_bar; #line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_progress_bar_set_ellipsize (_tmp17_, PANGO_ELLIPSIZE_NONE); + gtk_progress_bar_set_ellipsize (_tmp16_, PANGO_ELLIPSIZE_NONE); #line 1204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp18_ = self->priv->progress_bar; + _tmp17_ = self->priv->progress_bar; #line 1204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_progress_bar_set_text (_tmp18_, _ ("Fetching photo information")); + gtk_progress_bar_set_text (_tmp17_, _ ("Fetching photo information")); #line 1205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp19_ = self->priv->progress_bar; + _tmp18_ = self->priv->progress_bar; #line 1205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_progress_bar_set_fraction (_tmp19_, 0.0); + gtk_progress_bar_set_fraction (_tmp18_, 0.0); #line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp20_ = self->priv->progress_bar; + _tmp19_ = self->priv->progress_bar; #line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_progress_bar_set_pulse_step (_tmp20_, 0.01); + gtk_progress_bar_set_pulse_step (_tmp19_, 0.01); #line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp21_ = self->priv->progress_bar; + _tmp20_ = self->priv->progress_bar; #line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), TRUE); #line 1209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp22_ = gee_array_list_new (TYPE_IMPORT_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp21_ = gee_array_list_new (TYPE_IMPORT_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_list = _tmp22_; + import_list = _tmp21_; #line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" sifs = NULL; #line 1212 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" count = 0; #line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp23_ = self->priv->camera; + _tmp22_ = self->priv->camera; #line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp24_ = import_page_spin_idle_context; + _tmp23_ = import_page_spin_idle_context; #line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; + _tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; #line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp27_ = gp_camera_get_storageinfo (_tmp23_, &sifs, &_tmp26_, _tmp25_); + _tmp26_ = gp_camera_get_storageinfo (_tmp22_, &sifs, &_tmp25_, _tmp24_); #line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - count = _tmp26_; + count = _tmp25_; #line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->refresh_result = _tmp27_; + self->priv->refresh_result = _tmp26_; #line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp28_ = self->priv->refresh_result; + _tmp27_ = self->priv->refresh_result; #line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp28_ == GP_OK) { -#line 7987 "ImportPage.c" + if (_tmp27_ == GP_OK) { +#line 8390 "ImportPage.c" { gint fsid = 0; #line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" fsid = 0; -#line 7992 "ImportPage.c" +#line 8395 "ImportPage.c" { - gboolean _tmp29_ = FALSE; + gboolean _tmp28_ = FALSE; #line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp29_ = TRUE; + _tmp28_ = TRUE; #line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 7999 "ImportPage.c" +#line 8402 "ImportPage.c" + gint _tmp30_; gint _tmp31_; - gint _tmp32_; gboolean got_well_known_dir = FALSE; - gint _tmp33_; - gboolean _tmp34_; - gint _tmp37_; - gboolean _tmp38_; + gint _tmp32_; + gint _tmp35_; + gint _tmp38_; gint _tmp41_; - gboolean _tmp42_; - gint _tmp45_; - gboolean _tmp46_; - gint _tmp49_; - gboolean _tmp50_; + gint _tmp44_; + gint _tmp47_; + gint _tmp50_; gint _tmp53_; - gboolean _tmp54_; - gint _tmp57_; - gboolean _tmp58_; - gint _tmp61_; + gint _tmp56_; + gint _tmp59_; gboolean _tmp62_; - gint _tmp65_; - gboolean _tmp66_; - gint _tmp69_; - gboolean _tmp70_; - gboolean _tmp73_; #line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp29_) { -#line 8026 "ImportPage.c" - gint _tmp30_; + if (!_tmp28_) { +#line 8419 "ImportPage.c" + gint _tmp29_; #line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp30_ = fsid; + _tmp29_ = fsid; #line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - fsid = _tmp30_ + 1; -#line 8032 "ImportPage.c" + fsid = _tmp29_ + 1; +#line 8425 "ImportPage.c" } #line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp29_ = FALSE; + _tmp28_ = FALSE; #line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp31_ = fsid; + _tmp30_ = fsid; #line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp32_ = count; + _tmp31_ = count; #line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!(_tmp31_ < _tmp32_)) { + if (!(_tmp30_ < _tmp31_)) { #line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 8044 "ImportPage.c" +#line 8437 "ImportPage.c" } #line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = FALSE; #line 1222 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp33_ = fsid; -#line 1222 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp34_ = import_page_check_directory_exists (self, _tmp33_, "/", "DCIM"); + _tmp32_ = fsid; #line 1222 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp34_) { -#line 8054 "ImportPage.c" - gint _tmp35_; - GeeArrayList* _tmp36_; + if (import_page_check_directory_exists (self, _tmp32_, "/", "DCIM")) { +#line 8445 "ImportPage.c" + gint _tmp33_; + GeeArrayList* _tmp34_; #line 1223 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp35_ = fsid; + _tmp33_ = fsid; #line 1223 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp36_ = import_list; + _tmp34_ = import_list; #line 1223 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_enumerate_files (self, _tmp35_, "/DCIM", _tmp36_); + import_page_enumerate_files (self, _tmp33_, "/DCIM", _tmp34_); #line 1224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 8065 "ImportPage.c" +#line 8456 "ImportPage.c" } #line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp37_ = fsid; -#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp38_ = import_page_check_directory_exists (self, _tmp37_, "/", "dcim"); + _tmp35_ = fsid; #line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp38_) { -#line 8073 "ImportPage.c" - gint _tmp39_; - GeeArrayList* _tmp40_; + if (import_page_check_directory_exists (self, _tmp35_, "/", "dcim")) { +#line 8462 "ImportPage.c" + gint _tmp36_; + GeeArrayList* _tmp37_; #line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp39_ = fsid; + _tmp36_ = fsid; #line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp40_ = import_list; + _tmp37_ = import_list; #line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_enumerate_files (self, _tmp39_, "/dcim", _tmp40_); + import_page_enumerate_files (self, _tmp36_, "/dcim", _tmp37_); #line 1228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 8084 "ImportPage.c" +#line 8473 "ImportPage.c" } #line 1233 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp41_ = fsid; -#line 1233 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp42_ = import_page_check_directory_exists (self, _tmp41_, "/PRIVATE/", "AVCHD"); + _tmp38_ = fsid; #line 1233 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp42_) { -#line 8092 "ImportPage.c" - gint _tmp43_; - GeeArrayList* _tmp44_; + if (import_page_check_directory_exists (self, _tmp38_, "/PRIVATE/", "AVCHD")) { +#line 8479 "ImportPage.c" + gint _tmp39_; + GeeArrayList* _tmp40_; #line 1234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp43_ = fsid; + _tmp39_ = fsid; #line 1234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp44_ = import_list; + _tmp40_ = import_list; #line 1234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_enumerate_files (self, _tmp43_, "/PRIVATE/AVCHD", _tmp44_); + import_page_enumerate_files (self, _tmp39_, "/PRIVATE/AVCHD", _tmp40_); #line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 8103 "ImportPage.c" +#line 8490 "ImportPage.c" } #line 1237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp45_ = fsid; -#line 1237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp46_ = import_page_check_directory_exists (self, _tmp45_, "/private/", "avchd"); + _tmp41_ = fsid; #line 1237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp46_) { -#line 8111 "ImportPage.c" - gint _tmp47_; - GeeArrayList* _tmp48_; + if (import_page_check_directory_exists (self, _tmp41_, "/private/", "avchd")) { +#line 8496 "ImportPage.c" + gint _tmp42_; + GeeArrayList* _tmp43_; #line 1238 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp47_ = fsid; + _tmp42_ = fsid; #line 1238 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp48_ = import_list; + _tmp43_ = import_list; #line 1238 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_enumerate_files (self, _tmp47_, "/private/avchd", _tmp48_); + import_page_enumerate_files (self, _tmp42_, "/private/avchd", _tmp43_); #line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 8122 "ImportPage.c" +#line 8507 "ImportPage.c" } #line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp49_ = fsid; + _tmp44_ = fsid; #line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp50_ = import_page_check_directory_exists (self, _tmp49_, "/", "AVCHD"); -#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp50_) { -#line 8130 "ImportPage.c" - gint _tmp51_; - GeeArrayList* _tmp52_; + if (import_page_check_directory_exists (self, _tmp44_, "/", "AVCHD")) { +#line 8513 "ImportPage.c" + gint _tmp45_; + GeeArrayList* _tmp46_; #line 1242 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp51_ = fsid; + _tmp45_ = fsid; #line 1242 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp52_ = import_list; + _tmp46_ = import_list; #line 1242 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_enumerate_files (self, _tmp51_, "/AVCHD", _tmp52_); + import_page_enumerate_files (self, _tmp45_, "/AVCHD", _tmp46_); #line 1243 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 8141 "ImportPage.c" +#line 8524 "ImportPage.c" } #line 1245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp53_ = fsid; -#line 1245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp54_ = import_page_check_directory_exists (self, _tmp53_, "/", "avchd"); + _tmp47_ = fsid; #line 1245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp54_) { -#line 8149 "ImportPage.c" - gint _tmp55_; - GeeArrayList* _tmp56_; + if (import_page_check_directory_exists (self, _tmp47_, "/", "avchd")) { +#line 8530 "ImportPage.c" + gint _tmp48_; + GeeArrayList* _tmp49_; #line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp55_ = fsid; + _tmp48_ = fsid; #line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp56_ = import_list; + _tmp49_ = import_list; #line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_enumerate_files (self, _tmp55_, "/avchd", _tmp56_); + import_page_enumerate_files (self, _tmp48_, "/avchd", _tmp49_); #line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 8160 "ImportPage.c" +#line 8541 "ImportPage.c" } #line 1252 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp57_ = fsid; -#line 1252 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp58_ = import_page_check_directory_exists (self, _tmp57_, "/PRIVATE/", "SONY"); + _tmp50_ = fsid; #line 1252 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp58_) { -#line 8168 "ImportPage.c" - gint _tmp59_; - GeeArrayList* _tmp60_; + if (import_page_check_directory_exists (self, _tmp50_, "/PRIVATE/", "SONY")) { +#line 8547 "ImportPage.c" + gint _tmp51_; + GeeArrayList* _tmp52_; #line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp59_ = fsid; + _tmp51_ = fsid; #line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp60_ = import_list; + _tmp52_ = import_list; #line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_enumerate_files (self, _tmp59_, "/PRIVATE/SONY", _tmp60_); + import_page_enumerate_files (self, _tmp51_, "/PRIVATE/SONY", _tmp52_); #line 1254 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 8179 "ImportPage.c" +#line 8558 "ImportPage.c" } #line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp61_ = fsid; -#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp62_ = import_page_check_directory_exists (self, _tmp61_, "/private/", "sony"); + _tmp53_ = fsid; #line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp62_) { -#line 8187 "ImportPage.c" - gint _tmp63_; - GeeArrayList* _tmp64_; + if (import_page_check_directory_exists (self, _tmp53_, "/private/", "sony")) { +#line 8564 "ImportPage.c" + gint _tmp54_; + GeeArrayList* _tmp55_; #line 1257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp63_ = fsid; + _tmp54_ = fsid; #line 1257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp64_ = import_list; + _tmp55_ = import_list; #line 1257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_enumerate_files (self, _tmp63_, "/private/sony", _tmp64_); + import_page_enumerate_files (self, _tmp54_, "/private/sony", _tmp55_); #line 1258 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 8198 "ImportPage.c" +#line 8575 "ImportPage.c" } #line 1262 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp65_ = fsid; -#line 1262 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp66_ = import_page_check_directory_exists (self, _tmp65_, "/", "MP_ROOT"); + _tmp56_ = fsid; #line 1262 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp66_) { -#line 8206 "ImportPage.c" - gint _tmp67_; - GeeArrayList* _tmp68_; + if (import_page_check_directory_exists (self, _tmp56_, "/", "MP_ROOT")) { +#line 8581 "ImportPage.c" + gint _tmp57_; + GeeArrayList* _tmp58_; #line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp67_ = fsid; + _tmp57_ = fsid; #line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp68_ = import_list; + _tmp58_ = import_list; #line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_enumerate_files (self, _tmp67_, "/MP_ROOT", _tmp68_); + import_page_enumerate_files (self, _tmp57_, "/MP_ROOT", _tmp58_); #line 1264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 8217 "ImportPage.c" +#line 8592 "ImportPage.c" } #line 1266 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp69_ = fsid; + _tmp59_ = fsid; #line 1266 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp70_ = import_page_check_directory_exists (self, _tmp69_, "/", "mp_root"); -#line 1266 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp70_) { -#line 8225 "ImportPage.c" - gint _tmp71_; - GeeArrayList* _tmp72_; + if (import_page_check_directory_exists (self, _tmp59_, "/", "mp_root")) { +#line 8598 "ImportPage.c" + gint _tmp60_; + GeeArrayList* _tmp61_; #line 1267 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp71_ = fsid; + _tmp60_ = fsid; #line 1267 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp72_ = import_list; + _tmp61_ = import_list; #line 1267 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_enumerate_files (self, _tmp71_, "/mp_root", _tmp72_); + import_page_enumerate_files (self, _tmp60_, "/mp_root", _tmp61_); #line 1268 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 8236 "ImportPage.c" +#line 8609 "ImportPage.c" } #line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp73_ = got_well_known_dir; + _tmp62_ = got_well_known_dir; #line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp73_) { -#line 8242 "ImportPage.c" - gint _tmp74_; - GeeArrayList* _tmp75_; - gboolean _tmp76_; -#line 1274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp74_ = fsid; + if (!_tmp62_) { +#line 8615 "ImportPage.c" + gint _tmp63_; + GeeArrayList* _tmp64_; #line 1274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp75_ = import_list; + _tmp63_ = fsid; #line 1274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp76_ = import_page_enumerate_files (self, _tmp74_, "/", _tmp75_); + _tmp64_ = import_list; #line 1274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp76_) { + if (!import_page_enumerate_files (self, _tmp63_, "/", _tmp64_)) { #line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 8256 "ImportPage.c" +#line 8626 "ImportPage.c" } } } @@ -8266,104 +8636,99 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { #line 1280 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_clear_all_import_sources (self); #line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp77_ = import_list; + _tmp65_ = import_list; #line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_auto_match_raw_jpeg (self, _tmp77_); + import_page_auto_match_raw_jpeg (self, _tmp65_); #line 1290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp78_ = import_list; + _tmp66_ = import_list; #line 1290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_load_previews_and_metadata (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, GEE_TYPE_LIST, GeeList)); + import_page_load_previews_and_metadata (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, GEE_TYPE_LIST, GeeList)); #line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp79_ = self->priv->progress_bar; + _tmp67_ = self->priv->progress_bar; #line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), FALSE); #line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp80_ = self->priv->progress_bar; + _tmp68_ = self->priv->progress_bar; #line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_progress_bar_set_ellipsize (_tmp80_, PANGO_ELLIPSIZE_NONE); + gtk_progress_bar_set_ellipsize (_tmp68_, PANGO_ELLIPSIZE_NONE); #line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp81_ = self->priv->progress_bar; + _tmp69_ = self->priv->progress_bar; #line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_progress_bar_set_text (_tmp81_, ""); + gtk_progress_bar_set_text (_tmp69_, ""); #line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp82_ = self->priv->progress_bar; + _tmp70_ = self->priv->progress_bar; #line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_progress_bar_set_fraction (_tmp82_, 0.0); -#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp83_ = self->priv->camera; + gtk_progress_bar_set_fraction (_tmp70_, 0.0); #line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp84_ = import_page_spin_idle_context; + _tmp71_ = self->priv->camera; #line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp85_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; + _tmp72_ = import_page_spin_idle_context; #line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp86_ = gp_camera_exit (_tmp83_, _tmp85_); + _tmp73_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; #line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - res = _tmp86_; + res = gp_camera_exit (_tmp71_, _tmp73_); #line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp87_ = res; + _tmp74_ = res; #line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp87_ != GP_OK) { -#line 8303 "ImportPage.c" - int _tmp88_; - gchar* _tmp89_; - gchar* _tmp90_; + if (_tmp74_ != GP_OK) { +#line 8671 "ImportPage.c" + int _tmp75_; + gchar* _tmp76_; + gchar* _tmp77_; #line 1305 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp88_ = res; + _tmp75_ = res; #line 1305 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp89_ = gp_result_to_full_string (_tmp88_); + _tmp76_ = gp_result_to_full_string (_tmp75_); #line 1305 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp90_ = _tmp89_; + _tmp77_ = _tmp76_; #line 1305 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1305: Unable to unlock camera: %s", _tmp90_); + g_warning ("ImportPage.vala:1305: Unable to unlock camera: %s", _tmp77_); #line 1305 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp90_); -#line 8317 "ImportPage.c" + _g_free0 (_tmp77_); +#line 8685 "ImportPage.c" } #line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp91_ = self->priv->refresh_result; + _tmp78_ = self->priv->refresh_result; #line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp91_ == GP_OK) { -#line 8323 "ImportPage.c" - SourceCollection* _tmp92_; - gint _tmp93_; -#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp92_ = self->priv->import_sources; + if (_tmp78_ == GP_OK) { +#line 8691 "ImportPage.c" + SourceCollection* _tmp79_; #line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp93_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp79_ = self->priv->import_sources; #line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp93_ == 0) { -#line 8332 "ImportPage.c" - gchar* _tmp94_; - gchar* _tmp95_; + if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_DATA_COLLECTION, DataCollection)) == 0) { +#line 8697 "ImportPage.c" + gchar* _tmp80_; + gchar* _tmp81_; #line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp94_ = checkerboard_page_get_view_empty_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)); + _tmp80_ = checkerboard_page_get_view_empty_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)); #line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp95_ = _tmp94_; + _tmp81_ = _tmp80_; #line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp95_); + checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp81_); #line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp95_); -#line 8343 "ImportPage.c" + _g_free0 (_tmp81_); +#line 8708 "ImportPage.c" } #line 1312 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_update_status (self, FALSE, TRUE); -#line 8347 "ImportPage.c" +#line 8712 "ImportPage.c" } else { #line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_update_status (self, FALSE, FALSE); #line 1317 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_clear_all_import_sources (self); -#line 8353 "ImportPage.c" +#line 8718 "ImportPage.c" } #line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_view_changed (self); #line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp96_ = self->priv->refresh_result; + _tmp82_ = self->priv->refresh_result; #line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - switch (_tmp96_) { + switch (_tmp82_) { #line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case GP_OK: -#line 8363 "ImportPage.c" +#line 8728 "ImportPage.c" { #line 1324 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = IMPORT_PAGE_REFRESH_RESULT_OK; @@ -8371,11 +8736,11 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { _g_object_unref0 (import_list); #line 1324 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8371 "ImportPage.c" +#line 8736 "ImportPage.c" } #line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case GP_ERROR_IO_LOCK: -#line 8375 "ImportPage.c" +#line 8740 "ImportPage.c" { #line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = IMPORT_PAGE_REFRESH_RESULT_LOCKED; @@ -8383,7 +8748,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { _g_object_unref0 (import_list); #line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8383 "ImportPage.c" +#line 8748 "ImportPage.c" } default: { @@ -8393,378 +8758,290 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { _g_object_unref0 (import_list); #line 1330 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8393 "ImportPage.c" +#line 8758 "ImportPage.c" } } #line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (import_list); -#line 8398 "ImportPage.c" +#line 8763 "ImportPage.c" } -static gchar string_get (const gchar* self, glong index) { +static gchar +string_get (const gchar* self, + glong index) +{ gchar result = '\0'; - glong _tmp0_; - gchar _tmp1_; -#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar _tmp0_; +#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = index; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = ((gchar*) self)[index]; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 8416 "ImportPage.c" +#line 8781 "ImportPage.c" } -static gchar* string_slice (const gchar* self, glong start, glong end) { +static gchar* +string_slice (const gchar* self, + glong start, + glong end) +{ gchar* result = NULL; glong string_length = 0L; gint _tmp0_; gint _tmp1_; - glong _tmp2_; - glong _tmp5_; - gboolean _tmp8_ = FALSE; - glong _tmp9_; - gboolean _tmp12_ = FALSE; - glong _tmp13_; - glong _tmp16_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - gchar* _tmp21_; -#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gboolean _tmp4_ = FALSE; + gboolean _tmp6_ = FALSE; + gchar* _tmp8_; +#line 1369 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = start; -#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp2_ < ((glong) 0)) { -#line 8449 "ImportPage.c" +#line 1371 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (start < ((glong) 0)) { +#line 8807 "ImportPage.c" + glong _tmp2_; +#line 1372 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = string_length; +#line 1372 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + start = _tmp2_ + start; +#line 8813 "ImportPage.c" + } +#line 1374 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (end < ((glong) 0)) { +#line 8817 "ImportPage.c" glong _tmp3_; - glong _tmp4_; -#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1375 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = start; -#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - start = _tmp3_ + _tmp4_; -#line 8458 "ImportPage.c" - } -#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp5_ < ((glong) 0)) { -#line 8464 "ImportPage.c" - glong _tmp6_; - glong _tmp7_; -#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = string_length; -#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = end; -#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp6_ + _tmp7_; -#line 8473 "ImportPage.c" +#line 1375 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp3_ + end; +#line 8823 "ImportPage.c" } -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = start; -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp9_ >= ((glong) 0)) { -#line 8479 "ImportPage.c" - glong _tmp10_; - glong _tmp11_; -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = start; -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = string_length; -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp10_ <= _tmp11_; -#line 8488 "ImportPage.c" +#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (start >= ((glong) 0)) { +#line 8827 "ImportPage.c" + glong _tmp5_; +#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = start <= _tmp5_; +#line 8833 "ImportPage.c" } else { -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = FALSE; -#line 8492 "ImportPage.c" - } -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp8_, NULL); -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = end; -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp13_ >= ((glong) 0)) { -#line 8500 "ImportPage.c" - glong _tmp14_; - glong _tmp15_; -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = end; -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = _tmp14_ <= _tmp15_; -#line 8509 "ImportPage.c" +#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = FALSE; +#line 8837 "ImportPage.c" + } +#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (_tmp4_, NULL); +#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (end >= ((glong) 0)) { +#line 8843 "ImportPage.c" + glong _tmp7_; +#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = string_length; +#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = end <= _tmp7_; +#line 8849 "ImportPage.c" } else { -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = FALSE; -#line 8513 "ImportPage.c" - } -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_, NULL); -#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = start; -#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = end; -#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = start; -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = end; -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = start; -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp21_; -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = FALSE; +#line 8853 "ImportPage.c" + } +#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (_tmp6_, NULL); +#line 1379 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (start <= end, NULL); +#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = g_strndup (((gchar*) self) + start, (gsize) (end - start)); +#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp8_; +#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 8535 "ImportPage.c" +#line 8865 "ImportPage.c" } -static gchar* import_page_chomp_ch (const gchar* str, gchar ch) { +static gchar* +import_page_chomp_ch (const gchar* str, + gchar ch) +{ gchar* result = NULL; glong offset = 0L; - const gchar* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; - gchar* _tmp12_; + gchar* _tmp7_; #line 1334 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (str != NULL, NULL); #line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = str; + _tmp0_ = strlen (str); #line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = strlen (_tmp0_); -#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - offset = (glong) _tmp2_; + offset = (glong) _tmp1_; #line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 8558 "ImportPage.c" +#line 8888 "ImportPage.c" + glong _tmp2_; glong _tmp3_; glong _tmp4_; - const gchar* _tmp5_; - glong _tmp6_; - gchar _tmp7_; - gchar _tmp8_; #line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = offset; + _tmp2_ = offset; #line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - offset = _tmp3_ - 1; + offset = _tmp2_ - 1; #line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = offset; + _tmp3_ = offset; #line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!(_tmp4_ >= ((glong) 0))) { + if (!(_tmp3_ >= ((glong) 0))) { #line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 8575 "ImportPage.c" +#line 8902 "ImportPage.c" } #line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = str; -#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = offset; -#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = string_get (_tmp5_, _tmp6_); -#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = ch; + _tmp4_ = offset; #line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp7_ != _tmp8_) { -#line 8587 "ImportPage.c" - const gchar* _tmp9_; - glong _tmp10_; - gchar* _tmp11_; -#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = str; + if (string_get (str, _tmp4_) != ch) { +#line 8908 "ImportPage.c" + glong _tmp5_; + gchar* _tmp6_; #line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = offset; + _tmp5_ = offset; #line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = string_slice (_tmp9_, (glong) 0, _tmp10_); + _tmp6_ = string_slice (str, (glong) 0, _tmp5_); #line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp11_; + result = _tmp6_; #line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8601 "ImportPage.c" +#line 8919 "ImportPage.c" } } #line 1341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = g_strdup (""); + _tmp7_ = g_strdup (""); #line 1341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp12_; + result = _tmp7_; #line 1341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8610 "ImportPage.c" +#line 8928 "ImportPage.c" } -gchar* import_page_append_path (const gchar* basepath, const gchar* addition) { +gchar* +import_page_append_path (const gchar* basepath, + const gchar* addition) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_; - gboolean _tmp2_; #line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (basepath != NULL, NULL); #line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (addition != NULL, NULL); #line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = basepath; -#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = g_str_has_suffix (_tmp1_, "/"); + if (!g_str_has_suffix (basepath, "/")) { #line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp2_) { -#line 8629 "ImportPage.c" - const gchar* _tmp3_; - gboolean _tmp4_; -#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = addition; -#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = g_str_has_prefix (_tmp3_, "/"); -#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = !_tmp4_; -#line 8638 "ImportPage.c" + _tmp0_ = !g_str_has_prefix (addition, "/"); +#line 8946 "ImportPage.c" } else { #line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = FALSE; -#line 8642 "ImportPage.c" +#line 8950 "ImportPage.c" } #line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_) { -#line 8646 "ImportPage.c" - const gchar* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - const gchar* _tmp8_; - gchar* _tmp9_; - gchar* _tmp10_; -#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = basepath; -#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = g_strconcat (_tmp5_, "/", NULL); +#line 8954 "ImportPage.c" + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = _tmp6_; + _tmp1_ = g_strconcat (basepath, "/", NULL); #line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = addition; + _tmp2_ = _tmp1_; #line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = g_strconcat (_tmp7_, _tmp8_, NULL); + _tmp3_ = g_strconcat (_tmp2_, addition, NULL); #line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = _tmp9_; + _tmp4_ = _tmp3_; #line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp2_); #line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp10_; + result = _tmp4_; #line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8671 "ImportPage.c" +#line 8973 "ImportPage.c" } else { - gboolean _tmp11_ = FALSE; - const gchar* _tmp12_; - gboolean _tmp13_; -#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = basepath; + gboolean _tmp5_ = FALSE; #line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = g_str_has_suffix (_tmp12_, "/"); + if (g_str_has_suffix (basepath, "/")) { #line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp13_) { -#line 8682 "ImportPage.c" - const gchar* _tmp14_; - gboolean _tmp15_; -#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = addition; -#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp15_ = g_str_has_prefix (_tmp14_, "/"); -#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = _tmp15_; -#line 8691 "ImportPage.c" + _tmp5_ = g_str_has_prefix (addition, "/"); +#line 8980 "ImportPage.c" } else { #line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = FALSE; -#line 8695 "ImportPage.c" + _tmp5_ = FALSE; +#line 8984 "ImportPage.c" } #line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp11_) { -#line 8699 "ImportPage.c" - const gchar* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; - gchar* _tmp21_; -#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp16_ = basepath; -#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp17_ = import_page_chomp_ch (_tmp16_, '/'); + if (_tmp5_) { +#line 8988 "ImportPage.c" + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp18_ = _tmp17_; + _tmp6_ = import_page_chomp_ch (basepath, '/'); #line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp19_ = addition; + _tmp7_ = _tmp6_; #line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp20_ = g_strconcat (_tmp18_, _tmp19_, NULL); + _tmp8_ = g_strconcat (_tmp7_, addition, NULL); #line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp21_ = _tmp20_; + _tmp9_ = _tmp8_; #line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp7_); #line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp21_; + result = _tmp9_; #line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8724 "ImportPage.c" +#line 9007 "ImportPage.c" } else { - const gchar* _tmp22_; - const gchar* _tmp23_; - gchar* _tmp24_; -#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp22_ = basepath; -#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp23_ = addition; + gchar* _tmp10_; #line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp24_ = g_strconcat (_tmp22_, _tmp23_, NULL); + _tmp10_ = g_strconcat (basepath, addition, NULL); #line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp24_; + result = _tmp10_; #line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8739 "ImportPage.c" +#line 9016 "ImportPage.c" } } } -gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) { +gchar* +import_page_get_fs_basedir (Camera* camera, + gint fsid) +{ gchar* result = NULL; CameraStorageInformation* sifs = NULL; gint count = 0; int res = 0; - Camera* _tmp0_; - GPContextWrapper* _tmp1_; - GPContext* _tmp2_; - gint _tmp3_ = 0; + GPContextWrapper* _tmp0_; + GPContext* _tmp1_; + gint _tmp2_ = 0; + int _tmp3_; int _tmp4_; - int _tmp5_; - gint _tmp6_; - gint _tmp7_; + gint _tmp5_; CameraStorageInformation* ifs = NULL; + CameraStorageInformation* _tmp6_; + const gchar* _tmp7_ = NULL; CameraStorageInformation* _tmp8_; - gint _tmp9_; - const gchar* _tmp10_ = NULL; - CameraStorageInformation* _tmp11_; - CameraStorageInfoFields _tmp12_; - gchar* _tmp15_; + CameraStorageInfoFields _tmp9_; + gchar* _tmp12_; #line 1355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (camera != NULL, NULL); #line 1356 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -8772,89 +9049,84 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) { #line 1357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" count = 0; #line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = camera; + _tmp0_ = import_page_null_context; #line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = import_page_null_context; + _tmp1_ = _tmp0_->context; #line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = _tmp1_->context; + _tmp3_ = gp_camera_get_storageinfo (camera, &sifs, &_tmp2_, _tmp1_); #line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = gp_camera_get_storageinfo (_tmp0_, &sifs, &_tmp3_, _tmp2_); + count = _tmp2_; #line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - count = _tmp3_; -#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - res = _tmp4_; + res = _tmp3_; #line 1359 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = res; + _tmp4_ = res; #line 1359 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp5_ != GP_OK) { + if (_tmp4_ != GP_OK) { #line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = NULL; #line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8791 "ImportPage.c" +#line 9066 "ImportPage.c" } #line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = fsid; + _tmp5_ = count; #line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = count; -#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp6_ >= _tmp7_) { + if (fsid >= _tmp5_) { #line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = NULL; #line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8803 "ImportPage.c" +#line 9076 "ImportPage.c" } #line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = sifs; + _tmp6_ = sifs; #line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = fsid; -#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - ifs = _tmp8_ + _tmp9_; + ifs = _tmp6_ + fsid; #line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = ifs; + _tmp8_ = ifs; #line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = (*_tmp11_).fields; + _tmp9_ = (*_tmp8_).fields; #line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if ((_tmp12_ & GP_STORAGEINFO_BASE) != 0) { -#line 8817 "ImportPage.c" - CameraStorageInformation* _tmp13_; - const gchar* _tmp14_; + if ((_tmp9_ & GP_STORAGEINFO_BASE) != 0) { +#line 9088 "ImportPage.c" + CameraStorageInformation* _tmp10_; + const gchar* _tmp11_; #line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = ifs; + _tmp10_ = ifs; #line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = (*_tmp13_).basedir; + _tmp11_ = (*_tmp10_).basedir; #line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = _tmp14_; -#line 8826 "ImportPage.c" + _tmp7_ = _tmp11_; +#line 9097 "ImportPage.c" } else { #line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = "/"; -#line 8830 "ImportPage.c" + _tmp7_ = "/"; +#line 9101 "ImportPage.c" } #line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp15_ = g_strdup (_tmp10_); + _tmp12_ = g_strdup (_tmp7_); #line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp15_; + result = _tmp12_; #line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8838 "ImportPage.c" +#line 9109 "ImportPage.c" } -gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint fsid, const gchar* folder) { +gchar* +import_page_get_fulldir (Camera* camera, + const gchar* camera_name, + gint fsid, + const gchar* folder) +{ gchar* result = NULL; - const gchar* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; gchar* basedir = NULL; - Camera* _tmp3_; - gint _tmp4_; - gchar* _tmp5_; - const gchar* _tmp6_; - const gchar* _tmp11_; - const gchar* _tmp12_; - gchar* _tmp13_; + gchar* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp5_; + gchar* _tmp6_; #line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (camera != NULL, NULL); #line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -8862,102 +9134,86 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f #line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (folder != NULL, NULL); #line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = folder; -#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = strlen (_tmp0_); + _tmp0_ = strlen (folder); #line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp2_ > GP_MAX_BASEDIR_LENGTH) { + if (_tmp1_ > GP_MAX_BASEDIR_LENGTH) { #line 1372 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = NULL; #line 1372 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8873 "ImportPage.c" +#line 9143 "ImportPage.c" } #line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = camera; -#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = fsid; -#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = import_page_get_fs_basedir (_tmp3_, _tmp4_); + _tmp2_ = import_page_get_fs_basedir (camera, fsid); #line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - basedir = _tmp5_; + basedir = _tmp2_; #line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = basedir; + _tmp3_ = basedir; #line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp6_ == NULL) { -#line 8887 "ImportPage.c" - const gchar* _tmp7_; - gint _tmp8_; - const gchar* _tmp9_; - gchar* _tmp10_; -#line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = camera_name; -#line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = fsid; + if (_tmp3_ == NULL) { +#line 9153 "ImportPage.c" + gchar* _tmp4_; #line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_debug ("ImportPage.vala:1376: Unable to find base directory for %s fsid %d", _tmp7_, _tmp8_); + g_debug ("ImportPage.vala:1376: Unable to find base directory for %s fsid %d", camera_name, fsid); #line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = folder; + _tmp4_ = g_strdup (folder); #line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = g_strdup (_tmp9_); -#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp10_; + result = _tmp4_; #line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (basedir); #line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8908 "ImportPage.c" +#line 9165 "ImportPage.c" } #line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = basedir; + _tmp5_ = basedir; #line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = folder; + _tmp6_ = import_page_append_path (_tmp5_, folder); #line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = import_page_append_path (_tmp11_, _tmp12_); -#line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = _tmp13_; + result = _tmp6_; #line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (basedir); #line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8922 "ImportPage.c" +#line 9177 "ImportPage.c" } -static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const gchar* dir, GeeArrayList* import_list) { +static gboolean +import_page_enumerate_files (ImportPage* self, + gint fsid, + const gchar* dir, + GeeArrayList* import_list) +{ gboolean result = FALSE; gchar* fulldir = NULL; Camera* _tmp0_; const gchar* _tmp1_; - gint _tmp2_; + gchar* _tmp2_; const gchar* _tmp3_; - gchar* _tmp4_; - const gchar* _tmp5_; CameraList* files = NULL; - CameraList* _tmp7_ = NULL; - int _tmp8_; - int _tmp9_; - Camera* _tmp13_; - const gchar* _tmp14_; - CameraList* _tmp15_; - GPSpinIdleWrapper* _tmp16_; - GPContext* _tmp17_; - int _tmp18_; - int _tmp19_; - CameraList* _tmp24_; + CameraList* _tmp4_ = NULL; + int _tmp5_; + int _tmp6_; + Camera* _tmp10_; + const gchar* _tmp11_; + CameraList* _tmp12_; + GPSpinIdleWrapper* _tmp13_; + GPContext* _tmp14_; + int _tmp15_; + CameraList* _tmp20_; CameraList* folders = NULL; - CameraList* _tmp111_ = NULL; - int _tmp112_; - int _tmp113_; - Camera* _tmp117_; - const gchar* _tmp118_; - CameraList* _tmp119_; - GPSpinIdleWrapper* _tmp120_; - GPContext* _tmp121_; - int _tmp122_; - int _tmp123_; + CameraList* _tmp97_ = NULL; + int _tmp98_; + int _tmp99_; + Camera* _tmp103_; + const gchar* _tmp104_; + CameraList* _tmp105_; + GPSpinIdleWrapper* _tmp106_; + GPContext* _tmp107_; + int _tmp108_; GError * _inner_error_ = NULL; #line 1384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE); @@ -8970,57 +9226,49 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const #line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = self->priv->camera_name; #line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = fsid; + _tmp2_ = import_page_get_fulldir (_tmp0_, _tmp1_, fsid, dir); #line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = dir; -#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = import_page_get_fulldir (_tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - fulldir = _tmp4_; + fulldir = _tmp2_; #line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = fulldir; + _tmp3_ = fulldir; #line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp5_ == NULL) { -#line 8981 "ImportPage.c" - const gchar* _tmp6_; -#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = dir; + if (_tmp3_ == NULL) { #line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1387: Skipping enumerating %s: invalid folder name", _tmp6_); + g_warning ("ImportPage.vala:1387: Skipping enumerating %s: invalid folder name", dir); #line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = TRUE; #line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); #line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8993 "ImportPage.c" +#line 9241 "ImportPage.c" } #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = gp_list_new (&_tmp7_); + _tmp5_ = gp_list_new (&_tmp4_); #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (files); #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - files = _tmp7_; + files = _tmp4_; #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->refresh_result = _tmp8_; + self->priv->refresh_result = _tmp5_; #line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = self->priv->refresh_result; + _tmp6_ = self->priv->refresh_result; #line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp9_ != GP_OK) { -#line 9007 "ImportPage.c" - int _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; + if (_tmp6_ != GP_OK) { +#line 9255 "ImportPage.c" + int _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = self->priv->refresh_result; + _tmp7_ = self->priv->refresh_result; #line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = gp_result_to_full_string (_tmp10_); + _tmp8_ = gp_result_to_full_string (_tmp7_); #line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = _tmp11_; + _tmp9_ = _tmp8_; #line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1395: Unable to create file list: %s", _tmp12_); + g_warning ("ImportPage.vala:1395: Unable to create file list: %s", _tmp9_); #line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp9_); #line 1397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; #line 1397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -9029,43 +9277,41 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (fulldir); #line 1397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9029 "ImportPage.c" +#line 9277 "ImportPage.c" } #line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = self->priv->camera; + _tmp10_ = self->priv->camera; #line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = fulldir; + _tmp11_ = fulldir; #line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp15_ = files; + _tmp12_ = files; #line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp16_ = import_page_spin_idle_context; + _tmp13_ = import_page_spin_idle_context; #line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; + _tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; #line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp18_ = gp_camera_folder_list_files (_tmp13_, _tmp14_, _tmp15_, _tmp17_); -#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->refresh_result = _tmp18_; + self->priv->refresh_result = gp_camera_folder_list_files (_tmp10_, _tmp11_, _tmp12_, _tmp14_); #line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp19_ = self->priv->refresh_result; + _tmp15_ = self->priv->refresh_result; #line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp19_ != GP_OK) { -#line 9049 "ImportPage.c" - const gchar* _tmp20_; - int _tmp21_; - gchar* _tmp22_; - gchar* _tmp23_; + if (_tmp15_ != GP_OK) { +#line 9295 "ImportPage.c" + const gchar* _tmp16_; + int _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; #line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp20_ = fulldir; + _tmp16_ = fulldir; #line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp21_ = self->priv->refresh_result; + _tmp17_ = self->priv->refresh_result; #line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp22_ = gp_result_to_full_string (_tmp21_); + _tmp18_ = gp_result_to_full_string (_tmp17_); #line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp23_ = _tmp22_; + _tmp19_ = _tmp18_; #line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1402: Unable to list files in %s: %s", _tmp20_, _tmp23_); + g_warning ("ImportPage.vala:1402: Unable to list files in %s: %s", _tmp16_, _tmp19_); #line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp23_); + _g_free0 (_tmp19_); #line 1405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->refresh_result = GP_OK; #line 1407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -9076,97 +9322,94 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (fulldir); #line 1407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9076 "ImportPage.c" +#line 9322 "ImportPage.c" } #line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp24_ = files; + _tmp20_ = files; #line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gp_list_sort (_tmp24_); -#line 9082 "ImportPage.c" + gp_list_sort (_tmp20_); +#line 9328 "ImportPage.c" { gint ctr = 0; #line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ctr = 0; -#line 9087 "ImportPage.c" +#line 9333 "ImportPage.c" { - gboolean _tmp25_ = FALSE; + gboolean _tmp21_ = FALSE; #line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp25_ = TRUE; + _tmp21_ = TRUE; #line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 9094 "ImportPage.c" - gint _tmp27_; - CameraList* _tmp28_; - gint _tmp29_; +#line 9340 "ImportPage.c" + gint _tmp23_; + CameraList* _tmp24_; gchar* filename = NULL; - CameraList* _tmp30_; - gint _tmp31_; - const gchar* _tmp32_ = NULL; - int _tmp33_; - gchar* _tmp34_; - int _tmp35_; + CameraList* _tmp25_; + gint _tmp26_; + const gchar* _tmp27_ = NULL; + int _tmp28_; + gchar* _tmp29_; + int _tmp30_; #line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp25_) { -#line 9107 "ImportPage.c" - gint _tmp26_; + if (!_tmp21_) { +#line 9352 "ImportPage.c" + gint _tmp22_; #line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp26_ = ctr; + _tmp22_ = ctr; #line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - ctr = _tmp26_ + 1; -#line 9113 "ImportPage.c" + ctr = _tmp22_ + 1; +#line 9358 "ImportPage.c" } #line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp25_ = FALSE; -#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp27_ = ctr; + _tmp21_ = FALSE; #line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp28_ = files; + _tmp23_ = ctr; #line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp29_ = gp_list_count (_tmp28_); + _tmp24_ = files; #line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!(_tmp27_ < _tmp29_)) { + if (!(_tmp23_ < gp_list_count (_tmp24_))) { #line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 9127 "ImportPage.c" +#line 9370 "ImportPage.c" } #line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp30_ = files; + _tmp25_ = files; #line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp31_ = ctr; + _tmp26_ = ctr; #line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp33_ = gp_list_get_name (_tmp30_, _tmp31_, &_tmp32_); + _tmp28_ = gp_list_get_name (_tmp25_, _tmp26_, &_tmp27_); #line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (filename); #line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp34_ = g_strdup (_tmp32_); + _tmp29_ = g_strdup (_tmp27_); #line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - filename = _tmp34_; + filename = _tmp29_; #line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->refresh_result = _tmp33_; + self->priv->refresh_result = _tmp28_; #line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp35_ = self->priv->refresh_result; + _tmp30_ = self->priv->refresh_result; #line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp35_ != GP_OK) { -#line 9147 "ImportPage.c" - gint _tmp36_; - const gchar* _tmp37_; - int _tmp38_; - gchar* _tmp39_; - gchar* _tmp40_; + if (_tmp30_ != GP_OK) { +#line 9390 "ImportPage.c" + gint _tmp31_; + const gchar* _tmp32_; + int _tmp33_; + gchar* _tmp34_; + gchar* _tmp35_; #line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp36_ = ctr; + _tmp31_ = ctr; #line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp37_ = fulldir; + _tmp32_ = fulldir; #line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp38_ = self->priv->refresh_result; + _tmp33_ = self->priv->refresh_result; #line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp39_ = gp_result_to_full_string (_tmp38_); + _tmp34_ = gp_result_to_full_string (_tmp33_); #line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp40_ = _tmp39_; + _tmp35_ = _tmp34_; #line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1415: Unable to get the name of file %d in %s: %s", _tmp36_, _tmp37_, _tmp40_); + g_warning ("ImportPage.vala:1415: Unable to get the name of file %d in %s: %s", _tmp31_, _tmp32_, _tmp35_); #line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp40_); + _g_free0 (_tmp35_); #line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; #line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -9177,315 +9420,288 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (fulldir); #line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9177 "ImportPage.c" +#line 9420 "ImportPage.c" } { CameraFileInfo info = {0}; - gboolean _tmp41_ = FALSE; - GPSpinIdleWrapper* _tmp42_; - GPContext* _tmp43_; - Camera* _tmp44_; - const gchar* _tmp45_; - const gchar* _tmp46_; - CameraFileInfo _tmp47_ = {0}; - gboolean _tmp48_; - CameraFileInfo _tmp51_; - CameraFileInfoFile _tmp52_; - CameraFileInfoFields _tmp53_; - const gchar* _tmp59_; - gboolean _tmp60_; - GtkProgressBar* _tmp103_; + gboolean _tmp36_ = FALSE; + GPSpinIdleWrapper* _tmp37_; + GPContext* _tmp38_; + Camera* _tmp39_; + const gchar* _tmp40_; + const gchar* _tmp41_; + CameraFileInfo _tmp42_ = {0}; + gboolean _tmp43_; + CameraFileInfo _tmp46_; + CameraFileInfoFile _tmp47_; + CameraFileInfoFields _tmp48_; + const gchar* _tmp54_; + GtkProgressBar* _tmp89_; #line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp42_ = import_page_spin_idle_context; + _tmp37_ = import_page_spin_idle_context; #line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp43_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; + _tmp38_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; #line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp44_ = self->priv->camera; + _tmp39_ = self->priv->camera; #line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp45_ = fulldir; + _tmp40_ = fulldir; #line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp46_ = filename; + _tmp41_ = filename; #line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp48_ = gp_get_info (_tmp43_, _tmp44_, _tmp45_, _tmp46_, &_tmp47_, &_inner_error_); + _tmp43_ = gp_get_info (_tmp38_, _tmp39_, _tmp40_, _tmp41_, &_tmp42_, &_inner_error_); #line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" (info); #line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - info = _tmp47_; + info = _tmp42_; #line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp41_ = _tmp48_; + _tmp36_ = _tmp43_; #line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" (info); -#line 9217 "ImportPage.c" +#line 9459 "ImportPage.c" goto __catch76_g_error; } #line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp41_) { -#line 9222 "ImportPage.c" - const gchar* _tmp49_; - const gchar* _tmp50_; + if (!_tmp36_) { +#line 9464 "ImportPage.c" + const gchar* _tmp44_; + const gchar* _tmp45_; #line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp49_ = fulldir; + _tmp44_ = fulldir; #line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp50_ = filename; + _tmp45_ = filename; #line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1424: Skipping import of %s/%s: name too long", _tmp49_, _tmp50_); + g_warning ("ImportPage.vala:1424: Skipping import of %s/%s: name too long", _tmp44_, _tmp45_); #line 1426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" (info); #line 1426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (filename); #line 1426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" continue; -#line 9237 "ImportPage.c" +#line 9479 "ImportPage.c" } #line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp51_ = info; + _tmp46_ = info; #line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp52_ = _tmp51_.file; + _tmp47_ = _tmp46_.file; #line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp53_ = _tmp52_.fields; + _tmp48_ = _tmp47_.fields; #line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if ((_tmp53_ & GP_FILE_INFO_TYPE) == 0) { -#line 9247 "ImportPage.c" - const gchar* _tmp54_; - const gchar* _tmp55_; - CameraFileInfo _tmp56_; - CameraFileInfoFile _tmp57_; - CameraFileInfoFields _tmp58_; + if ((_tmp48_ & GP_FILE_INFO_TYPE) == 0) { +#line 9489 "ImportPage.c" + const gchar* _tmp49_; + const gchar* _tmp50_; + CameraFileInfo _tmp51_; + CameraFileInfoFile _tmp52_; + CameraFileInfoFields _tmp53_; #line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp54_ = fulldir; + _tmp49_ = fulldir; #line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp55_ = filename; + _tmp50_ = filename; #line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp56_ = info; + _tmp51_ = info; #line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp57_ = _tmp56_.file; + _tmp52_ = _tmp51_.file; #line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp58_ = _tmp57_.fields; + _tmp53_ = _tmp52_.fields; #line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_message ("ImportPage.vala:1430: Skipping %s/%s: No file (file=%02Xh)", _tmp54_, _tmp55_, (guint) _tmp58_); + g_message ("ImportPage.vala:1430: Skipping %s/%s: No file (file=%02Xh)", _tmp49_, _tmp50_, (guint) _tmp53_); #line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" (info); #line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (filename); #line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" continue; -#line 9271 "ImportPage.c" +#line 9513 "ImportPage.c" } #line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp59_ = filename; + _tmp54_ = filename; #line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp60_ = video_reader_is_supported_video_filename (_tmp59_); -#line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp60_) { -#line 9279 "ImportPage.c" + if (video_reader_is_supported_video_filename (_tmp54_)) { +#line 9519 "ImportPage.c" VideoImportSource* video_source = NULL; - const gchar* _tmp61_; - Camera* _tmp62_; - gint _tmp63_; - const gchar* _tmp64_; - const gchar* _tmp65_; - CameraFileInfo _tmp66_; - CameraFileInfoFile _tmp67_; - gulong _tmp68_; - CameraFileInfo _tmp69_; - CameraFileInfoFile _tmp70_; - time_t _tmp71_; - VideoImportSource* _tmp72_; - GeeArrayList* _tmp73_; - VideoImportSource* _tmp74_; -#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp61_ = self->priv->camera_name; + const gchar* _tmp55_; + Camera* _tmp56_; + const gchar* _tmp57_; + CameraFileInfo _tmp58_; + CameraFileInfoFile _tmp59_; + gulong _tmp60_; + CameraFileInfo _tmp61_; + CameraFileInfoFile _tmp62_; + time_t _tmp63_; + VideoImportSource* _tmp64_; + VideoImportSource* _tmp65_; #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp62_ = self->priv->camera; + _tmp55_ = self->priv->camera_name; #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp63_ = fsid; + _tmp56_ = self->priv->camera; #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp64_ = dir; + _tmp57_ = filename; #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp65_ = filename; + _tmp58_ = info; #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp66_ = info; + _tmp59_ = _tmp58_.file; #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp67_ = _tmp66_.file; + _tmp60_ = _tmp59_.size; #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp68_ = _tmp67_.size; + _tmp61_ = info; #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp69_ = info; + _tmp62_ = _tmp61_.file; #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp70_ = _tmp69_.file; + _tmp63_ = _tmp62_.mtime; #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp71_ = _tmp70_.mtime; + _tmp64_ = video_import_source_new (_tmp55_, _tmp56_, fsid, dir, _tmp57_, _tmp60_, _tmp63_); #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp72_ = video_import_source_new (_tmp61_, _tmp62_, _tmp63_, _tmp64_, _tmp65_, _tmp68_, _tmp71_); -#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - video_source = _tmp72_; -#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp73_ = import_list; + video_source = _tmp64_; #line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp74_ = video_source; + _tmp65_ = video_source; #line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, TYPE_IMPORT_SOURCE, ImportSource)); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (import_list, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_IMPORT_SOURCE, ImportSource)); #line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (video_source); -#line 9329 "ImportPage.c" +#line 9560 "ImportPage.c" } else { PhotoFileFormat file_format = 0; - CameraFileInfo _tmp75_; - CameraFileInfoFile _tmp76_; + CameraFileInfo _tmp66_; + CameraFileInfoFile _tmp67_; + const gchar* _tmp68_; + PhotoFileFormat _tmp69_; const gchar* _tmp77_; - PhotoFileFormat _tmp78_; - PhotoFileFormat _tmp79_; - GeeArrayList* _tmp88_; - const gchar* _tmp89_; - Camera* _tmp90_; - gint _tmp91_; - const gchar* _tmp92_; - const gchar* _tmp93_; - CameraFileInfo _tmp94_; - CameraFileInfoFile _tmp95_; - gulong _tmp96_; - CameraFileInfo _tmp97_; - CameraFileInfoFile _tmp98_; - time_t _tmp99_; - PhotoFileFormat _tmp100_; - PhotoImportSource* _tmp101_; - PhotoImportSource* _tmp102_; + Camera* _tmp78_; + const gchar* _tmp79_; + CameraFileInfo _tmp80_; + CameraFileInfoFile _tmp81_; + gulong _tmp82_; + CameraFileInfo _tmp83_; + CameraFileInfoFile _tmp84_; + time_t _tmp85_; + PhotoFileFormat _tmp86_; + PhotoImportSource* _tmp87_; + PhotoImportSource* _tmp88_; #line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp75_ = info; -#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp76_ = _tmp75_.file; + _tmp66_ = info; #line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp77_ = _tmp76_.type; + _tmp67_ = _tmp66_.file; #line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp78_ = photo_file_format_from_gphoto_type (_tmp77_); + _tmp68_ = _tmp67_.type; #line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - file_format = _tmp78_; + file_format = photo_file_format_from_gphoto_type (_tmp68_); #line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp79_ = file_format; + _tmp69_ = file_format; #line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp79_ == PHOTO_FILE_FORMAT_UNKNOWN) { -#line 9366 "ImportPage.c" - const gchar* _tmp80_; - PhotoFileFormat _tmp81_; - PhotoFileFormat _tmp82_; -#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp80_ = filename; + if (_tmp69_ == PHOTO_FILE_FORMAT_UNKNOWN) { +#line 9591 "ImportPage.c" + const gchar* _tmp70_; + PhotoFileFormat _tmp71_; #line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp81_ = photo_file_format_get_by_basename_extension (_tmp80_); + _tmp70_ = filename; #line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - file_format = _tmp81_; + file_format = photo_file_format_get_by_basename_extension (_tmp70_); #line 1445 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp82_ = file_format; + _tmp71_ = file_format; #line 1445 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp82_ == PHOTO_FILE_FORMAT_UNKNOWN) { -#line 9380 "ImportPage.c" - const gchar* _tmp83_; - const gchar* _tmp84_; - CameraFileInfo _tmp85_; - CameraFileInfoFile _tmp86_; - const gchar* _tmp87_; + if (_tmp71_ == PHOTO_FILE_FORMAT_UNKNOWN) { +#line 9602 "ImportPage.c" + const gchar* _tmp72_; + const gchar* _tmp73_; + CameraFileInfo _tmp74_; + CameraFileInfoFile _tmp75_; + const gchar* _tmp76_; #line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp83_ = fulldir; + _tmp72_ = fulldir; #line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp84_ = filename; + _tmp73_ = filename; #line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp85_ = info; + _tmp74_ = info; #line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp86_ = _tmp85_.file; + _tmp75_ = _tmp74_.file; #line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp87_ = _tmp86_.type; + _tmp76_ = _tmp75_.type; #line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_message ("ImportPage.vala:1446: Skipping %s/%s: Not a supported file extension (" \ -"%s)", _tmp83_, _tmp84_, _tmp87_); +"%s)", _tmp72_, _tmp73_, _tmp76_); #line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" (info); #line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (filename); #line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" continue; -#line 9404 "ImportPage.c" +#line 9626 "ImportPage.c" } } #line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp88_ = import_list; -#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp89_ = self->priv->camera_name; + _tmp77_ = self->priv->camera_name; #line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp90_ = self->priv->camera; + _tmp78_ = self->priv->camera; #line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp91_ = fsid; + _tmp79_ = filename; #line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp92_ = dir; + _tmp80_ = info; #line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp93_ = filename; + _tmp81_ = _tmp80_.file; #line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp94_ = info; + _tmp82_ = _tmp81_.size; #line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp95_ = _tmp94_.file; + _tmp83_ = info; #line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp96_ = _tmp95_.size; + _tmp84_ = _tmp83_.file; #line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp97_ = info; + _tmp85_ = _tmp84_.mtime; #line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp98_ = _tmp97_.file; + _tmp86_ = file_format; #line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp99_ = _tmp98_.mtime; + _tmp87_ = photo_import_source_new (_tmp77_, _tmp78_, fsid, dir, _tmp79_, _tmp82_, _tmp85_, _tmp86_); #line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp100_ = file_format; + _tmp88_ = _tmp87_; #line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp101_ = photo_import_source_new (_tmp89_, _tmp90_, _tmp91_, _tmp92_, _tmp93_, _tmp96_, _tmp99_, _tmp100_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (import_list, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_IMPORT_SOURCE, ImportSource)); #line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp102_ = _tmp101_; -#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp102_); -#line 9441 "ImportPage.c" + _g_object_unref0 (_tmp88_); +#line 9657 "ImportPage.c" } #line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp103_ = self->priv->progress_bar; + _tmp89_ = self->priv->progress_bar; #line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_progress_bar_pulse (_tmp103_); + gtk_progress_bar_pulse (_tmp89_); #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" spin_event_loop (); #line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" (info); -#line 9451 "ImportPage.c" +#line 9667 "ImportPage.c" } goto __finally76; __catch76_g_error: { GError* err = NULL; - const gchar* _tmp104_; - GError* _tmp105_; - const gchar* _tmp106_; - GError* _tmp107_; - const gchar* _tmp108_; - gchar* _tmp109_; + const gchar* _tmp90_; + GError* _tmp91_; + const gchar* _tmp92_; + GError* _tmp93_; + const gchar* _tmp94_; + gchar* _tmp95_; #line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" err = _inner_error_; #line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _inner_error_ = NULL; #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp104_ = fulldir; + _tmp90_ = fulldir; #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp105_ = err; + _tmp91_ = err; #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp106_ = _tmp105_->message; + _tmp92_ = _tmp91_->message; #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1461: Error while enumerating files in %s: %s", _tmp104_, _tmp106_); + g_warning ("ImportPage.vala:1461: Error while enumerating files in %s: %s", _tmp90_, _tmp92_); #line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp107_ = err; + _tmp93_ = err; #line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp108_ = _tmp107_->message; + _tmp94_ = _tmp93_->message; #line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp109_ = g_strdup (_tmp108_); + _tmp95_ = g_strdup (_tmp94_); #line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->refresh_error); #line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->refresh_error = _tmp109_; + self->priv->refresh_error = _tmp95_; #line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; #line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -9498,13 +9714,13 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (fulldir); #line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9497 "ImportPage.c" +#line 9713 "ImportPage.c" } __finally76: #line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9502 "ImportPage.c" - gboolean _tmp110_ = FALSE; +#line 9718 "ImportPage.c" + gboolean _tmp96_ = FALSE; #line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (filename); #line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -9516,41 +9732,41 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const #line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_clear_error (&_inner_error_); #line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - return _tmp110_; -#line 9516 "ImportPage.c" + return _tmp96_; +#line 9732 "ImportPage.c" } #line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (filename); -#line 9520 "ImportPage.c" +#line 9736 "ImportPage.c" } } } #line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp112_ = gp_list_new (&_tmp111_); + _tmp98_ = gp_list_new (&_tmp97_); #line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_list_unref0 (folders); #line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - folders = _tmp111_; + folders = _tmp97_; #line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->refresh_result = _tmp112_; + self->priv->refresh_result = _tmp98_; #line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp113_ = self->priv->refresh_result; + _tmp99_ = self->priv->refresh_result; #line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp113_ != GP_OK) { -#line 9536 "ImportPage.c" - int _tmp114_; - gchar* _tmp115_; - gchar* _tmp116_; + if (_tmp99_ != GP_OK) { +#line 9752 "ImportPage.c" + int _tmp100_; + gchar* _tmp101_; + gchar* _tmp102_; #line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp114_ = self->priv->refresh_result; + _tmp100_ = self->priv->refresh_result; #line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp115_ = gp_result_to_full_string (_tmp114_); + _tmp101_ = gp_result_to_full_string (_tmp100_); #line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp116_ = _tmp115_; + _tmp102_ = _tmp101_; #line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1472: Unable to create folder list: %s", _tmp116_); + g_warning ("ImportPage.vala:1472: Unable to create folder list: %s", _tmp102_); #line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp116_); + _g_free0 (_tmp102_); #line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; #line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -9561,43 +9777,41 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (fulldir); #line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9560 "ImportPage.c" +#line 9776 "ImportPage.c" } #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp117_ = self->priv->camera; -#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp118_ = fulldir; + _tmp103_ = self->priv->camera; #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp119_ = folders; + _tmp104_ = fulldir; #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp120_ = import_page_spin_idle_context; + _tmp105_ = folders; #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp121_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; + _tmp106_ = import_page_spin_idle_context; #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp122_ = gp_camera_folder_list_folders (_tmp117_, _tmp118_, _tmp119_, _tmp121_); + _tmp107_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->refresh_result = _tmp122_; + self->priv->refresh_result = gp_camera_folder_list_folders (_tmp103_, _tmp104_, _tmp105_, _tmp107_); #line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp123_ = self->priv->refresh_result; + _tmp108_ = self->priv->refresh_result; #line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp123_ != GP_OK) { -#line 9580 "ImportPage.c" - const gchar* _tmp124_; - int _tmp125_; - gchar* _tmp126_; - gchar* _tmp127_; + if (_tmp108_ != GP_OK) { +#line 9794 "ImportPage.c" + const gchar* _tmp109_; + int _tmp110_; + gchar* _tmp111_; + gchar* _tmp112_; #line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp124_ = fulldir; + _tmp109_ = fulldir; #line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp125_ = self->priv->refresh_result; + _tmp110_ = self->priv->refresh_result; #line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp126_ = gp_result_to_full_string (_tmp125_); + _tmp111_ = gp_result_to_full_string (_tmp110_); #line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp127_ = _tmp126_; + _tmp112_ = _tmp111_; #line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1479: Unable to list folders in %s: %s", _tmp124_, _tmp127_); + g_warning ("ImportPage.vala:1479: Unable to list folders in %s: %s", _tmp109_, _tmp112_); #line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp127_); + _g_free0 (_tmp112_); #line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->refresh_result = GP_OK; #line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -9610,97 +9824,90 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (fulldir); #line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9609 "ImportPage.c" +#line 9823 "ImportPage.c" } { gint ctr = 0; #line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ctr = 0; -#line 9615 "ImportPage.c" +#line 9829 "ImportPage.c" { - gboolean _tmp128_ = FALSE; + gboolean _tmp113_ = FALSE; #line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp128_ = TRUE; + _tmp113_ = TRUE; #line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 9622 "ImportPage.c" - gint _tmp130_; - CameraList* _tmp131_; - gint _tmp132_; +#line 9836 "ImportPage.c" + gint _tmp115_; + CameraList* _tmp116_; gchar* subdir = NULL; - CameraList* _tmp133_; - gint _tmp134_; - const gchar* _tmp135_ = NULL; - int _tmp136_; - gchar* _tmp137_; - int _tmp138_; - gint _tmp143_; - const gchar* _tmp144_; - const gchar* _tmp145_; - gchar* _tmp146_; - gchar* _tmp147_; - GeeArrayList* _tmp148_; - gboolean _tmp149_; - gboolean _tmp150_; + CameraList* _tmp117_; + gint _tmp118_; + const gchar* _tmp119_ = NULL; + int _tmp120_; + gchar* _tmp121_; + int _tmp122_; + const gchar* _tmp127_; + gchar* _tmp128_; + gchar* _tmp129_; + gboolean _tmp130_; #line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp128_) { -#line 9643 "ImportPage.c" - gint _tmp129_; + if (!_tmp113_) { +#line 9852 "ImportPage.c" + gint _tmp114_; #line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp129_ = ctr; + _tmp114_ = ctr; #line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - ctr = _tmp129_ + 1; -#line 9649 "ImportPage.c" + ctr = _tmp114_ + 1; +#line 9858 "ImportPage.c" } #line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp128_ = FALSE; + _tmp113_ = FALSE; #line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp130_ = ctr; + _tmp115_ = ctr; #line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp131_ = folders; + _tmp116_ = folders; #line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp132_ = gp_list_count (_tmp131_); -#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!(_tmp130_ < _tmp132_)) { + if (!(_tmp115_ < gp_list_count (_tmp116_))) { #line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 9663 "ImportPage.c" +#line 9870 "ImportPage.c" } #line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp133_ = folders; + _tmp117_ = folders; #line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp134_ = ctr; + _tmp118_ = ctr; #line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp136_ = gp_list_get_name (_tmp133_, _tmp134_, &_tmp135_); + _tmp120_ = gp_list_get_name (_tmp117_, _tmp118_, &_tmp119_); #line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (subdir); #line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp137_ = g_strdup (_tmp135_); + _tmp121_ = g_strdup (_tmp119_); #line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - subdir = _tmp137_; + subdir = _tmp121_; #line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->refresh_result = _tmp136_; + self->priv->refresh_result = _tmp120_; #line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp138_ = self->priv->refresh_result; + _tmp122_ = self->priv->refresh_result; #line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp138_ != GP_OK) { -#line 9683 "ImportPage.c" - gint _tmp139_; - int _tmp140_; - gchar* _tmp141_; - gchar* _tmp142_; + if (_tmp122_ != GP_OK) { +#line 9890 "ImportPage.c" + gint _tmp123_; + int _tmp124_; + gchar* _tmp125_; + gchar* _tmp126_; #line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp139_ = ctr; + _tmp123_ = ctr; #line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp140_ = self->priv->refresh_result; + _tmp124_ = self->priv->refresh_result; #line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp141_ = gp_result_to_full_string (_tmp140_); + _tmp125_ = gp_result_to_full_string (_tmp124_); #line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp142_ = _tmp141_; + _tmp126_ = _tmp125_; #line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1491: Unable to get name of folder %d: %s", _tmp139_, _tmp142_); + g_warning ("ImportPage.vala:1491: Unable to get name of folder %d: %s", _tmp123_, _tmp126_); #line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp142_); + _g_free0 (_tmp126_); #line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; #line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -9713,28 +9920,20 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (fulldir); #line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9712 "ImportPage.c" +#line 9919 "ImportPage.c" } #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp143_ = fsid; -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp144_ = dir; -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp145_ = subdir; + _tmp127_ = subdir; #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp146_ = import_page_append_path (_tmp144_, _tmp145_); + _tmp128_ = import_page_append_path (dir, _tmp127_); #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp147_ = _tmp146_; + _tmp129_ = _tmp128_; #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp148_ = import_list; + _tmp130_ = !import_page_enumerate_files (self, fsid, _tmp129_, import_list); #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp149_ = import_page_enumerate_files (self, _tmp143_, _tmp147_, _tmp148_); + _g_free0 (_tmp129_); #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp150_ = !_tmp149_; -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp147_); -#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp150_) { + if (_tmp130_) { #line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; #line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -9747,11 +9946,11 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (fulldir); #line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9746 "ImportPage.c" +#line 9945 "ImportPage.c" } #line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (subdir); -#line 9750 "ImportPage.c" +#line 9949 "ImportPage.c" } } } @@ -9765,439 +9964,412 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (fulldir); #line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9764 "ImportPage.c" +#line 9963 "ImportPage.c" } -static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* import_list) { +static void +import_page_auto_match_raw_jpeg (ImportPage* self, + GeeArrayList* import_list) +{ #line 1504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); #line 1504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (GEE_IS_ARRAY_LIST (import_list)); -#line 9773 "ImportPage.c" +#line 9975 "ImportPage.c" { gint i = 0; #line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" i = 0; -#line 9778 "ImportPage.c" +#line 9980 "ImportPage.c" { gboolean _tmp0_ = FALSE; #line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = TRUE; #line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 9785 "ImportPage.c" +#line 9987 "ImportPage.c" gint _tmp2_; - GeeArrayList* _tmp3_; + gint _tmp3_; gint _tmp4_; - gint _tmp5_; PhotoImportSource* current = NULL; - GeeArrayList* _tmp6_; - gint _tmp7_; - gpointer _tmp8_; - ImportSource* _tmp9_; - PhotoImportSource* _tmp10_; - PhotoImportSource* _tmp11_ = NULL; + gint _tmp5_; + gpointer _tmp6_; + ImportSource* _tmp7_; + PhotoImportSource* _tmp8_; + PhotoImportSource* _tmp9_ = NULL; + gint _tmp10_; + gint _tmp11_; gint _tmp12_; - GeeArrayList* _tmp13_; - gint _tmp14_; - gint _tmp15_; PhotoImportSource* next = NULL; - PhotoImportSource* _tmp21_; - PhotoImportSource* _tmp22_ = NULL; - gint _tmp23_; + PhotoImportSource* _tmp17_; + PhotoImportSource* _tmp18_ = NULL; + gint _tmp19_; PhotoImportSource* prev = NULL; - PhotoImportSource* _tmp29_; - gboolean _tmp30_ = FALSE; - PhotoImportSource* _tmp31_; + PhotoImportSource* _tmp24_; + gboolean _tmp25_ = FALSE; + PhotoImportSource* _tmp26_; #line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp0_) { -#line 9811 "ImportPage.c" +#line 10010 "ImportPage.c" gint _tmp1_; #line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = i; #line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" i = _tmp1_ + 1; -#line 9817 "ImportPage.c" +#line 10016 "ImportPage.c" } #line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = FALSE; #line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = i; #line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = import_list; -#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (import_list, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!(_tmp2_ < _tmp5_)) { + if (!(_tmp2_ < _tmp4_)) { #line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 9833 "ImportPage.c" +#line 10030 "ImportPage.c" } #line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = import_list; + _tmp5_ = i; #line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = i; + _tmp6_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (import_list, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp5_); #line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp7_); + _tmp7_ = (ImportSource*) _tmp6_; #line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = (ImportSource*) _tmp8_; + _tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp7_) : NULL; #line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp9_) : NULL; + if (_tmp8_ == NULL) { #line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp10_ == NULL) { -#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp9_); -#line 9849 "ImportPage.c" + _g_object_unref0 (_tmp7_); +#line 10044 "ImportPage.c" } #line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - current = _tmp10_; + current = _tmp8_; #line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = i; + _tmp10_ = i; #line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = import_list; + _tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (import_list, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp12_ = _tmp11_; #line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp15_ = _tmp14_; -#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if ((_tmp12_ + 1) < _tmp15_) { -#line 9863 "ImportPage.c" - GeeArrayList* _tmp16_; - gint _tmp17_; - gpointer _tmp18_; - ImportSource* _tmp19_; - PhotoImportSource* _tmp20_; -#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp16_ = import_list; + if ((_tmp10_ + 1) < _tmp12_) { +#line 10056 "ImportPage.c" + gint _tmp13_; + gpointer _tmp14_; + ImportSource* _tmp15_; + PhotoImportSource* _tmp16_; #line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp17_ = i; + _tmp13_ = i; #line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp18_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp17_ + 1); + _tmp14_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (import_list, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp13_ + 1); #line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp19_ = (ImportSource*) _tmp18_; + _tmp15_ = (ImportSource*) _tmp14_; #line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp19_) : NULL; + _tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp15_) : NULL; #line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp20_ == NULL) { + if (_tmp16_ == NULL) { #line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp19_); -#line 9883 "ImportPage.c" + _g_object_unref0 (_tmp15_); +#line 10073 "ImportPage.c" } #line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp9_); #line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = _tmp20_; -#line 9889 "ImportPage.c" + _tmp9_ = _tmp16_; +#line 10079 "ImportPage.c" } else { #line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp9_); #line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = NULL; -#line 9895 "ImportPage.c" + _tmp9_ = NULL; +#line 10085 "ImportPage.c" } #line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp21_ = _g_object_ref0 (_tmp11_); + _tmp17_ = _g_object_ref0 (_tmp9_); #line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - next = _tmp21_; + next = _tmp17_; #line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp23_ = i; + _tmp19_ = i; #line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp23_ > 0) { -#line 9905 "ImportPage.c" - GeeArrayList* _tmp24_; - gint _tmp25_; - gpointer _tmp26_; - ImportSource* _tmp27_; - PhotoImportSource* _tmp28_; -#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp24_ = import_list; + if (_tmp19_ > 0) { +#line 10095 "ImportPage.c" + gint _tmp20_; + gpointer _tmp21_; + ImportSource* _tmp22_; + PhotoImportSource* _tmp23_; #line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp25_ = i; + _tmp20_ = i; #line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp26_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp25_ - 1); + _tmp21_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (import_list, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp20_ - 1); #line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp27_ = (ImportSource*) _tmp26_; + _tmp22_ = (ImportSource*) _tmp21_; #line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp28_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp27_) : NULL; + _tmp23_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp22_) : NULL; #line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp28_ == NULL) { + if (_tmp23_ == NULL) { #line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp27_); -#line 9925 "ImportPage.c" + _g_object_unref0 (_tmp22_); +#line 10112 "ImportPage.c" } #line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp22_); + _g_object_unref0 (_tmp18_); #line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp22_ = _tmp28_; -#line 9931 "ImportPage.c" + _tmp18_ = _tmp23_; +#line 10118 "ImportPage.c" } else { #line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp22_); + _g_object_unref0 (_tmp18_); #line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp22_ = NULL; -#line 9937 "ImportPage.c" + _tmp18_ = NULL; +#line 10124 "ImportPage.c" } #line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp29_ = _g_object_ref0 (_tmp22_); + _tmp24_ = _g_object_ref0 (_tmp18_); #line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - prev = _tmp29_; -#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp31_ = current; + prev = _tmp24_; #line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp31_ != NULL) { -#line 9947 "ImportPage.c" - PhotoImportSource* _tmp32_; - PhotoFileFormat _tmp33_; + _tmp26_ = current; #line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp32_ = current; + if (_tmp26_ != NULL) { +#line 10134 "ImportPage.c" + PhotoImportSource* _tmp27_; #line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp33_ = photo_import_source_get_file_format (_tmp32_); + _tmp27_ = current; #line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp30_ = _tmp33_ == PHOTO_FILE_FORMAT_RAW; -#line 9956 "ImportPage.c" + _tmp25_ = photo_import_source_get_file_format (_tmp27_) == PHOTO_FILE_FORMAT_RAW; +#line 10140 "ImportPage.c" } else { #line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp30_ = FALSE; -#line 9960 "ImportPage.c" + _tmp25_ = FALSE; +#line 10144 "ImportPage.c" } #line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp30_) { -#line 9964 "ImportPage.c" + if (_tmp25_) { +#line 10148 "ImportPage.c" gchar* current_name = NULL; gchar* ext = NULL; - PhotoImportSource* _tmp34_; - gchar* _tmp35_; - gchar* _tmp36_; - gchar* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; + PhotoImportSource* _tmp28_; + gchar* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_ = NULL; + gchar* _tmp32_ = NULL; PhotoImportSource* associated = NULL; - gboolean _tmp39_ = FALSE; - PhotoImportSource* _tmp40_; - gboolean _tmp52_ = FALSE; - PhotoImportSource* _tmp53_; - PhotoImportSource* _tmp65_; + gboolean _tmp33_ = FALSE; + PhotoImportSource* _tmp34_; + gboolean _tmp45_ = FALSE; + PhotoImportSource* _tmp46_; + PhotoImportSource* _tmp57_; #line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp34_ = current; + _tmp28_ = current; #line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp35_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp29_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_IMPORT_SOURCE, ImportSource)); #line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp36_ = _tmp35_; + _tmp30_ = _tmp29_; #line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - disassemble_filename (_tmp36_, &_tmp37_, &_tmp38_); + disassemble_filename (_tmp30_, &_tmp31_, &_tmp32_); #line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (current_name); #line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - current_name = _tmp37_; + current_name = _tmp31_; #line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (ext); #line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - ext = _tmp38_; + ext = _tmp32_; #line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp36_); + _g_free0 (_tmp30_); #line 1517 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" associated = NULL; #line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp40_ = next; -#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp40_ != NULL) { -#line 10002 "ImportPage.c" - PhotoImportSource* _tmp41_; - PhotoFileFormat _tmp42_; + _tmp34_ = next; #line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp41_ = next; + if (_tmp34_ != NULL) { +#line 10186 "ImportPage.c" + PhotoImportSource* _tmp35_; #line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp42_ = photo_import_source_get_file_format (_tmp41_); + _tmp35_ = next; #line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp39_ = _tmp42_ == PHOTO_FILE_FORMAT_JFIF; -#line 10011 "ImportPage.c" + _tmp33_ = photo_import_source_get_file_format (_tmp35_) == PHOTO_FILE_FORMAT_JFIF; +#line 10192 "ImportPage.c" } else { #line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp39_ = FALSE; -#line 10015 "ImportPage.c" + _tmp33_ = FALSE; +#line 10196 "ImportPage.c" } #line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp39_) { -#line 10019 "ImportPage.c" + if (_tmp33_) { +#line 10200 "ImportPage.c" gchar* next_name = NULL; - PhotoImportSource* _tmp43_; - gchar* _tmp44_; - gchar* _tmp45_; - gchar* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; - const gchar* _tmp48_; - const gchar* _tmp49_; + PhotoImportSource* _tmp36_; + gchar* _tmp37_; + gchar* _tmp38_; + gchar* _tmp39_ = NULL; + gchar* _tmp40_ = NULL; + const gchar* _tmp41_; + const gchar* _tmp42_; #line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp43_ = next; + _tmp36_ = next; #line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp44_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp37_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_IMPORT_SOURCE, ImportSource)); #line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp45_ = _tmp44_; + _tmp38_ = _tmp37_; #line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - disassemble_filename (_tmp45_, &_tmp46_, &_tmp47_); + disassemble_filename (_tmp38_, &_tmp39_, &_tmp40_); #line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (next_name); #line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - next_name = _tmp46_; + next_name = _tmp39_; #line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (ext); #line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - ext = _tmp47_; + ext = _tmp40_; #line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp45_); + _g_free0 (_tmp38_); #line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp48_ = next_name; + _tmp41_ = next_name; #line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp49_ = current_name; + _tmp42_ = current_name; #line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (g_strcmp0 (_tmp48_, _tmp49_) == 0) { -#line 10052 "ImportPage.c" - PhotoImportSource* _tmp50_; - PhotoImportSource* _tmp51_; + if (g_strcmp0 (_tmp41_, _tmp42_) == 0) { +#line 10233 "ImportPage.c" + PhotoImportSource* _tmp43_; + PhotoImportSource* _tmp44_; #line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp50_ = next; + _tmp43_ = next; #line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp51_ = _g_object_ref0 (_tmp50_); + _tmp44_ = _g_object_ref0 (_tmp43_); #line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (associated); #line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - associated = _tmp51_; -#line 10063 "ImportPage.c" + associated = _tmp44_; +#line 10244 "ImportPage.c" } #line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (next_name); -#line 10067 "ImportPage.c" +#line 10248 "ImportPage.c" } #line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp53_ = prev; -#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp53_ != NULL) { -#line 10073 "ImportPage.c" - PhotoImportSource* _tmp54_; - PhotoFileFormat _tmp55_; + _tmp46_ = prev; #line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp54_ = prev; + if (_tmp46_ != NULL) { +#line 10254 "ImportPage.c" + PhotoImportSource* _tmp47_; #line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp55_ = photo_import_source_get_file_format (_tmp54_); + _tmp47_ = prev; #line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp52_ = _tmp55_ == PHOTO_FILE_FORMAT_JFIF; -#line 10082 "ImportPage.c" + _tmp45_ = photo_import_source_get_file_format (_tmp47_) == PHOTO_FILE_FORMAT_JFIF; +#line 10260 "ImportPage.c" } else { #line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp52_ = FALSE; -#line 10086 "ImportPage.c" + _tmp45_ = FALSE; +#line 10264 "ImportPage.c" } #line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp52_) { -#line 10090 "ImportPage.c" + if (_tmp45_) { +#line 10268 "ImportPage.c" gchar* prev_name = NULL; - PhotoImportSource* _tmp56_; - gchar* _tmp57_; - gchar* _tmp58_; - gchar* _tmp59_ = NULL; - gchar* _tmp60_ = NULL; - const gchar* _tmp61_; - const gchar* _tmp62_; + PhotoImportSource* _tmp48_; + gchar* _tmp49_; + gchar* _tmp50_; + gchar* _tmp51_ = NULL; + gchar* _tmp52_ = NULL; + const gchar* _tmp53_; + const gchar* _tmp54_; #line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp56_ = prev; + _tmp48_ = prev; #line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp57_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp49_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_IMPORT_SOURCE, ImportSource)); #line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp58_ = _tmp57_; + _tmp50_ = _tmp49_; #line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - disassemble_filename (_tmp58_, &_tmp59_, &_tmp60_); + disassemble_filename (_tmp50_, &_tmp51_, &_tmp52_); #line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (prev_name); #line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - prev_name = _tmp59_; + prev_name = _tmp51_; #line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (ext); #line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - ext = _tmp60_; + ext = _tmp52_; #line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp58_); + _g_free0 (_tmp50_); #line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp61_ = prev_name; + _tmp53_ = prev_name; #line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp62_ = current_name; + _tmp54_ = current_name; #line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (g_strcmp0 (_tmp61_, _tmp62_) == 0) { -#line 10123 "ImportPage.c" - PhotoImportSource* _tmp63_; - PhotoImportSource* _tmp64_; + if (g_strcmp0 (_tmp53_, _tmp54_) == 0) { +#line 10301 "ImportPage.c" + PhotoImportSource* _tmp55_; + PhotoImportSource* _tmp56_; #line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp63_ = prev; + _tmp55_ = prev; #line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp64_ = _g_object_ref0 (_tmp63_); + _tmp56_ = _g_object_ref0 (_tmp55_); #line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (associated); #line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - associated = _tmp64_; -#line 10134 "ImportPage.c" + associated = _tmp56_; +#line 10312 "ImportPage.c" } #line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (prev_name); -#line 10138 "ImportPage.c" +#line 10316 "ImportPage.c" } #line 1532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp65_ = associated; + _tmp57_ = associated; #line 1532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp65_ != NULL) { -#line 10144 "ImportPage.c" + if (_tmp57_ != NULL) { +#line 10322 "ImportPage.c" + PhotoImportSource* _tmp58_; + gchar* _tmp59_; + gchar* _tmp60_; + PhotoImportSource* _tmp61_; + gchar* _tmp62_; + gchar* _tmp63_; + PhotoImportSource* _tmp64_; + PhotoImportSource* _tmp65_; PhotoImportSource* _tmp66_; - gchar* _tmp67_; - gchar* _tmp68_; - PhotoImportSource* _tmp69_; - gchar* _tmp70_; - gchar* _tmp71_; - PhotoImportSource* _tmp72_; - PhotoImportSource* _tmp73_; - GeeArrayList* _tmp74_; - PhotoImportSource* _tmp75_; - gboolean _tmp76_; #line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp66_ = current; + _tmp58_ = current; #line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp67_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp59_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_IMPORT_SOURCE, ImportSource)); #line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp68_ = _tmp67_; + _tmp60_ = _tmp59_; #line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp69_ = associated; + _tmp61_ = associated; #line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp70_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp62_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_IMPORT_SOURCE, ImportSource)); #line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp71_ = _tmp70_; + _tmp63_ = _tmp62_; #line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_debug ("ImportPage.vala:1533: Found RAW+JPEG pair: %s and %s", _tmp68_, _tmp71_); + g_debug ("ImportPage.vala:1533: Found RAW+JPEG pair: %s and %s", _tmp60_, _tmp63_); #line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp71_); + _g_free0 (_tmp63_); #line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp68_); + _g_free0 (_tmp60_); #line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp72_ = current; + _tmp64_ = current; #line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp73_ = associated; + _tmp65_ = associated; #line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - photo_import_source_set_associated (_tmp72_, _tmp73_); -#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp74_ = import_list; -#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp75_ = associated; + photo_import_source_set_associated (_tmp64_, _tmp65_); #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp76_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp66_ = associated; #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp76_) { -#line 10188 "ImportPage.c" - PhotoImportSource* _tmp77_; + if (!gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (import_list, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_IMPORT_SOURCE, ImportSource))) { +#line 10360 "ImportPage.c" + PhotoImportSource* _tmp67_; #line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_debug ("ImportPage.vala:1536: Unable to associate files"); #line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp77_ = current; + _tmp67_ = current; #line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - photo_import_source_set_associated (_tmp77_, NULL); -#line 10196 "ImportPage.c" + photo_import_source_set_associated (_tmp67_, NULL); +#line 10368 "ImportPage.c" } } #line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -10206,26 +10378,29 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp _g_free0 (ext); #line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (current_name); -#line 10205 "ImportPage.c" +#line 10377 "ImportPage.c" } #line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (prev); #line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp22_); + _g_object_unref0 (_tmp18_); #line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (next); #line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp9_); #line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (current); -#line 10217 "ImportPage.c" +#line 10389 "ImportPage.c" } } } } -static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* import_list) { +static void +import_page_load_previews_and_metadata (ImportPage* self, + GeeList* import_list) +{ gint loaded_photos = 0; GError * _inner_error_ = NULL; #line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -10234,130 +10409,125 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i g_return_if_fail (GEE_IS_LIST (import_list)); #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" loaded_photos = 0; -#line 10233 "ImportPage.c" +#line 10408 "ImportPage.c" { GeeList* _import_source_list = NULL; GeeList* _tmp0_; - GeeList* _tmp1_; gint _import_source_size = 0; - GeeList* _tmp2_; + GeeList* _tmp1_; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; gint _import_source_index = 0; #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = import_list; -#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (import_list); #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _import_source_list = _tmp1_; + _import_source_list = _tmp0_; #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = _import_source_list; + _tmp1_ = _import_source_list; #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _import_source_size = _tmp4_; + _import_source_size = _tmp3_; #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _import_source_index = -1; #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 10261 "ImportPage.c" +#line 10433 "ImportPage.c" + gint _tmp4_; gint _tmp5_; gint _tmp6_; - gint _tmp7_; ImportSource* import_source = NULL; - GeeList* _tmp8_; - gint _tmp9_; - gpointer _tmp10_; + GeeList* _tmp7_; + gint _tmp8_; + gpointer _tmp9_; gchar* filename = NULL; - ImportSource* _tmp11_; - gchar* _tmp12_; + ImportSource* _tmp10_; + gchar* _tmp11_; gchar* fulldir = NULL; - ImportSource* _tmp13_; - gchar* _tmp14_; - const gchar* _tmp15_; + ImportSource* _tmp12_; + gchar* _tmp13_; + const gchar* _tmp14_; PhotoImportSource* associated = NULL; - gboolean _tmp19_ = FALSE; - ImportSource* _tmp20_; + gboolean _tmp18_ = FALSE; + ImportSource* _tmp19_; + GtkProgressBar* _tmp25_; GtkProgressBar* _tmp26_; - GtkProgressBar* _tmp27_; - ImportSource* _tmp28_; + ImportSource* _tmp27_; + gchar* _tmp28_; gchar* _tmp29_; gchar* _tmp30_; gchar* _tmp31_; - gchar* _tmp32_; PhotoMetadata* metadata = NULL; - const gchar* _tmp33_; - gboolean _tmp34_; + const gchar* _tmp32_; gchar* exif_only_md5 = NULL; - PhotoMetadata* _tmp47_; + PhotoMetadata* _tmp45_; GdkPixbuf* preview = NULL; gchar* preview_md5 = NULL; + ImportSource* _tmp71_; ImportSource* _tmp74_; - ImportSource* _tmp77_; - PhotoImportSource* _tmp83_; - SourceCollection* _tmp107_; - ImportSource* _tmp108_; - GtkProgressBar* _tmp109_; + PhotoImportSource* _tmp80_; + SourceCollection* _tmp104_; + ImportSource* _tmp105_; + GtkProgressBar* _tmp106_; + gint _tmp107_; + gint _tmp108_; + gint _tmp109_; gint _tmp110_; - gint _tmp111_; - GeeList* _tmp112_; - gint _tmp113_; - gint _tmp114_; #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = _import_source_index; + _tmp4_ = _import_source_index; #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _import_source_index = _tmp5_ + 1; + _import_source_index = _tmp4_ + 1; #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = _import_source_index; + _tmp5_ = _import_source_index; #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = _import_source_size; + _tmp6_ = _import_source_size; #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!(_tmp6_ < _tmp7_)) { + if (!(_tmp5_ < _tmp6_)) { #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 10316 "ImportPage.c" +#line 10486 "ImportPage.c" } #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = _import_source_list; + _tmp7_ = _import_source_list; #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = _import_source_index; + _tmp8_ = _import_source_index; #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = gee_list_get (_tmp8_, _tmp9_); + _tmp9_ = gee_list_get (_tmp7_, _tmp8_); #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_source = (ImportSource*) _tmp10_; + import_source = (ImportSource*) _tmp9_; #line 1547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = import_source; + _tmp10_ = import_source; #line 1547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = import_source_get_filename (_tmp11_); + _tmp11_ = import_source_get_filename (_tmp10_); #line 1547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - filename = _tmp12_; + filename = _tmp11_; #line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = import_source; + _tmp12_ = import_source; #line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = import_source_get_fulldir (_tmp13_); + _tmp13_ = import_source_get_fulldir (_tmp12_); #line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - fulldir = _tmp14_; + fulldir = _tmp13_; #line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp15_ = fulldir; + _tmp14_ = fulldir; #line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp15_ == NULL) { -#line 10342 "ImportPage.c" - ImportSource* _tmp16_; + if (_tmp14_ == NULL) { +#line 10512 "ImportPage.c" + ImportSource* _tmp15_; + gchar* _tmp16_; gchar* _tmp17_; - gchar* _tmp18_; #line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp16_ = import_source; + _tmp15_ = import_source; #line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp17_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject)); + _tmp16_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_OBJECT, DataObject)); #line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_warning ("ImportPage.vala:1550: Skipping loading preview of %s: invalid folder n" \ -"ame", _tmp18_); +"ame", _tmp17_); #line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp17_); #line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (fulldir); #line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -10366,145 +10536,143 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _g_object_unref0 (import_source); #line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" continue; -#line 10364 "ImportPage.c" +#line 10534 "ImportPage.c" } #line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" associated = NULL; #line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp20_ = import_source; + _tmp19_ = import_source; #line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO_IMPORT_SOURCE)) { -#line 10372 "ImportPage.c" - ImportSource* _tmp21_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_PHOTO_IMPORT_SOURCE)) { +#line 10542 "ImportPage.c" + ImportSource* _tmp20_; + PhotoImportSource* _tmp21_; PhotoImportSource* _tmp22_; - PhotoImportSource* _tmp23_; #line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp21_ = import_source; + _tmp20_ = import_source; #line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp22_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource)); + _tmp21_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource)); #line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp23_ = _tmp22_; + _tmp22_ = _tmp21_; #line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp19_ = _tmp23_ != NULL; + _tmp18_ = _tmp22_ != NULL; #line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp23_); -#line 10386 "ImportPage.c" + _g_object_unref0 (_tmp22_); +#line 10556 "ImportPage.c" } else { #line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp19_ = FALSE; -#line 10390 "ImportPage.c" + _tmp18_ = FALSE; +#line 10560 "ImportPage.c" } #line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp19_) { -#line 10394 "ImportPage.c" - ImportSource* _tmp24_; - PhotoImportSource* _tmp25_; + if (_tmp18_) { +#line 10564 "ImportPage.c" + ImportSource* _tmp23_; + PhotoImportSource* _tmp24_; #line 1559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp24_ = import_source; + _tmp23_ = import_source; #line 1559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp25_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource)); + _tmp24_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource)); #line 1559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (associated); #line 1559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - associated = _tmp25_; -#line 10405 "ImportPage.c" + associated = _tmp24_; +#line 10575 "ImportPage.c" } #line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp26_ = self->priv->progress_bar; + _tmp25_ = self->priv->progress_bar; #line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_progress_bar_set_ellipsize (_tmp26_, PANGO_ELLIPSIZE_MIDDLE); + gtk_progress_bar_set_ellipsize (_tmp25_, PANGO_ELLIPSIZE_MIDDLE); #line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp27_ = self->priv->progress_bar; + _tmp26_ = self->priv->progress_bar; #line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp28_ = import_source; + _tmp27_ = import_source; #line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp29_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject)); + _tmp28_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_OBJECT, DataObject)); #line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp30_ = _tmp29_; + _tmp29_ = _tmp28_; #line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp31_ = g_strdup_printf (_ ("Fetching preview for %s"), _tmp30_); + _tmp30_ = g_strdup_printf (_ ("Fetching preview for %s"), _tmp29_); #line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp32_ = _tmp31_; + _tmp31_ = _tmp30_; #line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_progress_bar_set_text (_tmp27_, _tmp32_); + gtk_progress_bar_set_text (_tmp26_, _tmp31_); #line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp32_); + _g_free0 (_tmp31_); #line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp30_); + _g_free0 (_tmp29_); #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" metadata = NULL; #line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp33_ = filename; + _tmp32_ = filename; #line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp34_ = video_reader_is_supported_video_filename (_tmp33_); -#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp34_) { -#line 10437 "ImportPage.c" + if (!video_reader_is_supported_video_filename (_tmp32_)) { +#line 10605 "ImportPage.c" { - PhotoMetadata* _tmp35_ = NULL; - GPSpinIdleWrapper* _tmp36_; - GPContext* _tmp37_; - Camera* _tmp38_; - const gchar* _tmp39_; - const gchar* _tmp40_; - PhotoMetadata* _tmp41_; - PhotoMetadata* _tmp42_; + PhotoMetadata* _tmp33_ = NULL; + GPSpinIdleWrapper* _tmp34_; + GPContext* _tmp35_; + Camera* _tmp36_; + const gchar* _tmp37_; + const gchar* _tmp38_; + PhotoMetadata* _tmp39_; + PhotoMetadata* _tmp40_; #line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp36_ = import_page_spin_idle_context; + _tmp34_ = import_page_spin_idle_context; #line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; + _tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; #line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp38_ = self->priv->camera; + _tmp36_ = self->priv->camera; #line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp39_ = fulldir; + _tmp37_ = fulldir; #line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp40_ = filename; + _tmp38_ = filename; #line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp41_ = gp_load_metadata (_tmp37_, _tmp38_, _tmp39_, _tmp40_, &_inner_error_); + _tmp39_ = gp_load_metadata (_tmp35_, _tmp36_, _tmp37_, _tmp38_, &_inner_error_); #line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp35_ = _tmp41_; + _tmp33_ = _tmp39_; #line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10463 "ImportPage.c" +#line 10631 "ImportPage.c" goto __catch77_g_error; } #line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp42_ = _tmp35_; + _tmp40_ = _tmp33_; #line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp35_ = NULL; + _tmp33_ = NULL; #line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (metadata); #line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - metadata = _tmp42_; + metadata = _tmp40_; #line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _media_metadata_unref0 (_tmp35_); -#line 10476 "ImportPage.c" + _media_metadata_unref0 (_tmp33_); +#line 10644 "ImportPage.c" } goto __finally77; __catch77_g_error: { GError* err = NULL; - const gchar* _tmp43_; + const gchar* _tmp41_; + const gchar* _tmp42_; + GError* _tmp43_; const gchar* _tmp44_; - GError* _tmp45_; - const gchar* _tmp46_; #line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" err = _inner_error_; #line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _inner_error_ = NULL; #line 1576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp43_ = fulldir; + _tmp41_ = fulldir; #line 1576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp44_ = filename; + _tmp42_ = filename; #line 1576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp45_ = err; + _tmp43_ = err; #line 1576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp46_ = _tmp45_->message; + _tmp44_ = _tmp43_->message; #line 1576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1576: Unable to fetch metadata for %s/%s: %s", _tmp43_, _tmp44_, _tmp46_); + g_warning ("ImportPage.vala:1576: Unable to fetch metadata for %s/%s: %s", _tmp41_, _tmp42_, _tmp44_); #line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 10502 "ImportPage.c" +#line 10670 "ImportPage.c" } __finally77: #line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -10527,168 +10695,165 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i g_clear_error (&_inner_error_); #line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 10525 "ImportPage.c" +#line 10693 "ImportPage.c" } } #line 1582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" exif_only_md5 = NULL; #line 1583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp47_ = metadata; + _tmp45_ = metadata; #line 1583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp47_ != NULL) { -#line 10534 "ImportPage.c" - PhotoMetadata* _tmp48_; - gchar* _tmp49_; + if (_tmp45_ != NULL) { +#line 10702 "ImportPage.c" + PhotoMetadata* _tmp46_; + gchar* _tmp47_; #line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp48_ = metadata; + _tmp46_ = metadata; #line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp49_ = photo_metadata_exif_hash (_tmp48_); + _tmp47_ = photo_metadata_exif_hash (_tmp46_); #line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (exif_only_md5); #line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - exif_only_md5 = _tmp49_; -#line 10545 "ImportPage.c" + exif_only_md5 = _tmp47_; +#line 10713 "ImportPage.c" } #line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview = NULL; #line 1594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_md5 = NULL; -#line 10551 "ImportPage.c" +#line 10719 "ImportPage.c" { gchar* preview_fulldir = NULL; + const gchar* _tmp48_; + gchar* _tmp49_; + gchar* preview_filename = NULL; const gchar* _tmp50_; gchar* _tmp51_; - gchar* preview_filename = NULL; - const gchar* _tmp52_; - gchar* _tmp53_; - PhotoImportSource* _tmp54_; - GdkPixbuf* _tmp59_ = NULL; - GPSpinIdleWrapper* _tmp60_; - GPContext* _tmp61_; - Camera* _tmp62_; - const gchar* _tmp63_; - const gchar* _tmp64_; - gchar* _tmp65_ = NULL; - GdkPixbuf* _tmp66_; - GdkPixbuf* _tmp67_; + PhotoImportSource* _tmp52_; + GdkPixbuf* _tmp57_ = NULL; + GPSpinIdleWrapper* _tmp58_; + GPContext* _tmp59_; + Camera* _tmp60_; + const gchar* _tmp61_; + const gchar* _tmp62_; + gchar* _tmp63_ = NULL; + GdkPixbuf* _tmp64_; + GdkPixbuf* _tmp65_; #line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp50_ = fulldir; + _tmp48_ = fulldir; #line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp51_ = g_strdup (_tmp50_); + _tmp49_ = g_strdup (_tmp48_); #line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - preview_fulldir = _tmp51_; + preview_fulldir = _tmp49_; #line 1597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp52_ = filename; + _tmp50_ = filename; #line 1597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp53_ = g_strdup (_tmp52_); + _tmp51_ = g_strdup (_tmp50_); #line 1597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - preview_filename = _tmp53_; + preview_filename = _tmp51_; #line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp54_ = associated; + _tmp52_ = associated; #line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp54_ != NULL) { -#line 10585 "ImportPage.c" + if (_tmp52_ != NULL) { +#line 10753 "ImportPage.c" + PhotoImportSource* _tmp53_; + gchar* _tmp54_; PhotoImportSource* _tmp55_; gchar* _tmp56_; - PhotoImportSource* _tmp57_; - gchar* _tmp58_; #line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp55_ = associated; + _tmp53_ = associated; #line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp56_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp54_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_IMPORT_SOURCE, ImportSource)); #line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (preview_fulldir); #line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - preview_fulldir = _tmp56_; + preview_fulldir = _tmp54_; #line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp57_ = associated; + _tmp55_ = associated; #line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp58_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp56_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_IMPORT_SOURCE, ImportSource)); #line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (preview_filename); #line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - preview_filename = _tmp58_; -#line 10606 "ImportPage.c" + preview_filename = _tmp56_; +#line 10774 "ImportPage.c" } #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp60_ = import_page_spin_idle_context; + _tmp58_ = import_page_spin_idle_context; #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp61_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; + _tmp59_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp62_ = self->priv->camera; + _tmp60_ = self->priv->camera; #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp63_ = preview_fulldir; + _tmp61_ = preview_fulldir; #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp64_ = preview_filename; + _tmp62_ = preview_filename; #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp66_ = gp_load_preview (_tmp61_, _tmp62_, _tmp63_, _tmp64_, &_tmp65_, &_inner_error_); + _tmp64_ = gp_load_preview (_tmp59_, _tmp60_, _tmp61_, _tmp62_, &_tmp63_, &_inner_error_); #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (preview_md5); #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - preview_md5 = _tmp65_; + preview_md5 = _tmp63_; #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp59_ = _tmp66_; + _tmp57_ = _tmp64_; #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (preview_filename); #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (preview_fulldir); -#line 10632 "ImportPage.c" +#line 10800 "ImportPage.c" goto __catch78_g_error; } #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp67_ = _tmp59_; + _tmp65_ = _tmp57_; #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp59_ = NULL; + _tmp57_ = NULL; #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (preview); #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - preview = _tmp67_; + preview = _tmp65_; #line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp59_); + _g_object_unref0 (_tmp57_); #line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (preview_filename); #line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (preview_fulldir); -#line 10649 "ImportPage.c" +#line 10817 "ImportPage.c" } goto __finally78; __catch78_g_error: { GError* err = NULL; - const gchar* _tmp68_; - gboolean _tmp69_; + const gchar* _tmp66_; #line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" err = _inner_error_; #line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _inner_error_ = NULL; #line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp68_ = filename; + _tmp66_ = filename; #line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp69_ = video_reader_is_supported_video_filename (_tmp68_); -#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp69_) { -#line 10667 "ImportPage.c" + if (!video_reader_is_supported_video_filename (_tmp66_)) { +#line 10832 "ImportPage.c" + const gchar* _tmp67_; + const gchar* _tmp68_; + GError* _tmp69_; const gchar* _tmp70_; - const gchar* _tmp71_; - GError* _tmp72_; - const gchar* _tmp73_; #line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp70_ = fulldir; + _tmp67_ = fulldir; #line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp71_ = filename; + _tmp68_ = filename; #line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp72_ = err; + _tmp69_ = err; #line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp73_ = _tmp72_->message; + _tmp70_ = _tmp69_->message; #line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1611: Unable to fetch preview for %s/%s: %s", _tmp70_, _tmp71_, _tmp73_); -#line 10682 "ImportPage.c" + g_warning ("ImportPage.vala:1611: Unable to fetch preview for %s/%s: %s", _tmp67_, _tmp68_, _tmp70_); +#line 10847 "ImportPage.c" } #line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 10686 "ImportPage.c" +#line 10851 "ImportPage.c" } __finally78: #line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -10717,157 +10882,157 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i g_clear_error (&_inner_error_); #line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 10715 "ImportPage.c" +#line 10880 "ImportPage.c" } #line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp74_ = import_source; + _tmp71_ = import_source; #line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp74_, TYPE_VIDEO_IMPORT_SOURCE)) { -#line 10721 "ImportPage.c" - ImportSource* _tmp75_; - GdkPixbuf* _tmp76_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp71_, TYPE_VIDEO_IMPORT_SOURCE)) { +#line 10886 "ImportPage.c" + ImportSource* _tmp72_; + GdkPixbuf* _tmp73_; #line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp75_ = import_source; + _tmp72_ = import_source; #line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp76_ = preview; + _tmp73_ = preview; #line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - video_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp75_) : NULL, _tmp76_); -#line 10730 "ImportPage.c" + video_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp72_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp72_) : NULL, _tmp73_); +#line 10895 "ImportPage.c" } #line 1622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp77_ = import_source; + _tmp74_ = import_source; #line 1622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp77_, TYPE_PHOTO_IMPORT_SOURCE)) { -#line 10736 "ImportPage.c" - ImportSource* _tmp78_; - GdkPixbuf* _tmp79_; - const gchar* _tmp80_; - PhotoMetadata* _tmp81_; - const gchar* _tmp82_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp74_, TYPE_PHOTO_IMPORT_SOURCE)) { +#line 10901 "ImportPage.c" + ImportSource* _tmp75_; + GdkPixbuf* _tmp76_; + const gchar* _tmp77_; + PhotoMetadata* _tmp78_; + const gchar* _tmp79_; #line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp78_ = import_source; + _tmp75_ = import_source; #line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp79_ = preview; + _tmp76_ = preview; #line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp80_ = preview_md5; + _tmp77_ = preview_md5; #line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp81_ = metadata; + _tmp78_ = metadata; #line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp82_ = exif_only_md5; + _tmp79_ = exif_only_md5; #line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - photo_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp78_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp78_) : NULL, _tmp79_, _tmp80_, _tmp81_, _tmp82_); -#line 10754 "ImportPage.c" + photo_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp75_) : NULL, _tmp76_, _tmp77_, _tmp78_, _tmp79_); +#line 10919 "ImportPage.c" } #line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp83_ = associated; + _tmp80_ = associated; #line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp83_ != NULL) { -#line 10760 "ImportPage.c" + if (_tmp80_ != NULL) { +#line 10925 "ImportPage.c" { PhotoMetadata* associated_metadata = NULL; - GPSpinIdleWrapper* _tmp84_; - GPContext* _tmp85_; - Camera* _tmp86_; + GPSpinIdleWrapper* _tmp81_; + GPContext* _tmp82_; + Camera* _tmp83_; + PhotoImportSource* _tmp84_; + gchar* _tmp85_; + gchar* _tmp86_; PhotoImportSource* _tmp87_; gchar* _tmp88_; gchar* _tmp89_; - PhotoImportSource* _tmp90_; - gchar* _tmp91_; - gchar* _tmp92_; - PhotoMetadata* _tmp93_; - PhotoMetadata* _tmp94_; - PhotoImportSource* _tmp95_; - GdkPixbuf* _tmp96_; - const gchar* _tmp97_; - PhotoMetadata* _tmp98_; -#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp84_ = import_page_spin_idle_context; + PhotoMetadata* _tmp90_; + PhotoMetadata* _tmp91_; + PhotoImportSource* _tmp92_; + GdkPixbuf* _tmp93_; + const gchar* _tmp94_; + PhotoMetadata* _tmp95_; #line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp85_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; + _tmp81_ = import_page_spin_idle_context; #line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp86_ = self->priv->camera; + _tmp82_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; #line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp87_ = associated; + _tmp83_ = self->priv->camera; #line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp88_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp84_ = associated; #line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp89_ = _tmp88_; + _tmp85_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, TYPE_IMPORT_SOURCE, ImportSource)); #line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp90_ = associated; + _tmp86_ = _tmp85_; #line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp91_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp87_ = associated; #line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp92_ = _tmp91_; + _tmp88_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_IMPORT_SOURCE, ImportSource)); #line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp93_ = gp_load_metadata (_tmp85_, _tmp86_, _tmp89_, _tmp92_, &_inner_error_); + _tmp89_ = _tmp88_; #line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp94_ = _tmp93_; + _tmp90_ = gp_load_metadata (_tmp82_, _tmp83_, _tmp86_, _tmp89_, &_inner_error_); #line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp92_); + _tmp91_ = _tmp90_; #line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp89_); #line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - associated_metadata = _tmp94_; + _g_free0 (_tmp86_); +#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + associated_metadata = _tmp91_; #line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10808 "ImportPage.c" +#line 10973 "ImportPage.c" goto __catch79_g_error; } #line 1630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp95_ = associated; + _tmp92_ = associated; #line 1630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp96_ = preview; + _tmp93_ = preview; #line 1630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp97_ = preview_md5; + _tmp94_ = preview_md5; #line 1630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp98_ = associated_metadata; + _tmp95_ = associated_metadata; #line 1630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - photo_import_source_update (_tmp95_, _tmp96_, _tmp97_, _tmp98_, NULL); + photo_import_source_update (_tmp92_, _tmp93_, _tmp94_, _tmp95_, NULL); #line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (associated_metadata); -#line 10823 "ImportPage.c" +#line 10988 "ImportPage.c" } goto __finally79; __catch79_g_error: { GError* err = NULL; + PhotoImportSource* _tmp96_; + gchar* _tmp97_; + gchar* _tmp98_; PhotoImportSource* _tmp99_; gchar* _tmp100_; gchar* _tmp101_; - PhotoImportSource* _tmp102_; - gchar* _tmp103_; - gchar* _tmp104_; - GError* _tmp105_; - const gchar* _tmp106_; + GError* _tmp102_; + const gchar* _tmp103_; #line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" err = _inner_error_; #line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _inner_error_ = NULL; #line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp99_ = associated; -#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp100_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp96_ = associated; #line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp101_ = _tmp100_; + _tmp97_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, TYPE_IMPORT_SOURCE, ImportSource)); #line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp102_ = associated; + _tmp98_ = _tmp97_; #line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp103_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, TYPE_IMPORT_SOURCE, ImportSource)); + _tmp99_ = associated; #line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp104_ = _tmp103_; + _tmp100_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, TYPE_IMPORT_SOURCE, ImportSource)); #line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp105_ = err; + _tmp101_ = _tmp100_; #line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp106_ = _tmp105_->message; + _tmp102_ = err; #line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_warning ("ImportPage.vala:1632: Unable to fetch metadata for %s/%s: %s", _tmp101_, _tmp104_, _tmp106_); + _tmp103_ = _tmp102_->message; #line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp104_); + g_warning ("ImportPage.vala:1632: Unable to fetch metadata for %s/%s: %s", _tmp98_, _tmp101_, _tmp103_); #line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp101_); +#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" + _g_free0 (_tmp98_); #line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 10865 "ImportPage.c" +#line 11030 "ImportPage.c" } __finally79: #line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -10896,31 +11061,29 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i g_clear_error (&_inner_error_); #line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 10894 "ImportPage.c" +#line 11059 "ImportPage.c" } } #line 1638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp107_ = self->priv->import_sources; + _tmp104_ = self->priv->import_sources; #line 1638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp108_ = import_source; + _tmp105_ = import_source; #line 1638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, TYPE_DATA_OBJECT, DataObject)); -#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp109_ = self->priv->progress_bar; + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, TYPE_DATA_OBJECT, DataObject)); #line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp110_ = loaded_photos; + _tmp106_ = self->priv->progress_bar; #line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - loaded_photos = _tmp110_ + 1; + _tmp107_ = loaded_photos; #line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp111_ = loaded_photos; + loaded_photos = _tmp107_ + 1; #line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp112_ = import_list; + _tmp108_ = loaded_photos; #line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp113_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp109_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (import_list, GEE_TYPE_COLLECTION, GeeCollection)); #line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp114_ = _tmp113_; + _tmp110_ = _tmp109_; #line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_progress_bar_set_fraction (_tmp109_, ((gdouble) _tmp111_) / ((gdouble) _tmp114_)); + gtk_progress_bar_set_fraction (_tmp106_, ((gdouble) _tmp108_) / ((gdouble) _tmp110_)); #line 1647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" spin_event_loop (); #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -10939,78 +11102,76 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _g_free0 (filename); #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (import_source); -#line 10937 "ImportPage.c" +#line 11100 "ImportPage.c" } #line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_import_source_list); -#line 10941 "ImportPage.c" +#line 11104 "ImportPage.c" } } -static void import_page_on_hide_imported (ImportPage* self) { +static void +import_page_on_hide_imported (ImportPage* self) +{ GtkCheckButton* _tmp0_; - gboolean _tmp1_; + ConfigFacade* _tmp7_; ConfigFacade* _tmp8_; - ConfigFacade* _tmp9_; - GtkCheckButton* _tmp10_; - gboolean _tmp11_; + GtkCheckButton* _tmp9_; #line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); #line 1652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = self->priv->hide_imported; #line 1652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 1652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp1_) { -#line 10961 "ImportPage.c" + if (gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton))) { +#line 11122 "ImportPage.c" + ViewCollection* _tmp1_; ViewCollection* _tmp2_; - ViewCollection* _tmp3_; - ImportPageHideImportedViewFilter* _tmp4_; + ImportPageHideImportedViewFilter* _tmp3_; #line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = self->priv->hide_imported_filter; + _tmp3_ = self->priv->hide_imported_filter; #line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - view_collection_install_view_filter (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_VIEW_FILTER, ViewFilter)); + view_collection_install_view_filter (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_VIEW_FILTER, ViewFilter)); #line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _data_collection_unref0 (_tmp3_); -#line 10975 "ImportPage.c" + _data_collection_unref0 (_tmp2_); +#line 11136 "ImportPage.c" } else { + ViewCollection* _tmp4_; ViewCollection* _tmp5_; - ViewCollection* _tmp6_; - ImportPageHideImportedViewFilter* _tmp7_; + ImportPageHideImportedViewFilter* _tmp6_; #line 1655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 1655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 1655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = self->priv->hide_imported_filter; + _tmp6_ = self->priv->hide_imported_filter; #line 1655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - view_collection_remove_view_filter (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIEW_FILTER, ViewFilter)); + view_collection_remove_view_filter (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_VIEW_FILTER, ViewFilter)); #line 1655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _data_collection_unref0 (_tmp6_); -#line 10990 "ImportPage.c" + _data_collection_unref0 (_tmp5_); +#line 11151 "ImportPage.c" } #line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = config_facade_get_instance (); + _tmp7_ = config_facade_get_instance (); #line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = _tmp8_; -#line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = self->priv->hide_imported; + _tmp8_ = _tmp7_; #line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_toggle_button_get_type (), GtkToggleButton)); + _tmp9_ = self->priv->hide_imported; #line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - configuration_facade_set_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp11_); + configuration_facade_set_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton))); #line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp9_); -#line 11004 "ImportPage.c" + _g_object_unref0 (_tmp8_); +#line 11163 "ImportPage.c" } -static void import_page_on_import_selected (ImportPage* self) { +static void +import_page_on_import_selected (ImportPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; GeeList* _tmp2_; @@ -11031,11 +11192,13 @@ static void import_page_on_import_selected (ImportPage* self) { _g_object_unref0 (_tmp3_); #line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp1_); -#line 11029 "ImportPage.c" +#line 11190 "ImportPage.c" } -static void import_page_on_import_all (ImportPage* self) { +static void +import_page_on_import_all (ImportPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; GeeCollection* _tmp2_; @@ -11056,60 +11219,79 @@ static void import_page_on_import_all (ImportPage* self) { _g_object_unref0 (_tmp3_); #line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp1_); -#line 11054 "ImportPage.c" +#line 11217 "ImportPage.c" } -static gint64 _import_page_import_job_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_import_page_import_job_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = import_page_import_job_comparator ((ImportPage*) self, a, b); #line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 11063 "ImportPage.c" +#line 11230 "ImportPage.c" } -static void _import_page_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { +static void +_import_page_import_reporter_batch_import_import_reporter (ImportManifest* manifest, + BatchImportRoll* import_roll, + gpointer self) +{ #line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_import_reporter ((ImportPage*) self, manifest); -#line 11070 "ImportPage.c" +#line 11241 "ImportPage.c" } -static void _import_page_on_import_job_failed_batch_import_import_job_failed (BatchImport* _sender, BatchImportResult* _result_, gpointer self) { +static void +_import_page_on_import_job_failed_batch_import_import_job_failed (BatchImport* _sender, + BatchImportResult* _result_, + gpointer self) +{ #line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_import_job_failed ((ImportPage*) self, _result_); -#line 11077 "ImportPage.c" +#line 11252 "ImportPage.c" } -static void _import_page_close_import_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { +static void +_import_page_close_import_batch_import_import_complete (BatchImport* _sender, + ImportManifest* manifest, + BatchImportRoll* import_roll, + gpointer self) +{ #line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_close_import ((ImportPage*) self); -#line 11084 "ImportPage.c" +#line 11264 "ImportPage.c" } -static void import_page_import (ImportPage* self, GeeIterable* items) { +static void +import_page_import (ImportPage* self, + GeeIterable* items) +{ int res = 0; Camera* _tmp0_; GPSpinIdleWrapper* _tmp1_; GPContext* _tmp2_; int _tmp3_; - int _tmp4_; - gboolean _tmp10_; - GtkProgressBar* _tmp11_; + gboolean _tmp9_; + GtkProgressBar* _tmp10_; SortedList* jobs = NULL; - SortedList* _tmp12_; + SortedList* _tmp11_; GeeArrayList* already_imported = NULL; - GeeArrayList* _tmp13_; + GeeArrayList* _tmp12_; + SortedList* _tmp50_; + gint _tmp51_; + gint _tmp52_; + const gchar* _tmp53_; SortedList* _tmp54_; gint _tmp55_; gint _tmp56_; - const gchar* _tmp57_; - SortedList* _tmp58_; - gint _tmp59_; - gint _tmp60_; #line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); #line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -11121,171 +11303,160 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { #line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; #line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = gp_camera_init (_tmp0_, _tmp2_); -#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - res = _tmp3_; + res = gp_camera_init (_tmp0_, _tmp2_); #line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = res; + _tmp3_ = res; #line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp4_ != GP_OK) { -#line 11126 "ImportPage.c" - int _tmp5_; + if (_tmp3_ != GP_OK) { +#line 11306 "ImportPage.c" + int _tmp4_; + gchar* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; #line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = res; + _tmp4_ = res; #line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = gp_result_to_full_string (_tmp5_); + _tmp5_ = gp_result_to_full_string (_tmp4_); #line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = g_strdup_printf (_ ("Unable to lock camera: %s"), _tmp7_); + _tmp7_ = g_strdup_printf (_ ("Unable to lock camera: %s"), _tmp6_); #line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - app_window_error_message (_tmp9_, NULL); + app_window_error_message (_tmp8_, NULL); #line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp8_); #line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 1673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 11150 "ImportPage.c" +#line 11330 "ImportPage.c" } #line 1676 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = self->priv->refreshed; + _tmp9_ = self->priv->refreshed; #line 1676 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_update_status (self, TRUE, _tmp10_); + import_page_update_status (self, TRUE, _tmp9_); #line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_view_changed (self); #line 1679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = self->priv->progress_bar; + _tmp10_ = self->priv->progress_bar; #line 1679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE); #line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = sorted_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, _import_page_import_job_comparator_comparator, self); + _tmp11_ = sorted_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, _import_page_import_job_comparator_comparator, self); #line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - jobs = _tmp12_; + jobs = _tmp11_; #line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = gee_array_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); + _tmp12_ = gee_array_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); #line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - already_imported = _tmp13_; -#line 11170 "ImportPage.c" + already_imported = _tmp12_; +#line 11350 "ImportPage.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp14_; - GeeIterator* _tmp15_; -#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = items; + GeeIterator* _tmp13_; #line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp15_ = gee_iterable_iterator (_tmp14_); + _tmp13_ = gee_iterable_iterator (items); #line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _object_it = _tmp15_; + _object_it = _tmp13_; #line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 11183 "ImportPage.c" - GeeIterator* _tmp16_; - gboolean _tmp17_; +#line 11360 "ImportPage.c" + GeeIterator* _tmp14_; DataObject* object = NULL; - GeeIterator* _tmp18_; - gpointer _tmp19_; + GeeIterator* _tmp15_; + gpointer _tmp16_; ImportPreview* preview = NULL; - DataObject* _tmp20_; - ImportPreview* _tmp21_; + DataObject* _tmp17_; + ImportPreview* _tmp18_; ImportSource* import_file = NULL; - ImportPreview* _tmp22_; - DataSource* _tmp23_; - ImportPreview* _tmp24_; - gboolean _tmp25_; + ImportPreview* _tmp19_; + DataSource* _tmp20_; + ImportPreview* _tmp21_; ImportPageCameraImportJob* import_job = NULL; - GPContextWrapper* _tmp37_; - ImportSource* _tmp38_; - ImportPageCameraImportJob* _tmp39_; - gboolean _tmp40_ = FALSE; - ImportSource* _tmp41_; - SortedList* _tmp52_; - ImportPageCameraImportJob* _tmp53_; + GPContextWrapper* _tmp33_; + ImportSource* _tmp34_; + ImportPageCameraImportJob* _tmp35_; + gboolean _tmp36_ = FALSE; + ImportSource* _tmp37_; + SortedList* _tmp48_; + ImportPageCameraImportJob* _tmp49_; #line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp16_ = _object_it; + _tmp14_ = _object_it; #line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp17_ = gee_iterator_next (_tmp16_); -#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp17_) { + if (!gee_iterator_next (_tmp14_)) { #line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 11213 "ImportPage.c" +#line 11386 "ImportPage.c" } #line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp18_ = _object_it; + _tmp15_ = _object_it; #line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp19_ = gee_iterator_get (_tmp18_); + _tmp16_ = gee_iterator_get (_tmp15_); #line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - object = (DataObject*) _tmp19_; + object = (DataObject*) _tmp16_; #line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp20_ = object; + _tmp17_ = object; #line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_IMPORT_PREVIEW, ImportPreview)); + _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_IMPORT_PREVIEW, ImportPreview)); #line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - preview = _tmp21_; + preview = _tmp18_; #line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp22_ = preview; + _tmp19_ = preview; #line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp23_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_VIEW, DataView)); + _tmp20_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_VIEW, DataView)); #line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_IMPORT_SOURCE, ImportSource); -#line 1688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp24_ = preview; + import_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_IMPORT_SOURCE, ImportSource); #line 1688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp25_ = import_preview_is_already_imported (_tmp24_); + _tmp21_ = preview; #line 1688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp25_) { -#line 11239 "ImportPage.c" - ImportSource* _tmp26_; - gchar* _tmp27_; - gchar* _tmp28_; - GeeArrayList* _tmp29_; - GPContextWrapper* _tmp30_; - ImportSource* _tmp31_; - ImportPreview* _tmp32_; - DuplicatedFile* _tmp33_; - DuplicatedFile* _tmp34_; - ImportPageCameraImportJob* _tmp35_; - ImportPageCameraImportJob* _tmp36_; + if (import_preview_is_already_imported (_tmp21_)) { +#line 11410 "ImportPage.c" + ImportSource* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + GeeArrayList* _tmp25_; + GPContextWrapper* _tmp26_; + ImportSource* _tmp27_; + ImportPreview* _tmp28_; + DuplicatedFile* _tmp29_; + DuplicatedFile* _tmp30_; + ImportPageCameraImportJob* _tmp31_; + ImportPageCameraImportJob* _tmp32_; #line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp26_ = import_file; + _tmp22_ = import_file; #line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp27_ = import_source_get_filename (_tmp26_); + _tmp23_ = import_source_get_filename (_tmp22_); #line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp28_ = _tmp27_; + _tmp24_ = _tmp23_; #line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_message ("ImportPage.vala:1689: Skipping import of %s: checksum detected in libr" \ -"ary", _tmp28_); +"ary", _tmp24_); #line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp28_); + _g_free0 (_tmp24_); #line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp29_ = already_imported; + _tmp25_ = already_imported; #line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp30_ = import_page_null_context; + _tmp26_ = import_page_null_context; #line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp31_ = import_file; + _tmp27_ = import_file; #line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp32_ = preview; + _tmp28_ = preview; #line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp33_ = import_preview_get_duplicated_file (_tmp32_); + _tmp29_ = import_preview_get_duplicated_file (_tmp28_); #line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp34_ = _tmp33_; + _tmp30_ = _tmp29_; #line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp35_ = import_page_camera_import_job_new (_tmp30_, _tmp31_, _tmp34_); + _tmp31_ = import_page_camera_import_job_new (_tmp26_, _tmp27_, _tmp30_); #line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp36_ = _tmp35_; + _tmp32_ = _tmp31_; #line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp36_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp32_); #line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _batch_import_job_unref0 (_tmp36_); + _batch_import_job_unref0 (_tmp32_); #line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp34_); + _g_object_unref0 (_tmp30_); #line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (import_file); #line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -11294,78 +11465,78 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { _g_object_unref0 (object); #line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" continue; -#line 11291 "ImportPage.c" +#line 11462 "ImportPage.c" } #line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp37_ = import_page_null_context; + _tmp33_ = import_page_null_context; #line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp38_ = import_file; + _tmp34_ = import_file; #line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp39_ = import_page_camera_import_job_new (_tmp37_, _tmp38_, NULL); + _tmp35_ = import_page_camera_import_job_new (_tmp33_, _tmp34_, NULL); #line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_job = _tmp39_; + import_job = _tmp35_; #line 1701 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp41_ = import_file; + _tmp37_ = import_file; #line 1701 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, TYPE_PHOTO_IMPORT_SOURCE)) { -#line 11305 "ImportPage.c" - ImportSource* _tmp42_; - PhotoImportSource* _tmp43_; - PhotoImportSource* _tmp44_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, TYPE_PHOTO_IMPORT_SOURCE)) { +#line 11476 "ImportPage.c" + ImportSource* _tmp38_; + PhotoImportSource* _tmp39_; + PhotoImportSource* _tmp40_; #line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp42_ = import_file; + _tmp38_ = import_file; #line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp43_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource)); + _tmp39_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource)); #line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp44_ = _tmp43_; + _tmp40_ = _tmp39_; #line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp40_ = _tmp44_ != NULL; + _tmp36_ = _tmp40_ != NULL; #line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp44_); -#line 11319 "ImportPage.c" + _g_object_unref0 (_tmp40_); +#line 11490 "ImportPage.c" } else { #line 1701 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp40_ = FALSE; -#line 11323 "ImportPage.c" + _tmp36_ = FALSE; +#line 11494 "ImportPage.c" } #line 1701 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp40_) { -#line 11327 "ImportPage.c" - ImportPageCameraImportJob* _tmp45_; - GPContextWrapper* _tmp46_; - ImportSource* _tmp47_; - PhotoImportSource* _tmp48_; - PhotoImportSource* _tmp49_; - ImportPageCameraImportJob* _tmp50_; - ImportPageCameraImportJob* _tmp51_; + if (_tmp36_) { +#line 11498 "ImportPage.c" + ImportPageCameraImportJob* _tmp41_; + GPContextWrapper* _tmp42_; + ImportSource* _tmp43_; + PhotoImportSource* _tmp44_; + PhotoImportSource* _tmp45_; + ImportPageCameraImportJob* _tmp46_; + ImportPageCameraImportJob* _tmp47_; #line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp45_ = import_job; + _tmp41_ = import_job; #line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp46_ = import_page_null_context; + _tmp42_ = import_page_null_context; #line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp47_ = import_file; + _tmp43_ = import_file; #line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp48_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource)); + _tmp44_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource)); #line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp49_ = _tmp48_; + _tmp45_ = _tmp44_; #line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp50_ = import_page_camera_import_job_new (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_IMPORT_SOURCE, ImportSource), NULL); + _tmp46_ = import_page_camera_import_job_new (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_IMPORT_SOURCE, ImportSource), NULL); #line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp51_ = _tmp50_; + _tmp47_ = _tmp46_; #line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - batch_import_job_set_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_BATCH_IMPORT_JOB, BatchImportJob), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_BATCH_IMPORT_JOB, BatchImportJob)); + batch_import_job_set_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_BATCH_IMPORT_JOB, BatchImportJob), G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_BATCH_IMPORT_JOB, BatchImportJob)); #line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _batch_import_job_unref0 (_tmp51_); + _batch_import_job_unref0 (_tmp47_); #line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp49_); -#line 11355 "ImportPage.c" + _g_object_unref0 (_tmp45_); +#line 11526 "ImportPage.c" } #line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp52_ = jobs; + _tmp48_ = jobs; #line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp53_ = import_job; + _tmp49_ = import_job; #line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), _tmp53_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection), _tmp49_); #line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _batch_import_job_unref0 (import_job); #line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -11374,181 +11545,175 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { _g_object_unref0 (preview); #line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (object); -#line 11371 "ImportPage.c" +#line 11542 "ImportPage.c" } #line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_object_it); -#line 11375 "ImportPage.c" +#line 11546 "ImportPage.c" } #line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp54_ = jobs; + _tmp50_ = jobs; #line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp55_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp51_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp56_ = _tmp55_; + _tmp52_ = _tmp51_; #line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp57_ = self->priv->camera_name; + _tmp53_ = self->priv->camera_name; #line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_debug ("ImportPage.vala:1710: Importing %d files from %s", _tmp56_, _tmp57_); + g_debug ("ImportPage.vala:1710: Importing %d files from %s", _tmp52_, _tmp53_); #line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp58_ = jobs; + _tmp54_ = jobs; #line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp59_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp55_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp60_ = _tmp59_; + _tmp56_ = _tmp55_; #line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp60_ > 0) { -#line 11395 "ImportPage.c" - ImportPage* _tmp61_; - ImportPage* _tmp62_; + if (_tmp56_ > 0) { +#line 11566 "ImportPage.c" + ImportPage* _tmp57_; + ImportPage* _tmp58_; BatchImport* batch_import = NULL; - SortedList* _tmp63_; - const gchar* _tmp64_; - GeeArrayList* _tmp65_; - BatchImport* _tmp66_; + SortedList* _tmp59_; + const gchar* _tmp60_; + GeeArrayList* _tmp61_; + BatchImport* _tmp62_; + BatchImport* _tmp63_; + BatchImport* _tmp64_; + LibraryWindow* _tmp65_; + LibraryWindow* _tmp66_; BatchImport* _tmp67_; - BatchImport* _tmp68_; + LibraryWindow* _tmp68_; LibraryWindow* _tmp69_; - LibraryWindow* _tmp70_; - BatchImport* _tmp71_; - LibraryWindow* _tmp72_; - LibraryWindow* _tmp73_; #line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp61_ = self->priv->local_ref; + _tmp57_ = self->priv->local_ref; #line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _vala_assert (_tmp61_ == NULL, "local_ref == null"); + _vala_assert (_tmp57_ == NULL, "local_ref == null"); #line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp62_ = _g_object_ref0 (self); + _tmp58_ = _g_object_ref0 (self); #line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->local_ref); #line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->local_ref = _tmp62_; + self->priv->local_ref = _tmp58_; #line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp63_ = jobs; + _tmp59_ = jobs; #line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp64_ = self->priv->camera_name; + _tmp60_ = self->priv->camera_name; #line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp65_ = already_imported; + _tmp61_ = already_imported; #line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp66_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_ITERABLE, GeeIterable), _tmp64_, _import_page_import_reporter_batch_import_import_reporter, self, NULL, _tmp65_, NULL, NULL, NULL); + _tmp62_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ITERABLE, GeeIterable), _tmp60_, _import_page_import_reporter_batch_import_import_reporter, self, NULL, _tmp61_, NULL, NULL, NULL); #line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - batch_import = _tmp66_; + batch_import = _tmp62_; #line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp67_ = batch_import; + _tmp63_ = batch_import; #line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_signal_connect_object (_tmp67_, "import-job-failed", (GCallback) _import_page_on_import_job_failed_batch_import_import_job_failed, self, 0); + g_signal_connect_object (_tmp63_, "import-job-failed", (GCallback) _import_page_on_import_job_failed_batch_import_import_job_failed, self, 0); #line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp68_ = batch_import; + _tmp64_ = batch_import; #line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_signal_connect_object (_tmp68_, "import-complete", (GCallback) _import_page_close_import_batch_import_import_complete, self, 0); + g_signal_connect_object (_tmp64_, "import-complete", (GCallback) _import_page_close_import_batch_import_import_complete, self, 0); #line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp69_ = library_window_get_app (); + _tmp65_ = library_window_get_app (); #line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp70_ = _tmp69_; + _tmp66_ = _tmp65_; #line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp71_ = batch_import; + _tmp67_ = batch_import; #line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - library_window_enqueue_batch_import (_tmp70_, _tmp71_, TRUE); + library_window_enqueue_batch_import (_tmp66_, _tmp67_, TRUE); #line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp70_); + _g_object_unref0 (_tmp66_); #line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp72_ = library_window_get_app (); + _tmp68_ = library_window_get_app (); #line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp73_ = _tmp72_; + _tmp69_ = _tmp68_; #line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - library_window_switch_to_import_queue_page (_tmp73_); + library_window_switch_to_import_queue_page (_tmp69_); #line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp73_); + _g_object_unref0 (_tmp69_); #line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (batch_import); -#line 11458 "ImportPage.c" +#line 11629 "ImportPage.c" } else { - GeeArrayList* _tmp74_; - gint _tmp75_; - gint _tmp76_; + GeeArrayList* _tmp70_; + gint _tmp71_; + gint _tmp72_; #line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp74_ = already_imported; + _tmp70_ = already_imported; #line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp75_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp71_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp76_ = _tmp75_; + _tmp72_ = _tmp71_; #line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp76_ > 0) { -#line 11471 "ImportPage.c" - GeeArrayList* _tmp77_; - ImportManifest* _tmp78_; - ImportManifest* _tmp79_; + if (_tmp72_ > 0) { +#line 11642 "ImportPage.c" + GeeArrayList* _tmp73_; + ImportManifest* _tmp74_; + ImportManifest* _tmp75_; #line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp77_ = already_imported; + _tmp73_ = already_imported; #line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp78_ = import_manifest_new (NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_LIST, GeeList)); + _tmp74_ = import_manifest_new (NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GEE_TYPE_LIST, GeeList)); #line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp79_ = _tmp78_; + _tmp75_ = _tmp74_; #line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_import_reporter (self, _tmp79_); + import_page_import_reporter (self, _tmp75_); #line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _import_manifest_unref0 (_tmp79_); -#line 11485 "ImportPage.c" + _import_manifest_unref0 (_tmp75_); +#line 11656 "ImportPage.c" } #line 1730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_close_import (self); -#line 11489 "ImportPage.c" +#line 11660 "ImportPage.c" } #line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (already_imported); #line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (jobs); -#line 11495 "ImportPage.c" +#line 11666 "ImportPage.c" } -static void import_page_on_import_job_failed (ImportPage* self, BatchImportResult* _result_) { +static void +import_page_on_import_job_failed (ImportPage* self, + BatchImportResult* _result_) +{ gboolean _tmp0_ = FALSE; - BatchImportResult* _tmp1_; - GFile* _tmp2_; + GFile* _tmp1_; GError * _inner_error_ = NULL; #line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); #line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_BATCH_IMPORT_RESULT (_result_)); #line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = _result_; -#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = _tmp1_->file; + _tmp1_ = _result_->file; #line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = TRUE; -#line 11516 "ImportPage.c" +#line 11687 "ImportPage.c" } else { - BatchImportResult* _tmp3_; - ImportResult _tmp4_; -#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = _result_; + ImportResult _tmp2_; #line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = _tmp3_->result; + _tmp2_ = _result_->result; #line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = _tmp4_ == IMPORT_RESULT_SUCCESS; -#line 11526 "ImportPage.c" + _tmp0_ = _tmp2_ == IMPORT_RESULT_SUCCESS; +#line 11694 "ImportPage.c" } #line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_) { #line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 11532 "ImportPage.c" +#line 11700 "ImportPage.c" } { - BatchImportResult* _tmp5_; - GFile* _tmp6_; + GFile* _tmp3_; #line 1740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = _result_; + _tmp3_ = _result_->file; #line 1740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = _tmp5_->file; -#line 1740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_file_delete (_tmp6_, NULL, &_inner_error_); + g_file_delete (_tmp3_, NULL, &_inner_error_); #line 1740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 11545 "ImportPage.c" +#line 11710 "ImportPage.c" goto __catch80_g_error; } } @@ -11556,35 +11721,32 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul __catch80_g_error: { GError* err = NULL; - BatchImportResult* _tmp7_; - GFile* _tmp8_; - gchar* _tmp9_; - gchar* _tmp10_; - GError* _tmp11_; - const gchar* _tmp12_; + GFile* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GError* _tmp7_; + const gchar* _tmp8_; #line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" err = _inner_error_; #line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _inner_error_ = NULL; #line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = _result_; -#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = _tmp7_->file; + _tmp4_ = _result_->file; #line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = g_file_get_path (_tmp8_); + _tmp5_ = g_file_get_path (_tmp4_); #line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = _tmp9_; + _tmp6_ = _tmp5_; #line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = err; + _tmp7_ = err; #line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = _tmp11_->message; + _tmp8_ = _tmp7_->message; #line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_message ("ImportPage.vala:1742: Unable to delete downloaded file %s: %s", _tmp10_, _tmp12_); + g_message ("ImportPage.vala:1742: Unable to delete downloaded file %s: %s", _tmp6_, _tmp8_); #line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp6_); #line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 11581 "ImportPage.c" +#line 11743 "ImportPage.c" } __finally80: #line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -11595,52 +11757,60 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul g_clear_error (&_inner_error_); #line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 11592 "ImportPage.c" +#line 11754 "ImportPage.c" } } -static gpointer _batch_import_job_ref0 (gpointer self) { +static gpointer +_batch_import_job_ref0 (gpointer self) +{ #line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self ? batch_import_job_ref (self) : NULL; -#line 11600 "ImportPage.c" +#line 11764 "ImportPage.c" } -static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) { +static gboolean +_progress_dialog_monitor_progress_monitor (guint64 current, + guint64 total, + gboolean do_event_loop, + gpointer self) +{ gboolean result; result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop); #line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 11609 "ImportPage.c" +#line 11778 "ImportPage.c" } -static void import_page_import_reporter (ImportPage* self, ImportManifest* manifest) { +static void +import_page_import_reporter (ImportPage* self, + ImportManifest* manifest) +{ ImportPage* local_ref = NULL; ImportPage* _tmp0_; ImportPage* _tmp1_; - ImportManifest* _tmp2_; - GeeList* _tmp3_; + GeeList* _tmp2_; + gint _tmp3_; gint _tmp4_; - gint _tmp5_; Marker* marker = NULL; - SourceCollection* _tmp55_; - Marker* _tmp56_; + SourceCollection* _tmp42_; + Marker* _tmp43_; ProgressDialog* progress = NULL; - AppWindow* _tmp76_; - AppWindow* _tmp77_; - GCancellable* _tmp78_; - GCancellable* _tmp79_; - ProgressDialog* _tmp80_; - ProgressDialog* _tmp81_; + AppWindow* _tmp62_; + AppWindow* _tmp63_; + GCancellable* _tmp64_; + GCancellable* _tmp65_; + ProgressDialog* _tmp66_; + ProgressDialog* _tmp67_; gint error_count = 0; - SourceCollection* _tmp82_; - Marker* _tmp83_; - ProgressDialog* _tmp84_; - gint _tmp85_; - gint _tmp86_; - ProgressDialog* _tmp91_; + SourceCollection* _tmp68_; + Marker* _tmp69_; + ProgressDialog* _tmp70_; + gint _tmp71_; + ProgressDialog* _tmp76_; #line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); #line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -11656,180 +11826,145 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif #line 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->local_ref = NULL; #line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = manifest; -#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = _tmp2_->success; + _tmp2_ = manifest->success; #line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp5_ > 0) { -#line 11662 "ImportPage.c" + if (_tmp4_ > 0) { +#line 11830 "ImportPage.c" gchar* photos_string = NULL; - ImportManifest* _tmp6_; - GeeList* _tmp7_; - gint _tmp8_; + GeeList* _tmp5_; + gint _tmp6_; + gint _tmp7_; + GeeList* _tmp8_; gint _tmp9_; - ImportManifest* _tmp10_; - GeeList* _tmp11_; - gint _tmp12_; - gint _tmp13_; - gchar* _tmp14_; + gint _tmp10_; + gchar* _tmp11_; gchar* videos_string = NULL; - ImportManifest* _tmp15_; - GeeList* _tmp16_; + GeeList* _tmp12_; + gint _tmp13_; + gint _tmp14_; + GeeList* _tmp15_; + gint _tmp16_; gint _tmp17_; - gint _tmp18_; - ImportManifest* _tmp19_; - GeeList* _tmp20_; - gint _tmp21_; - gint _tmp22_; - gchar* _tmp23_; + gchar* _tmp18_; gchar* both_string = NULL; - ImportManifest* _tmp24_; - GeeList* _tmp25_; - gint _tmp26_; + GeeList* _tmp19_; + gint _tmp20_; + gint _tmp21_; + GeeList* _tmp22_; + gint _tmp23_; + gint _tmp24_; + gchar* _tmp25_; + gchar* neither_string = NULL; + GeeList* _tmp26_; gint _tmp27_; - ImportManifest* _tmp28_; + gint _tmp28_; GeeList* _tmp29_; gint _tmp30_; gint _tmp31_; gchar* _tmp32_; - gchar* neither_string = NULL; - ImportManifest* _tmp33_; - GeeList* _tmp34_; - gint _tmp35_; - gint _tmp36_; - ImportManifest* _tmp37_; - GeeList* _tmp38_; - gint _tmp39_; - gint _tmp40_; - gchar* _tmp41_; gchar* question_string = NULL; - ImportManifest* _tmp42_; - GeeList* _tmp43_; - const gchar* _tmp44_; - const gchar* _tmp45_; - const gchar* _tmp46_; - const gchar* _tmp47_; - gchar* _tmp48_; + GeeList* _tmp33_; + const gchar* _tmp34_; + const gchar* _tmp35_; + const gchar* _tmp36_; + const gchar* _tmp37_; + gchar* _tmp38_; ImportUIQuestionParams* question = NULL; - const gchar* _tmp49_; - ImportUIQuestionParams* _tmp50_; - ImportManifest* _tmp51_; - ImportUIQuestionParams* _tmp52_; - gboolean _tmp53_; -#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = manifest; -#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = _tmp6_->success; + const gchar* _tmp39_; + ImportUIQuestionParams* _tmp40_; + ImportUIQuestionParams* _tmp41_; #line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp5_ = manifest->success; #line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = _tmp8_; + _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = manifest; + _tmp7_ = _tmp6_; #line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = _tmp10_->success; + _tmp8_ = manifest->success; #line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = _tmp12_; + _tmp10_ = _tmp9_; #line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = g_strdup_printf (ngettext ("Delete this photo from camera?", "Delete these %d photos from camera?", (gulong) _tmp9_), _tmp13_); + _tmp11_ = g_strdup_printf (ngettext ("Delete this photo from camera?", "Delete these %d photos from camera?", (gulong) _tmp7_), _tmp10_); #line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - photos_string = _tmp14_; -#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp15_ = manifest; + photos_string = _tmp11_; #line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp16_ = _tmp15_->success; + _tmp12_ = manifest->success; #line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp17_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp18_ = _tmp17_; + _tmp14_ = _tmp13_; #line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp19_ = manifest; + _tmp15_ = manifest->success; #line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp20_ = _tmp19_->success; + _tmp16_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp22_ = _tmp21_; + _tmp17_ = _tmp16_; #line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp23_ = g_strdup_printf (ngettext ("Delete this video from camera?", "Delete these %d videos from camera?", (gulong) _tmp18_), _tmp22_); + _tmp18_ = g_strdup_printf (ngettext ("Delete this video from camera?", "Delete these %d videos from camera?", (gulong) _tmp14_), _tmp17_); #line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - videos_string = _tmp23_; -#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp24_ = manifest; -#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp25_ = _tmp24_->success; + videos_string = _tmp18_; #line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp19_ = manifest->success; #line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp27_ = _tmp26_; + _tmp20_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp28_ = manifest; + _tmp21_ = _tmp20_; #line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp29_ = _tmp28_->success; + _tmp22_ = manifest->success; #line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp30_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp23_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp31_ = _tmp30_; + _tmp24_ = _tmp23_; #line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp32_ = g_strdup_printf (ngettext ("Delete this photo/video from camera?", "Delete these %d photos/videos from camera?", (gulong) _tmp27_), _tmp31_); + _tmp25_ = g_strdup_printf (ngettext ("Delete this photo/video from camera?", "Delete these %d photos/videos from camera?", (gulong) _tmp21_), _tmp24_); #line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - both_string = _tmp32_; -#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp33_ = manifest; -#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp34_ = _tmp33_->success; + both_string = _tmp25_; #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp35_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp26_ = manifest->success; #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp36_ = _tmp35_; + _tmp27_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp37_ = manifest; + _tmp28_ = _tmp27_; #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp38_ = _tmp37_->success; + _tmp29_ = manifest->success; #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp39_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp30_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp40_ = _tmp39_; + _tmp31_ = _tmp30_; #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp41_ = g_strdup_printf (ngettext ("Delete these files from camera?", "Delete these %d files from camera?", (gulong) _tmp36_), _tmp40_); + _tmp32_ = g_strdup_printf (ngettext ("Delete these files from camera?", "Delete these %d files from camera?", (gulong) _tmp28_), _tmp31_); #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - neither_string = _tmp41_; -#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp42_ = manifest; + neither_string = _tmp32_; #line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp43_ = _tmp42_->success; + _tmp33_ = manifest->success; #line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp44_ = photos_string; + _tmp34_ = photos_string; #line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp45_ = videos_string; + _tmp35_ = videos_string; #line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp46_ = both_string; + _tmp36_ = both_string; #line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp47_ = neither_string; + _tmp37_ = neither_string; #line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp48_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection), _tmp44_, _tmp45_, _tmp46_, _tmp47_); + _tmp38_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), _tmp34_, _tmp35_, _tmp36_, _tmp37_); #line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - question_string = _tmp48_; + question_string = _tmp38_; #line 1772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp49_ = question_string; + _tmp39_ = question_string; #line 1772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp50_ = import_ui_question_params_new (_tmp49_, RESOURCES_DELETE_LABEL, _ ("_Keep")); + _tmp40_ = import_ui_question_params_new (_tmp39_, RESOURCES_DELETE_LABEL, _ ("_Keep")); #line 1772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - question = _tmp50_; + question = _tmp40_; #line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp51_ = manifest; + _tmp41_ = question; #line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp52_ = question; -#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp53_ = import_ui_report_manifest (_tmp51_, FALSE, _tmp52_); -#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp53_) { + if (!import_ui_report_manifest (manifest, FALSE, _tmp41_)) { #line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _import_ui_question_params_unref0 (question); #line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -11846,7 +11981,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif _g_object_unref0 (local_ref); #line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 11843 "ImportPage.c" +#line 11978 "ImportPage.c" } #line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _import_ui_question_params_unref0 (question); @@ -11860,184 +11995,176 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif _g_free0 (videos_string); #line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (photos_string); -#line 11857 "ImportPage.c" +#line 11992 "ImportPage.c" } else { - ImportManifest* _tmp54_; #line 1778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp54_ = manifest; -#line 1778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_ui_report_manifest (_tmp54_, FALSE, NULL); + import_ui_report_manifest (manifest, FALSE, NULL); #line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (local_ref); #line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 11868 "ImportPage.c" +#line 12000 "ImportPage.c" } #line 1784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp55_ = self->priv->import_sources; + _tmp42_ = self->priv->import_sources; #line 1784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp56_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp43_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_DATA_COLLECTION, DataCollection)); #line 1784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - marker = _tmp56_; -#line 11876 "ImportPage.c" + marker = _tmp43_; +#line 12008 "ImportPage.c" { GeeList* _batch_result_list = NULL; - ImportManifest* _tmp57_; - GeeList* _tmp58_; - GeeList* _tmp59_; + GeeList* _tmp44_; + GeeList* _tmp45_; gint _batch_result_size = 0; - GeeList* _tmp60_; - gint _tmp61_; - gint _tmp62_; + GeeList* _tmp46_; + gint _tmp47_; + gint _tmp48_; gint _batch_result_index = 0; #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp57_ = manifest; -#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp58_ = _tmp57_->success; + _tmp44_ = manifest->success; #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp59_ = _g_object_ref0 (_tmp58_); + _tmp45_ = _g_object_ref0 (_tmp44_); #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _batch_result_list = _tmp59_; + _batch_result_list = _tmp45_; #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp60_ = _batch_result_list; + _tmp46_ = _batch_result_list; #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp61_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp47_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp62_ = _tmp61_; + _tmp48_ = _tmp47_; #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _batch_result_size = _tmp62_; + _batch_result_size = _tmp48_; #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _batch_result_index = -1; #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 11907 "ImportPage.c" - gint _tmp63_; - gint _tmp64_; - gint _tmp65_; +#line 12036 "ImportPage.c" + gint _tmp49_; + gint _tmp50_; + gint _tmp51_; BatchImportResult* batch_result = NULL; - GeeList* _tmp66_; - gint _tmp67_; - gpointer _tmp68_; + GeeList* _tmp52_; + gint _tmp53_; + gpointer _tmp54_; ImportPageCameraImportJob* job = NULL; - BatchImportResult* _tmp69_; - BatchImportJob* _tmp70_; - ImportPageCameraImportJob* _tmp71_; - Marker* _tmp72_; - ImportPageCameraImportJob* _tmp73_; - ImportSource* _tmp74_; - ImportSource* _tmp75_; + BatchImportResult* _tmp55_; + BatchImportJob* _tmp56_; + ImportPageCameraImportJob* _tmp57_; + Marker* _tmp58_; + ImportPageCameraImportJob* _tmp59_; + ImportSource* _tmp60_; + ImportSource* _tmp61_; #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp63_ = _batch_result_index; + _tmp49_ = _batch_result_index; #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _batch_result_index = _tmp63_ + 1; + _batch_result_index = _tmp49_ + 1; #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp64_ = _batch_result_index; + _tmp50_ = _batch_result_index; #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp65_ = _batch_result_size; + _tmp51_ = _batch_result_size; #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!(_tmp64_ < _tmp65_)) { + if (!(_tmp50_ < _tmp51_)) { #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 11935 "ImportPage.c" +#line 12064 "ImportPage.c" } #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp66_ = _batch_result_list; + _tmp52_ = _batch_result_list; #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp67_ = _batch_result_index; + _tmp53_ = _batch_result_index; #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp68_ = gee_list_get (_tmp66_, _tmp67_); + _tmp54_ = gee_list_get (_tmp52_, _tmp53_); #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - batch_result = (BatchImportResult*) _tmp68_; + batch_result = (BatchImportResult*) _tmp54_; #line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp69_ = batch_result; + _tmp55_ = batch_result; #line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp70_ = _tmp69_->job; + _tmp56_ = _tmp55_->job; #line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp71_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp70_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB) ? ((ImportPageCameraImportJob*) _tmp70_) : NULL); + _tmp57_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp56_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB) ? ((ImportPageCameraImportJob*) _tmp56_) : NULL); #line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - job = _tmp71_; + job = _tmp57_; #line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp72_ = marker; + _tmp58_ = marker; #line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp73_ = job; + _tmp59_ = job; #line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp74_ = import_page_camera_import_job_get_source (_tmp73_); + _tmp60_ = import_page_camera_import_job_get_source (_tmp59_); #line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp75_ = _tmp74_; + _tmp61_ = _tmp60_; #line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - marker_mark (_tmp72_, G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_DATA_OBJECT, DataObject)); + marker_mark (_tmp58_, G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_DATA_OBJECT, DataObject)); #line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp75_); + _g_object_unref0 (_tmp61_); #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _batch_import_job_unref0 (job); #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _batch_import_result_unref0 (batch_result); -#line 11969 "ImportPage.c" +#line 12098 "ImportPage.c" } #line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_batch_result_list); -#line 11973 "ImportPage.c" +#line 12102 "ImportPage.c" } #line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp76_ = app_window_get_instance (); + _tmp62_ = app_window_get_instance (); #line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp77_ = _tmp76_; + _tmp63_ = _tmp62_; #line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp78_ = g_cancellable_new (); + _tmp64_ = g_cancellable_new (); #line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp79_ = _tmp78_; + _tmp65_ = _tmp64_; #line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp80_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_window_get_type (), GtkWindow), _ ("Removing photos/videos from camera"), _tmp79_); + _tmp66_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_window_get_type (), GtkWindow), _ ("Removing photos/videos from camera"), _tmp65_); #line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_object_ref_sink (_tmp80_); + g_object_ref_sink (_tmp66_); #line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp81_ = _tmp80_; + _tmp67_ = _tmp66_; #line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp79_); + _g_object_unref0 (_tmp65_); #line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp77_); + _g_object_unref0 (_tmp63_); #line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - progress = _tmp81_; + progress = _tmp67_; #line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp82_ = self->priv->import_sources; + _tmp68_ = self->priv->import_sources; #line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp83_ = marker; + _tmp69_ = marker; #line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp84_ = progress; + _tmp70_ = progress; #line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp85_ = source_collection_destroy_marked (_tmp82_, _tmp83_, TRUE, _progress_dialog_monitor_progress_monitor, _tmp84_, NULL); -#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - error_count = _tmp85_; + error_count = source_collection_destroy_marked (_tmp68_, _tmp69_, TRUE, _progress_dialog_monitor_progress_monitor, _tmp70_, NULL); #line 1794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp86_ = error_count; + _tmp71_ = error_count; #line 1794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp86_ > 0) { -#line 12009 "ImportPage.c" + if (_tmp71_ > 0) { +#line 12136 "ImportPage.c" gchar* error_string = NULL; - gint _tmp87_; - gint _tmp88_; - gchar* _tmp89_; - const gchar* _tmp90_; + gint _tmp72_; + gint _tmp73_; + gchar* _tmp74_; + const gchar* _tmp75_; #line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp87_ = error_count; + _tmp72_ = error_count; #line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp88_ = error_count; + _tmp73_ = error_count; #line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp89_ = g_strdup_printf (ngettext ("Unable to delete %d photo/video from the camera due to errors.", "Unable to delete %d photos/videos from the camera due to errors.", (gulong) _tmp87_), _tmp88_); + _tmp74_ = g_strdup_printf (ngettext ("Unable to delete %d photo/video from the camera due to errors.", "Unable to delete %d photos/videos from the camera due to errors.", (gulong) _tmp72_), _tmp73_); #line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - error_string = _tmp89_; + error_string = _tmp74_; #line 1799 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp90_ = error_string; + _tmp75_ = error_string; #line 1799 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - app_window_error_message (_tmp90_, NULL); + app_window_error_message (_tmp75_, NULL); #line 1794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (error_string); -#line 12029 "ImportPage.c" +#line 12156 "ImportPage.c" } #line 1802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp91_ = progress; + _tmp76_ = progress; #line 1802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - progress_dialog_close (_tmp91_); + progress_dialog_close (_tmp76_); #line 1805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (local_ref); #line 1805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -12048,18 +12175,19 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif _g_object_unref0 (marker); #line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (local_ref); -#line 12045 "ImportPage.c" +#line 12172 "ImportPage.c" } -static void import_page_close_import (ImportPage* self) { +static void +import_page_close_import (ImportPage* self) +{ int res = 0; Camera* _tmp0_; GPSpinIdleWrapper* _tmp1_; GPContext* _tmp2_; int _tmp3_; - int _tmp4_; - gboolean _tmp8_; + gboolean _tmp7_; #line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_IMPORT_PAGE (self)); #line 1809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -12069,65 +12197,64 @@ static void import_page_close_import (ImportPage* self) { #line 1809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context; #line 1809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = gp_camera_exit (_tmp0_, _tmp2_); -#line 1809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - res = _tmp3_; + res = gp_camera_exit (_tmp0_, _tmp2_); #line 1810 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = res; + _tmp3_ = res; #line 1810 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp4_ != GP_OK) { -#line 12073 "ImportPage.c" - int _tmp5_; + if (_tmp3_ != GP_OK) { +#line 12199 "ImportPage.c" + int _tmp4_; + gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; #line 1812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = res; + _tmp4_ = res; #line 1812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = gp_result_to_full_string (_tmp5_); + _tmp5_ = gp_result_to_full_string (_tmp4_); #line 1812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 1812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_message ("ImportPage.vala:1812: Unable to unlock camera: %s", _tmp7_); + g_message ("ImportPage.vala:1812: Unable to unlock camera: %s", _tmp6_); #line 1812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_free0 (_tmp7_); -#line 12087 "ImportPage.c" + _g_free0 (_tmp6_); +#line 12213 "ImportPage.c" } #line 1815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = self->priv->refreshed; + _tmp7_ = self->priv->refreshed; #line 1815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - import_page_update_status (self, FALSE, _tmp8_); + import_page_update_status (self, FALSE, _tmp7_); #line 1817 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_view_changed (self); -#line 12095 "ImportPage.c" +#line 12221 "ImportPage.c" } -static void import_page_real_set_display_titles (CheckerboardPage* base, gboolean display) { +static void +import_page_real_set_display_titles (CheckerboardPage* base, + gboolean display) +{ ImportPage * self; - gboolean _tmp0_; - gboolean _tmp1_; #line 1820 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage); #line 1821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = display; -#line 1821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - CHECKERBOARD_PAGE_CLASS (import_page_parent_class)->set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp0_); -#line 1823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = display; + CHECKERBOARD_PAGE_CLASS (import_page_parent_class)->set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display); #line 1823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", _tmp1_); -#line 12113 "ImportPage.c" + page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", display); +#line 12236 "ImportPage.c" } -static gpointer _view_filter_ref0 (gpointer self) { +static gpointer +_view_filter_ref0 (gpointer self) +{ #line 1828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self ? view_filter_ref (self) : NULL; -#line 12120 "ImportPage.c" +#line 12245 "ImportPage.c" } -static SearchViewFilter* import_page_real_get_search_view_filter (CheckerboardPage* base) { +static SearchViewFilter* +import_page_real_get_search_view_filter (CheckerboardPage* base) +{ ImportPage * self; SearchViewFilter* result = NULL; ImportPageImportPageSearchViewFilter* _tmp0_; @@ -12142,61 +12269,65 @@ static SearchViewFilter* import_page_real_get_search_view_filter (CheckerboardPa result = _tmp1_; #line 1828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12139 "ImportPage.c" +#line 12266 "ImportPage.c" } -static ImportPageImportViewManager* import_page_import_view_manager_construct (GType object_type, ImportPage* owner) { +static ImportPageImportViewManager* +import_page_import_view_manager_construct (GType object_type, + ImportPage* owner) +{ ImportPageImportViewManager* self = NULL; ImportPage* _tmp0_; - ImportPage* _tmp1_; #line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_IMPORT_PAGE (owner), NULL); #line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = (ImportPageImportViewManager*) view_manager_construct (object_type); #line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = owner; -#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (owner); #line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->owner); #line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->owner = _tmp1_; + self->priv->owner = _tmp0_; #line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 12161 "ImportPage.c" +#line 12288 "ImportPage.c" } -static ImportPageImportViewManager* import_page_import_view_manager_new (ImportPage* owner) { +static ImportPageImportViewManager* +import_page_import_view_manager_new (ImportPage* owner) +{ #line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return import_page_import_view_manager_construct (IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, owner); -#line 12168 "ImportPage.c" +#line 12297 "ImportPage.c" } -static DataView* import_page_import_view_manager_real_create_view (ViewManager* base, DataSource* source) { +static DataView* +import_page_import_view_manager_real_create_view (ViewManager* base, + DataSource* source) +{ ImportPageImportViewManager * self; DataView* result = NULL; - DataSource* _tmp0_; - ImportPreview* _tmp1_; + ImportPreview* _tmp0_; #line 475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, ImportPageImportViewManager); #line 475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = source; + _tmp0_ = import_preview_new (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_IMPORT_SOURCE, ImportSource)); #line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = import_preview_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_SOURCE, ImportSource)); -#line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView); #line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12189 "ImportPage.c" +#line 12318 "ImportPage.c" } -static void import_page_import_view_manager_class_init (ImportPageImportViewManagerClass * klass) { +static void +import_page_import_view_manager_class_init (ImportPageImportViewManagerClass * klass) +{ #line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_import_view_manager_parent_class = g_type_class_peek_parent (klass); #line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -12205,18 +12336,22 @@ static void import_page_import_view_manager_class_init (ImportPageImportViewMana g_type_class_add_private (klass, sizeof (ImportPageImportViewManagerPrivate)); #line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) import_page_import_view_manager_real_create_view; -#line 12202 "ImportPage.c" +#line 12333 "ImportPage.c" } -static void import_page_import_view_manager_instance_init (ImportPageImportViewManager * self) { +static void +import_page_import_view_manager_instance_init (ImportPageImportViewManager * self) +{ #line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv = IMPORT_PAGE_IMPORT_VIEW_MANAGER_GET_PRIVATE (self); -#line 12209 "ImportPage.c" +#line 12342 "ImportPage.c" } -static void import_page_import_view_manager_finalize (ViewManager * obj) { +static void +import_page_import_view_manager_finalize (ViewManager * obj) +{ ImportPageImportViewManager * self; #line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, ImportPageImportViewManager); @@ -12224,11 +12359,13 @@ static void import_page_import_view_manager_finalize (ViewManager * obj) { _g_object_unref0 (self->priv->owner); #line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" VIEW_MANAGER_CLASS (import_page_import_view_manager_parent_class)->finalize (obj); -#line 12221 "ImportPage.c" +#line 12356 "ImportPage.c" } -static GType import_page_import_view_manager_get_type (void) { +static GType +import_page_import_view_manager_get_type (void) +{ static volatile gsize import_page_import_view_manager_type_id__volatile = 0; if (g_once_init_enter (&import_page_import_view_manager_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ImportPageImportViewManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) import_page_import_view_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ImportPageImportViewManager), 0, (GInstanceInitFunc) import_page_import_view_manager_instance_init, NULL }; @@ -12240,35 +12377,31 @@ static GType import_page_import_view_manager_get_type (void) { } -static gpointer _gp_context_wrapper_ref0 (gpointer self) { +static gpointer +_gp_context_wrapper_ref0 (gpointer self) +{ #line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self ? gp_context_wrapper_ref (self) : NULL; -#line 12240 "ImportPage.c" +#line 12379 "ImportPage.c" } -static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType object_type, GPContextWrapper* context, ImportSource* import_file, DuplicatedFile* duplicated_file) { +static ImportPageCameraImportJob* +import_page_camera_import_job_construct (GType object_type, + GPContextWrapper* context, + ImportSource* import_file, + DuplicatedFile* duplicated_file) +{ ImportPageCameraImportJob* self = NULL; GPContextWrapper* _tmp0_; - GPContextWrapper* _tmp1_; - ImportSource* _tmp2_; - ImportSource* _tmp3_; - DuplicatedFile* _tmp4_; - DuplicatedFile* _tmp5_; - ImportSource* _tmp6_; - Camera* _tmp7_; - ImportSource* _tmp8_; - gchar* _tmp9_; - const gchar* _tmp10_; - ImportSource* _tmp11_; - gchar* _tmp12_; - ImportSource* _tmp13_; - gulong _tmp14_; - PhotoMetadata* _tmp15_ = NULL; - ImportSource* _tmp16_; - PhotoMetadata* _tmp19_; - ImportSource* _tmp20_; - time_t _tmp21_; + ImportSource* _tmp1_; + DuplicatedFile* _tmp2_; + Camera* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; + PhotoMetadata* _tmp7_ = NULL; + PhotoMetadata* _tmp9_; #line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (GP_IS_CONTEXT_WRAPPER (context), NULL); #line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -12278,114 +12411,95 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType #line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = (ImportPageCameraImportJob*) batch_import_job_construct (object_type); #line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = context; -#line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = _gp_context_wrapper_ref0 (_tmp0_); + _tmp0_ = _gp_context_wrapper_ref0 (context); #line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_context_wrapper_unref0 (self->priv->context); #line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->context = _tmp1_; + self->priv->context = _tmp0_; #line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = import_file; -#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (import_file); #line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->import_file); #line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->import_file = _tmp3_; -#line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = duplicated_file; + self->priv->import_file = _tmp1_; #line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp2_ = _g_object_ref0 (duplicated_file); #line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (self->priv->duplicated_file); #line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->duplicated_file = _tmp5_; + self->priv->duplicated_file = _tmp2_; #line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = import_file; -#line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = import_source_get_camera (_tmp6_); + _tmp3_ = import_source_get_camera (import_file); #line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _gp_camera_unref0 (self->priv->camera); #line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->camera = _tmp7_; -#line 501 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = import_file; + self->priv->camera = _tmp3_; #line 501 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = import_source_get_fulldir (_tmp8_); + _tmp4_ = import_source_get_fulldir (import_file); #line 501 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->fulldir); #line 501 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->fulldir = _tmp9_; + self->priv->fulldir = _tmp4_; #line 503 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = self->priv->fulldir; + _tmp5_ = self->priv->fulldir; #line 503 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _vala_assert (_tmp10_ != NULL, "fulldir != null"); -#line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = import_file; + _vala_assert (_tmp5_ != NULL, "fulldir != null"); #line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = import_source_get_filename (_tmp11_); + _tmp6_ = import_source_get_filename (import_file); #line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (self->priv->filename); #line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->filename = _tmp12_; -#line 505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = import_file; -#line 505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = import_source_get_filesize (_tmp13_); + self->priv->filename = _tmp6_; #line 505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->filesize = (guint64) _tmp14_; + self->priv->filesize = (guint64) import_source_get_filesize (import_file); #line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp16_ = import_file; -#line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_PHOTO_IMPORT_SOURCE)) { -#line 12336 "ImportPage.c" - ImportSource* _tmp17_; - PhotoMetadata* _tmp18_; -#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp17_ = import_file; + if (G_TYPE_CHECK_INSTANCE_TYPE (import_file, TYPE_PHOTO_IMPORT_SOURCE)) { +#line 12451 "ImportPage.c" + PhotoMetadata* _tmp8_; #line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp18_ = photo_import_source_get_metadata (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp17_) : NULL); + _tmp8_ = photo_import_source_get_metadata (G_TYPE_CHECK_INSTANCE_TYPE (import_file, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) import_file) : NULL); #line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _media_metadata_unref0 (_tmp15_); + _media_metadata_unref0 (_tmp7_); #line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp15_ = _tmp18_; -#line 12347 "ImportPage.c" + _tmp7_ = _tmp8_; +#line 12459 "ImportPage.c" } else { #line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _media_metadata_unref0 (_tmp15_); + _media_metadata_unref0 (_tmp7_); #line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp15_ = NULL; -#line 12353 "ImportPage.c" + _tmp7_ = NULL; +#line 12465 "ImportPage.c" } #line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp19_ = _media_metadata_ref0 (_tmp15_); + _tmp9_ = _media_metadata_ref0 (_tmp7_); #line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (self->priv->metadata); #line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->metadata = _tmp19_; -#line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp20_ = import_file; -#line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp21_ = import_source_get_exposure_time (_tmp20_); + self->priv->metadata = _tmp9_; #line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->exposure_time = _tmp21_; + self->priv->exposure_time = import_source_get_exposure_time (import_file); #line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _media_metadata_unref0 (_tmp15_); + _media_metadata_unref0 (_tmp7_); #line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 12371 "ImportPage.c" +#line 12479 "ImportPage.c" } -static ImportPageCameraImportJob* import_page_camera_import_job_new (GPContextWrapper* context, ImportSource* import_file, DuplicatedFile* duplicated_file) { +static ImportPageCameraImportJob* +import_page_camera_import_job_new (GPContextWrapper* context, + ImportSource* import_file, + DuplicatedFile* duplicated_file) +{ #line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return import_page_camera_import_job_construct (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, context, import_file, duplicated_file); -#line 12378 "ImportPage.c" +#line 12490 "ImportPage.c" } -static time_t import_page_camera_import_job_get_exposure_time (ImportPageCameraImportJob* self) { +static time_t +import_page_camera_import_job_get_exposure_time (ImportPageCameraImportJob* self) +{ time_t result = 0; time_t _tmp0_; #line 511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -12396,11 +12510,13 @@ static time_t import_page_camera_import_job_get_exposure_time (ImportPageCameraI result = _tmp0_; #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12393 "ImportPage.c" +#line 12507 "ImportPage.c" } -static DuplicatedFile* import_page_camera_import_job_real_get_duplicated_file (BatchImportJob* base) { +static DuplicatedFile* +import_page_camera_import_job_real_get_duplicated_file (BatchImportJob* base) +{ ImportPageCameraImportJob * self; DuplicatedFile* result = NULL; DuplicatedFile* _tmp0_; @@ -12415,11 +12531,13 @@ static DuplicatedFile* import_page_camera_import_job_real_get_duplicated_file (B result = _tmp1_; #line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12412 "ImportPage.c" +#line 12528 "ImportPage.c" } -static time_t import_page_camera_import_job_real_get_exposure_time_override (BatchImportJob* base) { +static time_t +import_page_camera_import_job_real_get_exposure_time_override (BatchImportJob* base) +{ ImportPageCameraImportJob * self; time_t result = 0; time_t _tmp0_ = 0; @@ -12430,27 +12548,25 @@ static time_t import_page_camera_import_job_real_get_exposure_time_override (Bat _tmp1_ = self->priv->import_file; #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_VIDEO_IMPORT_SOURCE)) { -#line 12427 "ImportPage.c" - time_t _tmp2_; #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = import_page_camera_import_job_get_exposure_time (self); -#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = _tmp2_; -#line 12433 "ImportPage.c" + _tmp0_ = import_page_camera_import_job_get_exposure_time (self); +#line 12547 "ImportPage.c" } else { #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = (time_t) 0; -#line 12437 "ImportPage.c" +#line 12551 "ImportPage.c" } #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp0_; #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12443 "ImportPage.c" +#line 12557 "ImportPage.c" } -static gchar* import_page_camera_import_job_real_get_dest_identifier (BatchImportJob* base) { +static gchar* +import_page_camera_import_job_real_get_dest_identifier (BatchImportJob* base) +{ ImportPageCameraImportJob * self; gchar* result = NULL; const gchar* _tmp0_; @@ -12465,11 +12581,13 @@ static gchar* import_page_camera_import_job_real_get_dest_identifier (BatchImpor result = _tmp1_; #line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12462 "ImportPage.c" +#line 12578 "ImportPage.c" } -static gchar* import_page_camera_import_job_real_get_source_identifier (BatchImportJob* base) { +static gchar* +import_page_camera_import_job_real_get_source_identifier (BatchImportJob* base) +{ ImportPageCameraImportJob * self; gchar* result = NULL; ImportSource* _tmp0_; @@ -12484,11 +12602,13 @@ static gchar* import_page_camera_import_job_real_get_source_identifier (BatchImp result = _tmp1_; #line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12481 "ImportPage.c" +#line 12599 "ImportPage.c" } -static gchar* import_page_camera_import_job_real_get_basename (BatchImportJob* base) { +static gchar* +import_page_camera_import_job_real_get_basename (BatchImportJob* base) +{ ImportPageCameraImportJob * self; gchar* result = NULL; const gchar* _tmp0_; @@ -12503,11 +12623,13 @@ static gchar* import_page_camera_import_job_real_get_basename (BatchImportJob* b result = _tmp1_; #line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12500 "ImportPage.c" +#line 12620 "ImportPage.c" } -static gchar* import_page_camera_import_job_real_get_path (BatchImportJob* base) { +static gchar* +import_page_camera_import_job_real_get_path (BatchImportJob* base) +{ ImportPageCameraImportJob * self; gchar* result = NULL; const gchar* _tmp0_; @@ -12522,31 +12644,33 @@ static gchar* import_page_camera_import_job_real_get_path (BatchImportJob* base) result = _tmp1_; #line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12519 "ImportPage.c" +#line 12641 "ImportPage.c" } -static void import_page_camera_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated) { +static void +import_page_camera_import_job_real_set_associated (BatchImportJob* base, + BatchImportJob* associated) +{ ImportPageCameraImportJob * self; - BatchImportJob* _tmp0_; - ImportPageCameraImportJob* _tmp1_; + ImportPageCameraImportJob* _tmp0_; #line 539 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob); #line 539 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (IS_BATCH_IMPORT_JOB (associated)); #line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = associated; -#line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB) ? ((ImportPageCameraImportJob*) _tmp0_) : NULL); + _tmp0_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (associated, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB) ? ((ImportPageCameraImportJob*) associated) : NULL); #line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _batch_import_job_unref0 (self->priv->associated); #line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - self->priv->associated = _tmp1_; -#line 12539 "ImportPage.c" + self->priv->associated = _tmp0_; +#line 12661 "ImportPage.c" } -static ImportSource* import_page_camera_import_job_get_source (ImportPageCameraImportJob* self) { +static ImportSource* +import_page_camera_import_job_get_source (ImportPageCameraImportJob* self) +{ ImportSource* result = NULL; ImportSource* _tmp0_; ImportSource* _tmp1_; @@ -12560,11 +12684,13 @@ static ImportSource* import_page_camera_import_job_get_source (ImportPageCameraI result = _tmp1_; #line 544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12557 "ImportPage.c" +#line 12681 "ImportPage.c" } -static gboolean import_page_camera_import_job_real_is_directory (BatchImportJob* base) { +static gboolean +import_page_camera_import_job_real_is_directory (BatchImportJob* base) +{ ImportPageCameraImportJob * self; gboolean result = FALSE; #line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -12573,11 +12699,15 @@ static gboolean import_page_camera_import_job_real_is_directory (BatchImportJob* result = FALSE; #line 548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12570 "ImportPage.c" +#line 12696 "ImportPage.c" } -static gboolean import_page_camera_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file) { +static gboolean +import_page_camera_import_job_real_determine_file_size (BatchImportJob* base, + guint64* filesize, + GFile* * file) +{ ImportPageCameraImportJob * self; guint64 _vala_filesize = 0ULL; GFile* _vala_file = NULL; @@ -12599,25 +12729,30 @@ static gboolean import_page_camera_import_job_real_determine_file_size (BatchImp if (filesize) { #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *filesize = _vala_filesize; -#line 12596 "ImportPage.c" +#line 12726 "ImportPage.c" } #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (file) { #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *file = _vala_file; -#line 12602 "ImportPage.c" +#line 12732 "ImportPage.c" } else { #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_vala_file); -#line 12606 "ImportPage.c" +#line 12736 "ImportPage.c" } #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12610 "ImportPage.c" +#line 12740 "ImportPage.c" } -static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy_to_library, GError** error) { +static gboolean +import_page_camera_import_job_real_prepare (BatchImportJob* base, + GFile* * file_to_import, + gboolean* copy_to_library, + GError** error) +{ ImportPageCameraImportJob * self; GFile* _vala_file_to_import = NULL; gboolean _vala_copy_to_library = FALSE; @@ -12639,7 +12774,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _vala_copy_to_library = FALSE; #line 562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" dest_file = NULL; -#line 12636 "ImportPage.c" +#line 12771 "ImportPage.c" { gboolean collision = FALSE; GFile* _tmp0_ = NULL; @@ -12663,7 +12798,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _tmp0_ = _tmp5_; #line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12660 "ImportPage.c" +#line 12795 "ImportPage.c" goto __catch81_g_error; } #line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -12676,7 +12811,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base dest_file = _tmp6_; #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp0_); -#line 12673 "ImportPage.c" +#line 12808 "ImportPage.c" } goto __finally81; __catch81_g_error: @@ -12707,12 +12842,12 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _g_free0 (_tmp9_); #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 12704 "ImportPage.c" +#line 12839 "ImportPage.c" } __finally81: #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12709 "ImportPage.c" +#line 12844 "ImportPage.c" gboolean _tmp12_ = FALSE; #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_propagate_error (error, _inner_error_); @@ -12720,13 +12855,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _g_object_unref0 (dest_file); #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return _tmp12_; -#line 12717 "ImportPage.c" +#line 12852 "ImportPage.c" } #line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = dest_file; #line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp13_ == NULL) { -#line 12723 "ImportPage.c" +#line 12858 "ImportPage.c" ImportSource* _tmp14_; gchar* _tmp15_; gchar* _tmp16_; @@ -12748,27 +12883,27 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base if (file_to_import) { #line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *file_to_import = _vala_file_to_import; -#line 12745 "ImportPage.c" +#line 12880 "ImportPage.c" } else { #line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_vala_file_to_import); -#line 12749 "ImportPage.c" +#line 12884 "ImportPage.c" } #line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (copy_to_library) { #line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *copy_to_library = _vala_copy_to_library; -#line 12755 "ImportPage.c" +#line 12890 "ImportPage.c" } #line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12759 "ImportPage.c" +#line 12894 "ImportPage.c" } #line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = dest_file; #line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" library_monitor_blacklist_file (_tmp17_, "CameraImportJob.prepare"); -#line 12765 "ImportPage.c" +#line 12900 "ImportPage.c" { GPContextWrapper* _tmp18_; GPContext* _tmp19_; @@ -12792,7 +12927,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base gp_save_image (_tmp19_, _tmp20_, _tmp21_, _tmp22_, _tmp23_, &_inner_error_); #line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12789 "ImportPage.c" +#line 12924 "ImportPage.c" goto __finally82; } } @@ -12803,11 +12938,11 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _tmp24_ = dest_file; #line 584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" library_monitor_unblacklist_file (_tmp24_); -#line 12800 "ImportPage.c" +#line 12935 "ImportPage.c" } #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12804 "ImportPage.c" +#line 12939 "ImportPage.c" gboolean _tmp25_ = FALSE; #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_propagate_error (error, _inner_error_); @@ -12815,13 +12950,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _g_object_unref0 (dest_file); #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return _tmp25_; -#line 12812 "ImportPage.c" +#line 12947 "ImportPage.c" } #line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp26_ = self->priv->associated; #line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp26_ != NULL) { -#line 12818 "ImportPage.c" +#line 12953 "ImportPage.c" BackingPhotoRow* _tmp42_; GFile* assoc_dest = NULL; BackingPhotoRow* _tmp45_; @@ -12863,7 +12998,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _tmp27_ = _tmp35_; #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12860 "ImportPage.c" +#line 12995 "ImportPage.c" goto __catch83_g_error; } #line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -12876,7 +13011,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base self->priv->associated_file = _tmp36_; #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _backing_photo_row_unref0 (_tmp27_); -#line 12873 "ImportPage.c" +#line 13008 "ImportPage.c" } goto __finally83; __catch83_g_error: @@ -12903,12 +13038,12 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base ": %s", _tmp38_, _tmp40_); #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 12899 "ImportPage.c" +#line 13034 "ImportPage.c" } __finally83: #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12904 "ImportPage.c" +#line 13039 "ImportPage.c" gboolean _tmp41_ = FALSE; #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_propagate_error (error, _inner_error_); @@ -12916,13 +13051,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _g_object_unref0 (dest_file); #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return _tmp41_; -#line 12912 "ImportPage.c" +#line 13047 "ImportPage.c" } #line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp42_ = self->priv->associated_file; #line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp42_ == NULL) { -#line 12918 "ImportPage.c" +#line 13053 "ImportPage.c" ImportPageCameraImportJob* _tmp43_; const gchar* _tmp44_; #line 599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -12939,21 +13074,21 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base if (file_to_import) { #line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *file_to_import = _vala_file_to_import; -#line 12935 "ImportPage.c" +#line 13070 "ImportPage.c" } else { #line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_vala_file_to_import); -#line 12939 "ImportPage.c" +#line 13074 "ImportPage.c" } #line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (copy_to_library) { #line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *copy_to_library = _vala_copy_to_library; -#line 12945 "ImportPage.c" +#line 13080 "ImportPage.c" } #line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12949 "ImportPage.c" +#line 13084 "ImportPage.c" } #line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp45_ = self->priv->associated_file; @@ -12967,7 +13102,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _tmp48_ = assoc_dest; #line 604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" library_monitor_blacklist_file (_tmp48_, "CameraImportJob.prepare"); -#line 12963 "ImportPage.c" +#line 13098 "ImportPage.c" { GPContextWrapper* _tmp49_; GPContext* _tmp50_; @@ -12997,7 +13132,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base gp_save_image (_tmp50_, _tmp51_, _tmp53_, _tmp55_, _tmp56_, &_inner_error_); #line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12993 "ImportPage.c" +#line 13128 "ImportPage.c" goto __finally84; } } @@ -13008,11 +13143,11 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _tmp57_ = assoc_dest; #line 609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" library_monitor_unblacklist_file (_tmp57_); -#line 13004 "ImportPage.c" +#line 13139 "ImportPage.c" } #line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 13008 "ImportPage.c" +#line 13143 "ImportPage.c" gboolean _tmp58_ = FALSE; #line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_propagate_error (error, _inner_error_); @@ -13022,11 +13157,11 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _g_object_unref0 (dest_file); #line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return _tmp58_; -#line 13018 "ImportPage.c" +#line 13153 "ImportPage.c" } #line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (assoc_dest); -#line 13022 "ImportPage.c" +#line 13157 "ImportPage.c" } #line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp59_ = dest_file; @@ -13046,25 +13181,27 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base if (file_to_import) { #line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *file_to_import = _vala_file_to_import; -#line 13042 "ImportPage.c" +#line 13177 "ImportPage.c" } else { #line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_vala_file_to_import); -#line 13046 "ImportPage.c" +#line 13181 "ImportPage.c" } #line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (copy_to_library) { #line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *copy_to_library = _vala_copy_to_library; -#line 13052 "ImportPage.c" +#line 13187 "ImportPage.c" } #line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13056 "ImportPage.c" +#line 13191 "ImportPage.c" } -static GFile* import_page_camera_import_job_real_get_associated_file (BatchImportJob* base) { +static GFile* +import_page_camera_import_job_real_get_associated_file (BatchImportJob* base) +{ ImportPageCameraImportJob * self; GFile* result = NULL; BackingPhotoRow* _tmp0_; @@ -13081,7 +13218,7 @@ static GFile* import_page_camera_import_job_real_get_associated_file (BatchImpor result = NULL; #line 621 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13077 "ImportPage.c" +#line 13214 "ImportPage.c" } #line 624 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = self->priv->associated_file; @@ -13093,11 +13230,13 @@ static GFile* import_page_camera_import_job_real_get_associated_file (BatchImpor result = _tmp3_; #line 624 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13089 "ImportPage.c" +#line 13226 "ImportPage.c" } -static void import_page_camera_import_job_class_init (ImportPageCameraImportJobClass * klass) { +static void +import_page_camera_import_job_class_init (ImportPageCameraImportJobClass * klass) +{ #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_camera_import_job_parent_class = g_type_class_peek_parent (klass); #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -13126,22 +13265,26 @@ static void import_page_camera_import_job_class_init (ImportPageCameraImportJobC ((BatchImportJobClass *) klass)->prepare = (gboolean (*) (BatchImportJob *, GFile* *, gboolean*, GError**)) import_page_camera_import_job_real_prepare; #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((BatchImportJobClass *) klass)->get_associated_file = (GFile* (*) (BatchImportJob *)) import_page_camera_import_job_real_get_associated_file; -#line 13122 "ImportPage.c" +#line 13261 "ImportPage.c" } -static void import_page_camera_import_job_instance_init (ImportPageCameraImportJob * self) { +static void +import_page_camera_import_job_instance_init (ImportPageCameraImportJob * self) +{ #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv = IMPORT_PAGE_CAMERA_IMPORT_JOB_GET_PRIVATE (self); #line 489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->associated = NULL; #line 490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->associated_file = NULL; -#line 13133 "ImportPage.c" +#line 13274 "ImportPage.c" } -static void import_page_camera_import_job_finalize (BatchImportJob * obj) { +static void +import_page_camera_import_job_finalize (BatchImportJob * obj) +{ ImportPageCameraImportJob * self; #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob); @@ -13165,11 +13308,13 @@ static void import_page_camera_import_job_finalize (BatchImportJob * obj) { _g_object_unref0 (self->priv->duplicated_file); #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" BATCH_IMPORT_JOB_CLASS (import_page_camera_import_job_parent_class)->finalize (obj); -#line 13161 "ImportPage.c" +#line 13304 "ImportPage.c" } -static GType import_page_camera_import_job_get_type (void) { +static GType +import_page_camera_import_job_get_type (void) +{ static volatile gsize import_page_camera_import_job_type_id__volatile = 0; if (g_once_init_enter (&import_page_camera_import_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ImportPageCameraImportJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) import_page_camera_import_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ImportPageCameraImportJob), 0, (GInstanceInitFunc) import_page_camera_import_job_instance_init, NULL }; @@ -13181,7 +13326,9 @@ static GType import_page_camera_import_job_get_type (void) { } -static guint import_page_import_page_search_view_filter_real_get_criteria (SearchViewFilter* base) { +static guint +import_page_import_page_search_view_filter_real_get_criteria (SearchViewFilter* base) +{ ImportPageImportPageSearchViewFilter * self; guint result = 0U; #line 629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -13190,158 +13337,147 @@ static guint import_page_import_page_search_view_filter_real_get_criteria (Searc result = (guint) (SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_MEDIA); #line 630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13186 "ImportPage.c" +#line 13333 "ImportPage.c" } -static gboolean string_contains (const gchar* self, const gchar* needle) { +static gboolean +string_contains (const gchar* self, + const gchar* needle) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gchar* _tmp1_; -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = needle; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_ != NULL; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = strstr ((gchar*) self, (gchar*) needle); +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_ != NULL; +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 13206 "ImportPage.c" +#line 13353 "ImportPage.c" } -static gboolean import_page_import_page_search_view_filter_real_predicate (ViewFilter* base, DataView* view) { +static gboolean +import_page_import_page_search_view_filter_real_predicate (ViewFilter* base, + DataView* view) +{ ImportPageImportPageSearchViewFilter * self; gboolean result = FALSE; ImportSource* source = NULL; - DataView* _tmp0_; - ImportSource* _tmp1_; - gboolean _tmp2_ = FALSE; - guint _tmp3_; - guint _tmp26_; + ImportSource* _tmp0_; + gboolean _tmp1_ = FALSE; #line 633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_IMPORT_PAGE_SEARCH_VIEW_FILTER, ImportPageImportPageSearchViewFilter); #line 633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_DATA_VIEW (view), FALSE); #line 634 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = view; + _tmp0_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_IMPORT_PREVIEW, ImportPreview)); #line 634 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_PREVIEW, ImportPreview)); -#line 634 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - source = _tmp1_; -#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = search_view_filter_get_criteria (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); + source = _tmp0_; #line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if ((gboolean) (SEARCH_FILTER_CRITERIA_MEDIA & _tmp3_)) { -#line 13233 "ImportPage.c" - gboolean _tmp4_; + if ((gboolean) (SEARCH_FILTER_CRITERIA_MEDIA & search_view_filter_get_criteria (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)))) { #line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = search_view_filter_filter_by_media_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = _tmp4_; -#line 13239 "ImportPage.c" + _tmp1_ = search_view_filter_filter_by_media_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); +#line 13378 "ImportPage.c" } else { #line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp2_ = FALSE; -#line 13243 "ImportPage.c" + _tmp1_ = FALSE; +#line 13382 "ImportPage.c" } #line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp2_) { -#line 13247 "ImportPage.c" - ImportSource* _tmp5_; + if (_tmp1_) { +#line 13386 "ImportPage.c" + ImportSource* _tmp2_; #line 638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = source; + _tmp2_ = source; #line 638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_VIDEO_IMPORT_SOURCE)) { -#line 13253 "ImportPage.c" - gboolean _tmp6_; - gboolean _tmp7_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_VIDEO_IMPORT_SOURCE)) { +#line 13392 "ImportPage.c" + gboolean _tmp3_; + gboolean _tmp4_; #line 639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = search_view_filter_get_show_media_video (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); + _tmp3_ = search_view_filter_get_show_media_video (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp7_) { + if (!_tmp4_) { #line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; #line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (source); #line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13268 "ImportPage.c" +#line 13407 "ImportPage.c" } } else { - ImportSource* _tmp8_; + ImportSource* _tmp5_; #line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = source; + _tmp5_ = source; #line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_PHOTO_IMPORT_SOURCE)) { -#line 13276 "ImportPage.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_PHOTO_IMPORT_SOURCE)) { +#line 13415 "ImportPage.c" PhotoImportSource* photo = NULL; - ImportSource* _tmp9_; - PhotoImportSource* _tmp10_; - PhotoImportSource* _tmp11_; - PhotoFileFormat _tmp12_; + ImportSource* _tmp6_; + PhotoImportSource* _tmp7_; + PhotoImportSource* _tmp8_; #line 642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp9_ = source; + _tmp6_ = source; #line 642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp9_) : NULL); + _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp6_) : NULL); #line 642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - photo = _tmp10_; + photo = _tmp7_; #line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp11_ = photo; + _tmp8_ = photo; #line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp12_ = photo_import_source_get_file_format (_tmp11_); -#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp12_ == PHOTO_FILE_FORMAT_RAW) { -#line 13294 "ImportPage.c" - PhotoImportSource* _tmp13_; - PhotoImportSource* _tmp14_; - PhotoImportSource* _tmp15_; - gboolean _tmp16_; + if (photo_import_source_get_file_format (_tmp8_) == PHOTO_FILE_FORMAT_RAW) { +#line 13430 "ImportPage.c" + PhotoImportSource* _tmp9_; + PhotoImportSource* _tmp10_; + PhotoImportSource* _tmp11_; + gboolean _tmp12_; #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp13_ = photo; + _tmp9_ = photo; #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp14_ = photo_import_source_get_associated (_tmp13_); + _tmp10_ = photo_import_source_get_associated (_tmp9_); #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp15_ = _tmp14_; + _tmp11_ = _tmp10_; #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp16_ = _tmp15_ != NULL; + _tmp12_ = _tmp11_ != NULL; #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp11_); #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp16_) { -#line 13311 "ImportPage.c" - gboolean _tmp17_ = FALSE; - gboolean _tmp18_; - gboolean _tmp19_; + if (_tmp12_) { +#line 13447 "ImportPage.c" + gboolean _tmp13_ = FALSE; + gboolean _tmp14_; + gboolean _tmp15_; #line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp18_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); + _tmp14_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp19_ = _tmp18_; + _tmp15_ = _tmp14_; #line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp19_) { -#line 13321 "ImportPage.c" - gboolean _tmp20_; - gboolean _tmp21_; + if (!_tmp15_) { +#line 13457 "ImportPage.c" + gboolean _tmp16_; + gboolean _tmp17_; #line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp20_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); + _tmp16_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp21_ = _tmp20_; + _tmp17_ = _tmp16_; #line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp17_ = !_tmp21_; -#line 13330 "ImportPage.c" + _tmp13_ = !_tmp17_; +#line 13466 "ImportPage.c" } else { #line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp17_ = FALSE; -#line 13334 "ImportPage.c" + _tmp13_ = FALSE; +#line 13470 "ImportPage.c" } #line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp17_) { + if (_tmp13_) { #line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; #line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -13350,17 +13486,17 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF _g_object_unref0 (source); #line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13346 "ImportPage.c" +#line 13482 "ImportPage.c" } } else { - gboolean _tmp22_; - gboolean _tmp23_; + gboolean _tmp18_; + gboolean _tmp19_; #line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp22_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); + _tmp18_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp23_ = _tmp22_; + _tmp19_ = _tmp18_; #line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp23_) { + if (!_tmp19_) { #line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; #line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -13369,18 +13505,18 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF _g_object_unref0 (source); #line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13365 "ImportPage.c" +#line 13501 "ImportPage.c" } } } else { - gboolean _tmp24_; - gboolean _tmp25_; + gboolean _tmp20_; + gboolean _tmp21_; #line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp24_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); + _tmp20_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp25_ = _tmp24_; + _tmp21_ = _tmp20_; #line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp25_) { + if (!_tmp21_) { #line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; #line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -13389,85 +13525,77 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF _g_object_unref0 (source); #line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13385 "ImportPage.c" +#line 13521 "ImportPage.c" } } #line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (photo); -#line 13390 "ImportPage.c" +#line 13526 "ImportPage.c" } } } #line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp26_ = search_view_filter_get_criteria (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if ((gboolean) (SEARCH_FILTER_CRITERIA_TEXT & _tmp26_)) { -#line 13398 "ImportPage.c" + if ((gboolean) (SEARCH_FILTER_CRITERIA_TEXT & search_view_filter_get_criteria (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)))) { +#line 13532 "ImportPage.c" const gchar* keywords = NULL; - ImportSource* _tmp27_; - const gchar* _tmp28_; - const gchar* _tmp29_; - gboolean _tmp30_; - gint _tmp31_; - gchar** _tmp32_; + ImportSource* _tmp22_; + const gchar* _tmp23_; + const gchar* _tmp24_; + gint _tmp25_; + gchar** _tmp26_; #line 656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp27_ = source; + _tmp22_ = source; #line 656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp28_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_INDEXABLE, Indexable)); + _tmp23_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_INDEXABLE, Indexable)); #line 656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - keywords = _tmp28_; -#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp29_ = keywords; + keywords = _tmp23_; #line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp30_ = is_string_empty (_tmp29_); + _tmp24_ = keywords; #line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp30_) { + if (is_string_empty (_tmp24_)) { #line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; #line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (source); #line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13424 "ImportPage.c" +#line 13555 "ImportPage.c" } #line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp32_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp31_); -#line 13428 "ImportPage.c" + _tmp26_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp25_); +#line 13559 "ImportPage.c" { gchar** word_collection = NULL; gint word_collection_length1 = 0; gint _word_collection_size_ = 0; gint word_it = 0; #line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - word_collection = _tmp32_; + word_collection = _tmp26_; #line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - word_collection_length1 = _tmp31_; + word_collection_length1 = _tmp25_; #line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - for (word_it = 0; word_it < _tmp31_; word_it = word_it + 1) { -#line 13440 "ImportPage.c" + for (word_it = 0; word_it < _tmp25_; word_it = word_it + 1) { +#line 13571 "ImportPage.c" const gchar* word = NULL; #line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" word = word_collection[word_it]; -#line 13444 "ImportPage.c" +#line 13575 "ImportPage.c" { - const gchar* _tmp33_; - const gchar* _tmp34_; - gboolean _tmp35_; + const gchar* _tmp27_; + const gchar* _tmp28_; #line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp33_ = keywords; + _tmp27_ = keywords; #line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp34_ = word; + _tmp28_ = word; #line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp35_ = string_contains (_tmp33_, _tmp34_); -#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (!_tmp35_) { + if (!string_contains (_tmp27_, _tmp28_)) { #line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = FALSE; #line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (source); #line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13463 "ImportPage.c" +#line 13591 "ImportPage.c" } } } @@ -13479,43 +13607,53 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF _g_object_unref0 (source); #line 667 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13475 "ImportPage.c" +#line 13603 "ImportPage.c" } -static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_construct (GType object_type) { +static ImportPageImportPageSearchViewFilter* +import_page_import_page_search_view_filter_construct (GType object_type) +{ ImportPageImportPageSearchViewFilter* self = NULL; #line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = (ImportPageImportPageSearchViewFilter*) search_view_filter_construct (object_type); #line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 13485 "ImportPage.c" +#line 13615 "ImportPage.c" } -static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_new (void) { +static ImportPageImportPageSearchViewFilter* +import_page_import_page_search_view_filter_new (void) +{ #line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return import_page_import_page_search_view_filter_construct (IMPORT_PAGE_TYPE_IMPORT_PAGE_SEARCH_VIEW_FILTER); -#line 13492 "ImportPage.c" +#line 13624 "ImportPage.c" } -static void import_page_import_page_search_view_filter_class_init (ImportPageImportPageSearchViewFilterClass * klass) { +static void +import_page_import_page_search_view_filter_class_init (ImportPageImportPageSearchViewFilterClass * klass) +{ #line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_import_page_search_view_filter_parent_class = g_type_class_peek_parent (klass); #line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) import_page_import_page_search_view_filter_real_get_criteria; #line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) import_page_import_page_search_view_filter_real_predicate; -#line 13503 "ImportPage.c" +#line 13637 "ImportPage.c" } -static void import_page_import_page_search_view_filter_instance_init (ImportPageImportPageSearchViewFilter * self) { +static void +import_page_import_page_search_view_filter_instance_init (ImportPageImportPageSearchViewFilter * self) +{ } -static GType import_page_import_page_search_view_filter_get_type (void) { +static GType +import_page_import_page_search_view_filter_get_type (void) +{ static volatile gsize import_page_import_page_search_view_filter_type_id__volatile = 0; if (g_once_init_enter (&import_page_import_page_search_view_filter_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ImportPageImportPageSearchViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) import_page_import_page_search_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ImportPageImportPageSearchViewFilter), 0, (GInstanceInitFunc) import_page_import_page_search_view_filter_instance_init, NULL }; @@ -13527,58 +13665,65 @@ static GType import_page_import_page_search_view_filter_get_type (void) { } -static gboolean import_page_hide_imported_view_filter_real_predicate (ViewFilter* base, DataView* view) { +static gboolean +import_page_hide_imported_view_filter_real_predicate (ViewFilter* base, + DataView* view) +{ ImportPageHideImportedViewFilter * self; gboolean result = FALSE; - DataView* _tmp0_; - gboolean _tmp1_; #line 673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_HIDE_IMPORTED_VIEW_FILTER, ImportPageHideImportedViewFilter); #line 673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_val_if_fail (IS_DATA_VIEW (view), FALSE); #line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp0_ = view; -#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp1_ = import_preview_is_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_PREVIEW, ImportPreview)); -#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - result = !_tmp1_; + result = !import_preview_is_already_imported (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_IMPORT_PREVIEW, ImportPreview)); #line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13540 "ImportPage.c" +#line 13675 "ImportPage.c" } -static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_construct (GType object_type) { +static ImportPageHideImportedViewFilter* +import_page_hide_imported_view_filter_construct (GType object_type) +{ ImportPageHideImportedViewFilter* self = NULL; #line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = (ImportPageHideImportedViewFilter*) view_filter_construct (object_type); #line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 13550 "ImportPage.c" +#line 13687 "ImportPage.c" } -static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_new (void) { +static ImportPageHideImportedViewFilter* +import_page_hide_imported_view_filter_new (void) +{ #line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return import_page_hide_imported_view_filter_construct (IMPORT_PAGE_TYPE_HIDE_IMPORTED_VIEW_FILTER); -#line 13557 "ImportPage.c" +#line 13696 "ImportPage.c" } -static void import_page_hide_imported_view_filter_class_init (ImportPageHideImportedViewFilterClass * klass) { +static void +import_page_hide_imported_view_filter_class_init (ImportPageHideImportedViewFilterClass * klass) +{ #line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_hide_imported_view_filter_parent_class = g_type_class_peek_parent (klass); #line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) import_page_hide_imported_view_filter_real_predicate; -#line 13566 "ImportPage.c" +#line 13707 "ImportPage.c" } -static void import_page_hide_imported_view_filter_instance_init (ImportPageHideImportedViewFilter * self) { +static void +import_page_hide_imported_view_filter_instance_init (ImportPageHideImportedViewFilter * self) +{ } -static GType import_page_hide_imported_view_filter_get_type (void) { +static GType +import_page_hide_imported_view_filter_get_type (void) +{ static volatile gsize import_page_hide_imported_view_filter_type_id__volatile = 0; if (g_once_init_enter (&import_page_hide_imported_view_filter_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ImportPageHideImportedViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) import_page_hide_imported_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ImportPageHideImportedViewFilter), 0, (GInstanceInitFunc) import_page_hide_imported_view_filter_instance_init, NULL }; @@ -13590,7 +13735,9 @@ static GType import_page_hide_imported_view_filter_get_type (void) { } -static void import_page_class_init (ImportPageClass * klass) { +static void +import_page_class_init (ImportPageClass * klass) +{ #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_parent_class = g_type_class_peek_parent (klass); #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -13621,11 +13768,13 @@ static void import_page_class_init (ImportPageClass * klass) { ((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) import_page_real_get_search_view_filter; #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (klass)->finalize = import_page_finalize; -#line 13617 "ImportPage.c" +#line 13764 "ImportPage.c" } -static void import_page_instance_init (ImportPage * self) { +static void +import_page_instance_init (ImportPage * self) +{ GtkLabel* _tmp0_; GtkProgressBar* _tmp1_; ImportPageImportPageSearchViewFilter* _tmp2_; @@ -13668,11 +13817,13 @@ static void import_page_instance_init (ImportPage * self) { self->priv->hide_imported_filter = _tmp3_; #line 1160 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->claim_timeout = 500; -#line 13664 "ImportPage.c" +#line 13813 "ImportPage.c" } -static void import_page_finalize (GObject * obj) { +static void +import_page_finalize (GObject * obj) +{ ImportPage * self; LibraryPhotoSourceCollection* _tmp0_; guint _tmp1_; @@ -13722,11 +13873,13 @@ static void import_page_finalize (GObject * obj) { _core_tracker_unref0 (self->priv->tracker); #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (import_page_parent_class)->finalize (obj); -#line 13718 "ImportPage.c" +#line 13869 "ImportPage.c" } -GType import_page_get_type (void) { +GType +import_page_get_type (void) +{ static volatile gsize import_page_type_id__volatile = 0; if (g_once_init_enter (&import_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ImportPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) import_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ImportPage), 0, (GInstanceInitFunc) import_page_instance_init, NULL }; diff --git a/src/config/Config.c b/src/config/Config.c index 7008805..7dd8334 100644 --- a/src/config/Config.c +++ b/src/config/Config.c @@ -1,4 +1,4 @@ -/* Config.c generated by valac 0.36.6, the Vala compiler +/* Config.c generated by valac 0.40.4, the Vala compiler * generated from Config.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -15,6 +15,7 @@ * the preconfigure() method, implement it, and ensure in init() that it's been called. */ + #include #include #include @@ -60,6 +61,11 @@ typedef struct _Dimensions Dimensions; typedef struct _ConfigFacade ConfigFacade; typedef struct _ConfigFacadeClass ConfigFacadeClass; typedef struct _ConfigFacadePrivate ConfigFacadePrivate; +enum { + CONFIG_FACADE_0_PROPERTY, + CONFIG_FACADE_NUM_PROPERTIES +}; +static GParamSpec* config_facade_properties[CONFIG_FACADE_NUM_PROPERTIES]; #define _g_free0(var) (var = (g_free (var), NULL)) #define TYPE_GSETTINGS_CONFIGURATION_ENGINE (gsettings_configuration_engine_get_type ()) @@ -84,9 +90,9 @@ typedef struct _ConfigurationEngineIface ConfigurationEngineIface; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) enum { CONFIG_FACADE_COLORS_CHANGED_SIGNAL, - CONFIG_FACADE_LAST_SIGNAL + CONFIG_FACADE_NUM_SIGNALS }; -static guint config_facade_signals[CONFIG_FACADE_LAST_SIGNAL] = {0}; +static guint config_facade_signals[CONFIG_FACADE_NUM_SIGNALS] = {0}; struct _Dimensions { gint width; @@ -422,9 +428,6 @@ GType raw_developer_get_type (void) G_GNUC_CONST; GType fuzzy_property_state_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; #define CONFIG_FACADE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CONFIG_TYPE_FACADE, ConfigFacadePrivate)) -enum { - CONFIG_FACADE_DUMMY_PROPERTY -}; #define CONFIG_FACADE_WIDTH_DEFAULT 1024 #define CONFIG_FACADE_HEIGHT_DEFAULT 768 #define CONFIG_FACADE_SIDEBAR_MIN_POSITION 180 @@ -448,24 +451,37 @@ GType gsettings_configuration_engine_get_type (void) G_GNUC_CONST; GType configurable_property_get_type (void) G_GNUC_CONST; GQuark configuration_error_quark (void); GType configuration_engine_get_type (void) G_GNUC_CONST; -ConfigurationFacade* configuration_facade_construct (GType object_type, ConfigurationEngine* engine); +ConfigurationFacade* configuration_facade_construct (GType object_type, + ConfigurationEngine* engine); static void config_facade_on_color_name_changed (ConfigFacade* self); -static void _config_facade_on_color_name_changed_configuration_facade_bg_color_name_changed (ConfigurationFacade* _sender, gpointer self); -static void _config_facade_on_color_name_changed_configuration_facade_transparent_background_type_changed (ConfigurationFacade* _sender, gpointer self); -static void _config_facade_on_color_name_changed_configuration_facade_transparent_background_color_changed (ConfigurationFacade* _sender, gpointer self); +static void _config_facade_on_color_name_changed_configuration_facade_bg_color_name_changed (ConfigurationFacade* _sender, + gpointer self); +static void _config_facade_on_color_name_changed_configuration_facade_transparent_background_type_changed (ConfigurationFacade* _sender, + gpointer self); +static void _config_facade_on_color_name_changed_configuration_facade_transparent_background_color_changed (ConfigurationFacade* _sender, + gpointer self); ConfigFacade* config_facade_get_instance (void); -static void config_facade_set_text_colors (ConfigFacade* self, GdkRGBA* bg_color); +static void config_facade_set_text_colors (ConfigFacade* self, + GdkRGBA* bg_color); static void config_facade_get_colors (ConfigFacade* self); gchar* configuration_facade_get_bg_color_name (ConfigurationFacade* self); gboolean is_color_parsable (const gchar* spec); -void parse_color (const gchar* spec, GdkRGBA* result); -void config_facade_get_bg_color (ConfigFacade* self, GdkRGBA* result); +void parse_color (const gchar* spec, + GdkRGBA* result); +void config_facade_get_bg_color (ConfigFacade* self, + GdkRGBA* result); gboolean is_string_empty (const gchar* s); -void config_facade_get_selected_color (ConfigFacade* self, gboolean in_focus, GdkRGBA* result); -void config_facade_get_unselected_color (ConfigFacade* self, GdkRGBA* result); -void config_facade_get_border_color (ConfigFacade* self, GdkRGBA* result); -void config_facade_set_bg_color (ConfigFacade* self, GdkRGBA* color); -void configuration_facade_set_bg_color_name (ConfigurationFacade* self, const gchar* color_name); +void config_facade_get_selected_color (ConfigFacade* self, + gboolean in_focus, + GdkRGBA* result); +void config_facade_get_unselected_color (ConfigFacade* self, + GdkRGBA* result); +void config_facade_get_border_color (ConfigFacade* self, + GdkRGBA* result); +void config_facade_set_bg_color (ConfigFacade* self, + GdkRGBA* color); +void configuration_facade_set_bg_color_name (ConfigurationFacade* self, + const gchar* color_name); void config_facade_commit_bg_color (ConfigFacade* self); static void config_facade_finalize (GObject * obj); void config_preconfigure (void); @@ -473,28 +489,39 @@ void config_init (GError** error); void config_terminate (void); -static void _config_facade_on_color_name_changed_configuration_facade_bg_color_name_changed (ConfigurationFacade* _sender, gpointer self) { +static void +_config_facade_on_color_name_changed_configuration_facade_bg_color_name_changed (ConfigurationFacade* _sender, + gpointer self) +{ #line 49 "/home/jens/Source/shotwell/src/config/Config.vala" config_facade_on_color_name_changed ((ConfigFacade*) self); -#line 480 "Config.c" +#line 499 "Config.c" } -static void _config_facade_on_color_name_changed_configuration_facade_transparent_background_type_changed (ConfigurationFacade* _sender, gpointer self) { +static void +_config_facade_on_color_name_changed_configuration_facade_transparent_background_type_changed (ConfigurationFacade* _sender, + gpointer self) +{ #line 50 "/home/jens/Source/shotwell/src/config/Config.vala" config_facade_on_color_name_changed ((ConfigFacade*) self); -#line 487 "Config.c" +#line 509 "Config.c" } -static void _config_facade_on_color_name_changed_configuration_facade_transparent_background_color_changed (ConfigurationFacade* _sender, gpointer self) { +static void +_config_facade_on_color_name_changed_configuration_facade_transparent_background_color_changed (ConfigurationFacade* _sender, + gpointer self) +{ #line 51 "/home/jens/Source/shotwell/src/config/Config.vala" config_facade_on_color_name_changed ((ConfigFacade*) self); -#line 494 "Config.c" +#line 519 "Config.c" } -static ConfigFacade* config_facade_construct (GType object_type) { +static ConfigFacade* +config_facade_construct (GType object_type) +{ ConfigFacade * self = NULL; GSettingsConfigurationEngine* _tmp0_; GSettingsConfigurationEngine* _tmp1_; @@ -514,25 +541,31 @@ static ConfigFacade* config_facade_construct (GType object_type) { g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "transparent-background-color-changed", (GCallback) _config_facade_on_color_name_changed_configuration_facade_transparent_background_color_changed, self, 0); #line 46 "/home/jens/Source/shotwell/src/config/Config.vala" return self; -#line 518 "Config.c" +#line 545 "Config.c" } -static ConfigFacade* config_facade_new (void) { +static ConfigFacade* +config_facade_new (void) +{ #line 46 "/home/jens/Source/shotwell/src/config/Config.vala" return config_facade_construct (CONFIG_TYPE_FACADE); -#line 525 "Config.c" +#line 554 "Config.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 58 "/home/jens/Source/shotwell/src/config/Config.vala" return self ? g_object_ref (self) : NULL; -#line 532 "Config.c" +#line 563 "Config.c" } -ConfigFacade* config_facade_get_instance (void) { +ConfigFacade* +config_facade_get_instance (void) +{ ConfigFacade* result = NULL; ConfigFacade* _tmp0_; ConfigFacade* _tmp2_; @@ -541,7 +574,7 @@ ConfigFacade* config_facade_get_instance (void) { _tmp0_ = config_facade_instance; #line 55 "/home/jens/Source/shotwell/src/config/Config.vala" if (_tmp0_ == NULL) { -#line 545 "Config.c" +#line 578 "Config.c" ConfigFacade* _tmp1_; #line 56 "/home/jens/Source/shotwell/src/config/Config.vala" _tmp1_ = config_facade_new (); @@ -549,7 +582,7 @@ ConfigFacade* config_facade_get_instance (void) { _g_object_unref0 (config_facade_instance); #line 56 "/home/jens/Source/shotwell/src/config/Config.vala" config_facade_instance = _tmp1_; -#line 553 "Config.c" +#line 586 "Config.c" } #line 58 "/home/jens/Source/shotwell/src/config/Config.vala" _tmp2_ = config_facade_instance; @@ -559,20 +592,25 @@ ConfigFacade* config_facade_get_instance (void) { result = _tmp3_; #line 58 "/home/jens/Source/shotwell/src/config/Config.vala" return result; -#line 563 "Config.c" +#line 596 "Config.c" } -static void config_facade_on_color_name_changed (ConfigFacade* self) { +static void +config_facade_on_color_name_changed (ConfigFacade* self) +{ #line 61 "/home/jens/Source/shotwell/src/config/Config.vala" g_return_if_fail (CONFIG_IS_FACADE (self)); #line 62 "/home/jens/Source/shotwell/src/config/Config.vala" g_signal_emit (self, config_facade_signals[CONFIG_FACADE_COLORS_CHANGED_SIGNAL], 0); -#line 572 "Config.c" +#line 607 "Config.c" } -static void config_facade_set_text_colors (ConfigFacade* self, GdkRGBA* bg_color) { +static void +config_facade_set_text_colors (ConfigFacade* self, + GdkRGBA* bg_color) +{ GdkRGBA _tmp0_; gdouble _tmp1_; #line 65 "/home/jens/Source/shotwell/src/config/Config.vala" @@ -585,7 +623,7 @@ static void config_facade_set_text_colors (ConfigFacade* self, GdkRGBA* bg_color _tmp1_ = _tmp0_.red; #line 69 "/home/jens/Source/shotwell/src/config/Config.vala" if (_tmp1_ > CONFIG_FACADE_BLACK_THRESHOLD) { -#line 589 "Config.c" +#line 627 "Config.c" gchar* _tmp2_; gchar* _tmp3_; gchar* _tmp4_; @@ -614,7 +652,7 @@ static void config_facade_set_text_colors (ConfigFacade* self, GdkRGBA* bg_color _g_free0 (self->priv->border_color); #line 73 "/home/jens/Source/shotwell/src/config/Config.vala" self->priv->border_color = _tmp5_; -#line 618 "Config.c" +#line 656 "Config.c" } else { gchar* _tmp6_; gchar* _tmp7_; @@ -644,17 +682,18 @@ static void config_facade_set_text_colors (ConfigFacade* self, GdkRGBA* bg_color _g_free0 (self->priv->border_color); #line 78 "/home/jens/Source/shotwell/src/config/Config.vala" self->priv->border_color = _tmp9_; -#line 648 "Config.c" +#line 686 "Config.c" } } -static void config_facade_get_colors (ConfigFacade* self) { +static void +config_facade_get_colors (ConfigFacade* self) +{ gchar* _tmp0_; const gchar* _tmp1_; - gboolean _tmp2_; - const gchar* _tmp4_; - GdkRGBA _tmp5_ = {0}; + const gchar* _tmp3_; + GdkRGBA _tmp4_ = {0}; #line 82 "/home/jens/Source/shotwell/src/config/Config.vala" g_return_if_fail (CONFIG_IS_FACADE (self)); #line 83 "/home/jens/Source/shotwell/src/config/Config.vala" @@ -666,177 +705,173 @@ static void config_facade_get_colors (ConfigFacade* self) { #line 85 "/home/jens/Source/shotwell/src/config/Config.vala" _tmp1_ = self->priv->bg_color; #line 85 "/home/jens/Source/shotwell/src/config/Config.vala" - _tmp2_ = is_color_parsable (_tmp1_); -#line 85 "/home/jens/Source/shotwell/src/config/Config.vala" - if (!_tmp2_) { -#line 673 "Config.c" - gchar* _tmp3_; + if (!is_color_parsable (_tmp1_)) { +#line 710 "Config.c" + gchar* _tmp2_; #line 86 "/home/jens/Source/shotwell/src/config/Config.vala" - _tmp3_ = g_strdup (CONFIG_FACADE_DEFAULT_BG_COLOR); + _tmp2_ = g_strdup (CONFIG_FACADE_DEFAULT_BG_COLOR); #line 86 "/home/jens/Source/shotwell/src/config/Config.vala" _g_free0 (self->priv->bg_color); #line 86 "/home/jens/Source/shotwell/src/config/Config.vala" - self->priv->bg_color = _tmp3_; -#line 681 "Config.c" + self->priv->bg_color = _tmp2_; +#line 718 "Config.c" } #line 88 "/home/jens/Source/shotwell/src/config/Config.vala" - _tmp4_ = self->priv->bg_color; + _tmp3_ = self->priv->bg_color; #line 88 "/home/jens/Source/shotwell/src/config/Config.vala" - parse_color (_tmp4_, &_tmp5_); + parse_color (_tmp3_, &_tmp4_); #line 88 "/home/jens/Source/shotwell/src/config/Config.vala" - config_facade_set_text_colors (self, &_tmp5_); -#line 689 "Config.c" + config_facade_set_text_colors (self, &_tmp4_); +#line 726 "Config.c" } -void config_facade_get_bg_color (ConfigFacade* self, GdkRGBA* result) { +void +config_facade_get_bg_color (ConfigFacade* self, + GdkRGBA* result) +{ const gchar* _tmp0_; - gboolean _tmp1_; - const gchar* _tmp2_; - GdkRGBA _tmp3_ = {0}; + const gchar* _tmp1_; + GdkRGBA _tmp2_ = {0}; #line 91 "/home/jens/Source/shotwell/src/config/Config.vala" g_return_if_fail (CONFIG_IS_FACADE (self)); #line 92 "/home/jens/Source/shotwell/src/config/Config.vala" _tmp0_ = self->priv->bg_color; #line 92 "/home/jens/Source/shotwell/src/config/Config.vala" - _tmp1_ = is_string_empty (_tmp0_); -#line 92 "/home/jens/Source/shotwell/src/config/Config.vala" - if (_tmp1_) { + if (is_string_empty (_tmp0_)) { #line 93 "/home/jens/Source/shotwell/src/config/Config.vala" config_facade_get_colors (self); -#line 708 "Config.c" +#line 745 "Config.c" } #line 95 "/home/jens/Source/shotwell/src/config/Config.vala" - _tmp2_ = self->priv->bg_color; + _tmp1_ = self->priv->bg_color; #line 95 "/home/jens/Source/shotwell/src/config/Config.vala" - parse_color (_tmp2_, &_tmp3_); + parse_color (_tmp1_, &_tmp2_); #line 95 "/home/jens/Source/shotwell/src/config/Config.vala" - *result = _tmp3_; + *result = _tmp2_; #line 95 "/home/jens/Source/shotwell/src/config/Config.vala" return; -#line 718 "Config.c" +#line 755 "Config.c" } -void config_facade_get_selected_color (ConfigFacade* self, gboolean in_focus, GdkRGBA* result) { - gboolean _tmp0_; +void +config_facade_get_selected_color (ConfigFacade* self, + gboolean in_focus, + GdkRGBA* result) +{ #line 98 "/home/jens/Source/shotwell/src/config/Config.vala" g_return_if_fail (CONFIG_IS_FACADE (self)); #line 99 "/home/jens/Source/shotwell/src/config/Config.vala" - _tmp0_ = in_focus; -#line 99 "/home/jens/Source/shotwell/src/config/Config.vala" - if (_tmp0_) { -#line 730 "Config.c" + if (in_focus) { +#line 768 "Config.c" + const gchar* _tmp0_; const gchar* _tmp1_; - gboolean _tmp2_; - const gchar* _tmp3_; - GdkRGBA _tmp4_ = {0}; -#line 100 "/home/jens/Source/shotwell/src/config/Config.vala" - _tmp1_ = self->priv->selected_color; + GdkRGBA _tmp2_ = {0}; #line 100 "/home/jens/Source/shotwell/src/config/Config.vala" - _tmp2_ = is_string_empty (_tmp1_); + _tmp0_ = self->priv->selected_color; #line 100 "/home/jens/Source/shotwell/src/config/Config.vala" - if (_tmp2_) { + if (is_string_empty (_tmp0_)) { #line 101 "/home/jens/Source/shotwell/src/config/Config.vala" config_facade_get_colors (self); -#line 743 "Config.c" +#line 778 "Config.c" } #line 103 "/home/jens/Source/shotwell/src/config/Config.vala" - _tmp3_ = self->priv->selected_color; + _tmp1_ = self->priv->selected_color; #line 103 "/home/jens/Source/shotwell/src/config/Config.vala" - parse_color (_tmp3_, &_tmp4_); + parse_color (_tmp1_, &_tmp2_); #line 103 "/home/jens/Source/shotwell/src/config/Config.vala" - *result = _tmp4_; + *result = _tmp2_; #line 103 "/home/jens/Source/shotwell/src/config/Config.vala" return; -#line 753 "Config.c" +#line 788 "Config.c" } else { - const gchar* _tmp5_; - gboolean _tmp6_; - const gchar* _tmp7_; - GdkRGBA _tmp8_ = {0}; -#line 105 "/home/jens/Source/shotwell/src/config/Config.vala" - _tmp5_ = self->priv->unfocused_selected_color; + const gchar* _tmp3_; + const gchar* _tmp4_; + GdkRGBA _tmp5_ = {0}; #line 105 "/home/jens/Source/shotwell/src/config/Config.vala" - _tmp6_ = is_string_empty (_tmp5_); + _tmp3_ = self->priv->unfocused_selected_color; #line 105 "/home/jens/Source/shotwell/src/config/Config.vala" - if (_tmp6_) { + if (is_string_empty (_tmp3_)) { #line 106 "/home/jens/Source/shotwell/src/config/Config.vala" config_facade_get_colors (self); -#line 767 "Config.c" +#line 799 "Config.c" } #line 108 "/home/jens/Source/shotwell/src/config/Config.vala" - _tmp7_ = self->priv->unfocused_selected_color; + _tmp4_ = self->priv->unfocused_selected_color; #line 108 "/home/jens/Source/shotwell/src/config/Config.vala" - parse_color (_tmp7_, &_tmp8_); + parse_color (_tmp4_, &_tmp5_); #line 108 "/home/jens/Source/shotwell/src/config/Config.vala" - *result = _tmp8_; + *result = _tmp5_; #line 108 "/home/jens/Source/shotwell/src/config/Config.vala" return; -#line 777 "Config.c" +#line 809 "Config.c" } } -void config_facade_get_unselected_color (ConfigFacade* self, GdkRGBA* result) { +void +config_facade_get_unselected_color (ConfigFacade* self, + GdkRGBA* result) +{ const gchar* _tmp0_; - gboolean _tmp1_; - const gchar* _tmp2_; - GdkRGBA _tmp3_ = {0}; + const gchar* _tmp1_; + GdkRGBA _tmp2_ = {0}; #line 112 "/home/jens/Source/shotwell/src/config/Config.vala" g_return_if_fail (CONFIG_IS_FACADE (self)); #line 113 "/home/jens/Source/shotwell/src/config/Config.vala" _tmp0_ = self->priv->unselected_color; #line 113 "/home/jens/Source/shotwell/src/config/Config.vala" - _tmp1_ = is_string_empty (_tmp0_); -#line 113 "/home/jens/Source/shotwell/src/config/Config.vala" - if (_tmp1_) { + if (is_string_empty (_tmp0_)) { #line 114 "/home/jens/Source/shotwell/src/config/Config.vala" config_facade_get_colors (self); -#line 797 "Config.c" +#line 829 "Config.c" } #line 116 "/home/jens/Source/shotwell/src/config/Config.vala" - _tmp2_ = self->priv->unselected_color; + _tmp1_ = self->priv->unselected_color; #line 116 "/home/jens/Source/shotwell/src/config/Config.vala" - parse_color (_tmp2_, &_tmp3_); + parse_color (_tmp1_, &_tmp2_); #line 116 "/home/jens/Source/shotwell/src/config/Config.vala" - *result = _tmp3_; + *result = _tmp2_; #line 116 "/home/jens/Source/shotwell/src/config/Config.vala" return; -#line 807 "Config.c" +#line 839 "Config.c" } -void config_facade_get_border_color (ConfigFacade* self, GdkRGBA* result) { +void +config_facade_get_border_color (ConfigFacade* self, + GdkRGBA* result) +{ const gchar* _tmp0_; - gboolean _tmp1_; - const gchar* _tmp2_; - GdkRGBA _tmp3_ = {0}; + const gchar* _tmp1_; + GdkRGBA _tmp2_ = {0}; #line 119 "/home/jens/Source/shotwell/src/config/Config.vala" g_return_if_fail (CONFIG_IS_FACADE (self)); #line 120 "/home/jens/Source/shotwell/src/config/Config.vala" _tmp0_ = self->priv->border_color; #line 120 "/home/jens/Source/shotwell/src/config/Config.vala" - _tmp1_ = is_string_empty (_tmp0_); -#line 120 "/home/jens/Source/shotwell/src/config/Config.vala" - if (_tmp1_) { + if (is_string_empty (_tmp0_)) { #line 121 "/home/jens/Source/shotwell/src/config/Config.vala" config_facade_get_colors (self); -#line 826 "Config.c" +#line 858 "Config.c" } #line 123 "/home/jens/Source/shotwell/src/config/Config.vala" - _tmp2_ = self->priv->border_color; + _tmp1_ = self->priv->border_color; #line 123 "/home/jens/Source/shotwell/src/config/Config.vala" - parse_color (_tmp2_, &_tmp3_); + parse_color (_tmp1_, &_tmp2_); #line 123 "/home/jens/Source/shotwell/src/config/Config.vala" - *result = _tmp3_; + *result = _tmp2_; #line 123 "/home/jens/Source/shotwell/src/config/Config.vala" return; -#line 836 "Config.c" +#line 868 "Config.c" } -void config_facade_set_bg_color (ConfigFacade* self, GdkRGBA* color) { +void +config_facade_set_bg_color (ConfigFacade* self, + GdkRGBA* color) +{ guint8 col_tmp = 0U; GdkRGBA _tmp0_; gdouble _tmp1_; @@ -867,11 +902,13 @@ void config_facade_set_bg_color (ConfigFacade* self, GdkRGBA* color) { _tmp4_ = *color; #line 132 "/home/jens/Source/shotwell/src/config/Config.vala" config_facade_set_text_colors (self, &_tmp4_); -#line 871 "Config.c" +#line 906 "Config.c" } -void config_facade_commit_bg_color (ConfigFacade* self) { +void +config_facade_commit_bg_color (ConfigFacade* self) +{ const gchar* _tmp0_; #line 135 "/home/jens/Source/shotwell/src/config/Config.vala" g_return_if_fail (CONFIG_IS_FACADE (self)); @@ -879,11 +916,13 @@ void config_facade_commit_bg_color (ConfigFacade* self) { _tmp0_ = self->priv->bg_color; #line 136 "/home/jens/Source/shotwell/src/config/Config.vala" CONFIGURATION_FACADE_CLASS (config_facade_parent_class)->set_bg_color_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp0_); -#line 883 "Config.c" +#line 920 "Config.c" } -static void config_facade_class_init (ConfigFacadeClass * klass) { +static void +config_facade_class_init (ConfigFacadeClass * klass) +{ #line 18 "/home/jens/Source/shotwell/src/config/Config.vala" config_facade_parent_class = g_type_class_peek_parent (klass); #line 18 "/home/jens/Source/shotwell/src/config/Config.vala" @@ -892,11 +931,13 @@ static void config_facade_class_init (ConfigFacadeClass * klass) { G_OBJECT_CLASS (klass)->finalize = config_facade_finalize; #line 18 "/home/jens/Source/shotwell/src/config/Config.vala" config_facade_signals[CONFIG_FACADE_COLORS_CHANGED_SIGNAL] = g_signal_new ("colors-changed", CONFIG_TYPE_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 896 "Config.c" +#line 935 "Config.c" } -static void config_facade_instance_init (ConfigFacade * self) { +static void +config_facade_instance_init (ConfigFacade * self) +{ #line 18 "/home/jens/Source/shotwell/src/config/Config.vala" self->priv = CONFIG_FACADE_GET_PRIVATE (self); #line 36 "/home/jens/Source/shotwell/src/config/Config.vala" @@ -909,11 +950,13 @@ static void config_facade_instance_init (ConfigFacade * self) { self->priv->unfocused_selected_color = NULL; #line 40 "/home/jens/Source/shotwell/src/config/Config.vala" self->priv->border_color = NULL; -#line 913 "Config.c" +#line 954 "Config.c" } -static void config_facade_finalize (GObject * obj) { +static void +config_facade_finalize (GObject * obj) +{ ConfigFacade * self; #line 18 "/home/jens/Source/shotwell/src/config/Config.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, CONFIG_TYPE_FACADE, ConfigFacade); @@ -929,11 +972,13 @@ static void config_facade_finalize (GObject * obj) { _g_free0 (self->priv->border_color); #line 18 "/home/jens/Source/shotwell/src/config/Config.vala" G_OBJECT_CLASS (config_facade_parent_class)->finalize (obj); -#line 933 "Config.c" +#line 976 "Config.c" } -GType config_facade_get_type (void) { +GType +config_facade_get_type (void) +{ static volatile gsize config_facade_type_id__volatile = 0; if (g_once_init_enter (&config_facade_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ConfigFacadeClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) config_facade_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ConfigFacade), 0, (GInstanceInitFunc) config_facade_instance_init, NULL }; @@ -945,15 +990,21 @@ GType config_facade_get_type (void) { } -void config_preconfigure (void) { +void +config_preconfigure (void) +{ } -void config_init (GError** error) { +void +config_init (GError** error) +{ } -void config_terminate (void) { +void +config_terminate (void) +{ } diff --git a/src/config/ConfigurationInterfaces.c b/src/config/ConfigurationInterfaces.c index e5bfa56..2750b10 100644 --- a/src/config/ConfigurationInterfaces.c +++ b/src/config/ConfigurationInterfaces.c @@ -1,4 +1,4 @@ -/* ConfigurationInterfaces.c generated by valac 0.36.6, the Vala compiler +/* ConfigurationInterfaces.c generated by valac 0.40.4, the Vala compiler * generated from ConfigurationInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -29,9 +30,9 @@ typedef struct _ConfigurationEngine ConfigurationEngine; typedef struct _ConfigurationEngineIface ConfigurationEngineIface; enum { CONFIGURATION_ENGINE_PROPERTY_CHANGED_SIGNAL, - CONFIGURATION_ENGINE_LAST_SIGNAL + CONFIGURATION_ENGINE_NUM_SIGNALS }; -static guint configuration_engine_signals[CONFIGURATION_ENGINE_LAST_SIGNAL] = {0}; +static guint configuration_engine_signals[CONFIGURATION_ENGINE_NUM_SIGNALS] = {0}; #define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ()) #define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade)) @@ -56,6 +57,11 @@ typedef struct _Dimensions Dimensions; #define JPEG_TYPE_QUALITY (jpeg_quality_get_type ()) #define TYPE_RAW_DEVELOPER (raw_developer_get_type ()) +enum { + CONFIGURATION_FACADE_0_PROPERTY, + CONFIGURATION_FACADE_NUM_PROPERTIES +}; +static GParamSpec* configuration_facade_properties[CONFIGURATION_FACADE_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) @@ -70,9 +76,9 @@ enum { CONFIGURATION_FACADE_EVENTS_SORT_ASCENDING_CHANGED_SIGNAL, CONFIGURATION_FACADE_EXTERNAL_APP_CHANGED_SIGNAL, CONFIGURATION_FACADE_IMPORT_DIRECTORY_CHANGED_SIGNAL, - CONFIGURATION_FACADE_LAST_SIGNAL + CONFIGURATION_FACADE_NUM_SIGNALS }; -static guint configuration_facade_signals[CONFIGURATION_FACADE_LAST_SIGNAL] = {0}; +static guint configuration_facade_signals[CONFIGURATION_FACADE_NUM_SIGNALS] = {0}; typedef enum { CONFIGURATION_ERROR_PROPERTY_HAS_NO_VALUE, @@ -393,27 +399,90 @@ GType configurable_property_get_type (void) G_GNUC_CONST; gchar* configurable_property_to_string (ConfigurableProperty self); GType configuration_engine_get_type (void) G_GNUC_CONST; gchar* configuration_engine_get_name (ConfigurationEngine* self); -gint configuration_engine_get_int_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error); -void configuration_engine_set_int_property (ConfigurationEngine* self, ConfigurableProperty p, gint val, GError** error); -gint configuration_engine_get_enum_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error); -void configuration_engine_set_enum_property (ConfigurationEngine* self, ConfigurableProperty p, gint val, GError** error); -gchar* configuration_engine_get_string_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error); -void configuration_engine_set_string_property (ConfigurationEngine* self, ConfigurableProperty p, const gchar* val, GError** error); -gboolean configuration_engine_get_bool_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error); -void configuration_engine_set_bool_property (ConfigurationEngine* self, ConfigurableProperty p, gboolean val, GError** error); -gdouble configuration_engine_get_double_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error); -void configuration_engine_set_double_property (ConfigurationEngine* self, ConfigurableProperty p, gdouble val, GError** error); -gboolean configuration_engine_get_plugin_bool (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gboolean def); -void configuration_engine_set_plugin_bool (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gboolean val); -gdouble configuration_engine_get_plugin_double (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gdouble def); -void configuration_engine_set_plugin_double (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gdouble val); -gint configuration_engine_get_plugin_int (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gint def); -void configuration_engine_set_plugin_int (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gint val); -gchar* configuration_engine_get_plugin_string (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* def); -void configuration_engine_set_plugin_string (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* val); -void configuration_engine_unset_plugin_key (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key); -FuzzyPropertyState configuration_engine_is_plugin_enabled (ConfigurationEngine* self, const gchar* id); -void configuration_engine_set_plugin_enabled (ConfigurationEngine* self, const gchar* id, gboolean enabled); +gint configuration_engine_get_int_property (ConfigurationEngine* self, + ConfigurableProperty p, + GError** error); +void configuration_engine_set_int_property (ConfigurationEngine* self, + ConfigurableProperty p, + gint val, + GError** error); +gint configuration_engine_get_enum_property (ConfigurationEngine* self, + ConfigurableProperty p, + GError** error); +void configuration_engine_set_enum_property (ConfigurationEngine* self, + ConfigurableProperty p, + gint val, + GError** error); +gchar* configuration_engine_get_string_property (ConfigurationEngine* self, + ConfigurableProperty p, + GError** error); +void configuration_engine_set_string_property (ConfigurationEngine* self, + ConfigurableProperty p, + const gchar* val, + GError** error); +gboolean configuration_engine_get_bool_property (ConfigurationEngine* self, + ConfigurableProperty p, + GError** error); +void configuration_engine_set_bool_property (ConfigurationEngine* self, + ConfigurableProperty p, + gboolean val, + GError** error); +gdouble configuration_engine_get_double_property (ConfigurationEngine* self, + ConfigurableProperty p, + GError** error); +void configuration_engine_set_double_property (ConfigurationEngine* self, + ConfigurableProperty p, + gdouble val, + GError** error); +gboolean configuration_engine_get_plugin_bool (ConfigurationEngine* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gboolean def); +void configuration_engine_set_plugin_bool (ConfigurationEngine* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gboolean val); +gdouble configuration_engine_get_plugin_double (ConfigurationEngine* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gdouble def); +void configuration_engine_set_plugin_double (ConfigurationEngine* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gdouble val); +gint configuration_engine_get_plugin_int (ConfigurationEngine* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gint def); +void configuration_engine_set_plugin_int (ConfigurationEngine* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gint val); +gchar* configuration_engine_get_plugin_string (ConfigurationEngine* self, + const gchar* domain, + const gchar* id, + const gchar* key, + const gchar* def); +void configuration_engine_set_plugin_string (ConfigurationEngine* self, + const gchar* domain, + const gchar* id, + const gchar* key, + const gchar* val); +void configuration_engine_unset_plugin_key (ConfigurationEngine* self, + const gchar* domain, + const gchar* id, + const gchar* key); +FuzzyPropertyState configuration_engine_is_plugin_enabled (ConfigurationEngine* self, + const gchar* id); +void configuration_engine_set_plugin_enabled (ConfigurationEngine* self, + const gchar* id, + gboolean enabled); GType configuration_facade_get_type (void) G_GNUC_CONST; GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); @@ -424,308 +493,542 @@ GType photo_file_format_get_type (void) G_GNUC_CONST; GType jpeg_quality_get_type (void) G_GNUC_CONST; GType raw_developer_get_type (void) G_GNUC_CONST; #define CONFIGURATION_FACADE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CONFIGURATION_FACADE, ConfigurationFacadePrivate)) -enum { - CONFIGURATION_FACADE_DUMMY_PROPERTY -}; -ConfigurationFacade* configuration_facade_construct (GType object_type, ConfigurationEngine* engine); -static void configuration_facade_on_property_changed (ConfigurationFacade* self, ConfigurableProperty p); -static void _configuration_facade_on_property_changed_configuration_engine_property_changed (ConfigurationEngine* _sender, ConfigurableProperty p, gpointer self); +ConfigurationFacade* configuration_facade_construct (GType object_type, + ConfigurationEngine* engine); +static void configuration_facade_on_property_changed (ConfigurationFacade* self, + ConfigurableProperty p); +static void _configuration_facade_on_property_changed_configuration_engine_property_changed (ConfigurationEngine* _sender, + ConfigurableProperty p, + gpointer self); ConfigurationEngine* configuration_facade_get_engine (ConfigurationFacade* self); -void configuration_facade_on_configuration_error (ConfigurationFacade* self, GError* err); +void configuration_facade_on_configuration_error (ConfigurationFacade* self, + GError* err); gboolean configuration_facade_get_auto_import_from_library (ConfigurationFacade* self); static gboolean configuration_facade_real_get_auto_import_from_library (ConfigurationFacade* self); -void configuration_facade_set_auto_import_from_library (ConfigurationFacade* self, gboolean auto_import); -static void configuration_facade_real_set_auto_import_from_library (ConfigurationFacade* self, gboolean auto_import); +void configuration_facade_set_auto_import_from_library (ConfigurationFacade* self, + gboolean auto_import); +static void configuration_facade_real_set_auto_import_from_library (ConfigurationFacade* self, + gboolean auto_import); gchar* configuration_facade_get_bg_color_name (ConfigurationFacade* self); static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade* self); -void configuration_facade_set_bg_color_name (ConfigurationFacade* self, const gchar* color_name); -static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* self, const gchar* color_name); +void configuration_facade_set_bg_color_name (ConfigurationFacade* self, + const gchar* color_name); +static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* self, + const gchar* color_name); gchar* configuration_facade_get_transparent_background_type (ConfigurationFacade* self); static gchar* configuration_facade_real_get_transparent_background_type (ConfigurationFacade* self); -void configuration_facade_set_transparent_background_type (ConfigurationFacade* self, const gchar* type); -static void configuration_facade_real_set_transparent_background_type (ConfigurationFacade* self, const gchar* type); +void configuration_facade_set_transparent_background_type (ConfigurationFacade* self, + const gchar* type); +static void configuration_facade_real_set_transparent_background_type (ConfigurationFacade* self, + const gchar* type); gchar* configuration_facade_get_transparent_background_color (ConfigurationFacade* self); static gchar* configuration_facade_real_get_transparent_background_color (ConfigurationFacade* self); -void configuration_facade_set_transparent_background_color (ConfigurationFacade* self, const gchar* color_name); -static void configuration_facade_real_set_transparent_background_color (ConfigurationFacade* self, const gchar* color_name); +void configuration_facade_set_transparent_background_color (ConfigurationFacade* self, + const gchar* color_name); +static void configuration_facade_real_set_transparent_background_color (ConfigurationFacade* self, + const gchar* color_name); gboolean configuration_facade_get_commit_metadata_to_masters (ConfigurationFacade* self); static gboolean configuration_facade_real_get_commit_metadata_to_masters (ConfigurationFacade* self); -void configuration_facade_set_commit_metadata_to_masters (ConfigurationFacade* self, gboolean commit_metadata); -static void configuration_facade_real_set_commit_metadata_to_masters (ConfigurationFacade* self, gboolean commit_metadata); +void configuration_facade_set_commit_metadata_to_masters (ConfigurationFacade* self, + gboolean commit_metadata); +static void configuration_facade_real_set_commit_metadata_to_masters (ConfigurationFacade* self, + gboolean commit_metadata); gchar* configuration_facade_get_desktop_background (ConfigurationFacade* self); static gchar* configuration_facade_real_get_desktop_background (ConfigurationFacade* self); -void configuration_facade_set_desktop_background (ConfigurationFacade* self, const gchar* filename); -static void configuration_facade_real_set_desktop_background (ConfigurationFacade* self, const gchar* filename); +void configuration_facade_set_desktop_background (ConfigurationFacade* self, + const gchar* filename); +static void configuration_facade_real_set_desktop_background (ConfigurationFacade* self, + const gchar* filename); gchar* configuration_facade_get_screensaver (ConfigurationFacade* self); static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* self); -void configuration_facade_set_screensaver (ConfigurationFacade* self, const gchar* filename); -static void configuration_facade_real_set_screensaver (ConfigurationFacade* self, const gchar* filename); +void configuration_facade_set_screensaver (ConfigurationFacade* self, + const gchar* filename); +static void configuration_facade_real_set_screensaver (ConfigurationFacade* self, + const gchar* filename); gchar* configuration_facade_get_directory_pattern (ConfigurationFacade* self); static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFacade* self); -void configuration_facade_set_directory_pattern (ConfigurationFacade* self, const gchar* s); -static void configuration_facade_real_set_directory_pattern (ConfigurationFacade* self, const gchar* s); +void configuration_facade_set_directory_pattern (ConfigurationFacade* self, + const gchar* s); +static void configuration_facade_real_set_directory_pattern (ConfigurationFacade* self, + const gchar* s); gchar* configuration_facade_get_directory_pattern_custom (ConfigurationFacade* self); static gchar* configuration_facade_real_get_directory_pattern_custom (ConfigurationFacade* self); -void configuration_facade_set_directory_pattern_custom (ConfigurationFacade* self, const gchar* s); -static void configuration_facade_real_set_directory_pattern_custom (ConfigurationFacade* self, const gchar* s); -void configuration_facade_get_direct_window_state (ConfigurationFacade* self, gboolean* maximize, Dimensions* dimensions); -static void configuration_facade_real_get_direct_window_state (ConfigurationFacade* self, gboolean* maximize, Dimensions* dimensions); -void dimensions_init (Dimensions *self, gint width, gint height); -void configuration_facade_set_direct_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions); -static void configuration_facade_real_set_direct_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions); +void configuration_facade_set_directory_pattern_custom (ConfigurationFacade* self, + const gchar* s); +static void configuration_facade_real_set_directory_pattern_custom (ConfigurationFacade* self, + const gchar* s); +void configuration_facade_get_direct_window_state (ConfigurationFacade* self, + gboolean* maximize, + Dimensions* dimensions); +static void configuration_facade_real_get_direct_window_state (ConfigurationFacade* self, + gboolean* maximize, + Dimensions* dimensions); +void dimensions_init (Dimensions *self, + gint width, + gint height); +void configuration_facade_set_direct_window_state (ConfigurationFacade* self, + gboolean maximize, + Dimensions* dimensions); +static void configuration_facade_real_set_direct_window_state (ConfigurationFacade* self, + gboolean maximize, + Dimensions* dimensions); gboolean configuration_facade_get_display_basic_properties (ConfigurationFacade* self); static gboolean configuration_facade_real_get_display_basic_properties (ConfigurationFacade* self); -void configuration_facade_set_display_basic_properties (ConfigurationFacade* self, gboolean display); -static void configuration_facade_real_set_display_basic_properties (ConfigurationFacade* self, gboolean display); +void configuration_facade_set_display_basic_properties (ConfigurationFacade* self, + gboolean display); +static void configuration_facade_real_set_display_basic_properties (ConfigurationFacade* self, + gboolean display); gboolean configuration_facade_get_display_extended_properties (ConfigurationFacade* self); static gboolean configuration_facade_real_get_display_extended_properties (ConfigurationFacade* self); -void configuration_facade_set_display_extended_properties (ConfigurationFacade* self, gboolean display); -static void configuration_facade_real_set_display_extended_properties (ConfigurationFacade* self, gboolean display); +void configuration_facade_set_display_extended_properties (ConfigurationFacade* self, + gboolean display); +static void configuration_facade_real_set_display_extended_properties (ConfigurationFacade* self, + gboolean display); gboolean configuration_facade_get_display_sidebar (ConfigurationFacade* self); static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFacade* self); -void configuration_facade_set_display_sidebar (ConfigurationFacade* self, gboolean display); -static void configuration_facade_real_set_display_sidebar (ConfigurationFacade* self, gboolean display); +void configuration_facade_set_display_sidebar (ConfigurationFacade* self, + gboolean display); +static void configuration_facade_real_set_display_sidebar (ConfigurationFacade* self, + gboolean display); gboolean configuration_facade_get_display_toolbar (ConfigurationFacade* self); static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFacade* self); -void configuration_facade_set_display_toolbar (ConfigurationFacade* self, gboolean display); -static void configuration_facade_real_set_display_toolbar (ConfigurationFacade* self, gboolean display); +void configuration_facade_set_display_toolbar (ConfigurationFacade* self, + gboolean display); +static void configuration_facade_real_set_display_toolbar (ConfigurationFacade* self, + gboolean display); gboolean configuration_facade_get_display_search_bar (ConfigurationFacade* self); static gboolean configuration_facade_real_get_display_search_bar (ConfigurationFacade* self); -void configuration_facade_set_display_search_bar (ConfigurationFacade* self, gboolean display); -static void configuration_facade_real_set_display_search_bar (ConfigurationFacade* self, gboolean display); +void configuration_facade_set_display_search_bar (ConfigurationFacade* self, + gboolean display); +static void configuration_facade_real_set_display_search_bar (ConfigurationFacade* self, + gboolean display); gboolean configuration_facade_get_display_photo_ratings (ConfigurationFacade* self); static gboolean configuration_facade_real_get_display_photo_ratings (ConfigurationFacade* self); -void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self, gboolean display); -static void configuration_facade_real_set_display_photo_ratings (ConfigurationFacade* self, gboolean display); +void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self, + gboolean display); +static void configuration_facade_real_set_display_photo_ratings (ConfigurationFacade* self, + gboolean display); gboolean configuration_facade_get_display_photo_tags (ConfigurationFacade* self); static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationFacade* self); -void configuration_facade_set_display_photo_tags (ConfigurationFacade* self, gboolean display); -static void configuration_facade_real_set_display_photo_tags (ConfigurationFacade* self, gboolean display); +void configuration_facade_set_display_photo_tags (ConfigurationFacade* self, + gboolean display); +static void configuration_facade_real_set_display_photo_tags (ConfigurationFacade* self, + gboolean display); gboolean configuration_facade_get_display_photo_titles (ConfigurationFacade* self); static gboolean configuration_facade_real_get_display_photo_titles (ConfigurationFacade* self); -void configuration_facade_set_display_photo_titles (ConfigurationFacade* self, gboolean display); -static void configuration_facade_real_set_display_photo_titles (ConfigurationFacade* self, gboolean display); +void configuration_facade_set_display_photo_titles (ConfigurationFacade* self, + gboolean display); +static void configuration_facade_real_set_display_photo_titles (ConfigurationFacade* self, + gboolean display); gboolean configuration_facade_get_display_photo_comments (ConfigurationFacade* self); static gboolean configuration_facade_real_get_display_photo_comments (ConfigurationFacade* self); -void configuration_facade_set_display_photo_comments (ConfigurationFacade* self, gboolean display); -static void configuration_facade_real_set_display_photo_comments (ConfigurationFacade* self, gboolean display); +void configuration_facade_set_display_photo_comments (ConfigurationFacade* self, + gboolean display); +static void configuration_facade_real_set_display_photo_comments (ConfigurationFacade* self, + gboolean display); gboolean configuration_facade_get_display_event_comments (ConfigurationFacade* self); static gboolean configuration_facade_real_get_display_event_comments (ConfigurationFacade* self); -void configuration_facade_set_display_event_comments (ConfigurationFacade* self, gboolean display); -static void configuration_facade_real_set_display_event_comments (ConfigurationFacade* self, gboolean display); -void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by); -static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by); -void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by); -static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by); +void configuration_facade_set_display_event_comments (ConfigurationFacade* self, + gboolean display); +static void configuration_facade_real_set_display_event_comments (ConfigurationFacade* self, + gboolean display); +void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, + gboolean* sort_order, + gint* sort_by); +static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade* self, + gboolean* sort_order, + gint* sort_by); +void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, + gboolean sort_order, + gint sort_by); +static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade* self, + gboolean sort_order, + gint sort_by); gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* self); static gboolean configuration_facade_real_get_events_sort_ascending (ConfigurationFacade* self); -void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self, gboolean sort); -static void configuration_facade_real_set_events_sort_ascending (ConfigurationFacade* self, gboolean sort); +void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self, + gboolean sort); +static void configuration_facade_real_set_events_sort_ascending (ConfigurationFacade* self, + gboolean sort); gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self); static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFacade* self); -void configuration_facade_set_external_photo_app (ConfigurationFacade* self, const gchar* external_photo_app); -static void configuration_facade_real_set_external_photo_app (ConfigurationFacade* self, const gchar* external_photo_app); +void configuration_facade_set_external_photo_app (ConfigurationFacade* self, + const gchar* external_photo_app); +static void configuration_facade_real_set_external_photo_app (ConfigurationFacade* self, + const gchar* external_photo_app); gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self); static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacade* self); -void configuration_facade_set_external_raw_app (ConfigurationFacade* self, const gchar* external_raw_app); -static void configuration_facade_real_set_external_raw_app (ConfigurationFacade* self, const gchar* external_raw_app); +void configuration_facade_set_external_raw_app (ConfigurationFacade* self, + const gchar* external_raw_app); +static void configuration_facade_real_set_external_raw_app (ConfigurationFacade* self, + const gchar* external_raw_app); ScaleConstraint configuration_facade_get_export_constraint (ConfigurationFacade* self); static ScaleConstraint configuration_facade_real_get_export_constraint (ConfigurationFacade* self); -void configuration_facade_set_export_constraint (ConfigurationFacade* self, ScaleConstraint constraint); -static void configuration_facade_real_set_export_constraint (ConfigurationFacade* self, ScaleConstraint constraint); +void configuration_facade_set_export_constraint (ConfigurationFacade* self, + ScaleConstraint constraint); +static void configuration_facade_real_set_export_constraint (ConfigurationFacade* self, + ScaleConstraint constraint); ExportFormatMode configuration_facade_get_export_export_format_mode (ConfigurationFacade* self); static ExportFormatMode configuration_facade_real_get_export_export_format_mode (ConfigurationFacade* self); -void configuration_facade_set_export_export_format_mode (ConfigurationFacade* self, ExportFormatMode export_format_mode); -static void configuration_facade_real_set_export_export_format_mode (ConfigurationFacade* self, ExportFormatMode export_format_mode); +void configuration_facade_set_export_export_format_mode (ConfigurationFacade* self, + ExportFormatMode export_format_mode); +static void configuration_facade_real_set_export_export_format_mode (ConfigurationFacade* self, + ExportFormatMode export_format_mode); gboolean configuration_facade_get_export_export_metadata (ConfigurationFacade* self); static gboolean configuration_facade_real_get_export_export_metadata (ConfigurationFacade* self); -void configuration_facade_set_export_export_metadata (ConfigurationFacade* self, gboolean export_metadata); -static void configuration_facade_real_set_export_export_metadata (ConfigurationFacade* self, gboolean export_metadata); +void configuration_facade_set_export_export_metadata (ConfigurationFacade* self, + gboolean export_metadata); +static void configuration_facade_real_set_export_export_metadata (ConfigurationFacade* self, + gboolean export_metadata); PhotoFileFormat configuration_facade_get_export_photo_file_format (ConfigurationFacade* self); static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (ConfigurationFacade* self); PhotoFileFormat photo_file_format_unserialize (gint value); -void configuration_facade_set_export_photo_file_format (ConfigurationFacade* self, PhotoFileFormat photo_file_format); -static void configuration_facade_real_set_export_photo_file_format (ConfigurationFacade* self, PhotoFileFormat photo_file_format); +void configuration_facade_set_export_photo_file_format (ConfigurationFacade* self, + PhotoFileFormat photo_file_format); +static void configuration_facade_real_set_export_photo_file_format (ConfigurationFacade* self, + PhotoFileFormat photo_file_format); gint photo_file_format_serialize (PhotoFileFormat self); JpegQuality configuration_facade_get_export_quality (ConfigurationFacade* self); static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFacade* self); -void configuration_facade_set_export_quality (ConfigurationFacade* self, JpegQuality quality); -static void configuration_facade_real_set_export_quality (ConfigurationFacade* self, JpegQuality quality); +void configuration_facade_set_export_quality (ConfigurationFacade* self, + JpegQuality quality); +static void configuration_facade_real_set_export_quality (ConfigurationFacade* self, + JpegQuality quality); gint configuration_facade_get_export_scale (ConfigurationFacade* self); static gint configuration_facade_real_get_export_scale (ConfigurationFacade* self); -void configuration_facade_set_export_scale (ConfigurationFacade* self, gint scale); -static void configuration_facade_real_set_export_scale (ConfigurationFacade* self, gint scale); +void configuration_facade_set_export_scale (ConfigurationFacade* self, + gint scale); +static void configuration_facade_real_set_export_scale (ConfigurationFacade* self, + gint scale); RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self); static RawDeveloper configuration_facade_real_get_default_raw_developer (ConfigurationFacade* self); RawDeveloper raw_developer_from_string (const gchar* value); -void configuration_facade_set_default_raw_developer (ConfigurationFacade* self, RawDeveloper d); -static void configuration_facade_real_set_default_raw_developer (ConfigurationFacade* self, RawDeveloper d); +void configuration_facade_set_default_raw_developer (ConfigurationFacade* self, + RawDeveloper d); +static void configuration_facade_real_set_default_raw_developer (ConfigurationFacade* self, + RawDeveloper d); gchar* raw_developer_to_string (RawDeveloper self); gboolean configuration_facade_get_hide_photos_already_imported (ConfigurationFacade* self); static gboolean configuration_facade_real_get_hide_photos_already_imported (ConfigurationFacade* self); -void configuration_facade_set_hide_photos_already_imported (ConfigurationFacade* self, gboolean hide_imported); -static void configuration_facade_real_set_hide_photos_already_imported (ConfigurationFacade* self, gboolean hide_imported); +void configuration_facade_set_hide_photos_already_imported (ConfigurationFacade* self, + gboolean hide_imported); +static void configuration_facade_real_set_hide_photos_already_imported (ConfigurationFacade* self, + gboolean hide_imported); gchar* configuration_facade_get_import_dir (ConfigurationFacade* self); static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* self); -void configuration_facade_set_import_dir (ConfigurationFacade* self, const gchar* import_dir); -static void configuration_facade_real_set_import_dir (ConfigurationFacade* self, const gchar* import_dir); +void configuration_facade_set_import_dir (ConfigurationFacade* self, + const gchar* import_dir); +static void configuration_facade_real_set_import_dir (ConfigurationFacade* self, + const gchar* import_dir); gboolean configuration_facade_get_keep_relativity (ConfigurationFacade* self); static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFacade* self); -void configuration_facade_set_keep_relativity (ConfigurationFacade* self, gboolean keep_relativity); -static void configuration_facade_real_set_keep_relativity (ConfigurationFacade* self, gboolean keep_relativity); +void configuration_facade_set_keep_relativity (ConfigurationFacade* self, + gboolean keep_relativity); +static void configuration_facade_real_set_keep_relativity (ConfigurationFacade* self, + gboolean keep_relativity); gboolean configuration_facade_get_pin_toolbar_state (ConfigurationFacade* self); static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFacade* self); -void configuration_facade_set_pin_toolbar_state (ConfigurationFacade* self, gboolean state); -static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade* self, gboolean state); +void configuration_facade_set_pin_toolbar_state (ConfigurationFacade* self, + gboolean state); +static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade* self, + gboolean state); gint configuration_facade_get_last_crop_height (ConfigurationFacade* self); static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade* self); -void configuration_facade_set_last_crop_height (ConfigurationFacade* self, gint choice); -static void configuration_facade_real_set_last_crop_height (ConfigurationFacade* self, gint choice); +void configuration_facade_set_last_crop_height (ConfigurationFacade* self, + gint choice); +static void configuration_facade_real_set_last_crop_height (ConfigurationFacade* self, + gint choice); gint configuration_facade_get_last_crop_menu_choice (ConfigurationFacade* self); static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFacade* self); -void configuration_facade_set_last_crop_menu_choice (ConfigurationFacade* self, gint choice); -static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFacade* self, gint choice); +void configuration_facade_set_last_crop_menu_choice (ConfigurationFacade* self, + gint choice); +static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFacade* self, + gint choice); gint configuration_facade_get_last_crop_width (ConfigurationFacade* self); static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade* self); -void configuration_facade_set_last_crop_width (ConfigurationFacade* self, gint choice); -static void configuration_facade_real_set_last_crop_width (ConfigurationFacade* self, gint choice); +void configuration_facade_set_last_crop_width (ConfigurationFacade* self, + gint choice); +static void configuration_facade_real_set_last_crop_width (ConfigurationFacade* self, + gint choice); gchar* configuration_facade_get_last_used_service (ConfigurationFacade* self); static gchar* configuration_facade_real_get_last_used_service (ConfigurationFacade* self); -void configuration_facade_set_last_used_service (ConfigurationFacade* self, const gchar* service_name); -static void configuration_facade_real_set_last_used_service (ConfigurationFacade* self, const gchar* service_name); +void configuration_facade_set_last_used_service (ConfigurationFacade* self, + const gchar* service_name); +static void configuration_facade_real_set_last_used_service (ConfigurationFacade* self, + const gchar* service_name); gchar* configuration_facade_get_last_used_dataimports_service (ConfigurationFacade* self); static gchar* configuration_facade_real_get_last_used_dataimports_service (ConfigurationFacade* self); -void configuration_facade_set_last_used_dataimports_service (ConfigurationFacade* self, const gchar* service_name); -static void configuration_facade_real_set_last_used_dataimports_service (ConfigurationFacade* self, const gchar* service_name); -void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by); -static void configuration_facade_real_get_library_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by); -void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by); -static void configuration_facade_real_set_library_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by); -void configuration_facade_get_library_window_state (ConfigurationFacade* self, gboolean* maximize, Dimensions* dimensions); -static void configuration_facade_real_get_library_window_state (ConfigurationFacade* self, gboolean* maximize, Dimensions* dimensions); -void configuration_facade_set_library_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions); -static void configuration_facade_real_set_library_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions); +void configuration_facade_set_last_used_dataimports_service (ConfigurationFacade* self, + const gchar* service_name); +static void configuration_facade_real_set_last_used_dataimports_service (ConfigurationFacade* self, + const gchar* service_name); +void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, + gboolean* sort_order, + gint* sort_by); +static void configuration_facade_real_get_library_photos_sort (ConfigurationFacade* self, + gboolean* sort_order, + gint* sort_by); +void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, + gboolean sort_order, + gint sort_by); +static void configuration_facade_real_set_library_photos_sort (ConfigurationFacade* self, + gboolean sort_order, + gint sort_by); +void configuration_facade_get_library_window_state (ConfigurationFacade* self, + gboolean* maximize, + Dimensions* dimensions); +static void configuration_facade_real_get_library_window_state (ConfigurationFacade* self, + gboolean* maximize, + Dimensions* dimensions); +void configuration_facade_set_library_window_state (ConfigurationFacade* self, + gboolean maximize, + Dimensions* dimensions); +static void configuration_facade_real_set_library_window_state (ConfigurationFacade* self, + gboolean maximize, + Dimensions* dimensions); gboolean configuration_facade_get_modify_originals (ConfigurationFacade* self); static gboolean configuration_facade_real_get_modify_originals (ConfigurationFacade* self); -void configuration_facade_set_modify_originals (ConfigurationFacade* self, gboolean modify_originals); -static void configuration_facade_real_set_modify_originals (ConfigurationFacade* self, gboolean modify_originals); +void configuration_facade_set_modify_originals (ConfigurationFacade* self, + gboolean modify_originals); +static void configuration_facade_real_set_modify_originals (ConfigurationFacade* self, + gboolean modify_originals); gint configuration_facade_get_photo_thumbnail_scale (ConfigurationFacade* self); static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFacade* self); gint thumbnail_get_DEFAULT_SCALE (void); -void configuration_facade_set_photo_thumbnail_scale (ConfigurationFacade* self, gint scale); -static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFacade* self, gint scale); +void configuration_facade_set_photo_thumbnail_scale (ConfigurationFacade* self, + gint scale); +static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFacade* self, + gint scale); gdouble configuration_facade_get_printing_content_height (ConfigurationFacade* self); static gdouble configuration_facade_real_get_printing_content_height (ConfigurationFacade* self); -void configuration_facade_set_printing_content_height (ConfigurationFacade* self, gdouble content_height); -static void configuration_facade_real_set_printing_content_height (ConfigurationFacade* self, gdouble content_height); +void configuration_facade_set_printing_content_height (ConfigurationFacade* self, + gdouble content_height); +static void configuration_facade_real_set_printing_content_height (ConfigurationFacade* self, + gdouble content_height); gint configuration_facade_get_printing_content_layout (ConfigurationFacade* self); static gint configuration_facade_real_get_printing_content_layout (ConfigurationFacade* self); -void configuration_facade_set_printing_content_layout (ConfigurationFacade* self, gint layout_code); -static void configuration_facade_real_set_printing_content_layout (ConfigurationFacade* self, gint layout_code); +void configuration_facade_set_printing_content_layout (ConfigurationFacade* self, + gint layout_code); +static void configuration_facade_real_set_printing_content_layout (ConfigurationFacade* self, + gint layout_code); gint configuration_facade_get_printing_content_ppi (ConfigurationFacade* self); static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFacade* self); -void configuration_facade_set_printing_content_ppi (ConfigurationFacade* self, gint content_ppi); -static void configuration_facade_real_set_printing_content_ppi (ConfigurationFacade* self, gint content_ppi); +void configuration_facade_set_printing_content_ppi (ConfigurationFacade* self, + gint content_ppi); +static void configuration_facade_real_set_printing_content_ppi (ConfigurationFacade* self, + gint content_ppi); gint configuration_facade_get_printing_content_units (ConfigurationFacade* self); static gint configuration_facade_real_get_printing_content_units (ConfigurationFacade* self); -void configuration_facade_set_printing_content_units (ConfigurationFacade* self, gint units_code); -static void configuration_facade_real_set_printing_content_units (ConfigurationFacade* self, gint units_code); +void configuration_facade_set_printing_content_units (ConfigurationFacade* self, + gint units_code); +static void configuration_facade_real_set_printing_content_units (ConfigurationFacade* self, + gint units_code); gdouble configuration_facade_get_printing_content_width (ConfigurationFacade* self); static gdouble configuration_facade_real_get_printing_content_width (ConfigurationFacade* self); -void configuration_facade_set_printing_content_width (ConfigurationFacade* self, gdouble content_width); -static void configuration_facade_real_set_printing_content_width (ConfigurationFacade* self, gdouble content_width); +void configuration_facade_set_printing_content_width (ConfigurationFacade* self, + gdouble content_width); +static void configuration_facade_real_set_printing_content_width (ConfigurationFacade* self, + gdouble content_width); gint configuration_facade_get_printing_images_per_page (ConfigurationFacade* self); static gint configuration_facade_real_get_printing_images_per_page (ConfigurationFacade* self); -void configuration_facade_set_printing_images_per_page (ConfigurationFacade* self, gint images_per_page_code); -static void configuration_facade_real_set_printing_images_per_page (ConfigurationFacade* self, gint images_per_page_code); +void configuration_facade_set_printing_images_per_page (ConfigurationFacade* self, + gint images_per_page_code); +static void configuration_facade_real_set_printing_images_per_page (ConfigurationFacade* self, + gint images_per_page_code); gboolean configuration_facade_get_printing_match_aspect_ratio (ConfigurationFacade* self); static gboolean configuration_facade_real_get_printing_match_aspect_ratio (ConfigurationFacade* self); -void configuration_facade_set_printing_match_aspect_ratio (ConfigurationFacade* self, gboolean match_aspect_ratio); -static void configuration_facade_real_set_printing_match_aspect_ratio (ConfigurationFacade* self, gboolean match_aspect_ratio); +void configuration_facade_set_printing_match_aspect_ratio (ConfigurationFacade* self, + gboolean match_aspect_ratio); +static void configuration_facade_real_set_printing_match_aspect_ratio (ConfigurationFacade* self, + gboolean match_aspect_ratio); gboolean configuration_facade_get_printing_print_titles (ConfigurationFacade* self); static gboolean configuration_facade_real_get_printing_print_titles (ConfigurationFacade* self); -void configuration_facade_set_printing_print_titles (ConfigurationFacade* self, gboolean print_titles); -static void configuration_facade_real_set_printing_print_titles (ConfigurationFacade* self, gboolean print_titles); +void configuration_facade_set_printing_print_titles (ConfigurationFacade* self, + gboolean print_titles); +static void configuration_facade_real_set_printing_print_titles (ConfigurationFacade* self, + gboolean print_titles); gint configuration_facade_get_printing_size_selection (ConfigurationFacade* self); static gint configuration_facade_real_get_printing_size_selection (ConfigurationFacade* self); GType resources_unit_system_get_type (void) G_GNUC_CONST; ResourcesUnitSystem resources_get_default_measurement_unit (void); -void configuration_facade_set_printing_size_selection (ConfigurationFacade* self, gint size_code); -static void configuration_facade_real_set_printing_size_selection (ConfigurationFacade* self, gint size_code); +void configuration_facade_set_printing_size_selection (ConfigurationFacade* self, + gint size_code); +static void configuration_facade_real_set_printing_size_selection (ConfigurationFacade* self, + gint size_code); gchar* configuration_facade_get_printing_titles_font (ConfigurationFacade* self); static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationFacade* self); -void configuration_facade_set_printing_titles_font (ConfigurationFacade* self, const gchar* font_name); -static void configuration_facade_real_set_printing_titles_font (ConfigurationFacade* self, const gchar* font_name); +void configuration_facade_set_printing_titles_font (ConfigurationFacade* self, + const gchar* font_name); +static void configuration_facade_real_set_printing_titles_font (ConfigurationFacade* self, + const gchar* font_name); gboolean configuration_facade_get_show_welcome_dialog (ConfigurationFacade* self); static gboolean configuration_facade_real_get_show_welcome_dialog (ConfigurationFacade* self); -void configuration_facade_set_show_welcome_dialog (ConfigurationFacade* self, gboolean show); -static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFacade* self, gboolean show); +void configuration_facade_set_show_welcome_dialog (ConfigurationFacade* self, + gboolean show); +static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFacade* self, + gboolean show); gint configuration_facade_get_sidebar_position (ConfigurationFacade* self); static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade* self); -void configuration_facade_set_sidebar_position (ConfigurationFacade* self, gint position); -static void configuration_facade_real_set_sidebar_position (ConfigurationFacade* self, gint position); +void configuration_facade_set_sidebar_position (ConfigurationFacade* self, + gint position); +static void configuration_facade_real_set_sidebar_position (ConfigurationFacade* self, + gint position); gdouble configuration_facade_get_slideshow_delay (ConfigurationFacade* self); static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacade* self); -void configuration_facade_set_slideshow_delay (ConfigurationFacade* self, gdouble delay); -static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade* self, gdouble delay); +void configuration_facade_set_slideshow_delay (ConfigurationFacade* self, + gdouble delay); +static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade* self, + gdouble delay); gdouble configuration_facade_get_slideshow_transition_delay (ConfigurationFacade* self); static gdouble configuration_facade_real_get_slideshow_transition_delay (ConfigurationFacade* self); -void configuration_facade_set_slideshow_transition_delay (ConfigurationFacade* self, gdouble delay); -static void configuration_facade_real_set_slideshow_transition_delay (ConfigurationFacade* self, gdouble delay); +void configuration_facade_set_slideshow_transition_delay (ConfigurationFacade* self, + gdouble delay); +static void configuration_facade_real_set_slideshow_transition_delay (ConfigurationFacade* self, + gdouble delay); gchar* configuration_facade_get_slideshow_transition_effect_id (ConfigurationFacade* self); static gchar* configuration_facade_real_get_slideshow_transition_effect_id (ConfigurationFacade* self); #define NULL_TRANSITION_DESCRIPTOR_EFFECT_ID "org.yorba.shotwell.transitions.null" #define TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID NULL_TRANSITION_DESCRIPTOR_EFFECT_ID -void configuration_facade_set_slideshow_transition_effect_id (ConfigurationFacade* self, const gchar* id); -static void configuration_facade_real_set_slideshow_transition_effect_id (ConfigurationFacade* self, const gchar* id); +void configuration_facade_set_slideshow_transition_effect_id (ConfigurationFacade* self, + const gchar* id); +static void configuration_facade_real_set_slideshow_transition_effect_id (ConfigurationFacade* self, + const gchar* id); gboolean configuration_facade_get_slideshow_show_title (ConfigurationFacade* self); static gboolean configuration_facade_real_get_slideshow_show_title (ConfigurationFacade* self); -void configuration_facade_set_slideshow_show_title (ConfigurationFacade* self, gboolean show_title); -static void configuration_facade_real_set_slideshow_show_title (ConfigurationFacade* self, gboolean show_title); +void configuration_facade_set_slideshow_show_title (ConfigurationFacade* self, + gboolean show_title); +static void configuration_facade_real_set_slideshow_show_title (ConfigurationFacade* self, + gboolean show_title); gboolean configuration_facade_get_use_24_hour_time (ConfigurationFacade* self); static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFacade* self); gboolean is_string_empty (const gchar* s); -void configuration_facade_set_use_24_hour_time (ConfigurationFacade* self, gboolean use_24_hour_time); -static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade* self, gboolean use_24_hour_time); +void configuration_facade_set_use_24_hour_time (ConfigurationFacade* self, + gboolean use_24_hour_time); +static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade* self, + gboolean use_24_hour_time); gboolean configuration_facade_get_use_lowercase_filenames (ConfigurationFacade* self); static gboolean configuration_facade_real_get_use_lowercase_filenames (ConfigurationFacade* self); -void configuration_facade_set_use_lowercase_filenames (ConfigurationFacade* self, gboolean b); -static void configuration_facade_real_set_use_lowercase_filenames (ConfigurationFacade* self, gboolean b); +void configuration_facade_set_use_lowercase_filenames (ConfigurationFacade* self, + gboolean b); +static void configuration_facade_real_set_use_lowercase_filenames (ConfigurationFacade* self, + gboolean b); gint configuration_facade_get_video_interpreter_state_cookie (ConfigurationFacade* self); static gint configuration_facade_real_get_video_interpreter_state_cookie (ConfigurationFacade* self); -void configuration_facade_set_video_interpreter_state_cookie (ConfigurationFacade* self, gint state_cookie); -static void configuration_facade_real_set_video_interpreter_state_cookie (ConfigurationFacade* self, gint state_cookie); -gboolean configuration_facade_get_plugin_bool (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gboolean def); -static gboolean configuration_facade_real_get_plugin_bool (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gboolean def); -void configuration_facade_set_plugin_bool (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gboolean val); -static void configuration_facade_real_set_plugin_bool (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gboolean val); -gdouble configuration_facade_get_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble def); -static gdouble configuration_facade_real_get_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble def); -void configuration_facade_set_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble val); -static void configuration_facade_real_set_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble val); -gint configuration_facade_get_plugin_int (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gint def); -static gint configuration_facade_real_get_plugin_int (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gint def); -void configuration_facade_set_plugin_int (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gint val); -static void configuration_facade_real_set_plugin_int (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gint val); -gchar* configuration_facade_get_plugin_string (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* def); -static gchar* configuration_facade_real_get_plugin_string (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* def); -void configuration_facade_set_plugin_string (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* val); -static void configuration_facade_real_set_plugin_string (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* val); -void configuration_facade_unset_plugin_key (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key); -static void configuration_facade_real_unset_plugin_key (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key); -FuzzyPropertyState configuration_facade_is_plugin_enabled (ConfigurationFacade* self, const gchar* id); -static FuzzyPropertyState configuration_facade_real_is_plugin_enabled (ConfigurationFacade* self, const gchar* id); -void configuration_facade_set_plugin_enabled (ConfigurationFacade* self, const gchar* id, gboolean enabled); -static void configuration_facade_real_set_plugin_enabled (ConfigurationFacade* self, const gchar* id, gboolean enabled); +void configuration_facade_set_video_interpreter_state_cookie (ConfigurationFacade* self, + gint state_cookie); +static void configuration_facade_real_set_video_interpreter_state_cookie (ConfigurationFacade* self, + gint state_cookie); +gboolean configuration_facade_get_plugin_bool (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gboolean def); +static gboolean configuration_facade_real_get_plugin_bool (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gboolean def); +void configuration_facade_set_plugin_bool (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gboolean val); +static void configuration_facade_real_set_plugin_bool (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gboolean val); +gdouble configuration_facade_get_plugin_double (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gdouble def); +static gdouble configuration_facade_real_get_plugin_double (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gdouble def); +void configuration_facade_set_plugin_double (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gdouble val); +static void configuration_facade_real_set_plugin_double (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gdouble val); +gint configuration_facade_get_plugin_int (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gint def); +static gint configuration_facade_real_get_plugin_int (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gint def); +void configuration_facade_set_plugin_int (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gint val); +static void configuration_facade_real_set_plugin_int (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gint val); +gchar* configuration_facade_get_plugin_string (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + const gchar* def); +static gchar* configuration_facade_real_get_plugin_string (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + const gchar* def); +void configuration_facade_set_plugin_string (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + const gchar* val); +static void configuration_facade_real_set_plugin_string (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + const gchar* val); +void configuration_facade_unset_plugin_key (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key); +static void configuration_facade_real_unset_plugin_key (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key); +FuzzyPropertyState configuration_facade_is_plugin_enabled (ConfigurationFacade* self, + const gchar* id); +static FuzzyPropertyState configuration_facade_real_is_plugin_enabled (ConfigurationFacade* self, + const gchar* id); +void configuration_facade_set_plugin_enabled (ConfigurationFacade* self, + const gchar* id, + gboolean enabled); +static void configuration_facade_real_set_plugin_enabled (ConfigurationFacade* self, + const gchar* id, + gboolean enabled); static void configuration_facade_finalize (GObject * obj); -GQuark configuration_error_quark (void) { +GQuark +configuration_error_quark (void) +{ return g_quark_from_static_string ("configuration_error-quark"); } -GType fuzzy_property_state_get_type (void) { +GType +fuzzy_property_state_get_type (void) +{ static volatile gsize fuzzy_property_state_type_id__volatile = 0; if (g_once_init_enter (&fuzzy_property_state_type_id__volatile)) { static const GEnumValue values[] = {{FUZZY_PROPERTY_STATE_ENABLED, "FUZZY_PROPERTY_STATE_ENABLED", "enabled"}, {FUZZY_PROPERTY_STATE_DISABLED, "FUZZY_PROPERTY_STATE_DISABLED", "disabled"}, {FUZZY_PROPERTY_STATE_UNKNOWN, "FUZZY_PROPERTY_STATE_UNKNOWN", "unknown"}, {0, NULL, NULL}}; @@ -737,13 +1040,15 @@ GType fuzzy_property_state_get_type (void) { } -gchar* configurable_property_to_string (ConfigurableProperty self) { +gchar* +configurable_property_to_string (ConfigurableProperty self) +{ gchar* result = NULL; #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" switch (self) { #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY: -#line 747 "ConfigurationInterfaces.c" +#line 1052 "ConfigurationInterfaces.c" { gchar* _tmp0_; #line 101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -752,11 +1057,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp0_; #line 101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 756 "ConfigurationInterfaces.c" +#line 1061 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_BG_COLOR_NAME: -#line 760 "ConfigurationInterfaces.c" +#line 1065 "ConfigurationInterfaces.c" { gchar* _tmp1_; #line 104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -765,11 +1070,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp1_; #line 104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 769 "ConfigurationInterfaces.c" +#line 1074 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE: -#line 773 "ConfigurationInterfaces.c" +#line 1078 "ConfigurationInterfaces.c" { gchar* _tmp2_; #line 107 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -778,11 +1083,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp2_; #line 107 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 782 "ConfigurationInterfaces.c" +#line 1087 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR: -#line 786 "ConfigurationInterfaces.c" +#line 1091 "ConfigurationInterfaces.c" { gchar* _tmp3_; #line 110 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -791,11 +1096,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp3_; #line 110 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 795 "ConfigurationInterfaces.c" +#line 1100 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS: -#line 799 "ConfigurationInterfaces.c" +#line 1104 "ConfigurationInterfaces.c" { gchar* _tmp4_; #line 113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -804,11 +1109,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp4_; #line 113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 808 "ConfigurationInterfaces.c" +#line 1113 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE: -#line 812 "ConfigurationInterfaces.c" +#line 1117 "ConfigurationInterfaces.c" { gchar* _tmp5_; #line 116 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -817,11 +1122,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp5_; #line 116 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 821 "ConfigurationInterfaces.c" +#line 1126 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE: -#line 825 "ConfigurationInterfaces.c" +#line 1130 "ConfigurationInterfaces.c" { gchar* _tmp6_; #line 119 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -830,11 +1135,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp6_; #line 119 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 834 "ConfigurationInterfaces.c" +#line 1139 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_SCREENSAVER_FILE: -#line 838 "ConfigurationInterfaces.c" +#line 1143 "ConfigurationInterfaces.c" { gchar* _tmp7_; #line 122 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -843,11 +1148,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp7_; #line 122 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 847 "ConfigurationInterfaces.c" +#line 1152 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_SCREENSAVER_MODE: -#line 851 "ConfigurationInterfaces.c" +#line 1156 "ConfigurationInterfaces.c" { gchar* _tmp8_; #line 125 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -856,11 +1161,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp8_; #line 125 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 860 "ConfigurationInterfaces.c" +#line 1165 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN: -#line 864 "ConfigurationInterfaces.c" +#line 1169 "ConfigurationInterfaces.c" { gchar* _tmp9_; #line 128 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -869,11 +1174,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp9_; #line 128 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 873 "ConfigurationInterfaces.c" +#line 1178 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM: -#line 877 "ConfigurationInterfaces.c" +#line 1182 "ConfigurationInterfaces.c" { gchar* _tmp10_; #line 131 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -882,11 +1187,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp10_; #line 131 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 886 "ConfigurationInterfaces.c" +#line 1191 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT: -#line 890 "ConfigurationInterfaces.c" +#line 1195 "ConfigurationInterfaces.c" { gchar* _tmp11_; #line 134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -895,11 +1200,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp11_; #line 134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 899 "ConfigurationInterfaces.c" +#line 1204 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE: -#line 903 "ConfigurationInterfaces.c" +#line 1208 "ConfigurationInterfaces.c" { gchar* _tmp12_; #line 137 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -908,11 +1213,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp12_; #line 137 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 912 "ConfigurationInterfaces.c" +#line 1217 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH: -#line 916 "ConfigurationInterfaces.c" +#line 1221 "ConfigurationInterfaces.c" { gchar* _tmp13_; #line 140 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -921,11 +1226,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp13_; #line 140 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 925 "ConfigurationInterfaces.c" +#line 1230 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES: -#line 929 "ConfigurationInterfaces.c" +#line 1234 "ConfigurationInterfaces.c" { gchar* _tmp14_; #line 143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -934,11 +1239,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp14_; #line 143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 938 "ConfigurationInterfaces.c" +#line 1243 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES: -#line 942 "ConfigurationInterfaces.c" +#line 1247 "ConfigurationInterfaces.c" { gchar* _tmp15_; #line 146 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -947,11 +1252,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp15_; #line 146 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 951 "ConfigurationInterfaces.c" +#line 1256 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR: -#line 955 "ConfigurationInterfaces.c" +#line 1260 "ConfigurationInterfaces.c" { gchar* _tmp16_; #line 149 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -960,11 +1265,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp16_; #line 149 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 964 "ConfigurationInterfaces.c" +#line 1269 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR: -#line 968 "ConfigurationInterfaces.c" +#line 1273 "ConfigurationInterfaces.c" { gchar* _tmp17_; #line 152 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -973,11 +1278,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp17_; #line 152 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 977 "ConfigurationInterfaces.c" +#line 1282 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR: -#line 981 "ConfigurationInterfaces.c" +#line 1286 "ConfigurationInterfaces.c" { gchar* _tmp18_; #line 155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -986,11 +1291,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp18_; #line 155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 990 "ConfigurationInterfaces.c" +#line 1295 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS: -#line 994 "ConfigurationInterfaces.c" +#line 1299 "ConfigurationInterfaces.c" { gchar* _tmp19_; #line 158 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -999,11 +1304,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp19_; #line 158 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1003 "ConfigurationInterfaces.c" +#line 1308 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS: -#line 1007 "ConfigurationInterfaces.c" +#line 1312 "ConfigurationInterfaces.c" { gchar* _tmp20_; #line 161 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1012,11 +1317,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp20_; #line 161 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1016 "ConfigurationInterfaces.c" +#line 1321 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES: -#line 1020 "ConfigurationInterfaces.c" +#line 1325 "ConfigurationInterfaces.c" { gchar* _tmp21_; #line 164 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1025,11 +1330,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp21_; #line 164 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1029 "ConfigurationInterfaces.c" +#line 1334 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS: -#line 1033 "ConfigurationInterfaces.c" +#line 1338 "ConfigurationInterfaces.c" { gchar* _tmp22_; #line 167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1038,11 +1343,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp22_; #line 167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1042 "ConfigurationInterfaces.c" +#line 1347 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS: -#line 1046 "ConfigurationInterfaces.c" +#line 1351 "ConfigurationInterfaces.c" { gchar* _tmp23_; #line 170 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1051,11 +1356,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp23_; #line 170 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1055 "ConfigurationInterfaces.c" +#line 1360 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING: -#line 1059 "ConfigurationInterfaces.c" +#line 1364 "ConfigurationInterfaces.c" { gchar* _tmp24_; #line 173 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1064,11 +1369,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp24_; #line 173 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1068 "ConfigurationInterfaces.c" +#line 1373 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY: -#line 1072 "ConfigurationInterfaces.c" +#line 1377 "ConfigurationInterfaces.c" { gchar* _tmp25_; #line 176 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1077,11 +1382,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp25_; #line 176 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1081 "ConfigurationInterfaces.c" +#line 1386 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING: -#line 1085 "ConfigurationInterfaces.c" +#line 1390 "ConfigurationInterfaces.c" { gchar* _tmp26_; #line 179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1090,11 +1395,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp26_; #line 179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1094 "ConfigurationInterfaces.c" +#line 1399 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT: -#line 1098 "ConfigurationInterfaces.c" +#line 1403 "ConfigurationInterfaces.c" { gchar* _tmp27_; #line 182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1103,11 +1408,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp27_; #line 182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1107 "ConfigurationInterfaces.c" +#line 1412 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE: -#line 1111 "ConfigurationInterfaces.c" +#line 1416 "ConfigurationInterfaces.c" { gchar* _tmp28_; #line 185 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1116,11 +1421,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp28_; #line 185 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1120 "ConfigurationInterfaces.c" +#line 1425 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA: -#line 1124 "ConfigurationInterfaces.c" +#line 1429 "ConfigurationInterfaces.c" { gchar* _tmp29_; #line 188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1129,11 +1434,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp29_; #line 188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1133 "ConfigurationInterfaces.c" +#line 1438 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT: -#line 1137 "ConfigurationInterfaces.c" +#line 1442 "ConfigurationInterfaces.c" { gchar* _tmp30_; #line 191 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1142,11 +1447,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp30_; #line 191 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1146 "ConfigurationInterfaces.c" +#line 1451 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_EXPORT_QUALITY: -#line 1150 "ConfigurationInterfaces.c" +#line 1455 "ConfigurationInterfaces.c" { gchar* _tmp31_; #line 194 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1155,11 +1460,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp31_; #line 194 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1159 "ConfigurationInterfaces.c" +#line 1464 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_EXPORT_SCALE: -#line 1163 "ConfigurationInterfaces.c" +#line 1468 "ConfigurationInterfaces.c" { gchar* _tmp32_; #line 197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1168,11 +1473,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp32_; #line 197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1172 "ConfigurationInterfaces.c" +#line 1477 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP: -#line 1176 "ConfigurationInterfaces.c" +#line 1481 "ConfigurationInterfaces.c" { gchar* _tmp33_; #line 200 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1181,11 +1486,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp33_; #line 200 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1185 "ConfigurationInterfaces.c" +#line 1490 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP: -#line 1189 "ConfigurationInterfaces.c" +#line 1494 "ConfigurationInterfaces.c" { gchar* _tmp34_; #line 203 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1194,11 +1499,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp34_; #line 203 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1198 "ConfigurationInterfaces.c" +#line 1503 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED: -#line 1202 "ConfigurationInterfaces.c" +#line 1507 "ConfigurationInterfaces.c" { gchar* _tmp35_; #line 206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1207,11 +1512,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp35_; #line 206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1211 "ConfigurationInterfaces.c" +#line 1516 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_IMPORT_DIR: -#line 1215 "ConfigurationInterfaces.c" +#line 1520 "ConfigurationInterfaces.c" { gchar* _tmp36_; #line 209 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1220,11 +1525,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp36_; #line 209 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1224 "ConfigurationInterfaces.c" +#line 1529 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_KEEP_RELATIVITY: -#line 1228 "ConfigurationInterfaces.c" +#line 1533 "ConfigurationInterfaces.c" { gchar* _tmp37_; #line 212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1233,11 +1538,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp37_; #line 212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1237 "ConfigurationInterfaces.c" +#line 1542 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT: -#line 1241 "ConfigurationInterfaces.c" +#line 1546 "ConfigurationInterfaces.c" { gchar* _tmp38_; #line 215 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1246,11 +1551,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp38_; #line 215 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1250 "ConfigurationInterfaces.c" +#line 1555 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE: -#line 1254 "ConfigurationInterfaces.c" +#line 1559 "ConfigurationInterfaces.c" { gchar* _tmp39_; #line 218 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1259,11 +1564,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp39_; #line 218 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1263 "ConfigurationInterfaces.c" +#line 1568 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH: -#line 1267 "ConfigurationInterfaces.c" +#line 1572 "ConfigurationInterfaces.c" { gchar* _tmp40_; #line 221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1272,11 +1577,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp40_; #line 221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1276 "ConfigurationInterfaces.c" +#line 1581 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_LAST_USED_SERVICE: -#line 1280 "ConfigurationInterfaces.c" +#line 1585 "ConfigurationInterfaces.c" { gchar* _tmp41_; #line 224 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1285,11 +1590,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp41_; #line 224 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1289 "ConfigurationInterfaces.c" +#line 1594 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE: -#line 1293 "ConfigurationInterfaces.c" +#line 1598 "ConfigurationInterfaces.c" { gchar* _tmp42_; #line 227 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1298,11 +1603,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp42_; #line 227 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1302 "ConfigurationInterfaces.c" +#line 1607 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING: -#line 1306 "ConfigurationInterfaces.c" +#line 1611 "ConfigurationInterfaces.c" { gchar* _tmp43_; #line 230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1311,11 +1616,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp43_; #line 230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1315 "ConfigurationInterfaces.c" +#line 1620 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY: -#line 1319 "ConfigurationInterfaces.c" +#line 1624 "ConfigurationInterfaces.c" { gchar* _tmp44_; #line 233 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1324,11 +1629,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp44_; #line 233 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1328 "ConfigurationInterfaces.c" +#line 1633 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT: -#line 1332 "ConfigurationInterfaces.c" +#line 1637 "ConfigurationInterfaces.c" { gchar* _tmp45_; #line 236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1337,11 +1642,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp45_; #line 236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1341 "ConfigurationInterfaces.c" +#line 1646 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE: -#line 1345 "ConfigurationInterfaces.c" +#line 1650 "ConfigurationInterfaces.c" { gchar* _tmp46_; #line 239 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1350,11 +1655,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp46_; #line 239 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1354 "ConfigurationInterfaces.c" +#line 1659 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH: -#line 1358 "ConfigurationInterfaces.c" +#line 1663 "ConfigurationInterfaces.c" { gchar* _tmp47_; #line 242 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1363,11 +1668,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp47_; #line 242 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1367 "ConfigurationInterfaces.c" +#line 1672 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS: -#line 1371 "ConfigurationInterfaces.c" +#line 1676 "ConfigurationInterfaces.c" { gchar* _tmp48_; #line 245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1376,11 +1681,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp48_; #line 245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1380 "ConfigurationInterfaces.c" +#line 1685 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE: -#line 1384 "ConfigurationInterfaces.c" +#line 1689 "ConfigurationInterfaces.c" { gchar* _tmp49_; #line 248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1389,11 +1694,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp49_; #line 248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1393 "ConfigurationInterfaces.c" +#line 1698 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE: -#line 1397 "ConfigurationInterfaces.c" +#line 1702 "ConfigurationInterfaces.c" { gchar* _tmp50_; #line 251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1402,11 +1707,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp50_; #line 251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1406 "ConfigurationInterfaces.c" +#line 1711 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT: -#line 1410 "ConfigurationInterfaces.c" +#line 1715 "ConfigurationInterfaces.c" { gchar* _tmp51_; #line 254 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1415,11 +1720,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp51_; #line 254 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1419 "ConfigurationInterfaces.c" +#line 1724 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT: -#line 1423 "ConfigurationInterfaces.c" +#line 1728 "ConfigurationInterfaces.c" { gchar* _tmp52_; #line 257 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1428,11 +1733,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp52_; #line 257 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1432 "ConfigurationInterfaces.c" +#line 1737 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI: -#line 1436 "ConfigurationInterfaces.c" +#line 1741 "ConfigurationInterfaces.c" { gchar* _tmp53_; #line 260 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1441,11 +1746,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp53_; #line 260 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1445 "ConfigurationInterfaces.c" +#line 1750 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS: -#line 1449 "ConfigurationInterfaces.c" +#line 1754 "ConfigurationInterfaces.c" { gchar* _tmp54_; #line 263 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1454,11 +1759,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp54_; #line 263 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1458 "ConfigurationInterfaces.c" +#line 1763 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH: -#line 1462 "ConfigurationInterfaces.c" +#line 1767 "ConfigurationInterfaces.c" { gchar* _tmp55_; #line 266 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1467,11 +1772,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp55_; #line 266 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1471 "ConfigurationInterfaces.c" +#line 1776 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE: -#line 1475 "ConfigurationInterfaces.c" +#line 1780 "ConfigurationInterfaces.c" { gchar* _tmp56_; #line 269 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1480,11 +1785,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp56_; #line 269 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1484 "ConfigurationInterfaces.c" +#line 1789 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO: -#line 1488 "ConfigurationInterfaces.c" +#line 1793 "ConfigurationInterfaces.c" { gchar* _tmp57_; #line 272 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1493,11 +1798,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp57_; #line 272 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1497 "ConfigurationInterfaces.c" +#line 1802 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES: -#line 1501 "ConfigurationInterfaces.c" +#line 1806 "ConfigurationInterfaces.c" { gchar* _tmp58_; #line 275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1506,11 +1811,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp58_; #line 275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1510 "ConfigurationInterfaces.c" +#line 1815 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION: -#line 1514 "ConfigurationInterfaces.c" +#line 1819 "ConfigurationInterfaces.c" { gchar* _tmp59_; #line 278 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1519,11 +1824,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp59_; #line 278 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1523 "ConfigurationInterfaces.c" +#line 1828 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT: -#line 1527 "ConfigurationInterfaces.c" +#line 1832 "ConfigurationInterfaces.c" { gchar* _tmp60_; #line 281 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1532,11 +1837,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp60_; #line 281 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1536 "ConfigurationInterfaces.c" +#line 1841 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT: -#line 1540 "ConfigurationInterfaces.c" +#line 1845 "ConfigurationInterfaces.c" { gchar* _tmp61_; #line 284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1545,11 +1850,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp61_; #line 284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1549 "ConfigurationInterfaces.c" +#line 1854 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG: -#line 1553 "ConfigurationInterfaces.c" +#line 1858 "ConfigurationInterfaces.c" { gchar* _tmp62_; #line 287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1558,11 +1863,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp62_; #line 287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1562 "ConfigurationInterfaces.c" +#line 1867 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_SIDEBAR_POSITION: -#line 1566 "ConfigurationInterfaces.c" +#line 1871 "ConfigurationInterfaces.c" { gchar* _tmp63_; #line 290 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1571,11 +1876,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp63_; #line 290 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1575 "ConfigurationInterfaces.c" +#line 1880 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY: -#line 1579 "ConfigurationInterfaces.c" +#line 1884 "ConfigurationInterfaces.c" { gchar* _tmp64_; #line 293 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1584,11 +1889,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp64_; #line 293 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1588 "ConfigurationInterfaces.c" +#line 1893 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY: -#line 1592 "ConfigurationInterfaces.c" +#line 1897 "ConfigurationInterfaces.c" { gchar* _tmp65_; #line 296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1597,11 +1902,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp65_; #line 296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1601 "ConfigurationInterfaces.c" +#line 1906 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID: -#line 1605 "ConfigurationInterfaces.c" +#line 1910 "ConfigurationInterfaces.c" { gchar* _tmp66_; #line 299 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1610,11 +1915,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp66_; #line 299 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1614 "ConfigurationInterfaces.c" +#line 1919 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE: -#line 1618 "ConfigurationInterfaces.c" +#line 1923 "ConfigurationInterfaces.c" { gchar* _tmp67_; #line 302 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1623,11 +1928,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp67_; #line 302 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1627 "ConfigurationInterfaces.c" +#line 1932 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME: -#line 1631 "ConfigurationInterfaces.c" +#line 1936 "ConfigurationInterfaces.c" { gchar* _tmp68_; #line 305 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1636,11 +1941,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp68_; #line 305 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1640 "ConfigurationInterfaces.c" +#line 1945 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES: -#line 1644 "ConfigurationInterfaces.c" +#line 1949 "ConfigurationInterfaces.c" { gchar* _tmp69_; #line 308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1649,11 +1954,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp69_; #line 308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1653 "ConfigurationInterfaces.c" +#line 1958 "ConfigurationInterfaces.c" } #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE: -#line 1657 "ConfigurationInterfaces.c" +#line 1962 "ConfigurationInterfaces.c" { gchar* _tmp70_; #line 311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1662,20 +1967,22 @@ gchar* configurable_property_to_string (ConfigurableProperty self) { result = _tmp70_; #line 311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 1666 "ConfigurationInterfaces.c" +#line 1971 "ConfigurationInterfaces.c" } default: { #line 314 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_error ("ConfigurationInterfaces.vala:314: unknown ConfigurableProperty enumera" \ "tion value"); -#line 1672 "ConfigurationInterfaces.c" +#line 1977 "ConfigurationInterfaces.c" } } } -GType configurable_property_get_type (void) { +GType +configurable_property_get_type (void) +{ static volatile gsize configurable_property_type_id__volatile = 0; if (g_once_init_enter (&configurable_property_type_id__volatile)) { static const GEnumValue values[] = {{CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY, "CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY", "auto-import-from-library"}, {CONFIGURABLE_PROPERTY_BG_COLOR_NAME, "CONFIGURABLE_PROPERTY_BG_COLOR_NAME", "bg-color-name"}, {CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE, "CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE", "transparent-background-type"}, {CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR, "CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR", "transparent-background-color"}, {CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS, "CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS", "commit-metadata-to-masters"}, {CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE, "CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE", "desktop-background-file"}, {CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE, "CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE", "desktop-background-mode"}, {CONFIGURABLE_PROPERTY_SCREENSAVER_FILE, "CONFIGURABLE_PROPERTY_SCREENSAVER_FILE", "screensaver-file"}, {CONFIGURABLE_PROPERTY_SCREENSAVER_MODE, "CONFIGURABLE_PROPERTY_SCREENSAVER_MODE", "screensaver-mode"}, {CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN, "CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN", "directory-pattern"}, {CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM, "CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM", "directory-pattern-custom"}, {CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT, "CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT", "direct-window-height"}, {CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE, "CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE", "direct-window-maximize"}, {CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH, "CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH", "direct-window-width"}, {CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES, "CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES", "display-basic-properties"}, {CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS, "CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS", "display-event-comments"}, {CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES, "CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES", "display-extended-properties"}, {CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR, "CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR", "display-sidebar"}, {CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR, "CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR", "display-toolbar"}, {CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR, "CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR", "display-search-bar"}, {CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS, "CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS", "display-photo-ratings"}, {CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS, "CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS", "display-photo-tags"}, {CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES, "CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES", "display-photo-titles"}, {CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS, "CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS", "display-photo-comments"}, {CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING, "CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING", "event-photos-sort-ascending"}, {CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY, "CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY", "event-photos-sort-by"}, {CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING, "CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING", "events-sort-ascending"}, {CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT, "CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT", "export-constraint"}, {CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE, "CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE", "export-export-format-mode"}, {CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA, "CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA", "export-export-metadata"}, {CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT, "CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT", "export-photo-file-format"}, {CONFIGURABLE_PROPERTY_EXPORT_QUALITY, "CONFIGURABLE_PROPERTY_EXPORT_QUALITY", "export-quality"}, {CONFIGURABLE_PROPERTY_EXPORT_SCALE, "CONFIGURABLE_PROPERTY_EXPORT_SCALE", "export-scale"}, {CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP, "CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP", "external-photo-app"}, {CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP, "CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP", "external-raw-app"}, {CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED, "CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED", "hide-photos-already-imported"}, {CONFIGURABLE_PROPERTY_IMPORT_DIR, "CONFIGURABLE_PROPERTY_IMPORT_DIR", "import-dir"}, {CONFIGURABLE_PROPERTY_KEEP_RELATIVITY, "CONFIGURABLE_PROPERTY_KEEP_RELATIVITY", "keep-relativity"}, {CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT, "CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT", "last-crop-height"}, {CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE, "CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE", "last-crop-menu-choice"}, {CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH, "CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH", "last-crop-width"}, {CONFIGURABLE_PROPERTY_LAST_USED_SERVICE, "CONFIGURABLE_PROPERTY_LAST_USED_SERVICE", "last-used-service"}, {CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE, "CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE", "last-used-dataimports-service"}, {CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING, "CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING", "library-photos-sort-ascending"}, {CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY, "CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY", "library-photos-sort-by"}, {CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT, "CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT", "library-window-height"}, {CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE, "CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE", "library-window-maximize"}, {CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH, "CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH", "library-window-width"}, {CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS, "CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS", "modify-originals"}, {CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE, "CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE", "photo-thumbnail-scale"}, {CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE, "CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE", "pin-toolbar-state"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT", "printing-content-height"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT", "printing-content-layout"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI", "printing-content-ppi"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS", "printing-content-units"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH", "printing-content-width"}, {CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE, "CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE", "printing-images-per-page"}, {CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO, "CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO", "printing-match-aspect-ratio"}, {CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES, "CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES", "printing-print-titles"}, {CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION, "CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION", "printing-size-selection"}, {CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT, "CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT", "printing-titles-font"}, {CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT, "CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT", "raw-developer-default"}, {CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG, "CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG", "show-welcome-dialog"}, {CONFIGURABLE_PROPERTY_SIDEBAR_POSITION, "CONFIGURABLE_PROPERTY_SIDEBAR_POSITION", "sidebar-position"}, {CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY, "CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY", "slideshow-delay"}, {CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY, "CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY", "slideshow-transition-delay"}, {CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID, "CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID", "slideshow-transition-effect-id"}, {CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE, "CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE", "slideshow-show-title"}, {CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME, "CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME", "use-24-hour-time"}, {CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES, "CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES", "use-lowercase-filenames"}, {CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE, "CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE", "video-interpreter-state-cookie"}, {CONFIGURABLE_PROPERTY_NUM_PROPERTIES, "CONFIGURABLE_PROPERTY_NUM_PROPERTIES", "num-properties"}, {0, NULL, NULL}}; @@ -1687,205 +1994,314 @@ GType configurable_property_get_type (void) { } -gchar* configuration_engine_get_name (ConfigurationEngine* self) { +gchar* +configuration_engine_get_name (ConfigurationEngine* self) +{ #line 322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), NULL); #line 322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_name (self); -#line 1695 "ConfigurationInterfaces.c" +#line 2004 "ConfigurationInterfaces.c" } -gint configuration_engine_get_int_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error) { +gint +configuration_engine_get_int_property (ConfigurationEngine* self, + ConfigurableProperty p, + GError** error) +{ #line 324 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0); #line 324 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_int_property (self, p, error); -#line 1704 "ConfigurationInterfaces.c" +#line 2017 "ConfigurationInterfaces.c" } -void configuration_engine_set_int_property (ConfigurationEngine* self, ConfigurableProperty p, gint val, GError** error) { +void +configuration_engine_set_int_property (ConfigurationEngine* self, + ConfigurableProperty p, + gint val, + GError** error) +{ #line 325 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_ENGINE (self)); #line 325 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_int_property (self, p, val, error); -#line 1713 "ConfigurationInterfaces.c" +#line 2031 "ConfigurationInterfaces.c" } -gint configuration_engine_get_enum_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error) { +gint +configuration_engine_get_enum_property (ConfigurationEngine* self, + ConfigurableProperty p, + GError** error) +{ #line 327 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0); #line 327 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_enum_property (self, p, error); -#line 1722 "ConfigurationInterfaces.c" +#line 2044 "ConfigurationInterfaces.c" } -void configuration_engine_set_enum_property (ConfigurationEngine* self, ConfigurableProperty p, gint val, GError** error) { +void +configuration_engine_set_enum_property (ConfigurationEngine* self, + ConfigurableProperty p, + gint val, + GError** error) +{ #line 328 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_ENGINE (self)); #line 328 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_enum_property (self, p, val, error); -#line 1731 "ConfigurationInterfaces.c" +#line 2058 "ConfigurationInterfaces.c" } -gchar* configuration_engine_get_string_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error) { +gchar* +configuration_engine_get_string_property (ConfigurationEngine* self, + ConfigurableProperty p, + GError** error) +{ #line 330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), NULL); #line 330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_string_property (self, p, error); -#line 1740 "ConfigurationInterfaces.c" +#line 2071 "ConfigurationInterfaces.c" } -void configuration_engine_set_string_property (ConfigurationEngine* self, ConfigurableProperty p, const gchar* val, GError** error) { +void +configuration_engine_set_string_property (ConfigurationEngine* self, + ConfigurableProperty p, + const gchar* val, + GError** error) +{ #line 331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_ENGINE (self)); #line 331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_string_property (self, p, val, error); -#line 1749 "ConfigurationInterfaces.c" +#line 2085 "ConfigurationInterfaces.c" } -gboolean configuration_engine_get_bool_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error) { +gboolean +configuration_engine_get_bool_property (ConfigurationEngine* self, + ConfigurableProperty p, + GError** error) +{ #line 333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), FALSE); #line 333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_bool_property (self, p, error); -#line 1758 "ConfigurationInterfaces.c" +#line 2098 "ConfigurationInterfaces.c" } -void configuration_engine_set_bool_property (ConfigurationEngine* self, ConfigurableProperty p, gboolean val, GError** error) { +void +configuration_engine_set_bool_property (ConfigurationEngine* self, + ConfigurableProperty p, + gboolean val, + GError** error) +{ #line 334 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_ENGINE (self)); #line 334 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_bool_property (self, p, val, error); -#line 1767 "ConfigurationInterfaces.c" +#line 2112 "ConfigurationInterfaces.c" } -gdouble configuration_engine_get_double_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error) { +gdouble +configuration_engine_get_double_property (ConfigurationEngine* self, + ConfigurableProperty p, + GError** error) +{ #line 336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0.0); #line 336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_double_property (self, p, error); -#line 1776 "ConfigurationInterfaces.c" +#line 2125 "ConfigurationInterfaces.c" } -void configuration_engine_set_double_property (ConfigurationEngine* self, ConfigurableProperty p, gdouble val, GError** error) { +void +configuration_engine_set_double_property (ConfigurationEngine* self, + ConfigurableProperty p, + gdouble val, + GError** error) +{ #line 337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_ENGINE (self)); #line 337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_double_property (self, p, val, error); -#line 1785 "ConfigurationInterfaces.c" +#line 2139 "ConfigurationInterfaces.c" } -gboolean configuration_engine_get_plugin_bool (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gboolean def) { +gboolean +configuration_engine_get_plugin_bool (ConfigurationEngine* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gboolean def) +{ #line 339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), FALSE); #line 339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_plugin_bool (self, domain, id, key, def); -#line 1794 "ConfigurationInterfaces.c" +#line 2154 "ConfigurationInterfaces.c" } -void configuration_engine_set_plugin_bool (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gboolean val) { +void +configuration_engine_set_plugin_bool (ConfigurationEngine* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gboolean val) +{ #line 340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_ENGINE (self)); #line 340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_bool (self, domain, id, key, val); -#line 1803 "ConfigurationInterfaces.c" +#line 2169 "ConfigurationInterfaces.c" } -gdouble configuration_engine_get_plugin_double (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gdouble def) { +gdouble +configuration_engine_get_plugin_double (ConfigurationEngine* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gdouble def) +{ #line 341 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0.0); #line 341 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_plugin_double (self, domain, id, key, def); -#line 1812 "ConfigurationInterfaces.c" +#line 2184 "ConfigurationInterfaces.c" } -void configuration_engine_set_plugin_double (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gdouble val) { +void +configuration_engine_set_plugin_double (ConfigurationEngine* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gdouble val) +{ #line 342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_ENGINE (self)); #line 342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_double (self, domain, id, key, val); -#line 1821 "ConfigurationInterfaces.c" +#line 2199 "ConfigurationInterfaces.c" } -gint configuration_engine_get_plugin_int (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gint def) { +gint +configuration_engine_get_plugin_int (ConfigurationEngine* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gint def) +{ #line 343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0); #line 343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_plugin_int (self, domain, id, key, def); -#line 1830 "ConfigurationInterfaces.c" +#line 2214 "ConfigurationInterfaces.c" } -void configuration_engine_set_plugin_int (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gint val) { +void +configuration_engine_set_plugin_int (ConfigurationEngine* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gint val) +{ #line 344 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_ENGINE (self)); #line 344 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_int (self, domain, id, key, val); -#line 1839 "ConfigurationInterfaces.c" +#line 2229 "ConfigurationInterfaces.c" } -gchar* configuration_engine_get_plugin_string (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* def) { +gchar* +configuration_engine_get_plugin_string (ConfigurationEngine* self, + const gchar* domain, + const gchar* id, + const gchar* key, + const gchar* def) +{ #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), NULL); #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_plugin_string (self, domain, id, key, def); -#line 1848 "ConfigurationInterfaces.c" +#line 2244 "ConfigurationInterfaces.c" } -void configuration_engine_set_plugin_string (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* val) { +void +configuration_engine_set_plugin_string (ConfigurationEngine* self, + const gchar* domain, + const gchar* id, + const gchar* key, + const gchar* val) +{ #line 346 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_ENGINE (self)); #line 346 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_string (self, domain, id, key, val); -#line 1857 "ConfigurationInterfaces.c" +#line 2259 "ConfigurationInterfaces.c" } -void configuration_engine_unset_plugin_key (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key) { +void +configuration_engine_unset_plugin_key (ConfigurationEngine* self, + const gchar* domain, + const gchar* id, + const gchar* key) +{ #line 347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_ENGINE (self)); #line 347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_ENGINE_GET_INTERFACE (self)->unset_plugin_key (self, domain, id, key); -#line 1866 "ConfigurationInterfaces.c" +#line 2273 "ConfigurationInterfaces.c" } -FuzzyPropertyState configuration_engine_is_plugin_enabled (ConfigurationEngine* self, const gchar* id) { +FuzzyPropertyState +configuration_engine_is_plugin_enabled (ConfigurationEngine* self, + const gchar* id) +{ #line 349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0); #line 349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_ENGINE_GET_INTERFACE (self)->is_plugin_enabled (self, id); -#line 1875 "ConfigurationInterfaces.c" +#line 2285 "ConfigurationInterfaces.c" } -void configuration_engine_set_plugin_enabled (ConfigurationEngine* self, const gchar* id, gboolean enabled) { +void +configuration_engine_set_plugin_enabled (ConfigurationEngine* self, + const gchar* id, + gboolean enabled) +{ #line 350 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_ENGINE (self)); #line 350 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_enabled (self, id, enabled); -#line 1884 "ConfigurationInterfaces.c" +#line 2298 "ConfigurationInterfaces.c" } -static void configuration_engine_base_init (ConfigurationEngineIface * iface) { +static void +configuration_engine_base_init (ConfigurationEngineIface * iface) +{ #line 319 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" static gboolean initialized = FALSE; #line 319 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -1894,12 +2310,14 @@ static void configuration_engine_base_init (ConfigurationEngineIface * iface) { initialized = TRUE; #line 319 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" configuration_engine_signals[CONFIGURATION_ENGINE_PROPERTY_CHANGED_SIGNAL] = g_signal_new ("property-changed", TYPE_CONFIGURATION_ENGINE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__ENUM, G_TYPE_NONE, 1, TYPE_CONFIGURABLE_PROPERTY); -#line 1897 "ConfigurationInterfaces.c" +#line 2313 "ConfigurationInterfaces.c" } } -GType configuration_engine_get_type (void) { +GType +configuration_engine_get_type (void) +{ static volatile gsize configuration_engine_type_id__volatile = 0; if (g_once_init_enter (&configuration_engine_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ConfigurationEngineIface), (GBaseInitFunc) configuration_engine_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -1912,160 +2330,162 @@ GType configuration_engine_get_type (void) { } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 366 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return self ? g_object_ref (self) : NULL; -#line 1918 "ConfigurationInterfaces.c" +#line 2338 "ConfigurationInterfaces.c" } -static void _configuration_facade_on_property_changed_configuration_engine_property_changed (ConfigurationEngine* _sender, ConfigurableProperty p, gpointer self) { +static void +_configuration_facade_on_property_changed_configuration_engine_property_changed (ConfigurationEngine* _sender, + ConfigurableProperty p, + gpointer self) +{ #line 368 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" configuration_facade_on_property_changed ((ConfigurationFacade*) self, p); -#line 1925 "ConfigurationInterfaces.c" +#line 2349 "ConfigurationInterfaces.c" } -ConfigurationFacade* configuration_facade_construct (GType object_type, ConfigurationEngine* engine) { +ConfigurationFacade* +configuration_facade_construct (GType object_type, + ConfigurationEngine* engine) +{ ConfigurationFacade * self = NULL; ConfigurationEngine* _tmp0_; - ConfigurationEngine* _tmp1_; - ConfigurationEngine* _tmp2_; #line 365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_ENGINE (engine), NULL); #line 365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" self = (ConfigurationFacade*) g_object_new (object_type, NULL); #line 366 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = engine; -#line 366 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (engine); #line 366 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (self->priv->engine); #line 366 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - self->priv->engine = _tmp1_; + self->priv->engine = _tmp0_; #line 368 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = engine; -#line 368 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - g_signal_connect_object (_tmp2_, "property-changed", (GCallback) _configuration_facade_on_property_changed_configuration_engine_property_changed, self, 0); + g_signal_connect_object (engine, "property-changed", (GCallback) _configuration_facade_on_property_changed_configuration_engine_property_changed, self, 0); #line 365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return self; -#line 1952 "ConfigurationInterfaces.c" +#line 2373 "ConfigurationInterfaces.c" } -static void configuration_facade_on_property_changed (ConfigurationFacade* self, ConfigurableProperty p) { - ConfigurableProperty _tmp0_; +static void +configuration_facade_on_property_changed (ConfigurationFacade* self, + ConfigurableProperty p) +{ + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - ConfigurableProperty _tmp3_; #line 371 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 372 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = p; -#line 372 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp1_ = configurable_property_to_string (_tmp0_); + _tmp0_ = configurable_property_to_string (p); #line 372 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 372 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_debug ("ConfigurationInterfaces.vala:372: ConfigurationFacade: engine reports " \ -"property '%s' changed.", _tmp2_); +"property '%s' changed.", _tmp1_); #line 372 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_free0 (_tmp2_); -#line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = p; + _g_free0 (_tmp1_); #line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - switch (_tmp3_) { + switch (p) { #line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY: -#line 1979 "ConfigurationInterfaces.c" +#line 2397 "ConfigurationInterfaces.c" { #line 376 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_AUTO_IMPORT_FROM_LIBRARY_CHANGED_SIGNAL], 0); #line 377 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" break; -#line 1985 "ConfigurationInterfaces.c" +#line 2403 "ConfigurationInterfaces.c" } #line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_BG_COLOR_NAME: -#line 1989 "ConfigurationInterfaces.c" +#line 2407 "ConfigurationInterfaces.c" { #line 380 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_BG_COLOR_NAME_CHANGED_SIGNAL], 0); #line 381 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" break; -#line 1995 "ConfigurationInterfaces.c" +#line 2413 "ConfigurationInterfaces.c" } #line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE: -#line 1999 "ConfigurationInterfaces.c" +#line 2417 "ConfigurationInterfaces.c" { #line 384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_TRANSPARENT_BACKGROUND_TYPE_CHANGED_SIGNAL], 0); #line 385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" break; -#line 2005 "ConfigurationInterfaces.c" +#line 2423 "ConfigurationInterfaces.c" } #line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR: -#line 2009 "ConfigurationInterfaces.c" +#line 2427 "ConfigurationInterfaces.c" { #line 388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_TRANSPARENT_BACKGROUND_COLOR_CHANGED_SIGNAL], 0); #line 389 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" break; -#line 2015 "ConfigurationInterfaces.c" +#line 2433 "ConfigurationInterfaces.c" } #line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS: -#line 2019 "ConfigurationInterfaces.c" +#line 2437 "ConfigurationInterfaces.c" { #line 392 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_COMMIT_METADATA_TO_MASTERS_CHANGED_SIGNAL], 0); #line 393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" break; -#line 2025 "ConfigurationInterfaces.c" +#line 2443 "ConfigurationInterfaces.c" } #line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING: -#line 2029 "ConfigurationInterfaces.c" +#line 2447 "ConfigurationInterfaces.c" { #line 396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_EVENTS_SORT_ASCENDING_CHANGED_SIGNAL], 0); #line 397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" break; -#line 2035 "ConfigurationInterfaces.c" +#line 2453 "ConfigurationInterfaces.c" } #line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP: #line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP: -#line 2041 "ConfigurationInterfaces.c" +#line 2459 "ConfigurationInterfaces.c" { #line 401 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_EXTERNAL_APP_CHANGED_SIGNAL], 0); #line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" break; -#line 2047 "ConfigurationInterfaces.c" +#line 2465 "ConfigurationInterfaces.c" } #line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" case CONFIGURABLE_PROPERTY_IMPORT_DIR: -#line 2051 "ConfigurationInterfaces.c" +#line 2469 "ConfigurationInterfaces.c" { #line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_IMPORT_DIRECTORY_CHANGED_SIGNAL], 0); #line 406 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" break; -#line 2057 "ConfigurationInterfaces.c" +#line 2475 "ConfigurationInterfaces.c" } default: #line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" break; -#line 2062 "ConfigurationInterfaces.c" +#line 2480 "ConfigurationInterfaces.c" } } -ConfigurationEngine* configuration_facade_get_engine (ConfigurationFacade* self) { +ConfigurationEngine* +configuration_facade_get_engine (ConfigurationFacade* self) +{ ConfigurationEngine* result = NULL; ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; @@ -2079,124 +2499,111 @@ ConfigurationEngine* configuration_facade_get_engine (ConfigurationFacade* self) result = _tmp1_; #line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2081 "ConfigurationInterfaces.c" +#line 2501 "ConfigurationInterfaces.c" } -void configuration_facade_on_configuration_error (ConfigurationFacade* self, GError* err) { - GError* _tmp0_; +void +configuration_facade_on_configuration_error (ConfigurationFacade* self, + GError* err) +{ #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = err; -#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - if (g_error_matches (_tmp0_, CONFIGURATION_ERROR, CONFIGURATION_ERROR_PROPERTY_HAS_NO_VALUE)) { -#line 2093 "ConfigurationInterfaces.c" - ConfigurationEngine* _tmp1_; + if (g_error_matches (err, CONFIGURATION_ERROR, CONFIGURATION_ERROR_PROPERTY_HAS_NO_VALUE)) { +#line 2513 "ConfigurationInterfaces.c" + ConfigurationEngine* _tmp0_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; - GError* _tmp4_; - const gchar* _tmp5_; -#line 416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp1_ = self->priv->engine; + const gchar* _tmp3_; #line 416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = configuration_engine_get_name (_tmp1_); + _tmp0_ = self->priv->engine; #line 416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = _tmp2_; + _tmp1_ = configuration_engine_get_name (_tmp0_); #line 416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = err; + _tmp2_ = _tmp1_; #line 416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = _tmp4_->message; + _tmp3_ = err->message; #line 416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_message ("ConfigurationInterfaces.vala:416: configuration engine '%s' reports PR" \ -"OPERTY_HAS_NO_VALUE error: %s", _tmp3_, _tmp5_); +"OPERTY_HAS_NO_VALUE error: %s", _tmp2_, _tmp3_); #line 416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_free0 (_tmp3_); -#line 2113 "ConfigurationInterfaces.c" + _g_free0 (_tmp2_); +#line 2530 "ConfigurationInterfaces.c" } else { - GError* _tmp6_; #line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; -#line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - if (g_error_matches (_tmp6_, CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR)) { -#line 2120 "ConfigurationInterfaces.c" - ConfigurationEngine* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - GError* _tmp10_; - const gchar* _tmp11_; -#line 420 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp7_ = self->priv->engine; + if (g_error_matches (err, CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR)) { +#line 2534 "ConfigurationInterfaces.c" + ConfigurationEngine* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + const gchar* _tmp7_; #line 420 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp8_ = configuration_engine_get_name (_tmp7_); + _tmp4_ = self->priv->engine; #line 420 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp9_ = _tmp8_; + _tmp5_ = configuration_engine_get_name (_tmp4_); #line 420 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp10_ = err; + _tmp6_ = _tmp5_; #line 420 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp11_ = _tmp10_->message; + _tmp7_ = err->message; #line 420 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_critical ("ConfigurationInterfaces.vala:420: configuration engine '%s' reports EN" \ -"GINE_ERROR: %s", _tmp9_, _tmp11_); +"GINE_ERROR: %s", _tmp6_, _tmp7_); #line 420 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_free0 (_tmp9_); -#line 2140 "ConfigurationInterfaces.c" + _g_free0 (_tmp6_); +#line 2551 "ConfigurationInterfaces.c" } else { - ConfigurationEngine* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; - GError* _tmp15_; - const gchar* _tmp16_; -#line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp12_ = self->priv->engine; + ConfigurationEngine* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + const gchar* _tmp11_; #line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp13_ = configuration_engine_get_name (_tmp12_); + _tmp8_ = self->priv->engine; #line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp14_ = _tmp13_; + _tmp9_ = configuration_engine_get_name (_tmp8_); #line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp15_ = err; + _tmp10_ = _tmp9_; #line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp16_ = _tmp15_->message; + _tmp11_ = err->message; #line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_critical ("ConfigurationInterfaces.vala:423: configuration engine '%s' reports un" \ -"known error: %s", _tmp14_, _tmp16_); +"known error: %s", _tmp10_, _tmp11_); #line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_free0 (_tmp14_); -#line 2161 "ConfigurationInterfaces.c" + _g_free0 (_tmp10_); +#line 2569 "ConfigurationInterfaces.c" } } } -static gboolean configuration_facade_real_get_auto_import_from_library (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_auto_import_from_library (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY, &_inner_error_); -#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2191 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 2598 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2195 "ConfigurationInterfaces.c" +#line 2602 "ConfigurationInterfaces.c" goto __catch91_configuration_error; } #line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2204,35 +2611,35 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur #line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 2204 "ConfigurationInterfaces.c" + return _tmp4_; +#line 2611 "ConfigurationInterfaces.c" } #line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2210 "ConfigurationInterfaces.c" +#line 2617 "ConfigurationInterfaces.c" } goto __finally91; __catch91_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 435 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 435 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2231 "ConfigurationInterfaces.c" +#line 2638 "ConfigurationInterfaces.c" } __finally91: #line 432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2240,41 +2647,43 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur #line 432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 2240 "ConfigurationInterfaces.c" + return _tmp6_; +#line 2647 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_auto_import_from_library (ConfigurationFacade* self) { +gboolean +configuration_facade_get_auto_import_from_library (ConfigurationFacade* self) +{ #line 431 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 431 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_auto_import_from_library (self); -#line 2249 "ConfigurationInterfaces.c" +#line 2658 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_auto_import_from_library (ConfigurationFacade* self, gboolean auto_import) { +static void +configuration_facade_real_set_auto_import_from_library (ConfigurationFacade* self, + gboolean auto_import) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = auto_import; -#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY, auto_import, &_inner_error_); #line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2273 "ConfigurationInterfaces.c" +#line 2682 "ConfigurationInterfaces.c" goto __catch92_configuration_error; } #line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2283,27 +2692,27 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio g_clear_error (&_inner_error_); #line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2282 "ConfigurationInterfaces.c" +#line 2691 "ConfigurationInterfaces.c" } } goto __finally92; __catch92_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 446 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 446 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2302 "ConfigurationInterfaces.c" +#line 2711 "ConfigurationInterfaces.c" } __finally92: #line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2314,21 +2723,26 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio g_clear_error (&_inner_error_); #line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2313 "ConfigurationInterfaces.c" +#line 2722 "ConfigurationInterfaces.c" } } -void configuration_facade_set_auto_import_from_library (ConfigurationFacade* self, gboolean auto_import) { +void +configuration_facade_set_auto_import_from_library (ConfigurationFacade* self, + gboolean auto_import) +{ #line 441 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 441 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_auto_import_from_library (self, auto_import); -#line 2323 "ConfigurationInterfaces.c" +#line 2735 "ConfigurationInterfaces.c" } -static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade* self) { +static gchar* +configuration_facade_real_get_bg_color_name (ConfigurationFacade* self) +{ gchar* result = NULL; GError * _inner_error_ = NULL; { @@ -2354,7 +2768,7 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade* if (G_UNLIKELY (_inner_error_ != NULL)) { #line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2353 "ConfigurationInterfaces.c" +#line 2767 "ConfigurationInterfaces.c" goto __catch93_configuration_error; } #line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2363,7 +2777,7 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade* g_clear_error (&_inner_error_); #line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 2362 "ConfigurationInterfaces.c" +#line 2776 "ConfigurationInterfaces.c" } #line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -2375,7 +2789,7 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade* _g_free0 (_tmp0_); #line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2374 "ConfigurationInterfaces.c" +#line 2788 "ConfigurationInterfaces.c" } goto __finally93; __catch93_configuration_error: @@ -2399,7 +2813,7 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade* _g_error_free0 (err); #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2398 "ConfigurationInterfaces.c" +#line 2812 "ConfigurationInterfaces.c" } __finally93: #line 455 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2408,43 +2822,45 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade* g_clear_error (&_inner_error_); #line 455 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 2407 "ConfigurationInterfaces.c" +#line 2821 "ConfigurationInterfaces.c" } -gchar* configuration_facade_get_bg_color_name (ConfigurationFacade* self) { +gchar* +configuration_facade_get_bg_color_name (ConfigurationFacade* self) +{ #line 454 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 454 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_bg_color_name (self); -#line 2416 "ConfigurationInterfaces.c" +#line 2832 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* self, const gchar* color_name) { +static void +configuration_facade_real_set_bg_color_name (ConfigurationFacade* self, + const gchar* color_name) +{ GError * _inner_error_ = NULL; #line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (color_name != NULL); -#line 2424 "ConfigurationInterfaces.c" +#line 2843 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; #line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = color_name; -#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_BG_COLOR_NAME, _tmp2_, &_inner_error_); + configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_BG_COLOR_NAME, color_name, &_inner_error_); #line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2443 "ConfigurationInterfaces.c" +#line 2859 "ConfigurationInterfaces.c" goto __catch94_configuration_error; } #line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2453,27 +2869,27 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se g_clear_error (&_inner_error_); #line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2452 "ConfigurationInterfaces.c" +#line 2868 "ConfigurationInterfaces.c" } } goto __finally94; __catch94_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 465 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 465 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2472 "ConfigurationInterfaces.c" +#line 2888 "ConfigurationInterfaces.c" } __finally94: #line 465 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2484,21 +2900,26 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se g_clear_error (&_inner_error_); #line 465 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2483 "ConfigurationInterfaces.c" +#line 2899 "ConfigurationInterfaces.c" } } -void configuration_facade_set_bg_color_name (ConfigurationFacade* self, const gchar* color_name) { +void +configuration_facade_set_bg_color_name (ConfigurationFacade* self, + const gchar* color_name) +{ #line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_bg_color_name (self, color_name); -#line 2493 "ConfigurationInterfaces.c" +#line 2912 "ConfigurationInterfaces.c" } -static gchar* configuration_facade_real_get_transparent_background_type (ConfigurationFacade* self) { +static gchar* +configuration_facade_real_get_transparent_background_type (ConfigurationFacade* self) +{ gchar* result = NULL; GError * _inner_error_ = NULL; { @@ -2524,7 +2945,7 @@ static gchar* configuration_facade_real_get_transparent_background_type (Configu if (G_UNLIKELY (_inner_error_ != NULL)) { #line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2523 "ConfigurationInterfaces.c" +#line 2944 "ConfigurationInterfaces.c" goto __catch95_configuration_error; } #line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2533,7 +2954,7 @@ static gchar* configuration_facade_real_get_transparent_background_type (Configu g_clear_error (&_inner_error_); #line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 2532 "ConfigurationInterfaces.c" +#line 2953 "ConfigurationInterfaces.c" } #line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -2545,7 +2966,7 @@ static gchar* configuration_facade_real_get_transparent_background_type (Configu _g_free0 (_tmp0_); #line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2544 "ConfigurationInterfaces.c" +#line 2965 "ConfigurationInterfaces.c" } goto __finally95; __catch95_configuration_error: @@ -2569,7 +2990,7 @@ static gchar* configuration_facade_real_get_transparent_background_type (Configu _g_error_free0 (err); #line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2568 "ConfigurationInterfaces.c" +#line 2989 "ConfigurationInterfaces.c" } __finally95: #line 477 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2578,43 +2999,45 @@ static gchar* configuration_facade_real_get_transparent_background_type (Configu g_clear_error (&_inner_error_); #line 477 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 2577 "ConfigurationInterfaces.c" +#line 2998 "ConfigurationInterfaces.c" } -gchar* configuration_facade_get_transparent_background_type (ConfigurationFacade* self) { +gchar* +configuration_facade_get_transparent_background_type (ConfigurationFacade* self) +{ #line 476 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 476 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_transparent_background_type (self); -#line 2586 "ConfigurationInterfaces.c" +#line 3009 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_transparent_background_type (ConfigurationFacade* self, const gchar* type) { +static void +configuration_facade_real_set_transparent_background_type (ConfigurationFacade* self, + const gchar* type) +{ GError * _inner_error_ = NULL; #line 486 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (type != NULL); -#line 2594 "ConfigurationInterfaces.c" +#line 3020 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; #line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = type; -#line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE, _tmp2_, &_inner_error_); + configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE, type, &_inner_error_); #line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2613 "ConfigurationInterfaces.c" +#line 3036 "ConfigurationInterfaces.c" goto __catch96_configuration_error; } #line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2623,27 +3046,27 @@ static void configuration_facade_real_set_transparent_background_type (Configura g_clear_error (&_inner_error_); #line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2622 "ConfigurationInterfaces.c" +#line 3045 "ConfigurationInterfaces.c" } } goto __finally96; __catch96_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 490 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 490 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2642 "ConfigurationInterfaces.c" +#line 3065 "ConfigurationInterfaces.c" } __finally96: #line 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2654,21 +3077,26 @@ static void configuration_facade_real_set_transparent_background_type (Configura g_clear_error (&_inner_error_); #line 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2653 "ConfigurationInterfaces.c" +#line 3076 "ConfigurationInterfaces.c" } } -void configuration_facade_set_transparent_background_type (ConfigurationFacade* self, const gchar* type) { +void +configuration_facade_set_transparent_background_type (ConfigurationFacade* self, + const gchar* type) +{ #line 486 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 486 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_transparent_background_type (self, type); -#line 2663 "ConfigurationInterfaces.c" +#line 3089 "ConfigurationInterfaces.c" } -static gchar* configuration_facade_real_get_transparent_background_color (ConfigurationFacade* self) { +static gchar* +configuration_facade_real_get_transparent_background_color (ConfigurationFacade* self) +{ gchar* result = NULL; GError * _inner_error_ = NULL; { @@ -2694,7 +3122,7 @@ static gchar* configuration_facade_real_get_transparent_background_color (Config if (G_UNLIKELY (_inner_error_ != NULL)) { #line 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2693 "ConfigurationInterfaces.c" +#line 3121 "ConfigurationInterfaces.c" goto __catch97_configuration_error; } #line 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2703,7 +3131,7 @@ static gchar* configuration_facade_real_get_transparent_background_color (Config g_clear_error (&_inner_error_); #line 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 2702 "ConfigurationInterfaces.c" +#line 3130 "ConfigurationInterfaces.c" } #line 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -2715,7 +3143,7 @@ static gchar* configuration_facade_real_get_transparent_background_color (Config _g_free0 (_tmp0_); #line 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2714 "ConfigurationInterfaces.c" +#line 3142 "ConfigurationInterfaces.c" } goto __finally97; __catch97_configuration_error: @@ -2739,7 +3167,7 @@ static gchar* configuration_facade_real_get_transparent_background_color (Config _g_error_free0 (err); #line 504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2738 "ConfigurationInterfaces.c" +#line 3166 "ConfigurationInterfaces.c" } __finally97: #line 499 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2748,43 +3176,45 @@ static gchar* configuration_facade_real_get_transparent_background_color (Config g_clear_error (&_inner_error_); #line 499 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 2747 "ConfigurationInterfaces.c" +#line 3175 "ConfigurationInterfaces.c" } -gchar* configuration_facade_get_transparent_background_color (ConfigurationFacade* self) { +gchar* +configuration_facade_get_transparent_background_color (ConfigurationFacade* self) +{ #line 498 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 498 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_transparent_background_color (self); -#line 2756 "ConfigurationInterfaces.c" +#line 3186 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_transparent_background_color (ConfigurationFacade* self, const gchar* color_name) { +static void +configuration_facade_real_set_transparent_background_color (ConfigurationFacade* self, + const gchar* color_name) +{ GError * _inner_error_ = NULL; #line 508 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (color_name != NULL); -#line 2764 "ConfigurationInterfaces.c" +#line 3197 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; #line 510 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 510 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 510 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = color_name; -#line 510 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR, _tmp2_, &_inner_error_); + configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR, color_name, &_inner_error_); #line 510 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 510 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 510 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2783 "ConfigurationInterfaces.c" +#line 3213 "ConfigurationInterfaces.c" goto __catch98_configuration_error; } #line 510 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2793,27 +3223,27 @@ static void configuration_facade_real_set_transparent_background_color (Configur g_clear_error (&_inner_error_); #line 510 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2792 "ConfigurationInterfaces.c" +#line 3222 "ConfigurationInterfaces.c" } } goto __finally98; __catch98_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 512 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 512 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 513 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 513 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2812 "ConfigurationInterfaces.c" +#line 3242 "ConfigurationInterfaces.c" } __finally98: #line 509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2824,49 +3254,51 @@ static void configuration_facade_real_set_transparent_background_color (Configur g_clear_error (&_inner_error_); #line 509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2823 "ConfigurationInterfaces.c" +#line 3253 "ConfigurationInterfaces.c" } } -void configuration_facade_set_transparent_background_color (ConfigurationFacade* self, const gchar* color_name) { +void +configuration_facade_set_transparent_background_color (ConfigurationFacade* self, + const gchar* color_name) +{ #line 508 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 508 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_transparent_background_color (self, color_name); -#line 2833 "ConfigurationInterfaces.c" +#line 3266 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_commit_metadata_to_masters (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_commit_metadata_to_masters (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS, &_inner_error_); -#line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2861 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 3293 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2865 "ConfigurationInterfaces.c" +#line 3297 "ConfigurationInterfaces.c" goto __catch99_configuration_error; } #line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2874,35 +3306,35 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config #line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 2874 "ConfigurationInterfaces.c" + return _tmp4_; +#line 3306 "ConfigurationInterfaces.c" } #line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2880 "ConfigurationInterfaces.c" +#line 3312 "ConfigurationInterfaces.c" } goto __finally99; __catch99_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 521 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 521 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 526 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 526 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 526 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2901 "ConfigurationInterfaces.c" +#line 3333 "ConfigurationInterfaces.c" } __finally99: #line 521 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2910,41 +3342,43 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config #line 521 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 521 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 2910 "ConfigurationInterfaces.c" + return _tmp6_; +#line 3342 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_commit_metadata_to_masters (ConfigurationFacade* self) { +gboolean +configuration_facade_get_commit_metadata_to_masters (ConfigurationFacade* self) +{ #line 520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_commit_metadata_to_masters (self); -#line 2919 "ConfigurationInterfaces.c" +#line 3353 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_commit_metadata_to_masters (ConfigurationFacade* self, gboolean commit_metadata) { +static void +configuration_facade_real_set_commit_metadata_to_masters (ConfigurationFacade* self, + gboolean commit_metadata) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = commit_metadata; -#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS, commit_metadata, &_inner_error_); #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2943 "ConfigurationInterfaces.c" +#line 3377 "ConfigurationInterfaces.c" goto __catch100_configuration_error; } #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2953,27 +3387,27 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat g_clear_error (&_inner_error_); #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2952 "ConfigurationInterfaces.c" +#line 3386 "ConfigurationInterfaces.c" } } goto __finally100; __catch100_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2972 "ConfigurationInterfaces.c" +#line 3406 "ConfigurationInterfaces.c" } __finally100: #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2984,21 +3418,26 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat g_clear_error (&_inner_error_); #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2983 "ConfigurationInterfaces.c" +#line 3417 "ConfigurationInterfaces.c" } } -void configuration_facade_set_commit_metadata_to_masters (ConfigurationFacade* self, gboolean commit_metadata) { +void +configuration_facade_set_commit_metadata_to_masters (ConfigurationFacade* self, + gboolean commit_metadata) +{ #line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_commit_metadata_to_masters (self, commit_metadata); -#line 2993 "ConfigurationInterfaces.c" +#line 3430 "ConfigurationInterfaces.c" } -static gchar* configuration_facade_real_get_desktop_background (ConfigurationFacade* self) { +static gchar* +configuration_facade_real_get_desktop_background (ConfigurationFacade* self) +{ gchar* result = NULL; GError * _inner_error_ = NULL; { @@ -3024,7 +3463,7 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac if (G_UNLIKELY (_inner_error_ != NULL)) { #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3023 "ConfigurationInterfaces.c" +#line 3462 "ConfigurationInterfaces.c" goto __catch101_configuration_error; } #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3033,7 +3472,7 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac g_clear_error (&_inner_error_); #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 3032 "ConfigurationInterfaces.c" +#line 3471 "ConfigurationInterfaces.c" } #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -3045,7 +3484,7 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac _g_free0 (_tmp0_); #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 3044 "ConfigurationInterfaces.c" +#line 3483 "ConfigurationInterfaces.c" } goto __finally101; __catch101_configuration_error: @@ -3069,7 +3508,7 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac _g_error_free0 (err); #line 549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 3068 "ConfigurationInterfaces.c" +#line 3507 "ConfigurationInterfaces.c" } __finally101: #line 544 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3078,45 +3517,47 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac g_clear_error (&_inner_error_); #line 544 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 3077 "ConfigurationInterfaces.c" +#line 3516 "ConfigurationInterfaces.c" } -gchar* configuration_facade_get_desktop_background (ConfigurationFacade* self) { +gchar* +configuration_facade_get_desktop_background (ConfigurationFacade* self) +{ #line 543 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 543 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_desktop_background (self); -#line 3086 "ConfigurationInterfaces.c" +#line 3527 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_desktop_background (ConfigurationFacade* self, const gchar* filename) { +static void +configuration_facade_real_set_desktop_background (ConfigurationFacade* self, + const gchar* filename) +{ GError * _inner_error_ = NULL; #line 553 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (filename != NULL); -#line 3094 "ConfigurationInterfaces.c" +#line 3538 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; + ConfigurationEngine* _tmp2_; ConfigurationEngine* _tmp3_; - ConfigurationEngine* _tmp4_; #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = filename; -#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE, _tmp2_, &_inner_error_); + configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE, filename, &_inner_error_); #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3115 "ConfigurationInterfaces.c" +#line 3556 "ConfigurationInterfaces.c" goto __catch102_configuration_error; } #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3125,21 +3566,21 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad g_clear_error (&_inner_error_); #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3124 "ConfigurationInterfaces.c" +#line 3565 "ConfigurationInterfaces.c" } #line 557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = configuration_facade_get_engine (self); + _tmp2_ = configuration_facade_get_engine (self); #line 557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_string_property (_tmp4_, CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE, "zoom", &_inner_error_); + configuration_engine_set_string_property (_tmp3_, CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE, "zoom", &_inner_error_); #line 557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3138 "ConfigurationInterfaces.c" +#line 3579 "ConfigurationInterfaces.c" goto __catch102_configuration_error; } #line 557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3148,25 +3589,25 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad g_clear_error (&_inner_error_); #line 557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3147 "ConfigurationInterfaces.c" +#line 3588 "ConfigurationInterfaces.c" } } goto __finally102; __catch102_configuration_error: { GError* err = NULL; - GError* _tmp5_; + GError* _tmp4_; #line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp4_ = err; #line 560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp4_); #line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 3165 "ConfigurationInterfaces.c" +#line 3606 "ConfigurationInterfaces.c" } __finally102: #line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3177,21 +3618,26 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad g_clear_error (&_inner_error_); #line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3176 "ConfigurationInterfaces.c" +#line 3617 "ConfigurationInterfaces.c" } } -void configuration_facade_set_desktop_background (ConfigurationFacade* self, const gchar* filename) { +void +configuration_facade_set_desktop_background (ConfigurationFacade* self, + const gchar* filename) +{ #line 553 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 553 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_desktop_background (self, filename); -#line 3186 "ConfigurationInterfaces.c" +#line 3630 "ConfigurationInterfaces.c" } -static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* self) { +static gchar* +configuration_facade_real_get_screensaver (ConfigurationFacade* self) +{ gchar* result = NULL; GError * _inner_error_ = NULL; { @@ -3217,7 +3663,7 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se if (G_UNLIKELY (_inner_error_ != NULL)) { #line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3216 "ConfigurationInterfaces.c" +#line 3662 "ConfigurationInterfaces.c" goto __catch103_configuration_error; } #line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3226,7 +3672,7 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se g_clear_error (&_inner_error_); #line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 3225 "ConfigurationInterfaces.c" +#line 3671 "ConfigurationInterfaces.c" } #line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -3238,7 +3684,7 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se _g_free0 (_tmp0_); #line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 3237 "ConfigurationInterfaces.c" +#line 3683 "ConfigurationInterfaces.c" } goto __finally103; __catch103_configuration_error: @@ -3262,7 +3708,7 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se _g_error_free0 (err); #line 573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 3261 "ConfigurationInterfaces.c" +#line 3707 "ConfigurationInterfaces.c" } __finally103: #line 568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3271,45 +3717,47 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se g_clear_error (&_inner_error_); #line 568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 3270 "ConfigurationInterfaces.c" +#line 3716 "ConfigurationInterfaces.c" } -gchar* configuration_facade_get_screensaver (ConfigurationFacade* self) { +gchar* +configuration_facade_get_screensaver (ConfigurationFacade* self) +{ #line 567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_screensaver (self); -#line 3279 "ConfigurationInterfaces.c" +#line 3727 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_screensaver (ConfigurationFacade* self, const gchar* filename) { +static void +configuration_facade_real_set_screensaver (ConfigurationFacade* self, + const gchar* filename) +{ GError * _inner_error_ = NULL; #line 577 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (filename != NULL); -#line 3287 "ConfigurationInterfaces.c" +#line 3738 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; + ConfigurationEngine* _tmp2_; ConfigurationEngine* _tmp3_; - ConfigurationEngine* _tmp4_; #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = filename; -#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_SCREENSAVER_FILE, _tmp2_, &_inner_error_); + configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_SCREENSAVER_FILE, filename, &_inner_error_); #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3308 "ConfigurationInterfaces.c" +#line 3756 "ConfigurationInterfaces.c" goto __catch104_configuration_error; } #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3318,21 +3766,21 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self g_clear_error (&_inner_error_); #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3317 "ConfigurationInterfaces.c" +#line 3765 "ConfigurationInterfaces.c" } #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = configuration_facade_get_engine (self); + _tmp2_ = configuration_facade_get_engine (self); #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_string_property (_tmp4_, CONFIGURABLE_PROPERTY_SCREENSAVER_MODE, "zoom", &_inner_error_); + configuration_engine_set_string_property (_tmp3_, CONFIGURABLE_PROPERTY_SCREENSAVER_MODE, "zoom", &_inner_error_); #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3331 "ConfigurationInterfaces.c" +#line 3779 "ConfigurationInterfaces.c" goto __catch104_configuration_error; } #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3341,25 +3789,25 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self g_clear_error (&_inner_error_); #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3340 "ConfigurationInterfaces.c" +#line 3788 "ConfigurationInterfaces.c" } } goto __finally104; __catch104_configuration_error: { GError* err = NULL; - GError* _tmp5_; + GError* _tmp4_; #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp4_ = err; #line 584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp4_); #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 3358 "ConfigurationInterfaces.c" +#line 3806 "ConfigurationInterfaces.c" } __finally104: #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3370,21 +3818,26 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self g_clear_error (&_inner_error_); #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3369 "ConfigurationInterfaces.c" +#line 3817 "ConfigurationInterfaces.c" } } -void configuration_facade_set_screensaver (ConfigurationFacade* self, const gchar* filename) { +void +configuration_facade_set_screensaver (ConfigurationFacade* self, + const gchar* filename) +{ #line 577 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 577 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_screensaver (self, filename); -#line 3379 "ConfigurationInterfaces.c" +#line 3830 "ConfigurationInterfaces.c" } -static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFacade* self) { +static gchar* +configuration_facade_real_get_directory_pattern (ConfigurationFacade* self) +{ gchar* result = NULL; GError * _inner_error_ = NULL; { @@ -3411,7 +3864,7 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca if (G_UNLIKELY (_inner_error_ != NULL)) { #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3410 "ConfigurationInterfaces.c" +#line 3863 "ConfigurationInterfaces.c" goto __catch105_configuration_error; } #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3420,17 +3873,17 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca g_clear_error (&_inner_error_); #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 3419 "ConfigurationInterfaces.c" +#line 3872 "ConfigurationInterfaces.c" } #line 594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (g_strcmp0 (s, "") == 0) { #line 594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp4_ = NULL; -#line 3425 "ConfigurationInterfaces.c" +#line 3878 "ConfigurationInterfaces.c" } else { #line 594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp4_ = s; -#line 3429 "ConfigurationInterfaces.c" +#line 3882 "ConfigurationInterfaces.c" } #line 594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = g_strdup (_tmp4_); @@ -3440,7 +3893,7 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca _g_free0 (s); #line 594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 3439 "ConfigurationInterfaces.c" +#line 3892 "ConfigurationInterfaces.c" } goto __finally105; __catch105_configuration_error: @@ -3464,7 +3917,7 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca _g_error_free0 (err); #line 598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 3463 "ConfigurationInterfaces.c" +#line 3916 "ConfigurationInterfaces.c" } __finally105: #line 592 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3473,49 +3926,48 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca g_clear_error (&_inner_error_); #line 592 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 3472 "ConfigurationInterfaces.c" +#line 3925 "ConfigurationInterfaces.c" } -gchar* configuration_facade_get_directory_pattern (ConfigurationFacade* self) { +gchar* +configuration_facade_get_directory_pattern (ConfigurationFacade* self) +{ #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_directory_pattern (self); -#line 3481 "ConfigurationInterfaces.c" +#line 3936 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_directory_pattern (ConfigurationFacade* self, const gchar* s) { +static void +configuration_facade_real_set_directory_pattern (ConfigurationFacade* self, + const gchar* s) +{ GError * _inner_error_ = NULL; { - const gchar* _tmp0_; + ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - ConfigurationEngine* _tmp2_; - const gchar* _tmp3_; #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = s; -#line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - if (_tmp0_ == NULL) { + if (s == NULL) { #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" s = ""; -#line 3498 "ConfigurationInterfaces.c" +#line 3952 "ConfigurationInterfaces.c" } #line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp1_ = configuration_facade_get_engine (self); -#line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = _tmp1_; + _tmp0_ = configuration_facade_get_engine (self); #line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = s; + _tmp1_ = _tmp0_; #line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_string_property (_tmp2_, CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN, _tmp3_, &_inner_error_); + configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN, s, &_inner_error_); #line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3514 "ConfigurationInterfaces.c" +#line 3966 "ConfigurationInterfaces.c" goto __catch106_configuration_error; } #line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3524,25 +3976,25 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade g_clear_error (&_inner_error_); #line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3523 "ConfigurationInterfaces.c" +#line 3975 "ConfigurationInterfaces.c" } } goto __finally106; __catch106_configuration_error: { GError* err = NULL; - GError* _tmp4_; + GError* _tmp2_; #line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = err; + _tmp2_ = err; #line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp4_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 3541 "ConfigurationInterfaces.c" +#line 3993 "ConfigurationInterfaces.c" } __finally106: #line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3553,21 +4005,26 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade g_clear_error (&_inner_error_); #line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3552 "ConfigurationInterfaces.c" +#line 4004 "ConfigurationInterfaces.c" } } -void configuration_facade_set_directory_pattern (ConfigurationFacade* self, const gchar* s) { +void +configuration_facade_set_directory_pattern (ConfigurationFacade* self, + const gchar* s) +{ #line 602 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 602 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_directory_pattern (self, s); -#line 3562 "ConfigurationInterfaces.c" +#line 4017 "ConfigurationInterfaces.c" } -static gchar* configuration_facade_real_get_directory_pattern_custom (ConfigurationFacade* self) { +static gchar* +configuration_facade_real_get_directory_pattern_custom (ConfigurationFacade* self) +{ gchar* result = NULL; GError * _inner_error_ = NULL; { @@ -3593,7 +4050,7 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat if (G_UNLIKELY (_inner_error_ != NULL)) { #line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3592 "ConfigurationInterfaces.c" +#line 4049 "ConfigurationInterfaces.c" goto __catch107_configuration_error; } #line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3602,7 +4059,7 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat g_clear_error (&_inner_error_); #line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 3601 "ConfigurationInterfaces.c" +#line 4058 "ConfigurationInterfaces.c" } #line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -3614,7 +4071,7 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat _g_free0 (_tmp0_); #line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 3613 "ConfigurationInterfaces.c" +#line 4070 "ConfigurationInterfaces.c" } goto __finally107; __catch107_configuration_error: @@ -3638,7 +4095,7 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat _g_error_free0 (err); #line 622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 3637 "ConfigurationInterfaces.c" +#line 4094 "ConfigurationInterfaces.c" } __finally107: #line 617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3647,43 +4104,45 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat g_clear_error (&_inner_error_); #line 617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 3646 "ConfigurationInterfaces.c" +#line 4103 "ConfigurationInterfaces.c" } -gchar* configuration_facade_get_directory_pattern_custom (ConfigurationFacade* self) { +gchar* +configuration_facade_get_directory_pattern_custom (ConfigurationFacade* self) +{ #line 616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_directory_pattern_custom (self); -#line 3655 "ConfigurationInterfaces.c" +#line 4114 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_directory_pattern_custom (ConfigurationFacade* self, const gchar* s) { +static void +configuration_facade_real_set_directory_pattern_custom (ConfigurationFacade* self, + const gchar* s) +{ GError * _inner_error_ = NULL; #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (s != NULL); -#line 3663 "ConfigurationInterfaces.c" +#line 4125 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; #line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = s; -#line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM, _tmp2_, &_inner_error_); + configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM, s, &_inner_error_); #line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3682 "ConfigurationInterfaces.c" +#line 4141 "ConfigurationInterfaces.c" goto __catch108_configuration_error; } #line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3692,25 +4151,25 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio g_clear_error (&_inner_error_); #line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3691 "ConfigurationInterfaces.c" +#line 4150 "ConfigurationInterfaces.c" } } goto __finally108; __catch108_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 3709 "ConfigurationInterfaces.c" +#line 4168 "ConfigurationInterfaces.c" } __finally108: #line 627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3721,21 +4180,28 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio g_clear_error (&_inner_error_); #line 627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3720 "ConfigurationInterfaces.c" +#line 4179 "ConfigurationInterfaces.c" } } -void configuration_facade_set_directory_pattern_custom (ConfigurationFacade* self, const gchar* s) { +void +configuration_facade_set_directory_pattern_custom (ConfigurationFacade* self, + const gchar* s) +{ #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_directory_pattern_custom (self, s); -#line 3730 "ConfigurationInterfaces.c" +#line 4192 "ConfigurationInterfaces.c" } -static void configuration_facade_real_get_direct_window_state (ConfigurationFacade* self, gboolean* maximize, Dimensions* dimensions) { +static void +configuration_facade_real_get_direct_window_state (ConfigurationFacade* self, + gboolean* maximize, + Dimensions* dimensions) +{ gboolean _vala_maximize = FALSE; Dimensions _vala_dimensions = {0}; GError * _inner_error_ = NULL; @@ -3743,42 +4209,37 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca _vala_maximize = FALSE; #line 639 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" dimensions_init (&_vala_dimensions, 1024, 768); -#line 3742 "ConfigurationInterfaces.c" +#line 4208 "ConfigurationInterfaces.c" { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; gint w = 0; + ConfigurationEngine* _tmp4_; ConfigurationEngine* _tmp5_; - ConfigurationEngine* _tmp6_; - gint _tmp7_; - gint _tmp8_; + gint _tmp6_; gint h = 0; - ConfigurationEngine* _tmp9_; - ConfigurationEngine* _tmp10_; + ConfigurationEngine* _tmp7_; + ConfigurationEngine* _tmp8_; + gint _tmp9_; + gint _tmp10_; gint _tmp11_; - gint _tmp12_; - gint _tmp13_; - gint _tmp14_; #line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE, &_inner_error_); -#line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3777 "ConfigurationInterfaces.c" +#line 4238 "ConfigurationInterfaces.c" goto __catch109_configuration_error; } #line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3787,27 +4248,25 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca g_clear_error (&_inner_error_); #line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3786 "ConfigurationInterfaces.c" +#line 4247 "ConfigurationInterfaces.c" } #line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _vala_maximize = _tmp0_; #line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = configuration_facade_get_engine (self); -#line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = _tmp5_; + _tmp4_ = configuration_facade_get_engine (self); #line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp7_ = configuration_engine_get_int_property (_tmp6_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH, &_inner_error_); + _tmp5_ = _tmp4_; #line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp8_ = _tmp7_; + _tmp6_ = configuration_engine_get_int_property (_tmp5_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH, &_inner_error_); #line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp5_); #line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - w = _tmp8_; + w = _tmp6_; #line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3806 "ConfigurationInterfaces.c" +#line 4265 "ConfigurationInterfaces.c" goto __catch109_configuration_error; } #line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3816,25 +4275,23 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca g_clear_error (&_inner_error_); #line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3815 "ConfigurationInterfaces.c" +#line 4274 "ConfigurationInterfaces.c" } #line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp9_ = configuration_facade_get_engine (self); -#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp10_ = _tmp9_; + _tmp7_ = configuration_facade_get_engine (self); #line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp11_ = configuration_engine_get_int_property (_tmp10_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT, &_inner_error_); + _tmp8_ = _tmp7_; #line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp12_ = _tmp11_; + _tmp9_ = configuration_engine_get_int_property (_tmp8_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT, &_inner_error_); #line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - h = _tmp12_; + h = _tmp9_; #line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3833 "ConfigurationInterfaces.c" +#line 4290 "ConfigurationInterfaces.c" goto __catch109_configuration_error; } #line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3843,32 +4300,32 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca g_clear_error (&_inner_error_); #line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3842 "ConfigurationInterfaces.c" +#line 4299 "ConfigurationInterfaces.c" } #line 644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp13_ = w; + _tmp10_ = w; #line 644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp14_ = h; + _tmp11_ = h; #line 644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - dimensions_init (&_vala_dimensions, _tmp13_, _tmp14_); -#line 3850 "ConfigurationInterfaces.c" + dimensions_init (&_vala_dimensions, _tmp10_, _tmp11_); +#line 4307 "ConfigurationInterfaces.c" } goto __finally109; __catch109_configuration_error: { GError* err = NULL; - GError* _tmp15_; + GError* _tmp12_; #line 640 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 640 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp15_ = err; + _tmp12_ = err; #line 646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp15_); + configuration_facade_on_configuration_error (self, _tmp12_); #line 640 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 3867 "ConfigurationInterfaces.c" +#line 4324 "ConfigurationInterfaces.c" } __finally109: #line 640 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3879,64 +4336,69 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca g_clear_error (&_inner_error_); #line 640 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3878 "ConfigurationInterfaces.c" +#line 4335 "ConfigurationInterfaces.c" } #line 637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (maximize) { #line 637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" *maximize = _vala_maximize; -#line 3884 "ConfigurationInterfaces.c" +#line 4341 "ConfigurationInterfaces.c" } #line 637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (dimensions) { #line 637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" *dimensions = _vala_dimensions; -#line 3890 "ConfigurationInterfaces.c" +#line 4347 "ConfigurationInterfaces.c" } } -void configuration_facade_get_direct_window_state (ConfigurationFacade* self, gboolean* maximize, Dimensions* dimensions) { +void +configuration_facade_get_direct_window_state (ConfigurationFacade* self, + gboolean* maximize, + Dimensions* dimensions) +{ #line 637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->get_direct_window_state (self, maximize, dimensions); -#line 3900 "ConfigurationInterfaces.c" +#line 4361 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_direct_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions) { +static void +configuration_facade_real_set_direct_window_state (ConfigurationFacade* self, + gboolean maximize, + Dimensions* dimensions) +{ GError * _inner_error_ = NULL; #line 650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (dimensions != NULL); -#line 3908 "ConfigurationInterfaces.c" +#line 4373 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; + ConfigurationEngine* _tmp2_; ConfigurationEngine* _tmp3_; - ConfigurationEngine* _tmp4_; - Dimensions _tmp5_; - gint _tmp6_; + Dimensions _tmp4_; + gint _tmp5_; + ConfigurationEngine* _tmp6_; ConfigurationEngine* _tmp7_; - ConfigurationEngine* _tmp8_; - Dimensions _tmp9_; - gint _tmp10_; + Dimensions _tmp8_; + gint _tmp9_; #line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = maximize; -#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE, maximize, &_inner_error_); #line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3935 "ConfigurationInterfaces.c" +#line 4397 "ConfigurationInterfaces.c" goto __catch110_configuration_error; } #line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3945,25 +4407,25 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca g_clear_error (&_inner_error_); #line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3944 "ConfigurationInterfaces.c" +#line 4406 "ConfigurationInterfaces.c" } #line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = configuration_facade_get_engine (self); + _tmp2_ = configuration_facade_get_engine (self); #line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = *dimensions; + _tmp4_ = *dimensions; #line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = _tmp5_.width; + _tmp5_ = _tmp4_.width; #line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_int_property (_tmp4_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH, _tmp6_, &_inner_error_); + configuration_engine_set_int_property (_tmp3_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH, _tmp5_, &_inner_error_); #line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3962 "ConfigurationInterfaces.c" +#line 4424 "ConfigurationInterfaces.c" goto __catch110_configuration_error; } #line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3972,25 +4434,25 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca g_clear_error (&_inner_error_); #line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3971 "ConfigurationInterfaces.c" +#line 4433 "ConfigurationInterfaces.c" } #line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp7_ = configuration_facade_get_engine (self); + _tmp6_ = configuration_facade_get_engine (self); #line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp9_ = *dimensions; + _tmp8_ = *dimensions; #line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp10_ = _tmp9_.height; + _tmp9_ = _tmp8_.height; #line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_int_property (_tmp8_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT, _tmp10_, &_inner_error_); + configuration_engine_set_int_property (_tmp7_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT, _tmp9_, &_inner_error_); #line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3989 "ConfigurationInterfaces.c" +#line 4451 "ConfigurationInterfaces.c" goto __catch110_configuration_error; } #line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3999,25 +4461,25 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca g_clear_error (&_inner_error_); #line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3998 "ConfigurationInterfaces.c" +#line 4460 "ConfigurationInterfaces.c" } } goto __finally110; __catch110_configuration_error: { GError* err = NULL; - GError* _tmp11_; + GError* _tmp10_; #line 651 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 651 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp11_ = err; + _tmp10_ = err; #line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp11_); + configuration_facade_on_configuration_error (self, _tmp10_); #line 651 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 4016 "ConfigurationInterfaces.c" +#line 4478 "ConfigurationInterfaces.c" } __finally110: #line 651 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4028,49 +4490,52 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca g_clear_error (&_inner_error_); #line 651 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4027 "ConfigurationInterfaces.c" +#line 4489 "ConfigurationInterfaces.c" } } -void configuration_facade_set_direct_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions) { +void +configuration_facade_set_direct_window_state (ConfigurationFacade* self, + gboolean maximize, + Dimensions* dimensions) +{ #line 650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_direct_window_state (self, maximize, dimensions); -#line 4037 "ConfigurationInterfaces.c" +#line 4503 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_display_basic_properties (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_display_basic_properties (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES, &_inner_error_); -#line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4065 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 4530 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4069 "ConfigurationInterfaces.c" +#line 4534 "ConfigurationInterfaces.c" goto __catch111_configuration_error; } #line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4078,35 +4543,35 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur #line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 4078 "ConfigurationInterfaces.c" + return _tmp4_; +#line 4543 "ConfigurationInterfaces.c" } #line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4084 "ConfigurationInterfaces.c" +#line 4549 "ConfigurationInterfaces.c" } goto __finally111; __catch111_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = TRUE; #line 671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4105 "ConfigurationInterfaces.c" +#line 4570 "ConfigurationInterfaces.c" } __finally111: #line 666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4114,41 +4579,43 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur #line 666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 4114 "ConfigurationInterfaces.c" + return _tmp6_; +#line 4579 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_display_basic_properties (ConfigurationFacade* self) { +gboolean +configuration_facade_get_display_basic_properties (ConfigurationFacade* self) +{ #line 665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_basic_properties (self); -#line 4123 "ConfigurationInterfaces.c" +#line 4590 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_display_basic_properties (ConfigurationFacade* self, gboolean display) { +static void +configuration_facade_real_set_display_basic_properties (ConfigurationFacade* self, + gboolean display) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = display; -#line 677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES, display, &_inner_error_); #line 677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4147 "ConfigurationInterfaces.c" +#line 4614 "ConfigurationInterfaces.c" goto __catch112_configuration_error; } #line 677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4157,25 +4624,25 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio g_clear_error (&_inner_error_); #line 677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4156 "ConfigurationInterfaces.c" +#line 4623 "ConfigurationInterfaces.c" } } goto __finally112; __catch112_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 4174 "ConfigurationInterfaces.c" +#line 4641 "ConfigurationInterfaces.c" } __finally112: #line 676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4186,49 +4653,51 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio g_clear_error (&_inner_error_); #line 676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4185 "ConfigurationInterfaces.c" +#line 4652 "ConfigurationInterfaces.c" } } -void configuration_facade_set_display_basic_properties (ConfigurationFacade* self, gboolean display) { +void +configuration_facade_set_display_basic_properties (ConfigurationFacade* self, + gboolean display) +{ #line 675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_display_basic_properties (self, display); -#line 4195 "ConfigurationInterfaces.c" +#line 4665 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_display_extended_properties (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_display_extended_properties (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES, &_inner_error_); -#line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4223 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 4692 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4227 "ConfigurationInterfaces.c" +#line 4696 "ConfigurationInterfaces.c" goto __catch113_configuration_error; } #line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4236,35 +4705,35 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi #line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 4236 "ConfigurationInterfaces.c" + return _tmp4_; +#line 4705 "ConfigurationInterfaces.c" } #line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4242 "ConfigurationInterfaces.c" +#line 4711 "ConfigurationInterfaces.c" } goto __finally113; __catch113_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 692 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 692 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 692 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4263 "ConfigurationInterfaces.c" +#line 4732 "ConfigurationInterfaces.c" } __finally113: #line 687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4272,41 +4741,43 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi #line 687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 4272 "ConfigurationInterfaces.c" + return _tmp6_; +#line 4741 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_display_extended_properties (ConfigurationFacade* self) { +gboolean +configuration_facade_get_display_extended_properties (ConfigurationFacade* self) +{ #line 686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_extended_properties (self); -#line 4281 "ConfigurationInterfaces.c" +#line 4752 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_display_extended_properties (ConfigurationFacade* self, gboolean display) { +static void +configuration_facade_real_set_display_extended_properties (ConfigurationFacade* self, + gboolean display) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = display; -#line 698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES, display, &_inner_error_); #line 698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4305 "ConfigurationInterfaces.c" +#line 4776 "ConfigurationInterfaces.c" goto __catch114_configuration_error; } #line 698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4315,25 +4786,25 @@ static void configuration_facade_real_set_display_extended_properties (Configura g_clear_error (&_inner_error_); #line 698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4314 "ConfigurationInterfaces.c" +#line 4785 "ConfigurationInterfaces.c" } } goto __finally114; __catch114_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 4332 "ConfigurationInterfaces.c" +#line 4803 "ConfigurationInterfaces.c" } __finally114: #line 697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4344,49 +4815,51 @@ static void configuration_facade_real_set_display_extended_properties (Configura g_clear_error (&_inner_error_); #line 697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4343 "ConfigurationInterfaces.c" +#line 4814 "ConfigurationInterfaces.c" } } -void configuration_facade_set_display_extended_properties (ConfigurationFacade* self, gboolean display) { +void +configuration_facade_set_display_extended_properties (ConfigurationFacade* self, + gboolean display) +{ #line 696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_display_extended_properties (self, display); -#line 4353 "ConfigurationInterfaces.c" +#line 4827 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_display_sidebar (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR, &_inner_error_); -#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4381 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 4854 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4385 "ConfigurationInterfaces.c" +#line 4858 "ConfigurationInterfaces.c" goto __catch115_configuration_error; } #line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4394,35 +4867,35 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca #line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 4394 "ConfigurationInterfaces.c" + return _tmp4_; +#line 4867 "ConfigurationInterfaces.c" } #line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4400 "ConfigurationInterfaces.c" +#line 4873 "ConfigurationInterfaces.c" } goto __finally115; __catch115_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 714 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 714 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 714 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4421 "ConfigurationInterfaces.c" +#line 4894 "ConfigurationInterfaces.c" } __finally115: #line 709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4430,41 +4903,43 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca #line 709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 4430 "ConfigurationInterfaces.c" + return _tmp6_; +#line 4903 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_display_sidebar (ConfigurationFacade* self) { +gboolean +configuration_facade_get_display_sidebar (ConfigurationFacade* self) +{ #line 708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_sidebar (self); -#line 4439 "ConfigurationInterfaces.c" +#line 4914 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_display_sidebar (ConfigurationFacade* self, gboolean display) { +static void +configuration_facade_real_set_display_sidebar (ConfigurationFacade* self, + gboolean display) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = display; -#line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR, display, &_inner_error_); #line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4463 "ConfigurationInterfaces.c" +#line 4938 "ConfigurationInterfaces.c" goto __catch116_configuration_error; } #line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4473,25 +4948,25 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade* g_clear_error (&_inner_error_); #line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4472 "ConfigurationInterfaces.c" +#line 4947 "ConfigurationInterfaces.c" } } goto __finally116; __catch116_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 4490 "ConfigurationInterfaces.c" +#line 4965 "ConfigurationInterfaces.c" } __finally116: #line 719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4502,49 +4977,51 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade* g_clear_error (&_inner_error_); #line 719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4501 "ConfigurationInterfaces.c" +#line 4976 "ConfigurationInterfaces.c" } } -void configuration_facade_set_display_sidebar (ConfigurationFacade* self, gboolean display) { +void +configuration_facade_set_display_sidebar (ConfigurationFacade* self, + gboolean display) +{ #line 718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_display_sidebar (self, display); -#line 4511 "ConfigurationInterfaces.c" +#line 4989 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_display_toolbar (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR, &_inner_error_); -#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4539 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 5016 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4543 "ConfigurationInterfaces.c" +#line 5020 "ConfigurationInterfaces.c" goto __catch117_configuration_error; } #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4552,35 +5029,35 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 4552 "ConfigurationInterfaces.c" + return _tmp4_; +#line 5029 "ConfigurationInterfaces.c" } #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4558 "ConfigurationInterfaces.c" +#line 5035 "ConfigurationInterfaces.c" } goto __finally117; __catch117_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4579 "ConfigurationInterfaces.c" +#line 5056 "ConfigurationInterfaces.c" } __finally117: #line 731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4588,41 +5065,43 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca #line 731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 4588 "ConfigurationInterfaces.c" + return _tmp6_; +#line 5065 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_display_toolbar (ConfigurationFacade* self) { +gboolean +configuration_facade_get_display_toolbar (ConfigurationFacade* self) +{ #line 730 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 730 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_toolbar (self); -#line 4597 "ConfigurationInterfaces.c" +#line 5076 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_display_toolbar (ConfigurationFacade* self, gboolean display) { +static void +configuration_facade_real_set_display_toolbar (ConfigurationFacade* self, + gboolean display) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = display; -#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR, display, &_inner_error_); #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4621 "ConfigurationInterfaces.c" +#line 5100 "ConfigurationInterfaces.c" goto __catch118_configuration_error; } #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4631,25 +5110,25 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade* g_clear_error (&_inner_error_); #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4630 "ConfigurationInterfaces.c" +#line 5109 "ConfigurationInterfaces.c" } } goto __finally118; __catch118_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 741 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 741 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 744 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 744 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 741 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 4648 "ConfigurationInterfaces.c" +#line 5127 "ConfigurationInterfaces.c" } __finally118: #line 741 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4660,49 +5139,51 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade* g_clear_error (&_inner_error_); #line 741 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4659 "ConfigurationInterfaces.c" +#line 5138 "ConfigurationInterfaces.c" } } -void configuration_facade_set_display_toolbar (ConfigurationFacade* self, gboolean display) { +void +configuration_facade_set_display_toolbar (ConfigurationFacade* self, + gboolean display) +{ #line 740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_display_toolbar (self, display); -#line 4669 "ConfigurationInterfaces.c" +#line 5151 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_display_search_bar (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_display_search_bar (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR, &_inner_error_); -#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4697 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 5178 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4701 "ConfigurationInterfaces.c" +#line 5182 "ConfigurationInterfaces.c" goto __catch119_configuration_error; } #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4710,35 +5191,35 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 4710 "ConfigurationInterfaces.c" + return _tmp4_; +#line 5191 "ConfigurationInterfaces.c" } #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4716 "ConfigurationInterfaces.c" +#line 5197 "ConfigurationInterfaces.c" } goto __finally119; __catch119_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 755 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 755 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 757 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 757 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 757 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4737 "ConfigurationInterfaces.c" +#line 5218 "ConfigurationInterfaces.c" } __finally119: #line 752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4746,41 +5227,43 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF #line 752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 4746 "ConfigurationInterfaces.c" + return _tmp6_; +#line 5227 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_display_search_bar (ConfigurationFacade* self) { +gboolean +configuration_facade_get_display_search_bar (ConfigurationFacade* self) +{ #line 751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_search_bar (self); -#line 4755 "ConfigurationInterfaces.c" +#line 5238 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_display_search_bar (ConfigurationFacade* self, gboolean display) { +static void +configuration_facade_real_set_display_search_bar (ConfigurationFacade* self, + gboolean display) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = display; -#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR, display, &_inner_error_); #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4779 "ConfigurationInterfaces.c" +#line 5262 "ConfigurationInterfaces.c" goto __catch120_configuration_error; } #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4789,25 +5272,25 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad g_clear_error (&_inner_error_); #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4788 "ConfigurationInterfaces.c" +#line 5271 "ConfigurationInterfaces.c" } } goto __finally120; __catch120_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 4806 "ConfigurationInterfaces.c" +#line 5289 "ConfigurationInterfaces.c" } __finally120: #line 762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4818,49 +5301,51 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad g_clear_error (&_inner_error_); #line 762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4817 "ConfigurationInterfaces.c" +#line 5300 "ConfigurationInterfaces.c" } } -void configuration_facade_set_display_search_bar (ConfigurationFacade* self, gboolean display) { +void +configuration_facade_set_display_search_bar (ConfigurationFacade* self, + gboolean display) +{ #line 761 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 761 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_display_search_bar (self, display); -#line 4827 "ConfigurationInterfaces.c" +#line 5313 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_display_photo_ratings (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_display_photo_ratings (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS, &_inner_error_); -#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4855 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 5340 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4859 "ConfigurationInterfaces.c" +#line 5344 "ConfigurationInterfaces.c" goto __catch121_configuration_error; } #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4868,35 +5353,35 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 4868 "ConfigurationInterfaces.c" + return _tmp4_; +#line 5353 "ConfigurationInterfaces.c" } #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4874 "ConfigurationInterfaces.c" +#line 5359 "ConfigurationInterfaces.c" } goto __finally121; __catch121_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 776 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 776 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = TRUE; #line 778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4895 "ConfigurationInterfaces.c" +#line 5380 "ConfigurationInterfaces.c" } __finally121: #line 773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4904,41 +5389,43 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati #line 773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 4904 "ConfigurationInterfaces.c" + return _tmp6_; +#line 5389 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_display_photo_ratings (ConfigurationFacade* self) { +gboolean +configuration_facade_get_display_photo_ratings (ConfigurationFacade* self) +{ #line 772 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 772 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_ratings (self); -#line 4913 "ConfigurationInterfaces.c" +#line 5400 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_display_photo_ratings (ConfigurationFacade* self, gboolean display) { +static void +configuration_facade_real_set_display_photo_ratings (ConfigurationFacade* self, + gboolean display) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = display; -#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS, display, &_inner_error_); #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4937 "ConfigurationInterfaces.c" +#line 5424 "ConfigurationInterfaces.c" goto __catch122_configuration_error; } #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4947,25 +5434,25 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa g_clear_error (&_inner_error_); #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4946 "ConfigurationInterfaces.c" +#line 5433 "ConfigurationInterfaces.c" } } goto __finally122; __catch122_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 4964 "ConfigurationInterfaces.c" +#line 5451 "ConfigurationInterfaces.c" } __finally122: #line 783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4976,49 +5463,51 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa g_clear_error (&_inner_error_); #line 783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4975 "ConfigurationInterfaces.c" +#line 5462 "ConfigurationInterfaces.c" } } -void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self, gboolean display) { +void +configuration_facade_set_display_photo_ratings (ConfigurationFacade* self, + gboolean display) +{ #line 782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_ratings (self, display); -#line 4985 "ConfigurationInterfaces.c" +#line 5475 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_display_photo_tags (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS, &_inner_error_); -#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5013 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 5502 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5017 "ConfigurationInterfaces.c" +#line 5506 "ConfigurationInterfaces.c" goto __catch123_configuration_error; } #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5026,35 +5515,35 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 5026 "ConfigurationInterfaces.c" + return _tmp4_; +#line 5515 "ConfigurationInterfaces.c" } #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 5032 "ConfigurationInterfaces.c" +#line 5521 "ConfigurationInterfaces.c" } goto __finally123; __catch123_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 797 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 797 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = TRUE; #line 799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 5053 "ConfigurationInterfaces.c" +#line 5542 "ConfigurationInterfaces.c" } __finally123: #line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5062,41 +5551,43 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF #line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 5062 "ConfigurationInterfaces.c" + return _tmp6_; +#line 5551 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_display_photo_tags (ConfigurationFacade* self) { +gboolean +configuration_facade_get_display_photo_tags (ConfigurationFacade* self) +{ #line 793 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 793 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_tags (self); -#line 5071 "ConfigurationInterfaces.c" +#line 5562 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_display_photo_tags (ConfigurationFacade* self, gboolean display) { +static void +configuration_facade_real_set_display_photo_tags (ConfigurationFacade* self, + gboolean display) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = display; -#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS, display, &_inner_error_); #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5095 "ConfigurationInterfaces.c" +#line 5586 "ConfigurationInterfaces.c" goto __catch124_configuration_error; } #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5105,25 +5596,25 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad g_clear_error (&_inner_error_); #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5104 "ConfigurationInterfaces.c" +#line 5595 "ConfigurationInterfaces.c" } } goto __finally124; __catch124_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 5122 "ConfigurationInterfaces.c" +#line 5613 "ConfigurationInterfaces.c" } __finally124: #line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5134,49 +5625,51 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad g_clear_error (&_inner_error_); #line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5133 "ConfigurationInterfaces.c" +#line 5624 "ConfigurationInterfaces.c" } } -void configuration_facade_set_display_photo_tags (ConfigurationFacade* self, gboolean display) { +void +configuration_facade_set_display_photo_tags (ConfigurationFacade* self, + gboolean display) +{ #line 803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_tags (self, display); -#line 5143 "ConfigurationInterfaces.c" +#line 5637 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_display_photo_titles (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_display_photo_titles (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES, &_inner_error_); -#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5171 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 5664 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5175 "ConfigurationInterfaces.c" +#line 5668 "ConfigurationInterfaces.c" goto __catch125_configuration_error; } #line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5184,35 +5677,35 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio #line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 5184 "ConfigurationInterfaces.c" + return _tmp4_; +#line 5677 "ConfigurationInterfaces.c" } #line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 5190 "ConfigurationInterfaces.c" +#line 5683 "ConfigurationInterfaces.c" } goto __finally125; __catch125_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 820 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 820 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 820 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 5211 "ConfigurationInterfaces.c" +#line 5704 "ConfigurationInterfaces.c" } __finally125: #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5220,41 +5713,43 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 5220 "ConfigurationInterfaces.c" + return _tmp6_; +#line 5713 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_display_photo_titles (ConfigurationFacade* self) { +gboolean +configuration_facade_get_display_photo_titles (ConfigurationFacade* self) +{ #line 814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_titles (self); -#line 5229 "ConfigurationInterfaces.c" +#line 5724 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_display_photo_titles (ConfigurationFacade* self, gboolean display) { +static void +configuration_facade_real_set_display_photo_titles (ConfigurationFacade* self, + gboolean display) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = display; -#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES, display, &_inner_error_); #line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5253 "ConfigurationInterfaces.c" +#line 5748 "ConfigurationInterfaces.c" goto __catch126_configuration_error; } #line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5263,25 +5758,25 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac g_clear_error (&_inner_error_); #line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5262 "ConfigurationInterfaces.c" +#line 5757 "ConfigurationInterfaces.c" } } goto __finally126; __catch126_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 5280 "ConfigurationInterfaces.c" +#line 5775 "ConfigurationInterfaces.c" } __finally126: #line 825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5292,49 +5787,51 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac g_clear_error (&_inner_error_); #line 825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5291 "ConfigurationInterfaces.c" +#line 5786 "ConfigurationInterfaces.c" } } -void configuration_facade_set_display_photo_titles (ConfigurationFacade* self, gboolean display) { +void +configuration_facade_set_display_photo_titles (ConfigurationFacade* self, + gboolean display) +{ #line 824 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 824 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_titles (self, display); -#line 5301 "ConfigurationInterfaces.c" +#line 5799 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_display_photo_comments (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_display_photo_comments (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS, &_inner_error_); -#line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5329 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 5826 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5333 "ConfigurationInterfaces.c" +#line 5830 "ConfigurationInterfaces.c" goto __catch127_configuration_error; } #line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5342,35 +5839,35 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat #line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 5342 "ConfigurationInterfaces.c" + return _tmp4_; +#line 5839 "ConfigurationInterfaces.c" } #line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 5348 "ConfigurationInterfaces.c" +#line 5845 "ConfigurationInterfaces.c" } goto __finally127; __catch127_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 836 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 836 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 839 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 839 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 5369 "ConfigurationInterfaces.c" +#line 5866 "ConfigurationInterfaces.c" } __finally127: #line 836 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5378,41 +5875,43 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat #line 836 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 836 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 5378 "ConfigurationInterfaces.c" + return _tmp6_; +#line 5875 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_display_photo_comments (ConfigurationFacade* self) { +gboolean +configuration_facade_get_display_photo_comments (ConfigurationFacade* self) +{ #line 835 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 835 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_comments (self); -#line 5387 "ConfigurationInterfaces.c" +#line 5886 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_display_photo_comments (ConfigurationFacade* self, gboolean display) { +static void +configuration_facade_real_set_display_photo_comments (ConfigurationFacade* self, + gboolean display) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = display; -#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS, display, &_inner_error_); #line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5411 "ConfigurationInterfaces.c" +#line 5910 "ConfigurationInterfaces.c" goto __catch128_configuration_error; } #line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5421,25 +5920,25 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF g_clear_error (&_inner_error_); #line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5420 "ConfigurationInterfaces.c" +#line 5919 "ConfigurationInterfaces.c" } } goto __finally128; __catch128_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 846 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 846 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 846 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 5438 "ConfigurationInterfaces.c" +#line 5937 "ConfigurationInterfaces.c" } __finally128: #line 846 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5450,49 +5949,51 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF g_clear_error (&_inner_error_); #line 846 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5449 "ConfigurationInterfaces.c" +#line 5948 "ConfigurationInterfaces.c" } } -void configuration_facade_set_display_photo_comments (ConfigurationFacade* self, gboolean display) { +void +configuration_facade_set_display_photo_comments (ConfigurationFacade* self, + gboolean display) +{ #line 845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_comments (self, display); -#line 5459 "ConfigurationInterfaces.c" +#line 5961 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_display_event_comments (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_display_event_comments (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS, &_inner_error_); -#line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5487 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 5988 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5491 "ConfigurationInterfaces.c" +#line 5992 "ConfigurationInterfaces.c" goto __catch129_configuration_error; } #line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5500,35 +6001,35 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat #line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 5500 "ConfigurationInterfaces.c" + return _tmp4_; +#line 6001 "ConfigurationInterfaces.c" } #line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 5506 "ConfigurationInterfaces.c" +#line 6007 "ConfigurationInterfaces.c" } goto __finally129; __catch129_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 860 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 860 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 862 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 862 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 862 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 5527 "ConfigurationInterfaces.c" +#line 6028 "ConfigurationInterfaces.c" } __finally129: #line 857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5536,41 +6037,43 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat #line 857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 5536 "ConfigurationInterfaces.c" + return _tmp6_; +#line 6037 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_display_event_comments (ConfigurationFacade* self) { +gboolean +configuration_facade_get_display_event_comments (ConfigurationFacade* self) +{ #line 856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_event_comments (self); -#line 5545 "ConfigurationInterfaces.c" +#line 6048 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_display_event_comments (ConfigurationFacade* self, gboolean display) { +static void +configuration_facade_real_set_display_event_comments (ConfigurationFacade* self, + gboolean display) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = display; -#line 868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS, display, &_inner_error_); #line 868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5569 "ConfigurationInterfaces.c" +#line 6072 "ConfigurationInterfaces.c" goto __catch130_configuration_error; } #line 868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5579,25 +6082,25 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF g_clear_error (&_inner_error_); #line 868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5578 "ConfigurationInterfaces.c" +#line 6081 "ConfigurationInterfaces.c" } } goto __finally130; __catch130_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 867 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 867 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 870 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 870 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 867 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 5596 "ConfigurationInterfaces.c" +#line 6099 "ConfigurationInterfaces.c" } __finally130: #line 867 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5608,21 +6111,28 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF g_clear_error (&_inner_error_); #line 867 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5607 "ConfigurationInterfaces.c" +#line 6110 "ConfigurationInterfaces.c" } } -void configuration_facade_set_display_event_comments (ConfigurationFacade* self, gboolean display) { +void +configuration_facade_set_display_event_comments (ConfigurationFacade* self, + gboolean display) +{ #line 866 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 866 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_display_event_comments (self, display); -#line 5617 "ConfigurationInterfaces.c" +#line 6123 "ConfigurationInterfaces.c" } -static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by) { +static void +configuration_facade_real_get_event_photos_sort (ConfigurationFacade* self, + gboolean* sort_order, + gint* sort_by) +{ gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; GError * _inner_error_ = NULL; @@ -5630,35 +6140,31 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade _vala_sort_order = FALSE; #line 879 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _vala_sort_by = 2; -#line 5629 "ConfigurationInterfaces.c" +#line 6139 "ConfigurationInterfaces.c" { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; - gint _tmp5_ = 0; + gint _tmp4_ = 0; + ConfigurationEngine* _tmp5_; ConfigurationEngine* _tmp6_; - ConfigurationEngine* _tmp7_; - gint _tmp8_; - gint _tmp9_; + gint _tmp7_; #line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING, &_inner_error_); -#line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5657 "ConfigurationInterfaces.c" +#line 6163 "ConfigurationInterfaces.c" goto __catch131_configuration_error; } #line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5667,27 +6173,25 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade g_clear_error (&_inner_error_); #line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5666 "ConfigurationInterfaces.c" +#line 6172 "ConfigurationInterfaces.c" } #line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _vala_sort_order = _tmp0_; #line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = configuration_facade_get_engine (self); -#line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp7_ = _tmp6_; + _tmp5_ = configuration_facade_get_engine (self); #line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp8_ = configuration_engine_get_int_property (_tmp7_, CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY, &_inner_error_); + _tmp6_ = _tmp5_; #line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp9_ = _tmp8_; + _tmp7_ = configuration_engine_get_int_property (_tmp6_, CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY, &_inner_error_); #line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = _tmp9_; + _tmp4_ = _tmp7_; #line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5686 "ConfigurationInterfaces.c" +#line 6190 "ConfigurationInterfaces.c" goto __catch131_configuration_error; } #line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5696,28 +6200,28 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade g_clear_error (&_inner_error_); #line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5695 "ConfigurationInterfaces.c" +#line 6199 "ConfigurationInterfaces.c" } #line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _vala_sort_by = _tmp5_; -#line 5699 "ConfigurationInterfaces.c" + _vala_sort_by = _tmp4_; +#line 6203 "ConfigurationInterfaces.c" } goto __finally131; __catch131_configuration_error: { GError* err = NULL; - GError* _tmp10_; + GError* _tmp8_; #line 880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 885 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp10_ = err; + _tmp8_ = err; #line 885 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp10_); + configuration_facade_on_configuration_error (self, _tmp8_); #line 880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 5716 "ConfigurationInterfaces.c" +#line 6220 "ConfigurationInterfaces.c" } __finally131: #line 880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5728,56 +6232,60 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade g_clear_error (&_inner_error_); #line 880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5727 "ConfigurationInterfaces.c" +#line 6231 "ConfigurationInterfaces.c" } #line 877 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (sort_order) { #line 877 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" *sort_order = _vala_sort_order; -#line 5733 "ConfigurationInterfaces.c" +#line 6237 "ConfigurationInterfaces.c" } #line 877 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (sort_by) { #line 877 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" *sort_by = _vala_sort_by; -#line 5739 "ConfigurationInterfaces.c" +#line 6243 "ConfigurationInterfaces.c" } } -void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by) { +void +configuration_facade_get_event_photos_sort (ConfigurationFacade* self, + gboolean* sort_order, + gint* sort_by) +{ #line 877 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 877 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->get_event_photos_sort (self, sort_order, sort_by); -#line 5749 "ConfigurationInterfaces.c" +#line 6257 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by) { +static void +configuration_facade_real_set_event_photos_sort (ConfigurationFacade* self, + gboolean sort_order, + gint sort_by) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; + ConfigurationEngine* _tmp2_; ConfigurationEngine* _tmp3_; - ConfigurationEngine* _tmp4_; - gint _tmp5_; #line 891 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 891 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 891 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = sort_order; -#line 891 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING, sort_order, &_inner_error_); #line 891 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 891 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 891 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5776 "ConfigurationInterfaces.c" +#line 6284 "ConfigurationInterfaces.c" goto __catch132_configuration_error; } #line 891 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5786,23 +6294,21 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade g_clear_error (&_inner_error_); #line 891 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5785 "ConfigurationInterfaces.c" +#line 6293 "ConfigurationInterfaces.c" } #line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = configuration_facade_get_engine (self); -#line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; + _tmp2_ = configuration_facade_get_engine (self); #line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = sort_by; + _tmp3_ = _tmp2_; #line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_int_property (_tmp4_, CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY, _tmp5_, &_inner_error_); + configuration_engine_set_int_property (_tmp3_, CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY, sort_by, &_inner_error_); #line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5801 "ConfigurationInterfaces.c" +#line 6307 "ConfigurationInterfaces.c" goto __catch132_configuration_error; } #line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5811,25 +6317,25 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade g_clear_error (&_inner_error_); #line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5810 "ConfigurationInterfaces.c" +#line 6316 "ConfigurationInterfaces.c" } } goto __finally132; __catch132_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp4_; #line 890 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 890 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 896 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp4_ = err; #line 896 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp4_); #line 890 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 5828 "ConfigurationInterfaces.c" +#line 6334 "ConfigurationInterfaces.c" } __finally132: #line 890 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5840,49 +6346,52 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade g_clear_error (&_inner_error_); #line 890 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5839 "ConfigurationInterfaces.c" +#line 6345 "ConfigurationInterfaces.c" } } -void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by) { +void +configuration_facade_set_event_photos_sort (ConfigurationFacade* self, + gboolean sort_order, + gint sort_by) +{ #line 889 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 889 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_event_photos_sort (self, sort_order, sort_by); -#line 5849 "ConfigurationInterfaces.c" +#line 6359 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_events_sort_ascending (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_events_sort_ascending (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING, &_inner_error_); -#line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5877 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 6386 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5881 "ConfigurationInterfaces.c" +#line 6390 "ConfigurationInterfaces.c" goto __catch133_configuration_error; } #line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5890,35 +6399,35 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati #line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 5890 "ConfigurationInterfaces.c" + return _tmp4_; +#line 6399 "ConfigurationInterfaces.c" } #line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 5896 "ConfigurationInterfaces.c" +#line 6405 "ConfigurationInterfaces.c" } goto __finally133; __catch133_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 904 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 904 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 907 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 907 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 909 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 909 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 909 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 5917 "ConfigurationInterfaces.c" +#line 6426 "ConfigurationInterfaces.c" } __finally133: #line 904 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5926,41 +6435,43 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati #line 904 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 904 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 5926 "ConfigurationInterfaces.c" + return _tmp6_; +#line 6435 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* self) { +gboolean +configuration_facade_get_events_sort_ascending (ConfigurationFacade* self) +{ #line 903 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 903 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_events_sort_ascending (self); -#line 5935 "ConfigurationInterfaces.c" +#line 6446 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_events_sort_ascending (ConfigurationFacade* self, gboolean sort) { +static void +configuration_facade_real_set_events_sort_ascending (ConfigurationFacade* self, + gboolean sort) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = sort; -#line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING, sort, &_inner_error_); #line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5959 "ConfigurationInterfaces.c" +#line 6470 "ConfigurationInterfaces.c" goto __catch134_configuration_error; } #line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5969,27 +6480,27 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa g_clear_error (&_inner_error_); #line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5968 "ConfigurationInterfaces.c" +#line 6479 "ConfigurationInterfaces.c" } } goto __finally134; __catch134_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 914 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 914 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 917 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 917 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 918 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 918 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5988 "ConfigurationInterfaces.c" +#line 6499 "ConfigurationInterfaces.c" } __finally134: #line 914 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6000,21 +6511,26 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa g_clear_error (&_inner_error_); #line 914 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5999 "ConfigurationInterfaces.c" +#line 6510 "ConfigurationInterfaces.c" } } -void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self, gboolean sort) { +void +configuration_facade_set_events_sort_ascending (ConfigurationFacade* self, + gboolean sort) +{ #line 913 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 913 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_events_sort_ascending (self, sort); -#line 6009 "ConfigurationInterfaces.c" +#line 6523 "ConfigurationInterfaces.c" } -static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFacade* self) { +static gchar* +configuration_facade_real_get_external_photo_app (ConfigurationFacade* self) +{ gchar* result = NULL; GError * _inner_error_ = NULL; { @@ -6040,7 +6556,7 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac if (G_UNLIKELY (_inner_error_ != NULL)) { #line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6039 "ConfigurationInterfaces.c" +#line 6555 "ConfigurationInterfaces.c" goto __catch135_configuration_error; } #line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6049,7 +6565,7 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac g_clear_error (&_inner_error_); #line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 6048 "ConfigurationInterfaces.c" +#line 6564 "ConfigurationInterfaces.c" } #line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -6061,7 +6577,7 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac _g_free0 (_tmp0_); #line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6060 "ConfigurationInterfaces.c" +#line 6576 "ConfigurationInterfaces.c" } goto __finally135; __catch135_configuration_error: @@ -6085,7 +6601,7 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac _g_error_free0 (err); #line 931 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6084 "ConfigurationInterfaces.c" +#line 6600 "ConfigurationInterfaces.c" } __finally135: #line 926 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6094,43 +6610,45 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac g_clear_error (&_inner_error_); #line 926 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 6093 "ConfigurationInterfaces.c" +#line 6609 "ConfigurationInterfaces.c" } -gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self) { +gchar* +configuration_facade_get_external_photo_app (ConfigurationFacade* self) +{ #line 925 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 925 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_external_photo_app (self); -#line 6102 "ConfigurationInterfaces.c" +#line 6620 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_external_photo_app (ConfigurationFacade* self, const gchar* external_photo_app) { +static void +configuration_facade_real_set_external_photo_app (ConfigurationFacade* self, + const gchar* external_photo_app) +{ GError * _inner_error_ = NULL; #line 935 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (external_photo_app != NULL); -#line 6110 "ConfigurationInterfaces.c" +#line 6631 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; #line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = external_photo_app; -#line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP, _tmp2_, &_inner_error_); + configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP, external_photo_app, &_inner_error_); #line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6129 "ConfigurationInterfaces.c" +#line 6647 "ConfigurationInterfaces.c" goto __catch136_configuration_error; } #line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6139,27 +6657,27 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad g_clear_error (&_inner_error_); #line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6138 "ConfigurationInterfaces.c" +#line 6656 "ConfigurationInterfaces.c" } } goto __finally136; __catch136_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 936 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 936 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 941 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 941 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6158 "ConfigurationInterfaces.c" +#line 6676 "ConfigurationInterfaces.c" } __finally136: #line 936 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6170,21 +6688,26 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad g_clear_error (&_inner_error_); #line 936 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6169 "ConfigurationInterfaces.c" +#line 6687 "ConfigurationInterfaces.c" } } -void configuration_facade_set_external_photo_app (ConfigurationFacade* self, const gchar* external_photo_app) { +void +configuration_facade_set_external_photo_app (ConfigurationFacade* self, + const gchar* external_photo_app) +{ #line 935 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 935 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_external_photo_app (self, external_photo_app); -#line 6179 "ConfigurationInterfaces.c" +#line 6700 "ConfigurationInterfaces.c" } -static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacade* self) { +static gchar* +configuration_facade_real_get_external_raw_app (ConfigurationFacade* self) +{ gchar* result = NULL; GError * _inner_error_ = NULL; { @@ -6210,7 +6733,7 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad if (G_UNLIKELY (_inner_error_ != NULL)) { #line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6209 "ConfigurationInterfaces.c" +#line 6732 "ConfigurationInterfaces.c" goto __catch137_configuration_error; } #line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6219,7 +6742,7 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad g_clear_error (&_inner_error_); #line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 6218 "ConfigurationInterfaces.c" +#line 6741 "ConfigurationInterfaces.c" } #line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -6231,7 +6754,7 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad _g_free0 (_tmp0_); #line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6230 "ConfigurationInterfaces.c" +#line 6753 "ConfigurationInterfaces.c" } goto __finally137; __catch137_configuration_error: @@ -6255,7 +6778,7 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad _g_error_free0 (err); #line 954 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6254 "ConfigurationInterfaces.c" +#line 6777 "ConfigurationInterfaces.c" } __finally137: #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6264,43 +6787,45 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad g_clear_error (&_inner_error_); #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 6263 "ConfigurationInterfaces.c" +#line 6786 "ConfigurationInterfaces.c" } -gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self) { +gchar* +configuration_facade_get_external_raw_app (ConfigurationFacade* self) +{ #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_external_raw_app (self); -#line 6272 "ConfigurationInterfaces.c" +#line 6797 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_external_raw_app (ConfigurationFacade* self, const gchar* external_raw_app) { +static void +configuration_facade_real_set_external_raw_app (ConfigurationFacade* self, + const gchar* external_raw_app) +{ GError * _inner_error_ = NULL; #line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (external_raw_app != NULL); -#line 6280 "ConfigurationInterfaces.c" +#line 6808 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; #line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = external_raw_app; -#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP, _tmp2_, &_inner_error_); + configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP, external_raw_app, &_inner_error_); #line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6299 "ConfigurationInterfaces.c" +#line 6824 "ConfigurationInterfaces.c" goto __catch138_configuration_error; } #line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6309,27 +6834,27 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade* g_clear_error (&_inner_error_); #line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6308 "ConfigurationInterfaces.c" +#line 6833 "ConfigurationInterfaces.c" } } goto __finally138; __catch138_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 963 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 963 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 964 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 964 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6328 "ConfigurationInterfaces.c" +#line 6853 "ConfigurationInterfaces.c" } __finally138: #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6340,21 +6865,26 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade* g_clear_error (&_inner_error_); #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6339 "ConfigurationInterfaces.c" +#line 6864 "ConfigurationInterfaces.c" } } -void configuration_facade_set_external_raw_app (ConfigurationFacade* self, const gchar* external_raw_app) { +void +configuration_facade_set_external_raw_app (ConfigurationFacade* self, + const gchar* external_raw_app) +{ #line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_external_raw_app (self, external_raw_app); -#line 6349 "ConfigurationInterfaces.c" +#line 6877 "ConfigurationInterfaces.c" } -static ScaleConstraint configuration_facade_real_get_export_constraint (ConfigurationFacade* self) { +static ScaleConstraint +configuration_facade_real_get_export_constraint (ConfigurationFacade* self) +{ ScaleConstraint result = 0; GError * _inner_error_ = NULL; { @@ -6362,24 +6892,21 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gint _tmp3_; - gint _tmp4_; #line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_enum_property (_tmp2_, CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT, &_inner_error_); -#line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6378 "ConfigurationInterfaces.c" +#line 6905 "ConfigurationInterfaces.c" goto __catch139_configuration_error; } #line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6388,34 +6915,34 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur g_clear_error (&_inner_error_); #line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return 0; -#line 6387 "ConfigurationInterfaces.c" +#line 6914 "ConfigurationInterfaces.c" } #line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = (ScaleConstraint) _tmp0_; #line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6393 "ConfigurationInterfaces.c" +#line 6920 "ConfigurationInterfaces.c" } goto __finally139; __catch139_configuration_error: { GError* err = NULL; - GError* _tmp5_; + GError* _tmp4_; #line 972 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 972 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 975 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp4_ = err; #line 975 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp4_); #line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 0; #line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6414 "ConfigurationInterfaces.c" +#line 6941 "ConfigurationInterfaces.c" } __finally139: #line 972 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6424,40 +6951,42 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur g_clear_error (&_inner_error_); #line 972 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return 0; -#line 6423 "ConfigurationInterfaces.c" +#line 6950 "ConfigurationInterfaces.c" } -ScaleConstraint configuration_facade_get_export_constraint (ConfigurationFacade* self) { +ScaleConstraint +configuration_facade_get_export_constraint (ConfigurationFacade* self) +{ #line 971 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 971 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_constraint (self); -#line 6432 "ConfigurationInterfaces.c" +#line 6961 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_export_constraint (ConfigurationFacade* self, ScaleConstraint constraint) { +static void +configuration_facade_real_set_export_constraint (ConfigurationFacade* self, + ScaleConstraint constraint) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - ScaleConstraint _tmp2_; #line 983 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 983 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 983 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = constraint; -#line 983 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_enum_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT, (gint) _tmp2_, &_inner_error_); + configuration_engine_set_enum_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT, (gint) constraint, &_inner_error_); #line 983 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 983 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 983 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6456 "ConfigurationInterfaces.c" +#line 6985 "ConfigurationInterfaces.c" goto __catch140_configuration_error; } #line 983 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6466,27 +6995,27 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade g_clear_error (&_inner_error_); #line 983 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6465 "ConfigurationInterfaces.c" +#line 6994 "ConfigurationInterfaces.c" } } goto __finally140; __catch140_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 982 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 982 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 985 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 985 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6485 "ConfigurationInterfaces.c" +#line 7014 "ConfigurationInterfaces.c" } __finally140: #line 982 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6497,21 +7026,26 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade g_clear_error (&_inner_error_); #line 982 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6496 "ConfigurationInterfaces.c" +#line 7025 "ConfigurationInterfaces.c" } } -void configuration_facade_set_export_constraint (ConfigurationFacade* self, ScaleConstraint constraint) { +void +configuration_facade_set_export_constraint (ConfigurationFacade* self, + ScaleConstraint constraint) +{ #line 981 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 981 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_export_constraint (self, constraint); -#line 6506 "ConfigurationInterfaces.c" +#line 7038 "ConfigurationInterfaces.c" } -static ExportFormatMode configuration_facade_real_get_export_export_format_mode (ConfigurationFacade* self) { +static ExportFormatMode +configuration_facade_real_get_export_export_format_mode (ConfigurationFacade* self) +{ ExportFormatMode result = 0; GError * _inner_error_ = NULL; { @@ -6519,24 +7053,21 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gint _tmp3_; - gint _tmp4_; #line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_enum_property (_tmp2_, CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE, &_inner_error_); -#line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6535 "ConfigurationInterfaces.c" +#line 7066 "ConfigurationInterfaces.c" goto __catch141_configuration_error; } #line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6545,34 +7076,34 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode g_clear_error (&_inner_error_); #line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return 0; -#line 6544 "ConfigurationInterfaces.c" +#line 7075 "ConfigurationInterfaces.c" } #line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = (ExportFormatMode) _tmp0_; #line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6550 "ConfigurationInterfaces.c" +#line 7081 "ConfigurationInterfaces.c" } goto __finally141; __catch141_configuration_error: { GError* err = NULL; - GError* _tmp5_; + GError* _tmp4_; #line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 994 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp4_ = err; #line 994 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp4_); #line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 0; #line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6571 "ConfigurationInterfaces.c" +#line 7102 "ConfigurationInterfaces.c" } __finally141: #line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6581,40 +7112,42 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode g_clear_error (&_inner_error_); #line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return 0; -#line 6580 "ConfigurationInterfaces.c" +#line 7111 "ConfigurationInterfaces.c" } -ExportFormatMode configuration_facade_get_export_export_format_mode (ConfigurationFacade* self) { +ExportFormatMode +configuration_facade_get_export_export_format_mode (ConfigurationFacade* self) +{ #line 990 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 990 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_export_format_mode (self); -#line 6589 "ConfigurationInterfaces.c" +#line 7122 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_export_export_format_mode (ConfigurationFacade* self, ExportFormatMode export_format_mode) { +static void +configuration_facade_real_set_export_export_format_mode (ConfigurationFacade* self, + ExportFormatMode export_format_mode) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - ExportFormatMode _tmp2_; #line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = export_format_mode; -#line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_enum_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE, (gint) _tmp2_, &_inner_error_); + configuration_engine_set_enum_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE, (gint) export_format_mode, &_inner_error_); #line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6613 "ConfigurationInterfaces.c" +#line 7146 "ConfigurationInterfaces.c" goto __catch142_configuration_error; } #line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6623,27 +7156,27 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati g_clear_error (&_inner_error_); #line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6622 "ConfigurationInterfaces.c" +#line 7155 "ConfigurationInterfaces.c" } } goto __finally142; __catch142_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1001 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1001 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1004 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1004 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6642 "ConfigurationInterfaces.c" +#line 7175 "ConfigurationInterfaces.c" } __finally142: #line 1001 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6654,49 +7187,51 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati g_clear_error (&_inner_error_); #line 1001 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6653 "ConfigurationInterfaces.c" +#line 7186 "ConfigurationInterfaces.c" } } -void configuration_facade_set_export_export_format_mode (ConfigurationFacade* self, ExportFormatMode export_format_mode) { +void +configuration_facade_set_export_export_format_mode (ConfigurationFacade* self, + ExportFormatMode export_format_mode) +{ #line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_export_export_format_mode (self, export_format_mode); -#line 6663 "ConfigurationInterfaces.c" +#line 7199 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_export_export_metadata (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_export_export_metadata (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA, &_inner_error_); -#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6691 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 7226 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6695 "ConfigurationInterfaces.c" +#line 7230 "ConfigurationInterfaces.c" goto __catch143_configuration_error; } #line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6704,35 +7239,35 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat #line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 6704 "ConfigurationInterfaces.c" + return _tmp4_; +#line 7239 "ConfigurationInterfaces.c" } #line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6710 "ConfigurationInterfaces.c" +#line 7245 "ConfigurationInterfaces.c" } goto __finally143; __catch143_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1013 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1013 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6731 "ConfigurationInterfaces.c" +#line 7266 "ConfigurationInterfaces.c" } __finally143: #line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6740,41 +7275,43 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat #line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 6740 "ConfigurationInterfaces.c" + return _tmp6_; +#line 7275 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_export_export_metadata (ConfigurationFacade* self) { +gboolean +configuration_facade_get_export_export_metadata (ConfigurationFacade* self) +{ #line 1009 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1009 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_export_metadata (self); -#line 6749 "ConfigurationInterfaces.c" +#line 7286 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_export_export_metadata (ConfigurationFacade* self, gboolean export_metadata) { +static void +configuration_facade_real_set_export_export_metadata (ConfigurationFacade* self, + gboolean export_metadata) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 1021 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1021 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1021 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = export_metadata; -#line 1021 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA, export_metadata, &_inner_error_); #line 1021 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1021 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1021 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6773 "ConfigurationInterfaces.c" +#line 7310 "ConfigurationInterfaces.c" goto __catch144_configuration_error; } #line 1021 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6783,27 +7320,27 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF g_clear_error (&_inner_error_); #line 1021 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6782 "ConfigurationInterfaces.c" +#line 7319 "ConfigurationInterfaces.c" } } goto __finally144; __catch144_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1020 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1020 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1023 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1023 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1024 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1024 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6802 "ConfigurationInterfaces.c" +#line 7339 "ConfigurationInterfaces.c" } __finally144: #line 1020 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6814,21 +7351,26 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF g_clear_error (&_inner_error_); #line 1020 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6813 "ConfigurationInterfaces.c" +#line 7350 "ConfigurationInterfaces.c" } } -void configuration_facade_set_export_export_metadata (ConfigurationFacade* self, gboolean export_metadata) { +void +configuration_facade_set_export_export_metadata (ConfigurationFacade* self, + gboolean export_metadata) +{ #line 1019 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1019 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_export_export_metadata (self, export_metadata); -#line 6823 "ConfigurationInterfaces.c" +#line 7363 "ConfigurationInterfaces.c" } -static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (ConfigurationFacade* self) { +static PhotoFileFormat +configuration_facade_real_get_export_photo_file_format (ConfigurationFacade* self) +{ PhotoFileFormat result = 0; GError * _inner_error_ = NULL; { @@ -6836,25 +7378,21 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gint _tmp3_; - gint _tmp4_; - PhotoFileFormat _tmp5_; #line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_enum_property (_tmp2_, CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT, &_inner_error_); -#line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6853 "ConfigurationInterfaces.c" +#line 7391 "ConfigurationInterfaces.c" goto __catch145_configuration_error; } #line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6863,36 +7401,34 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C g_clear_error (&_inner_error_); #line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return 0; -#line 6862 "ConfigurationInterfaces.c" +#line 7400 "ConfigurationInterfaces.c" } #line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = photo_file_format_unserialize (_tmp0_); -#line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - result = _tmp5_; + result = photo_file_format_unserialize (_tmp0_); #line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6870 "ConfigurationInterfaces.c" +#line 7406 "ConfigurationInterfaces.c" } goto __finally145; __catch145_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp4_; #line 1029 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1029 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1032 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp4_ = err; #line 1032 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp4_); #line 1034 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 0; #line 1034 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1034 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6891 "ConfigurationInterfaces.c" +#line 7427 "ConfigurationInterfaces.c" } __finally145: #line 1029 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6901,43 +7437,42 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C g_clear_error (&_inner_error_); #line 1029 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return 0; -#line 6900 "ConfigurationInterfaces.c" +#line 7436 "ConfigurationInterfaces.c" } -PhotoFileFormat configuration_facade_get_export_photo_file_format (ConfigurationFacade* self) { +PhotoFileFormat +configuration_facade_get_export_photo_file_format (ConfigurationFacade* self) +{ #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_photo_file_format (self); -#line 6909 "ConfigurationInterfaces.c" +#line 7447 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_export_photo_file_format (ConfigurationFacade* self, PhotoFileFormat photo_file_format) { +static void +configuration_facade_real_set_export_photo_file_format (ConfigurationFacade* self, + PhotoFileFormat photo_file_format) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - PhotoFileFormat _tmp2_; - gint _tmp3_; #line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = photo_file_format; -#line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = photo_file_format_serialize (_tmp2_); -#line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_enum_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT, _tmp3_, &_inner_error_); + configuration_engine_set_enum_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT, photo_file_format_serialize (photo_file_format), &_inner_error_); #line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6936 "ConfigurationInterfaces.c" +#line 7471 "ConfigurationInterfaces.c" goto __catch146_configuration_error; } #line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6946,27 +7481,27 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio g_clear_error (&_inner_error_); #line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6945 "ConfigurationInterfaces.c" +#line 7480 "ConfigurationInterfaces.c" } } goto __finally146; __catch146_configuration_error: { GError* err = NULL; - GError* _tmp4_; + GError* _tmp2_; #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1042 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = err; + _tmp2_ = err; #line 1042 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp4_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1043 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1043 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6965 "ConfigurationInterfaces.c" +#line 7500 "ConfigurationInterfaces.c" } __finally146: #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6977,21 +7512,26 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio g_clear_error (&_inner_error_); #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6976 "ConfigurationInterfaces.c" +#line 7511 "ConfigurationInterfaces.c" } } -void configuration_facade_set_export_photo_file_format (ConfigurationFacade* self, PhotoFileFormat photo_file_format) { +void +configuration_facade_set_export_photo_file_format (ConfigurationFacade* self, + PhotoFileFormat photo_file_format) +{ #line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_export_photo_file_format (self, photo_file_format); -#line 6986 "ConfigurationInterfaces.c" +#line 7524 "ConfigurationInterfaces.c" } -static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFacade* self) { +static JpegQuality +configuration_facade_real_get_export_quality (ConfigurationFacade* self) +{ JpegQuality result = 0; GError * _inner_error_ = NULL; { @@ -6999,24 +7539,21 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gint _tmp3_; - gint _tmp4_; #line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_enum_property (_tmp2_, CONFIGURABLE_PROPERTY_EXPORT_QUALITY, &_inner_error_); -#line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7015 "ConfigurationInterfaces.c" +#line 7552 "ConfigurationInterfaces.c" goto __catch147_configuration_error; } #line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7025,34 +7562,34 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa g_clear_error (&_inner_error_); #line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return 0; -#line 7024 "ConfigurationInterfaces.c" +#line 7561 "ConfigurationInterfaces.c" } #line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = (JpegQuality) _tmp0_; #line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7030 "ConfigurationInterfaces.c" +#line 7567 "ConfigurationInterfaces.c" } goto __finally147; __catch147_configuration_error: { GError* err = NULL; - GError* _tmp5_; + GError* _tmp4_; #line 1048 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1048 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp4_ = err; #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp4_); #line 1053 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 0; #line 1053 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1053 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7051 "ConfigurationInterfaces.c" +#line 7588 "ConfigurationInterfaces.c" } __finally147: #line 1048 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7061,40 +7598,42 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa g_clear_error (&_inner_error_); #line 1048 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return 0; -#line 7060 "ConfigurationInterfaces.c" +#line 7597 "ConfigurationInterfaces.c" } -JpegQuality configuration_facade_get_export_quality (ConfigurationFacade* self) { +JpegQuality +configuration_facade_get_export_quality (ConfigurationFacade* self) +{ #line 1047 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1047 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_quality (self); -#line 7069 "ConfigurationInterfaces.c" +#line 7608 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_export_quality (ConfigurationFacade* self, JpegQuality quality) { +static void +configuration_facade_real_set_export_quality (ConfigurationFacade* self, + JpegQuality quality) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - JpegQuality _tmp2_; #line 1059 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1059 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1059 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = quality; -#line 1059 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_enum_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_QUALITY, (gint) _tmp2_, &_inner_error_); + configuration_engine_set_enum_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_QUALITY, (gint) quality, &_inner_error_); #line 1059 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1059 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1059 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7093 "ConfigurationInterfaces.c" +#line 7632 "ConfigurationInterfaces.c" goto __catch148_configuration_error; } #line 1059 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7103,27 +7642,27 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s g_clear_error (&_inner_error_); #line 1059 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7102 "ConfigurationInterfaces.c" +#line 7641 "ConfigurationInterfaces.c" } } goto __finally148; __catch148_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1058 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1058 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7122 "ConfigurationInterfaces.c" +#line 7661 "ConfigurationInterfaces.c" } __finally148: #line 1058 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7134,49 +7673,51 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s g_clear_error (&_inner_error_); #line 1058 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7133 "ConfigurationInterfaces.c" +#line 7672 "ConfigurationInterfaces.c" } } -void configuration_facade_set_export_quality (ConfigurationFacade* self, JpegQuality quality) { +void +configuration_facade_set_export_quality (ConfigurationFacade* self, + JpegQuality quality) +{ #line 1057 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1057 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_export_quality (self, quality); -#line 7143 "ConfigurationInterfaces.c" +#line 7685 "ConfigurationInterfaces.c" } -static gint configuration_facade_real_get_export_scale (ConfigurationFacade* self) { +static gint +configuration_facade_real_get_export_scale (ConfigurationFacade* self) +{ gint result = 0; - gint _tmp7_ = 0; + gint _tmp6_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gint _tmp3_; - gint _tmp4_; #line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_EXPORT_SCALE, &_inner_error_); -#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7171 "ConfigurationInterfaces.c" - gint _tmp5_ = 0; +#line 7712 "ConfigurationInterfaces.c" + gint _tmp4_ = 0; #line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7175 "ConfigurationInterfaces.c" +#line 7716 "ConfigurationInterfaces.c" goto __catch149_configuration_error; } #line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7184,35 +7725,35 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel #line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 7184 "ConfigurationInterfaces.c" + return _tmp4_; +#line 7725 "ConfigurationInterfaces.c" } #line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7190 "ConfigurationInterfaces.c" +#line 7731 "ConfigurationInterfaces.c" } goto __finally149; __catch149_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1067 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1067 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1070 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1070 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 0; #line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7211 "ConfigurationInterfaces.c" +#line 7752 "ConfigurationInterfaces.c" } __finally149: #line 1067 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7220,41 +7761,43 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel #line 1067 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1067 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 7220 "ConfigurationInterfaces.c" + return _tmp6_; +#line 7761 "ConfigurationInterfaces.c" } -gint configuration_facade_get_export_scale (ConfigurationFacade* self) { +gint +configuration_facade_get_export_scale (ConfigurationFacade* self) +{ #line 1066 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1066 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_scale (self); -#line 7229 "ConfigurationInterfaces.c" +#line 7772 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_export_scale (ConfigurationFacade* self, gint scale) { +static void +configuration_facade_real_set_export_scale (ConfigurationFacade* self, + gint scale) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gint _tmp2_; #line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = scale; -#line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_SCALE, _tmp2_, &_inner_error_); + configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_SCALE, scale, &_inner_error_); #line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7253 "ConfigurationInterfaces.c" +#line 7796 "ConfigurationInterfaces.c" goto __catch150_configuration_error; } #line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7263,27 +7806,27 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel g_clear_error (&_inner_error_); #line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7262 "ConfigurationInterfaces.c" +#line 7805 "ConfigurationInterfaces.c" } } goto __finally150; __catch150_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1080 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1080 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1081 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1081 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7282 "ConfigurationInterfaces.c" +#line 7825 "ConfigurationInterfaces.c" } __finally150: #line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7294,21 +7837,26 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel g_clear_error (&_inner_error_); #line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7293 "ConfigurationInterfaces.c" +#line 7836 "ConfigurationInterfaces.c" } } -void configuration_facade_set_export_scale (ConfigurationFacade* self, gint scale) { +void +configuration_facade_set_export_scale (ConfigurationFacade* self, + gint scale) +{ #line 1076 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1076 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_export_scale (self, scale); -#line 7303 "ConfigurationInterfaces.c" +#line 7849 "ConfigurationInterfaces.c" } -static RawDeveloper configuration_facade_real_get_default_raw_developer (ConfigurationFacade* self) { +static RawDeveloper +configuration_facade_real_get_default_raw_developer (ConfigurationFacade* self) +{ RawDeveloper result = 0; GError * _inner_error_ = NULL; { @@ -7317,7 +7865,6 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu ConfigurationEngine* _tmp2_; gchar* _tmp3_; gchar* _tmp4_; - RawDeveloper _tmp5_; #line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7334,7 +7881,7 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7333 "ConfigurationInterfaces.c" +#line 7880 "ConfigurationInterfaces.c" goto __catch151_configuration_error; } #line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7343,38 +7890,36 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu g_clear_error (&_inner_error_); #line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return 0; -#line 7342 "ConfigurationInterfaces.c" +#line 7889 "ConfigurationInterfaces.c" } #line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = raw_developer_from_string (_tmp0_); -#line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - result = _tmp5_; + result = raw_developer_from_string (_tmp0_); #line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_free0 (_tmp0_); #line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7352 "ConfigurationInterfaces.c" +#line 7897 "ConfigurationInterfaces.c" } goto __finally151; __catch151_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1089 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1089 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1095 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = RAW_DEVELOPER_CAMERA; #line 1095 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1095 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7373 "ConfigurationInterfaces.c" +#line 7918 "ConfigurationInterfaces.c" } __finally151: #line 1089 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7383,48 +7928,50 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu g_clear_error (&_inner_error_); #line 1089 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return 0; -#line 7382 "ConfigurationInterfaces.c" +#line 7927 "ConfigurationInterfaces.c" } -RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self) { +RawDeveloper +configuration_facade_get_default_raw_developer (ConfigurationFacade* self) +{ #line 1088 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1088 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_default_raw_developer (self); -#line 7391 "ConfigurationInterfaces.c" +#line 7938 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_default_raw_developer (ConfigurationFacade* self, RawDeveloper d) { +static void +configuration_facade_real_set_default_raw_developer (ConfigurationFacade* self, + RawDeveloper d) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - RawDeveloper _tmp2_; + gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; #line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = d; + _tmp2_ = raw_developer_to_string (d); #line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = raw_developer_to_string (_tmp2_); -#line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT, _tmp4_, &_inner_error_); + configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT, _tmp3_, &_inner_error_); #line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7423 "ConfigurationInterfaces.c" +#line 7970 "ConfigurationInterfaces.c" goto __catch152_configuration_error; } #line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7433,27 +7980,27 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa g_clear_error (&_inner_error_); #line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7432 "ConfigurationInterfaces.c" +#line 7979 "ConfigurationInterfaces.c" } } goto __finally152; __catch152_configuration_error: { GError* err = NULL; - GError* _tmp5_; + GError* _tmp4_; #line 1100 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1100 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp4_ = err; #line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp4_); #line 1105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7452 "ConfigurationInterfaces.c" +#line 7999 "ConfigurationInterfaces.c" } __finally152: #line 1100 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7464,49 +8011,51 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa g_clear_error (&_inner_error_); #line 1100 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7463 "ConfigurationInterfaces.c" +#line 8010 "ConfigurationInterfaces.c" } } -void configuration_facade_set_default_raw_developer (ConfigurationFacade* self, RawDeveloper d) { +void +configuration_facade_set_default_raw_developer (ConfigurationFacade* self, + RawDeveloper d) +{ #line 1099 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1099 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_default_raw_developer (self, d); -#line 7473 "ConfigurationInterfaces.c" +#line 8023 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_hide_photos_already_imported (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_hide_photos_already_imported (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED, &_inner_error_); -#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7501 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 8050 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7505 "ConfigurationInterfaces.c" +#line 8054 "ConfigurationInterfaces.c" goto __catch153_configuration_error; } #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7514,35 +8063,35 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 7514 "ConfigurationInterfaces.c" + return _tmp4_; +#line 8063 "ConfigurationInterfaces.c" } #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7520 "ConfigurationInterfaces.c" +#line 8069 "ConfigurationInterfaces.c" } goto __finally153; __catch153_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1116 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1116 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = TRUE; #line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7541 "ConfigurationInterfaces.c" +#line 8090 "ConfigurationInterfaces.c" } __finally153: #line 1113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7550,41 +8099,43 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf #line 1113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 7550 "ConfigurationInterfaces.c" + return _tmp6_; +#line 8099 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_hide_photos_already_imported (ConfigurationFacade* self) { +gboolean +configuration_facade_get_hide_photos_already_imported (ConfigurationFacade* self) +{ #line 1112 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1112 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_hide_photos_already_imported (self); -#line 7559 "ConfigurationInterfaces.c" +#line 8110 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_hide_photos_already_imported (ConfigurationFacade* self, gboolean hide_imported) { +static void +configuration_facade_real_set_hide_photos_already_imported (ConfigurationFacade* self, + gboolean hide_imported) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = hide_imported; -#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED, hide_imported, &_inner_error_); #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7583 "ConfigurationInterfaces.c" +#line 8134 "ConfigurationInterfaces.c" goto __catch154_configuration_error; } #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7593,25 +8144,25 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur g_clear_error (&_inner_error_); #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7592 "ConfigurationInterfaces.c" +#line 8143 "ConfigurationInterfaces.c" } } goto __finally154; __catch154_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 7610 "ConfigurationInterfaces.c" +#line 8161 "ConfigurationInterfaces.c" } __finally154: #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7622,21 +8173,26 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur g_clear_error (&_inner_error_); #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7621 "ConfigurationInterfaces.c" +#line 8172 "ConfigurationInterfaces.c" } } -void configuration_facade_set_hide_photos_already_imported (ConfigurationFacade* self, gboolean hide_imported) { +void +configuration_facade_set_hide_photos_already_imported (ConfigurationFacade* self, + gboolean hide_imported) +{ #line 1122 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1122 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_hide_photos_already_imported (self, hide_imported); -#line 7631 "ConfigurationInterfaces.c" +#line 8185 "ConfigurationInterfaces.c" } -static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* self) { +static gchar* +configuration_facade_real_get_import_dir (ConfigurationFacade* self) +{ gchar* result = NULL; GError * _inner_error_ = NULL; { @@ -7662,7 +8218,7 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7661 "ConfigurationInterfaces.c" +#line 8217 "ConfigurationInterfaces.c" goto __catch155_configuration_error; } #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7671,7 +8227,7 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel g_clear_error (&_inner_error_); #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 7670 "ConfigurationInterfaces.c" +#line 8226 "ConfigurationInterfaces.c" } #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -7683,7 +8239,7 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel _g_free0 (_tmp0_); #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7682 "ConfigurationInterfaces.c" +#line 8238 "ConfigurationInterfaces.c" } goto __finally155; __catch155_configuration_error: @@ -7707,7 +8263,7 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel _g_error_free0 (err); #line 1139 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7706 "ConfigurationInterfaces.c" +#line 8262 "ConfigurationInterfaces.c" } __finally155: #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7716,43 +8272,45 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel g_clear_error (&_inner_error_); #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 7715 "ConfigurationInterfaces.c" +#line 8271 "ConfigurationInterfaces.c" } -gchar* configuration_facade_get_import_dir (ConfigurationFacade* self) { +gchar* +configuration_facade_get_import_dir (ConfigurationFacade* self) +{ #line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_import_dir (self); -#line 7724 "ConfigurationInterfaces.c" +#line 8282 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_import_dir (ConfigurationFacade* self, const gchar* import_dir) { +static void +configuration_facade_real_set_import_dir (ConfigurationFacade* self, + const gchar* import_dir) +{ GError * _inner_error_ = NULL; #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (import_dir != NULL); -#line 7732 "ConfigurationInterfaces.c" +#line 8293 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; #line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = import_dir; -#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_IMPORT_DIR, _tmp2_, &_inner_error_); + configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_IMPORT_DIR, import_dir, &_inner_error_); #line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7751 "ConfigurationInterfaces.c" +#line 8309 "ConfigurationInterfaces.c" goto __catch156_configuration_error; } #line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7761,25 +8319,25 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self, g_clear_error (&_inner_error_); #line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7760 "ConfigurationInterfaces.c" +#line 8318 "ConfigurationInterfaces.c" } } goto __finally156; __catch156_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1147 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1147 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 7778 "ConfigurationInterfaces.c" +#line 8336 "ConfigurationInterfaces.c" } __finally156: #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7790,49 +8348,51 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self, g_clear_error (&_inner_error_); #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7789 "ConfigurationInterfaces.c" +#line 8347 "ConfigurationInterfaces.c" } } -void configuration_facade_set_import_dir (ConfigurationFacade* self, const gchar* import_dir) { +void +configuration_facade_set_import_dir (ConfigurationFacade* self, + const gchar* import_dir) +{ #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_import_dir (self, import_dir); -#line 7799 "ConfigurationInterfaces.c" +#line 8360 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_keep_relativity (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_KEEP_RELATIVITY, &_inner_error_); -#line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7827 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 8387 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7831 "ConfigurationInterfaces.c" +#line 8391 "ConfigurationInterfaces.c" goto __catch157_configuration_error; } #line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7840,35 +8400,35 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca #line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 7840 "ConfigurationInterfaces.c" + return _tmp4_; +#line 8400 "ConfigurationInterfaces.c" } #line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7846 "ConfigurationInterfaces.c" +#line 8406 "ConfigurationInterfaces.c" } goto __finally157; __catch157_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1158 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1158 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1160 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = TRUE; #line 1160 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1160 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7867 "ConfigurationInterfaces.c" +#line 8427 "ConfigurationInterfaces.c" } __finally157: #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7876,41 +8436,43 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 7876 "ConfigurationInterfaces.c" + return _tmp6_; +#line 8436 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_keep_relativity (ConfigurationFacade* self) { +gboolean +configuration_facade_get_keep_relativity (ConfigurationFacade* self) +{ #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_keep_relativity (self); -#line 7885 "ConfigurationInterfaces.c" +#line 8447 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_keep_relativity (ConfigurationFacade* self, gboolean keep_relativity) { +static void +configuration_facade_real_set_keep_relativity (ConfigurationFacade* self, + gboolean keep_relativity) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = keep_relativity; -#line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_KEEP_RELATIVITY, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_KEEP_RELATIVITY, keep_relativity, &_inner_error_); #line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7909 "ConfigurationInterfaces.c" +#line 8471 "ConfigurationInterfaces.c" goto __catch158_configuration_error; } #line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7919,25 +8481,25 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7918 "ConfigurationInterfaces.c" +#line 8480 "ConfigurationInterfaces.c" } } goto __finally158; __catch158_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 7936 "ConfigurationInterfaces.c" +#line 8498 "ConfigurationInterfaces.c" } __finally158: #line 1165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7948,49 +8510,51 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7947 "ConfigurationInterfaces.c" +#line 8509 "ConfigurationInterfaces.c" } } -void configuration_facade_set_keep_relativity (ConfigurationFacade* self, gboolean keep_relativity) { +void +configuration_facade_set_keep_relativity (ConfigurationFacade* self, + gboolean keep_relativity) +{ #line 1164 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1164 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_keep_relativity (self, keep_relativity); -#line 7957 "ConfigurationInterfaces.c" +#line 8522 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_pin_toolbar_state (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE, &_inner_error_); -#line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7985 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 8549 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7989 "ConfigurationInterfaces.c" +#line 8553 "ConfigurationInterfaces.c" goto __catch159_configuration_error; } #line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7998,35 +8562,35 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa #line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 7998 "ConfigurationInterfaces.c" + return _tmp4_; +#line 8562 "ConfigurationInterfaces.c" } #line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 8004 "ConfigurationInterfaces.c" +#line 8568 "ConfigurationInterfaces.c" } goto __finally159; __catch159_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1176 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1176 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1180 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 1180 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1180 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 8025 "ConfigurationInterfaces.c" +#line 8589 "ConfigurationInterfaces.c" } __finally159: #line 1176 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8034,41 +8598,43 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa #line 1176 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1176 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 8034 "ConfigurationInterfaces.c" + return _tmp6_; +#line 8598 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_pin_toolbar_state (ConfigurationFacade* self) { +gboolean +configuration_facade_get_pin_toolbar_state (ConfigurationFacade* self) +{ #line 1175 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1175 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_pin_toolbar_state (self); -#line 8043 "ConfigurationInterfaces.c" +#line 8609 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade* self, gboolean state) { +static void +configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade* self, + gboolean state) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = state; -#line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE, state, &_inner_error_); #line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8067 "ConfigurationInterfaces.c" +#line 8633 "ConfigurationInterfaces.c" goto __catch160_configuration_error; } #line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8077,25 +8643,25 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade g_clear_error (&_inner_error_); #line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8076 "ConfigurationInterfaces.c" +#line 8642 "ConfigurationInterfaces.c" } } goto __finally160; __catch160_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1185 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1185 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1185 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 8094 "ConfigurationInterfaces.c" +#line 8660 "ConfigurationInterfaces.c" } __finally160: #line 1185 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8106,49 +8672,51 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade g_clear_error (&_inner_error_); #line 1185 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8105 "ConfigurationInterfaces.c" +#line 8671 "ConfigurationInterfaces.c" } } -void configuration_facade_set_pin_toolbar_state (ConfigurationFacade* self, gboolean state) { +void +configuration_facade_set_pin_toolbar_state (ConfigurationFacade* self, + gboolean state) +{ #line 1184 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1184 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_pin_toolbar_state (self, state); -#line 8115 "ConfigurationInterfaces.c" +#line 8684 "ConfigurationInterfaces.c" } -static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade* self) { +static gint +configuration_facade_real_get_last_crop_height (ConfigurationFacade* self) +{ gint result = 0; - gint _tmp7_ = 0; + gint _tmp6_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gint _tmp3_; - gint _tmp4_; #line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT, &_inner_error_); -#line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8143 "ConfigurationInterfaces.c" - gint _tmp5_ = 0; +#line 8711 "ConfigurationInterfaces.c" + gint _tmp4_ = 0; #line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8147 "ConfigurationInterfaces.c" +#line 8715 "ConfigurationInterfaces.c" goto __catch161_configuration_error; } #line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8156,35 +8724,35 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade* #line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 8156 "ConfigurationInterfaces.c" + return _tmp4_; +#line 8724 "ConfigurationInterfaces.c" } #line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 8162 "ConfigurationInterfaces.c" +#line 8730 "ConfigurationInterfaces.c" } goto __finally161; __catch161_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1196 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1196 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1200 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 1; #line 1200 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1200 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 8183 "ConfigurationInterfaces.c" +#line 8751 "ConfigurationInterfaces.c" } __finally161: #line 1196 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8192,41 +8760,43 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade* #line 1196 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1196 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 8192 "ConfigurationInterfaces.c" + return _tmp6_; +#line 8760 "ConfigurationInterfaces.c" } -gint configuration_facade_get_last_crop_height (ConfigurationFacade* self) { +gint +configuration_facade_get_last_crop_height (ConfigurationFacade* self) +{ #line 1195 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1195 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_height (self); -#line 8201 "ConfigurationInterfaces.c" +#line 8771 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_last_crop_height (ConfigurationFacade* self, gint choice) { +static void +configuration_facade_real_set_last_crop_height (ConfigurationFacade* self, + gint choice) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gint _tmp2_; #line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = choice; -#line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT, _tmp2_, &_inner_error_); + configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT, choice, &_inner_error_); #line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8225 "ConfigurationInterfaces.c" +#line 8795 "ConfigurationInterfaces.c" goto __catch162_configuration_error; } #line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8235,25 +8805,25 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8234 "ConfigurationInterfaces.c" +#line 8804 "ConfigurationInterfaces.c" } } goto __finally162; __catch162_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1205 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1205 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1208 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1208 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1205 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 8252 "ConfigurationInterfaces.c" +#line 8822 "ConfigurationInterfaces.c" } __finally162: #line 1205 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8264,49 +8834,51 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1205 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8263 "ConfigurationInterfaces.c" +#line 8833 "ConfigurationInterfaces.c" } } -void configuration_facade_set_last_crop_height (ConfigurationFacade* self, gint choice) { +void +configuration_facade_set_last_crop_height (ConfigurationFacade* self, + gint choice) +{ #line 1204 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1204 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_height (self, choice); -#line 8273 "ConfigurationInterfaces.c" +#line 8846 "ConfigurationInterfaces.c" } -static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFacade* self) { +static gint +configuration_facade_real_get_last_crop_menu_choice (ConfigurationFacade* self) +{ gint result = 0; - gint _tmp7_ = 0; + gint _tmp6_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gint _tmp3_; - gint _tmp4_; #line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE, &_inner_error_); -#line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8301 "ConfigurationInterfaces.c" - gint _tmp5_ = 0; +#line 8873 "ConfigurationInterfaces.c" + gint _tmp4_ = 0; #line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8305 "ConfigurationInterfaces.c" +#line 8877 "ConfigurationInterfaces.c" goto __catch163_configuration_error; } #line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8314,35 +8886,35 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa #line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 8314 "ConfigurationInterfaces.c" + return _tmp4_; +#line 8886 "ConfigurationInterfaces.c" } #line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 8320 "ConfigurationInterfaces.c" +#line 8892 "ConfigurationInterfaces.c" } goto __finally163; __catch163_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1219 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1219 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1224 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 0; #line 1224 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1224 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 8341 "ConfigurationInterfaces.c" +#line 8913 "ConfigurationInterfaces.c" } __finally163: #line 1216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8350,41 +8922,43 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa #line 1216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 8350 "ConfigurationInterfaces.c" + return _tmp6_; +#line 8922 "ConfigurationInterfaces.c" } -gint configuration_facade_get_last_crop_menu_choice (ConfigurationFacade* self) { +gint +configuration_facade_get_last_crop_menu_choice (ConfigurationFacade* self) +{ #line 1215 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1215 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_menu_choice (self); -#line 8359 "ConfigurationInterfaces.c" +#line 8933 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFacade* self, gint choice) { +static void +configuration_facade_real_set_last_crop_menu_choice (ConfigurationFacade* self, + gint choice) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gint _tmp2_; #line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = choice; -#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE, _tmp2_, &_inner_error_); + configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE, choice, &_inner_error_); #line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8383 "ConfigurationInterfaces.c" +#line 8957 "ConfigurationInterfaces.c" goto __catch164_configuration_error; } #line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8393,25 +8967,25 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa g_clear_error (&_inner_error_); #line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8392 "ConfigurationInterfaces.c" +#line 8966 "ConfigurationInterfaces.c" } } goto __finally164; __catch164_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1229 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1229 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1232 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1232 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1229 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 8410 "ConfigurationInterfaces.c" +#line 8984 "ConfigurationInterfaces.c" } __finally164: #line 1229 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8422,49 +8996,51 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa g_clear_error (&_inner_error_); #line 1229 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8421 "ConfigurationInterfaces.c" +#line 8995 "ConfigurationInterfaces.c" } } -void configuration_facade_set_last_crop_menu_choice (ConfigurationFacade* self, gint choice) { +void +configuration_facade_set_last_crop_menu_choice (ConfigurationFacade* self, + gint choice) +{ #line 1228 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1228 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_menu_choice (self, choice); -#line 8431 "ConfigurationInterfaces.c" +#line 9008 "ConfigurationInterfaces.c" } -static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade* self) { +static gint +configuration_facade_real_get_last_crop_width (ConfigurationFacade* self) +{ gint result = 0; - gint _tmp7_ = 0; + gint _tmp6_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gint _tmp3_; - gint _tmp4_; #line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH, &_inner_error_); -#line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8459 "ConfigurationInterfaces.c" - gint _tmp5_ = 0; +#line 9035 "ConfigurationInterfaces.c" + gint _tmp4_ = 0; #line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8463 "ConfigurationInterfaces.c" +#line 9039 "ConfigurationInterfaces.c" goto __catch165_configuration_error; } #line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8472,35 +9048,35 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade* #line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 8472 "ConfigurationInterfaces.c" + return _tmp4_; +#line 9048 "ConfigurationInterfaces.c" } #line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 8478 "ConfigurationInterfaces.c" +#line 9054 "ConfigurationInterfaces.c" } goto __finally165; __catch165_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1244 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 1; #line 1244 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1244 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 8499 "ConfigurationInterfaces.c" +#line 9075 "ConfigurationInterfaces.c" } __finally165: #line 1240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8508,41 +9084,43 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade* #line 1240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 8508 "ConfigurationInterfaces.c" + return _tmp6_; +#line 9084 "ConfigurationInterfaces.c" } -gint configuration_facade_get_last_crop_width (ConfigurationFacade* self) { +gint +configuration_facade_get_last_crop_width (ConfigurationFacade* self) +{ #line 1239 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1239 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_width (self); -#line 8517 "ConfigurationInterfaces.c" +#line 9095 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_last_crop_width (ConfigurationFacade* self, gint choice) { +static void +configuration_facade_real_set_last_crop_width (ConfigurationFacade* self, + gint choice) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gint _tmp2_; #line 1250 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1250 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1250 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = choice; -#line 1250 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH, _tmp2_, &_inner_error_); + configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH, choice, &_inner_error_); #line 1250 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1250 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1250 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8541 "ConfigurationInterfaces.c" +#line 9119 "ConfigurationInterfaces.c" goto __catch166_configuration_error; } #line 1250 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8551,25 +9129,25 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1250 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8550 "ConfigurationInterfaces.c" +#line 9128 "ConfigurationInterfaces.c" } } goto __finally166; __catch166_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 8568 "ConfigurationInterfaces.c" +#line 9146 "ConfigurationInterfaces.c" } __finally166: #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8580,21 +9158,26 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8579 "ConfigurationInterfaces.c" +#line 9157 "ConfigurationInterfaces.c" } } -void configuration_facade_set_last_crop_width (ConfigurationFacade* self, gint choice) { +void +configuration_facade_set_last_crop_width (ConfigurationFacade* self, + gint choice) +{ #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_width (self, choice); -#line 8589 "ConfigurationInterfaces.c" +#line 9170 "ConfigurationInterfaces.c" } -static gchar* configuration_facade_real_get_last_used_service (ConfigurationFacade* self) { +static gchar* +configuration_facade_real_get_last_used_service (ConfigurationFacade* self) +{ gchar* result = NULL; GError * _inner_error_ = NULL; { @@ -8620,7 +9203,7 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8619 "ConfigurationInterfaces.c" +#line 9202 "ConfigurationInterfaces.c" goto __catch167_configuration_error; } #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8629,7 +9212,7 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca g_clear_error (&_inner_error_); #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 8628 "ConfigurationInterfaces.c" +#line 9211 "ConfigurationInterfaces.c" } #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -8641,7 +9224,7 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca _g_free0 (_tmp0_); #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 8640 "ConfigurationInterfaces.c" +#line 9223 "ConfigurationInterfaces.c" } goto __finally167; __catch167_configuration_error: @@ -8665,7 +9248,7 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca _g_error_free0 (err); #line 1268 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 8664 "ConfigurationInterfaces.c" +#line 9247 "ConfigurationInterfaces.c" } __finally167: #line 1260 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8674,43 +9257,45 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca g_clear_error (&_inner_error_); #line 1260 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 8673 "ConfigurationInterfaces.c" +#line 9256 "ConfigurationInterfaces.c" } -gchar* configuration_facade_get_last_used_service (ConfigurationFacade* self) { +gchar* +configuration_facade_get_last_used_service (ConfigurationFacade* self) +{ #line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_used_service (self); -#line 8682 "ConfigurationInterfaces.c" +#line 9267 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_last_used_service (ConfigurationFacade* self, const gchar* service_name) { +static void +configuration_facade_real_set_last_used_service (ConfigurationFacade* self, + const gchar* service_name) +{ GError * _inner_error_ = NULL; #line 1272 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (service_name != NULL); -#line 8690 "ConfigurationInterfaces.c" +#line 9278 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = service_name; -#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_LAST_USED_SERVICE, _tmp2_, &_inner_error_); + configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_LAST_USED_SERVICE, service_name, &_inner_error_); #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8709 "ConfigurationInterfaces.c" +#line 9294 "ConfigurationInterfaces.c" goto __catch168_configuration_error; } #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8719,25 +9304,25 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade g_clear_error (&_inner_error_); #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8718 "ConfigurationInterfaces.c" +#line 9303 "ConfigurationInterfaces.c" } } goto __finally168; __catch168_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 8736 "ConfigurationInterfaces.c" +#line 9321 "ConfigurationInterfaces.c" } __finally168: #line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8748,21 +9333,26 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade g_clear_error (&_inner_error_); #line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8747 "ConfigurationInterfaces.c" +#line 9332 "ConfigurationInterfaces.c" } } -void configuration_facade_set_last_used_service (ConfigurationFacade* self, const gchar* service_name) { +void +configuration_facade_set_last_used_service (ConfigurationFacade* self, + const gchar* service_name) +{ #line 1272 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1272 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_last_used_service (self, service_name); -#line 8757 "ConfigurationInterfaces.c" +#line 9345 "ConfigurationInterfaces.c" } -static gchar* configuration_facade_real_get_last_used_dataimports_service (ConfigurationFacade* self) { +static gchar* +configuration_facade_real_get_last_used_dataimports_service (ConfigurationFacade* self) +{ gchar* result = NULL; GError * _inner_error_ = NULL; { @@ -8788,7 +9378,7 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8787 "ConfigurationInterfaces.c" +#line 9377 "ConfigurationInterfaces.c" goto __catch169_configuration_error; } #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8797,7 +9387,7 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi g_clear_error (&_inner_error_); #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 8796 "ConfigurationInterfaces.c" +#line 9386 "ConfigurationInterfaces.c" } #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -8809,7 +9399,7 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi _g_free0 (_tmp0_); #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 8808 "ConfigurationInterfaces.c" +#line 9398 "ConfigurationInterfaces.c" } goto __finally169; __catch169_configuration_error: @@ -8833,7 +9423,7 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi _g_error_free0 (err); #line 1292 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 8832 "ConfigurationInterfaces.c" +#line 9422 "ConfigurationInterfaces.c" } __finally169: #line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8842,43 +9432,45 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi g_clear_error (&_inner_error_); #line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 8841 "ConfigurationInterfaces.c" +#line 9431 "ConfigurationInterfaces.c" } -gchar* configuration_facade_get_last_used_dataimports_service (ConfigurationFacade* self) { +gchar* +configuration_facade_get_last_used_dataimports_service (ConfigurationFacade* self) +{ #line 1283 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 1283 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_used_dataimports_service (self); -#line 8850 "ConfigurationInterfaces.c" +#line 9442 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_last_used_dataimports_service (ConfigurationFacade* self, const gchar* service_name) { +static void +configuration_facade_real_set_last_used_dataimports_service (ConfigurationFacade* self, + const gchar* service_name) +{ GError * _inner_error_ = NULL; #line 1296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (service_name != NULL); -#line 8858 "ConfigurationInterfaces.c" +#line 9453 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; #line 1298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = service_name; -#line 1298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE, _tmp2_, &_inner_error_); + configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE, service_name, &_inner_error_); #line 1298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8877 "ConfigurationInterfaces.c" +#line 9469 "ConfigurationInterfaces.c" goto __catch170_configuration_error; } #line 1298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8887,25 +9479,25 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu g_clear_error (&_inner_error_); #line 1298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8886 "ConfigurationInterfaces.c" +#line 9478 "ConfigurationInterfaces.c" } } goto __finally170; __catch170_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 8904 "ConfigurationInterfaces.c" +#line 9496 "ConfigurationInterfaces.c" } __finally170: #line 1297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8916,21 +9508,28 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu g_clear_error (&_inner_error_); #line 1297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8915 "ConfigurationInterfaces.c" +#line 9507 "ConfigurationInterfaces.c" } } -void configuration_facade_set_last_used_dataimports_service (ConfigurationFacade* self, const gchar* service_name) { +void +configuration_facade_set_last_used_dataimports_service (ConfigurationFacade* self, + const gchar* service_name) +{ #line 1296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_last_used_dataimports_service (self, service_name); -#line 8925 "ConfigurationInterfaces.c" +#line 9520 "ConfigurationInterfaces.c" } -static void configuration_facade_real_get_library_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by) { +static void +configuration_facade_real_get_library_photos_sort (ConfigurationFacade* self, + gboolean* sort_order, + gint* sort_by) +{ gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; GError * _inner_error_ = NULL; @@ -8938,35 +9537,31 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca _vala_sort_order = FALSE; #line 1309 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _vala_sort_by = 2; -#line 8937 "ConfigurationInterfaces.c" +#line 9536 "ConfigurationInterfaces.c" { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; - gint _tmp5_ = 0; + gint _tmp4_ = 0; + ConfigurationEngine* _tmp5_; ConfigurationEngine* _tmp6_; - ConfigurationEngine* _tmp7_; - gint _tmp8_; - gint _tmp9_; + gint _tmp7_; #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING, &_inner_error_); -#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8965 "ConfigurationInterfaces.c" +#line 9560 "ConfigurationInterfaces.c" goto __catch171_configuration_error; } #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8975,27 +9570,25 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca g_clear_error (&_inner_error_); #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8974 "ConfigurationInterfaces.c" +#line 9569 "ConfigurationInterfaces.c" } #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _vala_sort_order = _tmp0_; #line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = configuration_facade_get_engine (self); -#line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp7_ = _tmp6_; + _tmp5_ = configuration_facade_get_engine (self); #line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp8_ = configuration_engine_get_int_property (_tmp7_, CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY, &_inner_error_); + _tmp6_ = _tmp5_; #line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp9_ = _tmp8_; + _tmp7_ = configuration_engine_get_int_property (_tmp6_, CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY, &_inner_error_); #line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = _tmp9_; + _tmp4_ = _tmp7_; #line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8994 "ConfigurationInterfaces.c" +#line 9587 "ConfigurationInterfaces.c" goto __catch171_configuration_error; } #line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9004,28 +9597,28 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca g_clear_error (&_inner_error_); #line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9003 "ConfigurationInterfaces.c" +#line 9596 "ConfigurationInterfaces.c" } #line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _vala_sort_by = _tmp5_; -#line 9007 "ConfigurationInterfaces.c" + _vala_sort_by = _tmp4_; +#line 9600 "ConfigurationInterfaces.c" } goto __finally171; __catch171_configuration_error: { GError* err = NULL; - GError* _tmp10_; + GError* _tmp8_; #line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1315 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp10_ = err; + _tmp8_ = err; #line 1315 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp10_); + configuration_facade_on_configuration_error (self, _tmp8_); #line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 9024 "ConfigurationInterfaces.c" +#line 9617 "ConfigurationInterfaces.c" } __finally171: #line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9036,56 +9629,60 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca g_clear_error (&_inner_error_); #line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9035 "ConfigurationInterfaces.c" +#line 9628 "ConfigurationInterfaces.c" } #line 1307 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (sort_order) { #line 1307 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" *sort_order = _vala_sort_order; -#line 9041 "ConfigurationInterfaces.c" +#line 9634 "ConfigurationInterfaces.c" } #line 1307 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (sort_by) { #line 1307 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" *sort_by = _vala_sort_by; -#line 9047 "ConfigurationInterfaces.c" +#line 9640 "ConfigurationInterfaces.c" } } -void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by) { +void +configuration_facade_get_library_photos_sort (ConfigurationFacade* self, + gboolean* sort_order, + gint* sort_by) +{ #line 1307 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1307 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->get_library_photos_sort (self, sort_order, sort_by); -#line 9057 "ConfigurationInterfaces.c" +#line 9654 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_library_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by) { +static void +configuration_facade_real_set_library_photos_sort (ConfigurationFacade* self, + gboolean sort_order, + gint sort_by) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; + ConfigurationEngine* _tmp2_; ConfigurationEngine* _tmp3_; - ConfigurationEngine* _tmp4_; - gint _tmp5_; #line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = sort_order; -#line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING, sort_order, &_inner_error_); #line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9084 "ConfigurationInterfaces.c" +#line 9681 "ConfigurationInterfaces.c" goto __catch172_configuration_error; } #line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9094,23 +9691,21 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca g_clear_error (&_inner_error_); #line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9093 "ConfigurationInterfaces.c" +#line 9690 "ConfigurationInterfaces.c" } #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = configuration_facade_get_engine (self); -#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; + _tmp2_ = configuration_facade_get_engine (self); #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = sort_by; + _tmp3_ = _tmp2_; #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_int_property (_tmp4_, CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY, _tmp5_, &_inner_error_); + configuration_engine_set_int_property (_tmp3_, CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY, sort_by, &_inner_error_); #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9109 "ConfigurationInterfaces.c" +#line 9704 "ConfigurationInterfaces.c" goto __catch172_configuration_error; } #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9119,25 +9714,25 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca g_clear_error (&_inner_error_); #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9118 "ConfigurationInterfaces.c" +#line 9713 "ConfigurationInterfaces.c" } } goto __finally172; __catch172_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp4_; #line 1320 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1320 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp4_ = err; #line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp4_); #line 1320 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 9136 "ConfigurationInterfaces.c" +#line 9731 "ConfigurationInterfaces.c" } __finally172: #line 1320 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9148,21 +9743,29 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca g_clear_error (&_inner_error_); #line 1320 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9147 "ConfigurationInterfaces.c" +#line 9742 "ConfigurationInterfaces.c" } } -void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by) { +void +configuration_facade_set_library_photos_sort (ConfigurationFacade* self, + gboolean sort_order, + gint sort_by) +{ #line 1319 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1319 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_library_photos_sort (self, sort_order, sort_by); -#line 9157 "ConfigurationInterfaces.c" +#line 9756 "ConfigurationInterfaces.c" } -static void configuration_facade_real_get_library_window_state (ConfigurationFacade* self, gboolean* maximize, Dimensions* dimensions) { +static void +configuration_facade_real_get_library_window_state (ConfigurationFacade* self, + gboolean* maximize, + Dimensions* dimensions) +{ gboolean _vala_maximize = FALSE; Dimensions _vala_dimensions = {0}; GError * _inner_error_ = NULL; @@ -9170,42 +9773,37 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac _vala_maximize = FALSE; #line 1335 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" dimensions_init (&_vala_dimensions, 1024, 768); -#line 9169 "ConfigurationInterfaces.c" +#line 9772 "ConfigurationInterfaces.c" { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; gint w = 0; + ConfigurationEngine* _tmp4_; ConfigurationEngine* _tmp5_; - ConfigurationEngine* _tmp6_; - gint _tmp7_; - gint _tmp8_; + gint _tmp6_; gint h = 0; - ConfigurationEngine* _tmp9_; - ConfigurationEngine* _tmp10_; + ConfigurationEngine* _tmp7_; + ConfigurationEngine* _tmp8_; + gint _tmp9_; + gint _tmp10_; gint _tmp11_; - gint _tmp12_; - gint _tmp13_; - gint _tmp14_; #line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE, &_inner_error_); -#line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9204 "ConfigurationInterfaces.c" +#line 9802 "ConfigurationInterfaces.c" goto __catch173_configuration_error; } #line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9214,27 +9812,25 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac g_clear_error (&_inner_error_); #line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9213 "ConfigurationInterfaces.c" +#line 9811 "ConfigurationInterfaces.c" } #line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _vala_maximize = _tmp0_; #line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = configuration_facade_get_engine (self); + _tmp4_ = configuration_facade_get_engine (self); #line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = _tmp5_; -#line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp7_ = configuration_engine_get_int_property (_tmp6_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH, &_inner_error_); + _tmp5_ = _tmp4_; #line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp8_ = _tmp7_; + _tmp6_ = configuration_engine_get_int_property (_tmp5_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH, &_inner_error_); #line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp5_); #line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - w = _tmp8_; + w = _tmp6_; #line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9233 "ConfigurationInterfaces.c" +#line 9829 "ConfigurationInterfaces.c" goto __catch173_configuration_error; } #line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9243,25 +9839,23 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac g_clear_error (&_inner_error_); #line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9242 "ConfigurationInterfaces.c" +#line 9838 "ConfigurationInterfaces.c" } #line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp9_ = configuration_facade_get_engine (self); -#line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp10_ = _tmp9_; + _tmp7_ = configuration_facade_get_engine (self); #line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp11_ = configuration_engine_get_int_property (_tmp10_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT, &_inner_error_); + _tmp8_ = _tmp7_; #line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp12_ = _tmp11_; + _tmp9_ = configuration_engine_get_int_property (_tmp8_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT, &_inner_error_); #line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - h = _tmp12_; + h = _tmp9_; #line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9260 "ConfigurationInterfaces.c" +#line 9854 "ConfigurationInterfaces.c" goto __catch173_configuration_error; } #line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9270,32 +9864,32 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac g_clear_error (&_inner_error_); #line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9269 "ConfigurationInterfaces.c" +#line 9863 "ConfigurationInterfaces.c" } #line 1340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp13_ = w; + _tmp10_ = w; #line 1340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp14_ = h; + _tmp11_ = h; #line 1340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - dimensions_init (&_vala_dimensions, _tmp13_, _tmp14_); -#line 9277 "ConfigurationInterfaces.c" + dimensions_init (&_vala_dimensions, _tmp10_, _tmp11_); +#line 9871 "ConfigurationInterfaces.c" } goto __finally173; __catch173_configuration_error: { GError* err = NULL; - GError* _tmp15_; + GError* _tmp12_; #line 1336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp15_ = err; + _tmp12_ = err; #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp15_); + configuration_facade_on_configuration_error (self, _tmp12_); #line 1336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 9294 "ConfigurationInterfaces.c" +#line 9888 "ConfigurationInterfaces.c" } __finally173: #line 1336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9306,64 +9900,69 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac g_clear_error (&_inner_error_); #line 1336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9305 "ConfigurationInterfaces.c" +#line 9899 "ConfigurationInterfaces.c" } #line 1333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (maximize) { #line 1333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" *maximize = _vala_maximize; -#line 9311 "ConfigurationInterfaces.c" +#line 9905 "ConfigurationInterfaces.c" } #line 1333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (dimensions) { #line 1333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" *dimensions = _vala_dimensions; -#line 9317 "ConfigurationInterfaces.c" +#line 9911 "ConfigurationInterfaces.c" } } -void configuration_facade_get_library_window_state (ConfigurationFacade* self, gboolean* maximize, Dimensions* dimensions) { +void +configuration_facade_get_library_window_state (ConfigurationFacade* self, + gboolean* maximize, + Dimensions* dimensions) +{ #line 1333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->get_library_window_state (self, maximize, dimensions); -#line 9327 "ConfigurationInterfaces.c" +#line 9925 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_library_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions) { +static void +configuration_facade_real_set_library_window_state (ConfigurationFacade* self, + gboolean maximize, + Dimensions* dimensions) +{ GError * _inner_error_ = NULL; #line 1346 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (dimensions != NULL); -#line 9335 "ConfigurationInterfaces.c" +#line 9937 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; + ConfigurationEngine* _tmp2_; ConfigurationEngine* _tmp3_; - ConfigurationEngine* _tmp4_; - Dimensions _tmp5_; - gint _tmp6_; + Dimensions _tmp4_; + gint _tmp5_; + ConfigurationEngine* _tmp6_; ConfigurationEngine* _tmp7_; - ConfigurationEngine* _tmp8_; - Dimensions _tmp9_; - gint _tmp10_; + Dimensions _tmp8_; + gint _tmp9_; #line 1348 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1348 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1348 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = maximize; -#line 1348 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE, maximize, &_inner_error_); #line 1348 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1348 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1348 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9362 "ConfigurationInterfaces.c" +#line 9961 "ConfigurationInterfaces.c" goto __catch174_configuration_error; } #line 1348 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9372,25 +9971,25 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac g_clear_error (&_inner_error_); #line 1348 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9371 "ConfigurationInterfaces.c" +#line 9970 "ConfigurationInterfaces.c" } #line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = configuration_facade_get_engine (self); + _tmp2_ = configuration_facade_get_engine (self); #line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = *dimensions; + _tmp4_ = *dimensions; #line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = _tmp5_.width; + _tmp5_ = _tmp4_.width; #line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_int_property (_tmp4_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH, _tmp6_, &_inner_error_); + configuration_engine_set_int_property (_tmp3_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH, _tmp5_, &_inner_error_); #line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9389 "ConfigurationInterfaces.c" +#line 9988 "ConfigurationInterfaces.c" goto __catch174_configuration_error; } #line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9399,25 +9998,25 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac g_clear_error (&_inner_error_); #line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9398 "ConfigurationInterfaces.c" +#line 9997 "ConfigurationInterfaces.c" } #line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp7_ = configuration_facade_get_engine (self); + _tmp6_ = configuration_facade_get_engine (self); #line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp9_ = *dimensions; + _tmp8_ = *dimensions; #line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp10_ = _tmp9_.height; + _tmp9_ = _tmp8_.height; #line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_int_property (_tmp8_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT, _tmp10_, &_inner_error_); + configuration_engine_set_int_property (_tmp7_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT, _tmp9_, &_inner_error_); #line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9416 "ConfigurationInterfaces.c" +#line 10015 "ConfigurationInterfaces.c" goto __catch174_configuration_error; } #line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9426,25 +10025,25 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac g_clear_error (&_inner_error_); #line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9425 "ConfigurationInterfaces.c" +#line 10024 "ConfigurationInterfaces.c" } } goto __finally174; __catch174_configuration_error: { GError* err = NULL; - GError* _tmp11_; + GError* _tmp10_; #line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1354 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp11_ = err; + _tmp10_ = err; #line 1354 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp11_); + configuration_facade_on_configuration_error (self, _tmp10_); #line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 9443 "ConfigurationInterfaces.c" +#line 10042 "ConfigurationInterfaces.c" } __finally174: #line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9455,49 +10054,52 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac g_clear_error (&_inner_error_); #line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9454 "ConfigurationInterfaces.c" +#line 10053 "ConfigurationInterfaces.c" } } -void configuration_facade_set_library_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions) { +void +configuration_facade_set_library_window_state (ConfigurationFacade* self, + gboolean maximize, + Dimensions* dimensions) +{ #line 1346 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1346 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_library_window_state (self, maximize, dimensions); -#line 9464 "ConfigurationInterfaces.c" +#line 10067 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_modify_originals (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_modify_originals (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS, &_inner_error_); -#line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9492 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 10094 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9496 "ConfigurationInterfaces.c" +#line 10098 "ConfigurationInterfaces.c" goto __catch175_configuration_error; } #line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9505,35 +10107,35 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac #line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 9505 "ConfigurationInterfaces.c" + return _tmp4_; +#line 10107 "ConfigurationInterfaces.c" } #line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9511 "ConfigurationInterfaces.c" +#line 10113 "ConfigurationInterfaces.c" } goto __finally175; __catch175_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1368 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 1368 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1368 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9532 "ConfigurationInterfaces.c" +#line 10134 "ConfigurationInterfaces.c" } __finally175: #line 1362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9541,41 +10143,43 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac #line 1362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 9541 "ConfigurationInterfaces.c" + return _tmp6_; +#line 10143 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_modify_originals (ConfigurationFacade* self) { +gboolean +configuration_facade_get_modify_originals (ConfigurationFacade* self) +{ #line 1361 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1361 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_modify_originals (self); -#line 9550 "ConfigurationInterfaces.c" +#line 10154 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_modify_originals (ConfigurationFacade* self, gboolean modify_originals) { +static void +configuration_facade_real_set_modify_originals (ConfigurationFacade* self, + gboolean modify_originals) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = modify_originals; -#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS, modify_originals, &_inner_error_); #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9574 "ConfigurationInterfaces.c" +#line 10178 "ConfigurationInterfaces.c" goto __catch176_configuration_error; } #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9584,25 +10188,25 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9583 "ConfigurationInterfaces.c" +#line 10187 "ConfigurationInterfaces.c" } } goto __finally176; __catch176_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1376 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1376 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 9601 "ConfigurationInterfaces.c" +#line 10205 "ConfigurationInterfaces.c" } __finally176: #line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9613,49 +10217,51 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9612 "ConfigurationInterfaces.c" +#line 10216 "ConfigurationInterfaces.c" } } -void configuration_facade_set_modify_originals (ConfigurationFacade* self, gboolean modify_originals) { +void +configuration_facade_set_modify_originals (ConfigurationFacade* self, + gboolean modify_originals) +{ #line 1372 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1372 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_modify_originals (self, modify_originals); -#line 9622 "ConfigurationInterfaces.c" +#line 10229 "ConfigurationInterfaces.c" } -static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFacade* self) { +static gint +configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFacade* self) +{ gint result = 0; - gint _tmp9_ = 0; + gint _tmp8_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gint _tmp3_; - gint _tmp4_; #line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE, &_inner_error_); -#line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9650 "ConfigurationInterfaces.c" - gint _tmp5_ = 0; +#line 10256 "ConfigurationInterfaces.c" + gint _tmp4_ = 0; #line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9654 "ConfigurationInterfaces.c" +#line 10260 "ConfigurationInterfaces.c" goto __catch177_configuration_error; } #line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9663,41 +10269,41 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa #line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 9663 "ConfigurationInterfaces.c" + return _tmp4_; +#line 10269 "ConfigurationInterfaces.c" } #line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9669 "ConfigurationInterfaces.c" +#line 10275 "ConfigurationInterfaces.c" } goto __finally177; __catch177_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; + gint _tmp6_; gint _tmp7_; - gint _tmp8_; #line 1384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp7_ = thumbnail_get_DEFAULT_SCALE (); + _tmp6_ = thumbnail_get_DEFAULT_SCALE (); #line 1388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 1388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - result = _tmp8_; + result = _tmp7_; #line 1388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9696 "ConfigurationInterfaces.c" +#line 10302 "ConfigurationInterfaces.c" } __finally177: #line 1384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9705,41 +10311,43 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa #line 1384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp9_; -#line 9705 "ConfigurationInterfaces.c" + return _tmp8_; +#line 10311 "ConfigurationInterfaces.c" } -gint configuration_facade_get_photo_thumbnail_scale (ConfigurationFacade* self) { +gint +configuration_facade_get_photo_thumbnail_scale (ConfigurationFacade* self) +{ #line 1383 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1383 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_photo_thumbnail_scale (self); -#line 9714 "ConfigurationInterfaces.c" +#line 10322 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFacade* self, gint scale) { +static void +configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFacade* self, + gint scale) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gint _tmp2_; #line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = scale; -#line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE, _tmp2_, &_inner_error_); + configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE, scale, &_inner_error_); #line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9738 "ConfigurationInterfaces.c" +#line 10346 "ConfigurationInterfaces.c" goto __catch178_configuration_error; } #line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9748,25 +10356,25 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa g_clear_error (&_inner_error_); #line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9747 "ConfigurationInterfaces.c" +#line 10355 "ConfigurationInterfaces.c" } } goto __finally178; __catch178_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 9765 "ConfigurationInterfaces.c" +#line 10373 "ConfigurationInterfaces.c" } __finally178: #line 1393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9777,49 +10385,51 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa g_clear_error (&_inner_error_); #line 1393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9776 "ConfigurationInterfaces.c" +#line 10384 "ConfigurationInterfaces.c" } } -void configuration_facade_set_photo_thumbnail_scale (ConfigurationFacade* self, gint scale) { +void +configuration_facade_set_photo_thumbnail_scale (ConfigurationFacade* self, + gint scale) +{ #line 1392 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1392 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_photo_thumbnail_scale (self, scale); -#line 9786 "ConfigurationInterfaces.c" +#line 10397 "ConfigurationInterfaces.c" } -static gdouble configuration_facade_real_get_printing_content_height (ConfigurationFacade* self) { +static gdouble +configuration_facade_real_get_printing_content_height (ConfigurationFacade* self) +{ gdouble result = 0.0; - gdouble _tmp7_ = 0.0; + gdouble _tmp6_ = 0.0; GError * _inner_error_ = NULL; { gdouble _tmp0_ = 0.0; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gdouble _tmp3_; - gdouble _tmp4_; #line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_double_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT, &_inner_error_); -#line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9814 "ConfigurationInterfaces.c" - gdouble _tmp5_ = 0.0; +#line 10424 "ConfigurationInterfaces.c" + gdouble _tmp4_ = 0.0; #line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9818 "ConfigurationInterfaces.c" +#line 10428 "ConfigurationInterfaces.c" goto __catch179_configuration_error; } #line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9827,35 +10437,35 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat #line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 9827 "ConfigurationInterfaces.c" + return _tmp4_; +#line 10437 "ConfigurationInterfaces.c" } #line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9833 "ConfigurationInterfaces.c" +#line 10443 "ConfigurationInterfaces.c" } goto __finally179; __catch179_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1404 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1404 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1409 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 5.0; #line 1409 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1409 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9854 "ConfigurationInterfaces.c" +#line 10464 "ConfigurationInterfaces.c" } __finally179: #line 1404 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9863,41 +10473,43 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat #line 1404 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1404 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 9863 "ConfigurationInterfaces.c" + return _tmp6_; +#line 10473 "ConfigurationInterfaces.c" } -gdouble configuration_facade_get_printing_content_height (ConfigurationFacade* self) { +gdouble +configuration_facade_get_printing_content_height (ConfigurationFacade* self) +{ #line 1403 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0); #line 1403 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_height (self); -#line 9872 "ConfigurationInterfaces.c" +#line 10484 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_printing_content_height (ConfigurationFacade* self, gdouble content_height) { +static void +configuration_facade_real_set_printing_content_height (ConfigurationFacade* self, + gdouble content_height) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gdouble _tmp2_; #line 1415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = content_height; -#line 1415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_double_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT, _tmp2_, &_inner_error_); + configuration_engine_set_double_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT, content_height, &_inner_error_); #line 1415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9896 "ConfigurationInterfaces.c" +#line 10508 "ConfigurationInterfaces.c" goto __catch180_configuration_error; } #line 1415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9906,25 +10518,25 @@ static void configuration_facade_real_set_printing_content_height (Configuration g_clear_error (&_inner_error_); #line 1415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9905 "ConfigurationInterfaces.c" +#line 10517 "ConfigurationInterfaces.c" } } goto __finally180; __catch180_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 9923 "ConfigurationInterfaces.c" +#line 10535 "ConfigurationInterfaces.c" } __finally180: #line 1414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9935,49 +10547,51 @@ static void configuration_facade_real_set_printing_content_height (Configuration g_clear_error (&_inner_error_); #line 1414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9934 "ConfigurationInterfaces.c" +#line 10546 "ConfigurationInterfaces.c" } } -void configuration_facade_set_printing_content_height (ConfigurationFacade* self, gdouble content_height) { +void +configuration_facade_set_printing_content_height (ConfigurationFacade* self, + gdouble content_height) +{ #line 1413 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1413 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_height (self, content_height); -#line 9944 "ConfigurationInterfaces.c" +#line 10559 "ConfigurationInterfaces.c" } -static gint configuration_facade_real_get_printing_content_layout (ConfigurationFacade* self) { +static gint +configuration_facade_real_get_printing_content_layout (ConfigurationFacade* self) +{ gint result = 0; - gint _tmp7_ = 0; + gint _tmp6_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gint _tmp3_; - gint _tmp4_; #line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT, &_inner_error_); -#line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9972 "ConfigurationInterfaces.c" - gint _tmp5_ = 0; +#line 10586 "ConfigurationInterfaces.c" + gint _tmp4_ = 0; #line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9976 "ConfigurationInterfaces.c" +#line 10590 "ConfigurationInterfaces.c" goto __catch181_configuration_error; } #line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9985,35 +10599,35 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration #line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 9985 "ConfigurationInterfaces.c" + return _tmp4_; +#line 10599 "ConfigurationInterfaces.c" } #line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_ - 1; #line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9991 "ConfigurationInterfaces.c" +#line 10605 "ConfigurationInterfaces.c" } goto __finally181; __catch181_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1426 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1426 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1431 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 0; #line 1431 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1431 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10012 "ConfigurationInterfaces.c" +#line 10626 "ConfigurationInterfaces.c" } __finally181: #line 1426 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10021,41 +10635,43 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration #line 1426 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1426 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 10021 "ConfigurationInterfaces.c" + return _tmp6_; +#line 10635 "ConfigurationInterfaces.c" } -gint configuration_facade_get_printing_content_layout (ConfigurationFacade* self) { +gint +configuration_facade_get_printing_content_layout (ConfigurationFacade* self) +{ #line 1425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_layout (self); -#line 10030 "ConfigurationInterfaces.c" +#line 10646 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_printing_content_layout (ConfigurationFacade* self, gint layout_code) { +static void +configuration_facade_real_set_printing_content_layout (ConfigurationFacade* self, + gint layout_code) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gint _tmp2_; #line 1437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = layout_code; -#line 1437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT, _tmp2_ + 1, &_inner_error_); + configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT, layout_code + 1, &_inner_error_); #line 1437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10054 "ConfigurationInterfaces.c" +#line 10670 "ConfigurationInterfaces.c" goto __catch182_configuration_error; } #line 1437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10064,25 +10680,25 @@ static void configuration_facade_real_set_printing_content_layout (Configuration g_clear_error (&_inner_error_); #line 1437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10063 "ConfigurationInterfaces.c" +#line 10679 "ConfigurationInterfaces.c" } } goto __finally182; __catch182_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1436 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1436 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1436 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 10081 "ConfigurationInterfaces.c" +#line 10697 "ConfigurationInterfaces.c" } __finally182: #line 1436 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10093,49 +10709,51 @@ static void configuration_facade_real_set_printing_content_layout (Configuration g_clear_error (&_inner_error_); #line 1436 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10092 "ConfigurationInterfaces.c" +#line 10708 "ConfigurationInterfaces.c" } } -void configuration_facade_set_printing_content_layout (ConfigurationFacade* self, gint layout_code) { +void +configuration_facade_set_printing_content_layout (ConfigurationFacade* self, + gint layout_code) +{ #line 1435 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1435 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_layout (self, layout_code); -#line 10102 "ConfigurationInterfaces.c" +#line 10721 "ConfigurationInterfaces.c" } -static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFacade* self) { +static gint +configuration_facade_real_get_printing_content_ppi (ConfigurationFacade* self) +{ gint result = 0; - gint _tmp7_ = 0; + gint _tmp6_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gint _tmp3_; - gint _tmp4_; #line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI, &_inner_error_); -#line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10130 "ConfigurationInterfaces.c" - gint _tmp5_ = 0; +#line 10748 "ConfigurationInterfaces.c" + gint _tmp4_ = 0; #line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10134 "ConfigurationInterfaces.c" +#line 10752 "ConfigurationInterfaces.c" goto __catch183_configuration_error; } #line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10143,35 +10761,35 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac #line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 10143 "ConfigurationInterfaces.c" + return _tmp4_; +#line 10761 "ConfigurationInterfaces.c" } #line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10149 "ConfigurationInterfaces.c" +#line 10767 "ConfigurationInterfaces.c" } goto __finally183; __catch183_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1453 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 600; #line 1453 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1453 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10170 "ConfigurationInterfaces.c" +#line 10788 "ConfigurationInterfaces.c" } __finally183: #line 1448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10179,41 +10797,43 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac #line 1448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 10179 "ConfigurationInterfaces.c" + return _tmp6_; +#line 10797 "ConfigurationInterfaces.c" } -gint configuration_facade_get_printing_content_ppi (ConfigurationFacade* self) { +gint +configuration_facade_get_printing_content_ppi (ConfigurationFacade* self) +{ #line 1447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_ppi (self); -#line 10188 "ConfigurationInterfaces.c" +#line 10808 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_printing_content_ppi (ConfigurationFacade* self, gint content_ppi) { +static void +configuration_facade_real_set_printing_content_ppi (ConfigurationFacade* self, + gint content_ppi) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gint _tmp2_; #line 1459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = content_ppi; -#line 1459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI, _tmp2_, &_inner_error_); + configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI, content_ppi, &_inner_error_); #line 1459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10212 "ConfigurationInterfaces.c" +#line 10832 "ConfigurationInterfaces.c" goto __catch184_configuration_error; } #line 1459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10222,25 +10842,25 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac g_clear_error (&_inner_error_); #line 1459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10221 "ConfigurationInterfaces.c" +#line 10841 "ConfigurationInterfaces.c" } } goto __finally184; __catch184_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 10239 "ConfigurationInterfaces.c" +#line 10859 "ConfigurationInterfaces.c" } __finally184: #line 1458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10251,49 +10871,51 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac g_clear_error (&_inner_error_); #line 1458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10250 "ConfigurationInterfaces.c" +#line 10870 "ConfigurationInterfaces.c" } } -void configuration_facade_set_printing_content_ppi (ConfigurationFacade* self, gint content_ppi) { +void +configuration_facade_set_printing_content_ppi (ConfigurationFacade* self, + gint content_ppi) +{ #line 1457 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1457 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_ppi (self, content_ppi); -#line 10260 "ConfigurationInterfaces.c" +#line 10883 "ConfigurationInterfaces.c" } -static gint configuration_facade_real_get_printing_content_units (ConfigurationFacade* self) { +static gint +configuration_facade_real_get_printing_content_units (ConfigurationFacade* self) +{ gint result = 0; - gint _tmp7_ = 0; + gint _tmp6_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gint _tmp3_; - gint _tmp4_; #line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS, &_inner_error_); -#line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10288 "ConfigurationInterfaces.c" - gint _tmp5_ = 0; +#line 10910 "ConfigurationInterfaces.c" + gint _tmp4_ = 0; #line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10292 "ConfigurationInterfaces.c" +#line 10914 "ConfigurationInterfaces.c" goto __catch185_configuration_error; } #line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10301,35 +10923,35 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF #line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 10301 "ConfigurationInterfaces.c" + return _tmp4_; +#line 10923 "ConfigurationInterfaces.c" } #line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_ - 1; #line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10307 "ConfigurationInterfaces.c" +#line 10929 "ConfigurationInterfaces.c" } goto __finally185; __catch185_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 0; #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10328 "ConfigurationInterfaces.c" +#line 10950 "ConfigurationInterfaces.c" } __finally185: #line 1469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10337,41 +10959,43 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF #line 1469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 10337 "ConfigurationInterfaces.c" + return _tmp6_; +#line 10959 "ConfigurationInterfaces.c" } -gint configuration_facade_get_printing_content_units (ConfigurationFacade* self) { +gint +configuration_facade_get_printing_content_units (ConfigurationFacade* self) +{ #line 1468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_units (self); -#line 10346 "ConfigurationInterfaces.c" +#line 10970 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_printing_content_units (ConfigurationFacade* self, gint units_code) { +static void +configuration_facade_real_set_printing_content_units (ConfigurationFacade* self, + gint units_code) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gint _tmp2_; #line 1480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = units_code; -#line 1480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS, _tmp2_ + 1, &_inner_error_); + configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS, units_code + 1, &_inner_error_); #line 1480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10370 "ConfigurationInterfaces.c" +#line 10994 "ConfigurationInterfaces.c" goto __catch186_configuration_error; } #line 1480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10380,25 +11004,25 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF g_clear_error (&_inner_error_); #line 1480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10379 "ConfigurationInterfaces.c" +#line 11003 "ConfigurationInterfaces.c" } } goto __finally186; __catch186_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1479 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1479 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1479 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 10397 "ConfigurationInterfaces.c" +#line 11021 "ConfigurationInterfaces.c" } __finally186: #line 1479 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10409,49 +11033,51 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF g_clear_error (&_inner_error_); #line 1479 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10408 "ConfigurationInterfaces.c" +#line 11032 "ConfigurationInterfaces.c" } } -void configuration_facade_set_printing_content_units (ConfigurationFacade* self, gint units_code) { +void +configuration_facade_set_printing_content_units (ConfigurationFacade* self, + gint units_code) +{ #line 1478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_units (self, units_code); -#line 10418 "ConfigurationInterfaces.c" +#line 11045 "ConfigurationInterfaces.c" } -static gdouble configuration_facade_real_get_printing_content_width (ConfigurationFacade* self) { +static gdouble +configuration_facade_real_get_printing_content_width (ConfigurationFacade* self) +{ gdouble result = 0.0; - gdouble _tmp7_ = 0.0; + gdouble _tmp6_ = 0.0; GError * _inner_error_ = NULL; { gdouble _tmp0_ = 0.0; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gdouble _tmp3_; - gdouble _tmp4_; #line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_double_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH, &_inner_error_); -#line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10446 "ConfigurationInterfaces.c" - gdouble _tmp5_ = 0.0; +#line 11072 "ConfigurationInterfaces.c" + gdouble _tmp4_ = 0.0; #line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10450 "ConfigurationInterfaces.c" +#line 11076 "ConfigurationInterfaces.c" goto __catch187_configuration_error; } #line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10459,35 +11085,35 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati #line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 10459 "ConfigurationInterfaces.c" + return _tmp4_; +#line 11085 "ConfigurationInterfaces.c" } #line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10465 "ConfigurationInterfaces.c" +#line 11091 "ConfigurationInterfaces.c" } goto __finally187; __catch187_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 7.0; #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10486 "ConfigurationInterfaces.c" +#line 11112 "ConfigurationInterfaces.c" } __finally187: #line 1491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10495,41 +11121,43 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati #line 1491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 10495 "ConfigurationInterfaces.c" + return _tmp6_; +#line 11121 "ConfigurationInterfaces.c" } -gdouble configuration_facade_get_printing_content_width (ConfigurationFacade* self) { +gdouble +configuration_facade_get_printing_content_width (ConfigurationFacade* self) +{ #line 1490 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0); #line 1490 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_width (self); -#line 10504 "ConfigurationInterfaces.c" +#line 11132 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_printing_content_width (ConfigurationFacade* self, gdouble content_width) { +static void +configuration_facade_real_set_printing_content_width (ConfigurationFacade* self, + gdouble content_width) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gdouble _tmp2_; #line 1502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = content_width; -#line 1502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_double_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH, _tmp2_, &_inner_error_); + configuration_engine_set_double_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH, content_width, &_inner_error_); #line 1502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10528 "ConfigurationInterfaces.c" +#line 11156 "ConfigurationInterfaces.c" goto __catch188_configuration_error; } #line 1502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10538,25 +11166,25 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF g_clear_error (&_inner_error_); #line 1502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10537 "ConfigurationInterfaces.c" +#line 11165 "ConfigurationInterfaces.c" } } goto __finally188; __catch188_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1501 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1501 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1501 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 10555 "ConfigurationInterfaces.c" +#line 11183 "ConfigurationInterfaces.c" } __finally188: #line 1501 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10567,49 +11195,51 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF g_clear_error (&_inner_error_); #line 1501 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10566 "ConfigurationInterfaces.c" +#line 11194 "ConfigurationInterfaces.c" } } -void configuration_facade_set_printing_content_width (ConfigurationFacade* self, gdouble content_width) { +void +configuration_facade_set_printing_content_width (ConfigurationFacade* self, + gdouble content_width) +{ #line 1500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_width (self, content_width); -#line 10576 "ConfigurationInterfaces.c" +#line 11207 "ConfigurationInterfaces.c" } -static gint configuration_facade_real_get_printing_images_per_page (ConfigurationFacade* self) { +static gint +configuration_facade_real_get_printing_images_per_page (ConfigurationFacade* self) +{ gint result = 0; - gint _tmp7_ = 0; + gint _tmp6_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gint _tmp3_; - gint _tmp4_; #line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE, &_inner_error_); -#line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10604 "ConfigurationInterfaces.c" - gint _tmp5_ = 0; +#line 11234 "ConfigurationInterfaces.c" + gint _tmp4_ = 0; #line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10608 "ConfigurationInterfaces.c" +#line 11238 "ConfigurationInterfaces.c" goto __catch189_configuration_error; } #line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10617,35 +11247,35 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio #line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 10617 "ConfigurationInterfaces.c" + return _tmp4_; +#line 11247 "ConfigurationInterfaces.c" } #line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_ - 1; #line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10623 "ConfigurationInterfaces.c" +#line 11253 "ConfigurationInterfaces.c" } goto __finally189; __catch189_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1513 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1513 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 0; #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10644 "ConfigurationInterfaces.c" +#line 11274 "ConfigurationInterfaces.c" } __finally189: #line 1513 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10653,41 +11283,43 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio #line 1513 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1513 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 10653 "ConfigurationInterfaces.c" + return _tmp6_; +#line 11283 "ConfigurationInterfaces.c" } -gint configuration_facade_get_printing_images_per_page (ConfigurationFacade* self) { +gint +configuration_facade_get_printing_images_per_page (ConfigurationFacade* self) +{ #line 1512 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1512 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_images_per_page (self); -#line 10662 "ConfigurationInterfaces.c" +#line 11294 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_printing_images_per_page (ConfigurationFacade* self, gint images_per_page_code) { +static void +configuration_facade_real_set_printing_images_per_page (ConfigurationFacade* self, + gint images_per_page_code) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gint _tmp2_; #line 1524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = images_per_page_code; -#line 1524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE, _tmp2_ + 1, &_inner_error_); + configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE, images_per_page_code + 1, &_inner_error_); #line 1524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10686 "ConfigurationInterfaces.c" +#line 11318 "ConfigurationInterfaces.c" goto __catch190_configuration_error; } #line 1524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10696,25 +11328,25 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio g_clear_error (&_inner_error_); #line 1524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10695 "ConfigurationInterfaces.c" +#line 11327 "ConfigurationInterfaces.c" } } goto __finally190; __catch190_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1523 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1523 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1523 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 10713 "ConfigurationInterfaces.c" +#line 11345 "ConfigurationInterfaces.c" } __finally190: #line 1523 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10725,49 +11357,51 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio g_clear_error (&_inner_error_); #line 1523 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10724 "ConfigurationInterfaces.c" +#line 11356 "ConfigurationInterfaces.c" } } -void configuration_facade_set_printing_images_per_page (ConfigurationFacade* self, gint images_per_page_code) { +void +configuration_facade_set_printing_images_per_page (ConfigurationFacade* self, + gint images_per_page_code) +{ #line 1522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_images_per_page (self, images_per_page_code); -#line 10734 "ConfigurationInterfaces.c" +#line 11369 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_printing_match_aspect_ratio (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_printing_match_aspect_ratio (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO, &_inner_error_); -#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10762 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 11396 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10766 "ConfigurationInterfaces.c" +#line 11400 "ConfigurationInterfaces.c" goto __catch191_configuration_error; } #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10775,35 +11409,35 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 10775 "ConfigurationInterfaces.c" + return _tmp4_; +#line 11409 "ConfigurationInterfaces.c" } #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10781 "ConfigurationInterfaces.c" +#line 11415 "ConfigurationInterfaces.c" } goto __finally191; __catch191_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1538 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1538 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = TRUE; #line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10802 "ConfigurationInterfaces.c" +#line 11436 "ConfigurationInterfaces.c" } __finally191: #line 1535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10811,41 +11445,43 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi #line 1535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 10811 "ConfigurationInterfaces.c" + return _tmp6_; +#line 11445 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_printing_match_aspect_ratio (ConfigurationFacade* self) { +gboolean +configuration_facade_get_printing_match_aspect_ratio (ConfigurationFacade* self) +{ #line 1534 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1534 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_match_aspect_ratio (self); -#line 10820 "ConfigurationInterfaces.c" +#line 11456 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_printing_match_aspect_ratio (ConfigurationFacade* self, gboolean match_aspect_ratio) { +static void +configuration_facade_real_set_printing_match_aspect_ratio (ConfigurationFacade* self, + gboolean match_aspect_ratio) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = match_aspect_ratio; -#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO, match_aspect_ratio, &_inner_error_); #line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10844 "ConfigurationInterfaces.c" +#line 11480 "ConfigurationInterfaces.c" goto __catch192_configuration_error; } #line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10854,25 +11490,25 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura g_clear_error (&_inner_error_); #line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10853 "ConfigurationInterfaces.c" +#line 11489 "ConfigurationInterfaces.c" } } goto __finally192; __catch192_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 10871 "ConfigurationInterfaces.c" +#line 11507 "ConfigurationInterfaces.c" } __finally192: #line 1545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10883,49 +11519,51 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura g_clear_error (&_inner_error_); #line 1545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10882 "ConfigurationInterfaces.c" +#line 11518 "ConfigurationInterfaces.c" } } -void configuration_facade_set_printing_match_aspect_ratio (ConfigurationFacade* self, gboolean match_aspect_ratio) { +void +configuration_facade_set_printing_match_aspect_ratio (ConfigurationFacade* self, + gboolean match_aspect_ratio) +{ #line 1544 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1544 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_match_aspect_ratio (self, match_aspect_ratio); -#line 10892 "ConfigurationInterfaces.c" +#line 11531 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_printing_print_titles (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_printing_print_titles (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES, &_inner_error_); -#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10920 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 11558 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10924 "ConfigurationInterfaces.c" +#line 11562 "ConfigurationInterfaces.c" goto __catch193_configuration_error; } #line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10933,35 +11571,35 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati #line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 10933 "ConfigurationInterfaces.c" + return _tmp4_; +#line 11571 "ConfigurationInterfaces.c" } #line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10939 "ConfigurationInterfaces.c" +#line 11577 "ConfigurationInterfaces.c" } goto __finally193; __catch193_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10960 "ConfigurationInterfaces.c" +#line 11598 "ConfigurationInterfaces.c" } __finally193: #line 1557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10969,41 +11607,43 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati #line 1557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 10969 "ConfigurationInterfaces.c" + return _tmp6_; +#line 11607 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_printing_print_titles (ConfigurationFacade* self) { +gboolean +configuration_facade_get_printing_print_titles (ConfigurationFacade* self) +{ #line 1556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_print_titles (self); -#line 10978 "ConfigurationInterfaces.c" +#line 11618 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_printing_print_titles (ConfigurationFacade* self, gboolean print_titles) { +static void +configuration_facade_real_set_printing_print_titles (ConfigurationFacade* self, + gboolean print_titles) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 1568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = print_titles; -#line 1568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES, print_titles, &_inner_error_); #line 1568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11002 "ConfigurationInterfaces.c" +#line 11642 "ConfigurationInterfaces.c" goto __catch194_configuration_error; } #line 1568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11012,25 +11652,25 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa g_clear_error (&_inner_error_); #line 1568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11011 "ConfigurationInterfaces.c" +#line 11651 "ConfigurationInterfaces.c" } } goto __finally194; __catch194_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 11029 "ConfigurationInterfaces.c" +#line 11669 "ConfigurationInterfaces.c" } __finally194: #line 1567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11041,51 +11681,53 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa g_clear_error (&_inner_error_); #line 1567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11040 "ConfigurationInterfaces.c" +#line 11680 "ConfigurationInterfaces.c" } } -void configuration_facade_set_printing_print_titles (ConfigurationFacade* self, gboolean print_titles) { +void +configuration_facade_set_printing_print_titles (ConfigurationFacade* self, + gboolean print_titles) +{ #line 1566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_print_titles (self, print_titles); -#line 11050 "ConfigurationInterfaces.c" +#line 11693 "ConfigurationInterfaces.c" } -static gint configuration_facade_real_get_printing_size_selection (ConfigurationFacade* self) { +static gint +configuration_facade_real_get_printing_size_selection (ConfigurationFacade* self) +{ gint result = 0; - gint _tmp9_ = 0; + gint _tmp7_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gint _tmp3_; - gint _tmp4_; gint val = 0; - gint _tmp6_; + gint _tmp5_; #line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION, &_inner_error_); -#line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 11080 "ConfigurationInterfaces.c" - gint _tmp5_ = 0; +#line 11722 "ConfigurationInterfaces.c" + gint _tmp4_ = 0; #line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11084 "ConfigurationInterfaces.c" +#line 11726 "ConfigurationInterfaces.c" goto __catch195_configuration_error; } #line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11093,56 +11735,52 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration #line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 11093 "ConfigurationInterfaces.c" + return _tmp4_; +#line 11735 "ConfigurationInterfaces.c" } #line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" val = _tmp0_ - 1; #line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = val; + _tmp5_ = val; #line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - if (_tmp6_ == -2) { -#line 11101 "ConfigurationInterfaces.c" - ResourcesUnitSystem _tmp7_; + if (_tmp5_ == -2) { #line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp7_ = resources_get_default_measurement_unit (); -#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - if (_tmp7_ == RESOURCES_UNIT_SYSTEM_IMPERIAL) { + if (resources_get_default_measurement_unit () == RESOURCES_UNIT_SYSTEM_IMPERIAL) { #line 1583 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" val = 2; -#line 11109 "ConfigurationInterfaces.c" +#line 11747 "ConfigurationInterfaces.c" } else { #line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" val = 10; -#line 11113 "ConfigurationInterfaces.c" +#line 11751 "ConfigurationInterfaces.c" } } #line 1589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = val; #line 1589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11120 "ConfigurationInterfaces.c" +#line 11758 "ConfigurationInterfaces.c" } goto __finally195; __catch195_configuration_error: { GError* err = NULL; - GError* _tmp8_; + GError* _tmp6_; #line 1579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp8_ = err; + _tmp6_ = err; #line 1591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp8_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 0; #line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11141 "ConfigurationInterfaces.c" +#line 11779 "ConfigurationInterfaces.c" } __finally195: #line 1579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11150,41 +11788,43 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration #line 1579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp9_; -#line 11150 "ConfigurationInterfaces.c" + return _tmp7_; +#line 11788 "ConfigurationInterfaces.c" } -gint configuration_facade_get_printing_size_selection (ConfigurationFacade* self) { +gint +configuration_facade_get_printing_size_selection (ConfigurationFacade* self) +{ #line 1578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_size_selection (self); -#line 11159 "ConfigurationInterfaces.c" +#line 11799 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_printing_size_selection (ConfigurationFacade* self, gint size_code) { +static void +configuration_facade_real_set_printing_size_selection (ConfigurationFacade* self, + gint size_code) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gint _tmp2_; #line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = size_code; -#line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION, _tmp2_ + 1, &_inner_error_); + configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION, size_code + 1, &_inner_error_); #line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11183 "ConfigurationInterfaces.c" +#line 11823 "ConfigurationInterfaces.c" goto __catch196_configuration_error; } #line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11193,25 +11833,25 @@ static void configuration_facade_real_set_printing_size_selection (Configuration g_clear_error (&_inner_error_); #line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11192 "ConfigurationInterfaces.c" +#line 11832 "ConfigurationInterfaces.c" } } goto __finally196; __catch196_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1602 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1602 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 11210 "ConfigurationInterfaces.c" +#line 11850 "ConfigurationInterfaces.c" } __finally196: #line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11222,21 +11862,26 @@ static void configuration_facade_real_set_printing_size_selection (Configuration g_clear_error (&_inner_error_); #line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11221 "ConfigurationInterfaces.c" +#line 11861 "ConfigurationInterfaces.c" } } -void configuration_facade_set_printing_size_selection (ConfigurationFacade* self, gint size_code) { +void +configuration_facade_set_printing_size_selection (ConfigurationFacade* self, + gint size_code) +{ #line 1597 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1597 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_size_selection (self, size_code); -#line 11231 "ConfigurationInterfaces.c" +#line 11874 "ConfigurationInterfaces.c" } -static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationFacade* self) { +static gchar* +configuration_facade_real_get_printing_titles_font (ConfigurationFacade* self) +{ gchar* result = NULL; GError * _inner_error_ = NULL; { @@ -11262,7 +11907,7 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11261 "ConfigurationInterfaces.c" +#line 11906 "ConfigurationInterfaces.c" goto __catch197_configuration_error; } #line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11271,7 +11916,7 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF g_clear_error (&_inner_error_); #line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 11270 "ConfigurationInterfaces.c" +#line 11915 "ConfigurationInterfaces.c" } #line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -11283,7 +11928,7 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF _g_free0 (_tmp0_); #line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11282 "ConfigurationInterfaces.c" +#line 11927 "ConfigurationInterfaces.c" } goto __finally197; __catch197_configuration_error: @@ -11307,7 +11952,7 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF _g_error_free0 (err); #line 1617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11306 "ConfigurationInterfaces.c" +#line 11951 "ConfigurationInterfaces.c" } __finally197: #line 1610 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11316,43 +11961,45 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF g_clear_error (&_inner_error_); #line 1610 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 11315 "ConfigurationInterfaces.c" +#line 11960 "ConfigurationInterfaces.c" } -gchar* configuration_facade_get_printing_titles_font (ConfigurationFacade* self) { +gchar* +configuration_facade_get_printing_titles_font (ConfigurationFacade* self) +{ #line 1609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 1609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_titles_font (self); -#line 11324 "ConfigurationInterfaces.c" +#line 11971 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_printing_titles_font (ConfigurationFacade* self, const gchar* font_name) { +static void +configuration_facade_real_set_printing_titles_font (ConfigurationFacade* self, + const gchar* font_name) +{ GError * _inner_error_ = NULL; #line 1621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (font_name != NULL); -#line 11332 "ConfigurationInterfaces.c" +#line 11982 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; #line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = font_name; -#line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT, _tmp2_, &_inner_error_); + configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT, font_name, &_inner_error_); #line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11351 "ConfigurationInterfaces.c" +#line 11998 "ConfigurationInterfaces.c" goto __catch198_configuration_error; } #line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11361,25 +12008,25 @@ static void configuration_facade_real_set_printing_titles_font (ConfigurationFac g_clear_error (&_inner_error_); #line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11360 "ConfigurationInterfaces.c" +#line 12007 "ConfigurationInterfaces.c" } } goto __finally198; __catch198_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 11378 "ConfigurationInterfaces.c" +#line 12025 "ConfigurationInterfaces.c" } __finally198: #line 1622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11390,49 +12037,51 @@ static void configuration_facade_real_set_printing_titles_font (ConfigurationFac g_clear_error (&_inner_error_); #line 1622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11389 "ConfigurationInterfaces.c" +#line 12036 "ConfigurationInterfaces.c" } } -void configuration_facade_set_printing_titles_font (ConfigurationFacade* self, const gchar* font_name) { +void +configuration_facade_set_printing_titles_font (ConfigurationFacade* self, + const gchar* font_name) +{ #line 1621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_titles_font (self, font_name); -#line 11399 "ConfigurationInterfaces.c" +#line 12049 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_show_welcome_dialog (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_show_welcome_dialog (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG, &_inner_error_); -#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 11427 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 12076 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11431 "ConfigurationInterfaces.c" +#line 12080 "ConfigurationInterfaces.c" goto __catch199_configuration_error; } #line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11440,35 +12089,35 @@ static gboolean configuration_facade_real_get_show_welcome_dialog (Configuration #line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 11440 "ConfigurationInterfaces.c" + return _tmp4_; +#line 12089 "ConfigurationInterfaces.c" } #line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11446 "ConfigurationInterfaces.c" +#line 12095 "ConfigurationInterfaces.c" } goto __finally199; __catch199_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1633 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1633 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = TRUE; #line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11467 "ConfigurationInterfaces.c" +#line 12116 "ConfigurationInterfaces.c" } __finally199: #line 1633 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11476,41 +12125,43 @@ static gboolean configuration_facade_real_get_show_welcome_dialog (Configuration #line 1633 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1633 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 11476 "ConfigurationInterfaces.c" + return _tmp6_; +#line 12125 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_show_welcome_dialog (ConfigurationFacade* self) { +gboolean +configuration_facade_get_show_welcome_dialog (ConfigurationFacade* self) +{ #line 1632 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1632 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_show_welcome_dialog (self); -#line 11485 "ConfigurationInterfaces.c" +#line 12136 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFacade* self, gboolean show) { +static void +configuration_facade_real_set_show_welcome_dialog (ConfigurationFacade* self, + gboolean show) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 1644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = show; -#line 1644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG, show, &_inner_error_); #line 1644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11509 "ConfigurationInterfaces.c" +#line 12160 "ConfigurationInterfaces.c" goto __catch200_configuration_error; } #line 1644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11519,25 +12170,25 @@ static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFaca g_clear_error (&_inner_error_); #line 1644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11518 "ConfigurationInterfaces.c" +#line 12169 "ConfigurationInterfaces.c" } } goto __finally200; __catch200_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 11536 "ConfigurationInterfaces.c" +#line 12187 "ConfigurationInterfaces.c" } __finally200: #line 1643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11548,49 +12199,51 @@ static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFaca g_clear_error (&_inner_error_); #line 1643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11547 "ConfigurationInterfaces.c" +#line 12198 "ConfigurationInterfaces.c" } } -void configuration_facade_set_show_welcome_dialog (ConfigurationFacade* self, gboolean show) { +void +configuration_facade_set_show_welcome_dialog (ConfigurationFacade* self, + gboolean show) +{ #line 1642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_show_welcome_dialog (self, show); -#line 11557 "ConfigurationInterfaces.c" +#line 12211 "ConfigurationInterfaces.c" } -static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade* self) { +static gint +configuration_facade_real_get_sidebar_position (ConfigurationFacade* self) +{ gint result = 0; - gint _tmp7_ = 0; + gint _tmp6_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gint _tmp3_; - gint _tmp4_; #line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_SIDEBAR_POSITION, &_inner_error_); -#line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 11585 "ConfigurationInterfaces.c" - gint _tmp5_ = 0; +#line 12238 "ConfigurationInterfaces.c" + gint _tmp4_ = 0; #line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11589 "ConfigurationInterfaces.c" +#line 12242 "ConfigurationInterfaces.c" goto __catch201_configuration_error; } #line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11598,35 +12251,35 @@ static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade* #line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 11598 "ConfigurationInterfaces.c" + return _tmp4_; +#line 12251 "ConfigurationInterfaces.c" } #line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11604 "ConfigurationInterfaces.c" +#line 12257 "ConfigurationInterfaces.c" } goto __finally201; __catch201_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1660 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 180; #line 1660 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1660 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11625 "ConfigurationInterfaces.c" +#line 12278 "ConfigurationInterfaces.c" } __finally201: #line 1655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11634,41 +12287,43 @@ static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade* #line 1655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 11634 "ConfigurationInterfaces.c" + return _tmp6_; +#line 12287 "ConfigurationInterfaces.c" } -gint configuration_facade_get_sidebar_position (ConfigurationFacade* self) { +gint +configuration_facade_get_sidebar_position (ConfigurationFacade* self) +{ #line 1654 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1654 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_sidebar_position (self); -#line 11643 "ConfigurationInterfaces.c" +#line 12298 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_sidebar_position (ConfigurationFacade* self, gint position) { +static void +configuration_facade_real_set_sidebar_position (ConfigurationFacade* self, + gint position) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gint _tmp2_; #line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = position; -#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_SIDEBAR_POSITION, _tmp2_, &_inner_error_); + configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_SIDEBAR_POSITION, position, &_inner_error_); #line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11667 "ConfigurationInterfaces.c" +#line 12322 "ConfigurationInterfaces.c" goto __catch202_configuration_error; } #line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11677,25 +12332,25 @@ static void configuration_facade_real_set_sidebar_position (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11676 "ConfigurationInterfaces.c" +#line 12331 "ConfigurationInterfaces.c" } } goto __finally202; __catch202_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1668 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1668 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 11694 "ConfigurationInterfaces.c" +#line 12349 "ConfigurationInterfaces.c" } __finally202: #line 1665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11706,49 +12361,51 @@ static void configuration_facade_real_set_sidebar_position (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11705 "ConfigurationInterfaces.c" +#line 12360 "ConfigurationInterfaces.c" } } -void configuration_facade_set_sidebar_position (ConfigurationFacade* self, gint position) { +void +configuration_facade_set_sidebar_position (ConfigurationFacade* self, + gint position) +{ #line 1664 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1664 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_sidebar_position (self, position); -#line 11715 "ConfigurationInterfaces.c" +#line 12373 "ConfigurationInterfaces.c" } -static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacade* self) { +static gdouble +configuration_facade_real_get_slideshow_delay (ConfigurationFacade* self) +{ gdouble result = 0.0; - gdouble _tmp7_ = 0.0; + gdouble _tmp6_ = 0.0; GError * _inner_error_ = NULL; { gdouble _tmp0_ = 0.0; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gdouble _tmp3_; - gdouble _tmp4_; #line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_double_property (_tmp2_, CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY, &_inner_error_); -#line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 11743 "ConfigurationInterfaces.c" - gdouble _tmp5_ = 0.0; +#line 12400 "ConfigurationInterfaces.c" + gdouble _tmp4_ = 0.0; #line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11747 "ConfigurationInterfaces.c" +#line 12404 "ConfigurationInterfaces.c" goto __catch203_configuration_error; } #line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11756,35 +12413,35 @@ static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacad #line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 11756 "ConfigurationInterfaces.c" + return _tmp4_; +#line 12413 "ConfigurationInterfaces.c" } #line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11762 "ConfigurationInterfaces.c" +#line 12419 "ConfigurationInterfaces.c" } goto __finally203; __catch203_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1681 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 3.0; #line 1681 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1681 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11783 "ConfigurationInterfaces.c" +#line 12440 "ConfigurationInterfaces.c" } __finally203: #line 1676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11792,41 +12449,43 @@ static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacad #line 1676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 11792 "ConfigurationInterfaces.c" + return _tmp6_; +#line 12449 "ConfigurationInterfaces.c" } -gdouble configuration_facade_get_slideshow_delay (ConfigurationFacade* self) { +gdouble +configuration_facade_get_slideshow_delay (ConfigurationFacade* self) +{ #line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0); #line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_delay (self); -#line 11801 "ConfigurationInterfaces.c" +#line 12460 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade* self, gdouble delay) { +static void +configuration_facade_real_set_slideshow_delay (ConfigurationFacade* self, + gdouble delay) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gdouble _tmp2_; #line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = delay; -#line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_double_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY, _tmp2_, &_inner_error_); + configuration_engine_set_double_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY, delay, &_inner_error_); #line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11825 "ConfigurationInterfaces.c" +#line 12484 "ConfigurationInterfaces.c" goto __catch204_configuration_error; } #line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11835,25 +12494,25 @@ static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11834 "ConfigurationInterfaces.c" +#line 12493 "ConfigurationInterfaces.c" } } goto __finally204; __catch204_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1689 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1689 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 11852 "ConfigurationInterfaces.c" +#line 12511 "ConfigurationInterfaces.c" } __finally204: #line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11864,49 +12523,51 @@ static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11863 "ConfigurationInterfaces.c" +#line 12522 "ConfigurationInterfaces.c" } } -void configuration_facade_set_slideshow_delay (ConfigurationFacade* self, gdouble delay) { +void +configuration_facade_set_slideshow_delay (ConfigurationFacade* self, + gdouble delay) +{ #line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_delay (self, delay); -#line 11873 "ConfigurationInterfaces.c" +#line 12535 "ConfigurationInterfaces.c" } -static gdouble configuration_facade_real_get_slideshow_transition_delay (ConfigurationFacade* self) { +static gdouble +configuration_facade_real_get_slideshow_transition_delay (ConfigurationFacade* self) +{ gdouble result = 0.0; - gdouble _tmp7_ = 0.0; + gdouble _tmp6_ = 0.0; GError * _inner_error_ = NULL; { gdouble _tmp0_ = 0.0; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gdouble _tmp3_; - gdouble _tmp4_; #line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_double_property (_tmp2_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY, &_inner_error_); -#line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 11901 "ConfigurationInterfaces.c" - gdouble _tmp5_ = 0.0; +#line 12562 "ConfigurationInterfaces.c" + gdouble _tmp4_ = 0.0; #line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11905 "ConfigurationInterfaces.c" +#line 12566 "ConfigurationInterfaces.c" goto __catch205_configuration_error; } #line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11914,35 +12575,35 @@ static gdouble configuration_facade_real_get_slideshow_transition_delay (Configu #line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 11914 "ConfigurationInterfaces.c" + return _tmp4_; +#line 12575 "ConfigurationInterfaces.c" } #line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11920 "ConfigurationInterfaces.c" +#line 12581 "ConfigurationInterfaces.c" } goto __finally205; __catch205_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1703 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 0.3; #line 1703 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1703 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11941 "ConfigurationInterfaces.c" +#line 12602 "ConfigurationInterfaces.c" } __finally205: #line 1697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11950,41 +12611,43 @@ static gdouble configuration_facade_real_get_slideshow_transition_delay (Configu #line 1697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 11950 "ConfigurationInterfaces.c" + return _tmp6_; +#line 12611 "ConfigurationInterfaces.c" } -gdouble configuration_facade_get_slideshow_transition_delay (ConfigurationFacade* self) { +gdouble +configuration_facade_get_slideshow_transition_delay (ConfigurationFacade* self) +{ #line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0); #line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_transition_delay (self); -#line 11959 "ConfigurationInterfaces.c" +#line 12622 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_slideshow_transition_delay (ConfigurationFacade* self, gdouble delay) { +static void +configuration_facade_real_set_slideshow_transition_delay (ConfigurationFacade* self, + gdouble delay) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gdouble _tmp2_; #line 1709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = delay; -#line 1709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_double_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY, _tmp2_, &_inner_error_); + configuration_engine_set_double_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY, delay, &_inner_error_); #line 1709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11983 "ConfigurationInterfaces.c" +#line 12646 "ConfigurationInterfaces.c" goto __catch206_configuration_error; } #line 1709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11993,25 +12656,25 @@ static void configuration_facade_real_set_slideshow_transition_delay (Configurat g_clear_error (&_inner_error_); #line 1709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11992 "ConfigurationInterfaces.c" +#line 12655 "ConfigurationInterfaces.c" } } goto __finally206; __catch206_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 12010 "ConfigurationInterfaces.c" +#line 12673 "ConfigurationInterfaces.c" } __finally206: #line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12022,21 +12685,26 @@ static void configuration_facade_real_set_slideshow_transition_delay (Configurat g_clear_error (&_inner_error_); #line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 12021 "ConfigurationInterfaces.c" +#line 12684 "ConfigurationInterfaces.c" } } -void configuration_facade_set_slideshow_transition_delay (ConfigurationFacade* self, gdouble delay) { +void +configuration_facade_set_slideshow_transition_delay (ConfigurationFacade* self, + gdouble delay) +{ #line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_transition_delay (self, delay); -#line 12031 "ConfigurationInterfaces.c" +#line 12697 "ConfigurationInterfaces.c" } -static gchar* configuration_facade_real_get_slideshow_transition_effect_id (ConfigurationFacade* self) { +static gchar* +configuration_facade_real_get_slideshow_transition_effect_id (ConfigurationFacade* self) +{ gchar* result = NULL; GError * _inner_error_ = NULL; { @@ -12062,7 +12730,7 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 12061 "ConfigurationInterfaces.c" +#line 12729 "ConfigurationInterfaces.c" goto __catch207_configuration_error; } #line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12071,7 +12739,7 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf g_clear_error (&_inner_error_); #line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 12070 "ConfigurationInterfaces.c" +#line 12738 "ConfigurationInterfaces.c" } #line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -12083,7 +12751,7 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf _g_free0 (_tmp0_); #line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 12082 "ConfigurationInterfaces.c" +#line 12750 "ConfigurationInterfaces.c" } goto __finally207; __catch207_configuration_error: @@ -12107,7 +12775,7 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf _g_error_free0 (err); #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 12106 "ConfigurationInterfaces.c" +#line 12774 "ConfigurationInterfaces.c" } __finally207: #line 1720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12116,43 +12784,45 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf g_clear_error (&_inner_error_); #line 1720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 12115 "ConfigurationInterfaces.c" +#line 12783 "ConfigurationInterfaces.c" } -gchar* configuration_facade_get_slideshow_transition_effect_id (ConfigurationFacade* self) { +gchar* +configuration_facade_get_slideshow_transition_effect_id (ConfigurationFacade* self) +{ #line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_transition_effect_id (self); -#line 12124 "ConfigurationInterfaces.c" +#line 12794 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_slideshow_transition_effect_id (ConfigurationFacade* self, const gchar* id) { +static void +configuration_facade_real_set_slideshow_transition_effect_id (ConfigurationFacade* self, + const gchar* id) +{ GError * _inner_error_ = NULL; #line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (id != NULL); -#line 12132 "ConfigurationInterfaces.c" +#line 12805 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; #line 1734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = id; -#line 1734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID, _tmp2_, &_inner_error_); + configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID, id, &_inner_error_); #line 1734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 12151 "ConfigurationInterfaces.c" +#line 12821 "ConfigurationInterfaces.c" goto __catch208_configuration_error; } #line 1734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12161,25 +12831,25 @@ static void configuration_facade_real_set_slideshow_transition_effect_id (Config g_clear_error (&_inner_error_); #line 1734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 12160 "ConfigurationInterfaces.c" +#line 12830 "ConfigurationInterfaces.c" } } goto __finally208; __catch208_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 12178 "ConfigurationInterfaces.c" +#line 12848 "ConfigurationInterfaces.c" } __finally208: #line 1733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12190,49 +12860,51 @@ static void configuration_facade_real_set_slideshow_transition_effect_id (Config g_clear_error (&_inner_error_); #line 1733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 12189 "ConfigurationInterfaces.c" +#line 12859 "ConfigurationInterfaces.c" } } -void configuration_facade_set_slideshow_transition_effect_id (ConfigurationFacade* self, const gchar* id) { +void +configuration_facade_set_slideshow_transition_effect_id (ConfigurationFacade* self, + const gchar* id) +{ #line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_transition_effect_id (self, id); -#line 12199 "ConfigurationInterfaces.c" +#line 12872 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_slideshow_show_title (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_slideshow_show_title (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE, &_inner_error_); -#line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12227 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 12899 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 12231 "ConfigurationInterfaces.c" +#line 12903 "ConfigurationInterfaces.c" goto __catch209_configuration_error; } #line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12240,35 +12912,35 @@ static gboolean configuration_facade_real_get_slideshow_show_title (Configuratio #line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 12240 "ConfigurationInterfaces.c" + return _tmp4_; +#line 12912 "ConfigurationInterfaces.c" } #line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 12246 "ConfigurationInterfaces.c" +#line 12918 "ConfigurationInterfaces.c" } goto __finally209; __catch209_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 12267 "ConfigurationInterfaces.c" +#line 12939 "ConfigurationInterfaces.c" } __finally209: #line 1745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12276,41 +12948,43 @@ static gboolean configuration_facade_real_get_slideshow_show_title (Configuratio #line 1745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 12276 "ConfigurationInterfaces.c" + return _tmp6_; +#line 12948 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_slideshow_show_title (ConfigurationFacade* self) { +gboolean +configuration_facade_get_slideshow_show_title (ConfigurationFacade* self) +{ #line 1744 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1744 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_show_title (self); -#line 12285 "ConfigurationInterfaces.c" +#line 12959 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_slideshow_show_title (ConfigurationFacade* self, gboolean show_title) { +static void +configuration_facade_real_set_slideshow_show_title (ConfigurationFacade* self, + gboolean show_title) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 1756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = show_title; -#line 1756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE, show_title, &_inner_error_); #line 1756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 12309 "ConfigurationInterfaces.c" +#line 12983 "ConfigurationInterfaces.c" goto __catch210_configuration_error; } #line 1756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12319,25 +12993,25 @@ static void configuration_facade_real_set_slideshow_show_title (ConfigurationFac g_clear_error (&_inner_error_); #line 1756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 12318 "ConfigurationInterfaces.c" +#line 12992 "ConfigurationInterfaces.c" } } goto __finally210; __catch210_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1755 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1755 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1755 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 12336 "ConfigurationInterfaces.c" +#line 13010 "ConfigurationInterfaces.c" } __finally210: #line 1755 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12348,36 +13022,45 @@ static void configuration_facade_real_set_slideshow_show_title (ConfigurationFac g_clear_error (&_inner_error_); #line 1755 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 12347 "ConfigurationInterfaces.c" +#line 13021 "ConfigurationInterfaces.c" } } -void configuration_facade_set_slideshow_show_title (ConfigurationFacade* self, gboolean show_title) { +void +configuration_facade_set_slideshow_show_title (ConfigurationFacade* self, + gboolean show_title) +{ #line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_show_title (self, show_title); -#line 12357 "ConfigurationInterfaces.c" +#line 13034 "ConfigurationInterfaces.c" } -static void g_time_local (time_t time, struct tm* result) { +static void +g_time_local (time_t time, + struct tm* result) +{ struct tm _result_ = {0}; struct tm _tmp0_ = {0}; -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" localtime_r (&time, &_tmp0_); -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" *result = _result_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return; -#line 12372 "ConfigurationInterfaces.c" +#line 13052 "ConfigurationInterfaces.c" } -static gchar* g_time_format (struct tm *self, const gchar* format) { +static gchar* +g_time_format (struct tm *self, + const gchar* format) +{ gchar* result = NULL; gchar* buffer = NULL; gchar* _tmp0_; @@ -12385,73 +13068,69 @@ static gchar* g_time_format (struct tm *self, const gchar* format) { gint _buffer_size_; gchar* _tmp1_; gint _tmp1__length1; - const gchar* _tmp2_; + gchar* _tmp2_; + gint _tmp2__length1; gchar* _tmp3_; - gint _tmp3__length1; - gchar* _tmp4_; -#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2874 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (format != NULL, NULL); -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_new0 (gchar, 64); -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer = _tmp0_; -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer_length1 = 64; -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _buffer_size_ = buffer_length1; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = buffer; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1__length1 = buffer_length1; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = format; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self)); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = buffer; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3__length1 = buffer_length1; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = g_strdup ((const gchar*) _tmp3_); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + strftime (_tmp1_, _tmp1__length1, format, &(*self)); +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = buffer; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2__length1 = buffer_length1; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_strdup ((const gchar*) _tmp2_); +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp3_; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer = (g_free (buffer), NULL); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 12418 "ConfigurationInterfaces.c" +#line 13098 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_use_24_hour_time (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp12_ = FALSE; + gboolean _tmp10_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME, &_inner_error_); -#line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12446 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 13125 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 12450 "ConfigurationInterfaces.c" +#line 13129 "ConfigurationInterfaces.c" goto __catch211_configuration_error; } #line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12459,52 +13138,49 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac #line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 12459 "ConfigurationInterfaces.c" + return _tmp4_; +#line 13138 "ConfigurationInterfaces.c" } #line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 12465 "ConfigurationInterfaces.c" +#line 13144 "ConfigurationInterfaces.c" } goto __finally211; __catch211_configuration_error: { GError* err = NULL; - GError* _tmp6_; - struct tm _tmp7_ = {0}; + GError* _tmp5_; + struct tm _tmp6_ = {0}; + gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; - gboolean _tmp10_; - gboolean _tmp11_; + gboolean _tmp9_; #line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); -#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - g_time_local ((time_t) 0, &_tmp7_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp8_ = g_time_format (&_tmp7_, "%p"); + g_time_local ((time_t) 0, &_tmp6_); #line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp9_ = _tmp8_; + _tmp7_ = g_time_format (&_tmp6_, "%p"); #line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp10_ = is_string_empty (_tmp9_); + _tmp8_ = _tmp7_; #line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp11_ = _tmp10_; + _tmp9_ = is_string_empty (_tmp8_); #line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp8_); #line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - result = _tmp11_; + result = _tmp9_; #line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 12503 "ConfigurationInterfaces.c" +#line 13179 "ConfigurationInterfaces.c" } __finally211: #line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12512,41 +13188,43 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac #line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp12_; -#line 12512 "ConfigurationInterfaces.c" + return _tmp10_; +#line 13188 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_use_24_hour_time (ConfigurationFacade* self) { +gboolean +configuration_facade_get_use_24_hour_time (ConfigurationFacade* self) +{ #line 1765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_use_24_hour_time (self); -#line 12521 "ConfigurationInterfaces.c" +#line 13199 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade* self, gboolean use_24_hour_time) { +static void +configuration_facade_real_set_use_24_hour_time (ConfigurationFacade* self, + gboolean use_24_hour_time) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = use_24_hour_time; -#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME, use_24_hour_time, &_inner_error_); #line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 12545 "ConfigurationInterfaces.c" +#line 13223 "ConfigurationInterfaces.c" goto __catch212_configuration_error; } #line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12555,25 +13233,25 @@ static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 12554 "ConfigurationInterfaces.c" +#line 13232 "ConfigurationInterfaces.c" } } goto __finally212; __catch212_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 12572 "ConfigurationInterfaces.c" +#line 13250 "ConfigurationInterfaces.c" } __finally212: #line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12584,49 +13262,51 @@ static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 12583 "ConfigurationInterfaces.c" +#line 13261 "ConfigurationInterfaces.c" } } -void configuration_facade_set_use_24_hour_time (ConfigurationFacade* self, gboolean use_24_hour_time) { +void +configuration_facade_set_use_24_hour_time (ConfigurationFacade* self, + gboolean use_24_hour_time) +{ #line 1777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_use_24_hour_time (self, use_24_hour_time); -#line 12593 "ConfigurationInterfaces.c" +#line 13274 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_use_lowercase_filenames (ConfigurationFacade* self) { +static gboolean +configuration_facade_real_get_use_lowercase_filenames (ConfigurationFacade* self) +{ gboolean result = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; #line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES, &_inner_error_); -#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12621 "ConfigurationInterfaces.c" - gboolean _tmp5_ = FALSE; +#line 13301 "ConfigurationInterfaces.c" + gboolean _tmp4_ = FALSE; #line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 12625 "ConfigurationInterfaces.c" +#line 13305 "ConfigurationInterfaces.c" goto __catch213_configuration_error; } #line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12634,35 +13314,35 @@ static gboolean configuration_facade_real_get_use_lowercase_filenames (Configura #line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 12634 "ConfigurationInterfaces.c" + return _tmp4_; +#line 13314 "ConfigurationInterfaces.c" } #line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 12640 "ConfigurationInterfaces.c" +#line 13320 "ConfigurationInterfaces.c" } goto __finally213; __catch213_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1789 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1789 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1792 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1792 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 12661 "ConfigurationInterfaces.c" +#line 13341 "ConfigurationInterfaces.c" } __finally213: #line 1789 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12670,41 +13350,43 @@ static gboolean configuration_facade_real_get_use_lowercase_filenames (Configura #line 1789 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1789 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 12670 "ConfigurationInterfaces.c" + return _tmp6_; +#line 13350 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_use_lowercase_filenames (ConfigurationFacade* self) { +gboolean +configuration_facade_get_use_lowercase_filenames (ConfigurationFacade* self) +{ #line 1788 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1788 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_use_lowercase_filenames (self); -#line 12679 "ConfigurationInterfaces.c" +#line 13361 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_use_lowercase_filenames (ConfigurationFacade* self, gboolean b) { +static void +configuration_facade_real_set_use_lowercase_filenames (ConfigurationFacade* self, + gboolean b) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gboolean _tmp2_; #line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = b; -#line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES, _tmp2_, &_inner_error_); + configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES, b, &_inner_error_); #line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 12703 "ConfigurationInterfaces.c" +#line 13385 "ConfigurationInterfaces.c" goto __catch214_configuration_error; } #line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12713,25 +13395,25 @@ static void configuration_facade_real_set_use_lowercase_filenames (Configuration g_clear_error (&_inner_error_); #line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 12712 "ConfigurationInterfaces.c" +#line 13394 "ConfigurationInterfaces.c" } } goto __finally214; __catch214_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1802 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1802 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 12730 "ConfigurationInterfaces.c" +#line 13412 "ConfigurationInterfaces.c" } __finally214: #line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12742,49 +13424,51 @@ static void configuration_facade_real_set_use_lowercase_filenames (Configuration g_clear_error (&_inner_error_); #line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 12741 "ConfigurationInterfaces.c" +#line 13423 "ConfigurationInterfaces.c" } } -void configuration_facade_set_use_lowercase_filenames (ConfigurationFacade* self, gboolean b) { +void +configuration_facade_set_use_lowercase_filenames (ConfigurationFacade* self, + gboolean b) +{ #line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_use_lowercase_filenames (self, b); -#line 12751 "ConfigurationInterfaces.c" +#line 13436 "ConfigurationInterfaces.c" } -static gint configuration_facade_real_get_video_interpreter_state_cookie (ConfigurationFacade* self) { +static gint +configuration_facade_real_get_video_interpreter_state_cookie (ConfigurationFacade* self) +{ gint result = 0; - gint _tmp7_ = 0; + gint _tmp6_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; ConfigurationEngine* _tmp1_; ConfigurationEngine* _tmp2_; gint _tmp3_; - gint _tmp4_; #line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp2_ = _tmp1_; #line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE, &_inner_error_); -#line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; #line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); #line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12779 "ConfigurationInterfaces.c" - gint _tmp5_ = 0; +#line 13463 "ConfigurationInterfaces.c" + gint _tmp4_ = 0; #line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 12783 "ConfigurationInterfaces.c" +#line 13467 "ConfigurationInterfaces.c" goto __catch215_configuration_error; } #line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12792,35 +13476,35 @@ static gint configuration_facade_real_get_video_interpreter_state_cookie (Config #line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp5_; -#line 12792 "ConfigurationInterfaces.c" + return _tmp4_; +#line 13476 "ConfigurationInterfaces.c" } #line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 12798 "ConfigurationInterfaces.c" +#line 13482 "ConfigurationInterfaces.c" } goto __finally215; __catch215_configuration_error: { GError* err = NULL; - GError* _tmp6_; + GError* _tmp5_; #line 1810 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1810 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = err; + _tmp5_ = err; #line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp6_); + configuration_facade_on_configuration_error (self, _tmp5_); #line 1816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = -1; #line 1816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 12819 "ConfigurationInterfaces.c" +#line 13503 "ConfigurationInterfaces.c" } __finally215: #line 1810 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12828,41 +13512,43 @@ static gint configuration_facade_real_get_video_interpreter_state_cookie (Config #line 1810 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1810 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return _tmp7_; -#line 12828 "ConfigurationInterfaces.c" + return _tmp6_; +#line 13512 "ConfigurationInterfaces.c" } -gint configuration_facade_get_video_interpreter_state_cookie (ConfigurationFacade* self) { +gint +configuration_facade_get_video_interpreter_state_cookie (ConfigurationFacade* self) +{ #line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_video_interpreter_state_cookie (self); -#line 12837 "ConfigurationInterfaces.c" +#line 13523 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_video_interpreter_state_cookie (ConfigurationFacade* self, gint state_cookie) { +static void +configuration_facade_real_set_video_interpreter_state_cookie (ConfigurationFacade* self, + gint state_cookie) +{ GError * _inner_error_ = NULL; { ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - gint _tmp2_; #line 1822 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp0_ = configuration_facade_get_engine (self); #line 1822 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1822 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = state_cookie; -#line 1822 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE, _tmp2_, &_inner_error_); + configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE, state_cookie, &_inner_error_); #line 1822 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1822 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1822 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 12861 "ConfigurationInterfaces.c" +#line 13547 "ConfigurationInterfaces.c" goto __catch216_configuration_error; } #line 1822 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12871,25 +13557,25 @@ static void configuration_facade_real_set_video_interpreter_state_cookie (Config g_clear_error (&_inner_error_); #line 1822 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 12870 "ConfigurationInterfaces.c" +#line 13556 "ConfigurationInterfaces.c" } } goto __finally216; __catch216_configuration_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 1821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp3_); + configuration_facade_on_configuration_error (self, _tmp2_); #line 1821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 12888 "ConfigurationInterfaces.c" +#line 13574 "ConfigurationInterfaces.c" } __finally216: #line 1821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12900,30 +13586,34 @@ static void configuration_facade_real_set_video_interpreter_state_cookie (Config g_clear_error (&_inner_error_); #line 1821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 12899 "ConfigurationInterfaces.c" +#line 13585 "ConfigurationInterfaces.c" } } -void configuration_facade_set_video_interpreter_state_cookie (ConfigurationFacade* self, gint state_cookie) { +void +configuration_facade_set_video_interpreter_state_cookie (ConfigurationFacade* self, + gint state_cookie) +{ #line 1820 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1820 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_video_interpreter_state_cookie (self, state_cookie); -#line 12909 "ConfigurationInterfaces.c" +#line 13598 "ConfigurationInterfaces.c" } -static gboolean configuration_facade_real_get_plugin_bool (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gboolean def) { +static gboolean +configuration_facade_real_get_plugin_bool (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gboolean def) +{ gboolean result = FALSE; ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; - gboolean _tmp7_; + gboolean _tmp2_; #line 1832 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (domain != NULL, FALSE); #line 1832 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12935,43 +13625,41 @@ static gboolean configuration_facade_real_get_plugin_bool (ConfigurationFacade* #line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = domain; -#line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = id; -#line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = key; -#line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = def; -#line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = configuration_engine_get_plugin_bool (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_); -#line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp7_ = _tmp6_; + _tmp2_ = configuration_engine_get_plugin_bool (_tmp1_, domain, id, key, def); #line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - result = _tmp7_; + result = _tmp2_; #line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 12951 "ConfigurationInterfaces.c" +#line 13631 "ConfigurationInterfaces.c" } -gboolean configuration_facade_get_plugin_bool (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gboolean def) { +gboolean +configuration_facade_get_plugin_bool (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gboolean def) +{ #line 1832 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1832 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_bool (self, domain, id, key, def); -#line 12960 "ConfigurationInterfaces.c" +#line 13646 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_plugin_bool (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gboolean val) { +static void +configuration_facade_real_set_plugin_bool (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gboolean val) +{ ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - gboolean _tmp5_; #line 1836 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (domain != NULL); #line 1836 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12983,40 +13671,39 @@ static void configuration_facade_real_set_plugin_bool (ConfigurationFacade* self #line 1837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = domain; -#line 1837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = id; -#line 1837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = key; -#line 1837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = val; -#line 1837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_plugin_bool (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_); + configuration_engine_set_plugin_bool (_tmp1_, domain, id, key, val); #line 1837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); -#line 12993 "ConfigurationInterfaces.c" +#line 13673 "ConfigurationInterfaces.c" } -void configuration_facade_set_plugin_bool (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gboolean val) { +void +configuration_facade_set_plugin_bool (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gboolean val) +{ #line 1836 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1836 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_bool (self, domain, id, key, val); -#line 13002 "ConfigurationInterfaces.c" +#line 13688 "ConfigurationInterfaces.c" } -static gdouble configuration_facade_real_get_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble def) { +static gdouble +configuration_facade_real_get_plugin_double (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gdouble def) +{ gdouble result = 0.0; ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - gdouble _tmp5_; - gdouble _tmp6_; - gdouble _tmp7_; + gdouble _tmp2_; #line 1840 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (domain != NULL, 0.0); #line 1840 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -13028,43 +13715,41 @@ static gdouble configuration_facade_real_get_plugin_double (ConfigurationFacade* #line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = domain; -#line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = id; -#line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = key; -#line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = def; -#line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = configuration_engine_get_plugin_double (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_); -#line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp7_ = _tmp6_; + _tmp2_ = configuration_engine_get_plugin_double (_tmp1_, domain, id, key, def); #line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - result = _tmp7_; + result = _tmp2_; #line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 13044 "ConfigurationInterfaces.c" +#line 13721 "ConfigurationInterfaces.c" } -gdouble configuration_facade_get_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble def) { +gdouble +configuration_facade_get_plugin_double (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gdouble def) +{ #line 1840 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0); #line 1840 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_double (self, domain, id, key, def); -#line 13053 "ConfigurationInterfaces.c" +#line 13736 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble val) { +static void +configuration_facade_real_set_plugin_double (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gdouble val) +{ ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - gdouble _tmp5_; #line 1844 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (domain != NULL); #line 1844 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -13076,40 +13761,39 @@ static void configuration_facade_real_set_plugin_double (ConfigurationFacade* se #line 1845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = domain; -#line 1845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = id; -#line 1845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = key; -#line 1845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = val; -#line 1845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_plugin_double (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_); + configuration_engine_set_plugin_double (_tmp1_, domain, id, key, val); #line 1845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); -#line 13086 "ConfigurationInterfaces.c" +#line 13763 "ConfigurationInterfaces.c" } -void configuration_facade_set_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble val) { +void +configuration_facade_set_plugin_double (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gdouble val) +{ #line 1844 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1844 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_double (self, domain, id, key, val); -#line 13095 "ConfigurationInterfaces.c" +#line 13778 "ConfigurationInterfaces.c" } -static gint configuration_facade_real_get_plugin_int (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gint def) { +static gint +configuration_facade_real_get_plugin_int (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gint def) +{ gint result = 0; ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - gint _tmp5_; - gint _tmp6_; - gint _tmp7_; + gint _tmp2_; #line 1848 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (domain != NULL, 0); #line 1848 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -13121,43 +13805,41 @@ static gint configuration_facade_real_get_plugin_int (ConfigurationFacade* self, #line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = domain; -#line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = id; -#line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = key; -#line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = def; -#line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = configuration_engine_get_plugin_int (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_); -#line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp7_ = _tmp6_; + _tmp2_ = configuration_engine_get_plugin_int (_tmp1_, domain, id, key, def); #line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - result = _tmp7_; + result = _tmp2_; #line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 13137 "ConfigurationInterfaces.c" +#line 13811 "ConfigurationInterfaces.c" } -gint configuration_facade_get_plugin_int (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gint def) { +gint +configuration_facade_get_plugin_int (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gint def) +{ #line 1848 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1848 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_int (self, domain, id, key, def); -#line 13146 "ConfigurationInterfaces.c" +#line 13826 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_plugin_int (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gint val) { +static void +configuration_facade_real_set_plugin_int (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gint val) +{ ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - gint _tmp5_; #line 1852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (domain != NULL); #line 1852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -13169,44 +13851,44 @@ static void configuration_facade_real_set_plugin_int (ConfigurationFacade* self, #line 1853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = domain; -#line 1853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = id; -#line 1853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = key; -#line 1853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = val; -#line 1853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_plugin_int (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_); + configuration_engine_set_plugin_int (_tmp1_, domain, id, key, val); #line 1853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); -#line 13179 "ConfigurationInterfaces.c" +#line 13853 "ConfigurationInterfaces.c" } -void configuration_facade_set_plugin_int (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gint val) { +void +configuration_facade_set_plugin_int (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gint val) +{ #line 1852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_int (self, domain, id, key, val); -#line 13188 "ConfigurationInterfaces.c" +#line 13868 "ConfigurationInterfaces.c" } -static gchar* configuration_facade_real_get_plugin_string (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* def) { +static gchar* +configuration_facade_real_get_plugin_string (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + const gchar* def) +{ gchar* result = NULL; gchar* _result_ = NULL; ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_ = NULL; const gchar* _tmp5_; - gchar* _tmp6_; gchar* _tmp7_; - const gchar* _tmp8_ = NULL; - const gchar* _tmp9_; - gchar* _tmp11_; #line 1856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (domain != NULL, NULL); #line 1856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -13218,65 +13900,64 @@ static gchar* configuration_facade_real_get_plugin_string (ConfigurationFacade* #line 1857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = domain; -#line 1857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = id; -#line 1857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = key; -#line 1857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = def; + _tmp2_ = configuration_engine_get_plugin_string (_tmp1_, domain, id, key, def); #line 1857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = configuration_engine_get_plugin_string (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_); -#line 1857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp7_ = _tmp6_; + _tmp3_ = _tmp2_; #line 1857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _result_ = _tmp7_; + _result_ = _tmp3_; #line 1858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp9_ = _result_; + _tmp5_ = _result_; #line 1858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - if (g_strcmp0 (_tmp9_, "") == 0) { + if (g_strcmp0 (_tmp5_, "") == 0) { #line 1858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp8_ = NULL; -#line 13238 "ConfigurationInterfaces.c" + _tmp4_ = NULL; +#line 13912 "ConfigurationInterfaces.c" } else { - const gchar* _tmp10_; + const gchar* _tmp6_; #line 1858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp10_ = _result_; + _tmp6_ = _result_; #line 1858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp8_ = _tmp10_; -#line 13245 "ConfigurationInterfaces.c" + _tmp4_ = _tmp6_; +#line 13919 "ConfigurationInterfaces.c" } #line 1858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp11_ = g_strdup (_tmp8_); + _tmp7_ = g_strdup (_tmp4_); #line 1858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - result = _tmp11_; + result = _tmp7_; #line 1858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_free0 (_result_); #line 1858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 13255 "ConfigurationInterfaces.c" +#line 13929 "ConfigurationInterfaces.c" } -gchar* configuration_facade_get_plugin_string (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* def) { +gchar* +configuration_facade_get_plugin_string (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + const gchar* def) +{ #line 1856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 1856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_string (self, domain, id, key, def); -#line 13264 "ConfigurationInterfaces.c" +#line 13944 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_plugin_string (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* val) { - const gchar* _tmp0_; +static void +configuration_facade_real_set_plugin_string (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + const gchar* val) +{ + ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - ConfigurationEngine* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - const gchar* _tmp5_; - const gchar* _tmp6_; #line 1861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (domain != NULL); #line 1861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -13284,48 +13965,46 @@ static void configuration_facade_real_set_plugin_string (ConfigurationFacade* se #line 1861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (key != NULL); #line 1862 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp0_ = val; -#line 1862 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - if (_tmp0_ == NULL) { + if (val == NULL) { #line 1863 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" val = ""; -#line 13288 "ConfigurationInterfaces.c" +#line 13967 "ConfigurationInterfaces.c" } #line 1865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp1_ = configuration_facade_get_engine (self); -#line 1865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = _tmp1_; -#line 1865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = domain; -#line 1865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = id; -#line 1865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = key; + _tmp0_ = configuration_facade_get_engine (self); #line 1865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = val; + _tmp1_ = _tmp0_; #line 1865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_plugin_string (_tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_); + configuration_engine_set_plugin_string (_tmp1_, domain, id, key, val); #line 1865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_object_unref0 (_tmp2_); -#line 13306 "ConfigurationInterfaces.c" + _g_object_unref0 (_tmp1_); +#line 13977 "ConfigurationInterfaces.c" } -void configuration_facade_set_plugin_string (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* val) { +void +configuration_facade_set_plugin_string (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + const gchar* val) +{ #line 1861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_string (self, domain, id, key, val); -#line 13315 "ConfigurationInterfaces.c" +#line 13992 "ConfigurationInterfaces.c" } -static void configuration_facade_real_unset_plugin_key (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key) { +static void +configuration_facade_real_unset_plugin_key (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key) +{ ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; #line 1868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (domain != NULL); #line 1868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -13337,35 +14016,35 @@ static void configuration_facade_real_unset_plugin_key (ConfigurationFacade* sel #line 1869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = domain; -#line 1869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = id; -#line 1869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = key; -#line 1869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_unset_plugin_key (_tmp1_, _tmp2_, _tmp3_, _tmp4_); + configuration_engine_unset_plugin_key (_tmp1_, domain, id, key); #line 1869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); -#line 13345 "ConfigurationInterfaces.c" +#line 14018 "ConfigurationInterfaces.c" } -void configuration_facade_unset_plugin_key (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key) { +void +configuration_facade_unset_plugin_key (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key) +{ #line 1868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->unset_plugin_key (self, domain, id, key); -#line 13354 "ConfigurationInterfaces.c" +#line 14032 "ConfigurationInterfaces.c" } -static FuzzyPropertyState configuration_facade_real_is_plugin_enabled (ConfigurationFacade* self, const gchar* id) { +static FuzzyPropertyState +configuration_facade_real_is_plugin_enabled (ConfigurationFacade* self, + const gchar* id) +{ FuzzyPropertyState result = 0; ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; - FuzzyPropertyState _tmp3_; - FuzzyPropertyState _tmp4_; + FuzzyPropertyState _tmp2_; #line 1875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (id != NULL, 0); #line 1876 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -13373,35 +14052,36 @@ static FuzzyPropertyState configuration_facade_real_is_plugin_enabled (Configura #line 1876 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1876 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = id; -#line 1876 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = configuration_engine_is_plugin_enabled (_tmp1_, _tmp2_); -#line 1876 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp4_ = _tmp3_; + _tmp2_ = configuration_engine_is_plugin_enabled (_tmp1_, id); #line 1876 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); #line 1876 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - result = _tmp4_; + result = _tmp2_; #line 1876 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 13383 "ConfigurationInterfaces.c" +#line 14058 "ConfigurationInterfaces.c" } -FuzzyPropertyState configuration_facade_is_plugin_enabled (ConfigurationFacade* self, const gchar* id) { +FuzzyPropertyState +configuration_facade_is_plugin_enabled (ConfigurationFacade* self, + const gchar* id) +{ #line 1875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->is_plugin_enabled (self, id); -#line 13392 "ConfigurationInterfaces.c" +#line 14070 "ConfigurationInterfaces.c" } -static void configuration_facade_real_set_plugin_enabled (ConfigurationFacade* self, const gchar* id, gboolean enabled) { +static void +configuration_facade_real_set_plugin_enabled (ConfigurationFacade* self, + const gchar* id, + gboolean enabled) +{ ConfigurationEngine* _tmp0_; ConfigurationEngine* _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; #line 1879 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (id != NULL); #line 1880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -13409,27 +14089,29 @@ static void configuration_facade_real_set_plugin_enabled (ConfigurationFacade* s #line 1880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = _tmp0_; #line 1880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp2_ = id; -#line 1880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp3_ = enabled; -#line 1880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_engine_set_plugin_enabled (_tmp1_, _tmp2_, _tmp3_); + configuration_engine_set_plugin_enabled (_tmp1_, id, enabled); #line 1880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); -#line 13415 "ConfigurationInterfaces.c" +#line 14091 "ConfigurationInterfaces.c" } -void configuration_facade_set_plugin_enabled (ConfigurationFacade* self, const gchar* id, gboolean enabled) { +void +configuration_facade_set_plugin_enabled (ConfigurationFacade* self, + const gchar* id, + gboolean enabled) +{ #line 1879 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1879 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_enabled (self, id, enabled); -#line 13424 "ConfigurationInterfaces.c" +#line 14104 "ConfigurationInterfaces.c" } -static void configuration_facade_class_init (ConfigurationFacadeClass * klass) { +static void +configuration_facade_class_init (ConfigurationFacadeClass * klass) +{ #line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" configuration_facade_parent_class = g_type_class_peek_parent (klass); #line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -13726,18 +14408,22 @@ static void configuration_facade_class_init (ConfigurationFacadeClass * klass) { configuration_facade_signals[CONFIGURATION_FACADE_EXTERNAL_APP_CHANGED_SIGNAL] = g_signal_new ("external-app-changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" configuration_facade_signals[CONFIGURATION_FACADE_IMPORT_DIRECTORY_CHANGED_SIGNAL] = g_signal_new ("import-directory-changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 13725 "ConfigurationInterfaces.c" +#line 14407 "ConfigurationInterfaces.c" } -static void configuration_facade_instance_init (ConfigurationFacade * self) { +static void +configuration_facade_instance_init (ConfigurationFacade * self) +{ #line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" self->priv = CONFIGURATION_FACADE_GET_PRIVATE (self); -#line 13732 "ConfigurationInterfaces.c" +#line 14416 "ConfigurationInterfaces.c" } -static void configuration_facade_finalize (GObject * obj) { +static void +configuration_facade_finalize (GObject * obj) +{ ConfigurationFacade * self; #line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CONFIGURATION_FACADE, ConfigurationFacade); @@ -13745,11 +14431,13 @@ static void configuration_facade_finalize (GObject * obj) { _g_object_unref0 (self->priv->engine); #line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" G_OBJECT_CLASS (configuration_facade_parent_class)->finalize (obj); -#line 13744 "ConfigurationInterfaces.c" +#line 14430 "ConfigurationInterfaces.c" } -GType configuration_facade_get_type (void) { +GType +configuration_facade_get_type (void) +{ static volatile gsize configuration_facade_type_id__volatile = 0; if (g_once_init_enter (&configuration_facade_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ConfigurationFacadeClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) configuration_facade_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ConfigurationFacade), 0, (GInstanceInitFunc) configuration_facade_instance_init, NULL }; diff --git a/src/config/GSettingsEngine.c b/src/config/GSettingsEngine.c index 4f637b2..3ddaa71 100644 --- a/src/config/GSettingsEngine.c +++ b/src/config/GSettingsEngine.c @@ -1,4 +1,4 @@ -/* GSettingsEngine.c generated by valac 0.36.6, the Vala compiler +/* GSettingsEngine.c generated by valac 0.40.4, the Vala compiler * generated from GSettingsEngine.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -38,6 +39,11 @@ typedef struct _ConfigurationEngineIface ConfigurationEngineIface; typedef struct _GSettingsConfigurationEngine GSettingsConfigurationEngine; typedef struct _GSettingsConfigurationEngineClass GSettingsConfigurationEngineClass; typedef struct _GSettingsConfigurationEnginePrivate GSettingsConfigurationEnginePrivate; +enum { + GSETTINGS_CONFIGURATION_ENGINE_0_PROPERTY, + GSETTINGS_CONFIGURATION_ENGINE_NUM_PROPERTIES +}; +static GParamSpec* gsettings_configuration_engine_properties[GSETTINGS_CONFIGURATION_ENGINE_NUM_PROPERTIES]; #define _g_free0(var) (var = (g_free (var), NULL)) #define _g_settings_schema_unref0(var) ((var == NULL) ? NULL : (var = (g_settings_schema_unref (var), NULL))) #define _g_settings_schema_source_unref0(var) ((var == NULL) ? NULL : (var = (g_settings_schema_source_unref (var), NULL))) @@ -185,9 +191,6 @@ GType fuzzy_property_state_get_type (void) G_GNUC_CONST; GType configuration_engine_get_type (void) G_GNUC_CONST; GType gsettings_configuration_engine_get_type (void) G_GNUC_CONST; #define GSETTINGS_CONFIGURATION_ENGINE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEnginePrivate)) -enum { - GSETTINGS_CONFIGURATION_ENGINE_DUMMY_PROPERTY -}; #define GSETTINGS_CONFIGURATION_ENGINE_ROOT_SCHEMA_NAME "org.yorba.shotwell" #define GSETTINGS_CONFIGURATION_ENGINE_PREFS_SCHEMA_NAME GSETTINGS_CONFIGURATION_ENGINE_ROOT_SCHEMA_NAME ".preferences" #define GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME GSETTINGS_CONFIGURATION_ENGINE_PREFS_SCHEMA_NAME ".ui" @@ -206,53 +209,164 @@ enum { #define GSETTINGS_CONFIGURATION_ENGINE_PLUGINS_ENABLE_DISABLE_SCHEMA_NAME GSETTINGS_CONFIGURATION_ENGINE_ROOT_SCHEMA_NAME ".plugins.enable-state" GSettingsConfigurationEngine* gsettings_configuration_engine_new (void); GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType object_type); -static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error); -static gboolean gsettings_configuration_engine_get_gs_bool (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error); -static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gboolean value, GError** error); -static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gint value, GError** error); -static gint gsettings_configuration_engine_get_gs_enum (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error); -static gint gsettings_configuration_engine_get_gs_int (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error); -static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gint value, GError** error); -static gdouble gsettings_configuration_engine_get_gs_double (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error); -static void gsettings_configuration_engine_set_gs_double (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gdouble value, GError** error); -static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error); -static void gsettings_configuration_engine_set_gs_string (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, const gchar* value, GError** error); -static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error); +static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + GError** error); +static gboolean gsettings_configuration_engine_get_gs_bool (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + GError** error); +static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + gboolean value, + GError** error); +static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + gint value, + GError** error); +static gint gsettings_configuration_engine_get_gs_enum (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + GError** error); +static gint gsettings_configuration_engine_get_gs_int (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + GError** error); +static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + gint value, + GError** error); +static gdouble gsettings_configuration_engine_get_gs_double (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + GError** error); +static void gsettings_configuration_engine_set_gs_double (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + gdouble value, + GError** error); +static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + GError** error); +static void gsettings_configuration_engine_set_gs_string (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + const gchar* value, + GError** error); +static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + GError** error); static gchar* gsettings_configuration_engine_clean_plugin_id (const gchar* id); gboolean is_string_empty (const gchar* s); static gchar* gsettings_configuration_engine_get_plugin_enable_disable_name (const gchar* id); -static gchar* gsettings_configuration_engine_make_plugin_schema_name (const gchar* domain, const gchar* id); +static gchar* gsettings_configuration_engine_make_plugin_schema_name (const gchar* domain, + const gchar* id); static gchar* gsettings_configuration_engine_make_gsettings_key (const gchar* gconf_key); static gchar* gsettings_configuration_engine_real_get_name (ConfigurationEngine* base); -static gint gsettings_configuration_engine_real_get_enum_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error); -static void gsettings_configuration_engine_real_set_enum_property (ConfigurationEngine* base, ConfigurableProperty p, gint val, GError** error); -static gint gsettings_configuration_engine_real_get_int_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error); -static void gsettings_configuration_engine_real_set_int_property (ConfigurationEngine* base, ConfigurableProperty p, gint val, GError** error); -static gchar* gsettings_configuration_engine_real_get_string_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error); -static void gsettings_configuration_engine_real_set_string_property (ConfigurationEngine* base, ConfigurableProperty p, const gchar* val, GError** error); -static gboolean gsettings_configuration_engine_real_get_bool_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error); -static void gsettings_configuration_engine_real_set_bool_property (ConfigurationEngine* base, ConfigurableProperty p, gboolean val, GError** error); -static gdouble gsettings_configuration_engine_real_get_double_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error); -static void gsettings_configuration_engine_real_set_double_property (ConfigurationEngine* base, ConfigurableProperty p, gdouble val, GError** error); -static gboolean gsettings_configuration_engine_real_get_plugin_bool (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gboolean def); -static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gboolean val); -static gdouble gsettings_configuration_engine_real_get_plugin_double (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gdouble def); -static void gsettings_configuration_engine_real_set_plugin_double (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gdouble val); -static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gint def); -static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gint val); -static gchar* gsettings_configuration_engine_real_get_plugin_string (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, const gchar* def); -static void gsettings_configuration_engine_real_set_plugin_string (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, const gchar* val); -static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key); -static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled (ConfigurationEngine* base, const gchar* id); -static void gsettings_configuration_engine_real_set_plugin_enabled (ConfigurationEngine* base, const gchar* id, gboolean enabled); +static gint gsettings_configuration_engine_real_get_enum_property (ConfigurationEngine* base, + ConfigurableProperty p, + GError** error); +static void gsettings_configuration_engine_real_set_enum_property (ConfigurationEngine* base, + ConfigurableProperty p, + gint val, + GError** error); +static gint gsettings_configuration_engine_real_get_int_property (ConfigurationEngine* base, + ConfigurableProperty p, + GError** error); +static void gsettings_configuration_engine_real_set_int_property (ConfigurationEngine* base, + ConfigurableProperty p, + gint val, + GError** error); +static gchar* gsettings_configuration_engine_real_get_string_property (ConfigurationEngine* base, + ConfigurableProperty p, + GError** error); +static void gsettings_configuration_engine_real_set_string_property (ConfigurationEngine* base, + ConfigurableProperty p, + const gchar* val, + GError** error); +static gboolean gsettings_configuration_engine_real_get_bool_property (ConfigurationEngine* base, + ConfigurableProperty p, + GError** error); +static void gsettings_configuration_engine_real_set_bool_property (ConfigurationEngine* base, + ConfigurableProperty p, + gboolean val, + GError** error); +static gdouble gsettings_configuration_engine_real_get_double_property (ConfigurationEngine* base, + ConfigurableProperty p, + GError** error); +static void gsettings_configuration_engine_real_set_double_property (ConfigurationEngine* base, + ConfigurableProperty p, + gdouble val, + GError** error); +static gboolean gsettings_configuration_engine_real_get_plugin_bool (ConfigurationEngine* base, + const gchar* domain, + const gchar* id, + const gchar* key, + gboolean def); +static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEngine* base, + const gchar* domain, + const gchar* id, + const gchar* key, + gboolean val); +static gdouble gsettings_configuration_engine_real_get_plugin_double (ConfigurationEngine* base, + const gchar* domain, + const gchar* id, + const gchar* key, + gdouble def); +static void gsettings_configuration_engine_real_set_plugin_double (ConfigurationEngine* base, + const gchar* domain, + const gchar* id, + const gchar* key, + gdouble val); +static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEngine* base, + const gchar* domain, + const gchar* id, + const gchar* key, + gint def); +static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEngine* base, + const gchar* domain, + const gchar* id, + const gchar* key, + gint val); +static gchar* gsettings_configuration_engine_real_get_plugin_string (ConfigurationEngine* base, + const gchar* domain, + const gchar* id, + const gchar* key, + const gchar* def); +static void gsettings_configuration_engine_real_set_plugin_string (ConfigurationEngine* base, + const gchar* domain, + const gchar* id, + const gchar* key, + const gchar* val); +static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationEngine* base, + const gchar* domain, + const gchar* id, + const gchar* key); +static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled (ConfigurationEngine* base, + const gchar* id); +static void gsettings_configuration_engine_real_set_plugin_enabled (ConfigurationEngine* base, + const gchar* id, + gboolean enabled); void gsettings_configuration_engine_run_gsettings_migrator (void); GFile* app_dirs_get_settings_migrator_bin (void); static void gsettings_configuration_engine_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType object_type) { +GSettingsConfigurationEngine* +gsettings_configuration_engine_construct (GType object_type) +{ GSettingsConfigurationEngine * self = NULL; gchar** _tmp0_; gchar** _tmp1_; @@ -2552,36 +2666,42 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob _tmp427_ = _tmp425_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE]; #line 29 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return self; -#line 2556 "GSettingsEngine.c" +#line 2670 "GSettingsEngine.c" } -GSettingsConfigurationEngine* gsettings_configuration_engine_new (void) { +GSettingsConfigurationEngine* +gsettings_configuration_engine_new (void) +{ #line 29 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return gsettings_configuration_engine_construct (TYPE_GSETTINGS_CONFIGURATION_ENGINE); -#line 2563 "GSettingsEngine.c" +#line 2679 "GSettingsEngine.c" } -static gpointer _g_settings_schema_source_ref0 (gpointer self) { +static gpointer +_g_settings_schema_source_ref0 (gpointer self) +{ #line 180 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return self ? g_settings_schema_source_ref (self) : NULL; -#line 2570 "GSettingsEngine.c" +#line 2688 "GSettingsEngine.c" } -static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) { +static void +gsettings_configuration_engine_check_key_valid (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + GError** error) +{ GSettingsSchemaSource* schema_source = NULL; GSettingsSchemaSource* _tmp0_; GSettingsSchemaSource* _tmp1_; GSettingsSchema* settings_scheme = NULL; GSettingsSchemaSource* _tmp2_; - const gchar* _tmp3_; + GSettingsSchema* _tmp3_; GSettingsSchema* _tmp4_; - GSettingsSchema* _tmp5_; - GSettingsSchema* _tmp11_; - const gchar* _tmp12_; - gboolean _tmp13_; + GSettingsSchema* _tmp9_; GError * _inner_error_ = NULL; #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self)); @@ -2598,35 +2718,30 @@ static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurati #line 181 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp2_ = schema_source; #line 181 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = schema; + _tmp3_ = g_settings_schema_source_lookup (_tmp2_, schema, TRUE); #line 181 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = g_settings_schema_source_lookup (_tmp2_, _tmp3_, TRUE); -#line 181 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - settings_scheme = _tmp4_; + settings_scheme = _tmp3_; #line 182 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = settings_scheme; + _tmp4_ = settings_scheme; #line 182 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - if (_tmp5_ == NULL) { -#line 2611 "GSettingsEngine.c" - const gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - GError* _tmp9_; - GError* _tmp10_; -#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = schema; + if (_tmp4_ == NULL) { +#line 2729 "GSettingsEngine.c" + gchar* _tmp5_; + gchar* _tmp6_; + GError* _tmp7_; + GError* _tmp8_; #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = g_strdup_printf ("schema '%s' is not installed", _tmp6_); + _tmp5_ = g_strdup_printf ("schema '%s' is not installed", schema); #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp9_ = g_error_new_literal (CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR, _tmp8_); + _tmp7_ = g_error_new_literal (CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR, _tmp6_); #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp6_); #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _inner_error_ = _tmp10_; + _inner_error_ = _tmp8_; #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -2637,7 +2752,7 @@ static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurati _g_settings_schema_source_unref0 (schema_source); #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 2641 "GSettingsEngine.c" +#line 2756 "GSettingsEngine.c" } else { #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_settings_schema_unref0 (settings_scheme); @@ -2649,40 +2764,30 @@ static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurati g_clear_error (&_inner_error_); #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 2653 "GSettingsEngine.c" +#line 2768 "GSettingsEngine.c" } } #line 186 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp11_ = settings_scheme; -#line 186 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp12_ = key; + _tmp9_ = settings_scheme; #line 186 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp13_ = g_settings_schema_has_key (_tmp11_, _tmp12_); -#line 186 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - if (!_tmp13_) { -#line 2664 "GSettingsEngine.c" - const gchar* _tmp14_; - const gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; - GError* _tmp18_; - GError* _tmp19_; -#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp14_ = schema; + if (!g_settings_schema_has_key (_tmp9_, key)) { +#line 2775 "GSettingsEngine.c" + gchar* _tmp10_; + gchar* _tmp11_; + GError* _tmp12_; + GError* _tmp13_; #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp15_ = key; + _tmp10_ = g_strdup_printf ("schema '%s' does not define key '%s'", schema, key); #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp16_ = g_strdup_printf ("schema '%s' does not define key '%s'", _tmp14_, _tmp15_); + _tmp11_ = _tmp10_; #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp17_ = _tmp16_; + _tmp12_ = g_error_new_literal (CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR, _tmp11_); #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp18_ = g_error_new_literal (CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR, _tmp17_); + _tmp13_ = _tmp12_; #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp19_ = _tmp18_; -#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp11_); #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _inner_error_ = _tmp19_; + _inner_error_ = _tmp13_; #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -2693,7 +2798,7 @@ static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurati _g_settings_schema_source_unref0 (schema_source); #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 2697 "GSettingsEngine.c" +#line 2802 "GSettingsEngine.c" } else { #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_settings_schema_unref0 (settings_scheme); @@ -2705,27 +2810,27 @@ static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurati g_clear_error (&_inner_error_); #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 2709 "GSettingsEngine.c" +#line 2814 "GSettingsEngine.c" } } #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_settings_schema_unref0 (settings_scheme); #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_settings_schema_source_unref0 (schema_source); -#line 2716 "GSettingsEngine.c" +#line 2821 "GSettingsEngine.c" } -static gboolean gsettings_configuration_engine_get_gs_bool (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) { +static gboolean +gsettings_configuration_engine_get_gs_bool (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + GError** error) +{ gboolean result = FALSE; - const gchar* _tmp0_; - const gchar* _tmp1_; GSettings* schema_object = NULL; - const gchar* _tmp4_; - GSettings* _tmp5_; - GSettings* _tmp6_; - const gchar* _tmp7_; - gboolean _tmp8_; + GSettings* _tmp2_; + GSettings* _tmp3_; GError * _inner_error_ = NULL; #line 191 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), FALSE); @@ -2734,64 +2839,55 @@ static gboolean gsettings_configuration_engine_get_gs_bool (GSettingsConfigurati #line 191 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (key != NULL, FALSE); #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = schema; -#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = key; -#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); + gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_); #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2747 "GSettingsEngine.c" - gboolean _tmp2_ = FALSE; +#line 2848 "GSettingsEngine.c" + gboolean _tmp0_ = FALSE; #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_propagate_error (error, _inner_error_); #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp2_; -#line 2753 "GSettingsEngine.c" + return _tmp0_; +#line 2854 "GSettingsEngine.c" } else { - gboolean _tmp3_ = FALSE; + gboolean _tmp1_ = FALSE; #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp3_; -#line 2762 "GSettingsEngine.c" + return _tmp1_; +#line 2863 "GSettingsEngine.c" } } #line 194 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = schema; + _tmp2_ = g_settings_new (schema); #line 194 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = g_settings_new (_tmp4_); -#line 194 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_object = _tmp5_; -#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = schema_object; + schema_object = _tmp2_; #line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = key; + _tmp3_ = schema_object; #line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp8_ = g_settings_get_boolean (_tmp6_, _tmp7_); -#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp8_; + result = g_settings_get_boolean (_tmp3_, key); #line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); #line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 2783 "GSettingsEngine.c" +#line 2878 "GSettingsEngine.c" } -static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gboolean value, GError** error) { - const gchar* _tmp0_; - const gchar* _tmp1_; +static void +gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + gboolean value, + GError** error) +{ GSettings* schema_object = NULL; - const gchar* _tmp2_; - GSettings* _tmp3_; - GSettings* _tmp4_; - const gchar* _tmp5_; - gboolean _tmp6_; + GSettings* _tmp0_; + GSettings* _tmp1_; GError * _inner_error_ = NULL; #line 199 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self)); @@ -2800,11 +2896,7 @@ static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEn #line 199 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_if_fail (key != NULL); #line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = schema; -#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = key; -#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); + gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_); #line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -2813,7 +2905,7 @@ static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEn g_propagate_error (error, _inner_error_); #line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 2817 "GSettingsEngine.c" +#line 2909 "GSettingsEngine.c" } else { #line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2821,38 +2913,33 @@ static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEn g_clear_error (&_inner_error_); #line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 2825 "GSettingsEngine.c" +#line 2917 "GSettingsEngine.c" } } #line 202 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = schema; + _tmp0_ = g_settings_new (schema); #line 202 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = g_settings_new (_tmp2_); -#line 202 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_object = _tmp3_; -#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = schema_object; + schema_object = _tmp0_; #line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = key; + _tmp1_ = schema_object; #line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = value; -#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_settings_set_boolean (_tmp4_, _tmp5_, _tmp6_); + g_settings_set_boolean (_tmp1_, key, value); #line 199 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); -#line 2844 "GSettingsEngine.c" +#line 2930 "GSettingsEngine.c" } -static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gint value, GError** error) { - const gchar* _tmp0_; - const gchar* _tmp1_; +static void +gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + gint value, + GError** error) +{ GSettings* schema_object = NULL; - const gchar* _tmp2_; - GSettings* _tmp3_; - GSettings* _tmp4_; - const gchar* _tmp5_; - gint _tmp6_; + GSettings* _tmp0_; + GSettings* _tmp1_; GError * _inner_error_ = NULL; #line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self)); @@ -2861,11 +2948,7 @@ static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEn #line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_if_fail (key != NULL); #line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = schema; -#line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = key; -#line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); + gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_); #line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -2874,7 +2957,7 @@ static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEn g_propagate_error (error, _inner_error_); #line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 2878 "GSettingsEngine.c" +#line 2961 "GSettingsEngine.c" } else { #line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2882,39 +2965,33 @@ static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEn g_clear_error (&_inner_error_); #line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 2886 "GSettingsEngine.c" +#line 2969 "GSettingsEngine.c" } } #line 210 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = schema; + _tmp0_ = g_settings_new (schema); #line 210 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = g_settings_new (_tmp2_); -#line 210 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_object = _tmp3_; -#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = schema_object; + schema_object = _tmp0_; #line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = key; + _tmp1_ = schema_object; #line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = value; -#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_settings_set_enum (_tmp4_, _tmp5_, _tmp6_); + g_settings_set_enum (_tmp1_, key, value); #line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); -#line 2905 "GSettingsEngine.c" +#line 2982 "GSettingsEngine.c" } -static gint gsettings_configuration_engine_get_gs_enum (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) { +static gint +gsettings_configuration_engine_get_gs_enum (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + GError** error) +{ gint result = 0; - const gchar* _tmp0_; - const gchar* _tmp1_; GSettings* schema_object = NULL; - const gchar* _tmp4_; - GSettings* _tmp5_; - GSettings* _tmp6_; - const gchar* _tmp7_; - gint _tmp8_; + GSettings* _tmp2_; + GSettings* _tmp3_; GError * _inner_error_ = NULL; #line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), 0); @@ -2923,65 +3000,55 @@ static gint gsettings_configuration_engine_get_gs_enum (GSettingsConfigurationEn #line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (key != NULL, 0); #line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = schema; -#line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = key; -#line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); + gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_); #line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2936 "GSettingsEngine.c" - gint _tmp2_ = 0; +#line 3009 "GSettingsEngine.c" + gint _tmp0_ = 0; #line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_propagate_error (error, _inner_error_); #line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp2_; -#line 2942 "GSettingsEngine.c" + return _tmp0_; +#line 3015 "GSettingsEngine.c" } else { - gint _tmp3_ = 0; + gint _tmp1_ = 0; #line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp3_; -#line 2951 "GSettingsEngine.c" + return _tmp1_; +#line 3024 "GSettingsEngine.c" } } #line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = schema; + _tmp2_ = g_settings_new (schema); #line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = g_settings_new (_tmp4_); -#line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_object = _tmp5_; -#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = schema_object; + schema_object = _tmp2_; #line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = key; + _tmp3_ = schema_object; #line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp8_ = g_settings_get_enum (_tmp6_, _tmp7_); -#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp8_; + result = g_settings_get_enum (_tmp3_, key); #line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); #line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 2972 "GSettingsEngine.c" +#line 3039 "GSettingsEngine.c" } -static gint gsettings_configuration_engine_get_gs_int (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) { +static gint +gsettings_configuration_engine_get_gs_int (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + GError** error) +{ gint result = 0; - const gchar* _tmp0_; - const gchar* _tmp1_; GSettings* schema_object = NULL; - const gchar* _tmp4_; - GSettings* _tmp5_; - GSettings* _tmp6_; - const gchar* _tmp7_; - gint _tmp8_; + GSettings* _tmp2_; + GSettings* _tmp3_; GError * _inner_error_ = NULL; #line 221 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), 0); @@ -2990,64 +3057,55 @@ static gint gsettings_configuration_engine_get_gs_int (GSettingsConfigurationEng #line 221 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (key != NULL, 0); #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = schema; -#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = key; -#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); + gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_); #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3003 "GSettingsEngine.c" - gint _tmp2_ = 0; +#line 3066 "GSettingsEngine.c" + gint _tmp0_ = 0; #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_propagate_error (error, _inner_error_); #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp2_; -#line 3009 "GSettingsEngine.c" + return _tmp0_; +#line 3072 "GSettingsEngine.c" } else { - gint _tmp3_ = 0; + gint _tmp1_ = 0; #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp3_; -#line 3018 "GSettingsEngine.c" + return _tmp1_; +#line 3081 "GSettingsEngine.c" } } #line 224 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = schema; + _tmp2_ = g_settings_new (schema); #line 224 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = g_settings_new (_tmp4_); -#line 224 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_object = _tmp5_; -#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = schema_object; + schema_object = _tmp2_; #line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = key; + _tmp3_ = schema_object; #line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp8_ = g_settings_get_int (_tmp6_, _tmp7_); -#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp8_; + result = g_settings_get_int (_tmp3_, key); #line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); #line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 3039 "GSettingsEngine.c" +#line 3096 "GSettingsEngine.c" } -static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gint value, GError** error) { - const gchar* _tmp0_; - const gchar* _tmp1_; +static void +gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + gint value, + GError** error) +{ GSettings* schema_object = NULL; - const gchar* _tmp2_; - GSettings* _tmp3_; - GSettings* _tmp4_; - const gchar* _tmp5_; - gint _tmp6_; + GSettings* _tmp0_; + GSettings* _tmp1_; GError * _inner_error_ = NULL; #line 229 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self)); @@ -3056,11 +3114,7 @@ static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEng #line 229 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_if_fail (key != NULL); #line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = schema; -#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = key; -#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); + gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_); #line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -3069,7 +3123,7 @@ static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEng g_propagate_error (error, _inner_error_); #line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3073 "GSettingsEngine.c" +#line 3127 "GSettingsEngine.c" } else { #line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3077,39 +3131,33 @@ static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEng g_clear_error (&_inner_error_); #line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3081 "GSettingsEngine.c" +#line 3135 "GSettingsEngine.c" } } #line 232 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = schema; -#line 232 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = g_settings_new (_tmp2_); + _tmp0_ = g_settings_new (schema); #line 232 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_object = _tmp3_; + schema_object = _tmp0_; #line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = schema_object; + _tmp1_ = schema_object; #line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = key; -#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = value; -#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_settings_set_int (_tmp4_, _tmp5_, _tmp6_); + g_settings_set_int (_tmp1_, key, value); #line 229 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); -#line 3100 "GSettingsEngine.c" +#line 3148 "GSettingsEngine.c" } -static gdouble gsettings_configuration_engine_get_gs_double (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) { +static gdouble +gsettings_configuration_engine_get_gs_double (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + GError** error) +{ gdouble result = 0.0; - const gchar* _tmp0_; - const gchar* _tmp1_; GSettings* schema_object = NULL; - const gchar* _tmp4_; - GSettings* _tmp5_; - GSettings* _tmp6_; - const gchar* _tmp7_; - gdouble _tmp8_; + GSettings* _tmp2_; + GSettings* _tmp3_; GError * _inner_error_ = NULL; #line 237 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), 0.0); @@ -3118,64 +3166,55 @@ static gdouble gsettings_configuration_engine_get_gs_double (GSettingsConfigurat #line 237 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (key != NULL, 0.0); #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = schema; -#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = key; -#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); + gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_); #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3131 "GSettingsEngine.c" - gdouble _tmp2_ = 0.0; +#line 3175 "GSettingsEngine.c" + gdouble _tmp0_ = 0.0; #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_propagate_error (error, _inner_error_); #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp2_; -#line 3137 "GSettingsEngine.c" + return _tmp0_; +#line 3181 "GSettingsEngine.c" } else { - gdouble _tmp3_ = 0.0; + gdouble _tmp1_ = 0.0; #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp3_; -#line 3146 "GSettingsEngine.c" + return _tmp1_; +#line 3190 "GSettingsEngine.c" } } #line 240 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = schema; + _tmp2_ = g_settings_new (schema); #line 240 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = g_settings_new (_tmp4_); -#line 240 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_object = _tmp5_; -#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = schema_object; + schema_object = _tmp2_; #line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = key; + _tmp3_ = schema_object; #line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp8_ = g_settings_get_double (_tmp6_, _tmp7_); -#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp8_; + result = g_settings_get_double (_tmp3_, key); #line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); #line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 3167 "GSettingsEngine.c" +#line 3205 "GSettingsEngine.c" } -static void gsettings_configuration_engine_set_gs_double (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gdouble value, GError** error) { - const gchar* _tmp0_; - const gchar* _tmp1_; +static void +gsettings_configuration_engine_set_gs_double (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + gdouble value, + GError** error) +{ GSettings* schema_object = NULL; - const gchar* _tmp2_; - GSettings* _tmp3_; - GSettings* _tmp4_; - const gchar* _tmp5_; - gdouble _tmp6_; + GSettings* _tmp0_; + GSettings* _tmp1_; GError * _inner_error_ = NULL; #line 245 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self)); @@ -3184,11 +3223,7 @@ static void gsettings_configuration_engine_set_gs_double (GSettingsConfiguration #line 245 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_if_fail (key != NULL); #line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = schema; -#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = key; -#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); + gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_); #line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -3197,7 +3232,7 @@ static void gsettings_configuration_engine_set_gs_double (GSettingsConfiguration g_propagate_error (error, _inner_error_); #line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3201 "GSettingsEngine.c" +#line 3236 "GSettingsEngine.c" } else { #line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3205,39 +3240,34 @@ static void gsettings_configuration_engine_set_gs_double (GSettingsConfiguration g_clear_error (&_inner_error_); #line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3209 "GSettingsEngine.c" +#line 3244 "GSettingsEngine.c" } } #line 248 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = schema; -#line 248 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = g_settings_new (_tmp2_); + _tmp0_ = g_settings_new (schema); #line 248 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_object = _tmp3_; -#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = schema_object; -#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = key; + schema_object = _tmp0_; #line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = value; + _tmp1_ = schema_object; #line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_settings_set_double (_tmp4_, _tmp5_, _tmp6_); + g_settings_set_double (_tmp1_, key, value); #line 245 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); -#line 3228 "GSettingsEngine.c" +#line 3257 "GSettingsEngine.c" } -static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) { +static gchar* +gsettings_configuration_engine_get_gs_string (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + GError** error) +{ gchar* result = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; GSettings* schema_object = NULL; - const gchar* _tmp2_; - GSettings* _tmp3_; - GSettings* _tmp4_; - const gchar* _tmp5_; - gchar* _tmp6_; + GSettings* _tmp0_; + GSettings* _tmp1_; + gchar* _tmp2_; GError * _inner_error_ = NULL; #line 253 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), NULL); @@ -3246,11 +3276,7 @@ static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurati #line 253 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (key != NULL, NULL); #line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = schema; -#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = key; -#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); + gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_); #line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -3259,7 +3285,7 @@ static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurati g_propagate_error (error, _inner_error_); #line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return NULL; -#line 3263 "GSettingsEngine.c" +#line 3289 "GSettingsEngine.c" } else { #line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3267,40 +3293,37 @@ static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurati g_clear_error (&_inner_error_); #line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return NULL; -#line 3271 "GSettingsEngine.c" +#line 3297 "GSettingsEngine.c" } } #line 256 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = schema; + _tmp0_ = g_settings_new (schema); #line 256 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = g_settings_new (_tmp2_); -#line 256 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_object = _tmp3_; -#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = schema_object; + schema_object = _tmp0_; #line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = key; + _tmp1_ = schema_object; #line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = g_settings_get_string (_tmp4_, _tmp5_); + _tmp2_ = g_settings_get_string (_tmp1_, key); #line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp6_; + result = _tmp2_; #line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); #line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 3292 "GSettingsEngine.c" +#line 3314 "GSettingsEngine.c" } -static void gsettings_configuration_engine_set_gs_string (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, const gchar* value, GError** error) { - const gchar* _tmp0_; - const gchar* _tmp1_; +static void +gsettings_configuration_engine_set_gs_string (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + const gchar* value, + GError** error) +{ GSettings* schema_object = NULL; - const gchar* _tmp2_; - GSettings* _tmp3_; - GSettings* _tmp4_; - const gchar* _tmp5_; - const gchar* _tmp6_; + GSettings* _tmp0_; + GSettings* _tmp1_; GError * _inner_error_ = NULL; #line 261 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self)); @@ -3311,11 +3334,7 @@ static void gsettings_configuration_engine_set_gs_string (GSettingsConfiguration #line 261 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_if_fail (value != NULL); #line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = schema; -#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = key; -#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); + gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_); #line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -3324,7 +3343,7 @@ static void gsettings_configuration_engine_set_gs_string (GSettingsConfiguration g_propagate_error (error, _inner_error_); #line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3328 "GSettingsEngine.c" +#line 3347 "GSettingsEngine.c" } else { #line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3332,37 +3351,32 @@ static void gsettings_configuration_engine_set_gs_string (GSettingsConfiguration g_clear_error (&_inner_error_); #line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3336 "GSettingsEngine.c" +#line 3355 "GSettingsEngine.c" } } #line 264 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = schema; -#line 264 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = g_settings_new (_tmp2_); + _tmp0_ = g_settings_new (schema); #line 264 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_object = _tmp3_; + schema_object = _tmp0_; #line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = schema_object; + _tmp1_ = schema_object; #line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = key; -#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = value; -#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_settings_set_string (_tmp4_, _tmp5_, _tmp6_); + g_settings_set_string (_tmp1_, key, value); #line 261 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); -#line 3355 "GSettingsEngine.c" +#line 3368 "GSettingsEngine.c" } -static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) { - const gchar* _tmp0_; - const gchar* _tmp1_; +static void +gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigurationEngine* self, + const gchar* schema, + const gchar* key, + GError** error) +{ GSettings* schema_object = NULL; - const gchar* _tmp2_; - GSettings* _tmp3_; - GSettings* _tmp4_; - const gchar* _tmp5_; + GSettings* _tmp0_; + GSettings* _tmp1_; GError * _inner_error_ = NULL; #line 269 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self)); @@ -3371,11 +3385,7 @@ static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigu #line 269 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_if_fail (key != NULL); #line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = schema; -#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = key; -#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); + gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_); #line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -3384,7 +3394,7 @@ static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigu g_propagate_error (error, _inner_error_); #line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3388 "GSettingsEngine.c" +#line 3398 "GSettingsEngine.c" } else { #line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3392,403 +3402,383 @@ static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigu g_clear_error (&_inner_error_); #line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3396 "GSettingsEngine.c" +#line 3406 "GSettingsEngine.c" } } #line 272 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = schema; -#line 272 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = g_settings_new (_tmp2_); + _tmp0_ = g_settings_new (schema); #line 272 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_object = _tmp3_; + schema_object = _tmp0_; #line 274 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = schema_object; + _tmp1_ = schema_object; #line 274 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = key; -#line 274 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_settings_reset (_tmp4_, _tmp5_); + g_settings_reset (_tmp1_, key); #line 269 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); -#line 3413 "GSettingsEngine.c" +#line 3419 "GSettingsEngine.c" } -static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { +static gchar* +string_replace (const gchar* self, + const gchar* old, + const gchar* replacement) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if ((*((gchar*) self)) == '\0') { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 3432 "GSettingsEngine.c" +#line 3442 "GSettingsEngine.c" } else { - const gchar* _tmp2_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; -#line 3439 "GSettingsEngine.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) old)) == '\0'; +#line 3446 "GSettingsEngine.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = TRUE; -#line 3445 "GSettingsEngine.c" +#line 3452 "GSettingsEngine.c" } else { - const gchar* _tmp3_; - const gchar* _tmp4_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = replacement; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; -#line 3455 "GSettingsEngine.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (old, replacement) == 0; +#line 3456 "GSettingsEngine.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 3459 "GSettingsEngine.c" - gchar* _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = g_strdup (self); -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 3460 "GSettingsEngine.c" + gchar* _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = g_strdup (self); +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 3467 "GSettingsEngine.c" +#line 3468 "GSettingsEngine.c" } { GRegex* regex = NULL; - const gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - GRegex* _tmp9_; - GRegex* _tmp10_; - gchar* _tmp11_ = NULL; - GRegex* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = old; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = g_regex_escape_string (_tmp6_, -1); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = _tmp9_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp8_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - regex = _tmp10_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp3_; + gchar* _tmp4_; + GRegex* _tmp5_; + GRegex* _tmp6_; + gchar* _tmp7_ = NULL; + GRegex* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_regex_escape_string (old, -1); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = _tmp3_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp5_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp4_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + regex = _tmp6_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 3499 "GSettingsEngine.c" +#line 3496 "GSettingsEngine.c" goto __catch217_g_regex_error; } -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 3508 "GSettingsEngine.c" +#line 3505 "GSettingsEngine.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = regex; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = replacement; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp14_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = regex; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp9_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 3524 "GSettingsEngine.c" +#line 3519 "GSettingsEngine.c" goto __catch217_g_regex_error; } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 3535 "GSettingsEngine.c" +#line 3530 "GSettingsEngine.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = _tmp11_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = NULL; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp15_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp11_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = _tmp7_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = NULL; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp10_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp7_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 3549 "GSettingsEngine.c" +#line 3544 "GSettingsEngine.c" } goto __finally217; __catch217_g_regex_error: { GError* e = NULL; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 3563 "GSettingsEngine.c" +#line 3558 "GSettingsEngine.c" } __finally217: -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 3574 "GSettingsEngine.c" +#line 3569 "GSettingsEngine.c" } } -static gchar* string_strip (const gchar* self) { +static gchar* +string_strip (const gchar* self) +{ gchar* result = NULL; gchar* _result_ = NULL; gchar* _tmp0_; const gchar* _tmp1_; -#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1248 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _result_; -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 3598 "GSettingsEngine.c" +#line 3595 "GSettingsEngine.c" } -static gchar* gsettings_configuration_engine_clean_plugin_id (const gchar* id) { +static gchar* +gsettings_configuration_engine_clean_plugin_id (const gchar* id) +{ gchar* result = NULL; gchar* cleaned = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_; - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_; - gboolean _tmp6_; - gchar* _tmp8_; + gchar* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + const gchar* _tmp3_ = NULL; + const gchar* _tmp4_; + gchar* _tmp6_; #line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (id != NULL, NULL); #line 278 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = id; -#line 278 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = string_replace (_tmp0_, "/", "-"); + _tmp0_ = string_replace (id, "/", "-"); #line 278 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - cleaned = _tmp1_; + cleaned = _tmp0_; #line 279 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = cleaned; + _tmp1_ = cleaned; #line 279 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = string_strip (_tmp2_); + _tmp2_ = string_strip (_tmp1_); #line 279 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (cleaned); #line 279 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - cleaned = _tmp3_; + cleaned = _tmp2_; #line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = cleaned; + _tmp4_ = cleaned; #line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = is_string_empty (_tmp5_); -#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - if (!_tmp6_) { -#line 3635 "GSettingsEngine.c" - const gchar* _tmp7_; + if (!is_string_empty (_tmp4_)) { +#line 3628 "GSettingsEngine.c" + const gchar* _tmp5_; #line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = cleaned; + _tmp5_ = cleaned; #line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = _tmp7_; -#line 3641 "GSettingsEngine.c" + _tmp3_ = _tmp5_; +#line 3634 "GSettingsEngine.c" } else { #line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = NULL; -#line 3645 "GSettingsEngine.c" + _tmp3_ = NULL; +#line 3638 "GSettingsEngine.c" } #line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp8_ = g_strdup (_tmp4_); + _tmp6_ = g_strdup (_tmp3_); #line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp8_; + result = _tmp6_; #line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (cleaned); #line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 3655 "GSettingsEngine.c" +#line 3648 "GSettingsEngine.c" } -static gchar* gsettings_configuration_engine_get_plugin_enable_disable_name (const gchar* id) { +static gchar* +gsettings_configuration_engine_get_plugin_enable_disable_name (const gchar* id) +{ gchar* result = NULL; gchar* cleaned_id = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp4_; - gchar* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; + gchar* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; #line 284 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (id != NULL, NULL); #line 285 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = id; -#line 285 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = gsettings_configuration_engine_clean_plugin_id (_tmp0_); + _tmp0_ = gsettings_configuration_engine_clean_plugin_id (id); #line 285 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - cleaned_id = _tmp1_; + cleaned_id = _tmp0_; #line 286 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = cleaned_id; + _tmp1_ = cleaned_id; #line 286 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - if (_tmp2_ == NULL) { -#line 3681 "GSettingsEngine.c" - gchar* _tmp3_; + if (_tmp1_ == NULL) { +#line 3673 "GSettingsEngine.c" + gchar* _tmp2_; #line 287 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = g_strdup ("default"); + _tmp2_ = g_strdup ("default"); #line 287 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (cleaned_id); #line 287 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - cleaned_id = _tmp3_; -#line 3689 "GSettingsEngine.c" + cleaned_id = _tmp2_; +#line 3681 "GSettingsEngine.c" } #line 289 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = cleaned_id; + _tmp3_ = cleaned_id; #line 289 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = string_replace (_tmp4_, "org.yorba.shotwell.", ""); + _tmp4_ = string_replace (_tmp3_, "org.yorba.shotwell.", ""); #line 289 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (cleaned_id); #line 289 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - cleaned_id = _tmp5_; + cleaned_id = _tmp4_; #line 290 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = cleaned_id; + _tmp5_ = cleaned_id; #line 290 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = string_replace (_tmp6_, ".", "-"); + _tmp6_ = string_replace (_tmp5_, ".", "-"); #line 290 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (cleaned_id); #line 290 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - cleaned_id = _tmp7_; + cleaned_id = _tmp6_; #line 292 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" result = cleaned_id; #line 292 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 3711 "GSettingsEngine.c" +#line 3703 "GSettingsEngine.c" } -static gchar* gsettings_configuration_engine_make_plugin_schema_name (const gchar* domain, const gchar* id) { +static gchar* +gsettings_configuration_engine_make_plugin_schema_name (const gchar* domain, + const gchar* id) +{ gchar* result = NULL; gchar* cleaned_id = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp4_; - gchar* _tmp5_; - const gchar* _tmp6_; - const gchar* _tmp7_; - gchar* _tmp8_; + gchar* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; #line 295 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (domain != NULL, NULL); #line 295 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (id != NULL, NULL); #line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = id; + _tmp0_ = gsettings_configuration_engine_clean_plugin_id (id); #line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = gsettings_configuration_engine_clean_plugin_id (_tmp0_); -#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - cleaned_id = _tmp1_; + cleaned_id = _tmp0_; #line 297 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = cleaned_id; + _tmp1_ = cleaned_id; #line 297 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - if (_tmp2_ == NULL) { -#line 3740 "GSettingsEngine.c" - gchar* _tmp3_; + if (_tmp1_ == NULL) { +#line 3731 "GSettingsEngine.c" + gchar* _tmp2_; #line 298 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = g_strdup ("default"); + _tmp2_ = g_strdup ("default"); #line 298 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (cleaned_id); #line 298 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - cleaned_id = _tmp3_; -#line 3748 "GSettingsEngine.c" + cleaned_id = _tmp2_; +#line 3739 "GSettingsEngine.c" } #line 299 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = cleaned_id; + _tmp3_ = cleaned_id; #line 299 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = string_replace (_tmp4_, ".", "-"); + _tmp4_ = string_replace (_tmp3_, ".", "-"); #line 299 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (cleaned_id); #line 299 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - cleaned_id = _tmp5_; + cleaned_id = _tmp4_; #line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = domain; + _tmp5_ = cleaned_id; #line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = cleaned_id; + _tmp6_ = g_strdup_printf ("org.yorba.shotwell.%s.%s", domain, _tmp5_); #line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp8_ = g_strdup_printf ("org.yorba.shotwell.%s.%s", _tmp6_, _tmp7_); -#line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp8_; + result = _tmp6_; #line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (cleaned_id); #line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 3770 "GSettingsEngine.c" +#line 3759 "GSettingsEngine.c" } -static gchar* gsettings_configuration_engine_make_gsettings_key (const gchar* gconf_key) { +static gchar* +gsettings_configuration_engine_make_gsettings_key (const gchar* gconf_key) +{ gchar* result = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; #line 304 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (gconf_key != NULL, NULL); #line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = gconf_key; + _tmp0_ = string_replace (gconf_key, "_", "-"); #line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = string_replace (_tmp0_, "_", "-"); -#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp1_; + result = _tmp0_; #line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 3788 "GSettingsEngine.c" +#line 3776 "GSettingsEngine.c" } -static gchar* gsettings_configuration_engine_real_get_name (ConfigurationEngine* base) { +static gchar* +gsettings_configuration_engine_real_get_name (ConfigurationEngine* base) +{ GSettingsConfigurationEngine * self; gchar* result = NULL; gchar* _tmp0_; @@ -3800,23 +3790,24 @@ static gchar* gsettings_configuration_engine_real_get_name (ConfigurationEngine* result = _tmp0_; #line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 3804 "GSettingsEngine.c" +#line 3794 "GSettingsEngine.c" } -static gint gsettings_configuration_engine_real_get_enum_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error) { +static gint +gsettings_configuration_engine_real_get_enum_property (ConfigurationEngine* base, + ConfigurableProperty p, + GError** error) +{ GSettingsConfigurationEngine * self; gint result = 0; gint _tmp0_ = 0; gchar** _tmp1_; gint _tmp1__length1; - ConfigurableProperty _tmp2_; - const gchar* _tmp3_; - gchar** _tmp4_; - gint _tmp4__length1; - ConfigurableProperty _tmp5_; - const gchar* _tmp6_; - gint _tmp7_; + const gchar* _tmp2_; + gchar** _tmp3_; + gint _tmp3__length1; + const gchar* _tmp4_; GError * _inner_error_ = NULL; #line 312 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -3825,63 +3816,58 @@ static gint gsettings_configuration_engine_real_get_enum_property (Configuration #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp1__length1 = self->priv->schema_names_length1; #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = p; -#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = _tmp1_[_tmp2_]; -#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = self->priv->key_names; + _tmp2_ = _tmp1_[p]; #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4__length1 = self->priv->key_names_length1; -#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = p; + _tmp3_ = self->priv->key_names; #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = _tmp4_[_tmp5_]; + _tmp3__length1 = self->priv->key_names_length1; #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = gsettings_configuration_engine_get_gs_enum (self, _tmp3_, _tmp6_, &_inner_error_); + _tmp4_ = _tmp3_[p]; #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = _tmp7_; + _tmp0_ = gsettings_configuration_engine_get_gs_enum (self, _tmp2_, _tmp4_, &_inner_error_); #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3848 "GSettingsEngine.c" - gint _tmp8_ = 0; +#line 3833 "GSettingsEngine.c" + gint _tmp5_ = 0; #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_propagate_error (error, _inner_error_); #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp8_; -#line 3854 "GSettingsEngine.c" + return _tmp5_; +#line 3839 "GSettingsEngine.c" } else { - gint _tmp9_ = 0; + gint _tmp6_ = 0; #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp9_; -#line 3863 "GSettingsEngine.c" + return _tmp6_; +#line 3848 "GSettingsEngine.c" } } #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" result = _tmp0_; #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 3870 "GSettingsEngine.c" +#line 3855 "GSettingsEngine.c" } -static void gsettings_configuration_engine_real_set_enum_property (ConfigurationEngine* base, ConfigurableProperty p, gint val, GError** error) { +static void +gsettings_configuration_engine_real_set_enum_property (ConfigurationEngine* base, + ConfigurableProperty p, + gint val, + GError** error) +{ GSettingsConfigurationEngine * self; gchar** _tmp0_; gint _tmp0__length1; - ConfigurableProperty _tmp1_; - const gchar* _tmp2_; - gchar** _tmp3_; - gint _tmp3__length1; - ConfigurableProperty _tmp4_; - const gchar* _tmp5_; - gint _tmp6_; - ConfigurableProperty _tmp7_; + const gchar* _tmp1_; + gchar** _tmp2_; + gint _tmp2__length1; + const gchar* _tmp3_; GError * _inner_error_ = NULL; #line 316 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -3890,21 +3876,15 @@ static void gsettings_configuration_engine_real_set_enum_property (Configuration #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp0__length1 = self->priv->schema_names_length1; #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = p; -#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = _tmp0_[_tmp1_]; + _tmp1_ = _tmp0_[p]; #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = self->priv->key_names; -#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3__length1 = self->priv->key_names_length1; -#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = p; + _tmp2_ = self->priv->key_names; #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = _tmp3_[_tmp4_]; + _tmp2__length1 = self->priv->key_names_length1; #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = val; + _tmp3_ = _tmp2_[p]; #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_set_gs_enum (self, _tmp2_, _tmp5_, _tmp6_, &_inner_error_); + gsettings_configuration_engine_set_gs_enum (self, _tmp1_, _tmp3_, val, &_inner_error_); #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -3913,7 +3893,7 @@ static void gsettings_configuration_engine_real_set_enum_property (Configuration g_propagate_error (error, _inner_error_); #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3917 "GSettingsEngine.c" +#line 3897 "GSettingsEngine.c" } else { #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3921,30 +3901,29 @@ static void gsettings_configuration_engine_real_set_enum_property (Configuration g_clear_error (&_inner_error_); #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3925 "GSettingsEngine.c" +#line 3905 "GSettingsEngine.c" } } #line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = p; -#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp7_); -#line 3932 "GSettingsEngine.c" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", p); +#line 3910 "GSettingsEngine.c" } -static gint gsettings_configuration_engine_real_get_int_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error) { +static gint +gsettings_configuration_engine_real_get_int_property (ConfigurationEngine* base, + ConfigurableProperty p, + GError** error) +{ GSettingsConfigurationEngine * self; gint result = 0; gint _tmp0_ = 0; gchar** _tmp1_; gint _tmp1__length1; - ConfigurableProperty _tmp2_; - const gchar* _tmp3_; - gchar** _tmp4_; - gint _tmp4__length1; - ConfigurableProperty _tmp5_; - const gchar* _tmp6_; - gint _tmp7_; + const gchar* _tmp2_; + gchar** _tmp3_; + gint _tmp3__length1; + const gchar* _tmp4_; GError * _inner_error_ = NULL; #line 321 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -3953,63 +3932,58 @@ static gint gsettings_configuration_engine_real_get_int_property (ConfigurationE #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp1__length1 = self->priv->schema_names_length1; #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = p; -#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = _tmp1_[_tmp2_]; -#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = self->priv->key_names; -#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4__length1 = self->priv->key_names_length1; + _tmp2_ = _tmp1_[p]; #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = p; + _tmp3_ = self->priv->key_names; #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = _tmp4_[_tmp5_]; + _tmp3__length1 = self->priv->key_names_length1; #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = gsettings_configuration_engine_get_gs_int (self, _tmp3_, _tmp6_, &_inner_error_); + _tmp4_ = _tmp3_[p]; #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = _tmp7_; + _tmp0_ = gsettings_configuration_engine_get_gs_int (self, _tmp2_, _tmp4_, &_inner_error_); #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3976 "GSettingsEngine.c" - gint _tmp8_ = 0; +#line 3949 "GSettingsEngine.c" + gint _tmp5_ = 0; #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_propagate_error (error, _inner_error_); #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp8_; -#line 3982 "GSettingsEngine.c" + return _tmp5_; +#line 3955 "GSettingsEngine.c" } else { - gint _tmp9_ = 0; + gint _tmp6_ = 0; #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp9_; -#line 3991 "GSettingsEngine.c" + return _tmp6_; +#line 3964 "GSettingsEngine.c" } } #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" result = _tmp0_; #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 3998 "GSettingsEngine.c" +#line 3971 "GSettingsEngine.c" } -static void gsettings_configuration_engine_real_set_int_property (ConfigurationEngine* base, ConfigurableProperty p, gint val, GError** error) { +static void +gsettings_configuration_engine_real_set_int_property (ConfigurationEngine* base, + ConfigurableProperty p, + gint val, + GError** error) +{ GSettingsConfigurationEngine * self; gchar** _tmp0_; gint _tmp0__length1; - ConfigurableProperty _tmp1_; - const gchar* _tmp2_; - gchar** _tmp3_; - gint _tmp3__length1; - ConfigurableProperty _tmp4_; - const gchar* _tmp5_; - gint _tmp6_; - ConfigurableProperty _tmp7_; + const gchar* _tmp1_; + gchar** _tmp2_; + gint _tmp2__length1; + const gchar* _tmp3_; GError * _inner_error_ = NULL; #line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4018,21 +3992,15 @@ static void gsettings_configuration_engine_real_set_int_property (ConfigurationE #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp0__length1 = self->priv->schema_names_length1; #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = p; + _tmp1_ = _tmp0_[p]; #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = _tmp0_[_tmp1_]; + _tmp2_ = self->priv->key_names; #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = self->priv->key_names; -#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3__length1 = self->priv->key_names_length1; -#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = p; + _tmp2__length1 = self->priv->key_names_length1; #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = _tmp3_[_tmp4_]; + _tmp3_ = _tmp2_[p]; #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = val; -#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_set_gs_int (self, _tmp2_, _tmp5_, _tmp6_, &_inner_error_); + gsettings_configuration_engine_set_gs_int (self, _tmp1_, _tmp3_, val, &_inner_error_); #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4041,7 +4009,7 @@ static void gsettings_configuration_engine_real_set_int_property (ConfigurationE g_propagate_error (error, _inner_error_); #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 4045 "GSettingsEngine.c" +#line 4013 "GSettingsEngine.c" } else { #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4049,201 +4017,147 @@ static void gsettings_configuration_engine_real_set_int_property (ConfigurationE g_clear_error (&_inner_error_); #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 4053 "GSettingsEngine.c" +#line 4021 "GSettingsEngine.c" } } #line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = p; -#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp7_); -#line 4060 "GSettingsEngine.c" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", p); +#line 4026 "GSettingsEngine.c" } -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, + glong maxlen) +{ glong result = 0L; gchar* end = NULL; gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 4083 "GSettingsEngine.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 4091 "GSettingsEngine.c" +#line 4050 "GSettingsEngine.c" } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 4103 "GSettingsEngine.c" +#line 4059 "GSettingsEngine.c" } } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, + glong offset, + glong len) +{ gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + glong _tmp6_; + gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#line 4127 "GSettingsEngine.c" - glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = _tmp2_ >= ((glong) 0); -#line 4133 "GSettingsEngine.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = len >= ((glong) 0); +#line 4080 "GSettingsEngine.c" } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 4137 "GSettingsEngine.c" +#line 4084 "GSettingsEngine.c" } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 4141 "GSettingsEngine.c" +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = string_strnlen ((gchar*) self, offset + len); +#line 4090 "GSettingsEngine.c" + } else { + gint _tmp1_; + gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = (glong) _tmp2_; +#line 4100 "GSettingsEngine.c" + } +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset < ((glong) 0)) { +#line 4104 "GSettingsEngine.c" glong _tmp3_; - glong _tmp4_; - glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 4153 "GSettingsEngine.c" +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 4112 "GSettingsEngine.c" } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#line 4163 "GSettingsEngine.c" - } -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp8_ < ((glong) 0)) { -#line 4169 "GSettingsEngine.c" - glong _tmp9_; - glong _tmp10_; - glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 4183 "GSettingsEngine.c" - } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 4193 "GSettingsEngine.c" + glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 4119 "GSettingsEngine.c" } -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp14_ < ((glong) 0)) { -#line 4199 "GSettingsEngine.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 4208 "GSettingsEngine.c" +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (len < ((glong) 0)) { +#line 4123 "GSettingsEngine.c" + glong _tmp5_; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp5_ - offset; +#line 4129 "GSettingsEngine.c" } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 4228 "GSettingsEngine.c" +#line 4141 "GSettingsEngine.c" } -static gchar* gsettings_configuration_engine_real_get_string_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error) { +static gchar* +gsettings_configuration_engine_real_get_string_property (ConfigurationEngine* base, + ConfigurableProperty p, + GError** error) +{ GSettingsConfigurationEngine * self; gchar* result = NULL; gchar* gs_result = NULL; gchar** _tmp0_; gint _tmp0__length1; - ConfigurableProperty _tmp1_; - const gchar* _tmp2_; - gchar** _tmp3_; - gint _tmp3__length1; - ConfigurableProperty _tmp4_; - const gchar* _tmp5_; - gchar* _tmp6_; + const gchar* _tmp1_; + gchar** _tmp2_; + gint _tmp2__length1; + const gchar* _tmp3_; + gchar* _tmp4_; gchar* _result_ = NULL; - gchar* _tmp7_; - ConfigurableProperty _tmp8_; + gchar* _tmp5_; GError * _inner_error_ = NULL; #line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4252,21 +4166,17 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp0__length1 = self->priv->schema_names_length1; #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = p; + _tmp1_ = _tmp0_[p]; #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = _tmp0_[_tmp1_]; + _tmp2_ = self->priv->key_names; #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = self->priv->key_names; -#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3__length1 = self->priv->key_names_length1; + _tmp2__length1 = self->priv->key_names_length1; #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = p; + _tmp3_ = _tmp2_[p]; #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = _tmp3_[_tmp4_]; + _tmp4_ = gsettings_configuration_engine_get_gs_string (self, _tmp1_, _tmp3_, &_inner_error_); #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = gsettings_configuration_engine_get_gs_string (self, _tmp2_, _tmp5_, &_inner_error_); -#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gs_result = _tmp6_; + gs_result = _tmp4_; #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4275,7 +4185,7 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura g_propagate_error (error, _inner_error_); #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return NULL; -#line 4279 "GSettingsEngine.c" +#line 4189 "GSettingsEngine.c" } else { #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4283,26 +4193,24 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura g_clear_error (&_inner_error_); #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return NULL; -#line 4287 "GSettingsEngine.c" +#line 4197 "GSettingsEngine.c" } } #line 335 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = g_strdup (gs_result); + _tmp5_ = g_strdup (gs_result); #line 335 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _result_ = _tmp7_; -#line 336 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp8_ = p; + _result_ = _tmp5_; #line 336 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - if (_tmp8_ == CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE) { -#line 4298 "GSettingsEngine.c" - gchar* _tmp9_; + if (p == CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE) { +#line 4206 "GSettingsEngine.c" + gchar* _tmp6_; #line 337 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp9_ = string_substring (gs_result, (glong) 7, (glong) -1); + _tmp6_ = string_substring (gs_result, (glong) 7, (glong) -1); #line 337 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (_result_); #line 337 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _result_ = _tmp9_; -#line 4306 "GSettingsEngine.c" + _result_ = _tmp6_; +#line 4214 "GSettingsEngine.c" } #line 340 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" result = _result_; @@ -4310,88 +4218,74 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura _g_free0 (gs_result); #line 340 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 4314 "GSettingsEngine.c" +#line 4222 "GSettingsEngine.c" } -static void gsettings_configuration_engine_real_set_string_property (ConfigurationEngine* base, ConfigurableProperty p, const gchar* val, GError** error) { +static void +gsettings_configuration_engine_real_set_string_property (ConfigurationEngine* base, + ConfigurableProperty p, + const gchar* val, + GError** error) +{ GSettingsConfigurationEngine * self; gchar* converted_val = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - gboolean _tmp2_ = FALSE; - ConfigurableProperty _tmp3_; - gchar** _tmp7_; - gint _tmp7__length1; - ConfigurableProperty _tmp8_; - const gchar* _tmp9_; - gchar** _tmp10_; - gint _tmp10__length1; - ConfigurableProperty _tmp11_; - const gchar* _tmp12_; - const gchar* _tmp13_; - ConfigurableProperty _tmp14_; + gchar* _tmp0_; + gboolean _tmp1_ = FALSE; + gchar** _tmp3_; + gint _tmp3__length1; + const gchar* _tmp4_; + gchar** _tmp5_; + gint _tmp5__length1; + const gchar* _tmp6_; + const gchar* _tmp7_; GError * _inner_error_ = NULL; #line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); #line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_if_fail (val != NULL); #line 345 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = val; -#line 345 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (val); #line 345 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - converted_val = _tmp1_; + converted_val = _tmp0_; #line 346 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = p; + if (p == CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE) { #line 346 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - if (_tmp3_ == CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE) { -#line 346 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = TRUE; -#line 4352 "GSettingsEngine.c" + _tmp1_ = TRUE; +#line 4256 "GSettingsEngine.c" } else { - ConfigurableProperty _tmp4_; #line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = p; -#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = _tmp4_ == CONFIGURABLE_PROPERTY_SCREENSAVER_FILE; -#line 4359 "GSettingsEngine.c" + _tmp1_ = p == CONFIGURABLE_PROPERTY_SCREENSAVER_FILE; +#line 4260 "GSettingsEngine.c" } #line 346 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - if (_tmp2_) { -#line 4363 "GSettingsEngine.c" - const gchar* _tmp5_; - gchar* _tmp6_; -#line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = val; + if (_tmp1_) { +#line 4264 "GSettingsEngine.c" + gchar* _tmp2_; #line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = g_strconcat ("file://", _tmp5_, NULL); + _tmp2_ = g_strconcat ("file://", val, NULL); #line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (converted_val); #line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - converted_val = _tmp6_; -#line 4374 "GSettingsEngine.c" + converted_val = _tmp2_; +#line 4272 "GSettingsEngine.c" } #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = self->priv->schema_names; -#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7__length1 = self->priv->schema_names_length1; + _tmp3_ = self->priv->schema_names; #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp8_ = p; + _tmp3__length1 = self->priv->schema_names_length1; #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp9_ = _tmp7_[_tmp8_]; + _tmp4_ = _tmp3_[p]; #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp10_ = self->priv->key_names; + _tmp5_ = self->priv->key_names; #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp10__length1 = self->priv->key_names_length1; + _tmp5__length1 = self->priv->key_names_length1; #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp11_ = p; + _tmp6_ = _tmp5_[p]; #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp12_ = _tmp10_[_tmp11_]; + _tmp7_ = converted_val; #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp13_ = converted_val; -#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_set_gs_string (self, _tmp9_, _tmp12_, _tmp13_, &_inner_error_); + gsettings_configuration_engine_set_gs_string (self, _tmp4_, _tmp6_, _tmp7_, &_inner_error_); #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4402,7 +4296,7 @@ static void gsettings_configuration_engine_real_set_string_property (Configurati _g_free0 (converted_val); #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 4406 "GSettingsEngine.c" +#line 4300 "GSettingsEngine.c" } else { #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (converted_val); @@ -4412,32 +4306,31 @@ static void gsettings_configuration_engine_real_set_string_property (Configurati g_clear_error (&_inner_error_); #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 4416 "GSettingsEngine.c" +#line 4310 "GSettingsEngine.c" } } #line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp14_ = p; -#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp14_); + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", p); #line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (converted_val); -#line 4425 "GSettingsEngine.c" +#line 4317 "GSettingsEngine.c" } -static gboolean gsettings_configuration_engine_real_get_bool_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error) { +static gboolean +gsettings_configuration_engine_real_get_bool_property (ConfigurationEngine* base, + ConfigurableProperty p, + GError** error) +{ GSettingsConfigurationEngine * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; gchar** _tmp1_; gint _tmp1__length1; - ConfigurableProperty _tmp2_; - const gchar* _tmp3_; - gchar** _tmp4_; - gint _tmp4__length1; - ConfigurableProperty _tmp5_; - const gchar* _tmp6_; - gboolean _tmp7_; + const gchar* _tmp2_; + gchar** _tmp3_; + gint _tmp3__length1; + const gchar* _tmp4_; GError * _inner_error_ = NULL; #line 355 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4446,63 +4339,58 @@ static gboolean gsettings_configuration_engine_real_get_bool_property (Configura #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp1__length1 = self->priv->schema_names_length1; #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = p; -#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = _tmp1_[_tmp2_]; -#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = self->priv->key_names; + _tmp2_ = _tmp1_[p]; #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4__length1 = self->priv->key_names_length1; -#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = p; + _tmp3_ = self->priv->key_names; #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = _tmp4_[_tmp5_]; + _tmp3__length1 = self->priv->key_names_length1; #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = gsettings_configuration_engine_get_gs_bool (self, _tmp3_, _tmp6_, &_inner_error_); + _tmp4_ = _tmp3_[p]; #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = _tmp7_; + _tmp0_ = gsettings_configuration_engine_get_gs_bool (self, _tmp2_, _tmp4_, &_inner_error_); #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4469 "GSettingsEngine.c" - gboolean _tmp8_ = FALSE; +#line 4356 "GSettingsEngine.c" + gboolean _tmp5_ = FALSE; #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_propagate_error (error, _inner_error_); #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp8_; -#line 4475 "GSettingsEngine.c" + return _tmp5_; +#line 4362 "GSettingsEngine.c" } else { - gboolean _tmp9_ = FALSE; + gboolean _tmp6_ = FALSE; #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp9_; -#line 4484 "GSettingsEngine.c" + return _tmp6_; +#line 4371 "GSettingsEngine.c" } } #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" result = _tmp0_; #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 4491 "GSettingsEngine.c" +#line 4378 "GSettingsEngine.c" } -static void gsettings_configuration_engine_real_set_bool_property (ConfigurationEngine* base, ConfigurableProperty p, gboolean val, GError** error) { +static void +gsettings_configuration_engine_real_set_bool_property (ConfigurationEngine* base, + ConfigurableProperty p, + gboolean val, + GError** error) +{ GSettingsConfigurationEngine * self; gchar** _tmp0_; gint _tmp0__length1; - ConfigurableProperty _tmp1_; - const gchar* _tmp2_; - gchar** _tmp3_; - gint _tmp3__length1; - ConfigurableProperty _tmp4_; - const gchar* _tmp5_; - gboolean _tmp6_; - ConfigurableProperty _tmp7_; + const gchar* _tmp1_; + gchar** _tmp2_; + gint _tmp2__length1; + const gchar* _tmp3_; GError * _inner_error_ = NULL; #line 359 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4511,21 +4399,15 @@ static void gsettings_configuration_engine_real_set_bool_property (Configuration #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp0__length1 = self->priv->schema_names_length1; #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = p; + _tmp1_ = _tmp0_[p]; #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = _tmp0_[_tmp1_]; + _tmp2_ = self->priv->key_names; #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = self->priv->key_names; + _tmp2__length1 = self->priv->key_names_length1; #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3__length1 = self->priv->key_names_length1; -#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = p; -#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = _tmp3_[_tmp4_]; + _tmp3_ = _tmp2_[p]; #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = val; -#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_set_gs_bool (self, _tmp2_, _tmp5_, _tmp6_, &_inner_error_); + gsettings_configuration_engine_set_gs_bool (self, _tmp1_, _tmp3_, val, &_inner_error_); #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4534,7 +4416,7 @@ static void gsettings_configuration_engine_real_set_bool_property (Configuration g_propagate_error (error, _inner_error_); #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 4538 "GSettingsEngine.c" +#line 4420 "GSettingsEngine.c" } else { #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4542,30 +4424,29 @@ static void gsettings_configuration_engine_real_set_bool_property (Configuration g_clear_error (&_inner_error_); #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 4546 "GSettingsEngine.c" +#line 4428 "GSettingsEngine.c" } } #line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = p; -#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp7_); -#line 4553 "GSettingsEngine.c" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", p); +#line 4433 "GSettingsEngine.c" } -static gdouble gsettings_configuration_engine_real_get_double_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error) { +static gdouble +gsettings_configuration_engine_real_get_double_property (ConfigurationEngine* base, + ConfigurableProperty p, + GError** error) +{ GSettingsConfigurationEngine * self; gdouble result = 0.0; gdouble _tmp0_ = 0.0; gchar** _tmp1_; gint _tmp1__length1; - ConfigurableProperty _tmp2_; - const gchar* _tmp3_; - gchar** _tmp4_; - gint _tmp4__length1; - ConfigurableProperty _tmp5_; - const gchar* _tmp6_; - gdouble _tmp7_; + const gchar* _tmp2_; + gchar** _tmp3_; + gint _tmp3__length1; + const gchar* _tmp4_; GError * _inner_error_ = NULL; #line 364 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4574,63 +4455,58 @@ static gdouble gsettings_configuration_engine_real_get_double_property (Configur #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp1__length1 = self->priv->schema_names_length1; #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = p; -#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = _tmp1_[_tmp2_]; + _tmp2_ = _tmp1_[p]; #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = self->priv->key_names; -#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4__length1 = self->priv->key_names_length1; -#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = p; + _tmp3_ = self->priv->key_names; #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = _tmp4_[_tmp5_]; + _tmp3__length1 = self->priv->key_names_length1; #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = gsettings_configuration_engine_get_gs_double (self, _tmp3_, _tmp6_, &_inner_error_); + _tmp4_ = _tmp3_[p]; #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = _tmp7_; + _tmp0_ = gsettings_configuration_engine_get_gs_double (self, _tmp2_, _tmp4_, &_inner_error_); #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4597 "GSettingsEngine.c" - gdouble _tmp8_ = 0.0; +#line 4472 "GSettingsEngine.c" + gdouble _tmp5_ = 0.0; #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_propagate_error (error, _inner_error_); #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp8_; -#line 4603 "GSettingsEngine.c" + return _tmp5_; +#line 4478 "GSettingsEngine.c" } else { - gdouble _tmp9_ = 0.0; + gdouble _tmp6_ = 0.0; #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp9_; -#line 4612 "GSettingsEngine.c" + return _tmp6_; +#line 4487 "GSettingsEngine.c" } } #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" result = _tmp0_; #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 4619 "GSettingsEngine.c" +#line 4494 "GSettingsEngine.c" } -static void gsettings_configuration_engine_real_set_double_property (ConfigurationEngine* base, ConfigurableProperty p, gdouble val, GError** error) { +static void +gsettings_configuration_engine_real_set_double_property (ConfigurationEngine* base, + ConfigurableProperty p, + gdouble val, + GError** error) +{ GSettingsConfigurationEngine * self; gchar** _tmp0_; gint _tmp0__length1; - ConfigurableProperty _tmp1_; - const gchar* _tmp2_; - gchar** _tmp3_; - gint _tmp3__length1; - ConfigurableProperty _tmp4_; - const gchar* _tmp5_; - gdouble _tmp6_; - ConfigurableProperty _tmp7_; + const gchar* _tmp1_; + gchar** _tmp2_; + gint _tmp2__length1; + const gchar* _tmp3_; GError * _inner_error_ = NULL; #line 368 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4639,21 +4515,15 @@ static void gsettings_configuration_engine_real_set_double_property (Configurati #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp0__length1 = self->priv->schema_names_length1; #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = p; -#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = _tmp0_[_tmp1_]; + _tmp1_ = _tmp0_[p]; #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = self->priv->key_names; -#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3__length1 = self->priv->key_names_length1; + _tmp2_ = self->priv->key_names; #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = p; + _tmp2__length1 = self->priv->key_names_length1; #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = _tmp3_[_tmp4_]; + _tmp3_ = _tmp2_[p]; #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = val; -#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_set_gs_double (self, _tmp2_, _tmp5_, _tmp6_, &_inner_error_); + gsettings_configuration_engine_set_gs_double (self, _tmp1_, _tmp3_, val, &_inner_error_); #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4662,7 +4532,7 @@ static void gsettings_configuration_engine_real_set_double_property (Configurati g_propagate_error (error, _inner_error_); #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 4666 "GSettingsEngine.c" +#line 4536 "GSettingsEngine.c" } else { #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4670,25 +4540,27 @@ static void gsettings_configuration_engine_real_set_double_property (Configurati g_clear_error (&_inner_error_); #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 4674 "GSettingsEngine.c" +#line 4544 "GSettingsEngine.c" } } #line 370 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = p; -#line 370 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp7_); -#line 4681 "GSettingsEngine.c" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", p); +#line 4549 "GSettingsEngine.c" } -static gboolean gsettings_configuration_engine_real_get_plugin_bool (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gboolean def) { +static gboolean +gsettings_configuration_engine_real_get_plugin_bool (ConfigurationEngine* base, + const gchar* domain, + const gchar* id, + const gchar* key, + gboolean def) +{ GSettingsConfigurationEngine * self; gboolean result = FALSE; gchar* schema_name = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; - gboolean _tmp13_ = FALSE; + gchar* _tmp0_; + gboolean _tmp8_ = FALSE; GError * _inner_error_ = NULL; #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4699,42 +4571,32 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (key != NULL, FALSE); #line 374 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = domain; + _tmp0_ = gsettings_configuration_engine_make_plugin_schema_name (domain, id); #line 374 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = id; -#line 374 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); -#line 374 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_name = _tmp2_; -#line 4710 "GSettingsEngine.c" + schema_name = _tmp0_; +#line 4578 "GSettingsEngine.c" { - gboolean _tmp3_ = FALSE; - const gchar* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - gboolean _tmp7_; - gboolean _tmp8_; -#line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = key; + gboolean _tmp1_ = FALSE; + gchar* _tmp2_; + gchar* _tmp3_; + gboolean _tmp4_; #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = gsettings_configuration_engine_make_gsettings_key (_tmp4_); + _tmp2_ = gsettings_configuration_engine_make_gsettings_key (key); #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = gsettings_configuration_engine_get_gs_bool (self, schema_name, _tmp6_, &_inner_error_); + _tmp4_ = gsettings_configuration_engine_get_gs_bool (self, schema_name, _tmp3_, &_inner_error_); #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp8_ = _tmp7_; -#line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp3_); #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = _tmp8_; + _tmp1_ = _tmp4_; #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4734 "GSettingsEngine.c" - gboolean _tmp9_ = FALSE; +#line 4596 "GSettingsEngine.c" + gboolean _tmp5_ = FALSE; #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4738 "GSettingsEngine.c" +#line 4600 "GSettingsEngine.c" goto __catch218_configuration_error; } #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4744,45 +4606,42 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp9_; -#line 4749 "GSettingsEngine.c" + return _tmp5_; +#line 4611 "GSettingsEngine.c" } #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp3_; + result = _tmp1_; #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 4757 "GSettingsEngine.c" +#line 4619 "GSettingsEngine.c" } goto __finally218; __catch218_configuration_error: { GError* err = NULL; - GError* _tmp10_; - const gchar* _tmp11_; - gboolean _tmp12_; + GError* _tmp6_; + const gchar* _tmp7_; #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" err = _inner_error_; #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _inner_error_ = NULL; #line 379 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp10_ = err; + _tmp6_ = err; #line 379 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp11_ = _tmp10_->message; + _tmp7_ = _tmp6_->message; #line 379 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_critical ("GSettingsEngine.vala:379: GSettingsConfigurationEngine: error: %s", _tmp11_); + g_critical ("GSettingsEngine.vala:379: GSettingsConfigurationEngine: error: %s", _tmp7_); #line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp12_ = def; -#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp12_; + result = def; #line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); #line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); #line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 4786 "GSettingsEngine.c" +#line 4645 "GSettingsEngine.c" } __finally218: #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4792,17 +4651,21 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp13_; -#line 4797 "GSettingsEngine.c" + return _tmp8_; +#line 4656 "GSettingsEngine.c" } -static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gboolean val) { +static void +gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEngine* base, + const gchar* domain, + const gchar* id, + const gchar* key, + gboolean val) +{ GSettingsConfigurationEngine * self; gchar* schema_name = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp0_; GError * _inner_error_ = NULL; #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4813,36 +4676,26 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_if_fail (key != NULL); #line 385 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = domain; -#line 385 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = id; + _tmp0_ = gsettings_configuration_engine_make_plugin_schema_name (domain, id); #line 385 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); -#line 385 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_name = _tmp2_; -#line 4824 "GSettingsEngine.c" + schema_name = _tmp0_; +#line 4683 "GSettingsEngine.c" { - const gchar* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - gboolean _tmp6_; + gchar* _tmp1_; + gchar* _tmp2_; #line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = key; + _tmp1_ = gsettings_configuration_engine_make_gsettings_key (key); #line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = gsettings_configuration_engine_make_gsettings_key (_tmp3_); -#line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = val; + gsettings_configuration_engine_set_gs_bool (self, schema_name, _tmp2_, val, &_inner_error_); #line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_set_gs_bool (self, schema_name, _tmp5_, _tmp6_, &_inner_error_); -#line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp2_); #line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4846 "GSettingsEngine.c" +#line 4699 "GSettingsEngine.c" goto __catch219_configuration_error; } #line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4853,28 +4706,28 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn g_clear_error (&_inner_error_); #line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 4857 "GSettingsEngine.c" +#line 4710 "GSettingsEngine.c" } } goto __finally219; __catch219_configuration_error: { GError* err = NULL; - GError* _tmp7_; - const gchar* _tmp8_; + GError* _tmp3_; + const gchar* _tmp4_; #line 387 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" err = _inner_error_; #line 387 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _inner_error_ = NULL; #line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = err; + _tmp3_ = err; #line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp8_ = _tmp7_->message; + _tmp4_ = _tmp3_->message; #line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_critical ("GSettingsEngine.vala:390: GSettingsConfigurationEngine: error: %s", _tmp8_); + g_critical ("GSettingsEngine.vala:390: GSettingsConfigurationEngine: error: %s", _tmp4_); #line 387 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); -#line 4878 "GSettingsEngine.c" +#line 4731 "GSettingsEngine.c" } __finally219: #line 387 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4887,22 +4740,26 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn g_clear_error (&_inner_error_); #line 387 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 4891 "GSettingsEngine.c" +#line 4744 "GSettingsEngine.c" } #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); -#line 4895 "GSettingsEngine.c" +#line 4748 "GSettingsEngine.c" } -static gdouble gsettings_configuration_engine_real_get_plugin_double (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gdouble def) { +static gdouble +gsettings_configuration_engine_real_get_plugin_double (ConfigurationEngine* base, + const gchar* domain, + const gchar* id, + const gchar* key, + gdouble def) +{ GSettingsConfigurationEngine * self; gdouble result = 0.0; gchar* schema_name = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; - gdouble _tmp13_ = 0.0; + gchar* _tmp0_; + gdouble _tmp8_ = 0.0; GError * _inner_error_ = NULL; #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4913,42 +4770,32 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (key != NULL, 0.0); #line 395 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = domain; -#line 395 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = id; + _tmp0_ = gsettings_configuration_engine_make_plugin_schema_name (domain, id); #line 395 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); -#line 395 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_name = _tmp2_; -#line 4924 "GSettingsEngine.c" + schema_name = _tmp0_; +#line 4777 "GSettingsEngine.c" { - gdouble _tmp3_ = 0.0; - const gchar* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - gdouble _tmp7_; - gdouble _tmp8_; -#line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = key; -#line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = gsettings_configuration_engine_make_gsettings_key (_tmp4_); + gdouble _tmp1_ = 0.0; + gchar* _tmp2_; + gchar* _tmp3_; + gdouble _tmp4_; #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = _tmp5_; + _tmp2_ = gsettings_configuration_engine_make_gsettings_key (key); #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = gsettings_configuration_engine_get_gs_double (self, schema_name, _tmp6_, &_inner_error_); + _tmp3_ = _tmp2_; #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp8_ = _tmp7_; + _tmp4_ = gsettings_configuration_engine_get_gs_double (self, schema_name, _tmp3_, &_inner_error_); #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp3_); #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = _tmp8_; + _tmp1_ = _tmp4_; #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4948 "GSettingsEngine.c" - gdouble _tmp9_ = 0.0; +#line 4795 "GSettingsEngine.c" + gdouble _tmp5_ = 0.0; #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4952 "GSettingsEngine.c" +#line 4799 "GSettingsEngine.c" goto __catch220_configuration_error; } #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4958,45 +4805,42 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp9_; -#line 4963 "GSettingsEngine.c" + return _tmp5_; +#line 4810 "GSettingsEngine.c" } #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp3_; + result = _tmp1_; #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 4971 "GSettingsEngine.c" +#line 4818 "GSettingsEngine.c" } goto __finally220; __catch220_configuration_error: { GError* err = NULL; - GError* _tmp10_; - const gchar* _tmp11_; - gdouble _tmp12_; + GError* _tmp6_; + const gchar* _tmp7_; #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" err = _inner_error_; #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _inner_error_ = NULL; #line 400 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp10_ = err; + _tmp6_ = err; #line 400 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp11_ = _tmp10_->message; + _tmp7_ = _tmp6_->message; #line 400 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_critical ("GSettingsEngine.vala:400: GSettingsConfigurationEngine: error: %s", _tmp11_); -#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp12_ = def; + g_critical ("GSettingsEngine.vala:400: GSettingsConfigurationEngine: error: %s", _tmp7_); #line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp12_; + result = def; #line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); #line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); #line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 5000 "GSettingsEngine.c" +#line 4844 "GSettingsEngine.c" } __finally220: #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5006,17 +4850,21 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp13_; -#line 5011 "GSettingsEngine.c" + return _tmp8_; +#line 4855 "GSettingsEngine.c" } -static void gsettings_configuration_engine_real_set_plugin_double (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gdouble val) { +static void +gsettings_configuration_engine_real_set_plugin_double (ConfigurationEngine* base, + const gchar* domain, + const gchar* id, + const gchar* key, + gdouble val) +{ GSettingsConfigurationEngine * self; gchar* schema_name = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp0_; GError * _inner_error_ = NULL; #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -5027,36 +4875,26 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_if_fail (key != NULL); #line 406 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = domain; + _tmp0_ = gsettings_configuration_engine_make_plugin_schema_name (domain, id); #line 406 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = id; -#line 406 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); -#line 406 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_name = _tmp2_; -#line 5038 "GSettingsEngine.c" + schema_name = _tmp0_; +#line 4882 "GSettingsEngine.c" { - const gchar* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - gdouble _tmp6_; -#line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = key; + gchar* _tmp1_; + gchar* _tmp2_; #line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = gsettings_configuration_engine_make_gsettings_key (_tmp3_); + _tmp1_ = gsettings_configuration_engine_make_gsettings_key (key); #line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = _tmp4_; -#line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = val; + _tmp2_ = _tmp1_; #line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_set_gs_double (self, schema_name, _tmp5_, _tmp6_, &_inner_error_); + gsettings_configuration_engine_set_gs_double (self, schema_name, _tmp2_, val, &_inner_error_); #line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp2_); #line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5060 "GSettingsEngine.c" +#line 4898 "GSettingsEngine.c" goto __catch221_configuration_error; } #line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5067,28 +4905,28 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration g_clear_error (&_inner_error_); #line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 5071 "GSettingsEngine.c" +#line 4909 "GSettingsEngine.c" } } goto __finally221; __catch221_configuration_error: { GError* err = NULL; - GError* _tmp7_; - const gchar* _tmp8_; + GError* _tmp3_; + const gchar* _tmp4_; #line 408 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" err = _inner_error_; #line 408 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _inner_error_ = NULL; #line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = err; + _tmp3_ = err; #line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp8_ = _tmp7_->message; + _tmp4_ = _tmp3_->message; #line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_critical ("GSettingsEngine.vala:411: GSettingsConfigurationEngine: error: %s", _tmp8_); + g_critical ("GSettingsEngine.vala:411: GSettingsConfigurationEngine: error: %s", _tmp4_); #line 408 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); -#line 5092 "GSettingsEngine.c" +#line 4930 "GSettingsEngine.c" } __finally221: #line 408 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5101,22 +4939,26 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration g_clear_error (&_inner_error_); #line 408 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 5105 "GSettingsEngine.c" +#line 4943 "GSettingsEngine.c" } #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); -#line 5109 "GSettingsEngine.c" +#line 4947 "GSettingsEngine.c" } -static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gint def) { +static gint +gsettings_configuration_engine_real_get_plugin_int (ConfigurationEngine* base, + const gchar* domain, + const gchar* id, + const gchar* key, + gint def) +{ GSettingsConfigurationEngine * self; gint result = 0; gchar* schema_name = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; - gint _tmp13_ = 0; + gchar* _tmp0_; + gint _tmp8_ = 0; GError * _inner_error_ = NULL; #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -5127,42 +4969,32 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (key != NULL, 0); #line 416 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = domain; -#line 416 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = id; -#line 416 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); + _tmp0_ = gsettings_configuration_engine_make_plugin_schema_name (domain, id); #line 416 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_name = _tmp2_; -#line 5138 "GSettingsEngine.c" + schema_name = _tmp0_; +#line 4976 "GSettingsEngine.c" { - gint _tmp3_ = 0; - const gchar* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - gint _tmp7_; - gint _tmp8_; -#line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = key; -#line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = gsettings_configuration_engine_make_gsettings_key (_tmp4_); + gint _tmp1_ = 0; + gchar* _tmp2_; + gchar* _tmp3_; + gint _tmp4_; #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = _tmp5_; + _tmp2_ = gsettings_configuration_engine_make_gsettings_key (key); #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = gsettings_configuration_engine_get_gs_int (self, schema_name, _tmp6_, &_inner_error_); + _tmp3_ = _tmp2_; #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp8_ = _tmp7_; + _tmp4_ = gsettings_configuration_engine_get_gs_int (self, schema_name, _tmp3_, &_inner_error_); #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp3_); #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = _tmp8_; + _tmp1_ = _tmp4_; #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5162 "GSettingsEngine.c" - gint _tmp9_ = 0; +#line 4994 "GSettingsEngine.c" + gint _tmp5_ = 0; #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5166 "GSettingsEngine.c" +#line 4998 "GSettingsEngine.c" goto __catch222_configuration_error; } #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5172,45 +5004,42 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp9_; -#line 5177 "GSettingsEngine.c" + return _tmp5_; +#line 5009 "GSettingsEngine.c" } #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp3_; + result = _tmp1_; #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 5185 "GSettingsEngine.c" +#line 5017 "GSettingsEngine.c" } goto __finally222; __catch222_configuration_error: { GError* err = NULL; - GError* _tmp10_; - const gchar* _tmp11_; - gint _tmp12_; + GError* _tmp6_; + const gchar* _tmp7_; #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" err = _inner_error_; #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _inner_error_ = NULL; #line 421 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp10_ = err; + _tmp6_ = err; #line 421 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp11_ = _tmp10_->message; + _tmp7_ = _tmp6_->message; #line 421 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_critical ("GSettingsEngine.vala:421: GSettingsConfigurationEngine: error: %s", _tmp11_); + g_critical ("GSettingsEngine.vala:421: GSettingsConfigurationEngine: error: %s", _tmp7_); #line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp12_ = def; -#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp12_; + result = def; #line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); #line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); #line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 5214 "GSettingsEngine.c" +#line 5043 "GSettingsEngine.c" } __finally222: #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5220,17 +5049,21 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return _tmp13_; -#line 5225 "GSettingsEngine.c" + return _tmp8_; +#line 5054 "GSettingsEngine.c" } -static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gint val) { +static void +gsettings_configuration_engine_real_set_plugin_int (ConfigurationEngine* base, + const gchar* domain, + const gchar* id, + const gchar* key, + gint val) +{ GSettingsConfigurationEngine * self; gchar* schema_name = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp0_; GError * _inner_error_ = NULL; #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -5241,36 +5074,26 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_if_fail (key != NULL); #line 427 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = domain; -#line 427 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = id; + _tmp0_ = gsettings_configuration_engine_make_plugin_schema_name (domain, id); #line 427 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); -#line 427 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_name = _tmp2_; -#line 5252 "GSettingsEngine.c" + schema_name = _tmp0_; +#line 5081 "GSettingsEngine.c" { - const gchar* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - gint _tmp6_; + gchar* _tmp1_; + gchar* _tmp2_; #line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = key; + _tmp1_ = gsettings_configuration_engine_make_gsettings_key (key); #line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = gsettings_configuration_engine_make_gsettings_key (_tmp3_); + _tmp2_ = _tmp1_; #line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = _tmp4_; + gsettings_configuration_engine_set_gs_int (self, schema_name, _tmp2_, val, &_inner_error_); #line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = val; -#line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_set_gs_int (self, schema_name, _tmp5_, _tmp6_, &_inner_error_); -#line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp2_); #line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5274 "GSettingsEngine.c" +#line 5097 "GSettingsEngine.c" goto __catch223_configuration_error; } #line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5281,28 +5104,28 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng g_clear_error (&_inner_error_); #line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 5285 "GSettingsEngine.c" +#line 5108 "GSettingsEngine.c" } } goto __finally223; __catch223_configuration_error: { GError* err = NULL; - GError* _tmp7_; - const gchar* _tmp8_; + GError* _tmp3_; + const gchar* _tmp4_; #line 429 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" err = _inner_error_; #line 429 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _inner_error_ = NULL; #line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = err; + _tmp3_ = err; #line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp8_ = _tmp7_->message; + _tmp4_ = _tmp3_->message; #line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_critical ("GSettingsEngine.vala:432: GSettingsConfigurationEngine: error: %s", _tmp8_); + g_critical ("GSettingsEngine.vala:432: GSettingsConfigurationEngine: error: %s", _tmp4_); #line 429 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); -#line 5306 "GSettingsEngine.c" +#line 5129 "GSettingsEngine.c" } __finally223: #line 429 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5315,21 +5138,25 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng g_clear_error (&_inner_error_); #line 429 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 5319 "GSettingsEngine.c" +#line 5142 "GSettingsEngine.c" } #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); -#line 5323 "GSettingsEngine.c" +#line 5146 "GSettingsEngine.c" } -static gchar* gsettings_configuration_engine_real_get_plugin_string (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, const gchar* def) { +static gchar* +gsettings_configuration_engine_real_get_plugin_string (ConfigurationEngine* base, + const gchar* domain, + const gchar* id, + const gchar* key, + const gchar* def) +{ GSettingsConfigurationEngine * self; gchar* result = NULL; gchar* schema_name = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp0_; GError * _inner_error_ = NULL; #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -5340,41 +5167,34 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (key != NULL, NULL); #line 437 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = domain; + _tmp0_ = gsettings_configuration_engine_make_plugin_schema_name (domain, id); #line 437 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = id; -#line 437 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); -#line 437 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_name = _tmp2_; -#line 5351 "GSettingsEngine.c" + schema_name = _tmp0_; +#line 5174 "GSettingsEngine.c" { - gchar* _tmp3_ = NULL; - const gchar* _tmp4_; + gchar* _tmp1_ = NULL; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = key; + _tmp2_ = gsettings_configuration_engine_make_gsettings_key (key); #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = gsettings_configuration_engine_make_gsettings_key (_tmp4_); -#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = gsettings_configuration_engine_get_gs_string (self, schema_name, _tmp6_, &_inner_error_); + _tmp4_ = gsettings_configuration_engine_get_gs_string (self, schema_name, _tmp3_, &_inner_error_); #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp8_ = _tmp7_; + _tmp5_ = _tmp4_; #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp3_); #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = _tmp8_; + _tmp1_ = _tmp5_; #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5378 "GSettingsEngine.c" +#line 5198 "GSettingsEngine.c" goto __catch224_configuration_error; } #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5385,53 +5205,50 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati g_clear_error (&_inner_error_); #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return NULL; -#line 5389 "GSettingsEngine.c" +#line 5209 "GSettingsEngine.c" } #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp9_ = _tmp3_; + _tmp6_ = _tmp1_; #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = NULL; + _tmp1_ = NULL; #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp9_; + result = _tmp6_; #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp1_); #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 5403 "GSettingsEngine.c" +#line 5223 "GSettingsEngine.c" } goto __finally224; __catch224_configuration_error: { GError* err = NULL; - GError* _tmp10_; - const gchar* _tmp11_; - const gchar* _tmp12_; - gchar* _tmp13_; + GError* _tmp7_; + const gchar* _tmp8_; + gchar* _tmp9_; #line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" err = _inner_error_; #line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _inner_error_ = NULL; #line 442 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp10_ = err; + _tmp7_ = err; #line 442 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp11_ = _tmp10_->message; + _tmp8_ = _tmp7_->message; #line 442 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_critical ("GSettingsEngine.vala:442: GSettingsConfigurationEngine: error: %s", _tmp11_); -#line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp12_ = def; + g_critical ("GSettingsEngine.vala:442: GSettingsConfigurationEngine: error: %s", _tmp8_); #line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp13_ = g_strdup (_tmp12_); + _tmp9_ = g_strdup (def); #line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp13_; + result = _tmp9_; #line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); #line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); #line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 5435 "GSettingsEngine.c" +#line 5252 "GSettingsEngine.c" } __finally224: #line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5442,16 +5259,20 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati g_clear_error (&_inner_error_); #line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return NULL; -#line 5446 "GSettingsEngine.c" +#line 5263 "GSettingsEngine.c" } -static void gsettings_configuration_engine_real_set_plugin_string (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, const gchar* val) { +static void +gsettings_configuration_engine_real_set_plugin_string (ConfigurationEngine* base, + const gchar* domain, + const gchar* id, + const gchar* key, + const gchar* val) +{ GSettingsConfigurationEngine * self; gchar* schema_name = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp0_; GError * _inner_error_ = NULL; #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -5462,36 +5283,26 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_if_fail (key != NULL); #line 448 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = domain; -#line 448 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = id; + _tmp0_ = gsettings_configuration_engine_make_plugin_schema_name (domain, id); #line 448 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); -#line 448 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_name = _tmp2_; -#line 5473 "GSettingsEngine.c" + schema_name = _tmp0_; +#line 5290 "GSettingsEngine.c" { - const gchar* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - const gchar* _tmp6_; -#line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = key; -#line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = gsettings_configuration_engine_make_gsettings_key (_tmp3_); + gchar* _tmp1_; + gchar* _tmp2_; #line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = _tmp4_; + _tmp1_ = gsettings_configuration_engine_make_gsettings_key (key); #line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = val; + _tmp2_ = _tmp1_; #line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_set_gs_string (self, schema_name, _tmp5_, _tmp6_, &_inner_error_); + gsettings_configuration_engine_set_gs_string (self, schema_name, _tmp2_, val, &_inner_error_); #line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp2_); #line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5495 "GSettingsEngine.c" +#line 5306 "GSettingsEngine.c" goto __catch225_configuration_error; } #line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5502,28 +5313,28 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration g_clear_error (&_inner_error_); #line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 5506 "GSettingsEngine.c" +#line 5317 "GSettingsEngine.c" } } goto __finally225; __catch225_configuration_error: { GError* err = NULL; - GError* _tmp7_; - const gchar* _tmp8_; + GError* _tmp3_; + const gchar* _tmp4_; #line 450 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" err = _inner_error_; #line 450 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _inner_error_ = NULL; #line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = err; + _tmp3_ = err; #line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp8_ = _tmp7_->message; + _tmp4_ = _tmp3_->message; #line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_critical ("GSettingsEngine.vala:453: GSettingsConfigurationEngine: error: %s", _tmp8_); + g_critical ("GSettingsEngine.vala:453: GSettingsConfigurationEngine: error: %s", _tmp4_); #line 450 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); -#line 5527 "GSettingsEngine.c" +#line 5338 "GSettingsEngine.c" } __finally225: #line 450 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5536,20 +5347,23 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration g_clear_error (&_inner_error_); #line 450 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 5540 "GSettingsEngine.c" +#line 5351 "GSettingsEngine.c" } #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); -#line 5544 "GSettingsEngine.c" +#line 5355 "GSettingsEngine.c" } -static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key) { +static void +gsettings_configuration_engine_real_unset_plugin_key (ConfigurationEngine* base, + const gchar* domain, + const gchar* id, + const gchar* key) +{ GSettingsConfigurationEngine * self; gchar* schema_name = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp0_; GError * _inner_error_ = NULL; #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -5560,33 +5374,26 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_if_fail (key != NULL); #line 458 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = domain; -#line 458 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = id; -#line 458 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); + _tmp0_ = gsettings_configuration_engine_make_plugin_schema_name (domain, id); #line 458 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_name = _tmp2_; -#line 5571 "GSettingsEngine.c" + schema_name = _tmp0_; +#line 5381 "GSettingsEngine.c" { - const gchar* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; + gchar* _tmp1_; + gchar* _tmp2_; #line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = key; + _tmp1_ = gsettings_configuration_engine_make_gsettings_key (key); #line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = gsettings_configuration_engine_make_gsettings_key (_tmp3_); + _tmp2_ = _tmp1_; #line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = _tmp4_; -#line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_reset_gs_to_default (self, schema_name, _tmp5_, &_inner_error_); + gsettings_configuration_engine_reset_gs_to_default (self, schema_name, _tmp2_, &_inner_error_); #line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp2_); #line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5590 "GSettingsEngine.c" +#line 5397 "GSettingsEngine.c" goto __catch226_configuration_error; } #line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5597,28 +5404,28 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE g_clear_error (&_inner_error_); #line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 5601 "GSettingsEngine.c" +#line 5408 "GSettingsEngine.c" } } goto __finally226; __catch226_configuration_error: { GError* err = NULL; - GError* _tmp6_; - const gchar* _tmp7_; + GError* _tmp3_; + const gchar* _tmp4_; #line 460 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" err = _inner_error_; #line 460 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _inner_error_ = NULL; #line 463 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = err; + _tmp3_ = err; #line 463 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp7_ = _tmp6_->message; + _tmp4_ = _tmp3_->message; #line 463 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_critical ("GSettingsEngine.vala:463: GSettingsConfigurationEngine: error: %s", _tmp7_); + g_critical ("GSettingsEngine.vala:463: GSettingsConfigurationEngine: error: %s", _tmp4_); #line 460 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); -#line 5622 "GSettingsEngine.c" +#line 5429 "GSettingsEngine.c" } __finally226: #line 460 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5631,45 +5438,42 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE g_clear_error (&_inner_error_); #line 460 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 5635 "GSettingsEngine.c" +#line 5442 "GSettingsEngine.c" } #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); -#line 5639 "GSettingsEngine.c" +#line 5446 "GSettingsEngine.c" } -static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled (ConfigurationEngine* base, const gchar* id) { +static FuzzyPropertyState +gsettings_configuration_engine_real_is_plugin_enabled (ConfigurationEngine* base, + const gchar* id) +{ GSettingsConfigurationEngine * self; FuzzyPropertyState result = 0; gchar* enable_disable_name = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; GError * _inner_error_ = NULL; #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (id != NULL, 0); #line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = id; -#line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = gsettings_configuration_engine_get_plugin_enable_disable_name (_tmp0_); + _tmp0_ = gsettings_configuration_engine_get_plugin_enable_disable_name (id); #line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - enable_disable_name = _tmp1_; -#line 5660 "GSettingsEngine.c" + enable_disable_name = _tmp0_; +#line 5467 "GSettingsEngine.c" { - FuzzyPropertyState _tmp2_ = 0; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_; -#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = gsettings_configuration_engine_get_gs_bool (self, GSETTINGS_CONFIGURATION_ENGINE_PLUGINS_ENABLE_DISABLE_SCHEMA_NAME, enable_disable_name, &_inner_error_); + FuzzyPropertyState _tmp1_ = 0; + gboolean _tmp2_ = FALSE; #line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = _tmp4_; + _tmp2_ = gsettings_configuration_engine_get_gs_bool (self, GSETTINGS_CONFIGURATION_ENGINE_PLUGINS_ENABLE_DISABLE_SCHEMA_NAME, enable_disable_name, &_inner_error_); #line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5673 "GSettingsEngine.c" +#line 5477 "GSettingsEngine.c" goto __catch227_configuration_error; } #line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5680,42 +5484,42 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled g_clear_error (&_inner_error_); #line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return 0; -#line 5684 "GSettingsEngine.c" +#line 5488 "GSettingsEngine.c" } #line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - if (_tmp3_) { + if (_tmp2_) { #line 472 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = FUZZY_PROPERTY_STATE_ENABLED; -#line 5690 "GSettingsEngine.c" + _tmp1_ = FUZZY_PROPERTY_STATE_ENABLED; +#line 5494 "GSettingsEngine.c" } else { #line 472 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = FUZZY_PROPERTY_STATE_DISABLED; -#line 5694 "GSettingsEngine.c" + _tmp1_ = FUZZY_PROPERTY_STATE_DISABLED; +#line 5498 "GSettingsEngine.c" } #line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp2_; + result = _tmp1_; #line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (enable_disable_name); #line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 5702 "GSettingsEngine.c" +#line 5506 "GSettingsEngine.c" } goto __finally227; __catch227_configuration_error: { GError* err = NULL; - GError* _tmp5_; - const gchar* _tmp6_; + GError* _tmp3_; + const gchar* _tmp4_; #line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" err = _inner_error_; #line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _inner_error_ = NULL; #line 474 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = err; + _tmp3_ = err; #line 474 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = _tmp5_->message; + _tmp4_ = _tmp3_->message; #line 474 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_critical ("GSettingsEngine.vala:474: GSettingsConfigurationEngine: error: %s", _tmp6_); + g_critical ("GSettingsEngine.vala:474: GSettingsConfigurationEngine: error: %s", _tmp4_); #line 475 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" result = FUZZY_PROPERTY_STATE_UNKNOWN; #line 475 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5724,7 +5528,7 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled _g_free0 (enable_disable_name); #line 475 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 5728 "GSettingsEngine.c" +#line 5532 "GSettingsEngine.c" } __finally227: #line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5735,38 +5539,36 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled g_clear_error (&_inner_error_); #line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return 0; -#line 5739 "GSettingsEngine.c" +#line 5543 "GSettingsEngine.c" } -static void gsettings_configuration_engine_real_set_plugin_enabled (ConfigurationEngine* base, const gchar* id, gboolean enabled) { +static void +gsettings_configuration_engine_real_set_plugin_enabled (ConfigurationEngine* base, + const gchar* id, + gboolean enabled) +{ GSettingsConfigurationEngine * self; gchar* enable_disable_name = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; GError * _inner_error_ = NULL; #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_if_fail (id != NULL); #line 480 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp0_ = id; -#line 480 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp1_ = gsettings_configuration_engine_get_plugin_enable_disable_name (_tmp0_); + _tmp0_ = gsettings_configuration_engine_get_plugin_enable_disable_name (id); #line 480 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - enable_disable_name = _tmp1_; -#line 5759 "GSettingsEngine.c" + enable_disable_name = _tmp0_; +#line 5564 "GSettingsEngine.c" { - gboolean _tmp2_; -#line 483 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = enabled; #line 483 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - gsettings_configuration_engine_set_gs_bool (self, GSETTINGS_CONFIGURATION_ENGINE_PLUGINS_ENABLE_DISABLE_SCHEMA_NAME, enable_disable_name, _tmp2_, &_inner_error_); + gsettings_configuration_engine_set_gs_bool (self, GSETTINGS_CONFIGURATION_ENGINE_PLUGINS_ENABLE_DISABLE_SCHEMA_NAME, enable_disable_name, enabled, &_inner_error_); #line 483 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 483 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5770 "GSettingsEngine.c" +#line 5572 "GSettingsEngine.c" goto __catch228_configuration_error; } #line 483 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5777,28 +5579,28 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio g_clear_error (&_inner_error_); #line 483 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 5781 "GSettingsEngine.c" +#line 5583 "GSettingsEngine.c" } } goto __finally228; __catch228_configuration_error: { GError* err = NULL; - GError* _tmp3_; - const gchar* _tmp4_; + GError* _tmp1_; + const gchar* _tmp2_; #line 482 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" err = _inner_error_; #line 482 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _inner_error_ = NULL; #line 485 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = err; + _tmp1_ = err; #line 485 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = _tmp3_->message; + _tmp2_ = _tmp1_->message; #line 485 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_critical ("GSettingsEngine.vala:485: GSettingsConfigurationEngine: error: %s", _tmp4_); + g_critical ("GSettingsEngine.vala:485: GSettingsConfigurationEngine: error: %s", _tmp2_); #line 482 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); -#line 5802 "GSettingsEngine.c" +#line 5604 "GSettingsEngine.c" } __finally228: #line 482 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5811,15 +5613,17 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio g_clear_error (&_inner_error_); #line 482 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 5815 "GSettingsEngine.c" +#line 5617 "GSettingsEngine.c" } #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (enable_disable_name); -#line 5819 "GSettingsEngine.c" +#line 5621 "GSettingsEngine.c" } -void gsettings_configuration_engine_run_gsettings_migrator (void) { +void +gsettings_configuration_engine_run_gsettings_migrator (void) +{ gchar* cmd_line = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -5846,13 +5650,13 @@ void gsettings_configuration_engine_run_gsettings_migrator (void) { _g_object_unref0 (_tmp1_); #line 494 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" cmd_line = _tmp5_; -#line 5850 "GSettingsEngine.c" +#line 5654 "GSettingsEngine.c" { #line 497 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_spawn_command_line_sync (cmd_line, NULL, NULL, NULL, &_inner_error_); #line 497 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5856 "GSettingsEngine.c" +#line 5660 "GSettingsEngine.c" goto __catch229_g_error; } } @@ -5874,7 +5678,7 @@ void gsettings_configuration_engine_run_gsettings_migrator (void) { g_message ("GSettingsEngine.vala:499: Error running shotwell-settings-migrator: %s", _tmp7_); #line 496 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); -#line 5878 "GSettingsEngine.c" +#line 5682 "GSettingsEngine.c" } __finally229: #line 496 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5887,26 +5691,30 @@ void gsettings_configuration_engine_run_gsettings_migrator (void) { g_clear_error (&_inner_error_); #line 496 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 5891 "GSettingsEngine.c" +#line 5695 "GSettingsEngine.c" } #line 493 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (cmd_line); -#line 5895 "GSettingsEngine.c" +#line 5699 "GSettingsEngine.c" } -static void gsettings_configuration_engine_class_init (GSettingsConfigurationEngineClass * klass) { +static void +gsettings_configuration_engine_class_init (GSettingsConfigurationEngineClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" gsettings_configuration_engine_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_type_class_add_private (klass, sizeof (GSettingsConfigurationEnginePrivate)); #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" G_OBJECT_CLASS (klass)->finalize = gsettings_configuration_engine_finalize; -#line 5906 "GSettingsEngine.c" +#line 5712 "GSettingsEngine.c" } -static void gsettings_configuration_engine_configuration_engine_interface_init (ConfigurationEngineIface * iface) { +static void +gsettings_configuration_engine_configuration_engine_interface_init (ConfigurationEngineIface * iface) +{ #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" gsettings_configuration_engine_configuration_engine_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5953,18 +5761,22 @@ static void gsettings_configuration_engine_configuration_engine_interface_init ( iface->is_plugin_enabled = (FuzzyPropertyState (*) (ConfigurationEngine *, const gchar*)) gsettings_configuration_engine_real_is_plugin_enabled; #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" iface->set_plugin_enabled = (void (*) (ConfigurationEngine *, const gchar*, gboolean)) gsettings_configuration_engine_real_set_plugin_enabled; -#line 5957 "GSettingsEngine.c" +#line 5765 "GSettingsEngine.c" } -static void gsettings_configuration_engine_instance_init (GSettingsConfigurationEngine * self) { +static void +gsettings_configuration_engine_instance_init (GSettingsConfigurationEngine * self) +{ #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self->priv = GSETTINGS_CONFIGURATION_ENGINE_GET_PRIVATE (self); -#line 5964 "GSettingsEngine.c" +#line 5774 "GSettingsEngine.c" } -static void gsettings_configuration_engine_finalize (GObject * obj) { +static void +gsettings_configuration_engine_finalize (GObject * obj) +{ GSettingsConfigurationEngine * self; #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -5974,11 +5786,13 @@ static void gsettings_configuration_engine_finalize (GObject * obj) { self->priv->key_names = (_vala_array_free (self->priv->key_names, self->priv->key_names_length1, (GDestroyNotify) g_free), NULL); #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" G_OBJECT_CLASS (gsettings_configuration_engine_parent_class)->finalize (obj); -#line 5978 "GSettingsEngine.c" +#line 5790 "GSettingsEngine.c" } -GType gsettings_configuration_engine_get_type (void) { +GType +gsettings_configuration_engine_get_type (void) +{ static volatile gsize gsettings_configuration_engine_type_id__volatile = 0; if (g_once_init_enter (&gsettings_configuration_engine_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (GSettingsConfigurationEngineClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gsettings_configuration_engine_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (GSettingsConfigurationEngine), 0, (GInstanceInitFunc) gsettings_configuration_engine_instance_init, NULL }; @@ -5992,7 +5806,11 @@ GType gsettings_configuration_engine_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -6004,7 +5822,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/core/Alteration.c b/src/core/Alteration.c index 173f45f..a6d9ad0 100644 --- a/src/core/Alteration.c +++ b/src/core/Alteration.c @@ -1,4 +1,4 @@ -/* Alteration.c generated by valac 0.36.6, the Vala compiler +/* Alteration.c generated by valac 0.40.4, the Vala compiler * generated from Alteration.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -26,6 +26,7 @@ /* Recommended subjects include: image, thumbnail, metadata.*/ /**/ + #include #include #include @@ -78,49 +79,81 @@ static gpointer alteration_parent_class = NULL; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; #define ALTERATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ALTERATION, AlterationPrivate)) -enum { - ALTERATION_DUMMY_PROPERTY -}; -Alteration* alteration_new (const gchar* subject, const gchar* detail); -Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail); -static void alteration_add_detail (Alteration* self, const gchar* sub, const gchar* det); +Alteration* alteration_new (const gchar* subject, + const gchar* detail); +Alteration* alteration_construct (GType object_type, + const gchar* subject, + const gchar* detail); +static void alteration_add_detail (Alteration* self, + const gchar* sub, + const gchar* det); Alteration* alteration_new_from_list (const gchar* list); -Alteration* alteration_construct_from_list (GType object_type, const gchar* list); -Alteration* alteration_new_from_array (gchar** array, int array_length1); -Alteration* alteration_construct_from_array (GType object_type, gchar** array, int array_length1); +Alteration* alteration_construct_from_list (GType object_type, + const gchar* list); +Alteration* alteration_new_from_array (gchar** array, + int array_length1); +Alteration* alteration_construct_from_array (GType object_type, + gchar** array, + int array_length1); static Alteration* alteration_new_from_map (GeeMultiMap* map); -static Alteration* alteration_construct_from_map (GType object_type, GeeMultiMap* map); +static Alteration* alteration_construct_from_map (GType object_type, + GeeMultiMap* map); static GeeMultiMap* alteration_create_map (Alteration* self); static guint alteration_case_hash (const gchar* a); -static guint _alteration_case_hash_gee_hash_data_func (gconstpointer v, gpointer self); -static gboolean alteration_case_equal (const gchar* a, const gchar* b); -static gboolean _alteration_case_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); -static inline gboolean alteration_equal_values (const gchar* str1, const gchar* str2); +static guint _alteration_case_hash_gee_hash_data_func (gconstpointer v, + gpointer self); +static gboolean alteration_case_equal (const gchar* a, + const gchar* b); +static gboolean _alteration_case_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); +static inline gboolean alteration_equal_values (const gchar* str1, + const gchar* str2); static inline guint alteration_hash_value (const gchar* str); -gboolean alteration_has_subject (Alteration* self, const gchar* subject); -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail); -GeeCollection* alteration_get_details (Alteration* self, const gchar* subject); +gboolean alteration_has_subject (Alteration* self, + const gchar* subject); +gboolean alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail); +GeeCollection* alteration_get_details (Alteration* self, + const gchar* subject); gchar* alteration_to_string (Alteration* self); -gboolean alteration_contains_any (Alteration* self, Alteration* other); -gboolean alteration_equals (Alteration* self, Alteration* other); -static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src); -Alteration* alteration_compress (Alteration* self, Alteration* other); +gboolean alteration_contains_any (Alteration* self, + Alteration* other); +gboolean alteration_equals (Alteration* self, + Alteration* other); +static void alteration_multimap_add_all (GeeMultiMap* dest, + GeeMultiMap* src); +Alteration* alteration_compress (Alteration* self, + Alteration* other); static void alteration_finalize (Alteration * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); -Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail) { +Alteration* +alteration_construct (GType object_type, + const gchar* subject, + const gchar* detail) +{ Alteration* self = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; #line 32 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (subject != NULL, NULL); #line 32 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -128,141 +161,137 @@ Alteration* alteration_construct (GType object_type, const gchar* subject, const #line 32 "/home/jens/Source/shotwell/src/core/Alteration.vala" self = (Alteration*) g_type_create_instance (object_type); #line 33 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = subject; -#line 33 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = detail; -#line 33 "/home/jens/Source/shotwell/src/core/Alteration.vala" - alteration_add_detail (self, _tmp0_, _tmp1_); + alteration_add_detail (self, subject, detail); #line 32 "/home/jens/Source/shotwell/src/core/Alteration.vala" return self; -#line 139 "Alteration.c" +#line 168 "Alteration.c" } -Alteration* alteration_new (const gchar* subject, const gchar* detail) { +Alteration* +alteration_new (const gchar* subject, + const gchar* detail) +{ #line 32 "/home/jens/Source/shotwell/src/core/Alteration.vala" return alteration_construct (TYPE_ALTERATION, subject, detail); -#line 146 "Alteration.c" +#line 178 "Alteration.c" } -Alteration* alteration_construct_from_list (GType object_type, const gchar* list) { +Alteration* +alteration_construct_from_list (GType object_type, + const gchar* list) +{ Alteration* self = NULL; - const gchar* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; gchar** pairs = NULL; - const gchar* _tmp3_; - gchar** _tmp4_; - gchar** _tmp5_; + gchar** _tmp2_; + gchar** _tmp3_; gint pairs_length1; gint _pairs_size_; - gchar** _tmp6_; - gint _tmp6__length1; - gchar** _tmp7_; - gint _tmp7__length1; + gchar** _tmp4_; + gint _tmp4__length1; + gchar** _tmp5_; + gint _tmp5__length1; #line 38 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (list != NULL, NULL); #line 38 "/home/jens/Source/shotwell/src/core/Alteration.vala" self = (Alteration*) g_type_create_instance (object_type); #line 38 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = list; -#line 38 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = strlen (_tmp0_); + _tmp0_ = strlen (list); #line 38 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 38 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_return_val_if_fail (_tmp2_ > 0, "list.length > 0", NULL); + _vala_return_val_if_fail (_tmp1_ > 0, "list.length > 0", NULL); #line 39 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = list; + _tmp3_ = _tmp2_ = g_strsplit (list, ",", 0); #line 39 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp5_ = _tmp4_ = g_strsplit (_tmp3_, ",", 0); + pairs = _tmp3_; #line 39 "/home/jens/Source/shotwell/src/core/Alteration.vala" - pairs = _tmp5_; -#line 39 "/home/jens/Source/shotwell/src/core/Alteration.vala" - pairs_length1 = _vala_array_length (_tmp4_); + pairs_length1 = _vala_array_length (_tmp2_); #line 39 "/home/jens/Source/shotwell/src/core/Alteration.vala" _pairs_size_ = pairs_length1; #line 40 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6_ = pairs; + _tmp4_ = pairs; #line 40 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6__length1 = pairs_length1; + _tmp4__length1 = pairs_length1; #line 40 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp6__length1 >= 1, "pairs.length >= 1"); + _vala_assert (_tmp4__length1 >= 1, "pairs.length >= 1"); #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7_ = pairs; + _tmp5_ = pairs; #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7__length1 = pairs_length1; -#line 197 "Alteration.c" + _tmp5__length1 = pairs_length1; +#line 226 "Alteration.c" { gchar** pair_collection = NULL; gint pair_collection_length1 = 0; gint _pair_collection_size_ = 0; gint pair_it = 0; #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala" - pair_collection = _tmp7_; + pair_collection = _tmp5_; #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala" - pair_collection_length1 = _tmp7__length1; + pair_collection_length1 = _tmp5__length1; #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala" - for (pair_it = 0; pair_it < _tmp7__length1; pair_it = pair_it + 1) { -#line 209 "Alteration.c" - gchar* _tmp8_; + for (pair_it = 0; pair_it < _tmp5__length1; pair_it = pair_it + 1) { +#line 238 "Alteration.c" + gchar* _tmp6_; gchar* pair = NULL; #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp8_ = g_strdup (pair_collection[pair_it]); + _tmp6_ = g_strdup (pair_collection[pair_it]); #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala" - pair = _tmp8_; -#line 216 "Alteration.c" + pair = _tmp6_; +#line 245 "Alteration.c" { gchar** subject_detail = NULL; - const gchar* _tmp9_; - gchar** _tmp10_; - gchar** _tmp11_; + const gchar* _tmp7_; + gchar** _tmp8_; + gchar** _tmp9_; gint subject_detail_length1; gint _subject_detail_size_; - gchar** _tmp12_; - gint _tmp12__length1; + gchar** _tmp10_; + gint _tmp10__length1; + gchar** _tmp11_; + gint _tmp11__length1; + const gchar* _tmp12_; gchar** _tmp13_; gint _tmp13__length1; const gchar* _tmp14_; - gchar** _tmp15_; - gint _tmp15__length1; - const gchar* _tmp16_; #line 43 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9_ = pair; + _tmp7_ = pair; #line 43 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp11_ = _tmp10_ = g_strsplit (_tmp9_, ":", 2); + _tmp9_ = _tmp8_ = g_strsplit (_tmp7_, ":", 2); #line 43 "/home/jens/Source/shotwell/src/core/Alteration.vala" - subject_detail = _tmp11_; + subject_detail = _tmp9_; #line 43 "/home/jens/Source/shotwell/src/core/Alteration.vala" - subject_detail_length1 = _vala_array_length (_tmp10_); + subject_detail_length1 = _vala_array_length (_tmp8_); #line 43 "/home/jens/Source/shotwell/src/core/Alteration.vala" _subject_detail_size_ = subject_detail_length1; #line 44 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp12_ = subject_detail; + _tmp10_ = subject_detail; #line 44 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp12__length1 = subject_detail_length1; + _tmp10__length1 = subject_detail_length1; #line 44 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp12__length1 == 2, "subject_detail.length == 2"); + _vala_assert (_tmp10__length1 == 2, "subject_detail.length == 2"); #line 46 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = subject_detail; + _tmp11_ = subject_detail; #line 46 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13__length1 = subject_detail_length1; + _tmp11__length1 = subject_detail_length1; #line 46 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp14_ = _tmp13_[0]; + _tmp12_ = _tmp11_[0]; #line 46 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp15_ = subject_detail; + _tmp13_ = subject_detail; #line 46 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp15__length1 = subject_detail_length1; + _tmp13__length1 = subject_detail_length1; #line 46 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp16_ = _tmp15_[1]; + _tmp14_ = _tmp13_[1]; #line 46 "/home/jens/Source/shotwell/src/core/Alteration.vala" - alteration_add_detail (self, _tmp14_, _tmp16_); + alteration_add_detail (self, _tmp12_, _tmp14_); #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala" subject_detail = (_vala_array_free (subject_detail, subject_detail_length1, (GDestroyNotify) g_free), NULL); #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (pair); -#line 266 "Alteration.c" +#line 295 "Alteration.c" } } } @@ -270,200 +299,205 @@ Alteration* alteration_construct_from_list (GType object_type, const gchar* list pairs = (_vala_array_free (pairs, pairs_length1, (GDestroyNotify) g_free), NULL); #line 38 "/home/jens/Source/shotwell/src/core/Alteration.vala" return self; -#line 274 "Alteration.c" +#line 303 "Alteration.c" } -Alteration* alteration_new_from_list (const gchar* list) { +Alteration* +alteration_new_from_list (const gchar* list) +{ #line 38 "/home/jens/Source/shotwell/src/core/Alteration.vala" return alteration_construct_from_list (TYPE_ALTERATION, list); -#line 281 "Alteration.c" +#line 312 "Alteration.c" } -Alteration* alteration_construct_from_array (GType object_type, gchar** array, int array_length1) { +Alteration* +alteration_construct_from_array (GType object_type, + gchar** array, + int array_length1) +{ Alteration* self = NULL; - gchar** _tmp0_; - gint _tmp0__length1; - gchar** _tmp1_; - gint _tmp1__length1; #line 52 "/home/jens/Source/shotwell/src/core/Alteration.vala" self = (Alteration*) g_type_create_instance (object_type); #line 52 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = array; -#line 52 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0__length1 = array_length1; -#line 52 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_return_val_if_fail (_tmp0__length1 > 0, "array.length > 0", NULL); -#line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = array; -#line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1__length1 = array_length1; -#line 303 "Alteration.c" + _vala_return_val_if_fail (array_length1 > 0, "array.length > 0", NULL); +#line 326 "Alteration.c" { gchar** pair_collection = NULL; gint pair_collection_length1 = 0; gint _pair_collection_size_ = 0; gint pair_it = 0; #line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala" - pair_collection = _tmp1_; + pair_collection = array; #line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala" - pair_collection_length1 = _tmp1__length1; + pair_collection_length1 = array_length1; #line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala" - for (pair_it = 0; pair_it < _tmp1__length1; pair_it = pair_it + 1) { -#line 315 "Alteration.c" - gchar* _tmp2_; + for (pair_it = 0; pair_it < array_length1; pair_it = pair_it + 1) { +#line 338 "Alteration.c" + gchar* _tmp0_; gchar* pair = NULL; #line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = g_strdup (pair_collection[pair_it]); + _tmp0_ = g_strdup (pair_collection[pair_it]); #line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala" - pair = _tmp2_; -#line 322 "Alteration.c" + pair = _tmp0_; +#line 345 "Alteration.c" { gchar** subject_detail = NULL; - const gchar* _tmp3_; - gchar** _tmp4_; - gchar** _tmp5_; + const gchar* _tmp1_; + gchar** _tmp2_; + gchar** _tmp3_; gint subject_detail_length1; gint _subject_detail_size_; - gchar** _tmp6_; - gint _tmp6__length1; + gchar** _tmp4_; + gint _tmp4__length1; + gchar** _tmp5_; + gint _tmp5__length1; + const gchar* _tmp6_; gchar** _tmp7_; gint _tmp7__length1; const gchar* _tmp8_; - gchar** _tmp9_; - gint _tmp9__length1; - const gchar* _tmp10_; #line 54 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = pair; + _tmp1_ = pair; #line 54 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp5_ = _tmp4_ = g_strsplit (_tmp3_, ":", 2); + _tmp3_ = _tmp2_ = g_strsplit (_tmp1_, ":", 2); #line 54 "/home/jens/Source/shotwell/src/core/Alteration.vala" - subject_detail = _tmp5_; + subject_detail = _tmp3_; #line 54 "/home/jens/Source/shotwell/src/core/Alteration.vala" - subject_detail_length1 = _vala_array_length (_tmp4_); + subject_detail_length1 = _vala_array_length (_tmp2_); #line 54 "/home/jens/Source/shotwell/src/core/Alteration.vala" _subject_detail_size_ = subject_detail_length1; #line 55 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6_ = subject_detail; + _tmp4_ = subject_detail; #line 55 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6__length1 = subject_detail_length1; + _tmp4__length1 = subject_detail_length1; #line 55 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp6__length1 == 2, "subject_detail.length == 2"); + _vala_assert (_tmp4__length1 == 2, "subject_detail.length == 2"); #line 57 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7_ = subject_detail; + _tmp5_ = subject_detail; #line 57 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7__length1 = subject_detail_length1; + _tmp5__length1 = subject_detail_length1; #line 57 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp8_ = _tmp7_[0]; + _tmp6_ = _tmp5_[0]; #line 57 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9_ = subject_detail; + _tmp7_ = subject_detail; #line 57 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9__length1 = subject_detail_length1; + _tmp7__length1 = subject_detail_length1; #line 57 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = _tmp9_[1]; + _tmp8_ = _tmp7_[1]; #line 57 "/home/jens/Source/shotwell/src/core/Alteration.vala" - alteration_add_detail (self, _tmp8_, _tmp10_); + alteration_add_detail (self, _tmp6_, _tmp8_); #line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala" subject_detail = (_vala_array_free (subject_detail, subject_detail_length1, (GDestroyNotify) g_free), NULL); #line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (pair); -#line 372 "Alteration.c" +#line 395 "Alteration.c" } } } #line 52 "/home/jens/Source/shotwell/src/core/Alteration.vala" return self; -#line 378 "Alteration.c" +#line 401 "Alteration.c" } -Alteration* alteration_new_from_array (gchar** array, int array_length1) { +Alteration* +alteration_new_from_array (gchar** array, + int array_length1) +{ #line 52 "/home/jens/Source/shotwell/src/core/Alteration.vala" return alteration_construct_from_array (TYPE_ALTERATION, array, array_length1); -#line 385 "Alteration.c" +#line 411 "Alteration.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 63 "/home/jens/Source/shotwell/src/core/Alteration.vala" return self ? g_object_ref (self) : NULL; -#line 392 "Alteration.c" +#line 420 "Alteration.c" } -static Alteration* alteration_construct_from_map (GType object_type, GeeMultiMap* map) { +static Alteration* +alteration_construct_from_map (GType object_type, + GeeMultiMap* map) +{ Alteration* self = NULL; GeeMultiMap* _tmp0_; - GeeMultiMap* _tmp1_; #line 62 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (GEE_IS_MULTI_MAP (map), NULL); #line 62 "/home/jens/Source/shotwell/src/core/Alteration.vala" self = (Alteration*) g_type_create_instance (object_type); #line 63 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = map; -#line 63 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (map); #line 63 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (self->priv->map); #line 63 "/home/jens/Source/shotwell/src/core/Alteration.vala" - self->priv->map = _tmp1_; + self->priv->map = _tmp0_; #line 62 "/home/jens/Source/shotwell/src/core/Alteration.vala" return self; -#line 414 "Alteration.c" +#line 442 "Alteration.c" } -static Alteration* alteration_new_from_map (GeeMultiMap* map) { +static Alteration* +alteration_new_from_map (GeeMultiMap* map) +{ #line 62 "/home/jens/Source/shotwell/src/core/Alteration.vala" return alteration_construct_from_map (TYPE_ALTERATION, map); -#line 421 "Alteration.c" +#line 451 "Alteration.c" } -static gchar* string_strip (const gchar* self) { +static gchar* +string_strip (const gchar* self) +{ gchar* result = NULL; gchar* _result_ = NULL; gchar* _tmp0_; const gchar* _tmp1_; -#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1248 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _result_; -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 444 "Alteration.c" +#line 476 "Alteration.c" } -static void alteration_add_detail (Alteration* self, const gchar* sub, const gchar* det) { +static void +alteration_add_detail (Alteration* self, + const gchar* sub, + const gchar* det) +{ gchar* subject = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp0_; + const gchar* _tmp1_; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; gchar* detail = NULL; + gchar* _tmp4_; const gchar* _tmp5_; - gchar* _tmp6_; - const gchar* _tmp7_; - gint _tmp8_; - gint _tmp9_; - gboolean _tmp10_ = FALSE; - const gchar* _tmp11_; - GeeMultiMap* _tmp18_; - const gchar* _tmp20_; - GeeMultiMap* _tmp25_; - const gchar* _tmp26_; - const gchar* _tmp27_; + gint _tmp6_; + gint _tmp7_; + gboolean _tmp8_ = FALSE; + const gchar* _tmp9_; + GeeMultiMap* _tmp16_; + const gchar* _tmp18_; + GeeMultiMap* _tmp23_; + const gchar* _tmp24_; + const gchar* _tmp25_; #line 66 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_if_fail (IS_ALTERATION (self)); #line 66 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -471,120 +505,116 @@ static void alteration_add_detail (Alteration* self, const gchar* sub, const gch #line 66 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_if_fail (det != NULL); #line 68 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = sub; -#line 68 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = string_strip (_tmp0_); + _tmp0_ = string_strip (sub); #line 68 "/home/jens/Source/shotwell/src/core/Alteration.vala" - subject = _tmp1_; + subject = _tmp0_; #line 69 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = subject; + _tmp1_ = subject; #line 69 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = strlen (_tmp2_); + _tmp2_ = strlen (_tmp1_); #line 69 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 69 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp4_ > 0, "subject.length > 0"); -#line 71 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp5_ = det; + _vala_assert (_tmp3_ > 0, "subject.length > 0"); #line 71 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6_ = string_strip (_tmp5_); + _tmp4_ = string_strip (det); #line 71 "/home/jens/Source/shotwell/src/core/Alteration.vala" - detail = _tmp6_; + detail = _tmp4_; #line 72 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7_ = detail; + _tmp5_ = detail; #line 72 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp8_ = strlen (_tmp7_); + _tmp6_ = strlen (_tmp5_); #line 72 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 72 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp9_ > 0, "detail.length > 0"); + _vala_assert (_tmp7_ > 0, "detail.length > 0"); #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp11_ = self->priv->subject; + _tmp9_ = self->priv->subject; #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp11_ == NULL) { -#line 506 "Alteration.c" - GeeMultiMap* _tmp12_; + if (_tmp9_ == NULL) { +#line 536 "Alteration.c" + GeeMultiMap* _tmp10_; #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp12_ = self->priv->map; + _tmp10_ = self->priv->map; #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = _tmp12_ == NULL; -#line 512 "Alteration.c" + _tmp8_ = _tmp10_ == NULL; +#line 542 "Alteration.c" } else { #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = FALSE; -#line 516 "Alteration.c" + _tmp8_ = FALSE; +#line 546 "Alteration.c" } #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp10_) { -#line 520 "Alteration.c" - const gchar* _tmp13_; + if (_tmp8_) { +#line 550 "Alteration.c" + const gchar* _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; const gchar* _tmp14_; gchar* _tmp15_; - const gchar* _tmp16_; - gchar* _tmp17_; #line 76 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = self->priv->detail; + _tmp11_ = self->priv->detail; #line 76 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp13_ == NULL, "this.detail == null"); + _vala_assert (_tmp11_ == NULL, "this.detail == null"); #line 78 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp14_ = subject; + _tmp12_ = subject; #line 78 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp15_ = g_strdup (_tmp14_); + _tmp13_ = g_strdup (_tmp12_); #line 78 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (self->priv->subject); #line 78 "/home/jens/Source/shotwell/src/core/Alteration.vala" - self->priv->subject = _tmp15_; + self->priv->subject = _tmp13_; #line 79 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp16_ = detail; + _tmp14_ = detail; #line 79 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp17_ = g_strdup (_tmp16_); + _tmp15_ = g_strdup (_tmp14_); #line 79 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (self->priv->detail); #line 79 "/home/jens/Source/shotwell/src/core/Alteration.vala" - self->priv->detail = _tmp17_; + self->priv->detail = _tmp15_; #line 81 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (detail); #line 81 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (subject); #line 81 "/home/jens/Source/shotwell/src/core/Alteration.vala" return; -#line 552 "Alteration.c" +#line 582 "Alteration.c" } #line 85 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp18_ = self->priv->map; + _tmp16_ = self->priv->map; #line 85 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp18_ == NULL) { -#line 558 "Alteration.c" - GeeMultiMap* _tmp19_; + if (_tmp16_ == NULL) { +#line 588 "Alteration.c" + GeeMultiMap* _tmp17_; #line 86 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp19_ = alteration_create_map (self); + _tmp17_ = alteration_create_map (self); #line 86 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (self->priv->map); #line 86 "/home/jens/Source/shotwell/src/core/Alteration.vala" - self->priv->map = _tmp19_; -#line 566 "Alteration.c" + self->priv->map = _tmp17_; +#line 596 "Alteration.c" } #line 89 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp20_ = self->priv->subject; + _tmp18_ = self->priv->subject; #line 89 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp20_ != NULL) { -#line 572 "Alteration.c" + if (_tmp18_ != NULL) { +#line 602 "Alteration.c" + const gchar* _tmp19_; + GeeMultiMap* _tmp20_; const gchar* _tmp21_; - GeeMultiMap* _tmp22_; - const gchar* _tmp23_; - const gchar* _tmp24_; + const gchar* _tmp22_; #line 90 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp21_ = self->priv->detail; + _tmp19_ = self->priv->detail; #line 90 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp21_ != NULL, "this.detail != null"); + _vala_assert (_tmp19_ != NULL, "this.detail != null"); #line 92 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp22_ = self->priv->map; + _tmp20_ = self->priv->map; #line 92 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp23_ = self->priv->subject; + _tmp21_ = self->priv->subject; #line 92 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp24_ = self->priv->detail; + _tmp22_ = self->priv->detail; #line 92 "/home/jens/Source/shotwell/src/core/Alteration.vala" - gee_multi_map_set (_tmp22_, _tmp23_, _tmp24_); + gee_multi_map_set (_tmp20_, _tmp21_, _tmp22_); #line 93 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (self->priv->subject); #line 93 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -593,43 +623,52 @@ static void alteration_add_detail (Alteration* self, const gchar* sub, const gch _g_free0 (self->priv->detail); #line 94 "/home/jens/Source/shotwell/src/core/Alteration.vala" self->priv->detail = NULL; -#line 597 "Alteration.c" +#line 627 "Alteration.c" } #line 98 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp25_ = self->priv->map; + _tmp23_ = self->priv->map; #line 98 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp26_ = subject; + _tmp24_ = subject; #line 98 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp27_ = detail; + _tmp25_ = detail; #line 98 "/home/jens/Source/shotwell/src/core/Alteration.vala" - gee_multi_map_set (_tmp25_, _tmp26_, _tmp27_); + gee_multi_map_set (_tmp23_, _tmp24_, _tmp25_); #line 66 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (detail); #line 66 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (subject); -#line 611 "Alteration.c" +#line 641 "Alteration.c" } -static guint _alteration_case_hash_gee_hash_data_func (gconstpointer v, gpointer self) { +static guint +_alteration_case_hash_gee_hash_data_func (gconstpointer v, + gpointer self) +{ guint result; result = alteration_case_hash ((const gchar*) v); #line 102 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 620 "Alteration.c" +#line 653 "Alteration.c" } -static gboolean _alteration_case_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_alteration_case_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = alteration_case_equal ((const gchar*) a, (const gchar*) b); #line 102 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 629 "Alteration.c" +#line 666 "Alteration.c" } -static GeeMultiMap* alteration_create_map (Alteration* self) { +static GeeMultiMap* +alteration_create_map (Alteration* self) +{ GeeMultiMap* result = NULL; GeeHashMultiMap* _tmp0_; #line 101 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -640,97 +679,80 @@ static GeeMultiMap* alteration_create_map (Alteration* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap); #line 102 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 644 "Alteration.c" +#line 683 "Alteration.c" } -static gboolean alteration_case_equal (const gchar* a, const gchar* b) { +static gboolean +alteration_case_equal (const gchar* a, + const gchar* b) +{ gboolean result = FALSE; - const gchar* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; -#line 106 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = a; #line 106 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = b; -#line 106 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = alteration_equal_values (_tmp0_, _tmp1_); -#line 106 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp2_; + result = alteration_equal_values (a, b); #line 106 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 663 "Alteration.c" +#line 696 "Alteration.c" } -static guint alteration_case_hash (const gchar* a) { +static guint +alteration_case_hash (const gchar* a) +{ guint result = 0U; - const gchar* _tmp0_; - guint _tmp1_; -#line 110 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = a; -#line 110 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = alteration_hash_value (_tmp0_); #line 110 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp1_; + result = alteration_hash_value (a); #line 110 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 679 "Alteration.c" +#line 708 "Alteration.c" } -static inline gboolean alteration_equal_values (const gchar* str1, const gchar* str2) { +static inline gboolean +alteration_equal_values (const gchar* str1, + const gchar* str2) +{ gboolean result = FALSE; - const gchar* _tmp0_; - const gchar* _tmp1_; - gint _tmp2_; #line 113 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (str1 != NULL, FALSE); #line 113 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (str2 != NULL, FALSE); #line 114 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = str1; -#line 114 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = str2; -#line 114 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = g_ascii_strcasecmp (_tmp0_, _tmp1_); -#line 114 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp2_ == 0; + result = g_ascii_strcasecmp (str1, str2) == 0; #line 114 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 702 "Alteration.c" +#line 725 "Alteration.c" } -static inline guint alteration_hash_value (const gchar* str) { +static inline guint +alteration_hash_value (const gchar* str) +{ guint result = 0U; GHashFunc _tmp0_; - const gchar* _tmp1_; - guint _tmp2_; #line 117 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (str != NULL, 0U); #line 118 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp0_ = g_str_hash; #line 118 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = str; -#line 118 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = _tmp0_ (_tmp1_); -#line 118 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp2_; + result = _tmp0_ (str); #line 118 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 723 "Alteration.c" +#line 742 "Alteration.c" } -gboolean alteration_has_subject (Alteration* self, const gchar* subject) { +gboolean +alteration_has_subject (Alteration* self, + const gchar* subject) +{ gboolean result = FALSE; const gchar* _tmp0_; - GeeMultiMap* _tmp4_; + GeeMultiMap* _tmp2_; GeeSet* keys = NULL; - GeeMultiMap* _tmp5_; - GeeSet* _tmp6_; - GeeSet* _tmp7_; + GeeMultiMap* _tmp3_; + GeeSet* _tmp4_; + GeeSet* _tmp5_; #line 121 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (IS_ALTERATION (self), FALSE); #line 121 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -739,82 +761,67 @@ gboolean alteration_has_subject (Alteration* self, const gchar* subject) { _tmp0_ = self->priv->subject; #line 122 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp0_ != NULL) { -#line 743 "Alteration.c" +#line 765 "Alteration.c" const gchar* _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; #line 123 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp1_ = self->priv->subject; #line 123 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = subject; -#line 123 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = alteration_equal_values (_tmp1_, _tmp2_); -#line 123 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp3_; + result = alteration_equal_values (_tmp1_, subject); #line 123 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 757 "Alteration.c" +#line 773 "Alteration.c" } #line 125 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp4_ = self->priv->map; + _tmp2_ = self->priv->map; #line 125 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp4_ != NULL, "map != null"); + _vala_assert (_tmp2_ != NULL, "map != null"); #line 126 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp5_ = self->priv->map; + _tmp3_ = self->priv->map; #line 126 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6_ = gee_multi_map_get_keys (_tmp5_); + _tmp4_ = gee_multi_map_get_keys (_tmp3_); #line 126 "/home/jens/Source/shotwell/src/core/Alteration.vala" - keys = _tmp6_; + keys = _tmp4_; #line 127 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7_ = keys; + _tmp5_ = keys; #line 127 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp7_ != NULL) { -#line 773 "Alteration.c" + if (_tmp5_ != NULL) { +#line 789 "Alteration.c" { GeeIterator* _key_it = NULL; - GeeSet* _tmp8_; - GeeIterator* _tmp9_; + GeeSet* _tmp6_; + GeeIterator* _tmp7_; #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp8_ = keys; + _tmp6_ = keys; #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _key_it = _tmp9_; + _key_it = _tmp7_; #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { -#line 786 "Alteration.c" - GeeIterator* _tmp10_; - gboolean _tmp11_; +#line 802 "Alteration.c" + GeeIterator* _tmp8_; gchar* key = NULL; - GeeIterator* _tmp12_; - gpointer _tmp13_; - const gchar* _tmp14_; - const gchar* _tmp15_; - gboolean _tmp16_; -#line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = _key_it; + GeeIterator* _tmp9_; + gpointer _tmp10_; + const gchar* _tmp11_; #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp11_ = gee_iterator_next (_tmp10_); + _tmp8_ = _key_it; #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp11_) { + if (!gee_iterator_next (_tmp8_)) { #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" break; -#line 803 "Alteration.c" +#line 814 "Alteration.c" } #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp12_ = _key_it; + _tmp9_ = _key_it; #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = gee_iterator_get (_tmp12_); + _tmp10_ = gee_iterator_get (_tmp9_); #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" - key = (gchar*) _tmp13_; -#line 129 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp14_ = key; + key = (gchar*) _tmp10_; #line 129 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp15_ = subject; + _tmp11_ = key; #line 129 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp16_ = alteration_equal_values (_tmp14_, _tmp15_); -#line 129 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp16_) { + if (alteration_equal_values (_tmp11_, subject)) { #line 130 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = TRUE; #line 130 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -825,15 +832,15 @@ gboolean alteration_has_subject (Alteration* self, const gchar* subject) { _g_object_unref0 (keys); #line 130 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 829 "Alteration.c" +#line 836 "Alteration.c" } #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (key); -#line 833 "Alteration.c" +#line 840 "Alteration.c" } #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (_key_it); -#line 837 "Alteration.c" +#line 844 "Alteration.c" } } #line 134 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -842,20 +849,23 @@ gboolean alteration_has_subject (Alteration* self, const gchar* subject) { _g_object_unref0 (keys); #line 134 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 846 "Alteration.c" +#line 853 "Alteration.c" } -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail) { +gboolean +alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; const gchar* _tmp1_; - GeeMultiMap* _tmp10_; + GeeMultiMap* _tmp6_; GeeCollection* values = NULL; - GeeMultiMap* _tmp11_; - const gchar* _tmp12_; - GeeCollection* _tmp13_; - GeeCollection* _tmp14_; + GeeMultiMap* _tmp7_; + GeeCollection* _tmp8_; + GeeCollection* _tmp9_; #line 137 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (IS_ALTERATION (self), FALSE); #line 137 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -866,119 +876,96 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc _tmp1_ = self->priv->subject; #line 138 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp1_ != NULL) { -#line 870 "Alteration.c" +#line 880 "Alteration.c" const gchar* _tmp2_; #line 138 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp2_ = self->priv->detail; #line 138 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp0_ = _tmp2_ != NULL; -#line 876 "Alteration.c" +#line 886 "Alteration.c" } else { #line 138 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp0_ = FALSE; -#line 880 "Alteration.c" +#line 890 "Alteration.c" } #line 138 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp0_) { -#line 884 "Alteration.c" +#line 894 "Alteration.c" gboolean _tmp3_ = FALSE; const gchar* _tmp4_; - const gchar* _tmp5_; - gboolean _tmp6_; #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp4_ = self->priv->subject; #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp5_ = subject; -#line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6_ = alteration_equal_values (_tmp4_, _tmp5_); -#line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp6_) { -#line 897 "Alteration.c" - const gchar* _tmp7_; - const gchar* _tmp8_; - gboolean _tmp9_; + if (alteration_equal_values (_tmp4_, subject)) { +#line 901 "Alteration.c" + const gchar* _tmp5_; #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7_ = self->priv->detail; + _tmp5_ = self->priv->detail; #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp8_ = detail; -#line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9_ = alteration_equal_values (_tmp7_, _tmp8_); -#line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = _tmp9_; -#line 909 "Alteration.c" + _tmp3_ = alteration_equal_values (_tmp5_, detail); +#line 907 "Alteration.c" } else { #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp3_ = FALSE; -#line 913 "Alteration.c" +#line 911 "Alteration.c" } #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = _tmp3_; #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 919 "Alteration.c" +#line 917 "Alteration.c" } #line 141 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = self->priv->map; + _tmp6_ = self->priv->map; #line 141 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp10_ != NULL, "map != null"); -#line 142 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp11_ = self->priv->map; + _vala_assert (_tmp6_ != NULL, "map != null"); #line 142 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp12_ = subject; + _tmp7_ = self->priv->map; #line 142 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = gee_multi_map_get (_tmp11_, _tmp12_); + _tmp8_ = gee_multi_map_get (_tmp7_, subject); #line 142 "/home/jens/Source/shotwell/src/core/Alteration.vala" - values = _tmp13_; + values = _tmp8_; #line 143 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp14_ = values; + _tmp9_ = values; #line 143 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp14_ != NULL) { -#line 937 "Alteration.c" + if (_tmp9_ != NULL) { +#line 933 "Alteration.c" { GeeIterator* _value_it = NULL; - GeeCollection* _tmp15_; - GeeIterator* _tmp16_; + GeeCollection* _tmp10_; + GeeIterator* _tmp11_; #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp15_ = values; + _tmp10_ = values; #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _value_it = _tmp16_; + _value_it = _tmp11_; #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { -#line 950 "Alteration.c" - GeeIterator* _tmp17_; - gboolean _tmp18_; +#line 946 "Alteration.c" + GeeIterator* _tmp12_; gchar* value = NULL; - GeeIterator* _tmp19_; - gpointer _tmp20_; - const gchar* _tmp21_; - const gchar* _tmp22_; - gboolean _tmp23_; -#line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp17_ = _value_it; + GeeIterator* _tmp13_; + gpointer _tmp14_; + const gchar* _tmp15_; #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp18_ = gee_iterator_next (_tmp17_); + _tmp12_ = _value_it; #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp18_) { + if (!gee_iterator_next (_tmp12_)) { #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" break; -#line 967 "Alteration.c" +#line 958 "Alteration.c" } #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp19_ = _value_it; + _tmp13_ = _value_it; #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp20_ = gee_iterator_get (_tmp19_); + _tmp14_ = gee_iterator_get (_tmp13_); #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" - value = (gchar*) _tmp20_; -#line 145 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp21_ = value; + value = (gchar*) _tmp14_; #line 145 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp22_ = detail; + _tmp15_ = value; #line 145 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp23_ = alteration_equal_values (_tmp21_, _tmp22_); -#line 145 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp23_) { + if (alteration_equal_values (_tmp15_, detail)) { #line 146 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = TRUE; #line 146 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -989,15 +976,15 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc _g_object_unref0 (values); #line 146 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 993 "Alteration.c" +#line 980 "Alteration.c" } #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (value); -#line 997 "Alteration.c" +#line 984 "Alteration.c" } #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (_value_it); -#line 1001 "Alteration.c" +#line 988 "Alteration.c" } } #line 150 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1006,17 +993,20 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc _g_object_unref0 (values); #line 150 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1010 "Alteration.c" +#line 997 "Alteration.c" } -GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) { +GeeCollection* +alteration_get_details (Alteration* self, + const gchar* subject) +{ GeeCollection* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; const gchar* _tmp2_; - GeeCollection* _tmp10_ = NULL; - GeeMultiMap* _tmp11_; + GeeCollection* _tmp8_ = NULL; + GeeMultiMap* _tmp9_; #line 153 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (IS_ALTERATION (self), NULL); #line 153 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1025,96 +1015,89 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) { _tmp2_ = self->priv->subject; #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp2_ != NULL) { -#line 1029 "Alteration.c" +#line 1019 "Alteration.c" const gchar* _tmp3_; #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp3_ = self->priv->detail; #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp1_ = _tmp3_ != NULL; -#line 1035 "Alteration.c" +#line 1025 "Alteration.c" } else { #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp1_ = FALSE; -#line 1039 "Alteration.c" +#line 1029 "Alteration.c" } #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp1_) { -#line 1043 "Alteration.c" +#line 1033 "Alteration.c" const gchar* _tmp4_; - const gchar* _tmp5_; - gboolean _tmp6_; #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp4_ = self->priv->subject; #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp5_ = subject; -#line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6_ = alteration_equal_values (_tmp4_, _tmp5_); -#line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = _tmp6_; -#line 1055 "Alteration.c" + _tmp0_ = alteration_equal_values (_tmp4_, subject); +#line 1039 "Alteration.c" } else { #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp0_ = FALSE; -#line 1059 "Alteration.c" +#line 1043 "Alteration.c" } #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp0_) { -#line 1063 "Alteration.c" +#line 1047 "Alteration.c" GeeArrayList* details = NULL; - GeeArrayList* _tmp7_; - GeeArrayList* _tmp8_; - const gchar* _tmp9_; + GeeArrayList* _tmp5_; + GeeArrayList* _tmp6_; + const gchar* _tmp7_; #line 155 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp5_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 155 "/home/jens/Source/shotwell/src/core/Alteration.vala" - details = _tmp7_; + details = _tmp5_; #line 156 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp8_ = details; + _tmp6_ = details; #line 156 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9_ = self->priv->detail; + _tmp7_ = self->priv->detail; #line 156 "/home/jens/Source/shotwell/src/core/Alteration.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_); #line 158 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = G_TYPE_CHECK_INSTANCE_CAST (details, GEE_TYPE_COLLECTION, GeeCollection); #line 158 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1082 "Alteration.c" +#line 1066 "Alteration.c" } #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp11_ = self->priv->map; + _tmp9_ = self->priv->map; #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp11_ != NULL) { -#line 1088 "Alteration.c" - GeeMultiMap* _tmp12_; - const gchar* _tmp13_; - GeeCollection* _tmp14_; -#line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp12_ = self->priv->map; + if (_tmp9_ != NULL) { +#line 1072 "Alteration.c" + GeeMultiMap* _tmp10_; + GeeCollection* _tmp11_; #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = subject; + _tmp10_ = self->priv->map; #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp14_ = gee_multi_map_get (_tmp12_, _tmp13_); + _tmp11_ = gee_multi_map_get (_tmp10_, subject); #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = _tmp14_; -#line 1102 "Alteration.c" + _tmp8_ = _tmp11_; +#line 1083 "Alteration.c" } else { #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = NULL; -#line 1108 "Alteration.c" + _tmp8_ = NULL; +#line 1089 "Alteration.c" } #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp10_; + result = _tmp8_; #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1114 "Alteration.c" +#line 1095 "Alteration.c" } -gchar* alteration_to_string (Alteration* self) { +gchar* +alteration_to_string (Alteration* self) +{ gchar* result = NULL; const gchar* _tmp0_; GeeMultiMap* _tmp5_; @@ -1126,7 +1109,7 @@ gchar* alteration_to_string (Alteration* self) { _tmp0_ = self->priv->subject; #line 165 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp0_ != NULL) { -#line 1130 "Alteration.c" +#line 1113 "Alteration.c" const gchar* _tmp1_; const gchar* _tmp2_; const gchar* _tmp3_; @@ -1145,7 +1128,7 @@ gchar* alteration_to_string (Alteration* self) { result = _tmp4_; #line 168 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1149 "Alteration.c" +#line 1132 "Alteration.c" } #line 171 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp5_ = self->priv->map; @@ -1155,7 +1138,7 @@ gchar* alteration_to_string (Alteration* self) { _tmp6_ = g_strdup (""); #line 173 "/home/jens/Source/shotwell/src/core/Alteration.vala" str = _tmp6_; -#line 1159 "Alteration.c" +#line 1142 "Alteration.c" { GeeIterator* _key_it = NULL; GeeMultiMap* _tmp7_; @@ -1179,456 +1162,411 @@ gchar* alteration_to_string (Alteration* self) { _key_it = _tmp11_; #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { -#line 1183 "Alteration.c" +#line 1166 "Alteration.c" GeeIterator* _tmp12_; - gboolean _tmp13_; gchar* key = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; + GeeIterator* _tmp13_; + gpointer _tmp14_; #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp12_ = _key_it; #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = gee_iterator_next (_tmp12_); -#line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp12_)) { #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" break; -#line 1197 "Alteration.c" +#line 1177 "Alteration.c" } #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp14_ = _key_it; + _tmp13_ = _key_it; #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp14_ = gee_iterator_get (_tmp13_); #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" - key = (gchar*) _tmp15_; -#line 1205 "Alteration.c" + key = (gchar*) _tmp14_; +#line 1185 "Alteration.c" { GeeIterator* _value_it = NULL; - GeeMultiMap* _tmp16_; - const gchar* _tmp17_; + GeeMultiMap* _tmp15_; + const gchar* _tmp16_; + GeeCollection* _tmp17_; GeeCollection* _tmp18_; - GeeCollection* _tmp19_; + GeeIterator* _tmp19_; GeeIterator* _tmp20_; - GeeIterator* _tmp21_; #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp16_ = self->priv->map; + _tmp15_ = self->priv->map; #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp17_ = key; + _tmp16_ = key; #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp18_ = gee_multi_map_get (_tmp16_, _tmp17_); + _tmp17_ = gee_multi_map_get (_tmp15_, _tmp16_); #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable)); #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp21_ = _tmp20_; + _tmp20_ = _tmp19_; #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _g_object_unref0 (_tmp19_); + _g_object_unref0 (_tmp18_); #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _value_it = _tmp21_; + _value_it = _tmp20_; #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { -#line 1232 "Alteration.c" - GeeIterator* _tmp22_; - gboolean _tmp23_; +#line 1212 "Alteration.c" + GeeIterator* _tmp21_; gchar* value = NULL; - GeeIterator* _tmp24_; - gpointer _tmp25_; - const gchar* _tmp26_; - gint _tmp27_; - gint _tmp28_; + GeeIterator* _tmp22_; + gpointer _tmp23_; + const gchar* _tmp24_; + gint _tmp25_; + gint _tmp26_; + const gchar* _tmp29_; + const gchar* _tmp30_; const gchar* _tmp31_; - const gchar* _tmp32_; - const gchar* _tmp33_; + gchar* _tmp32_; + gchar* _tmp33_; gchar* _tmp34_; - gchar* _tmp35_; - gchar* _tmp36_; #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp22_ = _value_it; -#line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp23_ = gee_iterator_next (_tmp22_); + _tmp21_ = _value_it; #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp23_) { + if (!gee_iterator_next (_tmp21_)) { #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" break; -#line 1255 "Alteration.c" +#line 1232 "Alteration.c" } #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp24_ = _value_it; + _tmp22_ = _value_it; #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp25_ = gee_iterator_get (_tmp24_); + _tmp23_ = gee_iterator_get (_tmp22_); #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - value = (gchar*) _tmp25_; + value = (gchar*) _tmp23_; #line 176 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp26_ = str; + _tmp24_ = str; #line 176 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp27_ = strlen (_tmp26_); + _tmp25_ = strlen (_tmp24_); #line 176 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp28_ = _tmp27_; + _tmp26_ = _tmp25_; #line 176 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp28_ != 0) { -#line 1271 "Alteration.c" - const gchar* _tmp29_; - gchar* _tmp30_; + if (_tmp26_ != 0) { +#line 1248 "Alteration.c" + const gchar* _tmp27_; + gchar* _tmp28_; #line 177 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp29_ = str; + _tmp27_ = str; #line 177 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp30_ = g_strconcat (_tmp29_, ", ", NULL); + _tmp28_ = g_strconcat (_tmp27_, ", ", NULL); #line 177 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (str); #line 177 "/home/jens/Source/shotwell/src/core/Alteration.vala" - str = _tmp30_; -#line 1282 "Alteration.c" + str = _tmp28_; +#line 1259 "Alteration.c" } #line 179 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp31_ = str; + _tmp29_ = str; #line 179 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp32_ = key; + _tmp30_ = key; #line 179 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp33_ = value; + _tmp31_ = value; #line 179 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp34_ = g_strdup_printf ("%s:%s", _tmp32_, _tmp33_); + _tmp32_ = g_strdup_printf ("%s:%s", _tmp30_, _tmp31_); #line 179 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp35_ = _tmp34_; + _tmp33_ = _tmp32_; #line 179 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp36_ = g_strconcat (_tmp31_, _tmp35_, NULL); + _tmp34_ = g_strconcat (_tmp29_, _tmp33_, NULL); #line 179 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (str); #line 179 "/home/jens/Source/shotwell/src/core/Alteration.vala" - str = _tmp36_; + str = _tmp34_; #line 179 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _g_free0 (_tmp35_); + _g_free0 (_tmp33_); #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (value); -#line 1304 "Alteration.c" +#line 1281 "Alteration.c" } #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (_value_it); -#line 1308 "Alteration.c" +#line 1285 "Alteration.c" } #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (key); -#line 1312 "Alteration.c" +#line 1289 "Alteration.c" } #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (_key_it); -#line 1316 "Alteration.c" +#line 1293 "Alteration.c" } #line 183 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = str; #line 183 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1322 "Alteration.c" +#line 1299 "Alteration.c" } -gboolean alteration_contains_any (Alteration* self, Alteration* other) { +gboolean +alteration_contains_any (Alteration* self, + Alteration* other) +{ gboolean result = FALSE; - Alteration* _tmp0_; + gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; - const gchar* _tmp4_; - gboolean _tmp19_ = FALSE; - gboolean _tmp20_ = FALSE; - GeeMultiMap* _tmp21_; - gboolean _tmp56_ = FALSE; - GeeMultiMap* _tmp57_; + const gchar* _tmp3_; + gboolean _tmp12_ = FALSE; + gboolean _tmp13_ = FALSE; + GeeMultiMap* _tmp14_; + gboolean _tmp42_ = FALSE; + GeeMultiMap* _tmp43_; #line 187 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (IS_ALTERATION (self), FALSE); #line 187 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (IS_ALTERATION (other), FALSE); #line 189 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = other; -#line 189 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (self == _tmp0_) { + if (self == other) { #line 190 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = TRUE; #line 190 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1350 "Alteration.c" +#line 1327 "Alteration.c" } #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp4_ = self->priv->subject; -#line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp4_ != NULL) { -#line 1356 "Alteration.c" - Alteration* _tmp5_; - const gchar* _tmp6_; + _tmp3_ = self->priv->subject; #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp5_ = other; + if (_tmp3_ != NULL) { +#line 1333 "Alteration.c" + const gchar* _tmp4_; #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6_ = _tmp5_->priv->subject; + _tmp4_ = other->priv->subject; #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = _tmp6_ != NULL; -#line 1365 "Alteration.c" + _tmp2_ = _tmp4_ != NULL; +#line 1339 "Alteration.c" } else { #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = FALSE; -#line 1369 "Alteration.c" + _tmp2_ = FALSE; +#line 1343 "Alteration.c" } #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp3_) { -#line 1373 "Alteration.c" - const gchar* _tmp7_; + if (_tmp2_) { +#line 1347 "Alteration.c" + const gchar* _tmp5_; #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7_ = self->priv->detail; + _tmp5_ = self->priv->detail; #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = _tmp7_ != NULL; -#line 1379 "Alteration.c" + _tmp1_ = _tmp5_ != NULL; +#line 1353 "Alteration.c" } else { #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = FALSE; -#line 1383 "Alteration.c" + _tmp1_ = FALSE; +#line 1357 "Alteration.c" } #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp2_) { -#line 1387 "Alteration.c" - Alteration* _tmp8_; - const gchar* _tmp9_; -#line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp8_ = other; + if (_tmp1_) { +#line 1361 "Alteration.c" + const gchar* _tmp6_; #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9_ = _tmp8_->priv->detail; + _tmp6_ = other->priv->detail; #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = _tmp9_ != NULL; -#line 1396 "Alteration.c" + _tmp0_ = _tmp6_ != NULL; +#line 1367 "Alteration.c" } else { #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = FALSE; -#line 1400 "Alteration.c" + _tmp0_ = FALSE; +#line 1371 "Alteration.c" } #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp1_) { -#line 1404 "Alteration.c" - gboolean _tmp10_ = FALSE; - const gchar* _tmp11_; - Alteration* _tmp12_; - const gchar* _tmp13_; - gboolean _tmp14_; -#line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp11_ = self->priv->subject; -#line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp12_ = other; -#line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = _tmp12_->priv->subject; -#line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp14_ = alteration_equal_values (_tmp11_, _tmp13_); + if (_tmp0_) { +#line 1375 "Alteration.c" + gboolean _tmp7_ = FALSE; + const gchar* _tmp8_; + const gchar* _tmp9_; #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp14_) { -#line 1420 "Alteration.c" - const gchar* _tmp15_; - Alteration* _tmp16_; - const gchar* _tmp17_; - gboolean _tmp18_; + _tmp8_ = self->priv->subject; #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp15_ = self->priv->detail; + _tmp9_ = other->priv->subject; #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp16_ = other; + if (alteration_equal_values (_tmp8_, _tmp9_)) { +#line 1385 "Alteration.c" + const gchar* _tmp10_; + const gchar* _tmp11_; #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp17_ = _tmp16_->priv->detail; + _tmp10_ = self->priv->detail; #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp18_ = alteration_equal_values (_tmp15_, _tmp17_); + _tmp11_ = other->priv->detail; #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = _tmp18_; -#line 1435 "Alteration.c" + _tmp7_ = alteration_equal_values (_tmp10_, _tmp11_); +#line 1394 "Alteration.c" } else { #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = FALSE; -#line 1439 "Alteration.c" + _tmp7_ = FALSE; +#line 1398 "Alteration.c" } #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp10_; + result = _tmp7_; #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1445 "Alteration.c" +#line 1404 "Alteration.c" } #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp21_ = self->priv->map; + _tmp14_ = self->priv->map; #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp21_ != NULL) { -#line 1451 "Alteration.c" - Alteration* _tmp22_; - GeeMultiMap* _tmp23_; -#line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp22_ = other; + if (_tmp14_ != NULL) { +#line 1410 "Alteration.c" + GeeMultiMap* _tmp15_; #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp23_ = _tmp22_->priv->map; + _tmp15_ = other->priv->map; #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp20_ = _tmp23_ == NULL; -#line 1460 "Alteration.c" + _tmp13_ = _tmp15_ == NULL; +#line 1416 "Alteration.c" } else { #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp20_ = FALSE; -#line 1464 "Alteration.c" + _tmp13_ = FALSE; +#line 1420 "Alteration.c" } #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp20_) { + if (_tmp13_) { #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp19_ = TRUE; -#line 1470 "Alteration.c" + _tmp12_ = TRUE; +#line 1426 "Alteration.c" } else { - gboolean _tmp24_ = FALSE; - GeeMultiMap* _tmp25_; + gboolean _tmp16_ = FALSE; + GeeMultiMap* _tmp17_; #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp25_ = self->priv->map; -#line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp25_ == NULL) { -#line 1478 "Alteration.c" - Alteration* _tmp26_; - GeeMultiMap* _tmp27_; + _tmp17_ = self->priv->map; #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp26_ = other; + if (_tmp17_ == NULL) { +#line 1434 "Alteration.c" + GeeMultiMap* _tmp18_; #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp27_ = _tmp26_->priv->map; + _tmp18_ = other->priv->map; #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp24_ = _tmp27_ != NULL; -#line 1487 "Alteration.c" + _tmp16_ = _tmp18_ != NULL; +#line 1440 "Alteration.c" } else { #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp24_ = FALSE; -#line 1491 "Alteration.c" + _tmp16_ = FALSE; +#line 1444 "Alteration.c" } #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp19_ = _tmp24_; -#line 1495 "Alteration.c" + _tmp12_ = _tmp16_; +#line 1448 "Alteration.c" } #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp19_) { -#line 1499 "Alteration.c" - const gchar* _tmp28_ = NULL; - const gchar* _tmp29_; + if (_tmp12_) { +#line 1452 "Alteration.c" + const gchar* _tmp19_ = NULL; + const gchar* _tmp20_; gchar* single_subject = NULL; - gchar* _tmp33_; - const gchar* _tmp34_ = NULL; - const gchar* _tmp35_; + gchar* _tmp23_; + const gchar* _tmp24_ = NULL; + const gchar* _tmp25_; gchar* single_detail = NULL; - gchar* _tmp39_; - GeeMultiMap* _tmp40_ = NULL; - GeeMultiMap* _tmp41_; + gchar* _tmp28_; + GeeMultiMap* _tmp29_ = NULL; + GeeMultiMap* _tmp30_; GeeMultiMap* multimap = NULL; - GeeMultiMap* _tmp45_; - gboolean _tmp46_ = FALSE; - GeeMultiMap* _tmp47_; - const gchar* _tmp48_; - gboolean _tmp49_; + GeeMultiMap* _tmp33_; + gboolean _tmp34_ = FALSE; + GeeMultiMap* _tmp35_; + const gchar* _tmp36_; #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp29_ = self->priv->subject; + _tmp20_ = self->priv->subject; #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp29_ != NULL) { -#line 1520 "Alteration.c" - const gchar* _tmp30_; + if (_tmp20_ != NULL) { +#line 1472 "Alteration.c" + const gchar* _tmp21_; #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp30_ = self->priv->subject; + _tmp21_ = self->priv->subject; #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp28_ = _tmp30_; -#line 1526 "Alteration.c" + _tmp19_ = _tmp21_; +#line 1478 "Alteration.c" } else { - Alteration* _tmp31_; - const gchar* _tmp32_; -#line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp31_ = other; + const gchar* _tmp22_; #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp32_ = _tmp31_->priv->subject; + _tmp22_ = other->priv->subject; #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp28_ = _tmp32_; -#line 1536 "Alteration.c" + _tmp19_ = _tmp22_; +#line 1485 "Alteration.c" } #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp33_ = g_strdup (_tmp28_); + _tmp23_ = g_strdup (_tmp19_); #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" - single_subject = _tmp33_; + single_subject = _tmp23_; #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp35_ = self->priv->detail; + _tmp25_ = self->priv->detail; #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp35_ != NULL) { -#line 1546 "Alteration.c" - const gchar* _tmp36_; + if (_tmp25_ != NULL) { +#line 1495 "Alteration.c" + const gchar* _tmp26_; #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp36_ = self->priv->detail; + _tmp26_ = self->priv->detail; #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp34_ = _tmp36_; -#line 1552 "Alteration.c" + _tmp24_ = _tmp26_; +#line 1501 "Alteration.c" } else { - Alteration* _tmp37_; - const gchar* _tmp38_; -#line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp37_ = other; + const gchar* _tmp27_; #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp38_ = _tmp37_->priv->detail; + _tmp27_ = other->priv->detail; #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp34_ = _tmp38_; -#line 1562 "Alteration.c" + _tmp24_ = _tmp27_; +#line 1508 "Alteration.c" } #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp39_ = g_strdup (_tmp34_); + _tmp28_ = g_strdup (_tmp24_); #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" - single_detail = _tmp39_; + single_detail = _tmp28_; #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp41_ = self->priv->map; + _tmp30_ = self->priv->map; #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp41_ != NULL) { -#line 1572 "Alteration.c" - GeeMultiMap* _tmp42_; + if (_tmp30_ != NULL) { +#line 1518 "Alteration.c" + GeeMultiMap* _tmp31_; #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp42_ = self->priv->map; + _tmp31_ = self->priv->map; #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp40_ = _tmp42_; -#line 1578 "Alteration.c" + _tmp29_ = _tmp31_; +#line 1524 "Alteration.c" } else { - Alteration* _tmp43_; - GeeMultiMap* _tmp44_; + GeeMultiMap* _tmp32_; #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp43_ = other; + _tmp32_ = other->priv->map; #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp44_ = _tmp43_->priv->map; -#line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp40_ = _tmp44_; -#line 1588 "Alteration.c" + _tmp29_ = _tmp32_; +#line 1531 "Alteration.c" } #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp45_ = _g_object_ref0 (_tmp40_); + _tmp33_ = _g_object_ref0 (_tmp29_); #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" - multimap = _tmp45_; -#line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp47_ = multimap; + multimap = _tmp33_; #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp48_ = single_subject; + _tmp35_ = multimap; #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp49_ = gee_multi_map_contains (_tmp47_, _tmp48_); + _tmp36_ = single_subject; #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp49_) { -#line 1602 "Alteration.c" - GeeMultiMap* _tmp50_; - const gchar* _tmp51_; - GeeCollection* _tmp52_; - GeeCollection* _tmp53_; - const gchar* _tmp54_; - gboolean _tmp55_; -#line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp50_ = self->priv->map; + if (gee_multi_map_contains (_tmp35_, _tmp36_)) { +#line 1543 "Alteration.c" + GeeMultiMap* _tmp37_; + const gchar* _tmp38_; + GeeCollection* _tmp39_; + GeeCollection* _tmp40_; + const gchar* _tmp41_; #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp51_ = single_subject; + _tmp37_ = self->priv->map; #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp52_ = gee_multi_map_get (_tmp50_, _tmp51_); + _tmp38_ = single_subject; #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp53_ = _tmp52_; + _tmp39_ = gee_multi_map_get (_tmp37_, _tmp38_); #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp54_ = single_detail; + _tmp40_ = _tmp39_; #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp55_ = gee_collection_contains (_tmp53_, _tmp54_); + _tmp41_ = single_detail; #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp46_ = _tmp55_; + _tmp34_ = gee_collection_contains (_tmp40_, _tmp41_); #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _g_object_unref0 (_tmp53_); -#line 1625 "Alteration.c" + _g_object_unref0 (_tmp40_); +#line 1563 "Alteration.c" } else { #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp46_ = FALSE; -#line 1629 "Alteration.c" + _tmp34_ = FALSE; +#line 1567 "Alteration.c" } #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp46_; + result = _tmp34_; #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (multimap); #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1637,206 +1575,185 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { _g_free0 (single_subject); #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1641 "Alteration.c" +#line 1579 "Alteration.c" } #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp57_ = self->priv->map; + _tmp43_ = self->priv->map; #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp57_ != NULL) { -#line 1647 "Alteration.c" - Alteration* _tmp58_; - GeeMultiMap* _tmp59_; + if (_tmp43_ != NULL) { +#line 1585 "Alteration.c" + GeeMultiMap* _tmp44_; #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp58_ = other; + _tmp44_ = other->priv->map; #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp59_ = _tmp58_->priv->map; -#line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp56_ = _tmp59_ != NULL; -#line 1656 "Alteration.c" + _tmp42_ = _tmp44_ != NULL; +#line 1591 "Alteration.c" } else { #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp56_ = FALSE; -#line 1660 "Alteration.c" + _tmp42_ = FALSE; +#line 1595 "Alteration.c" } #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp56_) { -#line 1664 "Alteration.c" + if (_tmp42_) { +#line 1599 "Alteration.c" GeeSet* keys = NULL; - GeeMultiMap* _tmp60_; - GeeSet* _tmp61_; - GeeSet* _tmp62_; + GeeMultiMap* _tmp45_; + GeeSet* _tmp46_; + GeeSet* _tmp47_; GeeSet* other_keys = NULL; - Alteration* _tmp63_; - GeeMultiMap* _tmp64_; - GeeSet* _tmp65_; - GeeSet* _tmp66_; + GeeMultiMap* _tmp48_; + GeeSet* _tmp49_; + GeeSet* _tmp50_; #line 207 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp60_ = self->priv->map; + _tmp45_ = self->priv->map; #line 207 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp61_ = gee_multi_map_get_keys (_tmp60_); + _tmp46_ = gee_multi_map_get_keys (_tmp45_); #line 207 "/home/jens/Source/shotwell/src/core/Alteration.vala" - keys = _tmp61_; + keys = _tmp46_; #line 208 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp62_ = keys; + _tmp47_ = keys; #line 208 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp62_ != NULL, "keys != null"); -#line 209 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp63_ = other; + _vala_assert (_tmp47_ != NULL, "keys != null"); #line 209 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp64_ = _tmp63_->priv->map; + _tmp48_ = other->priv->map; #line 209 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp65_ = gee_multi_map_get_keys (_tmp64_); + _tmp49_ = gee_multi_map_get_keys (_tmp48_); #line 209 "/home/jens/Source/shotwell/src/core/Alteration.vala" - other_keys = _tmp65_; + other_keys = _tmp49_; #line 210 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp66_ = other_keys; + _tmp50_ = other_keys; #line 210 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp66_ != NULL, "other_keys != null"); -#line 1696 "Alteration.c" + _vala_assert (_tmp50_ != NULL, "other_keys != null"); +#line 1628 "Alteration.c" { GeeIterator* _subject_it = NULL; - GeeSet* _tmp67_; - GeeIterator* _tmp68_; + GeeSet* _tmp51_; + GeeIterator* _tmp52_; #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp67_ = other_keys; + _tmp51_ = other_keys; #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp68_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp52_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_ITERABLE, GeeIterable)); #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _subject_it = _tmp68_; + _subject_it = _tmp52_; #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { -#line 1709 "Alteration.c" - GeeIterator* _tmp69_; - gboolean _tmp70_; +#line 1641 "Alteration.c" + GeeIterator* _tmp53_; gchar* subject = NULL; - GeeIterator* _tmp71_; - gpointer _tmp72_; - GeeSet* _tmp73_; - const gchar* _tmp74_; - gboolean _tmp75_; + GeeIterator* _tmp54_; + gpointer _tmp55_; + GeeSet* _tmp56_; + const gchar* _tmp57_; GeeCollection* details = NULL; - GeeMultiMap* _tmp76_; - const gchar* _tmp77_; - GeeCollection* _tmp78_; + GeeMultiMap* _tmp58_; + const gchar* _tmp59_; + GeeCollection* _tmp60_; GeeCollection* other_details = NULL; - Alteration* _tmp79_; - GeeMultiMap* _tmp80_; - const gchar* _tmp81_; - GeeCollection* _tmp82_; - gboolean _tmp83_ = FALSE; - GeeCollection* _tmp84_; -#line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp69_ = _subject_it; + GeeMultiMap* _tmp61_; + const gchar* _tmp62_; + GeeCollection* _tmp63_; + gboolean _tmp64_ = FALSE; + GeeCollection* _tmp65_; #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp70_ = gee_iterator_next (_tmp69_); + _tmp53_ = _subject_it; #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp70_) { + if (!gee_iterator_next (_tmp53_)) { #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" break; -#line 1737 "Alteration.c" +#line 1664 "Alteration.c" } #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp71_ = _subject_it; + _tmp54_ = _subject_it; #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp72_ = gee_iterator_get (_tmp71_); + _tmp55_ = gee_iterator_get (_tmp54_); #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" - subject = (gchar*) _tmp72_; -#line 213 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp73_ = keys; + subject = (gchar*) _tmp55_; #line 213 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp74_ = subject; + _tmp56_ = keys; #line 213 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp75_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GEE_TYPE_COLLECTION, GeeCollection), _tmp74_); + _tmp57_ = subject; #line 213 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp75_) { + if (!gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_COLLECTION, GeeCollection), _tmp57_)) { #line 214 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (subject); #line 214 "/home/jens/Source/shotwell/src/core/Alteration.vala" continue; -#line 1757 "Alteration.c" +#line 1682 "Alteration.c" } #line 216 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp76_ = self->priv->map; + _tmp58_ = self->priv->map; #line 216 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp77_ = subject; + _tmp59_ = subject; #line 216 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp78_ = gee_multi_map_get (_tmp76_, _tmp77_); + _tmp60_ = gee_multi_map_get (_tmp58_, _tmp59_); #line 216 "/home/jens/Source/shotwell/src/core/Alteration.vala" - details = _tmp78_; -#line 217 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp79_ = other; + details = _tmp60_; #line 217 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp80_ = _tmp79_->priv->map; + _tmp61_ = other->priv->map; #line 217 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp81_ = subject; + _tmp62_ = subject; #line 217 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp82_ = gee_multi_map_get (_tmp80_, _tmp81_); + _tmp63_ = gee_multi_map_get (_tmp61_, _tmp62_); #line 217 "/home/jens/Source/shotwell/src/core/Alteration.vala" - other_details = _tmp82_; + other_details = _tmp63_; #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp84_ = details; + _tmp65_ = details; #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp84_ != NULL) { -#line 1781 "Alteration.c" - GeeCollection* _tmp85_; + if (_tmp65_ != NULL) { +#line 1704 "Alteration.c" + GeeCollection* _tmp66_; #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp85_ = other_details; + _tmp66_ = other_details; #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp83_ = _tmp85_ != NULL; -#line 1787 "Alteration.c" + _tmp64_ = _tmp66_ != NULL; +#line 1710 "Alteration.c" } else { #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp83_ = FALSE; -#line 1791 "Alteration.c" + _tmp64_ = FALSE; +#line 1714 "Alteration.c" } #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp83_) { -#line 1795 "Alteration.c" + if (_tmp64_) { +#line 1718 "Alteration.c" { GeeIterator* _detail_it = NULL; - GeeCollection* _tmp86_; - GeeIterator* _tmp87_; + GeeCollection* _tmp67_; + GeeIterator* _tmp68_; #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp86_ = other_details; + _tmp67_ = other_details; #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp87_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp68_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_ITERABLE, GeeIterable)); #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _detail_it = _tmp87_; + _detail_it = _tmp68_; #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { -#line 1808 "Alteration.c" - GeeIterator* _tmp88_; - gboolean _tmp89_; +#line 1731 "Alteration.c" + GeeIterator* _tmp69_; gchar* detail = NULL; - GeeIterator* _tmp90_; - gpointer _tmp91_; - GeeCollection* _tmp92_; - const gchar* _tmp93_; - gboolean _tmp94_; -#line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp88_ = _detail_it; + GeeIterator* _tmp70_; + gpointer _tmp71_; + GeeCollection* _tmp72_; + const gchar* _tmp73_; #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp89_ = gee_iterator_next (_tmp88_); + _tmp69_ = _detail_it; #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp89_) { + if (!gee_iterator_next (_tmp69_)) { #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" break; -#line 1825 "Alteration.c" +#line 1744 "Alteration.c" } #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp90_ = _detail_it; + _tmp70_ = _detail_it; #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp91_ = gee_iterator_get (_tmp90_); + _tmp71_ = gee_iterator_get (_tmp70_); #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" - detail = (gchar*) _tmp91_; + detail = (gchar*) _tmp71_; #line 221 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp92_ = details; + _tmp72_ = details; #line 221 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp93_ = detail; + _tmp73_ = detail; #line 221 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp94_ = gee_collection_contains (_tmp92_, _tmp93_); -#line 221 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp94_) { + if (gee_collection_contains (_tmp72_, _tmp73_)) { #line 222 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = TRUE; #line 222 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1857,15 +1774,15 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { _g_object_unref0 (keys); #line 222 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1861 "Alteration.c" +#line 1778 "Alteration.c" } #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (detail); -#line 1865 "Alteration.c" +#line 1782 "Alteration.c" } #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (_detail_it); -#line 1869 "Alteration.c" +#line 1786 "Alteration.c" } } #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1874,223 +1791,197 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { _g_object_unref0 (details); #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (subject); -#line 1878 "Alteration.c" +#line 1795 "Alteration.c" } #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (_subject_it); -#line 1882 "Alteration.c" +#line 1799 "Alteration.c" } #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (other_keys); #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (keys); -#line 1888 "Alteration.c" +#line 1805 "Alteration.c" } #line 228 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = FALSE; #line 228 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1894 "Alteration.c" +#line 1811 "Alteration.c" } -gboolean alteration_equals (Alteration* self, Alteration* other) { +gboolean +alteration_equals (Alteration* self, + Alteration* other) +{ gboolean result = FALSE; - Alteration* _tmp0_; + gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; - const gchar* _tmp4_; - gboolean _tmp19_ = FALSE; - GeeMultiMap* _tmp20_; + const gchar* _tmp3_; + gboolean _tmp12_ = FALSE; + GeeMultiMap* _tmp13_; #line 231 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (IS_ALTERATION (self), FALSE); #line 231 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (IS_ALTERATION (other), FALSE); #line 233 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = other; -#line 233 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (self == _tmp0_) { + if (self == other) { #line 234 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = TRUE; #line 234 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1919 "Alteration.c" +#line 1836 "Alteration.c" } #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp4_ = self->priv->subject; -#line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp4_ != NULL) { -#line 1925 "Alteration.c" - Alteration* _tmp5_; - const gchar* _tmp6_; + _tmp3_ = self->priv->subject; #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp5_ = other; + if (_tmp3_ != NULL) { +#line 1842 "Alteration.c" + const gchar* _tmp4_; #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6_ = _tmp5_->priv->subject; + _tmp4_ = other->priv->subject; #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = _tmp6_ != NULL; -#line 1934 "Alteration.c" + _tmp2_ = _tmp4_ != NULL; +#line 1848 "Alteration.c" } else { #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = FALSE; -#line 1938 "Alteration.c" + _tmp2_ = FALSE; +#line 1852 "Alteration.c" } #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp3_) { -#line 1942 "Alteration.c" - const gchar* _tmp7_; + if (_tmp2_) { +#line 1856 "Alteration.c" + const gchar* _tmp5_; #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7_ = self->priv->detail; + _tmp5_ = self->priv->detail; #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = _tmp7_ != NULL; -#line 1948 "Alteration.c" + _tmp1_ = _tmp5_ != NULL; +#line 1862 "Alteration.c" } else { #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = FALSE; -#line 1952 "Alteration.c" + _tmp1_ = FALSE; +#line 1866 "Alteration.c" } #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp2_) { -#line 1956 "Alteration.c" - Alteration* _tmp8_; - const gchar* _tmp9_; -#line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp8_ = other; + if (_tmp1_) { +#line 1870 "Alteration.c" + const gchar* _tmp6_; #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9_ = _tmp8_->priv->detail; + _tmp6_ = other->priv->detail; #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = _tmp9_ != NULL; -#line 1965 "Alteration.c" + _tmp0_ = _tmp6_ != NULL; +#line 1876 "Alteration.c" } else { #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = FALSE; -#line 1969 "Alteration.c" + _tmp0_ = FALSE; +#line 1880 "Alteration.c" } #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp1_) { -#line 1973 "Alteration.c" - gboolean _tmp10_ = FALSE; - const gchar* _tmp11_; - Alteration* _tmp12_; - const gchar* _tmp13_; - gboolean _tmp14_; -#line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp11_ = self->priv->subject; -#line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp12_ = other; -#line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = _tmp12_->priv->subject; -#line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp14_ = alteration_equal_values (_tmp11_, _tmp13_); + if (_tmp0_) { +#line 1884 "Alteration.c" + gboolean _tmp7_ = FALSE; + const gchar* _tmp8_; + const gchar* _tmp9_; #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp14_) { -#line 1989 "Alteration.c" - const gchar* _tmp15_; - Alteration* _tmp16_; - const gchar* _tmp17_; - gboolean _tmp18_; + _tmp8_ = self->priv->subject; #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp15_ = self->priv->detail; + _tmp9_ = other->priv->subject; #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp16_ = other; + if (alteration_equal_values (_tmp8_, _tmp9_)) { +#line 1894 "Alteration.c" + const gchar* _tmp10_; + const gchar* _tmp11_; #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp17_ = _tmp16_->priv->detail; + _tmp10_ = self->priv->detail; #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp18_ = alteration_equal_values (_tmp15_, _tmp17_); + _tmp11_ = other->priv->detail; #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = _tmp18_; -#line 2004 "Alteration.c" + _tmp7_ = alteration_equal_values (_tmp10_, _tmp11_); +#line 1903 "Alteration.c" } else { #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = FALSE; -#line 2008 "Alteration.c" + _tmp7_ = FALSE; +#line 1907 "Alteration.c" } #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp10_; + result = _tmp7_; #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2014 "Alteration.c" +#line 1913 "Alteration.c" } #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp20_ = self->priv->map; -#line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp20_ != NULL) { -#line 2020 "Alteration.c" - Alteration* _tmp21_; - GeeMultiMap* _tmp22_; + _tmp13_ = self->priv->map; #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp21_ = other; + if (_tmp13_ != NULL) { +#line 1919 "Alteration.c" + GeeMultiMap* _tmp14_; #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp22_ = _tmp21_->priv->map; + _tmp14_ = other->priv->map; #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp19_ = _tmp22_ != NULL; -#line 2029 "Alteration.c" + _tmp12_ = _tmp14_ != NULL; +#line 1925 "Alteration.c" } else { #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp19_ = FALSE; -#line 2033 "Alteration.c" + _tmp12_ = FALSE; +#line 1929 "Alteration.c" } #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp19_) { -#line 2037 "Alteration.c" + if (_tmp12_) { +#line 1933 "Alteration.c" GeeSet* keys = NULL; - GeeMultiMap* _tmp23_; - GeeSet* _tmp24_; - GeeSet* _tmp25_; + GeeMultiMap* _tmp15_; + GeeSet* _tmp16_; + GeeSet* _tmp17_; GeeSet* other_keys = NULL; - Alteration* _tmp26_; - GeeMultiMap* _tmp27_; + GeeMultiMap* _tmp18_; + GeeSet* _tmp19_; + GeeSet* _tmp20_; + GeeSet* _tmp21_; + gint _tmp22_; + gint _tmp23_; + GeeSet* _tmp24_; + gint _tmp25_; + gint _tmp26_; + GeeSet* _tmp27_; GeeSet* _tmp28_; GeeSet* _tmp29_; GeeSet* _tmp30_; - gint _tmp31_; - gint _tmp32_; - GeeSet* _tmp33_; - gint _tmp34_; - gint _tmp35_; - GeeSet* _tmp36_; - GeeSet* _tmp37_; - gboolean _tmp38_; - GeeSet* _tmp39_; - GeeSet* _tmp40_; - gboolean _tmp41_; #line 243 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp23_ = self->priv->map; + _tmp15_ = self->priv->map; #line 243 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp24_ = gee_multi_map_get_keys (_tmp23_); + _tmp16_ = gee_multi_map_get_keys (_tmp15_); #line 243 "/home/jens/Source/shotwell/src/core/Alteration.vala" - keys = _tmp24_; + keys = _tmp16_; #line 244 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp25_ = keys; + _tmp17_ = keys; #line 244 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp25_ != NULL, "keys != null"); + _vala_assert (_tmp17_ != NULL, "keys != null"); #line 245 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp26_ = other; + _tmp18_ = other->priv->map; #line 245 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp27_ = _tmp26_->priv->map; + _tmp19_ = gee_multi_map_get_keys (_tmp18_); #line 245 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp28_ = gee_multi_map_get_keys (_tmp27_); -#line 245 "/home/jens/Source/shotwell/src/core/Alteration.vala" - other_keys = _tmp28_; + other_keys = _tmp19_; #line 246 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp29_ = other_keys; + _tmp20_ = other_keys; #line 246 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp29_ != NULL, "other_keys != null"); + _vala_assert (_tmp20_ != NULL, "other_keys != null"); #line 248 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp30_ = keys; + _tmp21_ = keys; #line 248 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp31_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp22_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); #line 248 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp32_ = _tmp31_; + _tmp23_ = _tmp22_; #line 248 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp33_ = other_keys; + _tmp24_ = other_keys; #line 248 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp34_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp25_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection)); #line 248 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp35_ = _tmp34_; + _tmp26_ = _tmp25_; #line 248 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp32_ != _tmp35_) { + if (_tmp23_ != _tmp26_) { #line 249 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = FALSE; #line 249 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2099,16 +1990,14 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { _g_object_unref0 (keys); #line 249 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2103 "Alteration.c" +#line 1994 "Alteration.c" } #line 251 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp36_ = keys; + _tmp27_ = keys; #line 251 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp37_ = other_keys; + _tmp28_ = other_keys; #line 251 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp38_ = gee_collection_contains_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 251 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp38_) { + if (!gee_collection_contains_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection))) { #line 252 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = FALSE; #line 252 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2117,16 +2006,14 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { _g_object_unref0 (keys); #line 252 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2121 "Alteration.c" +#line 2010 "Alteration.c" } #line 254 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp39_ = other_keys; -#line 254 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp40_ = keys; + _tmp29_ = other_keys; #line 254 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp41_ = gee_collection_contains_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp30_ = keys; #line 254 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp41_) { + if (!gee_collection_contains_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection))) { #line 255 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = FALSE; #line 255 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2135,95 +2022,87 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { _g_object_unref0 (keys); #line 255 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2139 "Alteration.c" +#line 2026 "Alteration.c" } { GeeIterator* _key_it = NULL; - GeeSet* _tmp42_; - GeeIterator* _tmp43_; + GeeSet* _tmp31_; + GeeIterator* _tmp32_; #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp42_ = keys; + _tmp31_ = keys; #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp43_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp32_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ITERABLE, GeeIterable)); #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _key_it = _tmp43_; + _key_it = _tmp32_; #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { -#line 2153 "Alteration.c" - GeeIterator* _tmp44_; - gboolean _tmp45_; +#line 2040 "Alteration.c" + GeeIterator* _tmp33_; gchar* key = NULL; - GeeIterator* _tmp46_; - gpointer _tmp47_; + GeeIterator* _tmp34_; + gpointer _tmp35_; GeeCollection* values = NULL; - GeeMultiMap* _tmp48_; - const gchar* _tmp49_; - GeeCollection* _tmp50_; + GeeMultiMap* _tmp36_; + const gchar* _tmp37_; + GeeCollection* _tmp38_; GeeCollection* other_values = NULL; - Alteration* _tmp51_; - GeeMultiMap* _tmp52_; - const gchar* _tmp53_; - GeeCollection* _tmp54_; - GeeCollection* _tmp55_; - gint _tmp56_; - gint _tmp57_; - GeeCollection* _tmp58_; - gint _tmp59_; - gint _tmp60_; - GeeCollection* _tmp61_; - GeeCollection* _tmp62_; - gboolean _tmp63_; - GeeCollection* _tmp64_; - GeeCollection* _tmp65_; - gboolean _tmp66_; -#line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp44_ = _key_it; + GeeMultiMap* _tmp39_; + const gchar* _tmp40_; + GeeCollection* _tmp41_; + GeeCollection* _tmp42_; + gint _tmp43_; + gint _tmp44_; + GeeCollection* _tmp45_; + gint _tmp46_; + gint _tmp47_; + GeeCollection* _tmp48_; + GeeCollection* _tmp49_; + GeeCollection* _tmp50_; + GeeCollection* _tmp51_; #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp45_ = gee_iterator_next (_tmp44_); + _tmp33_ = _key_it; #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp45_) { + if (!gee_iterator_next (_tmp33_)) { #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" break; -#line 2188 "Alteration.c" +#line 2069 "Alteration.c" } #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp46_ = _key_it; + _tmp34_ = _key_it; #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp47_ = gee_iterator_get (_tmp46_); + _tmp35_ = gee_iterator_get (_tmp34_); #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" - key = (gchar*) _tmp47_; + key = (gchar*) _tmp35_; #line 258 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp48_ = self->priv->map; + _tmp36_ = self->priv->map; #line 258 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp49_ = key; + _tmp37_ = key; #line 258 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp50_ = gee_multi_map_get (_tmp48_, _tmp49_); + _tmp38_ = gee_multi_map_get (_tmp36_, _tmp37_); #line 258 "/home/jens/Source/shotwell/src/core/Alteration.vala" - values = _tmp50_; + values = _tmp38_; #line 259 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp51_ = other; + _tmp39_ = other->priv->map; #line 259 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp52_ = _tmp51_->priv->map; + _tmp40_ = key; #line 259 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp53_ = key; + _tmp41_ = gee_multi_map_get (_tmp39_, _tmp40_); #line 259 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp54_ = gee_multi_map_get (_tmp52_, _tmp53_); -#line 259 "/home/jens/Source/shotwell/src/core/Alteration.vala" - other_values = _tmp54_; + other_values = _tmp41_; #line 261 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp55_ = values; + _tmp42_ = values; #line 261 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp56_ = gee_collection_get_size (_tmp55_); + _tmp43_ = gee_collection_get_size (_tmp42_); #line 261 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp57_ = _tmp56_; + _tmp44_ = _tmp43_; #line 261 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp58_ = other_values; + _tmp45_ = other_values; #line 261 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp59_ = gee_collection_get_size (_tmp58_); + _tmp46_ = gee_collection_get_size (_tmp45_); #line 261 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp60_ = _tmp59_; + _tmp47_ = _tmp46_; #line 261 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp57_ != _tmp60_) { + if (_tmp44_ != _tmp47_) { #line 262 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = FALSE; #line 262 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2240,16 +2119,14 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { _g_object_unref0 (keys); #line 262 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2244 "Alteration.c" +#line 2123 "Alteration.c" } #line 264 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp61_ = values; + _tmp48_ = values; #line 264 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp62_ = other_values; + _tmp49_ = other_values; #line 264 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp63_ = gee_collection_contains_all (_tmp61_, _tmp62_); -#line 264 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp63_) { + if (!gee_collection_contains_all (_tmp48_, _tmp49_)) { #line 265 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = FALSE; #line 265 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2266,16 +2143,14 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { _g_object_unref0 (keys); #line 265 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2270 "Alteration.c" +#line 2147 "Alteration.c" } #line 267 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp64_ = other_values; -#line 267 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp65_ = values; + _tmp50_ = other_values; #line 267 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp66_ = gee_collection_contains_all (_tmp64_, _tmp65_); + _tmp51_ = values; #line 267 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp66_) { + if (!gee_collection_contains_all (_tmp50_, _tmp51_)) { #line 268 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = FALSE; #line 268 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2292,7 +2167,7 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { _g_object_unref0 (keys); #line 268 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2296 "Alteration.c" +#line 2171 "Alteration.c" } #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (other_values); @@ -2300,11 +2175,11 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { _g_object_unref0 (values); #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (key); -#line 2304 "Alteration.c" +#line 2179 "Alteration.c" } #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (_key_it); -#line 2308 "Alteration.c" +#line 2183 "Alteration.c" } #line 272 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = TRUE; @@ -2314,414 +2189,408 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { _g_object_unref0 (keys); #line 272 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2318 "Alteration.c" +#line 2193 "Alteration.c" } #line 276 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = FALSE; #line 276 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2324 "Alteration.c" +#line 2199 "Alteration.c" } -static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src) { +static void +alteration_multimap_add_all (GeeMultiMap* dest, + GeeMultiMap* src) +{ GeeSet* keys = NULL; - GeeMultiMap* _tmp0_; - GeeSet* _tmp1_; + GeeSet* _tmp0_; #line 279 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_if_fail (GEE_IS_MULTI_MAP (dest)); #line 279 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_if_fail (GEE_IS_MULTI_MAP (src)); #line 281 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = src; + _tmp0_ = gee_multi_map_get_keys (src); #line 281 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = gee_multi_map_get_keys (_tmp0_); -#line 281 "/home/jens/Source/shotwell/src/core/Alteration.vala" - keys = _tmp1_; -#line 2342 "Alteration.c" + keys = _tmp0_; +#line 2217 "Alteration.c" { GeeIterator* _key_it = NULL; - GeeSet* _tmp2_; - GeeIterator* _tmp3_; + GeeSet* _tmp1_; + GeeIterator* _tmp2_; #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = keys; + _tmp1_ = keys; #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _key_it = _tmp3_; + _key_it = _tmp2_; #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { -#line 2355 "Alteration.c" - GeeIterator* _tmp4_; - gboolean _tmp5_; +#line 2230 "Alteration.c" + GeeIterator* _tmp3_; gchar* key = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; + GeeIterator* _tmp4_; + gpointer _tmp5_; GeeCollection* values = NULL; - GeeMultiMap* _tmp8_; - const gchar* _tmp9_; - GeeCollection* _tmp10_; -#line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp4_ = _key_it; + const gchar* _tmp6_; + GeeCollection* _tmp7_; #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp5_ = gee_iterator_next (_tmp4_); + _tmp3_ = _key_it; #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp3_)) { #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" break; -#line 2373 "Alteration.c" +#line 2244 "Alteration.c" } #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6_ = _key_it; + _tmp4_ = _key_it; #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" - key = (gchar*) _tmp7_; + key = (gchar*) _tmp5_; #line 283 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp8_ = src; + _tmp6_ = key; #line 283 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9_ = key; + _tmp7_ = gee_multi_map_get (src, _tmp6_); #line 283 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = gee_multi_map_get (_tmp8_, _tmp9_); -#line 283 "/home/jens/Source/shotwell/src/core/Alteration.vala" - values = _tmp10_; -#line 2389 "Alteration.c" + values = _tmp7_; +#line 2258 "Alteration.c" { GeeIterator* _value_it = NULL; - GeeCollection* _tmp11_; - GeeIterator* _tmp12_; + GeeCollection* _tmp8_; + GeeIterator* _tmp9_; #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp11_ = values; + _tmp8_ = values; #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _value_it = _tmp12_; + _value_it = _tmp9_; #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { -#line 2402 "Alteration.c" - GeeIterator* _tmp13_; - gboolean _tmp14_; +#line 2271 "Alteration.c" + GeeIterator* _tmp10_; gchar* value = NULL; - GeeIterator* _tmp15_; - gpointer _tmp16_; - GeeMultiMap* _tmp17_; - const gchar* _tmp18_; - const gchar* _tmp19_; + GeeIterator* _tmp11_; + gpointer _tmp12_; + const gchar* _tmp13_; + const gchar* _tmp14_; #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = _value_it; + _tmp10_ = _value_it; #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp14_ = gee_iterator_next (_tmp13_); -#line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp14_) { + if (!gee_iterator_next (_tmp10_)) { #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" break; -#line 2419 "Alteration.c" +#line 2284 "Alteration.c" } #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp15_ = _value_it; + _tmp11_ = _value_it; #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp16_ = gee_iterator_get (_tmp15_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" - value = (gchar*) _tmp16_; -#line 285 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp17_ = dest; + value = (gchar*) _tmp12_; #line 285 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp18_ = key; + _tmp13_ = key; #line 285 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp19_ = value; + _tmp14_ = value; #line 285 "/home/jens/Source/shotwell/src/core/Alteration.vala" - gee_multi_map_set (_tmp17_, _tmp18_, _tmp19_); + gee_multi_map_set (dest, _tmp13_, _tmp14_); #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (value); -#line 2437 "Alteration.c" +#line 2300 "Alteration.c" } #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (_value_it); -#line 2441 "Alteration.c" +#line 2304 "Alteration.c" } #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (values); #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (key); -#line 2447 "Alteration.c" +#line 2310 "Alteration.c" } #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (_key_it); -#line 2451 "Alteration.c" +#line 2314 "Alteration.c" } #line 279 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (keys); -#line 2455 "Alteration.c" +#line 2318 "Alteration.c" } -static gpointer _alteration_ref0 (gpointer self) { +static gpointer +_alteration_ref0 (gpointer self) +{ #line 293 "/home/jens/Source/shotwell/src/core/Alteration.vala" return self ? alteration_ref (self) : NULL; -#line 2462 "Alteration.c" +#line 2327 "Alteration.c" } -Alteration* alteration_compress (Alteration* self, Alteration* other) { +Alteration* +alteration_compress (Alteration* self, + Alteration* other) +{ Alteration* result = NULL; - Alteration* _tmp0_; - gboolean _tmp1_; GeeMultiMap* compressed = NULL; - GeeMultiMap* _tmp3_; - gboolean _tmp4_ = FALSE; - const gchar* _tmp5_; - gboolean _tmp13_ = FALSE; - Alteration* _tmp14_; - const gchar* _tmp15_; - GeeMultiMap* _tmp28_; - Alteration* _tmp29_; + GeeMultiMap* _tmp1_; + gboolean _tmp2_ = FALSE; + const gchar* _tmp3_; + gboolean _tmp11_ = FALSE; + const gchar* _tmp12_; + GeeMultiMap* _tmp20_; + Alteration* _tmp21_; #line 291 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (IS_ALTERATION (self), NULL); #line 291 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (IS_ALTERATION (other), NULL); #line 292 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = other; -#line 292 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = alteration_equals (self, _tmp0_); -#line 292 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp1_) { -#line 2489 "Alteration.c" - Alteration* _tmp2_; + if (alteration_equals (self, other)) { +#line 2350 "Alteration.c" + Alteration* _tmp0_; #line 293 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = _alteration_ref0 (self); + _tmp0_ = _alteration_ref0 (self); #line 293 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp2_; + result = _tmp0_; #line 293 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2497 "Alteration.c" +#line 2358 "Alteration.c" } #line 297 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = alteration_create_map (self); + _tmp1_ = alteration_create_map (self); #line 297 "/home/jens/Source/shotwell/src/core/Alteration.vala" - compressed = _tmp3_; + compressed = _tmp1_; #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp5_ = self->priv->subject; + _tmp3_ = self->priv->subject; #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp5_ != NULL) { -#line 2507 "Alteration.c" - const gchar* _tmp6_; + if (_tmp3_ != NULL) { +#line 2368 "Alteration.c" + const gchar* _tmp4_; #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6_ = self->priv->detail; + _tmp4_ = self->priv->detail; #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp4_ = _tmp6_ != NULL; -#line 2513 "Alteration.c" + _tmp2_ = _tmp4_ != NULL; +#line 2374 "Alteration.c" } else { #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp4_ = FALSE; -#line 2517 "Alteration.c" + _tmp2_ = FALSE; +#line 2378 "Alteration.c" } #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp4_) { -#line 2521 "Alteration.c" - GeeMultiMap* _tmp7_; - const gchar* _tmp8_; - const gchar* _tmp9_; + if (_tmp2_) { +#line 2382 "Alteration.c" + GeeMultiMap* _tmp5_; + const gchar* _tmp6_; + const gchar* _tmp7_; #line 300 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7_ = compressed; + _tmp5_ = compressed; #line 300 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp8_ = self->priv->subject; + _tmp6_ = self->priv->subject; #line 300 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9_ = self->priv->detail; + _tmp7_ = self->priv->detail; #line 300 "/home/jens/Source/shotwell/src/core/Alteration.vala" - gee_multi_map_set (_tmp7_, _tmp8_, _tmp9_); -#line 2533 "Alteration.c" + gee_multi_map_set (_tmp5_, _tmp6_, _tmp7_); +#line 2394 "Alteration.c" } else { + GeeMultiMap* _tmp8_; + GeeMultiMap* _tmp9_; GeeMultiMap* _tmp10_; - GeeMultiMap* _tmp11_; - GeeMultiMap* _tmp12_; #line 302 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = self->priv->map; + _tmp8_ = self->priv->map; #line 302 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp10_ != NULL, "map != null"); + _vala_assert (_tmp8_ != NULL, "map != null"); #line 303 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp11_ = compressed; + _tmp9_ = compressed; #line 303 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp12_ = self->priv->map; + _tmp10_ = self->priv->map; #line 303 "/home/jens/Source/shotwell/src/core/Alteration.vala" - alteration_multimap_add_all (_tmp11_, _tmp12_); -#line 2548 "Alteration.c" + alteration_multimap_add_all (_tmp9_, _tmp10_); +#line 2409 "Alteration.c" } #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp14_ = other; + _tmp12_ = other->priv->subject; #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp15_ = _tmp14_->priv->subject; -#line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp15_ != NULL) { -#line 2556 "Alteration.c" - Alteration* _tmp16_; - const gchar* _tmp17_; -#line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp16_ = other; + if (_tmp12_ != NULL) { +#line 2415 "Alteration.c" + const gchar* _tmp13_; #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp17_ = _tmp16_->priv->detail; + _tmp13_ = other->priv->detail; #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = _tmp17_ != NULL; -#line 2565 "Alteration.c" + _tmp11_ = _tmp13_ != NULL; +#line 2421 "Alteration.c" } else { #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = FALSE; -#line 2569 "Alteration.c" + _tmp11_ = FALSE; +#line 2425 "Alteration.c" } #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp13_) { -#line 2573 "Alteration.c" - GeeMultiMap* _tmp18_; - Alteration* _tmp19_; - const gchar* _tmp20_; - Alteration* _tmp21_; - const gchar* _tmp22_; -#line 307 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp18_ = compressed; -#line 307 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp19_ = other; + if (_tmp11_) { +#line 2429 "Alteration.c" + GeeMultiMap* _tmp14_; + const gchar* _tmp15_; + const gchar* _tmp16_; #line 307 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp20_ = _tmp19_->priv->subject; + _tmp14_ = compressed; #line 307 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp21_ = other; + _tmp15_ = other->priv->subject; #line 307 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp22_ = _tmp21_->priv->detail; + _tmp16_ = other->priv->detail; #line 307 "/home/jens/Source/shotwell/src/core/Alteration.vala" - gee_multi_map_set (_tmp18_, _tmp20_, _tmp22_); -#line 2591 "Alteration.c" + gee_multi_map_set (_tmp14_, _tmp15_, _tmp16_); +#line 2441 "Alteration.c" } else { - Alteration* _tmp23_; - GeeMultiMap* _tmp24_; - GeeMultiMap* _tmp25_; - Alteration* _tmp26_; - GeeMultiMap* _tmp27_; -#line 309 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp23_ = other; + GeeMultiMap* _tmp17_; + GeeMultiMap* _tmp18_; + GeeMultiMap* _tmp19_; #line 309 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp24_ = _tmp23_->priv->map; + _tmp17_ = other->priv->map; #line 309 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp24_ != NULL, "other.map != null"); -#line 310 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp25_ = compressed; + _vala_assert (_tmp17_ != NULL, "other.map != null"); #line 310 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp26_ = other; + _tmp18_ = compressed; #line 310 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp27_ = _tmp26_->priv->map; + _tmp19_ = other->priv->map; #line 310 "/home/jens/Source/shotwell/src/core/Alteration.vala" - alteration_multimap_add_all (_tmp25_, _tmp27_); -#line 2612 "Alteration.c" + alteration_multimap_add_all (_tmp18_, _tmp19_); +#line 2456 "Alteration.c" } #line 313 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp28_ = compressed; + _tmp20_ = compressed; #line 313 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp29_ = alteration_new_from_map (_tmp28_); + _tmp21_ = alteration_new_from_map (_tmp20_); #line 313 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp29_; + result = _tmp21_; #line 313 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (compressed); #line 313 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2624 "Alteration.c" +#line 2468 "Alteration.c" } -static void value_alteration_init (GValue* value) { +static void +value_alteration_init (GValue* value) +{ #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" value->data[0].v_pointer = NULL; -#line 2631 "Alteration.c" +#line 2477 "Alteration.c" } -static void value_alteration_free_value (GValue* value) { +static void +value_alteration_free_value (GValue* value) +{ #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (value->data[0].v_pointer) { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" alteration_unref (value->data[0].v_pointer); -#line 2640 "Alteration.c" +#line 2488 "Alteration.c" } } -static void value_alteration_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_alteration_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (src_value->data[0].v_pointer) { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" dest_value->data[0].v_pointer = alteration_ref (src_value->data[0].v_pointer); -#line 2650 "Alteration.c" +#line 2501 "Alteration.c" } else { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" dest_value->data[0].v_pointer = NULL; -#line 2654 "Alteration.c" +#line 2505 "Alteration.c" } } -static gpointer value_alteration_peek_pointer (const GValue* value) { +static gpointer +value_alteration_peek_pointer (const GValue* value) +{ #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" return value->data[0].v_pointer; -#line 2662 "Alteration.c" +#line 2515 "Alteration.c" } -static gchar* value_alteration_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_alteration_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (collect_values[0].v_pointer) { -#line 2669 "Alteration.c" +#line 2527 "Alteration.c" Alteration * object; object = collect_values[0].v_pointer; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (object->parent_instance.g_class == NULL) { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2676 "Alteration.c" +#line 2534 "Alteration.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.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 2680 "Alteration.c" +#line 2538 "Alteration.c" } #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" value->data[0].v_pointer = alteration_ref (object); -#line 2684 "Alteration.c" +#line 2542 "Alteration.c" } else { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" value->data[0].v_pointer = NULL; -#line 2688 "Alteration.c" +#line 2546 "Alteration.c" } #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" return NULL; -#line 2692 "Alteration.c" +#line 2550 "Alteration.c" } -static gchar* value_alteration_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_alteration_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ Alteration ** object_p; object_p = collect_values[0].v_pointer; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (!object_p) { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2703 "Alteration.c" +#line 2566 "Alteration.c" } #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (!value->data[0].v_pointer) { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" *object_p = NULL; -#line 2709 "Alteration.c" +#line 2572 "Alteration.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" *object_p = value->data[0].v_pointer; -#line 2713 "Alteration.c" +#line 2576 "Alteration.c" } else { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" *object_p = alteration_ref (value->data[0].v_pointer); -#line 2717 "Alteration.c" +#line 2580 "Alteration.c" } #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" return NULL; -#line 2721 "Alteration.c" +#line 2584 "Alteration.c" } -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecAlteration* spec; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_ALTERATION), NULL); @@ -2731,20 +2600,25 @@ GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const g G_PARAM_SPEC (spec)->value_type = object_type; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" return G_PARAM_SPEC (spec); -#line 2735 "Alteration.c" +#line 2604 "Alteration.c" } -gpointer value_get_alteration (const GValue* value) { +gpointer +value_get_alteration (const GValue* value) +{ #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ALTERATION), NULL); #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" return value->data[0].v_pointer; -#line 2744 "Alteration.c" +#line 2615 "Alteration.c" } -void value_set_alteration (GValue* value, gpointer v_object) { +void +value_set_alteration (GValue* value, + gpointer v_object) +{ Alteration * old; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ALTERATION)); @@ -2760,22 +2634,25 @@ void value_set_alteration (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" alteration_ref (value->data[0].v_pointer); -#line 2764 "Alteration.c" +#line 2638 "Alteration.c" } else { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" value->data[0].v_pointer = NULL; -#line 2768 "Alteration.c" +#line 2642 "Alteration.c" } #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (old) { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" alteration_unref (old); -#line 2774 "Alteration.c" +#line 2648 "Alteration.c" } } -void value_take_alteration (GValue* value, gpointer v_object) { +void +value_take_alteration (GValue* value, + gpointer v_object) +{ Alteration * old; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ALTERATION)); @@ -2789,33 +2666,37 @@ void value_take_alteration (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" value->data[0].v_pointer = v_object; -#line 2793 "Alteration.c" +#line 2670 "Alteration.c" } else { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" value->data[0].v_pointer = NULL; -#line 2797 "Alteration.c" +#line 2674 "Alteration.c" } #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (old) { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" alteration_unref (old); -#line 2803 "Alteration.c" +#line 2680 "Alteration.c" } } -static void alteration_class_init (AlterationClass * klass) { +static void +alteration_class_init (AlterationClass * klass) +{ #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" alteration_parent_class = g_type_class_peek_parent (klass); #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" ((AlterationClass *) klass)->finalize = alteration_finalize; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_type_class_add_private (klass, sizeof (AlterationPrivate)); -#line 2815 "Alteration.c" +#line 2694 "Alteration.c" } -static void alteration_instance_init (Alteration * self) { +static void +alteration_instance_init (Alteration * self) +{ #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" self->priv = ALTERATION_GET_PRIVATE (self); #line 28 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2826,11 +2707,13 @@ static void alteration_instance_init (Alteration * self) { self->priv->map = NULL; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" self->ref_count = 1; -#line 2830 "Alteration.c" +#line 2711 "Alteration.c" } -static void alteration_finalize (Alteration * obj) { +static void +alteration_finalize (Alteration * obj) +{ Alteration * self; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ALTERATION, Alteration); @@ -2842,11 +2725,13 @@ static void alteration_finalize (Alteration * obj) { _g_free0 (self->priv->detail); #line 30 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (self->priv->map); -#line 2846 "Alteration.c" +#line 2729 "Alteration.c" } -GType alteration_get_type (void) { +GType +alteration_get_type (void) +{ static volatile gsize alteration_type_id__volatile = 0; if (g_once_init_enter (&alteration_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_alteration_init, value_alteration_free_value, value_alteration_copy_value, value_alteration_peek_pointer, "p", value_alteration_collect_value, "p", value_alteration_lcopy_value }; @@ -2860,18 +2745,22 @@ GType alteration_get_type (void) { } -gpointer alteration_ref (gpointer instance) { +gpointer +alteration_ref (gpointer instance) +{ Alteration * self; self = instance; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_atomic_int_inc (&self->ref_count); #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" return instance; -#line 2871 "Alteration.c" +#line 2758 "Alteration.c" } -void alteration_unref (gpointer instance) { +void +alteration_unref (gpointer instance) +{ Alteration * self; self = instance; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2880,12 +2769,16 @@ void alteration_unref (gpointer instance) { ALTERATION_GET_CLASS (self)->finalize (self); #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2884 "Alteration.c" +#line 2773 "Alteration.c" } } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -2897,13 +2790,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -static gint _vala_array_length (gpointer array) { +static gint +_vala_array_length (gpointer array) +{ int length; length = 0; if (array) { diff --git a/src/core/ContainerSourceCollection.c b/src/core/ContainerSourceCollection.c index 7bd5826..f9f30cb 100644 --- a/src/core/ContainerSourceCollection.c +++ b/src/core/ContainerSourceCollection.c @@ -1,4 +1,4 @@ -/* ContainerSourceCollection.c generated by valac 0.36.6, the Vala compiler +/* ContainerSourceCollection.c generated by valac 0.40.4, the Vala compiler * generated from ContainerSourceCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -15,6 +15,7 @@ /* when they hold no items), they should use the evaporate() method, which will either destroy*/ /* the DataSource or hold it in the tank (if backlinks are outstanding).*/ + #include #include #include @@ -160,9 +161,9 @@ enum { CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_REMOVED_SIGNAL, CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ALTERED_SIGNAL, CONTAINER_SOURCE_COLLECTION_BACKLINK_TO_CONTAINER_REMOVED_SIGNAL, - CONTAINER_SOURCE_COLLECTION_LAST_SIGNAL + CONTAINER_SOURCE_COLLECTION_NUM_SIGNALS }; -static guint container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_LAST_SIGNAL] = {0}; +static guint container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -300,17 +301,29 @@ static gpointer container_source_collection_parent_class = NULL; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType marker_get_type (void) G_GNUC_CONST; @@ -318,124 +331,226 @@ GType source_collection_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType container_source_get_type (void) G_GNUC_CONST; #define CONTAINER_SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollectionPrivate)) -enum { - CONTAINER_SOURCE_COLLECTION_DUMMY_PROPERTY -}; void container_source_collection_detach_all_collections (ContainerSourceCollection* self); -ContainerSourceCollection* container_source_collection_construct (GType object_type, const gchar* backlink_name, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target); -DatabaseSourceCollection* database_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target); -static void container_source_collection_real_notify_backlink_removed (SourceCollection* base, SourceBacklink* backlink, GeeCollection* sources); -void source_collection_notify_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources); -ContainerSource* container_source_collection_convert_backlink_to_container (ContainerSourceCollection* self, SourceBacklink* backlink); -void container_source_collection_notify_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources); -void container_source_collection_notify_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked); -static void container_source_collection_real_notify_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked); -void source_collection_relink (SourceCollection* self, DataSource* source); -void container_source_collection_notify_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked); -static void container_source_collection_real_notify_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked); -void container_source_collection_notify_container_contents_altered (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked); -static void container_source_collection_real_notify_container_contents_altered (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked); -static void container_source_collection_real_notify_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources); -GeeCollection* container_source_collection_get_containers_holding_source (ContainerSourceCollection* self, DataSource* source); -static GeeCollection* container_source_collection_real_get_containers_holding_source (ContainerSourceCollection* self, DataSource* source); -static ContainerSource* container_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* self, SourceBacklink* backlink); +ContainerSourceCollection* container_source_collection_construct (GType object_type, + const gchar* backlink_name, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target); +DatabaseSourceCollection* database_source_collection_construct (GType object_type, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target); +static void container_source_collection_real_notify_backlink_removed (SourceCollection* base, + SourceBacklink* backlink, + GeeCollection* sources); +void source_collection_notify_backlink_removed (SourceCollection* self, + SourceBacklink* backlink, + GeeCollection* sources); +ContainerSource* container_source_collection_convert_backlink_to_container (ContainerSourceCollection* self, + SourceBacklink* backlink); +void container_source_collection_notify_backlink_to_container_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* sources); +void container_source_collection_notify_container_contents_added (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked); +static void container_source_collection_real_notify_container_contents_added (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked); +void source_collection_relink (SourceCollection* self, + DataSource* source); +void container_source_collection_notify_container_contents_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* removed, + gboolean unlinked); +static void container_source_collection_real_notify_container_contents_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* removed, + gboolean unlinked); +void container_source_collection_notify_container_contents_altered (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked, + GeeCollection* removed, + gboolean unlinked); +static void container_source_collection_real_notify_container_contents_altered (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked, + GeeCollection* removed, + gboolean unlinked); +static void container_source_collection_real_notify_backlink_to_container_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* sources); +GeeCollection* container_source_collection_get_containers_holding_source (ContainerSourceCollection* self, + DataSource* source); +static GeeCollection* container_source_collection_real_get_containers_holding_source (ContainerSourceCollection* self, + DataSource* source); +static ContainerSource* container_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* self, + SourceBacklink* backlink); void container_source_collection_freeze_attached_notifications (ContainerSourceCollection* self); void data_collection_freeze_notifications (DataCollection* self); void container_source_collection_thaw_attached_notifications (ContainerSourceCollection* self); void data_collection_thaw_notifications (DataCollection* self); GeeCollection* container_source_collection_get_holding_tank (ContainerSourceCollection* self); -void container_source_collection_init_add_unlinked (ContainerSourceCollection* self, ContainerSource* unlinked); -void container_source_collection_init_add_many_unlinked (ContainerSourceCollection* self, GeeCollection* unlinked); -gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCollection* self, ContainerSource* source); -static void container_source_collection_on_contained_sources_unlinking (ContainerSourceCollection* self, GeeCollection* unlinking); -void data_source_set_backlink (DataSource* self, SourceBacklink* backlink); +void container_source_collection_init_add_unlinked (ContainerSourceCollection* self, + ContainerSource* unlinked); +void container_source_collection_init_add_many_unlinked (ContainerSourceCollection* self, + GeeCollection* unlinked); +gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCollection* self, + ContainerSource* source); +static void container_source_collection_on_contained_sources_unlinking (ContainerSourceCollection* self, + GeeCollection* unlinking); +void data_source_set_backlink (DataSource* self, + SourceBacklink* backlink); SourceBacklink* container_source_get_backlink (ContainerSource* self); -void container_source_break_link_many (ContainerSource* self, GeeCollection* sources); -static void container_source_collection_on_contained_sources_relinked (ContainerSourceCollection* self, GeeCollection* relinked); -GeeList* data_source_get_backlinks (DataSource* self, const gchar* name); +void container_source_break_link_many (ContainerSource* self, + GeeCollection* sources); +static void container_source_collection_on_contained_sources_relinked (ContainerSourceCollection* self, + GeeCollection* relinked); +GeeList* data_source_get_backlinks (DataSource* self, + const gchar* name); gchar* data_object_to_string (DataObject* self); gchar* source_backlink_to_string (SourceBacklink* self); -void container_source_establish_link_many (ContainerSource* self, GeeCollection* sources); -static void container_source_collection_on_contained_source_destroyed (ContainerSourceCollection* self, DataSource* source); +void container_source_establish_link_many (ContainerSource* self, + GeeCollection* sources); +static void container_source_collection_on_contained_source_destroyed (ContainerSourceCollection* self, + DataSource* source); gboolean container_source_has_links (ContainerSource* self); GType tag_get_type (void) G_GNUC_CONST; -gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing); -static void container_source_collection_real_notify_item_destroyed (SourceCollection* base, DataSource* source); -void source_collection_remove_backlink (SourceCollection* self, SourceBacklink* backlink); -void source_collection_notify_item_destroyed (SourceCollection* self, DataSource* source); -void container_source_collection_evaporate (ContainerSourceCollection* self, ContainerSource* container); -gboolean source_collection_has_backlink (SourceCollection* self, SourceBacklink* backlink); -GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* marker, ProgressMonitor monitor, void* monitor_target); -Marker* data_collection_mark (DataCollection* self, DataObject* object); +gboolean data_source_destroy_orphan (DataSource* self, + gboolean delete_backing); +static void container_source_collection_real_notify_item_destroyed (SourceCollection* base, + DataSource* source); +void source_collection_remove_backlink (SourceCollection* self, + SourceBacklink* backlink); +void source_collection_notify_item_destroyed (SourceCollection* self, + DataSource* source); +void container_source_collection_evaporate (ContainerSourceCollection* self, + ContainerSource* container); +gboolean source_collection_has_backlink (SourceCollection* self, + SourceBacklink* backlink); +GeeCollection* source_collection_unlink_marked (SourceCollection* self, + Marker* marker, + ProgressMonitor monitor, + void* monitor_target); +Marker* data_collection_mark (DataCollection* self, + DataObject* object); GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; -gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed); -void container_source_collection_attach_collection (ContainerSourceCollection* self, SourceCollection* collection); +gint source_collection_destroy_marked (SourceCollection* self, + Marker* marker, + gboolean delete_backing, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_removed); +void container_source_collection_attach_collection (ContainerSourceCollection* self, + SourceCollection* collection); gchar* data_collection_to_string (DataCollection* self); -static void _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self); -static void _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self); -static void _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); -static void _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); -static void container_source_collection_real_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked); -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void container_source_collection_real_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked); -static void container_source_collection_real_container_contents_altered (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked); -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void container_source_collection_real_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources); -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); +static void _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking (SourceCollection* _sender, + GeeCollection* unlinking, + gpointer self); +static void _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked (SourceCollection* _sender, + GeeCollection* relinked, + gpointer self); +static void _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); +static void _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); +static void container_source_collection_real_container_contents_added (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked); +static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void container_source_collection_real_container_contents_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* removed, + gboolean unlinked); +static void container_source_collection_real_container_contents_altered (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked, + GeeCollection* removed, + gboolean unlinked); +static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void container_source_collection_real_backlink_to_container_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* sources); +static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); static void container_source_collection_finalize (DataCollection * obj); -ContainerSourceCollection* container_source_collection_construct (GType object_type, const gchar* backlink_name, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target) { +ContainerSourceCollection* +container_source_collection_construct (GType object_type, + const gchar* backlink_name, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target) +{ ContainerSourceCollection* self = NULL; - const gchar* _tmp0_; - GetSourceDatabaseKey _tmp1_; - void* _tmp1__target; - const gchar* _tmp2_; - gchar* _tmp3_; + gchar* _tmp0_; #line 38 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_val_if_fail (backlink_name != NULL, NULL); #line 38 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_val_if_fail (name != NULL, NULL); #line 40 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp0_ = name; -#line 40 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = source_key_func; -#line 40 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1__target = source_key_func_target; -#line 40 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - self = (ContainerSourceCollection*) database_source_collection_construct (object_type, _tmp0_, _tmp1_, _tmp1__target); + self = (ContainerSourceCollection*) database_source_collection_construct (object_type, name, source_key_func, source_key_func_target); #line 42 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp2_ = backlink_name; -#line 42 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp0_ = g_strdup (backlink_name); #line 42 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_free0 (self->priv->backlink_name); #line 42 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - self->priv->backlink_name = _tmp3_; + self->priv->backlink_name = _tmp0_; #line 38 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return self; -#line 428 "ContainerSourceCollection.c" +#line 542 "ContainerSourceCollection.c" } -static void container_source_collection_real_notify_backlink_removed (SourceCollection* base, SourceBacklink* backlink, GeeCollection* sources) { +static void +container_source_collection_real_notify_backlink_removed (SourceCollection* base, + SourceBacklink* backlink, + GeeCollection* sources) +{ ContainerSourceCollection * self; - SourceBacklink* _tmp0_; - GeeCollection* _tmp1_; ContainerSource* container = NULL; - SourceBacklink* _tmp2_; - ContainerSource* _tmp3_; - ContainerSource* _tmp4_; + ContainerSource* _tmp0_; + ContainerSource* _tmp1_; #line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection); #line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -443,45 +558,36 @@ static void container_source_collection_real_notify_backlink_removed (SourceColl #line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); #line 51 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp0_ = backlink; -#line 51 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = sources; -#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 53 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp2_ = backlink; + 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), backlink, sources); #line 53 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = container_source_collection_convert_backlink_to_container (self, _tmp2_); + _tmp0_ = container_source_collection_convert_backlink_to_container (self, backlink); #line 53 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - container = _tmp3_; + container = _tmp0_; #line 54 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = container; + _tmp1_ = container; #line 54 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (_tmp4_ != NULL) { -#line 462 "ContainerSourceCollection.c" - ContainerSource* _tmp5_; - GeeCollection* _tmp6_; -#line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = container; + if (_tmp1_ != NULL) { +#line 571 "ContainerSourceCollection.c" + ContainerSource* _tmp2_; #line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = sources; + _tmp2_ = container; #line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - container_source_collection_notify_backlink_to_container_removed (self, _tmp5_, _tmp6_); -#line 471 "ContainerSourceCollection.c" + container_source_collection_notify_backlink_to_container_removed (self, _tmp2_, sources); +#line 577 "ContainerSourceCollection.c" } #line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); -#line 475 "ContainerSourceCollection.c" +#line 581 "ContainerSourceCollection.c" } -static void container_source_collection_real_notify_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked) { +static void +container_source_collection_real_notify_container_contents_added (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked) +{ GeeHashSet* _tmp0_; - ContainerSource* _tmp1_; - gboolean _tmp2_; - ContainerSource* _tmp8_; - GeeCollection* _tmp9_; - gboolean _tmp10_; #line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -489,92 +595,81 @@ static void container_source_collection_real_notify_container_contents_added (Co #line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp0_ = self->priv->holding_tank; #line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = container; -#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 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (_tmp2_) { -#line 498 "ContainerSourceCollection.c" + if (gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), container)) { +#line 600 "ContainerSourceCollection.c" gboolean removed = FALSE; - GeeHashSet* _tmp3_; - ContainerSource* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; - ContainerSource* _tmp7_; -#line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = self->priv->holding_tank; -#line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = container; + GeeHashSet* _tmp1_; + gboolean _tmp2_; #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_); + _tmp1_ = self->priv->holding_tank; #line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - removed = _tmp5_; + removed = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), container); #line 63 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = removed; + _tmp2_ = removed; #line 63 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _vala_assert (_tmp6_, "removed"); + _vala_assert (_tmp2_, "removed"); #line 65 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp7_ = container; -#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 521 "ContainerSourceCollection.c" + source_collection_relink (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (container, TYPE_DATA_SOURCE, DataSource)); +#line 614 "ContainerSourceCollection.c" } #line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp8_ = container; -#line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp9_ = added; -#line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp10_ = relinked; -#line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ADDED_SIGNAL], 0, _tmp8_, _tmp9_, _tmp10_); -#line 531 "ContainerSourceCollection.c" + g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ADDED_SIGNAL], 0, container, added, relinked); +#line 618 "ContainerSourceCollection.c" } -void container_source_collection_notify_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked) { +void +container_source_collection_notify_container_contents_added (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked) +{ #line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #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 540 "ContainerSourceCollection.c" +#line 632 "ContainerSourceCollection.c" } -static void container_source_collection_real_notify_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked) { - ContainerSource* _tmp0_; - GeeCollection* _tmp1_; - gboolean _tmp2_; +static void +container_source_collection_real_notify_container_contents_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* removed, + gboolean unlinked) +{ #line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (removed)); #line 73 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp0_ = container; -#line 73 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = removed; -#line 73 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp2_ = unlinked; -#line 73 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_REMOVED_SIGNAL], 0, _tmp0_, _tmp1_, _tmp2_); -#line 560 "ContainerSourceCollection.c" + g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_REMOVED_SIGNAL], 0, container, removed, unlinked); +#line 648 "ContainerSourceCollection.c" } -void container_source_collection_notify_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked) { +void +container_source_collection_notify_container_contents_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* removed, + gboolean unlinked) +{ #line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #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 569 "ContainerSourceCollection.c" +#line 662 "ContainerSourceCollection.c" } -static void container_source_collection_real_notify_container_contents_altered (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked) { - ContainerSource* _tmp0_; - GeeCollection* _tmp1_; - gboolean _tmp2_; - GeeCollection* _tmp3_; - gboolean _tmp4_; +static void +container_source_collection_real_notify_container_contents_altered (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked, + GeeCollection* removed, + gboolean unlinked) +{ #line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -582,96 +677,109 @@ static void container_source_collection_real_notify_container_contents_altered ( #line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp0_ = container; -#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = added; -#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp2_ = relinked; -#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = removed; -#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = unlinked; -#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ALTERED_SIGNAL], 0, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_); -#line 597 "ContainerSourceCollection.c" + g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ALTERED_SIGNAL], 0, container, added, relinked, removed, unlinked); +#line 682 "ContainerSourceCollection.c" } -void container_source_collection_notify_container_contents_altered (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked) { +void +container_source_collection_notify_container_contents_altered (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked, + GeeCollection* removed, + gboolean unlinked) +{ #line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #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 606 "ContainerSourceCollection.c" +#line 698 "ContainerSourceCollection.c" } -static void container_source_collection_real_notify_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources) { - ContainerSource* _tmp0_; - GeeCollection* _tmp1_; +static void +container_source_collection_real_notify_backlink_to_container_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* sources) +{ #line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); #line 84 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp0_ = container; -#line 84 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = sources; -#line 84 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_BACKLINK_TO_CONTAINER_REMOVED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 623 "ContainerSourceCollection.c" + g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_BACKLINK_TO_CONTAINER_REMOVED_SIGNAL], 0, container, sources); +#line 713 "ContainerSourceCollection.c" } -void container_source_collection_notify_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources) { +void +container_source_collection_notify_backlink_to_container_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* sources) +{ #line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #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 632 "ContainerSourceCollection.c" +#line 726 "ContainerSourceCollection.c" } -static GeeCollection* container_source_collection_real_get_containers_holding_source (ContainerSourceCollection* self, DataSource* source) { +static GeeCollection* +container_source_collection_real_get_containers_holding_source (ContainerSourceCollection* self, + DataSource* source) +{ #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 87 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return NULL; -#line 641 "ContainerSourceCollection.c" +#line 738 "ContainerSourceCollection.c" } -GeeCollection* container_source_collection_get_containers_holding_source (ContainerSourceCollection* self, DataSource* source) { +GeeCollection* +container_source_collection_get_containers_holding_source (ContainerSourceCollection* self, + DataSource* source) +{ #line 87 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), NULL); #line 87 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->get_containers_holding_source (self, source); -#line 650 "ContainerSourceCollection.c" +#line 750 "ContainerSourceCollection.c" } -static ContainerSource* container_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* self, SourceBacklink* backlink) { +static ContainerSource* +container_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* self, + SourceBacklink* backlink) +{ #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 90 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return NULL; -#line 659 "ContainerSourceCollection.c" +#line 762 "ContainerSourceCollection.c" } -ContainerSource* container_source_collection_convert_backlink_to_container (ContainerSourceCollection* self, SourceBacklink* backlink) { +ContainerSource* +container_source_collection_convert_backlink_to_container (ContainerSourceCollection* self, + SourceBacklink* backlink) +{ #line 90 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), NULL); #line 90 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->convert_backlink_to_container (self, backlink); -#line 668 "ContainerSourceCollection.c" +#line 774 "ContainerSourceCollection.c" } -void container_source_collection_freeze_attached_notifications (ContainerSourceCollection* self) { +void +container_source_collection_freeze_attached_notifications (ContainerSourceCollection* self) +{ #line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); -#line 675 "ContainerSourceCollection.c" +#line 783 "ContainerSourceCollection.c" { GeeIterator* _collection_it = NULL; GeeHashSet* _tmp0_; @@ -684,48 +792,47 @@ void container_source_collection_freeze_attached_notifications (ContainerSourceC _collection_it = _tmp1_; #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 688 "ContainerSourceCollection.c" +#line 796 "ContainerSourceCollection.c" GeeIterator* _tmp2_; - gboolean _tmp3_; SourceCollection* collection = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - SourceCollection* _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + SourceCollection* _tmp5_; #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = _collection_it; #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 703 "ContainerSourceCollection.c" +#line 808 "ContainerSourceCollection.c" } #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = _collection_it; + _tmp3_ = _collection_it; #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - collection = (SourceCollection*) _tmp5_; + collection = (SourceCollection*) _tmp4_; #line 94 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = collection; + _tmp5_ = collection; #line 94 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection)); #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); -#line 717 "ContainerSourceCollection.c" +#line 822 "ContainerSourceCollection.c" } #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); -#line 721 "ContainerSourceCollection.c" +#line 826 "ContainerSourceCollection.c" } } -void container_source_collection_thaw_attached_notifications (ContainerSourceCollection* self) { +void +container_source_collection_thaw_attached_notifications (ContainerSourceCollection* self) +{ #line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); -#line 729 "ContainerSourceCollection.c" +#line 836 "ContainerSourceCollection.c" { GeeIterator* _collection_it = NULL; GeeHashSet* _tmp0_; @@ -738,45 +845,44 @@ void container_source_collection_thaw_attached_notifications (ContainerSourceCol _collection_it = _tmp1_; #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 742 "ContainerSourceCollection.c" +#line 849 "ContainerSourceCollection.c" GeeIterator* _tmp2_; - gboolean _tmp3_; SourceCollection* collection = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - SourceCollection* _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + SourceCollection* _tmp5_; #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = _collection_it; #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 757 "ContainerSourceCollection.c" +#line 861 "ContainerSourceCollection.c" } #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = _collection_it; + _tmp3_ = _collection_it; #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - collection = (SourceCollection*) _tmp5_; + collection = (SourceCollection*) _tmp4_; #line 99 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = collection; + _tmp5_ = collection; #line 99 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection)); #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); -#line 771 "ContainerSourceCollection.c" +#line 875 "ContainerSourceCollection.c" } #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); -#line 775 "ContainerSourceCollection.c" +#line 879 "ContainerSourceCollection.c" } } -GeeCollection* container_source_collection_get_holding_tank (ContainerSourceCollection* self) { +GeeCollection* +container_source_collection_get_holding_tank (ContainerSourceCollection* self) +{ GeeCollection* result = NULL; GeeHashSet* _tmp0_; GeeSet* _tmp1_; @@ -793,13 +899,15 @@ GeeCollection* container_source_collection_get_holding_tank (ContainerSourceColl result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 103 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return result; -#line 797 "ContainerSourceCollection.c" +#line 903 "ContainerSourceCollection.c" } -void container_source_collection_init_add_unlinked (ContainerSourceCollection* self, ContainerSource* unlinked) { +void +container_source_collection_init_add_unlinked (ContainerSourceCollection* self, + ContainerSource* unlinked) +{ GeeHashSet* _tmp0_; - ContainerSource* _tmp1_; #line 106 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 106 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -807,16 +915,16 @@ void container_source_collection_init_add_unlinked (ContainerSourceCollection* s #line 107 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp0_ = self->priv->holding_tank; #line 107 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = unlinked; -#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 814 "ContainerSourceCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), unlinked); +#line 920 "ContainerSourceCollection.c" } -void container_source_collection_init_add_many_unlinked (ContainerSourceCollection* self, GeeCollection* unlinked) { +void +container_source_collection_init_add_many_unlinked (ContainerSourceCollection* self, + GeeCollection* unlinked) +{ GeeHashSet* _tmp0_; - GeeCollection* _tmp1_; #line 110 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 110 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -824,19 +932,17 @@ void container_source_collection_init_add_many_unlinked (ContainerSourceCollecti #line 111 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp0_ = self->priv->holding_tank; #line 111 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = unlinked; -#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 831 "ContainerSourceCollection.c" + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), unlinked); +#line 937 "ContainerSourceCollection.c" } -gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCollection* self, ContainerSource* source) { +gboolean +container_source_collection_relink_from_holding_tank (ContainerSourceCollection* self, + ContainerSource* source) +{ gboolean result = FALSE; GeeHashSet* _tmp0_; - ContainerSource* _tmp1_; - gboolean _tmp2_; - ContainerSource* _tmp3_; #line 114 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), FALSE); #line 114 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -844,30 +950,27 @@ gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCo #line 115 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp0_ = self->priv->holding_tank; #line 115 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = source; -#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 115 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp2_) { + if (!gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), source)) { #line 116 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" result = FALSE; #line 116 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return result; -#line 857 "ContainerSourceCollection.c" +#line 959 "ContainerSourceCollection.c" } #line 118 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = source; -#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)); + source_collection_relink (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #line 120 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" result = TRUE; #line 120 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return result; -#line 867 "ContainerSourceCollection.c" +#line 967 "ContainerSourceCollection.c" } -static void container_source_collection_on_contained_sources_unlinking (ContainerSourceCollection* self, GeeCollection* unlinking) { +static void +container_source_collection_on_contained_sources_unlinking (ContainerSourceCollection* self, + GeeCollection* unlinking) +{ GeeHashMultiMap* map = NULL; GeeHashMultiMap* _tmp0_; #line 123 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -880,250 +983,243 @@ static void container_source_collection_on_contained_sources_unlinking (Containe _tmp0_ = gee_hash_multi_map_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 126 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" map = _tmp0_; -#line 884 "ContainerSourceCollection.c" +#line 987 "ContainerSourceCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; -#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = unlinking; + GeeIterator* _tmp1_; #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (unlinking, GEE_TYPE_ITERABLE, GeeIterable)); #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _source_it = _tmp2_; + _source_it = _tmp1_; #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 897 "ContainerSourceCollection.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 997 "ContainerSourceCollection.c" + GeeIterator* _tmp2_; DataSource* source = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; GeeCollection* containers = NULL; - DataSource* _tmp7_; + DataSource* _tmp5_; + GeeCollection* _tmp6_; + gboolean _tmp7_ = FALSE; GeeCollection* _tmp8_; - gboolean _tmp9_ = FALSE; - GeeCollection* _tmp10_; -#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = _source_it; #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _source_it; #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 916 "ContainerSourceCollection.c" +#line 1013 "ContainerSourceCollection.c" } #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = _source_it; + _tmp3_ = _source_it; #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - source = (DataSource*) _tmp6_; + source = (DataSource*) _tmp4_; #line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp7_ = source; + _tmp5_ = source; #line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp8_ = container_source_collection_get_containers_holding_source (self, _tmp7_); + _tmp6_ = container_source_collection_get_containers_holding_source (self, _tmp5_); #line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - containers = _tmp8_; + containers = _tmp6_; #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp10_ = containers; + _tmp8_ = containers; #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (_tmp10_ == NULL) { + if (_tmp8_ == NULL) { #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp9_ = TRUE; -#line 936 "ContainerSourceCollection.c" + _tmp7_ = TRUE; +#line 1033 "ContainerSourceCollection.c" } else { - GeeCollection* _tmp11_; - gint _tmp12_; - gint _tmp13_; + GeeCollection* _tmp9_; + gint _tmp10_; + gint _tmp11_; #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp11_ = containers; + _tmp9_ = containers; #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp12_ = gee_collection_get_size (_tmp11_); + _tmp10_ = gee_collection_get_size (_tmp9_); #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp9_ = _tmp13_ == 0; -#line 949 "ContainerSourceCollection.c" + _tmp7_ = _tmp11_ == 0; +#line 1046 "ContainerSourceCollection.c" } #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (_tmp9_) { + if (_tmp7_) { #line 132 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (containers); #line 132 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (source); #line 132 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" continue; -#line 959 "ContainerSourceCollection.c" +#line 1056 "ContainerSourceCollection.c" } { GeeIterator* _container_it = NULL; - GeeCollection* _tmp14_; - GeeIterator* _tmp15_; + GeeCollection* _tmp12_; + GeeIterator* _tmp13_; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp14_ = containers; + _tmp12_ = containers; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _container_it = _tmp15_; + _container_it = _tmp13_; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 973 "ContainerSourceCollection.c" - GeeIterator* _tmp16_; - gboolean _tmp17_; +#line 1070 "ContainerSourceCollection.c" + GeeIterator* _tmp14_; ContainerSource* container = NULL; - GeeIterator* _tmp18_; - gpointer _tmp19_; - GeeHashMultiMap* _tmp20_; + GeeIterator* _tmp15_; + gpointer _tmp16_; + GeeHashMultiMap* _tmp17_; + ContainerSource* _tmp18_; + DataSource* _tmp19_; + DataSource* _tmp20_; ContainerSource* _tmp21_; - DataSource* _tmp22_; - DataSource* _tmp23_; - ContainerSource* _tmp24_; - SourceBacklink* _tmp25_; - SourceBacklink* _tmp26_; -#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp16_ = _container_it; + SourceBacklink* _tmp22_; + SourceBacklink* _tmp23_; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp17_ = gee_iterator_next (_tmp16_); + _tmp14_ = _container_it; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp17_) { + if (!gee_iterator_next (_tmp14_)) { #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 994 "ContainerSourceCollection.c" +#line 1088 "ContainerSourceCollection.c" } #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp18_ = _container_it; + _tmp15_ = _container_it; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp19_ = gee_iterator_get (_tmp18_); + _tmp16_ = gee_iterator_get (_tmp15_); #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - container = (ContainerSource*) _tmp19_; + container = (ContainerSource*) _tmp16_; #line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp20_ = map; + _tmp17_ = map; #line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp21_ = container; + _tmp18_ = container; #line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp22_ = source; + _tmp19_ = source; #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_); + gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp18_, _tmp19_); #line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp23_ = source; + _tmp20_ = source; #line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp24_ = container; + _tmp21_ = container; #line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp25_ = container_source_get_backlink (_tmp24_); + _tmp22_ = container_source_get_backlink (_tmp21_); #line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp26_ = _tmp25_; + _tmp23_ = _tmp22_; #line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - data_source_set_backlink (_tmp23_, _tmp26_); + data_source_set_backlink (_tmp20_, _tmp23_); #line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _source_backlink_unref0 (_tmp26_); + _source_backlink_unref0 (_tmp23_); #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); -#line 1024 "ContainerSourceCollection.c" +#line 1118 "ContainerSourceCollection.c" } #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_container_it); -#line 1028 "ContainerSourceCollection.c" +#line 1122 "ContainerSourceCollection.c" } #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (containers); #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (source); -#line 1034 "ContainerSourceCollection.c" +#line 1128 "ContainerSourceCollection.c" } #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_source_it); -#line 1038 "ContainerSourceCollection.c" +#line 1132 "ContainerSourceCollection.c" } { GeeIterator* _container_it = NULL; - GeeHashMultiMap* _tmp27_; - GeeSet* _tmp28_; - GeeSet* _tmp29_; - GeeIterator* _tmp30_; - GeeIterator* _tmp31_; + GeeHashMultiMap* _tmp24_; + GeeSet* _tmp25_; + GeeSet* _tmp26_; + GeeIterator* _tmp27_; + GeeIterator* _tmp28_; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp27_ = map; + _tmp24_ = map; #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)); + _tmp25_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_MULTI_MAP, GeeMultiMap)); #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp29_ = _tmp28_; + _tmp26_ = _tmp25_; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp30_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp27_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable)); #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp31_ = _tmp30_; + _tmp28_ = _tmp27_; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_object_unref0 (_tmp29_); + _g_object_unref0 (_tmp26_); #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _container_it = _tmp31_; + _container_it = _tmp28_; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1063 "ContainerSourceCollection.c" - GeeIterator* _tmp32_; - gboolean _tmp33_; +#line 1157 "ContainerSourceCollection.c" + GeeIterator* _tmp29_; ContainerSource* container = NULL; - GeeIterator* _tmp34_; - gpointer _tmp35_; - ContainerSource* _tmp36_; - GeeHashMultiMap* _tmp37_; - ContainerSource* _tmp38_; - GeeCollection* _tmp39_; - GeeCollection* _tmp40_; + GeeIterator* _tmp30_; + gpointer _tmp31_; + ContainerSource* _tmp32_; + GeeHashMultiMap* _tmp33_; + ContainerSource* _tmp34_; + GeeCollection* _tmp35_; + GeeCollection* _tmp36_; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp32_ = _container_it; + _tmp29_ = _container_it; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp33_ = gee_iterator_next (_tmp32_); -#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp33_) { + if (!gee_iterator_next (_tmp29_)) { #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1082 "ContainerSourceCollection.c" +#line 1173 "ContainerSourceCollection.c" } #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp34_ = _container_it; + _tmp30_ = _container_it; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp35_ = gee_iterator_get (_tmp34_); + _tmp31_ = gee_iterator_get (_tmp30_); #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - container = (ContainerSource*) _tmp35_; + container = (ContainerSource*) _tmp31_; #line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp36_ = container; + _tmp32_ = container; #line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp37_ = map; + _tmp33_ = map; #line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp38_ = container; + _tmp34_ = container; #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_); + _tmp35_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp34_); #line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp40_ = _tmp39_; + _tmp36_ = _tmp35_; #line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - container_source_break_link_many (_tmp36_, _tmp40_); + container_source_break_link_many (_tmp32_, _tmp36_); #line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_object_unref0 (_tmp40_); + _g_object_unref0 (_tmp36_); #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); -#line 1106 "ContainerSourceCollection.c" +#line 1197 "ContainerSourceCollection.c" } #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_container_it); -#line 1110 "ContainerSourceCollection.c" +#line 1201 "ContainerSourceCollection.c" } #line 143 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_thaw_attached_notifications (self); #line 123 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (map); -#line 1116 "ContainerSourceCollection.c" +#line 1207 "ContainerSourceCollection.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return self ? g_object_ref (self) : NULL; -#line 1123 "ContainerSourceCollection.c" +#line 1216 "ContainerSourceCollection.c" } -static void container_source_collection_on_contained_sources_relinked (ContainerSourceCollection* self, GeeCollection* relinked) { +static void +container_source_collection_on_contained_sources_relinked (ContainerSourceCollection* self, + GeeCollection* relinked) +{ GeeHashMultiMap* map = NULL; GeeHashMultiMap* _tmp0_; #line 146 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1136,299 +1232,293 @@ static void container_source_collection_on_contained_sources_relinked (Container _tmp0_ = gee_hash_multi_map_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 149 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" map = _tmp0_; -#line 1140 "ContainerSourceCollection.c" +#line 1236 "ContainerSourceCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; -#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = relinked; + GeeIterator* _tmp1_; #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (relinked, GEE_TYPE_ITERABLE, GeeIterable)); #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _source_it = _tmp2_; + _source_it = _tmp1_; #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1153 "ContainerSourceCollection.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 1246 "ContainerSourceCollection.c" + GeeIterator* _tmp2_; DataSource* source = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; GeeList* backlinks = NULL; - DataSource* _tmp7_; - const gchar* _tmp8_; + DataSource* _tmp5_; + const gchar* _tmp6_; + GeeList* _tmp7_; + gboolean _tmp8_ = FALSE; GeeList* _tmp9_; - gboolean _tmp10_ = FALSE; - GeeList* _tmp11_; -#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = _source_it; #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _source_it; #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1173 "ContainerSourceCollection.c" +#line 1263 "ContainerSourceCollection.c" } #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = _source_it; + _tmp3_ = _source_it; #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - source = (DataSource*) _tmp6_; + source = (DataSource*) _tmp4_; #line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp7_ = source; + _tmp5_ = source; #line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp8_ = self->priv->backlink_name; + _tmp6_ = self->priv->backlink_name; #line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp9_ = data_source_get_backlinks (_tmp7_, _tmp8_); + _tmp7_ = data_source_get_backlinks (_tmp5_, _tmp6_); #line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - backlinks = _tmp9_; + backlinks = _tmp7_; #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp11_ = backlinks; + _tmp9_ = backlinks; #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (_tmp11_ == NULL) { + if (_tmp9_ == NULL) { #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp10_ = TRUE; -#line 1195 "ContainerSourceCollection.c" + _tmp8_ = TRUE; +#line 1285 "ContainerSourceCollection.c" } else { - GeeList* _tmp12_; - gint _tmp13_; - gint _tmp14_; + GeeList* _tmp10_; + gint _tmp11_; + gint _tmp12_; #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp12_ = backlinks; + _tmp10_ = backlinks; #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)); + _tmp11_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection)); #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp10_ = _tmp14_ == 0; -#line 1208 "ContainerSourceCollection.c" + _tmp8_ = _tmp12_ == 0; +#line 1298 "ContainerSourceCollection.c" } #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (_tmp10_) { + if (_tmp8_) { #line 155 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (backlinks); #line 155 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (source); #line 155 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" continue; -#line 1218 "ContainerSourceCollection.c" +#line 1308 "ContainerSourceCollection.c" } { GeeList* _backlink_list = NULL; - GeeList* _tmp15_; - GeeList* _tmp16_; + GeeList* _tmp13_; + GeeList* _tmp14_; gint _backlink_size = 0; - GeeList* _tmp17_; - gint _tmp18_; - gint _tmp19_; + GeeList* _tmp15_; + gint _tmp16_; + gint _tmp17_; gint _backlink_index = 0; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp15_ = backlinks; + _tmp13_ = backlinks; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp16_ = _g_object_ref0 (_tmp15_); + _tmp14_ = _g_object_ref0 (_tmp13_); #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _backlink_list = _tmp16_; + _backlink_list = _tmp14_; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp17_ = _backlink_list; + _tmp15_ = _backlink_list; #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)); + _tmp16_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp19_ = _tmp18_; + _tmp17_ = _tmp16_; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _backlink_size = _tmp19_; + _backlink_size = _tmp17_; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _backlink_index = -1; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1247 "ContainerSourceCollection.c" +#line 1337 "ContainerSourceCollection.c" + gint _tmp18_; + gint _tmp19_; gint _tmp20_; - gint _tmp21_; - gint _tmp22_; SourceBacklink* backlink = NULL; - GeeList* _tmp23_; - gint _tmp24_; - gpointer _tmp25_; + GeeList* _tmp21_; + gint _tmp22_; + gpointer _tmp23_; ContainerSource* container = NULL; - SourceBacklink* _tmp26_; - ContainerSource* _tmp27_; - ContainerSource* _tmp28_; + SourceBacklink* _tmp24_; + ContainerSource* _tmp25_; + ContainerSource* _tmp26_; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp20_ = _backlink_index; + _tmp18_ = _backlink_index; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _backlink_index = _tmp20_ + 1; + _backlink_index = _tmp18_ + 1; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp21_ = _backlink_index; + _tmp19_ = _backlink_index; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp22_ = _backlink_size; + _tmp20_ = _backlink_size; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!(_tmp21_ < _tmp22_)) { + if (!(_tmp19_ < _tmp20_)) { #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1271 "ContainerSourceCollection.c" +#line 1361 "ContainerSourceCollection.c" } #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp23_ = _backlink_list; + _tmp21_ = _backlink_list; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp24_ = _backlink_index; + _tmp22_ = _backlink_index; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp25_ = gee_list_get (_tmp23_, _tmp24_); + _tmp23_ = gee_list_get (_tmp21_, _tmp22_); #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - backlink = (SourceBacklink*) _tmp25_; + backlink = (SourceBacklink*) _tmp23_; #line 158 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp26_ = backlink; + _tmp24_ = backlink; #line 158 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp27_ = container_source_collection_convert_backlink_to_container (self, _tmp26_); + _tmp25_ = container_source_collection_convert_backlink_to_container (self, _tmp24_); #line 158 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - container = _tmp27_; + container = _tmp25_; #line 159 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp28_ = container; + _tmp26_ = container; #line 159 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (_tmp28_ != NULL) { -#line 1291 "ContainerSourceCollection.c" - GeeHashMultiMap* _tmp29_; - ContainerSource* _tmp30_; - DataSource* _tmp31_; + if (_tmp26_ != NULL) { +#line 1381 "ContainerSourceCollection.c" + GeeHashMultiMap* _tmp27_; + ContainerSource* _tmp28_; + DataSource* _tmp29_; #line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp29_ = map; + _tmp27_ = map; #line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp30_ = container; + _tmp28_ = container; #line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp31_ = source; + _tmp29_ = source; #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 1303 "ContainerSourceCollection.c" + gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp28_, _tmp29_); +#line 1393 "ContainerSourceCollection.c" } else { - DataSource* _tmp32_; - gchar* _tmp33_; + DataSource* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + SourceBacklink* _tmp33_; gchar* _tmp34_; - SourceBacklink* _tmp35_; - gchar* _tmp36_; - gchar* _tmp37_; + gchar* _tmp35_; #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp32_ = source; + _tmp30_ = source; #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)); + _tmp31_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_OBJECT, DataObject)); #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp34_ = _tmp33_; + _tmp32_ = _tmp31_; #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp35_ = backlink; + _tmp33_ = backlink; #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp36_ = source_backlink_to_string (_tmp35_); + _tmp34_ = source_backlink_to_string (_tmp33_); #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp37_ = _tmp36_; + _tmp35_ = _tmp34_; #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_); +"acklink %s", _tmp32_, _tmp35_); #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_free0 (_tmp37_); + _g_free0 (_tmp35_); #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_free0 (_tmp34_); -#line 1329 "ContainerSourceCollection.c" + _g_free0 (_tmp32_); +#line 1419 "ContainerSourceCollection.c" } #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _source_backlink_unref0 (backlink); -#line 1335 "ContainerSourceCollection.c" +#line 1425 "ContainerSourceCollection.c" } #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_backlink_list); -#line 1339 "ContainerSourceCollection.c" +#line 1429 "ContainerSourceCollection.c" } #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (backlinks); #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (source); -#line 1345 "ContainerSourceCollection.c" +#line 1435 "ContainerSourceCollection.c" } #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_source_it); -#line 1349 "ContainerSourceCollection.c" +#line 1439 "ContainerSourceCollection.c" } { GeeIterator* _container_it = NULL; - GeeHashMultiMap* _tmp38_; - GeeSet* _tmp39_; - GeeSet* _tmp40_; - GeeIterator* _tmp41_; - GeeIterator* _tmp42_; + GeeHashMultiMap* _tmp36_; + GeeSet* _tmp37_; + GeeSet* _tmp38_; + GeeIterator* _tmp39_; + GeeIterator* _tmp40_; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp38_ = map; + _tmp36_ = map; #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)); + _tmp37_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_MULTI_MAP, GeeMultiMap)); #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp40_ = _tmp39_; + _tmp38_ = _tmp37_; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp41_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp39_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ITERABLE, GeeIterable)); #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp42_ = _tmp41_; + _tmp40_ = _tmp39_; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_object_unref0 (_tmp40_); + _g_object_unref0 (_tmp38_); #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _container_it = _tmp42_; + _container_it = _tmp40_; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1374 "ContainerSourceCollection.c" - GeeIterator* _tmp43_; - gboolean _tmp44_; +#line 1464 "ContainerSourceCollection.c" + GeeIterator* _tmp41_; ContainerSource* container = NULL; - GeeIterator* _tmp45_; - gpointer _tmp46_; - ContainerSource* _tmp47_; - GeeHashMultiMap* _tmp48_; - ContainerSource* _tmp49_; - GeeCollection* _tmp50_; - GeeCollection* _tmp51_; -#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp43_ = _container_it; + GeeIterator* _tmp42_; + gpointer _tmp43_; + ContainerSource* _tmp44_; + GeeHashMultiMap* _tmp45_; + ContainerSource* _tmp46_; + GeeCollection* _tmp47_; + GeeCollection* _tmp48_; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp44_ = gee_iterator_next (_tmp43_); + _tmp41_ = _container_it; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp44_) { + if (!gee_iterator_next (_tmp41_)) { #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1393 "ContainerSourceCollection.c" +#line 1480 "ContainerSourceCollection.c" } #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp45_ = _container_it; + _tmp42_ = _container_it; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp46_ = gee_iterator_get (_tmp45_); + _tmp43_ = gee_iterator_get (_tmp42_); #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - container = (ContainerSource*) _tmp46_; + container = (ContainerSource*) _tmp43_; #line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp47_ = container; + _tmp44_ = container; #line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp48_ = map; + _tmp45_ = map; #line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp49_ = container; + _tmp46_ = container; #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_); + _tmp47_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp46_); #line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp51_ = _tmp50_; + _tmp48_ = _tmp47_; #line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - container_source_establish_link_many (_tmp47_, _tmp51_); + container_source_establish_link_many (_tmp44_, _tmp48_); #line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_object_unref0 (_tmp51_); + _g_object_unref0 (_tmp48_); #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); -#line 1417 "ContainerSourceCollection.c" +#line 1504 "ContainerSourceCollection.c" } #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_container_it); -#line 1421 "ContainerSourceCollection.c" +#line 1508 "ContainerSourceCollection.c" } #line 171 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_thaw_attached_notifications (self); #line 146 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (map); -#line 1427 "ContainerSourceCollection.c" +#line 1514 "ContainerSourceCollection.c" } -static void container_source_collection_on_contained_source_destroyed (ContainerSourceCollection* self, DataSource* source) { +static void +container_source_collection_on_contained_source_destroyed (ContainerSourceCollection* self, + DataSource* source) +{ GeeIterator* iter = NULL; GeeHashSet* _tmp0_; GeeIterator* _tmp1_; @@ -1444,82 +1534,78 @@ static void container_source_collection_on_contained_source_destroyed (Container iter = _tmp1_; #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1447 "ContainerSourceCollection.c" +#line 1537 "ContainerSourceCollection.c" GeeIterator* _tmp2_; - gboolean _tmp3_; ContainerSource* container = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - gboolean _tmp6_ = FALSE; - ContainerSource* _tmp7_; - gboolean _tmp8_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + gboolean _tmp5_ = FALSE; + ContainerSource* _tmp6_; #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = iter; #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1464 "ContainerSourceCollection.c" +#line 1550 "ContainerSourceCollection.c" } #line 177 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = iter; + _tmp3_ = iter; #line 177 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 177 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - container = (ContainerSource*) _tmp5_; -#line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp7_ = container; + container = (ContainerSource*) _tmp4_; #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp8_ = container_source_has_links (_tmp7_); + _tmp6_ = container; #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp8_) { -#line 1478 "ContainerSourceCollection.c" - ContainerSource* _tmp9_; + if (!container_source_has_links (_tmp6_)) { +#line 1562 "ContainerSourceCollection.c" + ContainerSource* _tmp7_; #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp9_ = container; + _tmp7_ = container; #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_TAG); -#line 1484 "ContainerSourceCollection.c" + _tmp5_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_TAG); +#line 1568 "ContainerSourceCollection.c" } else { #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = FALSE; -#line 1488 "ContainerSourceCollection.c" + _tmp5_ = FALSE; +#line 1572 "ContainerSourceCollection.c" } #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (_tmp6_) { -#line 1492 "ContainerSourceCollection.c" - GeeIterator* _tmp10_; - ContainerSource* _tmp11_; + if (_tmp5_) { +#line 1576 "ContainerSourceCollection.c" + GeeIterator* _tmp8_; + ContainerSource* _tmp9_; #line 182 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp10_ = iter; + _tmp8_ = iter; #line 182 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - gee_iterator_remove (_tmp10_); + gee_iterator_remove (_tmp8_); #line 183 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp11_ = container; + _tmp9_ = container; #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 1503 "ContainerSourceCollection.c" + data_source_destroy_orphan (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_SOURCE, DataSource), TRUE); +#line 1587 "ContainerSourceCollection.c" } #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); -#line 1507 "ContainerSourceCollection.c" +#line 1591 "ContainerSourceCollection.c" } #line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (iter); -#line 1511 "ContainerSourceCollection.c" +#line 1595 "ContainerSourceCollection.c" } -static void container_source_collection_real_notify_item_destroyed (SourceCollection* base, DataSource* source) { +static void +container_source_collection_real_notify_item_destroyed (SourceCollection* base, + DataSource* source) +{ ContainerSourceCollection * self; - DataSource* _tmp10_; #line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection); #line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_DATA_SOURCE (source)); -#line 1522 "ContainerSourceCollection.c" +#line 1608 "ContainerSourceCollection.c" { GeeIterator* _collection_it = NULL; GeeHashSet* _tmp0_; @@ -1532,69 +1618,63 @@ static void container_source_collection_real_notify_item_destroyed (SourceCollec _collection_it = _tmp1_; #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1535 "ContainerSourceCollection.c" +#line 1621 "ContainerSourceCollection.c" GeeIterator* _tmp2_; - gboolean _tmp3_; SourceCollection* collection = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - SourceCollection* _tmp6_; - DataSource* _tmp7_; - SourceBacklink* _tmp8_; - SourceBacklink* _tmp9_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + SourceCollection* _tmp5_; + SourceBacklink* _tmp6_; + SourceBacklink* _tmp7_; #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = _collection_it; #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1553 "ContainerSourceCollection.c" +#line 1635 "ContainerSourceCollection.c" } #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = _collection_it; + _tmp3_ = _collection_it; #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - collection = (SourceCollection*) _tmp5_; + collection = (SourceCollection*) _tmp4_; #line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = collection; + _tmp5_ = collection; #line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp7_ = source; + _tmp6_ = container_source_get_backlink (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_CONTAINER_SOURCE, ContainerSource)); #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)); + _tmp7_ = _tmp6_; #line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp9_ = _tmp8_; + source_collection_remove_backlink (_tmp5_, _tmp7_); #line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - source_collection_remove_backlink (_tmp6_, _tmp9_); -#line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _source_backlink_unref0 (_tmp9_); + _source_backlink_unref0 (_tmp7_); #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); -#line 1575 "ContainerSourceCollection.c" +#line 1655 "ContainerSourceCollection.c" } #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); -#line 1579 "ContainerSourceCollection.c" +#line 1659 "ContainerSourceCollection.c" } #line 193 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp10_ = source; -#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 1585 "ContainerSourceCollection.c" + 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), source); +#line 1663 "ContainerSourceCollection.c" } -void container_source_collection_evaporate (ContainerSourceCollection* self, ContainerSource* container) { - ContainerSource* _tmp21_; - Marker* _tmp22_; - Marker* _tmp23_; +void +container_source_collection_evaporate (ContainerSourceCollection* self, + ContainerSource* container) +{ + Marker* _tmp15_; + Marker* _tmp16_; #line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); -#line 1597 "ContainerSourceCollection.c" +#line 1677 "ContainerSourceCollection.c" { GeeIterator* _collection_it = NULL; GeeHashSet* _tmp0_; @@ -1607,155 +1687,147 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con _collection_it = _tmp1_; #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1610 "ContainerSourceCollection.c" +#line 1690 "ContainerSourceCollection.c" GeeIterator* _tmp2_; - gboolean _tmp3_; SourceCollection* collection = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - SourceCollection* _tmp6_; - ContainerSource* _tmp7_; - SourceBacklink* _tmp8_; - SourceBacklink* _tmp9_; - gboolean _tmp10_; - gboolean _tmp11_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + SourceCollection* _tmp5_; + SourceBacklink* _tmp6_; + SourceBacklink* _tmp7_; + gboolean _tmp8_; #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = _collection_it; #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1630 "ContainerSourceCollection.c" +#line 1705 "ContainerSourceCollection.c" } #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = _collection_it; + _tmp3_ = _collection_it; #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #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 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp7_ = container; + collection = (SourceCollection*) _tmp4_; #line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp8_ = container_source_get_backlink (_tmp7_); + _tmp5_ = collection; #line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp9_ = _tmp8_; + _tmp6_ = container_source_get_backlink (container); #line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp10_ = source_collection_has_backlink (_tmp6_, _tmp9_); + _tmp7_ = _tmp6_; #line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp11_ = _tmp10_; + _tmp8_ = source_collection_has_backlink (_tmp5_, _tmp7_); #line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _source_backlink_unref0 (_tmp9_); + _source_backlink_unref0 (_tmp7_); #line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (_tmp11_) { -#line 1654 "ContainerSourceCollection.c" - ContainerSource* _tmp12_; - Marker* _tmp13_; - Marker* _tmp14_; - GeeCollection* _tmp15_; - GeeCollection* _tmp16_; + if (_tmp8_) { +#line 1725 "ContainerSourceCollection.c" + Marker* _tmp9_; + Marker* _tmp10_; + GeeCollection* _tmp11_; + GeeCollection* _tmp12_; gboolean added = FALSE; - GeeHashSet* _tmp17_; - ContainerSource* _tmp18_; - gboolean _tmp19_; - gboolean _tmp20_; + GeeHashSet* _tmp13_; + gboolean _tmp14_; #line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp12_ = container; + _tmp9_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (container, TYPE_DATA_OBJECT, DataObject)); #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)); + _tmp10_ = _tmp9_; #line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp14_ = _tmp13_; + _tmp11_ = source_collection_unlink_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp10_, NULL, NULL); #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); + _tmp12_ = _tmp11_; #line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp16_ = _tmp15_; + _g_object_unref0 (_tmp12_); #line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_object_unref0 (_tmp16_); -#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; + _g_object_unref0 (_tmp10_); #line 204 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp18_ = container; + _tmp13_ = self->priv->holding_tank; #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 204 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - added = _tmp19_; + added = gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), container); #line 205 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp20_ = added; + _tmp14_ = added; #line 205 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _vala_assert (_tmp20_, "added"); + _vala_assert (_tmp14_, "added"); #line 206 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); #line 206 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); #line 206 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return; -#line 1697 "ContainerSourceCollection.c" +#line 1759 "ContainerSourceCollection.c" } #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); -#line 1701 "ContainerSourceCollection.c" +#line 1763 "ContainerSourceCollection.c" } #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); -#line 1705 "ContainerSourceCollection.c" +#line 1767 "ContainerSourceCollection.c" } #line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp21_ = container; + _tmp15_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (container, TYPE_DATA_OBJECT, DataObject)); #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)); + _tmp16_ = _tmp15_; #line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp23_ = _tmp22_; + source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp16_, TRUE, NULL, NULL, NULL); #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 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_object_unref0 (_tmp23_); -#line 1717 "ContainerSourceCollection.c" + _g_object_unref0 (_tmp16_); +#line 1777 "ContainerSourceCollection.c" } -static void _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self) { +static void +_container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking (SourceCollection* _sender, + GeeCollection* unlinking, + gpointer self) +{ #line 221 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_on_contained_sources_unlinking ((ContainerSourceCollection*) self, unlinking); -#line 1724 "ContainerSourceCollection.c" +#line 1788 "ContainerSourceCollection.c" } -static void _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self) { +static void +_container_source_collection_on_contained_sources_relinked_source_collection_items_relinked (SourceCollection* _sender, + GeeCollection* relinked, + gpointer self) +{ #line 222 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_on_contained_sources_relinked ((ContainerSourceCollection*) self, relinked); -#line 1731 "ContainerSourceCollection.c" +#line 1799 "ContainerSourceCollection.c" } -static void _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +static void +_container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self) +{ #line 223 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_on_contained_source_destroyed ((ContainerSourceCollection*) self, source); -#line 1738 "ContainerSourceCollection.c" +#line 1810 "ContainerSourceCollection.c" } -static void _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +static void +_container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self) +{ #line 224 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_on_contained_source_destroyed ((ContainerSourceCollection*) self, source); -#line 1745 "ContainerSourceCollection.c" +#line 1821 "ContainerSourceCollection.c" } -void container_source_collection_attach_collection (ContainerSourceCollection* self, SourceCollection* collection) { +void +container_source_collection_attach_collection (ContainerSourceCollection* self, + SourceCollection* collection) +{ GeeHashSet* _tmp0_; - SourceCollection* _tmp1_; - gboolean _tmp2_; - GeeHashSet* _tmp8_; - SourceCollection* _tmp9_; - SourceCollection* _tmp10_; - SourceCollection* _tmp11_; - SourceCollection* _tmp12_; - SourceCollection* _tmp13_; + GeeHashSet* _tmp5_; #line 213 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 213 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1763,69 +1835,54 @@ void container_source_collection_attach_collection (ContainerSourceCollection* s #line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp0_ = self->priv->attached_collections; #line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = collection; -#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 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (_tmp2_) { -#line 1771 "ContainerSourceCollection.c" - SourceCollection* _tmp3_; + if (gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), collection)) { +#line 1839 "ContainerSourceCollection.c" + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; -#line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = collection; #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)); + _tmp1_ = data_collection_to_string (G_TYPE_CHECK_INSTANCE_CAST (collection, TYPE_DATA_COLLECTION, DataCollection)); #line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #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)); + _tmp3_ = data_collection_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_warning ("ContainerSourceCollection.vala:215: attempted to multiple-attach '%s' " \ -"to '%s'", _tmp5_, _tmp7_); +"to '%s'", _tmp2_, _tmp4_); #line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp4_); #line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp2_); #line 216 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return; -#line 1795 "ContainerSourceCollection.c" +#line 1860 "ContainerSourceCollection.c" } #line 219 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp8_ = self->priv->attached_collections; + _tmp5_ = self->priv->attached_collections; #line 219 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp9_ = collection; -#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 221 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp10_ = collection; + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), collection); #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); + g_signal_connect (collection, "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 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; + g_signal_connect (collection, "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" - g_signal_connect (_tmp12_, "item-destroyed", (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed, self); + g_signal_connect (collection, "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 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 1819 "ContainerSourceCollection.c" + g_signal_connect (collection, "unlinked-destroyed", (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed, self); +#line 1874 "ContainerSourceCollection.c" } -void container_source_collection_detach_all_collections (ContainerSourceCollection* self) { - GeeHashSet* _tmp14_; +void +container_source_collection_detach_all_collections (ContainerSourceCollection* self) +{ + GeeHashSet* _tmp13_; #line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); -#line 1827 "ContainerSourceCollection.c" +#line 1884 "ContainerSourceCollection.c" { GeeIterator* _collection_it = NULL; GeeHashSet* _tmp0_; @@ -1838,86 +1895,95 @@ void container_source_collection_detach_all_collections (ContainerSourceCollecti _collection_it = _tmp1_; #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1840 "ContainerSourceCollection.c" +#line 1897 "ContainerSourceCollection.c" GeeIterator* _tmp2_; - gboolean _tmp3_; SourceCollection* collection = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - SourceCollection* _tmp6_; - guint _tmp7_; - SourceCollection* _tmp8_; - guint _tmp9_; - SourceCollection* _tmp10_; - guint _tmp11_; - SourceCollection* _tmp12_; - guint _tmp13_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + SourceCollection* _tmp5_; + guint _tmp6_; + SourceCollection* _tmp7_; + guint _tmp8_; + SourceCollection* _tmp9_; + guint _tmp10_; + SourceCollection* _tmp11_; + guint _tmp12_; #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = _collection_it; #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1862 "ContainerSourceCollection.c" +#line 1916 "ContainerSourceCollection.c" } #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = _collection_it; + _tmp3_ = _collection_it; #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - collection = (SourceCollection*) _tmp5_; + collection = (SourceCollection*) _tmp4_; #line 229 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = collection; + _tmp5_ = collection; #line 229 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_parse_name ("items-unlinking", TYPE_SOURCE_COLLECTION, &_tmp7_, NULL, FALSE); + g_signal_parse_name ("items-unlinking", TYPE_SOURCE_COLLECTION, &_tmp6_, NULL, FALSE); #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); + g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 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; + _tmp7_ = collection; #line 230 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_parse_name ("items-relinked", TYPE_SOURCE_COLLECTION, &_tmp9_, NULL, FALSE); + g_signal_parse_name ("items-relinked", TYPE_SOURCE_COLLECTION, &_tmp8_, NULL, FALSE); #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); + g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 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; + _tmp9_ = collection; #line 231 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_parse_name ("item-destroyed", TYPE_SOURCE_COLLECTION, &_tmp11_, NULL, FALSE); + g_signal_parse_name ("item-destroyed", TYPE_SOURCE_COLLECTION, &_tmp10_, NULL, FALSE); #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); + g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 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; + _tmp11_ = collection; #line 232 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_parse_name ("unlinked-destroyed", TYPE_SOURCE_COLLECTION, &_tmp13_, NULL, FALSE); + g_signal_parse_name ("unlinked-destroyed", TYPE_SOURCE_COLLECTION, &_tmp12_, NULL, FALSE); #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); + g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed, self); #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); -#line 1896 "ContainerSourceCollection.c" +#line 1950 "ContainerSourceCollection.c" } #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); -#line 1900 "ContainerSourceCollection.c" +#line 1954 "ContainerSourceCollection.c" } #line 235 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp14_ = self->priv->attached_collections; + _tmp13_ = self->priv->attached_collections; #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 1906 "ContainerSourceCollection.c" + gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); +#line 1960 "ContainerSourceCollection.c" } -static void container_source_collection_real_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked) { +static void +container_source_collection_real_container_contents_added (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked) +{ #line 20 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 20 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (added)); -#line 1915 "ContainerSourceCollection.c" +#line 1974 "ContainerSourceCollection.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT_BOOLEAN) (gpointer data1, gpointer arg_1, gpointer arg_2, gboolean arg_3, gpointer data2); register GMarshalFunc_VOID__OBJECT_OBJECT_BOOLEAN callback; register GCClosure * cc; @@ -1932,43 +1998,62 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN (GClosure * clos data1 = closure->data; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data2 = param_values->data[0].v_pointer; -#line 1934 "ContainerSourceCollection.c" +#line 2000 "ContainerSourceCollection.c" } else { #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data1 = param_values->data[0].v_pointer; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data2 = closure->data; -#line 1940 "ContainerSourceCollection.c" +#line 2006 "ContainerSourceCollection.c" } #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT_BOOLEAN) (marshal_data ? marshal_data : cc->callback); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boolean (param_values + 3), data2); -#line 1946 "ContainerSourceCollection.c" +#line 2012 "ContainerSourceCollection.c" } -static void container_source_collection_real_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked) { +static void +container_source_collection_real_container_contents_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* removed, + gboolean unlinked) +{ #line 24 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 24 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (removed)); -#line 1955 "ContainerSourceCollection.c" +#line 2026 "ContainerSourceCollection.c" } -static void container_source_collection_real_container_contents_altered (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked) { +static void +container_source_collection_real_container_contents_altered (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked, + GeeCollection* removed, + gboolean unlinked) +{ #line 28 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 28 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); #line 28 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 1966 "ContainerSourceCollection.c" +#line 2044 "ContainerSourceCollection.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN) (gpointer data1, gpointer arg_1, gpointer arg_2, gboolean arg_3, gpointer arg_4, gboolean arg_5, gpointer data2); register GMarshalFunc_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN callback; register GCClosure * cc; @@ -1983,32 +2068,43 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN ( data1 = closure->data; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data2 = param_values->data[0].v_pointer; -#line 1985 "ContainerSourceCollection.c" +#line 2070 "ContainerSourceCollection.c" } else { #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data1 = param_values->data[0].v_pointer; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data2 = closure->data; -#line 1991 "ContainerSourceCollection.c" +#line 2076 "ContainerSourceCollection.c" } #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN) (marshal_data ? marshal_data : cc->callback); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boolean (param_values + 3), g_value_get_object (param_values + 4), g_value_get_boolean (param_values + 5), data2); -#line 1997 "ContainerSourceCollection.c" +#line 2082 "ContainerSourceCollection.c" } -static void container_source_collection_real_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources) { +static void +container_source_collection_real_backlink_to_container_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* sources) +{ #line 34 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 34 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); -#line 2006 "ContainerSourceCollection.c" +#line 2095 "ContainerSourceCollection.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2); register GMarshalFunc_VOID__OBJECT_OBJECT callback; register GCClosure * cc; @@ -2023,23 +2119,25 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa data1 = closure->data; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data2 = param_values->data[0].v_pointer; -#line 2025 "ContainerSourceCollection.c" +#line 2121 "ContainerSourceCollection.c" } else { #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data1 = param_values->data[0].v_pointer; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data2 = closure->data; -#line 2031 "ContainerSourceCollection.c" +#line 2127 "ContainerSourceCollection.c" } #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 2037 "ContainerSourceCollection.c" +#line 2133 "ContainerSourceCollection.c" } -static void container_source_collection_class_init (ContainerSourceCollectionClass * klass) { +static void +container_source_collection_class_init (ContainerSourceCollectionClass * klass) +{ #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_parent_class = g_type_class_peek_parent (klass); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -2078,11 +2176,13 @@ static void container_source_collection_class_init (ContainerSourceCollectionCla container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("container-contents-altered", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, container_contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN, G_TYPE_NONE, 5, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_BACKLINK_TO_CONTAINER_REMOVED_SIGNAL] = g_signal_new ("backlink-to-container-removed", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, backlink_to_container_removed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION); -#line 2080 "ContainerSourceCollection.c" +#line 2178 "ContainerSourceCollection.c" } -static void container_source_collection_instance_init (ContainerSourceCollection * self) { +static void +container_source_collection_instance_init (ContainerSourceCollection * self) +{ GeeHashSet* _tmp0_; GeeHashSet* _tmp1_; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -2095,11 +2195,13 @@ static void container_source_collection_instance_init (ContainerSourceCollection _tmp1_ = gee_hash_set_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 18 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" self->priv->holding_tank = _tmp1_; -#line 2097 "ContainerSourceCollection.c" +#line 2197 "ContainerSourceCollection.c" } -static void container_source_collection_finalize (DataCollection * obj) { +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); @@ -2113,11 +2215,13 @@ static void container_source_collection_finalize (DataCollection * obj) { _g_object_unref0 (self->priv->holding_tank); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" DATA_COLLECTION_CLASS (container_source_collection_parent_class)->finalize (obj); -#line 2115 "ContainerSourceCollection.c" +#line 2217 "ContainerSourceCollection.c" } -GType container_source_collection_get_type (void) { +GType +container_source_collection_get_type (void) +{ static volatile gsize container_source_collection_type_id__volatile = 0; if (g_once_init_enter (&container_source_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ContainerSourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) container_source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ContainerSourceCollection), 0, (GInstanceInitFunc) container_source_collection_instance_init, NULL }; diff --git a/src/core/Core.c b/src/core/Core.c index bb3c27b..df6c104 100644 --- a/src/core/Core.c +++ b/src/core/Core.c @@ -1,4 +1,4 @@ -/* Core.c generated by valac 0.36.6, the Vala compiler +/* Core.c generated by valac 0.40.4, the Vala compiler * generated from Core.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -15,6 +15,7 @@ * the preconfigure() method, implement it, and ensure in init() that it's been called. */ + #include #include @@ -26,15 +27,21 @@ void core_init (GError** error); void core_terminate (void); -void core_preconfigure (void) { +void +core_preconfigure (void) +{ } -void core_init (GError** error) { +void +core_init (GError** error) +{ } -void core_terminate (void) { +void +core_terminate (void) +{ } diff --git a/src/core/DataCollection.c b/src/core/DataCollection.c index 658dfa3..f71e80c 100644 --- a/src/core/DataCollection.c +++ b/src/core/DataCollection.c @@ -1,4 +1,4 @@ -/* DataCollection.c generated by valac 0.36.6, the Vala compiler +/* DataCollection.c generated by valac 0.40.4, the Vala compiler * generated from DataCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -90,6 +91,11 @@ typedef struct _DataCollectionMarkerImplClass DataCollectionMarkerImplClass; typedef struct _DataCollectionMarkerImplPrivate DataCollectionMarkerImplPrivate; #define _alteration_unref0(var) ((var == NULL) ? NULL : (var = (alteration_unref (var), NULL))) #define __vala_GValue_free0(var) ((var == NULL) ? NULL : (var = (_vala_GValue_free (var), NULL))) +enum { + DATA_COLLECTION_MARKER_IMPL_0_PROPERTY, + DATA_COLLECTION_MARKER_IMPL_NUM_PROPERTIES +}; +static GParamSpec* data_collection_marker_impl_properties[DATA_COLLECTION_MARKER_IMPL_NUM_PROPERTIES]; typedef struct _ParamSpecDataCollection ParamSpecDataCollection; enum { DATA_COLLECTION_ITEMS_ADDED_SIGNAL, @@ -101,9 +107,9 @@ enum { DATA_COLLECTION_PROPERTY_CLEARED_SIGNAL, DATA_COLLECTION_FROZEN_SIGNAL, DATA_COLLECTION_THAWED_SIGNAL, - DATA_COLLECTION_LAST_SIGNAL + DATA_COLLECTION_NUM_SIGNALS }; -static guint data_collection_signals[DATA_COLLECTION_LAST_SIGNAL] = {0}; +static guint data_collection_signals[DATA_COLLECTION_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -202,69 +208,129 @@ static MarkerIface * data_collection_marker_impl_marker_parent_iface = NULL; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType marker_get_type (void) G_GNUC_CONST; gpointer data_set_ref (gpointer instance); void data_set_unref (gpointer instance); -GParamSpec* param_spec_data_set (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_set (GValue* value, gpointer v_object); -void value_take_data_set (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_set (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_set (GValue* value, + gpointer v_object); +void value_take_data_set (GValue* value, + gpointer v_object); gpointer value_get_data_set (const GValue* value); GType data_set_get_type (void) G_GNUC_CONST; #define DATA_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DATA_COLLECTION, DataCollectionPrivate)) -enum { - DATA_COLLECTION_DUMMY_PROPERTY -}; DataSet* data_set_new (void); DataSet* data_set_construct (GType object_type); static GValue* _g_value_dup (GValue* self); static void _vala_GValue_free (GValue* self); #define DATA_COLLECTION_INVALID_OBJECT_ORDINAL ((gint64) -1) DataCollection* data_collection_new (const gchar* name); -DataCollection* data_collection_construct (GType object_type, const gchar* name); +DataCollection* data_collection_construct (GType object_type, + const gchar* name); gchar* data_collection_to_string (DataCollection* self); static gchar* data_collection_real_to_string (DataCollection* self); gint data_collection_get_count (DataCollection* self); -void data_collection_notify_items_added (DataCollection* self, GeeIterable* added); -static void data_collection_real_notify_items_added (DataCollection* self, GeeIterable* added); -void data_collection_notify_items_removed (DataCollection* self, GeeIterable* removed); -static void data_collection_real_notify_items_removed (DataCollection* self, GeeIterable* removed); -void data_collection_notify_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed); -static void data_collection_real_notify_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed); -void data_collection_notify_items_altered (DataCollection* self, GeeMap* items); -static void data_collection_real_notify_items_altered (DataCollection* self, GeeMap* items); +void data_collection_notify_items_added (DataCollection* self, + GeeIterable* added); +static void data_collection_real_notify_items_added (DataCollection* self, + GeeIterable* added); +void data_collection_notify_items_removed (DataCollection* self, + GeeIterable* removed); +static void data_collection_real_notify_items_removed (DataCollection* self, + GeeIterable* removed); +void data_collection_notify_contents_altered (DataCollection* self, + GeeIterable* added, + GeeIterable* removed); +static void data_collection_real_notify_contents_altered (DataCollection* self, + GeeIterable* added, + GeeIterable* removed); +void data_collection_notify_items_altered (DataCollection* self, + GeeMap* items); +static void data_collection_real_notify_items_altered (DataCollection* self, + GeeMap* items); void data_collection_notify_ordering_changed (DataCollection* self); static void data_collection_real_notify_ordering_changed (DataCollection* self); -void data_collection_notify_property_set (DataCollection* self, const gchar* name, GValue* old, GValue* val); -static void data_collection_real_notify_property_set (DataCollection* self, const gchar* name, GValue* old, GValue* val); -void data_collection_notify_property_cleared (DataCollection* self, const gchar* name); -static void data_collection_real_notify_property_cleared (DataCollection* self, const gchar* name); +void data_collection_notify_property_set (DataCollection* self, + const gchar* name, + GValue* old, + GValue* val); +static void data_collection_real_notify_property_set (DataCollection* self, + const gchar* name, + GValue* old, + GValue* val); +void data_collection_notify_property_cleared (DataCollection* self, + const gchar* name); +static void data_collection_real_notify_property_cleared (DataCollection* self, + const gchar* name); GeeCollection* data_collection_get_singleton (DataObject* object); -SingletonCollection* singleton_collection_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object); -SingletonCollection* singleton_collection_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object); +SingletonCollection* singleton_collection_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + gconstpointer object); +SingletonCollection* singleton_collection_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + gconstpointer object); GType singleton_collection_get_type (void) G_GNUC_CONST; -GeeMap* data_collection_get_alteration_singleton (DataObject* object, Alteration* alteration); -gboolean data_collection_valid_type (DataCollection* self, DataObject* object); -static gboolean data_collection_real_valid_type (DataCollection* self, DataObject* object); -Comparator data_collection_get_comparator (DataCollection* self, void** result_target); -Comparator data_set_get_comparator (DataSet* self, void** result_target); -ComparatorPredicate data_collection_get_comparator_predicate (DataCollection* self, void** result_target); -ComparatorPredicate data_set_get_comparator_predicate (DataSet* self, void** result_target); -void data_collection_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target); -static void data_collection_real_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target); -void data_set_set_comparator (DataSet* self, Comparator user_comparator, void* user_comparator_target, ComparatorPredicate comparator_predicate, void* comparator_predicate_target); +GeeMap* data_collection_get_alteration_singleton (DataObject* object, + Alteration* alteration); +gboolean data_collection_valid_type (DataCollection* self, + DataObject* object); +static gboolean data_collection_real_valid_type (DataCollection* self, + DataObject* object); +Comparator data_collection_get_comparator (DataCollection* self, + void** result_target); +Comparator data_set_get_comparator (DataSet* self, + void** result_target); +ComparatorPredicate data_collection_get_comparator_predicate (DataCollection* self, + void** result_target); +ComparatorPredicate data_set_get_comparator_predicate (DataSet* self, + void** result_target); +void data_collection_set_comparator (DataCollection* self, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target); +static void data_collection_real_set_comparator (DataCollection* self, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target); +void data_set_set_comparator (DataSet* self, + Comparator user_comparator, + void* user_comparator_target, + ComparatorPredicate comparator_predicate, + void* comparator_predicate_target); void data_collection_reset_comparator (DataCollection* self); static void data_collection_real_reset_comparator (DataCollection* self); void data_set_reset_comparator (DataSet* self); @@ -275,89 +341,177 @@ DataSet* data_collection_get_dataset_copy (DataCollection* self); DataSet* data_set_copy (DataSet* self); static gint data_collection_real_get_count (DataCollection* self); gint data_set_get_count (DataSet* self); -DataObject* data_collection_get_at (DataCollection* self, gint index); -static DataObject* data_collection_real_get_at (DataCollection* self, gint index); -DataObject* data_set_get_at (DataSet* self, gint index); -gint data_collection_index_of (DataCollection* self, DataObject* object); -static gint data_collection_real_index_of (DataCollection* self, DataObject* object); -gint data_set_index_of (DataSet* self, DataObject* object); -gboolean data_collection_contains (DataCollection* self, DataObject* object); -static gboolean data_collection_real_contains (DataCollection* self, DataObject* object); -static gboolean data_collection_internal_contains (DataCollection* self, DataObject* object); -gboolean data_set_contains (DataSet* self, DataObject* object); +DataObject* data_collection_get_at (DataCollection* self, + gint index); +static DataObject* data_collection_real_get_at (DataCollection* self, + gint index); +DataObject* data_set_get_at (DataSet* self, + gint index); +gint data_collection_index_of (DataCollection* self, + DataObject* object); +static gint data_collection_real_index_of (DataCollection* self, + DataObject* object); +gint data_set_index_of (DataSet* self, + DataObject* object); +gboolean data_collection_contains (DataCollection* self, + DataObject* object); +static gboolean data_collection_real_contains (DataCollection* self, + DataObject* object); +static gboolean data_collection_internal_contains (DataCollection* self, + DataObject* object); +gboolean data_set_contains (DataSet* self, + DataObject* object); DataCollection* data_object_get_membership (DataObject* self); -static void data_collection_internal_add (DataCollection* self, DataObject* object); -void data_object_internal_set_membership (DataObject* self, DataCollection* collection, gint64 ordinal); -gboolean data_set_add (DataSet* self, DataObject* object); -static void data_collection_internal_add_many (DataCollection* self, GeeList* objects, ProgressMonitor monitor, void* monitor_target); -gboolean data_set_add_many (DataSet* self, GeeCollection* objects); -static void data_collection_internal_remove (DataCollection* self, DataObject* object); -gboolean data_set_remove (DataSet* self, DataObject* object); +static void data_collection_internal_add (DataCollection* self, + DataObject* object); +void data_object_internal_set_membership (DataObject* self, + DataCollection* collection, + gint64 ordinal); +gboolean data_set_add (DataSet* self, + DataObject* object); +static void data_collection_internal_add_many (DataCollection* self, + GeeList* objects, + ProgressMonitor monitor, + void* monitor_target); +gboolean data_set_add_many (DataSet* self, + GeeCollection* objects); +static void data_collection_internal_remove (DataCollection* self, + DataObject* object); +gboolean data_set_remove (DataSet* self, + DataObject* object); void data_object_internal_clear_membership (DataObject* self); -gboolean data_collection_add (DataCollection* self, DataObject* object); -static gboolean data_collection_real_add (DataCollection* self, DataObject* object); +gboolean data_collection_add (DataCollection* self, + DataObject* object); +static gboolean data_collection_real_add (DataCollection* self, + DataObject* object); gchar* data_object_to_string (DataObject* self); -void data_object_notify_membership_changed (DataObject* self, DataCollection* collection); -GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); -static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); +void data_object_notify_membership_changed (DataObject* self, + DataCollection* collection); +GeeCollection* data_collection_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); +static GeeCollection* data_collection_real_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); Marker* data_collection_start_marking (DataCollection* self); static DataCollectionMarkerImpl* data_collection_marker_impl_new (DataCollection* owner); -static DataCollectionMarkerImpl* data_collection_marker_impl_construct (GType object_type, DataCollection* owner); +static DataCollectionMarkerImpl* data_collection_marker_impl_construct (GType object_type, + DataCollection* owner); static GType data_collection_marker_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -Marker* data_collection_mark (DataCollection* self, DataObject* object); -void marker_mark (Marker* self, DataObject* object); -Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects); -void marker_mark_many (Marker* self, GeeCollection* list); -void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedAction action, void* action_target, ProgressMonitor monitor, void* monitor_target, GObject* user); -static gboolean data_collection_marker_impl_is_valid (DataCollectionMarkerImpl* self, DataCollection* collection); +Marker* data_collection_mark (DataCollection* self, + DataObject* object); +void marker_mark (Marker* self, + DataObject* object); +Marker* data_collection_mark_many (DataCollection* self, + GeeCollection* objects); +void marker_mark_many (Marker* self, + GeeCollection* list); +void data_collection_act_on_marked (DataCollection* self, + Marker* m, + MarkedAction action, + void* action_target, + ProgressMonitor monitor, + void* monitor_target, + GObject* user); +static gboolean data_collection_marker_impl_is_valid (DataCollectionMarkerImpl* self, + DataCollection* collection); static void data_collection_marker_impl_freeze (DataCollectionMarkerImpl* self); static void data_collection_marker_impl_finished (DataCollectionMarkerImpl* self); -void data_collection_remove_marked (DataCollection* self, Marker* m); -static void data_collection_real_remove_marked (DataCollection* self, Marker* m); +void data_collection_remove_marked (DataCollection* self, + Marker* m); +static void data_collection_real_remove_marked (DataCollection* self, + Marker* m); void data_collection_clear (DataCollection* self); static void data_collection_real_clear (DataCollection* self); void data_collection_close (DataCollection* self); static void data_collection_real_close (DataCollection* self); -void data_collection_internal_notify_altered (DataCollection* self, DataObject* object, Alteration* alteration); -gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration* alteration); +void data_collection_internal_notify_altered (DataCollection* self, + DataObject* object, + Alteration* alteration); +gboolean data_set_resort_object (DataSet* self, + DataObject* object, + Alteration* alteration); gboolean data_collection_are_notifications_frozen (DataCollection* self); -Alteration* alteration_compress (Alteration* self, Alteration* other); -GValue* data_collection_get_property (DataCollection* self, const gchar* name); -void data_collection_set_property (DataCollection* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target); -gboolean bool_value_equals (GValue* a, GValue* b); -static gboolean _bool_value_equals_value_equal_func (GValue* a, GValue* b, gpointer self); -gboolean int_value_equals (GValue* a, GValue* b); -static gboolean _int_value_equals_value_equal_func (GValue* a, GValue* b, gpointer self); -void data_object_notify_collection_property_set (DataObject* self, const gchar* name, GValue* old, GValue* val); -void data_collection_clear_property (DataCollection* self, const gchar* name); -void data_object_notify_collection_property_cleared (DataObject* self, const gchar* name); +Alteration* alteration_compress (Alteration* self, + Alteration* other); +GValue* data_collection_get_property (DataCollection* self, + const gchar* name); +void data_collection_set_property (DataCollection* self, + const gchar* name, + GValue* val, + ValueEqualFunc value_equals, + void* value_equals_target); +gboolean bool_value_equals (GValue* a, + GValue* b); +static gboolean _bool_value_equals_value_equal_func (GValue* a, + GValue* b, + gpointer self); +gboolean int_value_equals (GValue* a, + GValue* b); +static gboolean _int_value_equals_value_equal_func (GValue* a, + GValue* b, + gpointer self); +void data_object_notify_collection_property_set (DataObject* self, + const gchar* name, + GValue* old, + GValue* val); +void data_collection_clear_property (DataCollection* self, + const gchar* name); +void data_object_notify_collection_property_cleared (DataObject* self, + const gchar* name); void data_collection_freeze_notifications (DataCollection* self); void data_collection_notify_frozen (DataCollection* self); void data_collection_thaw_notifications (DataCollection* self); void data_collection_notify_thawed (DataCollection* self); static void data_collection_real_notify_frozen (DataCollection* self); static void data_collection_real_notify_thawed (DataCollection* self); -static void data_collection_real_items_added (DataCollection* self, GeeIterable* added); -static void data_collection_real_items_removed (DataCollection* self, GeeIterable* removed); -static void data_collection_real_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed); -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void data_collection_real_items_altered (DataCollection* self, GeeMap* items); +static void data_collection_real_items_added (DataCollection* self, + GeeIterable* added); +static void data_collection_real_items_removed (DataCollection* self, + GeeIterable* removed); +static void data_collection_real_contents_altered (DataCollection* self, + GeeIterable* added, + GeeIterable* removed); +static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void data_collection_real_items_altered (DataCollection* self, + GeeMap* items); static void data_collection_real_ordering_changed (DataCollection* self); -static void data_collection_real_property_set (DataCollection* self, const gchar* name, GValue* old, GValue* val); -static void g_cclosure_user_marshal_VOID__STRING_POINTER_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void data_collection_real_property_cleared (DataCollection* self, const gchar* name); +static void data_collection_real_property_set (DataCollection* self, + const gchar* name, + GValue* old, + GValue* val); +static void g_cclosure_user_marshal_VOID__STRING_POINTER_BOXED (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void data_collection_real_property_cleared (DataCollection* self, + const gchar* name); static void data_collection_real_frozen (DataCollection* self); static void data_collection_real_thawed (DataCollection* self); -enum { - DATA_COLLECTION_MARKER_IMPL_DUMMY_PROPERTY -}; -static void data_collection_marker_impl_on_items_removed (DataCollectionMarkerImpl* self, GeeIterable* removed); -static void _data_collection_marker_impl_on_items_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self); -static void data_collection_marker_impl_real_mark (Marker* base, DataObject* object); -static void data_collection_marker_impl_real_unmark (Marker* base, DataObject* object); -static gboolean data_collection_marker_impl_real_toggle (Marker* base, DataObject* object); -static void data_collection_marker_impl_real_mark_many (Marker* base, GeeCollection* list); -static void data_collection_marker_impl_real_unmark_many (Marker* base, GeeCollection* list); +static void data_collection_marker_impl_on_items_removed (DataCollectionMarkerImpl* self, + GeeIterable* removed); +static void _data_collection_marker_impl_on_items_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self); +static void data_collection_marker_impl_real_mark (Marker* base, + DataObject* object); +static void data_collection_marker_impl_real_unmark (Marker* base, + DataObject* object); +static gboolean data_collection_marker_impl_real_toggle (Marker* base, + DataObject* object); +static void data_collection_marker_impl_real_mark_many (Marker* base, + GeeCollection* list); +static void data_collection_marker_impl_real_unmark_many (Marker* base, + GeeCollection* list); static void data_collection_marker_impl_real_mark_all (Marker* base); static gint data_collection_marker_impl_real_get_count (Marker* base); static GeeCollection* data_collection_marker_impl_real_get_all (Marker* base); @@ -365,258 +519,287 @@ static void data_collection_marker_impl_finalize (GObject * obj); static void data_collection_finalize (DataCollection * obj); -static GValue* _g_value_dup (GValue* self) { +static GValue* +_g_value_dup (GValue* self) +{ #line 109 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return g_boxed_copy (G_TYPE_VALUE, self); -#line 372 "DataCollection.c" +#line 528 "DataCollection.c" } -static void _vala_GValue_free (GValue* self) { +static void +_vala_GValue_free (GValue* self) +{ #line 109 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_value_unset (self); #line 109 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_free (self); -#line 381 "DataCollection.c" +#line 539 "DataCollection.c" } -DataCollection* data_collection_construct (GType object_type, const gchar* name) { +DataCollection* +data_collection_construct (GType object_type, + const gchar* name) +{ DataCollection* self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; #line 157 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (name != NULL, NULL); #line 157 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = (DataCollection*) g_type_create_instance (object_type); #line 158 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = name; -#line 158 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (name); #line 158 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_free0 (self->priv->name); #line 158 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - self->priv->name = _tmp1_; + self->priv->name = _tmp0_; #line 157 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return self; -#line 403 "DataCollection.c" +#line 561 "DataCollection.c" } -DataCollection* data_collection_new (const gchar* name) { +DataCollection* +data_collection_new (const gchar* name) +{ #line 157 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return data_collection_construct (TYPE_DATA_COLLECTION, name); -#line 410 "DataCollection.c" +#line 570 "DataCollection.c" } -static gchar* data_collection_real_to_string (DataCollection* self) { +static gchar* +data_collection_real_to_string (DataCollection* self) +{ gchar* result = NULL; const gchar* _tmp0_; - gint _tmp1_; - gchar* _tmp2_; + gchar* _tmp1_; #line 168 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->name; #line 168 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = data_collection_get_count (self); -#line 168 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = g_strdup_printf ("%s (%d)", _tmp0_, _tmp1_); + _tmp1_ = g_strdup_printf ("%s (%d)", _tmp0_, data_collection_get_count (self)); #line 168 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - result = _tmp2_; + result = _tmp1_; #line 168 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 429 "DataCollection.c" +#line 588 "DataCollection.c" } -gchar* data_collection_to_string (DataCollection* self) { +gchar* +data_collection_to_string (DataCollection* self) +{ #line 167 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL); #line 167 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return DATA_COLLECTION_GET_CLASS (self)->to_string (self); -#line 438 "DataCollection.c" +#line 599 "DataCollection.c" } -static void data_collection_real_notify_items_added (DataCollection* self, GeeIterable* added) { - GeeIterable* _tmp0_; +static void +data_collection_real_notify_items_added (DataCollection* self, + GeeIterable* added) +{ #line 172 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (added)); #line 173 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = added; -#line 173 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_ADDED_SIGNAL], 0, _tmp0_); -#line 450 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_ADDED_SIGNAL], 0, added); +#line 611 "DataCollection.c" } -void data_collection_notify_items_added (DataCollection* self, GeeIterable* added) { +void +data_collection_notify_items_added (DataCollection* self, + GeeIterable* added) +{ #line 172 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 172 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->notify_items_added (self, added); -#line 459 "DataCollection.c" +#line 623 "DataCollection.c" } -static void data_collection_real_notify_items_removed (DataCollection* self, GeeIterable* removed) { - GeeIterable* _tmp0_; +static void +data_collection_real_notify_items_removed (DataCollection* self, + GeeIterable* removed) +{ #line 176 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); #line 177 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = removed; -#line 177 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_REMOVED_SIGNAL], 0, _tmp0_); -#line 471 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_REMOVED_SIGNAL], 0, removed); +#line 635 "DataCollection.c" } -void data_collection_notify_items_removed (DataCollection* self, GeeIterable* removed) { +void +data_collection_notify_items_removed (DataCollection* self, + GeeIterable* removed) +{ #line 176 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 176 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->notify_items_removed (self, removed); -#line 480 "DataCollection.c" +#line 647 "DataCollection.c" } -static void data_collection_real_notify_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed) { - GeeIterable* _tmp0_; - GeeIterable* _tmp1_; +static void +data_collection_real_notify_contents_altered (DataCollection* self, + GeeIterable* added, + GeeIterable* removed) +{ #line 180 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added)); #line 180 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); #line 182 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = added; -#line 182 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = removed; -#line 182 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_emit (self, data_collection_signals[DATA_COLLECTION_CONTENTS_ALTERED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 497 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_CONTENTS_ALTERED_SIGNAL], 0, added, removed); +#line 662 "DataCollection.c" } -void data_collection_notify_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed) { +void +data_collection_notify_contents_altered (DataCollection* self, + GeeIterable* added, + GeeIterable* removed) +{ #line 180 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 180 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->notify_contents_altered (self, added, removed); -#line 506 "DataCollection.c" +#line 675 "DataCollection.c" } -static void data_collection_real_notify_items_altered (DataCollection* self, GeeMap* items) { - GeeMap* _tmp0_; +static void +data_collection_real_notify_items_altered (DataCollection* self, + GeeMap* items) +{ #line 185 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (GEE_IS_MAP (items)); #line 186 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = items; -#line 186 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_ALTERED_SIGNAL], 0, _tmp0_); -#line 518 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_ALTERED_SIGNAL], 0, items); +#line 687 "DataCollection.c" } -void data_collection_notify_items_altered (DataCollection* self, GeeMap* items) { +void +data_collection_notify_items_altered (DataCollection* self, + GeeMap* items) +{ #line 185 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 185 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->notify_items_altered (self, items); -#line 527 "DataCollection.c" +#line 699 "DataCollection.c" } -static void data_collection_real_notify_ordering_changed (DataCollection* self) { +static void +data_collection_real_notify_ordering_changed (DataCollection* self) +{ #line 190 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ORDERING_CHANGED_SIGNAL], 0); -#line 534 "DataCollection.c" +#line 708 "DataCollection.c" } -void data_collection_notify_ordering_changed (DataCollection* self) { +void +data_collection_notify_ordering_changed (DataCollection* self) +{ #line 189 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 189 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->notify_ordering_changed (self); -#line 543 "DataCollection.c" +#line 719 "DataCollection.c" } -static void data_collection_real_notify_property_set (DataCollection* self, const gchar* name, GValue* old, GValue* val) { - const gchar* _tmp0_; - GValue* _tmp1_; - GValue _tmp2_; +static void +data_collection_real_notify_property_set (DataCollection* self, + const gchar* name, + GValue* old, + GValue* val) +{ + GValue _tmp0_; #line 193 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (name != NULL); #line 193 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (val != NULL); #line 194 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = name; -#line 194 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = old; -#line 194 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = *val; + _tmp0_ = *val; #line 194 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_emit (self, data_collection_signals[DATA_COLLECTION_PROPERTY_SET_SIGNAL], 0, _tmp0_, _tmp1_, &_tmp2_); -#line 563 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_PROPERTY_SET_SIGNAL], 0, name, old, &_tmp0_); +#line 738 "DataCollection.c" } -void data_collection_notify_property_set (DataCollection* self, const gchar* name, GValue* old, GValue* val) { +void +data_collection_notify_property_set (DataCollection* self, + const gchar* name, + GValue* old, + GValue* val) +{ #line 193 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 193 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->notify_property_set (self, name, old, val); -#line 572 "DataCollection.c" +#line 752 "DataCollection.c" } -static void data_collection_real_notify_property_cleared (DataCollection* self, const gchar* name) { - const gchar* _tmp0_; +static void +data_collection_real_notify_property_cleared (DataCollection* self, + const gchar* name) +{ #line 197 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (name != NULL); #line 198 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = name; -#line 198 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_emit (self, data_collection_signals[DATA_COLLECTION_PROPERTY_CLEARED_SIGNAL], 0, _tmp0_); -#line 584 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_PROPERTY_CLEARED_SIGNAL], 0, name); +#line 764 "DataCollection.c" } -void data_collection_notify_property_cleared (DataCollection* self, const gchar* name) { +void +data_collection_notify_property_cleared (DataCollection* self, + const gchar* name) +{ #line 197 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 197 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->notify_property_cleared (self, name); -#line 593 "DataCollection.c" +#line 776 "DataCollection.c" } -GeeCollection* data_collection_get_singleton (DataObject* object) { +GeeCollection* +data_collection_get_singleton (DataObject* object) +{ GeeCollection* result = NULL; - DataObject* _tmp0_; - SingletonCollection* _tmp1_; + SingletonCollection* _tmp0_; #line 206 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), NULL); #line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = object; + _tmp0_ = singleton_collection_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, object); #line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = singleton_collection_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_); -#line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 611 "DataCollection.c" +#line 793 "DataCollection.c" } -GeeMap* data_collection_get_alteration_singleton (DataObject* object, Alteration* alteration) { +GeeMap* +data_collection_get_alteration_singleton (DataObject* object, + Alteration* alteration) +{ GeeMap* result = NULL; GeeMap* map = NULL; GeeHashMap* _tmp0_; - DataObject* _tmp1_; - Alteration* _tmp2_; #line 210 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), NULL); #line 210 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -626,20 +809,19 @@ GeeMap* data_collection_get_alteration_singleton (DataObject* object, Alteration #line 212 "/home/jens/Source/shotwell/src/core/DataCollection.vala" map = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap); #line 213 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = object; -#line 213 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = alteration; -#line 213 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_map_set (map, _tmp1_, _tmp2_); + gee_map_set (map, object, alteration); #line 215 "/home/jens/Source/shotwell/src/core/DataCollection.vala" result = map; #line 215 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 639 "DataCollection.c" +#line 818 "DataCollection.c" } -static gboolean data_collection_real_valid_type (DataCollection* self, DataObject* object) { +static gboolean +data_collection_real_valid_type (DataCollection* self, + DataObject* object) +{ gboolean result = FALSE; #line 218 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); @@ -647,20 +829,26 @@ static gboolean data_collection_real_valid_type (DataCollection* self, DataObjec result = TRUE; #line 219 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 651 "DataCollection.c" +#line 833 "DataCollection.c" } -gboolean data_collection_valid_type (DataCollection* self, DataObject* object) { +gboolean +data_collection_valid_type (DataCollection* self, + DataObject* object) +{ #line 218 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), FALSE); #line 218 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return DATA_COLLECTION_GET_CLASS (self)->valid_type (self, object); -#line 660 "DataCollection.c" +#line 845 "DataCollection.c" } -Comparator data_collection_get_comparator (DataCollection* self, void** result_target) { +Comparator +data_collection_get_comparator (DataCollection* self, + void** result_target) +{ Comparator result = NULL; DataSet* _tmp0_; void* _tmp1_; @@ -683,11 +871,14 @@ Comparator data_collection_get_comparator (DataCollection* self, void** result_t result = _tmp3_; #line 223 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 687 "DataCollection.c" +#line 875 "DataCollection.c" } -ComparatorPredicate data_collection_get_comparator_predicate (DataCollection* self, void** result_target) { +ComparatorPredicate +data_collection_get_comparator_predicate (DataCollection* self, + void** result_target) +{ ComparatorPredicate result = NULL; DataSet* _tmp0_; void* _tmp1_; @@ -710,44 +901,46 @@ ComparatorPredicate data_collection_get_comparator_predicate (DataCollection* se result = _tmp3_; #line 227 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 714 "DataCollection.c" +#line 905 "DataCollection.c" } -static void data_collection_real_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target) { +static void +data_collection_real_set_comparator (DataCollection* self, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target) +{ DataSet* _tmp0_; - Comparator _tmp1_; - void* _tmp1__target; - ComparatorPredicate _tmp2_; - void* _tmp2__target; #line 231 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->dataset; #line 231 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = comparator; -#line 231 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1__target = comparator_target; -#line 231 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = predicate; -#line 231 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2__target = predicate_target; -#line 231 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_set_set_comparator (_tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp2__target); + data_set_set_comparator (_tmp0_, comparator, comparator_target, predicate, predicate_target); #line 232 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_notify_ordering_changed (self); -#line 738 "DataCollection.c" +#line 923 "DataCollection.c" } -void data_collection_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target) { +void +data_collection_set_comparator (DataCollection* self, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target) +{ #line 230 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 230 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->set_comparator (self, comparator, comparator_target, predicate, predicate_target); -#line 747 "DataCollection.c" +#line 938 "DataCollection.c" } -static void data_collection_real_reset_comparator (DataCollection* self) { +static void +data_collection_real_reset_comparator (DataCollection* self) +{ DataSet* _tmp0_; #line 237 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->dataset; @@ -755,20 +948,24 @@ static void data_collection_real_reset_comparator (DataCollection* self) { data_set_reset_comparator (_tmp0_); #line 238 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_notify_ordering_changed (self); -#line 759 "DataCollection.c" +#line 952 "DataCollection.c" } -void data_collection_reset_comparator (DataCollection* self) { +void +data_collection_reset_comparator (DataCollection* self) +{ #line 236 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 236 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->reset_comparator (self); -#line 768 "DataCollection.c" +#line 963 "DataCollection.c" } -static GeeCollection* data_collection_real_get_all (DataCollection* self) { +static GeeCollection* +data_collection_real_get_all (DataCollection* self) +{ GeeCollection* result = NULL; DataSet* _tmp0_; GeeList* _tmp1_; @@ -780,20 +977,24 @@ static GeeCollection* data_collection_real_get_all (DataCollection* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); #line 242 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 784 "DataCollection.c" +#line 981 "DataCollection.c" } -GeeCollection* data_collection_get_all (DataCollection* self) { +GeeCollection* +data_collection_get_all (DataCollection* self) +{ #line 241 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL); #line 241 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return DATA_COLLECTION_GET_CLASS (self)->get_all (self); -#line 793 "DataCollection.c" +#line 992 "DataCollection.c" } -DataSet* data_collection_get_dataset_copy (DataCollection* self) { +DataSet* +data_collection_get_dataset_copy (DataCollection* self) +{ DataSet* result = NULL; DataSet* _tmp0_; DataSet* _tmp1_; @@ -807,128 +1008,132 @@ DataSet* data_collection_get_dataset_copy (DataCollection* self) { result = _tmp1_; #line 246 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 811 "DataCollection.c" +#line 1012 "DataCollection.c" } -static gint data_collection_real_get_count (DataCollection* self) { +static gint +data_collection_real_get_count (DataCollection* self) +{ gint result = 0; DataSet* _tmp0_; - gint _tmp1_; #line 250 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->dataset; #line 250 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = data_set_get_count (_tmp0_); -#line 250 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - result = _tmp1_; + result = data_set_get_count (_tmp0_); #line 250 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 827 "DataCollection.c" +#line 1027 "DataCollection.c" } -gint data_collection_get_count (DataCollection* self) { +gint +data_collection_get_count (DataCollection* self) +{ #line 249 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), 0); #line 249 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return DATA_COLLECTION_GET_CLASS (self)->get_count (self); -#line 836 "DataCollection.c" +#line 1038 "DataCollection.c" } -static DataObject* data_collection_real_get_at (DataCollection* self, gint index) { +static DataObject* +data_collection_real_get_at (DataCollection* self, + gint index) +{ DataObject* result = NULL; DataSet* _tmp0_; - gint _tmp1_; - DataObject* _tmp2_; + DataObject* _tmp1_; #line 254 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->dataset; #line 254 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = index; + _tmp1_ = data_set_get_at (_tmp0_, index); #line 254 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = data_set_get_at (_tmp0_, _tmp1_); -#line 254 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - result = _tmp2_; + result = _tmp1_; #line 254 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 855 "DataCollection.c" +#line 1057 "DataCollection.c" } -DataObject* data_collection_get_at (DataCollection* self, gint index) { +DataObject* +data_collection_get_at (DataCollection* self, + gint index) +{ #line 253 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL); #line 253 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return DATA_COLLECTION_GET_CLASS (self)->get_at (self, index); -#line 864 "DataCollection.c" +#line 1069 "DataCollection.c" } -static gint data_collection_real_index_of (DataCollection* self, DataObject* object) { +static gint +data_collection_real_index_of (DataCollection* self, + DataObject* object) +{ gint result = 0; DataSet* _tmp0_; - DataObject* _tmp1_; - gint _tmp2_; #line 257 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), 0); #line 258 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->dataset; #line 258 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = object; -#line 258 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = data_set_index_of (_tmp0_, _tmp1_); -#line 258 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - result = _tmp2_; + result = data_set_index_of (_tmp0_, object); #line 258 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 885 "DataCollection.c" +#line 1087 "DataCollection.c" } -gint data_collection_index_of (DataCollection* self, DataObject* object) { +gint +data_collection_index_of (DataCollection* self, + DataObject* object) +{ #line 257 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), 0); #line 257 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return DATA_COLLECTION_GET_CLASS (self)->index_of (self, object); -#line 894 "DataCollection.c" +#line 1099 "DataCollection.c" } -static gboolean data_collection_real_contains (DataCollection* self, DataObject* object) { +static gboolean +data_collection_real_contains (DataCollection* self, + DataObject* object) +{ gboolean result = FALSE; - DataObject* _tmp0_; - gboolean _tmp1_; #line 261 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 262 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = object; -#line 262 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = data_collection_internal_contains (self, _tmp0_); -#line 262 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - result = _tmp1_; + result = data_collection_internal_contains (self, object); #line 262 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 912 "DataCollection.c" +#line 1114 "DataCollection.c" } -gboolean data_collection_contains (DataCollection* self, DataObject* object) { +gboolean +data_collection_contains (DataCollection* self, + DataObject* object) +{ #line 261 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), FALSE); #line 261 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return DATA_COLLECTION_GET_CLASS (self)->contains (self, object); -#line 921 "DataCollection.c" +#line 1126 "DataCollection.c" } -static gboolean data_collection_internal_contains (DataCollection* self, DataObject* object) { +static gboolean +data_collection_internal_contains (DataCollection* self, + DataObject* object) +{ gboolean result = FALSE; DataSet* _tmp0_; - DataObject* _tmp1_; - gboolean _tmp2_; - DataObject* _tmp3_; - DataCollection* _tmp4_; - DataCollection* _tmp5_; + DataCollection* _tmp1_; + DataCollection* _tmp2_; #line 267 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), FALSE); #line 267 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -936,215 +1141,175 @@ static gboolean data_collection_internal_contains (DataCollection* self, DataObj #line 268 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->dataset; #line 268 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = object; -#line 268 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = data_set_contains (_tmp0_, _tmp1_); -#line 268 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp2_) { + if (!data_set_contains (_tmp0_, object)) { #line 269 "/home/jens/Source/shotwell/src/core/DataCollection.vala" result = FALSE; #line 269 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 949 "DataCollection.c" +#line 1150 "DataCollection.c" } #line 271 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = object; -#line 271 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = data_object_get_membership (_tmp3_); + _tmp1_ = data_object_get_membership (object); #line 271 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 271 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp5_ == self, "object.get_membership() == this"); + _vala_assert (_tmp2_ == self, "object.get_membership() == this"); #line 271 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp2_); #line 273 "/home/jens/Source/shotwell/src/core/DataCollection.vala" result = TRUE; #line 273 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 965 "DataCollection.c" +#line 1164 "DataCollection.c" } -static void data_collection_internal_add (DataCollection* self, DataObject* object) { - DataObject* _tmp0_; - gboolean _tmp1_; - DataObject* _tmp2_; - gint64 _tmp3_; +static void +data_collection_internal_add (DataCollection* self, + DataObject* object) +{ + gint64 _tmp0_; gboolean added = FALSE; - DataSet* _tmp4_; - DataObject* _tmp5_; - gboolean _tmp6_; + DataSet* _tmp1_; #line 276 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 276 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_OBJECT (object)); #line 277 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = object; -#line 277 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = data_collection_valid_type (self, _tmp0_); -#line 277 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp1_, "valid_type(object)"); + _vala_assert (data_collection_valid_type (self, object), "valid_type(object)"); #line 279 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = object; + _tmp0_ = self->priv->object_ordinal_generator; #line 279 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = self->priv->object_ordinal_generator; + self->priv->object_ordinal_generator = _tmp0_ + 1; #line 279 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - self->priv->object_ordinal_generator = _tmp3_ + 1; -#line 279 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_object_internal_set_membership (_tmp2_, self, _tmp3_); -#line 281 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = self->priv->dataset; + data_object_internal_set_membership (object, self, _tmp0_); #line 281 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = object; + _tmp1_ = self->priv->dataset; #line 281 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = data_set_add (_tmp4_, _tmp5_); -#line 281 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - added = _tmp6_; + added = data_set_add (_tmp1_, object); #line 282 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _vala_assert (added, "added"); -#line 1006 "DataCollection.c" +#line 1193 "DataCollection.c" } -static void data_collection_internal_add_many (DataCollection* self, GeeList* objects, ProgressMonitor monitor, void* monitor_target) { +static void +data_collection_internal_add_many (DataCollection* self, + GeeList* objects, + ProgressMonitor monitor, + void* monitor_target) +{ gint count = 0; - GeeList* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; gboolean added = FALSE; - DataSet* _tmp18_; - GeeList* _tmp19_; - gboolean _tmp20_; + DataSet* _tmp13_; #line 285 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 285 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (GEE_IS_LIST (objects)); #line 286 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = objects; + _tmp0_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (objects, GEE_TYPE_COLLECTION, GeeCollection)); #line 286 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp1_ = _tmp0_; #line 286 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = _tmp1_; -#line 286 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - count = _tmp2_; -#line 1031 "DataCollection.c" + count = _tmp1_; +#line 1218 "DataCollection.c" { gint ctr = 0; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" ctr = 0; -#line 1036 "DataCollection.c" +#line 1223 "DataCollection.c" { - gboolean _tmp3_ = FALSE; + gboolean _tmp2_ = FALSE; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = TRUE; + _tmp2_ = TRUE; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 1043 "DataCollection.c" +#line 1230 "DataCollection.c" + gint _tmp4_; gint _tmp5_; - gint _tmp6_; DataObject* object = NULL; - GeeList* _tmp7_; - gint _tmp8_; - gpointer _tmp9_; - DataObject* _tmp10_; - gboolean _tmp11_; - DataObject* _tmp12_; - gint64 _tmp13_; - ProgressMonitor _tmp14_; - void* _tmp14__target; + gint _tmp6_; + gpointer _tmp7_; + DataObject* _tmp8_; + DataObject* _tmp9_; + gint64 _tmp10_; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp3_) { -#line 1058 "DataCollection.c" - gint _tmp4_; + if (!_tmp2_) { +#line 1241 "DataCollection.c" + gint _tmp3_; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = ctr; + _tmp3_ = ctr; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ctr = _tmp4_ + 1; -#line 1064 "DataCollection.c" + ctr = _tmp3_ + 1; +#line 1247 "DataCollection.c" } #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = FALSE; + _tmp2_ = FALSE; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = ctr; + _tmp4_ = ctr; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = count; + _tmp5_ = count; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!(_tmp5_ < _tmp6_)) { + if (!(_tmp4_ < _tmp5_)) { #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1076 "DataCollection.c" +#line 1259 "DataCollection.c" } #line 288 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = objects; + _tmp6_ = ctr; #line 288 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = ctr; -#line 288 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = gee_list_get (_tmp7_, _tmp8_); + _tmp7_ = gee_list_get (objects, _tmp6_); #line 288 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = (DataObject*) _tmp9_; -#line 289 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = object; + object = (DataObject*) _tmp7_; #line 289 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp11_ = data_collection_valid_type (self, _tmp10_); + _tmp8_ = object; #line 289 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp11_, "valid_type(object)"); + _vala_assert (data_collection_valid_type (self, _tmp8_), "valid_type(object)"); #line 291 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp12_ = object; + _tmp9_ = object; #line 291 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp13_ = self->priv->object_ordinal_generator; + _tmp10_ = self->priv->object_ordinal_generator; #line 291 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - self->priv->object_ordinal_generator = _tmp13_ + 1; + self->priv->object_ordinal_generator = _tmp10_ + 1; #line 291 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_object_internal_set_membership (_tmp12_, self, _tmp13_); -#line 293 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp14_ = monitor; + data_object_internal_set_membership (_tmp9_, self, _tmp10_); #line 293 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp14__target = monitor_target; -#line 293 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp14_ != NULL) { -#line 1106 "DataCollection.c" - ProgressMonitor _tmp15_; - void* _tmp15__target; - gint _tmp16_; - gint _tmp17_; -#line 294 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp15_ = monitor; + if (monitor != NULL) { +#line 1281 "DataCollection.c" + gint _tmp11_; + gint _tmp12_; #line 294 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp15__target = monitor_target; + _tmp11_ = ctr; #line 294 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp16_ = ctr; + _tmp12_ = count; #line 294 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp17_ = count; -#line 294 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp15_ ((guint64) _tmp16_, (guint64) _tmp17_, TRUE, _tmp15__target); -#line 1121 "DataCollection.c" + monitor ((guint64) _tmp11_, (guint64) _tmp12_, TRUE, monitor_target); +#line 1290 "DataCollection.c" } #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 1125 "DataCollection.c" +#line 1294 "DataCollection.c" } } } #line 297 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp18_ = self->priv->dataset; -#line 297 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp19_ = objects; -#line 297 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp20_ = data_set_add_many (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp13_ = self->priv->dataset; #line 297 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - added = _tmp20_; + added = data_set_add_many (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (objects, GEE_TYPE_COLLECTION, GeeCollection)); #line 298 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _vala_assert (added, "added"); -#line 1139 "DataCollection.c" +#line 1304 "DataCollection.c" } -static void data_collection_internal_remove (DataCollection* self, DataObject* object) { +static void +data_collection_internal_remove (DataCollection* self, + DataObject* object) +{ gboolean removed = FALSE; DataSet* _tmp0_; - DataObject* _tmp1_; - gboolean _tmp2_; - DataObject* _tmp3_; #line 301 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 301 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1152,304 +1317,276 @@ static void data_collection_internal_remove (DataCollection* self, DataObject* o #line 302 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->dataset; #line 302 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = object; -#line 302 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = data_set_remove (_tmp0_, _tmp1_); -#line 302 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - removed = _tmp2_; + removed = data_set_remove (_tmp0_, object); #line 303 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _vala_assert (removed, "removed"); #line 305 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = object; -#line 305 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_object_internal_clear_membership (_tmp3_); -#line 1167 "DataCollection.c" + data_object_internal_clear_membership (object); +#line 1326 "DataCollection.c" } -static gboolean data_collection_real_add (DataCollection* self, DataObject* object) { +static gboolean +data_collection_real_add (DataCollection* self, + DataObject* object) +{ gboolean result = FALSE; - DataObject* _tmp0_; - gboolean _tmp1_; - DataObject* _tmp7_; GeeCollection* added = NULL; - DataObject* _tmp8_; - GeeCollection* _tmp9_; - GeeCollection* _tmp10_; - GeeCollection* _tmp11_; - DataObject* _tmp12_; + GeeCollection* _tmp4_; + GeeCollection* _tmp5_; + GeeCollection* _tmp6_; #line 309 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 310 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = object; -#line 310 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = data_collection_internal_contains (self, _tmp0_); -#line 310 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp1_) { -#line 1190 "DataCollection.c" + if (data_collection_internal_contains (self, object)) { +#line 1343 "DataCollection.c" + gchar* _tmp0_; + gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - DataObject* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; -#line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = data_collection_to_string (self); -#line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = _tmp2_; #line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = object; + _tmp0_ = data_collection_to_string (self); #line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = data_object_to_string (_tmp4_); + _tmp1_ = _tmp0_; #line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = _tmp5_; + _tmp2_ = data_object_to_string (object); #line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_debug ("DataCollection.vala:311: %s cannot add %s: already present", _tmp3_, _tmp6_); + _tmp3_ = _tmp2_; #line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _g_free0 (_tmp6_); + g_debug ("DataCollection.vala:311: %s cannot add %s: already present", _tmp1_, _tmp3_); #line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_free0 (_tmp3_); +#line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala" + _g_free0 (_tmp1_); #line 313 "/home/jens/Source/shotwell/src/core/DataCollection.vala" result = FALSE; #line 313 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 1216 "DataCollection.c" +#line 1366 "DataCollection.c" } #line 316 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = object; -#line 316 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_internal_add (self, _tmp7_); + data_collection_internal_add (self, object); #line 319 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = object; + _tmp4_ = data_collection_get_singleton (object); #line 319 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = data_collection_get_singleton (_tmp8_); -#line 319 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - added = _tmp9_; + added = _tmp4_; #line 320 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = added; + _tmp5_ = added; #line 320 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); + data_collection_notify_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); #line 321 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp11_ = added; + _tmp6_ = added; #line 321 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_contents_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable), NULL); -#line 324 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp12_ = object; + data_collection_notify_contents_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable), NULL); #line 324 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_object_notify_membership_changed (_tmp12_, self); + data_object_notify_membership_changed (object, self); #line 326 "/home/jens/Source/shotwell/src/core/DataCollection.vala" result = TRUE; #line 326 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (added); #line 326 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 1246 "DataCollection.c" +#line 1390 "DataCollection.c" } -gboolean data_collection_add (DataCollection* self, DataObject* object) { +gboolean +data_collection_add (DataCollection* self, + DataObject* object) +{ #line 309 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), FALSE); #line 309 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return DATA_COLLECTION_GET_CLASS (self)->add (self, object); -#line 1255 "DataCollection.c" +#line 1402 "DataCollection.c" } -static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target) { +static GeeCollection* +data_collection_real_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target) +{ GeeCollection* result = NULL; GeeArrayList* added = NULL; GeeArrayList* _tmp0_; gint count = 0; - GeeArrayList* _tmp16_; - gint _tmp17_; - gint _tmp18_; - gint _tmp19_; - GeeArrayList* _tmp20_; - ProgressMonitor _tmp21_; - void* _tmp21__target; - GeeArrayList* _tmp22_; - GeeArrayList* _tmp23_; + GeeArrayList* _tmp13_; + gint _tmp14_; + gint _tmp15_; + gint _tmp16_; + GeeArrayList* _tmp17_; + GeeArrayList* _tmp18_; + GeeArrayList* _tmp19_; #line 330 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (GEE_IS_COLLECTION (objects), NULL); #line 332 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 332 "/home/jens/Source/shotwell/src/core/DataCollection.vala" added = _tmp0_; -#line 1279 "DataCollection.c" +#line 1429 "DataCollection.c" { GeeIterator* _object_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; -#line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = objects; + GeeIterator* _tmp1_; #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (objects, GEE_TYPE_ITERABLE, GeeIterable)); #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _object_it = _tmp2_; + _object_it = _tmp1_; #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 1292 "DataCollection.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 1439 "DataCollection.c" + GeeIterator* _tmp2_; DataObject* object = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - DataObject* _tmp7_; - gboolean _tmp8_; - GeeArrayList* _tmp14_; - DataObject* _tmp15_; -#line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = _object_it; + GeeIterator* _tmp3_; + gpointer _tmp4_; + DataObject* _tmp5_; + GeeArrayList* _tmp11_; + DataObject* _tmp12_; #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _object_it; #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1310 "DataCollection.c" +#line 1453 "DataCollection.c" } #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = _object_it; + _tmp3_ = _object_it; #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = (DataObject*) _tmp6_; -#line 334 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = object; + object = (DataObject*) _tmp4_; #line 334 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = data_collection_internal_contains (self, _tmp7_); + _tmp5_ = object; #line 334 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp8_) { -#line 1324 "DataCollection.c" + if (data_collection_internal_contains (self, _tmp5_)) { +#line 1465 "DataCollection.c" + gchar* _tmp6_; + gchar* _tmp7_; + DataObject* _tmp8_; gchar* _tmp9_; gchar* _tmp10_; - DataObject* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; #line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = data_collection_to_string (self); + _tmp6_ = data_collection_to_string (self); #line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = _tmp9_; -#line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp11_ = object; + _tmp7_ = _tmp6_; #line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp12_ = data_object_to_string (_tmp11_); + _tmp8_ = object; #line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp13_ = _tmp12_; + _tmp9_ = data_object_to_string (_tmp8_); #line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_debug ("DataCollection.vala:335: %s cannot add %s: already present", _tmp10_, _tmp13_); + _tmp10_ = _tmp9_; #line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _g_free0 (_tmp13_); + g_debug ("DataCollection.vala:335: %s cannot add %s: already present", _tmp7_, _tmp10_); #line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_free0 (_tmp10_); +#line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala" + _g_free0 (_tmp7_); #line 337 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); #line 337 "/home/jens/Source/shotwell/src/core/DataCollection.vala" continue; -#line 1350 "DataCollection.c" +#line 1491 "DataCollection.c" } #line 340 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp14_ = added; + _tmp11_ = added; #line 340 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp15_ = object; + _tmp12_ = object; #line 340 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp12_); #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 1360 "DataCollection.c" +#line 1501 "DataCollection.c" } #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 1364 "DataCollection.c" +#line 1505 "DataCollection.c" } #line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp16_ = added; + _tmp13_ = added; #line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp14_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp18_ = _tmp17_; + _tmp15_ = _tmp14_; #line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - count = _tmp18_; + count = _tmp15_; #line 344 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp19_ = count; + _tmp16_ = count; #line 344 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp19_ == 0) { + if (_tmp16_ == 0) { #line 345 "/home/jens/Source/shotwell/src/core/DataCollection.vala" result = G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_COLLECTION, GeeCollection); #line 345 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 1382 "DataCollection.c" +#line 1523 "DataCollection.c" } #line 347 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp20_ = added; -#line 347 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp21_ = monitor; + _tmp17_ = added; #line 347 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp21__target = monitor_target; -#line 347 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_internal_add_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_LIST, GeeList), _tmp21_, _tmp21__target); + data_collection_internal_add_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_LIST, GeeList), monitor, monitor_target); #line 350 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp22_ = added; + _tmp18_ = added; #line 350 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ITERABLE, GeeIterable)); + data_collection_notify_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable)); #line 351 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp23_ = added; + _tmp19_ = added; #line 351 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_contents_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable), NULL); -#line 1400 "DataCollection.c" + data_collection_notify_contents_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable), NULL); +#line 1537 "DataCollection.c" { gint ctr = 0; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" ctr = 0; -#line 1405 "DataCollection.c" +#line 1542 "DataCollection.c" { - gboolean _tmp24_ = FALSE; + gboolean _tmp20_ = FALSE; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp24_ = TRUE; + _tmp20_ = TRUE; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 1412 "DataCollection.c" - gint _tmp26_; - gint _tmp27_; - GeeArrayList* _tmp28_; - gint _tmp29_; - gpointer _tmp30_; - DataObject* _tmp31_; +#line 1549 "DataCollection.c" + gint _tmp22_; + gint _tmp23_; + GeeArrayList* _tmp24_; + gint _tmp25_; + gpointer _tmp26_; + DataObject* _tmp27_; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp24_) { -#line 1421 "DataCollection.c" - gint _tmp25_; + if (!_tmp20_) { +#line 1558 "DataCollection.c" + gint _tmp21_; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp25_ = ctr; + _tmp21_ = ctr; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ctr = _tmp25_ + 1; -#line 1427 "DataCollection.c" + ctr = _tmp21_ + 1; +#line 1564 "DataCollection.c" } #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp24_ = FALSE; + _tmp20_ = FALSE; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp26_ = ctr; + _tmp22_ = ctr; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp27_ = count; + _tmp23_ = count; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!(_tmp26_ < _tmp27_)) { + if (!(_tmp22_ < _tmp23_)) { #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1439 "DataCollection.c" +#line 1576 "DataCollection.c" } #line 355 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp28_ = added; + _tmp24_ = added; #line 355 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp29_ = ctr; + _tmp25_ = ctr; #line 355 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp30_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp29_); + _tmp26_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp25_); #line 355 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp31_ = (DataObject*) _tmp30_; + _tmp27_ = (DataObject*) _tmp26_; #line 355 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_object_notify_membership_changed (_tmp31_, self); + data_object_notify_membership_changed (_tmp27_, self); #line 355 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _g_object_unref0 (_tmp31_); -#line 1453 "DataCollection.c" + _g_object_unref0 (_tmp27_); +#line 1590 "DataCollection.c" } } } @@ -1457,20 +1594,27 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo result = G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_COLLECTION, GeeCollection); #line 357 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 1461 "DataCollection.c" +#line 1598 "DataCollection.c" } -GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target) { +GeeCollection* +data_collection_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target) +{ #line 330 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL); #line 330 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return DATA_COLLECTION_GET_CLASS (self)->add_many (self, objects, monitor, monitor_target); -#line 1470 "DataCollection.c" +#line 1612 "DataCollection.c" } -Marker* data_collection_start_marking (DataCollection* self) { +Marker* +data_collection_start_marking (DataCollection* self) +{ Marker* result = NULL; DataCollectionMarkerImpl* _tmp0_; #line 361 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1481,15 +1625,17 @@ Marker* data_collection_start_marking (DataCollection* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MARKER, Marker); #line 362 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 1485 "DataCollection.c" +#line 1629 "DataCollection.c" } -Marker* data_collection_mark (DataCollection* self, DataObject* object) { +Marker* +data_collection_mark (DataCollection* self, + DataObject* object) +{ Marker* result = NULL; Marker* marker = NULL; DataCollectionMarkerImpl* _tmp0_; - DataObject* _tmp1_; #line 366 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL); #line 366 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1499,22 +1645,22 @@ Marker* data_collection_mark (DataCollection* self, DataObject* object) { #line 367 "/home/jens/Source/shotwell/src/core/DataCollection.vala" marker = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MARKER, Marker); #line 368 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = object; -#line 368 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - marker_mark (marker, _tmp1_); + marker_mark (marker, object); #line 370 "/home/jens/Source/shotwell/src/core/DataCollection.vala" result = marker; #line 370 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 1510 "DataCollection.c" +#line 1654 "DataCollection.c" } -Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects) { +Marker* +data_collection_mark_many (DataCollection* self, + GeeCollection* objects) +{ Marker* result = NULL; Marker* marker = NULL; DataCollectionMarkerImpl* _tmp0_; - GeeCollection* _tmp1_; #line 374 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL); #line 374 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1524,38 +1670,44 @@ Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects) #line 375 "/home/jens/Source/shotwell/src/core/DataCollection.vala" marker = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MARKER, Marker); #line 376 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = objects; -#line 376 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - marker_mark_many (marker, _tmp1_); + marker_mark_many (marker, objects); #line 378 "/home/jens/Source/shotwell/src/core/DataCollection.vala" result = marker; #line 378 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 1535 "DataCollection.c" +#line 1679 "DataCollection.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 385 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return self ? g_object_ref (self) : NULL; -#line 1542 "DataCollection.c" +#line 1688 "DataCollection.c" } -void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedAction action, void* action_target, ProgressMonitor monitor, void* monitor_target, GObject* user) { +void +data_collection_act_on_marked (DataCollection* self, + Marker* m, + MarkedAction action, + void* action_target, + ProgressMonitor monitor, + void* monitor_target, + GObject* user) +{ DataCollectionMarkerImpl* marker = NULL; - Marker* _tmp0_; + DataCollectionMarkerImpl* _tmp0_; DataCollectionMarkerImpl* _tmp1_; DataCollectionMarkerImpl* _tmp2_; - gboolean _tmp3_; - DataCollectionMarkerImpl* _tmp4_; guint64 count = 0ULL; guint64 total = 0ULL; - DataCollectionMarkerImpl* _tmp5_; - GeeHashSet* _tmp6_; - gint _tmp7_; - gint _tmp8_; - DataCollectionMarkerImpl* _tmp31_; + DataCollectionMarkerImpl* _tmp3_; + GeeHashSet* _tmp4_; + gint _tmp5_; + gint _tmp6_; + DataCollectionMarkerImpl* _tmp21_; #line 383 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 383 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1563,644 +1715,598 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio #line 383 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail ((user == NULL) || G_IS_OBJECT (user)); #line 385 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = m; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (m, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl)); #line 385 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl)); -#line 385 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - marker = _tmp1_; -#line 387 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = marker; + marker = _tmp0_; #line 387 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = data_collection_marker_impl_is_valid (_tmp2_, self); + _tmp1_ = marker; #line 387 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp3_, "marker.is_valid(this)"); + _vala_assert (data_collection_marker_impl_is_valid (_tmp1_, self), "marker.is_valid(this)"); #line 390 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = marker; + _tmp2_ = marker; #line 390 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_marker_impl_freeze (_tmp4_); + data_collection_marker_impl_freeze (_tmp2_); #line 392 "/home/jens/Source/shotwell/src/core/DataCollection.vala" count = (guint64) 0; #line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = marker; + _tmp3_ = marker; #line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = _tmp5_->marked; + _tmp4_ = _tmp3_->marked; #line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - total = (guint64) _tmp8_; -#line 1594 "DataCollection.c" + total = (guint64) _tmp6_; +#line 1742 "DataCollection.c" { GeeIterator* _object_it = NULL; - DataCollectionMarkerImpl* _tmp9_; - GeeHashSet* _tmp10_; - GeeIterator* _tmp11_; + DataCollectionMarkerImpl* _tmp7_; + GeeHashSet* _tmp8_; + GeeIterator* _tmp9_; #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = marker; + _tmp7_ = marker; #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = _tmp9_->marked; + _tmp8_ = _tmp7_->marked; #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp11_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp9_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _object_it = _tmp11_; + _object_it = _tmp9_; #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 1610 "DataCollection.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 1758 "DataCollection.c" + GeeIterator* _tmp10_; DataObject* object = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; - DataObject* _tmp16_; - gboolean _tmp17_; - MarkedAction _tmp21_; - void* _tmp21__target; - DataObject* _tmp22_; - GObject* _tmp23_; - gboolean _tmp24_; - ProgressMonitor _tmp25_; - void* _tmp25__target; + GeeIterator* _tmp11_; + gpointer _tmp12_; + DataObject* _tmp13_; + DataObject* _tmp17_; #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp12_ = _object_it; -#line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp13_ = gee_iterator_next (_tmp12_); + _tmp10_ = _object_it; #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp10_)) { #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1633 "DataCollection.c" +#line 1771 "DataCollection.c" } #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp14_ = _object_it; + _tmp11_ = _object_it; #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = (DataObject*) _tmp15_; -#line 398 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp16_ = object; + object = (DataObject*) _tmp12_; #line 398 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp17_ = data_collection_internal_contains (self, _tmp16_); + _tmp13_ = object; #line 398 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp17_) { -#line 1647 "DataCollection.c" - DataObject* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; + if (!data_collection_internal_contains (self, _tmp13_)) { +#line 1783 "DataCollection.c" + DataObject* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; #line 399 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp18_ = object; + _tmp14_ = object; #line 399 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp19_ = data_object_to_string (_tmp18_); + _tmp15_ = data_object_to_string (_tmp14_); #line 399 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp20_ = _tmp19_; + _tmp16_ = _tmp15_; #line 399 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_warning ("DataCollection.vala:399: act_on_marked: marker holding ref to unknown " \ -"%s", _tmp20_); +"%s", _tmp16_); #line 399 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp16_); #line 401 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); #line 401 "/home/jens/Source/shotwell/src/core/DataCollection.vala" continue; -#line 1665 "DataCollection.c" +#line 1801 "DataCollection.c" } #line 404 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp21_ = action; -#line 404 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp21__target = action_target; -#line 404 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp22_ = object; -#line 404 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp23_ = user; -#line 404 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp24_ = _tmp21_ (_tmp22_, _tmp23_, _tmp21__target); + _tmp17_ = object; #line 404 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp24_) { + if (!action (_tmp17_, user, action_target)) { #line 405 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); #line 405 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1683 "DataCollection.c" +#line 1811 "DataCollection.c" } #line 407 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp25_ = monitor; -#line 407 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp25__target = monitor_target; -#line 407 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp25_ != NULL) { -#line 1691 "DataCollection.c" - ProgressMonitor _tmp26_; - void* _tmp26__target; - guint64 _tmp27_; - guint64 _tmp28_; - guint64 _tmp29_; - gboolean _tmp30_; -#line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp26_ = monitor; + if (monitor != NULL) { +#line 1815 "DataCollection.c" + guint64 _tmp18_; + guint64 _tmp19_; + guint64 _tmp20_; #line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp26__target = monitor_target; + _tmp18_ = count; #line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp27_ = count; + count = _tmp18_ + 1; #line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - count = _tmp27_ + 1; + _tmp19_ = count; #line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp28_ = count; + _tmp20_ = total; #line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp29_ = total; -#line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp30_ = _tmp26_ (_tmp28_, _tmp29_, TRUE, _tmp26__target); -#line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp30_) { + if (!monitor (_tmp19_, _tmp20_, TRUE, monitor_target)) { #line 409 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); #line 409 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1718 "DataCollection.c" +#line 1833 "DataCollection.c" } } #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 1723 "DataCollection.c" +#line 1838 "DataCollection.c" } #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 1727 "DataCollection.c" +#line 1842 "DataCollection.c" } #line 414 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp31_ = marker; + _tmp21_ = marker; #line 414 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_marker_impl_finished (_tmp31_); + data_collection_marker_impl_finished (_tmp21_); #line 383 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (marker); -#line 1735 "DataCollection.c" +#line 1850 "DataCollection.c" } -static void data_collection_real_remove_marked (DataCollection* self, Marker* m) { +static void +data_collection_real_remove_marked (DataCollection* self, + Marker* m) +{ DataCollectionMarkerImpl* marker = NULL; - Marker* _tmp0_; + DataCollectionMarkerImpl* _tmp0_; DataCollectionMarkerImpl* _tmp1_; DataCollectionMarkerImpl* _tmp2_; - gboolean _tmp3_; - DataCollectionMarkerImpl* _tmp4_; GeeArrayList* skipped = NULL; - GeeArrayList* _tmp22_; - DataCollectionMarkerImpl* _tmp26_; - GeeHashSet* _tmp27_; - gint _tmp28_; - gint _tmp29_; - DataCollectionMarkerImpl* _tmp42_; + GeeArrayList* _tmp18_; + DataCollectionMarkerImpl* _tmp22_; + GeeHashSet* _tmp23_; + gint _tmp24_; + gint _tmp25_; + DataCollectionMarkerImpl* _tmp37_; #line 419 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_MARKER (m)); #line 420 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = m; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (m, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl)); #line 420 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl)); -#line 420 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - marker = _tmp1_; -#line 422 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = marker; + marker = _tmp0_; #line 422 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = data_collection_marker_impl_is_valid (_tmp2_, self); + _tmp1_ = marker; #line 422 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp3_, "marker.is_valid(this)"); + _vala_assert (data_collection_marker_impl_is_valid (_tmp1_, self), "marker.is_valid(this)"); #line 425 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = marker; + _tmp2_ = marker; #line 425 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_marker_impl_freeze (_tmp4_); + data_collection_marker_impl_freeze (_tmp2_); #line 428 "/home/jens/Source/shotwell/src/core/DataCollection.vala" skipped = NULL; -#line 1773 "DataCollection.c" +#line 1885 "DataCollection.c" { GeeIterator* _object_it = NULL; - DataCollectionMarkerImpl* _tmp5_; - GeeHashSet* _tmp6_; - GeeIterator* _tmp7_; + DataCollectionMarkerImpl* _tmp3_; + GeeHashSet* _tmp4_; + GeeIterator* _tmp5_; #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = marker; + _tmp3_ = marker; #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = _tmp5_->marked; + _tmp4_ = _tmp3_->marked; #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp5_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _object_it = _tmp7_; + _object_it = _tmp5_; #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 1789 "DataCollection.c" - GeeIterator* _tmp8_; - gboolean _tmp9_; +#line 1901 "DataCollection.c" + GeeIterator* _tmp6_; DataObject* object = NULL; - GeeIterator* _tmp10_; - gpointer _tmp11_; - DataObject* _tmp12_; - gboolean _tmp13_; - DataObject* _tmp21_; -#line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = _object_it; + GeeIterator* _tmp7_; + gpointer _tmp8_; + DataObject* _tmp9_; + DataObject* _tmp17_; #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = gee_iterator_next (_tmp8_); + _tmp6_ = _object_it; #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp9_) { + if (!gee_iterator_next (_tmp6_)) { #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1806 "DataCollection.c" +#line 1914 "DataCollection.c" } #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = _object_it; + _tmp7_ = _object_it; #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp11_ = gee_iterator_get (_tmp10_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = (DataObject*) _tmp11_; -#line 431 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp12_ = object; + object = (DataObject*) _tmp8_; #line 431 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp13_ = data_collection_internal_contains (self, _tmp12_); + _tmp9_ = object; #line 431 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp13_) { -#line 1820 "DataCollection.c" - DataObject* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; - GeeArrayList* _tmp17_; - GeeArrayList* _tmp19_; - DataObject* _tmp20_; + if (!data_collection_internal_contains (self, _tmp9_)) { +#line 1926 "DataCollection.c" + DataObject* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + GeeArrayList* _tmp13_; + GeeArrayList* _tmp15_; + DataObject* _tmp16_; #line 432 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp14_ = object; + _tmp10_ = object; #line 432 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp15_ = data_object_to_string (_tmp14_); + _tmp11_ = data_object_to_string (_tmp10_); #line 432 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp16_ = _tmp15_; + _tmp12_ = _tmp11_; #line 432 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_warning ("DataCollection.vala:432: remove_marked: marker holding ref to unknown " \ -"%s", _tmp16_); +"%s", _tmp12_); #line 432 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp12_); #line 434 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp17_ = skipped; + _tmp13_ = skipped; #line 434 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp17_ == NULL) { -#line 1841 "DataCollection.c" - GeeArrayList* _tmp18_; + if (_tmp13_ == NULL) { +#line 1947 "DataCollection.c" + GeeArrayList* _tmp14_; #line 435 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp18_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp14_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 435 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (skipped); #line 435 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - skipped = _tmp18_; -#line 1849 "DataCollection.c" + skipped = _tmp14_; +#line 1955 "DataCollection.c" } #line 437 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp19_ = skipped; + _tmp15_ = skipped; #line 437 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp20_ = object; + _tmp16_ = object; #line 437 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_); #line 439 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); #line 439 "/home/jens/Source/shotwell/src/core/DataCollection.vala" continue; -#line 1861 "DataCollection.c" +#line 1967 "DataCollection.c" } #line 442 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp21_ = object; + _tmp17_ = object; #line 442 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_internal_remove (self, _tmp21_); + data_collection_internal_remove (self, _tmp17_); #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 1869 "DataCollection.c" +#line 1975 "DataCollection.c" } #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 1873 "DataCollection.c" +#line 1979 "DataCollection.c" } #line 445 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp22_ = skipped; + _tmp18_ = skipped; #line 445 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp22_ != NULL) { -#line 1879 "DataCollection.c" - DataCollectionMarkerImpl* _tmp23_; - GeeHashSet* _tmp24_; - GeeArrayList* _tmp25_; + if (_tmp18_ != NULL) { +#line 1985 "DataCollection.c" + DataCollectionMarkerImpl* _tmp19_; + GeeHashSet* _tmp20_; + GeeArrayList* _tmp21_; #line 446 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp23_ = marker; + _tmp19_ = marker; #line 446 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp24_ = _tmp23_->marked; + _tmp20_ = _tmp19_->marked; #line 446 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp25_ = skipped; + _tmp21_ = skipped; #line 446 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1891 "DataCollection.c" + gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 1997 "DataCollection.c" } #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp26_ = marker; + _tmp22_ = marker; #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp27_ = _tmp26_->marked; + _tmp23_ = _tmp22_->marked; #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp24_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp29_ = _tmp28_; + _tmp25_ = _tmp24_; #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp29_ > 0) { -#line 1903 "DataCollection.c" - DataCollectionMarkerImpl* _tmp30_; - GeeHashSet* _tmp31_; - DataCollectionMarkerImpl* _tmp32_; - GeeHashSet* _tmp33_; + if (_tmp25_ > 0) { +#line 2009 "DataCollection.c" + DataCollectionMarkerImpl* _tmp26_; + GeeHashSet* _tmp27_; + DataCollectionMarkerImpl* _tmp28_; + GeeHashSet* _tmp29_; #line 450 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp30_ = marker; + _tmp26_ = marker; #line 450 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp31_ = _tmp30_->marked; + _tmp27_ = _tmp26_->marked; #line 450 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_items_removed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ITERABLE, GeeIterable)); + data_collection_notify_items_removed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ITERABLE, GeeIterable)); #line 451 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp32_ = marker; + _tmp28_ = marker; #line 451 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp33_ = _tmp32_->marked; + _tmp29_ = _tmp28_->marked; #line 451 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1920 "DataCollection.c" + data_collection_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ITERABLE, GeeIterable)); +#line 2026 "DataCollection.c" { GeeIterator* _object_it = NULL; - DataCollectionMarkerImpl* _tmp34_; - GeeHashSet* _tmp35_; - GeeIterator* _tmp36_; + DataCollectionMarkerImpl* _tmp30_; + GeeHashSet* _tmp31_; + GeeIterator* _tmp32_; #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp34_ = marker; + _tmp30_ = marker; #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp35_ = _tmp34_->marked; + _tmp31_ = _tmp30_->marked; #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp36_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp32_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _object_it = _tmp36_; + _object_it = _tmp32_; #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 1936 "DataCollection.c" - GeeIterator* _tmp37_; - gboolean _tmp38_; +#line 2042 "DataCollection.c" + GeeIterator* _tmp33_; DataObject* object = NULL; - GeeIterator* _tmp39_; - gpointer _tmp40_; - DataObject* _tmp41_; -#line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp37_ = _object_it; + GeeIterator* _tmp34_; + gpointer _tmp35_; + DataObject* _tmp36_; #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp38_ = gee_iterator_next (_tmp37_); + _tmp33_ = _object_it; #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp38_) { + if (!gee_iterator_next (_tmp33_)) { #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1951 "DataCollection.c" +#line 2054 "DataCollection.c" } #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp39_ = _object_it; + _tmp34_ = _object_it; #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp40_ = gee_iterator_get (_tmp39_); + _tmp35_ = gee_iterator_get (_tmp34_); #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = (DataObject*) _tmp40_; + object = (DataObject*) _tmp35_; #line 455 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp41_ = object; + _tmp36_ = object; #line 455 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_object_notify_membership_changed (_tmp41_, NULL); + data_object_notify_membership_changed (_tmp36_, NULL); #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 1965 "DataCollection.c" +#line 2068 "DataCollection.c" } #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 1969 "DataCollection.c" +#line 2072 "DataCollection.c" } } #line 459 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp42_ = marker; + _tmp37_ = marker; #line 459 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_marker_impl_finished (_tmp42_); + data_collection_marker_impl_finished (_tmp37_); #line 419 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (skipped); #line 419 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (marker); -#line 1980 "DataCollection.c" +#line 2083 "DataCollection.c" } -void data_collection_remove_marked (DataCollection* self, Marker* m) { +void +data_collection_remove_marked (DataCollection* self, + Marker* m) +{ #line 419 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 419 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->remove_marked (self, m); -#line 1989 "DataCollection.c" +#line 2095 "DataCollection.c" } -static void data_collection_real_clear (DataCollection* self) { +static void +data_collection_real_clear (DataCollection* self) +{ DataSet* _tmp0_; - gint _tmp1_; GeeArrayList* removed = NULL; - GeeArrayList* _tmp2_; - GeeArrayList* _tmp12_; - GeeArrayList* _tmp13_; + GeeArrayList* _tmp1_; + GeeArrayList* _tmp10_; + GeeArrayList* _tmp11_; #line 463 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->dataset; #line 463 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = data_set_get_count (_tmp0_); -#line 463 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp1_ == 0) { + if (data_set_get_count (_tmp0_) == 0) { #line 464 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return; -#line 2008 "DataCollection.c" +#line 2113 "DataCollection.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 468 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - removed = _tmp2_; -#line 2014 "DataCollection.c" + removed = _tmp1_; +#line 2119 "DataCollection.c" { - gboolean _tmp3_ = FALSE; + gboolean _tmp2_ = FALSE; #line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = TRUE; + _tmp2_ = TRUE; #line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 2021 "DataCollection.c" +#line 2126 "DataCollection.c" DataObject* object = NULL; - DataSet* _tmp6_; - DataObject* _tmp7_; + DataSet* _tmp4_; + DataObject* _tmp5_; + DataObject* _tmp6_; + GeeArrayList* _tmp7_; DataObject* _tmp8_; - GeeArrayList* _tmp9_; - DataObject* _tmp10_; - DataObject* _tmp11_; + DataObject* _tmp9_; #line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp3_) { -#line 2031 "DataCollection.c" - DataSet* _tmp4_; - gint _tmp5_; + if (!_tmp2_) { +#line 2136 "DataCollection.c" + DataSet* _tmp3_; #line 475 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = self->priv->dataset; + _tmp3_ = self->priv->dataset; #line 475 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = data_set_get_count (_tmp4_); -#line 475 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!(_tmp5_ > 0)) { + if (!(data_set_get_count (_tmp3_) > 0)) { #line 475 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 2042 "DataCollection.c" +#line 2144 "DataCollection.c" } } #line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = FALSE; + _tmp2_ = FALSE; #line 470 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = self->priv->dataset; + _tmp4_ = self->priv->dataset; #line 470 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = data_set_get_at (_tmp6_, 0); + _tmp5_ = data_set_get_at (_tmp4_, 0); #line 470 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = _tmp7_; + object = _tmp5_; #line 471 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = object; + _tmp6_ = object; #line 471 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp8_ != NULL, "object != null"); + _vala_assert (_tmp6_ != NULL, "object != null"); #line 473 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = removed; + _tmp7_ = removed; #line 473 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = object; + _tmp8_ = object; #line 473 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_); #line 474 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp11_ = object; + _tmp9_ = object; #line 474 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_internal_remove (self, _tmp11_); + data_collection_internal_remove (self, _tmp9_); #line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 2069 "DataCollection.c" +#line 2171 "DataCollection.c" } } #line 478 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp12_ = removed; + _tmp10_ = removed; #line 478 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_items_removed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); + data_collection_notify_items_removed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); #line 479 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp13_ = removed; + _tmp11_ = removed; #line 479 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 2080 "DataCollection.c" + data_collection_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); +#line 2182 "DataCollection.c" { GeeArrayList* _object_list = NULL; - GeeArrayList* _tmp14_; - GeeArrayList* _tmp15_; + GeeArrayList* _tmp12_; + GeeArrayList* _tmp13_; gint _object_size = 0; - GeeArrayList* _tmp16_; - gint _tmp17_; - gint _tmp18_; + GeeArrayList* _tmp14_; + gint _tmp15_; + gint _tmp16_; gint _object_index = 0; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp14_ = removed; + _tmp12_ = removed; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp15_ = _g_object_ref0 (_tmp14_); + _tmp13_ = _g_object_ref0 (_tmp12_); #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _object_list = _tmp15_; + _object_list = _tmp13_; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp16_ = _object_list; + _tmp14_ = _object_list; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp15_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp18_ = _tmp17_; + _tmp16_ = _tmp15_; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _object_size = _tmp18_; + _object_size = _tmp16_; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _object_index = -1; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 2108 "DataCollection.c" +#line 2210 "DataCollection.c" + gint _tmp17_; + gint _tmp18_; gint _tmp19_; - gint _tmp20_; - gint _tmp21_; DataObject* object = NULL; - GeeArrayList* _tmp22_; - gint _tmp23_; - gpointer _tmp24_; - DataObject* _tmp25_; + GeeArrayList* _tmp20_; + gint _tmp21_; + gpointer _tmp22_; + DataObject* _tmp23_; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp19_ = _object_index; + _tmp17_ = _object_index; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _object_index = _tmp19_ + 1; + _object_index = _tmp17_ + 1; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp20_ = _object_index; + _tmp18_ = _object_index; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp21_ = _object_size; + _tmp19_ = _object_size; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!(_tmp20_ < _tmp21_)) { + if (!(_tmp18_ < _tmp19_)) { #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 2129 "DataCollection.c" +#line 2231 "DataCollection.c" } #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp22_ = _object_list; + _tmp20_ = _object_list; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp23_ = _object_index; + _tmp21_ = _object_index; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp24_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp23_); + _tmp22_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp21_); #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = (DataObject*) _tmp24_; + object = (DataObject*) _tmp22_; #line 483 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp25_ = object; + _tmp23_ = object; #line 483 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_object_notify_membership_changed (_tmp25_, NULL); + data_object_notify_membership_changed (_tmp23_, NULL); #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 2145 "DataCollection.c" +#line 2247 "DataCollection.c" } #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_list); -#line 2149 "DataCollection.c" +#line 2251 "DataCollection.c" } #line 462 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (removed); -#line 2153 "DataCollection.c" +#line 2255 "DataCollection.c" } -void data_collection_clear (DataCollection* self) { +void +data_collection_clear (DataCollection* self) +{ #line 462 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 462 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->clear (self); -#line 2162 "DataCollection.c" +#line 2266 "DataCollection.c" } -static void data_collection_real_close (DataCollection* self) { +static void +data_collection_real_close (DataCollection* self) +{ #line 493 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_clear (self); -#line 2169 "DataCollection.c" +#line 2275 "DataCollection.c" } -void data_collection_close (DataCollection* self) { +void +data_collection_close (DataCollection* self) +{ #line 492 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 492 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->close (self); -#line 2178 "DataCollection.c" +#line 2286 "DataCollection.c" } -static gpointer _alteration_ref0 (gpointer self) { +static gpointer +_alteration_ref0 (gpointer self) +{ #line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return self ? alteration_ref (self) : NULL; -#line 2185 "DataCollection.c" +#line 2295 "DataCollection.c" } -void data_collection_internal_notify_altered (DataCollection* self, DataObject* object, Alteration* alteration) { - DataObject* _tmp0_; - gboolean _tmp1_; +void +data_collection_internal_notify_altered (DataCollection* self, + DataObject* object, + Alteration* alteration) +{ gboolean resort_occurred = FALSE; - DataSet* _tmp2_; - DataObject* _tmp3_; - Alteration* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; - gboolean _tmp24_; - DataObject* _tmp25_; - Alteration* _tmp26_; - GeeMap* _tmp27_; - GeeMap* _tmp28_; + DataSet* _tmp0_; + gboolean _tmp14_; + GeeMap* _tmp15_; + GeeMap* _tmp16_; #line 498 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 498 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2208,151 +2314,125 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject* #line 498 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_ALTERATION (alteration)); #line 499 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = object; -#line 499 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = data_collection_internal_contains (self, _tmp0_); -#line 499 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp1_, "internal_contains(object)"); + _vala_assert (data_collection_internal_contains (self, object), "internal_contains(object)"); #line 501 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = self->priv->dataset; -#line 501 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = object; -#line 501 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = alteration; -#line 501 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = data_set_resort_object (_tmp2_, _tmp3_, _tmp4_); + _tmp0_ = self->priv->dataset; #line 501 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - resort_occurred = _tmp5_; -#line 503 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = data_collection_are_notifications_frozen (self); + resort_occurred = data_set_resort_object (_tmp0_, object, alteration); #line 503 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp6_) { -#line 2229 "DataCollection.c" - GeeHashMap* _tmp7_; + if (data_collection_are_notifications_frozen (self)) { +#line 2323 "DataCollection.c" + GeeHashMap* _tmp1_; Alteration* current = NULL; + GeeHashMap* _tmp3_; + gpointer _tmp4_; + Alteration* _tmp5_; GeeHashMap* _tmp9_; - DataObject* _tmp10_; - gpointer _tmp11_; - Alteration* _tmp12_; - GeeHashMap* _tmp18_; - DataObject* _tmp19_; - Alteration* _tmp20_; - gboolean _tmp21_ = FALSE; - gboolean _tmp22_; + Alteration* _tmp10_; + gboolean _tmp11_ = FALSE; + gboolean _tmp12_; #line 504 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = self->priv->frozen_items_altered; + _tmp1_ = self->priv->frozen_items_altered; #line 504 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp7_ == NULL) { -#line 2245 "DataCollection.c" - GeeHashMap* _tmp8_; + if (_tmp1_ == NULL) { +#line 2337 "DataCollection.c" + GeeHashMap* _tmp2_; #line 505 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = gee_hash_map_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_ALTERATION, (GBoxedCopyFunc) alteration_ref, (GDestroyNotify) alteration_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp2_ = gee_hash_map_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_ALTERATION, (GBoxedCopyFunc) alteration_ref, (GDestroyNotify) alteration_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 505 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (self->priv->frozen_items_altered); #line 505 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - self->priv->frozen_items_altered = _tmp8_; -#line 2253 "DataCollection.c" + self->priv->frozen_items_altered = _tmp2_; +#line 2345 "DataCollection.c" } #line 509 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = self->priv->frozen_items_altered; -#line 509 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = object; + _tmp3_ = self->priv->frozen_items_altered; #line 509 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp11_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_); + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), object); #line 509 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - current = (Alteration*) _tmp11_; + current = (Alteration*) _tmp4_; #line 510 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp12_ = current; + _tmp5_ = current; #line 510 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp12_ != NULL) { -#line 2267 "DataCollection.c" - Alteration* _tmp13_; - Alteration* _tmp14_; - Alteration* _tmp15_; + if (_tmp5_ != NULL) { +#line 2357 "DataCollection.c" + Alteration* _tmp6_; + Alteration* _tmp7_; #line 511 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp13_ = current; + _tmp6_ = current; #line 511 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp14_ = alteration; -#line 511 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp15_ = alteration_compress (_tmp13_, _tmp14_); + _tmp7_ = alteration_compress (_tmp6_, alteration); #line 511 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _alteration_unref0 (current); #line 511 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - current = _tmp15_; -#line 2281 "DataCollection.c" + current = _tmp7_; +#line 2368 "DataCollection.c" } else { - Alteration* _tmp16_; - Alteration* _tmp17_; -#line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp16_ = alteration; + Alteration* _tmp8_; #line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp17_ = _alteration_ref0 (_tmp16_); + _tmp8_ = _alteration_ref0 (alteration); #line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _alteration_unref0 (current); #line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - current = _tmp17_; -#line 2293 "DataCollection.c" + current = _tmp8_; +#line 2377 "DataCollection.c" } #line 515 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp18_ = self->priv->frozen_items_altered; -#line 515 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp19_ = object; + _tmp9_ = self->priv->frozen_items_altered; #line 515 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp20_ = current; + _tmp10_ = current; #line 515 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp19_, _tmp20_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), object, _tmp10_); #line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp22_ = self->priv->fire_ordering_changed; + _tmp12_ = self->priv->fire_ordering_changed; #line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp22_) { + if (_tmp12_) { #line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp21_ = TRUE; -#line 2309 "DataCollection.c" + _tmp11_ = TRUE; +#line 2391 "DataCollection.c" } else { - gboolean _tmp23_; + gboolean _tmp13_; #line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp23_ = resort_occurred; + _tmp13_ = resort_occurred; #line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp21_ = _tmp23_; -#line 2316 "DataCollection.c" + _tmp11_ = _tmp13_; +#line 2398 "DataCollection.c" } #line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - self->priv->fire_ordering_changed = _tmp21_; + self->priv->fire_ordering_changed = _tmp11_; #line 519 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _alteration_unref0 (current); #line 519 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return; -#line 2324 "DataCollection.c" +#line 2406 "DataCollection.c" } #line 522 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp24_ = resort_occurred; + _tmp14_ = resort_occurred; #line 522 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp24_) { + if (_tmp14_) { #line 523 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_notify_ordering_changed (self); -#line 2332 "DataCollection.c" +#line 2414 "DataCollection.c" } #line 525 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp25_ = object; -#line 525 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp26_ = alteration; + _tmp15_ = data_collection_get_alteration_singleton (object, alteration); #line 525 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp27_ = data_collection_get_alteration_singleton (_tmp25_, _tmp26_); + _tmp16_ = _tmp15_; #line 525 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp28_ = _tmp27_; + data_collection_notify_items_altered (self, _tmp16_); #line 525 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_items_altered (self, _tmp28_); -#line 525 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _g_object_unref0 (_tmp28_); -#line 2346 "DataCollection.c" + _g_object_unref0 (_tmp16_); +#line 2424 "DataCollection.c" } -GValue* data_collection_get_property (DataCollection* self, const gchar* name) { +GValue* +data_collection_get_property (DataCollection* self, + const gchar* name) +{ GValue* result = NULL; GeeHashMap* _tmp0_; - const gchar* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 528 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL); #line 528 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2360,52 +2440,58 @@ GValue* data_collection_get_property (DataCollection* self, const gchar* name) { #line 529 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->properties; #line 529 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = name; -#line 529 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name); #line 529 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - result = (GValue*) _tmp2_; + result = (GValue*) _tmp1_; #line 529 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 2369 "DataCollection.c" +#line 2447 "DataCollection.c" } -static gboolean _bool_value_equals_value_equal_func (GValue* a, GValue* b, gpointer self) { +static gboolean +_bool_value_equals_value_equal_func (GValue* a, + GValue* b, + gpointer self) +{ gboolean result; result = bool_value_equals (a, b); #line 535 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 2378 "DataCollection.c" +#line 2460 "DataCollection.c" } -static gboolean _int_value_equals_value_equal_func (GValue* a, GValue* b, gpointer self) { +static gboolean +_int_value_equals_value_equal_func (GValue* a, + GValue* b, + gpointer self) +{ gboolean result; result = int_value_equals (a, b); #line 537 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 2387 "DataCollection.c" +#line 2473 "DataCollection.c" } -void data_collection_set_property (DataCollection* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target) { - ValueEqualFunc _tmp0_; - void* _tmp0__target; +void +data_collection_set_property (DataCollection* self, + const gchar* name, + GValue* val, + ValueEqualFunc value_equals, + void* value_equals_target) +{ GValue* old = NULL; - GeeHashMap* _tmp3_; - const gchar* _tmp4_; - gpointer _tmp5_; - GValue* _tmp6_; - GeeHashMap* _tmp12_; - const gchar* _tmp13_; - GValue _tmp14_; - const gchar* _tmp15_; - GValue* _tmp16_; - GValue _tmp17_; + GeeHashMap* _tmp0_; + gpointer _tmp1_; + GValue* _tmp2_; + GeeHashMap* _tmp6_; + GValue _tmp7_; + GValue* _tmp8_; + GValue _tmp9_; gint count = 0; - DataSet* _tmp18_; - gint _tmp19_; + DataSet* _tmp10_; #line 532 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 532 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2413,182 +2499,151 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal #line 532 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (val != NULL); #line 533 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = value_equals; -#line 533 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0__target = value_equals_target; -#line 533 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp0_ == NULL) { -#line 2420 "DataCollection.c" - gboolean _tmp1_; + if (value_equals == NULL) { #line 534 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = G_VALUE_HOLDS (val, G_TYPE_BOOLEAN); -#line 534 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp1_) { + if (G_VALUE_HOLDS (val, G_TYPE_BOOLEAN)) { #line 535 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value_equals = _bool_value_equals_value_equal_func; #line 535 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value_equals_target = NULL; -#line 2430 "DataCollection.c" +#line 2508 "DataCollection.c" } else { - gboolean _tmp2_; -#line 536 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = G_VALUE_HOLDS (val, G_TYPE_INT); #line 536 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp2_) { + if (G_VALUE_HOLDS (val, G_TYPE_INT)) { #line 537 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value_equals = _int_value_equals_value_equal_func; #line 537 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value_equals_target = NULL; -#line 2441 "DataCollection.c" +#line 2516 "DataCollection.c" } else { #line 539 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_error ("DataCollection.vala:539: value_equals must be specified for this type"); -#line 2445 "DataCollection.c" +#line 2520 "DataCollection.c" } } } #line 542 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = self->priv->properties; -#line 542 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = name; + _tmp0_ = self->priv->properties; #line 542 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name); #line 542 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - old = (GValue*) _tmp5_; + old = (GValue*) _tmp1_; #line 543 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = old; + _tmp2_ = old; #line 543 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp6_ != NULL) { -#line 2461 "DataCollection.c" - ValueEqualFunc _tmp7_; - void* _tmp7__target; - GValue* _tmp8_; - GValue _tmp9_; - GValue _tmp10_; - gboolean _tmp11_; + if (_tmp2_ != NULL) { +#line 2534 "DataCollection.c" + GValue* _tmp3_; + GValue _tmp4_; + GValue _tmp5_; #line 544 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = value_equals; + _tmp3_ = old; #line 544 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7__target = value_equals_target; + _tmp4_ = *val; #line 544 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = old; + _tmp5_ = *_tmp3_; #line 544 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = *val; -#line 544 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = *_tmp8_; -#line 544 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp11_ = _tmp7_ (&_tmp10_, &_tmp9_, _tmp7__target); -#line 544 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp11_) { + if (value_equals (&_tmp5_, &_tmp4_, value_equals_target)) { #line 545 "/home/jens/Source/shotwell/src/core/DataCollection.vala" __vala_GValue_free0 (old); #line 545 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return; -#line 2486 "DataCollection.c" +#line 2550 "DataCollection.c" } } #line 548 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp12_ = self->priv->properties; + _tmp6_ = self->priv->properties; #line 548 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp13_ = name; + _tmp7_ = *val; #line 548 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp14_ = *val; -#line 548 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, &_tmp14_); -#line 550 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp15_ = name; + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name, &_tmp7_); #line 550 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp16_ = old; + _tmp8_ = old; #line 550 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp17_ = *val; + _tmp9_ = *val; #line 550 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_property_set (self, _tmp15_, _tmp16_, &_tmp17_); -#line 553 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp18_ = self->priv->dataset; + data_collection_notify_property_set (self, name, _tmp8_, &_tmp9_); #line 553 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp19_ = data_set_get_count (_tmp18_); + _tmp10_ = self->priv->dataset; #line 553 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - count = _tmp19_; -#line 2511 "DataCollection.c" + count = data_set_get_count (_tmp10_); +#line 2569 "DataCollection.c" { gint ctr = 0; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" ctr = 0; -#line 2516 "DataCollection.c" +#line 2574 "DataCollection.c" { - gboolean _tmp20_ = FALSE; + gboolean _tmp11_ = FALSE; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp20_ = TRUE; + _tmp11_ = TRUE; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 2523 "DataCollection.c" - gint _tmp22_; - gint _tmp23_; - DataSet* _tmp24_; - gint _tmp25_; - DataObject* _tmp26_; - DataObject* _tmp27_; - const gchar* _tmp28_; - GValue* _tmp29_; - GValue _tmp30_; +#line 2581 "DataCollection.c" + gint _tmp13_; + gint _tmp14_; + DataSet* _tmp15_; + gint _tmp16_; + DataObject* _tmp17_; + DataObject* _tmp18_; + GValue* _tmp19_; + GValue _tmp20_; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp20_) { -#line 2535 "DataCollection.c" - gint _tmp21_; + if (!_tmp11_) { +#line 2592 "DataCollection.c" + gint _tmp12_; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp21_ = ctr; + _tmp12_ = ctr; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ctr = _tmp21_ + 1; -#line 2541 "DataCollection.c" + ctr = _tmp12_ + 1; +#line 2598 "DataCollection.c" } #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp20_ = FALSE; + _tmp11_ = FALSE; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp22_ = ctr; + _tmp13_ = ctr; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp23_ = count; + _tmp14_ = count; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!(_tmp22_ < _tmp23_)) { + if (!(_tmp13_ < _tmp14_)) { #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 2553 "DataCollection.c" +#line 2610 "DataCollection.c" } #line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp24_ = self->priv->dataset; + _tmp15_ = self->priv->dataset; #line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp25_ = ctr; + _tmp16_ = ctr; #line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp26_ = data_set_get_at (_tmp24_, _tmp25_); + _tmp17_ = data_set_get_at (_tmp15_, _tmp16_); #line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp27_ = _tmp26_; + _tmp18_ = _tmp17_; #line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp28_ = name; + _tmp19_ = old; #line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp29_ = old; + _tmp20_ = *val; #line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp30_ = *val; + data_object_notify_collection_property_set (_tmp18_, name, _tmp19_, &_tmp20_); #line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_object_notify_collection_property_set (_tmp27_, _tmp28_, _tmp29_, &_tmp30_); -#line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _g_object_unref0 (_tmp27_); -#line 2573 "DataCollection.c" + _g_object_unref0 (_tmp18_); +#line 2628 "DataCollection.c" } } } #line 532 "/home/jens/Source/shotwell/src/core/DataCollection.vala" __vala_GValue_free0 (old); -#line 2579 "DataCollection.c" +#line 2634 "DataCollection.c" } -void data_collection_clear_property (DataCollection* self, const gchar* name) { +void +data_collection_clear_property (DataCollection* self, + const gchar* name) +{ GeeHashMap* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; - const gchar* _tmp3_; + gboolean _tmp1_; gint count = 0; - DataSet* _tmp4_; - gint _tmp5_; + DataSet* _tmp2_; #line 558 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 558 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2596,89 +2651,82 @@ void data_collection_clear_property (DataCollection* self, const gchar* name) { #line 559 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->properties; #line 559 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = name; -#line 559 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL); + _tmp1_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name, NULL); #line 559 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp2_) { + if (!_tmp1_) { #line 560 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return; -#line 2605 "DataCollection.c" +#line 2658 "DataCollection.c" } #line 563 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = name; -#line 563 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_collection_notify_property_cleared (self, _tmp3_); -#line 566 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = self->priv->dataset; + data_collection_notify_property_cleared (self, name); #line 566 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = data_set_get_count (_tmp4_); + _tmp2_ = self->priv->dataset; #line 566 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - count = _tmp5_; -#line 2617 "DataCollection.c" + count = data_set_get_count (_tmp2_); +#line 2666 "DataCollection.c" { gint ctr = 0; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" ctr = 0; -#line 2622 "DataCollection.c" +#line 2671 "DataCollection.c" { - gboolean _tmp6_ = FALSE; + gboolean _tmp3_ = FALSE; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = TRUE; + _tmp3_ = TRUE; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 2629 "DataCollection.c" +#line 2678 "DataCollection.c" + gint _tmp5_; + gint _tmp6_; + DataSet* _tmp7_; gint _tmp8_; - gint _tmp9_; - DataSet* _tmp10_; - gint _tmp11_; - DataObject* _tmp12_; - DataObject* _tmp13_; - const gchar* _tmp14_; + DataObject* _tmp9_; + DataObject* _tmp10_; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp6_) { -#line 2639 "DataCollection.c" - gint _tmp7_; + if (!_tmp3_) { +#line 2687 "DataCollection.c" + gint _tmp4_; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = ctr; + _tmp4_ = ctr; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ctr = _tmp7_ + 1; -#line 2645 "DataCollection.c" + ctr = _tmp4_ + 1; +#line 2693 "DataCollection.c" } #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = FALSE; + _tmp3_ = FALSE; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = ctr; + _tmp5_ = ctr; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = count; + _tmp6_ = count; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!(_tmp8_ < _tmp9_)) { + if (!(_tmp5_ < _tmp6_)) { #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 2657 "DataCollection.c" +#line 2705 "DataCollection.c" } #line 568 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = self->priv->dataset; -#line 568 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp11_ = ctr; + _tmp7_ = self->priv->dataset; #line 568 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp12_ = data_set_get_at (_tmp10_, _tmp11_); + _tmp8_ = ctr; #line 568 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp13_ = _tmp12_; + _tmp9_ = data_set_get_at (_tmp7_, _tmp8_); #line 568 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp14_ = name; + _tmp10_ = _tmp9_; #line 568 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - data_object_notify_collection_property_cleared (_tmp13_, _tmp14_); + data_object_notify_collection_property_cleared (_tmp10_, name); #line 568 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _g_object_unref0 (_tmp13_); -#line 2673 "DataCollection.c" + _g_object_unref0 (_tmp10_); +#line 2719 "DataCollection.c" } } } } -void data_collection_freeze_notifications (DataCollection* self) { +void +data_collection_freeze_notifications (DataCollection* self) +{ gint _tmp0_; #line 581 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); @@ -2690,12 +2738,14 @@ void data_collection_freeze_notifications (DataCollection* self) { if (_tmp0_ == 0) { #line 583 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_notify_frozen (self); -#line 2692 "DataCollection.c" +#line 2740 "DataCollection.c" } } -void data_collection_thaw_notifications (DataCollection* self) { +void +data_collection_thaw_notifications (DataCollection* self) +{ gint _tmp0_; gint _tmp1_; gint _tmp2_; @@ -2707,7 +2757,7 @@ void data_collection_thaw_notifications (DataCollection* self) { if (_tmp0_ == 0) { #line 588 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return; -#line 2709 "DataCollection.c" +#line 2759 "DataCollection.c" } #line 590 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp1_ = self->priv->notifies_frozen; @@ -2719,12 +2769,14 @@ void data_collection_thaw_notifications (DataCollection* self) { if (_tmp2_ == 0) { #line 591 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_notify_thawed (self); -#line 2721 "DataCollection.c" +#line 2771 "DataCollection.c" } } -gboolean data_collection_are_notifications_frozen (DataCollection* self) { +gboolean +data_collection_are_notifications_frozen (DataCollection* self) +{ gboolean result = FALSE; gint _tmp0_; #line 594 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2735,34 +2787,40 @@ gboolean data_collection_are_notifications_frozen (DataCollection* self) { result = _tmp0_ > 0; #line 595 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 2737 "DataCollection.c" +#line 2789 "DataCollection.c" } -static void data_collection_real_notify_frozen (DataCollection* self) { +static void +data_collection_real_notify_frozen (DataCollection* self) +{ #line 601 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_signal_emit (self, data_collection_signals[DATA_COLLECTION_FROZEN_SIGNAL], 0); -#line 2744 "DataCollection.c" +#line 2798 "DataCollection.c" } -void data_collection_notify_frozen (DataCollection* self) { +void +data_collection_notify_frozen (DataCollection* self) +{ #line 600 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 600 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->notify_frozen (self); -#line 2753 "DataCollection.c" +#line 2809 "DataCollection.c" } -static void data_collection_real_notify_thawed (DataCollection* self) { +static void +data_collection_real_notify_thawed (DataCollection* self) +{ GeeHashMap* _tmp0_; gboolean _tmp4_; #line 607 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->frozen_items_altered; #line 607 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp0_ != NULL) { -#line 2764 "DataCollection.c" +#line 2822 "DataCollection.c" GeeMap* copy = NULL; GeeHashMap* _tmp1_; GeeMap* _tmp2_; @@ -2783,7 +2841,7 @@ static void data_collection_real_notify_thawed (DataCollection* self) { data_collection_notify_items_altered (self, _tmp3_); #line 607 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (copy); -#line 2785 "DataCollection.c" +#line 2843 "DataCollection.c" } #line 615 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp4_ = self->priv->fire_ordering_changed; @@ -2793,47 +2851,66 @@ static void data_collection_real_notify_thawed (DataCollection* self) { self->priv->fire_ordering_changed = FALSE; #line 617 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_notify_ordering_changed (self); -#line 2795 "DataCollection.c" +#line 2853 "DataCollection.c" } #line 620 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_signal_emit (self, data_collection_signals[DATA_COLLECTION_THAWED_SIGNAL], 0); -#line 2799 "DataCollection.c" +#line 2857 "DataCollection.c" } -void data_collection_notify_thawed (DataCollection* self) { +void +data_collection_notify_thawed (DataCollection* self) +{ #line 606 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 606 "/home/jens/Source/shotwell/src/core/DataCollection.vala" DATA_COLLECTION_GET_CLASS (self)->notify_thawed (self); -#line 2808 "DataCollection.c" +#line 2868 "DataCollection.c" } -static void data_collection_real_items_added (DataCollection* self, GeeIterable* added) { +static void +data_collection_real_items_added (DataCollection* self, + GeeIterable* added) +{ #line 116 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (added)); -#line 2815 "DataCollection.c" +#line 2878 "DataCollection.c" } -static void data_collection_real_items_removed (DataCollection* self, GeeIterable* removed) { +static void +data_collection_real_items_removed (DataCollection* self, + GeeIterable* removed) +{ #line 120 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); -#line 2822 "DataCollection.c" +#line 2888 "DataCollection.c" } -static void data_collection_real_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed) { +static void +data_collection_real_contents_altered (DataCollection* self, + GeeIterable* added, + GeeIterable* removed) +{ #line 124 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added)); #line 124 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); -#line 2831 "DataCollection.c" +#line 2901 "DataCollection.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2); register GMarshalFunc_VOID__OBJECT_OBJECT callback; register GCClosure * cc; @@ -2848,43 +2925,60 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa data1 = closure->data; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data2 = param_values->data[0].v_pointer; -#line 2850 "DataCollection.c" +#line 2927 "DataCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data1 = param_values->data[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data2 = closure->data; -#line 2856 "DataCollection.c" +#line 2933 "DataCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 2862 "DataCollection.c" +#line 2939 "DataCollection.c" } -static void data_collection_real_items_altered (DataCollection* self, GeeMap* items) { +static void +data_collection_real_items_altered (DataCollection* self, + GeeMap* items) +{ #line 130 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (GEE_IS_MAP (items)); -#line 2869 "DataCollection.c" +#line 2949 "DataCollection.c" } -static void data_collection_real_ordering_changed (DataCollection* self) { +static void +data_collection_real_ordering_changed (DataCollection* self) +{ } -static void data_collection_real_property_set (DataCollection* self, const gchar* name, GValue* old, GValue* val) { +static void +data_collection_real_property_set (DataCollection* self, + const gchar* name, + GValue* old, + GValue* val) +{ #line 140 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (name != NULL); #line 140 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (val != NULL); -#line 2882 "DataCollection.c" +#line 2969 "DataCollection.c" } -static void g_cclosure_user_marshal_VOID__STRING_POINTER_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__STRING_POINTER_BOXED (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__STRING_POINTER_BOXED) (gpointer data1, const char* arg_1, gpointer arg_2, gpointer arg_3, gpointer data2); register GMarshalFunc_VOID__STRING_POINTER_BOXED callback; register GCClosure * cc; @@ -2899,92 +2993,104 @@ static void g_cclosure_user_marshal_VOID__STRING_POINTER_BOXED (GClosure * closu data1 = closure->data; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data2 = param_values->data[0].v_pointer; -#line 2901 "DataCollection.c" +#line 2995 "DataCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data1 = param_values->data[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data2 = closure->data; -#line 2907 "DataCollection.c" +#line 3001 "DataCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" callback = (GMarshalFunc_VOID__STRING_POINTER_BOXED) (marshal_data ? marshal_data : cc->callback); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" callback (data1, g_value_get_string (param_values + 1), g_value_get_pointer (param_values + 2), g_value_get_boxed (param_values + 3), data2); -#line 2913 "DataCollection.c" +#line 3007 "DataCollection.c" } -static void data_collection_real_property_cleared (DataCollection* self, const gchar* name) { +static void +data_collection_real_property_cleared (DataCollection* self, + const gchar* name) +{ #line 144 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (name != NULL); -#line 2920 "DataCollection.c" +#line 3017 "DataCollection.c" } -static void data_collection_real_frozen (DataCollection* self) { +static void +data_collection_real_frozen (DataCollection* self) +{ } -static void data_collection_real_thawed (DataCollection* self) { +static void +data_collection_real_thawed (DataCollection* self) +{ } -static void _data_collection_marker_impl_on_items_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) { +static void +_data_collection_marker_impl_on_items_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self) +{ #line 24 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_marker_impl_on_items_removed ((DataCollectionMarkerImpl*) self, removed); -#line 2935 "DataCollection.c" +#line 3040 "DataCollection.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 16 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return self ? data_collection_ref (self) : NULL; -#line 2942 "DataCollection.c" +#line 3049 "DataCollection.c" } -static DataCollectionMarkerImpl* data_collection_marker_impl_construct (GType object_type, DataCollection* owner) { +static DataCollectionMarkerImpl* +data_collection_marker_impl_construct (GType object_type, + DataCollection* owner) +{ DataCollectionMarkerImpl * self = NULL; DataCollection* _tmp0_; - DataCollection* _tmp1_; - DataCollection* _tmp2_; #line 15 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (owner), NULL); #line 15 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = (DataCollectionMarkerImpl*) g_object_new (object_type, NULL); #line 16 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = owner; -#line 16 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = _data_collection_ref0 (_tmp0_); + _tmp0_ = _data_collection_ref0 (owner); #line 16 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _data_collection_unref0 (self->owner); #line 16 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - self->owner = _tmp1_; -#line 20 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = owner; + self->owner = _tmp0_; #line 20 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_connect_object (_tmp2_, "items-removed", (GCallback) _data_collection_marker_impl_on_items_removed_data_collection_items_removed, self, 0); + g_signal_connect_object (owner, "items-removed", (GCallback) _data_collection_marker_impl_on_items_removed_data_collection_items_removed, self, 0); #line 15 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return self; -#line 2969 "DataCollection.c" +#line 3073 "DataCollection.c" } -static DataCollectionMarkerImpl* data_collection_marker_impl_new (DataCollection* owner) { +static DataCollectionMarkerImpl* +data_collection_marker_impl_new (DataCollection* owner) +{ #line 15 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return data_collection_marker_impl_construct (DATA_COLLECTION_TYPE_MARKER_IMPL, owner); -#line 2976 "DataCollection.c" +#line 3082 "DataCollection.c" } -static void data_collection_marker_impl_real_mark (Marker* base, DataObject* object) { +static void +data_collection_marker_impl_real_mark (Marker* base, + DataObject* object) +{ DataCollectionMarkerImpl * self; DataCollection* _tmp0_; - DataObject* _tmp1_; - gboolean _tmp2_; - GeeHashSet* _tmp3_; - DataObject* _tmp4_; + GeeHashSet* _tmp1_; #line 27 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl); #line 27 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2992,28 +3098,22 @@ static void data_collection_marker_impl_real_mark (Marker* base, DataObject* obj #line 28 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->owner; #line 28 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = object; -#line 28 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = data_collection_internal_contains (_tmp0_, _tmp1_); -#line 28 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp2_, "owner.internal_contains(object)"); -#line 30 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = self->marked; + _vala_assert (data_collection_internal_contains (_tmp0_, object), "owner.internal_contains(object)"); #line 30 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = object; + _tmp1_ = self->marked; #line 30 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); -#line 3005 "DataCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), object); +#line 3105 "DataCollection.c" } -static void data_collection_marker_impl_real_unmark (Marker* base, DataObject* object) { +static void +data_collection_marker_impl_real_unmark (Marker* base, + DataObject* object) +{ DataCollectionMarkerImpl * self; DataCollection* _tmp0_; - DataObject* _tmp1_; - gboolean _tmp2_; - GeeHashSet* _tmp3_; - DataObject* _tmp4_; + GeeHashSet* _tmp1_; #line 33 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl); #line 33 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3021,33 +3121,24 @@ static void data_collection_marker_impl_real_unmark (Marker* base, DataObject* o #line 34 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->owner; #line 34 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = object; -#line 34 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = data_collection_internal_contains (_tmp0_, _tmp1_); -#line 34 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp2_, "owner.internal_contains(object)"); -#line 36 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = self->marked; + _vala_assert (data_collection_internal_contains (_tmp0_, object), "owner.internal_contains(object)"); #line 36 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = object; + _tmp1_ = self->marked; #line 36 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); -#line 3034 "DataCollection.c" + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), object); +#line 3128 "DataCollection.c" } -static gboolean data_collection_marker_impl_real_toggle (Marker* base, DataObject* object) { +static gboolean +data_collection_marker_impl_real_toggle (Marker* base, + DataObject* object) +{ DataCollectionMarkerImpl * self; gboolean result = FALSE; DataCollection* _tmp0_; - DataObject* _tmp1_; - gboolean _tmp2_; - GeeHashSet* _tmp3_; - DataObject* _tmp4_; - gboolean _tmp5_; - GeeHashSet* _tmp10_; - DataObject* _tmp11_; - gboolean _tmp12_; + GeeHashSet* _tmp1_; + GeeHashSet* _tmp4_; #line 39 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl); #line 39 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3055,201 +3146,173 @@ static gboolean data_collection_marker_impl_real_toggle (Marker* base, DataObjec #line 40 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->owner; #line 40 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = object; -#line 40 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = data_collection_internal_contains (_tmp0_, _tmp1_); -#line 40 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp2_, "owner.internal_contains(object)"); + _vala_assert (data_collection_internal_contains (_tmp0_, object), "owner.internal_contains(object)"); #line 42 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = self->marked; -#line 42 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = object; -#line 42 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); + _tmp1_ = self->marked; #line 42 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp5_) { -#line 3070 "DataCollection.c" - GeeHashSet* _tmp6_; - DataObject* _tmp7_; -#line 43 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = self->marked; + if (gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), object)) { +#line 3153 "DataCollection.c" + GeeHashSet* _tmp2_; #line 43 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = object; + _tmp2_ = self->marked; #line 43 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_); -#line 3079 "DataCollection.c" + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), object); +#line 3159 "DataCollection.c" } else { - GeeHashSet* _tmp8_; - DataObject* _tmp9_; -#line 45 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = self->marked; + GeeHashSet* _tmp3_; #line 45 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = object; + _tmp3_ = self->marked; #line 45 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_); -#line 3089 "DataCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), object); +#line 3166 "DataCollection.c" } #line 48 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = self->marked; -#line 48 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp11_ = object; + _tmp4_ = self->marked; #line 48 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp12_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_); -#line 48 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - result = _tmp12_; + result = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), object); #line 48 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 3101 "DataCollection.c" +#line 3174 "DataCollection.c" } -static void data_collection_marker_impl_real_mark_many (Marker* base, GeeCollection* list) { +static void +data_collection_marker_impl_real_mark_many (Marker* base, + GeeCollection* list) +{ DataCollectionMarkerImpl * self; #line 51 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl); #line 51 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (list)); -#line 3111 "DataCollection.c" +#line 3187 "DataCollection.c" { GeeIterator* _object_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = list; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_ITERABLE, GeeIterable)); #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 3124 "DataCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 3197 "DataCollection.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - DataCollection* _tmp6_; + GeeIterator* _tmp2_; + gpointer _tmp3_; + DataCollection* _tmp4_; + DataObject* _tmp5_; + GeeHashSet* _tmp6_; DataObject* _tmp7_; - gboolean _tmp8_; - GeeHashSet* _tmp9_; - DataObject* _tmp10_; -#line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = _object_it; #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 3143 "DataCollection.c" +#line 3212 "DataCollection.c" } #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = (DataObject*) _tmp5_; -#line 53 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = self->owner; + object = (DataObject*) _tmp3_; #line 53 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = object; + _tmp4_ = self->owner; #line 53 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = data_collection_internal_contains (_tmp6_, _tmp7_); + _tmp5_ = object; #line 53 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp8_, "owner.internal_contains(object)"); + _vala_assert (data_collection_internal_contains (_tmp4_, _tmp5_), "owner.internal_contains(object)"); #line 55 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = self->marked; + _tmp6_ = self->marked; #line 55 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = object; + _tmp7_ = object; #line 55 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_); #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 3167 "DataCollection.c" +#line 3234 "DataCollection.c" } #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 3171 "DataCollection.c" +#line 3238 "DataCollection.c" } } -static void data_collection_marker_impl_real_unmark_many (Marker* base, GeeCollection* list) { +static void +data_collection_marker_impl_real_unmark_many (Marker* base, + GeeCollection* list) +{ DataCollectionMarkerImpl * self; #line 59 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl); #line 59 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (list)); -#line 3182 "DataCollection.c" +#line 3252 "DataCollection.c" { GeeIterator* _object_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; -#line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = list; + GeeIterator* _tmp0_; #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_ITERABLE, GeeIterable)); #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 3195 "DataCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 3262 "DataCollection.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - DataCollection* _tmp6_; + GeeIterator* _tmp2_; + gpointer _tmp3_; + DataCollection* _tmp4_; + DataObject* _tmp5_; + GeeHashSet* _tmp6_; DataObject* _tmp7_; - gboolean _tmp8_; - GeeHashSet* _tmp9_; - DataObject* _tmp10_; #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = _object_it; -#line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 3214 "DataCollection.c" +#line 3277 "DataCollection.c" } #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 61 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = self->owner; + _tmp4_ = self->owner; #line 61 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = object; -#line 61 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = data_collection_internal_contains (_tmp6_, _tmp7_); + _tmp5_ = object; #line 61 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _vala_assert (_tmp8_, "owner.internal_contains(object)"); + _vala_assert (data_collection_internal_contains (_tmp4_, _tmp5_), "owner.internal_contains(object)"); #line 63 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = self->marked; + _tmp6_ = self->marked; #line 63 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = object; + _tmp7_ = object; #line 63 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_); #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 3238 "DataCollection.c" +#line 3299 "DataCollection.c" } #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 3242 "DataCollection.c" +#line 3303 "DataCollection.c" } } -static void data_collection_marker_impl_real_mark_all (Marker* base) { +static void +data_collection_marker_impl_real_mark_all (Marker* base) +{ DataCollectionMarkerImpl * self; #line 67 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl); -#line 3251 "DataCollection.c" +#line 3314 "DataCollection.c" { GeeIterator* _object_it = NULL; DataCollection* _tmp0_; @@ -3273,48 +3336,47 @@ static void data_collection_marker_impl_real_mark_all (Marker* base) { _object_it = _tmp4_; #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 3275 "DataCollection.c" +#line 3338 "DataCollection.c" GeeIterator* _tmp5_; - gboolean _tmp6_; DataObject* object = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; - GeeHashSet* _tmp9_; - DataObject* _tmp10_; + GeeIterator* _tmp6_; + gpointer _tmp7_; + GeeHashSet* _tmp8_; + DataObject* _tmp9_; #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp5_ = _object_it; #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = gee_iterator_next (_tmp5_); -#line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp5_)) { #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 3291 "DataCollection.c" +#line 3351 "DataCollection.c" } #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = _object_it; + _tmp6_ = _object_it; #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = (DataObject*) _tmp8_; + object = (DataObject*) _tmp7_; #line 69 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp9_ = self->marked; + _tmp8_ = self->marked; #line 69 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp10_ = object; + _tmp9_ = object; #line 69 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_); #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 3307 "DataCollection.c" +#line 3367 "DataCollection.c" } #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 3311 "DataCollection.c" +#line 3371 "DataCollection.c" } } -static gint data_collection_marker_impl_real_get_count (Marker* base) { +static gint +data_collection_marker_impl_real_get_count (Marker* base) +{ DataCollectionMarkerImpl * self; gint result = 0; gint _tmp0_ = 0; @@ -3325,7 +3387,7 @@ static gint data_collection_marker_impl_real_get_count (Marker* base) { _tmp1_ = self->marked; #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp1_ != NULL) { -#line 3327 "DataCollection.c" +#line 3389 "DataCollection.c" GeeHashSet* _tmp2_; gint _tmp3_; gint _tmp4_; @@ -3337,24 +3399,26 @@ static gint data_collection_marker_impl_real_get_count (Marker* base) { _tmp4_ = _tmp3_; #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = _tmp4_; -#line 3339 "DataCollection.c" +#line 3401 "DataCollection.c" } else { gint _tmp5_; #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp5_ = self->freeze_count; #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = _tmp5_; -#line 3346 "DataCollection.c" +#line 3408 "DataCollection.c" } #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala" result = _tmp0_; #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 3352 "DataCollection.c" +#line 3414 "DataCollection.c" } -static GeeCollection* data_collection_marker_impl_real_get_all (Marker* base) { +static GeeCollection* +data_collection_marker_impl_real_get_all (Marker* base) +{ DataCollectionMarkerImpl * self; GeeCollection* result = NULL; GeeArrayList* copy = NULL; @@ -3374,70 +3438,69 @@ static GeeCollection* data_collection_marker_impl_real_get_all (Marker* base) { result = G_TYPE_CHECK_INSTANCE_CAST (copy, GEE_TYPE_COLLECTION, GeeCollection); #line 80 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 3376 "DataCollection.c" +#line 3440 "DataCollection.c" } -static void data_collection_marker_impl_on_items_removed (DataCollectionMarkerImpl* self, GeeIterable* removed) { +static void +data_collection_marker_impl_on_items_removed (DataCollectionMarkerImpl* self, + GeeIterable* removed) +{ #line 83 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (DATA_COLLECTION_IS_MARKER_IMPL (self)); #line 83 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); -#line 3385 "DataCollection.c" +#line 3452 "DataCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; -#line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = removed; + GeeIterator* _tmp0_; #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); + _tmp0_ = gee_iterable_iterator (removed); #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 3398 "DataCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 3462 "DataCollection.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - GeeHashSet* _tmp6_; - DataObject* _tmp7_; -#line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = _object_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + GeeHashSet* _tmp4_; + DataObject* _tmp5_; #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 3414 "DataCollection.c" +#line 3475 "DataCollection.c" } #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 85 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp6_ = self->marked; + _tmp4_ = self->marked; #line 85 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp7_ = object; + _tmp5_ = object; #line 85 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_); + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_); #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 3430 "DataCollection.c" +#line 3491 "DataCollection.c" } #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 3434 "DataCollection.c" +#line 3495 "DataCollection.c" } } -static void data_collection_marker_impl_freeze (DataCollectionMarkerImpl* self) { +static void +data_collection_marker_impl_freeze (DataCollectionMarkerImpl* self) +{ DataCollection* _tmp0_; guint _tmp1_; #line 91 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3448,11 +3511,13 @@ static void data_collection_marker_impl_freeze (DataCollectionMarkerImpl* self) g_signal_parse_name ("items-removed", TYPE_DATA_COLLECTION, &_tmp1_, NULL, FALSE); #line 92 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _data_collection_marker_impl_on_items_removed_data_collection_items_removed, self); -#line 3450 "DataCollection.c" +#line 3513 "DataCollection.c" } -static void data_collection_marker_impl_finished (DataCollectionMarkerImpl* self) { +static void +data_collection_marker_impl_finished (DataCollectionMarkerImpl* self) +{ GeeHashSet* _tmp0_; #line 95 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (DATA_COLLECTION_IS_MARKER_IMPL (self)); @@ -3460,7 +3525,7 @@ static void data_collection_marker_impl_finished (DataCollectionMarkerImpl* self _tmp0_ = self->marked; #line 96 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp0_ != NULL) { -#line 3462 "DataCollection.c" +#line 3527 "DataCollection.c" GeeHashSet* _tmp1_; gint _tmp2_; gint _tmp3_; @@ -3472,61 +3537,65 @@ static void data_collection_marker_impl_finished (DataCollectionMarkerImpl* self _tmp3_ = _tmp2_; #line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self->freeze_count = _tmp3_; -#line 3474 "DataCollection.c" +#line 3539 "DataCollection.c" } #line 99 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (self->marked); #line 99 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self->marked = NULL; -#line 3480 "DataCollection.c" +#line 3545 "DataCollection.c" } -static gboolean data_collection_marker_impl_is_valid (DataCollectionMarkerImpl* self, DataCollection* collection) { +static gboolean +data_collection_marker_impl_is_valid (DataCollectionMarkerImpl* self, + DataCollection* collection) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; DataCollection* _tmp1_; - DataCollection* _tmp2_; #line 102 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (DATA_COLLECTION_IS_MARKER_IMPL (self), FALSE); #line 102 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (collection), FALSE); #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp1_ = collection; + _tmp1_ = self->owner; #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp2_ = self->owner; -#line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - if (_tmp1_ == _tmp2_) { -#line 3499 "DataCollection.c" - GeeHashSet* _tmp3_; + if (collection == _tmp1_) { +#line 3564 "DataCollection.c" + GeeHashSet* _tmp2_; #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp3_ = self->marked; + _tmp2_ = self->marked; #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - _tmp0_ = _tmp3_ != NULL; -#line 3505 "DataCollection.c" + _tmp0_ = _tmp2_ != NULL; +#line 3570 "DataCollection.c" } else { #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = FALSE; -#line 3509 "DataCollection.c" +#line 3574 "DataCollection.c" } #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala" result = _tmp0_; #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 3515 "DataCollection.c" +#line 3580 "DataCollection.c" } -static void data_collection_marker_impl_class_init (DataCollectionMarkerImplClass * klass) { +static void +data_collection_marker_impl_class_init (DataCollectionMarkerImplClass * klass) +{ #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_marker_impl_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala" G_OBJECT_CLASS (klass)->finalize = data_collection_marker_impl_finalize; -#line 3524 "DataCollection.c" +#line 3591 "DataCollection.c" } -static void data_collection_marker_impl_marker_interface_init (MarkerIface * iface) { +static void +data_collection_marker_impl_marker_interface_init (MarkerIface * iface) +{ #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_marker_impl_marker_parent_iface = g_type_interface_peek_parent (iface); #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3545,11 +3614,13 @@ static void data_collection_marker_impl_marker_interface_init (MarkerIface * ifa iface->get_count = (gint (*) (Marker *)) data_collection_marker_impl_real_get_count; #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala" iface->get_all = (GeeCollection* (*) (Marker *)) data_collection_marker_impl_real_get_all; -#line 3547 "DataCollection.c" +#line 3616 "DataCollection.c" } -static void data_collection_marker_impl_instance_init (DataCollectionMarkerImpl * self) { +static void +data_collection_marker_impl_instance_init (DataCollectionMarkerImpl * self) +{ GeeHashSet* _tmp0_; #line 12 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = gee_hash_set_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); @@ -3557,11 +3628,13 @@ static void data_collection_marker_impl_instance_init (DataCollectionMarkerImpl self->marked = _tmp0_; #line 13 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self->freeze_count = 0; -#line 3559 "DataCollection.c" +#line 3630 "DataCollection.c" } -static void data_collection_marker_impl_finalize (GObject * obj) { +static void +data_collection_marker_impl_finalize (GObject * obj) +{ DataCollectionMarkerImpl * self; DataCollection* _tmp0_; guint _tmp1_; @@ -3579,11 +3652,13 @@ static void data_collection_marker_impl_finalize (GObject * obj) { _g_object_unref0 (self->marked); #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala" G_OBJECT_CLASS (data_collection_marker_impl_parent_class)->finalize (obj); -#line 3581 "DataCollection.c" +#line 3654 "DataCollection.c" } -static GType data_collection_marker_impl_get_type (void) { +static GType +data_collection_marker_impl_get_type (void) +{ static volatile gsize data_collection_marker_impl_type_id__volatile = 0; if (g_once_init_enter (&data_collection_marker_impl_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DataCollectionMarkerImplClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_collection_marker_impl_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataCollectionMarkerImpl), 0, (GInstanceInitFunc) data_collection_marker_impl_instance_init, NULL }; @@ -3597,104 +3672,129 @@ static GType data_collection_marker_impl_get_type (void) { } -static void value_data_collection_init (GValue* value) { +static void +value_data_collection_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value->data[0].v_pointer = NULL; -#line 3602 "DataCollection.c" +#line 3679 "DataCollection.c" } -static void value_data_collection_free_value (GValue* value) { +static void +value_data_collection_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_unref (value->data[0].v_pointer); -#line 3611 "DataCollection.c" +#line 3690 "DataCollection.c" } } -static void value_data_collection_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_data_collection_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" dest_value->data[0].v_pointer = data_collection_ref (src_value->data[0].v_pointer); -#line 3621 "DataCollection.c" +#line 3703 "DataCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" dest_value->data[0].v_pointer = NULL; -#line 3625 "DataCollection.c" +#line 3707 "DataCollection.c" } } -static gpointer value_data_collection_peek_pointer (const GValue* value) { +static gpointer +value_data_collection_peek_pointer (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return value->data[0].v_pointer; -#line 3633 "DataCollection.c" +#line 3717 "DataCollection.c" } -static gchar* value_data_collection_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_data_collection_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (collect_values[0].v_pointer) { -#line 3640 "DataCollection.c" +#line 3729 "DataCollection.c" DataCollection * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3647 "DataCollection.c" +#line 3736 "DataCollection.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.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 3651 "DataCollection.c" +#line 3740 "DataCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value->data[0].v_pointer = data_collection_ref (object); -#line 3655 "DataCollection.c" +#line 3744 "DataCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value->data[0].v_pointer = NULL; -#line 3659 "DataCollection.c" +#line 3748 "DataCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return NULL; -#line 3663 "DataCollection.c" +#line 3752 "DataCollection.c" } -static gchar* value_data_collection_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_data_collection_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ DataCollection ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3674 "DataCollection.c" +#line 3768 "DataCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" *object_p = NULL; -#line 3680 "DataCollection.c" +#line 3774 "DataCollection.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" *object_p = value->data[0].v_pointer; -#line 3684 "DataCollection.c" +#line 3778 "DataCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" *object_p = data_collection_ref (value->data[0].v_pointer); -#line 3688 "DataCollection.c" +#line 3782 "DataCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return NULL; -#line 3692 "DataCollection.c" +#line 3786 "DataCollection.c" } -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecDataCollection* spec; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_DATA_COLLECTION), NULL); @@ -3704,20 +3804,25 @@ GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, co G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return G_PARAM_SPEC (spec); -#line 3706 "DataCollection.c" +#line 3806 "DataCollection.c" } -gpointer value_get_data_collection (const GValue* value) { +gpointer +value_get_data_collection (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_COLLECTION), NULL); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return value->data[0].v_pointer; -#line 3715 "DataCollection.c" +#line 3817 "DataCollection.c" } -void value_set_data_collection (GValue* value, gpointer v_object) { +void +value_set_data_collection (GValue* value, + gpointer v_object) +{ DataCollection * old; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_COLLECTION)); @@ -3733,22 +3838,25 @@ void value_set_data_collection (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_ref (value->data[0].v_pointer); -#line 3735 "DataCollection.c" +#line 3840 "DataCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value->data[0].v_pointer = NULL; -#line 3739 "DataCollection.c" +#line 3844 "DataCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_unref (old); -#line 3745 "DataCollection.c" +#line 3850 "DataCollection.c" } } -void value_take_data_collection (GValue* value, gpointer v_object) { +void +value_take_data_collection (GValue* value, + gpointer v_object) +{ DataCollection * old; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_COLLECTION)); @@ -3762,22 +3870,24 @@ void value_take_data_collection (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value->data[0].v_pointer = v_object; -#line 3764 "DataCollection.c" +#line 3872 "DataCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value->data[0].v_pointer = NULL; -#line 3768 "DataCollection.c" +#line 3876 "DataCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_unref (old); -#line 3774 "DataCollection.c" +#line 3882 "DataCollection.c" } } -static void data_collection_class_init (DataCollectionClass * klass) { +static void +data_collection_class_init (DataCollectionClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3866,11 +3976,13 @@ static void data_collection_class_init (DataCollectionClass * klass) { data_collection_signals[DATA_COLLECTION_FROZEN_SIGNAL] = g_signal_new ("frozen", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, frozen), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_signals[DATA_COLLECTION_THAWED_SIGNAL] = g_signal_new ("thawed", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, thawed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 3868 "DataCollection.c" +#line 3978 "DataCollection.c" } -static void data_collection_instance_init (DataCollection * self) { +static void +data_collection_instance_init (DataCollection * self) +{ DataSet* _tmp0_; GeeHashMap* _tmp1_; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3893,11 +4005,13 @@ static void data_collection_instance_init (DataCollection * self) { self->priv->fire_ordering_changed = FALSE; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self->ref_count = 1; -#line 3895 "DataCollection.c" +#line 4007 "DataCollection.c" } -static void data_collection_finalize (DataCollection * obj) { +static void +data_collection_finalize (DataCollection * obj) +{ DataCollection * self; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATA_COLLECTION, DataCollection); @@ -3911,11 +4025,13 @@ static void data_collection_finalize (DataCollection * obj) { _g_object_unref0 (self->priv->properties); #line 112 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (self->priv->frozen_items_altered); -#line 3913 "DataCollection.c" +#line 4027 "DataCollection.c" } -GType data_collection_get_type (void) { +GType +data_collection_get_type (void) +{ static volatile gsize data_collection_type_id__volatile = 0; if (g_once_init_enter (&data_collection_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_data_collection_init, value_data_collection_free_value, value_data_collection_copy_value, value_data_collection_peek_pointer, "p", value_data_collection_collect_value, "p", value_data_collection_lcopy_value }; @@ -3929,18 +4045,22 @@ GType data_collection_get_type (void) { } -gpointer data_collection_ref (gpointer instance) { +gpointer +data_collection_ref (gpointer instance) +{ DataCollection * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return instance; -#line 3938 "DataCollection.c" +#line 4056 "DataCollection.c" } -void data_collection_unref (gpointer instance) { +void +data_collection_unref (gpointer instance) +{ DataCollection * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3949,7 +4069,7 @@ void data_collection_unref (gpointer instance) { DATA_COLLECTION_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3951 "DataCollection.c" +#line 4071 "DataCollection.c" } } diff --git a/src/core/DataObject.c b/src/core/DataObject.c index a34dc93..1f966d2 100644 --- a/src/core/DataObject.c +++ b/src/core/DataObject.c @@ -1,4 +1,4 @@ -/* DataObject.c generated by valac 0.36.6, the Vala compiler +/* DataObject.c generated by valac 0.40.4, the Vala compiler * generated from DataObject.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -20,6 +20,7 @@ /* Have to inherit from Object due to ContainerSource and this bug:*/ /* https://bugzilla.gnome.org/show_bug.cgi?id=615904*/ + #include #include #include @@ -56,6 +57,11 @@ typedef struct _AlterationClass AlterationClass; typedef struct _DataCollection DataCollection; typedef struct _DataCollectionClass DataCollectionClass; +enum { + DATA_OBJECT_0_PROPERTY, + DATA_OBJECT_NUM_PROPERTIES +}; +static GParamSpec* data_object_properties[DATA_OBJECT_NUM_PROPERTIES]; #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL))) #define __vala_GValue_free0(var) ((var == NULL) ? NULL : (var = (_vala_GValue_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); @@ -93,91 +99,132 @@ static gint64 data_object_object_id_generator = (gint64) 0; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; #define DATA_OBJECT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DATA_OBJECT, DataObjectPrivate)) -enum { - DATA_OBJECT_DUMMY_PROPERTY -}; #define DATA_OBJECT_INVALID_OBJECT_ID ((gint64) -1) #define DATA_COLLECTION_INVALID_OBJECT_ORDINAL ((gint64) -1) -DataObject* data_object_construct (GType object_type, gint64 object_id); -void data_object_notify_altered (DataObject* self, Alteration* alteration); -static void data_object_real_notify_altered (DataObject* self, Alteration* alteration); -void data_collection_internal_notify_altered (DataCollection* self, DataObject* object, Alteration* alteration); -void data_object_notify_membership_changed (DataObject* self, DataCollection* collection); -static void data_object_real_notify_membership_changed (DataObject* self, DataCollection* collection); -void data_object_notify_collection_property_set (DataObject* self, const gchar* name, GValue* old, GValue* val); -static void data_object_real_notify_collection_property_set (DataObject* self, const gchar* name, GValue* old, GValue* val); -void data_object_notify_collection_property_cleared (DataObject* self, const gchar* name); -static void data_object_real_notify_collection_property_cleared (DataObject* self, const gchar* name); +DataObject* data_object_construct (GType object_type, + gint64 object_id); +void data_object_notify_altered (DataObject* self, + Alteration* alteration); +static void data_object_real_notify_altered (DataObject* self, + Alteration* alteration); +void data_collection_internal_notify_altered (DataCollection* self, + DataObject* object, + Alteration* alteration); +void data_object_notify_membership_changed (DataObject* self, + DataCollection* collection); +static void data_object_real_notify_membership_changed (DataObject* self, + DataCollection* collection); +void data_object_notify_collection_property_set (DataObject* self, + const gchar* name, + GValue* old, + GValue* val); +static void data_object_real_notify_collection_property_set (DataObject* self, + const gchar* name, + GValue* old, + GValue* val); +void data_object_notify_collection_property_cleared (DataObject* self, + const gchar* name); +static void data_object_real_notify_collection_property_cleared (DataObject* self, + const gchar* name); gchar* data_object_get_name (DataObject* self); static gchar* data_object_real_get_name (DataObject* self); gchar* data_object_to_string (DataObject* self); static gchar* data_object_real_to_string (DataObject* self); DataCollection* data_object_get_membership (DataObject* self); gboolean data_object_has_membership (DataObject* self); -void data_object_internal_set_membership (DataObject* self, DataCollection* collection, gint64 ordinal); -void data_object_internal_set_ordinal (DataObject* self, gint64 ordinal); +void data_object_internal_set_membership (DataObject* self, + DataCollection* collection, + gint64 ordinal); +void data_object_internal_set_ordinal (DataObject* self, + gint64 ordinal); void data_object_internal_clear_membership (DataObject* self); gint64 data_object_internal_get_ordinal (DataObject* self); gint64 data_object_get_object_id (DataObject* self); -void data_object_get_collection_property (DataObject* self, const gchar* name, GValue* def, GValue* result); -GValue* data_collection_get_property (DataCollection* self, const gchar* name); +void data_object_get_collection_property (DataObject* self, + const gchar* name, + GValue* def, + GValue* result); +GValue* data_collection_get_property (DataCollection* self, + const gchar* name); static void _vala_GValue_free (GValue* self); -void data_object_set_collection_property (DataObject* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target); -void data_collection_set_property (DataCollection* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target); -void data_object_clear_collection_property (DataObject* self, const gchar* name); -void data_collection_clear_property (DataCollection* self, const gchar* name); +void data_object_set_collection_property (DataObject* self, + const gchar* name, + GValue* val, + ValueEqualFunc value_equals, + void* value_equals_target); +void data_collection_set_property (DataCollection* self, + const gchar* name, + GValue* val, + ValueEqualFunc value_equals, + void* value_equals_target); +void data_object_clear_collection_property (DataObject* self, + const gchar* name); +void data_collection_clear_property (DataCollection* self, + const gchar* name); static void data_object_finalize (GObject * obj); -DataObject* data_object_construct (GType object_type, gint64 object_id) { +DataObject* +data_object_construct (GType object_type, + gint64 object_id) +{ DataObject * self = NULL; gint64 _tmp0_ = 0LL; - gint64 _tmp1_; #line 38 "/home/jens/Source/shotwell/src/core/DataObject.vala" self = (DataObject*) g_object_new (object_type, NULL); #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp1_ = object_id; -#line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" - if (_tmp1_ == DATA_OBJECT_INVALID_OBJECT_ID) { -#line 156 "DataObject.c" - gint64 _tmp2_; + if (object_id == DATA_OBJECT_INVALID_OBJECT_ID) { +#line 203 "DataObject.c" + gint64 _tmp1_; #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp2_ = data_object_object_id_generator; + _tmp1_ = data_object_object_id_generator; #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" - data_object_object_id_generator = _tmp2_ + 1; + data_object_object_id_generator = _tmp1_ + 1; #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp0_ = _tmp2_; -#line 164 "DataObject.c" + _tmp0_ = _tmp1_; +#line 211 "DataObject.c" } else { - gint64 _tmp3_; #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp3_ = object_id; -#line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp0_ = _tmp3_; -#line 171 "DataObject.c" + _tmp0_ = object_id; +#line 215 "DataObject.c" } #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" self->priv->object_id = _tmp0_; #line 38 "/home/jens/Source/shotwell/src/core/DataObject.vala" return self; -#line 177 "DataObject.c" +#line 221 "DataObject.c" } -static void data_object_real_notify_altered (DataObject* self, Alteration* alteration) { +static void +data_object_real_notify_altered (DataObject* self, + Alteration* alteration) +{ DataCollection* _tmp0_; #line 42 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_ALTERATION (alteration)); @@ -185,123 +232,157 @@ static void data_object_real_notify_altered (DataObject* self, Alteration* alter _tmp0_ = self->priv->member_of; #line 43 "/home/jens/Source/shotwell/src/core/DataObject.vala" if (_tmp0_ != NULL) { -#line 189 "DataObject.c" +#line 236 "DataObject.c" DataCollection* _tmp1_; - Alteration* _tmp2_; #line 44 "/home/jens/Source/shotwell/src/core/DataObject.vala" _tmp1_ = self->priv->member_of; #line 44 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp2_ = alteration; -#line 44 "/home/jens/Source/shotwell/src/core/DataObject.vala" - data_collection_internal_notify_altered (_tmp1_, self, _tmp2_); -#line 198 "DataObject.c" + data_collection_internal_notify_altered (_tmp1_, self, alteration); +#line 242 "DataObject.c" } } -void data_object_notify_altered (DataObject* self, Alteration* alteration) { +void +data_object_notify_altered (DataObject* self, + Alteration* alteration) +{ #line 42 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 42 "/home/jens/Source/shotwell/src/core/DataObject.vala" DATA_OBJECT_GET_CLASS (self)->notify_altered (self, alteration); -#line 208 "DataObject.c" +#line 255 "DataObject.c" } -static void data_object_real_notify_membership_changed (DataObject* self, DataCollection* collection) { +static void +data_object_real_notify_membership_changed (DataObject* self, + DataCollection* collection) +{ #line 56 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail ((collection == NULL) || IS_DATA_COLLECTION (collection)); -#line 215 "DataObject.c" +#line 265 "DataObject.c" } -void data_object_notify_membership_changed (DataObject* self, DataCollection* collection) { +void +data_object_notify_membership_changed (DataObject* self, + DataCollection* collection) +{ #line 56 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 56 "/home/jens/Source/shotwell/src/core/DataObject.vala" DATA_OBJECT_GET_CLASS (self)->notify_membership_changed (self, collection); -#line 224 "DataObject.c" +#line 277 "DataObject.c" } -static void data_object_real_notify_collection_property_set (DataObject* self, const gchar* name, GValue* old, GValue* val) { +static void +data_object_real_notify_collection_property_set (DataObject* self, + const gchar* name, + GValue* old, + GValue* val) +{ #line 61 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (name != NULL); #line 61 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (val != NULL); -#line 233 "DataObject.c" +#line 291 "DataObject.c" } -void data_object_notify_collection_property_set (DataObject* self, const gchar* name, GValue* old, GValue* val) { +void +data_object_notify_collection_property_set (DataObject* self, + const gchar* name, + GValue* old, + GValue* val) +{ #line 61 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 61 "/home/jens/Source/shotwell/src/core/DataObject.vala" DATA_OBJECT_GET_CLASS (self)->notify_collection_property_set (self, name, old, val); -#line 242 "DataObject.c" +#line 305 "DataObject.c" } -static void data_object_real_notify_collection_property_cleared (DataObject* self, const gchar* name) { +static void +data_object_real_notify_collection_property_cleared (DataObject* self, + const gchar* name) +{ #line 66 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (name != NULL); -#line 249 "DataObject.c" +#line 315 "DataObject.c" } -void data_object_notify_collection_property_cleared (DataObject* self, const gchar* name) { +void +data_object_notify_collection_property_cleared (DataObject* self, + const gchar* name) +{ #line 66 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 66 "/home/jens/Source/shotwell/src/core/DataObject.vala" DATA_OBJECT_GET_CLASS (self)->notify_collection_property_cleared (self, name); -#line 258 "DataObject.c" +#line 327 "DataObject.c" } -static gchar* data_object_real_get_name (DataObject* self) { +static gchar* +data_object_real_get_name (DataObject* self) +{ #line 69 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_critical ("Type `%s' does not implement abstract method `data_object_get_name'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 69 "/home/jens/Source/shotwell/src/core/DataObject.vala" return NULL; -#line 267 "DataObject.c" +#line 338 "DataObject.c" } -gchar* data_object_get_name (DataObject* self) { +gchar* +data_object_get_name (DataObject* self) +{ #line 69 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_val_if_fail (IS_DATA_OBJECT (self), NULL); #line 69 "/home/jens/Source/shotwell/src/core/DataObject.vala" return DATA_OBJECT_GET_CLASS (self)->get_name (self); -#line 276 "DataObject.c" +#line 349 "DataObject.c" } -static gchar* data_object_real_to_string (DataObject* self) { +static gchar* +data_object_real_to_string (DataObject* self) +{ #line 71 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_critical ("Type `%s' does not implement abstract method `data_object_to_string'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 71 "/home/jens/Source/shotwell/src/core/DataObject.vala" return NULL; -#line 285 "DataObject.c" +#line 360 "DataObject.c" } -gchar* data_object_to_string (DataObject* self) { +gchar* +data_object_to_string (DataObject* self) +{ #line 71 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_val_if_fail (IS_DATA_OBJECT (self), NULL); #line 71 "/home/jens/Source/shotwell/src/core/DataObject.vala" return DATA_OBJECT_GET_CLASS (self)->to_string (self); -#line 294 "DataObject.c" +#line 371 "DataObject.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 74 "/home/jens/Source/shotwell/src/core/DataObject.vala" return self ? data_collection_ref (self) : NULL; -#line 301 "DataObject.c" +#line 380 "DataObject.c" } -DataCollection* data_object_get_membership (DataObject* self) { +DataCollection* +data_object_get_membership (DataObject* self) +{ DataCollection* result = NULL; DataCollection* _tmp0_; DataCollection* _tmp1_; @@ -315,11 +396,13 @@ DataCollection* data_object_get_membership (DataObject* self) { result = _tmp1_; #line 74 "/home/jens/Source/shotwell/src/core/DataObject.vala" return result; -#line 319 "DataObject.c" +#line 400 "DataObject.c" } -gboolean data_object_has_membership (DataObject* self) { +gboolean +data_object_has_membership (DataObject* self) +{ gboolean result = FALSE; DataCollection* _tmp0_; #line 77 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -330,15 +413,17 @@ gboolean data_object_has_membership (DataObject* self) { result = _tmp0_ != NULL; #line 78 "/home/jens/Source/shotwell/src/core/DataObject.vala" return result; -#line 334 "DataObject.c" +#line 417 "DataObject.c" } -void data_object_internal_set_membership (DataObject* self, DataCollection* collection, gint64 ordinal) { +void +data_object_internal_set_membership (DataObject* self, + DataCollection* collection, + gint64 ordinal) +{ DataCollection* _tmp0_; DataCollection* _tmp1_; - DataCollection* _tmp2_; - gint64 _tmp3_; #line 83 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 83 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -348,24 +433,22 @@ void data_object_internal_set_membership (DataObject* self, DataCollection* coll #line 84 "/home/jens/Source/shotwell/src/core/DataObject.vala" _vala_assert (_tmp0_ == NULL, "member_of == null"); #line 86 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp1_ = collection; -#line 86 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp2_ = _data_collection_ref0 (_tmp1_); + _tmp1_ = _data_collection_ref0 (collection); #line 86 "/home/jens/Source/shotwell/src/core/DataObject.vala" _data_collection_unref0 (self->priv->member_of); #line 86 "/home/jens/Source/shotwell/src/core/DataObject.vala" - self->priv->member_of = _tmp2_; + self->priv->member_of = _tmp1_; #line 87 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp3_ = ordinal; -#line 87 "/home/jens/Source/shotwell/src/core/DataObject.vala" - self->priv->ordinal = _tmp3_; -#line 363 "DataObject.c" + self->priv->ordinal = ordinal; +#line 444 "DataObject.c" } -void data_object_internal_set_ordinal (DataObject* self, gint64 ordinal) { +void +data_object_internal_set_ordinal (DataObject* self, + gint64 ordinal) +{ DataCollection* _tmp0_; - gint64 _tmp1_; #line 96 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 97 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -373,14 +456,14 @@ void data_object_internal_set_ordinal (DataObject* self, gint64 ordinal) { #line 97 "/home/jens/Source/shotwell/src/core/DataObject.vala" _vala_assert (_tmp0_ == NULL, "member_of == null"); #line 99 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp1_ = ordinal; -#line 99 "/home/jens/Source/shotwell/src/core/DataObject.vala" - self->priv->ordinal = _tmp1_; -#line 380 "DataObject.c" + self->priv->ordinal = ordinal; +#line 461 "DataObject.c" } -void data_object_internal_clear_membership (DataObject* self) { +void +data_object_internal_clear_membership (DataObject* self) +{ #line 104 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 105 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -389,11 +472,13 @@ void data_object_internal_clear_membership (DataObject* self) { self->priv->member_of = NULL; #line 106 "/home/jens/Source/shotwell/src/core/DataObject.vala" self->priv->ordinal = DATA_COLLECTION_INVALID_OBJECT_ORDINAL; -#line 393 "DataObject.c" +#line 476 "DataObject.c" } -inline gint64 data_object_internal_get_ordinal (DataObject* self) { +inline gint64 +data_object_internal_get_ordinal (DataObject* self) +{ gint64 result = 0LL; gint64 _tmp0_; #line 110 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -404,11 +489,13 @@ inline gint64 data_object_internal_get_ordinal (DataObject* self) { result = _tmp0_; #line 111 "/home/jens/Source/shotwell/src/core/DataObject.vala" return result; -#line 408 "DataObject.c" +#line 493 "DataObject.c" } -inline gint64 data_object_get_object_id (DataObject* self) { +inline gint64 +data_object_get_object_id (DataObject* self) +{ gint64 result = 0LL; gint64 _tmp0_; #line 114 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -419,28 +506,34 @@ inline gint64 data_object_get_object_id (DataObject* self) { result = _tmp0_; #line 115 "/home/jens/Source/shotwell/src/core/DataObject.vala" return result; -#line 423 "DataObject.c" +#line 510 "DataObject.c" } -static void _vala_GValue_free (GValue* self) { +static void +_vala_GValue_free (GValue* self) +{ #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_value_unset (self); #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_free (self); -#line 432 "DataObject.c" +#line 521 "DataObject.c" } -void data_object_get_collection_property (DataObject* self, const gchar* name, GValue* def, GValue* result) { +void +data_object_get_collection_property (DataObject* self, + const gchar* name, + GValue* def, + GValue* result) +{ DataCollection* _tmp0_; GValue* _result_ = NULL; - DataCollection* _tmp3_; - const gchar* _tmp4_; + DataCollection* _tmp2_; + GValue* _tmp3_; + GValue* _tmp4_ = NULL; GValue* _tmp5_; - GValue* _tmp6_ = NULL; - GValue* _tmp7_; - GValue _tmp10_ = {0}; + GValue _tmp7_ = {0}; #line 118 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 118 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -449,79 +542,77 @@ void data_object_get_collection_property (DataObject* self, const gchar* name, G _tmp0_ = self->priv->member_of; #line 119 "/home/jens/Source/shotwell/src/core/DataObject.vala" if (_tmp0_ == NULL) { -#line 453 "DataObject.c" - GValue* _tmp1_; - GValue _tmp2_ = {0}; -#line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp1_ = def; +#line 546 "DataObject.c" + GValue _tmp1_ = {0}; #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala" - if (G_IS_VALUE (_tmp1_)) { + if (G_IS_VALUE (def)) { #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala" - g_value_init (&_tmp2_, G_VALUE_TYPE (_tmp1_)); + g_value_init (&_tmp1_, G_VALUE_TYPE (def)); #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala" - g_value_copy (_tmp1_, &_tmp2_); -#line 464 "DataObject.c" + g_value_copy (def, &_tmp1_); +#line 554 "DataObject.c" } else { #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp2_ = *_tmp1_; -#line 468 "DataObject.c" + _tmp1_ = *def; +#line 558 "DataObject.c" } #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala" - *result = _tmp2_; + *result = _tmp1_; #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala" return; -#line 474 "DataObject.c" +#line 564 "DataObject.c" } #line 122 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp3_ = self->priv->member_of; + _tmp2_ = self->priv->member_of; #line 122 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp4_ = name; + _tmp3_ = data_collection_get_property (_tmp2_, name); #line 122 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp5_ = data_collection_get_property (_tmp3_, _tmp4_); -#line 122 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _result_ = _tmp5_; + _result_ = _tmp3_; #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp7_ = _result_; + _tmp5_ = _result_; #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - if (_tmp7_ != NULL) { -#line 488 "DataObject.c" - GValue* _tmp8_; + if (_tmp5_ != NULL) { +#line 576 "DataObject.c" + GValue* _tmp6_; #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp8_ = _result_; + _tmp6_ = _result_; #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp6_ = _tmp8_; -#line 494 "DataObject.c" + _tmp4_ = _tmp6_; +#line 582 "DataObject.c" } else { - GValue* _tmp9_; -#line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp9_ = def; #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp6_ = _tmp9_; -#line 501 "DataObject.c" + _tmp4_ = def; +#line 586 "DataObject.c" } #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - if (G_IS_VALUE (_tmp6_)) { + if (G_IS_VALUE (_tmp4_)) { #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - g_value_init (&_tmp10_, G_VALUE_TYPE (_tmp6_)); + g_value_init (&_tmp7_, G_VALUE_TYPE (_tmp4_)); #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - g_value_copy (_tmp6_, &_tmp10_); -#line 509 "DataObject.c" + g_value_copy (_tmp4_, &_tmp7_); +#line 594 "DataObject.c" } else { #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp10_ = *_tmp6_; -#line 513 "DataObject.c" + _tmp7_ = *_tmp4_; +#line 598 "DataObject.c" } #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - *result = _tmp10_; + *result = _tmp7_; #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" __vala_GValue_free0 (_result_); #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" return; -#line 521 "DataObject.c" +#line 606 "DataObject.c" } -void data_object_set_collection_property (DataObject* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target) { +void +data_object_set_collection_property (DataObject* self, + const gchar* name, + GValue* val, + ValueEqualFunc value_equals, + void* value_equals_target) +{ DataCollection* _tmp0_; #line 127 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); @@ -533,30 +624,24 @@ void data_object_set_collection_property (DataObject* self, const gchar* name, G _tmp0_ = self->priv->member_of; #line 128 "/home/jens/Source/shotwell/src/core/DataObject.vala" if (_tmp0_ != NULL) { -#line 537 "DataObject.c" +#line 628 "DataObject.c" DataCollection* _tmp1_; - const gchar* _tmp2_; - GValue _tmp3_; - ValueEqualFunc _tmp4_; - void* _tmp4__target; + GValue _tmp2_; #line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala" _tmp1_ = self->priv->member_of; #line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp2_ = name; -#line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp3_ = *val; -#line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp4_ = value_equals; + _tmp2_ = *val; #line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp4__target = value_equals_target; -#line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala" - data_collection_set_property (_tmp1_, _tmp2_, &_tmp3_, _tmp4_, _tmp4__target); -#line 555 "DataObject.c" + data_collection_set_property (_tmp1_, name, &_tmp2_, value_equals, value_equals_target); +#line 637 "DataObject.c" } } -void data_object_clear_collection_property (DataObject* self, const gchar* name) { +void +data_object_clear_collection_property (DataObject* self, + const gchar* name) +{ DataCollection* _tmp0_; #line 132 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); @@ -566,21 +651,20 @@ void data_object_clear_collection_property (DataObject* self, const gchar* name) _tmp0_ = self->priv->member_of; #line 133 "/home/jens/Source/shotwell/src/core/DataObject.vala" if (_tmp0_ != NULL) { -#line 570 "DataObject.c" +#line 655 "DataObject.c" DataCollection* _tmp1_; - const gchar* _tmp2_; #line 134 "/home/jens/Source/shotwell/src/core/DataObject.vala" _tmp1_ = self->priv->member_of; #line 134 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp2_ = name; -#line 134 "/home/jens/Source/shotwell/src/core/DataObject.vala" - data_collection_clear_property (_tmp1_, _tmp2_); -#line 579 "DataObject.c" + data_collection_clear_property (_tmp1_, name); +#line 661 "DataObject.c" } } -static void data_object_class_init (DataObjectClass * klass) { +static void +data_object_class_init (DataObjectClass * klass) +{ #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" data_object_parent_class = g_type_class_peek_parent (klass); #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -599,11 +683,13 @@ static void data_object_class_init (DataObjectClass * klass) { ((DataObjectClass *) klass)->to_string = (gchar* (*) (DataObject *)) data_object_real_to_string; #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" G_OBJECT_CLASS (klass)->finalize = data_object_finalize; -#line 603 "DataObject.c" +#line 687 "DataObject.c" } -static void data_object_instance_init (DataObject * self) { +static void +data_object_instance_init (DataObject * self) +{ #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" self->priv = DATA_OBJECT_GET_PRIVATE (self); #line 32 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -612,11 +698,13 @@ static void data_object_instance_init (DataObject * self) { self->priv->member_of = NULL; #line 34 "/home/jens/Source/shotwell/src/core/DataObject.vala" self->priv->ordinal = DATA_COLLECTION_INVALID_OBJECT_ORDINAL; -#line 616 "DataObject.c" +#line 702 "DataObject.c" } -static void data_object_finalize (GObject * obj) { +static void +data_object_finalize (GObject * obj) +{ DataObject * self; #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATA_OBJECT, DataObject); @@ -624,11 +712,13 @@ static void data_object_finalize (GObject * obj) { _data_collection_unref0 (self->priv->member_of); #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" G_OBJECT_CLASS (data_object_parent_class)->finalize (obj); -#line 628 "DataObject.c" +#line 716 "DataObject.c" } -GType data_object_get_type (void) { +GType +data_object_get_type (void) +{ static volatile gsize data_object_type_id__volatile = 0; if (g_once_init_enter (&data_object_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DataObjectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_object_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataObject), 0, (GInstanceInitFunc) data_object_instance_init, NULL }; diff --git a/src/core/DataSet.c b/src/core/DataSet.c index cc12b64..367fefc 100644 --- a/src/core/DataSet.c +++ b/src/core/DataSet.c @@ -1,4 +1,4 @@ -/* DataSet.c generated by valac 0.36.6, the Vala compiler +/* DataSet.c generated by valac 0.40.4, the Vala compiler * generated from DataSet.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -26,6 +26,7 @@ /* ComparatorPredicate is used to determine if a re-sort operation is necessary; it has no*/ /* effect on adding a DataObject to a DataSet in sorted order.*/ + #include #include #include @@ -112,60 +113,114 @@ static gpointer data_set_parent_class = NULL; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer data_set_ref (gpointer instance); void data_set_unref (gpointer instance); -GParamSpec* param_spec_data_set (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_set (GValue* value, gpointer v_object); -void value_take_data_set (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_set (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_set (GValue* value, + gpointer v_object); +void value_take_data_set (GValue* value, + gpointer v_object); gpointer value_get_data_set (const GValue* value); GType data_set_get_type (void) G_GNUC_CONST; GType sorted_list_get_type (void) G_GNUC_CONST; #define DATA_SET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DATA_SET, DataSetPrivate)) -enum { - DATA_SET_DUMMY_PROPERTY -}; -SortedList* sorted_list_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target); -SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target); +SortedList* sorted_list_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + Comparator cmp, + void* cmp_target); +SortedList* sorted_list_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + Comparator cmp, + void* cmp_target); DataSet* data_set_new (void); DataSet* data_set_construct (GType object_type); void data_set_reset_comparator (DataSet* self); -static gint64 data_set_order_added_comparator (DataSet* self, void* a, void* b); +static gint64 data_set_order_added_comparator (DataSet* self, + void* a, + void* b); gint64 data_object_internal_get_ordinal (DataObject* self); -static gboolean data_set_order_added_predicate (DataSet* self, DataObject* object, Alteration* alteration); -static gint64 data_set_comparator_wrapper (DataSet* self, void* a, void* b); -gboolean data_set_contains (DataSet* self, DataObject* object); +static gboolean data_set_order_added_predicate (DataSet* self, + DataObject* object, + Alteration* alteration); +static gint64 data_set_comparator_wrapper (DataSet* self, + void* a, + void* b); +gboolean data_set_contains (DataSet* self, + DataObject* object); gint data_set_get_count (DataSet* self); gint sorted_list_get_count (SortedList* self); -static gboolean _data_set_order_added_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self); -void sorted_list_resort (SortedList* self, Comparator new_cmp, void* new_cmp_target); -static gint64 _data_set_order_added_comparator_comparator (void* a, void* b, gpointer self); -Comparator data_set_get_comparator (DataSet* self, void** result_target); -ComparatorPredicate data_set_get_comparator_predicate (DataSet* self, void** result_target); -void data_set_set_comparator (DataSet* self, Comparator user_comparator, void* user_comparator_target, ComparatorPredicate comparator_predicate, void* comparator_predicate_target); -static gint64 _data_set_comparator_wrapper_comparator (void* a, void* b, gpointer self); +static gboolean _data_set_order_added_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self); +void sorted_list_resort (SortedList* self, + Comparator new_cmp, + void* new_cmp_target); +static gint64 _data_set_order_added_comparator_comparator (void* a, + void* b, + gpointer self); +Comparator data_set_get_comparator (DataSet* self, + void** result_target); +ComparatorPredicate data_set_get_comparator_predicate (DataSet* self, + void** result_target); +void data_set_set_comparator (DataSet* self, + Comparator user_comparator, + void* user_comparator_target, + ComparatorPredicate comparator_predicate, + void* comparator_predicate_target); +static gint64 _data_set_comparator_wrapper_comparator (void* a, + void* b, + gpointer self); GeeList* data_set_get_all (DataSet* self); GeeList* sorted_list_get_read_only_view_as_list (SortedList* self); DataSet* data_set_copy (DataSet* self); SortedList* sorted_list_copy (SortedList* self); -DataObject* data_set_get_at (DataSet* self, gint index); -gpointer sorted_list_get_at (SortedList* self, gint index); -gint data_set_index_of (DataSet* self, DataObject* object); -gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altered, GEqualFunc equal_func); -gboolean data_set_add (DataSet* self, DataObject* object); -gboolean data_set_add_many (DataSet* self, GeeCollection* objects); -gboolean data_set_remove (DataSet* self, DataObject* object); -gboolean data_set_remove_many (DataSet* self, GeeCollection* objects); -gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration* alteration); -gboolean sorted_list_resort_item (SortedList* self, gconstpointer item); +DataObject* data_set_get_at (DataSet* self, + gint index); +gpointer sorted_list_get_at (SortedList* self, + gint index); +gint data_set_index_of (DataSet* self, + DataObject* object); +gint sorted_list_locate (SortedList* self, + gconstpointer search, + gboolean altered, + GEqualFunc equal_func); +gboolean data_set_add (DataSet* self, + DataObject* object); +gboolean data_set_add_many (DataSet* self, + GeeCollection* objects); +gboolean data_set_remove (DataSet* self, + DataObject* object); +gboolean data_set_remove_many (DataSet* self, + GeeCollection* objects); +gboolean data_set_resort_object (DataSet* self, + DataObject* object, + Alteration* alteration); +gboolean sorted_list_resort_item (SortedList* self, + gconstpointer item); static void data_set_finalize (DataSet * obj); -DataSet* data_set_construct (GType object_type) { +DataSet* +data_set_construct (GType object_type) +{ DataSet* self = NULL; #line 35 "/home/jens/Source/shotwell/src/core/DataSet.vala" self = (DataSet*) g_type_create_instance (object_type); @@ -173,42 +228,40 @@ DataSet* data_set_construct (GType object_type) { data_set_reset_comparator (self); #line 35 "/home/jens/Source/shotwell/src/core/DataSet.vala" return self; -#line 177 "DataSet.c" +#line 232 "DataSet.c" } -DataSet* data_set_new (void) { +DataSet* +data_set_new (void) +{ #line 35 "/home/jens/Source/shotwell/src/core/DataSet.vala" return data_set_construct (TYPE_DATA_SET); -#line 184 "DataSet.c" +#line 241 "DataSet.c" } -static gint64 data_set_order_added_comparator (DataSet* self, void* a, void* b) { +static gint64 +data_set_order_added_comparator (DataSet* self, + void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; - gint64 _tmp1_; - void* _tmp2_; - gint64 _tmp3_; #line 39 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), 0LL); #line 40 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp0_ = a; -#line 40 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = data_object_internal_get_ordinal (G_TYPE_CHECK_INSTANCE_CAST ((DataObject*) _tmp0_, TYPE_DATA_OBJECT, DataObject)); -#line 40 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2_ = b; -#line 40 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp3_ = data_object_internal_get_ordinal (G_TYPE_CHECK_INSTANCE_CAST ((DataObject*) _tmp2_, TYPE_DATA_OBJECT, DataObject)); -#line 40 "/home/jens/Source/shotwell/src/core/DataSet.vala" - result = _tmp1_ - _tmp3_; + result = data_object_internal_get_ordinal (G_TYPE_CHECK_INSTANCE_CAST ((DataObject*) a, TYPE_DATA_OBJECT, DataObject)) - data_object_internal_get_ordinal (G_TYPE_CHECK_INSTANCE_CAST ((DataObject*) b, TYPE_DATA_OBJECT, DataObject)); #line 40 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 208 "DataSet.c" +#line 257 "DataSet.c" } -static gboolean data_set_order_added_predicate (DataSet* self, DataObject* object, Alteration* alteration) { +static gboolean +data_set_order_added_predicate (DataSet* self, + DataObject* object, + Alteration* alteration) +{ gboolean result = FALSE; #line 43 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), FALSE); @@ -220,96 +273,76 @@ static gboolean data_set_order_added_predicate (DataSet* self, DataObject* objec result = FALSE; #line 45 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 224 "DataSet.c" +#line 277 "DataSet.c" } -static gint64 data_set_comparator_wrapper (DataSet* self, void* a, void* b) { +static gint64 +data_set_comparator_wrapper (DataSet* self, + void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; - void* _tmp1_; gint64 _result_ = 0LL; - Comparator _tmp2_; - void* _tmp2__target; - gint64 _tmp7_; - gint64 _tmp11_; + Comparator _tmp0_; + void* _tmp0__target; + gint64 _tmp2_; + gint64 _tmp3_; #line 48 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), 0LL); #line 49 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp0_ = a; -#line 49 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = b; -#line 49 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (_tmp0_ == _tmp1_) { + if (a == b) { #line 50 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = (gint64) 0; #line 50 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 249 "DataSet.c" +#line 300 "DataSet.c" } #line 54 "/home/jens/Source/shotwell/src/core/DataSet.vala" _result_ = (gint64) 0; #line 56 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2_ = self->priv->user_comparator; + _tmp0_ = self->priv->user_comparator; #line 56 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2__target = self->priv->user_comparator_target; + _tmp0__target = self->priv->user_comparator_target; #line 56 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (_tmp2_ != NULL) { -#line 259 "DataSet.c" - Comparator _tmp3_; - void* _tmp3__target; - void* _tmp4_; - void* _tmp5_; - gint64 _tmp6_; -#line 57 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp3_ = self->priv->user_comparator; + if (_tmp0_ != NULL) { +#line 310 "DataSet.c" + Comparator _tmp1_; + void* _tmp1__target; #line 57 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp3__target = self->priv->user_comparator_target; + _tmp1_ = self->priv->user_comparator; #line 57 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp4_ = a; + _tmp1__target = self->priv->user_comparator_target; #line 57 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp5_ = b; -#line 57 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp6_ = _tmp3_ (_tmp4_, _tmp5_, _tmp3__target); -#line 57 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _result_ = _tmp6_; -#line 277 "DataSet.c" + _result_ = _tmp1_ (a, b, _tmp1__target); +#line 319 "DataSet.c" } #line 59 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp7_ = _result_; + _tmp2_ = _result_; #line 59 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (_tmp7_ == ((gint64) 0)) { -#line 283 "DataSet.c" - void* _tmp8_; - void* _tmp9_; - gint64 _tmp10_; -#line 60 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp8_ = a; -#line 60 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp9_ = b; -#line 60 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp10_ = data_set_order_added_comparator (self, _tmp8_, _tmp9_); + if (_tmp2_ == ((gint64) 0)) { #line 60 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _result_ = _tmp10_; -#line 295 "DataSet.c" + _result_ = data_set_order_added_comparator (self, a, b); +#line 327 "DataSet.c" } #line 62 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp11_ = _result_; + _tmp3_ = _result_; #line 62 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _vala_assert (_tmp11_ != ((gint64) 0), "result != 0"); + _vala_assert (_tmp3_ != ((gint64) 0), "result != 0"); #line 64 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = _result_; #line 64 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 305 "DataSet.c" +#line 337 "DataSet.c" } -gboolean data_set_contains (DataSet* self, DataObject* object) { +gboolean +data_set_contains (DataSet* self, + DataObject* object) +{ gboolean result = FALSE; GeeHashSet* _tmp0_; - DataObject* _tmp1_; - gboolean _tmp2_; #line 67 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), FALSE); #line 67 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -317,54 +350,59 @@ gboolean data_set_contains (DataSet* self, DataObject* object) { #line 68 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp0_ = self->priv->hash_set; #line 68 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = object; -#line 68 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 68 "/home/jens/Source/shotwell/src/core/DataSet.vala" - result = _tmp2_; + result = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), object); #line 68 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 328 "DataSet.c" +#line 357 "DataSet.c" } -inline gint data_set_get_count (DataSet* self) { +inline gint +data_set_get_count (DataSet* self) +{ gint result = 0; SortedList* _tmp0_; - gint _tmp1_; #line 71 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), 0); #line 72 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp0_ = self->priv->list; #line 72 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = sorted_list_get_count (_tmp0_); -#line 72 "/home/jens/Source/shotwell/src/core/DataSet.vala" - result = _tmp1_; + result = sorted_list_get_count (_tmp0_); #line 72 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 346 "DataSet.c" +#line 374 "DataSet.c" } -static gboolean _data_set_order_added_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) { +static gboolean +_data_set_order_added_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self) +{ gboolean result; result = data_set_order_added_predicate ((DataSet*) self, object, alteration); #line 77 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 355 "DataSet.c" +#line 387 "DataSet.c" } -static gint64 _data_set_order_added_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_data_set_order_added_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = data_set_order_added_comparator ((DataSet*) self, a, b); #line 78 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 364 "DataSet.c" +#line 400 "DataSet.c" } -void data_set_reset_comparator (DataSet* self) { +void +data_set_reset_comparator (DataSet* self) +{ SortedList* _tmp0_; #line 75 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_if_fail (IS_DATA_SET (self)); @@ -380,11 +418,14 @@ void data_set_reset_comparator (DataSet* self) { _tmp0_ = self->priv->list; #line 78 "/home/jens/Source/shotwell/src/core/DataSet.vala" sorted_list_resort (_tmp0_, _data_set_order_added_comparator_comparator, self); -#line 384 "DataSet.c" +#line 422 "DataSet.c" } -Comparator data_set_get_comparator (DataSet* self, void** result_target) { +Comparator +data_set_get_comparator (DataSet* self, + void** result_target) +{ Comparator result = NULL; Comparator _tmp0_; void* _tmp0__target; @@ -406,11 +447,14 @@ Comparator data_set_get_comparator (DataSet* self, void** result_target) { result = _tmp1_; #line 82 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 410 "DataSet.c" +#line 451 "DataSet.c" } -ComparatorPredicate data_set_get_comparator_predicate (DataSet* self, void** result_target) { +ComparatorPredicate +data_set_get_comparator_predicate (DataSet* self, + void** result_target) +{ ComparatorPredicate result = NULL; ComparatorPredicate _tmp0_; void* _tmp0__target; @@ -432,52 +476,52 @@ ComparatorPredicate data_set_get_comparator_predicate (DataSet* self, void** res result = _tmp1_; #line 86 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 436 "DataSet.c" +#line 480 "DataSet.c" } -static gint64 _data_set_comparator_wrapper_comparator (void* a, void* b, gpointer self) { +static gint64 +_data_set_comparator_wrapper_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = data_set_comparator_wrapper ((DataSet*) self, a, b); #line 92 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 445 "DataSet.c" +#line 493 "DataSet.c" } -void data_set_set_comparator (DataSet* self, Comparator user_comparator, void* user_comparator_target, ComparatorPredicate comparator_predicate, void* comparator_predicate_target) { - Comparator _tmp0_; - void* _tmp0__target; - ComparatorPredicate _tmp1_; - void* _tmp1__target; - SortedList* _tmp2_; +void +data_set_set_comparator (DataSet* self, + Comparator user_comparator, + void* user_comparator_target, + ComparatorPredicate comparator_predicate, + void* comparator_predicate_target) +{ + SortedList* _tmp0_; #line 89 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_if_fail (IS_DATA_SET (self)); #line 90 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp0_ = user_comparator; + self->priv->user_comparator = user_comparator; #line 90 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp0__target = user_comparator_target; -#line 90 "/home/jens/Source/shotwell/src/core/DataSet.vala" - self->priv->user_comparator = _tmp0_; -#line 90 "/home/jens/Source/shotwell/src/core/DataSet.vala" - self->priv->user_comparator_target = _tmp0__target; -#line 91 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = comparator_predicate; + self->priv->user_comparator_target = user_comparator_target; #line 91 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1__target = comparator_predicate_target; + self->priv->comparator_predicate = comparator_predicate; #line 91 "/home/jens/Source/shotwell/src/core/DataSet.vala" - self->priv->comparator_predicate = _tmp1_; -#line 91 "/home/jens/Source/shotwell/src/core/DataSet.vala" - self->priv->comparator_predicate_target = _tmp1__target; + self->priv->comparator_predicate_target = comparator_predicate_target; #line 92 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2_ = self->priv->list; + _tmp0_ = self->priv->list; #line 92 "/home/jens/Source/shotwell/src/core/DataSet.vala" - sorted_list_resort (_tmp2_, _data_set_comparator_wrapper_comparator, self); -#line 477 "DataSet.c" + sorted_list_resort (_tmp0_, _data_set_comparator_wrapper_comparator, self); +#line 519 "DataSet.c" } -GeeList* data_set_get_all (DataSet* self) { +GeeList* +data_set_get_all (DataSet* self) +{ GeeList* result = NULL; SortedList* _tmp0_; GeeList* _tmp1_; @@ -494,11 +538,13 @@ GeeList* data_set_get_all (DataSet* self) { result = _tmp2_; #line 96 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 498 "DataSet.c" +#line 542 "DataSet.c" } -DataSet* data_set_copy (DataSet* self) { +DataSet* +data_set_copy (DataSet* self) +{ DataSet* result = NULL; DataSet* clone = NULL; DataSet* _tmp0_; @@ -530,37 +576,38 @@ DataSet* data_set_copy (DataSet* self) { result = clone; #line 104 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 534 "DataSet.c" +#line 580 "DataSet.c" } -DataObject* data_set_get_at (DataSet* self, gint index) { +DataObject* +data_set_get_at (DataSet* self, + gint index) +{ DataObject* result = NULL; SortedList* _tmp0_; - gint _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 107 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), NULL); #line 108 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp0_ = self->priv->list; #line 108 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = index; + _tmp1_ = sorted_list_get_at (_tmp0_, index); #line 108 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2_ = sorted_list_get_at (_tmp0_, _tmp1_); -#line 108 "/home/jens/Source/shotwell/src/core/DataSet.vala" - result = (DataObject*) _tmp2_; + result = (DataObject*) _tmp1_; #line 108 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 555 "DataSet.c" +#line 601 "DataSet.c" } -gint data_set_index_of (DataSet* self, DataObject* object) { +gint +data_set_index_of (DataSet* self, + DataObject* object) +{ gint result = 0; SortedList* _tmp0_; - DataObject* _tmp1_; - GEqualFunc _tmp2_; - gint _tmp3_; + GEqualFunc _tmp1_; #line 111 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), 0); #line 111 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -568,27 +615,22 @@ gint data_set_index_of (DataSet* self, DataObject* object) { #line 112 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp0_ = self->priv->list; #line 112 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = object; -#line 112 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2_ = g_direct_equal; -#line 112 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp3_ = sorted_list_locate (_tmp0_, _tmp1_, FALSE, _tmp2_); + _tmp1_ = g_direct_equal; #line 112 "/home/jens/Source/shotwell/src/core/DataSet.vala" - result = _tmp3_; + result = sorted_list_locate (_tmp0_, object, FALSE, _tmp1_); #line 112 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 581 "DataSet.c" +#line 624 "DataSet.c" } -gboolean data_set_add (DataSet* self, DataObject* object) { +gboolean +data_set_add (DataSet* self, + DataObject* object) +{ gboolean result = FALSE; SortedList* _tmp0_; - DataObject* _tmp1_; - gboolean _tmp2_; - GeeHashSet* _tmp3_; - DataObject* _tmp4_; - gboolean _tmp5_; + GeeHashSet* _tmp1_; #line 116 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), FALSE); #line 116 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -596,137 +638,110 @@ gboolean data_set_add (DataSet* self, DataObject* object) { #line 117 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp0_ = self->priv->list; #line 117 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = object; -#line 117 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2_ = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 117 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (!_tmp2_) { + if (!gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), object)) { #line 118 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = FALSE; #line 118 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 609 "DataSet.c" +#line 647 "DataSet.c" } #line 120 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp3_ = self->priv->hash_set; -#line 120 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp4_ = object; + _tmp1_ = self->priv->hash_set; #line 120 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp5_ = gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); -#line 120 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (!_tmp5_) { -#line 619 "DataSet.c" - SortedList* _tmp6_; - DataObject* _tmp7_; -#line 122 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp6_ = self->priv->list; + if (!gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), object)) { +#line 653 "DataSet.c" + SortedList* _tmp2_; #line 122 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp7_ = object; + _tmp2_ = self->priv->list; #line 122 "/home/jens/Source/shotwell/src/core/DataSet.vala" - gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), _tmp7_); + gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), object); #line 124 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = FALSE; #line 124 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 632 "DataSet.c" +#line 663 "DataSet.c" } #line 127 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = TRUE; #line 127 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 638 "DataSet.c" +#line 669 "DataSet.c" } -gboolean data_set_add_many (DataSet* self, GeeCollection* objects) { +gboolean +data_set_add_many (DataSet* self, + GeeCollection* objects) +{ gboolean result = FALSE; gint count = 0; - GeeCollection* _tmp0_; + gint _tmp0_; gint _tmp1_; gint _tmp2_; - gint _tmp3_; - SortedList* _tmp4_; - GeeCollection* _tmp5_; - gboolean _tmp6_; - GeeHashSet* _tmp7_; - GeeCollection* _tmp8_; - gboolean _tmp9_; + SortedList* _tmp3_; + GeeHashSet* _tmp4_; #line 131 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), FALSE); #line 131 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (GEE_IS_COLLECTION (objects), FALSE); #line 132 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp0_ = objects; -#line 132 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp0_ = gee_collection_get_size (objects); #line 132 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 132 "/home/jens/Source/shotwell/src/core/DataSet.vala" - count = _tmp2_; + count = _tmp1_; #line 133 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp3_ = count; + _tmp2_ = count; #line 133 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (_tmp3_ == 0) { + if (_tmp2_ == 0) { #line 134 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = TRUE; #line 134 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 675 "DataSet.c" +#line 702 "DataSet.c" } #line 136 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp4_ = self->priv->list; -#line 136 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp5_ = objects; -#line 136 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp6_ = gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), _tmp5_); + _tmp3_ = self->priv->list; #line 136 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (!_tmp6_) { + if (!gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), objects)) { #line 137 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = FALSE; #line 137 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 689 "DataSet.c" +#line 712 "DataSet.c" } #line 139 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp7_ = self->priv->hash_set; -#line 139 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp8_ = objects; -#line 139 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp9_ = gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp8_); + _tmp4_ = self->priv->hash_set; #line 139 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (!_tmp9_) { -#line 699 "DataSet.c" - SortedList* _tmp10_; - GeeCollection* _tmp11_; -#line 141 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp10_ = self->priv->list; + if (!gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), objects)) { +#line 718 "DataSet.c" + SortedList* _tmp5_; #line 141 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp11_ = objects; + _tmp5_ = self->priv->list; #line 141 "/home/jens/Source/shotwell/src/core/DataSet.vala" - gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_); + gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), objects); #line 143 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = FALSE; #line 143 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 712 "DataSet.c" +#line 728 "DataSet.c" } #line 146 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = TRUE; #line 146 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 718 "DataSet.c" +#line 734 "DataSet.c" } -gboolean data_set_remove (DataSet* self, DataObject* object) { +gboolean +data_set_remove (DataSet* self, + DataObject* object) +{ gboolean result = FALSE; gboolean success = FALSE; SortedList* _tmp0_; - DataObject* _tmp1_; - gboolean _tmp2_; - GeeHashSet* _tmp3_; - DataObject* _tmp4_; - gboolean _tmp5_; + GeeHashSet* _tmp1_; #line 149 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), FALSE); #line 149 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -736,44 +751,35 @@ gboolean data_set_remove (DataSet* self, DataObject* object) { #line 152 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp0_ = self->priv->list; #line 152 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = object; -#line 152 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2_ = gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 152 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (!_tmp2_) { + if (!gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), object)) { #line 153 "/home/jens/Source/shotwell/src/core/DataSet.vala" success = FALSE; -#line 747 "DataSet.c" +#line 758 "DataSet.c" } #line 155 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp3_ = self->priv->hash_set; -#line 155 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp4_ = object; + _tmp1_ = self->priv->hash_set; #line 155 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp5_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); -#line 155 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (!_tmp5_) { + if (!gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), object)) { #line 156 "/home/jens/Source/shotwell/src/core/DataSet.vala" success = FALSE; -#line 759 "DataSet.c" +#line 766 "DataSet.c" } #line 158 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = success; #line 158 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 765 "DataSet.c" +#line 772 "DataSet.c" } -gboolean data_set_remove_many (DataSet* self, GeeCollection* objects) { +gboolean +data_set_remove_many (DataSet* self, + GeeCollection* objects) +{ gboolean result = FALSE; gboolean success = FALSE; SortedList* _tmp0_; - GeeCollection* _tmp1_; - gboolean _tmp2_; - GeeHashSet* _tmp3_; - GeeCollection* _tmp4_; - gboolean _tmp5_; + GeeHashSet* _tmp1_; #line 161 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), FALSE); #line 161 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -783,44 +789,38 @@ gboolean data_set_remove_many (DataSet* self, GeeCollection* objects) { #line 164 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp0_ = self->priv->list; #line 164 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = objects; -#line 164 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2_ = gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 164 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (!_tmp2_) { + if (!gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), objects)) { #line 165 "/home/jens/Source/shotwell/src/core/DataSet.vala" success = FALSE; -#line 794 "DataSet.c" +#line 796 "DataSet.c" } #line 167 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp3_ = self->priv->hash_set; -#line 167 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp4_ = objects; + _tmp1_ = self->priv->hash_set; #line 167 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp5_ = gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), _tmp4_); -#line 167 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (!_tmp5_) { + if (!gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), objects)) { #line 168 "/home/jens/Source/shotwell/src/core/DataSet.vala" success = FALSE; -#line 806 "DataSet.c" +#line 804 "DataSet.c" } #line 170 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = success; #line 170 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 812 "DataSet.c" +#line 810 "DataSet.c" } -gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration* alteration) { +gboolean +data_set_resort_object (DataSet* self, + DataObject* object, + Alteration* alteration) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; ComparatorPredicate _tmp2_; void* _tmp2__target; - SortedList* _tmp8_; - DataObject* _tmp9_; - gboolean _tmp10_; + SortedList* _tmp4_; #line 174 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), FALSE); #line 174 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -833,43 +833,30 @@ gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration* _tmp2__target = self->priv->comparator_predicate_target; #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (_tmp2_ != NULL) { -#line 837 "DataSet.c" - Alteration* _tmp3_; -#line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp3_ = alteration; #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = _tmp3_ != NULL; -#line 843 "DataSet.c" + _tmp1_ = alteration != NULL; +#line 839 "DataSet.c" } else { #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp1_ = FALSE; -#line 847 "DataSet.c" +#line 843 "DataSet.c" } #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (_tmp1_) { -#line 851 "DataSet.c" - ComparatorPredicate _tmp4_; - void* _tmp4__target; - DataObject* _tmp5_; - Alteration* _tmp6_; - gboolean _tmp7_; -#line 176 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp4_ = self->priv->comparator_predicate; -#line 176 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp4__target = self->priv->comparator_predicate_target; -#line 176 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp5_ = object; +#line 847 "DataSet.c" + ComparatorPredicate _tmp3_; + void* _tmp3__target; #line 176 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp6_ = alteration; + _tmp3_ = self->priv->comparator_predicate; #line 176 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp7_ = _tmp4_ (_tmp5_, _tmp6_, _tmp4__target); + _tmp3__target = self->priv->comparator_predicate_target; #line 176 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp0_ = !_tmp7_; -#line 869 "DataSet.c" + _tmp0_ = !_tmp3_ (object, alteration, _tmp3__target); +#line 856 "DataSet.c" } else { #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp0_ = FALSE; -#line 873 "DataSet.c" +#line 860 "DataSet.c" } #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (_tmp0_) { @@ -877,120 +864,141 @@ gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration* result = FALSE; #line 177 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 881 "DataSet.c" +#line 868 "DataSet.c" } #line 180 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp8_ = self->priv->list; -#line 180 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp9_ = object; -#line 180 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp10_ = sorted_list_resort_item (_tmp8_, _tmp9_); + _tmp4_ = self->priv->list; #line 180 "/home/jens/Source/shotwell/src/core/DataSet.vala" - result = _tmp10_; + result = sorted_list_resort_item (_tmp4_, object); #line 180 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 893 "DataSet.c" +#line 876 "DataSet.c" } -static void value_data_set_init (GValue* value) { +static void +value_data_set_init (GValue* value) +{ #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" value->data[0].v_pointer = NULL; -#line 900 "DataSet.c" +#line 885 "DataSet.c" } -static void value_data_set_free_value (GValue* value) { +static void +value_data_set_free_value (GValue* value) +{ #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (value->data[0].v_pointer) { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" data_set_unref (value->data[0].v_pointer); -#line 909 "DataSet.c" +#line 896 "DataSet.c" } } -static void value_data_set_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_data_set_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (src_value->data[0].v_pointer) { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" dest_value->data[0].v_pointer = data_set_ref (src_value->data[0].v_pointer); -#line 919 "DataSet.c" +#line 909 "DataSet.c" } else { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" dest_value->data[0].v_pointer = NULL; -#line 923 "DataSet.c" +#line 913 "DataSet.c" } } -static gpointer value_data_set_peek_pointer (const GValue* value) { +static gpointer +value_data_set_peek_pointer (const GValue* value) +{ #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" return value->data[0].v_pointer; -#line 931 "DataSet.c" +#line 923 "DataSet.c" } -static gchar* value_data_set_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_data_set_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (collect_values[0].v_pointer) { -#line 938 "DataSet.c" +#line 935 "DataSet.c" DataSet * object; object = collect_values[0].v_pointer; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (object->parent_instance.g_class == NULL) { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 945 "DataSet.c" +#line 942 "DataSet.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.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 949 "DataSet.c" +#line 946 "DataSet.c" } #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" value->data[0].v_pointer = data_set_ref (object); -#line 953 "DataSet.c" +#line 950 "DataSet.c" } else { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" value->data[0].v_pointer = NULL; -#line 957 "DataSet.c" +#line 954 "DataSet.c" } #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" return NULL; -#line 961 "DataSet.c" +#line 958 "DataSet.c" } -static gchar* value_data_set_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_data_set_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ DataSet ** object_p; object_p = collect_values[0].v_pointer; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (!object_p) { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 972 "DataSet.c" +#line 974 "DataSet.c" } #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (!value->data[0].v_pointer) { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" *object_p = NULL; -#line 978 "DataSet.c" +#line 980 "DataSet.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" *object_p = value->data[0].v_pointer; -#line 982 "DataSet.c" +#line 984 "DataSet.c" } else { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" *object_p = data_set_ref (value->data[0].v_pointer); -#line 986 "DataSet.c" +#line 988 "DataSet.c" } #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" return NULL; -#line 990 "DataSet.c" +#line 992 "DataSet.c" } -GParamSpec* param_spec_data_set (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_data_set (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecDataSet* spec; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_DATA_SET), NULL); @@ -1000,20 +1008,25 @@ GParamSpec* param_spec_data_set (const gchar* name, const gchar* nick, const gch G_PARAM_SPEC (spec)->value_type = object_type; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" return G_PARAM_SPEC (spec); -#line 1004 "DataSet.c" +#line 1012 "DataSet.c" } -gpointer value_get_data_set (const GValue* value) { +gpointer +value_get_data_set (const GValue* value) +{ #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_SET), NULL); #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" return value->data[0].v_pointer; -#line 1013 "DataSet.c" +#line 1023 "DataSet.c" } -void value_set_data_set (GValue* value, gpointer v_object) { +void +value_set_data_set (GValue* value, + gpointer v_object) +{ DataSet * old; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_SET)); @@ -1029,22 +1042,25 @@ void value_set_data_set (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" data_set_ref (value->data[0].v_pointer); -#line 1033 "DataSet.c" +#line 1046 "DataSet.c" } else { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" value->data[0].v_pointer = NULL; -#line 1037 "DataSet.c" +#line 1050 "DataSet.c" } #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (old) { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" data_set_unref (old); -#line 1043 "DataSet.c" +#line 1056 "DataSet.c" } } -void value_take_data_set (GValue* value, gpointer v_object) { +void +value_take_data_set (GValue* value, + gpointer v_object) +{ DataSet * old; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_SET)); @@ -1058,33 +1074,37 @@ void value_take_data_set (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" value->data[0].v_pointer = v_object; -#line 1062 "DataSet.c" +#line 1078 "DataSet.c" } else { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" value->data[0].v_pointer = NULL; -#line 1066 "DataSet.c" +#line 1082 "DataSet.c" } #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (old) { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" data_set_unref (old); -#line 1072 "DataSet.c" +#line 1088 "DataSet.c" } } -static void data_set_class_init (DataSetClass * klass) { +static void +data_set_class_init (DataSetClass * klass) +{ #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" data_set_parent_class = g_type_class_peek_parent (klass); #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" ((DataSetClass *) klass)->finalize = data_set_finalize; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_type_class_add_private (klass, sizeof (DataSetPrivate)); -#line 1084 "DataSet.c" +#line 1102 "DataSet.c" } -static void data_set_instance_init (DataSet * self) { +static void +data_set_instance_init (DataSet * self) +{ SortedList* _tmp0_; GeeHashSet* _tmp1_; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -1107,11 +1127,13 @@ static void data_set_instance_init (DataSet * self) { self->priv->comparator_predicate_target = self; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" self->ref_count = 1; -#line 1111 "DataSet.c" +#line 1131 "DataSet.c" } -static void data_set_finalize (DataSet * obj) { +static void +data_set_finalize (DataSet * obj) +{ DataSet * self; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATA_SET, DataSet); @@ -1121,11 +1143,13 @@ static void data_set_finalize (DataSet * obj) { _g_object_unref0 (self->priv->list); #line 31 "/home/jens/Source/shotwell/src/core/DataSet.vala" _g_object_unref0 (self->priv->hash_set); -#line 1125 "DataSet.c" +#line 1147 "DataSet.c" } -GType data_set_get_type (void) { +GType +data_set_get_type (void) +{ static volatile gsize data_set_type_id__volatile = 0; if (g_once_init_enter (&data_set_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_data_set_init, value_data_set_free_value, value_data_set_copy_value, value_data_set_peek_pointer, "p", value_data_set_collect_value, "p", value_data_set_lcopy_value }; @@ -1139,18 +1163,22 @@ GType data_set_get_type (void) { } -gpointer data_set_ref (gpointer instance) { +gpointer +data_set_ref (gpointer instance) +{ DataSet * self; self = instance; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_atomic_int_inc (&self->ref_count); #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" return instance; -#line 1150 "DataSet.c" +#line 1176 "DataSet.c" } -void data_set_unref (gpointer instance) { +void +data_set_unref (gpointer instance) +{ DataSet * self; self = instance; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -1159,7 +1187,7 @@ void data_set_unref (gpointer instance) { DATA_SET_GET_CLASS (self)->finalize (self); #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1163 "DataSet.c" +#line 1191 "DataSet.c" } } diff --git a/src/core/DataSource.c b/src/core/DataSource.c index dab0d7b..3d7ecf5 100644 --- a/src/core/DataSource.c +++ b/src/core/DataSource.c @@ -1,4 +1,4 @@ -/* DataSource.c generated by valac 0.36.6, the Vala compiler +/* DataSource.c generated by valac 0.40.4, the Vala compiler * generated from DataSource.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -37,6 +37,7 @@ /* track when changes to external state would break the proxy and call notify_broken();*/ /**/ + #include #include #include @@ -126,6 +127,11 @@ typedef struct _SourceSnapshotClass SourceSnapshotClass; typedef struct _DataView DataView; typedef struct _DataViewClass DataViewClass; +enum { + DATA_SOURCE_0_PROPERTY, + DATA_SOURCE_NUM_PROPERTIES +}; +static GParamSpec* data_source_properties[DATA_SOURCE_NUM_PROPERTIES]; #define _source_holding_tank_unref0(var) ((var == NULL) ? NULL : (var = (source_holding_tank_unref (var), NULL))) #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL))) @@ -147,16 +153,16 @@ enum { DATA_SOURCE_UNLINKED_SIGNAL, DATA_SOURCE_RELINKED_SIGNAL, DATA_SOURCE_DESTROYED_SIGNAL, - DATA_SOURCE_LAST_SIGNAL + DATA_SOURCE_NUM_SIGNALS }; -static guint data_source_signals[DATA_SOURCE_LAST_SIGNAL] = {0}; +static guint data_source_signals[DATA_SOURCE_NUM_SIGNALS] = {0}; typedef struct _SourceSnapshotPrivate SourceSnapshotPrivate; typedef struct _ParamSpecSourceSnapshot ParamSpecSourceSnapshot; enum { SOURCE_SNAPSHOT_BROKEN_SIGNAL, - SOURCE_SNAPSHOT_LAST_SIGNAL + SOURCE_SNAPSHOT_NUM_SIGNALS }; -static guint source_snapshot_signals[SOURCE_SNAPSHOT_LAST_SIGNAL] = {0}; +static guint source_snapshot_signals[SOURCE_SNAPSHOT_NUM_SIGNALS] = {0}; typedef struct _SourceBacklinkPrivate SourceBacklinkPrivate; typedef struct _ParamSpecSourceBacklink ParamSpecSourceBacklink; @@ -176,9 +182,9 @@ enum { SOURCE_PROXY_RECONSTITUTED_SIGNAL, SOURCE_PROXY_DEHYDRATED_SIGNAL, SOURCE_PROXY_BROKEN_SIGNAL, - SOURCE_PROXY_LAST_SIGNAL + SOURCE_PROXY_NUM_SIGNALS }; -static guint source_proxy_signals[SOURCE_PROXY_LAST_SIGNAL] = {0}; +static guint source_proxy_signals[SOURCE_PROXY_NUM_SIGNALS] = {0}; #define TYPE_PROXYABLE (proxyable_get_type ()) #define PROXYABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROXYABLE, Proxyable)) @@ -331,58 +337,96 @@ static gpointer source_proxy_parent_class = NULL; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; gpointer source_snapshot_ref (gpointer instance); void source_snapshot_unref (gpointer instance); -GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_snapshot (GValue* value, gpointer v_object); -void value_take_source_snapshot (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_snapshot (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_snapshot (GValue* value, + gpointer v_object); +void value_take_source_snapshot (GValue* value, + gpointer v_object); gpointer value_get_source_snapshot (const GValue* value); GType source_snapshot_get_type (void) G_GNUC_CONST; GType data_view_get_type (void) G_GNUC_CONST; #define DATA_SOURCE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DATA_SOURCE, DataSourcePrivate)) -enum { - DATA_SOURCE_DUMMY_PROPERTY -}; -DataSource* data_source_construct (GType object_type, gint64 object_id); -DataObject* data_object_construct (GType object_type, gint64 object_id); -static void data_source_real_notify_membership_changed (DataObject* base, DataCollection* collection); +DataSource* data_source_construct (GType object_type, + gint64 object_id); +DataObject* data_object_construct (GType object_type, + gint64 object_id); +static void data_source_real_notify_membership_changed (DataObject* base, + DataCollection* collection); void data_source_notify_unlinked (DataSource* self); -void data_object_notify_membership_changed (DataObject* self, DataCollection* collection); -void data_source_notify_held_in_tank (DataSource* self, SourceHoldingTank* holding_tank); -static void data_source_real_notify_held_in_tank (DataSource* self, SourceHoldingTank* holding_tank); +void data_object_notify_membership_changed (DataObject* self, + DataCollection* collection); +void data_source_notify_held_in_tank (DataSource* self, + SourceHoldingTank* holding_tank); +static void data_source_real_notify_held_in_tank (DataSource* self, + SourceHoldingTank* holding_tank); DataCollection* data_object_get_membership (DataObject* self); -static void data_source_real_notify_altered (DataObject* base, Alteration* alteration); -void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataSource* source, Alteration* alteration); -void data_source_contact_subscribers_alteration (DataSource* self, Alteration* alteration); -void data_object_notify_altered (DataObject* self, Alteration* alteration); -void data_source_notify_unlinking (DataSource* self, SourceCollection* collection); -static void data_source_real_notify_unlinking (DataSource* self, SourceCollection* collection); +static void data_source_real_notify_altered (DataObject* base, + Alteration* alteration); +void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, + DataSource* source, + Alteration* alteration); +void data_source_contact_subscribers_alteration (DataSource* self, + Alteration* alteration); +void data_object_notify_altered (DataObject* self, + Alteration* alteration); +void data_source_notify_unlinking (DataSource* self, + SourceCollection* collection); +static void data_source_real_notify_unlinking (DataSource* self, + SourceCollection* collection); static void data_source_real_notify_unlinked (DataSource* self); -void data_source_commit_backlinks (DataSource* self, SourceCollection* sources, const gchar* dehydrated); +void data_source_commit_backlinks (DataSource* self, + SourceCollection* sources, + const gchar* dehydrated); static gchar* data_source_dehydrate_backlinks (DataSource* self); -void data_source_notify_relinking (DataSource* self, SourceCollection* collection); -static void data_source_real_notify_relinking (DataSource* self, SourceCollection* collection); +void data_source_notify_relinking (DataSource* self, + SourceCollection* collection); +static void data_source_real_notify_relinking (DataSource* self, + SourceCollection* collection); void data_source_notify_relinked (DataSource* self); static void data_source_real_notify_relinked (DataSource* self); gchar* data_source_get_typename (DataSource* self); @@ -393,50 +437,89 @@ gchar* data_source_get_source_id (DataSource* self); static gchar* data_source_real_get_source_id (DataSource* self); gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; -gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink); +gboolean data_source_has_backlink (DataSource* self, + SourceBacklink* backlink); const gchar* source_backlink_get_name (SourceBacklink* self); const gchar* source_backlink_get_value (SourceBacklink* self); -GeeList* data_source_get_backlinks (DataSource* self, const gchar* name); -SourceBacklink* source_backlink_new (const gchar* name, const gchar* value); -SourceBacklink* source_backlink_construct (GType object_type, const gchar* name, const gchar* value); -void data_source_set_backlink (DataSource* self, SourceBacklink* backlink); -void source_collection_internal_backlink_set (SourceCollection* self, DataSource* source, SourceBacklink* backlink); -gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink); -void source_collection_internal_backlink_removed (SourceCollection* self, DataSource* source, SourceBacklink* backlink); -static void data_source_real_commit_backlinks (DataSource* self, SourceCollection* sources, const gchar* dehydrated); +GeeList* data_source_get_backlinks (DataSource* self, + const gchar* name); +SourceBacklink* source_backlink_new (const gchar* name, + const gchar* value); +SourceBacklink* source_backlink_construct (GType object_type, + const gchar* name, + const gchar* value); +void data_source_set_backlink (DataSource* self, + SourceBacklink* backlink); +void source_collection_internal_backlink_set (SourceCollection* self, + DataSource* source, + SourceBacklink* backlink); +gboolean data_source_remove_backlink (DataSource* self, + SourceBacklink* backlink); +void source_collection_internal_backlink_removed (SourceCollection* self, + DataSource* source, + SourceBacklink* backlink); +static void data_source_real_commit_backlinks (DataSource* self, + SourceCollection* sources, + const gchar* dehydrated); gchar* data_object_to_string (DataObject* self); gboolean is_string_empty (const gchar* s); -void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlinked_from, const gchar* dehydrated); +void data_source_rehydrate_backlinks (DataSource* self, + SourceCollection* unlinked_from, + const gchar* dehydrated); SourceSnapshot* data_source_save_snapshot (DataSource* self); static SourceSnapshot* data_source_real_save_snapshot (DataSource* self); void data_source_internal_mark_for_destroy (DataSource* self); -gboolean data_source_internal_delete_backing (DataSource* self, GError** error); -static gboolean data_source_real_internal_delete_backing (DataSource* self, GError** error); -gboolean data_source_equals (DataSource* self, DataSource* source); -static gboolean data_source_real_equals (DataSource* self, DataSource* source); +gboolean data_source_internal_delete_backing (DataSource* self, + GError** error); +static gboolean data_source_real_internal_delete_backing (DataSource* self, + GError** error); +gboolean data_source_equals (DataSource* self, + DataSource* source); +static gboolean data_source_real_equals (DataSource* self, + DataSource* source); void data_source_destroy (DataSource* self); static void data_source_real_destroy (DataSource* self); -void data_view_notify_unsubscribed (DataView* self, DataSource* source); -gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing); -void source_collection_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked); -void data_source_internal_subscribe (DataSource* self, DataView* view); -static void _vala_array_add66 (DataView** * array, int* length, int* size, DataView* value); -void data_source_internal_unsubscribe (DataSource* self, DataView* view); -void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscriber contact_subscriber, void* contact_subscriber_target); -static void data_source_real_unlinked (DataSource* self, SourceCollection* sources); -static void g_cclosure_user_marshal_VOID__DATA_COLLECTION (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void data_source_real_relinked (DataSource* self, SourceCollection* sources); +void data_view_notify_unsubscribed (DataView* self, + DataSource* source); +gboolean data_source_destroy_orphan (DataSource* self, + gboolean delete_backing); +void source_collection_notify_unlinked_destroyed (SourceCollection* self, + DataSource* unlinked); +void data_source_internal_subscribe (DataSource* self, + DataView* view); +static void _vala_array_add66 (DataView** * array, + int* length, + int* size, + DataView* value); +void data_source_internal_unsubscribe (DataSource* self, + DataView* view); +void data_source_contact_subscribers (DataSource* self, + DataSourceContactSubscriber contact_subscriber, + void* contact_subscriber_target); +static void data_source_real_unlinked (DataSource* self, + SourceCollection* sources); +static void g_cclosure_user_marshal_VOID__DATA_COLLECTION (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void data_source_real_relinked (DataSource* self, + SourceCollection* sources); static void data_source_real_destroyed (DataSource* self); static void data_source_finalize (GObject * obj); #define SOURCE_SNAPSHOT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SOURCE_SNAPSHOT, SourceSnapshotPrivate)) -enum { - SOURCE_SNAPSHOT_DUMMY_PROPERTY -}; void source_snapshot_notify_broken (SourceSnapshot* self); static void source_snapshot_real_notify_broken (SourceSnapshot* self); gboolean source_snapshot_is_broken (SourceSnapshot* self); @@ -444,159 +527,178 @@ SourceSnapshot* source_snapshot_construct (GType object_type); static void source_snapshot_real_broken (SourceSnapshot* self); static void source_snapshot_finalize (SourceSnapshot * obj); #define SOURCE_BACKLINK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SOURCE_BACKLINK, SourceBacklinkPrivate)) -enum { - SOURCE_BACKLINK_DUMMY_PROPERTY -}; -static gboolean source_backlink_validate_name_value (const gchar* name, const gchar* value); +static gboolean source_backlink_validate_name_value (const gchar* name, + const gchar* value); SourceBacklink* source_backlink_new_from_source (DataSource* source); -SourceBacklink* source_backlink_construct_from_source (GType object_type, DataSource* source); +SourceBacklink* source_backlink_construct_from_source (GType object_type, + DataSource* source); gchar* source_backlink_to_string (SourceBacklink* self); guint source_backlink_hash_func (SourceBacklink* backlink); -gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blink); +gboolean source_backlink_equal_func (SourceBacklink* alink, + SourceBacklink* blink); const gchar* source_backlink_get_typename (SourceBacklink* self); gint64 source_backlink_get_instance_id (SourceBacklink* self); static void source_backlink_finalize (SourceBacklink * obj); gpointer source_proxy_ref (gpointer instance); void source_proxy_unref (gpointer instance); -GParamSpec* param_spec_source_proxy (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_proxy (GValue* value, gpointer v_object); -void value_take_source_proxy (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_proxy (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_proxy (GValue* value, + gpointer v_object); +void value_take_source_proxy (GValue* value, + gpointer v_object); gpointer value_get_source_proxy (const GValue* value); GType source_proxy_get_type (void) G_GNUC_CONST; #define SOURCE_PROXY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SOURCE_PROXY, SourceProxyPrivate)) -enum { - SOURCE_PROXY_DUMMY_PROPERTY -}; static void source_proxy_drop_source (SourceProxy* self); -static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added); -static void _source_proxy_on_source_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self); -SourceProxy* source_proxy_construct (GType object_type, DataSource* source); +static void source_proxy_on_source_added (SourceProxy* self, + GeeIterable* added); +static void _source_proxy_on_source_added_data_collection_items_added (DataCollection* _sender, + GeeIterable* added, + gpointer self); +SourceProxy* source_proxy_construct (GType object_type, + DataSource* source); gint64 data_object_get_object_id (DataObject* self); static void source_proxy_on_snapshot_broken (SourceProxy* self); -static void _source_proxy_on_snapshot_broken_source_snapshot_broken (SourceSnapshot* _sender, gpointer self); -static void source_proxy_set_source (SourceProxy* self, DataSource* source); -DataSource* source_proxy_reconstitute (SourceProxy* self, gint64 object_id, SourceSnapshot* snapshot); -static DataSource* source_proxy_real_reconstitute (SourceProxy* self, gint64 object_id, SourceSnapshot* snapshot); -void source_proxy_notify_reconstituted (SourceProxy* self, DataSource* source); -static void source_proxy_real_notify_reconstituted (SourceProxy* self, DataSource* source); +static void _source_proxy_on_snapshot_broken_source_snapshot_broken (SourceSnapshot* _sender, + gpointer self); +static void source_proxy_set_source (SourceProxy* self, + DataSource* source); +DataSource* source_proxy_reconstitute (SourceProxy* self, + gint64 object_id, + SourceSnapshot* snapshot); +static DataSource* source_proxy_real_reconstitute (SourceProxy* self, + gint64 object_id, + SourceSnapshot* snapshot); +void source_proxy_notify_reconstituted (SourceProxy* self, + DataSource* source); +static void source_proxy_real_notify_reconstituted (SourceProxy* self, + DataSource* source); void source_proxy_notify_dehydrated (SourceProxy* self); static void source_proxy_real_notify_dehydrated (SourceProxy* self); void source_proxy_notify_broken (SourceProxy* self); static void source_proxy_real_notify_broken (SourceProxy* self); static void source_proxy_on_destroyed (SourceProxy* self); -static void _source_proxy_on_destroyed_data_source_destroyed (DataSource* _sender, gpointer self); +static void _source_proxy_on_destroyed_data_source_destroyed (DataSource* _sender, + gpointer self); DataSource* source_proxy_get_source (SourceProxy* self); -gboolean data_collection_contains (DataCollection* self, DataObject* object); -static void source_proxy_real_reconstituted (SourceProxy* self, DataSource* source); +gboolean data_collection_contains (DataCollection* self, + DataObject* object); +static void source_proxy_real_reconstituted (SourceProxy* self, + DataSource* source); static void source_proxy_real_dehydrated (SourceProxy* self); static void source_proxy_real_broken (SourceProxy* self); static void source_proxy_finalize (SourceProxy * obj); GType proxyable_get_type (void) G_GNUC_CONST; SourceProxy* proxyable_get_proxy (Proxyable* self); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); -DataSource* data_source_construct (GType object_type, gint64 object_id) { +DataSource* +data_source_construct (GType object_type, + gint64 object_id) +{ DataSource * self = NULL; - gint64 _tmp0_; -#line 64 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = object_id; #line 64 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self = (DataSource*) data_object_construct (object_type, _tmp0_); + self = (DataSource*) data_object_construct (object_type, object_id); #line 63 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self; -#line 511 "DataSource.c" +#line 616 "DataSource.c" } -static void data_source_real_notify_membership_changed (DataObject* base, DataCollection* collection) { +static void +data_source_real_notify_membership_changed (DataObject* base, + DataCollection* collection) +{ DataSource * self; - DataCollection* _tmp0_; - gboolean _tmp5_ = FALSE; - DataCollection* _tmp6_; - DataCollection* _tmp8_; + gboolean _tmp4_ = FALSE; #line 73 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATA_SOURCE, DataSource); #line 73 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail ((collection == NULL) || IS_DATA_COLLECTION (collection)); #line 75 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = collection; -#line 75 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp0_ == NULL) { -#line 529 "DataSource.c" - gboolean _tmp1_ = FALSE; - gboolean _tmp2_; + if (collection == NULL) { +#line 632 "DataSource.c" + gboolean _tmp0_ = FALSE; + gboolean _tmp1_; #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = self->priv->is_destroyed; + _tmp1_ = self->priv->is_destroyed; #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp2_) { + if (_tmp1_) { #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = TRUE; -#line 538 "DataSource.c" + _tmp0_ = TRUE; +#line 641 "DataSource.c" } else { - GeeHashMap* _tmp3_; + GeeHashMap* _tmp2_; #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = self->priv->backlinks; + _tmp2_ = self->priv->backlinks; #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = _tmp3_ != NULL; -#line 545 "DataSource.c" + _tmp0_ = _tmp2_ != NULL; +#line 648 "DataSource.c" } #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (_tmp1_, "is_destroyed || backlinks != null"); -#line 549 "DataSource.c" + _vala_assert (_tmp0_, "is_destroyed || backlinks != null"); +#line 652 "DataSource.c" } else { - gboolean _tmp4_; + gboolean _tmp3_; #line 78 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = self->priv->is_destroyed; + _tmp3_ = self->priv->is_destroyed; #line 78 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (!_tmp4_, "!is_destroyed"); -#line 556 "DataSource.c" + _vala_assert (!_tmp3_, "!is_destroyed"); +#line 659 "DataSource.c" } #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = collection; -#line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp6_ == NULL) { -#line 562 "DataSource.c" - GeeHashMap* _tmp7_; + if (collection == NULL) { +#line 663 "DataSource.c" + GeeHashMap* _tmp5_; #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = self->priv->backlinks; + _tmp5_ = self->priv->backlinks; #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = _tmp7_ != NULL; -#line 568 "DataSource.c" + _tmp4_ = _tmp5_ != NULL; +#line 669 "DataSource.c" } else { #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = FALSE; -#line 572 "DataSource.c" + _tmp4_ = FALSE; +#line 673 "DataSource.c" } #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp5_) { + if (_tmp4_) { #line 83 "/home/jens/Source/shotwell/src/core/DataSource.vala" data_source_notify_unlinked (self); -#line 578 "DataSource.c" +#line 679 "DataSource.c" } #line 85 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = collection; -#line 85 "/home/jens/Source/shotwell/src/core/DataSource.vala" - DATA_OBJECT_CLASS (data_source_parent_class)->notify_membership_changed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp8_); -#line 584 "DataSource.c" + DATA_OBJECT_CLASS (data_source_parent_class)->notify_membership_changed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), collection); +#line 683 "DataSource.c" } -static gpointer _source_holding_tank_ref0 (gpointer self) { +static gpointer +_source_holding_tank_ref0 (gpointer self) +{ #line 100 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self ? source_holding_tank_ref (self) : NULL; -#line 591 "DataSource.c" +#line 692 "DataSource.c" } -static void data_source_real_notify_held_in_tank (DataSource* self, SourceHoldingTank* holding_tank) { +static void +data_source_real_notify_held_in_tank (DataSource* self, + SourceHoldingTank* holding_tank) +{ DataCollection* _tmp0_; DataCollection* _tmp1_; - SourceHoldingTank* _tmp2_; - SourceHoldingTank* _tmp5_; - SourceHoldingTank* _tmp6_; + SourceHoldingTank* _tmp4_; #line 88 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail ((holding_tank == NULL) || IS_SOURCE_HOLDING_TANK (holding_tank)); #line 90 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -608,46 +710,48 @@ static void data_source_real_notify_held_in_tank (DataSource* self, SourceHoldin #line 90 "/home/jens/Source/shotwell/src/core/DataSource.vala" _data_collection_unref0 (_tmp1_); #line 94 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = holding_tank; -#line 94 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp2_ != NULL) { -#line 615 "DataSource.c" - SourceHoldingTank* _tmp3_; + if (holding_tank != NULL) { +#line 715 "DataSource.c" + SourceHoldingTank* _tmp2_; #line 95 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = self->priv->holding_tank; + _tmp2_ = self->priv->holding_tank; #line 95 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (_tmp3_ == NULL, "this.holding_tank == null"); -#line 621 "DataSource.c" + _vala_assert (_tmp2_ == NULL, "this.holding_tank == null"); +#line 721 "DataSource.c" } else { - SourceHoldingTank* _tmp4_; + SourceHoldingTank* _tmp3_; #line 97 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = self->priv->holding_tank; + _tmp3_ = self->priv->holding_tank; #line 97 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (_tmp4_ != NULL, "this.holding_tank != null"); -#line 628 "DataSource.c" + _vala_assert (_tmp3_ != NULL, "this.holding_tank != null"); +#line 728 "DataSource.c" } #line 100 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = holding_tank; -#line 100 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = _source_holding_tank_ref0 (_tmp5_); + _tmp4_ = _source_holding_tank_ref0 (holding_tank); #line 100 "/home/jens/Source/shotwell/src/core/DataSource.vala" _source_holding_tank_unref0 (self->priv->holding_tank); #line 100 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->holding_tank = _tmp6_; -#line 638 "DataSource.c" + self->priv->holding_tank = _tmp4_; +#line 736 "DataSource.c" } -void data_source_notify_held_in_tank (DataSource* self, SourceHoldingTank* holding_tank) { +void +data_source_notify_held_in_tank (DataSource* self, + SourceHoldingTank* holding_tank) +{ #line 88 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 88 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->notify_held_in_tank (self, holding_tank); -#line 647 "DataSource.c" +#line 748 "DataSource.c" } -static void data_source_real_notify_altered (DataObject* base, Alteration* alteration) { +static void +data_source_real_notify_altered (DataObject* base, + Alteration* alteration) +{ DataSource * self; SourceHoldingTank* _tmp0_; #line 103 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -658,81 +762,77 @@ static void data_source_real_notify_altered (DataObject* base, Alteration* alter _tmp0_ = self->priv->holding_tank; #line 105 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp0_ != NULL) { -#line 662 "DataSource.c" +#line 766 "DataSource.c" SourceHoldingTank* _tmp1_; - Alteration* _tmp2_; #line 106 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->holding_tank; #line 106 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = alteration; -#line 106 "/home/jens/Source/shotwell/src/core/DataSource.vala" - source_holding_tank_internal_notify_altered (_tmp1_, self, _tmp2_); -#line 671 "DataSource.c" + source_holding_tank_internal_notify_altered (_tmp1_, self, alteration); +#line 772 "DataSource.c" } else { - Alteration* _tmp3_; - Alteration* _tmp4_; #line 108 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = alteration; -#line 108 "/home/jens/Source/shotwell/src/core/DataSource.vala" - data_source_contact_subscribers_alteration (self, _tmp3_); -#line 110 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = alteration; + data_source_contact_subscribers_alteration (self, alteration); #line 110 "/home/jens/Source/shotwell/src/core/DataSource.vala" - DATA_OBJECT_CLASS (data_source_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp4_); -#line 683 "DataSource.c" + DATA_OBJECT_CLASS (data_source_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), alteration); +#line 778 "DataSource.c" } } -static void data_source_real_notify_unlinking (DataSource* self, SourceCollection* collection) { +static void +data_source_real_notify_unlinking (DataSource* self, + SourceCollection* collection) +{ gboolean _tmp0_ = FALSE; GeeHashMap* _tmp1_; - SourceCollection* _tmp3_; - GeeHashMap* _tmp4_; + GeeHashMap* _tmp3_; #line 115 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_COLLECTION (collection)); #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp1_ == NULL) { -#line 699 "DataSource.c" +#line 796 "DataSource.c" SourceCollection* _tmp2_; #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = self->priv->unlinked_from_collection; #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = _tmp2_ == NULL; -#line 705 "DataSource.c" +#line 802 "DataSource.c" } else { #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 709 "DataSource.c" +#line 806 "DataSource.c" } #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp0_, "backlinks == null && unlinked_from_collection == null"); #line 118 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = collection; -#line 118 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->unlinked_from_collection = _tmp3_; + self->priv->unlinked_from_collection = collection; #line 119 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp3_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 119 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (self->priv->backlinks); #line 119 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->backlinks = _tmp4_; -#line 723 "DataSource.c" + self->priv->backlinks = _tmp3_; +#line 818 "DataSource.c" } -void data_source_notify_unlinking (DataSource* self, SourceCollection* collection) { +void +data_source_notify_unlinking (DataSource* self, + SourceCollection* collection) +{ #line 115 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 115 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->notify_unlinking (self, collection); -#line 732 "DataSource.c" +#line 830 "DataSource.c" } -static void data_source_real_notify_unlinked (DataSource* self) { +static void +data_source_real_notify_unlinked (DataSource* self) +{ gboolean _tmp0_ = FALSE; SourceCollection* _tmp1_; SourceCollection* _tmp3_; @@ -743,17 +843,17 @@ static void data_source_real_notify_unlinked (DataSource* self) { _tmp1_ = self->priv->unlinked_from_collection; #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp1_ != NULL) { -#line 747 "DataSource.c" +#line 847 "DataSource.c" GeeHashMap* _tmp2_; #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = self->priv->backlinks; #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = _tmp2_ != NULL; -#line 753 "DataSource.c" +#line 853 "DataSource.c" } else { #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 757 "DataSource.c" +#line 857 "DataSource.c" } #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp0_, "unlinked_from_collection != null && backlinks != null"); @@ -769,7 +869,7 @@ static void data_source_real_notify_unlinked (DataSource* self) { _tmp6_ = _tmp5_; #line 129 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp6_ > 0) { -#line 773 "DataSource.c" +#line 873 "DataSource.c" SourceCollection* _tmp7_; gchar* _tmp8_; gchar* _tmp9_; @@ -783,21 +883,26 @@ static void data_source_real_notify_unlinked (DataSource* self) { data_source_commit_backlinks (self, _tmp7_, _tmp9_); #line 130 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (_tmp9_); -#line 787 "DataSource.c" +#line 887 "DataSource.c" } } -void data_source_notify_unlinked (DataSource* self) { +void +data_source_notify_unlinked (DataSource* self) +{ #line 123 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 123 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->notify_unlinked (self); -#line 797 "DataSource.c" +#line 899 "DataSource.c" } -static void data_source_real_notify_relinking (DataSource* self, SourceCollection* collection) { +static void +data_source_real_notify_relinking (DataSource* self, + SourceCollection* collection) +{ gboolean _tmp0_ = FALSE; GeeHashMap* _tmp1_; #line 134 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -806,44 +911,48 @@ static void data_source_real_notify_relinking (DataSource* self, SourceCollectio _tmp1_ = self->priv->backlinks; #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp1_ != NULL) { -#line 810 "DataSource.c" +#line 915 "DataSource.c" SourceCollection* _tmp2_; - SourceCollection* _tmp3_; #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = self->priv->unlinked_from_collection; #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = collection; -#line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = _tmp2_ == _tmp3_; -#line 819 "DataSource.c" + _tmp0_ = _tmp2_ == collection; +#line 921 "DataSource.c" } else { #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 823 "DataSource.c" +#line 925 "DataSource.c" } #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp0_, "(backlinks != null) && (unlinked_from_collection == collection)"); -#line 827 "DataSource.c" +#line 929 "DataSource.c" } -void data_source_notify_relinking (DataSource* self, SourceCollection* collection) { +void +data_source_notify_relinking (DataSource* self, + SourceCollection* collection) +{ #line 134 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 134 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->notify_relinking (self, collection); -#line 836 "DataSource.c" +#line 941 "DataSource.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 142 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self ? data_collection_ref (self) : NULL; -#line 843 "DataSource.c" +#line 950 "DataSource.c" } -static void data_source_real_notify_relinked (DataSource* self) { +static void +data_source_real_notify_relinked (DataSource* self) +{ gboolean _tmp0_ = FALSE; GeeHashMap* _tmp1_; SourceCollection* relinked_to = NULL; @@ -853,17 +962,17 @@ static void data_source_real_notify_relinked (DataSource* self) { _tmp1_ = self->priv->backlinks; #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp1_ != NULL) { -#line 857 "DataSource.c" +#line 966 "DataSource.c" SourceCollection* _tmp2_; #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = self->priv->unlinked_from_collection; #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = _tmp2_ != NULL; -#line 863 "DataSource.c" +#line 972 "DataSource.c" } else { #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 867 "DataSource.c" +#line 976 "DataSource.c" } #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp0_, "backlinks != null && unlinked_from_collection != null"); @@ -885,103 +994,116 @@ static void data_source_real_notify_relinked (DataSource* self) { data_source_commit_backlinks (self, NULL, NULL); #line 139 "/home/jens/Source/shotwell/src/core/DataSource.vala" _data_collection_unref0 (relinked_to); -#line 889 "DataSource.c" +#line 998 "DataSource.c" } -void data_source_notify_relinked (DataSource* self) { +void +data_source_notify_relinked (DataSource* self) +{ #line 139 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 139 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->notify_relinked (self); -#line 898 "DataSource.c" +#line 1009 "DataSource.c" } -static gchar* data_source_real_get_typename (DataSource* self) { +static gchar* +data_source_real_get_typename (DataSource* self) +{ #line 156 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_critical ("Type `%s' does not implement abstract method `data_source_get_typename'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 156 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 907 "DataSource.c" +#line 1020 "DataSource.c" } -gchar* data_source_get_typename (DataSource* self) { +gchar* +data_source_get_typename (DataSource* self) +{ #line 156 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), NULL); #line 156 "/home/jens/Source/shotwell/src/core/DataSource.vala" return DATA_SOURCE_GET_CLASS (self)->get_typename (self); -#line 916 "DataSource.c" +#line 1031 "DataSource.c" } -static gint64 data_source_real_get_instance_id (DataSource* self) { +static gint64 +data_source_real_get_instance_id (DataSource* self) +{ gint64 _tmp0_ = 0LL; #line 162 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_critical ("Type `%s' does not implement abstract method `data_source_get_instance_id'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 162 "/home/jens/Source/shotwell/src/core/DataSource.vala" return _tmp0_; -#line 926 "DataSource.c" +#line 1043 "DataSource.c" } -gint64 data_source_get_instance_id (DataSource* self) { +gint64 +data_source_get_instance_id (DataSource* self) +{ #line 162 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), 0LL); #line 162 "/home/jens/Source/shotwell/src/core/DataSource.vala" return DATA_SOURCE_GET_CLASS (self)->get_instance_id (self); -#line 935 "DataSource.c" +#line 1054 "DataSource.c" } -static gchar* data_source_real_get_source_id (DataSource* self) { +static gchar* +data_source_real_get_source_id (DataSource* self) +{ gchar* result = NULL; gchar* _tmp0_; gchar* _tmp1_; - gint64 _tmp2_; + gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = data_source_get_typename (self); #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = _tmp0_; #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = data_source_get_instance_id (self); + _tmp2_ = g_strdup_printf ("%s-%016" G_GINT64_MODIFIER "x", _tmp1_, data_source_get_instance_id (self)); #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = g_strdup_printf ("%s-%016" G_GINT64_MODIFIER "x", _tmp1_, _tmp2_); -#line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (_tmp1_); #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala" - result = _tmp4_; + result = _tmp3_; #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 962 "DataSource.c" +#line 1080 "DataSource.c" } -gchar* data_source_get_source_id (DataSource* self) { +gchar* +data_source_get_source_id (DataSource* self) +{ #line 166 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), NULL); #line 166 "/home/jens/Source/shotwell/src/core/DataSource.vala" return DATA_SOURCE_GET_CLASS (self)->get_source_id (self); -#line 971 "DataSource.c" +#line 1091 "DataSource.c" } -gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) { +gboolean +data_source_has_backlink (DataSource* self, + SourceBacklink* backlink) +{ gboolean result = FALSE; GeeHashMap* _tmp0_; GeeList* values = NULL; GeeHashMap* _tmp1_; - SourceBacklink* _tmp2_; + const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; - gpointer _tmp5_; - gboolean _tmp6_ = FALSE; - GeeList* _tmp7_; + gpointer _tmp4_; + gboolean _tmp5_ = FALSE; + GeeList* _tmp6_; #line 170 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE); #line 170 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -994,76 +1116,72 @@ gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) { result = FALSE; #line 172 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 998 "DataSource.c" +#line 1120 "DataSource.c" } #line 174 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; #line 174 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = backlink; -#line 174 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = source_backlink_get_name (_tmp2_); + _tmp2_ = source_backlink_get_name (backlink); #line 174 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 174 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_); #line 174 "/home/jens/Source/shotwell/src/core/DataSource.vala" - values = (GeeList*) _tmp5_; -#line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = values; + values = (GeeList*) _tmp4_; #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp7_ != NULL) { -#line 1016 "DataSource.c" - GeeList* _tmp8_; - SourceBacklink* _tmp9_; - const gchar* _tmp10_; - const gchar* _tmp11_; - gboolean _tmp12_; -#line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = values; + _tmp6_ = values; #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = backlink; + if (_tmp6_ != NULL) { +#line 1136 "DataSource.c" + GeeList* _tmp7_; + const gchar* _tmp8_; + const gchar* _tmp9_; #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = source_backlink_get_value (_tmp9_); + _tmp7_ = values; #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = _tmp10_; + _tmp8_ = source_backlink_get_value (backlink); #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp12_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_); + _tmp9_ = _tmp8_; #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = _tmp12_; -#line 1034 "DataSource.c" + _tmp5_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp9_); +#line 1148 "DataSource.c" } else { #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = FALSE; -#line 1038 "DataSource.c" + _tmp5_ = FALSE; +#line 1152 "DataSource.c" } #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" - result = _tmp6_; + result = _tmp5_; #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (values); #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1046 "DataSource.c" +#line 1160 "DataSource.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self ? g_object_ref (self) : NULL; -#line 1053 "DataSource.c" +#line 1169 "DataSource.c" } -GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { +GeeList* +data_source_get_backlinks (DataSource* self, + const gchar* name) +{ GeeList* result = NULL; GeeHashMap* _tmp0_; GeeList* values = NULL; GeeHashMap* _tmp1_; - const gchar* _tmp2_; - gpointer _tmp3_; - gboolean _tmp4_ = FALSE; - GeeList* _tmp5_; + gpointer _tmp2_; + gboolean _tmp3_ = FALSE; + GeeList* _tmp4_; GeeList* backlinks = NULL; - GeeArrayList* _tmp9_; + GeeArrayList* _tmp8_; #line 179 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), NULL); #line 179 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1076,135 +1194,130 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { result = NULL; #line 181 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1080 "DataSource.c" +#line 1198 "DataSource.c" } #line 183 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; #line 183 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = name; + _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name); #line 183 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_); -#line 183 "/home/jens/Source/shotwell/src/core/DataSource.vala" - values = (GeeList*) _tmp3_; + values = (GeeList*) _tmp2_; #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = values; + _tmp4_ = values; #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp5_ == NULL) { + if (_tmp4_ == NULL) { #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = TRUE; -#line 1096 "DataSource.c" + _tmp3_ = TRUE; +#line 1212 "DataSource.c" } else { - GeeList* _tmp6_; + GeeList* _tmp5_; + gint _tmp6_; gint _tmp7_; - gint _tmp8_; #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = values; + _tmp5_ = values; #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = _tmp8_ == 0; -#line 1109 "DataSource.c" + _tmp3_ = _tmp7_ == 0; +#line 1225 "DataSource.c" } #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp4_) { + if (_tmp3_) { #line 185 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = NULL; #line 185 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (values); #line 185 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1119 "DataSource.c" +#line 1235 "DataSource.c" } #line 187 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = gee_array_list_new (TYPE_SOURCE_BACKLINK, (GBoxedCopyFunc) source_backlink_ref, (GDestroyNotify) source_backlink_unref, NULL, NULL, NULL); + _tmp8_ = gee_array_list_new (TYPE_SOURCE_BACKLINK, (GBoxedCopyFunc) source_backlink_ref, (GDestroyNotify) source_backlink_unref, NULL, NULL, NULL); #line 187 "/home/jens/Source/shotwell/src/core/DataSource.vala" - backlinks = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_LIST, GeeList); -#line 1125 "DataSource.c" + backlinks = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_LIST, GeeList); +#line 1241 "DataSource.c" { GeeList* _value_list = NULL; + GeeList* _tmp9_; GeeList* _tmp10_; - GeeList* _tmp11_; gint _value_size = 0; - GeeList* _tmp12_; + GeeList* _tmp11_; + gint _tmp12_; gint _tmp13_; - gint _tmp14_; gint _value_index = 0; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = values; + _tmp9_ = values; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = _g_object_ref0 (_tmp10_); + _tmp10_ = _g_object_ref0 (_tmp9_); #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _value_list = _tmp11_; + _value_list = _tmp10_; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp12_ = _value_list; + _tmp11_ = _value_list; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _value_size = _tmp14_; + _value_size = _tmp13_; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" _value_index = -1; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 1153 "DataSource.c" +#line 1269 "DataSource.c" + gint _tmp14_; gint _tmp15_; gint _tmp16_; - gint _tmp17_; gchar* value = NULL; - GeeList* _tmp18_; - gint _tmp19_; - gpointer _tmp20_; - GeeList* _tmp21_; - const gchar* _tmp22_; - const gchar* _tmp23_; - SourceBacklink* _tmp24_; - SourceBacklink* _tmp25_; + GeeList* _tmp17_; + gint _tmp18_; + gpointer _tmp19_; + GeeList* _tmp20_; + const gchar* _tmp21_; + SourceBacklink* _tmp22_; + SourceBacklink* _tmp23_; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp15_ = _value_index; + _tmp14_ = _value_index; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _value_index = _tmp15_ + 1; + _value_index = _tmp14_ + 1; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp16_ = _value_index; + _tmp15_ = _value_index; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp17_ = _value_size; + _tmp16_ = _value_size; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (!(_tmp16_ < _tmp17_)) { + if (!(_tmp15_ < _tmp16_)) { #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 1178 "DataSource.c" +#line 1293 "DataSource.c" } #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp18_ = _value_list; + _tmp17_ = _value_list; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp19_ = _value_index; + _tmp18_ = _value_index; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp20_ = gee_list_get (_tmp18_, _tmp19_); + _tmp19_ = gee_list_get (_tmp17_, _tmp18_); #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - value = (gchar*) _tmp20_; + value = (gchar*) _tmp19_; #line 189 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp21_ = backlinks; + _tmp20_ = backlinks; #line 189 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp22_ = name; + _tmp21_ = value; #line 189 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp23_ = value; + _tmp22_ = source_backlink_new (name, _tmp21_); #line 189 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp24_ = source_backlink_new (_tmp22_, _tmp23_); + _tmp23_ = _tmp22_; #line 189 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp25_ = _tmp24_; + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_); #line 189 "/home/jens/Source/shotwell/src/core/DataSource.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_); -#line 189 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _source_backlink_unref0 (_tmp25_); + _source_backlink_unref0 (_tmp23_); #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (value); -#line 1204 "DataSource.c" +#line 1317 "DataSource.c" } #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (_value_list); -#line 1208 "DataSource.c" +#line 1321 "DataSource.c" } #line 191 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = backlinks; @@ -1212,26 +1325,27 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { _g_object_unref0 (values); #line 191 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1216 "DataSource.c" +#line 1329 "DataSource.c" } -void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) { +void +data_source_set_backlink (DataSource* self, + SourceBacklink* backlink) +{ GeeHashMap* _tmp0_; GeeList* values = NULL; GeeHashMap* _tmp1_; - SourceBacklink* _tmp2_; + const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; - gpointer _tmp5_; - GeeList* _tmp6_; - GeeList* _tmp13_; - SourceBacklink* _tmp14_; - const gchar* _tmp15_; - const gchar* _tmp16_; + gpointer _tmp4_; + GeeList* _tmp5_; + GeeList* _tmp11_; + const gchar* _tmp12_; + const gchar* _tmp13_; SourceCollection* sources = NULL; - DataCollection* _tmp17_; - SourceCollection* _tmp18_; + DataCollection* _tmp14_; + SourceCollection* _tmp15_; #line 194 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 194 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1243,114 +1357,106 @@ void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) { #line 198 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; #line 198 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = backlink; + _tmp2_ = source_backlink_get_name (backlink); #line 198 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = source_backlink_get_name (_tmp2_); -#line 198 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 198 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_); #line 198 "/home/jens/Source/shotwell/src/core/DataSource.vala" - values = (GeeList*) _tmp5_; + values = (GeeList*) _tmp4_; #line 199 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = values; + _tmp5_ = values; #line 199 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp6_ == NULL) { -#line 1260 "DataSource.c" - GeeArrayList* _tmp7_; - GeeHashMap* _tmp8_; - SourceBacklink* _tmp9_; - const gchar* _tmp10_; - const gchar* _tmp11_; - GeeList* _tmp12_; + if (_tmp5_ == NULL) { +#line 1372 "DataSource.c" + GeeArrayList* _tmp6_; + GeeHashMap* _tmp7_; + const gchar* _tmp8_; + const gchar* _tmp9_; + GeeList* _tmp10_; #line 200 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp6_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 200 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (values); #line 200 "/home/jens/Source/shotwell/src/core/DataSource.vala" - values = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_LIST, GeeList); -#line 201 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = self->priv->backlinks; + values = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList); #line 201 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = backlink; + _tmp7_ = self->priv->backlinks; #line 201 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = source_backlink_get_name (_tmp9_); + _tmp8_ = source_backlink_get_name (backlink); #line 201 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 201 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp12_ = values; + _tmp10_ = values; #line 201 "/home/jens/Source/shotwell/src/core/DataSource.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, _tmp12_); -#line 1285 "DataSource.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, _tmp10_); +#line 1394 "DataSource.c" } #line 204 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp13_ = values; -#line 204 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp14_ = backlink; + _tmp11_ = values; #line 204 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp15_ = source_backlink_get_value (_tmp14_); + _tmp12_ = source_backlink_get_value (backlink); #line 204 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp16_ = _tmp15_; + _tmp13_ = _tmp12_; #line 204 "/home/jens/Source/shotwell/src/core/DataSource.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp16_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_); #line 206 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp17_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp14_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 206 "/home/jens/Source/shotwell/src/core/DataSource.vala" - sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_SOURCE_COLLECTION, SourceCollection); + sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_SOURCE_COLLECTION, SourceCollection); #line 207 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp18_ = sources; + _tmp15_ = sources; #line 207 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp18_ != NULL) { -#line 1305 "DataSource.c" - SourceCollection* _tmp19_; - SourceBacklink* _tmp20_; -#line 208 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp19_ = sources; + if (_tmp15_ != NULL) { +#line 1412 "DataSource.c" + SourceCollection* _tmp16_; #line 208 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp20_ = backlink; + _tmp16_ = sources; #line 208 "/home/jens/Source/shotwell/src/core/DataSource.vala" - source_collection_internal_backlink_set (_tmp19_, self, _tmp20_); -#line 1314 "DataSource.c" + source_collection_internal_backlink_set (_tmp16_, self, backlink); +#line 1418 "DataSource.c" } #line 194 "/home/jens/Source/shotwell/src/core/DataSource.vala" _data_collection_unref0 (sources); #line 194 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (values); -#line 1320 "DataSource.c" +#line 1424 "DataSource.c" } -gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink) { +gboolean +data_source_remove_backlink (DataSource* self, + SourceBacklink* backlink) +{ gboolean result = FALSE; GeeHashMap* _tmp0_; GeeList* values = NULL; GeeHashMap* _tmp1_; - SourceBacklink* _tmp2_; + const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; - gpointer _tmp5_; - GeeList* _tmp6_; + gpointer _tmp4_; + GeeList* _tmp5_; gint original_size = 0; - GeeList* _tmp7_; + GeeList* _tmp6_; + gint _tmp7_; gint _tmp8_; gint _tmp9_; - gint _tmp10_; GeeIterator* iter = NULL; - GeeList* _tmp11_; - GeeIterator* _tmp12_; - GeeList* _tmp23_; - gint _tmp24_; - gint _tmp25_; - SourceCollection* _tmp30_; - gchar* _tmp31_; - gchar* _tmp32_; + GeeList* _tmp10_; + GeeIterator* _tmp11_; + GeeList* _tmp20_; + gint _tmp21_; + gint _tmp22_; + SourceCollection* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; SourceCollection* sources = NULL; - DataCollection* _tmp33_; - SourceCollection* _tmp34_; - GeeList* _tmp37_; - gint _tmp38_; - gint _tmp39_; - gint _tmp40_; + DataCollection* _tmp29_; + SourceCollection* _tmp30_; + GeeList* _tmp32_; + gint _tmp33_; + gint _tmp34_; + gint _tmp35_; #line 211 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE); #line 211 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1363,163 +1469,149 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink result = FALSE; #line 213 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1367 "DataSource.c" +#line 1473 "DataSource.c" } #line 215 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; #line 215 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = backlink; -#line 215 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = source_backlink_get_name (_tmp2_); + _tmp2_ = source_backlink_get_name (backlink); #line 215 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 215 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_); #line 215 "/home/jens/Source/shotwell/src/core/DataSource.vala" - values = (GeeList*) _tmp5_; + values = (GeeList*) _tmp4_; #line 216 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = values; + _tmp5_ = values; #line 216 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp6_ == NULL) { + if (_tmp5_ == NULL) { #line 217 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = FALSE; #line 217 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (values); #line 217 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1391 "DataSource.c" +#line 1495 "DataSource.c" } #line 219 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = values; + _tmp6_ = values; #line 219 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); #line 219 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 219 "/home/jens/Source/shotwell/src/core/DataSource.vala" - original_size = _tmp9_; + original_size = _tmp8_; #line 220 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = original_size; + _tmp9_ = original_size; #line 220 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (_tmp10_ > 0, "original_size > 0"); + _vala_assert (_tmp9_ > 0, "original_size > 0"); #line 222 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = values; + _tmp10_ = values; #line 222 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); #line 222 "/home/jens/Source/shotwell/src/core/DataSource.vala" - iter = _tmp12_; + iter = _tmp11_; #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 1413 "DataSource.c" +#line 1517 "DataSource.c" + GeeIterator* _tmp12_; GeeIterator* _tmp13_; - gboolean _tmp14_; - GeeIterator* _tmp15_; - gpointer _tmp16_; - gchar* _tmp17_; - SourceBacklink* _tmp18_; - const gchar* _tmp19_; - const gchar* _tmp20_; - gboolean _tmp21_; -#line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp13_ = iter; + gpointer _tmp14_; + gchar* _tmp15_; + const gchar* _tmp16_; + const gchar* _tmp17_; + gboolean _tmp18_; #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp14_ = gee_iterator_next (_tmp13_); + _tmp12_ = iter; #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (!_tmp14_) { + if (!gee_iterator_next (_tmp12_)) { #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 1431 "DataSource.c" +#line 1531 "DataSource.c" } #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp15_ = iter; -#line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp16_ = gee_iterator_get (_tmp15_); + _tmp13_ = iter; #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp17_ = (gchar*) _tmp16_; + _tmp14_ = gee_iterator_get (_tmp13_); #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp18_ = backlink; + _tmp15_ = (gchar*) _tmp14_; #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp19_ = source_backlink_get_value (_tmp18_); + _tmp16_ = source_backlink_get_value (backlink); #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp20_ = _tmp19_; + _tmp17_ = _tmp16_; #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp21_ = g_strcmp0 (_tmp17_, _tmp20_) == 0; + _tmp18_ = g_strcmp0 (_tmp15_, _tmp17_) == 0; #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp15_); #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp21_) { -#line 1451 "DataSource.c" - GeeIterator* _tmp22_; + if (_tmp18_) { +#line 1549 "DataSource.c" + GeeIterator* _tmp19_; #line 225 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp22_ = iter; + _tmp19_ = iter; #line 225 "/home/jens/Source/shotwell/src/core/DataSource.vala" - gee_iterator_remove (_tmp22_); -#line 1457 "DataSource.c" + gee_iterator_remove (_tmp19_); +#line 1555 "DataSource.c" } } #line 228 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp23_ = values; + _tmp20_ = values; #line 228 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp24_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); #line 228 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp25_ = _tmp24_; + _tmp22_ = _tmp21_; #line 228 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp25_ == 0) { -#line 1468 "DataSource.c" - GeeHashMap* _tmp26_; - SourceBacklink* _tmp27_; - const gchar* _tmp28_; - const gchar* _tmp29_; -#line 229 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp26_ = self->priv->backlinks; + if (_tmp22_ == 0) { +#line 1566 "DataSource.c" + GeeHashMap* _tmp23_; + const gchar* _tmp24_; + const gchar* _tmp25_; #line 229 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp27_ = backlink; + _tmp23_ = self->priv->backlinks; #line 229 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp28_ = source_backlink_get_name (_tmp27_); + _tmp24_ = source_backlink_get_name (backlink); #line 229 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp29_ = _tmp28_; + _tmp25_ = _tmp24_; #line 229 "/home/jens/Source/shotwell/src/core/DataSource.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp29_, NULL); -#line 1483 "DataSource.c" + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp25_, NULL); +#line 1578 "DataSource.c" } #line 233 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp30_ = self->priv->unlinked_from_collection; + _tmp26_ = self->priv->unlinked_from_collection; #line 233 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp31_ = data_source_dehydrate_backlinks (self); + _tmp27_ = data_source_dehydrate_backlinks (self); #line 233 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp32_ = _tmp31_; + _tmp28_ = _tmp27_; #line 233 "/home/jens/Source/shotwell/src/core/DataSource.vala" - data_source_commit_backlinks (self, _tmp30_, _tmp32_); + data_source_commit_backlinks (self, _tmp26_, _tmp28_); #line 233 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_free0 (_tmp32_); + _g_free0 (_tmp28_); #line 235 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp33_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp29_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 235 "/home/jens/Source/shotwell/src/core/DataSource.vala" - sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_SOURCE_COLLECTION, SourceCollection); + sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_SOURCE_COLLECTION, SourceCollection); #line 236 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp34_ = sources; + _tmp30_ = sources; #line 236 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp34_ != NULL) { -#line 1503 "DataSource.c" - SourceCollection* _tmp35_; - SourceBacklink* _tmp36_; + if (_tmp30_ != NULL) { +#line 1598 "DataSource.c" + SourceCollection* _tmp31_; #line 237 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp35_ = sources; + _tmp31_ = sources; #line 237 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp36_ = backlink; -#line 237 "/home/jens/Source/shotwell/src/core/DataSource.vala" - source_collection_internal_backlink_removed (_tmp35_, self, _tmp36_); -#line 1512 "DataSource.c" + source_collection_internal_backlink_removed (_tmp31_, self, backlink); +#line 1604 "DataSource.c" } #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp37_ = values; + _tmp32_ = values; #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp38_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp33_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection)); #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp39_ = _tmp38_; + _tmp34_ = _tmp33_; #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp40_ = original_size; + _tmp35_ = original_size; #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala" - result = _tmp39_ != _tmp40_; + result = _tmp34_ != _tmp35_; #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala" _data_collection_unref0 (sources); #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1528,69 +1620,73 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink _g_object_unref0 (values); #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1532 "DataSource.c" +#line 1624 "DataSource.c" } -static void data_source_real_commit_backlinks (DataSource* self, SourceCollection* sources, const gchar* dehydrated) { +static void +data_source_real_commit_backlinks (DataSource* self, + SourceCollection* sources, + const gchar* dehydrated) +{ gboolean _tmp0_ = FALSE; - SourceCollection* _tmp1_; #line 248 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources)); #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = sources; -#line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp1_ != NULL) { + if (sources != NULL) { #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = TRUE; -#line 1547 "DataSource.c" +#line 1640 "DataSource.c" } else { - const gchar* _tmp2_; #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = dehydrated; -#line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = _tmp2_ != NULL; -#line 1554 "DataSource.c" + _tmp0_ = dehydrated != NULL; +#line 1644 "DataSource.c" } #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp0_) { -#line 1558 "DataSource.c" - gchar* _tmp3_; - gchar* _tmp4_; +#line 1648 "DataSource.c" + gchar* _tmp1_; + gchar* _tmp2_; #line 250 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp1_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 250 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 250 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_warning ("DataSource.vala:250: No implementation to commit link state for %s", _tmp4_); + g_warning ("DataSource.vala:250: No implementation to commit link state for %s", _tmp2_); #line 250 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_free0 (_tmp4_); -#line 1569 "DataSource.c" + _g_free0 (_tmp2_); +#line 1659 "DataSource.c" } } -void data_source_commit_backlinks (DataSource* self, SourceCollection* sources, const gchar* dehydrated) { +void +data_source_commit_backlinks (DataSource* self, + SourceCollection* sources, + const gchar* dehydrated) +{ #line 248 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 248 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->commit_backlinks (self, sources, dehydrated); -#line 1579 "DataSource.c" +#line 1673 "DataSource.c" } -static gchar* data_source_dehydrate_backlinks (DataSource* self) { +static gchar* +data_source_dehydrate_backlinks (DataSource* self) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; GeeHashMap* _tmp1_; GString* builder = NULL; GString* _tmp5_; - const gchar* _tmp51_ = NULL; - GString* _tmp52_; - const gchar* _tmp53_; - gint _tmp54_; - gint _tmp55_; - gchar* _tmp58_; + const gchar* _tmp49_ = NULL; + GString* _tmp50_; + const gchar* _tmp51_; + gint _tmp52_; + gint _tmp53_; + gchar* _tmp56_; #line 253 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), NULL); #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1599,7 +1695,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { if (_tmp1_ == NULL) { #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = TRUE; -#line 1603 "DataSource.c" +#line 1699 "DataSource.c" } else { GeeHashMap* _tmp2_; gint _tmp3_; @@ -1612,7 +1708,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _tmp4_ = _tmp3_; #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = _tmp4_ == 0; -#line 1616 "DataSource.c" +#line 1712 "DataSource.c" } #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp0_) { @@ -1620,13 +1716,13 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { result = NULL; #line 255 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1624 "DataSource.c" +#line 1720 "DataSource.c" } #line 257 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = g_string_new (""); #line 257 "/home/jens/Source/shotwell/src/core/DataSource.vala" builder = _tmp5_; -#line 1630 "DataSource.c" +#line 1726 "DataSource.c" { GeeIterator* _name_it = NULL; GeeHashMap* _tmp6_; @@ -1653,209 +1749,203 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _name_it = _tmp11_; #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 1657 "DataSource.c" +#line 1753 "DataSource.c" GeeIterator* _tmp12_; - gboolean _tmp13_; gchar* name = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; + GeeIterator* _tmp13_; + gpointer _tmp14_; GeeList* values = NULL; - GeeHashMap* _tmp16_; - const gchar* _tmp17_; - gpointer _tmp18_; - gboolean _tmp19_ = FALSE; - GeeList* _tmp20_; + GeeHashMap* _tmp15_; + const gchar* _tmp16_; + gpointer _tmp17_; + gboolean _tmp18_ = FALSE; + GeeList* _tmp19_; gchar* value_field = NULL; - gchar* _tmp24_; - const gchar* _tmp43_; - gint _tmp44_; - gint _tmp45_; + gchar* _tmp23_; + const gchar* _tmp41_; + gint _tmp42_; + gint _tmp43_; #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp12_ = _name_it; #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp13_ = gee_iterator_next (_tmp12_); -#line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp12_)) { #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 1682 "DataSource.c" +#line 1775 "DataSource.c" } #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp14_ = _name_it; + _tmp13_ = _name_it; #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp14_ = gee_iterator_get (_tmp13_); #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" - name = (gchar*) _tmp15_; + name = (gchar*) _tmp14_; #line 259 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp16_ = self->priv->backlinks; + _tmp15_ = self->priv->backlinks; #line 259 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp17_ = name; + _tmp16_ = name; #line 259 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp18_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_); + _tmp17_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_); #line 259 "/home/jens/Source/shotwell/src/core/DataSource.vala" - values = (GeeList*) _tmp18_; + values = (GeeList*) _tmp17_; #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp20_ = values; + _tmp19_ = values; #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp20_ == NULL) { + if (_tmp19_ == NULL) { #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp19_ = TRUE; -#line 1704 "DataSource.c" + _tmp18_ = TRUE; +#line 1797 "DataSource.c" } else { - GeeList* _tmp21_; + GeeList* _tmp20_; + gint _tmp21_; gint _tmp22_; - gint _tmp23_; #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp21_ = values; + _tmp20_ = values; #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp22_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp23_ = _tmp22_; + _tmp22_ = _tmp21_; #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp19_ = _tmp23_ == 0; -#line 1717 "DataSource.c" + _tmp18_ = _tmp22_ == 0; +#line 1810 "DataSource.c" } #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp19_) { + if (_tmp18_) { #line 261 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (values); #line 261 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (name); #line 261 "/home/jens/Source/shotwell/src/core/DataSource.vala" continue; -#line 1727 "DataSource.c" +#line 1820 "DataSource.c" } #line 263 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp24_ = g_strdup (""); + _tmp23_ = g_strdup (""); #line 263 "/home/jens/Source/shotwell/src/core/DataSource.vala" - value_field = _tmp24_; -#line 1733 "DataSource.c" + value_field = _tmp23_; +#line 1826 "DataSource.c" { GeeList* _value_list = NULL; + GeeList* _tmp24_; GeeList* _tmp25_; - GeeList* _tmp26_; gint _value_size = 0; - GeeList* _tmp27_; + GeeList* _tmp26_; + gint _tmp27_; gint _tmp28_; - gint _tmp29_; gint _value_index = 0; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp25_ = values; + _tmp24_ = values; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp26_ = _g_object_ref0 (_tmp25_); + _tmp25_ = _g_object_ref0 (_tmp24_); #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _value_list = _tmp26_; + _value_list = _tmp25_; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp27_ = _value_list; + _tmp26_ = _value_list; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp28_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp27_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection)); #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp29_ = _tmp28_; + _tmp28_ = _tmp27_; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _value_size = _tmp29_; + _value_size = _tmp28_; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" _value_index = -1; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 1761 "DataSource.c" +#line 1854 "DataSource.c" + gint _tmp29_; gint _tmp30_; gint _tmp31_; - gint _tmp32_; gchar* value = NULL; - GeeList* _tmp33_; - gint _tmp34_; - gpointer _tmp35_; - const gchar* _tmp36_; - gboolean _tmp37_; + GeeList* _tmp32_; + gint _tmp33_; + gpointer _tmp34_; + const gchar* _tmp35_; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp30_ = _value_index; + _tmp29_ = _value_index; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _value_index = _tmp30_ + 1; + _value_index = _tmp29_ + 1; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp31_ = _value_index; + _tmp30_ = _value_index; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp32_ = _value_size; + _tmp31_ = _value_size; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (!(_tmp31_ < _tmp32_)) { + if (!(_tmp30_ < _tmp31_)) { #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 1783 "DataSource.c" +#line 1875 "DataSource.c" } #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp33_ = _value_list; + _tmp32_ = _value_list; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp34_ = _value_index; + _tmp33_ = _value_index; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp35_ = gee_list_get (_tmp33_, _tmp34_); + _tmp34_ = gee_list_get (_tmp32_, _tmp33_); #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - value = (gchar*) _tmp35_; + value = (gchar*) _tmp34_; #line 265 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp36_ = value; + _tmp35_ = value; #line 265 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp37_ = is_string_empty (_tmp36_); -#line 265 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (!_tmp37_) { -#line 1799 "DataSource.c" - const gchar* _tmp38_; - const gchar* _tmp39_; + if (!is_string_empty (_tmp35_)) { +#line 1889 "DataSource.c" + const gchar* _tmp36_; + const gchar* _tmp37_; + gchar* _tmp38_; + gchar* _tmp39_; gchar* _tmp40_; - gchar* _tmp41_; - gchar* _tmp42_; #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp38_ = value_field; + _tmp36_ = value_field; #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp39_ = value; + _tmp37_ = value; #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp40_ = g_strconcat (_tmp39_, "|", NULL); + _tmp38_ = g_strconcat (_tmp37_, "|", NULL); #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp41_ = _tmp40_; + _tmp39_ = _tmp38_; #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp42_ = g_strconcat (_tmp38_, _tmp41_, NULL); + _tmp40_ = g_strconcat (_tmp36_, _tmp39_, NULL); #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (value_field); #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" - value_field = _tmp42_; + value_field = _tmp40_; #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_free0 (_tmp41_); -#line 1821 "DataSource.c" + _g_free0 (_tmp39_); +#line 1911 "DataSource.c" } #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (value); -#line 1825 "DataSource.c" +#line 1915 "DataSource.c" } #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (_value_list); -#line 1829 "DataSource.c" +#line 1919 "DataSource.c" } #line 269 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp43_ = value_field; + _tmp41_ = value_field; #line 269 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp44_ = strlen (_tmp43_); + _tmp42_ = strlen (_tmp41_); #line 269 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp45_ = _tmp44_; + _tmp43_ = _tmp42_; #line 269 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp45_ > 0) { -#line 1839 "DataSource.c" - GString* _tmp46_; - const gchar* _tmp47_; - const gchar* _tmp48_; - gchar* _tmp49_; - gchar* _tmp50_; + if (_tmp43_ > 0) { +#line 1929 "DataSource.c" + GString* _tmp44_; + const gchar* _tmp45_; + const gchar* _tmp46_; + gchar* _tmp47_; + gchar* _tmp48_; #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp46_ = builder; + _tmp44_ = builder; #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp47_ = name; + _tmp45_ = name; #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp48_ = value_field; + _tmp46_ = value_field; #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp49_ = g_strdup_printf ("%s=%s\n", _tmp47_, _tmp48_); + _tmp47_ = g_strdup_printf ("%s=%s\n", _tmp45_, _tmp46_); #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp50_ = _tmp49_; + _tmp48_ = _tmp47_; #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_string_append (_tmp46_, _tmp50_); + g_string_append (_tmp44_, _tmp48_); #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_free0 (_tmp50_); -#line 1859 "DataSource.c" + _g_free0 (_tmp48_); +#line 1949 "DataSource.c" } #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (value_field); @@ -1863,310 +1953,305 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _g_object_unref0 (values); #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (name); -#line 1867 "DataSource.c" +#line 1957 "DataSource.c" } #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (_name_it); -#line 1871 "DataSource.c" +#line 1961 "DataSource.c" } #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp52_ = builder; + _tmp50_ = builder; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp53_ = _tmp52_->str; + _tmp51_ = _tmp50_->str; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp54_ = strlen (_tmp53_); + _tmp52_ = strlen (_tmp51_); #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp55_ = _tmp54_; + _tmp53_ = _tmp52_; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp55_ > 0) { -#line 1883 "DataSource.c" - GString* _tmp56_; - const gchar* _tmp57_; + if (_tmp53_ > 0) { +#line 1973 "DataSource.c" + GString* _tmp54_; + const gchar* _tmp55_; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp56_ = builder; + _tmp54_ = builder; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp57_ = _tmp56_->str; + _tmp55_ = _tmp54_->str; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp51_ = _tmp57_; -#line 1892 "DataSource.c" + _tmp49_ = _tmp55_; +#line 1982 "DataSource.c" } else { #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp51_ = NULL; -#line 1896 "DataSource.c" + _tmp49_ = NULL; +#line 1986 "DataSource.c" } #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp58_ = g_strdup (_tmp51_); + _tmp56_ = g_strdup (_tmp49_); #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - result = _tmp58_; + result = _tmp56_; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_string_free0 (builder); #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1906 "DataSource.c" +#line 1996 "DataSource.c" } -void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlinked_from, const gchar* dehydrated) { - SourceCollection* _tmp0_; - GeeHashMap* _tmp1_; - const gchar* _tmp2_; +void +data_source_rehydrate_backlinks (DataSource* self, + SourceCollection* unlinked_from, + const gchar* dehydrated) +{ + GeeHashMap* _tmp0_; gchar** lines = NULL; - const gchar* _tmp3_; - gchar** _tmp4_; - gchar** _tmp5_; + gchar** _tmp1_; + gchar** _tmp2_; gint lines_length1; gint _lines_size_; - gchar** _tmp6_; - gint _tmp6__length1; + gchar** _tmp3_; + gint _tmp3__length1; #line 278 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 278 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_COLLECTION (unlinked_from)); #line 279 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = unlinked_from; -#line 279 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->unlinked_from_collection = _tmp0_; + self->priv->unlinked_from_collection = unlinked_from; #line 280 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 280 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (self->priv->backlinks); #line 280 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->backlinks = _tmp1_; + self->priv->backlinks = _tmp0_; #line 282 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = dehydrated; -#line 282 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp2_ == NULL) { + if (dehydrated == NULL) { #line 283 "/home/jens/Source/shotwell/src/core/DataSource.vala" return; -#line 1942 "DataSource.c" +#line 2029 "DataSource.c" } #line 285 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = dehydrated; -#line 285 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = _tmp4_ = g_strsplit (_tmp3_, "\n", 0); + _tmp2_ = _tmp1_ = g_strsplit (dehydrated, "\n", 0); #line 285 "/home/jens/Source/shotwell/src/core/DataSource.vala" - lines = _tmp5_; + lines = _tmp2_; #line 285 "/home/jens/Source/shotwell/src/core/DataSource.vala" - lines_length1 = _vala_array_length (_tmp4_); + lines_length1 = _vala_array_length (_tmp1_); #line 285 "/home/jens/Source/shotwell/src/core/DataSource.vala" _lines_size_ = lines_length1; #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = lines; + _tmp3_ = lines; #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6__length1 = lines_length1; -#line 1958 "DataSource.c" + _tmp3__length1 = lines_length1; +#line 2043 "DataSource.c" { gchar** line_collection = NULL; gint line_collection_length1 = 0; gint _line_collection_size_ = 0; gint line_it = 0; #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" - line_collection = _tmp6_; + line_collection = _tmp3_; #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" - line_collection_length1 = _tmp6__length1; + line_collection_length1 = _tmp3__length1; #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" - for (line_it = 0; line_it < _tmp6__length1; line_it = line_it + 1) { -#line 1970 "DataSource.c" - gchar* _tmp7_; + for (line_it = 0; line_it < _tmp3__length1; line_it = line_it + 1) { +#line 2055 "DataSource.c" + gchar* _tmp4_; gchar* line = NULL; #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = g_strdup (line_collection[line_it]); + _tmp4_ = g_strdup (line_collection[line_it]); #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" - line = _tmp7_; -#line 1977 "DataSource.c" + line = _tmp4_; +#line 2062 "DataSource.c" { - const gchar* _tmp8_; - gint _tmp9_; - gint _tmp10_; + const gchar* _tmp5_; + gint _tmp6_; + gint _tmp7_; gchar** tokens = NULL; - const gchar* _tmp11_; - gchar** _tmp12_; - gchar** _tmp13_; + const gchar* _tmp8_; + gchar** _tmp9_; + gchar** _tmp10_; gint tokens_length1; gint _tokens_size_; - gchar** _tmp14_; - gint _tmp14__length1; + gchar** _tmp11_; + gint _tmp11__length1; gchar** decoded_values = NULL; + gchar** _tmp15_; + gint _tmp15__length1; + const gchar* _tmp16_; + gchar** _tmp17_; gchar** _tmp18_; - gint _tmp18__length1; - const gchar* _tmp19_; - gchar** _tmp20_; - gchar** _tmp21_; gint decoded_values_length1; gint _decoded_values_size_; GeeList* values = NULL; - GeeArrayList* _tmp22_; - gchar** _tmp23_; - gint _tmp23__length1; - GeeList* _tmp32_; - gint _tmp33_; - gint _tmp34_; + GeeArrayList* _tmp19_; + gchar** _tmp20_; + gint _tmp20__length1; + GeeList* _tmp29_; + gint _tmp30_; + gint _tmp31_; #line 287 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = line; + _tmp5_ = line; #line 287 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = strlen (_tmp8_); + _tmp6_ = strlen (_tmp5_); #line 287 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = _tmp9_; + _tmp7_ = _tmp6_; #line 287 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp10_ == 0) { + if (_tmp7_ == 0) { #line 288 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (line); #line 288 "/home/jens/Source/shotwell/src/core/DataSource.vala" continue; -#line 2017 "DataSource.c" +#line 2102 "DataSource.c" } #line 290 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = line; + _tmp8_ = line; #line 290 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp13_ = _tmp12_ = g_strsplit (_tmp11_, "=", 2); + _tmp10_ = _tmp9_ = g_strsplit (_tmp8_, "=", 2); #line 290 "/home/jens/Source/shotwell/src/core/DataSource.vala" - tokens = _tmp13_; + tokens = _tmp10_; #line 290 "/home/jens/Source/shotwell/src/core/DataSource.vala" - tokens_length1 = _vala_array_length (_tmp12_); + tokens_length1 = _vala_array_length (_tmp9_); #line 290 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tokens_size_ = tokens_length1; #line 291 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp14_ = tokens; + _tmp11_ = tokens; #line 291 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp14__length1 = tokens_length1; + _tmp11__length1 = tokens_length1; #line 291 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp14__length1 < 2) { -#line 2035 "DataSource.c" - const gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; + if (_tmp11__length1 < 2) { +#line 2120 "DataSource.c" + const gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; #line 292 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp15_ = line; + _tmp12_ = line; #line 292 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp16_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp13_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 292 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp17_ = _tmp16_; + _tmp14_ = _tmp13_; #line 292 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_warning ("DataSource.vala:292: Unable to rehydrate \"%s\" for %s: name and value" \ -" not present", _tmp15_, _tmp17_); +" not present", _tmp12_, _tmp14_); #line 292 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp14_); #line 295 "/home/jens/Source/shotwell/src/core/DataSource.vala" tokens = (_vala_array_free (tokens, tokens_length1, (GDestroyNotify) g_free), NULL); #line 295 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (line); #line 295 "/home/jens/Source/shotwell/src/core/DataSource.vala" continue; -#line 2055 "DataSource.c" +#line 2140 "DataSource.c" } #line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp18_ = tokens; + _tmp15_ = tokens; #line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp18__length1 = tokens_length1; + _tmp15__length1 = tokens_length1; #line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp19_ = _tmp18_[1]; + _tmp16_ = _tmp15_[1]; #line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp21_ = _tmp20_ = g_strsplit (_tmp19_, "|", 0); + _tmp18_ = _tmp17_ = g_strsplit (_tmp16_, "|", 0); #line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala" - decoded_values = _tmp21_; + decoded_values = _tmp18_; #line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala" - decoded_values_length1 = _vala_array_length (_tmp20_); + decoded_values_length1 = _vala_array_length (_tmp17_); #line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala" _decoded_values_size_ = decoded_values_length1; #line 299 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp22_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp19_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 299 "/home/jens/Source/shotwell/src/core/DataSource.vala" - values = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_LIST, GeeList); + values = G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_LIST, GeeList); #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp23_ = decoded_values; + _tmp20_ = decoded_values; #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp23__length1 = decoded_values_length1; -#line 2079 "DataSource.c" + _tmp20__length1 = decoded_values_length1; +#line 2164 "DataSource.c" { gchar** value_collection = NULL; gint value_collection_length1 = 0; gint _value_collection_size_ = 0; gint value_it = 0; #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" - value_collection = _tmp23_; + value_collection = _tmp20_; #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" - value_collection_length1 = _tmp23__length1; + value_collection_length1 = _tmp20__length1; #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" - for (value_it = 0; value_it < _tmp23__length1; value_it = value_it + 1) { -#line 2091 "DataSource.c" - gchar* _tmp24_; + for (value_it = 0; value_it < _tmp20__length1; value_it = value_it + 1) { +#line 2176 "DataSource.c" + gchar* _tmp21_; gchar* value = NULL; #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp24_ = g_strdup (value_collection[value_it]); + _tmp21_ = g_strdup (value_collection[value_it]); #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" - value = _tmp24_; -#line 2098 "DataSource.c" + value = _tmp21_; +#line 2183 "DataSource.c" { - gboolean _tmp25_ = FALSE; - const gchar* _tmp26_; + gboolean _tmp22_ = FALSE; + const gchar* _tmp23_; #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp26_ = value; + _tmp23_ = value; #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp26_ != NULL) { -#line 2106 "DataSource.c" - const gchar* _tmp27_; - gint _tmp28_; - gint _tmp29_; + if (_tmp23_ != NULL) { +#line 2191 "DataSource.c" + const gchar* _tmp24_; + gint _tmp25_; + gint _tmp26_; #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp27_ = value; + _tmp24_ = value; #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp28_ = strlen (_tmp27_); + _tmp25_ = strlen (_tmp24_); #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp29_ = _tmp28_; + _tmp26_ = _tmp25_; #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp25_ = _tmp29_ > 0; -#line 2118 "DataSource.c" + _tmp22_ = _tmp26_ > 0; +#line 2203 "DataSource.c" } else { #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp25_ = FALSE; -#line 2122 "DataSource.c" + _tmp22_ = FALSE; +#line 2207 "DataSource.c" } #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp25_) { -#line 2126 "DataSource.c" - GeeList* _tmp30_; - const gchar* _tmp31_; + if (_tmp22_) { +#line 2211 "DataSource.c" + GeeList* _tmp27_; + const gchar* _tmp28_; #line 302 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp30_ = values; + _tmp27_ = values; #line 302 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp31_ = value; + _tmp28_ = value; #line 302 "/home/jens/Source/shotwell/src/core/DataSource.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), _tmp31_); -#line 2135 "DataSource.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_); +#line 2220 "DataSource.c" } #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (value); -#line 2139 "DataSource.c" +#line 2224 "DataSource.c" } } } #line 305 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp32_ = values; + _tmp29_ = values; #line 305 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp33_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp30_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection)); #line 305 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp34_ = _tmp33_; + _tmp31_ = _tmp30_; #line 305 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp34_ > 0) { -#line 2151 "DataSource.c" - GeeHashMap* _tmp35_; - gchar** _tmp36_; - gint _tmp36__length1; - const gchar* _tmp37_; - GeeList* _tmp38_; + if (_tmp31_ > 0) { +#line 2236 "DataSource.c" + GeeHashMap* _tmp32_; + gchar** _tmp33_; + gint _tmp33__length1; + const gchar* _tmp34_; + GeeList* _tmp35_; #line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp35_ = self->priv->backlinks; + _tmp32_ = self->priv->backlinks; #line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp36_ = tokens; + _tmp33_ = tokens; #line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp36__length1 = tokens_length1; + _tmp33__length1 = tokens_length1; #line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp37_ = _tmp36_[0]; + _tmp34_ = _tmp33_[0]; #line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp38_ = values; + _tmp35_ = values; #line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp37_, _tmp38_); -#line 2169 "DataSource.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp34_, _tmp35_); +#line 2254 "DataSource.c" } #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (values); @@ -2176,88 +2261,105 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink tokens = (_vala_array_free (tokens, tokens_length1, (GDestroyNotify) g_free), NULL); #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (line); -#line 2179 "DataSource.c" +#line 2264 "DataSource.c" } } } #line 278 "/home/jens/Source/shotwell/src/core/DataSource.vala" lines = (_vala_array_free (lines, lines_length1, (GDestroyNotify) g_free), NULL); -#line 2185 "DataSource.c" +#line 2270 "DataSource.c" } -static SourceSnapshot* data_source_real_save_snapshot (DataSource* self) { +static SourceSnapshot* +data_source_real_save_snapshot (DataSource* self) +{ SourceSnapshot* result = NULL; #line 312 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = NULL; #line 312 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 2195 "DataSource.c" +#line 2282 "DataSource.c" } -SourceSnapshot* data_source_save_snapshot (DataSource* self) { +SourceSnapshot* +data_source_save_snapshot (DataSource* self) +{ #line 311 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), NULL); #line 311 "/home/jens/Source/shotwell/src/core/DataSource.vala" return DATA_SOURCE_GET_CLASS (self)->save_snapshot (self); -#line 2204 "DataSource.c" +#line 2293 "DataSource.c" } -void data_source_internal_mark_for_destroy (DataSource* self) { +void +data_source_internal_mark_for_destroy (DataSource* self) +{ #line 316 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 317 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->marked_for_destroy = TRUE; -#line 2213 "DataSource.c" +#line 2304 "DataSource.c" } -static gboolean data_source_real_internal_delete_backing (DataSource* self, GError** error) { +static gboolean +data_source_real_internal_delete_backing (DataSource* self, + GError** error) +{ gboolean result = FALSE; #line 325 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = TRUE; #line 325 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 2223 "DataSource.c" +#line 2317 "DataSource.c" } -gboolean data_source_internal_delete_backing (DataSource* self, GError** error) { +gboolean +data_source_internal_delete_backing (DataSource* self, + GError** error) +{ #line 324 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE); #line 324 "/home/jens/Source/shotwell/src/core/DataSource.vala" return DATA_SOURCE_GET_CLASS (self)->internal_delete_backing (self, error); -#line 2232 "DataSource.c" +#line 2329 "DataSource.c" } -static gboolean data_source_real_equals (DataSource* self, DataSource* source) { +static gboolean +data_source_real_equals (DataSource* self, + DataSource* source) +{ gboolean result = FALSE; - DataSource* _tmp0_; #line 330 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail ((source == NULL) || IS_DATA_SOURCE (source), FALSE); #line 331 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = source; -#line 331 "/home/jens/Source/shotwell/src/core/DataSource.vala" - result = self == _tmp0_; + result = self == source; #line 331 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 2247 "DataSource.c" +#line 2344 "DataSource.c" } -gboolean data_source_equals (DataSource* self, DataSource* source) { +gboolean +data_source_equals (DataSource* self, + DataSource* source) +{ #line 330 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE); #line 330 "/home/jens/Source/shotwell/src/core/DataSource.vala" return DATA_SOURCE_GET_CLASS (self)->equals (self, source); -#line 2256 "DataSource.c" +#line 2356 "DataSource.c" } -static void data_source_real_destroy (DataSource* self) { +static void +data_source_real_destroy (DataSource* self) +{ gboolean _tmp0_; #line 341 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = self->priv->marked_for_destroy; @@ -2265,19 +2367,19 @@ static void data_source_real_destroy (DataSource* self) { _vala_assert (_tmp0_, "marked_for_destroy"); #line 344 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->is_destroyed = TRUE; -#line 2268 "DataSource.c" +#line 2370 "DataSource.c" { gint ctr = 0; #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = 0; -#line 2273 "DataSource.c" +#line 2375 "DataSource.c" { gboolean _tmp1_ = FALSE; #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = TRUE; #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 2280 "DataSource.c" +#line 2382 "DataSource.c" gint _tmp3_; DataView** _tmp4_; gint _tmp4__length1; @@ -2287,13 +2389,13 @@ static void data_source_real_destroy (DataSource* self) { DataView* _tmp7_; #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp1_) { -#line 2290 "DataSource.c" +#line 2392 "DataSource.c" gint _tmp2_; #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = ctr; #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = _tmp2_ + 1; -#line 2296 "DataSource.c" +#line 2398 "DataSource.c" } #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; @@ -2307,7 +2409,7 @@ static void data_source_real_destroy (DataSource* self) { if (!(_tmp3_ < _tmp4__length1)) { #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 2310 "DataSource.c" +#line 2412 "DataSource.c" } #line 348 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->subscribers; @@ -2319,7 +2421,7 @@ static void data_source_real_destroy (DataSource* self) { _tmp7_ = _tmp5_[_tmp6_]; #line 348 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp7_ != NULL) { -#line 2322 "DataSource.c" +#line 2424 "DataSource.c" DataView* view = NULL; DataView** _tmp8_; gint _tmp8__length1; @@ -2361,116 +2463,115 @@ static void data_source_real_destroy (DataSource* self) { data_view_notify_unsubscribed (_tmp15_, self); #line 348 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (view); -#line 2364 "DataSource.c" +#line 2466 "DataSource.c" } } } } #line 357 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_signal_emit (self, data_source_signals[DATA_SOURCE_DESTROYED_SIGNAL], 0); -#line 2371 "DataSource.c" +#line 2473 "DataSource.c" } -void data_source_destroy (DataSource* self) { +void +data_source_destroy (DataSource* self) +{ #line 340 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 340 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->destroy (self); -#line 2380 "DataSource.c" +#line 2484 "DataSource.c" } -gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) { +gboolean +data_source_destroy_orphan (DataSource* self, + gboolean delete_backing) +{ gboolean result = FALSE; gboolean ret = FALSE; - gboolean _tmp0_; - SourceCollection* _tmp11_; + SourceCollection* _tmp9_; GError * _inner_error_ = NULL; #line 366 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE); #line 367 "/home/jens/Source/shotwell/src/core/DataSource.vala" ret = TRUE; #line 368 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = delete_backing; -#line 368 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp0_) { -#line 2398 "DataSource.c" + if (delete_backing) { +#line 2502 "DataSource.c" { - gboolean _tmp1_ = FALSE; - gboolean _tmp2_; - gboolean _tmp3_; -#line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = data_source_internal_delete_backing (self, &_inner_error_); + gboolean _tmp0_ = FALSE; + gboolean _tmp1_; #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = _tmp2_; + _tmp0_ = data_source_internal_delete_backing (self, &_inner_error_); #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2409 "DataSource.c" +#line 2510 "DataSource.c" goto __catch54_g_error; } #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ret = _tmp1_; + ret = _tmp0_; #line 371 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = ret; + _tmp1_ = ret; #line 371 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (!_tmp3_) { -#line 2418 "DataSource.c" - gchar* _tmp4_; - gchar* _tmp5_; + if (!_tmp1_) { +#line 2519 "DataSource.c" + gchar* _tmp2_; + gchar* _tmp3_; #line 372 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp2_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 372 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 372 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_warning ("DataSource.vala:372: Unable to delete backing for %s", _tmp5_); + g_warning ("DataSource.vala:372: Unable to delete backing for %s", _tmp3_); #line 372 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_free0 (_tmp5_); -#line 2429 "DataSource.c" + _g_free0 (_tmp3_); +#line 2530 "DataSource.c" } } goto __finally54; __catch54_g_error: { GError* err = NULL; - gchar* _tmp6_; - gchar* _tmp7_; - GError* _tmp8_; - const gchar* _tmp9_; + gchar* _tmp4_; + gchar* _tmp5_; + GError* _tmp6_; + const gchar* _tmp7_; #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" err = _inner_error_; #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" _inner_error_ = NULL; #line 375 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 375 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 375 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = err; + _tmp6_ = err; #line 375 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = _tmp8_->message; + _tmp7_ = _tmp6_->message; #line 375 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_warning ("DataSource.vala:375: Unable to delete backing for %s: %s", _tmp7_, _tmp9_); + g_warning ("DataSource.vala:375: Unable to delete backing for %s: %s", _tmp5_, _tmp7_); #line 375 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp5_); #line 376 "/home/jens/Source/shotwell/src/core/DataSource.vala" ret = FALSE; #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_error_free0 (err); -#line 2460 "DataSource.c" +#line 2561 "DataSource.c" } __finally54: #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2465 "DataSource.c" - gboolean _tmp10_ = FALSE; +#line 2566 "DataSource.c" + gboolean _tmp8_ = FALSE; #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_clear_error (&_inner_error_); #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" - return _tmp10_; -#line 2473 "DataSource.c" + return _tmp8_; +#line 2574 "DataSource.c" } } #line 380 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2478,48 +2579,55 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) #line 381 "/home/jens/Source/shotwell/src/core/DataSource.vala" data_source_destroy (self); #line 383 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = self->priv->unlinked_from_collection; + _tmp9_ = self->priv->unlinked_from_collection; #line 383 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp11_ != NULL) { -#line 2484 "DataSource.c" - SourceCollection* _tmp12_; + if (_tmp9_ != NULL) { +#line 2585 "DataSource.c" + SourceCollection* _tmp10_; #line 384 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp12_ = self->priv->unlinked_from_collection; + _tmp10_ = self->priv->unlinked_from_collection; #line 384 "/home/jens/Source/shotwell/src/core/DataSource.vala" - source_collection_notify_unlinked_destroyed (_tmp12_, self); -#line 2490 "DataSource.c" + source_collection_notify_unlinked_destroyed (_tmp10_, self); +#line 2591 "DataSource.c" } #line 386 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = ret; #line 386 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 2496 "DataSource.c" +#line 2597 "DataSource.c" } -static void _vala_array_add66 (DataView** * array, int* length, int* size, DataView* value) { +static void +_vala_array_add66 (DataView** * array, + int* length, + int* size, + DataView* value) +{ #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" if ((*length) == (*size)) { #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" *size = (*size) ? (2 * (*size)) : 4; #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" *array = g_renew (DataView*, *array, (*size) + 1); -#line 2507 "DataSource.c" +#line 2613 "DataSource.c" } #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" (*array)[(*length)++] = value; #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" (*array)[*length] = NULL; -#line 2513 "DataSource.c" +#line 2619 "DataSource.c" } -void data_source_internal_subscribe (DataSource* self, DataView* view) { +void +data_source_internal_subscribe (DataSource* self, + DataView* view) +{ gboolean _tmp0_; - DataView** _tmp13_; - gint _tmp13__length1; - DataView* _tmp14_; - DataView* _tmp15_; + DataView** _tmp12_; + gint _tmp12__length1; + DataView* _tmp13_; #line 395 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 395 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2528,19 +2636,19 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) { _tmp0_ = self->priv->in_contact; #line 396 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (!_tmp0_, "!in_contact"); -#line 2531 "DataSource.c" +#line 2639 "DataSource.c" { gint ctr = 0; #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = 0; -#line 2536 "DataSource.c" +#line 2644 "DataSource.c" { gboolean _tmp1_ = FALSE; #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = TRUE; #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 2543 "DataSource.c" +#line 2651 "DataSource.c" gint _tmp3_; DataView** _tmp4_; gint _tmp4__length1; @@ -2550,13 +2658,13 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) { DataView* _tmp7_; #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp1_) { -#line 2553 "DataSource.c" +#line 2661 "DataSource.c" gint _tmp2_; #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = ctr; #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = _tmp2_ + 1; -#line 2559 "DataSource.c" +#line 2667 "DataSource.c" } #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; @@ -2570,7 +2678,7 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) { if (!(_tmp3_ < _tmp4__length1)) { #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 2573 "DataSource.c" +#line 2681 "DataSource.c" } #line 399 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->subscribers; @@ -2582,13 +2690,12 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) { _tmp7_ = _tmp5_[_tmp6_]; #line 399 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp7_ == NULL) { -#line 2585 "DataSource.c" +#line 2693 "DataSource.c" DataView** _tmp8_; gint _tmp8__length1; gint _tmp9_; DataView* _tmp10_; DataView* _tmp11_; - DataView* _tmp12_; #line 400 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp8_ = self->priv->subscribers; #line 400 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2596,37 +2703,36 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) { #line 400 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp9_ = ctr; #line 400 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = view; -#line 400 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = _g_object_ref0 (_tmp10_); + _tmp10_ = _g_object_ref0 (view); #line 400 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (_tmp8_[_tmp9_]); #line 400 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_[_tmp9_] = _tmp11_; + _tmp8_[_tmp9_] = _tmp10_; #line 400 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp12_ = _tmp8_[_tmp9_]; + _tmp11_ = _tmp8_[_tmp9_]; #line 402 "/home/jens/Source/shotwell/src/core/DataSource.vala" return; -#line 2610 "DataSource.c" +#line 2715 "DataSource.c" } } } } #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp13_ = self->priv->subscribers; + _tmp12_ = self->priv->subscribers; #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp13__length1 = self->priv->subscribers_length1; + _tmp12__length1 = self->priv->subscribers_length1; #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp14_ = view; + _tmp13_ = _g_object_ref0 (view); #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp15_ = _g_object_ref0 (_tmp14_); -#line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_array_add66 (&self->priv->subscribers, &self->priv->subscribers_length1, &self->priv->_subscribers_size_, _tmp15_); -#line 2625 "DataSource.c" + _vala_array_add66 (&self->priv->subscribers, &self->priv->subscribers_length1, &self->priv->_subscribers_size_, _tmp13_); +#line 2728 "DataSource.c" } -void data_source_internal_unsubscribe (DataSource* self, DataView* view) { +void +data_source_internal_unsubscribe (DataSource* self, + DataView* view) +{ gboolean _tmp0_; #line 411 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); @@ -2636,19 +2742,19 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) { _tmp0_ = self->priv->in_contact; #line 412 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (!_tmp0_, "!in_contact"); -#line 2639 "DataSource.c" +#line 2745 "DataSource.c" { gint ctr = 0; #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = 0; -#line 2644 "DataSource.c" +#line 2750 "DataSource.c" { gboolean _tmp1_ = FALSE; #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = TRUE; #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 2651 "DataSource.c" +#line 2757 "DataSource.c" gint _tmp3_; DataView** _tmp4_; gint _tmp4__length1; @@ -2656,16 +2762,15 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) { gint _tmp5__length1; gint _tmp6_; DataView* _tmp7_; - DataView* _tmp8_; #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp1_) { -#line 2662 "DataSource.c" +#line 2767 "DataSource.c" gint _tmp2_; #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = ctr; #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = _tmp2_ + 1; -#line 2668 "DataSource.c" +#line 2773 "DataSource.c" } #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; @@ -2679,7 +2784,7 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) { if (!(_tmp3_ < _tmp4__length1)) { #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 2682 "DataSource.c" +#line 2787 "DataSource.c" } #line 415 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->subscribers; @@ -2690,29 +2795,27 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) { #line 415 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp7_ = _tmp5_[_tmp6_]; #line 415 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = view; -#line 415 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp7_ == _tmp8_) { -#line 2696 "DataSource.c" - DataView** _tmp9_; - gint _tmp9__length1; - gint _tmp10_; - DataView* _tmp11_; + if (_tmp7_ == view) { +#line 2799 "DataSource.c" + DataView** _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + DataView* _tmp10_; #line 416 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = self->priv->subscribers; + _tmp8_ = self->priv->subscribers; #line 416 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9__length1 = self->priv->subscribers_length1; + _tmp8__length1 = self->priv->subscribers_length1; #line 416 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = ctr; + _tmp9_ = ctr; #line 416 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_object_unref0 (_tmp9_[_tmp10_]); + _g_object_unref0 (_tmp8_[_tmp9_]); #line 416 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_[_tmp10_] = NULL; + _tmp8_[_tmp9_] = NULL; #line 416 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = _tmp9_[_tmp10_]; + _tmp10_ = _tmp8_[_tmp9_]; #line 418 "/home/jens/Source/shotwell/src/core/DataSource.vala" return; -#line 2715 "DataSource.c" +#line 2818 "DataSource.c" } } } @@ -2720,7 +2823,11 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) { } -void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscriber contact_subscriber, void* contact_subscriber_target) { +void +data_source_contact_subscribers (DataSource* self, + DataSourceContactSubscriber contact_subscriber, + void* contact_subscriber_target) +{ gboolean _tmp0_; #line 423 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); @@ -2730,19 +2837,19 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri _vala_assert (!_tmp0_, "!in_contact"); #line 426 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->in_contact = TRUE; -#line 2733 "DataSource.c" +#line 2840 "DataSource.c" { gint ctr = 0; #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = 0; -#line 2738 "DataSource.c" +#line 2845 "DataSource.c" { gboolean _tmp1_ = FALSE; #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = TRUE; #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 2745 "DataSource.c" +#line 2852 "DataSource.c" gint _tmp3_; DataView** _tmp4_; gint _tmp4__length1; @@ -2752,13 +2859,13 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri DataView* _tmp7_; #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp1_) { -#line 2755 "DataSource.c" +#line 2862 "DataSource.c" gint _tmp2_; #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = ctr; #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = _tmp2_ + 1; -#line 2761 "DataSource.c" +#line 2868 "DataSource.c" } #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; @@ -2772,7 +2879,7 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri if (!(_tmp3_ < _tmp4__length1)) { #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 2775 "DataSource.c" +#line 2882 "DataSource.c" } #line 428 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->subscribers; @@ -2784,39 +2891,36 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri _tmp7_ = _tmp5_[_tmp6_]; #line 428 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp7_ != NULL) { -#line 2787 "DataSource.c" - DataSourceContactSubscriber _tmp8_; - void* _tmp8__target; - DataView** _tmp9_; - gint _tmp9__length1; - gint _tmp10_; - DataView* _tmp11_; -#line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = contact_subscriber; -#line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8__target = contact_subscriber_target; +#line 2894 "DataSource.c" + DataView** _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + DataView* _tmp10_; #line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = self->priv->subscribers; + _tmp8_ = self->priv->subscribers; #line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9__length1 = self->priv->subscribers_length1; + _tmp8__length1 = self->priv->subscribers_length1; #line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = ctr; + _tmp9_ = ctr; #line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = _tmp9_[_tmp10_]; + _tmp10_ = _tmp8_[_tmp9_]; #line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ (_tmp11_, _tmp8__target); -#line 2808 "DataSource.c" + contact_subscriber (_tmp10_, contact_subscriber_target); +#line 2909 "DataSource.c" } } } } #line 431 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->in_contact = FALSE; -#line 2815 "DataSource.c" +#line 2916 "DataSource.c" } -void data_source_contact_subscribers_alteration (DataSource* self, Alteration* alteration) { +void +data_source_contact_subscribers_alteration (DataSource* self, + Alteration* alteration) +{ gboolean _tmp0_; #line 434 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); @@ -2828,19 +2932,19 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a _vala_assert (!_tmp0_, "!in_contact"); #line 437 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->in_contact = TRUE; -#line 2831 "DataSource.c" +#line 2935 "DataSource.c" { gint ctr = 0; #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = 0; -#line 2836 "DataSource.c" +#line 2940 "DataSource.c" { gboolean _tmp1_ = FALSE; #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = TRUE; #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 2843 "DataSource.c" +#line 2947 "DataSource.c" gint _tmp3_; DataView** _tmp4_; gint _tmp4__length1; @@ -2850,13 +2954,13 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a DataView* _tmp7_; #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp1_) { -#line 2853 "DataSource.c" +#line 2957 "DataSource.c" gint _tmp2_; #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = ctr; #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = _tmp2_ + 1; -#line 2859 "DataSource.c" +#line 2963 "DataSource.c" } #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; @@ -2870,7 +2974,7 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a if (!(_tmp3_ < _tmp4__length1)) { #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 2873 "DataSource.c" +#line 2977 "DataSource.c" } #line 439 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->subscribers; @@ -2882,12 +2986,11 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a _tmp7_ = _tmp5_[_tmp6_]; #line 439 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp7_ != NULL) { -#line 2885 "DataSource.c" +#line 2989 "DataSource.c" DataView** _tmp8_; gint _tmp8__length1; gint _tmp9_; DataView* _tmp10_; - Alteration* _tmp11_; #line 440 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp8_ = self->priv->subscribers; #line 440 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2897,28 +3000,36 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a #line 440 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp10_ = _tmp8_[_tmp9_]; #line 440 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = alteration; -#line 440 "/home/jens/Source/shotwell/src/core/DataSource.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject), _tmp11_); -#line 2903 "DataSource.c" + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject), alteration); +#line 3004 "DataSource.c" } } } } #line 442 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->in_contact = FALSE; -#line 2910 "DataSource.c" +#line 3011 "DataSource.c" } -static void data_source_real_unlinked (DataSource* self, SourceCollection* sources) { +static void +data_source_real_unlinked (DataSource* self, + SourceCollection* sources) +{ #line 51 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_COLLECTION (sources)); -#line 2917 "DataSource.c" +#line 3021 "DataSource.c" } -static void g_cclosure_user_marshal_VOID__DATA_COLLECTION (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__DATA_COLLECTION (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__DATA_COLLECTION) (gpointer data1, gpointer arg_1, gpointer data2); register GMarshalFunc_VOID__DATA_COLLECTION callback; register GCClosure * cc; @@ -2933,34 +3044,41 @@ static void g_cclosure_user_marshal_VOID__DATA_COLLECTION (GClosure * closure, G data1 = closure->data; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" data2 = param_values->data[0].v_pointer; -#line 2936 "DataSource.c" +#line 3047 "DataSource.c" } else { #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" data1 = param_values->data[0].v_pointer; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" data2 = closure->data; -#line 2942 "DataSource.c" +#line 3053 "DataSource.c" } #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" callback = (GMarshalFunc_VOID__DATA_COLLECTION) (marshal_data ? marshal_data : cc->callback); #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" callback (data1, value_get_data_collection (param_values + 1), data2); -#line 2948 "DataSource.c" +#line 3059 "DataSource.c" } -static void data_source_real_relinked (DataSource* self, SourceCollection* sources) { +static void +data_source_real_relinked (DataSource* self, + SourceCollection* sources) +{ #line 55 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_COLLECTION (sources)); -#line 2955 "DataSource.c" +#line 3069 "DataSource.c" } -static void data_source_real_destroyed (DataSource* self) { +static void +data_source_real_destroyed (DataSource* self) +{ } -static void data_source_class_init (DataSourceClass * klass) { +static void +data_source_class_init (DataSourceClass * klass) +{ #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" data_source_parent_class = g_type_class_peek_parent (klass); #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3009,11 +3127,13 @@ static void data_source_class_init (DataSourceClass * klass) { data_source_signals[DATA_SOURCE_RELINKED_SIGNAL] = g_signal_new ("relinked", TYPE_DATA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataSourceClass, relinked), NULL, NULL, g_cclosure_user_marshal_VOID__DATA_COLLECTION, G_TYPE_NONE, 1, TYPE_SOURCE_COLLECTION); #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" data_source_signals[DATA_SOURCE_DESTROYED_SIGNAL] = g_signal_new ("destroyed", TYPE_DATA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataSourceClass, destroyed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 3012 "DataSource.c" +#line 3130 "DataSource.c" } -static void data_source_instance_init (DataSource * self) { +static void +data_source_instance_init (DataSource * self) +{ DataView** _tmp0_; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv = DATA_SOURCE_GET_PRIVATE (self); @@ -3037,11 +3157,13 @@ static void data_source_instance_init (DataSource * self) { self->priv->marked_for_destroy = FALSE; #line 48 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->is_destroyed = FALSE; -#line 3040 "DataSource.c" +#line 3160 "DataSource.c" } -static void data_source_finalize (GObject * obj) { +static void +data_source_finalize (GObject * obj) +{ DataSource * self; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATA_SOURCE, DataSource); @@ -3053,11 +3175,13 @@ static void data_source_finalize (GObject * obj) { _g_object_unref0 (self->priv->backlinks); #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" G_OBJECT_CLASS (data_source_parent_class)->finalize (obj); -#line 3056 "DataSource.c" +#line 3178 "DataSource.c" } -GType data_source_get_type (void) { +GType +data_source_get_type (void) +{ static volatile gsize data_source_type_id__volatile = 0; if (g_once_init_enter (&data_source_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DataSourceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_source_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataSource), 0, (GInstanceInitFunc) data_source_instance_init, NULL }; @@ -3069,25 +3193,31 @@ GType data_source_get_type (void) { } -static void source_snapshot_real_notify_broken (SourceSnapshot* self) { +static void +source_snapshot_real_notify_broken (SourceSnapshot* self) +{ #line 455 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->snapshot_broken = TRUE; #line 457 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_signal_emit (self, source_snapshot_signals[SOURCE_SNAPSHOT_BROKEN_SIGNAL], 0); -#line 3077 "DataSource.c" +#line 3203 "DataSource.c" } -void source_snapshot_notify_broken (SourceSnapshot* self) { +void +source_snapshot_notify_broken (SourceSnapshot* self) +{ #line 454 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_SNAPSHOT (self)); #line 454 "/home/jens/Source/shotwell/src/core/DataSource.vala" SOURCE_SNAPSHOT_GET_CLASS (self)->notify_broken (self); -#line 3086 "DataSource.c" +#line 3214 "DataSource.c" } -gboolean source_snapshot_is_broken (SourceSnapshot* self) { +gboolean +source_snapshot_is_broken (SourceSnapshot* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 460 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3098,122 +3228,151 @@ gboolean source_snapshot_is_broken (SourceSnapshot* self) { result = _tmp0_; #line 461 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3101 "DataSource.c" +#line 3231 "DataSource.c" } -SourceSnapshot* source_snapshot_construct (GType object_type) { +SourceSnapshot* +source_snapshot_construct (GType object_type) +{ SourceSnapshot* self = NULL; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = (SourceSnapshot*) g_type_create_instance (object_type); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self; -#line 3111 "DataSource.c" +#line 3243 "DataSource.c" } -static void source_snapshot_real_broken (SourceSnapshot* self) { +static void +source_snapshot_real_broken (SourceSnapshot* self) +{ } -static void value_source_snapshot_init (GValue* value) { +static void +value_source_snapshot_init (GValue* value) +{ #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3122 "DataSource.c" +#line 3258 "DataSource.c" } -static void value_source_snapshot_free_value (GValue* value) { +static void +value_source_snapshot_free_value (GValue* value) +{ #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (value->data[0].v_pointer) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_snapshot_unref (value->data[0].v_pointer); -#line 3131 "DataSource.c" +#line 3269 "DataSource.c" } } -static void value_source_snapshot_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_source_snapshot_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (src_value->data[0].v_pointer) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = source_snapshot_ref (src_value->data[0].v_pointer); -#line 3141 "DataSource.c" +#line 3282 "DataSource.c" } else { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = NULL; -#line 3145 "DataSource.c" +#line 3286 "DataSource.c" } } -static gpointer value_source_snapshot_peek_pointer (const GValue* value) { +static gpointer +value_source_snapshot_peek_pointer (const GValue* value) +{ #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return value->data[0].v_pointer; -#line 3153 "DataSource.c" +#line 3296 "DataSource.c" } -static gchar* value_source_snapshot_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_source_snapshot_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (collect_values[0].v_pointer) { -#line 3160 "DataSource.c" +#line 3308 "DataSource.c" SourceSnapshot * object; object = collect_values[0].v_pointer; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (object->parent_instance.g_class == NULL) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3167 "DataSource.c" +#line 3315 "DataSource.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.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 3171 "DataSource.c" +#line 3319 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = source_snapshot_ref (object); -#line 3175 "DataSource.c" +#line 3323 "DataSource.c" } else { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3179 "DataSource.c" +#line 3327 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 3183 "DataSource.c" +#line 3331 "DataSource.c" } -static gchar* value_source_snapshot_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_source_snapshot_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ SourceSnapshot ** object_p; object_p = collect_values[0].v_pointer; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!object_p) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3194 "DataSource.c" +#line 3347 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!value->data[0].v_pointer) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = NULL; -#line 3200 "DataSource.c" +#line 3353 "DataSource.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = value->data[0].v_pointer; -#line 3204 "DataSource.c" +#line 3357 "DataSource.c" } else { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = source_snapshot_ref (value->data[0].v_pointer); -#line 3208 "DataSource.c" +#line 3361 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 3212 "DataSource.c" +#line 3365 "DataSource.c" } -GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_source_snapshot (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecSourceSnapshot* spec; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_SOURCE_SNAPSHOT), NULL); @@ -3223,20 +3382,25 @@ GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, co G_PARAM_SPEC (spec)->value_type = object_type; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return G_PARAM_SPEC (spec); -#line 3226 "DataSource.c" +#line 3385 "DataSource.c" } -gpointer value_get_source_snapshot (const GValue* value) { +gpointer +value_get_source_snapshot (const GValue* value) +{ #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_SNAPSHOT), NULL); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return value->data[0].v_pointer; -#line 3235 "DataSource.c" +#line 3396 "DataSource.c" } -void value_set_source_snapshot (GValue* value, gpointer v_object) { +void +value_set_source_snapshot (GValue* value, + gpointer v_object) +{ SourceSnapshot * old; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_SNAPSHOT)); @@ -3252,22 +3416,25 @@ void value_set_source_snapshot (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_snapshot_ref (value->data[0].v_pointer); -#line 3255 "DataSource.c" +#line 3419 "DataSource.c" } else { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3259 "DataSource.c" +#line 3423 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (old) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_snapshot_unref (old); -#line 3265 "DataSource.c" +#line 3429 "DataSource.c" } } -void value_take_source_snapshot (GValue* value, gpointer v_object) { +void +value_take_source_snapshot (GValue* value, + gpointer v_object) +{ SourceSnapshot * old; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_SNAPSHOT)); @@ -3281,22 +3448,24 @@ void value_take_source_snapshot (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = v_object; -#line 3284 "DataSource.c" +#line 3451 "DataSource.c" } else { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3288 "DataSource.c" +#line 3455 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (old) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_snapshot_unref (old); -#line 3294 "DataSource.c" +#line 3461 "DataSource.c" } } -static void source_snapshot_class_init (SourceSnapshotClass * klass) { +static void +source_snapshot_class_init (SourceSnapshotClass * klass) +{ #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_snapshot_parent_class = g_type_class_peek_parent (klass); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3309,32 +3478,38 @@ static void source_snapshot_class_init (SourceSnapshotClass * klass) { ((SourceSnapshotClass *) klass)->broken = source_snapshot_real_broken; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_snapshot_signals[SOURCE_SNAPSHOT_BROKEN_SIGNAL] = g_signal_new ("broken", TYPE_SOURCE_SNAPSHOT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceSnapshotClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 3312 "DataSource.c" +#line 3481 "DataSource.c" } -static void source_snapshot_instance_init (SourceSnapshot * self) { +static void +source_snapshot_instance_init (SourceSnapshot * self) +{ #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv = SOURCE_SNAPSHOT_GET_PRIVATE (self); #line 447 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->snapshot_broken = FALSE; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->ref_count = 1; -#line 3323 "DataSource.c" +#line 3494 "DataSource.c" } -static void source_snapshot_finalize (SourceSnapshot * obj) { +static void +source_snapshot_finalize (SourceSnapshot * obj) +{ SourceSnapshot * self; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SOURCE_SNAPSHOT, SourceSnapshot); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_signal_handlers_destroy (self); -#line 3333 "DataSource.c" +#line 3506 "DataSource.c" } -GType source_snapshot_get_type (void) { +GType +source_snapshot_get_type (void) +{ static volatile gsize source_snapshot_type_id__volatile = 0; if (g_once_init_enter (&source_snapshot_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_source_snapshot_init, value_source_snapshot_free_value, value_source_snapshot_copy_value, value_source_snapshot_peek_pointer, "p", value_source_snapshot_collect_value, "p", value_source_snapshot_lcopy_value }; @@ -3348,18 +3523,22 @@ GType source_snapshot_get_type (void) { } -gpointer source_snapshot_ref (gpointer instance) { +gpointer +source_snapshot_ref (gpointer instance) +{ SourceSnapshot * self; self = instance; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_atomic_int_inc (&self->ref_count); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return instance; -#line 3358 "DataSource.c" +#line 3535 "DataSource.c" } -void source_snapshot_unref (gpointer instance) { +void +source_snapshot_unref (gpointer instance) +{ SourceSnapshot * self; self = instance; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3368,43 +3547,44 @@ void source_snapshot_unref (gpointer instance) { SOURCE_SNAPSHOT_GET_CLASS (self)->finalize (self); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3371 "DataSource.c" +#line 3550 "DataSource.c" } } -static gchar* string_strip (const gchar* self) { +static gchar* +string_strip (const gchar* self) +{ gchar* result = NULL; gchar* _result_ = NULL; gchar* _tmp0_; const gchar* _tmp1_; -#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1248 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _result_; -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 3395 "DataSource.c" +#line 3576 "DataSource.c" } -SourceBacklink* source_backlink_construct (GType object_type, const gchar* name, const gchar* value) { +SourceBacklink* +source_backlink_construct (GType object_type, + const gchar* name, + const gchar* value) +{ SourceBacklink* self = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; - const gchar* _tmp3_; - gchar* _tmp4_; - const gchar* _tmp5_; - gchar* _tmp6_; + gchar* _tmp0_; + gchar* _tmp1_; #line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (name != NULL, NULL); #line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3412,188 +3592,159 @@ SourceBacklink* source_backlink_construct (GType object_type, const gchar* name, #line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = (SourceBacklink*) g_type_create_instance (object_type); #line 499 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = name; -#line 499 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = value; -#line 499 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = source_backlink_validate_name_value (_tmp0_, _tmp1_); -#line 499 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (_tmp2_, "validate_name_value(name, value)"); + _vala_assert (source_backlink_validate_name_value (name, value), "validate_name_value(name, value)"); #line 501 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = name; -#line 501 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = string_strip (_tmp3_); + _tmp0_ = string_strip (name); #line 501 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (self->priv->_name); #line 501 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->_name = _tmp4_; -#line 502 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = value; + self->priv->_name = _tmp0_; #line 502 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = string_strip (_tmp5_); + _tmp1_ = string_strip (value); #line 502 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (self->priv->_value); #line 502 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->_value = _tmp6_; + self->priv->_value = _tmp1_; #line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self; -#line 3440 "DataSource.c" +#line 3610 "DataSource.c" } -SourceBacklink* source_backlink_new (const gchar* name, const gchar* value) { +SourceBacklink* +source_backlink_new (const gchar* name, + const gchar* value) +{ #line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala" return source_backlink_construct (TYPE_SOURCE_BACKLINK, name, value); -#line 3447 "DataSource.c" +#line 3620 "DataSource.c" } -SourceBacklink* source_backlink_construct_from_source (GType object_type, DataSource* source) { +SourceBacklink* +source_backlink_construct_from_source (GType object_type, + DataSource* source) +{ SourceBacklink* self = NULL; - DataSource* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - DataSource* _tmp4_; - gint64 _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - const gchar* _tmp9_; - const gchar* _tmp10_; - gboolean _tmp11_; + gchar* _tmp4_; + gchar* _tmp5_; + const gchar* _tmp6_; + const gchar* _tmp7_; #line 505 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 505 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = (SourceBacklink*) g_type_create_instance (object_type); #line 506 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = source; -#line 506 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = data_source_get_typename (_tmp0_); + _tmp0_ = data_source_get_typename (source); #line 506 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 506 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = string_strip (_tmp2_); + _tmp2_ = string_strip (_tmp1_); #line 506 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (self->priv->_name); #line 506 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->_name = _tmp3_; + self->priv->_name = _tmp2_; #line 506 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_free0 (_tmp2_); -#line 507 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = source; -#line 507 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = data_source_get_instance_id (_tmp4_); + _g_free0 (_tmp1_); #line 507 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp5_); + _tmp3_ = g_strdup_printf ("%" G_GINT64_FORMAT, data_source_get_instance_id (source)); #line 507 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 507 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = string_strip (_tmp7_); + _tmp5_ = string_strip (_tmp4_); #line 507 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (self->priv->_value); #line 507 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->_value = _tmp8_; + self->priv->_value = _tmp5_; #line 507 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp4_); #line 509 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = self->priv->_name; + _tmp6_ = self->priv->_name; #line 509 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = self->priv->_value; + _tmp7_ = self->priv->_value; #line 509 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = source_backlink_validate_name_value (_tmp9_, _tmp10_); -#line 509 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (_tmp11_, "validate_name_value(_name, _value)"); + _vala_assert (source_backlink_validate_name_value (_tmp6_, _tmp7_), "validate_name_value(_name, _value)"); #line 505 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self; -#line 3509 "DataSource.c" +#line 3673 "DataSource.c" } -SourceBacklink* source_backlink_new_from_source (DataSource* source) { +SourceBacklink* +source_backlink_new_from_source (DataSource* source) +{ #line 505 "/home/jens/Source/shotwell/src/core/DataSource.vala" return source_backlink_construct_from_source (TYPE_SOURCE_BACKLINK, source); -#line 3516 "DataSource.c" +#line 3682 "DataSource.c" } -static gboolean string_contains (const gchar* self, const gchar* needle) { +static gboolean +string_contains (const gchar* self, + const gchar* needle) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gchar* _tmp1_; -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = needle; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_ != NULL; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = strstr ((gchar*) self, (gchar*) needle); +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_ != NULL; +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 3536 "DataSource.c" +#line 3702 "DataSource.c" } -static gboolean source_backlink_validate_name_value (const gchar* name, const gchar* value) { +static gboolean +source_backlink_validate_name_value (const gchar* name, + const gchar* value) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - const gchar* _tmp2_; - gboolean _tmp3_; #line 512 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (name != NULL, FALSE); #line 512 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (value != NULL, FALSE); #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = name; -#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = string_contains (_tmp2_, "="); -#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (!_tmp3_) { -#line 3556 "DataSource.c" - const gchar* _tmp4_; - gboolean _tmp5_; -#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = name; -#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = string_contains (_tmp4_, "|"); + if (!string_contains (name, "=")) { #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = !_tmp5_; -#line 3565 "DataSource.c" + _tmp1_ = !string_contains (name, "|"); +#line 3721 "DataSource.c" } else { #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; -#line 3569 "DataSource.c" +#line 3725 "DataSource.c" } #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp1_) { -#line 3573 "DataSource.c" - const gchar* _tmp6_; - gboolean _tmp7_; -#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = value; -#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = string_contains (_tmp6_, "|"); #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = !_tmp7_; -#line 3582 "DataSource.c" + _tmp0_ = !string_contains (value, "|"); +#line 3731 "DataSource.c" } else { #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 3586 "DataSource.c" +#line 3735 "DataSource.c" } #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = _tmp0_; #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3592 "DataSource.c" +#line 3741 "DataSource.c" } -gchar* source_backlink_to_string (SourceBacklink* self) { +gchar* +source_backlink_to_string (SourceBacklink* self) +{ gchar* result = NULL; const gchar* _tmp0_; const gchar* _tmp1_; @@ -3616,55 +3767,45 @@ gchar* source_backlink_to_string (SourceBacklink* self) { result = _tmp4_; #line 517 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3619 "DataSource.c" +#line 3770 "DataSource.c" } -guint source_backlink_hash_func (SourceBacklink* backlink) { +guint +source_backlink_hash_func (SourceBacklink* backlink) +{ guint result = 0U; GHashFunc _tmp0_; - SourceBacklink* _tmp1_; - const gchar* _tmp2_; - guint _tmp3_; - GHashFunc _tmp4_; - SourceBacklink* _tmp5_; - const gchar* _tmp6_; - guint _tmp7_; + const gchar* _tmp1_; + GHashFunc _tmp2_; + const gchar* _tmp3_; #line 520 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail ((backlink == NULL) || IS_SOURCE_BACKLINK (backlink), 0U); #line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = g_str_hash; #line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = backlink; -#line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = _tmp1_->priv->_name; -#line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = _tmp0_ (_tmp2_); -#line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = g_str_hash; + _tmp1_ = backlink->priv->_name; #line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = backlink; + _tmp2_ = g_str_hash; #line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = _tmp5_->priv->_value; + _tmp3_ = backlink->priv->_value; #line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = _tmp4_ (_tmp6_); -#line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" - result = _tmp3_ ^ _tmp7_; + result = _tmp0_ (_tmp1_) ^ _tmp2_ (_tmp3_); #line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3655 "DataSource.c" +#line 3796 "DataSource.c" } -gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blink) { +gboolean +source_backlink_equal_func (SourceBacklink* alink, + SourceBacklink* blink) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; GEqualFunc _tmp1_; - SourceBacklink* _tmp2_; + const gchar* _tmp2_; const gchar* _tmp3_; - SourceBacklink* _tmp4_; - const gchar* _tmp5_; - gboolean _tmp6_; #line 524 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail ((alink == NULL) || IS_SOURCE_BACKLINK (alink), FALSE); #line 524 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3672,53 +3813,40 @@ gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blin #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = g_str_equal; #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = alink; -#line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = _tmp2_->priv->_name; -#line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = blink; -#line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = _tmp4_->priv->_name; + _tmp2_ = alink->priv->_name; #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = _tmp1_ (_tmp3_, _tmp5_); + _tmp3_ = blink->priv->_name; #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp6_) { -#line 3686 "DataSource.c" - GEqualFunc _tmp7_; - SourceBacklink* _tmp8_; - const gchar* _tmp9_; - SourceBacklink* _tmp10_; - const gchar* _tmp11_; - gboolean _tmp12_; -#line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = g_str_equal; -#line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = alink; -#line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = _tmp8_->priv->_value; + if (_tmp1_ (_tmp2_, _tmp3_)) { +#line 3821 "DataSource.c" + GEqualFunc _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = blink; + _tmp4_ = g_str_equal; #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = _tmp10_->priv->_value; + _tmp5_ = alink->priv->_value; #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp12_ = _tmp7_ (_tmp9_, _tmp11_); + _tmp6_ = blink->priv->_value; #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = _tmp12_; -#line 3707 "DataSource.c" + _tmp0_ = _tmp4_ (_tmp5_, _tmp6_); +#line 3833 "DataSource.c" } else { #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 3711 "DataSource.c" +#line 3837 "DataSource.c" } #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = _tmp0_; #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3717 "DataSource.c" +#line 3843 "DataSource.c" } -const gchar* source_backlink_get_name (SourceBacklink* self) { +const gchar* +source_backlink_get_name (SourceBacklink* self) +{ const gchar* result; const gchar* _tmp0_; #line 473 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3729,11 +3857,13 @@ const gchar* source_backlink_get_name (SourceBacklink* self) { result = _tmp0_; #line 474 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3732 "DataSource.c" +#line 3860 "DataSource.c" } -const gchar* source_backlink_get_value (SourceBacklink* self) { +const gchar* +source_backlink_get_value (SourceBacklink* self) +{ const gchar* result; const gchar* _tmp0_; #line 479 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3744,11 +3874,13 @@ const gchar* source_backlink_get_value (SourceBacklink* self) { result = _tmp0_; #line 480 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3747 "DataSource.c" +#line 3877 "DataSource.c" } -const gchar* source_backlink_get_typename (SourceBacklink* self) { +const gchar* +source_backlink_get_typename (SourceBacklink* self) +{ const gchar* result; const gchar* _tmp0_; #line 486 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3759,144 +3891,167 @@ const gchar* source_backlink_get_typename (SourceBacklink* self) { result = _tmp0_; #line 487 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3762 "DataSource.c" +#line 3894 "DataSource.c" } -static gint64 int64_parse (const gchar* str) { +static gint64 +int64_parse (const gchar* str) +{ gint64 result = 0LL; - const gchar* _tmp0_; - gint64 _tmp1_; -#line 687 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gint64 _tmp0_; +#line 687 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (str != NULL, 0LL); -#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0); -#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_; -#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_ascii_strtoll (str, NULL, (guint) 0); +#line 688 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_; +#line 688 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 3780 "DataSource.c" +#line 3911 "DataSource.c" } -gint64 source_backlink_get_instance_id (SourceBacklink* self) { +gint64 +source_backlink_get_instance_id (SourceBacklink* self) +{ gint64 result; const gchar* _tmp0_; - gint64 _tmp1_; #line 493 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_SOURCE_BACKLINK (self), 0LL); #line 494 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = self->priv->_value; #line 494 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = int64_parse (_tmp0_); -#line 494 "/home/jens/Source/shotwell/src/core/DataSource.vala" - result = _tmp1_; + result = int64_parse (_tmp0_); #line 494 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3798 "DataSource.c" +#line 3928 "DataSource.c" } -static void value_source_backlink_init (GValue* value) { +static void +value_source_backlink_init (GValue* value) +{ #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3805 "DataSource.c" +#line 3937 "DataSource.c" } -static void value_source_backlink_free_value (GValue* value) { +static void +value_source_backlink_free_value (GValue* value) +{ #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (value->data[0].v_pointer) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_backlink_unref (value->data[0].v_pointer); -#line 3814 "DataSource.c" +#line 3948 "DataSource.c" } } -static void value_source_backlink_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_source_backlink_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (src_value->data[0].v_pointer) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = source_backlink_ref (src_value->data[0].v_pointer); -#line 3824 "DataSource.c" +#line 3961 "DataSource.c" } else { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = NULL; -#line 3828 "DataSource.c" +#line 3965 "DataSource.c" } } -static gpointer value_source_backlink_peek_pointer (const GValue* value) { +static gpointer +value_source_backlink_peek_pointer (const GValue* value) +{ #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return value->data[0].v_pointer; -#line 3836 "DataSource.c" +#line 3975 "DataSource.c" } -static gchar* value_source_backlink_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_source_backlink_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (collect_values[0].v_pointer) { -#line 3843 "DataSource.c" +#line 3987 "DataSource.c" SourceBacklink * object; object = collect_values[0].v_pointer; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (object->parent_instance.g_class == NULL) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3850 "DataSource.c" +#line 3994 "DataSource.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.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 3854 "DataSource.c" +#line 3998 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = source_backlink_ref (object); -#line 3858 "DataSource.c" +#line 4002 "DataSource.c" } else { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3862 "DataSource.c" +#line 4006 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 3866 "DataSource.c" +#line 4010 "DataSource.c" } -static gchar* value_source_backlink_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_source_backlink_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ SourceBacklink ** object_p; object_p = collect_values[0].v_pointer; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!object_p) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3877 "DataSource.c" +#line 4026 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!value->data[0].v_pointer) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = NULL; -#line 3883 "DataSource.c" +#line 4032 "DataSource.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = value->data[0].v_pointer; -#line 3887 "DataSource.c" +#line 4036 "DataSource.c" } else { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = source_backlink_ref (value->data[0].v_pointer); -#line 3891 "DataSource.c" +#line 4040 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 3895 "DataSource.c" +#line 4044 "DataSource.c" } -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecSourceBacklink* spec; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_SOURCE_BACKLINK), NULL); @@ -3906,20 +4061,25 @@ GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, co G_PARAM_SPEC (spec)->value_type = object_type; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return G_PARAM_SPEC (spec); -#line 3909 "DataSource.c" +#line 4064 "DataSource.c" } -gpointer value_get_source_backlink (const GValue* value) { +gpointer +value_get_source_backlink (const GValue* value) +{ #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_BACKLINK), NULL); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return value->data[0].v_pointer; -#line 3918 "DataSource.c" +#line 4075 "DataSource.c" } -void value_set_source_backlink (GValue* value, gpointer v_object) { +void +value_set_source_backlink (GValue* value, + gpointer v_object) +{ SourceBacklink * old; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_BACKLINK)); @@ -3935,22 +4095,25 @@ void value_set_source_backlink (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_backlink_ref (value->data[0].v_pointer); -#line 3938 "DataSource.c" +#line 4098 "DataSource.c" } else { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3942 "DataSource.c" +#line 4102 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (old) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_backlink_unref (old); -#line 3948 "DataSource.c" +#line 4108 "DataSource.c" } } -void value_take_source_backlink (GValue* value, gpointer v_object) { +void +value_take_source_backlink (GValue* value, + gpointer v_object) +{ SourceBacklink * old; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_BACKLINK)); @@ -3964,42 +4127,48 @@ void value_take_source_backlink (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = v_object; -#line 3967 "DataSource.c" +#line 4130 "DataSource.c" } else { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3971 "DataSource.c" +#line 4134 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (old) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_backlink_unref (old); -#line 3977 "DataSource.c" +#line 4140 "DataSource.c" } } -static void source_backlink_class_init (SourceBacklinkClass * klass) { +static void +source_backlink_class_init (SourceBacklinkClass * klass) +{ #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_backlink_parent_class = g_type_class_peek_parent (klass); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" ((SourceBacklinkClass *) klass)->finalize = source_backlink_finalize; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_type_class_add_private (klass, sizeof (SourceBacklinkPrivate)); -#line 3989 "DataSource.c" +#line 4154 "DataSource.c" } -static void source_backlink_instance_init (SourceBacklink * self) { +static void +source_backlink_instance_init (SourceBacklink * self) +{ #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv = SOURCE_BACKLINK_GET_PRIVATE (self); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->ref_count = 1; -#line 3998 "DataSource.c" +#line 4165 "DataSource.c" } -static void source_backlink_finalize (SourceBacklink * obj) { +static void +source_backlink_finalize (SourceBacklink * obj) +{ SourceBacklink * self; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SOURCE_BACKLINK, SourceBacklink); @@ -4009,11 +4178,13 @@ static void source_backlink_finalize (SourceBacklink * obj) { _g_free0 (self->priv->_name); #line 470 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (self->priv->_value); -#line 4012 "DataSource.c" +#line 4181 "DataSource.c" } -GType source_backlink_get_type (void) { +GType +source_backlink_get_type (void) +{ static volatile gsize source_backlink_type_id__volatile = 0; if (g_once_init_enter (&source_backlink_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_source_backlink_init, value_source_backlink_free_value, value_source_backlink_copy_value, value_source_backlink_peek_pointer, "p", value_source_backlink_collect_value, "p", value_source_backlink_lcopy_value }; @@ -4027,18 +4198,22 @@ GType source_backlink_get_type (void) { } -gpointer source_backlink_ref (gpointer instance) { +gpointer +source_backlink_ref (gpointer instance) +{ SourceBacklink * self; self = instance; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_atomic_int_inc (&self->ref_count); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return instance; -#line 4037 "DataSource.c" +#line 4210 "DataSource.c" } -void source_backlink_unref (gpointer instance) { +void +source_backlink_unref (gpointer instance) +{ SourceBacklink * self; self = instance; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4047,193 +4222,210 @@ void source_backlink_unref (gpointer instance) { SOURCE_BACKLINK_GET_CLASS (self)->finalize (self); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_type_free_instance ((GTypeInstance *) self); -#line 4050 "DataSource.c" +#line 4225 "DataSource.c" } } -static void _source_proxy_on_source_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self) { +static void +_source_proxy_on_source_added_data_collection_items_added (DataCollection* _sender, + GeeIterable* added, + gpointer self) +{ #line 588 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_on_source_added ((SourceProxy*) self, added); -#line 4058 "DataSource.c" +#line 4237 "DataSource.c" } -static void _source_proxy_on_snapshot_broken_source_snapshot_broken (SourceSnapshot* _sender, gpointer self) { +static void +_source_proxy_on_snapshot_broken_source_snapshot_broken (SourceSnapshot* _sender, + gpointer self) +{ #line 577 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_on_snapshot_broken ((SourceProxy*) self); -#line 4065 "DataSource.c" +#line 4247 "DataSource.c" } -SourceProxy* source_proxy_construct (GType object_type, DataSource* source) { +SourceProxy* +source_proxy_construct (GType object_type, + DataSource* source) +{ SourceProxy* self = NULL; - DataSource* _tmp0_; - gint64 _tmp1_; - DataSource* _tmp2_; - gchar* _tmp3_; - DataSource* _tmp4_; - SourceSnapshot* _tmp5_; - SourceSnapshot* _tmp6_; - SourceSnapshot* _tmp7_; - DataSource* _tmp8_; - DataSource* _tmp9_; - DataCollection* _tmp10_; - SourceCollection* _tmp11_; - SourceCollection* _tmp12_; + gchar* _tmp0_; + SourceSnapshot* _tmp1_; + SourceSnapshot* _tmp2_; + SourceSnapshot* _tmp3_; + DataCollection* _tmp4_; + SourceCollection* _tmp5_; + SourceCollection* _tmp6_; #line 571 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 571 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = (SourceProxy*) g_type_create_instance (object_type); #line 572 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = source; -#line 572 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject)); -#line 572 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->object_id = _tmp1_; -#line 573 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = source; + self->priv->object_id = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 573 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 573 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (self->priv->source_string); #line 573 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->source_string = _tmp3_; -#line 575 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = source; + self->priv->source_string = _tmp0_; #line 575 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = data_source_save_snapshot (_tmp4_); + _tmp1_ = data_source_save_snapshot (source); #line 575 "/home/jens/Source/shotwell/src/core/DataSource.vala" _source_snapshot_unref0 (self->priv->snapshot); #line 575 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->snapshot = _tmp5_; + self->priv->snapshot = _tmp1_; #line 576 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = self->priv->snapshot; + _tmp2_ = self->priv->snapshot; #line 576 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (_tmp6_ != NULL, "snapshot != null"); + _vala_assert (_tmp2_ != NULL, "snapshot != null"); #line 577 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = self->priv->snapshot; + _tmp3_ = self->priv->snapshot; #line 577 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_connect (_tmp7_, "broken", (GCallback) _source_proxy_on_snapshot_broken_source_snapshot_broken, self); + g_signal_connect (_tmp3_, "broken", (GCallback) _source_proxy_on_snapshot_broken_source_snapshot_broken, self); #line 579 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = source; -#line 579 "/home/jens/Source/shotwell/src/core/DataSource.vala" - source_proxy_set_source (self, _tmp8_); -#line 581 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = source; + source_proxy_set_source (self, source); #line 581 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); + _tmp4_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 581 "/home/jens/Source/shotwell/src/core/DataSource.vala" _data_collection_unref0 (self->priv->membership); #line 581 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->membership = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_SOURCE_COLLECTION, SourceCollection); + self->priv->membership = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_COLLECTION, SourceCollection); #line 582 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = self->priv->membership; + _tmp5_ = self->priv->membership; #line 582 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (_tmp11_ != NULL, "membership != null"); + _vala_assert (_tmp5_ != NULL, "membership != null"); #line 583 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp12_ = self->priv->membership; + _tmp6_ = self->priv->membership; #line 583 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _source_proxy_on_source_added_data_collection_items_added, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _source_proxy_on_source_added_data_collection_items_added, self); #line 571 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self; -#line 4140 "DataSource.c" +#line 4307 "DataSource.c" } -static DataSource* source_proxy_real_reconstitute (SourceProxy* self, gint64 object_id, SourceSnapshot* snapshot) { +static DataSource* +source_proxy_real_reconstitute (SourceProxy* self, + gint64 object_id, + SourceSnapshot* snapshot) +{ #line 591 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_critical ("Type `%s' does not implement abstract method `source_proxy_reconstitute'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 591 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 4149 "DataSource.c" +#line 4320 "DataSource.c" } -DataSource* source_proxy_reconstitute (SourceProxy* self, gint64 object_id, SourceSnapshot* snapshot) { +DataSource* +source_proxy_reconstitute (SourceProxy* self, + gint64 object_id, + SourceSnapshot* snapshot) +{ #line 591 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_SOURCE_PROXY (self), NULL); #line 591 "/home/jens/Source/shotwell/src/core/DataSource.vala" return SOURCE_PROXY_GET_CLASS (self)->reconstitute (self, object_id, snapshot); -#line 4158 "DataSource.c" +#line 4333 "DataSource.c" } -static void source_proxy_real_notify_reconstituted (SourceProxy* self, DataSource* source) { - DataSource* _tmp0_; +static void +source_proxy_real_notify_reconstituted (SourceProxy* self, + DataSource* source) +{ #line 593 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 594 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = source; -#line 594 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_emit (self, source_proxy_signals[SOURCE_PROXY_RECONSTITUTED_SIGNAL], 0, _tmp0_); -#line 4170 "DataSource.c" + g_signal_emit (self, source_proxy_signals[SOURCE_PROXY_RECONSTITUTED_SIGNAL], 0, source); +#line 4345 "DataSource.c" } -void source_proxy_notify_reconstituted (SourceProxy* self, DataSource* source) { +void +source_proxy_notify_reconstituted (SourceProxy* self, + DataSource* source) +{ #line 593 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); #line 593 "/home/jens/Source/shotwell/src/core/DataSource.vala" SOURCE_PROXY_GET_CLASS (self)->notify_reconstituted (self, source); -#line 4179 "DataSource.c" +#line 4357 "DataSource.c" } -static void source_proxy_real_notify_dehydrated (SourceProxy* self) { +static void +source_proxy_real_notify_dehydrated (SourceProxy* self) +{ #line 598 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_signal_emit (self, source_proxy_signals[SOURCE_PROXY_DEHYDRATED_SIGNAL], 0); -#line 4186 "DataSource.c" +#line 4366 "DataSource.c" } -void source_proxy_notify_dehydrated (SourceProxy* self) { +void +source_proxy_notify_dehydrated (SourceProxy* self) +{ #line 597 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); #line 597 "/home/jens/Source/shotwell/src/core/DataSource.vala" SOURCE_PROXY_GET_CLASS (self)->notify_dehydrated (self); -#line 4195 "DataSource.c" +#line 4377 "DataSource.c" } -static void source_proxy_real_notify_broken (SourceProxy* self) { +static void +source_proxy_real_notify_broken (SourceProxy* self) +{ #line 602 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_signal_emit (self, source_proxy_signals[SOURCE_PROXY_BROKEN_SIGNAL], 0); -#line 4202 "DataSource.c" +#line 4386 "DataSource.c" } -void source_proxy_notify_broken (SourceProxy* self) { +void +source_proxy_notify_broken (SourceProxy* self) +{ #line 601 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); #line 601 "/home/jens/Source/shotwell/src/core/DataSource.vala" SOURCE_PROXY_GET_CLASS (self)->notify_broken (self); -#line 4211 "DataSource.c" +#line 4397 "DataSource.c" } -static void source_proxy_on_snapshot_broken (SourceProxy* self) { +static void +source_proxy_on_snapshot_broken (SourceProxy* self) +{ #line 605 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); #line 606 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_drop_source (self); #line 608 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_notify_broken (self); -#line 4222 "DataSource.c" +#line 4410 "DataSource.c" } -static void _source_proxy_on_destroyed_data_source_destroyed (DataSource* _sender, gpointer self) { +static void +_source_proxy_on_destroyed_data_source_destroyed (DataSource* _sender, + gpointer self) +{ #line 615 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_on_destroyed ((SourceProxy*) self); -#line 4229 "DataSource.c" +#line 4420 "DataSource.c" } -static void source_proxy_set_source (SourceProxy* self, DataSource* source) { +static void +source_proxy_set_source (SourceProxy* self, + DataSource* source) +{ DataSource* _tmp0_; - DataSource* _tmp1_; - DataSource* _tmp2_; #line 611 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); #line 611 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4241,22 +4433,20 @@ static void source_proxy_set_source (SourceProxy* self, DataSource* source) { #line 612 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_drop_source (self); #line 614 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = source; -#line 614 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (source); #line 614 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (self->priv->source); #line 614 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->source = _tmp1_; + self->priv->source = _tmp0_; #line 615 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = source; -#line 615 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_connect (_tmp2_, "destroyed", (GCallback) _source_proxy_on_destroyed_data_source_destroyed, self); -#line 4255 "DataSource.c" + g_signal_connect (source, "destroyed", (GCallback) _source_proxy_on_destroyed_data_source_destroyed, self); +#line 4443 "DataSource.c" } -static void source_proxy_drop_source (SourceProxy* self) { +static void +source_proxy_drop_source (SourceProxy* self) +{ DataSource* _tmp0_; DataSource* _tmp1_; guint _tmp2_; @@ -4268,7 +4458,7 @@ static void source_proxy_drop_source (SourceProxy* self) { if (_tmp0_ == NULL) { #line 620 "/home/jens/Source/shotwell/src/core/DataSource.vala" return; -#line 4271 "DataSource.c" +#line 4461 "DataSource.c" } #line 622 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->source; @@ -4280,140 +4470,129 @@ static void source_proxy_drop_source (SourceProxy* self) { _g_object_unref0 (self->priv->source); #line 623 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->source = NULL; -#line 4283 "DataSource.c" +#line 4473 "DataSource.c" } -DataSource* source_proxy_get_source (SourceProxy* self) { +DataSource* +source_proxy_get_source (SourceProxy* self) +{ DataSource* result = NULL; SourceSnapshot* _tmp0_; - gboolean _tmp1_; - DataSource* _tmp2_; + DataSource* _tmp1_; DataSource* new_source = NULL; - gint64 _tmp5_; - SourceSnapshot* _tmp6_; + gint64 _tmp4_; + SourceSnapshot* _tmp5_; + DataSource* _tmp6_; DataSource* _tmp7_; DataSource* _tmp8_; - DataSource* _tmp9_; - gint64 _tmp12_; - DataSource* _tmp13_; - gint64 _tmp14_; + gint64 _tmp11_; + DataSource* _tmp12_; + DataSource* _tmp14_; + gint64 _tmp15_; + SourceCollection* _tmp16_; DataSource* _tmp17_; - gint64 _tmp18_; - gint64 _tmp19_; - SourceCollection* _tmp20_; - DataSource* _tmp21_; - gboolean _tmp22_; - DataSource* _tmp23_; - DataSource* _tmp24_; + DataSource* _tmp18_; + DataSource* _tmp19_; #line 626 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_SOURCE_PROXY (self), NULL); #line 627 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = self->priv->snapshot; #line 627 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = source_snapshot_is_broken (_tmp0_); -#line 627 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp1_) { + if (source_snapshot_is_broken (_tmp0_)) { #line 628 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = NULL; #line 628 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 4321 "DataSource.c" +#line 4507 "DataSource.c" } #line 630 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = self->priv->source; + _tmp1_ = self->priv->source; #line 630 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp2_ != NULL) { -#line 4327 "DataSource.c" + if (_tmp1_ != NULL) { +#line 4513 "DataSource.c" + DataSource* _tmp2_; DataSource* _tmp3_; - DataSource* _tmp4_; #line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = self->priv->source; + _tmp2_ = self->priv->source; #line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp3_ = _g_object_ref0 (_tmp2_); #line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala" - result = _tmp4_; + result = _tmp3_; #line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 4338 "DataSource.c" +#line 4524 "DataSource.c" } #line 636 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = self->priv->object_id; + _tmp4_ = self->priv->object_id; #line 636 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = self->priv->snapshot; + _tmp5_ = self->priv->snapshot; #line 636 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = source_proxy_reconstitute (self, _tmp5_, _tmp6_); + _tmp6_ = source_proxy_reconstitute (self, _tmp4_, _tmp5_); #line 636 "/home/jens/Source/shotwell/src/core/DataSource.vala" - new_source = _tmp7_; + new_source = _tmp6_; #line 637 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = self->priv->source; + _tmp7_ = self->priv->source; #line 637 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = new_source; + _tmp8_ = new_source; #line 637 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp8_ != _tmp9_) { -#line 4354 "DataSource.c" + if (_tmp7_ != _tmp8_) { +#line 4540 "DataSource.c" + DataSource* _tmp9_; DataSource* _tmp10_; - DataSource* _tmp11_; #line 638 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = new_source; + _tmp9_ = new_source; #line 638 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = _g_object_ref0 (_tmp10_); + _tmp10_ = _g_object_ref0 (_tmp9_); #line 638 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (self->priv->source); #line 638 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->source = _tmp11_; -#line 4365 "DataSource.c" + self->priv->source = _tmp10_; +#line 4551 "DataSource.c" } #line 639 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp12_ = self->priv->object_id; -#line 639 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp13_ = self->priv->source; + _tmp11_ = self->priv->object_id; #line 639 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp14_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject)); + _tmp12_ = self->priv->source; #line 639 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp12_ != _tmp14_) { -#line 4375 "DataSource.c" - DataSource* _tmp15_; - gint64 _tmp16_; + if (_tmp11_ != data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject))) { +#line 4559 "DataSource.c" + DataSource* _tmp13_; #line 640 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp15_ = new_source; + _tmp13_ = new_source; #line 640 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp16_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_OBJECT, DataObject)); -#line 640 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->object_id = _tmp16_; -#line 4384 "DataSource.c" + self->priv->object_id = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject)); +#line 4565 "DataSource.c" } #line 641 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp17_ = self->priv->source; -#line 641 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp18_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_OBJECT, DataObject)); + _tmp14_ = self->priv->source; #line 641 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp19_ = self->priv->object_id; + _tmp15_ = self->priv->object_id; #line 641 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (_tmp18_ == _tmp19_, "source.get_object_id() == object_id"); -#line 642 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp20_ = self->priv->membership; + _vala_assert (data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)) == _tmp15_, "source.get_object_id() == object_id"); #line 642 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp21_ = self->priv->source; + _tmp16_ = self->priv->membership; #line 642 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp22_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_OBJECT, DataObject)); + _tmp17_ = self->priv->source; #line 642 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (_tmp22_, "membership.contains(source)"); + _vala_assert (data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_OBJECT, DataObject)), "membership.contains(source)"); #line 644 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp23_ = self->priv->source; + _tmp18_ = self->priv->source; #line 644 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp24_ = _g_object_ref0 (_tmp23_); + _tmp19_ = _g_object_ref0 (_tmp18_); #line 644 "/home/jens/Source/shotwell/src/core/DataSource.vala" - result = _tmp24_; + result = _tmp19_; #line 644 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (new_source); #line 644 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 4412 "DataSource.c" +#line 4589 "DataSource.c" } -static void source_proxy_on_destroyed (SourceProxy* self) { +static void +source_proxy_on_destroyed (SourceProxy* self) +{ DataSource* _tmp0_; #line 647 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); @@ -4425,11 +4604,14 @@ static void source_proxy_on_destroyed (SourceProxy* self) { source_proxy_drop_source (self); #line 653 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_notify_dehydrated (self); -#line 4428 "DataSource.c" +#line 4607 "DataSource.c" } -static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added) { +static void +source_proxy_on_source_added (SourceProxy* self, + GeeIterable* added) +{ DataSource* _tmp0_; #line 656 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); @@ -4441,195 +4623,218 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added) if (_tmp0_ != NULL) { #line 659 "/home/jens/Source/shotwell/src/core/DataSource.vala" return; -#line 4444 "DataSource.c" +#line 4626 "DataSource.c" } { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp1_; #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = added; + _tmp1_ = gee_iterable_iterator (added); #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = gee_iterable_iterator (_tmp1_); -#line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _object_it = _tmp2_; + _object_it = _tmp1_; #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 4458 "DataSource.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 4637 "DataSource.c" + GeeIterator* _tmp2_; DataObject* object = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + DataObject* _tmp5_; + gint64 _tmp6_; DataObject* _tmp7_; - gint64 _tmp8_; - gint64 _tmp9_; - DataObject* _tmp10_; - DataObject* _tmp11_; -#line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = _object_it; + DataObject* _tmp8_; #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _object_it; #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 4477 "DataSource.c" +#line 4652 "DataSource.c" } #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = _object_it; + _tmp3_ = _object_it; #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" - object = (DataObject*) _tmp6_; + object = (DataObject*) _tmp4_; #line 663 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = object; + _tmp5_ = object; #line 663 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = data_object_get_object_id (_tmp7_); + _tmp6_ = self->priv->object_id; #line 663 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = self->priv->object_id; -#line 663 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp8_ != _tmp9_) { + if (data_object_get_object_id (_tmp5_) != _tmp6_) { #line 664 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (object); #line 664 "/home/jens/Source/shotwell/src/core/DataSource.vala" continue; -#line 4497 "DataSource.c" +#line 4670 "DataSource.c" } #line 667 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = object; + _tmp7_ = object; #line 667 "/home/jens/Source/shotwell/src/core/DataSource.vala" - source_proxy_set_source (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_SOURCE, DataSource)); + source_proxy_set_source (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource)); #line 669 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = object; + _tmp8_ = object; #line 669 "/home/jens/Source/shotwell/src/core/DataSource.vala" - source_proxy_notify_reconstituted (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_SOURCE, DataSource)); + source_proxy_notify_reconstituted (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource)); #line 671 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (object); #line 671 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 4511 "DataSource.c" +#line 4684 "DataSource.c" } #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (_object_it); -#line 4515 "DataSource.c" +#line 4688 "DataSource.c" } } -static void source_proxy_real_reconstituted (SourceProxy* self, DataSource* source) { +static void +source_proxy_real_reconstituted (SourceProxy* self, + DataSource* source) +{ #line 558 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (source)); -#line 4523 "DataSource.c" +#line 4699 "DataSource.c" } -static void source_proxy_real_dehydrated (SourceProxy* self) { +static void +source_proxy_real_dehydrated (SourceProxy* self) +{ } -static void source_proxy_real_broken (SourceProxy* self) { +static void +source_proxy_real_broken (SourceProxy* self) +{ } -static void value_source_proxy_init (GValue* value) { +static void +value_source_proxy_init (GValue* value) +{ #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 4538 "DataSource.c" +#line 4720 "DataSource.c" } -static void value_source_proxy_free_value (GValue* value) { +static void +value_source_proxy_free_value (GValue* value) +{ #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (value->data[0].v_pointer) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_unref (value->data[0].v_pointer); -#line 4547 "DataSource.c" +#line 4731 "DataSource.c" } } -static void value_source_proxy_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_source_proxy_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (src_value->data[0].v_pointer) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = source_proxy_ref (src_value->data[0].v_pointer); -#line 4557 "DataSource.c" +#line 4744 "DataSource.c" } else { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = NULL; -#line 4561 "DataSource.c" +#line 4748 "DataSource.c" } } -static gpointer value_source_proxy_peek_pointer (const GValue* value) { +static gpointer +value_source_proxy_peek_pointer (const GValue* value) +{ #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return value->data[0].v_pointer; -#line 4569 "DataSource.c" +#line 4758 "DataSource.c" } -static gchar* value_source_proxy_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_source_proxy_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (collect_values[0].v_pointer) { -#line 4576 "DataSource.c" +#line 4770 "DataSource.c" SourceProxy * object; object = collect_values[0].v_pointer; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (object->parent_instance.g_class == NULL) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4583 "DataSource.c" +#line 4777 "DataSource.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.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 4587 "DataSource.c" +#line 4781 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = source_proxy_ref (object); -#line 4591 "DataSource.c" +#line 4785 "DataSource.c" } else { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 4595 "DataSource.c" +#line 4789 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 4599 "DataSource.c" +#line 4793 "DataSource.c" } -static gchar* value_source_proxy_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_source_proxy_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ SourceProxy ** object_p; object_p = collect_values[0].v_pointer; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!object_p) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 4610 "DataSource.c" +#line 4809 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!value->data[0].v_pointer) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = NULL; -#line 4616 "DataSource.c" +#line 4815 "DataSource.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = value->data[0].v_pointer; -#line 4620 "DataSource.c" +#line 4819 "DataSource.c" } else { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = source_proxy_ref (value->data[0].v_pointer); -#line 4624 "DataSource.c" +#line 4823 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 4628 "DataSource.c" +#line 4827 "DataSource.c" } -GParamSpec* param_spec_source_proxy (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_source_proxy (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecSourceProxy* spec; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_SOURCE_PROXY), NULL); @@ -4639,20 +4844,25 @@ GParamSpec* param_spec_source_proxy (const gchar* name, const gchar* nick, const G_PARAM_SPEC (spec)->value_type = object_type; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return G_PARAM_SPEC (spec); -#line 4642 "DataSource.c" +#line 4847 "DataSource.c" } -gpointer value_get_source_proxy (const GValue* value) { +gpointer +value_get_source_proxy (const GValue* value) +{ #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_PROXY), NULL); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return value->data[0].v_pointer; -#line 4651 "DataSource.c" +#line 4858 "DataSource.c" } -void value_set_source_proxy (GValue* value, gpointer v_object) { +void +value_set_source_proxy (GValue* value, + gpointer v_object) +{ SourceProxy * old; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_PROXY)); @@ -4668,22 +4878,25 @@ void value_set_source_proxy (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_ref (value->data[0].v_pointer); -#line 4671 "DataSource.c" +#line 4881 "DataSource.c" } else { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 4675 "DataSource.c" +#line 4885 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (old) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_unref (old); -#line 4681 "DataSource.c" +#line 4891 "DataSource.c" } } -void value_take_source_proxy (GValue* value, gpointer v_object) { +void +value_take_source_proxy (GValue* value, + gpointer v_object) +{ SourceProxy * old; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_PROXY)); @@ -4697,22 +4910,24 @@ void value_take_source_proxy (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = v_object; -#line 4700 "DataSource.c" +#line 4913 "DataSource.c" } else { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 4704 "DataSource.c" +#line 4917 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (old) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_unref (old); -#line 4710 "DataSource.c" +#line 4923 "DataSource.c" } } -static void source_proxy_class_init (SourceProxyClass * klass) { +static void +source_proxy_class_init (SourceProxyClass * klass) +{ #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_parent_class = g_type_class_peek_parent (klass); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4739,20 +4954,24 @@ static void source_proxy_class_init (SourceProxyClass * klass) { source_proxy_signals[SOURCE_PROXY_DEHYDRATED_SIGNAL] = g_signal_new ("dehydrated", TYPE_SOURCE_PROXY, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceProxyClass, dehydrated), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_signals[SOURCE_PROXY_BROKEN_SIGNAL] = g_signal_new ("broken", TYPE_SOURCE_PROXY, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceProxyClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 4742 "DataSource.c" +#line 4957 "DataSource.c" } -static void source_proxy_instance_init (SourceProxy * self) { +static void +source_proxy_instance_init (SourceProxy * self) +{ #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv = SOURCE_PROXY_GET_PRIVATE (self); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->ref_count = 1; -#line 4751 "DataSource.c" +#line 4968 "DataSource.c" } -static void source_proxy_finalize (SourceProxy * obj) { +static void +source_proxy_finalize (SourceProxy * obj) +{ SourceProxy * self; SourceCollection* _tmp0_; guint _tmp1_; @@ -4776,11 +4995,13 @@ static void source_proxy_finalize (SourceProxy * obj) { _source_snapshot_unref0 (self->priv->snapshot); #line 554 "/home/jens/Source/shotwell/src/core/DataSource.vala" _data_collection_unref0 (self->priv->membership); -#line 4779 "DataSource.c" +#line 4998 "DataSource.c" } -GType source_proxy_get_type (void) { +GType +source_proxy_get_type (void) +{ static volatile gsize source_proxy_type_id__volatile = 0; if (g_once_init_enter (&source_proxy_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_source_proxy_init, value_source_proxy_free_value, value_source_proxy_copy_value, value_source_proxy_peek_pointer, "p", value_source_proxy_collect_value, "p", value_source_proxy_lcopy_value }; @@ -4794,18 +5015,22 @@ GType source_proxy_get_type (void) { } -gpointer source_proxy_ref (gpointer instance) { +gpointer +source_proxy_ref (gpointer instance) +{ SourceProxy * self; self = instance; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_atomic_int_inc (&self->ref_count); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return instance; -#line 4804 "DataSource.c" +#line 5027 "DataSource.c" } -void source_proxy_unref (gpointer instance) { +void +source_proxy_unref (gpointer instance) +{ SourceProxy * self; self = instance; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4814,33 +5039,39 @@ void source_proxy_unref (gpointer instance) { SOURCE_PROXY_GET_CLASS (self)->finalize (self); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_type_free_instance ((GTypeInstance *) self); -#line 4817 "DataSource.c" +#line 5042 "DataSource.c" } } -SourceProxy* proxyable_get_proxy (Proxyable* self) { +SourceProxy* +proxyable_get_proxy (Proxyable* self) +{ #line 677 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_PROXYABLE (self), NULL); #line 677 "/home/jens/Source/shotwell/src/core/DataSource.vala" return PROXYABLE_GET_INTERFACE (self)->get_proxy (self); -#line 4827 "DataSource.c" +#line 5054 "DataSource.c" } -static void proxyable_base_init (ProxyableIface * iface) { +static void +proxyable_base_init (ProxyableIface * iface) +{ #line 676 "/home/jens/Source/shotwell/src/core/DataSource.vala" static gboolean initialized = FALSE; #line 676 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!initialized) { #line 676 "/home/jens/Source/shotwell/src/core/DataSource.vala" initialized = TRUE; -#line 4838 "DataSource.c" +#line 5067 "DataSource.c" } } -GType proxyable_get_type (void) { +GType +proxyable_get_type (void) +{ static volatile gsize proxyable_type_id__volatile = 0; if (g_once_init_enter (&proxyable_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ProxyableIface), (GBaseInitFunc) proxyable_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -4853,7 +5084,11 @@ GType proxyable_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -4865,13 +5100,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -static gint _vala_array_length (gpointer array) { +static gint +_vala_array_length (gpointer array) +{ int length; length = 0; if (array) { diff --git a/src/core/DataSourceTypes.c b/src/core/DataSourceTypes.c index 539ab93..5fda46c 100644 --- a/src/core/DataSourceTypes.c +++ b/src/core/DataSourceTypes.c @@ -1,4 +1,4 @@ -/* DataSourceTypes.c generated by valac 0.36.6, the Vala compiler +/* DataSourceTypes.c generated by valac 0.40.4, the Vala compiler * generated from DataSourceTypes.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -10,6 +10,7 @@ /* Media sources*/ /**/ + #include #include #include @@ -104,6 +105,11 @@ typedef struct _ThumbnailSourceClass ThumbnailSourceClass; typedef struct _ThumbnailSourcePrivate ThumbnailSourcePrivate; #define TYPE_PHOTO_FILE_FORMAT (photo_file_format_get_type ()) +enum { + THUMBNAIL_SOURCE_0_PROPERTY, + THUMBNAIL_SOURCE_NUM_PROPERTIES +}; +static GParamSpec* thumbnail_source_properties[THUMBNAIL_SOURCE_NUM_PROPERTIES]; #define TYPE_DATA_VIEW (data_view_get_type ()) #define DATA_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_VIEW, DataView)) @@ -126,9 +132,9 @@ typedef struct _ThumbnailView ThumbnailView; typedef struct _ThumbnailViewClass ThumbnailViewClass; enum { THUMBNAIL_SOURCE_THUMBNAIL_ALTERED_SIGNAL, - THUMBNAIL_SOURCE_LAST_SIGNAL + THUMBNAIL_SOURCE_NUM_SIGNALS }; -static guint thumbnail_source_signals[THUMBNAIL_SOURCE_LAST_SIGNAL] = {0}; +static guint thumbnail_source_signals[THUMBNAIL_SOURCE_NUM_SIGNALS] = {0}; #define TYPE_INDEXABLE (indexable_get_type ()) #define INDEXABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_INDEXABLE, Indexable)) @@ -207,6 +213,11 @@ typedef struct _MediaMetadataClass MediaMetadataClass; typedef struct _PhotoMetadata PhotoMetadata; typedef struct _PhotoMetadataClass PhotoMetadataClass; +enum { + PHOTO_SOURCE_0_PROPERTY, + PHOTO_SOURCE_NUM_PROPERTIES +}; +static GParamSpec* photo_source_properties[PHOTO_SOURCE_NUM_PROPERTIES]; #define TYPE_VIDEO_SOURCE (video_source_get_type ()) #define VIDEO_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIDEO_SOURCE, VideoSource)) @@ -218,6 +229,11 @@ typedef struct _PhotoMetadataClass PhotoMetadataClass; typedef struct _VideoSource VideoSource; typedef struct _VideoSourceClass VideoSourceClass; typedef struct _VideoSourcePrivate VideoSourcePrivate; +enum { + VIDEO_SOURCE_0_PROPERTY, + VIDEO_SOURCE_NUM_PROPERTIES +}; +static GParamSpec* video_source_properties[VIDEO_SOURCE_NUM_PROPERTIES]; #define TYPE_EVENT_SOURCE (event_source_get_type ()) #define EVENT_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EVENT_SOURCE, EventSource)) @@ -229,6 +245,11 @@ typedef struct _VideoSourcePrivate VideoSourcePrivate; typedef struct _EventSource EventSource; typedef struct _EventSourceClass EventSourceClass; typedef struct _EventSourcePrivate EventSourcePrivate; +enum { + EVENT_SOURCE_0_PROPERTY, + EVENT_SOURCE_NUM_PROPERTIES +}; +static GParamSpec* event_source_properties[EVENT_SOURCE_NUM_PROPERTIES]; #define TYPE_CONTAINER_SOURCE (container_source_get_type ()) #define CONTAINER_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONTAINER_SOURCE, ContainerSource)) @@ -460,53 +481,88 @@ static gpointer event_source_parent_class = NULL; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; gpointer source_snapshot_ref (gpointer instance); void source_snapshot_unref (gpointer instance); -GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_snapshot (GValue* value, gpointer v_object); -void value_take_source_snapshot (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_snapshot (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_snapshot (GValue* value, + gpointer v_object); +void value_take_source_snapshot (GValue* value, + gpointer v_object); gpointer value_get_source_snapshot (const GValue* value); GType source_snapshot_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType photo_file_format_get_type (void) G_GNUC_CONST; -enum { - THUMBNAIL_SOURCE_DUMMY_PROPERTY -}; -ThumbnailSource* thumbnail_source_construct (GType object_type, gint64 object_id); -DataSource* data_source_construct (GType object_type, gint64 object_id); +ThumbnailSource* thumbnail_source_construct (GType object_type, + gint64 object_id); +DataSource* data_source_construct (GType object_type, + gint64 object_id); void thumbnail_source_notify_thumbnail_altered (ThumbnailSource* self); static void thumbnail_source_real_notify_thumbnail_altered (ThumbnailSource* self); GType data_view_get_type (void) G_GNUC_CONST; -void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscriber contact_subscriber, void* contact_subscriber_target); -static void thumbnail_source_subscriber_thumbnail_altered (ThumbnailSource* self, DataView* view); -static void _thumbnail_source_subscriber_thumbnail_altered_data_source_contact_subscriber (DataView* view, gpointer self); +void data_source_contact_subscribers (DataSource* self, + DataSourceContactSubscriber contact_subscriber, + void* contact_subscriber_target); +static void thumbnail_source_subscriber_thumbnail_altered (ThumbnailSource* self, + DataView* view); +static void _thumbnail_source_subscriber_thumbnail_altered_data_source_contact_subscriber (DataView* view, + gpointer self); GType thumbnail_view_get_type (void) G_GNUC_CONST; void thumbnail_view_notify_thumbnail_altered (ThumbnailView* self); -GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GError** error); -static GdkPixbuf* thumbnail_source_real_get_thumbnail (ThumbnailSource* self, gint scale, GError** error); -GdkPixbuf* thumbnail_source_create_thumbnail (ThumbnailSource* self, gint scale, GError** error); -static GdkPixbuf* thumbnail_source_real_create_thumbnail (ThumbnailSource* self, gint scale, GError** error); +GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); +static GdkPixbuf* thumbnail_source_real_get_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); +GdkPixbuf* thumbnail_source_create_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); +static GdkPixbuf* thumbnail_source_real_create_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); gchar* thumbnail_source_get_representative_id (ThumbnailSource* self); static gchar* thumbnail_source_real_get_representative_id (ThumbnailSource* self); gchar* data_source_get_source_id (DataSource* self); @@ -520,9 +576,15 @@ EventID* event_id_dup (const EventID* self); void event_id_free (EventID* self); gpointer backing_file_state_ref (gpointer instance); void backing_file_state_unref (gpointer instance); -GParamSpec* param_spec_backing_file_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_file_state (GValue* value, gpointer v_object); -void value_take_backing_file_state (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_file_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_file_state (GValue* value, + gpointer v_object); +void value_take_backing_file_state (GValue* value, + gpointer v_object); gpointer value_get_backing_file_state (const GValue* value); GType backing_file_state_get_type (void) G_GNUC_CONST; GType rating_get_type (void) G_GNUC_CONST; @@ -540,32 +602,36 @@ void import_id_free (ImportID* self); GType photo_source_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; -enum { - PHOTO_SOURCE_DUMMY_PROPERTY -}; -PhotoSource* photo_source_construct (GType object_type, gint64 object_id); -MediaSource* media_source_construct (GType object_type, gint64 object_id); +PhotoSource* photo_source_construct (GType object_type, + gint64 object_id); +MediaSource* media_source_construct (GType object_type, + gint64 object_id); PhotoMetadata* photo_source_get_metadata (PhotoSource* self); static PhotoMetadata* photo_source_real_get_metadata (PhotoSource* self); -GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error); -static GdkPixbuf* photo_source_real_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error); +GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, + Scaling* scaling, + GError** error); +static GdkPixbuf* photo_source_real_get_pixbuf (PhotoSource* self, + Scaling* scaling, + GError** error); GType video_source_get_type (void) G_GNUC_CONST; -enum { - VIDEO_SOURCE_DUMMY_PROPERTY -}; VideoSource* video_source_construct (GType object_type); #define DATA_OBJECT_INVALID_OBJECT_ID ((gint64) -1) GType event_source_get_type (void) G_GNUC_CONST; -enum { - EVENT_SOURCE_DUMMY_PROPERTY -}; -EventSource* event_source_construct (GType object_type, gint64 object_id); +EventSource* event_source_construct (GType object_type, + gint64 object_id); time_t event_source_get_start_time (EventSource* self); static time_t event_source_real_get_start_time (EventSource* self); time_t event_source_get_end_time (EventSource* self); @@ -578,113 +644,150 @@ GeeCollection* event_source_get_media (EventSource* self); static GeeCollection* event_source_real_get_media (EventSource* self); gchar* event_source_get_comment (EventSource* self); static gchar* event_source_real_get_comment (EventSource* self); -gboolean event_source_set_comment (EventSource* self, const gchar* comment); -static gboolean event_source_real_set_comment (EventSource* self, const gchar* comment); +gboolean event_source_set_comment (EventSource* self, + const gchar* comment); +static gboolean event_source_real_set_comment (EventSource* self, + const gchar* comment); gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; GType container_source_get_type (void) G_GNUC_CONST; gboolean container_source_has_links (ContainerSource* self); SourceBacklink* container_source_get_backlink (ContainerSource* self); -void container_source_break_link (ContainerSource* self, DataSource* source); -void container_source_break_link_many (ContainerSource* self, GeeCollection* sources); -void container_source_establish_link (ContainerSource* self, DataSource* source); -void container_source_establish_link_many (ContainerSource* self, GeeCollection* sources); - - -ThumbnailSource* thumbnail_source_construct (GType object_type, gint64 object_id) { +void container_source_break_link (ContainerSource* self, + DataSource* source); +void container_source_break_link_many (ContainerSource* self, + GeeCollection* sources); +void container_source_establish_link (ContainerSource* self, + DataSource* source); +void container_source_establish_link_many (ContainerSource* self, + GeeCollection* sources); + + +ThumbnailSource* +thumbnail_source_construct (GType object_type, + gint64 object_id) +{ ThumbnailSource * self = NULL; - gint64 _tmp0_; -#line 16 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - _tmp0_ = object_id; #line 16 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - self = (ThumbnailSource*) data_source_construct (object_type, _tmp0_); + self = (ThumbnailSource*) data_source_construct (object_type, object_id); #line 15 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return self; -#line 609 "DataSourceTypes.c" +#line 687 "DataSourceTypes.c" } -static void _thumbnail_source_subscriber_thumbnail_altered_data_source_contact_subscriber (DataView* view, gpointer self) { +static void +_thumbnail_source_subscriber_thumbnail_altered_data_source_contact_subscriber (DataView* view, + gpointer self) +{ #line 24 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" thumbnail_source_subscriber_thumbnail_altered ((ThumbnailSource*) self, view); -#line 616 "DataSourceTypes.c" +#line 697 "DataSourceTypes.c" } -static void thumbnail_source_real_notify_thumbnail_altered (ThumbnailSource* self) { +static void +thumbnail_source_real_notify_thumbnail_altered (ThumbnailSource* self) +{ #line 21 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_signal_emit (self, thumbnail_source_signals[THUMBNAIL_SOURCE_THUMBNAIL_ALTERED_SIGNAL], 0); #line 24 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" data_source_contact_subscribers (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), _thumbnail_source_subscriber_thumbnail_altered_data_source_contact_subscriber, self); -#line 625 "DataSourceTypes.c" +#line 708 "DataSourceTypes.c" } -void thumbnail_source_notify_thumbnail_altered (ThumbnailSource* self) { +void +thumbnail_source_notify_thumbnail_altered (ThumbnailSource* self) +{ #line 19 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (self)); #line 19 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" THUMBNAIL_SOURCE_GET_CLASS (self)->notify_thumbnail_altered (self); -#line 634 "DataSourceTypes.c" +#line 719 "DataSourceTypes.c" } -static void thumbnail_source_subscriber_thumbnail_altered (ThumbnailSource* self, DataView* view) { - DataView* _tmp0_; +static void +thumbnail_source_subscriber_thumbnail_altered (ThumbnailSource* self, + DataView* view) +{ #line 27 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (self)); #line 27 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_if_fail (IS_DATA_VIEW (view)); #line 28 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - _tmp0_ = view; -#line 28 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - thumbnail_view_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_VIEW, ThumbnailView)); -#line 648 "DataSourceTypes.c" + thumbnail_view_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_THUMBNAIL_VIEW, ThumbnailView)); +#line 733 "DataSourceTypes.c" } -static GdkPixbuf* thumbnail_source_real_get_thumbnail (ThumbnailSource* self, gint scale, GError** error) { +static GdkPixbuf* +thumbnail_source_real_get_thumbnail (ThumbnailSource* self, + gint scale, + GError** error) +{ #line 31 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `thumbnail_source_get_thumbnail'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 31 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return NULL; -#line 657 "DataSourceTypes.c" +#line 746 "DataSourceTypes.c" } -GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GError** error) { +GdkPixbuf* +thumbnail_source_get_thumbnail (ThumbnailSource* self, + gint scale, + GError** error) +{ #line 31 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_THUMBNAIL_SOURCE (self), NULL); #line 31 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return THUMBNAIL_SOURCE_GET_CLASS (self)->get_thumbnail (self, scale, error); -#line 666 "DataSourceTypes.c" +#line 759 "DataSourceTypes.c" } -static GdkPixbuf* thumbnail_source_real_create_thumbnail (ThumbnailSource* self, gint scale, GError** error) { +static GdkPixbuf* +thumbnail_source_real_create_thumbnail (ThumbnailSource* self, + gint scale, + GError** error) +{ #line 35 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `thumbnail_source_create_thumbnail'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 35 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return NULL; -#line 675 "DataSourceTypes.c" +#line 772 "DataSourceTypes.c" } -GdkPixbuf* thumbnail_source_create_thumbnail (ThumbnailSource* self, gint scale, GError** error) { +GdkPixbuf* +thumbnail_source_create_thumbnail (ThumbnailSource* self, + gint scale, + GError** error) +{ #line 35 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_THUMBNAIL_SOURCE (self), NULL); #line 35 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return THUMBNAIL_SOURCE_GET_CLASS (self)->create_thumbnail (self, scale, error); -#line 684 "DataSourceTypes.c" +#line 785 "DataSourceTypes.c" } -static gchar* thumbnail_source_real_get_representative_id (ThumbnailSource* self) { +static gchar* +thumbnail_source_real_get_representative_id (ThumbnailSource* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 47 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" @@ -693,42 +796,52 @@ static gchar* thumbnail_source_real_get_representative_id (ThumbnailSource* self result = _tmp0_; #line 47 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return result; -#line 697 "DataSourceTypes.c" +#line 800 "DataSourceTypes.c" } -gchar* thumbnail_source_get_representative_id (ThumbnailSource* self) { +gchar* +thumbnail_source_get_representative_id (ThumbnailSource* self) +{ #line 46 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_THUMBNAIL_SOURCE (self), NULL); #line 46 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return THUMBNAIL_SOURCE_GET_CLASS (self)->get_representative_id (self); -#line 706 "DataSourceTypes.c" +#line 811 "DataSourceTypes.c" } -static PhotoFileFormat thumbnail_source_real_get_preferred_thumbnail_format (ThumbnailSource* self) { +static PhotoFileFormat +thumbnail_source_real_get_preferred_thumbnail_format (ThumbnailSource* self) +{ #line 50 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `thumbnail_source_get_preferred_thumbnail_format'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 50 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return 0; -#line 715 "DataSourceTypes.c" +#line 822 "DataSourceTypes.c" } -PhotoFileFormat thumbnail_source_get_preferred_thumbnail_format (ThumbnailSource* self) { +PhotoFileFormat +thumbnail_source_get_preferred_thumbnail_format (ThumbnailSource* self) +{ #line 50 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_THUMBNAIL_SOURCE (self), 0); #line 50 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return THUMBNAIL_SOURCE_GET_CLASS (self)->get_preferred_thumbnail_format (self); -#line 724 "DataSourceTypes.c" +#line 833 "DataSourceTypes.c" } -static void thumbnail_source_real_thumbnail_altered (ThumbnailSource* self) { +static void +thumbnail_source_real_thumbnail_altered (ThumbnailSource* self) +{ } -static void thumbnail_source_class_init (ThumbnailSourceClass * klass) { +static void +thumbnail_source_class_init (ThumbnailSourceClass * klass) +{ #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" thumbnail_source_parent_class = g_type_class_peek_parent (klass); #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" @@ -745,15 +858,19 @@ static void thumbnail_source_class_init (ThumbnailSourceClass * klass) { ((ThumbnailSourceClass *) klass)->thumbnail_altered = thumbnail_source_real_thumbnail_altered; #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" thumbnail_source_signals[THUMBNAIL_SOURCE_THUMBNAIL_ALTERED_SIGNAL] = g_signal_new ("thumbnail-altered", TYPE_THUMBNAIL_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ThumbnailSourceClass, thumbnail_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 749 "DataSourceTypes.c" +#line 862 "DataSourceTypes.c" } -static void thumbnail_source_instance_init (ThumbnailSource * self) { +static void +thumbnail_source_instance_init (ThumbnailSource * self) +{ } -GType thumbnail_source_get_type (void) { +GType +thumbnail_source_get_type (void) +{ static volatile gsize thumbnail_source_type_id__volatile = 0; if (g_once_init_enter (&thumbnail_source_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ThumbnailSourceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) thumbnail_source_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ThumbnailSource), 0, (GInstanceInitFunc) thumbnail_source_instance_init, NULL }; @@ -765,71 +882,89 @@ GType thumbnail_source_get_type (void) { } -PhotoSource* photo_source_construct (GType object_type, gint64 object_id) { +PhotoSource* +photo_source_construct (GType object_type, + gint64 object_id) +{ PhotoSource * self = NULL; - gint64 _tmp0_; -#line 55 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - _tmp0_ = object_id; #line 55 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - self = (PhotoSource*) media_source_construct (object_type, _tmp0_); + self = (PhotoSource*) media_source_construct (object_type, object_id); #line 54 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return self; -#line 778 "DataSourceTypes.c" +#line 895 "DataSourceTypes.c" } -static PhotoMetadata* photo_source_real_get_metadata (PhotoSource* self) { +static PhotoMetadata* +photo_source_real_get_metadata (PhotoSource* self) +{ #line 58 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `photo_source_get_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 58 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return NULL; -#line 787 "DataSourceTypes.c" +#line 906 "DataSourceTypes.c" } -PhotoMetadata* photo_source_get_metadata (PhotoSource* self) { +PhotoMetadata* +photo_source_get_metadata (PhotoSource* self) +{ #line 58 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_PHOTO_SOURCE (self), NULL); #line 58 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return PHOTO_SOURCE_GET_CLASS (self)->get_metadata (self); -#line 796 "DataSourceTypes.c" +#line 917 "DataSourceTypes.c" } -static GdkPixbuf* photo_source_real_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error) { +static GdkPixbuf* +photo_source_real_get_pixbuf (PhotoSource* self, + Scaling* scaling, + GError** error) +{ #line 60 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `photo_source_get_pixbuf'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 60 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return NULL; -#line 805 "DataSourceTypes.c" +#line 930 "DataSourceTypes.c" } -GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error) { +GdkPixbuf* +photo_source_get_pixbuf (PhotoSource* self, + Scaling* scaling, + GError** error) +{ #line 60 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_PHOTO_SOURCE (self), NULL); #line 60 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return PHOTO_SOURCE_GET_CLASS (self)->get_pixbuf (self, scaling, error); -#line 814 "DataSourceTypes.c" +#line 943 "DataSourceTypes.c" } -static void photo_source_class_init (PhotoSourceClass * klass) { +static void +photo_source_class_init (PhotoSourceClass * klass) +{ #line 53 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" photo_source_parent_class = g_type_class_peek_parent (klass); #line 53 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" ((PhotoSourceClass *) klass)->get_metadata = (PhotoMetadata* (*) (PhotoSource *)) photo_source_real_get_metadata; #line 53 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" ((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*) (PhotoSource *, Scaling*, GError**)) photo_source_real_get_pixbuf; -#line 825 "DataSourceTypes.c" +#line 956 "DataSourceTypes.c" } -static void photo_source_instance_init (PhotoSource * self) { +static void +photo_source_instance_init (PhotoSource * self) +{ } -GType photo_source_get_type (void) { +GType +photo_source_get_type (void) +{ static volatile gsize photo_source_type_id__volatile = 0; if (g_once_init_enter (&photo_source_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoSourceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_source_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoSource), 0, (GInstanceInitFunc) photo_source_instance_init, NULL }; @@ -841,28 +976,36 @@ GType photo_source_get_type (void) { } -VideoSource* video_source_construct (GType object_type) { +VideoSource* +video_source_construct (GType object_type) +{ VideoSource * self = NULL; #line 63 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" self = (VideoSource*) media_source_construct (object_type, DATA_OBJECT_INVALID_OBJECT_ID); #line 63 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return self; -#line 851 "DataSourceTypes.c" +#line 988 "DataSourceTypes.c" } -static void video_source_class_init (VideoSourceClass * klass) { +static void +video_source_class_init (VideoSourceClass * klass) +{ #line 63 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" video_source_parent_class = g_type_class_peek_parent (klass); -#line 858 "DataSourceTypes.c" +#line 997 "DataSourceTypes.c" } -static void video_source_instance_init (VideoSource * self) { +static void +video_source_instance_init (VideoSource * self) +{ } -GType video_source_get_type (void) { +GType +video_source_get_type (void) +{ static volatile gsize video_source_type_id__volatile = 0; if (g_once_init_enter (&video_source_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (VideoSourceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) video_source_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (VideoSource), 0, (GInstanceInitFunc) video_source_instance_init, NULL }; @@ -874,151 +1017,183 @@ GType video_source_get_type (void) { } -EventSource* event_source_construct (GType object_type, gint64 object_id) { +EventSource* +event_source_construct (GType object_type, + gint64 object_id) +{ EventSource * self = NULL; - gint64 _tmp0_; -#line 72 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - _tmp0_ = object_id; #line 72 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - self = (EventSource*) thumbnail_source_construct (object_type, _tmp0_); + self = (EventSource*) thumbnail_source_construct (object_type, object_id); #line 71 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return self; -#line 887 "DataSourceTypes.c" +#line 1030 "DataSourceTypes.c" } -static time_t event_source_real_get_start_time (EventSource* self) { +static time_t +event_source_real_get_start_time (EventSource* self) +{ time_t _tmp0_ = 0; #line 75 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `event_source_get_start_time'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 75 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return _tmp0_; -#line 897 "DataSourceTypes.c" +#line 1042 "DataSourceTypes.c" } -time_t event_source_get_start_time (EventSource* self) { +time_t +event_source_get_start_time (EventSource* self) +{ #line 75 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_EVENT_SOURCE (self), 0); #line 75 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->get_start_time (self); -#line 906 "DataSourceTypes.c" +#line 1053 "DataSourceTypes.c" } -static time_t event_source_real_get_end_time (EventSource* self) { +static time_t +event_source_real_get_end_time (EventSource* self) +{ time_t _tmp0_ = 0; #line 77 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `event_source_get_end_time'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 77 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return _tmp0_; -#line 916 "DataSourceTypes.c" +#line 1065 "DataSourceTypes.c" } -time_t event_source_get_end_time (EventSource* self) { +time_t +event_source_get_end_time (EventSource* self) +{ #line 77 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_EVENT_SOURCE (self), 0); #line 77 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->get_end_time (self); -#line 925 "DataSourceTypes.c" +#line 1076 "DataSourceTypes.c" } -static guint64 event_source_real_get_total_filesize (EventSource* self) { +static guint64 +event_source_real_get_total_filesize (EventSource* self) +{ guint64 _tmp0_ = 0ULL; #line 79 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `event_source_get_total_filesize'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 79 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return _tmp0_; -#line 935 "DataSourceTypes.c" +#line 1088 "DataSourceTypes.c" } -guint64 event_source_get_total_filesize (EventSource* self) { +guint64 +event_source_get_total_filesize (EventSource* self) +{ #line 79 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_EVENT_SOURCE (self), 0ULL); #line 79 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->get_total_filesize (self); -#line 944 "DataSourceTypes.c" +#line 1099 "DataSourceTypes.c" } -static gint event_source_real_get_media_count (EventSource* self) { +static gint +event_source_real_get_media_count (EventSource* self) +{ gint _tmp0_ = 0; #line 81 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `event_source_get_media_count'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 81 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return _tmp0_; -#line 954 "DataSourceTypes.c" +#line 1111 "DataSourceTypes.c" } -gint event_source_get_media_count (EventSource* self) { +gint +event_source_get_media_count (EventSource* self) +{ #line 81 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_EVENT_SOURCE (self), 0); #line 81 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->get_media_count (self); -#line 963 "DataSourceTypes.c" +#line 1122 "DataSourceTypes.c" } -static GeeCollection* event_source_real_get_media (EventSource* self) { +static GeeCollection* +event_source_real_get_media (EventSource* self) +{ #line 83 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `event_source_get_media'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 83 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return NULL; -#line 972 "DataSourceTypes.c" +#line 1133 "DataSourceTypes.c" } -GeeCollection* event_source_get_media (EventSource* self) { +GeeCollection* +event_source_get_media (EventSource* self) +{ #line 83 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_EVENT_SOURCE (self), NULL); #line 83 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->get_media (self); -#line 981 "DataSourceTypes.c" +#line 1144 "DataSourceTypes.c" } -static gchar* event_source_real_get_comment (EventSource* self) { +static gchar* +event_source_real_get_comment (EventSource* self) +{ #line 85 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `event_source_get_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 85 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return NULL; -#line 990 "DataSourceTypes.c" +#line 1155 "DataSourceTypes.c" } -gchar* event_source_get_comment (EventSource* self) { +gchar* +event_source_get_comment (EventSource* self) +{ #line 85 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_EVENT_SOURCE (self), NULL); #line 85 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->get_comment (self); -#line 999 "DataSourceTypes.c" +#line 1166 "DataSourceTypes.c" } -static gboolean event_source_real_set_comment (EventSource* self, const gchar* comment) { +static gboolean +event_source_real_set_comment (EventSource* self, + const gchar* comment) +{ gboolean _tmp0_ = FALSE; #line 87 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `event_source_set_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 87 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return _tmp0_; -#line 1009 "DataSourceTypes.c" +#line 1179 "DataSourceTypes.c" } -gboolean event_source_set_comment (EventSource* self, const gchar* comment) { +gboolean +event_source_set_comment (EventSource* self, + const gchar* comment) +{ #line 87 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_EVENT_SOURCE (self), FALSE); #line 87 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->set_comment (self, comment); -#line 1018 "DataSourceTypes.c" +#line 1191 "DataSourceTypes.c" } -static void event_source_class_init (EventSourceClass * klass) { +static void +event_source_class_init (EventSourceClass * klass) +{ #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" event_source_parent_class = g_type_class_peek_parent (klass); #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" @@ -1035,15 +1210,19 @@ static void event_source_class_init (EventSourceClass * klass) { ((EventSourceClass *) klass)->get_comment = (gchar* (*) (EventSource *)) event_source_real_get_comment; #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" ((EventSourceClass *) klass)->set_comment = (gboolean (*) (EventSource *, const gchar*)) event_source_real_set_comment; -#line 1039 "DataSourceTypes.c" +#line 1214 "DataSourceTypes.c" } -static void event_source_instance_init (EventSource * self) { +static void +event_source_instance_init (EventSource * self) +{ } -GType event_source_get_type (void) { +GType +event_source_get_type (void) +{ static volatile gsize event_source_type_id__volatile = 0; if (g_once_init_enter (&event_source_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventSourceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_source_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventSource), 0, (GInstanceInitFunc) event_source_instance_init, NULL }; @@ -1055,73 +1234,93 @@ GType event_source_get_type (void) { } -gboolean container_source_has_links (ContainerSource* self) { +gboolean +container_source_has_links (ContainerSource* self) +{ #line 95 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_CONTAINER_SOURCE (self), FALSE); #line 95 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return CONTAINER_SOURCE_GET_INTERFACE (self)->has_links (self); -#line 1064 "DataSourceTypes.c" +#line 1245 "DataSourceTypes.c" } -SourceBacklink* container_source_get_backlink (ContainerSource* self) { +SourceBacklink* +container_source_get_backlink (ContainerSource* self) +{ #line 97 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_CONTAINER_SOURCE (self), NULL); #line 97 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return CONTAINER_SOURCE_GET_INTERFACE (self)->get_backlink (self); -#line 1073 "DataSourceTypes.c" +#line 1256 "DataSourceTypes.c" } -void container_source_break_link (ContainerSource* self, DataSource* source) { +void +container_source_break_link (ContainerSource* self, + DataSource* source) +{ #line 99 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_if_fail (IS_CONTAINER_SOURCE (self)); #line 99 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" CONTAINER_SOURCE_GET_INTERFACE (self)->break_link (self, source); -#line 1082 "DataSourceTypes.c" +#line 1268 "DataSourceTypes.c" } -void container_source_break_link_many (ContainerSource* self, GeeCollection* sources) { +void +container_source_break_link_many (ContainerSource* self, + GeeCollection* sources) +{ #line 101 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_if_fail (IS_CONTAINER_SOURCE (self)); #line 101 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" CONTAINER_SOURCE_GET_INTERFACE (self)->break_link_many (self, sources); -#line 1091 "DataSourceTypes.c" +#line 1280 "DataSourceTypes.c" } -void container_source_establish_link (ContainerSource* self, DataSource* source) { +void +container_source_establish_link (ContainerSource* self, + DataSource* source) +{ #line 103 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_if_fail (IS_CONTAINER_SOURCE (self)); #line 103 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" CONTAINER_SOURCE_GET_INTERFACE (self)->establish_link (self, source); -#line 1100 "DataSourceTypes.c" +#line 1292 "DataSourceTypes.c" } -void container_source_establish_link_many (ContainerSource* self, GeeCollection* sources) { +void +container_source_establish_link_many (ContainerSource* self, + GeeCollection* sources) +{ #line 105 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_if_fail (IS_CONTAINER_SOURCE (self)); #line 105 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" CONTAINER_SOURCE_GET_INTERFACE (self)->establish_link_many (self, sources); -#line 1109 "DataSourceTypes.c" +#line 1304 "DataSourceTypes.c" } -static void container_source_base_init (ContainerSourceIface * iface) { +static void +container_source_base_init (ContainerSourceIface * iface) +{ #line 94 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" static gboolean initialized = FALSE; #line 94 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" if (!initialized) { #line 94 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" initialized = TRUE; -#line 1120 "DataSourceTypes.c" +#line 1317 "DataSourceTypes.c" } } -GType container_source_get_type (void) { +GType +container_source_get_type (void) +{ static volatile gsize container_source_type_id__volatile = 0; if (g_once_init_enter (&container_source_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ContainerSourceIface), (GBaseInitFunc) container_source_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; diff --git a/src/core/DataView.c b/src/core/DataView.c index 004d364..7267434 100644 --- a/src/core/DataView.c +++ b/src/core/DataView.c @@ -1,4 +1,4 @@ -/* DataView.c generated by valac 0.36.6, the Vala compiler +/* DataView.c generated by valac 0.40.4, the Vala compiler * generated from DataView.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -64,6 +65,11 @@ typedef struct _DataViewPrivate DataViewPrivate; typedef struct _DataSource DataSource; typedef struct _DataSourceClass DataSourceClass; +enum { + DATA_VIEW_0_PROPERTY, + DATA_VIEW_NUM_PROPERTIES +}; +static GParamSpec* data_view_properties[DATA_VIEW_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) @@ -83,9 +89,9 @@ enum { DATA_VIEW_VIEW_ALTERED_SIGNAL, DATA_VIEW_GEOMETRY_ALTERED_SIGNAL, DATA_VIEW_UNSUBSCRIBED_SIGNAL, - DATA_VIEW_LAST_SIGNAL + DATA_VIEW_NUM_SIGNALS }; -static guint data_view_signals[DATA_VIEW_LAST_SIGNAL] = {0}; +static guint data_view_signals[DATA_VIEW_NUM_SIGNALS] = {0}; struct _DataObject { GObject parent_instance; @@ -131,101 +137,126 @@ static gpointer data_view_parent_class = NULL; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_view_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; #define DATA_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DATA_VIEW, DataViewPrivate)) -enum { - DATA_VIEW_DUMMY_PROPERTY -}; -void data_source_internal_unsubscribe (DataSource* self, DataView* view); +void data_source_internal_unsubscribe (DataSource* self, + DataView* view); DataView* data_view_new (DataSource* source); -DataView* data_view_construct (GType object_type, DataSource* source); +DataView* data_view_construct (GType object_type, + DataSource* source); #define DATA_OBJECT_INVALID_OBJECT_ID ((gint64) -1) -DataObject* data_object_construct (GType object_type, gint64 object_id); -void data_source_internal_subscribe (DataSource* self, DataView* view); +DataObject* data_object_construct (GType object_type, + gint64 object_id); +void data_source_internal_subscribe (DataSource* self, + DataView* view); static gchar* data_view_real_get_name (DataObject* base); gchar* data_object_get_name (DataObject* self); static gchar* data_view_real_to_string (DataObject* base); gchar* data_object_to_string (DataObject* self); DataSource* data_view_get_source (DataView* self); gboolean data_view_is_selected (DataView* self); -void data_view_internal_set_selected (DataView* self, gboolean selected); +void data_view_internal_set_selected (DataView* self, + gboolean selected); gboolean data_view_internal_toggle (DataView* self); gboolean data_view_is_visible (DataView* self); -void data_view_internal_set_visible (DataView* self, gboolean visible); +void data_view_internal_set_visible (DataView* self, + gboolean visible); void data_view_notify_view_altered (DataView* self); static void data_view_real_notify_view_altered (DataView* self); GType view_collection_get_type (void) G_GNUC_CONST; DataCollection* data_object_get_membership (DataObject* self); gboolean data_collection_are_notifications_frozen (DataCollection* self); -void view_collection_internal_notify_view_altered (ViewCollection* self, DataView* view); +void view_collection_internal_notify_view_altered (ViewCollection* self, + DataView* view); void data_view_notify_geometry_altered (DataView* self); static void data_view_real_notify_geometry_altered (DataView* self); -void view_collection_internal_notify_geometry_altered (ViewCollection* self, DataView* view); -void data_view_notify_unsubscribed (DataView* self, DataSource* source); -static void data_view_real_notify_unsubscribed (DataView* self, DataSource* source); -static void data_view_real_state_changed (DataView* self, gboolean selected); -static void data_view_real_visibility_changed (DataView* self, gboolean visible); +void view_collection_internal_notify_geometry_altered (ViewCollection* self, + DataView* view); +void data_view_notify_unsubscribed (DataView* self, + DataSource* source); +static void data_view_real_notify_unsubscribed (DataView* self, + DataSource* source); +static void data_view_real_state_changed (DataView* self, + gboolean selected); +static void data_view_real_visibility_changed (DataView* self, + gboolean visible); static void data_view_real_view_altered (DataView* self); static void data_view_real_geometry_altered (DataView* self); -static void data_view_real_unsubscribed (DataView* self, DataSource* source); +static void data_view_real_unsubscribed (DataView* self, + DataSource* source); static void data_view_finalize (GObject * obj); -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 33 "/home/jens/Source/shotwell/src/core/DataView.vala" return self ? g_object_ref (self) : NULL; -#line 191 "DataView.c" +#line 221 "DataView.c" } -DataView* data_view_construct (GType object_type, DataSource* source) { +DataView* +data_view_construct (GType object_type, + DataSource* source) +{ DataView * self = NULL; DataSource* _tmp0_; - DataSource* _tmp1_; - DataSource* _tmp2_; #line 32 "/home/jens/Source/shotwell/src/core/DataView.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 32 "/home/jens/Source/shotwell/src/core/DataView.vala" self = (DataView*) data_object_construct (object_type, DATA_OBJECT_INVALID_OBJECT_ID); #line 33 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp0_ = source; -#line 33 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (source); #line 33 "/home/jens/Source/shotwell/src/core/DataView.vala" _g_object_unref0 (self->priv->source); #line 33 "/home/jens/Source/shotwell/src/core/DataView.vala" - self->priv->source = _tmp1_; -#line 37 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp2_ = source; + self->priv->source = _tmp0_; #line 37 "/home/jens/Source/shotwell/src/core/DataView.vala" - data_source_internal_subscribe (_tmp2_, self); + data_source_internal_subscribe (source, self); #line 32 "/home/jens/Source/shotwell/src/core/DataView.vala" return self; -#line 218 "DataView.c" +#line 245 "DataView.c" } -DataView* data_view_new (DataSource* source) { +DataView* +data_view_new (DataSource* source) +{ #line 32 "/home/jens/Source/shotwell/src/core/DataView.vala" return data_view_construct (TYPE_DATA_VIEW, source); -#line 225 "DataView.c" +#line 254 "DataView.c" } -static gchar* data_view_real_get_name (DataObject* base) { +static gchar* +data_view_real_get_name (DataObject* base) +{ DataView * self; gchar* result = NULL; DataSource* _tmp0_; @@ -251,11 +282,13 @@ static gchar* data_view_real_get_name (DataObject* base) { result = _tmp4_; #line 48 "/home/jens/Source/shotwell/src/core/DataView.vala" return result; -#line 255 "DataView.c" +#line 286 "DataView.c" } -static gchar* data_view_real_to_string (DataObject* base) { +static gchar* +data_view_real_to_string (DataObject* base) +{ DataView * self; gchar* result = NULL; gchar* _tmp0_; @@ -289,11 +322,13 @@ static gchar* data_view_real_to_string (DataObject* base) { result = _tmp6_; #line 52 "/home/jens/Source/shotwell/src/core/DataView.vala" return result; -#line 293 "DataView.c" +#line 326 "DataView.c" } -DataSource* data_view_get_source (DataView* self) { +DataSource* +data_view_get_source (DataView* self) +{ DataSource* result = NULL; DataSource* _tmp0_; DataSource* _tmp1_; @@ -307,11 +342,13 @@ DataSource* data_view_get_source (DataView* self) { result = _tmp1_; #line 56 "/home/jens/Source/shotwell/src/core/DataView.vala" return result; -#line 311 "DataView.c" +#line 346 "DataView.c" } -gboolean data_view_is_selected (DataView* self) { +gboolean +data_view_is_selected (DataView* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 59 "/home/jens/Source/shotwell/src/core/DataView.vala" @@ -322,40 +359,36 @@ gboolean data_view_is_selected (DataView* self) { result = _tmp0_; #line 60 "/home/jens/Source/shotwell/src/core/DataView.vala" return result; -#line 326 "DataView.c" +#line 363 "DataView.c" } -void data_view_internal_set_selected (DataView* self, gboolean selected) { +void +data_view_internal_set_selected (DataView* self, + gboolean selected) +{ gboolean _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_; - gboolean _tmp3_; #line 64 "/home/jens/Source/shotwell/src/core/DataView.vala" g_return_if_fail (IS_DATA_VIEW (self)); #line 65 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp0_ = self->priv->selected; #line 65 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp1_ = selected; -#line 65 "/home/jens/Source/shotwell/src/core/DataView.vala" - if (_tmp0_ == _tmp1_) { + if (_tmp0_ == selected) { #line 66 "/home/jens/Source/shotwell/src/core/DataView.vala" return; -#line 345 "DataView.c" +#line 380 "DataView.c" } #line 68 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp2_ = selected; -#line 68 "/home/jens/Source/shotwell/src/core/DataView.vala" - self->priv->selected = _tmp2_; + self->priv->selected = selected; #line 69 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp3_ = selected; -#line 69 "/home/jens/Source/shotwell/src/core/DataView.vala" - g_signal_emit (self, data_view_signals[DATA_VIEW_STATE_CHANGED_SIGNAL], 0, _tmp3_); -#line 355 "DataView.c" + g_signal_emit (self, data_view_signals[DATA_VIEW_STATE_CHANGED_SIGNAL], 0, selected); +#line 386 "DataView.c" } -gboolean data_view_internal_toggle (DataView* self) { +gboolean +data_view_internal_toggle (DataView* self) +{ gboolean result = FALSE; gboolean _tmp0_; gboolean _tmp1_; @@ -376,11 +409,13 @@ gboolean data_view_internal_toggle (DataView* self) { result = _tmp2_; #line 77 "/home/jens/Source/shotwell/src/core/DataView.vala" return result; -#line 380 "DataView.c" +#line 413 "DataView.c" } -gboolean data_view_is_visible (DataView* self) { +gboolean +data_view_is_visible (DataView* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 80 "/home/jens/Source/shotwell/src/core/DataView.vala" @@ -391,40 +426,36 @@ gboolean data_view_is_visible (DataView* self) { result = _tmp0_; #line 81 "/home/jens/Source/shotwell/src/core/DataView.vala" return result; -#line 395 "DataView.c" +#line 430 "DataView.c" } -void data_view_internal_set_visible (DataView* self, gboolean visible) { +void +data_view_internal_set_visible (DataView* self, + gboolean visible) +{ gboolean _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_; - gboolean _tmp3_; #line 85 "/home/jens/Source/shotwell/src/core/DataView.vala" g_return_if_fail (IS_DATA_VIEW (self)); #line 86 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp0_ = self->priv->visible; #line 86 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp1_ = visible; -#line 86 "/home/jens/Source/shotwell/src/core/DataView.vala" - if (_tmp0_ == _tmp1_) { + if (_tmp0_ == visible) { #line 87 "/home/jens/Source/shotwell/src/core/DataView.vala" return; -#line 414 "DataView.c" +#line 447 "DataView.c" } #line 89 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp2_ = visible; -#line 89 "/home/jens/Source/shotwell/src/core/DataView.vala" - self->priv->visible = _tmp2_; + self->priv->visible = visible; #line 90 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp3_ = visible; -#line 90 "/home/jens/Source/shotwell/src/core/DataView.vala" - g_signal_emit (self, data_view_signals[DATA_VIEW_VISIBILITY_CHANGED_SIGNAL], 0, _tmp3_); -#line 424 "DataView.c" + g_signal_emit (self, data_view_signals[DATA_VIEW_VISIBILITY_CHANGED_SIGNAL], 0, visible); +#line 453 "DataView.c" } -static void data_view_real_notify_view_altered (DataView* self) { +static void +data_view_real_notify_view_altered (DataView* self) +{ gboolean _tmp0_; ViewCollection* vc = NULL; DataCollection* _tmp1_; @@ -436,7 +467,7 @@ static void data_view_real_notify_view_altered (DataView* self) { if (!_tmp0_) { #line 96 "/home/jens/Source/shotwell/src/core/DataView.vala" return; -#line 440 "DataView.c" +#line 471 "DataView.c" } #line 98 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp1_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); @@ -446,7 +477,7 @@ static void data_view_real_notify_view_altered (DataView* self) { if (_tmp2_ == NULL) { #line 98 "/home/jens/Source/shotwell/src/core/DataView.vala" _data_collection_unref0 (_tmp1_); -#line 450 "DataView.c" +#line 481 "DataView.c" } #line 98 "/home/jens/Source/shotwell/src/core/DataView.vala" vc = _tmp2_; @@ -454,46 +485,47 @@ static void data_view_real_notify_view_altered (DataView* self) { _tmp3_ = vc; #line 99 "/home/jens/Source/shotwell/src/core/DataView.vala" if (_tmp3_ != NULL) { -#line 458 "DataView.c" +#line 489 "DataView.c" ViewCollection* _tmp4_; - gboolean _tmp5_; - ViewCollection* _tmp6_; + ViewCollection* _tmp5_; #line 100 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp4_ = vc; #line 100 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp5_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection)); -#line 100 "/home/jens/Source/shotwell/src/core/DataView.vala" - if (!_tmp5_) { + if (!data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection))) { #line 101 "/home/jens/Source/shotwell/src/core/DataView.vala" g_signal_emit (self, data_view_signals[DATA_VIEW_VIEW_ALTERED_SIGNAL], 0); -#line 470 "DataView.c" +#line 498 "DataView.c" } #line 104 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp6_ = vc; + _tmp5_ = vc; #line 104 "/home/jens/Source/shotwell/src/core/DataView.vala" - view_collection_internal_notify_view_altered (_tmp6_, self); -#line 476 "DataView.c" + view_collection_internal_notify_view_altered (_tmp5_, self); +#line 504 "DataView.c" } else { #line 106 "/home/jens/Source/shotwell/src/core/DataView.vala" g_signal_emit (self, data_view_signals[DATA_VIEW_VIEW_ALTERED_SIGNAL], 0); -#line 480 "DataView.c" +#line 508 "DataView.c" } #line 93 "/home/jens/Source/shotwell/src/core/DataView.vala" _data_collection_unref0 (vc); -#line 484 "DataView.c" +#line 512 "DataView.c" } -void data_view_notify_view_altered (DataView* self) { +void +data_view_notify_view_altered (DataView* self) +{ #line 93 "/home/jens/Source/shotwell/src/core/DataView.vala" g_return_if_fail (IS_DATA_VIEW (self)); #line 93 "/home/jens/Source/shotwell/src/core/DataView.vala" DATA_VIEW_GET_CLASS (self)->notify_view_altered (self); -#line 493 "DataView.c" +#line 523 "DataView.c" } -static void data_view_real_notify_geometry_altered (DataView* self) { +static void +data_view_real_notify_geometry_altered (DataView* self) +{ gboolean _tmp0_; ViewCollection* vc = NULL; DataCollection* _tmp1_; @@ -505,7 +537,7 @@ static void data_view_real_notify_geometry_altered (DataView* self) { if (!_tmp0_) { #line 113 "/home/jens/Source/shotwell/src/core/DataView.vala" return; -#line 509 "DataView.c" +#line 541 "DataView.c" } #line 115 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp1_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); @@ -515,7 +547,7 @@ static void data_view_real_notify_geometry_altered (DataView* self) { if (_tmp2_ == NULL) { #line 115 "/home/jens/Source/shotwell/src/core/DataView.vala" _data_collection_unref0 (_tmp1_); -#line 519 "DataView.c" +#line 551 "DataView.c" } #line 115 "/home/jens/Source/shotwell/src/core/DataView.vala" vc = _tmp2_; @@ -523,90 +555,107 @@ static void data_view_real_notify_geometry_altered (DataView* self) { _tmp3_ = vc; #line 116 "/home/jens/Source/shotwell/src/core/DataView.vala" if (_tmp3_ != NULL) { -#line 527 "DataView.c" +#line 559 "DataView.c" ViewCollection* _tmp4_; - gboolean _tmp5_; - ViewCollection* _tmp6_; + ViewCollection* _tmp5_; #line 117 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp4_ = vc; #line 117 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp5_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection)); -#line 117 "/home/jens/Source/shotwell/src/core/DataView.vala" - if (!_tmp5_) { + if (!data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection))) { #line 118 "/home/jens/Source/shotwell/src/core/DataView.vala" g_signal_emit (self, data_view_signals[DATA_VIEW_GEOMETRY_ALTERED_SIGNAL], 0); -#line 539 "DataView.c" +#line 568 "DataView.c" } #line 121 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp6_ = vc; + _tmp5_ = vc; #line 121 "/home/jens/Source/shotwell/src/core/DataView.vala" - view_collection_internal_notify_geometry_altered (_tmp6_, self); -#line 545 "DataView.c" + view_collection_internal_notify_geometry_altered (_tmp5_, self); +#line 574 "DataView.c" } else { #line 123 "/home/jens/Source/shotwell/src/core/DataView.vala" g_signal_emit (self, data_view_signals[DATA_VIEW_GEOMETRY_ALTERED_SIGNAL], 0); -#line 549 "DataView.c" +#line 578 "DataView.c" } #line 110 "/home/jens/Source/shotwell/src/core/DataView.vala" _data_collection_unref0 (vc); -#line 553 "DataView.c" +#line 582 "DataView.c" } -void data_view_notify_geometry_altered (DataView* self) { +void +data_view_notify_geometry_altered (DataView* self) +{ #line 110 "/home/jens/Source/shotwell/src/core/DataView.vala" g_return_if_fail (IS_DATA_VIEW (self)); #line 110 "/home/jens/Source/shotwell/src/core/DataView.vala" DATA_VIEW_GET_CLASS (self)->notify_geometry_altered (self); -#line 562 "DataView.c" +#line 593 "DataView.c" } -static void data_view_real_notify_unsubscribed (DataView* self, DataSource* source) { - DataSource* _tmp0_; +static void +data_view_real_notify_unsubscribed (DataView* self, + DataSource* source) +{ #line 128 "/home/jens/Source/shotwell/src/core/DataView.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 129 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp0_ = source; -#line 129 "/home/jens/Source/shotwell/src/core/DataView.vala" - g_signal_emit (self, data_view_signals[DATA_VIEW_UNSUBSCRIBED_SIGNAL], 0, _tmp0_); -#line 574 "DataView.c" + g_signal_emit (self, data_view_signals[DATA_VIEW_UNSUBSCRIBED_SIGNAL], 0, source); +#line 605 "DataView.c" } -void data_view_notify_unsubscribed (DataView* self, DataSource* source) { +void +data_view_notify_unsubscribed (DataView* self, + DataSource* source) +{ #line 128 "/home/jens/Source/shotwell/src/core/DataView.vala" g_return_if_fail (IS_DATA_VIEW (self)); #line 128 "/home/jens/Source/shotwell/src/core/DataView.vala" DATA_VIEW_GET_CLASS (self)->notify_unsubscribed (self, source); -#line 583 "DataView.c" +#line 617 "DataView.c" } -static void data_view_real_state_changed (DataView* self, gboolean selected) { +static void +data_view_real_state_changed (DataView* self, + gboolean selected) +{ } -static void data_view_real_visibility_changed (DataView* self, gboolean visible) { +static void +data_view_real_visibility_changed (DataView* self, + gboolean visible) +{ } -static void data_view_real_view_altered (DataView* self) { +static void +data_view_real_view_altered (DataView* self) +{ } -static void data_view_real_geometry_altered (DataView* self) { +static void +data_view_real_geometry_altered (DataView* self) +{ } -static void data_view_real_unsubscribed (DataView* self, DataSource* source) { +static void +data_view_real_unsubscribed (DataView* self, + DataSource* source) +{ #line 29 "/home/jens/Source/shotwell/src/core/DataView.vala" g_return_if_fail (IS_DATA_SOURCE (source)); -#line 606 "DataView.c" +#line 653 "DataView.c" } -static void data_view_class_init (DataViewClass * klass) { +static void +data_view_class_init (DataViewClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" data_view_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" @@ -643,22 +692,26 @@ static void data_view_class_init (DataViewClass * klass) { data_view_signals[DATA_VIEW_GEOMETRY_ALTERED_SIGNAL] = g_signal_new ("geometry-altered", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, geometry_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" data_view_signals[DATA_VIEW_UNSUBSCRIBED_SIGNAL] = g_signal_new ("unsubscribed", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, unsubscribed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE); -#line 647 "DataView.c" +#line 696 "DataView.c" } -static void data_view_instance_init (DataView * self) { +static void +data_view_instance_init (DataView * self) +{ #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" self->priv = DATA_VIEW_GET_PRIVATE (self); #line 9 "/home/jens/Source/shotwell/src/core/DataView.vala" self->priv->selected = FALSE; #line 10 "/home/jens/Source/shotwell/src/core/DataView.vala" self->priv->visible = TRUE; -#line 658 "DataView.c" +#line 709 "DataView.c" } -static void data_view_finalize (GObject * obj) { +static void +data_view_finalize (GObject * obj) +{ DataView * self; DataSource* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" @@ -671,11 +724,13 @@ static void data_view_finalize (GObject * obj) { _g_object_unref0 (self->priv->source); #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" G_OBJECT_CLASS (data_view_parent_class)->finalize (obj); -#line 675 "DataView.c" +#line 728 "DataView.c" } -GType data_view_get_type (void) { +GType +data_view_get_type (void) +{ static volatile gsize data_view_type_id__volatile = 0; if (g_once_init_enter (&data_view_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DataViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataView), 0, (GInstanceInitFunc) data_view_instance_init, NULL }; diff --git a/src/core/DataViewTypes.c b/src/core/DataViewTypes.c index c1ae9e3..b70a8ff 100644 --- a/src/core/DataViewTypes.c +++ b/src/core/DataViewTypes.c @@ -1,4 +1,4 @@ -/* DataViewTypes.c generated by valac 0.36.6, the Vala compiler +/* DataViewTypes.c generated by valac 0.40.4, the Vala compiler * generated from DataViewTypes.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -75,6 +76,11 @@ typedef struct _DataSourceClass DataSourceClass; typedef struct _ThumbnailView ThumbnailView; typedef struct _ThumbnailViewClass ThumbnailViewClass; typedef struct _ThumbnailViewPrivate ThumbnailViewPrivate; +enum { + THUMBNAIL_VIEW_0_PROPERTY, + THUMBNAIL_VIEW_NUM_PROPERTIES +}; +static GParamSpec* thumbnail_view_properties[THUMBNAIL_VIEW_NUM_PROPERTIES]; #define TYPE_THUMBNAIL_SOURCE (thumbnail_source_get_type ()) #define THUMBNAIL_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_THUMBNAIL_SOURCE, ThumbnailSource)) @@ -87,9 +93,9 @@ typedef struct _ThumbnailSource ThumbnailSource; typedef struct _ThumbnailSourceClass ThumbnailSourceClass; enum { THUMBNAIL_VIEW_THUMBNAIL_ALTERED_SIGNAL, - THUMBNAIL_VIEW_LAST_SIGNAL + THUMBNAIL_VIEW_NUM_SIGNALS }; -static guint thumbnail_view_signals[THUMBNAIL_VIEW_LAST_SIGNAL] = {0}; +static guint thumbnail_view_signals[THUMBNAIL_VIEW_NUM_SIGNALS] = {0}; #define TYPE_PHOTO_VIEW (photo_view_get_type ()) #define PHOTO_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_VIEW, PhotoView)) @@ -101,6 +107,11 @@ static guint thumbnail_view_signals[THUMBNAIL_VIEW_LAST_SIGNAL] = {0}; typedef struct _PhotoView PhotoView; typedef struct _PhotoViewClass PhotoViewClass; typedef struct _PhotoViewPrivate PhotoViewPrivate; +enum { + PHOTO_VIEW_0_PROPERTY, + PHOTO_VIEW_NUM_PROPERTIES +}; +static GParamSpec* photo_view_properties[PHOTO_VIEW_NUM_PROPERTIES]; #define TYPE_MEDIA_SOURCE (media_source_get_type ()) #define MEDIA_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_SOURCE, MediaSource)) @@ -132,6 +143,11 @@ typedef struct _PhotoSourceClass PhotoSourceClass; typedef struct _VideoView VideoView; typedef struct _VideoViewClass VideoViewClass; typedef struct _VideoViewPrivate VideoViewPrivate; +enum { + VIDEO_VIEW_0_PROPERTY, + VIDEO_VIEW_NUM_PROPERTIES +}; +static GParamSpec* video_view_properties[VIDEO_VIEW_NUM_PROPERTIES]; #define TYPE_VIDEO_SOURCE (video_source_get_type ()) #define VIDEO_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIDEO_SOURCE, VideoSource)) @@ -153,6 +169,11 @@ typedef struct _VideoSourceClass VideoSourceClass; typedef struct _EventView EventView; typedef struct _EventViewClass EventViewClass; typedef struct _EventViewPrivate EventViewPrivate; +enum { + EVENT_VIEW_0_PROPERTY, + EVENT_VIEW_NUM_PROPERTIES +}; +static GParamSpec* event_view_properties[EVENT_VIEW_NUM_PROPERTIES]; #define TYPE_EVENT_SOURCE (event_source_get_type ()) #define EVENT_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EVENT_SOURCE, EventSource)) @@ -243,103 +264,118 @@ static gpointer event_view_parent_class = NULL; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_view_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_view_get_type (void) G_GNUC_CONST; -enum { - THUMBNAIL_VIEW_DUMMY_PROPERTY -}; GType thumbnail_source_get_type (void) G_GNUC_CONST; ThumbnailView* thumbnail_view_new (ThumbnailSource* source); -ThumbnailView* thumbnail_view_construct (GType object_type, ThumbnailSource* source); +ThumbnailView* thumbnail_view_construct (GType object_type, + ThumbnailSource* source); DataView* data_view_new (DataSource* source); -DataView* data_view_construct (GType object_type, DataSource* source); +DataView* data_view_construct (GType object_type, + DataSource* source); void thumbnail_view_notify_thumbnail_altered (ThumbnailView* self); static void thumbnail_view_real_notify_thumbnail_altered (ThumbnailView* self); static void thumbnail_view_real_thumbnail_altered (ThumbnailView* self); GType photo_view_get_type (void) G_GNUC_CONST; -enum { - PHOTO_VIEW_DUMMY_PROPERTY -}; GType media_source_get_type (void) G_GNUC_CONST; GType photo_source_get_type (void) G_GNUC_CONST; PhotoView* photo_view_new (PhotoSource* source); -PhotoView* photo_view_construct (GType object_type, PhotoSource* source); +PhotoView* photo_view_construct (GType object_type, + PhotoSource* source); PhotoSource* photo_view_get_photo_source (PhotoView* self); DataSource* data_view_get_source (DataView* self); GType video_view_get_type (void) G_GNUC_CONST; -enum { - VIDEO_VIEW_DUMMY_PROPERTY -}; GType video_source_get_type (void) G_GNUC_CONST; VideoView* video_view_new (VideoSource* source); -VideoView* video_view_construct (GType object_type, VideoSource* source); +VideoView* video_view_construct (GType object_type, + VideoSource* source); VideoSource* video_view_get_video_source (VideoView* self); GType event_view_get_type (void) G_GNUC_CONST; -enum { - EVENT_VIEW_DUMMY_PROPERTY -}; GType event_source_get_type (void) G_GNUC_CONST; EventView* event_view_new (EventSource* source); -EventView* event_view_construct (GType object_type, EventSource* source); +EventView* event_view_construct (GType object_type, + EventSource* source); EventSource* event_view_get_event_source (EventView* self); -ThumbnailView* thumbnail_view_construct (GType object_type, ThumbnailSource* source) { +ThumbnailView* +thumbnail_view_construct (GType object_type, + ThumbnailSource* source) +{ ThumbnailView * self = NULL; - ThumbnailSource* _tmp0_; #line 11 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" g_return_val_if_fail (IS_THUMBNAIL_SOURCE (source), NULL); #line 12 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" - _tmp0_ = source; -#line 12 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" - self = (ThumbnailView*) data_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource)); + self = (ThumbnailView*) data_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #line 11 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return self; -#line 312 "DataViewTypes.c" +#line 338 "DataViewTypes.c" } -ThumbnailView* thumbnail_view_new (ThumbnailSource* source) { +ThumbnailView* +thumbnail_view_new (ThumbnailSource* source) +{ #line 11 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return thumbnail_view_construct (TYPE_THUMBNAIL_VIEW, source); -#line 319 "DataViewTypes.c" +#line 347 "DataViewTypes.c" } -static void thumbnail_view_real_notify_thumbnail_altered (ThumbnailView* self) { +static void +thumbnail_view_real_notify_thumbnail_altered (ThumbnailView* self) +{ #line 17 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" g_signal_emit (self, thumbnail_view_signals[THUMBNAIL_VIEW_THUMBNAIL_ALTERED_SIGNAL], 0); -#line 326 "DataViewTypes.c" +#line 356 "DataViewTypes.c" } -void thumbnail_view_notify_thumbnail_altered (ThumbnailView* self) { +void +thumbnail_view_notify_thumbnail_altered (ThumbnailView* self) +{ #line 15 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" g_return_if_fail (IS_THUMBNAIL_VIEW (self)); #line 15 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" THUMBNAIL_VIEW_GET_CLASS (self)->notify_thumbnail_altered (self); -#line 335 "DataViewTypes.c" +#line 367 "DataViewTypes.c" } -static void thumbnail_view_real_thumbnail_altered (ThumbnailView* self) { +static void +thumbnail_view_real_thumbnail_altered (ThumbnailView* self) +{ } -static void thumbnail_view_class_init (ThumbnailViewClass * klass) { +static void +thumbnail_view_class_init (ThumbnailViewClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" thumbnail_view_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" @@ -348,15 +384,19 @@ static void thumbnail_view_class_init (ThumbnailViewClass * klass) { ((ThumbnailViewClass *) klass)->thumbnail_altered = thumbnail_view_real_thumbnail_altered; #line 7 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" thumbnail_view_signals[THUMBNAIL_VIEW_THUMBNAIL_ALTERED_SIGNAL] = g_signal_new ("thumbnail-altered", TYPE_THUMBNAIL_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ThumbnailViewClass, thumbnail_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 352 "DataViewTypes.c" +#line 388 "DataViewTypes.c" } -static void thumbnail_view_instance_init (ThumbnailView * self) { +static void +thumbnail_view_instance_init (ThumbnailView * self) +{ } -GType thumbnail_view_get_type (void) { +GType +thumbnail_view_get_type (void) +{ static volatile gsize thumbnail_view_type_id__volatile = 0; if (g_once_init_enter (&thumbnail_view_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ThumbnailViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) thumbnail_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ThumbnailView), 0, (GInstanceInitFunc) thumbnail_view_instance_init, NULL }; @@ -368,29 +408,33 @@ GType thumbnail_view_get_type (void) { } -PhotoView* photo_view_construct (GType object_type, PhotoSource* source) { +PhotoView* +photo_view_construct (GType object_type, + PhotoSource* source) +{ PhotoView * self = NULL; - PhotoSource* _tmp0_; #line 22 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" g_return_val_if_fail (IS_PHOTO_SOURCE (source), NULL); #line 23 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" - _tmp0_ = source; -#line 23 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" - self = (PhotoView*) thumbnail_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); + self = (PhotoView*) thumbnail_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 22 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return self; -#line 383 "DataViewTypes.c" +#line 423 "DataViewTypes.c" } -PhotoView* photo_view_new (PhotoSource* source) { +PhotoView* +photo_view_new (PhotoSource* source) +{ #line 22 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return photo_view_construct (TYPE_PHOTO_VIEW, source); -#line 390 "DataViewTypes.c" +#line 432 "DataViewTypes.c" } -PhotoSource* photo_view_get_photo_source (PhotoView* self) { +PhotoSource* +photo_view_get_photo_source (PhotoView* self) +{ PhotoSource* result = NULL; DataSource* _tmp0_; #line 26 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" @@ -401,22 +445,28 @@ PhotoSource* photo_view_get_photo_source (PhotoView* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_SOURCE, PhotoSource); #line 27 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return result; -#line 405 "DataViewTypes.c" +#line 449 "DataViewTypes.c" } -static void photo_view_class_init (PhotoViewClass * klass) { +static void +photo_view_class_init (PhotoViewClass * klass) +{ #line 21 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" photo_view_parent_class = g_type_class_peek_parent (klass); -#line 412 "DataViewTypes.c" +#line 458 "DataViewTypes.c" } -static void photo_view_instance_init (PhotoView * self) { +static void +photo_view_instance_init (PhotoView * self) +{ } -GType photo_view_get_type (void) { +GType +photo_view_get_type (void) +{ static volatile gsize photo_view_type_id__volatile = 0; if (g_once_init_enter (&photo_view_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoView), 0, (GInstanceInitFunc) photo_view_instance_init, NULL }; @@ -428,29 +478,33 @@ GType photo_view_get_type (void) { } -VideoView* video_view_construct (GType object_type, VideoSource* source) { +VideoView* +video_view_construct (GType object_type, + VideoSource* source) +{ VideoView * self = NULL; - VideoSource* _tmp0_; #line 32 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" g_return_val_if_fail (IS_VIDEO_SOURCE (source), NULL); #line 33 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" - _tmp0_ = source; -#line 33 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" - self = (VideoView*) thumbnail_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); + self = (VideoView*) thumbnail_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 32 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return self; -#line 443 "DataViewTypes.c" +#line 493 "DataViewTypes.c" } -VideoView* video_view_new (VideoSource* source) { +VideoView* +video_view_new (VideoSource* source) +{ #line 32 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return video_view_construct (TYPE_VIDEO_VIEW, source); -#line 450 "DataViewTypes.c" +#line 502 "DataViewTypes.c" } -VideoSource* video_view_get_video_source (VideoView* self) { +VideoSource* +video_view_get_video_source (VideoView* self) +{ VideoSource* result = NULL; DataSource* _tmp0_; #line 36 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" @@ -461,22 +515,28 @@ VideoSource* video_view_get_video_source (VideoView* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO_SOURCE, VideoSource); #line 37 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return result; -#line 465 "DataViewTypes.c" +#line 519 "DataViewTypes.c" } -static void video_view_class_init (VideoViewClass * klass) { +static void +video_view_class_init (VideoViewClass * klass) +{ #line 31 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" video_view_parent_class = g_type_class_peek_parent (klass); -#line 472 "DataViewTypes.c" +#line 528 "DataViewTypes.c" } -static void video_view_instance_init (VideoView * self) { +static void +video_view_instance_init (VideoView * self) +{ } -GType video_view_get_type (void) { +GType +video_view_get_type (void) +{ static volatile gsize video_view_type_id__volatile = 0; if (g_once_init_enter (&video_view_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (VideoViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) video_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (VideoView), 0, (GInstanceInitFunc) video_view_instance_init, NULL }; @@ -488,29 +548,33 @@ GType video_view_get_type (void) { } -EventView* event_view_construct (GType object_type, EventSource* source) { +EventView* +event_view_construct (GType object_type, + EventSource* source) +{ EventView * self = NULL; - EventSource* _tmp0_; #line 42 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" g_return_val_if_fail (IS_EVENT_SOURCE (source), NULL); #line 43 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" - _tmp0_ = source; -#line 43 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" - self = (EventView*) thumbnail_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); + self = (EventView*) thumbnail_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 42 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return self; -#line 503 "DataViewTypes.c" +#line 563 "DataViewTypes.c" } -EventView* event_view_new (EventSource* source) { +EventView* +event_view_new (EventSource* source) +{ #line 42 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return event_view_construct (TYPE_EVENT_VIEW, source); -#line 510 "DataViewTypes.c" +#line 572 "DataViewTypes.c" } -EventSource* event_view_get_event_source (EventView* self) { +EventSource* +event_view_get_event_source (EventView* self) +{ EventSource* result = NULL; DataSource* _tmp0_; #line 46 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" @@ -521,22 +585,28 @@ EventSource* event_view_get_event_source (EventView* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_SOURCE, EventSource); #line 47 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return result; -#line 525 "DataViewTypes.c" +#line 589 "DataViewTypes.c" } -static void event_view_class_init (EventViewClass * klass) { +static void +event_view_class_init (EventViewClass * klass) +{ #line 41 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" event_view_parent_class = g_type_class_peek_parent (klass); -#line 532 "DataViewTypes.c" +#line 598 "DataViewTypes.c" } -static void event_view_instance_init (EventView * self) { +static void +event_view_instance_init (EventView * self) +{ } -GType event_view_get_type (void) { +GType +event_view_get_type (void) +{ static volatile gsize event_view_type_id__volatile = 0; if (g_once_init_enter (&event_view_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventView), 0, (GInstanceInitFunc) event_view_instance_init, NULL }; diff --git a/src/core/DatabaseSourceCollection.c b/src/core/DatabaseSourceCollection.c index 192d771..b61808a 100644 --- a/src/core/DatabaseSourceCollection.c +++ b/src/core/DatabaseSourceCollection.c @@ -1,4 +1,4 @@ -/* DatabaseSourceCollection.c generated by valac 0.36.6, the Vala compiler +/* DatabaseSourceCollection.c generated by valac 0.40.4, the Vala compiler * generated from DatabaseSourceCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -257,86 +258,145 @@ GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType marker_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; #define DATABASE_SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollectionPrivate)) -enum { - DATABASE_SOURCE_COLLECTION_DUMMY_PROPERTY -}; guint int64_hash (gint64* n); -static guint _int64_hash_gee_hash_data_func (gconstpointer v, gpointer self); -gboolean int64_equal (gint64* a, gint64* b); -static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); +static guint _int64_hash_gee_hash_data_func (gconstpointer v, + gpointer self); +gboolean int64_equal (gint64* a, + gint64* b); +static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); static gint64* _int64_dup (gint64* self); -DatabaseSourceCollection* database_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target); -SourceCollection* source_collection_construct (GType object_type, const gchar* name); -static void database_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added); -void data_collection_notify_items_added (DataCollection* self, GeeIterable* added); -static void database_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed); -void data_collection_notify_items_removed (DataCollection* self, GeeIterable* removed); -DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, gint64 key); +DatabaseSourceCollection* database_source_collection_construct (GType object_type, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target); +SourceCollection* source_collection_construct (GType object_type, + const gchar* name); +static void database_source_collection_real_notify_items_added (DataCollection* base, + GeeIterable* added); +void data_collection_notify_items_added (DataCollection* self, + GeeIterable* added); +static void database_source_collection_real_notify_items_removed (DataCollection* base, + GeeIterable* removed); +void data_collection_notify_items_removed (DataCollection* self, + GeeIterable* removed); +DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, + gint64 key); static void database_source_collection_finalize (DataCollection * obj); gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; GType database_source_holding_tank_get_type (void) G_GNUC_CONST; #define DATABASE_SOURCE_HOLDING_TANK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DATABASE_SOURCE_HOLDING_TANK, DatabaseSourceHoldingTankPrivate)) -enum { - DATABASE_SOURCE_HOLDING_TANK_DUMMY_PROPERTY -}; -DatabaseSourceHoldingTank* database_source_holding_tank_new (SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target); -DatabaseSourceHoldingTank* database_source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target); -SourceHoldingTank* source_holding_tank_new (SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target); -SourceHoldingTank* source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target); -DataSource* database_source_holding_tank_get_by_id (DatabaseSourceHoldingTank* self, gint64 id); -static void database_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed); -void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed); +DatabaseSourceHoldingTank* database_source_holding_tank_new (SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target); +DatabaseSourceHoldingTank* database_source_holding_tank_construct (GType object_type, + SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target); +SourceHoldingTank* source_holding_tank_new (SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target); +SourceHoldingTank* source_holding_tank_construct (GType object_type, + SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target); +DataSource* database_source_holding_tank_get_by_id (DatabaseSourceHoldingTank* self, + gint64 id); +static void database_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, + GeeCollection* added, + GeeCollection* removed); +void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, + GeeCollection* added, + GeeCollection* removed); static void database_source_holding_tank_finalize (SourceHoldingTank * obj); -static guint _int64_hash_gee_hash_data_func (gconstpointer v, gpointer self) { +static guint +_int64_hash_gee_hash_data_func (gconstpointer v, + gpointer self) +{ guint result; result = int64_hash ((gint64*) v); #line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" return result; -#line 327 "DatabaseSourceCollection.c" +#line 381 "DatabaseSourceCollection.c" } -static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_int64_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = int64_equal ((gint64*) a, (gint64*) b); #line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" return result; -#line 336 "DatabaseSourceCollection.c" +#line 394 "DatabaseSourceCollection.c" } -static gint64* _int64_dup (gint64* self) { +static gint64* +_int64_dup (gint64* self) +{ gint64* dup; #line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" dup = g_new0 (gint64, 1); @@ -344,260 +404,239 @@ static gint64* _int64_dup (gint64* self) { memcpy (dup, self, sizeof (gint64)); #line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" return dup; -#line 348 "DatabaseSourceCollection.c" +#line 408 "DatabaseSourceCollection.c" } -DatabaseSourceCollection* database_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target) { +DatabaseSourceCollection* +database_source_collection_construct (GType object_type, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target) +{ DatabaseSourceCollection* self = NULL; - const gchar* _tmp0_; - GetSourceDatabaseKey _tmp1_; - void* _tmp1__target; #line 20 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" g_return_val_if_fail (name != NULL, NULL); #line 21 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp0_ = name; -#line 21 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - self = (DatabaseSourceCollection*) source_collection_construct (object_type, _tmp0_); + self = (DatabaseSourceCollection*) source_collection_construct (object_type, name); #line 23 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp1_ = source_key_func; + self->priv->source_key_func = source_key_func; #line 23 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp1__target = source_key_func_target; -#line 23 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - self->priv->source_key_func = _tmp1_; -#line 23 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - self->priv->source_key_func_target = _tmp1__target; + self->priv->source_key_func_target = source_key_func_target; #line 20 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" return self; -#line 373 "DatabaseSourceCollection.c" +#line 429 "DatabaseSourceCollection.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 28 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" return self ? g_object_ref (self) : NULL; -#line 380 "DatabaseSourceCollection.c" +#line 438 "DatabaseSourceCollection.c" } -static void database_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added) { +static void +database_source_collection_real_notify_items_added (DataCollection* base, + GeeIterable* added) +{ DatabaseSourceCollection * self; - GeeIterable* _tmp17_; #line 26 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection); #line 26 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (added)); -#line 391 "DatabaseSourceCollection.c" +#line 451 "DatabaseSourceCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; -#line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp0_ = added; + GeeIterator* _tmp0_; #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); + _tmp0_ = gee_iterable_iterator (added); #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" while (TRUE) { -#line 404 "DatabaseSourceCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 461 "DatabaseSourceCollection.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; DataSource* source = NULL; - DataObject* _tmp6_; - DataSource* _tmp7_; + DataObject* _tmp4_; + DataSource* _tmp5_; gint64 key = 0LL; - GetSourceDatabaseKey _tmp8_; - void* _tmp8__target; - DataSource* _tmp9_; - gint64 _tmp10_; - GeeHashMap* _tmp11_; - gint64 _tmp12_; - gboolean _tmp13_; - GeeHashMap* _tmp14_; - gint64 _tmp15_; - DataSource* _tmp16_; -#line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp2_ = _object_it; + GetSourceDatabaseKey _tmp6_; + void* _tmp6__target; + DataSource* _tmp7_; + GeeHashMap* _tmp8_; + gint64 _tmp9_; + GeeHashMap* _tmp10_; + gint64 _tmp11_; + DataSource* _tmp12_; #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" break; -#line 432 "DatabaseSourceCollection.c" +#line 484 "DatabaseSourceCollection.c" } #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 28 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp6_ = object; + _tmp4_ = object; #line 28 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_SOURCE, DataSource)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource)); #line 28 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - source = _tmp7_; + source = _tmp5_; #line 29 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp8_ = self->priv->source_key_func; -#line 29 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp8__target = self->priv->source_key_func_target; + _tmp6_ = self->priv->source_key_func; #line 29 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp9_ = source; + _tmp6__target = self->priv->source_key_func_target; #line 29 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp10_ = _tmp8_ (_tmp9_, _tmp8__target); + _tmp7_ = source; #line 29 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - key = _tmp10_; -#line 31 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp11_ = self->priv->map; + key = _tmp6_ (_tmp7_, _tmp6__target); #line 31 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp12_ = key; + _tmp8_ = self->priv->map; #line 31 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp13_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp12_); + _tmp9_ = key; #line 31 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _vala_assert (!_tmp13_, "!map.has_key(key)"); + _vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp9_), "!map.has_key(key)"); #line 33 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp14_ = self->priv->map; + _tmp10_ = self->priv->map; #line 33 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp15_ = key; + _tmp11_ = key; #line 33 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp16_ = source; + _tmp12_ = source; #line 33 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp15_, _tmp16_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp11_, _tmp12_); #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _g_object_unref0 (source); #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _g_object_unref0 (object); -#line 476 "DatabaseSourceCollection.c" +#line 524 "DatabaseSourceCollection.c" } #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _g_object_unref0 (_object_it); -#line 480 "DatabaseSourceCollection.c" +#line 528 "DatabaseSourceCollection.c" } #line 36 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp17_ = added; -#line 36 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - DATA_COLLECTION_CLASS (database_source_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp17_); -#line 486 "DatabaseSourceCollection.c" + DATA_COLLECTION_CLASS (database_source_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), TYPE_DATA_COLLECTION, DataCollection), added); +#line 532 "DatabaseSourceCollection.c" } -static void database_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed) { +static void +database_source_collection_real_notify_items_removed (DataCollection* base, + GeeIterable* removed) +{ DatabaseSourceCollection * self; - GeeIterable* _tmp13_; #line 39 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection); #line 39 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); -#line 497 "DatabaseSourceCollection.c" +#line 545 "DatabaseSourceCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp0_ = removed; + _tmp0_ = gee_iterable_iterator (removed); #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); -#line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" while (TRUE) { -#line 510 "DatabaseSourceCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 555 "DatabaseSourceCollection.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; gint64 key = 0LL; - GetSourceDatabaseKey _tmp6_; - void* _tmp6__target; - DataObject* _tmp7_; - gint64 _tmp8_; + GetSourceDatabaseKey _tmp4_; + void* _tmp4__target; + DataObject* _tmp5_; gboolean is_removed = FALSE; - GeeHashMap* _tmp9_; - gint64 _tmp10_; - gboolean _tmp11_; - gboolean _tmp12_; + GeeHashMap* _tmp6_; + gint64 _tmp7_; + gboolean _tmp8_; + gboolean _tmp9_; #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp2_ = _object_it; + _tmp1_ = _object_it; #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" break; -#line 534 "DatabaseSourceCollection.c" +#line 575 "DatabaseSourceCollection.c" } #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 41 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp6_ = self->priv->source_key_func; + _tmp4_ = self->priv->source_key_func; #line 41 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp6__target = self->priv->source_key_func_target; + _tmp4__target = self->priv->source_key_func_target; #line 41 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp7_ = object; + _tmp5_ = object; #line 41 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp8_ = _tmp6_ (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource), _tmp6__target); -#line 41 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - key = _tmp8_; + key = _tmp4_ (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_SOURCE, DataSource), _tmp4__target); #line 43 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp9_ = self->priv->map; + _tmp6_ = self->priv->map; #line 43 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp10_ = key; + _tmp7_ = key; #line 43 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp11_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp10_, NULL); + _tmp8_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp7_, NULL); #line 43 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - is_removed = _tmp11_; + is_removed = _tmp8_; #line 44 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp12_ = is_removed; + _tmp9_ = is_removed; #line 44 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _vala_assert (_tmp12_, "is_removed"); + _vala_assert (_tmp9_, "is_removed"); #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _g_object_unref0 (object); -#line 566 "DatabaseSourceCollection.c" +#line 605 "DatabaseSourceCollection.c" } #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _g_object_unref0 (_object_it); -#line 570 "DatabaseSourceCollection.c" +#line 609 "DatabaseSourceCollection.c" } #line 47 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp13_ = removed; -#line 47 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - DATA_COLLECTION_CLASS (database_source_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp13_); -#line 576 "DatabaseSourceCollection.c" + DATA_COLLECTION_CLASS (database_source_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), TYPE_DATA_COLLECTION, DataCollection), removed); +#line 613 "DatabaseSourceCollection.c" } -DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, gint64 key) { +DataSource* +database_source_collection_fetch_by_key (DatabaseSourceCollection* self, + gint64 key) +{ DataSource* result = NULL; GeeHashMap* _tmp0_; - gint64 _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 50 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" g_return_val_if_fail (IS_DATABASE_SOURCE_COLLECTION (self), NULL); #line 51 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _tmp0_ = self->priv->map; #line 51 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp1_ = key; -#line 51 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &key); #line 51 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - result = (DataSource*) _tmp2_; + result = (DataSource*) _tmp1_; #line 51 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" return result; -#line 597 "DatabaseSourceCollection.c" +#line 634 "DatabaseSourceCollection.c" } -static void database_source_collection_class_init (DatabaseSourceCollectionClass * klass) { +static void +database_source_collection_class_init (DatabaseSourceCollectionClass * klass) +{ #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" database_source_collection_parent_class = g_type_class_peek_parent (klass); #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" @@ -608,11 +647,13 @@ static void database_source_collection_class_init (DatabaseSourceCollectionClass ((DataCollectionClass *) klass)->notify_items_added = (void (*) (DataCollection *, GeeIterable*)) database_source_collection_real_notify_items_added; #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" ((DataCollectionClass *) klass)->notify_items_removed = (void (*) (DataCollection *, GeeIterable*)) database_source_collection_real_notify_items_removed; -#line 612 "DatabaseSourceCollection.c" +#line 651 "DatabaseSourceCollection.c" } -static void database_source_collection_instance_init (DatabaseSourceCollection * self) { +static void +database_source_collection_instance_init (DatabaseSourceCollection * self) +{ GeeHashMap* _tmp0_; #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" self->priv = DATABASE_SOURCE_COLLECTION_GET_PRIVATE (self); @@ -620,11 +661,13 @@ static void database_source_collection_instance_init (DatabaseSourceCollection * _tmp0_ = gee_hash_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _int64_hash_gee_hash_data_func, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" self->priv->map = _tmp0_; -#line 624 "DatabaseSourceCollection.c" +#line 665 "DatabaseSourceCollection.c" } -static void database_source_collection_finalize (DataCollection * obj) { +static void +database_source_collection_finalize (DataCollection * obj) +{ DatabaseSourceCollection * self; #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection); @@ -632,11 +675,13 @@ static void database_source_collection_finalize (DataCollection * obj) { _g_object_unref0 (self->priv->map); #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" DATA_COLLECTION_CLASS (database_source_collection_parent_class)->finalize (obj); -#line 636 "DatabaseSourceCollection.c" +#line 679 "DatabaseSourceCollection.c" } -GType database_source_collection_get_type (void) { +GType +database_source_collection_get_type (void) +{ static volatile gsize database_source_collection_type_id__volatile = 0; if (g_once_init_enter (&database_source_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DatabaseSourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) database_source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DatabaseSourceCollection), 0, (GInstanceInitFunc) database_source_collection_instance_init, NULL }; @@ -648,71 +693,69 @@ GType database_source_collection_get_type (void) { } -DatabaseSourceHoldingTank* database_source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) { +DatabaseSourceHoldingTank* +database_source_holding_tank_construct (GType object_type, + SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target) +{ DatabaseSourceHoldingTank* self = NULL; - SourceCollection* _tmp0_; - SourceHoldingTankCheckToKeep _tmp1_; - void* _tmp1__target; - GetSourceDatabaseKey _tmp2_; - void* _tmp2__target; #line 60 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL); #line 62 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp0_ = sources; -#line 62 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp1_ = check_to_keep; -#line 62 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp1__target = check_to_keep_target; -#line 62 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - self = (DatabaseSourceHoldingTank*) source_holding_tank_construct (object_type, _tmp0_, _tmp1_, _tmp1__target); -#line 64 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp2_ = get_key; -#line 64 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp2__target = get_key_target; + self = (DatabaseSourceHoldingTank*) source_holding_tank_construct (object_type, sources, check_to_keep, check_to_keep_target); #line 64 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - self->priv->get_key = _tmp2_; + self->priv->get_key = get_key; #line 64 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - self->priv->get_key_target = _tmp2__target; + self->priv->get_key_target = get_key_target; #line 60 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" return self; -#line 679 "DatabaseSourceCollection.c" +#line 716 "DatabaseSourceCollection.c" } -DatabaseSourceHoldingTank* database_source_holding_tank_new (SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) { +DatabaseSourceHoldingTank* +database_source_holding_tank_new (SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target) +{ #line 60 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" return database_source_holding_tank_construct (TYPE_DATABASE_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target, get_key, get_key_target); -#line 686 "DatabaseSourceCollection.c" +#line 729 "DatabaseSourceCollection.c" } -DataSource* database_source_holding_tank_get_by_id (DatabaseSourceHoldingTank* self, gint64 id) { +DataSource* +database_source_holding_tank_get_by_id (DatabaseSourceHoldingTank* self, + gint64 id) +{ DataSource* result = NULL; GeeHashMap* _tmp0_; - gint64 _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 67 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" g_return_val_if_fail (IS_DATABASE_SOURCE_HOLDING_TANK (self), NULL); #line 68 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _tmp0_ = self->priv->map; #line 68 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp1_ = id; -#line 68 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &id); #line 68 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - result = (DataSource*) _tmp2_; + result = (DataSource*) _tmp1_; #line 68 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" return result; -#line 707 "DatabaseSourceCollection.c" +#line 750 "DatabaseSourceCollection.c" } -static void database_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed) { +static void +database_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, + GeeCollection* added, + GeeCollection* removed) +{ DatabaseSourceHoldingTank * self; - GeeCollection* _tmp0_; - GeeCollection* _tmp12_; - GeeCollection* _tmp23_; - GeeCollection* _tmp24_; #line 71 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATABASE_SOURCE_HOLDING_TANK, DatabaseSourceHoldingTank); #line 71 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" @@ -720,149 +763,131 @@ static void database_source_holding_tank_real_notify_contents_altered (SourceHol #line 71 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 73 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp0_ = added; -#line 73 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - if (_tmp0_ != NULL) { -#line 727 "DatabaseSourceCollection.c" + if (added != NULL) { +#line 768 "DatabaseSourceCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp0_; #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp1_ = added; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_ITERABLE, GeeIterable)); #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _source_it = _tmp2_; + _source_it = _tmp0_; #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" while (TRUE) { -#line 740 "DatabaseSourceCollection.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 778 "DatabaseSourceCollection.c" + GeeIterator* _tmp1_; DataSource* source = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - GeeHashMap* _tmp7_; - GetSourceDatabaseKey _tmp8_; - void* _tmp8__target; - DataSource* _tmp9_; - gint64 _tmp10_; - DataSource* _tmp11_; -#line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp3_ = _source_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + GeeHashMap* _tmp4_; + GetSourceDatabaseKey _tmp5_; + void* _tmp5__target; + DataSource* _tmp6_; + gint64 _tmp7_; + DataSource* _tmp8_; #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp1_ = _source_it; #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" break; -#line 760 "DatabaseSourceCollection.c" +#line 795 "DatabaseSourceCollection.c" } #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp5_ = _source_it; + _tmp2_ = _source_it; #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - source = (DataSource*) _tmp6_; + source = (DataSource*) _tmp3_; #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp7_ = self->priv->map; + _tmp4_ = self->priv->map; #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp8_ = self->priv->get_key; + _tmp5_ = self->priv->get_key; #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp8__target = self->priv->get_key_target; + _tmp5__target = self->priv->get_key_target; #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp9_ = source; + _tmp6_ = source; #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp10_ = _tmp8_ (_tmp9_, _tmp8__target); + _tmp7_ = _tmp5_ (_tmp6_, _tmp5__target); #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp11_ = source; + _tmp8_ = source; #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp10_, _tmp11_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp7_, _tmp8_); #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _g_object_unref0 (source); -#line 784 "DatabaseSourceCollection.c" +#line 819 "DatabaseSourceCollection.c" } #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _g_object_unref0 (_source_it); -#line 788 "DatabaseSourceCollection.c" +#line 823 "DatabaseSourceCollection.c" } } #line 78 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp12_ = removed; -#line 78 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - if (_tmp12_ != NULL) { -#line 795 "DatabaseSourceCollection.c" + if (removed != NULL) { +#line 828 "DatabaseSourceCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp13_; - GeeIterator* _tmp14_; -#line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp13_ = removed; + GeeIterator* _tmp9_; #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_ITERABLE, GeeIterable)); #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _source_it = _tmp14_; + _source_it = _tmp9_; #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" while (TRUE) { -#line 808 "DatabaseSourceCollection.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 838 "DatabaseSourceCollection.c" + GeeIterator* _tmp10_; DataSource* source = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; - GeeHashMap* _tmp19_; - GetSourceDatabaseKey _tmp20_; - void* _tmp20__target; - DataSource* _tmp21_; - gint64 _tmp22_; + GeeIterator* _tmp11_; + gpointer _tmp12_; + GeeHashMap* _tmp13_; + GetSourceDatabaseKey _tmp14_; + void* _tmp14__target; + DataSource* _tmp15_; + gint64 _tmp16_; #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp15_ = _source_it; + _tmp10_ = _source_it; #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp16_ = gee_iterator_next (_tmp15_); -#line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp10_)) { #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" break; -#line 827 "DatabaseSourceCollection.c" +#line 854 "DatabaseSourceCollection.c" } #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp17_ = _source_it; + _tmp11_ = _source_it; #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - source = (DataSource*) _tmp18_; + source = (DataSource*) _tmp12_; #line 80 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp19_ = self->priv->map; + _tmp13_ = self->priv->map; #line 80 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp20_ = self->priv->get_key; + _tmp14_ = self->priv->get_key; #line 80 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp20__target = self->priv->get_key_target; + _tmp14__target = self->priv->get_key_target; #line 80 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp21_ = source; + _tmp15_ = source; #line 80 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp22_ = _tmp20_ (_tmp21_, _tmp20__target); + _tmp16_ = _tmp14_ (_tmp15_, _tmp14__target); #line 80 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp22_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp16_, NULL); #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _g_object_unref0 (source); -#line 849 "DatabaseSourceCollection.c" +#line 876 "DatabaseSourceCollection.c" } #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _g_object_unref0 (_source_it); -#line 853 "DatabaseSourceCollection.c" +#line 880 "DatabaseSourceCollection.c" } } #line 83 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp23_ = added; -#line 83 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp24_ = removed; -#line 83 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - SOURCE_HOLDING_TANK_CLASS (database_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp23_, _tmp24_); -#line 862 "DatabaseSourceCollection.c" + SOURCE_HOLDING_TANK_CLASS (database_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), added, removed); +#line 885 "DatabaseSourceCollection.c" } -static void database_source_holding_tank_class_init (DatabaseSourceHoldingTankClass * klass) { +static void +database_source_holding_tank_class_init (DatabaseSourceHoldingTankClass * klass) +{ #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" database_source_holding_tank_parent_class = g_type_class_peek_parent (klass); #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" @@ -871,11 +896,13 @@ static void database_source_holding_tank_class_init (DatabaseSourceHoldingTankCl g_type_class_add_private (klass, sizeof (DatabaseSourceHoldingTankPrivate)); #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" ((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*) (SourceHoldingTank *, GeeCollection*, GeeCollection*)) database_source_holding_tank_real_notify_contents_altered; -#line 875 "DatabaseSourceCollection.c" +#line 900 "DatabaseSourceCollection.c" } -static void database_source_holding_tank_instance_init (DatabaseSourceHoldingTank * self) { +static void +database_source_holding_tank_instance_init (DatabaseSourceHoldingTank * self) +{ GeeHashMap* _tmp0_; #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" self->priv = DATABASE_SOURCE_HOLDING_TANK_GET_PRIVATE (self); @@ -883,11 +910,13 @@ static void database_source_holding_tank_instance_init (DatabaseSourceHoldingTan _tmp0_ = gee_hash_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _int64_hash_gee_hash_data_func, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 57 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" self->priv->map = _tmp0_; -#line 887 "DatabaseSourceCollection.c" +#line 914 "DatabaseSourceCollection.c" } -static void database_source_holding_tank_finalize (SourceHoldingTank * obj) { +static void +database_source_holding_tank_finalize (SourceHoldingTank * obj) +{ DatabaseSourceHoldingTank * self; #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATABASE_SOURCE_HOLDING_TANK, DatabaseSourceHoldingTank); @@ -895,11 +924,13 @@ static void database_source_holding_tank_finalize (SourceHoldingTank * obj) { _g_object_unref0 (self->priv->map); #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" SOURCE_HOLDING_TANK_CLASS (database_source_holding_tank_parent_class)->finalize (obj); -#line 899 "DatabaseSourceCollection.c" +#line 928 "DatabaseSourceCollection.c" } -GType database_source_holding_tank_get_type (void) { +GType +database_source_holding_tank_get_type (void) +{ static volatile gsize database_source_holding_tank_type_id__volatile = 0; if (g_once_init_enter (&database_source_holding_tank_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DatabaseSourceHoldingTankClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) database_source_holding_tank_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DatabaseSourceHoldingTank), 0, (GInstanceInitFunc) database_source_holding_tank_instance_init, NULL }; diff --git a/src/core/SourceCollection.c b/src/core/SourceCollection.c index 6742476..9de9400 100644 --- a/src/core/SourceCollection.c +++ b/src/core/SourceCollection.c @@ -1,4 +1,4 @@ -/* SourceCollection.c generated by valac 0.36.6, the Vala compiler +/* SourceCollection.c generated by valac 0.40.4, the Vala compiler * generated from SourceCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -116,6 +117,11 @@ typedef struct _SourceCollectionDestroyCounter SourceCollectionDestroyCounter; typedef struct _SourceCollectionDestroyCounterClass SourceCollectionDestroyCounterClass; typedef struct _SourceCollectionDestroyCounterPrivate SourceCollectionDestroyCounterPrivate; #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) +enum { + SOURCE_COLLECTION_DESTROY_COUNTER_0_PROPERTY, + SOURCE_COLLECTION_DESTROY_COUNTER_NUM_PROPERTIES +}; +static GParamSpec* source_collection_destroy_counter_properties[SOURCE_COLLECTION_DESTROY_COUNTER_NUM_PROPERTIES]; enum { SOURCE_COLLECTION_ITEMS_UNLINKING_SIGNAL, SOURCE_COLLECTION_ITEMS_RELINKED_SIGNAL, @@ -123,9 +129,9 @@ enum { SOURCE_COLLECTION_ITEMS_DESTROYED_SIGNAL, SOURCE_COLLECTION_UNLINKED_DESTROYED_SIGNAL, SOURCE_COLLECTION_BACKLINK_REMOVED_SIGNAL, - SOURCE_COLLECTION_LAST_SIGNAL + SOURCE_COLLECTION_NUM_SIGNALS }; -static guint source_collection_signals[SOURCE_COLLECTION_LAST_SIGNAL] = {0}; +static guint source_collection_signals[SOURCE_COLLECTION_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -236,17 +242,29 @@ static gpointer source_collection_destroy_counter_parent_class = NULL; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType marker_get_type (void) G_GNUC_CONST; @@ -254,312 +272,433 @@ GType source_collection_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; #define SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SOURCE_COLLECTION, SourceCollectionPrivate)) -enum { - SOURCE_COLLECTION_DUMMY_PROPERTY -}; -SourceCollection* source_collection_construct (GType object_type, const gchar* name); +SourceCollection* source_collection_construct (GType object_type, + const gchar* name); DataCollection* data_collection_new (const gchar* name); -DataCollection* data_collection_construct (GType object_type, const gchar* name); -gboolean source_collection_holds_type_of_source (SourceCollection* self, DataSource* source); -static gboolean source_collection_real_holds_type_of_source (SourceCollection* self, DataSource* source); -void source_collection_notify_items_unlinking (SourceCollection* self, GeeCollection* unlinking); -static void source_collection_real_notify_items_unlinking (SourceCollection* self, GeeCollection* unlinking); -void source_collection_notify_items_relinked (SourceCollection* self, GeeCollection* relinked); -static void source_collection_real_notify_items_relinked (SourceCollection* self, GeeCollection* relinked); -void source_collection_notify_item_destroyed (SourceCollection* self, DataSource* source); -static void source_collection_real_notify_item_destroyed (SourceCollection* self, DataSource* source); -void source_collection_notify_items_destroyed (SourceCollection* self, GeeCollection* destroyed); -static void source_collection_real_notify_items_destroyed (SourceCollection* self, GeeCollection* destroyed); -void source_collection_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked); -static void source_collection_real_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked); -void source_collection_notify_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources); -static void source_collection_real_notify_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources); -static gboolean source_collection_real_valid_type (DataCollection* base, DataObject* object); +DataCollection* data_collection_construct (GType object_type, + const gchar* name); +gboolean source_collection_holds_type_of_source (SourceCollection* self, + DataSource* source); +static gboolean source_collection_real_holds_type_of_source (SourceCollection* self, + DataSource* source); +void source_collection_notify_items_unlinking (SourceCollection* self, + GeeCollection* unlinking); +static void source_collection_real_notify_items_unlinking (SourceCollection* self, + GeeCollection* unlinking); +void source_collection_notify_items_relinked (SourceCollection* self, + GeeCollection* relinked); +static void source_collection_real_notify_items_relinked (SourceCollection* self, + GeeCollection* relinked); +void source_collection_notify_item_destroyed (SourceCollection* self, + DataSource* source); +static void source_collection_real_notify_item_destroyed (SourceCollection* self, + DataSource* source); +void source_collection_notify_items_destroyed (SourceCollection* self, + GeeCollection* destroyed); +static void source_collection_real_notify_items_destroyed (SourceCollection* self, + GeeCollection* destroyed); +void source_collection_notify_unlinked_destroyed (SourceCollection* self, + DataSource* unlinked); +static void source_collection_real_notify_unlinked_destroyed (SourceCollection* self, + DataSource* unlinked); +void source_collection_notify_backlink_removed (SourceCollection* self, + SourceBacklink* backlink, + GeeCollection* sources); +static void source_collection_real_notify_backlink_removed (SourceCollection* self, + SourceBacklink* backlink, + GeeCollection* sources); +static gboolean source_collection_real_valid_type (DataCollection* base, + DataObject* object); GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; -gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed); +gint source_collection_destroy_marked (SourceCollection* self, + Marker* marker, + gboolean delete_backing, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_removed); static GType source_collection_destroy_counter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; Marker* data_collection_start_marking (DataCollection* self); static SourceCollectionDestroyCounter* source_collection_destroy_counter_new (Marker* remove_marker); -static SourceCollectionDestroyCounter* source_collection_destroy_counter_construct (GType object_type, Marker* remove_marker); -void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedAction action, void* action_target, ProgressMonitor monitor, void* monitor_target, GObject* user); -static gboolean source_collection_destroy_and_delete_source (SourceCollection* self, DataObject* object, GObject* user); -static gboolean _source_collection_destroy_and_delete_source_marked_action (DataObject* object, GObject* user, gpointer self); -static gboolean source_collection_destroy_source (SourceCollection* self, DataObject* object, GObject* user); -static gboolean _source_collection_destroy_source_marked_action (DataObject* object, GObject* user, gpointer self); -void data_collection_remove_marked (DataCollection* self, Marker* m); -gboolean data_source_internal_delete_backing (DataSource* self, GError** error); +static SourceCollectionDestroyCounter* source_collection_destroy_counter_construct (GType object_type, + Marker* remove_marker); +void data_collection_act_on_marked (DataCollection* self, + Marker* m, + MarkedAction action, + void* action_target, + ProgressMonitor monitor, + void* monitor_target, + GObject* user); +static gboolean source_collection_destroy_and_delete_source (SourceCollection* self, + DataObject* object, + GObject* user); +static gboolean _source_collection_destroy_and_delete_source_marked_action (DataObject* object, + GObject* user, + gpointer self); +static gboolean source_collection_destroy_source (SourceCollection* self, + DataObject* object, + GObject* user); +static gboolean _source_collection_destroy_source_marked_action (DataObject* object, + GObject* user, + gpointer self); +void data_collection_remove_marked (DataCollection* self, + Marker* m); +gboolean data_source_internal_delete_backing (DataSource* self, + GError** error); void data_source_internal_mark_for_destroy (DataSource* self); void data_source_destroy (DataSource* self); -void marker_mark (Marker* self, DataObject* object); -void source_collection_internal_backlink_set (SourceCollection* self, DataSource* source, SourceBacklink* backlink); +void marker_mark (Marker* self, + DataObject* object); +void source_collection_internal_backlink_set (SourceCollection* self, + DataSource* source, + SourceBacklink* backlink); guint source_backlink_hash_func (SourceBacklink* backlink); -static guint _source_backlink_hash_func_gee_hash_data_func (gconstpointer v, gpointer self); -gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blink); -static gboolean _source_backlink_equal_func_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); -void source_collection_internal_backlink_removed (SourceCollection* self, DataSource* source, SourceBacklink* backlink); -gboolean source_collection_has_backlink (SourceCollection* self, SourceBacklink* backlink); -static gboolean source_collection_real_has_backlink (SourceCollection* self, SourceBacklink* backlink); -GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* marker, ProgressMonitor monitor, void* monitor_target); -static gboolean source_collection_prepare_for_unlink (SourceCollection* self, DataObject* object, GObject* user); -static gboolean _source_collection_prepare_for_unlink_marked_action (DataObject* object, GObject* user, gpointer self); -Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects); -void data_source_notify_unlinking (DataSource* self, SourceCollection* collection); -void source_collection_relink (SourceCollection* self, DataSource* source); -void data_source_notify_relinking (DataSource* self, SourceCollection* collection); -gboolean data_collection_add (DataCollection* self, DataObject* object); +static guint _source_backlink_hash_func_gee_hash_data_func (gconstpointer v, + gpointer self); +gboolean source_backlink_equal_func (SourceBacklink* alink, + SourceBacklink* blink); +static gboolean _source_backlink_equal_func_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); +void source_collection_internal_backlink_removed (SourceCollection* self, + DataSource* source, + SourceBacklink* backlink); +gboolean source_collection_has_backlink (SourceCollection* self, + SourceBacklink* backlink); +static gboolean source_collection_real_has_backlink (SourceCollection* self, + SourceBacklink* backlink); +GeeCollection* source_collection_unlink_marked (SourceCollection* self, + Marker* marker, + ProgressMonitor monitor, + void* monitor_target); +static gboolean source_collection_prepare_for_unlink (SourceCollection* self, + DataObject* object, + GObject* user); +static gboolean _source_collection_prepare_for_unlink_marked_action (DataObject* object, + GObject* user, + gpointer self); +Marker* data_collection_mark_many (DataCollection* self, + GeeCollection* objects); +void data_source_notify_unlinking (DataSource* self, + SourceCollection* collection); +void source_collection_relink (SourceCollection* self, + DataSource* source); +void data_source_notify_relinking (DataSource* self, + SourceCollection* collection); +gboolean data_collection_add (DataCollection* self, + DataObject* object); GeeCollection* data_collection_get_singleton (DataObject* object); void data_source_notify_relinked (DataSource* self); -void source_collection_relink_many (SourceCollection* self, GeeCollection* relink); -GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); -void source_collection_remove_backlink (SourceCollection* self, SourceBacklink* backlink); -static void source_collection_real_remove_backlink (SourceCollection* self, SourceBacklink* backlink); -gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink); -static void source_collection_real_items_unlinking (SourceCollection* self, GeeCollection* unlinking); -static void source_collection_real_items_relinked (SourceCollection* self, GeeCollection* relinked); -static void source_collection_real_item_destroyed (SourceCollection* self, DataSource* source); -static void source_collection_real_items_destroyed (SourceCollection* self, GeeCollection* destroyed); -static void source_collection_real_unlinked_destroyed (SourceCollection* self, DataSource* source); -static void source_collection_real_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources); -static void g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -enum { - SOURCE_COLLECTION_DESTROY_COUNTER_DUMMY_PROPERTY -}; +void source_collection_relink_many (SourceCollection* self, + GeeCollection* relink); +GeeCollection* data_collection_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); +void source_collection_remove_backlink (SourceCollection* self, + SourceBacklink* backlink); +static void source_collection_real_remove_backlink (SourceCollection* self, + SourceBacklink* backlink); +gboolean data_source_remove_backlink (DataSource* self, + SourceBacklink* backlink); +static void source_collection_real_items_unlinking (SourceCollection* self, + GeeCollection* unlinking); +static void source_collection_real_items_relinked (SourceCollection* self, + GeeCollection* relinked); +static void source_collection_real_item_destroyed (SourceCollection* self, + DataSource* source); +static void source_collection_real_items_destroyed (SourceCollection* self, + GeeCollection* destroyed); +static void source_collection_real_unlinked_destroyed (SourceCollection* self, + DataSource* source); +static void source_collection_real_backlink_removed (SourceCollection* self, + SourceBacklink* backlink, + GeeCollection* sources); +static void g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); static void source_collection_destroy_counter_finalize (GObject * obj); static void source_collection_finalize (DataCollection * obj); -SourceCollection* source_collection_construct (GType object_type, const gchar* name) { +SourceCollection* +source_collection_construct (GType object_type, + const gchar* name) +{ SourceCollection* self = NULL; - const gchar* _tmp0_; #line 50 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (name != NULL, NULL); #line 51 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = name; -#line 51 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - self = (SourceCollection*) data_collection_construct (object_type, _tmp0_); + self = (SourceCollection*) data_collection_construct (object_type, name); #line 50 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return self; -#line 350 "SourceCollection.c" +#line 451 "SourceCollection.c" } -static gboolean source_collection_real_holds_type_of_source (SourceCollection* self, DataSource* source) { +static gboolean +source_collection_real_holds_type_of_source (SourceCollection* self, + DataSource* source) +{ gboolean _tmp0_ = FALSE; #line 54 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_critical ("Type `%s' does not implement abstract method `source_collection_holds_type_of_source'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 54 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return _tmp0_; -#line 360 "SourceCollection.c" +#line 464 "SourceCollection.c" } -gboolean source_collection_holds_type_of_source (SourceCollection* self, DataSource* source) { +gboolean +source_collection_holds_type_of_source (SourceCollection* self, + DataSource* source) +{ #line 54 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE); #line 54 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return SOURCE_COLLECTION_GET_CLASS (self)->holds_type_of_source (self, source); -#line 369 "SourceCollection.c" +#line 476 "SourceCollection.c" } -static void source_collection_real_notify_items_unlinking (SourceCollection* self, GeeCollection* unlinking) { - GeeCollection* _tmp0_; +static void +source_collection_real_notify_items_unlinking (SourceCollection* self, + GeeCollection* unlinking) +{ #line 56 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (unlinking)); #line 57 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = unlinking; -#line 57 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_UNLINKING_SIGNAL], 0, _tmp0_); -#line 381 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_UNLINKING_SIGNAL], 0, unlinking); +#line 488 "SourceCollection.c" } -void source_collection_notify_items_unlinking (SourceCollection* self, GeeCollection* unlinking) { +void +source_collection_notify_items_unlinking (SourceCollection* self, + GeeCollection* unlinking) +{ #line 56 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 56 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_items_unlinking (self, unlinking); -#line 390 "SourceCollection.c" +#line 500 "SourceCollection.c" } -static void source_collection_real_notify_items_relinked (SourceCollection* self, GeeCollection* relinked) { - GeeCollection* _tmp0_; +static void +source_collection_real_notify_items_relinked (SourceCollection* self, + GeeCollection* relinked) +{ #line 60 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (relinked)); #line 61 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = relinked; -#line 61 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_RELINKED_SIGNAL], 0, _tmp0_); -#line 402 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_RELINKED_SIGNAL], 0, relinked); +#line 512 "SourceCollection.c" } -void source_collection_notify_items_relinked (SourceCollection* self, GeeCollection* relinked) { +void +source_collection_notify_items_relinked (SourceCollection* self, + GeeCollection* relinked) +{ #line 60 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 60 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_items_relinked (self, relinked); -#line 411 "SourceCollection.c" +#line 524 "SourceCollection.c" } -static void source_collection_real_notify_item_destroyed (SourceCollection* self, DataSource* source) { - DataSource* _tmp0_; +static void +source_collection_real_notify_item_destroyed (SourceCollection* self, + DataSource* source) +{ #line 64 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 65 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = source; -#line 65 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEM_DESTROYED_SIGNAL], 0, _tmp0_); -#line 423 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEM_DESTROYED_SIGNAL], 0, source); +#line 536 "SourceCollection.c" } -void source_collection_notify_item_destroyed (SourceCollection* self, DataSource* source) { +void +source_collection_notify_item_destroyed (SourceCollection* self, + DataSource* source) +{ #line 64 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 64 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_item_destroyed (self, source); -#line 432 "SourceCollection.c" +#line 548 "SourceCollection.c" } -static void source_collection_real_notify_items_destroyed (SourceCollection* self, GeeCollection* destroyed) { - GeeCollection* _tmp0_; +static void +source_collection_real_notify_items_destroyed (SourceCollection* self, + GeeCollection* destroyed) +{ #line 68 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (destroyed)); #line 69 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = destroyed; -#line 69 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_DESTROYED_SIGNAL], 0, _tmp0_); -#line 444 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_DESTROYED_SIGNAL], 0, destroyed); +#line 560 "SourceCollection.c" } -void source_collection_notify_items_destroyed (SourceCollection* self, GeeCollection* destroyed) { +void +source_collection_notify_items_destroyed (SourceCollection* self, + GeeCollection* destroyed) +{ #line 68 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 68 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_items_destroyed (self, destroyed); -#line 453 "SourceCollection.c" +#line 572 "SourceCollection.c" } -static void source_collection_real_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked) { - DataSource* _tmp0_; +static void +source_collection_real_notify_unlinked_destroyed (SourceCollection* self, + DataSource* unlinked) +{ #line 73 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_DATA_SOURCE (unlinked)); #line 74 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = unlinked; -#line 74 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_UNLINKED_DESTROYED_SIGNAL], 0, _tmp0_); -#line 465 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_UNLINKED_DESTROYED_SIGNAL], 0, unlinked); +#line 584 "SourceCollection.c" } -void source_collection_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked) { +void +source_collection_notify_unlinked_destroyed (SourceCollection* self, + DataSource* unlinked) +{ #line 73 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 73 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_unlinked_destroyed (self, unlinked); -#line 474 "SourceCollection.c" +#line 596 "SourceCollection.c" } -static void source_collection_real_notify_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources) { - SourceBacklink* _tmp0_; - GeeCollection* _tmp1_; +static void +source_collection_real_notify_backlink_removed (SourceCollection* self, + SourceBacklink* backlink, + GeeCollection* sources) +{ #line 77 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_BACKLINK (backlink)); #line 77 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); #line 79 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = backlink; -#line 79 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp1_ = sources; -#line 79 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_BACKLINK_REMOVED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 491 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_BACKLINK_REMOVED_SIGNAL], 0, backlink, sources); +#line 611 "SourceCollection.c" } -void source_collection_notify_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources) { +void +source_collection_notify_backlink_removed (SourceCollection* self, + SourceBacklink* backlink, + GeeCollection* sources) +{ #line 77 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 77 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_backlink_removed (self, backlink, sources); -#line 500 "SourceCollection.c" +#line 624 "SourceCollection.c" } -static gboolean source_collection_real_valid_type (DataCollection* base, DataObject* object) { +static gboolean +source_collection_real_valid_type (DataCollection* base, + DataObject* object) +{ SourceCollection * self; gboolean result = FALSE; - DataObject* _tmp0_; #line 82 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SOURCE_COLLECTION, SourceCollection); #line 82 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 83 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = object; -#line 83 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_DATA_SOURCE); + result = G_TYPE_CHECK_INSTANCE_TYPE (object, TYPE_DATA_SOURCE); #line 83 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 518 "SourceCollection.c" +#line 642 "SourceCollection.c" } -static gboolean _source_collection_destroy_and_delete_source_marked_action (DataObject* object, GObject* user, gpointer self) { +static gboolean +_source_collection_destroy_and_delete_source_marked_action (DataObject* object, + GObject* user, + gpointer self) +{ gboolean result; result = source_collection_destroy_and_delete_source ((SourceCollection*) self, object, user); #line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 527 "SourceCollection.c" +#line 655 "SourceCollection.c" } -static gboolean _source_collection_destroy_source_marked_action (DataObject* object, GObject* user, gpointer self) { +static gboolean +_source_collection_destroy_source_marked_action (DataObject* object, + GObject* user, + gpointer self) +{ gboolean result; result = source_collection_destroy_source ((SourceCollection*) self, object, user); #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 536 "SourceCollection.c" +#line 668 "SourceCollection.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return self ? g_object_ref (self) : NULL; -#line 543 "SourceCollection.c" +#line 677 "SourceCollection.c" } -gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed) { +gint +source_collection_destroy_marked (SourceCollection* self, + Marker* marker, + gboolean delete_backing, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_removed) +{ gint result = 0; SourceCollectionDestroyCounter* counter = NULL; Marker* _tmp0_; Marker* _tmp1_; SourceCollectionDestroyCounter* _tmp2_; SourceCollectionDestroyCounter* _tmp3_; - gboolean _tmp4_; - SourceCollectionDestroyCounter* _tmp24_; - GeeArrayList* _tmp25_; - SourceCollectionDestroyCounter* _tmp26_; - Marker* _tmp27_; - GeeList* _tmp28_; - SourceCollectionDestroyCounter* _tmp32_; - GeeArrayList* _tmp33_; - gint _tmp34_; - gint _tmp35_; + SourceCollectionDestroyCounter* _tmp19_; + GeeArrayList* _tmp20_; + SourceCollectionDestroyCounter* _tmp21_; + Marker* _tmp22_; + SourceCollectionDestroyCounter* _tmp25_; + GeeArrayList* _tmp26_; + gint _tmp27_; + gint _tmp28_; #line 88 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), 0); #line 88 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -579,172 +718,148 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g #line 90 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" counter = _tmp3_; #line 92 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = delete_backing; -#line 92 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (_tmp4_) { -#line 586 "SourceCollection.c" - Marker* _tmp5_; - ProgressMonitor _tmp6_; - void* _tmp6__target; - SourceCollectionDestroyCounter* _tmp7_; -#line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp5_ = marker; -#line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp6_ = monitor; -#line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp6__target = monitor_target; + if (delete_backing) { +#line 723 "SourceCollection.c" + SourceCollectionDestroyCounter* _tmp4_; #line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp7_ = counter; + _tmp4_ = counter; #line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp5_, _source_collection_destroy_and_delete_source_marked_action, self, _tmp6_, _tmp6__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, G_TYPE_OBJECT, GObject)); -#line 601 "SourceCollection.c" + data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), marker, _source_collection_destroy_and_delete_source_marked_action, self, monitor, monitor_target, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, G_TYPE_OBJECT, GObject)); +#line 729 "SourceCollection.c" } else { - Marker* _tmp8_; - ProgressMonitor _tmp9_; - void* _tmp9__target; - SourceCollectionDestroyCounter* _tmp10_; + SourceCollectionDestroyCounter* _tmp5_; #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp8_ = marker; + _tmp5_ = counter; #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp9_ = monitor; -#line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp9__target = monitor_target; -#line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp10_ = counter; -#line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp8_, _source_collection_destroy_source_marked_action, self, _tmp9_, _tmp9__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, G_TYPE_OBJECT, GObject)); -#line 617 "SourceCollection.c" + data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), marker, _source_collection_destroy_source_marked_action, self, monitor, monitor_target, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, G_TYPE_OBJECT, GObject)); +#line 736 "SourceCollection.c" } { GeeArrayList* _source_list = NULL; - SourceCollectionDestroyCounter* _tmp11_; - GeeArrayList* _tmp12_; - GeeArrayList* _tmp13_; + SourceCollectionDestroyCounter* _tmp6_; + GeeArrayList* _tmp7_; + GeeArrayList* _tmp8_; gint _source_size = 0; - GeeArrayList* _tmp14_; - gint _tmp15_; - gint _tmp16_; + GeeArrayList* _tmp9_; + gint _tmp10_; + gint _tmp11_; gint _source_index = 0; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp11_ = counter; + _tmp6_ = counter; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp12_ = _tmp11_->notify_list; + _tmp7_ = _tmp6_->notify_list; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp13_ = _g_object_ref0 (_tmp12_); + _tmp8_ = _g_object_ref0 (_tmp7_); #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _source_list = _tmp13_; + _source_list = _tmp8_; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp14_ = _source_list; + _tmp9_ = _source_list; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp15_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp10_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp16_ = _tmp15_; + _tmp11_ = _tmp10_; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _source_size = _tmp16_; + _source_size = _tmp11_; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _source_index = -1; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" while (TRUE) { -#line 649 "SourceCollection.c" - gint _tmp17_; - gint _tmp18_; - gint _tmp19_; +#line 768 "SourceCollection.c" + gint _tmp12_; + gint _tmp13_; + gint _tmp14_; DataSource* source = NULL; - GeeArrayList* _tmp20_; - gint _tmp21_; - gpointer _tmp22_; - DataSource* _tmp23_; + GeeArrayList* _tmp15_; + gint _tmp16_; + gpointer _tmp17_; + DataSource* _tmp18_; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp17_ = _source_index; + _tmp12_ = _source_index; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _source_index = _tmp17_ + 1; + _source_index = _tmp12_ + 1; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp18_ = _source_index; + _tmp13_ = _source_index; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp19_ = _source_size; + _tmp14_ = _source_size; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (!(_tmp18_ < _tmp19_)) { + if (!(_tmp13_ < _tmp14_)) { #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" break; -#line 670 "SourceCollection.c" +#line 789 "SourceCollection.c" } #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp20_ = _source_list; + _tmp15_ = _source_list; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp21_ = _source_index; + _tmp16_ = _source_index; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp22_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp21_); + _tmp17_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp16_); #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source = (DataSource*) _tmp22_; + source = (DataSource*) _tmp17_; #line 99 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp23_ = source; + _tmp18_ = source; #line 99 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source_collection_notify_item_destroyed (self, _tmp23_); + source_collection_notify_item_destroyed (self, _tmp18_); #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); -#line 686 "SourceCollection.c" +#line 805 "SourceCollection.c" } #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_source_list); -#line 690 "SourceCollection.c" +#line 809 "SourceCollection.c" } #line 100 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp24_ = counter; + _tmp19_ = counter; #line 100 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp25_ = _tmp24_->notify_list; + _tmp20_ = _tmp19_->notify_list; #line 100 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source_collection_notify_items_destroyed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection)); + source_collection_notify_items_destroyed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); #line 103 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp26_ = counter; + _tmp21_ = counter; #line 103 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp27_ = _tmp26_->remove_marker; + _tmp22_ = _tmp21_->remove_marker; #line 103 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp27_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp22_); #line 105 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp28_ = not_removed; -#line 105 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (NULL != _tmp28_) { -#line 708 "SourceCollection.c" - GeeList* _tmp29_; - SourceCollectionDestroyCounter* _tmp30_; - GeeArrayList* _tmp31_; -#line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp29_ = not_removed; + if (NULL != not_removed) { +#line 825 "SourceCollection.c" + SourceCollectionDestroyCounter* _tmp23_; + GeeArrayList* _tmp24_; #line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp30_ = counter; + _tmp23_ = counter; #line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp31_ = _tmp30_->not_removed; + _tmp24_ = _tmp23_->not_removed; #line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 720 "SourceCollection.c" + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (not_removed, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 834 "SourceCollection.c" } #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp32_ = counter; + _tmp25_ = counter; #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp33_ = _tmp32_->not_removed; + _tmp26_ = _tmp25_->not_removed; #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp35_ = _tmp34_; + _tmp28_ = _tmp27_; #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - result = _tmp35_; + result = _tmp28_; #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (counter); #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 736 "SourceCollection.c" +#line 850 "SourceCollection.c" } -static gboolean source_collection_destroy_and_delete_source (SourceCollection* self, DataObject* object, GObject* user) { +static gboolean +source_collection_destroy_and_delete_source (SourceCollection* self, + DataObject* object, + GObject* user) +{ gboolean result = FALSE; gboolean success = FALSE; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_; - gboolean _tmp10_ = FALSE; - DataObject* _tmp11_; - GObject* _tmp12_; - gboolean _tmp13_; + gboolean _tmp2_ = FALSE; + gboolean _tmp3_; + gboolean _tmp5_ = FALSE; GError * _inner_error_ = NULL; #line 112 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE); @@ -754,25 +869,19 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE); #line 113 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" success = FALSE; -#line 758 "SourceCollection.c" +#line 873 "SourceCollection.c" { gboolean _tmp0_ = FALSE; - DataObject* _tmp1_; - gboolean _tmp2_; -#line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp1_ = object; -#line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp2_ = data_source_internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource), &_inner_error_); #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = _tmp2_; + _tmp0_ = data_source_internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_SOURCE, DataSource), &_inner_error_); #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 771 "SourceCollection.c" +#line 880 "SourceCollection.c" goto __catch53_g_error; } #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" success = _tmp0_; -#line 776 "SourceCollection.c" +#line 885 "SourceCollection.c" } goto __finally53; __catch53_g_error: @@ -786,90 +895,75 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s success = FALSE; #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_error_free0 (err); -#line 790 "SourceCollection.c" +#line 899 "SourceCollection.c" } __finally53: #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 795 "SourceCollection.c" - gboolean _tmp3_ = FALSE; +#line 904 "SourceCollection.c" + gboolean _tmp1_ = FALSE; #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_clear_error (&_inner_error_); #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - return _tmp3_; -#line 803 "SourceCollection.c" + return _tmp1_; +#line 912 "SourceCollection.c" } #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp5_ = success; -#line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (!_tmp5_) { -#line 809 "SourceCollection.c" - DataObject* _tmp6_; + _tmp3_ = success; #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp6_ = object; + if (!_tmp3_) { #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_MEDIA_SOURCE); -#line 815 "SourceCollection.c" + _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (object, TYPE_MEDIA_SOURCE); +#line 920 "SourceCollection.c" } else { #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = FALSE; -#line 819 "SourceCollection.c" + _tmp2_ = FALSE; +#line 924 "SourceCollection.c" } #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (_tmp4_) { -#line 823 "SourceCollection.c" - GObject* _tmp7_; - GeeArrayList* _tmp8_; - DataObject* _tmp9_; -#line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp7_ = user; -#line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->not_removed; + if (_tmp2_) { +#line 928 "SourceCollection.c" + GeeArrayList* _tmp4_; #line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp9_ = object; + _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (user, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->not_removed; #line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 835 "SourceCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_MEDIA_SOURCE, MediaSource)); +#line 934 "SourceCollection.c" } #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp11_ = object; -#line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp12_ = user; -#line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp13_ = source_collection_destroy_source (self, _tmp11_, _tmp12_); + if (source_collection_destroy_source (self, object, user)) { +#line 938 "SourceCollection.c" + gboolean _tmp6_; #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (_tmp13_) { -#line 845 "SourceCollection.c" - gboolean _tmp14_; + _tmp6_ = success; #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp14_ = success; -#line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp10_ = _tmp14_; -#line 851 "SourceCollection.c" + _tmp5_ = _tmp6_; +#line 944 "SourceCollection.c" } else { #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp10_ = FALSE; -#line 855 "SourceCollection.c" + _tmp5_ = FALSE; +#line 948 "SourceCollection.c" } #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - result = _tmp10_; + result = _tmp5_; #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 861 "SourceCollection.c" +#line 954 "SourceCollection.c" } -static gboolean source_collection_destroy_source (SourceCollection* self, DataObject* object, GObject* user) { +static gboolean +source_collection_destroy_source (SourceCollection* self, + DataObject* object, + GObject* user) +{ gboolean result = FALSE; DataSource* source = NULL; - DataObject* _tmp0_; - DataSource* _tmp1_; - GObject* _tmp2_; - Marker* _tmp3_; - GObject* _tmp4_; - GeeArrayList* _tmp5_; + DataSource* _tmp0_; + Marker* _tmp1_; + GeeArrayList* _tmp2_; #line 127 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE); #line 127 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -877,60 +971,63 @@ static gboolean source_collection_destroy_source (SourceCollection* self, DataOb #line 127 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE); #line 128 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = object; -#line 128 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_SOURCE, DataSource)); #line 128 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source = _tmp1_; + source = _tmp0_; #line 130 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data_source_internal_mark_for_destroy (source); #line 131 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data_source_destroy (source); #line 133 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp2_ = user; -#line 133 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->remove_marker; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (user, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->remove_marker; #line 133 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - marker_mark (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); + marker_mark (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 134 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = user; + _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (user, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->notify_list; #line 134 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->notify_list; -#line 134 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), source); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), source); #line 136 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" result = TRUE; #line 136 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); #line 136 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 908 "SourceCollection.c" +#line 996 "SourceCollection.c" } -static guint _source_backlink_hash_func_gee_hash_data_func (gconstpointer v, gpointer self) { +static guint +_source_backlink_hash_func_gee_hash_data_func (gconstpointer v, + gpointer self) +{ guint result; result = source_backlink_hash_func ((SourceBacklink*) v); #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 917 "SourceCollection.c" +#line 1008 "SourceCollection.c" } -static gboolean _source_backlink_equal_func_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_source_backlink_equal_func_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = source_backlink_equal_func ((SourceBacklink*) a, (SourceBacklink*) b); #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 926 "SourceCollection.c" +#line 1021 "SourceCollection.c" } -void source_collection_internal_backlink_set (SourceCollection* self, DataSource* source, SourceBacklink* backlink) { +void +source_collection_internal_backlink_set (SourceCollection* self, + DataSource* source, + SourceBacklink* backlink) +{ GeeMultiMap* _tmp0_; GeeMultiMap* _tmp2_; - SourceBacklink* _tmp3_; - DataSource* _tmp4_; #line 140 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 140 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -941,7 +1038,7 @@ void source_collection_internal_backlink_set (SourceCollection* self, DataSource _tmp0_ = self->priv->backlinks; #line 141 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (_tmp0_ == NULL) { -#line 945 "SourceCollection.c" +#line 1042 "SourceCollection.c" GeeHashMultiMap* _tmp1_; #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp1_ = gee_hash_multi_map_new (TYPE_SOURCE_BACKLINK, (GBoxedCopyFunc) source_backlink_ref, (GDestroyNotify) source_backlink_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _source_backlink_hash_func_gee_hash_data_func, NULL, NULL, _source_backlink_equal_func_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -949,27 +1046,24 @@ void source_collection_internal_backlink_set (SourceCollection* self, DataSource _g_object_unref0 (self->priv->backlinks); #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self->priv->backlinks = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MULTI_MAP, GeeMultiMap); -#line 953 "SourceCollection.c" +#line 1050 "SourceCollection.c" } #line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp2_ = self->priv->backlinks; #line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp3_ = backlink; -#line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = source; -#line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - gee_multi_map_set (_tmp2_, _tmp3_, _tmp4_); -#line 963 "SourceCollection.c" + gee_multi_map_set (_tmp2_, backlink, source); +#line 1056 "SourceCollection.c" } -void source_collection_internal_backlink_removed (SourceCollection* self, DataSource* source, SourceBacklink* backlink) { +void +source_collection_internal_backlink_removed (SourceCollection* self, + DataSource* source, + SourceBacklink* backlink) +{ GeeMultiMap* _tmp0_; gboolean removed = FALSE; GeeMultiMap* _tmp1_; - SourceBacklink* _tmp2_; - DataSource* _tmp3_; - gboolean _tmp4_; #line 150 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 150 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -983,20 +1077,17 @@ void source_collection_internal_backlink_removed (SourceCollection* self, DataSo #line 153 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp1_ = self->priv->backlinks; #line 153 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp2_ = backlink; -#line 153 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp3_ = source; -#line 153 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = gee_multi_map_remove (_tmp1_, _tmp2_, _tmp3_); -#line 153 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - removed = _tmp4_; + removed = gee_multi_map_remove (_tmp1_, backlink, source); #line 154 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _vala_assert (removed, "removed"); -#line 996 "SourceCollection.c" +#line 1084 "SourceCollection.c" } -static gboolean source_collection_real_has_backlink (SourceCollection* self, SourceBacklink* backlink) { +static gboolean +source_collection_real_has_backlink (SourceCollection* self, + SourceBacklink* backlink) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; GeeMultiMap* _tmp1_; @@ -1006,65 +1097,68 @@ static gboolean source_collection_real_has_backlink (SourceCollection* self, Sou _tmp1_ = self->priv->backlinks; #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (_tmp1_ != NULL) { -#line 1010 "SourceCollection.c" +#line 1101 "SourceCollection.c" GeeMultiMap* _tmp2_; - SourceBacklink* _tmp3_; - gboolean _tmp4_; #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp2_ = self->priv->backlinks; #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp3_ = backlink; -#line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = gee_multi_map_contains (_tmp2_, _tmp3_); -#line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = _tmp4_; -#line 1022 "SourceCollection.c" + _tmp0_ = gee_multi_map_contains (_tmp2_, backlink); +#line 1107 "SourceCollection.c" } else { #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp0_ = FALSE; -#line 1026 "SourceCollection.c" +#line 1111 "SourceCollection.c" } #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" result = _tmp0_; #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1032 "SourceCollection.c" +#line 1117 "SourceCollection.c" } -gboolean source_collection_has_backlink (SourceCollection* self, SourceBacklink* backlink) { +gboolean +source_collection_has_backlink (SourceCollection* self, + SourceBacklink* backlink) +{ #line 157 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE); #line 157 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return SOURCE_COLLECTION_GET_CLASS (self)->has_backlink (self, backlink); -#line 1041 "SourceCollection.c" +#line 1129 "SourceCollection.c" } -static gboolean _source_collection_prepare_for_unlink_marked_action (DataObject* object, GObject* user, gpointer self) { +static gboolean +_source_collection_prepare_for_unlink_marked_action (DataObject* object, + GObject* user, + gpointer self) +{ gboolean result; result = source_collection_prepare_for_unlink ((SourceCollection*) self, object, user); #line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1050 "SourceCollection.c" +#line 1142 "SourceCollection.c" } -GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* marker, ProgressMonitor monitor, void* monitor_target) { +GeeCollection* +source_collection_unlink_marked (SourceCollection* self, + Marker* marker, + ProgressMonitor monitor, + void* monitor_target) +{ GeeCollection* result = NULL; GeeArrayList* list = NULL; GeeArrayList* _tmp0_; - Marker* _tmp1_; - ProgressMonitor _tmp2_; - void* _tmp2__target; - GeeArrayList* _tmp3_; - GeeArrayList* _tmp4_; - gint _tmp5_; - gint _tmp6_; - GeeArrayList* _tmp7_; - GeeArrayList* _tmp8_; - Marker* _tmp9_; - Marker* _tmp10_; + GeeArrayList* _tmp1_; + GeeArrayList* _tmp2_; + gint _tmp3_; + gint _tmp4_; + GeeArrayList* _tmp5_; + GeeArrayList* _tmp6_; + Marker* _tmp7_; + Marker* _tmp8_; #line 161 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), NULL); #line 161 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1074,59 +1168,55 @@ GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* #line 162 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" list = _tmp0_; #line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp1_ = marker; + _tmp1_ = list; #line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp2_ = monitor; -#line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp2__target = monitor_target; -#line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp3_ = list; -#line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, _source_collection_prepare_for_unlink_marked_action, self, _tmp2_, _tmp2__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_OBJECT, GObject)); + data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), marker, _source_collection_prepare_for_unlink_marked_action, self, monitor, monitor_target, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_OBJECT, GObject)); #line 165 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = list; + _tmp2_ = list; #line 165 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 165 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 165 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (_tmp6_ == 0) { + if (_tmp4_ == 0) { #line 166 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" result = NULL; #line 166 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (list); #line 166 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1101 "SourceCollection.c" +#line 1189 "SourceCollection.c" } #line 168 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp7_ = list; + _tmp5_ = list; #line 168 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source_collection_notify_items_unlinking (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); + source_collection_notify_items_unlinking (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 170 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp8_ = list; + _tmp6_ = list; #line 170 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp9_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp7_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); #line 170 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 170 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp10_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp8_); #line 170 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 172 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" result = G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_COLLECTION, GeeCollection); #line 172 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1121 "SourceCollection.c" +#line 1209 "SourceCollection.c" } -static gboolean source_collection_prepare_for_unlink (SourceCollection* self, DataObject* object, GObject* user) { +static gboolean +source_collection_prepare_for_unlink (SourceCollection* self, + DataObject* object, + GObject* user) +{ gboolean result = FALSE; DataSource* source = NULL; - DataObject* _tmp0_; - DataSource* _tmp1_; - GObject* _tmp2_; + DataSource* _tmp0_; #line 175 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE); #line 175 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1134,209 +1224,179 @@ static gboolean source_collection_prepare_for_unlink (SourceCollection* self, Da #line 175 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE); #line 176 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = object; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_SOURCE, DataSource)); #line 176 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource)); -#line 176 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source = _tmp1_; + source = _tmp0_; #line 178 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data_source_notify_unlinking (source, self); #line 179 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp2_ = user; -#line 179 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList), GEE_TYPE_COLLECTION, GeeCollection), source); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (user, GEE_TYPE_LIST, GeeList), GEE_TYPE_COLLECTION, GeeCollection), source); #line 181 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" result = TRUE; #line 181 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); #line 181 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1155 "SourceCollection.c" +#line 1241 "SourceCollection.c" } -void source_collection_relink (SourceCollection* self, DataSource* source) { - DataSource* _tmp0_; - DataSource* _tmp1_; - DataSource* _tmp2_; - GeeCollection* _tmp3_; - GeeCollection* _tmp4_; - DataSource* _tmp5_; +void +source_collection_relink (SourceCollection* self, + DataSource* source) +{ + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; #line 184 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 184 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 185 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = source; -#line 185 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_source_notify_relinking (_tmp0_, self); -#line 187 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp1_ = source; + data_source_notify_relinking (source, self); #line 187 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 188 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp2_ = source; + _tmp0_ = data_collection_get_singleton (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 188 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp3_ = data_collection_get_singleton (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject)); + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 188 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); + source_collection_notify_items_relinked (self, _tmp1_); #line 188 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source_collection_notify_items_relinked (self, _tmp4_); -#line 188 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _g_object_unref0 (_tmp4_); -#line 190 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp5_ = source; + _g_object_unref0 (_tmp1_); #line 190 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_source_notify_relinked (_tmp5_); -#line 1192 "SourceCollection.c" + data_source_notify_relinked (source); +#line 1269 "SourceCollection.c" } -void source_collection_relink_many (SourceCollection* self, GeeCollection* relink) { - GeeCollection* _tmp0_; +void +source_collection_relink_many (SourceCollection* self, + GeeCollection* relink) +{ + gint _tmp0_; gint _tmp1_; - gint _tmp2_; - GeeCollection* _tmp10_; - GeeCollection* _tmp11_; - GeeCollection* _tmp12_; - GeeCollection* _tmp13_; + GeeCollection* _tmp7_; + GeeCollection* _tmp8_; #line 193 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 193 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (relink)); #line 194 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = relink; -#line 194 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp0_ = gee_collection_get_size (relink); #line 194 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 194 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 195 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return; -#line 1218 "SourceCollection.c" +#line 1293 "SourceCollection.c" } { GeeIterator* _source_it = NULL; - GeeCollection* _tmp3_; - GeeIterator* _tmp4_; -#line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp3_ = relink; + GeeIterator* _tmp2_; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (relink, GEE_TYPE_ITERABLE, GeeIterable)); #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _source_it = _tmp4_; + _source_it = _tmp2_; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" while (TRUE) { -#line 1232 "SourceCollection.c" - GeeIterator* _tmp5_; - gboolean _tmp6_; +#line 1304 "SourceCollection.c" + GeeIterator* _tmp3_; DataSource* source = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; - DataSource* _tmp9_; + GeeIterator* _tmp4_; + gpointer _tmp5_; + DataSource* _tmp6_; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp5_ = _source_it; + _tmp3_ = _source_it; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp6_ = gee_iterator_next (_tmp5_); -#line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp3_)) { #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" break; -#line 1247 "SourceCollection.c" +#line 1316 "SourceCollection.c" } #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp7_ = _source_it; + _tmp4_ = _source_it; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source = (DataSource*) _tmp8_; + source = (DataSource*) _tmp5_; #line 198 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp9_ = source; + _tmp6_ = source; #line 198 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_source_notify_relinking (_tmp9_, self); + data_source_notify_relinking (_tmp6_, self); #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); -#line 1261 "SourceCollection.c" +#line 1330 "SourceCollection.c" } #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_source_it); -#line 1265 "SourceCollection.c" +#line 1334 "SourceCollection.c" } #line 200 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp10_ = relink; -#line 200 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp11_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp10_, NULL, NULL); + _tmp7_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), relink, NULL, NULL); #line 200 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 200 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _g_object_unref0 (_tmp12_); -#line 201 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp13_ = relink; + _g_object_unref0 (_tmp8_); #line 201 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source_collection_notify_items_relinked (self, _tmp13_); -#line 1279 "SourceCollection.c" + source_collection_notify_items_relinked (self, relink); +#line 1344 "SourceCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp14_; - GeeIterator* _tmp15_; + GeeIterator* _tmp9_; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp14_ = relink; + _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (relink, GEE_TYPE_ITERABLE, GeeIterable)); #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _source_it = _tmp15_; + _source_it = _tmp9_; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" while (TRUE) { -#line 1292 "SourceCollection.c" - GeeIterator* _tmp16_; - gboolean _tmp17_; +#line 1354 "SourceCollection.c" + GeeIterator* _tmp10_; DataSource* source = NULL; - GeeIterator* _tmp18_; - gpointer _tmp19_; - DataSource* _tmp20_; -#line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp16_ = _source_it; + GeeIterator* _tmp11_; + gpointer _tmp12_; + DataSource* _tmp13_; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp17_ = gee_iterator_next (_tmp16_); + _tmp10_ = _source_it; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (!_tmp17_) { + if (!gee_iterator_next (_tmp10_)) { #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" break; -#line 1307 "SourceCollection.c" +#line 1366 "SourceCollection.c" } #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp18_ = _source_it; + _tmp11_ = _source_it; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp19_ = gee_iterator_get (_tmp18_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source = (DataSource*) _tmp19_; + source = (DataSource*) _tmp12_; #line 204 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp20_ = source; + _tmp13_ = source; #line 204 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_source_notify_relinked (_tmp20_); + data_source_notify_relinked (_tmp13_); #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); -#line 1321 "SourceCollection.c" +#line 1380 "SourceCollection.c" } #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_source_it); -#line 1325 "SourceCollection.c" +#line 1384 "SourceCollection.c" } } -static void source_collection_real_remove_backlink (SourceCollection* self, SourceBacklink* backlink) { +static void +source_collection_real_remove_backlink (SourceCollection* self, + SourceBacklink* backlink) +{ GeeMultiMap* _tmp0_; GeeArrayList* sources = NULL; GeeArrayList* _tmp1_; GeeArrayList* _tmp2_; GeeMultiMap* _tmp3_; - SourceBacklink* _tmp4_; + GeeCollection* _tmp4_; GeeCollection* _tmp5_; - GeeCollection* _tmp6_; - SourceBacklink* _tmp20_; - GeeArrayList* _tmp21_; + GeeArrayList* _tmp18_; #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_BACKLINK (backlink)); #line 208 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1345,7 +1405,7 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour if (_tmp0_ == NULL) { #line 209 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return; -#line 1349 "SourceCollection.c" +#line 1409 "SourceCollection.c" } #line 212 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp1_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); @@ -1356,155 +1416,177 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp3_ = self->priv->backlinks; #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = backlink; -#line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp5_ = gee_multi_map_get (_tmp3_, _tmp4_); + _tmp4_ = gee_multi_map_get (_tmp3_, backlink); #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - gee_array_list_add_all (_tmp2_, _tmp6_); + gee_array_list_add_all (_tmp2_, _tmp5_); #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _g_object_unref0 (_tmp6_); -#line 1369 "SourceCollection.c" + _g_object_unref0 (_tmp5_); +#line 1427 "SourceCollection.c" { GeeArrayList* _source_list = NULL; + GeeArrayList* _tmp6_; GeeArrayList* _tmp7_; - GeeArrayList* _tmp8_; gint _source_size = 0; - GeeArrayList* _tmp9_; + GeeArrayList* _tmp8_; + gint _tmp9_; gint _tmp10_; - gint _tmp11_; gint _source_index = 0; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp7_ = sources; + _tmp6_ = sources; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp8_ = _g_object_ref0 (_tmp7_); + _tmp7_ = _g_object_ref0 (_tmp6_); #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _source_list = _tmp8_; + _source_list = _tmp7_; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp9_ = _source_list; + _tmp8_ = _source_list; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp10_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp9_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _source_size = _tmp11_; + _source_size = _tmp10_; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _source_index = -1; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" while (TRUE) { -#line 1397 "SourceCollection.c" +#line 1455 "SourceCollection.c" + gint _tmp11_; gint _tmp12_; gint _tmp13_; - gint _tmp14_; DataSource* source = NULL; - GeeArrayList* _tmp15_; - gint _tmp16_; - gpointer _tmp17_; - DataSource* _tmp18_; - SourceBacklink* _tmp19_; + GeeArrayList* _tmp14_; + gint _tmp15_; + gpointer _tmp16_; + DataSource* _tmp17_; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp12_ = _source_index; + _tmp11_ = _source_index; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _source_index = _tmp12_ + 1; + _source_index = _tmp11_ + 1; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp13_ = _source_index; + _tmp12_ = _source_index; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp14_ = _source_size; + _tmp13_ = _source_size; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (!(_tmp13_ < _tmp14_)) { + if (!(_tmp12_ < _tmp13_)) { #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" break; -#line 1419 "SourceCollection.c" +#line 1476 "SourceCollection.c" } #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp15_ = _source_list; + _tmp14_ = _source_list; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp16_ = _source_index; + _tmp15_ = _source_index; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp17_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp16_); + _tmp16_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp15_); #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source = (DataSource*) _tmp17_; + source = (DataSource*) _tmp16_; #line 216 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp18_ = source; + _tmp17_ = source; #line 216 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp19_ = backlink; -#line 216 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_source_remove_backlink (_tmp18_, _tmp19_); + data_source_remove_backlink (_tmp17_, backlink); #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); -#line 1437 "SourceCollection.c" +#line 1492 "SourceCollection.c" } #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_source_list); -#line 1441 "SourceCollection.c" +#line 1496 "SourceCollection.c" } #line 218 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp20_ = backlink; -#line 218 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp21_ = sources; + _tmp18_ = sources; #line 218 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source_collection_notify_backlink_removed (self, _tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); + source_collection_notify_backlink_removed (self, backlink, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (sources); -#line 1451 "SourceCollection.c" +#line 1504 "SourceCollection.c" } -void source_collection_remove_backlink (SourceCollection* self, SourceBacklink* backlink) { +void +source_collection_remove_backlink (SourceCollection* self, + SourceBacklink* backlink) +{ #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->remove_backlink (self, backlink); -#line 1460 "SourceCollection.c" +#line 1516 "SourceCollection.c" } -static void source_collection_real_items_unlinking (SourceCollection* self, GeeCollection* unlinking) { +static void +source_collection_real_items_unlinking (SourceCollection* self, + GeeCollection* unlinking) +{ #line 20 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (unlinking)); -#line 1467 "SourceCollection.c" +#line 1526 "SourceCollection.c" } -static void source_collection_real_items_relinked (SourceCollection* self, GeeCollection* relinked) { +static void +source_collection_real_items_relinked (SourceCollection* self, + GeeCollection* relinked) +{ #line 25 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (relinked)); -#line 1474 "SourceCollection.c" +#line 1536 "SourceCollection.c" } -static void source_collection_real_item_destroyed (SourceCollection* self, DataSource* source) { +static void +source_collection_real_item_destroyed (SourceCollection* self, + DataSource* source) +{ #line 30 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_DATA_SOURCE (source)); -#line 1481 "SourceCollection.c" +#line 1546 "SourceCollection.c" } -static void source_collection_real_items_destroyed (SourceCollection* self, GeeCollection* destroyed) { +static void +source_collection_real_items_destroyed (SourceCollection* self, + GeeCollection* destroyed) +{ #line 35 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (destroyed)); -#line 1488 "SourceCollection.c" +#line 1556 "SourceCollection.c" } -static void source_collection_real_unlinked_destroyed (SourceCollection* self, DataSource* source) { +static void +source_collection_real_unlinked_destroyed (SourceCollection* self, + DataSource* source) +{ #line 40 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_DATA_SOURCE (source)); -#line 1495 "SourceCollection.c" +#line 1566 "SourceCollection.c" } -static void source_collection_real_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources) { +static void +source_collection_real_backlink_removed (SourceCollection* self, + SourceBacklink* backlink, + GeeCollection* sources) +{ #line 44 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_BACKLINK (backlink)); #line 44 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); -#line 1504 "SourceCollection.c" +#line 1579 "SourceCollection.c" } -static void g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__SOURCE_BACKLINK_OBJECT) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2); register GMarshalFunc_VOID__SOURCE_BACKLINK_OBJECT callback; register GCClosure * cc; @@ -1519,61 +1601,67 @@ static void g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * clo data1 = closure->data; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data2 = param_values->data[0].v_pointer; -#line 1523 "SourceCollection.c" +#line 1605 "SourceCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data1 = param_values->data[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data2 = closure->data; -#line 1529 "SourceCollection.c" +#line 1611 "SourceCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" callback = (GMarshalFunc_VOID__SOURCE_BACKLINK_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" callback (data1, value_get_source_backlink (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 1535 "SourceCollection.c" +#line 1617 "SourceCollection.c" } -static SourceCollectionDestroyCounter* source_collection_destroy_counter_construct (GType object_type, Marker* remove_marker) { +static SourceCollectionDestroyCounter* +source_collection_destroy_counter_construct (GType object_type, + Marker* remove_marker) +{ SourceCollectionDestroyCounter * self = NULL; Marker* _tmp0_; - Marker* _tmp1_; #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_MARKER (remove_marker), NULL); #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self = (SourceCollectionDestroyCounter*) g_object_new (object_type, NULL); #line 14 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = remove_marker; -#line 14 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (remove_marker); #line 14 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (self->remove_marker); #line 14 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - self->remove_marker = _tmp1_; + self->remove_marker = _tmp0_; #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return self; -#line 1557 "SourceCollection.c" +#line 1639 "SourceCollection.c" } -static SourceCollectionDestroyCounter* source_collection_destroy_counter_new (Marker* remove_marker) { +static SourceCollectionDestroyCounter* +source_collection_destroy_counter_new (Marker* remove_marker) +{ #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return source_collection_destroy_counter_construct (SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, remove_marker); -#line 1564 "SourceCollection.c" +#line 1648 "SourceCollection.c" } -static void source_collection_destroy_counter_class_init (SourceCollectionDestroyCounterClass * klass) { +static void +source_collection_destroy_counter_class_init (SourceCollectionDestroyCounterClass * klass) +{ #line 8 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" source_collection_destroy_counter_parent_class = g_type_class_peek_parent (klass); #line 8 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" G_OBJECT_CLASS (klass)->finalize = source_collection_destroy_counter_finalize; -#line 1573 "SourceCollection.c" +#line 1659 "SourceCollection.c" } -static void source_collection_destroy_counter_instance_init (SourceCollectionDestroyCounter * self) { +static void +source_collection_destroy_counter_instance_init (SourceCollectionDestroyCounter * self) +{ GeeArrayList* _tmp0_; GeeArrayList* _tmp1_; #line 10 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1584,11 +1672,13 @@ static void source_collection_destroy_counter_instance_init (SourceCollectionDes _tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 11 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self->not_removed = _tmp1_; -#line 1588 "SourceCollection.c" +#line 1676 "SourceCollection.c" } -static void source_collection_destroy_counter_finalize (GObject * obj) { +static void +source_collection_destroy_counter_finalize (GObject * obj) +{ SourceCollectionDestroyCounter * self; #line 8 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter); @@ -1600,11 +1690,13 @@ static void source_collection_destroy_counter_finalize (GObject * obj) { _g_object_unref0 (self->not_removed); #line 8 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" G_OBJECT_CLASS (source_collection_destroy_counter_parent_class)->finalize (obj); -#line 1604 "SourceCollection.c" +#line 1694 "SourceCollection.c" } -static GType source_collection_destroy_counter_get_type (void) { +static GType +source_collection_destroy_counter_get_type (void) +{ static volatile gsize source_collection_destroy_counter_type_id__volatile = 0; if (g_once_init_enter (&source_collection_destroy_counter_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SourceCollectionDestroyCounterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) source_collection_destroy_counter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SourceCollectionDestroyCounter), 0, (GInstanceInitFunc) source_collection_destroy_counter_instance_init, NULL }; @@ -1616,7 +1708,9 @@ static GType source_collection_destroy_counter_get_type (void) { } -static void source_collection_class_init (SourceCollectionClass * klass) { +static void +source_collection_class_init (SourceCollectionClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" source_collection_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1667,20 +1761,24 @@ static void source_collection_class_init (SourceCollectionClass * klass) { source_collection_signals[SOURCE_COLLECTION_UNLINKED_DESTROYED_SIGNAL] = g_signal_new ("unlinked-destroyed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, unlinked_destroyed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" source_collection_signals[SOURCE_COLLECTION_BACKLINK_REMOVED_SIGNAL] = g_signal_new ("backlink-removed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, backlink_removed), NULL, NULL, g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT, G_TYPE_NONE, 2, TYPE_SOURCE_BACKLINK, GEE_TYPE_COLLECTION); -#line 1671 "SourceCollection.c" +#line 1765 "SourceCollection.c" } -static void source_collection_instance_init (SourceCollection * self) { +static void +source_collection_instance_init (SourceCollection * self) +{ #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self->priv = SOURCE_COLLECTION_GET_PRIVATE (self); #line 48 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self->priv->backlinks = NULL; -#line 1680 "SourceCollection.c" +#line 1776 "SourceCollection.c" } -static void source_collection_finalize (DataCollection * obj) { +static void +source_collection_finalize (DataCollection * obj) +{ SourceCollection * self; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SOURCE_COLLECTION, SourceCollection); @@ -1688,11 +1786,13 @@ static void source_collection_finalize (DataCollection * obj) { _g_object_unref0 (self->priv->backlinks); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" DATA_COLLECTION_CLASS (source_collection_parent_class)->finalize (obj); -#line 1692 "SourceCollection.c" +#line 1790 "SourceCollection.c" } -GType source_collection_get_type (void) { +GType +source_collection_get_type (void) +{ static volatile gsize source_collection_type_id__volatile = 0; if (g_once_init_enter (&source_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SourceCollection), 0, (GInstanceInitFunc) source_collection_instance_init, NULL }; diff --git a/src/core/SourceHoldingTank.c b/src/core/SourceHoldingTank.c index 7d92788..809af37 100644 --- a/src/core/SourceHoldingTank.c +++ b/src/core/SourceHoldingTank.c @@ -1,4 +1,4 @@ -/* SourceHoldingTank.c generated by valac 0.36.6, the Vala compiler +/* SourceHoldingTank.c generated by valac 0.40.4, the Vala compiler * generated from SourceHoldingTank.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -23,6 +23,7 @@ /* moved into more than one holding tank, or which should have preference. The CheckToRemove*/ /* predicate is offered only to know when to release them.*/ + #include #include #include @@ -136,9 +137,9 @@ typedef struct _SingletonCollectionClass SingletonCollectionClass; typedef struct _ParamSpecSourceHoldingTank ParamSpecSourceHoldingTank; enum { SOURCE_HOLDING_TANK_CONTENTS_ALTERED_SIGNAL, - SOURCE_HOLDING_TANK_LAST_SIGNAL + SOURCE_HOLDING_TANK_NUM_SIGNALS }; -static guint source_holding_tank_signals[SOURCE_HOLDING_TANK_LAST_SIGNAL] = {0}; +static guint source_holding_tank_signals[SOURCE_HOLDING_TANK_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -190,316 +191,392 @@ static gpointer source_holding_tank_parent_class = NULL; gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer data_set_ref (gpointer instance); void data_set_unref (gpointer instance); -GParamSpec* param_spec_data_set (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_set (GValue* value, gpointer v_object); -void value_take_data_set (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_set (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_set (GValue* value, + gpointer v_object); +void value_take_data_set (GValue* value, + gpointer v_object); gpointer value_get_data_set (const GValue* value); GType data_set_get_type (void) G_GNUC_CONST; #define SOURCE_HOLDING_TANK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SOURCE_HOLDING_TANK, SourceHoldingTankPrivate)) -enum { - SOURCE_HOLDING_TANK_DUMMY_PROPERTY -}; -static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, DataSource* source); -static void _source_holding_tank_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); +static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, + DataSource* source); +static void _source_holding_tank_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank* self); -static void _source_holding_tank_on_source_collection_thawed_data_collection_thawed (DataCollection* _sender, gpointer self); +static void _source_holding_tank_on_source_collection_thawed_data_collection_thawed (DataCollection* _sender, + gpointer self); DataSet* data_set_new (void); DataSet* data_set_construct (GType object_type); -SourceHoldingTank* source_holding_tank_new (SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target); -SourceHoldingTank* source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target); -void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed); -static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed); -void data_source_notify_held_in_tank (DataSource* self, SourceHoldingTank* holding_tank); +SourceHoldingTank* source_holding_tank_new (SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target); +SourceHoldingTank* source_holding_tank_construct (GType object_type, + SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target); +void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, + GeeCollection* added, + GeeCollection* removed); +static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank* self, + GeeCollection* added, + GeeCollection* removed); +void data_source_notify_held_in_tank (DataSource* self, + SourceHoldingTank* holding_tank); gint source_holding_tank_get_count (SourceHoldingTank* self); gint data_set_get_count (DataSet* self); GeeCollection* source_holding_tank_get_all (SourceHoldingTank* self); GeeList* data_set_get_all (DataSet* self); -gboolean source_holding_tank_contains (SourceHoldingTank* self, DataSource* source); -gboolean data_set_contains (DataSet* self, DataObject* object); -void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many); -void data_object_internal_set_ordinal (DataObject* self, gint64 ordinal); -gboolean data_set_add_many (DataSet* self, GeeCollection* objects); -void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection* unlink); +gboolean source_holding_tank_contains (SourceHoldingTank* self, + DataSource* source); +gboolean data_set_contains (DataSet* self, + DataObject* object); +void source_holding_tank_add_many (SourceHoldingTank* self, + GeeCollection* many); +void data_object_internal_set_ordinal (DataObject* self, + gint64 ordinal); +gboolean data_set_add_many (DataSet* self, + GeeCollection* objects); +void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, + GeeCollection* unlink); GType marker_get_type (void) G_GNUC_CONST; -GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* marker, ProgressMonitor monitor, void* monitor_target); -Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects); +GeeCollection* source_collection_unlink_marked (SourceCollection* self, + Marker* marker, + ProgressMonitor monitor, + void* monitor_target); +Marker* data_collection_mark_many (DataCollection* self, + GeeCollection* objects); gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; -gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBacklink* backlink); -DataObject* data_set_get_at (DataSet* self, gint index); -gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink); -void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklink* backlink); -gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink); -void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* destroy, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed); -gboolean data_set_remove_many (DataSet* self, GeeCollection* objects); -gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing); -gboolean data_set_remove (DataSet* self, DataObject* object); -SingletonCollection* singleton_collection_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object); -SingletonCollection* singleton_collection_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object); +gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, + SourceBacklink* backlink); +DataObject* data_set_get_at (DataSet* self, + gint index); +gboolean data_source_has_backlink (DataSource* self, + SourceBacklink* backlink); +void source_holding_tank_remove_backlink (SourceHoldingTank* self, + SourceBacklink* backlink); +gboolean data_source_remove_backlink (DataSource* self, + SourceBacklink* backlink); +void source_holding_tank_destroy_orphans (SourceHoldingTank* self, + GeeList* destroy, + gboolean delete_backing, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_removed); +gboolean data_set_remove_many (DataSet* self, + GeeCollection* objects); +gboolean data_source_destroy_orphan (DataSource* self, + gboolean delete_backing); +gboolean data_set_remove (DataSet* self, + DataObject* object); +SingletonCollection* singleton_collection_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + gconstpointer object); +SingletonCollection* singleton_collection_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + gconstpointer object); GType singleton_collection_get_type (void) G_GNUC_CONST; -void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataSource* source, Alteration* alteration); +void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, + DataSource* source, + Alteration* alteration); gchar* data_object_to_string (DataObject* self); gchar* source_holding_tank_to_string (SourceHoldingTank* self); gboolean data_collection_are_notifications_frozen (DataCollection* self); -void source_collection_relink (SourceCollection* self, DataSource* source); -void source_collection_relink_many (SourceCollection* self, GeeCollection* relink); -static void source_holding_tank_real_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed); -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); +void source_collection_relink (SourceCollection* self, + DataSource* source); +void source_collection_relink_many (SourceCollection* self, + GeeCollection* relink); +static void source_holding_tank_real_contents_altered (SourceHoldingTank* self, + GeeCollection* added, + GeeCollection* removed); +static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); static void source_holding_tank_finalize (SourceHoldingTank * obj); -static void _source_holding_tank_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +static void +_source_holding_tank_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self) +{ #line 48 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" source_holding_tank_on_source_destroyed ((SourceHoldingTank*) self, source); -#line 284 "SourceHoldingTank.c" +#line 371 "SourceHoldingTank.c" } -static void _source_holding_tank_on_source_collection_thawed_data_collection_thawed (DataCollection* _sender, gpointer self) { +static void +_source_holding_tank_on_source_collection_thawed_data_collection_thawed (DataCollection* _sender, + gpointer self) +{ #line 49 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" source_holding_tank_on_source_collection_thawed ((SourceHoldingTank*) self); -#line 291 "SourceHoldingTank.c" +#line 381 "SourceHoldingTank.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 40 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return self ? data_collection_ref (self) : NULL; -#line 298 "SourceHoldingTank.c" +#line 390 "SourceHoldingTank.c" } -SourceHoldingTank* source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target) { +SourceHoldingTank* +source_holding_tank_construct (GType object_type, + SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target) +{ SourceHoldingTank* self = NULL; SourceCollection* _tmp0_; SourceCollection* _tmp1_; - SourceHoldingTankCheckToKeep _tmp2_; - void* _tmp2__target; - SourceCollection* _tmp3_; - SourceCollection* _tmp4_; + SourceCollection* _tmp2_; #line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL); #line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" self = (SourceHoldingTank*) g_type_create_instance (object_type); #line 40 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp0_ = sources; -#line 40 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp1_ = _data_collection_ref0 (_tmp0_); + _tmp0_ = _data_collection_ref0 (sources); #line 40 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _data_collection_unref0 (self->priv->sources); #line 40 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - self->priv->sources = _tmp1_; -#line 41 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = check_to_keep; -#line 41 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2__target = check_to_keep_target; + self->priv->sources = _tmp0_; #line 41 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - self->priv->check_to_keep = _tmp2_; + self->priv->check_to_keep = check_to_keep; #line 41 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - self->priv->check_to_keep_target = _tmp2__target; + self->priv->check_to_keep_target = check_to_keep_target; #line 43 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp3_ = self->priv->sources; + _tmp1_ = self->priv->sources; #line 43 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - g_signal_connect (_tmp3_, "item-destroyed", (GCallback) _source_holding_tank_on_source_destroyed_source_collection_item_destroyed, self); + g_signal_connect (_tmp1_, "item-destroyed", (GCallback) _source_holding_tank_on_source_destroyed_source_collection_item_destroyed, self); #line 44 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp4_ = self->priv->sources; + _tmp2_ = self->priv->sources; #line 44 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), "thawed", (GCallback) _source_holding_tank_on_source_collection_thawed_data_collection_thawed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), "thawed", (GCallback) _source_holding_tank_on_source_collection_thawed_data_collection_thawed, self); #line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return self; -#line 340 "SourceHoldingTank.c" +#line 428 "SourceHoldingTank.c" } -SourceHoldingTank* source_holding_tank_new (SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target) { +SourceHoldingTank* +source_holding_tank_new (SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target) +{ #line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return source_holding_tank_construct (TYPE_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target); -#line 347 "SourceHoldingTank.c" +#line 439 "SourceHoldingTank.c" } -static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed) { - GeeCollection* _tmp0_; - GeeCollection* _tmp8_; - GeeCollection* _tmp16_; - GeeCollection* _tmp17_; +static void +source_holding_tank_real_notify_contents_altered (SourceHoldingTank* self, + GeeCollection* added, + GeeCollection* removed) +{ #line 52 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); #line 52 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 54 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp0_ = added; -#line 54 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (_tmp0_ != NULL) { -#line 364 "SourceHoldingTank.c" + if (added != NULL) { +#line 454 "SourceHoldingTank.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; -#line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp1_ = added; + GeeIterator* _tmp0_; #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_ITERABLE, GeeIterable)); #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _source_it = _tmp2_; + _source_it = _tmp0_; #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 377 "SourceHoldingTank.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 464 "SourceHoldingTank.c" + GeeIterator* _tmp1_; DataSource* source = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - DataSource* _tmp7_; + GeeIterator* _tmp2_; + gpointer _tmp3_; + DataSource* _tmp4_; #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp3_ = _source_it; + _tmp1_ = _source_it; #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp4_ = gee_iterator_next (_tmp3_); -#line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 392 "SourceHoldingTank.c" +#line 476 "SourceHoldingTank.c" } #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp5_ = _source_it; + _tmp2_ = _source_it; #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source = (DataSource*) _tmp6_; + source = (DataSource*) _tmp3_; #line 56 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp7_ = source; + _tmp4_ = source; #line 56 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - data_source_notify_held_in_tank (_tmp7_, self); + data_source_notify_held_in_tank (_tmp4_, self); #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (source); -#line 406 "SourceHoldingTank.c" +#line 490 "SourceHoldingTank.c" } #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (_source_it); -#line 410 "SourceHoldingTank.c" +#line 494 "SourceHoldingTank.c" } } #line 59 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp8_ = removed; -#line 59 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (_tmp8_ != NULL) { -#line 417 "SourceHoldingTank.c" + if (removed != NULL) { +#line 499 "SourceHoldingTank.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp9_; - GeeIterator* _tmp10_; -#line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp9_ = removed; + GeeIterator* _tmp5_; #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_ITERABLE, GeeIterable)); #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _source_it = _tmp10_; + _source_it = _tmp5_; #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 430 "SourceHoldingTank.c" - GeeIterator* _tmp11_; - gboolean _tmp12_; +#line 509 "SourceHoldingTank.c" + GeeIterator* _tmp6_; DataSource* source = NULL; - GeeIterator* _tmp13_; - gpointer _tmp14_; - DataSource* _tmp15_; -#line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp11_ = _source_it; + GeeIterator* _tmp7_; + gpointer _tmp8_; + DataSource* _tmp9_; #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp12_ = gee_iterator_next (_tmp11_); + _tmp6_ = _source_it; #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!_tmp12_) { + if (!gee_iterator_next (_tmp6_)) { #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 445 "SourceHoldingTank.c" +#line 521 "SourceHoldingTank.c" } #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp13_ = _source_it; + _tmp7_ = _source_it; #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp14_ = gee_iterator_get (_tmp13_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source = (DataSource*) _tmp14_; + source = (DataSource*) _tmp8_; #line 61 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp15_ = source; + _tmp9_ = source; #line 61 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - data_source_notify_held_in_tank (_tmp15_, NULL); + data_source_notify_held_in_tank (_tmp9_, NULL); #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (source); -#line 459 "SourceHoldingTank.c" +#line 535 "SourceHoldingTank.c" } #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (_source_it); -#line 463 "SourceHoldingTank.c" +#line 539 "SourceHoldingTank.c" } } #line 64 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp16_ = added; -#line 64 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp17_ = removed; -#line 64 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - g_signal_emit (self, source_holding_tank_signals[SOURCE_HOLDING_TANK_CONTENTS_ALTERED_SIGNAL], 0, _tmp16_, _tmp17_); -#line 472 "SourceHoldingTank.c" + g_signal_emit (self, source_holding_tank_signals[SOURCE_HOLDING_TANK_CONTENTS_ALTERED_SIGNAL], 0, added, removed); +#line 544 "SourceHoldingTank.c" } -void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed) { +void +source_holding_tank_notify_contents_altered (SourceHoldingTank* self, + GeeCollection* added, + GeeCollection* removed) +{ #line 52 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (IS_SOURCE_HOLDING_TANK (self)); #line 52 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" SOURCE_HOLDING_TANK_GET_CLASS (self)->notify_contents_altered (self, added, removed); -#line 481 "SourceHoldingTank.c" +#line 557 "SourceHoldingTank.c" } -gint source_holding_tank_get_count (SourceHoldingTank* self) { +gint +source_holding_tank_get_count (SourceHoldingTank* self) +{ gint result = 0; DataSet* _tmp0_; - gint _tmp1_; #line 67 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), 0); #line 68 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp0_ = self->priv->tank; #line 68 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp1_ = data_set_get_count (_tmp0_); -#line 68 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - result = _tmp1_; + result = data_set_get_count (_tmp0_); #line 68 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return result; -#line 499 "SourceHoldingTank.c" +#line 574 "SourceHoldingTank.c" } -GeeCollection* source_holding_tank_get_all (SourceHoldingTank* self) { +GeeCollection* +source_holding_tank_get_all (SourceHoldingTank* self) +{ GeeCollection* result = NULL; DataSet* _tmp0_; GeeList* _tmp1_; @@ -513,16 +590,17 @@ GeeCollection* source_holding_tank_get_all (SourceHoldingTank* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); #line 72 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return result; -#line 517 "SourceHoldingTank.c" +#line 594 "SourceHoldingTank.c" } -gboolean source_holding_tank_contains (SourceHoldingTank* self, DataSource* source) { +gboolean +source_holding_tank_contains (SourceHoldingTank* self, + DataSource* source) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; DataSet* _tmp1_; - DataSource* _tmp2_; - gboolean _tmp3_; #line 75 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), FALSE); #line 75 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -530,279 +608,232 @@ gboolean source_holding_tank_contains (SourceHoldingTank* self, DataSource* sour #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp1_ = self->priv->tank; #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = source; -#line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp3_ = data_set_contains (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject)); -#line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (_tmp3_) { + if (data_set_contains (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject))) { #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp0_ = TRUE; -#line 541 "SourceHoldingTank.c" +#line 615 "SourceHoldingTank.c" } else { - GeeHashSet* _tmp4_; - DataSource* _tmp5_; - gboolean _tmp6_; -#line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp4_ = self->priv->unlinking; -#line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp5_ = source; + GeeHashSet* _tmp2_; #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp6_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_); + _tmp2_ = self->priv->unlinking; #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp0_ = _tmp6_; -#line 554 "SourceHoldingTank.c" + _tmp0_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), source); +#line 622 "SourceHoldingTank.c" } #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" result = _tmp0_; #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return result; -#line 560 "SourceHoldingTank.c" +#line 628 "SourceHoldingTank.c" } -void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many) { - GeeCollection* _tmp0_; +void +source_holding_tank_add_many (SourceHoldingTank* self, + GeeCollection* many) +{ + gint _tmp0_; gint _tmp1_; - gint _tmp2_; gboolean added = FALSE; - DataSet* _tmp11_; - GeeCollection* _tmp12_; - gboolean _tmp13_; - gboolean _tmp14_; - GeeCollection* _tmp15_; + DataSet* _tmp8_; + gboolean _tmp9_; #line 80 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (IS_SOURCE_HOLDING_TANK (self)); #line 80 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (GEE_IS_COLLECTION (many)); #line 81 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp0_ = many; -#line 81 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp0_ = gee_collection_get_size (many); #line 81 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 81 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 82 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 588 "SourceHoldingTank.c" +#line 653 "SourceHoldingTank.c" } { GeeIterator* _source_it = NULL; - GeeCollection* _tmp3_; - GeeIterator* _tmp4_; -#line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp3_ = many; + GeeIterator* _tmp2_; #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (many, GEE_TYPE_ITERABLE, GeeIterable)); #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _source_it = _tmp4_; + _source_it = _tmp2_; #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 602 "SourceHoldingTank.c" - GeeIterator* _tmp5_; - gboolean _tmp6_; +#line 664 "SourceHoldingTank.c" + GeeIterator* _tmp3_; DataSource* source = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; - DataSource* _tmp9_; - gint64 _tmp10_; -#line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp5_ = _source_it; + GeeIterator* _tmp4_; + gpointer _tmp5_; + DataSource* _tmp6_; + gint64 _tmp7_; #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp6_ = gee_iterator_next (_tmp5_); + _tmp3_ = _source_it; #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp3_)) { #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 618 "SourceHoldingTank.c" +#line 677 "SourceHoldingTank.c" } #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp7_ = _source_it; + _tmp4_ = _source_it; #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source = (DataSource*) _tmp8_; + source = (DataSource*) _tmp5_; #line 85 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp9_ = source; + _tmp6_ = source; #line 85 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp10_ = self->priv->ordinal; + _tmp7_ = self->priv->ordinal; #line 85 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - self->priv->ordinal = _tmp10_ + 1; + self->priv->ordinal = _tmp7_ + 1; #line 85 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - data_object_internal_set_ordinal (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject), _tmp10_); + data_object_internal_set_ordinal (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_OBJECT, DataObject), _tmp7_); #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (source); -#line 636 "SourceHoldingTank.c" +#line 695 "SourceHoldingTank.c" } #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (_source_it); -#line 640 "SourceHoldingTank.c" +#line 699 "SourceHoldingTank.c" } #line 87 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp11_ = self->priv->tank; -#line 87 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp12_ = many; -#line 87 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp13_ = data_set_add_many (_tmp11_, _tmp12_); + _tmp8_ = self->priv->tank; #line 87 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - added = _tmp13_; + added = data_set_add_many (_tmp8_, many); #line 88 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp14_ = added; + _tmp9_ = added; #line 88 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _vala_assert (_tmp14_, "added"); + _vala_assert (_tmp9_, "added"); #line 90 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp15_ = many; -#line 90 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source_holding_tank_notify_contents_altered (self, _tmp15_, NULL); -#line 658 "SourceHoldingTank.c" + source_holding_tank_notify_contents_altered (self, many, NULL); +#line 711 "SourceHoldingTank.c" } -void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection* unlink) { - GeeCollection* _tmp0_; +void +source_holding_tank_unlink_and_hold (SourceHoldingTank* self, + GeeCollection* unlink) +{ + gint _tmp0_; gint _tmp1_; - gint _tmp2_; - GeeHashSet* _tmp3_; - GeeCollection* _tmp4_; - SourceCollection* _tmp5_; - SourceCollection* _tmp6_; + GeeHashSet* _tmp2_; + SourceCollection* _tmp3_; + SourceCollection* _tmp4_; + Marker* _tmp5_; + Marker* _tmp6_; GeeCollection* _tmp7_; - Marker* _tmp8_; - Marker* _tmp9_; - GeeCollection* _tmp10_; - GeeCollection* _tmp11_; + GeeCollection* _tmp8_; gboolean added = FALSE; - DataSet* _tmp20_; - GeeCollection* _tmp21_; - gboolean _tmp22_; - gboolean _tmp23_; - GeeHashSet* _tmp24_; - GeeCollection* _tmp25_; - GeeCollection* _tmp26_; + DataSet* _tmp15_; + gboolean _tmp16_; + GeeHashSet* _tmp17_; #line 95 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (IS_SOURCE_HOLDING_TANK (self)); #line 95 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (GEE_IS_COLLECTION (unlink)); #line 96 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp0_ = unlink; -#line 96 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp0_ = gee_collection_get_size (unlink); #line 96 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 96 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 97 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 697 "SourceHoldingTank.c" +#line 744 "SourceHoldingTank.c" } #line 100 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp3_ = self->priv->unlinking; -#line 100 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp4_ = unlink; + _tmp2_ = self->priv->unlinking; #line 100 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), _tmp4_); + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), unlink); #line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp5_ = self->priv->sources; -#line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp6_ = self->priv->sources; + _tmp3_ = self->priv->sources; #line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp7_ = unlink; + _tmp4_ = self->priv->sources; #line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp8_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), _tmp7_); + _tmp5_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), unlink); #line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp10_ = source_collection_unlink_marked (_tmp5_, _tmp9_, NULL, NULL); + _tmp7_ = source_collection_unlink_marked (_tmp3_, _tmp6_, NULL, NULL); #line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp8_); #line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _g_object_unref0 (_tmp9_); -#line 723 "SourceHoldingTank.c" + _g_object_unref0 (_tmp6_); +#line 766 "SourceHoldingTank.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp12_; - GeeIterator* _tmp13_; -#line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp12_ = unlink; + GeeIterator* _tmp9_; #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (unlink, GEE_TYPE_ITERABLE, GeeIterable)); #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _source_it = _tmp13_; + _source_it = _tmp9_; #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 736 "SourceHoldingTank.c" - GeeIterator* _tmp14_; - gboolean _tmp15_; +#line 776 "SourceHoldingTank.c" + GeeIterator* _tmp10_; DataSource* source = NULL; - GeeIterator* _tmp16_; - gpointer _tmp17_; - DataSource* _tmp18_; - gint64 _tmp19_; -#line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp14_ = _source_it; + GeeIterator* _tmp11_; + gpointer _tmp12_; + DataSource* _tmp13_; + gint64 _tmp14_; #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp15_ = gee_iterator_next (_tmp14_); + _tmp10_ = _source_it; #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!_tmp15_) { + if (!gee_iterator_next (_tmp10_)) { #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 752 "SourceHoldingTank.c" +#line 789 "SourceHoldingTank.c" } #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp16_ = _source_it; + _tmp11_ = _source_it; #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp17_ = gee_iterator_get (_tmp16_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source = (DataSource*) _tmp17_; + source = (DataSource*) _tmp12_; #line 105 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp18_ = source; + _tmp13_ = source; #line 105 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp19_ = self->priv->ordinal; + _tmp14_ = self->priv->ordinal; #line 105 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - self->priv->ordinal = _tmp19_ + 1; + self->priv->ordinal = _tmp14_ + 1; #line 105 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - data_object_internal_set_ordinal (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_OBJECT, DataObject), _tmp19_); + data_object_internal_set_ordinal (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject), _tmp14_); #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (source); -#line 770 "SourceHoldingTank.c" +#line 807 "SourceHoldingTank.c" } #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (_source_it); -#line 774 "SourceHoldingTank.c" +#line 811 "SourceHoldingTank.c" } #line 107 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp20_ = self->priv->tank; -#line 107 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp21_ = unlink; -#line 107 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp22_ = data_set_add_many (_tmp20_, _tmp21_); + _tmp15_ = self->priv->tank; #line 107 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - added = _tmp22_; + added = data_set_add_many (_tmp15_, unlink); #line 108 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp23_ = added; + _tmp16_ = added; #line 108 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _vala_assert (_tmp23_, "added"); -#line 111 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp24_ = self->priv->unlinking; + _vala_assert (_tmp16_, "added"); #line 111 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp25_ = unlink; + _tmp17_ = self->priv->unlinking; #line 111 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_); + gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection), unlink); #line 113 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp26_ = unlink; -#line 113 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source_holding_tank_notify_contents_altered (self, _tmp26_, NULL); -#line 798 "SourceHoldingTank.c" + source_holding_tank_notify_contents_altered (self, unlink, NULL); +#line 827 "SourceHoldingTank.c" } -gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBacklink* backlink) { +gboolean +source_holding_tank_has_backlink (SourceHoldingTank* self, + SourceBacklink* backlink) +{ gboolean result = FALSE; gint count = 0; DataSet* _tmp0_; - gint _tmp1_; #line 116 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), FALSE); #line 116 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -810,76 +841,68 @@ gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBackli #line 117 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp0_ = self->priv->tank; #line 117 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp1_ = data_set_get_count (_tmp0_); -#line 117 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - count = _tmp1_; -#line 817 "SourceHoldingTank.c" + count = data_set_get_count (_tmp0_); +#line 846 "SourceHoldingTank.c" { gint ctr = 0; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" ctr = 0; -#line 822 "SourceHoldingTank.c" +#line 851 "SourceHoldingTank.c" { - gboolean _tmp2_ = FALSE; + gboolean _tmp1_ = FALSE; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = TRUE; + _tmp1_ = TRUE; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 829 "SourceHoldingTank.c" +#line 858 "SourceHoldingTank.c" + gint _tmp3_; gint _tmp4_; - gint _tmp5_; - DataSet* _tmp6_; - gint _tmp7_; - DataObject* _tmp8_; - DataSource* _tmp9_; - SourceBacklink* _tmp10_; - gboolean _tmp11_; - gboolean _tmp12_; + DataSet* _tmp5_; + gint _tmp6_; + DataObject* _tmp7_; + DataSource* _tmp8_; + gboolean _tmp9_; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!_tmp2_) { -#line 841 "SourceHoldingTank.c" - gint _tmp3_; + if (!_tmp1_) { +#line 868 "SourceHoldingTank.c" + gint _tmp2_; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp3_ = ctr; + _tmp2_ = ctr; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - ctr = _tmp3_ + 1; -#line 847 "SourceHoldingTank.c" + ctr = _tmp2_ + 1; +#line 874 "SourceHoldingTank.c" } #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = FALSE; + _tmp1_ = FALSE; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp4_ = ctr; + _tmp3_ = ctr; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp5_ = count; + _tmp4_ = count; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!(_tmp4_ < _tmp5_)) { + if (!(_tmp3_ < _tmp4_)) { #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 859 "SourceHoldingTank.c" +#line 886 "SourceHoldingTank.c" } #line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp6_ = self->priv->tank; -#line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp7_ = ctr; + _tmp5_ = self->priv->tank; #line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp8_ = data_set_get_at (_tmp6_, _tmp7_); + _tmp6_ = ctr; #line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource); + _tmp7_ = data_set_get_at (_tmp5_, _tmp6_); #line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp10_ = backlink; + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource); #line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp11_ = data_source_has_backlink (_tmp9_, _tmp10_); + _tmp9_ = data_source_has_backlink (_tmp8_, backlink); #line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp12_ = _tmp11_; + _g_object_unref0 (_tmp8_); #line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _g_object_unref0 (_tmp9_); -#line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (_tmp12_) { + if (_tmp9_) { #line 120 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" result = TRUE; #line 120 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return result; -#line 883 "SourceHoldingTank.c" +#line 906 "SourceHoldingTank.c" } } } @@ -888,14 +911,16 @@ gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBackli result = FALSE; #line 123 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return result; -#line 892 "SourceHoldingTank.c" +#line 915 "SourceHoldingTank.c" } -void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklink* backlink) { +void +source_holding_tank_remove_backlink (SourceHoldingTank* self, + SourceBacklink* backlink) +{ gint count = 0; DataSet* _tmp0_; - gint _tmp1_; #line 126 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (IS_SOURCE_HOLDING_TANK (self)); #line 126 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -903,86 +928,83 @@ void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklin #line 127 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp0_ = self->priv->tank; #line 127 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp1_ = data_set_get_count (_tmp0_); -#line 127 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - count = _tmp1_; -#line 910 "SourceHoldingTank.c" + count = data_set_get_count (_tmp0_); +#line 933 "SourceHoldingTank.c" { gint ctr = 0; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" ctr = 0; -#line 915 "SourceHoldingTank.c" +#line 938 "SourceHoldingTank.c" { - gboolean _tmp2_ = FALSE; + gboolean _tmp1_ = FALSE; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = TRUE; + _tmp1_ = TRUE; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 922 "SourceHoldingTank.c" +#line 945 "SourceHoldingTank.c" + gint _tmp3_; gint _tmp4_; - gint _tmp5_; - DataSet* _tmp6_; - gint _tmp7_; - DataObject* _tmp8_; - DataSource* _tmp9_; - SourceBacklink* _tmp10_; + DataSet* _tmp5_; + gint _tmp6_; + DataObject* _tmp7_; + DataSource* _tmp8_; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!_tmp2_) { -#line 932 "SourceHoldingTank.c" - gint _tmp3_; + if (!_tmp1_) { +#line 954 "SourceHoldingTank.c" + gint _tmp2_; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp3_ = ctr; + _tmp2_ = ctr; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - ctr = _tmp3_ + 1; -#line 938 "SourceHoldingTank.c" + ctr = _tmp2_ + 1; +#line 960 "SourceHoldingTank.c" } #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = FALSE; + _tmp1_ = FALSE; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp4_ = ctr; + _tmp3_ = ctr; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp5_ = count; + _tmp4_ = count; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!(_tmp4_ < _tmp5_)) { + if (!(_tmp3_ < _tmp4_)) { #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 950 "SourceHoldingTank.c" +#line 972 "SourceHoldingTank.c" } #line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp6_ = self->priv->tank; + _tmp5_ = self->priv->tank; #line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp7_ = ctr; + _tmp6_ = ctr; #line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp8_ = data_set_get_at (_tmp6_, _tmp7_); + _tmp7_ = data_set_get_at (_tmp5_, _tmp6_); #line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource); + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource); #line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp10_ = backlink; + data_source_remove_backlink (_tmp8_, backlink); #line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - data_source_remove_backlink (_tmp9_, _tmp10_); -#line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _g_object_unref0 (_tmp9_); -#line 966 "SourceHoldingTank.c" + _g_object_unref0 (_tmp8_); +#line 986 "SourceHoldingTank.c" } } } } -void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* destroy, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed) { - GeeList* _tmp0_; +void +source_holding_tank_destroy_orphans (SourceHoldingTank* self, + GeeList* destroy, + gboolean delete_backing, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_removed) +{ + gint _tmp0_; gint _tmp1_; - gint _tmp2_; gboolean removed = FALSE; - DataSet* _tmp3_; - GeeList* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; - GeeList* _tmp7_; + DataSet* _tmp2_; + gboolean _tmp3_; gint count = 0; - GeeList* _tmp8_; - gint _tmp9_; - gint _tmp10_; + gint _tmp4_; + gint _tmp5_; #line 132 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (IS_SOURCE_HOLDING_TANK (self)); #line 132 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -990,165 +1012,125 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest #line 132 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail ((not_removed == NULL) || GEE_IS_LIST (not_removed)); #line 134 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp0_ = destroy; -#line 134 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp0_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (destroy, GEE_TYPE_COLLECTION, GeeCollection)); #line 134 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 134 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 135 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 1003 "SourceHoldingTank.c" +#line 1023 "SourceHoldingTank.c" } #line 137 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp3_ = self->priv->tank; + _tmp2_ = self->priv->tank; #line 137 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp4_ = destroy; -#line 137 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp5_ = data_set_remove_many (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 137 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - removed = _tmp5_; + removed = data_set_remove_many (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (destroy, GEE_TYPE_COLLECTION, GeeCollection)); #line 138 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp6_ = removed; + _tmp3_ = removed; #line 138 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _vala_assert (_tmp6_, "removed"); -#line 140 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp7_ = destroy; + _vala_assert (_tmp3_, "removed"); #line 140 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); + source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (destroy, GEE_TYPE_COLLECTION, GeeCollection)); #line 142 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp8_ = destroy; + _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (destroy, GEE_TYPE_COLLECTION, GeeCollection)); #line 142 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp5_ = _tmp4_; #line 142 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp10_ = _tmp9_; -#line 142 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - count = _tmp10_; -#line 1029 "SourceHoldingTank.c" + count = _tmp5_; +#line 1041 "SourceHoldingTank.c" { gint ctr = 0; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" ctr = 0; -#line 1034 "SourceHoldingTank.c" +#line 1046 "SourceHoldingTank.c" { - gboolean _tmp11_ = FALSE; + gboolean _tmp6_ = FALSE; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp11_ = TRUE; + _tmp6_ = TRUE; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 1041 "SourceHoldingTank.c" - gint _tmp13_; - gint _tmp14_; +#line 1053 "SourceHoldingTank.c" + gint _tmp8_; + gint _tmp9_; DataSource* source = NULL; - GeeList* _tmp15_; - gint _tmp16_; - gpointer _tmp17_; - DataSource* _tmp18_; - gboolean _tmp19_; - gboolean _tmp20_; - ProgressMonitor _tmp24_; - void* _tmp24__target; + gint _tmp10_; + gpointer _tmp11_; + DataSource* _tmp12_; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!_tmp11_) { -#line 1055 "SourceHoldingTank.c" - gint _tmp12_; + if (!_tmp6_) { +#line 1062 "SourceHoldingTank.c" + gint _tmp7_; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp12_ = ctr; + _tmp7_ = ctr; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - ctr = _tmp12_ + 1; -#line 1061 "SourceHoldingTank.c" + ctr = _tmp7_ + 1; +#line 1068 "SourceHoldingTank.c" } #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp11_ = FALSE; + _tmp6_ = FALSE; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp13_ = ctr; + _tmp8_ = ctr; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp14_ = count; + _tmp9_ = count; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!(_tmp13_ < _tmp14_)) { + if (!(_tmp8_ < _tmp9_)) { #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 1073 "SourceHoldingTank.c" +#line 1080 "SourceHoldingTank.c" } #line 144 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp15_ = destroy; -#line 144 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp16_ = ctr; + _tmp10_ = ctr; #line 144 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp17_ = gee_list_get (_tmp15_, _tmp16_); + _tmp11_ = gee_list_get (destroy, _tmp10_); #line 144 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source = (DataSource*) _tmp17_; -#line 145 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp18_ = source; -#line 145 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp19_ = delete_backing; + source = (DataSource*) _tmp11_; #line 145 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp20_ = data_source_destroy_orphan (_tmp18_, _tmp19_); + _tmp12_ = source; #line 145 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!_tmp20_) { -#line 1091 "SourceHoldingTank.c" - GeeList* _tmp21_; + if (!data_source_destroy_orphan (_tmp12_, delete_backing)) { #line 146 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp21_ = not_removed; -#line 146 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (NULL != _tmp21_) { -#line 1097 "SourceHoldingTank.c" - GeeList* _tmp22_; - DataSource* _tmp23_; -#line 147 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp22_ = not_removed; + if (NULL != not_removed) { +#line 1094 "SourceHoldingTank.c" + DataSource* _tmp13_; #line 147 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp23_ = source; + _tmp13_ = source; #line 147 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_); -#line 1106 "SourceHoldingTank.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (not_removed, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_); +#line 1100 "SourceHoldingTank.c" } } #line 150 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp24_ = monitor; -#line 150 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp24__target = monitor_target; -#line 150 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (_tmp24_ != NULL) { -#line 1115 "SourceHoldingTank.c" - ProgressMonitor _tmp25_; - void* _tmp25__target; - gint _tmp26_; - gint _tmp27_; + if (monitor != NULL) { +#line 1105 "SourceHoldingTank.c" + gint _tmp14_; + gint _tmp15_; #line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp25_ = monitor; + _tmp14_ = ctr; #line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp25__target = monitor_target; + _tmp15_ = count; #line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp26_ = ctr; -#line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp27_ = count; -#line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp25_ ((guint64) (_tmp26_ + 1), (guint64) _tmp27_, TRUE, _tmp25__target); -#line 1130 "SourceHoldingTank.c" + monitor ((guint64) (_tmp14_ + 1), (guint64) _tmp15_, TRUE, monitor_target); +#line 1114 "SourceHoldingTank.c" } #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (source); -#line 1134 "SourceHoldingTank.c" +#line 1118 "SourceHoldingTank.c" } } } } -static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, DataSource* source) { +static void +source_holding_tank_on_source_destroyed (SourceHoldingTank* self, + DataSource* source) +{ DataSet* _tmp0_; - DataSource* _tmp1_; - gboolean _tmp2_; gboolean removed = FALSE; - DataSet* _tmp3_; - DataSource* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; - DataSource* _tmp7_; - SingletonCollection* _tmp8_; - SingletonCollection* _tmp9_; + DataSet* _tmp1_; + gboolean _tmp2_; + SingletonCollection* _tmp3_; + SingletonCollection* _tmp4_; #line 155 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (IS_SOURCE_HOLDING_TANK (self)); #line 155 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1156,62 +1138,46 @@ static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, Da #line 156 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp0_ = self->priv->tank; #line 156 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp1_ = source; -#line 156 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = data_set_contains (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); -#line 156 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!_tmp2_) { + if (!data_set_contains (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject))) { #line 157 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 1167 "SourceHoldingTank.c" +#line 1145 "SourceHoldingTank.c" } #line 159 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp3_ = self->priv->tank; -#line 159 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp4_ = source; -#line 159 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp5_ = data_set_remove (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject)); + _tmp1_ = self->priv->tank; #line 159 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - removed = _tmp5_; + removed = data_set_remove (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 160 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp6_ = removed; + _tmp2_ = removed; #line 160 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _vala_assert (_tmp6_, "removed"); -#line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp7_ = source; + _vala_assert (_tmp2_, "removed"); #line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp8_ = singleton_collection_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp7_); + _tmp3_ = singleton_collection_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, source); #line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp9_ = _tmp8_; + _tmp4_ = _tmp3_; #line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection)); + source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); #line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _g_object_unref0 (_tmp9_); -#line 1191 "SourceHoldingTank.c" + _g_object_unref0 (_tmp4_); +#line 1163 "SourceHoldingTank.c" } -void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataSource* source, Alteration* alteration) { +void +source_holding_tank_internal_notify_altered (SourceHoldingTank* self, + DataSource* source, + Alteration* alteration) +{ DataSet* _tmp0_; - DataSource* _tmp1_; - gboolean _tmp2_; - SourceHoldingTankCheckToKeep _tmp8_; - void* _tmp8__target; - DataSource* _tmp9_; - Alteration* _tmp10_; - gboolean _tmp11_; + SourceHoldingTankCheckToKeep _tmp5_; + void* _tmp5__target; gboolean removed = FALSE; - DataSet* _tmp12_; - DataSource* _tmp13_; - gboolean _tmp14_; - gboolean _tmp15_; - SourceCollection* _tmp16_; - gboolean _tmp17_; - DataSource* _tmp20_; - SingletonCollection* _tmp21_; - SingletonCollection* _tmp22_; - SourceCollection* _tmp23_; - DataSource* _tmp24_; + DataSet* _tmp6_; + gboolean _tmp7_; + SourceCollection* _tmp8_; + SingletonCollection* _tmp10_; + SingletonCollection* _tmp11_; + SourceCollection* _tmp12_; #line 166 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (IS_SOURCE_HOLDING_TANK (self)); #line 166 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1221,113 +1187,91 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS #line 167 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp0_ = self->priv->tank; #line 167 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp1_ = source; -#line 167 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = data_set_contains (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); -#line 167 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!_tmp2_) { -#line 1230 "SourceHoldingTank.c" - DataSource* _tmp3_; + if (!data_set_contains (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject))) { +#line 1192 "SourceHoldingTank.c" + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; -#line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp3_ = source; #line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); + _tmp1_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp6_ = source_holding_tank_to_string (self); + _tmp3_ = source_holding_tank_to_string (self); #line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_debug ("SourceHoldingTank.vala:168: SourceHoldingTank.internal_notify_altered " \ -"called for %s not stored in %s", _tmp5_, _tmp7_); +"called for %s not stored in %s", _tmp2_, _tmp4_); #line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp4_); #line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp2_); #line 171 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 1254 "SourceHoldingTank.c" +#line 1213 "SourceHoldingTank.c" } #line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp8_ = self->priv->check_to_keep; -#line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp8__target = self->priv->check_to_keep_target; -#line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp9_ = source; + _tmp5_ = self->priv->check_to_keep; #line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp10_ = alteration; + _tmp5__target = self->priv->check_to_keep_target; #line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp11_ = _tmp8_ (_tmp9_, _tmp10_, _tmp8__target); -#line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (_tmp11_) { + if (_tmp5_ (source, alteration, _tmp5__target)) { #line 176 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 1270 "SourceHoldingTank.c" +#line 1223 "SourceHoldingTank.c" } #line 178 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp12_ = self->priv->tank; -#line 178 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp13_ = source; + _tmp6_ = self->priv->tank; #line 178 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp14_ = data_set_remove (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject)); -#line 178 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - removed = _tmp14_; + removed = data_set_remove (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 179 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp15_ = removed; + _tmp7_ = removed; #line 179 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _vala_assert (_tmp15_, "removed"); -#line 181 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp16_ = self->priv->sources; + _vala_assert (_tmp7_, "removed"); #line 181 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp17_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp8_ = self->priv->sources; #line 181 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (_tmp17_) { -#line 1290 "SourceHoldingTank.c" - GeeHashSet* _tmp18_; - DataSource* _tmp19_; + if (data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection))) { +#line 1237 "SourceHoldingTank.c" + GeeHashSet* _tmp9_; #line 182 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp18_ = self->priv->relinks; + _tmp9_ = self->priv->relinks; #line 182 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp19_ = source; -#line 182 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), source); #line 184 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 1301 "SourceHoldingTank.c" +#line 1245 "SourceHoldingTank.c" } #line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp20_ = source; -#line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp21_ = singleton_collection_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp20_); + _tmp10_ = singleton_collection_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, source); #line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp22_ = _tmp21_; + _tmp11_ = _tmp10_; #line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection)); + source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); #line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _g_object_unref0 (_tmp22_); -#line 189 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp23_ = self->priv->sources; + _g_object_unref0 (_tmp11_); #line 189 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp24_ = source; + _tmp12_ = self->priv->sources; #line 189 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source_collection_relink (_tmp23_, _tmp24_); -#line 1319 "SourceHoldingTank.c" + source_collection_relink (_tmp12_, source); +#line 1259 "SourceHoldingTank.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 197 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return self ? g_object_ref (self) : NULL; -#line 1326 "SourceHoldingTank.c" +#line 1268 "SourceHoldingTank.c" } -static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank* self) { +static void +source_holding_tank_on_source_collection_thawed (SourceHoldingTank* self) +{ GeeHashSet* _tmp0_; gint _tmp1_; gint _tmp2_; @@ -1350,7 +1294,7 @@ static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank* if (_tmp2_ == 0) { #line 194 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 1353 "SourceHoldingTank.c" +#line 1297 "SourceHoldingTank.c" } #line 197 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp3_ = self->priv->relinks; @@ -1376,11 +1320,13 @@ static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank* source_collection_relink_many (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); #line 192 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (copy); -#line 1379 "SourceHoldingTank.c" +#line 1323 "SourceHoldingTank.c" } -gchar* source_holding_tank_to_string (SourceHoldingTank* self) { +gchar* +source_holding_tank_to_string (SourceHoldingTank* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 205 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1391,20 +1337,31 @@ gchar* source_holding_tank_to_string (SourceHoldingTank* self) { result = _tmp0_; #line 206 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return result; -#line 1394 "SourceHoldingTank.c" +#line 1340 "SourceHoldingTank.c" } -static void source_holding_tank_real_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed) { +static void +source_holding_tank_real_contents_altered (SourceHoldingTank* self, + GeeCollection* added, + GeeCollection* removed) +{ #line 35 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); #line 35 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 1403 "SourceHoldingTank.c" +#line 1353 "SourceHoldingTank.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2); register GMarshalFunc_VOID__OBJECT_OBJECT callback; register GCClosure * cc; @@ -1419,120 +1376,145 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa data1 = closure->data; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" data2 = param_values->data[0].v_pointer; -#line 1422 "SourceHoldingTank.c" +#line 1379 "SourceHoldingTank.c" } else { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" data1 = param_values->data[0].v_pointer; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" data2 = closure->data; -#line 1428 "SourceHoldingTank.c" +#line 1385 "SourceHoldingTank.c" } #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 1434 "SourceHoldingTank.c" +#line 1391 "SourceHoldingTank.c" } -static void value_source_holding_tank_init (GValue* value) { +static void +value_source_holding_tank_init (GValue* value) +{ #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" value->data[0].v_pointer = NULL; -#line 1441 "SourceHoldingTank.c" +#line 1400 "SourceHoldingTank.c" } -static void value_source_holding_tank_free_value (GValue* value) { +static void +value_source_holding_tank_free_value (GValue* value) +{ #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (value->data[0].v_pointer) { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" source_holding_tank_unref (value->data[0].v_pointer); -#line 1450 "SourceHoldingTank.c" +#line 1411 "SourceHoldingTank.c" } } -static void value_source_holding_tank_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_source_holding_tank_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (src_value->data[0].v_pointer) { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" dest_value->data[0].v_pointer = source_holding_tank_ref (src_value->data[0].v_pointer); -#line 1460 "SourceHoldingTank.c" +#line 1424 "SourceHoldingTank.c" } else { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" dest_value->data[0].v_pointer = NULL; -#line 1464 "SourceHoldingTank.c" +#line 1428 "SourceHoldingTank.c" } } -static gpointer value_source_holding_tank_peek_pointer (const GValue* value) { +static gpointer +value_source_holding_tank_peek_pointer (const GValue* value) +{ #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return value->data[0].v_pointer; -#line 1472 "SourceHoldingTank.c" +#line 1438 "SourceHoldingTank.c" } -static gchar* value_source_holding_tank_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_source_holding_tank_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (collect_values[0].v_pointer) { -#line 1479 "SourceHoldingTank.c" +#line 1450 "SourceHoldingTank.c" SourceHoldingTank * object; object = collect_values[0].v_pointer; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (object->parent_instance.g_class == NULL) { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1486 "SourceHoldingTank.c" +#line 1457 "SourceHoldingTank.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.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 1490 "SourceHoldingTank.c" +#line 1461 "SourceHoldingTank.c" } #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" value->data[0].v_pointer = source_holding_tank_ref (object); -#line 1494 "SourceHoldingTank.c" +#line 1465 "SourceHoldingTank.c" } else { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" value->data[0].v_pointer = NULL; -#line 1498 "SourceHoldingTank.c" +#line 1469 "SourceHoldingTank.c" } #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return NULL; -#line 1502 "SourceHoldingTank.c" +#line 1473 "SourceHoldingTank.c" } -static gchar* value_source_holding_tank_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_source_holding_tank_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ SourceHoldingTank ** object_p; object_p = collect_values[0].v_pointer; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (!object_p) { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1513 "SourceHoldingTank.c" +#line 1489 "SourceHoldingTank.c" } #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (!value->data[0].v_pointer) { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" *object_p = NULL; -#line 1519 "SourceHoldingTank.c" +#line 1495 "SourceHoldingTank.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" *object_p = value->data[0].v_pointer; -#line 1523 "SourceHoldingTank.c" +#line 1499 "SourceHoldingTank.c" } else { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" *object_p = source_holding_tank_ref (value->data[0].v_pointer); -#line 1527 "SourceHoldingTank.c" +#line 1503 "SourceHoldingTank.c" } #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return NULL; -#line 1531 "SourceHoldingTank.c" +#line 1507 "SourceHoldingTank.c" } -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecSourceHoldingTank* spec; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_SOURCE_HOLDING_TANK), NULL); @@ -1542,20 +1524,25 @@ GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick G_PARAM_SPEC (spec)->value_type = object_type; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return G_PARAM_SPEC (spec); -#line 1545 "SourceHoldingTank.c" +#line 1527 "SourceHoldingTank.c" } -gpointer value_get_source_holding_tank (const GValue* value) { +gpointer +value_get_source_holding_tank (const GValue* value) +{ #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_HOLDING_TANK), NULL); #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return value->data[0].v_pointer; -#line 1554 "SourceHoldingTank.c" +#line 1538 "SourceHoldingTank.c" } -void value_set_source_holding_tank (GValue* value, gpointer v_object) { +void +value_set_source_holding_tank (GValue* value, + gpointer v_object) +{ SourceHoldingTank * old; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_HOLDING_TANK)); @@ -1571,22 +1558,25 @@ void value_set_source_holding_tank (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" source_holding_tank_ref (value->data[0].v_pointer); -#line 1574 "SourceHoldingTank.c" +#line 1561 "SourceHoldingTank.c" } else { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" value->data[0].v_pointer = NULL; -#line 1578 "SourceHoldingTank.c" +#line 1565 "SourceHoldingTank.c" } #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (old) { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" source_holding_tank_unref (old); -#line 1584 "SourceHoldingTank.c" +#line 1571 "SourceHoldingTank.c" } } -void value_take_source_holding_tank (GValue* value, gpointer v_object) { +void +value_take_source_holding_tank (GValue* value, + gpointer v_object) +{ SourceHoldingTank * old; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_HOLDING_TANK)); @@ -1600,22 +1590,24 @@ void value_take_source_holding_tank (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" value->data[0].v_pointer = v_object; -#line 1603 "SourceHoldingTank.c" +#line 1593 "SourceHoldingTank.c" } else { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" value->data[0].v_pointer = NULL; -#line 1607 "SourceHoldingTank.c" +#line 1597 "SourceHoldingTank.c" } #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (old) { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" source_holding_tank_unref (old); -#line 1613 "SourceHoldingTank.c" +#line 1603 "SourceHoldingTank.c" } } -static void source_holding_tank_class_init (SourceHoldingTankClass * klass) { +static void +source_holding_tank_class_init (SourceHoldingTankClass * klass) +{ #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" source_holding_tank_parent_class = g_type_class_peek_parent (klass); #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1628,11 +1620,13 @@ static void source_holding_tank_class_init (SourceHoldingTankClass * klass) { ((SourceHoldingTankClass *) klass)->contents_altered = source_holding_tank_real_contents_altered; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" source_holding_tank_signals[SOURCE_HOLDING_TANK_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("contents-altered", TYPE_SOURCE_HOLDING_TANK, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceHoldingTankClass, contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_COLLECTION, GEE_TYPE_COLLECTION); -#line 1631 "SourceHoldingTank.c" +#line 1623 "SourceHoldingTank.c" } -static void source_holding_tank_instance_init (SourceHoldingTank * self) { +static void +source_holding_tank_instance_init (SourceHoldingTank * self) +{ DataSet* _tmp0_; GeeHashSet* _tmp1_; GeeHashSet* _tmp2_; @@ -1654,11 +1648,13 @@ static void source_holding_tank_instance_init (SourceHoldingTank * self) { self->priv->ordinal = (gint64) 0; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" self->ref_count = 1; -#line 1657 "SourceHoldingTank.c" +#line 1651 "SourceHoldingTank.c" } -static void source_holding_tank_finalize (SourceHoldingTank * obj) { +static void +source_holding_tank_finalize (SourceHoldingTank * obj) +{ SourceHoldingTank * self; SourceCollection* _tmp0_; guint _tmp1_; @@ -1688,11 +1684,13 @@ static void source_holding_tank_finalize (SourceHoldingTank * obj) { _g_object_unref0 (self->priv->relinks); #line 32 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (self->priv->unlinking); -#line 1691 "SourceHoldingTank.c" +#line 1687 "SourceHoldingTank.c" } -GType source_holding_tank_get_type (void) { +GType +source_holding_tank_get_type (void) +{ static volatile gsize source_holding_tank_type_id__volatile = 0; if (g_once_init_enter (&source_holding_tank_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_source_holding_tank_init, value_source_holding_tank_free_value, value_source_holding_tank_copy_value, value_source_holding_tank_peek_pointer, "p", value_source_holding_tank_collect_value, "p", value_source_holding_tank_lcopy_value }; @@ -1706,7 +1704,9 @@ GType source_holding_tank_get_type (void) { } -gpointer source_holding_tank_ref (gpointer instance) { +gpointer +source_holding_tank_ref (gpointer instance) +{ SourceHoldingTank * self; self = instance; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1717,7 +1717,9 @@ gpointer source_holding_tank_ref (gpointer instance) { } -void source_holding_tank_unref (gpointer instance) { +void +source_holding_tank_unref (gpointer instance) +{ SourceHoldingTank * self; self = instance; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1726,7 +1728,7 @@ void source_holding_tank_unref (gpointer instance) { SOURCE_HOLDING_TANK_GET_CLASS (self)->finalize (self); #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1729 "SourceHoldingTank.c" +#line 1731 "SourceHoldingTank.c" } } diff --git a/src/core/SourceInterfaces.c b/src/core/SourceInterfaces.c index cc43f4e..a68996d 100644 --- a/src/core/SourceInterfaces.c +++ b/src/core/SourceInterfaces.c @@ -1,4 +1,4 @@ -/* SourceInterfaces.c generated by valac 0.36.6, the Vala compiler +/* SourceInterfaces.c generated by valac 0.40.4, the Vala compiler * generated from SourceInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -16,6 +16,7 @@ /* When the indexable string has changed, the object should fire an alteration of*/ /* "indexable:keywords". The prepare methods will not do this.*/ + #include #include #include @@ -66,91 +67,77 @@ const gchar* indexable_get_indexable_keywords (Indexable* self); gchar* indexable_prepare_indexable_string (const gchar* str); gboolean is_string_empty (const gchar* s); gchar* string_remove_diacritics (const gchar* istring); -gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1); +gchar* indexable_prepare_indexable_strings (gchar** strs, + int strs_length1); -const gchar* indexable_get_indexable_keywords (Indexable* self) { +const gchar* +indexable_get_indexable_keywords (Indexable* self) +{ #line 19 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" g_return_val_if_fail (IS_INDEXABLE (self), NULL); #line 19 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" return INDEXABLE_GET_INTERFACE (self)->get_indexable_keywords (self); -#line 78 "SourceInterfaces.c" +#line 82 "SourceInterfaces.c" } -gchar* indexable_prepare_indexable_string (const gchar* str) { +gchar* +indexable_prepare_indexable_string (const gchar* str) +{ gchar* result = NULL; - const gchar* _tmp0_; - gboolean _tmp1_; - const gchar* _tmp2_; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; -#line 22 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp0_ = str; -#line 22 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp1_ = is_string_empty (_tmp0_); #line 22 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - if (_tmp1_) { + if (is_string_empty (str)) { #line 23 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" result = NULL; #line 23 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" return result; -#line 101 "SourceInterfaces.c" +#line 100 "SourceInterfaces.c" } #line 24 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp2_ = str; + _tmp0_ = g_utf8_strdown (str, (gssize) -1); #line 24 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp3_ = g_utf8_strdown (_tmp2_, (gssize) -1); + _tmp1_ = _tmp0_; #line 24 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp4_ = _tmp3_; + _tmp2_ = string_remove_diacritics (_tmp1_); #line 24 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp5_ = string_remove_diacritics (_tmp4_); + _tmp3_ = _tmp2_; #line 24 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp6_ = _tmp5_; + _g_free0 (_tmp1_); #line 24 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _g_free0 (_tmp4_); -#line 24 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - result = _tmp6_; + result = _tmp3_; #line 24 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" return result; -#line 119 "SourceInterfaces.c" +#line 116 "SourceInterfaces.c" } -gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) { +gchar* +indexable_prepare_indexable_strings (gchar** strs, + int strs_length1) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; - gchar** _tmp1_; - gint _tmp1__length1; GString* builder = NULL; - GString* _tmp3_; + GString* _tmp1_; gint ctr = 0; - const gchar* _tmp21_ = NULL; - GString* _tmp22_; - const gchar* _tmp23_; - gboolean _tmp24_; - gchar* _tmp27_; -#line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp1_ = strs; + const gchar* _tmp14_ = NULL; + GString* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp19_; #line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp1__length1 = strs_length1; -#line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - if (_tmp1_ == NULL) { + if (strs == NULL) { #line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" _tmp0_ = TRUE; -#line 144 "SourceInterfaces.c" +#line 137 "SourceInterfaces.c" } else { - gchar** _tmp2_; - gint _tmp2__length1; -#line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp2_ = strs; -#line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp2__length1 = strs_length1; #line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp0_ = _tmp2__length1 == 0; -#line 154 "SourceInterfaces.c" + _tmp0_ = strs_length1 == 0; +#line 141 "SourceInterfaces.c" } #line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" if (_tmp0_) { @@ -158,161 +145,136 @@ gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) { result = NULL; #line 29 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" return result; -#line 162 "SourceInterfaces.c" +#line 149 "SourceInterfaces.c" } #line 31 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp3_ = g_string_new (""); + _tmp1_ = g_string_new (""); #line 31 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - builder = _tmp3_; + builder = _tmp1_; #line 32 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" ctr = 0; -#line 170 "SourceInterfaces.c" +#line 157 "SourceInterfaces.c" { - gboolean _tmp4_ = FALSE; + gboolean _tmp2_ = FALSE; #line 33 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp4_ = TRUE; + _tmp2_ = TRUE; #line 33 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" while (TRUE) { -#line 177 "SourceInterfaces.c" - gchar** _tmp8_; - gint _tmp8__length1; - gint _tmp9_; - const gchar* _tmp10_; - gboolean _tmp11_; +#line 164 "SourceInterfaces.c" + gint _tmp5_; + const gchar* _tmp6_; #line 33 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - if (!_tmp4_) { -#line 185 "SourceInterfaces.c" - gint _tmp5_; - gint _tmp6_; - gchar** _tmp7_; - gint _tmp7__length1; -#line 39 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp5_ = ctr; -#line 39 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - ctr = _tmp5_ + 1; + if (!_tmp2_) { +#line 169 "SourceInterfaces.c" + gint _tmp3_; + gint _tmp4_; #line 39 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp6_ = ctr; + _tmp3_ = ctr; #line 39 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp7_ = strs; + ctr = _tmp3_ + 1; #line 39 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp7__length1 = strs_length1; + _tmp4_ = ctr; #line 39 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - if (!(_tmp6_ < _tmp7__length1)) { + if (!(_tmp4_ < strs_length1)) { #line 39 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" break; -#line 204 "SourceInterfaces.c" +#line 182 "SourceInterfaces.c" } } #line 33 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp4_ = FALSE; + _tmp2_ = FALSE; #line 34 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp8_ = strs; + _tmp5_ = ctr; #line 34 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp8__length1 = strs_length1; + _tmp6_ = strs[_tmp5_]; #line 34 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp9_ = ctr; -#line 34 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp10_ = _tmp8_[_tmp9_]; -#line 34 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp11_ = is_string_empty (_tmp10_); -#line 34 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - if (!_tmp11_) { -#line 221 "SourceInterfaces.c" - GString* _tmp12_; - gchar** _tmp13_; - gint _tmp13__length1; - gint _tmp14_; - const gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; - gint _tmp18_; - gchar** _tmp19_; - gint _tmp19__length1; -#line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp12_ = builder; -#line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp13_ = strs; + if (!is_string_empty (_tmp6_)) { +#line 193 "SourceInterfaces.c" + GString* _tmp7_; + gint _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + gint _tmp12_; #line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp13__length1 = strs_length1; + _tmp7_ = builder; #line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp14_ = ctr; + _tmp8_ = ctr; #line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp15_ = _tmp13_[_tmp14_]; + _tmp9_ = strs[_tmp8_]; #line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp16_ = g_utf8_strdown (_tmp15_, (gssize) -1); + _tmp10_ = g_utf8_strdown (_tmp9_, (gssize) -1); #line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp17_ = _tmp16_; + _tmp11_ = _tmp10_; #line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - g_string_append (_tmp12_, _tmp17_); + g_string_append (_tmp7_, _tmp11_); #line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp11_); #line 36 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp18_ = ctr; + _tmp12_ = ctr; #line 36 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp19_ = strs; -#line 36 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp19__length1 = strs_length1; -#line 36 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - if (_tmp18_ < (_tmp19__length1 - 1)) { -#line 258 "SourceInterfaces.c" - GString* _tmp20_; + if (_tmp12_ < (strs_length1 - 1)) { +#line 218 "SourceInterfaces.c" + GString* _tmp13_; #line 37 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp20_ = builder; + _tmp13_ = builder; #line 37 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - g_string_append_c (_tmp20_, ' '); -#line 264 "SourceInterfaces.c" + g_string_append_c (_tmp13_, ' '); +#line 224 "SourceInterfaces.c" } } } } #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp22_ = builder; + _tmp15_ = builder; #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp23_ = _tmp22_->str; + _tmp16_ = _tmp15_->str; #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp24_ = is_string_empty (_tmp23_); + if (!is_string_empty (_tmp16_)) { +#line 235 "SourceInterfaces.c" + GString* _tmp17_; + const gchar* _tmp18_; #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - if (!_tmp24_) { -#line 277 "SourceInterfaces.c" - GString* _tmp25_; - const gchar* _tmp26_; + _tmp17_ = builder; #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp25_ = builder; + _tmp18_ = _tmp17_->str; #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp26_ = _tmp25_->str; -#line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp21_ = _tmp26_; -#line 286 "SourceInterfaces.c" + _tmp14_ = _tmp18_; +#line 244 "SourceInterfaces.c" } else { #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp21_ = NULL; -#line 290 "SourceInterfaces.c" + _tmp14_ = NULL; +#line 248 "SourceInterfaces.c" } #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp27_ = g_strdup (_tmp21_); + _tmp19_ = g_strdup (_tmp14_); #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - result = _tmp27_; + result = _tmp19_; #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" _g_string_free0 (builder); #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" return result; -#line 300 "SourceInterfaces.c" +#line 258 "SourceInterfaces.c" } -static void indexable_base_init (IndexableIface * iface) { +static void +indexable_base_init (IndexableIface * iface) +{ #line 18 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" static gboolean initialized = FALSE; #line 18 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" if (!initialized) { #line 18 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" initialized = TRUE; -#line 311 "SourceInterfaces.c" +#line 271 "SourceInterfaces.c" } } -GType indexable_get_type (void) { +GType +indexable_get_type (void) +{ static volatile gsize indexable_type_id__volatile = 0; if (g_once_init_enter (&indexable_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (IndexableIface), (GBaseInitFunc) indexable_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; diff --git a/src/core/Tracker.c b/src/core/Tracker.c index ff1dc00..3e3aee8 100644 --- a/src/core/Tracker.c +++ b/src/core/Tracker.c @@ -1,4 +1,4 @@ -/* Tracker.c generated by valac 0.36.6, the Vala compiler +/* Tracker.c generated by valac 0.40.4, the Vala compiler * generated from Tracker.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -67,9 +68,9 @@ typedef struct _DataCollectionClass DataCollectionClass; typedef struct _CoreParamSpecTracker CoreParamSpecTracker; enum { CORE_TRACKER_UPDATED_SIGNAL, - CORE_TRACKER_LAST_SIGNAL + CORE_TRACKER_NUM_SIGNALS }; -static guint core_tracker_signals[CORE_TRACKER_LAST_SIGNAL] = {0}; +static guint core_tracker_signals[CORE_TRACKER_NUM_SIGNALS] = {0}; #define CORE_TYPE_VIEW_TRACKER (core_view_tracker_get_type ()) #define CORE_VIEW_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CORE_TYPE_VIEW_TRACKER, CoreViewTracker)) @@ -112,6 +113,11 @@ typedef struct _ViewCollectionClass ViewCollectionClass; typedef struct _DataView DataView; typedef struct _DataViewClass DataViewClass; typedef struct _CoreViewTrackerMuxPrivate CoreViewTrackerMuxPrivate; +enum { + CORE_VIEW_TRACKER_MUX_0_PROPERTY, + CORE_VIEW_TRACKER_MUX_NUM_PROPERTIES +}; +static GParamSpec* core_view_tracker_mux_properties[CORE_VIEW_TRACKER_MUX_NUM_PROPERTIES]; #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; } @@ -181,123 +187,193 @@ static CoreTrackerAccumulatorIface * core_view_tracker_mux_core_tracker_accumula GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType core_tracker_accumulator_get_type (void) G_GNUC_CONST; -gboolean core_tracker_accumulator_include (CoreTrackerAccumulator* self, DataObject* object); -gboolean core_tracker_accumulator_uninclude (CoreTrackerAccumulator* self, DataObject* object); -gboolean core_tracker_accumulator_altered (CoreTrackerAccumulator* self, DataObject* object, Alteration* alteration); +gboolean core_tracker_accumulator_include (CoreTrackerAccumulator* self, + DataObject* object); +gboolean core_tracker_accumulator_uninclude (CoreTrackerAccumulator* self, + DataObject* object); +gboolean core_tracker_accumulator_altered (CoreTrackerAccumulator* self, + DataObject* object, + Alteration* alteration); gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; #define CORE_TRACKER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CORE_TYPE_TRACKER, CoreTrackerPrivate)) -enum { - CORE_TRACKER_DUMMY_PROPERTY -}; -static void core_tracker_on_items_added (CoreTracker* self, GeeIterable* added); -static void _core_tracker_on_items_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self); -static void core_tracker_on_items_removed (CoreTracker* self, GeeIterable* removed); -static void _core_tracker_on_items_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self); -static void core_tracker_on_items_altered (CoreTracker* self, GeeMap* map); -static void _core_tracker_on_items_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); -CoreTracker* core_tracker_new (DataCollection* collection, GeeCollection* initial); -CoreTracker* core_tracker_construct (GType object_type, DataCollection* collection, GeeCollection* initial); -void core_tracker_start (CoreTracker* self, CoreTrackerAccumulator* acc); +static void core_tracker_on_items_added (CoreTracker* self, + GeeIterable* added); +static void _core_tracker_on_items_added_data_collection_items_added (DataCollection* _sender, + GeeIterable* added, + gpointer self); +static void core_tracker_on_items_removed (CoreTracker* self, + GeeIterable* removed); +static void _core_tracker_on_items_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self); +static void core_tracker_on_items_altered (CoreTracker* self, + GeeMap* map); +static void _core_tracker_on_items_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); +CoreTracker* core_tracker_new (DataCollection* collection, + GeeCollection* initial); +CoreTracker* core_tracker_construct (GType object_type, + DataCollection* collection, + GeeCollection* initial); +void core_tracker_start (CoreTracker* self, + CoreTrackerAccumulator* acc); GeeCollection* data_collection_get_all (DataCollection* self); DataCollection* core_tracker_get_collection (CoreTracker* self); -void core_tracker_include_uninclude (CoreTracker* self, GeeIterable* objects, CoreTrackerIncludeUnincludeObject cb, void* cb_target); -static gboolean _core_tracker_accumulator_include_core_tracker_include_uninclude_object (DataObject* object, gpointer self); -static gboolean _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object (DataObject* object, gpointer self); +void core_tracker_include_uninclude (CoreTracker* self, + GeeIterable* objects, + CoreTrackerIncludeUnincludeObject cb, + void* cb_target); +static gboolean _core_tracker_accumulator_include_core_tracker_include_uninclude_object (DataObject* object, + gpointer self); +static gboolean _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object (DataObject* object, + gpointer self); static void core_tracker_real_updated (CoreTracker* self); static void core_tracker_finalize (CoreTracker * obj); GType core_view_tracker_get_type (void) G_GNUC_CONST; static GType core_view_tracker_mux_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define CORE_VIEW_TRACKER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CORE_TYPE_VIEW_TRACKER, CoreViewTrackerPrivate)) -enum { - CORE_VIEW_TRACKER_DUMMY_PROPERTY -}; GType view_collection_get_type (void) G_GNUC_CONST; GType data_view_get_type (void) G_GNUC_CONST; -static void core_view_tracker_on_items_shown (CoreViewTracker* self, GeeCollection* shown); -static void _core_view_tracker_on_items_shown_view_collection_items_shown (ViewCollection* _sender, GeeCollection* visible, gpointer self); -static void core_view_tracker_on_items_hidden (CoreViewTracker* self, GeeCollection* hidden); -static void _core_view_tracker_on_items_hidden_view_collection_items_hidden (ViewCollection* _sender, GeeCollection* hidden, gpointer self); -static void core_view_tracker_on_items_selected (CoreViewTracker* self, GeeIterable* selected); -static void _core_view_tracker_on_items_selected_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self); -static void core_view_tracker_on_items_unselected (CoreViewTracker* self, GeeIterable* unselected); -static void _core_view_tracker_on_items_unselected_view_collection_items_unselected (ViewCollection* _sender, GeeIterable* unselected, gpointer self); +static void core_view_tracker_on_items_shown (CoreViewTracker* self, + GeeCollection* shown); +static void _core_view_tracker_on_items_shown_view_collection_items_shown (ViewCollection* _sender, + GeeCollection* visible, + gpointer self); +static void core_view_tracker_on_items_hidden (CoreViewTracker* self, + GeeCollection* hidden); +static void _core_view_tracker_on_items_hidden_view_collection_items_hidden (ViewCollection* _sender, + GeeCollection* hidden, + gpointer self); +static void core_view_tracker_on_items_selected (CoreViewTracker* self, + GeeIterable* selected); +static void _core_view_tracker_on_items_selected_view_collection_items_selected (ViewCollection* _sender, + GeeIterable* selected, + gpointer self); +static void core_view_tracker_on_items_unselected (CoreViewTracker* self, + GeeIterable* unselected); +static void _core_view_tracker_on_items_unselected_view_collection_items_unselected (ViewCollection* _sender, + GeeIterable* unselected, + gpointer self); CoreViewTracker* core_view_tracker_new (ViewCollection* collection); -CoreViewTracker* core_view_tracker_construct (GType object_type, ViewCollection* collection); +CoreViewTracker* core_view_tracker_construct (GType object_type, + ViewCollection* collection); GeeCollection* view_collection_get_all_unfiltered (ViewCollection* self); -void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected); -static CoreViewTrackerMux* core_view_tracker_mux_new (CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected); -static CoreViewTrackerMux* core_view_tracker_mux_construct (GType object_type, CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected); -enum { - CORE_VIEW_TRACKER_MUX_DUMMY_PROPERTY -}; -static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base, DataObject* object); +void core_view_tracker_start (CoreViewTracker* self, + CoreTrackerAccumulator* all, + CoreTrackerAccumulator* visible, + CoreTrackerAccumulator* selected); +static CoreViewTrackerMux* core_view_tracker_mux_new (CoreTrackerAccumulator* all, + CoreTrackerAccumulator* visible, + CoreTrackerAccumulator* selected); +static CoreViewTrackerMux* core_view_tracker_mux_construct (GType object_type, + CoreTrackerAccumulator* all, + CoreTrackerAccumulator* visible, + CoreTrackerAccumulator* selected); +static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base, + DataObject* object); gboolean data_view_is_visible (DataView* self); gboolean data_view_is_selected (DataView* self); -static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* base, DataObject* object); -static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base, DataObject* object, Alteration* alteration); +static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* base, + DataObject* object); +static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base, + DataObject* object, + Alteration* alteration); static void core_view_tracker_mux_finalize (GObject * obj); static void core_view_tracker_finalize (CoreTracker * obj); -gboolean core_tracker_accumulator_include (CoreTrackerAccumulator* self, DataObject* object) { +gboolean +core_tracker_accumulator_include (CoreTrackerAccumulator* self, + DataObject* object) +{ #line 13 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (CORE_IS_TRACKER_ACCUMULATOR (self), FALSE); #line 13 "/home/jens/Source/shotwell/src/core/Tracker.vala" return CORE_TRACKER_ACCUMULATOR_GET_INTERFACE (self)->include (self, object); -#line 267 "Tracker.c" +#line 332 "Tracker.c" } -gboolean core_tracker_accumulator_uninclude (CoreTrackerAccumulator* self, DataObject* object) { +gboolean +core_tracker_accumulator_uninclude (CoreTrackerAccumulator* self, + DataObject* object) +{ #line 15 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (CORE_IS_TRACKER_ACCUMULATOR (self), FALSE); #line 15 "/home/jens/Source/shotwell/src/core/Tracker.vala" return CORE_TRACKER_ACCUMULATOR_GET_INTERFACE (self)->uninclude (self, object); -#line 276 "Tracker.c" +#line 344 "Tracker.c" } -gboolean core_tracker_accumulator_altered (CoreTrackerAccumulator* self, DataObject* object, Alteration* alteration) { +gboolean +core_tracker_accumulator_altered (CoreTrackerAccumulator* self, + DataObject* object, + Alteration* alteration) +{ #line 17 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (CORE_IS_TRACKER_ACCUMULATOR (self), FALSE); #line 17 "/home/jens/Source/shotwell/src/core/Tracker.vala" return CORE_TRACKER_ACCUMULATOR_GET_INTERFACE (self)->altered (self, object, alteration); -#line 285 "Tracker.c" +#line 357 "Tracker.c" } -static void core_tracker_accumulator_base_init (CoreTrackerAccumulatorIface * iface) { +static void +core_tracker_accumulator_base_init (CoreTrackerAccumulatorIface * iface) +{ #line 12 "/home/jens/Source/shotwell/src/core/Tracker.vala" static gboolean initialized = FALSE; #line 12 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (!initialized) { #line 12 "/home/jens/Source/shotwell/src/core/Tracker.vala" initialized = TRUE; -#line 296 "Tracker.c" +#line 370 "Tracker.c" } } -GType core_tracker_accumulator_get_type (void) { +GType +core_tracker_accumulator_get_type (void) +{ static volatile gsize core_tracker_accumulator_type_id__volatile = 0; if (g_once_init_enter (&core_tracker_accumulator_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CoreTrackerAccumulatorIface), (GBaseInitFunc) core_tracker_accumulator_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -310,47 +386,65 @@ GType core_tracker_accumulator_get_type (void) { } -static void _core_tracker_on_items_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self) { +static void +_core_tracker_on_items_added_data_collection_items_added (DataCollection* _sender, + GeeIterable* added, + gpointer self) +{ #line 40 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_tracker_on_items_added ((CoreTracker*) self, added); -#line 317 "Tracker.c" +#line 397 "Tracker.c" } -static void _core_tracker_on_items_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) { +static void +_core_tracker_on_items_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self) +{ #line 41 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_tracker_on_items_removed ((CoreTracker*) self, removed); -#line 324 "Tracker.c" +#line 408 "Tracker.c" } -static void _core_tracker_on_items_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_core_tracker_on_items_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_tracker_on_items_altered ((CoreTracker*) self, items); -#line 331 "Tracker.c" +#line 419 "Tracker.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 34 "/home/jens/Source/shotwell/src/core/Tracker.vala" return self ? data_collection_ref (self) : NULL; -#line 338 "Tracker.c" +#line 428 "Tracker.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 35 "/home/jens/Source/shotwell/src/core/Tracker.vala" return self ? g_object_ref (self) : NULL; -#line 345 "Tracker.c" +#line 437 "Tracker.c" } -CoreTracker* core_tracker_construct (GType object_type, DataCollection* collection, GeeCollection* initial) { +CoreTracker* +core_tracker_construct (GType object_type, + DataCollection* collection, + GeeCollection* initial) +{ CoreTracker* self = NULL; DataCollection* _tmp0_; - DataCollection* _tmp1_; - GeeCollection* _tmp2_; - GeeCollection* _tmp3_; + GeeCollection* _tmp1_; #line 33 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (IS_DATA_COLLECTION (collection), NULL); #line 33 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -358,43 +452,44 @@ CoreTracker* core_tracker_construct (GType object_type, DataCollection* collecti #line 33 "/home/jens/Source/shotwell/src/core/Tracker.vala" self = (CoreTracker*) g_type_create_instance (object_type); #line 34 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp0_ = collection; -#line 34 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = _data_collection_ref0 (_tmp0_); + _tmp0_ = _data_collection_ref0 (collection); #line 34 "/home/jens/Source/shotwell/src/core/Tracker.vala" _data_collection_unref0 (self->priv->collection); #line 34 "/home/jens/Source/shotwell/src/core/Tracker.vala" - self->priv->collection = _tmp1_; -#line 35 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = initial; + self->priv->collection = _tmp0_; #line 35 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (initial); #line 35 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (self->priv->initial); #line 35 "/home/jens/Source/shotwell/src/core/Tracker.vala" - self->priv->initial = _tmp3_; + self->priv->initial = _tmp1_; #line 33 "/home/jens/Source/shotwell/src/core/Tracker.vala" return self; -#line 379 "Tracker.c" +#line 469 "Tracker.c" } -CoreTracker* core_tracker_new (DataCollection* collection, GeeCollection* initial) { +CoreTracker* +core_tracker_new (DataCollection* collection, + GeeCollection* initial) +{ #line 33 "/home/jens/Source/shotwell/src/core/Tracker.vala" return core_tracker_construct (CORE_TYPE_TRACKER, collection, initial); -#line 386 "Tracker.c" +#line 479 "Tracker.c" } -void core_tracker_start (CoreTracker* self, CoreTrackerAccumulator* acc) { +void +core_tracker_start (CoreTracker* self, + CoreTrackerAccumulator* acc) +{ CoreTrackerAccumulator* _tmp0_; CoreTrackerAccumulator* _tmp1_; - CoreTrackerAccumulator* _tmp2_; + DataCollection* _tmp2_; DataCollection* _tmp3_; DataCollection* _tmp4_; - DataCollection* _tmp5_; - gboolean _tmp6_ = FALSE; - GeeCollection* _tmp7_; + gboolean _tmp5_ = FALSE; + GeeCollection* _tmp6_; #line 46 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (CORE_IS_TRACKER (self)); #line 46 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -404,88 +499,88 @@ void core_tracker_start (CoreTracker* self, CoreTrackerAccumulator* acc) { #line 48 "/home/jens/Source/shotwell/src/core/Tracker.vala" _vala_assert (_tmp0_ == NULL, "this.acc == null"); #line 50 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = acc; -#line 50 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (acc); #line 50 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (self->priv->acc); #line 50 "/home/jens/Source/shotwell/src/core/Tracker.vala" - self->priv->acc = _tmp2_; + self->priv->acc = _tmp1_; #line 52 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = self->priv->collection; + _tmp2_ = self->priv->collection; #line 52 "/home/jens/Source/shotwell/src/core/Tracker.vala" - g_signal_connect (_tmp3_, "items-added", (GCallback) _core_tracker_on_items_added_data_collection_items_added, self); + g_signal_connect (_tmp2_, "items-added", (GCallback) _core_tracker_on_items_added_data_collection_items_added, self); #line 53 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = self->priv->collection; + _tmp3_ = self->priv->collection; #line 53 "/home/jens/Source/shotwell/src/core/Tracker.vala" - g_signal_connect (_tmp4_, "items-removed", (GCallback) _core_tracker_on_items_removed_data_collection_items_removed, self); + g_signal_connect (_tmp3_, "items-removed", (GCallback) _core_tracker_on_items_removed_data_collection_items_removed, self); #line 54 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp5_ = self->priv->collection; + _tmp4_ = self->priv->collection; #line 54 "/home/jens/Source/shotwell/src/core/Tracker.vala" - g_signal_connect (_tmp5_, "items-altered", (GCallback) _core_tracker_on_items_altered_data_collection_items_altered, self); + g_signal_connect (_tmp4_, "items-altered", (GCallback) _core_tracker_on_items_altered_data_collection_items_altered, self); #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp7_ = self->priv->initial; + _tmp6_ = self->priv->initial; #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp7_ != NULL) { -#line 431 "Tracker.c" - GeeCollection* _tmp8_; + if (_tmp6_ != NULL) { +#line 524 "Tracker.c" + GeeCollection* _tmp7_; + gint _tmp8_; gint _tmp9_; - gint _tmp10_; #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp8_ = self->priv->initial; + _tmp7_ = self->priv->initial; #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp9_ = gee_collection_get_size (_tmp8_); + _tmp8_ = gee_collection_get_size (_tmp7_); #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp6_ = _tmp10_ > 0; -#line 443 "Tracker.c" + _tmp5_ = _tmp9_ > 0; +#line 536 "Tracker.c" } else { #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp6_ = FALSE; -#line 447 "Tracker.c" + _tmp5_ = FALSE; +#line 540 "Tracker.c" } #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp6_) { -#line 451 "Tracker.c" - GeeCollection* _tmp11_; + if (_tmp5_) { +#line 544 "Tracker.c" + GeeCollection* _tmp10_; #line 57 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp11_ = self->priv->initial; + _tmp10_ = self->priv->initial; #line 57 "/home/jens/Source/shotwell/src/core/Tracker.vala" - core_tracker_on_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 457 "Tracker.c" + core_tracker_on_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); +#line 550 "Tracker.c" } else { - GeeCollection* _tmp12_; + GeeCollection* _tmp11_; #line 58 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp12_ = self->priv->initial; + _tmp11_ = self->priv->initial; #line 58 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp12_ == NULL) { -#line 464 "Tracker.c" - DataCollection* _tmp13_; + if (_tmp11_ == NULL) { +#line 557 "Tracker.c" + DataCollection* _tmp12_; + GeeCollection* _tmp13_; GeeCollection* _tmp14_; - GeeCollection* _tmp15_; #line 59 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp13_ = self->priv->collection; + _tmp12_ = self->priv->collection; #line 59 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp14_ = data_collection_get_all (_tmp13_); + _tmp13_ = data_collection_get_all (_tmp12_); #line 59 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 59 "/home/jens/Source/shotwell/src/core/Tracker.vala" - core_tracker_on_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable)); + core_tracker_on_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable)); #line 59 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _g_object_unref0 (_tmp15_); -#line 478 "Tracker.c" + _g_object_unref0 (_tmp14_); +#line 571 "Tracker.c" } } #line 61 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (self->priv->initial); #line 61 "/home/jens/Source/shotwell/src/core/Tracker.vala" self->priv->initial = NULL; -#line 485 "Tracker.c" +#line 578 "Tracker.c" } -DataCollection* core_tracker_get_collection (CoreTracker* self) { +DataCollection* +core_tracker_get_collection (CoreTracker* self) +{ DataCollection* result = NULL; DataCollection* _tmp0_; DataCollection* _tmp1_; @@ -499,374 +594,388 @@ DataCollection* core_tracker_get_collection (CoreTracker* self) { result = _tmp1_; #line 65 "/home/jens/Source/shotwell/src/core/Tracker.vala" return result; -#line 503 "Tracker.c" +#line 598 "Tracker.c" } -static gboolean _core_tracker_accumulator_include_core_tracker_include_uninclude_object (DataObject* object, gpointer self) { +static gboolean +_core_tracker_accumulator_include_core_tracker_include_uninclude_object (DataObject* object, + gpointer self) +{ gboolean result; result = core_tracker_accumulator_include ((CoreTrackerAccumulator*) self, object); #line 69 "/home/jens/Source/shotwell/src/core/Tracker.vala" return result; -#line 512 "Tracker.c" +#line 610 "Tracker.c" } -static void core_tracker_on_items_added (CoreTracker* self, GeeIterable* added) { - GeeIterable* _tmp0_; - CoreTrackerAccumulator* _tmp1_; +static void +core_tracker_on_items_added (CoreTracker* self, + GeeIterable* added) +{ + CoreTrackerAccumulator* _tmp0_; #line 68 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (CORE_IS_TRACKER (self)); #line 68 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (GEE_IS_ITERABLE (added)); #line 69 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp0_ = added; -#line 69 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = self->priv->acc; + _tmp0_ = self->priv->acc; #line 69 "/home/jens/Source/shotwell/src/core/Tracker.vala" - core_tracker_include_uninclude (self, _tmp0_, _core_tracker_accumulator_include_core_tracker_include_uninclude_object, _tmp1_); -#line 529 "Tracker.c" + core_tracker_include_uninclude (self, added, _core_tracker_accumulator_include_core_tracker_include_uninclude_object, _tmp0_); +#line 627 "Tracker.c" } -static gboolean _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object (DataObject* object, gpointer self) { +static gboolean +_core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object (DataObject* object, + gpointer self) +{ gboolean result; result = core_tracker_accumulator_uninclude ((CoreTrackerAccumulator*) self, object); #line 73 "/home/jens/Source/shotwell/src/core/Tracker.vala" return result; -#line 538 "Tracker.c" +#line 639 "Tracker.c" } -static void core_tracker_on_items_removed (CoreTracker* self, GeeIterable* removed) { - GeeIterable* _tmp0_; - CoreTrackerAccumulator* _tmp1_; +static void +core_tracker_on_items_removed (CoreTracker* self, + GeeIterable* removed) +{ + CoreTrackerAccumulator* _tmp0_; #line 72 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (CORE_IS_TRACKER (self)); #line 72 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); #line 73 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp0_ = removed; -#line 73 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = self->priv->acc; + _tmp0_ = self->priv->acc; #line 73 "/home/jens/Source/shotwell/src/core/Tracker.vala" - core_tracker_include_uninclude (self, _tmp0_, _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object, _tmp1_); -#line 555 "Tracker.c" + core_tracker_include_uninclude (self, removed, _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object, _tmp0_); +#line 656 "Tracker.c" } -void core_tracker_include_uninclude (CoreTracker* self, GeeIterable* objects, CoreTrackerIncludeUnincludeObject cb, void* cb_target) { +void +core_tracker_include_uninclude (CoreTracker* self, + GeeIterable* objects, + CoreTrackerIncludeUnincludeObject cb, + void* cb_target) +{ gboolean fire_updated = FALSE; - gboolean _tmp11_; + gboolean _tmp7_; #line 77 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (CORE_IS_TRACKER (self)); #line 77 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (GEE_IS_ITERABLE (objects)); #line 78 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = FALSE; -#line 568 "Tracker.c" +#line 674 "Tracker.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; -#line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp0_ = objects; + GeeIterator* _tmp0_; #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); + _tmp0_ = gee_iterable_iterator (objects); #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" while (TRUE) { -#line 581 "Tracker.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 684 "Tracker.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - gboolean _tmp6_ = FALSE; - CoreTrackerIncludeUnincludeObject _tmp7_; - void* _tmp7__target; - DataObject* _tmp8_; - gboolean _tmp9_; -#line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = _object_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + gboolean _tmp4_ = FALSE; + DataObject* _tmp5_; #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" break; -#line 600 "Tracker.c" +#line 697 "Tracker.c" } #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" - object = (DataObject*) _tmp5_; -#line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp7_ = cb; -#line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp7__target = cb_target; + object = (DataObject*) _tmp3_; #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp8_ = object; + _tmp5_ = object; #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp9_ = _tmp7_ (_tmp8_, _tmp7__target); + if (cb (_tmp5_, cb_target)) { #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp9_) { -#line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp6_ = TRUE; -#line 620 "Tracker.c" + _tmp4_ = TRUE; +#line 711 "Tracker.c" } else { - gboolean _tmp10_; + gboolean _tmp6_; #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp10_ = fire_updated; + _tmp6_ = fire_updated; #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp6_ = _tmp10_; -#line 627 "Tracker.c" + _tmp4_ = _tmp6_; +#line 718 "Tracker.c" } #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp6_; + fire_updated = _tmp4_; #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (object); -#line 633 "Tracker.c" +#line 724 "Tracker.c" } #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (_object_it); -#line 637 "Tracker.c" +#line 728 "Tracker.c" } #line 82 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp11_ = fire_updated; + _tmp7_ = fire_updated; #line 82 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp11_) { + if (_tmp7_) { #line 83 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_signal_emit (self, core_tracker_signals[CORE_TRACKER_UPDATED_SIGNAL], 0); -#line 645 "Tracker.c" +#line 736 "Tracker.c" } } -static void core_tracker_on_items_altered (CoreTracker* self, GeeMap* map) { +static void +core_tracker_on_items_altered (CoreTracker* self, + GeeMap* map) +{ gboolean fire_updated = FALSE; - gboolean _tmp20_; + gboolean _tmp16_; #line 86 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (CORE_IS_TRACKER (self)); #line 86 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (GEE_IS_MAP (map)); #line 87 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = FALSE; -#line 659 "Tracker.c" +#line 753 "Tracker.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp0_ = map; + _tmp0_ = gee_map_get_keys (map); #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp2_ = _tmp1_; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = _tmp2_; -#line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" while (TRUE) { -#line 686 "Tracker.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 777 "Tracker.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - gboolean _tmp10_ = FALSE; - CoreTrackerAccumulator* _tmp11_; - DataObject* _tmp12_; - GeeMap* _tmp13_; - DataObject* _tmp14_; - gpointer _tmp15_; - Alteration* _tmp16_; - gboolean _tmp17_; - gboolean _tmp18_; -#line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp6_ = _object_it; + GeeIterator* _tmp6_; + gpointer _tmp7_; + gboolean _tmp8_ = FALSE; + CoreTrackerAccumulator* _tmp9_; + DataObject* _tmp10_; + DataObject* _tmp11_; + gpointer _tmp12_; + Alteration* _tmp13_; + gboolean _tmp14_; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" break; -#line 709 "Tracker.c" +#line 795 "Tracker.c" } #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - object = (DataObject*) _tmp9_; -#line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp11_ = self->priv->acc; + object = (DataObject*) _tmp7_; #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp12_ = object; + _tmp9_ = self->priv->acc; #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp13_ = map; + _tmp10_ = object; #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp14_ = object; + _tmp11_ = object; #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp15_ = gee_map_get (_tmp13_, _tmp14_); + _tmp12_ = gee_map_get (map, _tmp11_); #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp16_ = (Alteration*) _tmp15_; + _tmp13_ = (Alteration*) _tmp12_; #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp17_ = core_tracker_accumulator_altered (_tmp11_, _tmp12_, _tmp16_); + _tmp14_ = core_tracker_accumulator_altered (_tmp9_, _tmp10_, _tmp13_); #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp18_ = _tmp17_; + _alteration_unref0 (_tmp13_); #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _alteration_unref0 (_tmp16_); + if (_tmp14_) { #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp18_) { -#line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp10_ = TRUE; -#line 739 "Tracker.c" + _tmp8_ = TRUE; +#line 821 "Tracker.c" } else { - gboolean _tmp19_; + gboolean _tmp15_; #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp19_ = fire_updated; + _tmp15_ = fire_updated; #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp10_ = _tmp19_; -#line 746 "Tracker.c" + _tmp8_ = _tmp15_; +#line 828 "Tracker.c" } #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp10_; + fire_updated = _tmp8_; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (object); -#line 752 "Tracker.c" +#line 834 "Tracker.c" } #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (_object_it); -#line 756 "Tracker.c" +#line 838 "Tracker.c" } #line 91 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp20_ = fire_updated; + _tmp16_ = fire_updated; #line 91 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp20_) { + if (_tmp16_) { #line 92 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_signal_emit (self, core_tracker_signals[CORE_TRACKER_UPDATED_SIGNAL], 0); -#line 764 "Tracker.c" +#line 846 "Tracker.c" } } -static void core_tracker_real_updated (CoreTracker* self) { +static void +core_tracker_real_updated (CoreTracker* self) +{ } -static void core_value_tracker_init (GValue* value) { +static void +core_value_tracker_init (GValue* value) +{ #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" value->data[0].v_pointer = NULL; -#line 776 "Tracker.c" +#line 862 "Tracker.c" } -static void core_value_tracker_free_value (GValue* value) { +static void +core_value_tracker_free_value (GValue* value) +{ #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (value->data[0].v_pointer) { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_tracker_unref (value->data[0].v_pointer); -#line 785 "Tracker.c" +#line 873 "Tracker.c" } } -static void core_value_tracker_copy_value (const GValue* src_value, GValue* dest_value) { +static void +core_value_tracker_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (src_value->data[0].v_pointer) { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" dest_value->data[0].v_pointer = core_tracker_ref (src_value->data[0].v_pointer); -#line 795 "Tracker.c" +#line 886 "Tracker.c" } else { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" dest_value->data[0].v_pointer = NULL; -#line 799 "Tracker.c" +#line 890 "Tracker.c" } } -static gpointer core_value_tracker_peek_pointer (const GValue* value) { +static gpointer +core_value_tracker_peek_pointer (const GValue* value) +{ #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" return value->data[0].v_pointer; -#line 807 "Tracker.c" +#line 900 "Tracker.c" } -static gchar* core_value_tracker_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +core_value_tracker_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (collect_values[0].v_pointer) { -#line 814 "Tracker.c" +#line 912 "Tracker.c" CoreTracker * object; object = collect_values[0].v_pointer; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (object->parent_instance.g_class == NULL) { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 821 "Tracker.c" +#line 919 "Tracker.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.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 825 "Tracker.c" +#line 923 "Tracker.c" } #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" value->data[0].v_pointer = core_tracker_ref (object); -#line 829 "Tracker.c" +#line 927 "Tracker.c" } else { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" value->data[0].v_pointer = NULL; -#line 833 "Tracker.c" +#line 931 "Tracker.c" } #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" return NULL; -#line 837 "Tracker.c" +#line 935 "Tracker.c" } -static gchar* core_value_tracker_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +core_value_tracker_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ CoreTracker ** object_p; object_p = collect_values[0].v_pointer; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (!object_p) { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 848 "Tracker.c" +#line 951 "Tracker.c" } #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (!value->data[0].v_pointer) { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" *object_p = NULL; -#line 854 "Tracker.c" +#line 957 "Tracker.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" *object_p = value->data[0].v_pointer; -#line 858 "Tracker.c" +#line 961 "Tracker.c" } else { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" *object_p = core_tracker_ref (value->data[0].v_pointer); -#line 862 "Tracker.c" +#line 965 "Tracker.c" } #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" return NULL; -#line 866 "Tracker.c" +#line 969 "Tracker.c" } -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ CoreParamSpecTracker* spec; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (g_type_is_a (object_type, CORE_TYPE_TRACKER), NULL); @@ -876,20 +985,25 @@ GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const G_PARAM_SPEC (spec)->value_type = object_type; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" return G_PARAM_SPEC (spec); -#line 880 "Tracker.c" +#line 989 "Tracker.c" } -gpointer core_value_get_tracker (const GValue* value) { +gpointer +core_value_get_tracker (const GValue* value) +{ #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CORE_TYPE_TRACKER), NULL); #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" return value->data[0].v_pointer; -#line 889 "Tracker.c" +#line 1000 "Tracker.c" } -void core_value_set_tracker (GValue* value, gpointer v_object) { +void +core_value_set_tracker (GValue* value, + gpointer v_object) +{ CoreTracker * old; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CORE_TYPE_TRACKER)); @@ -905,22 +1019,25 @@ void core_value_set_tracker (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_tracker_ref (value->data[0].v_pointer); -#line 909 "Tracker.c" +#line 1023 "Tracker.c" } else { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" value->data[0].v_pointer = NULL; -#line 913 "Tracker.c" +#line 1027 "Tracker.c" } #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (old) { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_tracker_unref (old); -#line 919 "Tracker.c" +#line 1033 "Tracker.c" } } -void core_value_take_tracker (GValue* value, gpointer v_object) { +void +core_value_take_tracker (GValue* value, + gpointer v_object) +{ CoreTracker * old; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CORE_TYPE_TRACKER)); @@ -934,22 +1051,24 @@ void core_value_take_tracker (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" value->data[0].v_pointer = v_object; -#line 938 "Tracker.c" +#line 1055 "Tracker.c" } else { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" value->data[0].v_pointer = NULL; -#line 942 "Tracker.c" +#line 1059 "Tracker.c" } #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (old) { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_tracker_unref (old); -#line 948 "Tracker.c" +#line 1065 "Tracker.c" } } -static void core_tracker_class_init (CoreTrackerClass * klass) { +static void +core_tracker_class_init (CoreTrackerClass * klass) +{ #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_tracker_parent_class = g_type_class_peek_parent (klass); #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -960,22 +1079,26 @@ static void core_tracker_class_init (CoreTrackerClass * klass) { ((CoreTrackerClass *) klass)->updated = core_tracker_real_updated; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_tracker_signals[CORE_TRACKER_UPDATED_SIGNAL] = g_signal_new ("updated", CORE_TYPE_TRACKER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (CoreTrackerClass, updated), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 964 "Tracker.c" +#line 1083 "Tracker.c" } -static void core_tracker_instance_init (CoreTracker * self) { +static void +core_tracker_instance_init (CoreTracker * self) +{ #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" self->priv = CORE_TRACKER_GET_PRIVATE (self); #line 28 "/home/jens/Source/shotwell/src/core/Tracker.vala" self->priv->acc = NULL; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" self->ref_count = 1; -#line 975 "Tracker.c" +#line 1096 "Tracker.c" } -static void core_tracker_finalize (CoreTracker * obj) { +static void +core_tracker_finalize (CoreTracker * obj) +{ CoreTracker * self; CoreTrackerAccumulator* _tmp0_; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -986,7 +1109,7 @@ static void core_tracker_finalize (CoreTracker * obj) { _tmp0_ = self->priv->acc; #line 39 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp0_ != NULL) { -#line 990 "Tracker.c" +#line 1113 "Tracker.c" DataCollection* _tmp1_; guint _tmp2_; DataCollection* _tmp3_; @@ -1011,7 +1134,7 @@ static void core_tracker_finalize (CoreTracker * obj) { g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp6_, NULL, FALSE); #line 42 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _core_tracker_on_items_altered_data_collection_items_altered, self); -#line 1015 "Tracker.c" +#line 1138 "Tracker.c" } #line 26 "/home/jens/Source/shotwell/src/core/Tracker.vala" _data_collection_unref0 (self->priv->collection); @@ -1019,11 +1142,13 @@ static void core_tracker_finalize (CoreTracker * obj) { _g_object_unref0 (self->priv->initial); #line 28 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (self->priv->acc); -#line 1023 "Tracker.c" +#line 1146 "Tracker.c" } -GType core_tracker_get_type (void) { +GType +core_tracker_get_type (void) +{ static volatile gsize core_tracker_type_id__volatile = 0; if (g_once_init_enter (&core_tracker_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { core_value_tracker_init, core_value_tracker_free_value, core_value_tracker_copy_value, core_value_tracker_peek_pointer, "p", core_value_tracker_collect_value, "p", core_value_tracker_lcopy_value }; @@ -1037,18 +1162,22 @@ GType core_tracker_get_type (void) { } -gpointer core_tracker_ref (gpointer instance) { +gpointer +core_tracker_ref (gpointer instance) +{ CoreTracker * self; self = instance; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_atomic_int_inc (&self->ref_count); #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" return instance; -#line 1048 "Tracker.c" +#line 1175 "Tracker.c" } -void core_tracker_unref (gpointer instance) { +void +core_tracker_unref (gpointer instance) +{ CoreTracker * self; self = instance; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1057,82 +1186,99 @@ void core_tracker_unref (gpointer instance) { CORE_TRACKER_GET_CLASS (self)->finalize (self); #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1061 "Tracker.c" +#line 1190 "Tracker.c" } } -static void _core_view_tracker_on_items_shown_view_collection_items_shown (ViewCollection* _sender, GeeCollection* visible, gpointer self) { +static void +_core_view_tracker_on_items_shown_view_collection_items_shown (ViewCollection* _sender, + GeeCollection* visible, + gpointer self) +{ #line 173 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_view_tracker_on_items_shown ((CoreViewTracker*) self, visible); -#line 1069 "Tracker.c" +#line 1202 "Tracker.c" } -static void _core_view_tracker_on_items_hidden_view_collection_items_hidden (ViewCollection* _sender, GeeCollection* hidden, gpointer self) { +static void +_core_view_tracker_on_items_hidden_view_collection_items_hidden (ViewCollection* _sender, + GeeCollection* hidden, + gpointer self) +{ #line 174 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_view_tracker_on_items_hidden ((CoreViewTracker*) self, hidden); -#line 1076 "Tracker.c" +#line 1213 "Tracker.c" } -static void _core_view_tracker_on_items_selected_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self) { +static void +_core_view_tracker_on_items_selected_view_collection_items_selected (ViewCollection* _sender, + GeeIterable* selected, + gpointer self) +{ #line 175 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_view_tracker_on_items_selected ((CoreViewTracker*) self, selected); -#line 1083 "Tracker.c" +#line 1224 "Tracker.c" } -static void _core_view_tracker_on_items_unselected_view_collection_items_unselected (ViewCollection* _sender, GeeIterable* unselected, gpointer self) { +static void +_core_view_tracker_on_items_unselected_view_collection_items_unselected (ViewCollection* _sender, + GeeIterable* unselected, + gpointer self) +{ #line 176 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_view_tracker_on_items_unselected ((CoreViewTracker*) self, unselected); -#line 1090 "Tracker.c" +#line 1235 "Tracker.c" } -CoreViewTracker* core_view_tracker_construct (GType object_type, ViewCollection* collection) { +CoreViewTracker* +core_view_tracker_construct (GType object_type, + ViewCollection* collection) +{ CoreViewTracker* self = NULL; - ViewCollection* _tmp0_; - ViewCollection* _tmp1_; - GeeCollection* _tmp2_; - GeeCollection* _tmp3_; + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; #line 165 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (collection), NULL); #line 166 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp0_ = collection; -#line 166 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = collection; -#line 166 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = view_collection_get_all_unfiltered (_tmp1_); + _tmp0_ = view_collection_get_all_unfiltered (collection); #line 166 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 166 "/home/jens/Source/shotwell/src/core/Tracker.vala" - self = (CoreViewTracker*) core_tracker_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), _tmp3_); + self = (CoreViewTracker*) core_tracker_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (collection, TYPE_DATA_COLLECTION, DataCollection), _tmp1_); #line 166 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 165 "/home/jens/Source/shotwell/src/core/Tracker.vala" return self; -#line 1116 "Tracker.c" +#line 1258 "Tracker.c" } -CoreViewTracker* core_view_tracker_new (ViewCollection* collection) { +CoreViewTracker* +core_view_tracker_new (ViewCollection* collection) +{ #line 165 "/home/jens/Source/shotwell/src/core/Tracker.vala" return core_view_tracker_construct (CORE_TYPE_VIEW_TRACKER, collection); -#line 1123 "Tracker.c" +#line 1267 "Tracker.c" } -void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected) { +void +core_view_tracker_start (CoreViewTracker* self, + CoreTrackerAccumulator* all, + CoreTrackerAccumulator* visible, + CoreTrackerAccumulator* selected) +{ CoreViewTrackerMux* _tmp0_; - CoreTrackerAccumulator* _tmp1_; - CoreTrackerAccumulator* _tmp2_; - CoreTrackerAccumulator* _tmp3_; - CoreViewTrackerMux* _tmp4_; + CoreViewTrackerMux* _tmp1_; ViewCollection* collection = NULL; - DataCollection* _tmp5_; - ViewCollection* _tmp6_; - CoreViewTrackerMux* _tmp7_; + DataCollection* _tmp2_; + ViewCollection* _tmp3_; + CoreViewTrackerMux* _tmp4_; #line 180 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (CORE_IS_VIEW_TRACKER (self)); #line 180 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1146,29 +1292,23 @@ void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all #line 181 "/home/jens/Source/shotwell/src/core/Tracker.vala" _vala_assert (_tmp0_ == NULL, "mux == null"); #line 183 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = all; -#line 183 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = visible; -#line 183 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = selected; -#line 183 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = core_view_tracker_mux_new (_tmp1_, _tmp2_, _tmp3_); + _tmp1_ = core_view_tracker_mux_new (all, visible, selected); #line 183 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (self->priv->mux); #line 183 "/home/jens/Source/shotwell/src/core/Tracker.vala" - self->priv->mux = _tmp4_; + self->priv->mux = _tmp1_; #line 185 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp5_ = core_tracker_get_collection (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker)); + _tmp2_ = core_tracker_get_collection (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker)); #line 185 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_VIEW_COLLECTION) ? ((ViewCollection*) _tmp5_) : NULL; + _tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_VIEW_COLLECTION) ? ((ViewCollection*) _tmp2_) : NULL; #line 185 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp6_ == NULL) { + if (_tmp3_ == NULL) { #line 185 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _data_collection_unref0 (_tmp5_); -#line 1169 "Tracker.c" + _data_collection_unref0 (_tmp2_); +#line 1309 "Tracker.c" } #line 185 "/home/jens/Source/shotwell/src/core/Tracker.vala" - collection = _tmp6_; + collection = _tmp3_; #line 186 "/home/jens/Source/shotwell/src/core/Tracker.vala" _vala_assert (collection != NULL, "collection != null"); #line 187 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1180,16 +1320,19 @@ void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all #line 190 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_signal_connect (collection, "items-unselected", (GCallback) _core_view_tracker_on_items_unselected_view_collection_items_unselected, self); #line 192 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp7_ = self->priv->mux; + _tmp4_ = self->priv->mux; #line 192 "/home/jens/Source/shotwell/src/core/Tracker.vala" - core_tracker_start (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator)); + core_tracker_start (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator)); #line 180 "/home/jens/Source/shotwell/src/core/Tracker.vala" _data_collection_unref0 (collection); -#line 1189 "Tracker.c" +#line 1329 "Tracker.c" } -static void core_view_tracker_on_items_shown (CoreViewTracker* self, GeeCollection* shown) { +static void +core_view_tracker_on_items_shown (CoreViewTracker* self, + GeeCollection* shown) +{ CoreViewTrackerMux* _tmp0_; CoreTrackerAccumulator* _tmp1_; #line 195 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1202,24 +1345,24 @@ static void core_view_tracker_on_items_shown (CoreViewTracker* self, GeeCollecti _tmp1_ = _tmp0_->visible; #line 196 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp1_ != NULL) { -#line 1206 "Tracker.c" - GeeCollection* _tmp2_; - CoreViewTrackerMux* _tmp3_; - CoreTrackerAccumulator* _tmp4_; +#line 1349 "Tracker.c" + CoreViewTrackerMux* _tmp2_; + CoreTrackerAccumulator* _tmp3_; #line 197 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = shown; + _tmp2_ = self->priv->mux; #line 197 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = self->priv->mux; + _tmp3_ = _tmp2_->visible; #line 197 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = _tmp3_->visible; -#line 197 "/home/jens/Source/shotwell/src/core/Tracker.vala" - core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable), _core_tracker_accumulator_include_core_tracker_include_uninclude_object, _tmp4_); -#line 1218 "Tracker.c" + core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), G_TYPE_CHECK_INSTANCE_CAST (shown, GEE_TYPE_ITERABLE, GeeIterable), _core_tracker_accumulator_include_core_tracker_include_uninclude_object, _tmp3_); +#line 1358 "Tracker.c" } } -static void core_view_tracker_on_items_hidden (CoreViewTracker* self, GeeCollection* hidden) { +static void +core_view_tracker_on_items_hidden (CoreViewTracker* self, + GeeCollection* hidden) +{ CoreViewTrackerMux* _tmp0_; CoreTrackerAccumulator* _tmp1_; #line 200 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1232,24 +1375,24 @@ static void core_view_tracker_on_items_hidden (CoreViewTracker* self, GeeCollect _tmp1_ = _tmp0_->visible; #line 201 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp1_ != NULL) { -#line 1236 "Tracker.c" - GeeCollection* _tmp2_; - CoreViewTrackerMux* _tmp3_; - CoreTrackerAccumulator* _tmp4_; -#line 202 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = hidden; +#line 1379 "Tracker.c" + CoreViewTrackerMux* _tmp2_; + CoreTrackerAccumulator* _tmp3_; #line 202 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = self->priv->mux; + _tmp2_ = self->priv->mux; #line 202 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = _tmp3_->visible; + _tmp3_ = _tmp2_->visible; #line 202 "/home/jens/Source/shotwell/src/core/Tracker.vala" - core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable), _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object, _tmp4_); -#line 1248 "Tracker.c" + core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), G_TYPE_CHECK_INSTANCE_CAST (hidden, GEE_TYPE_ITERABLE, GeeIterable), _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object, _tmp3_); +#line 1388 "Tracker.c" } } -static void core_view_tracker_on_items_selected (CoreViewTracker* self, GeeIterable* selected) { +static void +core_view_tracker_on_items_selected (CoreViewTracker* self, + GeeIterable* selected) +{ CoreViewTrackerMux* _tmp0_; CoreTrackerAccumulator* _tmp1_; #line 205 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1262,24 +1405,24 @@ static void core_view_tracker_on_items_selected (CoreViewTracker* self, GeeItera _tmp1_ = _tmp0_->selected; #line 206 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp1_ != NULL) { -#line 1266 "Tracker.c" - GeeIterable* _tmp2_; - CoreViewTrackerMux* _tmp3_; - CoreTrackerAccumulator* _tmp4_; -#line 207 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = selected; +#line 1409 "Tracker.c" + CoreViewTrackerMux* _tmp2_; + CoreTrackerAccumulator* _tmp3_; #line 207 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = self->priv->mux; + _tmp2_ = self->priv->mux; #line 207 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = _tmp3_->selected; + _tmp3_ = _tmp2_->selected; #line 207 "/home/jens/Source/shotwell/src/core/Tracker.vala" - core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), _tmp2_, _core_tracker_accumulator_include_core_tracker_include_uninclude_object, _tmp4_); -#line 1278 "Tracker.c" + core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), selected, _core_tracker_accumulator_include_core_tracker_include_uninclude_object, _tmp3_); +#line 1418 "Tracker.c" } } -static void core_view_tracker_on_items_unselected (CoreViewTracker* self, GeeIterable* unselected) { +static void +core_view_tracker_on_items_unselected (CoreViewTracker* self, + GeeIterable* unselected) +{ CoreViewTrackerMux* _tmp0_; CoreTrackerAccumulator* _tmp1_; #line 210 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1292,31 +1435,30 @@ static void core_view_tracker_on_items_unselected (CoreViewTracker* self, GeeIte _tmp1_ = _tmp0_->selected; #line 211 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp1_ != NULL) { -#line 1296 "Tracker.c" - GeeIterable* _tmp2_; - CoreViewTrackerMux* _tmp3_; - CoreTrackerAccumulator* _tmp4_; -#line 212 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = unselected; +#line 1439 "Tracker.c" + CoreViewTrackerMux* _tmp2_; + CoreTrackerAccumulator* _tmp3_; #line 212 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = self->priv->mux; + _tmp2_ = self->priv->mux; #line 212 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = _tmp3_->selected; + _tmp3_ = _tmp2_->selected; #line 212 "/home/jens/Source/shotwell/src/core/Tracker.vala" - core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), _tmp2_, _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object, _tmp4_); -#line 1308 "Tracker.c" + core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), unselected, _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object, _tmp3_); +#line 1448 "Tracker.c" } } -static CoreViewTrackerMux* core_view_tracker_mux_construct (GType object_type, CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected) { +static CoreViewTrackerMux* +core_view_tracker_mux_construct (GType object_type, + CoreTrackerAccumulator* all, + CoreTrackerAccumulator* visible, + CoreTrackerAccumulator* selected) +{ CoreViewTrackerMux * self = NULL; CoreTrackerAccumulator* _tmp0_; CoreTrackerAccumulator* _tmp1_; CoreTrackerAccumulator* _tmp2_; - CoreTrackerAccumulator* _tmp3_; - CoreTrackerAccumulator* _tmp4_; - CoreTrackerAccumulator* _tmp5_; #line 105 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail ((all == NULL) || CORE_IS_TRACKER_ACCUMULATOR (all), NULL); #line 105 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1326,195 +1468,178 @@ static CoreViewTrackerMux* core_view_tracker_mux_construct (GType object_type, C #line 105 "/home/jens/Source/shotwell/src/core/Tracker.vala" self = (CoreViewTrackerMux*) g_object_new (object_type, NULL); #line 106 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp0_ = all; -#line 106 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (all); #line 106 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (self->all); #line 106 "/home/jens/Source/shotwell/src/core/Tracker.vala" - self->all = _tmp1_; + self->all = _tmp0_; #line 107 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = visible; -#line 107 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (visible); #line 107 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (self->visible); #line 107 "/home/jens/Source/shotwell/src/core/Tracker.vala" - self->visible = _tmp3_; -#line 108 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = selected; + self->visible = _tmp1_; #line 108 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp2_ = _g_object_ref0 (selected); #line 108 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (self->selected); #line 108 "/home/jens/Source/shotwell/src/core/Tracker.vala" - self->selected = _tmp5_; + self->selected = _tmp2_; #line 105 "/home/jens/Source/shotwell/src/core/Tracker.vala" return self; -#line 1355 "Tracker.c" +#line 1491 "Tracker.c" } -static CoreViewTrackerMux* core_view_tracker_mux_new (CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected) { +static CoreViewTrackerMux* +core_view_tracker_mux_new (CoreTrackerAccumulator* all, + CoreTrackerAccumulator* visible, + CoreTrackerAccumulator* selected) +{ #line 105 "/home/jens/Source/shotwell/src/core/Tracker.vala" return core_view_tracker_mux_construct (CORE_VIEW_TRACKER_TYPE_MUX, all, visible, selected); -#line 1362 "Tracker.c" +#line 1502 "Tracker.c" } -static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base, DataObject* object) { +static gboolean +core_view_tracker_mux_real_include (CoreTrackerAccumulator* base, + DataObject* object) +{ CoreViewTrackerMux * self; gboolean result = FALSE; DataView* view = NULL; - DataObject* _tmp0_; - DataView* _tmp1_; + DataView* _tmp0_; gboolean fire_updated = FALSE; - CoreTrackerAccumulator* _tmp2_; - gboolean _tmp8_ = FALSE; - CoreTrackerAccumulator* _tmp9_; - gboolean _tmp17_ = FALSE; - CoreTrackerAccumulator* _tmp18_; + CoreTrackerAccumulator* _tmp1_; + gboolean _tmp6_ = FALSE; + CoreTrackerAccumulator* _tmp7_; + gboolean _tmp13_ = FALSE; + CoreTrackerAccumulator* _tmp14_; #line 111 "/home/jens/Source/shotwell/src/core/Tracker.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, CORE_VIEW_TRACKER_TYPE_MUX, CoreViewTrackerMux); #line 111 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 112 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp0_ = object; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView)); #line 112 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView)); -#line 112 "/home/jens/Source/shotwell/src/core/Tracker.vala" - view = _tmp1_; + view = _tmp0_; #line 114 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = FALSE; #line 116 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = self->all; + _tmp1_ = self->all; #line 116 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp2_ != NULL) { -#line 1394 "Tracker.c" - gboolean _tmp3_ = FALSE; - CoreTrackerAccumulator* _tmp4_; - DataView* _tmp5_; - gboolean _tmp6_; -#line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = self->all; + if (_tmp1_ != NULL) { +#line 1534 "Tracker.c" + gboolean _tmp2_ = FALSE; + CoreTrackerAccumulator* _tmp3_; + DataView* _tmp4_; #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp5_ = view; + _tmp3_ = self->all; #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp6_ = core_tracker_accumulator_include (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); + _tmp4_ = view; #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp6_) { + if (core_tracker_accumulator_include (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject))) { #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = TRUE; -#line 1409 "Tracker.c" + _tmp2_ = TRUE; +#line 1546 "Tracker.c" } else { - gboolean _tmp7_; + gboolean _tmp5_; #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp7_ = fire_updated; + _tmp5_ = fire_updated; #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = _tmp7_; -#line 1416 "Tracker.c" + _tmp2_ = _tmp5_; +#line 1553 "Tracker.c" } #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp3_; -#line 1420 "Tracker.c" + fire_updated = _tmp2_; +#line 1557 "Tracker.c" } #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp9_ = self->visible; -#line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp9_ != NULL) { -#line 1426 "Tracker.c" - DataView* _tmp10_; - gboolean _tmp11_; + _tmp7_ = self->visible; #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp10_ = view; + if (_tmp7_ != NULL) { +#line 1563 "Tracker.c" + DataView* _tmp8_; #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp11_ = data_view_is_visible (_tmp10_); + _tmp8_ = view; #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp8_ = _tmp11_; -#line 1435 "Tracker.c" + _tmp6_ = data_view_is_visible (_tmp8_); +#line 1569 "Tracker.c" } else { #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp8_ = FALSE; -#line 1439 "Tracker.c" + _tmp6_ = FALSE; +#line 1573 "Tracker.c" } #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp8_) { -#line 1443 "Tracker.c" - gboolean _tmp12_ = FALSE; - CoreTrackerAccumulator* _tmp13_; - DataView* _tmp14_; - gboolean _tmp15_; -#line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp13_ = self->visible; + if (_tmp6_) { +#line 1577 "Tracker.c" + gboolean _tmp9_ = FALSE; + CoreTrackerAccumulator* _tmp10_; + DataView* _tmp11_; #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp14_ = view; + _tmp10_ = self->visible; #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp15_ = core_tracker_accumulator_include (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); + _tmp11_ = view; #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp15_) { + if (core_tracker_accumulator_include (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject))) { #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp12_ = TRUE; -#line 1458 "Tracker.c" + _tmp9_ = TRUE; +#line 1589 "Tracker.c" } else { - gboolean _tmp16_; + gboolean _tmp12_; #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp16_ = fire_updated; + _tmp12_ = fire_updated; #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp12_ = _tmp16_; -#line 1465 "Tracker.c" + _tmp9_ = _tmp12_; +#line 1596 "Tracker.c" } #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp12_; -#line 1469 "Tracker.c" + fire_updated = _tmp9_; +#line 1600 "Tracker.c" } #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp18_ = self->selected; + _tmp14_ = self->selected; #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp18_ != NULL) { -#line 1475 "Tracker.c" - DataView* _tmp19_; - gboolean _tmp20_; -#line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp19_ = view; + if (_tmp14_ != NULL) { +#line 1606 "Tracker.c" + DataView* _tmp15_; #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp20_ = data_view_is_selected (_tmp19_); + _tmp15_ = view; #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp17_ = _tmp20_; -#line 1484 "Tracker.c" + _tmp13_ = data_view_is_selected (_tmp15_); +#line 1612 "Tracker.c" } else { #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp17_ = FALSE; -#line 1488 "Tracker.c" + _tmp13_ = FALSE; +#line 1616 "Tracker.c" } #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp17_) { -#line 1492 "Tracker.c" - gboolean _tmp21_ = FALSE; - CoreTrackerAccumulator* _tmp22_; - DataView* _tmp23_; - gboolean _tmp24_; -#line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp22_ = self->selected; + if (_tmp13_) { +#line 1620 "Tracker.c" + gboolean _tmp16_ = FALSE; + CoreTrackerAccumulator* _tmp17_; + DataView* _tmp18_; #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp23_ = view; + _tmp17_ = self->selected; #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp24_ = core_tracker_accumulator_include (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_DATA_OBJECT, DataObject)); + _tmp18_ = view; #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp24_) { + if (core_tracker_accumulator_include (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_OBJECT, DataObject))) { #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp21_ = TRUE; -#line 1507 "Tracker.c" + _tmp16_ = TRUE; +#line 1632 "Tracker.c" } else { - gboolean _tmp25_; + gboolean _tmp19_; #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp25_ = fire_updated; + _tmp19_ = fire_updated; #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp21_ = _tmp25_; -#line 1514 "Tracker.c" + _tmp16_ = _tmp19_; +#line 1639 "Tracker.c" } #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp21_; -#line 1518 "Tracker.c" + fire_updated = _tmp16_; +#line 1643 "Tracker.c" } #line 125 "/home/jens/Source/shotwell/src/core/Tracker.vala" result = fire_updated; @@ -1522,163 +1647,148 @@ static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base _g_object_unref0 (view); #line 125 "/home/jens/Source/shotwell/src/core/Tracker.vala" return result; -#line 1526 "Tracker.c" +#line 1651 "Tracker.c" } -static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* base, DataObject* object) { +static gboolean +core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* base, + DataObject* object) +{ CoreViewTrackerMux * self; gboolean result = FALSE; DataView* view = NULL; - DataObject* _tmp0_; - DataView* _tmp1_; + DataView* _tmp0_; gboolean fire_updated = FALSE; - CoreTrackerAccumulator* _tmp2_; - gboolean _tmp8_ = FALSE; - CoreTrackerAccumulator* _tmp9_; - gboolean _tmp17_ = FALSE; - CoreTrackerAccumulator* _tmp18_; + CoreTrackerAccumulator* _tmp1_; + gboolean _tmp6_ = FALSE; + CoreTrackerAccumulator* _tmp7_; + gboolean _tmp13_ = FALSE; + CoreTrackerAccumulator* _tmp14_; #line 128 "/home/jens/Source/shotwell/src/core/Tracker.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, CORE_VIEW_TRACKER_TYPE_MUX, CoreViewTrackerMux); #line 128 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 129 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp0_ = object; -#line 129 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView)); #line 129 "/home/jens/Source/shotwell/src/core/Tracker.vala" - view = _tmp1_; + view = _tmp0_; #line 131 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = FALSE; #line 133 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = self->all; + _tmp1_ = self->all; #line 133 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp2_ != NULL) { -#line 1558 "Tracker.c" - gboolean _tmp3_ = FALSE; - CoreTrackerAccumulator* _tmp4_; - DataView* _tmp5_; - gboolean _tmp6_; -#line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = self->all; + if (_tmp1_ != NULL) { +#line 1683 "Tracker.c" + gboolean _tmp2_ = FALSE; + CoreTrackerAccumulator* _tmp3_; + DataView* _tmp4_; #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp5_ = view; + _tmp3_ = self->all; #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp6_ = core_tracker_accumulator_uninclude (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); + _tmp4_ = view; #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp6_) { + if (core_tracker_accumulator_uninclude (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject))) { #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = TRUE; -#line 1573 "Tracker.c" + _tmp2_ = TRUE; +#line 1695 "Tracker.c" } else { - gboolean _tmp7_; + gboolean _tmp5_; #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp7_ = fire_updated; + _tmp5_ = fire_updated; #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = _tmp7_; -#line 1580 "Tracker.c" + _tmp2_ = _tmp5_; +#line 1702 "Tracker.c" } #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp3_; -#line 1584 "Tracker.c" + fire_updated = _tmp2_; +#line 1706 "Tracker.c" } #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp9_ = self->visible; + _tmp7_ = self->visible; #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp9_ != NULL) { -#line 1590 "Tracker.c" - DataView* _tmp10_; - gboolean _tmp11_; -#line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp10_ = view; + if (_tmp7_ != NULL) { +#line 1712 "Tracker.c" + DataView* _tmp8_; #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp11_ = data_view_is_visible (_tmp10_); + _tmp8_ = view; #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp8_ = _tmp11_; -#line 1599 "Tracker.c" + _tmp6_ = data_view_is_visible (_tmp8_); +#line 1718 "Tracker.c" } else { #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp8_ = FALSE; -#line 1603 "Tracker.c" + _tmp6_ = FALSE; +#line 1722 "Tracker.c" } #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp8_) { -#line 1607 "Tracker.c" - gboolean _tmp12_ = FALSE; - CoreTrackerAccumulator* _tmp13_; - DataView* _tmp14_; - gboolean _tmp15_; -#line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp13_ = self->visible; + if (_tmp6_) { +#line 1726 "Tracker.c" + gboolean _tmp9_ = FALSE; + CoreTrackerAccumulator* _tmp10_; + DataView* _tmp11_; #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp14_ = view; + _tmp10_ = self->visible; #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp15_ = core_tracker_accumulator_uninclude (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); + _tmp11_ = view; #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp15_) { + if (core_tracker_accumulator_uninclude (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject))) { #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp12_ = TRUE; -#line 1622 "Tracker.c" + _tmp9_ = TRUE; +#line 1738 "Tracker.c" } else { - gboolean _tmp16_; + gboolean _tmp12_; #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp16_ = fire_updated; + _tmp12_ = fire_updated; #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp12_ = _tmp16_; -#line 1629 "Tracker.c" + _tmp9_ = _tmp12_; +#line 1745 "Tracker.c" } #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp12_; -#line 1633 "Tracker.c" + fire_updated = _tmp9_; +#line 1749 "Tracker.c" } #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp18_ = self->selected; -#line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp18_ != NULL) { -#line 1639 "Tracker.c" - DataView* _tmp19_; - gboolean _tmp20_; + _tmp14_ = self->selected; #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp19_ = view; + if (_tmp14_ != NULL) { +#line 1755 "Tracker.c" + DataView* _tmp15_; #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp20_ = data_view_is_selected (_tmp19_); + _tmp15_ = view; #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp17_ = _tmp20_; -#line 1648 "Tracker.c" + _tmp13_ = data_view_is_selected (_tmp15_); +#line 1761 "Tracker.c" } else { #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp17_ = FALSE; -#line 1652 "Tracker.c" + _tmp13_ = FALSE; +#line 1765 "Tracker.c" } #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp17_) { -#line 1656 "Tracker.c" - gboolean _tmp21_ = FALSE; - CoreTrackerAccumulator* _tmp22_; - DataView* _tmp23_; - gboolean _tmp24_; + if (_tmp13_) { +#line 1769 "Tracker.c" + gboolean _tmp16_ = FALSE; + CoreTrackerAccumulator* _tmp17_; + DataView* _tmp18_; #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp22_ = self->selected; + _tmp17_ = self->selected; #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp23_ = view; + _tmp18_ = view; #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp24_ = core_tracker_accumulator_uninclude (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_DATA_OBJECT, DataObject)); + if (core_tracker_accumulator_uninclude (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_OBJECT, DataObject))) { #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp24_) { -#line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp21_ = TRUE; -#line 1671 "Tracker.c" + _tmp16_ = TRUE; +#line 1781 "Tracker.c" } else { - gboolean _tmp25_; + gboolean _tmp19_; #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp25_ = fire_updated; + _tmp19_ = fire_updated; #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp21_ = _tmp25_; -#line 1678 "Tracker.c" + _tmp16_ = _tmp19_; +#line 1788 "Tracker.c" } #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp21_; -#line 1682 "Tracker.c" + fire_updated = _tmp16_; +#line 1792 "Tracker.c" } #line 142 "/home/jens/Source/shotwell/src/core/Tracker.vala" result = fire_updated; @@ -1686,22 +1796,25 @@ static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* ba _g_object_unref0 (view); #line 142 "/home/jens/Source/shotwell/src/core/Tracker.vala" return result; -#line 1690 "Tracker.c" +#line 1800 "Tracker.c" } -static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base, DataObject* object, Alteration* alteration) { +static gboolean +core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base, + DataObject* object, + Alteration* alteration) +{ CoreViewTrackerMux * self; gboolean result = FALSE; DataView* view = NULL; - DataObject* _tmp0_; - DataView* _tmp1_; + DataView* _tmp0_; gboolean fire_updated = FALSE; - CoreTrackerAccumulator* _tmp2_; - gboolean _tmp9_ = FALSE; - CoreTrackerAccumulator* _tmp10_; - gboolean _tmp19_ = FALSE; - CoreTrackerAccumulator* _tmp20_; + CoreTrackerAccumulator* _tmp1_; + gboolean _tmp6_ = FALSE; + CoreTrackerAccumulator* _tmp7_; + gboolean _tmp13_ = FALSE; + CoreTrackerAccumulator* _tmp14_; #line 145 "/home/jens/Source/shotwell/src/core/Tracker.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, CORE_VIEW_TRACKER_TYPE_MUX, CoreViewTrackerMux); #line 145 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1709,151 +1822,125 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base #line 145 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 146 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp0_ = object; -#line 146 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView)); #line 146 "/home/jens/Source/shotwell/src/core/Tracker.vala" - view = _tmp1_; + view = _tmp0_; #line 148 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = FALSE; #line 150 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = self->all; + _tmp1_ = self->all; #line 150 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp2_ != NULL) { -#line 1724 "Tracker.c" - gboolean _tmp3_ = FALSE; - CoreTrackerAccumulator* _tmp4_; - DataView* _tmp5_; - Alteration* _tmp6_; - gboolean _tmp7_; -#line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = self->all; -#line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp5_ = view; + if (_tmp1_ != NULL) { +#line 1835 "Tracker.c" + gboolean _tmp2_ = FALSE; + CoreTrackerAccumulator* _tmp3_; + DataView* _tmp4_; #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp6_ = alteration; + _tmp3_ = self->all; #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp7_ = core_tracker_accumulator_altered (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject), _tmp6_); + _tmp4_ = view; #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp7_) { + if (core_tracker_accumulator_altered (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject), alteration)) { #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = TRUE; -#line 1742 "Tracker.c" + _tmp2_ = TRUE; +#line 1847 "Tracker.c" } else { - gboolean _tmp8_; + gboolean _tmp5_; #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp8_ = fire_updated; + _tmp5_ = fire_updated; #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = _tmp8_; -#line 1749 "Tracker.c" + _tmp2_ = _tmp5_; +#line 1854 "Tracker.c" } #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp3_; -#line 1753 "Tracker.c" + fire_updated = _tmp2_; +#line 1858 "Tracker.c" } #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp10_ = self->visible; -#line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp10_ != NULL) { -#line 1759 "Tracker.c" - DataView* _tmp11_; - gboolean _tmp12_; + _tmp7_ = self->visible; #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp11_ = view; + if (_tmp7_ != NULL) { +#line 1864 "Tracker.c" + DataView* _tmp8_; #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp12_ = data_view_is_visible (_tmp11_); + _tmp8_ = view; #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp9_ = _tmp12_; -#line 1768 "Tracker.c" + _tmp6_ = data_view_is_visible (_tmp8_); +#line 1870 "Tracker.c" } else { #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp9_ = FALSE; -#line 1772 "Tracker.c" + _tmp6_ = FALSE; +#line 1874 "Tracker.c" } #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp9_) { -#line 1776 "Tracker.c" - gboolean _tmp13_ = FALSE; - CoreTrackerAccumulator* _tmp14_; - DataView* _tmp15_; - Alteration* _tmp16_; - gboolean _tmp17_; -#line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp14_ = self->visible; -#line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp15_ = view; + if (_tmp6_) { +#line 1878 "Tracker.c" + gboolean _tmp9_ = FALSE; + CoreTrackerAccumulator* _tmp10_; + DataView* _tmp11_; #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp16_ = alteration; + _tmp10_ = self->visible; #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp17_ = core_tracker_accumulator_altered (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_OBJECT, DataObject), _tmp16_); + _tmp11_ = view; #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp17_) { + if (core_tracker_accumulator_altered (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject), alteration)) { #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp13_ = TRUE; -#line 1794 "Tracker.c" + _tmp9_ = TRUE; +#line 1890 "Tracker.c" } else { - gboolean _tmp18_; + gboolean _tmp12_; #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp18_ = fire_updated; + _tmp12_ = fire_updated; #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp13_ = _tmp18_; -#line 1801 "Tracker.c" + _tmp9_ = _tmp12_; +#line 1897 "Tracker.c" } #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp13_; -#line 1805 "Tracker.c" + fire_updated = _tmp9_; +#line 1901 "Tracker.c" } #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp20_ = self->selected; -#line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp20_ != NULL) { -#line 1811 "Tracker.c" - DataView* _tmp21_; - gboolean _tmp22_; + _tmp14_ = self->selected; #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp21_ = view; + if (_tmp14_ != NULL) { +#line 1907 "Tracker.c" + DataView* _tmp15_; #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp22_ = data_view_is_selected (_tmp21_); + _tmp15_ = view; #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp19_ = _tmp22_; -#line 1820 "Tracker.c" + _tmp13_ = data_view_is_selected (_tmp15_); +#line 1913 "Tracker.c" } else { #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp19_ = FALSE; -#line 1824 "Tracker.c" + _tmp13_ = FALSE; +#line 1917 "Tracker.c" } #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp19_) { -#line 1828 "Tracker.c" - gboolean _tmp23_ = FALSE; - CoreTrackerAccumulator* _tmp24_; - DataView* _tmp25_; - Alteration* _tmp26_; - gboolean _tmp27_; + if (_tmp13_) { +#line 1921 "Tracker.c" + gboolean _tmp16_ = FALSE; + CoreTrackerAccumulator* _tmp17_; + DataView* _tmp18_; #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp24_ = self->selected; + _tmp17_ = self->selected; #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp25_ = view; + _tmp18_ = view; #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp26_ = alteration; + if (core_tracker_accumulator_altered (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_OBJECT, DataObject), alteration)) { #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp27_ = core_tracker_accumulator_altered (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject), _tmp26_); -#line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp27_) { -#line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp23_ = TRUE; -#line 1846 "Tracker.c" + _tmp16_ = TRUE; +#line 1933 "Tracker.c" } else { - gboolean _tmp28_; + gboolean _tmp19_; #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp28_ = fire_updated; + _tmp19_ = fire_updated; #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp23_ = _tmp28_; -#line 1853 "Tracker.c" + _tmp16_ = _tmp19_; +#line 1940 "Tracker.c" } #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp23_; -#line 1857 "Tracker.c" + fire_updated = _tmp16_; +#line 1944 "Tracker.c" } #line 159 "/home/jens/Source/shotwell/src/core/Tracker.vala" result = fire_updated; @@ -1861,20 +1948,24 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base _g_object_unref0 (view); #line 159 "/home/jens/Source/shotwell/src/core/Tracker.vala" return result; -#line 1865 "Tracker.c" +#line 1952 "Tracker.c" } -static void core_view_tracker_mux_class_init (CoreViewTrackerMuxClass * klass) { +static void +core_view_tracker_mux_class_init (CoreViewTrackerMuxClass * klass) +{ #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_view_tracker_mux_parent_class = g_type_class_peek_parent (klass); #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala" G_OBJECT_CLASS (klass)->finalize = core_view_tracker_mux_finalize; -#line 1874 "Tracker.c" +#line 1963 "Tracker.c" } -static void core_view_tracker_mux_core_tracker_accumulator_interface_init (CoreTrackerAccumulatorIface * iface) { +static void +core_view_tracker_mux_core_tracker_accumulator_interface_init (CoreTrackerAccumulatorIface * iface) +{ #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_view_tracker_mux_core_tracker_accumulator_parent_iface = g_type_interface_peek_parent (iface); #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1883,15 +1974,19 @@ static void core_view_tracker_mux_core_tracker_accumulator_interface_init (CoreT iface->uninclude = (gboolean (*) (CoreTrackerAccumulator *, DataObject*)) core_view_tracker_mux_real_uninclude; #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala" iface->altered = (gboolean (*) (CoreTrackerAccumulator *, DataObject*, Alteration*)) core_view_tracker_mux_real_altered; -#line 1887 "Tracker.c" +#line 1978 "Tracker.c" } -static void core_view_tracker_mux_instance_init (CoreViewTrackerMux * self) { +static void +core_view_tracker_mux_instance_init (CoreViewTrackerMux * self) +{ } -static void core_view_tracker_mux_finalize (GObject * obj) { +static void +core_view_tracker_mux_finalize (GObject * obj) +{ CoreViewTrackerMux * self; #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, CORE_VIEW_TRACKER_TYPE_MUX, CoreViewTrackerMux); @@ -1903,11 +1998,13 @@ static void core_view_tracker_mux_finalize (GObject * obj) { _g_object_unref0 (self->selected); #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala" G_OBJECT_CLASS (core_view_tracker_mux_parent_class)->finalize (obj); -#line 1907 "Tracker.c" +#line 2002 "Tracker.c" } -static GType core_view_tracker_mux_get_type (void) { +static GType +core_view_tracker_mux_get_type (void) +{ static volatile gsize core_view_tracker_mux_type_id__volatile = 0; if (g_once_init_enter (&core_view_tracker_mux_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CoreViewTrackerMuxClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) core_view_tracker_mux_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CoreViewTrackerMux), 0, (GInstanceInitFunc) core_view_tracker_mux_instance_init, NULL }; @@ -1921,27 +2018,33 @@ static GType core_view_tracker_mux_get_type (void) { } -static void core_view_tracker_class_init (CoreViewTrackerClass * klass) { +static void +core_view_tracker_class_init (CoreViewTrackerClass * klass) +{ #line 99 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_view_tracker_parent_class = g_type_class_peek_parent (klass); #line 99 "/home/jens/Source/shotwell/src/core/Tracker.vala" ((CoreTrackerClass *) klass)->finalize = core_view_tracker_finalize; #line 99 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_type_class_add_private (klass, sizeof (CoreViewTrackerPrivate)); -#line 1932 "Tracker.c" +#line 2031 "Tracker.c" } -static void core_view_tracker_instance_init (CoreViewTracker * self) { +static void +core_view_tracker_instance_init (CoreViewTracker * self) +{ #line 99 "/home/jens/Source/shotwell/src/core/Tracker.vala" self->priv = CORE_VIEW_TRACKER_GET_PRIVATE (self); #line 163 "/home/jens/Source/shotwell/src/core/Tracker.vala" self->priv->mux = NULL; -#line 1941 "Tracker.c" +#line 2042 "Tracker.c" } -static void core_view_tracker_finalize (CoreTracker * obj) { +static void +core_view_tracker_finalize (CoreTracker * obj) +{ CoreViewTracker * self; CoreViewTrackerMux* _tmp0_; #line 99 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1950,7 +2053,7 @@ static void core_view_tracker_finalize (CoreTracker * obj) { _tmp0_ = self->priv->mux; #line 170 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp0_ != NULL) { -#line 1954 "Tracker.c" +#line 2057 "Tracker.c" ViewCollection* collection = NULL; DataCollection* _tmp1_; ViewCollection* _tmp2_; @@ -1971,7 +2074,7 @@ static void core_view_tracker_finalize (CoreTracker * obj) { if (_tmp2_ == NULL) { #line 171 "/home/jens/Source/shotwell/src/core/Tracker.vala" _data_collection_unref0 (_tmp1_); -#line 1975 "Tracker.c" +#line 2078 "Tracker.c" } #line 171 "/home/jens/Source/shotwell/src/core/Tracker.vala" collection = _tmp2_; @@ -2005,17 +2108,19 @@ static void core_view_tracker_finalize (CoreTracker * obj) { g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _core_view_tracker_on_items_unselected_view_collection_items_unselected, self); #line 170 "/home/jens/Source/shotwell/src/core/Tracker.vala" _data_collection_unref0 (collection); -#line 2009 "Tracker.c" +#line 2112 "Tracker.c" } #line 163 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (self->priv->mux); #line 99 "/home/jens/Source/shotwell/src/core/Tracker.vala" CORE_TRACKER_CLASS (core_view_tracker_parent_class)->finalize (obj); -#line 2015 "Tracker.c" +#line 2118 "Tracker.c" } -GType core_view_tracker_get_type (void) { +GType +core_view_tracker_get_type (void) +{ static volatile gsize core_view_tracker_type_id__volatile = 0; if (g_once_init_enter (&core_view_tracker_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CoreViewTrackerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) core_view_tracker_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CoreViewTracker), 0, (GInstanceInitFunc) core_view_tracker_instance_init, NULL }; diff --git a/src/core/ViewCollection.c b/src/core/ViewCollection.c index f1dc3ad..20c7fd1 100644 --- a/src/core/ViewCollection.c +++ b/src/core/ViewCollection.c @@ -1,4 +1,4 @@ -/* ViewCollection.c generated by valac 0.36.6, the Vala compiler +/* ViewCollection.c generated by valac 0.40.4, the Vala compiler * generated from ViewCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -21,6 +21,7 @@ /* The default implementation provides a browser which orders the view in the order they're*/ /* stored in DataCollection, which is not specified.*/ + #include #include #include @@ -202,6 +203,11 @@ typedef struct _ViewCollectionToggleListsClass ViewCollectionToggleListsClass; typedef struct _ViewCollectionToggleListsPrivate ViewCollectionToggleListsPrivate; typedef struct _ViewCollectionParamSpecMonitor ViewCollectionParamSpecMonitor; #define _view_manager_unref0(var) ((var == NULL) ? NULL : (var = (view_manager_unref (var), NULL))) +enum { + VIEW_COLLECTION_TOGGLE_LISTS_0_PROPERTY, + VIEW_COLLECTION_TOGGLE_LISTS_NUM_PROPERTIES +}; +static GParamSpec* view_collection_toggle_lists_properties[VIEW_COLLECTION_TOGGLE_LISTS_NUM_PROPERTIES]; enum { VIEW_COLLECTION_ITEMS_SELECTED_SIGNAL, VIEW_COLLECTION_ITEMS_UNSELECTED_SIGNAL, @@ -216,18 +222,18 @@ enum { VIEW_COLLECTION_GEOMETRIES_ALTERED_SIGNAL, VIEW_COLLECTION_VIEW_FILTER_INSTALLED_SIGNAL, VIEW_COLLECTION_VIEW_FILTER_REMOVED_SIGNAL, - VIEW_COLLECTION_LAST_SIGNAL + VIEW_COLLECTION_NUM_SIGNALS }; -static guint view_collection_signals[VIEW_COLLECTION_LAST_SIGNAL] = {0}; +static guint view_collection_signals[VIEW_COLLECTION_NUM_SIGNALS] = {0}; typedef struct _ViewManagerPrivate ViewManagerPrivate; typedef struct _ParamSpecViewManager ParamSpecViewManager; typedef struct _ViewFilterPrivate ViewFilterPrivate; typedef struct _ParamSpecViewFilter ParamSpecViewFilter; enum { VIEW_FILTER_REFRESH_SIGNAL, - VIEW_FILTER_LAST_SIGNAL + VIEW_FILTER_NUM_SIGNALS }; -static guint view_filter_signals[VIEW_FILTER_LAST_SIGNAL] = {0}; +static guint view_filter_signals[VIEW_FILTER_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -440,17 +446,29 @@ static gpointer view_filter_parent_class = NULL; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType marker_get_type (void) G_GNUC_CONST; @@ -458,60 +476,99 @@ GType view_collection_get_type (void) G_GNUC_CONST; GType data_view_get_type (void) G_GNUC_CONST; gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; gpointer view_collection_monitor_ref (gpointer instance); void view_collection_monitor_unref (gpointer instance); -GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void view_collection_value_set_monitor (GValue* value, gpointer v_object); -void view_collection_value_take_monitor (GValue* value, gpointer v_object); +GParamSpec* view_collection_param_spec_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void view_collection_value_set_monitor (GValue* value, + gpointer v_object); +void view_collection_value_take_monitor (GValue* value, + gpointer v_object); gpointer view_collection_value_get_monitor (const GValue* value); GType view_collection_monitor_get_type (void) G_GNUC_CONST; static GType view_collection_monitor_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; GType data_source_get_type (void) G_GNUC_CONST; gpointer data_set_ref (gpointer instance); void data_set_unref (gpointer instance); -GParamSpec* param_spec_data_set (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_set (GValue* value, gpointer v_object); -void value_take_data_set (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_set (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_set (GValue* value, + gpointer v_object); +void value_take_data_set (GValue* value, + gpointer v_object); gpointer value_get_data_set (const GValue* value); GType data_set_get_type (void) G_GNUC_CONST; #define VIEW_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_VIEW_COLLECTION, ViewCollectionPrivate)) -enum { - VIEW_COLLECTION_DUMMY_PROPERTY -}; DataSet* data_set_new (void); DataSet* data_set_construct (GType object_type); ViewCollection* view_collection_new (const gchar* name); -ViewCollection* view_collection_construct (GType object_type, const gchar* name); +ViewCollection* view_collection_construct (GType object_type, + const gchar* name); DataCollection* data_collection_new (const gchar* name); -DataCollection* data_collection_construct (GType object_type, const gchar* name); -void view_collection_notify_items_selected_unselected (ViewCollection* self, GeeCollection* selected, GeeCollection* unselected); -static void view_collection_real_notify_items_selected_unselected (ViewCollection* self, GeeCollection* selected, GeeCollection* unselected); +DataCollection* data_collection_construct (GType object_type, + const gchar* name); +void view_collection_notify_items_selected_unselected (ViewCollection* self, + GeeCollection* selected, + GeeCollection* unselected); +static void view_collection_real_notify_items_selected_unselected (ViewCollection* self, + GeeCollection* selected, + GeeCollection* unselected); void view_collection_notify_selection_group_altered (ViewCollection* self); static void view_collection_real_notify_selection_group_altered (ViewCollection* self); -void view_collection_notify_item_view_altered (ViewCollection* self, DataView* view); -static void view_collection_real_notify_item_view_altered (ViewCollection* self, DataView* view); -void view_collection_notify_views_altered (ViewCollection* self, GeeCollection* views); -static void view_collection_real_notify_views_altered (ViewCollection* self, GeeCollection* views); -void view_collection_notify_item_geometry_altered (ViewCollection* self, DataView* view); -static void view_collection_real_notify_item_geometry_altered (ViewCollection* self, DataView* view); -void view_collection_notify_geometries_altered (ViewCollection* self, GeeCollection* views); -static void view_collection_real_notify_geometries_altered (ViewCollection* self, GeeCollection* views); -void view_collection_notify_items_shown (ViewCollection* self, GeeCollection* shown); -static void view_collection_real_notify_items_shown (ViewCollection* self, GeeCollection* shown); -void view_collection_notify_items_hidden (ViewCollection* self, GeeCollection* hidden); -static void view_collection_real_notify_items_hidden (ViewCollection* self, GeeCollection* hidden); -void view_collection_notify_items_visibility_changed (ViewCollection* self, GeeCollection* changed); -static void view_collection_real_notify_items_visibility_changed (ViewCollection* self, GeeCollection* changed); -void view_collection_notify_view_filter_installed (ViewCollection* self, ViewFilter* filter); -static void view_collection_real_notify_view_filter_installed (ViewCollection* self, ViewFilter* filter); -void view_collection_notify_view_filter_removed (ViewCollection* self, ViewFilter* filter); -static void view_collection_real_notify_view_filter_removed (ViewCollection* self, ViewFilter* filter); +void view_collection_notify_item_view_altered (ViewCollection* self, + DataView* view); +static void view_collection_real_notify_item_view_altered (ViewCollection* self, + DataView* view); +void view_collection_notify_views_altered (ViewCollection* self, + GeeCollection* views); +static void view_collection_real_notify_views_altered (ViewCollection* self, + GeeCollection* views); +void view_collection_notify_item_geometry_altered (ViewCollection* self, + DataView* view); +static void view_collection_real_notify_item_geometry_altered (ViewCollection* self, + DataView* view); +void view_collection_notify_geometries_altered (ViewCollection* self, + GeeCollection* views); +static void view_collection_real_notify_geometries_altered (ViewCollection* self, + GeeCollection* views); +void view_collection_notify_items_shown (ViewCollection* self, + GeeCollection* shown); +static void view_collection_real_notify_items_shown (ViewCollection* self, + GeeCollection* shown); +void view_collection_notify_items_hidden (ViewCollection* self, + GeeCollection* hidden); +static void view_collection_real_notify_items_hidden (ViewCollection* self, + GeeCollection* hidden); +void view_collection_notify_items_visibility_changed (ViewCollection* self, + GeeCollection* changed); +static void view_collection_real_notify_items_visibility_changed (ViewCollection* self, + GeeCollection* changed); +void view_collection_notify_view_filter_installed (ViewCollection* self, + ViewFilter* filter); +static void view_collection_real_notify_view_filter_installed (ViewCollection* self, + ViewFilter* filter); +void view_collection_notify_view_filter_removed (ViewCollection* self, + ViewFilter* filter); +static void view_collection_real_notify_view_filter_removed (ViewCollection* self, + ViewFilter* filter); static void view_collection_real_clear (DataCollection* base); gchar* data_collection_to_string (DataCollection* self); void data_collection_clear (DataCollection* self); @@ -519,79 +576,179 @@ static void view_collection_real_close (DataCollection* base); void view_collection_halt_all_monitoring (ViewCollection* self); void view_collection_halt_mirroring (ViewCollection* self); static void view_collection_on_view_filter_refresh (ViewCollection* self); -static void _view_collection_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, gpointer self); +static void _view_collection_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, + gpointer self); void data_collection_close (DataCollection* self); gpointer view_manager_ref (gpointer instance); void view_manager_unref (gpointer instance); -GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_manager (GValue* value, gpointer v_object); -void value_take_view_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_manager (GValue* value, + gpointer v_object); +void value_take_view_manager (GValue* value, + gpointer v_object); gpointer value_get_view_manager (const GValue* value); GType view_manager_get_type (void) G_GNUC_CONST; -ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target); +ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq, + GeeCollection* initial, + ProgressMonitor progress_monitor, + void* progress_monitor_target); void data_collection_freeze_notifications (DataCollection* self); -static ViewCollectionMonitorImpl* view_collection_monitor_impl_new (ViewCollection* owner, SourceCollection* sources, ViewManager* manager, Alteration* prereq); -static ViewCollectionMonitorImpl* view_collection_monitor_impl_construct (GType object_type, ViewCollection* owner, SourceCollection* sources, ViewManager* manager, Alteration* prereq); -DataView* view_manager_create_view (ViewManager* self, DataSource* source); -GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); -static void view_collection_add_sources (ViewCollection* self, SourceCollection* sources, GeeIterable* added, ProgressMonitor progress_monitor, void* progress_monitor_target); +static ViewCollectionMonitorImpl* view_collection_monitor_impl_new (ViewCollection* owner, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq); +static ViewCollectionMonitorImpl* view_collection_monitor_impl_construct (GType object_type, + ViewCollection* owner, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq); +DataView* view_manager_create_view (ViewManager* self, + DataSource* source); +GeeCollection* data_collection_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); +static void view_collection_add_sources (ViewCollection* self, + SourceCollection* sources, + GeeIterable* added, + ProgressMonitor progress_monitor, + void* progress_monitor_target); GeeCollection* data_collection_get_all (DataCollection* self); void data_collection_thaw_notifications (DataCollection* self); -void view_collection_halt_monitoring (ViewCollection* self, ViewCollectionMonitor* m); -void view_collection_mirror (ViewCollection* self, ViewCollection* to_mirror, CreateView mirroring_ctor, void* mirroring_ctor_target, CreateViewPredicate should_mirror, void* should_mirror_target); -void data_collection_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target); -Comparator data_collection_get_comparator (DataCollection* self, void** result_target); -ComparatorPredicate data_collection_get_comparator_predicate (DataCollection* self, void** result_target); -static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeIterable* added); -static void _view_collection_on_mirror_contents_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self); -static void view_collection_on_mirror_contents_removed (ViewCollection* self, GeeIterable* removed); -static void _view_collection_on_mirror_contents_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self); -void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, CreateView copying_ctor, void* copying_ctor_target, CreateViewPredicate should_copy, void* should_copy_target); +void view_collection_halt_monitoring (ViewCollection* self, + ViewCollectionMonitor* m); +void view_collection_mirror (ViewCollection* self, + ViewCollection* to_mirror, + CreateView mirroring_ctor, + void* mirroring_ctor_target, + CreateViewPredicate should_mirror, + void* should_mirror_target); +void data_collection_set_comparator (DataCollection* self, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target); +Comparator data_collection_get_comparator (DataCollection* self, + void** result_target); +ComparatorPredicate data_collection_get_comparator_predicate (DataCollection* self, + void** result_target); +static void view_collection_on_mirror_contents_added (ViewCollection* self, + GeeIterable* added); +static void _view_collection_on_mirror_contents_added_data_collection_items_added (DataCollection* _sender, + GeeIterable* added, + gpointer self); +static void view_collection_on_mirror_contents_removed (ViewCollection* self, + GeeIterable* removed); +static void _view_collection_on_mirror_contents_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self); +void view_collection_copy_into (ViewCollection* self, + ViewCollection* to_copy, + CreateView copying_ctor, + void* copying_ctor_target, + CreateViewPredicate should_copy, + void* should_copy_target); DataSource* data_view_get_source (DataView* self); -gboolean view_collection_is_view_filter_installed (ViewCollection* self, ViewFilter* f); -void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f); -void view_collection_remove_view_filter (ViewCollection* self, ViewFilter* f); -static void view_collection_filter_altered_items (ViewCollection* self, GeeCollection* views); -static gboolean view_collection_is_in_filter (ViewCollection* self, DataView* view); -gboolean view_filter_predicate (ViewFilter* self, DataView* view); -static gboolean view_collection_real_valid_type (DataCollection* base, DataObject* object); -static void view_collection_on_sources_added (ViewCollection* self, DataCollection* sources, GeeIterable* added); -gboolean view_manager_include_in_view (ViewManager* self, DataSource* source); -static DataView* _view_manager_create_view_create_view (DataSource* source, gpointer self); -gboolean data_collection_add (DataCollection* self, DataObject* object); -static gboolean view_collection_real_add (DataCollection* base, DataObject* object); -void data_view_internal_set_visible (DataView* self, gboolean visible); +gboolean view_collection_is_view_filter_installed (ViewCollection* self, + ViewFilter* f); +void view_collection_install_view_filter (ViewCollection* self, + ViewFilter* f); +void view_collection_remove_view_filter (ViewCollection* self, + ViewFilter* f); +static void view_collection_filter_altered_items (ViewCollection* self, + GeeCollection* views); +static gboolean view_collection_is_in_filter (ViewCollection* self, + DataView* view); +gboolean view_filter_predicate (ViewFilter* self, + DataView* view); +static gboolean view_collection_real_valid_type (DataCollection* base, + DataObject* object); +static void view_collection_on_sources_added (ViewCollection* self, + DataCollection* sources, + GeeIterable* added); +gboolean view_manager_include_in_view (ViewManager* self, + DataSource* source); +static DataView* _view_manager_create_view_create_view (DataSource* source, + gpointer self); +gboolean data_collection_add (DataCollection* self, + DataObject* object); +static gboolean view_collection_real_add (DataCollection* base, + DataObject* object); +void data_view_internal_set_visible (DataView* self, + gboolean visible); GeeCollection* data_collection_get_singleton (DataObject* object); -static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); -static void view_collection_on_sources_removed (ViewCollection* self, GeeIterable* removed); +static GeeCollection* view_collection_real_add_many (DataCollection* base, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); +static void view_collection_on_sources_removed (ViewCollection* self, + GeeIterable* removed); Marker* data_collection_start_marking (DataCollection* self); -void marker_mark (Marker* self, DataObject* object); +void marker_mark (Marker* self, + DataObject* object); gint marker_get_count (Marker* self); -void data_collection_remove_marked (DataCollection* self, Marker* m); -static void view_collection_on_sources_altered (ViewCollection* self, DataCollection* collection, GeeMap* items); -gboolean alteration_contains_any (Alteration* self, Alteration* other); -gboolean view_collection_has_view_for_source (ViewCollection* self, DataSource* source); -DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source); -gboolean data_set_contains (DataSet* self, DataObject* object); -gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration* alteration); -static gboolean view_collection_is_visible (ViewCollection* self, DataView* view); -Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects); +void data_collection_remove_marked (DataCollection* self, + Marker* m); +static void view_collection_on_sources_altered (ViewCollection* self, + DataCollection* collection, + GeeMap* items); +gboolean alteration_contains_any (Alteration* self, + Alteration* other); +gboolean view_collection_has_view_for_source (ViewCollection* self, + DataSource* source); +DataView* view_collection_get_view_for_source (ViewCollection* self, + DataSource* source); +gboolean data_set_contains (DataSet* self, + DataObject* object); +gboolean data_set_resort_object (DataSet* self, + DataObject* object, + Alteration* alteration); +static gboolean view_collection_is_visible (ViewCollection* self, + DataView* view); +Marker* data_collection_mark_many (DataCollection* self, + GeeCollection* objects); void data_collection_notify_ordering_changed (DataCollection* self); -static void view_collection_real_notify_items_added (DataCollection* base, GeeIterable* added); +static void view_collection_real_notify_items_added (DataCollection* base, + GeeIterable* added); gboolean data_view_is_selected (DataView* self); gboolean data_view_is_visible (DataView* self); -static gboolean view_collection_add_many_visible (ViewCollection* self, GeeCollection* many); -static void view_collection_add_many_selected (ViewCollection* self, GeeCollection* views); -void data_collection_notify_items_added (DataCollection* self, GeeIterable* added); -static void view_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed); -gboolean data_set_remove (DataSet* self, DataObject* object); -static void view_collection_remove_many_selected (ViewCollection* self, GeeCollection* views); -void data_collection_notify_items_removed (DataCollection* self, GeeIterable* removed); -static void view_collection_show_items (ViewCollection* self, GeeList* to_show); -static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide); -static void view_collection_real_items_altered (DataCollection* base, GeeMap* map); -static void view_collection_real_set_comparator (DataCollection* base, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target); -void data_set_set_comparator (DataSet* self, Comparator user_comparator, void* user_comparator_target, ComparatorPredicate comparator_predicate, void* comparator_predicate_target); +static gboolean view_collection_add_many_visible (ViewCollection* self, + GeeCollection* many); +static void view_collection_add_many_selected (ViewCollection* self, + GeeCollection* views); +void data_collection_notify_items_added (DataCollection* self, + GeeIterable* added); +static void view_collection_real_notify_items_removed (DataCollection* base, + GeeIterable* removed); +gboolean data_set_remove (DataSet* self, + DataObject* object); +static void view_collection_remove_many_selected (ViewCollection* self, + GeeCollection* views); +void data_collection_notify_items_removed (DataCollection* self, + GeeIterable* removed); +static void view_collection_show_items (ViewCollection* self, + GeeList* to_show); +static void view_collection_hide_items (ViewCollection* self, + GeeList* to_hide); +static void view_collection_real_items_altered (DataCollection* base, + GeeMap* map); +static void view_collection_real_set_comparator (DataCollection* base, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target); +void data_set_set_comparator (DataSet* self, + Comparator user_comparator, + void* user_comparator_target, + ComparatorPredicate comparator_predicate, + void* comparator_predicate_target); static void view_collection_real_reset_comparator (DataCollection* base); void data_set_reset_comparator (DataSet* self); void data_collection_reset_comparator (DataCollection* self); @@ -602,14 +759,22 @@ static gint view_collection_real_get_count (DataCollection* base); gint data_set_get_count (DataSet* self); gint data_collection_get_count (DataCollection* self); gint view_collection_get_unfiltered_count (ViewCollection* self); -static DataObject* view_collection_real_get_at (DataCollection* base, gint index); -DataObject* data_set_get_at (DataSet* self, gint index); -DataObject* data_collection_get_at (DataCollection* self, gint index); -static gint view_collection_real_index_of (DataCollection* base, DataObject* object); -gint data_set_index_of (DataSet* self, DataObject* object); -gint data_collection_index_of (DataCollection* self, DataObject* object); -static gboolean view_collection_real_contains (DataCollection* base, DataObject* object); -gboolean data_collection_contains (DataCollection* self, DataObject* object); +static DataObject* view_collection_real_get_at (DataCollection* base, + gint index); +DataObject* data_set_get_at (DataSet* self, + gint index); +DataObject* data_collection_get_at (DataCollection* self, + gint index); +static gint view_collection_real_index_of (DataCollection* base, + DataObject* object); +gint data_set_index_of (DataSet* self, + DataObject* object); +gint data_collection_index_of (DataCollection* self, + DataObject* object); +static gboolean view_collection_real_contains (DataCollection* base, + DataObject* object); +gboolean data_collection_contains (DataCollection* self, + DataObject* object); DataView* view_collection_get_first (ViewCollection* self); static DataView* view_collection_real_get_first (ViewCollection* self); DataView* view_collection_get_first_unrejected (ViewCollection* self); @@ -618,576 +783,649 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; GType rating_get_type (void) G_GNUC_CONST; Rating media_source_get_rating (MediaSource* self); -DataView* view_collection_get_next (ViewCollection* self, DataView* view); +DataView* view_collection_get_next (ViewCollection* self, + DataView* view); DataView* view_collection_get_last (ViewCollection* self); static DataView* view_collection_real_get_last (ViewCollection* self); -static DataView* view_collection_real_get_next (ViewCollection* self, DataView* view); -DataView* view_collection_get_previous (ViewCollection* self, DataView* view); -static DataView* view_collection_real_get_previous (ViewCollection* self, DataView* view); -gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource* * next, DataSource* * prev, const gchar* type_selector); +static DataView* view_collection_real_get_next (ViewCollection* self, + DataView* view); +DataView* view_collection_get_previous (ViewCollection* self, + DataView* view); +static DataView* view_collection_real_get_previous (ViewCollection* self, + DataView* view); +gboolean view_collection_get_immediate_neighbors (ViewCollection* self, + DataSource* home, + DataSource* * next, + DataSource* * prev, + const gchar* type_selector); gchar* data_source_get_typename (DataSource* self); -GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource* home, const gchar* typename); -gboolean data_set_add_many (DataSet* self, GeeCollection* objects); -gboolean data_set_remove_many (DataSet* self, GeeCollection* objects); -void view_collection_select_marked (ViewCollection* self, Marker* marker); -void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedAction action, void* action_target, ProgressMonitor monitor, void* monitor_target, GObject* user); -static gboolean view_collection_select_item (ViewCollection* self, DataObject* object, GObject* user); -static gboolean _view_collection_select_item_marked_action (DataObject* object, GObject* user, gpointer self); +GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, + DataSource* home, + const gchar* typename); +gboolean data_set_add_many (DataSet* self, + GeeCollection* objects); +gboolean data_set_remove_many (DataSet* self, + GeeCollection* objects); +void view_collection_select_marked (ViewCollection* self, + Marker* marker); +void data_collection_act_on_marked (DataCollection* self, + Marker* m, + MarkedAction action, + void* action_target, + ProgressMonitor monitor, + void* monitor_target, + GObject* user); +static gboolean view_collection_select_item (ViewCollection* self, + DataObject* object, + GObject* user); +static gboolean _view_collection_select_item_marked_action (DataObject* object, + GObject* user, + gpointer self); void view_collection_select_all (ViewCollection* self); void marker_mark_all (Marker* self); -void data_view_internal_set_selected (DataView* self, gboolean selected); -void view_collection_unselect_marked (ViewCollection* self, Marker* marker); -static gboolean view_collection_unselect_item (ViewCollection* self, DataObject* object, GObject* user); -static gboolean _view_collection_unselect_item_marked_action (DataObject* object, GObject* user, gpointer self); +void data_view_internal_set_selected (DataView* self, + gboolean selected); +void view_collection_unselect_marked (ViewCollection* self, + Marker* marker); +static gboolean view_collection_unselect_item (ViewCollection* self, + DataObject* object, + GObject* user); +static gboolean _view_collection_unselect_item_marked_action (DataObject* object, + GObject* user, + gpointer self); void view_collection_unselect_all (ViewCollection* self); -void marker_mark_many (Marker* self, GeeCollection* list); +void marker_mark_many (Marker* self, + GeeCollection* list); GeeList* view_collection_get_selected (ViewCollection* self); -void view_collection_unselect_all_but (ViewCollection* self, DataView* exception); -void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* unselect, Marker* select); -void view_collection_toggle_marked (ViewCollection* self, Marker* marker); +void view_collection_unselect_all_but (ViewCollection* self, + DataView* exception); +void view_collection_unselect_and_select_marked (ViewCollection* self, + Marker* unselect, + Marker* select); +void view_collection_toggle_marked (ViewCollection* self, + Marker* marker); static GType view_collection_toggle_lists_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static ViewCollectionToggleLists* view_collection_toggle_lists_new (void); static ViewCollectionToggleLists* view_collection_toggle_lists_construct (GType object_type); -static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* object, GObject* user); -static gboolean _view_collection_toggle_item_marked_action (DataObject* object, GObject* user, gpointer self); +static gboolean view_collection_toggle_item (ViewCollection* self, + DataObject* object, + GObject* user); +static gboolean _view_collection_toggle_item_marked_action (DataObject* object, + GObject* user, + gpointer self); gboolean data_view_internal_toggle (DataView* self); gint view_collection_get_selected_count (ViewCollection* self); -DataView* view_collection_get_selected_at (ViewCollection* self, gint index); +DataView* view_collection_get_selected_at (ViewCollection* self, + gint index); DataSet* data_collection_get_dataset_copy (DataCollection* self); -gboolean view_collection_has_view_for_source_with_filtered (ViewCollection* self, DataSource* source); -DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, DataSource* source); +gboolean view_collection_has_view_for_source_with_filtered (ViewCollection* self, + DataSource* source); +DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, + DataSource* source); GeeCollection* view_collection_get_sources (ViewCollection* self); -gboolean view_collection_has_source_of_type (ViewCollection* self, GType t); -gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t); -GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t); +gboolean view_collection_has_source_of_type (ViewCollection* self, + GType t); +gint view_collection_get_sources_of_type_count (ViewCollection* self, + GType t); +GeeList* view_collection_get_sources_of_type (ViewCollection* self, + GType t); GeeList* view_collection_get_selected_sources (ViewCollection* self); -DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index); -GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t); -gint view_collection_index_of_source (ViewCollection* self, DataSource* source); -void view_collection_internal_notify_view_altered (ViewCollection* self, DataView* view); +DataSource* view_collection_get_selected_source_at (ViewCollection* self, + gint index); +GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, + GType t); +gint view_collection_index_of_source (ViewCollection* self, + DataSource* source); +void view_collection_internal_notify_view_altered (ViewCollection* self, + DataView* view); gboolean data_collection_are_notifications_frozen (DataCollection* self); -void view_collection_internal_notify_geometry_altered (ViewCollection* self, DataView* view); +void view_collection_internal_notify_geometry_altered (ViewCollection* self, + DataView* view); static void view_collection_real_notify_thawed (DataCollection* base); void data_collection_notify_thawed (DataCollection* self); gboolean view_collection_are_items_filtered_out (ViewCollection* self); -static void view_collection_real_items_selected (ViewCollection* self, GeeIterable* selected); -static void view_collection_real_items_unselected (ViewCollection* self, GeeIterable* unselected); -static void view_collection_real_items_state_changed (ViewCollection* self, GeeIterable* changed); +static void view_collection_real_items_selected (ViewCollection* self, + GeeIterable* selected); +static void view_collection_real_items_unselected (ViewCollection* self, + GeeIterable* unselected); +static void view_collection_real_items_state_changed (ViewCollection* self, + GeeIterable* changed); static void view_collection_real_selection_group_altered (ViewCollection* self); -static void view_collection_real_items_shown (ViewCollection* self, GeeCollection* visible); -static void view_collection_real_items_hidden (ViewCollection* self, GeeCollection* hidden); -static void view_collection_real_items_visibility_changed (ViewCollection* self, GeeCollection* changed); -static void view_collection_real_item_view_altered (ViewCollection* self, DataView* view); -static void view_collection_real_item_geometry_altered (ViewCollection* self, DataView* view); -static void view_collection_real_views_altered (ViewCollection* self, GeeCollection* views); -static void view_collection_real_geometries_altered (ViewCollection* self, GeeCollection* views); -static void view_collection_real_view_filter_installed (ViewCollection* self, ViewFilter* filer); -static void g_cclosure_user_marshal_VOID__VIEW_FILTER (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void view_collection_real_view_filter_removed (ViewCollection* self, ViewFilter* filer); -enum { - VIEW_COLLECTION_MONITOR_DUMMY_PROPERTY -}; +static void view_collection_real_items_shown (ViewCollection* self, + GeeCollection* visible); +static void view_collection_real_items_hidden (ViewCollection* self, + GeeCollection* hidden); +static void view_collection_real_items_visibility_changed (ViewCollection* self, + GeeCollection* changed); +static void view_collection_real_item_view_altered (ViewCollection* self, + DataView* view); +static void view_collection_real_item_geometry_altered (ViewCollection* self, + DataView* view); +static void view_collection_real_views_altered (ViewCollection* self, + GeeCollection* views); +static void view_collection_real_geometries_altered (ViewCollection* self, + GeeCollection* views); +static void view_collection_real_view_filter_installed (ViewCollection* self, + ViewFilter* filer); +static void g_cclosure_user_marshal_VOID__VIEW_FILTER (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void view_collection_real_view_filter_removed (ViewCollection* self, + ViewFilter* filer); ViewCollectionMonitor* view_collection_monitor_new (void); ViewCollectionMonitor* view_collection_monitor_construct (GType object_type); static void view_collection_monitor_finalize (ViewCollectionMonitor * obj); -enum { - VIEW_COLLECTION_MONITOR_IMPL_DUMMY_PROPERTY -}; -static void _view_collection_on_sources_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self); -static void _view_collection_on_sources_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self); -static void _view_collection_on_sources_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void _view_collection_on_sources_added_data_collection_items_added (DataCollection* _sender, + GeeIterable* added, + gpointer self); +static void _view_collection_on_sources_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self); +static void _view_collection_on_sources_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); static void view_collection_monitor_impl_finalize (ViewCollectionMonitor * obj); -enum { - VIEW_COLLECTION_TOGGLE_LISTS_DUMMY_PROPERTY -}; static void view_collection_toggle_lists_finalize (GObject * obj); static void view_collection_finalize (DataCollection * obj); -enum { - VIEW_MANAGER_DUMMY_PROPERTY -}; -static gboolean view_manager_real_include_in_view (ViewManager* self, DataSource* source); -static DataView* view_manager_real_create_view (ViewManager* self, DataSource* source); +static gboolean view_manager_real_include_in_view (ViewManager* self, + DataSource* source); +static DataView* view_manager_real_create_view (ViewManager* self, + DataSource* source); ViewManager* view_manager_construct (GType object_type); static void view_manager_finalize (ViewManager * obj); -enum { - VIEW_FILTER_DUMMY_PROPERTY -}; -static gboolean view_filter_real_predicate (ViewFilter* self, DataView* view); +static gboolean view_filter_real_predicate (ViewFilter* self, + DataView* view); ViewFilter* view_filter_construct (GType object_type); static void view_filter_real_refresh (ViewFilter* self); static void view_filter_finalize (ViewFilter * obj); -ViewCollection* view_collection_construct (GType object_type, const gchar* name) { +ViewCollection* +view_collection_construct (GType object_type, + const gchar* name) +{ ViewCollection* self = NULL; - const gchar* _tmp0_; #line 125 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (name != NULL, NULL); #line 126 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = name; -#line 126 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self = (ViewCollection*) data_collection_construct (object_type, _tmp0_); + self = (ViewCollection*) data_collection_construct (object_type, name); #line 125 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self; -#line 733 "ViewCollection.c" +#line 958 "ViewCollection.c" } -ViewCollection* view_collection_new (const gchar* name) { +ViewCollection* +view_collection_new (const gchar* name) +{ #line 125 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return view_collection_construct (TYPE_VIEW_COLLECTION, name); -#line 740 "ViewCollection.c" +#line 967 "ViewCollection.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self ? g_object_ref (self) : NULL; -#line 747 "ViewCollection.c" +#line 976 "ViewCollection.c" } -static void view_collection_real_notify_items_selected_unselected (ViewCollection* self, GeeCollection* selected, GeeCollection* unselected) { +static void +view_collection_real_notify_items_selected_unselected (ViewCollection* self, + GeeCollection* selected, + GeeCollection* unselected) +{ gboolean _tmp0_ = FALSE; - GeeCollection* _tmp1_; gboolean has_selected = FALSE; - gboolean _tmp5_ = FALSE; - GeeCollection* _tmp6_; + gboolean _tmp3_ = FALSE; gboolean has_unselected = FALSE; - gboolean _tmp10_; - gboolean _tmp12_; + gboolean _tmp6_; + gboolean _tmp7_; GeeCollection* sum = NULL; - gboolean _tmp14_ = FALSE; - gboolean _tmp15_; - GeeCollection* _tmp32_; + gboolean _tmp8_ = FALSE; + gboolean _tmp9_; + GeeCollection* _tmp22_; #line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail ((selected == NULL) || GEE_IS_COLLECTION (selected)); #line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail ((unselected == NULL) || GEE_IS_COLLECTION (unselected)); #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = selected; -#line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp1_ != NULL) { -#line 772 "ViewCollection.c" - GeeCollection* _tmp2_; - gint _tmp3_; - gint _tmp4_; -#line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = selected; + if (selected != NULL) { +#line 1001 "ViewCollection.c" + gint _tmp1_; + gint _tmp2_; #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_collection_get_size (_tmp2_); + _tmp1_ = gee_collection_get_size (selected); #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = _tmp4_ > 0; -#line 784 "ViewCollection.c" + _tmp0_ = _tmp2_ > 0; +#line 1010 "ViewCollection.c" } else { #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = FALSE; -#line 788 "ViewCollection.c" +#line 1014 "ViewCollection.c" } #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" has_selected = _tmp0_; #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = unselected; -#line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp6_ != NULL) { -#line 796 "ViewCollection.c" - GeeCollection* _tmp7_; - gint _tmp8_; - gint _tmp9_; -#line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = unselected; + if (unselected != NULL) { +#line 1020 "ViewCollection.c" + gint _tmp4_; + gint _tmp5_; #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = gee_collection_get_size (_tmp7_); + _tmp4_ = gee_collection_get_size (unselected); #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = _tmp8_; + _tmp5_ = _tmp4_; #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _tmp9_ > 0; -#line 808 "ViewCollection.c" + _tmp3_ = _tmp5_ > 0; +#line 1029 "ViewCollection.c" } else { #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = FALSE; -#line 812 "ViewCollection.c" + _tmp3_ = FALSE; +#line 1033 "ViewCollection.c" } #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - has_unselected = _tmp5_; + has_unselected = _tmp3_; #line 134 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = has_selected; + _tmp6_ = has_selected; #line 134 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp10_) { -#line 820 "ViewCollection.c" - GeeCollection* _tmp11_; + if (_tmp6_) { #line 135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = selected; -#line 135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_SELECTED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 826 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_SELECTED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (selected, GEE_TYPE_ITERABLE, GeeIterable)); +#line 1043 "ViewCollection.c" } #line 137 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = has_unselected; + _tmp7_ = has_unselected; #line 137 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp12_) { -#line 832 "ViewCollection.c" - GeeCollection* _tmp13_; -#line 138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = unselected; + if (_tmp7_) { #line 138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_UNSELECTED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 838 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_UNSELECTED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (unselected, GEE_TYPE_ITERABLE, GeeIterable)); +#line 1051 "ViewCollection.c" } #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = has_selected; + _tmp9_ = has_selected; #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp15_) { -#line 844 "ViewCollection.c" - gboolean _tmp16_; + if (_tmp9_) { +#line 1057 "ViewCollection.c" + gboolean _tmp10_; #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = has_unselected; + _tmp10_ = has_unselected; #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = !_tmp16_; -#line 850 "ViewCollection.c" + _tmp8_ = !_tmp10_; +#line 1063 "ViewCollection.c" } else { #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = FALSE; -#line 854 "ViewCollection.c" + _tmp8_ = FALSE; +#line 1067 "ViewCollection.c" } #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp14_) { -#line 858 "ViewCollection.c" - GeeCollection* _tmp17_; - GeeCollection* _tmp18_; -#line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = selected; + if (_tmp8_) { +#line 1071 "ViewCollection.c" + GeeCollection* _tmp11_; #line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = _g_object_ref0 (_tmp17_); + _tmp11_ = _g_object_ref0 (selected); #line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (sum); #line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - sum = _tmp18_; -#line 869 "ViewCollection.c" + sum = _tmp11_; +#line 1079 "ViewCollection.c" } else { - gboolean _tmp19_ = FALSE; - gboolean _tmp20_; + gboolean _tmp12_ = FALSE; + gboolean _tmp13_; #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = has_selected; + _tmp13_ = has_selected; #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp20_) { -#line 877 "ViewCollection.c" - gboolean _tmp21_; + if (!_tmp13_) { +#line 1087 "ViewCollection.c" + gboolean _tmp14_; #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = has_unselected; + _tmp14_ = has_unselected; #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = _tmp21_; -#line 883 "ViewCollection.c" + _tmp12_ = _tmp14_; +#line 1093 "ViewCollection.c" } else { #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = FALSE; -#line 887 "ViewCollection.c" + _tmp12_ = FALSE; +#line 1097 "ViewCollection.c" } #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp19_) { -#line 891 "ViewCollection.c" - GeeCollection* _tmp22_; - GeeCollection* _tmp23_; + if (_tmp12_) { +#line 1101 "ViewCollection.c" + GeeCollection* _tmp15_; #line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = unselected; -#line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = _g_object_ref0 (_tmp22_); + _tmp15_ = _g_object_ref0 (unselected); #line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (sum); #line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - sum = _tmp23_; -#line 902 "ViewCollection.c" + sum = _tmp15_; +#line 1109 "ViewCollection.c" } else { - gboolean _tmp24_ = FALSE; - gboolean _tmp25_; + gboolean _tmp16_ = FALSE; + gboolean _tmp17_; #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = has_selected; + _tmp17_ = has_selected; #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp25_) { -#line 910 "ViewCollection.c" - gboolean _tmp26_; + if (!_tmp17_) { +#line 1117 "ViewCollection.c" + gboolean _tmp18_; #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp26_ = has_unselected; + _tmp18_ = has_unselected; #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = !_tmp26_; -#line 916 "ViewCollection.c" + _tmp16_ = !_tmp18_; +#line 1123 "ViewCollection.c" } else { #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = FALSE; -#line 920 "ViewCollection.c" + _tmp16_ = FALSE; +#line 1127 "ViewCollection.c" } #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp24_) { + if (_tmp16_) { #line 146 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (sum); #line 146 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" sum = NULL; -#line 928 "ViewCollection.c" +#line 1135 "ViewCollection.c" } else { - GeeHashSet* _tmp27_; - GeeCollection* _tmp28_; - GeeCollection* _tmp29_; - GeeCollection* _tmp30_; - GeeCollection* _tmp31_; + GeeHashSet* _tmp19_; + GeeCollection* _tmp20_; + GeeCollection* _tmp21_; #line 148 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp19_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 148 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (sum); #line 148 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - sum = G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection); + sum = G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection); #line 149 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp28_ = sum; + _tmp20_ = sum; #line 149 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp29_ = selected; -#line 149 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_collection_add_all (_tmp28_, _tmp29_); -#line 150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp30_ = sum; + gee_collection_add_all (_tmp20_, selected); #line 150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp31_ = unselected; + _tmp21_ = sum; #line 150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_collection_add_all (_tmp30_, _tmp31_); -#line 953 "ViewCollection.c" + gee_collection_add_all (_tmp21_, unselected); +#line 1154 "ViewCollection.c" } } } #line 153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp32_ = sum; + _tmp22_ = sum; #line 153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp32_ != NULL) { -#line 961 "ViewCollection.c" - GeeCollection* _tmp33_; + if (_tmp22_ != NULL) { +#line 1162 "ViewCollection.c" + GeeCollection* _tmp23_; #line 154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp33_ = sum; + _tmp23_ = sum; #line 154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_STATE_CHANGED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ITERABLE, GeeIterable)); + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_STATE_CHANGED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable)); #line 155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_notify_selection_group_altered (self); -#line 969 "ViewCollection.c" +#line 1170 "ViewCollection.c" } #line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (sum); -#line 973 "ViewCollection.c" +#line 1174 "ViewCollection.c" } -void view_collection_notify_items_selected_unselected (ViewCollection* self, GeeCollection* selected, GeeCollection* unselected) { +void +view_collection_notify_items_selected_unselected (ViewCollection* self, + GeeCollection* selected, + GeeCollection* unselected) +{ #line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_items_selected_unselected (self, selected, unselected); -#line 982 "ViewCollection.c" +#line 1187 "ViewCollection.c" } -static void view_collection_real_notify_selection_group_altered (ViewCollection* self) { +static void +view_collection_real_notify_selection_group_altered (ViewCollection* self) +{ #line 160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_SELECTION_GROUP_ALTERED_SIGNAL], 0); -#line 989 "ViewCollection.c" +#line 1196 "ViewCollection.c" } -void view_collection_notify_selection_group_altered (ViewCollection* self) { +void +view_collection_notify_selection_group_altered (ViewCollection* self) +{ #line 159 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 159 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_selection_group_altered (self); -#line 998 "ViewCollection.c" +#line 1207 "ViewCollection.c" } -static void view_collection_real_notify_item_view_altered (ViewCollection* self, DataView* view) { - DataView* _tmp0_; +static void +view_collection_real_notify_item_view_altered (ViewCollection* self, + DataView* view) +{ #line 163 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_DATA_VIEW (view)); #line 164 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = view; -#line 164 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEM_VIEW_ALTERED_SIGNAL], 0, _tmp0_); -#line 1010 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEM_VIEW_ALTERED_SIGNAL], 0, view); +#line 1219 "ViewCollection.c" } -void view_collection_notify_item_view_altered (ViewCollection* self, DataView* view) { +void +view_collection_notify_item_view_altered (ViewCollection* self, + DataView* view) +{ #line 163 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 163 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_item_view_altered (self, view); -#line 1019 "ViewCollection.c" +#line 1231 "ViewCollection.c" } -static void view_collection_real_notify_views_altered (ViewCollection* self, GeeCollection* views) { - GeeCollection* _tmp0_; +static void +view_collection_real_notify_views_altered (ViewCollection* self, + GeeCollection* views) +{ #line 167 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (views)); #line 168 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = views; -#line 168 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEWS_ALTERED_SIGNAL], 0, _tmp0_); -#line 1031 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEWS_ALTERED_SIGNAL], 0, views); +#line 1243 "ViewCollection.c" } -void view_collection_notify_views_altered (ViewCollection* self, GeeCollection* views) { +void +view_collection_notify_views_altered (ViewCollection* self, + GeeCollection* views) +{ #line 167 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 167 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_views_altered (self, views); -#line 1040 "ViewCollection.c" +#line 1255 "ViewCollection.c" } -static void view_collection_real_notify_item_geometry_altered (ViewCollection* self, DataView* view) { - DataView* _tmp0_; +static void +view_collection_real_notify_item_geometry_altered (ViewCollection* self, + DataView* view) +{ #line 171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_DATA_VIEW (view)); #line 172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = view; -#line 172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEM_GEOMETRY_ALTERED_SIGNAL], 0, _tmp0_); -#line 1052 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEM_GEOMETRY_ALTERED_SIGNAL], 0, view); +#line 1267 "ViewCollection.c" } -void view_collection_notify_item_geometry_altered (ViewCollection* self, DataView* view) { +void +view_collection_notify_item_geometry_altered (ViewCollection* self, + DataView* view) +{ #line 171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_item_geometry_altered (self, view); -#line 1061 "ViewCollection.c" +#line 1279 "ViewCollection.c" } -static void view_collection_real_notify_geometries_altered (ViewCollection* self, GeeCollection* views) { - GeeCollection* _tmp0_; +static void +view_collection_real_notify_geometries_altered (ViewCollection* self, + GeeCollection* views) +{ #line 175 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (views)); #line 176 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = views; -#line 176 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_GEOMETRIES_ALTERED_SIGNAL], 0, _tmp0_); -#line 1073 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_GEOMETRIES_ALTERED_SIGNAL], 0, views); +#line 1291 "ViewCollection.c" } -void view_collection_notify_geometries_altered (ViewCollection* self, GeeCollection* views) { +void +view_collection_notify_geometries_altered (ViewCollection* self, + GeeCollection* views) +{ #line 175 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 175 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_geometries_altered (self, views); -#line 1082 "ViewCollection.c" +#line 1303 "ViewCollection.c" } -static void view_collection_real_notify_items_shown (ViewCollection* self, GeeCollection* shown) { - GeeCollection* _tmp0_; +static void +view_collection_real_notify_items_shown (ViewCollection* self, + GeeCollection* shown) +{ #line 179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (shown)); #line 180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = shown; -#line 180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_SHOWN_SIGNAL], 0, _tmp0_); -#line 1094 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_SHOWN_SIGNAL], 0, shown); +#line 1315 "ViewCollection.c" } -void view_collection_notify_items_shown (ViewCollection* self, GeeCollection* shown) { +void +view_collection_notify_items_shown (ViewCollection* self, + GeeCollection* shown) +{ #line 179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_items_shown (self, shown); -#line 1103 "ViewCollection.c" +#line 1327 "ViewCollection.c" } -static void view_collection_real_notify_items_hidden (ViewCollection* self, GeeCollection* hidden) { - GeeCollection* _tmp0_; +static void +view_collection_real_notify_items_hidden (ViewCollection* self, + GeeCollection* hidden) +{ #line 183 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (hidden)); #line 184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = hidden; -#line 184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_HIDDEN_SIGNAL], 0, _tmp0_); -#line 1115 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_HIDDEN_SIGNAL], 0, hidden); +#line 1339 "ViewCollection.c" } -void view_collection_notify_items_hidden (ViewCollection* self, GeeCollection* hidden) { +void +view_collection_notify_items_hidden (ViewCollection* self, + GeeCollection* hidden) +{ #line 183 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 183 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_items_hidden (self, hidden); -#line 1124 "ViewCollection.c" +#line 1351 "ViewCollection.c" } -static void view_collection_real_notify_items_visibility_changed (ViewCollection* self, GeeCollection* changed) { - GeeCollection* _tmp0_; +static void +view_collection_real_notify_items_visibility_changed (ViewCollection* self, + GeeCollection* changed) +{ #line 187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (changed)); #line 188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = changed; -#line 188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_VISIBILITY_CHANGED_SIGNAL], 0, _tmp0_); -#line 1136 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_VISIBILITY_CHANGED_SIGNAL], 0, changed); +#line 1363 "ViewCollection.c" } -void view_collection_notify_items_visibility_changed (ViewCollection* self, GeeCollection* changed) { +void +view_collection_notify_items_visibility_changed (ViewCollection* self, + GeeCollection* changed) +{ #line 187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_items_visibility_changed (self, changed); -#line 1145 "ViewCollection.c" +#line 1375 "ViewCollection.c" } -static void view_collection_real_notify_view_filter_installed (ViewCollection* self, ViewFilter* filter) { - ViewFilter* _tmp0_; +static void +view_collection_real_notify_view_filter_installed (ViewCollection* self, + ViewFilter* filter) +{ #line 191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_FILTER (filter)); #line 192 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = filter; -#line 192 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_INSTALLED_SIGNAL], 0, _tmp0_); -#line 1157 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_INSTALLED_SIGNAL], 0, filter); +#line 1387 "ViewCollection.c" } -void view_collection_notify_view_filter_installed (ViewCollection* self, ViewFilter* filter) { +void +view_collection_notify_view_filter_installed (ViewCollection* self, + ViewFilter* filter) +{ #line 191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_view_filter_installed (self, filter); -#line 1166 "ViewCollection.c" +#line 1399 "ViewCollection.c" } -static void view_collection_real_notify_view_filter_removed (ViewCollection* self, ViewFilter* filter) { - ViewFilter* _tmp0_; +static void +view_collection_real_notify_view_filter_removed (ViewCollection* self, + ViewFilter* filter) +{ #line 195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_FILTER (filter)); #line 196 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = filter; -#line 196 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_REMOVED_SIGNAL], 0, _tmp0_); -#line 1178 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_REMOVED_SIGNAL], 0, filter); +#line 1411 "ViewCollection.c" } -void view_collection_notify_view_filter_removed (ViewCollection* self, ViewFilter* filter) { +void +view_collection_notify_view_filter_removed (ViewCollection* self, + ViewFilter* filter) +{ #line 195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_view_filter_removed (self, filter); -#line 1187 "ViewCollection.c" +#line 1423 "ViewCollection.c" } -static void view_collection_real_clear (DataCollection* base) { +static void +view_collection_real_clear (DataCollection* base) +{ ViewCollection * self; gboolean _tmp0_ = FALSE; GeeHashMultiMap* _tmp1_; @@ -1205,18 +1443,18 @@ static void view_collection_real_clear (DataCollection* base) { if (_tmp3_ > 0) { #line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = TRUE; -#line 1209 "ViewCollection.c" +#line 1447 "ViewCollection.c" } else { ViewCollection* _tmp4_; #line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = self->priv->mirroring; #line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = _tmp4_ != NULL; -#line 1216 "ViewCollection.c" +#line 1454 "ViewCollection.c" } #line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp0_) { -#line 1220 "ViewCollection.c" +#line 1458 "ViewCollection.c" gchar* _tmp5_; gchar* _tmp6_; #line 203 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1230,31 +1468,36 @@ static void view_collection_real_clear (DataCollection* base) { _g_free0 (_tmp6_); #line 205 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return; -#line 1233 "ViewCollection.c" +#line 1471 "ViewCollection.c" } #line 208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" DATA_COLLECTION_CLASS (view_collection_parent_class)->clear (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); -#line 1237 "ViewCollection.c" +#line 1475 "ViewCollection.c" } -static void _view_collection_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, gpointer self) { +static void +_view_collection_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, + gpointer self) +{ #line 215 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_on_view_filter_refresh ((ViewCollection*) self); -#line 1244 "ViewCollection.c" +#line 1485 "ViewCollection.c" } -static void view_collection_real_close (DataCollection* base) { +static void +view_collection_real_close (DataCollection* base) +{ ViewCollection * self; - GeeSet* _tmp8_; + GeeSet* _tmp7_; #line 211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_halt_all_monitoring (self); #line 213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_halt_mirroring (self); -#line 1257 "ViewCollection.c" +#line 1500 "ViewCollection.c" { GeeIterator* _f_it = NULL; GeeSet* _tmp0_; @@ -1267,66 +1510,66 @@ static void view_collection_real_close (DataCollection* base) { _f_it = _tmp1_; #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 1270 "ViewCollection.c" +#line 1513 "ViewCollection.c" GeeIterator* _tmp2_; - gboolean _tmp3_; ViewFilter* f = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - ViewFilter* _tmp6_; - guint _tmp7_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + ViewFilter* _tmp5_; + guint _tmp6_; #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = _f_it; #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 1286 "ViewCollection.c" +#line 1526 "ViewCollection.c" } #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = _f_it; + _tmp3_ = _f_it; #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - f = (ViewFilter*) _tmp5_; + f = (ViewFilter*) _tmp4_; #line 215 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = f; + _tmp5_ = f; #line 215 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp7_, NULL, FALSE); + g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp6_, NULL, FALSE); #line 215 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _view_collection_on_view_filter_refresh_view_filter_refresh, self); + g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _view_collection_on_view_filter_refresh_view_filter_refresh, self); #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_filter_unref0 (f); -#line 1302 "ViewCollection.c" +#line 1542 "ViewCollection.c" } #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_f_it); -#line 1306 "ViewCollection.c" +#line 1546 "ViewCollection.c" } #line 216 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = self->priv->filters; + _tmp7_ = self->priv->filters; #line 216 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); + gee_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); #line 218 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" DATA_COLLECTION_CLASS (view_collection_parent_class)->close (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); -#line 1314 "ViewCollection.c" +#line 1554 "ViewCollection.c" } -ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target) { +ViewCollectionMonitor* +view_collection_monitor_source_collection (ViewCollection* self, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq, + GeeCollection* initial, + ProgressMonitor progress_monitor, + void* progress_monitor_target) +{ ViewCollectionMonitor* result = NULL; ViewCollectionMonitorImpl* monitor = NULL; - SourceCollection* _tmp0_; - ViewManager* _tmp1_; - Alteration* _tmp2_; - ViewCollectionMonitorImpl* _tmp3_; - GeeHashMultiMap* _tmp4_; - SourceCollection* _tmp5_; - ViewCollectionMonitorImpl* _tmp6_; - gboolean _tmp7_ = FALSE; - GeeCollection* _tmp8_; + ViewCollectionMonitorImpl* _tmp0_; + GeeHashMultiMap* _tmp1_; + ViewCollectionMonitorImpl* _tmp2_; + gboolean _tmp3_ = FALSE; #line 221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1342,160 +1585,120 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection #line 227 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = sources; -#line 230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = manager; -#line 230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = prereq; + _tmp0_ = view_collection_monitor_impl_new (self, sources, manager, prereq); #line 230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = view_collection_monitor_impl_new (self, _tmp0_, _tmp1_, _tmp2_); -#line 230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - monitor = _tmp3_; -#line 231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = self->priv->monitors; + monitor = _tmp0_; #line 231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = sources; + _tmp1_ = self->priv->monitors; #line 231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = monitor; + _tmp2_ = monitor; #line 231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp5_, _tmp6_); -#line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = initial; + gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MULTI_MAP, GeeMultiMap), sources, _tmp2_); #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp8_ != NULL) { -#line 1366 "ViewCollection.c" - GeeCollection* _tmp9_; - gint _tmp10_; - gint _tmp11_; -#line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = initial; + if (initial != NULL) { +#line 1599 "ViewCollection.c" + gint _tmp4_; + gint _tmp5_; #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = gee_collection_get_size (_tmp9_); + _tmp4_ = gee_collection_get_size (initial); #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = _tmp10_; + _tmp5_ = _tmp4_; #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = _tmp11_ > 0; -#line 1378 "ViewCollection.c" + _tmp3_ = _tmp5_ > 0; +#line 1608 "ViewCollection.c" } else { #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = FALSE; -#line 1382 "ViewCollection.c" + _tmp3_ = FALSE; +#line 1612 "ViewCollection.c" } #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp7_) { -#line 1386 "ViewCollection.c" + if (_tmp3_) { +#line 1616 "ViewCollection.c" GeeArrayList* created_views = NULL; - GeeArrayList* _tmp12_; - GeeArrayList* _tmp24_; - ProgressMonitor _tmp25_; - void* _tmp25__target; - GeeCollection* _tmp26_; - GeeCollection* _tmp27_; + GeeArrayList* _tmp6_; + GeeArrayList* _tmp15_; + GeeCollection* _tmp16_; + GeeCollection* _tmp17_; #line 235 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp6_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 235 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - created_views = _tmp12_; -#line 1398 "ViewCollection.c" + created_views = _tmp6_; +#line 1626 "ViewCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp13_; - GeeIterator* _tmp14_; -#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = initial; + GeeIterator* _tmp7_; #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (initial, GEE_TYPE_ITERABLE, GeeIterable)); #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _source_it = _tmp14_; + _source_it = _tmp7_; #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 1411 "ViewCollection.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 1636 "ViewCollection.c" + GeeIterator* _tmp8_; DataSource* source = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; - GeeArrayList* _tmp19_; - ViewManager* _tmp20_; - DataSource* _tmp21_; - DataView* _tmp22_; - DataView* _tmp23_; -#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = _source_it; + GeeIterator* _tmp9_; + gpointer _tmp10_; + GeeArrayList* _tmp11_; + DataSource* _tmp12_; + DataView* _tmp13_; + DataView* _tmp14_; #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = gee_iterator_next (_tmp15_); + _tmp8_ = _source_it; #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp8_)) { #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 1430 "ViewCollection.c" +#line 1651 "ViewCollection.c" } #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = _source_it; + _tmp9_ = _source_it; #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp10_ = gee_iterator_get (_tmp9_); #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - source = (DataSource*) _tmp18_; + source = (DataSource*) _tmp10_; #line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = created_views; + _tmp11_ = created_views; #line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = manager; -#line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = source; + _tmp12_ = source; #line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = view_manager_create_view (_tmp20_, _tmp21_); + _tmp13_ = view_manager_create_view (manager, _tmp12_); #line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = _tmp22_; + _tmp14_ = _tmp13_; #line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp23_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_); #line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp14_); #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (source); -#line 1454 "ViewCollection.c" +#line 1673 "ViewCollection.c" } #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_source_it); -#line 1458 "ViewCollection.c" +#line 1677 "ViewCollection.c" } #line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = created_views; + _tmp15_ = created_views; #line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = progress_monitor; + _tmp16_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection), progress_monitor, progress_monitor_target); #line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25__target = progress_monitor_target; + _tmp17_ = _tmp16_; #line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp26_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_, _tmp25__target); -#line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = _tmp26_; -#line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp27_); + _g_object_unref0 (_tmp17_); #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (created_views); -#line 1474 "ViewCollection.c" +#line 1689 "ViewCollection.c" } else { - SourceCollection* _tmp28_; - SourceCollection* _tmp29_; - GeeCollection* _tmp30_; - GeeIterable* _tmp31_; - ProgressMonitor _tmp32_; - void* _tmp32__target; -#line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp28_ = sources; -#line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp29_ = sources; -#line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp30_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_COLLECTION, DataCollection)); -#line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp31_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ITERABLE, GeeIterable); + GeeCollection* _tmp18_; + GeeIterable* _tmp19_; #line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp32_ = progress_monitor; + _tmp18_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_DATA_COLLECTION, DataCollection)); #line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp32__target = progress_monitor_target; + _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable); #line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_add_sources (self, _tmp28_, _tmp31_, _tmp32_, _tmp32__target); + view_collection_add_sources (self, sources, _tmp19_, progress_monitor, progress_monitor_target); #line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp31_); -#line 1498 "ViewCollection.c" + _g_object_unref0 (_tmp19_); +#line 1701 "ViewCollection.c" } #line 245 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); @@ -1503,52 +1706,53 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection result = G_TYPE_CHECK_INSTANCE_CAST (monitor, VIEW_COLLECTION_TYPE_MONITOR, ViewCollectionMonitor); #line 247 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 1506 "ViewCollection.c" +#line 1709 "ViewCollection.c" } -static gpointer _view_collection_monitor_ref0 (gpointer self) { +static gpointer +_view_collection_monitor_ref0 (gpointer self) +{ #line 251 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self ? view_collection_monitor_ref (self) : NULL; -#line 1513 "ViewCollection.c" +#line 1718 "ViewCollection.c" } -void view_collection_halt_monitoring (ViewCollection* self, ViewCollectionMonitor* m) { +void +view_collection_halt_monitoring (ViewCollection* self, + ViewCollectionMonitor* m) +{ ViewCollectionMonitorImpl* monitor = NULL; - ViewCollectionMonitor* _tmp0_; - ViewCollectionMonitorImpl* _tmp1_; + ViewCollectionMonitorImpl* _tmp0_; gboolean removed = FALSE; - GeeHashMultiMap* _tmp2_; - SourceCollection* _tmp3_; - gboolean _tmp4_; + GeeHashMultiMap* _tmp1_; + SourceCollection* _tmp2_; #line 250 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 250 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (VIEW_COLLECTION_IS_MONITOR (m)); #line 251 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = m; -#line 251 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = _view_collection_monitor_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, VIEW_COLLECTION_TYPE_MONITOR_IMPL, ViewCollectionMonitorImpl)); + _tmp0_ = _view_collection_monitor_ref0 (G_TYPE_CHECK_INSTANCE_CAST (m, VIEW_COLLECTION_TYPE_MONITOR_IMPL, ViewCollectionMonitorImpl)); #line 251 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - monitor = _tmp1_; + monitor = _tmp0_; #line 253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = self->priv->monitors; -#line 253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = monitor->sources; + _tmp1_ = self->priv->monitors; #line 253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_multi_map_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp3_, monitor); + _tmp2_ = monitor->sources; #line 253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - removed = _tmp4_; + removed = gee_multi_map_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp2_, monitor); #line 254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _vala_assert (removed, "removed"); #line 250 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_collection_monitor_unref0 (monitor); -#line 1547 "ViewCollection.c" +#line 1749 "ViewCollection.c" } -void view_collection_halt_all_monitoring (ViewCollection* self) { +void +view_collection_halt_all_monitoring (ViewCollection* self) +{ GeeHashMultiMap* _tmp0_; #line 257 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); @@ -1556,49 +1760,59 @@ void view_collection_halt_all_monitoring (ViewCollection* self) { _tmp0_ = self->priv->monitors; #line 258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" gee_multi_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap)); -#line 1559 "ViewCollection.c" +#line 1763 "ViewCollection.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 267 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self ? data_collection_ref (self) : NULL; -#line 1566 "ViewCollection.c" +#line 1772 "ViewCollection.c" } -static void _view_collection_on_mirror_contents_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self) { +static void +_view_collection_on_mirror_contents_added_data_collection_items_added (DataCollection* _sender, + GeeIterable* added, + gpointer self) +{ #line 275 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_on_mirror_contents_added ((ViewCollection*) self, added); -#line 1573 "ViewCollection.c" +#line 1783 "ViewCollection.c" } -static void _view_collection_on_mirror_contents_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) { +static void +_view_collection_on_mirror_contents_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self) +{ #line 276 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_on_mirror_contents_removed ((ViewCollection*) self, removed); -#line 1580 "ViewCollection.c" +#line 1794 "ViewCollection.c" } -void view_collection_mirror (ViewCollection* self, ViewCollection* to_mirror, CreateView mirroring_ctor, void* mirroring_ctor_target, CreateViewPredicate should_mirror, void* should_mirror_target) { +void +view_collection_mirror (ViewCollection* self, + ViewCollection* to_mirror, + CreateView mirroring_ctor, + void* mirroring_ctor_target, + CreateViewPredicate should_mirror, + void* should_mirror_target) +{ ViewCollection* _tmp0_; - ViewCollection* _tmp1_; - CreateView _tmp2_; - void* _tmp2__target; - CreateViewPredicate _tmp3_; - void* _tmp3__target; - ViewCollection* _tmp4_; - void* _tmp5_; - Comparator _tmp6_; - ViewCollection* _tmp7_; - void* _tmp8_; - ComparatorPredicate _tmp9_; - ViewCollection* _tmp10_; - GeeCollection* _tmp11_; - GeeCollection* _tmp12_; - ViewCollection* _tmp13_; - ViewCollection* _tmp14_; + void* _tmp1_; + Comparator _tmp2_; + void* _tmp3_; + ComparatorPredicate _tmp4_; + ViewCollection* _tmp5_; + GeeCollection* _tmp6_; + GeeCollection* _tmp7_; + ViewCollection* _tmp8_; + ViewCollection* _tmp9_; #line 261 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 261 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1610,62 +1824,50 @@ void view_collection_mirror (ViewCollection* self, ViewCollection* to_mirror, Cr #line 265 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 267 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = to_mirror; -#line 267 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = _data_collection_ref0 (_tmp0_); + _tmp0_ = _data_collection_ref0 (to_mirror); #line 267 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _data_collection_unref0 (self->priv->mirroring); #line 267 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->priv->mirroring = _tmp1_; -#line 268 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = mirroring_ctor; + self->priv->mirroring = _tmp0_; #line 268 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2__target = mirroring_ctor_target; + self->priv->mirroring_ctor = mirroring_ctor; #line 268 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->priv->mirroring_ctor = _tmp2_; -#line 268 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->priv->mirroring_ctor_target = _tmp2__target; -#line 269 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = should_mirror; + self->priv->mirroring_ctor_target = mirroring_ctor_target; #line 269 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3__target = should_mirror_target; + self->priv->should_mirror = should_mirror; #line 269 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->priv->should_mirror = _tmp3_; -#line 269 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->priv->should_mirror_target = _tmp3__target; -#line 270 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = to_mirror; + self->priv->should_mirror_target = should_mirror_target; #line 270 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = data_collection_get_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), &_tmp5_); + _tmp2_ = data_collection_get_comparator (G_TYPE_CHECK_INSTANCE_CAST (to_mirror, TYPE_DATA_COLLECTION, DataCollection), &_tmp1_); #line 270 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = to_mirror; + _tmp4_ = data_collection_get_comparator_predicate (G_TYPE_CHECK_INSTANCE_CAST (to_mirror, TYPE_DATA_COLLECTION, DataCollection), &_tmp3_); #line 270 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = data_collection_get_comparator_predicate (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection), &_tmp8_); -#line 270 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp6_, _tmp5_, _tmp9_, _tmp8_); + data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp2_, _tmp1_, _tmp4_, _tmp3_); #line 273 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = self->priv->mirroring; + _tmp5_ = self->priv->mirroring; #line 273 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp6_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection)); #line 273 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = _tmp11_; + _tmp7_ = _tmp6_; #line 273 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_on_mirror_contents_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); + view_collection_on_mirror_contents_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); #line 273 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp7_); #line 275 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = self->priv->mirroring; + _tmp8_ = self->priv->mirroring; #line 275 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _view_collection_on_mirror_contents_added_data_collection_items_added, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _view_collection_on_mirror_contents_added_data_collection_items_added, self); #line 276 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = self->priv->mirroring; + _tmp9_ = self->priv->mirroring; #line 276 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _view_collection_on_mirror_contents_removed_data_collection_items_removed, self); -#line 1664 "ViewCollection.c" + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _view_collection_on_mirror_contents_removed_data_collection_items_removed, self); +#line 1864 "ViewCollection.c" } -void view_collection_halt_mirroring (ViewCollection* self) { +void +view_collection_halt_mirroring (ViewCollection* self) +{ ViewCollection* _tmp0_; #line 279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); @@ -1673,7 +1875,7 @@ void view_collection_halt_mirroring (ViewCollection* self) { _tmp0_ = self->priv->mirroring; #line 280 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp0_ != NULL) { -#line 1676 "ViewCollection.c" +#line 1878 "ViewCollection.c" ViewCollection* _tmp1_; guint _tmp2_; ViewCollection* _tmp3_; @@ -1690,22 +1892,29 @@ void view_collection_halt_mirroring (ViewCollection* self) { g_signal_parse_name ("items-removed", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE); #line 282 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _view_collection_on_mirror_contents_removed_data_collection_items_removed, self); -#line 1693 "ViewCollection.c" +#line 1895 "ViewCollection.c" } #line 285 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _data_collection_unref0 (self->priv->mirroring); #line 285 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->priv->mirroring = NULL; -#line 1699 "ViewCollection.c" +#line 1901 "ViewCollection.c" } -void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, CreateView copying_ctor, void* copying_ctor_target, CreateViewPredicate should_copy, void* should_copy_target) { +void +view_collection_copy_into (ViewCollection* self, + ViewCollection* to_copy, + CreateView copying_ctor, + void* copying_ctor_target, + CreateViewPredicate should_copy, + void* should_copy_target) +{ GeeArrayList* copy_view = NULL; GeeArrayList* _tmp0_; - GeeArrayList* _tmp25_; - GeeCollection* _tmp26_; - GeeCollection* _tmp27_; + GeeArrayList* _tmp20_; + GeeCollection* _tmp21_; + GeeCollection* _tmp22_; #line 288 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 288 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1714,148 +1923,128 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C _tmp0_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 291 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" copy_view = _tmp0_; -#line 1717 "ViewCollection.c" +#line 1926 "ViewCollection.c" { GeeIterator* _object_it = NULL; - ViewCollection* _tmp1_; + GeeCollection* _tmp1_; GeeCollection* _tmp2_; - GeeCollection* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; -#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = to_copy; #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp1_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (to_copy, TYPE_DATA_COLLECTION, DataCollection)); #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 1741 "ViewCollection.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 1947 "ViewCollection.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp6_; + gpointer _tmp7_; DataView* view = NULL; - DataObject* _tmp10_; - DataView* _tmp11_; - CreateViewPredicate _tmp12_; - void* _tmp12__target; - DataView* _tmp13_; - DataSource* _tmp14_; - DataSource* _tmp15_; - gboolean _tmp16_; - gboolean _tmp17_; -#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = _object_it; + DataObject* _tmp8_; + DataView* _tmp9_; + DataView* _tmp10_; + DataSource* _tmp11_; + DataSource* _tmp12_; + gboolean _tmp13_; #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 1765 "ViewCollection.c" +#line 1965 "ViewCollection.c" } #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = (DataObject*) _tmp9_; + object = (DataObject*) _tmp7_; #line 293 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = object; + _tmp8_ = object; #line 293 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView)); + _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView)); #line 293 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = _tmp11_; + view = _tmp9_; #line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = should_copy; -#line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12__target = should_copy_target; -#line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = view; -#line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = data_view_get_source (_tmp13_); + _tmp10_ = view; #line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = _tmp14_; + _tmp11_ = data_view_get_source (_tmp10_); #line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = _tmp12_ (_tmp15_, _tmp12__target); + _tmp12_ = _tmp11_; #line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = _tmp16_; + _tmp13_ = should_copy (_tmp12_, should_copy_target); #line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp12_); #line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp17_) { -#line 1797 "ViewCollection.c" - GeeArrayList* _tmp18_; - CreateView _tmp19_; - void* _tmp19__target; - DataView* _tmp20_; - DataSource* _tmp21_; - DataSource* _tmp22_; - DataView* _tmp23_; - DataView* _tmp24_; -#line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = copy_view; -#line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = copying_ctor; + if (_tmp13_) { +#line 1991 "ViewCollection.c" + GeeArrayList* _tmp14_; + DataView* _tmp15_; + DataSource* _tmp16_; + DataSource* _tmp17_; + DataView* _tmp18_; + DataView* _tmp19_; #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19__target = copying_ctor_target; + _tmp14_ = copy_view; #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = view; + _tmp15_ = view; #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = data_view_get_source (_tmp20_); + _tmp16_ = data_view_get_source (_tmp15_); #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = _tmp21_; + _tmp17_ = _tmp16_; #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = _tmp19_ (_tmp22_, _tmp19__target); + _tmp18_ = copying_ctor (_tmp17_, copying_ctor_target); #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = _tmp23_; + _tmp19_ = _tmp18_; #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_OBJECT, DataObject)); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_OBJECT, DataObject)); #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp19_); #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp22_); -#line 1828 "ViewCollection.c" + _g_object_unref0 (_tmp17_); +#line 2016 "ViewCollection.c" } #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 1834 "ViewCollection.c" +#line 2022 "ViewCollection.c" } #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 1838 "ViewCollection.c" +#line 2026 "ViewCollection.c" } #line 298 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = copy_view; + _tmp20_ = copy_view; #line 298 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp26_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); + _tmp21_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); #line 298 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = _tmp26_; + _tmp22_ = _tmp21_; #line 298 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp27_); + _g_object_unref0 (_tmp22_); #line 288 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (copy_view); -#line 1850 "ViewCollection.c" +#line 2038 "ViewCollection.c" } -gboolean view_collection_is_view_filter_installed (ViewCollection* self, ViewFilter* f) { +gboolean +view_collection_is_view_filter_installed (ViewCollection* self, + ViewFilter* f) +{ gboolean result = FALSE; GeeSet* _tmp0_; - ViewFilter* _tmp1_; - gboolean _tmp2_; #line 301 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); #line 301 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1863,103 +2052,77 @@ gboolean view_collection_is_view_filter_installed (ViewCollection* self, ViewFil #line 302 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = self->priv->filters; #line 302 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = f; -#line 302 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 302 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = _tmp2_; + result = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), f); #line 302 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 1873 "ViewCollection.c" +#line 2058 "ViewCollection.c" } -void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f) { - ViewFilter* _tmp0_; - gboolean _tmp1_; - GeeSet* _tmp2_; - ViewFilter* _tmp3_; - ViewFilter* _tmp4_; - ViewFilter* _tmp5_; +void +view_collection_install_view_filter (ViewCollection* self, + ViewFilter* f) +{ + GeeSet* _tmp0_; #line 305 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 305 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_FILTER (f)); #line 306 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = f; -#line 306 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view_collection_is_view_filter_installed (self, _tmp0_); -#line 306 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp1_) { + if (view_collection_is_view_filter_installed (self, f)) { #line 307 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return; -#line 1896 "ViewCollection.c" +#line 2075 "ViewCollection.c" } #line 309 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = self->priv->filters; -#line 309 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = f; + _tmp0_ = self->priv->filters; #line 309 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), _tmp3_); -#line 310 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = f; + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), f); #line 310 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_connect (_tmp4_, "refresh", (GCallback) _view_collection_on_view_filter_refresh_view_filter_refresh, self); + g_signal_connect (f, "refresh", (GCallback) _view_collection_on_view_filter_refresh_view_filter_refresh, self); #line 313 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_on_view_filter_refresh (self); #line 316 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = f; -#line 316 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_view_filter_installed (self, _tmp5_); -#line 1914 "ViewCollection.c" + view_collection_notify_view_filter_installed (self, f); +#line 2087 "ViewCollection.c" } -void view_collection_remove_view_filter (ViewCollection* self, ViewFilter* f) { - ViewFilter* _tmp0_; - gboolean _tmp1_; - GeeSet* _tmp2_; - ViewFilter* _tmp3_; - ViewFilter* _tmp4_; - guint _tmp5_; - ViewFilter* _tmp6_; +void +view_collection_remove_view_filter (ViewCollection* self, + ViewFilter* f) +{ + GeeSet* _tmp0_; + guint _tmp1_; #line 319 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 319 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_FILTER (f)); #line 320 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = f; -#line 320 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view_collection_is_view_filter_installed (self, _tmp0_); -#line 320 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp1_) { + if (!view_collection_is_view_filter_installed (self, f)) { #line 321 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return; -#line 1938 "ViewCollection.c" +#line 2105 "ViewCollection.c" } #line 323 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = self->priv->filters; -#line 323 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = f; + _tmp0_ = self->priv->filters; #line 323 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), _tmp3_); + gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), f); #line 324 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = f; + g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp1_, NULL, FALSE); #line 324 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp5_, NULL, FALSE); -#line 324 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _view_collection_on_view_filter_refresh_view_filter_refresh, self); + g_signal_handlers_disconnect_matched (f, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _view_collection_on_view_filter_refresh_view_filter_refresh, self); #line 327 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_on_view_filter_refresh (self); #line 330 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = f; -#line 330 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_view_filter_removed (self, _tmp6_); -#line 1958 "ViewCollection.c" + view_collection_notify_view_filter_removed (self, f); +#line 2119 "ViewCollection.c" } -static void view_collection_on_view_filter_refresh (ViewCollection* self) { +static void +view_collection_on_view_filter_refresh (ViewCollection* self) +{ GeeCollection* _tmp0_; GeeCollection* _tmp1_; #line 333 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1972,17 +2135,20 @@ static void view_collection_on_view_filter_refresh (ViewCollection* self) { view_collection_filter_altered_items (self, _tmp1_); #line 334 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp1_); -#line 1975 "ViewCollection.c" +#line 2138 "ViewCollection.c" } -static gboolean view_collection_is_in_filter (ViewCollection* self, DataView* view) { +static gboolean +view_collection_is_in_filter (ViewCollection* self, + DataView* view) +{ gboolean result = FALSE; #line 338 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); #line 338 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_DATA_VIEW (view), FALSE); -#line 1985 "ViewCollection.c" +#line 2151 "ViewCollection.c" { GeeIterator* _f_it = NULL; GeeSet* _tmp0_; @@ -1995,39 +2161,30 @@ static gboolean view_collection_is_in_filter (ViewCollection* self, DataView* vi _f_it = _tmp1_; #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 1998 "ViewCollection.c" +#line 2164 "ViewCollection.c" GeeIterator* _tmp2_; - gboolean _tmp3_; ViewFilter* f = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - ViewFilter* _tmp6_; - DataView* _tmp7_; - gboolean _tmp8_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + ViewFilter* _tmp5_; #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = _f_it; #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2015 "ViewCollection.c" +#line 2176 "ViewCollection.c" } #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = _f_it; + _tmp3_ = _f_it; #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - f = (ViewFilter*) _tmp5_; -#line 340 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = f; -#line 340 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = view; + f = (ViewFilter*) _tmp4_; #line 340 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = view_filter_predicate (_tmp6_, _tmp7_); + _tmp5_ = f; #line 340 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp8_) { + if (!view_filter_predicate (_tmp5_, view)) { #line 341 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = FALSE; #line 341 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2036,45 +2193,47 @@ static gboolean view_collection_is_in_filter (ViewCollection* self, DataView* vi _g_object_unref0 (_f_it); #line 341 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 2039 "ViewCollection.c" +#line 2196 "ViewCollection.c" } #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_filter_unref0 (f); -#line 2043 "ViewCollection.c" +#line 2200 "ViewCollection.c" } #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_f_it); -#line 2047 "ViewCollection.c" +#line 2204 "ViewCollection.c" } #line 343 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; #line 343 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 2053 "ViewCollection.c" +#line 2210 "ViewCollection.c" } -static gboolean view_collection_real_valid_type (DataCollection* base, DataObject* object) { +static gboolean +view_collection_real_valid_type (DataCollection* base, + DataObject* object) +{ ViewCollection * self; gboolean result = FALSE; - DataObject* _tmp0_; #line 346 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 346 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 347 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = object; -#line 347 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_DATA_VIEW); + result = G_TYPE_CHECK_INSTANCE_TYPE (object, TYPE_DATA_VIEW); #line 347 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 2071 "ViewCollection.c" +#line 2228 "ViewCollection.c" } -static void view_collection_on_sources_added (ViewCollection* self, DataCollection* sources, GeeIterable* added) { - DataCollection* _tmp0_; - GeeIterable* _tmp1_; +static void +view_collection_on_sources_added (ViewCollection* self, + DataCollection* sources, + GeeIterable* added) +{ #line 350 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 350 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2082,28 +2241,33 @@ static void view_collection_on_sources_added (ViewCollection* self, DataCollecti #line 350 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (added)); #line 351 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = sources; -#line 351 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = added; -#line 351 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_add_sources (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp1_, NULL, NULL); -#line 2090 "ViewCollection.c" + view_collection_add_sources (self, G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_SOURCE_COLLECTION, SourceCollection), added, NULL, NULL); +#line 2245 "ViewCollection.c" } -static DataView* _view_manager_create_view_create_view (DataSource* source, gpointer self) { +static DataView* +_view_manager_create_view_create_view (DataSource* source, + gpointer self) +{ DataView* result; result = view_manager_create_view ((ViewManager*) self, source); #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 2099 "ViewCollection.c" +#line 2257 "ViewCollection.c" } -static void view_collection_add_sources (ViewCollection* self, SourceCollection* sources, GeeIterable* added, ProgressMonitor progress_monitor, void* progress_monitor_target) { +static void +view_collection_add_sources (ViewCollection* self, + SourceCollection* sources, + GeeIterable* added, + ProgressMonitor progress_monitor, + void* progress_monitor_target) +{ DataView* created_view = NULL; GeeArrayList* created_views = NULL; - DataView* _tmp37_; + DataView* _tmp32_; #line 354 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 354 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2114,122 +2278,107 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* created_view = NULL; #line 359 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" created_views = NULL; -#line 2117 "ViewCollection.c" +#line 2281 "ViewCollection.c" { GeeIterator* _source_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; -#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = added; + GeeIterator* _tmp0_; #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); + _tmp0_ = gee_iterable_iterator (added); #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _source_it = _tmp1_; + _source_it = _tmp0_; #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 2130 "ViewCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 2291 "ViewCollection.c" + GeeIterator* _tmp1_; DataSource* source = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; CreateView factory = NULL; void* factory_target; GDestroyNotify factory_target_destroy_notify; - CreateView _tmp22_; - void* _tmp22__target; -#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _source_it; + CreateView _tmp17_; + void* _tmp17__target; #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _source_it; #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2149 "ViewCollection.c" +#line 2307 "ViewCollection.c" } #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = _source_it; + _tmp2_ = _source_it; #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - source = (DataSource*) _tmp5_; + source = (DataSource*) _tmp3_; #line 361 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" factory = NULL; #line 361 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" factory_target = NULL; #line 361 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" factory_target_destroy_notify = NULL; -#line 2163 "ViewCollection.c" +#line 2321 "ViewCollection.c" { GeeIterator* _monitor_it = NULL; - GeeHashMultiMap* _tmp6_; - SourceCollection* _tmp7_; - GeeCollection* _tmp8_; - GeeCollection* _tmp9_; - GeeIterator* _tmp10_; - GeeIterator* _tmp11_; -#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = self->priv->monitors; + GeeHashMultiMap* _tmp4_; + GeeCollection* _tmp5_; + GeeCollection* _tmp6_; + GeeIterator* _tmp7_; + GeeIterator* _tmp8_; #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = sources; + _tmp4_ = self->priv->monitors; #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp7_); + _tmp5_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MULTI_MAP, GeeMultiMap), sources); #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp6_); #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _monitor_it = _tmp11_; + _monitor_it = _tmp8_; #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 2190 "ViewCollection.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 2345 "ViewCollection.c" + GeeIterator* _tmp9_; ViewCollectionMonitorImpl* monitor = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; - ViewCollectionMonitorImpl* _tmp16_; - ViewManager* _tmp17_; - DataSource* _tmp18_; - gboolean _tmp19_; + GeeIterator* _tmp10_; + gpointer _tmp11_; + ViewCollectionMonitorImpl* _tmp12_; + ViewManager* _tmp13_; + DataSource* _tmp14_; #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = _monitor_it; + _tmp9_ = _monitor_it; #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = gee_iterator_next (_tmp12_); -#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp9_)) { #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2208 "ViewCollection.c" +#line 2359 "ViewCollection.c" } #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = _monitor_it; + _tmp10_ = _monitor_it; #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp11_ = gee_iterator_get (_tmp10_); #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - monitor = (ViewCollectionMonitorImpl*) _tmp15_; -#line 363 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = monitor; + monitor = (ViewCollectionMonitorImpl*) _tmp11_; #line 363 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = _tmp16_->manager; + _tmp12_ = monitor; #line 363 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = source; + _tmp13_ = _tmp12_->manager; #line 363 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = view_manager_include_in_view (_tmp17_, _tmp18_); + _tmp14_ = source; #line 363 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp19_) { -#line 2226 "ViewCollection.c" - ViewCollectionMonitorImpl* _tmp20_; - ViewManager* _tmp21_; + if (view_manager_include_in_view (_tmp13_, _tmp14_)) { +#line 2375 "ViewCollection.c" + ViewCollectionMonitorImpl* _tmp15_; + ViewManager* _tmp16_; #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = monitor; + _tmp15_ = monitor; #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = _tmp20_->manager; + _tmp16_ = _tmp15_->manager; #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" (factory_target_destroy_notify == NULL) ? NULL : (factory_target_destroy_notify (factory_target), NULL); #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2241,112 +2390,112 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" factory = _view_manager_create_view_create_view; #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - factory_target = view_manager_ref (_tmp21_); + factory_target = view_manager_ref (_tmp16_); #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" factory_target_destroy_notify = view_manager_unref; #line 366 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_collection_monitor_unref0 (monitor); #line 366 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2251 "ViewCollection.c" +#line 2400 "ViewCollection.c" } #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_collection_monitor_unref0 (monitor); -#line 2255 "ViewCollection.c" +#line 2404 "ViewCollection.c" } #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_monitor_it); -#line 2259 "ViewCollection.c" +#line 2408 "ViewCollection.c" } #line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = factory; + _tmp17_ = factory; #line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22__target = factory_target; + _tmp17__target = factory_target; #line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp22_ != NULL) { -#line 2267 "ViewCollection.c" + if (_tmp17_ != NULL) { +#line 2416 "ViewCollection.c" DataView* new_view = NULL; - CreateView _tmp23_; - void* _tmp23__target; - DataSource* _tmp24_; - DataView* _tmp25_; - GeeArrayList* _tmp26_; + CreateView _tmp18_; + void* _tmp18__target; + DataSource* _tmp19_; + DataView* _tmp20_; + GeeArrayList* _tmp21_; #line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = factory; + _tmp18_ = factory; #line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23__target = factory_target; + _tmp18__target = factory_target; #line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = source; + _tmp19_ = source; #line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = _tmp23_ (_tmp24_, _tmp23__target); + _tmp20_ = _tmp18_ (_tmp19_, _tmp18__target); #line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - new_view = _tmp25_; + new_view = _tmp20_; #line 375 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp26_ = created_views; + _tmp21_ = created_views; #line 375 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp26_ != NULL) { -#line 2288 "ViewCollection.c" - GeeArrayList* _tmp27_; - DataView* _tmp28_; + if (_tmp21_ != NULL) { +#line 2437 "ViewCollection.c" + GeeArrayList* _tmp22_; + DataView* _tmp23_; #line 376 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = created_views; + _tmp22_ = created_views; #line 376 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp28_ = new_view; + _tmp23_ = new_view; #line 376 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_); -#line 2297 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp23_); +#line 2446 "ViewCollection.c" } else { - DataView* _tmp29_; + DataView* _tmp24_; #line 377 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp29_ = created_view; + _tmp24_ = created_view; #line 377 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp29_ == NULL) { -#line 2304 "ViewCollection.c" - DataView* _tmp30_; - DataView* _tmp31_; + if (_tmp24_ == NULL) { +#line 2453 "ViewCollection.c" + DataView* _tmp25_; + DataView* _tmp26_; #line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp30_ = new_view; + _tmp25_ = new_view; #line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp31_ = _g_object_ref0 (_tmp30_); + _tmp26_ = _g_object_ref0 (_tmp25_); #line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (created_view); #line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - created_view = _tmp31_; -#line 2315 "ViewCollection.c" + created_view = _tmp26_; +#line 2464 "ViewCollection.c" } else { - GeeArrayList* _tmp32_; - GeeArrayList* _tmp33_; - DataView* _tmp34_; - GeeArrayList* _tmp35_; - DataView* _tmp36_; + GeeArrayList* _tmp27_; + GeeArrayList* _tmp28_; + DataView* _tmp29_; + GeeArrayList* _tmp30_; + DataView* _tmp31_; #line 380 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp32_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp27_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 380 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (created_views); #line 380 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - created_views = _tmp32_; + created_views = _tmp27_; #line 381 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp33_ = created_views; + _tmp28_ = created_views; #line 381 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp34_ = created_view; + _tmp29_ = created_view; #line 381 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp34_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_); #line 382 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (created_view); #line 382 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" created_view = NULL; #line 383 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp35_ = created_views; + _tmp30_ = created_views; #line 383 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp36_ = new_view; + _tmp31_ = new_view; #line 383 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp36_); -#line 2344 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp31_); +#line 2493 "ViewCollection.c" } } #line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (new_view); -#line 2349 "ViewCollection.c" +#line 2498 "ViewCollection.c" } #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" (factory_target_destroy_notify == NULL) ? NULL : (factory_target_destroy_notify (factory_target), NULL); @@ -2358,346 +2507,319 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* factory_target_destroy_notify = NULL; #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (source); -#line 2361 "ViewCollection.c" +#line 2510 "ViewCollection.c" } #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_source_it); -#line 2365 "ViewCollection.c" +#line 2514 "ViewCollection.c" } #line 388 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp37_ = created_view; + _tmp32_ = created_view; #line 388 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp37_ != NULL) { -#line 2371 "ViewCollection.c" - DataView* _tmp38_; + if (_tmp32_ != NULL) { +#line 2520 "ViewCollection.c" + DataView* _tmp33_; #line 389 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp38_ = created_view; + _tmp33_ = created_view; #line 389 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_OBJECT, DataObject)); -#line 2377 "ViewCollection.c" + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_OBJECT, DataObject)); +#line 2526 "ViewCollection.c" } else { - gboolean _tmp39_ = FALSE; - GeeArrayList* _tmp40_; + gboolean _tmp34_ = FALSE; + GeeArrayList* _tmp35_; #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp40_ = created_views; + _tmp35_ = created_views; #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp40_ != NULL) { -#line 2385 "ViewCollection.c" - GeeArrayList* _tmp41_; - gint _tmp42_; - gint _tmp43_; + if (_tmp35_ != NULL) { +#line 2534 "ViewCollection.c" + GeeArrayList* _tmp36_; + gint _tmp37_; + gint _tmp38_; #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp41_ = created_views; + _tmp36_ = created_views; #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp42_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp43_ = _tmp42_; + _tmp38_ = _tmp37_; #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp39_ = _tmp43_ > 0; -#line 2397 "ViewCollection.c" + _tmp34_ = _tmp38_ > 0; +#line 2546 "ViewCollection.c" } else { #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp39_ = FALSE; -#line 2401 "ViewCollection.c" + _tmp34_ = FALSE; +#line 2550 "ViewCollection.c" } #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp39_) { -#line 2405 "ViewCollection.c" - GeeArrayList* _tmp44_; - ProgressMonitor _tmp45_; - void* _tmp45__target; - GeeCollection* _tmp46_; - GeeCollection* _tmp47_; -#line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp44_ = created_views; -#line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp45_ = progress_monitor; + if (_tmp34_) { +#line 2554 "ViewCollection.c" + GeeArrayList* _tmp39_; + GeeCollection* _tmp40_; + GeeCollection* _tmp41_; #line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp45__target = progress_monitor_target; + _tmp39_ = created_views; #line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp46_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection), _tmp45_, _tmp45__target); + _tmp40_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection), progress_monitor, progress_monitor_target); #line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp47_ = _tmp46_; + _tmp41_ = _tmp40_; #line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp47_); -#line 2423 "ViewCollection.c" + _g_object_unref0 (_tmp41_); +#line 2566 "ViewCollection.c" } } #line 354 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (created_views); #line 354 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (created_view); -#line 2430 "ViewCollection.c" +#line 2573 "ViewCollection.c" } -static gboolean view_collection_real_add (DataCollection* base, DataObject* object) { +static gboolean +view_collection_real_add (DataCollection* base, + DataObject* object) +{ ViewCollection * self; gboolean result = FALSE; - DataObject* _tmp0_; - DataObject* _tmp1_; - gboolean _tmp2_; - DataObject* _tmp3_; - GeeCollection* _tmp4_; - GeeCollection* _tmp5_; + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; #line 394 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 394 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 395 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = object; -#line 395 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_view_internal_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView), TRUE); -#line 397 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = object; -#line 397 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->add (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_); + data_view_internal_set_visible (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView), TRUE); #line 397 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp2_) { + if (!DATA_COLLECTION_CLASS (view_collection_parent_class)->add (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), object)) { #line 398 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = FALSE; #line 398 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 2461 "ViewCollection.c" +#line 2597 "ViewCollection.c" } #line 400 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = object; -#line 400 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = data_collection_get_singleton (_tmp3_); + _tmp0_ = data_collection_get_singleton (object); #line 400 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 400 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_filter_altered_items (self, _tmp5_); + view_collection_filter_altered_items (self, _tmp1_); #line 400 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp1_); #line 402 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; #line 402 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 2477 "ViewCollection.c" +#line 2611 "ViewCollection.c" } -static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target) { +static GeeCollection* +view_collection_real_add_many (DataCollection* base, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target) +{ ViewCollection * self; GeeCollection* result = NULL; GeeCollection* return_list = NULL; - GeeCollection* _tmp7_; - ProgressMonitor _tmp8_; - void* _tmp8__target; - GeeCollection* _tmp9_; + GeeCollection* _tmp5_; #line 405 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 405 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (GEE_IS_COLLECTION (objects), NULL); -#line 2493 "ViewCollection.c" +#line 2629 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = objects; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (objects, GEE_TYPE_ITERABLE, GeeIterable)); #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 2506 "ViewCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 2639 "ViewCollection.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - DataObject* _tmp6_; -#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _object_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + DataObject* _tmp4_; #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2521 "ViewCollection.c" +#line 2651 "ViewCollection.c" } #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 408 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = object; + _tmp4_ = object; #line 408 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_view_internal_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_VIEW, DataView), TRUE); + data_view_internal_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_VIEW, DataView), TRUE); #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 2535 "ViewCollection.c" +#line 2665 "ViewCollection.c" } #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 2539 "ViewCollection.c" +#line 2669 "ViewCollection.c" } #line 410 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = objects; + _tmp5_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), objects, monitor, monitor_target); #line 410 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = monitor; -#line 410 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8__target = monitor_target; -#line 410 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp7_, _tmp8_, _tmp8__target); -#line 410 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - return_list = _tmp9_; + return_list = _tmp5_; #line 412 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_filter_altered_items (self, G_TYPE_CHECK_INSTANCE_CAST (return_list, GEE_TYPE_COLLECTION, GeeCollection)); #line 414 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = return_list; #line 414 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 2557 "ViewCollection.c" +#line 2681 "ViewCollection.c" } -static void view_collection_on_sources_removed (ViewCollection* self, GeeIterable* removed) { +static void +view_collection_on_sources_removed (ViewCollection* self, + GeeIterable* removed) +{ Marker* marker = NULL; - gboolean _tmp14_ = FALSE; - Marker* _tmp15_; + gboolean _tmp12_ = FALSE; + Marker* _tmp13_; #line 417 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 417 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); #line 419 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" marker = NULL; -#line 2571 "ViewCollection.c" +#line 2698 "ViewCollection.c" { GeeIterator* _source_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = removed; + _tmp0_ = gee_iterable_iterator (removed); #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); -#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _source_it = _tmp1_; + _source_it = _tmp0_; #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 2584 "ViewCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 2708 "ViewCollection.c" + GeeIterator* _tmp1_; DataSource* source = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; DataView* view = NULL; - GeeHashMap* _tmp6_; - DataSource* _tmp7_; - gpointer _tmp8_; - DataView* _tmp9_; -#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _source_it; + GeeHashMap* _tmp4_; + DataSource* _tmp5_; + gpointer _tmp6_; + DataView* _tmp7_; #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _source_it; #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2603 "ViewCollection.c" +#line 2724 "ViewCollection.c" } #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = _source_it; + _tmp2_ = _source_it; #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - source = (DataSource*) _tmp5_; + source = (DataSource*) _tmp3_; #line 421 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = self->priv->source_map; + _tmp4_ = self->priv->source_map; #line 421 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = source; + _tmp5_ = source; #line 421 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_); + _tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_); #line 421 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = (DataView*) _tmp8_; + view = (DataView*) _tmp6_; #line 424 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = view; + _tmp7_ = view; #line 424 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp9_ != NULL) { -#line 2623 "ViewCollection.c" + if (_tmp7_ != NULL) { +#line 2744 "ViewCollection.c" + Marker* _tmp8_; Marker* _tmp10_; - Marker* _tmp12_; - DataView* _tmp13_; + DataView* _tmp11_; #line 425 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = marker; + _tmp8_ = marker; #line 425 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp10_ == NULL) { -#line 2631 "ViewCollection.c" - Marker* _tmp11_; + if (_tmp8_ == NULL) { +#line 2752 "ViewCollection.c" + Marker* _tmp9_; #line 426 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); + _tmp9_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 426 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (marker); #line 426 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - marker = _tmp11_; -#line 2639 "ViewCollection.c" + marker = _tmp9_; +#line 2760 "ViewCollection.c" } #line 428 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = marker; + _tmp10_ = marker; #line 428 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = view; + _tmp11_ = view; #line 428 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - marker_mark (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject)); -#line 2647 "ViewCollection.c" + marker_mark (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject)); +#line 2768 "ViewCollection.c" } #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (source); -#line 2653 "ViewCollection.c" +#line 2774 "ViewCollection.c" } #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_source_it); -#line 2657 "ViewCollection.c" +#line 2778 "ViewCollection.c" } #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = marker; -#line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp15_ != NULL) { -#line 2663 "ViewCollection.c" - Marker* _tmp16_; - gint _tmp17_; + _tmp13_ = marker; #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = marker; + if (_tmp13_ != NULL) { +#line 2784 "ViewCollection.c" + Marker* _tmp14_; #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = marker_get_count (_tmp16_); + _tmp14_ = marker; #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = _tmp17_ != 0; -#line 2672 "ViewCollection.c" + _tmp12_ = marker_get_count (_tmp14_) != 0; +#line 2790 "ViewCollection.c" } else { #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = FALSE; -#line 2676 "ViewCollection.c" + _tmp12_ = FALSE; +#line 2794 "ViewCollection.c" } #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp14_) { -#line 2680 "ViewCollection.c" - Marker* _tmp18_; + if (_tmp12_) { +#line 2798 "ViewCollection.c" + Marker* _tmp15_; #line 433 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = marker; + _tmp15_ = marker; #line 433 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp18_); -#line 2686 "ViewCollection.c" + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp15_); +#line 2804 "ViewCollection.c" } #line 417 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (marker); -#line 2690 "ViewCollection.c" +#line 2808 "ViewCollection.c" } -static void view_collection_on_sources_altered (ViewCollection* self, DataCollection* collection, GeeMap* items) { +static void +view_collection_on_sources_altered (ViewCollection* self, + DataCollection* collection, + GeeMap* items) +{ GeeArrayList* to_add = NULL; GeeArrayList* to_remove = NULL; gboolean ordering_changed = FALSE; - GeeArrayList* _tmp82_; - GeeArrayList* _tmp86_; - gboolean _tmp90_; + GeeArrayList* _tmp69_; + GeeArrayList* _tmp73_; + gboolean _tmp77_; #line 436 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 436 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2710,223 +2832,202 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec to_remove = NULL; #line 441 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ordering_changed = FALSE; -#line 2713 "ViewCollection.c" +#line 2835 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = items; + _tmp0_ = gee_map_get_keys (items); #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = _tmp1_; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _tmp2_; -#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 2740 "ViewCollection.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 2859 "ViewCollection.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp6_; + gpointer _tmp7_; Alteration* alteration = NULL; - GeeMap* _tmp10_; - DataObject* _tmp11_; - gpointer _tmp12_; + DataObject* _tmp8_; + gpointer _tmp9_; DataSource* source = NULL; - DataObject* _tmp13_; - DataSource* _tmp14_; + DataObject* _tmp10_; + DataSource* _tmp11_; ViewCollectionMonitorImpl* monitor = NULL; gboolean ignored = FALSE; - gboolean _tmp38_; - gboolean _tmp40_ = FALSE; - ViewCollectionMonitorImpl* _tmp41_; -#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = _object_it; + gboolean _tmp31_; + gboolean _tmp33_ = FALSE; + ViewCollectionMonitorImpl* _tmp34_; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2766 "ViewCollection.c" +#line 2881 "ViewCollection.c" } #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = (DataObject*) _tmp9_; -#line 443 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = items; + object = (DataObject*) _tmp7_; #line 443 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = object; + _tmp8_ = object; #line 443 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = gee_map_get (_tmp10_, _tmp11_); + _tmp9_ = gee_map_get (items, _tmp8_); #line 443 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - alteration = (Alteration*) _tmp12_; + alteration = (Alteration*) _tmp9_; #line 444 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = object; + _tmp10_ = object; #line 444 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_SOURCE, DataSource)); + _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_SOURCE, DataSource)); #line 444 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - source = _tmp14_; + source = _tmp11_; #line 446 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" monitor = NULL; #line 447 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ignored = TRUE; -#line 2792 "ViewCollection.c" +#line 2905 "ViewCollection.c" { GeeIterator* _monitor_impl_it = NULL; - GeeHashMultiMap* _tmp15_; - DataCollection* _tmp16_; - GeeCollection* _tmp17_; - GeeCollection* _tmp18_; - GeeIterator* _tmp19_; - GeeIterator* _tmp20_; -#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = self->priv->monitors; + GeeHashMultiMap* _tmp12_; + GeeCollection* _tmp13_; + GeeCollection* _tmp14_; + GeeIterator* _tmp15_; + GeeIterator* _tmp16_; #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = collection; + _tmp12_ = self->priv->monitors; #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_MULTI_MAP, GeeMultiMap), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_SOURCE_COLLECTION, SourceCollection)); + _tmp13_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_MULTI_MAP, GeeMultiMap), G_TYPE_CHECK_INSTANCE_CAST (collection, TYPE_SOURCE_COLLECTION, SourceCollection)); #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = _tmp17_; + _tmp14_ = _tmp13_; #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable)); #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = _tmp19_; + _tmp16_ = _tmp15_; #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp14_); #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _monitor_impl_it = _tmp20_; + _monitor_impl_it = _tmp16_; #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 2819 "ViewCollection.c" - GeeIterator* _tmp21_; - gboolean _tmp22_; +#line 2929 "ViewCollection.c" + GeeIterator* _tmp17_; ViewCollectionMonitorImpl* monitor_impl = NULL; - GeeIterator* _tmp23_; - gpointer _tmp24_; - gboolean _tmp25_ = FALSE; + GeeIterator* _tmp18_; + gpointer _tmp19_; + gboolean _tmp20_ = FALSE; + ViewCollectionMonitorImpl* _tmp21_; + Alteration* _tmp22_; ViewCollectionMonitorImpl* _tmp26_; - Alteration* _tmp27_; - ViewCollectionMonitorImpl* _tmp32_; - ViewManager* _tmp33_; - DataSource* _tmp34_; - gboolean _tmp35_; + ViewManager* _tmp27_; + DataSource* _tmp28_; #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = _monitor_impl_it; + _tmp17_ = _monitor_impl_it; #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = gee_iterator_next (_tmp21_); -#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp22_) { + if (!gee_iterator_next (_tmp17_)) { #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2840 "ViewCollection.c" +#line 2946 "ViewCollection.c" } #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = _monitor_impl_it; + _tmp18_ = _monitor_impl_it; #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = gee_iterator_get (_tmp23_); + _tmp19_ = gee_iterator_get (_tmp18_); #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - monitor_impl = (ViewCollectionMonitorImpl*) _tmp24_; + monitor_impl = (ViewCollectionMonitorImpl*) _tmp19_; #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp26_ = monitor_impl; -#line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = _tmp26_->prereq; + _tmp21_ = monitor_impl; #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp27_ != NULL) { -#line 2854 "ViewCollection.c" - Alteration* _tmp28_; - ViewCollectionMonitorImpl* _tmp29_; - Alteration* _tmp30_; - gboolean _tmp31_; + _tmp22_ = _tmp21_->prereq; #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp28_ = alteration; + if (_tmp22_ != NULL) { +#line 2960 "ViewCollection.c" + Alteration* _tmp23_; + ViewCollectionMonitorImpl* _tmp24_; + Alteration* _tmp25_; #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp29_ = monitor_impl; + _tmp23_ = alteration; #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp30_ = _tmp29_->prereq; + _tmp24_ = monitor_impl; #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp31_ = alteration_contains_any (_tmp28_, _tmp30_); + _tmp25_ = _tmp24_->prereq; #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = !_tmp31_; -#line 2869 "ViewCollection.c" + _tmp20_ = !alteration_contains_any (_tmp23_, _tmp25_); +#line 2972 "ViewCollection.c" } else { #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = FALSE; -#line 2873 "ViewCollection.c" + _tmp20_ = FALSE; +#line 2976 "ViewCollection.c" } #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp25_) { + if (_tmp20_) { #line 450 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_collection_monitor_unref0 (monitor_impl); #line 450 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" continue; -#line 2881 "ViewCollection.c" +#line 2984 "ViewCollection.c" } #line 452 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ignored = FALSE; #line 454 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp32_ = monitor_impl; -#line 454 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp33_ = _tmp32_->manager; + _tmp26_ = monitor_impl; #line 454 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp34_ = source; + _tmp27_ = _tmp26_->manager; #line 454 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp35_ = view_manager_include_in_view (_tmp33_, _tmp34_); + _tmp28_ = source; #line 454 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp35_) { -#line 2895 "ViewCollection.c" - ViewCollectionMonitorImpl* _tmp36_; - ViewCollectionMonitorImpl* _tmp37_; + if (view_manager_include_in_view (_tmp27_, _tmp28_)) { +#line 2996 "ViewCollection.c" + ViewCollectionMonitorImpl* _tmp29_; + ViewCollectionMonitorImpl* _tmp30_; #line 455 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp36_ = monitor_impl; + _tmp29_ = monitor_impl; #line 455 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp37_ = _view_collection_monitor_ref0 (_tmp36_); + _tmp30_ = _view_collection_monitor_ref0 (_tmp29_); #line 455 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_collection_monitor_unref0 (monitor); #line 455 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - monitor = _tmp37_; + monitor = _tmp30_; #line 457 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_collection_monitor_unref0 (monitor_impl); #line 457 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2910 "ViewCollection.c" +#line 3011 "ViewCollection.c" } #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_collection_monitor_unref0 (monitor_impl); -#line 2914 "ViewCollection.c" +#line 3015 "ViewCollection.c" } #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_monitor_impl_it); -#line 2918 "ViewCollection.c" +#line 3019 "ViewCollection.c" } #line 461 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp38_ = ignored; + _tmp31_ = ignored; #line 461 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp38_) { -#line 2924 "ViewCollection.c" - ViewCollectionMonitorImpl* _tmp39_; + if (_tmp31_) { +#line 3025 "ViewCollection.c" + ViewCollectionMonitorImpl* _tmp32_; #line 462 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp39_ = monitor; + _tmp32_ = monitor; #line 462 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp39_ == NULL, "monitor == null"); + _vala_assert (_tmp32_ == NULL, "monitor == null"); #line 464 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_collection_monitor_unref0 (monitor); #line 464 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2937,230 +3038,212 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec _g_object_unref0 (object); #line 464 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" continue; -#line 2940 "ViewCollection.c" +#line 3041 "ViewCollection.c" } #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp41_ = monitor; -#line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp41_ != NULL) { -#line 2946 "ViewCollection.c" - DataSource* _tmp42_; - gboolean _tmp43_; + _tmp34_ = monitor; #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp42_ = source; + if (_tmp34_ != NULL) { +#line 3047 "ViewCollection.c" + DataSource* _tmp35_; #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp43_ = view_collection_has_view_for_source (self, _tmp42_); + _tmp35_ = source; #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp40_ = !_tmp43_; -#line 2955 "ViewCollection.c" + _tmp33_ = !view_collection_has_view_for_source (self, _tmp35_); +#line 3053 "ViewCollection.c" } else { #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp40_ = FALSE; -#line 2959 "ViewCollection.c" + _tmp33_ = FALSE; +#line 3057 "ViewCollection.c" } #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp40_) { -#line 2963 "ViewCollection.c" - GeeArrayList* _tmp44_; - GeeArrayList* _tmp46_; - ViewCollectionMonitorImpl* _tmp47_; - ViewManager* _tmp48_; - DataSource* _tmp49_; - DataView* _tmp50_; - DataView* _tmp51_; + if (_tmp33_) { +#line 3061 "ViewCollection.c" + GeeArrayList* _tmp36_; + GeeArrayList* _tmp38_; + ViewCollectionMonitorImpl* _tmp39_; + ViewManager* _tmp40_; + DataSource* _tmp41_; + DataView* _tmp42_; + DataView* _tmp43_; #line 468 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp44_ = to_add; + _tmp36_ = to_add; #line 468 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp44_ == NULL) { -#line 2975 "ViewCollection.c" - GeeArrayList* _tmp45_; + if (_tmp36_ == NULL) { +#line 3073 "ViewCollection.c" + GeeArrayList* _tmp37_; #line 469 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp45_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp37_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 469 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_add); #line 469 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - to_add = _tmp45_; -#line 2983 "ViewCollection.c" + to_add = _tmp37_; +#line 3081 "ViewCollection.c" } #line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp46_ = to_add; + _tmp38_ = to_add; #line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp47_ = monitor; + _tmp39_ = monitor; #line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp48_ = _tmp47_->manager; + _tmp40_ = _tmp39_->manager; #line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp49_ = source; + _tmp41_ = source; #line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp50_ = view_manager_create_view (_tmp48_, _tmp49_); + _tmp42_ = view_manager_create_view (_tmp40_, _tmp41_); #line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp51_ = _tmp50_; + _tmp43_ = _tmp42_; #line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp51_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp43_); #line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp51_); -#line 3001 "ViewCollection.c" + _g_object_unref0 (_tmp43_); +#line 3099 "ViewCollection.c" } else { - gboolean _tmp52_ = FALSE; - ViewCollectionMonitorImpl* _tmp53_; + gboolean _tmp44_ = FALSE; + ViewCollectionMonitorImpl* _tmp45_; #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp53_ = monitor; + _tmp45_ = monitor; #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp53_ == NULL) { -#line 3009 "ViewCollection.c" - DataSource* _tmp54_; - gboolean _tmp55_; + if (_tmp45_ == NULL) { +#line 3107 "ViewCollection.c" + DataSource* _tmp46_; #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp54_ = source; + _tmp46_ = source; #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp55_ = view_collection_has_view_for_source (self, _tmp54_); -#line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp52_ = _tmp55_; -#line 3018 "ViewCollection.c" + _tmp44_ = view_collection_has_view_for_source (self, _tmp46_); +#line 3113 "ViewCollection.c" } else { #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp52_ = FALSE; -#line 3022 "ViewCollection.c" + _tmp44_ = FALSE; +#line 3117 "ViewCollection.c" } #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp52_) { -#line 3026 "ViewCollection.c" - GeeArrayList* _tmp56_; - GeeArrayList* _tmp58_; - DataSource* _tmp59_; - DataView* _tmp60_; - DataView* _tmp61_; + if (_tmp44_) { +#line 3121 "ViewCollection.c" + GeeArrayList* _tmp47_; + GeeArrayList* _tmp49_; + DataSource* _tmp50_; + DataView* _tmp51_; + DataView* _tmp52_; #line 473 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp56_ = to_remove; + _tmp47_ = to_remove; #line 473 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp56_ == NULL) { -#line 3036 "ViewCollection.c" - GeeArrayList* _tmp57_; + if (_tmp47_ == NULL) { +#line 3131 "ViewCollection.c" + GeeArrayList* _tmp48_; #line 474 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp57_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp48_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 474 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_remove); #line 474 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - to_remove = _tmp57_; -#line 3044 "ViewCollection.c" + to_remove = _tmp48_; +#line 3139 "ViewCollection.c" } #line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp58_ = to_remove; + _tmp49_ = to_remove; #line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp59_ = source; + _tmp50_ = source; #line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp60_ = view_collection_get_view_for_source (self, _tmp59_); + _tmp51_ = view_collection_get_view_for_source (self, _tmp50_); #line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp61_ = _tmp60_; + _tmp52_ = _tmp51_; #line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp61_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp52_); #line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp61_); -#line 3058 "ViewCollection.c" + _g_object_unref0 (_tmp52_); +#line 3153 "ViewCollection.c" } else { - gboolean _tmp62_ = FALSE; - ViewCollectionMonitorImpl* _tmp63_; -#line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp63_ = monitor; + gboolean _tmp53_ = FALSE; + ViewCollectionMonitorImpl* _tmp54_; #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp63_ != NULL) { -#line 3066 "ViewCollection.c" - DataSource* _tmp64_; - gboolean _tmp65_; + _tmp54_ = monitor; #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp64_ = source; + if (_tmp54_ != NULL) { +#line 3161 "ViewCollection.c" + DataSource* _tmp55_; #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp65_ = view_collection_has_view_for_source (self, _tmp64_); + _tmp55_ = source; #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp62_ = _tmp65_; -#line 3075 "ViewCollection.c" + _tmp53_ = view_collection_has_view_for_source (self, _tmp55_); +#line 3167 "ViewCollection.c" } else { #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp62_ = FALSE; -#line 3079 "ViewCollection.c" + _tmp53_ = FALSE; +#line 3171 "ViewCollection.c" } #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp62_) { -#line 3083 "ViewCollection.c" + if (_tmp53_) { +#line 3175 "ViewCollection.c" DataView* view = NULL; - DataSource* _tmp66_; - DataView* _tmp67_; - DataSet* _tmp68_; - DataView* _tmp69_; - gboolean _tmp70_; - gboolean _tmp74_ = FALSE; - DataSet* _tmp75_; + DataSource* _tmp56_; + DataView* _tmp57_; + DataSet* _tmp58_; + DataView* _tmp59_; + gboolean _tmp63_ = FALSE; + DataSet* _tmp64_; #line 478 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp66_ = source; + _tmp56_ = source; #line 478 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp67_ = view_collection_get_view_for_source (self, _tmp66_); + _tmp57_ = view_collection_get_view_for_source (self, _tmp56_); #line 478 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = _tmp67_; -#line 480 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp68_ = self->priv->selected; + view = _tmp57_; #line 480 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp69_ = view; + _tmp58_ = self->priv->selected; #line 480 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp70_ = data_set_contains (_tmp68_, G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_DATA_OBJECT, DataObject)); + _tmp59_ = view; #line 480 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp70_) { -#line 3106 "ViewCollection.c" - DataSet* _tmp71_; - DataView* _tmp72_; - Alteration* _tmp73_; + if (data_set_contains (_tmp58_, G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, TYPE_DATA_OBJECT, DataObject))) { +#line 3195 "ViewCollection.c" + DataSet* _tmp60_; + DataView* _tmp61_; + Alteration* _tmp62_; #line 481 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp71_ = self->priv->selected; + _tmp60_ = self->priv->selected; #line 481 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp72_ = view; + _tmp61_ = view; #line 481 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp73_ = alteration; + _tmp62_ = alteration; #line 481 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_set_resort_object (_tmp71_, G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_DATA_OBJECT, DataObject), _tmp73_); -#line 3118 "ViewCollection.c" + data_set_resort_object (_tmp60_, G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_DATA_OBJECT, DataObject), _tmp62_); +#line 3207 "ViewCollection.c" } #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp75_ = self->priv->visible; + _tmp64_ = self->priv->visible; #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp75_ != NULL) { -#line 3124 "ViewCollection.c" - DataView* _tmp76_; - gboolean _tmp77_; + if (_tmp64_ != NULL) { +#line 3213 "ViewCollection.c" + DataView* _tmp65_; #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp76_ = view; + _tmp65_ = view; #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp77_ = view_collection_is_visible (self, _tmp76_); -#line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp74_ = _tmp77_; -#line 3133 "ViewCollection.c" + _tmp63_ = view_collection_is_visible (self, _tmp65_); +#line 3219 "ViewCollection.c" } else { #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp74_ = FALSE; -#line 3137 "ViewCollection.c" + _tmp63_ = FALSE; +#line 3223 "ViewCollection.c" } #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp74_) { -#line 3141 "ViewCollection.c" - DataSet* _tmp78_; - DataView* _tmp79_; - Alteration* _tmp80_; - gboolean _tmp81_; -#line 484 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp78_ = self->priv->visible; + if (_tmp63_) { +#line 3227 "ViewCollection.c" + DataSet* _tmp66_; + DataView* _tmp67_; + Alteration* _tmp68_; #line 484 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp79_ = view; + _tmp66_ = self->priv->visible; #line 484 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp80_ = alteration; + _tmp67_ = view; #line 484 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp81_ = data_set_resort_object (_tmp78_, G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_DATA_OBJECT, DataObject), _tmp80_); + _tmp68_ = alteration; #line 484 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp81_) { + if (data_set_resort_object (_tmp66_, G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_DATA_OBJECT, DataObject), _tmp68_)) { #line 485 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ordering_changed = TRUE; -#line 3158 "ViewCollection.c" +#line 3241 "ViewCollection.c" } } #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 3163 "ViewCollection.c" +#line 3246 "ViewCollection.c" } } } @@ -3172,72 +3255,75 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec _alteration_unref0 (alteration); #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 3175 "ViewCollection.c" +#line 3258 "ViewCollection.c" } #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 3179 "ViewCollection.c" +#line 3262 "ViewCollection.c" } #line 490 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp82_ = to_add; + _tmp69_ = to_add; #line 490 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp82_ != NULL) { -#line 3185 "ViewCollection.c" - GeeArrayList* _tmp83_; - GeeCollection* _tmp84_; - GeeCollection* _tmp85_; + if (_tmp69_ != NULL) { +#line 3268 "ViewCollection.c" + GeeArrayList* _tmp70_; + GeeCollection* _tmp71_; + GeeCollection* _tmp72_; #line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp83_ = to_add; + _tmp70_ = to_add; #line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp84_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); + _tmp71_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); #line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp85_ = _tmp84_; + _tmp72_ = _tmp71_; #line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp85_); -#line 3197 "ViewCollection.c" + _g_object_unref0 (_tmp72_); +#line 3280 "ViewCollection.c" } #line 493 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp86_ = to_remove; + _tmp73_ = to_remove; #line 493 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp86_ != NULL) { -#line 3203 "ViewCollection.c" - GeeArrayList* _tmp87_; - Marker* _tmp88_; - Marker* _tmp89_; + if (_tmp73_ != NULL) { +#line 3286 "ViewCollection.c" + GeeArrayList* _tmp74_; + Marker* _tmp75_; + Marker* _tmp76_; #line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp87_ = to_remove; + _tmp74_ = to_remove; #line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp88_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp75_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_COLLECTION, GeeCollection)); #line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp89_ = _tmp88_; + _tmp76_ = _tmp75_; #line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp89_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp76_); #line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp89_); -#line 3217 "ViewCollection.c" + _g_object_unref0 (_tmp76_); +#line 3300 "ViewCollection.c" } #line 496 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp90_ = ordering_changed; + _tmp77_ = ordering_changed; #line 496 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp90_) { + if (_tmp77_) { #line 497 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" data_collection_notify_ordering_changed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); -#line 3225 "ViewCollection.c" +#line 3308 "ViewCollection.c" } #line 436 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_remove); #line 436 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_add); -#line 3231 "ViewCollection.c" +#line 3314 "ViewCollection.c" } -static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeIterable* added) { +static void +view_collection_on_mirror_contents_added (ViewCollection* self, + GeeIterable* added) +{ GeeArrayList* to_add = NULL; GeeArrayList* _tmp0_; - GeeArrayList* _tmp19_; - gint _tmp20_; - gint _tmp21_; + GeeArrayList* _tmp16_; + gint _tmp17_; + gint _tmp18_; #line 500 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 500 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3246,148 +3332,142 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI _tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 501 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" to_add = _tmp0_; -#line 3249 "ViewCollection.c" +#line 3335 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_; - GeeIterator* _tmp2_; -#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = added; + GeeIterator* _tmp1_; #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = gee_iterable_iterator (_tmp1_); + _tmp1_ = gee_iterable_iterator (added); #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _object_it = _tmp2_; + _object_it = _tmp1_; #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 3262 "ViewCollection.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 3345 "ViewCollection.c" + GeeIterator* _tmp2_; DataObject* object = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; DataSource* source = NULL; - DataObject* _tmp7_; - DataSource* _tmp8_; - gboolean _tmp9_ = FALSE; - CreateViewPredicate _tmp10_; - void* _tmp10__target; -#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _object_it; + DataObject* _tmp5_; + DataSource* _tmp6_; + gboolean _tmp7_ = FALSE; + CreateViewPredicate _tmp8_; + void* _tmp8__target; #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _object_it; #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 3282 "ViewCollection.c" +#line 3362 "ViewCollection.c" } #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _object_it; + _tmp3_ = _object_it; #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = (DataObject*) _tmp6_; + object = (DataObject*) _tmp4_; #line 503 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = object; + _tmp5_ = object; #line 503 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_VIEW, DataView)); + _tmp6_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_VIEW, DataView)); #line 503 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - source = _tmp8_; + source = _tmp6_; #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = self->priv->should_mirror; + _tmp8_ = self->priv->should_mirror; #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10__target = self->priv->should_mirror_target; + _tmp8__target = self->priv->should_mirror_target; #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp10_ == NULL) { + if (_tmp8_ == NULL) { #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = TRUE; -#line 3304 "ViewCollection.c" + _tmp7_ = TRUE; +#line 3384 "ViewCollection.c" } else { - CreateViewPredicate _tmp11_; - void* _tmp11__target; - DataSource* _tmp12_; - gboolean _tmp13_; -#line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = self->priv->should_mirror; + CreateViewPredicate _tmp9_; + void* _tmp9__target; + DataSource* _tmp10_; #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11__target = self->priv->should_mirror_target; + _tmp9_ = self->priv->should_mirror; #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = source; + _tmp9__target = self->priv->should_mirror_target; #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = _tmp11_ (_tmp12_, _tmp11__target); + _tmp10_ = source; #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = _tmp13_; -#line 3320 "ViewCollection.c" + _tmp7_ = _tmp9_ (_tmp10_, _tmp9__target); +#line 3397 "ViewCollection.c" } #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp9_) { -#line 3324 "ViewCollection.c" - GeeArrayList* _tmp14_; - CreateView _tmp15_; - void* _tmp15__target; - DataSource* _tmp16_; - DataView* _tmp17_; - DataView* _tmp18_; + if (_tmp7_) { +#line 3401 "ViewCollection.c" + GeeArrayList* _tmp11_; + CreateView _tmp12_; + void* _tmp12__target; + DataSource* _tmp13_; + DataView* _tmp14_; + DataView* _tmp15_; #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = to_add; + _tmp11_ = to_add; #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = self->priv->mirroring_ctor; + _tmp12_ = self->priv->mirroring_ctor; #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15__target = self->priv->mirroring_ctor_target; + _tmp12__target = self->priv->mirroring_ctor_target; #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = source; + _tmp13_ = source; #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = _tmp15_ (_tmp16_, _tmp15__target); + _tmp14_ = _tmp12_ (_tmp13_, _tmp12__target); #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = _tmp17_; + _tmp15_ = _tmp14_; #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp18_); -#line 3347 "ViewCollection.c" + _g_object_unref0 (_tmp15_); +#line 3424 "ViewCollection.c" } #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (source); #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 3353 "ViewCollection.c" +#line 3430 "ViewCollection.c" } #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 3357 "ViewCollection.c" +#line 3434 "ViewCollection.c" } #line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = to_add; + _tmp16_ = to_add; #line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = _tmp20_; + _tmp18_ = _tmp17_; #line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp21_ > 0) { -#line 3367 "ViewCollection.c" - GeeArrayList* _tmp22_; - GeeCollection* _tmp23_; - GeeCollection* _tmp24_; + if (_tmp18_ > 0) { +#line 3444 "ViewCollection.c" + GeeArrayList* _tmp19_; + GeeCollection* _tmp20_; + GeeCollection* _tmp21_; #line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = to_add; + _tmp19_ = to_add; #line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); + _tmp20_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); #line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = _tmp23_; + _tmp21_ = _tmp20_; #line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp24_); -#line 3379 "ViewCollection.c" + _g_object_unref0 (_tmp21_); +#line 3456 "ViewCollection.c" } #line 500 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_add); -#line 3383 "ViewCollection.c" +#line 3460 "ViewCollection.c" } -static void view_collection_on_mirror_contents_removed (ViewCollection* self, GeeIterable* removed) { +static void +view_collection_on_mirror_contents_removed (ViewCollection* self, + GeeIterable* removed) +{ Marker* marker = NULL; Marker* _tmp0_; - Marker* _tmp17_; + Marker* _tmp15_; #line 513 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 513 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3396,112 +3476,108 @@ static void view_collection_on_mirror_contents_removed (ViewCollection* self, Ge _tmp0_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 514 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" marker = _tmp0_; -#line 3399 "ViewCollection.c" +#line 3479 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_; - GeeIterator* _tmp2_; -#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = removed; + GeeIterator* _tmp1_; #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = gee_iterable_iterator (_tmp1_); + _tmp1_ = gee_iterable_iterator (removed); #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _object_it = _tmp2_; + _object_it = _tmp1_; #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 3412 "ViewCollection.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 3489 "ViewCollection.c" + GeeIterator* _tmp2_; DataObject* object = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; DataView* view = NULL; - DataObject* _tmp7_; - DataView* _tmp8_; + DataObject* _tmp5_; + DataView* _tmp6_; DataView* our_view = NULL; - DataView* _tmp9_; - DataSource* _tmp10_; - DataSource* _tmp11_; + DataView* _tmp7_; + DataSource* _tmp8_; + DataSource* _tmp9_; + DataView* _tmp10_; + DataView* _tmp11_; DataView* _tmp12_; - DataView* _tmp13_; + Marker* _tmp13_; DataView* _tmp14_; - Marker* _tmp15_; - DataView* _tmp16_; -#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _object_it; #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _object_it; #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 3438 "ViewCollection.c" +#line 3512 "ViewCollection.c" } #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _object_it; + _tmp3_ = _object_it; #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = (DataObject*) _tmp6_; + object = (DataObject*) _tmp4_; #line 516 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = object; + _tmp5_ = object; #line 516 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_VIEW, DataView)); + _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_VIEW, DataView)); #line 516 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = _tmp8_; + view = _tmp6_; #line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = view; + _tmp7_ = view; #line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = data_view_get_source (_tmp9_); + _tmp8_ = data_view_get_source (_tmp7_); #line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = view_collection_get_view_for_source (self, _tmp11_); + _tmp10_ = view_collection_get_view_for_source (self, _tmp9_); #line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp9_); #line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - our_view = _tmp13_; + our_view = _tmp11_; #line 519 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = our_view; + _tmp12_ = our_view; #line 519 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp14_ != NULL, "our_view != null"); + _vala_assert (_tmp12_ != NULL, "our_view != null"); #line 521 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = marker; + _tmp13_ = marker; #line 521 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = our_view; + _tmp14_ = our_view; #line 521 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - marker_mark (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject)); + marker_mark (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (our_view); #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 3482 "ViewCollection.c" +#line 3556 "ViewCollection.c" } #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 3486 "ViewCollection.c" +#line 3560 "ViewCollection.c" } #line 524 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = marker; + _tmp15_ = marker; #line 524 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp17_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp15_); #line 513 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (marker); -#line 3494 "ViewCollection.c" +#line 3568 "ViewCollection.c" } -static void view_collection_real_notify_items_added (DataCollection* base, GeeIterable* added) { +static void +view_collection_real_notify_items_added (DataCollection* base, + GeeIterable* added) +{ ViewCollection * self; GeeArrayList* added_visible = NULL; GeeArrayList* added_selected = NULL; - GeeArrayList* _tmp30_; - GeeArrayList* _tmp34_; - GeeIterable* _tmp37_; + GeeArrayList* _tmp25_; + GeeArrayList* _tmp28_; #line 528 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 528 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3510,479 +3586,435 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt added_visible = NULL; #line 530 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" added_selected = NULL; -#line 3513 "ViewCollection.c" +#line 3589 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = added; + _tmp0_ = gee_iterable_iterator (added); #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); -#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 3526 "ViewCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 3599 "ViewCollection.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; DataView* view = NULL; - DataObject* _tmp6_; + DataObject* _tmp4_; + DataView* _tmp5_; + GeeHashMap* _tmp6_; DataView* _tmp7_; - GeeHashMap* _tmp8_; - DataView* _tmp9_; - DataSource* _tmp10_; - DataSource* _tmp11_; + DataSource* _tmp8_; + DataSource* _tmp9_; + DataView* _tmp10_; + gboolean _tmp11_ = FALSE; DataView* _tmp12_; - gboolean _tmp13_ = FALSE; - DataView* _tmp14_; - gboolean _tmp15_; - gboolean _tmp22_ = FALSE; - DataView* _tmp23_; - gboolean _tmp24_; + gboolean _tmp18_ = FALSE; + DataView* _tmp19_; #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _object_it; -#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 3554 "ViewCollection.c" +#line 3622 "ViewCollection.c" } #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 533 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = object; + _tmp4_ = object; #line 533 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_VIEW, DataView)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_VIEW, DataView)); #line 533 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = _tmp7_; + view = _tmp5_; #line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = self->priv->source_map; + _tmp6_ = self->priv->source_map; #line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = view; + _tmp7_ = view; #line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = data_view_get_source (_tmp9_); + _tmp8_ = data_view_get_source (_tmp7_); #line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = view; + _tmp10_ = view; #line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, _tmp12_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, _tmp10_); #line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp11_); -#line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = view; -#line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = data_view_is_selected (_tmp14_); + _g_object_unref0 (_tmp9_); #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp15_) { -#line 3588 "ViewCollection.c" - DataView* _tmp16_; - gboolean _tmp17_; + _tmp12_ = view; #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = view; + if (data_view_is_selected (_tmp12_)) { +#line 3654 "ViewCollection.c" + DataView* _tmp13_; #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = data_view_is_visible (_tmp16_); + _tmp13_ = view; #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = _tmp17_; -#line 3597 "ViewCollection.c" + _tmp11_ = data_view_is_visible (_tmp13_); +#line 3660 "ViewCollection.c" } else { #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = FALSE; -#line 3601 "ViewCollection.c" + _tmp11_ = FALSE; +#line 3664 "ViewCollection.c" } #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp13_) { -#line 3605 "ViewCollection.c" - GeeArrayList* _tmp18_; - GeeArrayList* _tmp20_; - DataView* _tmp21_; + if (_tmp11_) { +#line 3668 "ViewCollection.c" + GeeArrayList* _tmp14_; + GeeArrayList* _tmp16_; + DataView* _tmp17_; #line 537 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = added_selected; + _tmp14_ = added_selected; #line 537 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp18_ == NULL) { -#line 3613 "ViewCollection.c" - GeeArrayList* _tmp19_; + if (_tmp14_ == NULL) { +#line 3676 "ViewCollection.c" + GeeArrayList* _tmp15_; #line 538 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp15_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 538 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (added_selected); #line 538 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - added_selected = _tmp19_; -#line 3621 "ViewCollection.c" + added_selected = _tmp15_; +#line 3684 "ViewCollection.c" } #line 540 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = added_selected; + _tmp16_ = added_selected; #line 540 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = view; + _tmp17_ = view; #line 540 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); -#line 3629 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); +#line 3692 "ViewCollection.c" } #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = view; -#line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = data_view_is_visible (_tmp23_); + _tmp19_ = view; #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp24_) { -#line 3637 "ViewCollection.c" - DataSet* _tmp25_; + if (data_view_is_visible (_tmp19_)) { +#line 3698 "ViewCollection.c" + DataSet* _tmp20_; #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = self->priv->visible; + _tmp20_ = self->priv->visible; #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = _tmp25_ != NULL; -#line 3643 "ViewCollection.c" + _tmp18_ = _tmp20_ != NULL; +#line 3704 "ViewCollection.c" } else { #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = FALSE; -#line 3647 "ViewCollection.c" + _tmp18_ = FALSE; +#line 3708 "ViewCollection.c" } #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp22_) { -#line 3651 "ViewCollection.c" - GeeArrayList* _tmp26_; - GeeArrayList* _tmp28_; - DataView* _tmp29_; + if (_tmp18_) { +#line 3712 "ViewCollection.c" + GeeArrayList* _tmp21_; + GeeArrayList* _tmp23_; + DataView* _tmp24_; #line 545 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp26_ = added_visible; + _tmp21_ = added_visible; #line 545 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp26_ == NULL) { -#line 3659 "ViewCollection.c" - GeeArrayList* _tmp27_; + if (_tmp21_ == NULL) { +#line 3720 "ViewCollection.c" + GeeArrayList* _tmp22_; #line 546 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp22_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 546 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (added_visible); #line 546 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - added_visible = _tmp27_; -#line 3667 "ViewCollection.c" + added_visible = _tmp22_; +#line 3728 "ViewCollection.c" } #line 548 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp28_ = added_visible; + _tmp23_ = added_visible; #line 548 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp29_ = view; + _tmp24_ = view; #line 548 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_); -#line 3675 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_); +#line 3736 "ViewCollection.c" } #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 3681 "ViewCollection.c" +#line 3742 "ViewCollection.c" } #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 3685 "ViewCollection.c" +#line 3746 "ViewCollection.c" } #line 552 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp30_ = added_visible; + _tmp25_ = added_visible; #line 552 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp30_ != NULL) { -#line 3691 "ViewCollection.c" + if (_tmp25_ != NULL) { +#line 3752 "ViewCollection.c" gboolean is_added = FALSE; - GeeArrayList* _tmp31_; - gboolean _tmp32_; - gboolean _tmp33_; + GeeArrayList* _tmp26_; + gboolean _tmp27_; #line 553 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp31_ = added_visible; + _tmp26_ = added_visible; #line 553 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp32_ = view_collection_add_many_visible (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 553 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - is_added = _tmp32_; + is_added = view_collection_add_many_visible (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection)); #line 554 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp33_ = is_added; + _tmp27_ = is_added; #line 554 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp33_, "is_added"); -#line 3706 "ViewCollection.c" + _vala_assert (_tmp27_, "is_added"); +#line 3764 "ViewCollection.c" } #line 557 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp34_ = added_selected; + _tmp28_ = added_selected; #line 557 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp34_ != NULL) { -#line 3712 "ViewCollection.c" - GeeArrayList* _tmp35_; - GeeArrayList* _tmp36_; + if (_tmp28_ != NULL) { +#line 3770 "ViewCollection.c" + GeeArrayList* _tmp29_; + GeeArrayList* _tmp30_; #line 558 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp35_ = added_selected; + _tmp29_ = added_selected; #line 558 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection)); + view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection)); #line 559 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp36_ = added_selected; + _tmp30_ = added_selected; #line 559 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), NULL); -#line 3723 "ViewCollection.c" + view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), NULL); +#line 3781 "ViewCollection.c" } #line 562 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp37_ = added; -#line 562 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - DATA_COLLECTION_CLASS (view_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp37_); + DATA_COLLECTION_CLASS (view_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), added); #line 528 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (added_selected); #line 528 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (added_visible); -#line 3733 "ViewCollection.c" +#line 3789 "ViewCollection.c" } -static void view_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed) { +static void +view_collection_real_notify_items_removed (DataCollection* base, + GeeIterable* removed) +{ ViewCollection * self; GeeArrayList* selected_removed = NULL; - GeeArrayList* _tmp42_; - GeeIterable* _tmp44_; + GeeArrayList* _tmp33_; #line 566 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 566 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); #line 567 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" selected_removed = NULL; -#line 3748 "ViewCollection.c" +#line 3806 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; -#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = removed; + GeeIterator* _tmp0_; #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); + _tmp0_ = gee_iterable_iterator (removed); #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 3761 "ViewCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 3816 "ViewCollection.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; DataView* view = NULL; - DataObject* _tmp6_; + DataObject* _tmp4_; + DataView* _tmp5_; + GeeHashMap* _tmp6_; DataView* _tmp7_; - GeeHashMap* _tmp8_; - DataView* _tmp9_; - DataSource* _tmp10_; - DataSource* _tmp11_; - gboolean _tmp12_; - gboolean _tmp13_; -#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _object_it; + DataSource* _tmp8_; + DataSource* _tmp9_; + gboolean _tmp10_; #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 3784 "ViewCollection.c" +#line 3835 "ViewCollection.c" } #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 569 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = object; + _tmp4_ = object; #line 569 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_VIEW, DataView)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_VIEW, DataView)); #line 569 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = _tmp7_; + view = _tmp5_; #line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = self->priv->source_map; -#line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = view; + _tmp6_ = self->priv->source_map; #line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = data_view_get_source (_tmp9_); + _tmp7_ = view; #line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = _tmp10_; + _tmp8_ = data_view_get_source (_tmp7_); #line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_); + _tmp9_ = _tmp8_; #line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = _tmp12_; + _tmp10_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_); #line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp9_); #line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp13_) { -#line 3814 "ViewCollection.c" + if (_tmp10_) { +#line 3863 "ViewCollection.c" gboolean is_removed = FALSE; - GeeHashMap* _tmp14_; - DataView* _tmp15_; - DataSource* _tmp16_; - DataSource* _tmp17_; - gboolean _tmp18_; - gboolean _tmp19_; - gboolean _tmp20_; - DataView* _tmp21_; - gboolean _tmp22_; - gboolean _tmp34_ = FALSE; - DataView* _tmp35_; - gboolean _tmp36_; + GeeHashMap* _tmp11_; + DataView* _tmp12_; + DataSource* _tmp13_; + DataSource* _tmp14_; + gboolean _tmp15_; + gboolean _tmp16_; + gboolean _tmp17_; + DataView* _tmp18_; + gboolean _tmp27_ = FALSE; + DataView* _tmp28_; #line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = self->priv->source_map; + _tmp11_ = self->priv->source_map; #line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = view; + _tmp12_ = view; #line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = data_view_get_source (_tmp15_); + _tmp13_ = data_view_get_source (_tmp12_); #line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = _tmp16_; + _tmp14_ = _tmp13_; #line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_, NULL); + _tmp15_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp14_, NULL); #line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = _tmp18_; + _tmp16_ = _tmp15_; #line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp17_); + _g_object_unref0 (_tmp14_); #line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - is_removed = _tmp19_; + is_removed = _tmp16_; #line 577 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = is_removed; + _tmp17_ = is_removed; #line 577 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp20_, "is_removed"); -#line 579 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = view; + _vala_assert (_tmp17_, "is_removed"); #line 579 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = data_view_is_selected (_tmp21_); + _tmp18_ = view; #line 579 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp22_) { -#line 3854 "ViewCollection.c" - DataSet* _tmp23_; - DataView* _tmp24_; - gboolean _tmp25_; - DataView* _tmp26_; - gboolean _tmp27_; - DataView* _tmp28_; - gboolean _tmp29_; -#line 581 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = self->priv->selected; -#line 581 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = view; + if (data_view_is_selected (_tmp18_)) { +#line 3899 "ViewCollection.c" + DataSet* _tmp19_; + DataView* _tmp20_; + DataView* _tmp21_; + DataView* _tmp22_; #line 581 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = data_set_contains (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_OBJECT, DataObject)); + _tmp19_ = self->priv->selected; #line 581 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp26_ = view; + _tmp20_ = view; #line 581 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = data_view_is_visible (_tmp26_); + _tmp21_ = view; #line 581 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp25_ == _tmp27_, "selected.contains(view) == view.is_visible()"); -#line 583 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp28_ = view; + _vala_assert (data_set_contains (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_OBJECT, DataObject)) == data_view_is_visible (_tmp21_), "selected.contains(view) == view.is_visible()"); #line 583 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp29_ = data_view_is_visible (_tmp28_); + _tmp22_ = view; #line 583 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp29_) { -#line 3880 "ViewCollection.c" - GeeArrayList* _tmp30_; - GeeArrayList* _tmp32_; - DataView* _tmp33_; + if (data_view_is_visible (_tmp22_)) { +#line 3916 "ViewCollection.c" + GeeArrayList* _tmp23_; + GeeArrayList* _tmp25_; + DataView* _tmp26_; #line 584 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp30_ = selected_removed; + _tmp23_ = selected_removed; #line 584 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp30_ == NULL) { -#line 3888 "ViewCollection.c" - GeeArrayList* _tmp31_; + if (_tmp23_ == NULL) { +#line 3924 "ViewCollection.c" + GeeArrayList* _tmp24_; #line 585 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp31_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp24_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 585 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (selected_removed); #line 585 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - selected_removed = _tmp31_; -#line 3896 "ViewCollection.c" + selected_removed = _tmp24_; +#line 3932 "ViewCollection.c" } #line 587 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp32_ = selected_removed; + _tmp25_ = selected_removed; #line 587 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp33_ = view; + _tmp26_ = view; #line 587 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp33_); -#line 3904 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_); +#line 3940 "ViewCollection.c" } } #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp35_ = view; -#line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp36_ = data_view_is_visible (_tmp35_); + _tmp28_ = view; #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp36_) { -#line 3913 "ViewCollection.c" - DataSet* _tmp37_; + if (data_view_is_visible (_tmp28_)) { +#line 3947 "ViewCollection.c" + DataSet* _tmp29_; #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp37_ = self->priv->visible; + _tmp29_ = self->priv->visible; #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp34_ = _tmp37_ != NULL; -#line 3919 "ViewCollection.c" + _tmp27_ = _tmp29_ != NULL; +#line 3953 "ViewCollection.c" } else { #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp34_ = FALSE; -#line 3923 "ViewCollection.c" + _tmp27_ = FALSE; +#line 3957 "ViewCollection.c" } #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp34_) { -#line 3927 "ViewCollection.c" - DataSet* _tmp38_; - DataView* _tmp39_; - gboolean _tmp40_; - gboolean _tmp41_; -#line 592 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp38_ = self->priv->visible; + if (_tmp27_) { +#line 3961 "ViewCollection.c" + DataSet* _tmp30_; + DataView* _tmp31_; + gboolean _tmp32_; #line 592 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp39_ = view; + _tmp30_ = self->priv->visible; #line 592 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp40_ = data_set_remove (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_DATA_OBJECT, DataObject)); + _tmp31_ = view; #line 592 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - is_removed = _tmp40_; + is_removed = data_set_remove (_tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_OBJECT, DataObject)); #line 593 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp41_ = is_removed; + _tmp32_ = is_removed; #line 593 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp41_, "is_removed"); -#line 3944 "ViewCollection.c" + _vala_assert (_tmp32_, "is_removed"); +#line 3975 "ViewCollection.c" } } #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 3951 "ViewCollection.c" +#line 3982 "ViewCollection.c" } #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 3955 "ViewCollection.c" +#line 3986 "ViewCollection.c" } #line 598 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp42_ = selected_removed; + _tmp33_ = selected_removed; #line 598 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp42_ != NULL) { -#line 3961 "ViewCollection.c" - GeeArrayList* _tmp43_; + if (_tmp33_ != NULL) { +#line 3992 "ViewCollection.c" + GeeArrayList* _tmp34_; #line 599 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp43_ = selected_removed; + _tmp34_ = selected_removed; #line 599 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection)); + view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection)); #line 604 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_notify_selection_group_altered (self); -#line 3969 "ViewCollection.c" +#line 4000 "ViewCollection.c" } #line 607 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp44_ = removed; -#line 607 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - DATA_COLLECTION_CLASS (view_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp44_); + DATA_COLLECTION_CLASS (view_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), removed); #line 566 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (selected_removed); -#line 3977 "ViewCollection.c" +#line 4006 "ViewCollection.c" } -static void view_collection_filter_altered_items (ViewCollection* self, GeeCollection* views) { +static void +view_collection_filter_altered_items (ViewCollection* self, + GeeCollection* views) +{ GeeArrayList* to_show = NULL; GeeArrayList* to_hide = NULL; - GeeArrayList* _tmp20_; - GeeArrayList* _tmp22_; + GeeArrayList* _tmp15_; + GeeArrayList* _tmp17_; #line 610 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 610 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3991,256 +4023,210 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle to_show = NULL; #line 614 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" to_hide = NULL; -#line 3994 "ViewCollection.c" +#line 4026 "ViewCollection.c" { GeeIterator* _view_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = views; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (views, GEE_TYPE_ITERABLE, GeeIterable)); #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _view_it = _tmp1_; + _view_it = _tmp0_; #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 4007 "ViewCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 4036 "ViewCollection.c" + GeeIterator* _tmp1_; DataView* view = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - DataView* _tmp6_; - gboolean _tmp7_; -#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _view_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + DataView* _tmp4_; #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _view_it; #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 4023 "ViewCollection.c" +#line 4048 "ViewCollection.c" } #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = _view_it; + _tmp2_ = _view_it; #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = (DataView*) _tmp5_; -#line 620 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = view; + view = (DataView*) _tmp3_; #line 620 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = view_collection_is_in_filter (self, _tmp6_); + _tmp4_ = view; #line 620 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp7_) { -#line 4037 "ViewCollection.c" - DataView* _tmp8_; - gboolean _tmp9_; + if (view_collection_is_in_filter (self, _tmp4_)) { +#line 4060 "ViewCollection.c" + DataView* _tmp5_; #line 621 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = view; + _tmp5_ = view; #line 621 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = data_view_is_visible (_tmp8_); -#line 621 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp9_) { -#line 4046 "ViewCollection.c" - GeeArrayList* _tmp10_; - GeeArrayList* _tmp12_; - DataView* _tmp13_; + if (!data_view_is_visible (_tmp5_)) { +#line 4066 "ViewCollection.c" + GeeArrayList* _tmp6_; + GeeArrayList* _tmp8_; + DataView* _tmp9_; #line 622 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = to_show; + _tmp6_ = to_show; #line 622 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp10_ == NULL) { -#line 4054 "ViewCollection.c" - GeeArrayList* _tmp11_; + if (_tmp6_ == NULL) { +#line 4074 "ViewCollection.c" + GeeArrayList* _tmp7_; #line 623 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp7_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 623 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_show); #line 623 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - to_show = _tmp11_; -#line 4062 "ViewCollection.c" + to_show = _tmp7_; +#line 4082 "ViewCollection.c" } #line 625 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = to_show; + _tmp8_ = to_show; #line 625 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = view; + _tmp9_ = view; #line 625 "/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 4070 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_); +#line 4090 "ViewCollection.c" } } else { - DataView* _tmp14_; - gboolean _tmp15_; -#line 628 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = view; + DataView* _tmp10_; #line 628 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = data_view_is_visible (_tmp14_); + _tmp10_ = view; #line 628 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp15_) { -#line 4081 "ViewCollection.c" - GeeArrayList* _tmp16_; - GeeArrayList* _tmp18_; - DataView* _tmp19_; + if (data_view_is_visible (_tmp10_)) { +#line 4098 "ViewCollection.c" + GeeArrayList* _tmp11_; + GeeArrayList* _tmp13_; + DataView* _tmp14_; #line 629 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = to_hide; + _tmp11_ = to_hide; #line 629 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp16_ == NULL) { -#line 4089 "ViewCollection.c" - GeeArrayList* _tmp17_; + if (_tmp11_ == NULL) { +#line 4106 "ViewCollection.c" + GeeArrayList* _tmp12_; #line 630 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp12_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 630 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_hide); #line 630 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - to_hide = _tmp17_; -#line 4097 "ViewCollection.c" + to_hide = _tmp12_; +#line 4114 "ViewCollection.c" } #line 632 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = to_hide; + _tmp13_ = to_hide; #line 632 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = view; + _tmp14_ = view; #line 632 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_); -#line 4105 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_); +#line 4122 "ViewCollection.c" } } #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 4110 "ViewCollection.c" +#line 4127 "ViewCollection.c" } #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_view_it); -#line 4114 "ViewCollection.c" +#line 4131 "ViewCollection.c" } #line 641 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = to_show; + _tmp15_ = to_show; #line 641 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp20_ != NULL) { -#line 4120 "ViewCollection.c" - GeeArrayList* _tmp21_; + if (_tmp15_ != NULL) { +#line 4137 "ViewCollection.c" + GeeArrayList* _tmp16_; #line 642 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = to_show; + _tmp16_ = to_show; #line 642 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_show_items (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_LIST, GeeList)); -#line 4126 "ViewCollection.c" + view_collection_show_items (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_LIST, GeeList)); +#line 4143 "ViewCollection.c" } #line 644 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = to_hide; + _tmp17_ = to_hide; #line 644 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp22_ != NULL) { -#line 4132 "ViewCollection.c" - GeeArrayList* _tmp23_; + if (_tmp17_ != NULL) { +#line 4149 "ViewCollection.c" + GeeArrayList* _tmp18_; #line 645 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = to_hide; + _tmp18_ = to_hide; #line 645 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_hide_items (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_LIST, GeeList)); -#line 4138 "ViewCollection.c" + view_collection_hide_items (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_LIST, GeeList)); +#line 4155 "ViewCollection.c" } #line 610 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_hide); #line 610 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_show); -#line 4144 "ViewCollection.c" +#line 4161 "ViewCollection.c" } -static void view_collection_real_items_altered (DataCollection* base, GeeMap* map) { +static void +view_collection_real_items_altered (DataCollection* base, + GeeMap* map) +{ ViewCollection * self; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; - GeeSet* _tmp2_; - GeeCollection* _tmp3_; - GeeMap* _tmp4_; + GeeCollection* _tmp2_; #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 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = map; + _tmp0_ = gee_map_get_keys (map); #line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _tmp1_; -#line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); #line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_filter_altered_items (self, _tmp3_); + view_collection_filter_altered_items (self, _tmp2_); #line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp3_); -#line 652 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = map; + _g_object_unref0 (_tmp2_); #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 4175 "ViewCollection.c" + DATA_COLLECTION_CLASS (view_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), map); +#line 4189 "ViewCollection.c" } -static void view_collection_real_set_comparator (DataCollection* base, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target) { +static void +view_collection_real_set_comparator (DataCollection* base, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target) +{ ViewCollection * self; DataSet* _tmp0_; - Comparator _tmp1_; - void* _tmp1__target; - ComparatorPredicate _tmp2_; - void* _tmp2__target; - DataSet* _tmp3_; - Comparator _tmp7_; - void* _tmp7__target; - ComparatorPredicate _tmp8_; - void* _tmp8__target; + DataSet* _tmp1_; #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 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = comparator; -#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1__target = comparator_target; -#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = predicate; -#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2__target = predicate_target; -#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_set_set_comparator (_tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp2__target); + data_set_set_comparator (_tmp0_, comparator, comparator_target, predicate, predicate_target); #line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = self->priv->visible; + _tmp1_ = self->priv->visible; #line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp3_ != NULL) { -#line 4209 "ViewCollection.c" - DataSet* _tmp4_; - Comparator _tmp5_; - void* _tmp5__target; - ComparatorPredicate _tmp6_; - void* _tmp6__target; -#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = self->priv->visible; -#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = comparator; -#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5__target = comparator_target; -#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = predicate; + if (_tmp1_ != NULL) { +#line 4213 "ViewCollection.c" + DataSet* _tmp2_; #line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6__target = predicate_target; + _tmp2_ = self->priv->visible; #line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_set_set_comparator (_tmp4_, _tmp5_, _tmp5__target, _tmp6_, _tmp6__target); -#line 4227 "ViewCollection.c" + data_set_set_comparator (_tmp2_, comparator, comparator_target, predicate, predicate_target); +#line 4219 "ViewCollection.c" } #line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = comparator; -#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7__target = comparator_target; -#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = predicate; -#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8__target = predicate_target; -#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 4239 "ViewCollection.c" + DATA_COLLECTION_CLASS (view_collection_parent_class)->set_comparator (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), comparator, comparator_target, predicate, predicate_target); +#line 4223 "ViewCollection.c" } -static void view_collection_real_reset_comparator (DataCollection* base) { +static void +view_collection_real_reset_comparator (DataCollection* base) +{ ViewCollection * self; DataSet* _tmp0_; DataSet* _tmp1_; @@ -4254,21 +4240,23 @@ static void view_collection_real_reset_comparator (DataCollection* base) { _tmp1_ = self->priv->visible; #line 665 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp1_ != NULL) { -#line 4257 "ViewCollection.c" +#line 4243 "ViewCollection.c" DataSet* _tmp2_; #line 666 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = self->priv->visible; #line 666 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" data_set_reset_comparator (_tmp2_); -#line 4263 "ViewCollection.c" +#line 4249 "ViewCollection.c" } #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 4267 "ViewCollection.c" +#line 4253 "ViewCollection.c" } -static GeeCollection* view_collection_real_get_all (DataCollection* base) { +static GeeCollection* +view_collection_real_get_all (DataCollection* base) +{ ViewCollection * self; GeeCollection* result = NULL; GeeCollection* _tmp0_ = NULL; @@ -4279,7 +4267,7 @@ static GeeCollection* view_collection_real_get_all (DataCollection* base) { _tmp1_ = self->priv->visible; #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp1_ != NULL) { -#line 4282 "ViewCollection.c" +#line 4270 "ViewCollection.c" DataSet* _tmp2_; GeeList* _tmp3_; #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4290,7 +4278,7 @@ static GeeCollection* view_collection_real_get_all (DataCollection* base) { _g_object_unref0 (_tmp0_); #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); -#line 4293 "ViewCollection.c" +#line 4281 "ViewCollection.c" } else { GeeCollection* _tmp4_; #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4299,17 +4287,19 @@ static GeeCollection* view_collection_real_get_all (DataCollection* base) { _g_object_unref0 (_tmp0_); #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = _tmp4_; -#line 4302 "ViewCollection.c" +#line 4290 "ViewCollection.c" } #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = _tmp0_; #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4308 "ViewCollection.c" +#line 4296 "ViewCollection.c" } -GeeCollection* view_collection_get_all_unfiltered (ViewCollection* self) { +GeeCollection* +view_collection_get_all_unfiltered (ViewCollection* self) +{ GeeCollection* result = NULL; GeeCollection* _tmp0_; #line 675 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4320,11 +4310,13 @@ GeeCollection* view_collection_get_all_unfiltered (ViewCollection* self) { result = _tmp0_; #line 676 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4323 "ViewCollection.c" +#line 4313 "ViewCollection.c" } -static gint view_collection_real_get_count (DataCollection* base) { +static gint +view_collection_real_get_count (DataCollection* base) +{ ViewCollection * self; gint result = 0; gint _tmp0_ = 0; @@ -4335,48 +4327,44 @@ static gint view_collection_real_get_count (DataCollection* base) { _tmp1_ = self->priv->visible; #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp1_ != NULL) { -#line 4338 "ViewCollection.c" +#line 4330 "ViewCollection.c" DataSet* _tmp2_; - gint _tmp3_; #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = self->priv->visible; #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = data_set_get_count (_tmp2_); -#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = _tmp3_; -#line 4347 "ViewCollection.c" + _tmp0_ = data_set_get_count (_tmp2_); +#line 4336 "ViewCollection.c" } else { - gint _tmp4_; -#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 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = _tmp4_; -#line 4354 "ViewCollection.c" + _tmp0_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); +#line 4340 "ViewCollection.c" } #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = _tmp0_; #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4360 "ViewCollection.c" +#line 4346 "ViewCollection.c" } -gint view_collection_get_unfiltered_count (ViewCollection* self) { +gint +view_collection_get_unfiltered_count (ViewCollection* self) +{ gint result = 0; - gint _tmp0_; #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 684 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = _tmp0_; + result = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 684 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4375 "ViewCollection.c" +#line 4360 "ViewCollection.c" } -static DataObject* view_collection_real_get_at (DataCollection* base, gint index) { +static DataObject* +view_collection_real_get_at (DataCollection* base, + gint index) +{ ViewCollection * self; DataObject* result = NULL; DataObject* _tmp0_ = NULL; @@ -4387,43 +4375,40 @@ static DataObject* view_collection_real_get_at (DataCollection* base, gint index _tmp1_ = self->priv->visible; #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp1_ != NULL) { -#line 4390 "ViewCollection.c" +#line 4378 "ViewCollection.c" DataSet* _tmp2_; - gint _tmp3_; - DataObject* _tmp4_; + DataObject* _tmp3_; #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = self->priv->visible; #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = index; -#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = data_set_get_at (_tmp2_, _tmp3_); + _tmp3_ = data_set_get_at (_tmp2_, index); #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp0_); #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = _tmp4_; -#line 4404 "ViewCollection.c" + _tmp0_ = _tmp3_; +#line 4389 "ViewCollection.c" } else { - gint _tmp5_; - DataObject* _tmp6_; -#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = index; + DataObject* _tmp4_; #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_); + _tmp4_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), index); #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp0_); #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = _tmp6_; -#line 4416 "ViewCollection.c" + _tmp0_ = _tmp4_; +#line 4398 "ViewCollection.c" } #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = _tmp0_; #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4422 "ViewCollection.c" +#line 4404 "ViewCollection.c" } -static gint view_collection_real_index_of (DataCollection* base, DataObject* object) { +static gint +view_collection_real_index_of (DataCollection* base, + DataObject* object) +{ ViewCollection * self; gint result = 0; gint _tmp0_ = 0; @@ -4436,111 +4421,91 @@ static gint view_collection_real_index_of (DataCollection* base, DataObject* obj _tmp1_ = self->priv->visible; #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp1_ != NULL) { -#line 4439 "ViewCollection.c" +#line 4424 "ViewCollection.c" DataSet* _tmp2_; - DataObject* _tmp3_; - gint _tmp4_; #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = self->priv->visible; #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = object; -#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = data_set_index_of (_tmp2_, _tmp3_); -#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = _tmp4_; -#line 4451 "ViewCollection.c" + _tmp0_ = data_set_index_of (_tmp2_, object); +#line 4430 "ViewCollection.c" } else { - DataObject* _tmp5_; - gint _tmp6_; -#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = object; #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 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = _tmp6_; -#line 4461 "ViewCollection.c" + _tmp0_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), object); +#line 4434 "ViewCollection.c" } #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = _tmp0_; #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4467 "ViewCollection.c" +#line 4440 "ViewCollection.c" } -static gboolean view_collection_real_contains (DataCollection* base, DataObject* object) { +static gboolean +view_collection_real_contains (DataCollection* base, + DataObject* object) +{ ViewCollection * self; gboolean result = FALSE; - DataObject* _tmp0_; - gboolean _tmp1_; - DataObject* _tmp2_; - gboolean _tmp3_; #line 695 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 695 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 698 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = object; -#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 698 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp1_) { + if (!DATA_COLLECTION_CLASS (view_collection_parent_class)->contains (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), object)) { #line 699 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = FALSE; #line 699 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4492 "ViewCollection.c" +#line 4460 "ViewCollection.c" } #line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = object; -#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 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = _tmp3_; + result = view_collection_is_visible (self, G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView)); #line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4502 "ViewCollection.c" +#line 4466 "ViewCollection.c" } -static DataView* view_collection_real_get_first (ViewCollection* self) { +static DataView* +view_collection_real_get_first (ViewCollection* self) +{ DataView* result = NULL; DataView* _tmp0_ = NULL; - gint _tmp1_; -#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 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp1_ > 0) { -#line 4514 "ViewCollection.c" - DataObject* _tmp2_; + if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) > 0) { +#line 4477 "ViewCollection.c" + DataObject* _tmp1_; #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); + _tmp1_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), 0); #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp0_); #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView); -#line 4522 "ViewCollection.c" + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); +#line 4485 "ViewCollection.c" } else { #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp0_); #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = NULL; -#line 4528 "ViewCollection.c" +#line 4491 "ViewCollection.c" } #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = _tmp0_; #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4534 "ViewCollection.c" +#line 4497 "ViewCollection.c" } -DataView* view_collection_get_first (ViewCollection* self) { +DataView* +view_collection_get_first (ViewCollection* self) +{ #line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return VIEW_COLLECTION_GET_CLASS (self)->get_first (self); -#line 4543 "ViewCollection.c" +#line 4508 "ViewCollection.c" } @@ -4554,360 +4519,342 @@ DataView* view_collection_get_first (ViewCollection* self) { * pathological events that have nothing but rejected images * in them from breaking. */ -static DataView* view_collection_real_get_first_unrejected (ViewCollection* self) { +static DataView* +view_collection_real_get_first_unrejected (ViewCollection* self) +{ DataView* result = NULL; - gint _tmp0_; DataView* dv = NULL; - DataView* _tmp1_; + DataView* _tmp0_; gint num_views = 0; - gint _tmp2_; - DataView* _tmp17_; -#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)); + DataView* _tmp13_; #line 721 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp0_ < 1) { + if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) < 1) { #line 722 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = NULL; #line 722 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4573 "ViewCollection.c" +#line 4536 "ViewCollection.c" } #line 725 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view_collection_get_first (self); + _tmp0_ = view_collection_get_first (self); #line 725 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - dv = _tmp1_; + dv = _tmp0_; #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 726 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - num_views = _tmp2_; + num_views = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 4585 "ViewCollection.c" - gboolean _tmp3_ = FALSE; - DataView* _tmp4_; +#line 4546 "ViewCollection.c" + gboolean _tmp1_ = FALSE; + DataView* _tmp2_; MediaSource* tmp = NULL; - DataView* _tmp8_; - DataSource* _tmp9_; - MediaSource* _tmp10_; - gboolean _tmp11_ = FALSE; - MediaSource* _tmp12_; -#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = dv; + DataView* _tmp5_; + DataSource* _tmp6_; + MediaSource* _tmp7_; + gboolean _tmp8_ = FALSE; + MediaSource* _tmp9_; #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp4_ != NULL) { -#line 4598 "ViewCollection.c" - DataView* _tmp5_; - gint _tmp6_; - gint _tmp7_; + _tmp2_ = dv; #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = dv; + if (_tmp2_ != NULL) { +#line 4559 "ViewCollection.c" + DataView* _tmp3_; + gint _tmp4_; #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)); + _tmp3_ = dv; #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = num_views; + _tmp4_ = num_views; #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _tmp6_ < (_tmp7_ - 1); -#line 4610 "ViewCollection.c" + _tmp1_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)) < (_tmp4_ - 1); +#line 4568 "ViewCollection.c" } else { #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = FALSE; -#line 4614 "ViewCollection.c" + _tmp1_ = FALSE; +#line 4572 "ViewCollection.c" } #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { + if (!_tmp1_) { #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 4620 "ViewCollection.c" +#line 4578 "ViewCollection.c" } #line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = dv; + _tmp5_ = dv; #line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = data_view_get_source (_tmp8_); + _tmp6_ = data_view_get_source (_tmp5_); #line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp9_) : NULL; + _tmp7_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp6_) : NULL; #line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp10_ == NULL) { + if (_tmp7_ == NULL) { #line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp9_); -#line 4632 "ViewCollection.c" + _g_object_unref0 (_tmp6_); +#line 4590 "ViewCollection.c" } #line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - tmp = _tmp10_; -#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = tmp; + tmp = _tmp7_; #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp12_ != NULL) { -#line 4640 "ViewCollection.c" - MediaSource* _tmp13_; - Rating _tmp14_; + _tmp9_ = tmp; #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = tmp; + if (_tmp9_ != NULL) { +#line 4598 "ViewCollection.c" + MediaSource* _tmp10_; #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = media_source_get_rating (_tmp13_); + _tmp10_ = tmp; #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = _tmp14_ != RATING_REJECTED; -#line 4649 "ViewCollection.c" + _tmp8_ = media_source_get_rating (_tmp10_) != RATING_REJECTED; +#line 4604 "ViewCollection.c" } else { #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = FALSE; -#line 4653 "ViewCollection.c" + _tmp8_ = FALSE; +#line 4608 "ViewCollection.c" } #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp11_) { + if (_tmp8_) { #line 733 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = dv; #line 733 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (tmp); #line 733 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4663 "ViewCollection.c" +#line 4618 "ViewCollection.c" } else { - DataView* _tmp15_; - DataView* _tmp16_; + DataView* _tmp11_; + DataView* _tmp12_; #line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = dv; + _tmp11_ = dv; #line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = view_collection_get_next (self, _tmp15_); + _tmp12_ = view_collection_get_next (self, _tmp11_); #line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (dv); #line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - dv = _tmp16_; -#line 4675 "ViewCollection.c" + dv = _tmp12_; +#line 4630 "ViewCollection.c" } #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (tmp); -#line 4679 "ViewCollection.c" +#line 4634 "ViewCollection.c" } #line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = view_collection_get_first (self); + _tmp13_ = view_collection_get_first (self); #line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = _tmp17_; + result = _tmp13_; #line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (dv); #line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4689 "ViewCollection.c" +#line 4644 "ViewCollection.c" } -DataView* view_collection_get_first_unrejected (ViewCollection* self) { +DataView* +view_collection_get_first_unrejected (ViewCollection* self) +{ #line 719 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 719 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return VIEW_COLLECTION_GET_CLASS (self)->get_first_unrejected (self); -#line 4698 "ViewCollection.c" +#line 4655 "ViewCollection.c" } -static DataView* view_collection_real_get_last (ViewCollection* self) { +static DataView* +view_collection_real_get_last (ViewCollection* self) +{ DataView* result = NULL; DataView* _tmp0_ = NULL; - gint _tmp1_; -#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 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp1_ > 0) { -#line 4710 "ViewCollection.c" - gint _tmp2_; - DataObject* _tmp3_; #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)); + if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) > 0) { +#line 4666 "ViewCollection.c" + DataObject* _tmp1_; #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); + _tmp1_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) - 1); #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp0_); #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_VIEW, DataView); -#line 4721 "ViewCollection.c" + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); +#line 4674 "ViewCollection.c" } else { #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp0_); #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = NULL; -#line 4727 "ViewCollection.c" +#line 4680 "ViewCollection.c" } #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = _tmp0_; #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4733 "ViewCollection.c" +#line 4686 "ViewCollection.c" } -DataView* view_collection_get_last (ViewCollection* self) { +DataView* +view_collection_get_last (ViewCollection* self) +{ #line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return VIEW_COLLECTION_GET_CLASS (self)->get_last (self); -#line 4742 "ViewCollection.c" +#line 4697 "ViewCollection.c" } -static DataView* view_collection_real_get_next (ViewCollection* self, DataView* view) { +static DataView* +view_collection_real_get_next (ViewCollection* self, + DataView* view) +{ DataView* result = NULL; - gint _tmp0_; gint index = 0; - DataView* _tmp1_; + gint _tmp0_; + gint _tmp1_; gint _tmp2_; gint _tmp3_; - gint _tmp4_; - gint _tmp5_; - gint _tmp6_; - gint _tmp7_; - DataObject* _tmp8_; + DataObject* _tmp4_; #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 749 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp0_ == 0) { + if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) == 0) { #line 750 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = NULL; #line 750 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4768 "ViewCollection.c" +#line 4720 "ViewCollection.c" } #line 752 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view; -#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 752 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - index = _tmp2_; + index = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_OBJECT, DataObject)); #line 753 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = index; + _tmp0_ = index; #line 753 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp3_ < 0) { + if (_tmp0_ < 0) { #line 754 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = NULL; #line 754 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4784 "ViewCollection.c" +#line 4732 "ViewCollection.c" } #line 756 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = index; + _tmp1_ = index; #line 756 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - index = _tmp4_ + 1; + index = _tmp1_ + 1; #line 757 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = index; + _tmp2_ = index; #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 757 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp5_ >= _tmp6_) { + if (_tmp2_ >= data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection))) { #line 758 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" index = 0; -#line 4798 "ViewCollection.c" +#line 4744 "ViewCollection.c" } #line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = index; + _tmp3_ = index; #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_); + _tmp4_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp3_); #line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_VIEW, DataView); #line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4808 "ViewCollection.c" +#line 4754 "ViewCollection.c" } -DataView* view_collection_get_next (ViewCollection* self, DataView* view) { +DataView* +view_collection_get_next (ViewCollection* self, + DataView* view) +{ #line 748 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 748 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return VIEW_COLLECTION_GET_CLASS (self)->get_next (self, view); -#line 4817 "ViewCollection.c" +#line 4766 "ViewCollection.c" } -static DataView* view_collection_real_get_previous (ViewCollection* self, DataView* view) { +static DataView* +view_collection_real_get_previous (ViewCollection* self, + DataView* view) +{ DataView* result = NULL; - gint _tmp0_; gint index = 0; - DataView* _tmp1_; + gint _tmp0_; + gint _tmp1_; gint _tmp2_; gint _tmp3_; - gint _tmp4_; - gint _tmp5_; - gint _tmp7_; - DataObject* _tmp8_; + DataObject* _tmp4_; #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 764 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp0_ == 0) { + if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) == 0) { #line 765 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = NULL; #line 765 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4842 "ViewCollection.c" +#line 4789 "ViewCollection.c" } #line 767 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view; -#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 767 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - index = _tmp2_; + index = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_OBJECT, DataObject)); #line 768 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = index; + _tmp0_ = index; #line 768 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp3_ < 0) { + if (_tmp0_ < 0) { #line 769 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = NULL; #line 769 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4858 "ViewCollection.c" +#line 4801 "ViewCollection.c" } #line 771 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = index; + _tmp1_ = index; #line 771 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - index = _tmp4_ - 1; + index = _tmp1_ - 1; #line 772 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = index; + _tmp2_ = index; #line 772 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp5_ < 0) { -#line 4868 "ViewCollection.c" - gint _tmp6_; + if (_tmp2_ < 0) { #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 773 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - index = _tmp6_ - 1; -#line 4874 "ViewCollection.c" + index = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) - 1; +#line 4813 "ViewCollection.c" } #line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = index; + _tmp3_ = index; #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_); + _tmp4_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp3_); #line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_VIEW, DataView); #line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4884 "ViewCollection.c" +#line 4823 "ViewCollection.c" } -DataView* view_collection_get_previous (ViewCollection* self, DataView* view) { +DataView* +view_collection_get_previous (ViewCollection* self, + DataView* view) +{ #line 763 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 763 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return VIEW_COLLECTION_GET_CLASS (self)->get_previous (self, view); -#line 4893 "ViewCollection.c" +#line 4835 "ViewCollection.c" } -gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource* * next, DataSource* * prev, const gchar* type_selector) { +gboolean +view_collection_get_immediate_neighbors (ViewCollection* self, + DataSource* home, + DataSource* * next, + DataSource* * prev, + const gchar* type_selector) +{ DataSource* _vala_next = NULL; DataSource* _vala_prev = NULL; gboolean result = FALSE; DataView* home_view = NULL; - DataSource* _tmp0_; + DataView* _tmp0_; DataView* _tmp1_; - DataView* _tmp2_; DataView* next_view = NULL; + DataView* _tmp2_; DataView* _tmp3_; - DataView* _tmp4_; DataView* prev_view = NULL; - DataView* _tmp19_; - DataView* _tmp20_; + DataView* _tmp16_; + DataView* _tmp17_; #line 778 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); #line 778 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4921,15 +4868,13 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour #line 781 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _vala_prev = NULL; #line 783 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = home; -#line 783 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view_collection_get_view_for_source (self, _tmp0_); + _tmp0_ = view_collection_get_view_for_source (self, home); #line 783 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - home_view = _tmp1_; + home_view = _tmp0_; #line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = home_view; + _tmp1_ = home_view; #line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = FALSE; #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4938,197 +4883,185 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour if (next) { #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *next = _vala_next; -#line 4941 "ViewCollection.c" +#line 4886 "ViewCollection.c" } else { #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_vala_next); -#line 4945 "ViewCollection.c" +#line 4890 "ViewCollection.c" } #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (prev) { #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *prev = _vala_prev; -#line 4951 "ViewCollection.c" +#line 4896 "ViewCollection.c" } else { #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_vala_prev); -#line 4955 "ViewCollection.c" +#line 4900 "ViewCollection.c" } #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4959 "ViewCollection.c" +#line 4904 "ViewCollection.c" } #line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = home_view; + _tmp2_ = home_view; #line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = view_collection_get_next (self, _tmp3_); + _tmp3_ = view_collection_get_next (self, _tmp2_); #line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - next_view = _tmp4_; + next_view = _tmp3_; #line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 4969 "ViewCollection.c" +#line 4914 "ViewCollection.c" + DataView* _tmp4_; DataView* _tmp5_; - DataView* _tmp6_; - gboolean _tmp7_ = FALSE; - const gchar* _tmp8_; - DataView* _tmp17_; - DataView* _tmp18_; + gboolean _tmp6_ = FALSE; + DataView* _tmp14_; + DataView* _tmp15_; #line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = next_view; + _tmp4_ = next_view; #line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = home_view; + _tmp5_ = home_view; #line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!(_tmp5_ != _tmp6_)) { + if (!(_tmp4_ != _tmp5_)) { #line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 4984 "ViewCollection.c" +#line 4928 "ViewCollection.c" } #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = type_selector; -#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp8_ == NULL) { + if (type_selector == NULL) { #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = TRUE; -#line 4992 "ViewCollection.c" + _tmp6_ = TRUE; +#line 4934 "ViewCollection.c" } else { - DataView* _tmp9_; - DataSource* _tmp10_; - DataSource* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; - const gchar* _tmp14_; -#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = next_view; + DataView* _tmp7_; + DataSource* _tmp8_; + DataSource* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = data_view_get_source (_tmp9_); + _tmp7_ = next_view; #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = _tmp10_; + _tmp8_ = data_view_get_source (_tmp7_); #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = data_source_get_typename (_tmp11_); + _tmp9_ = _tmp8_; #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = _tmp12_; + _tmp10_ = data_source_get_typename (_tmp9_); #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = type_selector; + _tmp11_ = _tmp10_; #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = g_strcmp0 (_tmp13_, _tmp14_) == 0; + _tmp6_ = g_strcmp0 (_tmp11_, type_selector) == 0; #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp11_); #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp11_); -#line 5018 "ViewCollection.c" + _g_object_unref0 (_tmp9_); +#line 4957 "ViewCollection.c" } #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp7_) { -#line 5022 "ViewCollection.c" - DataView* _tmp15_; - DataSource* _tmp16_; + if (_tmp6_) { +#line 4961 "ViewCollection.c" + DataView* _tmp12_; + DataSource* _tmp13_; #line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = next_view; + _tmp12_ = next_view; #line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = data_view_get_source (_tmp15_); + _tmp13_ = data_view_get_source (_tmp12_); #line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_vala_next); #line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_next = _tmp16_; + _vala_next = _tmp13_; #line 791 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 5035 "ViewCollection.c" +#line 4974 "ViewCollection.c" } #line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = next_view; + _tmp14_ = next_view; #line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = view_collection_get_next (self, _tmp17_); + _tmp15_ = view_collection_get_next (self, _tmp14_); #line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (next_view); #line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - next_view = _tmp18_; -#line 5045 "ViewCollection.c" + next_view = _tmp15_; +#line 4984 "ViewCollection.c" } #line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = home_view; + _tmp16_ = home_view; #line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = view_collection_get_previous (self, _tmp19_); + _tmp17_ = view_collection_get_previous (self, _tmp16_); #line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - prev_view = _tmp20_; + prev_view = _tmp17_; #line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 5055 "ViewCollection.c" - DataView* _tmp21_; - DataView* _tmp22_; - gboolean _tmp23_ = FALSE; - const gchar* _tmp24_; - DataView* _tmp33_; - DataView* _tmp34_; +#line 4994 "ViewCollection.c" + DataView* _tmp18_; + DataView* _tmp19_; + gboolean _tmp20_ = FALSE; + DataView* _tmp28_; + DataView* _tmp29_; #line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = prev_view; + _tmp18_ = prev_view; #line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = home_view; + _tmp19_ = home_view; #line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!(_tmp21_ != _tmp22_)) { + if (!(_tmp18_ != _tmp19_)) { #line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 5070 "ViewCollection.c" +#line 5008 "ViewCollection.c" } #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = type_selector; + if (type_selector == NULL) { #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp24_ == NULL) { -#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = TRUE; -#line 5078 "ViewCollection.c" + _tmp20_ = TRUE; +#line 5014 "ViewCollection.c" } else { - DataView* _tmp25_; - DataSource* _tmp26_; - DataSource* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; - const gchar* _tmp30_; -#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = prev_view; + DataView* _tmp21_; + DataSource* _tmp22_; + DataSource* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp26_ = data_view_get_source (_tmp25_); + _tmp21_ = prev_view; #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = _tmp26_; + _tmp22_ = data_view_get_source (_tmp21_); #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp28_ = data_source_get_typename (_tmp27_); + _tmp23_ = _tmp22_; #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp29_ = _tmp28_; + _tmp24_ = data_source_get_typename (_tmp23_); #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp30_ = type_selector; + _tmp25_ = _tmp24_; #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = g_strcmp0 (_tmp29_, _tmp30_) == 0; + _tmp20_ = g_strcmp0 (_tmp25_, type_selector) == 0; #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_free0 (_tmp29_); + _g_free0 (_tmp25_); #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp27_); -#line 5104 "ViewCollection.c" + _g_object_unref0 (_tmp23_); +#line 5037 "ViewCollection.c" } #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp23_) { -#line 5108 "ViewCollection.c" - DataView* _tmp31_; - DataSource* _tmp32_; + if (_tmp20_) { +#line 5041 "ViewCollection.c" + DataView* _tmp26_; + DataSource* _tmp27_; #line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp31_ = prev_view; + _tmp26_ = prev_view; #line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp32_ = data_view_get_source (_tmp31_); + _tmp27_ = data_view_get_source (_tmp26_); #line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_vala_prev); #line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_prev = _tmp32_; + _vala_prev = _tmp27_; #line 800 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 5121 "ViewCollection.c" +#line 5054 "ViewCollection.c" } #line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp33_ = prev_view; + _tmp28_ = prev_view; #line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp34_ = view_collection_get_previous (self, _tmp33_); + _tmp29_ = view_collection_get_previous (self, _tmp28_); #line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (prev_view); #line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - prev_view = _tmp34_; -#line 5131 "ViewCollection.c" + prev_view = _tmp29_; +#line 5064 "ViewCollection.c" } #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; @@ -5142,43 +5075,44 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour if (next) { #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *next = _vala_next; -#line 5145 "ViewCollection.c" +#line 5078 "ViewCollection.c" } else { #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_vala_next); -#line 5149 "ViewCollection.c" +#line 5082 "ViewCollection.c" } #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (prev) { #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *prev = _vala_prev; -#line 5155 "ViewCollection.c" +#line 5088 "ViewCollection.c" } else { #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_vala_prev); -#line 5159 "ViewCollection.c" +#line 5092 "ViewCollection.c" } #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5163 "ViewCollection.c" +#line 5096 "ViewCollection.c" } -GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource* home, const gchar* typename) { +GeeSet* +view_collection_get_extended_neighbors (ViewCollection* self, + DataSource* home, + const gchar* typename) +{ GeeSet* result = NULL; GeeSet* neighbors = NULL; GeeHashSet* _tmp0_; DataSource* next = NULL; DataSource* prev = NULL; - DataSource* _tmp1_; - const gchar* _tmp2_; - DataSource* _tmp3_ = NULL; - DataSource* _tmp4_ = NULL; - gboolean _tmp5_; - DataSource* _tmp6_; - DataSource* _tmp16_; - GeeSet* _tmp26_; - DataSource* _tmp27_; + DataSource* _tmp1_ = NULL; + DataSource* _tmp2_ = NULL; + gboolean _tmp3_; + DataSource* _tmp4_; + DataSource* _tmp13_; + GeeSet* _tmp22_; #line 809 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 809 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5188,21 +5122,17 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource #line 811 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet); #line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = home; -#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = typename; -#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = view_collection_get_immediate_neighbors (self, _tmp1_, &_tmp3_, &_tmp4_, _tmp2_); + _tmp3_ = view_collection_get_immediate_neighbors (self, home, &_tmp1_, &_tmp2_, typename); #line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (next); #line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - next = _tmp3_; + next = _tmp1_; #line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (prev); #line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - prev = _tmp4_; + prev = _tmp2_; #line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp5_) { + if (!_tmp3_) { #line 816 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = neighbors; #line 816 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5211,124 +5141,116 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource _g_object_unref0 (next); #line 816 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5214 "ViewCollection.c" +#line 5144 "ViewCollection.c" } #line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = next; + _tmp4_ = next; #line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp6_ != NULL) { -#line 5220 "ViewCollection.c" - GeeSet* _tmp7_; - DataSource* _tmp8_; + if (_tmp4_ != NULL) { +#line 5150 "ViewCollection.c" + GeeSet* _tmp5_; + DataSource* _tmp6_; DataSource* next_next = NULL; DataSource* next_prev = NULL; - DataSource* _tmp9_; - const gchar* _tmp10_; - DataSource* _tmp11_ = NULL; - DataSource* _tmp12_ = NULL; - DataSource* _tmp13_; + DataSource* _tmp7_; + DataSource* _tmp8_ = NULL; + DataSource* _tmp9_ = NULL; + DataSource* _tmp10_; #line 820 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = neighbors; + _tmp5_ = neighbors; #line 820 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = next; + _tmp6_ = next; #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 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = next; + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), _tmp6_); #line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = typename; + _tmp7_ = next; #line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_get_immediate_neighbors (self, _tmp9_, &_tmp11_, &_tmp12_, _tmp10_); + view_collection_get_immediate_neighbors (self, _tmp7_, &_tmp8_, &_tmp9_, typename); #line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (next_next); #line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - next_next = _tmp11_; + next_next = _tmp8_; #line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (next_prev); #line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - next_prev = _tmp12_; + next_prev = _tmp9_; #line 826 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = next_next; + _tmp10_ = next_next; #line 826 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp13_ != NULL) { -#line 5254 "ViewCollection.c" - GeeSet* _tmp14_; - DataSource* _tmp15_; + if (_tmp10_ != NULL) { +#line 5181 "ViewCollection.c" + GeeSet* _tmp11_; + DataSource* _tmp12_; #line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = neighbors; + _tmp11_ = neighbors; #line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = next_next; + _tmp12_ = next_next; #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 5263 "ViewCollection.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection), _tmp12_); +#line 5190 "ViewCollection.c" } #line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (next_prev); #line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (next_next); -#line 5269 "ViewCollection.c" +#line 5196 "ViewCollection.c" } #line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = prev; + _tmp13_ = prev; #line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp16_ != NULL) { -#line 5275 "ViewCollection.c" - GeeSet* _tmp17_; - DataSource* _tmp18_; + if (_tmp13_ != NULL) { +#line 5202 "ViewCollection.c" + GeeSet* _tmp14_; + DataSource* _tmp15_; DataSource* next_prev = NULL; DataSource* prev_prev = NULL; + DataSource* _tmp16_; + DataSource* _tmp17_ = NULL; + DataSource* _tmp18_ = NULL; DataSource* _tmp19_; - const gchar* _tmp20_; - DataSource* _tmp21_ = NULL; - DataSource* _tmp22_ = NULL; - DataSource* _tmp23_; #line 832 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = neighbors; + _tmp14_ = neighbors; #line 832 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = prev; + _tmp15_ = prev; #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 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = prev; + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_); #line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = typename; + _tmp16_ = prev; #line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_get_immediate_neighbors (self, _tmp19_, &_tmp21_, &_tmp22_, _tmp20_); + view_collection_get_immediate_neighbors (self, _tmp16_, &_tmp17_, &_tmp18_, typename); #line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (next_prev); #line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - next_prev = _tmp21_; + next_prev = _tmp17_; #line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (prev_prev); #line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - prev_prev = _tmp22_; + prev_prev = _tmp18_; #line 838 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = prev_prev; + _tmp19_ = prev_prev; #line 838 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp23_ != NULL) { -#line 5309 "ViewCollection.c" - GeeSet* _tmp24_; - DataSource* _tmp25_; + if (_tmp19_ != NULL) { +#line 5233 "ViewCollection.c" + GeeSet* _tmp20_; + DataSource* _tmp21_; #line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = neighbors; + _tmp20_ = neighbors; #line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = prev_prev; + _tmp21_ = prev_prev; #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 5318 "ViewCollection.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_); +#line 5242 "ViewCollection.c" } #line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (prev_prev); #line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (next_prev); -#line 5324 "ViewCollection.c" +#line 5248 "ViewCollection.c" } #line 843 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp26_ = neighbors; -#line 843 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = home; + _tmp22_ = neighbors; #line 843 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_); + gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), home); #line 845 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = neighbors; #line 845 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5337,159 +5259,144 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource _g_object_unref0 (next); #line 845 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5340 "ViewCollection.c" +#line 5262 "ViewCollection.c" } -static void view_collection_add_many_selected (ViewCollection* self, GeeCollection* views) { - GeeCollection* _tmp0_; +static void +view_collection_add_many_selected (ViewCollection* self, + GeeCollection* views) +{ + gint _tmp0_; gint _tmp1_; - gint _tmp2_; gboolean added = FALSE; - DataSet* _tmp11_; - GeeCollection* _tmp12_; - gboolean _tmp13_; - gboolean _tmp14_; + DataSet* _tmp7_; + gboolean _tmp8_; #line 850 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #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 851 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp0_ = gee_collection_get_size (views); #line 851 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 851 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 852 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return; -#line 5367 "ViewCollection.c" +#line 5287 "ViewCollection.c" } { GeeIterator* _view_it = NULL; - GeeCollection* _tmp3_; - GeeIterator* _tmp4_; -#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = views; + GeeIterator* _tmp2_; #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (views, GEE_TYPE_ITERABLE, GeeIterable)); #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _view_it = _tmp4_; + _view_it = _tmp2_; #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 5381 "ViewCollection.c" - GeeIterator* _tmp5_; - gboolean _tmp6_; +#line 5298 "ViewCollection.c" + GeeIterator* _tmp3_; DataView* view = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; - DataView* _tmp9_; - gboolean _tmp10_; -#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _view_it; + GeeIterator* _tmp4_; + gpointer _tmp5_; + DataView* _tmp6_; #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = gee_iterator_next (_tmp5_); + _tmp3_ = _view_it; #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp3_)) { #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 5397 "ViewCollection.c" +#line 5310 "ViewCollection.c" } #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = _view_it; + _tmp4_ = _view_it; #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp5_ = gee_iterator_get (_tmp4_); #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; + view = (DataView*) _tmp5_; #line 855 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = data_view_is_visible (_tmp9_); + _tmp6_ = view; #line 855 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp10_, "view.is_visible()"); + _vala_assert (data_view_is_visible (_tmp6_), "view.is_visible()"); #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 5413 "ViewCollection.c" +#line 5324 "ViewCollection.c" } #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_view_it); -#line 5417 "ViewCollection.c" +#line 5328 "ViewCollection.c" } #line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = self->priv->selected; -#line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = views; + _tmp7_ = self->priv->selected; #line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = data_set_add_many (_tmp11_, _tmp12_); -#line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - added = _tmp13_; + added = data_set_add_many (_tmp7_, views); #line 858 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = added; + _tmp8_ = added; #line 858 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp14_, "added"); -#line 5431 "ViewCollection.c" + _vala_assert (_tmp8_, "added"); +#line 5338 "ViewCollection.c" } -static void view_collection_remove_many_selected (ViewCollection* self, GeeCollection* views) { - GeeCollection* _tmp0_; +static void +view_collection_remove_many_selected (ViewCollection* self, + GeeCollection* views) +{ + gint _tmp0_; gint _tmp1_; - gint _tmp2_; gboolean removed = FALSE; - DataSet* _tmp3_; - GeeCollection* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; + DataSet* _tmp2_; + gboolean _tmp3_; #line 861 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #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; + _tmp0_ = gee_collection_get_size (views); #line 862 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp1_ = _tmp0_; #line 862 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _tmp1_; -#line 862 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 863 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return; -#line 5458 "ViewCollection.c" +#line 5363 "ViewCollection.c" } #line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = self->priv->selected; -#line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = views; + _tmp2_ = self->priv->selected; #line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = data_set_remove_many (_tmp3_, _tmp4_); -#line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - removed = _tmp5_; + removed = data_set_remove_many (_tmp2_, views); #line 866 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = removed; + _tmp3_ = removed; #line 866 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp6_, "removed"); -#line 5472 "ViewCollection.c" + _vala_assert (_tmp3_, "removed"); +#line 5373 "ViewCollection.c" } -static gboolean _view_collection_select_item_marked_action (DataObject* object, GObject* user, gpointer self) { +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 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5481 "ViewCollection.c" +#line 5386 "ViewCollection.c" } -void view_collection_select_marked (ViewCollection* self, Marker* marker) { +void +view_collection_select_marked (ViewCollection* self, + Marker* marker) +{ GeeArrayList* selected = NULL; GeeArrayList* _tmp0_; - Marker* _tmp1_; + GeeArrayList* _tmp1_; GeeArrayList* _tmp2_; - GeeArrayList* _tmp3_; + gint _tmp3_; gint _tmp4_; - gint _tmp5_; #line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5499,39 +5406,39 @@ void view_collection_select_marked (ViewCollection* self, Marker* marker) { #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 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = selected; + _tmp1_ = selected; #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)); + data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), marker, _view_collection_select_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_OBJECT, GObject)); #line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = selected; + _tmp2_ = selected; #line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp5_ > 0) { -#line 5515 "ViewCollection.c" + if (_tmp4_ > 0) { +#line 5420 "ViewCollection.c" + GeeArrayList* _tmp5_; GeeArrayList* _tmp6_; - GeeArrayList* _tmp7_; #line 875 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = selected; + _tmp5_ = selected; #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)); + view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 876 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = selected; + _tmp6_ = selected; #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 5526 "ViewCollection.c" + view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), NULL); +#line 5431 "ViewCollection.c" } #line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (selected); -#line 5530 "ViewCollection.c" +#line 5435 "ViewCollection.c" } -void view_collection_select_all (ViewCollection* self) { +void +view_collection_select_all (ViewCollection* self) +{ Marker* marker = NULL; Marker* _tmp0_; #line 881 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5546,20 +5453,21 @@ void view_collection_select_all (ViewCollection* self) { view_collection_select_marked (self, marker); #line 881 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (marker); -#line 5549 "ViewCollection.c" +#line 5456 "ViewCollection.c" } -static gboolean view_collection_select_item (ViewCollection* self, DataObject* object, GObject* user) { +static gboolean +view_collection_select_item (ViewCollection* self, + DataObject* object, + GObject* user) +{ gboolean result = FALSE; DataView* view = NULL; - DataObject* _tmp0_; + DataView* _tmp0_; DataView* _tmp1_; - DataView* _tmp2_; - gboolean _tmp3_; - DataView* _tmp9_; - DataView* _tmp10_; - gboolean _tmp11_; + DataView* _tmp5_; + DataView* _tmp6_; #line 887 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); #line 887 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5567,39 +5475,29 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o #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; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView)); #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 888 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = _tmp1_; -#line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = view; + view = _tmp0_; #line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = data_view_is_selected (_tmp2_); + _tmp1_ = view; #line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp3_) { -#line 5581 "ViewCollection.c" - DataView* _tmp4_; - gboolean _tmp5_; -#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = view; + if (data_view_is_selected (_tmp1_)) { +#line 5485 "ViewCollection.c" + DataView* _tmp2_; #line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = data_view_is_visible (_tmp4_); + _tmp2_ = view; #line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp5_) { -#line 5590 "ViewCollection.c" - DataSet* _tmp6_; - DataView* _tmp7_; - gboolean _tmp8_; + if (data_view_is_visible (_tmp2_)) { +#line 5491 "ViewCollection.c" + DataSet* _tmp3_; + DataView* _tmp4_; #line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = self->priv->selected; + _tmp3_ = self->priv->selected; #line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = view; -#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)); + _tmp4_ = view; #line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp8_, "selected.contains(view)"); -#line 5602 "ViewCollection.c" + _vala_assert (data_set_contains (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject)), "selected.contains(view)"); +#line 5500 "ViewCollection.c" } #line 893 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; @@ -5607,28 +5505,23 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o _g_object_unref0 (view); #line 893 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5610 "ViewCollection.c" +#line 5508 "ViewCollection.c" } #line 896 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = view; + _tmp5_ = view; #line 896 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_view_internal_set_selected (_tmp9_, TRUE); + data_view_internal_set_selected (_tmp5_, TRUE); #line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = view; + _tmp6_ = view; #line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = data_view_is_visible (_tmp10_); -#line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp11_) { -#line 5622 "ViewCollection.c" - GObject* _tmp12_; - DataView* _tmp13_; -#line 901 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = user; + if (data_view_is_visible (_tmp6_)) { +#line 5518 "ViewCollection.c" + DataView* _tmp7_; #line 901 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = view; + _tmp7_ = view; #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 5631 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (user, GEE_TYPE_ARRAY_LIST, GeeArrayList), GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_); +#line 5524 "ViewCollection.c" } #line 903 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; @@ -5636,27 +5529,33 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o _g_object_unref0 (view); #line 903 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5639 "ViewCollection.c" +#line 5532 "ViewCollection.c" } -static gboolean _view_collection_unselect_item_marked_action (DataObject* object, GObject* user, gpointer self) { +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 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5648 "ViewCollection.c" +#line 5545 "ViewCollection.c" } -void view_collection_unselect_marked (ViewCollection* self, Marker* marker) { +void +view_collection_unselect_marked (ViewCollection* self, + Marker* marker) +{ GeeArrayList* unselected = NULL; GeeArrayList* _tmp0_; - Marker* _tmp1_; + GeeArrayList* _tmp1_; GeeArrayList* _tmp2_; - GeeArrayList* _tmp3_; + gint _tmp3_; gint _tmp4_; - gint _tmp5_; #line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5666,87 +5565,87 @@ void view_collection_unselect_marked (ViewCollection* self, Marker* marker) { #line 908 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" unselected = _tmp0_; #line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = marker; + _tmp1_ = unselected; #line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = unselected; -#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)); + data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), marker, _view_collection_unselect_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_OBJECT, GObject)); #line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = unselected; + _tmp2_ = unselected; #line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp5_ > 0) { -#line 5682 "ViewCollection.c" + if (_tmp4_ > 0) { +#line 5579 "ViewCollection.c" + GeeArrayList* _tmp5_; GeeArrayList* _tmp6_; - GeeArrayList* _tmp7_; #line 912 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = unselected; + _tmp5_ = unselected; #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)); + view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 913 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = unselected; + _tmp6_ = unselected; #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 5693 "ViewCollection.c" + view_collection_notify_items_selected_unselected (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 5590 "ViewCollection.c" } #line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (unselected); -#line 5697 "ViewCollection.c" +#line 5594 "ViewCollection.c" } -void view_collection_unselect_all (ViewCollection* self) { +void +view_collection_unselect_all (ViewCollection* self) +{ DataSet* _tmp0_; - gint _tmp1_; Marker* marker = NULL; + Marker* _tmp1_; Marker* _tmp2_; - Marker* _tmp3_; + GeeList* _tmp3_; GeeList* _tmp4_; - GeeList* _tmp5_; - Marker* _tmp6_; + Marker* _tmp5_; #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 919 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = data_set_get_count (_tmp0_); -#line 919 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp1_ == 0) { + if (data_set_get_count (_tmp0_) == 0) { #line 920 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return; -#line 5720 "ViewCollection.c" +#line 5616 "ViewCollection.c" } #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)); + _tmp1_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 922 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - marker = _tmp2_; + marker = _tmp1_; #line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = marker; + _tmp2_ = marker; #line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = view_collection_get_selected (self); + _tmp3_ = view_collection_get_selected (self); #line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - marker_mark_many (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); + marker_mark_many (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); #line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 925 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = marker; + _tmp5_ = marker; #line 925 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_unselect_marked (self, _tmp6_); + view_collection_unselect_marked (self, _tmp5_); #line 918 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (marker); -#line 5742 "ViewCollection.c" +#line 5638 "ViewCollection.c" } -void view_collection_unselect_all_but (ViewCollection* self, DataView* exception) { +void +view_collection_unselect_all_but (ViewCollection* self, + DataView* exception) +{ Marker* marker = NULL; Marker* _tmp0_; - Marker* _tmp15_; + Marker* _tmp13_; #line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5755,7 +5654,7 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception _tmp0_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" marker = _tmp0_; -#line 5758 "ViewCollection.c" +#line 5657 "ViewCollection.c" { GeeIterator* _object_it = NULL; GeeCollection* _tmp1_; @@ -5776,86 +5675,81 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception _object_it = _tmp4_; #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 5779 "ViewCollection.c" +#line 5678 "ViewCollection.c" GeeIterator* _tmp5_; - gboolean _tmp6_; DataObject* object = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; + GeeIterator* _tmp6_; + gpointer _tmp7_; DataView* view = NULL; - DataObject* _tmp9_; + DataObject* _tmp8_; + DataView* _tmp9_; DataView* _tmp10_; - DataView* _tmp11_; - DataView* _tmp12_; #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = _object_it; #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = gee_iterator_next (_tmp5_); -#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp5_)) { #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 5798 "ViewCollection.c" +#line 5693 "ViewCollection.c" } #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = _object_it; + _tmp6_ = _object_it; #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = (DataObject*) _tmp8_; + object = (DataObject*) _tmp7_; #line 932 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = object; + _tmp8_ = object; #line 932 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_VIEW, DataView)); + _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView)); #line 932 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = _tmp10_; + view = _tmp9_; #line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = view; -#line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = exception; + _tmp10_ = view; #line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp11_ != _tmp12_) { -#line 5818 "ViewCollection.c" - Marker* _tmp13_; - DataView* _tmp14_; + if (_tmp10_ != exception) { +#line 5711 "ViewCollection.c" + Marker* _tmp11_; + DataView* _tmp12_; #line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = marker; + _tmp11_ = marker; #line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = view; + _tmp12_ = view; #line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - marker_mark (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); -#line 5827 "ViewCollection.c" + marker_mark (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject)); +#line 5720 "ViewCollection.c" } #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 5833 "ViewCollection.c" +#line 5726 "ViewCollection.c" } #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 5837 "ViewCollection.c" +#line 5730 "ViewCollection.c" } #line 937 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = marker; + _tmp13_ = marker; #line 937 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_unselect_marked (self, _tmp15_); + view_collection_unselect_marked (self, _tmp13_); #line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (marker); -#line 5845 "ViewCollection.c" +#line 5738 "ViewCollection.c" } -static gboolean view_collection_unselect_item (ViewCollection* self, DataObject* object, GObject* user) { +static gboolean +view_collection_unselect_item (ViewCollection* self, + DataObject* object, + GObject* user) +{ gboolean result = FALSE; DataView* view = NULL; - DataObject* _tmp0_; + DataView* _tmp0_; DataView* _tmp1_; - DataView* _tmp2_; - gboolean _tmp3_; - DataView* _tmp7_; - GObject* _tmp8_; - DataView* _tmp9_; + DataView* _tmp4_; + DataView* _tmp5_; #line 940 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); #line 940 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5863,64 +5757,57 @@ static gboolean view_collection_unselect_item (ViewCollection* self, DataObject* #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; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView)); #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 941 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = _tmp1_; -#line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = view; + view = _tmp0_; #line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = data_view_is_selected (_tmp2_); + _tmp1_ = view; #line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { -#line 5877 "ViewCollection.c" - DataSet* _tmp4_; - DataView* _tmp5_; - gboolean _tmp6_; -#line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = self->priv->selected; + if (!data_view_is_selected (_tmp1_)) { +#line 5767 "ViewCollection.c" + DataSet* _tmp2_; + DataView* _tmp3_; #line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = view; + _tmp2_ = self->priv->selected; #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)); + _tmp3_ = view; #line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (!_tmp6_, "!selected.contains(view)"); + _vala_assert (!data_set_contains (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)), "!selected.contains(view)"); #line 945 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; #line 945 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); #line 945 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5895 "ViewCollection.c" +#line 5782 "ViewCollection.c" } #line 948 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = view; + _tmp4_ = view; #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; + data_view_internal_set_selected (_tmp4_, FALSE); #line 949 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = view; + _tmp5_ = view; #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_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (user, GEE_TYPE_ARRAY_LIST, GeeArrayList), GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_); #line 951 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; #line 951 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); #line 951 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5913 "ViewCollection.c" +#line 5798 "ViewCollection.c" } -void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* unselect, Marker* select) { +void +view_collection_unselect_and_select_marked (ViewCollection* self, + Marker* unselect, + Marker* select) +{ GeeArrayList* unselected = NULL; GeeArrayList* _tmp0_; - Marker* _tmp1_; GeeArrayList* selected = NULL; - GeeArrayList* _tmp2_; - Marker* _tmp3_; + GeeArrayList* _tmp1_; #line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5932,19 +5819,15 @@ void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* u #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 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)); + data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), unselect, _view_collection_unselect_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (unselected, G_TYPE_OBJECT, GObject)); #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 961 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 961 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - selected = _tmp2_; + selected = _tmp1_; #line 962 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = select; -#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)); + data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), select, _view_collection_select_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (selected, G_TYPE_OBJECT, GObject)); #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 966 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5953,27 +5836,33 @@ void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* u _g_object_unref0 (selected); #line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (unselected); -#line 5956 "ViewCollection.c" +#line 5839 "ViewCollection.c" } -static gboolean _view_collection_toggle_item_marked_action (DataObject* object, GObject* user, gpointer self) { +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 973 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5965 "ViewCollection.c" +#line 5852 "ViewCollection.c" } -void view_collection_toggle_marked (ViewCollection* self, Marker* marker) { +void +view_collection_toggle_marked (ViewCollection* self, + Marker* marker) +{ ViewCollectionToggleLists* lists = NULL; ViewCollectionToggleLists* _tmp0_; - Marker* _tmp1_; + GeeArrayList* _tmp1_; GeeArrayList* _tmp2_; GeeArrayList* _tmp3_; GeeArrayList* _tmp4_; - GeeArrayList* _tmp5_; #line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5983,39 +5872,38 @@ void view_collection_toggle_marked (ViewCollection* self, Marker* marker) { #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 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)); + data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), marker, _view_collection_toggle_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (lists, G_TYPE_OBJECT, GObject)); #line 976 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = lists->selected; + _tmp1_ = lists->selected; #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)); + view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); #line 977 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = lists->unselected; + _tmp2_ = lists->unselected; #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)); + view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 979 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = lists->selected; + _tmp3_ = lists->selected; #line 979 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = lists->unselected; + _tmp4_ = lists->unselected; #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)); + view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); #line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (lists); -#line 6005 "ViewCollection.c" +#line 5892 "ViewCollection.c" } -static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* object, GObject* user) { +static gboolean +view_collection_toggle_item (ViewCollection* self, + DataObject* object, + GObject* user) +{ gboolean result = FALSE; DataView* view = NULL; - DataObject* _tmp0_; - DataView* _tmp1_; + DataView* _tmp0_; ViewCollectionToggleLists* lists = NULL; - GObject* _tmp2_; - ViewCollectionToggleLists* _tmp3_; - DataView* _tmp4_; - gboolean _tmp5_; + ViewCollectionToggleLists* _tmp1_; + DataView* _tmp2_; #line 982 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); #line 982 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6023,59 +5911,50 @@ static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* o #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; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView)); #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 983 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = _tmp1_; -#line 984 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = user; + view = _tmp0_; #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)); + _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (user, VIEW_COLLECTION_TYPE_TOGGLE_LISTS, ViewCollectionToggleLists)); #line 984 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - lists = _tmp3_; + lists = _tmp1_; #line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = view; -#line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = data_view_internal_toggle (_tmp4_); + _tmp2_ = view; #line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp5_) { -#line 6043 "ViewCollection.c" - DataView* _tmp6_; - gboolean _tmp7_; -#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = view; + if (data_view_internal_toggle (_tmp2_)) { +#line 5925 "ViewCollection.c" + DataView* _tmp3_; #line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = data_view_is_visible (_tmp6_); + _tmp3_ = view; #line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp7_) { -#line 6052 "ViewCollection.c" - ViewCollectionToggleLists* _tmp8_; - GeeArrayList* _tmp9_; - DataView* _tmp10_; + if (data_view_is_visible (_tmp3_)) { +#line 5931 "ViewCollection.c" + ViewCollectionToggleLists* _tmp4_; + GeeArrayList* _tmp5_; + DataView* _tmp6_; #line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = lists; + _tmp4_ = lists; #line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = _tmp8_->selected; + _tmp5_ = _tmp4_->selected; #line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = view; + _tmp6_ = view; #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 6064 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp6_); +#line 5943 "ViewCollection.c" } } else { - ViewCollectionToggleLists* _tmp11_; - GeeArrayList* _tmp12_; - DataView* _tmp13_; + ViewCollectionToggleLists* _tmp7_; + GeeArrayList* _tmp8_; + DataView* _tmp9_; #line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = lists; + _tmp7_ = lists; #line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = _tmp11_->unselected; + _tmp8_ = _tmp7_->unselected; #line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = view; + _tmp9_ = view; #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 6078 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_); +#line 5957 "ViewCollection.c" } #line 997 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; @@ -6085,29 +5964,30 @@ static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* o _g_object_unref0 (view); #line 997 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6088 "ViewCollection.c" +#line 5967 "ViewCollection.c" } -gint view_collection_get_selected_count (ViewCollection* self) { +gint +view_collection_get_selected_count (ViewCollection* self) +{ gint result = 0; DataSet* _tmp0_; - gint _tmp1_; #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 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = data_set_get_count (_tmp0_); -#line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = _tmp1_; + result = data_set_get_count (_tmp0_); #line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6106 "ViewCollection.c" +#line 5984 "ViewCollection.c" } -GeeList* view_collection_get_selected (ViewCollection* self) { +GeeList* +view_collection_get_selected (ViewCollection* self) +{ GeeList* result = NULL; DataSet* _tmp0_; GeeList* _tmp1_; @@ -6121,32 +6001,35 @@ GeeList* view_collection_get_selected (ViewCollection* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_LIST, GeeList); #line 1005 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6124 "ViewCollection.c" +#line 6004 "ViewCollection.c" } -DataView* view_collection_get_selected_at (ViewCollection* self, gint index) { +DataView* +view_collection_get_selected_at (ViewCollection* self, + gint index) +{ DataView* result = NULL; DataSet* _tmp0_; - gint _tmp1_; - DataObject* _tmp2_; + DataObject* _tmp1_; #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 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = index; -#line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = data_set_get_at (_tmp0_, _tmp1_); + _tmp1_ = data_set_get_at (_tmp0_, index); #line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); #line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6145 "ViewCollection.c" +#line 6025 "ViewCollection.c" } -static gboolean view_collection_is_visible (ViewCollection* self, DataView* view) { +static gboolean +view_collection_is_visible (ViewCollection* self, + DataView* view) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; DataSet* _tmp1_; @@ -6158,41 +6041,34 @@ static gboolean view_collection_is_visible (ViewCollection* self, DataView* view _tmp1_ = self->priv->visible; #line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp1_ != NULL) { -#line 6161 "ViewCollection.c" +#line 6044 "ViewCollection.c" DataSet* _tmp2_; - DataView* _tmp3_; - gboolean _tmp4_; #line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = self->priv->visible; #line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = view; -#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 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = _tmp4_; -#line 6173 "ViewCollection.c" + _tmp0_ = data_set_contains (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_OBJECT, DataObject)); +#line 6050 "ViewCollection.c" } else { #line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = TRUE; -#line 6177 "ViewCollection.c" +#line 6054 "ViewCollection.c" } #line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = _tmp0_; #line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6183 "ViewCollection.c" +#line 6060 "ViewCollection.c" } -static gboolean view_collection_add_many_visible (ViewCollection* self, GeeCollection* many) { +static gboolean +view_collection_add_many_visible (ViewCollection* self, + GeeCollection* many) +{ gboolean result = FALSE; DataSet* _tmp0_; DataSet* _tmp1_; - GeeCollection* _tmp2_; - gboolean _tmp3_; - DataSet* _tmp4_; - gint _tmp5_; - gint _tmp6_; + DataSet* _tmp2_; #line 1016 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); #line 1016 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6205,64 +6081,55 @@ static gboolean view_collection_add_many_visible (ViewCollection* self, GeeColle result = TRUE; #line 1018 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6208 "ViewCollection.c" +#line 6084 "ViewCollection.c" } #line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp1_ = self->priv->visible; #line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = many; -#line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = data_set_add_many (_tmp1_, _tmp2_); -#line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { + if (!data_set_add_many (_tmp1_, many)) { #line 1021 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = FALSE; #line 1021 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6222 "ViewCollection.c" +#line 6094 "ViewCollection.c" } #line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = self->priv->visible; + _tmp2_ = self->priv->visible; #line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = data_set_get_count (_tmp4_); -#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 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp5_ == _tmp6_) { + if (data_set_get_count (_tmp2_) == DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection))) { #line 1025 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _data_set_unref0 (self->priv->visible); #line 1025 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->priv->visible = NULL; -#line 6236 "ViewCollection.c" +#line 6104 "ViewCollection.c" } #line 1027 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; #line 1027 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6242 "ViewCollection.c" +#line 6110 "ViewCollection.c" } -static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide) { +static void +view_collection_hide_items (ViewCollection* self, + GeeList* to_hide) +{ GeeArrayList* unselected = NULL; GeeArrayList* _tmp0_; gint count = 0; - GeeList* _tmp1_; + gint _tmp1_; gint _tmp2_; - gint _tmp3_; - DataSet* _tmp22_; + DataSet* _tmp17_; gboolean removed = FALSE; - DataSet* _tmp24_; - GeeList* _tmp25_; - gboolean _tmp26_; - gboolean _tmp27_; - GeeArrayList* _tmp28_; - GeeArrayList* _tmp29_; - gint _tmp30_; - gint _tmp31_; - GeeList* _tmp33_; - gint _tmp34_; - gint _tmp35_; + DataSet* _tmp19_; + gboolean _tmp20_; + GeeArrayList* _tmp21_; + GeeArrayList* _tmp22_; + gint _tmp23_; + gint _tmp24_; + gint _tmp26_; + gint _tmp27_; #line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6272,206 +6139,178 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide) #line 1032 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" unselected = _tmp0_; #line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = to_hide; + _tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (to_hide, GEE_TYPE_COLLECTION, GeeCollection)); #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 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - count = _tmp3_; -#line 6282 "ViewCollection.c" + count = _tmp2_; +#line 6147 "ViewCollection.c" { gint ctr = 0; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ctr = 0; -#line 6287 "ViewCollection.c" +#line 6152 "ViewCollection.c" { - gboolean _tmp4_ = FALSE; + gboolean _tmp3_ = FALSE; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = TRUE; + _tmp3_ = TRUE; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 6294 "ViewCollection.c" +#line 6159 "ViewCollection.c" + gint _tmp5_; gint _tmp6_; - gint _tmp7_; DataView* view = NULL; - GeeList* _tmp8_; - gint _tmp9_; - gpointer _tmp10_; - DataView* _tmp11_; - gboolean _tmp12_; - DataView* _tmp13_; - gboolean _tmp14_; - DataView* _tmp21_; + gint _tmp7_; + gpointer _tmp8_; + DataView* _tmp9_; + DataView* _tmp10_; + DataView* _tmp16_; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp4_) { -#line 6308 "ViewCollection.c" - gint _tmp5_; + if (!_tmp3_) { +#line 6170 "ViewCollection.c" + gint _tmp4_; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = ctr; + _tmp4_ = ctr; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ctr = _tmp5_ + 1; -#line 6314 "ViewCollection.c" + ctr = _tmp4_ + 1; +#line 6176 "ViewCollection.c" } #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = FALSE; + _tmp3_ = FALSE; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = ctr; + _tmp5_ = ctr; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = count; + _tmp6_ = count; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!(_tmp6_ < _tmp7_)) { + if (!(_tmp5_ < _tmp6_)) { #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 6326 "ViewCollection.c" +#line 6188 "ViewCollection.c" } #line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = to_hide; -#line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = ctr; + _tmp7_ = ctr; #line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = gee_list_get (_tmp8_, _tmp9_); + _tmp8_ = gee_list_get (to_hide, _tmp7_); #line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = (DataView*) _tmp10_; + view = (DataView*) _tmp8_; #line 1037 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = view; -#line 1037 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = data_view_is_visible (_tmp11_); + _tmp9_ = view; #line 1037 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp12_, "view.is_visible()"); -#line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = view; + _vala_assert (data_view_is_visible (_tmp9_), "view.is_visible()"); #line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = data_view_is_selected (_tmp13_); + _tmp10_ = view; #line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp14_) { -#line 6348 "ViewCollection.c" - DataView* _tmp15_; - GeeArrayList* _tmp16_; - DataView* _tmp17_; + if (data_view_is_selected (_tmp10_)) { +#line 6204 "ViewCollection.c" + DataView* _tmp11_; + GeeArrayList* _tmp12_; + DataView* _tmp13_; #line 1040 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = view; + _tmp11_ = view; #line 1040 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_view_internal_set_selected (_tmp15_, FALSE); + data_view_internal_set_selected (_tmp11_, FALSE); #line 1041 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = unselected; + _tmp12_ = unselected; #line 1041 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = view; + _tmp13_ = view; #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 6362 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_); +#line 6218 "ViewCollection.c" } else { - DataSet* _tmp18_; - DataView* _tmp19_; - gboolean _tmp20_; -#line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = self->priv->selected; + DataSet* _tmp14_; + DataView* _tmp15_; #line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = view; + _tmp14_ = self->priv->selected; #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)); + _tmp15_ = view; #line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (!_tmp20_, "!selected.contains(view)"); -#line 6375 "ViewCollection.c" + _vala_assert (!data_set_contains (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_OBJECT, DataObject)), "!selected.contains(view)"); +#line 6228 "ViewCollection.c" } #line 1046 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = view; + _tmp16_ = view; #line 1046 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_view_internal_set_visible (_tmp21_, FALSE); + data_view_internal_set_visible (_tmp16_, FALSE); #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 6383 "ViewCollection.c" +#line 6236 "ViewCollection.c" } } } #line 1049 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = self->priv->visible; + _tmp17_ = self->priv->visible; #line 1049 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp22_ == NULL) { -#line 6391 "ViewCollection.c" - DataSet* _tmp23_; + if (_tmp17_ == NULL) { +#line 6244 "ViewCollection.c" + DataSet* _tmp18_; #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)); + _tmp18_ = data_collection_get_dataset_copy (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 1051 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _data_set_unref0 (self->priv->visible); #line 1051 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->priv->visible = _tmp23_; -#line 6399 "ViewCollection.c" + self->priv->visible = _tmp18_; +#line 6252 "ViewCollection.c" } #line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = self->priv->visible; -#line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = to_hide; + _tmp19_ = self->priv->visible; #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 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - removed = _tmp26_; + removed = data_set_remove_many (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (to_hide, GEE_TYPE_COLLECTION, GeeCollection)); #line 1055 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = removed; + _tmp20_ = removed; #line 1055 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp27_, "removed"); + _vala_assert (_tmp20_, "removed"); #line 1057 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp28_ = unselected; + _tmp21_ = unselected; #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)); + view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp29_ = unselected; + _tmp22_ = unselected; #line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp23_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp31_ = _tmp30_; + _tmp24_ = _tmp23_; #line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp31_ > 0) { -#line 6425 "ViewCollection.c" - GeeArrayList* _tmp32_; + if (_tmp24_ > 0) { +#line 6274 "ViewCollection.c" + GeeArrayList* _tmp25_; #line 1060 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp32_ = unselected; + _tmp25_ = unselected; #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 6431 "ViewCollection.c" + view_collection_notify_items_selected_unselected (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 6280 "ViewCollection.c" } #line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp33_ = to_hide; -#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)); + _tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (to_hide, GEE_TYPE_COLLECTION, GeeCollection)); #line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp35_ = _tmp34_; + _tmp27_ = _tmp26_; #line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp35_ > 0) { -#line 6441 "ViewCollection.c" - GeeList* _tmp36_; - GeeList* _tmp37_; -#line 1063 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp36_ = to_hide; + if (_tmp27_ > 0) { #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; + view_collection_notify_items_hidden (self, G_TYPE_CHECK_INSTANCE_CAST (to_hide, GEE_TYPE_COLLECTION, GeeCollection)); #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 6452 "ViewCollection.c" + view_collection_notify_items_visibility_changed (self, G_TYPE_CHECK_INSTANCE_CAST (to_hide, GEE_TYPE_COLLECTION, GeeCollection)); +#line 6292 "ViewCollection.c" } #line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (unselected); -#line 6456 "ViewCollection.c" +#line 6296 "ViewCollection.c" } -static void view_collection_show_items (ViewCollection* self, GeeList* to_show) { +static void +view_collection_show_items (ViewCollection* self, + GeeList* to_show) +{ GeeArrayList* added_selected = NULL; GeeArrayList* _tmp0_; gint count = 0; - GeeList* _tmp1_; + gint _tmp1_; gint _tmp2_; - gint _tmp3_; gboolean added = FALSE; - GeeList* _tmp21_; - gboolean _tmp22_; - gboolean _tmp23_; - GeeArrayList* _tmp24_; - GeeList* _tmp25_; - gint _tmp26_; - gint _tmp27_; + gboolean _tmp16_; + GeeArrayList* _tmp17_; + gint _tmp18_; + gint _tmp19_; #line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6481,185 +6320,160 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show) #line 1070 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" added_selected = _tmp0_; #line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = to_show; -#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)); + _tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (to_show, GEE_TYPE_COLLECTION, GeeCollection)); #line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - count = _tmp3_; -#line 6491 "ViewCollection.c" + count = _tmp2_; +#line 6328 "ViewCollection.c" { gint ctr = 0; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ctr = 0; -#line 6496 "ViewCollection.c" +#line 6333 "ViewCollection.c" { - gboolean _tmp4_ = FALSE; + gboolean _tmp3_ = FALSE; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = TRUE; + _tmp3_ = TRUE; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 6503 "ViewCollection.c" +#line 6340 "ViewCollection.c" + gint _tmp5_; gint _tmp6_; - gint _tmp7_; DataView* view = NULL; - GeeList* _tmp8_; - gint _tmp9_; - gpointer _tmp10_; + gint _tmp7_; + gpointer _tmp8_; + DataView* _tmp9_; + DataView* _tmp10_; DataView* _tmp11_; - gboolean _tmp12_; - DataView* _tmp13_; - DataView* _tmp14_; - gboolean _tmp15_; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp4_) { -#line 6517 "ViewCollection.c" - gint _tmp5_; + if (!_tmp3_) { +#line 6351 "ViewCollection.c" + gint _tmp4_; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = ctr; + _tmp4_ = ctr; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ctr = _tmp5_ + 1; -#line 6523 "ViewCollection.c" + ctr = _tmp4_ + 1; +#line 6357 "ViewCollection.c" } #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = FALSE; + _tmp3_ = FALSE; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = ctr; + _tmp5_ = ctr; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = count; + _tmp6_ = count; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!(_tmp6_ < _tmp7_)) { + if (!(_tmp5_ < _tmp6_)) { #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 6535 "ViewCollection.c" +#line 6369 "ViewCollection.c" } #line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = to_show; -#line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = ctr; + _tmp7_ = ctr; #line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = gee_list_get (_tmp8_, _tmp9_); + _tmp8_ = gee_list_get (to_show, _tmp7_); #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; + view = (DataView*) _tmp8_; #line 1075 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = data_view_is_visible (_tmp11_); + _tmp9_ = view; #line 1075 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (!_tmp12_, "!view.is_visible()"); + _vala_assert (!data_view_is_visible (_tmp9_), "!view.is_visible()"); #line 1077 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = view; + _tmp10_ = view; #line 1077 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_view_internal_set_visible (_tmp13_, TRUE); -#line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = view; + data_view_internal_set_visible (_tmp10_, TRUE); #line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = data_view_is_selected (_tmp14_); + _tmp11_ = view; #line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp15_) { -#line 6561 "ViewCollection.c" - DataSet* _tmp16_; - DataView* _tmp17_; - gboolean _tmp18_; - GeeArrayList* _tmp19_; - DataView* _tmp20_; -#line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = self->priv->selected; + if (data_view_is_selected (_tmp11_)) { +#line 6389 "ViewCollection.c" + DataSet* _tmp12_; + DataView* _tmp13_; + GeeArrayList* _tmp14_; + DataView* _tmp15_; #line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = view; + _tmp12_ = self->priv->selected; #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)); + _tmp13_ = view; #line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (!_tmp18_, "!selected.contains(view)"); + _vala_assert (!data_set_contains (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject)), "!selected.contains(view)"); #line 1082 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = added_selected; + _tmp14_ = added_selected; #line 1082 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = view; + _tmp15_ = view; #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 6581 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); +#line 6406 "ViewCollection.c" } #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 6585 "ViewCollection.c" +#line 6410 "ViewCollection.c" } } } #line 1086 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = to_show; -#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 1086 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - added = _tmp22_; + added = view_collection_add_many_visible (self, G_TYPE_CHECK_INSTANCE_CAST (to_show, GEE_TYPE_COLLECTION, GeeCollection)); #line 1087 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = added; + _tmp16_ = added; #line 1087 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp23_, "added"); + _vala_assert (_tmp16_, "added"); #line 1089 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = added_selected; + _tmp17_ = added_selected; #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 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = to_show; + view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection)); #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)); + _tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (to_show, GEE_TYPE_COLLECTION, GeeCollection)); #line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = _tmp26_; + _tmp19_ = _tmp18_; #line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp27_ > 0) { -#line 6611 "ViewCollection.c" - GeeList* _tmp28_; - GeeList* _tmp29_; + if (_tmp19_ > 0) { #line 1092 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp28_ = to_show; -#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; + view_collection_notify_items_shown (self, G_TYPE_CHECK_INSTANCE_CAST (to_show, GEE_TYPE_COLLECTION, GeeCollection)); #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 6622 "ViewCollection.c" + view_collection_notify_items_visibility_changed (self, G_TYPE_CHECK_INSTANCE_CAST (to_show, GEE_TYPE_COLLECTION, GeeCollection)); +#line 6434 "ViewCollection.c" } #line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (added_selected); -#line 6626 "ViewCollection.c" +#line 6438 "ViewCollection.c" } -gboolean view_collection_has_view_for_source (ViewCollection* self, DataSource* source) { +gboolean +view_collection_has_view_for_source (ViewCollection* self, + DataSource* source) +{ gboolean result = FALSE; - DataSource* _tmp0_; + DataView* _tmp0_; DataView* _tmp1_; - DataView* _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; #line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), 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; + _tmp0_ = view_collection_get_view_for_source (self, source); #line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view_collection_get_view_for_source (self, _tmp0_); -#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _tmp2_ != NULL; + _tmp2_ = _tmp1_ != NULL; #line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = _tmp3_; + result = _tmp2_; #line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6654 "ViewCollection.c" +#line 6466 "ViewCollection.c" } -DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source) { +DataView* +view_collection_get_view_for_source (ViewCollection* self, + DataSource* source) +{ DataView* result = NULL; GeeHashMap* _tmp0_; - DataSource* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 1103 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 1103 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6667,53 +6481,53 @@ DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* #line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = self->priv->source_map; #line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = source; -#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_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), source); #line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = (DataView*) _tmp2_; + result = (DataView*) _tmp1_; #line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6677 "ViewCollection.c" +#line 6489 "ViewCollection.c" } -gboolean view_collection_has_view_for_source_with_filtered (ViewCollection* self, DataSource* source) { +gboolean +view_collection_has_view_for_source_with_filtered (ViewCollection* self, + DataSource* source) +{ gboolean result = FALSE; - DataSource* _tmp0_; + DataView* _tmp0_; DataView* _tmp1_; - DataView* _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; #line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), 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; + _tmp0_ = view_collection_get_view_for_source_filtered (self, source); #line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view_collection_get_view_for_source_filtered (self, _tmp0_); + _tmp1_ = _tmp0_; #line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _tmp1_; -#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _tmp2_ != NULL; + _tmp2_ = _tmp1_ != NULL; #line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = _tmp3_; + result = _tmp2_; #line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6705 "ViewCollection.c" +#line 6517 "ViewCollection.c" } -DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, DataSource* source) { +DataView* +view_collection_get_view_for_source_filtered (ViewCollection* self, + DataSource* source) +{ DataView* result = NULL; DataView* view = NULL; GeeHashMap* _tmp0_; - DataSource* _tmp1_; - gpointer _tmp2_; - gboolean _tmp3_ = FALSE; - DataView* _tmp4_; + gpointer _tmp1_; + gboolean _tmp2_ = FALSE; + DataView* _tmp3_; #line 1113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 1113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6721,49 +6535,46 @@ DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, Da #line 1114 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = self->priv->source_map; #line 1114 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = source; -#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_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), source); #line 1114 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = (DataView*) _tmp2_; -#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = view; + view = (DataView*) _tmp1_; #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp4_ != NULL) { -#line 6733 "ViewCollection.c" - DataView* _tmp5_; - gboolean _tmp6_; + _tmp3_ = view; #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = view; + if (_tmp3_ != NULL) { +#line 6545 "ViewCollection.c" + DataView* _tmp4_; #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = view_collection_is_in_filter (self, _tmp5_); + _tmp4_ = view; #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = !_tmp6_; -#line 6742 "ViewCollection.c" + _tmp2_ = !view_collection_is_in_filter (self, _tmp4_); +#line 6551 "ViewCollection.c" } else { #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = FALSE; -#line 6746 "ViewCollection.c" + _tmp2_ = FALSE; +#line 6555 "ViewCollection.c" } #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp3_) { + if (_tmp2_) { #line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = NULL; #line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); #line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6756 "ViewCollection.c" +#line 6565 "ViewCollection.c" } #line 1118 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = view; #line 1118 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6762 "ViewCollection.c" +#line 6571 "ViewCollection.c" } -GeeCollection* view_collection_get_sources (ViewCollection* self) { +GeeCollection* +view_collection_get_sources (ViewCollection* self) +{ GeeCollection* result = NULL; GeeHashMap* _tmp0_; GeeSet* _tmp1_; @@ -6794,85 +6605,70 @@ GeeCollection* view_collection_get_sources (ViewCollection* self) { result = _tmp6_; #line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6797 "ViewCollection.c" +#line 6608 "ViewCollection.c" } -gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) { +gboolean +view_collection_has_source_of_type (ViewCollection* self, + GType t) +{ gboolean result = FALSE; - GType _tmp0_; - gboolean _tmp1_; #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 1128 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = g_type_is_a (_tmp0_, TYPE_DATA_SOURCE); + g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); #line 1128 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp1_, "t.is_a(typeof(DataSource))"); -#line 6813 "ViewCollection.c" + _vala_assert (g_type_is_a (t, TYPE_DATA_SOURCE), "t.is_a(typeof(DataSource))"); +#line 6621 "ViewCollection.c" { GeeIterator* _source_it = NULL; - GeeHashMap* _tmp2_; + GeeHashMap* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; GeeSet* _tmp3_; - GeeSet* _tmp4_; - GeeSet* _tmp5_; - GeeIterator* _tmp6_; - GeeIterator* _tmp7_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = self->priv->source_map; + _tmp0_ = self->priv->source_map; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp3_); #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _source_it = _tmp7_; + _source_it = _tmp5_; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 6840 "ViewCollection.c" - GeeIterator* _tmp8_; - gboolean _tmp9_; +#line 6648 "ViewCollection.c" + GeeIterator* _tmp6_; DataSource* source = NULL; - GeeIterator* _tmp10_; - gpointer _tmp11_; - DataSource* _tmp12_; - GType _tmp13_; - GType _tmp14_; - gboolean _tmp15_; -#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = _source_it; + GeeIterator* _tmp7_; + gpointer _tmp8_; + DataSource* _tmp9_; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = gee_iterator_next (_tmp8_); + _tmp6_ = _source_it; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp9_) { + if (!gee_iterator_next (_tmp6_)) { #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 6858 "ViewCollection.c" +#line 6660 "ViewCollection.c" } #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = _source_it; + _tmp7_ = _source_it; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = gee_iterator_get (_tmp10_); + _tmp8_ = gee_iterator_get (_tmp7_); #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 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 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = t; + source = (DataSource*) _tmp8_; #line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = g_type_is_a (_tmp13_, _tmp14_); + _tmp9_ = source; #line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp15_) { + if (g_type_is_a (G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, G_TYPE_OBJECT, GObject)), t)) { #line 1132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; #line 1132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6881,263 +6677,234 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) { _g_object_unref0 (_source_it); #line 1132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6884 "ViewCollection.c" +#line 6680 "ViewCollection.c" } #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (source); -#line 6888 "ViewCollection.c" +#line 6684 "ViewCollection.c" } #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_source_it); -#line 6892 "ViewCollection.c" +#line 6688 "ViewCollection.c" } #line 1135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = FALSE; #line 1135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6898 "ViewCollection.c" +#line 6694 "ViewCollection.c" } -gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) { +gint +view_collection_get_sources_of_type_count (ViewCollection* self, + GType t) +{ gint result = 0; - GType _tmp0_; - gboolean _tmp1_; gint count = 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 1139 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = g_type_is_a (_tmp0_, TYPE_DATA_SOURCE); -#line 1139 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp1_, "t.is_a(typeof(DataSource))"); + _vala_assert (g_type_is_a (t, TYPE_DATA_SOURCE), "t.is_a(typeof(DataSource))"); #line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" count = 0; -#line 6917 "ViewCollection.c" +#line 6710 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeCollection* _tmp2_; - GeeCollection* _tmp3_; - GeeIterator* _tmp4_; - GeeIterator* _tmp5_; + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; + GeeIterator* _tmp3_; #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)); + _tmp0_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _object_it = _tmp5_; + _object_it = _tmp3_; #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 6938 "ViewCollection.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 6731 "ViewCollection.c" + GeeIterator* _tmp4_; DataObject* object = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - DataObject* _tmp10_; - DataSource* _tmp11_; - DataSource* _tmp12_; - GType _tmp13_; - GType _tmp14_; - gboolean _tmp15_; - gboolean _tmp16_; -#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = _object_it; + GeeIterator* _tmp5_; + gpointer _tmp6_; + DataObject* _tmp7_; + DataSource* _tmp8_; + DataSource* _tmp9_; + gboolean _tmp10_; #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp4_ = _object_it; #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp4_)) { #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 6959 "ViewCollection.c" +#line 6746 "ViewCollection.c" } #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = _object_it; + _tmp5_ = _object_it; #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp6_ = gee_iterator_get (_tmp5_); #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 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 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = _tmp11_; + object = (DataObject*) _tmp6_; #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)); + _tmp7_ = object; #line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = t; + _tmp8_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_VIEW, DataView)); #line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = g_type_is_a (_tmp13_, _tmp14_); + _tmp9_ = _tmp8_; #line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = _tmp15_; + _tmp10_ = g_type_is_a (G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, G_TYPE_OBJECT, GObject)), t); #line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp9_); #line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp16_) { -#line 6985 "ViewCollection.c" - gint _tmp17_; + if (_tmp10_) { +#line 6766 "ViewCollection.c" + gint _tmp11_; #line 1144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = count; + _tmp11_ = count; #line 1144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - count = _tmp17_ + 1; -#line 6991 "ViewCollection.c" + count = _tmp11_ + 1; +#line 6772 "ViewCollection.c" } #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 6995 "ViewCollection.c" +#line 6776 "ViewCollection.c" } #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 6999 "ViewCollection.c" +#line 6780 "ViewCollection.c" } #line 1147 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = count; #line 1147 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 7005 "ViewCollection.c" +#line 6786 "ViewCollection.c" } -GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) { +GeeList* +view_collection_get_sources_of_type (ViewCollection* self, + GType t) +{ GeeList* result = NULL; - GType _tmp0_; - gboolean _tmp1_; GeeList* sources = 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 1151 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = g_type_is_a (_tmp0_, TYPE_DATA_SOURCE); -#line 1151 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp1_, "t.is_a(typeof(DataSource))"); + _vala_assert (g_type_is_a (t, TYPE_DATA_SOURCE), "t.is_a(typeof(DataSource))"); #line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" sources = NULL; -#line 7024 "ViewCollection.c" +#line 6802 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeCollection* _tmp2_; - GeeCollection* _tmp3_; - GeeIterator* _tmp4_; - GeeIterator* _tmp5_; + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; + GeeIterator* _tmp3_; #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)); + _tmp0_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _object_it = _tmp5_; + _object_it = _tmp3_; #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 7045 "ViewCollection.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 6823 "ViewCollection.c" + GeeIterator* _tmp4_; DataObject* object = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp5_; + gpointer _tmp6_; DataSource* source = NULL; - DataObject* _tmp10_; - DataSource* _tmp11_; - DataSource* _tmp12_; - GType _tmp13_; - GType _tmp14_; - gboolean _tmp15_; -#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = _object_it; + DataObject* _tmp7_; + DataSource* _tmp8_; + DataSource* _tmp9_; #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp4_ = _object_it; #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp4_)) { #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 7066 "ViewCollection.c" +#line 6838 "ViewCollection.c" } #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = _object_it; + _tmp5_ = _object_it; #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = (DataObject*) _tmp9_; + object = (DataObject*) _tmp6_; #line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = object; + _tmp7_ = object; #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)); + _tmp8_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_VIEW, DataView)); #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 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 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = t; + source = _tmp8_; #line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = g_type_is_a (_tmp13_, _tmp14_); + _tmp9_ = source; #line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp15_) { -#line 7090 "ViewCollection.c" - GeeList* _tmp16_; - GeeList* _tmp18_; - DataSource* _tmp19_; + if (g_type_is_a (G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, G_TYPE_OBJECT, GObject)), t)) { +#line 6856 "ViewCollection.c" + GeeList* _tmp10_; + GeeList* _tmp12_; + DataSource* _tmp13_; #line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = sources; + _tmp10_ = sources; #line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp16_ == NULL) { -#line 7098 "ViewCollection.c" - GeeArrayList* _tmp17_; + if (_tmp10_ == NULL) { +#line 6864 "ViewCollection.c" + GeeArrayList* _tmp11_; #line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp11_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (sources); #line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_LIST, GeeList); -#line 7106 "ViewCollection.c" + sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_LIST, GeeList); +#line 6872 "ViewCollection.c" } #line 1160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = sources; + _tmp12_ = sources; #line 1160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = source; + _tmp13_ = source; #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 7114 "ViewCollection.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_); +#line 6880 "ViewCollection.c" } #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (source); #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 7120 "ViewCollection.c" +#line 6886 "ViewCollection.c" } #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 7124 "ViewCollection.c" +#line 6890 "ViewCollection.c" } #line 1164 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = sources; #line 1164 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 7130 "ViewCollection.c" +#line 6896 "ViewCollection.c" } -GeeList* view_collection_get_selected_sources (ViewCollection* self) { +GeeList* +view_collection_get_selected_sources (ViewCollection* self) +{ GeeList* result = NULL; GeeList* sources = NULL; GeeArrayList* _tmp0_; gint count = 0; DataSet* _tmp1_; - gint _tmp2_; #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" @@ -7147,74 +6914,72 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) { #line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp1_ = self->priv->selected; #line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = data_set_get_count (_tmp1_); -#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - count = _tmp2_; -#line 7153 "ViewCollection.c" + count = data_set_get_count (_tmp1_); +#line 6918 "ViewCollection.c" { gint ctr = 0; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ctr = 0; -#line 7158 "ViewCollection.c" +#line 6923 "ViewCollection.c" { - gboolean _tmp3_ = FALSE; + gboolean _tmp2_ = FALSE; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = TRUE; + _tmp2_ = TRUE; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 7165 "ViewCollection.c" +#line 6930 "ViewCollection.c" + gint _tmp4_; gint _tmp5_; - gint _tmp6_; - GeeList* _tmp7_; - DataSet* _tmp8_; - gint _tmp9_; - DataObject* _tmp10_; - DataView* _tmp11_; + GeeList* _tmp6_; + DataSet* _tmp7_; + gint _tmp8_; + DataObject* _tmp9_; + DataView* _tmp10_; + DataSource* _tmp11_; DataSource* _tmp12_; - DataSource* _tmp13_; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { -#line 7177 "ViewCollection.c" - gint _tmp4_; + if (!_tmp2_) { +#line 6942 "ViewCollection.c" + gint _tmp3_; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = ctr; + _tmp3_ = ctr; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ctr = _tmp4_ + 1; -#line 7183 "ViewCollection.c" + ctr = _tmp3_ + 1; +#line 6948 "ViewCollection.c" } #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = FALSE; + _tmp2_ = FALSE; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = ctr; + _tmp4_ = ctr; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = count; + _tmp5_ = count; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!(_tmp5_ < _tmp6_)) { + if (!(_tmp4_ < _tmp5_)) { #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 7195 "ViewCollection.c" +#line 6960 "ViewCollection.c" } #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = sources; + _tmp6_ = sources; #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = self->priv->selected; + _tmp7_ = self->priv->selected; #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = ctr; + _tmp8_ = ctr; #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = data_set_get_at (_tmp8_, _tmp9_); + _tmp9_ = data_set_get_at (_tmp7_, _tmp8_); #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView); + _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_VIEW, DataView); #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = data_view_get_source (_tmp11_); + _tmp11_ = data_view_get_source (_tmp10_); #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), _tmp12_); #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp12_); #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp11_); -#line 7217 "ViewCollection.c" + _g_object_unref0 (_tmp10_); +#line 6982 "ViewCollection.c" } } } @@ -7222,69 +6987,72 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) { result = sources; #line 1174 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 7225 "ViewCollection.c" +#line 6990 "ViewCollection.c" } -DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index) { +DataSource* +view_collection_get_selected_source_at (ViewCollection* self, + gint index) +{ DataSource* result = NULL; DataObject* object = NULL; DataSet* _tmp0_; - gint _tmp1_; - DataObject* _tmp2_; - DataSource* _tmp3_ = NULL; - DataObject* _tmp4_; + DataObject* _tmp1_; + DataSource* _tmp2_ = NULL; + DataObject* _tmp3_; #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 1178 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = index; -#line 1178 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = data_set_get_at (_tmp0_, _tmp1_); + _tmp1_ = data_set_get_at (_tmp0_, index); #line 1178 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = _tmp2_; + object = _tmp1_; #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = object; + _tmp3_ = object; #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp4_ != NULL) { -#line 7251 "ViewCollection.c" - DataObject* _tmp5_; - DataSource* _tmp6_; + if (_tmp3_ != NULL) { +#line 7016 "ViewCollection.c" + DataObject* _tmp4_; + DataSource* _tmp5_; #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = object; + _tmp4_ = object; #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)); + _tmp5_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_VIEW, DataView)); #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _tmp6_; -#line 7262 "ViewCollection.c" + _tmp2_ = _tmp5_; +#line 7027 "ViewCollection.c" } else { #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = NULL; -#line 7268 "ViewCollection.c" + _tmp2_ = NULL; +#line 7033 "ViewCollection.c" } #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = _tmp3_; + result = _tmp2_; #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 7276 "ViewCollection.c" +#line 7041 "ViewCollection.c" } -GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t) { +GeeList* +view_collection_get_selected_sources_of_type (ViewCollection* self, + GType t) +{ GeeList* result = NULL; GeeList* sources = 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 7287 "ViewCollection.c" +#line 7055 "ViewCollection.c" { GeeList* _view_list = NULL; GeeList* _tmp0_; @@ -7309,7 +7077,7 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy _view_index = -1; #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 7312 "ViewCollection.c" +#line 7080 "ViewCollection.c" gint _tmp4_; gint _tmp5_; gint _tmp6_; @@ -7321,9 +7089,6 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy DataView* _tmp10_; DataSource* _tmp11_; DataSource* _tmp12_; - GType _tmp13_; - GType _tmp14_; - gboolean _tmp15_; #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = _view_index; #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -7336,7 +7101,7 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy if (!(_tmp5_ < _tmp6_)) { #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 7339 "ViewCollection.c" +#line 7104 "ViewCollection.c" } #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp7_ = _view_list; @@ -7355,233 +7120,208 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy #line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp12_ = source; #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 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = t; -#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = g_type_is_a (_tmp13_, _tmp14_); -#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp15_) { -#line 7365 "ViewCollection.c" - GeeList* _tmp16_; - GeeList* _tmp18_; - DataSource* _tmp19_; + if (g_type_is_a (G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject)), t)) { +#line 7124 "ViewCollection.c" + GeeList* _tmp13_; + GeeList* _tmp15_; + DataSource* _tmp16_; #line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = sources; + _tmp13_ = sources; #line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp16_ == NULL) { -#line 7373 "ViewCollection.c" - GeeArrayList* _tmp17_; + if (_tmp13_ == NULL) { +#line 7132 "ViewCollection.c" + GeeArrayList* _tmp14_; #line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp14_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (sources); #line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_LIST, GeeList); -#line 7381 "ViewCollection.c" + sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_LIST, GeeList); +#line 7140 "ViewCollection.c" } #line 1191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = sources; + _tmp15_ = sources; #line 1191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = source; + _tmp16_ = source; #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 7389 "ViewCollection.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection), _tmp16_); +#line 7148 "ViewCollection.c" } #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (source); #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 7395 "ViewCollection.c" +#line 7154 "ViewCollection.c" } #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_view_list); -#line 7399 "ViewCollection.c" +#line 7158 "ViewCollection.c" } #line 1195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = sources; #line 1195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 7405 "ViewCollection.c" +#line 7164 "ViewCollection.c" } -gint view_collection_index_of_source (ViewCollection* self, DataSource* source) { +gint +view_collection_index_of_source (ViewCollection* self, + DataSource* source) +{ gint result = 0; DataView* view = NULL; - DataSource* _tmp0_; - DataView* _tmp1_; - gint _tmp2_ = 0; - DataView* _tmp3_; + DataView* _tmp0_; + gint _tmp1_ = 0; + DataView* _tmp2_; #line 1199 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), 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; + _tmp0_ = view_collection_get_view_for_source (self, source); #line 1200 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view_collection_get_view_for_source (self, _tmp0_); -#line 1200 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = _tmp1_; -#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = view; + view = _tmp0_; #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp3_ != NULL) { -#line 7430 "ViewCollection.c" - DataView* _tmp4_; - gint _tmp5_; + _tmp2_ = view; #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = view; + if (_tmp2_ != NULL) { +#line 7189 "ViewCollection.c" + DataView* _tmp3_; #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)); + _tmp3_ = view; #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _tmp5_; -#line 7439 "ViewCollection.c" + _tmp1_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); +#line 7195 "ViewCollection.c" } else { #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = -1; -#line 7443 "ViewCollection.c" + _tmp1_ = -1; +#line 7199 "ViewCollection.c" } #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = _tmp2_; + result = _tmp1_; #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 7451 "ViewCollection.c" +#line 7207 "ViewCollection.c" } -void view_collection_internal_notify_view_altered (ViewCollection* self, DataView* view) { - gboolean _tmp0_; +void +view_collection_internal_notify_view_altered (ViewCollection* self, + DataView* view) +{ #line 1206 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #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 1207 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp0_) { -#line 7465 "ViewCollection.c" - DataView* _tmp1_; - DataView* _tmp2_; - GeeCollection* _tmp3_; - GeeCollection* _tmp4_; -#line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view; + if (!data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection))) { +#line 7221 "ViewCollection.c" + GeeCollection* _tmp0_; + GeeCollection* _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; + view_collection_notify_item_view_altered (self, view); #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)); + _tmp0_ = data_collection_get_singleton (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_OBJECT, DataObject)); #line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_views_altered (self, _tmp4_); + view_collection_notify_views_altered (self, _tmp1_); #line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp4_); -#line 7484 "ViewCollection.c" + _g_object_unref0 (_tmp1_); +#line 7234 "ViewCollection.c" } else { - GeeHashSet* _tmp5_; - GeeHashSet* _tmp7_; - DataView* _tmp8_; + GeeHashSet* _tmp2_; + GeeHashSet* _tmp4_; #line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = self->priv->frozen_views_altered; + _tmp2_ = self->priv->frozen_views_altered; #line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp5_ == NULL) { -#line 7493 "ViewCollection.c" - GeeHashSet* _tmp6_; + if (_tmp2_ == NULL) { +#line 7242 "ViewCollection.c" + GeeHashSet* _tmp3_; #line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp3_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (self->priv->frozen_views_altered); #line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->priv->frozen_views_altered = _tmp6_; -#line 7501 "ViewCollection.c" + self->priv->frozen_views_altered = _tmp3_; +#line 7250 "ViewCollection.c" } #line 1213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = self->priv->frozen_views_altered; -#line 1213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = view; + _tmp4_ = self->priv->frozen_views_altered; #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 7509 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), view); +#line 7256 "ViewCollection.c" } } -void view_collection_internal_notify_geometry_altered (ViewCollection* self, DataView* view) { - gboolean _tmp0_; +void +view_collection_internal_notify_geometry_altered (ViewCollection* self, + DataView* view) +{ #line 1218 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #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 1219 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp0_) { -#line 7524 "ViewCollection.c" - DataView* _tmp1_; - DataView* _tmp2_; - GeeCollection* _tmp3_; - GeeCollection* _tmp4_; -#line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view; + if (!data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection))) { +#line 7271 "ViewCollection.c" + GeeCollection* _tmp0_; + GeeCollection* _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; + view_collection_notify_item_geometry_altered (self, view); #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)); + _tmp0_ = data_collection_get_singleton (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_OBJECT, DataObject)); #line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_geometries_altered (self, _tmp4_); + view_collection_notify_geometries_altered (self, _tmp1_); #line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp4_); -#line 7543 "ViewCollection.c" + _g_object_unref0 (_tmp1_); +#line 7284 "ViewCollection.c" } else { - GeeHashSet* _tmp5_; - GeeHashSet* _tmp7_; - DataView* _tmp8_; + GeeHashSet* _tmp2_; + GeeHashSet* _tmp4_; #line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = self->priv->frozen_geometries_altered; + _tmp2_ = self->priv->frozen_geometries_altered; #line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp5_ == NULL) { -#line 7552 "ViewCollection.c" - GeeHashSet* _tmp6_; + if (_tmp2_ == NULL) { +#line 7292 "ViewCollection.c" + GeeHashSet* _tmp3_; #line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp3_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (self->priv->frozen_geometries_altered); #line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->priv->frozen_geometries_altered = _tmp6_; -#line 7560 "ViewCollection.c" + self->priv->frozen_geometries_altered = _tmp3_; +#line 7300 "ViewCollection.c" } #line 1225 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = self->priv->frozen_geometries_altered; + _tmp4_ = self->priv->frozen_geometries_altered; #line 1225 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = view; -#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 7568 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), view); +#line 7306 "ViewCollection.c" } } -static void view_collection_real_notify_thawed (DataCollection* base) { +static void +view_collection_real_notify_thawed (DataCollection* base) +{ ViewCollection * self; GeeHashSet* _tmp0_; - GeeHashSet* _tmp9_; + GeeHashSet* _tmp8_; #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 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp0_ != NULL) { -#line 7583 "ViewCollection.c" - GeeHashSet* _tmp8_; +#line 7323 "ViewCollection.c" + GeeHashSet* _tmp7_; { GeeIterator* _view_it = NULL; GeeHashSet* _tmp1_; @@ -7594,220 +7334,252 @@ static void view_collection_real_notify_thawed (DataCollection* base) { _view_it = _tmp2_; #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 7597 "ViewCollection.c" +#line 7337 "ViewCollection.c" GeeIterator* _tmp3_; - gboolean _tmp4_; DataView* view = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - DataView* _tmp7_; + GeeIterator* _tmp4_; + gpointer _tmp5_; + DataView* _tmp6_; #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp3_ = _view_it; #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_iterator_next (_tmp3_); -#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp3_)) { #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 7612 "ViewCollection.c" +#line 7349 "ViewCollection.c" } #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _view_it; + _tmp4_ = _view_it; #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = (DataView*) _tmp6_; + view = (DataView*) _tmp5_; #line 1232 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = view; + _tmp6_ = view; #line 1232 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_item_view_altered (self, _tmp7_); + view_collection_notify_item_view_altered (self, _tmp6_); #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 7626 "ViewCollection.c" +#line 7363 "ViewCollection.c" } #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_view_it); -#line 7630 "ViewCollection.c" +#line 7367 "ViewCollection.c" } #line 1233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = self->priv->frozen_views_altered; + _tmp7_ = self->priv->frozen_views_altered; #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)); + view_collection_notify_views_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1234 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (self->priv->frozen_views_altered); #line 1234 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->priv->frozen_views_altered = NULL; -#line 7640 "ViewCollection.c" +#line 7377 "ViewCollection.c" } #line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = self->priv->frozen_geometries_altered; + _tmp8_ = self->priv->frozen_geometries_altered; #line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp9_ != NULL) { -#line 7646 "ViewCollection.c" - GeeHashSet* _tmp17_; + if (_tmp8_ != NULL) { +#line 7383 "ViewCollection.c" + GeeHashSet* _tmp15_; { GeeIterator* _view_it = NULL; - GeeHashSet* _tmp10_; - GeeIterator* _tmp11_; + GeeHashSet* _tmp9_; + GeeIterator* _tmp10_; #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = self->priv->frozen_geometries_altered; + _tmp9_ = self->priv->frozen_geometries_altered; #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)); + _tmp10_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _view_it = _tmp11_; + _view_it = _tmp10_; #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 7660 "ViewCollection.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 7397 "ViewCollection.c" + GeeIterator* _tmp11_; DataView* view = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; - DataView* _tmp16_; -#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = _view_it; + GeeIterator* _tmp12_; + gpointer _tmp13_; + DataView* _tmp14_; #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = gee_iterator_next (_tmp12_); + _tmp11_ = _view_it; #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp11_)) { #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 7675 "ViewCollection.c" +#line 7409 "ViewCollection.c" } #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = _view_it; + _tmp12_ = _view_it; #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = (DataView*) _tmp15_; + view = (DataView*) _tmp13_; #line 1239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = view; + _tmp14_ = view; #line 1239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_item_geometry_altered (self, _tmp16_); + view_collection_notify_item_geometry_altered (self, _tmp14_); #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 7689 "ViewCollection.c" +#line 7423 "ViewCollection.c" } #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_view_it); -#line 7693 "ViewCollection.c" +#line 7427 "ViewCollection.c" } #line 1240 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = self->priv->frozen_geometries_altered; + _tmp15_ = self->priv->frozen_geometries_altered; #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)); + view_collection_notify_geometries_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1241 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (self->priv->frozen_geometries_altered); #line 1241 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->priv->frozen_geometries_altered = NULL; -#line 7703 "ViewCollection.c" +#line 7437 "ViewCollection.c" } #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 7707 "ViewCollection.c" +#line 7441 "ViewCollection.c" } -gboolean view_collection_are_items_filtered_out (ViewCollection* self) { +gboolean +view_collection_are_items_filtered_out (ViewCollection* self) +{ gboolean result = FALSE; - gint _tmp0_; - gint _tmp1_; #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 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 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = _tmp0_ != _tmp1_; + result = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) != data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 7725 "ViewCollection.c" +#line 7455 "ViewCollection.c" } -static void view_collection_real_items_selected (ViewCollection* self, GeeIterable* selected) { +static void +view_collection_real_items_selected (ViewCollection* self, + GeeIterable* selected) +{ #line 75 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (selected)); -#line 7732 "ViewCollection.c" +#line 7465 "ViewCollection.c" } -static void view_collection_real_items_unselected (ViewCollection* self, GeeIterable* unselected) { +static void +view_collection_real_items_unselected (ViewCollection* self, + GeeIterable* unselected) +{ #line 79 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (unselected)); -#line 7739 "ViewCollection.c" +#line 7475 "ViewCollection.c" } -static void view_collection_real_items_state_changed (ViewCollection* self, GeeIterable* changed) { +static void +view_collection_real_items_state_changed (ViewCollection* self, + GeeIterable* changed) +{ #line 83 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (changed)); -#line 7746 "ViewCollection.c" +#line 7485 "ViewCollection.c" } -static void view_collection_real_selection_group_altered (ViewCollection* self) { +static void +view_collection_real_selection_group_altered (ViewCollection* self) +{ } -static void view_collection_real_items_shown (ViewCollection* self, GeeCollection* visible) { +static void +view_collection_real_items_shown (ViewCollection* self, + GeeCollection* visible) +{ #line 94 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (visible)); -#line 7757 "ViewCollection.c" +#line 7501 "ViewCollection.c" } -static void view_collection_real_items_hidden (ViewCollection* self, GeeCollection* hidden) { +static void +view_collection_real_items_hidden (ViewCollection* self, + GeeCollection* hidden) +{ #line 98 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (hidden)); -#line 7764 "ViewCollection.c" +#line 7511 "ViewCollection.c" } -static void view_collection_real_items_visibility_changed (ViewCollection* self, GeeCollection* changed) { +static void +view_collection_real_items_visibility_changed (ViewCollection* self, + GeeCollection* changed) +{ #line 102 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (changed)); -#line 7771 "ViewCollection.c" +#line 7521 "ViewCollection.c" } -static void view_collection_real_item_view_altered (ViewCollection* self, DataView* view) { +static void +view_collection_real_item_view_altered (ViewCollection* self, + DataView* view) +{ #line 106 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_DATA_VIEW (view)); -#line 7778 "ViewCollection.c" +#line 7531 "ViewCollection.c" } -static void view_collection_real_item_geometry_altered (ViewCollection* self, DataView* view) { +static void +view_collection_real_item_geometry_altered (ViewCollection* self, + DataView* view) +{ #line 110 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_DATA_VIEW (view)); -#line 7785 "ViewCollection.c" +#line 7541 "ViewCollection.c" } -static void view_collection_real_views_altered (ViewCollection* self, GeeCollection* views) { +static void +view_collection_real_views_altered (ViewCollection* self, + GeeCollection* views) +{ #line 113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (views)); -#line 7792 "ViewCollection.c" +#line 7551 "ViewCollection.c" } -static void view_collection_real_geometries_altered (ViewCollection* self, GeeCollection* views) { +static void +view_collection_real_geometries_altered (ViewCollection* self, + GeeCollection* views) +{ #line 116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (views)); -#line 7799 "ViewCollection.c" +#line 7561 "ViewCollection.c" } -static void view_collection_real_view_filter_installed (ViewCollection* self, ViewFilter* filer) { +static void +view_collection_real_view_filter_installed (ViewCollection* self, + ViewFilter* filer) +{ #line 119 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_FILTER (filer)); -#line 7806 "ViewCollection.c" +#line 7571 "ViewCollection.c" } -static void g_cclosure_user_marshal_VOID__VIEW_FILTER (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__VIEW_FILTER (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__VIEW_FILTER) (gpointer data1, gpointer arg_1, gpointer data2); register GMarshalFunc_VOID__VIEW_FILTER callback; register GCClosure * cc; @@ -7822,144 +7594,176 @@ static void g_cclosure_user_marshal_VOID__VIEW_FILTER (GClosure * closure, GValu data1 = closure->data; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" data2 = param_values->data[0].v_pointer; -#line 7825 "ViewCollection.c" +#line 7597 "ViewCollection.c" } else { #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" data1 = param_values->data[0].v_pointer; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" data2 = closure->data; -#line 7831 "ViewCollection.c" +#line 7603 "ViewCollection.c" } #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" callback = (GMarshalFunc_VOID__VIEW_FILTER) (marshal_data ? marshal_data : cc->callback); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" callback (data1, value_get_view_filter (param_values + 1), data2); -#line 7837 "ViewCollection.c" +#line 7609 "ViewCollection.c" } -static void view_collection_real_view_filter_removed (ViewCollection* self, ViewFilter* filer) { +static void +view_collection_real_view_filter_removed (ViewCollection* self, + ViewFilter* filer) +{ #line 122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_FILTER (filer)); -#line 7844 "ViewCollection.c" +#line 7619 "ViewCollection.c" } -ViewCollectionMonitor* view_collection_monitor_construct (GType object_type) { +ViewCollectionMonitor* +view_collection_monitor_construct (GType object_type) +{ ViewCollectionMonitor* self = NULL; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = (ViewCollectionMonitor*) g_type_create_instance (object_type); #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self; -#line 7854 "ViewCollection.c" +#line 7631 "ViewCollection.c" } -ViewCollectionMonitor* view_collection_monitor_new (void) { +ViewCollectionMonitor* +view_collection_monitor_new (void) +{ #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return view_collection_monitor_construct (VIEW_COLLECTION_TYPE_MONITOR); -#line 7861 "ViewCollection.c" +#line 7640 "ViewCollection.c" } -static void view_collection_value_monitor_init (GValue* value) { +static void +view_collection_value_monitor_init (GValue* value) +{ #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 7868 "ViewCollection.c" +#line 7649 "ViewCollection.c" } -static void view_collection_value_monitor_free_value (GValue* value) { +static void +view_collection_value_monitor_free_value (GValue* value) +{ #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (value->data[0].v_pointer) { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_monitor_unref (value->data[0].v_pointer); -#line 7877 "ViewCollection.c" +#line 7660 "ViewCollection.c" } } -static void view_collection_value_monitor_copy_value (const GValue* src_value, GValue* dest_value) { +static void +view_collection_value_monitor_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (src_value->data[0].v_pointer) { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" dest_value->data[0].v_pointer = view_collection_monitor_ref (src_value->data[0].v_pointer); -#line 7887 "ViewCollection.c" +#line 7673 "ViewCollection.c" } else { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" dest_value->data[0].v_pointer = NULL; -#line 7891 "ViewCollection.c" +#line 7677 "ViewCollection.c" } } -static gpointer view_collection_value_monitor_peek_pointer (const GValue* value) { +static gpointer +view_collection_value_monitor_peek_pointer (const GValue* value) +{ #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return value->data[0].v_pointer; -#line 7899 "ViewCollection.c" +#line 7687 "ViewCollection.c" } -static gchar* view_collection_value_monitor_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +view_collection_value_monitor_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (collect_values[0].v_pointer) { -#line 7906 "ViewCollection.c" +#line 7699 "ViewCollection.c" ViewCollectionMonitor * object; object = collect_values[0].v_pointer; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (object->parent_instance.g_class == NULL) { #line 22 "/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 7913 "ViewCollection.c" +#line 7706 "ViewCollection.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 22 "/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 7917 "ViewCollection.c" +#line 7710 "ViewCollection.c" } #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = view_collection_monitor_ref (object); -#line 7921 "ViewCollection.c" +#line 7714 "ViewCollection.c" } else { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 7925 "ViewCollection.c" +#line 7718 "ViewCollection.c" } #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 7929 "ViewCollection.c" +#line 7722 "ViewCollection.c" } -static gchar* view_collection_value_monitor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +view_collection_value_monitor_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ ViewCollectionMonitor ** object_p; object_p = collect_values[0].v_pointer; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (!object_p) { #line 22 "/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 7940 "ViewCollection.c" +#line 7738 "ViewCollection.c" } #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (!value->data[0].v_pointer) { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = NULL; -#line 7946 "ViewCollection.c" +#line 7744 "ViewCollection.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = value->data[0].v_pointer; -#line 7950 "ViewCollection.c" +#line 7748 "ViewCollection.c" } else { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = view_collection_monitor_ref (value->data[0].v_pointer); -#line 7954 "ViewCollection.c" +#line 7752 "ViewCollection.c" } #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 7958 "ViewCollection.c" +#line 7756 "ViewCollection.c" } -GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +view_collection_param_spec_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ViewCollectionParamSpecMonitor* spec; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (g_type_is_a (object_type, VIEW_COLLECTION_TYPE_MONITOR), NULL); @@ -7969,20 +7773,25 @@ GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* G_PARAM_SPEC (spec)->value_type = object_type; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return G_PARAM_SPEC (spec); -#line 7972 "ViewCollection.c" +#line 7776 "ViewCollection.c" } -gpointer view_collection_value_get_monitor (const GValue* value) { +gpointer +view_collection_value_get_monitor (const GValue* value) +{ #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIEW_COLLECTION_TYPE_MONITOR), NULL); #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return value->data[0].v_pointer; -#line 7981 "ViewCollection.c" +#line 7787 "ViewCollection.c" } -void view_collection_value_set_monitor (GValue* value, gpointer v_object) { +void +view_collection_value_set_monitor (GValue* value, + gpointer v_object) +{ ViewCollectionMonitor * old; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIEW_COLLECTION_TYPE_MONITOR)); @@ -7998,22 +7807,25 @@ void view_collection_value_set_monitor (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_monitor_ref (value->data[0].v_pointer); -#line 8001 "ViewCollection.c" +#line 7810 "ViewCollection.c" } else { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8005 "ViewCollection.c" +#line 7814 "ViewCollection.c" } #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (old) { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_monitor_unref (old); -#line 8011 "ViewCollection.c" +#line 7820 "ViewCollection.c" } } -void view_collection_value_take_monitor (GValue* value, gpointer v_object) { +void +view_collection_value_take_monitor (GValue* value, + gpointer v_object) +{ ViewCollectionMonitor * old; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIEW_COLLECTION_TYPE_MONITOR)); @@ -8027,48 +7839,56 @@ void view_collection_value_take_monitor (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = v_object; -#line 8030 "ViewCollection.c" +#line 7842 "ViewCollection.c" } else { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8034 "ViewCollection.c" +#line 7846 "ViewCollection.c" } #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (old) { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_monitor_unref (old); -#line 8040 "ViewCollection.c" +#line 7852 "ViewCollection.c" } } -static void view_collection_monitor_class_init (ViewCollectionMonitorClass * klass) { +static void +view_collection_monitor_class_init (ViewCollectionMonitorClass * klass) +{ #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_monitor_parent_class = g_type_class_peek_parent (klass); #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ((ViewCollectionMonitorClass *) klass)->finalize = view_collection_monitor_finalize; -#line 8050 "ViewCollection.c" +#line 7864 "ViewCollection.c" } -static void view_collection_monitor_instance_init (ViewCollectionMonitor * self) { +static void +view_collection_monitor_instance_init (ViewCollectionMonitor * self) +{ #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->ref_count = 1; -#line 8057 "ViewCollection.c" +#line 7873 "ViewCollection.c" } -static void view_collection_monitor_finalize (ViewCollectionMonitor * obj) { +static void +view_collection_monitor_finalize (ViewCollectionMonitor * obj) +{ ViewCollectionMonitor * self; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, VIEW_COLLECTION_TYPE_MONITOR, ViewCollectionMonitor); #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_signal_handlers_destroy (self); -#line 8067 "ViewCollection.c" +#line 7885 "ViewCollection.c" } -GType view_collection_monitor_get_type (void) { +GType +view_collection_monitor_get_type (void) +{ static volatile gsize view_collection_monitor_type_id__volatile = 0; if (g_once_init_enter (&view_collection_monitor_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { view_collection_value_monitor_init, view_collection_value_monitor_free_value, view_collection_value_monitor_copy_value, view_collection_value_monitor_peek_pointer, "p", view_collection_value_monitor_collect_value, "p", view_collection_value_monitor_lcopy_value }; @@ -8082,18 +7902,22 @@ GType view_collection_monitor_get_type (void) { } -gpointer view_collection_monitor_ref (gpointer instance) { +gpointer +view_collection_monitor_ref (gpointer instance) +{ ViewCollectionMonitor * self; self = instance; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_atomic_int_inc (&self->ref_count); #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return instance; -#line 8092 "ViewCollection.c" +#line 7914 "ViewCollection.c" } -void view_collection_monitor_unref (gpointer instance) { +void +view_collection_monitor_unref (gpointer instance) +{ ViewCollectionMonitor * self; self = instance; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8102,62 +7926,74 @@ void view_collection_monitor_unref (gpointer instance) { VIEW_COLLECTION_MONITOR_GET_CLASS (self)->finalize (self); #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8105 "ViewCollection.c" +#line 7929 "ViewCollection.c" } } -static void _view_collection_on_sources_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self) { +static void +_view_collection_on_sources_added_data_collection_items_added (DataCollection* _sender, + GeeIterable* added, + gpointer self) +{ #line 44 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_on_sources_added ((ViewCollection*) self, _sender, added); -#line 8113 "ViewCollection.c" +#line 7941 "ViewCollection.c" } -static void _view_collection_on_sources_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) { +static void +_view_collection_on_sources_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self) +{ #line 45 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_on_sources_removed ((ViewCollection*) self, removed); -#line 8120 "ViewCollection.c" +#line 7952 "ViewCollection.c" } -static void _view_collection_on_sources_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_view_collection_on_sources_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 46 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_on_sources_altered ((ViewCollection*) self, _sender, items); -#line 8127 "ViewCollection.c" +#line 7963 "ViewCollection.c" } -static gpointer _view_manager_ref0 (gpointer self) { +static gpointer +_view_manager_ref0 (gpointer self) +{ #line 35 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self ? view_manager_ref (self) : NULL; -#line 8134 "ViewCollection.c" +#line 7972 "ViewCollection.c" } -static gpointer _alteration_ref0 (gpointer self) { +static gpointer +_alteration_ref0 (gpointer self) +{ #line 36 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self ? alteration_ref (self) : NULL; -#line 8141 "ViewCollection.c" +#line 7981 "ViewCollection.c" } -static ViewCollectionMonitorImpl* view_collection_monitor_impl_construct (GType object_type, ViewCollection* owner, SourceCollection* sources, ViewManager* manager, Alteration* prereq) { +static ViewCollectionMonitorImpl* +view_collection_monitor_impl_construct (GType object_type, + ViewCollection* owner, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq) +{ ViewCollectionMonitorImpl* self = NULL; ViewCollection* _tmp0_; - ViewCollection* _tmp1_; - SourceCollection* _tmp2_; - SourceCollection* _tmp3_; - ViewManager* _tmp4_; - ViewManager* _tmp5_; - Alteration* _tmp6_; - Alteration* _tmp7_; - SourceCollection* _tmp8_; - ViewCollection* _tmp9_; - SourceCollection* _tmp10_; - ViewCollection* _tmp11_; - SourceCollection* _tmp12_; - ViewCollection* _tmp13_; + SourceCollection* _tmp1_; + ViewManager* _tmp2_; + Alteration* _tmp3_; #line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (owner), NULL); #line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8169,82 +8005,73 @@ static ViewCollectionMonitorImpl* view_collection_monitor_impl_construct (GType #line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = (ViewCollectionMonitorImpl*) view_collection_monitor_construct (object_type); #line 33 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = owner; -#line 33 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = _data_collection_ref0 (_tmp0_); + _tmp0_ = _data_collection_ref0 (owner); #line 33 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _data_collection_unref0 (self->owner); #line 33 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->owner = _tmp1_; -#line 34 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = sources; + self->owner = _tmp0_; #line 34 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _data_collection_ref0 (_tmp2_); + _tmp1_ = _data_collection_ref0 (sources); #line 34 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _data_collection_unref0 (self->sources); #line 34 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->sources = _tmp3_; + self->sources = _tmp1_; #line 35 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = manager; -#line 35 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _view_manager_ref0 (_tmp4_); + _tmp2_ = _view_manager_ref0 (manager); #line 35 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_manager_unref0 (self->manager); #line 35 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->manager = _tmp5_; -#line 36 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = prereq; + self->manager = _tmp2_; #line 36 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = _alteration_ref0 (_tmp6_); + _tmp3_ = _alteration_ref0 (prereq); #line 36 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _alteration_unref0 (self->prereq); #line 36 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->prereq = _tmp7_; + self->prereq = _tmp3_; #line 38 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = sources; -#line 38 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = owner; -#line 38 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _view_collection_on_sources_added_data_collection_items_added, _tmp9_); -#line 39 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = sources; -#line 39 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = owner; + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _view_collection_on_sources_added_data_collection_items_added, owner); #line 39 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _view_collection_on_sources_removed_data_collection_items_removed, _tmp11_); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _view_collection_on_sources_removed_data_collection_items_removed, owner); #line 40 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = sources; -#line 40 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = owner; -#line 40 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _view_collection_on_sources_altered_data_collection_items_altered, _tmp13_); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _view_collection_on_sources_altered_data_collection_items_altered, owner); #line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self; -#line 8223 "ViewCollection.c" +#line 8039 "ViewCollection.c" } -static ViewCollectionMonitorImpl* view_collection_monitor_impl_new (ViewCollection* owner, SourceCollection* sources, ViewManager* manager, Alteration* prereq) { +static ViewCollectionMonitorImpl* +view_collection_monitor_impl_new (ViewCollection* owner, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq) +{ #line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return view_collection_monitor_impl_construct (VIEW_COLLECTION_TYPE_MONITOR_IMPL, owner, sources, manager, prereq); -#line 8230 "ViewCollection.c" +#line 8051 "ViewCollection.c" } -static void view_collection_monitor_impl_class_init (ViewCollectionMonitorImplClass * klass) { +static void +view_collection_monitor_impl_class_init (ViewCollectionMonitorImplClass * klass) +{ #line 25 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_monitor_impl_parent_class = g_type_class_peek_parent (klass); #line 25 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ((ViewCollectionMonitorClass *) klass)->finalize = view_collection_monitor_impl_finalize; -#line 8239 "ViewCollection.c" +#line 8062 "ViewCollection.c" } -static void view_collection_monitor_impl_instance_init (ViewCollectionMonitorImpl * self) { +static void +view_collection_monitor_impl_instance_init (ViewCollectionMonitorImpl * self) +{ } -static void view_collection_monitor_impl_finalize (ViewCollectionMonitor * obj) { +static void +view_collection_monitor_impl_finalize (ViewCollectionMonitor * obj) +{ ViewCollectionMonitorImpl * self; SourceCollection* _tmp0_; ViewCollection* _tmp1_; @@ -8291,11 +8118,13 @@ static void view_collection_monitor_impl_finalize (ViewCollectionMonitor * obj) _alteration_unref0 (self->prereq); #line 25 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_MONITOR_CLASS (view_collection_monitor_impl_parent_class)->finalize (obj); -#line 8294 "ViewCollection.c" +#line 8121 "ViewCollection.c" } -static GType view_collection_monitor_impl_get_type (void) { +static GType +view_collection_monitor_impl_get_type (void) +{ static volatile gsize view_collection_monitor_impl_type_id__volatile = 0; if (g_once_init_enter (&view_collection_monitor_impl_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ViewCollectionMonitorImplClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) view_collection_monitor_impl_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ViewCollectionMonitorImpl), 0, (GInstanceInitFunc) view_collection_monitor_impl_instance_init, NULL }; @@ -8307,33 +8136,41 @@ static GType view_collection_monitor_impl_get_type (void) { } -static ViewCollectionToggleLists* view_collection_toggle_lists_construct (GType object_type) { +static ViewCollectionToggleLists* +view_collection_toggle_lists_construct (GType object_type) +{ ViewCollectionToggleLists * self = NULL; #line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = (ViewCollectionToggleLists*) g_object_new (object_type, NULL); #line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self; -#line 8316 "ViewCollection.c" +#line 8147 "ViewCollection.c" } -static ViewCollectionToggleLists* view_collection_toggle_lists_new (void) { +static ViewCollectionToggleLists* +view_collection_toggle_lists_new (void) +{ #line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return view_collection_toggle_lists_construct (VIEW_COLLECTION_TYPE_TOGGLE_LISTS); -#line 8323 "ViewCollection.c" +#line 8156 "ViewCollection.c" } -static void view_collection_toggle_lists_class_init (ViewCollectionToggleListsClass * klass) { +static void +view_collection_toggle_lists_class_init (ViewCollectionToggleListsClass * klass) +{ #line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_toggle_lists_parent_class = g_type_class_peek_parent (klass); #line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" G_OBJECT_CLASS (klass)->finalize = view_collection_toggle_lists_finalize; -#line 8332 "ViewCollection.c" +#line 8167 "ViewCollection.c" } -static void view_collection_toggle_lists_instance_init (ViewCollectionToggleLists * self) { +static void +view_collection_toggle_lists_instance_init (ViewCollectionToggleLists * self) +{ GeeArrayList* _tmp0_; GeeArrayList* _tmp1_; #line 51 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8344,11 +8181,13 @@ static void view_collection_toggle_lists_instance_init (ViewCollectionToggleList _tmp1_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 52 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->unselected = _tmp1_; -#line 8347 "ViewCollection.c" +#line 8184 "ViewCollection.c" } -static void view_collection_toggle_lists_finalize (GObject * obj) { +static void +view_collection_toggle_lists_finalize (GObject * obj) +{ ViewCollectionToggleLists * self; #line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, VIEW_COLLECTION_TYPE_TOGGLE_LISTS, ViewCollectionToggleLists); @@ -8358,11 +8197,13 @@ static void view_collection_toggle_lists_finalize (GObject * obj) { _g_object_unref0 (self->unselected); #line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" G_OBJECT_CLASS (view_collection_toggle_lists_parent_class)->finalize (obj); -#line 8361 "ViewCollection.c" +#line 8200 "ViewCollection.c" } -static GType view_collection_toggle_lists_get_type (void) { +static GType +view_collection_toggle_lists_get_type (void) +{ static volatile gsize view_collection_toggle_lists_type_id__volatile = 0; if (g_once_init_enter (&view_collection_toggle_lists_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ViewCollectionToggleListsClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) view_collection_toggle_lists_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ViewCollectionToggleLists), 0, (GInstanceInitFunc) view_collection_toggle_lists_instance_init, NULL }; @@ -8374,7 +8215,9 @@ static GType view_collection_toggle_lists_get_type (void) { } -static void view_collection_class_init (ViewCollectionClass * klass) { +static void +view_collection_class_init (ViewCollectionClass * klass) +{ #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_parent_class = g_type_class_peek_parent (klass); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8497,11 +8340,13 @@ static void view_collection_class_init (ViewCollectionClass * klass) { view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_INSTALLED_SIGNAL] = g_signal_new ("view-filter-installed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, view_filter_installed), NULL, NULL, g_cclosure_user_marshal_VOID__VIEW_FILTER, G_TYPE_NONE, 1, TYPE_VIEW_FILTER); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_REMOVED_SIGNAL] = g_signal_new ("view-filter-removed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, view_filter_removed), NULL, NULL, g_cclosure_user_marshal_VOID__VIEW_FILTER, G_TYPE_NONE, 1, TYPE_VIEW_FILTER); -#line 8500 "ViewCollection.c" +#line 8343 "ViewCollection.c" } -static void view_collection_instance_init (ViewCollection * self) { +static void +view_collection_instance_init (ViewCollection * self) +{ GeeHashMultiMap* _tmp0_; GeeHashSet* _tmp1_; DataSet* _tmp2_; @@ -8540,11 +8385,13 @@ static void view_collection_instance_init (ViewCollection * self) { _tmp3_ = gee_hash_map_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 72 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->priv->source_map = _tmp3_; -#line 8543 "ViewCollection.c" +#line 8388 "ViewCollection.c" } -static void view_collection_finalize (DataCollection * obj) { +static void +view_collection_finalize (DataCollection * obj) +{ ViewCollection * self; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIEW_COLLECTION, ViewCollection); @@ -8566,11 +8413,13 @@ static void view_collection_finalize (DataCollection * obj) { _g_object_unref0 (self->priv->source_map); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" DATA_COLLECTION_CLASS (view_collection_parent_class)->finalize (obj); -#line 8569 "ViewCollection.c" +#line 8416 "ViewCollection.c" } -GType view_collection_get_type (void) { +GType +view_collection_get_type (void) +{ static volatile gsize view_collection_type_id__volatile = 0; if (g_once_init_enter (&view_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ViewCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) view_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ViewCollection), 0, (GInstanceInitFunc) view_collection_instance_init, NULL }; @@ -8582,7 +8431,10 @@ GType view_collection_get_type (void) { } -static gboolean view_manager_real_include_in_view (ViewManager* self, DataSource* source) { +static gboolean +view_manager_real_include_in_view (ViewManager* self, + DataSource* source) +{ gboolean result = FALSE; #line 1258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); @@ -8590,145 +8442,181 @@ static gboolean view_manager_real_include_in_view (ViewManager* self, DataSource result = TRUE; #line 1259 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 8593 "ViewCollection.c" +#line 8445 "ViewCollection.c" } -gboolean view_manager_include_in_view (ViewManager* self, DataSource* source) { +gboolean +view_manager_include_in_view (ViewManager* self, + DataSource* source) +{ #line 1258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_MANAGER (self), FALSE); #line 1258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return VIEW_MANAGER_GET_CLASS (self)->include_in_view (self, source); -#line 8602 "ViewCollection.c" +#line 8457 "ViewCollection.c" } -static DataView* view_manager_real_create_view (ViewManager* self, DataSource* source) { +static DataView* +view_manager_real_create_view (ViewManager* self, + DataSource* source) +{ #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 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 8611 "ViewCollection.c" +#line 8469 "ViewCollection.c" } -DataView* view_manager_create_view (ViewManager* self, DataSource* source) { +DataView* +view_manager_create_view (ViewManager* self, + DataSource* source) +{ #line 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_MANAGER (self), NULL); #line 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return VIEW_MANAGER_GET_CLASS (self)->create_view (self, source); -#line 8620 "ViewCollection.c" +#line 8481 "ViewCollection.c" } -ViewManager* view_manager_construct (GType object_type) { +ViewManager* +view_manager_construct (GType object_type) +{ ViewManager* self = NULL; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = (ViewManager*) g_type_create_instance (object_type); #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self; -#line 8630 "ViewCollection.c" +#line 8493 "ViewCollection.c" } -static void value_view_manager_init (GValue* value) { +static void +value_view_manager_init (GValue* value) +{ #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8637 "ViewCollection.c" +#line 8502 "ViewCollection.c" } -static void value_view_manager_free_value (GValue* value) { +static void +value_view_manager_free_value (GValue* value) +{ #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (value->data[0].v_pointer) { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_manager_unref (value->data[0].v_pointer); -#line 8646 "ViewCollection.c" +#line 8513 "ViewCollection.c" } } -static void value_view_manager_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_view_manager_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (src_value->data[0].v_pointer) { #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 8656 "ViewCollection.c" +#line 8526 "ViewCollection.c" } else { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" dest_value->data[0].v_pointer = NULL; -#line 8660 "ViewCollection.c" +#line 8530 "ViewCollection.c" } } -static gpointer value_view_manager_peek_pointer (const GValue* value) { +static gpointer +value_view_manager_peek_pointer (const GValue* value) +{ #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return value->data[0].v_pointer; -#line 8668 "ViewCollection.c" +#line 8540 "ViewCollection.c" } -static gchar* value_view_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_view_manager_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (collect_values[0].v_pointer) { -#line 8675 "ViewCollection.c" +#line 8552 "ViewCollection.c" ViewManager * object; object = collect_values[0].v_pointer; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (object->parent_instance.g_class == NULL) { #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 8682 "ViewCollection.c" +#line 8559 "ViewCollection.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #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 8686 "ViewCollection.c" +#line 8563 "ViewCollection.c" } #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = view_manager_ref (object); -#line 8690 "ViewCollection.c" +#line 8567 "ViewCollection.c" } else { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8694 "ViewCollection.c" +#line 8571 "ViewCollection.c" } #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 8698 "ViewCollection.c" +#line 8575 "ViewCollection.c" } -static gchar* value_view_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +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 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (!object_p) { #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 8709 "ViewCollection.c" +#line 8591 "ViewCollection.c" } #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (!value->data[0].v_pointer) { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = NULL; -#line 8715 "ViewCollection.c" +#line 8597 "ViewCollection.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = value->data[0].v_pointer; -#line 8719 "ViewCollection.c" +#line 8601 "ViewCollection.c" } else { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = view_manager_ref (value->data[0].v_pointer); -#line 8723 "ViewCollection.c" +#line 8605 "ViewCollection.c" } #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 8727 "ViewCollection.c" +#line 8609 "ViewCollection.c" } -GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_view_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecViewManager* spec; #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); @@ -8738,20 +8626,25 @@ GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const G_PARAM_SPEC (spec)->value_type = object_type; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return G_PARAM_SPEC (spec); -#line 8741 "ViewCollection.c" +#line 8629 "ViewCollection.c" } -gpointer value_get_view_manager (const GValue* value) { +gpointer +value_get_view_manager (const GValue* value) +{ #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 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return value->data[0].v_pointer; -#line 8750 "ViewCollection.c" +#line 8640 "ViewCollection.c" } -void value_set_view_manager (GValue* value, gpointer v_object) { +void +value_set_view_manager (GValue* value, + gpointer v_object) +{ ViewManager * old; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_MANAGER)); @@ -8767,22 +8660,25 @@ void value_set_view_manager (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_manager_ref (value->data[0].v_pointer); -#line 8770 "ViewCollection.c" +#line 8663 "ViewCollection.c" } else { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8774 "ViewCollection.c" +#line 8667 "ViewCollection.c" } #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (old) { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_manager_unref (old); -#line 8780 "ViewCollection.c" +#line 8673 "ViewCollection.c" } } -void value_take_view_manager (GValue* value, gpointer v_object) { +void +value_take_view_manager (GValue* value, + gpointer v_object) +{ ViewManager * old; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_MANAGER)); @@ -8796,22 +8692,24 @@ void value_take_view_manager (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = v_object; -#line 8799 "ViewCollection.c" +#line 8695 "ViewCollection.c" } else { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8803 "ViewCollection.c" +#line 8699 "ViewCollection.c" } #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (old) { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_manager_unref (old); -#line 8809 "ViewCollection.c" +#line 8705 "ViewCollection.c" } } -static void view_manager_class_init (ViewManagerClass * klass) { +static void +view_manager_class_init (ViewManagerClass * klass) +{ #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_manager_parent_class = g_type_class_peek_parent (klass); #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8820,28 +8718,34 @@ static void view_manager_class_init (ViewManagerClass * klass) { ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) view_manager_real_include_in_view; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) view_manager_real_create_view; -#line 8823 "ViewCollection.c" +#line 8721 "ViewCollection.c" } -static void view_manager_instance_init (ViewManager * self) { +static void +view_manager_instance_init (ViewManager * self) +{ #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->ref_count = 1; -#line 8830 "ViewCollection.c" +#line 8730 "ViewCollection.c" } -static void view_manager_finalize (ViewManager * obj) { +static void +view_manager_finalize (ViewManager * obj) +{ ViewManager * self; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIEW_MANAGER, ViewManager); #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_signal_handlers_destroy (self); -#line 8840 "ViewCollection.c" +#line 8742 "ViewCollection.c" } -GType view_manager_get_type (void) { +GType +view_manager_get_type (void) +{ static volatile gsize view_manager_type_id__volatile = 0; if (g_once_init_enter (&view_manager_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_view_manager_init, value_view_manager_free_value, value_view_manager_copy_value, value_view_manager_peek_pointer, "p", value_view_manager_collect_value, "p", value_view_manager_lcopy_value }; @@ -8855,18 +8759,22 @@ GType view_manager_get_type (void) { } -gpointer view_manager_ref (gpointer instance) { +gpointer +view_manager_ref (gpointer instance) +{ ViewManager * self; self = instance; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_atomic_int_inc (&self->ref_count); #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return instance; -#line 8865 "ViewCollection.c" +#line 8771 "ViewCollection.c" } -void view_manager_unref (gpointer instance) { +void +view_manager_unref (gpointer instance) +{ ViewManager * self; self = instance; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8875,142 +8783,177 @@ void view_manager_unref (gpointer instance) { VIEW_MANAGER_GET_CLASS (self)->finalize (self); #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8878 "ViewCollection.c" +#line 8786 "ViewCollection.c" } } -static gboolean view_filter_real_predicate (ViewFilter* self, DataView* view) { +static gboolean +view_filter_real_predicate (ViewFilter* self, + DataView* view) +{ gboolean _tmp0_ = FALSE; #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 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return _tmp0_; -#line 8889 "ViewCollection.c" +#line 8800 "ViewCollection.c" } -gboolean view_filter_predicate (ViewFilter* self, DataView* view) { +gboolean +view_filter_predicate (ViewFilter* self, + DataView* view) +{ #line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_FILTER (self), FALSE); #line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return VIEW_FILTER_GET_CLASS (self)->predicate (self, view); -#line 8898 "ViewCollection.c" +#line 8812 "ViewCollection.c" } -ViewFilter* view_filter_construct (GType object_type) { +ViewFilter* +view_filter_construct (GType object_type) +{ ViewFilter* self = NULL; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = (ViewFilter*) g_type_create_instance (object_type); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self; -#line 8908 "ViewCollection.c" +#line 8824 "ViewCollection.c" } -static void view_filter_real_refresh (ViewFilter* self) { +static void +view_filter_real_refresh (ViewFilter* self) +{ } -static void value_view_filter_init (GValue* value) { +static void +value_view_filter_init (GValue* value) +{ #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8919 "ViewCollection.c" +#line 8839 "ViewCollection.c" } -static void value_view_filter_free_value (GValue* value) { +static void +value_view_filter_free_value (GValue* value) +{ #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (value->data[0].v_pointer) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_filter_unref (value->data[0].v_pointer); -#line 8928 "ViewCollection.c" +#line 8850 "ViewCollection.c" } } -static void value_view_filter_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_view_filter_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (src_value->data[0].v_pointer) { #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 8938 "ViewCollection.c" +#line 8863 "ViewCollection.c" } else { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" dest_value->data[0].v_pointer = NULL; -#line 8942 "ViewCollection.c" +#line 8867 "ViewCollection.c" } } -static gpointer value_view_filter_peek_pointer (const GValue* value) { +static gpointer +value_view_filter_peek_pointer (const GValue* value) +{ #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return value->data[0].v_pointer; -#line 8950 "ViewCollection.c" +#line 8877 "ViewCollection.c" } -static gchar* value_view_filter_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_view_filter_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (collect_values[0].v_pointer) { -#line 8957 "ViewCollection.c" +#line 8889 "ViewCollection.c" ViewFilter * object; object = collect_values[0].v_pointer; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (object->parent_instance.g_class == NULL) { #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 8964 "ViewCollection.c" +#line 8896 "ViewCollection.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #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 8968 "ViewCollection.c" +#line 8900 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = view_filter_ref (object); -#line 8972 "ViewCollection.c" +#line 8904 "ViewCollection.c" } else { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8976 "ViewCollection.c" +#line 8908 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 8980 "ViewCollection.c" +#line 8912 "ViewCollection.c" } -static gchar* value_view_filter_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +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 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (!object_p) { #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 8991 "ViewCollection.c" +#line 8928 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (!value->data[0].v_pointer) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = NULL; -#line 8997 "ViewCollection.c" +#line 8934 "ViewCollection.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = value->data[0].v_pointer; -#line 9001 "ViewCollection.c" +#line 8938 "ViewCollection.c" } else { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = view_filter_ref (value->data[0].v_pointer); -#line 9005 "ViewCollection.c" +#line 8942 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 9009 "ViewCollection.c" +#line 8946 "ViewCollection.c" } -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecViewFilter* spec; #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); @@ -9020,20 +8963,25 @@ GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const G_PARAM_SPEC (spec)->value_type = object_type; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return G_PARAM_SPEC (spec); -#line 9023 "ViewCollection.c" +#line 8966 "ViewCollection.c" } -gpointer value_get_view_filter (const GValue* value) { +gpointer +value_get_view_filter (const GValue* value) +{ #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 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return value->data[0].v_pointer; -#line 9032 "ViewCollection.c" +#line 8977 "ViewCollection.c" } -void value_set_view_filter (GValue* value, gpointer v_object) { +void +value_set_view_filter (GValue* value, + gpointer v_object) +{ ViewFilter * old; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_FILTER)); @@ -9049,22 +8997,25 @@ void value_set_view_filter (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_filter_ref (value->data[0].v_pointer); -#line 9052 "ViewCollection.c" +#line 9000 "ViewCollection.c" } else { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 9056 "ViewCollection.c" +#line 9004 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (old) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_filter_unref (old); -#line 9062 "ViewCollection.c" +#line 9010 "ViewCollection.c" } } -void value_take_view_filter (GValue* value, gpointer v_object) { +void +value_take_view_filter (GValue* value, + gpointer v_object) +{ ViewFilter * old; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_FILTER)); @@ -9078,22 +9029,24 @@ void value_take_view_filter (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = v_object; -#line 9081 "ViewCollection.c" +#line 9032 "ViewCollection.c" } else { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 9085 "ViewCollection.c" +#line 9036 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (old) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_filter_unref (old); -#line 9091 "ViewCollection.c" +#line 9042 "ViewCollection.c" } } -static void view_filter_class_init (ViewFilterClass * klass) { +static void +view_filter_class_init (ViewFilterClass * klass) +{ #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_filter_parent_class = g_type_class_peek_parent (klass); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -9104,28 +9057,34 @@ static void view_filter_class_init (ViewFilterClass * klass) { ((ViewFilterClass *) klass)->refresh = view_filter_real_refresh; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_filter_signals[VIEW_FILTER_REFRESH_SIGNAL] = 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 9107 "ViewCollection.c" +#line 9060 "ViewCollection.c" } -static void view_filter_instance_init (ViewFilter * self) { +static void +view_filter_instance_init (ViewFilter * self) +{ #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->ref_count = 1; -#line 9114 "ViewCollection.c" +#line 9069 "ViewCollection.c" } -static void view_filter_finalize (ViewFilter * obj) { +static void +view_filter_finalize (ViewFilter * obj) +{ ViewFilter * self; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIEW_FILTER, ViewFilter); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_signal_handlers_destroy (self); -#line 9124 "ViewCollection.c" +#line 9081 "ViewCollection.c" } -GType view_filter_get_type (void) { +GType +view_filter_get_type (void) +{ static volatile gsize view_filter_type_id__volatile = 0; if (g_once_init_enter (&view_filter_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_view_filter_init, value_view_filter_free_value, value_view_filter_copy_value, value_view_filter_peek_pointer, "p", value_view_filter_collect_value, "p", value_view_filter_lcopy_value }; @@ -9139,18 +9098,22 @@ GType view_filter_get_type (void) { } -gpointer view_filter_ref (gpointer instance) { +gpointer +view_filter_ref (gpointer instance) +{ ViewFilter * self; self = instance; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_atomic_int_inc (&self->ref_count); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return instance; -#line 9149 "ViewCollection.c" +#line 9110 "ViewCollection.c" } -void view_filter_unref (gpointer instance) { +void +view_filter_unref (gpointer instance) +{ ViewFilter * self; self = instance; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -9159,7 +9122,7 @@ void view_filter_unref (gpointer instance) { VIEW_FILTER_GET_CLASS (self)->finalize (self); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_type_free_instance ((GTypeInstance *) self); -#line 9162 "ViewCollection.c" +#line 9125 "ViewCollection.c" } } diff --git a/src/core/util.c b/src/core/util.c index f4143d3..2b9ace7 100644 --- a/src/core/util.c +++ b/src/core/util.c @@ -1,4 +1,4 @@ -/* util.c generated by valac 0.36.6, the Vala compiler +/* util.c generated by valac 0.40.4, the Vala compiler * generated from util.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -12,6 +12,7 @@ /**/ /* This collection cannot be used to store null.*/ + #include #include #include @@ -32,6 +33,16 @@ typedef struct _SingletonCollection SingletonCollection; typedef struct _SingletonCollectionClass SingletonCollectionClass; typedef struct _SingletonCollectionPrivate SingletonCollectionPrivate; +enum { + SINGLETON_COLLECTION_0_PROPERTY, + SINGLETON_COLLECTION_G_TYPE, + SINGLETON_COLLECTION_G_DUP_FUNC, + SINGLETON_COLLECTION_G_DESTROY_FUNC, + SINGLETON_COLLECTION_READ_ONLY_PROPERTY, + SINGLETON_COLLECTION_SIZE_PROPERTY, + SINGLETON_COLLECTION_NUM_PROPERTIES +}; +static GParamSpec* singleton_collection_properties[SINGLETON_COLLECTION_NUM_PROPERTIES]; #define _g_destroy_func0(var) (((var == NULL) || (g_destroy_func == NULL)) ? NULL : (var = (g_destroy_func (var), NULL))) #define SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR (singleton_collection_singleton_iterator_get_type ()) @@ -44,6 +55,16 @@ typedef struct _SingletonCollectionPrivate SingletonCollectionPrivate; typedef struct _SingletonCollectionSingletonIterator SingletonCollectionSingletonIterator; typedef struct _SingletonCollectionSingletonIteratorClass SingletonCollectionSingletonIteratorClass; typedef struct _SingletonCollectionSingletonIteratorPrivate SingletonCollectionSingletonIteratorPrivate; +enum { + SINGLETON_COLLECTION_SINGLETON_ITERATOR_0_PROPERTY, + SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_TYPE, + SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DUP_FUNC, + SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DESTROY_FUNC, + SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY, + SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY, + SINGLETON_COLLECTION_SINGLETON_ITERATOR_NUM_PROPERTIES +}; +static GParamSpec* singleton_collection_singleton_iterator_properties[SINGLETON_COLLECTION_SINGLETON_ITERATOR_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define TYPE_MARKER (marker_get_type ()) @@ -191,93 +212,140 @@ static gpointer aggregate_progress_monitor_parent_class = NULL; GType singleton_collection_get_type (void) G_GNUC_CONST; #define SINGLETON_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SINGLETON_COLLECTION, SingletonCollectionPrivate)) -enum { - SINGLETON_COLLECTION_DUMMY_PROPERTY, - SINGLETON_COLLECTION_G_TYPE, - SINGLETON_COLLECTION_G_DUP_FUNC, - SINGLETON_COLLECTION_G_DESTROY_FUNC, - SINGLETON_COLLECTION_READ_ONLY_PROPERTY, - SINGLETON_COLLECTION_SIZE_PROPERTY -}; -SingletonCollection* singleton_collection_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object); -SingletonCollection* singleton_collection_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object); -static gboolean singleton_collection_real_add (GeeAbstractCollection* base, gconstpointer object); +SingletonCollection* singleton_collection_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + gconstpointer object); +SingletonCollection* singleton_collection_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + gconstpointer object); +static gboolean singleton_collection_real_add (GeeAbstractCollection* base, + gconstpointer object); static void singleton_collection_real_clear (GeeAbstractCollection* base); -static gboolean singleton_collection_real_contains (GeeAbstractCollection* base, gconstpointer object); +static gboolean singleton_collection_real_contains (GeeAbstractCollection* base, + gconstpointer object); static GeeIterator* singleton_collection_real_iterator (GeeAbstractCollection* base); -static SingletonCollectionSingletonIterator* singleton_collection_singleton_iterator_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, SingletonCollection* c); -static SingletonCollectionSingletonIterator* singleton_collection_singleton_iterator_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, SingletonCollection* c); +static SingletonCollectionSingletonIterator* singleton_collection_singleton_iterator_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + SingletonCollection* c); +static SingletonCollectionSingletonIterator* singleton_collection_singleton_iterator_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + SingletonCollection* c); static GType singleton_collection_singleton_iterator_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -static gboolean singleton_collection_real_remove (GeeAbstractCollection* base, gconstpointer item); +static gboolean singleton_collection_real_remove (GeeAbstractCollection* base, + gconstpointer item); #define SINGLETON_COLLECTION_SINGLETON_ITERATOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIteratorPrivate)) -enum { - SINGLETON_COLLECTION_SINGLETON_ITERATOR_DUMMY_PROPERTY, - SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_TYPE, - SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DUP_FUNC, - SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DESTROY_FUNC, - SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY, - SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY -}; -static gboolean singleton_collection_singleton_iterator_real_foreach (GeeTraversable* base, GeeForallFunc f, void* f_target); +static gboolean singleton_collection_singleton_iterator_real_foreach (GeeTraversable* base, + GeeForallFunc f, + void* f_target); static gpointer singleton_collection_singleton_iterator_real_get (GeeIterator* base); static gboolean singleton_collection_singleton_iterator_real_has_next (GeeIterator* base); static gboolean singleton_collection_singleton_iterator_real_next (GeeIterator* base); static void singleton_collection_singleton_iterator_real_remove (GeeIterator* base); static void singleton_collection_singleton_iterator_finalize (GObject * obj); -static void _vala_singleton_collection_singleton_iterator_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void _vala_singleton_collection_singleton_iterator_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); +static void _vala_singleton_collection_singleton_iterator_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); +static void _vala_singleton_collection_singleton_iterator_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec); static void singleton_collection_finalize (GObject * obj); -static void _vala_singleton_collection_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void _vala_singleton_collection_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); +static void _vala_singleton_collection_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); +static void _vala_singleton_collection_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec); GType data_object_get_type (void) G_GNUC_CONST; GType marker_get_type (void) G_GNUC_CONST; -void marker_mark (Marker* self, DataObject* object); -void marker_unmark (Marker* self, DataObject* object); -gboolean marker_toggle (Marker* self, DataObject* object); -void marker_mark_many (Marker* self, GeeCollection* list); -void marker_unmark_many (Marker* self, GeeCollection* list); +void marker_mark (Marker* self, + DataObject* object); +void marker_unmark (Marker* self, + DataObject* object); +gboolean marker_toggle (Marker* self, + DataObject* object); +void marker_mark_many (Marker* self, + GeeCollection* list); +void marker_unmark_many (Marker* self, + GeeCollection* list); void marker_mark_all (Marker* self); gint marker_get_count (Marker* self); GeeCollection* marker_get_all (Marker* self); gpointer unknown_total_monitor_ref (gpointer instance); void unknown_total_monitor_unref (gpointer instance); -GParamSpec* param_spec_unknown_total_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_unknown_total_monitor (GValue* value, gpointer v_object); -void value_take_unknown_total_monitor (GValue* value, gpointer v_object); +GParamSpec* param_spec_unknown_total_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_unknown_total_monitor (GValue* value, + gpointer v_object); +void value_take_unknown_total_monitor (GValue* value, + gpointer v_object); gpointer value_get_unknown_total_monitor (const GValue* value); GType unknown_total_monitor_get_type (void) G_GNUC_CONST; #define UNKNOWN_TOTAL_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_UNKNOWN_TOTAL_MONITOR, UnknownTotalMonitorPrivate)) -enum { - UNKNOWN_TOTAL_MONITOR_DUMMY_PROPERTY -}; -UnknownTotalMonitor* unknown_total_monitor_new (guint64 total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target); -UnknownTotalMonitor* unknown_total_monitor_construct (GType object_type, guint64 total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target); -gboolean unknown_total_monitor_monitor (UnknownTotalMonitor* self, guint64 count, guint64 total); +UnknownTotalMonitor* unknown_total_monitor_new (guint64 total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target); +UnknownTotalMonitor* unknown_total_monitor_construct (GType object_type, + guint64 total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target); +gboolean unknown_total_monitor_monitor (UnknownTotalMonitor* self, + guint64 count, + guint64 total); static void unknown_total_monitor_finalize (UnknownTotalMonitor * obj); gpointer aggregate_progress_monitor_ref (gpointer instance); void aggregate_progress_monitor_unref (gpointer instance); -GParamSpec* param_spec_aggregate_progress_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_aggregate_progress_monitor (GValue* value, gpointer v_object); -void value_take_aggregate_progress_monitor (GValue* value, gpointer v_object); +GParamSpec* param_spec_aggregate_progress_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_aggregate_progress_monitor (GValue* value, + gpointer v_object); +void value_take_aggregate_progress_monitor (GValue* value, + gpointer v_object); gpointer value_get_aggregate_progress_monitor (const GValue* value); GType aggregate_progress_monitor_get_type (void) G_GNUC_CONST; #define AGGREGATE_PROGRESS_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_AGGREGATE_PROGRESS_MONITOR, AggregateProgressMonitorPrivate)) -enum { - AGGREGATE_PROGRESS_MONITOR_DUMMY_PROPERTY -}; -AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target); -AggregateProgressMonitor* aggregate_progress_monitor_construct (GType object_type, guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target); -void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, const gchar* name); -gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, guint64 count, guint64 total); +AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target); +AggregateProgressMonitor* aggregate_progress_monitor_construct (GType object_type, + guint64 grand_total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target); +void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, + const gchar* name); +gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, + guint64 count, + guint64 total); static void aggregate_progress_monitor_finalize (AggregateProgressMonitor * obj); -gboolean null_progress_monitor (guint64 count, guint64 total); +gboolean null_progress_monitor (guint64 count, + guint64 total); gdouble degrees_to_radians (gdouble theta); -SingletonCollection* singleton_collection_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object) { +SingletonCollection* +singleton_collection_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + gconstpointer object) +{ SingletonCollection * self = NULL; - gconstpointer _tmp0_; - gpointer _tmp1_; + gpointer _tmp0_; #line 65 "/home/jens/Source/shotwell/src/core/util.vala" self = (SingletonCollection*) gee_abstract_collection_construct (object_type, g_type, (GBoxedCopyFunc) g_dup_func, (GDestroyNotify) g_destroy_func); #line 65 "/home/jens/Source/shotwell/src/core/util.vala" @@ -287,27 +355,33 @@ SingletonCollection* singleton_collection_construct (GType object_type, GType g_ #line 65 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->g_destroy_func = g_destroy_func; #line 66 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = object; -#line 66 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = ((_tmp0_ != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) _tmp0_) : ((gpointer) _tmp0_); + _tmp0_ = ((object != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) object) : ((gpointer) object); #line 66 "/home/jens/Source/shotwell/src/core/util.vala" _g_destroy_func0 (self->priv->object); #line 66 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->object = _tmp1_; + self->priv->object = _tmp0_; #line 65 "/home/jens/Source/shotwell/src/core/util.vala" return self; -#line 300 "util.c" +#line 366 "util.c" } -SingletonCollection* singleton_collection_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object) { +SingletonCollection* +singleton_collection_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + gconstpointer object) +{ #line 65 "/home/jens/Source/shotwell/src/core/util.vala" return singleton_collection_construct (TYPE_SINGLETON_COLLECTION, g_type, g_dup_func, g_destroy_func, object); -#line 307 "util.c" +#line 378 "util.c" } -static gboolean singleton_collection_real_add (GeeAbstractCollection* base, gconstpointer object) { +static gboolean +singleton_collection_real_add (GeeAbstractCollection* base, + gconstpointer object) +{ SingletonCollection * self; gboolean result = FALSE; #line 73 "/home/jens/Source/shotwell/src/core/util.vala" @@ -318,11 +392,13 @@ static gboolean singleton_collection_real_add (GeeAbstractCollection* base, gcon result = FALSE; #line 76 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 322 "util.c" +#line 396 "util.c" } -static void singleton_collection_real_clear (GeeAbstractCollection* base) { +static void +singleton_collection_real_clear (GeeAbstractCollection* base) +{ SingletonCollection * self; #line 79 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection); @@ -330,30 +406,32 @@ static void singleton_collection_real_clear (GeeAbstractCollection* base) { ((self->priv->object == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (self->priv->object = (self->priv->g_destroy_func (self->priv->object), NULL)); #line 80 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->object = NULL; -#line 334 "util.c" +#line 410 "util.c" } -static gboolean singleton_collection_real_contains (GeeAbstractCollection* base, gconstpointer object) { +static gboolean +singleton_collection_real_contains (GeeAbstractCollection* base, + gconstpointer object) +{ SingletonCollection * self; gboolean result = FALSE; gconstpointer _tmp0_; - gconstpointer _tmp1_; #line 83 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection); #line 84 "/home/jens/Source/shotwell/src/core/util.vala" _tmp0_ = self->priv->object; #line 84 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = object; -#line 84 "/home/jens/Source/shotwell/src/core/util.vala" - result = _tmp0_ == _tmp1_; + result = _tmp0_ == object; #line 84 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 353 "util.c" +#line 429 "util.c" } -static GeeIterator* singleton_collection_real_iterator (GeeAbstractCollection* base) { +static GeeIterator* +singleton_collection_real_iterator (GeeAbstractCollection* base) +{ SingletonCollection * self; GeeIterator* result = NULL; SingletonCollectionSingletonIterator* _tmp0_; @@ -365,23 +443,23 @@ static GeeIterator* singleton_collection_real_iterator (GeeAbstractCollection* b result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERATOR, GeeIterator); #line 88 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 369 "util.c" +#line 447 "util.c" } -static gboolean singleton_collection_real_remove (GeeAbstractCollection* base, gconstpointer item) { +static gboolean +singleton_collection_real_remove (GeeAbstractCollection* base, + gconstpointer item) +{ SingletonCollection * self; gboolean result = FALSE; gconstpointer _tmp0_; - gconstpointer _tmp1_; #line 91 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection); #line 92 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = item; -#line 92 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = self->priv->object; + _tmp0_ = self->priv->object; #line 92 "/home/jens/Source/shotwell/src/core/util.vala" - if (_tmp0_ == _tmp1_) { + if (item == _tmp0_) { #line 93 "/home/jens/Source/shotwell/src/core/util.vala" ((self->priv->object == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (self->priv->object = (self->priv->g_destroy_func (self->priv->object), NULL)); #line 93 "/home/jens/Source/shotwell/src/core/util.vala" @@ -390,17 +468,19 @@ static gboolean singleton_collection_real_remove (GeeAbstractCollection* base, g result = TRUE; #line 95 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 394 "util.c" +#line 472 "util.c" } #line 98 "/home/jens/Source/shotwell/src/core/util.vala" result = FALSE; #line 98 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 400 "util.c" +#line 478 "util.c" } -static gboolean singleton_collection_real_get_read_only (GeeAbstractCollection* base) { +static gboolean +singleton_collection_real_get_read_only (GeeAbstractCollection* base) +{ gboolean result; SingletonCollection* self; #line 70 "/home/jens/Source/shotwell/src/core/util.vala" @@ -409,11 +489,13 @@ static gboolean singleton_collection_real_get_read_only (GeeAbstractCollection* result = FALSE; #line 70 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 413 "util.c" +#line 493 "util.c" } -static gint singleton_collection_real_get_size (GeeAbstractCollection* base) { +static gint +singleton_collection_real_get_size (GeeAbstractCollection* base) +{ gint result; SingletonCollection* self; gint _tmp0_ = 0; @@ -426,31 +508,38 @@ static gint singleton_collection_real_get_size (GeeAbstractCollection* base) { if (_tmp1_ != NULL) { #line 103 "/home/jens/Source/shotwell/src/core/util.vala" _tmp0_ = 1; -#line 430 "util.c" +#line 512 "util.c" } else { #line 103 "/home/jens/Source/shotwell/src/core/util.vala" _tmp0_ = 0; -#line 434 "util.c" +#line 516 "util.c" } #line 103 "/home/jens/Source/shotwell/src/core/util.vala" result = _tmp0_; #line 103 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 440 "util.c" +#line 522 "util.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 20 "/home/jens/Source/shotwell/src/core/util.vala" return self ? g_object_ref (self) : NULL; -#line 447 "util.c" +#line 531 "util.c" } -static SingletonCollectionSingletonIterator* singleton_collection_singleton_iterator_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, SingletonCollection* c) { +static SingletonCollectionSingletonIterator* +singleton_collection_singleton_iterator_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + SingletonCollection* c) +{ SingletonCollectionSingletonIterator * self = NULL; SingletonCollection* _tmp0_; - SingletonCollection* _tmp1_; #line 19 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (IS_SINGLETON_COLLECTION (c), NULL); #line 19 "/home/jens/Source/shotwell/src/core/util.vala" @@ -462,58 +551,58 @@ static SingletonCollectionSingletonIterator* singleton_collection_singleton_iter #line 19 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->g_destroy_func = g_destroy_func; #line 20 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = c; -#line 20 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (c); #line 20 "/home/jens/Source/shotwell/src/core/util.vala" _g_object_unref0 (self->priv->c); #line 20 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->c = _tmp1_; + self->priv->c = _tmp0_; #line 19 "/home/jens/Source/shotwell/src/core/util.vala" return self; -#line 475 "util.c" +#line 562 "util.c" } -static SingletonCollectionSingletonIterator* singleton_collection_singleton_iterator_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, SingletonCollection* c) { +static SingletonCollectionSingletonIterator* +singleton_collection_singleton_iterator_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + SingletonCollection* c) +{ #line 19 "/home/jens/Source/shotwell/src/core/util.vala" return singleton_collection_singleton_iterator_construct (SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, g_type, g_dup_func, g_destroy_func, c); -#line 482 "util.c" +#line 574 "util.c" } -static gboolean singleton_collection_singleton_iterator_real_foreach (GeeTraversable* base, GeeForallFunc f, void* f_target) { +static gboolean +singleton_collection_singleton_iterator_real_foreach (GeeTraversable* base, + GeeForallFunc f, + void* f_target) +{ SingletonCollectionSingletonIterator * self; gboolean result = FALSE; - GeeForallFunc _tmp0_; - void* _tmp0__target; - SingletonCollection* _tmp1_; - gconstpointer _tmp2_; - gpointer _tmp3_; - gboolean _tmp4_; + SingletonCollection* _tmp0_; + gconstpointer _tmp1_; + gpointer _tmp2_; #line 31 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator); #line 32 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = f; -#line 32 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0__target = f_target; -#line 32 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = self->priv->c; -#line 32 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp2_ = _tmp1_->priv->object; + _tmp0_ = self->priv->c; #line 32 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp3_ = ((_tmp2_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp2_) : ((gpointer) _tmp2_); + _tmp1_ = _tmp0_->priv->object; #line 32 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp4_ = _tmp0_ (_tmp3_, _tmp0__target); + _tmp2_ = ((_tmp1_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp1_) : ((gpointer) _tmp1_); #line 32 "/home/jens/Source/shotwell/src/core/util.vala" - result = _tmp4_; + result = f (_tmp2_, f_target); #line 32 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 513 "util.c" +#line 600 "util.c" } -static gpointer singleton_collection_singleton_iterator_real_get (GeeIterator* base) { +static gpointer +singleton_collection_singleton_iterator_real_get (GeeIterator* base) +{ SingletonCollectionSingletonIterator * self; gpointer result = NULL; gconstpointer _tmp0_; @@ -528,11 +617,13 @@ static gpointer singleton_collection_singleton_iterator_real_get (GeeIterator* b result = _tmp1_; #line 36 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 532 "util.c" +#line 621 "util.c" } -static gboolean singleton_collection_singleton_iterator_real_has_next (GeeIterator* base) { +static gboolean +singleton_collection_singleton_iterator_real_has_next (GeeIterator* base) +{ SingletonCollectionSingletonIterator * self; gboolean result = FALSE; #line 39 "/home/jens/Source/shotwell/src/core/util.vala" @@ -541,11 +632,13 @@ static gboolean singleton_collection_singleton_iterator_real_has_next (GeeIterat result = FALSE; #line 40 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 545 "util.c" +#line 636 "util.c" } -static gboolean singleton_collection_singleton_iterator_real_next (GeeIterator* base) { +static gboolean +singleton_collection_singleton_iterator_real_next (GeeIterator* base) +{ SingletonCollectionSingletonIterator * self; gboolean result = FALSE; gboolean _tmp0_; @@ -562,7 +655,7 @@ static gboolean singleton_collection_singleton_iterator_real_next (GeeIterator* result = FALSE; #line 45 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 566 "util.c" +#line 659 "util.c" } #line 47 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->done = TRUE; @@ -580,11 +673,13 @@ static gboolean singleton_collection_singleton_iterator_real_next (GeeIterator* result = TRUE; #line 50 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 584 "util.c" +#line 677 "util.c" } -static void singleton_collection_singleton_iterator_real_remove (GeeIterator* base) { +static void +singleton_collection_singleton_iterator_real_remove (GeeIterator* base) +{ SingletonCollectionSingletonIterator * self; gboolean _tmp0_; #line 53 "/home/jens/Source/shotwell/src/core/util.vala" @@ -593,7 +688,7 @@ static void singleton_collection_singleton_iterator_real_remove (GeeIterator* ba _tmp0_ = self->priv->done; #line 54 "/home/jens/Source/shotwell/src/core/util.vala" if (!_tmp0_) { -#line 597 "util.c" +#line 692 "util.c" SingletonCollection* _tmp1_; #line 55 "/home/jens/Source/shotwell/src/core/util.vala" _tmp1_ = self->priv->c; @@ -605,15 +700,17 @@ static void singleton_collection_singleton_iterator_real_remove (GeeIterator* ba ((self->priv->current == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (self->priv->current = (self->priv->g_destroy_func (self->priv->current), NULL)); #line 56 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->current = NULL; -#line 609 "util.c" +#line 704 "util.c" } #line 59 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->done = TRUE; -#line 613 "util.c" +#line 708 "util.c" } -static gboolean singleton_collection_singleton_iterator_real_get_read_only (GeeIterator* base) { +static gboolean +singleton_collection_singleton_iterator_real_get_read_only (GeeIterator* base) +{ gboolean result; SingletonCollectionSingletonIterator* self; gboolean _tmp0_; @@ -625,11 +722,13 @@ static gboolean singleton_collection_singleton_iterator_real_get_read_only (GeeI result = _tmp0_; #line 24 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 629 "util.c" +#line 726 "util.c" } -static gboolean singleton_collection_singleton_iterator_real_get_valid (GeeIterator* base) { +static gboolean +singleton_collection_singleton_iterator_real_get_valid (GeeIterator* base) +{ gboolean result; SingletonCollectionSingletonIterator* self; gboolean _tmp0_; @@ -641,11 +740,13 @@ static gboolean singleton_collection_singleton_iterator_real_get_valid (GeeItera result = _tmp0_; #line 28 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 645 "util.c" +#line 744 "util.c" } -static void singleton_collection_singleton_iterator_class_init (SingletonCollectionSingletonIteratorClass * klass) { +static void +singleton_collection_singleton_iterator_class_init (SingletonCollectionSingletonIteratorClass * klass) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" singleton_collection_singleton_iterator_parent_class = g_type_class_peek_parent (klass); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" @@ -657,41 +758,49 @@ static void singleton_collection_singleton_iterator_class_init (SingletonCollect #line 14 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_CLASS (klass)->finalize = singleton_collection_singleton_iterator_finalize; #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_TYPE, g_param_spec_gtype ("g-type", "type", "type", G_TYPE_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_TYPE, g_param_spec_gtype ("g-type", "type", "type", G_TYPE_NONE, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DUP_FUNC, g_param_spec_pointer ("g-dup-func", "dup func", "dup func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DUP_FUNC, g_param_spec_pointer ("g-dup-func", "dup func", "dup func", G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY, g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY, singleton_collection_singleton_iterator_properties[SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY] = g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY, g_param_spec_boolean ("valid", "valid", "valid", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 670 "util.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY, singleton_collection_singleton_iterator_properties[SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY] = g_param_spec_boolean ("valid", "valid", "valid", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 771 "util.c" } -static GType singleton_collection_singleton_iterator_gee_traversable_get_g_type (SingletonCollectionSingletonIterator* self) { +static GType +singleton_collection_singleton_iterator_gee_traversable_get_g_type (SingletonCollectionSingletonIterator* self) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" return self->priv->g_type; -#line 677 "util.c" +#line 780 "util.c" } -static GBoxedCopyFunc singleton_collection_singleton_iterator_gee_traversable_get_g_dup_func (SingletonCollectionSingletonIterator* self) { +static GBoxedCopyFunc +singleton_collection_singleton_iterator_gee_traversable_get_g_dup_func (SingletonCollectionSingletonIterator* self) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" return self->priv->g_dup_func; -#line 684 "util.c" +#line 789 "util.c" } -static GDestroyNotify singleton_collection_singleton_iterator_gee_traversable_get_g_destroy_func (SingletonCollectionSingletonIterator* self) { +static GDestroyNotify +singleton_collection_singleton_iterator_gee_traversable_get_g_destroy_func (SingletonCollectionSingletonIterator* self) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" return self->priv->g_destroy_func; -#line 691 "util.c" +#line 798 "util.c" } -static void singleton_collection_singleton_iterator_gee_traversable_interface_init (GeeTraversableIface * iface) { +static void +singleton_collection_singleton_iterator_gee_traversable_interface_init (GeeTraversableIface * iface) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" singleton_collection_singleton_iterator_gee_traversable_parent_iface = g_type_interface_peek_parent (iface); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" @@ -702,11 +811,13 @@ static void singleton_collection_singleton_iterator_gee_traversable_interface_in iface->get_g_dup_func = (GBoxedCopyFunc (*) (GeeTraversable *)) singleton_collection_singleton_iterator_gee_traversable_get_g_dup_func; #line 14 "/home/jens/Source/shotwell/src/core/util.vala" iface->get_g_destroy_func = (GDestroyNotify (*) (GeeTraversable *)) singleton_collection_singleton_iterator_gee_traversable_get_g_destroy_func; -#line 706 "util.c" +#line 815 "util.c" } -static void singleton_collection_singleton_iterator_gee_iterator_interface_init (GeeIteratorIface * iface) { +static void +singleton_collection_singleton_iterator_gee_iterator_interface_init (GeeIteratorIface * iface) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" singleton_collection_singleton_iterator_gee_iterator_parent_iface = g_type_interface_peek_parent (iface); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" @@ -721,22 +832,26 @@ static void singleton_collection_singleton_iterator_gee_iterator_interface_init iface->get_read_only = singleton_collection_singleton_iterator_real_get_read_only; #line 14 "/home/jens/Source/shotwell/src/core/util.vala" iface->get_valid = singleton_collection_singleton_iterator_real_get_valid; -#line 725 "util.c" +#line 836 "util.c" } -static void singleton_collection_singleton_iterator_instance_init (SingletonCollectionSingletonIterator * self) { +static void +singleton_collection_singleton_iterator_instance_init (SingletonCollectionSingletonIterator * self) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" self->priv = SINGLETON_COLLECTION_SINGLETON_ITERATOR_GET_PRIVATE (self); #line 16 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->done = FALSE; #line 17 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->current = NULL; -#line 736 "util.c" +#line 849 "util.c" } -static void singleton_collection_singleton_iterator_finalize (GObject * obj) { +static void +singleton_collection_singleton_iterator_finalize (GObject * obj) +{ SingletonCollectionSingletonIterator * self; #line 14 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator); @@ -746,11 +861,13 @@ static void singleton_collection_singleton_iterator_finalize (GObject * obj) { ((self->priv->current == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (self->priv->current = (self->priv->g_destroy_func (self->priv->current), NULL)); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_CLASS (singleton_collection_singleton_iterator_parent_class)->finalize (obj); -#line 750 "util.c" +#line 865 "util.c" } -static GType singleton_collection_singleton_iterator_get_type (void) { +static GType +singleton_collection_singleton_iterator_get_type (void) +{ static volatile gsize singleton_collection_singleton_iterator_type_id__volatile = 0; if (g_once_init_enter (&singleton_collection_singleton_iterator_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SingletonCollectionSingletonIteratorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) singleton_collection_singleton_iterator_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SingletonCollectionSingletonIterator), 0, (GInstanceInitFunc) singleton_collection_singleton_iterator_instance_init, NULL }; @@ -766,7 +883,12 @@ static GType singleton_collection_singleton_iterator_get_type (void) { } -static void _vala_singleton_collection_singleton_iterator_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_singleton_collection_singleton_iterator_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ SingletonCollectionSingletonIterator * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" @@ -783,18 +905,23 @@ static void _vala_singleton_collection_singleton_iterator_get_property (GObject g_value_set_boolean (value, gee_iterator_get_valid (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_ITERATOR, GeeIterator))); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 787 "util.c" +#line 909 "util.c" default: #line 14 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 793 "util.c" +#line 915 "util.c" } } -static void _vala_singleton_collection_singleton_iterator_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { +static void +_vala_singleton_collection_singleton_iterator_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec) +{ SingletonCollectionSingletonIterator * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" @@ -817,18 +944,20 @@ static void _vala_singleton_collection_singleton_iterator_set_property (GObject self->priv->g_destroy_func = g_value_get_pointer (value); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 821 "util.c" +#line 948 "util.c" default: #line 14 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 827 "util.c" +#line 954 "util.c" } } -static void singleton_collection_class_init (SingletonCollectionClass * klass) { +static void +singleton_collection_class_init (SingletonCollectionClass * klass) +{ #line 13 "/home/jens/Source/shotwell/src/core/util.vala" singleton_collection_parent_class = g_type_class_peek_parent (klass); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" @@ -854,27 +983,31 @@ static void singleton_collection_class_init (SingletonCollectionClass * klass) { #line 13 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_CLASS (klass)->finalize = singleton_collection_finalize; #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_G_TYPE, g_param_spec_gtype ("g-type", "type", "type", G_TYPE_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_G_TYPE, g_param_spec_gtype ("g-type", "type", "type", G_TYPE_NONE, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_G_DUP_FUNC, g_param_spec_pointer ("g-dup-func", "dup func", "dup func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_G_DUP_FUNC, g_param_spec_pointer ("g-dup-func", "dup func", "dup func", G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_READ_ONLY_PROPERTY, g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_READ_ONLY_PROPERTY, singleton_collection_properties[SINGLETON_COLLECTION_READ_ONLY_PROPERTY] = g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SIZE_PROPERTY, g_param_spec_int ("size", "size", "size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 867 "util.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SIZE_PROPERTY, singleton_collection_properties[SINGLETON_COLLECTION_SIZE_PROPERTY] = g_param_spec_int ("size", "size", "size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 996 "util.c" } -static void singleton_collection_instance_init (SingletonCollection * self) { +static void +singleton_collection_instance_init (SingletonCollection * self) +{ #line 13 "/home/jens/Source/shotwell/src/core/util.vala" self->priv = SINGLETON_COLLECTION_GET_PRIVATE (self); -#line 874 "util.c" +#line 1005 "util.c" } -static void singleton_collection_finalize (GObject * obj) { +static void +singleton_collection_finalize (GObject * obj) +{ SingletonCollection * self; #line 13 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SINGLETON_COLLECTION, SingletonCollection); @@ -882,11 +1015,13 @@ static void singleton_collection_finalize (GObject * obj) { ((self->priv->object == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (self->priv->object = (self->priv->g_destroy_func (self->priv->object), NULL)); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_CLASS (singleton_collection_parent_class)->finalize (obj); -#line 886 "util.c" +#line 1019 "util.c" } -GType singleton_collection_get_type (void) { +GType +singleton_collection_get_type (void) +{ static volatile gsize singleton_collection_type_id__volatile = 0; if (g_once_init_enter (&singleton_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SingletonCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) singleton_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SingletonCollection), 0, (GInstanceInitFunc) singleton_collection_instance_init, NULL }; @@ -898,7 +1033,12 @@ GType singleton_collection_get_type (void) { } -static void _vala_singleton_collection_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_singleton_collection_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ SingletonCollection * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_SINGLETON_COLLECTION, SingletonCollection); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" @@ -915,18 +1055,23 @@ static void _vala_singleton_collection_get_property (GObject * object, guint pro g_value_set_int (value, gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection))); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 919 "util.c" +#line 1059 "util.c" default: #line 13 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 925 "util.c" +#line 1065 "util.c" } } -static void _vala_singleton_collection_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { +static void +_vala_singleton_collection_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec) +{ SingletonCollection * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_SINGLETON_COLLECTION, SingletonCollection); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" @@ -949,102 +1094,127 @@ static void _vala_singleton_collection_set_property (GObject * object, guint pro self->priv->g_destroy_func = g_value_get_pointer (value); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 953 "util.c" +#line 1098 "util.c" default: #line 13 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 959 "util.c" +#line 1104 "util.c" } } -void marker_mark (Marker* self, DataObject* object) { +void +marker_mark (Marker* self, + DataObject* object) +{ #line 113 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (IS_MARKER (self)); #line 113 "/home/jens/Source/shotwell/src/core/util.vala" MARKER_GET_INTERFACE (self)->mark (self, object); -#line 969 "util.c" +#line 1117 "util.c" } -void marker_unmark (Marker* self, DataObject* object) { +void +marker_unmark (Marker* self, + DataObject* object) +{ #line 115 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (IS_MARKER (self)); #line 115 "/home/jens/Source/shotwell/src/core/util.vala" MARKER_GET_INTERFACE (self)->unmark (self, object); -#line 978 "util.c" +#line 1129 "util.c" } -gboolean marker_toggle (Marker* self, DataObject* object) { +gboolean +marker_toggle (Marker* self, + DataObject* object) +{ #line 117 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (IS_MARKER (self), FALSE); #line 117 "/home/jens/Source/shotwell/src/core/util.vala" return MARKER_GET_INTERFACE (self)->toggle (self, object); -#line 987 "util.c" +#line 1141 "util.c" } -void marker_mark_many (Marker* self, GeeCollection* list) { +void +marker_mark_many (Marker* self, + GeeCollection* list) +{ #line 119 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (IS_MARKER (self)); #line 119 "/home/jens/Source/shotwell/src/core/util.vala" MARKER_GET_INTERFACE (self)->mark_many (self, list); -#line 996 "util.c" +#line 1153 "util.c" } -void marker_unmark_many (Marker* self, GeeCollection* list) { +void +marker_unmark_many (Marker* self, + GeeCollection* list) +{ #line 121 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (IS_MARKER (self)); #line 121 "/home/jens/Source/shotwell/src/core/util.vala" MARKER_GET_INTERFACE (self)->unmark_many (self, list); -#line 1005 "util.c" +#line 1165 "util.c" } -void marker_mark_all (Marker* self) { +void +marker_mark_all (Marker* self) +{ #line 123 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (IS_MARKER (self)); #line 123 "/home/jens/Source/shotwell/src/core/util.vala" MARKER_GET_INTERFACE (self)->mark_all (self); -#line 1014 "util.c" +#line 1176 "util.c" } -gint marker_get_count (Marker* self) { +gint +marker_get_count (Marker* self) +{ #line 127 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (IS_MARKER (self), 0); #line 127 "/home/jens/Source/shotwell/src/core/util.vala" return MARKER_GET_INTERFACE (self)->get_count (self); -#line 1023 "util.c" +#line 1187 "util.c" } -GeeCollection* marker_get_all (Marker* self) { +GeeCollection* +marker_get_all (Marker* self) +{ #line 130 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (IS_MARKER (self), NULL); #line 130 "/home/jens/Source/shotwell/src/core/util.vala" return MARKER_GET_INTERFACE (self)->get_all (self); -#line 1032 "util.c" +#line 1198 "util.c" } -static void marker_base_init (MarkerIface * iface) { +static void +marker_base_init (MarkerIface * iface) +{ #line 112 "/home/jens/Source/shotwell/src/core/util.vala" static gboolean initialized = FALSE; #line 112 "/home/jens/Source/shotwell/src/core/util.vala" if (!initialized) { #line 112 "/home/jens/Source/shotwell/src/core/util.vala" initialized = TRUE; -#line 1043 "util.c" +#line 1211 "util.c" } } -GType marker_get_type (void) { +GType +marker_get_type (void) +{ static volatile gsize marker_type_id__volatile = 0; if (g_once_init_enter (&marker_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MarkerIface), (GBaseInitFunc) marker_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -1057,45 +1227,47 @@ GType marker_get_type (void) { } -UnknownTotalMonitor* unknown_total_monitor_construct (GType object_type, guint64 total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target) { +UnknownTotalMonitor* +unknown_total_monitor_construct (GType object_type, + guint64 total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target) +{ UnknownTotalMonitor* self = NULL; - guint64 _tmp0_; - ProgressMonitor _tmp1_; - void* _tmp1__target; #line 147 "/home/jens/Source/shotwell/src/core/util.vala" self = (UnknownTotalMonitor*) g_type_create_instance (object_type); #line 148 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = total; -#line 148 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->total = _tmp0_; + self->priv->total = total; #line 149 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = wrapped_monitor; + self->priv->wrapped_monitor = wrapped_monitor; #line 149 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1__target = wrapped_monitor_target; -#line 149 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->wrapped_monitor = _tmp1_; -#line 149 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->wrapped_monitor_target = _tmp1__target; + self->priv->wrapped_monitor_target = wrapped_monitor_target; #line 147 "/home/jens/Source/shotwell/src/core/util.vala" return self; -#line 1082 "util.c" +#line 1248 "util.c" } -UnknownTotalMonitor* unknown_total_monitor_new (guint64 total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target) { +UnknownTotalMonitor* +unknown_total_monitor_new (guint64 total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target) +{ #line 147 "/home/jens/Source/shotwell/src/core/util.vala" return unknown_total_monitor_construct (TYPE_UNKNOWN_TOTAL_MONITOR, total, wrapped_monitor, wrapped_monitor_target); -#line 1089 "util.c" +#line 1259 "util.c" } -gboolean unknown_total_monitor_monitor (UnknownTotalMonitor* self, guint64 count, guint64 total) { +gboolean +unknown_total_monitor_monitor (UnknownTotalMonitor* self, + guint64 count, + guint64 total) +{ gboolean result = FALSE; ProgressMonitor _tmp0_; void* _tmp0__target; guint64 _tmp1_; - guint64 _tmp2_; - gboolean _tmp3_; #line 152 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (IS_UNKNOWN_TOTAL_MONITOR (self), FALSE); #line 153 "/home/jens/Source/shotwell/src/core/util.vala" @@ -1103,117 +1275,138 @@ gboolean unknown_total_monitor_monitor (UnknownTotalMonitor* self, guint64 count #line 153 "/home/jens/Source/shotwell/src/core/util.vala" _tmp0__target = self->priv->wrapped_monitor_target; #line 153 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = count; -#line 153 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp2_ = self->priv->total; + _tmp1_ = self->priv->total; #line 153 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp3_ = _tmp0_ (_tmp1_, _tmp2_, TRUE, _tmp0__target); -#line 153 "/home/jens/Source/shotwell/src/core/util.vala" - result = _tmp3_; + result = _tmp0_ (count, _tmp1_, TRUE, _tmp0__target); #line 153 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 1116 "util.c" +#line 1284 "util.c" } -static void value_unknown_total_monitor_init (GValue* value) { +static void +value_unknown_total_monitor_init (GValue* value) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1123 "util.c" +#line 1293 "util.c" } -static void value_unknown_total_monitor_free_value (GValue* value) { +static void +value_unknown_total_monitor_free_value (GValue* value) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (value->data[0].v_pointer) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" unknown_total_monitor_unref (value->data[0].v_pointer); -#line 1132 "util.c" +#line 1304 "util.c" } } -static void value_unknown_total_monitor_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_unknown_total_monitor_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (src_value->data[0].v_pointer) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" dest_value->data[0].v_pointer = unknown_total_monitor_ref (src_value->data[0].v_pointer); -#line 1142 "util.c" +#line 1317 "util.c" } else { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" dest_value->data[0].v_pointer = NULL; -#line 1146 "util.c" +#line 1321 "util.c" } } -static gpointer value_unknown_total_monitor_peek_pointer (const GValue* value) { +static gpointer +value_unknown_total_monitor_peek_pointer (const GValue* value) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return value->data[0].v_pointer; -#line 1154 "util.c" +#line 1331 "util.c" } -static gchar* value_unknown_total_monitor_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_unknown_total_monitor_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (collect_values[0].v_pointer) { -#line 1161 "util.c" +#line 1343 "util.c" UnknownTotalMonitor * object; object = collect_values[0].v_pointer; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (object->parent_instance.g_class == NULL) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1168 "util.c" +#line 1350 "util.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 143 "/home/jens/Source/shotwell/src/core/util.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 1172 "util.c" +#line 1354 "util.c" } #line 143 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = unknown_total_monitor_ref (object); -#line 1176 "util.c" +#line 1358 "util.c" } else { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1180 "util.c" +#line 1362 "util.c" } #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return NULL; -#line 1184 "util.c" +#line 1366 "util.c" } -static gchar* value_unknown_total_monitor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_unknown_total_monitor_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ UnknownTotalMonitor ** object_p; object_p = collect_values[0].v_pointer; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (!object_p) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1195 "util.c" +#line 1382 "util.c" } #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (!value->data[0].v_pointer) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" *object_p = NULL; -#line 1201 "util.c" +#line 1388 "util.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" *object_p = value->data[0].v_pointer; -#line 1205 "util.c" +#line 1392 "util.c" } else { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" *object_p = unknown_total_monitor_ref (value->data[0].v_pointer); -#line 1209 "util.c" +#line 1396 "util.c" } #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return NULL; -#line 1213 "util.c" +#line 1400 "util.c" } -GParamSpec* param_spec_unknown_total_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_unknown_total_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecUnknownTotalMonitor* spec; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_UNKNOWN_TOTAL_MONITOR), NULL); @@ -1223,20 +1416,25 @@ GParamSpec* param_spec_unknown_total_monitor (const gchar* name, const gchar* ni G_PARAM_SPEC (spec)->value_type = object_type; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return G_PARAM_SPEC (spec); -#line 1227 "util.c" +#line 1420 "util.c" } -gpointer value_get_unknown_total_monitor (const GValue* value) { +gpointer +value_get_unknown_total_monitor (const GValue* value) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UNKNOWN_TOTAL_MONITOR), NULL); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return value->data[0].v_pointer; -#line 1236 "util.c" +#line 1431 "util.c" } -void value_set_unknown_total_monitor (GValue* value, gpointer v_object) { +void +value_set_unknown_total_monitor (GValue* value, + gpointer v_object) +{ UnknownTotalMonitor * old; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UNKNOWN_TOTAL_MONITOR)); @@ -1252,22 +1450,25 @@ void value_set_unknown_total_monitor (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" unknown_total_monitor_ref (value->data[0].v_pointer); -#line 1256 "util.c" +#line 1454 "util.c" } else { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1260 "util.c" +#line 1458 "util.c" } #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (old) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" unknown_total_monitor_unref (old); -#line 1266 "util.c" +#line 1464 "util.c" } } -void value_take_unknown_total_monitor (GValue* value, gpointer v_object) { +void +value_take_unknown_total_monitor (GValue* value, + gpointer v_object) +{ UnknownTotalMonitor * old; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UNKNOWN_TOTAL_MONITOR)); @@ -1281,52 +1482,60 @@ void value_take_unknown_total_monitor (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = v_object; -#line 1285 "util.c" +#line 1486 "util.c" } else { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1289 "util.c" +#line 1490 "util.c" } #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (old) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" unknown_total_monitor_unref (old); -#line 1295 "util.c" +#line 1496 "util.c" } } -static void unknown_total_monitor_class_init (UnknownTotalMonitorClass * klass) { +static void +unknown_total_monitor_class_init (UnknownTotalMonitorClass * klass) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" unknown_total_monitor_parent_class = g_type_class_peek_parent (klass); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" ((UnknownTotalMonitorClass *) klass)->finalize = unknown_total_monitor_finalize; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_type_class_add_private (klass, sizeof (UnknownTotalMonitorPrivate)); -#line 1307 "util.c" +#line 1510 "util.c" } -static void unknown_total_monitor_instance_init (UnknownTotalMonitor * self) { +static void +unknown_total_monitor_instance_init (UnknownTotalMonitor * self) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" self->priv = UNKNOWN_TOTAL_MONITOR_GET_PRIVATE (self); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" self->ref_count = 1; -#line 1316 "util.c" +#line 1521 "util.c" } -static void unknown_total_monitor_finalize (UnknownTotalMonitor * obj) { +static void +unknown_total_monitor_finalize (UnknownTotalMonitor * obj) +{ UnknownTotalMonitor * self; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_UNKNOWN_TOTAL_MONITOR, UnknownTotalMonitor); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_signal_handlers_destroy (self); -#line 1326 "util.c" +#line 1533 "util.c" } -GType unknown_total_monitor_get_type (void) { +GType +unknown_total_monitor_get_type (void) +{ static volatile gsize unknown_total_monitor_type_id__volatile = 0; if (g_once_init_enter (&unknown_total_monitor_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_unknown_total_monitor_init, value_unknown_total_monitor_free_value, value_unknown_total_monitor_copy_value, value_unknown_total_monitor_peek_pointer, "p", value_unknown_total_monitor_collect_value, "p", value_unknown_total_monitor_lcopy_value }; @@ -1340,18 +1549,22 @@ GType unknown_total_monitor_get_type (void) { } -gpointer unknown_total_monitor_ref (gpointer instance) { +gpointer +unknown_total_monitor_ref (gpointer instance) +{ UnknownTotalMonitor * self; self = instance; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_atomic_int_inc (&self->ref_count); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return instance; -#line 1351 "util.c" +#line 1562 "util.c" } -void unknown_total_monitor_unref (gpointer instance) { +void +unknown_total_monitor_unref (gpointer instance) +{ UnknownTotalMonitor * self; self = instance; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" @@ -1360,256 +1573,273 @@ void unknown_total_monitor_unref (gpointer instance) { UNKNOWN_TOTAL_MONITOR_GET_CLASS (self)->finalize (self); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1364 "util.c" +#line 1577 "util.c" } } -AggregateProgressMonitor* aggregate_progress_monitor_construct (GType object_type, guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target) { +AggregateProgressMonitor* +aggregate_progress_monitor_construct (GType object_type, + guint64 grand_total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target) +{ AggregateProgressMonitor* self = NULL; - guint64 _tmp0_; - ProgressMonitor _tmp1_; - void* _tmp1__target; #line 165 "/home/jens/Source/shotwell/src/core/util.vala" self = (AggregateProgressMonitor*) g_type_create_instance (object_type); #line 166 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = grand_total; -#line 166 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->grand_total = _tmp0_; -#line 167 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = wrapped_monitor; -#line 167 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1__target = wrapped_monitor_target; + self->priv->grand_total = grand_total; #line 167 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->wrapped_monitor = _tmp1_; + self->priv->wrapped_monitor = wrapped_monitor; #line 167 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->wrapped_monitor_target = _tmp1__target; + self->priv->wrapped_monitor_target = wrapped_monitor_target; #line 165 "/home/jens/Source/shotwell/src/core/util.vala" return self; -#line 1390 "util.c" +#line 1599 "util.c" } -AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target) { +AggregateProgressMonitor* +aggregate_progress_monitor_new (guint64 grand_total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target) +{ #line 165 "/home/jens/Source/shotwell/src/core/util.vala" return aggregate_progress_monitor_construct (TYPE_AGGREGATE_PROGRESS_MONITOR, grand_total, wrapped_monitor, wrapped_monitor_target); -#line 1397 "util.c" +#line 1610 "util.c" } -void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, const gchar* name) { - const gchar* _tmp0_; - guint64 _tmp1_; +void +aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, + const gchar* name) +{ + guint64 _tmp0_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; - guint64 _tmp4_; + guint64 _tmp3_; + gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; #line 170 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (IS_AGGREGATE_PROGRESS_MONITOR (self)); #line 170 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (name != NULL); #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = name; + _tmp0_ = self->priv->aggregate_count; #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = self->priv->aggregate_count; + _tmp1_ = g_strdup_printf ("%" G_GUINT64_FORMAT, _tmp0_); #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp2_ = g_strdup_printf ("%" G_GUINT64_FORMAT, _tmp1_); + _tmp2_ = _tmp1_; #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp3_ = _tmp2_; + _tmp3_ = self->priv->grand_total; #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp4_ = self->priv->grand_total; + _tmp4_ = g_strdup_printf ("%" G_GUINT64_FORMAT, _tmp3_); #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp5_ = g_strdup_printf ("%" G_GUINT64_FORMAT, _tmp4_); + _tmp5_ = _tmp4_; #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp6_ = _tmp5_; + g_debug ("util.vala:171: next step: %s (%s/%s)", name, _tmp2_, _tmp5_); #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - g_debug ("util.vala:171: next step: %s (%s/%s)", _tmp0_, _tmp3_, _tmp6_); + _g_free0 (_tmp5_); #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _g_free0 (_tmp6_); -#line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 172 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->last_count = G_MAXUINT64; -#line 1435 "util.c" +#line 1648 "util.c" } -gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, guint64 count, guint64 total) { +gboolean +aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, + guint64 count, + guint64 total) +{ gboolean result = FALSE; guint64 _tmp0_ = 0ULL; guint64 _tmp1_; + guint64 _tmp3_; + guint64 _tmp4_; guint64 _tmp5_; - guint64 _tmp6_; - guint64 _tmp7_; + ProgressMonitor _tmp7_; + void* _tmp7__target; + guint64 _tmp8_; guint64 _tmp9_; - ProgressMonitor _tmp10_; - void* _tmp10__target; - guint64 _tmp11_; - guint64 _tmp12_; - gboolean _tmp13_; #line 175 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (IS_AGGREGATE_PROGRESS_MONITOR (self), FALSE); #line 177 "/home/jens/Source/shotwell/src/core/util.vala" _tmp1_ = self->priv->last_count; #line 177 "/home/jens/Source/shotwell/src/core/util.vala" if (_tmp1_ != G_MAXUINT64) { -#line 1458 "util.c" +#line 1673 "util.c" guint64 _tmp2_; - guint64 _tmp3_; -#line 177 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp2_ = count; #line 177 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp3_ = self->priv->last_count; + _tmp2_ = self->priv->last_count; #line 177 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = _tmp2_ - _tmp3_; -#line 1467 "util.c" + _tmp0_ = count - _tmp2_; +#line 1679 "util.c" } else { - guint64 _tmp4_; -#line 177 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp4_ = count; #line 177 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = _tmp4_; -#line 1474 "util.c" + _tmp0_ = count; +#line 1683 "util.c" } #line 177 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp5_ = self->priv->aggregate_count; + _tmp3_ = self->priv->aggregate_count; #line 177 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->aggregate_count = _tmp5_ + _tmp0_; + self->priv->aggregate_count = _tmp3_ + _tmp0_; #line 178 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp6_ = self->priv->aggregate_count; + _tmp4_ = self->priv->aggregate_count; #line 178 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp7_ = self->priv->grand_total; + _tmp5_ = self->priv->grand_total; #line 178 "/home/jens/Source/shotwell/src/core/util.vala" - if (_tmp6_ > _tmp7_) { -#line 1486 "util.c" - guint64 _tmp8_; + if (_tmp4_ > _tmp5_) { +#line 1695 "util.c" + guint64 _tmp6_; #line 179 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp8_ = self->priv->grand_total; + _tmp6_ = self->priv->grand_total; #line 179 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->aggregate_count = _tmp8_; -#line 1492 "util.c" + self->priv->aggregate_count = _tmp6_; +#line 1701 "util.c" } #line 182 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp9_ = count; -#line 182 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->last_count = _tmp9_; -#line 184 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp10_ = self->priv->wrapped_monitor; + self->priv->last_count = count; #line 184 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp10__target = self->priv->wrapped_monitor_target; + _tmp7_ = self->priv->wrapped_monitor; #line 184 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp11_ = self->priv->aggregate_count; + _tmp7__target = self->priv->wrapped_monitor_target; #line 184 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp12_ = self->priv->grand_total; + _tmp8_ = self->priv->aggregate_count; #line 184 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp13_ = _tmp10_ (_tmp11_, _tmp12_, TRUE, _tmp10__target); + _tmp9_ = self->priv->grand_total; #line 184 "/home/jens/Source/shotwell/src/core/util.vala" - result = _tmp13_; + result = _tmp7_ (_tmp8_, _tmp9_, TRUE, _tmp7__target); #line 184 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 1512 "util.c" +#line 1717 "util.c" } -static void value_aggregate_progress_monitor_init (GValue* value) { +static void +value_aggregate_progress_monitor_init (GValue* value) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1519 "util.c" +#line 1726 "util.c" } -static void value_aggregate_progress_monitor_free_value (GValue* value) { +static void +value_aggregate_progress_monitor_free_value (GValue* value) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (value->data[0].v_pointer) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" aggregate_progress_monitor_unref (value->data[0].v_pointer); -#line 1528 "util.c" +#line 1737 "util.c" } } -static void value_aggregate_progress_monitor_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_aggregate_progress_monitor_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (src_value->data[0].v_pointer) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" dest_value->data[0].v_pointer = aggregate_progress_monitor_ref (src_value->data[0].v_pointer); -#line 1538 "util.c" +#line 1750 "util.c" } else { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" dest_value->data[0].v_pointer = NULL; -#line 1542 "util.c" +#line 1754 "util.c" } } -static gpointer value_aggregate_progress_monitor_peek_pointer (const GValue* value) { +static gpointer +value_aggregate_progress_monitor_peek_pointer (const GValue* value) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return value->data[0].v_pointer; -#line 1550 "util.c" +#line 1764 "util.c" } -static gchar* value_aggregate_progress_monitor_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_aggregate_progress_monitor_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (collect_values[0].v_pointer) { -#line 1557 "util.c" +#line 1776 "util.c" AggregateProgressMonitor * object; object = collect_values[0].v_pointer; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (object->parent_instance.g_class == NULL) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1564 "util.c" +#line 1783 "util.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 159 "/home/jens/Source/shotwell/src/core/util.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 1568 "util.c" +#line 1787 "util.c" } #line 159 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = aggregate_progress_monitor_ref (object); -#line 1572 "util.c" +#line 1791 "util.c" } else { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1576 "util.c" +#line 1795 "util.c" } #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return NULL; -#line 1580 "util.c" +#line 1799 "util.c" } -static gchar* value_aggregate_progress_monitor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_aggregate_progress_monitor_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ AggregateProgressMonitor ** object_p; object_p = collect_values[0].v_pointer; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (!object_p) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1591 "util.c" +#line 1815 "util.c" } #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (!value->data[0].v_pointer) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" *object_p = NULL; -#line 1597 "util.c" +#line 1821 "util.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" *object_p = value->data[0].v_pointer; -#line 1601 "util.c" +#line 1825 "util.c" } else { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" *object_p = aggregate_progress_monitor_ref (value->data[0].v_pointer); -#line 1605 "util.c" +#line 1829 "util.c" } #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return NULL; -#line 1609 "util.c" +#line 1833 "util.c" } -GParamSpec* param_spec_aggregate_progress_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_aggregate_progress_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecAggregateProgressMonitor* spec; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_AGGREGATE_PROGRESS_MONITOR), NULL); @@ -1619,20 +1849,25 @@ GParamSpec* param_spec_aggregate_progress_monitor (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return G_PARAM_SPEC (spec); -#line 1623 "util.c" +#line 1853 "util.c" } -gpointer value_get_aggregate_progress_monitor (const GValue* value) { +gpointer +value_get_aggregate_progress_monitor (const GValue* value) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AGGREGATE_PROGRESS_MONITOR), NULL); #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return value->data[0].v_pointer; -#line 1632 "util.c" +#line 1864 "util.c" } -void value_set_aggregate_progress_monitor (GValue* value, gpointer v_object) { +void +value_set_aggregate_progress_monitor (GValue* value, + gpointer v_object) +{ AggregateProgressMonitor * old; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AGGREGATE_PROGRESS_MONITOR)); @@ -1648,22 +1883,25 @@ void value_set_aggregate_progress_monitor (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" aggregate_progress_monitor_ref (value->data[0].v_pointer); -#line 1652 "util.c" +#line 1887 "util.c" } else { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1656 "util.c" +#line 1891 "util.c" } #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (old) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" aggregate_progress_monitor_unref (old); -#line 1662 "util.c" +#line 1897 "util.c" } } -void value_take_aggregate_progress_monitor (GValue* value, gpointer v_object) { +void +value_take_aggregate_progress_monitor (GValue* value, + gpointer v_object) +{ AggregateProgressMonitor * old; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AGGREGATE_PROGRESS_MONITOR)); @@ -1677,33 +1915,37 @@ void value_take_aggregate_progress_monitor (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 159 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = v_object; -#line 1681 "util.c" +#line 1919 "util.c" } else { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1685 "util.c" +#line 1923 "util.c" } #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (old) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" aggregate_progress_monitor_unref (old); -#line 1691 "util.c" +#line 1929 "util.c" } } -static void aggregate_progress_monitor_class_init (AggregateProgressMonitorClass * klass) { +static void +aggregate_progress_monitor_class_init (AggregateProgressMonitorClass * klass) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" aggregate_progress_monitor_parent_class = g_type_class_peek_parent (klass); #line 159 "/home/jens/Source/shotwell/src/core/util.vala" ((AggregateProgressMonitorClass *) klass)->finalize = aggregate_progress_monitor_finalize; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_type_class_add_private (klass, sizeof (AggregateProgressMonitorPrivate)); -#line 1703 "util.c" +#line 1943 "util.c" } -static void aggregate_progress_monitor_instance_init (AggregateProgressMonitor * self) { +static void +aggregate_progress_monitor_instance_init (AggregateProgressMonitor * self) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" self->priv = AGGREGATE_PROGRESS_MONITOR_GET_PRIVATE (self); #line 162 "/home/jens/Source/shotwell/src/core/util.vala" @@ -1712,21 +1954,25 @@ static void aggregate_progress_monitor_instance_init (AggregateProgressMonitor * self->priv->last_count = G_MAXUINT64; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" self->ref_count = 1; -#line 1716 "util.c" +#line 1958 "util.c" } -static void aggregate_progress_monitor_finalize (AggregateProgressMonitor * obj) { +static void +aggregate_progress_monitor_finalize (AggregateProgressMonitor * obj) +{ AggregateProgressMonitor * self; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_AGGREGATE_PROGRESS_MONITOR, AggregateProgressMonitor); #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_signal_handlers_destroy (self); -#line 1726 "util.c" +#line 1970 "util.c" } -GType aggregate_progress_monitor_get_type (void) { +GType +aggregate_progress_monitor_get_type (void) +{ static volatile gsize aggregate_progress_monitor_type_id__volatile = 0; if (g_once_init_enter (&aggregate_progress_monitor_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_aggregate_progress_monitor_init, value_aggregate_progress_monitor_free_value, value_aggregate_progress_monitor_copy_value, value_aggregate_progress_monitor_peek_pointer, "p", value_aggregate_progress_monitor_collect_value, "p", value_aggregate_progress_monitor_lcopy_value }; @@ -1740,18 +1986,22 @@ GType aggregate_progress_monitor_get_type (void) { } -gpointer aggregate_progress_monitor_ref (gpointer instance) { +gpointer +aggregate_progress_monitor_ref (gpointer instance) +{ AggregateProgressMonitor * self; self = instance; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_atomic_int_inc (&self->ref_count); #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return instance; -#line 1751 "util.c" +#line 1999 "util.c" } -void aggregate_progress_monitor_unref (gpointer instance) { +void +aggregate_progress_monitor_unref (gpointer instance) +{ AggregateProgressMonitor * self; self = instance; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" @@ -1760,31 +2010,33 @@ void aggregate_progress_monitor_unref (gpointer instance) { AGGREGATE_PROGRESS_MONITOR_GET_CLASS (self)->finalize (self); #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1764 "util.c" +#line 2014 "util.c" } } -gboolean null_progress_monitor (guint64 count, guint64 total) { +gboolean +null_progress_monitor (guint64 count, + guint64 total) +{ gboolean result = FALSE; #line 190 "/home/jens/Source/shotwell/src/core/util.vala" result = TRUE; #line 190 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 1775 "util.c" +#line 2028 "util.c" } -gdouble degrees_to_radians (gdouble theta) { +gdouble +degrees_to_radians (gdouble theta) +{ gdouble result = 0.0; - gdouble _tmp0_; -#line 195 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = theta; #line 195 "/home/jens/Source/shotwell/src/core/util.vala" - result = _tmp0_ * (G_PI / 180.0); + result = theta * (G_PI / 180.0); #line 195 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 1788 "util.c" +#line 2040 "util.c" } diff --git a/src/data_imports/DataImportJob.c b/src/data_imports/DataImportJob.c index c9fdbcb..edc0967 100644 --- a/src/data_imports/DataImportJob.c +++ b/src/data_imports/DataImportJob.c @@ -1,4 +1,4 @@ -/* DataImportJob.c generated by valac 0.36.6, the Vala compiler +/* DataImportJob.c generated by valac 0.40.4, the Vala compiler * generated from DataImportJob.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -335,9 +336,15 @@ extern TagSourceCollection* tag_global; gpointer batch_import_job_ref (gpointer instance); void batch_import_job_unref (gpointer instance); -GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_job (GValue* value, gpointer v_object); -void value_take_batch_import_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_job (GValue* value, + gpointer v_object); +void value_take_batch_import_job (GValue* value, + gpointer v_object); gpointer value_get_batch_import_job (const GValue* value); GType batch_import_job_get_type (void) G_GNUC_CONST; GType duplicated_file_get_type (void) G_GNUC_CONST; @@ -347,40 +354,63 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; gpointer batch_import_roll_ref (gpointer instance); void batch_import_roll_unref (gpointer instance); -GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_roll (GValue* value, gpointer v_object); -void value_take_batch_import_roll (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_roll (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_roll (GValue* value, + gpointer v_object); +void value_take_batch_import_roll (GValue* value, + gpointer v_object); gpointer value_get_batch_import_roll (const GValue* value); GType batch_import_roll_get_type (void) G_GNUC_CONST; GType spit_data_imports_data_import_job_get_type (void) G_GNUC_CONST; gpointer spit_data_imports_data_import_source_ref (gpointer instance); void spit_data_imports_data_import_source_unref (gpointer instance); -GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void spit_data_imports_value_set_data_import_source (GValue* value, gpointer v_object); -void spit_data_imports_value_take_data_import_source (GValue* value, gpointer v_object); +GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void spit_data_imports_value_set_data_import_source (GValue* value, + gpointer v_object); +void spit_data_imports_value_take_data_import_source (GValue* value, + gpointer v_object); gpointer spit_data_imports_value_get_data_import_source (const GValue* value); GType spit_data_imports_data_import_source_get_type (void) G_GNUC_CONST; gpointer hierarchical_tag_index_ref (gpointer instance); void hierarchical_tag_index_unref (gpointer instance); -GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_hierarchical_tag_index (GValue* value, gpointer v_object); -void value_take_hierarchical_tag_index (GValue* value, gpointer v_object); +GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_hierarchical_tag_index (GValue* value, + gpointer v_object); +void value_take_hierarchical_tag_index (GValue* value, + gpointer v_object); gpointer value_get_hierarchical_tag_index (const GValue* value); GType hierarchical_tag_index_get_type (void) G_GNUC_CONST; #define SPIT_DATA_IMPORTS_DATA_IMPORT_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJobPrivate)) -enum { - SPIT_DATA_IMPORTS_DATA_IMPORT_JOB_DUMMY_PROPERTY -}; SpitDataImportsDataImportJob* spit_data_imports_data_import_job_new (SpitDataImportsDataImportSource* import_source); -SpitDataImportsDataImportJob* spit_data_imports_data_import_job_construct (GType object_type, SpitDataImportsDataImportSource* import_source); +SpitDataImportsDataImportJob* spit_data_imports_data_import_job_construct (GType object_type, + SpitDataImportsDataImportSource* import_source); BatchImportJob* batch_import_job_construct (GType object_type); GFile* spit_data_imports_data_import_source_get_file (SpitDataImportsDataImportSource* self); guint64 spit_data_imports_data_import_source_get_filesize (SpitDataImportsDataImportSource* self); time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDataImportSource* self); -static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_index (SpitDataImportsDataImportJob* self, SpitDataImportsImportableTag** src_tags, int src_tags_length1); -gchar* hierarchical_tag_utilities_join_path_components (gchar** path_components, int path_components_length1); -gchar** tag_prep_tag_names (gchar** names, int names_length1, int* result_length1); -static gchar** spit_data_imports_data_import_job_build_path_components (SpitDataImportsDataImportJob* self, SpitDataImportsImportableTag* tag, int* result_length1); +static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_index (SpitDataImportsDataImportJob* self, + SpitDataImportsImportableTag** src_tags, + int src_tags_length1); +gchar* hierarchical_tag_utilities_join_path_components (gchar** path_components, + int path_components_length1); +gchar** tag_prep_tag_names (gchar** names, + int names_length1, + int* result_length1); +static gchar** spit_data_imports_data_import_job_build_path_components (SpitDataImportsDataImportJob* self, + SpitDataImportsImportableTag* tag, + int* result_length1); #define TAG_PATH_SEPARATOR_STRING "/" GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path); HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_paths); @@ -391,11 +421,20 @@ static gchar* spit_data_imports_data_import_job_real_get_source_identifier (Batc static gboolean spit_data_imports_data_import_job_real_is_directory (BatchImportJob* base); static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJob* base); static gchar* spit_data_imports_data_import_job_real_get_path (BatchImportJob* base); -static void spit_data_imports_data_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated); -static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file); -static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy_to_library, GError** error); +static void spit_data_imports_data_import_job_real_set_associated (BatchImportJob* base, + BatchImportJob* associated); +static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base, + guint64* filesize, + GFile* * file); +static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base, + GFile* * file_to_import, + gboolean* copy_to_library, + GError** error); SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_photo (SpitDataImportsDataImportSource* self); -static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob* base, MediaSource* source, BatchImportRoll* import_roll, GError** error); +static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob* base, + MediaSource* source, + BatchImportRoll* import_roll, + GError** error); GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; @@ -406,349 +445,358 @@ GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_p gchar* hierarchical_tag_utilities_hierarchical_to_flat (const gchar* path); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType tag_source_collection_get_type (void) G_GNUC_CONST; -gboolean tag_source_collection_exists (TagSourceCollection* self, const gchar* name, gboolean treat_htags_as_root); +gboolean tag_source_collection_exists (TagSourceCollection* self, + const gchar* name, + gboolean treat_htags_as_root); void tag_promote (Tag* self); -void tag_attach (Tag* self, MediaSource* source); +void tag_attach (Tag* self, + MediaSource* source); GType prepare_input_text_options_get_type (void) G_GNUC_CONST; -gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length); +gchar* prepare_input_text (const gchar* text, + PrepareInputTextOptions options, + gint dest_length); GType view_collection_get_type (void) G_GNUC_CONST; -void event_generate_single_event (MediaSource* media, ViewCollection* events_so_far, const gchar* event_name); +void event_generate_single_event (MediaSource* media, + ViewCollection* events_so_far, + const gchar* event_name); GType import_id_get_type (void) G_GNUC_CONST; ImportID* import_id_dup (const ImportID* self); void import_id_free (ImportID* self); GType rating_get_type (void) G_GNUC_CONST; Rating rating_unserialize (gint value); -void media_source_set_rating (MediaSource* self, Rating rating); -void media_source_set_title (MediaSource* self, const gchar* title); +void media_source_set_rating (MediaSource* self, + Rating rating); +void media_source_set_title (MediaSource* self, + const gchar* title); GType dateable_get_type (void) G_GNUC_CONST; -void dateable_set_exposure_time (Dateable* self, time_t target_time); -void photo_set_import_id (Photo* self, ImportID* import_id); +void dateable_set_exposure_time (Dateable* self, + time_t target_time); +void photo_set_import_id (Photo* self, + ImportID* import_id); gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag); static void spit_data_imports_data_import_job_finalize (BatchImportJob * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -static gpointer _spit_data_imports_data_import_source_ref0 (gpointer self) { +static gpointer +_spit_data_imports_data_import_source_ref0 (gpointer self) +{ #line 21 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" return self ? spit_data_imports_data_import_source_ref (self) : NULL; -#line 445 "DataImportJob.c" +#line 507 "DataImportJob.c" } -SpitDataImportsDataImportJob* spit_data_imports_data_import_job_construct (GType object_type, SpitDataImportsDataImportSource* import_source) { +SpitDataImportsDataImportJob* +spit_data_imports_data_import_job_construct (GType object_type, + SpitDataImportsDataImportSource* import_source) +{ SpitDataImportsDataImportJob* self = NULL; SpitDataImportsDataImportSource* _tmp0_; - SpitDataImportsDataImportSource* _tmp1_; - SpitDataImportsDataImportSource* _tmp2_; - GFile* _tmp3_; - SpitDataImportsDataImportSource* _tmp4_; - guint64 _tmp5_; - SpitDataImportsDataImportSource* _tmp6_; - time_t _tmp7_; + GFile* _tmp1_; #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (import_source), NULL); #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" self = (SpitDataImportsDataImportJob*) batch_import_job_construct (object_type); #line 21 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp0_ = import_source; -#line 21 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp1_ = _spit_data_imports_data_import_source_ref0 (_tmp0_); + _tmp0_ = _spit_data_imports_data_import_source_ref0 (import_source); #line 21 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _spit_data_imports_data_import_source_unref0 (self->priv->import_source); #line 21 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - self->priv->import_source = _tmp1_; -#line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp2_ = import_source; + self->priv->import_source = _tmp0_; #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp3_ = spit_data_imports_data_import_source_get_file (_tmp2_); + _tmp1_ = spit_data_imports_data_import_source_get_file (import_source); #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_object_unref0 (self->priv->src_file); #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - self->priv->src_file = _tmp3_; -#line 25 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp4_ = import_source; -#line 25 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp5_ = spit_data_imports_data_import_source_get_filesize (_tmp4_); + self->priv->src_file = _tmp1_; #line 25 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - self->priv->filesize = _tmp5_; + self->priv->filesize = spit_data_imports_data_import_source_get_filesize (import_source); #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp6_ = import_source; -#line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp7_ = spit_data_imports_data_import_source_get_exposure_time (_tmp6_); -#line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - self->priv->exposure_time = _tmp7_; + self->priv->exposure_time = spit_data_imports_data_import_source_get_exposure_time (import_source); #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" return self; -#line 493 "DataImportJob.c" +#line 540 "DataImportJob.c" } -SpitDataImportsDataImportJob* spit_data_imports_data_import_job_new (SpitDataImportsDataImportSource* import_source) { +SpitDataImportsDataImportJob* +spit_data_imports_data_import_job_new (SpitDataImportsDataImportSource* import_source) +{ #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" return spit_data_imports_data_import_job_construct (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, import_source); -#line 500 "DataImportJob.c" +#line 549 "DataImportJob.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" return self ? g_object_ref (self) : NULL; -#line 507 "DataImportJob.c" +#line 558 "DataImportJob.c" } -static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_index (SpitDataImportsDataImportJob* self, SpitDataImportsImportableTag** src_tags, int src_tags_length1) { +static HierarchicalTagIndex* +spit_data_imports_data_import_job_build_exclusion_index (SpitDataImportsDataImportJob* self, + SpitDataImportsImportableTag** src_tags, + int src_tags_length1) +{ HierarchicalTagIndex* result = NULL; GeeSet* detected_htags = NULL; GeeHashSet* _tmp0_; - SpitDataImportsImportableTag** _tmp1_; - gint _tmp1__length1; - HierarchicalTagIndex* _tmp33_ = NULL; - GeeSet* _tmp34_; - gint _tmp35_; - gint _tmp36_; + HierarchicalTagIndex* _tmp31_ = NULL; + GeeSet* _tmp32_; + gint _tmp33_; + gint _tmp34_; #line 29 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_JOB (self), NULL); #line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" detected_htags = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet); -#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp1_ = src_tags; -#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp1__length1 = src_tags_length1; -#line 531 "DataImportJob.c" +#line 580 "DataImportJob.c" { SpitDataImportsImportableTag** src_tag_collection = NULL; gint src_tag_collection_length1 = 0; gint _src_tag_collection_size_ = 0; gint src_tag_it = 0; #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - src_tag_collection = _tmp1_; + src_tag_collection = src_tags; #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - src_tag_collection_length1 = _tmp1__length1; + src_tag_collection_length1 = src_tags_length1; #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - for (src_tag_it = 0; src_tag_it < _tmp1__length1; src_tag_it = src_tag_it + 1) { -#line 543 "DataImportJob.c" - SpitDataImportsImportableTag* _tmp2_; + for (src_tag_it = 0; src_tag_it < src_tags_length1; src_tag_it = src_tag_it + 1) { +#line 592 "DataImportJob.c" + SpitDataImportsImportableTag* _tmp1_; SpitDataImportsImportableTag* src_tag = NULL; #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp2_ = _g_object_ref0 (src_tag_collection[src_tag_it]); + _tmp1_ = _g_object_ref0 (src_tag_collection[src_tag_it]); #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - src_tag = _tmp2_; -#line 550 "DataImportJob.c" + src_tag = _tmp1_; +#line 599 "DataImportJob.c" { gchar* prepped = NULL; - SpitDataImportsImportableTag* _tmp3_; - gint _tmp4_; + SpitDataImportsImportableTag* _tmp2_; + gint _tmp3_; + gchar** _tmp4_; gchar** _tmp5_; - gchar** _tmp6_; - gint _tmp6__length1; - gint _tmp7_; + gint _tmp5__length1; + gint _tmp6_; + gchar** _tmp7_; gchar** _tmp8_; - gchar** _tmp9_; - gint _tmp9__length1; + gint _tmp8__length1; + gchar* _tmp9_; gchar* _tmp10_; - gchar* _tmp11_; - gboolean _tmp12_ = FALSE; - const gchar* _tmp13_; + gboolean _tmp11_ = FALSE; + const gchar* _tmp12_; #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp3_ = src_tag; + _tmp2_ = src_tag; #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp5_ = spit_data_imports_data_import_job_build_path_components (self, _tmp3_, &_tmp4_); + _tmp4_ = spit_data_imports_data_import_job_build_path_components (self, _tmp2_, &_tmp3_); #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp6__length1 = _tmp4_; + _tmp5__length1 = _tmp3_; #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp8_ = tag_prep_tag_names (_tmp6_, _tmp4_, &_tmp7_); + _tmp7_ = tag_prep_tag_names (_tmp5_, _tmp3_, &_tmp6_); #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp9__length1 = _tmp7_; + _tmp8__length1 = _tmp6_; #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp10_ = hierarchical_tag_utilities_join_path_components (_tmp9_, _tmp7_); + _tmp9_ = hierarchical_tag_utilities_join_path_components (_tmp8_, _tmp6_); #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp9_ = (_vala_array_free (_tmp9_, _tmp9__length1, (GDestroyNotify) g_free), NULL); + _tmp8_ = (_vala_array_free (_tmp8_, _tmp8__length1, (GDestroyNotify) g_free), NULL); #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL); + _tmp5_ = (_vala_array_free (_tmp5_, _tmp5__length1, (GDestroyNotify) g_free), NULL); #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - prepped = _tmp11_; + prepped = _tmp10_; #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp13_ = prepped; + _tmp12_ = prepped; #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - if (_tmp13_ != NULL) { -#line 594 "DataImportJob.c" - const gchar* _tmp14_; - gboolean _tmp15_; + if (_tmp12_ != NULL) { +#line 643 "DataImportJob.c" + const gchar* _tmp13_; #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp14_ = prepped; + _tmp13_ = prepped; #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp15_ = g_str_has_prefix (_tmp14_, TAG_PATH_SEPARATOR_STRING); -#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp12_ = _tmp15_; -#line 603 "DataImportJob.c" + _tmp11_ = g_str_has_prefix (_tmp13_, TAG_PATH_SEPARATOR_STRING); +#line 649 "DataImportJob.c" } else { #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp12_ = FALSE; -#line 607 "DataImportJob.c" + _tmp11_ = FALSE; +#line 653 "DataImportJob.c" } #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - if (_tmp12_) { -#line 611 "DataImportJob.c" - GeeSet* _tmp16_; - const gchar* _tmp17_; + if (_tmp11_) { +#line 657 "DataImportJob.c" + GeeSet* _tmp14_; + const gchar* _tmp15_; GeeList* parents = NULL; - const gchar* _tmp18_; - GeeList* _tmp19_; + const gchar* _tmp16_; + GeeList* _tmp17_; #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp16_ = detected_htags; + _tmp14_ = detected_htags; #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp17_ = prepped; + _tmp15_ = prepped; #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_); #line 42 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp18_ = prepped; + _tmp16_ = prepped; #line 42 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp19_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp18_); + _tmp17_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp16_); #line 42 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - parents = _tmp19_; -#line 629 "DataImportJob.c" + parents = _tmp17_; +#line 675 "DataImportJob.c" { GeeList* _parent_list = NULL; - GeeList* _tmp20_; - GeeList* _tmp21_; + GeeList* _tmp18_; + GeeList* _tmp19_; gint _parent_size = 0; - GeeList* _tmp22_; - gint _tmp23_; - gint _tmp24_; + GeeList* _tmp20_; + gint _tmp21_; + gint _tmp22_; gint _parent_index = 0; #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp20_ = parents; + _tmp18_ = parents; #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp21_ = _g_object_ref0 (_tmp20_); + _tmp19_ = _g_object_ref0 (_tmp18_); #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _parent_list = _tmp21_; + _parent_list = _tmp19_; #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp22_ = _parent_list; + _tmp20_ = _parent_list; #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp23_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp24_ = _tmp23_; + _tmp22_ = _tmp21_; #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _parent_size = _tmp24_; + _parent_size = _tmp22_; #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _parent_index = -1; #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" while (TRUE) { -#line 657 "DataImportJob.c" +#line 703 "DataImportJob.c" + gint _tmp23_; + gint _tmp24_; gint _tmp25_; - gint _tmp26_; - gint _tmp27_; gchar* parent = NULL; - GeeList* _tmp28_; - gint _tmp29_; - gpointer _tmp30_; - GeeSet* _tmp31_; - const gchar* _tmp32_; + GeeList* _tmp26_; + gint _tmp27_; + gpointer _tmp28_; + GeeSet* _tmp29_; + const gchar* _tmp30_; #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp25_ = _parent_index; + _tmp23_ = _parent_index; #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _parent_index = _tmp25_ + 1; + _parent_index = _tmp23_ + 1; #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp26_ = _parent_index; + _tmp24_ = _parent_index; #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp27_ = _parent_size; + _tmp25_ = _parent_size; #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - if (!(_tmp26_ < _tmp27_)) { + if (!(_tmp24_ < _tmp25_)) { #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" break; -#line 679 "DataImportJob.c" +#line 725 "DataImportJob.c" } #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp28_ = _parent_list; + _tmp26_ = _parent_list; #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp29_ = _parent_index; + _tmp27_ = _parent_index; #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp30_ = gee_list_get (_tmp28_, _tmp29_); + _tmp28_ = gee_list_get (_tmp26_, _tmp27_); #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - parent = (gchar*) _tmp30_; + parent = (gchar*) _tmp28_; #line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp31_ = detected_htags; + _tmp29_ = detected_htags; #line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp32_ = parent; + _tmp30_ = parent; #line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection), _tmp32_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), _tmp30_); #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_free0 (parent); -#line 697 "DataImportJob.c" +#line 743 "DataImportJob.c" } #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_object_unref0 (_parent_list); -#line 701 "DataImportJob.c" +#line 747 "DataImportJob.c" } #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_object_unref0 (parents); -#line 705 "DataImportJob.c" +#line 751 "DataImportJob.c" } #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_free0 (prepped); #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_object_unref0 (src_tag); -#line 711 "DataImportJob.c" +#line 757 "DataImportJob.c" } } } #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp34_ = detected_htags; + _tmp32_ = detected_htags; #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp35_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp33_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection)); #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp36_ = _tmp35_; + _tmp34_ = _tmp33_; #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - if (_tmp36_ > 0) { -#line 723 "DataImportJob.c" - GeeSet* _tmp37_; - HierarchicalTagIndex* _tmp38_; + if (_tmp34_ > 0) { +#line 769 "DataImportJob.c" + GeeSet* _tmp35_; + HierarchicalTagIndex* _tmp36_; #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp37_ = detected_htags; + _tmp35_ = detected_htags; #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp38_ = hierarchical_tag_index_from_paths (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp36_ = hierarchical_tag_index_from_paths (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection)); #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _hierarchical_tag_index_unref0 (_tmp33_); + _hierarchical_tag_index_unref0 (_tmp31_); #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp33_ = _tmp38_; -#line 734 "DataImportJob.c" + _tmp31_ = _tmp36_; +#line 780 "DataImportJob.c" } else { #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _hierarchical_tag_index_unref0 (_tmp33_); + _hierarchical_tag_index_unref0 (_tmp31_); #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp33_ = NULL; -#line 740 "DataImportJob.c" + _tmp31_ = NULL; +#line 786 "DataImportJob.c" } #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - result = _tmp33_; + result = _tmp31_; #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_object_unref0 (detected_htags); #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" return result; -#line 748 "DataImportJob.c" +#line 794 "DataImportJob.c" } -time_t spit_data_imports_data_import_job_get_exposure_time (SpitDataImportsDataImportJob* self) { +time_t +spit_data_imports_data_import_job_get_exposure_time (SpitDataImportsDataImportJob* self) +{ time_t result = 0; time_t _tmp0_; #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" @@ -759,11 +807,13 @@ time_t spit_data_imports_data_import_job_get_exposure_time (SpitDataImportsDataI result = _tmp0_; #line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" return result; -#line 763 "DataImportJob.c" +#line 811 "DataImportJob.c" } -static gchar* spit_data_imports_data_import_job_real_get_dest_identifier (BatchImportJob* base) { +static gchar* +spit_data_imports_data_import_job_real_get_dest_identifier (BatchImportJob* base) +{ SpitDataImportsDataImportJob * self; gchar* result = NULL; SpitDataImportsDataImportSource* _tmp0_; @@ -778,11 +828,13 @@ static gchar* spit_data_imports_data_import_job_real_get_dest_identifier (BatchI result = _tmp1_; #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" return result; -#line 782 "DataImportJob.c" +#line 832 "DataImportJob.c" } -static gchar* spit_data_imports_data_import_job_real_get_source_identifier (BatchImportJob* base) { +static gchar* +spit_data_imports_data_import_job_real_get_source_identifier (BatchImportJob* base) +{ SpitDataImportsDataImportJob * self; gchar* result = NULL; SpitDataImportsDataImportSource* _tmp0_; @@ -797,11 +849,13 @@ static gchar* spit_data_imports_data_import_job_real_get_source_identifier (Batc result = _tmp1_; #line 60 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" return result; -#line 801 "DataImportJob.c" +#line 853 "DataImportJob.c" } -static gboolean spit_data_imports_data_import_job_real_is_directory (BatchImportJob* base) { +static gboolean +spit_data_imports_data_import_job_real_is_directory (BatchImportJob* base) +{ SpitDataImportsDataImportJob * self; gboolean result = FALSE; #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" @@ -810,11 +864,13 @@ static gboolean spit_data_imports_data_import_job_real_is_directory (BatchImport result = FALSE; #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" return result; -#line 814 "DataImportJob.c" +#line 868 "DataImportJob.c" } -static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJob* base) { +static gchar* +spit_data_imports_data_import_job_real_get_basename (BatchImportJob* base) +{ SpitDataImportsDataImportJob * self; gchar* result = NULL; GFile* _tmp0_; @@ -829,11 +885,13 @@ static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJo result = _tmp1_; #line 68 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" return result; -#line 833 "DataImportJob.c" +#line 889 "DataImportJob.c" } -static gchar* spit_data_imports_data_import_job_real_get_path (BatchImportJob* base) { +static gchar* +spit_data_imports_data_import_job_real_get_path (BatchImportJob* base) +{ SpitDataImportsDataImportJob * self; gchar* result = NULL; GFile* _tmp0_; @@ -859,38 +917,44 @@ static gchar* spit_data_imports_data_import_job_real_get_path (BatchImportJob* b result = _tmp4_; #line 72 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" return result; -#line 863 "DataImportJob.c" +#line 921 "DataImportJob.c" } -static gpointer _batch_import_job_ref0 (gpointer self) { +static gpointer +_batch_import_job_ref0 (gpointer self) +{ #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" return self ? batch_import_job_ref (self) : NULL; -#line 870 "DataImportJob.c" +#line 930 "DataImportJob.c" } -static void spit_data_imports_data_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated) { +static void +spit_data_imports_data_import_job_real_set_associated (BatchImportJob* base, + BatchImportJob* associated) +{ SpitDataImportsDataImportJob * self; - BatchImportJob* _tmp0_; - SpitDataImportsDataImportJob* _tmp1_; + SpitDataImportsDataImportJob* _tmp0_; #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob); #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" g_return_if_fail (IS_BATCH_IMPORT_JOB (associated)); #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp0_ = associated; -#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp1_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB) ? ((SpitDataImportsDataImportJob*) _tmp0_) : NULL); + _tmp0_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (associated, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB) ? ((SpitDataImportsDataImportJob*) associated) : NULL); #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _batch_import_job_unref0 (self->priv->associated); #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - self->priv->associated = _tmp1_; -#line 890 "DataImportJob.c" + self->priv->associated = _tmp0_; +#line 950 "DataImportJob.c" } -static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file) { +static gboolean +spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base, + guint64* filesize, + GFile* * file) +{ SpitDataImportsDataImportJob * self; guint64 _vala_filesize = 0ULL; GFile* _vala_file = NULL; @@ -912,25 +976,30 @@ static gboolean spit_data_imports_data_import_job_real_determine_file_size (Batc if (filesize) { #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" *filesize = _vala_filesize; -#line 916 "DataImportJob.c" +#line 980 "DataImportJob.c" } #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" if (file) { #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" *file = _vala_file; -#line 922 "DataImportJob.c" +#line 986 "DataImportJob.c" } else { #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_object_unref0 (_vala_file); -#line 926 "DataImportJob.c" +#line 990 "DataImportJob.c" } #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" return result; -#line 930 "DataImportJob.c" +#line 994 "DataImportJob.c" } -static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy_to_library, GError** error) { +static gboolean +spit_data_imports_data_import_job_real_prepare (BatchImportJob* base, + GFile* * file_to_import, + gboolean* copy_to_library, + GError** error) +{ SpitDataImportsDataImportJob * self; GFile* _vala_file_to_import = NULL; gboolean _vala_copy_to_library = FALSE; @@ -985,66 +1054,68 @@ static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* if (file_to_import) { #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" *file_to_import = _vala_file_to_import; -#line 989 "DataImportJob.c" +#line 1058 "DataImportJob.c" } else { #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_object_unref0 (_vala_file_to_import); -#line 993 "DataImportJob.c" +#line 1062 "DataImportJob.c" } #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" if (copy_to_library) { #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" *copy_to_library = _vala_copy_to_library; -#line 999 "DataImportJob.c" +#line 1068 "DataImportJob.c" } #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" return result; -#line 1003 "DataImportJob.c" +#line 1072 "DataImportJob.c" } -static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob* base, MediaSource* source, BatchImportRoll* import_roll, GError** error) { +static gboolean +spit_data_imports_data_import_job_real_complete (BatchImportJob* base, + MediaSource* source, + BatchImportRoll* import_roll, + GError** error) +{ SpitDataImportsDataImportJob * self; gboolean result = FALSE; LibraryPhoto* photo = NULL; - MediaSource* _tmp0_; + LibraryPhoto* _tmp0_; LibraryPhoto* _tmp1_; - LibraryPhoto* _tmp2_; SpitDataImportsImportableMediaItem* src_photo = NULL; - SpitDataImportsDataImportSource* _tmp3_; - SpitDataImportsImportableMediaItem* _tmp4_; - HierarchicalTagIndex* _tmp5_; + SpitDataImportsDataImportSource* _tmp2_; + SpitDataImportsImportableMediaItem* _tmp3_; + HierarchicalTagIndex* _tmp4_; SpitDataImportsImportableTag** src_tags = NULL; - SpitDataImportsImportableMediaItem* _tmp17_; - gint _tmp18_; - SpitDataImportsImportableTag** _tmp19_; + SpitDataImportsImportableMediaItem* _tmp15_; + gint _tmp16_; + SpitDataImportsImportableTag** _tmp17_; gint src_tags_length1; gint _src_tags_size_; - SpitDataImportsImportableTag** _tmp20_; - gint _tmp20__length1; + SpitDataImportsImportableTag** _tmp18_; + gint _tmp18__length1; SpitDataImportsImportableEvent* src_event = NULL; - SpitDataImportsImportableMediaItem* _tmp61_; - SpitDataImportsImportableEvent* _tmp62_; - SpitDataImportsImportableEvent* _tmp63_; + SpitDataImportsImportableMediaItem* _tmp57_; + SpitDataImportsImportableEvent* _tmp58_; + SpitDataImportsImportableEvent* _tmp59_; Rating dst_rating = 0; SpitDataImportsImportableRating* src_rating = NULL; - SpitDataImportsImportableMediaItem* _tmp74_; - SpitDataImportsImportableRating* _tmp75_; - SpitDataImportsImportableRating* _tmp76_; - gboolean _tmp77_; - LibraryPhoto* _tmp83_; - Rating _tmp84_; + SpitDataImportsImportableMediaItem* _tmp69_; + SpitDataImportsImportableRating* _tmp70_; + SpitDataImportsImportableRating* _tmp71_; + LibraryPhoto* _tmp74_; + Rating _tmp75_; gchar* title = NULL; - SpitDataImportsImportableMediaItem* _tmp85_; - gchar* _tmp86_; - const gchar* _tmp87_; + SpitDataImportsImportableMediaItem* _tmp76_; + gchar* _tmp77_; + const gchar* _tmp78_; time_t* date_time = NULL; - SpitDataImportsImportableMediaItem* _tmp90_; - time_t* _tmp91_; - time_t* _tmp92_; - LibraryPhoto* _tmp95_; - BatchImportRoll* _tmp96_; - ImportID _tmp97_; + SpitDataImportsImportableMediaItem* _tmp81_; + time_t* _tmp82_; + time_t* _tmp83_; + LibraryPhoto* _tmp86_; + ImportID _tmp87_; #line 95 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob); #line 95 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" @@ -1052,291 +1123,280 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob* #line 95 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" g_return_val_if_fail (IS_BATCH_IMPORT_ROLL (import_roll), FALSE); #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp0_ = source; -#line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) source) : NULL); #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - photo = _tmp1_; + photo = _tmp0_; #line 97 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp2_ = photo; + _tmp1_ = photo; #line 97 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" result = FALSE; #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_object_unref0 (photo); #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" return result; -#line 1071 "DataImportJob.c" +#line 1140 "DataImportJob.c" } #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp3_ = self->priv->import_source; + _tmp2_ = self->priv->import_source; #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp4_ = spit_data_imports_data_import_source_get_photo (_tmp3_); + _tmp3_ = spit_data_imports_data_import_source_get_photo (_tmp2_); #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - src_photo = _tmp4_; + src_photo = _tmp3_; #line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp5_ = self->priv->detected_htags; + _tmp4_ = self->priv->detected_htags; #line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - if (_tmp5_ != NULL) { -#line 1083 "DataImportJob.c" + if (_tmp4_ != NULL) { +#line 1152 "DataImportJob.c" GeeCollection* paths = NULL; - HierarchicalTagIndex* _tmp6_; - GeeCollection* _tmp7_; + HierarchicalTagIndex* _tmp5_; + GeeCollection* _tmp6_; #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp6_ = self->priv->detected_htags; + _tmp5_ = self->priv->detected_htags; #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp7_ = hierarchical_tag_index_get_all_paths (_tmp6_); + _tmp6_ = hierarchical_tag_index_get_all_paths (_tmp5_); #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - paths = _tmp7_; -#line 1093 "DataImportJob.c" + paths = _tmp6_; +#line 1162 "DataImportJob.c" { GeeIterator* _path_it = NULL; - GeeCollection* _tmp8_; - GeeIterator* _tmp9_; + GeeCollection* _tmp7_; + GeeIterator* _tmp8_; #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp8_ = paths; + _tmp7_ = paths; #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _path_it = _tmp9_; + _path_it = _tmp8_; #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" while (TRUE) { -#line 1106 "DataImportJob.c" - GeeIterator* _tmp10_; - gboolean _tmp11_; +#line 1175 "DataImportJob.c" + GeeIterator* _tmp9_; gchar* path = NULL; - GeeIterator* _tmp12_; - gpointer _tmp13_; - const gchar* _tmp14_; - Tag* _tmp15_; - Tag* _tmp16_; -#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp10_ = _path_it; + GeeIterator* _tmp10_; + gpointer _tmp11_; + const gchar* _tmp12_; + Tag* _tmp13_; + Tag* _tmp14_; #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp11_ = gee_iterator_next (_tmp10_); + _tmp9_ = _path_it; #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - if (!_tmp11_) { + if (!gee_iterator_next (_tmp9_)) { #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" break; -#line 1123 "DataImportJob.c" +#line 1189 "DataImportJob.c" } #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp12_ = _path_it; + _tmp10_ = _path_it; #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp13_ = gee_iterator_get (_tmp12_); + _tmp11_ = gee_iterator_get (_tmp10_); #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - path = (gchar*) _tmp13_; + path = (gchar*) _tmp11_; #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp14_ = path; + _tmp12_ = path; #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp15_ = tag_for_path (_tmp14_); + _tmp13_ = tag_for_path (_tmp12_); #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp16_ = _tmp15_; + _tmp14_ = _tmp13_; #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp14_); #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_free0 (path); -#line 1141 "DataImportJob.c" +#line 1207 "DataImportJob.c" } #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_object_unref0 (_path_it); -#line 1145 "DataImportJob.c" +#line 1211 "DataImportJob.c" } #line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_object_unref0 (paths); -#line 1149 "DataImportJob.c" +#line 1215 "DataImportJob.c" } #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp17_ = src_photo; + _tmp15_ = src_photo; #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp19_ = spit_data_imports_importable_media_item_get_tags (_tmp17_, &_tmp18_); + _tmp17_ = spit_data_imports_importable_media_item_get_tags (_tmp15_, &_tmp16_); #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - src_tags = _tmp19_; + src_tags = _tmp17_; #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - src_tags_length1 = _tmp18_; + src_tags_length1 = _tmp16_; #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _src_tags_size_ = src_tags_length1; #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp20_ = src_tags; + _tmp18_ = src_tags; #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp20__length1 = src_tags_length1; -#line 1165 "DataImportJob.c" + _tmp18__length1 = src_tags_length1; +#line 1231 "DataImportJob.c" { SpitDataImportsImportableTag** src_tag_collection = NULL; gint src_tag_collection_length1 = 0; gint _src_tag_collection_size_ = 0; gint src_tag_it = 0; #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - src_tag_collection = _tmp20_; + src_tag_collection = _tmp18_; #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - src_tag_collection_length1 = _tmp20__length1; + src_tag_collection_length1 = _tmp18__length1; #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - for (src_tag_it = 0; src_tag_it < _tmp20__length1; src_tag_it = src_tag_it + 1) { -#line 1177 "DataImportJob.c" - SpitDataImportsImportableTag* _tmp21_; + for (src_tag_it = 0; src_tag_it < _tmp18__length1; src_tag_it = src_tag_it + 1) { +#line 1243 "DataImportJob.c" + SpitDataImportsImportableTag* _tmp19_; SpitDataImportsImportableTag* src_tag = NULL; #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp21_ = _g_object_ref0 (src_tag_collection[src_tag_it]); + _tmp19_ = _g_object_ref0 (src_tag_collection[src_tag_it]); #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - src_tag = _tmp21_; -#line 1184 "DataImportJob.c" + src_tag = _tmp19_; +#line 1250 "DataImportJob.c" { gchar* prepped = NULL; - SpitDataImportsImportableTag* _tmp22_; - gint _tmp23_; - gchar** _tmp24_; + SpitDataImportsImportableTag* _tmp20_; + gint _tmp21_; + gchar** _tmp22_; + gchar** _tmp23_; + gint _tmp23__length1; + gint _tmp24_; gchar** _tmp25_; - gint _tmp25__length1; - gint _tmp26_; - gchar** _tmp27_; - gchar** _tmp28_; - gint _tmp28__length1; - gchar* _tmp29_; - gchar* _tmp30_; - const gchar* _tmp31_; + gchar** _tmp26_; + gint _tmp26__length1; + gchar* _tmp27_; + gchar* _tmp28_; + const gchar* _tmp29_; #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp22_ = src_tag; + _tmp20_ = src_tag; #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp24_ = spit_data_imports_data_import_job_build_path_components (self, _tmp22_, &_tmp23_); + _tmp22_ = spit_data_imports_data_import_job_build_path_components (self, _tmp20_, &_tmp21_); #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp25_ = _tmp24_; + _tmp23_ = _tmp22_; #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp25__length1 = _tmp23_; + _tmp23__length1 = _tmp21_; #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp27_ = tag_prep_tag_names (_tmp25_, _tmp23_, &_tmp26_); + _tmp25_ = tag_prep_tag_names (_tmp23_, _tmp21_, &_tmp24_); #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp28_ = _tmp27_; + _tmp26_ = _tmp25_; #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp28__length1 = _tmp26_; + _tmp26__length1 = _tmp24_; #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp29_ = hierarchical_tag_utilities_join_path_components (_tmp28_, _tmp26_); + _tmp27_ = hierarchical_tag_utilities_join_path_components (_tmp26_, _tmp24_); #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp30_ = _tmp29_; + _tmp28_ = _tmp27_; #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp28_ = (_vala_array_free (_tmp28_, _tmp28__length1, (GDestroyNotify) g_free), NULL); + _tmp26_ = (_vala_array_free (_tmp26_, _tmp26__length1, (GDestroyNotify) g_free), NULL); #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp25_ = (_vala_array_free (_tmp25_, _tmp25__length1, (GDestroyNotify) g_free), NULL); + _tmp23_ = (_vala_array_free (_tmp23_, _tmp23__length1, (GDestroyNotify) g_free), NULL); #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - prepped = _tmp30_; + prepped = _tmp28_; #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp31_ = prepped; + _tmp29_ = prepped; #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - if (_tmp31_ != NULL) { -#line 1227 "DataImportJob.c" - const gchar* _tmp32_; - GeeList* _tmp33_; - GeeList* _tmp34_; - gint _tmp35_; - gint _tmp36_; - gboolean _tmp37_; - const gchar* _tmp57_; - Tag* _tmp58_; - Tag* _tmp59_; - LibraryPhoto* _tmp60_; + if (_tmp29_ != NULL) { +#line 1293 "DataImportJob.c" + const gchar* _tmp30_; + GeeList* _tmp31_; + GeeList* _tmp32_; + gint _tmp33_; + gint _tmp34_; + gboolean _tmp35_; + const gchar* _tmp53_; + Tag* _tmp54_; + Tag* _tmp55_; + LibraryPhoto* _tmp56_; #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp32_ = prepped; + _tmp30_ = prepped; #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp33_ = hierarchical_tag_utilities_enumerate_path_components (_tmp32_); + _tmp31_ = hierarchical_tag_utilities_enumerate_path_components (_tmp30_); #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp34_ = _tmp33_; + _tmp32_ = _tmp31_; #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp35_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp33_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection)); #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp36_ = _tmp35_; + _tmp34_ = _tmp33_; #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp37_ = _tmp36_ == 1; + _tmp35_ = _tmp34_ == 1; #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _g_object_unref0 (_tmp34_); + _g_object_unref0 (_tmp32_); #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - if (_tmp37_) { -#line 1254 "DataImportJob.c" - const gchar* _tmp38_; - gboolean _tmp39_; + if (_tmp35_) { +#line 1320 "DataImportJob.c" + const gchar* _tmp36_; #line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp38_ = prepped; + _tmp36_ = prepped; #line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp39_ = g_str_has_prefix (_tmp38_, TAG_PATH_SEPARATOR_STRING); -#line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - if (_tmp39_) { -#line 1263 "DataImportJob.c" - const gchar* _tmp40_; - gchar* _tmp41_; + if (g_str_has_prefix (_tmp36_, TAG_PATH_SEPARATOR_STRING)) { +#line 1326 "DataImportJob.c" + const gchar* _tmp37_; + gchar* _tmp38_; #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp40_ = prepped; + _tmp37_ = prepped; #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp41_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp40_); + _tmp38_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp37_); #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_free0 (prepped); #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - prepped = _tmp41_; -#line 1274 "DataImportJob.c" + prepped = _tmp38_; +#line 1337 "DataImportJob.c" } } else { GeeList* parents = NULL; - const gchar* _tmp42_; - GeeList* _tmp43_; - GeeList* _tmp44_; - gint _tmp45_; - gint _tmp46_; + const gchar* _tmp39_; + GeeList* _tmp40_; + GeeList* _tmp41_; + gint _tmp42_; + gint _tmp43_; gchar* top_level_parent = NULL; - GeeList* _tmp47_; - gpointer _tmp48_; + GeeList* _tmp44_; + gpointer _tmp45_; gchar* flat_top_level_parent = NULL; + const gchar* _tmp46_; + gchar* _tmp47_; + TagSourceCollection* _tmp48_; const gchar* _tmp49_; - gchar* _tmp50_; - TagSourceCollection* _tmp51_; - const gchar* _tmp52_; - gboolean _tmp53_; #line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp42_ = prepped; + _tmp39_ = prepped; #line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp43_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp42_); + _tmp40_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp39_); #line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - parents = _tmp43_; + parents = _tmp40_; #line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp44_ = parents; + _tmp41_ = parents; #line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp45_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp42_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection)); #line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp46_ = _tmp45_; + _tmp43_ = _tmp42_; #line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _vala_assert (_tmp46_ > 0, "parents.size > 0"); + _vala_assert (_tmp43_ > 0, "parents.size > 0"); #line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp47_ = parents; + _tmp44_ = parents; #line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp48_ = gee_list_get (_tmp47_, 0); + _tmp45_ = gee_list_get (_tmp44_, 0); #line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - top_level_parent = (gchar*) _tmp48_; + top_level_parent = (gchar*) _tmp45_; #line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp49_ = top_level_parent; + _tmp46_ = top_level_parent; #line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp50_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp49_); + _tmp47_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp46_); #line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - flat_top_level_parent = _tmp50_; + flat_top_level_parent = _tmp47_; #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp51_ = tag_global; + _tmp48_ = tag_global; #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp52_ = flat_top_level_parent; + _tmp49_ = flat_top_level_parent; #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp53_ = tag_source_collection_exists (_tmp51_, _tmp52_, FALSE); -#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - if (_tmp53_) { -#line 1326 "DataImportJob.c" - const gchar* _tmp54_; - Tag* _tmp55_; - Tag* _tmp56_; + if (tag_source_collection_exists (_tmp48_, _tmp49_, FALSE)) { +#line 1386 "DataImportJob.c" + const gchar* _tmp50_; + Tag* _tmp51_; + Tag* _tmp52_; #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp54_ = flat_top_level_parent; + _tmp50_ = flat_top_level_parent; #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp55_ = tag_for_path (_tmp54_); + _tmp51_ = tag_for_path (_tmp50_); #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp56_ = _tmp55_; + _tmp52_ = _tmp51_; #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - tag_promote (_tmp56_); + tag_promote (_tmp52_); #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _g_object_unref0 (_tmp56_); -#line 1340 "DataImportJob.c" + _g_object_unref0 (_tmp52_); +#line 1400 "DataImportJob.c" } #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_free0 (flat_top_level_parent); @@ -1344,185 +1404,169 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob* _g_free0 (top_level_parent); #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_object_unref0 (parents); -#line 1348 "DataImportJob.c" +#line 1408 "DataImportJob.c" } #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp57_ = prepped; + _tmp53_ = prepped; #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp58_ = tag_for_path (_tmp57_); + _tmp54_ = tag_for_path (_tmp53_); #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp59_ = _tmp58_; + _tmp55_ = _tmp54_; #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp60_ = photo; + _tmp56_ = photo; #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - tag_attach (_tmp59_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE, MediaSource)); + tag_attach (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_MEDIA_SOURCE, MediaSource)); #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _g_object_unref0 (_tmp59_); -#line 1362 "DataImportJob.c" + _g_object_unref0 (_tmp55_); +#line 1422 "DataImportJob.c" } #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_free0 (prepped); #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_object_unref0 (src_tag); -#line 1368 "DataImportJob.c" +#line 1428 "DataImportJob.c" } } } #line 139 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp61_ = src_photo; + _tmp57_ = src_photo; #line 139 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp62_ = spit_data_imports_importable_media_item_get_event (_tmp61_); + _tmp58_ = spit_data_imports_importable_media_item_get_event (_tmp57_); #line 139 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - src_event = _tmp62_; + src_event = _tmp58_; #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp63_ = src_event; + _tmp59_ = src_event; #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - if (_tmp63_ != NULL) { -#line 1382 "DataImportJob.c" + if (_tmp59_ != NULL) { +#line 1442 "DataImportJob.c" gchar* prepped = NULL; - SpitDataImportsImportableEvent* _tmp64_; - gchar* _tmp65_; - gchar* _tmp66_; - gchar* _tmp67_; - gchar* _tmp68_; - const gchar* _tmp69_; + SpitDataImportsImportableEvent* _tmp60_; + gchar* _tmp61_; + gchar* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; + const gchar* _tmp65_; #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp64_ = src_event; + _tmp60_ = src_event; #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp65_ = spit_data_imports_importable_event_get_name (_tmp64_); + _tmp61_ = spit_data_imports_importable_event_get_name (_tmp60_); #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp66_ = _tmp65_; + _tmp62_ = _tmp61_; #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp67_ = prepare_input_text (_tmp66_, PREPARE_INPUT_TEXT_OPTIONS_DEFAULT, -1); + _tmp63_ = prepare_input_text (_tmp62_, PREPARE_INPUT_TEXT_OPTIONS_DEFAULT, -1); #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp68_ = _tmp67_; + _tmp64_ = _tmp63_; #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _g_free0 (_tmp66_); + _g_free0 (_tmp62_); #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - prepped = _tmp68_; + prepped = _tmp64_; #line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp69_ = prepped; + _tmp65_ = prepped; #line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - if (_tmp69_ != NULL) { -#line 1408 "DataImportJob.c" - LibraryPhoto* _tmp70_; - BatchImportRoll* _tmp71_; - ViewCollection* _tmp72_; - const gchar* _tmp73_; -#line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp70_ = photo; + if (_tmp65_ != NULL) { +#line 1468 "DataImportJob.c" + LibraryPhoto* _tmp66_; + ViewCollection* _tmp67_; + const gchar* _tmp68_; #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp71_ = import_roll; + _tmp66_ = photo; #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp72_ = _tmp71_->generated_events; + _tmp67_ = import_roll->generated_events; #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp73_ = prepped; + _tmp68_ = prepped; #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_MEDIA_SOURCE, MediaSource), _tmp72_, _tmp73_); -#line 1423 "DataImportJob.c" + event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_MEDIA_SOURCE, MediaSource), _tmp67_, _tmp68_); +#line 1480 "DataImportJob.c" } #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_free0 (prepped); -#line 1427 "DataImportJob.c" +#line 1484 "DataImportJob.c" } #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp74_ = src_photo; + _tmp69_ = src_photo; #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp75_ = spit_data_imports_importable_media_item_get_rating (_tmp74_); + _tmp70_ = spit_data_imports_importable_media_item_get_rating (_tmp69_); #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - src_rating = _tmp75_; + src_rating = _tmp70_; #line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp76_ = src_rating; + _tmp71_ = src_rating; #line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp77_ = spit_data_imports_importable_rating_is_rejected (_tmp76_); -#line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - if (_tmp77_) { + if (spit_data_imports_importable_rating_is_rejected (_tmp71_)) { #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" dst_rating = RATING_REJECTED; -#line 1443 "DataImportJob.c" +#line 1498 "DataImportJob.c" } else { - SpitDataImportsImportableRating* _tmp78_; - gboolean _tmp79_; -#line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp78_ = src_rating; + SpitDataImportsImportableRating* _tmp72_; #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp79_ = spit_data_imports_importable_rating_is_unrated (_tmp78_); + _tmp72_ = src_rating; #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - if (_tmp79_) { + if (spit_data_imports_importable_rating_is_unrated (_tmp72_)) { #line 152 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" dst_rating = RATING_UNRATED; -#line 1455 "DataImportJob.c" +#line 1507 "DataImportJob.c" } else { - SpitDataImportsImportableRating* _tmp80_; - gint _tmp81_; - Rating _tmp82_; + SpitDataImportsImportableRating* _tmp73_; #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp80_ = src_rating; + _tmp73_ = src_rating; #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp81_ = spit_data_imports_importable_rating_get_value (_tmp80_); -#line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp82_ = rating_unserialize (_tmp81_); -#line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - dst_rating = _tmp82_; -#line 1468 "DataImportJob.c" + dst_rating = rating_unserialize (spit_data_imports_importable_rating_get_value (_tmp73_)); +#line 1514 "DataImportJob.c" } } #line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp83_ = photo; + _tmp74_ = photo; #line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp84_ = dst_rating; + _tmp75_ = dst_rating; #line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, TYPE_MEDIA_SOURCE, MediaSource), _tmp84_); + media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, TYPE_MEDIA_SOURCE, MediaSource), _tmp75_); #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp85_ = src_photo; + _tmp76_ = src_photo; #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp86_ = spit_data_imports_importable_media_item_get_title (_tmp85_); + _tmp77_ = spit_data_imports_importable_media_item_get_title (_tmp76_); #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - title = _tmp86_; + title = _tmp77_; #line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp87_ = title; + _tmp78_ = title; #line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - if (_tmp87_ != NULL) { -#line 1487 "DataImportJob.c" - LibraryPhoto* _tmp88_; - const gchar* _tmp89_; + if (_tmp78_ != NULL) { +#line 1533 "DataImportJob.c" + LibraryPhoto* _tmp79_; + const gchar* _tmp80_; #line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp88_ = photo; + _tmp79_ = photo; #line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp89_ = title; + _tmp80_ = title; #line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_MEDIA_SOURCE, MediaSource), _tmp89_); -#line 1496 "DataImportJob.c" + media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_MEDIA_SOURCE, MediaSource), _tmp80_); +#line 1542 "DataImportJob.c" } #line 161 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp90_ = src_photo; + _tmp81_ = src_photo; #line 161 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp91_ = spit_data_imports_importable_media_item_get_exposure_time (_tmp90_); + _tmp82_ = spit_data_imports_importable_media_item_get_exposure_time (_tmp81_); #line 161 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - date_time = _tmp91_; + date_time = _tmp82_; #line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp92_ = date_time; + _tmp83_ = date_time; #line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - if (_tmp92_ != NULL) { -#line 1508 "DataImportJob.c" - LibraryPhoto* _tmp93_; - time_t* _tmp94_; + if (_tmp83_ != NULL) { +#line 1554 "DataImportJob.c" + LibraryPhoto* _tmp84_; + time_t* _tmp85_; #line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp93_ = photo; + _tmp84_ = photo; #line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp94_ = date_time; + _tmp85_ = date_time; #line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, TYPE_DATEABLE, Dateable), *_tmp94_); -#line 1517 "DataImportJob.c" + dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, TYPE_DATEABLE, Dateable), *_tmp85_); +#line 1563 "DataImportJob.c" } #line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp95_ = photo; -#line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp96_ = import_roll; + _tmp86_ = photo; #line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp97_ = _tmp96_->import_id; + _tmp87_ = import_roll->import_id; #line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - photo_set_import_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, TYPE_PHOTO, Photo), &_tmp97_); + photo_set_import_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, TYPE_PHOTO, Photo), &_tmp87_); #line 167 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" result = TRUE; #line 167 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" @@ -1541,19 +1585,23 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob* _g_object_unref0 (photo); #line 167 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" return result; -#line 1545 "DataImportJob.c" +#line 1589 "DataImportJob.c" } -static gchar** spit_data_imports_data_import_job_build_path_components (SpitDataImportsDataImportJob* self, SpitDataImportsImportableTag* tag, int* result_length1) { +static gchar** +spit_data_imports_data_import_job_build_path_components (SpitDataImportsDataImportJob* self, + SpitDataImportsImportableTag* tag, + int* result_length1) +{ gchar** result = NULL; GeeList* components = NULL; GeeLinkedList* _tmp0_; - GeeList* _tmp13_; - gint _tmp14_; - gpointer* _tmp15_; - gchar** _tmp16_; - gint _tmp16__length1; + GeeList* _tmp12_; + gint _tmp13_; + gpointer* _tmp14_; + gchar** _tmp15_; + gint _tmp15__length1; #line 170 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_JOB (self), NULL); #line 170 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" @@ -1562,107 +1610,106 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData _tmp0_ = gee_linked_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" components = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList); -#line 1566 "DataImportJob.c" +#line 1614 "DataImportJob.c" { SpitDataImportsImportableTag* current_tag = NULL; SpitDataImportsImportableTag* _tmp1_; - SpitDataImportsImportableTag* _tmp2_; #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp1_ = tag; + _tmp1_ = _g_object_ref0 (tag); #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); -#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - current_tag = _tmp2_; -#line 1577 "DataImportJob.c" + current_tag = _tmp1_; +#line 1622 "DataImportJob.c" { - gboolean _tmp3_ = FALSE; + gboolean _tmp2_ = FALSE; #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp3_ = TRUE; + _tmp2_ = TRUE; #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" while (TRUE) { -#line 1584 "DataImportJob.c" - SpitDataImportsImportableTag* _tmp6_; - GeeList* _tmp7_; - SpitDataImportsImportableTag* _tmp8_; +#line 1629 "DataImportJob.c" + SpitDataImportsImportableTag* _tmp5_; + GeeList* _tmp6_; + SpitDataImportsImportableTag* _tmp7_; + gchar* _tmp8_; gchar* _tmp9_; gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - if (!_tmp3_) { -#line 1594 "DataImportJob.c" + if (!_tmp2_) { +#line 1639 "DataImportJob.c" + SpitDataImportsImportableTag* _tmp3_; SpitDataImportsImportableTag* _tmp4_; - SpitDataImportsImportableTag* _tmp5_; #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp4_ = current_tag; + _tmp3_ = current_tag; #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp5_ = spit_data_imports_importable_tag_get_parent (_tmp4_); + _tmp4_ = spit_data_imports_importable_tag_get_parent (_tmp3_); #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_object_unref0 (current_tag); #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - current_tag = _tmp5_; -#line 1605 "DataImportJob.c" + current_tag = _tmp4_; +#line 1650 "DataImportJob.c" } #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp3_ = FALSE; + _tmp2_ = FALSE; #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp6_ = current_tag; + _tmp5_ = current_tag; #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - if (!(_tmp6_ != NULL)) { + if (!(_tmp5_ != NULL)) { #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" break; -#line 1615 "DataImportJob.c" +#line 1660 "DataImportJob.c" } #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp7_ = components; + _tmp6_ = components; #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp8_ = current_tag; + _tmp7_ = current_tag; #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp9_ = spit_data_imports_importable_tag_get_name (_tmp8_); + _tmp8_ = spit_data_imports_importable_tag_get_name (_tmp7_); #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp11_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp10_); + _tmp10_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp9_); #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - gee_list_insert (_tmp7_, 0, _tmp12_); + gee_list_insert (_tmp6_, 0, _tmp11_); #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp11_); #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _g_free0 (_tmp10_); -#line 1635 "DataImportJob.c" + _g_free0 (_tmp9_); +#line 1680 "DataImportJob.c" } } #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_object_unref0 (current_tag); -#line 1640 "DataImportJob.c" +#line 1685 "DataImportJob.c" } #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp13_ = components; + _tmp12_ = components; #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp15_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp14_); + _tmp14_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp13_); #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp16__length1 = _tmp14_; + _tmp15__length1 = _tmp13_; #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" if (result_length1) { #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - *result_length1 = _tmp16__length1; -#line 1654 "DataImportJob.c" + *result_length1 = _tmp15__length1; +#line 1699 "DataImportJob.c" } #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - result = _tmp16_; + result = _tmp15_; #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" _g_object_unref0 (components); #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" return result; -#line 1662 "DataImportJob.c" +#line 1707 "DataImportJob.c" } -static void spit_data_imports_data_import_job_class_init (SpitDataImportsDataImportJobClass * klass) { +static void +spit_data_imports_data_import_job_class_init (SpitDataImportsDataImportJobClass * klass) +{ #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" spit_data_imports_data_import_job_parent_class = g_type_class_peek_parent (klass); #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" @@ -1687,22 +1734,26 @@ static void spit_data_imports_data_import_job_class_init (SpitDataImportsDataImp ((BatchImportJobClass *) klass)->prepare = (gboolean (*) (BatchImportJob *, GFile* *, gboolean*, GError**)) spit_data_imports_data_import_job_real_prepare; #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" ((BatchImportJobClass *) klass)->complete = (gboolean (*) (BatchImportJob *, MediaSource*, BatchImportRoll*, GError**)) spit_data_imports_data_import_job_real_complete; -#line 1691 "DataImportJob.c" +#line 1738 "DataImportJob.c" } -static void spit_data_imports_data_import_job_instance_init (SpitDataImportsDataImportJob * self) { +static void +spit_data_imports_data_import_job_instance_init (SpitDataImportsDataImportJob * self) +{ #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" self->priv = SPIT_DATA_IMPORTS_DATA_IMPORT_JOB_GET_PRIVATE (self); #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" self->priv->associated = NULL; #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" self->priv->detected_htags = NULL; -#line 1702 "DataImportJob.c" +#line 1751 "DataImportJob.c" } -static void spit_data_imports_data_import_job_finalize (BatchImportJob * obj) { +static void +spit_data_imports_data_import_job_finalize (BatchImportJob * obj) +{ SpitDataImportsDataImportJob * self; #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob); @@ -1716,14 +1767,16 @@ static void spit_data_imports_data_import_job_finalize (BatchImportJob * obj) { _hierarchical_tag_index_unref0 (self->priv->detected_htags); #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" BATCH_IMPORT_JOB_CLASS (spit_data_imports_data_import_job_parent_class)->finalize (obj); -#line 1720 "DataImportJob.c" +#line 1771 "DataImportJob.c" } /** * A specialized import job implementation for alien databases. */ -GType spit_data_imports_data_import_job_get_type (void) { +GType +spit_data_imports_data_import_job_get_type (void) +{ static volatile gsize spit_data_imports_data_import_job_type_id__volatile = 0; if (g_once_init_enter (&spit_data_imports_data_import_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsDataImportJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) spit_data_imports_data_import_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SpitDataImportsDataImportJob), 0, (GInstanceInitFunc) spit_data_imports_data_import_job_instance_init, NULL }; @@ -1735,7 +1788,11 @@ GType spit_data_imports_data_import_job_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -1747,7 +1804,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/data_imports/DataImportSource.c b/src/data_imports/DataImportSource.c index d3990dc..b4786b1 100644 --- a/src/data_imports/DataImportSource.c +++ b/src/data_imports/DataImportSource.c @@ -1,4 +1,4 @@ -/* DataImportSource.c generated by valac 0.36.6, the Vala compiler +/* DataImportSource.c generated by valac 0.40.4, the Vala compiler * generated from DataImportSource.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include "shotwell-plugin-dev-1.0.h" @@ -105,43 +106,65 @@ static gpointer spit_data_imports_data_import_source_parent_class = NULL; gpointer spit_data_imports_data_import_source_ref (gpointer instance); void spit_data_imports_data_import_source_unref (gpointer instance); -GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void spit_data_imports_value_set_data_import_source (GValue* value, gpointer v_object); -void spit_data_imports_value_take_data_import_source (GValue* value, gpointer v_object); +GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void spit_data_imports_value_set_data_import_source (GValue* value, + gpointer v_object); +void spit_data_imports_value_take_data_import_source (GValue* value, + gpointer v_object); gpointer spit_data_imports_value_get_data_import_source (const GValue* value); GType spit_data_imports_data_import_source_get_type (void) G_GNUC_CONST; gpointer metadata_date_time_ref (gpointer instance); void metadata_date_time_unref (gpointer instance); -GParamSpec* param_spec_metadata_date_time (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_metadata_date_time (GValue* value, gpointer v_object); -void value_take_metadata_date_time (GValue* value, gpointer v_object); +GParamSpec* param_spec_metadata_date_time (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_metadata_date_time (GValue* value, + gpointer v_object); +void value_take_metadata_date_time (GValue* value, + gpointer v_object); gpointer value_get_metadata_date_time (const GValue* value); GType metadata_date_time_get_type (void) G_GNUC_CONST; #define SPIT_DATA_IMPORTS_DATA_IMPORT_SOURCE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE, SpitDataImportsDataImportSourcePrivate)) -enum { - SPIT_DATA_IMPORTS_DATA_IMPORT_SOURCE_DUMMY_PROPERTY -}; SpitDataImportsDataImportSource* spit_data_imports_data_import_source_new (SpitDataImportsImportableMediaItem* db_photo); -SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct (GType object_type, SpitDataImportsImportableMediaItem* db_photo); +SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct (GType object_type, + SpitDataImportsImportableMediaItem* db_photo); gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; PhotoMetadata* photo_metadata_new (void); PhotoMetadata* photo_metadata_construct (GType object_type); -void media_metadata_read_from_file (MediaMetadata* self, GFile* file, GError** error); +void media_metadata_read_from_file (MediaMetadata* self, + GFile* file, + GError** error); gchar* spit_data_imports_data_import_source_get_filename (SpitDataImportsDataImportSource* self); gchar* media_metadata_get_title (MediaMetadata* self); MetadataDateTime* metadata_date_time_new (time_t timestamp); -MetadataDateTime* metadata_date_time_construct (GType object_type, time_t timestamp); +MetadataDateTime* metadata_date_time_construct (GType object_type, + time_t timestamp); MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self); gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self); -guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GError** error); -time_t query_file_modified (GFile* file, GError** error); +guint64 query_total_file_size (GFile* file_or_dir, + GCancellable* cancellable, + GError** error); +time_t query_file_modified (GFile* file, + GError** error); gchar* spit_data_imports_data_import_source_get_fulldir (SpitDataImportsDataImportSource* self); GFile* spit_data_imports_data_import_source_get_file (SpitDataImportsDataImportSource* self); gchar* spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportSource* self); @@ -156,183 +179,173 @@ time_t metadata_date_time_get_timestamp (MetadataDateTime* self); guint64 spit_data_imports_data_import_source_get_filesize (SpitDataImportsDataImportSource* self); SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_photo (SpitDataImportsDataImportSource* self); gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImportsDataImportSource* self); -gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format); +gboolean library_photo_has_nontrash_duplicate (GFile* file, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format); gboolean spit_data_imports_data_import_source_was_backing_file_found (SpitDataImportsDataImportSource* self); static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataImportSource * obj); -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 27 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return self ? g_object_ref (self) : NULL; -#line 168 "DataImportSource.c" +#line 196 "DataImportSource.c" } -static gpointer _metadata_date_time_ref0 (gpointer self) { +static gpointer +_metadata_date_time_ref0 (gpointer self) +{ #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return self ? metadata_date_time_ref (self) : NULL; -#line 175 "DataImportSource.c" +#line 205 "DataImportSource.c" } -SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct (GType object_type, SpitDataImportsImportableMediaItem* db_photo) { +SpitDataImportsDataImportSource* +spit_data_imports_data_import_source_construct (GType object_type, + SpitDataImportsImportableMediaItem* db_photo) +{ SpitDataImportsDataImportSource* self = NULL; SpitDataImportsImportableMediaItem* _tmp0_; - SpitDataImportsImportableMediaItem* _tmp1_; gchar* folder_path = NULL; - SpitDataImportsImportableMediaItem* _tmp2_; - gchar* _tmp3_; + gchar* _tmp1_; gchar* filename = NULL; - SpitDataImportsImportableMediaItem* _tmp4_; - gchar* _tmp5_; + gchar* _tmp2_; GFile* photo = NULL; - gboolean _tmp6_ = FALSE; - const gchar* _tmp7_; - gboolean _tmp20_ = FALSE; - GFile* _tmp21_; + gboolean _tmp3_ = FALSE; + const gchar* _tmp4_; + gboolean _tmp14_ = FALSE; + GFile* _tmp15_; GError * _inner_error_ = NULL; #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_MEDIA_ITEM (db_photo), NULL); #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" self = (SpitDataImportsDataImportSource*) g_type_create_instance (object_type); #line 27 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp0_ = db_photo; -#line 27 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (db_photo); #line 27 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_object_unref0 (self->priv->db_photo); #line 27 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - self->priv->db_photo = _tmp1_; + self->priv->db_photo = _tmp0_; #line 31 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp2_ = db_photo; + _tmp1_ = spit_data_imports_importable_media_item_get_folder_path (db_photo); #line 31 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp3_ = spit_data_imports_importable_media_item_get_folder_path (_tmp2_); -#line 31 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - folder_path = _tmp3_; -#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp4_ = db_photo; + folder_path = _tmp1_; #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp5_ = spit_data_imports_importable_media_item_get_filename (_tmp4_); + _tmp2_ = spit_data_imports_importable_media_item_get_filename (db_photo); #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - filename = _tmp5_; + filename = _tmp2_; #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" photo = NULL; #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp7_ = folder_path; + _tmp4_ = folder_path; #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - if (_tmp7_ != NULL) { -#line 225 "DataImportSource.c" - const gchar* _tmp8_; + if (_tmp4_ != NULL) { +#line 249 "DataImportSource.c" + const gchar* _tmp5_; #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp8_ = filename; + _tmp5_ = filename; #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp6_ = _tmp8_ != NULL; -#line 231 "DataImportSource.c" + _tmp3_ = _tmp5_ != NULL; +#line 255 "DataImportSource.c" } else { #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp6_ = FALSE; -#line 235 "DataImportSource.c" + _tmp3_ = FALSE; +#line 259 "DataImportSource.c" } #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - if (_tmp6_) { -#line 239 "DataImportSource.c" - SpitDataImportsImportableMediaItem* _tmp9_; + if (_tmp3_) { +#line 263 "DataImportSource.c" + gchar* _tmp6_; + gchar* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; gchar* _tmp10_; gchar* _tmp11_; GFile* _tmp12_; GFile* _tmp13_; - SpitDataImportsImportableMediaItem* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; - GFile* _tmp17_; - GFile* _tmp18_; - gboolean _tmp19_; -#line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp9_ = db_photo; #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp10_ = spit_data_imports_importable_media_item_get_folder_path (_tmp9_); + _tmp6_ = spit_data_imports_importable_media_item_get_folder_path (db_photo); #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp11_ = _tmp10_; -#line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp12_ = g_file_new_for_path (_tmp11_); + _tmp7_ = _tmp6_; #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp13_ = _tmp12_; + _tmp8_ = g_file_new_for_path (_tmp7_); #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp14_ = db_photo; + _tmp9_ = _tmp8_; #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp15_ = spit_data_imports_importable_media_item_get_filename (_tmp14_); + _tmp10_ = spit_data_imports_importable_media_item_get_filename (db_photo); #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp16_ = _tmp15_; + _tmp11_ = _tmp10_; #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp17_ = g_file_get_child (_tmp13_, _tmp16_); + _tmp12_ = g_file_get_child (_tmp9_, _tmp11_); #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_object_unref0 (photo); #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - photo = _tmp17_; + photo = _tmp12_; #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp11_); #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp9_); #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_free0 (_tmp11_); -#line 38 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp18_ = photo; + _g_free0 (_tmp7_); #line 38 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp19_ = g_file_query_exists (_tmp18_, NULL); + _tmp13_ = photo; #line 38 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - self->priv->backing_file_found = _tmp19_; -#line 285 "DataImportSource.c" + self->priv->backing_file_found = g_file_query_exists (_tmp13_, NULL); +#line 300 "DataImportSource.c" } else { #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" self->priv->backing_file_found = FALSE; -#line 289 "DataImportSource.c" +#line 304 "DataImportSource.c" } #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp21_ = photo; + _tmp15_ = photo; #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - if (_tmp21_ != NULL) { -#line 295 "DataImportSource.c" - gboolean _tmp22_; + if (_tmp15_ != NULL) { +#line 310 "DataImportSource.c" + gboolean _tmp16_; #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp22_ = self->priv->backing_file_found; + _tmp16_ = self->priv->backing_file_found; #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp20_ = _tmp22_; -#line 301 "DataImportSource.c" + _tmp14_ = _tmp16_; +#line 316 "DataImportSource.c" } else { #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp20_ = FALSE; -#line 305 "DataImportSource.c" + _tmp14_ = FALSE; +#line 320 "DataImportSource.c" } #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - if (_tmp20_) { -#line 309 "DataImportSource.c" + if (_tmp14_) { +#line 324 "DataImportSource.c" PhotoMetadata* metadata = NULL; - PhotoMetadata* _tmp23_; - SpitDataImportsImportableMediaItem* _tmp30_; - gchar* _tmp31_; - const gchar* _tmp32_; + PhotoMetadata* _tmp17_; + gchar* _tmp24_; + const gchar* _tmp25_; time_t* date_time = NULL; - SpitDataImportsImportableMediaItem* _tmp38_; - time_t* _tmp39_; - time_t* _tmp40_; - PhotoMetadata* _tmp48_; + time_t* _tmp31_; + time_t* _tmp32_; + PhotoMetadata* _tmp40_; #line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp23_ = photo_metadata_new (); + _tmp17_ = photo_metadata_new (); #line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - metadata = _tmp23_; -#line 324 "DataImportSource.c" + metadata = _tmp17_; +#line 337 "DataImportSource.c" { - PhotoMetadata* _tmp24_; - GFile* _tmp25_; + PhotoMetadata* _tmp18_; + GFile* _tmp19_; #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp24_ = metadata; + _tmp18_ = metadata; #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp25_ = photo; + _tmp19_ = photo; #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_METADATA, MediaMetadata), _tmp25_, &_inner_error_); + media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_MEDIA_METADATA, MediaMetadata), _tmp19_, &_inner_error_); #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 336 "DataImportSource.c" +#line 349 "DataImportSource.c" goto __catch230_g_error; } } @@ -340,33 +353,33 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct __catch230_g_error: { GError* e = NULL; - gchar* _tmp26_; - gchar* _tmp27_; - GError* _tmp28_; - const gchar* _tmp29_; + gchar* _tmp20_; + gchar* _tmp21_; + GError* _tmp22_; + const gchar* _tmp23_; #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" e = _inner_error_; #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _inner_error_ = NULL; #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp26_ = spit_data_imports_data_import_source_get_filename (self); + _tmp20_ = spit_data_imports_data_import_source_get_filename (self); #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp27_ = _tmp26_; + _tmp21_ = _tmp20_; #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp28_ = e; + _tmp22_ = e; #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp29_ = _tmp28_->message; + _tmp23_ = _tmp22_->message; #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - g_warning ("DataImportSource.vala:48: Could not get file metadata for %s: %s", _tmp27_, _tmp29_); + g_warning ("DataImportSource.vala:48: Could not get file metadata for %s: %s", _tmp21_, _tmp23_); #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_free0 (_tmp27_); + _g_free0 (_tmp21_); #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _media_metadata_unref0 (metadata); #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" metadata = NULL; #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_error_free0 (e); -#line 370 "DataImportSource.c" +#line 383 "DataImportSource.c" } __finally230: #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -385,179 +398,172 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct g_clear_error (&_inner_error_); #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return NULL; -#line 389 "DataImportSource.c" +#line 402 "DataImportSource.c" } #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp30_ = db_photo; -#line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp31_ = spit_data_imports_importable_media_item_get_title (_tmp30_); + _tmp24_ = spit_data_imports_importable_media_item_get_title (db_photo); #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (self->priv->title); #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - self->priv->title = _tmp31_; + self->priv->title = _tmp24_; #line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp32_ = self->priv->title; + _tmp25_ = self->priv->title; #line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - if (_tmp32_ == NULL) { -#line 403 "DataImportSource.c" - gchar* _tmp33_ = NULL; - PhotoMetadata* _tmp34_; - gchar* _tmp37_; + if (_tmp25_ == NULL) { +#line 414 "DataImportSource.c" + gchar* _tmp26_ = NULL; + PhotoMetadata* _tmp27_; + gchar* _tmp30_; #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp34_ = metadata; + _tmp27_ = metadata; #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - if (_tmp34_ != NULL) { -#line 411 "DataImportSource.c" - PhotoMetadata* _tmp35_; - gchar* _tmp36_; + if (_tmp27_ != NULL) { +#line 422 "DataImportSource.c" + PhotoMetadata* _tmp28_; + gchar* _tmp29_; #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp35_ = metadata; + _tmp28_ = metadata; #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp36_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp29_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_free0 (_tmp33_); + _g_free0 (_tmp26_); #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp33_ = _tmp36_; -#line 422 "DataImportSource.c" + _tmp26_ = _tmp29_; +#line 433 "DataImportSource.c" } else { #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_free0 (_tmp33_); + _g_free0 (_tmp26_); #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp33_ = NULL; -#line 428 "DataImportSource.c" + _tmp26_ = NULL; +#line 439 "DataImportSource.c" } #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp37_ = g_strdup (_tmp33_); + _tmp30_ = g_strdup (_tmp26_); #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (self->priv->title); #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - self->priv->title = _tmp37_; + self->priv->title = _tmp30_; #line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_free0 (_tmp33_); -#line 438 "DataImportSource.c" + _g_free0 (_tmp26_); +#line 449 "DataImportSource.c" } #line 55 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp38_ = db_photo; -#line 55 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp39_ = spit_data_imports_importable_media_item_get_exposure_time (_tmp38_); + _tmp31_ = spit_data_imports_importable_media_item_get_exposure_time (db_photo); #line 55 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - date_time = _tmp39_; + date_time = _tmp31_; #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp40_ = date_time; + _tmp32_ = date_time; #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - if (_tmp40_ != NULL) { -#line 450 "DataImportSource.c" - time_t* _tmp41_; - MetadataDateTime* _tmp42_; + if (_tmp32_ != NULL) { +#line 459 "DataImportSource.c" + time_t* _tmp33_; + MetadataDateTime* _tmp34_; #line 57 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp41_ = date_time; + _tmp33_ = date_time; #line 57 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp42_ = metadata_date_time_new (*_tmp41_); + _tmp34_ = metadata_date_time_new (*_tmp33_); #line 57 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _metadata_date_time_unref0 (self->priv->exposure_time); #line 57 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - self->priv->exposure_time = _tmp42_; -#line 461 "DataImportSource.c" + self->priv->exposure_time = _tmp34_; +#line 470 "DataImportSource.c" } else { - MetadataDateTime* _tmp43_ = NULL; - PhotoMetadata* _tmp44_; - MetadataDateTime* _tmp47_; + MetadataDateTime* _tmp35_ = NULL; + PhotoMetadata* _tmp36_; + MetadataDateTime* _tmp39_; #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp44_ = metadata; + _tmp36_ = metadata; #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - if (_tmp44_ != NULL) { -#line 470 "DataImportSource.c" - PhotoMetadata* _tmp45_; - MetadataDateTime* _tmp46_; + if (_tmp36_ != NULL) { +#line 479 "DataImportSource.c" + PhotoMetadata* _tmp37_; + MetadataDateTime* _tmp38_; #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp45_ = metadata; + _tmp37_ = metadata; #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp46_ = photo_metadata_get_exposure_date_time (_tmp45_); + _tmp38_ = photo_metadata_get_exposure_date_time (_tmp37_); #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _metadata_date_time_unref0 (_tmp43_); + _metadata_date_time_unref0 (_tmp35_); #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp43_ = _tmp46_; -#line 481 "DataImportSource.c" + _tmp35_ = _tmp38_; +#line 490 "DataImportSource.c" } else { #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _metadata_date_time_unref0 (_tmp43_); + _metadata_date_time_unref0 (_tmp35_); #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp43_ = NULL; -#line 487 "DataImportSource.c" + _tmp35_ = NULL; +#line 496 "DataImportSource.c" } #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp47_ = _metadata_date_time_ref0 (_tmp43_); + _tmp39_ = _metadata_date_time_ref0 (_tmp35_); #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _metadata_date_time_unref0 (self->priv->exposure_time); #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - self->priv->exposure_time = _tmp47_; + self->priv->exposure_time = _tmp39_; #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _metadata_date_time_unref0 (_tmp43_); -#line 497 "DataImportSource.c" + _metadata_date_time_unref0 (_tmp35_); +#line 506 "DataImportSource.c" } #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp48_ = metadata; + _tmp40_ = metadata; #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - if (_tmp48_ != NULL) { -#line 503 "DataImportSource.c" - PhotoMetadata* _tmp49_; - gchar* _tmp50_; + if (_tmp40_ != NULL) { +#line 512 "DataImportSource.c" + PhotoMetadata* _tmp41_; + gchar* _tmp42_; #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp49_ = metadata; + _tmp41_ = metadata; #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp50_ = photo_metadata_thumbnail_hash (_tmp49_); + _tmp42_ = photo_metadata_thumbnail_hash (_tmp41_); #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (self->priv->preview_md5); #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - self->priv->preview_md5 = _tmp50_; -#line 514 "DataImportSource.c" + self->priv->preview_md5 = _tmp42_; +#line 523 "DataImportSource.c" } { - guint64 _tmp51_ = 0ULL; - GFile* _tmp52_; - guint64 _tmp53_; -#line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp52_ = photo; + guint64 _tmp43_ = 0ULL; + GFile* _tmp44_; #line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp53_ = query_total_file_size (_tmp52_, NULL, &_inner_error_); + _tmp44_ = photo; #line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp51_ = _tmp53_; + _tmp43_ = query_total_file_size (_tmp44_, NULL, &_inner_error_); #line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 528 "DataImportSource.c" +#line 534 "DataImportSource.c" goto __catch231_g_error; } #line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - self->priv->file_size = _tmp51_; -#line 533 "DataImportSource.c" + self->priv->file_size = _tmp43_; +#line 539 "DataImportSource.c" } goto __finally231; __catch231_g_error: { GError* e = NULL; - gchar* _tmp54_; - gchar* _tmp55_; - GError* _tmp56_; - const gchar* _tmp57_; + gchar* _tmp45_; + gchar* _tmp46_; + GError* _tmp47_; + const gchar* _tmp48_; #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" e = _inner_error_; #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _inner_error_ = NULL; #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp54_ = spit_data_imports_data_import_source_get_filename (self); + _tmp45_ = spit_data_imports_data_import_source_get_filename (self); #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp55_ = _tmp54_; + _tmp46_ = _tmp45_; #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp56_ = e; + _tmp47_ = e; #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp57_ = _tmp56_->message; + _tmp48_ = _tmp47_->message; #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - g_warning ("DataImportSource.vala:73: Could not get file size for %s: %s", _tmp55_, _tmp57_); + g_warning ("DataImportSource.vala:73: Could not get file size for %s: %s", _tmp46_, _tmp48_); #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_free0 (_tmp55_); + _g_free0 (_tmp46_); #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_error_free0 (e); -#line 561 "DataImportSource.c" +#line 567 "DataImportSource.c" } __finally231: #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -578,54 +584,51 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct g_clear_error (&_inner_error_); #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return NULL; -#line 582 "DataImportSource.c" +#line 588 "DataImportSource.c" } { - time_t _tmp58_ = 0; - GFile* _tmp59_; - time_t _tmp60_; + time_t _tmp49_ = 0; + GFile* _tmp50_; #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp59_ = photo; + _tmp50_ = photo; #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp60_ = query_file_modified (_tmp59_, &_inner_error_); -#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp58_ = _tmp60_; + _tmp49_ = query_file_modified (_tmp50_, &_inner_error_); #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 596 "DataImportSource.c" +#line 599 "DataImportSource.c" goto __catch232_g_error; } #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - self->priv->modification_time = _tmp58_; -#line 601 "DataImportSource.c" + self->priv->modification_time = _tmp49_; +#line 604 "DataImportSource.c" } goto __finally232; __catch232_g_error: { GError* e = NULL; - gchar* _tmp61_; - gchar* _tmp62_; - GError* _tmp63_; - const gchar* _tmp64_; + gchar* _tmp51_; + gchar* _tmp52_; + GError* _tmp53_; + const gchar* _tmp54_; #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" e = _inner_error_; #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _inner_error_ = NULL; #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp61_ = spit_data_imports_data_import_source_get_filename (self); + _tmp51_ = spit_data_imports_data_import_source_get_filename (self); #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp62_ = _tmp61_; + _tmp52_ = _tmp51_; #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp63_ = e; + _tmp53_ = e; #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp64_ = _tmp63_->message; + _tmp54_ = _tmp53_->message; #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - g_warning ("DataImportSource.vala:78: Could not get modification time for %s: %s", _tmp62_, _tmp64_); + g_warning ("DataImportSource.vala:78: Could not get modification time for %s: %s", _tmp52_, _tmp54_); #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_free0 (_tmp62_); + _g_free0 (_tmp52_); #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_error_free0 (e); -#line 629 "DataImportSource.c" +#line 632 "DataImportSource.c" } __finally232: #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -646,36 +649,36 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct g_clear_error (&_inner_error_); #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return NULL; -#line 650 "DataImportSource.c" +#line 653 "DataImportSource.c" } #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (date_time); #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _media_metadata_unref0 (metadata); -#line 656 "DataImportSource.c" +#line 659 "DataImportSource.c" } else { - GFile* _tmp65_; - gchar* _tmp66_; - gchar* _tmp67_; - gchar* _tmp68_; - gchar* _tmp69_; + GFile* _tmp55_; + gchar* _tmp56_; + gchar* _tmp57_; + gchar* _tmp58_; + gchar* _tmp59_; #line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp65_ = photo; + _tmp55_ = photo; #line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp66_ = g_file_get_path (_tmp65_); + _tmp56_ = g_file_get_path (_tmp55_); #line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp67_ = _tmp66_; + _tmp57_ = _tmp56_; #line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp68_ = g_strdup_printf ("Photo file %s not found", _tmp67_); + _tmp58_ = g_strdup_printf ("Photo file %s not found", _tmp57_); #line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp69_ = _tmp68_; + _tmp59_ = _tmp58_; #line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - g_debug ("DataImportSource.vala:81: %s", _tmp69_); + g_debug ("DataImportSource.vala:81: %s", _tmp59_); #line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_free0 (_tmp69_); + _g_free0 (_tmp59_); #line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_free0 (_tmp67_); -#line 679 "DataImportSource.c" + _g_free0 (_tmp57_); +#line 682 "DataImportSource.c" } #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_object_unref0 (photo); @@ -685,18 +688,22 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct _g_free0 (folder_path); #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return self; -#line 689 "DataImportSource.c" +#line 692 "DataImportSource.c" } -SpitDataImportsDataImportSource* spit_data_imports_data_import_source_new (SpitDataImportsImportableMediaItem* db_photo) { +SpitDataImportsDataImportSource* +spit_data_imports_data_import_source_new (SpitDataImportsImportableMediaItem* db_photo) +{ #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return spit_data_imports_data_import_source_construct (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE, db_photo); -#line 696 "DataImportSource.c" +#line 701 "DataImportSource.c" } -gchar* spit_data_imports_data_import_source_get_filename (SpitDataImportsDataImportSource* self) { +gchar* +spit_data_imports_data_import_source_get_filename (SpitDataImportsDataImportSource* self) +{ gchar* result = NULL; SpitDataImportsImportableMediaItem* _tmp0_; gchar* _tmp1_; @@ -710,11 +717,13 @@ gchar* spit_data_imports_data_import_source_get_filename (SpitDataImportsDataImp result = _tmp1_; #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 714 "DataImportSource.c" +#line 721 "DataImportSource.c" } -gchar* spit_data_imports_data_import_source_get_fulldir (SpitDataImportsDataImportSource* self) { +gchar* +spit_data_imports_data_import_source_get_fulldir (SpitDataImportsDataImportSource* self) +{ gchar* result = NULL; SpitDataImportsImportableMediaItem* _tmp0_; gchar* _tmp1_; @@ -728,11 +737,13 @@ gchar* spit_data_imports_data_import_source_get_fulldir (SpitDataImportsDataImpo result = _tmp1_; #line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 732 "DataImportSource.c" +#line 741 "DataImportSource.c" } -GFile* spit_data_imports_data_import_source_get_file (SpitDataImportsDataImportSource* self) { +GFile* +spit_data_imports_data_import_source_get_file (SpitDataImportsDataImportSource* self) +{ GFile* result = NULL; gchar* _tmp0_; gchar* _tmp1_; @@ -770,54 +781,55 @@ GFile* spit_data_imports_data_import_source_get_file (SpitDataImportsDataImportS result = _tmp7_; #line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 774 "DataImportSource.c" +#line 785 "DataImportSource.c" } -gchar* spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportSource* self) { +gchar* +spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportSource* self) +{ gchar* result = NULL; gchar* _tmp0_ = NULL; const gchar* _tmp1_; - gboolean _tmp2_; #line 97 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL); #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp1_ = self->priv->title; #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp2_ = is_string_empty (_tmp1_); -#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - if (!_tmp2_) { -#line 791 "DataImportSource.c" - const gchar* _tmp3_; - gchar* _tmp4_; + if (!is_string_empty (_tmp1_)) { +#line 801 "DataImportSource.c" + const gchar* _tmp2_; + gchar* _tmp3_; #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp3_ = self->priv->title; + _tmp2_ = self->priv->title; #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp4_ = g_strdup (_tmp3_); + _tmp3_ = g_strdup (_tmp2_); #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (_tmp0_); #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp0_ = _tmp4_; -#line 802 "DataImportSource.c" + _tmp0_ = _tmp3_; +#line 812 "DataImportSource.c" } else { - gchar* _tmp5_; + gchar* _tmp4_; #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp5_ = spit_data_imports_data_import_source_get_filename (self); + _tmp4_ = spit_data_imports_data_import_source_get_filename (self); #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (_tmp0_); #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp0_ = _tmp5_; -#line 811 "DataImportSource.c" + _tmp0_ = _tmp4_; +#line 821 "DataImportSource.c" } #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" result = _tmp0_; #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 817 "DataImportSource.c" +#line 827 "DataImportSource.c" } -gchar* spit_data_imports_data_import_source_get_title (SpitDataImportsDataImportSource* self) { +gchar* +spit_data_imports_data_import_source_get_title (SpitDataImportsDataImportSource* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -831,16 +843,17 @@ gchar* spit_data_imports_data_import_source_get_title (SpitDataImportsDataImport result = _tmp1_; #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 835 "DataImportSource.c" +#line 847 "DataImportSource.c" } -PhotoFileFormat spit_data_imports_data_import_source_get_file_format (SpitDataImportsDataImportSource* self) { +PhotoFileFormat +spit_data_imports_data_import_source_get_file_format (SpitDataImportsDataImportSource* self) +{ PhotoFileFormat result = 0; gchar* _tmp0_; gchar* _tmp1_; PhotoFileFormat _tmp2_; - PhotoFileFormat _tmp3_; #line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), 0); #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -849,19 +862,19 @@ PhotoFileFormat spit_data_imports_data_import_source_get_file_format (SpitDataIm _tmp1_ = _tmp0_; #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp2_ = photo_file_format_get_by_basename_extension (_tmp1_); -#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp3_ = _tmp2_; #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (_tmp1_); #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - result = _tmp3_; + result = _tmp2_; #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 861 "DataImportSource.c" +#line 872 "DataImportSource.c" } -gchar* spit_data_imports_data_import_source_to_string (SpitDataImportsDataImportSource* self) { +gchar* +spit_data_imports_data_import_source_to_string (SpitDataImportsDataImportSource* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -872,11 +885,13 @@ gchar* spit_data_imports_data_import_source_to_string (SpitDataImportsDataImport result = _tmp0_; #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 876 "DataImportSource.c" +#line 889 "DataImportSource.c" } -time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDataImportSource* self) { +time_t +spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDataImportSource* self) +{ time_t result = 0; time_t _tmp0_ = 0; MetadataDateTime* _tmp1_; @@ -886,33 +901,32 @@ time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDa _tmp1_ = self->priv->exposure_time; #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp1_ != NULL) { -#line 890 "DataImportSource.c" +#line 905 "DataImportSource.c" MetadataDateTime* _tmp2_; - time_t _tmp3_; #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp2_ = self->priv->exposure_time; #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp3_ = metadata_date_time_get_timestamp (_tmp2_); -#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp0_ = _tmp3_; -#line 899 "DataImportSource.c" + _tmp0_ = metadata_date_time_get_timestamp (_tmp2_); +#line 911 "DataImportSource.c" } else { - time_t _tmp4_; + time_t _tmp3_; #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp4_ = self->priv->modification_time; + _tmp3_ = self->priv->modification_time; #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp0_ = _tmp4_; -#line 906 "DataImportSource.c" + _tmp0_ = _tmp3_; +#line 918 "DataImportSource.c" } #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" result = _tmp0_; #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 912 "DataImportSource.c" +#line 924 "DataImportSource.c" } -guint64 spit_data_imports_data_import_source_get_filesize (SpitDataImportsDataImportSource* self) { +guint64 +spit_data_imports_data_import_source_get_filesize (SpitDataImportsDataImportSource* self) +{ guint64 result = 0ULL; guint64 _tmp0_; #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -923,11 +937,13 @@ guint64 spit_data_imports_data_import_source_get_filesize (SpitDataImportsDataIm result = _tmp0_; #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 927 "DataImportSource.c" +#line 941 "DataImportSource.c" } -SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_photo (SpitDataImportsDataImportSource* self) { +SpitDataImportsImportableMediaItem* +spit_data_imports_data_import_source_get_photo (SpitDataImportsDataImportSource* self) +{ SpitDataImportsImportableMediaItem* result = NULL; SpitDataImportsImportableMediaItem* _tmp0_; SpitDataImportsImportableMediaItem* _tmp1_; @@ -941,11 +957,13 @@ SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_pho result = _tmp1_; #line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 945 "DataImportSource.c" +#line 961 "DataImportSource.c" } -gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImportsDataImportSource* self) { +gboolean +spit_data_imports_data_import_source_is_already_imported (SpitDataImportsDataImportSource* self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; const gchar* _tmp1_; @@ -955,33 +973,29 @@ gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImpor _tmp1_ = self->priv->preview_md5; #line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp1_ != NULL) { -#line 959 "DataImportSource.c" +#line 977 "DataImportSource.c" const gchar* _tmp2_; - PhotoFileFormat _tmp3_; - gboolean _tmp4_; #line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp2_ = self->priv->preview_md5; #line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp3_ = spit_data_imports_data_import_source_get_file_format (self); -#line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp4_ = library_photo_has_nontrash_duplicate (NULL, _tmp2_, NULL, _tmp3_); -#line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp0_ = _tmp4_; -#line 971 "DataImportSource.c" + _tmp0_ = library_photo_has_nontrash_duplicate (NULL, _tmp2_, NULL, spit_data_imports_data_import_source_get_file_format (self)); +#line 983 "DataImportSource.c" } else { #line 129 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp0_ = FALSE; -#line 975 "DataImportSource.c" +#line 987 "DataImportSource.c" } #line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" result = _tmp0_; #line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 981 "DataImportSource.c" +#line 993 "DataImportSource.c" } -gboolean spit_data_imports_data_import_source_was_backing_file_found (SpitDataImportsDataImportSource* self) { +gboolean +spit_data_imports_data_import_source_was_backing_file_found (SpitDataImportsDataImportSource* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -992,108 +1006,133 @@ gboolean spit_data_imports_data_import_source_was_backing_file_found (SpitDataIm result = _tmp0_; #line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 996 "DataImportSource.c" +#line 1010 "DataImportSource.c" } -static void spit_data_imports_value_data_import_source_init (GValue* value) { +static void +spit_data_imports_value_data_import_source_init (GValue* value) +{ #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" value->data[0].v_pointer = NULL; -#line 1003 "DataImportSource.c" +#line 1019 "DataImportSource.c" } -static void spit_data_imports_value_data_import_source_free_value (GValue* value) { +static void +spit_data_imports_value_data_import_source_free_value (GValue* value) +{ #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (value->data[0].v_pointer) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" spit_data_imports_data_import_source_unref (value->data[0].v_pointer); -#line 1012 "DataImportSource.c" +#line 1030 "DataImportSource.c" } } -static void spit_data_imports_value_data_import_source_copy_value (const GValue* src_value, GValue* dest_value) { +static void +spit_data_imports_value_data_import_source_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (src_value->data[0].v_pointer) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" dest_value->data[0].v_pointer = spit_data_imports_data_import_source_ref (src_value->data[0].v_pointer); -#line 1022 "DataImportSource.c" +#line 1043 "DataImportSource.c" } else { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" dest_value->data[0].v_pointer = NULL; -#line 1026 "DataImportSource.c" +#line 1047 "DataImportSource.c" } } -static gpointer spit_data_imports_value_data_import_source_peek_pointer (const GValue* value) { +static gpointer +spit_data_imports_value_data_import_source_peek_pointer (const GValue* value) +{ #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return value->data[0].v_pointer; -#line 1034 "DataImportSource.c" +#line 1057 "DataImportSource.c" } -static gchar* spit_data_imports_value_data_import_source_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +spit_data_imports_value_data_import_source_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (collect_values[0].v_pointer) { -#line 1041 "DataImportSource.c" +#line 1069 "DataImportSource.c" SpitDataImportsDataImportSource * object; object = collect_values[0].v_pointer; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (object->parent_instance.g_class == NULL) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1048 "DataImportSource.c" +#line 1076 "DataImportSource.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1052 "DataImportSource.c" +#line 1080 "DataImportSource.c" } #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" value->data[0].v_pointer = spit_data_imports_data_import_source_ref (object); -#line 1056 "DataImportSource.c" +#line 1084 "DataImportSource.c" } else { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" value->data[0].v_pointer = NULL; -#line 1060 "DataImportSource.c" +#line 1088 "DataImportSource.c" } #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return NULL; -#line 1064 "DataImportSource.c" +#line 1092 "DataImportSource.c" } -static gchar* spit_data_imports_value_data_import_source_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +spit_data_imports_value_data_import_source_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ SpitDataImportsDataImportSource ** object_p; object_p = collect_values[0].v_pointer; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (!object_p) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1075 "DataImportSource.c" +#line 1108 "DataImportSource.c" } #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (!value->data[0].v_pointer) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" *object_p = NULL; -#line 1081 "DataImportSource.c" +#line 1114 "DataImportSource.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" *object_p = value->data[0].v_pointer; -#line 1085 "DataImportSource.c" +#line 1118 "DataImportSource.c" } else { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" *object_p = spit_data_imports_data_import_source_ref (value->data[0].v_pointer); -#line 1089 "DataImportSource.c" +#line 1122 "DataImportSource.c" } #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return NULL; -#line 1093 "DataImportSource.c" +#line 1126 "DataImportSource.c" } -GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +spit_data_imports_param_spec_data_import_source (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ SpitDataImportsParamSpecDataImportSource* spec; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_val_if_fail (g_type_is_a (object_type, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE), NULL); @@ -1103,20 +1142,25 @@ GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name, G_PARAM_SPEC (spec)->value_type = object_type; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return G_PARAM_SPEC (spec); -#line 1107 "DataImportSource.c" +#line 1146 "DataImportSource.c" } -gpointer spit_data_imports_value_get_data_import_source (const GValue* value) { +gpointer +spit_data_imports_value_get_data_import_source (const GValue* value) +{ #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE), NULL); #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return value->data[0].v_pointer; -#line 1116 "DataImportSource.c" +#line 1157 "DataImportSource.c" } -void spit_data_imports_value_set_data_import_source (GValue* value, gpointer v_object) { +void +spit_data_imports_value_set_data_import_source (GValue* value, + gpointer v_object) +{ SpitDataImportsDataImportSource * old; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE)); @@ -1132,22 +1176,25 @@ void spit_data_imports_value_set_data_import_source (GValue* value, gpointer v_o value->data[0].v_pointer = v_object; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" spit_data_imports_data_import_source_ref (value->data[0].v_pointer); -#line 1136 "DataImportSource.c" +#line 1180 "DataImportSource.c" } else { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" value->data[0].v_pointer = NULL; -#line 1140 "DataImportSource.c" +#line 1184 "DataImportSource.c" } #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (old) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" spit_data_imports_data_import_source_unref (old); -#line 1146 "DataImportSource.c" +#line 1190 "DataImportSource.c" } } -void spit_data_imports_value_take_data_import_source (GValue* value, gpointer v_object) { +void +spit_data_imports_value_take_data_import_source (GValue* value, + gpointer v_object) +{ SpitDataImportsDataImportSource * old; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE)); @@ -1161,33 +1208,37 @@ void spit_data_imports_value_take_data_import_source (GValue* value, gpointer v_ g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" value->data[0].v_pointer = v_object; -#line 1165 "DataImportSource.c" +#line 1212 "DataImportSource.c" } else { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" value->data[0].v_pointer = NULL; -#line 1169 "DataImportSource.c" +#line 1216 "DataImportSource.c" } #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (old) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" spit_data_imports_data_import_source_unref (old); -#line 1175 "DataImportSource.c" +#line 1222 "DataImportSource.c" } } -static void spit_data_imports_data_import_source_class_init (SpitDataImportsDataImportSourceClass * klass) { +static void +spit_data_imports_data_import_source_class_init (SpitDataImportsDataImportSourceClass * klass) +{ #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" spit_data_imports_data_import_source_parent_class = g_type_class_peek_parent (klass); #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" ((SpitDataImportsDataImportSourceClass *) klass)->finalize = spit_data_imports_data_import_source_finalize; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_type_class_add_private (klass, sizeof (SpitDataImportsDataImportSourcePrivate)); -#line 1187 "DataImportSource.c" +#line 1236 "DataImportSource.c" } -static void spit_data_imports_data_import_source_instance_init (SpitDataImportsDataImportSource * self) { +static void +spit_data_imports_data_import_source_instance_init (SpitDataImportsDataImportSource * self) +{ #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" self->priv = SPIT_DATA_IMPORTS_DATA_IMPORT_SOURCE_GET_PRIVATE (self); #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -1196,11 +1247,13 @@ static void spit_data_imports_data_import_source_instance_init (SpitDataImportsD self->priv->preview_md5 = NULL; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" self->ref_count = 1; -#line 1200 "DataImportSource.c" +#line 1251 "DataImportSource.c" } -static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataImportSource * obj) { +static void +spit_data_imports_data_import_source_finalize (SpitDataImportsDataImportSource * obj) +{ SpitDataImportsDataImportSource * self; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE, SpitDataImportsDataImportSource); @@ -1214,7 +1267,7 @@ static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataIm _g_free0 (self->priv->preview_md5); #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _metadata_date_time_unref0 (self->priv->exposure_time); -#line 1218 "DataImportSource.c" +#line 1271 "DataImportSource.c" } @@ -1226,7 +1279,9 @@ static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataIm * This class does not extend PhotoSource in order to minimise the API to the * absolute minimum required to run the import job. */ -GType spit_data_imports_data_import_source_get_type (void) { +GType +spit_data_imports_data_import_source_get_type (void) +{ static volatile gsize spit_data_imports_data_import_source_type_id__volatile = 0; if (g_once_init_enter (&spit_data_imports_data_import_source_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { spit_data_imports_value_data_import_source_init, spit_data_imports_value_data_import_source_free_value, spit_data_imports_value_data_import_source_copy_value, spit_data_imports_value_data_import_source_peek_pointer, "p", spit_data_imports_value_data_import_source_collect_value, "p", spit_data_imports_value_data_import_source_lcopy_value }; @@ -1240,18 +1295,22 @@ GType spit_data_imports_data_import_source_get_type (void) { } -gpointer spit_data_imports_data_import_source_ref (gpointer instance) { +gpointer +spit_data_imports_data_import_source_ref (gpointer instance) +{ SpitDataImportsDataImportSource * self; self = instance; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_atomic_int_inc (&self->ref_count); #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return instance; -#line 1251 "DataImportSource.c" +#line 1308 "DataImportSource.c" } -void spit_data_imports_data_import_source_unref (gpointer instance) { +void +spit_data_imports_data_import_source_unref (gpointer instance) +{ SpitDataImportsDataImportSource * self; self = instance; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -1260,7 +1319,7 @@ void spit_data_imports_data_import_source_unref (gpointer instance) { SPIT_DATA_IMPORTS_DATA_IMPORT_SOURCE_GET_CLASS (self)->finalize (self); #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1264 "DataImportSource.c" +#line 1323 "DataImportSource.c" } } diff --git a/src/data_imports/DataImports.c b/src/data_imports/DataImports.c index 47b2e0a..e7ae485 100644 --- a/src/data_imports/DataImports.c +++ b/src/data_imports/DataImports.c @@ -1,4 +1,4 @@ -/* DataImports.c generated by valac 0.36.6, the Vala compiler +/* DataImports.c generated by valac 0.40.4, the Vala compiler * generated from DataImports.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -15,6 +15,7 @@ * the preconfigure() method, implement it, and ensure in init() that it's been called. */ + #include #include #include @@ -26,32 +27,50 @@ void data_imports_init (GError** error); -static void _vala_array_add71 (gchar** * array, int* length, int* size, gchar* value); -void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1); +static void _vala_array_add71 (gchar** * array, + int* length, + int* size, + gchar* value); +void plugins_register_extension_point (GType type, + const gchar* name, + const gchar* icon_name, + gchar** core_ids, + int core_ids_length1); #define RESOURCES_IMPORT "import" void data_imports_terminate (void); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -static void _vala_array_add71 (gchar** * array, int* length, int* size, gchar* value) { +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); + + +static void +_vala_array_add71 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala" if ((*length) == (*size)) { #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala" *size = (*size) ? (2 * (*size)) : 4; #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 45 "DataImports.c" +#line 62 "DataImports.c" } #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala" (*array)[(*length)++] = value; #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala" (*array)[*length] = NULL; -#line 51 "DataImports.c" +#line 68 "DataImports.c" } -void data_imports_init (GError** error) { +void +data_imports_init (GError** error) +{ gchar** core_ids = NULL; gchar** _tmp0_; gint core_ids_length1; @@ -85,15 +104,21 @@ void data_imports_init (GError** error) { plugins_register_extension_point (SPIT_DATA_IMPORTS_TYPE_SERVICE, _ ("Data Imports"), RESOURCES_IMPORT, _tmp3_, _tmp3__length1); #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala" core_ids = (_vala_array_free (core_ids, core_ids_length1, (GDestroyNotify) g_free), NULL); -#line 89 "DataImports.c" +#line 108 "DataImports.c" } -void data_imports_terminate (void) { +void +data_imports_terminate (void) +{ } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -105,7 +130,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/data_imports/DataImportsPluginHost.c b/src/data_imports/DataImportsPluginHost.c index d07da46..6b42fc1 100644 --- a/src/data_imports/DataImportsPluginHost.c +++ b/src/data_imports/DataImportsPluginHost.c @@ -1,4 +1,4 @@ -/* DataImportsPluginHost.c generated by valac 0.36.6, the Vala compiler +/* DataImportsPluginHost.c generated by valac 0.40.4, the Vala compiler * generated from DataImportsPluginHost.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include "shotwell-plugin-dev-1.0.h" @@ -190,6 +191,11 @@ typedef struct _DataImportsUIConcreteDialogPaneClass DataImportsUIConcreteDialog typedef struct _DataImportsUIProgressPane DataImportsUIProgressPane; typedef struct _DataImportsUIProgressPaneClass DataImportsUIProgressPaneClass; +enum { + SPIT_DATA_IMPORTS_CONCRETE_DATA_IMPORTS_HOST_0_PROPERTY, + SPIT_DATA_IMPORTS_CONCRETE_DATA_IMPORTS_HOST_NUM_PROPERTIES +}; +static GParamSpec* spit_data_imports_concrete_data_imports_host_properties[SPIT_DATA_IMPORTS_CONCRETE_DATA_IMPORTS_HOST_NUM_PROPERTIES]; #define _spit_data_imports_core_importer_unref0(var) ((var == NULL) ? NULL : (var = (spit_data_imports_core_importer_unref (var), NULL))) #define DATA_IMPORTS_UI_TYPE_STATIC_MESSAGE_PANE (data_imports_ui_static_message_pane_get_type ()) @@ -232,6 +238,11 @@ typedef struct _SpitDataImportsWelcomeDataImportsHostPrivate SpitDataImportsWelc typedef struct _SpitDataImportsWelcomeImportMetaHost SpitDataImportsWelcomeImportMetaHost; typedef struct _SpitDataImportsWelcomeImportMetaHostClass SpitDataImportsWelcomeImportMetaHostClass; +enum { + SPIT_DATA_IMPORTS_WELCOME_DATA_IMPORTS_HOST_0_PROPERTY, + SPIT_DATA_IMPORTS_WELCOME_DATA_IMPORTS_HOST_NUM_PROPERTIES +}; +static GParamSpec* spit_data_imports_welcome_data_imports_host_properties[SPIT_DATA_IMPORTS_WELCOME_DATA_IMPORTS_HOST_NUM_PROPERTIES]; #define TYPE_WELCOME_SERVICE_ENTRY (welcome_service_entry_get_type ()) #define WELCOME_SERVICE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_WELCOME_SERVICE_ENTRY, WelcomeServiceEntry)) @@ -251,6 +262,11 @@ typedef struct _WelcomeServiceEntryIface WelcomeServiceEntryIface; typedef struct _SpitDataImportsWelcomeImportServiceEntry SpitDataImportsWelcomeImportServiceEntry; typedef struct _SpitDataImportsWelcomeImportServiceEntryClass SpitDataImportsWelcomeImportServiceEntryClass; typedef struct _SpitDataImportsWelcomeImportServiceEntryPrivate SpitDataImportsWelcomeImportServiceEntryPrivate; +enum { + SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_0_PROPERTY, + SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* spit_data_imports_welcome_import_service_entry_properties[SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_NUM_PROPERTIES]; typedef struct _SpitDataImportsWelcomeImportMetaHostPrivate SpitDataImportsWelcomeImportMetaHostPrivate; #define TYPE_WELCOME_DIALOG (welcome_dialog_get_type ()) @@ -262,6 +278,11 @@ typedef struct _SpitDataImportsWelcomeImportMetaHostPrivate SpitDataImportsWelco typedef struct _WelcomeDialog WelcomeDialog; typedef struct _WelcomeDialogClass WelcomeDialogClass; +enum { + SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_0_PROPERTY, + SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_NUM_PROPERTIES +}; +static GParamSpec* spit_data_imports_welcome_import_meta_host_properties[SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_NUM_PROPERTIES]; typedef struct _ImportManifestPrivate ImportManifestPrivate; #define TYPE_DATA_OBJECT (data_object_get_type ()) @@ -464,71 +485,140 @@ ImportManifest* spit_data_imports_meta_manifest = NULL; gpointer spit_data_imports_core_importer_ref (gpointer instance); void spit_data_imports_core_importer_unref (gpointer instance); -GParamSpec* spit_data_imports_param_spec_core_importer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void spit_data_imports_value_set_core_importer (GValue* value, gpointer v_object); -void spit_data_imports_value_take_core_importer (GValue* value, gpointer v_object); +GParamSpec* spit_data_imports_param_spec_core_importer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void spit_data_imports_value_set_core_importer (GValue* value, + gpointer v_object); +void spit_data_imports_value_take_core_importer (GValue* value, + gpointer v_object); gpointer spit_data_imports_value_get_core_importer (const GValue* value); GType spit_data_imports_core_importer_get_type (void) G_GNUC_CONST; gpointer batch_import_roll_ref (gpointer instance); void batch_import_roll_unref (gpointer instance); -GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_roll (GValue* value, gpointer v_object); -void value_take_batch_import_roll (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_roll (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_roll (GValue* value, + gpointer v_object); +void value_take_batch_import_roll (GValue* value, + gpointer v_object); gpointer value_get_batch_import_roll (const GValue* value); GType batch_import_roll_get_type (void) G_GNUC_CONST; #define SPIT_DATA_IMPORTS_CORE_IMPORTER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER, SpitDataImportsCoreImporterPrivate)) -enum { - SPIT_DATA_IMPORTS_CORE_IMPORTER_DUMMY_PROPERTY -}; SpitDataImportsCoreImporter* spit_data_imports_core_importer_new (SpitDataImportsPluginHost* host); -SpitDataImportsCoreImporter* spit_data_imports_core_importer_construct (GType object_type, SpitDataImportsPluginHost* host); -void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImportsCoreImporter* self, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message); +SpitDataImportsCoreImporter* spit_data_imports_core_importer_construct (GType object_type, + SpitDataImportsPluginHost* host); +void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImportsCoreImporter* self, + SpitDataImportsImportableMediaItem** items, + int items_length1, + gdouble progress, + gdouble host_progress_delta, + const gchar* progress_message); GType sorted_list_get_type (void) G_GNUC_CONST; gpointer batch_import_job_ref (gpointer instance); void batch_import_job_unref (gpointer instance); -GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_job (GValue* value, gpointer v_object); -void value_take_batch_import_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_job (GValue* value, + gpointer v_object); +void value_take_batch_import_job (GValue* value, + gpointer v_object); gpointer value_get_batch_import_job (const GValue* value); GType batch_import_job_get_type (void) G_GNUC_CONST; GType spit_data_imports_data_import_job_get_type (void) G_GNUC_CONST; -gint64 spit_data_imports_import_job_comparator (void* a, void* b); -static gint64 _spit_data_imports_import_job_comparator_comparator (void* a, void* b, gpointer self); -SortedList* sorted_list_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target); -SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target); +gint64 spit_data_imports_import_job_comparator (void* a, + void* b); +static gint64 _spit_data_imports_import_job_comparator_comparator (void* a, + void* b, + gpointer self); +SortedList* sorted_list_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + Comparator cmp, + void* cmp_target); +SortedList* sorted_list_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + Comparator cmp, + void* cmp_target); gpointer spit_data_imports_data_import_source_ref (gpointer instance); void spit_data_imports_data_import_source_unref (gpointer instance); -GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void spit_data_imports_value_set_data_import_source (GValue* value, gpointer v_object); -void spit_data_imports_value_take_data_import_source (GValue* value, gpointer v_object); +GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void spit_data_imports_value_set_data_import_source (GValue* value, + gpointer v_object); +void spit_data_imports_value_take_data_import_source (GValue* value, + gpointer v_object); gpointer spit_data_imports_value_get_data_import_source (const GValue* value); GType spit_data_imports_data_import_source_get_type (void) G_GNUC_CONST; SpitDataImportsDataImportSource* spit_data_imports_data_import_source_new (SpitDataImportsImportableMediaItem* db_photo); -SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct (GType object_type, SpitDataImportsImportableMediaItem* db_photo); +SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct (GType object_type, + SpitDataImportsImportableMediaItem* db_photo); gboolean spit_data_imports_data_import_source_was_backing_file_found (SpitDataImportsDataImportSource* self); gchar* spit_data_imports_data_import_source_get_filename (SpitDataImportsDataImportSource* self); SpitDataImportsDataImportJob* spit_data_imports_data_import_job_new (SpitDataImportsDataImportSource* import_source); -SpitDataImportsDataImportJob* spit_data_imports_data_import_job_construct (GType object_type, SpitDataImportsDataImportSource* import_source); +SpitDataImportsDataImportJob* spit_data_imports_data_import_job_construct (GType object_type, + SpitDataImportsDataImportSource* import_source); gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImportsDataImportSource* self); BatchImportRoll* batch_import_roll_new (void); BatchImportRoll* batch_import_roll_construct (GType object_type); GType batch_import_get_type (void) G_GNUC_CONST; gpointer import_manifest_ref (gpointer instance); void import_manifest_unref (gpointer instance); -GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_import_manifest (GValue* value, gpointer v_object); -void value_take_import_manifest (GValue* value, gpointer v_object); +GParamSpec* param_spec_import_manifest (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_import_manifest (GValue* value, + gpointer v_object); +void value_take_import_manifest (GValue* value, + gpointer v_object); gpointer value_get_import_manifest (const GValue* value); GType import_manifest_get_type (void) G_GNUC_CONST; -void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll); -static void _spit_data_imports_data_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self); -BatchImport* batch_import_new (GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest); -BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest); +void spit_data_imports_data_import_reporter (ImportManifest* manifest, + BatchImportRoll* import_roll); +static void _spit_data_imports_data_import_reporter_batch_import_import_reporter (ImportManifest* manifest, + BatchImportRoll* import_roll, + gpointer self); +BatchImport* batch_import_new (GeeIterable* jobs, + const gchar* name, + BatchImportImportReporter reporter, + void* reporter_target, + GeeArrayList* prefailed, + GeeArrayList* pre_already_imported, + GCancellable* cancellable, + BatchImportRoll* import_roll, + ImportManifest* skip_manifest); +BatchImport* batch_import_construct (GType object_type, + GeeIterable* jobs, + const gchar* name, + BatchImportImportReporter reporter, + void* reporter_target, + GeeArrayList* prefailed, + GeeArrayList* pre_already_imported, + GCancellable* cancellable, + BatchImportRoll* import_roll, + ImportManifest* skip_manifest); GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; GType library_window_get_type (void) G_GNUC_CONST; LibraryWindow* library_window_get_app (void); -void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batch_import, gboolean allow_user_cancel); +void library_window_enqueue_batch_import (LibraryWindow* self, + BatchImport* batch_import, + gboolean allow_user_cancel); void spit_data_imports_core_importer_finalize_import (SpitDataImportsCoreImporter* self); static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporter * obj); GType plugins_standard_host_interface_get_type (void) G_GNUC_CONST; @@ -537,526 +627,610 @@ GType data_imports_ui_data_imports_dialog_get_type (void) G_GNUC_CONST; GType data_imports_ui_concrete_dialog_pane_get_type (void) G_GNUC_CONST; GType data_imports_ui_progress_pane_get_type (void) G_GNUC_CONST; #define SPIT_DATA_IMPORTS_CONCRETE_DATA_IMPORTS_HOST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHostPrivate)) -enum { - SPIT_DATA_IMPORTS_CONCRETE_DATA_IMPORTS_HOST_DUMMY_PROPERTY -}; -SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_new (SpitDataImportsService* service, DataImportsUIDataImportsDialog* dialog); -SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_construct (GType object_type, SpitDataImportsService* service, DataImportsUIDataImportsDialog* dialog); -PluginsStandardHostInterface* plugins_standard_host_interface_new (SpitPluggable* pluggable, const gchar* config_domain); -PluginsStandardHostInterface* plugins_standard_host_interface_construct (GType object_type, SpitPluggable* pluggable, const gchar* config_domain); +SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_new (SpitDataImportsService* service, + DataImportsUIDataImportsDialog* dialog); +SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_construct (GType object_type, + SpitDataImportsService* service, + DataImportsUIDataImportsDialog* dialog); +PluginsStandardHostInterface* plugins_standard_host_interface_new (SpitPluggable* pluggable, + const gchar* config_domain); +PluginsStandardHostInterface* plugins_standard_host_interface_construct (GType object_type, + SpitPluggable* pluggable, + const gchar* config_domain); static SpitDataImportsDataImporter* spit_data_imports_concrete_data_imports_host_real_get_data_importer (SpitDataImportsPluginHost* base); static void spit_data_imports_concrete_data_imports_host_real_start_importing (SpitDataImportsPluginHost* base); static void spit_data_imports_concrete_data_imports_host_real_stop_importing (SpitDataImportsPluginHost* base); static void spit_data_imports_concrete_data_imports_host_clean_up (SpitDataImportsConcreteDataImportsHost* self); -void spit_data_imports_concrete_data_imports_host_set_button_mode (SpitDataImportsConcreteDataImportsHost* self, SpitDataImportsPluginHostButtonMode mode); +void spit_data_imports_concrete_data_imports_host_set_button_mode (SpitDataImportsConcreteDataImportsHost* self, + SpitDataImportsPluginHostButtonMode mode); void data_imports_ui_data_imports_dialog_set_close_button_mode (DataImportsUIDataImportsDialog* self); void data_imports_ui_data_imports_dialog_set_cancel_button_mode (DataImportsUIDataImportsDialog* self); -static void spit_data_imports_concrete_data_imports_host_real_post_error (SpitDataImportsPluginHost* base, GError* err); -static void spit_data_imports_concrete_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base, const gchar* message); -void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsDialog* self, SpitDataImportsDialogPane* pane); +static void spit_data_imports_concrete_data_imports_host_real_post_error (SpitDataImportsPluginHost* base, + GError* err); +static void spit_data_imports_concrete_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base, + const gchar* message); +void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsDialog* self, + SpitDataImportsDialogPane* pane); DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_new_with_pango (const gchar* msg); -DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct_with_pango (GType object_type, const gchar* msg); +DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct_with_pango (GType object_type, + const gchar* msg); GType data_imports_ui_static_message_pane_get_type (void) G_GNUC_CONST; void data_imports_ui_data_imports_dialog_unlock_service (DataImportsUIDataImportsDialog* self); -static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pane (SpitDataImportsPluginHost* base, SpitDataImportsDialogPane* pane, SpitDataImportsPluginHostButtonMode button_mode); -static void spit_data_imports_concrete_data_imports_host_real_install_static_message_pane (SpitDataImportsPluginHost* base, const gchar* message, SpitDataImportsPluginHostButtonMode button_mode); -static void spit_data_imports_concrete_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label); -DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_new (SpitDataImportsPluginHost* host, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label); -DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_construct (GType object_type, SpitDataImportsPluginHost* host, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label); +static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pane (SpitDataImportsPluginHost* base, + SpitDataImportsDialogPane* pane, + SpitDataImportsPluginHostButtonMode button_mode); +static void spit_data_imports_concrete_data_imports_host_real_install_static_message_pane (SpitDataImportsPluginHost* base, + const gchar* message, + SpitDataImportsPluginHostButtonMode button_mode); +static void spit_data_imports_concrete_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base, + const gchar* welcome_message, + SpitDataImportsImportableLibrary** discovered_libraries, + int discovered_libraries_length1, + const gchar* file_select_label); +DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_new (SpitDataImportsPluginHost* host, + const gchar* welcome_message, + SpitDataImportsImportableLibrary** discovered_libraries, + int discovered_libraries_length1, + const gchar* file_select_label); +DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_construct (GType object_type, + SpitDataImportsPluginHost* host, + const gchar* welcome_message, + SpitDataImportsImportableLibrary** discovered_libraries, + int discovered_libraries_length1, + const gchar* file_select_label); GType data_imports_ui_library_selection_pane_get_type (void) G_GNUC_CONST; -static void spit_data_imports_concrete_data_imports_host_real_install_import_progress_pane (SpitDataImportsPluginHost* base, const gchar* message); +static void spit_data_imports_concrete_data_imports_host_real_install_import_progress_pane (SpitDataImportsPluginHost* base, + const gchar* message); DataImportsUIProgressPane* data_imports_ui_progress_pane_new (const gchar* message); -DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object_type, const gchar* message); -static void spit_data_imports_concrete_data_imports_host_real_update_import_progress_pane (SpitDataImportsPluginHost* base, gdouble progress, const gchar* progress_message); -void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* self, gdouble progress, const gchar* progress_message); -static void spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message); -static void spit_data_imports_concrete_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message); +DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object_type, + const gchar* message); +static void spit_data_imports_concrete_data_imports_host_real_update_import_progress_pane (SpitDataImportsPluginHost* base, + gdouble progress, + const gchar* progress_message); +void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* self, + gdouble progress, + const gchar* progress_message); +static void spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, + SpitDataImportsImportableMediaItem** items, + int items_length1, + gdouble progress, + gdouble host_progress_delta, + const gchar* progress_message); +static void spit_data_imports_concrete_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, + SpitDataImportsImportedItemsCountCallback report_imported_items_count, + void* report_imported_items_count_target, + const gchar* finalize_message); void library_window_switch_to_import_queue_page (LibraryWindow* self); static void spit_data_imports_concrete_data_imports_host_finalize (GObject * obj); GType spit_data_imports_welcome_data_imports_host_get_type (void) G_GNUC_CONST; GType spit_data_imports_welcome_import_meta_host_get_type (void) G_GNUC_CONST; #define SPIT_DATA_IMPORTS_WELCOME_DATA_IMPORTS_HOST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHostPrivate)) -enum { - SPIT_DATA_IMPORTS_WELCOME_DATA_IMPORTS_HOST_DUMMY_PROPERTY -}; -SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_host_new (SpitDataImportsService* service, SpitDataImportsWelcomeImportMetaHost* meta_host); -SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_host_construct (GType object_type, SpitDataImportsService* service, SpitDataImportsWelcomeImportMetaHost* meta_host); +SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_host_new (SpitDataImportsService* service, + SpitDataImportsWelcomeImportMetaHost* meta_host); +SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_host_construct (GType object_type, + SpitDataImportsService* service, + SpitDataImportsWelcomeImportMetaHost* meta_host); static SpitDataImportsDataImporter* spit_data_imports_welcome_data_imports_host_real_get_data_importer (SpitDataImportsPluginHost* base); static void spit_data_imports_welcome_data_imports_host_real_start_importing (SpitDataImportsPluginHost* base); static void spit_data_imports_welcome_data_imports_host_real_stop_importing (SpitDataImportsPluginHost* base); static void spit_data_imports_welcome_data_imports_host_clean_up (SpitDataImportsWelcomeDataImportsHost* self); -static void spit_data_imports_welcome_data_imports_host_real_post_error (SpitDataImportsPluginHost* base, GError* err); -static void spit_data_imports_welcome_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base, const gchar* message); -static void spit_data_imports_welcome_data_imports_host_real_install_dialog_pane (SpitDataImportsPluginHost* base, SpitDataImportsDialogPane* pane, SpitDataImportsPluginHostButtonMode button_mode); -static void spit_data_imports_welcome_data_imports_host_real_install_static_message_pane (SpitDataImportsPluginHost* base, const gchar* message, SpitDataImportsPluginHostButtonMode button_mode); -static void spit_data_imports_welcome_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label); +static void spit_data_imports_welcome_data_imports_host_real_post_error (SpitDataImportsPluginHost* base, + GError* err); +static void spit_data_imports_welcome_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base, + const gchar* message); +static void spit_data_imports_welcome_data_imports_host_real_install_dialog_pane (SpitDataImportsPluginHost* base, + SpitDataImportsDialogPane* pane, + SpitDataImportsPluginHostButtonMode button_mode); +static void spit_data_imports_welcome_data_imports_host_real_install_static_message_pane (SpitDataImportsPluginHost* base, + const gchar* message, + SpitDataImportsPluginHostButtonMode button_mode); +static void spit_data_imports_welcome_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base, + const gchar* welcome_message, + SpitDataImportsImportableLibrary** discovered_libraries, + int discovered_libraries_length1, + const gchar* file_select_label); GType welcome_service_entry_get_type (void) G_GNUC_CONST; -void spit_data_imports_welcome_import_meta_host_install_service_entry (SpitDataImportsWelcomeImportMetaHost* self, WelcomeServiceEntry* entry); -SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_service_entry_new (SpitDataImportsPluginHost* host, const gchar* pluggable_name, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1); -SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_service_entry_construct (GType object_type, SpitDataImportsPluginHost* host, const gchar* pluggable_name, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1); +void spit_data_imports_welcome_import_meta_host_install_service_entry (SpitDataImportsWelcomeImportMetaHost* self, + WelcomeServiceEntry* entry); +SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_service_entry_new (SpitDataImportsPluginHost* host, + const gchar* pluggable_name, + SpitDataImportsImportableLibrary** discovered_libraries, + int discovered_libraries_length1); +SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_service_entry_construct (GType object_type, + SpitDataImportsPluginHost* host, + const gchar* pluggable_name, + SpitDataImportsImportableLibrary** discovered_libraries, + int discovered_libraries_length1); GType spit_data_imports_welcome_import_service_entry_get_type (void) G_GNUC_CONST; -static void spit_data_imports_welcome_data_imports_host_real_install_import_progress_pane (SpitDataImportsPluginHost* base, const gchar* message); -static void spit_data_imports_welcome_data_imports_host_real_update_import_progress_pane (SpitDataImportsPluginHost* base, gdouble progress, const gchar* progress_message); -static void spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message); -static void spit_data_imports_welcome_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message); -void spit_data_imports_welcome_import_meta_host_finalize_import (SpitDataImportsWelcomeImportMetaHost* self, SpitDataImportsWelcomeDataImportsHost* host); +static void spit_data_imports_welcome_data_imports_host_real_install_import_progress_pane (SpitDataImportsPluginHost* base, + const gchar* message); +static void spit_data_imports_welcome_data_imports_host_real_update_import_progress_pane (SpitDataImportsPluginHost* base, + gdouble progress, + const gchar* progress_message); +static void spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, + SpitDataImportsImportableMediaItem** items, + int items_length1, + gdouble progress, + gdouble host_progress_delta, + const gchar* progress_message); +static void spit_data_imports_welcome_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, + SpitDataImportsImportedItemsCountCallback report_imported_items_count, + void* report_imported_items_count_target, + const gchar* finalize_message); +void spit_data_imports_welcome_import_meta_host_finalize_import (SpitDataImportsWelcomeImportMetaHost* self, + SpitDataImportsWelcomeDataImportsHost* host); static void spit_data_imports_welcome_data_imports_host_finalize (GObject * obj); #define SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, SpitDataImportsWelcomeImportServiceEntryPrivate)) -enum { - SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_DUMMY_PROPERTY -}; -static SpitDataImportsImportableLibrary** _vala_array_dup21 (SpitDataImportsImportableLibrary** self, int length); +static SpitDataImportsImportableLibrary** _vala_array_dup21 (SpitDataImportsImportableLibrary** self, + int length); static gchar* spit_data_imports_welcome_import_service_entry_real_get_service_name (WelcomeServiceEntry* base); static void spit_data_imports_welcome_import_service_entry_real_execute (WelcomeServiceEntry* base); static void spit_data_imports_welcome_import_service_entry_finalize (GObject * obj); GType welcome_dialog_get_type (void) G_GNUC_CONST; #define SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, SpitDataImportsWelcomeImportMetaHostPrivate)) -enum { - SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_DUMMY_PROPERTY -}; SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_new (WelcomeDialog* dialog); -SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_construct (GType object_type, WelcomeDialog* dialog); +SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_construct (GType object_type, + WelcomeDialog* dialog); void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImportMetaHost* self); SpitDataImportsService** spit_data_imports_load_all_services (int* result_length1); gchar* welcome_service_entry_get_service_name (WelcomeServiceEntry* self); -void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEntry* entry); +void welcome_dialog_install_service_entry (WelcomeDialog* self, + WelcomeServiceEntry* entry); static void spit_data_imports_welcome_import_meta_host_finalize (GObject * obj); -SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int* result_length1); -GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled); +SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, + int* result_length1); +GeeCollection* plugins_get_pluggables_for_type (GType type, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify, + gboolean include_disabled); gchar* plugins_get_pluggable_module_id (SpitPluggable* needle); -static void _vala_array_add72 (SpitDataImportsService** * array, int* length, int* size, SpitDataImportsService* value); -static gint __lambda25_ (void* a, void* b); -gint utf8_cs_compare (void* a, void* b); -static gint ___lambda25____compar_fn_t (void* key1, void* key2); +static void _vala_array_add72 (SpitDataImportsService** * array, + int* length, + int* size, + SpitDataImportsService* value); +static gint __lambda25_ (void* a, + void* b); +gint utf8_cs_compare (void* a, + void* b); +static gint ___lambda25____compar_fn_t (void* key1, + void* key2); GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; gpointer batch_import_result_ref (gpointer instance); void batch_import_result_unref (gpointer instance); -GParamSpec* param_spec_batch_import_result (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_result (GValue* value, gpointer v_object); -void value_take_batch_import_result (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_result (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_result (GValue* value, + gpointer v_object); +void value_take_batch_import_result (GValue* value, + gpointer v_object); gpointer value_get_batch_import_result (const GValue* value); GType batch_import_result_get_type (void) G_GNUC_CONST; -ImportManifest* import_manifest_new (GeeList* prefailed, GeeList* pre_already_imported); -ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed, GeeList* pre_already_imported); -void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_result); +ImportManifest* import_manifest_new (GeeList* prefailed, + GeeList* pre_already_imported); +ImportManifest* import_manifest_construct (GType object_type, + GeeList* prefailed, + GeeList* pre_already_imported); +void import_manifest_add_result (ImportManifest* self, + BatchImportResult* batch_result); void data_imports_ui_data_imports_dialog_terminate_instance (void); gpointer import_ui_question_params_ref (gpointer instance); void import_ui_question_params_unref (gpointer instance); -GParamSpec* import_ui_param_spec_question_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void import_ui_value_set_question_params (GValue* value, gpointer v_object); -void import_ui_value_take_question_params (GValue* value, gpointer v_object); +GParamSpec* import_ui_param_spec_question_params (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void import_ui_value_set_question_params (GValue* value, + gpointer v_object); +void import_ui_value_take_question_params (GValue* value, + gpointer v_object); gpointer import_ui_value_get_question_params (const GValue* value); GType import_ui_question_params_get_type (void) G_GNUC_CONST; -gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest_id, ImportUIQuestionParams* question); +gboolean import_ui_report_manifest (ImportManifest* manifest, + gboolean show_dest_id, + ImportUIQuestionParams* question); time_t spit_data_imports_data_import_job_get_exposure_time (SpitDataImportsDataImportJob* self); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -SpitDataImportsCoreImporter* spit_data_imports_core_importer_construct (GType object_type, SpitDataImportsPluginHost* host) { +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); + + +SpitDataImportsCoreImporter* +spit_data_imports_core_importer_construct (GType object_type, + SpitDataImportsPluginHost* host) +{ SpitDataImportsCoreImporter* self = NULL; - SpitDataImportsPluginHost* _tmp0_; #line 14 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (host), NULL); #line 14 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = (SpitDataImportsCoreImporter*) g_type_create_instance (object_type); #line 15 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = host; -#line 15 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - self->priv->host = _tmp0_; + self->priv->host = host; #line 14 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return self; -#line 673 "DataImportsPluginHost.c" +#line 862 "DataImportsPluginHost.c" } -SpitDataImportsCoreImporter* spit_data_imports_core_importer_new (SpitDataImportsPluginHost* host) { +SpitDataImportsCoreImporter* +spit_data_imports_core_importer_new (SpitDataImportsPluginHost* host) +{ #line 14 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return spit_data_imports_core_importer_construct (SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER, host); -#line 680 "DataImportsPluginHost.c" +#line 871 "DataImportsPluginHost.c" } -static gint64 _spit_data_imports_import_job_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_spit_data_imports_import_job_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = spit_data_imports_import_job_comparator (a, b); #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return result; -#line 689 "DataImportsPluginHost.c" +#line 884 "DataImportsPluginHost.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return self ? g_object_ref (self) : NULL; -#line 696 "DataImportsPluginHost.c" +#line 893 "DataImportsPluginHost.c" } -static void _spit_data_imports_data_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { +static void +_spit_data_imports_data_import_reporter_batch_import_import_reporter (ImportManifest* manifest, + BatchImportRoll* import_roll, + gpointer self) +{ #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_data_import_reporter (manifest, import_roll); -#line 703 "DataImportsPluginHost.c" +#line 904 "DataImportsPluginHost.c" } -void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImportsCoreImporter* self, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message) { +void +spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImportsCoreImporter* self, + SpitDataImportsImportableMediaItem** items, + int items_length1, + gdouble progress, + gdouble host_progress_delta, + const gchar* progress_message) +{ SpitDataImportsPluginHost* _tmp0_; - gdouble _tmp1_; - const gchar* _tmp2_; SortedList* jobs = NULL; - SortedList* _tmp3_; + SortedList* _tmp1_; GeeArrayList* already_imported = NULL; - GeeArrayList* _tmp4_; + GeeArrayList* _tmp2_; GeeArrayList* failed = NULL; - GeeArrayList* _tmp5_; + GeeArrayList* _tmp3_; gint item_idx = 0; gdouble item_progress_delta = 0.0; - gdouble _tmp6_; - SpitDataImportsImportableMediaItem** _tmp7_; - gint _tmp7__length1; - SpitDataImportsImportableMediaItem** _tmp8_; - gint _tmp8__length1; - SortedList* _tmp39_; - gint _tmp40_; - gint _tmp41_; - SpitDataImportsPluginHost* _tmp65_; - gdouble _tmp66_; - gdouble _tmp67_; + SortedList* _tmp31_; + gint _tmp32_; + gint _tmp33_; + SpitDataImportsPluginHost* _tmp57_; #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_CORE_IMPORTER (self)); #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp0_ = self->priv->host; #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = progress; -#line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = progress_message; -#line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_plugin_host_update_import_progress_pane (_tmp0_, _tmp1_, _tmp2_); + spit_data_imports_plugin_host_update_import_progress_pane (_tmp0_, progress, progress_message); #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = sorted_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, _spit_data_imports_import_job_comparator_comparator, NULL); + _tmp1_ = sorted_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, _spit_data_imports_import_job_comparator_comparator, NULL); #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - jobs = _tmp3_; + jobs = _tmp1_; #line 28 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = gee_array_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); + _tmp2_ = gee_array_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); #line 28 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - already_imported = _tmp4_; + already_imported = _tmp2_; #line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp5_ = gee_array_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); + _tmp3_ = gee_array_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); #line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - failed = _tmp5_; + failed = _tmp3_; #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" item_idx = 0; #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp6_ = host_progress_delta; -#line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp7_ = items; -#line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp7__length1 = items_length1; -#line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - item_progress_delta = _tmp6_ / _tmp7__length1; -#line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp8_ = items; -#line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp8__length1 = items_length1; -#line 766 "DataImportsPluginHost.c" + item_progress_delta = host_progress_delta / items_length1; +#line 951 "DataImportsPluginHost.c" { SpitDataImportsImportableMediaItem** src_item_collection = NULL; gint src_item_collection_length1 = 0; gint _src_item_collection_size_ = 0; gint src_item_it = 0; #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - src_item_collection = _tmp8_; + src_item_collection = items; #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - src_item_collection_length1 = _tmp8__length1; + src_item_collection_length1 = items_length1; #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - for (src_item_it = 0; src_item_it < _tmp8__length1; src_item_it = src_item_it + 1) { -#line 778 "DataImportsPluginHost.c" - SpitDataImportsImportableMediaItem* _tmp9_; + for (src_item_it = 0; src_item_it < items_length1; src_item_it = src_item_it + 1) { +#line 963 "DataImportsPluginHost.c" + SpitDataImportsImportableMediaItem* _tmp4_; SpitDataImportsImportableMediaItem* src_item = NULL; #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp9_ = _g_object_ref0 (src_item_collection[src_item_it]); + _tmp4_ = _g_object_ref0 (src_item_collection[src_item_it]); #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - src_item = _tmp9_; -#line 785 "DataImportsPluginHost.c" + src_item = _tmp4_; +#line 970 "DataImportsPluginHost.c" { SpitDataImportsDataImportSource* import_source = NULL; - SpitDataImportsImportableMediaItem* _tmp10_; - SpitDataImportsDataImportSource* _tmp11_; - SpitDataImportsDataImportSource* _tmp12_; - gboolean _tmp13_; - SpitDataImportsDataImportSource* _tmp21_; - gboolean _tmp22_; - SortedList* _tmp30_; - SpitDataImportsDataImportSource* _tmp31_; - SpitDataImportsDataImportJob* _tmp32_; - SpitDataImportsDataImportJob* _tmp33_; - gint _tmp34_; - SpitDataImportsPluginHost* _tmp35_; - gdouble _tmp36_; - gint _tmp37_; - gdouble _tmp38_; + SpitDataImportsImportableMediaItem* _tmp5_; + SpitDataImportsDataImportSource* _tmp6_; + SpitDataImportsDataImportSource* _tmp7_; + SpitDataImportsDataImportSource* _tmp15_; + SortedList* _tmp23_; + SpitDataImportsDataImportSource* _tmp24_; + SpitDataImportsDataImportJob* _tmp25_; + SpitDataImportsDataImportJob* _tmp26_; + gint _tmp27_; + SpitDataImportsPluginHost* _tmp28_; + gint _tmp29_; + gdouble _tmp30_; #line 36 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp10_ = src_item; + _tmp5_ = src_item; #line 36 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp11_ = spit_data_imports_data_import_source_new (_tmp10_); + _tmp6_ = spit_data_imports_data_import_source_new (_tmp5_); #line 36 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - import_source = _tmp11_; -#line 38 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp12_ = import_source; + import_source = _tmp6_; #line 38 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp13_ = spit_data_imports_data_import_source_was_backing_file_found (_tmp12_); + _tmp7_ = import_source; #line 38 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - if (!_tmp13_) { -#line 815 "DataImportsPluginHost.c" - SpitDataImportsDataImportSource* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; - GeeArrayList* _tmp17_; - SpitDataImportsDataImportSource* _tmp18_; - SpitDataImportsDataImportJob* _tmp19_; - SpitDataImportsDataImportJob* _tmp20_; + if (!spit_data_imports_data_import_source_was_backing_file_found (_tmp7_)) { +#line 995 "DataImportsPluginHost.c" + SpitDataImportsDataImportSource* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + GeeArrayList* _tmp11_; + SpitDataImportsDataImportSource* _tmp12_; + SpitDataImportsDataImportJob* _tmp13_; + SpitDataImportsDataImportJob* _tmp14_; #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp14_ = import_source; + _tmp8_ = import_source; #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp15_ = spit_data_imports_data_import_source_get_filename (_tmp14_); + _tmp9_ = spit_data_imports_data_import_source_get_filename (_tmp8_); #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp16_ = _tmp15_; + _tmp10_ = _tmp9_; #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_message ("DataImportsPluginHost.vala:39: Skipping import of %s: backing file not" \ -" found", _tmp16_); +" found", _tmp10_); #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp10_); #line 41 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp17_ = failed; + _tmp11_ = failed; #line 41 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp18_ = import_source; + _tmp12_ = import_source; #line 41 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp19_ = spit_data_imports_data_import_job_new (_tmp18_); + _tmp13_ = spit_data_imports_data_import_job_new (_tmp12_); #line 41 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp20_ = _tmp19_; + _tmp14_ = _tmp13_; #line 41 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_); #line 41 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _batch_import_job_unref0 (_tmp20_); + _batch_import_job_unref0 (_tmp14_); #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _spit_data_imports_data_import_source_unref0 (import_source); #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (src_item); #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" continue; -#line 851 "DataImportsPluginHost.c" +#line 1031 "DataImportsPluginHost.c" } #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp21_ = import_source; + _tmp15_ = import_source; #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp22_ = spit_data_imports_data_import_source_is_already_imported (_tmp21_); -#line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - if (_tmp22_) { -#line 859 "DataImportsPluginHost.c" - SpitDataImportsDataImportSource* _tmp23_; - gchar* _tmp24_; - gchar* _tmp25_; - GeeArrayList* _tmp26_; - SpitDataImportsDataImportSource* _tmp27_; - SpitDataImportsDataImportJob* _tmp28_; - SpitDataImportsDataImportJob* _tmp29_; + if (spit_data_imports_data_import_source_is_already_imported (_tmp15_)) { +#line 1037 "DataImportsPluginHost.c" + SpitDataImportsDataImportSource* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + GeeArrayList* _tmp19_; + SpitDataImportsDataImportSource* _tmp20_; + SpitDataImportsDataImportJob* _tmp21_; + SpitDataImportsDataImportJob* _tmp22_; #line 47 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp23_ = import_source; + _tmp16_ = import_source; #line 47 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp24_ = spit_data_imports_data_import_source_get_filename (_tmp23_); + _tmp17_ = spit_data_imports_data_import_source_get_filename (_tmp16_); #line 47 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp25_ = _tmp24_; + _tmp18_ = _tmp17_; #line 47 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_message ("DataImportsPluginHost.vala:47: Skipping import of %s: checksum detecte" \ -"d in library", _tmp25_); +"d in library", _tmp18_); #line 47 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_free0 (_tmp25_); + _g_free0 (_tmp18_); #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp26_ = already_imported; + _tmp19_ = already_imported; #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp27_ = import_source; + _tmp20_ = import_source; #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp28_ = spit_data_imports_data_import_job_new (_tmp27_); + _tmp21_ = spit_data_imports_data_import_job_new (_tmp20_); #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp29_ = _tmp28_; + _tmp22_ = _tmp21_; #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_); #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _batch_import_job_unref0 (_tmp29_); + _batch_import_job_unref0 (_tmp22_); #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _spit_data_imports_data_import_source_unref0 (import_source); #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (src_item); #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" continue; -#line 895 "DataImportsPluginHost.c" +#line 1073 "DataImportsPluginHost.c" } #line 54 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp30_ = jobs; + _tmp23_ = jobs; #line 54 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp31_ = import_source; + _tmp24_ = import_source; #line 54 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp32_ = spit_data_imports_data_import_job_new (_tmp31_); + _tmp25_ = spit_data_imports_data_import_job_new (_tmp24_); #line 54 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp33_ = _tmp32_; + _tmp26_ = _tmp25_; #line 54 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), _tmp33_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection), _tmp26_); #line 54 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _batch_import_job_unref0 (_tmp33_); + _batch_import_job_unref0 (_tmp26_); #line 55 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp34_ = item_idx; + _tmp27_ = item_idx; #line 55 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - item_idx = _tmp34_ + 1; -#line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp35_ = self->priv->host; + item_idx = _tmp27_ + 1; #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp36_ = progress; + _tmp28_ = self->priv->host; #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp37_ = item_idx; + _tmp29_ = item_idx; #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp38_ = item_progress_delta; + _tmp30_ = item_progress_delta; #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_plugin_host_update_import_progress_pane (_tmp35_, _tmp36_ + (_tmp37_ * _tmp38_), NULL); + spit_data_imports_plugin_host_update_import_progress_pane (_tmp28_, progress + (_tmp29_ * _tmp30_), NULL); #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _spit_data_imports_data_import_source_unref0 (import_source); #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (src_item); -#line 927 "DataImportsPluginHost.c" +#line 1103 "DataImportsPluginHost.c" } } } #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp39_ = jobs; + _tmp31_ = jobs; #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp40_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp32_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection)); #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp41_ = _tmp40_; + _tmp33_ = _tmp32_; #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - if (_tmp41_ > 0) { -#line 939 "DataImportsPluginHost.c" - BatchImportRoll* _tmp42_; + if (_tmp33_ > 0) { +#line 1115 "DataImportsPluginHost.c" + BatchImportRoll* _tmp34_; gchar* db_name = NULL; - SpitDataImportsPluginHost* _tmp44_; - SpitDataImportsDataImporter* _tmp45_; - SpitDataImportsDataImporter* _tmp46_; - SpitDataImportsService* _tmp47_; - SpitDataImportsService* _tmp48_; - const gchar* _tmp49_; - gchar* _tmp50_; - gchar* _tmp51_; + SpitDataImportsPluginHost* _tmp36_; + SpitDataImportsDataImporter* _tmp37_; + SpitDataImportsDataImporter* _tmp38_; + SpitDataImportsService* _tmp39_; + SpitDataImportsService* _tmp40_; + const gchar* _tmp41_; + gchar* _tmp42_; + gchar* _tmp43_; BatchImport* batch_import = NULL; - SortedList* _tmp52_; - const gchar* _tmp53_; - GeeArrayList* _tmp54_; - GeeArrayList* _tmp55_; - BatchImportRoll* _tmp56_; - BatchImport* _tmp57_; - LibraryWindow* _tmp58_; - LibraryWindow* _tmp59_; - BatchImport* _tmp60_; - gint _tmp61_; - SortedList* _tmp62_; - gint _tmp63_; - gint _tmp64_; + SortedList* _tmp44_; + const gchar* _tmp45_; + GeeArrayList* _tmp46_; + GeeArrayList* _tmp47_; + BatchImportRoll* _tmp48_; + BatchImport* _tmp49_; + LibraryWindow* _tmp50_; + LibraryWindow* _tmp51_; + BatchImport* _tmp52_; + gint _tmp53_; + SortedList* _tmp54_; + gint _tmp55_; + gint _tmp56_; #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp42_ = self->current_import_roll; + _tmp34_ = self->current_import_roll; #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - if (_tmp42_ == NULL) { -#line 968 "DataImportsPluginHost.c" - BatchImportRoll* _tmp43_; + if (_tmp34_ == NULL) { +#line 1144 "DataImportsPluginHost.c" + BatchImportRoll* _tmp35_; #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp43_ = batch_import_roll_new (); + _tmp35_ = batch_import_roll_new (); #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _batch_import_roll_unref0 (self->current_import_roll); #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - self->current_import_roll = _tmp43_; -#line 976 "DataImportsPluginHost.c" + self->current_import_roll = _tmp35_; +#line 1152 "DataImportsPluginHost.c" } #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp44_ = self->priv->host; + _tmp36_ = self->priv->host; #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp45_ = spit_data_imports_plugin_host_get_data_importer (_tmp44_); + _tmp37_ = spit_data_imports_plugin_host_get_data_importer (_tmp36_); #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp46_ = _tmp45_; + _tmp38_ = _tmp37_; #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp47_ = spit_data_imports_data_importer_get_service (_tmp46_); + _tmp39_ = spit_data_imports_data_importer_get_service (_tmp38_); #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp48_ = _tmp47_; + _tmp40_ = _tmp39_; #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp49_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp41_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp50_ = g_strdup_printf (_ ("%s Database"), _tmp49_); + _tmp42_ = g_strdup_printf (_ ("%s Database"), _tmp41_); #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp51_ = _tmp50_; + _tmp43_ = _tmp42_; #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp48_); + _g_object_unref0 (_tmp40_); #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp46_); + _g_object_unref0 (_tmp38_); #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - db_name = _tmp51_; + db_name = _tmp43_; #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp52_ = jobs; + _tmp44_ = jobs; #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp53_ = db_name; + _tmp45_ = db_name; #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp54_ = failed; + _tmp46_ = failed; #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp55_ = already_imported; + _tmp47_ = already_imported; #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp56_ = self->current_import_roll; + _tmp48_ = self->current_import_roll; #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp57_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ITERABLE, GeeIterable), _tmp53_, _spit_data_imports_data_import_reporter_batch_import_import_reporter, NULL, _tmp54_, _tmp55_, NULL, _tmp56_, NULL); + _tmp49_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ITERABLE, GeeIterable), _tmp45_, _spit_data_imports_data_import_reporter_batch_import_import_reporter, NULL, _tmp46_, _tmp47_, NULL, _tmp48_, NULL); #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - batch_import = _tmp57_; + batch_import = _tmp49_; #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp58_ = library_window_get_app (); + _tmp50_ = library_window_get_app (); #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp59_ = _tmp58_; + _tmp51_ = _tmp50_; #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp60_ = batch_import; + _tmp52_ = batch_import; #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - library_window_enqueue_batch_import (_tmp59_, _tmp60_, TRUE); + library_window_enqueue_batch_import (_tmp51_, _tmp52_, TRUE); #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp59_); + _g_object_unref0 (_tmp51_); #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp61_ = self->imported_items_count; + _tmp53_ = self->imported_items_count; #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp62_ = jobs; + _tmp54_ = jobs; #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp63_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp55_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection)); #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp64_ = _tmp63_; + _tmp56_ = _tmp55_; #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - self->imported_items_count = _tmp61_ + _tmp64_; + self->imported_items_count = _tmp53_ + _tmp56_; #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (batch_import); #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_free0 (db_name); -#line 1038 "DataImportsPluginHost.c" +#line 1214 "DataImportsPluginHost.c" } #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp65_ = self->priv->host; -#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp66_ = progress; -#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp67_ = host_progress_delta; + _tmp57_ = self->priv->host; #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_plugin_host_update_import_progress_pane (_tmp65_, _tmp66_ + _tmp67_, NULL); + spit_data_imports_plugin_host_update_import_progress_pane (_tmp57_, progress + host_progress_delta, NULL); #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (failed); #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (already_imported); #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (jobs); -#line 1054 "DataImportsPluginHost.c" +#line 1226 "DataImportsPluginHost.c" } -void spit_data_imports_core_importer_finalize_import (SpitDataImportsCoreImporter* self) { +void +spit_data_imports_core_importer_finalize_import (SpitDataImportsCoreImporter* self) +{ gchar* db_name = NULL; SpitDataImportsPluginHost* _tmp0_; SpitDataImportsDataImporter* _tmp1_; @@ -1128,108 +1302,133 @@ void spit_data_imports_core_importer_finalize_import (SpitDataImportsCoreImporte _g_object_unref0 (batch_import); #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_free0 (db_name); -#line 1130 "DataImportsPluginHost.c" +#line 1304 "DataImportsPluginHost.c" } -static void spit_data_imports_value_core_importer_init (GValue* value) { +static void +spit_data_imports_value_core_importer_init (GValue* value) +{ #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" value->data[0].v_pointer = NULL; -#line 1137 "DataImportsPluginHost.c" +#line 1313 "DataImportsPluginHost.c" } -static void spit_data_imports_value_core_importer_free_value (GValue* value) { +static void +spit_data_imports_value_core_importer_free_value (GValue* value) +{ #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (value->data[0].v_pointer) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_core_importer_unref (value->data[0].v_pointer); -#line 1146 "DataImportsPluginHost.c" +#line 1324 "DataImportsPluginHost.c" } } -static void spit_data_imports_value_core_importer_copy_value (const GValue* src_value, GValue* dest_value) { +static void +spit_data_imports_value_core_importer_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (src_value->data[0].v_pointer) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" dest_value->data[0].v_pointer = spit_data_imports_core_importer_ref (src_value->data[0].v_pointer); -#line 1156 "DataImportsPluginHost.c" +#line 1337 "DataImportsPluginHost.c" } else { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" dest_value->data[0].v_pointer = NULL; -#line 1160 "DataImportsPluginHost.c" +#line 1341 "DataImportsPluginHost.c" } } -static gpointer spit_data_imports_value_core_importer_peek_pointer (const GValue* value) { +static gpointer +spit_data_imports_value_core_importer_peek_pointer (const GValue* value) +{ #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return value->data[0].v_pointer; -#line 1168 "DataImportsPluginHost.c" +#line 1351 "DataImportsPluginHost.c" } -static gchar* spit_data_imports_value_core_importer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +spit_data_imports_value_core_importer_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (collect_values[0].v_pointer) { -#line 1175 "DataImportsPluginHost.c" +#line 1363 "DataImportsPluginHost.c" SpitDataImportsCoreImporter * object; object = collect_values[0].v_pointer; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (object->parent_instance.g_class == NULL) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1182 "DataImportsPluginHost.c" +#line 1370 "DataImportsPluginHost.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1186 "DataImportsPluginHost.c" +#line 1374 "DataImportsPluginHost.c" } #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" value->data[0].v_pointer = spit_data_imports_core_importer_ref (object); -#line 1190 "DataImportsPluginHost.c" +#line 1378 "DataImportsPluginHost.c" } else { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" value->data[0].v_pointer = NULL; -#line 1194 "DataImportsPluginHost.c" +#line 1382 "DataImportsPluginHost.c" } #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return NULL; -#line 1198 "DataImportsPluginHost.c" +#line 1386 "DataImportsPluginHost.c" } -static gchar* spit_data_imports_value_core_importer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +spit_data_imports_value_core_importer_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ SpitDataImportsCoreImporter ** object_p; object_p = collect_values[0].v_pointer; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (!object_p) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1209 "DataImportsPluginHost.c" +#line 1402 "DataImportsPluginHost.c" } #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (!value->data[0].v_pointer) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" *object_p = NULL; -#line 1215 "DataImportsPluginHost.c" +#line 1408 "DataImportsPluginHost.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" *object_p = value->data[0].v_pointer; -#line 1219 "DataImportsPluginHost.c" +#line 1412 "DataImportsPluginHost.c" } else { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" *object_p = spit_data_imports_core_importer_ref (value->data[0].v_pointer); -#line 1223 "DataImportsPluginHost.c" +#line 1416 "DataImportsPluginHost.c" } #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return NULL; -#line 1227 "DataImportsPluginHost.c" +#line 1420 "DataImportsPluginHost.c" } -GParamSpec* spit_data_imports_param_spec_core_importer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +spit_data_imports_param_spec_core_importer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ SpitDataImportsParamSpecCoreImporter* spec; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_val_if_fail (g_type_is_a (object_type, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER), NULL); @@ -1239,20 +1438,25 @@ GParamSpec* spit_data_imports_param_spec_core_importer (const gchar* name, const G_PARAM_SPEC (spec)->value_type = object_type; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return G_PARAM_SPEC (spec); -#line 1241 "DataImportsPluginHost.c" +#line 1440 "DataImportsPluginHost.c" } -gpointer spit_data_imports_value_get_core_importer (const GValue* value) { +gpointer +spit_data_imports_value_get_core_importer (const GValue* value) +{ #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER), NULL); #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return value->data[0].v_pointer; -#line 1250 "DataImportsPluginHost.c" +#line 1451 "DataImportsPluginHost.c" } -void spit_data_imports_value_set_core_importer (GValue* value, gpointer v_object) { +void +spit_data_imports_value_set_core_importer (GValue* value, + gpointer v_object) +{ SpitDataImportsCoreImporter * old; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER)); @@ -1268,22 +1472,25 @@ void spit_data_imports_value_set_core_importer (GValue* value, gpointer v_object value->data[0].v_pointer = v_object; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_core_importer_ref (value->data[0].v_pointer); -#line 1270 "DataImportsPluginHost.c" +#line 1474 "DataImportsPluginHost.c" } else { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" value->data[0].v_pointer = NULL; -#line 1274 "DataImportsPluginHost.c" +#line 1478 "DataImportsPluginHost.c" } #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (old) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_core_importer_unref (old); -#line 1280 "DataImportsPluginHost.c" +#line 1484 "DataImportsPluginHost.c" } } -void spit_data_imports_value_take_core_importer (GValue* value, gpointer v_object) { +void +spit_data_imports_value_take_core_importer (GValue* value, + gpointer v_object) +{ SpitDataImportsCoreImporter * old; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER)); @@ -1297,33 +1504,37 @@ void spit_data_imports_value_take_core_importer (GValue* value, gpointer v_objec g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" value->data[0].v_pointer = v_object; -#line 1299 "DataImportsPluginHost.c" +#line 1506 "DataImportsPluginHost.c" } else { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" value->data[0].v_pointer = NULL; -#line 1303 "DataImportsPluginHost.c" +#line 1510 "DataImportsPluginHost.c" } #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (old) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_core_importer_unref (old); -#line 1309 "DataImportsPluginHost.c" +#line 1516 "DataImportsPluginHost.c" } } -static void spit_data_imports_core_importer_class_init (SpitDataImportsCoreImporterClass * klass) { +static void +spit_data_imports_core_importer_class_init (SpitDataImportsCoreImporterClass * klass) +{ #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_core_importer_parent_class = g_type_class_peek_parent (klass); #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" ((SpitDataImportsCoreImporterClass *) klass)->finalize = spit_data_imports_core_importer_finalize; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_type_class_add_private (klass, sizeof (SpitDataImportsCoreImporterPrivate)); -#line 1321 "DataImportsPluginHost.c" +#line 1530 "DataImportsPluginHost.c" } -static void spit_data_imports_core_importer_instance_init (SpitDataImportsCoreImporter * self) { +static void +spit_data_imports_core_importer_instance_init (SpitDataImportsCoreImporter * self) +{ #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->priv = SPIT_DATA_IMPORTS_CORE_IMPORTER_GET_PRIVATE (self); #line 11 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1332,11 +1543,13 @@ static void spit_data_imports_core_importer_instance_init (SpitDataImportsCoreIm self->current_import_roll = NULL; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->ref_count = 1; -#line 1334 "DataImportsPluginHost.c" +#line 1545 "DataImportsPluginHost.c" } -static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporter * obj) { +static void +spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporter * obj) +{ SpitDataImportsCoreImporter * self; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER, SpitDataImportsCoreImporter); @@ -1344,11 +1557,13 @@ static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporte g_signal_handlers_destroy (self); #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _batch_import_roll_unref0 (self->current_import_roll); -#line 1346 "DataImportsPluginHost.c" +#line 1559 "DataImportsPluginHost.c" } -GType spit_data_imports_core_importer_get_type (void) { +GType +spit_data_imports_core_importer_get_type (void) +{ static volatile gsize spit_data_imports_core_importer_type_id__volatile = 0; if (g_once_init_enter (&spit_data_imports_core_importer_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { spit_data_imports_value_core_importer_init, spit_data_imports_value_core_importer_free_value, spit_data_imports_value_core_importer_copy_value, spit_data_imports_value_core_importer_peek_pointer, "p", spit_data_imports_value_core_importer_collect_value, "p", spit_data_imports_value_core_importer_lcopy_value }; @@ -1362,18 +1577,22 @@ GType spit_data_imports_core_importer_get_type (void) { } -gpointer spit_data_imports_core_importer_ref (gpointer instance) { +gpointer +spit_data_imports_core_importer_ref (gpointer instance) +{ SpitDataImportsCoreImporter * self; self = instance; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_atomic_int_inc (&self->ref_count); #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return instance; -#line 1371 "DataImportsPluginHost.c" +#line 1588 "DataImportsPluginHost.c" } -void spit_data_imports_core_importer_unref (gpointer instance) { +void +spit_data_imports_core_importer_unref (gpointer instance) +{ SpitDataImportsCoreImporter * self; self = instance; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1382,58 +1601,58 @@ void spit_data_imports_core_importer_unref (gpointer instance) { SPIT_DATA_IMPORTS_CORE_IMPORTER_GET_CLASS (self)->finalize (self); #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1384 "DataImportsPluginHost.c" +#line 1603 "DataImportsPluginHost.c" } } -SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_construct (GType object_type, SpitDataImportsService* service, DataImportsUIDataImportsDialog* dialog) { +SpitDataImportsConcreteDataImportsHost* +spit_data_imports_concrete_data_imports_host_construct (GType object_type, + SpitDataImportsService* service, + DataImportsUIDataImportsDialog* dialog) +{ SpitDataImportsConcreteDataImportsHost * self = NULL; - SpitDataImportsService* _tmp0_; - DataImportsUIDataImportsDialog* _tmp1_; - SpitDataImportsService* _tmp2_; - SpitDataImportsDataImporter* _tmp3_; - SpitDataImportsCoreImporter* _tmp4_; + SpitDataImportsDataImporter* _tmp0_; + SpitDataImportsCoreImporter* _tmp1_; #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (service), NULL); #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_val_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (dialog), NULL); #line 97 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = service; -#line 97 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - self = (SpitDataImportsConcreteDataImportsHost*) plugins_standard_host_interface_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_PLUGGABLE, SpitPluggable), "data_imports"); + self = (SpitDataImportsConcreteDataImportsHost*) plugins_standard_host_interface_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (service, SPIT_TYPE_PLUGGABLE, SpitPluggable), "data_imports"); #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = dialog; -#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - self->priv->dialog = _tmp1_; -#line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = service; + self->priv->dialog = dialog; #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = spit_data_imports_service_create_data_importer (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); + _tmp0_ = spit_data_imports_service_create_data_importer (service, G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (self->priv->active_importer); #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - self->priv->active_importer = _tmp3_; + self->priv->active_importer = _tmp0_; #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = spit_data_imports_core_importer_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); + _tmp1_ = spit_data_imports_core_importer_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _spit_data_imports_core_importer_unref0 (self->priv->core_importer); #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - self->priv->core_importer = _tmp4_; + self->priv->core_importer = _tmp1_; #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return self; -#line 1424 "DataImportsPluginHost.c" +#line 1638 "DataImportsPluginHost.c" } -SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_new (SpitDataImportsService* service, DataImportsUIDataImportsDialog* dialog) { +SpitDataImportsConcreteDataImportsHost* +spit_data_imports_concrete_data_imports_host_new (SpitDataImportsService* service, + DataImportsUIDataImportsDialog* dialog) +{ #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return spit_data_imports_concrete_data_imports_host_construct (SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, service, dialog); -#line 1431 "DataImportsPluginHost.c" +#line 1648 "DataImportsPluginHost.c" } -static SpitDataImportsDataImporter* spit_data_imports_concrete_data_imports_host_real_get_data_importer (SpitDataImportsPluginHost* base) { +static SpitDataImportsDataImporter* +spit_data_imports_concrete_data_imports_host_real_get_data_importer (SpitDataImportsPluginHost* base) +{ SpitDataImportsConcreteDataImportsHost * self; SpitDataImportsDataImporter* result = NULL; SpitDataImportsDataImporter* _tmp0_; @@ -1448,18 +1667,19 @@ static SpitDataImportsDataImporter* spit_data_imports_concrete_data_imports_host result = _tmp1_; #line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return result; -#line 1450 "DataImportsPluginHost.c" +#line 1669 "DataImportsPluginHost.c" } -static void spit_data_imports_concrete_data_imports_host_real_start_importing (SpitDataImportsPluginHost* base) { +static void +spit_data_imports_concrete_data_imports_host_real_start_importing (SpitDataImportsPluginHost* base) +{ SpitDataImportsConcreteDataImportsHost * self; SpitDataImportsDataImporter* _tmp0_; SpitDataImportsDataImporter* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; + SpitDataImportsDataImporter* _tmp3_; SpitDataImportsDataImporter* _tmp4_; - SpitDataImportsDataImporter* _tmp5_; #line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1468,37 +1688,36 @@ static void spit_data_imports_concrete_data_imports_host_real_start_importing (S _tmp1_ = _tmp0_; #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp2_ = spit_data_imports_data_importer_is_running (_tmp1_); -#line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = _tmp2_; #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (_tmp1_); #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - if (_tmp3_) { + if (_tmp2_) { #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return; -#line 1478 "DataImportsPluginHost.c" +#line 1696 "DataImportsPluginHost.c" } #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_debug ("DataImportsPluginHost.vala:112: ConcreteDataImportsHost.start_importin" \ "g( ): invoked."); #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); + _tmp3_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_data_importer_start (_tmp5_); + spit_data_imports_data_importer_start (_tmp4_); #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp5_); -#line 1490 "DataImportsPluginHost.c" + _g_object_unref0 (_tmp4_); +#line 1708 "DataImportsPluginHost.c" } -static void spit_data_imports_concrete_data_imports_host_real_stop_importing (SpitDataImportsPluginHost* base) { +static void +spit_data_imports_concrete_data_imports_host_real_stop_importing (SpitDataImportsPluginHost* base) +{ SpitDataImportsConcreteDataImportsHost * self; SpitDataImportsDataImporter* _tmp0_; SpitDataImportsDataImporter* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1510,99 +1729,99 @@ static void spit_data_imports_concrete_data_imports_host_real_stop_importing (Sp _tmp1_ = _tmp0_; #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp2_ = spit_data_imports_data_importer_is_running (_tmp1_); -#line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = _tmp2_; #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (_tmp1_); #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - if (_tmp3_) { -#line 1516 "DataImportsPluginHost.c" + if (_tmp2_) { +#line 1733 "DataImportsPluginHost.c" + SpitDataImportsDataImporter* _tmp3_; SpitDataImportsDataImporter* _tmp4_; - SpitDataImportsDataImporter* _tmp5_; #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); + _tmp3_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_data_importer_stop (_tmp5_); + spit_data_imports_data_importer_stop (_tmp4_); #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp5_); -#line 1527 "DataImportsPluginHost.c" + _g_object_unref0 (_tmp4_); +#line 1744 "DataImportsPluginHost.c" } #line 123 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_concrete_data_imports_host_clean_up (self); #line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->priv->importing_halted = TRUE; -#line 1533 "DataImportsPluginHost.c" +#line 1750 "DataImportsPluginHost.c" } -static void spit_data_imports_concrete_data_imports_host_clean_up (SpitDataImportsConcreteDataImportsHost* self) { +static void +spit_data_imports_concrete_data_imports_host_clean_up (SpitDataImportsConcreteDataImportsHost* self) +{ #line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_CONCRETE_DATA_IMPORTS_HOST (self)); #line 129 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (self->priv->progress_pane); #line 129 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->priv->progress_pane = NULL; -#line 1544 "DataImportsPluginHost.c" +#line 1763 "DataImportsPluginHost.c" } -void spit_data_imports_concrete_data_imports_host_set_button_mode (SpitDataImportsConcreteDataImportsHost* self, SpitDataImportsPluginHostButtonMode mode) { - SpitDataImportsPluginHostButtonMode _tmp0_; +void +spit_data_imports_concrete_data_imports_host_set_button_mode (SpitDataImportsConcreteDataImportsHost* self, + SpitDataImportsPluginHostButtonMode mode) +{ #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_CONCRETE_DATA_IMPORTS_HOST (self)); #line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = mode; -#line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - if (_tmp0_ == SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE) { -#line 1556 "DataImportsPluginHost.c" - DataImportsUIDataImportsDialog* _tmp1_; + if (mode == SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE) { +#line 1775 "DataImportsPluginHost.c" + DataImportsUIDataImportsDialog* _tmp0_; #line 134 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = self->priv->dialog; + _tmp0_ = self->priv->dialog; #line 134 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - data_imports_ui_data_imports_dialog_set_close_button_mode (_tmp1_); -#line 1562 "DataImportsPluginHost.c" + data_imports_ui_data_imports_dialog_set_close_button_mode (_tmp0_); +#line 1781 "DataImportsPluginHost.c" } else { - SpitDataImportsPluginHostButtonMode _tmp2_; -#line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = mode; #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - if (_tmp2_ == SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CANCEL) { -#line 1569 "DataImportsPluginHost.c" - DataImportsUIDataImportsDialog* _tmp3_; + if (mode == SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CANCEL) { +#line 1785 "DataImportsPluginHost.c" + DataImportsUIDataImportsDialog* _tmp1_; #line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = self->priv->dialog; + _tmp1_ = self->priv->dialog; #line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - data_imports_ui_data_imports_dialog_set_cancel_button_mode (_tmp3_); -#line 1575 "DataImportsPluginHost.c" + data_imports_ui_data_imports_dialog_set_cancel_button_mode (_tmp1_); +#line 1791 "DataImportsPluginHost.c" } else { #line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_error ("DataImportsPluginHost.vala:138: unrecognized button mode enumeration v" \ "alue"); -#line 1579 "DataImportsPluginHost.c" +#line 1795 "DataImportsPluginHost.c" } } } -static void spit_data_imports_concrete_data_imports_host_real_post_error (SpitDataImportsPluginHost* base, GError* err) { +static void +spit_data_imports_concrete_data_imports_host_real_post_error (SpitDataImportsPluginHost* base, + GError* err) +{ SpitDataImportsConcreteDataImportsHost * self; - GError* _tmp0_; - const gchar* _tmp1_; + const gchar* _tmp0_; #line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = err; -#line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = _tmp0_->message; + _tmp0_ = err->message; #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp1_); -#line 1597 "DataImportsPluginHost.c" + spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp0_); +#line 1813 "DataImportsPluginHost.c" } -static void spit_data_imports_concrete_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base, const gchar* message) { +static void +spit_data_imports_concrete_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base, + const gchar* message) +{ SpitDataImportsConcreteDataImportsHost * self; gchar* msg = NULL; SpitDataImportsDataImporter* _tmp0_; @@ -1612,20 +1831,19 @@ static void spit_data_imports_concrete_data_imports_host_real_post_error_message gchar* _tmp4_; gchar* _tmp5_; const gchar* _tmp6_; - const gchar* _tmp7_; + gchar* _tmp7_; gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; - const gchar* _tmp11_; - gchar* _tmp12_; - DataImportsUIDataImportsDialog* _tmp13_; - const gchar* _tmp14_; + const gchar* _tmp10_; + gchar* _tmp11_; + DataImportsUIDataImportsDialog* _tmp12_; + const gchar* _tmp13_; + DataImportsUIStaticMessagePane* _tmp14_; DataImportsUIStaticMessagePane* _tmp15_; - DataImportsUIStaticMessagePane* _tmp16_; + DataImportsUIDataImportsDialog* _tmp16_; DataImportsUIDataImportsDialog* _tmp17_; - DataImportsUIDataImportsDialog* _tmp18_; + SpitDataImportsDataImporter* _tmp18_; SpitDataImportsDataImporter* _tmp19_; - SpitDataImportsDataImporter* _tmp20_; #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1649,72 +1867,72 @@ static void spit_data_imports_concrete_data_imports_host_real_post_error_message #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp6_ = msg; #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp7_ = message; -#line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp8_ = g_markup_printf_escaped ("\n\n%s\n\n", _tmp7_); + _tmp7_ = g_markup_printf_escaped ("\n\n%s\n\n", message); #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp10_ = g_strconcat (_tmp6_, _tmp9_, NULL); + _tmp9_ = g_strconcat (_tmp6_, _tmp8_, NULL); #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_free0 (msg); #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - msg = _tmp10_; + msg = _tmp9_; #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp8_); #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp11_ = msg; + _tmp10_ = msg; #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp12_ = g_strconcat (_tmp11_, _ ("To try importing from another service, select one from the above menu."), NULL); + _tmp11_ = g_strconcat (_tmp10_, _ ("To try importing from another service, select one from the above menu."), NULL); #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_free0 (msg); #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - msg = _tmp12_; + msg = _tmp11_; #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp13_ = self->priv->dialog; + _tmp12_ = self->priv->dialog; #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp14_ = msg; + _tmp13_ = msg; #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp15_ = data_imports_ui_static_message_pane_new_with_pango (_tmp14_); + _tmp14_ = data_imports_ui_static_message_pane_new_with_pango (_tmp13_); #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - data_imports_ui_data_imports_dialog_install_pane (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); + data_imports_ui_data_imports_dialog_install_pane (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp15_); #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp17_ = self->priv->dialog; + _tmp16_ = self->priv->dialog; #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - data_imports_ui_data_imports_dialog_set_close_button_mode (_tmp17_); + data_imports_ui_data_imports_dialog_set_close_button_mode (_tmp16_); #line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp18_ = self->priv->dialog; + _tmp17_ = self->priv->dialog; #line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - data_imports_ui_data_imports_dialog_unlock_service (_tmp18_); + data_imports_ui_data_imports_dialog_unlock_service (_tmp17_); #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp19_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); + _tmp18_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_data_importer_stop (_tmp20_); + spit_data_imports_data_importer_stop (_tmp19_); #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp19_); #line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_concrete_data_imports_host_clean_up (self); #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_free0 (msg); -#line 1701 "DataImportsPluginHost.c" +#line 1917 "DataImportsPluginHost.c" } -static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pane (SpitDataImportsPluginHost* base, SpitDataImportsDialogPane* pane, SpitDataImportsPluginHostButtonMode button_mode) { +static void +spit_data_imports_concrete_data_imports_host_real_install_dialog_pane (SpitDataImportsPluginHost* base, + SpitDataImportsDialogPane* pane, + SpitDataImportsPluginHostButtonMode button_mode) +{ SpitDataImportsConcreteDataImportsHost * self; gboolean _tmp0_ = FALSE; SpitDataImportsDataImporter* _tmp1_; SpitDataImportsDataImporter* _tmp2_; gboolean _tmp3_; - DataImportsUIDataImportsDialog* _tmp7_; - SpitDataImportsDialogPane* _tmp8_; - SpitDataImportsPluginHostButtonMode _tmp9_; + DataImportsUIDataImportsDialog* _tmp6_; #line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1734,183 +1952,162 @@ static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pan if (_tmp3_) { #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp0_ = TRUE; -#line 1732 "DataImportsPluginHost.c" +#line 1950 "DataImportsPluginHost.c" } else { SpitDataImportsDataImporter* _tmp4_; SpitDataImportsDataImporter* _tmp5_; - gboolean _tmp6_; #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp4_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp5_ = _tmp4_; #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp6_ = spit_data_imports_data_importer_is_running (_tmp5_); -#line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = !_tmp6_; + _tmp0_ = !spit_data_imports_data_importer_is_running (_tmp5_); #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (_tmp5_); -#line 1747 "DataImportsPluginHost.c" +#line 1962 "DataImportsPluginHost.c" } #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (_tmp0_) { #line 170 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return; -#line 1753 "DataImportsPluginHost.c" +#line 1968 "DataImportsPluginHost.c" } #line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp7_ = self->priv->dialog; + _tmp6_ = self->priv->dialog; #line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp8_ = pane; -#line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - data_imports_ui_data_imports_dialog_install_pane (_tmp7_, _tmp8_); -#line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp9_ = button_mode; + data_imports_ui_data_imports_dialog_install_pane (_tmp6_, pane); #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_concrete_data_imports_host_set_button_mode (self, _tmp9_); -#line 1765 "DataImportsPluginHost.c" + spit_data_imports_concrete_data_imports_host_set_button_mode (self, button_mode); +#line 1976 "DataImportsPluginHost.c" } -static void spit_data_imports_concrete_data_imports_host_real_install_static_message_pane (SpitDataImportsPluginHost* base, const gchar* message, SpitDataImportsPluginHostButtonMode button_mode) { +static void +spit_data_imports_concrete_data_imports_host_real_install_static_message_pane (SpitDataImportsPluginHost* base, + const gchar* message, + SpitDataImportsPluginHostButtonMode button_mode) +{ SpitDataImportsConcreteDataImportsHost * self; - SpitDataImportsPluginHostButtonMode _tmp0_; - DataImportsUIDataImportsDialog* _tmp1_; - const gchar* _tmp2_; - DataImportsUIStaticMessagePane* _tmp3_; - DataImportsUIStaticMessagePane* _tmp4_; + DataImportsUIDataImportsDialog* _tmp0_; + DataImportsUIStaticMessagePane* _tmp1_; + DataImportsUIStaticMessagePane* _tmp2_; #line 177 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 177 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (message != NULL); #line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = button_mode; -#line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_concrete_data_imports_host_set_button_mode (self, _tmp0_); + spit_data_imports_concrete_data_imports_host_set_button_mode (self, button_mode); #line 182 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = self->priv->dialog; -#line 182 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = message; + _tmp0_ = self->priv->dialog; #line 182 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = data_imports_ui_static_message_pane_new_with_pango (_tmp2_); + _tmp1_ = data_imports_ui_static_message_pane_new_with_pango (message); #line 182 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 182 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - data_imports_ui_data_imports_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); + data_imports_ui_data_imports_dialog_install_pane (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); #line 182 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp4_); -#line 1796 "DataImportsPluginHost.c" + _g_object_unref0 (_tmp2_); +#line 2005 "DataImportsPluginHost.c" } -static void spit_data_imports_concrete_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) { +static void +spit_data_imports_concrete_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base, + const gchar* welcome_message, + SpitDataImportsImportableLibrary** discovered_libraries, + int discovered_libraries_length1, + const gchar* file_select_label) +{ SpitDataImportsConcreteDataImportsHost * self; gboolean _tmp0_ = FALSE; - SpitDataImportsImportableLibrary** _tmp1_; - gint _tmp1__length1; #line 185 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 185 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (welcome_message != NULL); #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = discovered_libraries; -#line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1__length1 = discovered_libraries_length1; + if (discovered_libraries_length1 == 0) { #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - if (_tmp1__length1 == 0) { -#line 1815 "DataImportsPluginHost.c" - const gchar* _tmp2_; -#line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = file_select_label; -#line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = _tmp2_ == NULL; -#line 1821 "DataImportsPluginHost.c" + _tmp0_ = file_select_label == NULL; +#line 2026 "DataImportsPluginHost.c" } else { #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp0_ = FALSE; -#line 1825 "DataImportsPluginHost.c" +#line 2030 "DataImportsPluginHost.c" } #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (_tmp0_) { #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), "Libraries or file option needed"); -#line 1831 "DataImportsPluginHost.c" +#line 2036 "DataImportsPluginHost.c" } else { - DataImportsUIDataImportsDialog* _tmp3_; - const gchar* _tmp4_; - SpitDataImportsImportableLibrary** _tmp5_; - gint _tmp5__length1; - const gchar* _tmp6_; - DataImportsUILibrarySelectionPane* _tmp7_; - DataImportsUILibrarySelectionPane* _tmp8_; -#line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = self->priv->dialog; -#line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = welcome_message; -#line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp5_ = discovered_libraries; -#line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp5__length1 = discovered_libraries_length1; + DataImportsUIDataImportsDialog* _tmp1_; + DataImportsUILibrarySelectionPane* _tmp2_; + DataImportsUILibrarySelectionPane* _tmp3_; #line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp6_ = file_select_label; + _tmp1_ = self->priv->dialog; #line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp7_ = data_imports_ui_library_selection_pane_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp4_, _tmp5_, _tmp5__length1, _tmp6_); + _tmp2_ = data_imports_ui_library_selection_pane_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), welcome_message, discovered_libraries, discovered_libraries_length1, file_select_label); #line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp8_ = _tmp7_; + _tmp3_ = _tmp2_; #line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - data_imports_ui_data_imports_dialog_install_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); + data_imports_ui_data_imports_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); #line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp8_); -#line 1858 "DataImportsPluginHost.c" + _g_object_unref0 (_tmp3_); +#line 2051 "DataImportsPluginHost.c" } #line 199 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_concrete_data_imports_host_set_button_mode (self, SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE); -#line 1862 "DataImportsPluginHost.c" +#line 2055 "DataImportsPluginHost.c" } -static void spit_data_imports_concrete_data_imports_host_real_install_import_progress_pane (SpitDataImportsPluginHost* base, const gchar* message) { +static void +spit_data_imports_concrete_data_imports_host_real_install_import_progress_pane (SpitDataImportsPluginHost* base, + const gchar* message) +{ SpitDataImportsConcreteDataImportsHost * self; - const gchar* _tmp0_; - DataImportsUIProgressPane* _tmp1_; - DataImportsUIDataImportsDialog* _tmp2_; - DataImportsUIProgressPane* _tmp3_; + DataImportsUIProgressPane* _tmp0_; + DataImportsUIDataImportsDialog* _tmp1_; + DataImportsUIProgressPane* _tmp2_; + SpitDataImportsCoreImporter* _tmp3_; SpitDataImportsCoreImporter* _tmp4_; - SpitDataImportsCoreImporter* _tmp5_; #line 202 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 202 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (message != NULL); #line 205 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = message; -#line 205 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = data_imports_ui_progress_pane_new (_tmp0_); + _tmp0_ = data_imports_ui_progress_pane_new (message); #line 205 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (self->priv->progress_pane); #line 205 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - self->priv->progress_pane = _tmp1_; + self->priv->progress_pane = _tmp0_; #line 206 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = self->priv->dialog; + _tmp1_ = self->priv->dialog; #line 206 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = self->priv->progress_pane; + _tmp2_ = self->priv->progress_pane; #line 206 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - data_imports_ui_data_imports_dialog_install_pane (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); + data_imports_ui_data_imports_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); #line 207 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_concrete_data_imports_host_set_button_mode (self, SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CANCEL); #line 209 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = self->priv->core_importer; + _tmp3_ = self->priv->core_importer; #line 209 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_->imported_items_count = 0; + _tmp3_->imported_items_count = 0; #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp5_ = self->priv->core_importer; + _tmp4_ = self->priv->core_importer; #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _batch_import_roll_unref0 (_tmp5_->current_import_roll); + _batch_import_roll_unref0 (_tmp4_->current_import_roll); #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp5_->current_import_roll = NULL; -#line 1904 "DataImportsPluginHost.c" + _tmp4_->current_import_roll = NULL; +#line 2097 "DataImportsPluginHost.c" } -static void spit_data_imports_concrete_data_imports_host_real_update_import_progress_pane (SpitDataImportsPluginHost* base, gdouble progress, const gchar* progress_message) { +static void +spit_data_imports_concrete_data_imports_host_real_update_import_progress_pane (SpitDataImportsPluginHost* base, + gdouble progress, + const gchar* progress_message) +{ SpitDataImportsConcreteDataImportsHost * self; DataImportsUIProgressPane* _tmp0_; #line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1919,117 +2116,103 @@ static void spit_data_imports_concrete_data_imports_host_real_update_import_prog _tmp0_ = self->priv->progress_pane; #line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (_tmp0_ != NULL) { -#line 1917 "DataImportsPluginHost.c" +#line 2114 "DataImportsPluginHost.c" DataImportsUIProgressPane* _tmp1_; - gdouble _tmp2_; - const gchar* _tmp3_; #line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp1_ = self->priv->progress_pane; #line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = progress; -#line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = progress_message; -#line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - data_imports_ui_progress_pane_update_progress (_tmp1_, _tmp2_, _tmp3_); -#line 1929 "DataImportsPluginHost.c" + data_imports_ui_progress_pane_update_progress (_tmp1_, progress, progress_message); +#line 2120 "DataImportsPluginHost.c" } } -static void spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message) { +static void +spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, + SpitDataImportsImportableMediaItem** items, + int items_length1, + gdouble progress, + gdouble host_progress_delta, + const gchar* progress_message) +{ SpitDataImportsConcreteDataImportsHost * self; SpitDataImportsCoreImporter* _tmp0_; - SpitDataImportsImportableMediaItem** _tmp1_; - gint _tmp1__length1; - gdouble _tmp2_; - gdouble _tmp3_; - const gchar* _tmp4_; #line 222 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp0_ = self->priv->core_importer; #line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = items; -#line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1__length1 = items_length1; -#line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = progress; -#line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = host_progress_delta; -#line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = progress_message; -#line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_core_importer_prepare_media_items_for_import (_tmp0_, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_, _tmp4_); -#line 1958 "DataImportsPluginHost.c" + spit_data_imports_core_importer_prepare_media_items_for_import (_tmp0_, items, items_length1, progress, host_progress_delta, progress_message); +#line 2141 "DataImportsPluginHost.c" } -static void spit_data_imports_concrete_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message) { +static void +spit_data_imports_concrete_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, + SpitDataImportsImportedItemsCountCallback report_imported_items_count, + void* report_imported_items_count_target, + const gchar* finalize_message) +{ SpitDataImportsConcreteDataImportsHost * self; - const gchar* _tmp0_; + SpitDataImportsCoreImporter* _tmp0_; SpitDataImportsCoreImporter* _tmp1_; - SpitDataImportsImportedItemsCountCallback _tmp2_; - void* _tmp2__target; + gint _tmp2_; SpitDataImportsCoreImporter* _tmp3_; gint _tmp4_; - SpitDataImportsCoreImporter* _tmp5_; - gint _tmp6_; #line 231 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 235 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = finalize_message; -#line 235 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_plugin_host_update_import_progress_pane (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), 1.0, _tmp0_); + spit_data_imports_plugin_host_update_import_progress_pane (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), 1.0, finalize_message); #line 236 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_concrete_data_imports_host_set_button_mode (self, SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE); #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = self->priv->core_importer; + _tmp0_ = self->priv->core_importer; #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_core_importer_finalize_import (_tmp1_); -#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = report_imported_items_count; + spit_data_imports_core_importer_finalize_import (_tmp0_); #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2__target = report_imported_items_count_target; + _tmp1_ = self->priv->core_importer; #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = self->priv->core_importer; + _tmp2_ = _tmp1_->imported_items_count; #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = _tmp3_->imported_items_count; -#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ (_tmp4_, _tmp2__target); + report_imported_items_count (_tmp2_, report_imported_items_count_target); #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp5_ = self->priv->core_importer; + _tmp3_ = self->priv->core_importer; #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp6_ = _tmp5_->imported_items_count; + _tmp4_ = _tmp3_->imported_items_count; #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - if (_tmp6_ > 0) { -#line 2000 "DataImportsPluginHost.c" - LibraryWindow* _tmp7_; - LibraryWindow* _tmp8_; + if (_tmp4_ > 0) { +#line 2179 "DataImportsPluginHost.c" + LibraryWindow* _tmp5_; + LibraryWindow* _tmp6_; #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp7_ = library_window_get_app (); + _tmp5_ = library_window_get_app (); #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - library_window_switch_to_import_queue_page (_tmp8_); + library_window_switch_to_import_queue_page (_tmp6_); #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp8_); -#line 2011 "DataImportsPluginHost.c" + _g_object_unref0 (_tmp6_); +#line 2190 "DataImportsPluginHost.c" } } -static void spit_data_imports_concrete_data_imports_host_class_init (SpitDataImportsConcreteDataImportsHostClass * klass) { +static void +spit_data_imports_concrete_data_imports_host_class_init (SpitDataImportsConcreteDataImportsHostClass * klass) +{ #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_concrete_data_imports_host_parent_class = g_type_class_peek_parent (klass); #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_type_class_add_private (klass, sizeof (SpitDataImportsConcreteDataImportsHostPrivate)); #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" G_OBJECT_CLASS (klass)->finalize = spit_data_imports_concrete_data_imports_host_finalize; -#line 2023 "DataImportsPluginHost.c" +#line 2204 "DataImportsPluginHost.c" } -static void spit_data_imports_concrete_data_imports_host_spit_data_imports_plugin_host_interface_init (SpitDataImportsPluginHostIface * iface) { +static void +spit_data_imports_concrete_data_imports_host_spit_data_imports_plugin_host_interface_init (SpitDataImportsPluginHostIface * iface) +{ #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_concrete_data_imports_host_spit_data_imports_plugin_host_parent_iface = g_type_interface_peek_parent (iface); #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2056,11 +2239,13 @@ static void spit_data_imports_concrete_data_imports_host_spit_data_imports_plugi iface->prepare_media_items_for_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportableMediaItem**, int, gdouble, gdouble, const gchar*)) spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import; #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" iface->finalize_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportedItemsCountCallback, void*, const gchar*)) spit_data_imports_concrete_data_imports_host_real_finalize_import; -#line 2054 "DataImportsPluginHost.c" +#line 2237 "DataImportsPluginHost.c" } -static void spit_data_imports_concrete_data_imports_host_instance_init (SpitDataImportsConcreteDataImportsHost * self) { +static void +spit_data_imports_concrete_data_imports_host_instance_init (SpitDataImportsConcreteDataImportsHost * self) +{ #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->priv = SPIT_DATA_IMPORTS_CONCRETE_DATA_IMPORTS_HOST_GET_PRIVATE (self); #line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2071,11 +2256,13 @@ static void spit_data_imports_concrete_data_imports_host_instance_init (SpitData self->priv->progress_pane = NULL; #line 93 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->priv->importing_halted = FALSE; -#line 2069 "DataImportsPluginHost.c" +#line 2254 "DataImportsPluginHost.c" } -static void spit_data_imports_concrete_data_imports_host_finalize (GObject * obj) { +static void +spit_data_imports_concrete_data_imports_host_finalize (GObject * obj) +{ SpitDataImportsConcreteDataImportsHost * self; #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); @@ -2087,11 +2274,13 @@ static void spit_data_imports_concrete_data_imports_host_finalize (GObject * obj _spit_data_imports_core_importer_unref0 (self->priv->core_importer); #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" G_OBJECT_CLASS (spit_data_imports_concrete_data_imports_host_parent_class)->finalize (obj); -#line 2085 "DataImportsPluginHost.c" +#line 2272 "DataImportsPluginHost.c" } -GType spit_data_imports_concrete_data_imports_host_get_type (void) { +GType +spit_data_imports_concrete_data_imports_host_get_type (void) +{ static volatile gsize spit_data_imports_concrete_data_imports_host_type_id__volatile = 0; if (g_once_init_enter (&spit_data_imports_concrete_data_imports_host_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsConcreteDataImportsHostClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) spit_data_imports_concrete_data_imports_host_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SpitDataImportsConcreteDataImportsHost), 0, (GInstanceInitFunc) spit_data_imports_concrete_data_imports_host_instance_init, NULL }; @@ -2105,53 +2294,53 @@ GType spit_data_imports_concrete_data_imports_host_get_type (void) { } -SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_host_construct (GType object_type, SpitDataImportsService* service, SpitDataImportsWelcomeImportMetaHost* meta_host) { +SpitDataImportsWelcomeDataImportsHost* +spit_data_imports_welcome_data_imports_host_construct (GType object_type, + SpitDataImportsService* service, + SpitDataImportsWelcomeImportMetaHost* meta_host) +{ SpitDataImportsWelcomeDataImportsHost * self = NULL; - SpitDataImportsService* _tmp0_; - SpitDataImportsService* _tmp1_; - SpitDataImportsDataImporter* _tmp2_; - SpitDataImportsCoreImporter* _tmp3_; - SpitDataImportsWelcomeImportMetaHost* _tmp4_; + SpitDataImportsDataImporter* _tmp0_; + SpitDataImportsCoreImporter* _tmp1_; #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (service), NULL); #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_IMPORT_META_HOST (meta_host), NULL); #line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = service; -#line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - self = (SpitDataImportsWelcomeDataImportsHost*) plugins_standard_host_interface_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_PLUGGABLE, SpitPluggable), "data_imports"); -#line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = service; + self = (SpitDataImportsWelcomeDataImportsHost*) plugins_standard_host_interface_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (service, SPIT_TYPE_PLUGGABLE, SpitPluggable), "data_imports"); #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = spit_data_imports_service_create_data_importer (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); + _tmp0_ = spit_data_imports_service_create_data_importer (service, G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (self->priv->active_importer); #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - self->priv->active_importer = _tmp2_; + self->priv->active_importer = _tmp0_; #line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = spit_data_imports_core_importer_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); + _tmp1_ = spit_data_imports_core_importer_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); #line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _spit_data_imports_core_importer_unref0 (self->priv->core_importer); #line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - self->priv->core_importer = _tmp3_; + self->priv->core_importer = _tmp1_; #line 257 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = meta_host; -#line 257 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - self->priv->meta_host = _tmp4_; + self->priv->meta_host = meta_host; #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return self; -#line 2138 "DataImportsPluginHost.c" +#line 2322 "DataImportsPluginHost.c" } -SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_host_new (SpitDataImportsService* service, SpitDataImportsWelcomeImportMetaHost* meta_host) { +SpitDataImportsWelcomeDataImportsHost* +spit_data_imports_welcome_data_imports_host_new (SpitDataImportsService* service, + SpitDataImportsWelcomeImportMetaHost* meta_host) +{ #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return spit_data_imports_welcome_data_imports_host_construct (SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, service, meta_host); -#line 2145 "DataImportsPluginHost.c" +#line 2332 "DataImportsPluginHost.c" } -static SpitDataImportsDataImporter* spit_data_imports_welcome_data_imports_host_real_get_data_importer (SpitDataImportsPluginHost* base) { +static SpitDataImportsDataImporter* +spit_data_imports_welcome_data_imports_host_real_get_data_importer (SpitDataImportsPluginHost* base) +{ SpitDataImportsWelcomeDataImportsHost * self; SpitDataImportsDataImporter* result = NULL; SpitDataImportsDataImporter* _tmp0_; @@ -2166,18 +2355,19 @@ static SpitDataImportsDataImporter* spit_data_imports_welcome_data_imports_host_ result = _tmp1_; #line 261 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return result; -#line 2164 "DataImportsPluginHost.c" +#line 2353 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_data_imports_host_real_start_importing (SpitDataImportsPluginHost* base) { +static void +spit_data_imports_welcome_data_imports_host_real_start_importing (SpitDataImportsPluginHost* base) +{ SpitDataImportsWelcomeDataImportsHost * self; SpitDataImportsDataImporter* _tmp0_; SpitDataImportsDataImporter* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; + SpitDataImportsDataImporter* _tmp3_; SpitDataImportsDataImporter* _tmp4_; - SpitDataImportsDataImporter* _tmp5_; #line 264 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); #line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2186,37 +2376,36 @@ static void spit_data_imports_welcome_data_imports_host_real_start_importing (Sp _tmp1_ = _tmp0_; #line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp2_ = spit_data_imports_data_importer_is_running (_tmp1_); -#line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = _tmp2_; #line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (_tmp1_); #line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - if (_tmp3_) { + if (_tmp2_) { #line 266 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return; -#line 2192 "DataImportsPluginHost.c" +#line 2380 "DataImportsPluginHost.c" } #line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_debug ("DataImportsPluginHost.vala:268: WelcomeDataImportsHost.start_importing" \ "( ): invoked."); #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); + _tmp3_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_data_importer_start (_tmp5_); + spit_data_imports_data_importer_start (_tmp4_); #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp5_); -#line 2204 "DataImportsPluginHost.c" + _g_object_unref0 (_tmp4_); +#line 2392 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_data_imports_host_real_stop_importing (SpitDataImportsPluginHost* base) { +static void +spit_data_imports_welcome_data_imports_host_real_stop_importing (SpitDataImportsPluginHost* base) +{ SpitDataImportsWelcomeDataImportsHost * self; SpitDataImportsDataImporter* _tmp0_; SpitDataImportsDataImporter* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; #line 273 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); #line 274 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2228,57 +2417,60 @@ static void spit_data_imports_welcome_data_imports_host_real_stop_importing (Spi _tmp1_ = _tmp0_; #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp2_ = spit_data_imports_data_importer_is_running (_tmp1_); -#line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = _tmp2_; #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (_tmp1_); #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - if (_tmp3_) { -#line 2230 "DataImportsPluginHost.c" + if (_tmp2_) { +#line 2417 "DataImportsPluginHost.c" + SpitDataImportsDataImporter* _tmp3_; SpitDataImportsDataImporter* _tmp4_; - SpitDataImportsDataImporter* _tmp5_; #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); + _tmp3_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_data_importer_stop (_tmp5_); + spit_data_imports_data_importer_stop (_tmp4_); #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp5_); -#line 2241 "DataImportsPluginHost.c" + _g_object_unref0 (_tmp4_); +#line 2428 "DataImportsPluginHost.c" } #line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_welcome_data_imports_host_clean_up (self); #line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->priv->importing_halted = TRUE; -#line 2247 "DataImportsPluginHost.c" +#line 2434 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_data_imports_host_clean_up (SpitDataImportsWelcomeDataImportsHost* self) { +static void +spit_data_imports_welcome_data_imports_host_clean_up (SpitDataImportsWelcomeDataImportsHost* self) +{ #line 284 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_DATA_IMPORTS_HOST (self)); -#line 2254 "DataImportsPluginHost.c" +#line 2443 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_data_imports_host_real_post_error (SpitDataImportsPluginHost* base, GError* err) { +static void +spit_data_imports_welcome_data_imports_host_real_post_error (SpitDataImportsPluginHost* base, + GError* err) +{ SpitDataImportsWelcomeDataImportsHost * self; - GError* _tmp0_; - const gchar* _tmp1_; + const gchar* _tmp0_; #line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = err; -#line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = _tmp0_->message; + _tmp0_ = err->message; #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp1_); -#line 2270 "DataImportsPluginHost.c" + spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp0_); +#line 2459 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base, const gchar* message) { +static void +spit_data_imports_welcome_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base, + const gchar* message) +{ SpitDataImportsWelcomeDataImportsHost * self; gchar* msg = NULL; SpitDataImportsDataImporter* _tmp0_; @@ -2323,31 +2515,45 @@ static void spit_data_imports_welcome_data_imports_host_real_post_error_message spit_data_imports_welcome_data_imports_host_clean_up (self); #line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_free0 (msg); -#line 2319 "DataImportsPluginHost.c" +#line 2511 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_data_imports_host_real_install_dialog_pane (SpitDataImportsPluginHost* base, SpitDataImportsDialogPane* pane, SpitDataImportsPluginHostButtonMode button_mode) { +static void +spit_data_imports_welcome_data_imports_host_real_install_dialog_pane (SpitDataImportsPluginHost* base, + SpitDataImportsDialogPane* pane, + SpitDataImportsPluginHostButtonMode button_mode) +{ SpitDataImportsWelcomeDataImportsHost * self; #line 307 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); #line 307 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (pane)); -#line 2329 "DataImportsPluginHost.c" +#line 2525 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_data_imports_host_real_install_static_message_pane (SpitDataImportsPluginHost* base, const gchar* message, SpitDataImportsPluginHostButtonMode button_mode) { +static void +spit_data_imports_welcome_data_imports_host_real_install_static_message_pane (SpitDataImportsPluginHost* base, + const gchar* message, + SpitDataImportsPluginHostButtonMode button_mode) +{ SpitDataImportsWelcomeDataImportsHost * self; #line 312 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); #line 312 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (message != NULL); -#line 2339 "DataImportsPluginHost.c" +#line 2539 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) { +static void +spit_data_imports_welcome_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base, + const gchar* welcome_message, + SpitDataImportsImportableLibrary** discovered_libraries, + int discovered_libraries_length1, + const gchar* file_select_label) +{ SpitDataImportsWelcomeDataImportsHost * self; SpitDataImportsDataImporter* _tmp0_; SpitDataImportsDataImporter* _tmp1_; @@ -2356,8 +2562,6 @@ static void spit_data_imports_welcome_data_imports_host_real_install_library_sel const gchar* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; - SpitDataImportsImportableLibrary** _tmp7_; - gint _tmp7__length1; #line 317 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); #line 317 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2385,109 +2589,101 @@ static void spit_data_imports_welcome_data_imports_host_real_install_library_sel #line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (_tmp1_); #line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp7_ = discovered_libraries; -#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp7__length1 = discovered_libraries_length1; -#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - if (_tmp7__length1 > 0) { -#line 2386 "DataImportsPluginHost.c" - SpitDataImportsWelcomeImportMetaHost* _tmp8_; + if (discovered_libraries_length1 > 0) { +#line 2586 "DataImportsPluginHost.c" + SpitDataImportsWelcomeImportMetaHost* _tmp7_; + SpitDataImportsDataImporter* _tmp8_; SpitDataImportsDataImporter* _tmp9_; - SpitDataImportsDataImporter* _tmp10_; + SpitDataImportsService* _tmp10_; SpitDataImportsService* _tmp11_; - SpitDataImportsService* _tmp12_; - const gchar* _tmp13_; - SpitDataImportsImportableLibrary** _tmp14_; - gint _tmp14__length1; - SpitDataImportsWelcomeImportServiceEntry* _tmp15_; - SpitDataImportsWelcomeImportServiceEntry* _tmp16_; + const gchar* _tmp12_; + SpitDataImportsWelcomeImportServiceEntry* _tmp13_; + SpitDataImportsWelcomeImportServiceEntry* _tmp14_; #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp8_ = self->priv->meta_host; + _tmp7_ = self->priv->meta_host; #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp9_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); + _tmp8_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp11_ = spit_data_imports_data_importer_get_service (_tmp10_); + _tmp10_ = spit_data_imports_data_importer_get_service (_tmp9_); #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp13_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp12_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp14_ = discovered_libraries; + _tmp13_ = spit_data_imports_welcome_import_service_entry_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp12_, discovered_libraries, discovered_libraries_length1); #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp14__length1 = discovered_libraries_length1; + _tmp14_ = _tmp13_; #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp15_ = spit_data_imports_welcome_import_service_entry_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp13_, _tmp14_, _tmp14__length1); + spit_data_imports_welcome_import_meta_host_install_service_entry (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_WELCOME_SERVICE_ENTRY, WelcomeServiceEntry)); #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp16_ = _tmp15_; + _g_object_unref0 (_tmp14_); #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_welcome_import_meta_host_install_service_entry (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_WELCOME_SERVICE_ENTRY, WelcomeServiceEntry)); + _g_object_unref0 (_tmp11_); #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp16_); -#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp12_); -#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp10_); -#line 2425 "DataImportsPluginHost.c" + _g_object_unref0 (_tmp9_); +#line 2619 "DataImportsPluginHost.c" } } -static void spit_data_imports_welcome_data_imports_host_real_install_import_progress_pane (SpitDataImportsPluginHost* base, const gchar* message) { +static void +spit_data_imports_welcome_data_imports_host_real_install_import_progress_pane (SpitDataImportsPluginHost* base, + const gchar* message) +{ SpitDataImportsWelcomeDataImportsHost * self; #line 332 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); #line 332 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (message != NULL); -#line 2436 "DataImportsPluginHost.c" +#line 2633 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_data_imports_host_real_update_import_progress_pane (SpitDataImportsPluginHost* base, gdouble progress, const gchar* progress_message) { +static void +spit_data_imports_welcome_data_imports_host_real_update_import_progress_pane (SpitDataImportsPluginHost* base, + gdouble progress, + const gchar* progress_message) +{ SpitDataImportsWelcomeDataImportsHost * self; #line 338 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); -#line 2444 "DataImportsPluginHost.c" +#line 2645 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message) { +static void +spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, + SpitDataImportsImportableMediaItem** items, + int items_length1, + gdouble progress, + gdouble host_progress_delta, + const gchar* progress_message) +{ SpitDataImportsWelcomeDataImportsHost * self; SpitDataImportsCoreImporter* _tmp0_; - SpitDataImportsImportableMediaItem** _tmp1_; - gint _tmp1__length1; - gdouble _tmp2_; - gdouble _tmp3_; - const gchar* _tmp4_; #line 345 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); #line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp0_ = self->priv->core_importer; #line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = items; -#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1__length1 = items_length1; -#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = progress; -#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = host_progress_delta; -#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = progress_message; -#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_core_importer_prepare_media_items_for_import (_tmp0_, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_, _tmp4_); -#line 2472 "DataImportsPluginHost.c" + spit_data_imports_core_importer_prepare_media_items_for_import (_tmp0_, items, items_length1, progress, host_progress_delta, progress_message); +#line 2665 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message) { +static void +spit_data_imports_welcome_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, + SpitDataImportsImportedItemsCountCallback report_imported_items_count, + void* report_imported_items_count_target, + const gchar* finalize_message) +{ SpitDataImportsWelcomeDataImportsHost * self; SpitDataImportsCoreImporter* _tmp0_; - SpitDataImportsImportedItemsCountCallback _tmp1_; - void* _tmp1__target; - SpitDataImportsCoreImporter* _tmp2_; - gint _tmp3_; - SpitDataImportsWelcomeImportMetaHost* _tmp4_; + SpitDataImportsCoreImporter* _tmp1_; + gint _tmp2_; + SpitDataImportsWelcomeImportMetaHost* _tmp3_; #line 354 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); #line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2495,35 +2691,35 @@ static void spit_data_imports_welcome_data_imports_host_real_finalize_import (Sp #line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_core_importer_finalize_import (_tmp0_); #line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = report_imported_items_count; -#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1__target = report_imported_items_count_target; -#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = self->priv->core_importer; + _tmp1_ = self->priv->core_importer; #line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = _tmp2_->imported_items_count; + _tmp2_ = _tmp1_->imported_items_count; #line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ (_tmp3_, _tmp1__target); + report_imported_items_count (_tmp2_, report_imported_items_count_target); #line 360 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = self->priv->meta_host; + _tmp3_ = self->priv->meta_host; #line 360 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_welcome_import_meta_host_finalize_import (_tmp4_, self); -#line 2504 "DataImportsPluginHost.c" + spit_data_imports_welcome_import_meta_host_finalize_import (_tmp3_, self); +#line 2696 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_data_imports_host_class_init (SpitDataImportsWelcomeDataImportsHostClass * klass) { +static void +spit_data_imports_welcome_data_imports_host_class_init (SpitDataImportsWelcomeDataImportsHostClass * klass) +{ #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_welcome_data_imports_host_parent_class = g_type_class_peek_parent (klass); #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_type_class_add_private (klass, sizeof (SpitDataImportsWelcomeDataImportsHostPrivate)); #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" G_OBJECT_CLASS (klass)->finalize = spit_data_imports_welcome_data_imports_host_finalize; -#line 2515 "DataImportsPluginHost.c" +#line 2709 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin_host_interface_init (SpitDataImportsPluginHostIface * iface) { +static void +spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin_host_interface_init (SpitDataImportsPluginHostIface * iface) +{ #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin_host_parent_iface = g_type_interface_peek_parent (iface); #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2550,22 +2746,26 @@ static void spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin iface->prepare_media_items_for_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportableMediaItem**, int, gdouble, gdouble, const gchar*)) spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import; #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" iface->finalize_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportedItemsCountCallback, void*, const gchar*)) spit_data_imports_welcome_data_imports_host_real_finalize_import; -#line 2546 "DataImportsPluginHost.c" +#line 2742 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_data_imports_host_instance_init (SpitDataImportsWelcomeDataImportsHost * self) { +static void +spit_data_imports_welcome_data_imports_host_instance_init (SpitDataImportsWelcomeDataImportsHost * self) +{ #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->priv = SPIT_DATA_IMPORTS_WELCOME_DATA_IMPORTS_HOST_GET_PRIVATE (self); #line 248 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->priv->active_importer = NULL; #line 249 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->priv->importing_halted = FALSE; -#line 2557 "DataImportsPluginHost.c" +#line 2755 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_data_imports_host_finalize (GObject * obj) { +static void +spit_data_imports_welcome_data_imports_host_finalize (GObject * obj) +{ SpitDataImportsWelcomeDataImportsHost * self; #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); @@ -2575,11 +2775,13 @@ static void spit_data_imports_welcome_data_imports_host_finalize (GObject * obj) _spit_data_imports_core_importer_unref0 (self->priv->core_importer); #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" G_OBJECT_CLASS (spit_data_imports_welcome_data_imports_host_parent_class)->finalize (obj); -#line 2571 "DataImportsPluginHost.c" +#line 2771 "DataImportsPluginHost.c" } -GType spit_data_imports_welcome_data_imports_host_get_type (void) { +GType +spit_data_imports_welcome_data_imports_host_get_type (void) +{ static volatile gsize spit_data_imports_welcome_data_imports_host_type_id__volatile = 0; if (g_once_init_enter (&spit_data_imports_welcome_data_imports_host_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsWelcomeDataImportsHostClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) spit_data_imports_welcome_data_imports_host_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SpitDataImportsWelcomeDataImportsHost), 0, (GInstanceInitFunc) spit_data_imports_welcome_data_imports_host_instance_init, NULL }; @@ -2593,37 +2795,42 @@ GType spit_data_imports_welcome_data_imports_host_get_type (void) { } -static SpitDataImportsImportableLibrary** _vala_array_dup21 (SpitDataImportsImportableLibrary** self, int length) { +static SpitDataImportsImportableLibrary** +_vala_array_dup21 (SpitDataImportsImportableLibrary** self, + int length) +{ SpitDataImportsImportableLibrary** result; int i; #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" result = g_new0 (SpitDataImportsImportableLibrary*, length + 1); #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" for (i = 0; i < length; i++) { -#line 2596 "DataImportsPluginHost.c" +#line 2801 "DataImportsPluginHost.c" SpitDataImportsImportableLibrary* _tmp0_; #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" result[i] = _tmp0_; -#line 2602 "DataImportsPluginHost.c" +#line 2807 "DataImportsPluginHost.c" } #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return result; -#line 2606 "DataImportsPluginHost.c" +#line 2811 "DataImportsPluginHost.c" } -SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_service_entry_construct (GType object_type, SpitDataImportsPluginHost* host, const gchar* pluggable_name, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1) { +SpitDataImportsWelcomeImportServiceEntry* +spit_data_imports_welcome_import_service_entry_construct (GType object_type, + SpitDataImportsPluginHost* host, + const gchar* pluggable_name, + SpitDataImportsImportableLibrary** discovered_libraries, + int discovered_libraries_length1) +{ SpitDataImportsWelcomeImportServiceEntry * self = NULL; SpitDataImportsPluginHost* _tmp0_; - SpitDataImportsPluginHost* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_; - SpitDataImportsImportableLibrary** _tmp4_; - gint _tmp4__length1; - SpitDataImportsImportableLibrary** _tmp5_; - gint _tmp5__length1; + gchar* _tmp1_; + SpitDataImportsImportableLibrary** _tmp2_; + gint _tmp2__length1; #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (host), NULL); #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2631,51 +2838,50 @@ SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_servi #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = (SpitDataImportsWelcomeImportServiceEntry*) g_object_new (object_type, NULL); #line 376 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = host; -#line 376 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (host); #line 376 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (self->priv->host); #line 376 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - self->priv->host = _tmp1_; -#line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = pluggable_name; + self->priv->host = _tmp0_; #line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (pluggable_name); #line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_free0 (self->priv->pluggable_name); #line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - self->priv->pluggable_name = _tmp3_; + self->priv->pluggable_name = _tmp1_; #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = discovered_libraries; + _tmp2_ = (discovered_libraries != NULL) ? _vala_array_dup21 (discovered_libraries, discovered_libraries_length1) : ((gpointer) discovered_libraries); #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4__length1 = discovered_libraries_length1; -#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp5_ = (_tmp4_ != NULL) ? _vala_array_dup21 (_tmp4_, _tmp4__length1) : ((gpointer) _tmp4_); -#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp5__length1 = _tmp4__length1; + _tmp2__length1 = discovered_libraries_length1; #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->priv->discovered_libraries = (_vala_array_free (self->priv->discovered_libraries, self->priv->discovered_libraries_length1, (GDestroyNotify) g_object_unref), NULL); #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - self->priv->discovered_libraries = _tmp5_; + self->priv->discovered_libraries = _tmp2_; #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - self->priv->discovered_libraries_length1 = _tmp5__length1; + self->priv->discovered_libraries_length1 = _tmp2__length1; #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->priv->_discovered_libraries_size_ = self->priv->discovered_libraries_length1; #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return self; -#line 2660 "DataImportsPluginHost.c" +#line 2859 "DataImportsPluginHost.c" } -SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_service_entry_new (SpitDataImportsPluginHost* host, const gchar* pluggable_name, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1) { +SpitDataImportsWelcomeImportServiceEntry* +spit_data_imports_welcome_import_service_entry_new (SpitDataImportsPluginHost* host, + const gchar* pluggable_name, + SpitDataImportsImportableLibrary** discovered_libraries, + int discovered_libraries_length1) +{ #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return spit_data_imports_welcome_import_service_entry_construct (SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, host, pluggable_name, discovered_libraries, discovered_libraries_length1); -#line 2667 "DataImportsPluginHost.c" +#line 2871 "DataImportsPluginHost.c" } -static gchar* spit_data_imports_welcome_import_service_entry_real_get_service_name (WelcomeServiceEntry* base) { +static gchar* +spit_data_imports_welcome_import_service_entry_real_get_service_name (WelcomeServiceEntry* base) +{ SpitDataImportsWelcomeImportServiceEntry * self; gchar* result = NULL; const gchar* _tmp0_; @@ -2690,11 +2896,13 @@ static gchar* spit_data_imports_welcome_import_service_entry_real_get_service_na result = _tmp1_; #line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return result; -#line 2686 "DataImportsPluginHost.c" +#line 2892 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_import_service_entry_real_execute (WelcomeServiceEntry* base) { +static void +spit_data_imports_welcome_import_service_entry_real_execute (WelcomeServiceEntry* base) +{ SpitDataImportsWelcomeImportServiceEntry * self; SpitDataImportsImportableLibrary** _tmp0_; gint _tmp0__length1; @@ -2704,7 +2912,7 @@ static void spit_data_imports_welcome_import_service_entry_real_execute (Welcome _tmp0_ = self->priv->discovered_libraries; #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp0__length1 = self->priv->discovered_libraries_length1; -#line 2700 "DataImportsPluginHost.c" +#line 2908 "DataImportsPluginHost.c" { SpitDataImportsImportableLibrary** library_collection = NULL; gint library_collection_length1 = 0; @@ -2716,14 +2924,14 @@ static void spit_data_imports_welcome_import_service_entry_real_execute (Welcome library_collection_length1 = _tmp0__length1; #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" for (library_it = 0; library_it < _tmp0__length1; library_it = library_it + 1) { -#line 2712 "DataImportsPluginHost.c" +#line 2920 "DataImportsPluginHost.c" SpitDataImportsImportableLibrary* _tmp1_; SpitDataImportsImportableLibrary* library = NULL; #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp1_ = _g_object_ref0 (library_collection[library_it]); #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" library = _tmp1_; -#line 2719 "DataImportsPluginHost.c" +#line 2927 "DataImportsPluginHost.c" { SpitDataImportsPluginHost* _tmp2_; SpitDataImportsDataImporter* _tmp3_; @@ -2743,43 +2951,51 @@ static void spit_data_imports_welcome_import_service_entry_real_execute (Welcome _g_object_unref0 (_tmp4_); #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (library); -#line 2739 "DataImportsPluginHost.c" +#line 2947 "DataImportsPluginHost.c" } } } } -static void spit_data_imports_welcome_import_service_entry_class_init (SpitDataImportsWelcomeImportServiceEntryClass * klass) { +static void +spit_data_imports_welcome_import_service_entry_class_init (SpitDataImportsWelcomeImportServiceEntryClass * klass) +{ #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_welcome_import_service_entry_parent_class = g_type_class_peek_parent (klass); #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_type_class_add_private (klass, sizeof (SpitDataImportsWelcomeImportServiceEntryPrivate)); #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" G_OBJECT_CLASS (klass)->finalize = spit_data_imports_welcome_import_service_entry_finalize; -#line 2753 "DataImportsPluginHost.c" +#line 2963 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_import_service_entry_welcome_service_entry_interface_init (WelcomeServiceEntryIface * iface) { +static void +spit_data_imports_welcome_import_service_entry_welcome_service_entry_interface_init (WelcomeServiceEntryIface * iface) +{ #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_welcome_import_service_entry_welcome_service_entry_parent_iface = g_type_interface_peek_parent (iface); #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" iface->get_service_name = (gchar* (*) (WelcomeServiceEntry *)) spit_data_imports_welcome_import_service_entry_real_get_service_name; #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" iface->execute = (void (*) (WelcomeServiceEntry *)) spit_data_imports_welcome_import_service_entry_real_execute; -#line 2764 "DataImportsPluginHost.c" +#line 2976 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_import_service_entry_instance_init (SpitDataImportsWelcomeImportServiceEntry * self) { +static void +spit_data_imports_welcome_import_service_entry_instance_init (SpitDataImportsWelcomeImportServiceEntry * self) +{ #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->priv = SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_GET_PRIVATE (self); -#line 2771 "DataImportsPluginHost.c" +#line 2985 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_import_service_entry_finalize (GObject * obj) { +static void +spit_data_imports_welcome_import_service_entry_finalize (GObject * obj) +{ SpitDataImportsWelcomeImportServiceEntry * self; #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, SpitDataImportsWelcomeImportServiceEntry); @@ -2791,11 +3007,13 @@ static void spit_data_imports_welcome_import_service_entry_finalize (GObject * o _g_object_unref0 (self->priv->host); #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" G_OBJECT_CLASS (spit_data_imports_welcome_import_service_entry_parent_class)->finalize (obj); -#line 2787 "DataImportsPluginHost.c" +#line 3003 "DataImportsPluginHost.c" } -GType spit_data_imports_welcome_import_service_entry_get_type (void) { +GType +spit_data_imports_welcome_import_service_entry_get_type (void) +{ static volatile gsize spit_data_imports_welcome_import_service_entry_type_id__volatile = 0; if (g_once_init_enter (&spit_data_imports_welcome_import_service_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsWelcomeImportServiceEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) spit_data_imports_welcome_import_service_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SpitDataImportsWelcomeImportServiceEntry), 0, (GInstanceInitFunc) spit_data_imports_welcome_import_service_entry_instance_init, NULL }; @@ -2809,36 +3027,40 @@ GType spit_data_imports_welcome_import_service_entry_get_type (void) { } -SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_construct (GType object_type, WelcomeDialog* dialog) { +SpitDataImportsWelcomeImportMetaHost* +spit_data_imports_welcome_import_meta_host_construct (GType object_type, + WelcomeDialog* dialog) +{ SpitDataImportsWelcomeImportMetaHost * self = NULL; WelcomeDialog* _tmp0_; - WelcomeDialog* _tmp1_; #line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_val_if_fail (IS_WELCOME_DIALOG (dialog), NULL); #line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = (SpitDataImportsWelcomeImportMetaHost*) g_object_new (object_type, NULL); #line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = dialog; -#line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (dialog); #line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (self->priv->dialog); #line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - self->priv->dialog = _tmp1_; + self->priv->dialog = _tmp0_; #line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return self; -#line 2823 "DataImportsPluginHost.c" +#line 3041 "DataImportsPluginHost.c" } -SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_new (WelcomeDialog* dialog) { +SpitDataImportsWelcomeImportMetaHost* +spit_data_imports_welcome_import_meta_host_new (WelcomeDialog* dialog) +{ #line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return spit_data_imports_welcome_import_meta_host_construct (SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, dialog); -#line 2830 "DataImportsPluginHost.c" +#line 3050 "DataImportsPluginHost.c" } -void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImportMetaHost* self) { +void +spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImportMetaHost* self) +{ SpitDataImportsService** services = NULL; gint _tmp0_; SpitDataImportsService** _tmp1_; @@ -2860,7 +3082,7 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp _tmp2_ = services; #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp2__length1 = services_length1; -#line 2856 "DataImportsPluginHost.c" +#line 3078 "DataImportsPluginHost.c" { SpitDataImportsService** service_collection = NULL; gint service_collection_length1 = 0; @@ -2872,14 +3094,14 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp service_collection_length1 = _tmp2__length1; #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" for (service_it = 0; service_it < _tmp2__length1; service_it = service_it + 1) { -#line 2868 "DataImportsPluginHost.c" +#line 3090 "DataImportsPluginHost.c" SpitDataImportsService* _tmp3_; SpitDataImportsService* service = NULL; #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp3_ = _g_object_ref0 (service_collection[service_it]); #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" service = _tmp3_; -#line 2875 "DataImportsPluginHost.c" +#line 3097 "DataImportsPluginHost.c" { SpitDataImportsWelcomeDataImportsHost* host = NULL; SpitDataImportsService* _tmp4_; @@ -2899,87 +3121,90 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp _g_object_unref0 (host); #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (service); -#line 2895 "DataImportsPluginHost.c" +#line 3117 "DataImportsPluginHost.c" } } } #line 399 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" services = (_vala_array_free (services, services_length1, (GDestroyNotify) g_object_unref), NULL); -#line 2901 "DataImportsPluginHost.c" +#line 3123 "DataImportsPluginHost.c" } -void spit_data_imports_welcome_import_meta_host_finalize_import (SpitDataImportsWelcomeImportMetaHost* self, SpitDataImportsWelcomeDataImportsHost* host) { - SpitDataImportsWelcomeDataImportsHost* _tmp0_; +void +spit_data_imports_welcome_import_meta_host_finalize_import (SpitDataImportsWelcomeImportMetaHost* self, + SpitDataImportsWelcomeDataImportsHost* host) +{ #line 407 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_IMPORT_META_HOST (self)); #line 407 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_DATA_IMPORTS_HOST (host)); #line 408 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = host; -#line 408 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_plugin_host_stop_importing (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); -#line 2915 "DataImportsPluginHost.c" + spit_data_imports_plugin_host_stop_importing (G_TYPE_CHECK_INSTANCE_CAST (host, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); +#line 3137 "DataImportsPluginHost.c" } -void spit_data_imports_welcome_import_meta_host_install_service_entry (SpitDataImportsWelcomeImportMetaHost* self, WelcomeServiceEntry* entry) { - WelcomeServiceEntry* _tmp0_; +void +spit_data_imports_welcome_import_meta_host_install_service_entry (SpitDataImportsWelcomeImportMetaHost* self, + WelcomeServiceEntry* entry) +{ + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - WelcomeDialog* _tmp5_; - WelcomeServiceEntry* _tmp6_; + WelcomeDialog* _tmp4_; #line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_IMPORT_META_HOST (self)); #line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (IS_WELCOME_SERVICE_ENTRY (entry)); #line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = entry; + _tmp0_ = welcome_service_entry_get_service_name (entry); #line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = welcome_service_entry_get_service_name (_tmp0_); -#line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = g_strdup_printf ("WelcomeImportMetaHost: Installing service entry for %s", _tmp2_); + _tmp2_ = g_strdup_printf ("WelcomeImportMetaHost: Installing service entry for %s", _tmp1_); #line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - g_debug ("DataImportsPluginHost.vala:412: %s", _tmp4_); + g_debug ("DataImportsPluginHost.vala:412: %s", _tmp3_); #line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 413 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp5_ = self->priv->dialog; + _tmp4_ = self->priv->dialog; #line 413 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp6_ = entry; -#line 413 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - welcome_dialog_install_service_entry (_tmp5_, _tmp6_); -#line 2953 "DataImportsPluginHost.c" + welcome_dialog_install_service_entry (_tmp4_, entry); +#line 3172 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_import_meta_host_class_init (SpitDataImportsWelcomeImportMetaHostClass * klass) { +static void +spit_data_imports_welcome_import_meta_host_class_init (SpitDataImportsWelcomeImportMetaHostClass * klass) +{ #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_welcome_import_meta_host_parent_class = g_type_class_peek_parent (klass); #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_type_class_add_private (klass, sizeof (SpitDataImportsWelcomeImportMetaHostPrivate)); #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" G_OBJECT_CLASS (klass)->finalize = spit_data_imports_welcome_import_meta_host_finalize; -#line 2964 "DataImportsPluginHost.c" +#line 3185 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_import_meta_host_instance_init (SpitDataImportsWelcomeImportMetaHost * self) { +static void +spit_data_imports_welcome_import_meta_host_instance_init (SpitDataImportsWelcomeImportMetaHost * self) +{ #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->priv = SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_GET_PRIVATE (self); -#line 2971 "DataImportsPluginHost.c" +#line 3194 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_import_meta_host_finalize (GObject * obj) { +static void +spit_data_imports_welcome_import_meta_host_finalize (GObject * obj) +{ SpitDataImportsWelcomeImportMetaHost * self; #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, SpitDataImportsWelcomeImportMetaHost); @@ -2987,11 +3212,13 @@ static void spit_data_imports_welcome_import_meta_host_finalize (GObject * obj) _g_object_unref0 (self->priv->dialog); #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" G_OBJECT_CLASS (spit_data_imports_welcome_import_meta_host_parent_class)->finalize (obj); -#line 2983 "DataImportsPluginHost.c" +#line 3208 "DataImportsPluginHost.c" } -GType spit_data_imports_welcome_import_meta_host_get_type (void) { +GType +spit_data_imports_welcome_import_meta_host_get_type (void) +{ static volatile gsize spit_data_imports_welcome_import_meta_host_type_id__volatile = 0; if (g_once_init_enter (&spit_data_imports_welcome_import_meta_host_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsWelcomeImportMetaHostClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) spit_data_imports_welcome_import_meta_host_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SpitDataImportsWelcomeImportMetaHost), 0, (GInstanceInitFunc) spit_data_imports_welcome_import_meta_host_instance_init, NULL }; @@ -3003,7 +3230,9 @@ GType spit_data_imports_welcome_import_meta_host_get_type (void) { } -SpitDataImportsService** spit_data_imports_load_all_services (int* result_length1) { +SpitDataImportsService** +spit_data_imports_load_all_services (int* result_length1) +{ SpitDataImportsService** result = NULL; gint _tmp0_; SpitDataImportsService** _tmp1_; @@ -3019,85 +3248,89 @@ SpitDataImportsService** spit_data_imports_load_all_services (int* result_length if (result_length1) { #line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" *result_length1 = _tmp2__length1; -#line 3015 "DataImportsPluginHost.c" +#line 3244 "DataImportsPluginHost.c" } #line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" result = _tmp2_; #line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return result; -#line 3021 "DataImportsPluginHost.c" +#line 3250 "DataImportsPluginHost.c" } -static void _vala_array_add72 (SpitDataImportsService** * array, int* length, int* size, SpitDataImportsService* value) { +static void +_vala_array_add72 (SpitDataImportsService** * array, + int* length, + int* size, + SpitDataImportsService* value) +{ #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if ((*length) == (*size)) { #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" *size = (*size) ? (2 * (*size)) : 4; #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" *array = g_renew (SpitDataImportsService*, *array, (*size) + 1); -#line 3032 "DataImportsPluginHost.c" +#line 3266 "DataImportsPluginHost.c" } #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" (*array)[(*length)++] = value; #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" (*array)[*length] = NULL; -#line 3038 "DataImportsPluginHost.c" +#line 3272 "DataImportsPluginHost.c" } -static gint __lambda25_ (void* a, void* b) { +static gint +__lambda25_ (void* a, + void* b) +{ gint result = 0; - void* _tmp0_; + const gchar* _tmp0_; const gchar* _tmp1_; - void* _tmp2_; - const gchar* _tmp3_; - gint _tmp4_; -#line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = a; #line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitDataImportsService**) _tmp0_), SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp0_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitDataImportsService**) a), SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = b; + _tmp1_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitDataImportsService**) b), SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitDataImportsService**) _tmp2_), SPIT_TYPE_PLUGGABLE, SpitPluggable)); -#line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = utf8_cs_compare (_tmp1_, _tmp3_); -#line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - result = _tmp4_; + result = utf8_cs_compare (_tmp0_, _tmp1_); #line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return result; -#line 3063 "DataImportsPluginHost.c" +#line 3291 "DataImportsPluginHost.c" } -static gint ___lambda25____compar_fn_t (void* key1, void* key2) { +static gint +___lambda25____compar_fn_t (void* key1, + void* key2) +{ gint result; result = __lambda25_ (key1, key2); #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return result; -#line 3072 "DataImportsPluginHost.c" +#line 3303 "DataImportsPluginHost.c" } -SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int* result_length1) { +SpitDataImportsService** +spit_data_imports_load_services (gboolean load_all, + int* result_length1) +{ SpitDataImportsService** result = NULL; SpitDataImportsService** loaded_services = NULL; SpitDataImportsService** _tmp0_; gint loaded_services_length1; gint _loaded_services_size_; GeeCollection* pluggables = NULL; - gboolean _tmp1_; + GeeCollection* _tmp1_; GeeCollection* _tmp2_; - GeeCollection* _tmp3_; + gint _tmp3_; gint _tmp4_; - gint _tmp5_; - SpitDataImportsService** _tmp26_; - gint _tmp26__length1; - SpitDataImportsService** _tmp27_; - gint _tmp27__length1; - SpitDataImportsService** _tmp28_; - gint _tmp28__length1; + SpitDataImportsService** _tmp23_; + gint _tmp23__length1; + SpitDataImportsService** _tmp24_; + gint _tmp24__length1; + SpitDataImportsService** _tmp25_; + gint _tmp25__length1; #line 422 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp0_ = g_new0 (SpitDataImportsService*, 0 + 1); #line 422 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -3107,316 +3340,300 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int #line 422 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _loaded_services_size_ = loaded_services_length1; #line 425 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = load_all; -#line 425 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = plugins_get_pluggables_for_type (SPIT_DATA_IMPORTS_TYPE_SERVICE, NULL, NULL, NULL, _tmp1_); + _tmp1_ = plugins_get_pluggables_for_type (SPIT_DATA_IMPORTS_TYPE_SERVICE, NULL, NULL, NULL, load_all); #line 425 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - pluggables = _tmp2_; + pluggables = _tmp1_; #line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = pluggables; + _tmp2_ = pluggables; #line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = gee_collection_get_size (_tmp3_); + _tmp3_ = gee_collection_get_size (_tmp2_); #line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_debug ("DataImportsPluginHost.vala:429: DataImportsDialog: discovered %d plugg" \ -"able data import services.", _tmp5_); -#line 3116 "DataImportsPluginHost.c" +"able data import services.", _tmp4_); +#line 3347 "DataImportsPluginHost.c" { GeeIterator* _pluggable_it = NULL; - GeeCollection* _tmp6_; - GeeIterator* _tmp7_; + GeeCollection* _tmp5_; + GeeIterator* _tmp6_; #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp6_ = pluggables; + _tmp5_ = pluggables; #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _pluggable_it = _tmp7_; + _pluggable_it = _tmp6_; #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" while (TRUE) { -#line 3129 "DataImportsPluginHost.c" - GeeIterator* _tmp8_; - gboolean _tmp9_; +#line 3360 "DataImportsPluginHost.c" + GeeIterator* _tmp7_; SpitPluggable* pluggable = NULL; - GeeIterator* _tmp10_; - gpointer _tmp11_; + GeeIterator* _tmp8_; + gpointer _tmp9_; gint pluggable_interface = 0; - SpitPluggable* _tmp12_; - gint _tmp13_; - gint _tmp14_; + SpitPluggable* _tmp10_; + gint _tmp11_; SpitDataImportsService* service = NULL; - SpitPluggable* _tmp19_; - SpitDataImportsService* _tmp20_; + SpitPluggable* _tmp16_; + SpitDataImportsService* _tmp17_; + SpitDataImportsService* _tmp18_; + const gchar* _tmp19_; + SpitDataImportsService** _tmp20_; + gint _tmp20__length1; SpitDataImportsService* _tmp21_; - const gchar* _tmp22_; - SpitDataImportsService** _tmp23_; - gint _tmp23__length1; - SpitDataImportsService* _tmp24_; - SpitDataImportsService* _tmp25_; -#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp8_ = _pluggable_it; + SpitDataImportsService* _tmp22_; #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp9_ = gee_iterator_next (_tmp8_); + _tmp7_ = _pluggable_it; #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - if (!_tmp9_) { + if (!gee_iterator_next (_tmp7_)) { #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" break; -#line 3156 "DataImportsPluginHost.c" +#line 3383 "DataImportsPluginHost.c" } #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp10_ = _pluggable_it; + _tmp8_ = _pluggable_it; #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp11_ = gee_iterator_get (_tmp10_); + _tmp9_ = gee_iterator_get (_tmp8_); #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - pluggable = (SpitPluggable*) _tmp11_; + pluggable = (SpitPluggable*) _tmp9_; #line 432 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp12_ = pluggable; + _tmp10_ = pluggable; #line 432 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp13_ = spit_pluggable_get_pluggable_interface (_tmp12_, SPIT_DATA_IMPORTS_CURRENT_INTERFACE, SPIT_DATA_IMPORTS_CURRENT_INTERFACE); -#line 432 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - pluggable_interface = _tmp13_; + pluggable_interface = spit_pluggable_get_pluggable_interface (_tmp10_, SPIT_DATA_IMPORTS_CURRENT_INTERFACE, SPIT_DATA_IMPORTS_CURRENT_INTERFACE); #line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp14_ = pluggable_interface; + _tmp11_ = pluggable_interface; #line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - if (_tmp14_ != SPIT_DATA_IMPORTS_CURRENT_INTERFACE) { -#line 3174 "DataImportsPluginHost.c" - SpitPluggable* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; - gint _tmp18_; + if (_tmp11_ != SPIT_DATA_IMPORTS_CURRENT_INTERFACE) { +#line 3399 "DataImportsPluginHost.c" + SpitPluggable* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + gint _tmp15_; #line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp15_ = pluggable; + _tmp12_ = pluggable; #line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp16_ = plugins_get_pluggable_module_id (_tmp15_); + _tmp13_ = plugins_get_pluggable_module_id (_tmp12_); #line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp17_ = _tmp16_; + _tmp14_ = _tmp13_; #line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp18_ = pluggable_interface; + _tmp15_ = pluggable_interface; #line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_warning ("DataImportsPluginHost.vala:435: Unable to load data import plugin %s: " \ -"reported interface %d.", _tmp17_, _tmp18_); +"reported interface %d.", _tmp14_, _tmp15_); #line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp14_); #line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (pluggable); #line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" continue; -#line 3195 "DataImportsPluginHost.c" +#line 3420 "DataImportsPluginHost.c" } #line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp19_ = pluggable; + _tmp16_ = pluggable; #line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SPIT_DATA_IMPORTS_TYPE_SERVICE, SpitDataImportsService)); + _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_DATA_IMPORTS_TYPE_SERVICE, SpitDataImportsService)); #line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - service = _tmp20_; + service = _tmp17_; #line 444 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp21_ = service; + _tmp18_ = service; #line 444 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp22_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp19_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 444 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_debug ("DataImportsPluginHost.vala:444: DataImportsDialog: discovered pluggabl" \ -"e data import service '%s'.", _tmp22_); +"e data import service '%s'.", _tmp19_); #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp23_ = loaded_services; + _tmp20_ = loaded_services; #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp23__length1 = loaded_services_length1; + _tmp20__length1 = loaded_services_length1; #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp24_ = service; + _tmp21_ = service; #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp25_ = _g_object_ref0 (_tmp24_); + _tmp22_ = _g_object_ref0 (_tmp21_); #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _vala_array_add72 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp25_); + _vala_array_add72 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp22_); #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (service); #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (pluggable); -#line 3223 "DataImportsPluginHost.c" +#line 3448 "DataImportsPluginHost.c" } #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (_pluggable_it); -#line 3227 "DataImportsPluginHost.c" +#line 3452 "DataImportsPluginHost.c" } #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp26_ = loaded_services; + _tmp23_ = loaded_services; #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp26__length1 = loaded_services_length1; + _tmp23__length1 = loaded_services_length1; #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp27_ = loaded_services; + _tmp24_ = loaded_services; #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp27__length1 = loaded_services_length1; + _tmp24__length1 = loaded_services_length1; #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - qsort (_tmp26_, (gsize) _tmp27__length1, (gsize) sizeof (SpitDataImportsService*), ___lambda25____compar_fn_t); + qsort (_tmp23_, (gsize) _tmp24__length1, (gsize) sizeof (SpitDataImportsService*), ___lambda25____compar_fn_t); #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp28_ = loaded_services; + _tmp25_ = loaded_services; #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp28__length1 = loaded_services_length1; + _tmp25__length1 = loaded_services_length1; #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (result_length1) { #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - *result_length1 = _tmp28__length1; -#line 3247 "DataImportsPluginHost.c" + *result_length1 = _tmp25__length1; +#line 3472 "DataImportsPluginHost.c" } #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - result = _tmp28_; + result = _tmp25_; #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (pluggables); #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return result; -#line 3255 "DataImportsPluginHost.c" +#line 3480 "DataImportsPluginHost.c" } -void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll) { - ImportManifest* _tmp0_; - GeeList* _tmp1_; +void +spit_data_imports_data_import_reporter (ImportManifest* manifest, + BatchImportRoll* import_roll) +{ + GeeList* _tmp0_; + gint _tmp1_; gint _tmp2_; - gint _tmp3_; #line 462 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (IS_IMPORT_MANIFEST (manifest)); #line 462 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (IS_BATCH_IMPORT_ROLL (import_roll)); #line 463 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = manifest; -#line 463 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = _tmp0_->all; + _tmp0_ = manifest->all; #line 463 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); #line 463 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 463 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - if (_tmp3_ > 0) { -#line 3278 "DataImportsPluginHost.c" - ImportManifest* _tmp4_; + if (_tmp2_ > 0) { +#line 3503 "DataImportsPluginHost.c" + ImportManifest* _tmp3_; #line 464 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = spit_data_imports_meta_manifest; + _tmp3_ = spit_data_imports_meta_manifest; #line 464 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - if (_tmp4_ == NULL) { -#line 3284 "DataImportsPluginHost.c" - ImportManifest* _tmp5_; + if (_tmp3_ == NULL) { +#line 3509 "DataImportsPluginHost.c" + ImportManifest* _tmp4_; #line 465 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp5_ = import_manifest_new (NULL, NULL); + _tmp4_ = import_manifest_new (NULL, NULL); #line 465 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _import_manifest_unref0 (spit_data_imports_meta_manifest); #line 465 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_meta_manifest = _tmp5_; -#line 3292 "DataImportsPluginHost.c" + spit_data_imports_meta_manifest = _tmp4_; +#line 3517 "DataImportsPluginHost.c" } { GeeList* _result_list = NULL; - ImportManifest* _tmp6_; - GeeList* _tmp7_; - GeeList* _tmp8_; + GeeList* _tmp5_; + GeeList* _tmp6_; gint _result_size = 0; - GeeList* _tmp9_; - gint _tmp10_; - gint _tmp11_; + GeeList* _tmp7_; + gint _tmp8_; + gint _tmp9_; gint _result_index = 0; #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp6_ = manifest; + _tmp5_ = manifest->all; #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp7_ = _tmp6_->all; + _tmp6_ = _g_object_ref0 (_tmp5_); #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp8_ = _g_object_ref0 (_tmp7_); + _result_list = _tmp6_; #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _result_list = _tmp8_; + _tmp7_ = _result_list; #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp9_ = _result_list; + _tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp9_ = _tmp8_; #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp11_ = _tmp10_; -#line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _result_size = _tmp11_; + _result_size = _tmp9_; #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _result_index = -1; #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" while (TRUE) { -#line 3324 "DataImportsPluginHost.c" +#line 3546 "DataImportsPluginHost.c" + gint _tmp10_; + gint _tmp11_; gint _tmp12_; - gint _tmp13_; - gint _tmp14_; BatchImportResult* _result_ = NULL; - GeeList* _tmp15_; - gint _tmp16_; - gpointer _tmp17_; - ImportManifest* _tmp18_; - BatchImportResult* _tmp19_; + GeeList* _tmp13_; + gint _tmp14_; + gpointer _tmp15_; + ImportManifest* _tmp16_; + BatchImportResult* _tmp17_; #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp12_ = _result_index; + _tmp10_ = _result_index; #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _result_index = _tmp12_ + 1; + _result_index = _tmp10_ + 1; #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp13_ = _result_index; + _tmp11_ = _result_index; #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp14_ = _result_size; + _tmp12_ = _result_size; #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - if (!(_tmp13_ < _tmp14_)) { + if (!(_tmp11_ < _tmp12_)) { #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" break; -#line 3346 "DataImportsPluginHost.c" +#line 3568 "DataImportsPluginHost.c" } #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp15_ = _result_list; + _tmp13_ = _result_list; #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp16_ = _result_index; + _tmp14_ = _result_index; #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp17_ = gee_list_get (_tmp15_, _tmp16_); + _tmp15_ = gee_list_get (_tmp13_, _tmp14_); #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _result_ = (BatchImportResult*) _tmp17_; + _result_ = (BatchImportResult*) _tmp15_; #line 467 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp18_ = spit_data_imports_meta_manifest; + _tmp16_ = spit_data_imports_meta_manifest; #line 467 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp19_ = _result_; + _tmp17_ = _result_; #line 467 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - import_manifest_add_result (_tmp18_, _tmp19_); + import_manifest_add_result (_tmp16_, _tmp17_); #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _batch_import_result_unref0 (_result_); -#line 3364 "DataImportsPluginHost.c" +#line 3586 "DataImportsPluginHost.c" } #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (_result_list); -#line 3368 "DataImportsPluginHost.c" +#line 3590 "DataImportsPluginHost.c" } } else { - ImportManifest* _tmp20_; + ImportManifest* _tmp18_; #line 470 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" data_imports_ui_data_imports_dialog_terminate_instance (); #line 471 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp20_ = spit_data_imports_meta_manifest; + _tmp18_ = spit_data_imports_meta_manifest; #line 471 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - import_ui_report_manifest (_tmp20_, TRUE, NULL); + import_ui_report_manifest (_tmp18_, TRUE, NULL); #line 472 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _import_manifest_unref0 (spit_data_imports_meta_manifest); #line 472 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_meta_manifest = NULL; -#line 3382 "DataImportsPluginHost.c" +#line 3604 "DataImportsPluginHost.c" } } -gint64 spit_data_imports_import_job_comparator (void* a, void* b) { +gint64 +spit_data_imports_import_job_comparator (void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; - time_t _tmp1_; - void* _tmp2_; - time_t _tmp3_; -#line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = a; -#line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = spit_data_imports_data_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((SpitDataImportsDataImportJob*) _tmp0_, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob)); -#line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = b; -#line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = spit_data_imports_data_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((SpitDataImportsDataImportJob*) _tmp2_, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob)); #line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - result = (gint64) (_tmp1_ - _tmp3_); + result = (gint64) (spit_data_imports_data_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((SpitDataImportsDataImportJob*) a, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob)) - spit_data_imports_data_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((SpitDataImportsDataImportJob*) b, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob))); #line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return result; -#line 3405 "DataImportsPluginHost.c" +#line 3618 "DataImportsPluginHost.c" } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -3428,7 +3645,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/data_imports/DataImportsUI.c b/src/data_imports/DataImportsUI.c index b350abf..6a5ebdf 100644 --- a/src/data_imports/DataImportsUI.c +++ b/src/data_imports/DataImportsUI.c @@ -1,4 +1,4 @@ -/* DataImportsUI.c generated by valac 0.36.6, the Vala compiler +/* DataImportsUI.c generated by valac 0.40.4, the Vala compiler * generated from DataImportsUI.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -30,6 +31,11 @@ typedef struct _DataImportsUIConcreteDialogPane DataImportsUIConcreteDialogPane; typedef struct _DataImportsUIConcreteDialogPaneClass DataImportsUIConcreteDialogPaneClass; typedef struct _DataImportsUIConcreteDialogPanePrivate DataImportsUIConcreteDialogPanePrivate; +enum { + DATA_IMPORTS_UI_CONCRETE_DIALOG_PANE_0_PROPERTY, + DATA_IMPORTS_UI_CONCRETE_DIALOG_PANE_NUM_PROPERTIES +}; +static GParamSpec* data_imports_ui_concrete_dialog_pane_properties[DATA_IMPORTS_UI_CONCRETE_DIALOG_PANE_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define DATA_IMPORTS_UI_TYPE_STATIC_MESSAGE_PANE (data_imports_ui_static_message_pane_get_type ()) @@ -42,6 +48,11 @@ typedef struct _DataImportsUIConcreteDialogPanePrivate DataImportsUIConcreteDial typedef struct _DataImportsUIStaticMessagePane DataImportsUIStaticMessagePane; typedef struct _DataImportsUIStaticMessagePaneClass DataImportsUIStaticMessagePaneClass; typedef struct _DataImportsUIStaticMessagePanePrivate DataImportsUIStaticMessagePanePrivate; +enum { + DATA_IMPORTS_UI_STATIC_MESSAGE_PANE_0_PROPERTY, + DATA_IMPORTS_UI_STATIC_MESSAGE_PANE_NUM_PROPERTIES +}; +static GParamSpec* data_imports_ui_static_message_pane_properties[DATA_IMPORTS_UI_STATIC_MESSAGE_PANE_NUM_PROPERTIES]; #define DATA_IMPORTS_UI_TYPE_LIBRARY_SELECTION_PANE (data_imports_ui_library_selection_pane_get_type ()) #define DATA_IMPORTS_UI_LIBRARY_SELECTION_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_UI_TYPE_LIBRARY_SELECTION_PANE, DataImportsUILibrarySelectionPane)) @@ -53,6 +64,11 @@ typedef struct _DataImportsUIStaticMessagePanePrivate DataImportsUIStaticMessage typedef struct _DataImportsUILibrarySelectionPane DataImportsUILibrarySelectionPane; typedef struct _DataImportsUILibrarySelectionPaneClass DataImportsUILibrarySelectionPaneClass; typedef struct _DataImportsUILibrarySelectionPanePrivate DataImportsUILibrarySelectionPanePrivate; +enum { + DATA_IMPORTS_UI_LIBRARY_SELECTION_PANE_0_PROPERTY, + DATA_IMPORTS_UI_LIBRARY_SELECTION_PANE_NUM_PROPERTIES +}; +static GParamSpec* data_imports_ui_library_selection_pane_properties[DATA_IMPORTS_UI_LIBRARY_SELECTION_PANE_NUM_PROPERTIES]; #define _g_free0(var) (var = (g_free (var), NULL)) typedef struct _Block11Data Block11Data; typedef struct _Block12Data Block12Data; @@ -67,6 +83,11 @@ typedef struct _Block12Data Block12Data; typedef struct _DataImportsUIProgressPane DataImportsUIProgressPane; typedef struct _DataImportsUIProgressPaneClass DataImportsUIProgressPaneClass; typedef struct _DataImportsUIProgressPanePrivate DataImportsUIProgressPanePrivate; +enum { + DATA_IMPORTS_UI_PROGRESS_PANE_0_PROPERTY, + DATA_IMPORTS_UI_PROGRESS_PANE_NUM_PROPERTIES +}; +static GParamSpec* data_imports_ui_progress_pane_properties[DATA_IMPORTS_UI_PROGRESS_PANE_NUM_PROPERTIES]; #define DATA_IMPORTS_UI_TYPE_DATA_IMPORTS_DIALOG (data_imports_ui_data_imports_dialog_get_type ()) #define DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_UI_TYPE_DATA_IMPORTS_DIALOG, DataImportsUIDataImportsDialog)) @@ -98,6 +119,11 @@ typedef struct _PluginsStandardHostInterfaceClass PluginsStandardHostInterfaceCl typedef struct _SpitDataImportsConcreteDataImportsHost SpitDataImportsConcreteDataImportsHost; typedef struct _SpitDataImportsConcreteDataImportsHostClass SpitDataImportsConcreteDataImportsHostClass; +enum { + DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_0_PROPERTY, + DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_NUM_PROPERTIES +}; +static GParamSpec* data_imports_ui_data_imports_dialog_properties[DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_NUM_PROPERTIES]; #define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ()) #define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade)) @@ -224,9 +250,6 @@ static DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_insta " in the Preferences dialog.") GType data_imports_ui_concrete_dialog_pane_get_type (void) G_GNUC_CONST; #define DATA_IMPORTS_UI_CONCRETE_DIALOG_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_UI_TYPE_CONCRETE_DIALOG_PANE, DataImportsUIConcreteDialogPanePrivate)) -enum { - DATA_IMPORTS_UI_CONCRETE_DIALOG_PANE_DUMMY_PROPERTY -}; DataImportsUIConcreteDialogPane* data_imports_ui_concrete_dialog_pane_new (void); DataImportsUIConcreteDialogPane* data_imports_ui_concrete_dialog_pane_construct (GType object_type); static GtkWidget* data_imports_ui_concrete_dialog_pane_real_get_widget (SpitDataImportsDialogPane* base); @@ -235,52 +258,65 @@ static void data_imports_ui_concrete_dialog_pane_real_on_pane_installed (SpitDat static void data_imports_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitDataImportsDialogPane* base); static void data_imports_ui_concrete_dialog_pane_finalize (GObject * obj); GType data_imports_ui_static_message_pane_get_type (void) G_GNUC_CONST; -enum { - DATA_IMPORTS_UI_STATIC_MESSAGE_PANE_DUMMY_PROPERTY -}; DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_new (const gchar* message_string); -DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct (GType object_type, const gchar* message_string); +DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct (GType object_type, + const gchar* message_string); DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_new_with_pango (const gchar* msg); -DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct_with_pango (GType object_type, const gchar* msg); +DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct_with_pango (GType object_type, + const gchar* msg); GType data_imports_ui_library_selection_pane_get_type (void) G_GNUC_CONST; #define DATA_IMPORTS_UI_LIBRARY_SELECTION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_UI_TYPE_LIBRARY_SELECTION_PANE, DataImportsUILibrarySelectionPanePrivate)) -enum { - DATA_IMPORTS_UI_LIBRARY_SELECTION_PANE_DUMMY_PROPERTY -}; -DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_new (SpitDataImportsPluginHost* host, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label); -DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_construct (GType object_type, SpitDataImportsPluginHost* host, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label); -static void data_imports_ui_library_selection_pane_on_file_selected (DataImportsUILibrarySelectionPane* self, GFile* file); -static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_button (DataImportsUILibrarySelectionPane* self, GtkBox* box, GtkRadioButton* group, SpitDataImportsImportableLibrary* library, const gchar* label, gint margin_left, gint margin_right); +DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_new (SpitDataImportsPluginHost* host, + const gchar* welcome_message, + SpitDataImportsImportableLibrary** discovered_libraries, + int discovered_libraries_length1, + const gchar* file_select_label); +DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_construct (GType object_type, + SpitDataImportsPluginHost* host, + const gchar* welcome_message, + SpitDataImportsImportableLibrary** discovered_libraries, + int discovered_libraries_length1, + const gchar* file_select_label); +static void data_imports_ui_library_selection_pane_on_file_selected (DataImportsUILibrarySelectionPane* self, + GFile* file); +static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_button (DataImportsUILibrarySelectionPane* self, + GtkBox* box, + GtkRadioButton* group, + SpitDataImportsImportableLibrary* library, + const gchar* label, + gint margin_left, + gint margin_right); static Block11Data* block11_data_ref (Block11Data* _data11_); static void block11_data_unref (void * _userdata_); static void ___lambda23_ (Block11Data* _data11_); static void data_imports_ui_library_selection_pane_set_import_button_sensitivity (DataImportsUILibrarySelectionPane* self); -static void ____lambda23__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self); +static void ____lambda23__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, + gpointer self); static void __lambda24_ (DataImportsUILibrarySelectionPane* self); -static void data_imports_ui_library_selection_pane_on_library_selected (DataImportsUILibrarySelectionPane* self, SpitDataImportsImportableLibrary* library); -static void ___lambda24__gtk_button_clicked (GtkButton* _sender, gpointer self); +static void data_imports_ui_library_selection_pane_on_library_selected (DataImportsUILibrarySelectionPane* self, + SpitDataImportsImportableLibrary* library); +static void ___lambda24__gtk_button_clicked (GtkButton* _sender, + gpointer self); static Block12Data* block12_data_ref (Block12Data* _data12_); static void block12_data_unref (void * _userdata_); static void __lambda22_ (Block12Data* _data12_); -static void ___lambda22__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self); +static void ___lambda22__gtk_toggle_button_toggled (GtkToggleButton* _sender, + gpointer self); static void data_imports_ui_library_selection_pane_finalize (GObject * obj); GType data_imports_ui_progress_pane_get_type (void) G_GNUC_CONST; #define DATA_IMPORTS_UI_PROGRESS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_UI_TYPE_PROGRESS_PANE, DataImportsUIProgressPanePrivate)) -enum { - DATA_IMPORTS_UI_PROGRESS_PANE_DUMMY_PROPERTY -}; DataImportsUIProgressPane* data_imports_ui_progress_pane_new (const gchar* message); -DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object_type, const gchar* message); -void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* self, gdouble progress, const gchar* progress_message); +DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object_type, + const gchar* message); +void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* self, + gdouble progress, + const gchar* progress_message); void spin_event_loop (void); static void data_imports_ui_progress_pane_finalize (GObject * obj); GType data_imports_ui_data_imports_dialog_get_type (void) G_GNUC_CONST; GType plugins_standard_host_interface_get_type (void) G_GNUC_CONST; GType spit_data_imports_concrete_data_imports_host_get_type (void) G_GNUC_CONST; #define DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_UI_TYPE_DATA_IMPORTS_DIALOG, DataImportsUIDataImportsDialogPrivate)) -enum { - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_DUMMY_PROPERTY -}; #define DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_WIDTH 860 #define DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_HEIGHT 688 #define DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_WIDTH 1024 @@ -294,27 +330,38 @@ enum { DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_new (void); DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (GType object_type); gint resources_use_header_bar (void); -static gboolean data_imports_ui_data_imports_dialog_on_window_close (DataImportsUIDataImportsDialog* self, GdkEventAny* evt); -static gboolean _data_imports_ui_data_imports_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self); -SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int* result_length1); +static gboolean data_imports_ui_data_imports_dialog_on_window_close (DataImportsUIDataImportsDialog* self, + GdkEventAny* evt); +static gboolean _data_imports_ui_data_imports_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, + GdkEventAny* event, + gpointer self); +SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, + int* result_length1); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); gchar* configuration_facade_get_last_used_dataimports_service (ConfigurationFacade* self); static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsUIDataImportsDialog* self); -static void _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); +static void _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self); static void data_imports_ui_data_imports_dialog_on_close_cancel_clicked (DataImportsUIDataImportsDialog* self); -static void _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self); static void data_imports_ui_data_imports_dialog_set_standard_window_mode (DataImportsUIDataImportsDialog* self); -void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsDialog* self, SpitDataImportsDialogPane* pane); +void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsDialog* self, + SpitDataImportsDialogPane* pane); void data_imports_ui_data_imports_dialog_set_close_button_mode (DataImportsUIDataImportsDialog* self); DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_create_instance (void); void data_imports_ui_data_imports_dialog_terminate_instance (void); static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImportsDialog* self); SpitDataImportsService** spit_data_imports_load_all_services (int* result_length1); -void configuration_facade_set_last_used_dataimports_service (ConfigurationFacade* self, const gchar* service_name); -SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_new (SpitDataImportsService* service, DataImportsUIDataImportsDialog* dialog); -SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_construct (GType object_type, SpitDataImportsService* service, DataImportsUIDataImportsDialog* dialog); +void configuration_facade_set_last_used_dataimports_service (ConfigurationFacade* self, + const gchar* service_name); +SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_new (SpitDataImportsService* service, + DataImportsUIDataImportsDialog* dialog); +SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_construct (GType object_type, + SpitDataImportsService* service, + DataImportsUIDataImportsDialog* dialog); static void data_imports_ui_data_imports_dialog_set_large_window_mode (DataImportsUIDataImportsDialog* self); static void data_imports_ui_data_imports_dialog_set_colossal_window_mode (DataImportsUIDataImportsDialog* self); static void data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (DataImportsUIDataImportsDialog* self); @@ -324,11 +371,17 @@ void data_imports_ui_data_imports_dialog_set_cancel_button_mode (DataImportsUIDa void data_imports_ui_data_imports_dialog_lock_service (DataImportsUIDataImportsDialog* self); void data_imports_ui_data_imports_dialog_unlock_service (DataImportsUIDataImportsDialog* self); static void data_imports_ui_data_imports_dialog_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -DataImportsUIConcreteDialogPane* data_imports_ui_concrete_dialog_pane_construct (GType object_type) { +DataImportsUIConcreteDialogPane* +data_imports_ui_concrete_dialog_pane_construct (GType object_type) +{ DataImportsUIConcreteDialogPane * self = NULL; GtkBox* _tmp0_; #line 15 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -343,25 +396,31 @@ DataImportsUIConcreteDialogPane* data_imports_ui_concrete_dialog_pane_construct self->priv->pane_widget = _tmp0_; #line 15 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return self; -#line 343 "DataImportsUI.c" +#line 396 "DataImportsUI.c" } -DataImportsUIConcreteDialogPane* data_imports_ui_concrete_dialog_pane_new (void) { +DataImportsUIConcreteDialogPane* +data_imports_ui_concrete_dialog_pane_new (void) +{ #line 15 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return data_imports_ui_concrete_dialog_pane_construct (DATA_IMPORTS_UI_TYPE_CONCRETE_DIALOG_PANE); -#line 350 "DataImportsUI.c" +#line 405 "DataImportsUI.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return self ? g_object_ref (self) : NULL; -#line 357 "DataImportsUI.c" +#line 414 "DataImportsUI.c" } -static GtkWidget* data_imports_ui_concrete_dialog_pane_real_get_widget (SpitDataImportsDialogPane* base) { +static GtkWidget* +data_imports_ui_concrete_dialog_pane_real_get_widget (SpitDataImportsDialogPane* base) +{ DataImportsUIConcreteDialogPane * self; GtkWidget* result = NULL; GtkBox* _tmp0_; @@ -376,11 +435,13 @@ static GtkWidget* data_imports_ui_concrete_dialog_pane_real_get_widget (SpitData result = _tmp1_; #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return result; -#line 376 "DataImportsUI.c" +#line 435 "DataImportsUI.c" } -static SpitDataImportsDialogPaneGeometryOptions data_imports_ui_concrete_dialog_pane_real_get_preferred_geometry (SpitDataImportsDialogPane* base) { +static SpitDataImportsDialogPaneGeometryOptions +data_imports_ui_concrete_dialog_pane_real_get_preferred_geometry (SpitDataImportsDialogPane* base) +{ DataImportsUIConcreteDialogPane * self; SpitDataImportsDialogPaneGeometryOptions result = 0; #line 23 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -389,38 +450,46 @@ static SpitDataImportsDialogPaneGeometryOptions data_imports_ui_concrete_dialog_ result = SPIT_DATA_IMPORTS_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return result; -#line 389 "DataImportsUI.c" +#line 450 "DataImportsUI.c" } -static void data_imports_ui_concrete_dialog_pane_real_on_pane_installed (SpitDataImportsDialogPane* base) { +static void +data_imports_ui_concrete_dialog_pane_real_on_pane_installed (SpitDataImportsDialogPane* base) +{ DataImportsUIConcreteDialogPane * self; #line 27 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_UI_TYPE_CONCRETE_DIALOG_PANE, DataImportsUIConcreteDialogPane); -#line 397 "DataImportsUI.c" +#line 460 "DataImportsUI.c" } -static void data_imports_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitDataImportsDialogPane* base) { +static void +data_imports_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitDataImportsDialogPane* base) +{ DataImportsUIConcreteDialogPane * self; #line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_UI_TYPE_CONCRETE_DIALOG_PANE, DataImportsUIConcreteDialogPane); -#line 405 "DataImportsUI.c" +#line 470 "DataImportsUI.c" } -static void data_imports_ui_concrete_dialog_pane_class_init (DataImportsUIConcreteDialogPaneClass * klass) { +static void +data_imports_ui_concrete_dialog_pane_class_init (DataImportsUIConcreteDialogPaneClass * klass) +{ #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_concrete_dialog_pane_parent_class = g_type_class_peek_parent (klass); #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_type_class_add_private (klass, sizeof (DataImportsUIConcreteDialogPanePrivate)); #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" G_OBJECT_CLASS (klass)->finalize = data_imports_ui_concrete_dialog_pane_finalize; -#line 416 "DataImportsUI.c" +#line 483 "DataImportsUI.c" } -static void data_imports_ui_concrete_dialog_pane_spit_data_imports_dialog_pane_interface_init (SpitDataImportsDialogPaneIface * iface) { +static void +data_imports_ui_concrete_dialog_pane_spit_data_imports_dialog_pane_interface_init (SpitDataImportsDialogPaneIface * iface) +{ #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_concrete_dialog_pane_spit_data_imports_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -431,18 +500,22 @@ static void data_imports_ui_concrete_dialog_pane_spit_data_imports_dialog_pane_i iface->on_pane_installed = (void (*) (SpitDataImportsDialogPane *)) data_imports_ui_concrete_dialog_pane_real_on_pane_installed; #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" iface->on_pane_uninstalled = (void (*) (SpitDataImportsDialogPane *)) data_imports_ui_concrete_dialog_pane_real_on_pane_uninstalled; -#line 431 "DataImportsUI.c" +#line 500 "DataImportsUI.c" } -static void data_imports_ui_concrete_dialog_pane_instance_init (DataImportsUIConcreteDialogPane * self) { +static void +data_imports_ui_concrete_dialog_pane_instance_init (DataImportsUIConcreteDialogPane * self) +{ #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" self->priv = DATA_IMPORTS_UI_CONCRETE_DIALOG_PANE_GET_PRIVATE (self); -#line 438 "DataImportsUI.c" +#line 509 "DataImportsUI.c" } -static void data_imports_ui_concrete_dialog_pane_finalize (GObject * obj) { +static void +data_imports_ui_concrete_dialog_pane_finalize (GObject * obj) +{ DataImportsUIConcreteDialogPane * self; #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_UI_TYPE_CONCRETE_DIALOG_PANE, DataImportsUIConcreteDialogPane); @@ -450,11 +523,13 @@ static void data_imports_ui_concrete_dialog_pane_finalize (GObject * obj) { _g_object_unref0 (self->priv->pane_widget); #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" G_OBJECT_CLASS (data_imports_ui_concrete_dialog_pane_parent_class)->finalize (obj); -#line 450 "DataImportsUI.c" +#line 523 "DataImportsUI.c" } -GType data_imports_ui_concrete_dialog_pane_get_type (void) { +GType +data_imports_ui_concrete_dialog_pane_get_type (void) +{ static volatile gsize data_imports_ui_concrete_dialog_pane_type_id__volatile = 0; if (g_once_init_enter (&data_imports_ui_concrete_dialog_pane_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DataImportsUIConcreteDialogPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_ui_concrete_dialog_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsUIConcreteDialogPane), 0, (GInstanceInitFunc) data_imports_ui_concrete_dialog_pane_instance_init, NULL }; @@ -468,65 +543,69 @@ GType data_imports_ui_concrete_dialog_pane_get_type (void) { } -DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct (GType object_type, const gchar* message_string) { +DataImportsUIStaticMessagePane* +data_imports_ui_static_message_pane_construct (GType object_type, + const gchar* message_string) +{ DataImportsUIStaticMessagePane * self = NULL; GtkLabel* message_label = NULL; - const gchar* _tmp0_; - GtkLabel* _tmp1_; - GtkWidget* _tmp2_; + GtkLabel* _tmp0_; + GtkWidget* _tmp1_; + GtkBox* _tmp2_; GtkBox* _tmp3_; - GtkBox* _tmp4_; #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_val_if_fail (message_string != NULL, NULL); #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" self = (DataImportsUIStaticMessagePane*) data_imports_ui_concrete_dialog_pane_construct (object_type); #line 36 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp0_ = message_string; -#line 36 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp1_ = (GtkLabel*) gtk_label_new (_tmp0_); + _tmp0_ = (GtkLabel*) gtk_label_new (message_string); #line 36 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_object_ref_sink (_tmp1_); + g_object_ref_sink (_tmp0_); #line 36 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - message_label = _tmp1_; + message_label = _tmp0_; #line 37 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp2_ = spit_data_imports_dialog_pane_get_widget (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); + _tmp1_ = spit_data_imports_dialog_pane_get_widget (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); #line 37 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_box_get_type ()) ? ((GtkBox*) _tmp2_) : NULL; + _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_box_get_type ()) ? ((GtkBox*) _tmp1_) : NULL; #line 37 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 37 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _g_object_unref0 (_tmp2_); -#line 496 "DataImportsUI.c" + _g_object_unref0 (_tmp1_); +#line 571 "DataImportsUI.c" } #line 37 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 37 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_box_pack_start (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (message_label, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (message_label, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 37 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (message_label); #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return self; -#line 508 "DataImportsUI.c" +#line 583 "DataImportsUI.c" } -DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_new (const gchar* message_string) { +DataImportsUIStaticMessagePane* +data_imports_ui_static_message_pane_new (const gchar* message_string) +{ #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return data_imports_ui_static_message_pane_construct (DATA_IMPORTS_UI_TYPE_STATIC_MESSAGE_PANE, message_string); -#line 515 "DataImportsUI.c" +#line 592 "DataImportsUI.c" } -DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct_with_pango (GType object_type, const gchar* msg) { +DataImportsUIStaticMessagePane* +data_imports_ui_static_message_pane_construct_with_pango (GType object_type, + const gchar* msg) +{ DataImportsUIStaticMessagePane * self = NULL; GtkLabel* label = NULL; GtkLabel* _tmp0_; - const gchar* _tmp1_; - GtkWidget* _tmp2_; + GtkWidget* _tmp1_; + GtkBox* _tmp2_; GtkBox* _tmp3_; - GtkBox* _tmp4_; #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_val_if_fail (msg != NULL, NULL); #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -538,54 +617,60 @@ DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct_wi #line 41 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" label = _tmp0_; #line 42 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp1_ = msg; -#line 42 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_label_set_markup (label, _tmp1_); + gtk_label_set_markup (label, msg); #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_label_set_line_wrap (label, TRUE); #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp2_ = spit_data_imports_dialog_pane_get_widget (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); + _tmp1_ = spit_data_imports_dialog_pane_get_widget (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_box_get_type ()) ? ((GtkBox*) _tmp2_) : NULL; + _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_box_get_type ()) ? ((GtkBox*) _tmp1_) : NULL; #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _g_object_unref0 (_tmp2_); -#line 551 "DataImportsUI.c" + _g_object_unref0 (_tmp1_); +#line 628 "DataImportsUI.c" } #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_box_pack_start (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (label, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (label, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (label); #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return self; -#line 563 "DataImportsUI.c" +#line 640 "DataImportsUI.c" } -DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_new_with_pango (const gchar* msg) { +DataImportsUIStaticMessagePane* +data_imports_ui_static_message_pane_new_with_pango (const gchar* msg) +{ #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return data_imports_ui_static_message_pane_construct_with_pango (DATA_IMPORTS_UI_TYPE_STATIC_MESSAGE_PANE, msg); -#line 570 "DataImportsUI.c" +#line 649 "DataImportsUI.c" } -static void data_imports_ui_static_message_pane_class_init (DataImportsUIStaticMessagePaneClass * klass) { +static void +data_imports_ui_static_message_pane_class_init (DataImportsUIStaticMessagePaneClass * klass) +{ #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_static_message_pane_parent_class = g_type_class_peek_parent (klass); -#line 577 "DataImportsUI.c" +#line 658 "DataImportsUI.c" } -static void data_imports_ui_static_message_pane_instance_init (DataImportsUIStaticMessagePane * self) { +static void +data_imports_ui_static_message_pane_instance_init (DataImportsUIStaticMessagePane * self) +{ } -GType data_imports_ui_static_message_pane_get_type (void) { +GType +data_imports_ui_static_message_pane_get_type (void) +{ static volatile gsize data_imports_ui_static_message_pane_type_id__volatile = 0; if (g_once_init_enter (&data_imports_ui_static_message_pane_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DataImportsUIStaticMessagePaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_ui_static_message_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsUIStaticMessagePane), 0, (GInstanceInitFunc) data_imports_ui_static_message_pane_instance_init, NULL }; @@ -597,21 +682,25 @@ GType data_imports_ui_static_message_pane_get_type (void) { } -static Block11Data* block11_data_ref (Block11Data* _data11_) { +static Block11Data* +block11_data_ref (Block11Data* _data11_) +{ #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_atomic_int_inc (&_data11_->_ref_count_); #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return _data11_; -#line 602 "DataImportsUI.c" +#line 689 "DataImportsUI.c" } -static void block11_data_unref (void * _userdata_) { +static void +block11_data_unref (void * _userdata_) +{ Block11Data* _data11_; _data11_ = (Block11Data*) _userdata_; #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" if (g_atomic_int_dec_and_test (&_data11_->_ref_count_)) { -#line 611 "DataImportsUI.c" +#line 700 "DataImportsUI.c" DataImportsUILibrarySelectionPane* self; #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" self = _data11_->self; @@ -621,12 +710,14 @@ static void block11_data_unref (void * _userdata_) { _g_object_unref0 (self); #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_slice_free (Block11Data, _data11_); -#line 621 "DataImportsUI.c" +#line 710 "DataImportsUI.c" } } -static void ___lambda23_ (Block11Data* _data11_) { +static void +___lambda23_ (Block11Data* _data11_) +{ DataImportsUILibrarySelectionPane* self; GtkFileChooserButton* _tmp0_; GFile* _tmp1_; @@ -636,7 +727,7 @@ static void ___lambda23_ (Block11Data* _data11_) { #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = _data11_->file_chooser; #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp1_ = gtk_file_chooser_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); + _tmp1_ = gtk_file_chooser_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_file_chooser_get_type (), GtkFileChooser)); #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (self->priv->selected_file); #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -645,108 +736,116 @@ static void ___lambda23_ (Block11Data* _data11_) { _tmp2_ = self->priv->file_radio; #line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" if (_tmp2_ != NULL) { -#line 645 "DataImportsUI.c" +#line 736 "DataImportsUI.c" GtkRadioButton* _tmp3_; #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp3_ = self->priv->file_radio; #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); -#line 651 "DataImportsUI.c" +#line 742 "DataImportsUI.c" } #line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_library_selection_pane_set_import_button_sensitivity (self); -#line 655 "DataImportsUI.c" +#line 746 "DataImportsUI.c" } -static void ____lambda23__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self) { +static void +____lambda23__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, + gpointer self) +{ #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" ___lambda23_ (self); -#line 662 "DataImportsUI.c" +#line 756 "DataImportsUI.c" } -static void __lambda24_ (DataImportsUILibrarySelectionPane* self) { +static void +__lambda24_ (DataImportsUILibrarySelectionPane* self) +{ SpitDataImportsImportableLibrary* _tmp0_; #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = self->priv->selected_library; #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" if (_tmp0_ != NULL) { -#line 672 "DataImportsUI.c" +#line 768 "DataImportsUI.c" SpitDataImportsImportableLibrary* _tmp1_; #line 115 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp1_ = self->priv->selected_library; #line 115 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_library_selection_pane_on_library_selected (self, _tmp1_); -#line 678 "DataImportsUI.c" +#line 774 "DataImportsUI.c" } else { GFile* _tmp2_; #line 116 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp2_ = self->priv->selected_file; #line 116 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" if (_tmp2_ != NULL) { -#line 685 "DataImportsUI.c" +#line 781 "DataImportsUI.c" GFile* _tmp3_; #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp3_ = self->priv->selected_file; #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_library_selection_pane_on_file_selected (self, _tmp3_); -#line 691 "DataImportsUI.c" +#line 787 "DataImportsUI.c" } else { #line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_debug ("DataImportsUI.vala:119: LibrarySelectionPane: Library or file should b" \ "e selected."); -#line 695 "DataImportsUI.c" +#line 791 "DataImportsUI.c" } } } -static void ___lambda24__gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +___lambda24__gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" __lambda24_ ((DataImportsUILibrarySelectionPane*) self); -#line 704 "DataImportsUI.c" +#line 803 "DataImportsUI.c" } -DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_construct (GType object_type, SpitDataImportsPluginHost* host, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) { +DataImportsUILibrarySelectionPane* +data_imports_ui_library_selection_pane_construct (GType object_type, + SpitDataImportsPluginHost* host, + const gchar* welcome_message, + SpitDataImportsImportableLibrary** discovered_libraries, + int discovered_libraries_length1, + const gchar* file_select_label) +{ DataImportsUILibrarySelectionPane * self = NULL; gboolean _tmp0_ = FALSE; - SpitDataImportsImportableLibrary** _tmp1_; - gint _tmp1__length1; - SpitDataImportsPluginHost* _tmp2_; GtkBox* content_box = NULL; + GtkBox* _tmp1_; + GtkBox* _tmp2_; GtkBox* _tmp3_; - GtkBox* _tmp4_; - GtkBox* _tmp5_; GtkLabel* welcome_label = NULL; + GtkLabel* _tmp4_; + GtkLabel* _tmp5_; GtkLabel* _tmp6_; GtkLabel* _tmp7_; - const gchar* _tmp8_; + GtkBox* _tmp8_; GtkLabel* _tmp9_; - GtkLabel* _tmp10_; - GtkBox* _tmp11_; - GtkLabel* _tmp12_; gint radio_margin_left = 0; gint radio_margin_right = 0; gint chooser_margin_left = 0; - gint _tmp13_; + gint _tmp10_; gint chooser_margin_right = 0; - gint _tmp14_; + gint _tmp11_; GtkRadioButton* lib_radio = NULL; - SpitDataImportsImportableLibrary** _tmp15_; - gint _tmp15__length1; - const gchar* _tmp37_; - GtkButton* _tmp46_; - GtkButton* _tmp47_; + GtkButton* _tmp38_; + GtkButton* _tmp39_; GtkButtonBox* button_box = NULL; - GtkButtonBox* _tmp48_; - GtkButton* _tmp49_; - GtkBox* _tmp50_; - GtkWidget* _tmp51_; - GtkBox* _tmp52_; - GtkBox* _tmp53_; - GtkBox* _tmp54_; + GtkButtonBox* _tmp40_; + GtkButton* _tmp41_; + GtkBox* _tmp42_; + GtkWidget* _tmp43_; + GtkBox* _tmp44_; + GtkBox* _tmp45_; + GtkBox* _tmp46_; #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (host), NULL); #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -754,215 +853,189 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" self = (DataImportsUILibrarySelectionPane*) data_imports_ui_concrete_dialog_pane_construct (object_type); #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp1_ = discovered_libraries; -#line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp1__length1 = discovered_libraries_length1; -#line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (_tmp1__length1 > 0) { + if (discovered_libraries_length1 > 0) { #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = TRUE; -#line 760 "DataImportsUI.c" +#line 855 "DataImportsUI.c" } else { #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = data_imports_ui_library_selection_pane_on_file_selected != NULL; -#line 764 "DataImportsUI.c" +#line 859 "DataImportsUI.c" } #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _vala_assert (_tmp0_, "discovered_libraries.length > 0 || on_file_selected != null"); #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp2_ = host; -#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - self->priv->host = _tmp2_; + self->priv->host = host; #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp3_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); + _tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_object_ref_sink (_tmp3_); + g_object_ref_sink (_tmp1_); #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - content_box = _tmp3_; + content_box = _tmp1_; #line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp4_ = content_box; + _tmp2_ = content_box; #line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), 30); + gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), 30); #line 68 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp5_ = content_box; + _tmp3_ = content_box; #line 68 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), 30); + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), 30); #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp6_ = (GtkLabel*) gtk_label_new (NULL); + _tmp4_ = (GtkLabel*) gtk_label_new (NULL); #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_object_ref_sink (_tmp6_); + g_object_ref_sink (_tmp4_); #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - welcome_label = _tmp6_; -#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp7_ = welcome_label; + welcome_label = _tmp4_; #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp8_ = welcome_message; + _tmp5_ = welcome_label; #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_label_set_markup (_tmp7_, _tmp8_); + gtk_label_set_markup (_tmp5_, welcome_message); #line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp9_ = welcome_label; + _tmp6_ = welcome_label; #line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_label_set_line_wrap (_tmp9_, TRUE); + gtk_label_set_line_wrap (_tmp6_, TRUE); #line 72 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp10_ = welcome_label; + _tmp7_ = welcome_label; #line 72 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp11_ = content_box; + _tmp8_ = content_box; #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp12_ = welcome_label; + _tmp9_ = welcome_label; #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_box_pack_start (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 6); + gtk_box_pack_start (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 6); #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" radio_margin_left = 20; #line 77 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" radio_margin_right = 20; #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp13_ = radio_margin_left; + _tmp10_ = radio_margin_left; #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - chooser_margin_left = _tmp13_; + chooser_margin_left = _tmp10_; #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp14_ = radio_margin_right; + _tmp11_ = radio_margin_right; #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - chooser_margin_right = _tmp14_; + chooser_margin_right = _tmp11_; #line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" lib_radio = NULL; #line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp15_ = discovered_libraries; -#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp15__length1 = discovered_libraries_length1; -#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (_tmp15__length1 > 0) { -#line 832 "DataImportsUI.c" - gint _tmp16_; - SpitDataImportsImportableLibrary** _tmp17_; - gint _tmp17__length1; - const gchar* _tmp28_; + if (discovered_libraries_length1 > 0) { +#line 919 "DataImportsUI.c" + gint _tmp12_; #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp16_ = radio_margin_left; + _tmp12_ = radio_margin_left; #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - chooser_margin_left = _tmp16_ + 20; -#line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp17_ = discovered_libraries; -#line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp17__length1 = discovered_libraries_length1; -#line 845 "DataImportsUI.c" + chooser_margin_left = _tmp12_ + 20; +#line 925 "DataImportsUI.c" { SpitDataImportsImportableLibrary** library_collection = NULL; gint library_collection_length1 = 0; gint _library_collection_size_ = 0; gint library_it = 0; #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - library_collection = _tmp17_; + library_collection = discovered_libraries; #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - library_collection_length1 = _tmp17__length1; + library_collection_length1 = discovered_libraries_length1; #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - for (library_it = 0; library_it < _tmp17__length1; library_it = library_it + 1) { -#line 857 "DataImportsUI.c" - SpitDataImportsImportableLibrary* _tmp18_; + for (library_it = 0; library_it < discovered_libraries_length1; library_it = library_it + 1) { +#line 937 "DataImportsUI.c" + SpitDataImportsImportableLibrary* _tmp13_; SpitDataImportsImportableLibrary* library = NULL; #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp18_ = _g_object_ref0 (library_collection[library_it]); + _tmp13_ = _g_object_ref0 (library_collection[library_it]); #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - library = _tmp18_; -#line 864 "DataImportsUI.c" + library = _tmp13_; +#line 944 "DataImportsUI.c" { gchar* lib_radio_label = NULL; - SpitDataImportsImportableLibrary* _tmp19_; - gchar* _tmp20_; - GtkBox* _tmp21_; + SpitDataImportsImportableLibrary* _tmp14_; + gchar* _tmp15_; + GtkBox* _tmp16_; + GtkRadioButton* _tmp17_; + SpitDataImportsImportableLibrary* _tmp18_; + const gchar* _tmp19_; + gint _tmp20_; + gint _tmp21_; GtkRadioButton* _tmp22_; - SpitDataImportsImportableLibrary* _tmp23_; - const gchar* _tmp24_; - gint _tmp25_; - gint _tmp26_; - GtkRadioButton* _tmp27_; #line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp19_ = library; + _tmp14_ = library; #line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp20_ = spit_data_imports_importable_library_get_display_name (_tmp19_); + _tmp15_ = spit_data_imports_importable_library_get_display_name (_tmp14_); #line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - lib_radio_label = _tmp20_; + lib_radio_label = _tmp15_; #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp21_ = content_box; + _tmp16_ = content_box; #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp22_ = lib_radio; + _tmp17_ = lib_radio; #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp23_ = library; + _tmp18_ = library; #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp24_ = lib_radio_label; + _tmp19_ = lib_radio_label; #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp25_ = radio_margin_left; + _tmp20_ = radio_margin_left; #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp26_ = radio_margin_right; + _tmp21_ = radio_margin_right; #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp27_ = data_imports_ui_library_selection_pane_create_radio_button (self, _tmp21_, _tmp22_, _tmp23_, _tmp24_, _tmp25_, _tmp26_); + _tmp22_ = data_imports_ui_library_selection_pane_create_radio_button (self, _tmp16_, _tmp17_, _tmp18_, _tmp19_, _tmp20_, _tmp21_); #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (lib_radio); #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - lib_radio = _tmp27_; + lib_radio = _tmp22_; #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_free0 (lib_radio_label); #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (library); -#line 904 "DataImportsUI.c" +#line 984 "DataImportsUI.c" } } } #line 91 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp28_ = file_select_label; -#line 91 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (_tmp28_ != NULL) { -#line 912 "DataImportsUI.c" - GtkBox* _tmp29_; - GtkRadioButton* _tmp30_; - const gchar* _tmp31_; - gint _tmp32_; - gint _tmp33_; - GtkRadioButton* _tmp34_; - GtkRadioButton* _tmp35_; - GtkRadioButton* _tmp36_; -#line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp29_ = content_box; + if (file_select_label != NULL) { +#line 990 "DataImportsUI.c" + GtkBox* _tmp23_; + GtkRadioButton* _tmp24_; + gint _tmp25_; + gint _tmp26_; + GtkRadioButton* _tmp27_; + GtkRadioButton* _tmp28_; + GtkRadioButton* _tmp29_; #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp30_ = lib_radio; + _tmp23_ = content_box; #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp31_ = file_select_label; + _tmp24_ = lib_radio; #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp32_ = radio_margin_left; + _tmp25_ = radio_margin_left; #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp33_ = radio_margin_right; + _tmp26_ = radio_margin_right; #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp34_ = data_imports_ui_library_selection_pane_create_radio_button (self, _tmp29_, _tmp30_, NULL, _tmp31_, _tmp32_, _tmp33_); + _tmp27_ = data_imports_ui_library_selection_pane_create_radio_button (self, _tmp23_, _tmp24_, NULL, file_select_label, _tmp25_, _tmp26_); #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (lib_radio); #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - lib_radio = _tmp34_; + lib_radio = _tmp27_; #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp35_ = lib_radio; + _tmp28_ = lib_radio; #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp36_ = _g_object_ref0 (_tmp35_); + _tmp29_ = _g_object_ref0 (_tmp28_); #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (self->priv->file_radio); #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - self->priv->file_radio = _tmp36_; -#line 945 "DataImportsUI.c" + self->priv->file_radio = _tmp29_; +#line 1020 "DataImportsUI.c" } } #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp37_ = file_select_label; -#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (_tmp37_ != NULL) { -#line 952 "DataImportsUI.c" + if (file_select_label != NULL) { +#line 1025 "DataImportsUI.c" Block11Data* _data11_; - GtkFileChooserButton* _tmp38_; - GtkFileChooserButton* _tmp39_; - GtkFileChooserButton* _tmp40_; - gint _tmp41_; - GtkFileChooserButton* _tmp42_; - gint _tmp43_; - GtkBox* _tmp44_; - GtkFileChooserButton* _tmp45_; + GtkFileChooserButton* _tmp30_; + GtkFileChooserButton* _tmp31_; + GtkFileChooserButton* _tmp32_; + gint _tmp33_; + GtkFileChooserButton* _tmp34_; + gint _tmp35_; + GtkBox* _tmp36_; + GtkFileChooserButton* _tmp37_; #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _data11_ = g_slice_new0 (Block11Data); #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -970,85 +1043,85 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _data11_->self = g_object_ref (self); #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp38_ = (GtkFileChooserButton*) gtk_file_chooser_button_new (_ ("Database file:"), GTK_FILE_CHOOSER_ACTION_OPEN); + _tmp30_ = (GtkFileChooserButton*) gtk_file_chooser_button_new (_ ("Database file:"), GTK_FILE_CHOOSER_ACTION_OPEN); #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_object_ref_sink (_tmp38_); + g_object_ref_sink (_tmp30_); #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _data11_->file_chooser = _tmp38_; + _data11_->file_chooser = _tmp30_; #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp39_ = _data11_->file_chooser; + _tmp31_ = _data11_->file_chooser; #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "selection-changed", (GCallback) ____lambda23__gtk_file_chooser_selection_changed, block11_data_ref (_data11_), (GClosureNotify) block11_data_unref, 0); + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_file_chooser_get_type (), GtkFileChooser), "selection-changed", (GCallback) ____lambda23__gtk_file_chooser_selection_changed, block11_data_ref (_data11_), (GClosureNotify) block11_data_unref, 0); #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp40_ = _data11_->file_chooser; + _tmp32_ = _data11_->file_chooser; #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp41_ = chooser_margin_left; + _tmp33_ = chooser_margin_left; #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), _tmp41_); + gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), _tmp33_); #line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp42_ = _data11_->file_chooser; + _tmp34_ = _data11_->file_chooser; #line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp43_ = chooser_margin_right; + _tmp35_ = chooser_margin_right; #line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), _tmp43_); + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), _tmp35_); #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp44_ = content_box; + _tmp36_ = content_box; #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp45_ = _data11_->file_chooser; + _tmp37_ = _data11_->file_chooser; #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_box_pack_start (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6); + gtk_box_pack_start (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6); #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" block11_data_unref (_data11_); #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _data11_ = NULL; -#line 1000 "DataImportsUI.c" +#line 1073 "DataImportsUI.c" } #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp46_ = (GtkButton*) gtk_button_new_with_mnemonic (_ ("_Import")); + _tmp38_ = (GtkButton*) gtk_button_new_with_mnemonic (_ ("_Import")); #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_object_ref_sink (_tmp46_); + g_object_ref_sink (_tmp38_); #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (self->priv->import_button); #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - self->priv->import_button = _tmp46_; + self->priv->import_button = _tmp38_; #line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp47_ = self->priv->import_button; + _tmp39_ = self->priv->import_button; #line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_signal_connect_object (_tmp47_, "clicked", (GCallback) ___lambda24__gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp39_, "clicked", (GCallback) ___lambda24__gtk_button_clicked, self, 0); #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp48_ = (GtkButtonBox*) gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); + _tmp40_ = (GtkButtonBox*) gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_object_ref_sink (_tmp48_); + g_object_ref_sink (_tmp40_); #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - button_box = _tmp48_; + button_box = _tmp40_; #line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_object_set (button_box, "layout-style", GTK_BUTTONBOX_CENTER, NULL); #line 123 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp49_ = self->priv->import_button; + _tmp41_ = self->priv->import_button; #line 123 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (button_box, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (button_box, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget)); #line 124 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp50_ = content_box; + _tmp42_ = content_box; #line 124 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_box_pack_end (_tmp50_, G_TYPE_CHECK_INSTANCE_CAST (button_box, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 6); + gtk_box_pack_end (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (button_box, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 6); #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp51_ = spit_data_imports_dialog_pane_get_widget (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); + _tmp43_ = spit_data_imports_dialog_pane_get_widget (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp52_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp51_, gtk_box_get_type ()) ? ((GtkBox*) _tmp51_) : NULL; + _tmp44_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp43_, gtk_box_get_type ()) ? ((GtkBox*) _tmp43_) : NULL; #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (_tmp52_ == NULL) { + if (_tmp44_ == NULL) { #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _g_object_unref0 (_tmp51_); -#line 1038 "DataImportsUI.c" + _g_object_unref0 (_tmp43_); +#line 1111 "DataImportsUI.c" } #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp53_ = _tmp52_; + _tmp45_ = _tmp44_; #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp54_ = content_box; + _tmp46_ = content_box; #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_box_pack_start (_tmp53_, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _g_object_unref0 (_tmp53_); + _g_object_unref0 (_tmp45_); #line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_library_selection_pane_set_import_button_sensitivity (self); #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -1061,32 +1134,42 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr _g_object_unref0 (content_box); #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return self; -#line 1060 "DataImportsUI.c" +#line 1133 "DataImportsUI.c" } -DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_new (SpitDataImportsPluginHost* host, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) { +DataImportsUILibrarySelectionPane* +data_imports_ui_library_selection_pane_new (SpitDataImportsPluginHost* host, + const gchar* welcome_message, + SpitDataImportsImportableLibrary** discovered_libraries, + int discovered_libraries_length1, + const gchar* file_select_label) +{ #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return data_imports_ui_library_selection_pane_construct (DATA_IMPORTS_UI_TYPE_LIBRARY_SELECTION_PANE, host, welcome_message, discovered_libraries, discovered_libraries_length1, file_select_label); -#line 1067 "DataImportsUI.c" +#line 1146 "DataImportsUI.c" } -static Block12Data* block12_data_ref (Block12Data* _data12_) { +static Block12Data* +block12_data_ref (Block12Data* _data12_) +{ #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_atomic_int_inc (&_data12_->_ref_count_); #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return _data12_; -#line 1076 "DataImportsUI.c" +#line 1157 "DataImportsUI.c" } -static void block12_data_unref (void * _userdata_) { +static void +block12_data_unref (void * _userdata_) +{ Block12Data* _data12_; _data12_ = (Block12Data*) _userdata_; #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" if (g_atomic_int_dec_and_test (&_data12_->_ref_count_)) { -#line 1085 "DataImportsUI.c" +#line 1168 "DataImportsUI.c" DataImportsUILibrarySelectionPane* self; #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" self = _data12_->self; @@ -1098,12 +1181,14 @@ static void block12_data_unref (void * _userdata_) { _g_object_unref0 (self); #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_slice_free (Block12Data, _data12_); -#line 1097 "DataImportsUI.c" +#line 1180 "DataImportsUI.c" } } -static void __lambda22_ (Block12Data* _data12_) { +static void +__lambda22_ (Block12Data* _data12_) +{ DataImportsUILibrarySelectionPane* self; GtkRadioButton* _tmp0_; gboolean _tmp1_; @@ -1118,49 +1203,50 @@ static void __lambda22_ (Block12Data* _data12_) { _tmp2_ = _tmp1_; #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" if (_tmp2_) { -#line 1117 "DataImportsUI.c" +#line 1202 "DataImportsUI.c" SpitDataImportsImportableLibrary* _tmp3_; - SpitDataImportsImportableLibrary* _tmp4_; -#line 142 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp3_ = _data12_->library; #line 142 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp3_ = _g_object_ref0 (_data12_->library); #line 142 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (self->priv->selected_library); #line 142 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - self->priv->selected_library = _tmp4_; + self->priv->selected_library = _tmp3_; #line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_library_selection_pane_set_import_button_sensitivity (self); -#line 1130 "DataImportsUI.c" +#line 1212 "DataImportsUI.c" } } -static void ___lambda22__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) { +static void +___lambda22__gtk_toggle_button_toggled (GtkToggleButton* _sender, + gpointer self) +{ #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" __lambda22_ (self); -#line 1138 "DataImportsUI.c" +#line 1223 "DataImportsUI.c" } -static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_button (DataImportsUILibrarySelectionPane* self, GtkBox* box, GtkRadioButton* group, SpitDataImportsImportableLibrary* library, const gchar* label, gint margin_left, gint margin_right) { +static GtkRadioButton* +data_imports_ui_library_selection_pane_create_radio_button (DataImportsUILibrarySelectionPane* self, + GtkBox* box, + GtkRadioButton* group, + SpitDataImportsImportableLibrary* library, + const gchar* label, + gint margin_left, + gint margin_right) +{ GtkRadioButton* result = NULL; Block12Data* _data12_; SpitDataImportsImportableLibrary* _tmp0_; - SpitDataImportsImportableLibrary* _tmp1_; - GtkRadioButton* _tmp2_; - const gchar* _tmp3_; + GtkRadioButton* _tmp1_; GtkRadioButton* _tmp4_; GtkRadioButton* _tmp5_; + GtkRadioButton* _tmp6_; + GtkRadioButton* _tmp7_; + GtkRadioButton* _tmp8_; GtkRadioButton* _tmp9_; - GtkRadioButton* _tmp10_; - gint _tmp11_; - GtkRadioButton* _tmp12_; - gint _tmp13_; - GtkBox* _tmp14_; - GtkRadioButton* _tmp15_; - GtkRadioButton* _tmp16_; - GtkRadioButton* _tmp17_; #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_val_if_fail (DATA_IMPORTS_UI_IS_LIBRARY_SELECTION_PANE (self), NULL); #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -1178,84 +1264,69 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _data12_->self = g_object_ref (self); #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp0_ = library; -#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (library); #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (_data12_->library); #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _data12_->library = _tmp1_; -#line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp2_ = group; + _data12_->library = _tmp0_; #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp3_ = label; + _tmp1_ = (GtkRadioButton*) gtk_radio_button_new_with_label_from_widget (group, label); #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp4_ = (GtkRadioButton*) gtk_radio_button_new_with_label_from_widget (_tmp2_, _tmp3_); -#line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_object_ref_sink (_tmp4_); + g_object_ref_sink (_tmp1_); #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _data12_->button = _tmp4_; -#line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp5_ = group; + _data12_->button = _tmp1_; #line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (_tmp5_ == NULL) { -#line 1198 "DataImportsUI.c" - GtkRadioButton* _tmp6_; - SpitDataImportsImportableLibrary* _tmp7_; - SpitDataImportsImportableLibrary* _tmp8_; + if (group == NULL) { +#line 1276 "DataImportsUI.c" + GtkRadioButton* _tmp2_; + SpitDataImportsImportableLibrary* _tmp3_; #line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp6_ = _data12_->button; + _tmp2_ = _data12_->button; #line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); -#line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp7_ = _data12_->library; + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); #line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp8_ = _g_object_ref0 (_tmp7_); + _tmp3_ = _g_object_ref0 (_data12_->library); #line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (self->priv->selected_library); #line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - self->priv->selected_library = _tmp8_; -#line 1214 "DataImportsUI.c" + self->priv->selected_library = _tmp3_; +#line 1289 "DataImportsUI.c" } #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp9_ = _data12_->button; + _tmp4_ = _data12_->button; #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) ___lambda22__gtk_toggle_button_toggled, block12_data_ref (_data12_), (GClosureNotify) block12_data_unref, 0); + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) ___lambda22__gtk_toggle_button_toggled, block12_data_ref (_data12_), (GClosureNotify) block12_data_unref, 0); #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp10_ = _data12_->button; + _tmp5_ = _data12_->button; #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp11_ = margin_left; -#line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), _tmp11_); -#line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp12_ = _data12_->button; + gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), margin_left); #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp13_ = margin_right; + _tmp6_ = _data12_->button; #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), _tmp13_); -#line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp14_ = box; + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), margin_right); #line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp15_ = _data12_->button; + _tmp7_ = _data12_->button; #line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6); + gtk_box_pack_start (box, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6); #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp16_ = _data12_->button; + _tmp8_ = _data12_->button; #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp17_ = _g_object_ref0 (_tmp16_); + _tmp9_ = _g_object_ref0 (_tmp8_); #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - result = _tmp17_; + result = _tmp9_; #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" block12_data_unref (_data12_); #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _data12_ = NULL; #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return result; -#line 1250 "DataImportsUI.c" +#line 1319 "DataImportsUI.c" } -static void data_imports_ui_library_selection_pane_set_import_button_sensitivity (DataImportsUILibrarySelectionPane* self) { +static void +data_imports_ui_library_selection_pane_set_import_button_sensitivity (DataImportsUILibrarySelectionPane* self) +{ gboolean _tmp0_ = FALSE; SpitDataImportsImportableLibrary* _tmp1_; GtkButton* _tmp3_; @@ -1267,28 +1338,30 @@ static void data_imports_ui_library_selection_pane_set_import_button_sensitivity if (_tmp1_ != NULL) { #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = TRUE; -#line 1266 "DataImportsUI.c" +#line 1337 "DataImportsUI.c" } else { GFile* _tmp2_; #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp2_ = self->priv->selected_file; #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = _tmp2_ != NULL; -#line 1273 "DataImportsUI.c" +#line 1344 "DataImportsUI.c" } #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp3_ = self->priv->import_button; #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _tmp0_); -#line 1279 "DataImportsUI.c" +#line 1350 "DataImportsUI.c" } -static void data_imports_ui_library_selection_pane_on_library_selected (DataImportsUILibrarySelectionPane* self, SpitDataImportsImportableLibrary* library) { +static void +data_imports_ui_library_selection_pane_on_library_selected (DataImportsUILibrarySelectionPane* self, + SpitDataImportsImportableLibrary* library) +{ SpitDataImportsPluginHost* _tmp0_; SpitDataImportsDataImporter* _tmp1_; SpitDataImportsDataImporter* _tmp2_; - SpitDataImportsImportableLibrary* _tmp3_; #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_LIBRARY_SELECTION_PANE (self)); #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -1300,20 +1373,20 @@ static void data_imports_ui_library_selection_pane_on_library_selected (DataImpo #line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp2_ = _tmp1_; #line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp3_ = library; -#line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - spit_data_imports_data_importer_on_library_selected (_tmp2_, _tmp3_); + spit_data_imports_data_importer_on_library_selected (_tmp2_, library); #line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (_tmp2_); -#line 1304 "DataImportsUI.c" +#line 1375 "DataImportsUI.c" } -static void data_imports_ui_library_selection_pane_on_file_selected (DataImportsUILibrarySelectionPane* self, GFile* file) { +static void +data_imports_ui_library_selection_pane_on_file_selected (DataImportsUILibrarySelectionPane* self, + GFile* file) +{ SpitDataImportsPluginHost* _tmp0_; SpitDataImportsDataImporter* _tmp1_; SpitDataImportsDataImporter* _tmp2_; - GFile* _tmp3_; #line 161 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_LIBRARY_SELECTION_PANE (self)); #line 161 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -1325,27 +1398,29 @@ static void data_imports_ui_library_selection_pane_on_file_selected (DataImports #line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp2_ = _tmp1_; #line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp3_ = file; -#line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - spit_data_imports_data_importer_on_file_selected (_tmp2_, _tmp3_); + spit_data_imports_data_importer_on_file_selected (_tmp2_, file); #line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (_tmp2_); -#line 1329 "DataImportsUI.c" +#line 1400 "DataImportsUI.c" } -static void data_imports_ui_library_selection_pane_class_init (DataImportsUILibrarySelectionPaneClass * klass) { +static void +data_imports_ui_library_selection_pane_class_init (DataImportsUILibrarySelectionPaneClass * klass) +{ #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_library_selection_pane_parent_class = g_type_class_peek_parent (klass); #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_type_class_add_private (klass, sizeof (DataImportsUILibrarySelectionPanePrivate)); #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" G_OBJECT_CLASS (klass)->finalize = data_imports_ui_library_selection_pane_finalize; -#line 1340 "DataImportsUI.c" +#line 1413 "DataImportsUI.c" } -static void data_imports_ui_library_selection_pane_instance_init (DataImportsUILibrarySelectionPane * self) { +static void +data_imports_ui_library_selection_pane_instance_init (DataImportsUILibrarySelectionPane * self) +{ #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" self->priv = DATA_IMPORTS_UI_LIBRARY_SELECTION_PANE_GET_PRIVATE (self); #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -1354,11 +1429,13 @@ static void data_imports_ui_library_selection_pane_instance_init (DataImportsUIL self->priv->selected_file = NULL; #line 54 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" self->priv->file_radio = NULL; -#line 1353 "DataImportsUI.c" +#line 1428 "DataImportsUI.c" } -static void data_imports_ui_library_selection_pane_finalize (GObject * obj) { +static void +data_imports_ui_library_selection_pane_finalize (GObject * obj) +{ DataImportsUILibrarySelectionPane * self; #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_UI_TYPE_LIBRARY_SELECTION_PANE, DataImportsUILibrarySelectionPane); @@ -1372,11 +1449,13 @@ static void data_imports_ui_library_selection_pane_finalize (GObject * obj) { _g_object_unref0 (self->priv->file_radio); #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" G_OBJECT_CLASS (data_imports_ui_library_selection_pane_parent_class)->finalize (obj); -#line 1371 "DataImportsUI.c" +#line 1448 "DataImportsUI.c" } -GType data_imports_ui_library_selection_pane_get_type (void) { +GType +data_imports_ui_library_selection_pane_get_type (void) +{ static volatile gsize data_imports_ui_library_selection_pane_type_id__volatile = 0; if (g_once_init_enter (&data_imports_ui_library_selection_pane_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DataImportsUILibrarySelectionPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_ui_library_selection_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsUILibrarySelectionPane), 0, (GInstanceInitFunc) data_imports_ui_library_selection_pane_instance_init, NULL }; @@ -1388,20 +1467,22 @@ GType data_imports_ui_library_selection_pane_get_type (void) { } -DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object_type, const gchar* message) { +DataImportsUIProgressPane* +data_imports_ui_progress_pane_construct (GType object_type, + const gchar* message) +{ DataImportsUIProgressPane * self = NULL; GtkBox* content_box = NULL; GtkBox* _tmp0_; - const gchar* _tmp1_; + GtkLabel* _tmp1_; GtkLabel* _tmp2_; - GtkLabel* _tmp3_; + GtkProgressBar* _tmp3_; GtkProgressBar* _tmp4_; - GtkProgressBar* _tmp5_; + GtkLabel* _tmp5_; GtkLabel* _tmp6_; - GtkLabel* _tmp7_; - GtkWidget* _tmp8_; + GtkWidget* _tmp7_; + GtkContainer* _tmp8_; GtkContainer* _tmp9_; - GtkContainer* _tmp10_; #line 171 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_val_if_fail (message != NULL, NULL); #line 171 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -1413,126 +1494,127 @@ DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object #line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" content_box = _tmp0_; #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp1_ = message; -#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp2_ = (GtkLabel*) gtk_label_new (_tmp1_); + _tmp1_ = (GtkLabel*) gtk_label_new (message); #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_object_ref_sink (_tmp2_); + g_object_ref_sink (_tmp1_); #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (self->priv->message_label); #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - self->priv->message_label = _tmp2_; + self->priv->message_label = _tmp1_; #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp3_ = self->priv->message_label; + _tmp2_ = self->priv->message_label; #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_box_pack_start (content_box, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 6); + gtk_box_pack_start (content_box, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 6); #line 175 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp4_ = (GtkProgressBar*) gtk_progress_bar_new (); + _tmp3_ = (GtkProgressBar*) gtk_progress_bar_new (); #line 175 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_object_ref_sink (_tmp4_); + g_object_ref_sink (_tmp3_); #line 175 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (self->priv->progress_bar); #line 175 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - self->priv->progress_bar = _tmp4_; + self->priv->progress_bar = _tmp3_; #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp5_ = self->priv->progress_bar; + _tmp4_ = self->priv->progress_bar; #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_box_pack_start (content_box, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), FALSE, TRUE, (guint) 6); + gtk_box_pack_start (content_box, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), FALSE, TRUE, (guint) 6); #line 177 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp6_ = (GtkLabel*) gtk_label_new (""); + _tmp5_ = (GtkLabel*) gtk_label_new (""); #line 177 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_object_ref_sink (_tmp6_); + g_object_ref_sink (_tmp5_); #line 177 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (self->priv->progress_label); #line 177 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - self->priv->progress_label = _tmp6_; + self->priv->progress_label = _tmp5_; #line 178 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp7_ = self->priv->progress_label; + _tmp6_ = self->priv->progress_label; #line 178 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_box_pack_start (content_box, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), FALSE, TRUE, (guint) 6); + gtk_box_pack_start (content_box, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE, TRUE, (guint) 6); #line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp8_ = spit_data_imports_dialog_pane_get_widget (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); + _tmp7_ = spit_data_imports_dialog_pane_get_widget (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); #line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp8_) : NULL; + _tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp7_) : NULL; #line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (_tmp9_ == NULL) { + if (_tmp8_ == NULL) { #line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _g_object_unref0 (_tmp8_); -#line 1457 "DataImportsUI.c" + _g_object_unref0 (_tmp7_); +#line 1536 "DataImportsUI.c" } #line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_container_add (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (content_box, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (content_box, gtk_widget_get_type (), GtkWidget)); #line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp9_); #line 171 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (content_box); #line 171 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return self; -#line 1469 "DataImportsUI.c" +#line 1548 "DataImportsUI.c" } -DataImportsUIProgressPane* data_imports_ui_progress_pane_new (const gchar* message) { +DataImportsUIProgressPane* +data_imports_ui_progress_pane_new (const gchar* message) +{ #line 171 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return data_imports_ui_progress_pane_construct (DATA_IMPORTS_UI_TYPE_PROGRESS_PANE, message); -#line 1476 "DataImportsUI.c" +#line 1557 "DataImportsUI.c" } -void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* self, gdouble progress, const gchar* progress_message) { +void +data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* self, + gdouble progress, + const gchar* progress_message) +{ GtkProgressBar* _tmp0_; - gdouble _tmp1_; - const gchar* _tmp2_; #line 183 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_PROGRESS_PANE (self)); #line 184 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = self->priv->progress_bar; #line 184 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp1_ = progress; -#line 184 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_progress_bar_set_fraction (_tmp0_, _tmp1_); + gtk_progress_bar_set_fraction (_tmp0_, progress); #line 185 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp2_ = progress_message; -#line 185 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (_tmp2_ != NULL) { -#line 1496 "DataImportsUI.c" - GtkLabel* _tmp3_; - const gchar* _tmp4_; + if (progress_message != NULL) { +#line 1575 "DataImportsUI.c" + GtkLabel* _tmp1_; #line 186 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp3_ = self->priv->progress_label; + _tmp1_ = self->priv->progress_label; #line 186 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp4_ = progress_message; -#line 186 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_label_set_label (_tmp3_, _tmp4_); -#line 1505 "DataImportsUI.c" + gtk_label_set_label (_tmp1_, progress_message); +#line 1581 "DataImportsUI.c" } #line 187 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" spin_event_loop (); -#line 1509 "DataImportsUI.c" +#line 1585 "DataImportsUI.c" } -static void data_imports_ui_progress_pane_class_init (DataImportsUIProgressPaneClass * klass) { +static void +data_imports_ui_progress_pane_class_init (DataImportsUIProgressPaneClass * klass) +{ #line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_progress_pane_parent_class = g_type_class_peek_parent (klass); #line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_type_class_add_private (klass, sizeof (DataImportsUIProgressPanePrivate)); #line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" G_OBJECT_CLASS (klass)->finalize = data_imports_ui_progress_pane_finalize; -#line 1520 "DataImportsUI.c" +#line 1598 "DataImportsUI.c" } -static void data_imports_ui_progress_pane_instance_init (DataImportsUIProgressPane * self) { +static void +data_imports_ui_progress_pane_instance_init (DataImportsUIProgressPane * self) +{ #line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" self->priv = DATA_IMPORTS_UI_PROGRESS_PANE_GET_PRIVATE (self); -#line 1527 "DataImportsUI.c" +#line 1607 "DataImportsUI.c" } -static void data_imports_ui_progress_pane_finalize (GObject * obj) { +static void +data_imports_ui_progress_pane_finalize (GObject * obj) +{ DataImportsUIProgressPane * self; #line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_UI_TYPE_PROGRESS_PANE, DataImportsUIProgressPane); @@ -1544,11 +1626,13 @@ static void data_imports_ui_progress_pane_finalize (GObject * obj) { _g_object_unref0 (self->priv->progress_bar); #line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" G_OBJECT_CLASS (data_imports_ui_progress_pane_parent_class)->finalize (obj); -#line 1543 "DataImportsUI.c" +#line 1625 "DataImportsUI.c" } -GType data_imports_ui_progress_pane_get_type (void) { +GType +data_imports_ui_progress_pane_get_type (void) +{ static volatile gsize data_imports_ui_progress_pane_type_id__volatile = 0; if (g_once_init_enter (&data_imports_ui_progress_pane_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DataImportsUIProgressPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_ui_progress_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsUIProgressPane), 0, (GInstanceInitFunc) data_imports_ui_progress_pane_instance_init, NULL }; @@ -1560,408 +1644,414 @@ GType data_imports_ui_progress_pane_get_type (void) { } -static gboolean _data_imports_ui_data_imports_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) { +static gboolean +_data_imports_ui_data_imports_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, + GdkEventAny* event, + gpointer self) +{ gboolean result; result = data_imports_ui_data_imports_dialog_on_window_close ((DataImportsUIDataImportsDialog*) self, event); #line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return result; -#line 1564 "DataImportsUI.c" +#line 1652 "DataImportsUI.c" } -static void _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void +_data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self) +{ #line 250 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_on_service_changed ((DataImportsUIDataImportsDialog*) self); -#line 1571 "DataImportsUI.c" +#line 1662 "DataImportsUI.c" } -static void _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 305 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_on_close_cancel_clicked ((DataImportsUIDataImportsDialog*) self); -#line 1578 "DataImportsUI.c" +#line 1672 "DataImportsUI.c" } -DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (GType object_type) { +DataImportsUIDataImportsDialog* +data_imports_ui_data_imports_dialog_construct (GType object_type) +{ DataImportsUIDataImportsDialog * self = NULL; gboolean use_header = FALSE; - gint _tmp0_; - gint _tmp1_; - gboolean _tmp2_; + gboolean _tmp0_; gchar* title = NULL; - gchar* _tmp4_; + gchar* _tmp2_; gchar* label = NULL; - gchar* _tmp5_; - const gchar* _tmp6_; + gchar* _tmp3_; + const gchar* _tmp4_; SpitDataImportsService** loaded_services = NULL; - gint _tmp7_; - SpitDataImportsService** _tmp8_; + gint _tmp5_; + SpitDataImportsService** _tmp6_; gint loaded_services_length1; gint _loaded_services_size_; - SpitDataImportsService** _tmp9_; - gint _tmp9__length1; + SpitDataImportsService** _tmp7_; + gint _tmp7__length1; + GtkBox* _tmp62_; + GtkBox* _tmp63_; GtkBox* _tmp64_; - GtkBox* _tmp65_; - GtkBox* _tmp66_; - gboolean _tmp67_; - GtkButton* _tmp77_; - SpitDataImportsService** _tmp78_; - gint _tmp78__length1; -#line 211 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp0_ = resources_use_header_bar (); + gboolean _tmp65_; + GtkButton* _tmp75_; + SpitDataImportsService** _tmp76_; + gint _tmp76__length1; #line 211 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - use_header = _tmp0_ == 1; + use_header = resources_use_header_bar () == 1; #line 212 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp1_ = resources_use_header_bar (); -#line 212 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - self = (DataImportsUIDataImportsDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL); + self = (DataImportsUIDataImportsDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL); #line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp2_ = use_header; + _tmp0_ = use_header; #line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (_tmp2_) { -#line 1619 "DataImportsUI.c" - GtkWidget* _tmp3_; + if (_tmp0_) { +#line 1709 "DataImportsUI.c" + GtkWidget* _tmp1_; #line 214 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp3_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); + _tmp1_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); #line 214 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE); -#line 1625 "DataImportsUI.c" + gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE); +#line 1715 "DataImportsUI.c" } #line 216 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); #line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _data_imports_ui_data_imports_dialog_on_window_close_gtk_widget_delete_event, self, 0); #line 219 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp4_ = g_strdup (_ ("Import From Application")); + _tmp2_ = g_strdup (_ ("Import From Application")); #line 219 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - title = _tmp4_; + title = _tmp2_; #line 220 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp5_ = g_strdup (_ ("Import media _from:")); + _tmp3_ = g_strdup (_ ("Import media _from:")); #line 220 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - label = _tmp5_; + label = _tmp3_; #line 222 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp6_ = title; + _tmp4_ = title; #line 222 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp6_); + gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp4_); #line 224 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp8_ = spit_data_imports_load_services (FALSE, &_tmp7_); + _tmp6_ = spit_data_imports_load_services (FALSE, &_tmp5_); #line 224 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - loaded_services = _tmp8_; + loaded_services = _tmp6_; #line 224 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - loaded_services_length1 = _tmp7_; + loaded_services_length1 = _tmp5_; #line 224 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _loaded_services_size_ = loaded_services_length1; #line 226 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp9_ = loaded_services; + _tmp7_ = loaded_services; #line 226 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp9__length1 = loaded_services_length1; + _tmp7__length1 = loaded_services_length1; #line 226 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (_tmp9__length1 > 0) { -#line 1657 "DataImportsUI.c" - GtkComboBoxText* _tmp10_; - GtkComboBoxText* _tmp11_; + if (_tmp7__length1 > 0) { +#line 1747 "DataImportsUI.c" + GtkComboBoxText* _tmp8_; + GtkComboBoxText* _tmp9_; gchar* last_used_service = NULL; - ConfigFacade* _tmp12_; - ConfigFacade* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; + ConfigFacade* _tmp10_; + ConfigFacade* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; gint ticker = 0; gint last_used_index = 0; - SpitDataImportsService** _tmp16_; - gint _tmp16__length1; - gint _tmp30_; - GtkComboBoxText* _tmp34_; - gboolean _tmp35_; + SpitDataImportsService** _tmp14_; + gint _tmp14__length1; + gint _tmp28_; + GtkComboBoxText* _tmp32_; + gboolean _tmp33_; #line 229 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp10_ = (GtkComboBoxText*) gtk_combo_box_text_new (); + _tmp8_ = (GtkComboBoxText*) gtk_combo_box_text_new (); #line 229 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_object_ref_sink (_tmp10_); + g_object_ref_sink (_tmp8_); #line 229 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (self->priv->service_selector_box); #line 229 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - self->priv->service_selector_box = _tmp10_; + self->priv->service_selector_box = _tmp8_; #line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp11_ = self->priv->service_selector_box; + _tmp9_ = self->priv->service_selector_box; #line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), 0); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp12_ = config_facade_get_instance (); + _tmp10_ = config_facade_get_instance (); #line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp14_ = configuration_facade_get_last_used_dataimports_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp12_ = configuration_facade_get_last_used_dataimports_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp15_ = _tmp14_; + _tmp13_ = _tmp12_; #line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp11_); #line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - last_used_service = _tmp15_; + last_used_service = _tmp13_; #line 235 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" ticker = 0; #line 236 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" last_used_index = -1; #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp16_ = loaded_services; + _tmp14_ = loaded_services; #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp16__length1 = loaded_services_length1; -#line 1704 "DataImportsUI.c" + _tmp14__length1 = loaded_services_length1; +#line 1794 "DataImportsUI.c" { SpitDataImportsService** service_collection = NULL; gint service_collection_length1 = 0; gint _service_collection_size_ = 0; gint service_it = 0; #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - service_collection = _tmp16_; + service_collection = _tmp14_; #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - service_collection_length1 = _tmp16__length1; + service_collection_length1 = _tmp14__length1; #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - for (service_it = 0; service_it < _tmp16__length1; service_it = service_it + 1) { -#line 1716 "DataImportsUI.c" - SpitDataImportsService* _tmp17_; + for (service_it = 0; service_it < _tmp14__length1; service_it = service_it + 1) { +#line 1806 "DataImportsUI.c" + SpitDataImportsService* _tmp15_; SpitDataImportsService* service = NULL; #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp17_ = _g_object_ref0 (service_collection[service_it]); + _tmp15_ = _g_object_ref0 (service_collection[service_it]); #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - service = _tmp17_; -#line 1723 "DataImportsUI.c" + service = _tmp15_; +#line 1813 "DataImportsUI.c" { gchar* curr_service_id = NULL; - SpitDataImportsService* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; - gboolean _tmp21_ = FALSE; - const gchar* _tmp22_; - GtkComboBoxText* _tmp26_; - SpitDataImportsService* _tmp27_; - const gchar* _tmp28_; - gint _tmp29_; + SpitDataImportsService* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; + gboolean _tmp19_ = FALSE; + const gchar* _tmp20_; + GtkComboBoxText* _tmp24_; + SpitDataImportsService* _tmp25_; + const gchar* _tmp26_; + gint _tmp27_; #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp18_ = service; + _tmp16_ = service; #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp19_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp17_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp20_ = g_strdup (_tmp19_); + _tmp18_ = g_strdup (_tmp17_); #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - curr_service_id = _tmp20_; + curr_service_id = _tmp18_; #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp22_ = last_used_service; + _tmp20_ = last_used_service; #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (_tmp22_ != NULL) { -#line 1747 "DataImportsUI.c" - const gchar* _tmp23_; - const gchar* _tmp24_; + if (_tmp20_ != NULL) { +#line 1837 "DataImportsUI.c" + const gchar* _tmp21_; + const gchar* _tmp22_; #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp23_ = last_used_service; + _tmp21_ = last_used_service; #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp24_ = curr_service_id; + _tmp22_ = curr_service_id; #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp21_ = g_strcmp0 (_tmp23_, _tmp24_) == 0; -#line 1756 "DataImportsUI.c" + _tmp19_ = g_strcmp0 (_tmp21_, _tmp22_) == 0; +#line 1846 "DataImportsUI.c" } else { #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp21_ = FALSE; -#line 1760 "DataImportsUI.c" + _tmp19_ = FALSE; +#line 1850 "DataImportsUI.c" } #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (_tmp21_) { -#line 1764 "DataImportsUI.c" - gint _tmp25_; + if (_tmp19_) { +#line 1854 "DataImportsUI.c" + gint _tmp23_; #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp25_ = ticker; + _tmp23_ = ticker; #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - last_used_index = _tmp25_; -#line 1770 "DataImportsUI.c" + last_used_index = _tmp23_; +#line 1860 "DataImportsUI.c" } #line 242 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp26_ = self->priv->service_selector_box; + _tmp24_ = self->priv->service_selector_box; #line 242 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp27_ = service; + _tmp25_ = service; #line 242 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp28_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp26_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 242 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_combo_box_text_append_text (_tmp26_, _tmp28_); + gtk_combo_box_text_append_text (_tmp24_, _tmp26_); #line 243 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp29_ = ticker; + _tmp27_ = ticker; #line 243 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - ticker = _tmp29_ + 1; + ticker = _tmp27_ + 1; #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_free0 (curr_service_id); #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (service); -#line 1788 "DataImportsUI.c" +#line 1878 "DataImportsUI.c" } } } #line 245 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp30_ = last_used_index; + _tmp28_ = last_used_index; #line 245 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (_tmp30_ >= 0) { -#line 1796 "DataImportsUI.c" - GtkComboBoxText* _tmp31_; - gint _tmp32_; + if (_tmp28_ >= 0) { +#line 1886 "DataImportsUI.c" + GtkComboBoxText* _tmp29_; + gint _tmp30_; #line 246 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp31_ = self->priv->service_selector_box; + _tmp29_ = self->priv->service_selector_box; #line 246 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp32_ = last_used_index; + _tmp30_ = last_used_index; #line 246 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_combo_box_get_type (), GtkComboBox), _tmp32_); -#line 1805 "DataImportsUI.c" + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_combo_box_get_type (), GtkComboBox), _tmp30_); +#line 1895 "DataImportsUI.c" } else { - GtkComboBoxText* _tmp33_; + GtkComboBoxText* _tmp31_; #line 248 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp33_ = self->priv->service_selector_box; + _tmp31_ = self->priv->service_selector_box; #line 248 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 1812 "DataImportsUI.c" + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_combo_box_get_type (), GtkComboBox), 0); +#line 1902 "DataImportsUI.c" } #line 250 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp34_ = self->priv->service_selector_box; + _tmp32_ = self->priv->service_selector_box; #line 250 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed, self, 0); #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp35_ = use_header; + _tmp33_ = use_header; #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (!_tmp35_) { -#line 1822 "DataImportsUI.c" + if (!_tmp33_) { +#line 1912 "DataImportsUI.c" GtkLabel* service_selector_box_label = NULL; - const gchar* _tmp36_; - GtkLabel* _tmp37_; + const gchar* _tmp34_; + GtkLabel* _tmp35_; + GtkLabel* _tmp36_; + GtkComboBoxText* _tmp37_; GtkLabel* _tmp38_; - GtkComboBoxText* _tmp39_; - GtkLabel* _tmp40_; - GtkLabel* _tmp41_; + GtkLabel* _tmp39_; + GtkComboBoxText* _tmp40_; + GtkComboBoxText* _tmp41_; GtkComboBoxText* _tmp42_; GtkComboBoxText* _tmp43_; - GtkComboBoxText* _tmp44_; - GtkComboBoxText* _tmp45_; GtkBox* service_selector_layouter = NULL; + GtkBox* _tmp44_; + GtkBox* _tmp45_; GtkBox* _tmp46_; - GtkBox* _tmp47_; + GtkLabel* _tmp47_; GtkBox* _tmp48_; - GtkLabel* _tmp49_; - GtkBox* _tmp50_; - GtkComboBoxText* _tmp51_; + GtkComboBoxText* _tmp49_; GtkBox* service_area_layouter = NULL; + GtkBox* _tmp50_; + GtkBox* _tmp51_; GtkBox* _tmp52_; - GtkBox* _tmp53_; - GtkBox* _tmp54_; GtkSeparator* service_central_separator = NULL; + GtkSeparator* _tmp53_; + GtkBox* _tmp54_; GtkSeparator* _tmp55_; GtkBox* _tmp56_; - GtkSeparator* _tmp57_; + GtkBox* _tmp57_; GtkBox* _tmp58_; GtkBox* _tmp59_; GtkBox* _tmp60_; GtkBox* _tmp61_; - GtkBox* _tmp62_; - GtkBox* _tmp63_; #line 254 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp36_ = label; + _tmp34_ = label; #line 254 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp37_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp36_); + _tmp35_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp34_); #line 254 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_object_ref_sink (_tmp37_); + g_object_ref_sink (_tmp35_); #line 254 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - service_selector_box_label = _tmp37_; + service_selector_box_label = _tmp35_; #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp38_ = service_selector_box_label; + _tmp36_ = service_selector_box_label; #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp39_ = self->priv->service_selector_box; + _tmp37_ = self->priv->service_selector_box; #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_label_set_mnemonic_widget (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget)); + gtk_label_set_mnemonic_widget (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget)); #line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp40_ = service_selector_box_label; + _tmp38_ = service_selector_box_label; #line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); #line 257 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp41_ = service_selector_box_label; + _tmp39_ = service_selector_box_label; #line 257 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); + gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); #line 263 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp42_ = self->priv->service_selector_box; + _tmp40_ = self->priv->service_selector_box; #line 263 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END); + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END); #line 264 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp43_ = self->priv->service_selector_box; + _tmp41_ = self->priv->service_selector_box; #line 264 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); + gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); #line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp44_ = self->priv->service_selector_box; + _tmp42_ = self->priv->service_selector_box; #line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), FALSE); #line 266 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp45_ = self->priv->service_selector_box; + _tmp43_ = self->priv->service_selector_box; #line 266 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), FALSE); #line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp46_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); + _tmp44_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); #line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_object_ref_sink (_tmp46_); + g_object_ref_sink (_tmp44_); #line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - service_selector_layouter = _tmp46_; + service_selector_layouter = _tmp44_; #line 269 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp47_ = service_selector_layouter; + _tmp45_ = service_selector_layouter; #line 269 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_container_get_type (), GtkContainer), (guint) 12); + gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_container_get_type (), GtkContainer), (guint) 12); #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp48_ = service_selector_layouter; + _tmp46_ = service_selector_layouter; #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp49_ = service_selector_box_label; + _tmp47_ = service_selector_box_label; #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget)); #line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp50_ = service_selector_layouter; + _tmp48_ = service_selector_layouter; #line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp51_ = self->priv->service_selector_box; + _tmp49_ = self->priv->service_selector_box; #line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_box_pack_start (_tmp50_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 275 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp52_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + _tmp50_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); #line 275 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_object_ref_sink (_tmp52_); + g_object_ref_sink (_tmp50_); #line 275 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - service_area_layouter = _tmp52_; + service_area_layouter = _tmp50_; #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp53_ = service_area_layouter; + _tmp51_ = service_area_layouter; #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp54_ = service_selector_layouter; + _tmp52_ = service_selector_layouter; #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_box_pack_start (_tmp53_, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp55_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); + _tmp53_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_object_ref_sink (_tmp55_); + g_object_ref_sink (_tmp53_); #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - service_central_separator = _tmp55_; + service_central_separator = _tmp53_; #line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp56_ = service_area_layouter; + _tmp54_ = service_area_layouter; #line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp57_ = service_central_separator; + _tmp55_ = service_central_separator; #line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget)); #line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp58_ = service_area_layouter; + _tmp56_ = service_area_layouter; #line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL); + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL); #line 280 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp59_ = service_area_layouter; + _tmp57_ = service_area_layouter; #line 280 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); + gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); #line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp60_ = service_area_layouter; + _tmp58_ = service_area_layouter; #line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), TRUE); #line 282 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp61_ = service_area_layouter; + _tmp59_ = service_area_layouter; #line 282 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget), FALSE); #line 284 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp62_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); + _tmp60_ = gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); #line 284 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp63_ = service_area_layouter; + _tmp61_ = service_area_layouter; #line 284 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (service_central_separator); #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -1970,113 +2060,113 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G _g_object_unref0 (service_selector_layouter); #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (service_selector_box_label); -#line 1969 "DataImportsUI.c" +#line 2059 "DataImportsUI.c" } #line 226 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_free0 (last_used_service); -#line 1973 "DataImportsUI.c" +#line 2063 "DataImportsUI.c" } #line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp64_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + _tmp62_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); #line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_object_ref_sink (_tmp64_); + g_object_ref_sink (_tmp62_); #line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (self->priv->central_area_layouter); #line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - self->priv->central_area_layouter = _tmp64_; + self->priv->central_area_layouter = _tmp62_; #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp65_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); + _tmp63_ = gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp66_ = self->priv->central_area_layouter; + _tmp64_ = self->priv->central_area_layouter; #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp67_ = use_header; + _tmp65_ = use_header; #line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (_tmp67_) { -#line 1993 "DataImportsUI.c" - GtkButton* _tmp68_; + if (_tmp65_) { +#line 2083 "DataImportsUI.c" + GtkButton* _tmp66_; + GtkButton* _tmp67_; + GtkWidget* _tmp68_; GtkButton* _tmp69_; - GtkWidget* _tmp70_; - GtkButton* _tmp71_; - GtkComboBoxText* _tmp72_; + GtkComboBoxText* _tmp70_; #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp68_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel"); + _tmp66_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel"); #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_object_ref_sink (_tmp68_); + g_object_ref_sink (_tmp66_); #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (self->priv->close_cancel_button); #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - self->priv->close_cancel_button = _tmp68_; + self->priv->close_cancel_button = _tmp66_; #line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp69_ = self->priv->close_cancel_button; + _tmp67_ = self->priv->close_cancel_button; #line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), TRUE); #line 296 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp70_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); + _tmp68_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); #line 296 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp71_ = self->priv->close_cancel_button; + _tmp69_ = self->priv->close_cancel_button; #line 296 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget)); + gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget)); #line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp72_ = self->priv->service_selector_box; + _tmp70_ = self->priv->service_selector_box; #line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (_tmp72_ != NULL) { -#line 2021 "DataImportsUI.c" - GtkWidget* _tmp73_; - GtkComboBoxText* _tmp74_; + if (_tmp70_ != NULL) { +#line 2111 "DataImportsUI.c" + GtkWidget* _tmp71_; + GtkComboBoxText* _tmp72_; #line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp73_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); + _tmp71_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); #line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp74_ = self->priv->service_selector_box; + _tmp72_ = self->priv->service_selector_box; #line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget)); -#line 2030 "DataImportsUI.c" + gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget)); +#line 2120 "DataImportsUI.c" } } else { - GtkWidget* _tmp75_; - GtkButton* _tmp76_; + GtkWidget* _tmp73_; + GtkButton* _tmp74_; #line 302 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _ ("_Cancel"), (gint) GTK_RESPONSE_CANCEL); #line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp75_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL); + _tmp73_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL); #line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp76_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, gtk_button_get_type ()) ? ((GtkButton*) _tmp75_) : NULL); + _tmp74_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp73_, gtk_button_get_type ()) ? ((GtkButton*) _tmp73_) : NULL); #line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (self->priv->close_cancel_button); #line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - self->priv->close_cancel_button = _tmp76_; -#line 2045 "DataImportsUI.c" + self->priv->close_cancel_button = _tmp74_; +#line 2135 "DataImportsUI.c" } #line 305 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp77_ = self->priv->close_cancel_button; + _tmp75_ = self->priv->close_cancel_button; #line 305 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - g_signal_connect_object (_tmp77_, "clicked", (GCallback) _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp75_, "clicked", (GCallback) _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0); #line 307 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_set_standard_window_mode (self); #line 309 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp78_ = loaded_services; + _tmp76_ = loaded_services; #line 309 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp78__length1 = loaded_services_length1; + _tmp76__length1 = loaded_services_length1; #line 309 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if (_tmp78__length1 > 0) { + if (_tmp76__length1 > 0) { #line 311 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_on_service_changed (self); -#line 2061 "DataImportsUI.c" +#line 2151 "DataImportsUI.c" } else { - DataImportsUIStaticMessagePane* _tmp79_; - DataImportsUIStaticMessagePane* _tmp80_; + DataImportsUIStaticMessagePane* _tmp77_; + DataImportsUIStaticMessagePane* _tmp78_; #line 314 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp79_ = data_imports_ui_static_message_pane_new_with_pango (DATA_IMPORTS_UI_NO_PLUGINS_ENABLED_MESSAGE); + _tmp77_ = data_imports_ui_static_message_pane_new_with_pango (DATA_IMPORTS_UI_NO_PLUGINS_ENABLED_MESSAGE); #line 314 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp80_ = _tmp79_; + _tmp78_ = _tmp77_; #line 314 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - data_imports_ui_data_imports_dialog_install_pane (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); + data_imports_ui_data_imports_dialog_install_pane (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); #line 314 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _g_object_unref0 (_tmp80_); + _g_object_unref0 (_tmp78_); #line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_set_close_button_mode (self); -#line 2075 "DataImportsUI.c" +#line 2165 "DataImportsUI.c" } #line 318 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); @@ -2088,18 +2178,22 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G _g_free0 (title); #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return self; -#line 2087 "DataImportsUI.c" +#line 2177 "DataImportsUI.c" } -DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_new (void) { +DataImportsUIDataImportsDialog* +data_imports_ui_data_imports_dialog_new (void) +{ #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return data_imports_ui_data_imports_dialog_construct (DATA_IMPORTS_UI_TYPE_DATA_IMPORTS_DIALOG); -#line 2094 "DataImportsUI.c" +#line 2186 "DataImportsUI.c" } -DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_create_instance (void) { +DataImportsUIDataImportsDialog* +data_imports_ui_data_imports_dialog_get_or_create_instance (void) +{ DataImportsUIDataImportsDialog* result = NULL; DataImportsUIDataImportsDialog* _tmp0_; DataImportsUIDataImportsDialog* _tmp2_; @@ -2108,7 +2202,7 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_creat _tmp0_ = data_imports_ui_data_imports_dialog_instance; #line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" if (_tmp0_ == NULL) { -#line 2107 "DataImportsUI.c" +#line 2201 "DataImportsUI.c" DataImportsUIDataImportsDialog* _tmp1_; #line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp1_ = data_imports_ui_data_imports_dialog_new (); @@ -2118,7 +2212,7 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_creat _g_object_unref0 (data_imports_ui_data_imports_dialog_instance); #line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_instance = _tmp1_; -#line 2117 "DataImportsUI.c" +#line 2211 "DataImportsUI.c" } #line 325 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp2_ = data_imports_ui_data_imports_dialog_instance; @@ -2128,33 +2222,38 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_creat result = _tmp3_; #line 325 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return result; -#line 2127 "DataImportsUI.c" +#line 2221 "DataImportsUI.c" } -void data_imports_ui_data_imports_dialog_terminate_instance (void) { +void +data_imports_ui_data_imports_dialog_terminate_instance (void) +{ DataImportsUIDataImportsDialog* _tmp0_; #line 329 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp0_ = data_imports_ui_data_imports_dialog_instance; #line 329 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" if (_tmp0_ != NULL) { -#line 2137 "DataImportsUI.c" +#line 2233 "DataImportsUI.c" DataImportsUIDataImportsDialog* _tmp1_; #line 330 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp1_ = data_imports_ui_data_imports_dialog_instance; #line 330 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_terminate (_tmp1_); -#line 2143 "DataImportsUI.c" +#line 2239 "DataImportsUI.c" } #line 332 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (data_imports_ui_data_imports_dialog_instance); #line 332 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_instance = NULL; -#line 2149 "DataImportsUI.c" +#line 2245 "DataImportsUI.c" } -static gboolean data_imports_ui_data_imports_dialog_on_window_close (DataImportsUIDataImportsDialog* self, GdkEventAny* evt) { +static gboolean +data_imports_ui_data_imports_dialog_on_window_close (DataImportsUIDataImportsDialog* self, + GdkEventAny* evt) +{ gboolean result = FALSE; #line 335 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_val_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self), FALSE); @@ -2169,11 +2268,13 @@ static gboolean data_imports_ui_data_imports_dialog_on_window_close (DataImports result = TRUE; #line 339 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return result; -#line 2167 "DataImportsUI.c" +#line 2266 "DataImportsUI.c" } -static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsUIDataImportsDialog* self) { +static void +data_imports_ui_data_imports_dialog_on_service_changed (DataImportsUIDataImportsDialog* self) +{ gchar* service_name = NULL; GtkComboBoxText* _tmp0_; gchar* _tmp1_; @@ -2217,7 +2318,7 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU _tmp4_ = services; #line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp4__length1 = services_length1; -#line 2215 "DataImportsUI.c" +#line 2316 "DataImportsUI.c" { SpitDataImportsService** service_collection = NULL; gint service_collection_length1 = 0; @@ -2229,14 +2330,14 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU service_collection_length1 = _tmp4__length1; #line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" for (service_it = 0; service_it < _tmp4__length1; service_it = service_it + 1) { -#line 2227 "DataImportsUI.c" +#line 2328 "DataImportsUI.c" SpitDataImportsService* _tmp5_; SpitDataImportsService* service = NULL; #line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp5_ = _g_object_ref0 (service_collection[service_it]); #line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" service = _tmp5_; -#line 2234 "DataImportsUI.c" +#line 2335 "DataImportsUI.c" { SpitDataImportsService* _tmp6_; const gchar* _tmp7_; @@ -2249,7 +2350,7 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU _tmp8_ = service_name; #line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" if (g_strcmp0 (_tmp7_, _tmp8_) == 0) { -#line 2247 "DataImportsUI.c" +#line 2348 "DataImportsUI.c" SpitDataImportsService* _tmp9_; SpitDataImportsService* _tmp10_; #line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -2264,11 +2365,11 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU _g_object_unref0 (service); #line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" break; -#line 2262 "DataImportsUI.c" +#line 2363 "DataImportsUI.c" } #line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (service); -#line 2266 "DataImportsUI.c" +#line 2367 "DataImportsUI.c" } } } @@ -2306,11 +2407,13 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU _g_object_unref0 (selected_service); #line 342 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_free0 (service_name); -#line 2304 "DataImportsUI.c" +#line 2405 "DataImportsUI.c" } -static void data_imports_ui_data_imports_dialog_on_close_cancel_clicked (DataImportsUIDataImportsDialog* self) { +static void +data_imports_ui_data_imports_dialog_on_close_cancel_clicked (DataImportsUIDataImportsDialog* self) +{ #line 362 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); #line 363 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -2318,11 +2421,13 @@ static void data_imports_ui_data_imports_dialog_on_close_cancel_clicked (DataImp " invoked."); #line 365 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_terminate (self); -#line 2315 "DataImportsUI.c" +#line 2418 "DataImportsUI.c" } -static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImportsDialog* self) { +static void +data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImportsDialog* self) +{ SpitDataImportsConcreteDataImportsHost* _tmp0_; #line 368 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); @@ -2332,7 +2437,7 @@ static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImpo _tmp0_ = self->priv->host; #line 371 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" if (_tmp0_ != NULL) { -#line 2329 "DataImportsUI.c" +#line 2434 "DataImportsUI.c" SpitDataImportsConcreteDataImportsHost* _tmp1_; #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp1_ = self->priv->host; @@ -2342,7 +2447,7 @@ static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImpo _g_object_unref0 (self->priv->host); #line 373 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" self->priv->host = NULL; -#line 2339 "DataImportsUI.c" +#line 2444 "DataImportsUI.c" } #line 376 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); @@ -2352,11 +2457,13 @@ static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImpo _g_object_unref0 (data_imports_ui_data_imports_dialog_instance); #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_instance = NULL; -#line 2349 "DataImportsUI.c" +#line 2454 "DataImportsUI.c" } -static void data_imports_ui_data_imports_dialog_set_large_window_mode (DataImportsUIDataImportsDialog* self) { +static void +data_imports_ui_data_imports_dialog_set_large_window_mode (DataImportsUIDataImportsDialog* self) +{ GtkBox* _tmp0_; #line 381 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); @@ -2368,11 +2475,13 @@ static void data_imports_ui_data_imports_dialog_set_large_window_mode (DataImpor gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT); #line 385 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); -#line 2365 "DataImportsUI.c" +#line 2472 "DataImportsUI.c" } -static void data_imports_ui_data_imports_dialog_set_colossal_window_mode (DataImportsUIDataImportsDialog* self) { +static void +data_imports_ui_data_imports_dialog_set_colossal_window_mode (DataImportsUIDataImportsDialog* self) +{ GtkBox* _tmp0_; #line 388 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); @@ -2384,11 +2493,13 @@ static void data_imports_ui_data_imports_dialog_set_colossal_window_mode (DataIm gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT); #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); -#line 2381 "DataImportsUI.c" +#line 2490 "DataImportsUI.c" } -static void data_imports_ui_data_imports_dialog_set_standard_window_mode (DataImportsUIDataImportsDialog* self) { +static void +data_imports_ui_data_imports_dialog_set_standard_window_mode (DataImportsUIDataImportsDialog* self) +{ GtkBox* _tmp0_; #line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); @@ -2400,29 +2511,35 @@ static void data_imports_ui_data_imports_dialog_set_standard_window_mode (DataIm gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT); #line 399 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); -#line 2397 "DataImportsUI.c" +#line 2508 "DataImportsUI.c" } -static void data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (DataImportsUIDataImportsDialog* self) { +static void +data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (DataImportsUIDataImportsDialog* self) +{ #line 402 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); #line 403 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE); -#line 2406 "DataImportsUI.c" +#line 2519 "DataImportsUI.c" } -static void data_imports_ui_data_imports_dialog_clear_free_sizable_window_mode (DataImportsUIDataImportsDialog* self) { +static void +data_imports_ui_data_imports_dialog_clear_free_sizable_window_mode (DataImportsUIDataImportsDialog* self) +{ #line 406 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); #line 407 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); -#line 2415 "DataImportsUI.c" +#line 2530 "DataImportsUI.c" } -SpitDataImportsDialogPane* data_imports_ui_data_imports_dialog_get_active_pane (DataImportsUIDataImportsDialog* self) { +SpitDataImportsDialogPane* +data_imports_ui_data_imports_dialog_get_active_pane (DataImportsUIDataImportsDialog* self) +{ SpitDataImportsDialogPane* result = NULL; SpitDataImportsDialogPane* _tmp0_; SpitDataImportsDialogPane* _tmp1_; @@ -2436,11 +2553,13 @@ SpitDataImportsDialogPane* data_imports_ui_data_imports_dialog_get_active_pane ( result = _tmp1_; #line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" return result; -#line 2433 "DataImportsUI.c" +#line 2550 "DataImportsUI.c" } -void data_imports_ui_data_imports_dialog_set_close_button_mode (DataImportsUIDataImportsDialog* self) { +void +data_imports_ui_data_imports_dialog_set_close_button_mode (DataImportsUIDataImportsDialog* self) +{ GtkButton* _tmp0_; GtkButton* _tmp1_; #line 414 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -2453,11 +2572,13 @@ void data_imports_ui_data_imports_dialog_set_close_button_mode (DataImportsUIDat _tmp1_ = self->priv->close_cancel_button; #line 416 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); -#line 2450 "DataImportsUI.c" +#line 2569 "DataImportsUI.c" } -void data_imports_ui_data_imports_dialog_set_cancel_button_mode (DataImportsUIDataImportsDialog* self) { +void +data_imports_ui_data_imports_dialog_set_cancel_button_mode (DataImportsUIDataImportsDialog* self) +{ GtkButton* _tmp0_; #line 419 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); @@ -2465,11 +2586,13 @@ void data_imports_ui_data_imports_dialog_set_cancel_button_mode (DataImportsUIDa _tmp0_ = self->priv->close_cancel_button; #line 420 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_button_set_label (_tmp0_, _ ("_Cancel")); -#line 2462 "DataImportsUI.c" +#line 2583 "DataImportsUI.c" } -void data_imports_ui_data_imports_dialog_lock_service (DataImportsUIDataImportsDialog* self) { +void +data_imports_ui_data_imports_dialog_lock_service (DataImportsUIDataImportsDialog* self) +{ GtkComboBoxText* _tmp0_; #line 423 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); @@ -2477,11 +2600,13 @@ void data_imports_ui_data_imports_dialog_lock_service (DataImportsUIDataImportsD _tmp0_ = self->priv->service_selector_box; #line 424 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 2474 "DataImportsUI.c" +#line 2597 "DataImportsUI.c" } -void data_imports_ui_data_imports_dialog_unlock_service (DataImportsUIDataImportsDialog* self) { +void +data_imports_ui_data_imports_dialog_unlock_service (DataImportsUIDataImportsDialog* self) +{ GtkComboBoxText* _tmp0_; #line 427 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); @@ -2489,24 +2614,22 @@ void data_imports_ui_data_imports_dialog_unlock_service (DataImportsUIDataImport _tmp0_ = self->priv->service_selector_box; #line 428 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 2486 "DataImportsUI.c" +#line 2611 "DataImportsUI.c" } -void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsDialog* self, SpitDataImportsDialogPane* pane) { +void +data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsDialog* self, + SpitDataImportsDialogPane* pane) +{ SpitDataImportsDialogPane* _tmp0_; GtkBox* _tmp6_; - SpitDataImportsDialogPane* _tmp7_; + GtkWidget* _tmp7_; GtkWidget* _tmp8_; - GtkWidget* _tmp9_; SpitDataImportsDialogPaneGeometryOptions geometry_options = 0; - SpitDataImportsDialogPane* _tmp10_; + SpitDataImportsDialogPaneGeometryOptions _tmp9_; SpitDataImportsDialogPaneGeometryOptions _tmp11_; - SpitDataImportsDialogPaneGeometryOptions _tmp12_; - SpitDataImportsDialogPaneGeometryOptions _tmp14_; - SpitDataImportsDialogPane* _tmp15_; - SpitDataImportsDialogPane* _tmp16_; - SpitDataImportsDialogPane* _tmp17_; + SpitDataImportsDialogPane* _tmp12_; #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self)); #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" @@ -2517,7 +2640,7 @@ void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsD _tmp0_ = self->priv->active_pane; #line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" if (_tmp0_ != NULL) { -#line 2514 "DataImportsUI.c" +#line 2637 "DataImportsUI.c" SpitDataImportsDialogPane* _tmp1_; GtkBox* _tmp2_; SpitDataImportsDialogPane* _tmp3_; @@ -2542,97 +2665,93 @@ void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsD gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), _tmp5_); #line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (_tmp5_); -#line 2538 "DataImportsUI.c" +#line 2661 "DataImportsUI.c" } #line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _tmp6_ = self->priv->central_area_layouter; #line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp7_ = pane; -#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp8_ = spit_data_imports_dialog_pane_get_widget (_tmp7_); + _tmp7_ = spit_data_imports_dialog_pane_get_widget (pane); #line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - gtk_box_pack_start (_tmp6_, _tmp9_, TRUE, TRUE, (guint) 0); + gtk_box_pack_start (_tmp6_, _tmp8_, TRUE, TRUE, (guint) 0); #line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 444 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp10_ = pane; -#line 444 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp11_ = spit_data_imports_dialog_pane_get_preferred_geometry (_tmp10_); -#line 444 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - geometry_options = _tmp11_; + geometry_options = spit_data_imports_dialog_pane_get_preferred_geometry (pane); #line 446 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp12_ = geometry_options; + _tmp9_ = geometry_options; #line 446 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if ((_tmp12_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) { + if ((_tmp9_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) { #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_set_large_window_mode (self); -#line 2566 "DataImportsUI.c" +#line 2683 "DataImportsUI.c" } else { - SpitDataImportsDialogPaneGeometryOptions _tmp13_; + SpitDataImportsDialogPaneGeometryOptions _tmp10_; #line 448 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp13_ = geometry_options; + _tmp10_ = geometry_options; #line 448 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if ((_tmp13_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) { + if ((_tmp10_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) { #line 449 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_set_colossal_window_mode (self); -#line 2575 "DataImportsUI.c" +#line 2692 "DataImportsUI.c" } else { #line 451 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_set_standard_window_mode (self); -#line 2579 "DataImportsUI.c" +#line 2696 "DataImportsUI.c" } } #line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp14_ = geometry_options; + _tmp11_ = geometry_options; #line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - if ((_tmp14_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) { + if ((_tmp11_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) { #line 454 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (self); -#line 2588 "DataImportsUI.c" +#line 2705 "DataImportsUI.c" } else { #line 456 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_clear_free_sizable_window_mode (self); -#line 2592 "DataImportsUI.c" +#line 2709 "DataImportsUI.c" } #line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp15_ = pane; -#line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp16_ = _g_object_ref0 (_tmp15_); + _tmp12_ = _g_object_ref0 (pane); #line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" _g_object_unref0 (self->priv->active_pane); #line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - self->priv->active_pane = _tmp16_; -#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - _tmp17_ = pane; + self->priv->active_pane = _tmp12_; #line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" - spit_data_imports_dialog_pane_on_pane_installed (_tmp17_); -#line 2606 "DataImportsUI.c" + spit_data_imports_dialog_pane_on_pane_installed (pane); +#line 2719 "DataImportsUI.c" } -static void data_imports_ui_data_imports_dialog_class_init (DataImportsUIDataImportsDialogClass * klass) { +static void +data_imports_ui_data_imports_dialog_class_init (DataImportsUIDataImportsDialogClass * klass) +{ #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" data_imports_ui_data_imports_dialog_parent_class = g_type_class_peek_parent (klass); #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" g_type_class_add_private (klass, sizeof (DataImportsUIDataImportsDialogPrivate)); #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" G_OBJECT_CLASS (klass)->finalize = data_imports_ui_data_imports_dialog_finalize; -#line 2617 "DataImportsUI.c" +#line 2732 "DataImportsUI.c" } -static void data_imports_ui_data_imports_dialog_instance_init (DataImportsUIDataImportsDialog * self) { +static void +data_imports_ui_data_imports_dialog_instance_init (DataImportsUIDataImportsDialog * self) +{ #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" self->priv = DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_GET_PRIVATE (self); -#line 2624 "DataImportsUI.c" +#line 2741 "DataImportsUI.c" } -static void data_imports_ui_data_imports_dialog_finalize (GObject * obj) { +static void +data_imports_ui_data_imports_dialog_finalize (GObject * obj) +{ DataImportsUIDataImportsDialog * self; #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_UI_TYPE_DATA_IMPORTS_DIALOG, DataImportsUIDataImportsDialog); @@ -2648,11 +2767,13 @@ static void data_imports_ui_data_imports_dialog_finalize (GObject * obj) { _g_object_unref0 (self->priv->host); #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala" G_OBJECT_CLASS (data_imports_ui_data_imports_dialog_parent_class)->finalize (obj); -#line 2644 "DataImportsUI.c" +#line 2763 "DataImportsUI.c" } -GType data_imports_ui_data_imports_dialog_get_type (void) { +GType +data_imports_ui_data_imports_dialog_get_type (void) +{ static volatile gsize data_imports_ui_data_imports_dialog_type_id__volatile = 0; if (g_once_init_enter (&data_imports_ui_data_imports_dialog_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DataImportsUIDataImportsDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_ui_data_imports_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsUIDataImportsDialog), 0, (GInstanceInitFunc) data_imports_ui_data_imports_dialog_instance_init, NULL }; @@ -2664,7 +2785,11 @@ GType data_imports_ui_data_imports_dialog_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -2676,7 +2801,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/db/DatabaseTable.c b/src/db/DatabaseTable.c index 8d595f0..4c1b44e 100644 --- a/src/db/DatabaseTable.c +++ b/src/db/DatabaseTable.c @@ -1,4 +1,4 @@ -/* DatabaseTable.c generated by valac 0.36.6, the Vala compiler +/* DatabaseTable.c generated by valac 0.40.4, the Vala compiler * generated from DatabaseTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -73,41 +74,87 @@ static gint database_table_in_transaction = 0; GQuark database_error_quark (void); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; -enum { - DATABASE_TABLE_DUMMY_PROPERTY -}; #define DATABASE_TABLE_SCHEMA_VERSION 20 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); +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_warning (const gchar* op, + gint res); void database_table_terminate (void); -void database_table_fatal (const gchar* op, gint res); -void database_table_set_table_name (DatabaseTable* self, const gchar* table_name); -void database_table_throw_error (const gchar* method, gint res, GError** error); -gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id); -gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt* * stmt); -static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id, const gchar* column, sqlite3_stmt* * stmt); -static gboolean database_table_execute_update_by_id (DatabaseTable* self, sqlite3_stmt* stmt); -gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text); -void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error); -gboolean database_table_update_int_by_id (DatabaseTable* self, gint64 id, const gchar* column, gint value); -void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint value, GError** error); -gboolean database_table_update_int64_by_id (DatabaseTable* self, gint64 id, const gchar* column, gint64 value); -void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint64 value, GError** error); -void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error); -gboolean database_table_has_column (const gchar* table_name, const gchar* column_name); +void database_table_fatal (const gchar* op, + gint res); +void database_table_set_table_name (DatabaseTable* self, + const gchar* table_name); +void database_table_throw_error (const gchar* method, + gint res, + GError** error); +gboolean database_table_exists_by_id (DatabaseTable* self, + gint64 id); +gboolean database_table_select_by_id (DatabaseTable* self, + gint64 id, + const gchar* columns, + sqlite3_stmt* * stmt); +static void database_table_prepare_update_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + sqlite3_stmt* * stmt); +static gboolean database_table_execute_update_by_id (DatabaseTable* self, + sqlite3_stmt* stmt); +gboolean database_table_update_text_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text); +void database_table_update_text_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text, + GError** error); +gboolean database_table_update_int_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + gint value); +void database_table_update_int_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + gint value, + GError** error); +gboolean database_table_update_int64_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + gint64 value); +void database_table_update_int64_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + gint64 value, + GError** error); +void database_table_delete_by_id (DatabaseTable* self, + gint64 id, + GError** error); +gboolean database_table_has_column (const gchar* table_name, + const gchar* column_name); gboolean database_table_has_table (const gchar* table_name); -gboolean database_table_add_column (const gchar* table_name, const gchar* column_name, const gchar* column_constraints); -gboolean database_table_ensure_column (const gchar* table_name, const gchar* column_name, const gchar* column_constraints, const gchar* upgrade_msg); +gboolean database_table_add_column (const gchar* table_name, + const gchar* column_name, + const gchar* column_constraints); +gboolean database_table_ensure_column (const gchar* table_name, + const gchar* column_name, + const gchar* column_constraints, + const gchar* upgrade_msg); gint database_table_get_row_count (DatabaseTable* self); void database_table_begin_transaction (void); void database_table_commit_transaction (GError** error); @@ -115,156 +162,142 @@ DatabaseTable* database_table_construct (GType object_type); static void database_table_finalize (DatabaseTable * obj); -GQuark database_error_quark (void) { +GQuark +database_error_quark (void) +{ return g_quark_from_static_string ("database_error-quark"); } -static void _database_table_on_trace_sqlite_trace_callback (gpointer self, const gchar* message) { +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" +#line 179 "DatabaseTable.c" } -static void database_table_prepare_db (const gchar* filename) { +static void +database_table_prepare_db (const gchar* filename) +{ gint res = 0; - const gchar* _tmp0_; - sqlite3* _tmp1_ = NULL; + sqlite3* _tmp0_ = NULL; + gint _tmp1_; gint _tmp2_; - gint _tmp3_; - const gchar* _tmp8_; const gchar* sql_debug = NULL; - const gchar* _tmp23_; - gboolean _tmp24_ = FALSE; - const gchar* _tmp25_; + const gchar* _tmp16_; + gboolean _tmp17_ = FALSE; + const gchar* _tmp18_; GError * _inner_error_ = NULL; #line 32 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (filename != NULL); #line 34 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = filename; -#line 34 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = sqlite3_open_v2 (_tmp0_, &_tmp1_, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL); + _tmp1_ = sqlite3_open_v2 (filename, &_tmp0_, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL); #line 34 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_close0 (database_table_db); #line 34 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_db = _tmp1_; + database_table_db = _tmp0_; #line 34 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp2_; + res = _tmp1_; #line 36 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = res; + _tmp2_ = res; #line 36 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp3_ != SQLITE_OK) { -#line 159 "DatabaseTable.c" - const gchar* _tmp4_; - gint _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; -#line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = filename; + if (_tmp2_ != SQLITE_OK) { +#line 209 "DatabaseTable.c" + gint _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = res; + _tmp3_ = res; #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = g_strdup_printf (_ ("Unable to open/create photo database %s: error code %d"), _tmp4_, _tmp5_); + _tmp4_ = g_strdup_printf (_ ("Unable to open/create photo database %s: error code %d"), filename, _tmp3_); #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - app_window_panic (_tmp7_); + app_window_panic (_tmp5_); #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp7_); -#line 176 "DatabaseTable.c" + _g_free0 (_tmp5_); +#line 223 "DatabaseTable.c" } #line 41 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = filename; -#line 41 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (g_strcmp0 (_tmp8_, DB_IN_MEMORY_NAME) != 0) { -#line 182 "DatabaseTable.c" + if (g_strcmp0 (filename, DB_IN_MEMORY_NAME) != 0) { +#line 227 "DatabaseTable.c" { GFile* file_db = NULL; - const gchar* _tmp9_; - GFile* _tmp10_; + GFile* _tmp6_; GFileInfo* info = NULL; - GFile* _tmp11_; - GFileInfo* _tmp12_; - GFileInfo* _tmp13_; - gboolean _tmp14_; -#line 43 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = filename; + GFile* _tmp7_; + GFileInfo* _tmp8_; + GFileInfo* _tmp9_; #line 43 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = g_file_new_for_path (_tmp9_); + _tmp6_ = g_file_new_for_path (filename); #line 43 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - file_db = _tmp10_; + file_db = _tmp6_; #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = file_db; + _tmp7_ = file_db; #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = g_file_query_info (_tmp11_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); + _tmp8_ = g_file_query_info (_tmp7_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - info = _tmp12_; + info = _tmp8_; #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (file_db); -#line 208 "DatabaseTable.c" +#line 249 "DatabaseTable.c" goto __catch15_g_error; } #line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = info; + _tmp9_ = info; #line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = g_file_info_get_attribute_boolean (_tmp13_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE); -#line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (!_tmp14_) { -#line 217 "DatabaseTable.c" - const gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; -#line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = filename; + if (!g_file_info_get_attribute_boolean (_tmp9_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE)) { +#line 256 "DatabaseTable.c" + gchar* _tmp10_; + gchar* _tmp11_; #line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = g_strdup_printf (_ ("Unable to write to photo database file:\n %s"), _tmp15_); + _tmp10_ = g_strdup_printf (_ ("Unable to write to photo database file:\n %s"), filename); #line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp17_ = _tmp16_; + _tmp11_ = _tmp10_; #line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - app_window_panic (_tmp17_); + app_window_panic (_tmp11_); #line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp17_); -#line 231 "DatabaseTable.c" + _g_free0 (_tmp11_); +#line 267 "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 237 "DatabaseTable.c" +#line 273 "DatabaseTable.c" } goto __finally15; __catch15_g_error: { GError* e = NULL; - const gchar* _tmp18_; - GError* _tmp19_; - const gchar* _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; + GError* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" e = _inner_error_; #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _inner_error_ = NULL; #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp18_ = filename; -#line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp19_ = e; + _tmp12_ = e; #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp20_ = _tmp19_->message; + _tmp13_ = _tmp12_->message; #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp21_ = g_strdup_printf (_ ("Error accessing database file:\n %s\n\nError was: \n%s"), _tmp18_, _tmp20_); + _tmp14_ = g_strdup_printf (_ ("Error accessing database file:\n %s\n\nError was: \n%s"), filename, _tmp13_); #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp22_ = _tmp21_; + _tmp15_ = _tmp14_; #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - app_window_panic (_tmp22_); + app_window_panic (_tmp15_); #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp15_); #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_error_free0 (e); -#line 268 "DatabaseTable.c" +#line 301 "DatabaseTable.c" } __finally15: #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -275,239 +308,225 @@ 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 279 "DatabaseTable.c" +#line 312 "DatabaseTable.c" } } #line 53 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp23_ = g_getenv ("SHOTWELL_SQL_DEBUG"); + _tmp16_ = g_getenv ("SHOTWELL_SQL_DEBUG"); #line 53 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - sql_debug = _tmp23_; + sql_debug = _tmp16_; #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp25_ = sql_debug; + _tmp18_ = sql_debug; #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp25_ != NULL) { -#line 290 "DatabaseTable.c" - const gchar* _tmp26_; + if (_tmp18_ != NULL) { +#line 323 "DatabaseTable.c" + const gchar* _tmp19_; #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp26_ = sql_debug; + _tmp19_ = sql_debug; #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp24_ = g_strcmp0 (_tmp26_, "") != 0; -#line 296 "DatabaseTable.c" + _tmp17_ = g_strcmp0 (_tmp19_, "") != 0; +#line 329 "DatabaseTable.c" } else { #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp24_ = FALSE; -#line 300 "DatabaseTable.c" + _tmp17_ = FALSE; +#line 333 "DatabaseTable.c" } #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp24_) { -#line 304 "DatabaseTable.c" - sqlite3* _tmp27_; + if (_tmp17_) { +#line 337 "DatabaseTable.c" + sqlite3* _tmp20_; #line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp27_ = database_table_db; + _tmp20_ = database_table_db; #line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - sqlite3_trace (_tmp27_, _database_table_on_trace_sqlite_trace_callback, NULL); -#line 310 "DatabaseTable.c" + sqlite3_trace (_tmp20_, _database_table_on_trace_sqlite_trace_callback, NULL); +#line 343 "DatabaseTable.c" } } -void database_table_on_trace (const gchar* message) { - const gchar* _tmp0_; +void +database_table_on_trace (const gchar* message) +{ #line 61 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (message != NULL); #line 62 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = message; -#line 62 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - g_debug ("DatabaseTable.vala:62: SQLITE: %s", _tmp0_); -#line 323 "DatabaseTable.c" + g_debug ("DatabaseTable.vala:62: SQLITE: %s", message); +#line 355 "DatabaseTable.c" } -static gint _sqlite3_exec (sqlite3* self, const gchar* sql, sqlite3_callback callback, void* callback_target, gchar* * errmsg) { +static gint +_sqlite3_exec (sqlite3* self, + const gchar* sql, + sqlite3_callback callback, + void* callback_target, + gchar* * errmsg) +{ gchar* _vala_errmsg = NULL; gint result = 0; const gchar* sqlite_errmsg = NULL; gint ec = 0; - const gchar* _tmp0_; - sqlite3_callback _tmp1_; - void* _tmp1__target; - const gchar* _tmp2_ = NULL; - gint _tmp3_; - const gchar* _tmp6_; -#line 34 "/usr/share/vala-0.36/vapi/sqlite3.vapi" + const gchar* _tmp0_ = NULL; + gint _tmp1_; + const gchar* _tmp4_; +#line 34 "/usr/share/vala-0.40/vapi/sqlite3.vapi" g_return_val_if_fail (self != NULL, 0); -#line 34 "/usr/share/vala-0.36/vapi/sqlite3.vapi" +#line 34 "/usr/share/vala-0.40/vapi/sqlite3.vapi" g_return_val_if_fail (sql != NULL, 0); -#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - _tmp0_ = sql; -#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - _tmp1_ = callback; -#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - _tmp1__target = callback_target; -#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - _tmp3_ = sqlite3_exec (self, _tmp0_, _tmp1_, _tmp1__target, (char**) (&_tmp2_)); -#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - sqlite_errmsg = _tmp2_; -#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - ec = _tmp3_; -#line 37 "/usr/share/vala-0.36/vapi/sqlite3.vapi" +#line 36 "/usr/share/vala-0.40/vapi/sqlite3.vapi" + _tmp1_ = sqlite3_exec (self, sql, callback, callback_target, (char**) (&_tmp0_)); +#line 36 "/usr/share/vala-0.40/vapi/sqlite3.vapi" + sqlite_errmsg = _tmp0_; +#line 36 "/usr/share/vala-0.40/vapi/sqlite3.vapi" + ec = _tmp1_; +#line 37 "/usr/share/vala-0.40/vapi/sqlite3.vapi" if ((&_vala_errmsg) != NULL) { -#line 356 "DatabaseTable.c" - const gchar* _tmp4_; - gchar* _tmp5_; -#line 38 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - _tmp4_ = sqlite_errmsg; -#line 38 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - _tmp5_ = g_strdup (_tmp4_); -#line 38 "/usr/share/vala-0.36/vapi/sqlite3.vapi" +#line 385 "DatabaseTable.c" + const gchar* _tmp2_; + gchar* _tmp3_; +#line 38 "/usr/share/vala-0.40/vapi/sqlite3.vapi" + _tmp2_ = sqlite_errmsg; +#line 38 "/usr/share/vala-0.40/vapi/sqlite3.vapi" + _tmp3_ = g_strdup (_tmp2_); +#line 38 "/usr/share/vala-0.40/vapi/sqlite3.vapi" _g_free0 (_vala_errmsg); -#line 38 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - _vala_errmsg = _tmp5_; -#line 367 "DatabaseTable.c" +#line 38 "/usr/share/vala-0.40/vapi/sqlite3.vapi" + _vala_errmsg = _tmp3_; +#line 396 "DatabaseTable.c" } -#line 40 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - _tmp6_ = sqlite_errmsg; -#line 40 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - sqlite3_free ((void*) _tmp6_); -#line 41 "/usr/share/vala-0.36/vapi/sqlite3.vapi" +#line 40 "/usr/share/vala-0.40/vapi/sqlite3.vapi" + _tmp4_ = sqlite_errmsg; +#line 40 "/usr/share/vala-0.40/vapi/sqlite3.vapi" + sqlite3_free ((void*) _tmp4_); +#line 41 "/usr/share/vala-0.40/vapi/sqlite3.vapi" result = ec; -#line 41 "/usr/share/vala-0.36/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.40/vapi/sqlite3.vapi" if (errmsg) { -#line 41 "/usr/share/vala-0.36/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.40/vapi/sqlite3.vapi" *errmsg = _vala_errmsg; -#line 379 "DatabaseTable.c" +#line 408 "DatabaseTable.c" } else { -#line 41 "/usr/share/vala-0.36/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.40/vapi/sqlite3.vapi" _g_free0 (_vala_errmsg); -#line 383 "DatabaseTable.c" +#line 412 "DatabaseTable.c" } -#line 41 "/usr/share/vala-0.36/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.40/vapi/sqlite3.vapi" return result; -#line 387 "DatabaseTable.c" +#line 416 "DatabaseTable.c" } -void database_table_init (const gchar* filename) { - const gchar* _tmp0_; +void +database_table_init (const gchar* filename) +{ sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp1_; - sqlite3_stmt* _tmp2_ = NULL; + sqlite3* _tmp0_; + sqlite3_stmt* _tmp1_ = NULL; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; - sqlite3* _tmp18_; - gint _tmp19_; - gint _tmp20_; + sqlite3* _tmp14_; + gint _tmp15_; + gint _tmp16_; GError * _inner_error_ = NULL; #line 65 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (filename != NULL); #line 67 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = filename; -#line 67 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_prepare_db (_tmp0_); + database_table_prepare_db (filename); #line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = database_table_db; + _tmp0_ = database_table_db; #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); + _tmp2_ = sqlite3_prepare_v2 (_tmp0_, "CREATE TABLE IF NOT EXISTS VersionTable (" "id INTEGER PRIMARY KEY, " "schema_version INTEGER, " "app_version TEXT, " "user_data TEXT NULL" ")", -1, &_tmp1_, NULL); #line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - stmt = _tmp2_; + stmt = _tmp1_; #line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp3_; + res = _tmp2_; #line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = res; + _tmp3_ = res; #line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp4_ != SQLITE_OK) { -#line 423 "DatabaseTable.c" + if (_tmp3_ != SQLITE_OK) { +#line 451 "DatabaseTable.c" gchar* backup_path = NULL; - const gchar* _tmp5_; - gchar* _tmp6_; + gchar* _tmp4_; #line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_close0 (database_table_db); #line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" database_table_db = NULL; #line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = filename; -#line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = g_strconcat (_tmp5_, ".bak", NULL); + _tmp4_ = g_strconcat (filename, ".bak", NULL); #line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - backup_path = _tmp6_; -#line 437 "DatabaseTable.c" + backup_path = _tmp4_; +#line 462 "DatabaseTable.c" { GFile* src = NULL; - const gchar* _tmp7_; - GFile* _tmp8_; + const gchar* _tmp5_; + GFile* _tmp6_; GFile* dest = NULL; - const gchar* _tmp9_; - GFile* _tmp10_; - GFile* _tmp11_; - GFile* _tmp12_; - const gchar* _tmp13_; + GFile* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; #line 85 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = backup_path; + _tmp5_ = backup_path; #line 85 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = g_file_new_for_commandline_arg (_tmp7_); + _tmp6_ = g_file_new_for_commandline_arg (_tmp5_); #line 85 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - src = _tmp8_; -#line 86 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = filename; + src = _tmp6_; #line 86 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = g_file_new_for_commandline_arg (_tmp9_); + _tmp7_ = g_file_new_for_commandline_arg (filename); #line 86 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - dest = _tmp10_; + dest = _tmp7_; #line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = src; + _tmp8_ = src; #line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = dest; + _tmp9_ = dest; #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_); + g_file_copy (_tmp8_, _tmp9_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &_inner_error_); #line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (dest); #line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (src); -#line 472 "DatabaseTable.c" +#line 493 "DatabaseTable.c" goto __catch16_g_error; } #line 90 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = filename; -#line 90 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_prepare_db (_tmp13_); + database_table_prepare_db (filename); #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (dest); #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (src); -#line 483 "DatabaseTable.c" +#line 502 "DatabaseTable.c" } goto __finally16; __catch16_g_error: { GError* _error_ = NULL; - GError* _tmp14_; - const gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; + GError* _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _error_ = _inner_error_; #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _inner_error_ = NULL; #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = _error_; + _tmp10_ = _error_; #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = _tmp14_->message; + _tmp11_ = _tmp10_->message; #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = g_strdup_printf (_ ("Unable to restore photo database %s"), _tmp15_); + _tmp12_ = g_strdup_printf (_ ("Unable to restore photo database %s"), _tmp11_); #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp17_ = _tmp16_; + _tmp13_ = _tmp12_; #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - app_window_panic (_tmp17_); + app_window_panic (_tmp13_); #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp13_); #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_error_free0 (_error_); -#line 511 "DatabaseTable.c" +#line 530 "DatabaseTable.c" } __finally16: #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -522,146 +541,137 @@ void database_table_init (const gchar* filename) { g_clear_error (&_inner_error_); #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 526 "DatabaseTable.c" +#line 545 "DatabaseTable.c" } #line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (backup_path); -#line 530 "DatabaseTable.c" +#line 549 "DatabaseTable.c" } #line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp18_ = database_table_db; + _tmp14_ = database_table_db; #line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp19_ = _sqlite3_exec (_tmp18_, "PRAGMA synchronous=OFF", NULL, NULL, NULL); + _tmp15_ = _sqlite3_exec (_tmp14_, "PRAGMA synchronous=OFF", NULL, NULL, NULL); #line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp19_; + res = _tmp15_; #line 99 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp20_ = res; + _tmp16_ = res; #line 99 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp20_ != SQLITE_OK) { -#line 542 "DatabaseTable.c" - gint _tmp21_; + if (_tmp16_ != SQLITE_OK) { +#line 561 "DatabaseTable.c" + gint _tmp17_; #line 100 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp21_ = res; + _tmp17_ = res; #line 100 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_warning ("Unable to disable synchronous mode", _tmp21_); -#line 548 "DatabaseTable.c" + database_table_warning ("Unable to disable synchronous mode", _tmp17_); +#line 567 "DatabaseTable.c" } #line 65 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); -#line 552 "DatabaseTable.c" +#line 571 "DatabaseTable.c" } -void database_table_terminate (void) { +void +database_table_terminate (void) +{ #line 105 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_close0 (database_table_db); #line 105 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" database_table_db = NULL; -#line 561 "DatabaseTable.c" +#line 582 "DatabaseTable.c" } -void database_table_fatal (const gchar* op, gint res) { - const gchar* _tmp0_; - gint _tmp1_; - sqlite3* _tmp2_; - const gchar* _tmp3_; +void +database_table_fatal (const gchar* op, + gint res) +{ + sqlite3* _tmp0_; + const gchar* _tmp1_; #line 109 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (op != NULL); #line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = op; -#line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = res; -#line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = database_table_db; + _tmp0_ = database_table_db; #line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = sqlite3_errmsg (_tmp2_); + _tmp1_ = sqlite3_errmsg (_tmp0_); #line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - g_error ("DatabaseTable.vala:110: %s: [%d] %s", _tmp0_, _tmp1_, _tmp3_); -#line 582 "DatabaseTable.c" + g_error ("DatabaseTable.vala:110: %s: [%d] %s", op, res, _tmp1_); +#line 600 "DatabaseTable.c" } -void database_table_warning (const gchar* op, gint res) { - const gchar* _tmp0_; - gint _tmp1_; - sqlite3* _tmp2_; - const gchar* _tmp3_; +void +database_table_warning (const gchar* op, + gint res) +{ + sqlite3* _tmp0_; + const gchar* _tmp1_; #line 114 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (op != NULL); #line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = op; -#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = res; -#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = database_table_db; + _tmp0_ = database_table_db; #line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = sqlite3_errmsg (_tmp2_); + _tmp1_ = sqlite3_errmsg (_tmp0_); #line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - g_warning ("DatabaseTable.vala:115: %s: [%d] %s", _tmp0_, _tmp1_, _tmp3_); -#line 603 "DatabaseTable.c" + g_warning ("DatabaseTable.vala:115: %s: [%d] %s", op, res, _tmp1_); +#line 618 "DatabaseTable.c" } -void database_table_set_table_name (DatabaseTable* self, const gchar* table_name) { - const gchar* _tmp0_; - gchar* _tmp1_; +void +database_table_set_table_name (DatabaseTable* self, + const gchar* table_name) +{ + gchar* _tmp0_; #line 118 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (IS_DATABASE_TABLE (self)); #line 118 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (table_name != NULL); #line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = table_name; -#line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (table_name); #line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (self->table_name); #line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - self->table_name = _tmp1_; -#line 622 "DatabaseTable.c" + self->table_name = _tmp0_; +#line 637 "DatabaseTable.c" } -void database_table_throw_error (const gchar* method, gint res, GError** error) { +void +database_table_throw_error (const gchar* method, + gint res, + GError** error) +{ gchar* msg = NULL; - const gchar* _tmp0_; - gint _tmp1_; - sqlite3* _tmp2_; - const gchar* _tmp3_; - gchar* _tmp4_; - gint _tmp5_; + sqlite3* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; GError * _inner_error_ = NULL; #line 124 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (method != NULL); #line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = method; -#line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = res; -#line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = database_table_db; + _tmp0_ = database_table_db; #line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = sqlite3_errmsg (_tmp2_); + _tmp1_ = sqlite3_errmsg (_tmp0_); #line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = g_strdup_printf ("(%s) [%d] - %s", _tmp0_, _tmp1_, _tmp3_); + _tmp2_ = g_strdup_printf ("(%s) [%d] - %s", method, res, _tmp1_); #line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - msg = _tmp4_; + msg = _tmp2_; #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = res; -#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - switch (_tmp5_) { + switch (res) { #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_OK: #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_DONE: #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_ROW: -#line 659 "DatabaseTable.c" +#line 669 "DatabaseTable.c" { #line 131 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); #line 131 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 665 "DatabaseTable.c" +#line 675 "DatabaseTable.c" } #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_PERM: @@ -683,16 +693,16 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) case SQLITE_FORMAT: #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_NOTADB: -#line 687 "DatabaseTable.c" +#line 697 "DatabaseTable.c" { - const gchar* _tmp6_; - GError* _tmp7_; + const gchar* _tmp3_; + GError* _tmp4_; #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = msg; + _tmp3_ = msg; #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_BACKING, _tmp6_); + _tmp4_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_BACKING, _tmp3_); #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _inner_error_ = _tmp7_; + _inner_error_ = _tmp4_; #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -701,7 +711,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) _g_free0 (msg); #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 705 "DatabaseTable.c" +#line 715 "DatabaseTable.c" } else { #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); @@ -711,21 +721,21 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) g_clear_error (&_inner_error_); #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 715 "DatabaseTable.c" +#line 725 "DatabaseTable.c" } } #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_NOMEM: -#line 720 "DatabaseTable.c" +#line 730 "DatabaseTable.c" { - const gchar* _tmp8_; - GError* _tmp9_; + const gchar* _tmp5_; + GError* _tmp6_; #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = msg; + _tmp5_ = msg; #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_MEMORY, _tmp8_); + _tmp6_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_MEMORY, _tmp5_); #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _inner_error_ = _tmp9_; + _inner_error_ = _tmp6_; #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -734,7 +744,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) _g_free0 (msg); #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 738 "DatabaseTable.c" +#line 748 "DatabaseTable.c" } else { #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); @@ -744,7 +754,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) g_clear_error (&_inner_error_); #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 748 "DatabaseTable.c" +#line 758 "DatabaseTable.c" } } #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -753,16 +763,16 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) case SQLITE_LOCKED: #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_INTERRUPT: -#line 757 "DatabaseTable.c" +#line 767 "DatabaseTable.c" { - const gchar* _tmp10_; - GError* _tmp11_; + const gchar* _tmp7_; + GError* _tmp8_; #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = msg; + _tmp7_ = msg; #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_ABORT, _tmp10_); + _tmp8_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_ABORT, _tmp7_); #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _inner_error_ = _tmp11_; + _inner_error_ = _tmp8_; #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -771,7 +781,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) _g_free0 (msg); #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 775 "DatabaseTable.c" +#line 785 "DatabaseTable.c" } else { #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); @@ -781,7 +791,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) g_clear_error (&_inner_error_); #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 785 "DatabaseTable.c" +#line 795 "DatabaseTable.c" } } #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -794,16 +804,16 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) case SQLITE_CONSTRAINT: #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_RANGE: -#line 798 "DatabaseTable.c" +#line 808 "DatabaseTable.c" { - const gchar* _tmp12_; - GError* _tmp13_; + const gchar* _tmp9_; + GError* _tmp10_; #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = msg; + _tmp9_ = msg; #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_LIMITS, _tmp12_); + _tmp10_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_LIMITS, _tmp9_); #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _inner_error_ = _tmp13_; + _inner_error_ = _tmp10_; #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -812,7 +822,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) _g_free0 (msg); #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 816 "DatabaseTable.c" +#line 826 "DatabaseTable.c" } else { #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); @@ -822,23 +832,23 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) g_clear_error (&_inner_error_); #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 826 "DatabaseTable.c" +#line 836 "DatabaseTable.c" } } #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_SCHEMA: #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_MISMATCH: -#line 833 "DatabaseTable.c" +#line 843 "DatabaseTable.c" { - const gchar* _tmp14_; - GError* _tmp15_; + const gchar* _tmp11_; + GError* _tmp12_; #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = msg; + _tmp11_ = msg; #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_TYPESPEC, _tmp14_); + _tmp12_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_TYPESPEC, _tmp11_); #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _inner_error_ = _tmp15_; + _inner_error_ = _tmp12_; #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -847,7 +857,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) _g_free0 (msg); #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 851 "DatabaseTable.c" +#line 861 "DatabaseTable.c" } else { #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); @@ -857,7 +867,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) g_clear_error (&_inner_error_); #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 861 "DatabaseTable.c" +#line 871 "DatabaseTable.c" } } default: @@ -867,16 +877,16 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) case SQLITE_INTERNAL: #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_MISUSE: -#line 871 "DatabaseTable.c" +#line 881 "DatabaseTable.c" { - const gchar* _tmp16_; - GError* _tmp17_; + const gchar* _tmp13_; + GError* _tmp14_; #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = msg; + _tmp13_ = msg; #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp17_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_ERROR, _tmp16_); + _tmp14_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_ERROR, _tmp13_); #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _inner_error_ = _tmp17_; + _inner_error_ = _tmp14_; #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -885,7 +895,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) _g_free0 (msg); #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 889 "DatabaseTable.c" +#line 899 "DatabaseTable.c" } else { #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); @@ -895,17 +905,20 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) g_clear_error (&_inner_error_); #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 899 "DatabaseTable.c" +#line 909 "DatabaseTable.c" } } } #line 124 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); -#line 905 "DatabaseTable.c" +#line 915 "DatabaseTable.c" } -gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) { +gboolean +database_table_exists_by_id (DatabaseTable* self, + gint64 id) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -918,14 +931,11 @@ gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) { gint _tmp6_; gint _tmp7_; sqlite3_stmt* _tmp8_; - gint64 _tmp9_; - gint _tmp10_; - gint _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; - gboolean _tmp14_ = FALSE; - gint _tmp15_; - gint _tmp24_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + gboolean _tmp11_ = FALSE; + gint _tmp12_; + gint _tmp20_; #line 172 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE); #line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -955,236 +965,216 @@ gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) { #line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp8_ = stmt; #line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = id; -#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = sqlite3_bind_int64 (_tmp8_, 1, _tmp9_); -#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp10_; + res = sqlite3_bind_int64 (_tmp8_, 1, id); #line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = stmt; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = sqlite3_step (_tmp12_); + _tmp10_ = stmt; #line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp13_; + res = sqlite3_step (_tmp10_); #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = res; + _tmp12_ = res; #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp15_ != SQLITE_ROW) { -#line 978 "DatabaseTable.c" - gint _tmp16_; + if (_tmp12_ != SQLITE_ROW) { +#line 982 "DatabaseTable.c" + gint _tmp13_; #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = res; + _tmp13_ = res; #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = _tmp16_ != SQLITE_DONE; -#line 984 "DatabaseTable.c" + _tmp11_ = _tmp13_ != SQLITE_DONE; +#line 988 "DatabaseTable.c" } else { #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = FALSE; -#line 988 "DatabaseTable.c" + _tmp11_ = FALSE; +#line 992 "DatabaseTable.c" } #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp14_) { -#line 992 "DatabaseTable.c" - gint64 _tmp17_; + if (_tmp11_) { +#line 996 "DatabaseTable.c" + gchar* _tmp14_; + gchar* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; gchar* _tmp18_; - gchar* _tmp19_; - const gchar* _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; - gint _tmp23_; -#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp17_ = id; + gint _tmp19_; #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp18_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp17_); + _tmp14_ = g_strdup_printf ("%" G_GINT64_FORMAT, id); #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp19_ = _tmp18_; + _tmp15_ = _tmp14_; #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp20_ = self->table_name; + _tmp16_ = self->table_name; #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp21_ = g_strdup_printf ("exists_by_id [%s] %s", _tmp19_, _tmp20_); + _tmp17_ = g_strdup_printf ("exists_by_id [%s] %s", _tmp15_, _tmp16_); #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp22_ = _tmp21_; + _tmp18_ = _tmp17_; #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp23_ = res; + _tmp19_ = res; #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_fatal (_tmp22_, _tmp23_); + database_table_fatal (_tmp18_, _tmp19_); #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp18_); #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp19_); -#line 1020 "DatabaseTable.c" + _g_free0 (_tmp15_); +#line 1021 "DatabaseTable.c" } #line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp24_ = res; + _tmp20_ = res; #line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - result = _tmp24_ == SQLITE_ROW; + result = _tmp20_ == SQLITE_ROW; #line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1030 "DatabaseTable.c" +#line 1031 "DatabaseTable.c" } -gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt* * stmt) { +gboolean +database_table_select_by_id (DatabaseTable* self, + gint64 id, + const gchar* columns, + sqlite3_stmt* * stmt) +{ sqlite3_stmt* _vala_stmt = NULL; gboolean result = FALSE; gchar* sql = NULL; const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp1_; gint res = 0; - sqlite3* _tmp3_; - const gchar* _tmp4_; - sqlite3_stmt* _tmp5_ = NULL; + sqlite3* _tmp2_; + const gchar* _tmp3_; + sqlite3_stmt* _tmp4_ = NULL; + gint _tmp5_; gint _tmp6_; - gint _tmp7_; - sqlite3_stmt* _tmp8_; - gint64 _tmp9_; - gint _tmp10_; + sqlite3_stmt* _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + gboolean _tmp10_ = FALSE; gint _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; - gboolean _tmp14_ = FALSE; - gint _tmp15_; - gint _tmp25_; + gint _tmp19_; #line 187 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE); #line 187 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (columns != NULL, FALSE); #line 188 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = columns; -#line 188 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = self->table_name; + _tmp0_ = self->table_name; #line 188 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = g_strdup_printf ("SELECT %s FROM %s WHERE id=?", _tmp0_, _tmp1_); + _tmp1_ = g_strdup_printf ("SELECT %s FROM %s WHERE id=?", columns, _tmp0_); #line 188 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - sql = _tmp2_; + sql = _tmp1_; #line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = database_table_db; + _tmp2_ = database_table_db; #line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = sql; + _tmp3_ = sql; #line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = sqlite3_prepare_v2 (_tmp3_, _tmp4_, -1, &_tmp5_, NULL); + _tmp5_ = sqlite3_prepare_v2 (_tmp2_, _tmp3_, -1, &_tmp4_, NULL); #line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (_vala_stmt); #line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_stmt = _tmp5_; + _vala_stmt = _tmp4_; #line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp6_; + res = _tmp5_; #line 191 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 191 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); -#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = _vala_stmt; -#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = id; + _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); #line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = sqlite3_bind_int64 (_tmp8_, 1, _tmp9_); + _tmp7_ = _vala_stmt; #line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp10_; + res = sqlite3_bind_int64 (_tmp7_, 1, id); #line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = res; + _tmp8_ = res; #line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = _vala_stmt; + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = sqlite3_step (_tmp12_); + _tmp9_ = _vala_stmt; #line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp13_; + res = sqlite3_step (_tmp9_); #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = res; + _tmp11_ = res; #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp15_ != SQLITE_ROW) { -#line 1106 "DatabaseTable.c" - gint _tmp16_; + if (_tmp11_ != SQLITE_ROW) { +#line 1100 "DatabaseTable.c" + gint _tmp12_; #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = res; + _tmp12_ = res; #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = _tmp16_ != SQLITE_DONE; -#line 1112 "DatabaseTable.c" + _tmp10_ = _tmp12_ != SQLITE_DONE; +#line 1106 "DatabaseTable.c" } else { #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = FALSE; -#line 1116 "DatabaseTable.c" + _tmp10_ = FALSE; +#line 1110 "DatabaseTable.c" } #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp14_) { -#line 1120 "DatabaseTable.c" - gint64 _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; - const gchar* _tmp20_; - const gchar* _tmp21_; - gchar* _tmp22_; - gchar* _tmp23_; - gint _tmp24_; -#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp17_ = id; -#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp18_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp17_); + if (_tmp10_) { +#line 1114 "DatabaseTable.c" + gchar* _tmp13_; + gchar* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gint _tmp18_; #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp19_ = _tmp18_; + _tmp13_ = g_strdup_printf ("%" G_GINT64_FORMAT, id); #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp20_ = self->table_name; + _tmp14_ = _tmp13_; #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp21_ = columns; + _tmp15_ = self->table_name; #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp22_ = g_strdup_printf ("select_by_id [%s] %s %s", _tmp19_, _tmp20_, _tmp21_); + _tmp16_ = g_strdup_printf ("select_by_id [%s] %s %s", _tmp14_, _tmp15_, columns); #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp23_ = _tmp22_; + _tmp17_ = _tmp16_; #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp24_ = res; + _tmp18_ = res; #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_fatal (_tmp23_, _tmp24_); + database_table_fatal (_tmp17_, _tmp18_); #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp23_); + _g_free0 (_tmp17_); #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp19_); -#line 1151 "DatabaseTable.c" + _g_free0 (_tmp14_); +#line 1139 "DatabaseTable.c" } #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp25_ = res; + _tmp19_ = res; #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - result = _tmp25_ == SQLITE_ROW; + result = _tmp19_ == SQLITE_ROW; #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (sql); #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (stmt) { #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" *stmt = _vala_stmt; -#line 1163 "DatabaseTable.c" +#line 1151 "DatabaseTable.c" } else { #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (_vala_stmt); -#line 1167 "DatabaseTable.c" +#line 1155 "DatabaseTable.c" } #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1171 "DatabaseTable.c" +#line 1159 "DatabaseTable.c" } -static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id, const gchar* column, sqlite3_stmt* * stmt) { +static void +database_table_prepare_update_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + sqlite3_stmt* * stmt) +{ sqlite3_stmt* _vala_stmt = NULL; gchar* sql = NULL; const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp1_; gint res = 0; - sqlite3* _tmp3_; - sqlite3_stmt* _tmp4_ = NULL; + sqlite3* _tmp2_; + sqlite3_stmt* _tmp3_ = NULL; + gint _tmp4_; gint _tmp5_; gint _tmp6_; - gint64 _tmp7_; - gint _tmp8_; - gint _tmp9_; #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (IS_DATABASE_TABLE (self)); #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1192,102 +1182,93 @@ static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id, #line 205 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp0_ = self->table_name; #line 205 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = column; -#line 205 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = g_strdup_printf ("UPDATE %s SET %s=? WHERE id=?", _tmp0_, _tmp1_); + _tmp1_ = g_strdup_printf ("UPDATE %s SET %s=? WHERE id=?", _tmp0_, column); #line 205 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - sql = _tmp2_; + sql = _tmp1_; #line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = database_table_db; + _tmp2_ = database_table_db; #line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = sqlite3_prepare_v2 (_tmp3_, sql, -1, &_tmp4_, NULL); + _tmp4_ = sqlite3_prepare_v2 (_tmp2_, sql, -1, &_tmp3_, NULL); #line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (_vala_stmt); #line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_stmt = _tmp4_; + _vala_stmt = _tmp3_; #line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp5_; + res = _tmp4_; #line 208 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 208 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); -#line 210 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = id; + _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); #line 210 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = sqlite3_bind_int64 (_vala_stmt, 2, _tmp7_); -#line 210 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp8_; + res = sqlite3_bind_int64 (_vala_stmt, 2, id); #line 211 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = res; + _tmp6_ = res; #line 211 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (sql); #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (stmt) { #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" *stmt = _vala_stmt; -#line 1231 "DatabaseTable.c" +#line 1215 "DatabaseTable.c" } else { #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (_vala_stmt); -#line 1235 "DatabaseTable.c" +#line 1219 "DatabaseTable.c" } } -static gboolean database_table_execute_update_by_id (DatabaseTable* self, sqlite3_stmt* stmt) { +static gboolean +database_table_execute_update_by_id (DatabaseTable* self, + sqlite3_stmt* stmt) +{ gboolean result = FALSE; gint res = 0; - sqlite3_stmt* _tmp0_; - gint _tmp1_; - gint _tmp2_; + gint _tmp0_; #line 214 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE); #line 214 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (stmt != NULL, FALSE); #line 215 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = stmt; -#line 215 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = sqlite3_step (_tmp0_); -#line 215 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp1_; + res = sqlite3_step (stmt); #line 216 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = res; + _tmp0_ = res; #line 216 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp2_ != SQLITE_DONE) { -#line 1260 "DatabaseTable.c" - gint _tmp3_; + if (_tmp0_ != SQLITE_DONE) { +#line 1241 "DatabaseTable.c" + gint _tmp1_; #line 217 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = res; + _tmp1_ = res; #line 217 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_fatal ("execute_update_by_id", _tmp3_); + database_table_fatal ("execute_update_by_id", _tmp1_); #line 219 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" result = FALSE; #line 219 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1270 "DatabaseTable.c" +#line 1251 "DatabaseTable.c" } #line 222 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" result = TRUE; #line 222 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1276 "DatabaseTable.c" +#line 1257 "DatabaseTable.c" } -gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text) { +gboolean +database_table_update_text_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; - gint64 _tmp0_; - const gchar* _tmp1_; - sqlite3_stmt* _tmp2_ = NULL; + sqlite3_stmt* _tmp0_ = NULL; gint res = 0; - const gchar* _tmp3_; - gchar* _tmp4_; - GDestroyNotify _tmp5_; - gint _tmp6_; - gboolean _tmp7_; + gchar* _tmp1_; + GDestroyNotify _tmp2_; #line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE); #line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1295,54 +1276,45 @@ gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const #line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (text != NULL, FALSE); #line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = id; -#line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = column; -#line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_); + database_table_prepare_update_by_id (self, id, column, &_tmp0_); #line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - stmt = _tmp2_; -#line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = text; -#line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = g_strdup (_tmp3_); + stmt = _tmp0_; #line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = g_free; + _tmp1_ = g_strdup (text); #line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = sqlite3_bind_text (stmt, 1, _tmp4_, -1, _tmp5_); + _tmp2_ = g_free; #line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp6_; + res = sqlite3_bind_text (stmt, 1, _tmp1_, -1, _tmp2_); #line 230 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _vala_assert (res == SQLITE_OK, "res == Sqlite.OK"); #line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = database_table_execute_update_by_id (self, stmt); -#line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - result = _tmp7_; + result = database_table_execute_update_by_id (self, stmt); #line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1328 "DatabaseTable.c" +#line 1299 "DatabaseTable.c" } -void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error) { +void +database_table_update_text_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text, + GError** error) +{ sqlite3_stmt* stmt = NULL; - gint64 _tmp0_; - const gchar* _tmp1_; - sqlite3_stmt* _tmp2_ = NULL; + sqlite3_stmt* _tmp0_ = NULL; gint res = 0; - sqlite3_stmt* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; - GDestroyNotify _tmp6_; - gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; - gint _tmp11_; + sqlite3_stmt* _tmp1_; + gchar* _tmp2_; + GDestroyNotify _tmp3_; + gint _tmp4_; + sqlite3_stmt* _tmp5_; + gint _tmp6_; GError * _inner_error_ = NULL; #line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (IS_DATABASE_TABLE (self)); @@ -1351,61 +1323,48 @@ void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const g #line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (text != NULL); #line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = id; -#line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = column; -#line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_); + database_table_prepare_update_by_id (self, id, column, &_tmp0_); #line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - stmt = _tmp2_; -#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = stmt; + stmt = _tmp0_; #line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = text; + _tmp1_ = stmt; #line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = g_strdup (_tmp4_); + _tmp2_ = g_strdup (text); #line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = g_free; + _tmp3_ = g_free; #line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = sqlite3_bind_text (_tmp3_, 1, _tmp5_, -1, _tmp6_); -#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp7_; + res = sqlite3_bind_text (_tmp1_, 1, _tmp2_, -1, _tmp3_); #line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = res; + _tmp4_ = res; #line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp4_ == SQLITE_OK, "res == Sqlite.OK"); #line 242 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = stmt; + _tmp5_ = stmt; #line 242 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); -#line 242 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp10_; + res = sqlite3_step (_tmp5_); #line 243 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = res; + _tmp6_ = res; #line 243 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp11_ != SQLITE_DONE) { -#line 1390 "DatabaseTable.c" - const gchar* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; - gint _tmp16_; + if (_tmp6_ != SQLITE_DONE) { +#line 1352 "DatabaseTable.c" + const gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gint _tmp10_; #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = self->table_name; + _tmp7_ = self->table_name; #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = column; + _tmp8_ = g_strdup_printf ("DatabaseTable.update_text_by_id_2 %s.%s", _tmp7_, column); #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = g_strdup_printf ("DatabaseTable.update_text_by_id_2 %s.%s", _tmp12_, _tmp13_); + _tmp9_ = _tmp8_; #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = _tmp14_; + _tmp10_ = res; #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = res; + database_table_throw_error (_tmp9_, _tmp10_, &_inner_error_); #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_throw_error (_tmp15_, _tmp16_, &_inner_error_); -#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp9_); #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1416,7 +1375,7 @@ void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const g _sqlite3_finalize0 (stmt); #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1420 "DatabaseTable.c" +#line 1379 "DatabaseTable.c" } else { #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); @@ -1426,130 +1385,108 @@ void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const g g_clear_error (&_inner_error_); #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1430 "DatabaseTable.c" +#line 1389 "DatabaseTable.c" } } } #line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); -#line 1436 "DatabaseTable.c" +#line 1395 "DatabaseTable.c" } -gboolean database_table_update_int_by_id (DatabaseTable* self, gint64 id, const gchar* column, gint value) { +gboolean +database_table_update_int_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + gint value) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; - gint64 _tmp0_; - const gchar* _tmp1_; - sqlite3_stmt* _tmp2_ = NULL; + sqlite3_stmt* _tmp0_ = NULL; gint res = 0; - gint _tmp3_; - gint _tmp4_; - gboolean _tmp5_; #line 247 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE); #line 247 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (column != NULL, FALSE); #line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = id; -#line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = column; -#line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_); + database_table_prepare_update_by_id (self, id, column, &_tmp0_); #line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - stmt = _tmp2_; -#line 251 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = value; -#line 251 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = sqlite3_bind_int (stmt, 1, _tmp3_); + stmt = _tmp0_; #line 251 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp4_; + res = sqlite3_bind_int (stmt, 1, value); #line 252 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _vala_assert (res == SQLITE_OK, "res == Sqlite.OK"); #line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = database_table_execute_update_by_id (self, stmt); -#line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - result = _tmp5_; + result = database_table_execute_update_by_id (self, stmt); #line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1480 "DatabaseTable.c" +#line 1429 "DatabaseTable.c" } -void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint value, GError** error) { +void +database_table_update_int_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + gint value, + GError** error) +{ sqlite3_stmt* stmt = NULL; - gint64 _tmp0_; - const gchar* _tmp1_; - sqlite3_stmt* _tmp2_ = NULL; + sqlite3_stmt* _tmp0_ = NULL; gint res = 0; + sqlite3_stmt* _tmp1_; + gint _tmp2_; sqlite3_stmt* _tmp3_; gint _tmp4_; - gint _tmp5_; - gint _tmp6_; - sqlite3_stmt* _tmp7_; - gint _tmp8_; - gint _tmp9_; GError * _inner_error_ = NULL; #line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (IS_DATABASE_TABLE (self)); #line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (column != NULL); #line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = id; -#line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = column; -#line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_); + database_table_prepare_update_by_id (self, id, column, &_tmp0_); #line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - stmt = _tmp2_; + stmt = _tmp0_; #line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = stmt; -#line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = value; + _tmp1_ = stmt; #line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = sqlite3_bind_int (_tmp3_, 1, _tmp4_); -#line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp5_; + res = sqlite3_bind_int (_tmp1_, 1, value); #line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = res; + _tmp2_ = res; #line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp2_ == SQLITE_OK, "res == Sqlite.OK"); #line 264 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = stmt; -#line 264 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = sqlite3_step (_tmp7_); + _tmp3_ = stmt; #line 264 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp8_; + res = sqlite3_step (_tmp3_); #line 265 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = res; + _tmp4_ = res; #line 265 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp9_ != SQLITE_DONE) { -#line 1534 "DatabaseTable.c" - const gchar* _tmp10_; - const gchar* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; - gint _tmp14_; -#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = self->table_name; + if (_tmp4_ != SQLITE_DONE) { +#line 1474 "DatabaseTable.c" + const gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gint _tmp8_; #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = column; + _tmp5_ = self->table_name; #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = g_strdup_printf ("DatabaseTable.update_int_by_id_2 %s.%s", _tmp10_, _tmp11_); + _tmp6_ = g_strdup_printf ("DatabaseTable.update_int_by_id_2 %s.%s", _tmp5_, column); #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = _tmp12_; + _tmp7_ = _tmp6_; #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = res; + _tmp8_ = res; #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_throw_error (_tmp13_, _tmp14_, &_inner_error_); + database_table_throw_error (_tmp7_, _tmp8_, &_inner_error_); #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp7_); #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1560,7 +1497,7 @@ void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gc _sqlite3_finalize0 (stmt); #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1564 "DatabaseTable.c" +#line 1501 "DatabaseTable.c" } else { #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); @@ -1570,130 +1507,108 @@ void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gc g_clear_error (&_inner_error_); #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1574 "DatabaseTable.c" +#line 1511 "DatabaseTable.c" } } } #line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); -#line 1580 "DatabaseTable.c" +#line 1517 "DatabaseTable.c" } -gboolean database_table_update_int64_by_id (DatabaseTable* self, gint64 id, const gchar* column, gint64 value) { +gboolean +database_table_update_int64_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + gint64 value) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; - gint64 _tmp0_; - const gchar* _tmp1_; - sqlite3_stmt* _tmp2_ = NULL; + sqlite3_stmt* _tmp0_ = NULL; gint res = 0; - gint64 _tmp3_; - gint _tmp4_; - gboolean _tmp5_; #line 269 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE); #line 269 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (column != NULL, FALSE); #line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = id; -#line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = column; -#line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_); + database_table_prepare_update_by_id (self, id, column, &_tmp0_); #line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - stmt = _tmp2_; -#line 273 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = value; + stmt = _tmp0_; #line 273 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = sqlite3_bind_int64 (stmt, 1, _tmp3_); -#line 273 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp4_; + res = sqlite3_bind_int64 (stmt, 1, value); #line 274 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _vala_assert (res == SQLITE_OK, "res == Sqlite.OK"); #line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = database_table_execute_update_by_id (self, stmt); -#line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - result = _tmp5_; + result = database_table_execute_update_by_id (self, stmt); #line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1624 "DatabaseTable.c" +#line 1551 "DatabaseTable.c" } -void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint64 value, GError** error) { +void +database_table_update_int64_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + gint64 value, + GError** error) +{ sqlite3_stmt* stmt = NULL; - gint64 _tmp0_; - const gchar* _tmp1_; - sqlite3_stmt* _tmp2_ = NULL; + sqlite3_stmt* _tmp0_ = NULL; gint res = 0; + sqlite3_stmt* _tmp1_; + gint _tmp2_; sqlite3_stmt* _tmp3_; - gint64 _tmp4_; - gint _tmp5_; - gint _tmp6_; - sqlite3_stmt* _tmp7_; - gint _tmp8_; - gint _tmp9_; + gint _tmp4_; GError * _inner_error_ = NULL; #line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (IS_DATABASE_TABLE (self)); #line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (column != NULL); #line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = id; -#line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = column; -#line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_); + database_table_prepare_update_by_id (self, id, column, &_tmp0_); #line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - stmt = _tmp2_; -#line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = stmt; + stmt = _tmp0_; #line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = value; + _tmp1_ = stmt; #line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = sqlite3_bind_int64 (_tmp3_, 1, _tmp4_); -#line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp5_; + res = sqlite3_bind_int64 (_tmp1_, 1, value); #line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = res; + _tmp2_ = res; #line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); -#line 286 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = stmt; + _vala_assert (_tmp2_ == SQLITE_OK, "res == Sqlite.OK"); #line 286 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = sqlite3_step (_tmp7_); + _tmp3_ = stmt; #line 286 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp8_; + res = sqlite3_step (_tmp3_); #line 287 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = res; + _tmp4_ = res; #line 287 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp9_ != SQLITE_DONE) { -#line 1678 "DatabaseTable.c" - const gchar* _tmp10_; - const gchar* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; - gint _tmp14_; -#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = self->table_name; + if (_tmp4_ != SQLITE_DONE) { +#line 1596 "DatabaseTable.c" + const gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gint _tmp8_; #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = column; + _tmp5_ = self->table_name; #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = g_strdup_printf ("DatabaseTable.update_int64_by_id_2 %s.%s", _tmp10_, _tmp11_); + _tmp6_ = g_strdup_printf ("DatabaseTable.update_int64_by_id_2 %s.%s", _tmp5_, column); #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = _tmp12_; + _tmp7_ = _tmp6_; #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = res; + _tmp8_ = res; #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_throw_error (_tmp13_, _tmp14_, &_inner_error_); + database_table_throw_error (_tmp7_, _tmp8_, &_inner_error_); #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp7_); #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1704,7 +1619,7 @@ void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const _sqlite3_finalize0 (stmt); #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1708 "DatabaseTable.c" +#line 1623 "DatabaseTable.c" } else { #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); @@ -1714,17 +1629,21 @@ void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const g_clear_error (&_inner_error_); #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1718 "DatabaseTable.c" +#line 1633 "DatabaseTable.c" } } } #line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); -#line 1724 "DatabaseTable.c" +#line 1639 "DatabaseTable.c" } -void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error) { +void +database_table_delete_by_id (DatabaseTable* self, + gint64 id, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -1736,12 +1655,9 @@ void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error gint _tmp6_; gint _tmp7_; sqlite3_stmt* _tmp8_; - gint64 _tmp9_; - gint _tmp10_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; gint _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; - gint _tmp14_; GError * _inner_error_ = NULL; #line 291 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (IS_DATABASE_TABLE (self)); @@ -1772,42 +1688,36 @@ void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error #line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp8_ = stmt; #line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = id; -#line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = sqlite3_bind_int64 (_tmp8_, 1, _tmp9_); -#line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp10_; + res = sqlite3_bind_int64 (_tmp8_, 1, id); #line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 299 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = stmt; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 299 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = sqlite3_step (_tmp12_); + _tmp10_ = stmt; #line 299 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp13_; + res = sqlite3_step (_tmp10_); #line 300 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = res; + _tmp11_ = res; #line 300 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp14_ != SQLITE_DONE) { -#line 1795 "DatabaseTable.c" - const gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; - gint _tmp18_; + if (_tmp11_ != SQLITE_DONE) { +#line 1705 "DatabaseTable.c" + const gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + gint _tmp15_; #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = self->table_name; + _tmp12_ = self->table_name; #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = g_strdup_printf ("%s.remove", _tmp15_); + _tmp13_ = g_strdup_printf ("%s.remove", _tmp12_); #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp17_ = _tmp16_; + _tmp14_ = _tmp13_; #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp18_ = res; + _tmp15_ = res; #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_throw_error (_tmp17_, _tmp18_, &_inner_error_); + database_table_throw_error (_tmp14_, _tmp15_, &_inner_error_); #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp14_); #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1818,7 +1728,7 @@ void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error _sqlite3_finalize0 (stmt); #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1822 "DatabaseTable.c" +#line 1732 "DatabaseTable.c" } else { #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); @@ -1828,28 +1738,30 @@ void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error g_clear_error (&_inner_error_); #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1832 "DatabaseTable.c" +#line 1742 "DatabaseTable.c" } } } #line 291 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); -#line 1838 "DatabaseTable.c" +#line 1748 "DatabaseTable.c" } -gboolean database_table_has_column (const gchar* table_name, const gchar* column_name) { +gboolean +database_table_has_column (const gchar* table_name, + const gchar* column_name) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; - const gchar* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; - sqlite3_stmt* _tmp4_ = NULL; + sqlite3_stmt* _tmp3_ = NULL; + gint _tmp4_; gint _tmp5_; gint _tmp6_; - gint _tmp7_; #line 304 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (table_name != NULL, FALSE); #line 304 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1857,119 +1769,108 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column #line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp0_ = database_table_db; #line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = table_name; -#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = g_strdup_printf ("PRAGMA table_info(%s)", _tmp1_); + _tmp1_ = g_strdup_printf ("PRAGMA table_info(%s)", table_name); #line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = sqlite3_prepare_v2 (_tmp0_, _tmp3_, -1, &_tmp4_, NULL); + _tmp4_ = sqlite3_prepare_v2 (_tmp0_, _tmp2_, -1, &_tmp3_, NULL); #line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - stmt = _tmp4_; + stmt = _tmp3_; #line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp6_; + res = _tmp5_; #line 307 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 307 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1882 "DatabaseTable.c" + _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); +#line 1792 "DatabaseTable.c" { - gboolean _tmp8_ = FALSE; + gboolean _tmp7_ = FALSE; #line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = TRUE; + _tmp7_ = TRUE; #line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" while (TRUE) { -#line 1889 "DatabaseTable.c" - sqlite3_stmt* _tmp9_; - gint _tmp10_; - gint _tmp11_; +#line 1799 "DatabaseTable.c" + sqlite3_stmt* _tmp8_; + gint _tmp9_; #line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (!_tmp8_) { -#line 1895 "DatabaseTable.c" + if (!_tmp7_) { +#line 1804 "DatabaseTable.c" } #line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = FALSE; -#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = stmt; + _tmp7_ = FALSE; #line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp10_; + res = sqlite3_step (_tmp8_); #line 311 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 311 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp11_ == SQLITE_DONE) { + if (_tmp9_ == SQLITE_DONE) { #line 312 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" break; -#line 1911 "DatabaseTable.c" +#line 1818 "DatabaseTable.c" } else { - gint _tmp12_; + gint _tmp10_; #line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp12_ != SQLITE_ROW) { -#line 1918 "DatabaseTable.c" - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; - gint _tmp16_; + if (_tmp10_ != SQLITE_ROW) { +#line 1825 "DatabaseTable.c" + gchar* _tmp11_; + gchar* _tmp12_; + gint _tmp13_; #line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = table_name; + _tmp11_ = g_strdup_printf ("has_column %s", table_name); #line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = g_strdup_printf ("has_column %s", _tmp13_); + _tmp12_ = _tmp11_; #line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = _tmp14_; + _tmp13_ = res; #line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = res; + database_table_fatal (_tmp12_, _tmp13_); #line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_fatal (_tmp15_, _tmp16_); -#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp12_); #line 316 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" break; -#line 1937 "DatabaseTable.c" +#line 1841 "DatabaseTable.c" } else { gchar* column = NULL; - sqlite3_stmt* _tmp17_; + sqlite3_stmt* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + gboolean _tmp17_ = FALSE; const gchar* _tmp18_; - gchar* _tmp19_; - gboolean _tmp20_ = FALSE; - const gchar* _tmp21_; #line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp17_ = stmt; + _tmp14_ = stmt; #line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp18_ = sqlite3_column_text (_tmp17_, 1); + _tmp15_ = sqlite3_column_text (_tmp14_, 1); #line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp19_ = g_strdup (_tmp18_); + _tmp16_ = g_strdup (_tmp15_); #line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - column = _tmp19_; -#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp21_ = column; + column = _tmp16_; #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp21_ != NULL) { -#line 1957 "DatabaseTable.c" - const gchar* _tmp22_; - const gchar* _tmp23_; + _tmp18_ = column; #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp22_ = column; + if (_tmp18_ != NULL) { +#line 1861 "DatabaseTable.c" + const gchar* _tmp19_; #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp23_ = column_name; + _tmp19_ = column; #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp20_ = g_strcmp0 (_tmp22_, _tmp23_) == 0; -#line 1966 "DatabaseTable.c" + _tmp17_ = g_strcmp0 (_tmp19_, column_name) == 0; +#line 1867 "DatabaseTable.c" } else { #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp20_ = FALSE; -#line 1970 "DatabaseTable.c" + _tmp17_ = FALSE; +#line 1871 "DatabaseTable.c" } #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp20_) { + if (_tmp17_) { #line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" result = TRUE; #line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1978,11 +1879,11 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column _sqlite3_finalize0 (stmt); #line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1982 "DatabaseTable.c" +#line 1883 "DatabaseTable.c" } #line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (column); -#line 1986 "DatabaseTable.c" +#line 1887 "DatabaseTable.c" } } } @@ -1993,83 +1894,79 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column _sqlite3_finalize0 (stmt); #line 324 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1997 "DatabaseTable.c" +#line 1898 "DatabaseTable.c" } -gboolean database_table_has_table (const gchar* table_name) { +gboolean +database_table_has_table (const gchar* table_name) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; - const gchar* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; - sqlite3_stmt* _tmp4_ = NULL; + sqlite3_stmt* _tmp3_ = NULL; + gint _tmp4_; gint _tmp5_; gint _tmp6_; gint _tmp7_; - gint _tmp8_; - gint _tmp9_; #line 327 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (table_name != NULL, FALSE); #line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp0_ = database_table_db; #line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = table_name; + _tmp1_ = g_strdup_printf ("PRAGMA table_info(%s)", table_name); #line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = g_strdup_printf ("PRAGMA table_info(%s)", _tmp1_); + _tmp2_ = _tmp1_; #line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = _tmp2_; -#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = sqlite3_prepare_v2 (_tmp0_, _tmp3_, -1, &_tmp4_, NULL); + _tmp4_ = sqlite3_prepare_v2 (_tmp0_, _tmp2_, -1, &_tmp3_, NULL); #line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - stmt = _tmp4_; + stmt = _tmp3_; #line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp6_; + res = _tmp5_; #line 330 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 330 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); -#line 332 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = sqlite3_step (stmt); + _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); #line 332 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp8_; + res = sqlite3_step (stmt); #line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = res; + _tmp7_ = res; #line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - result = _tmp9_ != SQLITE_DONE; + result = _tmp7_ != SQLITE_DONE; #line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2053 "DatabaseTable.c" +#line 1950 "DatabaseTable.c" } -gboolean database_table_add_column (const gchar* table_name, const gchar* column_name, const gchar* column_constraints) { +gboolean +database_table_add_column (const gchar* table_name, + const gchar* column_name, + const gchar* column_constraints) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_; + gchar* _tmp1_; + gchar* _tmp2_; + sqlite3_stmt* _tmp3_ = NULL; + gint _tmp4_; + gint _tmp5_; + gint _tmp6_; + sqlite3_stmt* _tmp7_; gint _tmp8_; - gint _tmp9_; - sqlite3_stmt* _tmp10_; - gint _tmp11_; - gint _tmp12_; #line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (table_name != NULL, FALSE); #line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -2079,69 +1976,52 @@ gboolean database_table_add_column (const gchar* table_name, const gchar* column #line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp0_ = database_table_db; #line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = table_name; + _tmp1_ = g_strdup_printf ("ALTER TABLE %s ADD COLUMN %s %s", table_name, column_name, column_constraints); #line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = column_name; + _tmp2_ = _tmp1_; #line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = column_constraints; -#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 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = _tmp4_; -#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = sqlite3_prepare_v2 (_tmp0_, _tmp5_, -1, &_tmp6_, NULL); + _tmp4_ = sqlite3_prepare_v2 (_tmp0_, _tmp2_, -1, &_tmp3_, NULL); #line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - stmt = _tmp6_; + stmt = _tmp3_; #line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = _tmp7_; + _tmp5_ = _tmp4_; #line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp2_); #line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp8_; + res = _tmp5_; #line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = res; + _tmp6_ = res; #line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); -#line 343 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = stmt; + _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); #line 343 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = sqlite3_step (_tmp10_); + _tmp7_ = stmt; #line 343 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp11_; + res = sqlite3_step (_tmp7_); #line 344 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = res; + _tmp8_ = res; #line 344 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp12_ != SQLITE_DONE) { -#line 2118 "DatabaseTable.c" - const gchar* _tmp13_; - const gchar* _tmp14_; - const gchar* _tmp15_; - gint _tmp16_; - sqlite3* _tmp17_; - const gchar* _tmp18_; -#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = table_name; -#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = column_name; -#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = column_constraints; + if (_tmp8_ != SQLITE_DONE) { +#line 2007 "DatabaseTable.c" + gint _tmp9_; + sqlite3* _tmp10_; + const gchar* _tmp11_; #line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = res; + _tmp9_ = res; #line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp17_ = database_table_db; + _tmp10_ = database_table_db; #line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp18_ = sqlite3_errmsg (_tmp17_); + _tmp11_ = sqlite3_errmsg (_tmp10_); #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_); + g_critical ("DatabaseTable.vala:345: Unable to add column %s %s %s: (%d) %s", table_name, column_name, column_constraints, _tmp9_, _tmp11_); #line 348 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" result = FALSE; #line 348 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 348 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2145 "DatabaseTable.c" +#line 2025 "DatabaseTable.c" } #line 351 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" result = TRUE; @@ -2149,20 +2029,18 @@ gboolean database_table_add_column (const gchar* table_name, const gchar* column _sqlite3_finalize0 (stmt); #line 351 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2153 "DatabaseTable.c" +#line 2033 "DatabaseTable.c" } -gboolean database_table_ensure_column (const gchar* table_name, const gchar* column_name, const gchar* column_constraints, const gchar* upgrade_msg) { +gboolean +database_table_ensure_column (const gchar* table_name, + const gchar* column_name, + const gchar* column_constraints, + const gchar* upgrade_msg) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_; - gboolean _tmp2_; - const gchar* _tmp6_; - const gchar* _tmp7_; - const gchar* _tmp8_; - const gchar* _tmp9_; - gboolean _tmp10_; #line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (table_name != NULL, FALSE); #line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -2172,27 +2050,14 @@ gboolean database_table_ensure_column (const gchar* table_name, const gchar* col #line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (upgrade_msg != NULL, FALSE); #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = table_name; -#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = database_table_has_table (_tmp1_); -#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (!_tmp2_) { + if (!database_table_has_table (table_name)) { #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp0_ = TRUE; -#line 2183 "DatabaseTable.c" +#line 2057 "DatabaseTable.c" } else { - const gchar* _tmp3_; - const gchar* _tmp4_; - gboolean _tmp5_; -#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = table_name; -#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = column_name; #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = database_table_has_column (_tmp3_, _tmp4_); -#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = _tmp5_; -#line 2196 "DatabaseTable.c" + _tmp0_ = database_table_has_column (table_name, column_name); +#line 2061 "DatabaseTable.c" } #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp0_) { @@ -2200,29 +2065,21 @@ gboolean database_table_ensure_column (const gchar* table_name, const gchar* col result = TRUE; #line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2204 "DatabaseTable.c" +#line 2069 "DatabaseTable.c" } #line 362 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = upgrade_msg; -#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 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = column_name; + g_message ("DatabaseTable.vala:362: %s", upgrade_msg); #line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = column_constraints; -#line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = database_table_add_column (_tmp7_, _tmp8_, _tmp9_); -#line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - result = _tmp10_; + result = database_table_add_column (table_name, column_name, column_constraints); #line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2222 "DatabaseTable.c" +#line 2077 "DatabaseTable.c" } -gint database_table_get_row_count (DatabaseTable* self) { +gint +database_table_get_row_count (DatabaseTable* self) +{ gint result = 0; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -2236,9 +2093,7 @@ gint database_table_get_row_count (DatabaseTable* self) { gint _tmp7_; sqlite3_stmt* _tmp8_; gint _tmp9_; - gint _tmp10_; - sqlite3_stmt* _tmp15_; - gint _tmp16_; + sqlite3_stmt* _tmp14_; #line 367 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), 0); #line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -2268,51 +2123,49 @@ gint database_table_get_row_count (DatabaseTable* self) { #line 372 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp8_ = stmt; #line 372 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = sqlite3_step (_tmp8_); -#line 372 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp9_; + res = sqlite3_step (_tmp8_); #line 373 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = res; + _tmp9_ = res; #line 373 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp10_ != SQLITE_ROW) { -#line 2279 "DatabaseTable.c" - const gchar* _tmp11_; - gint _tmp12_; - sqlite3* _tmp13_; - const gchar* _tmp14_; + if (_tmp9_ != SQLITE_ROW) { +#line 2132 "DatabaseTable.c" + const gchar* _tmp10_; + gint _tmp11_; + sqlite3* _tmp12_; + const gchar* _tmp13_; #line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = self->table_name; + _tmp10_ = self->table_name; #line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = res; + _tmp11_ = res; #line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = database_table_db; + _tmp12_ = database_table_db; #line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = sqlite3_errmsg (_tmp13_); + _tmp13_ = sqlite3_errmsg (_tmp12_); #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_); + g_critical ("DatabaseTable.vala:374: Unable to retrieve row count on %s: (%d) %s", _tmp10_, _tmp11_, _tmp13_); #line 376 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" result = 0; #line 376 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 376 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2300 "DatabaseTable.c" +#line 2153 "DatabaseTable.c" } #line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = stmt; -#line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = sqlite3_column_int (_tmp15_, 0); + _tmp14_ = stmt; #line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - result = _tmp16_; + result = sqlite3_column_int (_tmp14_, 0); #line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2312 "DatabaseTable.c" +#line 2163 "DatabaseTable.c" } -void database_table_begin_transaction (void) { +void +database_table_begin_transaction (void) +{ gint _tmp0_; gint res = 0; sqlite3* _tmp1_; @@ -2326,7 +2179,7 @@ void database_table_begin_transaction (void) { if (_tmp0_ != 0) { #line 385 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 2330 "DatabaseTable.c" +#line 2183 "DatabaseTable.c" } #line 387 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp1_ = database_table_db; @@ -2338,11 +2191,13 @@ void database_table_begin_transaction (void) { _tmp3_ = res; #line 388 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); -#line 2342 "DatabaseTable.c" +#line 2195 "DatabaseTable.c" } -void database_table_commit_transaction (GError** error) { +void +database_table_commit_transaction (GError** error) +{ gint _tmp0_; gint _tmp1_; gint _tmp2_; @@ -2365,7 +2220,7 @@ void database_table_commit_transaction (GError** error) { if (_tmp2_ != 0) { #line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 2369 "DatabaseTable.c" +#line 2224 "DatabaseTable.c" } #line 397 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp3_ = database_table_db; @@ -2377,7 +2232,7 @@ void database_table_commit_transaction (GError** error) { _tmp5_ = res; #line 398 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp5_ != SQLITE_DONE) { -#line 2381 "DatabaseTable.c" +#line 2236 "DatabaseTable.c" gint _tmp6_; #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp6_ = res; @@ -2391,7 +2246,7 @@ void database_table_commit_transaction (GError** error) { g_propagate_error (error, _inner_error_); #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 2395 "DatabaseTable.c" +#line 2250 "DatabaseTable.c" } else { #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); @@ -2399,121 +2254,148 @@ void database_table_commit_transaction (GError** error) { g_clear_error (&_inner_error_); #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 2403 "DatabaseTable.c" +#line 2258 "DatabaseTable.c" } } } } -DatabaseTable* database_table_construct (GType object_type) { +DatabaseTable* +database_table_construct (GType object_type) +{ DatabaseTable* self = NULL; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" self = (DatabaseTable*) g_type_create_instance (object_type); #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return self; -#line 2416 "DatabaseTable.c" +#line 2273 "DatabaseTable.c" } -static void value_database_table_init (GValue* value) { +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 2423 "DatabaseTable.c" +#line 2282 "DatabaseTable.c" } -static void value_database_table_free_value (GValue* value) { +static void +value_database_table_free_value (GValue* value) +{ #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" database_table_unref (value->data[0].v_pointer); -#line 2432 "DatabaseTable.c" +#line 2293 "DatabaseTable.c" } } -static void value_database_table_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_database_table_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" 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 2442 "DatabaseTable.c" +#line 2306 "DatabaseTable.c" } else { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" dest_value->data[0].v_pointer = NULL; -#line 2446 "DatabaseTable.c" +#line 2310 "DatabaseTable.c" } } -static gpointer value_database_table_peek_pointer (const GValue* value) { +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 2454 "DatabaseTable.c" +#line 2320 "DatabaseTable.c" } -static gchar* value_database_table_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +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 2461 "DatabaseTable.c" +#line 2332 "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 2468 "DatabaseTable.c" +#line 2339 "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 2472 "DatabaseTable.c" +#line 2343 "DatabaseTable.c" } #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" value->data[0].v_pointer = database_table_ref (object); -#line 2476 "DatabaseTable.c" +#line 2347 "DatabaseTable.c" } else { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" value->data[0].v_pointer = NULL; -#line 2480 "DatabaseTable.c" +#line 2351 "DatabaseTable.c" } #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return NULL; -#line 2484 "DatabaseTable.c" +#line 2355 "DatabaseTable.c" } -static gchar* value_database_table_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_database_table_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ DatabaseTable ** object_p; object_p = collect_values[0].v_pointer; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" 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 2495 "DatabaseTable.c" +#line 2371 "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 2501 "DatabaseTable.c" +#line 2377 "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 2505 "DatabaseTable.c" +#line 2381 "DatabaseTable.c" } else { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" *object_p = database_table_ref (value->data[0].v_pointer); -#line 2509 "DatabaseTable.c" +#line 2385 "DatabaseTable.c" } #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return NULL; -#line 2513 "DatabaseTable.c" +#line 2389 "DatabaseTable.c" } -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecDatabaseTable* spec; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_DATABASE_TABLE), NULL); @@ -2523,20 +2405,25 @@ 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 2527 "DatabaseTable.c" +#line 2409 "DatabaseTable.c" } -gpointer value_get_database_table (const GValue* value) { +gpointer +value_get_database_table (const GValue* value) +{ #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" 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 2536 "DatabaseTable.c" +#line 2420 "DatabaseTable.c" } -void value_set_database_table (GValue* value, gpointer v_object) { +void +value_set_database_table (GValue* value, + gpointer v_object) +{ DatabaseTable * old; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATABASE_TABLE)); @@ -2552,22 +2439,25 @@ 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 2556 "DatabaseTable.c" +#line 2443 "DatabaseTable.c" } else { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" value->data[0].v_pointer = NULL; -#line 2560 "DatabaseTable.c" +#line 2447 "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 2566 "DatabaseTable.c" +#line 2453 "DatabaseTable.c" } } -void value_take_database_table (GValue* value, gpointer v_object) { +void +value_take_database_table (GValue* value, + gpointer v_object) +{ DatabaseTable * old; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATABASE_TABLE)); @@ -2581,40 +2471,46 @@ 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 2585 "DatabaseTable.c" +#line 2475 "DatabaseTable.c" } else { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" value->data[0].v_pointer = NULL; -#line 2589 "DatabaseTable.c" +#line 2479 "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 2595 "DatabaseTable.c" +#line 2485 "DatabaseTable.c" } } -static void database_table_class_init (DatabaseTableClass * klass) { +static void +database_table_class_init (DatabaseTableClass * klass) +{ #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" 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 2605 "DatabaseTable.c" +#line 2497 "DatabaseTable.c" } -static void database_table_instance_init (DatabaseTable * self) { +static void +database_table_instance_init (DatabaseTable * self) +{ #line 30 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" self->table_name = NULL; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" self->ref_count = 1; -#line 2614 "DatabaseTable.c" +#line 2508 "DatabaseTable.c" } -static void database_table_finalize (DatabaseTable * obj) { +static void +database_table_finalize (DatabaseTable * obj) +{ DatabaseTable * self; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATABASE_TABLE, DatabaseTable); @@ -2622,11 +2518,13 @@ 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 2626 "DatabaseTable.c" +#line 2522 "DatabaseTable.c" } -GType database_table_get_type (void) { +GType +database_table_get_type (void) +{ static volatile gsize database_table_type_id__volatile = 0; if (g_once_init_enter (&database_table_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_database_table_init, value_database_table_free_value, value_database_table_copy_value, value_database_table_peek_pointer, "p", value_database_table_collect_value, "p", value_database_table_lcopy_value }; @@ -2640,18 +2538,22 @@ GType database_table_get_type (void) { } -gpointer database_table_ref (gpointer instance) { +gpointer +database_table_ref (gpointer instance) +{ DatabaseTable * self; self = instance; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_atomic_int_inc (&self->ref_count); #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return instance; -#line 2651 "DatabaseTable.c" +#line 2551 "DatabaseTable.c" } -void database_table_unref (gpointer instance) { +void +database_table_unref (gpointer instance) +{ DatabaseTable * self; self = instance; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -2660,7 +2562,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 2664 "DatabaseTable.c" +#line 2566 "DatabaseTable.c" } } diff --git a/src/db/Db.c b/src/db/Db.c index b5200cf..cafe2e4 100644 --- a/src/db/Db.c +++ b/src/db/Db.c @@ -1,4 +1,4 @@ -/* Db.c generated by valac 0.36.6, the Vala compiler +/* Db.c generated by valac 0.40.4, the Vala compiler * generated from Db.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -71,84 +72,108 @@ void database_table_init (const gchar* filename); void db_terminate (void); void database_table_terminate (void); GType db_verify_result_get_type (void) G_GNUC_CONST; -DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version); +DbVerifyResult db_verify_database (gchar* * app_version, + gint* schema_version); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType version_table_get_type (void) G_GNUC_CONST; VersionTable* version_table_get_instance (void); -gint version_table_get_version (VersionTable* self, gchar* * app_version); +gint version_table_get_version (VersionTable* self, + gchar* * app_version); #define DATABASE_TABLE_SCHEMA_VERSION 20 #define RESOURCES_APP_VERSION _VERSION -void version_table_set_version (VersionTable* self, gint version, const gchar* app_version, const gchar* user_data); +void version_table_set_version (VersionTable* self, + gint version, + const gchar* app_version, + const gchar* user_data); DbVerifyResult db_upgrade_database (gint input_version); -gboolean database_table_has_column (const gchar* table_name, const gchar* column_name); -gboolean database_table_add_column (const gchar* table_name, const gchar* column_name, const gchar* column_constraints); +gboolean database_table_has_column (const gchar* table_name, + const gchar* column_name); +gboolean database_table_add_column (const gchar* table_name, + const gchar* column_name, + const gchar* column_constraints); gboolean database_table_has_table (const gchar* table_name); -gboolean database_table_ensure_column (const gchar* table_name, const gchar* column_name, const gchar* column_constraints, const gchar* upgrade_msg); +gboolean database_table_ensure_column (const gchar* table_name, + const gchar* column_name, + const gchar* column_constraints, + const gchar* upgrade_msg); void tag_table_upgrade_for_htags (void); void gsettings_configuration_engine_run_gsettings_migrator (void); gpointer application_ref (gpointer instance); void application_unref (gpointer instance); -GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_application (GValue* value, gpointer v_object); -void value_take_application (GValue* value, gpointer v_object); +GParamSpec* param_spec_application (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_application (GValue* value, + gpointer v_object); +void value_take_application (GValue* value, + gpointer v_object); gpointer value_get_application (const GValue* value); GType application_get_type (void) G_GNUC_CONST; Application* application_get_instance (void); -void application_set_raw_thumbs_fix_required (Application* self, gboolean should_fixup); -void version_table_update_version (VersionTable* self, gint version, const gchar* app_version); +void application_set_raw_thumbs_fix_required (Application* self, + gboolean should_fixup); +void version_table_update_version (VersionTable* self, + gint version, + const gchar* app_version); -void db_preconfigure (GFile* db_file) { +void +db_preconfigure (GFile* db_file) +{ gchar* _tmp0_ = NULL; - GFile* _tmp1_; - gchar* _tmp5_; + gchar* _tmp3_; #line 14 "/home/jens/Source/shotwell/src/db/Db.vala" g_return_if_fail ((db_file == NULL) || G_IS_FILE (db_file)); #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp1_ = db_file; -#line 15 "/home/jens/Source/shotwell/src/db/Db.vala" - if (_tmp1_ != NULL) { -#line 118 "Db.c" - GFile* _tmp2_; - gchar* _tmp3_; + if (db_file != NULL) { +#line 144 "Db.c" + gchar* _tmp1_; #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp2_ = db_file; -#line 15 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp3_ = g_file_get_path (_tmp2_); + _tmp1_ = g_file_get_path (db_file); #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" _g_free0 (_tmp0_); #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp0_ = _tmp3_; -#line 129 "Db.c" + _tmp0_ = _tmp1_; +#line 152 "Db.c" } else { - gchar* _tmp4_; + gchar* _tmp2_; #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp4_ = g_strdup (DB_IN_MEMORY_NAME); + _tmp2_ = g_strdup (DB_IN_MEMORY_NAME); #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" _g_free0 (_tmp0_); #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp0_ = _tmp4_; -#line 138 "Db.c" + _tmp0_ = _tmp2_; +#line 161 "Db.c" } #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp5_ = g_strdup (_tmp0_); + _tmp3_ = g_strdup (_tmp0_); #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" _g_free0 (db_filename); #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" - db_filename = _tmp5_; + db_filename = _tmp3_; #line 14 "/home/jens/Source/shotwell/src/db/Db.vala" _g_free0 (_tmp0_); -#line 148 "Db.c" +#line 171 "Db.c" } -void db_init (GError** error) { +void +db_init (GError** error) +{ const gchar* _tmp0_; const gchar* _tmp1_; #line 19 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -159,18 +184,22 @@ void db_init (GError** error) { _tmp1_ = db_filename; #line 21 "/home/jens/Source/shotwell/src/db/Db.vala" database_table_init (_tmp1_); -#line 163 "Db.c" +#line 188 "Db.c" } -void db_terminate (void) { +void +db_terminate (void) +{ #line 25 "/home/jens/Source/shotwell/src/db/Db.vala" database_table_terminate (); -#line 170 "Db.c" +#line 197 "Db.c" } -GType db_verify_result_get_type (void) { +GType +db_verify_result_get_type (void) +{ static volatile gsize db_verify_result_type_id__volatile = 0; if (g_once_init_enter (&db_verify_result_type_id__volatile)) { static const GEnumValue values[] = {{DB_VERIFY_RESULT_OK, "DB_VERIFY_RESULT_OK", "ok"}, {DB_VERIFY_RESULT_FUTURE_VERSION, "DB_VERIFY_RESULT_FUTURE_VERSION", "future-version"}, {DB_VERIFY_RESULT_UPGRADE_ERROR, "DB_VERIFY_RESULT_UPGRADE_ERROR", "upgrade-error"}, {DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE, "DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE", "no-upgrade-available"}, {0, NULL, NULL}}; @@ -182,7 +211,10 @@ GType db_verify_result_get_type (void) { } -DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version) { +DbVerifyResult +db_verify_database (gchar* * app_version, + gint* schema_version) +{ gchar* _vala_app_version = NULL; gint _vala_schema_version = 0; DbVerifyResult result = 0; @@ -211,7 +243,7 @@ DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version) { _tmp4_ = _vala_schema_version; #line 39 "/home/jens/Source/shotwell/src/db/Db.vala" if (_tmp4_ >= 0) { -#line 215 "Db.c" +#line 247 "Db.c" gint _tmp5_; const gchar* _tmp6_; #line 40 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -220,13 +252,13 @@ DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version) { _tmp6_ = _vala_app_version; #line 40 "/home/jens/Source/shotwell/src/db/Db.vala" g_debug ("Db.vala:40: Database schema version %d created by app version %s", _tmp5_, _tmp6_); -#line 224 "Db.c" +#line 256 "Db.c" } #line 42 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp7_ = _vala_schema_version; #line 42 "/home/jens/Source/shotwell/src/db/Db.vala" if (_tmp7_ == -1) { -#line 230 "Db.c" +#line 262 "Db.c" VersionTable* _tmp8_; gchar* _tmp9_; #line 44 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -243,7 +275,7 @@ DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version) { _vala_app_version = _tmp9_; #line 48 "/home/jens/Source/shotwell/src/db/Db.vala" _vala_schema_version = DATABASE_TABLE_SCHEMA_VERSION; -#line 247 "Db.c" +#line 279 "Db.c" } else { gint _tmp10_; #line 49 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -258,42 +290,39 @@ DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version) { if (app_version) { #line 51 "/home/jens/Source/shotwell/src/db/Db.vala" *app_version = _vala_app_version; -#line 262 "Db.c" +#line 294 "Db.c" } else { #line 51 "/home/jens/Source/shotwell/src/db/Db.vala" _g_free0 (_vala_app_version); -#line 266 "Db.c" +#line 298 "Db.c" } #line 51 "/home/jens/Source/shotwell/src/db/Db.vala" if (schema_version) { #line 51 "/home/jens/Source/shotwell/src/db/Db.vala" *schema_version = _vala_schema_version; -#line 272 "Db.c" +#line 304 "Db.c" } #line 51 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 276 "Db.c" +#line 308 "Db.c" } else { gint _tmp11_; #line 52 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp11_ = _vala_schema_version; #line 52 "/home/jens/Source/shotwell/src/db/Db.vala" if (_tmp11_ < DATABASE_TABLE_SCHEMA_VERSION) { -#line 283 "Db.c" +#line 315 "Db.c" DbVerifyResult _result_ = 0; gint _tmp12_; DbVerifyResult _tmp13_; - DbVerifyResult _tmp14_; #line 54 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp12_ = _vala_schema_version; #line 54 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp13_ = db_upgrade_database (_tmp12_); -#line 54 "/home/jens/Source/shotwell/src/db/Db.vala" - _result_ = _tmp13_; + _result_ = db_upgrade_database (_tmp12_); #line 55 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp14_ = _result_; + _tmp13_ = _result_; #line 55 "/home/jens/Source/shotwell/src/db/Db.vala" - if (_tmp14_ != DB_VERIFY_RESULT_OK) { + if (_tmp13_ != DB_VERIFY_RESULT_OK) { #line 56 "/home/jens/Source/shotwell/src/db/Db.vala" result = _result_; #line 56 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -302,21 +331,21 @@ DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version) { if (app_version) { #line 56 "/home/jens/Source/shotwell/src/db/Db.vala" *app_version = _vala_app_version; -#line 306 "Db.c" +#line 335 "Db.c" } else { #line 56 "/home/jens/Source/shotwell/src/db/Db.vala" _g_free0 (_vala_app_version); -#line 310 "Db.c" +#line 339 "Db.c" } #line 56 "/home/jens/Source/shotwell/src/db/Db.vala" if (schema_version) { #line 56 "/home/jens/Source/shotwell/src/db/Db.vala" *schema_version = _vala_schema_version; -#line 316 "Db.c" +#line 345 "Db.c" } #line 56 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 320 "Db.c" +#line 349 "Db.c" } } } @@ -329,526 +358,384 @@ DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version) { if (app_version) { #line 59 "/home/jens/Source/shotwell/src/db/Db.vala" *app_version = _vala_app_version; -#line 333 "Db.c" +#line 362 "Db.c" } else { #line 59 "/home/jens/Source/shotwell/src/db/Db.vala" _g_free0 (_vala_app_version); -#line 337 "Db.c" +#line 366 "Db.c" } #line 59 "/home/jens/Source/shotwell/src/db/Db.vala" if (schema_version) { #line 59 "/home/jens/Source/shotwell/src/db/Db.vala" *schema_version = _vala_schema_version; -#line 343 "Db.c" +#line 372 "Db.c" } #line 59 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 347 "Db.c" +#line 376 "Db.c" } -DbVerifyResult db_upgrade_database (gint input_version) { +DbVerifyResult +db_upgrade_database (gint input_version) +{ DbVerifyResult result = 0; - gint _tmp0_; gint version = 0; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; - gint _tmp3_; - gboolean _tmp4_; - gboolean _tmp6_; - gboolean _tmp8_; - gboolean _tmp10_; - gboolean _tmp12_; - gboolean _tmp14_; - gboolean _tmp16_; - gboolean _tmp18_; - gboolean _tmp20_ = FALSE; - gboolean _tmp21_; - gboolean _tmp24_; - gboolean _tmp26_; - gboolean _tmp27_; - gboolean _tmp29_; - gboolean _tmp31_; - gboolean _tmp33_; - gint _tmp35_; - gint _tmp36_; - gboolean _tmp37_; - gboolean _tmp39_; - gboolean _tmp40_; - gboolean _tmp42_; - gint _tmp44_; - gint _tmp47_; - VersionTable* _tmp48_; - VersionTable* _tmp49_; - gint _tmp50_; - gint _tmp51_; -#line 63 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp0_ = input_version; + gboolean _tmp2_ = FALSE; + gint _tmp5_; + VersionTable* _tmp6_; + VersionTable* _tmp7_; + gint _tmp8_; + gint _tmp9_; #line 63 "/home/jens/Source/shotwell/src/db/Db.vala" - _vala_assert (_tmp0_ < DATABASE_TABLE_SCHEMA_VERSION, "input_version < DatabaseTable.SCHEMA_VERSION"); + _vala_assert (input_version < DATABASE_TABLE_SCHEMA_VERSION, "input_version < DatabaseTable.SCHEMA_VERSION"); #line 65 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp1_ = input_version; -#line 65 "/home/jens/Source/shotwell/src/db/Db.vala" - version = _tmp1_; + version = input_version; #line 68 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp2_ = version; + _tmp0_ = version; #line 68 "/home/jens/Source/shotwell/src/db/Db.vala" - if (_tmp2_ == 1) { + if (_tmp0_ == 1) { #line 69 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE; #line 69 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 402 "Db.c" +#line 405 "Db.c" } #line 71 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp3_ = version; + _tmp1_ = version; #line 71 "/home/jens/Source/shotwell/src/db/Db.vala" - g_message ("Db.vala:71: Upgrading database from schema version %d to %d", _tmp3_, DATABASE_TABLE_SCHEMA_VERSION); -#line 83 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp4_ = database_table_has_column ("PhotoTable", "flags"); + g_message ("Db.vala:71: Upgrading database from schema version %d to %d", _tmp1_, DATABASE_TABLE_SCHEMA_VERSION); #line 83 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp4_) { -#line 412 "Db.c" - gboolean _tmp5_; + if (!database_table_has_column ("PhotoTable", "flags")) { #line 84 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:84: upgrade_database: adding flags column to PhotoTable"); #line 85 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp5_ = database_table_add_column ("PhotoTable", "flags", "INTEGER DEFAULT 0"); -#line 85 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp5_) { + if (!database_table_add_column ("PhotoTable", "flags", "INTEGER DEFAULT 0")) { #line 86 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 86 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 424 "Db.c" +#line 421 "Db.c" } } #line 89 "/home/jens/Source/shotwell/src/db/Db.vala" version = 3; #line 100 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp6_ = database_table_has_column ("PhotoTable", "file_format"); -#line 100 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp6_) { -#line 433 "Db.c" - gboolean _tmp7_; + if (!database_table_has_column ("PhotoTable", "file_format")) { #line 101 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:101: upgrade_database: adding file_format column to PhotoTable"); #line 102 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp7_ = database_table_add_column ("PhotoTable", "file_format", "INTEGER DEFAULT 0"); -#line 102 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp7_) { + if (!database_table_add_column ("PhotoTable", "file_format", "INTEGER DEFAULT 0")) { #line 103 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 103 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 445 "Db.c" +#line 436 "Db.c" } } #line 106 "/home/jens/Source/shotwell/src/db/Db.vala" version = 4; #line 113 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp8_ = database_table_has_column ("PhotoTable", "title"); -#line 113 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp8_) { -#line 454 "Db.c" - gboolean _tmp9_; + if (!database_table_has_column ("PhotoTable", "title")) { #line 114 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:114: upgrade_database: adding title column to PhotoTable"); #line 115 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp9_ = database_table_add_column ("PhotoTable", "title", "TEXT"); -#line 115 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp9_) { + if (!database_table_add_column ("PhotoTable", "title", "TEXT")) { #line 116 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 116 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 466 "Db.c" +#line 451 "Db.c" } } #line 119 "/home/jens/Source/shotwell/src/db/Db.vala" version = 5; #line 126 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp10_ = database_table_has_column ("PhotoTable", "backlinks"); -#line 126 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp10_) { -#line 475 "Db.c" - gboolean _tmp11_; + if (!database_table_has_column ("PhotoTable", "backlinks")) { #line 127 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:127: upgrade_database: adding backlinks column to PhotoTable"); #line 128 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp11_ = database_table_add_column ("PhotoTable", "backlinks", "TEXT"); -#line 128 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp11_) { + if (!database_table_add_column ("PhotoTable", "backlinks", "TEXT")) { #line 129 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 129 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 487 "Db.c" +#line 466 "Db.c" } } #line 132 "/home/jens/Source/shotwell/src/db/Db.vala" version = 6; #line 146 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp12_ = database_table_has_column ("PhotoTable", "time_reimported"); -#line 146 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp12_) { -#line 496 "Db.c" - gboolean _tmp13_; + if (!database_table_has_column ("PhotoTable", "time_reimported")) { #line 147 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:147: upgrade_database: adding time_reimported column to PhotoT" \ "able"); #line 148 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp13_ = database_table_add_column ("PhotoTable", "time_reimported", "INTEGER"); -#line 148 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp13_) { + if (!database_table_add_column ("PhotoTable", "time_reimported", "INTEGER")) { #line 149 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 149 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 508 "Db.c" +#line 481 "Db.c" } } #line 152 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp14_ = database_table_has_column ("PhotoTable", "editable_id"); -#line 152 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp14_) { -#line 515 "Db.c" - gboolean _tmp15_; + if (!database_table_has_column ("PhotoTable", "editable_id")) { #line 153 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:153: upgrade_database: adding editable_id column to PhotoTable"); #line 154 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp15_ = database_table_add_column ("PhotoTable", "editable_id", "INTEGER DEFAULT -1"); -#line 154 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp15_) { + if (!database_table_add_column ("PhotoTable", "editable_id", "INTEGER DEFAULT -1")) { #line 155 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 155 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 527 "Db.c" +#line 494 "Db.c" } } #line 158 "/home/jens/Source/shotwell/src/db/Db.vala" version = 7; #line 170 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp16_ = database_table_has_column ("PhotoTable", "rating"); -#line 170 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp16_) { -#line 536 "Db.c" - gboolean _tmp17_; + if (!database_table_has_column ("PhotoTable", "rating")) { #line 171 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:171: upgrade_database: adding rating column to PhotoTable"); #line 172 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp17_ = database_table_add_column ("PhotoTable", "rating", "INTEGER DEFAULT 0"); -#line 172 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp17_) { + if (!database_table_add_column ("PhotoTable", "rating", "INTEGER DEFAULT 0")) { #line 173 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 173 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 548 "Db.c" +#line 509 "Db.c" } } #line 182 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp18_ = database_table_has_column ("PhotoTable", "metadata_dirty"); -#line 182 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp18_) { -#line 555 "Db.c" - gboolean _tmp19_; + if (!database_table_has_column ("PhotoTable", "metadata_dirty")) { #line 183 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:183: upgrade_database: adding metadata_dirty column to PhotoTa" \ "ble"); #line 184 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp19_ = database_table_add_column ("PhotoTable", "metadata_dirty", "INTEGER DEFAULT 1"); -#line 184 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp19_) { + if (!database_table_add_column ("PhotoTable", "metadata_dirty", "INTEGER DEFAULT 1")) { #line 185 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 185 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 567 "Db.c" +#line 522 "Db.c" } } #line 188 "/home/jens/Source/shotwell/src/db/Db.vala" version = 9; #line 195 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp21_ = database_table_has_table ("VideoTable"); -#line 195 "/home/jens/Source/shotwell/src/db/Db.vala" - if (_tmp21_) { -#line 576 "Db.c" - gboolean _tmp22_; -#line 195 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp22_ = database_table_has_column ("VideoTable", "flags"); + if (database_table_has_table ("VideoTable")) { #line 195 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp20_ = !_tmp22_; -#line 582 "Db.c" + _tmp2_ = !database_table_has_column ("VideoTable", "flags"); +#line 531 "Db.c" } else { #line 195 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp20_ = FALSE; -#line 586 "Db.c" + _tmp2_ = FALSE; +#line 535 "Db.c" } #line 195 "/home/jens/Source/shotwell/src/db/Db.vala" - if (_tmp20_) { -#line 590 "Db.c" - gboolean _tmp23_; + if (_tmp2_) { #line 196 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:196: upgrade_database: adding flags column to VideoTable"); #line 197 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp23_ = database_table_add_column ("VideoTable", "flags", "INTEGER DEFAULT 0"); -#line 197 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp23_) { + if (!database_table_add_column ("VideoTable", "flags", "INTEGER DEFAULT 0")) { #line 198 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 198 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 602 "Db.c" +#line 547 "Db.c" } } #line 201 "/home/jens/Source/shotwell/src/db/Db.vala" version = 10; #line 208 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp24_ = database_table_has_column ("EventTable", "primary_source_id"); -#line 208 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp24_) { -#line 611 "Db.c" - gboolean _tmp25_; + if (!database_table_has_column ("EventTable", "primary_source_id")) { #line 209 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:209: upgrade_database: adding primary_source_id column to Even" \ "tTable"); #line 210 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp25_ = database_table_add_column ("EventTable", "primary_source_id", "TEXT"); -#line 210 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp25_) { + if (!database_table_add_column ("EventTable", "primary_source_id", "TEXT")) { #line 211 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 211 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 623 "Db.c" +#line 562 "Db.c" } } #line 214 "/home/jens/Source/shotwell/src/db/Db.vala" version = 11; #line 221 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp26_ = database_table_ensure_column ("TombstoneTable", "reason", "INTEGER DEFAULT 0", "upgrade_database: adding reason column to TombstoneTable"); -#line 221 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp26_) { + if (!database_table_ensure_column ("TombstoneTable", "reason", "INTEGER DEFAULT 0", "upgrade_database: adding reason column to TombstoneTable")) { #line 223 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 223 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 636 "Db.c" +#line 573 "Db.c" } #line 226 "/home/jens/Source/shotwell/src/db/Db.vala" version = 12; #line 233 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp27_ = database_table_has_column ("PhotoTable", "developer"); -#line 233 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp27_) { -#line 644 "Db.c" - gboolean _tmp28_; + if (!database_table_has_column ("PhotoTable", "developer")) { #line 234 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:234: upgrade_database: adding developer column to PhotoTable"); #line 235 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp28_ = database_table_add_column ("PhotoTable", "developer", "TEXT"); -#line 235 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp28_) { + if (!database_table_add_column ("PhotoTable", "developer", "TEXT")) { #line 236 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 236 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 656 "Db.c" +#line 587 "Db.c" } } #line 239 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp29_ = database_table_has_column ("PhotoTable", "develop_shotwell_id"); -#line 239 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp29_) { -#line 663 "Db.c" - gboolean _tmp30_; + if (!database_table_has_column ("PhotoTable", "develop_shotwell_id")) { #line 240 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:240: upgrade_database: adding develop_shotwell_id column to Ph" \ "otoTable"); #line 241 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp30_ = database_table_add_column ("PhotoTable", "develop_shotwell_id", "INTEGER DEFAULT -1"); -#line 241 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp30_) { + if (!database_table_add_column ("PhotoTable", "develop_shotwell_id", "INTEGER DEFAULT -1")) { #line 242 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 242 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 675 "Db.c" +#line 600 "Db.c" } } #line 245 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp31_ = database_table_has_column ("PhotoTable", "develop_camera_id"); -#line 245 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp31_) { -#line 682 "Db.c" - gboolean _tmp32_; + if (!database_table_has_column ("PhotoTable", "develop_camera_id")) { #line 246 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:246: upgrade_database: adding develop_camera_id column to Phot" \ "oTable"); #line 247 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp32_ = database_table_add_column ("PhotoTable", "develop_camera_id", "INTEGER DEFAULT -1"); -#line 247 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp32_) { + if (!database_table_add_column ("PhotoTable", "develop_camera_id", "INTEGER DEFAULT -1")) { #line 248 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 248 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 694 "Db.c" +#line 613 "Db.c" } } #line 251 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp33_ = database_table_has_column ("PhotoTable", "develop_embedded_id"); -#line 251 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp33_) { -#line 701 "Db.c" - gboolean _tmp34_; + if (!database_table_has_column ("PhotoTable", "develop_embedded_id")) { #line 252 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:252: upgrade_database: adding develop_embedded_id column to Ph" \ "otoTable"); #line 253 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp34_ = database_table_add_column ("PhotoTable", "develop_embedded_id", "INTEGER DEFAULT -1"); -#line 253 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp34_) { + if (!database_table_add_column ("PhotoTable", "develop_embedded_id", "INTEGER DEFAULT -1")) { #line 254 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 254 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 713 "Db.c" +#line 626 "Db.c" } } #line 257 "/home/jens/Source/shotwell/src/db/Db.vala" version = 13; #line 264 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp35_ = input_version; -#line 264 "/home/jens/Source/shotwell/src/db/Db.vala" - if (_tmp35_ < 14) { + if (input_version < 14) { #line 265 "/home/jens/Source/shotwell/src/db/Db.vala" tag_table_upgrade_for_htags (); -#line 724 "Db.c" +#line 635 "Db.c" } #line 267 "/home/jens/Source/shotwell/src/db/Db.vala" version = 14; #line 279 "/home/jens/Source/shotwell/src/db/Db.vala" version = 15; #line 289 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp36_ = input_version; -#line 289 "/home/jens/Source/shotwell/src/db/Db.vala" - if (_tmp36_ < 16) { + if (input_version < 16) { #line 292 "/home/jens/Source/shotwell/src/db/Db.vala" gsettings_configuration_engine_run_gsettings_migrator (); -#line 736 "Db.c" +#line 645 "Db.c" } #line 295 "/home/jens/Source/shotwell/src/db/Db.vala" version = 16; #line 302 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp37_ = database_table_has_column ("PhotoTable", "comment"); -#line 302 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp37_) { -#line 744 "Db.c" - gboolean _tmp38_; + if (!database_table_has_column ("PhotoTable", "comment")) { #line 303 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:303: upgrade_database: adding comment column to PhotoTable"); #line 304 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp38_ = database_table_add_column ("PhotoTable", "comment", "TEXT"); -#line 304 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp38_) { + if (!database_table_add_column ("PhotoTable", "comment", "TEXT")) { #line 305 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 305 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 756 "Db.c" +#line 659 "Db.c" } } #line 307 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp39_ = database_table_has_table ("VideoTable"); -#line 307 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp40_ = database_table_has_column ("VideoTable", "comment"); -#line 307 "/home/jens/Source/shotwell/src/db/Db.vala" - if (_tmp39_ & (!_tmp40_)) { -#line 765 "Db.c" - gboolean _tmp41_; + if (database_table_has_table ("VideoTable") & (!database_table_has_column ("VideoTable", "comment"))) { #line 308 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:308: upgrade_database: adding comment column to VideoTable"); #line 309 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp41_ = database_table_add_column ("VideoTable", "comment", "TEXT"); -#line 309 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp41_) { + if (!database_table_add_column ("VideoTable", "comment", "TEXT")) { #line 310 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 310 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 777 "Db.c" +#line 672 "Db.c" } } #line 313 "/home/jens/Source/shotwell/src/db/Db.vala" version = 17; #line 320 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp42_ = database_table_has_column ("EventTable", "comment"); -#line 320 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp42_) { -#line 786 "Db.c" - gboolean _tmp43_; + if (!database_table_has_column ("EventTable", "comment")) { #line 321 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:321: upgrade_database: adding comment column to EventTable"); #line 322 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp43_ = database_table_add_column ("EventTable", "comment", "TEXT"); -#line 322 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp43_) { + if (!database_table_add_column ("EventTable", "comment", "TEXT")) { #line 323 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 323 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 798 "Db.c" +#line 687 "Db.c" } } #line 326 "/home/jens/Source/shotwell/src/db/Db.vala" version = 18; #line 337 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp44_ = input_version; -#line 337 "/home/jens/Source/shotwell/src/db/Db.vala" - if (_tmp44_ < 19) { -#line 807 "Db.c" - Application* _tmp45_; - Application* _tmp46_; + if (input_version < 19) { +#line 694 "Db.c" + Application* _tmp3_; + Application* _tmp4_; #line 338 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp45_ = application_get_instance (); + _tmp3_ = application_get_instance (); #line 338 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp46_ = _tmp45_; + _tmp4_ = _tmp3_; #line 338 "/home/jens/Source/shotwell/src/db/Db.vala" - application_set_raw_thumbs_fix_required (_tmp46_, TRUE); + application_set_raw_thumbs_fix_required (_tmp4_, TRUE); #line 338 "/home/jens/Source/shotwell/src/db/Db.vala" - _application_unref0 (_tmp46_); -#line 818 "Db.c" + _application_unref0 (_tmp4_); +#line 705 "Db.c" } #line 341 "/home/jens/Source/shotwell/src/db/Db.vala" version = 19; #line 351 "/home/jens/Source/shotwell/src/db/Db.vala" version = 20; #line 357 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp47_ = version; + _tmp5_ = version; #line 357 "/home/jens/Source/shotwell/src/db/Db.vala" - _vala_assert (_tmp47_ == DATABASE_TABLE_SCHEMA_VERSION, "version == DatabaseTable.SCHEMA_VERSION"); + _vala_assert (_tmp5_ == DATABASE_TABLE_SCHEMA_VERSION, "version == DatabaseTable.SCHEMA_VERSION"); #line 358 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp48_ = version_table_get_instance (); + _tmp6_ = version_table_get_instance (); #line 358 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp49_ = _tmp48_; + _tmp7_ = _tmp6_; #line 358 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp50_ = version; + _tmp8_ = version; #line 358 "/home/jens/Source/shotwell/src/db/Db.vala" - version_table_update_version (_tmp49_, _tmp50_, RESOURCES_APP_VERSION); + version_table_update_version (_tmp7_, _tmp8_, RESOURCES_APP_VERSION); #line 358 "/home/jens/Source/shotwell/src/db/Db.vala" - _database_table_unref0 (_tmp49_); + _database_table_unref0 (_tmp7_); #line 360 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp51_ = version; + _tmp9_ = version; #line 360 "/home/jens/Source/shotwell/src/db/Db.vala" - g_message ("Db.vala:360: Database upgrade to schema version %d successful", _tmp51_); + g_message ("Db.vala:360: Database upgrade to schema version %d successful", _tmp9_); #line 362 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_OK; #line 362 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 846 "Db.c" +#line 733 "Db.c" } diff --git a/src/db/EventTable.c b/src/db/EventTable.c index 462ebc8..ce14303 100644 --- a/src/db/EventTable.c +++ b/src/db/EventTable.c @@ -1,4 +1,4 @@ -/* EventTable.c generated by valac 0.36.6, the Vala compiler +/* EventTable.c generated by valac 0.40.4, the Vala compiler * generated from EventTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -146,88 +147,136 @@ GType event_id_get_type (void) G_GNUC_CONST; EventID* event_id_dup (const EventID* self); void event_id_free (EventID* self); #define EVENT_ID_INVALID ((gint64) -1) -void event_id_init (EventID *self, gint64 id); +void event_id_init (EventID *self, + gint64 id); gboolean event_id_is_invalid (EventID *self); gboolean event_id_is_valid (EventID *self); gpointer event_row_ref (gpointer instance); void event_row_unref (gpointer instance); -GParamSpec* param_spec_event_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_event_row (GValue* value, gpointer v_object); -void value_take_event_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_event_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_event_row (GValue* value, + gpointer v_object); +void value_take_event_row (GValue* value, + gpointer v_object); gpointer value_get_event_row (const GValue* value); GType event_row_get_type (void) G_GNUC_CONST; -enum { - EVENT_ROW_DUMMY_PROPERTY -}; EventRow* event_row_new (void); EventRow* event_row_construct (GType object_type); static void event_row_finalize (EventRow * obj); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType event_table_get_type (void) G_GNUC_CONST; -enum { - EVENT_TABLE_DUMMY_PROPERTY -}; static EventTable* event_table_new (void); static EventTable* event_table_construct (GType object_type); DatabaseTable* database_table_construct (GType object_type); -void database_table_fatal (const gchar* op, gint res); -void database_table_set_table_name (DatabaseTable* self, const gchar* table_name); +void database_table_fatal (const gchar* op, + gint res); +void database_table_set_table_name (DatabaseTable* self, + const gchar* table_name); EventTable* event_table_get_instance (void); -static gchar* event_table_source_id_upgrade (EventTable* self, gint64 primary_photo_id, const gchar* primary_source_id); +static gchar* event_table_source_id_upgrade (EventTable* self, + gint64 primary_photo_id, + const gchar* primary_source_id); gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); -gboolean media_collection_registry_is_valid_source_id (MediaCollectionRegistry* self, const gchar* source_id); +gboolean media_collection_registry_is_valid_source_id (MediaCollectionRegistry* self, + const gchar* source_id); #define PHOTO_ID_INVALID ((gint64) -1) GType photo_id_get_type (void) G_GNUC_CONST; PhotoID* photo_id_dup (const PhotoID* self); void photo_id_free (PhotoID* self); gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id); -void photo_id_init (PhotoID *self, gint64 id); +void photo_id_init (PhotoID *self, + gint64 id); GQuark database_error_quark (void); -EventRow* event_table_create (EventTable* self, const gchar* primary_source_id, const gchar* comment, GError** error); +EventRow* event_table_create (EventTable* self, + const gchar* primary_source_id, + const gchar* comment, + GError** error); gulong now_sec (void); -void database_table_throw_error (const gchar* method, gint res, GError** error); -void event_table_create_from_row (EventTable* self, EventRow* row, EventID* result); -EventRow* event_table_get_row (EventTable* self, EventID* event_id); -void event_table_remove (EventTable* self, EventID* event_id, GError** error); -void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error); +void database_table_throw_error (const gchar* method, + gint res, + GError** error); +void event_table_create_from_row (EventTable* self, + EventRow* row, + EventID* result); +EventRow* event_table_get_row (EventTable* self, + EventID* event_id); +void event_table_remove (EventTable* self, + EventID* event_id, + GError** error); +void database_table_delete_by_id (DatabaseTable* self, + gint64 id, + GError** error); GeeArrayList* event_table_get_events (EventTable* self); -gboolean event_table_rename (EventTable* self, EventID* event_id, const gchar* name); -gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text); -gchar* event_table_get_name (EventTable* self, EventID* event_id); -gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt* * stmt); -gchar* event_table_get_primary_source_id (EventTable* self, EventID* event_id); -gboolean event_table_set_primary_source_id (EventTable* self, EventID* event_id, const gchar* primary_source_id); -time_t event_table_get_time_created (EventTable* self, EventID* event_id); -gboolean event_table_set_comment (EventTable* self, EventID* event_id, const gchar* new_comment); +gboolean event_table_rename (EventTable* self, + EventID* event_id, + const gchar* name); +gboolean database_table_update_text_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text); +gchar* event_table_get_name (EventTable* self, + EventID* event_id); +gboolean database_table_select_by_id (DatabaseTable* self, + gint64 id, + const gchar* columns, + sqlite3_stmt* * stmt); +gchar* event_table_get_primary_source_id (EventTable* self, + EventID* event_id); +gboolean event_table_set_primary_source_id (EventTable* self, + EventID* event_id, + const gchar* primary_source_id); +time_t event_table_get_time_created (EventTable* self, + EventID* event_id); +gboolean event_table_set_comment (EventTable* self, + EventID* event_id, + const gchar* new_comment); static void event_table_finalize (DatabaseTable * obj); -void event_id_init (EventID *self, gint64 id) { - gint64 _tmp0_; +void +event_id_init (EventID *self, + gint64 id) +{ #line 12 "/home/jens/Source/shotwell/src/db/EventTable.vala" memset (self, 0, sizeof (EventID)); #line 13 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp0_ = id; -#line 13 "/home/jens/Source/shotwell/src/db/EventTable.vala" - (*self).id = _tmp0_; -#line 227 "EventTable.c" + (*self).id = id; +#line 274 "EventTable.c" } -gboolean event_id_is_invalid (EventID *self) { +gboolean +event_id_is_invalid (EventID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 17 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -236,11 +285,13 @@ gboolean event_id_is_invalid (EventID *self) { result = _tmp0_ == EVENT_ID_INVALID; #line 17 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 240 "EventTable.c" +#line 289 "EventTable.c" } -gboolean event_id_is_valid (EventID *self) { +gboolean +event_id_is_valid (EventID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 21 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -249,11 +300,13 @@ gboolean event_id_is_valid (EventID *self) { result = _tmp0_ != EVENT_ID_INVALID; #line 21 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 253 "EventTable.c" +#line 304 "EventTable.c" } -EventID* event_id_dup (const EventID* self) { +EventID* +event_id_dup (const EventID* self) +{ EventID* dup; #line 7 "/home/jens/Source/shotwell/src/db/EventTable.vala" dup = g_new0 (EventID, 1); @@ -261,18 +314,22 @@ EventID* event_id_dup (const EventID* self) { memcpy (dup, self, sizeof (EventID)); #line 7 "/home/jens/Source/shotwell/src/db/EventTable.vala" return dup; -#line 265 "EventTable.c" +#line 318 "EventTable.c" } -void event_id_free (EventID* self) { +void +event_id_free (EventID* self) +{ #line 7 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_free (self); -#line 272 "EventTable.c" +#line 327 "EventTable.c" } -GType event_id_get_type (void) { +GType +event_id_get_type (void) +{ static volatile gsize event_id_type_id__volatile = 0; if (g_once_init_enter (&event_id_type_id__volatile)) { GType event_id_type_id; @@ -283,121 +340,150 @@ GType event_id_get_type (void) { } -EventRow* event_row_construct (GType object_type) { +EventRow* +event_row_construct (GType object_type) +{ EventRow* self = NULL; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" self = (EventRow*) g_type_create_instance (object_type); #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" return self; -#line 293 "EventTable.c" +#line 352 "EventTable.c" } -EventRow* event_row_new (void) { +EventRow* +event_row_new (void) +{ #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" return event_row_construct (TYPE_EVENT_ROW); -#line 300 "EventTable.c" +#line 361 "EventTable.c" } -static void value_event_row_init (GValue* value) { +static void +value_event_row_init (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" value->data[0].v_pointer = NULL; -#line 307 "EventTable.c" +#line 370 "EventTable.c" } -static void value_event_row_free_value (GValue* value) { +static void +value_event_row_free_value (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" event_row_unref (value->data[0].v_pointer); -#line 316 "EventTable.c" +#line 381 "EventTable.c" } } -static void value_event_row_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_event_row_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (src_value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" dest_value->data[0].v_pointer = event_row_ref (src_value->data[0].v_pointer); -#line 326 "EventTable.c" +#line 394 "EventTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" dest_value->data[0].v_pointer = NULL; -#line 330 "EventTable.c" +#line 398 "EventTable.c" } } -static gpointer value_event_row_peek_pointer (const GValue* value) { +static gpointer +value_event_row_peek_pointer (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" return value->data[0].v_pointer; -#line 338 "EventTable.c" +#line 408 "EventTable.c" } -static gchar* value_event_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_event_row_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (collect_values[0].v_pointer) { -#line 345 "EventTable.c" +#line 420 "EventTable.c" EventRow * object; object = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (object->parent_instance.g_class == NULL) { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 352 "EventTable.c" +#line 427 "EventTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.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 356 "EventTable.c" +#line 431 "EventTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" value->data[0].v_pointer = event_row_ref (object); -#line 360 "EventTable.c" +#line 435 "EventTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" value->data[0].v_pointer = NULL; -#line 364 "EventTable.c" +#line 439 "EventTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" return NULL; -#line 368 "EventTable.c" +#line 443 "EventTable.c" } -static gchar* value_event_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_event_row_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ EventRow ** object_p; object_p = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (!object_p) { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 379 "EventTable.c" +#line 459 "EventTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (!value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" *object_p = NULL; -#line 385 "EventTable.c" +#line 465 "EventTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" *object_p = value->data[0].v_pointer; -#line 389 "EventTable.c" +#line 469 "EventTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" *object_p = event_row_ref (value->data[0].v_pointer); -#line 393 "EventTable.c" +#line 473 "EventTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" return NULL; -#line 397 "EventTable.c" +#line 477 "EventTable.c" } -GParamSpec* param_spec_event_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_event_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecEventRow* spec; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_EVENT_ROW), NULL); @@ -407,20 +493,25 @@ GParamSpec* param_spec_event_row (const gchar* name, const gchar* nick, const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" return G_PARAM_SPEC (spec); -#line 411 "EventTable.c" +#line 497 "EventTable.c" } -gpointer value_get_event_row (const GValue* value) { +gpointer +value_get_event_row (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EVENT_ROW), NULL); #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" return value->data[0].v_pointer; -#line 420 "EventTable.c" +#line 508 "EventTable.c" } -void value_set_event_row (GValue* value, gpointer v_object) { +void +value_set_event_row (GValue* value, + gpointer v_object) +{ EventRow * old; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EVENT_ROW)); @@ -436,22 +527,25 @@ void value_set_event_row (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" event_row_ref (value->data[0].v_pointer); -#line 440 "EventTable.c" +#line 531 "EventTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" value->data[0].v_pointer = NULL; -#line 444 "EventTable.c" +#line 535 "EventTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" event_row_unref (old); -#line 450 "EventTable.c" +#line 541 "EventTable.c" } } -void value_take_event_row (GValue* value, gpointer v_object) { +void +value_take_event_row (GValue* value, + gpointer v_object) +{ EventRow * old; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EVENT_ROW)); @@ -465,38 +559,44 @@ void value_take_event_row (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" value->data[0].v_pointer = v_object; -#line 469 "EventTable.c" +#line 563 "EventTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" value->data[0].v_pointer = NULL; -#line 473 "EventTable.c" +#line 567 "EventTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" event_row_unref (old); -#line 479 "EventTable.c" +#line 573 "EventTable.c" } } -static void event_row_class_init (EventRowClass * klass) { +static void +event_row_class_init (EventRowClass * klass) +{ #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" event_row_parent_class = g_type_class_peek_parent (klass); #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" ((EventRowClass *) klass)->finalize = event_row_finalize; -#line 489 "EventTable.c" +#line 585 "EventTable.c" } -static void event_row_instance_init (EventRow * self) { +static void +event_row_instance_init (EventRow * self) +{ #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" self->ref_count = 1; -#line 496 "EventTable.c" +#line 594 "EventTable.c" } -static void event_row_finalize (EventRow * obj) { +static void +event_row_finalize (EventRow * obj) +{ EventRow * self; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_ROW, EventRow); @@ -508,11 +608,13 @@ static void event_row_finalize (EventRow * obj) { _g_free0 (self->primary_source_id); #line 30 "/home/jens/Source/shotwell/src/db/EventTable.vala" _g_free0 (self->comment); -#line 512 "EventTable.c" +#line 612 "EventTable.c" } -GType event_row_get_type (void) { +GType +event_row_get_type (void) +{ static volatile gsize event_row_type_id__volatile = 0; if (g_once_init_enter (&event_row_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_event_row_init, value_event_row_free_value, value_event_row_copy_value, value_event_row_peek_pointer, "p", value_event_row_collect_value, "p", value_event_row_lcopy_value }; @@ -526,18 +628,22 @@ GType event_row_get_type (void) { } -gpointer event_row_ref (gpointer instance) { +gpointer +event_row_ref (gpointer instance) +{ EventRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_atomic_int_inc (&self->ref_count); #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" return instance; -#line 537 "EventTable.c" +#line 641 "EventTable.c" } -void event_row_unref (gpointer instance) { +void +event_row_unref (gpointer instance) +{ EventRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -546,12 +652,14 @@ void event_row_unref (gpointer instance) { EVENT_ROW_GET_CLASS (self)->finalize (self); #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 550 "EventTable.c" +#line 656 "EventTable.c" } } -static EventTable* event_table_construct (GType object_type) { +static EventTable* +event_table_construct (GType object_type) +{ EventTable* self = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -561,7 +669,6 @@ static EventTable* event_table_construct (GType object_type) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; #line 36 "/home/jens/Source/shotwell/src/db/EventTable.vala" self = (EventTable*) database_table_construct (object_type); #line 38 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -581,20 +688,18 @@ static EventTable* event_table_construct (GType object_type) { #line 48 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp4_ = stmt; #line 48 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 48 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 49 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 49 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp6_ != SQLITE_DONE) { -#line 592 "EventTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_DONE) { +#line 697 "EventTable.c" + gint _tmp6_; #line 50 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 50 "/home/jens/Source/shotwell/src/db/EventTable.vala" - database_table_fatal ("create photo table", _tmp7_); -#line 598 "EventTable.c" + database_table_fatal ("create photo table", _tmp6_); +#line 703 "EventTable.c" } #line 52 "/home/jens/Source/shotwell/src/db/EventTable.vala" database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "EventTable"); @@ -602,25 +707,31 @@ static EventTable* event_table_construct (GType object_type) { _sqlite3_finalize0 (stmt); #line 36 "/home/jens/Source/shotwell/src/db/EventTable.vala" return self; -#line 606 "EventTable.c" +#line 711 "EventTable.c" } -static EventTable* event_table_new (void) { +static EventTable* +event_table_new (void) +{ #line 36 "/home/jens/Source/shotwell/src/db/EventTable.vala" return event_table_construct (TYPE_EVENT_TABLE); -#line 613 "EventTable.c" +#line 720 "EventTable.c" } -static gpointer _database_table_ref0 (gpointer self) { +static gpointer +_database_table_ref0 (gpointer self) +{ #line 59 "/home/jens/Source/shotwell/src/db/EventTable.vala" return self ? database_table_ref (self) : NULL; -#line 620 "EventTable.c" +#line 729 "EventTable.c" } -EventTable* event_table_get_instance (void) { +EventTable* +event_table_get_instance (void) +{ EventTable* result = NULL; EventTable* _tmp0_; EventTable* _tmp2_; @@ -629,7 +740,7 @@ EventTable* event_table_get_instance (void) { _tmp0_ = event_table_instance; #line 56 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (_tmp0_ == NULL) { -#line 633 "EventTable.c" +#line 744 "EventTable.c" EventTable* _tmp1_; #line 57 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp1_ = event_table_new (); @@ -637,7 +748,7 @@ EventTable* event_table_get_instance (void) { _database_table_unref0 (event_table_instance); #line 57 "/home/jens/Source/shotwell/src/db/EventTable.vala" event_table_instance = _tmp1_; -#line 641 "EventTable.c" +#line 752 "EventTable.c" } #line 59 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp2_ = event_table_instance; @@ -647,18 +758,19 @@ EventTable* event_table_get_instance (void) { result = _tmp3_; #line 59 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 651 "EventTable.c" +#line 762 "EventTable.c" } -static gchar* event_table_source_id_upgrade (EventTable* self, gint64 primary_photo_id, const gchar* primary_source_id) { +static gchar* +event_table_source_id_upgrade (EventTable* self, + gint64 primary_photo_id, + const gchar* primary_source_id) +{ gchar* result = NULL; MediaCollectionRegistry* _tmp0_; MediaCollectionRegistry* _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; - gint64 _tmp7_; + gboolean _tmp2_; #line 63 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), NULL); #line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -666,201 +778,163 @@ static gchar* event_table_source_id_upgrade (EventTable* self, gint64 primary_ph #line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp1_ = _tmp0_; #line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp2_ = primary_source_id; -#line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp3_ = media_collection_registry_is_valid_source_id (_tmp1_, _tmp2_); -#line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp4_ = _tmp3_; + _tmp2_ = media_collection_registry_is_valid_source_id (_tmp1_, primary_source_id); #line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala" _media_collection_registry_unref0 (_tmp1_); #line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp4_) { -#line 679 "EventTable.c" - const gchar* _tmp5_; - gchar* _tmp6_; -#line 65 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp5_ = primary_source_id; + if (_tmp2_) { +#line 787 "EventTable.c" + gchar* _tmp3_; #line 65 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp6_ = g_strdup (_tmp5_); + _tmp3_ = g_strdup (primary_source_id); #line 65 "/home/jens/Source/shotwell/src/db/EventTable.vala" - result = _tmp6_; + result = _tmp3_; #line 65 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 690 "EventTable.c" +#line 795 "EventTable.c" } #line 67 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp7_ = primary_photo_id; -#line 67 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp7_ != PHOTO_ID_INVALID) { -#line 696 "EventTable.c" - gint64 _tmp8_; - PhotoID _tmp9_ = {0}; - gchar* _tmp10_; -#line 69 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp8_ = primary_photo_id; + if (primary_photo_id != PHOTO_ID_INVALID) { +#line 799 "EventTable.c" + PhotoID _tmp4_ = {0}; + gchar* _tmp5_; #line 69 "/home/jens/Source/shotwell/src/db/EventTable.vala" - photo_id_init (&_tmp9_, _tmp8_); + photo_id_init (&_tmp4_, primary_photo_id); #line 69 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp10_ = photo_id_upgrade_photo_id_to_source_id (&_tmp9_); + _tmp5_ = photo_id_upgrade_photo_id_to_source_id (&_tmp4_); #line 69 "/home/jens/Source/shotwell/src/db/EventTable.vala" - result = _tmp10_; + result = _tmp5_; #line 69 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 710 "EventTable.c" +#line 810 "EventTable.c" } #line 71 "/home/jens/Source/shotwell/src/db/EventTable.vala" result = NULL; #line 71 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 716 "EventTable.c" +#line 816 "EventTable.c" } -EventRow* event_table_create (EventTable* self, const gchar* primary_source_id, const gchar* comment, GError** error) { +EventRow* +event_table_create (EventTable* self, + const gchar* primary_source_id, + const gchar* comment, + GError** error) +{ EventRow* result = NULL; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp3_; - sqlite3_stmt* _tmp4_ = NULL; - gint _tmp5_; - gint _tmp6_; + sqlite3* _tmp1_; + sqlite3_stmt* _tmp2_ = NULL; + gint _tmp3_; + gint _tmp4_; time_t time_created = 0; - gulong _tmp7_; - sqlite3_stmt* _tmp8_; - const gchar* _tmp9_; - gchar* _tmp10_; - GDestroyNotify _tmp11_; - gint _tmp12_; - gint _tmp13_; - sqlite3_stmt* _tmp14_; - time_t _tmp15_; - gint _tmp16_; + sqlite3_stmt* _tmp5_; + gchar* _tmp6_; + GDestroyNotify _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + time_t _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; + gchar* _tmp13_; + GDestroyNotify _tmp14_; + gint _tmp15_; + sqlite3_stmt* _tmp16_; gint _tmp17_; - sqlite3_stmt* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; - GDestroyNotify _tmp21_; - gint _tmp22_; - gint _tmp23_; - sqlite3_stmt* _tmp24_; - gint _tmp25_; - gint _tmp26_; EventRow* row = NULL; - EventRow* _tmp28_; - EventRow* _tmp29_; - sqlite3* _tmp30_; - gint64 _tmp31_; - EventRow* _tmp32_; - EventRow* _tmp33_; - const gchar* _tmp34_; - gchar* _tmp35_; - EventRow* _tmp36_; - time_t _tmp37_; - EventRow* _tmp38_; - const gchar* _tmp39_; - gchar* _tmp40_; + EventRow* _tmp19_; + EventRow* _tmp20_; + sqlite3* _tmp21_; + EventRow* _tmp22_; + EventRow* _tmp23_; + gchar* _tmp24_; + EventRow* _tmp25_; + time_t _tmp26_; + EventRow* _tmp27_; + gchar* _tmp28_; GError * _inner_error_ = NULL; #line 74 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), NULL); #line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp1_ = primary_source_id; -#line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp1_ != NULL) { -#line 772 "EventTable.c" - const gchar* _tmp2_; -#line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp2_ = primary_source_id; + if (primary_source_id != NULL) { #line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp0_ = g_strcmp0 (_tmp2_, "") != 0; -#line 778 "EventTable.c" + _tmp0_ = g_strcmp0 (primary_source_id, "") != 0; +#line 866 "EventTable.c" } else { #line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp0_ = FALSE; -#line 782 "EventTable.c" +#line 870 "EventTable.c" } #line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala" _vala_assert (_tmp0_, "primary_source_id != null && primary_source_id != \"\""); #line 78 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp3_ = database_table_db; + _tmp1_ = database_table_db; #line 78 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp5_ = sqlite3_prepare_v2 (_tmp3_, "INSERT INTO EventTable (primary_source_id, time_created, comment) VALU" \ -"ES (?, ?, ?)", -1, &_tmp4_, NULL); + _tmp3_ = sqlite3_prepare_v2 (_tmp1_, "INSERT INTO EventTable (primary_source_id, time_created, comment) VALU" \ +"ES (?, ?, ?)", -1, &_tmp2_, NULL); #line 78 "/home/jens/Source/shotwell/src/db/EventTable.vala" _sqlite3_finalize0 (stmt); #line 78 "/home/jens/Source/shotwell/src/db/EventTable.vala" - stmt = _tmp4_; + stmt = _tmp2_; #line 78 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp5_; + res = _tmp3_; #line 81 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp6_ = res; + _tmp4_ = res; #line 81 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); -#line 83 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp7_ = now_sec (); + _vala_assert (_tmp4_ == SQLITE_OK, "res == Sqlite.OK"); #line 83 "/home/jens/Source/shotwell/src/db/EventTable.vala" - time_created = (time_t) _tmp7_; -#line 85 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp8_ = stmt; + time_created = (time_t) now_sec (); #line 85 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp9_ = primary_source_id; + _tmp5_ = stmt; #line 85 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp10_ = g_strdup (_tmp9_); + _tmp6_ = g_strdup (primary_source_id); #line 85 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp11_ = g_free; + _tmp7_ = g_free; #line 85 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp12_ = sqlite3_bind_text (_tmp8_, 1, _tmp10_, -1, _tmp11_); -#line 85 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp12_; + res = sqlite3_bind_text (_tmp5_, 1, _tmp6_, -1, _tmp7_); #line 86 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp13_ = res; + _tmp8_ = res; #line 86 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); -#line 87 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp14_ = stmt; + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 87 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp15_ = time_created; + _tmp9_ = stmt; #line 87 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp16_ = sqlite3_bind_int64 (_tmp14_, 2, (gint64) _tmp15_); + _tmp10_ = time_created; #line 87 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp16_; + res = sqlite3_bind_int64 (_tmp9_, 2, (gint64) _tmp10_); #line 88 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp17_ = res; + _tmp11_ = res; #line 88 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); -#line 89 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp18_ = stmt; -#line 89 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp19_ = comment; + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 89 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp20_ = g_strdup (_tmp19_); + _tmp12_ = stmt; #line 89 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp21_ = g_free; + _tmp13_ = g_strdup (comment); #line 89 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp22_ = sqlite3_bind_text (_tmp18_, 3, _tmp20_, -1, _tmp21_); + _tmp14_ = g_free; #line 89 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp22_; + res = sqlite3_bind_text (_tmp12_, 3, _tmp13_, -1, _tmp14_); #line 90 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp23_ = res; + _tmp15_ = res; #line 90 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK"); #line 92 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp24_ = stmt; + _tmp16_ = stmt; #line 92 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp25_ = sqlite3_step (_tmp24_); -#line 92 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp25_; + res = sqlite3_step (_tmp16_); #line 93 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp26_ = res; + _tmp17_ = res; #line 93 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp26_ != SQLITE_DONE) { -#line 858 "EventTable.c" - gint _tmp27_; + if (_tmp17_ != SQLITE_DONE) { +#line 932 "EventTable.c" + gint _tmp18_; #line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp27_ = res; + _tmp18_ = res; #line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala" - database_table_throw_error ("EventTable.create", _tmp27_, &_inner_error_); + database_table_throw_error ("EventTable.create", _tmp18_, &_inner_error_); #line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -871,7 +945,7 @@ EventRow* event_table_create (EventTable* self, const gchar* primary_source_id, _sqlite3_finalize0 (stmt); #line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala" return NULL; -#line 874 "EventTable.c" +#line 948 "EventTable.c" } else { #line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala" _sqlite3_finalize0 (stmt); @@ -881,65 +955,63 @@ EventRow* event_table_create (EventTable* self, const gchar* primary_source_id, g_clear_error (&_inner_error_); #line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala" return NULL; -#line 884 "EventTable.c" +#line 958 "EventTable.c" } } } #line 96 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp28_ = event_row_new (); + _tmp19_ = event_row_new (); #line 96 "/home/jens/Source/shotwell/src/db/EventTable.vala" - row = _tmp28_; + row = _tmp19_; #line 97 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp29_ = row; -#line 97 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp30_ = database_table_db; + _tmp20_ = row; #line 97 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp31_ = sqlite3_last_insert_rowid (_tmp30_); + _tmp21_ = database_table_db; #line 97 "/home/jens/Source/shotwell/src/db/EventTable.vala" - event_id_init (&_tmp29_->event_id, _tmp31_); + event_id_init (&_tmp20_->event_id, sqlite3_last_insert_rowid (_tmp21_)); #line 98 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp32_ = row; + _tmp22_ = row; #line 98 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _g_free0 (_tmp32_->name); + _g_free0 (_tmp22_->name); #line 98 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp32_->name = NULL; -#line 99 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp33_ = row; + _tmp22_->name = NULL; #line 99 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp34_ = primary_source_id; + _tmp23_ = row; #line 99 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp35_ = g_strdup (_tmp34_); + _tmp24_ = g_strdup (primary_source_id); #line 99 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _g_free0 (_tmp33_->primary_source_id); + _g_free0 (_tmp23_->primary_source_id); #line 99 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp33_->primary_source_id = _tmp35_; + _tmp23_->primary_source_id = _tmp24_; #line 100 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp36_ = row; + _tmp25_ = row; #line 100 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp37_ = time_created; + _tmp26_ = time_created; #line 100 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp36_->time_created = _tmp37_; + _tmp25_->time_created = _tmp26_; #line 101 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp38_ = row; -#line 101 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp39_ = comment; + _tmp27_ = row; #line 101 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp40_ = g_strdup (_tmp39_); + _tmp28_ = g_strdup (comment); #line 101 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _g_free0 (_tmp38_->comment); + _g_free0 (_tmp27_->comment); #line 101 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp38_->comment = _tmp40_; + _tmp27_->comment = _tmp28_; #line 103 "/home/jens/Source/shotwell/src/db/EventTable.vala" result = row; #line 103 "/home/jens/Source/shotwell/src/db/EventTable.vala" _sqlite3_finalize0 (stmt); #line 103 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 938 "EventTable.c" +#line 1006 "EventTable.c" } -void event_table_create_from_row (EventTable* self, EventRow* row, EventID* result) { +void +event_table_create_from_row (EventTable* self, + EventRow* row, + EventID* result) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -947,40 +1019,29 @@ void event_table_create_from_row (EventTable* self, EventRow* row, EventID* resu gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - EventRow* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; - GDestroyNotify _tmp8_; - gint _tmp9_; + const gchar* _tmp5_; + gchar* _tmp6_; + GDestroyNotify _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; gint _tmp10_; sqlite3_stmt* _tmp11_; - gint _tmp12_; - gint _tmp13_; - sqlite3_stmt* _tmp14_; - EventRow* _tmp15_; - const gchar* _tmp16_; - gchar* _tmp17_; - GDestroyNotify _tmp18_; - gint _tmp19_; - gint _tmp20_; - sqlite3_stmt* _tmp21_; - EventRow* _tmp22_; - time_t _tmp23_; - gint _tmp24_; + const gchar* _tmp12_; + gchar* _tmp13_; + GDestroyNotify _tmp14_; + gint _tmp15_; + sqlite3_stmt* _tmp16_; + time_t _tmp17_; + gint _tmp18_; + sqlite3_stmt* _tmp19_; + const gchar* _tmp20_; + gchar* _tmp21_; + GDestroyNotify _tmp22_; + gint _tmp23_; + sqlite3_stmt* _tmp24_; gint _tmp25_; - sqlite3_stmt* _tmp26_; - EventRow* _tmp27_; - const gchar* _tmp28_; - gchar* _tmp29_; - GDestroyNotify _tmp30_; - gint _tmp31_; - gint _tmp32_; - sqlite3_stmt* _tmp33_; - gint _tmp34_; - gint _tmp35_; - sqlite3* _tmp38_; - gint64 _tmp39_; - EventID _tmp40_ = {0}; + sqlite3* _tmp28_; + EventID _tmp29_ = {0}; #line 109 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_if_fail (IS_EVENT_TABLE (self)); #line 109 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1003,125 +1064,106 @@ void event_table_create_from_row (EventTable* self, EventRow* row, EventID* resu #line 115 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp4_ = stmt; #line 115 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp5_ = row; -#line 115 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp6_ = _tmp5_->name; + _tmp5_ = row->name; #line 115 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp7_ = g_strdup (_tmp6_); -#line 115 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp8_ = g_free; + _tmp6_ = g_strdup (_tmp5_); #line 115 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp9_ = sqlite3_bind_text (_tmp4_, 1, _tmp7_, -1, _tmp8_); + _tmp7_ = g_free; #line 115 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp9_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); #line 116 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp10_ = res; + _tmp8_ = res; #line 116 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); -#line 117 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp11_ = stmt; + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 117 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp12_ = sqlite3_bind_int64 (_tmp11_, 2, PHOTO_ID_INVALID); + _tmp9_ = stmt; #line 117 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp12_; + res = sqlite3_bind_int64 (_tmp9_, 2, PHOTO_ID_INVALID); #line 118 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp13_ = res; + _tmp10_ = res; #line 118 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); -#line 119 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp14_ = stmt; -#line 119 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp15_ = row; + _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); #line 119 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp16_ = _tmp15_->primary_source_id; + _tmp11_ = stmt; #line 119 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp17_ = g_strdup (_tmp16_); + _tmp12_ = row->primary_source_id; #line 119 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp18_ = g_free; + _tmp13_ = g_strdup (_tmp12_); #line 119 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp19_ = sqlite3_bind_text (_tmp14_, 3, _tmp17_, -1, _tmp18_); + _tmp14_ = g_free; #line 119 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp19_; + res = sqlite3_bind_text (_tmp11_, 3, _tmp13_, -1, _tmp14_); #line 120 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp20_ = res; + _tmp15_ = res; #line 120 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _vala_assert (_tmp20_ == SQLITE_OK, "res == Sqlite.OK"); -#line 121 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp21_ = stmt; -#line 121 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp22_ = row; + _vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK"); #line 121 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp23_ = _tmp22_->time_created; + _tmp16_ = stmt; #line 121 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp24_ = sqlite3_bind_int64 (_tmp21_, 4, (gint64) _tmp23_); + _tmp17_ = row->time_created; #line 121 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp24_; + res = sqlite3_bind_int64 (_tmp16_, 4, (gint64) _tmp17_); #line 122 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp25_ = res; + _tmp18_ = res; #line 122 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK"); -#line 123 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp26_ = stmt; + _vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK"); #line 123 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp27_ = row; + _tmp19_ = stmt; #line 123 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp28_ = _tmp27_->comment; + _tmp20_ = row->comment; #line 123 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp29_ = g_strdup (_tmp28_); + _tmp21_ = g_strdup (_tmp20_); #line 123 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp30_ = g_free; + _tmp22_ = g_free; #line 123 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp31_ = sqlite3_bind_text (_tmp26_, 5, _tmp29_, -1, _tmp30_); -#line 123 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp31_; + res = sqlite3_bind_text (_tmp19_, 5, _tmp21_, -1, _tmp22_); #line 124 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp32_ = res; + _tmp23_ = res; #line 124 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _vala_assert (_tmp32_ == SQLITE_OK, "res == Sqlite.OK"); -#line 126 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp33_ = stmt; + _vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK"); #line 126 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp34_ = sqlite3_step (_tmp33_); + _tmp24_ = stmt; #line 126 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp34_; + res = sqlite3_step (_tmp24_); #line 127 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp35_ = res; + _tmp25_ = res; #line 127 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp35_ != SQLITE_DONE) { -#line 1090 "EventTable.c" - gint _tmp36_; - EventID _tmp37_ = {0}; + if (_tmp25_ != SQLITE_DONE) { +#line 1131 "EventTable.c" + gint _tmp26_; + EventID _tmp27_ = {0}; #line 128 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp36_ = res; + _tmp26_ = res; #line 128 "/home/jens/Source/shotwell/src/db/EventTable.vala" - database_table_fatal ("Event create_from_row", _tmp36_); + database_table_fatal ("Event create_from_row", _tmp26_); #line 130 "/home/jens/Source/shotwell/src/db/EventTable.vala" - event_id_init (&_tmp37_, EVENT_ID_INVALID); + event_id_init (&_tmp27_, EVENT_ID_INVALID); #line 130 "/home/jens/Source/shotwell/src/db/EventTable.vala" - *result = _tmp37_; + *result = _tmp27_; #line 130 "/home/jens/Source/shotwell/src/db/EventTable.vala" _sqlite3_finalize0 (stmt); #line 130 "/home/jens/Source/shotwell/src/db/EventTable.vala" return; -#line 1105 "EventTable.c" +#line 1146 "EventTable.c" } #line 133 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp38_ = database_table_db; + _tmp28_ = database_table_db; #line 133 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp39_ = sqlite3_last_insert_rowid (_tmp38_); + event_id_init (&_tmp29_, sqlite3_last_insert_rowid (_tmp28_)); #line 133 "/home/jens/Source/shotwell/src/db/EventTable.vala" - event_id_init (&_tmp40_, _tmp39_); -#line 133 "/home/jens/Source/shotwell/src/db/EventTable.vala" - *result = _tmp40_; + *result = _tmp29_; #line 133 "/home/jens/Source/shotwell/src/db/EventTable.vala" _sqlite3_finalize0 (stmt); #line 133 "/home/jens/Source/shotwell/src/db/EventTable.vala" return; -#line 1119 "EventTable.c" +#line 1158 "EventTable.c" } -EventRow* event_table_get_row (EventTable* self, EventID* event_id) { +EventRow* +event_table_get_row (EventTable* self, + EventID* event_id) +{ EventRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1133,33 +1175,29 @@ EventRow* event_table_get_row (EventTable* self, EventID* event_id) { EventID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; + sqlite3_stmt* _tmp8_; EventRow* row = NULL; - EventRow* _tmp11_; + EventRow* _tmp9_; + EventRow* _tmp10_; + EventID _tmp11_; EventRow* _tmp12_; - EventID _tmp13_; - EventRow* _tmp14_; - sqlite3_stmt* _tmp15_; - const gchar* _tmp16_; - gchar* _tmp17_; - gboolean _tmp18_ = FALSE; - EventRow* _tmp19_; - const gchar* _tmp20_; - EventRow* _tmp26_; - sqlite3_stmt* _tmp27_; - gint64 _tmp28_; - sqlite3_stmt* _tmp29_; - const gchar* _tmp30_; - gchar* _tmp31_; - EventRow* _tmp32_; - sqlite3_stmt* _tmp33_; - gint64 _tmp34_; - EventRow* _tmp35_; - sqlite3_stmt* _tmp36_; - const gchar* _tmp37_; - gchar* _tmp38_; + sqlite3_stmt* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_; + gboolean _tmp16_ = FALSE; + EventRow* _tmp17_; + const gchar* _tmp18_; + EventRow* _tmp24_; + sqlite3_stmt* _tmp25_; + sqlite3_stmt* _tmp26_; + const gchar* _tmp27_; + gchar* _tmp28_; + EventRow* _tmp29_; + sqlite3_stmt* _tmp30_; + EventRow* _tmp31_; + sqlite3_stmt* _tmp32_; + const gchar* _tmp33_; + gchar* _tmp34_; #line 136 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), NULL); #line 136 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1186,135 +1224,131 @@ EventRow* event_table_get_row (EventTable* self, EventID* event_id) { #line 142 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp6_ = _tmp5_.id; #line 142 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 142 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 143 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 143 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 145 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp9_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 145 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 145 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp10_ != SQLITE_ROW) { + if (sqlite3_step (_tmp8_) != SQLITE_ROW) { #line 146 "/home/jens/Source/shotwell/src/db/EventTable.vala" result = NULL; #line 146 "/home/jens/Source/shotwell/src/db/EventTable.vala" _sqlite3_finalize0 (stmt); #line 146 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1206 "EventTable.c" +#line 1240 "EventTable.c" } #line 148 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp11_ = event_row_new (); + _tmp9_ = event_row_new (); #line 148 "/home/jens/Source/shotwell/src/db/EventTable.vala" - row = _tmp11_; + row = _tmp9_; #line 149 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp12_ = row; + _tmp10_ = row; #line 149 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp13_ = *event_id; + _tmp11_ = *event_id; #line 149 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp12_->event_id = _tmp13_; + _tmp10_->event_id = _tmp11_; #line 150 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp14_ = row; + _tmp12_ = row; #line 150 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp15_ = stmt; + _tmp13_ = stmt; #line 150 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp16_ = sqlite3_column_text (_tmp15_, 0); + _tmp14_ = sqlite3_column_text (_tmp13_, 0); #line 150 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp17_ = g_strdup (_tmp16_); + _tmp15_ = g_strdup (_tmp14_); #line 150 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _g_free0 (_tmp14_->name); + _g_free0 (_tmp12_->name); #line 150 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp14_->name = _tmp17_; + _tmp12_->name = _tmp15_; #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp19_ = row; + _tmp17_ = row; #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp20_ = _tmp19_->name; + _tmp18_ = _tmp17_->name; #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp20_ != NULL) { -#line 1236 "EventTable.c" - EventRow* _tmp21_; - const gchar* _tmp22_; - gint _tmp23_; - gint _tmp24_; + if (_tmp18_ != NULL) { +#line 1270 "EventTable.c" + EventRow* _tmp19_; + const gchar* _tmp20_; + gint _tmp21_; + gint _tmp22_; #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp21_ = row; + _tmp19_ = row; #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp22_ = _tmp21_->name; + _tmp20_ = _tmp19_->name; #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp23_ = strlen (_tmp22_); + _tmp21_ = strlen (_tmp20_); #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp24_ = _tmp23_; + _tmp22_ = _tmp21_; #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp18_ = _tmp24_ == 0; -#line 1251 "EventTable.c" + _tmp16_ = _tmp22_ == 0; +#line 1285 "EventTable.c" } else { #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp18_ = FALSE; -#line 1255 "EventTable.c" + _tmp16_ = FALSE; +#line 1289 "EventTable.c" } #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp18_) { -#line 1259 "EventTable.c" - EventRow* _tmp25_; + if (_tmp16_) { +#line 1293 "EventTable.c" + EventRow* _tmp23_; #line 152 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp25_ = row; + _tmp23_ = row; #line 152 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _g_free0 (_tmp25_->name); + _g_free0 (_tmp23_->name); #line 152 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp25_->name = NULL; -#line 1267 "EventTable.c" + _tmp23_->name = NULL; +#line 1301 "EventTable.c" } #line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp26_ = row; + _tmp24_ = row; #line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp27_ = stmt; + _tmp25_ = stmt; #line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp28_ = sqlite3_column_int64 (_tmp27_, 1); -#line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp29_ = stmt; + _tmp26_ = stmt; #line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp30_ = sqlite3_column_text (_tmp29_, 2); + _tmp27_ = sqlite3_column_text (_tmp26_, 2); #line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp31_ = event_table_source_id_upgrade (self, _tmp28_, _tmp30_); + _tmp28_ = event_table_source_id_upgrade (self, sqlite3_column_int64 (_tmp25_, 1), _tmp27_); #line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _g_free0 (_tmp26_->primary_source_id); + _g_free0 (_tmp24_->primary_source_id); #line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp26_->primary_source_id = _tmp31_; + _tmp24_->primary_source_id = _tmp28_; #line 154 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp32_ = row; -#line 154 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp33_ = stmt; + _tmp29_ = row; #line 154 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp34_ = sqlite3_column_int64 (_tmp33_, 3); + _tmp30_ = stmt; #line 154 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp32_->time_created = (time_t) _tmp34_; + _tmp29_->time_created = (time_t) sqlite3_column_int64 (_tmp30_, 3); #line 155 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp35_ = row; + _tmp31_ = row; #line 155 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp36_ = stmt; + _tmp32_ = stmt; #line 155 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp37_ = sqlite3_column_text (_tmp36_, 4); + _tmp33_ = sqlite3_column_text (_tmp32_, 4); #line 155 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp38_ = g_strdup (_tmp37_); + _tmp34_ = g_strdup (_tmp33_); #line 155 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _g_free0 (_tmp35_->comment); + _g_free0 (_tmp31_->comment); #line 155 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp35_->comment = _tmp38_; + _tmp31_->comment = _tmp34_; #line 157 "/home/jens/Source/shotwell/src/db/EventTable.vala" result = row; #line 157 "/home/jens/Source/shotwell/src/db/EventTable.vala" _sqlite3_finalize0 (stmt); #line 157 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1311 "EventTable.c" +#line 1341 "EventTable.c" } -void event_table_remove (EventTable* self, EventID* event_id, GError** error) { +void +event_table_remove (EventTable* self, + EventID* event_id, + GError** error) +{ EventID _tmp0_; gint64 _tmp1_; GError * _inner_error_ = NULL; @@ -1336,7 +1370,7 @@ void event_table_remove (EventTable* self, EventID* event_id, GError** error) { g_propagate_error (error, _inner_error_); #line 161 "/home/jens/Source/shotwell/src/db/EventTable.vala" return; -#line 1337 "EventTable.c" +#line 1371 "EventTable.c" } else { #line 161 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1344,13 +1378,15 @@ void event_table_remove (EventTable* self, EventID* event_id, GError** error) { g_clear_error (&_inner_error_); #line 161 "/home/jens/Source/shotwell/src/db/EventTable.vala" return; -#line 1345 "EventTable.c" +#line 1379 "EventTable.c" } } } -GeeArrayList* event_table_get_events (EventTable* self) { +GeeArrayList* +event_table_get_events (EventTable* self) +{ GeeArrayList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1381,146 +1417,134 @@ GeeArrayList* event_table_get_events (EventTable* self) { _tmp4_ = gee_array_list_new (TYPE_EVENT_ROW, (GBoxedCopyFunc) event_row_ref, (GDestroyNotify) event_row_unref, NULL, NULL, NULL); #line 170 "/home/jens/Source/shotwell/src/db/EventTable.vala" event_rows = _tmp4_; -#line 1381 "EventTable.c" +#line 1417 "EventTable.c" { gboolean _tmp5_ = FALSE; #line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp5_ = TRUE; #line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala" while (TRUE) { -#line 1388 "EventTable.c" +#line 1424 "EventTable.c" sqlite3_stmt* _tmp6_; gint _tmp7_; - gint _tmp8_; EventRow* row = NULL; + EventRow* _tmp10_; EventRow* _tmp11_; - EventRow* _tmp12_; - sqlite3_stmt* _tmp13_; - gint64 _tmp14_; - EventRow* _tmp15_; - sqlite3_stmt* _tmp16_; - const gchar* _tmp17_; - gchar* _tmp18_; - EventRow* _tmp19_; - sqlite3_stmt* _tmp20_; - gint64 _tmp21_; - sqlite3_stmt* _tmp22_; - const gchar* _tmp23_; - gchar* _tmp24_; - EventRow* _tmp25_; - sqlite3_stmt* _tmp26_; - gint64 _tmp27_; - EventRow* _tmp28_; - sqlite3_stmt* _tmp29_; - const gchar* _tmp30_; - gchar* _tmp31_; - GeeArrayList* _tmp32_; - EventRow* _tmp33_; + sqlite3_stmt* _tmp12_; + EventRow* _tmp13_; + sqlite3_stmt* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + EventRow* _tmp17_; + sqlite3_stmt* _tmp18_; + sqlite3_stmt* _tmp19_; + const gchar* _tmp20_; + gchar* _tmp21_; + EventRow* _tmp22_; + sqlite3_stmt* _tmp23_; + EventRow* _tmp24_; + sqlite3_stmt* _tmp25_; + const gchar* _tmp26_; + gchar* _tmp27_; + GeeArrayList* _tmp28_; + EventRow* _tmp29_; #line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (!_tmp5_) { -#line 1418 "EventTable.c" +#line 1450 "EventTable.c" } #line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp5_ = FALSE; #line 172 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp6_ = stmt; #line 172 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp7_ = sqlite3_step (_tmp6_); -#line 172 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp7_; + res = sqlite3_step (_tmp6_); #line 173 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 173 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp8_ == SQLITE_DONE) { + if (_tmp7_ == SQLITE_DONE) { #line 174 "/home/jens/Source/shotwell/src/db/EventTable.vala" break; -#line 1434 "EventTable.c" +#line 1464 "EventTable.c" } else { - gint _tmp9_; + gint _tmp8_; #line 175 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp9_ = res; + _tmp8_ = res; #line 175 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp9_ != SQLITE_ROW) { -#line 1441 "EventTable.c" - gint _tmp10_; + if (_tmp8_ != SQLITE_ROW) { +#line 1471 "EventTable.c" + gint _tmp9_; #line 176 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp10_ = res; + _tmp9_ = res; #line 176 "/home/jens/Source/shotwell/src/db/EventTable.vala" - database_table_fatal ("get_events", _tmp10_); + database_table_fatal ("get_events", _tmp9_); #line 178 "/home/jens/Source/shotwell/src/db/EventTable.vala" break; -#line 1449 "EventTable.c" +#line 1479 "EventTable.c" } } #line 181 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp11_ = event_row_new (); + _tmp10_ = event_row_new (); #line 181 "/home/jens/Source/shotwell/src/db/EventTable.vala" - row = _tmp11_; + row = _tmp10_; #line 183 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp12_ = row; + _tmp11_ = row; #line 183 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp13_ = stmt; + _tmp12_ = stmt; #line 183 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp14_ = sqlite3_column_int64 (_tmp13_, 0); -#line 183 "/home/jens/Source/shotwell/src/db/EventTable.vala" - event_id_init (&_tmp12_->event_id, _tmp14_); + event_id_init (&_tmp11_->event_id, sqlite3_column_int64 (_tmp12_, 0)); #line 184 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp15_ = row; + _tmp13_ = row; #line 184 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp16_ = stmt; + _tmp14_ = stmt; #line 184 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp17_ = sqlite3_column_text (_tmp16_, 1); + _tmp15_ = sqlite3_column_text (_tmp14_, 1); #line 184 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp18_ = g_strdup (_tmp17_); + _tmp16_ = g_strdup (_tmp15_); #line 184 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _g_free0 (_tmp15_->name); + _g_free0 (_tmp13_->name); #line 184 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp15_->name = _tmp18_; -#line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp19_ = row; + _tmp13_->name = _tmp16_; #line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp20_ = stmt; + _tmp17_ = row; #line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp21_ = sqlite3_column_int64 (_tmp20_, 2); + _tmp18_ = stmt; #line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp22_ = stmt; + _tmp19_ = stmt; #line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp23_ = sqlite3_column_text (_tmp22_, 3); + _tmp20_ = sqlite3_column_text (_tmp19_, 3); #line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp24_ = event_table_source_id_upgrade (self, _tmp21_, _tmp23_); + _tmp21_ = event_table_source_id_upgrade (self, sqlite3_column_int64 (_tmp18_, 2), _tmp20_); #line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _g_free0 (_tmp19_->primary_source_id); + _g_free0 (_tmp17_->primary_source_id); #line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp19_->primary_source_id = _tmp24_; + _tmp17_->primary_source_id = _tmp21_; #line 186 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp25_ = row; + _tmp22_ = row; #line 186 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp26_ = stmt; + _tmp23_ = stmt; #line 186 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp27_ = sqlite3_column_int64 (_tmp26_, 4); -#line 186 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp25_->time_created = (time_t) _tmp27_; + _tmp22_->time_created = (time_t) sqlite3_column_int64 (_tmp23_, 4); #line 187 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp28_ = row; + _tmp24_ = row; #line 187 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp29_ = stmt; + _tmp25_ = stmt; #line 187 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp30_ = sqlite3_column_text (_tmp29_, 5); + _tmp26_ = sqlite3_column_text (_tmp25_, 5); #line 187 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp31_ = g_strdup (_tmp30_); + _tmp27_ = g_strdup (_tmp26_); #line 187 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _g_free0 (_tmp28_->comment); + _g_free0 (_tmp24_->comment); #line 187 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp28_->comment = _tmp31_; + _tmp24_->comment = _tmp27_; #line 189 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp32_ = event_rows; + _tmp28_ = event_rows; #line 189 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp33_ = row; + _tmp29_ = row; #line 189 "/home/jens/Source/shotwell/src/db/EventTable.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp33_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_); #line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala" _event_row_unref0 (row); -#line 1520 "EventTable.c" +#line 1544 "EventTable.c" } } #line 192 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1529,52 +1553,49 @@ GeeArrayList* event_table_get_events (EventTable* self) { _sqlite3_finalize0 (stmt); #line 192 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1529 "EventTable.c" +#line 1553 "EventTable.c" } -gboolean event_table_rename (EventTable* self, EventID* event_id, const gchar* name) { +gboolean +event_table_rename (EventTable* self, + EventID* event_id, + const gchar* name) +{ gboolean result = FALSE; const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - EventID _tmp3_; - gint64 _tmp4_; - gboolean _tmp5_; + EventID _tmp1_; + gint64 _tmp2_; #line 195 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), FALSE); #line 195 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (event_id != NULL, FALSE); #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp1_ = name; -#line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp1_ != NULL) { -#line 1548 "EventTable.c" - const gchar* _tmp2_; + if (name != NULL) { #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp2_ = name; -#line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp0_ = _tmp2_; -#line 1554 "EventTable.c" + _tmp0_ = name; +#line 1574 "EventTable.c" } else { #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp0_ = ""; -#line 1558 "EventTable.c" +#line 1578 "EventTable.c" } #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp3_ = *event_id; -#line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp4_ = _tmp3_.id; + _tmp1_ = *event_id; #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp5_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "name", _tmp0_); + _tmp2_ = _tmp1_.id; #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" - result = _tmp5_; + result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "name", _tmp0_); #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1570 "EventTable.c" +#line 1588 "EventTable.c" } -gchar* event_table_get_name (EventTable* self, EventID* event_id) { +gchar* +event_table_get_name (EventTable* self, + EventID* event_id) +{ gchar* result = NULL; sqlite3_stmt* stmt = NULL; EventID _tmp0_; @@ -1611,7 +1632,7 @@ gchar* event_table_get_name (EventTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 202 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1611 "EventTable.c" +#line 1632 "EventTable.c" } #line 204 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp4_ = stmt; @@ -1625,7 +1646,7 @@ gchar* event_table_get_name (EventTable* self, EventID* event_id) { _tmp9_ = name; #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (_tmp9_ != NULL) { -#line 1625 "EventTable.c" +#line 1646 "EventTable.c" const gchar* _tmp10_; gint _tmp11_; gint _tmp12_; @@ -1637,25 +1658,25 @@ gchar* event_table_get_name (EventTable* self, EventID* event_id) { _tmp12_ = _tmp11_; #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp8_ = _tmp12_ > 0; -#line 1637 "EventTable.c" +#line 1658 "EventTable.c" } else { #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp8_ = FALSE; -#line 1641 "EventTable.c" +#line 1662 "EventTable.c" } #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (_tmp8_) { -#line 1645 "EventTable.c" +#line 1666 "EventTable.c" const gchar* _tmp13_; #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp13_ = name; #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp7_ = _tmp13_; -#line 1651 "EventTable.c" +#line 1672 "EventTable.c" } else { #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp7_ = NULL; -#line 1655 "EventTable.c" +#line 1676 "EventTable.c" } #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp14_ = g_strdup (_tmp7_); @@ -1667,11 +1688,14 @@ gchar* event_table_get_name (EventTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1667 "EventTable.c" +#line 1688 "EventTable.c" } -gchar* event_table_get_primary_source_id (EventTable* self, EventID* event_id) { +gchar* +event_table_get_primary_source_id (EventTable* self, + EventID* event_id) +{ gchar* result = NULL; sqlite3_stmt* stmt = NULL; EventID _tmp0_; @@ -1703,7 +1727,7 @@ gchar* event_table_get_primary_source_id (EventTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 212 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1703 "EventTable.c" +#line 1727 "EventTable.c" } #line 214 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp4_ = stmt; @@ -1717,16 +1741,18 @@ gchar* event_table_get_primary_source_id (EventTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 214 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1717 "EventTable.c" +#line 1741 "EventTable.c" } -gboolean event_table_set_primary_source_id (EventTable* self, EventID* event_id, const gchar* primary_source_id) { +gboolean +event_table_set_primary_source_id (EventTable* self, + EventID* event_id, + const gchar* primary_source_id) +{ gboolean result = FALSE; EventID _tmp0_; gint64 _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; #line 217 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), FALSE); #line 217 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1738,18 +1764,17 @@ gboolean event_table_set_primary_source_id (EventTable* self, EventID* event_id, #line 218 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp1_ = _tmp0_.id; #line 218 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp2_ = primary_source_id; -#line 218 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp3_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "primary_source_id", _tmp2_); -#line 218 "/home/jens/Source/shotwell/src/db/EventTable.vala" - result = _tmp3_; + result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "primary_source_id", primary_source_id); #line 218 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1745 "EventTable.c" +#line 1767 "EventTable.c" } -time_t event_table_get_time_created (EventTable* self, EventID* event_id) { +time_t +event_table_get_time_created (EventTable* self, + EventID* event_id) +{ time_t result = 0; sqlite3_stmt* stmt = NULL; EventID _tmp0_; @@ -1757,7 +1782,6 @@ time_t event_table_get_time_created (EventTable* self, EventID* event_id) { sqlite3_stmt* _tmp2_ = NULL; gboolean _tmp3_; sqlite3_stmt* _tmp4_; - gint64 _tmp5_; #line 221 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), 0); #line 221 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1780,29 +1804,29 @@ time_t event_table_get_time_created (EventTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 224 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1780 "EventTable.c" +#line 1804 "EventTable.c" } #line 226 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp4_ = stmt; #line 226 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp5_ = sqlite3_column_int64 (_tmp4_, 0); -#line 226 "/home/jens/Source/shotwell/src/db/EventTable.vala" - result = (time_t) _tmp5_; + result = (time_t) sqlite3_column_int64 (_tmp4_, 0); #line 226 "/home/jens/Source/shotwell/src/db/EventTable.vala" _sqlite3_finalize0 (stmt); #line 226 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1792 "EventTable.c" +#line 1814 "EventTable.c" } -gboolean event_table_set_comment (EventTable* self, EventID* event_id, const gchar* new_comment) { +gboolean +event_table_set_comment (EventTable* self, + EventID* event_id, + const gchar* new_comment) +{ gboolean result = FALSE; const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - EventID _tmp3_; - gint64 _tmp4_; - gboolean _tmp5_; + EventID _tmp1_; + gint64 _tmp2_; #line 229 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), FALSE); #line 229 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1810,59 +1834,59 @@ gboolean event_table_set_comment (EventTable* self, EventID* event_id, const gch #line 229 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (new_comment != NULL, FALSE); #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp1_ = new_comment; -#line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp1_ != NULL) { -#line 1813 "EventTable.c" - const gchar* _tmp2_; + if (new_comment != NULL) { #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp2_ = new_comment; -#line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp0_ = _tmp2_; -#line 1819 "EventTable.c" + _tmp0_ = new_comment; +#line 1837 "EventTable.c" } else { #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp0_ = ""; -#line 1823 "EventTable.c" +#line 1841 "EventTable.c" } #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp3_ = *event_id; -#line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp4_ = _tmp3_.id; + _tmp1_ = *event_id; #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp5_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "comment", _tmp0_); + _tmp2_ = _tmp1_.id; #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" - result = _tmp5_; + result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "comment", _tmp0_); #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1835 "EventTable.c" +#line 1851 "EventTable.c" } -static void event_table_class_init (EventTableClass * klass) { +static void +event_table_class_init (EventTableClass * klass) +{ #line 33 "/home/jens/Source/shotwell/src/db/EventTable.vala" event_table_parent_class = g_type_class_peek_parent (klass); #line 33 "/home/jens/Source/shotwell/src/db/EventTable.vala" ((DatabaseTableClass *) klass)->finalize = event_table_finalize; -#line 1844 "EventTable.c" +#line 1862 "EventTable.c" } -static void event_table_instance_init (EventTable * self) { +static void +event_table_instance_init (EventTable * self) +{ } -static void event_table_finalize (DatabaseTable * obj) { +static void +event_table_finalize (DatabaseTable * obj) +{ EventTable * self; #line 33 "/home/jens/Source/shotwell/src/db/EventTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_TABLE, EventTable); #line 33 "/home/jens/Source/shotwell/src/db/EventTable.vala" DATABASE_TABLE_CLASS (event_table_parent_class)->finalize (obj); -#line 1858 "EventTable.c" +#line 1880 "EventTable.c" } -GType event_table_get_type (void) { +GType +event_table_get_type (void) +{ static volatile gsize event_table_type_id__volatile = 0; if (g_once_init_enter (&event_table_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventTable), 0, (GInstanceInitFunc) event_table_instance_init, NULL }; diff --git a/src/db/PhotoTable.c b/src/db/PhotoTable.c index 3fd09f6..a2832f0 100644 --- a/src/db/PhotoTable.c +++ b/src/db/PhotoTable.c @@ -1,4 +1,4 @@ -/* PhotoTable.c generated by valac 0.36.6, the Vala compiler +/* PhotoTable.c generated by valac 0.40.4, the Vala compiler * generated from PhotoTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -285,36 +286,53 @@ GType photo_id_get_type (void) G_GNUC_CONST; PhotoID* photo_id_dup (const PhotoID* self); void photo_id_free (PhotoID* self); #define PHOTO_ID_INVALID ((gint64) -1) -void photo_id_init (PhotoID *self, gint64 id); +void photo_id_init (PhotoID *self, + gint64 id); gboolean photo_id_is_invalid (PhotoID *self); gboolean photo_id_is_valid (PhotoID *self); guint photo_id_hash (PhotoID *self); guint int64_hash (gint64* n); -gboolean photo_id_equal (void* a, void* b); +gboolean photo_id_equal (void* a, + void* b); gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id); #define PHOTO_TYPENAME "thumb" GType import_id_get_type (void) G_GNUC_CONST; ImportID* import_id_dup (const ImportID* self); void import_id_free (ImportID* self); #define IMPORT_ID_INVALID ((gint64) 0) -void import_id_init (ImportID *self, gint64 id); +void import_id_init (ImportID *self, + gint64 id); void import_id_generate (ImportID* result); gboolean import_id_is_invalid (ImportID *self); gboolean import_id_is_valid (ImportID *self); -gint import_id_compare_func (ImportID* a, ImportID* b); -gint64 import_id_comparator (void* a, void* b); +gint import_id_compare_func (ImportID* a, + ImportID* b); +gint64 import_id_comparator (void* a, + void* b); gpointer photo_row_ref (gpointer instance); void photo_row_unref (gpointer instance); -GParamSpec* param_spec_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_row (GValue* value, gpointer v_object); -void value_take_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_row (GValue* value, + gpointer v_object); +void value_take_photo_row (GValue* value, + gpointer v_object); gpointer value_get_photo_row (const GValue* value); GType photo_row_get_type (void) G_GNUC_CONST; gpointer backing_photo_row_ref (gpointer instance); void backing_photo_row_unref (gpointer instance); -GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_photo_row (GValue* value, gpointer v_object); -void value_take_backing_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_photo_row (GValue* value, + gpointer v_object); +void value_take_backing_photo_row (GValue* value, + gpointer v_object); gpointer value_get_backing_photo_row (const GValue* value); GType backing_photo_row_get_type (void) G_GNUC_CONST; GType event_id_get_type (void) G_GNUC_CONST; @@ -326,36 +344,42 @@ GType backing_photo_id_get_type (void) G_GNUC_CONST; BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self); void backing_photo_id_free (BackingPhotoID* self); GType raw_developer_get_type (void) G_GNUC_CONST; -enum { - PHOTO_ROW_DUMMY_PROPERTY -}; PhotoRow* photo_row_new (void); PhotoRow* photo_row_construct (GType object_type); BackingPhotoRow* backing_photo_row_new (void); BackingPhotoRow* backing_photo_row_construct (GType object_type); #define BACKING_PHOTO_ID_INVALID ((gint64) -1) -void backing_photo_id_init (BackingPhotoID *self, gint64 id); +void backing_photo_id_init (BackingPhotoID *self, + gint64 id); RawDeveloper* raw_developer_as_array (int* result_length1); static void photo_row_finalize (PhotoRow * obj); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType photo_table_get_type (void) G_GNUC_CONST; -enum { - PHOTO_TABLE_DUMMY_PROPERTY -}; static PhotoTable* photo_table_new (void); static PhotoTable* photo_table_construct (GType object_type); DatabaseTable* database_table_construct (GType object_type); -void database_table_fatal (const gchar* op, gint res); -void database_table_warning (const gchar* op, gint res); -void database_table_set_table_name (DatabaseTable* self, const gchar* table_name); +void database_table_fatal (const gchar* op, + gint res); +void database_table_warning (const gchar* op, + gint res); +void database_table_set_table_name (DatabaseTable* self, + const gchar* table_name); PhotoTable* photo_table_get_instance (void); -void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result); +void photo_table_add (PhotoTable* self, + PhotoRow* photo_row, + PhotoID* result); gulong now_sec (void); GType photo_file_format_get_type (void) G_GNUC_CONST; GType dimensions_get_type (void) G_GNUC_CONST; @@ -365,104 +389,249 @@ void dimensions_free (Dimensions* self); gint photo_file_format_serialize (PhotoFileFormat self); gint rating_serialize (Rating self); gchar* raw_developer_to_string (RawDeveloper self); -void event_id_init (EventID *self, gint64 id); +void event_id_init (EventID *self, + gint64 id); GQuark database_error_quark (void); -void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error); -void database_table_throw_error (const gchar* method, gint res, GError** error); -gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gint64 filesize, glong timestamp, const gchar* md5, const gchar* exif_md5, const gchar* thumbnail_md5, PhotoRow* row); -static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row); -gboolean photo_table_set_orientation (PhotoTable* self, PhotoID* photo_id, Orientation orientation); -PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id); -void dimensions_init (Dimensions *self, gint width, gint height); +void photo_table_reimport (PhotoTable* self, + PhotoRow* row, + GError** error); +void database_table_throw_error (const gchar* method, + gint res, + GError** error); +gboolean photo_table_master_exif_updated (PhotoTable* self, + PhotoID* photoID, + gint64 filesize, + glong timestamp, + const gchar* md5, + const gchar* exif_md5, + const gchar* thumbnail_md5, + PhotoRow* row); +static void photo_table_validate_orientation (PhotoTable* self, + PhotoRow* row); +gboolean photo_table_set_orientation (PhotoTable* self, + PhotoID* photo_id, + Orientation orientation); +PhotoRow* photo_table_get_row (PhotoTable* self, + PhotoID* photo_id); +void dimensions_init (Dimensions *self, + gint width, + gint height); GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans); Rating rating_unserialize (gint value); PhotoFileFormat photo_file_format_unserialize (gint value); RawDeveloper raw_developer_from_string (const gchar* value); GeeArrayList* photo_table_get_all (PhotoTable* self); -void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* new_filename, BackingPhotoID* editable_id, BackingPhotoID* develop_shotwell, BackingPhotoID* develop_camera_id, BackingPhotoID* develop_embedded_id, PhotoID* result); +void photo_table_duplicate (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_filename, + BackingPhotoID* editable_id, + BackingPhotoID* develop_shotwell, + BackingPhotoID* develop_camera_id, + BackingPhotoID* develop_embedded_id, + PhotoID* result); gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations); -gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar* new_title); -gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text); -gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gchar* new_comment); -void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* filepath, GError** error); -void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error); -void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t timestamp, GError** error); -void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint64 value, GError** error); -gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, time_t time); -gboolean database_table_update_int64_by_id (DatabaseTable* self, gint64 id, const gchar* column, gint64 value); -void photo_table_set_import_id (PhotoTable* self, PhotoID* photo_id, ImportID* import_id, GError** error); -gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file); -void photo_table_remove (PhotoTable* self, PhotoID* photo_id, GError** error); -void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error); +gboolean photo_table_set_title (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_title); +gboolean database_table_update_text_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text); +gboolean photo_table_set_comment (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_comment); +void photo_table_set_filepath (PhotoTable* self, + PhotoID* photo_id, + const gchar* filepath, + GError** error); +void database_table_update_text_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text, + GError** error); +void photo_table_update_timestamp (PhotoTable* self, + PhotoID* photo_id, + time_t timestamp, + GError** error); +void database_table_update_int64_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + gint64 value, + GError** error); +gboolean photo_table_set_exposure_time (PhotoTable* self, + PhotoID* photo_id, + time_t time); +gboolean database_table_update_int64_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + gint64 value); +void photo_table_set_import_id (PhotoTable* self, + PhotoID* photo_id, + ImportID* import_id, + GError** error); +gboolean photo_table_remove_by_file (PhotoTable* self, + GFile* file); +void photo_table_remove (PhotoTable* self, + PhotoID* photo_id, + GError** error); +void database_table_delete_by_id (DatabaseTable* self, + gint64 id, + GError** error); GeeArrayList* photo_table_get_photos (PhotoTable* self); -gboolean database_table_update_int_by_id (DatabaseTable* self, gint64 id, const gchar* column, gint value); -gboolean photo_table_replace_flags (PhotoTable* self, PhotoID* photo_id, guint64 flags); -gboolean photo_table_set_rating (PhotoTable* self, PhotoID* photo_id, Rating rating); -gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id); -GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event_id); -gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id); -gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id); -gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* event_id); -static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* photo_id); -gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt* * stmt); -static gboolean photo_table_set_raw_transformations (PhotoTable* self, PhotoID* photo_id, const gchar* trans); -gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_id, Orientation orientation, GeeHashMap* transformations); -gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, KeyValueMap* map); -gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, const gchar* object); -gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* photo_id); -static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format); -gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format); -PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format, int* result_length1); -static void _vala_array_add2 (PhotoID* * array, int* length, int* size, const PhotoID* value); -void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gchar* backlinks, GError** error); -void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoID* editable_id, GError** error); -void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** error); -void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboolean dirty, GError** error); -void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint value, GError** error); -void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, BackingPhotoID* backing_photo_id, GError** error); -void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, GError** error); +gboolean database_table_update_int_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + gint value); +gboolean photo_table_replace_flags (PhotoTable* self, + PhotoID* photo_id, + guint64 flags); +gboolean photo_table_set_rating (PhotoTable* self, + PhotoID* photo_id, + Rating rating); +gint photo_table_get_event_photo_count (PhotoTable* self, + EventID* event_id); +GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, + EventID* event_id); +gboolean photo_table_event_has_photos (PhotoTable* self, + EventID* event_id); +gboolean photo_table_drop_event (PhotoTable* self, + EventID* event_id); +gboolean photo_table_set_event (PhotoTable* self, + PhotoID* photo_id, + EventID* event_id); +static gchar* photo_table_get_raw_transformations (PhotoTable* self, + PhotoID* photo_id); +gboolean database_table_select_by_id (DatabaseTable* self, + gint64 id, + const gchar* columns, + sqlite3_stmt* * stmt); +static gboolean photo_table_set_raw_transformations (PhotoTable* self, + PhotoID* photo_id, + const gchar* trans); +gboolean photo_table_set_transformation_state (PhotoTable* self, + PhotoID* photo_id, + Orientation orientation, + GeeHashMap* transformations); +gboolean photo_table_set_transformation (PhotoTable* self, + PhotoID* photo_id, + KeyValueMap* map); +gboolean photo_table_remove_transformation (PhotoTable* self, + PhotoID* photo_id, + const gchar* object); +gboolean photo_table_remove_all_transformations (PhotoTable* self, + PhotoID* photo_id); +static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format); +gboolean photo_table_has_duplicate (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format); +PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format, + int* result_length1); +static void _vala_array_add2 (PhotoID* * array, + int* length, + int* size, + const PhotoID* value); +void photo_table_update_backlinks (PhotoTable* self, + PhotoID* photo_id, + const gchar* backlinks, + GError** error); +void photo_table_attach_editable (PhotoTable* self, + PhotoRow* row, + BackingPhotoID* editable_id, + GError** error); +void photo_table_detach_editable (PhotoTable* self, + PhotoRow* row, + GError** error); +void photo_table_set_metadata_dirty (PhotoTable* self, + PhotoID* photo_id, + gboolean dirty, + GError** error); +void database_table_update_int_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + gint value, + GError** error); +void photo_table_update_raw_development (PhotoTable* self, + PhotoRow* row, + RawDeveloper rd, + BackingPhotoID* backing_photo_id, + GError** error); +void photo_table_remove_development (PhotoTable* self, + PhotoRow* row, + RawDeveloper rd, + GError** error); static void photo_table_finalize (DatabaseTable * obj); gboolean backing_photo_id_is_invalid (BackingPhotoID *self); gboolean backing_photo_id_is_valid (BackingPhotoID *self); -enum { - BACKING_PHOTO_ROW_DUMMY_PROPERTY -}; -gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* info); -gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info); -void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from); +gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, + GFileInfo* info); +gboolean backing_photo_row_is_touched (BackingPhotoRow* self, + GFileInfo* info); +void backing_photo_row_copy_from (BackingPhotoRow* self, + BackingPhotoRow* from); static void backing_photo_row_finalize (BackingPhotoRow * obj); GType backing_photo_table_get_type (void) G_GNUC_CONST; -enum { - BACKING_PHOTO_TABLE_DUMMY_PROPERTY -}; static BackingPhotoTable* backing_photo_table_new (void); static BackingPhotoTable* backing_photo_table_construct (GType object_type); BackingPhotoTable* backing_photo_table_get_instance (void); -void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, GError** error); -BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhotoID* id, GError** error); -void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, GError** error); -void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, gint64 filesize, GError** error); -void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backing_id, GError** error); -void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error); -void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, GError** error); +void backing_photo_table_add (BackingPhotoTable* self, + BackingPhotoRow* state, + GError** error); +BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, + BackingPhotoID* id, + GError** error); +void backing_photo_table_update (BackingPhotoTable* self, + BackingPhotoRow* row, + GError** error); +void backing_photo_table_update_attributes (BackingPhotoTable* self, + BackingPhotoID* id, + time_t timestamp, + gint64 filesize, + GError** error); +void backing_photo_table_remove (BackingPhotoTable* self, + BackingPhotoID* backing_id, + GError** error); +void backing_photo_table_set_filepath (BackingPhotoTable* self, + BackingPhotoID* id, + const gchar* filepath, + GError** error); +void backing_photo_table_update_timestamp (BackingPhotoTable* self, + BackingPhotoID* id, + time_t timestamp, + GError** error); static void backing_photo_table_finalize (DatabaseTable * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -void photo_id_init (PhotoID *self, gint64 id) { - gint64 _tmp0_; +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); + + +void +photo_id_init (PhotoID *self, + gint64 id) +{ #line 12 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" memset (self, 0, sizeof (PhotoID)); #line 13 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = id; -#line 13 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - (*self).id = _tmp0_; -#line 462 "PhotoTable.c" + (*self).id = id; +#line 629 "PhotoTable.c" } -gboolean photo_id_is_invalid (PhotoID *self) { +gboolean +photo_id_is_invalid (PhotoID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 17 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -471,11 +640,13 @@ gboolean photo_id_is_invalid (PhotoID *self) { result = _tmp0_ == PHOTO_ID_INVALID; #line 17 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 475 "PhotoTable.c" +#line 644 "PhotoTable.c" } -gboolean photo_id_is_valid (PhotoID *self) { +gboolean +photo_id_is_valid (PhotoID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 21 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -484,49 +655,47 @@ gboolean photo_id_is_valid (PhotoID *self) { result = _tmp0_ != PHOTO_ID_INVALID; #line 21 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 488 "PhotoTable.c" +#line 659 "PhotoTable.c" } -guint photo_id_hash (PhotoID *self) { +guint +photo_id_hash (PhotoID *self) +{ guint result = 0U; gint64 _tmp0_; - guint _tmp1_; #line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = (*self).id; #line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = int64_hash (&_tmp0_); -#line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp1_; + result = int64_hash (&_tmp0_); #line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 504 "PhotoTable.c" +#line 674 "PhotoTable.c" } -gboolean photo_id_equal (void* a, void* b) { +gboolean +photo_id_equal (void* a, + void* b) +{ gboolean result = FALSE; - void* _tmp0_; + gint64 _tmp0_; gint64 _tmp1_; - void* _tmp2_; - gint64 _tmp3_; #line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = a; + _tmp0_ = (*((PhotoID*) a)).id; #line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = (*((PhotoID*) _tmp0_)).id; + _tmp1_ = (*((PhotoID*) b)).id; #line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = b; -#line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = (*((PhotoID*) _tmp2_)).id; -#line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp1_ == _tmp3_; + result = _tmp0_ == _tmp1_; #line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 526 "PhotoTable.c" +#line 693 "PhotoTable.c" } -gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id) { +gchar* +photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id) +{ gchar* result = NULL; PhotoID _tmp0_; gint64 _tmp1_; @@ -543,11 +712,13 @@ gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id) { result = _tmp2_; #line 33 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 547 "PhotoTable.c" +#line 716 "PhotoTable.c" } -PhotoID* photo_id_dup (const PhotoID* self) { +PhotoID* +photo_id_dup (const PhotoID* self) +{ PhotoID* dup; #line 7 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dup = g_new0 (PhotoID, 1); @@ -555,18 +726,22 @@ PhotoID* photo_id_dup (const PhotoID* self) { memcpy (dup, self, sizeof (PhotoID)); #line 7 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return dup; -#line 559 "PhotoTable.c" +#line 730 "PhotoTable.c" } -void photo_id_free (PhotoID* self) { +void +photo_id_free (PhotoID* self) +{ #line 7 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_free (self); -#line 566 "PhotoTable.c" +#line 739 "PhotoTable.c" } -GType photo_id_get_type (void) { +GType +photo_id_get_type (void) +{ static volatile gsize photo_id_type_id__volatile = 0; if (g_once_init_enter (&photo_id_type_id__volatile)) { GType photo_id_type_id; @@ -577,19 +752,21 @@ GType photo_id_get_type (void) { } -void import_id_init (ImportID *self, gint64 id) { - gint64 _tmp0_; +void +import_id_init (ImportID *self, + gint64 id) +{ #line 42 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" memset (self, 0, sizeof (ImportID)); #line 43 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = id; -#line 43 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - (*self).id = _tmp0_; -#line 589 "PhotoTable.c" + (*self).id = id; +#line 764 "PhotoTable.c" } -void import_id_generate (ImportID* result) { +void +import_id_generate (ImportID* result) +{ GTimeVal timestamp = {0}; gint64 id = 0LL; GTimeVal _tmp0_; @@ -611,11 +788,13 @@ void import_id_generate (ImportID* result) { *result = _tmp2_; #line 51 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 615 "PhotoTable.c" +#line 792 "PhotoTable.c" } -gboolean import_id_is_invalid (ImportID *self) { +gboolean +import_id_is_invalid (ImportID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 55 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -624,11 +803,13 @@ gboolean import_id_is_invalid (ImportID *self) { result = _tmp0_ == IMPORT_ID_INVALID; #line 55 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 628 "PhotoTable.c" +#line 807 "PhotoTable.c" } -gboolean import_id_is_valid (ImportID *self) { +gboolean +import_id_is_valid (ImportID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 59 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -637,75 +818,64 @@ gboolean import_id_is_valid (ImportID *self) { result = _tmp0_ != IMPORT_ID_INVALID; #line 59 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 641 "PhotoTable.c" +#line 822 "PhotoTable.c" } -gint import_id_compare_func (ImportID* a, ImportID* b) { +gint +import_id_compare_func (ImportID* a, + ImportID* b) +{ gint result = 0; gboolean _tmp0_ = FALSE; - ImportID* _tmp1_; - ImportID* _tmp3_; - gint64 _tmp4_; - ImportID* _tmp5_; - gint64 _tmp6_; -#line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = a; -#line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_ != NULL) { -#line 657 "PhotoTable.c" - ImportID* _tmp2_; + gint64 _tmp1_; + gint64 _tmp2_; #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = b; + if (a != NULL) { #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp2_ != NULL; -#line 663 "PhotoTable.c" + _tmp0_ = b != NULL; +#line 838 "PhotoTable.c" } else { #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = FALSE; -#line 667 "PhotoTable.c" +#line 842 "PhotoTable.c" } #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp0_, "a != null && b != null"); #line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = a; -#line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = (*_tmp3_).id; -#line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = b; + _tmp1_ = (*a).id; #line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = (*_tmp5_).id; + _tmp2_ = (*b).id; #line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = (gint) (_tmp4_ - _tmp6_); + result = (gint) (_tmp1_ - _tmp2_); #line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 683 "PhotoTable.c" +#line 854 "PhotoTable.c" } -gint64 import_id_comparator (void* a, void* b) { +gint64 +import_id_comparator (void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; + gint64 _tmp0_; gint64 _tmp1_; - void* _tmp2_; - gint64 _tmp3_; -#line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = a; #line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = (*((ImportID*) _tmp0_)).id; + _tmp0_ = (*((ImportID*) a)).id; #line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = b; + _tmp1_ = (*((ImportID*) b)).id; #line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = (*((ImportID*) _tmp2_)).id; -#line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp1_ - _tmp3_; + result = _tmp0_ - _tmp1_; #line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 705 "PhotoTable.c" +#line 873 "PhotoTable.c" } -ImportID* import_id_dup (const ImportID* self) { +ImportID* +import_id_dup (const ImportID* self) +{ ImportID* dup; #line 37 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dup = g_new0 (ImportID, 1); @@ -713,18 +883,22 @@ ImportID* import_id_dup (const ImportID* self) { memcpy (dup, self, sizeof (ImportID)); #line 37 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return dup; -#line 717 "PhotoTable.c" +#line 887 "PhotoTable.c" } -void import_id_free (ImportID* self) { +void +import_id_free (ImportID* self) +{ #line 37 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_free (self); -#line 724 "PhotoTable.c" +#line 896 "PhotoTable.c" } -GType import_id_get_type (void) { +GType +import_id_get_type (void) +{ static volatile gsize import_id_type_id__volatile = 0; if (g_once_init_enter (&import_id_type_id__volatile)) { GType import_id_type_id; @@ -735,7 +909,9 @@ GType import_id_get_type (void) { } -PhotoRow* photo_row_construct (GType object_type) { +PhotoRow* +photo_row_construct (GType object_type) +{ PhotoRow* self = NULL; BackingPhotoRow* _tmp0_; gint _tmp1_; @@ -773,7 +949,7 @@ PhotoRow* photo_row_construct (GType object_type) { _tmp3_ = (g_free (_tmp3_), NULL); #line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = raw_developer_as_array (&_tmp5_); -#line 777 "PhotoTable.c" +#line 953 "PhotoTable.c" { RawDeveloper* d_collection = NULL; gint d_collection_length1 = 0; @@ -785,11 +961,11 @@ PhotoRow* photo_row_construct (GType object_type) { d_collection_length1 = _tmp5_; #line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" for (d_it = 0; d_it < _tmp5_; d_it = d_it + 1) { -#line 789 "PhotoTable.c" +#line 965 "PhotoTable.c" RawDeveloper d = 0; #line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" d = d_collection[d_it]; -#line 793 "PhotoTable.c" +#line 969 "PhotoTable.c" { BackingPhotoID* _tmp7_; gint _tmp7__length1; @@ -808,124 +984,151 @@ PhotoRow* photo_row_construct (GType object_type) { _tmp7_[_tmp8_] = _tmp9_; #line 105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp10_ = _tmp7_[_tmp8_]; -#line 812 "PhotoTable.c" +#line 988 "PhotoTable.c" } } #line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" d_collection = (g_free (d_collection), NULL); -#line 817 "PhotoTable.c" +#line 993 "PhotoTable.c" } #line 100 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self; -#line 821 "PhotoTable.c" +#line 997 "PhotoTable.c" } -PhotoRow* photo_row_new (void) { +PhotoRow* +photo_row_new (void) +{ #line 100 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return photo_row_construct (TYPE_PHOTO_ROW); -#line 828 "PhotoTable.c" +#line 1006 "PhotoTable.c" } -static void value_photo_row_init (GValue* value) { +static void +value_photo_row_init (GValue* value) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 835 "PhotoTable.c" +#line 1015 "PhotoTable.c" } -static void value_photo_row_free_value (GValue* value) { +static void +value_photo_row_free_value (GValue* value) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (value->data[0].v_pointer) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_row_unref (value->data[0].v_pointer); -#line 844 "PhotoTable.c" +#line 1026 "PhotoTable.c" } } -static void value_photo_row_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_photo_row_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (src_value->data[0].v_pointer) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dest_value->data[0].v_pointer = photo_row_ref (src_value->data[0].v_pointer); -#line 854 "PhotoTable.c" +#line 1039 "PhotoTable.c" } else { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dest_value->data[0].v_pointer = NULL; -#line 858 "PhotoTable.c" +#line 1043 "PhotoTable.c" } } -static gpointer value_photo_row_peek_pointer (const GValue* value) { +static gpointer +value_photo_row_peek_pointer (const GValue* value) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return value->data[0].v_pointer; -#line 866 "PhotoTable.c" +#line 1053 "PhotoTable.c" } -static gchar* value_photo_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_row_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (collect_values[0].v_pointer) { -#line 873 "PhotoTable.c" +#line 1065 "PhotoTable.c" PhotoRow * object; object = collect_values[0].v_pointer; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (object->parent_instance.g_class == NULL) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 880 "PhotoTable.c" +#line 1072 "PhotoTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 884 "PhotoTable.c" +#line 1076 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = photo_row_ref (object); -#line 888 "PhotoTable.c" +#line 1080 "PhotoTable.c" } else { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 892 "PhotoTable.c" +#line 1084 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 896 "PhotoTable.c" +#line 1088 "PhotoTable.c" } -static gchar* value_photo_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_row_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoRow ** object_p; object_p = collect_values[0].v_pointer; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!object_p) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 907 "PhotoTable.c" +#line 1104 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!value->data[0].v_pointer) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = NULL; -#line 913 "PhotoTable.c" +#line 1110 "PhotoTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = value->data[0].v_pointer; -#line 917 "PhotoTable.c" +#line 1114 "PhotoTable.c" } else { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = photo_row_ref (value->data[0].v_pointer); -#line 921 "PhotoTable.c" +#line 1118 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 925 "PhotoTable.c" +#line 1122 "PhotoTable.c" } -GParamSpec* param_spec_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPhotoRow* spec; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PHOTO_ROW), NULL); @@ -935,20 +1138,25 @@ GParamSpec* param_spec_photo_row (const gchar* name, const gchar* nick, const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return G_PARAM_SPEC (spec); -#line 939 "PhotoTable.c" +#line 1142 "PhotoTable.c" } -gpointer value_get_photo_row (const GValue* value) { +gpointer +value_get_photo_row (const GValue* value) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_ROW), NULL); #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return value->data[0].v_pointer; -#line 948 "PhotoTable.c" +#line 1153 "PhotoTable.c" } -void value_set_photo_row (GValue* value, gpointer v_object) { +void +value_set_photo_row (GValue* value, + gpointer v_object) +{ PhotoRow * old; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_ROW)); @@ -964,22 +1172,25 @@ void value_set_photo_row (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_row_ref (value->data[0].v_pointer); -#line 968 "PhotoTable.c" +#line 1176 "PhotoTable.c" } else { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 972 "PhotoTable.c" +#line 1180 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (old) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_row_unref (old); -#line 978 "PhotoTable.c" +#line 1186 "PhotoTable.c" } } -void value_take_photo_row (GValue* value, gpointer v_object) { +void +value_take_photo_row (GValue* value, + gpointer v_object) +{ PhotoRow * old; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_ROW)); @@ -993,38 +1204,44 @@ void value_take_photo_row (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = v_object; -#line 997 "PhotoTable.c" +#line 1208 "PhotoTable.c" } else { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 1001 "PhotoTable.c" +#line 1212 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (old) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_row_unref (old); -#line 1007 "PhotoTable.c" +#line 1218 "PhotoTable.c" } } -static void photo_row_class_init (PhotoRowClass * klass) { +static void +photo_row_class_init (PhotoRowClass * klass) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_row_parent_class = g_type_class_peek_parent (klass); #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ((PhotoRowClass *) klass)->finalize = photo_row_finalize; -#line 1017 "PhotoTable.c" +#line 1230 "PhotoTable.c" } -static void photo_row_instance_init (PhotoRow * self) { +static void +photo_row_instance_init (PhotoRow * self) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self->ref_count = 1; -#line 1024 "PhotoTable.c" +#line 1239 "PhotoTable.c" } -static void photo_row_finalize (PhotoRow * obj) { +static void +photo_row_finalize (PhotoRow * obj) +{ PhotoRow * self; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_ROW, PhotoRow); @@ -1048,11 +1265,13 @@ static void photo_row_finalize (PhotoRow * obj) { _g_free0 (self->backlinks); #line 97 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self->development_ids = (g_free (self->development_ids), NULL); -#line 1052 "PhotoTable.c" +#line 1269 "PhotoTable.c" } -GType photo_row_get_type (void) { +GType +photo_row_get_type (void) +{ static volatile gsize photo_row_type_id__volatile = 0; if (g_once_init_enter (&photo_row_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_photo_row_init, value_photo_row_free_value, value_photo_row_copy_value, value_photo_row_peek_pointer, "p", value_photo_row_collect_value, "p", value_photo_row_lcopy_value }; @@ -1066,18 +1285,22 @@ GType photo_row_get_type (void) { } -gpointer photo_row_ref (gpointer instance) { +gpointer +photo_row_ref (gpointer instance) +{ PhotoRow * self; self = instance; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_atomic_int_inc (&self->ref_count); #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return instance; -#line 1077 "PhotoTable.c" +#line 1298 "PhotoTable.c" } -void photo_row_unref (gpointer instance) { +void +photo_row_unref (gpointer instance) +{ PhotoRow * self; self = instance; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1086,12 +1309,14 @@ void photo_row_unref (gpointer instance) { PHOTO_ROW_GET_CLASS (self)->finalize (self); #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1090 "PhotoTable.c" +#line 1313 "PhotoTable.c" } } -static PhotoTable* photo_table_construct (GType object_type) { +static PhotoTable* +photo_table_construct (GType object_type) +{ PhotoTable* self = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1101,44 +1326,38 @@ static PhotoTable* photo_table_construct (GType object_type) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; sqlite3_stmt* stmt2 = NULL; gint res2 = 0; - sqlite3* _tmp8_; - sqlite3_stmt* _tmp9_ = NULL; + sqlite3* _tmp7_; + sqlite3_stmt* _tmp8_ = NULL; + gint _tmp9_; gint _tmp10_; - gint _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; - gint _tmp14_; - sqlite3* _tmp16_; - sqlite3_stmt* _tmp17_ = NULL; - gint _tmp18_; + sqlite3_stmt* _tmp11_; + gint _tmp12_; + sqlite3* _tmp14_; + sqlite3_stmt* _tmp15_ = NULL; + gint _tmp16_; + gint _tmp17_; + sqlite3_stmt* _tmp18_; gint _tmp19_; - sqlite3_stmt* _tmp20_; - gint _tmp21_; - gint _tmp22_; - sqlite3* _tmp24_; - sqlite3_stmt* _tmp25_ = NULL; + sqlite3* _tmp21_; + sqlite3_stmt* _tmp22_ = NULL; + gint _tmp23_; + gint _tmp24_; + sqlite3_stmt* _tmp25_; gint _tmp26_; - gint _tmp27_; - sqlite3_stmt* _tmp28_; - gint _tmp29_; + sqlite3* _tmp28_; + sqlite3_stmt* _tmp29_ = NULL; gint _tmp30_; - sqlite3* _tmp32_; - sqlite3_stmt* _tmp33_ = NULL; - gint _tmp34_; - gint _tmp35_; - sqlite3_stmt* _tmp36_; + gint _tmp31_; + sqlite3_stmt* _tmp32_; + gint _tmp33_; + sqlite3* _tmp35_; + sqlite3_stmt* _tmp36_ = NULL; gint _tmp37_; gint _tmp38_; - sqlite3* _tmp40_; - sqlite3_stmt* _tmp41_ = NULL; - gint _tmp42_; - gint _tmp43_; - sqlite3_stmt* _tmp44_; - gint _tmp45_; - gint _tmp46_; + sqlite3_stmt* _tmp39_; + gint _tmp40_; #line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = (PhotoTable*) database_table_construct (object_type); #line 114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1158,183 +1377,171 @@ static PhotoTable* photo_table_construct (GType object_type) { #line 147 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 147 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 147 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 148 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 148 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp6_ != SQLITE_DONE) { -#line 1169 "PhotoTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_DONE) { +#line 1386 "PhotoTable.c" + gint _tmp6_; #line 149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("create photo table", _tmp7_); -#line 1175 "PhotoTable.c" + database_table_fatal ("create photo table", _tmp6_); +#line 1392 "PhotoTable.c" } #line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = database_table_db; + _tmp7_ = database_table_db; #line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_prepare_v2 (_tmp8_, "CREATE INDEX IF NOT EXISTS PhotoEventIDIndex ON PhotoTable (event_id)", -1, &_tmp9_, NULL); + _tmp9_ = sqlite3_prepare_v2 (_tmp7_, "CREATE INDEX IF NOT EXISTS PhotoEventIDIndex ON PhotoTable (event_id)", -1, &_tmp8_, NULL); #line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt2); #line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt2 = _tmp9_; + stmt2 = _tmp8_; #line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res2 = _tmp10_; + res2 = _tmp9_; #line 155 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res2; + _tmp10_ = res2; #line 155 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res2 == Sqlite.OK"); + _vala_assert (_tmp10_ == SQLITE_OK, "res2 == Sqlite.OK"); #line 157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt2; + _tmp11_ = stmt2; #line 157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = sqlite3_step (_tmp12_); -#line 157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res2 = _tmp13_; + res2 = sqlite3_step (_tmp11_); #line 158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = res2; + _tmp12_ = res2; #line 158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp14_ != SQLITE_DONE) { -#line 1201 "PhotoTable.c" - gint _tmp15_; + if (_tmp12_ != SQLITE_DONE) { +#line 1416 "PhotoTable.c" + gint _tmp13_; #line 159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = res2; + _tmp13_ = res2; #line 159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("create photo table", _tmp15_); -#line 1207 "PhotoTable.c" + database_table_fatal ("create photo table", _tmp13_); +#line 1422 "PhotoTable.c" } #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = database_table_db; + _tmp14_ = database_table_db; #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = sqlite3_prepare_v2 (_tmp16_, "DROP INDEX IF EXISTS PhotoTableMD5Format", -1, &_tmp17_, NULL); + _tmp16_ = sqlite3_prepare_v2 (_tmp14_, "DROP INDEX IF EXISTS PhotoTableMD5Format", -1, &_tmp15_, NULL); #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp17_; + stmt = _tmp15_; #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp18_; + res = _tmp16_; #line 166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = res; + _tmp17_ = res; #line 166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); -#line 167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = stmt; + _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); #line 167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = sqlite3_step (_tmp20_); + _tmp18_ = stmt; #line 167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp21_; + res = sqlite3_step (_tmp18_); #line 168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = res; + _tmp19_ = res; #line 168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp22_ != SQLITE_DONE) { -#line 1233 "PhotoTable.c" - gint _tmp23_; + if (_tmp19_ != SQLITE_DONE) { +#line 1446 "PhotoTable.c" + gint _tmp20_; #line 169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = res; + _tmp20_ = res; #line 169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_warning ("Failed to drop old PhotoTable index", _tmp23_); -#line 1239 "PhotoTable.c" + database_table_warning ("Failed to drop old PhotoTable index", _tmp20_); +#line 1452 "PhotoTable.c" } #line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = database_table_db; + _tmp21_ = database_table_db; #line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = sqlite3_prepare_v2 (_tmp24_, "CREATE INDEX IF NOT EXISTS PhotoTableMD5FormatV2 on PhotoTable(md5, fi" \ -"le_format)", -1, &_tmp25_, NULL); + _tmp23_ = sqlite3_prepare_v2 (_tmp21_, "CREATE INDEX IF NOT EXISTS PhotoTableMD5FormatV2 on PhotoTable(md5, fi" \ +"le_format)", -1, &_tmp22_, NULL); #line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp25_; + stmt = _tmp22_; #line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp26_; + res = _tmp23_; #line 173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = res; + _tmp24_ = res; #line 173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); -#line 174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = stmt; + _vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK"); #line 174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = sqlite3_step (_tmp28_); + _tmp25_ = stmt; #line 174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp29_; + res = sqlite3_step (_tmp25_); #line 175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = res; + _tmp26_ = res; #line 175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp30_ != SQLITE_DONE) { -#line 1265 "PhotoTable.c" - gint _tmp31_; + if (_tmp26_ != SQLITE_DONE) { +#line 1476 "PhotoTable.c" + gint _tmp27_; #line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = res; + _tmp27_ = res; #line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_warning ("Failed to create index on md5 and file_format", _tmp31_); -#line 1271 "PhotoTable.c" + database_table_warning ("Failed to create index on md5 and file_format", _tmp27_); +#line 1482 "PhotoTable.c" } #line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = database_table_db; + _tmp28_ = database_table_db; #line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = sqlite3_prepare_v2 (_tmp32_, "CREATE INDEX IF NOT EXISTS PhotoTableThumbnailMD5Format on PhotoTable(" \ -"thumbnail_md5, file_format)", -1, &_tmp33_, NULL); + _tmp30_ = sqlite3_prepare_v2 (_tmp28_, "CREATE INDEX IF NOT EXISTS PhotoTableThumbnailMD5Format on PhotoTable(" \ +"thumbnail_md5, file_format)", -1, &_tmp29_, NULL); #line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp33_; + stmt = _tmp29_; #line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp34_; + res = _tmp30_; #line 181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = res; + _tmp31_ = res; #line 181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK"); -#line 182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = stmt; + _vala_assert (_tmp31_ == SQLITE_OK, "res == Sqlite.OK"); #line 182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = sqlite3_step (_tmp36_); + _tmp32_ = stmt; #line 182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp37_; + res = sqlite3_step (_tmp32_); #line 183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = res; + _tmp33_ = res; #line 183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp38_ != SQLITE_DONE) { -#line 1297 "PhotoTable.c" - gint _tmp39_; + if (_tmp33_ != SQLITE_DONE) { +#line 1506 "PhotoTable.c" + gint _tmp34_; #line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = res; + _tmp34_ = res; #line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_warning ("Failed to create index on md5 and file_format", _tmp39_); -#line 1303 "PhotoTable.c" + database_table_warning ("Failed to create index on md5 and file_format", _tmp34_); +#line 1512 "PhotoTable.c" } #line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = database_table_db; + _tmp35_ = database_table_db; #line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = sqlite3_prepare_v2 (_tmp40_, "CREATE INDEX IF NOT EXISTS PhotoTableThumbnailMD5MD5 on PhotoTable(thu" \ -"mbnail_md5, md5)", -1, &_tmp41_, NULL); + _tmp37_ = sqlite3_prepare_v2 (_tmp35_, "CREATE INDEX IF NOT EXISTS PhotoTableThumbnailMD5MD5 on PhotoTable(thu" \ +"mbnail_md5, md5)", -1, &_tmp36_, NULL); #line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp41_; + stmt = _tmp36_; #line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp42_; + res = _tmp37_; #line 189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = res; + _tmp38_ = res; #line 189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp43_ == SQLITE_OK, "res == Sqlite.OK"); -#line 190 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = stmt; + _vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK"); #line 190 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = sqlite3_step (_tmp44_); + _tmp39_ = stmt; #line 190 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp45_; + res = sqlite3_step (_tmp39_); #line 191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = res; + _tmp40_ = res; #line 191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp46_ != SQLITE_DONE) { -#line 1329 "PhotoTable.c" - gint _tmp47_; + if (_tmp40_ != SQLITE_DONE) { +#line 1536 "PhotoTable.c" + gint _tmp41_; #line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = res; + _tmp41_ = res; #line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_warning ("Failed to create index on thumbnail_md5 and md5", _tmp47_); -#line 1335 "PhotoTable.c" + database_table_warning ("Failed to create index on thumbnail_md5 and md5", _tmp41_); +#line 1542 "PhotoTable.c" } #line 195 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "PhotoTable"); @@ -1344,25 +1551,31 @@ static PhotoTable* photo_table_construct (GType object_type) { _sqlite3_finalize0 (stmt); #line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self; -#line 1345 "PhotoTable.c" +#line 1552 "PhotoTable.c" } -static PhotoTable* photo_table_new (void) { +static PhotoTable* +photo_table_new (void) +{ #line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return photo_table_construct (TYPE_PHOTO_TABLE); -#line 1352 "PhotoTable.c" +#line 1561 "PhotoTable.c" } -static gpointer _database_table_ref0 (gpointer self) { +static gpointer +_database_table_ref0 (gpointer self) +{ #line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self ? database_table_ref (self) : NULL; -#line 1359 "PhotoTable.c" +#line 1570 "PhotoTable.c" } -PhotoTable* photo_table_get_instance (void) { +PhotoTable* +photo_table_get_instance (void) +{ PhotoTable* result = NULL; PhotoTable* _tmp0_; PhotoTable* _tmp2_; @@ -1371,7 +1584,7 @@ PhotoTable* photo_table_get_instance (void) { _tmp0_ = photo_table_instance; #line 199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_ == NULL) { -#line 1372 "PhotoTable.c" +#line 1585 "PhotoTable.c" PhotoTable* _tmp1_; #line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = photo_table_new (); @@ -1379,7 +1592,7 @@ PhotoTable* photo_table_get_instance (void) { _database_table_unref0 (photo_table_instance); #line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_table_instance = _tmp1_; -#line 1380 "PhotoTable.c" +#line 1593 "PhotoTable.c" } #line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = photo_table_instance; @@ -1389,11 +1602,15 @@ PhotoTable* photo_table_get_instance (void) { result = _tmp3_; #line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 1390 "PhotoTable.c" +#line 1603 "PhotoTable.c" } -void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) { +void +photo_table_add (PhotoTable* self, + PhotoRow* photo_row, + PhotoID* result) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -1401,145 +1618,96 @@ void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) { gint _tmp2_; gint _tmp3_; gulong time_created = 0UL; - gulong _tmp4_; - sqlite3_stmt* _tmp5_; - PhotoRow* _tmp6_; - BackingPhotoRow* _tmp7_; - const gchar* _tmp8_; - gchar* _tmp9_; - GDestroyNotify _tmp10_; - gint _tmp11_; - gint _tmp12_; - sqlite3_stmt* _tmp13_; - PhotoRow* _tmp14_; - BackingPhotoRow* _tmp15_; - Dimensions _tmp16_; - gint _tmp17_; + sqlite3_stmt* _tmp4_; + BackingPhotoRow* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + GDestroyNotify _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + BackingPhotoRow* _tmp11_; + Dimensions _tmp12_; + gint _tmp13_; + gint _tmp14_; + sqlite3_stmt* _tmp15_; + BackingPhotoRow* _tmp16_; + Dimensions _tmp17_; gint _tmp18_; gint _tmp19_; sqlite3_stmt* _tmp20_; - PhotoRow* _tmp21_; - BackingPhotoRow* _tmp22_; - Dimensions _tmp23_; - gint _tmp24_; - gint _tmp25_; - gint _tmp26_; - sqlite3_stmt* _tmp27_; - PhotoRow* _tmp28_; - BackingPhotoRow* _tmp29_; - gint64 _tmp30_; - gint _tmp31_; - gint _tmp32_; - sqlite3_stmt* _tmp33_; - PhotoRow* _tmp34_; - BackingPhotoRow* _tmp35_; - time_t _tmp36_; - gint _tmp37_; + BackingPhotoRow* _tmp21_; + gint64 _tmp22_; + gint _tmp23_; + sqlite3_stmt* _tmp24_; + BackingPhotoRow* _tmp25_; + time_t _tmp26_; + gint _tmp27_; + sqlite3_stmt* _tmp28_; + time_t _tmp29_; + gint _tmp30_; + sqlite3_stmt* _tmp31_; + BackingPhotoRow* _tmp32_; + Orientation _tmp33_; + gint _tmp34_; + sqlite3_stmt* _tmp35_; + BackingPhotoRow* _tmp36_; + Orientation _tmp37_; gint _tmp38_; sqlite3_stmt* _tmp39_; - PhotoRow* _tmp40_; - time_t _tmp41_; + ImportID _tmp40_; + gint64 _tmp41_; gint _tmp42_; - gint _tmp43_; - sqlite3_stmt* _tmp44_; - PhotoRow* _tmp45_; - BackingPhotoRow* _tmp46_; - Orientation _tmp47_; - gint _tmp48_; + sqlite3_stmt* _tmp43_; + gint _tmp44_; + sqlite3_stmt* _tmp45_; + const gchar* _tmp46_; + gchar* _tmp47_; + GDestroyNotify _tmp48_; gint _tmp49_; sqlite3_stmt* _tmp50_; - PhotoRow* _tmp51_; - BackingPhotoRow* _tmp52_; - Orientation _tmp53_; + const gchar* _tmp51_; + gchar* _tmp52_; + GDestroyNotify _tmp53_; gint _tmp54_; - gint _tmp55_; - sqlite3_stmt* _tmp56_; - PhotoRow* _tmp57_; - ImportID _tmp58_; - gint64 _tmp59_; - gint _tmp60_; - gint _tmp61_; - sqlite3_stmt* _tmp62_; - gint _tmp63_; - gint _tmp64_; - sqlite3_stmt* _tmp65_; - PhotoRow* _tmp66_; - const gchar* _tmp67_; - gchar* _tmp68_; - GDestroyNotify _tmp69_; - gint _tmp70_; + sqlite3_stmt* _tmp55_; + const gchar* _tmp56_; + gchar* _tmp57_; + GDestroyNotify _tmp58_; + gint _tmp59_; + sqlite3_stmt* _tmp60_; + gulong _tmp61_; + gint _tmp62_; + sqlite3_stmt* _tmp63_; + BackingPhotoRow* _tmp64_; + PhotoFileFormat _tmp65_; + gint _tmp66_; + sqlite3_stmt* _tmp67_; + const gchar* _tmp68_; + gchar* _tmp69_; + GDestroyNotify _tmp70_; gint _tmp71_; sqlite3_stmt* _tmp72_; - PhotoRow* _tmp73_; - const gchar* _tmp74_; - gchar* _tmp75_; - GDestroyNotify _tmp76_; - gint _tmp77_; - gint _tmp78_; - sqlite3_stmt* _tmp79_; - PhotoRow* _tmp80_; - const gchar* _tmp81_; - gchar* _tmp82_; - GDestroyNotify _tmp83_; - gint _tmp84_; - gint _tmp85_; - sqlite3_stmt* _tmp86_; - gulong _tmp87_; + Rating _tmp73_; + gint _tmp74_; + sqlite3_stmt* _tmp75_; + gint _tmp76_; + sqlite3_stmt* _tmp77_; + RawDeveloper _tmp78_; + gchar* _tmp79_; + GDestroyNotify _tmp80_; + gint _tmp81_; + sqlite3_stmt* _tmp82_; + const gchar* _tmp83_; + gchar* _tmp84_; + GDestroyNotify _tmp85_; + gint _tmp86_; + sqlite3_stmt* _tmp87_; gint _tmp88_; - gint _tmp89_; - sqlite3_stmt* _tmp90_; - PhotoRow* _tmp91_; - BackingPhotoRow* _tmp92_; - PhotoFileFormat _tmp93_; - gint _tmp94_; - gint _tmp95_; - gint _tmp96_; - sqlite3_stmt* _tmp97_; - PhotoRow* _tmp98_; - const gchar* _tmp99_; - gchar* _tmp100_; - GDestroyNotify _tmp101_; - gint _tmp102_; - gint _tmp103_; - sqlite3_stmt* _tmp104_; - PhotoRow* _tmp105_; - Rating _tmp106_; - gint _tmp107_; - gint _tmp108_; - gint _tmp109_; - sqlite3_stmt* _tmp110_; - gint _tmp111_; - gint _tmp112_; - sqlite3_stmt* _tmp113_; - PhotoRow* _tmp114_; - RawDeveloper _tmp115_; - gchar* _tmp116_; - GDestroyNotify _tmp117_; - gint _tmp118_; - gint _tmp119_; - sqlite3_stmt* _tmp120_; - PhotoRow* _tmp121_; - const gchar* _tmp122_; - gchar* _tmp123_; - GDestroyNotify _tmp124_; - gint _tmp125_; - gint _tmp126_; - sqlite3_stmt* _tmp127_; - gint _tmp128_; - gint _tmp129_; - PhotoRow* _tmp133_; - sqlite3* _tmp134_; - gint64 _tmp135_; - PhotoRow* _tmp136_; - PhotoRow* _tmp137_; - BackingPhotoRow* _tmp138_; - Orientation _tmp139_; - PhotoRow* _tmp140_; - PhotoRow* _tmp141_; - gulong _tmp142_; - PhotoRow* _tmp143_; - PhotoRow* _tmp144_; - PhotoID _tmp145_; + sqlite3* _tmp92_; + BackingPhotoRow* _tmp93_; + Orientation _tmp94_; + gulong _tmp95_; + PhotoID _tmp96_; #line 207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #line 207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1562,415 +1730,321 @@ void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) { #line 215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 217 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = now_sec (); -#line 217 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - time_created = _tmp4_; -#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = stmt; + time_created = now_sec (); #line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = photo_row; -#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = _tmp6_->master; + _tmp4_ = stmt; #line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = _tmp7_->filepath; + _tmp5_ = photo_row->master; #line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = g_strdup (_tmp8_); + _tmp6_ = _tmp5_->filepath; #line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = g_free; + _tmp7_ = g_strdup (_tmp6_); #line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = sqlite3_bind_text (_tmp5_, 1, _tmp9_, -1, _tmp10_); + _tmp8_ = g_free; #line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp11_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp7_, -1, _tmp8_); #line 220 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = res; + _tmp9_ = res; #line 220 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp12_ == SQLITE_OK, "res == Sqlite.OK"); -#line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = stmt; -#line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = photo_row; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = _tmp14_->master; + _tmp10_ = stmt; #line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_->dim; + _tmp11_ = photo_row->master; #line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = _tmp16_.width; + _tmp12_ = _tmp11_->dim; #line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = sqlite3_bind_int (_tmp13_, 2, _tmp17_); + _tmp13_ = _tmp12_.width; #line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp18_; + res = sqlite3_bind_int (_tmp10_, 2, _tmp13_); #line 222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = res; + _tmp14_ = res; #line 222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); -#line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = stmt; + _vala_assert (_tmp14_ == SQLITE_OK, "res == Sqlite.OK"); #line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = photo_row; + _tmp15_ = stmt; #line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = _tmp21_->master; -#line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = _tmp22_->dim; + _tmp16_ = photo_row->master; #line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = _tmp23_.height; + _tmp17_ = _tmp16_->dim; #line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = sqlite3_bind_int (_tmp20_, 3, _tmp24_); + _tmp18_ = _tmp17_.height; #line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp25_; + res = sqlite3_bind_int (_tmp15_, 3, _tmp18_); #line 224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = res; + _tmp19_ = res; #line 224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp26_ == SQLITE_OK, "res == Sqlite.OK"); -#line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = stmt; -#line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = photo_row; + _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); #line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = _tmp28_->master; + _tmp20_ = stmt; #line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = _tmp29_->filesize; + _tmp21_ = photo_row->master; #line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = sqlite3_bind_int64 (_tmp27_, 4, _tmp30_); + _tmp22_ = _tmp21_->filesize; #line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp31_; + res = sqlite3_bind_int64 (_tmp20_, 4, _tmp22_); #line 226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = res; + _tmp23_ = res; #line 226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp32_ == SQLITE_OK, "res == Sqlite.OK"); -#line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = stmt; -#line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = photo_row; + _vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK"); #line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = _tmp34_->master; + _tmp24_ = stmt; #line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = _tmp35_->timestamp; + _tmp25_ = photo_row->master; #line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = sqlite3_bind_int64 (_tmp33_, 5, (gint64) _tmp36_); + _tmp26_ = _tmp25_->timestamp; #line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp37_; + res = sqlite3_bind_int64 (_tmp24_, 5, (gint64) _tmp26_); #line 228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = res; + _tmp27_ = res; #line 228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK"); -#line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = stmt; -#line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = photo_row; + _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); #line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = _tmp40_->exposure_time; + _tmp28_ = stmt; #line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = sqlite3_bind_int64 (_tmp39_, 6, (gint64) _tmp41_); + _tmp29_ = photo_row->exposure_time; #line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp42_; + res = sqlite3_bind_int64 (_tmp28_, 6, (gint64) _tmp29_); #line 230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = res; + _tmp30_ = res; #line 230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp43_ == SQLITE_OK, "res == Sqlite.OK"); -#line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = stmt; -#line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = photo_row; + _vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK"); #line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = _tmp45_->master; + _tmp31_ = stmt; #line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = _tmp46_->original_orientation; + _tmp32_ = photo_row->master; #line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = sqlite3_bind_int (_tmp44_, 7, (gint) _tmp47_); + _tmp33_ = _tmp32_->original_orientation; #line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp48_; + res = sqlite3_bind_int (_tmp31_, 7, (gint) _tmp33_); #line 232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = res; + _tmp34_ = res; #line 232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp49_ == SQLITE_OK, "res == Sqlite.OK"); -#line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = stmt; -#line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = photo_row; + _vala_assert (_tmp34_ == SQLITE_OK, "res == Sqlite.OK"); #line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = _tmp51_->master; + _tmp35_ = stmt; #line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = _tmp52_->original_orientation; + _tmp36_ = photo_row->master; #line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = sqlite3_bind_int (_tmp50_, 8, (gint) _tmp53_); + _tmp37_ = _tmp36_->original_orientation; #line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp54_; + res = sqlite3_bind_int (_tmp35_, 8, (gint) _tmp37_); #line 234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = res; + _tmp38_ = res; #line 234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp55_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK"); #line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = stmt; -#line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = photo_row; -#line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp58_ = _tmp57_->import_id; + _tmp39_ = stmt; #line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_ = _tmp58_.id; + _tmp40_ = photo_row->import_id; #line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp60_ = sqlite3_bind_int64 (_tmp56_, 9, _tmp59_); + _tmp41_ = _tmp40_.id; #line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp60_; + res = sqlite3_bind_int64 (_tmp39_, 9, _tmp41_); #line 236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_ = res; + _tmp42_ = res; #line 236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp61_ == SQLITE_OK, "res == Sqlite.OK"); -#line 237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = stmt; + _vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK"); #line 237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = sqlite3_bind_int64 (_tmp62_, 10, EVENT_ID_INVALID); + _tmp43_ = stmt; #line 237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp63_; + res = sqlite3_bind_int64 (_tmp43_, 10, EVENT_ID_INVALID); #line 238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp64_ = res; + _tmp44_ = res; #line 238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp64_ == SQLITE_OK, "res == Sqlite.OK"); -#line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_ = stmt; -#line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_ = photo_row; + _vala_assert (_tmp44_ == SQLITE_OK, "res == Sqlite.OK"); #line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp67_ = _tmp66_->md5; + _tmp45_ = stmt; #line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_ = g_strdup (_tmp67_); + _tmp46_ = photo_row->md5; #line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_ = g_free; + _tmp47_ = g_strdup (_tmp46_); #line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp70_ = sqlite3_bind_text (_tmp65_, 11, _tmp68_, -1, _tmp69_); + _tmp48_ = g_free; #line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp70_; + res = sqlite3_bind_text (_tmp45_, 11, _tmp47_, -1, _tmp48_); #line 240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_ = res; + _tmp49_ = res; #line 240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp71_ == SQLITE_OK, "res == Sqlite.OK"); -#line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp72_ = stmt; -#line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp73_ = photo_row; + _vala_assert (_tmp49_ == SQLITE_OK, "res == Sqlite.OK"); #line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp74_ = _tmp73_->thumbnail_md5; + _tmp50_ = stmt; #line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp75_ = g_strdup (_tmp74_); + _tmp51_ = photo_row->thumbnail_md5; #line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp76_ = g_free; + _tmp52_ = g_strdup (_tmp51_); #line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp77_ = sqlite3_bind_text (_tmp72_, 12, _tmp75_, -1, _tmp76_); + _tmp53_ = g_free; #line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp77_; + res = sqlite3_bind_text (_tmp50_, 12, _tmp52_, -1, _tmp53_); #line 242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp78_ = res; + _tmp54_ = res; #line 242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp78_ == SQLITE_OK, "res == Sqlite.OK"); -#line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp79_ = stmt; -#line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp80_ = photo_row; + _vala_assert (_tmp54_ == SQLITE_OK, "res == Sqlite.OK"); #line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp81_ = _tmp80_->exif_md5; + _tmp55_ = stmt; #line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp82_ = g_strdup (_tmp81_); + _tmp56_ = photo_row->exif_md5; #line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp83_ = g_free; + _tmp57_ = g_strdup (_tmp56_); #line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp84_ = sqlite3_bind_text (_tmp79_, 13, _tmp82_, -1, _tmp83_); + _tmp58_ = g_free; #line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp84_; + res = sqlite3_bind_text (_tmp55_, 13, _tmp57_, -1, _tmp58_); #line 244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp85_ = res; + _tmp59_ = res; #line 244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp85_ == SQLITE_OK, "res == Sqlite.OK"); -#line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp86_ = stmt; + _vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK"); #line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp87_ = time_created; + _tmp60_ = stmt; #line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp88_ = sqlite3_bind_int64 (_tmp86_, 14, (gint64) _tmp87_); + _tmp61_ = time_created; #line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp88_; + res = sqlite3_bind_int64 (_tmp60_, 14, (gint64) _tmp61_); #line 246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp89_ = res; + _tmp62_ = res; #line 246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp89_ == SQLITE_OK, "res == Sqlite.OK"); -#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp90_ = stmt; -#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp91_ = photo_row; -#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp92_ = _tmp91_->master; + _vala_assert (_tmp62_ == SQLITE_OK, "res == Sqlite.OK"); #line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp93_ = _tmp92_->file_format; + _tmp63_ = stmt; #line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp94_ = photo_file_format_serialize (_tmp93_); + _tmp64_ = photo_row->master; #line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp95_ = sqlite3_bind_int (_tmp90_, 15, _tmp94_); + _tmp65_ = _tmp64_->file_format; #line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp95_; + res = sqlite3_bind_int (_tmp63_, 15, photo_file_format_serialize (_tmp65_)); #line 248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp96_ = res; + _tmp66_ = res; #line 248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp96_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp66_ == SQLITE_OK, "res == Sqlite.OK"); #line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_ = stmt; + _tmp67_ = stmt; #line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp98_ = photo_row; + _tmp68_ = photo_row->title; #line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp99_ = _tmp98_->title; + _tmp69_ = g_strdup (_tmp68_); #line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp100_ = g_strdup (_tmp99_); -#line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp101_ = g_free; -#line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp102_ = sqlite3_bind_text (_tmp97_, 16, _tmp100_, -1, _tmp101_); + _tmp70_ = g_free; #line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp102_; + res = sqlite3_bind_text (_tmp67_, 16, _tmp69_, -1, _tmp70_); #line 250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103_ = res; + _tmp71_ = res; #line 250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp103_ == SQLITE_OK, "res == Sqlite.OK"); -#line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp104_ = stmt; -#line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp105_ = photo_row; -#line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp106_ = _tmp105_->rating; + _vala_assert (_tmp71_ == SQLITE_OK, "res == Sqlite.OK"); #line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp107_ = rating_serialize (_tmp106_); + _tmp72_ = stmt; #line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp108_ = sqlite3_bind_int64 (_tmp104_, 17, (gint64) _tmp107_); + _tmp73_ = photo_row->rating; #line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp108_; + res = sqlite3_bind_int64 (_tmp72_, 17, (gint64) rating_serialize (_tmp73_)); #line 252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp109_ = res; + _tmp74_ = res; #line 252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp109_ == SQLITE_OK, "res == Sqlite.OK"); -#line 253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp110_ = stmt; + _vala_assert (_tmp74_ == SQLITE_OK, "res == Sqlite.OK"); #line 253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp111_ = sqlite3_bind_int64 (_tmp110_, 18, BACKING_PHOTO_ID_INVALID); + _tmp75_ = stmt; #line 253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp111_; + res = sqlite3_bind_int64 (_tmp75_, 18, BACKING_PHOTO_ID_INVALID); #line 254 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp112_ = res; + _tmp76_ = res; #line 254 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp112_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp76_ == SQLITE_OK, "res == Sqlite.OK"); #line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp113_ = stmt; -#line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp114_ = photo_row; -#line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp115_ = _tmp114_->developer; + _tmp77_ = stmt; #line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp116_ = raw_developer_to_string (_tmp115_); + _tmp78_ = photo_row->developer; #line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp117_ = g_free; + _tmp79_ = raw_developer_to_string (_tmp78_); #line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp118_ = sqlite3_bind_text (_tmp113_, 19, _tmp116_, -1, _tmp117_); + _tmp80_ = g_free; #line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp118_; + res = sqlite3_bind_text (_tmp77_, 19, _tmp79_, -1, _tmp80_); #line 256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp119_ = res; + _tmp81_ = res; #line 256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp119_ == SQLITE_OK, "res == Sqlite.OK"); -#line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp120_ = stmt; + _vala_assert (_tmp81_ == SQLITE_OK, "res == Sqlite.OK"); #line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp121_ = photo_row; + _tmp82_ = stmt; #line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp122_ = _tmp121_->comment; + _tmp83_ = photo_row->comment; #line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp123_ = g_strdup (_tmp122_); + _tmp84_ = g_strdup (_tmp83_); #line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp124_ = g_free; + _tmp85_ = g_free; #line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp125_ = sqlite3_bind_text (_tmp120_, 20, _tmp123_, -1, _tmp124_); -#line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp125_; + res = sqlite3_bind_text (_tmp82_, 20, _tmp84_, -1, _tmp85_); #line 258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp126_ = res; + _tmp86_ = res; #line 258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp126_ == SQLITE_OK, "res == Sqlite.OK"); -#line 260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp127_ = stmt; + _vala_assert (_tmp86_ == SQLITE_OK, "res == Sqlite.OK"); #line 260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp128_ = sqlite3_step (_tmp127_); + _tmp87_ = stmt; #line 260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp128_; + res = sqlite3_step (_tmp87_); #line 261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp129_ = res; + _tmp88_ = res; #line 261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp129_ != SQLITE_DONE) { -#line 1897 "PhotoTable.c" - gint _tmp130_; - PhotoID _tmp132_ = {0}; + if (_tmp88_ != SQLITE_DONE) { +#line 1983 "PhotoTable.c" + gint _tmp89_; + PhotoID _tmp91_ = {0}; #line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp130_ = res; + _tmp89_ = res; #line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp130_ != SQLITE_CONSTRAINT) { -#line 1904 "PhotoTable.c" - gint _tmp131_; + if (_tmp89_ != SQLITE_CONSTRAINT) { +#line 1990 "PhotoTable.c" + gint _tmp90_; #line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp131_ = res; + _tmp90_ = res; #line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("add_photo", _tmp131_); -#line 1910 "PhotoTable.c" + database_table_fatal ("add_photo", _tmp90_); +#line 1996 "PhotoTable.c" } #line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp132_, PHOTO_ID_INVALID); + photo_id_init (&_tmp91_, PHOTO_ID_INVALID); #line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - *result = _tmp132_; + *result = _tmp91_; #line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 1920 "PhotoTable.c" +#line 2006 "PhotoTable.c" } #line 269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp133_ = photo_row; -#line 269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp134_ = database_table_db; + _tmp92_ = database_table_db; #line 269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp135_ = sqlite3_last_insert_rowid (_tmp134_); -#line 269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp133_->photo_id, _tmp135_); -#line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp136_ = photo_row; -#line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp137_ = photo_row; + photo_id_init (&photo_row->photo_id, sqlite3_last_insert_rowid (_tmp92_)); #line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp138_ = _tmp137_->master; + _tmp93_ = photo_row->master; #line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp139_ = _tmp138_->original_orientation; + _tmp94_ = _tmp93_->original_orientation; #line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp136_->orientation = _tmp139_; + photo_row->orientation = _tmp94_; #line 271 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp140_ = photo_row; -#line 271 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - event_id_init (&_tmp140_->event_id, EVENT_ID_INVALID); -#line 272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp141_ = photo_row; + event_id_init (&photo_row->event_id, EVENT_ID_INVALID); #line 272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp142_ = time_created; + _tmp95_ = time_created; #line 272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp141_->time_created = (time_t) _tmp142_; + photo_row->time_created = (time_t) _tmp95_; #line 273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp143_ = photo_row; -#line 273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp143_->flags = (guint64) 0; -#line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp144_ = photo_row; + photo_row->flags = (guint64) 0; #line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp145_ = _tmp144_->photo_id; + _tmp96_ = photo_row->photo_id; #line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - *result = _tmp145_; + *result = _tmp96_; #line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 1964 "PhotoTable.c" +#line 2034 "PhotoTable.c" } -void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) { +void +photo_table_reimport (PhotoTable* self, + PhotoRow* row, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -1978,104 +2052,71 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) { gint _tmp2_; gint _tmp3_; time_t time_reimported = 0; - gulong _tmp4_; - sqlite3_stmt* _tmp5_; - PhotoRow* _tmp6_; - BackingPhotoRow* _tmp7_; - Dimensions _tmp8_; - gint _tmp9_; - gint _tmp10_; - gint _tmp11_; - sqlite3_stmt* _tmp12_; - PhotoRow* _tmp13_; - BackingPhotoRow* _tmp14_; - Dimensions _tmp15_; - gint _tmp16_; + sqlite3_stmt* _tmp4_; + BackingPhotoRow* _tmp5_; + Dimensions _tmp6_; + gint _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + BackingPhotoRow* _tmp10_; + Dimensions _tmp11_; + gint _tmp12_; + gint _tmp13_; + sqlite3_stmt* _tmp14_; + BackingPhotoRow* _tmp15_; + gint64 _tmp16_; gint _tmp17_; - gint _tmp18_; - sqlite3_stmt* _tmp19_; - PhotoRow* _tmp20_; - BackingPhotoRow* _tmp21_; - gint64 _tmp22_; - gint _tmp23_; + sqlite3_stmt* _tmp18_; + BackingPhotoRow* _tmp19_; + time_t _tmp20_; + gint _tmp21_; + sqlite3_stmt* _tmp22_; + time_t _tmp23_; gint _tmp24_; sqlite3_stmt* _tmp25_; - PhotoRow* _tmp26_; - BackingPhotoRow* _tmp27_; - time_t _tmp28_; - gint _tmp29_; - gint _tmp30_; - sqlite3_stmt* _tmp31_; - PhotoRow* _tmp32_; - time_t _tmp33_; - gint _tmp34_; - gint _tmp35_; - sqlite3_stmt* _tmp36_; - PhotoRow* _tmp37_; - BackingPhotoRow* _tmp38_; - Orientation _tmp39_; - gint _tmp40_; - gint _tmp41_; - sqlite3_stmt* _tmp42_; - PhotoRow* _tmp43_; - BackingPhotoRow* _tmp44_; - Orientation _tmp45_; - gint _tmp46_; + BackingPhotoRow* _tmp26_; + Orientation _tmp27_; + gint _tmp28_; + sqlite3_stmt* _tmp29_; + BackingPhotoRow* _tmp30_; + Orientation _tmp31_; + gint _tmp32_; + sqlite3_stmt* _tmp33_; + const gchar* _tmp34_; + gchar* _tmp35_; + GDestroyNotify _tmp36_; + gint _tmp37_; + sqlite3_stmt* _tmp38_; + const gchar* _tmp39_; + gchar* _tmp40_; + GDestroyNotify _tmp41_; + gint _tmp42_; + sqlite3_stmt* _tmp43_; + const gchar* _tmp44_; + gchar* _tmp45_; + GDestroyNotify _tmp46_; gint _tmp47_; sqlite3_stmt* _tmp48_; - PhotoRow* _tmp49_; - const gchar* _tmp50_; - gchar* _tmp51_; - GDestroyNotify _tmp52_; - gint _tmp53_; - gint _tmp54_; - sqlite3_stmt* _tmp55_; - PhotoRow* _tmp56_; - const gchar* _tmp57_; - gchar* _tmp58_; - GDestroyNotify _tmp59_; - gint _tmp60_; - gint _tmp61_; - sqlite3_stmt* _tmp62_; - PhotoRow* _tmp63_; - const gchar* _tmp64_; - gchar* _tmp65_; - GDestroyNotify _tmp66_; - gint _tmp67_; - gint _tmp68_; - sqlite3_stmt* _tmp69_; - PhotoRow* _tmp70_; - BackingPhotoRow* _tmp71_; - PhotoFileFormat _tmp72_; - gint _tmp73_; - gint _tmp74_; - gint _tmp75_; - sqlite3_stmt* _tmp76_; - PhotoRow* _tmp77_; - const gchar* _tmp78_; - gchar* _tmp79_; - GDestroyNotify _tmp80_; - gint _tmp81_; - gint _tmp82_; - sqlite3_stmt* _tmp83_; - time_t _tmp84_; - gint _tmp85_; - gint _tmp86_; - sqlite3_stmt* _tmp87_; - PhotoRow* _tmp88_; - PhotoID _tmp89_; - gint64 _tmp90_; - gint _tmp91_; - gint _tmp92_; - sqlite3_stmt* _tmp93_; - gint _tmp94_; - gint _tmp95_; - PhotoRow* _tmp97_; - time_t _tmp98_; - PhotoRow* _tmp99_; - PhotoRow* _tmp100_; - BackingPhotoRow* _tmp101_; - Orientation _tmp102_; + BackingPhotoRow* _tmp49_; + PhotoFileFormat _tmp50_; + gint _tmp51_; + sqlite3_stmt* _tmp52_; + const gchar* _tmp53_; + gchar* _tmp54_; + GDestroyNotify _tmp55_; + gint _tmp56_; + sqlite3_stmt* _tmp57_; + time_t _tmp58_; + gint _tmp59_; + sqlite3_stmt* _tmp60_; + PhotoID _tmp61_; + gint64 _tmp62_; + gint _tmp63_; + sqlite3_stmt* _tmp64_; + gint _tmp65_; + time_t _tmp67_; + BackingPhotoRow* _tmp68_; + Orientation _tmp69_; GError * _inner_error_ = NULL; #line 283 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -2099,257 +2140,197 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) { #line 290 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 292 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = now_sec (); -#line 292 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - time_reimported = (time_t) _tmp4_; -#line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = stmt; + time_reimported = (time_t) now_sec (); #line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = row; -#line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = _tmp6_->master; + _tmp4_ = stmt; #line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = _tmp7_->dim; + _tmp5_ = row->master; #line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = _tmp8_.width; + _tmp6_ = _tmp5_->dim; #line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_bind_int (_tmp5_, 1, _tmp9_); + _tmp7_ = _tmp6_.width; #line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_bind_int (_tmp4_, 1, _tmp7_); #line 295 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp8_ = res; #line 295 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt; -#line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = row; + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_->master; + _tmp9_ = stmt; #line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = _tmp14_->dim; + _tmp10_ = row->master; #line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_.height; + _tmp11_ = _tmp10_->dim; #line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = sqlite3_bind_int (_tmp12_, 2, _tmp16_); + _tmp12_ = _tmp11_.height; #line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp17_; + res = sqlite3_bind_int (_tmp9_, 2, _tmp12_); #line 297 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = res; + _tmp13_ = res; #line 297 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK"); -#line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = stmt; -#line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = row; + _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); #line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = _tmp20_->master; + _tmp14_ = stmt; #line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = _tmp21_->filesize; + _tmp15_ = row->master; #line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = sqlite3_bind_int64 (_tmp19_, 3, _tmp22_); + _tmp16_ = _tmp15_->filesize; #line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp23_; + res = sqlite3_bind_int64 (_tmp14_, 3, _tmp16_); #line 299 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = res; + _tmp17_ = res; #line 299 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK"); -#line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = stmt; -#line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = row; + _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); #line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = _tmp26_->master; + _tmp18_ = stmt; #line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = _tmp27_->timestamp; + _tmp19_ = row->master; #line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = sqlite3_bind_int64 (_tmp25_, 4, (gint64) _tmp28_); + _tmp20_ = _tmp19_->timestamp; #line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp29_; + res = sqlite3_bind_int64 (_tmp18_, 4, (gint64) _tmp20_); #line 301 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = res; + _tmp21_ = res; #line 301 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK"); -#line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = stmt; -#line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = row; + _vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK"); #line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = _tmp32_->exposure_time; + _tmp22_ = stmt; #line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = sqlite3_bind_int64 (_tmp31_, 5, (gint64) _tmp33_); + _tmp23_ = row->exposure_time; #line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp34_; + res = sqlite3_bind_int64 (_tmp22_, 5, (gint64) _tmp23_); #line 303 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = res; + _tmp24_ = res; #line 303 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK"); -#line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = stmt; -#line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = row; + _vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK"); #line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = _tmp37_->master; + _tmp25_ = stmt; #line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = _tmp38_->original_orientation; + _tmp26_ = row->master; #line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = sqlite3_bind_int (_tmp36_, 6, (gint) _tmp39_); + _tmp27_ = _tmp26_->original_orientation; #line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp40_; + res = sqlite3_bind_int (_tmp25_, 6, (gint) _tmp27_); #line 305 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = res; + _tmp28_ = res; #line 305 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp41_ == SQLITE_OK, "res == Sqlite.OK"); -#line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = stmt; -#line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = row; + _vala_assert (_tmp28_ == SQLITE_OK, "res == Sqlite.OK"); #line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = _tmp43_->master; + _tmp29_ = stmt; #line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = _tmp44_->original_orientation; + _tmp30_ = row->master; #line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = sqlite3_bind_int (_tmp42_, 7, (gint) _tmp45_); + _tmp31_ = _tmp30_->original_orientation; #line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp46_; + res = sqlite3_bind_int (_tmp29_, 7, (gint) _tmp31_); #line 307 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = res; + _tmp32_ = res; #line 307 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp47_ == SQLITE_OK, "res == Sqlite.OK"); -#line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = stmt; -#line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = row; + _vala_assert (_tmp32_ == SQLITE_OK, "res == Sqlite.OK"); #line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = _tmp49_->md5; + _tmp33_ = stmt; #line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = g_strdup (_tmp50_); + _tmp34_ = row->md5; #line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = g_free; + _tmp35_ = g_strdup (_tmp34_); #line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = sqlite3_bind_text (_tmp48_, 8, _tmp51_, -1, _tmp52_); + _tmp36_ = g_free; #line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp53_; + res = sqlite3_bind_text (_tmp33_, 8, _tmp35_, -1, _tmp36_); #line 309 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = res; + _tmp37_ = res; #line 309 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp54_ == SQLITE_OK, "res == Sqlite.OK"); -#line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = stmt; -#line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = row; + _vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK"); #line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = _tmp56_->exif_md5; + _tmp38_ = stmt; #line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp58_ = g_strdup (_tmp57_); + _tmp39_ = row->exif_md5; #line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_ = g_free; + _tmp40_ = g_strdup (_tmp39_); #line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp60_ = sqlite3_bind_text (_tmp55_, 9, _tmp58_, -1, _tmp59_); + _tmp41_ = g_free; #line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp60_; + res = sqlite3_bind_text (_tmp38_, 9, _tmp40_, -1, _tmp41_); #line 311 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_ = res; + _tmp42_ = res; #line 311 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp61_ == SQLITE_OK, "res == Sqlite.OK"); -#line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = stmt; -#line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = row; + _vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK"); #line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp64_ = _tmp63_->thumbnail_md5; + _tmp43_ = stmt; #line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_ = g_strdup (_tmp64_); + _tmp44_ = row->thumbnail_md5; #line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_ = g_free; + _tmp45_ = g_strdup (_tmp44_); #line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp67_ = sqlite3_bind_text (_tmp62_, 10, _tmp65_, -1, _tmp66_); + _tmp46_ = g_free; #line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp67_; + res = sqlite3_bind_text (_tmp43_, 10, _tmp45_, -1, _tmp46_); #line 313 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_ = res; + _tmp47_ = res; #line 313 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp68_ == SQLITE_OK, "res == Sqlite.OK"); -#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_ = stmt; -#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp70_ = row; -#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_ = _tmp70_->master; + _vala_assert (_tmp47_ == SQLITE_OK, "res == Sqlite.OK"); #line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp72_ = _tmp71_->file_format; + _tmp48_ = stmt; #line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp73_ = photo_file_format_serialize (_tmp72_); + _tmp49_ = row->master; #line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp74_ = sqlite3_bind_int (_tmp69_, 11, _tmp73_); + _tmp50_ = _tmp49_->file_format; #line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp74_; + res = sqlite3_bind_int (_tmp48_, 11, photo_file_format_serialize (_tmp50_)); #line 315 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp75_ = res; + _tmp51_ = res; #line 315 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp75_ == SQLITE_OK, "res == Sqlite.OK"); -#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp76_ = stmt; + _vala_assert (_tmp51_ == SQLITE_OK, "res == Sqlite.OK"); #line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp77_ = row; + _tmp52_ = stmt; #line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp78_ = _tmp77_->title; + _tmp53_ = row->title; #line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp79_ = g_strdup (_tmp78_); -#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp80_ = g_free; + _tmp54_ = g_strdup (_tmp53_); #line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp81_ = sqlite3_bind_text (_tmp76_, 12, _tmp79_, -1, _tmp80_); + _tmp55_ = g_free; #line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp81_; + res = sqlite3_bind_text (_tmp52_, 12, _tmp54_, -1, _tmp55_); #line 317 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp82_ = res; + _tmp56_ = res; #line 317 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp82_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp56_ == SQLITE_OK, "res == Sqlite.OK"); #line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp83_ = stmt; + _tmp57_ = stmt; #line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp84_ = time_reimported; + _tmp58_ = time_reimported; #line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp85_ = sqlite3_bind_int64 (_tmp83_, 13, (gint64) _tmp84_); -#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp85_; + res = sqlite3_bind_int64 (_tmp57_, 13, (gint64) _tmp58_); #line 319 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp86_ = res; + _tmp59_ = res; #line 319 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp86_ == SQLITE_OK, "res == Sqlite.OK"); -#line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp87_ = stmt; -#line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp88_ = row; + _vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK"); #line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp89_ = _tmp88_->photo_id; + _tmp60_ = stmt; #line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp90_ = _tmp89_.id; + _tmp61_ = row->photo_id; #line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp91_ = sqlite3_bind_int64 (_tmp87_, 14, _tmp90_); + _tmp62_ = _tmp61_.id; #line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp91_; + res = sqlite3_bind_int64 (_tmp60_, 14, _tmp62_); #line 321 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp92_ = res; + _tmp63_ = res; #line 321 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp92_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp63_ == SQLITE_OK, "res == Sqlite.OK"); #line 323 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp93_ = stmt; + _tmp64_ = stmt; #line 323 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp94_ = sqlite3_step (_tmp93_); -#line 323 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp94_; + res = sqlite3_step (_tmp64_); #line 324 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp95_ = res; + _tmp65_ = res; #line 324 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp95_ != SQLITE_DONE) { -#line 2339 "PhotoTable.c" - gint _tmp96_; + if (_tmp65_ != SQLITE_DONE) { +#line 2320 "PhotoTable.c" + gint _tmp66_; #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp96_ = res; + _tmp66_ = res; #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_throw_error ("PhotoTable.reimport_master", _tmp96_, &_inner_error_); + database_table_throw_error ("PhotoTable.reimport_master", _tmp66_, &_inner_error_); #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -2360,7 +2341,7 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) { _sqlite3_finalize0 (stmt); #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 2355 "PhotoTable.c" +#line 2336 "PhotoTable.c" } else { #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -2370,33 +2351,36 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) { g_clear_error (&_inner_error_); #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 2365 "PhotoTable.c" +#line 2346 "PhotoTable.c" } } } #line 327 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_ = row; -#line 327 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp98_ = time_reimported; + _tmp67_ = time_reimported; #line 327 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_->time_reimported = _tmp98_; -#line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp99_ = row; -#line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp100_ = row; + row->time_reimported = _tmp67_; #line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp101_ = _tmp100_->master; + _tmp68_ = row->master; #line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp102_ = _tmp101_->original_orientation; + _tmp69_ = _tmp68_->original_orientation; #line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp99_->orientation = _tmp102_; + row->orientation = _tmp69_; #line 283 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 2387 "PhotoTable.c" +#line 2362 "PhotoTable.c" } -gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gint64 filesize, glong timestamp, const gchar* md5, const gchar* exif_md5, const gchar* thumbnail_md5, PhotoRow* row) { +gboolean +photo_table_master_exif_updated (PhotoTable* self, + PhotoID* photoID, + gint64 filesize, + glong timestamp, + const gchar* md5, + const gchar* exif_md5, + const gchar* thumbnail_md5, + PhotoRow* row) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -2405,54 +2389,32 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - gint64 _tmp5_; - gint _tmp6_; + gint _tmp5_; + sqlite3_stmt* _tmp6_; gint _tmp7_; sqlite3_stmt* _tmp8_; - glong _tmp9_; - gint _tmp10_; + gchar* _tmp9_; + GDestroyNotify _tmp10_; gint _tmp11_; sqlite3_stmt* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - GDestroyNotify _tmp15_; - gint _tmp16_; - gint _tmp17_; - sqlite3_stmt* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; - GDestroyNotify _tmp21_; - gint _tmp22_; + gchar* _tmp13_; + GDestroyNotify _tmp14_; + gint _tmp15_; + sqlite3_stmt* _tmp16_; + gchar* _tmp17_; + GDestroyNotify _tmp18_; + gint _tmp19_; + sqlite3_stmt* _tmp20_; + PhotoID _tmp21_; + gint64 _tmp22_; gint _tmp23_; sqlite3_stmt* _tmp24_; - const gchar* _tmp25_; - gchar* _tmp26_; - GDestroyNotify _tmp27_; - gint _tmp28_; - gint _tmp29_; - sqlite3_stmt* _tmp30_; - PhotoID _tmp31_; - gint64 _tmp32_; - gint _tmp33_; - gint _tmp34_; - sqlite3_stmt* _tmp35_; - gint _tmp36_; - gint _tmp37_; - PhotoRow* _tmp40_; - BackingPhotoRow* _tmp41_; - gint64 _tmp42_; - PhotoRow* _tmp43_; - BackingPhotoRow* _tmp44_; - glong _tmp45_; - PhotoRow* _tmp46_; - const gchar* _tmp47_; - gchar* _tmp48_; - PhotoRow* _tmp49_; - const gchar* _tmp50_; - gchar* _tmp51_; - PhotoRow* _tmp52_; - const gchar* _tmp53_; - gchar* _tmp54_; + gint _tmp25_; + BackingPhotoRow* _tmp28_; + BackingPhotoRow* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; #line 331 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 331 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -2479,112 +2441,88 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi #line 339 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 339 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = filesize; -#line 339 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp5_); -#line 339 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp6_; + res = sqlite3_bind_int64 (_tmp4_, 1, filesize); #line 340 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; + _tmp5_ = res; #line 340 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); -#line 341 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = stmt; -#line 341 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = timestamp; + _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); #line 341 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_bind_int64 (_tmp8_, 2, (gint64) _tmp9_); + _tmp6_ = stmt; #line 341 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_bind_int64 (_tmp6_, 2, (gint64) timestamp); #line 342 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp7_ = res; #line 342 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt; -#line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = md5; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = g_strdup (_tmp13_); + _tmp8_ = stmt; #line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = g_free; + _tmp9_ = g_strdup (md5); #line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = sqlite3_bind_text (_tmp12_, 3, _tmp14_, -1, _tmp15_); + _tmp10_ = g_free; #line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp16_; + res = sqlite3_bind_text (_tmp8_, 3, _tmp9_, -1, _tmp10_); #line 344 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = res; + _tmp11_ = res; #line 344 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); -#line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = stmt; -#line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = exif_md5; + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = g_strdup (_tmp19_); + _tmp12_ = stmt; #line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = g_free; + _tmp13_ = g_strdup (exif_md5); #line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = sqlite3_bind_text (_tmp18_, 4, _tmp20_, -1, _tmp21_); + _tmp14_ = g_free; #line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp22_; + res = sqlite3_bind_text (_tmp12_, 4, _tmp13_, -1, _tmp14_); #line 346 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = res; + _tmp15_ = res; #line 346 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK"); -#line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = stmt; -#line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = thumbnail_md5; + _vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK"); #line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = g_strdup (_tmp25_); + _tmp16_ = stmt; #line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = g_free; + _tmp17_ = g_strdup (thumbnail_md5); #line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = sqlite3_bind_text (_tmp24_, 5, _tmp26_, -1, _tmp27_); + _tmp18_ = g_free; #line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp28_; + res = sqlite3_bind_text (_tmp16_, 5, _tmp17_, -1, _tmp18_); #line 348 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = res; + _tmp19_ = res; #line 348 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp29_ == SQLITE_OK, "res == Sqlite.OK"); -#line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = stmt; + _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); #line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = *photoID; + _tmp20_ = stmt; #line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = _tmp31_.id; + _tmp21_ = *photoID; #line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = sqlite3_bind_int64 (_tmp30_, 6, _tmp32_); + _tmp22_ = _tmp21_.id; #line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp33_; + res = sqlite3_bind_int64 (_tmp20_, 6, _tmp22_); #line 350 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = res; + _tmp23_ = res; #line 350 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp34_ == SQLITE_OK, "res == Sqlite.OK"); -#line 352 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = stmt; + _vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK"); #line 352 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = sqlite3_step (_tmp35_); + _tmp24_ = stmt; #line 352 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp36_; + res = sqlite3_step (_tmp24_); #line 353 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = res; + _tmp25_ = res; #line 353 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp37_ != SQLITE_DONE) { -#line 2566 "PhotoTable.c" - gint _tmp38_; + if (_tmp25_ != SQLITE_DONE) { +#line 2504 "PhotoTable.c" + gint _tmp26_; #line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = res; + _tmp26_ = res; #line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp38_ != SQLITE_CONSTRAINT) { -#line 2572 "PhotoTable.c" - gint _tmp39_; + if (_tmp26_ != SQLITE_CONSTRAINT) { +#line 2510 "PhotoTable.c" + gint _tmp27_; #line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = res; + _tmp27_ = res; #line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("write_update_photo", _tmp39_); -#line 2578 "PhotoTable.c" + database_table_fatal ("write_update_photo", _tmp27_); +#line 2516 "PhotoTable.c" } #line 357 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; @@ -2592,114 +2530,88 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi _sqlite3_finalize0 (stmt); #line 357 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 2586 "PhotoTable.c" - } -#line 360 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = row; -#line 360 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = _tmp40_->master; +#line 2524 "PhotoTable.c" + } #line 360 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = filesize; + _tmp28_ = row->master; #line 360 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_->filesize = _tmp42_; -#line 361 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = row; + _tmp28_->filesize = filesize; #line 361 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = _tmp43_->master; + _tmp29_ = row->master; #line 361 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = timestamp; -#line 361 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_->timestamp = (time_t) _tmp45_; -#line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = row; -#line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = md5; + _tmp29_->timestamp = (time_t) timestamp; #line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = g_strdup (_tmp47_); + _tmp30_ = g_strdup (md5); #line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp46_->md5); + _g_free0 (row->md5); #line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_->md5 = _tmp48_; -#line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = row; -#line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = exif_md5; + row->md5 = _tmp30_; #line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = g_strdup (_tmp50_); + _tmp31_ = g_strdup (exif_md5); #line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp49_->exif_md5); + _g_free0 (row->exif_md5); #line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_->exif_md5 = _tmp51_; + row->exif_md5 = _tmp31_; #line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = row; + _tmp32_ = g_strdup (thumbnail_md5); #line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = thumbnail_md5; + _g_free0 (row->thumbnail_md5); #line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = g_strdup (_tmp53_); -#line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp52_->thumbnail_md5); -#line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_->thumbnail_md5 = _tmp54_; + row->thumbnail_md5 = _tmp32_; #line 366 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; #line 366 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 366 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 2640 "PhotoTable.c" +#line 2558 "PhotoTable.c" } -static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row) { +static void +photo_table_validate_orientation (PhotoTable* self, + PhotoRow* row) +{ gboolean _tmp0_ = FALSE; - PhotoRow* _tmp1_; - Orientation _tmp2_; + Orientation _tmp1_; #line 377 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #line 377 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_ROW (row)); #line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = row; + _tmp1_ = row->orientation; #line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = _tmp1_->orientation; -#line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp2_ < ORIENTATION_MIN) { + if (_tmp1_ < ORIENTATION_MIN) { #line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = TRUE; -#line 2660 "PhotoTable.c" +#line 2578 "PhotoTable.c" } else { - PhotoRow* _tmp3_; - Orientation _tmp4_; + Orientation _tmp2_; #line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = row; + _tmp2_ = row->orientation; #line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_->orientation; -#line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp4_ > ORIENTATION_MAX; -#line 2670 "PhotoTable.c" + _tmp0_ = _tmp2_ > ORIENTATION_MAX; +#line 2585 "PhotoTable.c" } #line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_) { -#line 2674 "PhotoTable.c" - PhotoRow* _tmp5_; - PhotoID _tmp6_; - PhotoRow* _tmp7_; +#line 2589 "PhotoTable.c" + PhotoID _tmp3_; #line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = row; + _tmp3_ = row->photo_id; #line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = _tmp5_->photo_id; -#line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_table_set_orientation (self, &_tmp6_, ORIENTATION_MIN); -#line 382 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = row; + photo_table_set_orientation (self, &_tmp3_, ORIENTATION_MIN); #line 382 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_->orientation = ORIENTATION_MIN; -#line 2688 "PhotoTable.c" + row->orientation = ORIENTATION_MIN; +#line 2597 "PhotoTable.c" } } -PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) { +PhotoRow* +photo_table_get_row (PhotoTable* self, + PhotoID* photo_id) +{ PhotoRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -2711,125 +2623,102 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) { PhotoID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; + sqlite3_stmt* _tmp8_; PhotoRow* row = NULL; - PhotoRow* _tmp11_; + PhotoRow* _tmp9_; + PhotoRow* _tmp10_; + PhotoID _tmp11_; PhotoRow* _tmp12_; - PhotoID _tmp13_; - PhotoRow* _tmp14_; - BackingPhotoRow* _tmp15_; - sqlite3_stmt* _tmp16_; - const gchar* _tmp17_; - gchar* _tmp18_; - PhotoRow* _tmp19_; - BackingPhotoRow* _tmp20_; - sqlite3_stmt* _tmp21_; - gint _tmp22_; + BackingPhotoRow* _tmp13_; + sqlite3_stmt* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + PhotoRow* _tmp17_; + BackingPhotoRow* _tmp18_; + sqlite3_stmt* _tmp19_; + sqlite3_stmt* _tmp20_; + PhotoRow* _tmp21_; + BackingPhotoRow* _tmp22_; sqlite3_stmt* _tmp23_; - gint _tmp24_; - PhotoRow* _tmp25_; - BackingPhotoRow* _tmp26_; - sqlite3_stmt* _tmp27_; - gint64 _tmp28_; + PhotoRow* _tmp24_; + BackingPhotoRow* _tmp25_; + sqlite3_stmt* _tmp26_; + PhotoRow* _tmp27_; + sqlite3_stmt* _tmp28_; PhotoRow* _tmp29_; - BackingPhotoRow* _tmp30_; - sqlite3_stmt* _tmp31_; - gint64 _tmp32_; - PhotoRow* _tmp33_; - sqlite3_stmt* _tmp34_; - gint64 _tmp35_; + sqlite3_stmt* _tmp30_; + PhotoRow* _tmp31_; + BackingPhotoRow* _tmp32_; + sqlite3_stmt* _tmp33_; + PhotoRow* _tmp34_; + sqlite3_stmt* _tmp35_; PhotoRow* _tmp36_; sqlite3_stmt* _tmp37_; - gint _tmp38_; - PhotoRow* _tmp39_; - BackingPhotoRow* _tmp40_; - sqlite3_stmt* _tmp41_; - gint _tmp42_; - PhotoRow* _tmp43_; - sqlite3_stmt* _tmp44_; - gint64 _tmp45_; + PhotoRow* _tmp38_; + sqlite3_stmt* _tmp39_; + const gchar* _tmp40_; + GeeHashMap* _tmp41_; + PhotoRow* _tmp42_; + sqlite3_stmt* _tmp43_; + const gchar* _tmp44_; + gchar* _tmp45_; PhotoRow* _tmp46_; sqlite3_stmt* _tmp47_; - gint64 _tmp48_; - PhotoRow* _tmp49_; - sqlite3_stmt* _tmp50_; - const gchar* _tmp51_; - GeeHashMap* _tmp52_; - PhotoRow* _tmp53_; - sqlite3_stmt* _tmp54_; - const gchar* _tmp55_; - gchar* _tmp56_; - PhotoRow* _tmp57_; - sqlite3_stmt* _tmp58_; - const gchar* _tmp59_; - gchar* _tmp60_; - PhotoRow* _tmp61_; + const gchar* _tmp48_; + gchar* _tmp49_; + PhotoRow* _tmp50_; + sqlite3_stmt* _tmp51_; + const gchar* _tmp52_; + gchar* _tmp53_; + PhotoRow* _tmp54_; + sqlite3_stmt* _tmp55_; + PhotoRow* _tmp56_; + sqlite3_stmt* _tmp57_; + PhotoRow* _tmp58_; + sqlite3_stmt* _tmp59_; + PhotoRow* _tmp60_; + BackingPhotoRow* _tmp61_; sqlite3_stmt* _tmp62_; - const gchar* _tmp63_; - gchar* _tmp64_; - PhotoRow* _tmp65_; - sqlite3_stmt* _tmp66_; - gint64 _tmp67_; - PhotoRow* _tmp68_; - sqlite3_stmt* _tmp69_; - gint64 _tmp70_; + PhotoRow* _tmp63_; + sqlite3_stmt* _tmp64_; + const gchar* _tmp65_; + gchar* _tmp66_; + PhotoRow* _tmp67_; + sqlite3_stmt* _tmp68_; + const gchar* _tmp69_; + gchar* _tmp70_; PhotoRow* _tmp71_; sqlite3_stmt* _tmp72_; - gint _tmp73_; - Rating _tmp74_; + PhotoRow* _tmp73_; + sqlite3_stmt* _tmp74_; PhotoRow* _tmp75_; - BackingPhotoRow* _tmp76_; - sqlite3_stmt* _tmp77_; - gint _tmp78_; - PhotoFileFormat _tmp79_; - PhotoRow* _tmp80_; - sqlite3_stmt* _tmp81_; - const gchar* _tmp82_; - gchar* _tmp83_; - PhotoRow* _tmp84_; + sqlite3_stmt* _tmp76_; + RawDeveloper _tmp77_ = 0; + sqlite3_stmt* _tmp78_; + const gchar* _tmp79_; + PhotoRow* _tmp82_; + PhotoRow* _tmp83_; + BackingPhotoID* _tmp84_; + gint _tmp84__length1; sqlite3_stmt* _tmp85_; - const gchar* _tmp86_; - gchar* _tmp87_; + BackingPhotoID _tmp86_ = {0}; + BackingPhotoID _tmp87_; PhotoRow* _tmp88_; - sqlite3_stmt* _tmp89_; - gint64 _tmp90_; - PhotoRow* _tmp91_; - sqlite3_stmt* _tmp92_; - gint64 _tmp93_; - PhotoRow* _tmp94_; + BackingPhotoID* _tmp89_; + gint _tmp89__length1; + sqlite3_stmt* _tmp90_; + BackingPhotoID _tmp91_ = {0}; + BackingPhotoID _tmp92_; + PhotoRow* _tmp93_; + BackingPhotoID* _tmp94_; + gint _tmp94__length1; sqlite3_stmt* _tmp95_; - gint _tmp96_; - RawDeveloper _tmp97_ = 0; - sqlite3_stmt* _tmp98_; - const gchar* _tmp99_; - PhotoRow* _tmp103_; - PhotoRow* _tmp104_; - BackingPhotoID* _tmp105_; - gint _tmp105__length1; - sqlite3_stmt* _tmp106_; - gint64 _tmp107_; - BackingPhotoID _tmp108_ = {0}; - BackingPhotoID _tmp109_; - PhotoRow* _tmp110_; - BackingPhotoID* _tmp111_; - gint _tmp111__length1; - sqlite3_stmt* _tmp112_; - gint64 _tmp113_; - BackingPhotoID _tmp114_ = {0}; - BackingPhotoID _tmp115_; - PhotoRow* _tmp116_; - BackingPhotoID* _tmp117_; - gint _tmp117__length1; - sqlite3_stmt* _tmp118_; - gint64 _tmp119_; - BackingPhotoID _tmp120_ = {0}; - BackingPhotoID _tmp121_; - PhotoRow* _tmp122_; - sqlite3_stmt* _tmp123_; - const gchar* _tmp124_; - gchar* _tmp125_; + BackingPhotoID _tmp96_ = {0}; + BackingPhotoID _tmp97_; + PhotoRow* _tmp98_; + sqlite3_stmt* _tmp99_; + const gchar* _tmp100_; + gchar* _tmp101_; #line 386 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL); #line 386 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -2858,360 +2747,313 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) { #line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = _tmp5_.id; #line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 399 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 399 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 401 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 401 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 401 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp10_ != SQLITE_ROW) { + if (sqlite3_step (_tmp8_) != SQLITE_ROW) { #line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = NULL; #line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 2868 "PhotoTable.c" +#line 2753 "PhotoTable.c" } #line 404 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = photo_row_new (); + _tmp9_ = photo_row_new (); #line 404 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - row = _tmp11_; + row = _tmp9_; #line 405 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = row; + _tmp10_ = row; #line 405 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = *photo_id; + _tmp11_ = *photo_id; #line 405 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_->photo_id = _tmp13_; + _tmp10_->photo_id = _tmp11_; #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = row; + _tmp12_ = row; #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = _tmp14_->master; + _tmp13_ = _tmp12_->master; #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = stmt; + _tmp14_ = stmt; #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = sqlite3_column_text (_tmp16_, 0); + _tmp15_ = sqlite3_column_text (_tmp14_, 0); #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = g_strdup (_tmp17_); + _tmp16_ = g_strdup (_tmp15_); #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp15_->filepath); + _g_free0 (_tmp13_->filepath); #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_->filepath = _tmp18_; -#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = row; + _tmp13_->filepath = _tmp16_; #line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = _tmp19_->master; -#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = stmt; + _tmp17_ = row; #line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = sqlite3_column_int (_tmp21_, 1); + _tmp18_ = _tmp17_->master; #line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = stmt; + _tmp19_ = stmt; #line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = sqlite3_column_int (_tmp23_, 2); + _tmp20_ = stmt; #line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - dimensions_init (&_tmp20_->dim, _tmp22_, _tmp24_); + dimensions_init (&_tmp18_->dim, sqlite3_column_int (_tmp19_, 1), sqlite3_column_int (_tmp20_, 2)); #line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = row; -#line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = _tmp25_->master; + _tmp21_ = row; #line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = stmt; + _tmp22_ = _tmp21_->master; #line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = sqlite3_column_int64 (_tmp27_, 3); + _tmp23_ = stmt; #line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_->filesize = _tmp28_; -#line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = row; + _tmp22_->filesize = sqlite3_column_int64 (_tmp23_, 3); #line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = _tmp29_->master; + _tmp24_ = row; #line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = stmt; + _tmp25_ = _tmp24_->master; #line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = sqlite3_column_int64 (_tmp31_, 4); + _tmp26_ = stmt; #line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_->timestamp = (time_t) _tmp32_; + _tmp25_->timestamp = (time_t) sqlite3_column_int64 (_tmp26_, 4); #line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = row; -#line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = stmt; + _tmp27_ = row; #line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = sqlite3_column_int64 (_tmp34_, 5); + _tmp28_ = stmt; #line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_->exposure_time = (time_t) _tmp35_; -#line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = row; + _tmp27_->exposure_time = (time_t) sqlite3_column_int64 (_tmp28_, 5); #line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = stmt; + _tmp29_ = row; #line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = sqlite3_column_int (_tmp37_, 6); + _tmp30_ = stmt; #line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_->orientation = (Orientation) _tmp38_; + _tmp29_->orientation = (Orientation) sqlite3_column_int (_tmp30_, 6); #line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = row; + _tmp31_ = row; #line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = _tmp39_->master; + _tmp32_ = _tmp31_->master; #line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = stmt; -#line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = sqlite3_column_int (_tmp41_, 7); + _tmp33_ = stmt; #line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_->original_orientation = (Orientation) _tmp42_; + _tmp32_->original_orientation = (Orientation) sqlite3_column_int (_tmp33_, 7); #line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = row; + _tmp34_ = row; #line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = stmt; -#line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = sqlite3_column_int64 (_tmp44_, 8); + _tmp35_ = stmt; #line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_->import_id.id = _tmp45_; + _tmp34_->import_id.id = sqlite3_column_int64 (_tmp35_, 8); #line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = row; -#line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = stmt; + _tmp36_ = row; #line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = sqlite3_column_int64 (_tmp47_, 9); + _tmp37_ = stmt; #line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_->event_id.id = _tmp48_; + _tmp36_->event_id.id = sqlite3_column_int64 (_tmp37_, 9); #line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = row; + _tmp38_ = row; #line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = stmt; + _tmp39_ = stmt; #line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = sqlite3_column_text (_tmp50_, 10); + _tmp40_ = sqlite3_column_text (_tmp39_, 10); #line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = photo_table_marshall_all_transformations (_tmp51_); + _tmp41_ = photo_table_marshall_all_transformations (_tmp40_); #line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_object_unref0 (_tmp49_->transformations); + _g_object_unref0 (_tmp38_->transformations); #line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_->transformations = _tmp52_; + _tmp38_->transformations = _tmp41_; #line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = row; + _tmp42_ = row; #line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = stmt; + _tmp43_ = stmt; #line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = sqlite3_column_text (_tmp54_, 11); + _tmp44_ = sqlite3_column_text (_tmp43_, 11); #line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = g_strdup (_tmp55_); + _tmp45_ = g_strdup (_tmp44_); #line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp53_->md5); + _g_free0 (_tmp42_->md5); #line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_->md5 = _tmp56_; + _tmp42_->md5 = _tmp45_; #line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = row; + _tmp46_ = row; #line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp58_ = stmt; + _tmp47_ = stmt; #line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_ = sqlite3_column_text (_tmp58_, 12); + _tmp48_ = sqlite3_column_text (_tmp47_, 12); #line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp60_ = g_strdup (_tmp59_); + _tmp49_ = g_strdup (_tmp48_); #line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp57_->thumbnail_md5); + _g_free0 (_tmp46_->thumbnail_md5); #line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_->thumbnail_md5 = _tmp60_; + _tmp46_->thumbnail_md5 = _tmp49_; #line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_ = row; + _tmp50_ = row; #line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = stmt; + _tmp51_ = stmt; #line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = sqlite3_column_text (_tmp62_, 13); + _tmp52_ = sqlite3_column_text (_tmp51_, 13); #line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp64_ = g_strdup (_tmp63_); + _tmp53_ = g_strdup (_tmp52_); #line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp61_->exif_md5); + _g_free0 (_tmp50_->exif_md5); #line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_->exif_md5 = _tmp64_; -#line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_ = row; + _tmp50_->exif_md5 = _tmp53_; #line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_ = stmt; + _tmp54_ = row; #line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp67_ = sqlite3_column_int64 (_tmp66_, 14); + _tmp55_ = stmt; #line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_->time_created = (time_t) _tmp67_; -#line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_ = row; + _tmp54_->time_created = (time_t) sqlite3_column_int64 (_tmp55_, 14); #line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_ = stmt; + _tmp56_ = row; #line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp70_ = sqlite3_column_int64 (_tmp69_, 15); + _tmp57_ = stmt; #line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_->flags = (guint64) _tmp70_; -#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_ = row; -#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp72_ = stmt; + _tmp56_->flags = (guint64) sqlite3_column_int64 (_tmp57_, 15); #line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp73_ = sqlite3_column_int (_tmp72_, 16); + _tmp58_ = row; #line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp74_ = rating_unserialize (_tmp73_); + _tmp59_ = stmt; #line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_->rating = _tmp74_; -#line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp75_ = row; -#line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp76_ = _tmp75_->master; + _tmp58_->rating = rating_unserialize (sqlite3_column_int (_tmp59_, 16)); #line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp77_ = stmt; + _tmp60_ = row; #line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp78_ = sqlite3_column_int (_tmp77_, 17); + _tmp61_ = _tmp60_->master; #line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp79_ = photo_file_format_unserialize (_tmp78_); + _tmp62_ = stmt; #line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp76_->file_format = _tmp79_; + _tmp61_->file_format = photo_file_format_unserialize (sqlite3_column_int (_tmp62_, 17)); #line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp80_ = row; + _tmp63_ = row; #line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp81_ = stmt; + _tmp64_ = stmt; #line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp82_ = sqlite3_column_text (_tmp81_, 18); + _tmp65_ = sqlite3_column_text (_tmp64_, 18); #line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp83_ = g_strdup (_tmp82_); + _tmp66_ = g_strdup (_tmp65_); #line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp80_->title); + _g_free0 (_tmp63_->title); #line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp80_->title = _tmp83_; + _tmp63_->title = _tmp66_; #line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp84_ = row; + _tmp67_ = row; #line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp85_ = stmt; + _tmp68_ = stmt; #line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp86_ = sqlite3_column_text (_tmp85_, 19); + _tmp69_ = sqlite3_column_text (_tmp68_, 19); #line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp87_ = g_strdup (_tmp86_); + _tmp70_ = g_strdup (_tmp69_); #line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp84_->backlinks); + _g_free0 (_tmp67_->backlinks); #line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp84_->backlinks = _tmp87_; -#line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp88_ = row; + _tmp67_->backlinks = _tmp70_; #line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp89_ = stmt; + _tmp71_ = row; #line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp90_ = sqlite3_column_int64 (_tmp89_, 20); + _tmp72_ = stmt; #line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp88_->time_reimported = (time_t) _tmp90_; + _tmp71_->time_reimported = (time_t) sqlite3_column_int64 (_tmp72_, 20); #line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp91_ = row; + _tmp73_ = row; #line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp92_ = stmt; + _tmp74_ = stmt; #line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp93_ = sqlite3_column_int64 (_tmp92_, 21); -#line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp91_->editable_id, _tmp93_); -#line 427 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp94_ = row; + backing_photo_id_init (&_tmp73_->editable_id, sqlite3_column_int64 (_tmp74_, 21)); #line 427 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp95_ = stmt; + _tmp75_ = row; #line 427 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp96_ = sqlite3_column_int (_tmp95_, 22); + _tmp76_ = stmt; #line 427 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp94_->metadata_dirty = _tmp96_ != 0; -#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp98_ = stmt; + _tmp75_->metadata_dirty = sqlite3_column_int (_tmp76_, 22) != 0; #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp99_ = sqlite3_column_text (_tmp98_, 23); + _tmp78_ = stmt; #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp99_ != NULL) { -#line 3110 "PhotoTable.c" - sqlite3_stmt* _tmp100_; - const gchar* _tmp101_; - RawDeveloper _tmp102_; + _tmp79_ = sqlite3_column_text (_tmp78_, 23); #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp100_ = stmt; + if (_tmp79_ != NULL) { +#line 2959 "PhotoTable.c" + sqlite3_stmt* _tmp80_; + const gchar* _tmp81_; #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp101_ = sqlite3_column_text (_tmp100_, 23); + _tmp80_ = stmt; #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp102_ = raw_developer_from_string (_tmp101_); + _tmp81_ = sqlite3_column_text (_tmp80_, 23); #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_ = _tmp102_; -#line 3122 "PhotoTable.c" + _tmp77_ = raw_developer_from_string (_tmp81_); +#line 2968 "PhotoTable.c" } else { #line 429 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_ = RAW_DEVELOPER_CAMERA; -#line 3126 "PhotoTable.c" + _tmp77_ = RAW_DEVELOPER_CAMERA; +#line 2972 "PhotoTable.c" } #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103_ = row; + _tmp82_ = row; #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103_->developer = _tmp97_; + _tmp82_->developer = _tmp77_; #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp104_ = row; + _tmp83_ = row; #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp105_ = _tmp104_->development_ids; + _tmp84_ = _tmp83_->development_ids; #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp105__length1 = _tmp104_->development_ids_length1; + _tmp84__length1 = _tmp83_->development_ids_length1; #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp106_ = stmt; -#line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp107_ = sqlite3_column_int64 (_tmp106_, 24); + _tmp85_ = stmt; #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp108_, _tmp107_); + backing_photo_id_init (&_tmp86_, sqlite3_column_int64 (_tmp85_, 24)); #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp105_[RAW_DEVELOPER_SHOTWELL] = _tmp108_; + _tmp84_[RAW_DEVELOPER_SHOTWELL] = _tmp86_; #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp109_ = _tmp105_[RAW_DEVELOPER_SHOTWELL]; + _tmp87_ = _tmp84_[RAW_DEVELOPER_SHOTWELL]; #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp110_ = row; -#line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp111_ = _tmp110_->development_ids; + _tmp88_ = row; #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp111__length1 = _tmp110_->development_ids_length1; + _tmp89_ = _tmp88_->development_ids; #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp112_ = stmt; + _tmp89__length1 = _tmp88_->development_ids_length1; #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp113_ = sqlite3_column_int64 (_tmp112_, 25); + _tmp90_ = stmt; #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp114_, _tmp113_); + backing_photo_id_init (&_tmp91_, sqlite3_column_int64 (_tmp90_, 25)); #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp111_[RAW_DEVELOPER_CAMERA] = _tmp114_; + _tmp89_[RAW_DEVELOPER_CAMERA] = _tmp91_; #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp115_ = _tmp111_[RAW_DEVELOPER_CAMERA]; -#line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp116_ = row; + _tmp92_ = _tmp89_[RAW_DEVELOPER_CAMERA]; #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp117_ = _tmp116_->development_ids; + _tmp93_ = row; #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp117__length1 = _tmp116_->development_ids_length1; + _tmp94_ = _tmp93_->development_ids; #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp118_ = stmt; + _tmp94__length1 = _tmp93_->development_ids_length1; #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp119_ = sqlite3_column_int64 (_tmp118_, 26); + _tmp95_ = stmt; #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp120_, _tmp119_); + backing_photo_id_init (&_tmp96_, sqlite3_column_int64 (_tmp95_, 26)); #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp117_[RAW_DEVELOPER_EMBEDDED] = _tmp120_; + _tmp94_[RAW_DEVELOPER_EMBEDDED] = _tmp96_; #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp121_ = _tmp117_[RAW_DEVELOPER_EMBEDDED]; + _tmp97_ = _tmp94_[RAW_DEVELOPER_EMBEDDED]; #line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp122_ = row; + _tmp98_ = row; #line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp123_ = stmt; + _tmp99_ = stmt; #line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp124_ = sqlite3_column_text (_tmp123_, 27); + _tmp100_ = sqlite3_column_text (_tmp99_, 27); #line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp125_ = g_strdup (_tmp124_); + _tmp101_ = g_strdup (_tmp100_); #line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp122_->comment); + _g_free0 (_tmp98_->comment); #line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp122_->comment = _tmp125_; + _tmp98_->comment = _tmp101_; #line 435 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = row; #line 435 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 435 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 3198 "PhotoTable.c" +#line 3038 "PhotoTable.c" } -GeeArrayList* photo_table_get_all (PhotoTable* self) { +GeeArrayList* +photo_table_get_all (PhotoTable* self) +{ GeeArrayList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -3247,481 +3089,409 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) { all = _tmp4_; #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 3234 "PhotoTable.c" +#line 3076 "PhotoTable.c" sqlite3_stmt* _tmp5_; gint _tmp6_; - gint _tmp7_; PhotoRow* row = NULL; + PhotoRow* _tmp7_; PhotoRow* _tmp8_; - PhotoRow* _tmp9_; - sqlite3_stmt* _tmp10_; - gint64 _tmp11_; - PhotoRow* _tmp12_; - BackingPhotoRow* _tmp13_; - sqlite3_stmt* _tmp14_; - const gchar* _tmp15_; - gchar* _tmp16_; - PhotoRow* _tmp17_; - BackingPhotoRow* _tmp18_; - sqlite3_stmt* _tmp19_; - gint _tmp20_; + sqlite3_stmt* _tmp9_; + PhotoRow* _tmp10_; + BackingPhotoRow* _tmp11_; + sqlite3_stmt* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + PhotoRow* _tmp15_; + BackingPhotoRow* _tmp16_; + sqlite3_stmt* _tmp17_; + sqlite3_stmt* _tmp18_; + PhotoRow* _tmp19_; + BackingPhotoRow* _tmp20_; sqlite3_stmt* _tmp21_; - gint _tmp22_; - PhotoRow* _tmp23_; - BackingPhotoRow* _tmp24_; - sqlite3_stmt* _tmp25_; - gint64 _tmp26_; + PhotoRow* _tmp22_; + BackingPhotoRow* _tmp23_; + sqlite3_stmt* _tmp24_; + PhotoRow* _tmp25_; + sqlite3_stmt* _tmp26_; PhotoRow* _tmp27_; - BackingPhotoRow* _tmp28_; - sqlite3_stmt* _tmp29_; - gint64 _tmp30_; - PhotoRow* _tmp31_; - sqlite3_stmt* _tmp32_; - gint64 _tmp33_; + sqlite3_stmt* _tmp28_; + PhotoRow* _tmp29_; + BackingPhotoRow* _tmp30_; + sqlite3_stmt* _tmp31_; + PhotoRow* _tmp32_; + sqlite3_stmt* _tmp33_; PhotoRow* _tmp34_; sqlite3_stmt* _tmp35_; - gint _tmp36_; - PhotoRow* _tmp37_; - BackingPhotoRow* _tmp38_; - sqlite3_stmt* _tmp39_; - gint _tmp40_; - PhotoRow* _tmp41_; - sqlite3_stmt* _tmp42_; - gint64 _tmp43_; + PhotoRow* _tmp36_; + sqlite3_stmt* _tmp37_; + const gchar* _tmp38_; + GeeHashMap* _tmp39_; + PhotoRow* _tmp40_; + sqlite3_stmt* _tmp41_; + const gchar* _tmp42_; + gchar* _tmp43_; PhotoRow* _tmp44_; sqlite3_stmt* _tmp45_; - gint64 _tmp46_; - PhotoRow* _tmp47_; - sqlite3_stmt* _tmp48_; - const gchar* _tmp49_; - GeeHashMap* _tmp50_; - PhotoRow* _tmp51_; - sqlite3_stmt* _tmp52_; - const gchar* _tmp53_; - gchar* _tmp54_; - PhotoRow* _tmp55_; - sqlite3_stmt* _tmp56_; - const gchar* _tmp57_; - gchar* _tmp58_; - PhotoRow* _tmp59_; + const gchar* _tmp46_; + gchar* _tmp47_; + PhotoRow* _tmp48_; + sqlite3_stmt* _tmp49_; + const gchar* _tmp50_; + gchar* _tmp51_; + PhotoRow* _tmp52_; + sqlite3_stmt* _tmp53_; + PhotoRow* _tmp54_; + sqlite3_stmt* _tmp55_; + PhotoRow* _tmp56_; + sqlite3_stmt* _tmp57_; + PhotoRow* _tmp58_; + BackingPhotoRow* _tmp59_; sqlite3_stmt* _tmp60_; - const gchar* _tmp61_; - gchar* _tmp62_; - PhotoRow* _tmp63_; - sqlite3_stmt* _tmp64_; - gint64 _tmp65_; - PhotoRow* _tmp66_; - sqlite3_stmt* _tmp67_; - gint64 _tmp68_; + PhotoRow* _tmp61_; + sqlite3_stmt* _tmp62_; + const gchar* _tmp63_; + gchar* _tmp64_; + PhotoRow* _tmp65_; + sqlite3_stmt* _tmp66_; + const gchar* _tmp67_; + gchar* _tmp68_; PhotoRow* _tmp69_; sqlite3_stmt* _tmp70_; - gint _tmp71_; - Rating _tmp72_; + PhotoRow* _tmp71_; + sqlite3_stmt* _tmp72_; PhotoRow* _tmp73_; - BackingPhotoRow* _tmp74_; - sqlite3_stmt* _tmp75_; - gint _tmp76_; - PhotoFileFormat _tmp77_; - PhotoRow* _tmp78_; - sqlite3_stmt* _tmp79_; - const gchar* _tmp80_; - gchar* _tmp81_; - PhotoRow* _tmp82_; + sqlite3_stmt* _tmp74_; + RawDeveloper _tmp75_ = 0; + sqlite3_stmt* _tmp76_; + const gchar* _tmp77_; + PhotoRow* _tmp80_; + PhotoRow* _tmp81_; + BackingPhotoID* _tmp82_; + gint _tmp82__length1; sqlite3_stmt* _tmp83_; - const gchar* _tmp84_; - gchar* _tmp85_; + BackingPhotoID _tmp84_ = {0}; + BackingPhotoID _tmp85_; PhotoRow* _tmp86_; - sqlite3_stmt* _tmp87_; - gint64 _tmp88_; - PhotoRow* _tmp89_; - sqlite3_stmt* _tmp90_; - gint64 _tmp91_; - PhotoRow* _tmp92_; + BackingPhotoID* _tmp87_; + gint _tmp87__length1; + sqlite3_stmt* _tmp88_; + BackingPhotoID _tmp89_ = {0}; + BackingPhotoID _tmp90_; + PhotoRow* _tmp91_; + BackingPhotoID* _tmp92_; + gint _tmp92__length1; sqlite3_stmt* _tmp93_; - gint _tmp94_; - RawDeveloper _tmp95_ = 0; - sqlite3_stmt* _tmp96_; - const gchar* _tmp97_; - PhotoRow* _tmp101_; + BackingPhotoID _tmp94_ = {0}; + BackingPhotoID _tmp95_; + PhotoRow* _tmp96_; + sqlite3_stmt* _tmp97_; + const gchar* _tmp98_; + gchar* _tmp99_; + PhotoRow* _tmp100_; + GeeArrayList* _tmp101_; PhotoRow* _tmp102_; - BackingPhotoID* _tmp103_; - gint _tmp103__length1; - sqlite3_stmt* _tmp104_; - gint64 _tmp105_; - BackingPhotoID _tmp106_ = {0}; - BackingPhotoID _tmp107_; - PhotoRow* _tmp108_; - BackingPhotoID* _tmp109_; - gint _tmp109__length1; - sqlite3_stmt* _tmp110_; - gint64 _tmp111_; - BackingPhotoID _tmp112_ = {0}; - BackingPhotoID _tmp113_; - PhotoRow* _tmp114_; - BackingPhotoID* _tmp115_; - gint _tmp115__length1; - sqlite3_stmt* _tmp116_; - gint64 _tmp117_; - BackingPhotoID _tmp118_ = {0}; - BackingPhotoID _tmp119_; - PhotoRow* _tmp120_; - sqlite3_stmt* _tmp121_; - const gchar* _tmp122_; - gchar* _tmp123_; - PhotoRow* _tmp124_; - GeeArrayList* _tmp125_; - PhotoRow* _tmp126_; #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = stmt; #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = sqlite3_step (_tmp5_); + res = sqlite3_step (_tmp5_); #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp6_; + _tmp6_ = res; #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; -#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!(_tmp7_ == SQLITE_ROW)) { + if (!(_tmp6_ == SQLITE_ROW)) { #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 3370 "PhotoTable.c" +#line 3187 "PhotoTable.c" } #line 452 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = photo_row_new (); + _tmp7_ = photo_row_new (); #line 452 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - row = _tmp8_; -#line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = row; + row = _tmp7_; #line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = stmt; + _tmp8_ = row; #line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = sqlite3_column_int64 (_tmp10_, 0); + _tmp9_ = stmt; #line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_->photo_id.id = _tmp11_; + _tmp8_->photo_id.id = sqlite3_column_int64 (_tmp9_, 0); #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = row; + _tmp10_ = row; #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = _tmp12_->master; + _tmp11_ = _tmp10_->master; #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = stmt; + _tmp12_ = stmt; #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = sqlite3_column_text (_tmp14_, 1); + _tmp13_ = sqlite3_column_text (_tmp12_, 1); #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = g_strdup (_tmp15_); + _tmp14_ = g_strdup (_tmp13_); #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp13_->filepath); + _g_free0 (_tmp11_->filepath); #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_->filepath = _tmp16_; -#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = row; -#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = _tmp17_->master; + _tmp11_->filepath = _tmp14_; #line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = stmt; + _tmp15_ = row; #line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = sqlite3_column_int (_tmp19_, 2); + _tmp16_ = _tmp15_->master; #line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = stmt; + _tmp17_ = stmt; #line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = sqlite3_column_int (_tmp21_, 3); + _tmp18_ = stmt; #line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - dimensions_init (&_tmp18_->dim, _tmp20_, _tmp22_); -#line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = row; + dimensions_init (&_tmp16_->dim, sqlite3_column_int (_tmp17_, 2), sqlite3_column_int (_tmp18_, 3)); #line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = _tmp23_->master; + _tmp19_ = row; #line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = stmt; + _tmp20_ = _tmp19_->master; #line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = sqlite3_column_int64 (_tmp25_, 4); + _tmp21_ = stmt; #line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_->filesize = _tmp26_; -#line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = row; + _tmp20_->filesize = sqlite3_column_int64 (_tmp21_, 4); #line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = _tmp27_->master; + _tmp22_ = row; #line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = stmt; + _tmp23_ = _tmp22_->master; #line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = sqlite3_column_int64 (_tmp29_, 5); + _tmp24_ = stmt; #line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_->timestamp = (time_t) _tmp30_; -#line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = row; + _tmp23_->timestamp = (time_t) sqlite3_column_int64 (_tmp24_, 5); #line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = stmt; + _tmp25_ = row; #line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = sqlite3_column_int64 (_tmp32_, 6); + _tmp26_ = stmt; #line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_->exposure_time = (time_t) _tmp33_; -#line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = row; + _tmp25_->exposure_time = (time_t) sqlite3_column_int64 (_tmp26_, 6); #line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = stmt; + _tmp27_ = row; #line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = sqlite3_column_int (_tmp35_, 7); + _tmp28_ = stmt; #line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_->orientation = (Orientation) _tmp36_; + _tmp27_->orientation = (Orientation) sqlite3_column_int (_tmp28_, 7); #line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = row; + _tmp29_ = row; #line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = _tmp37_->master; + _tmp30_ = _tmp29_->master; #line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = stmt; + _tmp31_ = stmt; #line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = sqlite3_column_int (_tmp39_, 8); -#line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_->original_orientation = (Orientation) _tmp40_; -#line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = row; + _tmp30_->original_orientation = (Orientation) sqlite3_column_int (_tmp31_, 8); #line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = stmt; + _tmp32_ = row; #line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = sqlite3_column_int64 (_tmp42_, 9); + _tmp33_ = stmt; #line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_->import_id.id = _tmp43_; + _tmp32_->import_id.id = sqlite3_column_int64 (_tmp33_, 9); #line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = row; -#line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = stmt; + _tmp34_ = row; #line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = sqlite3_column_int64 (_tmp45_, 10); + _tmp35_ = stmt; #line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_->event_id.id = _tmp46_; + _tmp34_->event_id.id = sqlite3_column_int64 (_tmp35_, 10); #line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = row; + _tmp36_ = row; #line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = stmt; + _tmp37_ = stmt; #line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = sqlite3_column_text (_tmp48_, 11); + _tmp38_ = sqlite3_column_text (_tmp37_, 11); #line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = photo_table_marshall_all_transformations (_tmp49_); + _tmp39_ = photo_table_marshall_all_transformations (_tmp38_); #line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_object_unref0 (_tmp47_->transformations); + _g_object_unref0 (_tmp36_->transformations); #line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_->transformations = _tmp50_; + _tmp36_->transformations = _tmp39_; #line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = row; + _tmp40_ = row; #line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = stmt; + _tmp41_ = stmt; #line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = sqlite3_column_text (_tmp52_, 12); + _tmp42_ = sqlite3_column_text (_tmp41_, 12); #line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = g_strdup (_tmp53_); + _tmp43_ = g_strdup (_tmp42_); #line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp51_->md5); + _g_free0 (_tmp40_->md5); #line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_->md5 = _tmp54_; + _tmp40_->md5 = _tmp43_; #line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = row; + _tmp44_ = row; #line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = stmt; + _tmp45_ = stmt; #line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = sqlite3_column_text (_tmp56_, 13); + _tmp46_ = sqlite3_column_text (_tmp45_, 13); #line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp58_ = g_strdup (_tmp57_); + _tmp47_ = g_strdup (_tmp46_); #line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp55_->thumbnail_md5); + _g_free0 (_tmp44_->thumbnail_md5); #line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_->thumbnail_md5 = _tmp58_; + _tmp44_->thumbnail_md5 = _tmp47_; #line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_ = row; + _tmp48_ = row; #line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp60_ = stmt; + _tmp49_ = stmt; #line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_ = sqlite3_column_text (_tmp60_, 14); + _tmp50_ = sqlite3_column_text (_tmp49_, 14); #line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = g_strdup (_tmp61_); + _tmp51_ = g_strdup (_tmp50_); #line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp59_->exif_md5); + _g_free0 (_tmp48_->exif_md5); #line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_->exif_md5 = _tmp62_; + _tmp48_->exif_md5 = _tmp51_; #line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = row; + _tmp52_ = row; #line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp64_ = stmt; + _tmp53_ = stmt; #line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_ = sqlite3_column_int64 (_tmp64_, 15); -#line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_->time_created = (time_t) _tmp65_; -#line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_ = row; + _tmp52_->time_created = (time_t) sqlite3_column_int64 (_tmp53_, 15); #line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp67_ = stmt; + _tmp54_ = row; #line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_ = sqlite3_column_int64 (_tmp67_, 16); + _tmp55_ = stmt; #line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_->flags = (guint64) _tmp68_; -#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_ = row; -#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp70_ = stmt; + _tmp54_->flags = (guint64) sqlite3_column_int64 (_tmp55_, 16); #line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_ = sqlite3_column_int (_tmp70_, 17); + _tmp56_ = row; #line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp72_ = rating_unserialize (_tmp71_); + _tmp57_ = stmt; #line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_->rating = _tmp72_; -#line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp73_ = row; -#line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp74_ = _tmp73_->master; + _tmp56_->rating = rating_unserialize (sqlite3_column_int (_tmp57_, 17)); #line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp75_ = stmt; + _tmp58_ = row; #line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp76_ = sqlite3_column_int (_tmp75_, 18); + _tmp59_ = _tmp58_->master; #line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp77_ = photo_file_format_unserialize (_tmp76_); + _tmp60_ = stmt; #line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp74_->file_format = _tmp77_; + _tmp59_->file_format = photo_file_format_unserialize (sqlite3_column_int (_tmp60_, 18)); #line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp78_ = row; + _tmp61_ = row; #line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp79_ = stmt; + _tmp62_ = stmt; #line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp80_ = sqlite3_column_text (_tmp79_, 19); + _tmp63_ = sqlite3_column_text (_tmp62_, 19); #line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp81_ = g_strdup (_tmp80_); + _tmp64_ = g_strdup (_tmp63_); #line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp78_->title); + _g_free0 (_tmp61_->title); #line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp78_->title = _tmp81_; + _tmp61_->title = _tmp64_; #line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp82_ = row; + _tmp65_ = row; #line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp83_ = stmt; + _tmp66_ = stmt; #line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp84_ = sqlite3_column_text (_tmp83_, 20); + _tmp67_ = sqlite3_column_text (_tmp66_, 20); #line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp85_ = g_strdup (_tmp84_); + _tmp68_ = g_strdup (_tmp67_); #line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp82_->backlinks); + _g_free0 (_tmp65_->backlinks); #line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp82_->backlinks = _tmp85_; + _tmp65_->backlinks = _tmp68_; #line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp86_ = row; -#line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp87_ = stmt; + _tmp69_ = row; #line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp88_ = sqlite3_column_int64 (_tmp87_, 21); + _tmp70_ = stmt; #line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp86_->time_reimported = (time_t) _tmp88_; + _tmp69_->time_reimported = (time_t) sqlite3_column_int64 (_tmp70_, 21); #line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp89_ = row; + _tmp71_ = row; #line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp90_ = stmt; + _tmp72_ = stmt; #line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp91_ = sqlite3_column_int64 (_tmp90_, 22); -#line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp89_->editable_id, _tmp91_); -#line 475 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp92_ = row; + backing_photo_id_init (&_tmp71_->editable_id, sqlite3_column_int64 (_tmp72_, 22)); #line 475 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp93_ = stmt; + _tmp73_ = row; #line 475 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp94_ = sqlite3_column_int (_tmp93_, 23); + _tmp74_ = stmt; #line 475 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp92_->metadata_dirty = _tmp94_ != 0; + _tmp73_->metadata_dirty = sqlite3_column_int (_tmp74_, 23) != 0; #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp96_ = stmt; + _tmp76_ = stmt; #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_ = sqlite3_column_text (_tmp96_, 24); + _tmp77_ = sqlite3_column_text (_tmp76_, 24); #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp97_ != NULL) { -#line 3614 "PhotoTable.c" - sqlite3_stmt* _tmp98_; - const gchar* _tmp99_; - RawDeveloper _tmp100_; + if (_tmp77_ != NULL) { +#line 3393 "PhotoTable.c" + sqlite3_stmt* _tmp78_; + const gchar* _tmp79_; #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp98_ = stmt; + _tmp78_ = stmt; #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp99_ = sqlite3_column_text (_tmp98_, 24); + _tmp79_ = sqlite3_column_text (_tmp78_, 24); #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp100_ = raw_developer_from_string (_tmp99_); -#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp95_ = _tmp100_; -#line 3626 "PhotoTable.c" + _tmp75_ = raw_developer_from_string (_tmp79_); +#line 3402 "PhotoTable.c" } else { #line 477 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp95_ = RAW_DEVELOPER_CAMERA; -#line 3630 "PhotoTable.c" + _tmp75_ = RAW_DEVELOPER_CAMERA; +#line 3406 "PhotoTable.c" } #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp101_ = row; + _tmp80_ = row; #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp101_->developer = _tmp95_; -#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp102_ = row; + _tmp80_->developer = _tmp75_; #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103_ = _tmp102_->development_ids; + _tmp81_ = row; #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103__length1 = _tmp102_->development_ids_length1; + _tmp82_ = _tmp81_->development_ids; #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp104_ = stmt; + _tmp82__length1 = _tmp81_->development_ids_length1; #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp105_ = sqlite3_column_int64 (_tmp104_, 25); + _tmp83_ = stmt; #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp106_, _tmp105_); + backing_photo_id_init (&_tmp84_, sqlite3_column_int64 (_tmp83_, 25)); #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103_[RAW_DEVELOPER_SHOTWELL] = _tmp106_; + _tmp82_[RAW_DEVELOPER_SHOTWELL] = _tmp84_; #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp107_ = _tmp103_[RAW_DEVELOPER_SHOTWELL]; + _tmp85_ = _tmp82_[RAW_DEVELOPER_SHOTWELL]; #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp108_ = row; -#line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp109_ = _tmp108_->development_ids; + _tmp86_ = row; #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp109__length1 = _tmp108_->development_ids_length1; + _tmp87_ = _tmp86_->development_ids; #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp110_ = stmt; + _tmp87__length1 = _tmp86_->development_ids_length1; #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp111_ = sqlite3_column_int64 (_tmp110_, 26); + _tmp88_ = stmt; #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp112_, _tmp111_); + backing_photo_id_init (&_tmp89_, sqlite3_column_int64 (_tmp88_, 26)); #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp109_[RAW_DEVELOPER_CAMERA] = _tmp112_; + _tmp87_[RAW_DEVELOPER_CAMERA] = _tmp89_; #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp113_ = _tmp109_[RAW_DEVELOPER_CAMERA]; + _tmp90_ = _tmp87_[RAW_DEVELOPER_CAMERA]; #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp114_ = row; + _tmp91_ = row; #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp115_ = _tmp114_->development_ids; + _tmp92_ = _tmp91_->development_ids; #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp115__length1 = _tmp114_->development_ids_length1; + _tmp92__length1 = _tmp91_->development_ids_length1; #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp116_ = stmt; -#line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp117_ = sqlite3_column_int64 (_tmp116_, 27); + _tmp93_ = stmt; #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp118_, _tmp117_); + backing_photo_id_init (&_tmp94_, sqlite3_column_int64 (_tmp93_, 27)); #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp115_[RAW_DEVELOPER_EMBEDDED] = _tmp118_; + _tmp92_[RAW_DEVELOPER_EMBEDDED] = _tmp94_; #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp119_ = _tmp115_[RAW_DEVELOPER_EMBEDDED]; + _tmp95_ = _tmp92_[RAW_DEVELOPER_EMBEDDED]; #line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp120_ = row; + _tmp96_ = row; #line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp121_ = stmt; + _tmp97_ = stmt; #line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp122_ = sqlite3_column_text (_tmp121_, 28); + _tmp98_ = sqlite3_column_text (_tmp97_, 28); #line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp123_ = g_strdup (_tmp122_); + _tmp99_ = g_strdup (_tmp98_); #line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp120_->comment); + _g_free0 (_tmp96_->comment); #line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp120_->comment = _tmp123_; + _tmp96_->comment = _tmp99_; #line 483 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp124_ = row; + _tmp100_ = row; #line 483 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_table_validate_orientation (self, _tmp124_); + photo_table_validate_orientation (self, _tmp100_); #line 485 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp125_ = all; + _tmp101_ = all; #line 485 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp126_ = row; + _tmp102_ = row; #line 485 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp126_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp102_); #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _photo_row_unref0 (row); -#line 3708 "PhotoTable.c" +#line 3478 "PhotoTable.c" } #line 488 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = all; @@ -3729,86 +3499,95 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) { _sqlite3_finalize0 (stmt); #line 488 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 3716 "PhotoTable.c" +#line 3486 "PhotoTable.c" } -void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* new_filename, BackingPhotoID* editable_id, BackingPhotoID* develop_shotwell, BackingPhotoID* develop_camera_id, BackingPhotoID* develop_embedded_id, PhotoID* result) { +void +photo_table_duplicate (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_filename, + BackingPhotoID* editable_id, + BackingPhotoID* develop_shotwell, + BackingPhotoID* develop_camera_id, + BackingPhotoID* develop_embedded_id, + PhotoID* result) +{ PhotoRow* original = NULL; PhotoID _tmp0_; PhotoRow* _tmp1_; - sqlite3_stmt* stmt = NULL; - gint res = 0; - sqlite3* _tmp2_; - sqlite3_stmt* _tmp3_ = NULL; - gint _tmp4_; - gint _tmp5_; - sqlite3_stmt* _tmp6_; - const gchar* _tmp7_; - gchar* _tmp8_; - GDestroyNotify _tmp9_; - gint _tmp10_; - gint _tmp11_; - sqlite3_stmt* _tmp12_; - PhotoRow* _tmp13_; - BackingPhotoRow* _tmp14_; - Dimensions _tmp15_; - gint _tmp16_; - gint _tmp17_; - gint _tmp18_; - sqlite3_stmt* _tmp19_; - PhotoRow* _tmp20_; - BackingPhotoRow* _tmp21_; - Dimensions _tmp22_; - gint _tmp23_; - gint _tmp24_; - gint _tmp25_; - sqlite3_stmt* _tmp26_; - PhotoRow* _tmp27_; - BackingPhotoRow* _tmp28_; - gint64 _tmp29_; - gint _tmp30_; + sqlite3_stmt* stmt = NULL; + gint res = 0; + sqlite3* _tmp2_; + sqlite3_stmt* _tmp3_ = NULL; + gint _tmp4_; + gint _tmp5_; + sqlite3_stmt* _tmp6_; + gchar* _tmp7_; + GDestroyNotify _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + PhotoRow* _tmp11_; + BackingPhotoRow* _tmp12_; + Dimensions _tmp13_; + gint _tmp14_; + gint _tmp15_; + sqlite3_stmt* _tmp16_; + PhotoRow* _tmp17_; + BackingPhotoRow* _tmp18_; + Dimensions _tmp19_; + gint _tmp20_; + gint _tmp21_; + sqlite3_stmt* _tmp22_; + PhotoRow* _tmp23_; + BackingPhotoRow* _tmp24_; + gint64 _tmp25_; + gint _tmp26_; + sqlite3_stmt* _tmp27_; + PhotoRow* _tmp28_; + BackingPhotoRow* _tmp29_; + time_t _tmp30_; gint _tmp31_; sqlite3_stmt* _tmp32_; PhotoRow* _tmp33_; - BackingPhotoRow* _tmp34_; - time_t _tmp35_; - gint _tmp36_; - gint _tmp37_; - sqlite3_stmt* _tmp38_; - PhotoRow* _tmp39_; - time_t _tmp40_; - gint _tmp41_; - gint _tmp42_; - sqlite3_stmt* _tmp43_; - PhotoRow* _tmp44_; - Orientation _tmp45_; - gint _tmp46_; - gint _tmp47_; - sqlite3_stmt* _tmp48_; - PhotoRow* _tmp49_; - BackingPhotoRow* _tmp50_; - Orientation _tmp51_; - gint _tmp52_; - gint _tmp53_; - sqlite3_stmt* _tmp54_; - PhotoRow* _tmp55_; - ImportID _tmp56_; - gint64 _tmp57_; - gint _tmp58_; - gint _tmp59_; - sqlite3_stmt* _tmp60_; - PhotoRow* _tmp61_; - EventID _tmp62_; - gint64 _tmp63_; - gint _tmp64_; - gint _tmp65_; - sqlite3_stmt* _tmp66_; - PhotoRow* _tmp67_; - GeeHashMap* _tmp68_; - gchar* _tmp69_; - GDestroyNotify _tmp70_; - gint _tmp71_; + time_t _tmp34_; + gint _tmp35_; + sqlite3_stmt* _tmp36_; + PhotoRow* _tmp37_; + Orientation _tmp38_; + gint _tmp39_; + sqlite3_stmt* _tmp40_; + PhotoRow* _tmp41_; + BackingPhotoRow* _tmp42_; + Orientation _tmp43_; + gint _tmp44_; + sqlite3_stmt* _tmp45_; + PhotoRow* _tmp46_; + ImportID _tmp47_; + gint64 _tmp48_; + gint _tmp49_; + sqlite3_stmt* _tmp50_; + PhotoRow* _tmp51_; + EventID _tmp52_; + gint64 _tmp53_; + gint _tmp54_; + sqlite3_stmt* _tmp55_; + PhotoRow* _tmp56_; + GeeHashMap* _tmp57_; + gchar* _tmp58_; + GDestroyNotify _tmp59_; + gint _tmp60_; + sqlite3_stmt* _tmp61_; + PhotoRow* _tmp62_; + const gchar* _tmp63_; + gchar* _tmp64_; + GDestroyNotify _tmp65_; + gint _tmp66_; + sqlite3_stmt* _tmp67_; + PhotoRow* _tmp68_; + const gchar* _tmp69_; + gchar* _tmp70_; + GDestroyNotify _tmp71_; gint _tmp72_; sqlite3_stmt* _tmp73_; PhotoRow* _tmp74_; @@ -3816,90 +3595,59 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne gchar* _tmp76_; GDestroyNotify _tmp77_; gint _tmp78_; - gint _tmp79_; - sqlite3_stmt* _tmp80_; - PhotoRow* _tmp81_; - const gchar* _tmp82_; - gchar* _tmp83_; - GDestroyNotify _tmp84_; - gint _tmp85_; - gint _tmp86_; - sqlite3_stmt* _tmp87_; - PhotoRow* _tmp88_; - const gchar* _tmp89_; - gchar* _tmp90_; - GDestroyNotify _tmp91_; - gint _tmp92_; + sqlite3_stmt* _tmp79_; + gint _tmp80_; + sqlite3_stmt* _tmp81_; + PhotoRow* _tmp82_; + guint64 _tmp83_; + gint _tmp84_; + sqlite3_stmt* _tmp85_; + PhotoRow* _tmp86_; + Rating _tmp87_; + gint _tmp88_; + sqlite3_stmt* _tmp89_; + PhotoRow* _tmp90_; + BackingPhotoRow* _tmp91_; + PhotoFileFormat _tmp92_; gint _tmp93_; sqlite3_stmt* _tmp94_; - gulong _tmp95_; - gint _tmp96_; - gint _tmp97_; - sqlite3_stmt* _tmp98_; - PhotoRow* _tmp99_; - guint64 _tmp100_; - gint _tmp101_; - gint _tmp102_; - sqlite3_stmt* _tmp103_; - PhotoRow* _tmp104_; - Rating _tmp105_; - gint _tmp106_; - gint _tmp107_; - gint _tmp108_; - sqlite3_stmt* _tmp109_; - PhotoRow* _tmp110_; - BackingPhotoRow* _tmp111_; - PhotoFileFormat _tmp112_; + PhotoRow* _tmp95_; + const gchar* _tmp96_; + gchar* _tmp97_; + GDestroyNotify _tmp98_; + gint _tmp99_; + sqlite3_stmt* _tmp100_; + BackingPhotoID _tmp101_; + gint64 _tmp102_; + gint _tmp103_; + sqlite3_stmt* _tmp104_; + PhotoRow* _tmp105_; + RawDeveloper _tmp106_; + gchar* _tmp107_; + GDestroyNotify _tmp108_; + gint _tmp109_; + sqlite3_stmt* _tmp110_; + BackingPhotoID _tmp111_; + gint64 _tmp112_; gint _tmp113_; - gint _tmp114_; - gint _tmp115_; - sqlite3_stmt* _tmp116_; - PhotoRow* _tmp117_; - const gchar* _tmp118_; - gchar* _tmp119_; - GDestroyNotify _tmp120_; + sqlite3_stmt* _tmp114_; + BackingPhotoID _tmp115_; + gint64 _tmp116_; + gint _tmp117_; + sqlite3_stmt* _tmp118_; + BackingPhotoID _tmp119_; + gint64 _tmp120_; gint _tmp121_; - gint _tmp122_; - sqlite3_stmt* _tmp123_; - BackingPhotoID _tmp124_; - gint64 _tmp125_; - gint _tmp126_; + sqlite3_stmt* _tmp122_; + PhotoRow* _tmp123_; + const gchar* _tmp124_; + gchar* _tmp125_; + GDestroyNotify _tmp126_; gint _tmp127_; sqlite3_stmt* _tmp128_; - PhotoRow* _tmp129_; - RawDeveloper _tmp130_; - gchar* _tmp131_; - GDestroyNotify _tmp132_; - gint _tmp133_; - gint _tmp134_; - sqlite3_stmt* _tmp135_; - BackingPhotoID _tmp136_; - gint64 _tmp137_; - gint _tmp138_; - gint _tmp139_; - sqlite3_stmt* _tmp140_; - BackingPhotoID _tmp141_; - gint64 _tmp142_; - gint _tmp143_; - gint _tmp144_; - sqlite3_stmt* _tmp145_; - BackingPhotoID _tmp146_; - gint64 _tmp147_; - gint _tmp148_; - gint _tmp149_; - sqlite3_stmt* _tmp150_; - PhotoRow* _tmp151_; - const gchar* _tmp152_; - gchar* _tmp153_; - GDestroyNotify _tmp154_; - gint _tmp155_; - gint _tmp156_; - sqlite3_stmt* _tmp157_; - gint _tmp158_; - gint _tmp159_; - sqlite3* _tmp163_; - gint64 _tmp164_; - PhotoID _tmp165_ = {0}; + gint _tmp129_; + sqlite3* _tmp133_; + PhotoID _tmp134_ = {0}; #line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -3941,546 +3689,476 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne #line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = stmt; #line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = new_filename; -#line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = g_strdup (_tmp7_); + _tmp7_ = g_strdup (new_filename); #line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = g_free; + _tmp8_ = g_free; #line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_bind_text (_tmp6_, 1, _tmp8_, -1, _tmp9_); -#line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_bind_text (_tmp6_, 1, _tmp7_, -1, _tmp8_); #line 510 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 510 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = original; + _tmp10_ = stmt; #line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_->master; + _tmp11_ = original; #line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = _tmp14_->dim; + _tmp12_ = _tmp11_->master; #line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_.width; + _tmp13_ = _tmp12_->dim; #line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = sqlite3_bind_int (_tmp12_, 2, _tmp16_); + _tmp14_ = _tmp13_.width; #line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp17_; + res = sqlite3_bind_int (_tmp10_, 2, _tmp14_); #line 512 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = res; + _tmp15_ = res; #line 512 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK"); -#line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = stmt; + _vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK"); #line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = original; + _tmp16_ = stmt; #line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = _tmp20_->master; + _tmp17_ = original; #line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = _tmp21_->dim; + _tmp18_ = _tmp17_->master; #line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = _tmp22_.height; + _tmp19_ = _tmp18_->dim; #line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = sqlite3_bind_int (_tmp19_, 3, _tmp23_); + _tmp20_ = _tmp19_.height; #line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp24_; + res = sqlite3_bind_int (_tmp16_, 3, _tmp20_); #line 514 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = res; + _tmp21_ = res; #line 514 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK"); -#line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = stmt; + _vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK"); #line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = original; + _tmp22_ = stmt; #line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = _tmp27_->master; + _tmp23_ = original; #line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = _tmp28_->filesize; + _tmp24_ = _tmp23_->master; #line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = sqlite3_bind_int64 (_tmp26_, 4, _tmp29_); + _tmp25_ = _tmp24_->filesize; #line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp30_; + res = sqlite3_bind_int64 (_tmp22_, 4, _tmp25_); #line 516 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = res; + _tmp26_ = res; #line 516 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp31_ == SQLITE_OK, "res == Sqlite.OK"); -#line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = stmt; + _vala_assert (_tmp26_ == SQLITE_OK, "res == Sqlite.OK"); #line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = original; + _tmp27_ = stmt; #line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = _tmp33_->master; + _tmp28_ = original; #line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = _tmp34_->timestamp; + _tmp29_ = _tmp28_->master; #line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = sqlite3_bind_int64 (_tmp32_, 5, (gint64) _tmp35_); + _tmp30_ = _tmp29_->timestamp; #line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp36_; + res = sqlite3_bind_int64 (_tmp27_, 5, (gint64) _tmp30_); #line 518 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = res; + _tmp31_ = res; #line 518 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK"); -#line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = stmt; + _vala_assert (_tmp31_ == SQLITE_OK, "res == Sqlite.OK"); #line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = original; + _tmp32_ = stmt; #line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = _tmp39_->exposure_time; + _tmp33_ = original; #line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = sqlite3_bind_int64 (_tmp38_, 6, (gint64) _tmp40_); + _tmp34_ = _tmp33_->exposure_time; #line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp41_; + res = sqlite3_bind_int64 (_tmp32_, 6, (gint64) _tmp34_); #line 520 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = res; + _tmp35_ = res; #line 520 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK"); -#line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = stmt; + _vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK"); #line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = original; + _tmp36_ = stmt; #line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = _tmp44_->orientation; + _tmp37_ = original; #line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = sqlite3_bind_int (_tmp43_, 7, (gint) _tmp45_); + _tmp38_ = _tmp37_->orientation; #line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp46_; + res = sqlite3_bind_int (_tmp36_, 7, (gint) _tmp38_); #line 522 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = res; + _tmp39_ = res; #line 522 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp47_ == SQLITE_OK, "res == Sqlite.OK"); -#line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = stmt; + _vala_assert (_tmp39_ == SQLITE_OK, "res == Sqlite.OK"); #line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = original; + _tmp40_ = stmt; #line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = _tmp49_->master; + _tmp41_ = original; #line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = _tmp50_->original_orientation; + _tmp42_ = _tmp41_->master; #line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = sqlite3_bind_int (_tmp48_, 8, (gint) _tmp51_); + _tmp43_ = _tmp42_->original_orientation; #line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp52_; + res = sqlite3_bind_int (_tmp40_, 8, (gint) _tmp43_); #line 524 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = res; + _tmp44_ = res; #line 524 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp53_ == SQLITE_OK, "res == Sqlite.OK"); -#line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = stmt; + _vala_assert (_tmp44_ == SQLITE_OK, "res == Sqlite.OK"); #line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = original; + _tmp45_ = stmt; #line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = _tmp55_->import_id; + _tmp46_ = original; #line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = _tmp56_.id; + _tmp47_ = _tmp46_->import_id; #line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp58_ = sqlite3_bind_int64 (_tmp54_, 9, _tmp57_); + _tmp48_ = _tmp47_.id; #line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp58_; + res = sqlite3_bind_int64 (_tmp45_, 9, _tmp48_); #line 526 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_ = res; + _tmp49_ = res; #line 526 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK"); -#line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp60_ = stmt; + _vala_assert (_tmp49_ == SQLITE_OK, "res == Sqlite.OK"); #line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_ = original; + _tmp50_ = stmt; #line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = _tmp61_->event_id; + _tmp51_ = original; #line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = _tmp62_.id; + _tmp52_ = _tmp51_->event_id; #line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp64_ = sqlite3_bind_int64 (_tmp60_, 10, _tmp63_); + _tmp53_ = _tmp52_.id; #line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp64_; + res = sqlite3_bind_int64 (_tmp50_, 10, _tmp53_); #line 528 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_ = res; + _tmp54_ = res; #line 528 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp65_ == SQLITE_OK, "res == Sqlite.OK"); -#line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_ = stmt; + _vala_assert (_tmp54_ == SQLITE_OK, "res == Sqlite.OK"); #line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp67_ = original; + _tmp55_ = stmt; #line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_ = _tmp67_->transformations; + _tmp56_ = original; #line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_ = photo_table_unmarshall_all_transformations (_tmp68_); + _tmp57_ = _tmp56_->transformations; #line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp70_ = g_free; + _tmp58_ = photo_table_unmarshall_all_transformations (_tmp57_); #line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_ = sqlite3_bind_text (_tmp66_, 11, _tmp69_, -1, _tmp70_); + _tmp59_ = g_free; #line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp71_; + res = sqlite3_bind_text (_tmp55_, 11, _tmp58_, -1, _tmp59_); #line 530 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp72_ = res; + _tmp60_ = res; #line 530 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK"); -#line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp73_ = stmt; + _vala_assert (_tmp60_ == SQLITE_OK, "res == Sqlite.OK"); #line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp74_ = original; + _tmp61_ = stmt; #line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp75_ = _tmp74_->md5; + _tmp62_ = original; #line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp76_ = g_strdup (_tmp75_); + _tmp63_ = _tmp62_->md5; #line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp77_ = g_free; + _tmp64_ = g_strdup (_tmp63_); #line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp78_ = sqlite3_bind_text (_tmp73_, 12, _tmp76_, -1, _tmp77_); + _tmp65_ = g_free; #line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp78_; + res = sqlite3_bind_text (_tmp61_, 12, _tmp64_, -1, _tmp65_); #line 532 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp79_ = res; + _tmp66_ = res; #line 532 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp79_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp66_ == SQLITE_OK, "res == Sqlite.OK"); #line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp80_ = stmt; + _tmp67_ = stmt; #line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp81_ = original; + _tmp68_ = original; #line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp82_ = _tmp81_->thumbnail_md5; + _tmp69_ = _tmp68_->thumbnail_md5; #line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp83_ = g_strdup (_tmp82_); + _tmp70_ = g_strdup (_tmp69_); #line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp84_ = g_free; + _tmp71_ = g_free; #line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp85_ = sqlite3_bind_text (_tmp80_, 13, _tmp83_, -1, _tmp84_); -#line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp85_; + res = sqlite3_bind_text (_tmp67_, 13, _tmp70_, -1, _tmp71_); #line 534 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp86_ = res; + _tmp72_ = res; #line 534 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp86_ == SQLITE_OK, "res == Sqlite.OK"); -#line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp87_ = stmt; + _vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK"); #line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp88_ = original; + _tmp73_ = stmt; #line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp89_ = _tmp88_->exif_md5; + _tmp74_ = original; #line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp90_ = g_strdup (_tmp89_); + _tmp75_ = _tmp74_->exif_md5; #line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp91_ = g_free; + _tmp76_ = g_strdup (_tmp75_); #line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp92_ = sqlite3_bind_text (_tmp87_, 14, _tmp90_, -1, _tmp91_); + _tmp77_ = g_free; #line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp92_; + res = sqlite3_bind_text (_tmp73_, 14, _tmp76_, -1, _tmp77_); #line 536 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp93_ = res; + _tmp78_ = res; #line 536 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp93_ == SQLITE_OK, "res == Sqlite.OK"); -#line 537 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp94_ = stmt; -#line 537 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp95_ = now_sec (); + _vala_assert (_tmp78_ == SQLITE_OK, "res == Sqlite.OK"); #line 537 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp96_ = sqlite3_bind_int64 (_tmp94_, 15, (gint64) _tmp95_); + _tmp79_ = stmt; #line 537 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp96_; + res = sqlite3_bind_int64 (_tmp79_, 15, (gint64) now_sec ()); #line 538 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_ = res; + _tmp80_ = res; #line 538 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp97_ == SQLITE_OK, "res == Sqlite.OK"); -#line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp98_ = stmt; + _vala_assert (_tmp80_ == SQLITE_OK, "res == Sqlite.OK"); #line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp99_ = original; + _tmp81_ = stmt; #line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp100_ = _tmp99_->flags; + _tmp82_ = original; #line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp101_ = sqlite3_bind_int64 (_tmp98_, 16, (gint64) _tmp100_); + _tmp83_ = _tmp82_->flags; #line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp101_; + res = sqlite3_bind_int64 (_tmp81_, 16, (gint64) _tmp83_); #line 540 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp102_ = res; + _tmp84_ = res; #line 540 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp102_ == SQLITE_OK, "res == Sqlite.OK"); -#line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103_ = stmt; + _vala_assert (_tmp84_ == SQLITE_OK, "res == Sqlite.OK"); #line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp104_ = original; -#line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp105_ = _tmp104_->rating; + _tmp85_ = stmt; #line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp106_ = rating_serialize (_tmp105_); + _tmp86_ = original; #line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp107_ = sqlite3_bind_int64 (_tmp103_, 17, (gint64) _tmp106_); + _tmp87_ = _tmp86_->rating; #line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp107_; + res = sqlite3_bind_int64 (_tmp85_, 17, (gint64) rating_serialize (_tmp87_)); #line 542 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp108_ = res; + _tmp88_ = res; #line 542 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp108_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp88_ == SQLITE_OK, "res == Sqlite.OK"); #line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp109_ = stmt; -#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp110_ = original; -#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp111_ = _tmp110_->master; + _tmp89_ = stmt; #line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp112_ = _tmp111_->file_format; + _tmp90_ = original; #line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp113_ = photo_file_format_serialize (_tmp112_); + _tmp91_ = _tmp90_->master; #line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp114_ = sqlite3_bind_int (_tmp109_, 18, _tmp113_); + _tmp92_ = _tmp91_->file_format; #line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp114_; + res = sqlite3_bind_int (_tmp89_, 18, photo_file_format_serialize (_tmp92_)); #line 544 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp115_ = res; + _tmp93_ = res; #line 544 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp115_ == SQLITE_OK, "res == Sqlite.OK"); -#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp116_ = stmt; + _vala_assert (_tmp93_ == SQLITE_OK, "res == Sqlite.OK"); #line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp117_ = original; + _tmp94_ = stmt; #line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp118_ = _tmp117_->title; + _tmp95_ = original; #line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp119_ = g_strdup (_tmp118_); + _tmp96_ = _tmp95_->title; #line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp120_ = g_free; + _tmp97_ = g_strdup (_tmp96_); #line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp121_ = sqlite3_bind_text (_tmp116_, 19, _tmp119_, -1, _tmp120_); + _tmp98_ = g_free; #line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp121_; + res = sqlite3_bind_text (_tmp94_, 19, _tmp97_, -1, _tmp98_); #line 546 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp122_ = res; + _tmp99_ = res; #line 546 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp122_ == SQLITE_OK, "res == Sqlite.OK"); -#line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp123_ = stmt; + _vala_assert (_tmp99_ == SQLITE_OK, "res == Sqlite.OK"); #line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp124_ = *editable_id; + _tmp100_ = stmt; #line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp125_ = _tmp124_.id; + _tmp101_ = *editable_id; #line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp126_ = sqlite3_bind_int64 (_tmp123_, 20, _tmp125_); + _tmp102_ = _tmp101_.id; #line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp126_; + res = sqlite3_bind_int64 (_tmp100_, 20, _tmp102_); #line 548 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp127_ = res; + _tmp103_ = res; #line 548 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp127_ == SQLITE_OK, "res == Sqlite.OK"); -#line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp128_ = stmt; + _vala_assert (_tmp103_ == SQLITE_OK, "res == Sqlite.OK"); #line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp129_ = original; + _tmp104_ = stmt; #line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp130_ = _tmp129_->developer; + _tmp105_ = original; #line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp131_ = raw_developer_to_string (_tmp130_); + _tmp106_ = _tmp105_->developer; #line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp132_ = g_free; + _tmp107_ = raw_developer_to_string (_tmp106_); #line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp133_ = sqlite3_bind_text (_tmp128_, 21, _tmp131_, -1, _tmp132_); + _tmp108_ = g_free; #line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp133_; + res = sqlite3_bind_text (_tmp104_, 21, _tmp107_, -1, _tmp108_); #line 551 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp134_ = res; + _tmp109_ = res; #line 551 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp134_ == SQLITE_OK, "res == Sqlite.OK"); -#line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp135_ = stmt; + _vala_assert (_tmp109_ == SQLITE_OK, "res == Sqlite.OK"); #line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp136_ = *develop_shotwell; + _tmp110_ = stmt; #line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp137_ = _tmp136_.id; + _tmp111_ = *develop_shotwell; #line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp138_ = sqlite3_bind_int64 (_tmp135_, 22, _tmp137_); + _tmp112_ = _tmp111_.id; #line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp138_; + res = sqlite3_bind_int64 (_tmp110_, 22, _tmp112_); #line 553 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp139_ = res; + _tmp113_ = res; #line 553 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp139_ == SQLITE_OK, "res == Sqlite.OK"); -#line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp140_ = stmt; + _vala_assert (_tmp113_ == SQLITE_OK, "res == Sqlite.OK"); #line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp141_ = *develop_camera_id; + _tmp114_ = stmt; #line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp142_ = _tmp141_.id; + _tmp115_ = *develop_camera_id; #line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp143_ = sqlite3_bind_int64 (_tmp140_, 23, _tmp142_); + _tmp116_ = _tmp115_.id; #line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp143_; + res = sqlite3_bind_int64 (_tmp114_, 23, _tmp116_); #line 555 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp144_ = res; + _tmp117_ = res; #line 555 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp144_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp117_ == SQLITE_OK, "res == Sqlite.OK"); #line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp145_ = stmt; -#line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp146_ = *develop_embedded_id; + _tmp118_ = stmt; #line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp147_ = _tmp146_.id; + _tmp119_ = *develop_embedded_id; #line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp148_ = sqlite3_bind_int64 (_tmp145_, 24, _tmp147_); + _tmp120_ = _tmp119_.id; #line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp148_; + res = sqlite3_bind_int64 (_tmp118_, 24, _tmp120_); #line 557 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp149_ = res; + _tmp121_ = res; #line 557 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp149_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp121_ == SQLITE_OK, "res == Sqlite.OK"); #line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp150_ = stmt; + _tmp122_ = stmt; #line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp151_ = original; + _tmp123_ = original; #line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp152_ = _tmp151_->comment; + _tmp124_ = _tmp123_->comment; #line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp153_ = g_strdup (_tmp152_); -#line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp154_ = g_free; + _tmp125_ = g_strdup (_tmp124_); #line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp155_ = sqlite3_bind_text (_tmp150_, 25, _tmp153_, -1, _tmp154_); + _tmp126_ = g_free; #line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp155_; + res = sqlite3_bind_text (_tmp122_, 25, _tmp125_, -1, _tmp126_); #line 559 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp156_ = res; + _tmp127_ = res; #line 559 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp156_ == SQLITE_OK, "res == Sqlite.OK"); -#line 561 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp157_ = stmt; + _vala_assert (_tmp127_ == SQLITE_OK, "res == Sqlite.OK"); #line 561 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp158_ = sqlite3_step (_tmp157_); + _tmp128_ = stmt; #line 561 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp158_; + res = sqlite3_step (_tmp128_); #line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp159_ = res; + _tmp129_ = res; #line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp159_ != SQLITE_DONE) { -#line 4333 "PhotoTable.c" - gint _tmp160_; - PhotoID _tmp162_ = {0}; + if (_tmp129_ != SQLITE_DONE) { +#line 4021 "PhotoTable.c" + gint _tmp130_; + PhotoID _tmp132_ = {0}; #line 563 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp160_ = res; + _tmp130_ = res; #line 563 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp160_ != SQLITE_CONSTRAINT) { -#line 4340 "PhotoTable.c" - gint _tmp161_; + if (_tmp130_ != SQLITE_CONSTRAINT) { +#line 4028 "PhotoTable.c" + gint _tmp131_; #line 564 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp161_ = res; + _tmp131_ = res; #line 564 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("duplicate", _tmp161_); -#line 4346 "PhotoTable.c" + database_table_fatal ("duplicate", _tmp131_); +#line 4034 "PhotoTable.c" } #line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp162_, PHOTO_ID_INVALID); + photo_id_init (&_tmp132_, PHOTO_ID_INVALID); #line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - *result = _tmp162_; + *result = _tmp132_; #line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _photo_row_unref0 (original); #line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4358 "PhotoTable.c" +#line 4046 "PhotoTable.c" } #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp163_ = database_table_db; + _tmp133_ = database_table_db; #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp164_ = sqlite3_last_insert_rowid (_tmp163_); + photo_id_init (&_tmp134_, sqlite3_last_insert_rowid (_tmp133_)); #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp165_, _tmp164_); -#line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - *result = _tmp165_; + *result = _tmp134_; #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _photo_row_unref0 (original); #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4374 "PhotoTable.c" +#line 4060 "PhotoTable.c" } -gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar* new_title) { +gboolean +photo_table_set_title (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_title) +{ gboolean result = FALSE; const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - PhotoID _tmp3_; - gint64 _tmp4_; - gboolean _tmp5_; + PhotoID _tmp1_; + gint64 _tmp2_; #line 572 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 572 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (photo_id != NULL, FALSE); #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = new_title; + if (new_title != NULL) { #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_ != NULL) { -#line 4393 "PhotoTable.c" - const gchar* _tmp2_; -#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = new_title; -#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp2_; -#line 4399 "PhotoTable.c" + _tmp0_ = new_title; +#line 4081 "PhotoTable.c" } else { #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = ""; -#line 4403 "PhotoTable.c" +#line 4085 "PhotoTable.c" } #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = *photo_id; + _tmp1_ = *photo_id; #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_.id; -#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "title", _tmp0_); + _tmp2_ = _tmp1_.id; #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp5_; + result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "title", _tmp0_); #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4415 "PhotoTable.c" +#line 4095 "PhotoTable.c" } -gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gchar* new_comment) { +gboolean +photo_table_set_comment (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_comment) +{ gboolean result = FALSE; const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - PhotoID _tmp3_; - gint64 _tmp4_; - gboolean _tmp5_; + PhotoID _tmp1_; + gint64 _tmp2_; #line 576 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 576 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (photo_id != NULL, FALSE); #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = new_comment; -#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_ != NULL) { -#line 4434 "PhotoTable.c" - const gchar* _tmp2_; + if (new_comment != NULL) { #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = new_comment; -#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp2_; -#line 4440 "PhotoTable.c" + _tmp0_ = new_comment; +#line 4116 "PhotoTable.c" } else { #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = ""; -#line 4444 "PhotoTable.c" +#line 4120 "PhotoTable.c" } #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = *photo_id; -#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_.id; + _tmp1_ = *photo_id; #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "comment", _tmp0_); + _tmp2_ = _tmp1_.id; #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp5_; + result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "comment", _tmp0_); #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4456 "PhotoTable.c" +#line 4130 "PhotoTable.c" } -void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* filepath, GError** error) { +void +photo_table_set_filepath (PhotoTable* self, + PhotoID* photo_id, + const gchar* filepath, + GError** error) +{ PhotoID _tmp0_; gint64 _tmp1_; - const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 580 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -4493,9 +4171,7 @@ void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = filepath; -#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filename", _tmp2_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filename", filepath, &_inner_error_); #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4504,7 +4180,7 @@ void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* g_propagate_error (error, _inner_error_); #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4487 "PhotoTable.c" +#line 4163 "PhotoTable.c" } else { #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4512,16 +4188,20 @@ void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* g_clear_error (&_inner_error_); #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4495 "PhotoTable.c" +#line 4171 "PhotoTable.c" } } } -void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t timestamp, GError** error) { +void +photo_table_update_timestamp (PhotoTable* self, + PhotoID* photo_id, + time_t timestamp, + GError** error) +{ PhotoID _tmp0_; gint64 _tmp1_; - time_t _tmp2_; GError * _inner_error_ = NULL; #line 584 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -4532,9 +4212,7 @@ void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t t #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = timestamp; -#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "timestamp", (gint64) _tmp2_, &_inner_error_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "timestamp", (gint64) timestamp, &_inner_error_); #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4543,7 +4221,7 @@ void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t t g_propagate_error (error, _inner_error_); #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4526 "PhotoTable.c" +#line 4204 "PhotoTable.c" } else { #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4551,18 +4229,20 @@ void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t t g_clear_error (&_inner_error_); #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4534 "PhotoTable.c" +#line 4212 "PhotoTable.c" } } } -gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, time_t time) { +gboolean +photo_table_set_exposure_time (PhotoTable* self, + PhotoID* photo_id, + time_t time) +{ gboolean result = FALSE; PhotoID _tmp0_; gint64 _tmp1_; - time_t _tmp2_; - gboolean _tmp3_; #line 588 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 588 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4572,18 +4252,19 @@ gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, tim #line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = time; -#line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "exposure_time", (gint64) _tmp2_); -#line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp3_; + result = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "exposure_time", (gint64) time); #line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4562 "PhotoTable.c" +#line 4238 "PhotoTable.c" } -void photo_table_set_import_id (PhotoTable* self, PhotoID* photo_id, ImportID* import_id, GError** error) { +void +photo_table_set_import_id (PhotoTable* self, + PhotoID* photo_id, + ImportID* import_id, + GError** error) +{ PhotoID _tmp0_; gint64 _tmp1_; ImportID _tmp2_; @@ -4613,7 +4294,7 @@ void photo_table_set_import_id (PhotoTable* self, PhotoID* photo_id, ImportID* i g_propagate_error (error, _inner_error_); #line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4596 "PhotoTable.c" +#line 4277 "PhotoTable.c" } else { #line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4621,13 +4302,16 @@ void photo_table_set_import_id (PhotoTable* self, PhotoID* photo_id, ImportID* i g_clear_error (&_inner_error_); #line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4604 "PhotoTable.c" +#line 4285 "PhotoTable.c" } } } -gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) { +gboolean +photo_table_remove_by_file (PhotoTable* self, + GFile* file) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -4636,14 +4320,11 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) { gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - GFile* _tmp5_; - gchar* _tmp6_; - GDestroyNotify _tmp7_; - gint _tmp8_; + gchar* _tmp5_; + GDestroyNotify _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; gint _tmp9_; - sqlite3_stmt* _tmp10_; - gint _tmp11_; - gint _tmp12_; #line 596 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 596 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4665,42 +4346,36 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) { #line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = file; -#line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = g_file_get_path (_tmp5_); + _tmp5_ = g_file_get_path (file); #line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = g_free; -#line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); + _tmp6_ = g_free; #line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp8_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_); #line 602 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = res; + _tmp7_ = res; #line 602 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); -#line 604 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 604 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = sqlite3_step (_tmp10_); + _tmp8_ = stmt; #line 604 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp11_; + res = sqlite3_step (_tmp8_); #line 605 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = res; + _tmp9_ = res; #line 605 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp12_ != SQLITE_DONE) { -#line 4671 "PhotoTable.c" - gint _tmp13_; + if (_tmp9_ != SQLITE_DONE) { +#line 4346 "PhotoTable.c" + gint _tmp10_; #line 606 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp10_ = res; #line 606 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_warning ("remove", _tmp13_); + database_table_warning ("remove", _tmp10_); #line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4683 "PhotoTable.c" +#line 4358 "PhotoTable.c" } #line 611 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; @@ -4708,11 +4383,15 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) { _sqlite3_finalize0 (stmt); #line 611 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4691 "PhotoTable.c" +#line 4366 "PhotoTable.c" } -void photo_table_remove (PhotoTable* self, PhotoID* photo_id, GError** error) { +void +photo_table_remove (PhotoTable* self, + PhotoID* photo_id, + GError** error) +{ PhotoID _tmp0_; gint64 _tmp1_; GError * _inner_error_ = NULL; @@ -4734,7 +4413,7 @@ void photo_table_remove (PhotoTable* self, PhotoID* photo_id, GError** error) { g_propagate_error (error, _inner_error_); #line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4717 "PhotoTable.c" +#line 4396 "PhotoTable.c" } else { #line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4742,13 +4421,15 @@ void photo_table_remove (PhotoTable* self, PhotoID* photo_id, GError** error) { g_clear_error (&_inner_error_); #line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4725 "PhotoTable.c" +#line 4404 "PhotoTable.c" } } } -GeeArrayList* photo_table_get_photos (PhotoTable* self) { +GeeArrayList* +photo_table_get_photos (PhotoTable* self) +{ GeeArrayList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -4778,68 +4459,62 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) { _tmp4_ = gee_array_list_new (TYPE_PHOTO_ID, (GBoxedCopyFunc) photo_id_dup, (GDestroyNotify) photo_id_free, NULL, NULL, NULL); #line 623 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_ids = _tmp4_; -#line 4761 "PhotoTable.c" +#line 4442 "PhotoTable.c" { gboolean _tmp5_ = FALSE; #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = TRUE; #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 4768 "PhotoTable.c" +#line 4449 "PhotoTable.c" sqlite3_stmt* _tmp6_; gint _tmp7_; - gint _tmp8_; - GeeArrayList* _tmp11_; - sqlite3_stmt* _tmp12_; - gint64 _tmp13_; - PhotoID _tmp14_ = {0}; + GeeArrayList* _tmp10_; + sqlite3_stmt* _tmp11_; + PhotoID _tmp12_ = {0}; #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!_tmp5_) { -#line 4778 "PhotoTable.c" +#line 4457 "PhotoTable.c" } #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = FALSE; #line 625 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = stmt; #line 625 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_step (_tmp6_); -#line 625 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_step (_tmp6_); #line 626 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 626 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp8_ == SQLITE_DONE) { + if (_tmp7_ == SQLITE_DONE) { #line 627 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 4794 "PhotoTable.c" +#line 4471 "PhotoTable.c" } else { - gint _tmp9_; + gint _tmp8_; #line 628 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = res; + _tmp8_ = res; #line 628 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp9_ != SQLITE_ROW) { -#line 4801 "PhotoTable.c" - gint _tmp10_; + if (_tmp8_ != SQLITE_ROW) { +#line 4478 "PhotoTable.c" + gint _tmp9_; #line 629 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = res; + _tmp9_ = res; #line 629 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("get_photos", _tmp10_); + database_table_fatal ("get_photos", _tmp9_); #line 631 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 4809 "PhotoTable.c" +#line 4486 "PhotoTable.c" } } #line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = photo_ids; + _tmp10_ = photo_ids; #line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt; -#line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = sqlite3_column_int64 (_tmp12_, 0); + _tmp11_ = stmt; #line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp14_, _tmp13_); + photo_id_init (&_tmp12_, sqlite3_column_int64 (_tmp11_, 0)); #line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp14_); -#line 4822 "PhotoTable.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp12_); +#line 4497 "PhotoTable.c" } } #line 637 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4848,16 +4523,18 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) { _sqlite3_finalize0 (stmt); #line 637 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4831 "PhotoTable.c" +#line 4506 "PhotoTable.c" } -gboolean photo_table_set_orientation (PhotoTable* self, PhotoID* photo_id, Orientation orientation) { +gboolean +photo_table_set_orientation (PhotoTable* self, + PhotoID* photo_id, + Orientation orientation) +{ gboolean result = FALSE; PhotoID _tmp0_; gint64 _tmp1_; - Orientation _tmp2_; - gboolean _tmp3_; #line 640 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 640 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4867,23 +4544,21 @@ gboolean photo_table_set_orientation (PhotoTable* self, PhotoID* photo_id, Orien #line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = orientation; -#line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = database_table_update_int_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "orientation", (gint) _tmp2_); -#line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp3_; + result = database_table_update_int_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "orientation", (gint) orientation); #line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4857 "PhotoTable.c" +#line 4530 "PhotoTable.c" } -gboolean photo_table_replace_flags (PhotoTable* self, PhotoID* photo_id, guint64 flags) { +gboolean +photo_table_replace_flags (PhotoTable* self, + PhotoID* photo_id, + guint64 flags) +{ gboolean result = FALSE; PhotoID _tmp0_; gint64 _tmp1_; - guint64 _tmp2_; - gboolean _tmp3_; #line 644 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 644 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4893,24 +4568,21 @@ gboolean photo_table_replace_flags (PhotoTable* self, PhotoID* photo_id, guint64 #line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = flags; -#line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "flags", (gint64) _tmp2_); -#line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp3_; + result = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "flags", (gint64) flags); #line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4883 "PhotoTable.c" +#line 4554 "PhotoTable.c" } -gboolean photo_table_set_rating (PhotoTable* self, PhotoID* photo_id, Rating rating) { +gboolean +photo_table_set_rating (PhotoTable* self, + PhotoID* photo_id, + Rating rating) +{ gboolean result = FALSE; PhotoID _tmp0_; gint64 _tmp1_; - Rating _tmp2_; - gint _tmp3_; - gboolean _tmp4_; #line 648 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 648 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4920,20 +4592,17 @@ gboolean photo_table_set_rating (PhotoTable* self, PhotoID* photo_id, Rating rat #line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = rating; -#line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = rating_serialize (_tmp2_); -#line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = database_table_update_int_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "rating", _tmp3_); -#line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp4_; + result = database_table_update_int_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "rating", rating_serialize (rating)); #line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4912 "PhotoTable.c" +#line 4578 "PhotoTable.c" } -gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) { +gint +photo_table_get_event_photo_count (PhotoTable* self, + EventID* event_id) +{ gint result = 0; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -4945,7 +4614,6 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) { EventID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; gint count = 0; #line 652 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), 0); @@ -4972,68 +4640,63 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) { #line 657 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = _tmp5_.id; #line 657 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 657 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 658 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 658 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 660 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" count = 0; -#line 4964 "PhotoTable.c" +#line 4630 "PhotoTable.c" { - gboolean _tmp9_ = FALSE; + gboolean _tmp8_ = FALSE; #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = TRUE; + _tmp8_ = TRUE; #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 4971 "PhotoTable.c" - sqlite3_stmt* _tmp10_; - gint _tmp11_; - gint _tmp12_; - gint _tmp15_; +#line 4637 "PhotoTable.c" + sqlite3_stmt* _tmp9_; + gint _tmp10_; + gint _tmp13_; #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp9_) { -#line 4978 "PhotoTable.c" + if (!_tmp8_) { +#line 4643 "PhotoTable.c" } #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = FALSE; -#line 662 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = stmt; + _tmp8_ = FALSE; #line 662 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = sqlite3_step (_tmp10_); + _tmp9_ = stmt; #line 662 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp11_; + res = sqlite3_step (_tmp9_); #line 663 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 663 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp12_ == SQLITE_DONE) { + if (_tmp10_ == SQLITE_DONE) { #line 664 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 4994 "PhotoTable.c" +#line 4657 "PhotoTable.c" } else { - gint _tmp13_; + gint _tmp11_; #line 665 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 665 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp13_ != SQLITE_ROW) { -#line 5001 "PhotoTable.c" - gint _tmp14_; + if (_tmp11_ != SQLITE_ROW) { +#line 4664 "PhotoTable.c" + gint _tmp12_; #line 666 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = res; + _tmp12_ = res; #line 666 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("get_event_photo_count", _tmp14_); + database_table_fatal ("get_event_photo_count", _tmp12_); #line 668 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 5009 "PhotoTable.c" +#line 4672 "PhotoTable.c" } } #line 671 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = count; + _tmp13_ = count; #line 671 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - count = _tmp15_ + 1; -#line 5016 "PhotoTable.c" + count = _tmp13_ + 1; +#line 4679 "PhotoTable.c" } } #line 674 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5042,11 +4705,14 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 674 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5025 "PhotoTable.c" +#line 4688 "PhotoTable.c" } -GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event_id) { +GeeArrayList* +photo_table_get_event_source_ids (PhotoTable* self, + EventID* event_id) +{ GeeArrayList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -5058,9 +4724,8 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event EventID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; GeeArrayList* _result_ = NULL; - GeeArrayList* _tmp9_; + GeeArrayList* _tmp8_; #line 677 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL); #line 677 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5086,87 +4751,79 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event #line 682 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = _tmp5_.id; #line 682 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 682 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 683 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 683 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 685 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp8_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 685 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _result_ = _tmp9_; -#line 5080 "PhotoTable.c" + _result_ = _tmp8_; +#line 4743 "PhotoTable.c" { - gboolean _tmp10_ = FALSE; + gboolean _tmp9_ = FALSE; #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = TRUE; + _tmp9_ = TRUE; #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 5087 "PhotoTable.c" - sqlite3_stmt* _tmp11_; - gint _tmp12_; - gint _tmp13_; - GeeArrayList* _tmp16_; - sqlite3_stmt* _tmp17_; - gint64 _tmp18_; - PhotoID _tmp19_ = {0}; - gchar* _tmp20_; - gchar* _tmp21_; +#line 4750 "PhotoTable.c" + sqlite3_stmt* _tmp10_; + gint _tmp11_; + GeeArrayList* _tmp14_; + sqlite3_stmt* _tmp15_; + PhotoID _tmp16_ = {0}; + gchar* _tmp17_; + gchar* _tmp18_; #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp10_) { -#line 5099 "PhotoTable.c" + if (!_tmp9_) { +#line 4760 "PhotoTable.c" } #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = FALSE; -#line 687 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = stmt; + _tmp9_ = FALSE; #line 687 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = sqlite3_step (_tmp11_); + _tmp10_ = stmt; #line 687 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp12_; + res = sqlite3_step (_tmp10_); #line 688 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 688 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp13_ == SQLITE_DONE) { + if (_tmp11_ == SQLITE_DONE) { #line 689 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 5115 "PhotoTable.c" +#line 4774 "PhotoTable.c" } else { - gint _tmp14_; + gint _tmp12_; #line 690 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = res; + _tmp12_ = res; #line 690 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp14_ != SQLITE_ROW) { -#line 5122 "PhotoTable.c" - gint _tmp15_; + if (_tmp12_ != SQLITE_ROW) { +#line 4781 "PhotoTable.c" + gint _tmp13_; #line 691 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = res; + _tmp13_ = res; #line 691 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("get_event_source_ids", _tmp15_); + database_table_fatal ("get_event_source_ids", _tmp13_); #line 693 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 5130 "PhotoTable.c" +#line 4789 "PhotoTable.c" } } #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _result_; + _tmp14_ = _result_; #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = stmt; + _tmp15_ = stmt; #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = sqlite3_column_int64 (_tmp17_, 0); + photo_id_init (&_tmp16_, sqlite3_column_int64 (_tmp15_, 0)); #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp19_, _tmp18_); + _tmp17_ = photo_id_upgrade_photo_id_to_source_id (&_tmp16_); #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = photo_id_upgrade_photo_id_to_source_id (&_tmp19_); + _tmp18_ = _tmp17_; #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = _tmp20_; + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_); #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); -#line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp21_); -#line 5149 "PhotoTable.c" + _g_free0 (_tmp18_); +#line 4806 "PhotoTable.c" } } #line 699 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5175,11 +4832,14 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event _sqlite3_finalize0 (stmt); #line 699 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5158 "PhotoTable.c" +#line 4815 "PhotoTable.c" } -gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) { +gboolean +photo_table_event_has_photos (PhotoTable* self, + EventID* event_id) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -5191,10 +4851,8 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) { EventID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; - gint _tmp11_; + sqlite3_stmt* _tmp8_; + gint _tmp9_; #line 702 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 702 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5220,49 +4878,45 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) { #line 707 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = _tmp5_.id; #line 707 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 707 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 708 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 708 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 710 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 710 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 710 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_step (_tmp8_); #line 711 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 711 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp11_ == SQLITE_DONE) { + if (_tmp9_ == SQLITE_DONE) { #line 712 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 712 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 712 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5226 "PhotoTable.c" +#line 4880 "PhotoTable.c" } else { - gint _tmp12_; + gint _tmp10_; #line 713 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 713 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp12_ != SQLITE_ROW) { -#line 5233 "PhotoTable.c" - gint _tmp13_; + if (_tmp10_ != SQLITE_ROW) { +#line 4887 "PhotoTable.c" + gint _tmp11_; #line 714 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 714 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("event_has_photos", _tmp13_); + database_table_fatal ("event_has_photos", _tmp11_); #line 716 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 716 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 716 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5245 "PhotoTable.c" +#line 4899 "PhotoTable.c" } } #line 719 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5271,11 +4925,14 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 719 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5254 "PhotoTable.c" +#line 4908 "PhotoTable.c" } -gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) { +gboolean +photo_table_drop_event (PhotoTable* self, + EventID* event_id) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -5285,15 +4942,12 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; - sqlite3_stmt* _tmp7_; - EventID _tmp8_; - gint64 _tmp9_; - gint _tmp10_; + sqlite3_stmt* _tmp6_; + EventID _tmp7_; + gint64 _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; gint _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; - gint _tmp14_; #line 722 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 722 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5315,50 +4969,44 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) { #line 727 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 727 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = sqlite3_bind_int64 (_tmp4_, 1, EVENT_ID_INVALID); -#line 727 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp5_; + res = sqlite3_bind_int64 (_tmp4_, 1, EVENT_ID_INVALID); #line 728 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 728 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); -#line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = stmt; + _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); #line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = *event_id; + _tmp6_ = stmt; #line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = _tmp8_.id; + _tmp7_ = *event_id; #line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_bind_int64 (_tmp7_, 2, _tmp9_); + _tmp8_ = _tmp7_.id; #line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_bind_int64 (_tmp6_, 2, _tmp8_); #line 730 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 730 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 732 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 732 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = sqlite3_step (_tmp12_); + _tmp10_ = stmt; #line 732 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp13_; + res = sqlite3_step (_tmp10_); #line 733 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = res; + _tmp11_ = res; #line 733 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp14_ != SQLITE_DONE) { -#line 5329 "PhotoTable.c" - gint _tmp15_; + if (_tmp11_ != SQLITE_DONE) { +#line 4977 "PhotoTable.c" + gint _tmp12_; #line 734 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = res; + _tmp12_ = res; #line 734 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("drop_event", _tmp15_); + database_table_fatal ("drop_event", _tmp12_); #line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5341 "PhotoTable.c" +#line 4989 "PhotoTable.c" } #line 739 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; @@ -5366,17 +5014,20 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 739 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5349 "PhotoTable.c" +#line 4997 "PhotoTable.c" } -gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* event_id) { +gboolean +photo_table_set_event (PhotoTable* self, + PhotoID* photo_id, + EventID* event_id) +{ gboolean result = FALSE; PhotoID _tmp0_; gint64 _tmp1_; EventID _tmp2_; gint64 _tmp3_; - gboolean _tmp4_; #line 742 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 742 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5392,16 +5043,17 @@ gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* ev #line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = _tmp2_.id; #line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "event_id", _tmp3_); -#line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp4_; + result = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "event_id", _tmp3_); #line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5380 "PhotoTable.c" +#line 5029 "PhotoTable.c" } -static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* photo_id) { +static gchar* +photo_table_get_raw_transformations (PhotoTable* self, + PhotoID* photo_id) +{ gchar* result = NULL; sqlite3_stmt* stmt = NULL; PhotoID _tmp0_; @@ -5436,7 +5088,7 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph _sqlite3_finalize0 (stmt); #line 749 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5419 "PhotoTable.c" +#line 5071 "PhotoTable.c" } #line 751 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; @@ -5452,7 +5104,7 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph if (_tmp8_ == NULL) { #line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = TRUE; -#line 5435 "PhotoTable.c" +#line 5087 "PhotoTable.c" } else { const gchar* _tmp9_; gint _tmp10_; @@ -5465,7 +5117,7 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph _tmp11_ = _tmp10_; #line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = _tmp11_ == 0; -#line 5448 "PhotoTable.c" +#line 5100 "PhotoTable.c" } #line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp7_) { @@ -5477,7 +5129,7 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph _sqlite3_finalize0 (stmt); #line 753 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5460 "PhotoTable.c" +#line 5112 "PhotoTable.c" } #line 755 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = trans; @@ -5485,16 +5137,18 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph _sqlite3_finalize0 (stmt); #line 755 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5468 "PhotoTable.c" +#line 5120 "PhotoTable.c" } -static gboolean photo_table_set_raw_transformations (PhotoTable* self, PhotoID* photo_id, const gchar* trans) { +static gboolean +photo_table_set_raw_transformations (PhotoTable* self, + PhotoID* photo_id, + const gchar* trans) +{ gboolean result = FALSE; PhotoID _tmp0_; gint64 _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; #line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5506,18 +5160,19 @@ static gboolean photo_table_set_raw_transformations (PhotoTable* self, PhotoID* #line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = trans; -#line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "transformations", _tmp2_); -#line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp3_; + result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "transformations", trans); #line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5496 "PhotoTable.c" +#line 5146 "PhotoTable.c" } -gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_id, Orientation orientation, GeeHashMap* transformations) { +gboolean +photo_table_set_transformation_state (PhotoTable* self, + PhotoID* photo_id, + Orientation orientation, + GeeHashMap* transformations) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -5526,23 +5181,17 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_ gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - Orientation _tmp5_; - gint _tmp6_; - gint _tmp7_; - sqlite3_stmt* _tmp8_; - GeeHashMap* _tmp9_; - gchar* _tmp10_; - GDestroyNotify _tmp11_; - gint _tmp12_; + gint _tmp5_; + sqlite3_stmt* _tmp6_; + gchar* _tmp7_; + GDestroyNotify _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + PhotoID _tmp11_; + gint64 _tmp12_; gint _tmp13_; sqlite3_stmt* _tmp14_; - PhotoID _tmp15_; - gint64 _tmp16_; - gint _tmp17_; - gint _tmp18_; - sqlite3_stmt* _tmp19_; - gint _tmp20_; - gint _tmp21_; + gint _tmp15_; #line 762 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 762 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5567,68 +5216,56 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_ #line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = orientation; -#line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = sqlite3_bind_int (_tmp4_, 1, (gint) _tmp5_); -#line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp6_; + res = sqlite3_bind_int (_tmp4_, 1, (gint) orientation); #line 770 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; + _tmp5_ = res; #line 770 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); -#line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = stmt; -#line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = transformations; + _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); #line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = photo_table_unmarshall_all_transformations (_tmp9_); + _tmp6_ = stmt; #line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = g_free; + _tmp7_ = photo_table_unmarshall_all_transformations (transformations); #line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = sqlite3_bind_text (_tmp8_, 2, _tmp10_, -1, _tmp11_); + _tmp8_ = g_free; #line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp12_; + res = sqlite3_bind_text (_tmp6_, 2, _tmp7_, -1, _tmp8_); #line 772 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp9_ = res; #line 772 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); -#line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = stmt; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = *photo_id; + _tmp10_ = stmt; #line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_.id; + _tmp11_ = *photo_id; #line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = sqlite3_bind_int64 (_tmp14_, 3, _tmp16_); + _tmp12_ = _tmp11_.id; #line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp17_; + res = sqlite3_bind_int64 (_tmp10_, 3, _tmp12_); #line 774 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = res; + _tmp13_ = res; #line 774 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK"); -#line 776 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = stmt; + _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); #line 776 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = sqlite3_step (_tmp19_); + _tmp14_ = stmt; #line 776 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp20_; + res = sqlite3_step (_tmp14_); #line 777 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = res; + _tmp15_ = res; #line 777 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp21_ != SQLITE_DONE) { -#line 5598 "PhotoTable.c" - gint _tmp22_; + if (_tmp15_ != SQLITE_DONE) { +#line 5235 "PhotoTable.c" + gint _tmp16_; #line 778 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = res; + _tmp16_ = res; #line 778 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("set_transformation_state", _tmp22_); + database_table_fatal ("set_transformation_state", _tmp16_); #line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5610 "PhotoTable.c" +#line 5247 "PhotoTable.c" } #line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; @@ -5636,35 +5273,31 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_ _sqlite3_finalize0 (stmt); #line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5618 "PhotoTable.c" +#line 5255 "PhotoTable.c" } -GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { +GeeHashMap* +photo_table_marshall_all_transformations (const gchar* trans) +{ GeeHashMap* result = NULL; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_; GError * _inner_error_ = NULL; #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = trans; -#line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_ == NULL) { + if (trans == NULL) { #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = TRUE; -#line 5633 "PhotoTable.c" +#line 5269 "PhotoTable.c" } else { - const gchar* _tmp2_; - gint _tmp3_; - gint _tmp4_; + gint _tmp1_; + gint _tmp2_; #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = trans; + _tmp1_ = strlen (trans); #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = strlen (_tmp2_); + _tmp2_ = _tmp1_; #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_; -#line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp4_ == 0; -#line 5646 "PhotoTable.c" + _tmp0_ = _tmp2_ == 0; +#line 5279 "PhotoTable.c" } #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_) { @@ -5672,128 +5305,119 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { result = NULL; #line 788 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5654 "PhotoTable.c" +#line 5287 "PhotoTable.c" } { GKeyFile* keyfile = NULL; + GKeyFile* _tmp3_; + gboolean _tmp4_ = FALSE; GKeyFile* _tmp5_; - gboolean _tmp6_ = FALSE; - GKeyFile* _tmp7_; - const gchar* _tmp8_; - const gchar* _tmp9_; - gint _tmp10_; - gint _tmp11_; - gboolean _tmp12_; + gint _tmp6_; + gint _tmp7_; GeeHashMap* map = NULL; - GeeHashMap* _tmp13_; + GeeHashMap* _tmp8_; gchar** objects = NULL; - GKeyFile* _tmp14_; - gsize _tmp15_; - gchar** _tmp16_; + GKeyFile* _tmp9_; + gsize _tmp10_; + gchar** _tmp11_; gint objects_length1; gint _objects_size_; - gchar** _tmp17_; - gint _tmp17__length1; + gchar** _tmp12_; + gint _tmp12__length1; #line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = g_key_file_new (); + _tmp3_ = g_key_file_new (); #line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - keyfile = _tmp5_; -#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = keyfile; -#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = trans; -#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = trans; + keyfile = _tmp3_; #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = strlen (_tmp9_); + _tmp5_ = keyfile; #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = _tmp10_; + _tmp6_ = strlen (trans); #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = g_key_file_load_from_data (_tmp7_, _tmp8_, (gsize) _tmp11_, G_KEY_FILE_NONE, &_inner_error_); + _tmp7_ = _tmp6_; #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = _tmp12_; + _tmp4_ = g_key_file_load_from_data (_tmp5_, trans, (gsize) _tmp7_, G_KEY_FILE_NONE, &_inner_error_); #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 5698 "PhotoTable.c" +#line 5322 "PhotoTable.c" goto __catch17_g_error; } #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp6_) { + if (!_tmp4_) { #line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = NULL; #line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); #line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5709 "PhotoTable.c" +#line 5333 "PhotoTable.c" } #line 795 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp8_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 795 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - map = _tmp13_; + map = _tmp8_; #line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = keyfile; + _tmp9_ = keyfile; #line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = g_key_file_get_groups (_tmp14_, &_tmp15_); + _tmp11_ = g_key_file_get_groups (_tmp9_, &_tmp10_); #line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - objects = _tmp16_; + objects = _tmp11_; #line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - objects_length1 = _tmp15_; + objects_length1 = _tmp10_; #line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _objects_size_ = objects_length1; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = objects; + _tmp12_ = objects; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17__length1 = objects_length1; -#line 5729 "PhotoTable.c" + _tmp12__length1 = objects_length1; +#line 5353 "PhotoTable.c" { gchar** object_collection = NULL; gint object_collection_length1 = 0; gint _object_collection_size_ = 0; gint object_it = 0; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - object_collection = _tmp17_; + object_collection = _tmp12_; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - object_collection_length1 = _tmp17__length1; + object_collection_length1 = _tmp12__length1; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - for (object_it = 0; object_it < _tmp17__length1; object_it = object_it + 1) { -#line 5741 "PhotoTable.c" - gchar* _tmp18_; + for (object_it = 0; object_it < _tmp12__length1; object_it = object_it + 1) { +#line 5365 "PhotoTable.c" + gchar* _tmp13_; gchar* object = NULL; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = g_strdup (object_collection[object_it]); + _tmp13_ = g_strdup (object_collection[object_it]); #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - object = _tmp18_; -#line 5748 "PhotoTable.c" + object = _tmp13_; +#line 5372 "PhotoTable.c" { gchar** keys = NULL; - GKeyFile* _tmp19_; - const gchar* _tmp20_; - gsize _tmp21_; - gchar** _tmp22_; + GKeyFile* _tmp14_; + const gchar* _tmp15_; + gsize _tmp16_; + gchar** _tmp17_; gint keys_length1; gint _keys_size_; - gboolean _tmp23_ = FALSE; - gchar** _tmp24_; - gint _tmp24__length1; + gboolean _tmp18_ = FALSE; + gchar** _tmp19_; + gint _tmp19__length1; KeyValueMap* key_map = NULL; - const gchar* _tmp26_; - KeyValueMap* _tmp27_; - GeeHashMap* _tmp43_; - const gchar* _tmp44_; - KeyValueMap* _tmp45_; + const gchar* _tmp21_; + KeyValueMap* _tmp22_; + GeeHashMap* _tmp38_; + const gchar* _tmp39_; + KeyValueMap* _tmp40_; #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = keyfile; + _tmp14_ = keyfile; #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = object; + _tmp15_ = object; #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = g_key_file_get_keys (_tmp19_, _tmp20_, &_tmp21_, &_inner_error_); + _tmp17_ = g_key_file_get_keys (_tmp14_, _tmp15_, &_tmp16_, &_inner_error_); #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - keys = _tmp22_; + keys = _tmp17_; #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - keys_length1 = _tmp21_; + keys_length1 = _tmp16_; #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _keys_size_ = keys_length1; #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5806,114 +5430,114 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { _g_object_unref0 (map); #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 5788 "PhotoTable.c" +#line 5412 "PhotoTable.c" goto __catch17_g_error; } #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = keys; + _tmp19_ = keys; #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24__length1 = keys_length1; + _tmp19__length1 = keys_length1; #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp24_ == NULL) { + if (_tmp19_ == NULL) { #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = TRUE; -#line 5799 "PhotoTable.c" + _tmp18_ = TRUE; +#line 5423 "PhotoTable.c" } else { - gchar** _tmp25_; - gint _tmp25__length1; + gchar** _tmp20_; + gint _tmp20__length1; #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = keys; + _tmp20_ = keys; #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25__length1 = keys_length1; + _tmp20__length1 = keys_length1; #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = _tmp25__length1 == 0; -#line 5809 "PhotoTable.c" + _tmp18_ = _tmp20__length1 == 0; +#line 5433 "PhotoTable.c" } #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp23_) { + if (_tmp18_) { #line 801 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL); #line 801 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (object); #line 801 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" continue; -#line 5819 "PhotoTable.c" +#line 5443 "PhotoTable.c" } #line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = object; + _tmp21_ = object; #line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = key_value_map_new (_tmp26_); + _tmp22_ = key_value_map_new (_tmp21_); #line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - key_map = _tmp27_; -#line 5827 "PhotoTable.c" + key_map = _tmp22_; +#line 5451 "PhotoTable.c" { gint ctr = 0; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ctr = 0; -#line 5832 "PhotoTable.c" +#line 5456 "PhotoTable.c" { - gboolean _tmp28_ = FALSE; + gboolean _tmp23_ = FALSE; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = TRUE; + _tmp23_ = TRUE; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 5839 "PhotoTable.c" - gint _tmp30_; - gchar** _tmp31_; - gint _tmp31__length1; - gchar* _tmp32_ = NULL; - GKeyFile* _tmp33_; - const gchar* _tmp34_; +#line 5463 "PhotoTable.c" + gint _tmp25_; + gchar** _tmp26_; + gint _tmp26__length1; + gchar* _tmp27_ = NULL; + GKeyFile* _tmp28_; + const gchar* _tmp29_; + gchar** _tmp30_; + gint _tmp30__length1; + gint _tmp31_; + const gchar* _tmp32_; + gchar* _tmp33_; + KeyValueMap* _tmp34_; gchar** _tmp35_; gint _tmp35__length1; gint _tmp36_; const gchar* _tmp37_; - gchar* _tmp38_; - KeyValueMap* _tmp39_; - gchar** _tmp40_; - gint _tmp40__length1; - gint _tmp41_; - const gchar* _tmp42_; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp28_) { -#line 5858 "PhotoTable.c" - gint _tmp29_; + if (!_tmp23_) { +#line 5482 "PhotoTable.c" + gint _tmp24_; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = ctr; + _tmp24_ = ctr; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - ctr = _tmp29_ + 1; -#line 5864 "PhotoTable.c" + ctr = _tmp24_ + 1; +#line 5488 "PhotoTable.c" } #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = FALSE; + _tmp23_ = FALSE; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = ctr; + _tmp25_ = ctr; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = keys; + _tmp26_ = keys; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31__length1 = keys_length1; + _tmp26__length1 = keys_length1; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!(_tmp30_ < _tmp31__length1)) { + if (!(_tmp25_ < _tmp26__length1)) { #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 5878 "PhotoTable.c" +#line 5502 "PhotoTable.c" } #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = keyfile; + _tmp28_ = keyfile; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = object; + _tmp29_ = object; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = keys; + _tmp30_ = keys; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35__length1 = keys_length1; + _tmp30__length1 = keys_length1; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = ctr; + _tmp31_ = ctr; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = _tmp35_[_tmp36_]; + _tmp32_ = _tmp30_[_tmp31_]; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = g_key_file_get_string (_tmp33_, _tmp34_, _tmp37_, &_inner_error_); + _tmp33_ = g_key_file_get_string (_tmp28_, _tmp29_, _tmp32_, &_inner_error_); #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = _tmp38_; + _tmp27_ = _tmp33_; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5928,42 +5552,42 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { _g_object_unref0 (map); #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 5910 "PhotoTable.c" +#line 5534 "PhotoTable.c" goto __catch17_g_error; } #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = key_map; + _tmp34_ = key_map; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = keys; + _tmp35_ = keys; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40__length1 = keys_length1; + _tmp35__length1 = keys_length1; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = ctr; + _tmp36_ = ctr; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = _tmp40_[_tmp41_]; + _tmp37_ = _tmp35_[_tmp36_]; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - key_value_map_set_string (_tmp39_, _tmp42_, _tmp32_); + key_value_map_set_string (_tmp34_, _tmp37_, _tmp27_); #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp32_); -#line 5927 "PhotoTable.c" + _g_free0 (_tmp27_); +#line 5551 "PhotoTable.c" } } } #line 807 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = map; + _tmp38_ = map; #line 807 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = object; + _tmp39_ = object; #line 807 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = key_map; + _tmp40_ = key_map; #line 807 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp44_, _tmp45_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp39_, _tmp40_); #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _key_value_map_unref0 (key_map); #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL); #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (object); -#line 5945 "PhotoTable.c" +#line 5569 "PhotoTable.c" } } } @@ -5975,24 +5599,24 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { _g_key_file_unref0 (keyfile); #line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5957 "PhotoTable.c" +#line 5581 "PhotoTable.c" } goto __finally17; __catch17_g_error: { GError* err = NULL; - const gchar* _tmp46_; + const gchar* _tmp41_; #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" err = _inner_error_; #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _inner_error_ = NULL; #line 812 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = err->message; + _tmp41_ = err->message; #line 812 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_error ("PhotoTable.vala:812: %s", _tmp46_); + g_error ("PhotoTable.vala:812: %s", _tmp41_); #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_error_free0 (err); -#line 5974 "PhotoTable.c" +#line 5598 "PhotoTable.c" } __finally17: #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6001,58 +5625,54 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { g_clear_error (&_inner_error_); #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 5983 "PhotoTable.c" +#line 5607 "PhotoTable.c" } -gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) { +gchar* +photo_table_unmarshall_all_transformations (GeeHashMap* transformations) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; - GeeHashMap* _tmp1_; GKeyFile* keyfile = NULL; - GKeyFile* _tmp8_; + GKeyFile* _tmp6_; gsize length = 0UL; gchar* unmarshalled = NULL; - GKeyFile* _tmp39_; - gsize _tmp40_ = 0UL; - gchar* _tmp41_; - const gchar* _tmp42_; - const gchar* _tmp43_; - gint _tmp44_; - gint _tmp45_; + GKeyFile* _tmp33_; + gsize _tmp34_ = 0UL; + gchar* _tmp35_; + const gchar* _tmp36_; + const gchar* _tmp37_; + gint _tmp38_; + gint _tmp39_; #line 816 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail ((transformations == NULL) || GEE_IS_HASH_MAP (transformations), NULL); #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = transformations; -#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_ == NULL) { + if (transformations == NULL) { #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = TRUE; -#line 6010 "PhotoTable.c" +#line 5633 "PhotoTable.c" } else { - GeeHashMap* _tmp2_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; GeeSet* _tmp3_; - GeeSet* _tmp4_; - GeeSet* _tmp5_; - gint _tmp6_; - gint _tmp7_; -#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = transformations; + gint _tmp4_; + gint _tmp5_; #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (transformations, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp7_ == 0; + _tmp0_ = _tmp5_ == 0; #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_object_unref0 (_tmp5_); -#line 6034 "PhotoTable.c" + _g_object_unref0 (_tmp3_); +#line 5654 "PhotoTable.c" } #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_) { @@ -6060,208 +5680,199 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) result = NULL; #line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6042 "PhotoTable.c" +#line 5662 "PhotoTable.c" } #line 820 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = g_key_file_new (); + _tmp6_ = g_key_file_new (); #line 820 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - keyfile = _tmp8_; -#line 6048 "PhotoTable.c" + keyfile = _tmp6_; +#line 5668 "PhotoTable.c" { GeeIterator* _object_it = NULL; - GeeHashMap* _tmp9_; - GeeSet* _tmp10_; - GeeSet* _tmp11_; - GeeSet* _tmp12_; - GeeIterator* _tmp13_; - GeeIterator* _tmp14_; -#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = transformations; + GeeSet* _tmp7_; + GeeSet* _tmp8_; + GeeSet* _tmp9_; + GeeIterator* _tmp10_; + GeeIterator* _tmp11_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp7_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (transformations, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = _tmp11_; + _tmp9_ = _tmp8_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_; + _tmp11_ = _tmp10_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp9_); #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _object_it = _tmp14_; + _object_it = _tmp11_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 6075 "PhotoTable.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 5692 "PhotoTable.c" + GeeIterator* _tmp12_; gchar* object = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; + GeeIterator* _tmp13_; + gpointer _tmp14_; KeyValueMap* map = NULL; - GeeHashMap* _tmp19_; - const gchar* _tmp20_; - gpointer _tmp21_; -#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = _object_it; + const gchar* _tmp15_; + gpointer _tmp16_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = gee_iterator_next (_tmp15_); + _tmp12_ = _object_it; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp12_)) { #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 6093 "PhotoTable.c" +#line 5706 "PhotoTable.c" } #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = _object_it; + _tmp13_ = _object_it; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp14_ = gee_iterator_get (_tmp13_); #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - object = (gchar*) _tmp18_; -#line 823 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = transformations; + object = (gchar*) _tmp14_; #line 823 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = object; + _tmp15_ = object; #line 823 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_); + _tmp16_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (transformations, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_); #line 823 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - map = (KeyValueMap*) _tmp21_; -#line 6109 "PhotoTable.c" + map = (KeyValueMap*) _tmp16_; +#line 5720 "PhotoTable.c" { GeeIterator* _key_it = NULL; - KeyValueMap* _tmp22_; - GeeSet* _tmp23_; - GeeSet* _tmp24_; - GeeIterator* _tmp25_; - GeeIterator* _tmp26_; + KeyValueMap* _tmp17_; + GeeSet* _tmp18_; + GeeSet* _tmp19_; + GeeIterator* _tmp20_; + GeeIterator* _tmp21_; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = map; + _tmp17_ = map; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = key_value_map_get_keys (_tmp22_); + _tmp18_ = key_value_map_get_keys (_tmp17_); #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = _tmp23_; + _tmp19_ = _tmp18_; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable)); #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = _tmp25_; + _tmp21_ = _tmp20_; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp19_); #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _key_it = _tmp26_; + _key_it = _tmp21_; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 6133 "PhotoTable.c" - GeeIterator* _tmp27_; - gboolean _tmp28_; +#line 5744 "PhotoTable.c" + GeeIterator* _tmp22_; gchar* key = NULL; - GeeIterator* _tmp29_; - gpointer _tmp30_; + GeeIterator* _tmp23_; + gpointer _tmp24_; gchar* value = NULL; - KeyValueMap* _tmp31_; + KeyValueMap* _tmp25_; + const gchar* _tmp26_; + gchar* _tmp27_; + const gchar* _tmp28_; + GKeyFile* _tmp29_; + const gchar* _tmp30_; + const gchar* _tmp31_; const gchar* _tmp32_; - gchar* _tmp33_; - const gchar* _tmp34_; - GKeyFile* _tmp35_; - const gchar* _tmp36_; - const gchar* _tmp37_; - const gchar* _tmp38_; -#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = _key_it; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = gee_iterator_next (_tmp27_); + _tmp22_ = _key_it; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp28_) { + if (!gee_iterator_next (_tmp22_)) { #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 6156 "PhotoTable.c" +#line 5764 "PhotoTable.c" } #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = _key_it; + _tmp23_ = _key_it; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = gee_iterator_get (_tmp29_); + _tmp24_ = gee_iterator_get (_tmp23_); #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - key = (gchar*) _tmp30_; + key = (gchar*) _tmp24_; #line 826 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = map; + _tmp25_ = map; #line 826 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = key; + _tmp26_ = key; #line 826 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = key_value_map_get_string (_tmp31_, _tmp32_, NULL); + _tmp27_ = key_value_map_get_string (_tmp25_, _tmp26_, NULL); #line 826 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - value = _tmp33_; + value = _tmp27_; #line 827 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = value; + _tmp28_ = value; #line 827 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp34_ != NULL, "value != null"); + _vala_assert (_tmp28_ != NULL, "value != null"); #line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = keyfile; + _tmp29_ = keyfile; #line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = object; + _tmp30_ = object; #line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = key; + _tmp31_ = key; #line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = value; + _tmp32_ = value; #line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_key_file_set_string (_tmp35_, _tmp36_, _tmp37_, _tmp38_); + g_key_file_set_string (_tmp29_, _tmp30_, _tmp31_, _tmp32_); #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (value); #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (key); -#line 6190 "PhotoTable.c" +#line 5798 "PhotoTable.c" } #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_object_unref0 (_key_it); -#line 6194 "PhotoTable.c" +#line 5802 "PhotoTable.c" } #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _key_value_map_unref0 (map); #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (object); -#line 6200 "PhotoTable.c" +#line 5808 "PhotoTable.c" } #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_object_unref0 (_object_it); -#line 6204 "PhotoTable.c" +#line 5812 "PhotoTable.c" } #line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = keyfile; + _tmp33_ = keyfile; #line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = g_key_file_to_data (_tmp39_, &_tmp40_, NULL); + _tmp35_ = g_key_file_to_data (_tmp33_, &_tmp34_, NULL); #line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - length = _tmp40_; + length = _tmp34_; #line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - unmarshalled = _tmp41_; + unmarshalled = _tmp35_; #line 835 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = unmarshalled; + _tmp36_ = unmarshalled; #line 835 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp42_ != NULL, "unmarshalled != null"); + _vala_assert (_tmp36_ != NULL, "unmarshalled != null"); #line 836 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = unmarshalled; + _tmp37_ = unmarshalled; #line 836 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = strlen (_tmp43_); + _tmp38_ = strlen (_tmp37_); #line 836 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = _tmp44_; + _tmp39_ = _tmp38_; #line 836 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp45_ > 0, "unmarshalled.length > 0"); + _vala_assert (_tmp39_ > 0, "unmarshalled.length > 0"); #line 838 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = unmarshalled; #line 838 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); #line 838 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6232 "PhotoTable.c" +#line 5840 "PhotoTable.c" } -gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, KeyValueMap* map) { +gboolean +photo_table_set_transformation (PhotoTable* self, + PhotoID* photo_id, + KeyValueMap* map) +{ gboolean result = FALSE; gchar* trans = NULL; PhotoID _tmp0_; gchar* _tmp1_; - PhotoID _tmp38_; - const gchar* _tmp39_; - gboolean _tmp40_; + PhotoID _tmp33_; + const gchar* _tmp34_; GError * _inner_error_ = NULL; #line 841 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); @@ -6275,22 +5886,21 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke _tmp1_ = photo_table_get_raw_transformations (self, &_tmp0_); #line 842 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" trans = _tmp1_; -#line 6257 "PhotoTable.c" +#line 5868 "PhotoTable.c" { GKeyFile* keyfile = NULL; GKeyFile* _tmp2_; const gchar* _tmp3_; GeeSet* keys = NULL; - KeyValueMap* _tmp11_; - GeeSet* _tmp12_; + GeeSet* _tmp10_; gsize length = 0UL; - GKeyFile* _tmp29_; - gsize _tmp30_ = 0UL; - gchar* _tmp31_; - const gchar* _tmp32_; - const gchar* _tmp33_; - gint _tmp34_; - gint _tmp35_; + GKeyFile* _tmp24_; + gsize _tmp25_ = 0UL; + gchar* _tmp26_; + const gchar* _tmp27_; + const gchar* _tmp28_; + gint _tmp29_; + gint _tmp30_; #line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = g_key_file_new (); #line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6299,14 +5909,13 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke _tmp3_ = trans; #line 846 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp3_ != NULL) { -#line 6281 "PhotoTable.c" +#line 5891 "PhotoTable.c" gboolean _tmp4_ = FALSE; GKeyFile* _tmp5_; const gchar* _tmp6_; const gchar* _tmp7_; gint _tmp8_; gint _tmp9_; - gboolean _tmp10_; #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = keyfile; #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6318,14 +5927,12 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = _tmp8_; #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = g_key_file_load_from_data (_tmp5_, _tmp6_, (gsize) _tmp9_, G_KEY_FILE_NONE, &_inner_error_); -#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp10_; + _tmp4_ = g_key_file_load_from_data (_tmp5_, _tmp6_, (gsize) _tmp9_, G_KEY_FILE_NONE, &_inner_error_); #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6307 "PhotoTable.c" +#line 5914 "PhotoTable.c" goto __catch18_g_error; } #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6338,149 +5945,138 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke _g_free0 (trans); #line 848 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6320 "PhotoTable.c" +#line 5927 "PhotoTable.c" } } #line 851 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = map; -#line 851 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = key_value_map_get_keys (_tmp11_); + _tmp10_ = key_value_map_get_keys (map); #line 851 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - keys = _tmp12_; -#line 6329 "PhotoTable.c" + keys = _tmp10_; +#line 5934 "PhotoTable.c" { GeeIterator* _key_it = NULL; - GeeSet* _tmp13_; - GeeIterator* _tmp14_; + GeeSet* _tmp11_; + GeeIterator* _tmp12_; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = keys; + _tmp11_ = keys; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _key_it = _tmp14_; + _key_it = _tmp12_; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 6342 "PhotoTable.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 5947 "PhotoTable.c" + GeeIterator* _tmp13_; gchar* key = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; + GeeIterator* _tmp14_; + gpointer _tmp15_; gchar* value = NULL; - KeyValueMap* _tmp19_; - const gchar* _tmp20_; + const gchar* _tmp16_; + gchar* _tmp17_; + const gchar* _tmp18_; + GKeyFile* _tmp19_; + gchar* _tmp20_; gchar* _tmp21_; const gchar* _tmp22_; - GKeyFile* _tmp23_; - KeyValueMap* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; - const gchar* _tmp27_; - const gchar* _tmp28_; + const gchar* _tmp23_; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = _key_it; + _tmp13_ = _key_it; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = gee_iterator_next (_tmp15_); -#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp13_)) { #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 6367 "PhotoTable.c" +#line 5967 "PhotoTable.c" } #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = _key_it; + _tmp14_ = _key_it; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp15_ = gee_iterator_get (_tmp14_); #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - key = (gchar*) _tmp18_; -#line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = map; + key = (gchar*) _tmp15_; #line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = key; + _tmp16_ = key; #line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = key_value_map_get_string (_tmp19_, _tmp20_, NULL); + _tmp17_ = key_value_map_get_string (map, _tmp16_, NULL); #line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - value = _tmp21_; + value = _tmp17_; #line 854 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = value; + _tmp18_ = value; #line 854 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp22_ != NULL, "value != null"); + _vala_assert (_tmp18_ != NULL, "value != null"); #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = keyfile; + _tmp19_ = keyfile; #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = map; + _tmp20_ = key_value_map_get_group (map); #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = key_value_map_get_group (_tmp24_); + _tmp21_ = _tmp20_; #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = _tmp25_; + _tmp22_ = key; #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = key; + _tmp23_ = value; #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = value; + g_key_file_set_string (_tmp19_, _tmp21_, _tmp22_, _tmp23_); #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_key_file_set_string (_tmp23_, _tmp26_, _tmp27_, _tmp28_); -#line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp21_); #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (value); #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (key); -#line 6407 "PhotoTable.c" +#line 6003 "PhotoTable.c" } #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_object_unref0 (_key_it); -#line 6411 "PhotoTable.c" +#line 6007 "PhotoTable.c" } #line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = keyfile; + _tmp24_ = keyfile; #line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = g_key_file_to_data (_tmp29_, &_tmp30_, NULL); + _tmp26_ = g_key_file_to_data (_tmp24_, &_tmp25_, NULL); #line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - length = _tmp30_; + length = _tmp25_; #line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - trans = _tmp31_; + trans = _tmp26_; #line 861 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = trans; + _tmp27_ = trans; #line 861 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp32_ != NULL, "trans != null"); + _vala_assert (_tmp27_ != NULL, "trans != null"); #line 862 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = trans; + _tmp28_ = trans; #line 862 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = strlen (_tmp33_); + _tmp29_ = strlen (_tmp28_); #line 862 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = _tmp34_; + _tmp30_ = _tmp29_; #line 862 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp35_ > 0, "trans.length > 0"); + _vala_assert (_tmp30_ > 0, "trans.length > 0"); #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_object_unref0 (keys); #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6439 "PhotoTable.c" +#line 6035 "PhotoTable.c" } goto __finally18; __catch18_g_error: { GError* err = NULL; - const gchar* _tmp36_; + const gchar* _tmp31_; #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" err = _inner_error_; #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _inner_error_ = NULL; #line 864 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = err->message; + _tmp31_ = err->message; #line 864 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_error ("PhotoTable.vala:864: %s", _tmp36_); + g_error ("PhotoTable.vala:864: %s", _tmp31_); #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_error_free0 (err); -#line 6456 "PhotoTable.c" +#line 6052 "PhotoTable.c" } __finally18: #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6461 "PhotoTable.c" - gboolean _tmp37_ = FALSE; +#line 6057 "PhotoTable.c" + gboolean _tmp32_ = FALSE; #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6488,34 +6084,35 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - return _tmp37_; -#line 6471 "PhotoTable.c" + return _tmp32_; +#line 6067 "PhotoTable.c" } #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = *photo_id; -#line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = trans; + _tmp33_ = *photo_id; #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = photo_table_set_raw_transformations (self, &_tmp38_, _tmp39_); + _tmp34_ = trans; #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp40_; + result = photo_table_set_raw_transformations (self, &_tmp33_, _tmp34_); #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6485 "PhotoTable.c" +#line 6079 "PhotoTable.c" } -gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, const gchar* object) { +gboolean +photo_table_remove_transformation (PhotoTable* self, + PhotoID* photo_id, + const gchar* object) +{ gboolean result = FALSE; gchar* trans = NULL; PhotoID _tmp0_; gchar* _tmp1_; const gchar* _tmp2_; - PhotoID _tmp22_; - const gchar* _tmp23_; - gboolean _tmp24_; + PhotoID _tmp18_; + const gchar* _tmp19_; GError * _inner_error_ = NULL; #line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); @@ -6539,7 +6136,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, _g_free0 (trans); #line 873 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6521 "PhotoTable.c" +#line 6118 "PhotoTable.c" } { GKeyFile* keyfile = NULL; @@ -6550,17 +6147,13 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, const gchar* _tmp7_; gint _tmp8_; gint _tmp9_; - gboolean _tmp10_; + GKeyFile* _tmp10_; GKeyFile* _tmp11_; - const gchar* _tmp12_; - gboolean _tmp13_; - GKeyFile* _tmp14_; - const gchar* _tmp15_; gsize length = 0UL; - GKeyFile* _tmp16_; - gsize _tmp17_ = 0UL; - gchar* _tmp18_; - const gchar* _tmp19_; + GKeyFile* _tmp12_; + gsize _tmp13_ = 0UL; + gchar* _tmp14_; + const gchar* _tmp15_; #line 876 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = g_key_file_new (); #line 876 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6576,14 +6169,12 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = _tmp8_; #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = g_key_file_load_from_data (_tmp5_, _tmp6_, (gsize) _tmp9_, G_KEY_FILE_NONE, &_inner_error_); -#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp10_; + _tmp4_ = g_key_file_load_from_data (_tmp5_, _tmp6_, (gsize) _tmp9_, G_KEY_FILE_NONE, &_inner_error_); #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6565 "PhotoTable.c" +#line 6156 "PhotoTable.c" goto __catch19_g_error; } #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6596,16 +6187,12 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, _g_free0 (trans); #line 878 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6578 "PhotoTable.c" +#line 6169 "PhotoTable.c" } #line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = keyfile; -#line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = object; + _tmp10_ = keyfile; #line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = g_key_file_has_group (_tmp11_, _tmp12_); -#line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp13_) { + if (!g_key_file_has_group (_tmp10_, object)) { #line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; #line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6614,61 +6201,59 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, _g_free0 (trans); #line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6596 "PhotoTable.c" +#line 6183 "PhotoTable.c" } #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = keyfile; -#line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = object; + _tmp11_ = keyfile; #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_key_file_remove_group (_tmp14_, _tmp15_, &_inner_error_); + g_key_file_remove_group (_tmp11_, object, &_inner_error_); #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6608 "PhotoTable.c" +#line 6193 "PhotoTable.c" goto __catch19_g_error; } #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = keyfile; + _tmp12_ = keyfile; #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = g_key_file_to_data (_tmp16_, &_tmp17_, NULL); + _tmp14_ = g_key_file_to_data (_tmp12_, &_tmp13_, NULL); #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - length = _tmp17_; + length = _tmp13_; #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - trans = _tmp18_; + trans = _tmp14_; #line 887 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = trans; + _tmp15_ = trans; #line 887 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp19_ != NULL, "trans != null"); + _vala_assert (_tmp15_ != NULL, "trans != null"); #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6627 "PhotoTable.c" +#line 6212 "PhotoTable.c" } goto __finally19; __catch19_g_error: { GError* err = NULL; - const gchar* _tmp20_; + const gchar* _tmp16_; #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" err = _inner_error_; #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _inner_error_ = NULL; #line 889 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = err->message; + _tmp16_ = err->message; #line 889 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_error ("PhotoTable.vala:889: %s", _tmp20_); + g_error ("PhotoTable.vala:889: %s", _tmp16_); #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_error_free0 (err); -#line 6644 "PhotoTable.c" +#line 6229 "PhotoTable.c" } __finally19: #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6649 "PhotoTable.c" - gboolean _tmp21_ = FALSE; +#line 6234 "PhotoTable.c" + gboolean _tmp17_ = FALSE; #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6676,26 +6261,27 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - return _tmp21_; -#line 6659 "PhotoTable.c" + return _tmp17_; +#line 6244 "PhotoTable.c" } #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = *photo_id; -#line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = trans; + _tmp18_ = *photo_id; #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = photo_table_set_raw_transformations (self, &_tmp22_, _tmp23_); + _tmp19_ = trans; #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp24_; + result = photo_table_set_raw_transformations (self, &_tmp18_, _tmp19_); #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6673 "PhotoTable.c" +#line 6256 "PhotoTable.c" } -gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* photo_id) { +gboolean +photo_table_remove_all_transformations (PhotoTable* self, + PhotoID* photo_id) +{ gboolean result = FALSE; PhotoID _tmp0_; gchar* _tmp1_; @@ -6703,7 +6289,6 @@ gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* phot gboolean _tmp3_; PhotoID _tmp4_; gint64 _tmp5_; - gboolean _tmp6_; #line 895 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 895 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6724,428 +6309,355 @@ gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* phot result = FALSE; #line 897 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6706 "PhotoTable.c" +#line 6291 "PhotoTable.c" } #line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = *photo_id; #line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = _tmp4_.id; #line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp5_, "transformations", ""); -#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp6_; + result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp5_, "transformations", ""); #line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6718 "PhotoTable.c" +#line 6301 "PhotoTable.c" } -static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format) { +static sqlite3_stmt* +photo_table_get_duplicate_stmt (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format) +{ sqlite3_stmt* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GFile* _tmp2_; gchar* sql = NULL; - gchar* _tmp5_; + gchar* _tmp2_; gboolean first = FALSE; - GFile* _tmp6_; - gboolean _tmp9_ = FALSE; - const gchar* _tmp10_; + gboolean _tmp5_ = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp33_; - const gchar* _tmp34_; - sqlite3_stmt* _tmp35_ = NULL; - gint _tmp36_; - gint _tmp37_; + sqlite3* _tmp23_; + const gchar* _tmp24_; + sqlite3_stmt* _tmp25_ = NULL; + gint _tmp26_; + gint _tmp27_; gint col = 0; - GFile* _tmp38_; - const gchar* _tmp46_; - const gchar* _tmp54_; - gboolean _tmp62_ = FALSE; - gboolean _tmp63_ = FALSE; - const gchar* _tmp64_; + gboolean _tmp43_ = FALSE; + gboolean _tmp44_ = FALSE; #line 904 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL); #line 904 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL); #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = file; -#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp2_ != NULL) { + if (file != NULL) { #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = TRUE; -#line 6757 "PhotoTable.c" +#line 6337 "PhotoTable.c" } else { - const gchar* _tmp3_; -#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = thumbnail_md5; #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = _tmp3_ != NULL; -#line 6764 "PhotoTable.c" + _tmp1_ = thumbnail_md5 != NULL; +#line 6341 "PhotoTable.c" } #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp1_) { #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = TRUE; -#line 6770 "PhotoTable.c" +#line 6347 "PhotoTable.c" } else { - const gchar* _tmp4_; #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = md5; -#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp4_ != NULL; -#line 6777 "PhotoTable.c" + _tmp0_ = md5 != NULL; +#line 6351 "PhotoTable.c" } #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp0_, "file != null || thumbnail_md5 != null || md5 != null"); #line 908 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = g_strdup ("SELECT id FROM PhotoTable WHERE"); + _tmp2_ = g_strdup ("SELECT id FROM PhotoTable WHERE"); #line 908 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp5_; + sql = _tmp2_; #line 909 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" first = TRUE; #line 911 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = file; -#line 911 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp6_ != NULL) { -#line 6791 "PhotoTable.c" - const gchar* _tmp7_; - gchar* _tmp8_; + if (file != NULL) { +#line 6363 "PhotoTable.c" + const gchar* _tmp3_; + gchar* _tmp4_; #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sql; + _tmp3_ = sql; #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = g_strconcat (_tmp7_, " filename=?", NULL); + _tmp4_ = g_strconcat (_tmp3_, " filename=?", NULL); #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp8_; + sql = _tmp4_; #line 913 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" first = FALSE; -#line 6804 "PhotoTable.c" +#line 6376 "PhotoTable.c" } #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = thumbnail_md5; + if (thumbnail_md5 != NULL) { #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp10_ != NULL) { -#line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = TRUE; -#line 6812 "PhotoTable.c" + _tmp5_ = TRUE; +#line 6382 "PhotoTable.c" } else { - const gchar* _tmp11_; -#line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = md5; #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = _tmp11_ != NULL; -#line 6819 "PhotoTable.c" + _tmp5_ = md5 != NULL; +#line 6386 "PhotoTable.c" } #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp9_) { -#line 6823 "PhotoTable.c" - gboolean _tmp12_; + if (_tmp5_) { +#line 6390 "PhotoTable.c" + gboolean _tmp6_; const gchar* _tmp17_; - const gchar* _tmp20_; - const gchar* _tmp26_; - gchar* _tmp27_; - PhotoFileFormat _tmp28_; - const gchar* _tmp31_; - gchar* _tmp32_; + gchar* _tmp18_; + const gchar* _tmp21_; + gchar* _tmp22_; #line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = first; + _tmp6_ = first; #line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp12_) { -#line 6836 "PhotoTable.c" - const gchar* _tmp13_; - gchar* _tmp14_; + if (_tmp6_) { +#line 6400 "PhotoTable.c" + const gchar* _tmp7_; + gchar* _tmp8_; #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = sql; + _tmp7_ = sql; #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = g_strconcat (_tmp13_, " ((", NULL); + _tmp8_ = g_strconcat (_tmp7_, " ((", NULL); #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp14_; -#line 6847 "PhotoTable.c" + sql = _tmp8_; +#line 6411 "PhotoTable.c" } else { - const gchar* _tmp15_; - gchar* _tmp16_; + const gchar* _tmp9_; + gchar* _tmp10_; #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = sql; + _tmp9_ = sql; #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = g_strconcat (_tmp15_, " OR ((", NULL); + _tmp10_ = g_strconcat (_tmp9_, " OR ((", NULL); #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp16_; -#line 6859 "PhotoTable.c" + sql = _tmp10_; +#line 6423 "PhotoTable.c" } #line 921 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" first = FALSE; #line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = md5; -#line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp17_ != NULL) { -#line 6867 "PhotoTable.c" - const gchar* _tmp18_; - gchar* _tmp19_; + if (md5 != NULL) { +#line 6429 "PhotoTable.c" + const gchar* _tmp11_; + gchar* _tmp12_; #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = sql; + _tmp11_ = sql; #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = g_strconcat (_tmp18_, " md5=?", NULL); + _tmp12_ = g_strconcat (_tmp11_, " md5=?", NULL); #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp19_; -#line 6878 "PhotoTable.c" + sql = _tmp12_; +#line 6440 "PhotoTable.c" } #line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = thumbnail_md5; -#line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp20_ != NULL) { -#line 6884 "PhotoTable.c" - const gchar* _tmp21_; + if (thumbnail_md5 != NULL) { #line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = md5; -#line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp21_ == NULL) { -#line 6890 "PhotoTable.c" - const gchar* _tmp22_; - gchar* _tmp23_; + if (md5 == NULL) { +#line 6446 "PhotoTable.c" + const gchar* _tmp13_; + gchar* _tmp14_; #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = sql; + _tmp13_ = sql; #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = g_strconcat (_tmp22_, " thumbnail_md5=?", NULL); + _tmp14_ = g_strconcat (_tmp13_, " thumbnail_md5=?", NULL); #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp23_; -#line 6901 "PhotoTable.c" + sql = _tmp14_; +#line 6457 "PhotoTable.c" } else { - const gchar* _tmp24_; - gchar* _tmp25_; + const gchar* _tmp15_; + gchar* _tmp16_; #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = sql; + _tmp15_ = sql; #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = g_strconcat (_tmp24_, " OR (md5 IS NULL AND thumbnail_md5=?)", NULL); + _tmp16_ = g_strconcat (_tmp15_, " OR (md5 IS NULL AND thumbnail_md5=?)", NULL); #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp25_; -#line 6913 "PhotoTable.c" + sql = _tmp16_; +#line 6469 "PhotoTable.c" } } #line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = sql; + _tmp17_ = sql; #line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = g_strconcat (_tmp26_, ")", NULL); + _tmp18_ = g_strconcat (_tmp17_, ")", NULL); #line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp27_; + sql = _tmp18_; #line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = file_format; -#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp28_ != PHOTO_FILE_FORMAT_UNKNOWN) { -#line 6928 "PhotoTable.c" - const gchar* _tmp29_; - gchar* _tmp30_; + if (file_format != PHOTO_FILE_FORMAT_UNKNOWN) { +#line 6482 "PhotoTable.c" + const gchar* _tmp19_; + gchar* _tmp20_; #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = sql; + _tmp19_ = sql; #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = g_strconcat (_tmp29_, " AND file_format=?", NULL); + _tmp20_ = g_strconcat (_tmp19_, " AND file_format=?", NULL); #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp30_; -#line 6939 "PhotoTable.c" + sql = _tmp20_; +#line 6493 "PhotoTable.c" } #line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = sql; + _tmp21_ = sql; #line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = g_strconcat (_tmp31_, ")", NULL); + _tmp22_ = g_strconcat (_tmp21_, ")", NULL); #line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp32_; -#line 6949 "PhotoTable.c" + sql = _tmp22_; +#line 6503 "PhotoTable.c" } #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = database_table_db; + _tmp23_ = database_table_db; #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = sql; + _tmp24_ = sql; #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = sqlite3_prepare_v2 (_tmp33_, _tmp34_, -1, &_tmp35_, NULL); + _tmp26_ = sqlite3_prepare_v2 (_tmp23_, _tmp24_, -1, &_tmp25_, NULL); #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp35_; + stmt = _tmp25_; #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp36_; + res = _tmp26_; #line 944 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = res; + _tmp27_ = res; #line 944 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); #line 946 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" col = 1; #line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = file; -#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp38_ != NULL) { -#line 6973 "PhotoTable.c" - sqlite3_stmt* _tmp39_; - gint _tmp40_; - GFile* _tmp41_; - gchar* _tmp42_; - GDestroyNotify _tmp43_; - gint _tmp44_; - gint _tmp45_; -#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = stmt; + if (file != NULL) { +#line 6525 "PhotoTable.c" + sqlite3_stmt* _tmp28_; + gint _tmp29_; + gchar* _tmp30_; + GDestroyNotify _tmp31_; + gint _tmp32_; #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = col; + _tmp28_ = stmt; #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp40_ + 1; + _tmp29_ = col; #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = file; + col = _tmp29_ + 1; #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = g_file_get_path (_tmp41_); + _tmp30_ = g_file_get_path (file); #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = g_free; + _tmp31_ = g_free; #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = sqlite3_bind_text (_tmp39_, _tmp40_, _tmp42_, -1, _tmp43_); -#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp44_; + res = sqlite3_bind_text (_tmp28_, _tmp29_, _tmp30_, -1, _tmp31_); #line 950 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = res; + _tmp32_ = res; #line 950 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp45_ == SQLITE_OK, "res == Sqlite.OK"); -#line 7001 "PhotoTable.c" + _vala_assert (_tmp32_ == SQLITE_OK, "res == Sqlite.OK"); +#line 6547 "PhotoTable.c" } #line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = thumbnail_md5; -#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp46_ != NULL) { -#line 7007 "PhotoTable.c" - sqlite3_stmt* _tmp47_; - gint _tmp48_; - const gchar* _tmp49_; - gchar* _tmp50_; - GDestroyNotify _tmp51_; - gint _tmp52_; - gint _tmp53_; -#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = stmt; -#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = col; + if (thumbnail_md5 != NULL) { +#line 6551 "PhotoTable.c" + sqlite3_stmt* _tmp33_; + gint _tmp34_; + gchar* _tmp35_; + GDestroyNotify _tmp36_; + gint _tmp37_; #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp48_ + 1; + _tmp33_ = stmt; #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = thumbnail_md5; + _tmp34_ = col; #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = g_strdup (_tmp49_); + col = _tmp34_ + 1; #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = g_free; + _tmp35_ = g_strdup (thumbnail_md5); #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = sqlite3_bind_text (_tmp47_, _tmp48_, _tmp50_, -1, _tmp51_); + _tmp36_ = g_free; #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp52_; + res = sqlite3_bind_text (_tmp33_, _tmp34_, _tmp35_, -1, _tmp36_); #line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = res; + _tmp37_ = res; #line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp53_ == SQLITE_OK, "res == Sqlite.OK"); -#line 7035 "PhotoTable.c" + _vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK"); +#line 6573 "PhotoTable.c" } #line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = md5; -#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp54_ != NULL) { -#line 7041 "PhotoTable.c" - sqlite3_stmt* _tmp55_; - gint _tmp56_; - const gchar* _tmp57_; - gchar* _tmp58_; - GDestroyNotify _tmp59_; - gint _tmp60_; - gint _tmp61_; -#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = stmt; -#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = col; + if (md5 != NULL) { +#line 6577 "PhotoTable.c" + sqlite3_stmt* _tmp38_; + gint _tmp39_; + gchar* _tmp40_; + GDestroyNotify _tmp41_; + gint _tmp42_; #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp56_ + 1; + _tmp38_ = stmt; #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = md5; + _tmp39_ = col; #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp58_ = g_strdup (_tmp57_); + col = _tmp39_ + 1; #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_ = g_free; + _tmp40_ = g_strdup (md5); #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp60_ = sqlite3_bind_text (_tmp55_, _tmp56_, _tmp58_, -1, _tmp59_); + _tmp41_ = g_free; #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp60_; + res = sqlite3_bind_text (_tmp38_, _tmp39_, _tmp40_, -1, _tmp41_); #line 960 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_ = res; + _tmp42_ = res; #line 960 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp61_ == SQLITE_OK, "res == Sqlite.OK"); -#line 7069 "PhotoTable.c" + _vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK"); +#line 6599 "PhotoTable.c" } #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp64_ = thumbnail_md5; + if (thumbnail_md5 != NULL) { #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp64_ != NULL) { -#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = TRUE; -#line 7077 "PhotoTable.c" + _tmp44_ = TRUE; +#line 6605 "PhotoTable.c" } else { - const gchar* _tmp65_; -#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_ = md5; #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = _tmp65_ != NULL; -#line 7084 "PhotoTable.c" + _tmp44_ = md5 != NULL; +#line 6609 "PhotoTable.c" } #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp63_) { -#line 7088 "PhotoTable.c" - PhotoFileFormat _tmp66_; + if (_tmp44_) { #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_ = file_format; -#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = _tmp66_ != PHOTO_FILE_FORMAT_UNKNOWN; -#line 7094 "PhotoTable.c" + _tmp43_ = file_format != PHOTO_FILE_FORMAT_UNKNOWN; +#line 6615 "PhotoTable.c" } else { #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = FALSE; -#line 7098 "PhotoTable.c" + _tmp43_ = FALSE; +#line 6619 "PhotoTable.c" } #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp62_) { -#line 7102 "PhotoTable.c" - sqlite3_stmt* _tmp67_; - gint _tmp68_; - PhotoFileFormat _tmp69_; - gint _tmp70_; - gint _tmp71_; - gint _tmp72_; -#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp67_ = stmt; -#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_ = col; -#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp68_ + 1; + if (_tmp43_) { +#line 6623 "PhotoTable.c" + sqlite3_stmt* _tmp45_; + gint _tmp46_; + gint _tmp47_; #line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_ = file_format; + _tmp45_ = stmt; #line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp70_ = photo_file_format_serialize (_tmp69_); + _tmp46_ = col; #line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_ = sqlite3_bind_int (_tmp67_, _tmp68_, _tmp70_); + col = _tmp46_ + 1; #line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp71_; + res = sqlite3_bind_int (_tmp45_, _tmp46_, photo_file_format_serialize (file_format)); #line 965 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp72_ = res; + _tmp47_ = res; #line 965 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK"); -#line 7127 "PhotoTable.c" + _vala_assert (_tmp47_ == SQLITE_OK, "res == Sqlite.OK"); +#line 6639 "PhotoTable.c" } #line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = stmt; @@ -7153,242 +6665,222 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _g_free0 (sql); #line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7135 "PhotoTable.c" +#line 6647 "PhotoTable.c" } -gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format) { +gboolean +photo_table_has_duplicate (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; - GFile* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - PhotoFileFormat _tmp3_; - sqlite3_stmt* _tmp4_; + sqlite3_stmt* _tmp0_; gint res = 0; - sqlite3_stmt* _tmp5_; - gint _tmp6_; - gint _tmp7_; + sqlite3_stmt* _tmp1_; + gint _tmp2_; #line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE); #line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = file; -#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = thumbnail_md5; -#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = md5; + _tmp0_ = photo_table_get_duplicate_stmt (self, file, thumbnail_md5, md5, file_format); #line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = file_format; -#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = photo_table_get_duplicate_stmt (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp4_; + stmt = _tmp0_; #line 973 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = stmt; + _tmp1_ = stmt; #line 973 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = sqlite3_step (_tmp5_); -#line 973 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp6_; + res = sqlite3_step (_tmp1_); #line 975 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; + _tmp2_ = res; #line 975 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp7_ == SQLITE_DONE) { + if (_tmp2_ == SQLITE_DONE) { #line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7183 "PhotoTable.c" +#line 6686 "PhotoTable.c" } else { - gint _tmp8_; + gint _tmp3_; #line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp3_ = res; #line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp8_ == SQLITE_ROW) { + if (_tmp3_ == SQLITE_ROW) { #line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; #line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7196 "PhotoTable.c" +#line 6699 "PhotoTable.c" } else { - gint _tmp9_; + gint _tmp4_; #line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = res; + _tmp4_ = res; #line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("has_duplicate", _tmp9_); + database_table_fatal ("has_duplicate", _tmp4_); #line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7209 "PhotoTable.c" +#line 6712 "PhotoTable.c" } } #line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 7214 "PhotoTable.c" +#line 6717 "PhotoTable.c" } -static void _vala_array_add2 (PhotoID* * array, int* length, int* size, const PhotoID* value) { +static void +_vala_array_add2 (PhotoID* * array, + int* length, + int* size, + const PhotoID* value) +{ #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if ((*length) == (*size)) { #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *size = (*size) ? (2 * (*size)) : 4; #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *array = g_renew (PhotoID, *array, *size); -#line 7225 "PhotoTable.c" +#line 6733 "PhotoTable.c" } #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" (*array)[(*length)++] = *value; -#line 7229 "PhotoTable.c" +#line 6737 "PhotoTable.c" } -PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format, int* result_length1) { +PhotoID* +photo_table_get_duplicate_ids (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format, + int* result_length1) +{ PhotoID* result = NULL; sqlite3_stmt* stmt = NULL; - GFile* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - PhotoFileFormat _tmp3_; - sqlite3_stmt* _tmp4_; + sqlite3_stmt* _tmp0_; PhotoID* ids = NULL; - PhotoID* _tmp5_; + PhotoID* _tmp1_; gint ids_length1; gint _ids_size_; gint res = 0; - sqlite3_stmt* _tmp6_; - gint _tmp7_; - PhotoID* _tmp15_; - gint _tmp15__length1; + sqlite3_stmt* _tmp2_; + PhotoID* _tmp8_; + gint _tmp8__length1; #line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL); #line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL); #line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = file; -#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = thumbnail_md5; -#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = md5; -#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = file_format; -#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = photo_table_get_duplicate_stmt (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_); + _tmp0_ = photo_table_get_duplicate_stmt (self, file, thumbnail_md5, md5, file_format); #line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp4_; + stmt = _tmp0_; #line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = g_new0 (PhotoID, 0); + _tmp1_ = g_new0 (PhotoID, 0); #line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - ids = _tmp5_; + ids = _tmp1_; #line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ids_length1 = 0; #line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _ids_size_ = ids_length1; #line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = stmt; -#line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_step (_tmp6_); + _tmp2_ = stmt; #line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_step (_tmp2_); #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 7282 "PhotoTable.c" - gint _tmp8_; - PhotoID* _tmp9_; - gint _tmp9__length1; - sqlite3_stmt* _tmp10_; - gint64 _tmp11_; - PhotoID _tmp12_ = {0}; - sqlite3_stmt* _tmp13_; - gint _tmp14_; +#line 6782 "PhotoTable.c" + gint _tmp3_; + PhotoID* _tmp4_; + gint _tmp4__length1; + sqlite3_stmt* _tmp5_; + PhotoID _tmp6_ = {0}; + sqlite3_stmt* _tmp7_; #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp3_ = res; #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!(_tmp8_ == SQLITE_ROW)) { + if (!(_tmp3_ == SQLITE_ROW)) { #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 7297 "PhotoTable.c" +#line 6795 "PhotoTable.c" } #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = ids; + _tmp4_ = ids; #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9__length1 = ids_length1; + _tmp4__length1 = ids_length1; #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = stmt; -#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = sqlite3_column_int64 (_tmp10_, 0); + _tmp5_ = stmt; #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp12_, _tmp11_); + photo_id_init (&_tmp6_, sqlite3_column_int64 (_tmp5_, 0)); #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_array_add2 (&ids, &ids_length1, &_ids_size_, &_tmp12_); + _vala_array_add2 (&ids, &ids_length1, &_ids_size_, &_tmp6_); #line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = stmt; + _tmp7_ = stmt; #line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = sqlite3_step (_tmp13_); -#line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp14_; -#line 7317 "PhotoTable.c" + res = sqlite3_step (_tmp7_); +#line 6811 "PhotoTable.c" } #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = ids; + _tmp8_ = ids; #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15__length1 = ids_length1; + _tmp8__length1 = ids_length1; #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (result_length1) { #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - *result_length1 = _tmp15__length1; -#line 7327 "PhotoTable.c" + *result_length1 = _tmp8__length1; +#line 6821 "PhotoTable.c" } #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp15_; + result = _tmp8_; #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7335 "PhotoTable.c" +#line 6829 "PhotoTable.c" } -void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gchar* backlinks, GError** error) { +void +photo_table_update_backlinks (PhotoTable* self, + PhotoID* photo_id, + const gchar* backlinks, + GError** error) +{ const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - PhotoID _tmp3_; - gint64 _tmp4_; + PhotoID _tmp1_; + gint64 _tmp2_; GError * _inner_error_ = NULL; #line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (photo_id != NULL); #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = backlinks; -#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_ != NULL) { -#line 7353 "PhotoTable.c" - const gchar* _tmp2_; + if (backlinks != NULL) { #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = backlinks; -#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp2_; -#line 7359 "PhotoTable.c" + _tmp0_ = backlinks; +#line 6851 "PhotoTable.c" } else { #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = ""; -#line 7363 "PhotoTable.c" +#line 6855 "PhotoTable.c" } #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = *photo_id; + _tmp1_ = *photo_id; #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_.id; + _tmp2_ = _tmp1_.id; #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "backlinks", _tmp0_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "backlinks", _tmp0_, &_inner_error_); #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7397,7 +6889,7 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc g_propagate_error (error, _inner_error_); #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7379 "PhotoTable.c" +#line 6871 "PhotoTable.c" } else { #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7405,20 +6897,23 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc g_clear_error (&_inner_error_); #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7387 "PhotoTable.c" +#line 6879 "PhotoTable.c" } } } -void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoID* editable_id, GError** error) { - PhotoRow* _tmp0_; - PhotoID _tmp1_; - gint64 _tmp2_; - BackingPhotoID _tmp3_; - gint64 _tmp4_; - PhotoRow* _tmp5_; - BackingPhotoID _tmp6_; +void +photo_table_attach_editable (PhotoTable* self, + PhotoRow* row, + BackingPhotoID* editable_id, + GError** error) +{ + PhotoID _tmp0_; + gint64 _tmp1_; + BackingPhotoID _tmp2_; + gint64 _tmp3_; + BackingPhotoID _tmp4_; GError * _inner_error_ = NULL; #line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -7427,17 +6922,15 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI #line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (editable_id != NULL); #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = row; + _tmp0_ = row->photo_id; #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = _tmp0_->photo_id; -#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = _tmp1_.id; + _tmp1_ = _tmp0_.id; #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = *editable_id; + _tmp2_ = *editable_id; #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_.id; + _tmp3_ = _tmp2_.id; #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "editable_id", _tmp4_, &_inner_error_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "editable_id", _tmp3_, &_inner_error_); #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7446,7 +6939,7 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI g_propagate_error (error, _inner_error_); #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7428 "PhotoTable.c" +#line 6921 "PhotoTable.c" } else { #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7454,37 +6947,35 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI g_clear_error (&_inner_error_); #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7436 "PhotoTable.c" +#line 6929 "PhotoTable.c" } } #line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = row; + _tmp4_ = *editable_id; #line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = *editable_id; -#line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_->editable_id = _tmp6_; -#line 7445 "PhotoTable.c" + row->editable_id = _tmp4_; +#line 6936 "PhotoTable.c" } -void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** error) { - PhotoRow* _tmp0_; - PhotoID _tmp1_; - gint64 _tmp2_; - PhotoRow* _tmp3_; +void +photo_table_detach_editable (PhotoTable* self, + PhotoRow* row, + GError** error) +{ + PhotoID _tmp0_; + gint64 _tmp1_; GError * _inner_error_ = NULL; #line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_ROW (row)); #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = row; -#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = _tmp0_->photo_id; + _tmp0_ = row->photo_id; #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = _tmp1_.id; + _tmp1_ = _tmp0_.id; #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "editable_id", BACKING_PHOTO_ID_INVALID, &_inner_error_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "editable_id", BACKING_PHOTO_ID_INVALID, &_inner_error_); #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7493,7 +6984,7 @@ void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** erro g_propagate_error (error, _inner_error_); #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7475 "PhotoTable.c" +#line 6966 "PhotoTable.c" } else { #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7501,45 +6992,45 @@ void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** erro g_clear_error (&_inner_error_); #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7483 "PhotoTable.c" +#line 6974 "PhotoTable.c" } } #line 1016 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = row; -#line 1016 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp3_->editable_id, BACKING_PHOTO_ID_INVALID); -#line 7490 "PhotoTable.c" + backing_photo_id_init (&row->editable_id, BACKING_PHOTO_ID_INVALID); +#line 6979 "PhotoTable.c" } -void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboolean dirty, GError** error) { +void +photo_table_set_metadata_dirty (PhotoTable* self, + PhotoID* photo_id, + gboolean dirty, + GError** error) +{ gint _tmp0_ = 0; - gboolean _tmp1_; - PhotoID _tmp2_; - gint64 _tmp3_; + PhotoID _tmp1_; + gint64 _tmp2_; GError * _inner_error_ = NULL; #line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (photo_id != NULL); #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = dirty; -#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_) { + if (dirty) { #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = 1; -#line 7510 "PhotoTable.c" +#line 7001 "PhotoTable.c" } else { #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = 0; -#line 7514 "PhotoTable.c" +#line 7005 "PhotoTable.c" } #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = *photo_id; + _tmp1_ = *photo_id; #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = _tmp2_.id; + _tmp2_ = _tmp1_.id; #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_update_int_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp3_, "metadata_dirty", _tmp0_, &_inner_error_); + database_table_update_int_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "metadata_dirty", _tmp0_, &_inner_error_); #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7548,7 +7039,7 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole g_propagate_error (error, _inner_error_); #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7530 "PhotoTable.c" +#line 7021 "PhotoTable.c" } else { #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7556,29 +7047,31 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole g_clear_error (&_inner_error_); #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7538 "PhotoTable.c" +#line 7029 "PhotoTable.c" } } } -void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, BackingPhotoID* backing_photo_id, GError** error) { +void +photo_table_update_raw_development (PhotoTable* self, + PhotoRow* row, + RawDeveloper rd, + BackingPhotoID* backing_photo_id, + GError** error) +{ gchar* col = NULL; - RawDeveloper _tmp0_; - PhotoRow* _tmp4_; - BackingPhotoID* _tmp5_; - gint _tmp5__length1; - RawDeveloper _tmp6_; - BackingPhotoID _tmp7_; - BackingPhotoID _tmp8_; - PhotoRow* _tmp9_; - PhotoID _tmp10_; - gint64 _tmp11_; - const gchar* _tmp12_; - BackingPhotoID _tmp13_; - gint64 _tmp14_; - BackingPhotoID _tmp15_; - gint64 _tmp16_; + BackingPhotoID* _tmp3_; + gint _tmp3__length1; + BackingPhotoID _tmp4_; + BackingPhotoID _tmp5_; + PhotoID _tmp6_; + gint64 _tmp7_; + const gchar* _tmp8_; + BackingPhotoID _tmp9_; + gint64 _tmp10_; + BackingPhotoID _tmp11_; + gint64 _tmp12_; GError * _inner_error_ = NULL; #line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -7587,89 +7080,81 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev #line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (backing_photo_id != NULL); #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = rd; -#line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - switch (_tmp0_) { + switch (rd) { #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" case RAW_DEVELOPER_SHOTWELL: -#line 7574 "PhotoTable.c" +#line 7065 "PhotoTable.c" { - gchar* _tmp1_; + gchar* _tmp0_; #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = g_strdup ("develop_shotwell_id"); + _tmp0_ = g_strdup ("develop_shotwell_id"); #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp1_; + col = _tmp0_; #line 1030 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 7585 "PhotoTable.c" +#line 7076 "PhotoTable.c" } #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" case RAW_DEVELOPER_CAMERA: -#line 7589 "PhotoTable.c" +#line 7080 "PhotoTable.c" { - gchar* _tmp2_; + gchar* _tmp1_; #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = g_strdup ("develop_camera_id"); + _tmp1_ = g_strdup ("develop_camera_id"); #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp2_; + col = _tmp1_; #line 1034 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 7600 "PhotoTable.c" +#line 7091 "PhotoTable.c" } #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" case RAW_DEVELOPER_EMBEDDED: -#line 7604 "PhotoTable.c" +#line 7095 "PhotoTable.c" { - gchar* _tmp3_; + gchar* _tmp2_; #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = g_strdup ("develop_embedded_id"); + _tmp2_ = g_strdup ("develop_embedded_id"); #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp3_; + col = _tmp2_; #line 1038 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 7615 "PhotoTable.c" +#line 7106 "PhotoTable.c" } default: { #line 1041 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_assert_not_reached (); -#line 7621 "PhotoTable.c" +#line 7112 "PhotoTable.c" } } #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = row; -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = _tmp4_->development_ids; + _tmp3_ = row->development_ids; #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5__length1 = _tmp4_->development_ids_length1; + _tmp3__length1 = row->development_ids_length1; #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = rd; + _tmp4_ = *backing_photo_id; #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = *backing_photo_id; + _tmp3_[rd] = _tmp4_; #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_[_tmp6_] = _tmp7_; -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = _tmp5_[_tmp6_]; -#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = row; + _tmp5_ = _tmp3_[rd]; #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = _tmp9_->photo_id; + _tmp6_ = row->photo_id; #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = _tmp10_.id; + _tmp7_ = _tmp6_.id; #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = col; + _tmp8_ = col; #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = *backing_photo_id; + _tmp9_ = *backing_photo_id; #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_.id; + _tmp10_ = _tmp9_.id; #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp11_, _tmp12_, _tmp14_, &_inner_error_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp7_, _tmp8_, _tmp10_, &_inner_error_); #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7680,7 +7165,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev _g_free0 (col); #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7662 "PhotoTable.c" +#line 7147 "PhotoTable.c" } else { #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); @@ -7690,38 +7175,32 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev g_clear_error (&_inner_error_); #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7672 "PhotoTable.c" +#line 7157 "PhotoTable.c" } } #line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = *backing_photo_id; + _tmp11_ = *backing_photo_id; #line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_.id; + _tmp12_ = _tmp11_.id; #line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp16_ != BACKING_PHOTO_ID_INVALID) { -#line 7681 "PhotoTable.c" - PhotoRow* _tmp17_; - PhotoID _tmp18_; - gint64 _tmp19_; - RawDeveloper _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; -#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = row; -#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = _tmp17_->photo_id; + if (_tmp12_ != BACKING_PHOTO_ID_INVALID) { +#line 7166 "PhotoTable.c" + PhotoID _tmp13_; + gint64 _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = _tmp18_.id; + _tmp13_ = row->photo_id; #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = rd; + _tmp14_ = _tmp13_.id; #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = raw_developer_to_string (_tmp20_); + _tmp15_ = raw_developer_to_string (rd); #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = _tmp21_; + _tmp16_ = _tmp15_; #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp19_, "developer", _tmp22_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp14_, "developer", _tmp16_, &_inner_error_); #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp16_); #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7732,7 +7211,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev _g_free0 (col); #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7714 "PhotoTable.c" +#line 7193 "PhotoTable.c" } else { #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); @@ -7742,33 +7221,32 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev g_clear_error (&_inner_error_); #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7724 "PhotoTable.c" +#line 7203 "PhotoTable.c" } } } #line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); -#line 7730 "PhotoTable.c" +#line 7209 "PhotoTable.c" } -void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, GError** error) { - PhotoRow* _tmp0_; - RawDeveloper _tmp1_; - BackingPhotoID _tmp2_ = {0}; +void +photo_table_remove_development (PhotoTable* self, + PhotoRow* row, + RawDeveloper rd, + GError** error) +{ + BackingPhotoID _tmp0_ = {0}; GError * _inner_error_ = NULL; #line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_ROW (row)); #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = row; -#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = rd; + backing_photo_id_init (&_tmp0_, BACKING_PHOTO_ID_INVALID); #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp2_, BACKING_PHOTO_ID_INVALID); -#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_table_update_raw_development (self, _tmp0_, _tmp1_, &_tmp2_, &_inner_error_); + photo_table_update_raw_development (self, row, rd, &_tmp0_, &_inner_error_); #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7777,7 +7255,7 @@ void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDevelop g_propagate_error (error, _inner_error_); #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7759 "PhotoTable.c" +#line 7237 "PhotoTable.c" } else { #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7785,36 +7263,44 @@ void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDevelop g_clear_error (&_inner_error_); #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7767 "PhotoTable.c" +#line 7245 "PhotoTable.c" } } } -static void photo_table_class_init (PhotoTableClass * klass) { +static void +photo_table_class_init (PhotoTableClass * klass) +{ #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_table_parent_class = g_type_class_peek_parent (klass); #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ((DatabaseTableClass *) klass)->finalize = photo_table_finalize; -#line 7778 "PhotoTable.c" +#line 7258 "PhotoTable.c" } -static void photo_table_instance_init (PhotoTable * self) { +static void +photo_table_instance_init (PhotoTable * self) +{ } -static void photo_table_finalize (DatabaseTable * obj) { +static void +photo_table_finalize (DatabaseTable * obj) +{ PhotoTable * self; #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_TABLE, PhotoTable); #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" DATABASE_TABLE_CLASS (photo_table_parent_class)->finalize (obj); -#line 7792 "PhotoTable.c" +#line 7276 "PhotoTable.c" } -GType photo_table_get_type (void) { +GType +photo_table_get_type (void) +{ static volatile gsize photo_table_type_id__volatile = 0; if (g_once_init_enter (&photo_table_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoTable), 0, (GInstanceInitFunc) photo_table_instance_init, NULL }; @@ -7826,19 +7312,21 @@ GType photo_table_get_type (void) { } -void backing_photo_id_init (BackingPhotoID *self, gint64 id) { - gint64 _tmp0_; +void +backing_photo_id_init (BackingPhotoID *self, + gint64 id) +{ #line 1072 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" memset (self, 0, sizeof (BackingPhotoID)); #line 1073 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = id; -#line 1073 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - (*self).id = _tmp0_; -#line 7816 "PhotoTable.c" + (*self).id = id; +#line 7302 "PhotoTable.c" } -gboolean backing_photo_id_is_invalid (BackingPhotoID *self) { +gboolean +backing_photo_id_is_invalid (BackingPhotoID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7847,11 +7335,13 @@ gboolean backing_photo_id_is_invalid (BackingPhotoID *self) { result = _tmp0_ == BACKING_PHOTO_ID_INVALID; #line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7829 "PhotoTable.c" +#line 7317 "PhotoTable.c" } -gboolean backing_photo_id_is_valid (BackingPhotoID *self) { +gboolean +backing_photo_id_is_valid (BackingPhotoID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7860,11 +7350,13 @@ gboolean backing_photo_id_is_valid (BackingPhotoID *self) { result = _tmp0_ != BACKING_PHOTO_ID_INVALID; #line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7842 "PhotoTable.c" +#line 7332 "PhotoTable.c" } -BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self) { +BackingPhotoID* +backing_photo_id_dup (const BackingPhotoID* self) +{ BackingPhotoID* dup; #line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dup = g_new0 (BackingPhotoID, 1); @@ -7872,18 +7364,22 @@ BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self) { memcpy (dup, self, sizeof (BackingPhotoID)); #line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return dup; -#line 7854 "PhotoTable.c" +#line 7346 "PhotoTable.c" } -void backing_photo_id_free (BackingPhotoID* self) { +void +backing_photo_id_free (BackingPhotoID* self) +{ #line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_free (self); -#line 7861 "PhotoTable.c" +#line 7355 "PhotoTable.c" } -GType backing_photo_id_get_type (void) { +GType +backing_photo_id_get_type (void) +{ static volatile gsize backing_photo_id_type_id__volatile = 0; if (g_once_init_enter (&backing_photo_id_type_id__volatile)) { GType backing_photo_id_type_id; @@ -7894,15 +7390,15 @@ GType backing_photo_id_get_type (void) { } -gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* info) { +gboolean +backing_photo_row_matches_file_info (BackingPhotoRow* self, + GFileInfo* info) +{ gboolean result = FALSE; gint64 _tmp0_; - GFileInfo* _tmp1_; - gint64 _tmp2_; - time_t _tmp3_; - GFileInfo* _tmp4_; - GTimeVal _tmp5_ = {0}; - glong _tmp6_; + time_t _tmp1_; + GTimeVal _tmp2_ = {0}; + glong _tmp3_; #line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_BACKING_PHOTO_ROW (self), FALSE); #line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7910,42 +7406,36 @@ gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* #line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = self->filesize; #line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = info; -#line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = g_file_info_get_size (_tmp1_); -#line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp0_ != _tmp2_) { + if (_tmp0_ != g_file_info_get_size (info)) { #line 1097 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 1097 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7901 "PhotoTable.c" +#line 7393 "PhotoTable.c" } #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = self->timestamp; -#line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = info; + _tmp1_ = self->timestamp; #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_file_info_get_modification_time (_tmp4_, &_tmp5_); + g_file_info_get_modification_time (info, &_tmp2_); #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = _tmp5_.tv_sec; + _tmp3_ = _tmp2_.tv_sec; #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp3_ == ((time_t) _tmp6_); + result = _tmp1_ == ((time_t) _tmp3_); #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7915 "PhotoTable.c" +#line 7405 "PhotoTable.c" } -gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) { +gboolean +backing_photo_row_is_touched (BackingPhotoRow* self, + GFileInfo* info) +{ gboolean result = FALSE; gint64 _tmp0_; - GFileInfo* _tmp1_; - gint64 _tmp2_; - time_t _tmp3_; - GFileInfo* _tmp4_; - GTimeVal _tmp5_ = {0}; - glong _tmp6_; + time_t _tmp1_; + GTimeVal _tmp2_ = {0}; + glong _tmp3_; #line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_BACKING_PHOTO_ROW (self), FALSE); #line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7953,226 +7443,228 @@ gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) { #line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = self->filesize; #line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = info; -#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = g_file_info_get_size (_tmp1_); -#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp0_ != _tmp2_) { + if (_tmp0_ != g_file_info_get_size (info)) { #line 1104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 1104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7944 "PhotoTable.c" +#line 7430 "PhotoTable.c" } #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = self->timestamp; -#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = info; + _tmp1_ = self->timestamp; #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_file_info_get_modification_time (_tmp4_, &_tmp5_); + g_file_info_get_modification_time (info, &_tmp2_); #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = _tmp5_.tv_sec; + _tmp3_ = _tmp2_.tv_sec; #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp3_ != ((time_t) _tmp6_); + result = _tmp1_ != ((time_t) _tmp3_); #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7958 "PhotoTable.c" +#line 7442 "PhotoTable.c" } -void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from) { - BackingPhotoRow* _tmp0_; - BackingPhotoID _tmp1_; - BackingPhotoRow* _tmp2_; - time_t _tmp3_; - BackingPhotoRow* _tmp4_; - const gchar* _tmp5_; - gchar* _tmp6_; - BackingPhotoRow* _tmp7_; - gint64 _tmp8_; - BackingPhotoRow* _tmp9_; - time_t _tmp10_; - BackingPhotoRow* _tmp11_; - PhotoFileFormat _tmp12_; - BackingPhotoRow* _tmp13_; - Dimensions _tmp14_; - BackingPhotoRow* _tmp15_; - Orientation _tmp16_; +void +backing_photo_row_copy_from (BackingPhotoRow* self, + BackingPhotoRow* from) +{ + BackingPhotoID _tmp0_; + time_t _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; + gint64 _tmp4_; + time_t _tmp5_; + PhotoFileFormat _tmp6_; + Dimensions _tmp7_; + Orientation _tmp8_; #line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_ROW (self)); #line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_ROW (from)); #line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = from; + _tmp0_ = from->id; #line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = _tmp0_->id; -#line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->id = _tmp1_; -#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = from; + self->id = _tmp0_; #line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = _tmp2_->time_created; + _tmp1_ = from->time_created; #line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->time_created = _tmp3_; + self->time_created = _tmp1_; #line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = from; + _tmp2_ = from->filepath; #line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = _tmp4_->filepath; -#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = g_strdup (_tmp5_); + _tmp3_ = g_strdup (_tmp2_); #line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (self->filepath); #line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->filepath = _tmp6_; + self->filepath = _tmp3_; #line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = from; + _tmp4_ = from->filesize; #line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = _tmp7_->filesize; -#line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->filesize = _tmp8_; -#line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = from; + self->filesize = _tmp4_; #line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = _tmp9_->timestamp; + _tmp5_ = from->timestamp; #line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->timestamp = _tmp10_; + self->timestamp = _tmp5_; #line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = from; + _tmp6_ = from->file_format; #line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = _tmp11_->file_format; -#line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->file_format = _tmp12_; -#line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = from; + self->file_format = _tmp6_; #line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_->dim; + _tmp7_ = from->dim; #line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->dim = _tmp14_; + self->dim = _tmp7_; #line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = from; + _tmp8_ = from->original_orientation; #line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_->original_orientation; -#line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->original_orientation = _tmp16_; -#line 8036 "PhotoTable.c" + self->original_orientation = _tmp8_; +#line 7499 "PhotoTable.c" } -BackingPhotoRow* backing_photo_row_construct (GType object_type) { +BackingPhotoRow* +backing_photo_row_construct (GType object_type) +{ BackingPhotoRow* self = NULL; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = (BackingPhotoRow*) g_type_create_instance (object_type); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self; -#line 8046 "PhotoTable.c" +#line 7511 "PhotoTable.c" } -BackingPhotoRow* backing_photo_row_new (void) { +BackingPhotoRow* +backing_photo_row_new (void) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return backing_photo_row_construct (TYPE_BACKING_PHOTO_ROW); -#line 8053 "PhotoTable.c" +#line 7520 "PhotoTable.c" } -static void value_backing_photo_row_init (GValue* value) { +static void +value_backing_photo_row_init (GValue* value) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 8060 "PhotoTable.c" +#line 7529 "PhotoTable.c" } -static void value_backing_photo_row_free_value (GValue* value) { +static void +value_backing_photo_row_free_value (GValue* value) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (value->data[0].v_pointer) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_unref (value->data[0].v_pointer); -#line 8069 "PhotoTable.c" +#line 7540 "PhotoTable.c" } } -static void value_backing_photo_row_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_backing_photo_row_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (src_value->data[0].v_pointer) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dest_value->data[0].v_pointer = backing_photo_row_ref (src_value->data[0].v_pointer); -#line 8079 "PhotoTable.c" +#line 7553 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dest_value->data[0].v_pointer = NULL; -#line 8083 "PhotoTable.c" +#line 7557 "PhotoTable.c" } } -static gpointer value_backing_photo_row_peek_pointer (const GValue* value) { +static gpointer +value_backing_photo_row_peek_pointer (const GValue* value) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return value->data[0].v_pointer; -#line 8091 "PhotoTable.c" +#line 7567 "PhotoTable.c" } -static gchar* value_backing_photo_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_backing_photo_row_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (collect_values[0].v_pointer) { -#line 8098 "PhotoTable.c" +#line 7579 "PhotoTable.c" BackingPhotoRow * object; object = collect_values[0].v_pointer; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (object->parent_instance.g_class == NULL) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8105 "PhotoTable.c" +#line 7586 "PhotoTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8109 "PhotoTable.c" +#line 7590 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = backing_photo_row_ref (object); -#line 8113 "PhotoTable.c" +#line 7594 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 8117 "PhotoTable.c" +#line 7598 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 8121 "PhotoTable.c" +#line 7602 "PhotoTable.c" } -static gchar* value_backing_photo_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_backing_photo_row_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ BackingPhotoRow ** object_p; object_p = collect_values[0].v_pointer; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!object_p) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8132 "PhotoTable.c" +#line 7618 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!value->data[0].v_pointer) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = NULL; -#line 8138 "PhotoTable.c" +#line 7624 "PhotoTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = value->data[0].v_pointer; -#line 8142 "PhotoTable.c" +#line 7628 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = backing_photo_row_ref (value->data[0].v_pointer); -#line 8146 "PhotoTable.c" +#line 7632 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 8150 "PhotoTable.c" +#line 7636 "PhotoTable.c" } -GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_backing_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecBackingPhotoRow* spec; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_BACKING_PHOTO_ROW), NULL); @@ -8182,20 +7674,25 @@ GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return G_PARAM_SPEC (spec); -#line 8164 "PhotoTable.c" +#line 7656 "PhotoTable.c" } -gpointer value_get_backing_photo_row (const GValue* value) { +gpointer +value_get_backing_photo_row (const GValue* value) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW), NULL); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return value->data[0].v_pointer; -#line 8173 "PhotoTable.c" +#line 7667 "PhotoTable.c" } -void value_set_backing_photo_row (GValue* value, gpointer v_object) { +void +value_set_backing_photo_row (GValue* value, + gpointer v_object) +{ BackingPhotoRow * old; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW)); @@ -8211,22 +7708,25 @@ void value_set_backing_photo_row (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_ref (value->data[0].v_pointer); -#line 8193 "PhotoTable.c" +#line 7690 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 8197 "PhotoTable.c" +#line 7694 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (old) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_unref (old); -#line 8203 "PhotoTable.c" +#line 7700 "PhotoTable.c" } } -void value_take_backing_photo_row (GValue* value, gpointer v_object) { +void +value_take_backing_photo_row (GValue* value, + gpointer v_object) +{ BackingPhotoRow * old; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW)); @@ -8240,40 +7740,46 @@ void value_take_backing_photo_row (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = v_object; -#line 8222 "PhotoTable.c" +#line 7722 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 8226 "PhotoTable.c" +#line 7726 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (old) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_unref (old); -#line 8232 "PhotoTable.c" +#line 7732 "PhotoTable.c" } } -static void backing_photo_row_class_init (BackingPhotoRowClass * klass) { +static void +backing_photo_row_class_init (BackingPhotoRowClass * klass) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_parent_class = g_type_class_peek_parent (klass); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ((BackingPhotoRowClass *) klass)->finalize = backing_photo_row_finalize; -#line 8242 "PhotoTable.c" +#line 7744 "PhotoTable.c" } -static void backing_photo_row_instance_init (BackingPhotoRow * self) { +static void +backing_photo_row_instance_init (BackingPhotoRow * self) +{ #line 1088 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self->filepath = NULL; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self->ref_count = 1; -#line 8251 "PhotoTable.c" +#line 7755 "PhotoTable.c" } -static void backing_photo_row_finalize (BackingPhotoRow * obj) { +static void +backing_photo_row_finalize (BackingPhotoRow * obj) +{ BackingPhotoRow * self; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_ROW, BackingPhotoRow); @@ -8281,11 +7787,13 @@ static void backing_photo_row_finalize (BackingPhotoRow * obj) { g_signal_handlers_destroy (self); #line 1088 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (self->filepath); -#line 8263 "PhotoTable.c" +#line 7769 "PhotoTable.c" } -GType backing_photo_row_get_type (void) { +GType +backing_photo_row_get_type (void) +{ static volatile gsize backing_photo_row_type_id__volatile = 0; if (g_once_init_enter (&backing_photo_row_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_backing_photo_row_init, value_backing_photo_row_free_value, value_backing_photo_row_copy_value, value_backing_photo_row_peek_pointer, "p", value_backing_photo_row_collect_value, "p", value_backing_photo_row_lcopy_value }; @@ -8299,18 +7807,22 @@ GType backing_photo_row_get_type (void) { } -gpointer backing_photo_row_ref (gpointer instance) { +gpointer +backing_photo_row_ref (gpointer instance) +{ BackingPhotoRow * self; self = instance; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_atomic_int_inc (&self->ref_count); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return instance; -#line 8288 "PhotoTable.c" +#line 7798 "PhotoTable.c" } -void backing_photo_row_unref (gpointer instance) { +void +backing_photo_row_unref (gpointer instance) +{ BackingPhotoRow * self; self = instance; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -8319,12 +7831,14 @@ void backing_photo_row_unref (gpointer instance) { BACKING_PHOTO_ROW_GET_CLASS (self)->finalize (self); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8301 "PhotoTable.c" +#line 7813 "PhotoTable.c" } } -static BackingPhotoTable* backing_photo_table_construct (GType object_type) { +static BackingPhotoTable* +backing_photo_table_construct (GType object_type) +{ BackingPhotoTable* self = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -8334,7 +7848,6 @@ static BackingPhotoTable* backing_photo_table_construct (GType object_type) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = (BackingPhotoTable*) database_table_construct (object_type); #line 1126 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -8356,37 +7869,39 @@ static BackingPhotoTable* backing_photo_table_construct (GType object_type) { #line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp6_ != SQLITE_DONE) { -#line 8345 "PhotoTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_DONE) { +#line 7856 "PhotoTable.c" + gint _tmp6_; #line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("create PhotoBackingTable", _tmp7_); -#line 8351 "PhotoTable.c" + database_table_fatal ("create PhotoBackingTable", _tmp6_); +#line 7862 "PhotoTable.c" } #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self; -#line 8357 "PhotoTable.c" +#line 7868 "PhotoTable.c" } -static BackingPhotoTable* backing_photo_table_new (void) { +static BackingPhotoTable* +backing_photo_table_new (void) +{ #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return backing_photo_table_construct (TYPE_BACKING_PHOTO_TABLE); -#line 8364 "PhotoTable.c" +#line 7877 "PhotoTable.c" } -BackingPhotoTable* backing_photo_table_get_instance (void) { +BackingPhotoTable* +backing_photo_table_get_instance (void) +{ BackingPhotoTable* result = NULL; BackingPhotoTable* _tmp0_; BackingPhotoTable* _tmp2_; @@ -8395,7 +7910,7 @@ BackingPhotoTable* backing_photo_table_get_instance (void) { _tmp0_ = backing_photo_table_instance; #line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_ == NULL) { -#line 8377 "PhotoTable.c" +#line 7892 "PhotoTable.c" BackingPhotoTable* _tmp1_; #line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = backing_photo_table_new (); @@ -8403,7 +7918,7 @@ BackingPhotoTable* backing_photo_table_get_instance (void) { _database_table_unref0 (backing_photo_table_instance); #line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_table_instance = _tmp1_; -#line 8385 "PhotoTable.c" +#line 7900 "PhotoTable.c" } #line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = backing_photo_table_instance; @@ -8413,11 +7928,15 @@ BackingPhotoTable* backing_photo_table_get_instance (void) { result = _tmp3_; #line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 8395 "PhotoTable.c" +#line 7910 "PhotoTable.c" } -void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, GError** error) { +void +backing_photo_table_add (BackingPhotoTable* self, + BackingPhotoRow* state, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -8425,59 +7944,38 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G gint _tmp2_; gint _tmp3_; time_t time_created = 0; - gulong _tmp4_; - sqlite3_stmt* _tmp5_; - BackingPhotoRow* _tmp6_; - const gchar* _tmp7_; - gchar* _tmp8_; - GDestroyNotify _tmp9_; - gint _tmp10_; + sqlite3_stmt* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; + GDestroyNotify _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + time_t _tmp10_; gint _tmp11_; sqlite3_stmt* _tmp12_; - BackingPhotoRow* _tmp13_; - time_t _tmp14_; - gint _tmp15_; - gint _tmp16_; - sqlite3_stmt* _tmp17_; - BackingPhotoRow* _tmp18_; - gint64 _tmp19_; - gint _tmp20_; + gint64 _tmp13_; + gint _tmp14_; + sqlite3_stmt* _tmp15_; + Dimensions _tmp16_; + gint _tmp17_; + gint _tmp18_; + sqlite3_stmt* _tmp19_; + Dimensions _tmp20_; gint _tmp21_; - sqlite3_stmt* _tmp22_; - BackingPhotoRow* _tmp23_; - Dimensions _tmp24_; + gint _tmp22_; + sqlite3_stmt* _tmp23_; + Orientation _tmp24_; gint _tmp25_; - gint _tmp26_; - gint _tmp27_; - sqlite3_stmt* _tmp28_; - BackingPhotoRow* _tmp29_; - Dimensions _tmp30_; + sqlite3_stmt* _tmp26_; + PhotoFileFormat _tmp27_; + gint _tmp28_; + sqlite3_stmt* _tmp29_; + time_t _tmp30_; gint _tmp31_; - gint _tmp32_; + sqlite3_stmt* _tmp32_; gint _tmp33_; - sqlite3_stmt* _tmp34_; - BackingPhotoRow* _tmp35_; - Orientation _tmp36_; - gint _tmp37_; - gint _tmp38_; - sqlite3_stmt* _tmp39_; - BackingPhotoRow* _tmp40_; - PhotoFileFormat _tmp41_; - gint _tmp42_; - gint _tmp43_; - gint _tmp44_; - sqlite3_stmt* _tmp45_; - time_t _tmp46_; - gint _tmp47_; - gint _tmp48_; - sqlite3_stmt* _tmp49_; - gint _tmp50_; - gint _tmp51_; - BackingPhotoRow* _tmp53_; - sqlite3* _tmp54_; - gint64 _tmp55_; - BackingPhotoRow* _tmp56_; - time_t _tmp57_; + sqlite3* _tmp35_; + time_t _tmp36_; GError * _inner_error_ = NULL; #line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -8498,145 +7996,109 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G #line 1163 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 1165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = now_sec (); -#line 1165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - time_created = (time_t) _tmp4_; + time_created = (time_t) now_sec (); #line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = stmt; -#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = state; -#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = _tmp6_->filepath; + _tmp4_ = stmt; #line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = g_strdup (_tmp7_); + _tmp5_ = state->filepath; #line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = g_free; + _tmp6_ = g_strdup (_tmp5_); #line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_bind_text (_tmp5_, 1, _tmp8_, -1, _tmp9_); + _tmp7_ = g_free; #line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); #line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp8_ = res; #line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt; -#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = state; + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_->timestamp; + _tmp9_ = stmt; #line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = sqlite3_bind_int64 (_tmp12_, 2, (gint64) _tmp14_); + _tmp10_ = state->timestamp; #line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp15_; + res = sqlite3_bind_int64 (_tmp9_, 2, (gint64) _tmp10_); #line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = res; + _tmp11_ = res; #line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = stmt; -#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = state; + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = _tmp18_->filesize; + _tmp12_ = stmt; #line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = sqlite3_bind_int64 (_tmp17_, 3, _tmp19_); + _tmp13_ = state->filesize; #line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp20_; + res = sqlite3_bind_int64 (_tmp12_, 3, _tmp13_); #line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = res; + _tmp14_ = res; #line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = stmt; -#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = state; + _vala_assert (_tmp14_ == SQLITE_OK, "res == Sqlite.OK"); #line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = _tmp23_->dim; + _tmp15_ = stmt; #line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = _tmp24_.width; + _tmp16_ = state->dim; #line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = sqlite3_bind_int (_tmp22_, 4, _tmp25_); + _tmp17_ = _tmp16_.width; #line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp26_; + res = sqlite3_bind_int (_tmp15_, 4, _tmp17_); #line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = res; + _tmp18_ = res; #line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = stmt; -#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = state; + _vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK"); #line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = _tmp29_->dim; + _tmp19_ = stmt; #line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = _tmp30_.height; + _tmp20_ = state->dim; #line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = sqlite3_bind_int (_tmp28_, 5, _tmp31_); + _tmp21_ = _tmp20_.height; #line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp32_; + res = sqlite3_bind_int (_tmp19_, 5, _tmp21_); #line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = res; + _tmp22_ = res; #line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp33_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp22_ == SQLITE_OK, "res == Sqlite.OK"); #line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = stmt; -#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = state; -#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = _tmp35_->original_orientation; + _tmp23_ = stmt; #line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = sqlite3_bind_int (_tmp34_, 6, (gint) _tmp36_); + _tmp24_ = state->original_orientation; #line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp37_; + res = sqlite3_bind_int (_tmp23_, 6, (gint) _tmp24_); #line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = res; + _tmp25_ = res; #line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = stmt; -#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = state; -#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = _tmp40_->file_format; + _vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK"); #line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = photo_file_format_serialize (_tmp41_); + _tmp26_ = stmt; #line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = sqlite3_bind_int (_tmp39_, 7, _tmp42_); + _tmp27_ = state->file_format; #line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp43_; + res = sqlite3_bind_int (_tmp26_, 7, photo_file_format_serialize (_tmp27_)); #line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = res; + _tmp28_ = res; #line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp44_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = stmt; + _vala_assert (_tmp28_ == SQLITE_OK, "res == Sqlite.OK"); #line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = time_created; + _tmp29_ = stmt; #line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = sqlite3_bind_int64 (_tmp45_, 8, (gint64) _tmp46_); + _tmp30_ = time_created; #line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp47_; + res = sqlite3_bind_int64 (_tmp29_, 8, (gint64) _tmp30_); #line 1182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = res; + _tmp31_ = res; #line 1182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp48_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = stmt; + _vala_assert (_tmp31_ == SQLITE_OK, "res == Sqlite.OK"); #line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = sqlite3_step (_tmp49_); + _tmp32_ = stmt; #line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp50_; + res = sqlite3_step (_tmp32_); #line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = res; + _tmp33_ = res; #line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp51_ != SQLITE_DONE) { -#line 8613 "PhotoTable.c" - gint _tmp52_; + if (_tmp33_ != SQLITE_DONE) { +#line 8075 "PhotoTable.c" + gint _tmp34_; #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = res; + _tmp34_ = res; #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_throw_error ("PhotoBackingTable.add", _tmp52_, &_inner_error_); + database_table_throw_error ("PhotoBackingTable.add", _tmp34_, &_inner_error_); #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -8647,7 +8109,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G _sqlite3_finalize0 (stmt); #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 8629 "PhotoTable.c" +#line 8091 "PhotoTable.c" } else { #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -8657,31 +8119,29 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G g_clear_error (&_inner_error_); #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 8639 "PhotoTable.c" +#line 8101 "PhotoTable.c" } } } #line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = state; -#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = database_table_db; + _tmp35_ = database_table_db; #line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = sqlite3_last_insert_rowid (_tmp54_); -#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp53_->id, _tmp55_); -#line 1189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = state; + backing_photo_id_init (&state->id, sqlite3_last_insert_rowid (_tmp35_)); #line 1189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = time_created; + _tmp36_ = time_created; #line 1189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_->time_created = _tmp57_; + state->time_created = _tmp36_; #line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 8659 "PhotoTable.c" +#line 8115 "PhotoTable.c" } -BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhotoID* id, GError** error) { +BackingPhotoRow* +backing_photo_table_fetch (BackingPhotoTable* self, + BackingPhotoID* id, + GError** error) +{ BackingPhotoRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -8693,39 +8153,29 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot BackingPhotoID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; - gint _tmp11_; + sqlite3_stmt* _tmp8_; + gint _tmp9_; BackingPhotoRow* row = NULL; - BackingPhotoRow* _tmp14_; + BackingPhotoRow* _tmp12_; + BackingPhotoRow* _tmp13_; + BackingPhotoID _tmp14_; BackingPhotoRow* _tmp15_; - BackingPhotoID _tmp16_; - BackingPhotoRow* _tmp17_; - sqlite3_stmt* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; + sqlite3_stmt* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; + BackingPhotoRow* _tmp19_; + sqlite3_stmt* _tmp20_; BackingPhotoRow* _tmp21_; sqlite3_stmt* _tmp22_; - gint64 _tmp23_; - BackingPhotoRow* _tmp24_; + BackingPhotoRow* _tmp23_; + sqlite3_stmt* _tmp24_; sqlite3_stmt* _tmp25_; - gint64 _tmp26_; - BackingPhotoRow* _tmp27_; - sqlite3_stmt* _tmp28_; - gint _tmp29_; - sqlite3_stmt* _tmp30_; - gint _tmp31_; - BackingPhotoRow* _tmp32_; - sqlite3_stmt* _tmp33_; - gint _tmp34_; - BackingPhotoRow* _tmp35_; - sqlite3_stmt* _tmp36_; - gint _tmp37_; - PhotoFileFormat _tmp38_; - BackingPhotoRow* _tmp39_; - sqlite3_stmt* _tmp40_; - gint64 _tmp41_; + BackingPhotoRow* _tmp26_; + sqlite3_stmt* _tmp27_; + BackingPhotoRow* _tmp28_; + sqlite3_stmt* _tmp29_; + BackingPhotoRow* _tmp30_; + sqlite3_stmt* _tmp31_; GError * _inner_error_ = NULL; #line 1192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_BACKING_PHOTO_TABLE (self), NULL); @@ -8753,42 +8203,38 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot #line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = _tmp5_.id; #line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 1200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 1200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_step (_tmp8_); #line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp11_ == SQLITE_DONE) { + if (_tmp9_ == SQLITE_DONE) { #line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = NULL; #line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 8757 "PhotoTable.c" +#line 8203 "PhotoTable.c" } else { - gint _tmp12_; + gint _tmp10_; #line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp12_ != SQLITE_ROW) { -#line 8764 "PhotoTable.c" - gint _tmp13_; + if (_tmp10_ != SQLITE_ROW) { +#line 8210 "PhotoTable.c" + gint _tmp11_; #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_throw_error ("BackingPhotoTable.fetch_for_photo", _tmp13_, &_inner_error_); + database_table_throw_error ("BackingPhotoTable.fetch_for_photo", _tmp11_, &_inner_error_); #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -8799,7 +8245,7 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot _sqlite3_finalize0 (stmt); #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 8780 "PhotoTable.c" +#line 8226 "PhotoTable.c" } else { #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -8809,98 +8255,86 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot g_clear_error (&_inner_error_); #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 8790 "PhotoTable.c" +#line 8236 "PhotoTable.c" } } } } #line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = backing_photo_row_new (); + _tmp12_ = backing_photo_row_new (); #line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - row = _tmp14_; + row = _tmp12_; #line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = row; + _tmp13_ = row; #line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = *id; + _tmp14_ = *id; #line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_->id = _tmp16_; + _tmp13_->id = _tmp14_; #line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = row; + _tmp15_ = row; #line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = stmt; + _tmp16_ = stmt; #line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = sqlite3_column_text (_tmp18_, 0); + _tmp17_ = sqlite3_column_text (_tmp16_, 0); #line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = g_strdup (_tmp19_); + _tmp18_ = g_strdup (_tmp17_); #line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp17_->filepath); + _g_free0 (_tmp15_->filepath); #line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_->filepath = _tmp20_; -#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = row; + _tmp15_->filepath = _tmp18_; #line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = stmt; + _tmp19_ = row; #line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = sqlite3_column_int64 (_tmp22_, 1); + _tmp20_ = stmt; #line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_->timestamp = (time_t) _tmp23_; -#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = row; + _tmp19_->timestamp = (time_t) sqlite3_column_int64 (_tmp20_, 1); #line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = stmt; + _tmp21_ = row; #line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = sqlite3_column_int64 (_tmp25_, 2); + _tmp22_ = stmt; #line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_->filesize = _tmp26_; -#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = row; + _tmp21_->filesize = sqlite3_column_int64 (_tmp22_, 2); #line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = stmt; -#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = sqlite3_column_int (_tmp28_, 3); + _tmp23_ = row; #line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = stmt; + _tmp24_ = stmt; #line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = sqlite3_column_int (_tmp30_, 4); + _tmp25_ = stmt; #line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - dimensions_init (&_tmp27_->dim, _tmp29_, _tmp31_); -#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = row; + dimensions_init (&_tmp23_->dim, sqlite3_column_int (_tmp24_, 3), sqlite3_column_int (_tmp25_, 4)); #line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = stmt; + _tmp26_ = row; #line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = sqlite3_column_int (_tmp33_, 5); + _tmp27_ = stmt; #line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_->original_orientation = (Orientation) _tmp34_; -#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = row; -#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = stmt; + _tmp26_->original_orientation = (Orientation) sqlite3_column_int (_tmp27_, 5); #line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = sqlite3_column_int (_tmp36_, 6); + _tmp28_ = row; #line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = photo_file_format_unserialize (_tmp37_); + _tmp29_ = stmt; #line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_->file_format = _tmp38_; + _tmp28_->file_format = photo_file_format_unserialize (sqlite3_column_int (_tmp29_, 6)); #line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = row; + _tmp30_ = row; #line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = stmt; -#line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = sqlite3_column_int64 (_tmp40_, 7); + _tmp31_ = stmt; #line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_->time_created = (time_t) _tmp41_; + _tmp30_->time_created = (time_t) sqlite3_column_int64 (_tmp31_, 7); #line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = row; #line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 8877 "PhotoTable.c" +#line 8307 "PhotoTable.c" } -void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, GError** error) { +void +backing_photo_table_update (BackingPhotoTable* self, + BackingPhotoRow* row, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -8908,47 +8342,31 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - BackingPhotoRow* _tmp5_; - time_t _tmp6_; - gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - BackingPhotoRow* _tmp10_; - gint64 _tmp11_; + time_t _tmp5_; + gint _tmp6_; + sqlite3_stmt* _tmp7_; + gint64 _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + Dimensions _tmp11_; gint _tmp12_; gint _tmp13_; sqlite3_stmt* _tmp14_; - BackingPhotoRow* _tmp15_; - Dimensions _tmp16_; + Dimensions _tmp15_; + gint _tmp16_; gint _tmp17_; - gint _tmp18_; - gint _tmp19_; - sqlite3_stmt* _tmp20_; - BackingPhotoRow* _tmp21_; - Dimensions _tmp22_; + sqlite3_stmt* _tmp18_; + Orientation _tmp19_; + gint _tmp20_; + sqlite3_stmt* _tmp21_; + PhotoFileFormat _tmp22_; gint _tmp23_; - gint _tmp24_; - gint _tmp25_; - sqlite3_stmt* _tmp26_; - BackingPhotoRow* _tmp27_; - Orientation _tmp28_; + sqlite3_stmt* _tmp24_; + BackingPhotoID _tmp25_; + gint64 _tmp26_; + gint _tmp27_; + sqlite3_stmt* _tmp28_; gint _tmp29_; - gint _tmp30_; - sqlite3_stmt* _tmp31_; - BackingPhotoRow* _tmp32_; - PhotoFileFormat _tmp33_; - gint _tmp34_; - gint _tmp35_; - gint _tmp36_; - sqlite3_stmt* _tmp37_; - BackingPhotoRow* _tmp38_; - BackingPhotoID _tmp39_; - gint64 _tmp40_; - gint _tmp41_; - gint _tmp42_; - sqlite3_stmt* _tmp43_; - gint _tmp44_; - gint _tmp45_; GError * _inner_error_ = NULL; #line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -8971,125 +8389,93 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, #line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = row; -#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = _tmp5_->timestamp; + _tmp5_ = row->timestamp; #line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, (gint64) _tmp6_); -#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, (gint64) _tmp5_); #line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp6_ = res; #line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = stmt; -#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = row; + _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); #line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = _tmp10_->filesize; + _tmp7_ = stmt; #line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = sqlite3_bind_int64 (_tmp9_, 2, _tmp11_); + _tmp8_ = row->filesize; #line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp12_; + res = sqlite3_bind_int64 (_tmp7_, 2, _tmp8_); #line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp9_ = res; #line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = stmt; -#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = row; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_->dim; + _tmp10_ = stmt; #line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = _tmp16_.width; + _tmp11_ = row->dim; #line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = sqlite3_bind_int (_tmp14_, 3, _tmp17_); + _tmp12_ = _tmp11_.width; #line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp18_; + res = sqlite3_bind_int (_tmp10_, 3, _tmp12_); #line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = res; + _tmp13_ = res; #line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = stmt; -#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = row; + _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); #line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = _tmp21_->dim; + _tmp14_ = stmt; #line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = _tmp22_.height; + _tmp15_ = row->dim; #line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = sqlite3_bind_int (_tmp20_, 4, _tmp23_); + _tmp16_ = _tmp15_.height; #line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp24_; + res = sqlite3_bind_int (_tmp14_, 4, _tmp16_); #line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = res; + _tmp17_ = res; #line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = stmt; -#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = row; + _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); #line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = _tmp27_->original_orientation; + _tmp18_ = stmt; #line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = sqlite3_bind_int (_tmp26_, 5, (gint) _tmp28_); + _tmp19_ = row->original_orientation; #line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp29_; + res = sqlite3_bind_int (_tmp18_, 5, (gint) _tmp19_); #line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = res; + _tmp20_ = res; #line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = stmt; -#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = row; + _vala_assert (_tmp20_ == SQLITE_OK, "res == Sqlite.OK"); #line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = _tmp32_->file_format; -#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = photo_file_format_serialize (_tmp33_); + _tmp21_ = stmt; #line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = sqlite3_bind_int (_tmp31_, 6, _tmp34_); + _tmp22_ = row->file_format; #line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp35_; + res = sqlite3_bind_int (_tmp21_, 6, photo_file_format_serialize (_tmp22_)); #line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = res; + _tmp23_ = res; #line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp36_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = stmt; -#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = row; + _vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK"); #line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = _tmp38_->id; + _tmp24_ = stmt; #line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = _tmp39_.id; + _tmp25_ = row->id; #line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = sqlite3_bind_int64 (_tmp37_, 7, _tmp40_); + _tmp26_ = _tmp25_.id; #line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp41_; + res = sqlite3_bind_int64 (_tmp24_, 7, _tmp26_); #line 1243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = res; + _tmp27_ = res; #line 1243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = stmt; + _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); #line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = sqlite3_step (_tmp43_); + _tmp28_ = stmt; #line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp44_; + res = sqlite3_step (_tmp28_); #line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = res; + _tmp29_ = res; #line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp45_ != SQLITE_DONE) { -#line 9065 "PhotoTable.c" - gint _tmp46_; + if (_tmp29_ != SQLITE_DONE) { +#line 8451 "PhotoTable.c" + gint _tmp30_; #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = res; + _tmp30_ = res; #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_throw_error ("BackingPhotoTable.update", _tmp46_, &_inner_error_); + database_table_throw_error ("BackingPhotoTable.update", _tmp30_, &_inner_error_); #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -9100,7 +8486,7 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, _sqlite3_finalize0 (stmt); #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9081 "PhotoTable.c" +#line 8467 "PhotoTable.c" } else { #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -9110,17 +8496,23 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, g_clear_error (&_inner_error_); #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9091 "PhotoTable.c" +#line 8477 "PhotoTable.c" } } } #line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 9097 "PhotoTable.c" +#line 8483 "PhotoTable.c" } -void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, gint64 filesize, GError** error) { +void +backing_photo_table_update_attributes (BackingPhotoTable* self, + BackingPhotoID* id, + time_t timestamp, + gint64 filesize, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -9128,21 +8520,15 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - time_t _tmp5_; - gint _tmp6_; + gint _tmp5_; + sqlite3_stmt* _tmp6_; gint _tmp7_; sqlite3_stmt* _tmp8_; - gint64 _tmp9_; - gint _tmp10_; + BackingPhotoID _tmp9_; + gint64 _tmp10_; gint _tmp11_; sqlite3_stmt* _tmp12_; - BackingPhotoID _tmp13_; - gint64 _tmp14_; - gint _tmp15_; - gint _tmp16_; - sqlite3_stmt* _tmp17_; - gint _tmp18_; - gint _tmp19_; + gint _tmp13_; GError * _inner_error_ = NULL; #line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -9165,57 +8551,45 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot #line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = timestamp; -#line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = sqlite3_bind_int64 (_tmp4_, 1, (gint64) _tmp5_); -#line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp6_; + res = sqlite3_bind_int64 (_tmp4_, 1, (gint64) timestamp); #line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; + _tmp5_ = res; #line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = stmt; -#line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = filesize; + _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); #line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_bind_int64 (_tmp8_, 2, _tmp9_); + _tmp6_ = stmt; #line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_bind_int64 (_tmp6_, 2, filesize); #line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp7_ = res; #line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = *id; + _tmp8_ = stmt; #line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_.id; + _tmp9_ = *id; #line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = sqlite3_bind_int64 (_tmp12_, 3, _tmp14_); + _tmp10_ = _tmp9_.id; #line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp15_; + res = sqlite3_bind_int64 (_tmp8_, 3, _tmp10_); #line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = res; + _tmp11_ = res; #line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = stmt; + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = sqlite3_step (_tmp17_); + _tmp12_ = stmt; #line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp18_; + res = sqlite3_step (_tmp12_); #line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = res; + _tmp13_ = res; #line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp19_ != SQLITE_DONE) { -#line 9191 "PhotoTable.c" - gint _tmp20_; + if (_tmp13_ != SQLITE_DONE) { +#line 8565 "PhotoTable.c" + gint _tmp14_; #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = res; + _tmp14_ = res; #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_throw_error ("BackingPhotoTable.update_attributes", _tmp20_, &_inner_error_); + database_table_throw_error ("BackingPhotoTable.update_attributes", _tmp14_, &_inner_error_); #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -9226,7 +8600,7 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot _sqlite3_finalize0 (stmt); #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9207 "PhotoTable.c" +#line 8581 "PhotoTable.c" } else { #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -9236,17 +8610,21 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot g_clear_error (&_inner_error_); #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9217 "PhotoTable.c" +#line 8591 "PhotoTable.c" } } } #line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 9223 "PhotoTable.c" +#line 8597 "PhotoTable.c" } -void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backing_id, GError** error) { +void +backing_photo_table_remove (BackingPhotoTable* self, + BackingPhotoID* backing_id, + GError** error) +{ BackingPhotoID _tmp0_; gint64 _tmp1_; GError * _inner_error_ = NULL; @@ -9268,7 +8646,7 @@ void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backin g_propagate_error (error, _inner_error_); #line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9249 "PhotoTable.c" +#line 8627 "PhotoTable.c" } else { #line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -9276,16 +8654,20 @@ void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backin g_clear_error (&_inner_error_); #line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9257 "PhotoTable.c" +#line 8635 "PhotoTable.c" } } } -void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error) { +void +backing_photo_table_set_filepath (BackingPhotoTable* self, + BackingPhotoID* id, + const gchar* filepath, + GError** error) +{ BackingPhotoID _tmp0_; gint64 _tmp1_; - const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -9298,9 +8680,7 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = filepath; -#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filepath", _tmp2_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filepath", filepath, &_inner_error_); #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -9309,7 +8689,7 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* g_propagate_error (error, _inner_error_); #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9290 "PhotoTable.c" +#line 8670 "PhotoTable.c" } else { #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -9317,16 +8697,20 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* g_clear_error (&_inner_error_); #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9298 "PhotoTable.c" +#line 8678 "PhotoTable.c" } } } -void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, GError** error) { +void +backing_photo_table_update_timestamp (BackingPhotoTable* self, + BackingPhotoID* id, + time_t timestamp, + GError** error) +{ BackingPhotoID _tmp0_; gint64 _tmp1_; - time_t _tmp2_; GError * _inner_error_ = NULL; #line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -9337,9 +8721,7 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = timestamp; -#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "timestamp", (gint64) _tmp2_, &_inner_error_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "timestamp", (gint64) timestamp, &_inner_error_); #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -9348,7 +8730,7 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto g_propagate_error (error, _inner_error_); #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9329 "PhotoTable.c" +#line 8711 "PhotoTable.c" } else { #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -9356,36 +8738,44 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto g_clear_error (&_inner_error_); #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9337 "PhotoTable.c" +#line 8719 "PhotoTable.c" } } } -static void backing_photo_table_class_init (BackingPhotoTableClass * klass) { +static void +backing_photo_table_class_init (BackingPhotoTableClass * klass) +{ #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_table_parent_class = g_type_class_peek_parent (klass); #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ((DatabaseTableClass *) klass)->finalize = backing_photo_table_finalize; -#line 9348 "PhotoTable.c" +#line 8732 "PhotoTable.c" } -static void backing_photo_table_instance_init (BackingPhotoTable * self) { +static void +backing_photo_table_instance_init (BackingPhotoTable * self) +{ } -static void backing_photo_table_finalize (DatabaseTable * obj) { +static void +backing_photo_table_finalize (DatabaseTable * obj) +{ BackingPhotoTable * self; #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_TABLE, BackingPhotoTable); #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" DATABASE_TABLE_CLASS (backing_photo_table_parent_class)->finalize (obj); -#line 9362 "PhotoTable.c" +#line 8750 "PhotoTable.c" } -GType backing_photo_table_get_type (void) { +GType +backing_photo_table_get_type (void) +{ static volatile gsize backing_photo_table_type_id__volatile = 0; if (g_once_init_enter (&backing_photo_table_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (BackingPhotoTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) backing_photo_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (BackingPhotoTable), 0, (GInstanceInitFunc) backing_photo_table_instance_init, NULL }; @@ -9397,7 +8787,11 @@ GType backing_photo_table_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -9409,7 +8803,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/db/SavedSearchDBTable.c b/src/db/SavedSearchDBTable.c index bedc8f4..d2d20d2 100644 --- a/src/db/SavedSearchDBTable.c +++ b/src/db/SavedSearchDBTable.c @@ -1,4 +1,4 @@ -/* SavedSearchDBTable.c generated by valac 0.36.6, the Vala compiler +/* SavedSearchDBTable.c generated by valac 0.40.4, the Vala compiler * generated from SavedSearchDBTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -301,52 +302,76 @@ GType saved_search_id_get_type (void) G_GNUC_CONST; SavedSearchID* saved_search_id_dup (const SavedSearchID* self); void saved_search_id_free (SavedSearchID* self); #define SAVED_SEARCH_ID_INVALID ((gint64) -1) -void saved_search_id_init (SavedSearchID *self, gint64 id); +void saved_search_id_init (SavedSearchID *self, + gint64 id); gboolean saved_search_id_is_invalid (SavedSearchID *self); gboolean saved_search_id_is_valid (SavedSearchID *self); gpointer saved_search_row_ref (gpointer instance); void saved_search_row_unref (gpointer instance); -GParamSpec* param_spec_saved_search_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_saved_search_row (GValue* value, gpointer v_object); -void value_take_saved_search_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_saved_search_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_saved_search_row (GValue* value, + gpointer v_object); +void value_take_saved_search_row (GValue* value, + gpointer v_object); gpointer value_get_saved_search_row (const GValue* value); GType saved_search_row_get_type (void) G_GNUC_CONST; GType search_operator_get_type (void) G_GNUC_CONST; gpointer search_condition_ref (gpointer instance); void search_condition_unref (gpointer instance); -GParamSpec* param_spec_search_condition (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_search_condition (GValue* value, gpointer v_object); -void value_take_search_condition (GValue* value, gpointer v_object); +GParamSpec* param_spec_search_condition (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_search_condition (GValue* value, + gpointer v_object); +void value_take_search_condition (GValue* value, + gpointer v_object); gpointer value_get_search_condition (const GValue* value); GType search_condition_get_type (void) G_GNUC_CONST; -enum { - SAVED_SEARCH_ROW_DUMMY_PROPERTY -}; SavedSearchRow* saved_search_row_new (void); SavedSearchRow* saved_search_row_construct (GType object_type); static void saved_search_row_finalize (SavedSearchRow * obj); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType saved_search_db_table_get_type (void) G_GNUC_CONST; -enum { - SAVED_SEARCH_DB_TABLE_DUMMY_PROPERTY -}; static SavedSearchDBTable* saved_search_db_table_new (void); static SavedSearchDBTable* saved_search_db_table_construct (GType object_type); DatabaseTable* database_table_construct (GType object_type); -void database_table_set_table_name (DatabaseTable* self, const gchar* table_name); -void database_table_fatal (const gchar* op, gint res); +void database_table_set_table_name (DatabaseTable* self, + const gchar* table_name); +void database_table_fatal (const gchar* op, + gint res); SavedSearchDBTable* saved_search_db_table_get_instance (void); GQuark database_error_quark (void); -SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar* name, SearchOperator operator, GeeArrayList* conditions, GError** error); +SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, + const gchar* name, + SearchOperator operator, + GeeArrayList* conditions, + GError** error); gchar* search_operator_to_string (SearchOperator self); -void database_table_throw_error (const gchar* method, gint res, GError** error); -static void saved_search_db_table_add_condition (SavedSearchDBTable* self, SavedSearchID* id, SearchCondition* condition, GError** error); +void database_table_throw_error (const gchar* method, + gint res, + GError** error); +static void saved_search_db_table_add_condition (SavedSearchDBTable* self, + SavedSearchID* id, + SearchCondition* condition, + GError** error); GType search_condition_text_get_type (void) G_GNUC_CONST; GType search_condition_search_type_get_type (void) G_GNUC_CONST; SearchConditionSearchType search_condition_get_search_type (SearchCondition* self); @@ -386,55 +411,111 @@ SearchConditionDateContext search_condition_date_get_context (SearchConditionDat gchar* search_condition_date_context_to_string (SearchConditionDateContext self); GDateTime* search_condition_date_get_date_one (SearchConditionDate* self); GDateTime* search_condition_date_get_date_two (SearchConditionDate* self); -static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error); -static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTable* self, const gchar* table_name, SavedSearchID* search_id, GError** error); -static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error); +static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error); +static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTable* self, + const gchar* table_name, + SavedSearchID* search_id, + GError** error); +static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error); SearchConditionSearchType search_condition_search_type_from_string (const gchar* str); SearchConditionTextContext search_condition_text_context_from_string (const gchar* str); -SearchConditionText* search_condition_text_new (SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context); -SearchConditionText* search_condition_text_construct (GType object_type, SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context); +SearchConditionText* search_condition_text_new (SearchConditionSearchType search_type, + const gchar* text, + SearchConditionTextContext context); +SearchConditionText* search_condition_text_construct (GType object_type, + SearchConditionSearchType search_type, + const gchar* text, + SearchConditionTextContext context); SearchConditionMediaTypeContext search_condition_media_type_context_from_string (const gchar* str); SearchConditionMediaTypeMediaType search_condition_media_type_media_type_from_string (const gchar* str); -SearchConditionMediaType* search_condition_media_type_new (SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type); -SearchConditionMediaType* search_condition_media_type_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type); +SearchConditionMediaType* search_condition_media_type_new (SearchConditionSearchType search_type, + SearchConditionMediaTypeContext context, + SearchConditionMediaTypeMediaType media_type); +SearchConditionMediaType* search_condition_media_type_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionMediaTypeContext context, + SearchConditionMediaTypeMediaType media_type); SearchConditionFlaggedState search_condition_flagged_state_from_string (const gchar* str); -SearchConditionFlagged* search_condition_flagged_new (SearchConditionSearchType search_type, SearchConditionFlaggedState state); -SearchConditionFlagged* search_condition_flagged_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionFlaggedState state); +SearchConditionFlagged* search_condition_flagged_new (SearchConditionSearchType search_type, + SearchConditionFlaggedState state); +SearchConditionFlagged* search_condition_flagged_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionFlaggedState state); SearchConditionModifiedContext search_condition_modified_context_from_string (const gchar* str); SearchConditionModifiedState search_condition_modified_state_from_string (const gchar* str); -SearchConditionModified* search_condition_modified_new (SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state); -SearchConditionModified* search_condition_modified_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state); +SearchConditionModified* search_condition_modified_new (SearchConditionSearchType search_type, + SearchConditionModifiedContext context, + SearchConditionModifiedState state); +SearchConditionModified* search_condition_modified_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionModifiedContext context, + SearchConditionModifiedState state); Rating rating_unserialize (gint value); SearchConditionRatingContext search_condition_rating_context_from_string (const gchar* str); -SearchConditionRating* search_condition_rating_new (SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context); -SearchConditionRating* search_condition_rating_construct (GType object_type, SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context); +SearchConditionRating* search_condition_rating_new (SearchConditionSearchType search_type, + Rating rating, + SearchConditionRatingContext context); +SearchConditionRating* search_condition_rating_construct (GType object_type, + SearchConditionSearchType search_type, + Rating rating, + SearchConditionRatingContext context); SearchConditionDateContext search_condition_date_context_from_string (const gchar* str); -SearchConditionDate* search_condition_date_new (SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two); -SearchConditionDate* search_condition_date_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two); -void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearchRow* row, SavedSearchID* result, GError** error); -void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error); -void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error); -SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error); +SearchConditionDate* search_condition_date_new (SearchConditionSearchType search_type, + SearchConditionDateContext context, + GDateTime* date_one, + GDateTime* date_two); +SearchConditionDate* search_condition_date_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionDateContext context, + GDateTime* date_one, + GDateTime* date_two); +void saved_search_db_table_create_from_row (SavedSearchDBTable* self, + SavedSearchRow* row, + SavedSearchID* result, + GError** error); +void saved_search_db_table_remove (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error); +void database_table_delete_by_id (DatabaseTable* self, + gint64 id, + GError** error); +SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error); SearchOperator search_operator_from_string (const gchar* str); -GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** error); -void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* search_id, const gchar* new_name, GError** error); -void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error); +GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, + GError** error); +void saved_search_db_table_rename (SavedSearchDBTable* self, + SavedSearchID* search_id, + const gchar* new_name, + GError** error); +void database_table_update_text_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text, + GError** error); static void saved_search_db_table_finalize (DatabaseTable * obj); -void saved_search_id_init (SavedSearchID *self, gint64 id) { - gint64 _tmp0_; +void +saved_search_id_init (SavedSearchID *self, + gint64 id) +{ #line 12 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" memset (self, 0, sizeof (SavedSearchID)); #line 13 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp0_ = id; -#line 13 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - (*self).id = _tmp0_; -#line 434 "SavedSearchDBTable.c" + (*self).id = id; +#line 513 "SavedSearchDBTable.c" } -gboolean saved_search_id_is_invalid (SavedSearchID *self) { +gboolean +saved_search_id_is_invalid (SavedSearchID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 17 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -443,11 +524,13 @@ gboolean saved_search_id_is_invalid (SavedSearchID *self) { result = _tmp0_ == SAVED_SEARCH_ID_INVALID; #line 17 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 447 "SavedSearchDBTable.c" +#line 528 "SavedSearchDBTable.c" } -gboolean saved_search_id_is_valid (SavedSearchID *self) { +gboolean +saved_search_id_is_valid (SavedSearchID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 21 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -456,11 +539,13 @@ gboolean saved_search_id_is_valid (SavedSearchID *self) { result = _tmp0_ != SAVED_SEARCH_ID_INVALID; #line 21 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 460 "SavedSearchDBTable.c" +#line 543 "SavedSearchDBTable.c" } -SavedSearchID* saved_search_id_dup (const SavedSearchID* self) { +SavedSearchID* +saved_search_id_dup (const SavedSearchID* self) +{ SavedSearchID* dup; #line 7 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" dup = g_new0 (SavedSearchID, 1); @@ -468,18 +553,22 @@ SavedSearchID* saved_search_id_dup (const SavedSearchID* self) { memcpy (dup, self, sizeof (SavedSearchID)); #line 7 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return dup; -#line 472 "SavedSearchDBTable.c" +#line 557 "SavedSearchDBTable.c" } -void saved_search_id_free (SavedSearchID* self) { +void +saved_search_id_free (SavedSearchID* self) +{ #line 7 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_free (self); -#line 479 "SavedSearchDBTable.c" +#line 566 "SavedSearchDBTable.c" } -GType saved_search_id_get_type (void) { +GType +saved_search_id_get_type (void) +{ static volatile gsize saved_search_id_type_id__volatile = 0; if (g_once_init_enter (&saved_search_id_type_id__volatile)) { GType saved_search_id_type_id; @@ -490,121 +579,150 @@ GType saved_search_id_get_type (void) { } -SavedSearchRow* saved_search_row_construct (GType object_type) { +SavedSearchRow* +saved_search_row_construct (GType object_type) +{ SavedSearchRow* self = NULL; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" self = (SavedSearchRow*) g_type_create_instance (object_type); #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return self; -#line 500 "SavedSearchDBTable.c" +#line 591 "SavedSearchDBTable.c" } -SavedSearchRow* saved_search_row_new (void) { +SavedSearchRow* +saved_search_row_new (void) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return saved_search_row_construct (TYPE_SAVED_SEARCH_ROW); -#line 507 "SavedSearchDBTable.c" +#line 600 "SavedSearchDBTable.c" } -static void value_saved_search_row_init (GValue* value) { +static void +value_saved_search_row_init (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" value->data[0].v_pointer = NULL; -#line 514 "SavedSearchDBTable.c" +#line 609 "SavedSearchDBTable.c" } -static void value_saved_search_row_free_value (GValue* value) { +static void +value_saved_search_row_free_value (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_row_unref (value->data[0].v_pointer); -#line 523 "SavedSearchDBTable.c" +#line 620 "SavedSearchDBTable.c" } } -static void value_saved_search_row_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_saved_search_row_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (src_value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" dest_value->data[0].v_pointer = saved_search_row_ref (src_value->data[0].v_pointer); -#line 533 "SavedSearchDBTable.c" +#line 633 "SavedSearchDBTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" dest_value->data[0].v_pointer = NULL; -#line 537 "SavedSearchDBTable.c" +#line 637 "SavedSearchDBTable.c" } } -static gpointer value_saved_search_row_peek_pointer (const GValue* value) { +static gpointer +value_saved_search_row_peek_pointer (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return value->data[0].v_pointer; -#line 545 "SavedSearchDBTable.c" +#line 647 "SavedSearchDBTable.c" } -static gchar* value_saved_search_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_saved_search_row_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (collect_values[0].v_pointer) { -#line 552 "SavedSearchDBTable.c" +#line 659 "SavedSearchDBTable.c" SavedSearchRow * object; object = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (object->parent_instance.g_class == NULL) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 559 "SavedSearchDBTable.c" +#line 666 "SavedSearchDBTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 563 "SavedSearchDBTable.c" +#line 670 "SavedSearchDBTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" value->data[0].v_pointer = saved_search_row_ref (object); -#line 567 "SavedSearchDBTable.c" +#line 674 "SavedSearchDBTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" value->data[0].v_pointer = NULL; -#line 571 "SavedSearchDBTable.c" +#line 678 "SavedSearchDBTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 575 "SavedSearchDBTable.c" +#line 682 "SavedSearchDBTable.c" } -static gchar* value_saved_search_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_saved_search_row_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ SavedSearchRow ** object_p; object_p = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (!object_p) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 586 "SavedSearchDBTable.c" +#line 698 "SavedSearchDBTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (!value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" *object_p = NULL; -#line 592 "SavedSearchDBTable.c" +#line 704 "SavedSearchDBTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" *object_p = value->data[0].v_pointer; -#line 596 "SavedSearchDBTable.c" +#line 708 "SavedSearchDBTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" *object_p = saved_search_row_ref (value->data[0].v_pointer); -#line 600 "SavedSearchDBTable.c" +#line 712 "SavedSearchDBTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 604 "SavedSearchDBTable.c" +#line 716 "SavedSearchDBTable.c" } -GParamSpec* param_spec_saved_search_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_saved_search_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecSavedSearchRow* spec; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_SAVED_SEARCH_ROW), NULL); @@ -614,20 +732,25 @@ GParamSpec* param_spec_saved_search_row (const gchar* name, const gchar* nick, c G_PARAM_SPEC (spec)->value_type = object_type; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return G_PARAM_SPEC (spec); -#line 618 "SavedSearchDBTable.c" +#line 736 "SavedSearchDBTable.c" } -gpointer value_get_saved_search_row (const GValue* value) { +gpointer +value_get_saved_search_row (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_ROW), NULL); #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return value->data[0].v_pointer; -#line 627 "SavedSearchDBTable.c" +#line 747 "SavedSearchDBTable.c" } -void value_set_saved_search_row (GValue* value, gpointer v_object) { +void +value_set_saved_search_row (GValue* value, + gpointer v_object) +{ SavedSearchRow * old; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_ROW)); @@ -643,22 +766,25 @@ void value_set_saved_search_row (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_row_ref (value->data[0].v_pointer); -#line 647 "SavedSearchDBTable.c" +#line 770 "SavedSearchDBTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" value->data[0].v_pointer = NULL; -#line 651 "SavedSearchDBTable.c" +#line 774 "SavedSearchDBTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_row_unref (old); -#line 657 "SavedSearchDBTable.c" +#line 780 "SavedSearchDBTable.c" } } -void value_take_saved_search_row (GValue* value, gpointer v_object) { +void +value_take_saved_search_row (GValue* value, + gpointer v_object) +{ SavedSearchRow * old; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_ROW)); @@ -672,38 +798,44 @@ void value_take_saved_search_row (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" value->data[0].v_pointer = v_object; -#line 676 "SavedSearchDBTable.c" +#line 802 "SavedSearchDBTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" value->data[0].v_pointer = NULL; -#line 680 "SavedSearchDBTable.c" +#line 806 "SavedSearchDBTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_row_unref (old); -#line 686 "SavedSearchDBTable.c" +#line 812 "SavedSearchDBTable.c" } } -static void saved_search_row_class_init (SavedSearchRowClass * klass) { +static void +saved_search_row_class_init (SavedSearchRowClass * klass) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_row_parent_class = g_type_class_peek_parent (klass); #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" ((SavedSearchRowClass *) klass)->finalize = saved_search_row_finalize; -#line 696 "SavedSearchDBTable.c" +#line 824 "SavedSearchDBTable.c" } -static void saved_search_row_instance_init (SavedSearchRow * self) { +static void +saved_search_row_instance_init (SavedSearchRow * self) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" self->ref_count = 1; -#line 703 "SavedSearchDBTable.c" +#line 833 "SavedSearchDBTable.c" } -static void saved_search_row_finalize (SavedSearchRow * obj) { +static void +saved_search_row_finalize (SavedSearchRow * obj) +{ SavedSearchRow * self; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_ROW, SavedSearchRow); @@ -713,11 +845,13 @@ static void saved_search_row_finalize (SavedSearchRow * obj) { _g_free0 (self->name); #line 30 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _g_object_unref0 (self->conditions); -#line 717 "SavedSearchDBTable.c" +#line 849 "SavedSearchDBTable.c" } -GType saved_search_row_get_type (void) { +GType +saved_search_row_get_type (void) +{ static volatile gsize saved_search_row_type_id__volatile = 0; if (g_once_init_enter (&saved_search_row_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_saved_search_row_init, value_saved_search_row_free_value, value_saved_search_row_copy_value, value_saved_search_row_peek_pointer, "p", value_saved_search_row_collect_value, "p", value_saved_search_row_lcopy_value }; @@ -731,18 +865,22 @@ GType saved_search_row_get_type (void) { } -gpointer saved_search_row_ref (gpointer instance) { +gpointer +saved_search_row_ref (gpointer instance) +{ SavedSearchRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_atomic_int_inc (&self->ref_count); #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return instance; -#line 742 "SavedSearchDBTable.c" +#line 878 "SavedSearchDBTable.c" } -void saved_search_row_unref (gpointer instance) { +void +saved_search_row_unref (gpointer instance) +{ SavedSearchRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -751,12 +889,14 @@ void saved_search_row_unref (gpointer instance) { SAVED_SEARCH_ROW_GET_CLASS (self)->finalize (self); #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 755 "SavedSearchDBTable.c" +#line 893 "SavedSearchDBTable.c" } } -static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { +static SavedSearchDBTable* +saved_search_db_table_construct (GType object_type) +{ SavedSearchDBTable* self = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -766,48 +906,47 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; - sqlite3* _tmp8_; - sqlite3_stmt* _tmp9_ = NULL; + sqlite3* _tmp7_; + sqlite3_stmt* _tmp8_ = NULL; + gint _tmp9_; gint _tmp10_; - gint _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; - gint _tmp14_; - sqlite3* _tmp16_; - sqlite3_stmt* _tmp17_ = NULL; - gint _tmp18_; + sqlite3_stmt* _tmp11_; + gint _tmp12_; + sqlite3* _tmp14_; + sqlite3_stmt* _tmp15_ = NULL; + gint _tmp16_; + gint _tmp17_; + sqlite3_stmt* _tmp18_; gint _tmp19_; - sqlite3_stmt* _tmp20_; - gint _tmp21_; - gint _tmp22_; - sqlite3* _tmp24_; - sqlite3_stmt* _tmp25_ = NULL; + sqlite3* _tmp21_; + sqlite3_stmt* _tmp22_ = NULL; + gint _tmp23_; + gint _tmp24_; + sqlite3_stmt* _tmp25_; gint _tmp26_; - gint _tmp27_; - sqlite3_stmt* _tmp28_; - gint _tmp29_; + sqlite3* _tmp28_; + sqlite3_stmt* _tmp29_ = NULL; gint _tmp30_; - sqlite3* _tmp32_; - sqlite3_stmt* _tmp33_ = NULL; - gint _tmp34_; - gint _tmp35_; - sqlite3_stmt* _tmp36_; + gint _tmp31_; + sqlite3_stmt* _tmp32_; + gint _tmp33_; + sqlite3* _tmp35_; + sqlite3_stmt* _tmp36_ = NULL; gint _tmp37_; gint _tmp38_; - sqlite3* _tmp40_; - sqlite3_stmt* _tmp41_ = NULL; - gint _tmp42_; - gint _tmp43_; - sqlite3_stmt* _tmp44_; + sqlite3_stmt* _tmp39_; + gint _tmp40_; + sqlite3* _tmp42_; + sqlite3_stmt* _tmp43_ = NULL; + gint _tmp44_; gint _tmp45_; - gint _tmp46_; - sqlite3* _tmp48_; - sqlite3_stmt* _tmp49_ = NULL; - gint _tmp50_; + sqlite3_stmt* _tmp46_; + gint _tmp47_; + sqlite3* _tmp49_; + sqlite3_stmt* _tmp50_ = NULL; gint _tmp51_; - sqlite3_stmt* _tmp52_; - gint _tmp53_; + gint _tmp52_; + sqlite3_stmt* _tmp53_; gint _tmp54_; sqlite3* _tmp56_; sqlite3_stmt* _tmp57_ = NULL; @@ -815,42 +954,30 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { gint _tmp59_; sqlite3_stmt* _tmp60_; gint _tmp61_; - gint _tmp62_; - sqlite3* _tmp64_; - sqlite3_stmt* _tmp65_ = NULL; + sqlite3* _tmp63_; + sqlite3_stmt* _tmp64_ = NULL; + gint _tmp65_; gint _tmp66_; - gint _tmp67_; - sqlite3_stmt* _tmp68_; - gint _tmp69_; - gint _tmp70_; - sqlite3* _tmp72_; - sqlite3_stmt* _tmp73_ = NULL; - gint _tmp74_; + sqlite3_stmt* _tmp67_; + gint _tmp68_; + sqlite3* _tmp70_; + sqlite3_stmt* _tmp71_ = NULL; + gint _tmp72_; + gint _tmp73_; + sqlite3_stmt* _tmp74_; gint _tmp75_; - sqlite3_stmt* _tmp76_; - gint _tmp77_; - gint _tmp78_; - sqlite3* _tmp80_; - sqlite3_stmt* _tmp81_ = NULL; + sqlite3* _tmp77_; + sqlite3_stmt* _tmp78_ = NULL; + gint _tmp79_; + gint _tmp80_; + sqlite3_stmt* _tmp81_; gint _tmp82_; - gint _tmp83_; - sqlite3_stmt* _tmp84_; - gint _tmp85_; + sqlite3* _tmp84_; + sqlite3_stmt* _tmp85_ = NULL; gint _tmp86_; - sqlite3* _tmp88_; - sqlite3_stmt* _tmp89_ = NULL; - gint _tmp90_; - gint _tmp91_; - sqlite3_stmt* _tmp92_; - gint _tmp93_; - gint _tmp94_; - sqlite3* _tmp96_; - sqlite3_stmt* _tmp97_ = NULL; - gint _tmp98_; - gint _tmp99_; - sqlite3_stmt* _tmp100_; - gint _tmp101_; - gint _tmp102_; + gint _tmp87_; + sqlite3_stmt* _tmp88_; + gint _tmp89_; #line 36 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" self = (SavedSearchDBTable*) database_table_construct (object_type); #line 37 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -872,428 +999,408 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { #line 50 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp4_ = stmt; #line 50 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 50 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 51 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 51 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp6_ != SQLITE_DONE) { -#line 883 "SavedSearchDBTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_DONE) { +#line 1008 "SavedSearchDBTable.c" + gint _tmp6_; #line 52 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 52 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable", _tmp7_); -#line 889 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable", _tmp6_); +#line 1014 "SavedSearchDBTable.c" } #line 55 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = database_table_db; + _tmp7_ = database_table_db; #line 55 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = sqlite3_prepare_v2 (_tmp8_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Text " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "text TEXT" ")", -1, &_tmp9_, NULL); + _tmp9_ = sqlite3_prepare_v2 (_tmp7_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Text " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "text TEXT" ")", -1, &_tmp8_, NULL); #line 55 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 55 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp9_; + stmt = _tmp8_; #line 55 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp10_; + res = _tmp9_; #line 64 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = res; + _tmp10_ = res; #line 64 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 66 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = stmt; + _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); #line 66 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = sqlite3_step (_tmp12_); + _tmp11_ = stmt; #line 66 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp13_; + res = sqlite3_step (_tmp11_); #line 67 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = res; + _tmp12_ = res; #line 67 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp14_ != SQLITE_DONE) { -#line 915 "SavedSearchDBTable.c" - gint _tmp15_; + if (_tmp12_ != SQLITE_DONE) { +#line 1038 "SavedSearchDBTable.c" + gint _tmp13_; #line 68 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = res; + _tmp13_ = res; #line 68 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Text", _tmp15_); -#line 921 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Text", _tmp13_); +#line 1044 "SavedSearchDBTable.c" } #line 71 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = database_table_db; + _tmp14_ = database_table_db; #line 71 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = sqlite3_prepare_v2 (_tmp16_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_MediaType " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "type TEXT NOT_NULL" ")", -1, &_tmp17_, NULL); + _tmp16_ = sqlite3_prepare_v2 (_tmp14_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_MediaType " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "type TEXT NOT_NULL" ")", -1, &_tmp15_, NULL); #line 71 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 71 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp17_; + stmt = _tmp15_; #line 71 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp18_; + res = _tmp16_; #line 80 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = res; + _tmp17_ = res; #line 80 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); -#line 82 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = stmt; + _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); #line 82 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = sqlite3_step (_tmp20_); + _tmp18_ = stmt; #line 82 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp21_; + res = sqlite3_step (_tmp18_); #line 83 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = res; + _tmp19_ = res; #line 83 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp22_ != SQLITE_DONE) { -#line 947 "SavedSearchDBTable.c" - gint _tmp23_; + if (_tmp19_ != SQLITE_DONE) { +#line 1068 "SavedSearchDBTable.c" + gint _tmp20_; #line 84 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = res; + _tmp20_ = res; #line 84 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_MediaType", _tmp23_); -#line 953 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_MediaType", _tmp20_); +#line 1074 "SavedSearchDBTable.c" } #line 87 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = database_table_db; + _tmp21_ = database_table_db; #line 87 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp26_ = sqlite3_prepare_v2 (_tmp24_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Flagged " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "flag_state TEXT NOT NULL" ")", -1, &_tmp25_, NULL); + _tmp23_ = sqlite3_prepare_v2 (_tmp21_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Flagged " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "flag_state TEXT NOT NULL" ")", -1, &_tmp22_, NULL); #line 87 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 87 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp25_; + stmt = _tmp22_; #line 87 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp26_; + res = _tmp23_; #line 95 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_ = res; + _tmp24_ = res; #line 95 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); -#line 97 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp28_ = stmt; + _vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK"); #line 97 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_ = sqlite3_step (_tmp28_); + _tmp25_ = stmt; #line 97 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp29_; + res = sqlite3_step (_tmp25_); #line 98 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp30_ = res; + _tmp26_ = res; #line 98 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp30_ != SQLITE_DONE) { -#line 979 "SavedSearchDBTable.c" - gint _tmp31_; + if (_tmp26_ != SQLITE_DONE) { +#line 1098 "SavedSearchDBTable.c" + gint _tmp27_; #line 99 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp31_ = res; + _tmp27_ = res; #line 99 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Flagged", _tmp31_); -#line 985 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Flagged", _tmp27_); +#line 1104 "SavedSearchDBTable.c" } #line 102 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp32_ = database_table_db; + _tmp28_ = database_table_db; #line 102 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp34_ = sqlite3_prepare_v2 (_tmp32_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Modified " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "modified_state TEXT NOT NULL" ")", -1, &_tmp33_, NULL); + _tmp30_ = sqlite3_prepare_v2 (_tmp28_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Modified " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "modified_state TEXT NOT NULL" ")", -1, &_tmp29_, NULL); #line 102 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 102 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp33_; + stmt = _tmp29_; #line 102 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp34_; + res = _tmp30_; #line 111 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp35_ = res; + _tmp31_ = res; #line 111 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK"); -#line 113 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp36_ = stmt; + _vala_assert (_tmp31_ == SQLITE_OK, "res == Sqlite.OK"); #line 113 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp37_ = sqlite3_step (_tmp36_); + _tmp32_ = stmt; #line 113 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp37_; + res = sqlite3_step (_tmp32_); #line 114 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp38_ = res; + _tmp33_ = res; #line 114 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp38_ != SQLITE_DONE) { -#line 1011 "SavedSearchDBTable.c" - gint _tmp39_; + if (_tmp33_ != SQLITE_DONE) { +#line 1128 "SavedSearchDBTable.c" + gint _tmp34_; #line 115 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp39_ = res; + _tmp34_ = res; #line 115 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Modified", _tmp39_); -#line 1017 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Modified", _tmp34_); +#line 1134 "SavedSearchDBTable.c" } #line 118 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp40_ = database_table_db; + _tmp35_ = database_table_db; #line 118 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp42_ = sqlite3_prepare_v2 (_tmp40_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Rating " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "rating INTEGER NOT_NULL, " "context TEXT NOT NULL" ")", -1, &_tmp41_, NULL); + _tmp37_ = sqlite3_prepare_v2 (_tmp35_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Rating " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "rating INTEGER NOT_NULL, " "context TEXT NOT NULL" ")", -1, &_tmp36_, NULL); #line 118 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 118 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp41_; + stmt = _tmp36_; #line 118 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp42_; + res = _tmp37_; #line 127 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp43_ = res; + _tmp38_ = res; #line 127 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp43_ == SQLITE_OK, "res == Sqlite.OK"); -#line 129 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp44_ = stmt; + _vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK"); #line 129 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp45_ = sqlite3_step (_tmp44_); + _tmp39_ = stmt; #line 129 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp45_; + res = sqlite3_step (_tmp39_); #line 130 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp46_ = res; + _tmp40_ = res; #line 130 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp46_ != SQLITE_DONE) { -#line 1043 "SavedSearchDBTable.c" - gint _tmp47_; + if (_tmp40_ != SQLITE_DONE) { +#line 1158 "SavedSearchDBTable.c" + gint _tmp41_; #line 131 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp47_ = res; + _tmp41_ = res; #line 131 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Rating", _tmp47_); -#line 1049 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Rating", _tmp41_); +#line 1164 "SavedSearchDBTable.c" } #line 134 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp48_ = database_table_db; + _tmp42_ = database_table_db; #line 134 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp50_ = sqlite3_prepare_v2 (_tmp48_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Date " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "date_one INTEGER NOT_NULL, " "date_two INTEGER NOT_NULL" ")", -1, &_tmp49_, NULL); + _tmp44_ = sqlite3_prepare_v2 (_tmp42_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Date " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "date_one INTEGER NOT_NULL, " "date_two INTEGER NOT_NULL" ")", -1, &_tmp43_, NULL); #line 134 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 134 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp49_; + stmt = _tmp43_; #line 134 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp50_; + res = _tmp44_; #line 144 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp51_ = res; + _tmp45_ = res; #line 144 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp51_ == SQLITE_OK, "res == Sqlite.OK"); -#line 146 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp52_ = stmt; + _vala_assert (_tmp45_ == SQLITE_OK, "res == Sqlite.OK"); #line 146 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp53_ = sqlite3_step (_tmp52_); + _tmp46_ = stmt; #line 146 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp53_; + res = sqlite3_step (_tmp46_); #line 147 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp54_ = res; + _tmp47_ = res; #line 147 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp54_ != SQLITE_DONE) { -#line 1075 "SavedSearchDBTable.c" - gint _tmp55_; + if (_tmp47_ != SQLITE_DONE) { +#line 1188 "SavedSearchDBTable.c" + gint _tmp48_; #line 148 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp55_ = res; + _tmp48_ = res; #line 148 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Rating", _tmp55_); -#line 1081 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Rating", _tmp48_); +#line 1194 "SavedSearchDBTable.c" } #line 151 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp56_ = database_table_db; + _tmp49_ = database_table_db; #line 151 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp58_ = sqlite3_prepare_v2 (_tmp56_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Text_Index " "ON SavedSearchDBTable_Text(search_id)", -1, &_tmp57_, NULL); + _tmp51_ = sqlite3_prepare_v2 (_tmp49_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Text_Index " "ON SavedSearchDBTable_Text(search_id)", -1, &_tmp50_, NULL); #line 151 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 151 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp57_; + stmt = _tmp50_; #line 151 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp58_; + res = _tmp51_; #line 154 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp59_ = res; + _tmp52_ = res; #line 154 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp52_ == SQLITE_OK, "res == Sqlite.OK"); #line 155 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp60_ = stmt; -#line 155 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp61_ = sqlite3_step (_tmp60_); + _tmp53_ = stmt; #line 155 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp61_; + res = sqlite3_step (_tmp53_); #line 156 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp62_ = res; + _tmp54_ = res; #line 156 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp62_ != SQLITE_DONE) { -#line 1107 "SavedSearchDBTable.c" - gint _tmp63_; + if (_tmp54_ != SQLITE_DONE) { +#line 1218 "SavedSearchDBTable.c" + gint _tmp55_; #line 157 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp63_ = res; + _tmp55_ = res; #line 157 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Text_Index", _tmp63_); -#line 1113 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Text_Index", _tmp55_); +#line 1224 "SavedSearchDBTable.c" } #line 159 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp64_ = database_table_db; + _tmp56_ = database_table_db; #line 159 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp66_ = sqlite3_prepare_v2 (_tmp64_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_MediaType_Index " "ON SavedSearchDBTable_MediaType(search_id)", -1, &_tmp65_, NULL); + _tmp58_ = sqlite3_prepare_v2 (_tmp56_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_MediaType_Index " "ON SavedSearchDBTable_MediaType(search_id)", -1, &_tmp57_, NULL); #line 159 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 159 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp65_; + stmt = _tmp57_; #line 159 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp66_; + res = _tmp58_; #line 162 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp67_ = res; + _tmp59_ = res; #line 162 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp67_ == SQLITE_OK, "res == Sqlite.OK"); -#line 163 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp68_ = stmt; + _vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK"); #line 163 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp69_ = sqlite3_step (_tmp68_); + _tmp60_ = stmt; #line 163 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp69_; + res = sqlite3_step (_tmp60_); #line 164 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp70_ = res; + _tmp61_ = res; #line 164 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp70_ != SQLITE_DONE) { -#line 1139 "SavedSearchDBTable.c" - gint _tmp71_; + if (_tmp61_ != SQLITE_DONE) { +#line 1248 "SavedSearchDBTable.c" + gint _tmp62_; #line 165 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp71_ = res; + _tmp62_ = res; #line 165 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_MediaType_Index", _tmp71_); -#line 1145 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_MediaType_Index", _tmp62_); +#line 1254 "SavedSearchDBTable.c" } #line 167 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp72_ = database_table_db; + _tmp63_ = database_table_db; #line 167 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp74_ = sqlite3_prepare_v2 (_tmp72_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Flagged_Index " "ON SavedSearchDBTable_Flagged(search_id)", -1, &_tmp73_, NULL); + _tmp65_ = sqlite3_prepare_v2 (_tmp63_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Flagged_Index " "ON SavedSearchDBTable_Flagged(search_id)", -1, &_tmp64_, NULL); #line 167 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 167 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp73_; + stmt = _tmp64_; #line 167 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp74_; + res = _tmp65_; #line 170 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp75_ = res; + _tmp66_ = res; #line 170 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp75_ == SQLITE_OK, "res == Sqlite.OK"); -#line 171 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp76_ = stmt; + _vala_assert (_tmp66_ == SQLITE_OK, "res == Sqlite.OK"); #line 171 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp77_ = sqlite3_step (_tmp76_); + _tmp67_ = stmt; #line 171 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp77_; + res = sqlite3_step (_tmp67_); #line 172 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp78_ = res; + _tmp68_ = res; #line 172 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp78_ != SQLITE_DONE) { -#line 1171 "SavedSearchDBTable.c" - gint _tmp79_; + if (_tmp68_ != SQLITE_DONE) { +#line 1278 "SavedSearchDBTable.c" + gint _tmp69_; #line 173 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp79_ = res; + _tmp69_ = res; #line 173 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Flagged_Index", _tmp79_); -#line 1177 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Flagged_Index", _tmp69_); +#line 1284 "SavedSearchDBTable.c" } #line 175 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp80_ = database_table_db; + _tmp70_ = database_table_db; #line 175 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp82_ = sqlite3_prepare_v2 (_tmp80_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Modified_Index " "ON SavedSearchDBTable_Modified(search_id)", -1, &_tmp81_, NULL); + _tmp72_ = sqlite3_prepare_v2 (_tmp70_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Modified_Index " "ON SavedSearchDBTable_Modified(search_id)", -1, &_tmp71_, NULL); #line 175 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 175 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp81_; + stmt = _tmp71_; #line 175 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp82_; + res = _tmp72_; #line 178 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp83_ = res; + _tmp73_ = res; #line 178 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp83_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp73_ == SQLITE_OK, "res == Sqlite.OK"); #line 179 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp84_ = stmt; + _tmp74_ = stmt; #line 179 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp85_ = sqlite3_step (_tmp84_); -#line 179 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp85_; + res = sqlite3_step (_tmp74_); #line 180 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp86_ = res; + _tmp75_ = res; #line 180 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp86_ != SQLITE_DONE) { -#line 1203 "SavedSearchDBTable.c" - gint _tmp87_; + if (_tmp75_ != SQLITE_DONE) { +#line 1308 "SavedSearchDBTable.c" + gint _tmp76_; #line 181 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp87_ = res; + _tmp76_ = res; #line 181 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Modified_Index", _tmp87_); -#line 1209 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Modified_Index", _tmp76_); +#line 1314 "SavedSearchDBTable.c" } #line 183 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp88_ = database_table_db; + _tmp77_ = database_table_db; #line 183 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp90_ = sqlite3_prepare_v2 (_tmp88_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Rating_Index " "ON SavedSearchDBTable_Rating(search_id)", -1, &_tmp89_, NULL); + _tmp79_ = sqlite3_prepare_v2 (_tmp77_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Rating_Index " "ON SavedSearchDBTable_Rating(search_id)", -1, &_tmp78_, NULL); #line 183 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 183 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp89_; + stmt = _tmp78_; #line 183 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp90_; + res = _tmp79_; #line 186 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp91_ = res; + _tmp80_ = res; #line 186 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp91_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp80_ == SQLITE_OK, "res == Sqlite.OK"); #line 187 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp92_ = stmt; + _tmp81_ = stmt; #line 187 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp93_ = sqlite3_step (_tmp92_); -#line 187 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp93_; + res = sqlite3_step (_tmp81_); #line 188 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp94_ = res; + _tmp82_ = res; #line 188 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp94_ != SQLITE_DONE) { -#line 1235 "SavedSearchDBTable.c" - gint _tmp95_; + if (_tmp82_ != SQLITE_DONE) { +#line 1338 "SavedSearchDBTable.c" + gint _tmp83_; #line 189 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp95_ = res; + _tmp83_ = res; #line 189 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Rating_Index", _tmp95_); -#line 1241 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Rating_Index", _tmp83_); +#line 1344 "SavedSearchDBTable.c" } #line 191 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp96_ = database_table_db; + _tmp84_ = database_table_db; #line 191 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp98_ = sqlite3_prepare_v2 (_tmp96_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Date_Index " "ON SavedSearchDBTable_Date(search_id)", -1, &_tmp97_, NULL); + _tmp86_ = sqlite3_prepare_v2 (_tmp84_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Date_Index " "ON SavedSearchDBTable_Date(search_id)", -1, &_tmp85_, NULL); #line 191 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 191 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp97_; + stmt = _tmp85_; #line 191 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp98_; + res = _tmp86_; #line 194 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp99_ = res; + _tmp87_ = res; #line 194 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp99_ == SQLITE_OK, "res == Sqlite.OK"); -#line 195 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp100_ = stmt; + _vala_assert (_tmp87_ == SQLITE_OK, "res == Sqlite.OK"); #line 195 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp101_ = sqlite3_step (_tmp100_); + _tmp88_ = stmt; #line 195 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp101_; + res = sqlite3_step (_tmp88_); #line 196 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp102_ = res; + _tmp89_ = res; #line 196 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp102_ != SQLITE_DONE) { -#line 1267 "SavedSearchDBTable.c" - gint _tmp103_; + if (_tmp89_ != SQLITE_DONE) { +#line 1368 "SavedSearchDBTable.c" + gint _tmp90_; #line 197 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp103_ = res; + _tmp90_ = res; #line 197 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Date_Index", _tmp103_); -#line 1273 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Date_Index", _tmp90_); +#line 1374 "SavedSearchDBTable.c" } #line 36 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 36 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return self; -#line 1279 "SavedSearchDBTable.c" +#line 1380 "SavedSearchDBTable.c" } -static SavedSearchDBTable* saved_search_db_table_new (void) { +static SavedSearchDBTable* +saved_search_db_table_new (void) +{ #line 36 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return saved_search_db_table_construct (TYPE_SAVED_SEARCH_DB_TABLE); -#line 1286 "SavedSearchDBTable.c" +#line 1389 "SavedSearchDBTable.c" } -static gpointer _database_table_ref0 (gpointer self) { +static gpointer +_database_table_ref0 (gpointer self) +{ #line 204 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return self ? database_table_ref (self) : NULL; -#line 1293 "SavedSearchDBTable.c" +#line 1398 "SavedSearchDBTable.c" } -SavedSearchDBTable* saved_search_db_table_get_instance (void) { +SavedSearchDBTable* +saved_search_db_table_get_instance (void) +{ SavedSearchDBTable* result = NULL; SavedSearchDBTable* _tmp0_; SavedSearchDBTable* _tmp2_; @@ -1302,7 +1409,7 @@ SavedSearchDBTable* saved_search_db_table_get_instance (void) { _tmp0_ = saved_search_db_table_instance; #line 201 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp0_ == NULL) { -#line 1306 "SavedSearchDBTable.c" +#line 1413 "SavedSearchDBTable.c" SavedSearchDBTable* _tmp1_; #line 202 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp1_ = saved_search_db_table_new (); @@ -1310,7 +1417,7 @@ SavedSearchDBTable* saved_search_db_table_get_instance (void) { _database_table_unref0 (saved_search_db_table_instance); #line 202 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_db_table_instance = _tmp1_; -#line 1314 "SavedSearchDBTable.c" +#line 1421 "SavedSearchDBTable.c" } #line 204 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp2_ = saved_search_db_table_instance; @@ -1320,18 +1427,26 @@ SavedSearchDBTable* saved_search_db_table_get_instance (void) { result = _tmp3_; #line 204 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 1324 "SavedSearchDBTable.c" +#line 1431 "SavedSearchDBTable.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return self ? g_object_ref (self) : NULL; -#line 1331 "SavedSearchDBTable.c" +#line 1440 "SavedSearchDBTable.c" } -SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar* name, SearchOperator operator, GeeArrayList* conditions, GError** error) { +SavedSearchRow* +saved_search_db_table_add (SavedSearchDBTable* self, + const gchar* name, + SearchOperator operator, + GeeArrayList* conditions, + GError** error) +{ SavedSearchRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1340,33 +1455,24 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - const gchar* _tmp5_; - gchar* _tmp6_; - GDestroyNotify _tmp7_; - gint _tmp8_; - gint _tmp9_; - sqlite3_stmt* _tmp10_; - SearchOperator _tmp11_; - gchar* _tmp12_; - GDestroyNotify _tmp13_; - gint _tmp14_; - gint _tmp15_; - sqlite3_stmt* _tmp16_; - gint _tmp17_; - gint _tmp18_; + gchar* _tmp5_; + GDestroyNotify _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; + gchar* _tmp9_; + GDestroyNotify _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; + gint _tmp13_; SavedSearchRow* row = NULL; + SavedSearchRow* _tmp15_; + SavedSearchRow* _tmp16_; + sqlite3* _tmp17_; + SavedSearchRow* _tmp18_; + gchar* _tmp19_; SavedSearchRow* _tmp20_; SavedSearchRow* _tmp21_; - sqlite3* _tmp22_; - gint64 _tmp23_; - SavedSearchRow* _tmp24_; - const gchar* _tmp25_; - gchar* _tmp26_; - SavedSearchRow* _tmp27_; - SearchOperator _tmp28_; - SavedSearchRow* _tmp29_; - GeeArrayList* _tmp30_; - GeeList* _tmp31_; + GeeList* _tmp22_; GError * _inner_error_ = NULL; #line 207 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL); @@ -1391,51 +1497,41 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar #line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp4_ = stmt; #line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp5_ = name; -#line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp6_ = g_strdup (_tmp5_); -#line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = g_free; + _tmp5_ = g_strdup (name); #line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); + _tmp6_ = g_free; #line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp8_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_); #line 215 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = res; + _tmp7_ = res; #line 215 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); -#line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = stmt; -#line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = operator; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = search_operator_to_string (_tmp11_); + _tmp8_ = stmt; #line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = g_free; + _tmp9_ = search_operator_to_string (operator); #line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = sqlite3_bind_text (_tmp10_, 2, _tmp12_, -1, _tmp13_); + _tmp10_ = g_free; #line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp14_; + res = sqlite3_bind_text (_tmp8_, 2, _tmp9_, -1, _tmp10_); #line 217 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = res; + _tmp11_ = res; #line 217 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK"); -#line 219 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = stmt; + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 219 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = sqlite3_step (_tmp16_); + _tmp12_ = stmt; #line 219 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp17_; + res = sqlite3_step (_tmp12_); #line 220 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = res; + _tmp13_ = res; #line 220 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp18_ != SQLITE_DONE) { -#line 1434 "SavedSearchDBTable.c" - gint _tmp19_; + if (_tmp13_ != SQLITE_DONE) { +#line 1530 "SavedSearchDBTable.c" + gint _tmp14_; #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = res; + _tmp14_ = res; #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable.add", _tmp19_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable.add", _tmp14_, &_inner_error_); #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1446,7 +1542,7 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar _sqlite3_finalize0 (stmt); #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 1450 "SavedSearchDBTable.c" +#line 1546 "SavedSearchDBTable.c" } else { #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -1456,117 +1552,106 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar g_clear_error (&_inner_error_); #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 1460 "SavedSearchDBTable.c" +#line 1556 "SavedSearchDBTable.c" } } } #line 223 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = saved_search_row_new (); + _tmp15_ = saved_search_row_new (); #line 223 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - row = _tmp20_; -#line 224 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = row; + row = _tmp15_; #line 224 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = database_table_db; + _tmp16_ = row; #line 224 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = sqlite3_last_insert_rowid (_tmp22_); + _tmp17_ = database_table_db; #line 224 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - saved_search_id_init (&_tmp21_->search_id, _tmp23_); + saved_search_id_init (&_tmp16_->search_id, sqlite3_last_insert_rowid (_tmp17_)); #line 225 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = row; + _tmp18_ = row; #line 225 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp25_ = name; + _tmp19_ = g_strdup (name); #line 225 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp26_ = g_strdup (_tmp25_); + _g_free0 (_tmp18_->name); #line 225 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_free0 (_tmp24_->name); -#line 225 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_->name = _tmp26_; -#line 226 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_ = row; + _tmp18_->name = _tmp19_; #line 226 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp28_ = operator; + _tmp20_ = row; #line 226 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_->operator = _tmp28_; -#line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_ = row; + _tmp20_->operator = operator; #line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp30_ = conditions; + _tmp21_ = row; #line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_LIST, GeeList)); + _tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (conditions, GEE_TYPE_LIST, GeeList)); #line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_object_unref0 (_tmp29_->conditions); + _g_object_unref0 (_tmp21_->conditions); #line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_->conditions = _tmp31_; -#line 1502 "SavedSearchDBTable.c" + _tmp21_->conditions = _tmp22_; +#line 1590 "SavedSearchDBTable.c" { GeeArrayList* _sc_list = NULL; - GeeArrayList* _tmp32_; - GeeArrayList* _tmp33_; + GeeArrayList* _tmp23_; gint _sc_size = 0; - GeeArrayList* _tmp34_; - gint _tmp35_; - gint _tmp36_; + GeeArrayList* _tmp24_; + gint _tmp25_; + gint _tmp26_; gint _sc_index = 0; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp32_ = conditions; -#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp33_ = _g_object_ref0 (_tmp32_); + _tmp23_ = _g_object_ref0 (conditions); #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _sc_list = _tmp33_; + _sc_list = _tmp23_; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp34_ = _sc_list; + _tmp24_ = _sc_list; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp35_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp36_ = _tmp35_; + _tmp26_ = _tmp25_; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _sc_size = _tmp36_; + _sc_size = _tmp26_; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sc_index = -1; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 1530 "SavedSearchDBTable.c" - gint _tmp37_; - gint _tmp38_; - gint _tmp39_; +#line 1615 "SavedSearchDBTable.c" + gint _tmp27_; + gint _tmp28_; + gint _tmp29_; SearchCondition* sc = NULL; - GeeArrayList* _tmp40_; - gint _tmp41_; - gpointer _tmp42_; - SavedSearchRow* _tmp43_; - SavedSearchID _tmp44_; - SearchCondition* _tmp45_; + GeeArrayList* _tmp30_; + gint _tmp31_; + gpointer _tmp32_; + SavedSearchRow* _tmp33_; + SavedSearchID _tmp34_; + SearchCondition* _tmp35_; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp37_ = _sc_index; + _tmp27_ = _sc_index; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _sc_index = _tmp37_ + 1; + _sc_index = _tmp27_ + 1; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp38_ = _sc_index; + _tmp28_ = _sc_index; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp39_ = _sc_size; + _tmp29_ = _sc_size; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!(_tmp38_ < _tmp39_)) { + if (!(_tmp28_ < _tmp29_)) { #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 1553 "SavedSearchDBTable.c" +#line 1638 "SavedSearchDBTable.c" } #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp40_ = _sc_list; + _tmp30_ = _sc_list; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp41_ = _sc_index; + _tmp31_ = _sc_index; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp42_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp41_); + _tmp32_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp31_); #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - sc = (SearchCondition*) _tmp42_; + sc = (SearchCondition*) _tmp32_; #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp43_ = row; + _tmp33_ = row; #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp44_ = _tmp43_->search_id; + _tmp34_ = _tmp33_->search_id; #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp45_ = sc; + _tmp35_ = sc; #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - saved_search_db_table_add_condition (self, &_tmp44_, _tmp45_, &_inner_error_); + saved_search_db_table_add_condition (self, &_tmp34_, _tmp35_, &_inner_error_); #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1583,7 +1668,7 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar _sqlite3_finalize0 (stmt); #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 1587 "SavedSearchDBTable.c" +#line 1672 "SavedSearchDBTable.c" } else { #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (sc); @@ -1599,16 +1684,16 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar g_clear_error (&_inner_error_); #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 1603 "SavedSearchDBTable.c" +#line 1688 "SavedSearchDBTable.c" } } #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (sc); -#line 1608 "SavedSearchDBTable.c" +#line 1693 "SavedSearchDBTable.c" } #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _g_object_unref0 (_sc_list); -#line 1612 "SavedSearchDBTable.c" +#line 1697 "SavedSearchDBTable.c" } #line 233 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" result = row; @@ -1616,19 +1701,25 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar _sqlite3_finalize0 (stmt); #line 233 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 1620 "SavedSearchDBTable.c" +#line 1705 "SavedSearchDBTable.c" } -static gpointer _search_condition_ref0 (gpointer self) { +static gpointer +_search_condition_ref0 (gpointer self) +{ #line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return self ? search_condition_ref (self) : NULL; -#line 1627 "SavedSearchDBTable.c" +#line 1714 "SavedSearchDBTable.c" } -static void saved_search_db_table_add_condition (SavedSearchDBTable* self, SavedSearchID* id, SearchCondition* condition, GError** error) { - SearchCondition* _tmp0_; +static void +saved_search_db_table_add_condition (SavedSearchDBTable* self, + SavedSearchID* id, + SearchCondition* condition, + GError** error) +{ GError * _inner_error_ = NULL; #line 236 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self)); @@ -1637,161 +1728,141 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved #line 236 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SEARCH_CONDITION (condition)); #line 237 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp0_ = condition; -#line 237 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_TEXT)) { -#line 1644 "SavedSearchDBTable.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_TEXT)) { +#line 1733 "SavedSearchDBTable.c" SearchConditionText* text = NULL; - SearchCondition* _tmp1_; - SearchConditionText* _tmp2_; + SearchConditionText* _tmp0_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp3_; - sqlite3_stmt* _tmp4_ = NULL; - gint _tmp5_; - gint _tmp6_; - sqlite3_stmt* _tmp7_; - SavedSearchID _tmp8_; - gint64 _tmp9_; - gint _tmp10_; - gint _tmp11_; - sqlite3_stmt* _tmp12_; - SearchConditionText* _tmp13_; - SearchConditionSearchType _tmp14_; - SearchConditionSearchType _tmp15_; - gchar* _tmp16_; - GDestroyNotify _tmp17_; - gint _tmp18_; - gint _tmp19_; - sqlite3_stmt* _tmp20_; - SearchConditionText* _tmp21_; - SearchConditionTextContext _tmp22_; - SearchConditionTextContext _tmp23_; - gchar* _tmp24_; - GDestroyNotify _tmp25_; - gint _tmp26_; - gint _tmp27_; - sqlite3_stmt* _tmp28_; - SearchConditionText* _tmp29_; - const gchar* _tmp30_; - const gchar* _tmp31_; - gchar* _tmp32_; - GDestroyNotify _tmp33_; - gint _tmp34_; - gint _tmp35_; - sqlite3_stmt* _tmp36_; - gint _tmp37_; - gint _tmp38_; -#line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp1_ = condition; + sqlite3* _tmp1_; + sqlite3_stmt* _tmp2_ = NULL; + gint _tmp3_; + gint _tmp4_; + sqlite3_stmt* _tmp5_; + SavedSearchID _tmp6_; + gint64 _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + SearchConditionText* _tmp10_; + SearchConditionSearchType _tmp11_; + SearchConditionSearchType _tmp12_; + gchar* _tmp13_; + GDestroyNotify _tmp14_; + gint _tmp15_; + sqlite3_stmt* _tmp16_; + SearchConditionText* _tmp17_; + SearchConditionTextContext _tmp18_; + SearchConditionTextContext _tmp19_; + gchar* _tmp20_; + GDestroyNotify _tmp21_; + gint _tmp22_; + sqlite3_stmt* _tmp23_; + SearchConditionText* _tmp24_; + const gchar* _tmp25_; + const gchar* _tmp26_; + gchar* _tmp27_; + GDestroyNotify _tmp28_; + gint _tmp29_; + sqlite3_stmt* _tmp30_; + gint _tmp31_; #line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp2_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_SEARCH_CONDITION_TEXT) ? ((SearchConditionText*) _tmp1_) : NULL); + _tmp0_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_TEXT) ? ((SearchConditionText*) condition) : NULL); #line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - text = _tmp2_; + text = _tmp0_; #line 240 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp3_ = database_table_db; + _tmp1_ = database_table_db; #line 240 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp5_ = sqlite3_prepare_v2 (_tmp3_, "INSERT INTO SavedSearchDBTable_Text (search_id, search_type, context, " "text) VALUES (?, ?, ?, ?)", -1, &_tmp4_, NULL); + _tmp3_ = sqlite3_prepare_v2 (_tmp1_, "INSERT INTO SavedSearchDBTable_Text (search_id, search_type, context, " "text) VALUES (?, ?, ?, ?)", -1, &_tmp2_, NULL); #line 240 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 240 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp4_; + stmt = _tmp2_; #line 240 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp5_; + res = _tmp3_; #line 243 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp6_ = res; + _tmp4_ = res; #line 243 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); -#line 245 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = stmt; + _vala_assert (_tmp4_ == SQLITE_OK, "res == Sqlite.OK"); #line 245 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = *id; + _tmp5_ = stmt; #line 245 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = _tmp8_.id; + _tmp6_ = *id; #line 245 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = sqlite3_bind_int64 (_tmp7_, 1, _tmp9_); + _tmp7_ = _tmp6_.id; #line 245 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp10_; + res = sqlite3_bind_int64 (_tmp5_, 1, _tmp7_); #line 246 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = res; + _tmp8_ = res; #line 246 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = stmt; + _tmp9_ = stmt; #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = text; + _tmp10_ = text; #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp11_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = _tmp14_; + _tmp12_ = _tmp11_; #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = search_condition_search_type_to_string (_tmp15_); + _tmp13_ = search_condition_search_type_to_string (_tmp12_); #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = g_free; + _tmp14_ = g_free; #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = sqlite3_bind_text (_tmp12_, 2, _tmp16_, -1, _tmp17_); -#line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp18_; + res = sqlite3_bind_text (_tmp9_, 2, _tmp13_, -1, _tmp14_); #line 249 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = res; + _tmp15_ = res; #line 249 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK"); #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = stmt; + _tmp16_ = stmt; #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = text; + _tmp17_ = text; #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = search_condition_text_get_context (_tmp21_); + _tmp18_ = search_condition_text_get_context (_tmp17_); #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = _tmp22_; + _tmp19_ = _tmp18_; #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = search_condition_text_context_to_string (_tmp23_); + _tmp20_ = search_condition_text_context_to_string (_tmp19_); #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp25_ = g_free; + _tmp21_ = g_free; #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp26_ = sqlite3_bind_text (_tmp20_, 3, _tmp24_, -1, _tmp25_); -#line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp26_; + res = sqlite3_bind_text (_tmp16_, 3, _tmp20_, -1, _tmp21_); #line 252 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_ = res; + _tmp22_ = res; #line 252 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); -#line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp28_ = stmt; + _vala_assert (_tmp22_ == SQLITE_OK, "res == Sqlite.OK"); #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_ = text; + _tmp23_ = stmt; #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp30_ = search_condition_text_get_text (_tmp29_); + _tmp24_ = text; #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp31_ = _tmp30_; + _tmp25_ = search_condition_text_get_text (_tmp24_); #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp32_ = g_strdup (_tmp31_); + _tmp26_ = _tmp25_; #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp33_ = g_free; + _tmp27_ = g_strdup (_tmp26_); #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp34_ = sqlite3_bind_text (_tmp28_, 4, _tmp32_, -1, _tmp33_); + _tmp28_ = g_free; #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp34_; + res = sqlite3_bind_text (_tmp23_, 4, _tmp27_, -1, _tmp28_); #line 255 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp35_ = res; + _tmp29_ = res; #line 255 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp29_ == SQLITE_OK, "res == Sqlite.OK"); #line 257 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp36_ = stmt; + _tmp30_ = stmt; #line 257 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp37_ = sqlite3_step (_tmp36_); -#line 257 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp37_; + res = sqlite3_step (_tmp30_); #line 258 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp38_ = res; + _tmp31_ = res; #line 258 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp38_ != SQLITE_DONE) { -#line 1790 "SavedSearchDBTable.c" - gint _tmp39_; + if (_tmp31_ != SQLITE_DONE) { +#line 1861 "SavedSearchDBTable.c" + gint _tmp32_; #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp39_ = res; + _tmp32_ = res; #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Text.add", _tmp39_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Text.add", _tmp32_, &_inner_error_); #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1804,7 +1875,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (text); #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 1808 "SavedSearchDBTable.c" +#line 1879 "SavedSearchDBTable.c" } else { #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -1816,7 +1887,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved g_clear_error (&_inner_error_); #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 1820 "SavedSearchDBTable.c" +#line 1891 "SavedSearchDBTable.c" } } } @@ -1824,166 +1895,145 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _sqlite3_finalize0 (stmt); #line 237 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (text); -#line 1828 "SavedSearchDBTable.c" +#line 1899 "SavedSearchDBTable.c" } else { - SearchCondition* _tmp40_; #line 260 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp40_ = condition; -#line 260 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, TYPE_SEARCH_CONDITION_MEDIA_TYPE)) { -#line 1835 "SavedSearchDBTable.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_MEDIA_TYPE)) { +#line 1903 "SavedSearchDBTable.c" SearchConditionMediaType* media_type = NULL; - SearchCondition* _tmp41_; - SearchConditionMediaType* _tmp42_; + SearchConditionMediaType* _tmp33_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp43_; - sqlite3_stmt* _tmp44_ = NULL; - gint _tmp45_; - gint _tmp46_; - sqlite3_stmt* _tmp47_; - SavedSearchID _tmp48_; - gint64 _tmp49_; - gint _tmp50_; - gint _tmp51_; - sqlite3_stmt* _tmp52_; - SearchConditionMediaType* _tmp53_; - SearchConditionSearchType _tmp54_; - SearchConditionSearchType _tmp55_; - gchar* _tmp56_; - GDestroyNotify _tmp57_; - gint _tmp58_; - gint _tmp59_; - sqlite3_stmt* _tmp60_; - SearchConditionMediaType* _tmp61_; - SearchConditionMediaTypeContext _tmp62_; - SearchConditionMediaTypeContext _tmp63_; - gchar* _tmp64_; - GDestroyNotify _tmp65_; - gint _tmp66_; - gint _tmp67_; - sqlite3_stmt* _tmp68_; - SearchConditionMediaType* _tmp69_; - SearchConditionMediaTypeMediaType _tmp70_; - SearchConditionMediaTypeMediaType _tmp71_; - gchar* _tmp72_; - GDestroyNotify _tmp73_; - gint _tmp74_; - gint _tmp75_; - sqlite3_stmt* _tmp76_; - gint _tmp77_; - gint _tmp78_; -#line 261 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp41_ = condition; + sqlite3* _tmp34_; + sqlite3_stmt* _tmp35_ = NULL; + gint _tmp36_; + gint _tmp37_; + sqlite3_stmt* _tmp38_; + SavedSearchID _tmp39_; + gint64 _tmp40_; + gint _tmp41_; + sqlite3_stmt* _tmp42_; + SearchConditionMediaType* _tmp43_; + SearchConditionSearchType _tmp44_; + SearchConditionSearchType _tmp45_; + gchar* _tmp46_; + GDestroyNotify _tmp47_; + gint _tmp48_; + sqlite3_stmt* _tmp49_; + SearchConditionMediaType* _tmp50_; + SearchConditionMediaTypeContext _tmp51_; + SearchConditionMediaTypeContext _tmp52_; + gchar* _tmp53_; + GDestroyNotify _tmp54_; + gint _tmp55_; + sqlite3_stmt* _tmp56_; + SearchConditionMediaType* _tmp57_; + SearchConditionMediaTypeMediaType _tmp58_; + SearchConditionMediaTypeMediaType _tmp59_; + gchar* _tmp60_; + GDestroyNotify _tmp61_; + gint _tmp62_; + sqlite3_stmt* _tmp63_; + gint _tmp64_; #line 261 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp42_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, TYPE_SEARCH_CONDITION_MEDIA_TYPE) ? ((SearchConditionMediaType*) _tmp41_) : NULL); + _tmp33_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_MEDIA_TYPE) ? ((SearchConditionMediaType*) condition) : NULL); #line 261 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - media_type = _tmp42_; + media_type = _tmp33_; #line 263 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp43_ = database_table_db; + _tmp34_ = database_table_db; #line 263 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp45_ = sqlite3_prepare_v2 (_tmp43_, "INSERT INTO SavedSearchDBTable_MediaType (search_id, search_type, cont" \ -"ext, " "type) VALUES (?, ?, ?, ?)", -1, &_tmp44_, NULL); + _tmp36_ = sqlite3_prepare_v2 (_tmp34_, "INSERT INTO SavedSearchDBTable_MediaType (search_id, search_type, cont" \ +"ext, " "type) VALUES (?, ?, ?, ?)", -1, &_tmp35_, NULL); #line 263 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 263 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp44_; + stmt = _tmp35_; #line 263 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp45_; + res = _tmp36_; #line 266 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp46_ = res; + _tmp37_ = res; #line 266 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp46_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK"); #line 268 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp47_ = stmt; + _tmp38_ = stmt; #line 268 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp48_ = *id; + _tmp39_ = *id; #line 268 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp49_ = _tmp48_.id; + _tmp40_ = _tmp39_.id; #line 268 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp50_ = sqlite3_bind_int64 (_tmp47_, 1, _tmp49_); -#line 268 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp50_; + res = sqlite3_bind_int64 (_tmp38_, 1, _tmp40_); #line 269 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp51_ = res; + _tmp41_ = res; #line 269 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp51_ == SQLITE_OK, "res == Sqlite.OK"); -#line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp52_ = stmt; + _vala_assert (_tmp41_ == SQLITE_OK, "res == Sqlite.OK"); #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp53_ = media_type; + _tmp42_ = stmt; #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp54_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp43_ = media_type; #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp55_ = _tmp54_; + _tmp44_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp56_ = search_condition_search_type_to_string (_tmp55_); + _tmp45_ = _tmp44_; #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp57_ = g_free; + _tmp46_ = search_condition_search_type_to_string (_tmp45_); #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp58_ = sqlite3_bind_text (_tmp52_, 2, _tmp56_, -1, _tmp57_); + _tmp47_ = g_free; #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp58_; + res = sqlite3_bind_text (_tmp42_, 2, _tmp46_, -1, _tmp47_); #line 272 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp59_ = res; + _tmp48_ = res; #line 272 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp48_ == SQLITE_OK, "res == Sqlite.OK"); #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp60_ = stmt; -#line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp61_ = media_type; + _tmp49_ = stmt; #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp62_ = search_condition_media_type_get_context (_tmp61_); + _tmp50_ = media_type; #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp63_ = _tmp62_; + _tmp51_ = search_condition_media_type_get_context (_tmp50_); #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp64_ = search_condition_media_type_context_to_string (_tmp63_); + _tmp52_ = _tmp51_; #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp65_ = g_free; + _tmp53_ = search_condition_media_type_context_to_string (_tmp52_); #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp66_ = sqlite3_bind_text (_tmp60_, 3, _tmp64_, -1, _tmp65_); + _tmp54_ = g_free; #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp66_; + res = sqlite3_bind_text (_tmp49_, 3, _tmp53_, -1, _tmp54_); #line 275 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp67_ = res; + _tmp55_ = res; #line 275 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp67_ == SQLITE_OK, "res == Sqlite.OK"); -#line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp68_ = stmt; + _vala_assert (_tmp55_ == SQLITE_OK, "res == Sqlite.OK"); #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp69_ = media_type; + _tmp56_ = stmt; #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp70_ = search_condition_media_type_get_media_type (_tmp69_); + _tmp57_ = media_type; #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp71_ = _tmp70_; + _tmp58_ = search_condition_media_type_get_media_type (_tmp57_); #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp72_ = search_condition_media_type_media_type_to_string (_tmp71_); + _tmp59_ = _tmp58_; #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp73_ = g_free; + _tmp60_ = search_condition_media_type_media_type_to_string (_tmp59_); #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp74_ = sqlite3_bind_text (_tmp68_, 4, _tmp72_, -1, _tmp73_); + _tmp61_ = g_free; #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp74_; + res = sqlite3_bind_text (_tmp56_, 4, _tmp60_, -1, _tmp61_); #line 278 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp75_ = res; + _tmp62_ = res; #line 278 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp75_ == SQLITE_OK, "res == Sqlite.OK"); -#line 280 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp76_ = stmt; + _vala_assert (_tmp62_ == SQLITE_OK, "res == Sqlite.OK"); #line 280 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp77_ = sqlite3_step (_tmp76_); + _tmp63_ = stmt; #line 280 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp77_; + res = sqlite3_step (_tmp63_); #line 281 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp78_ = res; + _tmp64_ = res; #line 281 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp78_ != SQLITE_DONE) { -#line 1981 "SavedSearchDBTable.c" - gint _tmp79_; + if (_tmp64_ != SQLITE_DONE) { +#line 2031 "SavedSearchDBTable.c" + gint _tmp65_; #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp79_ = res; + _tmp65_ = res; #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_MediaType.add", _tmp79_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_MediaType.add", _tmp65_, &_inner_error_); #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1996,7 +2046,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (media_type); #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 1999 "SavedSearchDBTable.c" +#line 2049 "SavedSearchDBTable.c" } else { #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -2008,7 +2058,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved g_clear_error (&_inner_error_); #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2011 "SavedSearchDBTable.c" +#line 2061 "SavedSearchDBTable.c" } } } @@ -2016,137 +2066,119 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _sqlite3_finalize0 (stmt); #line 260 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (media_type); -#line 2019 "SavedSearchDBTable.c" +#line 2069 "SavedSearchDBTable.c" } else { - SearchCondition* _tmp80_; -#line 283 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp80_ = condition; #line 283 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp80_, TYPE_SEARCH_CONDITION_FLAGGED)) { -#line 2026 "SavedSearchDBTable.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_FLAGGED)) { +#line 2073 "SavedSearchDBTable.c" SearchConditionFlagged* flag_state = NULL; - SearchCondition* _tmp81_; - SearchConditionFlagged* _tmp82_; + SearchConditionFlagged* _tmp66_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp83_; - sqlite3_stmt* _tmp84_ = NULL; - gint _tmp85_; - gint _tmp86_; - sqlite3_stmt* _tmp87_; - SavedSearchID _tmp88_; - gint64 _tmp89_; + sqlite3* _tmp67_; + sqlite3_stmt* _tmp68_ = NULL; + gint _tmp69_; + gint _tmp70_; + sqlite3_stmt* _tmp71_; + SavedSearchID _tmp72_; + gint64 _tmp73_; + gint _tmp74_; + sqlite3_stmt* _tmp75_; + SearchConditionFlagged* _tmp76_; + SearchConditionSearchType _tmp77_; + SearchConditionSearchType _tmp78_; + gchar* _tmp79_; + GDestroyNotify _tmp80_; + gint _tmp81_; + sqlite3_stmt* _tmp82_; + SearchConditionFlagged* _tmp83_; + SearchConditionFlaggedState _tmp84_; + SearchConditionFlaggedState _tmp85_; + gchar* _tmp86_; + GDestroyNotify _tmp87_; + gint _tmp88_; + sqlite3_stmt* _tmp89_; gint _tmp90_; - gint _tmp91_; - sqlite3_stmt* _tmp92_; - SearchConditionFlagged* _tmp93_; - SearchConditionSearchType _tmp94_; - SearchConditionSearchType _tmp95_; - gchar* _tmp96_; - GDestroyNotify _tmp97_; - gint _tmp98_; - gint _tmp99_; - sqlite3_stmt* _tmp100_; - SearchConditionFlagged* _tmp101_; - SearchConditionFlaggedState _tmp102_; - SearchConditionFlaggedState _tmp103_; - gchar* _tmp104_; - GDestroyNotify _tmp105_; - gint _tmp106_; - gint _tmp107_; - sqlite3_stmt* _tmp108_; - gint _tmp109_; - gint _tmp110_; -#line 284 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp81_ = condition; #line 284 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp82_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp81_, TYPE_SEARCH_CONDITION_FLAGGED) ? ((SearchConditionFlagged*) _tmp81_) : NULL); + _tmp66_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_FLAGGED) ? ((SearchConditionFlagged*) condition) : NULL); #line 284 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - flag_state = _tmp82_; + flag_state = _tmp66_; #line 286 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp83_ = database_table_db; + _tmp67_ = database_table_db; #line 286 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp85_ = sqlite3_prepare_v2 (_tmp83_, "INSERT INTO SavedSearchDBTable_Flagged (search_id, search_type, " "flag_state) VALUES (?, ?, ?)", -1, &_tmp84_, NULL); + _tmp69_ = sqlite3_prepare_v2 (_tmp67_, "INSERT INTO SavedSearchDBTable_Flagged (search_id, search_type, " "flag_state) VALUES (?, ?, ?)", -1, &_tmp68_, NULL); #line 286 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 286 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp84_; + stmt = _tmp68_; #line 286 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp85_; + res = _tmp69_; #line 289 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp86_ = res; + _tmp70_ = res; #line 289 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp86_ == SQLITE_OK, "res == Sqlite.OK"); -#line 291 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp87_ = stmt; + _vala_assert (_tmp70_ == SQLITE_OK, "res == Sqlite.OK"); #line 291 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp88_ = *id; + _tmp71_ = stmt; #line 291 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp89_ = _tmp88_.id; + _tmp72_ = *id; #line 291 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp90_ = sqlite3_bind_int64 (_tmp87_, 1, _tmp89_); + _tmp73_ = _tmp72_.id; #line 291 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp90_; + res = sqlite3_bind_int64 (_tmp71_, 1, _tmp73_); #line 292 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp91_ = res; + _tmp74_ = res; #line 292 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp91_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp74_ == SQLITE_OK, "res == Sqlite.OK"); #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp92_ = stmt; + _tmp75_ = stmt; #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp93_ = flag_state; + _tmp76_ = flag_state; #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp94_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp77_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp95_ = _tmp94_; + _tmp78_ = _tmp77_; #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp96_ = search_condition_search_type_to_string (_tmp95_); + _tmp79_ = search_condition_search_type_to_string (_tmp78_); #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp97_ = g_free; + _tmp80_ = g_free; #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp98_ = sqlite3_bind_text (_tmp92_, 2, _tmp96_, -1, _tmp97_); -#line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp98_; + res = sqlite3_bind_text (_tmp75_, 2, _tmp79_, -1, _tmp80_); #line 295 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp99_ = res; + _tmp81_ = res; #line 295 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp99_ == SQLITE_OK, "res == Sqlite.OK"); -#line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp100_ = stmt; + _vala_assert (_tmp81_ == SQLITE_OK, "res == Sqlite.OK"); #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp101_ = flag_state; + _tmp82_ = stmt; #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp102_ = search_condition_flagged_get_state (_tmp101_); + _tmp83_ = flag_state; #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp103_ = _tmp102_; + _tmp84_ = search_condition_flagged_get_state (_tmp83_); #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp104_ = search_condition_flagged_state_to_string (_tmp103_); + _tmp85_ = _tmp84_; #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp105_ = g_free; + _tmp86_ = search_condition_flagged_state_to_string (_tmp85_); #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp106_ = sqlite3_bind_text (_tmp100_, 3, _tmp104_, -1, _tmp105_); + _tmp87_ = g_free; #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp106_; + res = sqlite3_bind_text (_tmp82_, 3, _tmp86_, -1, _tmp87_); #line 298 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp107_ = res; + _tmp88_ = res; #line 298 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp107_ == SQLITE_OK, "res == Sqlite.OK"); -#line 300 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp108_ = stmt; + _vala_assert (_tmp88_ == SQLITE_OK, "res == Sqlite.OK"); #line 300 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp109_ = sqlite3_step (_tmp108_); + _tmp89_ = stmt; #line 300 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp109_; + res = sqlite3_step (_tmp89_); #line 301 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp110_ = res; + _tmp90_ = res; #line 301 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp110_ != SQLITE_DONE) { -#line 2144 "SavedSearchDBTable.c" - gint _tmp111_; + if (_tmp90_ != SQLITE_DONE) { +#line 2176 "SavedSearchDBTable.c" + gint _tmp91_; #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp111_ = res; + _tmp91_ = res; #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Flagged.add", _tmp111_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Flagged.add", _tmp91_, &_inner_error_); #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2159,7 +2191,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (flag_state); #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2162 "SavedSearchDBTable.c" +#line 2194 "SavedSearchDBTable.c" } else { #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -2171,7 +2203,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved g_clear_error (&_inner_error_); #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2174 "SavedSearchDBTable.c" +#line 2206 "SavedSearchDBTable.c" } } } @@ -2179,166 +2211,145 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _sqlite3_finalize0 (stmt); #line 283 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (flag_state); -#line 2182 "SavedSearchDBTable.c" +#line 2214 "SavedSearchDBTable.c" } else { - SearchCondition* _tmp112_; #line 303 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp112_ = condition; -#line 303 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp112_, TYPE_SEARCH_CONDITION_MODIFIED)) { -#line 2189 "SavedSearchDBTable.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_MODIFIED)) { +#line 2218 "SavedSearchDBTable.c" SearchConditionModified* modified_state = NULL; - SearchCondition* _tmp113_; - SearchConditionModified* _tmp114_; + SearchConditionModified* _tmp92_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp115_; - sqlite3_stmt* _tmp116_ = NULL; - gint _tmp117_; - gint _tmp118_; - sqlite3_stmt* _tmp119_; - SavedSearchID _tmp120_; - gint64 _tmp121_; - gint _tmp122_; + sqlite3* _tmp93_; + sqlite3_stmt* _tmp94_ = NULL; + gint _tmp95_; + gint _tmp96_; + sqlite3_stmt* _tmp97_; + SavedSearchID _tmp98_; + gint64 _tmp99_; + gint _tmp100_; + sqlite3_stmt* _tmp101_; + SearchConditionModified* _tmp102_; + SearchConditionSearchType _tmp103_; + SearchConditionSearchType _tmp104_; + gchar* _tmp105_; + GDestroyNotify _tmp106_; + gint _tmp107_; + sqlite3_stmt* _tmp108_; + SearchConditionModified* _tmp109_; + SearchConditionModifiedContext _tmp110_; + SearchConditionModifiedContext _tmp111_; + gchar* _tmp112_; + GDestroyNotify _tmp113_; + gint _tmp114_; + sqlite3_stmt* _tmp115_; + SearchConditionModified* _tmp116_; + SearchConditionModifiedState _tmp117_; + SearchConditionModifiedState _tmp118_; + gchar* _tmp119_; + GDestroyNotify _tmp120_; + gint _tmp121_; + sqlite3_stmt* _tmp122_; gint _tmp123_; - sqlite3_stmt* _tmp124_; - SearchConditionModified* _tmp125_; - SearchConditionSearchType _tmp126_; - SearchConditionSearchType _tmp127_; - gchar* _tmp128_; - GDestroyNotify _tmp129_; - gint _tmp130_; - gint _tmp131_; - sqlite3_stmt* _tmp132_; - SearchConditionModified* _tmp133_; - SearchConditionModifiedContext _tmp134_; - SearchConditionModifiedContext _tmp135_; - gchar* _tmp136_; - GDestroyNotify _tmp137_; - gint _tmp138_; - gint _tmp139_; - sqlite3_stmt* _tmp140_; - SearchConditionModified* _tmp141_; - SearchConditionModifiedState _tmp142_; - SearchConditionModifiedState _tmp143_; - gchar* _tmp144_; - GDestroyNotify _tmp145_; - gint _tmp146_; - gint _tmp147_; - sqlite3_stmt* _tmp148_; - gint _tmp149_; - gint _tmp150_; -#line 304 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp113_ = condition; #line 304 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp114_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp113_, TYPE_SEARCH_CONDITION_MODIFIED) ? ((SearchConditionModified*) _tmp113_) : NULL); + _tmp92_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_MODIFIED) ? ((SearchConditionModified*) condition) : NULL); #line 304 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - modified_state = _tmp114_; + modified_state = _tmp92_; #line 306 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp115_ = database_table_db; + _tmp93_ = database_table_db; #line 306 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp117_ = sqlite3_prepare_v2 (_tmp115_, "INSERT INTO SavedSearchDBTable_Modified (search_id, search_type, conte" \ -"xt, " "modified_state) VALUES (?, ?, ?, ?)", -1, &_tmp116_, NULL); + _tmp95_ = sqlite3_prepare_v2 (_tmp93_, "INSERT INTO SavedSearchDBTable_Modified (search_id, search_type, conte" \ +"xt, " "modified_state) VALUES (?, ?, ?, ?)", -1, &_tmp94_, NULL); #line 306 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 306 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp116_; + stmt = _tmp94_; #line 306 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp117_; + res = _tmp95_; #line 309 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp118_ = res; + _tmp96_ = res; #line 309 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp118_ == SQLITE_OK, "res == Sqlite.OK"); -#line 311 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp119_ = stmt; + _vala_assert (_tmp96_ == SQLITE_OK, "res == Sqlite.OK"); #line 311 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp120_ = *id; + _tmp97_ = stmt; #line 311 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp121_ = _tmp120_.id; + _tmp98_ = *id; #line 311 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp122_ = sqlite3_bind_int64 (_tmp119_, 1, _tmp121_); + _tmp99_ = _tmp98_.id; #line 311 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp122_; + res = sqlite3_bind_int64 (_tmp97_, 1, _tmp99_); #line 312 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp123_ = res; + _tmp100_ = res; #line 312 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp123_ == SQLITE_OK, "res == Sqlite.OK"); -#line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp124_ = stmt; + _vala_assert (_tmp100_ == SQLITE_OK, "res == Sqlite.OK"); #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp125_ = modified_state; + _tmp101_ = stmt; #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp126_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp102_ = modified_state; #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp127_ = _tmp126_; + _tmp103_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp128_ = search_condition_search_type_to_string (_tmp127_); + _tmp104_ = _tmp103_; #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp129_ = g_free; + _tmp105_ = search_condition_search_type_to_string (_tmp104_); #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp130_ = sqlite3_bind_text (_tmp124_, 2, _tmp128_, -1, _tmp129_); + _tmp106_ = g_free; #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp130_; + res = sqlite3_bind_text (_tmp101_, 2, _tmp105_, -1, _tmp106_); #line 315 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp131_ = res; + _tmp107_ = res; #line 315 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp131_ == SQLITE_OK, "res == Sqlite.OK"); -#line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp132_ = stmt; + _vala_assert (_tmp107_ == SQLITE_OK, "res == Sqlite.OK"); #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp133_ = modified_state; + _tmp108_ = stmt; #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp134_ = search_condition_modified_get_context (_tmp133_); + _tmp109_ = modified_state; #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp135_ = _tmp134_; + _tmp110_ = search_condition_modified_get_context (_tmp109_); #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp136_ = search_condition_modified_context_to_string (_tmp135_); + _tmp111_ = _tmp110_; #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp137_ = g_free; + _tmp112_ = search_condition_modified_context_to_string (_tmp111_); #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp138_ = sqlite3_bind_text (_tmp132_, 3, _tmp136_, -1, _tmp137_); + _tmp113_ = g_free; #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp138_; + res = sqlite3_bind_text (_tmp108_, 3, _tmp112_, -1, _tmp113_); #line 318 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp139_ = res; + _tmp114_ = res; #line 318 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp139_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp114_ == SQLITE_OK, "res == Sqlite.OK"); #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp140_ = stmt; + _tmp115_ = stmt; #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp141_ = modified_state; + _tmp116_ = modified_state; #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp142_ = search_condition_modified_get_state (_tmp141_); + _tmp117_ = search_condition_modified_get_state (_tmp116_); #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp143_ = _tmp142_; + _tmp118_ = _tmp117_; #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp144_ = search_condition_modified_state_to_string (_tmp143_); + _tmp119_ = search_condition_modified_state_to_string (_tmp118_); #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp145_ = g_free; + _tmp120_ = g_free; #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp146_ = sqlite3_bind_text (_tmp140_, 4, _tmp144_, -1, _tmp145_); -#line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp146_; + res = sqlite3_bind_text (_tmp115_, 4, _tmp119_, -1, _tmp120_); #line 321 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp147_ = res; + _tmp121_ = res; #line 321 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp147_ == SQLITE_OK, "res == Sqlite.OK"); -#line 323 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp148_ = stmt; + _vala_assert (_tmp121_ == SQLITE_OK, "res == Sqlite.OK"); #line 323 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp149_ = sqlite3_step (_tmp148_); + _tmp122_ = stmt; #line 323 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp149_; + res = sqlite3_step (_tmp122_); #line 324 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp150_ = res; + _tmp123_ = res; #line 324 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp150_ != SQLITE_DONE) { -#line 2335 "SavedSearchDBTable.c" - gint _tmp151_; + if (_tmp123_ != SQLITE_DONE) { +#line 2346 "SavedSearchDBTable.c" + gint _tmp124_; #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp151_ = res; + _tmp124_ = res; #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Modified.add", _tmp151_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Modified.add", _tmp124_, &_inner_error_); #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2351,7 +2362,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (modified_state); #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2353 "SavedSearchDBTable.c" +#line 2364 "SavedSearchDBTable.c" } else { #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -2363,7 +2374,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved g_clear_error (&_inner_error_); #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2365 "SavedSearchDBTable.c" +#line 2376 "SavedSearchDBTable.c" } } } @@ -2371,163 +2382,139 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _sqlite3_finalize0 (stmt); #line 303 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (modified_state); -#line 2373 "SavedSearchDBTable.c" +#line 2384 "SavedSearchDBTable.c" } else { - SearchCondition* _tmp152_; #line 326 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp152_ = condition; -#line 326 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp152_, TYPE_SEARCH_CONDITION_RATING)) { -#line 2380 "SavedSearchDBTable.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_RATING)) { +#line 2388 "SavedSearchDBTable.c" SearchConditionRating* rating = NULL; - SearchCondition* _tmp153_; - SearchConditionRating* _tmp154_; + SearchConditionRating* _tmp125_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp155_; - sqlite3_stmt* _tmp156_ = NULL; - gint _tmp157_; - gint _tmp158_; - sqlite3_stmt* _tmp159_; - SavedSearchID _tmp160_; - gint64 _tmp161_; - gint _tmp162_; - gint _tmp163_; - sqlite3_stmt* _tmp164_; - SearchConditionRating* _tmp165_; - SearchConditionSearchType _tmp166_; - SearchConditionSearchType _tmp167_; - gchar* _tmp168_; - GDestroyNotify _tmp169_; - gint _tmp170_; - gint _tmp171_; - sqlite3_stmt* _tmp172_; - SearchConditionRating* _tmp173_; - Rating _tmp174_; - Rating _tmp175_; - gint _tmp176_; - gint _tmp177_; - gint _tmp178_; - sqlite3_stmt* _tmp179_; - SearchConditionRating* _tmp180_; - SearchConditionRatingContext _tmp181_; - SearchConditionRatingContext _tmp182_; - gchar* _tmp183_; - GDestroyNotify _tmp184_; - gint _tmp185_; - gint _tmp186_; - sqlite3_stmt* _tmp187_; - gint _tmp188_; - gint _tmp189_; -#line 327 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp153_ = condition; + sqlite3* _tmp126_; + sqlite3_stmt* _tmp127_ = NULL; + gint _tmp128_; + gint _tmp129_; + sqlite3_stmt* _tmp130_; + SavedSearchID _tmp131_; + gint64 _tmp132_; + gint _tmp133_; + sqlite3_stmt* _tmp134_; + SearchConditionRating* _tmp135_; + SearchConditionSearchType _tmp136_; + SearchConditionSearchType _tmp137_; + gchar* _tmp138_; + GDestroyNotify _tmp139_; + gint _tmp140_; + sqlite3_stmt* _tmp141_; + SearchConditionRating* _tmp142_; + Rating _tmp143_; + Rating _tmp144_; + gint _tmp145_; + sqlite3_stmt* _tmp146_; + SearchConditionRating* _tmp147_; + SearchConditionRatingContext _tmp148_; + SearchConditionRatingContext _tmp149_; + gchar* _tmp150_; + GDestroyNotify _tmp151_; + gint _tmp152_; + sqlite3_stmt* _tmp153_; + gint _tmp154_; #line 327 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp154_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp153_, TYPE_SEARCH_CONDITION_RATING) ? ((SearchConditionRating*) _tmp153_) : NULL); + _tmp125_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_RATING) ? ((SearchConditionRating*) condition) : NULL); #line 327 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - rating = _tmp154_; + rating = _tmp125_; #line 329 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp155_ = database_table_db; + _tmp126_ = database_table_db; #line 329 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp157_ = sqlite3_prepare_v2 (_tmp155_, "INSERT INTO SavedSearchDBTable_Rating (search_id, search_type, rating," \ -" " "context) VALUES (?, ?, ?, ?)", -1, &_tmp156_, NULL); + _tmp128_ = sqlite3_prepare_v2 (_tmp126_, "INSERT INTO SavedSearchDBTable_Rating (search_id, search_type, rating," \ +" " "context) VALUES (?, ?, ?, ?)", -1, &_tmp127_, NULL); #line 329 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 329 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp156_; + stmt = _tmp127_; #line 329 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp157_; + res = _tmp128_; #line 332 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp158_ = res; + _tmp129_ = res; #line 332 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp158_ == SQLITE_OK, "res == Sqlite.OK"); -#line 334 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp159_ = stmt; + _vala_assert (_tmp129_ == SQLITE_OK, "res == Sqlite.OK"); #line 334 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp160_ = *id; + _tmp130_ = stmt; #line 334 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp161_ = _tmp160_.id; + _tmp131_ = *id; #line 334 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp162_ = sqlite3_bind_int64 (_tmp159_, 1, _tmp161_); + _tmp132_ = _tmp131_.id; #line 334 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp162_; + res = sqlite3_bind_int64 (_tmp130_, 1, _tmp132_); #line 335 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp163_ = res; + _tmp133_ = res; #line 335 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp163_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp133_ == SQLITE_OK, "res == Sqlite.OK"); #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp164_ = stmt; + _tmp134_ = stmt; #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp165_ = rating; + _tmp135_ = rating; #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp166_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp165_, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp136_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp167_ = _tmp166_; + _tmp137_ = _tmp136_; #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp168_ = search_condition_search_type_to_string (_tmp167_); + _tmp138_ = search_condition_search_type_to_string (_tmp137_); #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp169_ = g_free; + _tmp139_ = g_free; #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp170_ = sqlite3_bind_text (_tmp164_, 2, _tmp168_, -1, _tmp169_); -#line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp170_; + res = sqlite3_bind_text (_tmp134_, 2, _tmp138_, -1, _tmp139_); #line 338 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp171_ = res; + _tmp140_ = res; #line 338 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp171_ == SQLITE_OK, "res == Sqlite.OK"); -#line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp172_ = stmt; -#line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp173_ = rating; + _vala_assert (_tmp140_ == SQLITE_OK, "res == Sqlite.OK"); #line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp174_ = search_condition_rating_get_rating (_tmp173_); + _tmp141_ = stmt; #line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp175_ = _tmp174_; + _tmp142_ = rating; #line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp176_ = rating_serialize (_tmp175_); + _tmp143_ = search_condition_rating_get_rating (_tmp142_); #line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp177_ = sqlite3_bind_int (_tmp172_, 3, _tmp176_); + _tmp144_ = _tmp143_; #line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp177_; + res = sqlite3_bind_int (_tmp141_, 3, rating_serialize (_tmp144_)); #line 341 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp178_ = res; + _tmp145_ = res; #line 341 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp178_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp145_ == SQLITE_OK, "res == Sqlite.OK"); #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp179_ = stmt; + _tmp146_ = stmt; #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp180_ = rating; + _tmp147_ = rating; #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp181_ = search_condition_rating_get_context (_tmp180_); + _tmp148_ = search_condition_rating_get_context (_tmp147_); #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp182_ = _tmp181_; + _tmp149_ = _tmp148_; #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp183_ = search_condition_rating_context_to_string (_tmp182_); + _tmp150_ = search_condition_rating_context_to_string (_tmp149_); #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp184_ = g_free; + _tmp151_ = g_free; #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp185_ = sqlite3_bind_text (_tmp179_, 4, _tmp183_, -1, _tmp184_); -#line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp185_; + res = sqlite3_bind_text (_tmp146_, 4, _tmp150_, -1, _tmp151_); #line 344 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp186_ = res; + _tmp152_ = res; #line 344 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp186_ == SQLITE_OK, "res == Sqlite.OK"); -#line 346 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp187_ = stmt; + _vala_assert (_tmp152_ == SQLITE_OK, "res == Sqlite.OK"); #line 346 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp188_ = sqlite3_step (_tmp187_); + _tmp153_ = stmt; #line 346 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp188_; + res = sqlite3_step (_tmp153_); #line 347 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp189_ = res; + _tmp154_ = res; #line 347 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp189_ != SQLITE_DONE) { -#line 2523 "SavedSearchDBTable.c" - gint _tmp190_; + if (_tmp154_ != SQLITE_DONE) { +#line 2510 "SavedSearchDBTable.c" + gint _tmp155_; #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp190_ = res; + _tmp155_ = res; #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Rating.add", _tmp190_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Rating.add", _tmp155_, &_inner_error_); #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2540,7 +2527,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (rating); #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2541 "SavedSearchDBTable.c" +#line 2528 "SavedSearchDBTable.c" } else { #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -2552,7 +2539,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved g_clear_error (&_inner_error_); #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2553 "SavedSearchDBTable.c" +#line 2540 "SavedSearchDBTable.c" } } } @@ -2560,187 +2547,157 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _sqlite3_finalize0 (stmt); #line 326 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (rating); -#line 2561 "SavedSearchDBTable.c" +#line 2548 "SavedSearchDBTable.c" } else { - SearchCondition* _tmp191_; #line 349 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp191_ = condition; -#line 349 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp191_, TYPE_SEARCH_CONDITION_DATE)) { -#line 2568 "SavedSearchDBTable.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_DATE)) { +#line 2552 "SavedSearchDBTable.c" SearchConditionDate* date = NULL; - SearchCondition* _tmp192_; - SearchConditionDate* _tmp193_; + SearchConditionDate* _tmp156_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp194_; - sqlite3_stmt* _tmp195_ = NULL; - gint _tmp196_; - gint _tmp197_; - sqlite3_stmt* _tmp198_; - SavedSearchID _tmp199_; - gint64 _tmp200_; - gint _tmp201_; - gint _tmp202_; - sqlite3_stmt* _tmp203_; - SearchConditionDate* _tmp204_; - SearchConditionSearchType _tmp205_; - SearchConditionSearchType _tmp206_; - gchar* _tmp207_; - GDestroyNotify _tmp208_; - gint _tmp209_; - gint _tmp210_; - sqlite3_stmt* _tmp211_; - SearchConditionDate* _tmp212_; - SearchConditionDateContext _tmp213_; - SearchConditionDateContext _tmp214_; - gchar* _tmp215_; - GDestroyNotify _tmp216_; - gint _tmp217_; - gint _tmp218_; - sqlite3_stmt* _tmp219_; - SearchConditionDate* _tmp220_; - GDateTime* _tmp221_; - GDateTime* _tmp222_; - gint64 _tmp223_; - gint _tmp224_; - gint _tmp225_; - sqlite3_stmt* _tmp226_; - SearchConditionDate* _tmp227_; - GDateTime* _tmp228_; - GDateTime* _tmp229_; - gint64 _tmp230_; - gint _tmp231_; - gint _tmp232_; - sqlite3_stmt* _tmp233_; - gint _tmp234_; - gint _tmp235_; -#line 350 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp192_ = condition; + sqlite3* _tmp157_; + sqlite3_stmt* _tmp158_ = NULL; + gint _tmp159_; + gint _tmp160_; + sqlite3_stmt* _tmp161_; + SavedSearchID _tmp162_; + gint64 _tmp163_; + gint _tmp164_; + sqlite3_stmt* _tmp165_; + SearchConditionDate* _tmp166_; + SearchConditionSearchType _tmp167_; + SearchConditionSearchType _tmp168_; + gchar* _tmp169_; + GDestroyNotify _tmp170_; + gint _tmp171_; + sqlite3_stmt* _tmp172_; + SearchConditionDate* _tmp173_; + SearchConditionDateContext _tmp174_; + SearchConditionDateContext _tmp175_; + gchar* _tmp176_; + GDestroyNotify _tmp177_; + gint _tmp178_; + sqlite3_stmt* _tmp179_; + SearchConditionDate* _tmp180_; + GDateTime* _tmp181_; + GDateTime* _tmp182_; + gint _tmp183_; + sqlite3_stmt* _tmp184_; + SearchConditionDate* _tmp185_; + GDateTime* _tmp186_; + GDateTime* _tmp187_; + gint _tmp188_; + sqlite3_stmt* _tmp189_; + gint _tmp190_; #line 350 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp193_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp192_, TYPE_SEARCH_CONDITION_DATE) ? ((SearchConditionDate*) _tmp192_) : NULL); + _tmp156_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_DATE) ? ((SearchConditionDate*) condition) : NULL); #line 350 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - date = _tmp193_; + date = _tmp156_; #line 352 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp194_ = database_table_db; + _tmp157_ = database_table_db; #line 352 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp196_ = sqlite3_prepare_v2 (_tmp194_, "INSERT INTO SavedSearchDBTable_Date (search_id, search_type, " "context, date_one, date_two) VALUES (?, ?, ?, ?, ?)", -1, &_tmp195_, NULL); + _tmp159_ = sqlite3_prepare_v2 (_tmp157_, "INSERT INTO SavedSearchDBTable_Date (search_id, search_type, " "context, date_one, date_two) VALUES (?, ?, ?, ?, ?)", -1, &_tmp158_, NULL); #line 352 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 352 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp195_; + stmt = _tmp158_; #line 352 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp196_; + res = _tmp159_; #line 355 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp197_ = res; + _tmp160_ = res; #line 355 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp197_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp160_ == SQLITE_OK, "res == Sqlite.OK"); #line 357 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp198_ = stmt; + _tmp161_ = stmt; #line 357 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp199_ = *id; + _tmp162_ = *id; #line 357 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp200_ = _tmp199_.id; + _tmp163_ = _tmp162_.id; #line 357 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp201_ = sqlite3_bind_int64 (_tmp198_, 1, _tmp200_); -#line 357 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp201_; + res = sqlite3_bind_int64 (_tmp161_, 1, _tmp163_); #line 358 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp202_ = res; + _tmp164_ = res; #line 358 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp202_ == SQLITE_OK, "res == Sqlite.OK"); -#line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp203_ = stmt; + _vala_assert (_tmp164_ == SQLITE_OK, "res == Sqlite.OK"); #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp204_ = date; + _tmp165_ = stmt; #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp205_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp204_, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp166_ = date; #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp206_ = _tmp205_; + _tmp167_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp166_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp207_ = search_condition_search_type_to_string (_tmp206_); + _tmp168_ = _tmp167_; #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp208_ = g_free; + _tmp169_ = search_condition_search_type_to_string (_tmp168_); #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp209_ = sqlite3_bind_text (_tmp203_, 2, _tmp207_, -1, _tmp208_); + _tmp170_ = g_free; #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp209_; + res = sqlite3_bind_text (_tmp165_, 2, _tmp169_, -1, _tmp170_); #line 361 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp210_ = res; + _tmp171_ = res; #line 361 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp210_ == SQLITE_OK, "res == Sqlite.OK"); -#line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp211_ = stmt; + _vala_assert (_tmp171_ == SQLITE_OK, "res == Sqlite.OK"); #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp212_ = date; + _tmp172_ = stmt; #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp213_ = search_condition_date_get_context (_tmp212_); + _tmp173_ = date; #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp214_ = _tmp213_; + _tmp174_ = search_condition_date_get_context (_tmp173_); #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp215_ = search_condition_date_context_to_string (_tmp214_); + _tmp175_ = _tmp174_; #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp216_ = g_free; + _tmp176_ = search_condition_date_context_to_string (_tmp175_); #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp217_ = sqlite3_bind_text (_tmp211_, 3, _tmp215_, -1, _tmp216_); + _tmp177_ = g_free; #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp217_; + res = sqlite3_bind_text (_tmp172_, 3, _tmp176_, -1, _tmp177_); #line 364 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp218_ = res; + _tmp178_ = res; #line 364 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp218_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp178_ == SQLITE_OK, "res == Sqlite.OK"); #line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp219_ = stmt; + _tmp179_ = stmt; #line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp220_ = date; + _tmp180_ = date; #line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp221_ = search_condition_date_get_date_one (_tmp220_); + _tmp181_ = search_condition_date_get_date_one (_tmp180_); #line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp222_ = _tmp221_; + _tmp182_ = _tmp181_; #line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp223_ = g_date_time_to_unix (_tmp222_); -#line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp224_ = sqlite3_bind_int64 (_tmp219_, 4, _tmp223_); -#line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp224_; + res = sqlite3_bind_int64 (_tmp179_, 4, g_date_time_to_unix (_tmp182_)); #line 367 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp225_ = res; + _tmp183_ = res; #line 367 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp225_ == SQLITE_OK, "res == Sqlite.OK"); -#line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp226_ = stmt; + _vala_assert (_tmp183_ == SQLITE_OK, "res == Sqlite.OK"); #line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp227_ = date; + _tmp184_ = stmt; #line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp228_ = search_condition_date_get_date_two (_tmp227_); + _tmp185_ = date; #line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp229_ = _tmp228_; + _tmp186_ = search_condition_date_get_date_two (_tmp185_); #line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp230_ = g_date_time_to_unix (_tmp229_); + _tmp187_ = _tmp186_; #line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp231_ = sqlite3_bind_int64 (_tmp226_, 5, _tmp230_); -#line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp231_; + res = sqlite3_bind_int64 (_tmp184_, 5, g_date_time_to_unix (_tmp187_)); #line 370 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp232_ = res; + _tmp188_ = res; #line 370 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp232_ == SQLITE_OK, "res == Sqlite.OK"); -#line 372 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp233_ = stmt; + _vala_assert (_tmp188_ == SQLITE_OK, "res == Sqlite.OK"); #line 372 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp234_ = sqlite3_step (_tmp233_); + _tmp189_ = stmt; #line 372 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp234_; + res = sqlite3_step (_tmp189_); #line 373 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp235_ = res; + _tmp190_ = res; #line 373 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp235_ != SQLITE_DONE) { -#line 2736 "SavedSearchDBTable.c" - gint _tmp236_; + if (_tmp190_ != SQLITE_DONE) { +#line 2693 "SavedSearchDBTable.c" + gint _tmp191_; #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp236_ = res; + _tmp191_ = res; #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Date.add", _tmp236_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Date.add", _tmp191_, &_inner_error_); #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2753,7 +2710,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (date); #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2754 "SavedSearchDBTable.c" +#line 2711 "SavedSearchDBTable.c" } else { #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -2765,7 +2722,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved g_clear_error (&_inner_error_); #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2766 "SavedSearchDBTable.c" +#line 2723 "SavedSearchDBTable.c" } } } @@ -2773,11 +2730,11 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _sqlite3_finalize0 (stmt); #line 349 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (date); -#line 2774 "SavedSearchDBTable.c" +#line 2731 "SavedSearchDBTable.c" } else { #line 376 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_assert_not_reached (); -#line 2778 "SavedSearchDBTable.c" +#line 2735 "SavedSearchDBTable.c" } } } @@ -2787,7 +2744,11 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved } -static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) { +static void +saved_search_db_table_remove_conditions_for_search_id (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error) +{ SavedSearchID _tmp0_; SavedSearchID _tmp1_; SavedSearchID _tmp2_; @@ -2811,7 +2772,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_propagate_error (error, _inner_error_); #line 382 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2812 "SavedSearchDBTable.c" +#line 2773 "SavedSearchDBTable.c" } else { #line 382 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2819,7 +2780,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_clear_error (&_inner_error_); #line 382 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2820 "SavedSearchDBTable.c" +#line 2781 "SavedSearchDBTable.c" } } #line 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2834,7 +2795,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_propagate_error (error, _inner_error_); #line 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2835 "SavedSearchDBTable.c" +#line 2796 "SavedSearchDBTable.c" } else { #line 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2842,7 +2803,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_clear_error (&_inner_error_); #line 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2843 "SavedSearchDBTable.c" +#line 2804 "SavedSearchDBTable.c" } } #line 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2857,7 +2818,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_propagate_error (error, _inner_error_); #line 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2858 "SavedSearchDBTable.c" +#line 2819 "SavedSearchDBTable.c" } else { #line 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2865,7 +2826,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_clear_error (&_inner_error_); #line 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2866 "SavedSearchDBTable.c" +#line 2827 "SavedSearchDBTable.c" } } #line 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2880,7 +2841,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_propagate_error (error, _inner_error_); #line 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2881 "SavedSearchDBTable.c" +#line 2842 "SavedSearchDBTable.c" } else { #line 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2888,7 +2849,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_clear_error (&_inner_error_); #line 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2889 "SavedSearchDBTable.c" +#line 2850 "SavedSearchDBTable.c" } } #line 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2903,7 +2864,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_propagate_error (error, _inner_error_); #line 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2904 "SavedSearchDBTable.c" +#line 2865 "SavedSearchDBTable.c" } else { #line 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2911,7 +2872,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_clear_error (&_inner_error_); #line 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2912 "SavedSearchDBTable.c" +#line 2873 "SavedSearchDBTable.c" } } #line 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2926,7 +2887,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_propagate_error (error, _inner_error_); #line 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2927 "SavedSearchDBTable.c" +#line 2888 "SavedSearchDBTable.c" } else { #line 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2934,31 +2895,33 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_clear_error (&_inner_error_); #line 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2935 "SavedSearchDBTable.c" +#line 2896 "SavedSearchDBTable.c" } } } -static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTable* self, const gchar* table_name, SavedSearchID* search_id, GError** error) { +static void +saved_search_db_table_remove_conditions_for_table (SavedSearchDBTable* self, + const gchar* table_name, + SavedSearchID* search_id, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; - const gchar* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; - sqlite3_stmt* _tmp4_ = NULL; + sqlite3_stmt* _tmp3_ = NULL; + gint _tmp4_; gint _tmp5_; gint _tmp6_; - gint _tmp7_; - sqlite3_stmt* _tmp8_; - SavedSearchID _tmp9_; - gint64 _tmp10_; - gint _tmp11_; + sqlite3_stmt* _tmp7_; + SavedSearchID _tmp8_; + gint64 _tmp9_; + gint _tmp10_; + sqlite3_stmt* _tmp11_; gint _tmp12_; - sqlite3_stmt* _tmp13_; - gint _tmp14_; - gint _tmp15_; GError * _inner_error_ = NULL; #line 390 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self)); @@ -2969,68 +2932,59 @@ static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTabl #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp0_ = database_table_db; #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp1_ = table_name; -#line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp2_ = g_strdup_printf ("DELETE FROM %s WHERE search_id=?", _tmp1_); + _tmp1_ = g_strdup_printf ("DELETE FROM %s WHERE search_id=?", table_name); #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp5_ = sqlite3_prepare_v2 (_tmp0_, _tmp3_, -1, &_tmp4_, NULL); + _tmp4_ = sqlite3_prepare_v2 (_tmp0_, _tmp2_, -1, &_tmp3_, NULL); #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp4_; + stmt = _tmp3_; #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp6_; + res = _tmp5_; #line 394 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 394 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); #line 396 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = stmt; -#line 396 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = *search_id; + _tmp7_ = stmt; #line 396 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = _tmp9_.id; + _tmp8_ = *search_id; #line 396 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = sqlite3_bind_int64 (_tmp8_, 1, _tmp10_); + _tmp9_ = _tmp8_.id; #line 396 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp11_; + res = sqlite3_bind_int64 (_tmp7_, 1, _tmp9_); #line 397 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 397 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp12_ == SQLITE_OK, "res == Sqlite.OK"); -#line 399 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = stmt; + _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); #line 399 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = sqlite3_step (_tmp13_); + _tmp11_ = stmt; #line 399 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp14_; + res = sqlite3_step (_tmp11_); #line 400 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = res; + _tmp12_ = res; #line 400 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp15_ != SQLITE_DONE) { -#line 3015 "SavedSearchDBTable.c" - const gchar* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; - gint _tmp19_; -#line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = table_name; + if (_tmp12_ != SQLITE_DONE) { +#line 2972 "SavedSearchDBTable.c" + gchar* _tmp13_; + gchar* _tmp14_; + gint _tmp15_; #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = g_strdup_printf ("%s.remove", _tmp16_); + _tmp13_ = g_strdup_printf ("%s.remove", table_name); #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = _tmp17_; + _tmp14_ = _tmp13_; #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = res; + _tmp15_ = res; #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error (_tmp18_, _tmp19_, &_inner_error_); + database_table_throw_error (_tmp14_, _tmp15_, &_inner_error_); #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp14_); #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3041,7 +2995,7 @@ static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTabl _sqlite3_finalize0 (stmt); #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 3042 "SavedSearchDBTable.c" +#line 2996 "SavedSearchDBTable.c" } else { #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3051,17 +3005,21 @@ static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTabl g_clear_error (&_inner_error_); #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 3052 "SavedSearchDBTable.c" +#line 3006 "SavedSearchDBTable.c" } } } #line 390 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); -#line 3058 "SavedSearchDBTable.c" +#line 3012 "SavedSearchDBTable.c" } -static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) { +static GeeList* +saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error) +{ GeeList* result = NULL; GeeList* list = NULL; GeeArrayList* _tmp0_; @@ -3075,52 +3033,46 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* SavedSearchID _tmp6_; gint64 _tmp7_; gint _tmp8_; - gint _tmp9_; - sqlite3* _tmp27_; - sqlite3_stmt* _tmp28_ = NULL; - gint _tmp29_; + sqlite3* _tmp23_; + sqlite3_stmt* _tmp24_ = NULL; + gint _tmp25_; + gint _tmp26_; + sqlite3_stmt* _tmp27_; + SavedSearchID _tmp28_; + gint64 _tmp29_; gint _tmp30_; - sqlite3_stmt* _tmp31_; - SavedSearchID _tmp32_; - gint64 _tmp33_; - gint _tmp34_; - gint _tmp35_; - sqlite3* _tmp54_; - sqlite3_stmt* _tmp55_ = NULL; - gint _tmp56_; - gint _tmp57_; - sqlite3_stmt* _tmp58_; - SavedSearchID _tmp59_; - gint64 _tmp60_; - gint _tmp61_; - gint _tmp62_; - sqlite3* _tmp78_; - sqlite3_stmt* _tmp79_ = NULL; - gint _tmp80_; - gint _tmp81_; - sqlite3_stmt* _tmp82_; - SavedSearchID _tmp83_; - gint64 _tmp84_; - gint _tmp85_; - gint _tmp86_; - sqlite3* _tmp105_; - sqlite3_stmt* _tmp106_ = NULL; - gint _tmp107_; - gint _tmp108_; - sqlite3_stmt* _tmp109_; - SavedSearchID _tmp110_; - gint64 _tmp111_; - gint _tmp112_; - gint _tmp113_; - sqlite3* _tmp132_; - sqlite3_stmt* _tmp133_ = NULL; - gint _tmp134_; - gint _tmp135_; - sqlite3_stmt* _tmp136_; - SavedSearchID _tmp137_; - gint64 _tmp138_; - gint _tmp139_; - gint _tmp140_; + sqlite3* _tmp45_; + sqlite3_stmt* _tmp46_ = NULL; + gint _tmp47_; + gint _tmp48_; + sqlite3_stmt* _tmp49_; + SavedSearchID _tmp50_; + gint64 _tmp51_; + gint _tmp52_; + sqlite3* _tmp65_; + sqlite3_stmt* _tmp66_ = NULL; + gint _tmp67_; + gint _tmp68_; + sqlite3_stmt* _tmp69_; + SavedSearchID _tmp70_; + gint64 _tmp71_; + gint _tmp72_; + sqlite3* _tmp87_; + sqlite3_stmt* _tmp88_ = NULL; + gint _tmp89_; + gint _tmp90_; + sqlite3_stmt* _tmp91_; + SavedSearchID _tmp92_; + gint64 _tmp93_; + gint _tmp94_; + sqlite3* _tmp108_; + sqlite3_stmt* _tmp109_ = NULL; + gint _tmp110_; + gint _tmp111_; + sqlite3_stmt* _tmp112_; + SavedSearchID _tmp113_; + gint64 _tmp114_; + gint _tmp115_; GError * _inner_error_ = NULL; #line 405 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL); @@ -3151,67 +3103,60 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* #line 417 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp7_ = _tmp6_.id; #line 417 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = sqlite3_bind_int64 (_tmp5_, 1, _tmp7_); -#line 417 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp8_; + res = sqlite3_bind_int64 (_tmp5_, 1, _tmp7_); #line 418 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = res; + _tmp8_ = res; #line 418 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); -#line 3159 "SavedSearchDBTable.c" + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); +#line 3109 "SavedSearchDBTable.c" { - gboolean _tmp10_ = FALSE; + gboolean _tmp9_ = FALSE; #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = TRUE; + _tmp9_ = TRUE; #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 3166 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp11_; - gint _tmp12_; - gint _tmp13_; +#line 3116 "SavedSearchDBTable.c" + sqlite3_stmt* _tmp10_; + gint _tmp11_; SearchConditionText* condition = NULL; + sqlite3_stmt* _tmp14_; + const gchar* _tmp15_; sqlite3_stmt* _tmp16_; const gchar* _tmp17_; - SearchConditionSearchType _tmp18_; - sqlite3_stmt* _tmp19_; - const gchar* _tmp20_; - sqlite3_stmt* _tmp21_; - const gchar* _tmp22_; - SearchConditionTextContext _tmp23_; - SearchConditionText* _tmp24_; - GeeList* _tmp25_; - SearchConditionText* _tmp26_; + sqlite3_stmt* _tmp18_; + const gchar* _tmp19_; + SearchConditionText* _tmp20_; + GeeList* _tmp21_; + SearchConditionText* _tmp22_; #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!_tmp10_) { -#line 3184 "SavedSearchDBTable.c" + if (!_tmp9_) { +#line 3131 "SavedSearchDBTable.c" } #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = FALSE; -#line 421 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = stmt; + _tmp9_ = FALSE; #line 421 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = sqlite3_step (_tmp11_); + _tmp10_ = stmt; #line 421 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp12_; + res = sqlite3_step (_tmp10_); #line 422 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 422 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp13_ == SQLITE_DONE) { + if (_tmp11_ == SQLITE_DONE) { #line 423 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 3200 "SavedSearchDBTable.c" +#line 3145 "SavedSearchDBTable.c" } else { - gint _tmp14_; + gint _tmp12_; #line 424 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = res; + _tmp12_ = res; #line 424 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp14_ != SQLITE_ROW) { -#line 3207 "SavedSearchDBTable.c" - gint _tmp15_; + if (_tmp12_ != SQLITE_ROW) { +#line 3152 "SavedSearchDBTable.c" + gint _tmp13_; #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = res; + _tmp13_ = res; #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Text.get_all_rows", _tmp15_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Text.get_all_rows", _tmp13_, &_inner_error_); #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3224,7 +3169,7 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _g_object_unref0 (list); #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3225 "SavedSearchDBTable.c" +#line 3170 "SavedSearchDBTable.c" } else { #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3236,125 +3181,113 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* g_clear_error (&_inner_error_); #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3237 "SavedSearchDBTable.c" +#line 3182 "SavedSearchDBTable.c" } } } } #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = stmt; + _tmp14_ = stmt; #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = sqlite3_column_text (_tmp16_, 0); + _tmp15_ = sqlite3_column_text (_tmp14_, 0); #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = search_condition_search_type_from_string (_tmp17_); -#line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = stmt; -#line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = sqlite3_column_text (_tmp19_, 2); + _tmp16_ = stmt; #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = stmt; + _tmp17_ = sqlite3_column_text (_tmp16_, 2); #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = sqlite3_column_text (_tmp21_, 1); + _tmp18_ = stmt; #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = search_condition_text_context_from_string (_tmp22_); + _tmp19_ = sqlite3_column_text (_tmp18_, 1); #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = search_condition_text_new (_tmp18_, _tmp20_, _tmp23_); + _tmp20_ = search_condition_text_new (search_condition_search_type_from_string (_tmp15_), _tmp17_, search_condition_text_context_from_string (_tmp19_)); #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - condition = _tmp24_; + condition = _tmp20_; #line 432 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp25_ = list; + _tmp21_ = list; #line 432 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp26_ = condition; + _tmp22_ = condition; #line 432 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_SEARCH_CONDITION, SearchCondition)); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (condition); -#line 3270 "SavedSearchDBTable.c" +#line 3211 "SavedSearchDBTable.c" } } #line 436 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_ = database_table_db; + _tmp23_ = database_table_db; #line 436 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_ = sqlite3_prepare_v2 (_tmp27_, "SELECT search_type, context, type FROM SavedSearchDBTable_MediaType " "WHERE search_id=?", -1, &_tmp28_, NULL); + _tmp25_ = sqlite3_prepare_v2 (_tmp23_, "SELECT search_type, context, type FROM SavedSearchDBTable_MediaType " "WHERE search_id=?", -1, &_tmp24_, NULL); #line 436 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 436 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp28_; + stmt = _tmp24_; #line 436 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp29_; + res = _tmp25_; #line 439 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp30_ = res; + _tmp26_ = res; #line 439 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK"); -#line 441 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp31_ = stmt; + _vala_assert (_tmp26_ == SQLITE_OK, "res == Sqlite.OK"); #line 441 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp32_ = *search_id; + _tmp27_ = stmt; #line 441 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp33_ = _tmp32_.id; + _tmp28_ = *search_id; #line 441 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp34_ = sqlite3_bind_int64 (_tmp31_, 1, _tmp33_); + _tmp29_ = _tmp28_.id; #line 441 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp34_; + res = sqlite3_bind_int64 (_tmp27_, 1, _tmp29_); #line 442 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp35_ = res; + _tmp30_ = res; #line 442 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK"); -#line 3301 "SavedSearchDBTable.c" + _vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK"); +#line 3240 "SavedSearchDBTable.c" { - gboolean _tmp36_ = FALSE; + gboolean _tmp31_ = FALSE; #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp36_ = TRUE; + _tmp31_ = TRUE; #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 3308 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp37_; - gint _tmp38_; - gint _tmp39_; +#line 3247 "SavedSearchDBTable.c" + sqlite3_stmt* _tmp32_; + gint _tmp33_; SearchConditionMediaType* condition = NULL; - sqlite3_stmt* _tmp42_; - const gchar* _tmp43_; - SearchConditionSearchType _tmp44_; - sqlite3_stmt* _tmp45_; - const gchar* _tmp46_; - SearchConditionMediaTypeContext _tmp47_; - sqlite3_stmt* _tmp48_; - const gchar* _tmp49_; - SearchConditionMediaTypeMediaType _tmp50_; - SearchConditionMediaType* _tmp51_; - GeeList* _tmp52_; - SearchConditionMediaType* _tmp53_; + sqlite3_stmt* _tmp36_; + const gchar* _tmp37_; + sqlite3_stmt* _tmp38_; + const gchar* _tmp39_; + sqlite3_stmt* _tmp40_; + const gchar* _tmp41_; + SearchConditionMediaType* _tmp42_; + GeeList* _tmp43_; + SearchConditionMediaType* _tmp44_; #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!_tmp36_) { -#line 3327 "SavedSearchDBTable.c" + if (!_tmp31_) { +#line 3262 "SavedSearchDBTable.c" } #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp36_ = FALSE; + _tmp31_ = FALSE; #line 445 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp37_ = stmt; + _tmp32_ = stmt; #line 445 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp38_ = sqlite3_step (_tmp37_); -#line 445 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp38_; + res = sqlite3_step (_tmp32_); #line 446 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp39_ = res; + _tmp33_ = res; #line 446 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp39_ == SQLITE_DONE) { + if (_tmp33_ == SQLITE_DONE) { #line 447 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 3343 "SavedSearchDBTable.c" +#line 3276 "SavedSearchDBTable.c" } else { - gint _tmp40_; + gint _tmp34_; #line 448 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp40_ = res; + _tmp34_ = res; #line 448 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp40_ != SQLITE_ROW) { -#line 3350 "SavedSearchDBTable.c" - gint _tmp41_; + if (_tmp34_ != SQLITE_ROW) { +#line 3283 "SavedSearchDBTable.c" + gint _tmp35_; #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp41_ = res; + _tmp35_ = res; #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_MediaType.get_all_rows", _tmp41_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_MediaType.get_all_rows", _tmp35_, &_inner_error_); #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3367,7 +3300,7 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _g_object_unref0 (list); #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3368 "SavedSearchDBTable.c" +#line 3301 "SavedSearchDBTable.c" } else { #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3379,124 +3312,111 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* g_clear_error (&_inner_error_); #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3380 "SavedSearchDBTable.c" +#line 3313 "SavedSearchDBTable.c" } } } } #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp42_ = stmt; -#line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp43_ = sqlite3_column_text (_tmp42_, 0); -#line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp44_ = search_condition_search_type_from_string (_tmp43_); -#line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp45_ = stmt; + _tmp36_ = stmt; #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp46_ = sqlite3_column_text (_tmp45_, 1); + _tmp37_ = sqlite3_column_text (_tmp36_, 0); #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp47_ = search_condition_media_type_context_from_string (_tmp46_); + _tmp38_ = stmt; #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp48_ = stmt; + _tmp39_ = sqlite3_column_text (_tmp38_, 1); #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp49_ = sqlite3_column_text (_tmp48_, 2); + _tmp40_ = stmt; #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp50_ = search_condition_media_type_media_type_from_string (_tmp49_); + _tmp41_ = sqlite3_column_text (_tmp40_, 2); #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp51_ = search_condition_media_type_new (_tmp44_, _tmp47_, _tmp50_); + _tmp42_ = search_condition_media_type_new (search_condition_search_type_from_string (_tmp37_), search_condition_media_type_context_from_string (_tmp39_), search_condition_media_type_media_type_from_string (_tmp41_)); #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - condition = _tmp51_; + condition = _tmp42_; #line 456 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp52_ = list; + _tmp43_ = list; #line 456 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp53_ = condition; + _tmp44_ = condition; #line 456 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_SEARCH_CONDITION, SearchCondition)); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (condition); -#line 3415 "SavedSearchDBTable.c" +#line 3342 "SavedSearchDBTable.c" } } #line 460 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp54_ = database_table_db; + _tmp45_ = database_table_db; #line 460 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp56_ = sqlite3_prepare_v2 (_tmp54_, "SELECT search_type, flag_state FROM SavedSearchDBTable_Flagged " "WHERE search_id=?", -1, &_tmp55_, NULL); + _tmp47_ = sqlite3_prepare_v2 (_tmp45_, "SELECT search_type, flag_state FROM SavedSearchDBTable_Flagged " "WHERE search_id=?", -1, &_tmp46_, NULL); #line 460 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 460 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp55_; + stmt = _tmp46_; #line 460 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp56_; + res = _tmp47_; #line 463 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp57_ = res; + _tmp48_ = res; #line 463 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp57_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp48_ == SQLITE_OK, "res == Sqlite.OK"); #line 465 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp58_ = stmt; + _tmp49_ = stmt; #line 465 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp59_ = *search_id; + _tmp50_ = *search_id; #line 465 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp60_ = _tmp59_.id; + _tmp51_ = _tmp50_.id; #line 465 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp61_ = sqlite3_bind_int64 (_tmp58_, 1, _tmp60_); -#line 465 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp61_; + res = sqlite3_bind_int64 (_tmp49_, 1, _tmp51_); #line 466 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp62_ = res; + _tmp52_ = res; #line 466 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp62_ == SQLITE_OK, "res == Sqlite.OK"); -#line 3446 "SavedSearchDBTable.c" + _vala_assert (_tmp52_ == SQLITE_OK, "res == Sqlite.OK"); +#line 3371 "SavedSearchDBTable.c" { - gboolean _tmp63_ = FALSE; + gboolean _tmp53_ = FALSE; #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp63_ = TRUE; + _tmp53_ = TRUE; #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 3453 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp64_; - gint _tmp65_; - gint _tmp66_; +#line 3378 "SavedSearchDBTable.c" + sqlite3_stmt* _tmp54_; + gint _tmp55_; SearchConditionFlagged* condition = NULL; - sqlite3_stmt* _tmp69_; - const gchar* _tmp70_; - SearchConditionSearchType _tmp71_; - sqlite3_stmt* _tmp72_; - const gchar* _tmp73_; - SearchConditionFlaggedState _tmp74_; - SearchConditionFlagged* _tmp75_; - GeeList* _tmp76_; - SearchConditionFlagged* _tmp77_; + sqlite3_stmt* _tmp58_; + const gchar* _tmp59_; + sqlite3_stmt* _tmp60_; + const gchar* _tmp61_; + SearchConditionFlagged* _tmp62_; + GeeList* _tmp63_; + SearchConditionFlagged* _tmp64_; #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!_tmp63_) { -#line 3469 "SavedSearchDBTable.c" + if (!_tmp53_) { +#line 3391 "SavedSearchDBTable.c" } #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp63_ = FALSE; -#line 469 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp64_ = stmt; + _tmp53_ = FALSE; #line 469 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp65_ = sqlite3_step (_tmp64_); + _tmp54_ = stmt; #line 469 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp65_; + res = sqlite3_step (_tmp54_); #line 470 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp66_ = res; + _tmp55_ = res; #line 470 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp66_ == SQLITE_DONE) { + if (_tmp55_ == SQLITE_DONE) { #line 471 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 3485 "SavedSearchDBTable.c" +#line 3405 "SavedSearchDBTable.c" } else { - gint _tmp67_; + gint _tmp56_; #line 472 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp67_ = res; + _tmp56_ = res; #line 472 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp67_ != SQLITE_ROW) { -#line 3492 "SavedSearchDBTable.c" - gint _tmp68_; + if (_tmp56_ != SQLITE_ROW) { +#line 3412 "SavedSearchDBTable.c" + gint _tmp57_; #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp68_ = res; + _tmp57_ = res; #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Flagged.get_all_rows", _tmp68_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Flagged.get_all_rows", _tmp57_, &_inner_error_); #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3509,7 +3429,7 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _g_object_unref0 (list); #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3510 "SavedSearchDBTable.c" +#line 3430 "SavedSearchDBTable.c" } else { #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3521,122 +3441,110 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* g_clear_error (&_inner_error_); #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3522 "SavedSearchDBTable.c" +#line 3442 "SavedSearchDBTable.c" } } } } #line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp69_ = stmt; + _tmp58_ = stmt; #line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp70_ = sqlite3_column_text (_tmp69_, 0); + _tmp59_ = sqlite3_column_text (_tmp58_, 0); #line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp71_ = search_condition_search_type_from_string (_tmp70_); -#line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp72_ = stmt; -#line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp73_ = sqlite3_column_text (_tmp72_, 1); + _tmp60_ = stmt; #line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp74_ = search_condition_flagged_state_from_string (_tmp73_); + _tmp61_ = sqlite3_column_text (_tmp60_, 1); #line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp75_ = search_condition_flagged_new (_tmp71_, _tmp74_); + _tmp62_ = search_condition_flagged_new (search_condition_search_type_from_string (_tmp59_), search_condition_flagged_state_from_string (_tmp61_)); #line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - condition = _tmp75_; + condition = _tmp62_; #line 479 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp76_ = list; + _tmp63_ = list; #line 479 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp77_ = condition; + _tmp64_ = condition; #line 479 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_SEARCH_CONDITION, SearchCondition)); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (condition); -#line 3551 "SavedSearchDBTable.c" +#line 3467 "SavedSearchDBTable.c" } } #line 483 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp78_ = database_table_db; + _tmp65_ = database_table_db; #line 483 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp80_ = sqlite3_prepare_v2 (_tmp78_, "SELECT search_type, context, modified_state FROM SavedSearchDBTable_Mo" \ -"dified " "WHERE search_id=?", -1, &_tmp79_, NULL); + _tmp67_ = sqlite3_prepare_v2 (_tmp65_, "SELECT search_type, context, modified_state FROM SavedSearchDBTable_Mo" \ +"dified " "WHERE search_id=?", -1, &_tmp66_, NULL); #line 483 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 483 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp79_; + stmt = _tmp66_; #line 483 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp80_; + res = _tmp67_; #line 486 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp81_ = res; + _tmp68_ = res; #line 486 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp81_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp68_ == SQLITE_OK, "res == Sqlite.OK"); #line 488 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp82_ = stmt; + _tmp69_ = stmt; #line 488 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp83_ = *search_id; + _tmp70_ = *search_id; #line 488 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp84_ = _tmp83_.id; + _tmp71_ = _tmp70_.id; #line 488 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp85_ = sqlite3_bind_int64 (_tmp82_, 1, _tmp84_); -#line 488 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp85_; + res = sqlite3_bind_int64 (_tmp69_, 1, _tmp71_); #line 489 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp86_ = res; + _tmp72_ = res; #line 489 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp86_ == SQLITE_OK, "res == Sqlite.OK"); -#line 3582 "SavedSearchDBTable.c" + _vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK"); +#line 3496 "SavedSearchDBTable.c" { - gboolean _tmp87_ = FALSE; + gboolean _tmp73_ = FALSE; #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp87_ = TRUE; + _tmp73_ = TRUE; #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 3589 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp88_; - gint _tmp89_; - gint _tmp90_; +#line 3503 "SavedSearchDBTable.c" + sqlite3_stmt* _tmp74_; + gint _tmp75_; SearchConditionModified* condition = NULL; - sqlite3_stmt* _tmp93_; - const gchar* _tmp94_; - SearchConditionSearchType _tmp95_; - sqlite3_stmt* _tmp96_; - const gchar* _tmp97_; - SearchConditionModifiedContext _tmp98_; - sqlite3_stmt* _tmp99_; - const gchar* _tmp100_; - SearchConditionModifiedState _tmp101_; - SearchConditionModified* _tmp102_; - GeeList* _tmp103_; - SearchConditionModified* _tmp104_; + sqlite3_stmt* _tmp78_; + const gchar* _tmp79_; + sqlite3_stmt* _tmp80_; + const gchar* _tmp81_; + sqlite3_stmt* _tmp82_; + const gchar* _tmp83_; + SearchConditionModified* _tmp84_; + GeeList* _tmp85_; + SearchConditionModified* _tmp86_; #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!_tmp87_) { -#line 3608 "SavedSearchDBTable.c" + if (!_tmp73_) { +#line 3518 "SavedSearchDBTable.c" } #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp87_ = FALSE; + _tmp73_ = FALSE; #line 492 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp88_ = stmt; + _tmp74_ = stmt; #line 492 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp89_ = sqlite3_step (_tmp88_); -#line 492 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp89_; + res = sqlite3_step (_tmp74_); #line 493 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp90_ = res; + _tmp75_ = res; #line 493 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp90_ == SQLITE_DONE) { + if (_tmp75_ == SQLITE_DONE) { #line 494 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 3624 "SavedSearchDBTable.c" +#line 3532 "SavedSearchDBTable.c" } else { - gint _tmp91_; + gint _tmp76_; #line 495 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp91_ = res; + _tmp76_ = res; #line 495 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp91_ != SQLITE_ROW) { -#line 3631 "SavedSearchDBTable.c" - gint _tmp92_; + if (_tmp76_ != SQLITE_ROW) { +#line 3539 "SavedSearchDBTable.c" + gint _tmp77_; #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp92_ = res; + _tmp77_ = res; #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Modified.get_all_rows", _tmp92_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Modified.get_all_rows", _tmp77_, &_inner_error_); #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3649,7 +3557,7 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _g_object_unref0 (list); #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3649 "SavedSearchDBTable.c" +#line 3557 "SavedSearchDBTable.c" } else { #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3661,127 +3569,112 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* g_clear_error (&_inner_error_); #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3661 "SavedSearchDBTable.c" +#line 3569 "SavedSearchDBTable.c" } } } } #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp93_ = stmt; -#line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp94_ = sqlite3_column_text (_tmp93_, 0); + _tmp78_ = stmt; #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp95_ = search_condition_search_type_from_string (_tmp94_); + _tmp79_ = sqlite3_column_text (_tmp78_, 0); #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp96_ = stmt; -#line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp97_ = sqlite3_column_text (_tmp96_, 1); -#line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp98_ = search_condition_modified_context_from_string (_tmp97_); + _tmp80_ = stmt; #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp99_ = stmt; + _tmp81_ = sqlite3_column_text (_tmp80_, 1); #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp100_ = sqlite3_column_text (_tmp99_, 2); + _tmp82_ = stmt; #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp101_ = search_condition_modified_state_from_string (_tmp100_); + _tmp83_ = sqlite3_column_text (_tmp82_, 2); #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp102_ = search_condition_modified_new (_tmp95_, _tmp98_, _tmp101_); + _tmp84_ = search_condition_modified_new (search_condition_search_type_from_string (_tmp79_), search_condition_modified_context_from_string (_tmp81_), search_condition_modified_state_from_string (_tmp83_)); #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - condition = _tmp102_; + condition = _tmp84_; #line 503 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp103_ = list; + _tmp85_ = list; #line 503 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp104_ = condition; + _tmp86_ = condition; #line 503 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, TYPE_SEARCH_CONDITION, SearchCondition)); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (condition); -#line 3696 "SavedSearchDBTable.c" +#line 3598 "SavedSearchDBTable.c" } } #line 507 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp105_ = database_table_db; + _tmp87_ = database_table_db; #line 507 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp107_ = sqlite3_prepare_v2 (_tmp105_, "SELECT search_type, rating, context FROM SavedSearchDBTable_Rating " "WHERE search_id=?", -1, &_tmp106_, NULL); + _tmp89_ = sqlite3_prepare_v2 (_tmp87_, "SELECT search_type, rating, context FROM SavedSearchDBTable_Rating " "WHERE search_id=?", -1, &_tmp88_, NULL); #line 507 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 507 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp106_; + stmt = _tmp88_; #line 507 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp107_; + res = _tmp89_; #line 510 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp108_ = res; + _tmp90_ = res; #line 510 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp108_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp90_ == SQLITE_OK, "res == Sqlite.OK"); #line 512 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp109_ = stmt; + _tmp91_ = stmt; #line 512 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp110_ = *search_id; + _tmp92_ = *search_id; #line 512 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp111_ = _tmp110_.id; + _tmp93_ = _tmp92_.id; #line 512 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp112_ = sqlite3_bind_int64 (_tmp109_, 1, _tmp111_); -#line 512 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp112_; + res = sqlite3_bind_int64 (_tmp91_, 1, _tmp93_); #line 513 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp113_ = res; + _tmp94_ = res; #line 513 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp113_ == SQLITE_OK, "res == Sqlite.OK"); -#line 3727 "SavedSearchDBTable.c" + _vala_assert (_tmp94_ == SQLITE_OK, "res == Sqlite.OK"); +#line 3627 "SavedSearchDBTable.c" { - gboolean _tmp114_ = FALSE; + gboolean _tmp95_ = FALSE; #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp114_ = TRUE; + _tmp95_ = TRUE; #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 3734 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp115_; - gint _tmp116_; - gint _tmp117_; +#line 3634 "SavedSearchDBTable.c" + sqlite3_stmt* _tmp96_; + gint _tmp97_; SearchConditionRating* condition = NULL; - sqlite3_stmt* _tmp120_; - const gchar* _tmp121_; - SearchConditionSearchType _tmp122_; - sqlite3_stmt* _tmp123_; - gint _tmp124_; - Rating _tmp125_; - sqlite3_stmt* _tmp126_; - const gchar* _tmp127_; - SearchConditionRatingContext _tmp128_; - SearchConditionRating* _tmp129_; - GeeList* _tmp130_; - SearchConditionRating* _tmp131_; + sqlite3_stmt* _tmp100_; + const gchar* _tmp101_; + sqlite3_stmt* _tmp102_; + sqlite3_stmt* _tmp103_; + const gchar* _tmp104_; + SearchConditionRating* _tmp105_; + GeeList* _tmp106_; + SearchConditionRating* _tmp107_; #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!_tmp114_) { -#line 3753 "SavedSearchDBTable.c" + if (!_tmp95_) { +#line 3648 "SavedSearchDBTable.c" } #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp114_ = FALSE; -#line 516 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp115_ = stmt; + _tmp95_ = FALSE; #line 516 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp116_ = sqlite3_step (_tmp115_); + _tmp96_ = stmt; #line 516 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp116_; + res = sqlite3_step (_tmp96_); #line 517 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp117_ = res; + _tmp97_ = res; #line 517 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp117_ == SQLITE_DONE) { + if (_tmp97_ == SQLITE_DONE) { #line 518 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 3769 "SavedSearchDBTable.c" +#line 3662 "SavedSearchDBTable.c" } else { - gint _tmp118_; + gint _tmp98_; #line 519 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp118_ = res; + _tmp98_ = res; #line 519 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp118_ != SQLITE_ROW) { -#line 3776 "SavedSearchDBTable.c" - gint _tmp119_; + if (_tmp98_ != SQLITE_ROW) { +#line 3669 "SavedSearchDBTable.c" + gint _tmp99_; #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp119_ = res; + _tmp99_ = res; #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Rating.get_all_rows", _tmp119_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Rating.get_all_rows", _tmp99_, &_inner_error_); #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3794,7 +3687,7 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _g_object_unref0 (list); #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3794 "SavedSearchDBTable.c" +#line 3687 "SavedSearchDBTable.c" } else { #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3806,134 +3699,117 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* g_clear_error (&_inner_error_); #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3806 "SavedSearchDBTable.c" +#line 3699 "SavedSearchDBTable.c" } } } } #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp120_ = stmt; -#line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp121_ = sqlite3_column_text (_tmp120_, 0); -#line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp122_ = search_condition_search_type_from_string (_tmp121_); + _tmp100_ = stmt; #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp123_ = stmt; -#line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp124_ = sqlite3_column_int (_tmp123_, 1); + _tmp101_ = sqlite3_column_text (_tmp100_, 0); #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp125_ = rating_unserialize (_tmp124_); + _tmp102_ = stmt; #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp126_ = stmt; + _tmp103_ = stmt; #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp127_ = sqlite3_column_text (_tmp126_, 2); + _tmp104_ = sqlite3_column_text (_tmp103_, 2); #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp128_ = search_condition_rating_context_from_string (_tmp127_); + _tmp105_ = search_condition_rating_new (search_condition_search_type_from_string (_tmp101_), rating_unserialize (sqlite3_column_int (_tmp102_, 1)), search_condition_rating_context_from_string (_tmp104_)); #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp129_ = search_condition_rating_new (_tmp122_, _tmp125_, _tmp128_); -#line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - condition = _tmp129_; + condition = _tmp105_; #line 527 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp130_ = list; + _tmp106_ = list; #line 527 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp131_ = condition; + _tmp107_ = condition; #line 527 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp131_, TYPE_SEARCH_CONDITION, SearchCondition)); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (condition); -#line 3841 "SavedSearchDBTable.c" +#line 3726 "SavedSearchDBTable.c" } } #line 531 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp132_ = database_table_db; + _tmp108_ = database_table_db; #line 531 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp134_ = sqlite3_prepare_v2 (_tmp132_, "SELECT search_type, context, date_one, date_two FROM SavedSearchDBTabl" \ -"e_Date " "WHERE search_id=?", -1, &_tmp133_, NULL); + _tmp110_ = sqlite3_prepare_v2 (_tmp108_, "SELECT search_type, context, date_one, date_two FROM SavedSearchDBTabl" \ +"e_Date " "WHERE search_id=?", -1, &_tmp109_, NULL); #line 531 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 531 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp133_; + stmt = _tmp109_; #line 531 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp134_; + res = _tmp110_; #line 534 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp135_ = res; + _tmp111_ = res; #line 534 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp135_ == SQLITE_OK, "res == Sqlite.OK"); -#line 536 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp136_ = stmt; + _vala_assert (_tmp111_ == SQLITE_OK, "res == Sqlite.OK"); #line 536 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp137_ = *search_id; + _tmp112_ = stmt; #line 536 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp138_ = _tmp137_.id; + _tmp113_ = *search_id; #line 536 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp139_ = sqlite3_bind_int64 (_tmp136_, 1, _tmp138_); + _tmp114_ = _tmp113_.id; #line 536 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp139_; + res = sqlite3_bind_int64 (_tmp112_, 1, _tmp114_); #line 537 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp140_ = res; + _tmp115_ = res; #line 537 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp140_ == SQLITE_OK, "res == Sqlite.OK"); -#line 3872 "SavedSearchDBTable.c" + _vala_assert (_tmp115_ == SQLITE_OK, "res == Sqlite.OK"); +#line 3755 "SavedSearchDBTable.c" { - gboolean _tmp141_ = FALSE; + gboolean _tmp116_ = FALSE; #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp141_ = TRUE; + _tmp116_ = TRUE; #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 3879 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp142_; - gint _tmp143_; - gint _tmp144_; +#line 3762 "SavedSearchDBTable.c" + sqlite3_stmt* _tmp117_; + gint _tmp118_; SearchConditionDate* condition = NULL; - sqlite3_stmt* _tmp147_; - const gchar* _tmp148_; - SearchConditionSearchType _tmp149_; - sqlite3_stmt* _tmp150_; - const gchar* _tmp151_; - SearchConditionDateContext _tmp152_; - sqlite3_stmt* _tmp153_; - gint64 _tmp154_; - GDateTime* _tmp155_; - GDateTime* _tmp156_; - sqlite3_stmt* _tmp157_; - gint64 _tmp158_; - GDateTime* _tmp159_; - GDateTime* _tmp160_; - SearchConditionDate* _tmp161_; - SearchConditionDate* _tmp162_; - GeeList* _tmp163_; - SearchConditionDate* _tmp164_; + sqlite3_stmt* _tmp121_; + const gchar* _tmp122_; + sqlite3_stmt* _tmp123_; + const gchar* _tmp124_; + sqlite3_stmt* _tmp125_; + GDateTime* _tmp126_; + GDateTime* _tmp127_; + sqlite3_stmt* _tmp128_; + GDateTime* _tmp129_; + GDateTime* _tmp130_; + SearchConditionDate* _tmp131_; + SearchConditionDate* _tmp132_; + GeeList* _tmp133_; + SearchConditionDate* _tmp134_; #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!_tmp141_) { -#line 3904 "SavedSearchDBTable.c" + if (!_tmp116_) { +#line 3782 "SavedSearchDBTable.c" } #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp141_ = FALSE; -#line 540 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp142_ = stmt; + _tmp116_ = FALSE; #line 540 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp143_ = sqlite3_step (_tmp142_); + _tmp117_ = stmt; #line 540 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp143_; + res = sqlite3_step (_tmp117_); #line 541 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp144_ = res; + _tmp118_ = res; #line 541 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp144_ == SQLITE_DONE) { + if (_tmp118_ == SQLITE_DONE) { #line 542 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 3920 "SavedSearchDBTable.c" +#line 3796 "SavedSearchDBTable.c" } else { - gint _tmp145_; + gint _tmp119_; #line 543 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp145_ = res; + _tmp119_ = res; #line 543 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp145_ != SQLITE_ROW) { -#line 3927 "SavedSearchDBTable.c" - gint _tmp146_; + if (_tmp119_ != SQLITE_ROW) { +#line 3803 "SavedSearchDBTable.c" + gint _tmp120_; #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp146_ = res; + _tmp120_ = res; #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Date.get_all_rows", _tmp146_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Date.get_all_rows", _tmp120_, &_inner_error_); #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3946,7 +3822,7 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _g_object_unref0 (list); #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3945 "SavedSearchDBTable.c" +#line 3821 "SavedSearchDBTable.c" } else { #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3958,58 +3834,50 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* g_clear_error (&_inner_error_); #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3957 "SavedSearchDBTable.c" +#line 3833 "SavedSearchDBTable.c" } } } } #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp147_ = stmt; -#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp148_ = sqlite3_column_text (_tmp147_, 0); + _tmp121_ = stmt; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp149_ = search_condition_search_type_from_string (_tmp148_); + _tmp122_ = sqlite3_column_text (_tmp121_, 0); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp150_ = stmt; -#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp151_ = sqlite3_column_text (_tmp150_, 1); -#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp152_ = search_condition_date_context_from_string (_tmp151_); -#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp153_ = stmt; + _tmp123_ = stmt; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp154_ = sqlite3_column_int64 (_tmp153_, 2); + _tmp124_ = sqlite3_column_text (_tmp123_, 1); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp155_ = g_date_time_new_from_unix_local (_tmp154_); + _tmp125_ = stmt; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp156_ = _tmp155_; + _tmp126_ = g_date_time_new_from_unix_local (sqlite3_column_int64 (_tmp125_, 2)); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp157_ = stmt; + _tmp127_ = _tmp126_; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp158_ = sqlite3_column_int64 (_tmp157_, 3); + _tmp128_ = stmt; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp159_ = g_date_time_new_from_unix_local (_tmp158_); + _tmp129_ = g_date_time_new_from_unix_local (sqlite3_column_int64 (_tmp128_, 3)); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp160_ = _tmp159_; + _tmp130_ = _tmp129_; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp161_ = search_condition_date_new (_tmp149_, _tmp152_, _tmp156_, _tmp160_); + _tmp131_ = search_condition_date_new (search_condition_search_type_from_string (_tmp122_), search_condition_date_context_from_string (_tmp124_), _tmp127_, _tmp130_); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp162_ = _tmp161_; + _tmp132_ = _tmp131_; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_date_time_unref0 (_tmp160_); + _g_date_time_unref0 (_tmp130_); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_date_time_unref0 (_tmp156_); + _g_date_time_unref0 (_tmp127_); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - condition = _tmp162_; + condition = _tmp132_; #line 551 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp163_ = list; + _tmp133_ = list; #line 551 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp164_ = condition; + _tmp134_ = condition; #line 551 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp163_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp164_, TYPE_SEARCH_CONDITION, SearchCondition)); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (condition); -#line 4008 "SavedSearchDBTable.c" +#line 3876 "SavedSearchDBTable.c" } } #line 554 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4018,11 +3886,16 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _sqlite3_finalize0 (stmt); #line 554 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 4017 "SavedSearchDBTable.c" +#line 3885 "SavedSearchDBTable.c" } -void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearchRow* row, SavedSearchID* result, GError** error) { +void +saved_search_db_table_create_from_row (SavedSearchDBTable* self, + SavedSearchRow* row, + SavedSearchID* result, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -4030,25 +3903,19 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - SavedSearchRow* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; - GDestroyNotify _tmp8_; - gint _tmp9_; - gint _tmp10_; - sqlite3_stmt* _tmp11_; - SavedSearchRow* _tmp12_; - SearchOperator _tmp13_; - gchar* _tmp14_; - GDestroyNotify _tmp15_; - gint _tmp16_; - gint _tmp17_; - sqlite3_stmt* _tmp18_; - gint _tmp19_; - gint _tmp20_; + const gchar* _tmp5_; + gchar* _tmp6_; + GDestroyNotify _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + SearchOperator _tmp10_; + gchar* _tmp11_; + GDestroyNotify _tmp12_; + gint _tmp13_; + sqlite3_stmt* _tmp14_; + gint _tmp15_; SavedSearchID search_id = {0}; - sqlite3* _tmp22_; - gint64 _tmp23_; + sqlite3* _tmp17_; GError * _inner_error_ = NULL; #line 558 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self)); @@ -4071,55 +3938,45 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc #line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp4_ = stmt; #line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp5_ = row; -#line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp6_ = _tmp5_->name; -#line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp5_ = row->name; #line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = g_free; + _tmp6_ = g_strdup (_tmp5_); #line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = sqlite3_bind_text (_tmp4_, 1, _tmp7_, -1, _tmp8_); + _tmp7_ = g_free; #line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp9_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); #line 565 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = res; + _tmp8_ = res; #line 565 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); -#line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = stmt; -#line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = row; + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = _tmp12_->operator; + _tmp9_ = stmt; #line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = search_operator_to_string (_tmp13_); + _tmp10_ = row->operator; #line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = g_free; + _tmp11_ = search_operator_to_string (_tmp10_); #line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = sqlite3_bind_text (_tmp11_, 2, _tmp14_, -1, _tmp15_); + _tmp12_ = g_free; #line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp16_; + res = sqlite3_bind_text (_tmp9_, 2, _tmp11_, -1, _tmp12_); #line 567 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = res; + _tmp13_ = res; #line 567 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); -#line 569 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = stmt; + _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); #line 569 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = sqlite3_step (_tmp18_); + _tmp14_ = stmt; #line 569 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp19_; + res = sqlite3_step (_tmp14_); #line 570 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = res; + _tmp15_ = res; #line 570 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp20_ != SQLITE_DONE) { -#line 4113 "SavedSearchDBTable.c" - gint _tmp21_; + if (_tmp15_ != SQLITE_DONE) { +#line 3970 "SavedSearchDBTable.c" + gint _tmp16_; #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = res; + _tmp16_ = res; #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable.create_from_row", _tmp21_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable.create_from_row", _tmp16_, &_inner_error_); #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4130,7 +3987,7 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc _sqlite3_finalize0 (stmt); #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4129 "SavedSearchDBTable.c" +#line 3986 "SavedSearchDBTable.c" } else { #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -4140,85 +3997,80 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc g_clear_error (&_inner_error_); #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4139 "SavedSearchDBTable.c" +#line 3996 "SavedSearchDBTable.c" } } } #line 573 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = database_table_db; -#line 573 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = sqlite3_last_insert_rowid (_tmp22_); + _tmp17_ = database_table_db; #line 573 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - saved_search_id_init (&search_id, _tmp23_); -#line 4149 "SavedSearchDBTable.c" + saved_search_id_init (&search_id, sqlite3_last_insert_rowid (_tmp17_)); +#line 4004 "SavedSearchDBTable.c" { GeeList* _sc_list = NULL; - SavedSearchRow* _tmp24_; - GeeList* _tmp25_; - GeeList* _tmp26_; + GeeList* _tmp18_; + GeeList* _tmp19_; gint _sc_size = 0; - GeeList* _tmp27_; - gint _tmp28_; - gint _tmp29_; + GeeList* _tmp20_; + gint _tmp21_; + gint _tmp22_; gint _sc_index = 0; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = row; -#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp25_ = _tmp24_->conditions; + _tmp18_ = row->conditions; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp26_ = _g_object_ref0 (_tmp25_); + _tmp19_ = _g_object_ref0 (_tmp18_); #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _sc_list = _tmp26_; + _sc_list = _tmp19_; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_ = _sc_list; + _tmp20_ = _sc_list; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp28_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_ = _tmp28_; + _tmp22_ = _tmp21_; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _sc_size = _tmp29_; + _sc_size = _tmp22_; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sc_index = -1; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 4180 "SavedSearchDBTable.c" - gint _tmp30_; - gint _tmp31_; - gint _tmp32_; +#line 4032 "SavedSearchDBTable.c" + gint _tmp23_; + gint _tmp24_; + gint _tmp25_; SearchCondition* sc = NULL; - GeeList* _tmp33_; - gint _tmp34_; - gpointer _tmp35_; - SavedSearchID _tmp36_; - SearchCondition* _tmp37_; + GeeList* _tmp26_; + gint _tmp27_; + gpointer _tmp28_; + SavedSearchID _tmp29_; + SearchCondition* _tmp30_; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp30_ = _sc_index; + _tmp23_ = _sc_index; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _sc_index = _tmp30_ + 1; + _sc_index = _tmp23_ + 1; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp31_ = _sc_index; + _tmp24_ = _sc_index; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp32_ = _sc_size; + _tmp25_ = _sc_size; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!(_tmp31_ < _tmp32_)) { + if (!(_tmp24_ < _tmp25_)) { #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 4202 "SavedSearchDBTable.c" +#line 4054 "SavedSearchDBTable.c" } #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp33_ = _sc_list; + _tmp26_ = _sc_list; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp34_ = _sc_index; + _tmp27_ = _sc_index; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp35_ = gee_list_get (_tmp33_, _tmp34_); + _tmp28_ = gee_list_get (_tmp26_, _tmp27_); #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - sc = (SearchCondition*) _tmp35_; + sc = (SearchCondition*) _tmp28_; #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp36_ = search_id; + _tmp29_ = search_id; #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp37_ = sc; + _tmp30_ = sc; #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - saved_search_db_table_add_condition (self, &_tmp36_, _tmp37_, &_inner_error_); + saved_search_db_table_add_condition (self, &_tmp29_, _tmp30_, &_inner_error_); #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4233,7 +4085,7 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc _sqlite3_finalize0 (stmt); #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4232 "SavedSearchDBTable.c" +#line 4084 "SavedSearchDBTable.c" } else { #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (sc); @@ -4247,16 +4099,16 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc g_clear_error (&_inner_error_); #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4246 "SavedSearchDBTable.c" +#line 4098 "SavedSearchDBTable.c" } } #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (sc); -#line 4251 "SavedSearchDBTable.c" +#line 4103 "SavedSearchDBTable.c" } #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _g_object_unref0 (_sc_list); -#line 4255 "SavedSearchDBTable.c" +#line 4107 "SavedSearchDBTable.c" } #line 579 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" *result = search_id; @@ -4264,11 +4116,15 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc _sqlite3_finalize0 (stmt); #line 579 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4263 "SavedSearchDBTable.c" +#line 4115 "SavedSearchDBTable.c" } -void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) { +void +saved_search_db_table_remove (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error) +{ SavedSearchID _tmp0_; SavedSearchID _tmp1_; gint64 _tmp2_; @@ -4289,7 +4145,7 @@ void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* sear g_propagate_error (error, _inner_error_); #line 583 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4288 "SavedSearchDBTable.c" +#line 4144 "SavedSearchDBTable.c" } else { #line 583 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4297,7 +4153,7 @@ void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* sear g_clear_error (&_inner_error_); #line 583 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4296 "SavedSearchDBTable.c" +#line 4152 "SavedSearchDBTable.c" } } #line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4314,7 +4170,7 @@ void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* sear g_propagate_error (error, _inner_error_); #line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4313 "SavedSearchDBTable.c" +#line 4169 "SavedSearchDBTable.c" } else { #line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4322,13 +4178,17 @@ void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* sear g_clear_error (&_inner_error_); #line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4321 "SavedSearchDBTable.c" +#line 4177 "SavedSearchDBTable.c" } } } -SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) { +SavedSearchRow* +saved_search_db_table_get_row (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error) +{ SavedSearchRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -4340,22 +4200,19 @@ SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSe SavedSearchID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; - gint _tmp11_; + sqlite3_stmt* _tmp8_; + gint _tmp9_; SavedSearchRow* row = NULL; - SavedSearchRow* _tmp14_; + SavedSearchRow* _tmp12_; + SavedSearchRow* _tmp13_; + SavedSearchID _tmp14_; SavedSearchRow* _tmp15_; - SavedSearchID _tmp16_; - SavedSearchRow* _tmp17_; - sqlite3_stmt* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; - SavedSearchRow* _tmp21_; - sqlite3_stmt* _tmp22_; - const gchar* _tmp23_; - SearchOperator _tmp24_; + sqlite3_stmt* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; + SavedSearchRow* _tmp19_; + sqlite3_stmt* _tmp20_; + const gchar* _tmp21_; GError * _inner_error_ = NULL; #line 587 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL); @@ -4382,42 +4239,38 @@ SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSe #line 593 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp6_ = _tmp5_.id; #line 593 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 593 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 594 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 594 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 596 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 596 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 596 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp10_; + res = sqlite3_step (_tmp8_); #line 597 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 597 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp11_ == SQLITE_DONE) { + if (_tmp9_ == SQLITE_DONE) { #line 598 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" result = NULL; #line 598 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 598 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 4404 "SavedSearchDBTable.c" +#line 4257 "SavedSearchDBTable.c" } else { - gint _tmp12_; + gint _tmp10_; #line 599 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 599 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp12_ != SQLITE_ROW) { -#line 4411 "SavedSearchDBTable.c" - gint _tmp13_; + if (_tmp10_ != SQLITE_ROW) { +#line 4264 "SavedSearchDBTable.c" + gint _tmp11_; #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable.get_row", _tmp13_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable.get_row", _tmp11_, &_inner_error_); #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4428,7 +4281,7 @@ SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSe _sqlite3_finalize0 (stmt); #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 4427 "SavedSearchDBTable.c" +#line 4280 "SavedSearchDBTable.c" } else { #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -4438,54 +4291,55 @@ SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSe g_clear_error (&_inner_error_); #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 4437 "SavedSearchDBTable.c" +#line 4290 "SavedSearchDBTable.c" } } } } #line 602 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = saved_search_row_new (); + _tmp12_ = saved_search_row_new (); #line 602 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - row = _tmp14_; + row = _tmp12_; #line 603 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = row; + _tmp13_ = row; #line 603 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = *search_id; + _tmp14_ = *search_id; #line 603 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_->search_id = _tmp16_; + _tmp13_->search_id = _tmp14_; #line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = row; + _tmp15_ = row; #line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = stmt; + _tmp16_ = stmt; #line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = sqlite3_column_text (_tmp18_, 0); + _tmp17_ = sqlite3_column_text (_tmp16_, 0); #line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = g_strdup (_tmp19_); + _tmp18_ = g_strdup (_tmp17_); #line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_free0 (_tmp17_->name); + _g_free0 (_tmp15_->name); #line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_->name = _tmp20_; -#line 605 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = row; + _tmp15_->name = _tmp18_; #line 605 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = stmt; + _tmp19_ = row; #line 605 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = sqlite3_column_text (_tmp22_, 1); + _tmp20_ = stmt; #line 605 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = search_operator_from_string (_tmp23_); + _tmp21_ = sqlite3_column_text (_tmp20_, 1); #line 605 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_->operator = _tmp24_; + _tmp19_->operator = search_operator_from_string (_tmp21_); #line 607 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" result = row; #line 607 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 607 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 4480 "SavedSearchDBTable.c" +#line 4331 "SavedSearchDBTable.c" } -GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** error) { +GeeList* +saved_search_db_table_get_all_rows (SavedSearchDBTable* self, + GError** error) +{ GeeList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -4516,69 +4370,64 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** _tmp4_ = gee_array_list_new (TYPE_SAVED_SEARCH_ROW, (GBoxedCopyFunc) saved_search_row_ref, (GDestroyNotify) saved_search_row_unref, NULL, NULL, NULL); #line 616 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" rows = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList); -#line 4515 "SavedSearchDBTable.c" +#line 4369 "SavedSearchDBTable.c" { gboolean _tmp5_ = FALSE; #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp5_ = TRUE; #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 4522 "SavedSearchDBTable.c" +#line 4376 "SavedSearchDBTable.c" sqlite3_stmt* _tmp6_; gint _tmp7_; - gint _tmp8_; SavedSearchRow* row = NULL; + SavedSearchRow* _tmp10_; SavedSearchRow* _tmp11_; - SavedSearchRow* _tmp12_; - sqlite3_stmt* _tmp13_; - gint64 _tmp14_; - SavedSearchRow* _tmp15_; - sqlite3_stmt* _tmp16_; - const gchar* _tmp17_; - gchar* _tmp18_; - SavedSearchRow* _tmp19_; - sqlite3_stmt* _tmp20_; - const gchar* _tmp21_; - SearchOperator _tmp22_; - GeeList* _tmp23_ = NULL; + sqlite3_stmt* _tmp12_; + SavedSearchRow* _tmp13_; + sqlite3_stmt* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + SavedSearchRow* _tmp17_; + sqlite3_stmt* _tmp18_; + const gchar* _tmp19_; + GeeList* _tmp20_ = NULL; + SavedSearchRow* _tmp21_; + SavedSearchID _tmp22_; + GeeList* _tmp23_; SavedSearchRow* _tmp24_; - SavedSearchID _tmp25_; + GeeList* _tmp25_; GeeList* _tmp26_; SavedSearchRow* _tmp27_; - GeeList* _tmp28_; - GeeList* _tmp29_; - SavedSearchRow* _tmp30_; #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (!_tmp5_) { -#line 4549 "SavedSearchDBTable.c" +#line 4400 "SavedSearchDBTable.c" } #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp5_ = FALSE; #line 619 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp6_ = stmt; #line 619 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = sqlite3_step (_tmp6_); -#line 619 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp7_; + res = sqlite3_step (_tmp6_); #line 620 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 620 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp8_ == SQLITE_DONE) { + if (_tmp7_ == SQLITE_DONE) { #line 621 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 4565 "SavedSearchDBTable.c" +#line 4414 "SavedSearchDBTable.c" } else { - gint _tmp9_; + gint _tmp8_; #line 622 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = res; + _tmp8_ = res; #line 622 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp9_ != SQLITE_ROW) { -#line 4572 "SavedSearchDBTable.c" - gint _tmp10_; + if (_tmp8_ != SQLITE_ROW) { +#line 4421 "SavedSearchDBTable.c" + gint _tmp9_; #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = res; + _tmp9_ = res; #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable.get_all_rows", _tmp10_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable.get_all_rows", _tmp9_, &_inner_error_); #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4591,7 +4440,7 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** _sqlite3_finalize0 (stmt); #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 4590 "SavedSearchDBTable.c" +#line 4439 "SavedSearchDBTable.c" } else { #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _g_object_unref0 (rows); @@ -4603,53 +4452,49 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** g_clear_error (&_inner_error_); #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 4602 "SavedSearchDBTable.c" +#line 4451 "SavedSearchDBTable.c" } } } } #line 625 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = saved_search_row_new (); + _tmp10_ = saved_search_row_new (); #line 625 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - row = _tmp11_; + row = _tmp10_; #line 626 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = row; + _tmp11_ = row; #line 626 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = stmt; + _tmp12_ = stmt; #line 626 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = sqlite3_column_int64 (_tmp13_, 0); -#line 626 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - saved_search_id_init (&_tmp12_->search_id, _tmp14_); + saved_search_id_init (&_tmp11_->search_id, sqlite3_column_int64 (_tmp12_, 0)); #line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = row; + _tmp13_ = row; #line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = stmt; + _tmp14_ = stmt; #line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = sqlite3_column_text (_tmp16_, 1); + _tmp15_ = sqlite3_column_text (_tmp14_, 1); #line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = g_strdup (_tmp17_); + _tmp16_ = g_strdup (_tmp15_); #line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_free0 (_tmp15_->name); + _g_free0 (_tmp13_->name); #line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_->name = _tmp18_; -#line 628 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = row; + _tmp13_->name = _tmp16_; #line 628 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = stmt; + _tmp17_ = row; #line 628 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = sqlite3_column_text (_tmp20_, 2); + _tmp18_ = stmt; #line 628 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = search_operator_from_string (_tmp21_); + _tmp19_ = sqlite3_column_text (_tmp18_, 2); #line 628 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_->operator = _tmp22_; + _tmp17_->operator = search_operator_from_string (_tmp19_); #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = row; + _tmp21_ = row; #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp25_ = _tmp24_->search_id; + _tmp22_ = _tmp21_->search_id; #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp26_ = saved_search_db_table_get_conditions_for_id (self, &_tmp25_, &_inner_error_); + _tmp23_ = saved_search_db_table_get_conditions_for_id (self, &_tmp22_, &_inner_error_); #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = _tmp26_; + _tmp20_ = _tmp23_; #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4664,7 +4509,7 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** _sqlite3_finalize0 (stmt); #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 4663 "SavedSearchDBTable.c" +#line 4508 "SavedSearchDBTable.c" } else { #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _saved_search_row_unref0 (row); @@ -4678,30 +4523,30 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** g_clear_error (&_inner_error_); #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 4677 "SavedSearchDBTable.c" +#line 4522 "SavedSearchDBTable.c" } } #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_ = row; + _tmp24_ = row; #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp28_ = _tmp23_; + _tmp25_ = _tmp20_; #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = NULL; + _tmp20_ = NULL; #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_object_unref0 (_tmp27_->conditions); + _g_object_unref0 (_tmp24_->conditions); #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_->conditions = _tmp28_; + _tmp24_->conditions = _tmp25_; #line 631 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_ = rows; + _tmp26_ = rows; #line 631 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp30_ = row; + _tmp27_ = row; #line 631 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), _tmp30_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_); #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp20_); #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _saved_search_row_unref0 (row); -#line 4700 "SavedSearchDBTable.c" +#line 4545 "SavedSearchDBTable.c" } } #line 634 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4710,14 +4555,18 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** _sqlite3_finalize0 (stmt); #line 634 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 4709 "SavedSearchDBTable.c" +#line 4554 "SavedSearchDBTable.c" } -void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* search_id, const gchar* new_name, GError** error) { +void +saved_search_db_table_rename (SavedSearchDBTable* self, + SavedSearchID* search_id, + const gchar* new_name, + GError** error) +{ SavedSearchID _tmp0_; gint64 _tmp1_; - const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 637 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self)); @@ -4730,9 +4579,7 @@ void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* sear #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp1_ = _tmp0_.id; #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp2_ = new_name; -#line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "name", _tmp2_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "name", new_name, &_inner_error_); #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4741,7 +4588,7 @@ void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* sear g_propagate_error (error, _inner_error_); #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4740 "SavedSearchDBTable.c" +#line 4587 "SavedSearchDBTable.c" } else { #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4749,36 +4596,44 @@ void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* sear g_clear_error (&_inner_error_); #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4748 "SavedSearchDBTable.c" +#line 4595 "SavedSearchDBTable.c" } } } -static void saved_search_db_table_class_init (SavedSearchDBTableClass * klass) { +static void +saved_search_db_table_class_init (SavedSearchDBTableClass * klass) +{ #line 33 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_db_table_parent_class = g_type_class_peek_parent (klass); #line 33 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" ((DatabaseTableClass *) klass)->finalize = saved_search_db_table_finalize; -#line 4759 "SavedSearchDBTable.c" +#line 4608 "SavedSearchDBTable.c" } -static void saved_search_db_table_instance_init (SavedSearchDBTable * self) { +static void +saved_search_db_table_instance_init (SavedSearchDBTable * self) +{ } -static void saved_search_db_table_finalize (DatabaseTable * obj) { +static void +saved_search_db_table_finalize (DatabaseTable * obj) +{ SavedSearchDBTable * self; #line 33 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_DB_TABLE, SavedSearchDBTable); #line 33 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" DATABASE_TABLE_CLASS (saved_search_db_table_parent_class)->finalize (obj); -#line 4773 "SavedSearchDBTable.c" +#line 4626 "SavedSearchDBTable.c" } -GType saved_search_db_table_get_type (void) { +GType +saved_search_db_table_get_type (void) +{ static volatile gsize saved_search_db_table_type_id__volatile = 0; if (g_once_init_enter (&saved_search_db_table_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDBTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_db_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDBTable), 0, (GInstanceInitFunc) saved_search_db_table_instance_init, NULL }; diff --git a/src/db/TagTable.c b/src/db/TagTable.c index 986af84..b1c77a4 100644 --- a/src/db/TagTable.c +++ b/src/db/TagTable.c @@ -1,4 +1,4 @@ -/* TagTable.c generated by valac 0.36.6, the Vala compiler +/* TagTable.c generated by valac 0.40.4, the Vala compiler * generated from TagTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -137,83 +138,131 @@ GType tag_id_get_type (void) G_GNUC_CONST; TagID* tag_id_dup (const TagID* self); void tag_id_free (TagID* self); #define TAG_ID_INVALID ((gint64) -1) -void tag_id_init (TagID *self, gint64 id); +void tag_id_init (TagID *self, + gint64 id); gboolean tag_id_is_invalid (TagID *self); gboolean tag_id_is_valid (TagID *self); gpointer tag_row_ref (gpointer instance); void tag_row_unref (gpointer instance); -GParamSpec* param_spec_tag_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_tag_row (GValue* value, gpointer v_object); -void value_take_tag_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_tag_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_tag_row (GValue* value, + gpointer v_object); +void value_take_tag_row (GValue* value, + gpointer v_object); gpointer value_get_tag_row (const GValue* value); GType tag_row_get_type (void) G_GNUC_CONST; -enum { - TAG_ROW_DUMMY_PROPERTY -}; TagRow* tag_row_new (void); TagRow* tag_row_construct (GType object_type); static void tag_row_finalize (TagRow * obj); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType tag_table_get_type (void) G_GNUC_CONST; -enum { - TAG_TABLE_DUMMY_PROPERTY -}; static TagTable* tag_table_new (void); static TagTable* tag_table_construct (GType object_type); DatabaseTable* database_table_construct (GType object_type); -void database_table_set_table_name (DatabaseTable* self, const gchar* table_name); -void database_table_fatal (const gchar* op, gint res); +void database_table_set_table_name (DatabaseTable* self, + const gchar* table_name); +void database_table_fatal (const gchar* op, + gint res); TagTable* tag_table_get_instance (void); void tag_table_upgrade_for_htags (void); GQuark database_error_quark (void); -GeeList* tag_table_get_all_rows (TagTable* self, GError** error); +GeeList* tag_table_get_all_rows (TagTable* self, + GError** error); #define TAG_PATH_SEPARATOR_STRING "/" -void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GError** error); -TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error); +void tag_table_rename (TagTable* self, + TagID* tag_id, + const gchar* new_name, + GError** error); +TagRow* tag_table_add (TagTable* self, + const gchar* name, + GError** error); gulong now_sec (void); -void database_table_throw_error (const gchar* method, gint res, GError** error); -void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GError** error); -static gchar* tag_table_serialize_source_ids (TagTable* self, GeeCollection* source_ids); -void tag_table_remove (TagTable* self, TagID* tag_id, GError** error); -void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error); -gchar* tag_table_get_name (TagTable* self, TagID* tag_id, GError** error); -gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt* * stmt); -TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error); -static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* text_list); -void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error); -void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection* source_ids, GError** error); +void database_table_throw_error (const gchar* method, + gint res, + GError** error); +void tag_table_create_from_row (TagTable* self, + TagRow* row, + TagID* result, + GError** error); +static gchar* tag_table_serialize_source_ids (TagTable* self, + GeeCollection* source_ids); +void tag_table_remove (TagTable* self, + TagID* tag_id, + GError** error); +void database_table_delete_by_id (DatabaseTable* self, + gint64 id, + GError** error); +gchar* tag_table_get_name (TagTable* self, + TagID* tag_id, + GError** error); +gboolean database_table_select_by_id (DatabaseTable* self, + gint64 id, + const gchar* columns, + sqlite3_stmt* * stmt); +TagRow* tag_table_get_row (TagTable* self, + TagID* tag_id, + GError** error); +static GeeSet* tag_table_unserialize_source_ids (TagTable* self, + const gchar* text_list); +void database_table_update_text_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text, + GError** error); +void tag_table_set_tagged_sources (TagTable* self, + TagID* tag_id, + GeeCollection* source_ids, + GError** error); gboolean is_string_empty (const gchar* s); GType photo_id_get_type (void) G_GNUC_CONST; PhotoID* photo_id_dup (const PhotoID* self); void photo_id_free (PhotoID* self); gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id); -gint64 parse_int64 (const gchar* str, gint num_base); -void photo_id_init (PhotoID *self, gint64 id); +gint64 parse_int64 (const gchar* str, + gint num_base); +void photo_id_init (PhotoID *self, + gint64 id); static void tag_table_finalize (DatabaseTable * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); -void tag_id_init (TagID *self, gint64 id) { - gint64 _tmp0_; +void +tag_id_init (TagID *self, + gint64 id) +{ #line 12 "/home/jens/Source/shotwell/src/db/TagTable.vala" memset (self, 0, sizeof (TagID)); #line 13 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp0_ = id; -#line 13 "/home/jens/Source/shotwell/src/db/TagTable.vala" - (*self).id = _tmp0_; -#line 213 "TagTable.c" + (*self).id = id; +#line 260 "TagTable.c" } -gboolean tag_id_is_invalid (TagID *self) { +gboolean +tag_id_is_invalid (TagID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 17 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -222,11 +271,13 @@ gboolean tag_id_is_invalid (TagID *self) { result = _tmp0_ == TAG_ID_INVALID; #line 17 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 226 "TagTable.c" +#line 275 "TagTable.c" } -gboolean tag_id_is_valid (TagID *self) { +gboolean +tag_id_is_valid (TagID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 21 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -235,11 +286,13 @@ gboolean tag_id_is_valid (TagID *self) { result = _tmp0_ != TAG_ID_INVALID; #line 21 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 239 "TagTable.c" +#line 290 "TagTable.c" } -TagID* tag_id_dup (const TagID* self) { +TagID* +tag_id_dup (const TagID* self) +{ TagID* dup; #line 7 "/home/jens/Source/shotwell/src/db/TagTable.vala" dup = g_new0 (TagID, 1); @@ -247,18 +300,22 @@ TagID* tag_id_dup (const TagID* self) { memcpy (dup, self, sizeof (TagID)); #line 7 "/home/jens/Source/shotwell/src/db/TagTable.vala" return dup; -#line 251 "TagTable.c" +#line 304 "TagTable.c" } -void tag_id_free (TagID* self) { +void +tag_id_free (TagID* self) +{ #line 7 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_free (self); -#line 258 "TagTable.c" +#line 313 "TagTable.c" } -GType tag_id_get_type (void) { +GType +tag_id_get_type (void) +{ static volatile gsize tag_id_type_id__volatile = 0; if (g_once_init_enter (&tag_id_type_id__volatile)) { GType tag_id_type_id; @@ -269,121 +326,150 @@ GType tag_id_get_type (void) { } -TagRow* tag_row_construct (GType object_type) { +TagRow* +tag_row_construct (GType object_type) +{ TagRow* self = NULL; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" self = (TagRow*) g_type_create_instance (object_type); #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" return self; -#line 279 "TagTable.c" +#line 338 "TagTable.c" } -TagRow* tag_row_new (void) { +TagRow* +tag_row_new (void) +{ #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" return tag_row_construct (TYPE_TAG_ROW); -#line 286 "TagTable.c" +#line 347 "TagTable.c" } -static void value_tag_row_init (GValue* value) { +static void +value_tag_row_init (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" value->data[0].v_pointer = NULL; -#line 293 "TagTable.c" +#line 356 "TagTable.c" } -static void value_tag_row_free_value (GValue* value) { +static void +value_tag_row_free_value (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" tag_row_unref (value->data[0].v_pointer); -#line 302 "TagTable.c" +#line 367 "TagTable.c" } } -static void value_tag_row_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_tag_row_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (src_value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" dest_value->data[0].v_pointer = tag_row_ref (src_value->data[0].v_pointer); -#line 312 "TagTable.c" +#line 380 "TagTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" dest_value->data[0].v_pointer = NULL; -#line 316 "TagTable.c" +#line 384 "TagTable.c" } } -static gpointer value_tag_row_peek_pointer (const GValue* value) { +static gpointer +value_tag_row_peek_pointer (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" return value->data[0].v_pointer; -#line 324 "TagTable.c" +#line 394 "TagTable.c" } -static gchar* value_tag_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_tag_row_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (collect_values[0].v_pointer) { -#line 331 "TagTable.c" +#line 406 "TagTable.c" TagRow * object; object = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (object->parent_instance.g_class == NULL) { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 338 "TagTable.c" +#line 413 "TagTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.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 342 "TagTable.c" +#line 417 "TagTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" value->data[0].v_pointer = tag_row_ref (object); -#line 346 "TagTable.c" +#line 421 "TagTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" value->data[0].v_pointer = NULL; -#line 350 "TagTable.c" +#line 425 "TagTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 354 "TagTable.c" +#line 429 "TagTable.c" } -static gchar* value_tag_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_tag_row_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ TagRow ** object_p; object_p = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (!object_p) { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 365 "TagTable.c" +#line 445 "TagTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (!value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" *object_p = NULL; -#line 371 "TagTable.c" +#line 451 "TagTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" *object_p = value->data[0].v_pointer; -#line 375 "TagTable.c" +#line 455 "TagTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" *object_p = tag_row_ref (value->data[0].v_pointer); -#line 379 "TagTable.c" +#line 459 "TagTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 383 "TagTable.c" +#line 463 "TagTable.c" } -GParamSpec* param_spec_tag_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_tag_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecTagRow* spec; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_TAG_ROW), NULL); @@ -393,20 +479,25 @@ GParamSpec* param_spec_tag_row (const gchar* name, const gchar* nick, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" return G_PARAM_SPEC (spec); -#line 397 "TagTable.c" +#line 483 "TagTable.c" } -gpointer value_get_tag_row (const GValue* value) { +gpointer +value_get_tag_row (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TAG_ROW), NULL); #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" return value->data[0].v_pointer; -#line 406 "TagTable.c" +#line 494 "TagTable.c" } -void value_set_tag_row (GValue* value, gpointer v_object) { +void +value_set_tag_row (GValue* value, + gpointer v_object) +{ TagRow * old; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TAG_ROW)); @@ -422,22 +513,25 @@ void value_set_tag_row (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" tag_row_ref (value->data[0].v_pointer); -#line 426 "TagTable.c" +#line 517 "TagTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" value->data[0].v_pointer = NULL; -#line 430 "TagTable.c" +#line 521 "TagTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" tag_row_unref (old); -#line 436 "TagTable.c" +#line 527 "TagTable.c" } } -void value_take_tag_row (GValue* value, gpointer v_object) { +void +value_take_tag_row (GValue* value, + gpointer v_object) +{ TagRow * old; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TAG_ROW)); @@ -451,38 +545,44 @@ void value_take_tag_row (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" value->data[0].v_pointer = v_object; -#line 455 "TagTable.c" +#line 549 "TagTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" value->data[0].v_pointer = NULL; -#line 459 "TagTable.c" +#line 553 "TagTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" tag_row_unref (old); -#line 465 "TagTable.c" +#line 559 "TagTable.c" } } -static void tag_row_class_init (TagRowClass * klass) { +static void +tag_row_class_init (TagRowClass * klass) +{ #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" tag_row_parent_class = g_type_class_peek_parent (klass); #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" ((TagRowClass *) klass)->finalize = tag_row_finalize; -#line 475 "TagTable.c" +#line 571 "TagTable.c" } -static void tag_row_instance_init (TagRow * self) { +static void +tag_row_instance_init (TagRow * self) +{ #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" self->ref_count = 1; -#line 482 "TagTable.c" +#line 580 "TagTable.c" } -static void tag_row_finalize (TagRow * obj) { +static void +tag_row_finalize (TagRow * obj) +{ TagRow * self; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TAG_ROW, TagRow); @@ -492,11 +592,13 @@ static void tag_row_finalize (TagRow * obj) { _g_free0 (self->name); #line 28 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_object_unref0 (self->source_id_list); -#line 496 "TagTable.c" +#line 596 "TagTable.c" } -GType tag_row_get_type (void) { +GType +tag_row_get_type (void) +{ static volatile gsize tag_row_type_id__volatile = 0; if (g_once_init_enter (&tag_row_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_tag_row_init, value_tag_row_free_value, value_tag_row_copy_value, value_tag_row_peek_pointer, "p", value_tag_row_collect_value, "p", value_tag_row_lcopy_value }; @@ -510,18 +612,22 @@ GType tag_row_get_type (void) { } -gpointer tag_row_ref (gpointer instance) { +gpointer +tag_row_ref (gpointer instance) +{ TagRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_atomic_int_inc (&self->ref_count); #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" return instance; -#line 521 "TagTable.c" +#line 625 "TagTable.c" } -void tag_row_unref (gpointer instance) { +void +tag_row_unref (gpointer instance) +{ TagRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -530,12 +636,14 @@ void tag_row_unref (gpointer instance) { TAG_ROW_GET_CLASS (self)->finalize (self); #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 534 "TagTable.c" +#line 640 "TagTable.c" } } -static TagTable* tag_table_construct (GType object_type) { +static TagTable* +tag_table_construct (GType object_type) +{ TagTable* self = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -545,7 +653,6 @@ static TagTable* tag_table_construct (GType object_type) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; #line 35 "/home/jens/Source/shotwell/src/db/TagTable.vala" self = (TagTable*) database_table_construct (object_type); #line 36 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -567,44 +674,48 @@ static TagTable* tag_table_construct (GType object_type) { #line 49 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp4_ = stmt; #line 49 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 49 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 50 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 50 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp6_ != SQLITE_DONE) { -#line 578 "TagTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_DONE) { +#line 683 "TagTable.c" + gint _tmp6_; #line 51 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 51 "/home/jens/Source/shotwell/src/db/TagTable.vala" - database_table_fatal ("create TagTable", _tmp7_); -#line 584 "TagTable.c" + database_table_fatal ("create TagTable", _tmp6_); +#line 689 "TagTable.c" } #line 35 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); #line 35 "/home/jens/Source/shotwell/src/db/TagTable.vala" return self; -#line 590 "TagTable.c" +#line 695 "TagTable.c" } -static TagTable* tag_table_new (void) { +static TagTable* +tag_table_new (void) +{ #line 35 "/home/jens/Source/shotwell/src/db/TagTable.vala" return tag_table_construct (TYPE_TAG_TABLE); -#line 597 "TagTable.c" +#line 704 "TagTable.c" } -static gpointer _database_table_ref0 (gpointer self) { +static gpointer +_database_table_ref0 (gpointer self) +{ #line 58 "/home/jens/Source/shotwell/src/db/TagTable.vala" return self ? database_table_ref (self) : NULL; -#line 604 "TagTable.c" +#line 713 "TagTable.c" } -TagTable* tag_table_get_instance (void) { +TagTable* +tag_table_get_instance (void) +{ TagTable* result = NULL; TagTable* _tmp0_; TagTable* _tmp2_; @@ -613,7 +724,7 @@ TagTable* tag_table_get_instance (void) { _tmp0_ = tag_table_instance; #line 55 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (_tmp0_ == NULL) { -#line 617 "TagTable.c" +#line 728 "TagTable.c" TagTable* _tmp1_; #line 56 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp1_ = tag_table_new (); @@ -621,7 +732,7 @@ TagTable* tag_table_get_instance (void) { _database_table_unref0 (tag_table_instance); #line 56 "/home/jens/Source/shotwell/src/db/TagTable.vala" tag_table_instance = _tmp1_; -#line 625 "TagTable.c" +#line 736 "TagTable.c" } #line 58 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp2_ = tag_table_instance; @@ -631,180 +742,173 @@ TagTable* tag_table_get_instance (void) { result = _tmp3_; #line 58 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 635 "TagTable.c" +#line 746 "TagTable.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala" return self ? g_object_ref (self) : NULL; -#line 642 "TagTable.c" +#line 755 "TagTable.c" } -static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { +static gchar* +string_replace (const gchar* self, + const gchar* old, + const gchar* replacement) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if ((*((gchar*) self)) == '\0') { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 661 "TagTable.c" +#line 778 "TagTable.c" } else { - const gchar* _tmp2_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; -#line 668 "TagTable.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) old)) == '\0'; +#line 782 "TagTable.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = TRUE; -#line 674 "TagTable.c" +#line 788 "TagTable.c" } else { - const gchar* _tmp3_; - const gchar* _tmp4_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = replacement; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; -#line 684 "TagTable.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (old, replacement) == 0; +#line 792 "TagTable.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 688 "TagTable.c" - gchar* _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = g_strdup (self); -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 796 "TagTable.c" + gchar* _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = g_strdup (self); +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 696 "TagTable.c" +#line 804 "TagTable.c" } { GRegex* regex = NULL; - const gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - GRegex* _tmp9_; - GRegex* _tmp10_; - gchar* _tmp11_ = NULL; - GRegex* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = old; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = g_regex_escape_string (_tmp6_, -1); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = _tmp9_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp8_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - regex = _tmp10_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp3_; + gchar* _tmp4_; + GRegex* _tmp5_; + GRegex* _tmp6_; + gchar* _tmp7_ = NULL; + GRegex* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_regex_escape_string (old, -1); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = _tmp3_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp5_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp4_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + regex = _tmp6_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 728 "TagTable.c" +#line 832 "TagTable.c" goto __catch21_g_regex_error; } -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 737 "TagTable.c" +#line 841 "TagTable.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = regex; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = replacement; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp14_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = regex; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp9_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 753 "TagTable.c" +#line 855 "TagTable.c" goto __catch21_g_regex_error; } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 764 "TagTable.c" +#line 866 "TagTable.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = _tmp11_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = NULL; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp15_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp11_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = _tmp7_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = NULL; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp10_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp7_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 778 "TagTable.c" +#line 880 "TagTable.c" } goto __finally21; __catch21_g_regex_error: { GError* e = NULL; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 792 "TagTable.c" +#line 894 "TagTable.c" } __finally21: -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 803 "TagTable.c" +#line 905 "TagTable.c" } } -void tag_table_upgrade_for_htags (void) { +void +tag_table_upgrade_for_htags (void) +{ TagTable* table = NULL; TagTable* _tmp0_; GError * _inner_error_ = NULL; @@ -812,7 +916,7 @@ void tag_table_upgrade_for_htags (void) { _tmp0_ = tag_table_get_instance (); #line 62 "/home/jens/Source/shotwell/src/db/TagTable.vala" table = _tmp0_; -#line 816 "TagTable.c" +#line 920 "TagTable.c" { GeeList* rows = NULL; TagTable* _tmp1_; @@ -827,7 +931,7 @@ void tag_table_upgrade_for_htags (void) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 831 "TagTable.c" +#line 935 "TagTable.c" goto __catch20_database_error; } #line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -838,7 +942,7 @@ void tag_table_upgrade_for_htags (void) { g_clear_error (&_inner_error_); #line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 842 "TagTable.c" +#line 946 "TagTable.c" } { GeeList* _row_list = NULL; @@ -867,7 +971,7 @@ void tag_table_upgrade_for_htags (void) { _row_index = -1; #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala" while (TRUE) { -#line 871 "TagTable.c" +#line 975 "TagTable.c" gint _tmp8_; gint _tmp9_; gint _tmp10_; @@ -896,7 +1000,7 @@ void tag_table_upgrade_for_htags (void) { if (!(_tmp9_ < _tmp10_)) { #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala" break; -#line 900 "TagTable.c" +#line 1004 "TagTable.c" } #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp11_ = _row_list; @@ -940,7 +1044,7 @@ void tag_table_upgrade_for_htags (void) { _g_object_unref0 (rows); #line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 944 "TagTable.c" +#line 1048 "TagTable.c" goto __catch20_database_error; } #line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -957,19 +1061,19 @@ void tag_table_upgrade_for_htags (void) { g_clear_error (&_inner_error_); #line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 961 "TagTable.c" +#line 1065 "TagTable.c" } #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tag_row_unref0 (row); -#line 965 "TagTable.c" +#line 1069 "TagTable.c" } #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_object_unref0 (_row_list); -#line 969 "TagTable.c" +#line 1073 "TagTable.c" } #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_object_unref0 (rows); -#line 973 "TagTable.c" +#line 1077 "TagTable.c" } goto __finally20; __catch20_database_error: @@ -987,7 +1091,7 @@ void tag_table_upgrade_for_htags (void) { "ag support: %s", _tmp23_); #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_error_free0 (e); -#line 990 "TagTable.c" +#line 1094 "TagTable.c" } __finally20: #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1000,15 +1104,19 @@ void tag_table_upgrade_for_htags (void) { g_clear_error (&_inner_error_); #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1003 "TagTable.c" +#line 1107 "TagTable.c" } #line 61 "/home/jens/Source/shotwell/src/db/TagTable.vala" _database_table_unref0 (table); -#line 1007 "TagTable.c" +#line 1111 "TagTable.c" } -TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error) { +TagRow* +tag_table_add (TagTable* self, + const gchar* name, + GError** error) +{ TagRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1017,31 +1125,24 @@ TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error) { gint _tmp2_; gint _tmp3_; time_t time_created = 0; - gulong _tmp4_; - sqlite3_stmt* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; - GDestroyNotify _tmp8_; - gint _tmp9_; + sqlite3_stmt* _tmp4_; + gchar* _tmp5_; + GDestroyNotify _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; + time_t _tmp9_; gint _tmp10_; sqlite3_stmt* _tmp11_; - time_t _tmp12_; - gint _tmp13_; - gint _tmp14_; - sqlite3_stmt* _tmp15_; - gint _tmp16_; - gint _tmp17_; + gint _tmp12_; TagRow* row = NULL; + TagRow* _tmp14_; + TagRow* _tmp15_; + sqlite3* _tmp16_; + TagRow* _tmp17_; + gchar* _tmp18_; TagRow* _tmp19_; TagRow* _tmp20_; - sqlite3* _tmp21_; - gint64 _tmp22_; - TagRow* _tmp23_; - const gchar* _tmp24_; - gchar* _tmp25_; - TagRow* _tmp26_; - TagRow* _tmp27_; - time_t _tmp28_; + time_t _tmp21_; GError * _inner_error_ = NULL; #line 76 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail (IS_TAG_TABLE (self), NULL); @@ -1062,53 +1163,43 @@ TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error) { #line 80 "/home/jens/Source/shotwell/src/db/TagTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 82 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp4_ = now_sec (); -#line 82 "/home/jens/Source/shotwell/src/db/TagTable.vala" - time_created = (time_t) _tmp4_; -#line 84 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp5_ = stmt; + time_created = (time_t) now_sec (); #line 84 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp6_ = name; -#line 84 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp4_ = stmt; #line 84 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp8_ = g_free; + _tmp5_ = g_strdup (name); #line 84 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp9_ = sqlite3_bind_text (_tmp5_, 1, _tmp7_, -1, _tmp8_); + _tmp6_ = g_free; #line 84 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp9_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_); #line 85 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp10_ = res; + _tmp7_ = res; #line 85 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 86 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp11_ = stmt; + _tmp8_ = stmt; #line 86 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp12_ = time_created; + _tmp9_ = time_created; #line 86 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp13_ = sqlite3_bind_int64 (_tmp11_, 2, (gint64) _tmp12_); -#line 86 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp13_; + res = sqlite3_bind_int64 (_tmp8_, 2, (gint64) _tmp9_); #line 87 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp14_ = res; + _tmp10_ = res; #line 87 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _vala_assert (_tmp14_ == SQLITE_OK, "res == Sqlite.OK"); -#line 89 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp15_ = stmt; + _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); #line 89 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp16_ = sqlite3_step (_tmp15_); + _tmp11_ = stmt; #line 89 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp16_; + res = sqlite3_step (_tmp11_); #line 90 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp17_ = res; + _tmp12_ = res; #line 90 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp17_ != SQLITE_DONE) { -#line 1106 "TagTable.c" - gint _tmp18_; + if (_tmp12_ != SQLITE_DONE) { +#line 1197 "TagTable.c" + gint _tmp13_; #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp18_ = res; + _tmp13_ = res; #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala" - database_table_throw_error ("TagTable.add", _tmp18_, &_inner_error_); + database_table_throw_error ("TagTable.add", _tmp13_, &_inner_error_); #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1119,7 +1210,7 @@ TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error) { _sqlite3_finalize0 (stmt); #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 1122 "TagTable.c" +#line 1213 "TagTable.c" } else { #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); @@ -1129,55 +1220,56 @@ TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error) { g_clear_error (&_inner_error_); #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 1132 "TagTable.c" +#line 1223 "TagTable.c" } } } #line 93 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp19_ = tag_row_new (); + _tmp14_ = tag_row_new (); #line 93 "/home/jens/Source/shotwell/src/db/TagTable.vala" - row = _tmp19_; -#line 94 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp20_ = row; + row = _tmp14_; #line 94 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp21_ = database_table_db; + _tmp15_ = row; #line 94 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp22_ = sqlite3_last_insert_rowid (_tmp21_); + _tmp16_ = database_table_db; #line 94 "/home/jens/Source/shotwell/src/db/TagTable.vala" - tag_id_init (&_tmp20_->tag_id, _tmp22_); + tag_id_init (&_tmp15_->tag_id, sqlite3_last_insert_rowid (_tmp16_)); #line 95 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp23_ = row; -#line 95 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp24_ = name; + _tmp17_ = row; #line 95 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp25_ = g_strdup (_tmp24_); + _tmp18_ = g_strdup (name); #line 95 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _g_free0 (_tmp23_->name); + _g_free0 (_tmp17_->name); #line 95 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp23_->name = _tmp25_; + _tmp17_->name = _tmp18_; #line 96 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp26_ = row; + _tmp19_ = row; #line 96 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _g_object_unref0 (_tmp26_->source_id_list); + _g_object_unref0 (_tmp19_->source_id_list); #line 96 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp26_->source_id_list = NULL; + _tmp19_->source_id_list = NULL; #line 97 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp27_ = row; + _tmp20_ = row; #line 97 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp28_ = time_created; + _tmp21_ = time_created; #line 97 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp27_->time_created = _tmp28_; + _tmp20_->time_created = _tmp21_; #line 99 "/home/jens/Source/shotwell/src/db/TagTable.vala" result = row; #line 99 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); #line 99 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1176 "TagTable.c" +#line 1263 "TagTable.c" } -void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GError** error) { +void +tag_table_create_from_row (TagTable* self, + TagRow* row, + TagID* result, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -1185,30 +1277,22 @@ void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GErr gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - TagRow* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; - GDestroyNotify _tmp8_; - gint _tmp9_; - gint _tmp10_; - sqlite3_stmt* _tmp11_; - TagRow* _tmp12_; - GeeSet* _tmp13_; - gchar* _tmp14_; - GDestroyNotify _tmp15_; + const gchar* _tmp5_; + gchar* _tmp6_; + GDestroyNotify _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + GeeSet* _tmp10_; + gchar* _tmp11_; + GDestroyNotify _tmp12_; + gint _tmp13_; + sqlite3_stmt* _tmp14_; + time_t _tmp15_; gint _tmp16_; - gint _tmp17_; - sqlite3_stmt* _tmp18_; - TagRow* _tmp19_; - time_t _tmp20_; - gint _tmp21_; - gint _tmp22_; - sqlite3_stmt* _tmp23_; - gint _tmp24_; - gint _tmp25_; - sqlite3* _tmp27_; - gint64 _tmp28_; - TagID _tmp29_ = {0}; + sqlite3_stmt* _tmp17_; + gint _tmp18_; + sqlite3* _tmp20_; + TagID _tmp21_ = {0}; GError * _inner_error_ = NULL; #line 103 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_if_fail (IS_TAG_TABLE (self)); @@ -1232,69 +1316,55 @@ void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GErr #line 109 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp4_ = stmt; #line 109 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp5_ = row; -#line 109 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp6_ = _tmp5_->name; + _tmp5_ = row->name; #line 109 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp7_ = g_strdup (_tmp6_); -#line 109 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp8_ = g_free; + _tmp6_ = g_strdup (_tmp5_); #line 109 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp9_ = sqlite3_bind_text (_tmp4_, 1, _tmp7_, -1, _tmp8_); + _tmp7_ = g_free; #line 109 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp9_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); #line 110 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp10_ = res; + _tmp8_ = res; #line 110 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); -#line 111 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp11_ = stmt; -#line 111 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp12_ = row; + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 111 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp13_ = _tmp12_->source_id_list; + _tmp9_ = stmt; #line 111 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp14_ = tag_table_serialize_source_ids (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp10_ = row->source_id_list; #line 111 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp15_ = g_free; + _tmp11_ = tag_table_serialize_source_ids (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection)); #line 111 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp16_ = sqlite3_bind_text (_tmp11_, 2, _tmp14_, -1, _tmp15_); + _tmp12_ = g_free; #line 111 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp16_; + res = sqlite3_bind_text (_tmp9_, 2, _tmp11_, -1, _tmp12_); #line 112 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp17_ = res; + _tmp13_ = res; #line 112 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); #line 113 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp18_ = stmt; + _tmp14_ = stmt; #line 113 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp19_ = row; -#line 113 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp20_ = _tmp19_->time_created; -#line 113 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp21_ = sqlite3_bind_int64 (_tmp18_, 3, (gint64) _tmp20_); + _tmp15_ = row->time_created; #line 113 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp21_; + res = sqlite3_bind_int64 (_tmp14_, 3, (gint64) _tmp15_); #line 114 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp22_ = res; + _tmp16_ = res; #line 114 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _vala_assert (_tmp22_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK"); #line 116 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp23_ = stmt; + _tmp17_ = stmt; #line 116 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp24_ = sqlite3_step (_tmp23_); -#line 116 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp24_; + res = sqlite3_step (_tmp17_); #line 117 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp25_ = res; + _tmp18_ = res; #line 117 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp25_ != SQLITE_DONE) { -#line 1291 "TagTable.c" - gint _tmp26_; + if (_tmp18_ != SQLITE_DONE) { +#line 1361 "TagTable.c" + gint _tmp19_; #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp26_ = res; + _tmp19_ = res; #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala" - database_table_throw_error ("TagTable.create_from_row", _tmp26_, &_inner_error_); + database_table_throw_error ("TagTable.create_from_row", _tmp19_, &_inner_error_); #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1305,7 +1375,7 @@ void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GErr _sqlite3_finalize0 (stmt); #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1307 "TagTable.c" +#line 1377 "TagTable.c" } else { #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); @@ -1315,27 +1385,29 @@ void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GErr g_clear_error (&_inner_error_); #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1317 "TagTable.c" +#line 1387 "TagTable.c" } } } #line 120 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp27_ = database_table_db; -#line 120 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp28_ = sqlite3_last_insert_rowid (_tmp27_); + _tmp20_ = database_table_db; #line 120 "/home/jens/Source/shotwell/src/db/TagTable.vala" - tag_id_init (&_tmp29_, _tmp28_); + tag_id_init (&_tmp21_, sqlite3_last_insert_rowid (_tmp20_)); #line 120 "/home/jens/Source/shotwell/src/db/TagTable.vala" - *result = _tmp29_; + *result = _tmp21_; #line 120 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); #line 120 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1333 "TagTable.c" +#line 1401 "TagTable.c" } -void tag_table_remove (TagTable* self, TagID* tag_id, GError** error) { +void +tag_table_remove (TagTable* self, + TagID* tag_id, + GError** error) +{ TagID _tmp0_; gint64 _tmp1_; GError * _inner_error_ = NULL; @@ -1357,7 +1429,7 @@ void tag_table_remove (TagTable* self, TagID* tag_id, GError** error) { g_propagate_error (error, _inner_error_); #line 124 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1359 "TagTable.c" +#line 1431 "TagTable.c" } else { #line 124 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1365,13 +1437,17 @@ void tag_table_remove (TagTable* self, TagID* tag_id, GError** error) { g_clear_error (&_inner_error_); #line 124 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1367 "TagTable.c" +#line 1439 "TagTable.c" } } } -gchar* tag_table_get_name (TagTable* self, TagID* tag_id, GError** error) { +gchar* +tag_table_get_name (TagTable* self, + TagID* tag_id, + GError** error) +{ gchar* result = NULL; sqlite3_stmt* stmt = NULL; TagID _tmp0_; @@ -1403,7 +1479,7 @@ gchar* tag_table_get_name (TagTable* self, TagID* tag_id, GError** error) { _sqlite3_finalize0 (stmt); #line 130 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1405 "TagTable.c" +#line 1481 "TagTable.c" } #line 132 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp4_ = stmt; @@ -1417,11 +1493,15 @@ gchar* tag_table_get_name (TagTable* self, TagID* tag_id, GError** error) { _sqlite3_finalize0 (stmt); #line 132 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1419 "TagTable.c" +#line 1495 "TagTable.c" } -TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error) { +TagRow* +tag_table_get_row (TagTable* self, + TagID* tag_id, + GError** error) +{ TagRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1433,25 +1513,22 @@ TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error) { TagID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; - gint _tmp11_; + sqlite3_stmt* _tmp8_; + gint _tmp9_; TagRow* row = NULL; - TagRow* _tmp14_; + TagRow* _tmp12_; + TagRow* _tmp13_; + TagID _tmp14_; TagRow* _tmp15_; - TagID _tmp16_; - TagRow* _tmp17_; - sqlite3_stmt* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; - TagRow* _tmp21_; - sqlite3_stmt* _tmp22_; - const gchar* _tmp23_; - GeeSet* _tmp24_; - TagRow* _tmp25_; - sqlite3_stmt* _tmp26_; - gint64 _tmp27_; + sqlite3_stmt* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; + TagRow* _tmp19_; + sqlite3_stmt* _tmp20_; + const gchar* _tmp21_; + GeeSet* _tmp22_; + TagRow* _tmp23_; + sqlite3_stmt* _tmp24_; GError * _inner_error_ = NULL; #line 135 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail (IS_TAG_TABLE (self), NULL); @@ -1478,42 +1555,38 @@ TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error) { #line 141 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp6_ = _tmp5_.id; #line 141 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 141 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 142 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 142 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 144 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp9_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 144 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 144 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp10_; + res = sqlite3_step (_tmp8_); #line 145 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 145 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp11_ == SQLITE_DONE) { + if (_tmp9_ == SQLITE_DONE) { #line 146 "/home/jens/Source/shotwell/src/db/TagTable.vala" result = NULL; #line 146 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); #line 146 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1503 "TagTable.c" +#line 1576 "TagTable.c" } else { - gint _tmp12_; + gint _tmp10_; #line 147 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 147 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp12_ != SQLITE_ROW) { -#line 1510 "TagTable.c" - gint _tmp13_; + if (_tmp10_ != SQLITE_ROW) { +#line 1583 "TagTable.c" + gint _tmp11_; #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala" - database_table_throw_error ("TagTable.get_row", _tmp13_, &_inner_error_); + database_table_throw_error ("TagTable.get_row", _tmp11_, &_inner_error_); #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1524,7 +1597,7 @@ TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error) { _sqlite3_finalize0 (stmt); #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 1526 "TagTable.c" +#line 1599 "TagTable.c" } else { #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); @@ -1534,64 +1607,65 @@ TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error) { g_clear_error (&_inner_error_); #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 1536 "TagTable.c" +#line 1609 "TagTable.c" } } } } #line 150 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp14_ = tag_row_new (); + _tmp12_ = tag_row_new (); #line 150 "/home/jens/Source/shotwell/src/db/TagTable.vala" - row = _tmp14_; + row = _tmp12_; #line 151 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp15_ = row; + _tmp13_ = row; #line 151 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp16_ = *tag_id; + _tmp14_ = *tag_id; #line 151 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp15_->tag_id = _tmp16_; + _tmp13_->tag_id = _tmp14_; #line 152 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp17_ = row; + _tmp15_ = row; #line 152 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp18_ = stmt; + _tmp16_ = stmt; #line 152 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp19_ = sqlite3_column_text (_tmp18_, 0); + _tmp17_ = sqlite3_column_text (_tmp16_, 0); #line 152 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp20_ = g_strdup (_tmp19_); + _tmp18_ = g_strdup (_tmp17_); #line 152 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _g_free0 (_tmp17_->name); + _g_free0 (_tmp15_->name); #line 152 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp17_->name = _tmp20_; + _tmp15_->name = _tmp18_; #line 153 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp21_ = row; + _tmp19_ = row; #line 153 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp22_ = stmt; + _tmp20_ = stmt; #line 153 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp23_ = sqlite3_column_text (_tmp22_, 1); + _tmp21_ = sqlite3_column_text (_tmp20_, 1); #line 153 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp24_ = tag_table_unserialize_source_ids (self, _tmp23_); + _tmp22_ = tag_table_unserialize_source_ids (self, _tmp21_); #line 153 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _g_object_unref0 (_tmp21_->source_id_list); + _g_object_unref0 (_tmp19_->source_id_list); #line 153 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp21_->source_id_list = _tmp24_; -#line 154 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp25_ = row; + _tmp19_->source_id_list = _tmp22_; #line 154 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp26_ = stmt; + _tmp23_ = row; #line 154 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp27_ = sqlite3_column_int64 (_tmp26_, 2); + _tmp24_ = stmt; #line 154 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp25_->time_created = (time_t) _tmp27_; + _tmp23_->time_created = (time_t) sqlite3_column_int64 (_tmp24_, 2); #line 156 "/home/jens/Source/shotwell/src/db/TagTable.vala" result = row; #line 156 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); #line 156 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1589 "TagTable.c" +#line 1660 "TagTable.c" } -GeeList* tag_table_get_all_rows (TagTable* self, GError** error) { +GeeList* +tag_table_get_all_rows (TagTable* self, + GError** error) +{ GeeList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1622,66 +1696,61 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) { _tmp4_ = gee_array_list_new (TYPE_TAG_ROW, (GBoxedCopyFunc) tag_row_ref, (GDestroyNotify) tag_row_unref, NULL, NULL, NULL); #line 165 "/home/jens/Source/shotwell/src/db/TagTable.vala" rows = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList); -#line 1624 "TagTable.c" +#line 1698 "TagTable.c" { gboolean _tmp5_ = FALSE; #line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp5_ = TRUE; #line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala" while (TRUE) { -#line 1631 "TagTable.c" +#line 1705 "TagTable.c" sqlite3_stmt* _tmp6_; gint _tmp7_; - gint _tmp8_; TagRow* row = NULL; + TagRow* _tmp10_; TagRow* _tmp11_; - TagRow* _tmp12_; - sqlite3_stmt* _tmp13_; - gint64 _tmp14_; - TagRow* _tmp15_; - sqlite3_stmt* _tmp16_; - const gchar* _tmp17_; - gchar* _tmp18_; - TagRow* _tmp19_; - sqlite3_stmt* _tmp20_; - const gchar* _tmp21_; - GeeSet* _tmp22_; - TagRow* _tmp23_; - sqlite3_stmt* _tmp24_; - gint64 _tmp25_; - GeeList* _tmp26_; - TagRow* _tmp27_; + sqlite3_stmt* _tmp12_; + TagRow* _tmp13_; + sqlite3_stmt* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + TagRow* _tmp17_; + sqlite3_stmt* _tmp18_; + const gchar* _tmp19_; + GeeSet* _tmp20_; + TagRow* _tmp21_; + sqlite3_stmt* _tmp22_; + GeeList* _tmp23_; + TagRow* _tmp24_; #line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (!_tmp5_) { -#line 1655 "TagTable.c" +#line 1726 "TagTable.c" } #line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp5_ = FALSE; #line 168 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp6_ = stmt; #line 168 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp7_ = sqlite3_step (_tmp6_); -#line 168 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp7_; + res = sqlite3_step (_tmp6_); #line 169 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 169 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp8_ == SQLITE_DONE) { + if (_tmp7_ == SQLITE_DONE) { #line 170 "/home/jens/Source/shotwell/src/db/TagTable.vala" break; -#line 1671 "TagTable.c" +#line 1740 "TagTable.c" } else { - gint _tmp9_; + gint _tmp8_; #line 171 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp9_ = res; + _tmp8_ = res; #line 171 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp9_ != SQLITE_ROW) { -#line 1678 "TagTable.c" - gint _tmp10_; + if (_tmp8_ != SQLITE_ROW) { +#line 1747 "TagTable.c" + gint _tmp9_; #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp10_ = res; + _tmp9_ = res; #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala" - database_table_throw_error ("TagTable.get_all_rows", _tmp10_, &_inner_error_); + database_table_throw_error ("TagTable.get_all_rows", _tmp9_, &_inner_error_); #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1694,7 +1763,7 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) { _sqlite3_finalize0 (stmt); #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 1696 "TagTable.c" +#line 1765 "TagTable.c" } else { #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_object_unref0 (rows); @@ -1706,64 +1775,60 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) { g_clear_error (&_inner_error_); #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 1708 "TagTable.c" +#line 1777 "TagTable.c" } } } } #line 175 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp11_ = tag_row_new (); + _tmp10_ = tag_row_new (); #line 175 "/home/jens/Source/shotwell/src/db/TagTable.vala" - row = _tmp11_; + row = _tmp10_; #line 176 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp12_ = row; + _tmp11_ = row; #line 176 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp13_ = stmt; + _tmp12_ = stmt; #line 176 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp14_ = sqlite3_column_int64 (_tmp13_, 0); -#line 176 "/home/jens/Source/shotwell/src/db/TagTable.vala" - tag_id_init (&_tmp12_->tag_id, _tmp14_); + tag_id_init (&_tmp11_->tag_id, sqlite3_column_int64 (_tmp12_, 0)); #line 177 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp15_ = row; + _tmp13_ = row; #line 177 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp16_ = stmt; + _tmp14_ = stmt; #line 177 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp17_ = sqlite3_column_text (_tmp16_, 1); + _tmp15_ = sqlite3_column_text (_tmp14_, 1); #line 177 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp18_ = g_strdup (_tmp17_); + _tmp16_ = g_strdup (_tmp15_); #line 177 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _g_free0 (_tmp15_->name); + _g_free0 (_tmp13_->name); #line 177 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp15_->name = _tmp18_; + _tmp13_->name = _tmp16_; #line 178 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp19_ = row; + _tmp17_ = row; #line 178 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp20_ = stmt; + _tmp18_ = stmt; #line 178 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp21_ = sqlite3_column_text (_tmp20_, 2); + _tmp19_ = sqlite3_column_text (_tmp18_, 2); #line 178 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp22_ = tag_table_unserialize_source_ids (self, _tmp21_); + _tmp20_ = tag_table_unserialize_source_ids (self, _tmp19_); #line 178 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _g_object_unref0 (_tmp19_->source_id_list); + _g_object_unref0 (_tmp17_->source_id_list); #line 178 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp19_->source_id_list = _tmp22_; -#line 179 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp23_ = row; + _tmp17_->source_id_list = _tmp20_; #line 179 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp24_ = stmt; + _tmp21_ = row; #line 179 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp25_ = sqlite3_column_int64 (_tmp24_, 3); + _tmp22_ = stmt; #line 179 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp23_->time_created = (time_t) _tmp25_; + _tmp21_->time_created = (time_t) sqlite3_column_int64 (_tmp22_, 3); #line 181 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp26_ = rows; + _tmp23_ = rows; #line 181 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp27_ = row; + _tmp24_ = row; #line 181 "/home/jens/Source/shotwell/src/db/TagTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection), _tmp24_); #line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tag_row_unref0 (row); -#line 1765 "TagTable.c" +#line 1830 "TagTable.c" } } #line 184 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1772,14 +1837,18 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) { _sqlite3_finalize0 (stmt); #line 184 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1774 "TagTable.c" +#line 1839 "TagTable.c" } -void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GError** error) { +void +tag_table_rename (TagTable* self, + TagID* tag_id, + const gchar* new_name, + GError** error) +{ TagID _tmp0_; gint64 _tmp1_; - const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 187 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_if_fail (IS_TAG_TABLE (self)); @@ -1792,9 +1861,7 @@ void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GEr #line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp1_ = _tmp0_.id; #line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp2_ = new_name; -#line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "name", _tmp2_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "name", new_name, &_inner_error_); #line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1803,7 +1870,7 @@ void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GEr g_propagate_error (error, _inner_error_); #line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1805 "TagTable.c" +#line 1872 "TagTable.c" } else { #line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1811,13 +1878,18 @@ void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GEr g_clear_error (&_inner_error_); #line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1813 "TagTable.c" +#line 1880 "TagTable.c" } } } -void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection* source_ids, GError** error) { +void +tag_table_set_tagged_sources (TagTable* self, + TagID* tag_id, + GeeCollection* source_ids, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -1825,19 +1897,15 @@ void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection* gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - GeeCollection* _tmp5_; - gchar* _tmp6_; - GDestroyNotify _tmp7_; - gint _tmp8_; - gint _tmp9_; - sqlite3_stmt* _tmp10_; - TagID _tmp11_; - gint64 _tmp12_; + gchar* _tmp5_; + GDestroyNotify _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; + TagID _tmp9_; + gint64 _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; gint _tmp13_; - gint _tmp14_; - sqlite3_stmt* _tmp15_; - gint _tmp16_; - gint _tmp17_; GError * _inner_error_ = NULL; #line 191 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_if_fail (IS_TAG_TABLE (self)); @@ -1862,49 +1930,41 @@ void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection* #line 196 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp4_ = stmt; #line 196 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp5_ = source_ids; -#line 196 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp6_ = tag_table_serialize_source_ids (self, _tmp5_); -#line 196 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp7_ = g_free; + _tmp5_ = tag_table_serialize_source_ids (self, source_ids); #line 196 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp8_ = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); + _tmp6_ = g_free; #line 196 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp8_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_); #line 197 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp9_ = res; + _tmp7_ = res; #line 197 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); -#line 198 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp10_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 198 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp11_ = *tag_id; + _tmp8_ = stmt; #line 198 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp12_ = _tmp11_.id; + _tmp9_ = *tag_id; #line 198 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp13_ = sqlite3_bind_int64 (_tmp10_, 2, _tmp12_); + _tmp10_ = _tmp9_.id; #line 198 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp13_; + res = sqlite3_bind_int64 (_tmp8_, 2, _tmp10_); #line 199 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp14_ = res; + _tmp11_ = res; #line 199 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _vala_assert (_tmp14_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 201 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp15_ = stmt; + _tmp12_ = stmt; #line 201 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp16_ = sqlite3_step (_tmp15_); -#line 201 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp16_; + res = sqlite3_step (_tmp12_); #line 202 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp17_ = res; + _tmp13_ = res; #line 202 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp17_ != SQLITE_DONE) { -#line 1901 "TagTable.c" - gint _tmp18_; + if (_tmp13_ != SQLITE_DONE) { +#line 1961 "TagTable.c" + gint _tmp14_; #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp18_ = res; + _tmp14_ = res; #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala" - database_table_throw_error ("TagTable.set_tagged_photos", _tmp18_, &_inner_error_); + database_table_throw_error ("TagTable.set_tagged_photos", _tmp14_, &_inner_error_); #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1915,7 +1975,7 @@ void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection* _sqlite3_finalize0 (stmt); #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1917 "TagTable.c" +#line 1977 "TagTable.c" } else { #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); @@ -1925,163 +1985,158 @@ void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection* g_clear_error (&_inner_error_); #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1927 "TagTable.c" +#line 1987 "TagTable.c" } } } #line 191 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); -#line 1933 "TagTable.c" +#line 1993 "TagTable.c" } -static gchar* tag_table_serialize_source_ids (TagTable* self, GeeCollection* source_ids) { +static gchar* +tag_table_serialize_source_ids (TagTable* self, + GeeCollection* source_ids) +{ gchar* result = NULL; - GeeCollection* _tmp0_; GString* _result_ = NULL; - GString* _tmp1_; - const gchar* _tmp11_ = NULL; - GString* _tmp12_; - gssize _tmp13_; - gchar* _tmp16_; + GString* _tmp0_; + const gchar* _tmp8_ = NULL; + GString* _tmp9_; + gssize _tmp10_; + gchar* _tmp13_; #line 206 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail (IS_TAG_TABLE (self), NULL); #line 206 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail ((source_ids == NULL) || GEE_IS_COLLECTION (source_ids), NULL); #line 207 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp0_ = source_ids; -#line 207 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp0_ == NULL) { + if (source_ids == NULL) { #line 208 "/home/jens/Source/shotwell/src/db/TagTable.vala" result = NULL; #line 208 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1958 "TagTable.c" +#line 2018 "TagTable.c" } #line 210 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp1_ = g_string_new (""); + _tmp0_ = g_string_new (""); #line 210 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _result_ = _tmp1_; -#line 1964 "TagTable.c" + _result_ = _tmp0_; +#line 2024 "TagTable.c" { GeeIterator* _source_id_it = NULL; - GeeCollection* _tmp2_; - GeeIterator* _tmp3_; + GeeIterator* _tmp1_; #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp2_ = source_ids; + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (source_ids, GEE_TYPE_ITERABLE, GeeIterable)); #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _source_id_it = _tmp3_; + _source_id_it = _tmp1_; #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" while (TRUE) { -#line 1977 "TagTable.c" - GeeIterator* _tmp4_; - gboolean _tmp5_; +#line 2034 "TagTable.c" + GeeIterator* _tmp2_; gchar* source_id = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - GString* _tmp8_; - const gchar* _tmp9_; - GString* _tmp10_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + GString* _tmp5_; + const gchar* _tmp6_; + GString* _tmp7_; #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp4_ = _source_id_it; + _tmp2_ = _source_id_it; #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp2_)) { #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" break; -#line 1994 "TagTable.c" +#line 2048 "TagTable.c" } #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp6_ = _source_id_it; + _tmp3_ = _source_id_it; #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" - source_id = (gchar*) _tmp7_; + source_id = (gchar*) _tmp4_; #line 213 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp8_ = _result_; + _tmp5_ = _result_; #line 213 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp9_ = source_id; + _tmp6_ = source_id; #line 213 "/home/jens/Source/shotwell/src/db/TagTable.vala" - g_string_append (_tmp8_, _tmp9_); + g_string_append (_tmp5_, _tmp6_); #line 214 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp10_ = _result_; + _tmp7_ = _result_; #line 214 "/home/jens/Source/shotwell/src/db/TagTable.vala" - g_string_append (_tmp10_, ","); + g_string_append (_tmp7_, ","); #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_free0 (source_id); -#line 2014 "TagTable.c" +#line 2068 "TagTable.c" } #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_object_unref0 (_source_id_it); -#line 2018 "TagTable.c" +#line 2072 "TagTable.c" } #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp12_ = _result_; + _tmp9_ = _result_; #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp13_ = _tmp12_->len; + _tmp10_ = _tmp9_->len; #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp13_ != ((gssize) 0)) { -#line 2026 "TagTable.c" - GString* _tmp14_; - const gchar* _tmp15_; + if (_tmp10_ != ((gssize) 0)) { +#line 2080 "TagTable.c" + GString* _tmp11_; + const gchar* _tmp12_; #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp14_ = _result_; + _tmp11_ = _result_; #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp15_ = _tmp14_->str; + _tmp12_ = _tmp11_->str; #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp11_ = _tmp15_; -#line 2035 "TagTable.c" + _tmp8_ = _tmp12_; +#line 2089 "TagTable.c" } else { #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp11_ = NULL; -#line 2039 "TagTable.c" + _tmp8_ = NULL; +#line 2093 "TagTable.c" } #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp16_ = g_strdup (_tmp11_); + _tmp13_ = g_strdup (_tmp8_); #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" - result = _tmp16_; + result = _tmp13_; #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_string_free0 (_result_); #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 2049 "TagTable.c" +#line 2103 "TagTable.c" } -static gchar string_get (const gchar* self, glong index) { +static gchar +string_get (const gchar* self, + glong index) +{ gchar result = '\0'; - glong _tmp0_; - gchar _tmp1_; -#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar _tmp0_; +#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = index; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = ((gchar*) self)[index]; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2067 "TagTable.c" +#line 2121 "TagTable.c" } -static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* text_list) { +static GeeSet* +tag_table_unserialize_source_ids (TagTable* self, + const gchar* text_list) +{ GeeSet* result = NULL; GeeSet* _result_ = NULL; GeeHashSet* _tmp0_; - const gchar* _tmp1_; gchar** split = NULL; - const gchar* _tmp2_; - gchar** _tmp3_; - gchar** _tmp4_; + gchar** _tmp1_; + gchar** _tmp2_; gint split_length1; gint _split_size_; - gchar** _tmp5_; - gint _tmp5__length1; + gchar** _tmp3_; + gint _tmp3__length1; #line 220 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail (IS_TAG_TABLE (self), NULL); #line 221 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -2089,126 +2144,104 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te #line 221 "/home/jens/Source/shotwell/src/db/TagTable.vala" _result_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet); #line 223 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp1_ = text_list; -#line 223 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp1_ == NULL) { + if (text_list == NULL) { #line 224 "/home/jens/Source/shotwell/src/db/TagTable.vala" result = _result_; #line 224 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 2098 "TagTable.c" +#line 2151 "TagTable.c" } #line 226 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp2_ = text_list; -#line 226 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp4_ = _tmp3_ = g_strsplit (_tmp2_, ",", 0); + _tmp2_ = _tmp1_ = g_strsplit (text_list, ",", 0); #line 226 "/home/jens/Source/shotwell/src/db/TagTable.vala" - split = _tmp4_; + split = _tmp2_; #line 226 "/home/jens/Source/shotwell/src/db/TagTable.vala" - split_length1 = _vala_array_length (_tmp3_); + split_length1 = _vala_array_length (_tmp1_); #line 226 "/home/jens/Source/shotwell/src/db/TagTable.vala" _split_size_ = split_length1; #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp5_ = split; + _tmp3_ = split; #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp5__length1 = split_length1; -#line 2114 "TagTable.c" + _tmp3__length1 = split_length1; +#line 2165 "TagTable.c" { gchar** token_collection = NULL; gint token_collection_length1 = 0; gint _token_collection_size_ = 0; gint token_it = 0; #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" - token_collection = _tmp5_; + token_collection = _tmp3_; #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" - token_collection_length1 = _tmp5__length1; + token_collection_length1 = _tmp3__length1; #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" - for (token_it = 0; token_it < _tmp5__length1; token_it = token_it + 1) { -#line 2126 "TagTable.c" - gchar* _tmp6_; + for (token_it = 0; token_it < _tmp3__length1; token_it = token_it + 1) { +#line 2177 "TagTable.c" + gchar* _tmp4_; gchar* token = NULL; #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp6_ = g_strdup (token_collection[token_it]); + _tmp4_ = g_strdup (token_collection[token_it]); #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" - token = _tmp6_; -#line 2133 "TagTable.c" + token = _tmp4_; +#line 2184 "TagTable.c" { - const gchar* _tmp7_; - gboolean _tmp8_; - const gchar* _tmp9_; - gchar _tmp10_; - gboolean _tmp11_; -#line 228 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp7_ = token; + const gchar* _tmp5_; + const gchar* _tmp6_; #line 228 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp8_ = is_string_empty (_tmp7_); + _tmp5_ = token; #line 228 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp8_) { + if (is_string_empty (_tmp5_)) { #line 229 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_free0 (token); #line 229 "/home/jens/Source/shotwell/src/db/TagTable.vala" continue; -#line 2150 "TagTable.c" +#line 2196 "TagTable.c" } #line 236 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp9_ = token; -#line 236 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp10_ = string_get (_tmp9_, (glong) 0); + _tmp6_ = token; #line 236 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp11_ = g_ascii_isdigit (_tmp10_); -#line 236 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp11_) { -#line 2160 "TagTable.c" - GeeSet* _tmp12_; - const gchar* _tmp13_; - gint64 _tmp14_; - PhotoID _tmp15_ = {0}; - gchar* _tmp16_; - gchar* _tmp17_; -#line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp12_ = _result_; + if (g_ascii_isdigit (string_get (_tmp6_, (glong) 0))) { +#line 2202 "TagTable.c" + GeeSet* _tmp7_; + const gchar* _tmp8_; + PhotoID _tmp9_ = {0}; + gchar* _tmp10_; + gchar* _tmp11_; #line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp13_ = token; + _tmp7_ = _result_; #line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp14_ = parse_int64 (_tmp13_, 10); + _tmp8_ = token; #line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala" - photo_id_init (&_tmp15_, _tmp14_); + photo_id_init (&_tmp9_, parse_int64 (_tmp8_, 10)); #line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp16_ = photo_id_upgrade_photo_id_to_source_id (&_tmp15_); + _tmp10_ = photo_id_upgrade_photo_id_to_source_id (&_tmp9_); #line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp17_ = _tmp16_; + _tmp11_ = _tmp10_; #line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_); #line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _g_free0 (_tmp17_); -#line 2183 "TagTable.c" + _g_free0 (_tmp11_); +#line 2222 "TagTable.c" } else { - const gchar* _tmp18_; - gchar _tmp19_; - gboolean _tmp20_; -#line 239 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp18_ = token; + const gchar* _tmp12_; #line 239 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp19_ = string_get (_tmp18_, (glong) 0); + _tmp12_ = token; #line 239 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp20_ = g_ascii_isalpha (_tmp19_); -#line 239 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp20_) { -#line 2196 "TagTable.c" - GeeSet* _tmp21_; - const gchar* _tmp22_; + if (g_ascii_isalpha (string_get (_tmp12_, (glong) 0))) { +#line 2229 "TagTable.c" + GeeSet* _tmp13_; + const gchar* _tmp14_; #line 241 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp21_ = _result_; + _tmp13_ = _result_; #line 241 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp22_ = token; + _tmp14_ = token; #line 241 "/home/jens/Source/shotwell/src/db/TagTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), _tmp22_); -#line 2205 "TagTable.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_); +#line 2238 "TagTable.c" } } #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_free0 (token); -#line 2210 "TagTable.c" +#line 2243 "TagTable.c" } } } @@ -2218,34 +2251,42 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL); #line 245 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 2220 "TagTable.c" +#line 2253 "TagTable.c" } -static void tag_table_class_init (TagTableClass * klass) { +static void +tag_table_class_init (TagTableClass * klass) +{ #line 32 "/home/jens/Source/shotwell/src/db/TagTable.vala" tag_table_parent_class = g_type_class_peek_parent (klass); #line 32 "/home/jens/Source/shotwell/src/db/TagTable.vala" ((DatabaseTableClass *) klass)->finalize = tag_table_finalize; -#line 2229 "TagTable.c" +#line 2264 "TagTable.c" } -static void tag_table_instance_init (TagTable * self) { +static void +tag_table_instance_init (TagTable * self) +{ } -static void tag_table_finalize (DatabaseTable * obj) { +static void +tag_table_finalize (DatabaseTable * obj) +{ TagTable * self; #line 32 "/home/jens/Source/shotwell/src/db/TagTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TAG_TABLE, TagTable); #line 32 "/home/jens/Source/shotwell/src/db/TagTable.vala" DATABASE_TABLE_CLASS (tag_table_parent_class)->finalize (obj); -#line 2243 "TagTable.c" +#line 2282 "TagTable.c" } -GType tag_table_get_type (void) { +GType +tag_table_get_type (void) +{ static volatile gsize tag_table_type_id__volatile = 0; if (g_once_init_enter (&tag_table_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TagTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tag_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TagTable), 0, (GInstanceInitFunc) tag_table_instance_init, NULL }; @@ -2257,7 +2298,11 @@ GType tag_table_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -2269,13 +2314,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -static gint _vala_array_length (gpointer array) { +static gint +_vala_array_length (gpointer array) +{ int length; length = 0; if (array) { diff --git a/src/db/TombstoneTable.c b/src/db/TombstoneTable.c index 8c9400e..b7b9f58 100644 --- a/src/db/TombstoneTable.c +++ b/src/db/TombstoneTable.c @@ -1,4 +1,4 @@ -/* TombstoneTable.c generated by valac 0.36.6, the Vala compiler +/* TombstoneTable.c generated by valac 0.40.4, the Vala compiler * generated from TombstoneTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -134,70 +135,105 @@ GType tombstone_id_get_type (void) G_GNUC_CONST; TombstoneID* tombstone_id_dup (const TombstoneID* self); void tombstone_id_free (TombstoneID* self); #define TOMBSTONE_ID_INVALID ((gint64) -1) -void tombstone_id_init (TombstoneID *self, gint64 id); +void tombstone_id_init (TombstoneID *self, + gint64 id); gboolean tombstone_id_is_invalid (TombstoneID *self); gboolean tombstone_id_is_valid (TombstoneID *self); gpointer tombstone_row_ref (gpointer instance); void tombstone_row_unref (gpointer instance); -GParamSpec* param_spec_tombstone_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_tombstone_row (GValue* value, gpointer v_object); -void value_take_tombstone_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_tombstone_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_tombstone_row (GValue* value, + gpointer v_object); +void value_take_tombstone_row (GValue* value, + gpointer v_object); gpointer value_get_tombstone_row (const GValue* value); GType tombstone_row_get_type (void) G_GNUC_CONST; GType tombstone_reason_get_type (void) G_GNUC_CONST; -enum { - TOMBSTONE_ROW_DUMMY_PROPERTY -}; TombstoneRow* tombstone_row_new (void); TombstoneRow* tombstone_row_construct (GType object_type); static void tombstone_row_finalize (TombstoneRow * obj); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType tombstone_table_get_type (void) G_GNUC_CONST; -enum { - TOMBSTONE_TABLE_DUMMY_PROPERTY -}; static TombstoneTable* tombstone_table_new (void); static TombstoneTable* tombstone_table_construct (GType object_type); DatabaseTable* database_table_construct (GType object_type); -void database_table_set_table_name (DatabaseTable* self, const gchar* table_name); -void database_table_fatal (const gchar* op, gint res); +void database_table_set_table_name (DatabaseTable* self, + const gchar* table_name); +void database_table_fatal (const gchar* op, + gint res); TombstoneTable* tombstone_table_get_instance (void); GQuark database_error_quark (void); -TombstoneRow* tombstone_table_add (TombstoneTable* self, const gchar* filepath, gint64 filesize, const gchar* md5, TombstoneReason reason, GError** error); +TombstoneRow* tombstone_table_add (TombstoneTable* self, + const gchar* filepath, + gint64 filesize, + const gchar* md5, + TombstoneReason reason, + GError** error); gulong now_sec (void); gint tombstone_reason_serialize (TombstoneReason self); -void database_table_throw_error (const gchar* method, gint res, GError** error); -TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, int* result_length1, GError** error); +void database_table_throw_error (const gchar* method, + gint res, + GError** error); +TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, + int* result_length1, + GError** error); gint database_table_get_row_count (DatabaseTable* self); TombstoneReason tombstone_reason_unserialize (gint value); -void tombstone_table_update_file (TombstoneTable* self, TombstoneID* tombstone_id, const gchar* filepath, GError** error); -void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error); -void tombstone_table_remove (TombstoneTable* self, TombstoneID* tombstone_id, GError** error); -void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error); +void tombstone_table_update_file (TombstoneTable* self, + TombstoneID* tombstone_id, + const gchar* filepath, + GError** error); +void database_table_update_text_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text, + GError** error); +void tombstone_table_remove (TombstoneTable* self, + TombstoneID* tombstone_id, + GError** error); +void database_table_delete_by_id (DatabaseTable* self, + gint64 id, + GError** error); static void tombstone_table_finalize (DatabaseTable * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -void tombstone_id_init (TombstoneID *self, gint64 id) { - gint64 _tmp0_; +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); + + +void +tombstone_id_init (TombstoneID *self, + gint64 id) +{ #line 12 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" memset (self, 0, sizeof (TombstoneID)); #line 13 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp0_ = id; -#line 13 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - (*self).id = _tmp0_; -#line 197 "TombstoneTable.c" + (*self).id = id; +#line 231 "TombstoneTable.c" } -gboolean tombstone_id_is_invalid (TombstoneID *self) { +gboolean +tombstone_id_is_invalid (TombstoneID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 17 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -206,11 +242,13 @@ gboolean tombstone_id_is_invalid (TombstoneID *self) { result = _tmp0_ == TOMBSTONE_ID_INVALID; #line 17 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return result; -#line 210 "TombstoneTable.c" +#line 246 "TombstoneTable.c" } -gboolean tombstone_id_is_valid (TombstoneID *self) { +gboolean +tombstone_id_is_valid (TombstoneID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 21 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -219,11 +257,13 @@ gboolean tombstone_id_is_valid (TombstoneID *self) { result = _tmp0_ != TOMBSTONE_ID_INVALID; #line 21 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return result; -#line 223 "TombstoneTable.c" +#line 261 "TombstoneTable.c" } -TombstoneID* tombstone_id_dup (const TombstoneID* self) { +TombstoneID* +tombstone_id_dup (const TombstoneID* self) +{ TombstoneID* dup; #line 7 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" dup = g_new0 (TombstoneID, 1); @@ -231,18 +271,22 @@ TombstoneID* tombstone_id_dup (const TombstoneID* self) { memcpy (dup, self, sizeof (TombstoneID)); #line 7 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return dup; -#line 235 "TombstoneTable.c" +#line 275 "TombstoneTable.c" } -void tombstone_id_free (TombstoneID* self) { +void +tombstone_id_free (TombstoneID* self) +{ #line 7 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_free (self); -#line 242 "TombstoneTable.c" +#line 284 "TombstoneTable.c" } -GType tombstone_id_get_type (void) { +GType +tombstone_id_get_type (void) +{ static volatile gsize tombstone_id_type_id__volatile = 0; if (g_once_init_enter (&tombstone_id_type_id__volatile)) { GType tombstone_id_type_id; @@ -253,121 +297,150 @@ GType tombstone_id_get_type (void) { } -TombstoneRow* tombstone_row_construct (GType object_type) { +TombstoneRow* +tombstone_row_construct (GType object_type) +{ TombstoneRow* self = NULL; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" self = (TombstoneRow*) g_type_create_instance (object_type); #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return self; -#line 263 "TombstoneTable.c" +#line 309 "TombstoneTable.c" } -TombstoneRow* tombstone_row_new (void) { +TombstoneRow* +tombstone_row_new (void) +{ #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return tombstone_row_construct (TYPE_TOMBSTONE_ROW); -#line 270 "TombstoneTable.c" +#line 318 "TombstoneTable.c" } -static void value_tombstone_row_init (GValue* value) { +static void +value_tombstone_row_init (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" value->data[0].v_pointer = NULL; -#line 277 "TombstoneTable.c" +#line 327 "TombstoneTable.c" } -static void value_tombstone_row_free_value (GValue* value) { +static void +value_tombstone_row_free_value (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" tombstone_row_unref (value->data[0].v_pointer); -#line 286 "TombstoneTable.c" +#line 338 "TombstoneTable.c" } } -static void value_tombstone_row_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_tombstone_row_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (src_value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" dest_value->data[0].v_pointer = tombstone_row_ref (src_value->data[0].v_pointer); -#line 296 "TombstoneTable.c" +#line 351 "TombstoneTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" dest_value->data[0].v_pointer = NULL; -#line 300 "TombstoneTable.c" +#line 355 "TombstoneTable.c" } } -static gpointer value_tombstone_row_peek_pointer (const GValue* value) { +static gpointer +value_tombstone_row_peek_pointer (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return value->data[0].v_pointer; -#line 308 "TombstoneTable.c" +#line 365 "TombstoneTable.c" } -static gchar* value_tombstone_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_tombstone_row_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (collect_values[0].v_pointer) { -#line 315 "TombstoneTable.c" +#line 377 "TombstoneTable.c" TombstoneRow * object; object = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (object->parent_instance.g_class == NULL) { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 322 "TombstoneTable.c" +#line 384 "TombstoneTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.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 326 "TombstoneTable.c" +#line 388 "TombstoneTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" value->data[0].v_pointer = tombstone_row_ref (object); -#line 330 "TombstoneTable.c" +#line 392 "TombstoneTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" value->data[0].v_pointer = NULL; -#line 334 "TombstoneTable.c" +#line 396 "TombstoneTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return NULL; -#line 338 "TombstoneTable.c" +#line 400 "TombstoneTable.c" } -static gchar* value_tombstone_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_tombstone_row_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ TombstoneRow ** object_p; object_p = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (!object_p) { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 349 "TombstoneTable.c" +#line 416 "TombstoneTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (!value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" *object_p = NULL; -#line 355 "TombstoneTable.c" +#line 422 "TombstoneTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" *object_p = value->data[0].v_pointer; -#line 359 "TombstoneTable.c" +#line 426 "TombstoneTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" *object_p = tombstone_row_ref (value->data[0].v_pointer); -#line 363 "TombstoneTable.c" +#line 430 "TombstoneTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return NULL; -#line 367 "TombstoneTable.c" +#line 434 "TombstoneTable.c" } -GParamSpec* param_spec_tombstone_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_tombstone_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecTombstoneRow* spec; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_TOMBSTONE_ROW), NULL); @@ -377,20 +450,25 @@ GParamSpec* param_spec_tombstone_row (const gchar* name, const gchar* nick, cons G_PARAM_SPEC (spec)->value_type = object_type; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return G_PARAM_SPEC (spec); -#line 381 "TombstoneTable.c" +#line 454 "TombstoneTable.c" } -gpointer value_get_tombstone_row (const GValue* value) { +gpointer +value_get_tombstone_row (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONE_ROW), NULL); #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return value->data[0].v_pointer; -#line 390 "TombstoneTable.c" +#line 465 "TombstoneTable.c" } -void value_set_tombstone_row (GValue* value, gpointer v_object) { +void +value_set_tombstone_row (GValue* value, + gpointer v_object) +{ TombstoneRow * old; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONE_ROW)); @@ -406,22 +484,25 @@ void value_set_tombstone_row (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" tombstone_row_ref (value->data[0].v_pointer); -#line 410 "TombstoneTable.c" +#line 488 "TombstoneTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" value->data[0].v_pointer = NULL; -#line 414 "TombstoneTable.c" +#line 492 "TombstoneTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" tombstone_row_unref (old); -#line 420 "TombstoneTable.c" +#line 498 "TombstoneTable.c" } } -void value_take_tombstone_row (GValue* value, gpointer v_object) { +void +value_take_tombstone_row (GValue* value, + gpointer v_object) +{ TombstoneRow * old; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONE_ROW)); @@ -435,38 +516,44 @@ void value_take_tombstone_row (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" value->data[0].v_pointer = v_object; -#line 439 "TombstoneTable.c" +#line 520 "TombstoneTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" value->data[0].v_pointer = NULL; -#line 443 "TombstoneTable.c" +#line 524 "TombstoneTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" tombstone_row_unref (old); -#line 449 "TombstoneTable.c" +#line 530 "TombstoneTable.c" } } -static void tombstone_row_class_init (TombstoneRowClass * klass) { +static void +tombstone_row_class_init (TombstoneRowClass * klass) +{ #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" tombstone_row_parent_class = g_type_class_peek_parent (klass); #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" ((TombstoneRowClass *) klass)->finalize = tombstone_row_finalize; -#line 459 "TombstoneTable.c" +#line 542 "TombstoneTable.c" } -static void tombstone_row_instance_init (TombstoneRow * self) { +static void +tombstone_row_instance_init (TombstoneRow * self) +{ #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" self->ref_count = 1; -#line 466 "TombstoneTable.c" +#line 551 "TombstoneTable.c" } -static void tombstone_row_finalize (TombstoneRow * obj) { +static void +tombstone_row_finalize (TombstoneRow * obj) +{ TombstoneRow * self; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONE_ROW, TombstoneRow); @@ -476,11 +563,13 @@ static void tombstone_row_finalize (TombstoneRow * obj) { _g_free0 (self->filepath); #line 29 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _g_free0 (self->md5); -#line 480 "TombstoneTable.c" +#line 567 "TombstoneTable.c" } -GType tombstone_row_get_type (void) { +GType +tombstone_row_get_type (void) +{ static volatile gsize tombstone_row_type_id__volatile = 0; if (g_once_init_enter (&tombstone_row_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_tombstone_row_init, value_tombstone_row_free_value, value_tombstone_row_copy_value, value_tombstone_row_peek_pointer, "p", value_tombstone_row_collect_value, "p", value_tombstone_row_lcopy_value }; @@ -494,18 +583,22 @@ GType tombstone_row_get_type (void) { } -gpointer tombstone_row_ref (gpointer instance) { +gpointer +tombstone_row_ref (gpointer instance) +{ TombstoneRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_atomic_int_inc (&self->ref_count); #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return instance; -#line 505 "TombstoneTable.c" +#line 596 "TombstoneTable.c" } -void tombstone_row_unref (gpointer instance) { +void +tombstone_row_unref (gpointer instance) +{ TombstoneRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -514,12 +607,14 @@ void tombstone_row_unref (gpointer instance) { TOMBSTONE_ROW_GET_CLASS (self)->finalize (self); #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 518 "TombstoneTable.c" +#line 611 "TombstoneTable.c" } } -static TombstoneTable* tombstone_table_construct (GType object_type) { +static TombstoneTable* +tombstone_table_construct (GType object_type) +{ TombstoneTable* self = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -529,7 +624,6 @@ static TombstoneTable* tombstone_table_construct (GType object_type) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; #line 37 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" self = (TombstoneTable*) database_table_construct (object_type); #line 38 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -551,44 +645,48 @@ static TombstoneTable* tombstone_table_construct (GType object_type) { #line 53 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _tmp4_ = stmt; #line 53 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 53 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 54 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 54 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - if (_tmp6_ != SQLITE_DONE) { -#line 562 "TombstoneTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_DONE) { +#line 654 "TombstoneTable.c" + gint _tmp6_; #line 55 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 55 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - database_table_fatal ("create TombstoneTable", _tmp7_); -#line 568 "TombstoneTable.c" + database_table_fatal ("create TombstoneTable", _tmp6_); +#line 660 "TombstoneTable.c" } #line 37 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _sqlite3_finalize0 (stmt); #line 37 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return self; -#line 574 "TombstoneTable.c" +#line 666 "TombstoneTable.c" } -static TombstoneTable* tombstone_table_new (void) { +static TombstoneTable* +tombstone_table_new (void) +{ #line 37 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return tombstone_table_construct (TYPE_TOMBSTONE_TABLE); -#line 581 "TombstoneTable.c" +#line 675 "TombstoneTable.c" } -static gpointer _database_table_ref0 (gpointer self) { +static gpointer +_database_table_ref0 (gpointer self) +{ #line 62 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return self ? database_table_ref (self) : NULL; -#line 588 "TombstoneTable.c" +#line 684 "TombstoneTable.c" } -TombstoneTable* tombstone_table_get_instance (void) { +TombstoneTable* +tombstone_table_get_instance (void) +{ TombstoneTable* result = NULL; TombstoneTable* _tmp0_; TombstoneTable* _tmp2_; @@ -597,7 +695,7 @@ TombstoneTable* tombstone_table_get_instance (void) { _tmp0_ = tombstone_table_instance; #line 59 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (_tmp0_ == NULL) { -#line 601 "TombstoneTable.c" +#line 699 "TombstoneTable.c" TombstoneTable* _tmp1_; #line 60 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _tmp1_ = tombstone_table_new (); @@ -605,7 +703,7 @@ TombstoneTable* tombstone_table_get_instance (void) { _database_table_unref0 (tombstone_table_instance); #line 60 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" tombstone_table_instance = _tmp1_; -#line 609 "TombstoneTable.c" +#line 707 "TombstoneTable.c" } #line 62 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _tmp2_ = tombstone_table_instance; @@ -615,11 +713,18 @@ TombstoneTable* tombstone_table_get_instance (void) { result = _tmp3_; #line 62 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return result; -#line 619 "TombstoneTable.c" +#line 717 "TombstoneTable.c" } -TombstoneRow* tombstone_table_add (TombstoneTable* self, const gchar* filepath, gint64 filesize, const gchar* md5, TombstoneReason reason, GError** error) { +TombstoneRow* +tombstone_table_add (TombstoneTable* self, + const gchar* filepath, + gint64 filesize, + const gchar* md5, + TombstoneReason reason, + GError** error) +{ TombstoneRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -628,52 +733,35 @@ TombstoneRow* tombstone_table_add (TombstoneTable* self, const gchar* filepath, gint _tmp2_; gint _tmp3_; time_t time_created = 0; - gulong _tmp4_; - sqlite3_stmt* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; - GDestroyNotify _tmp8_; + sqlite3_stmt* _tmp4_; + gchar* _tmp5_; + GDestroyNotify _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; gint _tmp9_; - gint _tmp10_; - sqlite3_stmt* _tmp11_; - gint64 _tmp12_; + sqlite3_stmt* _tmp10_; + gchar* _tmp11_; + GDestroyNotify _tmp12_; gint _tmp13_; - gint _tmp14_; - sqlite3_stmt* _tmp15_; - const gchar* _tmp16_; - gchar* _tmp17_; - GDestroyNotify _tmp18_; - gint _tmp19_; + sqlite3_stmt* _tmp14_; + time_t _tmp15_; + gint _tmp16_; + sqlite3_stmt* _tmp17_; + gint _tmp18_; + sqlite3_stmt* _tmp19_; gint _tmp20_; - sqlite3_stmt* _tmp21_; - time_t _tmp22_; - gint _tmp23_; - gint _tmp24_; - sqlite3_stmt* _tmp25_; - TombstoneReason _tmp26_; - gint _tmp27_; - gint _tmp28_; - gint _tmp29_; - sqlite3_stmt* _tmp30_; - gint _tmp31_; - gint _tmp32_; TombstoneRow* row = NULL; - TombstoneRow* _tmp34_; - TombstoneRow* _tmp35_; - sqlite3* _tmp36_; - gint64 _tmp37_; - TombstoneRow* _tmp38_; - const gchar* _tmp39_; - gchar* _tmp40_; - TombstoneRow* _tmp41_; - gint64 _tmp42_; - TombstoneRow* _tmp43_; - const gchar* _tmp44_; - gchar* _tmp45_; - TombstoneRow* _tmp46_; - time_t _tmp47_; - TombstoneRow* _tmp48_; - TombstoneReason _tmp49_; + TombstoneRow* _tmp22_; + TombstoneRow* _tmp23_; + sqlite3* _tmp24_; + TombstoneRow* _tmp25_; + gchar* _tmp26_; + TombstoneRow* _tmp27_; + TombstoneRow* _tmp28_; + gchar* _tmp29_; + TombstoneRow* _tmp30_; + time_t _tmp31_; + TombstoneRow* _tmp32_; GError * _inner_error_ = NULL; #line 65 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_return_val_if_fail (IS_TOMBSTONE_TABLE (self), NULL); @@ -694,95 +782,71 @@ TombstoneRow* tombstone_table_add (TombstoneTable* self, const gchar* filepath, #line 72 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 74 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp4_ = now_sec (); -#line 74 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - time_created = (time_t) _tmp4_; -#line 76 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp5_ = stmt; + time_created = (time_t) now_sec (); #line 76 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp6_ = filepath; -#line 76 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp4_ = stmt; #line 76 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp8_ = g_free; + _tmp5_ = g_strdup (filepath); #line 76 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp9_ = sqlite3_bind_text (_tmp5_, 1, _tmp7_, -1, _tmp8_); + _tmp6_ = g_free; #line 76 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - res = _tmp9_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_); #line 77 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp10_ = res; + _tmp7_ = res; #line 77 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 78 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp11_ = stmt; + _tmp8_ = stmt; #line 78 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp12_ = filesize; -#line 78 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp13_ = sqlite3_bind_int64 (_tmp11_, 2, _tmp12_); -#line 78 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - res = _tmp13_; + res = sqlite3_bind_int64 (_tmp8_, 2, filesize); #line 79 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp14_ = res; + _tmp9_ = res; #line 79 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _vala_assert (_tmp14_ == SQLITE_OK, "res == Sqlite.OK"); -#line 80 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp15_ = stmt; -#line 80 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp16_ = md5; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 80 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp17_ = g_strdup (_tmp16_); + _tmp10_ = stmt; #line 80 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp18_ = g_free; + _tmp11_ = g_strdup (md5); #line 80 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp19_ = sqlite3_bind_text (_tmp15_, 3, _tmp17_, -1, _tmp18_); + _tmp12_ = g_free; #line 80 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - res = _tmp19_; + res = sqlite3_bind_text (_tmp10_, 3, _tmp11_, -1, _tmp12_); #line 81 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp20_ = res; + _tmp13_ = res; #line 81 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _vala_assert (_tmp20_ == SQLITE_OK, "res == Sqlite.OK"); -#line 82 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp21_ = stmt; + _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); #line 82 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp22_ = time_created; + _tmp14_ = stmt; #line 82 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp23_ = sqlite3_bind_int64 (_tmp21_, 4, (gint64) _tmp22_); + _tmp15_ = time_created; #line 82 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - res = _tmp23_; + res = sqlite3_bind_int64 (_tmp14_, 4, (gint64) _tmp15_); #line 83 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp24_ = res; + _tmp16_ = res; #line 83 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK"); -#line 84 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp25_ = stmt; -#line 84 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp26_ = reason; + _vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK"); #line 84 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp27_ = tombstone_reason_serialize (_tmp26_); + _tmp17_ = stmt; #line 84 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp28_ = sqlite3_bind_int (_tmp25_, 5, _tmp27_); -#line 84 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - res = _tmp28_; + res = sqlite3_bind_int (_tmp17_, 5, tombstone_reason_serialize (reason)); #line 85 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp29_ = res; + _tmp18_ = res; #line 85 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _vala_assert (_tmp29_ == SQLITE_OK, "res == Sqlite.OK"); -#line 87 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp30_ = stmt; + _vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK"); #line 87 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp31_ = sqlite3_step (_tmp30_); + _tmp19_ = stmt; #line 87 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - res = _tmp31_; + res = sqlite3_step (_tmp19_); #line 88 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp32_ = res; + _tmp20_ = res; #line 88 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - if (_tmp32_ != SQLITE_DONE) { -#line 781 "TombstoneTable.c" - gint _tmp33_; + if (_tmp20_ != SQLITE_DONE) { +#line 845 "TombstoneTable.c" + gint _tmp21_; #line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp33_ = res; + _tmp21_ = res; #line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - database_table_throw_error ("TombstoneTable.add", _tmp33_, &_inner_error_); + database_table_throw_error ("TombstoneTable.add", _tmp21_, &_inner_error_); #line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -793,7 +857,7 @@ TombstoneRow* tombstone_table_add (TombstoneTable* self, const gchar* filepath, _sqlite3_finalize0 (stmt); #line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return NULL; -#line 797 "TombstoneTable.c" +#line 861 "TombstoneTable.c" } else { #line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _sqlite3_finalize0 (stmt); @@ -803,225 +867,210 @@ TombstoneRow* tombstone_table_add (TombstoneTable* self, const gchar* filepath, g_clear_error (&_inner_error_); #line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return NULL; -#line 807 "TombstoneTable.c" +#line 871 "TombstoneTable.c" } } } #line 91 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp34_ = tombstone_row_new (); + _tmp22_ = tombstone_row_new (); #line 91 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - row = _tmp34_; + row = _tmp22_; #line 92 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp35_ = row; + _tmp23_ = row; #line 92 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp36_ = database_table_db; + _tmp24_ = database_table_db; #line 92 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp37_ = sqlite3_last_insert_rowid (_tmp36_); -#line 92 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - tombstone_id_init (&_tmp35_->id, _tmp37_); -#line 93 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp38_ = row; + tombstone_id_init (&_tmp23_->id, sqlite3_last_insert_rowid (_tmp24_)); #line 93 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp39_ = filepath; + _tmp25_ = row; #line 93 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp40_ = g_strdup (_tmp39_); + _tmp26_ = g_strdup (filepath); #line 93 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _g_free0 (_tmp38_->filepath); + _g_free0 (_tmp25_->filepath); #line 93 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp38_->filepath = _tmp40_; + _tmp25_->filepath = _tmp26_; #line 94 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp41_ = row; + _tmp27_ = row; #line 94 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp42_ = filesize; -#line 94 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp41_->filesize = _tmp42_; -#line 95 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp43_ = row; + _tmp27_->filesize = filesize; #line 95 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp44_ = md5; + _tmp28_ = row; #line 95 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp45_ = g_strdup (_tmp44_); + _tmp29_ = g_strdup (md5); #line 95 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _g_free0 (_tmp43_->md5); + _g_free0 (_tmp28_->md5); #line 95 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp43_->md5 = _tmp45_; + _tmp28_->md5 = _tmp29_; #line 96 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp46_ = row; + _tmp30_ = row; #line 96 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp47_ = time_created; + _tmp31_ = time_created; #line 96 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp46_->time_created = _tmp47_; + _tmp30_->time_created = _tmp31_; #line 97 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp48_ = row; + _tmp32_ = row; #line 97 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp49_ = reason; -#line 97 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp48_->reason = _tmp49_; + _tmp32_->reason = reason; #line 99 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" result = row; #line 99 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _sqlite3_finalize0 (stmt); #line 99 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return result; -#line 867 "TombstoneTable.c" +#line 921 "TombstoneTable.c" } -static gpointer _tombstone_row_ref0 (gpointer self) { +static gpointer +_tombstone_row_ref0 (gpointer self) +{ #line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return self ? tombstone_row_ref (self) : NULL; -#line 874 "TombstoneTable.c" +#line 930 "TombstoneTable.c" } -TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, int* result_length1, GError** error) { +TombstoneRow** +tombstone_table_fetch_all (TombstoneTable* self, + int* result_length1, + GError** error) +{ TombstoneRow** result = NULL; gint row_count = 0; gint _tmp0_; - gint _tmp1_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp3_; - sqlite3_stmt* _tmp4_ = NULL; + sqlite3* _tmp2_; + sqlite3_stmt* _tmp3_ = NULL; + gint _tmp4_; gint _tmp5_; - gint _tmp6_; TombstoneRow** rows = NULL; - gint _tmp7_; - TombstoneRow** _tmp8_; + gint _tmp6_; + TombstoneRow** _tmp7_; gint rows_length1; gint _rows_size_; gint index = 0; - gint _tmp42_; - gint _tmp43_; - TombstoneRow** _tmp44_; - gint _tmp44__length1; + gint _tmp35_; + gint _tmp36_; + TombstoneRow** _tmp37_; + gint _tmp37__length1; GError * _inner_error_ = NULL; #line 102 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_return_val_if_fail (IS_TOMBSTONE_TABLE (self), NULL); #line 103 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp0_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable)); -#line 103 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - row_count = _tmp0_; + row_count = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable)); #line 104 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp1_ = row_count; + _tmp0_ = row_count; #line 104 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - if (_tmp1_ == 0) { -#line 910 "TombstoneTable.c" - TombstoneRow** _tmp2_; - gint _tmp2__length1; + if (_tmp0_ == 0) { +#line 967 "TombstoneTable.c" + TombstoneRow** _tmp1_; + gint _tmp1__length1; #line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp2_ = NULL; + _tmp1_ = NULL; #line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp2__length1 = 0; + _tmp1__length1 = 0; #line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (result_length1) { #line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - *result_length1 = _tmp2__length1; -#line 921 "TombstoneTable.c" + *result_length1 = _tmp1__length1; +#line 978 "TombstoneTable.c" } #line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - result = _tmp2_; + result = _tmp1_; #line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return result; -#line 927 "TombstoneTable.c" +#line 984 "TombstoneTable.c" } #line 108 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp3_ = database_table_db; + _tmp2_ = database_table_db; #line 108 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp5_ = sqlite3_prepare_v2 (_tmp3_, "SELECT id, filepath, filesize, md5, time_created, reason " "FROM TombstoneTable", -1, &_tmp4_, NULL); + _tmp4_ = sqlite3_prepare_v2 (_tmp2_, "SELECT id, filepath, filesize, md5, time_created, reason " "FROM TombstoneTable", -1, &_tmp3_, NULL); #line 108 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _sqlite3_finalize0 (stmt); #line 108 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - stmt = _tmp4_; + stmt = _tmp3_; #line 108 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - res = _tmp5_; + res = _tmp4_; #line 110 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 110 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); #line 112 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp7_ = row_count; + _tmp6_ = row_count; #line 112 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp8_ = g_new0 (TombstoneRow*, _tmp7_ + 1); + _tmp7_ = g_new0 (TombstoneRow*, _tmp6_ + 1); #line 112 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - rows = _tmp8_; + rows = _tmp7_; #line 112 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - rows_length1 = _tmp7_; + rows_length1 = _tmp6_; #line 112 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _rows_size_ = rows_length1; #line 114 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" index = 0; -#line 955 "TombstoneTable.c" +#line 1012 "TombstoneTable.c" { - gboolean _tmp9_ = FALSE; + gboolean _tmp8_ = FALSE; #line 115 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp9_ = TRUE; + _tmp8_ = TRUE; #line 115 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" while (TRUE) { -#line 962 "TombstoneTable.c" - sqlite3_stmt* _tmp10_; - gint _tmp11_; - gint _tmp12_; +#line 1019 "TombstoneTable.c" + sqlite3_stmt* _tmp9_; + gint _tmp10_; TombstoneRow* row = NULL; - TombstoneRow* _tmp15_; + TombstoneRow* _tmp13_; + TombstoneRow* _tmp14_; + sqlite3_stmt* _tmp15_; TombstoneRow* _tmp16_; sqlite3_stmt* _tmp17_; - gint64 _tmp18_; - TombstoneRow* _tmp19_; - sqlite3_stmt* _tmp20_; - const gchar* _tmp21_; - gchar* _tmp22_; - TombstoneRow* _tmp23_; - sqlite3_stmt* _tmp24_; - gint64 _tmp25_; + const gchar* _tmp18_; + gchar* _tmp19_; + TombstoneRow* _tmp20_; + sqlite3_stmt* _tmp21_; + TombstoneRow* _tmp22_; + sqlite3_stmt* _tmp23_; + const gchar* _tmp24_; + gchar* _tmp25_; TombstoneRow* _tmp26_; sqlite3_stmt* _tmp27_; - const gchar* _tmp28_; - gchar* _tmp29_; - TombstoneRow* _tmp30_; - sqlite3_stmt* _tmp31_; - gint64 _tmp32_; + TombstoneRow* _tmp28_; + sqlite3_stmt* _tmp29_; + TombstoneRow** _tmp30_; + gint _tmp30__length1; + gint _tmp31_; + TombstoneRow* _tmp32_; TombstoneRow* _tmp33_; - sqlite3_stmt* _tmp34_; - gint _tmp35_; - TombstoneReason _tmp36_; - TombstoneRow** _tmp37_; - gint _tmp37__length1; - gint _tmp38_; - TombstoneRow* _tmp39_; - TombstoneRow* _tmp40_; - TombstoneRow* _tmp41_; + TombstoneRow* _tmp34_; #line 115 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - if (!_tmp9_) { -#line 997 "TombstoneTable.c" + if (!_tmp8_) { +#line 1048 "TombstoneTable.c" } #line 115 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp9_ = FALSE; -#line 116 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp10_ = stmt; + _tmp8_ = FALSE; #line 116 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp11_ = sqlite3_step (_tmp10_); + _tmp9_ = stmt; #line 116 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - res = _tmp11_; + res = sqlite3_step (_tmp9_); #line 117 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 117 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - if (_tmp12_ == SQLITE_DONE) { + if (_tmp10_ == SQLITE_DONE) { #line 118 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" break; -#line 1013 "TombstoneTable.c" +#line 1062 "TombstoneTable.c" } else { - gint _tmp13_; + gint _tmp11_; #line 119 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 119 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - if (_tmp13_ != SQLITE_ROW) { -#line 1020 "TombstoneTable.c" - gint _tmp14_; + if (_tmp11_ != SQLITE_ROW) { +#line 1069 "TombstoneTable.c" + gint _tmp12_; #line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp14_ = res; + _tmp12_ = res; #line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - database_table_throw_error ("TombstoneTable.fetch_all", _tmp14_, &_inner_error_); + database_table_throw_error ("TombstoneTable.fetch_all", _tmp12_, &_inner_error_); #line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -1034,7 +1083,7 @@ TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, int* result_leng _sqlite3_finalize0 (stmt); #line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return NULL; -#line 1038 "TombstoneTable.c" +#line 1087 "TombstoneTable.c" } else { #line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" rows = (_vala_array_free (rows, rows_length1, (GDestroyNotify) tombstone_row_unref), NULL); @@ -1046,126 +1095,120 @@ TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, int* result_leng g_clear_error (&_inner_error_); #line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return NULL; -#line 1050 "TombstoneTable.c" +#line 1099 "TombstoneTable.c" } } } } #line 122 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp15_ = tombstone_row_new (); + _tmp13_ = tombstone_row_new (); #line 122 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - row = _tmp15_; + row = _tmp13_; #line 123 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp16_ = row; -#line 123 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp17_ = stmt; + _tmp14_ = row; #line 123 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp18_ = sqlite3_column_int64 (_tmp17_, 0); + _tmp15_ = stmt; #line 123 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - tombstone_id_init (&_tmp16_->id, _tmp18_); + tombstone_id_init (&_tmp14_->id, sqlite3_column_int64 (_tmp15_, 0)); #line 124 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp19_ = row; + _tmp16_ = row; #line 124 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp20_ = stmt; + _tmp17_ = stmt; #line 124 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp21_ = sqlite3_column_text (_tmp20_, 1); + _tmp18_ = sqlite3_column_text (_tmp17_, 1); #line 124 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp22_ = g_strdup (_tmp21_); + _tmp19_ = g_strdup (_tmp18_); #line 124 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _g_free0 (_tmp19_->filepath); + _g_free0 (_tmp16_->filepath); #line 124 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp19_->filepath = _tmp22_; + _tmp16_->filepath = _tmp19_; #line 125 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp23_ = row; + _tmp20_ = row; #line 125 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp24_ = stmt; + _tmp21_ = stmt; #line 125 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp25_ = sqlite3_column_int64 (_tmp24_, 2); -#line 125 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp23_->filesize = _tmp25_; + _tmp20_->filesize = sqlite3_column_int64 (_tmp21_, 2); #line 126 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp26_ = row; + _tmp22_ = row; #line 126 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp27_ = stmt; + _tmp23_ = stmt; #line 126 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp28_ = sqlite3_column_text (_tmp27_, 3); + _tmp24_ = sqlite3_column_text (_tmp23_, 3); #line 126 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp29_ = g_strdup (_tmp28_); + _tmp25_ = g_strdup (_tmp24_); #line 126 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _g_free0 (_tmp26_->md5); + _g_free0 (_tmp22_->md5); #line 126 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp26_->md5 = _tmp29_; -#line 127 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp30_ = row; + _tmp22_->md5 = _tmp25_; #line 127 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp31_ = stmt; + _tmp26_ = row; #line 127 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp32_ = sqlite3_column_int64 (_tmp31_, 4); + _tmp27_ = stmt; #line 127 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp30_->time_created = (time_t) _tmp32_; + _tmp26_->time_created = (time_t) sqlite3_column_int64 (_tmp27_, 4); #line 128 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp33_ = row; + _tmp28_ = row; #line 128 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp34_ = stmt; + _tmp29_ = stmt; #line 128 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp35_ = sqlite3_column_int (_tmp34_, 5); -#line 128 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp36_ = tombstone_reason_unserialize (_tmp35_); -#line 128 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp33_->reason = _tmp36_; + _tmp28_->reason = tombstone_reason_unserialize (sqlite3_column_int (_tmp29_, 5)); #line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp37_ = rows; + _tmp30_ = rows; #line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp37__length1 = rows_length1; + _tmp30__length1 = rows_length1; #line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp38_ = index; + _tmp31_ = index; #line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - index = _tmp38_ + 1; + index = _tmp31_ + 1; #line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp39_ = row; + _tmp32_ = row; #line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp40_ = _tombstone_row_ref0 (_tmp39_); + _tmp33_ = _tombstone_row_ref0 (_tmp32_); #line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tombstone_row_unref0 (_tmp37_[_tmp38_]); + _tombstone_row_unref0 (_tmp30_[_tmp31_]); #line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp37_[_tmp38_] = _tmp40_; + _tmp30_[_tmp31_] = _tmp33_; #line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp41_ = _tmp37_[_tmp38_]; + _tmp34_ = _tmp30_[_tmp31_]; #line 115 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _tombstone_row_unref0 (row); -#line 1137 "TombstoneTable.c" +#line 1176 "TombstoneTable.c" } } #line 133 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp42_ = index; + _tmp35_ = index; #line 133 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp43_ = row_count; + _tmp36_ = row_count; #line 133 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _vala_assert (_tmp42_ == _tmp43_, "index == row_count"); + _vala_assert (_tmp35_ == _tmp36_, "index == row_count"); #line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp44_ = rows; + _tmp37_ = rows; #line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp44__length1 = rows_length1; + _tmp37__length1 = rows_length1; #line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (result_length1) { #line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - *result_length1 = _tmp44__length1; -#line 1154 "TombstoneTable.c" + *result_length1 = _tmp37__length1; +#line 1193 "TombstoneTable.c" } #line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - result = _tmp44_; + result = _tmp37_; #line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _sqlite3_finalize0 (stmt); #line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return result; -#line 1162 "TombstoneTable.c" +#line 1201 "TombstoneTable.c" } -void tombstone_table_update_file (TombstoneTable* self, TombstoneID* tombstone_id, const gchar* filepath, GError** error) { +void +tombstone_table_update_file (TombstoneTable* self, + TombstoneID* tombstone_id, + const gchar* filepath, + GError** error) +{ TombstoneID _tmp0_; gint64 _tmp1_; - const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 138 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_return_if_fail (IS_TOMBSTONE_TABLE (self)); @@ -1178,9 +1221,7 @@ void tombstone_table_update_file (TombstoneTable* self, TombstoneID* tombstone_i #line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _tmp1_ = _tmp0_.id; #line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp2_ = filepath; -#line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filepath", _tmp2_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filepath", filepath, &_inner_error_); #line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -1189,7 +1230,7 @@ void tombstone_table_update_file (TombstoneTable* self, TombstoneID* tombstone_i g_propagate_error (error, _inner_error_); #line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return; -#line 1193 "TombstoneTable.c" +#line 1234 "TombstoneTable.c" } else { #line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1197,13 +1238,17 @@ void tombstone_table_update_file (TombstoneTable* self, TombstoneID* tombstone_i g_clear_error (&_inner_error_); #line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return; -#line 1201 "TombstoneTable.c" +#line 1242 "TombstoneTable.c" } } } -void tombstone_table_remove (TombstoneTable* self, TombstoneID* tombstone_id, GError** error) { +void +tombstone_table_remove (TombstoneTable* self, + TombstoneID* tombstone_id, + GError** error) +{ TombstoneID _tmp0_; gint64 _tmp1_; GError * _inner_error_ = NULL; @@ -1225,7 +1270,7 @@ void tombstone_table_remove (TombstoneTable* self, TombstoneID* tombstone_id, GE g_propagate_error (error, _inner_error_); #line 143 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return; -#line 1229 "TombstoneTable.c" +#line 1274 "TombstoneTable.c" } else { #line 143 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1233,36 +1278,44 @@ void tombstone_table_remove (TombstoneTable* self, TombstoneID* tombstone_id, GE g_clear_error (&_inner_error_); #line 143 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return; -#line 1237 "TombstoneTable.c" +#line 1282 "TombstoneTable.c" } } } -static void tombstone_table_class_init (TombstoneTableClass * klass) { +static void +tombstone_table_class_init (TombstoneTableClass * klass) +{ #line 34 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" tombstone_table_parent_class = g_type_class_peek_parent (klass); #line 34 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" ((DatabaseTableClass *) klass)->finalize = tombstone_table_finalize; -#line 1248 "TombstoneTable.c" +#line 1295 "TombstoneTable.c" } -static void tombstone_table_instance_init (TombstoneTable * self) { +static void +tombstone_table_instance_init (TombstoneTable * self) +{ } -static void tombstone_table_finalize (DatabaseTable * obj) { +static void +tombstone_table_finalize (DatabaseTable * obj) +{ TombstoneTable * self; #line 34 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONE_TABLE, TombstoneTable); #line 34 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" DATABASE_TABLE_CLASS (tombstone_table_parent_class)->finalize (obj); -#line 1262 "TombstoneTable.c" +#line 1313 "TombstoneTable.c" } -GType tombstone_table_get_type (void) { +GType +tombstone_table_get_type (void) +{ static volatile gsize tombstone_table_type_id__volatile = 0; if (g_once_init_enter (&tombstone_table_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TombstoneTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tombstone_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TombstoneTable), 0, (GInstanceInitFunc) tombstone_table_instance_init, NULL }; @@ -1274,7 +1327,11 @@ GType tombstone_table_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -1286,7 +1343,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/db/VersionTable.c b/src/db/VersionTable.c index 4505a6f..a5847d7 100644 --- a/src/db/VersionTable.c +++ b/src/db/VersionTable.c @@ -1,4 +1,4 @@ -/* VersionTable.c generated by valac 0.36.6, the Vala compiler +/* VersionTable.c generated by valac 0.40.4, the Vala compiler * generated from VersionTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -72,28 +73,41 @@ extern sqlite3* database_table_db; gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType version_table_get_type (void) G_GNUC_CONST; -enum { - VERSION_TABLE_DUMMY_PROPERTY -}; static VersionTable* version_table_new (void); static VersionTable* version_table_construct (GType object_type); DatabaseTable* database_table_construct (GType object_type); -void database_table_fatal (const gchar* op, gint res); -void database_table_set_table_name (DatabaseTable* self, const gchar* table_name); +void database_table_fatal (const gchar* op, + gint res); +void database_table_set_table_name (DatabaseTable* self, + const gchar* table_name); VersionTable* version_table_get_instance (void); -gint version_table_get_version (VersionTable* self, gchar* * app_version); -void version_table_set_version (VersionTable* self, gint version, const gchar* app_version, const gchar* user_data); -void version_table_update_version (VersionTable* self, gint version, const gchar* app_version); +gint version_table_get_version (VersionTable* self, + gchar* * app_version); +void version_table_set_version (VersionTable* self, + gint version, + const gchar* app_version, + const gchar* user_data); +void version_table_update_version (VersionTable* self, + gint version, + const gchar* app_version); static void version_table_finalize (DatabaseTable * obj); -static VersionTable* version_table_construct (GType object_type) { +static VersionTable* +version_table_construct (GType object_type) +{ VersionTable* self = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -103,7 +117,6 @@ static VersionTable* version_table_construct (GType object_type) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; #line 10 "/home/jens/Source/shotwell/src/db/VersionTable.vala" self = (VersionTable*) database_table_construct (object_type); #line 12 "/home/jens/Source/shotwell/src/db/VersionTable.vala" @@ -123,20 +136,18 @@ static VersionTable* version_table_construct (GType object_type) { #line 20 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp4_ = stmt; #line 20 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 20 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 21 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 21 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - if (_tmp6_ != SQLITE_DONE) { -#line 134 "VersionTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_DONE) { +#line 145 "VersionTable.c" + gint _tmp6_; #line 22 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 22 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - database_table_fatal ("create version table", _tmp7_); -#line 140 "VersionTable.c" + database_table_fatal ("create version table", _tmp6_); +#line 151 "VersionTable.c" } #line 24 "/home/jens/Source/shotwell/src/db/VersionTable.vala" database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "VersionTable"); @@ -144,25 +155,31 @@ static VersionTable* version_table_construct (GType object_type) { _sqlite3_finalize0 (stmt); #line 10 "/home/jens/Source/shotwell/src/db/VersionTable.vala" return self; -#line 148 "VersionTable.c" +#line 159 "VersionTable.c" } -static VersionTable* version_table_new (void) { +static VersionTable* +version_table_new (void) +{ #line 10 "/home/jens/Source/shotwell/src/db/VersionTable.vala" return version_table_construct (TYPE_VERSION_TABLE); -#line 155 "VersionTable.c" +#line 168 "VersionTable.c" } -static gpointer _database_table_ref0 (gpointer self) { +static gpointer +_database_table_ref0 (gpointer self) +{ #line 31 "/home/jens/Source/shotwell/src/db/VersionTable.vala" return self ? database_table_ref (self) : NULL; -#line 162 "VersionTable.c" +#line 177 "VersionTable.c" } -VersionTable* version_table_get_instance (void) { +VersionTable* +version_table_get_instance (void) +{ VersionTable* result = NULL; VersionTable* _tmp0_; VersionTable* _tmp2_; @@ -171,7 +188,7 @@ VersionTable* version_table_get_instance (void) { _tmp0_ = version_table_instance; #line 28 "/home/jens/Source/shotwell/src/db/VersionTable.vala" if (_tmp0_ == NULL) { -#line 175 "VersionTable.c" +#line 192 "VersionTable.c" VersionTable* _tmp1_; #line 29 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp1_ = version_table_new (); @@ -179,7 +196,7 @@ VersionTable* version_table_get_instance (void) { _database_table_unref0 (version_table_instance); #line 29 "/home/jens/Source/shotwell/src/db/VersionTable.vala" version_table_instance = _tmp1_; -#line 183 "VersionTable.c" +#line 200 "VersionTable.c" } #line 31 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp2_ = version_table_instance; @@ -189,11 +206,14 @@ VersionTable* version_table_get_instance (void) { result = _tmp3_; #line 31 "/home/jens/Source/shotwell/src/db/VersionTable.vala" return result; -#line 193 "VersionTable.c" +#line 210 "VersionTable.c" } -gint version_table_get_version (VersionTable* self, gchar* * app_version) { +gint +version_table_get_version (VersionTable* self, + gchar* * app_version) +{ gchar* _vala_app_version = NULL; gint result = 0; sqlite3_stmt* stmt = NULL; @@ -204,12 +224,10 @@ gint version_table_get_version (VersionTable* self, gchar* * app_version) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; - sqlite3_stmt* _tmp9_; - const gchar* _tmp10_; - gchar* _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; + sqlite3_stmt* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + sqlite3_stmt* _tmp11_; #line 34 "/home/jens/Source/shotwell/src/db/VersionTable.vala" g_return_val_if_fail (IS_VERSION_TABLE (self), 0); #line 36 "/home/jens/Source/shotwell/src/db/VersionTable.vala" @@ -230,26 +248,24 @@ gint version_table_get_version (VersionTable* self, gchar* * app_version) { #line 40 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp4_ = stmt; #line 40 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 40 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 41 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 41 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - if (_tmp6_ != SQLITE_ROW) { -#line 240 "VersionTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_ROW) { +#line 256 "VersionTable.c" + gint _tmp6_; #line 42 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 42 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - if (_tmp7_ != SQLITE_DONE) { -#line 246 "VersionTable.c" - gint _tmp8_; + if (_tmp6_ != SQLITE_DONE) { +#line 262 "VersionTable.c" + gint _tmp7_; #line 43 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 43 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - database_table_fatal ("get_version", _tmp8_); -#line 252 "VersionTable.c" + database_table_fatal ("get_version", _tmp7_); +#line 268 "VersionTable.c" } #line 45 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _g_free0 (_vala_app_version); @@ -263,51 +279,54 @@ gint version_table_get_version (VersionTable* self, gchar* * app_version) { if (app_version) { #line 47 "/home/jens/Source/shotwell/src/db/VersionTable.vala" *app_version = _vala_app_version; -#line 266 "VersionTable.c" +#line 282 "VersionTable.c" } else { #line 47 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _g_free0 (_vala_app_version); -#line 270 "VersionTable.c" +#line 286 "VersionTable.c" } #line 47 "/home/jens/Source/shotwell/src/db/VersionTable.vala" return result; -#line 274 "VersionTable.c" +#line 290 "VersionTable.c" } #line 50 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp9_ = stmt; + _tmp8_ = stmt; #line 50 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp10_ = sqlite3_column_text (_tmp9_, 1); + _tmp9_ = sqlite3_column_text (_tmp8_, 1); #line 50 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp11_ = g_strdup (_tmp10_); + _tmp10_ = g_strdup (_tmp9_); #line 50 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _g_free0 (_vala_app_version); #line 50 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _vala_app_version = _tmp11_; -#line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp12_ = stmt; + _vala_app_version = _tmp10_; #line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp13_ = sqlite3_column_int (_tmp12_, 0); + _tmp11_ = stmt; #line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - result = _tmp13_; + result = sqlite3_column_int (_tmp11_, 0); #line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _sqlite3_finalize0 (stmt); #line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala" if (app_version) { #line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala" *app_version = _vala_app_version; -#line 298 "VersionTable.c" +#line 312 "VersionTable.c" } else { #line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _g_free0 (_vala_app_version); -#line 302 "VersionTable.c" +#line 316 "VersionTable.c" } #line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala" return result; -#line 306 "VersionTable.c" +#line 320 "VersionTable.c" } -void version_table_set_version (VersionTable* self, gint version, const gchar* app_version, const gchar* user_data) { +void +version_table_set_version (VersionTable* self, + gint version, + const gchar* app_version, + const gchar* user_data) +{ sqlite3_stmt* stmt = NULL; gchar* bitbucket = NULL; gchar* _tmp0_ = NULL; @@ -315,23 +334,16 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a gint res = 0; sqlite3_stmt* _tmp10_; gint _tmp11_; - gint _tmp12_; - gint _tmp13_; - sqlite3_stmt* _tmp14_; - const gchar* _tmp15_; - gchar* _tmp16_; - GDestroyNotify _tmp17_; - gint _tmp18_; + sqlite3_stmt* _tmp12_; + gchar* _tmp13_; + GDestroyNotify _tmp14_; + gint _tmp15_; + sqlite3_stmt* _tmp16_; + gchar* _tmp17_; + GDestroyNotify _tmp18_; gint _tmp19_; sqlite3_stmt* _tmp20_; - const gchar* _tmp21_; - gchar* _tmp22_; - GDestroyNotify _tmp23_; - gint _tmp24_; - gint _tmp25_; - sqlite3_stmt* _tmp26_; - gint _tmp27_; - gint _tmp28_; + gint _tmp21_; #line 55 "/home/jens/Source/shotwell/src/db/VersionTable.vala" g_return_if_fail (IS_VERSION_TABLE (self)); #line 55 "/home/jens/Source/shotwell/src/db/VersionTable.vala" @@ -344,7 +356,7 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a bitbucket = _tmp0_; #line 59 "/home/jens/Source/shotwell/src/db/VersionTable.vala" if (_tmp1_ != -1) { -#line 347 "VersionTable.c" +#line 359 "VersionTable.c" gint res = 0; sqlite3* _tmp2_; sqlite3_stmt* _tmp3_ = NULL; @@ -364,7 +376,7 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a _tmp5_ = res; #line 63 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); -#line 367 "VersionTable.c" +#line 379 "VersionTable.c" } else { gint res = 0; sqlite3* _tmp6_; @@ -386,96 +398,77 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a _tmp9_ = res; #line 68 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); -#line 388 "VersionTable.c" +#line 400 "VersionTable.c" } #line 71 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp10_ = stmt; #line 71 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp11_ = version; -#line 71 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp12_ = sqlite3_bind_int (_tmp10_, 1, _tmp11_); -#line 71 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - res = _tmp12_; + res = sqlite3_bind_int (_tmp10_, 1, version); #line 72 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 72 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); -#line 73 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp14_ = stmt; -#line 73 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp15_ = app_version; + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 73 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp16_ = g_strdup (_tmp15_); + _tmp12_ = stmt; #line 73 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp17_ = g_free; + _tmp13_ = g_strdup (app_version); #line 73 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp18_ = sqlite3_bind_text (_tmp14_, 2, _tmp16_, -1, _tmp17_); + _tmp14_ = g_free; #line 73 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - res = _tmp18_; + res = sqlite3_bind_text (_tmp12_, 2, _tmp13_, -1, _tmp14_); #line 74 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp19_ = res; + _tmp15_ = res; #line 74 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); -#line 75 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp20_ = stmt; + _vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK"); #line 75 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp21_ = user_data; + _tmp16_ = stmt; #line 75 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp22_ = g_strdup (_tmp21_); + _tmp17_ = g_strdup (user_data); #line 75 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp23_ = g_free; + _tmp18_ = g_free; #line 75 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp24_ = sqlite3_bind_text (_tmp20_, 3, _tmp22_, -1, _tmp23_); -#line 75 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - res = _tmp24_; + res = sqlite3_bind_text (_tmp16_, 3, _tmp17_, -1, _tmp18_); #line 76 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp25_ = res; + _tmp19_ = res; #line 76 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK"); -#line 78 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp26_ = stmt; + _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); #line 78 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp27_ = sqlite3_step (_tmp26_); + _tmp20_ = stmt; #line 78 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - res = _tmp27_; + res = sqlite3_step (_tmp20_); #line 79 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp28_ = res; + _tmp21_ = res; #line 79 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - if (_tmp28_ != SQLITE_DONE) { -#line 444 "VersionTable.c" - gint _tmp29_; - const gchar* _tmp30_; - const gchar* _tmp31_; - gchar* _tmp32_; - gchar* _tmp33_; - gint _tmp34_; -#line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp29_ = version; + if (_tmp21_ != SQLITE_DONE) { +#line 442 "VersionTable.c" + gchar* _tmp22_; + gchar* _tmp23_; + gint _tmp24_; #line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp30_ = app_version; + _tmp22_ = g_strdup_printf ("set_version %d %s %s", version, app_version, user_data); #line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp31_ = user_data; + _tmp23_ = _tmp22_; #line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp32_ = g_strdup_printf ("set_version %d %s %s", _tmp29_, _tmp30_, _tmp31_); + _tmp24_ = res; #line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp33_ = _tmp32_; + database_table_fatal (_tmp23_, _tmp24_); #line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp34_ = res; -#line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - database_table_fatal (_tmp33_, _tmp34_); -#line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _g_free0 (_tmp33_); -#line 467 "VersionTable.c" + _g_free0 (_tmp23_); +#line 456 "VersionTable.c" } #line 55 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _g_free0 (bitbucket); #line 55 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _sqlite3_finalize0 (stmt); -#line 473 "VersionTable.c" +#line 462 "VersionTable.c" } -void version_table_update_version (VersionTable* self, gint version, const gchar* app_version) { +void +version_table_update_version (VersionTable* self, + gint version, + const gchar* app_version) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -484,17 +477,12 @@ void version_table_update_version (VersionTable* self, gint version, const gchar gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; - gint _tmp7_; - sqlite3_stmt* _tmp8_; - const gchar* _tmp9_; - gchar* _tmp10_; - GDestroyNotify _tmp11_; - gint _tmp12_; - gint _tmp13_; - sqlite3_stmt* _tmp14_; - gint _tmp15_; - gint _tmp16_; + sqlite3_stmt* _tmp6_; + gchar* _tmp7_; + GDestroyNotify _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + gint _tmp11_; #line 83 "/home/jens/Source/shotwell/src/db/VersionTable.vala" g_return_if_fail (IS_VERSION_TABLE (self)); #line 83 "/home/jens/Source/shotwell/src/db/VersionTable.vala" @@ -516,90 +504,85 @@ void version_table_update_version (VersionTable* self, gint version, const gchar #line 88 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp4_ = stmt; #line 88 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp5_ = version; -#line 88 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp6_ = sqlite3_bind_int (_tmp4_, 1, _tmp5_); -#line 88 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - res = _tmp6_; + res = sqlite3_bind_int (_tmp4_, 1, version); #line 89 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp7_ = res; + _tmp5_ = res; #line 89 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); #line 90 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp8_ = stmt; + _tmp6_ = stmt; #line 90 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp9_ = app_version; + _tmp7_ = g_strdup (app_version); #line 90 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp10_ = g_strdup (_tmp9_); + _tmp8_ = g_free; #line 90 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp11_ = g_free; -#line 90 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp12_ = sqlite3_bind_text (_tmp8_, 2, _tmp10_, -1, _tmp11_); -#line 90 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - res = _tmp12_; + res = sqlite3_bind_text (_tmp6_, 2, _tmp7_, -1, _tmp8_); #line 91 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp13_ = res; + _tmp9_ = res; #line 91 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); -#line 93 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp14_ = stmt; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 93 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp15_ = sqlite3_step (_tmp14_); + _tmp10_ = stmt; #line 93 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - res = _tmp15_; + res = sqlite3_step (_tmp10_); #line 94 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp16_ = res; + _tmp11_ = res; #line 94 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - if (_tmp16_ != SQLITE_DONE) { -#line 553 "VersionTable.c" - gint _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; - gint _tmp20_; -#line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp17_ = version; + if (_tmp11_ != SQLITE_DONE) { +#line 531 "VersionTable.c" + gchar* _tmp12_; + gchar* _tmp13_; + gint _tmp14_; #line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp18_ = g_strdup_printf ("update_version %d", _tmp17_); + _tmp12_ = g_strdup_printf ("update_version %d", version); #line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp19_ = _tmp18_; + _tmp13_ = _tmp12_; #line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp20_ = res; + _tmp14_ = res; #line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - database_table_fatal (_tmp19_, _tmp20_); + database_table_fatal (_tmp13_, _tmp14_); #line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _g_free0 (_tmp19_); -#line 570 "VersionTable.c" + _g_free0 (_tmp13_); +#line 545 "VersionTable.c" } #line 83 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _sqlite3_finalize0 (stmt); -#line 574 "VersionTable.c" +#line 549 "VersionTable.c" } -static void version_table_class_init (VersionTableClass * klass) { +static void +version_table_class_init (VersionTableClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/db/VersionTable.vala" version_table_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/db/VersionTable.vala" ((DatabaseTableClass *) klass)->finalize = version_table_finalize; -#line 583 "VersionTable.c" +#line 560 "VersionTable.c" } -static void version_table_instance_init (VersionTable * self) { +static void +version_table_instance_init (VersionTable * self) +{ } -static void version_table_finalize (DatabaseTable * obj) { +static void +version_table_finalize (DatabaseTable * obj) +{ VersionTable * self; #line 7 "/home/jens/Source/shotwell/src/db/VersionTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VERSION_TABLE, VersionTable); #line 7 "/home/jens/Source/shotwell/src/db/VersionTable.vala" DATABASE_TABLE_CLASS (version_table_parent_class)->finalize (obj); -#line 597 "VersionTable.c" +#line 578 "VersionTable.c" } -GType version_table_get_type (void) { +GType +version_table_get_type (void) +{ static volatile gsize version_table_type_id__volatile = 0; if (g_once_init_enter (&version_table_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (VersionTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) version_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (VersionTable), 0, (GInstanceInitFunc) version_table_instance_init, NULL }; diff --git a/src/db/VideoTable.c b/src/db/VideoTable.c index 69ca2ca..0780862 100644 --- a/src/db/VideoTable.c +++ b/src/db/VideoTable.c @@ -1,4 +1,4 @@ -/* VideoTable.c generated by valac 0.36.6, the Vala compiler +/* VideoTable.c generated by valac 0.40.4, the Vala compiler * generated from VideoTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -171,19 +172,27 @@ GType video_id_get_type (void) G_GNUC_CONST; VideoID* video_id_dup (const VideoID* self); void video_id_free (VideoID* self); #define VIDEO_ID_INVALID ((gint64) -1) -void video_id_init (VideoID *self, gint64 id); +void video_id_init (VideoID *self, + gint64 id); gboolean video_id_is_invalid (VideoID *self); gboolean video_id_is_valid (VideoID *self); guint video_id_hash (VideoID* a); guint int64_hash (gint64* n); -gboolean video_id_equal (void* a, void* b); +gboolean video_id_equal (void* a, + void* b); gchar* video_id_upgrade_video_id_to_source_id (VideoID* video_id); #define VIDEO_TYPENAME "video" gpointer video_row_ref (gpointer instance); void video_row_unref (gpointer instance); -GParamSpec* param_spec_video_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_video_row (GValue* value, gpointer v_object); -void value_take_video_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_video_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_video_row (GValue* value, + gpointer v_object); +void value_take_video_row (GValue* value, + gpointer v_object); gpointer value_get_video_row (const GValue* value); GType video_row_get_type (void) G_GNUC_CONST; GType import_id_get_type (void) G_GNUC_CONST; @@ -193,80 +202,155 @@ GType event_id_get_type (void) G_GNUC_CONST; EventID* event_id_dup (const EventID* self); void event_id_free (EventID* self); GType rating_get_type (void) G_GNUC_CONST; -enum { - VIDEO_ROW_DUMMY_PROPERTY -}; VideoRow* video_row_new (void); VideoRow* video_row_construct (GType object_type); static void video_row_finalize (VideoRow * obj); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType video_table_get_type (void) G_GNUC_CONST; -enum { - VIDEO_TABLE_DUMMY_PROPERTY -}; static VideoTable* video_table_new (void); static VideoTable* video_table_construct (GType object_type); DatabaseTable* database_table_construct (GType object_type); -void database_table_fatal (const gchar* op, gint res); -void database_table_set_table_name (DatabaseTable* self, const gchar* table_name); +void database_table_fatal (const gchar* op, + gint res); +void database_table_set_table_name (DatabaseTable* self, + const gchar* table_name); VideoTable* video_table_get_instance (void); GQuark database_error_quark (void); -void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* result, GError** error); +void video_table_add (VideoTable* self, + VideoRow* video_row, + VideoID* result, + GError** error); gulong now_sec (void); #define EVENT_ID_INVALID ((gint64) -1) -void database_table_throw_error (const gchar* method, gint res, GError** error); -void event_id_init (EventID *self, gint64 id); -gboolean video_table_drop_event (VideoTable* self, EventID* event_id); -VideoRow* video_table_get_row (VideoTable* self, VideoID* video_id); +void database_table_throw_error (const gchar* method, + gint res, + GError** error); +void event_id_init (EventID *self, + gint64 id); +gboolean video_table_drop_event (VideoTable* self, + EventID* event_id); +VideoRow* video_table_get_row (VideoTable* self, + VideoID* video_id); Rating rating_unserialize (gint value); GeeArrayList* video_table_get_all (VideoTable* self); -void video_table_set_filepath (VideoTable* self, VideoID* video_id, const gchar* filepath, GError** error); -void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error); -void video_table_set_title (VideoTable* self, VideoID* video_id, const gchar* new_title, GError** error); -void video_table_set_comment (VideoTable* self, VideoID* video_id, const gchar* new_comment, GError** error); -void video_table_set_exposure_time (VideoTable* self, VideoID* video_id, time_t time, GError** error); -void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint64 value, GError** error); -void video_table_set_rating (VideoTable* self, VideoID* video_id, Rating rating, GError** error); +void video_table_set_filepath (VideoTable* self, + VideoID* video_id, + const gchar* filepath, + GError** error); +void database_table_update_text_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text, + GError** error); +void video_table_set_title (VideoTable* self, + VideoID* video_id, + const gchar* new_title, + GError** error); +void video_table_set_comment (VideoTable* self, + VideoID* video_id, + const gchar* new_comment, + GError** error); +void video_table_set_exposure_time (VideoTable* self, + VideoID* video_id, + time_t time, + GError** error); +void database_table_update_int64_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + gint64 value, + GError** error); +void video_table_set_rating (VideoTable* self, + VideoID* video_id, + Rating rating, + GError** error); gint rating_serialize (Rating self); -void video_table_set_flags (VideoTable* self, VideoID* video_id, guint64 flags, GError** error); -void video_table_update_backlinks (VideoTable* self, VideoID* video_id, const gchar* backlinks, GError** error); -void video_table_update_is_interpretable (VideoTable* self, VideoID* video_id, gboolean is_interpretable, GError** error); -void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint value, GError** error); -gboolean video_table_set_event (VideoTable* self, VideoID* video_id, EventID* event_id); -gboolean database_table_update_int64_by_id (DatabaseTable* self, gint64 id, const gchar* column, gint64 value); -void video_table_remove_by_file (VideoTable* self, GFile* file, GError** error); -void video_table_remove (VideoTable* self, VideoID* videoID, GError** error); -gboolean video_table_is_video_stored (VideoTable* self, GFile* file); -void video_table_get_id (VideoTable* self, GFile* file, VideoID* result); -GeeArrayList* video_table_get_videos (VideoTable* self, GError** error); -static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* file, const gchar* md5); -gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar* md5); -VideoID* video_table_get_duplicate_ids (VideoTable* self, GFile* file, const gchar* md5, int* result_length1); -static void _vala_array_add3 (VideoID* * array, int* length, int* size, const VideoID* value); -GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event_id); -void video_table_set_timestamp (VideoTable* self, VideoID* video_id, time_t timestamp, GError** error); +void video_table_set_flags (VideoTable* self, + VideoID* video_id, + guint64 flags, + GError** error); +void video_table_update_backlinks (VideoTable* self, + VideoID* video_id, + const gchar* backlinks, + GError** error); +void video_table_update_is_interpretable (VideoTable* self, + VideoID* video_id, + gboolean is_interpretable, + GError** error); +void database_table_update_int_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + gint value, + GError** error); +gboolean video_table_set_event (VideoTable* self, + VideoID* video_id, + EventID* event_id); +gboolean database_table_update_int64_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + gint64 value); +void video_table_remove_by_file (VideoTable* self, + GFile* file, + GError** error); +void video_table_remove (VideoTable* self, + VideoID* videoID, + GError** error); +gboolean video_table_is_video_stored (VideoTable* self, + GFile* file); +void video_table_get_id (VideoTable* self, + GFile* file, + VideoID* result); +GeeArrayList* video_table_get_videos (VideoTable* self, + GError** error); +static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, + GFile* file, + const gchar* md5); +gboolean video_table_has_duplicate (VideoTable* self, + GFile* file, + const gchar* md5); +VideoID* video_table_get_duplicate_ids (VideoTable* self, + GFile* file, + const gchar* md5, + int* result_length1); +static void _vala_array_add3 (VideoID* * array, + int* length, + int* size, + const VideoID* value); +GeeArrayList* video_table_get_event_source_ids (VideoTable* self, + EventID* event_id); +void video_table_set_timestamp (VideoTable* self, + VideoID* video_id, + time_t timestamp, + GError** error); static void video_table_finalize (DatabaseTable * obj); -void video_id_init (VideoID *self, gint64 id) { - gint64 _tmp0_; +void +video_id_init (VideoID *self, + gint64 id) +{ #line 12 "/home/jens/Source/shotwell/src/db/VideoTable.vala" memset (self, 0, sizeof (VideoID)); #line 13 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp0_ = id; -#line 13 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - (*self).id = _tmp0_; -#line 266 "VideoTable.c" + (*self).id = id; +#line 348 "VideoTable.c" } -gboolean video_id_is_invalid (VideoID *self) { +gboolean +video_id_is_invalid (VideoID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 17 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -275,11 +359,13 @@ gboolean video_id_is_invalid (VideoID *self) { result = _tmp0_ == VIDEO_ID_INVALID; #line 17 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 279 "VideoTable.c" +#line 363 "VideoTable.c" } -gboolean video_id_is_valid (VideoID *self) { +gboolean +video_id_is_valid (VideoID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 21 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -288,52 +374,47 @@ gboolean video_id_is_valid (VideoID *self) { result = _tmp0_ != VIDEO_ID_INVALID; #line 21 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 292 "VideoTable.c" +#line 378 "VideoTable.c" } -guint video_id_hash (VideoID* a) { +guint +video_id_hash (VideoID* a) +{ guint result = 0U; - VideoID* _tmp0_; - gint64 _tmp1_; - guint _tmp2_; -#line 25 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp0_ = a; -#line 25 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp1_ = (*_tmp0_).id; + gint64 _tmp0_; #line 25 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = int64_hash (&_tmp1_); + _tmp0_ = (*a).id; #line 25 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - result = _tmp2_; + result = int64_hash (&_tmp0_); #line 25 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 311 "VideoTable.c" +#line 393 "VideoTable.c" } -gboolean video_id_equal (void* a, void* b) { +gboolean +video_id_equal (void* a, + void* b) +{ gboolean result = FALSE; - void* _tmp0_; + gint64 _tmp0_; gint64 _tmp1_; - void* _tmp2_; - gint64 _tmp3_; -#line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp0_ = a; #line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp1_ = (*((VideoID*) _tmp0_)).id; + _tmp0_ = (*((VideoID*) a)).id; #line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = b; + _tmp1_ = (*((VideoID*) b)).id; #line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp3_ = (*((VideoID*) _tmp2_)).id; -#line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - result = _tmp1_ == _tmp3_; + result = _tmp0_ == _tmp1_; #line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 333 "VideoTable.c" +#line 412 "VideoTable.c" } -gchar* video_id_upgrade_video_id_to_source_id (VideoID* video_id) { +gchar* +video_id_upgrade_video_id_to_source_id (VideoID* video_id) +{ gchar* result = NULL; VideoID _tmp0_; gint64 _tmp1_; @@ -350,11 +431,13 @@ gchar* video_id_upgrade_video_id_to_source_id (VideoID* video_id) { result = _tmp2_; #line 33 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 354 "VideoTable.c" +#line 435 "VideoTable.c" } -VideoID* video_id_dup (const VideoID* self) { +VideoID* +video_id_dup (const VideoID* self) +{ VideoID* dup; #line 7 "/home/jens/Source/shotwell/src/db/VideoTable.vala" dup = g_new0 (VideoID, 1); @@ -362,18 +445,22 @@ VideoID* video_id_dup (const VideoID* self) { memcpy (dup, self, sizeof (VideoID)); #line 7 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return dup; -#line 366 "VideoTable.c" +#line 449 "VideoTable.c" } -void video_id_free (VideoID* self) { +void +video_id_free (VideoID* self) +{ #line 7 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_free (self); -#line 373 "VideoTable.c" +#line 458 "VideoTable.c" } -GType video_id_get_type (void) { +GType +video_id_get_type (void) +{ static volatile gsize video_id_type_id__volatile = 0; if (g_once_init_enter (&video_id_type_id__volatile)) { GType video_id_type_id; @@ -384,121 +471,150 @@ GType video_id_get_type (void) { } -VideoRow* video_row_construct (GType object_type) { +VideoRow* +video_row_construct (GType object_type) +{ VideoRow* self = NULL; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" self = (VideoRow*) g_type_create_instance (object_type); #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return self; -#line 394 "VideoTable.c" +#line 483 "VideoTable.c" } -VideoRow* video_row_new (void) { +VideoRow* +video_row_new (void) +{ #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return video_row_construct (TYPE_VIDEO_ROW); -#line 401 "VideoTable.c" +#line 492 "VideoTable.c" } -static void value_video_row_init (GValue* value) { +static void +value_video_row_init (GValue* value) +{ #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" value->data[0].v_pointer = NULL; -#line 408 "VideoTable.c" +#line 501 "VideoTable.c" } -static void value_video_row_free_value (GValue* value) { +static void +value_video_row_free_value (GValue* value) +{ #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (value->data[0].v_pointer) { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" video_row_unref (value->data[0].v_pointer); -#line 417 "VideoTable.c" +#line 512 "VideoTable.c" } } -static void value_video_row_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_video_row_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (src_value->data[0].v_pointer) { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" dest_value->data[0].v_pointer = video_row_ref (src_value->data[0].v_pointer); -#line 427 "VideoTable.c" +#line 525 "VideoTable.c" } else { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" dest_value->data[0].v_pointer = NULL; -#line 431 "VideoTable.c" +#line 529 "VideoTable.c" } } -static gpointer value_video_row_peek_pointer (const GValue* value) { +static gpointer +value_video_row_peek_pointer (const GValue* value) +{ #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return value->data[0].v_pointer; -#line 439 "VideoTable.c" +#line 539 "VideoTable.c" } -static gchar* value_video_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_video_row_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (collect_values[0].v_pointer) { -#line 446 "VideoTable.c" +#line 551 "VideoTable.c" VideoRow * object; object = collect_values[0].v_pointer; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (object->parent_instance.g_class == NULL) { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 453 "VideoTable.c" +#line 558 "VideoTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.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 457 "VideoTable.c" +#line 562 "VideoTable.c" } #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" value->data[0].v_pointer = video_row_ref (object); -#line 461 "VideoTable.c" +#line 566 "VideoTable.c" } else { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" value->data[0].v_pointer = NULL; -#line 465 "VideoTable.c" +#line 570 "VideoTable.c" } #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return NULL; -#line 469 "VideoTable.c" +#line 574 "VideoTable.c" } -static gchar* value_video_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_video_row_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ VideoRow ** object_p; object_p = collect_values[0].v_pointer; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (!object_p) { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 480 "VideoTable.c" +#line 590 "VideoTable.c" } #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (!value->data[0].v_pointer) { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" *object_p = NULL; -#line 486 "VideoTable.c" +#line 596 "VideoTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" *object_p = value->data[0].v_pointer; -#line 490 "VideoTable.c" +#line 600 "VideoTable.c" } else { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" *object_p = video_row_ref (value->data[0].v_pointer); -#line 494 "VideoTable.c" +#line 604 "VideoTable.c" } #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return NULL; -#line 498 "VideoTable.c" +#line 608 "VideoTable.c" } -GParamSpec* param_spec_video_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_video_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecVideoRow* spec; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_VIDEO_ROW), NULL); @@ -508,20 +624,25 @@ GParamSpec* param_spec_video_row (const gchar* name, const gchar* nick, const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return G_PARAM_SPEC (spec); -#line 512 "VideoTable.c" +#line 628 "VideoTable.c" } -gpointer value_get_video_row (const GValue* value) { +gpointer +value_get_video_row (const GValue* value) +{ #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_ROW), NULL); #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return value->data[0].v_pointer; -#line 521 "VideoTable.c" +#line 639 "VideoTable.c" } -void value_set_video_row (GValue* value, gpointer v_object) { +void +value_set_video_row (GValue* value, + gpointer v_object) +{ VideoRow * old; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_ROW)); @@ -537,22 +658,25 @@ void value_set_video_row (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" video_row_ref (value->data[0].v_pointer); -#line 541 "VideoTable.c" +#line 662 "VideoTable.c" } else { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" value->data[0].v_pointer = NULL; -#line 545 "VideoTable.c" +#line 666 "VideoTable.c" } #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (old) { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" video_row_unref (old); -#line 551 "VideoTable.c" +#line 672 "VideoTable.c" } } -void value_take_video_row (GValue* value, gpointer v_object) { +void +value_take_video_row (GValue* value, + gpointer v_object) +{ VideoRow * old; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_ROW)); @@ -566,38 +690,44 @@ void value_take_video_row (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" value->data[0].v_pointer = v_object; -#line 570 "VideoTable.c" +#line 694 "VideoTable.c" } else { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" value->data[0].v_pointer = NULL; -#line 574 "VideoTable.c" +#line 698 "VideoTable.c" } #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (old) { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" video_row_unref (old); -#line 580 "VideoTable.c" +#line 704 "VideoTable.c" } } -static void video_row_class_init (VideoRowClass * klass) { +static void +video_row_class_init (VideoRowClass * klass) +{ #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" video_row_parent_class = g_type_class_peek_parent (klass); #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" ((VideoRowClass *) klass)->finalize = video_row_finalize; -#line 590 "VideoTable.c" +#line 716 "VideoTable.c" } -static void video_row_instance_init (VideoRow * self) { +static void +video_row_instance_init (VideoRow * self) +{ #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" self->ref_count = 1; -#line 597 "VideoTable.c" +#line 725 "VideoTable.c" } -static void video_row_finalize (VideoRow * obj) { +static void +video_row_finalize (VideoRow * obj) +{ VideoRow * self; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_ROW, VideoRow); @@ -613,11 +743,13 @@ static void video_row_finalize (VideoRow * obj) { _g_free0 (self->backlinks); #line 56 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _g_free0 (self->comment); -#line 617 "VideoTable.c" +#line 747 "VideoTable.c" } -GType video_row_get_type (void) { +GType +video_row_get_type (void) +{ static volatile gsize video_row_type_id__volatile = 0; if (g_once_init_enter (&video_row_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_video_row_init, value_video_row_free_value, value_video_row_copy_value, value_video_row_peek_pointer, "p", value_video_row_collect_value, "p", value_video_row_lcopy_value }; @@ -631,18 +763,22 @@ GType video_row_get_type (void) { } -gpointer video_row_ref (gpointer instance) { +gpointer +video_row_ref (gpointer instance) +{ VideoRow * self; self = instance; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_atomic_int_inc (&self->ref_count); #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return instance; -#line 642 "VideoTable.c" +#line 776 "VideoTable.c" } -void video_row_unref (gpointer instance) { +void +video_row_unref (gpointer instance) +{ VideoRow * self; self = instance; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -651,12 +787,14 @@ void video_row_unref (gpointer instance) { VIDEO_ROW_GET_CLASS (self)->finalize (self); #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 655 "VideoTable.c" +#line 791 "VideoTable.c" } } -static VideoTable* video_table_construct (GType object_type) { +static VideoTable* +video_table_construct (GType object_type) +{ VideoTable* self = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -666,16 +804,14 @@ static VideoTable* video_table_construct (GType object_type) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; sqlite3_stmt* stmt2 = NULL; gint res2 = 0; - sqlite3* _tmp8_; - sqlite3_stmt* _tmp9_ = NULL; + sqlite3* _tmp7_; + sqlite3_stmt* _tmp8_ = NULL; + gint _tmp9_; gint _tmp10_; - gint _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; - gint _tmp14_; + sqlite3_stmt* _tmp11_; + gint _tmp12_; #line 62 "/home/jens/Source/shotwell/src/db/VideoTable.vala" self = (VideoTable*) database_table_construct (object_type); #line 64 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -695,52 +831,48 @@ static VideoTable* video_table_construct (GType object_type) { #line 87 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp4_ = stmt; #line 87 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 87 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 88 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 88 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp6_ != SQLITE_DONE) { -#line 706 "VideoTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_DONE) { +#line 840 "VideoTable.c" + gint _tmp6_; #line 89 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 89 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_fatal ("VideoTable constructor", _tmp7_); -#line 712 "VideoTable.c" + database_table_fatal ("VideoTable constructor", _tmp6_); +#line 846 "VideoTable.c" } #line 93 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = database_table_db; + _tmp7_ = database_table_db; #line 93 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = sqlite3_prepare_v2 (_tmp8_, "CREATE INDEX IF NOT EXISTS VideoEventIDIndex ON VideoTable (event_id)", -1, &_tmp9_, NULL); + _tmp9_ = sqlite3_prepare_v2 (_tmp7_, "CREATE INDEX IF NOT EXISTS VideoEventIDIndex ON VideoTable (event_id)", -1, &_tmp8_, NULL); #line 93 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt2); #line 93 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - stmt2 = _tmp9_; + stmt2 = _tmp8_; #line 93 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res2 = _tmp10_; + res2 = _tmp9_; #line 95 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = res2; + _tmp10_ = res2; #line 95 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res2 == Sqlite.OK"); -#line 97 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = stmt2; + _vala_assert (_tmp10_ == SQLITE_OK, "res2 == Sqlite.OK"); #line 97 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = sqlite3_step (_tmp12_); + _tmp11_ = stmt2; #line 97 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res2 = _tmp13_; + res2 = sqlite3_step (_tmp11_); #line 98 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp14_ = res2; + _tmp12_ = res2; #line 98 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp14_ != SQLITE_DONE) { -#line 738 "VideoTable.c" - gint _tmp15_; + if (_tmp12_ != SQLITE_DONE) { +#line 870 "VideoTable.c" + gint _tmp13_; #line 99 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp15_ = res2; + _tmp13_ = res2; #line 99 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_fatal ("VideoTable constructor", _tmp15_); -#line 744 "VideoTable.c" + database_table_fatal ("VideoTable constructor", _tmp13_); +#line 876 "VideoTable.c" } #line 101 "/home/jens/Source/shotwell/src/db/VideoTable.vala" database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "VideoTable"); @@ -750,25 +882,31 @@ static VideoTable* video_table_construct (GType object_type) { _sqlite3_finalize0 (stmt); #line 62 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return self; -#line 754 "VideoTable.c" +#line 886 "VideoTable.c" } -static VideoTable* video_table_new (void) { +static VideoTable* +video_table_new (void) +{ #line 62 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return video_table_construct (TYPE_VIDEO_TABLE); -#line 761 "VideoTable.c" +#line 895 "VideoTable.c" } -static gpointer _database_table_ref0 (gpointer self) { +static gpointer +_database_table_ref0 (gpointer self) +{ #line 108 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return self ? database_table_ref (self) : NULL; -#line 768 "VideoTable.c" +#line 904 "VideoTable.c" } -VideoTable* video_table_get_instance (void) { +VideoTable* +video_table_get_instance (void) +{ VideoTable* result = NULL; VideoTable* _tmp0_; VideoTable* _tmp2_; @@ -777,7 +915,7 @@ VideoTable* video_table_get_instance (void) { _tmp0_ = video_table_instance; #line 105 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (_tmp0_ == NULL) { -#line 781 "VideoTable.c" +#line 919 "VideoTable.c" VideoTable* _tmp1_; #line 106 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp1_ = video_table_new (); @@ -785,7 +923,7 @@ VideoTable* video_table_get_instance (void) { _database_table_unref0 (video_table_instance); #line 106 "/home/jens/Source/shotwell/src/db/VideoTable.vala" video_table_instance = _tmp1_; -#line 789 "VideoTable.c" +#line 927 "VideoTable.c" } #line 108 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp2_ = video_table_instance; @@ -795,11 +933,16 @@ VideoTable* video_table_get_instance (void) { result = _tmp3_; #line 108 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 799 "VideoTable.c" +#line 937 "VideoTable.c" } -void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* result, GError** error) { +void +video_table_add (VideoTable* self, + VideoRow* video_row, + VideoID* result, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -807,96 +950,62 @@ void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* result, GE gint _tmp2_; gint _tmp3_; gulong time_created = 0UL; - gulong _tmp4_; - sqlite3_stmt* _tmp5_; - VideoRow* _tmp6_; - const gchar* _tmp7_; - gchar* _tmp8_; - GDestroyNotify _tmp9_; + sqlite3_stmt* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; + GDestroyNotify _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; gint _tmp10_; gint _tmp11_; sqlite3_stmt* _tmp12_; - VideoRow* _tmp13_; + gint _tmp13_; gint _tmp14_; - gint _tmp15_; - gint _tmp16_; - sqlite3_stmt* _tmp17_; - VideoRow* _tmp18_; - gint _tmp19_; - gint _tmp20_; + sqlite3_stmt* _tmp15_; + gdouble _tmp16_; + gint _tmp17_; + gint _tmp18_ = 0; + gboolean _tmp19_; + sqlite3_stmt* _tmp20_; gint _tmp21_; sqlite3_stmt* _tmp22_; - VideoRow* _tmp23_; - gdouble _tmp24_; - gint _tmp25_; - gint _tmp26_; - gint _tmp27_ = 0; - VideoRow* _tmp28_; - gboolean _tmp29_; - sqlite3_stmt* _tmp30_; - gint _tmp31_; - gint _tmp32_; - sqlite3_stmt* _tmp33_; - VideoRow* _tmp34_; - gint64 _tmp35_; + gint64 _tmp23_; + gint _tmp24_; + sqlite3_stmt* _tmp25_; + time_t _tmp26_; + gint _tmp27_; + sqlite3_stmt* _tmp28_; + time_t _tmp29_; + gint _tmp30_; + sqlite3_stmt* _tmp31_; + ImportID _tmp32_; + gint64 _tmp33_; + gint _tmp34_; + sqlite3_stmt* _tmp35_; gint _tmp36_; - gint _tmp37_; - sqlite3_stmt* _tmp38_; - VideoRow* _tmp39_; - time_t _tmp40_; + sqlite3_stmt* _tmp37_; + const gchar* _tmp38_; + gchar* _tmp39_; + GDestroyNotify _tmp40_; gint _tmp41_; - gint _tmp42_; - sqlite3_stmt* _tmp43_; - VideoRow* _tmp44_; - time_t _tmp45_; - gint _tmp46_; - gint _tmp47_; - sqlite3_stmt* _tmp48_; - VideoRow* _tmp49_; - ImportID _tmp50_; - gint64 _tmp51_; - gint _tmp52_; - gint _tmp53_; - sqlite3_stmt* _tmp54_; - gint _tmp55_; + sqlite3_stmt* _tmp42_; + gulong _tmp43_; + gint _tmp44_; + sqlite3_stmt* _tmp45_; + const gchar* _tmp46_; + gchar* _tmp47_; + GDestroyNotify _tmp48_; + gint _tmp49_; + sqlite3_stmt* _tmp50_; + const gchar* _tmp51_; + gchar* _tmp52_; + GDestroyNotify _tmp53_; + gint _tmp54_; + sqlite3_stmt* _tmp55_; gint _tmp56_; - sqlite3_stmt* _tmp57_; - VideoRow* _tmp58_; - const gchar* _tmp59_; - gchar* _tmp60_; - GDestroyNotify _tmp61_; - gint _tmp62_; - gint _tmp63_; - sqlite3_stmt* _tmp64_; - gulong _tmp65_; - gint _tmp66_; - gint _tmp67_; - sqlite3_stmt* _tmp68_; - VideoRow* _tmp69_; - const gchar* _tmp70_; - gchar* _tmp71_; - GDestroyNotify _tmp72_; - gint _tmp73_; - gint _tmp74_; - sqlite3_stmt* _tmp75_; - VideoRow* _tmp76_; - const gchar* _tmp77_; - gchar* _tmp78_; - GDestroyNotify _tmp79_; - gint _tmp80_; - gint _tmp81_; - sqlite3_stmt* _tmp82_; - gint _tmp83_; - gint _tmp84_; - VideoRow* _tmp87_; - sqlite3* _tmp88_; - gint64 _tmp89_; - VideoRow* _tmp90_; - VideoRow* _tmp91_; - gulong _tmp92_; - VideoRow* _tmp93_; - VideoRow* _tmp94_; - VideoID _tmp95_; + sqlite3* _tmp59_; + gulong _tmp60_; + VideoID _tmp61_; GError * _inner_error_ = NULL; #line 113 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -919,249 +1028,193 @@ void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* result, GE #line 120 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 122 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp4_ = now_sec (); -#line 122 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - time_created = _tmp4_; + time_created = now_sec (); #line 124 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp5_ = stmt; -#line 124 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp6_ = video_row; -#line 124 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = _tmp6_->filepath; + _tmp4_ = stmt; #line 124 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = g_strdup (_tmp7_); + _tmp5_ = video_row->filepath; #line 124 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = g_free; + _tmp6_ = g_strdup (_tmp5_); #line 124 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = sqlite3_bind_text (_tmp5_, 1, _tmp8_, -1, _tmp9_); + _tmp7_ = g_free; #line 124 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp10_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); #line 125 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = res; + _tmp8_ = res; #line 125 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 126 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = stmt; -#line 126 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = video_row; + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 126 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp14_ = _tmp13_->width; + _tmp9_ = stmt; #line 126 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp15_ = sqlite3_bind_int (_tmp12_, 2, _tmp14_); + _tmp10_ = video_row->width; #line 126 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp15_; + res = sqlite3_bind_int (_tmp9_, 2, _tmp10_); #line 127 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp16_ = res; + _tmp11_ = res; #line 127 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK"); -#line 128 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp17_ = stmt; -#line 128 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp18_ = video_row; + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 128 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp19_ = _tmp18_->height; + _tmp12_ = stmt; #line 128 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp20_ = sqlite3_bind_int (_tmp17_, 3, _tmp19_); + _tmp13_ = video_row->height; #line 128 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp20_; + res = sqlite3_bind_int (_tmp12_, 3, _tmp13_); #line 129 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp21_ = res; + _tmp14_ = res; #line 129 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK"); -#line 130 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp22_ = stmt; + _vala_assert (_tmp14_ == SQLITE_OK, "res == Sqlite.OK"); #line 130 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp23_ = video_row; -#line 130 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp24_ = _tmp23_->clip_duration; + _tmp15_ = stmt; #line 130 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp25_ = sqlite3_bind_double (_tmp22_, 4, _tmp24_); + _tmp16_ = video_row->clip_duration; #line 130 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp25_; + res = sqlite3_bind_double (_tmp15_, 4, _tmp16_); #line 131 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp26_ = res; + _tmp17_ = res; #line 131 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp26_ == SQLITE_OK, "res == Sqlite.OK"); -#line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp28_ = video_row; + _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); #line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp29_ = _tmp28_->is_interpretable; + _tmp19_ = video_row->is_interpretable; #line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp29_) { + if (_tmp19_) { #line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp27_ = 1; -#line 992 "VideoTable.c" + _tmp18_ = 1; +#line 1081 "VideoTable.c" } else { #line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp27_ = 0; -#line 996 "VideoTable.c" + _tmp18_ = 0; +#line 1085 "VideoTable.c" } #line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp30_ = stmt; -#line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp31_ = sqlite3_bind_int (_tmp30_, 5, _tmp27_); + _tmp20_ = stmt; #line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp31_; + res = sqlite3_bind_int (_tmp20_, 5, _tmp18_); #line 133 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp32_ = res; + _tmp21_ = res; #line 133 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp32_ == SQLITE_OK, "res == Sqlite.OK"); -#line 134 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp33_ = stmt; -#line 134 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp34_ = video_row; + _vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK"); #line 134 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp35_ = _tmp34_->filesize; + _tmp22_ = stmt; #line 134 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp36_ = sqlite3_bind_int64 (_tmp33_, 6, _tmp35_); + _tmp23_ = video_row->filesize; #line 134 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp36_; + res = sqlite3_bind_int64 (_tmp22_, 6, _tmp23_); #line 135 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp37_ = res; + _tmp24_ = res; #line 135 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK"); #line 136 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp38_ = stmt; -#line 136 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp39_ = video_row; -#line 136 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp40_ = _tmp39_->timestamp; + _tmp25_ = stmt; #line 136 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp41_ = sqlite3_bind_int64 (_tmp38_, 7, (gint64) _tmp40_); + _tmp26_ = video_row->timestamp; #line 136 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp41_; + res = sqlite3_bind_int64 (_tmp25_, 7, (gint64) _tmp26_); #line 137 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp42_ = res; + _tmp27_ = res; #line 137 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); #line 138 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp43_ = stmt; -#line 138 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp44_ = video_row; -#line 138 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp45_ = _tmp44_->exposure_time; + _tmp28_ = stmt; #line 138 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp46_ = sqlite3_bind_int64 (_tmp43_, 8, (gint64) _tmp45_); + _tmp29_ = video_row->exposure_time; #line 138 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp46_; + res = sqlite3_bind_int64 (_tmp28_, 8, (gint64) _tmp29_); #line 139 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp47_ = res; + _tmp30_ = res; #line 139 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp47_ == SQLITE_OK, "res == Sqlite.OK"); -#line 140 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp48_ = stmt; -#line 140 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp49_ = video_row; + _vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK"); #line 140 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp50_ = _tmp49_->import_id; + _tmp31_ = stmt; #line 140 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp51_ = _tmp50_.id; + _tmp32_ = video_row->import_id; #line 140 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp52_ = sqlite3_bind_int64 (_tmp48_, 9, _tmp51_); + _tmp33_ = _tmp32_.id; #line 140 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp52_; + res = sqlite3_bind_int64 (_tmp31_, 9, _tmp33_); #line 141 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp53_ = res; + _tmp34_ = res; #line 141 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp53_ == SQLITE_OK, "res == Sqlite.OK"); -#line 142 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp54_ = stmt; + _vala_assert (_tmp34_ == SQLITE_OK, "res == Sqlite.OK"); #line 142 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp55_ = sqlite3_bind_int64 (_tmp54_, 10, EVENT_ID_INVALID); + _tmp35_ = stmt; #line 142 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp55_; + res = sqlite3_bind_int64 (_tmp35_, 10, EVENT_ID_INVALID); #line 143 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp56_ = res; + _tmp36_ = res; #line 143 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp56_ == SQLITE_OK, "res == Sqlite.OK"); -#line 144 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp57_ = stmt; + _vala_assert (_tmp36_ == SQLITE_OK, "res == Sqlite.OK"); #line 144 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp58_ = video_row; -#line 144 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp59_ = _tmp58_->md5; + _tmp37_ = stmt; #line 144 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp60_ = g_strdup (_tmp59_); + _tmp38_ = video_row->md5; #line 144 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp61_ = g_free; + _tmp39_ = g_strdup (_tmp38_); #line 144 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp62_ = sqlite3_bind_text (_tmp57_, 11, _tmp60_, -1, _tmp61_); + _tmp40_ = g_free; #line 144 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp62_; + res = sqlite3_bind_text (_tmp37_, 11, _tmp39_, -1, _tmp40_); #line 145 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp63_ = res; + _tmp41_ = res; #line 145 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp63_ == SQLITE_OK, "res == Sqlite.OK"); -#line 146 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp64_ = stmt; + _vala_assert (_tmp41_ == SQLITE_OK, "res == Sqlite.OK"); #line 146 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp65_ = time_created; + _tmp42_ = stmt; #line 146 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp66_ = sqlite3_bind_int64 (_tmp64_, 12, (gint64) _tmp65_); + _tmp43_ = time_created; #line 146 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp66_; + res = sqlite3_bind_int64 (_tmp42_, 12, (gint64) _tmp43_); #line 147 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp67_ = res; + _tmp44_ = res; #line 147 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp67_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp44_ == SQLITE_OK, "res == Sqlite.OK"); #line 148 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp68_ = stmt; + _tmp45_ = stmt; #line 148 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp69_ = video_row; + _tmp46_ = video_row->title; #line 148 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp70_ = _tmp69_->title; + _tmp47_ = g_strdup (_tmp46_); #line 148 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp71_ = g_strdup (_tmp70_); + _tmp48_ = g_free; #line 148 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp72_ = g_free; -#line 148 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp73_ = sqlite3_bind_text (_tmp68_, 13, _tmp71_, -1, _tmp72_); -#line 148 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp73_; + res = sqlite3_bind_text (_tmp45_, 13, _tmp47_, -1, _tmp48_); #line 149 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp74_ = res; + _tmp49_ = res; #line 149 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp74_ == SQLITE_OK, "res == Sqlite.OK"); -#line 150 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp75_ = stmt; + _vala_assert (_tmp49_ == SQLITE_OK, "res == Sqlite.OK"); #line 150 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp76_ = video_row; -#line 150 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp77_ = _tmp76_->comment; + _tmp50_ = stmt; #line 150 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp78_ = g_strdup (_tmp77_); + _tmp51_ = video_row->comment; #line 150 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp79_ = g_free; + _tmp52_ = g_strdup (_tmp51_); #line 150 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp80_ = sqlite3_bind_text (_tmp75_, 14, _tmp78_, -1, _tmp79_); + _tmp53_ = g_free; #line 150 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp80_; + res = sqlite3_bind_text (_tmp50_, 14, _tmp52_, -1, _tmp53_); #line 151 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp81_ = res; + _tmp54_ = res; #line 151 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp81_ == SQLITE_OK, "res == Sqlite.OK"); -#line 153 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp82_ = stmt; + _vala_assert (_tmp54_ == SQLITE_OK, "res == Sqlite.OK"); #line 153 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp83_ = sqlite3_step (_tmp82_); + _tmp55_ = stmt; #line 153 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp83_; + res = sqlite3_step (_tmp55_); #line 154 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp84_ = res; + _tmp56_ = res; #line 154 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp84_ != SQLITE_DONE) { -#line 1152 "VideoTable.c" - gint _tmp85_; + if (_tmp56_ != SQLITE_DONE) { +#line 1205 "VideoTable.c" + gint _tmp57_; #line 155 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp85_ = res; + _tmp57_ = res; #line 155 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp85_ != SQLITE_CONSTRAINT) { -#line 1158 "VideoTable.c" - gint _tmp86_; + if (_tmp57_ != SQLITE_CONSTRAINT) { +#line 1211 "VideoTable.c" + gint _tmp58_; #line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp86_ = res; + _tmp58_ = res; #line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_throw_error ("VideoTable.add", _tmp86_, &_inner_error_); + database_table_throw_error ("VideoTable.add", _tmp58_, &_inner_error_); #line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -1172,7 +1225,7 @@ void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* result, GE _sqlite3_finalize0 (stmt); #line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 1174 "VideoTable.c" +#line 1227 "VideoTable.c" } else { #line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); @@ -1182,48 +1235,39 @@ void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* result, GE g_clear_error (&_inner_error_); #line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 1184 "VideoTable.c" +#line 1237 "VideoTable.c" } } } } #line 160 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp87_ = video_row; -#line 160 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp88_ = database_table_db; + _tmp59_ = database_table_db; #line 160 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp89_ = sqlite3_last_insert_rowid (_tmp88_); -#line 160 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - video_id_init (&_tmp87_->video_id, _tmp89_); -#line 161 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp90_ = video_row; + video_id_init (&video_row->video_id, sqlite3_last_insert_rowid (_tmp59_)); #line 161 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - event_id_init (&_tmp90_->event_id, EVENT_ID_INVALID); + event_id_init (&video_row->event_id, EVENT_ID_INVALID); #line 162 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp91_ = video_row; + _tmp60_ = time_created; #line 162 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp92_ = time_created; -#line 162 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp91_->time_created = (time_t) _tmp92_; -#line 163 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp93_ = video_row; + video_row->time_created = (time_t) _tmp60_; #line 163 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp93_->flags = (guint64) 0; -#line 165 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp94_ = video_row; + video_row->flags = (guint64) 0; #line 165 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp95_ = _tmp94_->video_id; + _tmp61_ = video_row->video_id; #line 165 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - *result = _tmp95_; + *result = _tmp61_; #line 165 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); #line 165 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 1221 "VideoTable.c" +#line 1262 "VideoTable.c" } -gboolean video_table_drop_event (VideoTable* self, EventID* event_id) { +gboolean +video_table_drop_event (VideoTable* self, + EventID* event_id) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1233,15 +1277,12 @@ gboolean video_table_drop_event (VideoTable* self, EventID* event_id) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; - sqlite3_stmt* _tmp7_; - EventID _tmp8_; - gint64 _tmp9_; - gint _tmp10_; + sqlite3_stmt* _tmp6_; + EventID _tmp7_; + gint64 _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; gint _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; - gint _tmp14_; #line 168 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE); #line 168 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -1263,50 +1304,44 @@ gboolean video_table_drop_event (VideoTable* self, EventID* event_id) { #line 173 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp4_ = stmt; #line 173 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp5_ = sqlite3_bind_int64 (_tmp4_, 1, EVENT_ID_INVALID); -#line 173 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp5_; + res = sqlite3_bind_int64 (_tmp4_, 1, EVENT_ID_INVALID); #line 174 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 174 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); #line 175 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = stmt; + _tmp6_ = stmt; #line 175 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = *event_id; + _tmp7_ = *event_id; #line 175 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = _tmp8_.id; + _tmp8_ = _tmp7_.id; #line 175 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = sqlite3_bind_int64 (_tmp7_, 2, _tmp9_); -#line 175 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp10_; + res = sqlite3_bind_int64 (_tmp6_, 2, _tmp8_); #line 176 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 176 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 178 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = stmt; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 178 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = sqlite3_step (_tmp12_); + _tmp10_ = stmt; #line 178 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp13_; + res = sqlite3_step (_tmp10_); #line 179 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp14_ = res; + _tmp11_ = res; #line 179 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp14_ != SQLITE_DONE) { -#line 1296 "VideoTable.c" - gint _tmp15_; + if (_tmp11_ != SQLITE_DONE) { +#line 1331 "VideoTable.c" + gint _tmp12_; #line 180 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp15_ = res; + _tmp12_ = res; #line 180 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_fatal ("VideoTable.drop_event", _tmp15_); + database_table_fatal ("VideoTable.drop_event", _tmp12_); #line 182 "/home/jens/Source/shotwell/src/db/VideoTable.vala" result = FALSE; #line 182 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); #line 182 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 1308 "VideoTable.c" +#line 1343 "VideoTable.c" } #line 185 "/home/jens/Source/shotwell/src/db/VideoTable.vala" result = TRUE; @@ -1314,11 +1349,14 @@ gboolean video_table_drop_event (VideoTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 185 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 1316 "VideoTable.c" +#line 1351 "VideoTable.c" } -VideoRow* video_table_get_row (VideoTable* self, VideoID* video_id) { +VideoRow* +video_table_get_row (VideoTable* self, + VideoID* video_id) +{ VideoRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1330,73 +1368,57 @@ VideoRow* video_table_get_row (VideoTable* self, VideoID* video_id) { VideoID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; + sqlite3_stmt* _tmp8_; VideoRow* row = NULL; - VideoRow* _tmp11_; + VideoRow* _tmp9_; + VideoRow* _tmp10_; + VideoID _tmp11_; VideoRow* _tmp12_; - VideoID _tmp13_; - VideoRow* _tmp14_; - sqlite3_stmt* _tmp15_; - const gchar* _tmp16_; - gchar* _tmp17_; + sqlite3_stmt* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_; + VideoRow* _tmp16_; + sqlite3_stmt* _tmp17_; VideoRow* _tmp18_; sqlite3_stmt* _tmp19_; - gint _tmp20_; - VideoRow* _tmp21_; - sqlite3_stmt* _tmp22_; - gint _tmp23_; + VideoRow* _tmp20_; + sqlite3_stmt* _tmp21_; + VideoRow* _tmp22_; + sqlite3_stmt* _tmp23_; VideoRow* _tmp24_; sqlite3_stmt* _tmp25_; - gdouble _tmp26_; - VideoRow* _tmp27_; - sqlite3_stmt* _tmp28_; - gint _tmp29_; + VideoRow* _tmp26_; + sqlite3_stmt* _tmp27_; + VideoRow* _tmp28_; + sqlite3_stmt* _tmp29_; VideoRow* _tmp30_; sqlite3_stmt* _tmp31_; - gint64 _tmp32_; - VideoRow* _tmp33_; - sqlite3_stmt* _tmp34_; - gint64 _tmp35_; - VideoRow* _tmp36_; - sqlite3_stmt* _tmp37_; - gint64 _tmp38_; - VideoRow* _tmp39_; - sqlite3_stmt* _tmp40_; - gint64 _tmp41_; + VideoRow* _tmp32_; + sqlite3_stmt* _tmp33_; + VideoRow* _tmp34_; + sqlite3_stmt* _tmp35_; + const gchar* _tmp36_; + gchar* _tmp37_; + VideoRow* _tmp38_; + sqlite3_stmt* _tmp39_; + VideoRow* _tmp40_; + sqlite3_stmt* _tmp41_; VideoRow* _tmp42_; sqlite3_stmt* _tmp43_; - gint64 _tmp44_; - VideoRow* _tmp45_; - sqlite3_stmt* _tmp46_; - const gchar* _tmp47_; - gchar* _tmp48_; - VideoRow* _tmp49_; - sqlite3_stmt* _tmp50_; - gint64 _tmp51_; + const gchar* _tmp44_; + gchar* _tmp45_; + VideoRow* _tmp46_; + sqlite3_stmt* _tmp47_; + const gchar* _tmp48_; + gchar* _tmp49_; + VideoRow* _tmp50_; + sqlite3_stmt* _tmp51_; VideoRow* _tmp52_; sqlite3_stmt* _tmp53_; - gint _tmp54_; - Rating _tmp55_; - VideoRow* _tmp56_; - sqlite3_stmt* _tmp57_; - const gchar* _tmp58_; - gchar* _tmp59_; - VideoRow* _tmp60_; - sqlite3_stmt* _tmp61_; - const gchar* _tmp62_; - gchar* _tmp63_; - VideoRow* _tmp64_; - sqlite3_stmt* _tmp65_; - gint64 _tmp66_; - VideoRow* _tmp67_; - sqlite3_stmt* _tmp68_; - gint64 _tmp69_; - VideoRow* _tmp70_; - sqlite3_stmt* _tmp71_; - const gchar* _tmp72_; - gchar* _tmp73_; + VideoRow* _tmp54_; + sqlite3_stmt* _tmp55_; + const gchar* _tmp56_; + gchar* _tmp57_; #line 188 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL); #line 188 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -1424,214 +1446,184 @@ VideoRow* video_table_get_row (VideoTable* self, VideoID* video_id) { #line 197 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp6_ = _tmp5_.id; #line 197 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 197 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 198 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 198 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 200 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = stmt; -#line 200 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 200 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp10_ != SQLITE_ROW) { + if (sqlite3_step (_tmp8_) != SQLITE_ROW) { #line 201 "/home/jens/Source/shotwell/src/db/VideoTable.vala" result = NULL; #line 201 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); #line 201 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 1443 "VideoTable.c" +#line 1461 "VideoTable.c" } #line 203 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = video_row_new (); + _tmp9_ = video_row_new (); #line 203 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - row = _tmp11_; + row = _tmp9_; #line 204 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = row; + _tmp10_ = row; #line 204 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = *video_id; + _tmp11_ = *video_id; #line 204 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_->video_id = _tmp13_; + _tmp10_->video_id = _tmp11_; #line 205 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp14_ = row; + _tmp12_ = row; #line 205 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp15_ = stmt; + _tmp13_ = stmt; #line 205 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp16_ = sqlite3_column_text (_tmp15_, 0); + _tmp14_ = sqlite3_column_text (_tmp13_, 0); #line 205 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp17_ = g_strdup (_tmp16_); + _tmp15_ = g_strdup (_tmp14_); #line 205 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp14_->filepath); + _g_free0 (_tmp12_->filepath); #line 205 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp14_->filepath = _tmp17_; -#line 206 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp18_ = row; + _tmp12_->filepath = _tmp15_; #line 206 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp19_ = stmt; + _tmp16_ = row; #line 206 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp20_ = sqlite3_column_int (_tmp19_, 1); + _tmp17_ = stmt; #line 206 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp18_->width = _tmp20_; -#line 207 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp21_ = row; + _tmp16_->width = sqlite3_column_int (_tmp17_, 1); #line 207 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp22_ = stmt; + _tmp18_ = row; #line 207 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp23_ = sqlite3_column_int (_tmp22_, 2); + _tmp19_ = stmt; #line 207 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp21_->height = _tmp23_; + _tmp18_->height = sqlite3_column_int (_tmp19_, 2); #line 208 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp24_ = row; -#line 208 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp25_ = stmt; + _tmp20_ = row; #line 208 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp26_ = sqlite3_column_double (_tmp25_, 3); + _tmp21_ = stmt; #line 208 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp24_->clip_duration = _tmp26_; + _tmp20_->clip_duration = sqlite3_column_double (_tmp21_, 3); #line 209 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp27_ = row; + _tmp22_ = row; #line 209 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp28_ = stmt; -#line 209 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp29_ = sqlite3_column_int (_tmp28_, 4); + _tmp23_ = stmt; #line 209 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp27_->is_interpretable = _tmp29_ == 1; + _tmp22_->is_interpretable = sqlite3_column_int (_tmp23_, 4) == 1; #line 210 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp30_ = row; -#line 210 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp31_ = stmt; + _tmp24_ = row; #line 210 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp32_ = sqlite3_column_int64 (_tmp31_, 5); + _tmp25_ = stmt; #line 210 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp30_->filesize = _tmp32_; + _tmp24_->filesize = sqlite3_column_int64 (_tmp25_, 5); #line 211 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp33_ = row; + _tmp26_ = row; #line 211 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp34_ = stmt; + _tmp27_ = stmt; #line 211 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp35_ = sqlite3_column_int64 (_tmp34_, 6); -#line 211 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp33_->timestamp = (time_t) _tmp35_; -#line 212 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp36_ = row; + _tmp26_->timestamp = (time_t) sqlite3_column_int64 (_tmp27_, 6); #line 212 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp37_ = stmt; + _tmp28_ = row; #line 212 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp38_ = sqlite3_column_int64 (_tmp37_, 7); + _tmp29_ = stmt; #line 212 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp36_->exposure_time = (time_t) _tmp38_; + _tmp28_->exposure_time = (time_t) sqlite3_column_int64 (_tmp29_, 7); #line 213 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp39_ = row; -#line 213 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp40_ = stmt; + _tmp30_ = row; #line 213 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp41_ = sqlite3_column_int64 (_tmp40_, 8); + _tmp31_ = stmt; #line 213 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp39_->import_id.id = _tmp41_; + _tmp30_->import_id.id = sqlite3_column_int64 (_tmp31_, 8); #line 214 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp42_ = row; -#line 214 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp43_ = stmt; + _tmp32_ = row; #line 214 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp44_ = sqlite3_column_int64 (_tmp43_, 9); + _tmp33_ = stmt; #line 214 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp42_->event_id.id = _tmp44_; + _tmp32_->event_id.id = sqlite3_column_int64 (_tmp33_, 9); #line 215 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp45_ = row; + _tmp34_ = row; #line 215 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp46_ = stmt; + _tmp35_ = stmt; #line 215 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp47_ = sqlite3_column_text (_tmp46_, 10); + _tmp36_ = sqlite3_column_text (_tmp35_, 10); #line 215 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp48_ = g_strdup (_tmp47_); + _tmp37_ = g_strdup (_tmp36_); #line 215 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp45_->md5); + _g_free0 (_tmp34_->md5); #line 215 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp45_->md5 = _tmp48_; -#line 216 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp49_ = row; + _tmp34_->md5 = _tmp37_; #line 216 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp50_ = stmt; + _tmp38_ = row; #line 216 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp51_ = sqlite3_column_int64 (_tmp50_, 11); + _tmp39_ = stmt; #line 216 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp49_->time_created = (time_t) _tmp51_; -#line 217 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp52_ = row; -#line 217 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp53_ = stmt; + _tmp38_->time_created = (time_t) sqlite3_column_int64 (_tmp39_, 11); #line 217 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp54_ = sqlite3_column_int (_tmp53_, 12); + _tmp40_ = row; #line 217 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp55_ = rating_unserialize (_tmp54_); + _tmp41_ = stmt; #line 217 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp52_->rating = _tmp55_; + _tmp40_->rating = rating_unserialize (sqlite3_column_int (_tmp41_, 12)); #line 218 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp56_ = row; + _tmp42_ = row; #line 218 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp57_ = stmt; + _tmp43_ = stmt; #line 218 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp58_ = sqlite3_column_text (_tmp57_, 13); + _tmp44_ = sqlite3_column_text (_tmp43_, 13); #line 218 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp59_ = g_strdup (_tmp58_); + _tmp45_ = g_strdup (_tmp44_); #line 218 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp56_->title); + _g_free0 (_tmp42_->title); #line 218 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp56_->title = _tmp59_; + _tmp42_->title = _tmp45_; #line 219 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp60_ = row; + _tmp46_ = row; #line 219 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp61_ = stmt; + _tmp47_ = stmt; #line 219 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp62_ = sqlite3_column_text (_tmp61_, 14); + _tmp48_ = sqlite3_column_text (_tmp47_, 14); #line 219 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp63_ = g_strdup (_tmp62_); + _tmp49_ = g_strdup (_tmp48_); #line 219 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp60_->backlinks); + _g_free0 (_tmp46_->backlinks); #line 219 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp60_->backlinks = _tmp63_; + _tmp46_->backlinks = _tmp49_; #line 220 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp64_ = row; + _tmp50_ = row; #line 220 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp65_ = stmt; + _tmp51_ = stmt; #line 220 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp66_ = sqlite3_column_int64 (_tmp65_, 15); -#line 220 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp64_->time_reimported = (time_t) _tmp66_; -#line 221 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp67_ = row; + _tmp50_->time_reimported = (time_t) sqlite3_column_int64 (_tmp51_, 15); #line 221 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp68_ = stmt; + _tmp52_ = row; #line 221 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp69_ = sqlite3_column_int64 (_tmp68_, 16); + _tmp53_ = stmt; #line 221 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp67_->flags = (guint64) _tmp69_; + _tmp52_->flags = (guint64) sqlite3_column_int64 (_tmp53_, 16); #line 222 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp70_ = row; + _tmp54_ = row; #line 222 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp71_ = stmt; + _tmp55_ = stmt; #line 222 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp72_ = sqlite3_column_text (_tmp71_, 17); + _tmp56_ = sqlite3_column_text (_tmp55_, 17); #line 222 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp73_ = g_strdup (_tmp72_); + _tmp57_ = g_strdup (_tmp56_); #line 222 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp70_->comment); + _g_free0 (_tmp54_->comment); #line 222 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp70_->comment = _tmp73_; + _tmp54_->comment = _tmp57_; #line 224 "/home/jens/Source/shotwell/src/db/VideoTable.vala" result = row; #line 224 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); #line 224 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 1627 "VideoTable.c" +#line 1617 "VideoTable.c" } -GeeArrayList* video_table_get_all (VideoTable* self) { +GeeArrayList* +video_table_get_all (VideoTable* self) +{ GeeArrayList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1665,278 +1657,230 @@ GeeArrayList* video_table_get_all (VideoTable* self) { all = _tmp4_; #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala" while (TRUE) { -#line 1663 "VideoTable.c" +#line 1655 "VideoTable.c" sqlite3_stmt* _tmp5_; gint _tmp6_; - gint _tmp7_; VideoRow* row = NULL; + VideoRow* _tmp7_; VideoRow* _tmp8_; - VideoRow* _tmp9_; - sqlite3_stmt* _tmp10_; - gint64 _tmp11_; - VideoRow* _tmp12_; - sqlite3_stmt* _tmp13_; - const gchar* _tmp14_; - gchar* _tmp15_; + sqlite3_stmt* _tmp9_; + VideoRow* _tmp10_; + sqlite3_stmt* _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; + VideoRow* _tmp14_; + sqlite3_stmt* _tmp15_; VideoRow* _tmp16_; sqlite3_stmt* _tmp17_; - gint _tmp18_; - VideoRow* _tmp19_; - sqlite3_stmt* _tmp20_; - gint _tmp21_; + VideoRow* _tmp18_; + sqlite3_stmt* _tmp19_; + VideoRow* _tmp20_; + sqlite3_stmt* _tmp21_; VideoRow* _tmp22_; sqlite3_stmt* _tmp23_; - gdouble _tmp24_; - VideoRow* _tmp25_; - sqlite3_stmt* _tmp26_; - gint _tmp27_; + VideoRow* _tmp24_; + sqlite3_stmt* _tmp25_; + VideoRow* _tmp26_; + sqlite3_stmt* _tmp27_; VideoRow* _tmp28_; sqlite3_stmt* _tmp29_; - gint64 _tmp30_; - VideoRow* _tmp31_; - sqlite3_stmt* _tmp32_; - gint64 _tmp33_; - VideoRow* _tmp34_; - sqlite3_stmt* _tmp35_; - gint64 _tmp36_; - VideoRow* _tmp37_; - sqlite3_stmt* _tmp38_; - gint64 _tmp39_; + VideoRow* _tmp30_; + sqlite3_stmt* _tmp31_; + VideoRow* _tmp32_; + sqlite3_stmt* _tmp33_; + const gchar* _tmp34_; + gchar* _tmp35_; + VideoRow* _tmp36_; + sqlite3_stmt* _tmp37_; + VideoRow* _tmp38_; + sqlite3_stmt* _tmp39_; VideoRow* _tmp40_; sqlite3_stmt* _tmp41_; - gint64 _tmp42_; - VideoRow* _tmp43_; - sqlite3_stmt* _tmp44_; - const gchar* _tmp45_; - gchar* _tmp46_; - VideoRow* _tmp47_; - sqlite3_stmt* _tmp48_; - gint64 _tmp49_; + const gchar* _tmp42_; + gchar* _tmp43_; + VideoRow* _tmp44_; + sqlite3_stmt* _tmp45_; + const gchar* _tmp46_; + gchar* _tmp47_; + VideoRow* _tmp48_; + sqlite3_stmt* _tmp49_; VideoRow* _tmp50_; sqlite3_stmt* _tmp51_; - gint _tmp52_; - Rating _tmp53_; - VideoRow* _tmp54_; - sqlite3_stmt* _tmp55_; - const gchar* _tmp56_; - gchar* _tmp57_; - VideoRow* _tmp58_; - sqlite3_stmt* _tmp59_; - const gchar* _tmp60_; - gchar* _tmp61_; - VideoRow* _tmp62_; - sqlite3_stmt* _tmp63_; - gint64 _tmp64_; - VideoRow* _tmp65_; - sqlite3_stmt* _tmp66_; - gint64 _tmp67_; - VideoRow* _tmp68_; - sqlite3_stmt* _tmp69_; - const gchar* _tmp70_; - gchar* _tmp71_; - GeeArrayList* _tmp72_; - VideoRow* _tmp73_; + VideoRow* _tmp52_; + sqlite3_stmt* _tmp53_; + const gchar* _tmp54_; + gchar* _tmp55_; + GeeArrayList* _tmp56_; + VideoRow* _tmp57_; #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp5_ = stmt; #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp6_ = sqlite3_step (_tmp5_); -#line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp6_; + res = sqlite3_step (_tmp5_); #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (!(_tmp7_ == SQLITE_ROW)) { + if (!(_tmp6_ == SQLITE_ROW)) { #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala" break; -#line 1746 "VideoTable.c" +#line 1720 "VideoTable.c" } #line 239 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = video_row_new (); + _tmp7_ = video_row_new (); #line 239 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - row = _tmp8_; -#line 240 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = row; + row = _tmp7_; #line 240 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = stmt; + _tmp8_ = row; #line 240 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = sqlite3_column_int64 (_tmp10_, 0); + _tmp9_ = stmt; #line 240 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_->video_id.id = _tmp11_; + _tmp8_->video_id.id = sqlite3_column_int64 (_tmp9_, 0); #line 241 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = row; + _tmp10_ = row; #line 241 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = stmt; + _tmp11_ = stmt; #line 241 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp14_ = sqlite3_column_text (_tmp13_, 1); + _tmp12_ = sqlite3_column_text (_tmp11_, 1); #line 241 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp15_ = g_strdup (_tmp14_); + _tmp13_ = g_strdup (_tmp12_); #line 241 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp12_->filepath); + _g_free0 (_tmp10_->filepath); #line 241 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_->filepath = _tmp15_; + _tmp10_->filepath = _tmp13_; #line 242 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp16_ = row; -#line 242 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp17_ = stmt; + _tmp14_ = row; #line 242 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp18_ = sqlite3_column_int (_tmp17_, 2); + _tmp15_ = stmt; #line 242 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp16_->width = _tmp18_; + _tmp14_->width = sqlite3_column_int (_tmp15_, 2); #line 243 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp19_ = row; -#line 243 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp20_ = stmt; + _tmp16_ = row; #line 243 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp21_ = sqlite3_column_int (_tmp20_, 3); + _tmp17_ = stmt; #line 243 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp19_->height = _tmp21_; + _tmp16_->height = sqlite3_column_int (_tmp17_, 3); #line 244 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp22_ = row; + _tmp18_ = row; #line 244 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp23_ = stmt; -#line 244 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp24_ = sqlite3_column_double (_tmp23_, 4); + _tmp19_ = stmt; #line 244 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp22_->clip_duration = _tmp24_; + _tmp18_->clip_duration = sqlite3_column_double (_tmp19_, 4); #line 245 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp25_ = row; + _tmp20_ = row; #line 245 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp26_ = stmt; + _tmp21_ = stmt; #line 245 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp27_ = sqlite3_column_int (_tmp26_, 5); -#line 245 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp25_->is_interpretable = _tmp27_ == 1; -#line 246 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp28_ = row; + _tmp20_->is_interpretable = sqlite3_column_int (_tmp21_, 5) == 1; #line 246 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp29_ = stmt; + _tmp22_ = row; #line 246 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp30_ = sqlite3_column_int64 (_tmp29_, 6); + _tmp23_ = stmt; #line 246 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp28_->filesize = _tmp30_; + _tmp22_->filesize = sqlite3_column_int64 (_tmp23_, 6); #line 247 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp31_ = row; + _tmp24_ = row; #line 247 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp32_ = stmt; + _tmp25_ = stmt; #line 247 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp33_ = sqlite3_column_int64 (_tmp32_, 7); -#line 247 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp31_->timestamp = (time_t) _tmp33_; -#line 248 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp34_ = row; + _tmp24_->timestamp = (time_t) sqlite3_column_int64 (_tmp25_, 7); #line 248 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp35_ = stmt; + _tmp26_ = row; #line 248 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp36_ = sqlite3_column_int64 (_tmp35_, 8); + _tmp27_ = stmt; #line 248 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp34_->exposure_time = (time_t) _tmp36_; -#line 249 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp37_ = row; + _tmp26_->exposure_time = (time_t) sqlite3_column_int64 (_tmp27_, 8); #line 249 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp38_ = stmt; + _tmp28_ = row; #line 249 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp39_ = sqlite3_column_int64 (_tmp38_, 9); + _tmp29_ = stmt; #line 249 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp37_->import_id.id = _tmp39_; + _tmp28_->import_id.id = sqlite3_column_int64 (_tmp29_, 9); #line 250 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp40_ = row; + _tmp30_ = row; #line 250 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp41_ = stmt; -#line 250 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp42_ = sqlite3_column_int64 (_tmp41_, 10); + _tmp31_ = stmt; #line 250 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp40_->event_id.id = _tmp42_; + _tmp30_->event_id.id = sqlite3_column_int64 (_tmp31_, 10); #line 251 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp43_ = row; + _tmp32_ = row; #line 251 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp44_ = stmt; + _tmp33_ = stmt; #line 251 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp45_ = sqlite3_column_text (_tmp44_, 11); + _tmp34_ = sqlite3_column_text (_tmp33_, 11); #line 251 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp46_ = g_strdup (_tmp45_); + _tmp35_ = g_strdup (_tmp34_); #line 251 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp43_->md5); + _g_free0 (_tmp32_->md5); #line 251 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp43_->md5 = _tmp46_; -#line 252 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp47_ = row; + _tmp32_->md5 = _tmp35_; #line 252 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp48_ = stmt; + _tmp36_ = row; #line 252 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp49_ = sqlite3_column_int64 (_tmp48_, 12); + _tmp37_ = stmt; #line 252 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp47_->time_created = (time_t) _tmp49_; -#line 253 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp50_ = row; -#line 253 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp51_ = stmt; + _tmp36_->time_created = (time_t) sqlite3_column_int64 (_tmp37_, 12); #line 253 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp52_ = sqlite3_column_int (_tmp51_, 13); + _tmp38_ = row; #line 253 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp53_ = rating_unserialize (_tmp52_); + _tmp39_ = stmt; #line 253 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp50_->rating = _tmp53_; + _tmp38_->rating = rating_unserialize (sqlite3_column_int (_tmp39_, 13)); #line 254 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp54_ = row; + _tmp40_ = row; #line 254 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp55_ = stmt; + _tmp41_ = stmt; #line 254 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp56_ = sqlite3_column_text (_tmp55_, 14); + _tmp42_ = sqlite3_column_text (_tmp41_, 14); #line 254 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp57_ = g_strdup (_tmp56_); + _tmp43_ = g_strdup (_tmp42_); #line 254 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp54_->title); + _g_free0 (_tmp40_->title); #line 254 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp54_->title = _tmp57_; + _tmp40_->title = _tmp43_; #line 255 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp58_ = row; + _tmp44_ = row; #line 255 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp59_ = stmt; + _tmp45_ = stmt; #line 255 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp60_ = sqlite3_column_text (_tmp59_, 15); + _tmp46_ = sqlite3_column_text (_tmp45_, 15); #line 255 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp61_ = g_strdup (_tmp60_); + _tmp47_ = g_strdup (_tmp46_); #line 255 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp58_->backlinks); + _g_free0 (_tmp44_->backlinks); #line 255 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp58_->backlinks = _tmp61_; -#line 256 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp62_ = row; + _tmp44_->backlinks = _tmp47_; #line 256 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp63_ = stmt; + _tmp48_ = row; #line 256 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp64_ = sqlite3_column_int64 (_tmp63_, 16); + _tmp49_ = stmt; #line 256 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp62_->time_reimported = (time_t) _tmp64_; + _tmp48_->time_reimported = (time_t) sqlite3_column_int64 (_tmp49_, 16); #line 257 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp65_ = row; -#line 257 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp66_ = stmt; + _tmp50_ = row; #line 257 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp67_ = sqlite3_column_int64 (_tmp66_, 17); + _tmp51_ = stmt; #line 257 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp65_->flags = (guint64) _tmp67_; + _tmp50_->flags = (guint64) sqlite3_column_int64 (_tmp51_, 17); #line 258 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp68_ = row; + _tmp52_ = row; #line 258 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp69_ = stmt; + _tmp53_ = stmt; #line 258 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp70_ = sqlite3_column_text (_tmp69_, 18); + _tmp54_ = sqlite3_column_text (_tmp53_, 18); #line 258 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp71_ = g_strdup (_tmp70_); + _tmp55_ = g_strdup (_tmp54_); #line 258 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp68_->comment); + _g_free0 (_tmp52_->comment); #line 258 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp68_->comment = _tmp71_; + _tmp52_->comment = _tmp55_; #line 260 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp72_ = all; + _tmp56_ = all; #line 260 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp73_ = row; + _tmp57_ = row; #line 260 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp73_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp57_); #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _video_row_unref0 (row); -#line 1934 "VideoTable.c" +#line 1878 "VideoTable.c" } #line 263 "/home/jens/Source/shotwell/src/db/VideoTable.vala" result = all; @@ -1944,14 +1888,18 @@ GeeArrayList* video_table_get_all (VideoTable* self) { _sqlite3_finalize0 (stmt); #line 263 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 1942 "VideoTable.c" +#line 1886 "VideoTable.c" } -void video_table_set_filepath (VideoTable* self, VideoID* video_id, const gchar* filepath, GError** error) { +void +video_table_set_filepath (VideoTable* self, + VideoID* video_id, + const gchar* filepath, + GError** error) +{ VideoID _tmp0_; gint64 _tmp1_; - const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 266 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -1964,9 +1912,7 @@ void video_table_set_filepath (VideoTable* self, VideoID* video_id, const gchar* #line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp1_ = _tmp0_.id; #line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = filepath; -#line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filename", _tmp2_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filename", filepath, &_inner_error_); #line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -1975,7 +1921,7 @@ void video_table_set_filepath (VideoTable* self, VideoID* video_id, const gchar* g_propagate_error (error, _inner_error_); #line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 1973 "VideoTable.c" +#line 1919 "VideoTable.c" } else { #line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1983,44 +1929,42 @@ void video_table_set_filepath (VideoTable* self, VideoID* video_id, const gchar* g_clear_error (&_inner_error_); #line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 1981 "VideoTable.c" +#line 1927 "VideoTable.c" } } } -void video_table_set_title (VideoTable* self, VideoID* video_id, const gchar* new_title, GError** error) { +void +video_table_set_title (VideoTable* self, + VideoID* video_id, + const gchar* new_title, + GError** error) +{ const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - VideoID _tmp3_; - gint64 _tmp4_; + VideoID _tmp1_; + gint64 _tmp2_; GError * _inner_error_ = NULL; #line 270 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); #line 270 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (video_id != NULL); #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp1_ = new_title; -#line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp1_ != NULL) { -#line 2001 "VideoTable.c" - const gchar* _tmp2_; -#line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = new_title; + if (new_title != NULL) { #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp0_ = _tmp2_; -#line 2007 "VideoTable.c" + _tmp0_ = new_title; +#line 1951 "VideoTable.c" } else { #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp0_ = ""; -#line 2011 "VideoTable.c" +#line 1955 "VideoTable.c" } #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp3_ = *video_id; + _tmp1_ = *video_id; #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp4_ = _tmp3_.id; + _tmp2_ = _tmp1_.id; #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "title", _tmp0_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "title", _tmp0_, &_inner_error_); #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2029,7 +1973,7 @@ void video_table_set_title (VideoTable* self, VideoID* video_id, const gchar* ne g_propagate_error (error, _inner_error_); #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2027 "VideoTable.c" +#line 1971 "VideoTable.c" } else { #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2037,44 +1981,42 @@ void video_table_set_title (VideoTable* self, VideoID* video_id, const gchar* ne g_clear_error (&_inner_error_); #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2035 "VideoTable.c" +#line 1979 "VideoTable.c" } } } -void video_table_set_comment (VideoTable* self, VideoID* video_id, const gchar* new_comment, GError** error) { +void +video_table_set_comment (VideoTable* self, + VideoID* video_id, + const gchar* new_comment, + GError** error) +{ const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - VideoID _tmp3_; - gint64 _tmp4_; + VideoID _tmp1_; + gint64 _tmp2_; GError * _inner_error_ = NULL; #line 274 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); #line 274 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (video_id != NULL); #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp1_ = new_comment; + if (new_comment != NULL) { #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp1_ != NULL) { -#line 2055 "VideoTable.c" - const gchar* _tmp2_; -#line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = new_comment; -#line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp0_ = _tmp2_; -#line 2061 "VideoTable.c" + _tmp0_ = new_comment; +#line 2003 "VideoTable.c" } else { #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp0_ = ""; -#line 2065 "VideoTable.c" +#line 2007 "VideoTable.c" } #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp3_ = *video_id; + _tmp1_ = *video_id; #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp4_ = _tmp3_.id; + _tmp2_ = _tmp1_.id; #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "comment", _tmp0_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "comment", _tmp0_, &_inner_error_); #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2083,7 +2025,7 @@ void video_table_set_comment (VideoTable* self, VideoID* video_id, const gchar* g_propagate_error (error, _inner_error_); #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2081 "VideoTable.c" +#line 2023 "VideoTable.c" } else { #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2091,16 +2033,20 @@ void video_table_set_comment (VideoTable* self, VideoID* video_id, const gchar* g_clear_error (&_inner_error_); #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2089 "VideoTable.c" +#line 2031 "VideoTable.c" } } } -void video_table_set_exposure_time (VideoTable* self, VideoID* video_id, time_t time, GError** error) { +void +video_table_set_exposure_time (VideoTable* self, + VideoID* video_id, + time_t time, + GError** error) +{ VideoID _tmp0_; gint64 _tmp1_; - time_t _tmp2_; GError * _inner_error_ = NULL; #line 278 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -2111,9 +2057,7 @@ void video_table_set_exposure_time (VideoTable* self, VideoID* video_id, time_t #line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp1_ = _tmp0_.id; #line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = time; -#line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "exposure_time", (gint64) _tmp2_, &_inner_error_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "exposure_time", (gint64) time, &_inner_error_); #line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2122,7 +2066,7 @@ void video_table_set_exposure_time (VideoTable* self, VideoID* video_id, time_t g_propagate_error (error, _inner_error_); #line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2120 "VideoTable.c" +#line 2064 "VideoTable.c" } else { #line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2130,17 +2074,20 @@ void video_table_set_exposure_time (VideoTable* self, VideoID* video_id, time_t g_clear_error (&_inner_error_); #line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2128 "VideoTable.c" +#line 2072 "VideoTable.c" } } } -void video_table_set_rating (VideoTable* self, VideoID* video_id, Rating rating, GError** error) { +void +video_table_set_rating (VideoTable* self, + VideoID* video_id, + Rating rating, + GError** error) +{ VideoID _tmp0_; gint64 _tmp1_; - Rating _tmp2_; - gint _tmp3_; GError * _inner_error_ = NULL; #line 282 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -2151,11 +2098,7 @@ void video_table_set_rating (VideoTable* self, VideoID* video_id, Rating rating, #line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp1_ = _tmp0_.id; #line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = rating; -#line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp3_ = rating_serialize (_tmp2_); -#line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "rating", (gint64) _tmp3_, &_inner_error_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "rating", (gint64) rating_serialize (rating), &_inner_error_); #line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2164,7 +2107,7 @@ void video_table_set_rating (VideoTable* self, VideoID* video_id, Rating rating, g_propagate_error (error, _inner_error_); #line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2162 "VideoTable.c" +#line 2105 "VideoTable.c" } else { #line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2172,16 +2115,20 @@ void video_table_set_rating (VideoTable* self, VideoID* video_id, Rating rating, g_clear_error (&_inner_error_); #line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2170 "VideoTable.c" +#line 2113 "VideoTable.c" } } } -void video_table_set_flags (VideoTable* self, VideoID* video_id, guint64 flags, GError** error) { +void +video_table_set_flags (VideoTable* self, + VideoID* video_id, + guint64 flags, + GError** error) +{ VideoID _tmp0_; gint64 _tmp1_; - guint64 _tmp2_; GError * _inner_error_ = NULL; #line 286 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -2192,9 +2139,7 @@ void video_table_set_flags (VideoTable* self, VideoID* video_id, guint64 flags, #line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp1_ = _tmp0_.id; #line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = flags; -#line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "flags", (gint64) _tmp2_, &_inner_error_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "flags", (gint64) flags, &_inner_error_); #line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2203,7 +2148,7 @@ void video_table_set_flags (VideoTable* self, VideoID* video_id, guint64 flags, g_propagate_error (error, _inner_error_); #line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2201 "VideoTable.c" +#line 2146 "VideoTable.c" } else { #line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2211,44 +2156,42 @@ void video_table_set_flags (VideoTable* self, VideoID* video_id, guint64 flags, g_clear_error (&_inner_error_); #line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2209 "VideoTable.c" +#line 2154 "VideoTable.c" } } } -void video_table_update_backlinks (VideoTable* self, VideoID* video_id, const gchar* backlinks, GError** error) { +void +video_table_update_backlinks (VideoTable* self, + VideoID* video_id, + const gchar* backlinks, + GError** error) +{ const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - VideoID _tmp3_; - gint64 _tmp4_; + VideoID _tmp1_; + gint64 _tmp2_; GError * _inner_error_ = NULL; #line 290 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); #line 290 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (video_id != NULL); #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp1_ = backlinks; -#line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp1_ != NULL) { -#line 2229 "VideoTable.c" - const gchar* _tmp2_; -#line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = backlinks; + if (backlinks != NULL) { #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp0_ = _tmp2_; -#line 2235 "VideoTable.c" + _tmp0_ = backlinks; +#line 2178 "VideoTable.c" } else { #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp0_ = ""; -#line 2239 "VideoTable.c" +#line 2182 "VideoTable.c" } #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp3_ = *video_id; + _tmp1_ = *video_id; #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp4_ = _tmp3_.id; + _tmp2_ = _tmp1_.id; #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "backlinks", _tmp0_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "backlinks", _tmp0_, &_inner_error_); #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2257,7 +2200,7 @@ void video_table_update_backlinks (VideoTable* self, VideoID* video_id, const gc g_propagate_error (error, _inner_error_); #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2255 "VideoTable.c" +#line 2198 "VideoTable.c" } else { #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2265,40 +2208,42 @@ void video_table_update_backlinks (VideoTable* self, VideoID* video_id, const gc g_clear_error (&_inner_error_); #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2263 "VideoTable.c" +#line 2206 "VideoTable.c" } } } -void video_table_update_is_interpretable (VideoTable* self, VideoID* video_id, gboolean is_interpretable, GError** error) { +void +video_table_update_is_interpretable (VideoTable* self, + VideoID* video_id, + gboolean is_interpretable, + GError** error) +{ gint _tmp0_ = 0; - gboolean _tmp1_; - VideoID _tmp2_; - gint64 _tmp3_; + VideoID _tmp1_; + gint64 _tmp2_; GError * _inner_error_ = NULL; #line 294 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); #line 294 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (video_id != NULL); #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp1_ = is_interpretable; -#line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp1_) { + if (is_interpretable) { #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp0_ = 1; -#line 2285 "VideoTable.c" +#line 2230 "VideoTable.c" } else { #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp0_ = 0; -#line 2289 "VideoTable.c" +#line 2234 "VideoTable.c" } #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = *video_id; + _tmp1_ = *video_id; #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp3_ = _tmp2_.id; + _tmp2_ = _tmp1_.id; #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_update_int_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp3_, "is_interpretable", _tmp0_, &_inner_error_); + database_table_update_int_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "is_interpretable", _tmp0_, &_inner_error_); #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2307,7 +2252,7 @@ void video_table_update_is_interpretable (VideoTable* self, VideoID* video_id, g g_propagate_error (error, _inner_error_); #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2305 "VideoTable.c" +#line 2250 "VideoTable.c" } else { #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2315,19 +2260,22 @@ void video_table_update_is_interpretable (VideoTable* self, VideoID* video_id, g g_clear_error (&_inner_error_); #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2313 "VideoTable.c" +#line 2258 "VideoTable.c" } } } -gboolean video_table_set_event (VideoTable* self, VideoID* video_id, EventID* event_id) { +gboolean +video_table_set_event (VideoTable* self, + VideoID* video_id, + EventID* event_id) +{ gboolean result = FALSE; VideoID _tmp0_; gint64 _tmp1_; EventID _tmp2_; gint64 _tmp3_; - gboolean _tmp4_; #line 298 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE); #line 298 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2343,16 +2291,18 @@ gboolean video_table_set_event (VideoTable* self, VideoID* video_id, EventID* ev #line 299 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp3_ = _tmp2_.id; #line 299 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp4_ = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "event_id", _tmp3_); -#line 299 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - result = _tmp4_; + result = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "event_id", _tmp3_); #line 299 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 2346 "VideoTable.c" +#line 2292 "VideoTable.c" } -void video_table_remove_by_file (VideoTable* self, GFile* file, GError** error) { +void +video_table_remove_by_file (VideoTable* self, + GFile* file, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -2360,14 +2310,11 @@ void video_table_remove_by_file (VideoTable* self, GFile* file, GError** error) gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - GFile* _tmp5_; - gchar* _tmp6_; - GDestroyNotify _tmp7_; - gint _tmp8_; + gchar* _tmp5_; + GDestroyNotify _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; gint _tmp9_; - sqlite3_stmt* _tmp10_; - gint _tmp11_; - gint _tmp12_; GError * _inner_error_ = NULL; #line 302 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -2390,35 +2337,29 @@ void video_table_remove_by_file (VideoTable* self, GFile* file, GError** error) #line 307 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp4_ = stmt; #line 307 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp5_ = file; -#line 307 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp6_ = g_file_get_path (_tmp5_); + _tmp5_ = g_file_get_path (file); #line 307 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = g_free; -#line 307 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); + _tmp6_ = g_free; #line 307 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp8_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_); #line 308 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = res; + _tmp7_ = res; #line 308 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); -#line 310 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 310 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = sqlite3_step (_tmp10_); + _tmp8_ = stmt; #line 310 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp11_; + res = sqlite3_step (_tmp8_); #line 311 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = res; + _tmp9_ = res; #line 311 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp12_ != SQLITE_DONE) { -#line 2411 "VideoTable.c" - gint _tmp13_; + if (_tmp9_ != SQLITE_DONE) { +#line 2352 "VideoTable.c" + gint _tmp10_; #line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = res; + _tmp10_ = res; #line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_throw_error ("VideoTable.remove_by_file", _tmp13_, &_inner_error_); + database_table_throw_error ("VideoTable.remove_by_file", _tmp10_, &_inner_error_); #line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2429,7 +2370,7 @@ void video_table_remove_by_file (VideoTable* self, GFile* file, GError** error) _sqlite3_finalize0 (stmt); #line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2427 "VideoTable.c" +#line 2368 "VideoTable.c" } else { #line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); @@ -2439,17 +2380,21 @@ void video_table_remove_by_file (VideoTable* self, GFile* file, GError** error) g_clear_error (&_inner_error_); #line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2437 "VideoTable.c" +#line 2378 "VideoTable.c" } } } #line 302 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); -#line 2443 "VideoTable.c" +#line 2384 "VideoTable.c" } -void video_table_remove (VideoTable* self, VideoID* videoID, GError** error) { +void +video_table_remove (VideoTable* self, + VideoID* videoID, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -2460,10 +2405,8 @@ void video_table_remove (VideoTable* self, VideoID* videoID, GError** error) { VideoID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; - gint _tmp11_; + sqlite3_stmt* _tmp8_; + gint _tmp9_; GError * _inner_error_ = NULL; #line 315 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -2490,29 +2433,25 @@ void video_table_remove (VideoTable* self, VideoID* videoID, GError** error) { #line 320 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp6_ = _tmp5_.id; #line 320 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 320 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 321 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 321 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 323 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 323 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 323 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp10_; + res = sqlite3_step (_tmp8_); #line 324 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 324 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp11_ != SQLITE_DONE) { -#line 2505 "VideoTable.c" - gint _tmp12_; + if (_tmp9_ != SQLITE_DONE) { +#line 2444 "VideoTable.c" + gint _tmp10_; #line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_throw_error ("VideoTable.remove", _tmp12_, &_inner_error_); + database_table_throw_error ("VideoTable.remove", _tmp10_, &_inner_error_); #line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2523,7 +2462,7 @@ void video_table_remove (VideoTable* self, VideoID* videoID, GError** error) { _sqlite3_finalize0 (stmt); #line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2521 "VideoTable.c" +#line 2460 "VideoTable.c" } else { #line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); @@ -2533,40 +2472,41 @@ void video_table_remove (VideoTable* self, VideoID* videoID, GError** error) { g_clear_error (&_inner_error_); #line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2531 "VideoTable.c" +#line 2470 "VideoTable.c" } } } #line 315 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); -#line 2537 "VideoTable.c" +#line 2476 "VideoTable.c" } -gboolean video_table_is_video_stored (VideoTable* self, GFile* file) { +gboolean +video_table_is_video_stored (VideoTable* self, + GFile* file) +{ gboolean result = FALSE; - GFile* _tmp0_; - VideoID _tmp1_ = {0}; - gboolean _tmp2_; + VideoID _tmp0_ = {0}; #line 328 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE); #line 328 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 329 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp0_ = file; -#line 329 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - video_table_get_id (self, _tmp0_, &_tmp1_); + video_table_get_id (self, file, &_tmp0_); #line 329 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = video_id_is_valid (&_tmp1_); -#line 329 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - result = _tmp2_; + result = video_id_is_valid (&_tmp0_); #line 329 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 2560 "VideoTable.c" +#line 2496 "VideoTable.c" } -void video_table_get_id (VideoTable* self, GFile* file, VideoID* result) { +void +video_table_get_id (VideoTable* self, + GFile* file, + VideoID* result) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -2574,15 +2514,12 @@ void video_table_get_id (VideoTable* self, GFile* file, VideoID* result) { gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - GFile* _tmp5_; - gchar* _tmp6_; - GDestroyNotify _tmp7_; - gint _tmp8_; - gint _tmp9_; - sqlite3_stmt* _tmp10_; - gint _tmp11_; - VideoID _tmp12_ = {0}; - gint _tmp13_; + gchar* _tmp5_; + GDestroyNotify _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; + VideoID _tmp9_ = {0}; + gint _tmp10_; #line 332 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); #line 332 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2604,55 +2541,49 @@ void video_table_get_id (VideoTable* self, GFile* file, VideoID* result) { #line 337 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp4_ = stmt; #line 337 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp5_ = file; -#line 337 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp6_ = g_file_get_path (_tmp5_); -#line 337 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = g_free; + _tmp5_ = g_file_get_path (file); #line 337 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); + _tmp6_ = g_free; #line 337 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp8_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_); #line 338 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = res; + _tmp7_ = res; #line 338 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 340 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = stmt; -#line 340 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = sqlite3_step (_tmp10_); + _tmp8_ = stmt; #line 340 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp11_; + res = sqlite3_step (_tmp8_); #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = res; + _tmp10_ = res; #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp13_ == SQLITE_ROW) { -#line 2625 "VideoTable.c" - sqlite3_stmt* _tmp14_; - gint64 _tmp15_; -#line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp14_ = stmt; + if (_tmp10_ == SQLITE_ROW) { +#line 2556 "VideoTable.c" + sqlite3_stmt* _tmp11_; #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp15_ = sqlite3_column_int64 (_tmp14_, 0); + _tmp11_ = stmt; #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - video_id_init (&_tmp12_, _tmp15_); -#line 2634 "VideoTable.c" + video_id_init (&_tmp9_, sqlite3_column_int64 (_tmp11_, 0)); +#line 2562 "VideoTable.c" } else { #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - video_id_init (&_tmp12_, VIDEO_ID_INVALID); -#line 2638 "VideoTable.c" + video_id_init (&_tmp9_, VIDEO_ID_INVALID); +#line 2566 "VideoTable.c" } #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - *result = _tmp12_; + *result = _tmp9_; #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2646 "VideoTable.c" +#line 2574 "VideoTable.c" } -GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) { +GeeArrayList* +video_table_get_videos (VideoTable* self, + GError** error) +{ GeeArrayList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -2683,52 +2614,48 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) { _tmp4_ = gee_array_list_new (TYPE_VIDEO_ID, (GBoxedCopyFunc) video_id_dup, (GDestroyNotify) video_id_free, NULL, NULL, NULL); #line 350 "/home/jens/Source/shotwell/src/db/VideoTable.vala" video_ids = _tmp4_; -#line 2681 "VideoTable.c" +#line 2612 "VideoTable.c" { gboolean _tmp5_ = FALSE; #line 351 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp5_ = TRUE; #line 351 "/home/jens/Source/shotwell/src/db/VideoTable.vala" while (TRUE) { -#line 2688 "VideoTable.c" +#line 2619 "VideoTable.c" sqlite3_stmt* _tmp6_; gint _tmp7_; - gint _tmp8_; - GeeArrayList* _tmp11_; - sqlite3_stmt* _tmp12_; - gint64 _tmp13_; - VideoID _tmp14_ = {0}; + GeeArrayList* _tmp10_; + sqlite3_stmt* _tmp11_; + VideoID _tmp12_ = {0}; #line 351 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (!_tmp5_) { -#line 2698 "VideoTable.c" +#line 2627 "VideoTable.c" } #line 351 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp5_ = FALSE; #line 352 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp6_ = stmt; #line 352 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = sqlite3_step (_tmp6_); -#line 352 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp7_; + res = sqlite3_step (_tmp6_); #line 353 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 353 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp8_ == SQLITE_DONE) { + if (_tmp7_ == SQLITE_DONE) { #line 354 "/home/jens/Source/shotwell/src/db/VideoTable.vala" break; -#line 2714 "VideoTable.c" +#line 2641 "VideoTable.c" } else { - gint _tmp9_; + gint _tmp8_; #line 355 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = res; + _tmp8_ = res; #line 355 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp9_ != SQLITE_ROW) { -#line 2721 "VideoTable.c" - gint _tmp10_; + if (_tmp8_ != SQLITE_ROW) { +#line 2648 "VideoTable.c" + gint _tmp9_; #line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = res; + _tmp9_ = res; #line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_throw_error ("VideoTable.get_videos", _tmp10_, &_inner_error_); + database_table_throw_error ("VideoTable.get_videos", _tmp9_, &_inner_error_); #line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2741,7 +2668,7 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) { _sqlite3_finalize0 (stmt); #line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return NULL; -#line 2739 "VideoTable.c" +#line 2666 "VideoTable.c" } else { #line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _g_object_unref0 (video_ids); @@ -2753,22 +2680,20 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) { g_clear_error (&_inner_error_); #line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return NULL; -#line 2751 "VideoTable.c" +#line 2678 "VideoTable.c" } } } } #line 359 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = video_ids; -#line 359 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = stmt; + _tmp10_ = video_ids; #line 359 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = sqlite3_column_int64 (_tmp12_, 0); + _tmp11_ = stmt; #line 359 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - video_id_init (&_tmp14_, _tmp13_); + video_id_init (&_tmp12_, sqlite3_column_int64 (_tmp11_, 0)); #line 359 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp14_); -#line 2766 "VideoTable.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp12_); +#line 2691 "VideoTable.c" } } #line 362 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2777,195 +2702,169 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) { _sqlite3_finalize0 (stmt); #line 362 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 2775 "VideoTable.c" +#line 2700 "VideoTable.c" } -static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* file, const gchar* md5) { +static sqlite3_stmt* +video_table_get_duplicate_stmt (VideoTable* self, + GFile* file, + const gchar* md5) +{ sqlite3_stmt* result = NULL; gboolean _tmp0_ = FALSE; - GFile* _tmp1_; gchar* sql = NULL; - gchar* _tmp3_; + gchar* _tmp1_; gboolean first = FALSE; - GFile* _tmp4_; - const gchar* _tmp7_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp13_; - const gchar* _tmp14_; - sqlite3_stmt* _tmp15_ = NULL; - gint _tmp16_; - gint _tmp17_; + sqlite3* _tmp9_; + const gchar* _tmp10_; + sqlite3_stmt* _tmp11_ = NULL; + gint _tmp12_; + gint _tmp13_; gint col = 0; - GFile* _tmp18_; - const gchar* _tmp26_; #line 365 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL); #line 365 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL); #line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp1_ = file; -#line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp1_ != NULL) { + if (file != NULL) { #line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp0_ = TRUE; -#line 2808 "VideoTable.c" +#line 2730 "VideoTable.c" } else { - const gchar* _tmp2_; -#line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = md5; #line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp0_ = _tmp2_ != NULL; -#line 2815 "VideoTable.c" + _tmp0_ = md5 != NULL; +#line 2734 "VideoTable.c" } #line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _vala_assert (_tmp0_, "file != null || md5 != null"); #line 368 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp3_ = g_strdup ("SELECT id FROM VideoTable WHERE"); + _tmp1_ = g_strdup ("SELECT id FROM VideoTable WHERE"); #line 368 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - sql = _tmp3_; + sql = _tmp1_; #line 369 "/home/jens/Source/shotwell/src/db/VideoTable.vala" first = TRUE; #line 371 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp4_ = file; -#line 371 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp4_ != NULL) { -#line 2829 "VideoTable.c" - const gchar* _tmp5_; - gchar* _tmp6_; + if (file != NULL) { +#line 2746 "VideoTable.c" + const gchar* _tmp2_; + gchar* _tmp3_; #line 372 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp5_ = sql; + _tmp2_ = sql; #line 372 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp6_ = g_strconcat (_tmp5_, " filename=?", NULL); + _tmp3_ = g_strconcat (_tmp2_, " filename=?", NULL); #line 372 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _g_free0 (sql); #line 372 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - sql = _tmp6_; + sql = _tmp3_; #line 373 "/home/jens/Source/shotwell/src/db/VideoTable.vala" first = FALSE; -#line 2842 "VideoTable.c" +#line 2759 "VideoTable.c" } #line 376 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = md5; -#line 376 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp7_ != NULL) { -#line 2848 "VideoTable.c" - gboolean _tmp8_; - const gchar* _tmp11_; - gchar* _tmp12_; + if (md5 != NULL) { +#line 2763 "VideoTable.c" + gboolean _tmp4_; + const gchar* _tmp7_; + gchar* _tmp8_; #line 377 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = first; + _tmp4_ = first; #line 377 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (!_tmp8_) { -#line 2856 "VideoTable.c" - const gchar* _tmp9_; - gchar* _tmp10_; + if (!_tmp4_) { +#line 2771 "VideoTable.c" + const gchar* _tmp5_; + gchar* _tmp6_; #line 378 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = sql; + _tmp5_ = sql; #line 378 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = g_strconcat (_tmp9_, " OR ", NULL); + _tmp6_ = g_strconcat (_tmp5_, " OR ", NULL); #line 378 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _g_free0 (sql); #line 378 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - sql = _tmp10_; -#line 2867 "VideoTable.c" + sql = _tmp6_; +#line 2782 "VideoTable.c" } #line 380 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = sql; + _tmp7_ = sql; #line 380 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = g_strconcat (_tmp11_, " md5=?", NULL); + _tmp8_ = g_strconcat (_tmp7_, " md5=?", NULL); #line 380 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _g_free0 (sql); #line 380 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - sql = _tmp12_; -#line 2877 "VideoTable.c" + sql = _tmp8_; +#line 2792 "VideoTable.c" } #line 384 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = database_table_db; + _tmp9_ = database_table_db; #line 384 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp14_ = sql; + _tmp10_ = sql; #line 384 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp16_ = sqlite3_prepare_v2 (_tmp13_, _tmp14_, -1, &_tmp15_, NULL); + _tmp12_ = sqlite3_prepare_v2 (_tmp9_, _tmp10_, -1, &_tmp11_, NULL); #line 384 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); #line 384 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - stmt = _tmp15_; + stmt = _tmp11_; #line 384 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp16_; + res = _tmp12_; #line 385 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp17_ = res; + _tmp13_ = res; #line 385 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); #line 387 "/home/jens/Source/shotwell/src/db/VideoTable.vala" col = 1; #line 389 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp18_ = file; -#line 389 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp18_ != NULL) { -#line 2901 "VideoTable.c" - sqlite3_stmt* _tmp19_; - gint _tmp20_; - GFile* _tmp21_; - gchar* _tmp22_; - GDestroyNotify _tmp23_; - gint _tmp24_; - gint _tmp25_; -#line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp19_ = stmt; -#line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp20_ = col; + if (file != NULL) { +#line 2814 "VideoTable.c" + sqlite3_stmt* _tmp14_; + gint _tmp15_; + gchar* _tmp16_; + GDestroyNotify _tmp17_; + gint _tmp18_; #line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - col = _tmp20_ + 1; + _tmp14_ = stmt; #line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp21_ = file; + _tmp15_ = col; #line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp22_ = g_file_get_path (_tmp21_); + col = _tmp15_ + 1; #line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp23_ = g_free; + _tmp16_ = g_file_get_path (file); #line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp24_ = sqlite3_bind_text (_tmp19_, _tmp20_, _tmp22_, -1, _tmp23_); + _tmp17_ = g_free; #line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp24_; + res = sqlite3_bind_text (_tmp14_, _tmp15_, _tmp16_, -1, _tmp17_); #line 391 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp25_ = res; + _tmp18_ = res; #line 391 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK"); -#line 2929 "VideoTable.c" + _vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK"); +#line 2836 "VideoTable.c" } #line 394 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp26_ = md5; -#line 394 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp26_ != NULL) { -#line 2935 "VideoTable.c" - sqlite3_stmt* _tmp27_; - gint _tmp28_; - const gchar* _tmp29_; - gchar* _tmp30_; - GDestroyNotify _tmp31_; - gint _tmp32_; - gint _tmp33_; -#line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp27_ = stmt; -#line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp28_ = col; + if (md5 != NULL) { +#line 2840 "VideoTable.c" + sqlite3_stmt* _tmp19_; + gint _tmp20_; + gchar* _tmp21_; + GDestroyNotify _tmp22_; + gint _tmp23_; #line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - col = _tmp28_ + 1; + _tmp19_ = stmt; #line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp29_ = md5; + _tmp20_ = col; #line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp30_ = g_strdup (_tmp29_); + col = _tmp20_ + 1; #line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp31_ = g_free; + _tmp21_ = g_strdup (md5); #line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp32_ = sqlite3_bind_text (_tmp27_, _tmp28_, _tmp30_, -1, _tmp31_); + _tmp22_ = g_free; #line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp32_; + res = sqlite3_bind_text (_tmp19_, _tmp20_, _tmp21_, -1, _tmp22_); #line 396 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp33_ = res; + _tmp23_ = res; #line 396 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp33_ == SQLITE_OK, "res == Sqlite.OK"); -#line 2963 "VideoTable.c" + _vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK"); +#line 2862 "VideoTable.c" } #line 399 "/home/jens/Source/shotwell/src/db/VideoTable.vala" result = stmt; @@ -2973,69 +2872,64 @@ static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* fi _g_free0 (sql); #line 399 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 2971 "VideoTable.c" +#line 2870 "VideoTable.c" } -gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar* md5) { +gboolean +video_table_has_duplicate (VideoTable* self, + GFile* file, + const gchar* md5) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; - GFile* _tmp0_; - const gchar* _tmp1_; - sqlite3_stmt* _tmp2_; + sqlite3_stmt* _tmp0_; gint res = 0; - sqlite3_stmt* _tmp3_; - gint _tmp4_; - gint _tmp5_; + sqlite3_stmt* _tmp1_; + gint _tmp2_; #line 402 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE); #line 402 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE); #line 403 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp0_ = file; -#line 403 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp1_ = md5; + _tmp0_ = video_table_get_duplicate_stmt (self, file, md5); #line 403 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = video_table_get_duplicate_stmt (self, _tmp0_, _tmp1_); -#line 403 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - stmt = _tmp2_; -#line 404 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp3_ = stmt; + stmt = _tmp0_; #line 404 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp4_ = sqlite3_step (_tmp3_); + _tmp1_ = stmt; #line 404 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp4_; + res = sqlite3_step (_tmp1_); #line 406 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp5_ = res; + _tmp2_ = res; #line 406 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp5_ == SQLITE_DONE) { + if (_tmp2_ == SQLITE_DONE) { #line 408 "/home/jens/Source/shotwell/src/db/VideoTable.vala" result = FALSE; #line 408 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); #line 408 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 3013 "VideoTable.c" +#line 2907 "VideoTable.c" } else { - gint _tmp6_; + gint _tmp3_; #line 409 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp6_ = res; + _tmp3_ = res; #line 409 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp6_ == SQLITE_ROW) { + if (_tmp3_ == SQLITE_ROW) { #line 411 "/home/jens/Source/shotwell/src/db/VideoTable.vala" result = TRUE; #line 411 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); #line 411 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 3026 "VideoTable.c" +#line 2920 "VideoTable.c" } else { - gint _tmp7_; + gint _tmp4_; #line 413 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = res; + _tmp4_ = res; #line 413 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_fatal ("VideoTable.has_duplicate", _tmp7_); -#line 3033 "VideoTable.c" + database_table_fatal ("VideoTable.has_duplicate", _tmp4_); +#line 2927 "VideoTable.c" } } #line 416 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -3044,126 +2938,124 @@ gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar* _sqlite3_finalize0 (stmt); #line 416 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 3042 "VideoTable.c" +#line 2936 "VideoTable.c" } -static void _vala_array_add3 (VideoID* * array, int* length, int* size, const VideoID* value) { +static void +_vala_array_add3 (VideoID* * array, + int* length, + int* size, + const VideoID* value) +{ #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if ((*length) == (*size)) { #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" *size = (*size) ? (2 * (*size)) : 4; #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" *array = g_renew (VideoID, *array, *size); -#line 3053 "VideoTable.c" +#line 2952 "VideoTable.c" } #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" (*array)[(*length)++] = *value; -#line 3057 "VideoTable.c" +#line 2956 "VideoTable.c" } -VideoID* video_table_get_duplicate_ids (VideoTable* self, GFile* file, const gchar* md5, int* result_length1) { +VideoID* +video_table_get_duplicate_ids (VideoTable* self, + GFile* file, + const gchar* md5, + int* result_length1) +{ VideoID* result = NULL; sqlite3_stmt* stmt = NULL; - GFile* _tmp0_; - const gchar* _tmp1_; - sqlite3_stmt* _tmp2_; + sqlite3_stmt* _tmp0_; VideoID* ids = NULL; - VideoID* _tmp3_; + VideoID* _tmp1_; gint ids_length1; gint _ids_size_; gint res = 0; - sqlite3_stmt* _tmp4_; - gint _tmp5_; - VideoID* _tmp13_; - gint _tmp13__length1; + sqlite3_stmt* _tmp2_; + VideoID* _tmp8_; + gint _tmp8__length1; #line 419 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL); #line 419 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL); #line 420 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp0_ = file; -#line 420 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp1_ = md5; -#line 420 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = video_table_get_duplicate_stmt (self, _tmp0_, _tmp1_); + _tmp0_ = video_table_get_duplicate_stmt (self, file, md5); #line 420 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - stmt = _tmp2_; + stmt = _tmp0_; #line 422 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp3_ = g_new0 (VideoID, 0); + _tmp1_ = g_new0 (VideoID, 0); #line 422 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - ids = _tmp3_; + ids = _tmp1_; #line 422 "/home/jens/Source/shotwell/src/db/VideoTable.vala" ids_length1 = 0; #line 422 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _ids_size_ = ids_length1; #line 424 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp4_ = stmt; -#line 424 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); + _tmp2_ = stmt; #line 424 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp2_); #line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala" while (TRUE) { -#line 3104 "VideoTable.c" - gint _tmp6_; - VideoID* _tmp7_; - gint _tmp7__length1; - sqlite3_stmt* _tmp8_; - gint64 _tmp9_; - VideoID _tmp10_ = {0}; - sqlite3_stmt* _tmp11_; - gint _tmp12_; +#line 2999 "VideoTable.c" + gint _tmp3_; + VideoID* _tmp4_; + gint _tmp4__length1; + sqlite3_stmt* _tmp5_; + VideoID _tmp6_ = {0}; + sqlite3_stmt* _tmp7_; #line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp6_ = res; + _tmp3_ = res; #line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (!(_tmp6_ == SQLITE_ROW)) { + if (!(_tmp3_ == SQLITE_ROW)) { #line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala" break; -#line 3119 "VideoTable.c" +#line 3012 "VideoTable.c" } #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = ids; -#line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7__length1 = ids_length1; + _tmp4_ = ids; #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = stmt; + _tmp4__length1 = ids_length1; #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = sqlite3_column_int64 (_tmp8_, 0); + _tmp5_ = stmt; #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - video_id_init (&_tmp10_, _tmp9_); + video_id_init (&_tmp6_, sqlite3_column_int64 (_tmp5_, 0)); #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_array_add3 (&ids, &ids_length1, &_ids_size_, &_tmp10_); + _vala_array_add3 (&ids, &ids_length1, &_ids_size_, &_tmp6_); #line 427 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = stmt; -#line 427 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = sqlite3_step (_tmp11_); + _tmp7_ = stmt; #line 427 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp12_; -#line 3139 "VideoTable.c" + res = sqlite3_step (_tmp7_); +#line 3028 "VideoTable.c" } #line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = ids; + _tmp8_ = ids; #line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13__length1 = ids_length1; + _tmp8__length1 = ids_length1; #line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (result_length1) { #line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - *result_length1 = _tmp13__length1; -#line 3149 "VideoTable.c" + *result_length1 = _tmp8__length1; +#line 3038 "VideoTable.c" } #line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - result = _tmp13_; + result = _tmp8_; #line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); #line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 3157 "VideoTable.c" +#line 3046 "VideoTable.c" } -GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event_id) { +GeeArrayList* +video_table_get_event_source_ids (VideoTable* self, + EventID* event_id) +{ GeeArrayList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -3175,9 +3067,8 @@ GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event EventID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; GeeArrayList* _result_ = NULL; - GeeArrayList* _tmp9_; + GeeArrayList* _tmp8_; #line 433 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL); #line 433 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -3203,87 +3094,79 @@ GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event #line 438 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp6_ = _tmp5_.id; #line 438 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 438 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 439 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 439 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 441 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp8_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 441 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _result_ = _tmp9_; -#line 3212 "VideoTable.c" + _result_ = _tmp8_; +#line 3101 "VideoTable.c" { - gboolean _tmp10_ = FALSE; + gboolean _tmp9_ = FALSE; #line 442 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = TRUE; + _tmp9_ = TRUE; #line 442 "/home/jens/Source/shotwell/src/db/VideoTable.vala" while (TRUE) { -#line 3219 "VideoTable.c" - sqlite3_stmt* _tmp11_; - gint _tmp12_; - gint _tmp13_; - GeeArrayList* _tmp16_; - sqlite3_stmt* _tmp17_; - gint64 _tmp18_; - VideoID _tmp19_ = {0}; - gchar* _tmp20_; - gchar* _tmp21_; +#line 3108 "VideoTable.c" + sqlite3_stmt* _tmp10_; + gint _tmp11_; + GeeArrayList* _tmp14_; + sqlite3_stmt* _tmp15_; + VideoID _tmp16_ = {0}; + gchar* _tmp17_; + gchar* _tmp18_; #line 442 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (!_tmp10_) { -#line 3231 "VideoTable.c" + if (!_tmp9_) { +#line 3118 "VideoTable.c" } #line 442 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = FALSE; + _tmp9_ = FALSE; #line 443 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = stmt; -#line 443 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = sqlite3_step (_tmp11_); + _tmp10_ = stmt; #line 443 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp12_; + res = sqlite3_step (_tmp10_); #line 444 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 444 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp13_ == SQLITE_DONE) { + if (_tmp11_ == SQLITE_DONE) { #line 445 "/home/jens/Source/shotwell/src/db/VideoTable.vala" break; -#line 3247 "VideoTable.c" +#line 3132 "VideoTable.c" } else { - gint _tmp14_; + gint _tmp12_; #line 446 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp14_ = res; + _tmp12_ = res; #line 446 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp14_ != SQLITE_ROW) { -#line 3254 "VideoTable.c" - gint _tmp15_; + if (_tmp12_ != SQLITE_ROW) { +#line 3139 "VideoTable.c" + gint _tmp13_; #line 447 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp15_ = res; + _tmp13_ = res; #line 447 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_fatal ("get_event_source_ids", _tmp15_); + database_table_fatal ("get_event_source_ids", _tmp13_); #line 449 "/home/jens/Source/shotwell/src/db/VideoTable.vala" break; -#line 3262 "VideoTable.c" +#line 3147 "VideoTable.c" } } #line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp16_ = _result_; + _tmp14_ = _result_; #line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp17_ = stmt; + _tmp15_ = stmt; #line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp18_ = sqlite3_column_int64 (_tmp17_, 0); + video_id_init (&_tmp16_, sqlite3_column_int64 (_tmp15_, 0)); #line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - video_id_init (&_tmp19_, _tmp18_); + _tmp17_ = video_id_upgrade_video_id_to_source_id (&_tmp16_); #line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp20_ = video_id_upgrade_video_id_to_source_id (&_tmp19_); + _tmp18_ = _tmp17_; #line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp21_ = _tmp20_; + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_); #line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); -#line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp21_); -#line 3281 "VideoTable.c" + _g_free0 (_tmp18_); +#line 3164 "VideoTable.c" } } #line 455 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -3292,14 +3175,18 @@ GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event _sqlite3_finalize0 (stmt); #line 455 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 3290 "VideoTable.c" +#line 3173 "VideoTable.c" } -void video_table_set_timestamp (VideoTable* self, VideoID* video_id, time_t timestamp, GError** error) { +void +video_table_set_timestamp (VideoTable* self, + VideoID* video_id, + time_t timestamp, + GError** error) +{ VideoID _tmp0_; gint64 _tmp1_; - time_t _tmp2_; GError * _inner_error_ = NULL; #line 458 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -3310,9 +3197,7 @@ void video_table_set_timestamp (VideoTable* self, VideoID* video_id, time_t time #line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp1_ = _tmp0_.id; #line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = timestamp; -#line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "timestamp", (gint64) _tmp2_, &_inner_error_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "timestamp", (gint64) timestamp, &_inner_error_); #line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -3321,7 +3206,7 @@ void video_table_set_timestamp (VideoTable* self, VideoID* video_id, time_t time g_propagate_error (error, _inner_error_); #line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 3319 "VideoTable.c" +#line 3204 "VideoTable.c" } else { #line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3329,36 +3214,44 @@ void video_table_set_timestamp (VideoTable* self, VideoID* video_id, time_t time g_clear_error (&_inner_error_); #line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 3327 "VideoTable.c" +#line 3212 "VideoTable.c" } } } -static void video_table_class_init (VideoTableClass * klass) { +static void +video_table_class_init (VideoTableClass * klass) +{ #line 59 "/home/jens/Source/shotwell/src/db/VideoTable.vala" video_table_parent_class = g_type_class_peek_parent (klass); #line 59 "/home/jens/Source/shotwell/src/db/VideoTable.vala" ((DatabaseTableClass *) klass)->finalize = video_table_finalize; -#line 3338 "VideoTable.c" +#line 3225 "VideoTable.c" } -static void video_table_instance_init (VideoTable * self) { +static void +video_table_instance_init (VideoTable * self) +{ } -static void video_table_finalize (DatabaseTable * obj) { +static void +video_table_finalize (DatabaseTable * obj) +{ VideoTable * self; #line 59 "/home/jens/Source/shotwell/src/db/VideoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_TABLE, VideoTable); #line 59 "/home/jens/Source/shotwell/src/db/VideoTable.vala" DATABASE_TABLE_CLASS (video_table_parent_class)->finalize (obj); -#line 3352 "VideoTable.c" +#line 3243 "VideoTable.c" } -GType video_table_get_type (void) { +GType +video_table_get_type (void) +{ static volatile gsize video_table_type_id__volatile = 0; if (g_once_init_enter (&video_table_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (VideoTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) video_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (VideoTable), 0, (GInstanceInitFunc) video_table_instance_init, NULL }; diff --git a/src/dialogs/AdjustDateTimeDialog.c b/src/dialogs/AdjustDateTimeDialog.c index 9eb3020..fe412df 100644 --- a/src/dialogs/AdjustDateTimeDialog.c +++ b/src/dialogs/AdjustDateTimeDialog.c @@ -1,4 +1,4 @@ -/* AdjustDateTimeDialog.c generated by valac 0.36.6, the Vala compiler +/* AdjustDateTimeDialog.c generated by valac 0.40.4, the Vala compiler * generated from AdjustDateTimeDialog.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -8,6 +8,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -32,6 +33,11 @@ typedef struct _AdjustDateTimeDialogClass AdjustDateTimeDialogClass; typedef struct _AdjustDateTimeDialogPrivate AdjustDateTimeDialogPrivate; #define ADJUST_DATE_TIME_DIALOG_TYPE_TIME_SYSTEM (adjust_date_time_dialog_time_system_get_type ()) +enum { + ADJUST_DATE_TIME_DIALOG_0_PROPERTY, + ADJUST_DATE_TIME_DIALOG_NUM_PROPERTIES +}; +static GParamSpec* adjust_date_time_dialog_properties[ADJUST_DATE_TIME_DIALOG_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define TYPE_DATA_OBJECT (data_object_get_type ()) @@ -171,9 +177,6 @@ static gpointer adjust_date_time_dialog_parent_class = NULL; GType adjust_date_time_dialog_get_type (void) G_GNUC_CONST; static GType adjust_date_time_dialog_time_system_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define ADJUST_DATE_TIME_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ADJUST_DATE_TIME_DIALOG, AdjustDateTimeDialogPrivate)) -enum { - ADJUST_DATE_TIME_DIALOG_DUMMY_PROPERTY -}; #define ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY ((gint64) ((60 * 60) * 24)) #define ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR ((gint64) (60 * 60)) #define ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE ((gint64) 60) @@ -184,8 +187,17 @@ GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; GType dateable_get_type (void) G_GNUC_CONST; -AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video); -AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video); +AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source, + gint photo_count, + gboolean display_options, + gboolean contains_video, + gboolean only_video); +AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, + Dateable* source, + gint photo_count, + gboolean display_options, + gboolean contains_video, + gboolean only_video); gint resources_use_header_bar (void); GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; @@ -194,35 +206,55 @@ AppWindow* app_window_get_instance (void); #define RESOURCES_OK_LABEL _ ("_OK") #define RESOURCES_ADJUST_DATE_TIME_LABEL _ ("Adjust Date and Time") static void adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self); -static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self); -static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed (GtkCalendar* _sender, gpointer self); -static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year (GtkCalendar* _sender, gpointer self); -static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year (GtkCalendar* _sender, gpointer self); +static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected (GtkCalendar* _sender, + gpointer self); +static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed (GtkCalendar* _sender, + gpointer self); +static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year (GtkCalendar* _sender, + gpointer self); +static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year (GtkCalendar* _sender, + gpointer self); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); gboolean configuration_facade_get_use_24_hour_time (ConfigurationFacade* self); -static gboolean adjust_date_time_dialog_on_spin_button_output (AdjustDateTimeDialog* self, GtkSpinButton* button); -static gboolean _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output (GtkSpinButton* _sender, gpointer self); +static gboolean adjust_date_time_dialog_on_spin_button_output (AdjustDateTimeDialog* self, + GtkSpinButton* button); +static gboolean _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output (GtkSpinButton* _sender, + gpointer self); static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog* self); -static void _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); +static void _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self); gboolean configuration_facade_get_keep_relativity (ConfigurationFacade* self); -static void _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self); +static void _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, + gpointer self); gboolean configuration_facade_get_commit_metadata_to_masters (ConfigurationFacade* self); -GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GError** error); +GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); gchar* data_object_to_string (DataObject* self); time_t dateable_get_exposure_time (Dateable* self); -static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct tm* time); -static void adjust_date_time_dialog_set_original_time_label (AdjustDateTimeDialog* self, gboolean use_24_hr_format); +static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, + struct tm* time); +static void adjust_date_time_dialog_set_original_time_label (AdjustDateTimeDialog* self, + gboolean use_24_hr_format); static time_t adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self); -gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* time_shift, gboolean* keep_relativity, gboolean* modify_originals); -void configuration_facade_set_keep_relativity (ConfigurationFacade* self, gboolean keep_relativity); -void configuration_facade_set_modify_originals (ConfigurationFacade* self, gboolean modify_originals); -void configuration_facade_set_use_24_hour_time (ConfigurationFacade* self, gboolean use_24_hour_time); +gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, + gint64* time_shift, + gboolean* keep_relativity, + gboolean* modify_originals); +void configuration_facade_set_keep_relativity (ConfigurationFacade* self, + gboolean keep_relativity); +void configuration_facade_set_modify_originals (ConfigurationFacade* self, + gboolean modify_originals); +void configuration_facade_set_use_24_hour_time (ConfigurationFacade* self, + gboolean use_24_hour_time); static void adjust_date_time_dialog_finalize (GObject * obj); -static GType adjust_date_time_dialog_time_system_get_type (void) { +static GType +adjust_date_time_dialog_time_system_get_type (void) +{ static volatile gsize adjust_date_time_dialog_time_system_type_id__volatile = 0; if (g_once_init_enter (&adjust_date_time_dialog_time_system_type_id__volatile)) { static const GEnumValue values[] = {{ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM, "ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM", "am"}, {ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM, "ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM", "pm"}, {ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR, "ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR", "24hr"}, {0, NULL, NULL}}; @@ -234,73 +266,100 @@ static GType adjust_date_time_dialog_time_system_get_type (void) { } -static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) { +static void +_adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected (GtkCalendar* _sender, + gpointer self) +{ #line 53 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self); -#line 241 "AdjustDateTimeDialog.c" +#line 276 "AdjustDateTimeDialog.c" } -static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed (GtkCalendar* _sender, gpointer self) { +static void +_adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed (GtkCalendar* _sender, + gpointer self) +{ #line 54 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self); -#line 248 "AdjustDateTimeDialog.c" +#line 286 "AdjustDateTimeDialog.c" } -static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year (GtkCalendar* _sender, gpointer self) { +static void +_adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year (GtkCalendar* _sender, + gpointer self) +{ #line 55 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self); -#line 255 "AdjustDateTimeDialog.c" +#line 296 "AdjustDateTimeDialog.c" } -static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year (GtkCalendar* _sender, gpointer self) { +static void +_adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year (GtkCalendar* _sender, + gpointer self) +{ #line 56 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self); -#line 262 "AdjustDateTimeDialog.c" +#line 306 "AdjustDateTimeDialog.c" } -static gboolean _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output (GtkSpinButton* _sender, gpointer self) { +static gboolean +_adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output (GtkSpinButton* _sender, + gpointer self) +{ gboolean result; result = adjust_date_time_dialog_on_spin_button_output ((AdjustDateTimeDialog*) self, _sender); #line 63 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" return result; -#line 271 "AdjustDateTimeDialog.c" +#line 318 "AdjustDateTimeDialog.c" } -static void _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void +_adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self) +{ #line 81 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" adjust_date_time_dialog_on_time_system_changed ((AdjustDateTimeDialog*) self); -#line 278 "AdjustDateTimeDialog.c" +#line 328 "AdjustDateTimeDialog.c" } -static void _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) { +static void +_adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, + gpointer self) +{ #line 103 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self); -#line 285 "AdjustDateTimeDialog.c" +#line 338 "AdjustDateTimeDialog.c" } -static void g_time_gm (time_t time, struct tm* result) { +static void +g_time_gm (time_t time, + struct tm* result) +{ struct tm _result_ = {0}; struct tm _tmp0_ = {0}; -#line 2841 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2861 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" gmtime_r (&time, &_tmp0_); -#line 2841 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2861 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 2842 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2862 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" *result = _result_; -#line 2842 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2862 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return; -#line 300 "AdjustDateTimeDialog.c" +#line 356 "AdjustDateTimeDialog.c" } -static gchar* g_time_format (struct tm *self, const gchar* format) { +static gchar* +g_time_format (struct tm *self, + const gchar* format) +{ gchar* result = NULL; gchar* buffer = NULL; gchar* _tmp0_; @@ -308,82 +367,91 @@ static gchar* g_time_format (struct tm *self, const gchar* format) { gint _buffer_size_; gchar* _tmp1_; gint _tmp1__length1; - const gchar* _tmp2_; + gchar* _tmp2_; + gint _tmp2__length1; gchar* _tmp3_; - gint _tmp3__length1; - gchar* _tmp4_; -#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2874 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (format != NULL, NULL); -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_new0 (gchar, 64); -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer = _tmp0_; -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer_length1 = 64; -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _buffer_size_ = buffer_length1; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = buffer; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1__length1 = buffer_length1; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = format; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self)); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = buffer; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3__length1 = buffer_length1; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = g_strdup ((const gchar*) _tmp3_); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + strftime (_tmp1_, _tmp1__length1, format, &(*self)); +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = buffer; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2__length1 = buffer_length1; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_strdup ((const gchar*) _tmp2_); +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp3_; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer = (g_free (buffer), NULL); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 346 "AdjustDateTimeDialog.c" +#line 402 "AdjustDateTimeDialog.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" return self ? g_object_ref (self) : NULL; -#line 353 "AdjustDateTimeDialog.c" +#line 411 "AdjustDateTimeDialog.c" } -static void g_time_local (time_t time, struct tm* result) { +static void +g_time_local (time_t time, + struct tm* result) +{ struct tm _result_ = {0}; struct tm _tmp0_ = {0}; -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" localtime_r (&time, &_tmp0_); -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" *result = _result_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return; -#line 368 "AdjustDateTimeDialog.c" +#line 429 "AdjustDateTimeDialog.c" } -AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video) { +AdjustDateTimeDialog* +adjust_date_time_dialog_construct (GType object_type, + Dateable* source, + gint photo_count, + gboolean display_options, + gboolean contains_video, + gboolean only_video) +{ AdjustDateTimeDialog * self = NULL; - Dateable* _tmp0_; - gint _tmp1_; - AppWindow* _tmp2_; - AppWindow* _tmp3_; + AppWindow* _tmp0_; + AppWindow* _tmp1_; + GtkCalendar* _tmp2_; + GtkCalendar* _tmp3_; GtkCalendar* _tmp4_; GtkCalendar* _tmp5_; GtkCalendar* _tmp6_; GtkCalendar* _tmp7_; - GtkCalendar* _tmp8_; - GtkCalendar* _tmp9_; - ConfigFacade* _tmp10_; - ConfigFacade* _tmp11_; - gboolean _tmp12_; - gboolean _tmp13_; + ConfigFacade* _tmp8_; + ConfigFacade* _tmp9_; + gboolean _tmp10_; + GtkSpinButton* _tmp13_; + GtkSpinButton* _tmp14_; + GtkSpinButton* _tmp15_; GtkSpinButton* _tmp16_; GtkSpinButton* _tmp17_; GtkSpinButton* _tmp18_; @@ -392,770 +460,703 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date GtkSpinButton* _tmp21_; GtkSpinButton* _tmp22_; GtkSpinButton* _tmp23_; - GtkSpinButton* _tmp24_; - GtkSpinButton* _tmp25_; - GtkSpinButton* _tmp26_; + GtkComboBoxText* _tmp24_; + GtkComboBoxText* _tmp25_; + GtkComboBoxText* _tmp26_; GtkComboBoxText* _tmp27_; GtkComboBoxText* _tmp28_; - GtkComboBoxText* _tmp29_; - GtkComboBoxText* _tmp30_; - GtkComboBoxText* _tmp31_; GtkBox* clock = NULL; + GtkBox* _tmp29_; + GtkBox* _tmp30_; + GtkSpinButton* _tmp31_; GtkBox* _tmp32_; - GtkBox* _tmp33_; - GtkSpinButton* _tmp34_; + GtkLabel* _tmp33_; + GtkLabel* _tmp34_; GtkBox* _tmp35_; - GtkLabel* _tmp36_; - GtkLabel* _tmp37_; - GtkBox* _tmp38_; - GtkSpinButton* _tmp39_; + GtkSpinButton* _tmp36_; + GtkBox* _tmp37_; + GtkLabel* _tmp38_; + GtkLabel* _tmp39_; GtkBox* _tmp40_; - GtkLabel* _tmp41_; - GtkLabel* _tmp42_; - GtkBox* _tmp43_; - GtkSpinButton* _tmp44_; - GtkBox* _tmp45_; - GtkComboBoxText* _tmp46_; - GtkRadioButton* _tmp47_; - GtkRadioButton* _tmp48_; - ConfigFacade* _tmp49_; - ConfigFacade* _tmp50_; - gboolean _tmp51_; - gboolean _tmp52_ = FALSE; - gboolean _tmp53_; - GtkRadioButton* _tmp55_; - GtkRadioButton* _tmp56_; - GSList* _tmp57_; + GtkSpinButton* _tmp41_; + GtkBox* _tmp42_; + GtkComboBoxText* _tmp43_; + GtkRadioButton* _tmp44_; + GtkRadioButton* _tmp45_; + ConfigFacade* _tmp46_; + ConfigFacade* _tmp47_; + gboolean _tmp48_ = FALSE; + GtkRadioButton* _tmp49_; + GtkRadioButton* _tmp50_; + GSList* _tmp51_; + GtkRadioButton* _tmp52_; + GtkRadioButton* _tmp53_; + ConfigFacade* _tmp54_; + ConfigFacade* _tmp55_; + gboolean _tmp56_ = FALSE; + GtkRadioButton* _tmp57_; GtkRadioButton* _tmp58_; - GtkRadioButton* _tmp59_; - ConfigFacade* _tmp60_; - ConfigFacade* _tmp61_; - gboolean _tmp62_; - gboolean _tmp63_ = FALSE; - gboolean _tmp64_; - GtkRadioButton* _tmp66_; - GtkRadioButton* _tmp67_; + gboolean _tmp65_ = FALSE; + ConfigFacade* _tmp66_; + ConfigFacade* _tmp67_; gboolean _tmp68_; - gboolean _tmp77_ = FALSE; - ConfigFacade* _tmp78_; - ConfigFacade* _tmp79_; - gboolean _tmp80_; - gboolean _tmp81_; - GtkCheckButton* _tmp83_; - gboolean _tmp84_ = FALSE; - gboolean _tmp85_; - GtkCheckButton* _tmp92_; + GtkCheckButton* _tmp69_; + gboolean _tmp70_ = FALSE; + GtkCheckButton* _tmp75_; GtkBox* time_content = NULL; - GtkBox* _tmp93_; + GtkBox* _tmp76_; GtkBox* picker = NULL; - GtkBox* _tmp94_; + GtkBox* _tmp77_; GtkComboBoxText* combo = NULL; - GtkComboBoxText* _tmp95_; - GtkBox* _tmp104_; - GtkComboBoxText* _tmp105_; + GtkComboBoxText* _tmp78_; + GtkBox* _tmp87_; + GtkComboBoxText* _tmp88_; GtkSpinButton* spin = NULL; - GtkSpinButton* _tmp106_; - GtkBox* _tmp107_; - GtkSpinButton* _tmp108_; - GtkSpinButton* _tmp109_; - GtkCalendar* _tmp110_; - GtkComboBoxText* _tmp111_; - GtkCalendar* _tmp112_; + GtkSpinButton* _tmp89_; + GtkBox* _tmp90_; + GtkSpinButton* _tmp91_; + GtkSpinButton* _tmp92_; + GtkCalendar* _tmp93_; + GtkComboBoxText* _tmp94_; + GtkCalendar* _tmp95_; + GtkBox* _tmp96_; + GtkBox* _tmp97_; + GtkBox* _tmp98_; + GtkCalendar* _tmp99_; + GtkBox* _tmp100_; + GtkBox* _tmp101_; + GdkPixbuf* preview = NULL; + GtkBox* image_content = NULL; GtkBox* _tmp113_; GtkBox* _tmp114_; GtkBox* _tmp115_; - GtkCalendar* _tmp116_; - GtkBox* _tmp117_; - GtkBox* _tmp118_; - gboolean _tmp119_; - GdkPixbuf* preview = NULL; - GtkBox* image_content = NULL; + GtkImage* _tmp116_ = NULL; + GdkPixbuf* _tmp117_; + GtkImage* image = NULL; + GtkImage* _tmp121_; + GtkLabel* _tmp122_; + GtkBox* _tmp123_; + GtkImage* _tmp124_; + GtkBox* _tmp125_; + GtkLabel* _tmp126_; + GtkBox* hbox = NULL; + GtkBox* _tmp127_; + GtkBox* _tmp128_; + GtkBox* _tmp129_; + GtkBox* _tmp130_; + GtkBox* _tmp131_; + GtkBox* _tmp132_; GtkBox* _tmp133_; GtkBox* _tmp134_; GtkBox* _tmp135_; - GtkImage* _tmp136_ = NULL; - GdkPixbuf* _tmp137_; - GtkImage* image = NULL; - GtkImage* _tmp141_; - GtkLabel* _tmp142_; - GtkBox* _tmp143_; - GtkImage* _tmp144_; - GtkBox* _tmp145_; - GtkLabel* _tmp146_; - GtkBox* hbox = NULL; - GtkBox* _tmp147_; - GtkBox* _tmp148_; - GtkBox* _tmp149_; - GtkBox* _tmp150_; - GtkBox* _tmp151_; - GtkBox* _tmp152_; - GtkBox* _tmp153_; - GtkBox* _tmp154_; - GtkBox* _tmp155_; - GtkBox* _tmp156_; - GtkBox* _tmp157_; - GtkBox* _tmp158_; - GtkLabel* _tmp159_; - GtkLabel* _tmp160_; - GtkLabel* _tmp161_; - GtkBox* _tmp162_; - GtkLabel* _tmp163_; - Dateable* _tmp164_; - time_t _tmp165_; - time_t _tmp166_; - time_t _tmp168_; - struct tm _tmp169_ = {0}; - ConfigFacade* _tmp170_; - ConfigFacade* _tmp171_; - gboolean _tmp172_; + GtkBox* _tmp136_; + GtkBox* _tmp137_; + GtkBox* _tmp138_; + GtkLabel* _tmp139_; + GtkLabel* _tmp140_; + GtkLabel* _tmp141_; + GtkBox* _tmp142_; + GtkLabel* _tmp143_; + time_t _tmp144_; + time_t _tmp146_; + struct tm _tmp147_ = {0}; + ConfigFacade* _tmp148_; + ConfigFacade* _tmp149_; GError * _inner_error_ = NULL; #line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" g_return_val_if_fail (IS_DATEABLE (source), NULL); #line 39 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp0_ = source; -#line 39 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _vala_assert (_tmp0_ != NULL, "source != null"); + _vala_assert (source != NULL, "source != null"); #line 41 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp1_ = resources_use_header_bar (); -#line 41 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - self = (AdjustDateTimeDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL); + self = (AdjustDateTimeDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL); #line 43 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE); #line 44 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); #line 45 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp2_ = app_window_get_instance (); + _tmp0_ = app_window_get_instance (); #line 45 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 45 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_window_get_type (), GtkWindow)); + gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow)); #line 45 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 47 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL); #line 49 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), RESOURCES_ADJUST_DATE_TIME_LABEL); #line 51 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp4_ = (GtkCalendar*) gtk_calendar_new (); + _tmp2_ = (GtkCalendar*) gtk_calendar_new (); #line 51 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp4_); + g_object_ref_sink (_tmp2_); #line 51 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_object_unref0 (self->priv->calendar); #line 51 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - self->priv->calendar = _tmp4_; + self->priv->calendar = _tmp2_; #line 52 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp5_ = self->priv->calendar; + _tmp3_ = self->priv->calendar; #line 52 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_set (_tmp5_, "show-heading", FALSE, NULL); + g_object_set (_tmp3_, "show-heading", FALSE, NULL); #line 53 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp6_ = self->priv->calendar; + _tmp4_ = self->priv->calendar; #line 53 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_signal_connect_object (_tmp6_, "day-selected", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected, self, 0); + g_signal_connect_object (_tmp4_, "day-selected", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected, self, 0); #line 54 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp7_ = self->priv->calendar; + _tmp5_ = self->priv->calendar; #line 54 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_signal_connect_object (_tmp7_, "month-changed", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed, self, 0); + g_signal_connect_object (_tmp5_, "month-changed", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed, self, 0); #line 55 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp8_ = self->priv->calendar; + _tmp6_ = self->priv->calendar; #line 55 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_signal_connect_object (_tmp8_, "next-year", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year, self, 0); + g_signal_connect_object (_tmp6_, "next-year", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year, self, 0); #line 56 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp9_ = self->priv->calendar; + _tmp7_ = self->priv->calendar; #line 56 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_signal_connect_object (_tmp9_, "prev-year", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year, self, 0); + g_signal_connect_object (_tmp7_, "prev-year", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year, self, 0); #line 58 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp10_ = config_facade_get_instance (); + _tmp8_ = config_facade_get_instance (); #line 58 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 58 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp12_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp10_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 58 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp13_ = _tmp12_; + _g_object_unref0 (_tmp9_); #line 58 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_object_unref0 (_tmp11_); -#line 58 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp13_) { -#line 579 "AdjustDateTimeDialog.c" - GtkSpinButton* _tmp14_; + if (_tmp10_) { +#line 627 "AdjustDateTimeDialog.c" + GtkSpinButton* _tmp11_; #line 59 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp14_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 23, (gdouble) 1); + _tmp11_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 23, (gdouble) 1); #line 59 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp14_); + g_object_ref_sink (_tmp11_); #line 59 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_object_unref0 (self->priv->hour); #line 59 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - self->priv->hour = _tmp14_; -#line 589 "AdjustDateTimeDialog.c" + self->priv->hour = _tmp11_; +#line 637 "AdjustDateTimeDialog.c" } else { - GtkSpinButton* _tmp15_; + GtkSpinButton* _tmp12_; #line 61 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp15_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 1, (gdouble) 12, (gdouble) 1); + _tmp12_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 1, (gdouble) 12, (gdouble) 1); #line 61 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp15_); + g_object_ref_sink (_tmp12_); #line 61 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_object_unref0 (self->priv->hour); #line 61 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - self->priv->hour = _tmp15_; -#line 600 "AdjustDateTimeDialog.c" + self->priv->hour = _tmp12_; +#line 648 "AdjustDateTimeDialog.c" } #line 63 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp16_ = self->priv->hour; + _tmp13_ = self->priv->hour; #line 63 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_signal_connect_object (_tmp16_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0); + g_signal_connect_object (_tmp13_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0); #line 64 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp17_ = self->priv->hour; + _tmp14_ = self->priv->hour; #line 64 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_entry_get_type (), GtkEntry), 2); + gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_entry_get_type (), GtkEntry), 2); #line 65 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp18_ = self->priv->hour; + _tmp15_ = self->priv->hour; #line 65 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_entry_get_type (), GtkEntry), 2); + gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_entry_get_type (), GtkEntry), 2); #line 67 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp19_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 59, (gdouble) 1); + _tmp16_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 59, (gdouble) 1); #line 67 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp19_); + g_object_ref_sink (_tmp16_); #line 67 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_object_unref0 (self->priv->minute); #line 67 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - self->priv->minute = _tmp19_; + self->priv->minute = _tmp16_; #line 68 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp20_ = self->priv->minute; + _tmp17_ = self->priv->minute; #line 68 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_entry_get_type (), GtkEntry), 2); + gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_entry_get_type (), GtkEntry), 2); #line 69 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp21_ = self->priv->minute; + _tmp18_ = self->priv->minute; #line 69 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_entry_get_type (), GtkEntry), 2); + gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_entry_get_type (), GtkEntry), 2); #line 70 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp22_ = self->priv->minute; + _tmp19_ = self->priv->minute; #line 70 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_signal_connect_object (_tmp22_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0); + g_signal_connect_object (_tmp19_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0); #line 72 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp23_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 59, (gdouble) 1); + _tmp20_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 59, (gdouble) 1); #line 72 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp23_); + g_object_ref_sink (_tmp20_); #line 72 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_object_unref0 (self->priv->second); #line 72 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - self->priv->second = _tmp23_; + self->priv->second = _tmp20_; #line 73 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp24_ = self->priv->second; + _tmp21_ = self->priv->second; #line 73 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_entry_get_type (), GtkEntry), 2); + gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_entry_get_type (), GtkEntry), 2); #line 74 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp25_ = self->priv->second; + _tmp22_ = self->priv->second; #line 74 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_entry_get_type (), GtkEntry), 2); + gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_entry_get_type (), GtkEntry), 2); #line 75 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp26_ = self->priv->second; + _tmp23_ = self->priv->second; #line 75 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_signal_connect_object (_tmp26_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0); + g_signal_connect_object (_tmp23_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0); #line 77 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp27_ = (GtkComboBoxText*) gtk_combo_box_text_new (); + _tmp24_ = (GtkComboBoxText*) gtk_combo_box_text_new (); #line 77 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp27_); + g_object_ref_sink (_tmp24_); #line 77 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_object_unref0 (self->priv->system); #line 77 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - self->priv->system = _tmp27_; + self->priv->system = _tmp24_; #line 78 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp28_ = self->priv->system; + _tmp25_ = self->priv->system; #line 78 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_combo_box_text_append_text (_tmp28_, _ ("AM")); + gtk_combo_box_text_append_text (_tmp25_, _ ("AM")); #line 79 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp29_ = self->priv->system; + _tmp26_ = self->priv->system; #line 79 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_combo_box_text_append_text (_tmp29_, _ ("PM")); + gtk_combo_box_text_append_text (_tmp26_, _ ("PM")); #line 80 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp30_ = self->priv->system; + _tmp27_ = self->priv->system; #line 80 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_combo_box_text_append_text (_tmp30_, _ ("24 Hr")); + gtk_combo_box_text_append_text (_tmp27_, _ ("24 Hr")); #line 81 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp31_ = self->priv->system; + _tmp28_ = self->priv->system; #line 81 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed, self, 0); #line 83 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp32_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + _tmp29_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); #line 83 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp32_); + g_object_ref_sink (_tmp29_); #line 83 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - clock = _tmp32_; + clock = _tmp29_; #line 85 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp33_ = clock; + _tmp30_ = clock; #line 85 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp34_ = self->priv->hour; + _tmp31_ = self->priv->hour; #line 85 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_pack_start (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 86 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp35_ = clock; + _tmp32_ = clock; #line 86 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp36_ = (GtkLabel*) gtk_label_new (":"); + _tmp33_ = (GtkLabel*) gtk_label_new (":"); #line 86 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp36_); + g_object_ref_sink (_tmp33_); #line 86 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp37_ = _tmp36_; + _tmp34_ = _tmp33_; #line 86 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_pack_start (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp32_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 86 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_object_unref0 (_tmp37_); + _g_object_unref0 (_tmp34_); #line 87 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp38_ = clock; + _tmp35_ = clock; #line 87 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp39_ = self->priv->minute; + _tmp36_ = self->priv->minute; #line 87 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_pack_start (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 88 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp40_ = clock; + _tmp37_ = clock; #line 88 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp41_ = (GtkLabel*) gtk_label_new (":"); + _tmp38_ = (GtkLabel*) gtk_label_new (":"); #line 88 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp41_); + g_object_ref_sink (_tmp38_); #line 88 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp42_ = _tmp41_; + _tmp39_ = _tmp38_; #line 88 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_pack_start (_tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 88 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_object_unref0 (_tmp42_); + _g_object_unref0 (_tmp39_); #line 89 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp43_ = clock; + _tmp40_ = clock; #line 89 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp44_ = self->priv->second; + _tmp41_ = self->priv->second; #line 89 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_pack_start (_tmp43_, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 90 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp45_ = clock; + _tmp42_ = clock; #line 90 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp46_ = self->priv->system; + _tmp43_ = self->priv->system; #line 90 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_pack_start (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 92 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK); #line 94 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp47_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (NULL, _ ("_Shift photos/videos by the same amount")); + _tmp44_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (NULL, _ ("_Shift photos/videos by the same amount")); #line 94 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp47_); + g_object_ref_sink (_tmp44_); #line 94 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_object_unref0 (self->priv->relativity_radio_button); #line 94 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - self->priv->relativity_radio_button = _tmp47_; -#line 96 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp48_ = self->priv->relativity_radio_button; + self->priv->relativity_radio_button = _tmp44_; #line 96 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp49_ = config_facade_get_instance (); + _tmp45_ = self->priv->relativity_radio_button; #line 96 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp50_ = _tmp49_; + _tmp46_ = config_facade_get_instance (); #line 96 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp51_ = configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp47_ = _tmp46_; #line 96 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp51_); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_toggle_button_get_type (), GtkToggleButton), configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 96 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_object_unref0 (_tmp50_); -#line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp53_ = display_options; -#line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp53_) { -#line 758 "AdjustDateTimeDialog.c" - gint _tmp54_; + _g_object_unref0 (_tmp47_); #line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp54_ = photo_count; + if (display_options) { #line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp52_ = _tmp54_ > 1; -#line 764 "AdjustDateTimeDialog.c" + _tmp48_ = photo_count > 1; +#line 804 "AdjustDateTimeDialog.c" } else { #line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp52_ = FALSE; -#line 768 "AdjustDateTimeDialog.c" + _tmp48_ = FALSE; +#line 808 "AdjustDateTimeDialog.c" } #line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp55_ = self->priv->relativity_radio_button; + _tmp49_ = self->priv->relativity_radio_button; #line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget), _tmp52_); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), _tmp48_); #line 99 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp56_ = self->priv->relativity_radio_button; + _tmp50_ = self->priv->relativity_radio_button; #line 99 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp57_ = gtk_radio_button_get_group (_tmp56_); + _tmp51_ = gtk_radio_button_get_group (_tmp50_); #line 99 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp58_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (_tmp57_, _ ("Set _all photos/videos to this time")); + _tmp52_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (_tmp51_, _ ("Set _all photos/videos to this time")); #line 99 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp58_); + g_object_ref_sink (_tmp52_); #line 99 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_object_unref0 (self->priv->batch_radio_button); #line 99 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - self->priv->batch_radio_button = _tmp58_; -#line 101 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp59_ = self->priv->batch_radio_button; + self->priv->batch_radio_button = _tmp52_; #line 101 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp60_ = config_facade_get_instance (); + _tmp53_ = self->priv->batch_radio_button; #line 101 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp61_ = _tmp60_; + _tmp54_ = config_facade_get_instance (); #line 101 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp62_ = configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp55_ = _tmp54_; #line 101 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_toggle_button_get_type (), GtkToggleButton), !_tmp62_); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_toggle_button_get_type (), GtkToggleButton), !configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 101 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_object_unref0 (_tmp61_); -#line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp64_ = display_options; + _g_object_unref0 (_tmp55_); #line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp64_) { -#line 802 "AdjustDateTimeDialog.c" - gint _tmp65_; + if (display_options) { #line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp65_ = photo_count; -#line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp63_ = _tmp65_ > 1; -#line 808 "AdjustDateTimeDialog.c" + _tmp56_ = photo_count > 1; +#line 840 "AdjustDateTimeDialog.c" } else { #line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp63_ = FALSE; -#line 812 "AdjustDateTimeDialog.c" + _tmp56_ = FALSE; +#line 844 "AdjustDateTimeDialog.c" } #line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp66_ = self->priv->batch_radio_button; + _tmp57_ = self->priv->batch_radio_button; #line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), _tmp63_); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget), _tmp56_); #line 103 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp67_ = self->priv->batch_radio_button; + _tmp58_ = self->priv->batch_radio_button; #line 103 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled, self, 0); -#line 105 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp68_ = contains_video; + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled, self, 0); #line 105 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp68_) { -#line 826 "AdjustDateTimeDialog.c" + if (contains_video) { +#line 856 "AdjustDateTimeDialog.c" gchar* text = NULL; - gint _tmp69_; - gchar* _tmp70_; - const gchar* _tmp71_; - GtkCheckButton* _tmp72_; -#line 106 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp69_ = photo_count; + gchar* _tmp59_; + const gchar* _tmp60_; + GtkCheckButton* _tmp61_; #line 106 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp70_ = g_strdup (ngettext ("_Modify original photo file", "_Modify original photo files", (gulong) _tmp69_)); + _tmp59_ = g_strdup (ngettext ("_Modify original photo file", "_Modify original photo files", (gulong) photo_count)); #line 106 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - text = _tmp70_; + text = _tmp59_; #line 108 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp71_ = text; + _tmp60_ = text; #line 108 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp72_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp71_); + _tmp61_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp60_); #line 108 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp72_); + g_object_ref_sink (_tmp61_); #line 108 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_object_unref0 (self->priv->modify_originals_check_button); #line 108 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - self->priv->modify_originals_check_button = _tmp72_; + self->priv->modify_originals_check_button = _tmp61_; #line 105 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_free0 (text); -#line 850 "AdjustDateTimeDialog.c" +#line 877 "AdjustDateTimeDialog.c" } else { gchar* text = NULL; - gint _tmp73_; - gchar* _tmp74_; - const gchar* _tmp75_; - GtkCheckButton* _tmp76_; -#line 110 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp73_ = photo_count; + gchar* _tmp62_; + const gchar* _tmp63_; + GtkCheckButton* _tmp64_; #line 110 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp74_ = g_strdup (ngettext ("_Modify original file", "_Modify original files", (gulong) _tmp73_)); + _tmp62_ = g_strdup (ngettext ("_Modify original file", "_Modify original files", (gulong) photo_count)); #line 110 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - text = _tmp74_; + text = _tmp62_; #line 111 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp75_ = text; + _tmp63_ = text; #line 111 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp76_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp75_); + _tmp64_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp63_); #line 111 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp76_); + g_object_ref_sink (_tmp64_); #line 111 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_object_unref0 (self->priv->modify_originals_check_button); #line 111 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - self->priv->modify_originals_check_button = _tmp76_; + self->priv->modify_originals_check_button = _tmp64_; #line 105 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_free0 (text); -#line 875 "AdjustDateTimeDialog.c" +#line 899 "AdjustDateTimeDialog.c" } #line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp78_ = config_facade_get_instance (); -#line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp79_ = _tmp78_; + _tmp66_ = config_facade_get_instance (); #line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp80_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp67_ = _tmp66_; #line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp81_ = _tmp80_; + _tmp68_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_object_unref0 (_tmp79_); + _g_object_unref0 (_tmp67_); #line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp81_) { -#line 889 "AdjustDateTimeDialog.c" - gboolean _tmp82_; -#line 115 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp82_ = display_options; + if (_tmp68_) { #line 115 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp77_ = _tmp82_; -#line 895 "AdjustDateTimeDialog.c" + _tmp65_ = display_options; +#line 913 "AdjustDateTimeDialog.c" } else { #line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp77_ = FALSE; -#line 899 "AdjustDateTimeDialog.c" + _tmp65_ = FALSE; +#line 917 "AdjustDateTimeDialog.c" } #line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp83_ = self->priv->modify_originals_check_button; + _tmp69_ = self->priv->modify_originals_check_button; #line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp77_); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp65_); #line 116 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp85_ = only_video; -#line 116 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (!_tmp85_) { -#line 909 "AdjustDateTimeDialog.c" - gboolean _tmp86_ = FALSE; - ConfigFacade* _tmp87_; - ConfigFacade* _tmp88_; - gboolean _tmp89_; - gboolean _tmp90_; -#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp87_ = config_facade_get_instance (); -#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp88_ = _tmp87_; + if (!only_video) { +#line 925 "AdjustDateTimeDialog.c" + gboolean _tmp71_ = FALSE; + ConfigFacade* _tmp72_; + ConfigFacade* _tmp73_; + gboolean _tmp74_; #line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp89_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp72_ = config_facade_get_instance (); #line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp90_ = !_tmp89_; + _tmp73_ = _tmp72_; #line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_object_unref0 (_tmp88_); + _tmp74_ = !configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp90_) { -#line 927 "AdjustDateTimeDialog.c" - gboolean _tmp91_; + _g_object_unref0 (_tmp73_); #line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp91_ = display_options; + if (_tmp74_) { #line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp86_ = _tmp91_; -#line 933 "AdjustDateTimeDialog.c" + _tmp71_ = display_options; +#line 942 "AdjustDateTimeDialog.c" } else { #line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp86_ = FALSE; -#line 937 "AdjustDateTimeDialog.c" + _tmp71_ = FALSE; +#line 946 "AdjustDateTimeDialog.c" } #line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp84_ = _tmp86_; -#line 941 "AdjustDateTimeDialog.c" + _tmp70_ = _tmp71_; +#line 950 "AdjustDateTimeDialog.c" } else { #line 116 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp84_ = FALSE; -#line 945 "AdjustDateTimeDialog.c" + _tmp70_ = FALSE; +#line 954 "AdjustDateTimeDialog.c" } #line 116 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp92_ = self->priv->modify_originals_check_button; + _tmp75_ = self->priv->modify_originals_check_button; #line 116 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, gtk_widget_get_type (), GtkWidget), _tmp84_); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_widget_get_type (), GtkWidget), _tmp70_); #line 119 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp93_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); + _tmp76_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); #line 119 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp93_); + g_object_ref_sink (_tmp76_); #line 119 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - time_content = _tmp93_; + time_content = _tmp76_; #line 121 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp94_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + _tmp77_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); #line 121 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp94_); + g_object_ref_sink (_tmp77_); #line 121 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - picker = _tmp94_; + picker = _tmp77_; #line 122 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp95_ = (GtkComboBoxText*) gtk_combo_box_text_new (); + _tmp78_ = (GtkComboBoxText*) gtk_combo_box_text_new (); #line 122 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp95_); + g_object_ref_sink (_tmp78_); #line 122 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - combo = _tmp95_; -#line 969 "AdjustDateTimeDialog.c" + combo = _tmp78_; +#line 978 "AdjustDateTimeDialog.c" { gint i = 0; #line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" i = 0; -#line 974 "AdjustDateTimeDialog.c" +#line 983 "AdjustDateTimeDialog.c" { - gboolean _tmp96_ = FALSE; + gboolean _tmp79_ = FALSE; #line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp96_ = TRUE; + _tmp79_ = TRUE; #line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" while (TRUE) { -#line 981 "AdjustDateTimeDialog.c" - gint _tmp98_; - GtkComboBoxText* _tmp99_; - gint _tmp100_; - struct tm _tmp101_ = {0}; - gchar* _tmp102_; - gchar* _tmp103_; -#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (!_tmp96_) { #line 990 "AdjustDateTimeDialog.c" - gint _tmp97_; + gint _tmp81_; + GtkComboBoxText* _tmp82_; + gint _tmp83_; + struct tm _tmp84_ = {0}; + gchar* _tmp85_; + gchar* _tmp86_; +#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" + if (!_tmp79_) { +#line 999 "AdjustDateTimeDialog.c" + gint _tmp80_; #line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp97_ = i; + _tmp80_ = i; #line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - i = _tmp97_ + 1; -#line 996 "AdjustDateTimeDialog.c" + i = _tmp80_ + 1; +#line 1005 "AdjustDateTimeDialog.c" } #line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp96_ = FALSE; + _tmp79_ = FALSE; #line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp98_ = i; + _tmp81_ = i; #line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (!(_tmp98_ < 12)) { + if (!(_tmp81_ < 12)) { #line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" break; -#line 1006 "AdjustDateTimeDialog.c" +#line 1015 "AdjustDateTimeDialog.c" } #line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp99_ = combo; + _tmp82_ = combo; #line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp100_ = i; + _tmp83_ = i; #line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_time_gm ((time_t) (_tmp100_ * 2764800), &_tmp101_); + g_time_gm ((time_t) (_tmp83_ * 2764800), &_tmp84_); #line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp102_ = g_time_format (&_tmp101_, "%B"); + _tmp85_ = g_time_format (&_tmp84_, "%B"); #line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp103_ = _tmp102_; + _tmp86_ = _tmp85_; #line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_combo_box_text_append_text (_tmp99_, _tmp103_); + gtk_combo_box_text_append_text (_tmp82_, _tmp86_); #line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_free0 (_tmp103_); -#line 1022 "AdjustDateTimeDialog.c" + _g_free0 (_tmp86_); +#line 1031 "AdjustDateTimeDialog.c" } } } #line 126 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp104_ = picker; + _tmp87_ = picker; #line 126 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp105_ = combo; + _tmp88_ = combo; #line 126 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_pack_start (_tmp104_, G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp87_, G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 128 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp106_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) (G_MAXINT >> 9), (gdouble) 1); + _tmp89_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) (G_MAXINT >> 9), (gdouble) 1); #line 128 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp106_); + g_object_ref_sink (_tmp89_); #line 128 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - spin = _tmp106_; + spin = _tmp89_; #line 129 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp107_ = picker; + _tmp90_ = picker; #line 129 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp108_ = spin; + _tmp91_ = spin; #line 129 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_pack_end (_tmp107_, G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_end (_tmp90_, G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 130 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp109_ = spin; + _tmp92_ = spin; #line 130 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp110_ = self->priv->calendar; + _tmp93_ = self->priv->calendar; #line 130 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_bind_property_with_closures (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, G_TYPE_OBJECT, GObject), "value", G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, G_TYPE_OBJECT, GObject), "year", G_BINDING_BIDIRECTIONAL, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL))); + g_object_bind_property_with_closures (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, G_TYPE_OBJECT, GObject), "value", G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, G_TYPE_OBJECT, GObject), "year", G_BINDING_BIDIRECTIONAL, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL))); #line 131 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp111_ = combo; + _tmp94_ = combo; #line 131 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp112_ = self->priv->calendar; + _tmp95_ = self->priv->calendar; #line 131 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_bind_property_with_closures (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, G_TYPE_OBJECT, GObject), "active", G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, G_TYPE_OBJECT, GObject), "month", G_BINDING_BIDIRECTIONAL, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL))); + g_object_bind_property_with_closures (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, G_TYPE_OBJECT, GObject), "active", G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, G_TYPE_OBJECT, GObject), "month", G_BINDING_BIDIRECTIONAL, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL))); #line 133 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp113_ = time_content; + _tmp96_ = time_content; #line 133 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp114_ = picker; + _tmp97_ = picker; #line 133 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_pack_start (_tmp113_, G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp96_, G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 134 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp115_ = time_content; + _tmp98_ = time_content; #line 134 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp116_ = self->priv->calendar; + _tmp99_ = self->priv->calendar; #line 134 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_pack_start (_tmp115_, G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp98_, G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); #line 135 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp117_ = time_content; + _tmp100_ = time_content; #line 135 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp118_ = clock; + _tmp101_ = clock; #line 135 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_pack_start (_tmp117_, G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); -#line 137 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp119_ = display_options; + gtk_box_pack_start (_tmp100_, G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); #line 137 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp119_) { -#line 1078 "AdjustDateTimeDialog.c" - GtkBox* _tmp120_; - GtkRadioButton* _tmp121_; - GtkBox* _tmp122_; - GtkRadioButton* _tmp123_; - GtkBox* _tmp124_; - GtkCheckButton* _tmp125_; + if (display_options) { +#line 1085 "AdjustDateTimeDialog.c" + GtkBox* _tmp102_; + GtkRadioButton* _tmp103_; + GtkBox* _tmp104_; + GtkRadioButton* _tmp105_; + GtkBox* _tmp106_; + GtkCheckButton* _tmp107_; #line 138 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp120_ = time_content; + _tmp102_ = time_content; #line 138 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp121_ = self->priv->relativity_radio_button; + _tmp103_ = self->priv->relativity_radio_button; #line 138 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_pack_start (_tmp120_, G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp102_, G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); #line 139 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp122_ = time_content; + _tmp104_ = time_content; #line 139 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp123_ = self->priv->batch_radio_button; + _tmp105_ = self->priv->batch_radio_button; #line 139 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_pack_start (_tmp122_, G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp104_, G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); #line 140 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp124_ = time_content; + _tmp106_ = time_content; #line 140 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp125_ = self->priv->modify_originals_check_button; + _tmp107_ = self->priv->modify_originals_check_button; #line 140 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_pack_start (_tmp124_, G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); -#line 1103 "AdjustDateTimeDialog.c" + gtk_box_pack_start (_tmp106_, G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); +#line 1110 "AdjustDateTimeDialog.c" } #line 143 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" preview = NULL; -#line 1107 "AdjustDateTimeDialog.c" +#line 1114 "AdjustDateTimeDialog.c" { - GdkPixbuf* _tmp126_ = NULL; - Dateable* _tmp127_; - GdkPixbuf* _tmp128_; - GdkPixbuf* _tmp129_; + GdkPixbuf* _tmp108_ = NULL; + GdkPixbuf* _tmp109_; + GdkPixbuf* _tmp110_; #line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp127_ = source; + _tmp109_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), ADJUST_DATE_TIME_DIALOG_CALENDAR_THUMBNAIL_SCALE, &_inner_error_); #line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp128_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), ADJUST_DATE_TIME_DIALOG_CALENDAR_THUMBNAIL_SCALE, &_inner_error_); -#line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp126_ = _tmp128_; + _tmp108_ = _tmp109_; #line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1121 "AdjustDateTimeDialog.c" +#line 1125 "AdjustDateTimeDialog.c" goto __catch25_g_error; } #line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp129_ = _tmp126_; + _tmp110_ = _tmp108_; #line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp126_ = NULL; + _tmp108_ = NULL; #line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_object_unref0 (preview); #line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - preview = _tmp129_; + preview = _tmp110_; #line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_object_unref0 (_tmp126_); -#line 1134 "AdjustDateTimeDialog.c" + _g_object_unref0 (_tmp108_); +#line 1138 "AdjustDateTimeDialog.c" } goto __finally25; __catch25_g_error: { GError* err = NULL; - Dateable* _tmp130_; - gchar* _tmp131_; - gchar* _tmp132_; + gchar* _tmp111_; + gchar* _tmp112_; #line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" err = _inner_error_; #line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _inner_error_ = NULL; #line 149 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp130_ = source; -#line 149 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp131_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, TYPE_DATA_OBJECT, DataObject)); + _tmp111_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 149 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp132_ = _tmp131_; + _tmp112_ = _tmp111_; #line 149 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_warning ("AdjustDateTimeDialog.vala:149: Unable to fetch preview for %s", _tmp132_); + g_warning ("AdjustDateTimeDialog.vala:149: Unable to fetch preview for %s", _tmp112_); #line 149 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_free0 (_tmp132_); + _g_free0 (_tmp112_); #line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_error_free0 (err); -#line 1159 "AdjustDateTimeDialog.c" +#line 1160 "AdjustDateTimeDialog.c" } __finally25: #line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" @@ -1178,184 +1179,178 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date g_clear_error (&_inner_error_); #line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" return NULL; -#line 1182 "AdjustDateTimeDialog.c" +#line 1183 "AdjustDateTimeDialog.c" } #line 152 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp133_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + _tmp113_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); #line 152 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp133_); + g_object_ref_sink (_tmp113_); #line 152 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - image_content = _tmp133_; + image_content = _tmp113_; #line 153 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp134_ = image_content; + _tmp114_ = image_content; #line 153 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); + gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); #line 154 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp135_ = image_content; + _tmp115_ = image_content; #line 154 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_set_homogeneous (_tmp135_, TRUE); + gtk_box_set_homogeneous (_tmp115_, TRUE); #line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp137_ = preview; + _tmp117_ = preview; #line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp137_ != NULL) { -#line 1202 "AdjustDateTimeDialog.c" - GdkPixbuf* _tmp138_; - GtkImage* _tmp139_; + if (_tmp117_ != NULL) { +#line 1203 "AdjustDateTimeDialog.c" + GdkPixbuf* _tmp118_; + GtkImage* _tmp119_; #line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp138_ = preview; + _tmp118_ = preview; #line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp139_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp138_); + _tmp119_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp118_); #line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp139_); + g_object_ref_sink (_tmp119_); #line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_object_unref0 (_tmp136_); + _g_object_unref0 (_tmp116_); #line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp136_ = _tmp139_; -#line 1215 "AdjustDateTimeDialog.c" + _tmp116_ = _tmp119_; +#line 1216 "AdjustDateTimeDialog.c" } else { - GtkImage* _tmp140_; + GtkImage* _tmp120_; #line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp140_ = (GtkImage*) gtk_image_new (); + _tmp120_ = (GtkImage*) gtk_image_new (); #line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp140_); + g_object_ref_sink (_tmp120_); #line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_object_unref0 (_tmp136_); + _g_object_unref0 (_tmp116_); #line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp136_ = _tmp140_; -#line 1226 "AdjustDateTimeDialog.c" + _tmp116_ = _tmp120_; +#line 1227 "AdjustDateTimeDialog.c" } #line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp141_ = _g_object_ref0 (_tmp136_); + _tmp121_ = _g_object_ref0 (_tmp116_); #line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - image = _tmp141_; + image = _tmp121_; #line 156 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp142_ = (GtkLabel*) gtk_label_new (NULL); + _tmp122_ = (GtkLabel*) gtk_label_new (NULL); #line 156 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp142_); + g_object_ref_sink (_tmp122_); #line 156 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_object_unref0 (self->priv->original_time_label); #line 156 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - self->priv->original_time_label = _tmp142_; + self->priv->original_time_label = _tmp122_; #line 157 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp143_ = image_content; + _tmp123_ = image_content; #line 157 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp144_ = image; + _tmp124_ = image; #line 157 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_pack_start (_tmp143_, G_TYPE_CHECK_INSTANCE_CAST (_tmp144_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp123_, G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); #line 158 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp145_ = image_content; + _tmp125_ = image_content; #line 158 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp146_ = self->priv->original_time_label; + _tmp126_ = self->priv->original_time_label; #line 158 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_pack_start (_tmp145_, G_TYPE_CHECK_INSTANCE_CAST (_tmp146_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp125_, G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); #line 160 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp147_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); + _tmp127_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); #line 160 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp147_); + g_object_ref_sink (_tmp127_); #line 160 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - hbox = _tmp147_; + hbox = _tmp127_; #line 161 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp148_ = hbox; + _tmp128_ = hbox; #line 161 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp148_, gtk_container_get_type (), GtkContainer), (guint) 3); + gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp128_, gtk_container_get_type (), GtkContainer), (guint) 3); #line 162 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp149_ = hbox; + _tmp129_ = hbox; #line 162 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp150_ = image_content; + _tmp130_ = image_content; #line 162 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_pack_start (_tmp149_, G_TYPE_CHECK_INSTANCE_CAST (_tmp150_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp129_, G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); #line 163 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp151_ = hbox; + _tmp131_ = hbox; #line 163 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp152_ = time_content; + _tmp132_ = time_content; #line 163 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_pack_start (_tmp151_, G_TYPE_CHECK_INSTANCE_CAST (_tmp152_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp131_, G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); #line 164 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp153_ = hbox; + _tmp133_ = hbox; #line 164 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp153_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); #line 165 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp154_ = hbox; + _tmp134_ = hbox; #line 165 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp154_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); + gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); #line 166 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp155_ = hbox; + _tmp135_ = hbox; #line 166 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp155_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, gtk_widget_get_type (), GtkWidget), FALSE); #line 167 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp156_ = hbox; + _tmp136_ = hbox; #line 167 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp156_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp136_, gtk_widget_get_type (), GtkWidget), FALSE); #line 169 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp157_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); + _tmp137_ = gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); #line 169 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp158_ = hbox; + _tmp138_ = hbox; #line 169 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp157_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp158_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); + gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); #line 171 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp159_ = (GtkLabel*) gtk_label_new (""); + _tmp139_ = (GtkLabel*) gtk_label_new (""); #line 171 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_ref_sink (_tmp159_); + g_object_ref_sink (_tmp139_); #line 171 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_object_unref0 (self->priv->notification); #line 171 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - self->priv->notification = _tmp159_; + self->priv->notification = _tmp139_; #line 172 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp160_ = self->priv->notification; + _tmp140_ = self->priv->notification; #line 172 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_label_set_line_wrap (_tmp160_, TRUE); + gtk_label_set_line_wrap (_tmp140_, TRUE); #line 173 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp161_ = self->priv->notification; + _tmp141_ = self->priv->notification; #line 173 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_label_set_justify (_tmp161_, GTK_JUSTIFY_CENTER); + gtk_label_set_justify (_tmp141_, GTK_JUSTIFY_CENTER); #line 175 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp162_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); + _tmp142_ = gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); #line 175 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp163_ = self->priv->notification; + _tmp143_ = self->priv->notification; #line 175 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp162_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp163_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 177 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp164_ = source; -#line 177 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp165_ = dateable_get_exposure_time (_tmp164_); -#line 177 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - self->priv->original_time = _tmp165_; + self->priv->original_time = dateable_get_exposure_time (source); #line 179 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp166_ = self->priv->original_time; + _tmp144_ = self->priv->original_time; #line 179 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp166_ == ((time_t) 0)) { -#line 1328 "AdjustDateTimeDialog.c" - time_t _tmp167_; + if (_tmp144_ == ((time_t) 0)) { +#line 1325 "AdjustDateTimeDialog.c" + time_t _tmp145_; #line 180 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp167_ = time (NULL); + _tmp145_ = time (NULL); #line 180 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - self->priv->original_time = _tmp167_; + self->priv->original_time = _tmp145_; #line 181 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" self->priv->no_original_time = TRUE; -#line 1336 "AdjustDateTimeDialog.c" +#line 1333 "AdjustDateTimeDialog.c" } #line 184 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp168_ = self->priv->original_time; + _tmp146_ = self->priv->original_time; #line 184 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_time_local (_tmp168_, &_tmp169_); + g_time_local (_tmp146_, &_tmp147_); #line 184 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - adjust_date_time_dialog_set_time (self, &_tmp169_); -#line 185 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp170_ = config_facade_get_instance (); + adjust_date_time_dialog_set_time (self, &_tmp147_); #line 185 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp171_ = _tmp170_; + _tmp148_ = config_facade_get_instance (); #line 185 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp172_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp171_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp149_ = _tmp148_; #line 185 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - adjust_date_time_dialog_set_original_time_label (self, _tmp172_); + adjust_date_time_dialog_set_original_time_label (self, configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp149_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 185 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_object_unref0 (_tmp171_); + _g_object_unref0 (_tmp149_); #line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_object_unref0 (hbox); #line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_object_unref0 (image); #line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_object_unref0 (_tmp136_); + _g_object_unref0 (_tmp116_); #line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_object_unref0 (image_content); #line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" @@ -1372,18 +1367,27 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date _g_object_unref0 (clock); #line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" return self; -#line 1376 "AdjustDateTimeDialog.c" +#line 1371 "AdjustDateTimeDialog.c" } -AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video) { +AdjustDateTimeDialog* +adjust_date_time_dialog_new (Dateable* source, + gint photo_count, + gboolean display_options, + gboolean contains_video, + gboolean only_video) +{ #line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" return adjust_date_time_dialog_construct (TYPE_ADJUST_DATE_TIME_DIALOG, source, photo_count, display_options, contains_video, only_video); -#line 1383 "AdjustDateTimeDialog.c" +#line 1384 "AdjustDateTimeDialog.c" } -static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct tm* time) { +static void +adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, + struct tm* time) +{ GtkCalendar* _tmp0_; struct tm _tmp1_; gint _tmp2_; @@ -1397,15 +1401,13 @@ static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct ConfigFacade* _tmp10_; ConfigFacade* _tmp11_; gboolean _tmp12_; - gboolean _tmp13_; - GtkSpinButton* _tmp28_; - struct tm _tmp29_; - gint _tmp30_; - GtkSpinButton* _tmp31_; - struct tm _tmp32_; - gint _tmp33_; - GtkComboBoxText* _tmp34_; - gint _tmp35_; + GtkSpinButton* _tmp27_; + struct tm _tmp28_; + gint _tmp29_; + GtkSpinButton* _tmp30_; + struct tm _tmp31_; + gint _tmp32_; + GtkComboBoxText* _tmp33_; #line 188 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self)); #line 188 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" @@ -1444,123 +1446,121 @@ static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct _tmp11_ = _tmp10_; #line 194 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _tmp12_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 194 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp13_ = _tmp12_; #line 194 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_object_unref0 (_tmp11_); #line 194 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp13_) { + if (_tmp12_) { #line 1454 "AdjustDateTimeDialog.c" - GtkComboBoxText* _tmp14_; - GtkSpinButton* _tmp15_; - struct tm _tmp16_; - gint _tmp17_; + GtkComboBoxText* _tmp13_; + GtkSpinButton* _tmp14_; + struct tm _tmp15_; + gint _tmp16_; #line 195 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp14_ = self->priv->system; + _tmp13_ = self->priv->system; #line 195 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_combo_box_get_type (), GtkComboBox), (gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_combo_box_get_type (), GtkComboBox), (gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR); #line 196 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp15_ = self->priv->hour; + _tmp14_ = self->priv->hour; #line 196 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp16_ = *time; + _tmp15_ = *time; #line 196 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp17_ = _tmp16_.tm_hour; + _tmp16_ = _tmp15_.tm_hour; #line 196 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_spin_button_set_value (_tmp15_, (gdouble) _tmp17_); + gtk_spin_button_set_value (_tmp14_, (gdouble) _tmp16_); #line 1471 "AdjustDateTimeDialog.c" } else { gint AMPM_hour = 0; - struct tm _tmp18_; - gint _tmp19_; - gint _tmp20_ = 0; - gint _tmp21_; - GtkSpinButton* _tmp23_; - AdjustDateTimeDialogTimeSystem _tmp24_ = 0; - struct tm _tmp25_; - gint _tmp26_; - GtkComboBoxText* _tmp27_; + struct tm _tmp17_; + gint _tmp18_; + gint _tmp19_ = 0; + gint _tmp20_; + GtkSpinButton* _tmp22_; + AdjustDateTimeDialogTimeSystem _tmp23_ = 0; + struct tm _tmp24_; + gint _tmp25_; + GtkComboBoxText* _tmp26_; #line 198 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp18_ = *time; + _tmp17_ = *time; #line 198 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp19_ = _tmp18_.tm_hour; + _tmp18_ = _tmp17_.tm_hour; #line 198 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - AMPM_hour = _tmp19_ % 12; + AMPM_hour = _tmp18_ % 12; #line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp21_ = AMPM_hour; + _tmp20_ = AMPM_hour; #line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp21_ == 0) { + if (_tmp20_ == 0) { #line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp20_ = 12; + _tmp19_ = 12; #line 1495 "AdjustDateTimeDialog.c" } else { - gint _tmp22_; + gint _tmp21_; #line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp22_ = AMPM_hour; + _tmp21_ = AMPM_hour; #line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp20_ = _tmp22_; + _tmp19_ = _tmp21_; #line 1502 "AdjustDateTimeDialog.c" } #line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp23_ = self->priv->hour; + _tmp22_ = self->priv->hour; #line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_spin_button_set_value (_tmp23_, (gdouble) _tmp20_); + gtk_spin_button_set_value (_tmp22_, (gdouble) _tmp19_); #line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp25_ = *time; + _tmp24_ = *time; #line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp26_ = _tmp25_.tm_hour; + _tmp25_ = _tmp24_.tm_hour; #line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp26_ >= 12) { + if (_tmp25_ >= 12) { #line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp24_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM; + _tmp23_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM; #line 1516 "AdjustDateTimeDialog.c" } else { #line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp24_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM; + _tmp23_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM; #line 1520 "AdjustDateTimeDialog.c" } #line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp27_ = self->priv->system; + _tmp26_ = self->priv->system; #line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp24_); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp23_); #line 1526 "AdjustDateTimeDialog.c" } #line 203 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp28_ = self->priv->minute; + _tmp27_ = self->priv->minute; #line 203 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp29_ = *time; + _tmp28_ = *time; #line 203 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp30_ = _tmp29_.tm_min; + _tmp29_ = _tmp28_.tm_min; #line 203 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_spin_button_set_value (_tmp28_, (gdouble) _tmp30_); + gtk_spin_button_set_value (_tmp27_, (gdouble) _tmp29_); #line 204 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp31_ = self->priv->second; + _tmp30_ = self->priv->second; #line 204 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp32_ = *time; + _tmp31_ = *time; #line 204 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp33_ = _tmp32_.tm_sec; + _tmp32_ = _tmp31_.tm_sec; #line 204 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_spin_button_set_value (_tmp31_, (gdouble) _tmp33_); + gtk_spin_button_set_value (_tmp30_, (gdouble) _tmp32_); #line 206 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp34_ = self->priv->system; + _tmp33_ = self->priv->system; #line 206 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp35_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox)); -#line 206 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) _tmp35_; -#line 1550 "AdjustDateTimeDialog.c" + self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_combo_box_get_type (), GtkComboBox)); +#line 1548 "AdjustDateTimeDialog.c" } -static void adjust_date_time_dialog_set_original_time_label (AdjustDateTimeDialog* self, gboolean use_24_hr_format) { +static void +adjust_date_time_dialog_set_original_time_label (AdjustDateTimeDialog* self, + gboolean use_24_hr_format) +{ gboolean _tmp0_; const gchar* _tmp1_ = NULL; - gboolean _tmp2_; - GtkLabel* _tmp3_; - time_t _tmp4_; - struct tm _tmp5_ = {0}; + GtkLabel* _tmp2_; + time_t _tmp3_; + struct tm _tmp4_ = {0}; + gchar* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; #line 209 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self)); #line 210 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" @@ -1572,66 +1572,61 @@ static void adjust_date_time_dialog_set_original_time_label (AdjustDateTimeDialo #line 1573 "AdjustDateTimeDialog.c" } #line 214 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp2_ = use_24_hr_format; -#line 214 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp2_) { + if (use_24_hr_format) { #line 214 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _tmp1_ = _ ("%m/%d/%Y, %H:%M:%S"); -#line 1581 "AdjustDateTimeDialog.c" +#line 1579 "AdjustDateTimeDialog.c" } else { #line 215 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _tmp1_ = _ ("%m/%d/%Y, %I:%M:%S %p"); -#line 1585 "AdjustDateTimeDialog.c" +#line 1583 "AdjustDateTimeDialog.c" } #line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp3_ = self->priv->original_time_label; + _tmp2_ = self->priv->original_time_label; #line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp4_ = self->priv->original_time; + _tmp3_ = self->priv->original_time; #line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_time_local (_tmp4_, &_tmp5_); + g_time_local (_tmp3_, &_tmp4_); #line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp6_ = g_time_format (&_tmp5_, _tmp1_); + _tmp5_ = g_time_format (&_tmp4_, _tmp1_); #line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp8_ = g_strconcat (_ ("Original: "), _tmp7_, NULL); + _tmp7_ = g_strconcat (_ ("Original: "), _tmp6_, NULL); #line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_label_set_text (_tmp3_, _tmp9_); + gtk_label_set_text (_tmp2_, _tmp8_); #line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp8_); #line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_free0 (_tmp7_); -#line 1607 "AdjustDateTimeDialog.c" + _g_free0 (_tmp6_); +#line 1605 "AdjustDateTimeDialog.c" } -static time_t adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self) { +static time_t +adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self) +{ time_t result = 0; struct tm time = {0}; GtkSpinButton* _tmp0_; - gdouble _tmp1_; - GtkSpinButton* _tmp2_; - gdouble _tmp3_; + GtkSpinButton* _tmp1_; gint hour = 0; - GtkSpinButton* _tmp4_; - gdouble _tmp5_; - gint _tmp6_ = 0; - gboolean _tmp7_ = FALSE; - gint _tmp8_; - gint _tmp12_ = 0; - GtkComboBoxText* _tmp13_; - gint _tmp14_; - gint _tmp15_; + GtkSpinButton* _tmp2_; + gint _tmp3_ = 0; + gboolean _tmp4_ = FALSE; + gint _tmp5_; + gint _tmp8_ = 0; + GtkComboBoxText* _tmp9_; + gint _tmp10_; guint year = 0U; guint month = 0U; guint day = 0U; - GtkCalendar* _tmp16_; - guint _tmp17_ = 0U; - guint _tmp18_ = 0U; - guint _tmp19_ = 0U; - time_t _tmp20_; + GtkCalendar* _tmp11_; + guint _tmp12_ = 0U; + guint _tmp13_ = 0U; + guint _tmp14_ = 0U; #line 218 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), 0); #line 219 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" @@ -1639,83 +1634,72 @@ static time_t adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self) { #line 221 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _tmp0_ = self->priv->second; #line 221 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp1_ = gtk_spin_button_get_value (_tmp0_); -#line 221 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - time.tm_sec = (gint) _tmp1_; -#line 222 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp2_ = self->priv->minute; + time.tm_sec = (gint) gtk_spin_button_get_value (_tmp0_); #line 222 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp3_ = gtk_spin_button_get_value (_tmp2_); + _tmp1_ = self->priv->minute; #line 222 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - time.tm_min = (gint) _tmp3_; + time.tm_min = (gint) gtk_spin_button_get_value (_tmp1_); #line 225 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp4_ = self->priv->hour; + _tmp2_ = self->priv->hour; #line 225 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp5_ = gtk_spin_button_get_value (_tmp4_); -#line 225 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - hour = (gint) _tmp5_; -#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp8_ = hour; + hour = (gint) gtk_spin_button_get_value (_tmp2_); #line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp8_ == 12) { -#line 1662 "AdjustDateTimeDialog.c" - GtkComboBoxText* _tmp9_; - gint _tmp10_; + _tmp5_ = hour; #line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp9_ = self->priv->system; + if (_tmp5_ == 12) { +#line 1651 "AdjustDateTimeDialog.c" + GtkComboBoxText* _tmp6_; #line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp10_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox)); + _tmp6_ = self->priv->system; #line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp7_ = _tmp10_ != ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR); -#line 1671 "AdjustDateTimeDialog.c" + _tmp4_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox)) != ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR); +#line 1657 "AdjustDateTimeDialog.c" } else { #line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp7_ = FALSE; -#line 1675 "AdjustDateTimeDialog.c" + _tmp4_ = FALSE; +#line 1661 "AdjustDateTimeDialog.c" } #line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp7_) { + if (_tmp4_) { #line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp6_ = 0; -#line 1681 "AdjustDateTimeDialog.c" + _tmp3_ = 0; +#line 1667 "AdjustDateTimeDialog.c" } else { - gint _tmp11_; + gint _tmp7_; #line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp11_ = hour; + _tmp7_ = hour; #line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp6_ = _tmp11_; -#line 1688 "AdjustDateTimeDialog.c" + _tmp3_ = _tmp7_; +#line 1674 "AdjustDateTimeDialog.c" } #line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - time.tm_hour = _tmp6_; -#line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp13_ = self->priv->system; + time.tm_hour = _tmp3_; #line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp14_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_combo_box_get_type (), GtkComboBox)); + _tmp9_ = self->priv->system; #line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp14_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM)) { + if (gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox)) == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM)) { #line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp12_ = 12; -#line 1700 "AdjustDateTimeDialog.c" + _tmp8_ = 12; +#line 1684 "AdjustDateTimeDialog.c" } else { #line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp12_ = 0; -#line 1704 "AdjustDateTimeDialog.c" + _tmp8_ = 0; +#line 1688 "AdjustDateTimeDialog.c" } #line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp15_ = time.tm_hour; + _tmp10_ = time.tm_hour; #line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - time.tm_hour = _tmp15_ + _tmp12_; + time.tm_hour = _tmp10_ + _tmp8_; #line 230 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp16_ = self->priv->calendar; + _tmp11_ = self->priv->calendar; #line 230 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_calendar_get_date (_tmp16_, &_tmp17_, &_tmp18_, &_tmp19_); + gtk_calendar_get_date (_tmp11_, &_tmp12_, &_tmp13_, &_tmp14_); #line 230 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - year = _tmp17_; + year = _tmp12_; #line 230 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - month = _tmp18_; + month = _tmp13_; #line 230 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - day = _tmp19_; + day = _tmp14_; #line 231 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" time.tm_year = ((gint) year) - ADJUST_DATE_TIME_DIALOG_YEAR_OFFSET; #line 232 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" @@ -1725,22 +1709,24 @@ static time_t adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self) { #line 235 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" time.tm_isdst = -1; #line 237 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp20_ = mktime (&time); -#line 237 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - result = _tmp20_; + result = mktime (&time); #line 237 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" return result; -#line 1734 "AdjustDateTimeDialog.c" +#line 1716 "AdjustDateTimeDialog.c" } -gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* time_shift, gboolean* keep_relativity, gboolean* modify_originals) { +gboolean +adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, + gint64* time_shift, + gboolean* keep_relativity, + gboolean* modify_originals) +{ gint64 _vala_time_shift = 0LL; gboolean _vala_keep_relativity = FALSE; gboolean _vala_modify_originals = FALSE; gboolean result = FALSE; gboolean response = FALSE; - gint _tmp0_; #line 240 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), FALSE); #line 242 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" @@ -1748,106 +1734,91 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti #line 244 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" response = FALSE; #line 246 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); -#line 246 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) { -#line 1755 "AdjustDateTimeDialog.c" - gboolean _tmp1_; - GtkRadioButton* _tmp5_; - gboolean _tmp6_; - GtkRadioButton* _tmp7_; - gboolean _tmp8_; - gboolean _tmp9_; - GtkCheckButton* _tmp13_; - gboolean _tmp14_; - GtkCheckButton* _tmp15_; - gboolean _tmp16_; - gboolean _tmp17_; + if (gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)) == ((gint) GTK_RESPONSE_OK)) { +#line 1739 "AdjustDateTimeDialog.c" + gboolean _tmp0_; + GtkRadioButton* _tmp2_; + GtkRadioButton* _tmp3_; + gboolean _tmp4_; + gboolean _tmp5_; + GtkCheckButton* _tmp9_; + GtkCheckButton* _tmp10_; + gboolean _tmp11_; + gboolean _tmp12_; #line 247 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp1_ = self->priv->no_original_time; + _tmp0_ = self->priv->no_original_time; #line 247 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp1_) { -#line 1771 "AdjustDateTimeDialog.c" - time_t _tmp2_; -#line 248 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp2_ = adjust_date_time_dialog_get_time (self); + if (_tmp0_) { #line 248 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _vala_time_shift = (gint64) _tmp2_; -#line 1777 "AdjustDateTimeDialog.c" + _vala_time_shift = (gint64) adjust_date_time_dialog_get_time (self); +#line 1755 "AdjustDateTimeDialog.c" } else { - time_t _tmp3_; - time_t _tmp4_; -#line 250 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp3_ = adjust_date_time_dialog_get_time (self); + time_t _tmp1_; #line 250 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp4_ = self->priv->original_time; + _tmp1_ = self->priv->original_time; #line 250 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _vala_time_shift = (gint64) (_tmp3_ - _tmp4_); -#line 1787 "AdjustDateTimeDialog.c" + _vala_time_shift = (gint64) (adjust_date_time_dialog_get_time (self) - _tmp1_); +#line 1762 "AdjustDateTimeDialog.c" } #line 252 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp5_ = self->priv->relativity_radio_button; + _tmp2_ = self->priv->relativity_radio_button; #line 252 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp6_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 252 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _vala_keep_relativity = _tmp6_; + _vala_keep_relativity = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 254 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp7_ = self->priv->relativity_radio_button; + _tmp3_ = self->priv->relativity_radio_button; #line 254 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp8_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget)); + _tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); #line 254 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp9_ = _tmp8_; + _tmp5_ = _tmp4_; #line 254 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp9_) { -#line 1803 "AdjustDateTimeDialog.c" - ConfigFacade* _tmp10_; - ConfigFacade* _tmp11_; - gboolean _tmp12_; + if (_tmp5_) { +#line 1776 "AdjustDateTimeDialog.c" + ConfigFacade* _tmp6_; + ConfigFacade* _tmp7_; + gboolean _tmp8_; #line 255 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp10_ = config_facade_get_instance (); + _tmp6_ = config_facade_get_instance (); #line 255 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp11_ = _tmp10_; + _tmp7_ = _tmp6_; #line 255 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp12_ = _vala_keep_relativity; + _tmp8_ = _vala_keep_relativity; #line 255 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - configuration_facade_set_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_); + configuration_facade_set_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp8_); #line 255 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_object_unref0 (_tmp11_); -#line 1817 "AdjustDateTimeDialog.c" + _g_object_unref0 (_tmp7_); +#line 1790 "AdjustDateTimeDialog.c" } #line 257 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp13_ = self->priv->modify_originals_check_button; -#line 257 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp14_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_toggle_button_get_type (), GtkToggleButton)); + _tmp9_ = self->priv->modify_originals_check_button; #line 257 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _vala_modify_originals = _tmp14_; + _vala_modify_originals = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 259 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp15_ = self->priv->modify_originals_check_button; + _tmp10_ = self->priv->modify_originals_check_button; #line 259 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp16_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget)); + _tmp11_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget)); #line 259 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp17_ = _tmp16_; + _tmp12_ = _tmp11_; #line 259 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp17_) { -#line 1833 "AdjustDateTimeDialog.c" - ConfigFacade* _tmp18_; - ConfigFacade* _tmp19_; - gboolean _tmp20_; + if (_tmp12_) { +#line 1804 "AdjustDateTimeDialog.c" + ConfigFacade* _tmp13_; + ConfigFacade* _tmp14_; + gboolean _tmp15_; #line 260 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp18_ = config_facade_get_instance (); + _tmp13_ = config_facade_get_instance (); #line 260 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp19_ = _tmp18_; + _tmp14_ = _tmp13_; #line 260 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp20_ = _vala_modify_originals; + _tmp15_ = _vala_modify_originals; #line 260 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - configuration_facade_set_modify_originals (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp20_); + configuration_facade_set_modify_originals (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp15_); #line 260 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_object_unref0 (_tmp19_); -#line 1847 "AdjustDateTimeDialog.c" + _g_object_unref0 (_tmp14_); +#line 1818 "AdjustDateTimeDialog.c" } #line 262 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" response = TRUE; -#line 1851 "AdjustDateTimeDialog.c" +#line 1822 "AdjustDateTimeDialog.c" } else { #line 264 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _vala_time_shift = (gint64) 0; @@ -1855,7 +1826,7 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti _vala_keep_relativity = TRUE; #line 266 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _vala_modify_originals = FALSE; -#line 1859 "AdjustDateTimeDialog.c" +#line 1830 "AdjustDateTimeDialog.c" } #line 269 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); @@ -1865,288 +1836,271 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti if (time_shift) { #line 271 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" *time_shift = _vala_time_shift; -#line 1869 "AdjustDateTimeDialog.c" +#line 1840 "AdjustDateTimeDialog.c" } #line 271 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" if (keep_relativity) { #line 271 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" *keep_relativity = _vala_keep_relativity; -#line 1875 "AdjustDateTimeDialog.c" +#line 1846 "AdjustDateTimeDialog.c" } #line 271 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" if (modify_originals) { #line 271 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" *modify_originals = _vala_modify_originals; -#line 1881 "AdjustDateTimeDialog.c" +#line 1852 "AdjustDateTimeDialog.c" } #line 271 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" return result; -#line 1885 "AdjustDateTimeDialog.c" +#line 1856 "AdjustDateTimeDialog.c" } -static gboolean adjust_date_time_dialog_on_spin_button_output (AdjustDateTimeDialog* self, GtkSpinButton* button) { +static gboolean +adjust_date_time_dialog_on_spin_button_output (AdjustDateTimeDialog* self, + GtkSpinButton* button) +{ gboolean result = FALSE; - GtkSpinButton* _tmp0_; - GtkSpinButton* _tmp1_; - gdouble _tmp2_; - gchar* _tmp3_; - gchar* _tmp4_; + gchar* _tmp0_; + gchar* _tmp1_; #line 274 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), FALSE); #line 274 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" g_return_val_if_fail (GTK_IS_SPIN_BUTTON (button), FALSE); #line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp0_ = button; + _tmp0_ = g_strdup_printf ("%02d", (gint) gtk_spin_button_get_value (button)); #line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp1_ = button; + _tmp1_ = _tmp0_; #line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp2_ = gtk_spin_button_get_value (_tmp1_); + gtk_entry_set_text (G_TYPE_CHECK_INSTANCE_CAST (button, gtk_entry_get_type (), GtkEntry), _tmp1_); #line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp3_ = g_strdup_printf ("%02d", (gint) _tmp2_); -#line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp4_ = _tmp3_; -#line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_entry_set_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_entry_get_type (), GtkEntry), _tmp4_); -#line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp1_); #line 277 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" adjust_date_time_dialog_on_time_changed (self); #line 279 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" result = TRUE; #line 279 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" return result; -#line 1920 "AdjustDateTimeDialog.c" +#line 1885 "AdjustDateTimeDialog.c" } -static void adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self) { +static void +adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self) +{ gint64 time_shift = 0LL; time_t _tmp0_; - time_t _tmp1_; + GtkCalendar* _tmp1_; GtkCalendar* _tmp2_; - GtkCalendar* _tmp3_; - GtkComboBoxText* _tmp4_; - gint _tmp5_; - gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; - gint64 _tmp8_; + GtkComboBoxText* _tmp3_; + gboolean _tmp4_ = FALSE; + gboolean _tmp5_ = FALSE; + gint64 _tmp6_; #line 282 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self)); #line 283 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp0_ = adjust_date_time_dialog_get_time (self); -#line 283 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp1_ = self->priv->original_time; + _tmp0_ = self->priv->original_time; #line 283 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - time_shift = ((gint64) _tmp0_) - ((gint64) _tmp1_); + time_shift = ((gint64) adjust_date_time_dialog_get_time (self)) - ((gint64) _tmp0_); #line 284 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp2_ = self->priv->calendar; + _tmp1_ = self->priv->calendar; #line 284 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_notify (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, G_TYPE_OBJECT, GObject), "year"); + g_object_notify (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_OBJECT, GObject), "year"); #line 285 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp3_ = self->priv->calendar; + _tmp2_ = self->priv->calendar; #line 285 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - g_object_notify (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_OBJECT, GObject), "month"); + g_object_notify (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, G_TYPE_OBJECT, GObject), "month"); #line 287 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp4_ = self->priv->system; -#line 287 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox)); + _tmp3_ = self->priv->system; #line 287 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) _tmp5_; + self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox)); #line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp8_ = time_shift; + _tmp6_ = time_shift; #line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp8_ == ((gint64) 0)) { + if (_tmp6_ == ((gint64) 0)) { #line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp7_ = TRUE; -#line 1963 "AdjustDateTimeDialog.c" + _tmp5_ = TRUE; +#line 1924 "AdjustDateTimeDialog.c" } else { - gboolean _tmp9_; + gboolean _tmp7_; #line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp9_ = self->priv->no_original_time; + _tmp7_ = self->priv->no_original_time; #line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp7_ = _tmp9_; -#line 1970 "AdjustDateTimeDialog.c" + _tmp5_ = _tmp7_; +#line 1931 "AdjustDateTimeDialog.c" } #line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp7_) { + if (_tmp5_) { #line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp6_ = TRUE; -#line 1976 "AdjustDateTimeDialog.c" + _tmp4_ = TRUE; +#line 1937 "AdjustDateTimeDialog.c" } else { - gboolean _tmp10_ = FALSE; - GtkRadioButton* _tmp11_; - gboolean _tmp12_; + gboolean _tmp8_ = FALSE; + GtkRadioButton* _tmp9_; #line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp11_ = self->priv->batch_radio_button; + _tmp9_ = self->priv->batch_radio_button; #line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp12_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp12_) { -#line 1987 "AdjustDateTimeDialog.c" - GtkRadioButton* _tmp13_; - gboolean _tmp14_; - gboolean _tmp15_; + if (gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton))) { +#line 1945 "AdjustDateTimeDialog.c" + GtkRadioButton* _tmp10_; + gboolean _tmp11_; + gboolean _tmp12_; #line 290 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp13_ = self->priv->batch_radio_button; + _tmp10_ = self->priv->batch_radio_button; #line 290 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp14_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget)); + _tmp11_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget)); #line 290 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp15_ = _tmp14_; + _tmp12_ = _tmp11_; #line 290 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp10_ = _tmp15_; -#line 1999 "AdjustDateTimeDialog.c" + _tmp8_ = _tmp12_; +#line 1957 "AdjustDateTimeDialog.c" } else { #line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp10_ = FALSE; -#line 2003 "AdjustDateTimeDialog.c" + _tmp8_ = FALSE; +#line 1961 "AdjustDateTimeDialog.c" } #line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp6_ = _tmp10_; -#line 2007 "AdjustDateTimeDialog.c" + _tmp4_ = _tmp8_; +#line 1965 "AdjustDateTimeDialog.c" } #line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp6_) { -#line 2011 "AdjustDateTimeDialog.c" - GtkLabel* _tmp16_; + if (_tmp4_) { +#line 1969 "AdjustDateTimeDialog.c" + GtkLabel* _tmp13_; #line 291 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp16_ = self->priv->notification; + _tmp13_ = self->priv->notification; #line 291 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget)); -#line 2017 "AdjustDateTimeDialog.c" + gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget)); +#line 1975 "AdjustDateTimeDialog.c" } else { gboolean forward = FALSE; - gint64 _tmp17_; + gint64 _tmp14_; gint days = 0; gint hours = 0; gint minutes = 0; gint seconds = 0; + gint64 _tmp15_; + gint64 _tmp16_; + gint64 _tmp17_; gint64 _tmp18_; gint64 _tmp19_; gint64 _tmp20_; gint64 _tmp21_; - gint64 _tmp22_; - gint64 _tmp23_; - gint64 _tmp24_; - gint64 _tmp25_; - const gchar* _tmp26_ = NULL; - gboolean _tmp27_; + const gchar* _tmp22_ = NULL; + gboolean _tmp23_; gchar* shift_status = NULL; - gchar* _tmp28_; - GtkLabel* _tmp29_; - const gchar* _tmp30_; + gchar* _tmp24_; + GtkLabel* _tmp25_; + const gchar* _tmp26_; + gint _tmp27_; + gint _tmp28_; + gint _tmp29_; + gint _tmp30_; gint _tmp31_; gint _tmp32_; gint _tmp33_; gint _tmp34_; - gint _tmp35_; - gint _tmp36_; - gint _tmp37_; - gint _tmp38_; - gchar* _tmp39_; - gchar* _tmp40_; - GtkLabel* _tmp41_; + gchar* _tmp35_; + gchar* _tmp36_; + GtkLabel* _tmp37_; #line 293 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp17_ = time_shift; + _tmp14_ = time_shift; #line 293 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - forward = _tmp17_ > ((gint64) 0); -#line 296 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp18_ = time_shift; + forward = _tmp14_ > ((gint64) 0); #line 296 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp19_ = llabs (_tmp18_); + _tmp15_ = time_shift; #line 296 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - time_shift = _tmp19_; + time_shift = llabs (_tmp15_); #line 298 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp20_ = time_shift; + _tmp16_ = time_shift; #line 298 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - days = (gint) (_tmp20_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY); + days = (gint) (_tmp16_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY); #line 299 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp21_ = time_shift; + _tmp17_ = time_shift; #line 299 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - time_shift = _tmp21_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY; + time_shift = _tmp17_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY; #line 300 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp22_ = time_shift; + _tmp18_ = time_shift; #line 300 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - hours = (gint) (_tmp22_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR); + hours = (gint) (_tmp18_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR); #line 301 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp23_ = time_shift; + _tmp19_ = time_shift; #line 301 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - time_shift = _tmp23_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR; + time_shift = _tmp19_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR; #line 302 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp24_ = time_shift; + _tmp20_ = time_shift; #line 302 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - minutes = (gint) (_tmp24_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE); + minutes = (gint) (_tmp20_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE); #line 303 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp25_ = time_shift; + _tmp21_ = time_shift; #line 303 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - seconds = (gint) (_tmp25_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE); + seconds = (gint) (_tmp21_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE); #line 305 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp27_ = forward; + _tmp23_ = forward; #line 305 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp27_) { + if (_tmp23_) { #line 306 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp26_ = _ ("Exposure time will be shifted forward by\n" \ + _tmp22_ = _ ("Exposure time will be shifted forward by\n" \ "%d %s, %d %s, %d %s, and %d %s."); -#line 2090 "AdjustDateTimeDialog.c" +#line 2045 "AdjustDateTimeDialog.c" } else { #line 307 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp26_ = _ ("Exposure time will be shifted backward by\n" \ + _tmp22_ = _ ("Exposure time will be shifted backward by\n" \ "%d %s, %d %s, %d %s, and %d %s."); -#line 2094 "AdjustDateTimeDialog.c" +#line 2049 "AdjustDateTimeDialog.c" } #line 305 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp28_ = g_strdup (_tmp26_); + _tmp24_ = g_strdup (_tmp22_); #line 305 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - shift_status = _tmp28_; + shift_status = _tmp24_; #line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp29_ = self->priv->notification; + _tmp25_ = self->priv->notification; #line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp30_ = shift_status; + _tmp26_ = shift_status; #line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp31_ = days; + _tmp27_ = days; #line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp32_ = days; + _tmp28_ = days; #line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp33_ = hours; + _tmp29_ = hours; #line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp34_ = hours; + _tmp30_ = hours; #line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp35_ = minutes; + _tmp31_ = minutes; #line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp36_ = minutes; + _tmp32_ = minutes; #line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp37_ = seconds; + _tmp33_ = seconds; #line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp38_ = seconds; + _tmp34_ = seconds; #line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp39_ = g_strdup_printf (_tmp30_, _tmp31_, ngettext ("day", "days", (gulong) _tmp32_), _tmp33_, ngettext ("hour", "hours", (gulong) _tmp34_), _tmp35_, ngettext ("minute", "minutes", (gulong) _tmp36_), _tmp37_, ngettext ("second", "seconds", (gulong) _tmp38_)); + _tmp35_ = g_strdup_printf (_tmp26_, _tmp27_, ngettext ("day", "days", (gulong) _tmp28_), _tmp29_, ngettext ("hour", "hours", (gulong) _tmp30_), _tmp31_, ngettext ("minute", "minutes", (gulong) _tmp32_), _tmp33_, ngettext ("second", "seconds", (gulong) _tmp34_)); #line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp40_ = _tmp39_; + _tmp36_ = _tmp35_; #line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_label_set_text (_tmp29_, _tmp40_); + gtk_label_set_text (_tmp25_, _tmp36_); #line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_free0 (_tmp40_); + _g_free0 (_tmp36_); #line 314 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp41_ = self->priv->notification; + _tmp37_ = self->priv->notification; #line 314 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget)); #line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _g_free0 (shift_status); -#line 2134 "AdjustDateTimeDialog.c" +#line 2089 "AdjustDateTimeDialog.c" } } -static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog* self) { +static void +adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog* self) +{ AdjustDateTimeDialogTimeSystem _tmp0_; GtkComboBoxText* _tmp1_; - gint _tmp2_; + ConfigFacade* _tmp2_; ConfigFacade* _tmp3_; - ConfigFacade* _tmp4_; + GtkComboBoxText* _tmp4_; GtkComboBoxText* _tmp5_; - gint _tmp6_; - GtkComboBoxText* _tmp7_; - gint _tmp8_; #line 318 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self)); #line 319 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" @@ -2154,161 +2108,152 @@ static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog #line 319 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" _tmp1_ = self->priv->system; #line 319 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); -#line 319 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp0_ == _tmp2_) { + if (_tmp0_ == gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox))) { #line 320 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" return; -#line 2161 "AdjustDateTimeDialog.c" +#line 2113 "AdjustDateTimeDialog.c" } #line 322 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp3_ = config_facade_get_instance (); -#line 322 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp4_ = _tmp3_; + _tmp2_ = config_facade_get_instance (); #line 322 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp5_ = self->priv->system; + _tmp3_ = _tmp2_; #line 322 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp6_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox)); + _tmp4_ = self->priv->system; #line 322 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - configuration_facade_set_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR)); + configuration_facade_set_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox)) == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR)); #line 322 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _g_object_unref0 (_tmp4_); -#line 324 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp7_ = self->priv->system; + _g_object_unref0 (_tmp3_); #line 324 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp8_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox)); + _tmp5_ = self->priv->system; #line 324 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp8_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR)) { -#line 2181 "AdjustDateTimeDialog.c" - gint _tmp9_ = 0; - GtkSpinButton* _tmp10_; - gdouble _tmp11_; + if (gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox)) == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR)) { +#line 2129 "AdjustDateTimeDialog.c" + gint _tmp6_ = 0; + GtkSpinButton* _tmp7_; gint time = 0; - gint _tmp14_ = 0; - AdjustDateTimeDialogTimeSystem _tmp15_; - gint _tmp16_; - GtkSpinButton* _tmp17_; - GtkSpinButton* _tmp18_; - gint _tmp19_; -#line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp10_ = self->priv->hour; + gint _tmp9_ = 0; + AdjustDateTimeDialogTimeSystem _tmp10_; + gint _tmp11_; + GtkSpinButton* _tmp12_; + GtkSpinButton* _tmp13_; + gint _tmp14_; #line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp11_ = gtk_spin_button_get_value (_tmp10_); + _tmp7_ = self->priv->hour; #line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp11_ == 12.0) { + if (gtk_spin_button_get_value (_tmp7_) == 12.0) { #line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp9_ = 0; -#line 2200 "AdjustDateTimeDialog.c" + _tmp6_ = 0; +#line 2145 "AdjustDateTimeDialog.c" } else { - GtkSpinButton* _tmp12_; - gdouble _tmp13_; -#line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp12_ = self->priv->hour; + GtkSpinButton* _tmp8_; #line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp13_ = gtk_spin_button_get_value (_tmp12_); + _tmp8_ = self->priv->hour; #line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp9_ = (gint) _tmp13_; -#line 2210 "AdjustDateTimeDialog.c" + _tmp6_ = (gint) gtk_spin_button_get_value (_tmp8_); +#line 2152 "AdjustDateTimeDialog.c" } #line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - time = _tmp9_; + time = _tmp6_; #line 326 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp15_ = self->priv->previous_time_system; + _tmp10_ = self->priv->previous_time_system; #line 326 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp15_ == ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM) { + if (_tmp10_ == ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM) { #line 326 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp14_ = 12; -#line 2220 "AdjustDateTimeDialog.c" + _tmp9_ = 12; +#line 2162 "AdjustDateTimeDialog.c" } else { #line 326 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp14_ = 0; -#line 2224 "AdjustDateTimeDialog.c" + _tmp9_ = 0; +#line 2166 "AdjustDateTimeDialog.c" } #line 326 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp16_ = time; + _tmp11_ = time; #line 326 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - time = _tmp16_ + _tmp14_; + time = _tmp11_ + _tmp9_; #line 328 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp17_ = self->priv->hour; + _tmp12_ = self->priv->hour; #line 328 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_spin_button_set_range (_tmp17_, (gdouble) 0, (gdouble) 23); + gtk_spin_button_set_range (_tmp12_, (gdouble) 0, (gdouble) 23); #line 329 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" adjust_date_time_dialog_set_original_time_label (self, TRUE); #line 331 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp18_ = self->priv->hour; + _tmp13_ = self->priv->hour; #line 331 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp19_ = time; + _tmp14_ = time; #line 331 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_spin_button_set_value (_tmp18_, (gdouble) _tmp19_); -#line 2242 "AdjustDateTimeDialog.c" + gtk_spin_button_set_value (_tmp13_, (gdouble) _tmp14_); +#line 2184 "AdjustDateTimeDialog.c" } else { gint AMPM_hour = 0; + GtkSpinButton* _tmp15_; + GtkSpinButton* _tmp16_; + gint _tmp17_ = 0; + gint _tmp18_; GtkSpinButton* _tmp20_; - gdouble _tmp21_; - GtkSpinButton* _tmp22_; - gint _tmp23_ = 0; - gint _tmp24_; - GtkSpinButton* _tmp26_; #line 333 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp20_ = self->priv->hour; -#line 333 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp21_ = gtk_spin_button_get_value (_tmp20_); + _tmp15_ = self->priv->hour; #line 333 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - AMPM_hour = ((gint) _tmp21_) % 12; + AMPM_hour = ((gint) gtk_spin_button_get_value (_tmp15_)) % 12; #line 335 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp22_ = self->priv->hour; + _tmp16_ = self->priv->hour; #line 335 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_spin_button_set_range (_tmp22_, (gdouble) 1, (gdouble) 12); + gtk_spin_button_set_range (_tmp16_, (gdouble) 1, (gdouble) 12); #line 336 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" adjust_date_time_dialog_set_original_time_label (self, FALSE); #line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp24_ = AMPM_hour; + _tmp18_ = AMPM_hour; #line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - if (_tmp24_ == 0) { + if (_tmp18_ == 0) { #line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp23_ = 12; -#line 2269 "AdjustDateTimeDialog.c" + _tmp17_ = 12; +#line 2208 "AdjustDateTimeDialog.c" } else { - gint _tmp25_; + gint _tmp19_; #line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp25_ = AMPM_hour; + _tmp19_ = AMPM_hour; #line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp23_ = _tmp25_; -#line 2276 "AdjustDateTimeDialog.c" + _tmp17_ = _tmp19_; +#line 2215 "AdjustDateTimeDialog.c" } #line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - _tmp26_ = self->priv->hour; + _tmp20_ = self->priv->hour; #line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" - gtk_spin_button_set_value (_tmp26_, (gdouble) _tmp23_); -#line 2282 "AdjustDateTimeDialog.c" + gtk_spin_button_set_value (_tmp20_, (gdouble) _tmp17_); +#line 2221 "AdjustDateTimeDialog.c" } #line 341 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" adjust_date_time_dialog_on_time_changed (self); -#line 2286 "AdjustDateTimeDialog.c" +#line 2225 "AdjustDateTimeDialog.c" } -static void adjust_date_time_dialog_class_init (AdjustDateTimeDialogClass * klass) { +static void +adjust_date_time_dialog_class_init (AdjustDateTimeDialogClass * klass) +{ #line 8 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" adjust_date_time_dialog_parent_class = g_type_class_peek_parent (klass); #line 8 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" g_type_class_add_private (klass, sizeof (AdjustDateTimeDialogPrivate)); #line 8 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" G_OBJECT_CLASS (klass)->finalize = adjust_date_time_dialog_finalize; -#line 2297 "AdjustDateTimeDialog.c" +#line 2238 "AdjustDateTimeDialog.c" } -static void adjust_date_time_dialog_instance_init (AdjustDateTimeDialog * self) { +static void +adjust_date_time_dialog_instance_init (AdjustDateTimeDialog * self) +{ #line 8 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" self->priv = ADJUST_DATE_TIME_DIALOG_GET_PRIVATE (self); #line 13 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" self->priv->no_original_time = FALSE; -#line 2306 "AdjustDateTimeDialog.c" +#line 2249 "AdjustDateTimeDialog.c" } -static void adjust_date_time_dialog_finalize (GObject * obj) { +static void +adjust_date_time_dialog_finalize (GObject * obj) +{ AdjustDateTimeDialog * self; #line 8 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_DATE_TIME_DIALOG, AdjustDateTimeDialog); @@ -2334,11 +2279,13 @@ static void adjust_date_time_dialog_finalize (GObject * obj) { _g_object_unref0 (self->priv->notification); #line 8 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala" G_OBJECT_CLASS (adjust_date_time_dialog_parent_class)->finalize (obj); -#line 2336 "AdjustDateTimeDialog.c" +#line 2281 "AdjustDateTimeDialog.c" } -GType adjust_date_time_dialog_get_type (void) { +GType +adjust_date_time_dialog_get_type (void) +{ static volatile gsize adjust_date_time_dialog_type_id__volatile = 0; if (g_once_init_enter (&adjust_date_time_dialog_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (AdjustDateTimeDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) adjust_date_time_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (AdjustDateTimeDialog), 0, (GInstanceInitFunc) adjust_date_time_dialog_instance_init, NULL }; diff --git a/src/dialogs/EntryMultiCompletion.c b/src/dialogs/EntryMultiCompletion.c index 9dd3cd1..4006725 100644 --- a/src/dialogs/EntryMultiCompletion.c +++ b/src/dialogs/EntryMultiCompletion.c @@ -1,4 +1,4 @@ -/* EntryMultiCompletion.c generated by valac 0.36.6, the Vala compiler +/* EntryMultiCompletion.c generated by valac 0.40.4, the Vala compiler * generated from EntryMultiCompletion.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -10,6 +10,7 @@ /* Entry completion for values separated by separators (e.g. comma in the case of tags)*/ /* Partly inspired by the class of the same name in gtkmm-utils by Marko Anastasov*/ + #include #include #include @@ -28,6 +29,11 @@ typedef struct _EntryMultiCompletion EntryMultiCompletion; typedef struct _EntryMultiCompletionClass EntryMultiCompletionClass; typedef struct _EntryMultiCompletionPrivate EntryMultiCompletionPrivate; +enum { + ENTRY_MULTI_COMPLETION_0_PROPERTY, + ENTRY_MULTI_COMPLETION_NUM_PROPERTIES +}; +static GParamSpec* entry_multi_completion_properties[ENTRY_MULTI_COMPLETION_NUM_PROPERTIES]; #define _g_free0(var) (var = (g_free (var), NULL)) #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); @@ -53,110 +59,124 @@ static gpointer entry_multi_completion_parent_class = NULL; GType entry_multi_completion_get_type (void) G_GNUC_CONST; #define ENTRY_MULTI_COMPLETION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletionPrivate)) -enum { - ENTRY_MULTI_COMPLETION_DUMMY_PROPERTY -}; -EntryMultiCompletion* entry_multi_completion_new (GeeCollection* completion_list, const gchar* delimiter); -EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCollection* completion_list, const gchar* delimiter); +EntryMultiCompletion* entry_multi_completion_new (GeeCollection* completion_list, + const gchar* delimiter); +EntryMultiCompletion* entry_multi_completion_construct (GType object_type, + GeeCollection* completion_list, + const gchar* delimiter); static GtkListStore* entry_multi_completion_create_completion_store (GeeCollection* completion_list); -static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter); -static gboolean _entry_multi_completion_match_func_gtk_entry_completion_match_func (GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter, gpointer self); -static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar* delimiter); -static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion* base, GtkTreeModel* model, GtkTreeIter* iter); +static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, + GtkEntryCompletion* completion, + const gchar* key, + GtkTreeIter* iter); +static gboolean _entry_multi_completion_match_func_gtk_entry_completion_match_func (GtkEntryCompletion* completion, + const gchar* key, + GtkTreeIter* iter, + gpointer self); +static gchar* entry_multi_completion_get_last_part (const gchar* s, + const gchar* delimiter); +static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion* base, + GtkTreeModel* model, + GtkTreeIter* iter); static void entry_multi_completion_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); -static gboolean _entry_multi_completion_match_func_gtk_entry_completion_match_func (GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter, gpointer self) { +static gboolean +_entry_multi_completion_match_func_gtk_entry_completion_match_func (GtkEntryCompletion* completion, + const gchar* key, + GtkTreeIter* iter, + gpointer self) +{ gboolean result; result = entry_multi_completion_match_func ((EntryMultiCompletion*) self, completion, key, iter); #line 19 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" return result; -#line 78 "EntryMultiCompletion.c" +#line 102 "EntryMultiCompletion.c" } -EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCollection* completion_list, const gchar* delimiter) { +EntryMultiCompletion* +entry_multi_completion_construct (GType object_type, + GeeCollection* completion_list, + const gchar* delimiter) +{ EntryMultiCompletion * self = NULL; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_; - const gchar* _tmp5_; - gchar* _tmp6_; - GeeCollection* _tmp7_; - GtkListStore* _tmp8_; - GtkListStore* _tmp9_; + gchar* _tmp3_; + GtkListStore* _tmp4_; + GtkListStore* _tmp5_; #line 13 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" g_return_val_if_fail (GEE_IS_COLLECTION (completion_list), NULL); #line 13 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" self = (EntryMultiCompletion*) g_object_new (object_type, NULL); #line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp1_ = delimiter; -#line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - if (_tmp1_ == NULL) { + if (delimiter == NULL) { #line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" _tmp0_ = TRUE; -#line 101 "EntryMultiCompletion.c" +#line 124 "EntryMultiCompletion.c" } else { - const gchar* _tmp2_; - gint _tmp3_; - gint _tmp4_; -#line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp2_ = delimiter; + gint _tmp1_; + gint _tmp2_; #line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp3_ = strlen (_tmp2_); + _tmp1_ = strlen (delimiter); #line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp0_ = _tmp4_ == 1; -#line 114 "EntryMultiCompletion.c" + _tmp0_ = _tmp2_ == 1; +#line 134 "EntryMultiCompletion.c" } #line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" _vala_assert (_tmp0_, "delimiter == null || delimiter.length == 1"); #line 15 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp5_ = delimiter; -#line 15 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp6_ = g_strdup (_tmp5_); + _tmp3_ = g_strdup (delimiter); #line 15 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" _g_free0 (self->priv->delimiter); #line 15 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - self->priv->delimiter = _tmp6_; + self->priv->delimiter = _tmp3_; #line 17 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp7_ = completion_list; + _tmp4_ = entry_multi_completion_create_completion_store (completion_list); #line 17 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp8_ = entry_multi_completion_create_completion_store (_tmp7_); + _tmp5_ = _tmp4_; #line 17 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp9_ = _tmp8_; + gtk_entry_completion_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_tree_model_get_type (), GtkTreeModel)); #line 17 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - gtk_entry_completion_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_TREE_MODEL, GtkTreeModel)); -#line 17 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp5_); #line 18 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" gtk_entry_completion_set_text_column (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), 0); #line 19 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" gtk_entry_completion_set_match_func (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), _entry_multi_completion_match_func_gtk_entry_completion_match_func, g_object_ref (self), g_object_unref); #line 13 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" return self; -#line 142 "EntryMultiCompletion.c" +#line 158 "EntryMultiCompletion.c" } -EntryMultiCompletion* entry_multi_completion_new (GeeCollection* completion_list, const gchar* delimiter) { +EntryMultiCompletion* +entry_multi_completion_new (GeeCollection* completion_list, + const gchar* delimiter) +{ #line 13 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" return entry_multi_completion_construct (TYPE_ENTRY_MULTI_COMPLETION, completion_list, delimiter); -#line 149 "EntryMultiCompletion.c" +#line 168 "EntryMultiCompletion.c" } -static GtkListStore* entry_multi_completion_create_completion_store (GeeCollection* completion_list) { +static GtkListStore* +entry_multi_completion_create_completion_store (GeeCollection* completion_list) +{ GtkListStore* result = NULL; GtkListStore* completion_store = NULL; GtkListStore* _tmp0_; GtkTreeIter store_iter = {0}; GeeIterator* completion_iter = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp1_; #line 22 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" g_return_val_if_fail (GEE_IS_COLLECTION (completion_list), NULL); #line 23 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" @@ -164,54 +184,49 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti #line 23 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" completion_store = _tmp0_; #line 25 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp1_ = completion_list; -#line 25 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (completion_list, GEE_TYPE_ITERABLE, GeeIterable)); #line 25 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - completion_iter = _tmp2_; + completion_iter = _tmp1_; #line 26 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" while (TRUE) { -#line 175 "EntryMultiCompletion.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 193 "EntryMultiCompletion.c" + GeeIterator* _tmp2_; + GtkListStore* _tmp3_; + GtkTreeIter _tmp4_ = {0}; GtkListStore* _tmp5_; - GtkTreeIter _tmp6_ = {0}; - GtkListStore* _tmp7_; - GtkTreeIter _tmp8_; - GeeIterator* _tmp9_; - gpointer _tmp10_; - gchar* _tmp11_; + GtkTreeIter _tmp6_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + gchar* _tmp9_; #line 26 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp3_ = completion_iter; + _tmp2_ = completion_iter; #line 26 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp4_ = gee_iterator_next (_tmp3_); -#line 26 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 26 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" break; -#line 193 "EntryMultiCompletion.c" +#line 208 "EntryMultiCompletion.c" } #line 27 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp5_ = completion_store; + _tmp3_ = completion_store; #line 27 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - gtk_list_store_append (_tmp5_, &_tmp6_); + gtk_list_store_append (_tmp3_, &_tmp4_); #line 27 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - store_iter = _tmp6_; + store_iter = _tmp4_; #line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp7_ = completion_store; + _tmp5_ = completion_store; #line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp8_ = store_iter; + _tmp6_ = store_iter; #line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp9_ = completion_iter; + _tmp7_ = completion_iter; #line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp11_ = (gchar*) _tmp10_; + _tmp9_ = (gchar*) _tmp8_; #line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - gtk_list_store_set (_tmp7_, &_tmp8_, 0, _tmp11_, -1, -1); + gtk_list_store_set (_tmp5_, &_tmp6_, 0, _tmp9_, -1, -1); #line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _g_free0 (_tmp11_); -#line 215 "EntryMultiCompletion.c" + _g_free0 (_tmp9_); +#line 230 "EntryMultiCompletion.c" } #line 31 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" result = completion_store; @@ -219,135 +234,140 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti _g_object_unref0 (completion_iter); #line 31 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" return result; -#line 223 "EntryMultiCompletion.c" +#line 238 "EntryMultiCompletion.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 35 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" return self ? g_object_ref (self) : NULL; -#line 230 "EntryMultiCompletion.c" +#line 247 "EntryMultiCompletion.c" } -static gchar* string_strip (const gchar* self) { +static gchar* +string_strip (const gchar* self) +{ gchar* result = NULL; gchar* _result_ = NULL; gchar* _tmp0_; const gchar* _tmp1_; -#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1248 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _result_; -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 253 "EntryMultiCompletion.c" +#line 272 "EntryMultiCompletion.c" } -static gboolean string_contains (const gchar* self, const gchar* needle) { +static gboolean +string_contains (const gchar* self, + const gchar* needle) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gchar* _tmp1_; -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = needle; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_ != NULL; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = strstr ((gchar*) self, (gchar*) needle); +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_ != NULL; +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 273 "EntryMultiCompletion.c" +#line 292 "EntryMultiCompletion.c" } -static gint string_last_index_of_char (const gchar* self, gunichar c, gint start_index) { +static gint +string_last_index_of_char (const gchar* self, + gunichar c, + gint start_index) +{ gint result = 0; gchar* _result_ = NULL; - gint _tmp0_; - gunichar _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1041 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; + gchar* _tmp1_; +#line 1055 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = start_index; -#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = c; -#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_); -#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _result_ = _tmp2_; -#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = _result_; -#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ != NULL) { -#line 298 "EntryMultiCompletion.c" - gchar* _tmp4_; -#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = _result_; -#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1056 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_utf8_strrchr (((gchar*) self) + start_index, (gssize) -1, c); +#line 1056 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _result_ = _tmp0_; +#line 1058 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = _result_; +#line 1058 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ != NULL) { +#line 315 "EntryMultiCompletion.c" + gchar* _tmp2_; +#line 1059 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _result_; +#line 1059 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (gint) (_tmp2_ - ((gchar*) self)); +#line 1059 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 306 "EntryMultiCompletion.c" +#line 323 "EntryMultiCompletion.c" } else { -#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = -1; -#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 312 "EntryMultiCompletion.c" +#line 329 "EntryMultiCompletion.c" } } -static gchar string_get (const gchar* self, glong index) { +static gchar +string_get (const gchar* self, + glong index) +{ gchar result = '\0'; - glong _tmp0_; - gchar _tmp1_; -#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar _tmp0_; +#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = index; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = ((gchar*) self)[index]; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 331 "EntryMultiCompletion.c" +#line 348 "EntryMultiCompletion.c" } -static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter) { +static gboolean +entry_multi_completion_match_func (EntryMultiCompletion* self, + GtkEntryCompletion* completion, + const gchar* key, + GtkTreeIter* iter) +{ gboolean result = FALSE; GtkTreeModel* model = NULL; - GtkEntryCompletion* _tmp0_; + GtkTreeModel* _tmp0_; GtkTreeModel* _tmp1_; - GtkTreeModel* _tmp2_; gchar* possible_match = NULL; - GtkTreeModel* _tmp3_; - GtkTreeIter _tmp4_; - const gchar* _tmp5_; + GtkTreeModel* _tmp2_; + GtkTreeIter _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; - gchar* _tmp8_; gchar* normed_key = NULL; + gchar* _tmp8_; const gchar* _tmp9_; - gchar* _tmp10_; - const gchar* _tmp11_; #line 34 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" g_return_val_if_fail (IS_ENTRY_MULTI_COMPLETION (self), FALSE); #line 34 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" @@ -357,66 +377,59 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G #line 34 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" g_return_val_if_fail (iter != NULL, FALSE); #line 35 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp0_ = completion; -#line 35 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp1_ = gtk_entry_completion_get_model (_tmp0_); + _tmp0_ = gtk_entry_completion_get_model (completion); #line 35 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 35 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - model = _tmp2_; + model = _tmp1_; #line 37 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp3_ = model; + _tmp2_ = model; #line 37 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp4_ = *iter; + _tmp3_ = *iter; #line 37 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - gtk_tree_model_get (_tmp3_, &_tmp4_, 0, &possible_match, -1); + gtk_tree_model_get (_tmp2_, &_tmp3_, 0, &possible_match, -1); #line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp5_ = possible_match; + _tmp4_ = possible_match; #line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp6_ = g_utf8_casefold (_tmp5_, (gssize) -1); + _tmp5_ = g_utf8_casefold (_tmp4_, (gssize) -1); #line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp8_ = g_utf8_normalize (_tmp7_, (gssize) -1, G_NORMALIZE_ALL_COMPOSE); + _tmp7_ = g_utf8_normalize (_tmp6_, (gssize) -1, G_NORMALIZE_ALL_COMPOSE); #line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" _g_free0 (possible_match); #line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - possible_match = _tmp8_; + possible_match = _tmp7_; #line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 44 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp9_ = key; + _tmp8_ = g_utf8_normalize (key, (gssize) -1, G_NORMALIZE_ALL_COMPOSE); #line 44 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp10_ = g_utf8_normalize (_tmp9_, (gssize) -1, G_NORMALIZE_ALL_COMPOSE); -#line 44 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - normed_key = _tmp10_; + normed_key = _tmp8_; #line 46 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp11_ = self->priv->delimiter; + _tmp9_ = self->priv->delimiter; #line 46 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - if (_tmp11_ == NULL) { -#line 398 "EntryMultiCompletion.c" - const gchar* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; - gboolean _tmp16_; - gboolean _tmp17_; -#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp12_ = possible_match; + if (_tmp9_ == NULL) { +#line 414 "EntryMultiCompletion.c" + const gchar* _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gboolean _tmp14_; #line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp13_ = normed_key; + _tmp10_ = possible_match; #line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp14_ = string_strip (_tmp13_); + _tmp11_ = normed_key; #line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp15_ = _tmp14_; + _tmp12_ = string_strip (_tmp11_); #line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp16_ = g_str_has_prefix (_tmp12_, _tmp15_); + _tmp13_ = _tmp12_; #line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp17_ = _tmp16_; + _tmp14_ = g_str_has_prefix (_tmp10_, _tmp13_); #line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp13_); #line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - result = _tmp17_; + result = _tmp14_; #line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" _g_free0 (normed_key); #line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" @@ -425,74 +438,58 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G _g_object_unref0 (model); #line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" return result; -#line 429 "EntryMultiCompletion.c" +#line 442 "EntryMultiCompletion.c" } else { - const gchar* _tmp18_; - const gchar* _tmp19_; - gboolean _tmp20_; + const gchar* _tmp15_; + const gchar* _tmp16_; gchar* last_part = NULL; - const gchar* _tmp31_; - gchar* _tmp32_; - gchar* _tmp33_; - const gchar* _tmp34_; + const gchar* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; + const gchar* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + const gchar* _tmp29_; + gint _tmp30_; + gint _tmp31_; + const gchar* _tmp32_; + const gchar* _tmp33_; + gchar* _tmp34_; gchar* _tmp35_; - gchar* _tmp36_; - const gchar* _tmp37_; - gint _tmp38_; - gint _tmp39_; - const gchar* _tmp40_; - const gchar* _tmp41_; - gchar* _tmp42_; - gchar* _tmp43_; - gboolean _tmp44_; - gboolean _tmp45_; -#line 49 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp18_ = normed_key; + gboolean _tmp36_; #line 49 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp19_ = self->priv->delimiter; + _tmp15_ = normed_key; #line 49 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp20_ = string_contains (_tmp18_, _tmp19_); + _tmp16_ = self->priv->delimiter; #line 49 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - if (_tmp20_) { -#line 458 "EntryMultiCompletion.c" + if (string_contains (_tmp15_, _tmp16_)) { +#line 467 "EntryMultiCompletion.c" gint offset = 0; - const gchar* _tmp21_; - const gchar* _tmp22_; - const gchar* _tmp23_; - gchar _tmp24_; - gint _tmp25_; - gint _tmp26_; + const gchar* _tmp17_; + const gchar* _tmp18_; + const gchar* _tmp19_; gint position = 0; - GtkWidget* _tmp27_; - gint _tmp28_; - gint _tmp29_; - gint _tmp30_; -#line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp21_ = normed_key; -#line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp22_ = normed_key; + GtkWidget* _tmp20_; + gint _tmp21_; + gint _tmp22_; #line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp23_ = self->priv->delimiter; + _tmp17_ = normed_key; #line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp24_ = string_get (_tmp23_, (glong) 0); + _tmp18_ = normed_key; #line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp25_ = string_last_index_of_char (_tmp22_, (gunichar) _tmp24_, 0); + _tmp19_ = self->priv->delimiter; #line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp26_ = g_utf8_strlen (_tmp21_, (gssize) _tmp25_); -#line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - offset = _tmp26_; -#line 52 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp27_ = gtk_entry_completion_get_entry (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion)); + offset = g_utf8_strlen (_tmp17_, (gssize) string_last_index_of_char (_tmp18_, (gunichar) string_get (_tmp19_, (glong) 0), 0)); #line 52 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp28_ = gtk_editable_get_position (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_entry_get_type (), GtkEntry), GTK_TYPE_EDITABLE, GtkEditable)); + _tmp20_ = gtk_entry_completion_get_entry (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion)); #line 52 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - position = _tmp28_; + position = gtk_editable_get_position (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_entry_get_type (), GtkEntry), gtk_editable_get_type (), GtkEditable)); #line 53 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp29_ = position; + _tmp21_ = position; #line 53 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp30_ = offset; + _tmp22_ = offset; #line 53 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - if (_tmp29_ <= _tmp30_) { + if (_tmp21_ <= _tmp22_) { #line 54 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" result = FALSE; #line 54 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" @@ -503,33 +500,33 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G _g_object_unref0 (model); #line 54 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" return result; -#line 507 "EntryMultiCompletion.c" +#line 504 "EntryMultiCompletion.c" } } #line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp31_ = normed_key; + _tmp23_ = normed_key; #line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp32_ = string_strip (_tmp31_); + _tmp24_ = string_strip (_tmp23_); #line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp33_ = _tmp32_; + _tmp25_ = _tmp24_; #line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp34_ = self->priv->delimiter; + _tmp26_ = self->priv->delimiter; #line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp35_ = entry_multi_completion_get_last_part (_tmp33_, _tmp34_); + _tmp27_ = entry_multi_completion_get_last_part (_tmp25_, _tmp26_); #line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp36_ = _tmp35_; + _tmp28_ = _tmp27_; #line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _g_free0 (_tmp33_); + _g_free0 (_tmp25_); #line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - last_part = _tmp36_; + last_part = _tmp28_; #line 59 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp37_ = last_part; + _tmp29_ = last_part; #line 59 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp38_ = strlen (_tmp37_); + _tmp30_ = strlen (_tmp29_); #line 59 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp39_ = _tmp38_; + _tmp31_ = _tmp30_; #line 59 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - if (_tmp39_ == 0) { + if (_tmp31_ == 0) { #line 60 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" result = FALSE; #line 60 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" @@ -542,24 +539,22 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G _g_object_unref0 (model); #line 60 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" return result; -#line 546 "EntryMultiCompletion.c" +#line 543 "EntryMultiCompletion.c" } #line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp40_ = possible_match; + _tmp32_ = possible_match; #line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp41_ = last_part; + _tmp33_ = last_part; #line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp42_ = string_strip (_tmp41_); + _tmp34_ = string_strip (_tmp33_); #line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp43_ = _tmp42_; + _tmp35_ = _tmp34_; #line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp44_ = g_str_has_prefix (_tmp40_, _tmp43_); + _tmp36_ = g_str_has_prefix (_tmp32_, _tmp35_); #line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp45_ = _tmp44_; + _g_free0 (_tmp35_); #line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _g_free0 (_tmp43_); -#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - result = _tmp45_; + result = _tmp36_; #line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" _g_free0 (last_part); #line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" @@ -570,7 +565,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G _g_object_unref0 (model); #line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" return result; -#line 574 "EntryMultiCompletion.c" +#line 569 "EntryMultiCompletion.c" } #line 34 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" _g_free0 (normed_key); @@ -578,210 +573,160 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G _g_free0 (possible_match); #line 34 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" _g_object_unref0 (model); -#line 582 "EntryMultiCompletion.c" +#line 577 "EntryMultiCompletion.c" } -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, + glong maxlen) +{ glong result = 0L; gchar* end = NULL; gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 605 "EntryMultiCompletion.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 613 "EntryMultiCompletion.c" +#line 601 "EntryMultiCompletion.c" } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 625 "EntryMultiCompletion.c" +#line 610 "EntryMultiCompletion.c" } } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, + glong offset, + glong len) +{ gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + glong _tmp6_; + gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#line 649 "EntryMultiCompletion.c" - glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = _tmp2_ >= ((glong) 0); -#line 655 "EntryMultiCompletion.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = len >= ((glong) 0); +#line 631 "EntryMultiCompletion.c" } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 659 "EntryMultiCompletion.c" +#line 635 "EntryMultiCompletion.c" } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 663 "EntryMultiCompletion.c" - glong _tmp3_; - glong _tmp4_; - glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 675 "EntryMultiCompletion.c" +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = string_strnlen ((gchar*) self, offset + len); +#line 641 "EntryMultiCompletion.c" } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#line 685 "EntryMultiCompletion.c" + gint _tmp1_; + gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = (glong) _tmp2_; +#line 651 "EntryMultiCompletion.c" } -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp8_ < ((glong) 0)) { -#line 691 "EntryMultiCompletion.c" - glong _tmp9_; - glong _tmp10_; - glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 705 "EntryMultiCompletion.c" +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset < ((glong) 0)) { +#line 655 "EntryMultiCompletion.c" + glong _tmp3_; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 663 "EntryMultiCompletion.c" } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 715 "EntryMultiCompletion.c" + glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 670 "EntryMultiCompletion.c" } -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp14_ < ((glong) 0)) { -#line 721 "EntryMultiCompletion.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 730 "EntryMultiCompletion.c" +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (len < ((glong) 0)) { +#line 674 "EntryMultiCompletion.c" + glong _tmp5_; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp5_ - offset; +#line 680 "EntryMultiCompletion.c" } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 750 "EntryMultiCompletion.c" +#line 692 "EntryMultiCompletion.c" } -static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion* base, GtkTreeModel* model, GtkTreeIter* iter) { +static gboolean +entry_multi_completion_real_match_selected (GtkEntryCompletion* base, + GtkTreeModel* model, + GtkTreeIter* iter) +{ EntryMultiCompletion * self; gboolean result = FALSE; gchar* match = NULL; - GtkTreeModel* _tmp0_; - GtkTreeIter _tmp1_; + GtkTreeIter _tmp0_; GtkEntry* entry = NULL; - GtkWidget* _tmp2_; - GtkEntry* _tmp3_; + GtkWidget* _tmp1_; + GtkEntry* _tmp2_; gchar* old_text = NULL; - GtkEntry* _tmp4_; - const gchar* _tmp5_; - gchar* _tmp6_; - const gchar* _tmp7_; + GtkEntry* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; + const gchar* _tmp6_; + gint _tmp7_; gint _tmp8_; - gint _tmp9_; - const gchar* _tmp24_ = NULL; - const gchar* _tmp25_; + const gchar* _tmp20_ = NULL; + const gchar* _tmp21_; gchar* new_text = NULL; + const gchar* _tmp22_; + const gchar* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; const gchar* _tmp26_; - const gchar* _tmp27_; + gchar* _tmp27_; gchar* _tmp28_; gchar* _tmp29_; - const gchar* _tmp30_; - gchar* _tmp31_; - gchar* _tmp32_; - gchar* _tmp33_; - gchar* _tmp34_; - GtkEntry* _tmp35_; - GtkEntry* _tmp36_; - gint _tmp37_; - gint _tmp38_; + gchar* _tmp30_; + GtkEntry* _tmp31_; + GtkEntry* _tmp32_; + gint _tmp33_; + gint _tmp34_; #line 66 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletion); #line 66 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" @@ -789,150 +734,139 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion* #line 66 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" g_return_val_if_fail (iter != NULL, FALSE); #line 68 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp0_ = model; -#line 68 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp1_ = *iter; + _tmp0_ = *iter; #line 68 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - gtk_tree_model_get (_tmp0_, &_tmp1_, 0, &match, -1); + gtk_tree_model_get (model, &_tmp0_, 0, &match, -1); #line 70 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp2_ = gtk_entry_completion_get_entry (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion)); + _tmp1_ = gtk_entry_completion_get_entry (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion)); #line 70 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_entry_get_type (), GtkEntry)); + _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_entry_get_type (), GtkEntry)); #line 70 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - entry = _tmp3_; + entry = _tmp2_; #line 72 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp4_ = entry; + _tmp3_ = entry; #line 72 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp5_ = gtk_entry_get_text (_tmp4_); + _tmp4_ = gtk_entry_get_text (_tmp3_); #line 72 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp6_ = g_utf8_normalize (_tmp5_, (gssize) -1, G_NORMALIZE_ALL_COMPOSE); + _tmp5_ = g_utf8_normalize (_tmp4_, (gssize) -1, G_NORMALIZE_ALL_COMPOSE); #line 72 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - old_text = _tmp6_; + old_text = _tmp5_; #line 73 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp7_ = old_text; + _tmp6_ = old_text; #line 73 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp8_ = strlen (_tmp7_); + _tmp7_ = strlen (_tmp6_); #line 73 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 73 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - if (_tmp9_ > 0) { -#line 820 "EntryMultiCompletion.c" + if (_tmp8_ > 0) { +#line 763 "EntryMultiCompletion.c" + const gchar* _tmp9_; const gchar* _tmp10_; - const gchar* _tmp11_; - gboolean _tmp12_; #line 74 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp10_ = old_text; + _tmp9_ = old_text; #line 74 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp11_ = self->priv->delimiter; + _tmp10_ = self->priv->delimiter; #line 74 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp12_ = string_contains (_tmp10_, _tmp11_); -#line 74 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - if (_tmp12_) { -#line 832 "EntryMultiCompletion.c" - const gchar* _tmp13_ = NULL; + if (string_contains (_tmp9_, _tmp10_)) { +#line 772 "EntryMultiCompletion.c" + const gchar* _tmp11_ = NULL; + const gchar* _tmp12_; + const gchar* _tmp13_; const gchar* _tmp14_; const gchar* _tmp15_; - const gchar* _tmp16_; - const gchar* _tmp17_; - gchar _tmp18_; - gint _tmp19_; - gchar* _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; + gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; #line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp14_ = self->priv->delimiter; + _tmp12_ = self->priv->delimiter; #line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - if (g_strcmp0 (_tmp14_, " ") != 0) { + if (g_strcmp0 (_tmp12_, " ") != 0) { #line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp13_ = " "; -#line 849 "EntryMultiCompletion.c" + _tmp11_ = " "; +#line 787 "EntryMultiCompletion.c" } else { #line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp13_ = ""; -#line 853 "EntryMultiCompletion.c" + _tmp11_ = ""; +#line 791 "EntryMultiCompletion.c" } #line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp15_ = old_text; -#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp16_ = old_text; + _tmp13_ = old_text; #line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp17_ = self->priv->delimiter; + _tmp14_ = old_text; #line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp18_ = string_get (_tmp17_, (glong) 0); + _tmp15_ = self->priv->delimiter; #line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp19_ = string_last_index_of_char (_tmp16_, (gunichar) _tmp18_, 0); + _tmp16_ = string_substring (_tmp13_, (glong) 0, (glong) (string_last_index_of_char (_tmp14_, (gunichar) string_get (_tmp15_, (glong) 0), 0) + 1)); #line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp20_ = string_substring (_tmp15_, (glong) 0, (glong) (_tmp19_ + 1)); + _tmp17_ = _tmp16_; #line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp21_ = _tmp20_; -#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp22_ = g_strconcat (_tmp21_, _tmp13_, NULL); + _tmp18_ = g_strconcat (_tmp17_, _tmp11_, NULL); #line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" _g_free0 (old_text); #line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - old_text = _tmp22_; + old_text = _tmp18_; #line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _g_free0 (_tmp21_); -#line 877 "EntryMultiCompletion.c" + _g_free0 (_tmp17_); +#line 811 "EntryMultiCompletion.c" } else { - gchar* _tmp23_; + gchar* _tmp19_; #line 77 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp23_ = g_strdup (""); + _tmp19_ = g_strdup (""); #line 77 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" _g_free0 (old_text); #line 77 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - old_text = _tmp23_; -#line 886 "EntryMultiCompletion.c" + old_text = _tmp19_; +#line 820 "EntryMultiCompletion.c" } } #line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp25_ = self->priv->delimiter; + _tmp21_ = self->priv->delimiter; #line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - if (g_strcmp0 (_tmp25_, " ") != 0) { + if (g_strcmp0 (_tmp21_, " ") != 0) { #line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp24_ = " "; -#line 895 "EntryMultiCompletion.c" + _tmp20_ = " "; +#line 829 "EntryMultiCompletion.c" } else { #line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp24_ = ""; -#line 899 "EntryMultiCompletion.c" + _tmp20_ = ""; +#line 833 "EntryMultiCompletion.c" } #line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp26_ = old_text; + _tmp22_ = old_text; #line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp27_ = match; + _tmp23_ = match; #line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp28_ = g_strconcat (_tmp26_, _tmp27_, NULL); + _tmp24_ = g_strconcat (_tmp22_, _tmp23_, NULL); #line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp29_ = _tmp28_; + _tmp25_ = _tmp24_; #line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp30_ = self->priv->delimiter; + _tmp26_ = self->priv->delimiter; #line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp31_ = g_strconcat (_tmp29_, _tmp30_, NULL); + _tmp27_ = g_strconcat (_tmp25_, _tmp26_, NULL); #line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp32_ = _tmp31_; + _tmp28_ = _tmp27_; #line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp33_ = g_strconcat (_tmp32_, _tmp24_, NULL); + _tmp29_ = g_strconcat (_tmp28_, _tmp20_, NULL); #line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp34_ = _tmp33_; + _tmp30_ = _tmp29_; #line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _g_free0 (_tmp32_); + _g_free0 (_tmp28_); #line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _g_free0 (_tmp29_); + _g_free0 (_tmp25_); #line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - new_text = _tmp34_; + new_text = _tmp30_; #line 81 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp35_ = entry; + _tmp31_ = entry; #line 81 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - gtk_entry_set_text (_tmp35_, new_text); + gtk_entry_set_text (_tmp31_, new_text); #line 82 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp36_ = entry; + _tmp32_ = entry; #line 82 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp37_ = strlen (new_text); + _tmp33_ = strlen (new_text); #line 82 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp38_ = _tmp37_; + _tmp34_ = _tmp33_; #line 82 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - gtk_editable_set_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GTK_TYPE_EDITABLE, GtkEditable), (gint) _tmp38_); + gtk_editable_set_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_editable_get_type (), GtkEditable), (gint) _tmp34_); #line 84 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" result = TRUE; #line 84 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" @@ -945,109 +879,108 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion* _g_free0 (match); #line 84 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" return result; -#line 949 "EntryMultiCompletion.c" +#line 883 "EntryMultiCompletion.c" } -static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar* delimiter) { +static gchar* +entry_multi_completion_get_last_part (const gchar* s, + const gchar* delimiter) +{ gchar* result = NULL; gchar** split = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - gchar** _tmp2_; - gchar** _tmp3_; + gchar** _tmp0_; + gchar** _tmp1_; gint split_length1; gint _split_size_; - gboolean _tmp4_ = FALSE; - gchar** _tmp5_; - gint _tmp5__length1; + gboolean _tmp2_ = FALSE; + gchar** _tmp3_; + gint _tmp3__length1; #line 88 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" g_return_val_if_fail (s != NULL, NULL); #line 88 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" g_return_val_if_fail (delimiter != NULL, NULL); #line 89 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp0_ = s; -#line 89 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp1_ = delimiter; -#line 89 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp3_ = _tmp2_ = g_strsplit (_tmp0_, _tmp1_, 0); + _tmp1_ = _tmp0_ = g_strsplit (s, delimiter, 0); #line 89 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - split = _tmp3_; + split = _tmp1_; #line 89 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - split_length1 = _vala_array_length (_tmp2_); + split_length1 = _vala_array_length (_tmp0_); #line 89 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" _split_size_ = split_length1; #line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp5_ = split; + _tmp3_ = split; #line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp5__length1 = split_length1; + _tmp3__length1 = split_length1; #line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - if (_tmp5_ != NULL) { -#line 987 "EntryMultiCompletion.c" - gchar** _tmp6_; - gint _tmp6__length1; - const gchar* _tmp7_; + if (_tmp3_ != NULL) { +#line 918 "EntryMultiCompletion.c" + gchar** _tmp4_; + gint _tmp4__length1; + const gchar* _tmp5_; #line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp6_ = split; + _tmp4_ = split; #line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp6__length1 = split_length1; + _tmp4__length1 = split_length1; #line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp7_ = _tmp6_[0]; + _tmp5_ = _tmp4_[0]; #line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp4_ = _tmp7_ != NULL; -#line 999 "EntryMultiCompletion.c" + _tmp2_ = _tmp5_ != NULL; +#line 930 "EntryMultiCompletion.c" } else { #line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp4_ = FALSE; -#line 1003 "EntryMultiCompletion.c" + _tmp2_ = FALSE; +#line 934 "EntryMultiCompletion.c" } #line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - if (_tmp4_) { -#line 1007 "EntryMultiCompletion.c" - gchar** _tmp8_; - gint _tmp8__length1; - gchar** _tmp9_; - gint _tmp9__length1; - const gchar* _tmp10_; - gchar* _tmp11_; + if (_tmp2_) { +#line 938 "EntryMultiCompletion.c" + gchar** _tmp6_; + gint _tmp6__length1; + gchar** _tmp7_; + gint _tmp7__length1; + const gchar* _tmp8_; + gchar* _tmp9_; #line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp8_ = split; + _tmp6_ = split; #line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp8__length1 = split_length1; + _tmp6__length1 = split_length1; #line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp9_ = split; + _tmp7_ = split; #line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp9__length1 = split_length1; + _tmp7__length1 = split_length1; #line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp10_ = _tmp8_[_tmp9__length1 - 1]; + _tmp8_ = _tmp6_[_tmp7__length1 - 1]; #line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp11_ = g_strdup (_tmp10_); + _tmp9_ = g_strdup (_tmp8_); #line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - result = _tmp11_; + result = _tmp9_; #line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL); #line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" return result; -#line 1032 "EntryMultiCompletion.c" +#line 963 "EntryMultiCompletion.c" } else { - gchar* _tmp12_; + gchar* _tmp10_; #line 94 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - _tmp12_ = g_strdup (""); + _tmp10_ = g_strdup (""); #line 94 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" - result = _tmp12_; + result = _tmp10_; #line 94 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL); #line 94 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" return result; -#line 1043 "EntryMultiCompletion.c" +#line 974 "EntryMultiCompletion.c" } #line 88 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL); -#line 1047 "EntryMultiCompletion.c" +#line 978 "EntryMultiCompletion.c" } -static void entry_multi_completion_class_init (EntryMultiCompletionClass * klass) { +static void +entry_multi_completion_class_init (EntryMultiCompletionClass * klass) +{ #line 10 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" entry_multi_completion_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" @@ -1056,18 +989,22 @@ static void entry_multi_completion_class_init (EntryMultiCompletionClass * klass ((GtkEntryCompletionClass *) klass)->match_selected = (gboolean (*) (GtkEntryCompletion *, GtkTreeModel*, GtkTreeIter*)) entry_multi_completion_real_match_selected; #line 10 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" G_OBJECT_CLASS (klass)->finalize = entry_multi_completion_finalize; -#line 1060 "EntryMultiCompletion.c" +#line 993 "EntryMultiCompletion.c" } -static void entry_multi_completion_instance_init (EntryMultiCompletion * self) { +static void +entry_multi_completion_instance_init (EntryMultiCompletion * self) +{ #line 10 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" self->priv = ENTRY_MULTI_COMPLETION_GET_PRIVATE (self); -#line 1067 "EntryMultiCompletion.c" +#line 1002 "EntryMultiCompletion.c" } -static void entry_multi_completion_finalize (GObject * obj) { +static void +entry_multi_completion_finalize (GObject * obj) +{ EntryMultiCompletion * self; #line 10 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletion); @@ -1075,11 +1012,13 @@ static void entry_multi_completion_finalize (GObject * obj) { _g_free0 (self->priv->delimiter); #line 10 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala" G_OBJECT_CLASS (entry_multi_completion_parent_class)->finalize (obj); -#line 1079 "EntryMultiCompletion.c" +#line 1016 "EntryMultiCompletion.c" } -GType entry_multi_completion_get_type (void) { +GType +entry_multi_completion_get_type (void) +{ static volatile gsize entry_multi_completion_type_id__volatile = 0; if (g_once_init_enter (&entry_multi_completion_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EntryMultiCompletionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) entry_multi_completion_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EntryMultiCompletion), 0, (GInstanceInitFunc) entry_multi_completion_instance_init, NULL }; @@ -1091,7 +1030,11 @@ GType entry_multi_completion_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -1103,13 +1046,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -static gint _vala_array_length (gpointer array) { +static gint +_vala_array_length (gpointer array) +{ int length; length = 0; if (array) { diff --git a/src/dialogs/ExportDialog.c b/src/dialogs/ExportDialog.c index f74f962..f20dd78 100644 --- a/src/dialogs/ExportDialog.c +++ b/src/dialogs/ExportDialog.c @@ -1,4 +1,4 @@ -/* ExportDialog.c generated by valac 0.36.6, the Vala compiler +/* ExportDialog.c generated by valac 0.40.4, the Vala compiler * generated from ExportDialog.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -8,6 +8,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -27,6 +28,11 @@ typedef struct _ExportDialog ExportDialog; typedef struct _ExportDialogClass ExportDialogClass; typedef struct _ExportDialogPrivate ExportDialogPrivate; +enum { + EXPORT_DIALOG_0_PROPERTY, + EXPORT_DIALOG_NUM_PROPERTIES +}; +static GParamSpec* export_dialog_properties[EXPORT_DIALOG_NUM_PROPERTIES]; #define TYPE_SCALE_CONSTRAINT (scale_constraint_get_type ()) @@ -146,9 +152,6 @@ static gint export_dialog_current_scale = 0; GType export_dialog_get_type (void) G_GNUC_CONST; #define EXPORT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EXPORT_DIALOG, ExportDialogPrivate)) -enum { - EXPORT_DIALOG_DUMMY_PROPERTY -}; GType scale_constraint_get_type (void) G_GNUC_CONST; GType export_format_parameters_get_type (void) G_GNUC_CONST; GType export_format_mode_get_type (void) G_GNUC_CONST; @@ -162,7 +165,8 @@ void export_format_parameters_current (ExportFormatParameters* result); #define EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL _ ("Unmodified") #define EXPORT_DIALOG_CURRENT_FORMAT_LABEL _ ("Current") ExportDialog* export_dialog_new (const gchar* title); -ExportDialog* export_dialog_construct (GType object_type, const gchar* title); +ExportDialog* export_dialog_construct (GType object_type, + const gchar* title); gint resources_use_header_bar (void); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; @@ -175,213 +179,248 @@ ScaleConstraint configuration_facade_get_export_constraint (ConfigurationFacade* gint configuration_facade_get_export_scale (ConfigurationFacade* self); gchar* jpeg_quality_to_string (JpegQuality self); gchar* scale_constraint_to_string (ScaleConstraint self); -static void export_dialog_format_add_option (ExportDialog* self, const gchar* format_name); +static void export_dialog_format_add_option (ExportDialog* self, + const gchar* format_name); PhotoFileFormat* photo_file_format_get_writeable (int* result_length1); gpointer photo_file_format_properties_ref (gpointer instance); void photo_file_format_properties_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_properties (GValue* value, gpointer v_object); -void value_take_photo_file_format_properties (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_properties (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_properties (GValue* value, + gpointer v_object); +void value_take_photo_file_format_properties (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_properties (const GValue* value); GType photo_file_format_properties_get_type (void) G_GNUC_CONST; PhotoFileFormatProperties* photo_file_format_get_properties (PhotoFileFormat self); gchar* photo_file_format_properties_get_user_visible_name (PhotoFileFormatProperties* self); static void export_dialog_on_constraint_changed (ExportDialog* self); -static void _export_dialog_on_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); +static void _export_dialog_on_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self); static void export_dialog_on_format_changed (ExportDialog* self); -static void _export_dialog_on_format_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); +static void _export_dialog_on_format_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self); static void export_dialog_on_pixels_changed (ExportDialog* self); -static void _export_dialog_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self); -static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar* text, gint length, gint* position); -static void _export_dialog_on_pixels_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self); +static void _export_dialog_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, + gpointer self); +static void export_dialog_on_pixels_insert_text (ExportDialog* self, + const gchar* text, + gint length, + gint* position); +static void _export_dialog_on_pixels_insert_text_gtk_editable_insert_text (GtkEditable* _sender, + const gchar* new_text, + gint new_text_length, + gint* position, + gpointer self); static void export_dialog_on_activate (ExportDialog* self); -static void _export_dialog_on_activate_gtk_entry_activate (GtkEntry* _sender, gpointer self); -static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint x, gint y, GtkWidget* widget); -static void export_dialog_add_control (ExportDialog* self, GtkWidget* widget, gint x, gint y); +static void _export_dialog_on_activate_gtk_entry_activate (GtkEntry* _sender, + gpointer self); +static void export_dialog_add_label (ExportDialog* self, + const gchar* text, + gint x, + gint y, + GtkWidget* widget); +static void export_dialog_add_control (ExportDialog* self, + GtkWidget* widget, + gint x, + gint y); #define RESOURCES_CANCEL_LABEL _ ("_Cancel") #define RESOURCES_OK_LABEL _ ("_OK") -static void export_dialog_format_set_active_text (ExportDialog* self, const gchar* text); +static void export_dialog_format_set_active_text (ExportDialog* self, + const gchar* text); static PhotoFileFormat export_dialog_get_specified_format (ExportDialog* self); -static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, ExportFormatParameters* params); -gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint* constraint, ExportFormatParameters* parameters); +static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, + ExportFormatParameters* params); +gboolean export_dialog_execute (ExportDialog* self, + gint* scale, + ScaleConstraint* constraint, + ExportFormatParameters* parameters); gboolean photo_file_format_can_write (PhotoFileFormat self); PhotoFileFormat photo_file_format_get_system_default_format (void); -void configuration_facade_set_export_export_format_mode (ConfigurationFacade* self, ExportFormatMode export_format_mode); -void configuration_facade_set_export_photo_file_format (ConfigurationFacade* self, PhotoFileFormat photo_file_format); -void configuration_facade_set_export_quality (ConfigurationFacade* self, JpegQuality quality); -void configuration_facade_set_export_export_metadata (ConfigurationFacade* self, gboolean export_metadata); -void configuration_facade_set_export_constraint (ConfigurationFacade* self, ScaleConstraint constraint); -void configuration_facade_set_export_scale (ConfigurationFacade* self, gint scale); +void configuration_facade_set_export_export_format_mode (ConfigurationFacade* self, + ExportFormatMode export_format_mode); +void configuration_facade_set_export_photo_file_format (ConfigurationFacade* self, + PhotoFileFormat photo_file_format); +void configuration_facade_set_export_quality (ConfigurationFacade* self, + JpegQuality quality); +void configuration_facade_set_export_export_metadata (ConfigurationFacade* self, + gboolean export_metadata); +void configuration_facade_set_export_constraint (ConfigurationFacade* self, + ScaleConstraint constraint); +void configuration_facade_set_export_scale (ConfigurationFacade* self, + gint scale); static void export_dialog_finalize (GObject * obj); const ScaleConstraint EXPORT_DIALOG_CONSTRAINT_ARRAY[4] = {SCALE_CONSTRAINT_ORIGINAL, SCALE_CONSTRAINT_DIMENSIONS, SCALE_CONSTRAINT_WIDTH, SCALE_CONSTRAINT_HEIGHT}; const JpegQuality EXPORT_DIALOG_QUALITY_ARRAY[4] = {JPEG_QUALITY_LOW, JPEG_QUALITY_MEDIUM, JPEG_QUALITY_HIGH, JPEG_QUALITY_MAXIMUM}; -static void _export_dialog_on_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void +_export_dialog_on_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self) +{ #line 83 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" export_dialog_on_constraint_changed ((ExportDialog*) self); -#line 224 "ExportDialog.c" +#line 267 "ExportDialog.c" } -static void _export_dialog_on_format_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void +_export_dialog_on_format_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self) +{ #line 84 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" export_dialog_on_format_changed ((ExportDialog*) self); -#line 231 "ExportDialog.c" +#line 277 "ExportDialog.c" } -static void _export_dialog_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { +static void +_export_dialog_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, + gpointer self) +{ #line 85 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" export_dialog_on_pixels_changed ((ExportDialog*) self); -#line 238 "ExportDialog.c" +#line 287 "ExportDialog.c" } -static void _export_dialog_on_pixels_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) { +static void +_export_dialog_on_pixels_insert_text_gtk_editable_insert_text (GtkEditable* _sender, + const gchar* new_text, + gint new_text_length, + gint* position, + gpointer self) +{ #line 86 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" export_dialog_on_pixels_insert_text ((ExportDialog*) self, new_text, new_text_length, position); -#line 245 "ExportDialog.c" +#line 300 "ExportDialog.c" } -static void _export_dialog_on_activate_gtk_entry_activate (GtkEntry* _sender, gpointer self) { +static void +_export_dialog_on_activate_gtk_entry_activate (GtkEntry* _sender, + gpointer self) +{ #line 87 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" export_dialog_on_activate ((ExportDialog*) self); -#line 252 "ExportDialog.c" +#line 310 "ExportDialog.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 116 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" return self ? g_object_ref (self) : NULL; -#line 259 "ExportDialog.c" +#line 319 "ExportDialog.c" } -ExportDialog* export_dialog_construct (GType object_type, const gchar* title) { +ExportDialog* +export_dialog_construct (GType object_type, + const gchar* title) +{ ExportDialog * self = NULL; - gint _tmp0_; - const gchar* _tmp1_; ConfigFacade* config = NULL; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; ConfigFacade* _tmp2_; ConfigFacade* _tmp3_; - ExportFormatMode _tmp4_; + ConfigFacade* _tmp4_; ConfigFacade* _tmp5_; - PhotoFileFormat _tmp6_; - ConfigFacade* _tmp7_; - JpegQuality _tmp8_; - ConfigFacade* _tmp9_; - gboolean _tmp10_; - ConfigFacade* _tmp11_; - ScaleConstraint _tmp12_; - ConfigFacade* _tmp13_; - gint _tmp14_; - GtkComboBoxText* _tmp15_; + ConfigFacade* _tmp6_; + GtkComboBoxText* _tmp7_; gint ctr = 0; - GtkComboBoxText* _tmp26_; - GtkComboBoxText* _tmp36_; - gint _tmp37_; - PhotoFileFormat* _tmp38_; + GtkComboBoxText* _tmp18_; + GtkComboBoxText* _tmp28_; + gint _tmp29_; + PhotoFileFormat* _tmp30_; + GtkEntry* _tmp36_; + GtkEntry* _tmp37_; + GtkEntry* _tmp38_; + gint _tmp39_; + gchar* _tmp40_; + gchar* _tmp41_; + GtkComboBoxText* _tmp42_; + GtkComboBoxText* _tmp43_; GtkEntry* _tmp44_; GtkEntry* _tmp45_; GtkEntry* _tmp46_; - gint _tmp47_; - gchar* _tmp48_; - gchar* _tmp49_; + GtkComboBoxText* _tmp47_; + GtkComboBoxText* _tmp48_; + GtkComboBoxText* _tmp49_; GtkComboBoxText* _tmp50_; GtkComboBoxText* _tmp51_; - GtkEntry* _tmp52_; + GtkComboBoxText* _tmp52_; GtkEntry* _tmp53_; GtkEntry* _tmp54_; - GtkComboBoxText* _tmp55_; - GtkComboBoxText* _tmp56_; - GtkComboBoxText* _tmp57_; - GtkComboBoxText* _tmp58_; - GtkComboBoxText* _tmp59_; - GtkComboBoxText* _tmp60_; - GtkEntry* _tmp61_; - GtkEntry* _tmp62_; - GtkSwitch* _tmp63_; - GtkSwitch* _tmp64_; - GtkSwitch* _tmp65_; - GtkSwitch* _tmp66_; - GtkSwitch* _tmp67_; - GtkGrid* _tmp68_; - GtkGrid* _tmp69_; - GtkGrid* _tmp70_; - GtkBox* _tmp71_; - GtkGrid* _tmp72_; + GtkSwitch* _tmp55_; + GtkSwitch* _tmp56_; + GtkSwitch* _tmp57_; + GtkSwitch* _tmp58_; + GtkSwitch* _tmp59_; + GtkGrid* _tmp60_; + GtkGrid* _tmp61_; + GtkGrid* _tmp62_; + GtkBox* _tmp63_; + GtkGrid* _tmp64_; + GtkWidget* _tmp65_; + GtkWidget* _tmp66_; + GtkWidget* _tmp67_; + GtkWidget* _tmp68_; + GtkWidget* _tmp69_; + ScaleConstraint _tmp70_; GtkWidget* _tmp73_; - GtkWidget* _tmp74_; - GtkWidget* _tmp75_; - GtkWidget* _tmp76_; - GtkWidget* _tmp77_; - ScaleConstraint _tmp78_; - GtkWidget* _tmp81_; #line 38 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" g_return_val_if_fail (title != NULL, NULL); #line 39 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp0_ = resources_use_header_bar (); -#line 39 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - self = (ExportDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL); + self = (ExportDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL); #line 41 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp1_ = title; -#line 41 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp1_); + gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), title); #line 42 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); #line 45 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp2_ = config_facade_get_instance (); + _tmp0_ = config_facade_get_instance (); #line 45 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - config = _tmp2_; -#line 46 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp3_ = config; + config = _tmp0_; #line 46 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp4_ = configuration_facade_get_export_export_format_mode (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp1_ = config; #line 46 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_current_parameters.mode = _tmp4_; -#line 47 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp5_ = config; + export_dialog_current_parameters.mode = configuration_facade_get_export_export_format_mode (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 47 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp6_ = configuration_facade_get_export_photo_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp2_ = config; #line 47 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_current_parameters.specified_format = _tmp6_; + export_dialog_current_parameters.specified_format = configuration_facade_get_export_photo_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 48 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp7_ = config; -#line 48 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp8_ = configuration_facade_get_export_quality (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp3_ = config; #line 48 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_current_parameters.quality = _tmp8_; + export_dialog_current_parameters.quality = configuration_facade_get_export_quality (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 49 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp9_ = config; + _tmp4_ = config; #line 49 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp10_ = configuration_facade_get_export_export_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 49 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_current_parameters.export_metadata = _tmp10_; -#line 50 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp11_ = config; + export_dialog_current_parameters.export_metadata = configuration_facade_get_export_export_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 50 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp12_ = configuration_facade_get_export_constraint (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp5_ = config; #line 50 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_current_constraint = _tmp12_; -#line 51 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp13_ = config; + export_dialog_current_constraint = configuration_facade_get_export_constraint (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 51 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp14_ = configuration_facade_get_export_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp6_ = config; #line 51 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_current_scale = _tmp14_; + export_dialog_current_scale = configuration_facade_get_export_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 53 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp15_ = (GtkComboBoxText*) gtk_combo_box_text_new (); + _tmp7_ = (GtkComboBoxText*) gtk_combo_box_text_new (); #line 53 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - g_object_ref_sink (_tmp15_); + g_object_ref_sink (_tmp7_); #line 53 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _g_object_unref0 (self->priv->quality_combo); #line 53 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - self->priv->quality_combo = _tmp15_; + self->priv->quality_combo = _tmp7_; #line 54 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" ctr = 0; -#line 385 "ExportDialog.c" +#line 424 "ExportDialog.c" { JpegQuality* quality_collection = NULL; gint quality_collection_length1 = 0; @@ -393,70 +432,70 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) { quality_collection_length1 = G_N_ELEMENTS (EXPORT_DIALOG_QUALITY_ARRAY); #line 55 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" for (quality_it = 0; quality_it < G_N_ELEMENTS (EXPORT_DIALOG_QUALITY_ARRAY); quality_it = quality_it + 1) { -#line 397 "ExportDialog.c" +#line 436 "ExportDialog.c" JpegQuality quality = 0; #line 55 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" quality = quality_collection[quality_it]; -#line 401 "ExportDialog.c" +#line 440 "ExportDialog.c" { - GtkComboBoxText* _tmp16_; - JpegQuality _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; - JpegQuality _tmp20_; - ExportFormatParameters _tmp21_; - JpegQuality _tmp22_; - gint _tmp25_; + GtkComboBoxText* _tmp8_; + JpegQuality _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + JpegQuality _tmp12_; + ExportFormatParameters _tmp13_; + JpegQuality _tmp14_; + gint _tmp17_; #line 56 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp16_ = self->priv->quality_combo; + _tmp8_ = self->priv->quality_combo; #line 56 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp17_ = quality; + _tmp9_ = quality; #line 56 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp18_ = jpeg_quality_to_string (_tmp17_); + _tmp10_ = jpeg_quality_to_string (_tmp9_); #line 56 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp19_ = _tmp18_; + _tmp11_ = _tmp10_; #line 56 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_combo_box_text_append_text (_tmp16_, _tmp19_); + gtk_combo_box_text_append_text (_tmp8_, _tmp11_); #line 56 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _g_free0 (_tmp19_); + _g_free0 (_tmp11_); #line 57 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp20_ = quality; + _tmp12_ = quality; #line 57 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp21_ = export_dialog_current_parameters; + _tmp13_ = export_dialog_current_parameters; #line 57 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp22_ = _tmp21_.quality; + _tmp14_ = _tmp13_.quality; #line 57 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (_tmp20_ == _tmp22_) { -#line 431 "ExportDialog.c" - GtkComboBoxText* _tmp23_; - gint _tmp24_; + if (_tmp12_ == _tmp14_) { +#line 470 "ExportDialog.c" + GtkComboBoxText* _tmp15_; + gint _tmp16_; #line 58 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp23_ = self->priv->quality_combo; + _tmp15_ = self->priv->quality_combo; #line 58 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp24_ = ctr; + _tmp16_ = ctr; #line 58 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox), _tmp24_); -#line 440 "ExportDialog.c" + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_combo_box_get_type (), GtkComboBox), _tmp16_); +#line 479 "ExportDialog.c" } #line 59 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp25_ = ctr; + _tmp17_ = ctr; #line 59 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - ctr = _tmp25_ + 1; -#line 446 "ExportDialog.c" + ctr = _tmp17_ + 1; +#line 485 "ExportDialog.c" } } } #line 62 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp26_ = (GtkComboBoxText*) gtk_combo_box_text_new (); + _tmp18_ = (GtkComboBoxText*) gtk_combo_box_text_new (); #line 62 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - g_object_ref_sink (_tmp26_); + g_object_ref_sink (_tmp18_); #line 62 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _g_object_unref0 (self->priv->constraint_combo); #line 62 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - self->priv->constraint_combo = _tmp26_; + self->priv->constraint_combo = _tmp18_; #line 63 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" ctr = 0; -#line 460 "ExportDialog.c" +#line 499 "ExportDialog.c" { ScaleConstraint* constraint_collection = NULL; gint constraint_collection_length1 = 0; @@ -468,299 +507,302 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) { constraint_collection_length1 = G_N_ELEMENTS (EXPORT_DIALOG_CONSTRAINT_ARRAY); #line 64 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" for (constraint_it = 0; constraint_it < G_N_ELEMENTS (EXPORT_DIALOG_CONSTRAINT_ARRAY); constraint_it = constraint_it + 1) { -#line 472 "ExportDialog.c" +#line 511 "ExportDialog.c" ScaleConstraint constraint = 0; #line 64 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" constraint = constraint_collection[constraint_it]; -#line 476 "ExportDialog.c" +#line 515 "ExportDialog.c" { - GtkComboBoxText* _tmp27_; - ScaleConstraint _tmp28_; - gchar* _tmp29_; - gchar* _tmp30_; - ScaleConstraint _tmp31_; - ScaleConstraint _tmp32_; - gint _tmp35_; + GtkComboBoxText* _tmp19_; + ScaleConstraint _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + ScaleConstraint _tmp23_; + ScaleConstraint _tmp24_; + gint _tmp27_; #line 65 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp27_ = self->priv->constraint_combo; + _tmp19_ = self->priv->constraint_combo; #line 65 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp28_ = constraint; + _tmp20_ = constraint; #line 65 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp29_ = scale_constraint_to_string (_tmp28_); + _tmp21_ = scale_constraint_to_string (_tmp20_); #line 65 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp30_ = _tmp29_; + _tmp22_ = _tmp21_; #line 65 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_combo_box_text_append_text (_tmp27_, _tmp30_); + gtk_combo_box_text_append_text (_tmp19_, _tmp22_); #line 65 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _g_free0 (_tmp30_); + _g_free0 (_tmp22_); #line 66 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp31_ = constraint; + _tmp23_ = constraint; #line 66 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp32_ = export_dialog_current_constraint; + _tmp24_ = export_dialog_current_constraint; #line 66 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (_tmp31_ == _tmp32_) { -#line 503 "ExportDialog.c" - GtkComboBoxText* _tmp33_; - gint _tmp34_; + if (_tmp23_ == _tmp24_) { +#line 542 "ExportDialog.c" + GtkComboBoxText* _tmp25_; + gint _tmp26_; #line 67 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp33_ = self->priv->constraint_combo; + _tmp25_ = self->priv->constraint_combo; #line 67 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp34_ = ctr; + _tmp26_ = ctr; #line 67 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_combo_box_get_type (), GtkComboBox), _tmp34_); -#line 512 "ExportDialog.c" + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_combo_box_get_type (), GtkComboBox), _tmp26_); +#line 551 "ExportDialog.c" } #line 68 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp35_ = ctr; + _tmp27_ = ctr; #line 68 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - ctr = _tmp35_ + 1; -#line 518 "ExportDialog.c" + ctr = _tmp27_ + 1; +#line 557 "ExportDialog.c" } } } #line 71 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp36_ = (GtkComboBoxText*) gtk_combo_box_text_new (); + _tmp28_ = (GtkComboBoxText*) gtk_combo_box_text_new (); #line 71 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - g_object_ref_sink (_tmp36_); + g_object_ref_sink (_tmp28_); #line 71 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _g_object_unref0 (self->priv->format_combo); #line 71 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - self->priv->format_combo = _tmp36_; + self->priv->format_combo = _tmp28_; #line 72 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" export_dialog_format_add_option (self, EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL); #line 73 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" export_dialog_format_add_option (self, EXPORT_DIALOG_CURRENT_FORMAT_LABEL); #line 74 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp38_ = photo_file_format_get_writeable (&_tmp37_); -#line 536 "ExportDialog.c" + _tmp30_ = photo_file_format_get_writeable (&_tmp29_); +#line 575 "ExportDialog.c" { PhotoFileFormat* format_collection = NULL; gint format_collection_length1 = 0; gint _format_collection_size_ = 0; gint format_it = 0; #line 74 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - format_collection = _tmp38_; + format_collection = _tmp30_; #line 74 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - format_collection_length1 = _tmp37_; + format_collection_length1 = _tmp29_; #line 74 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - for (format_it = 0; format_it < _tmp37_; format_it = format_it + 1) { -#line 548 "ExportDialog.c" + for (format_it = 0; format_it < _tmp29_; format_it = format_it + 1) { +#line 587 "ExportDialog.c" PhotoFileFormat format = 0; #line 74 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" format = format_collection[format_it]; -#line 552 "ExportDialog.c" +#line 591 "ExportDialog.c" { - PhotoFileFormat _tmp39_; - PhotoFileFormatProperties* _tmp40_; - PhotoFileFormatProperties* _tmp41_; - gchar* _tmp42_; - gchar* _tmp43_; + PhotoFileFormat _tmp31_; + PhotoFileFormatProperties* _tmp32_; + PhotoFileFormatProperties* _tmp33_; + gchar* _tmp34_; + gchar* _tmp35_; #line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp39_ = format; + _tmp31_ = format; #line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp40_ = photo_file_format_get_properties (_tmp39_); + _tmp32_ = photo_file_format_get_properties (_tmp31_); #line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp41_ = _tmp40_; + _tmp33_ = _tmp32_; #line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp42_ = photo_file_format_properties_get_user_visible_name (_tmp41_); + _tmp34_ = photo_file_format_properties_get_user_visible_name (_tmp33_); #line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp43_ = _tmp42_; + _tmp35_ = _tmp34_; #line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_format_add_option (self, _tmp43_); + export_dialog_format_add_option (self, _tmp35_); #line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _g_free0 (_tmp43_); + _g_free0 (_tmp35_); #line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _photo_file_format_properties_unref0 (_tmp41_); -#line 575 "ExportDialog.c" + _photo_file_format_properties_unref0 (_tmp33_); +#line 614 "ExportDialog.c" } } #line 74 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" format_collection = (g_free (format_collection), NULL); -#line 580 "ExportDialog.c" +#line 619 "ExportDialog.c" } #line 78 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp44_ = (GtkEntry*) gtk_entry_new (); + _tmp36_ = (GtkEntry*) gtk_entry_new (); #line 78 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - g_object_ref_sink (_tmp44_); + g_object_ref_sink (_tmp36_); #line 78 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _g_object_unref0 (self->priv->pixels_entry); #line 78 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - self->priv->pixels_entry = _tmp44_; + self->priv->pixels_entry = _tmp36_; #line 79 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp45_ = self->priv->pixels_entry; + _tmp37_ = self->priv->pixels_entry; #line 79 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_entry_set_max_length (_tmp45_, 6); + gtk_entry_set_max_length (_tmp37_, 6); #line 80 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp46_ = self->priv->pixels_entry; + _tmp38_ = self->priv->pixels_entry; #line 80 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp47_ = export_dialog_current_scale; + _tmp39_ = export_dialog_current_scale; #line 80 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp48_ = g_strdup_printf ("%d", _tmp47_); + _tmp40_ = g_strdup_printf ("%d", _tmp39_); #line 80 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp49_ = _tmp48_; + _tmp41_ = _tmp40_; #line 80 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_entry_set_text (_tmp46_, _tmp49_); + gtk_entry_set_text (_tmp38_, _tmp41_); #line 80 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _g_free0 (_tmp49_); + _g_free0 (_tmp41_); #line 83 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp50_ = self->priv->constraint_combo; + _tmp42_ = self->priv->constraint_combo; #line 83 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _export_dialog_on_constraint_changed_gtk_combo_box_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _export_dialog_on_constraint_changed_gtk_combo_box_changed, self, 0); #line 84 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp51_ = self->priv->format_combo; + _tmp43_ = self->priv->format_combo; #line 84 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _export_dialog_on_format_changed_gtk_combo_box_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _export_dialog_on_format_changed_gtk_combo_box_changed, self, 0); #line 85 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp52_ = self->priv->pixels_entry; + _tmp44_ = self->priv->pixels_entry; #line 85 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _export_dialog_on_pixels_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _export_dialog_on_pixels_changed_gtk_editable_changed, self, 0); #line 86 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp53_ = self->priv->pixels_entry; + _tmp45_ = self->priv->pixels_entry; #line 86 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _export_dialog_on_pixels_insert_text_gtk_editable_insert_text, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_editable_get_type (), GtkEditable), "insert-text", (GCallback) _export_dialog_on_pixels_insert_text_gtk_editable_insert_text, self, 0); #line 87 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp54_ = self->priv->pixels_entry; + _tmp46_ = self->priv->pixels_entry; #line 87 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - g_signal_connect_object (_tmp54_, "activate", (GCallback) _export_dialog_on_activate_gtk_entry_activate, self, 0); + g_signal_connect_object (_tmp46_, "activate", (GCallback) _export_dialog_on_activate_gtk_entry_activate, self, 0); #line 90 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp55_ = self->priv->format_combo; + _tmp47_ = self->priv->format_combo; #line 90 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_add_label (self, _ ("_Format:"), 0, 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget)); + export_dialog_add_label (self, _ ("_Format:"), 0, 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget)); #line 91 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp56_ = self->priv->format_combo; + _tmp48_ = self->priv->format_combo; #line 91 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_widget_get_type (), GtkWidget), 1, 0); + export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget), 1, 0); #line 93 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp57_ = self->priv->quality_combo; + _tmp49_ = self->priv->quality_combo; #line 93 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_add_label (self, _ ("_Quality:"), 0, 1, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget)); + export_dialog_add_label (self, _ ("_Quality:"), 0, 1, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget)); #line 94 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp58_ = self->priv->quality_combo; + _tmp50_ = self->priv->quality_combo; #line 94 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), 1, 1); + export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), 1, 1); #line 96 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp59_ = self->priv->constraint_combo; + _tmp51_ = self->priv->constraint_combo; #line 96 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_add_label (self, _ ("_Scaling constraint:"), 0, 2, G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget)); + export_dialog_add_label (self, _ ("_Scaling constraint:"), 0, 2, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget)); #line 97 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp60_ = self->priv->constraint_combo; + _tmp52_ = self->priv->constraint_combo; #line 97 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), 1, 2); + export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), 1, 2); #line 99 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp61_ = self->priv->pixels_entry; + _tmp53_ = self->priv->pixels_entry; #line 99 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_add_label (self, _ ("_Pixels:"), 0, 3, G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget)); + export_dialog_add_label (self, _ ("_Pixels:"), 0, 3, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_widget_get_type (), GtkWidget)); #line 100 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp62_ = self->priv->pixels_entry; + _tmp54_ = self->priv->pixels_entry; #line 100 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), 1, 3); + export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), 1, 3); #line 102 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp63_ = (GtkSwitch*) gtk_switch_new (); + _tmp55_ = (GtkSwitch*) gtk_switch_new (); #line 102 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - g_object_ref_sink (_tmp63_); + g_object_ref_sink (_tmp55_); #line 102 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _g_object_unref0 (self->priv->export_metadata); #line 102 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - self->priv->export_metadata = _tmp63_; + self->priv->export_metadata = _tmp55_; #line 103 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp64_ = self->priv->export_metadata; + _tmp56_ = self->priv->export_metadata; #line 103 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_add_label (self, _ ("Export _metadata:"), 0, 4, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget)); + export_dialog_add_label (self, _ ("Export _metadata:"), 0, 4, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_widget_get_type (), GtkWidget)); #line 104 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp65_ = self->priv->export_metadata; + _tmp57_ = self->priv->export_metadata; #line 104 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget), 1, 4); + export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget), 1, 4); #line 105 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp66_ = self->priv->export_metadata; + _tmp58_ = self->priv->export_metadata; #line 105 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_switch_set_active (_tmp66_, TRUE); + gtk_switch_set_active (_tmp58_, TRUE); #line 106 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp67_ = self->priv->export_metadata; + _tmp59_ = self->priv->export_metadata; #line 106 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); #line 108 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp68_ = self->priv->table; + _tmp60_ = self->priv->table; #line 108 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_grid_set_row_spacing (_tmp68_, (guint) 6); + gtk_grid_set_row_spacing (_tmp60_, (guint) 6); #line 109 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp69_ = self->priv->table; + _tmp61_ = self->priv->table; #line 109 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_grid_set_column_spacing (_tmp69_, (guint) 12); + gtk_grid_set_column_spacing (_tmp61_, (guint) 12); #line 110 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp70_ = self->priv->table; + _tmp62_ = self->priv->table; #line 110 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_container_get_type (), GtkContainer), (guint) 18); + gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_container_get_type (), GtkContainer), (guint) 18); #line 112 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp71_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); + _tmp63_ = gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); #line 112 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp72_ = self->priv->table; + _tmp64_ = self->priv->table; #line 112 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget)); #line 115 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, (gint) GTK_RESPONSE_CANCEL); #line 116 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp73_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK); + _tmp65_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK); #line 116 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp74_ = _g_object_ref0 (_tmp73_); + _tmp66_ = _g_object_ref0 (_tmp65_); #line 116 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _g_object_unref0 (self->priv->ok_button); #line 116 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - self->priv->ok_button = _tmp74_; + self->priv->ok_button = _tmp66_; #line 117 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK); #line 119 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp75_ = self->priv->ok_button; + _tmp67_ = self->priv->ok_button; #line 119 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_can_default (_tmp75_, TRUE); + gtk_widget_set_can_default (_tmp67_, TRUE); #line 120 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp76_ = self->priv->ok_button; + _tmp68_ = self->priv->ok_button; #line 120 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - g_object_set (_tmp76_, "has-default", TRUE, NULL); + g_object_set (_tmp68_, "has-default", TRUE, NULL); #line 121 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp77_ = self->priv->ok_button; + _tmp69_ = self->priv->ok_button; #line 121 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp77_); + gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp69_); #line 123 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp78_ = export_dialog_current_constraint; + _tmp70_ = export_dialog_current_constraint; #line 123 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (_tmp78_ == SCALE_CONSTRAINT_ORIGINAL) { -#line 728 "ExportDialog.c" - GtkEntry* _tmp79_; - GtkComboBoxText* _tmp80_; + if (_tmp70_ == SCALE_CONSTRAINT_ORIGINAL) { +#line 767 "ExportDialog.c" + GtkEntry* _tmp71_; + GtkComboBoxText* _tmp72_; #line 124 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp79_ = self->priv->pixels_entry; + _tmp71_ = self->priv->pixels_entry; #line 124 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget), FALSE); #line 125 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp80_ = self->priv->quality_combo; + _tmp72_ = self->priv->quality_combo; #line 125 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 739 "ExportDialog.c" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget), FALSE); +#line 778 "ExportDialog.c" } #line 128 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp81_ = self->priv->ok_button; + _tmp73_ = self->priv->ok_button; #line 128 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_grab_focus (_tmp81_); + gtk_widget_grab_focus (_tmp73_); #line 38 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _g_object_unref0 (config); #line 38 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" return self; -#line 749 "ExportDialog.c" +#line 788 "ExportDialog.c" } -ExportDialog* export_dialog_new (const gchar* title) { +ExportDialog* +export_dialog_new (const gchar* title) +{ #line 38 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" return export_dialog_construct (TYPE_EXPORT_DIALOG, title); -#line 756 "ExportDialog.c" +#line 797 "ExportDialog.c" } -static void export_dialog_format_add_option (ExportDialog* self, const gchar* format_name) { +static void +export_dialog_format_add_option (ExportDialog* self, + const gchar* format_name) +{ GeeArrayList* _tmp0_; - const gchar* _tmp1_; - GtkComboBoxText* _tmp2_; - const gchar* _tmp3_; + GtkComboBoxText* _tmp1_; #line 131 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" g_return_if_fail (IS_EXPORT_DIALOG (self)); #line 131 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" @@ -768,29 +810,27 @@ static void export_dialog_format_add_option (ExportDialog* self, const gchar* fo #line 132 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _tmp0_ = self->priv->format_options; #line 132 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp1_ = format_name; -#line 132 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 133 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp2_ = self->priv->format_combo; + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), format_name); #line 133 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp3_ = format_name; + _tmp1_ = self->priv->format_combo; #line 133 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_combo_box_text_append_text (_tmp2_, _tmp3_); -#line 781 "ExportDialog.c" + gtk_combo_box_text_append_text (_tmp1_, format_name); +#line 819 "ExportDialog.c" } -static void export_dialog_format_set_active_text (ExportDialog* self, const gchar* text) { +static void +export_dialog_format_set_active_text (ExportDialog* self, + const gchar* text) +{ gint selection_ticker = 0; - const gchar* _tmp16_; #line 136 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" g_return_if_fail (IS_EXPORT_DIALOG (self)); #line 136 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" g_return_if_fail (text != NULL); #line 137 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" selection_ticker = 0; -#line 794 "ExportDialog.c" +#line 834 "ExportDialog.c" { GeeArrayList* _current_text_list = NULL; GeeArrayList* _tmp0_; @@ -818,7 +858,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha _current_text_index = -1; #line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" while (TRUE) { -#line 822 "ExportDialog.c" +#line 862 "ExportDialog.c" gint _tmp5_; gint _tmp6_; gint _tmp7_; @@ -827,8 +867,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha gint _tmp9_; gpointer _tmp10_; const gchar* _tmp11_; - const gchar* _tmp12_; - gint _tmp15_; + gint _tmp14_; #line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _tmp5_ = _current_text_index; #line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" @@ -841,7 +880,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha if (!(_tmp6_ < _tmp7_)) { #line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" break; -#line 845 "ExportDialog.c" +#line 884 "ExportDialog.c" } #line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _tmp8_ = _current_text_list; @@ -854,104 +893,102 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha #line 140 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _tmp11_ = current_text; #line 140 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp12_ = text; -#line 140 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (g_strcmp0 (_tmp11_, _tmp12_) == 0) { -#line 861 "ExportDialog.c" - GtkComboBoxText* _tmp13_; - gint _tmp14_; + if (g_strcmp0 (_tmp11_, text) == 0) { +#line 898 "ExportDialog.c" + GtkComboBoxText* _tmp12_; + gint _tmp13_; #line 141 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp13_ = self->priv->format_combo; + _tmp12_ = self->priv->format_combo; #line 141 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp14_ = selection_ticker; + _tmp13_ = selection_ticker; #line 141 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_combo_box_get_type (), GtkComboBox), _tmp14_); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), _tmp13_); #line 142 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _g_free0 (current_text); #line 142 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _g_object_unref0 (_current_text_list); #line 142 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" return; -#line 876 "ExportDialog.c" +#line 913 "ExportDialog.c" } #line 144 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp15_ = selection_ticker; + _tmp14_ = selection_ticker; #line 144 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - selection_ticker = _tmp15_ + 1; + selection_ticker = _tmp14_ + 1; #line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _g_free0 (current_text); -#line 884 "ExportDialog.c" +#line 921 "ExportDialog.c" } #line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _g_object_unref0 (_current_text_list); -#line 888 "ExportDialog.c" +#line 925 "ExportDialog.c" } -#line 147 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp16_ = text; #line 147 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" g_error ("ExportDialog.vala:147: format_set_active_text: text '%s' isn't in comb" \ -"o box", _tmp16_); -#line 894 "ExportDialog.c" +"o box", text); +#line 929 "ExportDialog.c" } -static PhotoFileFormat export_dialog_get_specified_format (ExportDialog* self) { +static PhotoFileFormat +export_dialog_get_specified_format (ExportDialog* self) +{ PhotoFileFormat result = 0; gint index = 0; GtkComboBoxText* _tmp0_; gint _tmp1_; gint _tmp2_; - gint _tmp3_; PhotoFileFormat* writeable_formats = NULL; - gint _tmp4_; - PhotoFileFormat* _tmp5_; + gint _tmp3_; + PhotoFileFormat* _tmp4_; gint writeable_formats_length1; gint _writeable_formats_size_; - gint _tmp6_; - PhotoFileFormat _tmp7_; + gint _tmp5_; + PhotoFileFormat _tmp6_; #line 150 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" g_return_val_if_fail (IS_EXPORT_DIALOG (self), 0); #line 151 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _tmp0_ = self->priv->format_combo; #line 151 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox)); -#line 151 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - index = _tmp1_; + index = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox)); #line 152 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp2_ = index; + _tmp1_ = index; #line 152 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (_tmp2_ < EXPORT_DIALOG_NUM_SPECIAL_FORMATS) { + if (_tmp1_ < EXPORT_DIALOG_NUM_SPECIAL_FORMATS) { #line 153 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" index = EXPORT_DIALOG_NUM_SPECIAL_FORMATS; -#line 926 "ExportDialog.c" +#line 960 "ExportDialog.c" } #line 155 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp3_ = index; + _tmp2_ = index; #line 155 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - index = _tmp3_ - EXPORT_DIALOG_NUM_SPECIAL_FORMATS; + index = _tmp2_ - EXPORT_DIALOG_NUM_SPECIAL_FORMATS; #line 156 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp5_ = photo_file_format_get_writeable (&_tmp4_); + _tmp4_ = photo_file_format_get_writeable (&_tmp3_); #line 156 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - writeable_formats = _tmp5_; + writeable_formats = _tmp4_; #line 156 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - writeable_formats_length1 = _tmp4_; + writeable_formats_length1 = _tmp3_; #line 156 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _writeable_formats_size_ = writeable_formats_length1; #line 157 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp6_ = index; + _tmp5_ = index; #line 157 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp7_ = writeable_formats[_tmp6_]; + _tmp6_ = writeable_formats[_tmp5_]; #line 157 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - result = _tmp7_; + result = _tmp6_; #line 157 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" writeable_formats = (g_free (writeable_formats), NULL); #line 157 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" return result; -#line 950 "ExportDialog.c" +#line 984 "ExportDialog.c" } -static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, ExportFormatParameters* params) { +static gchar* +export_dialog_get_label_for_parameters (ExportDialog* self, + ExportFormatParameters* params) +{ gchar* result = NULL; ExportFormatParameters _tmp0_; ExportFormatMode _tmp1_; @@ -967,7 +1004,7 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export switch (_tmp1_) { #line 161 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" case EXPORT_FORMAT_MODE_UNMODIFIED: -#line 970 "ExportDialog.c" +#line 1007 "ExportDialog.c" { gchar* _tmp2_; #line 163 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" @@ -976,11 +1013,11 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export result = _tmp2_; #line 163 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" return result; -#line 979 "ExportDialog.c" +#line 1016 "ExportDialog.c" } #line 161 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" case EXPORT_FORMAT_MODE_CURRENT: -#line 983 "ExportDialog.c" +#line 1020 "ExportDialog.c" { gchar* _tmp3_; #line 166 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" @@ -989,11 +1026,11 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export result = _tmp3_; #line 166 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" return result; -#line 992 "ExportDialog.c" +#line 1029 "ExportDialog.c" } #line 161 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" case EXPORT_FORMAT_MODE_SPECIFIED: -#line 996 "ExportDialog.c" +#line 1033 "ExportDialog.c" { ExportFormatParameters _tmp4_; PhotoFileFormat _tmp5_; @@ -1019,20 +1056,25 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export result = _tmp9_; #line 169 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" return result; -#line 1022 "ExportDialog.c" +#line 1059 "ExportDialog.c" } default: { #line 172 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" g_error ("ExportDialog.vala:172: get_label_for_parameters: unrecognized export f" \ "ormat mode"); -#line 1028 "ExportDialog.c" +#line 1065 "ExportDialog.c" } } } -gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint* constraint, ExportFormatParameters* parameters) { +gboolean +export_dialog_execute (ExportDialog* self, + gint* scale, + ScaleConstraint* constraint, + ExportFormatParameters* parameters) +{ gint _vala_scale = 0; ScaleConstraint _vala_constraint = 0; gboolean result = FALSE; @@ -1040,12 +1082,11 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint ExportFormatMode _tmp1_; ExportFormatParameters _tmp4_; ExportFormatMode _tmp5_; - ExportFormatParameters _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; + ExportFormatParameters _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; gboolean ok = FALSE; - gint _tmp17_; - gboolean _tmp18_; + gboolean _tmp15_; #line 179 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" g_return_val_if_fail (IS_EXPORT_DIALOG (self), FALSE); #line 179 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" @@ -1058,7 +1099,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint _tmp1_ = _tmp0_.mode; #line 185 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" if (_tmp1_ != EXPORT_FORMAT_MODE_LAST) { -#line 1060 "ExportDialog.c" +#line 1101 "ExportDialog.c" ScaleConstraint _tmp2_; GtkComboBoxText* _tmp3_; #line 186 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" @@ -1071,7 +1112,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint _tmp3_ = self->priv->constraint_combo; #line 187 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 1073 "ExportDialog.c" +#line 1114 "ExportDialog.c" } #line 190 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _tmp4_ = *parameters; @@ -1079,13 +1120,13 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint _tmp5_ = _tmp4_.mode; #line 190 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" if (_tmp5_ == EXPORT_FORMAT_MODE_LAST) { -#line 1081 "ExportDialog.c" +#line 1122 "ExportDialog.c" ExportFormatParameters _tmp6_; #line 191 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _tmp6_ = export_dialog_current_parameters; #line 191 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" *parameters = _tmp6_; -#line 1087 "ExportDialog.c" +#line 1128 "ExportDialog.c" } else { gboolean _tmp7_ = FALSE; ExportFormatParameters _tmp8_; @@ -1096,317 +1137,296 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint _tmp9_ = _tmp8_.mode; #line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" if (_tmp9_ == EXPORT_FORMAT_MODE_SPECIFIED) { -#line 1098 "ExportDialog.c" +#line 1139 "ExportDialog.c" ExportFormatParameters _tmp10_; PhotoFileFormat _tmp11_; - gboolean _tmp12_; #line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _tmp10_ = *parameters; #line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _tmp11_ = _tmp10_.specified_format; #line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp12_ = photo_file_format_can_write (_tmp11_); -#line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp7_ = !_tmp12_; -#line 1110 "ExportDialog.c" + _tmp7_ = !photo_file_format_can_write (_tmp11_); +#line 1148 "ExportDialog.c" } else { #line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _tmp7_ = FALSE; -#line 1114 "ExportDialog.c" +#line 1152 "ExportDialog.c" } #line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" if (_tmp7_) { -#line 1118 "ExportDialog.c" - PhotoFileFormat _tmp13_; -#line 193 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp13_ = photo_file_format_get_system_default_format (); #line 193 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - (*parameters).specified_format = _tmp13_; -#line 1124 "ExportDialog.c" + (*parameters).specified_format = photo_file_format_get_system_default_format (); +#line 1158 "ExportDialog.c" } } #line 195 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp14_ = *parameters; + _tmp12_ = *parameters; #line 195 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp15_ = export_dialog_get_label_for_parameters (self, &_tmp14_); + _tmp13_ = export_dialog_get_label_for_parameters (self, &_tmp12_); #line 195 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp16_ = _tmp15_; + _tmp14_ = _tmp13_; #line 195 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_format_set_active_text (self, _tmp16_); + export_dialog_format_set_active_text (self, _tmp14_); #line 195 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp14_); #line 196 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" export_dialog_on_format_changed (self); #line 198 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); -#line 198 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - ok = _tmp17_ == ((gint) GTK_RESPONSE_OK); + ok = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)) == ((gint) GTK_RESPONSE_OK); #line 199 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp18_ = ok; + _tmp15_ = ok; #line 199 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (_tmp18_) { -#line 1147 "ExportDialog.c" + if (_tmp15_) { +#line 1179 "ExportDialog.c" gint index = 0; - GtkComboBoxText* _tmp19_; - gint _tmp20_; - gint _tmp21_; - gint _tmp22_; + GtkComboBoxText* _tmp16_; + gint _tmp17_; + gint _tmp18_; + ScaleConstraint _tmp19_; + ScaleConstraint _tmp20_; + GtkEntry* _tmp21_; + const gchar* _tmp22_; ScaleConstraint _tmp23_; - ScaleConstraint _tmp24_; - GtkEntry* _tmp25_; - const gchar* _tmp26_; - gint _tmp27_; - ScaleConstraint _tmp28_; - gint _tmp30_; - gboolean _tmp31_ = FALSE; - GtkSwitch* _tmp32_; - gboolean _tmp33_; - gboolean _tmp34_; - GtkComboBoxText* _tmp38_; - gchar* _tmp39_; - gchar* _tmp40_; - gboolean _tmp41_; + gint _tmp25_; + gboolean _tmp26_ = FALSE; + GtkSwitch* _tmp27_; + gboolean _tmp28_; + gboolean _tmp29_; + GtkComboBoxText* _tmp33_; + gchar* _tmp34_; + gchar* _tmp35_; + gboolean _tmp36_; ConfigFacade* config = NULL; + ConfigFacade* _tmp50_; + ConfigFacade* _tmp51_; + ExportFormatParameters _tmp52_; + ExportFormatMode _tmp53_; + ConfigFacade* _tmp54_; + ExportFormatParameters _tmp55_; + PhotoFileFormat _tmp56_; ConfigFacade* _tmp57_; - ConfigFacade* _tmp58_; - ExportFormatParameters _tmp59_; - ExportFormatMode _tmp60_; - ConfigFacade* _tmp61_; - ExportFormatParameters _tmp62_; - PhotoFileFormat _tmp63_; - ConfigFacade* _tmp64_; - ExportFormatParameters _tmp65_; - JpegQuality _tmp66_; - ConfigFacade* _tmp67_; - ExportFormatParameters _tmp68_; - gboolean _tmp69_; - ConfigFacade* _tmp70_; - ScaleConstraint _tmp71_; - ConfigFacade* _tmp72_; - gint _tmp73_; -#line 200 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp19_ = self->priv->constraint_combo; + ExportFormatParameters _tmp58_; + JpegQuality _tmp59_; + ConfigFacade* _tmp60_; + ExportFormatParameters _tmp61_; + gboolean _tmp62_; + ConfigFacade* _tmp63_; + ScaleConstraint _tmp64_; + ConfigFacade* _tmp65_; + gint _tmp66_; #line 200 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp20_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_combo_box_get_type (), GtkComboBox)); + _tmp16_ = self->priv->constraint_combo; #line 200 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - index = _tmp20_; + index = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox)); #line 201 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp21_ = index; + _tmp17_ = index; #line 201 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _vala_assert (_tmp21_ >= 0, "index >= 0"); + _vala_assert (_tmp17_ >= 0, "index >= 0"); #line 202 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp22_ = index; + _tmp18_ = index; #line 202 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp23_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[_tmp22_]; + _tmp19_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[_tmp18_]; #line 202 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _vala_constraint = _tmp23_; + _vala_constraint = _tmp19_; #line 203 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp24_ = _vala_constraint; + _tmp20_ = _vala_constraint; #line 203 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_current_constraint = _tmp24_; + export_dialog_current_constraint = _tmp20_; #line 205 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp25_ = self->priv->pixels_entry; + _tmp21_ = self->priv->pixels_entry; #line 205 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp26_ = gtk_entry_get_text (_tmp25_); + _tmp22_ = gtk_entry_get_text (_tmp21_); #line 205 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp27_ = atoi (_tmp26_); -#line 205 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _vala_scale = _tmp27_; + _vala_scale = atoi (_tmp22_); #line 206 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp28_ = _vala_constraint; + _tmp23_ = _vala_constraint; #line 206 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (_tmp28_ != SCALE_CONSTRAINT_ORIGINAL) { -#line 1218 "ExportDialog.c" - gint _tmp29_; + if (_tmp23_ != SCALE_CONSTRAINT_ORIGINAL) { +#line 1244 "ExportDialog.c" + gint _tmp24_; #line 207 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp29_ = _vala_scale; + _tmp24_ = _vala_scale; #line 207 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _vala_assert (_tmp29_ > 0, "scale > 0"); -#line 1224 "ExportDialog.c" + _vala_assert (_tmp24_ > 0, "scale > 0"); +#line 1250 "ExportDialog.c" } #line 208 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp30_ = _vala_scale; + _tmp25_ = _vala_scale; #line 208 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_current_scale = _tmp30_; + export_dialog_current_scale = _tmp25_; #line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp32_ = self->priv->export_metadata; + _tmp27_ = self->priv->export_metadata; #line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp33_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget)); + _tmp28_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget)); #line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp34_ = _tmp33_; + _tmp29_ = _tmp28_; #line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (_tmp34_) { -#line 1238 "ExportDialog.c" - GtkSwitch* _tmp35_; - gboolean _tmp36_; - gboolean _tmp37_; + if (_tmp29_) { +#line 1264 "ExportDialog.c" + GtkSwitch* _tmp30_; + gboolean _tmp31_; + gboolean _tmp32_; #line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp35_ = self->priv->export_metadata; + _tmp30_ = self->priv->export_metadata; #line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp36_ = gtk_switch_get_active (_tmp35_); + _tmp31_ = gtk_switch_get_active (_tmp30_); #line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp37_ = _tmp36_; + _tmp32_ = _tmp31_; #line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp31_ = _tmp37_; -#line 1250 "ExportDialog.c" + _tmp26_ = _tmp32_; +#line 1276 "ExportDialog.c" } else { #line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp31_ = FALSE; -#line 1254 "ExportDialog.c" + _tmp26_ = FALSE; +#line 1280 "ExportDialog.c" } #line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - (*parameters).export_metadata = _tmp31_; + (*parameters).export_metadata = _tmp26_; #line 212 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp38_ = self->priv->format_combo; + _tmp33_ = self->priv->format_combo; #line 212 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp39_ = gtk_combo_box_text_get_active_text (_tmp38_); + _tmp34_ = gtk_combo_box_text_get_active_text (_tmp33_); #line 212 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp40_ = _tmp39_; + _tmp35_ = _tmp34_; #line 212 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp41_ = g_strcmp0 (_tmp40_, EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL) == 0; + _tmp36_ = g_strcmp0 (_tmp35_, EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL) == 0; #line 212 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _g_free0 (_tmp40_); + _g_free0 (_tmp35_); #line 212 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (_tmp41_) { -#line 1270 "ExportDialog.c" - ExportFormatMode _tmp42_; + if (_tmp36_) { +#line 1296 "ExportDialog.c" + ExportFormatMode _tmp37_; #line 213 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_UNMODIFIED; #line 213 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp42_ = export_dialog_current_parameters.mode; + _tmp37_ = export_dialog_current_parameters.mode; #line 213 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - (*parameters).mode = _tmp42_; -#line 1278 "ExportDialog.c" + (*parameters).mode = _tmp37_; +#line 1304 "ExportDialog.c" } else { - GtkComboBoxText* _tmp43_; - gchar* _tmp44_; - gchar* _tmp45_; - gboolean _tmp46_; + GtkComboBoxText* _tmp38_; + gchar* _tmp39_; + gchar* _tmp40_; + gboolean _tmp41_; #line 214 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp43_ = self->priv->format_combo; + _tmp38_ = self->priv->format_combo; #line 214 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp44_ = gtk_combo_box_text_get_active_text (_tmp43_); + _tmp39_ = gtk_combo_box_text_get_active_text (_tmp38_); #line 214 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp45_ = _tmp44_; + _tmp40_ = _tmp39_; #line 214 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp46_ = g_strcmp0 (_tmp45_, EXPORT_DIALOG_CURRENT_FORMAT_LABEL) == 0; + _tmp41_ = g_strcmp0 (_tmp40_, EXPORT_DIALOG_CURRENT_FORMAT_LABEL) == 0; #line 214 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _g_free0 (_tmp45_); + _g_free0 (_tmp40_); #line 214 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (_tmp46_) { -#line 1296 "ExportDialog.c" - ExportFormatMode _tmp47_; + if (_tmp41_) { +#line 1322 "ExportDialog.c" + ExportFormatMode _tmp42_; #line 215 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_CURRENT; #line 215 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp47_ = export_dialog_current_parameters.mode; + _tmp42_ = export_dialog_current_parameters.mode; #line 215 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - (*parameters).mode = _tmp47_; -#line 1304 "ExportDialog.c" + (*parameters).mode = _tmp42_; +#line 1330 "ExportDialog.c" } else { - ExportFormatMode _tmp48_; - PhotoFileFormat _tmp49_; - PhotoFileFormat _tmp50_; - ExportFormatParameters _tmp51_; - PhotoFileFormat _tmp52_; + ExportFormatMode _tmp43_; + PhotoFileFormat _tmp44_; + ExportFormatParameters _tmp45_; + PhotoFileFormat _tmp46_; #line 217 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_SPECIFIED; #line 217 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp48_ = export_dialog_current_parameters.mode; + _tmp43_ = export_dialog_current_parameters.mode; #line 217 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - (*parameters).mode = _tmp48_; -#line 218 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp49_ = export_dialog_get_specified_format (self); + (*parameters).mode = _tmp43_; #line 218 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_current_parameters.specified_format = _tmp49_; + export_dialog_current_parameters.specified_format = export_dialog_get_specified_format (self); #line 218 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp50_ = export_dialog_current_parameters.specified_format; + _tmp44_ = export_dialog_current_parameters.specified_format; #line 218 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - (*parameters).specified_format = _tmp50_; + (*parameters).specified_format = _tmp44_; #line 219 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp51_ = export_dialog_current_parameters; + _tmp45_ = export_dialog_current_parameters; #line 219 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp52_ = _tmp51_.specified_format; + _tmp46_ = _tmp45_.specified_format; #line 219 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (_tmp52_ == PHOTO_FILE_FORMAT_JFIF) { -#line 1331 "ExportDialog.c" - GtkComboBoxText* _tmp53_; - gint _tmp54_; - JpegQuality _tmp55_; - JpegQuality _tmp56_; + if (_tmp46_ == PHOTO_FILE_FORMAT_JFIF) { +#line 1354 "ExportDialog.c" + GtkComboBoxText* _tmp47_; + JpegQuality _tmp48_; + JpegQuality _tmp49_; #line 220 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp53_ = self->priv->quality_combo; + _tmp47_ = self->priv->quality_combo; #line 220 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp54_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_combo_box_get_type (), GtkComboBox)); + _tmp48_ = EXPORT_DIALOG_QUALITY_ARRAY[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_combo_box_get_type (), GtkComboBox))]; #line 220 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp55_ = EXPORT_DIALOG_QUALITY_ARRAY[_tmp54_]; + export_dialog_current_parameters.quality = _tmp48_; #line 220 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - export_dialog_current_parameters.quality = _tmp55_; + _tmp49_ = export_dialog_current_parameters.quality; #line 220 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp56_ = export_dialog_current_parameters.quality; -#line 220 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - (*parameters).quality = _tmp56_; -#line 1348 "ExportDialog.c" + (*parameters).quality = _tmp49_; +#line 1368 "ExportDialog.c" } } } #line 224 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp57_ = config_facade_get_instance (); + _tmp50_ = config_facade_get_instance (); #line 224 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - config = _tmp57_; + config = _tmp50_; #line 225 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp58_ = config; + _tmp51_ = config; #line 225 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp59_ = export_dialog_current_parameters; + _tmp52_ = export_dialog_current_parameters; #line 225 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp60_ = _tmp59_.mode; + _tmp53_ = _tmp52_.mode; #line 225 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - configuration_facade_set_export_export_format_mode (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp60_); + configuration_facade_set_export_export_format_mode (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp53_); #line 226 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp61_ = config; + _tmp54_ = config; #line 226 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp62_ = export_dialog_current_parameters; + _tmp55_ = export_dialog_current_parameters; #line 226 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp63_ = _tmp62_.specified_format; + _tmp56_ = _tmp55_.specified_format; #line 226 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - configuration_facade_set_export_photo_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp63_); + configuration_facade_set_export_photo_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp56_); #line 227 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp64_ = config; + _tmp57_ = config; #line 227 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp65_ = export_dialog_current_parameters; + _tmp58_ = export_dialog_current_parameters; #line 227 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp66_ = _tmp65_.quality; + _tmp59_ = _tmp58_.quality; #line 227 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - configuration_facade_set_export_quality (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp66_); + configuration_facade_set_export_quality (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp59_); #line 228 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp67_ = config; + _tmp60_ = config; #line 228 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp68_ = export_dialog_current_parameters; + _tmp61_ = export_dialog_current_parameters; #line 228 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp69_ = _tmp68_.export_metadata; + _tmp62_ = _tmp61_.export_metadata; #line 228 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - configuration_facade_set_export_export_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp69_); + configuration_facade_set_export_export_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp62_); #line 229 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp70_ = config; + _tmp63_ = config; #line 229 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp71_ = export_dialog_current_constraint; + _tmp64_ = export_dialog_current_constraint; #line 229 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - configuration_facade_set_export_constraint (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp71_); + configuration_facade_set_export_constraint (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp64_); #line 230 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp72_ = config; + _tmp65_ = config; #line 230 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp73_ = export_dialog_current_scale; + _tmp66_ = export_dialog_current_scale; #line 230 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - configuration_facade_set_export_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp73_); + configuration_facade_set_export_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp66_); #line 199 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _g_object_unref0 (config); -#line 1402 "ExportDialog.c" +#line 1422 "ExportDialog.c" } else { #line 232 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _vala_scale = 0; #line 233 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _vala_constraint = SCALE_CONSTRAINT_ORIGINAL; -#line 1408 "ExportDialog.c" +#line 1428 "ExportDialog.c" } #line 236 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); @@ -1416,32 +1436,34 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint if (scale) { #line 238 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" *scale = _vala_scale; -#line 1418 "ExportDialog.c" +#line 1438 "ExportDialog.c" } #line 238 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" if (constraint) { #line 238 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" *constraint = _vala_constraint; -#line 1424 "ExportDialog.c" +#line 1444 "ExportDialog.c" } #line 238 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" return result; -#line 1428 "ExportDialog.c" +#line 1448 "ExportDialog.c" } -static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint x, gint y, GtkWidget* widget) { +static void +export_dialog_add_label (ExportDialog* self, + const gchar* text, + gint x, + gint y, + GtkWidget* widget) +{ GtkLabel* new_label = NULL; - const gchar* _tmp0_; + GtkLabel* _tmp0_; GtkLabel* _tmp1_; GtkLabel* _tmp2_; GtkLabel* _tmp3_; - GtkLabel* _tmp4_; - GtkWidget* _tmp5_; - GtkGrid* _tmp8_; - GtkLabel* _tmp9_; - gint _tmp10_; - gint _tmp11_; + GtkGrid* _tmp5_; + GtkLabel* _tmp6_; #line 241 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" g_return_if_fail (IS_EXPORT_DIALOG (self)); #line 241 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" @@ -1449,424 +1471,394 @@ static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint #line 241 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" g_return_if_fail ((widget == NULL) || GTK_IS_WIDGET (widget)); #line 242 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp0_ = text; -#line 242 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp1_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp0_); + _tmp0_ = (GtkLabel*) gtk_label_new_with_mnemonic (text); #line 242 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - g_object_ref_sink (_tmp1_); + g_object_ref_sink (_tmp0_); #line 242 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - new_label = _tmp1_; + new_label = _tmp0_; #line 243 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp2_ = new_label; + _tmp1_ = new_label; #line 243 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END); + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END); #line 244 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp3_ = new_label; + _tmp2_ = new_label; #line 244 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); + gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); #line 245 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp4_ = new_label; + _tmp3_ = new_label; #line 245 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_label_set_use_underline (_tmp4_, TRUE); + gtk_label_set_use_underline (_tmp3_, TRUE); #line 247 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp5_ = widget; -#line 247 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (_tmp5_ != NULL) { -#line 1474 "ExportDialog.c" - GtkLabel* _tmp6_; - GtkWidget* _tmp7_; -#line 248 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp6_ = new_label; + if (widget != NULL) { +#line 1492 "ExportDialog.c" + GtkLabel* _tmp4_; #line 248 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp7_ = widget; + _tmp4_ = new_label; #line 248 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_label_set_mnemonic_widget (_tmp6_, _tmp7_); -#line 1483 "ExportDialog.c" + gtk_label_set_mnemonic_widget (_tmp4_, widget); +#line 1498 "ExportDialog.c" } #line 250 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp8_ = self->priv->table; -#line 250 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp9_ = new_label; -#line 250 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp10_ = x; + _tmp5_ = self->priv->table; #line 250 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp11_ = y; + _tmp6_ = new_label; #line 250 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_grid_attach (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), _tmp10_, _tmp11_, 1, 1); + gtk_grid_attach (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), x, y, 1, 1); #line 241 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _g_object_unref0 (new_label); -#line 1497 "ExportDialog.c" +#line 1508 "ExportDialog.c" } -static void export_dialog_add_control (ExportDialog* self, GtkWidget* widget, gint x, gint y) { - GtkWidget* _tmp0_; - GtkWidget* _tmp1_; - GtkWidget* _tmp2_; - GtkWidget* _tmp3_; - GtkGrid* _tmp4_; - GtkWidget* _tmp5_; - gint _tmp6_; - gint _tmp7_; +static void +export_dialog_add_control (ExportDialog* self, + GtkWidget* widget, + gint x, + gint y) +{ + GtkGrid* _tmp0_; #line 253 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" g_return_if_fail (IS_EXPORT_DIALOG (self)); #line 253 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" g_return_if_fail (GTK_IS_WIDGET (widget)); #line 254 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp0_ = widget; -#line 254 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_halign (_tmp0_, GTK_ALIGN_FILL); -#line 255 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp1_ = widget; + gtk_widget_set_halign (widget, GTK_ALIGN_FILL); #line 255 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_valign (_tmp1_, GTK_ALIGN_CENTER); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); #line 256 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp2_ = widget; -#line 256 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_hexpand (_tmp2_, TRUE); -#line 257 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp3_ = widget; + gtk_widget_set_hexpand (widget, TRUE); #line 257 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_vexpand (_tmp3_, TRUE); + gtk_widget_set_vexpand (widget, TRUE); #line 259 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp4_ = self->priv->table; + _tmp0_ = self->priv->table; #line 259 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp5_ = widget; -#line 259 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp6_ = x; -#line 259 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp7_ = y; -#line 259 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_grid_attach (_tmp4_, _tmp5_, _tmp6_, _tmp7_, 1, 1); -#line 1540 "ExportDialog.c" + gtk_grid_attach (_tmp0_, widget, x, y, 1, 1); +#line 1535 "ExportDialog.c" } -static void export_dialog_on_constraint_changed (ExportDialog* self) { +static void +export_dialog_on_constraint_changed (ExportDialog* self) +{ gboolean original = FALSE; GtkComboBoxText* _tmp0_; - gint _tmp1_; - ScaleConstraint _tmp2_; + ScaleConstraint _tmp1_; gboolean jpeg = FALSE; - GtkComboBoxText* _tmp3_; + GtkComboBoxText* _tmp2_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; + PhotoFileFormatProperties* _tmp5_; PhotoFileFormatProperties* _tmp6_; - PhotoFileFormatProperties* _tmp7_; + gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; - gboolean _tmp10_; - GtkEntry* _tmp11_; - gboolean _tmp12_; - gboolean _tmp13_ = FALSE; - gboolean _tmp14_; - GtkComboBoxText* _tmp16_; - gboolean _tmp17_; + gboolean _tmp9_; + GtkEntry* _tmp10_; + gboolean _tmp11_; + gboolean _tmp12_ = FALSE; + gboolean _tmp13_; + GtkComboBoxText* _tmp15_; + gboolean _tmp16_; #line 262 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" g_return_if_fail (IS_EXPORT_DIALOG (self)); #line 263 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _tmp0_ = self->priv->constraint_combo; #line 263 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox)); -#line 263 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp2_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[_tmp1_]; + _tmp1_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox))]; #line 263 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - original = _tmp2_ == SCALE_CONSTRAINT_ORIGINAL; + original = _tmp1_ == SCALE_CONSTRAINT_ORIGINAL; #line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp3_ = self->priv->format_combo; + _tmp2_ = self->priv->format_combo; #line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp4_ = gtk_combo_box_text_get_active_text (_tmp3_); + _tmp3_ = gtk_combo_box_text_get_active_text (_tmp2_); #line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp6_ = photo_file_format_get_properties (PHOTO_FILE_FORMAT_JFIF); + _tmp5_ = photo_file_format_get_properties (PHOTO_FILE_FORMAT_JFIF); #line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp8_ = photo_file_format_properties_get_user_visible_name (_tmp7_); + _tmp7_ = photo_file_format_properties_get_user_visible_name (_tmp6_); #line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp10_ = g_strcmp0 (_tmp5_, _tmp9_) == 0; + _tmp9_ = g_strcmp0 (_tmp4_, _tmp8_) == 0; #line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp8_); #line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _photo_file_format_properties_unref0 (_tmp7_); + _photo_file_format_properties_unref0 (_tmp6_); #line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp4_); #line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - jpeg = _tmp10_; + jpeg = _tmp9_; #line 266 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp11_ = self->priv->pixels_entry; + _tmp10_ = self->priv->pixels_entry; #line 266 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp12_ = original; + _tmp11_ = original; #line 266 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), !_tmp12_); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), !_tmp11_); #line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp14_ = original; + _tmp13_ = original; #line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (!_tmp14_) { -#line 1608 "ExportDialog.c" - gboolean _tmp15_; + if (!_tmp13_) { +#line 1602 "ExportDialog.c" + gboolean _tmp14_; #line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp15_ = jpeg; + _tmp14_ = jpeg; #line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp13_ = _tmp15_; -#line 1614 "ExportDialog.c" + _tmp12_ = _tmp14_; +#line 1608 "ExportDialog.c" } else { #line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp13_ = FALSE; -#line 1618 "ExportDialog.c" + _tmp12_ = FALSE; +#line 1612 "ExportDialog.c" } #line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp16_ = self->priv->quality_combo; + _tmp15_ = self->priv->quality_combo; #line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), _tmp13_); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), _tmp12_); #line 268 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp17_ = original; + _tmp16_ = original; #line 268 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (_tmp17_) { -#line 1628 "ExportDialog.c" - GtkWidget* _tmp18_; + if (_tmp16_) { +#line 1622 "ExportDialog.c" + GtkWidget* _tmp17_; #line 269 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp18_ = self->priv->ok_button; + _tmp17_ = self->priv->ok_button; #line 269 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_sensitive (_tmp18_, TRUE); -#line 1634 "ExportDialog.c" + gtk_widget_set_sensitive (_tmp17_, TRUE); +#line 1628 "ExportDialog.c" } else { #line 271 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" export_dialog_on_pixels_changed (self); -#line 1638 "ExportDialog.c" +#line 1632 "ExportDialog.c" } } -static void export_dialog_on_format_changed (ExportDialog* self) { +static void +export_dialog_on_format_changed (ExportDialog* self) +{ gboolean original = FALSE; GtkComboBoxText* _tmp0_; - gint _tmp1_; - ScaleConstraint _tmp2_; - GtkComboBoxText* _tmp3_; + ScaleConstraint _tmp1_; + GtkComboBoxText* _tmp2_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; - gboolean _tmp6_; + gboolean _tmp5_; #line 274 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" g_return_if_fail (IS_EXPORT_DIALOG (self)); #line 275 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _tmp0_ = self->priv->constraint_combo; #line 275 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox)); + _tmp1_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox))]; #line 275 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp2_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[_tmp1_]; -#line 275 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - original = _tmp2_ == SCALE_CONSTRAINT_ORIGINAL; + original = _tmp1_ == SCALE_CONSTRAINT_ORIGINAL; #line 277 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp3_ = self->priv->format_combo; + _tmp2_ = self->priv->format_combo; #line 277 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp4_ = gtk_combo_box_text_get_active_text (_tmp3_); + _tmp3_ = gtk_combo_box_text_get_active_text (_tmp2_); #line 277 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 277 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp6_ = g_strcmp0 (_tmp5_, EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL) == 0; + _tmp5_ = g_strcmp0 (_tmp4_, EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL) == 0; #line 277 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp4_); #line 277 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (_tmp6_) { -#line 1674 "ExportDialog.c" + if (_tmp5_) { +#line 1667 "ExportDialog.c" + GtkComboBoxText* _tmp6_; GtkComboBoxText* _tmp7_; GtkComboBoxText* _tmp8_; - GtkComboBoxText* _tmp9_; - GtkEntry* _tmp10_; + GtkEntry* _tmp9_; + GtkSwitch* _tmp10_; GtkSwitch* _tmp11_; - GtkSwitch* _tmp12_; #line 282 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp7_ = self->priv->constraint_combo; + _tmp6_ = self->priv->constraint_combo; #line 282 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 283 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp8_ = self->priv->constraint_combo; + _tmp7_ = self->priv->constraint_combo; #line 283 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), FALSE); #line 284 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp9_ = self->priv->quality_combo; + _tmp8_ = self->priv->quality_combo; #line 284 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), FALSE); #line 285 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp10_ = self->priv->pixels_entry; + _tmp9_ = self->priv->pixels_entry; #line 285 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), FALSE); #line 286 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp11_ = self->priv->export_metadata; + _tmp10_ = self->priv->export_metadata; #line 286 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_switch_set_active (_tmp11_, FALSE); + gtk_switch_set_active (_tmp10_, FALSE); #line 287 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp12_ = self->priv->export_metadata; + _tmp11_ = self->priv->export_metadata; #line 287 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 1705 "ExportDialog.c" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), FALSE); +#line 1698 "ExportDialog.c" } else { - GtkComboBoxText* _tmp13_; + GtkComboBoxText* _tmp12_; + gchar* _tmp13_; gchar* _tmp14_; - gchar* _tmp15_; - gboolean _tmp16_; + gboolean _tmp15_; #line 288 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp13_ = self->priv->format_combo; + _tmp12_ = self->priv->format_combo; #line 288 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp14_ = gtk_combo_box_text_get_active_text (_tmp13_); + _tmp13_ = gtk_combo_box_text_get_active_text (_tmp12_); #line 288 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 288 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp16_ = g_strcmp0 (_tmp15_, EXPORT_DIALOG_CURRENT_FORMAT_LABEL) == 0; + _tmp15_ = g_strcmp0 (_tmp14_, EXPORT_DIALOG_CURRENT_FORMAT_LABEL) == 0; #line 288 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp14_); #line 288 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (_tmp16_) { -#line 1723 "ExportDialog.c" + if (_tmp15_) { +#line 1716 "ExportDialog.c" + GtkComboBoxText* _tmp16_; GtkComboBoxText* _tmp17_; - GtkComboBoxText* _tmp18_; - GtkEntry* _tmp19_; - gboolean _tmp20_; - GtkSwitch* _tmp21_; + GtkEntry* _tmp18_; + gboolean _tmp19_; + GtkSwitch* _tmp20_; #line 295 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp17_ = self->priv->constraint_combo; + _tmp16_ = self->priv->constraint_combo; #line 295 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), TRUE); #line 296 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp18_ = self->priv->quality_combo; + _tmp17_ = self->priv->quality_combo; #line 296 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE); #line 297 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp19_ = self->priv->pixels_entry; + _tmp18_ = self->priv->pixels_entry; #line 297 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp20_ = original; + _tmp19_ = original; #line 297 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), !_tmp20_); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), !_tmp19_); #line 298 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp21_ = self->priv->export_metadata; + _tmp20_ = self->priv->export_metadata; #line 298 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 1747 "ExportDialog.c" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), TRUE); +#line 1740 "ExportDialog.c" } else { - GtkComboBoxText* _tmp22_; + GtkComboBoxText* _tmp21_; gboolean jpeg = FALSE; - PhotoFileFormat _tmp23_; - gboolean _tmp24_ = FALSE; - gboolean _tmp25_; - GtkComboBoxText* _tmp27_; - GtkSwitch* _tmp28_; + gboolean _tmp22_ = FALSE; + gboolean _tmp23_; + GtkComboBoxText* _tmp25_; + GtkSwitch* _tmp26_; #line 303 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp22_ = self->priv->constraint_combo; + _tmp21_ = self->priv->constraint_combo; #line 303 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 304 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp23_ = export_dialog_get_specified_format (self); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE); #line 304 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - jpeg = _tmp23_ == PHOTO_FILE_FORMAT_JFIF; + jpeg = export_dialog_get_specified_format (self) == PHOTO_FILE_FORMAT_JFIF; #line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp25_ = original; + _tmp23_ = original; #line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (!_tmp25_) { -#line 1768 "ExportDialog.c" - gboolean _tmp26_; + if (!_tmp23_) { +#line 1758 "ExportDialog.c" + gboolean _tmp24_; #line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp26_ = jpeg; + _tmp24_ = jpeg; #line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp24_ = _tmp26_; -#line 1774 "ExportDialog.c" + _tmp22_ = _tmp24_; +#line 1764 "ExportDialog.c" } else { #line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp24_ = FALSE; -#line 1778 "ExportDialog.c" + _tmp22_ = FALSE; +#line 1768 "ExportDialog.c" } #line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp27_ = self->priv->quality_combo; + _tmp25_ = self->priv->quality_combo; #line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), _tmp24_); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), _tmp22_); #line 306 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp28_ = self->priv->export_metadata; + _tmp26_ = self->priv->export_metadata; #line 306 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 1788 "ExportDialog.c" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), TRUE); +#line 1778 "ExportDialog.c" } } } -static void export_dialog_on_activate (ExportDialog* self) { +static void +export_dialog_on_activate (ExportDialog* self) +{ #line 310 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" g_return_if_fail (IS_EXPORT_DIALOG (self)); #line 311 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" gtk_dialog_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK); -#line 1799 "ExportDialog.c" +#line 1791 "ExportDialog.c" } -static void export_dialog_on_pixels_changed (ExportDialog* self) { +static void +export_dialog_on_pixels_changed (ExportDialog* self) +{ gboolean _tmp0_ = FALSE; GtkEntry* _tmp1_; - guint16 _tmp2_; - GtkWidget* _tmp6_; + GtkWidget* _tmp4_; #line 314 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" g_return_if_fail (IS_EXPORT_DIALOG (self)); #line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _tmp1_ = self->priv->pixels_entry; #line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp2_ = gtk_entry_get_text_length (_tmp1_); -#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (((gint) _tmp2_) > 0) { -#line 1816 "ExportDialog.c" - GtkEntry* _tmp3_; - const gchar* _tmp4_; - gint _tmp5_; -#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp3_ = self->priv->pixels_entry; + if (((gint) gtk_entry_get_text_length (_tmp1_)) > 0) { +#line 1807 "ExportDialog.c" + GtkEntry* _tmp2_; + const gchar* _tmp3_; #line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp4_ = gtk_entry_get_text (_tmp3_); + _tmp2_ = self->priv->pixels_entry; #line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp5_ = atoi (_tmp4_); + _tmp3_ = gtk_entry_get_text (_tmp2_); #line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp0_ = _tmp5_ > 0; -#line 1828 "ExportDialog.c" + _tmp0_ = atoi (_tmp3_) > 0; +#line 1816 "ExportDialog.c" } else { #line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _tmp0_ = FALSE; -#line 1832 "ExportDialog.c" +#line 1820 "ExportDialog.c" } #line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp6_ = self->priv->ok_button; + _tmp4_ = self->priv->ok_button; #line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_widget_set_sensitive (_tmp6_, _tmp0_); -#line 1838 "ExportDialog.c" + gtk_widget_set_sensitive (_tmp4_, _tmp0_); +#line 1826 "ExportDialog.c" } -static gchar string_get (const gchar* self, glong index) { +static gchar +string_get (const gchar* self, + glong index) +{ gchar result = '\0'; - glong _tmp0_; - gchar _tmp1_; -#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar _tmp0_; +#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = index; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = ((gchar*) self)[index]; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1856 "ExportDialog.c" +#line 1844 "ExportDialog.c" } -static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar* text, gint length, gint* position) { +static void +export_dialog_on_pixels_insert_text (ExportDialog* self, + const gchar* text, + gint length, + gint* position) +{ gboolean _tmp0_; - gint _tmp1_; gchar* new_text = NULL; - gchar* _tmp5_; - const gchar* _tmp21_; - gint _tmp22_; - gint _tmp23_; - GtkEntry* _tmp29_; + gchar* _tmp3_; + const gchar* _tmp13_; + gint _tmp14_; + gint _tmp15_; + GtkEntry* _tmp21_; #line 318 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" g_return_if_fail (IS_EXPORT_DIALOG (self)); #line 318 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" @@ -1877,157 +1869,136 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar if (_tmp0_) { #line 321 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" return; -#line 1879 "ExportDialog.c" +#line 1871 "ExportDialog.c" } #line 323 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" self->priv->in_insert = TRUE; #line 325 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp1_ = length; -#line 325 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (_tmp1_ == -1) { -#line 1887 "ExportDialog.c" - const gchar* _tmp2_; - gint _tmp3_; - gint _tmp4_; + if (length == -1) { +#line 1877 "ExportDialog.c" + gint _tmp1_; + gint _tmp2_; #line 326 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp2_ = text; + _tmp1_ = strlen (text); #line 326 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp3_ = strlen (_tmp2_); + _tmp2_ = _tmp1_; #line 326 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp4_ = _tmp3_; -#line 326 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - length = (gint) _tmp4_; -#line 1899 "ExportDialog.c" + length = (gint) _tmp2_; +#line 1886 "ExportDialog.c" } #line 329 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp5_ = g_strdup (""); + _tmp3_ = g_strdup (""); #line 329 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - new_text = _tmp5_; -#line 1905 "ExportDialog.c" + new_text = _tmp3_; +#line 1892 "ExportDialog.c" { gint ctr = 0; #line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" ctr = 0; -#line 1910 "ExportDialog.c" +#line 1897 "ExportDialog.c" { - gboolean _tmp6_ = FALSE; + gboolean _tmp4_ = FALSE; #line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp6_ = TRUE; + _tmp4_ = TRUE; #line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" while (TRUE) { -#line 1917 "ExportDialog.c" - gint _tmp8_; - gint _tmp9_; - const gchar* _tmp10_; - gint _tmp11_; - gchar _tmp12_; - gboolean _tmp13_; +#line 1904 "ExportDialog.c" + gint _tmp6_; + gint _tmp7_; #line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (!_tmp6_) { -#line 1926 "ExportDialog.c" - gint _tmp7_; + if (!_tmp4_) { +#line 1909 "ExportDialog.c" + gint _tmp5_; #line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp7_ = ctr; + _tmp5_ = ctr; #line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - ctr = _tmp7_ + 1; -#line 1932 "ExportDialog.c" + ctr = _tmp5_ + 1; +#line 1915 "ExportDialog.c" } #line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp6_ = FALSE; -#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp8_ = ctr; + _tmp4_ = FALSE; #line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp9_ = length; + _tmp6_ = ctr; #line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (!(_tmp8_ < _tmp9_)) { + if (!(_tmp6_ < length)) { #line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" break; -#line 1944 "ExportDialog.c" +#line 1925 "ExportDialog.c" } #line 331 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp10_ = text; -#line 331 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp11_ = ctr; -#line 331 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp12_ = string_get (_tmp10_, (glong) _tmp11_); + _tmp7_ = ctr; #line 331 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp13_ = g_ascii_isdigit (_tmp12_); -#line 331 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (_tmp13_) { -#line 1956 "ExportDialog.c" - const gchar* _tmp14_; - const gchar* _tmp15_; - gint _tmp16_; - gchar _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; -#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp14_ = new_text; -#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp15_ = text; + if (g_ascii_isdigit (string_get (text, (glong) _tmp7_))) { +#line 1931 "ExportDialog.c" + const gchar* _tmp8_; + gint _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; #line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp16_ = ctr; + _tmp8_ = new_text; #line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp17_ = string_get (_tmp15_, (glong) _tmp16_); + _tmp9_ = ctr; #line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp18_ = g_strdup_printf ("%c", (gchar) _tmp17_); + _tmp10_ = g_strdup_printf ("%c", (gchar) string_get (text, (glong) _tmp9_)); #line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp19_ = _tmp18_; + _tmp11_ = _tmp10_; #line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp20_ = g_strconcat (_tmp14_, _tmp19_, NULL); + _tmp12_ = g_strconcat (_tmp8_, _tmp11_, NULL); #line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _g_free0 (new_text); #line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - new_text = _tmp20_; + new_text = _tmp12_; #line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _g_free0 (_tmp19_); -#line 1984 "ExportDialog.c" + _g_free0 (_tmp11_); +#line 1953 "ExportDialog.c" } } } } #line 336 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp21_ = new_text; + _tmp13_ = new_text; #line 336 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp22_ = strlen (_tmp21_); + _tmp14_ = strlen (_tmp13_); #line 336 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp23_ = _tmp22_; + _tmp15_ = _tmp14_; #line 336 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - if (_tmp23_ > 0) { -#line 1997 "ExportDialog.c" - GtkEntry* _tmp24_; - const gchar* _tmp25_; - const gchar* _tmp26_; - gint _tmp27_; - gint _tmp28_; + if (_tmp15_ > 0) { +#line 1966 "ExportDialog.c" + GtkEntry* _tmp16_; + const gchar* _tmp17_; + const gchar* _tmp18_; + gint _tmp19_; + gint _tmp20_; #line 337 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp24_ = self->priv->pixels_entry; + _tmp16_ = self->priv->pixels_entry; #line 337 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp25_ = new_text; + _tmp17_ = new_text; #line 337 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp26_ = new_text; + _tmp18_ = new_text; #line 337 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp27_ = strlen (_tmp26_); + _tmp19_ = strlen (_tmp18_); #line 337 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp28_ = _tmp27_; + _tmp20_ = _tmp19_; #line 337 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), _tmp25_, (gint) _tmp28_, position); -#line 2015 "ExportDialog.c" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_editable_get_type (), GtkEditable), "insert-text", _tmp17_, (gint) _tmp20_, position); +#line 1984 "ExportDialog.c" } #line 339 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - _tmp29_ = self->priv->pixels_entry; + _tmp21_ = self->priv->pixels_entry; #line 339 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" - g_signal_stop_emission_by_name (_tmp29_, "insert-text"); + g_signal_stop_emission_by_name (_tmp21_, "insert-text"); #line 341 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" self->priv->in_insert = FALSE; #line 318 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" _g_free0 (new_text); -#line 2025 "ExportDialog.c" +#line 1994 "ExportDialog.c" } -static void export_dialog_class_init (ExportDialogClass * klass) { +static void +export_dialog_class_init (ExportDialogClass * klass) +{ ExportFormatParameters _tmp0_ = {0}; #line 8 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" export_dialog_parent_class = g_type_class_peek_parent (klass); @@ -2041,11 +2012,13 @@ static void export_dialog_class_init (ExportDialogClass * klass) { export_dialog_current_parameters = _tmp0_; #line 26 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" export_dialog_current_scale = EXPORT_DIALOG_DEFAULT_SCALE; -#line 2043 "ExportDialog.c" +#line 2014 "ExportDialog.c" } -static void export_dialog_instance_init (ExportDialog * self) { +static void +export_dialog_instance_init (ExportDialog * self) +{ GtkGrid* _tmp0_; GeeArrayList* _tmp1_; #line 8 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" @@ -2062,11 +2035,13 @@ static void export_dialog_instance_init (ExportDialog * self) { self->priv->format_options = _tmp1_; #line 36 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" self->priv->in_insert = FALSE; -#line 2064 "ExportDialog.c" +#line 2037 "ExportDialog.c" } -static void export_dialog_finalize (GObject * obj) { +static void +export_dialog_finalize (GObject * obj) +{ ExportDialog * self; #line 8 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXPORT_DIALOG, ExportDialog); @@ -2088,11 +2063,13 @@ static void export_dialog_finalize (GObject * obj) { _g_object_unref0 (self->priv->ok_button); #line 8 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala" G_OBJECT_CLASS (export_dialog_parent_class)->finalize (obj); -#line 2090 "ExportDialog.c" +#line 2065 "ExportDialog.c" } -GType export_dialog_get_type (void) { +GType +export_dialog_get_type (void) +{ static volatile gsize export_dialog_type_id__volatile = 0; if (g_once_init_enter (&export_dialog_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ExportDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) export_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ExportDialog), 0, (GInstanceInitFunc) export_dialog_instance_init, NULL }; diff --git a/src/dialogs/MultiTextEntryDialog.c b/src/dialogs/MultiTextEntryDialog.c index 7e682a6..e33e415 100644 --- a/src/dialogs/MultiTextEntryDialog.c +++ b/src/dialogs/MultiTextEntryDialog.c @@ -1,4 +1,4 @@ -/* MultiTextEntryDialog.c generated by valac 0.36.6, the Vala compiler +/* MultiTextEntryDialog.c generated by valac 0.40.4, the Vala compiler * generated from MultiTextEntryDialog.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -8,6 +8,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -25,6 +26,11 @@ typedef struct _MultiTextEntryDialog MultiTextEntryDialog; typedef struct _MultiTextEntryDialogClass MultiTextEntryDialogClass; typedef struct _MultiTextEntryDialogPrivate MultiTextEntryDialogPrivate; +enum { + MULTI_TEXT_ENTRY_DIALOG_0_PROPERTY, + MULTI_TEXT_ENTRY_DIALOG_NUM_PROPERTIES +}; +static GParamSpec* multi_text_entry_dialog_properties[MULTI_TEXT_ENTRY_DIALOG_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define TYPE_PAGE_WINDOW (page_window_get_type ()) @@ -69,13 +75,15 @@ static gpointer multi_text_entry_dialog_parent_class = NULL; GType multi_text_entry_dialog_get_type (void) G_GNUC_CONST; #define MULTI_TEXT_ENTRY_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MULTI_TEXT_ENTRY_DIALOG, MultiTextEntryDialogPrivate)) -enum { - MULTI_TEXT_ENTRY_DIALOG_DUMMY_PROPERTY -}; MultiTextEntryDialog* multi_text_entry_dialog_new (void); MultiTextEntryDialog* multi_text_entry_dialog_construct (GType object_type); gint resources_use_header_bar (void); -void multi_text_entry_dialog_setup (MultiTextEntryDialog* self, MultiTextEntryDialogOnModifyValidateType modify_validate, void* modify_validate_target, const gchar* title, const gchar* label, const gchar* initial_text); +void multi_text_entry_dialog_setup (MultiTextEntryDialog* self, + MultiTextEntryDialogOnModifyValidateType modify_validate, + void* modify_validate_target, + const gchar* title, + const gchar* label, + const gchar* initial_text); GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); @@ -83,41 +91,45 @@ gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self); static void multi_text_entry_dialog_finalize (GObject * obj); -MultiTextEntryDialog* multi_text_entry_dialog_construct (GType object_type) { +MultiTextEntryDialog* +multi_text_entry_dialog_construct (GType object_type) +{ MultiTextEntryDialog * self = NULL; - gint _tmp0_; -#line 17 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp0_ = resources_use_header_bar (); #line 17 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - self = (MultiTextEntryDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL); + self = (MultiTextEntryDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL); #line 16 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" return self; -#line 96 "MultiTextEntryDialog.c" +#line 103 "MultiTextEntryDialog.c" } -MultiTextEntryDialog* multi_text_entry_dialog_new (void) { +MultiTextEntryDialog* +multi_text_entry_dialog_new (void) +{ #line 16 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" return multi_text_entry_dialog_construct (TYPE_MULTI_TEXT_ENTRY_DIALOG); -#line 103 "MultiTextEntryDialog.c" +#line 112 "MultiTextEntryDialog.c" } -void multi_text_entry_dialog_setup (MultiTextEntryDialog* self, MultiTextEntryDialogOnModifyValidateType modify_validate, void* modify_validate_target, const gchar* title, const gchar* label, const gchar* initial_text) { - const gchar* _tmp0_; +void +multi_text_entry_dialog_setup (MultiTextEntryDialog* self, + MultiTextEntryDialogOnModifyValidateType modify_validate, + void* modify_validate_target, + const gchar* title, + const gchar* label, + const gchar* initial_text) +{ + AppWindow* _tmp0_; AppWindow* _tmp1_; - AppWindow* _tmp2_; - GdkWindow* _tmp3_; + GdkWindow* _tmp2_; + AppWindow* _tmp3_; AppWindow* _tmp4_; - AppWindow* _tmp5_; - MultiTextEntryDialogOnModifyValidateType _tmp6_; - void* _tmp6__target; - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_; - GtkTextView* _tmp10_; - GtkTextBuffer* _tmp11_; - GtkTextBuffer* _tmp12_; - GtkTextView* _tmp13_; + const gchar* _tmp5_ = NULL; + GtkTextView* _tmp6_; + GtkTextBuffer* _tmp7_; + GtkTextBuffer* _tmp8_; + GtkTextView* _tmp9_; #line 20 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" g_return_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self)); #line 20 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" @@ -125,71 +137,60 @@ void multi_text_entry_dialog_setup (MultiTextEntryDialog* self, MultiTextEntryDi #line 20 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" g_return_if_fail (label != NULL); #line 21 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp0_ = title; -#line 21 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_); + gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), title); #line 22 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp1_ = app_window_get_instance (); + _tmp0_ = app_window_get_instance (); #line 22 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 22 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); + _tmp2_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); #line 22 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp3_); + gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp2_); #line 22 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 23 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp4_ = app_window_get_instance (); + _tmp3_ = app_window_get_instance (); #line 23 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 23 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow)); + gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow)); #line 23 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _g_object_unref0 (_tmp5_); -#line 24 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp6_ = modify_validate; -#line 24 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp6__target = modify_validate_target; + _g_object_unref0 (_tmp4_); #line 24 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - self->priv->on_modify_validate = _tmp6_; + self->priv->on_modify_validate = modify_validate; #line 24 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - self->priv->on_modify_validate_target = _tmp6__target; + self->priv->on_modify_validate_target = modify_validate_target; #line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp8_ = initial_text; + if (initial_text != NULL) { #line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - if (_tmp8_ != NULL) { -#line 162 "MultiTextEntryDialog.c" - const gchar* _tmp9_; -#line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp9_ = initial_text; -#line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp7_ = _tmp9_; + _tmp5_ = initial_text; #line 168 "MultiTextEntryDialog.c" } else { #line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp7_ = ""; + _tmp5_ = ""; #line 172 "MultiTextEntryDialog.c" } #line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp10_ = self->priv->entry; + _tmp6_ = self->priv->entry; #line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp11_ = gtk_text_view_get_buffer (_tmp10_); + _tmp7_ = gtk_text_view_get_buffer (_tmp6_); #line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - g_object_set (_tmp12_, "text", _tmp7_, NULL); + g_object_set (_tmp8_, "text", _tmp5_, NULL); #line 28 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp13_ = self->priv->entry; + _tmp9_ = self->priv->entry; #line 28 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); #line 186 "MultiTextEntryDialog.c" } -gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self) { +gchar* +multi_text_entry_dialog_execute (MultiTextEntryDialog* self) +{ gchar* result = NULL; gchar* text = NULL; - gint _tmp0_; #line 31 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" g_return_val_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self), NULL); #line 32 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" @@ -197,30 +198,28 @@ gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self) { #line 34 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 36 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); -#line 36 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) { -#line 204 "MultiTextEntryDialog.c" - GtkTextView* _tmp1_; + if (gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)) == ((gint) GTK_RESPONSE_OK)) { +#line 203 "MultiTextEntryDialog.c" + GtkTextView* _tmp0_; + GtkTextBuffer* _tmp1_; GtkTextBuffer* _tmp2_; - GtkTextBuffer* _tmp3_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; #line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp1_ = self->priv->entry; + _tmp0_ = self->priv->entry; #line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp2_ = gtk_text_view_get_buffer (_tmp1_); + _tmp1_ = gtk_text_view_get_buffer (_tmp0_); #line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - g_object_get (_tmp3_, "text", &_tmp4_, NULL); + g_object_get (_tmp2_, "text", &_tmp3_, NULL); #line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" _g_free0 (text); #line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" - text = _tmp5_; -#line 224 "MultiTextEntryDialog.c" + text = _tmp4_; +#line 223 "MultiTextEntryDialog.c" } #line 39 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); @@ -228,11 +227,13 @@ gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self) { result = text; #line 41 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" return result; -#line 232 "MultiTextEntryDialog.c" +#line 231 "MultiTextEntryDialog.c" } -static void multi_text_entry_dialog_class_init (MultiTextEntryDialogClass * klass) { +static void +multi_text_entry_dialog_class_init (MultiTextEntryDialogClass * klass) +{ gint MultiTextEntryDialog_private_offset; #line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" multi_text_entry_dialog_parent_class = g_type_class_peek_parent (klass); @@ -246,20 +247,24 @@ static void multi_text_entry_dialog_class_init (MultiTextEntryDialogClass * klas gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/multitextentrydialog.ui"); #line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "entry", FALSE, MultiTextEntryDialog_private_offset + G_STRUCT_OFFSET (MultiTextEntryDialogPrivate, entry)); -#line 250 "MultiTextEntryDialog.c" +#line 251 "MultiTextEntryDialog.c" } -static void multi_text_entry_dialog_instance_init (MultiTextEntryDialog * self) { +static void +multi_text_entry_dialog_instance_init (MultiTextEntryDialog * self) +{ #line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" self->priv = MULTI_TEXT_ENTRY_DIALOG_GET_PRIVATE (self); #line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 259 "MultiTextEntryDialog.c" +#line 262 "MultiTextEntryDialog.c" } -static void multi_text_entry_dialog_finalize (GObject * obj) { +static void +multi_text_entry_dialog_finalize (GObject * obj) +{ MultiTextEntryDialog * self; #line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTI_TEXT_ENTRY_DIALOG, MultiTextEntryDialog); @@ -267,11 +272,13 @@ static void multi_text_entry_dialog_finalize (GObject * obj) { _g_object_unref0 (self->priv->entry); #line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala" G_OBJECT_CLASS (multi_text_entry_dialog_parent_class)->finalize (obj); -#line 271 "MultiTextEntryDialog.c" +#line 276 "MultiTextEntryDialog.c" } -GType multi_text_entry_dialog_get_type (void) { +GType +multi_text_entry_dialog_get_type (void) +{ static volatile gsize multi_text_entry_dialog_type_id__volatile = 0; if (g_once_init_enter (&multi_text_entry_dialog_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MultiTextEntryDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) multi_text_entry_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MultiTextEntryDialog), 0, (GInstanceInitFunc) multi_text_entry_dialog_instance_init, NULL }; diff --git a/src/dialogs/Preferences.c b/src/dialogs/Preferences.c index 855b11d..7a77423 100644 --- a/src/dialogs/Preferences.c +++ b/src/dialogs/Preferences.c @@ -1,4 +1,4 @@ -/* Preferences.c generated by valac 0.36.6, the Vala compiler +/* Preferences.c generated by valac 0.40.4, the Vala compiler * generated from Preferences.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -8,6 +8,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -63,6 +64,11 @@ typedef struct _PreferencesDialogPathFormatClass PreferencesDialogPathFormatClas typedef struct _PluginsManifestWidgetMediator PluginsManifestWidgetMediator; typedef struct _PluginsManifestWidgetMediatorClass PluginsManifestWidgetMediatorClass; +enum { + PREFERENCES_DIALOG_0_PROPERTY, + PREFERENCES_DIALOG_NUM_PROPERTIES +}; +static GParamSpec* preferences_dialog_properties[PREFERENCES_DIALOG_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) #define _g_date_time_unref0(var) ((var == NULL) ? NULL : (var = (g_date_time_unref (var), NULL))) @@ -198,16 +204,19 @@ GType preferences_dialog_get_type (void) G_GNUC_CONST; GType sorted_list_get_type (void) G_GNUC_CONST; static gpointer preferences_dialog_path_format_ref (gpointer instance); static void preferences_dialog_path_format_unref (gpointer instance); -static GParamSpec* preferences_dialog_param_spec_path_format (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; -static void preferences_dialog_value_set_path_format (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void preferences_dialog_value_take_path_format (GValue* value, gpointer v_object) G_GNUC_UNUSED; +static GParamSpec* preferences_dialog_param_spec_path_format (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) G_GNUC_UNUSED; +static void preferences_dialog_value_set_path_format (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void preferences_dialog_value_take_path_format (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer preferences_dialog_value_get_path_format (const GValue* value) G_GNUC_UNUSED; static GType preferences_dialog_path_format_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; GType plugins_manifest_widget_mediator_get_type (void) G_GNUC_CONST; #define PREFERENCES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PREFERENCES_DIALOG, PreferencesDialogPrivate)) -enum { - PREFERENCES_DIALOG_DUMMY_PROPERTY -}; PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_new (void); PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_construct (GType object_type); static PreferencesDialog* preferences_dialog_new (void); @@ -217,62 +226,102 @@ GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); static gboolean preferences_dialog_on_delete (PreferencesDialog* self); -static gboolean _preferences_dialog_on_delete_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self); +static gboolean _preferences_dialog_on_delete_gtk_widget_delete_event (GtkWidget* _sender, + GdkEventAny* event, + gpointer self); static void preferences_dialog_on_close (PreferencesDialog* self); -static void _preferences_dialog_on_close_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self); +static void _preferences_dialog_on_close_gtk_dialog_response (GtkDialog* _sender, + gint response_id, + gpointer self); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); -void config_facade_get_bg_color (ConfigFacade* self, GdkRGBA* result); +void config_facade_get_bg_color (ConfigFacade* self, + GdkRGBA* result); static void preferences_dialog_on_value_changed (PreferencesDialog* self); -static void _preferences_dialog_on_value_changed_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self); -static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, GdkEventButton* event); -static gboolean _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); +static void _preferences_dialog_on_value_changed_gtk_adjustment_value_changed (GtkAdjustment* _sender, + gpointer self); +static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, + GdkEventButton* event); +static gboolean _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self); static void preferences_dialog_on_radio_changed (PreferencesDialog* self); -static void _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self); +static void _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, + gpointer self); gchar* configuration_facade_get_transparent_background_color (ConfigurationFacade* self); static void preferences_dialog_on_color_changed (PreferencesDialog* self); -static void _preferences_dialog_on_color_changed_gtk_color_button_color_set (GtkColorButton* _sender, gpointer self); +static void _preferences_dialog_on_color_changed_gtk_color_button_color_set (GtkColorButton* _sender, + gpointer self); gchar* configuration_facade_get_transparent_background_type (ConfigurationFacade* self); gchar* resources_get_help_path (void); #define RESOURCES_DIR_PATTERN_URI_SYSWIDE "help:shotwell/other-files" -static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* self, const gchar* ignore); -static gboolean _preferences_dialog_on_local_pattern_help_gtk_label_activate_link (GtkLabel* _sender, const gchar* uri, gpointer self); -static void preferences_dialog_add_to_dir_formats (PreferencesDialog* self, const gchar* name, const gchar* pattern); +static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* self, + const gchar* ignore); +static gboolean _preferences_dialog_on_local_pattern_help_gtk_label_activate_link (GtkLabel* _sender, + const gchar* uri, + gpointer self); +static void preferences_dialog_add_to_dir_formats (PreferencesDialog* self, + const gchar* name, + const gchar* pattern); static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog* self); -static void _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); +static void _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self); static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog* self); -static void _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self); +static void _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed (GtkEditable* _sender, + gpointer self); static void preferences_dialog_on_lowercase_toggled (PreferencesDialog* self); -static void _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self); +static void _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, + gpointer self); void preferences_dialog_populate_preference_options (PreferencesDialog* self); static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self); -static void _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); +static void _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self); static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self); -static void _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); +static void _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self); gboolean configuration_facade_get_auto_import_from_library (ConfigurationFacade* self); gboolean configuration_facade_get_commit_metadata_to_masters (ConfigurationFacade* self); GType raw_developer_get_type (void) G_GNUC_CONST; gchar* raw_developer_get_label (RawDeveloper self); -static void preferences_dialog_set_raw_developer_combo (PreferencesDialog* self, RawDeveloper d); +static void preferences_dialog_set_raw_developer_combo (PreferencesDialog* self, + RawDeveloper d); RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self); static void preferences_dialog_on_default_raw_developer_changed (PreferencesDialog* self); -static void _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); -static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, GtkComboBox* combo_box, gchar** mime_types, int mime_types_length1, const gchar* current_app_executable, SortedList* * external_apps); +static void _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self); +static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, + GtkComboBox* combo_box, + gchar** mime_types, + int mime_types_length1, + const gchar* current_app_executable, + SortedList* * external_apps); gchar** photo_file_format_get_editable_mime_types (int* result_length1); gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self); GType photo_file_format_get_type (void) G_GNUC_CONST; -gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_length1); +gchar** photo_file_format_get_mime_types (PhotoFileFormat self, + int* result_length1); gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self); -static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkComboBox* combo_box, GtkEntry* entry); +static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, + GtkComboBox* combo_box, + GtkEntry* entry); gboolean configuration_facade_get_use_lowercase_filenames (ConfigurationFacade* self); -void configuration_facade_set_transparent_background_type (ConfigurationFacade* self, const gchar* type); -void configuration_facade_set_transparent_background_color (ConfigurationFacade* self, const gchar* color_name); -void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** error); -SortedList* desktop_integration_get_apps_for_mime_types (gchar** mime_types, int mime_types_length1); -GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gboolean scale_up); +void configuration_facade_set_transparent_background_type (ConfigurationFacade* self, + const gchar* type); +void configuration_facade_set_transparent_background_color (ConfigurationFacade* self, + const gchar* color_name); +void resources_launch_help (GdkScreen* screen, + const gchar* anchor, + GError** error); +SortedList* desktop_integration_get_apps_for_mime_types (gchar** mime_types, + int mime_types_length1); +GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, + gint scale, + GdkInterpType interp, + gboolean scale_up); #define RESOURCES_DEFAULT_ICON_SCALE 24 -gint sorted_list_index_of (SortedList* self, gconstpointer search); +gint sorted_list_index_of (SortedList* self, + gconstpointer search); gchar* configuration_facade_get_directory_pattern (ConfigurationFacade* self); gchar* configuration_facade_get_directory_pattern_custom (ConfigurationFacade* self); gboolean is_string_empty (const gchar* s); @@ -280,568 +329,624 @@ void preferences_dialog_show_preferences (void); GFile* app_dirs_get_import_dir (void); static void preferences_dialog_commit_on_close (PreferencesDialog* self); void config_facade_commit_bg_color (ConfigFacade* self); -void configuration_facade_set_auto_import_from_library (ConfigurationFacade* self, gboolean auto_import); -void configuration_facade_set_commit_metadata_to_masters (ConfigurationFacade* self, gboolean commit_metadata); +void configuration_facade_set_auto_import_from_library (ConfigurationFacade* self, + gboolean auto_import); +void configuration_facade_set_commit_metadata_to_masters (ConfigurationFacade* self, + gboolean commit_metadata); void app_dirs_set_import_dir (const gchar* path); -void configuration_facade_set_directory_pattern_custom (ConfigurationFacade* self, const gchar* s); -void configuration_facade_set_directory_pattern (ConfigurationFacade* self, const gchar* s); +void configuration_facade_set_directory_pattern_custom (ConfigurationFacade* self, + const gchar* s); +void configuration_facade_set_directory_pattern (ConfigurationFacade* self, + const gchar* s); static gboolean preferences_dialog_get_allow_closing (PreferencesDialog* self); -static void preferences_dialog_set_background_color (PreferencesDialog* self, gdouble bg_color_value); -gboolean has_only_key_modifier (GdkModifierType field, GdkModifierType mask); -void parse_color (const gchar* spec, GdkRGBA* result); +static void preferences_dialog_set_background_color (PreferencesDialog* self, + gdouble bg_color_value); +gboolean has_only_key_modifier (GdkModifierType field, + GdkModifierType mask); +void parse_color (const gchar* spec, + GdkRGBA* result); #define CONFIG_FACADE_DEFAULT_BG_COLOR "#444" -static void preferences_dialog_set_allow_closing (PreferencesDialog* self, gboolean allow); -void config_facade_set_bg_color (ConfigFacade* self, GdkRGBA* color); -static void preferences_dialog_to_grayscale (PreferencesDialog* self, gdouble color_value, GdkRGBA* result); -gpointer sorted_list_get_at (SortedList* self, gint index); -void configuration_facade_set_external_photo_app (ConfigurationFacade* self, const gchar* external_photo_app); +static void preferences_dialog_set_allow_closing (PreferencesDialog* self, + gboolean allow); +void config_facade_set_bg_color (ConfigFacade* self, + GdkRGBA* color); +static void preferences_dialog_to_grayscale (PreferencesDialog* self, + gdouble color_value, + GdkRGBA* result); +gpointer sorted_list_get_at (SortedList* self, + gint index); +void configuration_facade_set_external_photo_app (ConfigurationFacade* self, + const gchar* external_photo_app); gchar* desktop_integration_get_app_open_command (GAppInfo* app_info); -void configuration_facade_set_external_raw_app (ConfigurationFacade* self, const gchar* external_raw_app); +void configuration_facade_set_external_raw_app (ConfigurationFacade* self, + const gchar* external_raw_app); static RawDeveloper preferences_dialog_raw_developer_from_combo (PreferencesDialog* self); -void configuration_facade_set_default_raw_developer (ConfigurationFacade* self, RawDeveloper d); +void configuration_facade_set_default_raw_developer (ConfigurationFacade* self, + RawDeveloper d); static void preferences_dialog_on_current_folder_changed (PreferencesDialog* self); -static gboolean preferences_dialog_real_map_event (GtkWidget* base, GdkEventAny* event); -static void _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed (GtkFileChooser* _sender, gpointer self); -static PreferencesDialogPathFormat* preferences_dialog_path_format_new (const gchar* name, const gchar* pattern); -static PreferencesDialogPathFormat* preferences_dialog_path_format_construct (GType object_type, const gchar* name, const gchar* pattern); -void configuration_facade_set_use_lowercase_filenames (ConfigurationFacade* self, gboolean b); -enum { - PREFERENCES_DIALOG_PATH_FORMAT_DUMMY_PROPERTY -}; +static gboolean preferences_dialog_real_map_event (GtkWidget* base, + GdkEventAny* event); +static void _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed (GtkFileChooser* _sender, + gpointer self); +static PreferencesDialogPathFormat* preferences_dialog_path_format_new (const gchar* name, + const gchar* pattern); +static PreferencesDialogPathFormat* preferences_dialog_path_format_construct (GType object_type, + const gchar* name, + const gchar* pattern); +void configuration_facade_set_use_lowercase_filenames (ConfigurationFacade* self, + gboolean b); static void preferences_dialog_path_format_finalize (PreferencesDialogPathFormat * obj); static void preferences_dialog_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); -static gboolean _preferences_dialog_on_delete_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) { +static gboolean +_preferences_dialog_on_delete_gtk_widget_delete_event (GtkWidget* _sender, + GdkEventAny* event, + gpointer self) +{ gboolean result; result = preferences_dialog_on_delete ((PreferencesDialog*) self); #line 72 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return result; -#line 324 "Preferences.c" +#line 399 "Preferences.c" } -static void _preferences_dialog_on_close_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { +static void +_preferences_dialog_on_close_gtk_dialog_response (GtkDialog* _sender, + gint response_id, + gpointer self) +{ #line 73 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_on_close ((PreferencesDialog*) self); -#line 331 "Preferences.c" +#line 410 "Preferences.c" } -static void _preferences_dialog_on_value_changed_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) { +static void +_preferences_dialog_on_value_changed_gtk_adjustment_value_changed (GtkAdjustment* _sender, + gpointer self) +{ #line 77 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_on_value_changed ((PreferencesDialog*) self); -#line 338 "Preferences.c" +#line 420 "Preferences.c" } -static gboolean _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { +static gboolean +_preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self) +{ gboolean result; result = preferences_dialog_on_bg_color_reset ((PreferencesDialog*) self, event); #line 79 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return result; -#line 347 "Preferences.c" +#line 433 "Preferences.c" } -static void _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) { +static void +_preferences_dialog_on_radio_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, + gpointer self) +{ #line 81 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_on_radio_changed ((PreferencesDialog*) self); -#line 354 "Preferences.c" +#line 443 "Preferences.c" } -static void _preferences_dialog_on_color_changed_gtk_color_button_color_set (GtkColorButton* _sender, gpointer self) { +static void +_preferences_dialog_on_color_changed_gtk_color_button_color_set (GtkColorButton* _sender, + gpointer self) +{ #line 92 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_on_color_changed ((PreferencesDialog*) self); -#line 361 "Preferences.c" +#line 453 "Preferences.c" } -static gboolean _preferences_dialog_on_local_pattern_help_gtk_label_activate_link (GtkLabel* _sender, const gchar* uri, gpointer self) { +static gboolean +_preferences_dialog_on_local_pattern_help_gtk_label_activate_link (GtkLabel* _sender, + const gchar* uri, + gpointer self) +{ gboolean result; result = preferences_dialog_on_local_pattern_help ((PreferencesDialog*) self, uri); #line 120 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return result; -#line 370 "Preferences.c" +#line 466 "Preferences.c" } -static void _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void +_preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self) +{ #line 131 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_on_dir_pattern_combo_changed ((PreferencesDialog*) self); -#line 377 "Preferences.c" +#line 476 "Preferences.c" } -static void _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { +static void +_preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed (GtkEditable* _sender, + gpointer self) +{ #line 132 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_on_dir_pattern_entry_changed ((PreferencesDialog*) self); -#line 384 "Preferences.c" +#line 486 "Preferences.c" } -static void _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) { +static void +_preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, + gpointer self) +{ #line 134 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_on_lowercase_toggled ((PreferencesDialog*) self); -#line 391 "Preferences.c" +#line 496 "Preferences.c" } -static void _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void +_preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self) +{ #line 140 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_on_photo_editor_changed ((PreferencesDialog*) self); -#line 398 "Preferences.c" +#line 506 "Preferences.c" } -static void _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void +_preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self) +{ #line 141 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_on_raw_editor_changed ((PreferencesDialog*) self); -#line 405 "Preferences.c" +#line 516 "Preferences.c" } -static void _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void +_preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self) +{ #line 150 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_on_default_raw_developer_changed ((PreferencesDialog*) self); -#line 412 "Preferences.c" +#line 526 "Preferences.c" } -static PreferencesDialog* preferences_dialog_construct (GType object_type) { +static PreferencesDialog* +preferences_dialog_construct (GType object_type) +{ PreferencesDialog * self = NULL; - gint _tmp0_; + AppWindow* _tmp0_; AppWindow* _tmp1_; - AppWindow* _tmp2_; - GdkWindow* _tmp3_; + GdkWindow* _tmp2_; + AppWindow* _tmp3_; AppWindow* _tmp4_; - AppWindow* _tmp5_; + GtkAdjustment* _tmp5_; GtkAdjustment* _tmp6_; - GtkAdjustment* _tmp7_; - gdouble _tmp8_; - ConfigFacade* _tmp9_; - ConfigFacade* _tmp10_; - GdkRGBA _tmp11_ = {0}; - gdouble _tmp12_; - GtkAdjustment* _tmp13_; - GtkScale* _tmp14_; + ConfigFacade* _tmp7_; + ConfigFacade* _tmp8_; + GdkRGBA _tmp9_ = {0}; + gdouble _tmp10_; + GtkAdjustment* _tmp11_; + GtkScale* _tmp12_; + GtkRadioButton* _tmp13_; + GtkRadioButton* _tmp14_; GtkRadioButton* _tmp15_; GtkRadioButton* _tmp16_; - GtkRadioButton* _tmp17_; - GtkRadioButton* _tmp18_; - GtkColorButton* _tmp19_; + GtkColorButton* _tmp17_; GdkRGBA color = {0}; - ConfigFacade* _tmp20_; - ConfigFacade* _tmp21_; - gchar* _tmp22_; - gchar* _tmp23_; + ConfigFacade* _tmp18_; + ConfigFacade* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; + GtkColorButton* _tmp22_; + GdkRGBA _tmp23_; GtkColorButton* _tmp24_; - GdkRGBA _tmp25_; - GtkColorButton* _tmp26_; - ConfigFacade* _tmp27_; - ConfigFacade* _tmp28_; + ConfigFacade* _tmp25_; + ConfigFacade* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; gchar* _tmp29_; - gchar* _tmp30_; - gchar* _tmp31_; - GQuark _tmp33_ = 0U; + GQuark _tmp31_ = 0U; #line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - static GQuark _tmp32_label0 = 0; + static GQuark _tmp30_label0 = 0; #line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - static GQuark _tmp32_label1 = 0; -#line 456 "Preferences.c" + static GQuark _tmp30_label1 = 0; +#line 570 "Preferences.c" gchar* help_path = NULL; - gchar* _tmp37_; - const gchar* _tmp38_; + gchar* _tmp35_; + const gchar* _tmp36_; + gchar* _tmp48_; + gchar* _tmp49_; gchar* _tmp50_; gchar* _tmp51_; gchar* _tmp52_; gchar* _tmp53_; - gchar* _tmp54_; - gchar* _tmp55_; - GtkComboBoxText* _tmp56_; - GtkEntry* _tmp57_; - GtkCheckButton* _tmp58_; - GtkNotebook* _tmp59_; - GtkWidget* _tmp60_; - PluginsManifestWidgetMediator* _tmp61_; - GtkComboBox* _tmp62_; - GtkComboBox* _tmp63_; - GtkCheckButton* _tmp64_; - ConfigFacade* _tmp65_; + GtkComboBoxText* _tmp54_; + GtkEntry* _tmp55_; + GtkCheckButton* _tmp56_; + GtkNotebook* _tmp57_; + GtkWidget* _tmp58_; + PluginsManifestWidgetMediator* _tmp59_; + GtkComboBox* _tmp60_; + GtkComboBox* _tmp61_; + GtkCheckButton* _tmp62_; + ConfigFacade* _tmp63_; + ConfigFacade* _tmp64_; + GtkCheckButton* _tmp65_; ConfigFacade* _tmp66_; - gboolean _tmp67_; - GtkCheckButton* _tmp68_; - ConfigFacade* _tmp69_; - ConfigFacade* _tmp70_; - gboolean _tmp71_; - GtkComboBoxText* _tmp72_; + ConfigFacade* _tmp67_; + GtkComboBoxText* _tmp68_; + gchar* _tmp69_; + gchar* _tmp70_; + GtkComboBoxText* _tmp71_; + gchar* _tmp72_; gchar* _tmp73_; - gchar* _tmp74_; - GtkComboBoxText* _tmp75_; - gchar* _tmp76_; - gchar* _tmp77_; - ConfigFacade* _tmp78_; - ConfigFacade* _tmp79_; - RawDeveloper _tmp80_; - GtkComboBoxText* _tmp81_; -#line 68 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp0_ = resources_use_header_bar (); + ConfigFacade* _tmp74_; + ConfigFacade* _tmp75_; + GtkComboBoxText* _tmp76_; #line 68 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - self = (PreferencesDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL); + self = (PreferencesDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL); #line 70 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp1_ = app_window_get_instance (); + _tmp0_ = app_window_get_instance (); #line 70 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 70 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); + _tmp2_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); #line 70 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp3_); + gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp2_); #line 70 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 71 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp4_ = app_window_get_instance (); + _tmp3_ = app_window_get_instance (); #line 71 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 71 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow)); + gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow)); #line 71 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 72 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _preferences_dialog_on_delete_gtk_widget_delete_event, self, 0); #line 73 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), "response", (GCallback) _preferences_dialog_on_close_gtk_dialog_response, self, 0); #line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp6_ = self->priv->bg_color_adjustment; -#line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp7_ = self->priv->bg_color_adjustment; + _tmp5_ = self->priv->bg_color_adjustment; #line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp8_ = gtk_adjustment_get_upper (_tmp7_); + _tmp6_ = self->priv->bg_color_adjustment; #line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp9_ = config_facade_get_instance (); + _tmp7_ = config_facade_get_instance (); #line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - config_facade_get_bg_color (_tmp10_, &_tmp11_); + config_facade_get_bg_color (_tmp8_, &_tmp9_); #line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp12_ = _tmp11_.red; + _tmp10_ = _tmp9_.red; #line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_adjustment_set_value (_tmp6_, _tmp8_ - (_tmp12_ * 65535.0)); + gtk_adjustment_set_value (_tmp5_, gtk_adjustment_get_upper (_tmp6_) - (_tmp10_ * 65535.0)); #line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 77 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp13_ = self->priv->bg_color_adjustment; + _tmp11_ = self->priv->bg_color_adjustment; #line 77 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_signal_connect_object (_tmp13_, "value-changed", (GCallback) _preferences_dialog_on_value_changed_gtk_adjustment_value_changed, self, 0); + g_signal_connect_object (_tmp11_, "value-changed", (GCallback) _preferences_dialog_on_value_changed_gtk_adjustment_value_changed, self, 0); #line 79 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp14_ = self->priv->bg_color_slider; + _tmp12_ = self->priv->bg_color_slider; #line 79 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event, self, 0); #line 81 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp15_ = self->priv->transparent_checker_radio; + _tmp13_ = self->priv->transparent_checker_radio; #line 81 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled, self, 0); #line 82 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp16_ = self->priv->transparent_solid_radio; + _tmp14_ = self->priv->transparent_solid_radio; #line 82 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled, self, 0); #line 83 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp17_ = self->priv->transparent_none_radio; + _tmp15_ = self->priv->transparent_none_radio; #line 83 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled, self, 0); #line 85 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp18_ = self->priv->transparent_solid_radio; + _tmp16_ = self->priv->transparent_solid_radio; #line 85 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp19_ = self->priv->transparent_solid_color; + _tmp17_ = self->priv->transparent_solid_color; #line 85 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_object_bind_property_with_closures (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, G_TYPE_OBJECT, GObject), "active", G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, G_TYPE_OBJECT, GObject), "sensitive", G_BINDING_DEFAULT, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL))); + g_object_bind_property_with_closures (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, G_TYPE_OBJECT, GObject), "active", G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, G_TYPE_OBJECT, GObject), "sensitive", G_BINDING_DEFAULT, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL))); #line 89 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" memset (&color, 0, sizeof (GdkRGBA)); #line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp20_ = config_facade_get_instance (); + _tmp18_ = config_facade_get_instance (); #line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp21_ = _tmp20_; + _tmp19_ = _tmp18_; #line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp22_ = configuration_facade_get_transparent_background_color (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp20_ = configuration_facade_get_transparent_background_color (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp23_ = _tmp22_; + _tmp21_ = _tmp20_; #line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gdk_rgba_parse (&color, _tmp23_); + gdk_rgba_parse (&color, _tmp21_); #line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_free0 (_tmp23_); + _g_free0 (_tmp21_); #line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_object_unref0 (_tmp21_); + _g_object_unref0 (_tmp19_); #line 91 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp24_ = self->priv->transparent_solid_color; + _tmp22_ = self->priv->transparent_solid_color; #line 91 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp25_ = color; + _tmp23_ = color; #line 91 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_color_chooser_set_rgba (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, GTK_TYPE_COLOR_CHOOSER) ? ((GtkColorChooser*) _tmp24_) : NULL, &_tmp25_); + gtk_color_chooser_set_rgba (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, gtk_color_chooser_get_type ()) ? ((GtkColorChooser*) _tmp22_) : NULL, &_tmp23_); #line 92 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp26_ = self->priv->transparent_solid_color; + _tmp24_ = self->priv->transparent_solid_color; #line 92 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_signal_connect_object (_tmp26_, "color-set", (GCallback) _preferences_dialog_on_color_changed_gtk_color_button_color_set, self, 0); + g_signal_connect_object (_tmp24_, "color-set", (GCallback) _preferences_dialog_on_color_changed_gtk_color_button_color_set, self, 0); #line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp27_ = config_facade_get_instance (); + _tmp25_ = config_facade_get_instance (); #line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp28_ = _tmp27_; + _tmp26_ = _tmp25_; #line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp29_ = configuration_facade_get_transparent_background_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp27_ = configuration_facade_get_transparent_background_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp30_ = _tmp29_; + _tmp28_ = _tmp27_; #line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_object_unref0 (_tmp28_); + _g_object_unref0 (_tmp26_); #line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp31_ = _tmp30_; + _tmp29_ = _tmp28_; #line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp33_ = (NULL == _tmp31_) ? 0 : g_quark_from_string (_tmp31_); + _tmp31_ = (NULL == _tmp29_) ? 0 : g_quark_from_string (_tmp29_); #line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_free (_tmp31_); + g_free (_tmp29_); #line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (_tmp33_ == ((0 != _tmp32_label0) ? _tmp32_label0 : (_tmp32_label0 = g_quark_from_static_string ("checkered")))) { + if (_tmp31_ == ((0 != _tmp30_label0) ? _tmp30_label0 : (_tmp30_label0 = g_quark_from_static_string ("checkered")))) { #line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" switch (0) { -#line 608 "Preferences.c" +#line 715 "Preferences.c" default: { - GtkRadioButton* _tmp34_; + GtkRadioButton* _tmp32_; #line 96 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp34_ = self->priv->transparent_checker_radio; + _tmp32_ = self->priv->transparent_checker_radio; #line 96 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); #line 97 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" break; -#line 618 "Preferences.c" +#line 725 "Preferences.c" } } - } else if (_tmp33_ == ((0 != _tmp32_label1) ? _tmp32_label1 : (_tmp32_label1 = g_quark_from_static_string ("solid")))) { + } else if (_tmp31_ == ((0 != _tmp30_label1) ? _tmp30_label1 : (_tmp30_label1 = g_quark_from_static_string ("solid")))) { #line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" switch (0) { -#line 624 "Preferences.c" +#line 731 "Preferences.c" default: { - GtkRadioButton* _tmp35_; + GtkRadioButton* _tmp33_; #line 99 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp35_ = self->priv->transparent_solid_radio; + _tmp33_ = self->priv->transparent_solid_radio; #line 99 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); #line 100 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" break; -#line 634 "Preferences.c" +#line 741 "Preferences.c" } } } else { #line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" switch (0) { -#line 640 "Preferences.c" +#line 747 "Preferences.c" default: { - GtkRadioButton* _tmp36_; + GtkRadioButton* _tmp34_; #line 102 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp36_ = self->priv->transparent_none_radio; + _tmp34_ = self->priv->transparent_none_radio; #line 102 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); #line 103 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" break; -#line 650 "Preferences.c" +#line 757 "Preferences.c" } } } #line 111 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp37_ = resources_get_help_path (); + _tmp35_ = resources_get_help_path (); #line 111 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - help_path = _tmp37_; + help_path = _tmp35_; #line 113 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp38_ = help_path; + _tmp36_ = help_path; #line 113 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (_tmp38_ == NULL) { -#line 662 "Preferences.c" - GtkLabel* _tmp39_; + if (_tmp36_ == NULL) { +#line 769 "Preferences.c" + GtkLabel* _tmp37_; + gchar* _tmp38_; + gchar* _tmp39_; gchar* _tmp40_; gchar* _tmp41_; - gchar* _tmp42_; - gchar* _tmp43_; #line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp39_ = self->priv->pattern_help; + _tmp37_ = self->priv->pattern_help; #line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp40_ = g_strconcat ("", _ ("(Help)"), NULL); + _tmp38_ = g_strconcat ("", _ ("(Help)"), NULL); #line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp41_ = _tmp40_; + _tmp39_ = _tmp38_; #line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp42_ = g_strconcat (_tmp41_, "", NULL); + _tmp40_ = g_strconcat (_tmp39_, "", NULL); #line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp43_ = _tmp42_; -#line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_label_set_markup (_tmp39_, _tmp43_); + _tmp41_ = _tmp40_; #line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_free0 (_tmp43_); + gtk_label_set_markup (_tmp37_, _tmp41_); #line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_free0 (_tmp41_); -#line 684 "Preferences.c" +#line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" + _g_free0 (_tmp39_); +#line 791 "Preferences.c" } else { - GtkLabel* _tmp44_; + GtkLabel* _tmp42_; + gchar* _tmp43_; + gchar* _tmp44_; gchar* _tmp45_; gchar* _tmp46_; - gchar* _tmp47_; - gchar* _tmp48_; - GtkLabel* _tmp49_; -#line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp44_ = self->priv->pattern_help; + GtkLabel* _tmp47_; #line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp45_ = g_strconcat ("", _ ("(Help)"), NULL); + _tmp42_ = self->priv->pattern_help; #line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp46_ = _tmp45_; + _tmp43_ = g_strconcat ("", _ ("(Help)"), NULL); #line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp47_ = g_strconcat (_tmp46_, "", NULL); + _tmp44_ = _tmp43_; #line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp48_ = _tmp47_; + _tmp45_ = g_strconcat (_tmp44_, "", NULL); #line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_label_set_markup (_tmp44_, _tmp48_); + _tmp46_ = _tmp45_; #line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_free0 (_tmp48_); + gtk_label_set_markup (_tmp42_, _tmp46_); #line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_free0 (_tmp46_); +#line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" + _g_free0 (_tmp44_); #line 120 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp49_ = self->priv->pattern_help; + _tmp47_ = self->priv->pattern_help; #line 120 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_signal_connect_object (_tmp49_, "activate-link", (GCallback) _preferences_dialog_on_local_pattern_help_gtk_label_activate_link, self, 0); -#line 712 "Preferences.c" + g_signal_connect_object (_tmp47_, "activate-link", (GCallback) _preferences_dialog_on_local_pattern_help_gtk_label_activate_link, self, 0); +#line 819 "Preferences.c" } #line 123 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp50_ = g_strdup_printf (_ ("Year%sMonth%sDay"), G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S); + _tmp48_ = g_strdup_printf (_ ("Year%sMonth%sDay"), G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S); #line 123 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp51_ = _tmp50_; + _tmp49_ = _tmp48_; #line 123 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - preferences_dialog_add_to_dir_formats (self, _tmp51_, "%Y" G_DIR_SEPARATOR_S "%m" G_DIR_SEPARATOR_S "%d"); + preferences_dialog_add_to_dir_formats (self, _tmp49_, "%Y" G_DIR_SEPARATOR_S "%m" G_DIR_SEPARATOR_S "%d"); #line 123 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_free0 (_tmp51_); + _g_free0 (_tmp49_); #line 125 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp52_ = g_strdup_printf (_ ("Year%sMonth"), G_DIR_SEPARATOR_S); + _tmp50_ = g_strdup_printf (_ ("Year%sMonth"), G_DIR_SEPARATOR_S); #line 125 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp53_ = _tmp52_; + _tmp51_ = _tmp50_; #line 125 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - preferences_dialog_add_to_dir_formats (self, _tmp53_, "%Y" G_DIR_SEPARATOR_S "%m"); + preferences_dialog_add_to_dir_formats (self, _tmp51_, "%Y" G_DIR_SEPARATOR_S "%m"); #line 125 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_free0 (_tmp53_); + _g_free0 (_tmp51_); #line 127 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp54_ = g_strdup_printf (_ ("Year%sMonth-Day"), G_DIR_SEPARATOR_S); + _tmp52_ = g_strdup_printf (_ ("Year%sMonth-Day"), G_DIR_SEPARATOR_S); #line 127 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp55_ = _tmp54_; + _tmp53_ = _tmp52_; #line 127 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - preferences_dialog_add_to_dir_formats (self, _tmp55_, "%Y" G_DIR_SEPARATOR_S "%m-%d"); + preferences_dialog_add_to_dir_formats (self, _tmp53_, "%Y" G_DIR_SEPARATOR_S "%m-%d"); #line 127 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_free0 (_tmp55_); + _g_free0 (_tmp53_); #line 129 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_add_to_dir_formats (self, _ ("Year-Month-Day"), "%Y-%m-%d"); #line 130 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_add_to_dir_formats (self, _ ("Custom"), NULL); #line 131 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp56_ = self->priv->dir_pattern_combo; + _tmp54_ = self->priv->dir_pattern_combo; #line 131 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed, self, 0); #line 132 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp57_ = self->priv->dir_pattern_entry; + _tmp55_ = self->priv->dir_pattern_entry; #line 132 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed, self, 0); #line 134 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp58_ = self->priv->lowercase; + _tmp56_ = self->priv->lowercase; #line 134 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled, self, 0); #line 136 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp59_ = self->priv->preferences_notebook; + _tmp57_ = self->priv->preferences_notebook; #line 136 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp60_ = gtk_notebook_get_nth_page (_tmp59_, 2); + _tmp58_ = gtk_notebook_get_nth_page (_tmp57_, 2); #line 136 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp61_ = self->priv->plugins_mediator; + _tmp59_ = self->priv->plugins_mediator; #line 136 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_TYPE (_tmp60_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp60_) : NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_TYPE (_tmp58_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp58_) : NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget)); #line 138 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_populate_preference_options (self); #line 140 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp62_ = self->priv->photo_editor_combo; + _tmp60_ = self->priv->photo_editor_combo; #line 140 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_signal_connect_object (_tmp62_, "changed", (GCallback) _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed, self, 0); + g_signal_connect_object (_tmp60_, "changed", (GCallback) _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed, self, 0); #line 141 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp63_ = self->priv->raw_editor_combo; + _tmp61_ = self->priv->raw_editor_combo; #line 141 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_signal_connect_object (_tmp63_, "changed", (GCallback) _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed, self, 0); + g_signal_connect_object (_tmp61_, "changed", (GCallback) _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed, self, 0); #line 143 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp64_ = self->priv->autoimport; + _tmp62_ = self->priv->autoimport; #line 143 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp65_ = config_facade_get_instance (); + _tmp63_ = config_facade_get_instance (); #line 143 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp66_ = _tmp65_; + _tmp64_ = _tmp63_; #line 143 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp67_ = configuration_facade_get_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_toggle_button_get_type (), GtkToggleButton), configuration_facade_get_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 143 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp67_); -#line 143 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_object_unref0 (_tmp66_); -#line 145 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp68_ = self->priv->write_metadata; + _g_object_unref0 (_tmp64_); #line 145 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp69_ = config_facade_get_instance (); + _tmp65_ = self->priv->write_metadata; #line 145 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp70_ = _tmp69_; + _tmp66_ = config_facade_get_instance (); #line 145 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp71_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp67_ = _tmp66_; #line 145 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp71_); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_toggle_button_get_type (), GtkToggleButton), configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 145 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_object_unref0 (_tmp70_); + _g_object_unref0 (_tmp67_); #line 147 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp72_ = self->priv->default_raw_developer_combo; + _tmp68_ = self->priv->default_raw_developer_combo; #line 147 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp73_ = raw_developer_get_label (RAW_DEVELOPER_CAMERA); + _tmp69_ = raw_developer_get_label (RAW_DEVELOPER_CAMERA); #line 147 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp74_ = _tmp73_; + _tmp70_ = _tmp69_; #line 147 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_combo_box_text_append_text (_tmp72_, _tmp74_); + gtk_combo_box_text_append_text (_tmp68_, _tmp70_); #line 147 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_free0 (_tmp74_); + _g_free0 (_tmp70_); #line 148 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp75_ = self->priv->default_raw_developer_combo; + _tmp71_ = self->priv->default_raw_developer_combo; #line 148 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp76_ = raw_developer_get_label (RAW_DEVELOPER_SHOTWELL); + _tmp72_ = raw_developer_get_label (RAW_DEVELOPER_SHOTWELL); #line 148 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp77_ = _tmp76_; + _tmp73_ = _tmp72_; #line 148 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_combo_box_text_append_text (_tmp75_, _tmp77_); + gtk_combo_box_text_append_text (_tmp71_, _tmp73_); #line 148 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_free0 (_tmp77_); + _g_free0 (_tmp73_); #line 149 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp78_ = config_facade_get_instance (); + _tmp74_ = config_facade_get_instance (); #line 149 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp79_ = _tmp78_; + _tmp75_ = _tmp74_; #line 149 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp80_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + preferences_dialog_set_raw_developer_combo (self, configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 149 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - preferences_dialog_set_raw_developer_combo (self, _tmp80_); -#line 149 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_object_unref0 (_tmp79_); + _g_object_unref0 (_tmp75_); #line 150 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp81_ = self->priv->default_raw_developer_combo; + _tmp76_ = self->priv->default_raw_developer_combo; #line 150 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed, self, 0); #line 67 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_free0 (help_path); #line 67 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return self; -#line 834 "Preferences.c" +#line 935 "Preferences.c" } -static PreferencesDialog* preferences_dialog_new (void) { +static PreferencesDialog* +preferences_dialog_new (void) +{ #line 67 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return preferences_dialog_construct (TYPE_PREFERENCES_DIALOG); -#line 841 "Preferences.c" +#line 944 "Preferences.c" } -void preferences_dialog_populate_preference_options (PreferencesDialog* self) { +void +preferences_dialog_populate_preference_options (PreferencesDialog* self) +{ GtkComboBox* _tmp0_; gint _tmp1_; gchar** _tmp2_; @@ -867,7 +972,6 @@ void preferences_dialog_populate_preference_options (PreferencesDialog* self) { GtkCheckButton* _tmp20_; ConfigFacade* _tmp21_; ConfigFacade* _tmp22_; - gboolean _tmp23_; #line 153 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (IS_PREFERENCES_DIALOG (self)); #line 154 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" @@ -939,16 +1043,16 @@ void preferences_dialog_populate_preference_options (PreferencesDialog* self) { #line 162 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp22_ = _tmp21_; #line 162 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp23_ = configuration_facade_get_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 162 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp23_); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_toggle_button_get_type (), GtkToggleButton), configuration_facade_get_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 162 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_object_unref0 (_tmp22_); -#line 948 "Preferences.c" +#line 1050 "Preferences.c" } -static void preferences_dialog_on_radio_changed (PreferencesDialog* self) { +static void +preferences_dialog_on_radio_changed (PreferencesDialog* self) +{ ConfigFacade* config = NULL; ConfigFacade* _tmp0_; GtkRadioButton* _tmp1_; @@ -968,13 +1072,13 @@ static void preferences_dialog_on_radio_changed (PreferencesDialog* self) { _tmp3_ = _tmp2_; #line 168 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (_tmp3_) { -#line 972 "Preferences.c" +#line 1076 "Preferences.c" ConfigFacade* _tmp4_; #line 169 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp4_ = config; #line 169 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" configuration_facade_set_transparent_background_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "checkered"); -#line 978 "Preferences.c" +#line 1082 "Preferences.c" } else { GtkRadioButton* _tmp5_; gboolean _tmp6_; @@ -987,29 +1091,31 @@ static void preferences_dialog_on_radio_changed (PreferencesDialog* self) { _tmp7_ = _tmp6_; #line 170 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (_tmp7_) { -#line 991 "Preferences.c" +#line 1095 "Preferences.c" ConfigFacade* _tmp8_; #line 171 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp8_ = config; #line 171 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" configuration_facade_set_transparent_background_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "solid"); -#line 997 "Preferences.c" +#line 1101 "Preferences.c" } else { ConfigFacade* _tmp9_; #line 173 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp9_ = config; #line 173 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" configuration_facade_set_transparent_background_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "none"); -#line 1004 "Preferences.c" +#line 1108 "Preferences.c" } } #line 165 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_object_unref0 (config); -#line 1009 "Preferences.c" +#line 1113 "Preferences.c" } -static void preferences_dialog_on_color_changed (PreferencesDialog* self) { +static void +preferences_dialog_on_color_changed (PreferencesDialog* self) +{ gchar* color = NULL; GtkColorButton* _tmp0_; GdkRGBA _tmp1_ = {0}; @@ -1022,7 +1128,7 @@ static void preferences_dialog_on_color_changed (PreferencesDialog* self) { #line 178 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp0_ = self->priv->transparent_solid_color; #line 178 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_color_chooser_get_rgba (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, GTK_TYPE_COLOR_CHOOSER) ? ((GtkColorChooser*) _tmp0_) : NULL, &_tmp1_); + gtk_color_chooser_get_rgba (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_color_chooser_get_type ()) ? ((GtkColorChooser*) _tmp0_) : NULL, &_tmp1_); #line 178 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp2_ = _tmp1_; #line 178 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" @@ -1039,18 +1145,21 @@ static void preferences_dialog_on_color_changed (PreferencesDialog* self) { _g_object_unref0 (_tmp5_); #line 177 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_free0 (color); -#line 1043 "Preferences.c" +#line 1149 "Preferences.c" } -static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* self, const gchar* ignore) { +static gboolean +preferences_dialog_on_local_pattern_help (PreferencesDialog* self, + const gchar* ignore) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 184 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE); #line 184 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_val_if_fail (ignore != NULL, FALSE); -#line 1054 "Preferences.c" +#line 1163 "Preferences.c" { AppWindow* _tmp0_; AppWindow* _tmp1_; @@ -1067,7 +1176,7 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel _g_object_unref0 (_tmp1_); #line 186 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1071 "Preferences.c" +#line 1180 "Preferences.c" goto __catch22_g_error; } } @@ -1089,12 +1198,12 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel g_message ("Preferences.vala:188: Unable to launch help: %s", _tmp4_); #line 185 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_error_free0 (e); -#line 1093 "Preferences.c" +#line 1202 "Preferences.c" } __finally22: #line 185 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1098 "Preferences.c" +#line 1207 "Preferences.c" gboolean _tmp5_ = FALSE; #line 185 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1102,53 +1211,52 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel g_clear_error (&_inner_error_); #line 185 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return _tmp5_; -#line 1106 "Preferences.c" +#line 1215 "Preferences.c" } #line 190 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" result = TRUE; #line 190 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return result; -#line 1112 "Preferences.c" +#line 1221 "Preferences.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 220 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return self ? g_object_ref (self) : NULL; -#line 1119 "Preferences.c" +#line 1230 "Preferences.c" } -static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, GtkComboBox* combo_box, gchar** mime_types, int mime_types_length1, const gchar* current_app_executable, SortedList* * external_apps) { +static void +preferences_dialog_populate_app_combo_box (PreferencesDialog* self, + GtkComboBox* combo_box, + gchar** mime_types, + int mime_types_length1, + const gchar* current_app_executable, + SortedList* * external_apps) +{ SortedList* _vala_external_apps = NULL; - gchar** _tmp0_; - gint _tmp0__length1; - gchar** _tmp1_; - gint _tmp1__length1; - SortedList* _tmp2_; - SortedList* _tmp3_; - gint _tmp4_; - gint _tmp5_; + SortedList* _tmp0_; + SortedList* _tmp1_; + gint _tmp2_; + gint _tmp3_; GtkCellRendererPixbuf* pixbuf_renderer = NULL; - GtkCellRendererPixbuf* _tmp6_; + GtkCellRendererPixbuf* _tmp4_; GtkCellRendererText* text_renderer = NULL; + GtkCellRendererText* _tmp5_; + GtkCellRendererPixbuf* _tmp6_; GtkCellRendererText* _tmp7_; - GtkComboBox* _tmp8_; - GtkComboBox* _tmp9_; - GtkCellRendererPixbuf* _tmp10_; - GtkComboBox* _tmp11_; - GtkCellRendererText* _tmp12_; - GtkComboBox* _tmp13_; - GtkCellRendererPixbuf* _tmp14_; - GtkComboBox* _tmp15_; - GtkCellRendererText* _tmp16_; + GtkCellRendererPixbuf* _tmp8_; + GtkCellRendererText* _tmp9_; GtkListStore* combo_store = NULL; - GtkListStore* _tmp17_; + GtkListStore* _tmp10_; GtkTreeIter iter = {0}; gint current_app = 0; - GtkComboBox* _tmp67_; - GtkListStore* _tmp68_; - gint _tmp69_; + GtkListStore* _tmp57_; + gint _tmp58_; GError * _inner_error_ = NULL; #line 193 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (IS_PREFERENCES_DIALOG (self)); @@ -1157,261 +1265,239 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, #line 193 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (current_app_executable != NULL); #line 196 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp0_ = mime_types; -#line 196 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp0__length1 = mime_types_length1; -#line 196 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _vala_assert (_tmp0__length1 != 0, "mime_types.length != 0"); + _vala_assert (mime_types_length1 != 0, "mime_types.length != 0"); #line 197 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp1_ = mime_types; -#line 197 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp1__length1 = mime_types_length1; -#line 197 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp2_ = desktop_integration_get_apps_for_mime_types (_tmp1_, _tmp1__length1); + _tmp0_ = desktop_integration_get_apps_for_mime_types (mime_types, mime_types_length1); #line 197 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_object_unref0 (_vala_external_apps); #line 197 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _vala_external_apps = _tmp2_; + _vala_external_apps = _tmp0_; #line 199 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp3_ = _vala_external_apps; + _tmp1_ = _vala_external_apps; #line 199 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); #line 199 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 199 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (_tmp5_ == 0) { + if (_tmp3_ == 0) { #line 200 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (external_apps) { #line 200 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" *external_apps = _vala_external_apps; -#line 1188 "Preferences.c" +#line 1288 "Preferences.c" } else { #line 200 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_object_unref0 (_vala_external_apps); -#line 1192 "Preferences.c" +#line 1292 "Preferences.c" } #line 200 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return; -#line 1196 "Preferences.c" +#line 1296 "Preferences.c" } #line 203 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp6_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new (); + _tmp4_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new (); #line 203 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_object_ref_sink (_tmp6_); + g_object_ref_sink (_tmp4_); #line 203 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - pixbuf_renderer = _tmp6_; + pixbuf_renderer = _tmp4_; #line 204 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp7_ = (GtkCellRendererText*) gtk_cell_renderer_text_new (); + _tmp5_ = (GtkCellRendererText*) gtk_cell_renderer_text_new (); #line 204 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_object_ref_sink (_tmp7_); + g_object_ref_sink (_tmp5_); #line 204 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - text_renderer = _tmp7_; + text_renderer = _tmp5_; #line 205 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp8_ = combo_box; -#line 205 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_cell_layout_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout)); -#line 206 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp9_ = combo_box; + gtk_cell_layout_clear (G_TYPE_CHECK_INSTANCE_CAST (combo_box, gtk_cell_layout_get_type (), GtkCellLayout)); #line 206 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp10_ = pixbuf_renderer; + _tmp6_ = pixbuf_renderer; #line 206 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE); -#line 207 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp11_ = combo_box; + gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (combo_box, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE); #line 207 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp12_ = text_renderer; + _tmp7_ = text_renderer; #line 207 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE); + gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (combo_box, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE); #line 208 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp13_ = combo_box; + _tmp8_ = pixbuf_renderer; #line 208 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp14_ = pixbuf_renderer; -#line 208 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0); -#line 209 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp15_ = combo_box; + gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (combo_box, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0); #line 209 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp16_ = text_renderer; + _tmp9_ = text_renderer; #line 209 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1); + gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (combo_box, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1); #line 212 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp17_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1); + _tmp10_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1); #line 212 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - combo_store = _tmp17_; + combo_store = _tmp10_; #line 215 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" current_app = -1; -#line 1244 "Preferences.c" +#line 1334 "Preferences.c" { GeeIterator* _app_it = NULL; - SortedList* _tmp18_; - GeeIterator* _tmp19_; + SortedList* _tmp11_; + GeeIterator* _tmp12_; #line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp18_ = _vala_external_apps; + _tmp11_ = _vala_external_apps; #line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); #line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _app_it = _tmp19_; + _app_it = _tmp12_; #line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" while (TRUE) { -#line 1257 "Preferences.c" - GeeIterator* _tmp20_; - gboolean _tmp21_; +#line 1347 "Preferences.c" + GeeIterator* _tmp13_; GAppInfo* app = NULL; - GeeIterator* _tmp22_; - gpointer _tmp23_; - GtkListStore* _tmp24_; - GtkTreeIter _tmp25_ = {0}; + GeeIterator* _tmp14_; + gpointer _tmp15_; + GtkListStore* _tmp16_; + GtkTreeIter _tmp17_ = {0}; GIcon* app_icon = NULL; - GAppInfo* _tmp26_; - GIcon* _tmp27_; - GIcon* _tmp28_; - GtkListStore* _tmp56_; - GtkTreeIter _tmp57_; - GAppInfo* _tmp58_; - const gchar* _tmp59_; - GValue _tmp60_ = {0}; - GAppInfo* _tmp61_; - const gchar* _tmp62_; - const gchar* _tmp63_; -#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp20_ = _app_it; + GAppInfo* _tmp18_; + GIcon* _tmp19_; + GIcon* _tmp20_; + GtkListStore* _tmp48_; + GtkTreeIter _tmp49_; + GAppInfo* _tmp50_; + const gchar* _tmp51_; + GValue _tmp52_ = {0}; + GAppInfo* _tmp53_; + const gchar* _tmp54_; #line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp21_ = gee_iterator_next (_tmp20_); + _tmp13_ = _app_it; #line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (!_tmp21_) { + if (!gee_iterator_next (_tmp13_)) { #line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" break; -#line 1285 "Preferences.c" +#line 1371 "Preferences.c" } #line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp22_ = _app_it; + _tmp14_ = _app_it; #line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp23_ = gee_iterator_get (_tmp22_); + _tmp15_ = gee_iterator_get (_tmp14_); #line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - app = (GAppInfo*) _tmp23_; + app = (GAppInfo*) _tmp15_; #line 218 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp24_ = combo_store; + _tmp16_ = combo_store; #line 218 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_list_store_append (_tmp24_, &_tmp25_); + gtk_list_store_append (_tmp16_, &_tmp17_); #line 218 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - iter = _tmp25_; + iter = _tmp17_; #line 220 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp26_ = app; + _tmp18_ = app; #line 220 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp27_ = g_app_info_get_icon (_tmp26_); + _tmp19_ = g_app_info_get_icon (_tmp18_); #line 220 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp28_ = _g_object_ref0 (_tmp27_); + _tmp20_ = _g_object_ref0 (_tmp19_); #line 220 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - app_icon = _tmp28_; -#line 1307 "Preferences.c" + app_icon = _tmp20_; +#line 1393 "Preferences.c" { - GIcon* _tmp29_; + GIcon* _tmp21_; #line 222 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp29_ = app_icon; + _tmp21_ = app_icon; #line 222 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, g_file_icon_get_type ())) { -#line 1314 "Preferences.c" - GdkPixbuf* _tmp30_ = NULL; - GIcon* _tmp31_; - GFile* _tmp32_; - gchar* _tmp33_; - gchar* _tmp34_; - GdkPixbuf* _tmp35_; - GdkPixbuf* _tmp36_; - GtkListStore* _tmp37_; - GtkTreeIter _tmp38_; - GdkPixbuf* _tmp39_; - GValue _tmp40_ = {0}; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, g_file_icon_get_type ())) { +#line 1400 "Preferences.c" + GdkPixbuf* _tmp22_ = NULL; + GIcon* _tmp23_; + GFile* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; + GdkPixbuf* _tmp27_; + GdkPixbuf* _tmp28_; + GtkListStore* _tmp29_; + GtkTreeIter _tmp30_; + GdkPixbuf* _tmp31_; + GValue _tmp32_ = {0}; #line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp31_ = app_icon; + _tmp23_ = app_icon; #line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp32_ = g_file_icon_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_file_icon_get_type (), GFileIcon)); + _tmp24_ = g_file_icon_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, g_file_icon_get_type (), GFileIcon)); #line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp33_ = g_file_get_path (_tmp32_); + _tmp25_ = g_file_get_path (_tmp24_); #line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp34_ = _tmp33_; + _tmp26_ = _tmp25_; #line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp35_ = gdk_pixbuf_new_from_file (_tmp34_, &_inner_error_); + _tmp27_ = gdk_pixbuf_new_from_file (_tmp26_, &_inner_error_); #line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp36_ = _tmp35_; + _tmp28_ = _tmp27_; #line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_free0 (_tmp34_); + _g_free0 (_tmp26_); #line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp30_ = _tmp36_; + _tmp22_ = _tmp28_; #line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1344 "Preferences.c" +#line 1430 "Preferences.c" goto __catch23_g_error; } #line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp37_ = combo_store; + _tmp29_ = combo_store; #line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp38_ = iter; + _tmp30_ = iter; #line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp39_ = scale_pixbuf (_tmp30_, RESOURCES_DEFAULT_ICON_SCALE, GDK_INTERP_BILINEAR, FALSE); + _tmp31_ = scale_pixbuf (_tmp22_, RESOURCES_DEFAULT_ICON_SCALE, GDK_INTERP_BILINEAR, FALSE); #line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_value_init (&_tmp40_, gdk_pixbuf_get_type ()); + g_value_init (&_tmp32_, gdk_pixbuf_get_type ()); #line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_value_take_object (&_tmp40_, _tmp39_); + g_value_take_object (&_tmp32_, _tmp31_); #line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_list_store_set_value (_tmp37_, &_tmp38_, 0, &_tmp40_); + gtk_list_store_set_value (_tmp29_, &_tmp30_, 0, &_tmp32_); #line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - G_IS_VALUE (&_tmp40_) ? (g_value_unset (&_tmp40_), NULL) : NULL; + G_IS_VALUE (&_tmp32_) ? (g_value_unset (&_tmp32_), NULL) : NULL; #line 222 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_object_unref0 (_tmp30_); -#line 1363 "Preferences.c" + _g_object_unref0 (_tmp22_); +#line 1449 "Preferences.c" } else { - GIcon* _tmp41_; + GIcon* _tmp33_; #line 226 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp41_ = app_icon; + _tmp33_ = app_icon; #line 226 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, g_themed_icon_get_type ())) { -#line 1370 "Preferences.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp33_, g_themed_icon_get_type ())) { +#line 1456 "Preferences.c" GdkPixbuf* icon_pixbuf = NULL; - GtkIconTheme* _tmp42_; - GIcon* _tmp43_; - gchar** _tmp44_; - gchar** _tmp45_; - const gchar* _tmp46_; - GdkPixbuf* _tmp47_; - GtkListStore* _tmp48_; - GtkTreeIter _tmp49_; - GdkPixbuf* _tmp50_; - GValue _tmp51_ = {0}; + GtkIconTheme* _tmp34_; + GIcon* _tmp35_; + gchar** _tmp36_; + gchar** _tmp37_; + const gchar* _tmp38_; + GdkPixbuf* _tmp39_; + GtkListStore* _tmp40_; + GtkTreeIter _tmp41_; + GdkPixbuf* _tmp42_; + GValue _tmp43_ = {0}; #line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp42_ = gtk_icon_theme_get_default (); + _tmp34_ = gtk_icon_theme_get_default (); #line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp43_ = app_icon; + _tmp35_ = app_icon; #line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp45_ = _tmp44_ = g_themed_icon_get_names (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, g_themed_icon_get_type (), GThemedIcon)); + _tmp37_ = _tmp36_ = g_themed_icon_get_names (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, g_themed_icon_get_type (), GThemedIcon)); #line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp46_ = _tmp45_[0]; + _tmp38_ = _tmp37_[0]; #line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp47_ = gtk_icon_theme_load_icon (_tmp42_, _tmp46_, RESOURCES_DEFAULT_ICON_SCALE, GTK_ICON_LOOKUP_FORCE_SIZE, &_inner_error_); + _tmp39_ = gtk_icon_theme_load_icon (_tmp34_, _tmp38_, RESOURCES_DEFAULT_ICON_SCALE, GTK_ICON_LOOKUP_FORCE_SIZE, &_inner_error_); #line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - icon_pixbuf = _tmp47_; + icon_pixbuf = _tmp39_; #line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1396 "Preferences.c" +#line 1482 "Preferences.c" goto __catch23_g_error; } #line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp48_ = combo_store; + _tmp40_ = combo_store; #line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp49_ = iter; + _tmp41_ = iter; #line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp50_ = icon_pixbuf; + _tmp42_ = icon_pixbuf; #line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_value_init (&_tmp51_, gdk_pixbuf_get_type ()); + g_value_init (&_tmp43_, gdk_pixbuf_get_type ()); #line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_value_set_object (&_tmp51_, _tmp50_); + g_value_set_object (&_tmp43_, _tmp42_); #line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_list_store_set_value (_tmp48_, &_tmp49_, 0, &_tmp51_); + gtk_list_store_set_value (_tmp40_, &_tmp41_, 0, &_tmp43_); #line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - G_IS_VALUE (&_tmp51_) ? (g_value_unset (&_tmp51_), NULL) : NULL; + G_IS_VALUE (&_tmp43_) ? (g_value_unset (&_tmp43_), NULL) : NULL; #line 226 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_object_unref0 (icon_pixbuf); -#line 1415 "Preferences.c" +#line 1501 "Preferences.c" } } } @@ -1419,29 +1505,29 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, __catch23_g_error: { GError* _error_ = NULL; - GError* _tmp52_; - const gchar* _tmp53_; - gchar* _tmp54_; - gchar* _tmp55_; + GError* _tmp44_; + const gchar* _tmp45_; + gchar* _tmp46_; + gchar* _tmp47_; #line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _error_ = _inner_error_; #line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _inner_error_ = NULL; #line 234 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp52_ = _error_; + _tmp44_ = _error_; #line 234 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp53_ = _tmp52_->message; + _tmp45_ = _tmp44_->message; #line 234 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp54_ = g_strconcat ("Error loading icon pixbuf: ", _tmp53_, NULL); + _tmp46_ = g_strconcat ("Error loading icon pixbuf: ", _tmp45_, NULL); #line 234 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp55_ = _tmp54_; + _tmp47_ = _tmp46_; #line 234 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_warning ("Preferences.vala:234: %s", _tmp55_); + g_warning ("Preferences.vala:234: %s", _tmp47_); #line 234 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_free0 (_tmp55_); + _g_free0 (_tmp47_); #line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_error_free0 (_error_); -#line 1445 "Preferences.c" +#line 1531 "Preferences.c" } __finally23: #line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" @@ -1464,76 +1550,66 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, g_clear_error (&_inner_error_); #line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return; -#line 1468 "Preferences.c" +#line 1554 "Preferences.c" } #line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp56_ = combo_store; + _tmp48_ = combo_store; #line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp57_ = iter; + _tmp49_ = iter; #line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp58_ = app; + _tmp50_ = app; #line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp59_ = g_app_info_get_name (_tmp58_); + _tmp51_ = g_app_info_get_name (_tmp50_); #line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_value_init (&_tmp60_, G_TYPE_STRING); + g_value_init (&_tmp52_, G_TYPE_STRING); #line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_value_set_string (&_tmp60_, _tmp59_); + g_value_set_string (&_tmp52_, _tmp51_); #line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_list_store_set_value (_tmp56_, &_tmp57_, 1, &_tmp60_); + gtk_list_store_set_value (_tmp48_, &_tmp49_, 1, &_tmp52_); #line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - G_IS_VALUE (&_tmp60_) ? (g_value_unset (&_tmp60_), NULL) : NULL; + G_IS_VALUE (&_tmp52_) ? (g_value_unset (&_tmp52_), NULL) : NULL; #line 239 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp61_ = app; + _tmp53_ = app; #line 239 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp62_ = g_app_info_get_commandline (_tmp61_); + _tmp54_ = g_app_info_get_commandline (_tmp53_); #line 239 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp63_ = current_app_executable; -#line 239 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (g_strcmp0 (_tmp62_, _tmp63_) == 0) { -#line 1494 "Preferences.c" - SortedList* _tmp64_; - GAppInfo* _tmp65_; - gint _tmp66_; -#line 240 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp64_ = _vala_external_apps; + if (g_strcmp0 (_tmp54_, current_app_executable) == 0) { +#line 1578 "Preferences.c" + SortedList* _tmp55_; + GAppInfo* _tmp56_; #line 240 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp65_ = app; + _tmp55_ = _vala_external_apps; #line 240 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp66_ = sorted_list_index_of (_tmp64_, _tmp65_); + _tmp56_ = app; #line 240 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - current_app = _tmp66_; -#line 1506 "Preferences.c" + current_app = sorted_list_index_of (_tmp55_, _tmp56_); +#line 1587 "Preferences.c" } #line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_object_unref0 (app_icon); #line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_object_unref0 (app); -#line 1512 "Preferences.c" +#line 1593 "Preferences.c" } #line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_object_unref0 (_app_it); -#line 1516 "Preferences.c" +#line 1597 "Preferences.c" } #line 245 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp67_ = combo_box; -#line 245 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp68_ = combo_store; + _tmp57_ = combo_store; #line 245 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_combo_box_set_model (_tmp67_, G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GTK_TYPE_TREE_MODEL, GtkTreeModel)); + gtk_combo_box_set_model (combo_box, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_tree_model_get_type (), GtkTreeModel)); #line 247 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp69_ = current_app; + _tmp58_ = current_app; #line 247 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (_tmp69_ != -1) { -#line 1528 "Preferences.c" - GtkComboBox* _tmp70_; - gint _tmp71_; + if (_tmp58_ != -1) { +#line 1607 "Preferences.c" + gint _tmp59_; #line 248 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp70_ = combo_box; + _tmp59_ = current_app; #line 248 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp71_ = current_app; -#line 248 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_combo_box_set_active (_tmp70_, _tmp71_); -#line 1537 "Preferences.c" + gtk_combo_box_set_active (combo_box, _tmp59_); +#line 1613 "Preferences.c" } #line 193 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_object_unref0 (combo_store); @@ -1545,16 +1621,20 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, if (external_apps) { #line 193 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" *external_apps = _vala_external_apps; -#line 1549 "Preferences.c" +#line 1625 "Preferences.c" } else { #line 193 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_object_unref0 (_vala_external_apps); -#line 1553 "Preferences.c" +#line 1629 "Preferences.c" } } -static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkComboBox* combo_box, GtkEntry* entry) { +static void +preferences_dialog_setup_dir_pattern (PreferencesDialog* self, + GtkComboBox* combo_box, + GtkEntry* entry) +{ gchar* pattern = NULL; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; @@ -1562,7 +1642,7 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo gchar* _tmp3_; gboolean found = FALSE; const gchar* _tmp4_; - gboolean _tmp32_; + gboolean _tmp29_; #line 251 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (IS_PREFERENCES_DIALOG (self)); #line 251 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" @@ -1587,11 +1667,11 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo _tmp4_ = pattern; #line 254 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (NULL != _tmp4_) { -#line 1591 "Preferences.c" +#line 1671 "Preferences.c" gint i = 0; #line 256 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" i = 0; -#line 1595 "Preferences.c" +#line 1675 "Preferences.c" { GeeArrayList* _pf_list = NULL; GeeArrayList* _tmp5_; @@ -1619,7 +1699,7 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo _pf_index = -1; #line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" while (TRUE) { -#line 1623 "Preferences.c" +#line 1703 "Preferences.c" gint _tmp10_; gint _tmp11_; gint _tmp12_; @@ -1630,7 +1710,7 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo PreferencesDialogPathFormat* _tmp16_; const gchar* _tmp17_; const gchar* _tmp18_; - gint _tmp21_; + gint _tmp20_; #line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp10_ = _pf_index; #line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" @@ -1643,7 +1723,7 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo if (!(_tmp11_ < _tmp12_)) { #line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" break; -#line 1647 "Preferences.c" +#line 1727 "Preferences.c" } #line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp13_ = _pf_list; @@ -1661,105 +1741,94 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo _tmp18_ = pattern; #line 258 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (g_strcmp0 (_tmp17_, _tmp18_) == 0) { -#line 1665 "Preferences.c" - GtkComboBox* _tmp19_; - gint _tmp20_; -#line 259 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp19_ = combo_box; +#line 1745 "Preferences.c" + gint _tmp19_; #line 259 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp20_ = i; + _tmp19_ = i; #line 259 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_combo_box_set_active (_tmp19_, _tmp20_); + gtk_combo_box_set_active (combo_box, _tmp19_); #line 260 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" found = TRUE; #line 261 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _preferences_dialog_path_format_unref0 (pf); #line 261 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" break; -#line 1680 "Preferences.c" +#line 1757 "Preferences.c" } #line 263 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp21_ = i; + _tmp20_ = i; #line 263 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - i = _tmp21_ + 1; + i = _tmp20_ + 1; #line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _preferences_dialog_path_format_unref0 (pf); -#line 1688 "Preferences.c" +#line 1765 "Preferences.c" } #line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_object_unref0 (_pf_list); -#line 1692 "Preferences.c" +#line 1769 "Preferences.c" } } else { gchar* s = NULL; + ConfigFacade* _tmp21_; ConfigFacade* _tmp22_; - ConfigFacade* _tmp23_; + gchar* _tmp23_; gchar* _tmp24_; - gchar* _tmp25_; - const gchar* _tmp26_; - gboolean _tmp27_; + const gchar* _tmp25_; #line 267 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp22_ = config_facade_get_instance (); + _tmp21_ = config_facade_get_instance (); #line 267 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp23_ = _tmp22_; + _tmp22_ = _tmp21_; #line 267 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp24_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp23_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 267 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp25_ = _tmp24_; + _tmp24_ = _tmp23_; #line 267 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp22_); #line 267 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - s = _tmp25_; -#line 268 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp26_ = s; + s = _tmp24_; #line 268 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp27_ = is_string_empty (_tmp26_); + _tmp25_ = s; #line 268 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (!_tmp27_) { -#line 1720 "Preferences.c" - GtkComboBox* _tmp28_; - GeeArrayList* _tmp29_; - gint _tmp30_; - gint _tmp31_; + if (!is_string_empty (_tmp25_)) { +#line 1794 "Preferences.c" + GeeArrayList* _tmp26_; + gint _tmp27_; + gint _tmp28_; #line 269 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp28_ = combo_box; + _tmp26_ = self->priv->path_formats; #line 269 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp29_ = self->priv->path_formats; + _tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 269 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp28_ = _tmp27_; #line 269 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp31_ = _tmp30_; -#line 269 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_combo_box_set_active (_tmp28_, _tmp31_ - 1); + gtk_combo_box_set_active (combo_box, _tmp28_ - 1); #line 270 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" found = TRUE; -#line 1737 "Preferences.c" +#line 1808 "Preferences.c" } #line 254 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_free0 (s); -#line 1741 "Preferences.c" +#line 1812 "Preferences.c" } #line 274 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp32_ = found; + _tmp29_ = found; #line 274 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (!_tmp32_) { -#line 1747 "Preferences.c" - GtkComboBox* _tmp33_; -#line 275 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp33_ = combo_box; + if (!_tmp29_) { #line 275 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_combo_box_set_active (_tmp33_, 0); -#line 1753 "Preferences.c" + gtk_combo_box_set_active (combo_box, 0); +#line 1820 "Preferences.c" } #line 278 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_on_dir_pattern_combo_changed (self); #line 251 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_free0 (pattern); -#line 1759 "Preferences.c" +#line 1826 "Preferences.c" } -void preferences_dialog_show_preferences (void) { +void +preferences_dialog_show_preferences (void) +{ PreferencesDialog* _tmp0_; PreferencesDialog* _tmp2_; PreferencesDialog* _tmp3_; @@ -1774,7 +1843,7 @@ void preferences_dialog_show_preferences (void) { _tmp0_ = preferences_dialog_preferences_dialog; #line 282 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (_tmp0_ == NULL) { -#line 1778 "Preferences.c" +#line 1847 "Preferences.c" PreferencesDialog* _tmp1_; #line 283 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp1_ = preferences_dialog_new (); @@ -1784,7 +1853,7 @@ void preferences_dialog_show_preferences (void) { _g_object_unref0 (preferences_dialog_preferences_dialog); #line 283 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_preferences_dialog = _tmp1_; -#line 1788 "Preferences.c" +#line 1857 "Preferences.c" } #line 285 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp2_ = preferences_dialog_preferences_dialog; @@ -1807,7 +1876,7 @@ void preferences_dialog_show_preferences (void) { #line 287 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp9_ = _tmp8_; #line 287 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp9_); + gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_file_chooser_get_type (), GtkFileChooser), _tmp9_); #line 287 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_free0 (_tmp9_); #line 287 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" @@ -1816,11 +1885,13 @@ void preferences_dialog_show_preferences (void) { _tmp10_ = preferences_dialog_preferences_dialog; #line 291 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow)); -#line 1820 "Preferences.c" +#line 1889 "Preferences.c" } -static void preferences_dialog_commit_on_close (PreferencesDialog* self) { +static void +preferences_dialog_commit_on_close (PreferencesDialog* self) +{ ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; ConfigFacade* _tmp2_; @@ -1837,10 +1908,9 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) { PreferencesDialogPathFormat* pf = NULL; GeeArrayList* _tmp14_; GtkComboBoxText* _tmp15_; - gint _tmp16_; - gpointer _tmp17_; - PreferencesDialogPathFormat* _tmp18_; - const gchar* _tmp19_; + gpointer _tmp16_; + PreferencesDialogPathFormat* _tmp17_; + const gchar* _tmp18_; #line 296 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (IS_PREFERENCES_DIALOG (self)); #line 297 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" @@ -1883,250 +1953,228 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) { _tmp12_ = self->priv->lib_dir; #line 301 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (_tmp12_ != NULL) { -#line 1887 "Preferences.c" +#line 1957 "Preferences.c" const gchar* _tmp13_; #line 302 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp13_ = self->priv->lib_dir; #line 302 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" app_dirs_set_import_dir (_tmp13_); -#line 1893 "Preferences.c" +#line 1963 "Preferences.c" } #line 304 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp14_ = self->priv->path_formats; #line 304 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp15_ = self->priv->dir_pattern_combo; #line 304 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp16_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_combo_box_get_type (), GtkComboBox)); -#line 304 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp17_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp16_); + _tmp16_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_combo_box_get_type (), GtkComboBox))); #line 304 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - pf = (PreferencesDialogPathFormat*) _tmp17_; + pf = (PreferencesDialogPathFormat*) _tmp16_; #line 305 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp18_ = pf; + _tmp17_ = pf; #line 305 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp19_ = _tmp18_->pattern; + _tmp18_ = _tmp17_->pattern; #line 305 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (NULL == _tmp19_) { -#line 1911 "Preferences.c" + if (NULL == _tmp18_) { +#line 1979 "Preferences.c" + ConfigFacade* _tmp19_; ConfigFacade* _tmp20_; - ConfigFacade* _tmp21_; - GtkEntry* _tmp22_; + GtkEntry* _tmp21_; + const gchar* _tmp22_; const gchar* _tmp23_; - const gchar* _tmp24_; + ConfigFacade* _tmp24_; ConfigFacade* _tmp25_; - ConfigFacade* _tmp26_; #line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp20_ = config_facade_get_instance (); + _tmp19_ = config_facade_get_instance (); #line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp21_ = _tmp20_; + _tmp20_ = _tmp19_; #line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp22_ = self->priv->dir_pattern_entry; + _tmp21_ = self->priv->dir_pattern_entry; #line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp23_ = gtk_entry_get_text (_tmp22_); + _tmp22_ = gtk_entry_get_text (_tmp21_); #line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - configuration_facade_set_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp24_); + configuration_facade_set_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp23_); #line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_object_unref0 (_tmp21_); + _g_object_unref0 (_tmp20_); #line 307 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp25_ = config_facade_get_instance (); + _tmp24_ = config_facade_get_instance (); #line 307 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp26_ = _tmp25_; + _tmp25_ = _tmp24_; #line 307 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), NULL); + configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), NULL); #line 307 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_object_unref0 (_tmp26_); -#line 1941 "Preferences.c" + _g_object_unref0 (_tmp25_); +#line 2009 "Preferences.c" } else { + ConfigFacade* _tmp26_; ConfigFacade* _tmp27_; - ConfigFacade* _tmp28_; - PreferencesDialogPathFormat* _tmp29_; - const gchar* _tmp30_; + PreferencesDialogPathFormat* _tmp28_; + const gchar* _tmp29_; #line 309 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp27_ = config_facade_get_instance (); + _tmp26_ = config_facade_get_instance (); #line 309 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp28_ = _tmp27_; + _tmp27_ = _tmp26_; #line 309 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp29_ = pf; + _tmp28_ = pf; #line 309 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp30_ = _tmp29_->pattern; + _tmp29_ = _tmp28_->pattern; #line 309 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp30_); + configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp29_); #line 309 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_object_unref0 (_tmp28_); -#line 1959 "Preferences.c" + _g_object_unref0 (_tmp27_); +#line 2027 "Preferences.c" } #line 296 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _preferences_dialog_path_format_unref0 (pf); -#line 1963 "Preferences.c" +#line 2031 "Preferences.c" } -static gboolean preferences_dialog_on_delete (PreferencesDialog* self) { +static gboolean +preferences_dialog_on_delete (PreferencesDialog* self) +{ gboolean result = FALSE; - gboolean _tmp0_; - gboolean _tmp1_; #line 313 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE); #line 314 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp0_ = preferences_dialog_get_allow_closing (self); -#line 314 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (!_tmp0_) { + if (!preferences_dialog_get_allow_closing (self)) { #line 315 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" result = TRUE; #line 315 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return result; -#line 1981 "Preferences.c" +#line 2047 "Preferences.c" } #line 317 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_commit_on_close (self); #line 318 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp1_ = gtk_widget_hide_on_delete (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 318 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - result = _tmp1_; + result = gtk_widget_hide_on_delete (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 318 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return result; -#line 1991 "Preferences.c" +#line 2055 "Preferences.c" } -static void preferences_dialog_on_close (PreferencesDialog* self) { - gboolean _tmp0_; +static void +preferences_dialog_on_close (PreferencesDialog* self) +{ #line 321 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (IS_PREFERENCES_DIALOG (self)); #line 322 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp0_ = preferences_dialog_get_allow_closing (self); -#line 322 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (!_tmp0_) { + if (!preferences_dialog_get_allow_closing (self)) { #line 323 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return; -#line 2005 "Preferences.c" +#line 2068 "Preferences.c" } #line 325 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 326 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_commit_on_close (self); -#line 2011 "Preferences.c" +#line 2074 "Preferences.c" } -static void preferences_dialog_on_value_changed (PreferencesDialog* self) { +static void +preferences_dialog_on_value_changed (PreferencesDialog* self) +{ GtkAdjustment* _tmp0_; - gdouble _tmp1_; - GtkAdjustment* _tmp2_; - gdouble _tmp3_; + GtkAdjustment* _tmp1_; #line 329 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (IS_PREFERENCES_DIALOG (self)); #line 330 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp0_ = self->priv->bg_color_adjustment; #line 330 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp1_ = gtk_adjustment_get_upper (_tmp0_); + _tmp1_ = self->priv->bg_color_adjustment; #line 330 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp2_ = self->priv->bg_color_adjustment; -#line 330 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp3_ = gtk_adjustment_get_value (_tmp2_); -#line 330 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - preferences_dialog_set_background_color (self, ((gdouble) (_tmp1_ - _tmp3_)) / 65535.0); -#line 2032 "Preferences.c" + preferences_dialog_set_background_color (self, ((gdouble) (gtk_adjustment_get_upper (_tmp0_) - gtk_adjustment_get_value (_tmp1_))) / 65535.0); +#line 2091 "Preferences.c" } -static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, GdkEventButton* event) { +static gboolean +preferences_dialog_on_bg_color_reset (PreferencesDialog* self, + GdkEventButton* event) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GdkEventButton* _tmp2_; - guint _tmp3_; + guint _tmp2_; #line 334 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE); #line 334 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_val_if_fail (event != NULL, FALSE); #line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp2_ = event; -#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp3_ = _tmp2_->button; -#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (_tmp3_ == ((guint) 1)) { -#line 2052 "Preferences.c" - GdkEventButton* _tmp4_; - GdkEventType _tmp5_; + _tmp2_ = event->button; #line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp4_ = event; + if (_tmp2_ == ((guint) 1)) { +#line 2111 "Preferences.c" + GdkEventType _tmp3_; #line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp5_ = _tmp4_->type; + _tmp3_ = event->type; #line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp1_ = _tmp5_ == GDK_BUTTON_PRESS; -#line 2061 "Preferences.c" + _tmp1_ = _tmp3_ == GDK_BUTTON_PRESS; +#line 2117 "Preferences.c" } else { #line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp1_ = FALSE; -#line 2065 "Preferences.c" +#line 2121 "Preferences.c" } #line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (_tmp1_) { -#line 2069 "Preferences.c" - GdkEventButton* _tmp6_; - GdkModifierType _tmp7_; - gboolean _tmp8_; +#line 2125 "Preferences.c" + GdkModifierType _tmp4_; #line 336 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp6_ = event; + _tmp4_ = event->state; #line 336 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp7_ = _tmp6_->state; -#line 336 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp8_ = has_only_key_modifier (_tmp7_, GDK_CONTROL_MASK); -#line 336 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp0_ = _tmp8_; -#line 2081 "Preferences.c" + _tmp0_ = has_only_key_modifier (_tmp4_, GDK_CONTROL_MASK); +#line 2131 "Preferences.c" } else { #line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp0_ = FALSE; -#line 2085 "Preferences.c" +#line 2135 "Preferences.c" } #line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (_tmp0_) { -#line 2089 "Preferences.c" - GtkScale* _tmp9_; - GtkAdjustment* _tmp10_; - gdouble _tmp11_; - GdkRGBA _tmp12_ = {0}; - gdouble _tmp13_; +#line 2139 "Preferences.c" + GtkScale* _tmp5_; + GtkAdjustment* _tmp6_; + GdkRGBA _tmp7_ = {0}; + gdouble _tmp8_; #line 338 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp9_ = self->priv->bg_color_slider; + _tmp5_ = self->priv->bg_color_slider; #line 338 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp10_ = self->priv->bg_color_adjustment; + _tmp6_ = self->priv->bg_color_adjustment; #line 338 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp11_ = gtk_adjustment_get_upper (_tmp10_); + parse_color (CONFIG_FACADE_DEFAULT_BG_COLOR, &_tmp7_); #line 338 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - parse_color (CONFIG_FACADE_DEFAULT_BG_COLOR, &_tmp12_); + _tmp8_ = _tmp7_.red; #line 338 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp13_ = _tmp12_.red; -#line 338 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), _tmp11_ - (_tmp13_ * 65536.0f)); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_range_get_type (), GtkRange), gtk_adjustment_get_upper (_tmp6_) - (_tmp8_ * 65536.0f)); #line 340 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_on_value_changed (self); #line 342 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" result = TRUE; #line 342 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return result; -#line 2113 "Preferences.c" +#line 2160 "Preferences.c" } #line 345 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" result = FALSE; #line 345 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return result; -#line 2119 "Preferences.c" +#line 2166 "Preferences.c" } -static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog* self) { +static void +preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog* self) +{ PreferencesDialogPathFormat* pf = NULL; GeeArrayList* _tmp0_; GtkComboBoxText* _tmp1_; - gint _tmp2_; - gpointer _tmp3_; - PreferencesDialogPathFormat* _tmp4_; - const gchar* _tmp5_; + gpointer _tmp2_; + PreferencesDialogPathFormat* _tmp3_; + const gchar* _tmp4_; #line 348 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (IS_PREFERENCES_DIALOG (self)); #line 349 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" @@ -2134,105 +2182,102 @@ static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog* #line 349 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp1_ = self->priv->dir_pattern_combo; #line 349 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); -#line 349 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp3_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp2_); + _tmp2_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox))); #line 349 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - pf = (PreferencesDialogPathFormat*) _tmp3_; + pf = (PreferencesDialogPathFormat*) _tmp2_; #line 350 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp4_ = pf; + _tmp3_ = pf; #line 350 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp5_ = _tmp4_->pattern; + _tmp4_ = _tmp3_->pattern; #line 350 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (NULL == _tmp5_) { -#line 2149 "Preferences.c" + if (NULL == _tmp4_) { +#line 2195 "Preferences.c" gchar* dir_pattern = NULL; + ConfigFacade* _tmp5_; ConfigFacade* _tmp6_; - ConfigFacade* _tmp7_; + gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; - const gchar* _tmp10_; - gboolean _tmp11_; + const gchar* _tmp9_; + GtkEntry* _tmp11_; + const gchar* _tmp12_; GtkEntry* _tmp13_; - const gchar* _tmp14_; - GtkEntry* _tmp15_; - GtkEntry* _tmp16_; + GtkEntry* _tmp14_; #line 352 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp6_ = config_facade_get_instance (); + _tmp5_ = config_facade_get_instance (); #line 352 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 352 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp8_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp7_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 352 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 352 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 352 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - dir_pattern = _tmp9_; -#line 353 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp10_ = dir_pattern; + dir_pattern = _tmp8_; #line 353 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp11_ = is_string_empty (_tmp10_); + _tmp9_ = dir_pattern; #line 353 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (_tmp11_) { -#line 2179 "Preferences.c" - gchar* _tmp12_; + if (is_string_empty (_tmp9_)) { +#line 2222 "Preferences.c" + gchar* _tmp10_; #line 354 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp12_ = g_strdup (""); + _tmp10_ = g_strdup (""); #line 354 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_free0 (dir_pattern); #line 354 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - dir_pattern = _tmp12_; -#line 2187 "Preferences.c" + dir_pattern = _tmp10_; +#line 2230 "Preferences.c" } #line 355 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp13_ = self->priv->dir_pattern_entry; + _tmp11_ = self->priv->dir_pattern_entry; #line 355 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp14_ = dir_pattern; + _tmp12_ = dir_pattern; #line 355 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_entry_set_text (_tmp13_, _tmp14_); + gtk_entry_set_text (_tmp11_, _tmp12_); #line 356 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp15_ = self->priv->dir_pattern_entry; + _tmp13_ = self->priv->dir_pattern_entry; #line 356 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_object_set (_tmp15_, "editable", TRUE, NULL); + g_object_set (_tmp13_, "editable", TRUE, NULL); #line 357 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp16_ = self->priv->dir_pattern_entry; + _tmp14_ = self->priv->dir_pattern_entry; #line 357 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), TRUE); #line 350 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_free0 (dir_pattern); -#line 2205 "Preferences.c" +#line 2248 "Preferences.c" } else { - GtkEntry* _tmp17_; - PreferencesDialogPathFormat* _tmp18_; - const gchar* _tmp19_; - GtkEntry* _tmp20_; - GtkEntry* _tmp21_; + GtkEntry* _tmp15_; + PreferencesDialogPathFormat* _tmp16_; + const gchar* _tmp17_; + GtkEntry* _tmp18_; + GtkEntry* _tmp19_; #line 359 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp17_ = self->priv->dir_pattern_entry; + _tmp15_ = self->priv->dir_pattern_entry; #line 359 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp18_ = pf; + _tmp16_ = pf; #line 359 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp19_ = _tmp18_->pattern; + _tmp17_ = _tmp16_->pattern; #line 359 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_entry_set_text (_tmp17_, _tmp19_); + gtk_entry_set_text (_tmp15_, _tmp17_); #line 360 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp20_ = self->priv->dir_pattern_entry; + _tmp18_ = self->priv->dir_pattern_entry; #line 360 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_object_set (_tmp20_, "editable", FALSE, NULL); + g_object_set (_tmp18_, "editable", FALSE, NULL); #line 361 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp21_ = self->priv->dir_pattern_entry; + _tmp19_ = self->priv->dir_pattern_entry; #line 361 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 2228 "Preferences.c" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), FALSE); +#line 2271 "Preferences.c" } #line 348 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _preferences_dialog_path_format_unref0 (pf); -#line 2232 "Preferences.c" +#line 2275 "Preferences.c" } -static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog* self) { +static void +preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog* self) +{ gchar* example = NULL; GDateTime* _tmp0_; GtkEntry* _tmp1_; @@ -2241,7 +2286,6 @@ static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog* gchar* _tmp4_; gboolean _tmp5_ = FALSE; const gchar* _tmp6_; - gboolean _tmp7_; #line 365 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (IS_PREFERENCES_DIALOG (self)); #line 366 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" @@ -2259,93 +2303,87 @@ static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog* #line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp6_ = example; #line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp7_ = is_string_empty (_tmp6_); -#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (_tmp7_) { -#line 2266 "Preferences.c" - GtkEntry* _tmp8_; + if (is_string_empty (_tmp6_)) { +#line 2308 "Preferences.c" + GtkEntry* _tmp7_; + const gchar* _tmp8_; const gchar* _tmp9_; - const gchar* _tmp10_; - gboolean _tmp11_; #line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp8_ = self->priv->dir_pattern_entry; + _tmp7_ = self->priv->dir_pattern_entry; #line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp9_ = gtk_entry_get_text (_tmp8_); + _tmp8_ = gtk_entry_get_text (_tmp7_); #line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp10_ = _tmp9_; -#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp11_ = is_string_empty (_tmp10_); + _tmp9_ = _tmp8_; #line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp5_ = !_tmp11_; -#line 2281 "Preferences.c" + _tmp5_ = !is_string_empty (_tmp9_); +#line 2320 "Preferences.c" } else { #line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp5_ = FALSE; -#line 2285 "Preferences.c" +#line 2324 "Preferences.c" } #line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (_tmp5_) { -#line 2289 "Preferences.c" - GtkLabel* _tmp12_; - GtkEntry* _tmp13_; - GtkEntry* _tmp14_; +#line 2328 "Preferences.c" + GtkLabel* _tmp10_; + GtkEntry* _tmp11_; + GtkEntry* _tmp12_; #line 369 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp12_ = self->priv->dir_pattern_example; + _tmp10_ = self->priv->dir_pattern_example; #line 369 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_label_set_text (_tmp12_, _ ("Invalid pattern")); + gtk_label_set_text (_tmp10_, _ ("Invalid pattern")); #line 370 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp13_ = self->priv->dir_pattern_entry; + _tmp11_ = self->priv->dir_pattern_entry; #line 370 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_entry_set_icon_from_icon_name (_tmp13_, GTK_ENTRY_ICON_SECONDARY, "dialog-error"); + gtk_entry_set_icon_from_icon_name (_tmp11_, GTK_ENTRY_ICON_SECONDARY, "dialog-error"); #line 371 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp14_ = self->priv->dir_pattern_entry; + _tmp12_ = self->priv->dir_pattern_entry; #line 371 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_entry_set_icon_activatable (_tmp14_, GTK_ENTRY_ICON_SECONDARY, FALSE); + gtk_entry_set_icon_activatable (_tmp12_, GTK_ENTRY_ICON_SECONDARY, FALSE); #line 372 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_set_allow_closing (self, FALSE); -#line 2307 "Preferences.c" +#line 2346 "Preferences.c" } else { - GtkLabel* _tmp15_; - const gchar* _tmp16_; - GtkEntry* _tmp17_; + GtkLabel* _tmp13_; + const gchar* _tmp14_; + GtkEntry* _tmp15_; #line 375 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp15_ = self->priv->dir_pattern_example; + _tmp13_ = self->priv->dir_pattern_example; #line 375 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp16_ = example; + _tmp14_ = example; #line 375 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_label_set_text (_tmp15_, _tmp16_); + gtk_label_set_text (_tmp13_, _tmp14_); #line 376 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp17_ = self->priv->dir_pattern_entry; + _tmp15_ = self->priv->dir_pattern_entry; #line 376 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_entry_set_icon_from_icon_name (_tmp17_, GTK_ENTRY_ICON_SECONDARY, NULL); + gtk_entry_set_icon_from_icon_name (_tmp15_, GTK_ENTRY_ICON_SECONDARY, NULL); #line 377 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_set_allow_closing (self, TRUE); -#line 2324 "Preferences.c" +#line 2363 "Preferences.c" } #line 365 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_free0 (example); -#line 2328 "Preferences.c" +#line 2367 "Preferences.c" } -static void preferences_dialog_set_allow_closing (PreferencesDialog* self, gboolean allow) { - gboolean _tmp0_; - gboolean _tmp1_; +static void +preferences_dialog_set_allow_closing (PreferencesDialog* self, + gboolean allow) +{ #line 381 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (IS_PREFERENCES_DIALOG (self)); #line 382 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp0_ = allow; -#line 382 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_window_set_deletable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_); -#line 383 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp1_ = allow; + gtk_window_set_deletable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), allow); #line 383 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - self->priv->allow_closing = _tmp1_; -#line 2345 "Preferences.c" + self->priv->allow_closing = allow; +#line 2381 "Preferences.c" } -static gboolean preferences_dialog_get_allow_closing (PreferencesDialog* self) { +static gboolean +preferences_dialog_get_allow_closing (PreferencesDialog* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 386 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" @@ -2356,15 +2394,17 @@ static gboolean preferences_dialog_get_allow_closing (PreferencesDialog* self) { result = _tmp0_; #line 387 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return result; -#line 2360 "Preferences.c" +#line 2398 "Preferences.c" } -static void preferences_dialog_set_background_color (PreferencesDialog* self, gdouble bg_color_value) { +static void +preferences_dialog_set_background_color (PreferencesDialog* self, + gdouble bg_color_value) +{ ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - gdouble _tmp2_; - GdkRGBA _tmp3_ = {0}; + GdkRGBA _tmp2_ = {0}; #line 390 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (IS_PREFERENCES_DIALOG (self)); #line 391 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" @@ -2372,276 +2412,261 @@ static void preferences_dialog_set_background_color (PreferencesDialog* self, gd #line 391 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp1_ = _tmp0_; #line 391 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp2_ = bg_color_value; + preferences_dialog_to_grayscale (self, bg_color_value, &_tmp2_); #line 391 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - preferences_dialog_to_grayscale (self, _tmp2_, &_tmp3_); -#line 391 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - config_facade_set_bg_color (_tmp1_, &_tmp3_); + config_facade_set_bg_color (_tmp1_, &_tmp2_); #line 391 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_object_unref0 (_tmp1_); -#line 2383 "Preferences.c" +#line 2421 "Preferences.c" } -static void preferences_dialog_to_grayscale (PreferencesDialog* self, gdouble color_value, GdkRGBA* result) { +static void +preferences_dialog_to_grayscale (PreferencesDialog* self, + gdouble color_value, + GdkRGBA* result) +{ GdkRGBA color = {0}; - gdouble _tmp0_; - gdouble _tmp1_; - gdouble _tmp2_; #line 394 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (IS_PREFERENCES_DIALOG (self)); #line 395 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" memset (&color, 0, sizeof (GdkRGBA)); #line 397 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp0_ = color_value; -#line 397 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - color.red = _tmp0_; + color.red = color_value; #line 398 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp1_ = color_value; -#line 398 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - color.green = _tmp1_; -#line 399 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp2_ = color_value; + color.green = color_value; #line 399 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - color.blue = _tmp2_; + color.blue = color_value; #line 400 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" color.alpha = 1.0; #line 402 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" *result = color; #line 402 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return; -#line 2414 "Preferences.c" +#line 2447 "Preferences.c" } -static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self) { +static void +preferences_dialog_on_photo_editor_changed (PreferencesDialog* self) +{ gint _tmp0_ = 0; GtkComboBox* _tmp1_; - gint _tmp2_; - SortedList* _tmp3_; + SortedList* _tmp2_; + gint _tmp3_; gint _tmp4_; - gint _tmp5_; gint photo_app_choice_index = 0; GAppInfo* app = NULL; - SortedList* _tmp11_; - gpointer _tmp12_; - ConfigFacade* _tmp13_; - ConfigFacade* _tmp14_; + SortedList* _tmp9_; + gpointer _tmp10_; + ConfigFacade* _tmp11_; + ConfigFacade* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; gchar* _tmp15_; gchar* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; #line 405 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (IS_PREFERENCES_DIALOG (self)); #line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp1_ = self->priv->photo_editor_combo; #line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp2_ = gtk_combo_box_get_active (_tmp1_); + _tmp2_ = self->priv->external_photo_apps; #line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp3_ = self->priv->external_photo_apps; + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp4_ = _tmp3_; #line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp5_ = _tmp4_; -#line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (_tmp2_ < _tmp5_) { -#line 2449 "Preferences.c" - GtkComboBox* _tmp6_; - gint _tmp7_; + if (gtk_combo_box_get_active (_tmp1_) < _tmp4_) { +#line 2481 "Preferences.c" + GtkComboBox* _tmp5_; #line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp6_ = self->priv->photo_editor_combo; + _tmp5_ = self->priv->photo_editor_combo; #line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp7_ = gtk_combo_box_get_active (_tmp6_); -#line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp0_ = _tmp7_; -#line 2458 "Preferences.c" + _tmp0_ = gtk_combo_box_get_active (_tmp5_); +#line 2487 "Preferences.c" } else { - SortedList* _tmp8_; - gint _tmp9_; - gint _tmp10_; + SortedList* _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp8_ = self->priv->external_photo_apps; + _tmp6_ = self->priv->external_photo_apps; #line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); #line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp0_ = _tmp10_; -#line 2471 "Preferences.c" + _tmp0_ = _tmp8_; +#line 2500 "Preferences.c" } #line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" photo_app_choice_index = _tmp0_; #line 409 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp11_ = self->priv->external_photo_apps; + _tmp9_ = self->priv->external_photo_apps; #line 409 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp12_ = sorted_list_get_at (_tmp11_, photo_app_choice_index); + _tmp10_ = sorted_list_get_at (_tmp9_, photo_app_choice_index); #line 409 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - app = (GAppInfo*) _tmp12_; + app = (GAppInfo*) _tmp10_; #line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp13_ = config_facade_get_instance (); + _tmp11_ = config_facade_get_instance (); #line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp15_ = desktop_integration_get_app_open_command (app); + _tmp13_ = desktop_integration_get_app_open_command (app); #line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp16_ = _tmp15_; + _tmp14_ = _tmp13_; #line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - configuration_facade_set_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp16_); + configuration_facade_set_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp14_); #line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp14_); #line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp12_); #line 413 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp17_ = desktop_integration_get_app_open_command (app); + _tmp15_ = desktop_integration_get_app_open_command (app); #line 413 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp18_ = _tmp17_; + _tmp16_ = _tmp15_; #line 413 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_debug ("Preferences.vala:413: setting external photo editor to: %s", _tmp18_); + g_debug ("Preferences.vala:413: setting external photo editor to: %s", _tmp16_); #line 413 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp16_); #line 405 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_object_unref0 (app); -#line 2505 "Preferences.c" +#line 2534 "Preferences.c" } -static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self) { +static void +preferences_dialog_on_raw_editor_changed (PreferencesDialog* self) +{ gint _tmp0_ = 0; GtkComboBox* _tmp1_; - gint _tmp2_; - SortedList* _tmp3_; + SortedList* _tmp2_; + gint _tmp3_; gint _tmp4_; - gint _tmp5_; gint raw_app_choice_index = 0; GAppInfo* app = NULL; - SortedList* _tmp11_; - gpointer _tmp12_; - ConfigFacade* _tmp13_; - ConfigFacade* _tmp14_; - const gchar* _tmp15_; - const gchar* _tmp16_; + SortedList* _tmp9_; + gpointer _tmp10_; + ConfigFacade* _tmp11_; + ConfigFacade* _tmp12_; + const gchar* _tmp13_; + const gchar* _tmp14_; #line 416 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (IS_PREFERENCES_DIALOG (self)); #line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp1_ = self->priv->raw_editor_combo; #line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp2_ = gtk_combo_box_get_active (_tmp1_); + _tmp2_ = self->priv->external_raw_apps; #line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp3_ = self->priv->external_raw_apps; + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp4_ = _tmp3_; #line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp5_ = _tmp4_; -#line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (_tmp2_ < _tmp5_) { -#line 2538 "Preferences.c" - GtkComboBox* _tmp6_; - gint _tmp7_; + if (gtk_combo_box_get_active (_tmp1_) < _tmp4_) { +#line 2566 "Preferences.c" + GtkComboBox* _tmp5_; #line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp6_ = self->priv->raw_editor_combo; + _tmp5_ = self->priv->raw_editor_combo; #line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp7_ = gtk_combo_box_get_active (_tmp6_); -#line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp0_ = _tmp7_; -#line 2547 "Preferences.c" + _tmp0_ = gtk_combo_box_get_active (_tmp5_); +#line 2572 "Preferences.c" } else { - SortedList* _tmp8_; - gint _tmp9_; - gint _tmp10_; + SortedList* _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp8_ = self->priv->external_raw_apps; + _tmp6_ = self->priv->external_raw_apps; #line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); #line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp0_ = _tmp10_; -#line 2560 "Preferences.c" + _tmp0_ = _tmp8_; +#line 2585 "Preferences.c" } #line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" raw_app_choice_index = _tmp0_; #line 420 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp11_ = self->priv->external_raw_apps; + _tmp9_ = self->priv->external_raw_apps; #line 420 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp12_ = sorted_list_get_at (_tmp11_, raw_app_choice_index); + _tmp10_ = sorted_list_get_at (_tmp9_, raw_app_choice_index); #line 420 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - app = (GAppInfo*) _tmp12_; + app = (GAppInfo*) _tmp10_; #line 422 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp13_ = config_facade_get_instance (); + _tmp11_ = config_facade_get_instance (); #line 422 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 422 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp15_ = g_app_info_get_commandline (app); + _tmp13_ = g_app_info_get_commandline (app); #line 422 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - configuration_facade_set_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp15_); + configuration_facade_set_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp13_); #line 422 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp12_); #line 424 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp16_ = g_app_info_get_commandline (app); + _tmp14_ = g_app_info_get_commandline (app); #line 424 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_debug ("Preferences.vala:424: setting external raw editor to: %s", _tmp16_); + g_debug ("Preferences.vala:424: setting external raw editor to: %s", _tmp14_); #line 416 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_object_unref0 (app); -#line 2586 "Preferences.c" +#line 2611 "Preferences.c" } -static RawDeveloper preferences_dialog_raw_developer_from_combo (PreferencesDialog* self) { +static RawDeveloper +preferences_dialog_raw_developer_from_combo (PreferencesDialog* self) +{ RawDeveloper result = 0; GtkComboBoxText* _tmp0_; - gint _tmp1_; #line 427 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), 0); #line 428 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp0_ = self->priv->default_raw_developer_combo; #line 428 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox)); -#line 428 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (_tmp1_ == 0) { + if (gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox)) == 0) { #line 429 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" result = RAW_DEVELOPER_CAMERA; #line 429 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return result; -#line 2606 "Preferences.c" +#line 2630 "Preferences.c" } #line 430 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" result = RAW_DEVELOPER_SHOTWELL; #line 430 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return result; -#line 2612 "Preferences.c" +#line 2636 "Preferences.c" } -static void preferences_dialog_set_raw_developer_combo (PreferencesDialog* self, RawDeveloper d) { - RawDeveloper _tmp0_; +static void +preferences_dialog_set_raw_developer_combo (PreferencesDialog* self, + RawDeveloper d) +{ #line 433 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (IS_PREFERENCES_DIALOG (self)); #line 434 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp0_ = d; -#line 434 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - if (_tmp0_ == RAW_DEVELOPER_CAMERA) { -#line 2624 "Preferences.c" - GtkComboBoxText* _tmp1_; + if (d == RAW_DEVELOPER_CAMERA) { +#line 2648 "Preferences.c" + GtkComboBoxText* _tmp0_; #line 435 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp1_ = self->priv->default_raw_developer_combo; + _tmp0_ = self->priv->default_raw_developer_combo; #line 435 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 2630 "Preferences.c" + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), 0); +#line 2654 "Preferences.c" } else { - GtkComboBoxText* _tmp2_; + GtkComboBoxText* _tmp1_; #line 437 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp2_ = self->priv->default_raw_developer_combo; + _tmp1_ = self->priv->default_raw_developer_combo; #line 437 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), 1); -#line 2637 "Preferences.c" + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), 1); +#line 2661 "Preferences.c" } } -static void preferences_dialog_on_default_raw_developer_changed (PreferencesDialog* self) { +static void +preferences_dialog_on_default_raw_developer_changed (PreferencesDialog* self) +{ ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - RawDeveloper _tmp2_; #line 440 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (IS_PREFERENCES_DIALOG (self)); #line 441 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" @@ -2649,16 +2674,16 @@ static void preferences_dialog_on_default_raw_developer_changed (PreferencesDial #line 441 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp1_ = _tmp0_; #line 441 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp2_ = preferences_dialog_raw_developer_from_combo (self); -#line 441 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - configuration_facade_set_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_); + configuration_facade_set_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), preferences_dialog_raw_developer_from_combo (self)); #line 441 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_object_unref0 (_tmp1_); -#line 2658 "Preferences.c" +#line 2681 "Preferences.c" } -static void preferences_dialog_on_current_folder_changed (PreferencesDialog* self) { +static void +preferences_dialog_on_current_folder_changed (PreferencesDialog* self) +{ GtkFileChooserButton* _tmp0_; gchar* _tmp1_; #line 444 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" @@ -2666,92 +2691,88 @@ static void preferences_dialog_on_current_folder_changed (PreferencesDialog* sel #line 445 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp0_ = self->priv->library_dir_button; #line 445 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp1_ = gtk_file_chooser_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); + _tmp1_ = gtk_file_chooser_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_file_chooser_get_type (), GtkFileChooser)); #line 445 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_free0 (self->priv->lib_dir); #line 445 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" self->priv->lib_dir = _tmp1_; -#line 2675 "Preferences.c" +#line 2700 "Preferences.c" } -static void _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed (GtkFileChooser* _sender, gpointer self) { +static void +_preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed (GtkFileChooser* _sender, + gpointer self) +{ #line 454 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_on_current_folder_changed ((PreferencesDialog*) self); -#line 2682 "Preferences.c" +#line 2710 "Preferences.c" } -static gboolean preferences_dialog_real_map_event (GtkWidget* base, GdkEventAny* event) { +static gboolean +preferences_dialog_real_map_event (GtkWidget* base, + GdkEventAny* event) +{ PreferencesDialog * self; gboolean result = FALSE; gboolean _result_ = FALSE; - GdkEventAny* _tmp0_; - gboolean _tmp1_; - GtkFileChooserButton* _tmp2_; + GtkFileChooserButton* _tmp0_; #line 448 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PREFERENCES_DIALOG, PreferencesDialog); #line 448 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_val_if_fail (event != NULL, FALSE); #line 449 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp0_ = event; -#line 449 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp1_ = GTK_WIDGET_CLASS (preferences_dialog_parent_class)->map_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), gtk_widget_get_type (), GtkWidget), _tmp0_); -#line 449 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _result_ = _tmp1_; + _result_ = GTK_WIDGET_CLASS (preferences_dialog_parent_class)->map_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), gtk_widget_get_type (), GtkWidget), event); #line 454 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp2_ = self->priv->library_dir_button; + _tmp0_ = self->priv->library_dir_button; #line 454 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "current-folder-changed", (GCallback) _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_file_chooser_get_type (), GtkFileChooser), "current-folder-changed", (GCallback) _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed, self, 0); #line 456 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" result = _result_; #line 456 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return result; -#line 2711 "Preferences.c" +#line 2736 "Preferences.c" } -static void preferences_dialog_add_to_dir_formats (PreferencesDialog* self, const gchar* name, const gchar* pattern) { +static void +preferences_dialog_add_to_dir_formats (PreferencesDialog* self, + const gchar* name, + const gchar* pattern) +{ PreferencesDialogPathFormat* pf = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - PreferencesDialogPathFormat* _tmp2_; - GeeArrayList* _tmp3_; - GtkComboBoxText* _tmp4_; - const gchar* _tmp5_; + PreferencesDialogPathFormat* _tmp0_; + GeeArrayList* _tmp1_; + GtkComboBoxText* _tmp2_; #line 459 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (IS_PREFERENCES_DIALOG (self)); #line 459 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (name != NULL); #line 460 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp0_ = name; -#line 460 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp1_ = pattern; -#line 460 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp2_ = preferences_dialog_path_format_new (_tmp0_, _tmp1_); + _tmp0_ = preferences_dialog_path_format_new (name, pattern); #line 460 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - pf = _tmp2_; + pf = _tmp0_; #line 461 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp3_ = self->priv->path_formats; + _tmp1_ = self->priv->path_formats; #line 461 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), pf); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), pf); #line 462 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp4_ = self->priv->dir_pattern_combo; + _tmp2_ = self->priv->dir_pattern_combo; #line 462 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp5_ = name; -#line 462 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - gtk_combo_box_text_append_text (_tmp4_, _tmp5_); + gtk_combo_box_text_append_text (_tmp2_, name); #line 459 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _preferences_dialog_path_format_unref0 (pf); -#line 2747 "Preferences.c" +#line 2767 "Preferences.c" } -static void preferences_dialog_on_lowercase_toggled (PreferencesDialog* self) { +static void +preferences_dialog_on_lowercase_toggled (PreferencesDialog* self) +{ ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; GtkCheckButton* _tmp2_; - gboolean _tmp3_; #line 465 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (IS_PREFERENCES_DIALOG (self)); #line 466 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" @@ -2761,152 +2782,176 @@ static void preferences_dialog_on_lowercase_toggled (PreferencesDialog* self) { #line 466 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _tmp2_ = self->priv->lowercase; #line 466 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 466 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - configuration_facade_set_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp3_); + configuration_facade_set_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton))); #line 466 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_object_unref0 (_tmp1_); -#line 2770 "Preferences.c" +#line 2789 "Preferences.c" } -static PreferencesDialogPathFormat* preferences_dialog_path_format_construct (GType object_type, const gchar* name, const gchar* pattern) { +static PreferencesDialogPathFormat* +preferences_dialog_path_format_construct (GType object_type, + const gchar* name, + const gchar* pattern) +{ PreferencesDialogPathFormat* self = NULL; - const gchar* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_; #line 11 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_val_if_fail (name != NULL, NULL); #line 11 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" self = (PreferencesDialogPathFormat*) g_type_create_instance (object_type); #line 12 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp0_ = name; -#line 12 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (name); #line 12 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_free0 (self->name); #line 12 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - self->name = _tmp1_; + self->name = _tmp0_; #line 13 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp2_ = pattern; -#line 13 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (pattern); #line 13 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_free0 (self->pattern); #line 13 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" - self->pattern = _tmp3_; + self->pattern = _tmp1_; #line 11 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return self; -#line 2802 "Preferences.c" +#line 2819 "Preferences.c" } -static PreferencesDialogPathFormat* preferences_dialog_path_format_new (const gchar* name, const gchar* pattern) { +static PreferencesDialogPathFormat* +preferences_dialog_path_format_new (const gchar* name, + const gchar* pattern) +{ #line 11 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return preferences_dialog_path_format_construct (PREFERENCES_DIALOG_TYPE_PATH_FORMAT, name, pattern); -#line 2809 "Preferences.c" +#line 2829 "Preferences.c" } -static void preferences_dialog_value_path_format_init (GValue* value) { +static void +preferences_dialog_value_path_format_init (GValue* value) +{ #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" value->data[0].v_pointer = NULL; -#line 2816 "Preferences.c" +#line 2838 "Preferences.c" } -static void preferences_dialog_value_path_format_free_value (GValue* value) { +static void +preferences_dialog_value_path_format_free_value (GValue* value) +{ #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (value->data[0].v_pointer) { #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_path_format_unref (value->data[0].v_pointer); -#line 2825 "Preferences.c" +#line 2849 "Preferences.c" } } -static void preferences_dialog_value_path_format_copy_value (const GValue* src_value, GValue* dest_value) { +static void +preferences_dialog_value_path_format_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (src_value->data[0].v_pointer) { #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" dest_value->data[0].v_pointer = preferences_dialog_path_format_ref (src_value->data[0].v_pointer); -#line 2835 "Preferences.c" +#line 2862 "Preferences.c" } else { #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" dest_value->data[0].v_pointer = NULL; -#line 2839 "Preferences.c" +#line 2866 "Preferences.c" } } -static gpointer preferences_dialog_value_path_format_peek_pointer (const GValue* value) { +static gpointer +preferences_dialog_value_path_format_peek_pointer (const GValue* value) +{ #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return value->data[0].v_pointer; -#line 2847 "Preferences.c" +#line 2876 "Preferences.c" } -static gchar* preferences_dialog_value_path_format_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +preferences_dialog_value_path_format_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (collect_values[0].v_pointer) { -#line 2854 "Preferences.c" +#line 2888 "Preferences.c" PreferencesDialogPathFormat * object; object = collect_values[0].v_pointer; #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (object->parent_instance.g_class == NULL) { #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2861 "Preferences.c" +#line 2895 "Preferences.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2865 "Preferences.c" +#line 2899 "Preferences.c" } #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" value->data[0].v_pointer = preferences_dialog_path_format_ref (object); -#line 2869 "Preferences.c" +#line 2903 "Preferences.c" } else { #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" value->data[0].v_pointer = NULL; -#line 2873 "Preferences.c" +#line 2907 "Preferences.c" } #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return NULL; -#line 2877 "Preferences.c" +#line 2911 "Preferences.c" } -static gchar* preferences_dialog_value_path_format_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +preferences_dialog_value_path_format_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PreferencesDialogPathFormat ** object_p; object_p = collect_values[0].v_pointer; #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (!object_p) { #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2888 "Preferences.c" +#line 2927 "Preferences.c" } #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (!value->data[0].v_pointer) { #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" *object_p = NULL; -#line 2894 "Preferences.c" +#line 2933 "Preferences.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" *object_p = value->data[0].v_pointer; -#line 2898 "Preferences.c" +#line 2937 "Preferences.c" } else { #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" *object_p = preferences_dialog_path_format_ref (value->data[0].v_pointer); -#line 2902 "Preferences.c" +#line 2941 "Preferences.c" } #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return NULL; -#line 2906 "Preferences.c" +#line 2945 "Preferences.c" } -static GParamSpec* preferences_dialog_param_spec_path_format (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +static GParamSpec* +preferences_dialog_param_spec_path_format (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ PreferencesDialogParamSpecPathFormat* spec; #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_val_if_fail (g_type_is_a (object_type, PREFERENCES_DIALOG_TYPE_PATH_FORMAT), NULL); @@ -2916,20 +2961,25 @@ static GParamSpec* preferences_dialog_param_spec_path_format (const gchar* name, G_PARAM_SPEC (spec)->value_type = object_type; #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return G_PARAM_SPEC (spec); -#line 2920 "Preferences.c" +#line 2965 "Preferences.c" } -static gpointer preferences_dialog_value_get_path_format (const GValue* value) { +static gpointer +preferences_dialog_value_get_path_format (const GValue* value) +{ #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT), NULL); #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return value->data[0].v_pointer; -#line 2929 "Preferences.c" +#line 2976 "Preferences.c" } -static void preferences_dialog_value_set_path_format (GValue* value, gpointer v_object) { +static void +preferences_dialog_value_set_path_format (GValue* value, + gpointer v_object) +{ PreferencesDialogPathFormat * old; #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT)); @@ -2945,22 +2995,25 @@ static void preferences_dialog_value_set_path_format (GValue* value, gpointer v_ value->data[0].v_pointer = v_object; #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_path_format_ref (value->data[0].v_pointer); -#line 2949 "Preferences.c" +#line 2999 "Preferences.c" } else { #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" value->data[0].v_pointer = NULL; -#line 2953 "Preferences.c" +#line 3003 "Preferences.c" } #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (old) { #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_path_format_unref (old); -#line 2959 "Preferences.c" +#line 3009 "Preferences.c" } } -static void preferences_dialog_value_take_path_format (GValue* value, gpointer v_object) { +static void +preferences_dialog_value_take_path_format (GValue* value, + gpointer v_object) +{ PreferencesDialogPathFormat * old; #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT)); @@ -2974,38 +3027,44 @@ static void preferences_dialog_value_take_path_format (GValue* value, gpointer v g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" value->data[0].v_pointer = v_object; -#line 2978 "Preferences.c" +#line 3031 "Preferences.c" } else { #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" value->data[0].v_pointer = NULL; -#line 2982 "Preferences.c" +#line 3035 "Preferences.c" } #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" if (old) { #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_path_format_unref (old); -#line 2988 "Preferences.c" +#line 3041 "Preferences.c" } } -static void preferences_dialog_path_format_class_init (PreferencesDialogPathFormatClass * klass) { +static void +preferences_dialog_path_format_class_init (PreferencesDialogPathFormatClass * klass) +{ #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_path_format_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" ((PreferencesDialogPathFormatClass *) klass)->finalize = preferences_dialog_path_format_finalize; -#line 2998 "Preferences.c" +#line 3053 "Preferences.c" } -static void preferences_dialog_path_format_instance_init (PreferencesDialogPathFormat * self) { +static void +preferences_dialog_path_format_instance_init (PreferencesDialogPathFormat * self) +{ #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" self->ref_count = 1; -#line 3005 "Preferences.c" +#line 3062 "Preferences.c" } -static void preferences_dialog_path_format_finalize (PreferencesDialogPathFormat * obj) { +static void +preferences_dialog_path_format_finalize (PreferencesDialogPathFormat * obj) +{ PreferencesDialogPathFormat * self; #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PREFERENCES_DIALOG_TYPE_PATH_FORMAT, PreferencesDialogPathFormat); @@ -3015,11 +3074,13 @@ static void preferences_dialog_path_format_finalize (PreferencesDialogPathFormat _g_free0 (self->name); #line 16 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" _g_free0 (self->pattern); -#line 3019 "Preferences.c" +#line 3078 "Preferences.c" } -static GType preferences_dialog_path_format_get_type (void) { +static GType +preferences_dialog_path_format_get_type (void) +{ static volatile gsize preferences_dialog_path_format_type_id__volatile = 0; if (g_once_init_enter (&preferences_dialog_path_format_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { preferences_dialog_value_path_format_init, preferences_dialog_value_path_format_free_value, preferences_dialog_value_path_format_copy_value, preferences_dialog_value_path_format_peek_pointer, "p", preferences_dialog_value_path_format_collect_value, "p", preferences_dialog_value_path_format_lcopy_value }; @@ -3033,18 +3094,22 @@ static GType preferences_dialog_path_format_get_type (void) { } -static gpointer preferences_dialog_path_format_ref (gpointer instance) { +static gpointer +preferences_dialog_path_format_ref (gpointer instance) +{ PreferencesDialogPathFormat * self; self = instance; #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_atomic_int_inc (&self->ref_count); #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" return instance; -#line 3044 "Preferences.c" +#line 3107 "Preferences.c" } -static void preferences_dialog_path_format_unref (gpointer instance) { +static void +preferences_dialog_path_format_unref (gpointer instance) +{ PreferencesDialogPathFormat * self; self = instance; #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" @@ -3053,12 +3118,14 @@ static void preferences_dialog_path_format_unref (gpointer instance) { PREFERENCES_DIALOG_PATH_FORMAT_GET_CLASS (self)->finalize (self); #line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3057 "Preferences.c" +#line 3122 "Preferences.c" } } -static void preferences_dialog_class_init (PreferencesDialogClass * klass) { +static void +preferences_dialog_class_init (PreferencesDialogClass * klass) +{ gint PreferencesDialog_private_offset; #line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" preferences_dialog_parent_class = g_type_class_peek_parent (klass); @@ -3108,11 +3175,13 @@ static void preferences_dialog_class_init (PreferencesDialogClass * klass) { gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "transparent_solid_color", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, transparent_solid_color)); #line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "transparent_none_radio", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, transparent_none_radio)); -#line 3112 "Preferences.c" +#line 3179 "Preferences.c" } -static void preferences_dialog_instance_init (PreferencesDialog * self) { +static void +preferences_dialog_instance_init (PreferencesDialog * self) +{ GeeArrayList* _tmp0_; GDateTime* _tmp1_; PluginsManifestWidgetMediator* _tmp2_; @@ -3138,11 +3207,13 @@ static void preferences_dialog_instance_init (PreferencesDialog * self) { self->priv->plugins_mediator = _tmp2_; #line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 3142 "Preferences.c" +#line 3211 "Preferences.c" } -static void preferences_dialog_finalize (GObject * obj) { +static void +preferences_dialog_finalize (GObject * obj) +{ PreferencesDialog * self; #line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREFERENCES_DIALOG, PreferencesDialog); @@ -3196,11 +3267,13 @@ static void preferences_dialog_finalize (GObject * obj) { _g_object_unref0 (self->priv->transparent_none_radio); #line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala" G_OBJECT_CLASS (preferences_dialog_parent_class)->finalize (obj); -#line 3200 "Preferences.c" +#line 3271 "Preferences.c" } -GType preferences_dialog_get_type (void) { +GType +preferences_dialog_get_type (void) +{ static volatile gsize preferences_dialog_type_id__volatile = 0; if (g_once_init_enter (&preferences_dialog_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PreferencesDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) preferences_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PreferencesDialog), 0, (GInstanceInitFunc) preferences_dialog_instance_init, NULL }; @@ -3212,7 +3285,11 @@ GType preferences_dialog_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -3224,13 +3301,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -static gint _vala_array_length (gpointer array) { +static gint +_vala_array_length (gpointer array) +{ int length; length = 0; if (array) { diff --git a/src/dialogs/ProgressDialog.c b/src/dialogs/ProgressDialog.c index 5183c12..7098e20 100644 --- a/src/dialogs/ProgressDialog.c +++ b/src/dialogs/ProgressDialog.c @@ -1,4 +1,4 @@ -/* ProgressDialog.c generated by valac 0.36.6, the Vala compiler +/* ProgressDialog.c generated by valac 0.40.4, the Vala compiler * generated from ProgressDialog.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -8,6 +8,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -30,6 +31,11 @@ typedef struct _ProgressDialog ProgressDialog; typedef struct _ProgressDialogClass ProgressDialogClass; typedef struct _ProgressDialogPrivate ProgressDialogPrivate; +enum { + PROGRESS_DIALOG_0_PROPERTY, + PROGRESS_DIALOG_NUM_PROPERTIES +}; +static GParamSpec* progress_dialog_properties[PROGRESS_DIALOG_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); @@ -61,80 +67,103 @@ static gpointer progress_dialog_parent_class = NULL; GType progress_dialog_get_type (void) G_GNUC_CONST; #define PROGRESS_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PROGRESS_DIALOG, ProgressDialogPrivate)) -enum { - PROGRESS_DIALOG_DUMMY_PROPERTY -}; -ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable); -ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable); +ProgressDialog* progress_dialog_new (GtkWindow* owner, + const gchar* text, + GCancellable* cancellable); +ProgressDialog* progress_dialog_construct (GType object_type, + GtkWindow* owner, + const gchar* text, + GCancellable* cancellable); #define RESOURCES_CANCEL_LABEL _ ("_Cancel") static void progress_dialog_on_cancel (ProgressDialog* self); -static void _progress_dialog_on_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void _progress_dialog_on_cancel_gtk_button_clicked (GtkButton* _sender, + gpointer self); static gboolean progress_dialog_on_window_closed (ProgressDialog* self); -static gboolean _progress_dialog_on_window_closed_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self); +static gboolean _progress_dialog_on_window_closed_gtk_widget_delete_event (GtkWidget* _sender, + GdkEventAny* event, + gpointer self); gulong now_ms (void); static void progress_dialog_real_realize (GtkWidget* base); -void progress_dialog_update_display_every (ProgressDialog* self, gint update_every); -void progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self, gint minimum_on_screen_time_msec); -void progress_dialog_set_fraction (ProgressDialog* self, gint current, gint total); -void progress_dialog_set_percentage (ProgressDialog* self, gdouble pct); -static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct); -void progress_dialog_set_status (ProgressDialog* self, const gchar* text); -gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop); +void progress_dialog_update_display_every (ProgressDialog* self, + gint update_every); +void progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self, + gint minimum_on_screen_time_msec); +void progress_dialog_set_fraction (ProgressDialog* self, + gint current, + gint total); +void progress_dialog_set_percentage (ProgressDialog* self, + gdouble pct); +static void progress_dialog_maybe_show_all (ProgressDialog* self, + gdouble pct); +void progress_dialog_set_status (ProgressDialog* self, + const gchar* text); +gboolean progress_dialog_monitor (ProgressDialog* self, + guint64 count, + guint64 total, + gboolean do_event_loop); void spin_event_loop (void); void progress_dialog_close (ProgressDialog* self); static void progress_dialog_finalize (GObject * obj); -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 21 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" return self ? g_object_ref (self) : NULL; -#line 92 "ProgressDialog.c" +#line 115 "ProgressDialog.c" } -static void _progress_dialog_on_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_progress_dialog_on_cancel_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 38 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" progress_dialog_on_cancel ((ProgressDialog*) self); -#line 99 "ProgressDialog.c" +#line 125 "ProgressDialog.c" } -static gboolean _progress_dialog_on_window_closed_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) { +static gboolean +_progress_dialog_on_window_closed_gtk_widget_delete_event (GtkWidget* _sender, + GdkEventAny* event, + gpointer self) +{ gboolean result; result = progress_dialog_on_window_closed ((ProgressDialog*) self); #line 39 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" return result; -#line 108 "ProgressDialog.c" +#line 138 "ProgressDialog.c" } -ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable) { +ProgressDialog* +progress_dialog_construct (GType object_type, + GtkWindow* owner, + const gchar* text, + GCancellable* cancellable) +{ ProgressDialog * self = NULL; GCancellable* _tmp0_; - GCancellable* _tmp1_; - const gchar* _tmp2_; - GtkWindow* _tmp3_; - GtkProgressBar* _tmp5_; - GtkProgressBar* _tmp6_; + GtkProgressBar* _tmp1_; + GtkProgressBar* _tmp2_; GtkBox* vbox_bar = NULL; - GtkBox* _tmp7_; - GtkBox* _tmp8_; - GtkProgressBar* _tmp9_; - GCancellable* _tmp10_; + GtkBox* _tmp3_; + GtkBox* _tmp4_; + GtkProgressBar* _tmp5_; GtkBox* hbox = NULL; - GtkBox* _tmp13_; - GtkBox* _tmp14_; - GtkBox* _tmp15_; - GtkButton* _tmp16_; + GtkBox* _tmp8_; + GtkBox* _tmp9_; + GtkBox* _tmp10_; + GtkButton* _tmp11_; GtkLabel* primary_text_label = NULL; - GtkLabel* _tmp19_; - const gchar* _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; + GtkLabel* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; GtkBox* vbox = NULL; - GtkBox* _tmp23_; - GtkBox* _tmp24_; - gulong _tmp25_; + GtkBox* _tmp17_; + GtkBox* _tmp18_; #line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" g_return_val_if_fail ((owner == NULL) || GTK_IS_WINDOW (owner), NULL); #line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" @@ -144,137 +173,123 @@ ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, #line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" self = (ProgressDialog*) g_object_new (object_type, NULL); #line 21 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp0_ = cancellable; -#line 21 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (cancellable); #line 21 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" _g_object_unref0 (self->priv->cancellable); #line 21 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - self->priv->cancellable = _tmp1_; -#line 23 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp2_ = text; + self->priv->cancellable = _tmp0_; #line 23 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp2_); + gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), text); #line 24 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); #line 25 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp3_ = owner; -#line 25 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - if (_tmp3_ != NULL) { -#line 165 "ProgressDialog.c" - GtkWindow* _tmp4_; -#line 26 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp4_ = owner; + if (owner != NULL) { #line 26 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp4_); -#line 171 "ProgressDialog.c" + gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), owner); +#line 190 "ProgressDialog.c" } #line 27 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE); #line 28 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG); #line 30 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp5_ = self->priv->progress_bar; + _tmp1_ = self->priv->progress_bar; #line 30 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), 300, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), 300, -1); #line 31 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp6_ = self->priv->progress_bar; + _tmp2_ = self->priv->progress_bar; #line 31 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - gtk_progress_bar_set_show_text (_tmp6_, TRUE); + gtk_progress_bar_set_show_text (_tmp2_, TRUE); #line 33 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + _tmp3_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); #line 33 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - g_object_ref_sink (_tmp7_); + g_object_ref_sink (_tmp3_); #line 33 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - vbox_bar = _tmp7_; + vbox_bar = _tmp3_; #line 34 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp8_ = vbox_bar; + _tmp4_ = vbox_bar; #line 34 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp9_ = self->priv->progress_bar; + _tmp5_ = self->priv->progress_bar; #line 34 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - gtk_box_pack_start (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); -#line 36 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp10_ = cancellable; + gtk_box_pack_start (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); #line 36 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - if (_tmp10_ != NULL) { -#line 201 "ProgressDialog.c" - GtkButton* _tmp11_; - GtkButton* _tmp12_; + if (cancellable != NULL) { +#line 218 "ProgressDialog.c" + GtkButton* _tmp6_; + GtkButton* _tmp7_; #line 37 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp11_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL); + _tmp6_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL); #line 37 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - g_object_ref_sink (_tmp11_); + g_object_ref_sink (_tmp6_); #line 37 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" _g_object_unref0 (self->priv->cancel_button); #line 37 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - self->priv->cancel_button = _tmp11_; + self->priv->cancel_button = _tmp6_; #line 38 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp12_ = self->priv->cancel_button; + _tmp7_ = self->priv->cancel_button; #line 38 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - g_signal_connect_object (_tmp12_, "clicked", (GCallback) _progress_dialog_on_cancel_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp7_, "clicked", (GCallback) _progress_dialog_on_cancel_gtk_button_clicked, self, 0); #line 39 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _progress_dialog_on_window_closed_gtk_widget_delete_event, self, 0); -#line 218 "ProgressDialog.c" +#line 235 "ProgressDialog.c" } #line 42 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); + _tmp8_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); #line 42 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - g_object_ref_sink (_tmp13_); + g_object_ref_sink (_tmp8_); #line 42 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - hbox = _tmp13_; + hbox = _tmp8_; #line 43 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp14_ = hbox; + _tmp9_ = hbox; #line 43 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp15_ = vbox_bar; + _tmp10_ = vbox_bar; #line 43 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); #line 44 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp16_ = self->priv->cancel_button; + _tmp11_ = self->priv->cancel_button; #line 44 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - if (_tmp16_ != NULL) { -#line 236 "ProgressDialog.c" - GtkBox* _tmp17_; - GtkButton* _tmp18_; + if (_tmp11_ != NULL) { +#line 253 "ProgressDialog.c" + GtkBox* _tmp12_; + GtkButton* _tmp13_; #line 45 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp17_ = hbox; + _tmp12_ = hbox; #line 45 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp18_ = self->priv->cancel_button; + _tmp13_ = self->priv->cancel_button; #line 45 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - gtk_box_pack_end (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 245 "ProgressDialog.c" + gtk_box_pack_end (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); +#line 262 "ProgressDialog.c" } #line 47 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp19_ = (GtkLabel*) gtk_label_new (""); + _tmp14_ = (GtkLabel*) gtk_label_new (""); #line 47 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - g_object_ref_sink (_tmp19_); + g_object_ref_sink (_tmp14_); #line 47 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - primary_text_label = _tmp19_; + primary_text_label = _tmp14_; #line 48 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp20_ = text; + _tmp15_ = g_strdup_printf ("%s", text); #line 48 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp21_ = g_strdup_printf ("%s", _tmp20_); + _tmp16_ = _tmp15_; #line 48 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp22_ = _tmp21_; + gtk_label_set_markup (primary_text_label, _tmp16_); #line 48 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - gtk_label_set_markup (primary_text_label, _tmp22_); -#line 48 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp16_); #line 49 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" gtk_label_set_xalign (primary_text_label, 0.0f); #line 50 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" gtk_label_set_yalign (primary_text_label, 0.5f); #line 52 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); + _tmp17_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); #line 52 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - g_object_ref_sink (_tmp23_); + g_object_ref_sink (_tmp17_); #line 52 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - vbox = _tmp23_; + vbox = _tmp17_; #line 53 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" gtk_box_pack_start (vbox, G_TYPE_CHECK_INSTANCE_CAST (primary_text_label, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 54 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp24_ = hbox; + _tmp18_ = hbox; #line 54 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - gtk_box_pack_start (vbox, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); + gtk_box_pack_start (vbox, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0); #line 55 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); #line 56 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" @@ -294,9 +309,7 @@ ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, #line 64 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget)); #line 66 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp25_ = now_ms (); -#line 66 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - self->priv->time_started = _tmp25_; + self->priv->time_started = now_ms (); #line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" _g_object_unref0 (vbox); #line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" @@ -307,18 +320,24 @@ ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, _g_object_unref0 (vbox_bar); #line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" return self; -#line 311 "ProgressDialog.c" +#line 324 "ProgressDialog.c" } -ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable) { +ProgressDialog* +progress_dialog_new (GtkWindow* owner, + const gchar* text, + GCancellable* cancellable) +{ #line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" return progress_dialog_construct (TYPE_PROGRESS_DIALOG, owner, text, cancellable); -#line 318 "ProgressDialog.c" +#line 335 "ProgressDialog.c" } -static void progress_dialog_real_realize (GtkWidget* base) { +static void +progress_dialog_real_realize (GtkWidget* base) +{ ProgressDialog * self; GCancellable* _tmp0_; #line 69 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" @@ -329,108 +348,93 @@ static void progress_dialog_real_realize (GtkWidget* base) { _tmp0_ = self->priv->cancellable; #line 73 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" if (_tmp0_ == NULL) { -#line 333 "ProgressDialog.c" +#line 352 "ProgressDialog.c" GdkWindow* _tmp1_; #line 74 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" _tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 74 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" gdk_window_set_functions (_tmp1_, GDK_FUNC_MOVE); -#line 339 "ProgressDialog.c" +#line 358 "ProgressDialog.c" } } -void progress_dialog_update_display_every (ProgressDialog* self, gint update_every) { - gint _tmp0_; - gint _tmp1_; +void +progress_dialog_update_display_every (ProgressDialog* self, + gint update_every) +{ #line 77 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" g_return_if_fail (IS_PROGRESS_DIALOG (self)); #line 78 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp0_ = update_every; -#line 78 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _vala_assert (_tmp0_ >= 1, "update_every >= 1"); + _vala_assert (update_every >= 1, "update_every >= 1"); #line 80 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp1_ = update_every; -#line 80 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - self->priv->update_every = _tmp1_; -#line 357 "ProgressDialog.c" + self->priv->update_every = update_every; +#line 373 "ProgressDialog.c" } -void progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self, gint minimum_on_screen_time_msec) { - gint _tmp0_; +void +progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self, + gint minimum_on_screen_time_msec) +{ #line 83 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" g_return_if_fail (IS_PROGRESS_DIALOG (self)); #line 84 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp0_ = minimum_on_screen_time_msec; -#line 84 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - self->priv->minimum_on_screen_time_msec = _tmp0_; -#line 369 "ProgressDialog.c" + self->priv->minimum_on_screen_time_msec = minimum_on_screen_time_msec; +#line 385 "ProgressDialog.c" } -void progress_dialog_set_fraction (ProgressDialog* self, gint current, gint total) { - gint _tmp0_; - gint _tmp1_; +void +progress_dialog_set_fraction (ProgressDialog* self, + gint current, + gint total) +{ #line 87 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" g_return_if_fail (IS_PROGRESS_DIALOG (self)); #line 88 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp0_ = current; -#line 88 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp1_ = total; -#line 88 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - progress_dialog_set_percentage (self, ((gdouble) _tmp0_) / ((gdouble) _tmp1_)); -#line 384 "ProgressDialog.c" + progress_dialog_set_percentage (self, ((gdouble) current) / ((gdouble) total)); +#line 398 "ProgressDialog.c" } -void progress_dialog_set_percentage (ProgressDialog* self, gdouble pct) { - gdouble _tmp0_; - gdouble _tmp1_; - gdouble _tmp2_; - GtkProgressBar* _tmp3_; - gdouble _tmp4_; - GtkProgressBar* _tmp5_; - gdouble _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; +void +progress_dialog_set_percentage (ProgressDialog* self, + gdouble pct) +{ + GtkProgressBar* _tmp0_; + GtkProgressBar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; #line 91 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" g_return_if_fail (IS_PROGRESS_DIALOG (self)); #line 92 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp0_ = pct; -#line 92 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp1_ = CLAMP (_tmp0_, 0.0, 1.0); -#line 92 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - pct = _tmp1_; -#line 94 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp2_ = pct; + pct = CLAMP (pct, 0.0, 1.0); #line 94 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - progress_dialog_maybe_show_all (self, _tmp2_); + progress_dialog_maybe_show_all (self, pct); #line 96 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp3_ = self->priv->progress_bar; -#line 96 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp4_ = pct; + _tmp0_ = self->priv->progress_bar; #line 96 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - gtk_progress_bar_set_fraction (_tmp3_, _tmp4_); + gtk_progress_bar_set_fraction (_tmp0_, pct); #line 97 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp5_ = self->priv->progress_bar; -#line 97 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp6_ = pct; + _tmp1_ = self->priv->progress_bar; #line 97 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp7_ = g_strdup_printf (_ ("%d%%"), (gint) (_tmp6_ * 100.0)); + _tmp2_ = g_strdup_printf (_ ("%d%%"), (gint) (pct * 100.0)); #line 97 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp8_ = _tmp7_; + _tmp3_ = _tmp2_; #line 97 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - gtk_progress_bar_set_text (_tmp5_, _tmp8_); + gtk_progress_bar_set_text (_tmp1_, _tmp3_); #line 97 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _g_free0 (_tmp8_); -#line 428 "ProgressDialog.c" + _g_free0 (_tmp3_); +#line 430 "ProgressDialog.c" } -void progress_dialog_set_status (ProgressDialog* self, const gchar* text) { +void +progress_dialog_set_status (ProgressDialog* self, + const gchar* text) +{ GtkProgressBar* _tmp0_; - const gchar* _tmp1_; #line 105 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" g_return_if_fail (IS_PROGRESS_DIALOG (self)); #line 105 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" @@ -438,23 +442,25 @@ void progress_dialog_set_status (ProgressDialog* self, const gchar* text) { #line 106 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" _tmp0_ = self->priv->progress_bar; #line 106 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp1_ = text; -#line 106 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - gtk_progress_bar_set_text (_tmp0_, _tmp1_); + gtk_progress_bar_set_text (_tmp0_, text); #line 112 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 447 "ProgressDialog.c" +#line 449 "ProgressDialog.c" } -gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop) { +gboolean +progress_dialog_monitor (ProgressDialog* self, + guint64 count, + guint64 total, + gboolean do_event_loop) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; guint64 _tmp1_; - gboolean _tmp8_ = FALSE; - GCancellable* _tmp9_; + gboolean _tmp4_ = FALSE; + GCancellable* _tmp5_; gboolean keep_going = FALSE; - gboolean _tmp12_; #line 116 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" g_return_val_if_fail (IS_PROGRESS_DIALOG (self), FALSE); #line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" @@ -463,88 +469,74 @@ gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 t if (_tmp1_ == G_MAXUINT64) { #line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" _tmp0_ = TRUE; -#line 467 "ProgressDialog.c" +#line 473 "ProgressDialog.c" } else { guint64 _tmp2_; - guint64 _tmp3_; - gint _tmp4_; -#line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp2_ = count; + gint _tmp3_; #line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp3_ = self->priv->last_count; + _tmp2_ = self->priv->last_count; #line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp4_ = self->priv->update_every; + _tmp3_ = self->priv->update_every; #line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp0_ = (_tmp2_ - _tmp3_) >= ((guint64) _tmp4_); -#line 480 "ProgressDialog.c" + _tmp0_ = (count - _tmp2_) >= ((guint64) _tmp3_); +#line 483 "ProgressDialog.c" } #line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" if (_tmp0_) { -#line 484 "ProgressDialog.c" - guint64 _tmp5_; - guint64 _tmp6_; - guint64 _tmp7_; -#line 118 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp5_ = count; -#line 118 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp6_ = total; #line 118 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - progress_dialog_set_percentage (self, ((gdouble) _tmp5_) / ((gdouble) _tmp6_)); + progress_dialog_set_percentage (self, ((gdouble) count) / ((gdouble) total)); #line 119 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp7_ = count; -#line 119 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - self->priv->last_count = _tmp7_; -#line 498 "ProgressDialog.c" + self->priv->last_count = count; +#line 491 "ProgressDialog.c" } #line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp9_ = self->priv->cancellable; -#line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - if (_tmp9_ != NULL) { -#line 504 "ProgressDialog.c" - GCancellable* _tmp10_; - gboolean _tmp11_; + _tmp5_ = self->priv->cancellable; #line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp10_ = self->priv->cancellable; + if (_tmp5_ != NULL) { +#line 497 "ProgressDialog.c" + GCancellable* _tmp6_; #line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp11_ = g_cancellable_is_cancelled (_tmp10_); + _tmp6_ = self->priv->cancellable; #line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp8_ = !_tmp11_; -#line 513 "ProgressDialog.c" + _tmp4_ = !g_cancellable_is_cancelled (_tmp6_); +#line 503 "ProgressDialog.c" } else { #line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp8_ = TRUE; -#line 517 "ProgressDialog.c" + _tmp4_ = TRUE; +#line 507 "ProgressDialog.c" } #line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - keep_going = _tmp8_; -#line 130 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp12_ = do_event_loop; + keep_going = _tmp4_; #line 130 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - if (_tmp12_) { + if (do_event_loop) { #line 131 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" spin_event_loop (); -#line 527 "ProgressDialog.c" +#line 515 "ProgressDialog.c" } #line 133 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" result = keep_going; #line 133 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" return result; -#line 533 "ProgressDialog.c" +#line 521 "ProgressDialog.c" } -void progress_dialog_close (ProgressDialog* self) { +void +progress_dialog_close (ProgressDialog* self) +{ #line 136 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" g_return_if_fail (IS_PROGRESS_DIALOG (self)); #line 141 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 142 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 544 "ProgressDialog.c" +#line 534 "ProgressDialog.c" } -static gboolean progress_dialog_on_window_closed (ProgressDialog* self) { +static gboolean +progress_dialog_on_window_closed (ProgressDialog* self) +{ gboolean result = FALSE; #line 145 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" g_return_val_if_fail (IS_PROGRESS_DIALOG (self), FALSE); @@ -554,11 +546,13 @@ static gboolean progress_dialog_on_window_closed (ProgressDialog* self) { result = FALSE; #line 147 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" return result; -#line 558 "ProgressDialog.c" +#line 550 "ProgressDialog.c" } -static void progress_dialog_on_cancel (ProgressDialog* self) { +static void +progress_dialog_on_cancel (ProgressDialog* self) +{ GCancellable* _tmp0_; GtkButton* _tmp2_; #line 151 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" @@ -567,23 +561,26 @@ static void progress_dialog_on_cancel (ProgressDialog* self) { _tmp0_ = self->priv->cancellable; #line 152 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" if (_tmp0_ != NULL) { -#line 571 "ProgressDialog.c" +#line 565 "ProgressDialog.c" GCancellable* _tmp1_; #line 153 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" _tmp1_ = self->priv->cancellable; #line 153 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" g_cancellable_cancel (_tmp1_); -#line 577 "ProgressDialog.c" +#line 571 "ProgressDialog.c" } #line 155 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" _tmp2_ = self->priv->cancel_button; #line 155 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 583 "ProgressDialog.c" +#line 577 "ProgressDialog.c" } -static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct) { +static void +progress_dialog_maybe_show_all (ProgressDialog* self, + gdouble pct) +{ gboolean _tmp0_ = FALSE; gboolean _tmp1_; gboolean _tmp2_; @@ -595,61 +592,57 @@ static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct) { _tmp2_ = _tmp1_; #line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" if (!_tmp2_) { -#line 599 "ProgressDialog.c" +#line 596 "ProgressDialog.c" gulong _tmp3_; - gulong _tmp4_; - gint _tmp5_; + gint _tmp4_; #line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp3_ = now_ms (); + _tmp3_ = self->priv->time_started; #line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp4_ = self->priv->time_started; + _tmp4_ = self->priv->minimum_on_screen_time_msec; #line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp5_ = self->priv->minimum_on_screen_time_msec; -#line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp0_ = (_tmp3_ - _tmp4_) > ((gulong) _tmp5_); -#line 611 "ProgressDialog.c" + _tmp0_ = (now_ms () - _tmp3_) > ((gulong) _tmp4_); +#line 605 "ProgressDialog.c" } else { #line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" _tmp0_ = FALSE; -#line 615 "ProgressDialog.c" +#line 609 "ProgressDialog.c" } #line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" if (_tmp0_) { -#line 619 "ProgressDialog.c" +#line 613 "ProgressDialog.c" gdouble pps = 0.0; - gdouble _tmp6_; - gint _tmp7_; + gint _tmp5_; gdouble ttc = 0.0; - gdouble _tmp8_; - gdouble _tmp9_; - gint _tmp10_; -#line 163 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp6_ = pct; + gdouble _tmp6_; + gdouble _tmp7_; + gint _tmp8_; #line 163 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp7_ = self->priv->minimum_on_screen_time_msec; + _tmp5_ = self->priv->minimum_on_screen_time_msec; #line 163 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - pps = (_tmp6_ * 100.0) / _tmp7_; + pps = (pct * 100.0) / _tmp5_; #line 165 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp8_ = pps; + _tmp6_ = pps; #line 165 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - ttc = 100.0 / _tmp8_; + ttc = 100.0 / _tmp6_; #line 168 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp9_ = ttc; + _tmp7_ = ttc; #line 168 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - _tmp10_ = self->priv->minimum_on_screen_time_msec; + _tmp8_ = self->priv->minimum_on_screen_time_msec; #line 168 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" - if (_tmp9_ > ((gdouble) _tmp10_)) { + if (_tmp7_ > ((gdouble) _tmp8_)) { #line 173 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 174 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" spin_event_loop (); -#line 647 "ProgressDialog.c" +#line 638 "ProgressDialog.c" } } } -static void progress_dialog_class_init (ProgressDialogClass * klass) { +static void +progress_dialog_class_init (ProgressDialogClass * klass) +{ #line 8 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" progress_dialog_parent_class = g_type_class_peek_parent (klass); #line 8 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" @@ -658,11 +651,13 @@ static void progress_dialog_class_init (ProgressDialogClass * klass) { ((GtkWidgetClass *) klass)->realize = (void (*) (GtkWidget *)) progress_dialog_real_realize; #line 8 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" G_OBJECT_CLASS (klass)->finalize = progress_dialog_finalize; -#line 662 "ProgressDialog.c" +#line 655 "ProgressDialog.c" } -static void progress_dialog_instance_init (ProgressDialog * self) { +static void +progress_dialog_instance_init (ProgressDialog * self) +{ GtkProgressBar* _tmp0_; #line 8 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" self->priv = PROGRESS_DIALOG_GET_PRIVATE (self); @@ -680,11 +675,13 @@ static void progress_dialog_instance_init (ProgressDialog * self) { self->priv->update_every = 1; #line 14 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" self->priv->minimum_on_screen_time_msec = 500; -#line 684 "ProgressDialog.c" +#line 679 "ProgressDialog.c" } -static void progress_dialog_finalize (GObject * obj) { +static void +progress_dialog_finalize (GObject * obj) +{ ProgressDialog * self; #line 8 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_DIALOG, ProgressDialog); @@ -696,11 +693,13 @@ static void progress_dialog_finalize (GObject * obj) { _g_object_unref0 (self->priv->cancellable); #line 8 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala" G_OBJECT_CLASS (progress_dialog_parent_class)->finalize (obj); -#line 700 "ProgressDialog.c" +#line 697 "ProgressDialog.c" } -GType progress_dialog_get_type (void) { +GType +progress_dialog_get_type (void) +{ static volatile gsize progress_dialog_type_id__volatile = 0; if (g_once_init_enter (&progress_dialog_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ProgressDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) progress_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ProgressDialog), 0, (GInstanceInitFunc) progress_dialog_instance_init, NULL }; diff --git a/src/dialogs/SetBackground.c b/src/dialogs/SetBackground.c index 3f4d45f..88577ce 100644 --- a/src/dialogs/SetBackground.c +++ b/src/dialogs/SetBackground.c @@ -1,4 +1,4 @@ -/* SetBackground.c generated by valac 0.36.6, the Vala compiler +/* SetBackground.c generated by valac 0.40.4, the Vala compiler * generated from SetBackground.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -8,6 +8,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -23,6 +24,11 @@ typedef struct _SetBackgroundPhotoDialog SetBackgroundPhotoDialog; typedef struct _SetBackgroundPhotoDialogClass SetBackgroundPhotoDialogClass; typedef struct _SetBackgroundPhotoDialogPrivate SetBackgroundPhotoDialogPrivate; +enum { + SET_BACKGROUND_PHOTO_DIALOG_0_PROPERTY, + SET_BACKGROUND_PHOTO_DIALOG_NUM_PROPERTIES +}; +static GParamSpec* set_background_photo_dialog_properties[SET_BACKGROUND_PHOTO_DIALOG_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define TYPE_PAGE_WINDOW (page_window_get_type ()) @@ -64,9 +70,6 @@ static gpointer set_background_photo_dialog_parent_class = NULL; GType set_background_photo_dialog_get_type (void) G_GNUC_CONST; #define SET_BACKGROUND_PHOTO_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialogPrivate)) -enum { - SET_BACKGROUND_PHOTO_DIALOG_DUMMY_PROPERTY -}; SetBackgroundPhotoDialog* set_background_photo_dialog_new (void); SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type); gint resources_use_header_bar (void); @@ -74,42 +77,48 @@ GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoDialog* self); -static void _set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self); -gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gboolean* desktop_background, gboolean* screensaver); +static void _set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, + gpointer self); +gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, + gboolean* desktop_background, + gboolean* screensaver); static void set_background_photo_dialog_finalize (GObject * obj); -SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type) { +SetBackgroundPhotoDialog* +set_background_photo_dialog_construct (GType object_type) +{ SetBackgroundPhotoDialog * self = NULL; - gint _tmp0_; + AppWindow* _tmp0_; AppWindow* _tmp1_; - AppWindow* _tmp2_; -#line 16 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" - _tmp0_ = resources_use_header_bar (); #line 16 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" - self = (SetBackgroundPhotoDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL); + self = (SetBackgroundPhotoDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL); #line 17 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" - _tmp1_ = app_window_get_instance (); + _tmp0_ = app_window_get_instance (); #line 17 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 17 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" - gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow)); + gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow)); #line 17 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 15 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" return self; -#line 102 "SetBackground.c" +#line 107 "SetBackground.c" } -SetBackgroundPhotoDialog* set_background_photo_dialog_new (void) { +SetBackgroundPhotoDialog* +set_background_photo_dialog_new (void) +{ #line 15 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" return set_background_photo_dialog_construct (TYPE_SET_BACKGROUND_PHOTO_DIALOG); -#line 109 "SetBackground.c" +#line 116 "SetBackground.c" } -static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoDialog* self) { +static void +set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoDialog* self) +{ gboolean _tmp0_ = FALSE; GtkCheckButton* _tmp1_; gboolean _tmp2_; @@ -126,7 +135,7 @@ static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoD if (_tmp3_) { #line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" _tmp0_ = TRUE; -#line 130 "SetBackground.c" +#line 139 "SetBackground.c" } else { GtkCheckButton* _tmp4_; gboolean _tmp5_; @@ -139,59 +148,63 @@ static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoD _tmp6_ = _tmp5_; #line 24 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" _tmp0_ = _tmp6_; -#line 143 "SetBackground.c" +#line 152 "SetBackground.c" } #line 22 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp0_); -#line 147 "SetBackground.c" +#line 156 "SetBackground.c" } -static void _set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) { +static void +_set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, + gpointer self) +{ #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" set_background_photo_dialog_on_checkbox_clicked ((SetBackgroundPhotoDialog*) self); -#line 154 "SetBackground.c" +#line 166 "SetBackground.c" } -gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gboolean* desktop_background, gboolean* screensaver) { +gboolean +set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, + gboolean* desktop_background, + gboolean* screensaver) +{ gboolean _vala_desktop_background = FALSE; gboolean _vala_screensaver = FALSE; gboolean result = FALSE; gboolean _result_ = FALSE; - gint _tmp0_; - GtkCheckButton* _tmp1_; + GtkCheckButton* _tmp0_; + gboolean _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; - GtkCheckButton* _tmp4_; + GtkCheckButton* _tmp3_; + gboolean _tmp4_; gboolean _tmp5_; - gboolean _tmp6_; #line 27 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" g_return_val_if_fail (IS_SET_BACKGROUND_PHOTO_DIALOG (self), FALSE); #line 28 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 29 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" - _tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); -#line 29 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" - _result_ = _tmp0_ == ((gint) GTK_RESPONSE_OK); + _result_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)) == ((gint) GTK_RESPONSE_OK); #line 30 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 32 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" - _tmp1_ = self->priv->desktop_background_checkbox; + _tmp0_ = self->priv->desktop_background_checkbox; #line 32 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" - _tmp2_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton)); + _tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 32 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 32 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" - _vala_desktop_background = _tmp3_; + _vala_desktop_background = _tmp2_; #line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" - _tmp4_ = self->priv->screensaver_checkbox; + _tmp3_ = self->priv->screensaver_checkbox; #line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" - _tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton)); + _tmp4_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" - _vala_screensaver = _tmp6_; + _vala_screensaver = _tmp5_; #line 35 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" @@ -200,21 +213,23 @@ gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gb if (desktop_background) { #line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" *desktop_background = _vala_desktop_background; -#line 204 "SetBackground.c" +#line 217 "SetBackground.c" } #line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" if (screensaver) { #line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" *screensaver = _vala_screensaver; -#line 210 "SetBackground.c" +#line 223 "SetBackground.c" } #line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" return result; -#line 214 "SetBackground.c" +#line 227 "SetBackground.c" } -static void set_background_photo_dialog_class_init (SetBackgroundPhotoDialogClass * klass) { +static void +set_background_photo_dialog_class_init (SetBackgroundPhotoDialogClass * klass) +{ gint SetBackgroundPhotoDialog_private_offset; #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" set_background_photo_dialog_parent_class = g_type_class_peek_parent (klass); @@ -232,20 +247,24 @@ static void set_background_photo_dialog_class_init (SetBackgroundPhotoDialogClas gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "screensaver_checkbox", FALSE, SetBackgroundPhotoDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundPhotoDialogPrivate, screensaver_checkbox)); #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_checkbox_clicked", G_CALLBACK(_set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled)); -#line 236 "SetBackground.c" +#line 251 "SetBackground.c" } -static void set_background_photo_dialog_instance_init (SetBackgroundPhotoDialog * self) { +static void +set_background_photo_dialog_instance_init (SetBackgroundPhotoDialog * self) +{ #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" self->priv = SET_BACKGROUND_PHOTO_DIALOG_GET_PRIVATE (self); #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 245 "SetBackground.c" +#line 262 "SetBackground.c" } -static void set_background_photo_dialog_finalize (GObject * obj) { +static void +set_background_photo_dialog_finalize (GObject * obj) +{ SetBackgroundPhotoDialog * self; #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialog); @@ -255,11 +274,13 @@ static void set_background_photo_dialog_finalize (GObject * obj) { _g_object_unref0 (self->priv->screensaver_checkbox); #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala" G_OBJECT_CLASS (set_background_photo_dialog_parent_class)->finalize (obj); -#line 259 "SetBackground.c" +#line 278 "SetBackground.c" } -GType set_background_photo_dialog_get_type (void) { +GType +set_background_photo_dialog_get_type (void) +{ static volatile gsize set_background_photo_dialog_type_id__volatile = 0; if (g_once_init_enter (&set_background_photo_dialog_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SetBackgroundPhotoDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) set_background_photo_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SetBackgroundPhotoDialog), 0, (GInstanceInitFunc) set_background_photo_dialog_instance_init, NULL }; diff --git a/src/dialogs/SetBackgroundSlideshow.c b/src/dialogs/SetBackgroundSlideshow.c index 6e13d67..aa581d4 100644 --- a/src/dialogs/SetBackgroundSlideshow.c +++ b/src/dialogs/SetBackgroundSlideshow.c @@ -1,4 +1,4 @@ -/* SetBackgroundSlideshow.c generated by valac 0.36.6, the Vala compiler +/* SetBackgroundSlideshow.c generated by valac 0.40.4, the Vala compiler * generated from SetBackgroundSlideshow.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -8,6 +8,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -28,6 +29,11 @@ typedef struct _SetBackgroundSlideshowDialog SetBackgroundSlideshowDialog; typedef struct _SetBackgroundSlideshowDialogClass SetBackgroundSlideshowDialogClass; typedef struct _SetBackgroundSlideshowDialogPrivate SetBackgroundSlideshowDialogPrivate; +enum { + SET_BACKGROUND_SLIDESHOW_DIALOG_0_PROPERTY, + SET_BACKGROUND_SLIDESHOW_DIALOG_NUM_PROPERTIES +}; +static GParamSpec* set_background_slideshow_dialog_properties[SET_BACKGROUND_SLIDESHOW_DIALOG_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define TYPE_PAGE_WINDOW (page_window_get_type ()) @@ -73,9 +79,6 @@ static gpointer set_background_slideshow_dialog_parent_class = NULL; GType set_background_slideshow_dialog_get_type (void) G_GNUC_CONST; #define SET_BACKGROUND_SLIDESHOW_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialogPrivate)) -enum { - SET_BACKGROUND_SLIDESHOW_DIALOG_DUMMY_PROPERTY -}; SetBackgroundSlideshowDialog* set_background_slideshow_dialog_new (void); SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType object_type); gint resources_use_header_bar (void); @@ -85,53 +88,63 @@ AppWindow* app_window_get_instance (void); static void set_background_slideshow_dialog_real_constructed (GObject* base); static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBackgroundSlideshowDialog* self); static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSlideshowDialog* self); -static void _set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self); -static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self); -gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self, gint* delay_value, gboolean* desktop_background, gboolean* screensaver); +static void _set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, + gpointer self); +static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, + gpointer self); +gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self, + gint* delay_value, + gboolean* desktop_background, + gboolean* screensaver); static void set_background_slideshow_dialog_finalize (GObject * obj); -SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType object_type) { +SetBackgroundSlideshowDialog* +set_background_slideshow_dialog_construct (GType object_type) +{ SetBackgroundSlideshowDialog * self = NULL; - gint _tmp0_; + AppWindow* _tmp0_; AppWindow* _tmp1_; - AppWindow* _tmp2_; -#line 22 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp0_ = resources_use_header_bar (); #line 22 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - self = (SetBackgroundSlideshowDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL); + self = (SetBackgroundSlideshowDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL); #line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp1_ = app_window_get_instance (); + _tmp0_ = app_window_get_instance (); #line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow)); + gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow)); #line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 21 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" return self; -#line 114 "SetBackgroundSlideshow.c" +#line 121 "SetBackgroundSlideshow.c" } -SetBackgroundSlideshowDialog* set_background_slideshow_dialog_new (void) { +SetBackgroundSlideshowDialog* +set_background_slideshow_dialog_new (void) +{ #line 21 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" return set_background_slideshow_dialog_construct (TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG); -#line 121 "SetBackgroundSlideshow.c" +#line 130 "SetBackgroundSlideshow.c" } -static void set_background_slideshow_dialog_real_constructed (GObject* base) { +static void +set_background_slideshow_dialog_real_constructed (GObject* base) +{ SetBackgroundSlideshowDialog * self; #line 26 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialog); #line 27 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" set_background_slideshow_dialog_on_delay_scale_value_changed (self); -#line 131 "SetBackgroundSlideshow.c" +#line 142 "SetBackgroundSlideshow.c" } -static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSlideshowDialog* self) { +static void +set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSlideshowDialog* self) +{ gboolean _tmp0_ = FALSE; GtkCheckButton* _tmp1_; gboolean _tmp2_; @@ -148,7 +161,7 @@ static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSl if (_tmp3_) { #line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" _tmp0_ = TRUE; -#line 152 "SetBackgroundSlideshow.c" +#line 165 "SetBackgroundSlideshow.c" } else { GtkCheckButton* _tmp4_; gboolean _tmp5_; @@ -161,22 +174,27 @@ static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSl _tmp6_ = _tmp5_; #line 34 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" _tmp0_ = _tmp6_; -#line 165 "SetBackgroundSlideshow.c" +#line 178 "SetBackgroundSlideshow.c" } #line 32 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp0_); -#line 169 "SetBackgroundSlideshow.c" +#line 182 "SetBackgroundSlideshow.c" } -static void _set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) { +static void +_set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, + gpointer self) +{ #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" set_background_slideshow_dialog_on_checkbox_clicked ((SetBackgroundSlideshowDialog*) self); -#line 176 "SetBackgroundSlideshow.c" +#line 192 "SetBackgroundSlideshow.c" } -static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBackgroundSlideshowDialog* self) { +static void +set_background_slideshow_dialog_on_delay_scale_value_changed (SetBackgroundSlideshowDialog* self) +{ gdouble value = 0.0; GtkScale* _tmp0_; GtkAdjustment* _tmp1_; @@ -184,12 +202,10 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac gdouble _tmp3_; gdouble _tmp4_; gdouble _tmp5_; - gdouble _tmp6_; - gdouble _tmp7_; gchar* text = NULL; - gint _tmp8_; - GtkLabel* _tmp25_; - const gchar* _tmp26_; + gint _tmp6_; + GtkLabel* _tmp23_; + const gchar* _tmp24_; #line 38 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" g_return_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self)); #line 39 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" @@ -207,171 +223,172 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac #line 44 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" _tmp5_ = value; #line 44 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp6_ = pow (_tmp5_, (gdouble) 5); -#line 44 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp7_ = pow ((gdouble) 90, (gdouble) 5); -#line 44 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - self->priv->delay_value = (gint) (((((_tmp6_ / _tmp7_) * 60) * 60) * 24) + 5); + self->priv->delay_value = (gint) (((((pow (_tmp5_, (gdouble) 5) / pow ((gdouble) 90, (gdouble) 5)) * 60) * 60) * 24) + 5); #line 48 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp8_ = self->priv->delay_value; + _tmp6_ = self->priv->delay_value; #line 48 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - if (_tmp8_ < 60) { -#line 220 "SetBackgroundSlideshow.c" - gint _tmp9_; - gint _tmp10_; - gchar* _tmp11_; + if (_tmp6_ < 60) { +#line 232 "SetBackgroundSlideshow.c" + gint _tmp7_; + gint _tmp8_; + gchar* _tmp9_; #line 49 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp9_ = self->priv->delay_value; + _tmp7_ = self->priv->delay_value; #line 49 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp10_ = self->priv->delay_value; + _tmp8_ = self->priv->delay_value; #line 49 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp11_ = g_strdup_printf (ngettext ("%d second", "%d seconds", (gulong) _tmp9_), _tmp10_); + _tmp9_ = g_strdup_printf (ngettext ("%d second", "%d seconds", (gulong) _tmp7_), _tmp8_); #line 49 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" _g_free0 (text); #line 49 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - text = _tmp11_; -#line 234 "SetBackgroundSlideshow.c" + text = _tmp9_; +#line 246 "SetBackgroundSlideshow.c" } else { - gint _tmp12_; + gint _tmp10_; #line 50 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp12_ = self->priv->delay_value; + _tmp10_ = self->priv->delay_value; #line 50 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - if (_tmp12_ < (60 * 60)) { -#line 241 "SetBackgroundSlideshow.c" + if (_tmp10_ < (60 * 60)) { +#line 253 "SetBackgroundSlideshow.c" gint minutes = 0; + gint _tmp11_; + gint _tmp12_; gint _tmp13_; - gint _tmp14_; + gchar* _tmp14_; gint _tmp15_; - gchar* _tmp16_; - gint _tmp17_; #line 51 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp13_ = self->priv->delay_value; + _tmp11_ = self->priv->delay_value; #line 51 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - minutes = _tmp13_ / 60; + minutes = _tmp11_ / 60; #line 52 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp14_ = minutes; + _tmp12_ = minutes; #line 52 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp15_ = minutes; + _tmp13_ = minutes; #line 52 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp16_ = g_strdup_printf (ngettext ("%d minute", "%d minutes", (gulong) _tmp14_), _tmp15_); + _tmp14_ = g_strdup_printf (ngettext ("%d minute", "%d minutes", (gulong) _tmp12_), _tmp13_); #line 52 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" _g_free0 (text); #line 52 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - text = _tmp16_; + text = _tmp14_; #line 53 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp17_ = minutes; + _tmp15_ = minutes; #line 53 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - self->priv->delay_value = _tmp17_ * 60; -#line 266 "SetBackgroundSlideshow.c" + self->priv->delay_value = _tmp15_ * 60; +#line 278 "SetBackgroundSlideshow.c" } else { - gint _tmp18_; + gint _tmp16_; #line 54 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp18_ = self->priv->delay_value; + _tmp16_ = self->priv->delay_value; #line 54 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - if (_tmp18_ < ((60 * 60) * 24)) { -#line 273 "SetBackgroundSlideshow.c" + if (_tmp16_ < ((60 * 60) * 24)) { +#line 285 "SetBackgroundSlideshow.c" gint hours = 0; + gint _tmp17_; + gint _tmp18_; gint _tmp19_; - gint _tmp20_; + gchar* _tmp20_; gint _tmp21_; - gchar* _tmp22_; - gint _tmp23_; #line 55 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp19_ = self->priv->delay_value; + _tmp17_ = self->priv->delay_value; #line 55 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - hours = _tmp19_ / (60 * 60); + hours = _tmp17_ / (60 * 60); #line 56 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp20_ = hours; + _tmp18_ = hours; #line 56 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp21_ = hours; + _tmp19_ = hours; #line 56 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp22_ = g_strdup_printf (ngettext ("%d hour", "%d hours", (gulong) _tmp20_), _tmp21_); + _tmp20_ = g_strdup_printf (ngettext ("%d hour", "%d hours", (gulong) _tmp18_), _tmp19_); #line 56 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" _g_free0 (text); #line 56 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - text = _tmp22_; + text = _tmp20_; #line 57 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp23_ = hours; + _tmp21_ = hours; #line 57 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - self->priv->delay_value = _tmp23_ * (60 * 60); -#line 298 "SetBackgroundSlideshow.c" + self->priv->delay_value = _tmp21_ * (60 * 60); +#line 310 "SetBackgroundSlideshow.c" } else { - gchar* _tmp24_; + gchar* _tmp22_; #line 59 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp24_ = g_strdup (_ ("1 day")); + _tmp22_ = g_strdup (_ ("1 day")); #line 59 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" _g_free0 (text); #line 59 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - text = _tmp24_; + text = _tmp22_; #line 60 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" self->priv->delay_value = (60 * 60) * 24; -#line 309 "SetBackgroundSlideshow.c" +#line 321 "SetBackgroundSlideshow.c" } } } #line 63 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp25_ = self->priv->delay_value_label; + _tmp23_ = self->priv->delay_value_label; #line 63 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp26_ = text; + _tmp24_ = text; #line 63 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - gtk_label_set_label (_tmp25_, _tmp26_); + gtk_label_set_label (_tmp23_, _tmp24_); #line 38 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" _g_free0 (text); -#line 321 "SetBackgroundSlideshow.c" +#line 333 "SetBackgroundSlideshow.c" } -static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) { +static void +_set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, + gpointer self) +{ #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" set_background_slideshow_dialog_on_delay_scale_value_changed ((SetBackgroundSlideshowDialog*) self); -#line 328 "SetBackgroundSlideshow.c" +#line 343 "SetBackgroundSlideshow.c" } -gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self, gint* delay_value, gboolean* desktop_background, gboolean* screensaver) { +gboolean +set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self, + gint* delay_value, + gboolean* desktop_background, + gboolean* screensaver) +{ gint _vala_delay_value = 0; gboolean _vala_desktop_background = FALSE; gboolean _vala_screensaver = FALSE; gboolean result = FALSE; gboolean _result_ = FALSE; gint _tmp0_; - gint _tmp1_; - GtkCheckButton* _tmp2_; + GtkCheckButton* _tmp1_; + gboolean _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; - GtkCheckButton* _tmp5_; + GtkCheckButton* _tmp4_; + gboolean _tmp5_; gboolean _tmp6_; - gboolean _tmp7_; #line 66 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" g_return_val_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self), FALSE); #line 67 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 68 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); -#line 68 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _result_ = _tmp0_ == ((gint) GTK_RESPONSE_OK); + _result_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)) == ((gint) GTK_RESPONSE_OK); #line 69 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 71 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp1_ = self->priv->delay_value; + _tmp0_ = self->priv->delay_value; #line 71 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _vala_delay_value = _tmp1_; + _vala_delay_value = _tmp0_; #line 72 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp2_ = self->priv->desktop_background_checkbox; + _tmp1_ = self->priv->desktop_background_checkbox; #line 72 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton)); + _tmp2_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 72 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 72 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _vala_desktop_background = _tmp4_; + _vala_desktop_background = _tmp3_; #line 73 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp5_ = self->priv->screensaver_checkbox; + _tmp4_ = self->priv->screensaver_checkbox; #line 73 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp6_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_toggle_button_get_type (), GtkToggleButton)); + _tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 73 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 73 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" - _vala_screensaver = _tmp7_; + _vala_screensaver = _tmp6_; #line 75 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" @@ -380,27 +397,29 @@ gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* if (delay_value) { #line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" *delay_value = _vala_delay_value; -#line 384 "SetBackgroundSlideshow.c" +#line 401 "SetBackgroundSlideshow.c" } #line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" if (desktop_background) { #line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" *desktop_background = _vala_desktop_background; -#line 390 "SetBackgroundSlideshow.c" +#line 407 "SetBackgroundSlideshow.c" } #line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" if (screensaver) { #line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" *screensaver = _vala_screensaver; -#line 396 "SetBackgroundSlideshow.c" +#line 413 "SetBackgroundSlideshow.c" } #line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" return result; -#line 400 "SetBackgroundSlideshow.c" +#line 417 "SetBackgroundSlideshow.c" } -static void set_background_slideshow_dialog_class_init (SetBackgroundSlideshowDialogClass * klass) { +static void +set_background_slideshow_dialog_class_init (SetBackgroundSlideshowDialogClass * klass) +{ gint SetBackgroundSlideshowDialog_private_offset; #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" set_background_slideshow_dialog_parent_class = g_type_class_peek_parent (klass); @@ -426,22 +445,26 @@ static void set_background_slideshow_dialog_class_init (SetBackgroundSlideshowDi gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_checkbox_clicked", G_CALLBACK(_set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled)); #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_delay_scale_value_changed", G_CALLBACK(_set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed)); -#line 430 "SetBackgroundSlideshow.c" +#line 449 "SetBackgroundSlideshow.c" } -static void set_background_slideshow_dialog_instance_init (SetBackgroundSlideshowDialog * self) { +static void +set_background_slideshow_dialog_instance_init (SetBackgroundSlideshowDialog * self) +{ #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" self->priv = SET_BACKGROUND_SLIDESHOW_DIALOG_GET_PRIVATE (self); #line 19 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" self->priv->delay_value = 0; #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 441 "SetBackgroundSlideshow.c" +#line 462 "SetBackgroundSlideshow.c" } -static void set_background_slideshow_dialog_finalize (GObject * obj) { +static void +set_background_slideshow_dialog_finalize (GObject * obj) +{ SetBackgroundSlideshowDialog * self; #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialog); @@ -455,11 +478,13 @@ static void set_background_slideshow_dialog_finalize (GObject * obj) { _g_object_unref0 (self->priv->delay_value_label); #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala" G_OBJECT_CLASS (set_background_slideshow_dialog_parent_class)->finalize (obj); -#line 459 "SetBackgroundSlideshow.c" +#line 482 "SetBackgroundSlideshow.c" } -GType set_background_slideshow_dialog_get_type (void) { +GType +set_background_slideshow_dialog_get_type (void) +{ static volatile gsize set_background_slideshow_dialog_type_id__volatile = 0; if (g_once_init_enter (&set_background_slideshow_dialog_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SetBackgroundSlideshowDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) set_background_slideshow_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SetBackgroundSlideshowDialog), 0, (GInstanceInitFunc) set_background_slideshow_dialog_instance_init, NULL }; diff --git a/src/dialogs/TextEntry.c b/src/dialogs/TextEntry.c index 6fa478f..97716a3 100644 --- a/src/dialogs/TextEntry.c +++ b/src/dialogs/TextEntry.c @@ -1,4 +1,4 @@ -/* TextEntry.c generated by valac 0.36.6, the Vala compiler +/* TextEntry.c generated by valac 0.40.4, the Vala compiler * generated from TextEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -8,6 +8,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -26,6 +27,11 @@ typedef struct _TextEntryDialog TextEntryDialog; typedef struct _TextEntryDialogClass TextEntryDialogClass; typedef struct _TextEntryDialogPrivate TextEntryDialogPrivate; +enum { + TEXT_ENTRY_DIALOG_0_PROPERTY, + TEXT_ENTRY_DIALOG_NUM_PROPERTIES +}; +static GParamSpec* text_entry_dialog_properties[TEXT_ENTRY_DIALOG_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define TYPE_PAGE_WINDOW (page_window_get_type ()) @@ -81,69 +87,84 @@ static gpointer text_entry_dialog_parent_class = NULL; GType text_entry_dialog_get_type (void) G_GNUC_CONST; #define TEXT_ENTRY_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TEXT_ENTRY_DIALOG, TextEntryDialogPrivate)) -enum { - TEXT_ENTRY_DIALOG_DUMMY_PROPERTY -}; TextEntryDialog* text_entry_dialog_new (void); TextEntryDialog* text_entry_dialog_construct (GType object_type); gint resources_use_header_bar (void); -void text_entry_dialog_setup (TextEntryDialog* self, TextEntryDialogOnModifyValidateType modify_validate, void* modify_validate_target, const gchar* title, const gchar* label, const gchar* initial_text, GeeCollection* completion_list, const gchar* completion_delimiter); +void text_entry_dialog_setup (TextEntryDialog* self, + TextEntryDialogOnModifyValidateType modify_validate, + void* modify_validate_target, + const gchar* title, + const gchar* label, + const gchar* initial_text, + GeeCollection* completion_list, + const gchar* completion_delimiter); GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); void text_entry_dialog_on_entry_changed (TextEntryDialog* self); -static void _text_entry_dialog_on_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self); +static void _text_entry_dialog_on_entry_changed_gtk_editable_changed (GtkEditable* _sender, + gpointer self); GType entry_multi_completion_get_type (void) G_GNUC_CONST; -EntryMultiCompletion* entry_multi_completion_new (GeeCollection* completion_list, const gchar* delimiter); -EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCollection* completion_list, const gchar* delimiter); +EntryMultiCompletion* entry_multi_completion_new (GeeCollection* completion_list, + const gchar* delimiter); +EntryMultiCompletion* entry_multi_completion_construct (GType object_type, + GeeCollection* completion_list, + const gchar* delimiter); gchar* text_entry_dialog_execute (TextEntryDialog* self); static void text_entry_dialog_finalize (GObject * obj); -TextEntryDialog* text_entry_dialog_construct (GType object_type) { +TextEntryDialog* +text_entry_dialog_construct (GType object_type) +{ TextEntryDialog * self = NULL; - gint _tmp0_; -#line 21 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp0_ = resources_use_header_bar (); #line 21 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - self = (TextEntryDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL); + self = (TextEntryDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL); #line 20 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" return self; -#line 113 "TextEntry.c" +#line 126 "TextEntry.c" } -TextEntryDialog* text_entry_dialog_new (void) { +TextEntryDialog* +text_entry_dialog_new (void) +{ #line 20 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" return text_entry_dialog_construct (TYPE_TEXT_ENTRY_DIALOG); -#line 120 "TextEntry.c" +#line 135 "TextEntry.c" } -static void _text_entry_dialog_on_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { +static void +_text_entry_dialog_on_entry_changed_gtk_editable_changed (GtkEditable* _sender, + gpointer self) +{ #line 35 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" text_entry_dialog_on_entry_changed ((TextEntryDialog*) self); -#line 127 "TextEntry.c" +#line 145 "TextEntry.c" } -void text_entry_dialog_setup (TextEntryDialog* self, TextEntryDialogOnModifyValidateType modify_validate, void* modify_validate_target, const gchar* title, const gchar* label, const gchar* initial_text, GeeCollection* completion_list, const gchar* completion_delimiter) { - const gchar* _tmp0_; +void +text_entry_dialog_setup (TextEntryDialog* self, + TextEntryDialogOnModifyValidateType modify_validate, + void* modify_validate_target, + const gchar* title, + const gchar* label, + const gchar* initial_text, + GeeCollection* completion_list, + const gchar* completion_delimiter) +{ + AppWindow* _tmp0_; AppWindow* _tmp1_; - AppWindow* _tmp2_; - GdkWindow* _tmp3_; + GdkWindow* _tmp2_; + AppWindow* _tmp3_; AppWindow* _tmp4_; - AppWindow* _tmp5_; - TextEntryDialogOnModifyValidateType _tmp6_; - void* _tmp6__target; - GtkLabel* _tmp7_; - const gchar* _tmp8_; - const gchar* _tmp9_ = NULL; - const gchar* _tmp10_; - GtkEntry* _tmp12_; - GtkEntry* _tmp13_; - GtkEntry* _tmp14_; - GeeCollection* _tmp15_; + GtkLabel* _tmp5_; + const gchar* _tmp6_ = NULL; + GtkEntry* _tmp7_; + GtkEntry* _tmp8_; + GtkEntry* _tmp9_; #line 24 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self)); #line 24 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" @@ -153,115 +174,93 @@ void text_entry_dialog_setup (TextEntryDialog* self, TextEntryDialogOnModifyVali #line 24 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" g_return_if_fail ((completion_list == NULL) || GEE_IS_COLLECTION (completion_list)); #line 26 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp0_ = title; -#line 26 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_); + gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), title); #line 27 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp1_ = app_window_get_instance (); + _tmp0_ = app_window_get_instance (); #line 27 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 27 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); + _tmp2_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); #line 27 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp3_); + gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp2_); #line 27 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 28 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp4_ = app_window_get_instance (); + _tmp3_ = app_window_get_instance (); #line 28 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 28 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow)); + gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow)); #line 28 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _g_object_unref0 (_tmp5_); -#line 29 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp6_ = modify_validate; + _g_object_unref0 (_tmp4_); #line 29 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp6__target = modify_validate_target; + self->priv->on_modify_validate = modify_validate; #line 29 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - self->priv->on_modify_validate = _tmp6_; -#line 29 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - self->priv->on_modify_validate_target = _tmp6__target; -#line 31 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp7_ = self->priv->label; + self->priv->on_modify_validate_target = modify_validate_target; #line 31 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp8_ = label; + _tmp5_ = self->priv->label; #line 31 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - gtk_label_set_text (_tmp7_, _tmp8_); + gtk_label_set_text (_tmp5_, label); #line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp10_ = initial_text; + if (initial_text != NULL) { #line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - if (_tmp10_ != NULL) { -#line 196 "TextEntry.c" - const gchar* _tmp11_; -#line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp11_ = initial_text; -#line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp9_ = _tmp11_; -#line 202 "TextEntry.c" + _tmp6_ = initial_text; +#line 209 "TextEntry.c" } else { #line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp9_ = ""; -#line 206 "TextEntry.c" + _tmp6_ = ""; +#line 213 "TextEntry.c" } #line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp12_ = self->priv->entry; + _tmp7_ = self->priv->entry; #line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - gtk_entry_set_text (_tmp12_, _tmp9_); + gtk_entry_set_text (_tmp7_, _tmp6_); #line 34 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp13_ = self->priv->entry; + _tmp8_ = self->priv->entry; #line 34 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget)); #line 35 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp14_ = self->priv->entry; + _tmp9_ = self->priv->entry; #line 35 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _text_entry_dialog_on_entry_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _text_entry_dialog_on_entry_changed_gtk_editable_changed, self, 0); #line 37 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp15_ = completion_list; -#line 37 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - if (_tmp15_ != NULL) { -#line 224 "TextEntry.c" + if (completion_list != NULL) { +#line 229 "TextEntry.c" EntryMultiCompletion* completion = NULL; - GeeCollection* _tmp16_; - const gchar* _tmp17_; - EntryMultiCompletion* _tmp18_; - GtkEntry* _tmp19_; - EntryMultiCompletion* _tmp20_; -#line 38 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp16_ = completion_list; -#line 38 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp17_ = completion_delimiter; + EntryMultiCompletion* _tmp10_; + GtkEntry* _tmp11_; + EntryMultiCompletion* _tmp12_; #line 38 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp18_ = entry_multi_completion_new (_tmp16_, _tmp17_); + _tmp10_ = entry_multi_completion_new (completion_list, completion_delimiter); #line 38 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - completion = _tmp18_; + completion = _tmp10_; #line 40 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp19_ = self->priv->entry; + _tmp11_ = self->priv->entry; #line 40 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp20_ = completion; + _tmp12_ = completion; #line 40 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - gtk_entry_set_completion (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_entry_completion_get_type (), GtkEntryCompletion)); + gtk_entry_set_completion (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_entry_completion_get_type (), GtkEntryCompletion)); #line 37 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" _g_object_unref0 (completion); -#line 247 "TextEntry.c" +#line 246 "TextEntry.c" } #line 43 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK); -#line 251 "TextEntry.c" +#line 250 "TextEntry.c" } -gchar* text_entry_dialog_execute (TextEntryDialog* self) { +gchar* +text_entry_dialog_execute (TextEntryDialog* self) +{ gchar* result = NULL; gchar* text = NULL; TextEntryDialogOnModifyValidateType _tmp0_; void* _tmp0__target; GtkEntry* _tmp1_; const gchar* _tmp2_; - gboolean _tmp3_; - gint _tmp4_; - GtkEntry* _tmp8_; - guint _tmp9_; + GtkEntry* _tmp6_; + guint _tmp7_; #line 46 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" g_return_val_if_fail (IS_TEXT_ENTRY_DIALOG (self), NULL); #line 47 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" @@ -275,53 +274,50 @@ gchar* text_entry_dialog_execute (TextEntryDialog* self) { #line 50 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" _tmp2_ = gtk_entry_get_text (_tmp1_); #line 50 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp3_ = _tmp0_ (_tmp2_, _tmp0__target); -#line 50 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp3_); + gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp0_ (_tmp2_, _tmp0__target)); #line 52 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 54 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp4_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); -#line 54 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - if (_tmp4_ == ((gint) GTK_RESPONSE_OK)) { -#line 288 "TextEntry.c" - GtkEntry* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; + if (gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)) == ((gint) GTK_RESPONSE_OK)) { +#line 283 "TextEntry.c" + GtkEntry* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; #line 55 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp5_ = self->priv->entry; + _tmp3_ = self->priv->entry; #line 55 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp6_ = gtk_entry_get_text (_tmp5_); + _tmp4_ = gtk_entry_get_text (_tmp3_); #line 55 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp5_ = g_strdup (_tmp4_); #line 55 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" _g_free0 (text); #line 55 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - text = _tmp7_; -#line 302 "TextEntry.c" + text = _tmp5_; +#line 297 "TextEntry.c" } #line 57 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp8_ = self->priv->entry; + _tmp6_ = self->priv->entry; #line 57 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp9_, NULL, FALSE); + g_signal_parse_name ("changed", gtk_editable_get_type (), &_tmp7_, NULL, FALSE); #line 57 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _text_entry_dialog_on_entry_changed_gtk_editable_changed, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_editable_get_type (), GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _text_entry_dialog_on_entry_changed_gtk_editable_changed, self); #line 58 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 60 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" result = text; #line 60 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" return result; -#line 316 "TextEntry.c" +#line 311 "TextEntry.c" } -void text_entry_dialog_on_entry_changed (TextEntryDialog* self) { +void +text_entry_dialog_on_entry_changed (TextEntryDialog* self) +{ TextEntryDialogOnModifyValidateType _tmp0_; void* _tmp0__target; GtkEntry* _tmp1_; const gchar* _tmp2_; - gboolean _tmp3_; #line 63 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self)); #line 64 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" @@ -333,14 +329,14 @@ void text_entry_dialog_on_entry_changed (TextEntryDialog* self) { #line 64 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" _tmp2_ = gtk_entry_get_text (_tmp1_); #line 64 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - _tmp3_ = _tmp0_ (_tmp2_, _tmp0__target); -#line 64 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" - gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp3_); -#line 340 "TextEntry.c" + gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp0_ (_tmp2_, _tmp0__target)); +#line 334 "TextEntry.c" } -static void text_entry_dialog_class_init (TextEntryDialogClass * klass) { +static void +text_entry_dialog_class_init (TextEntryDialogClass * klass) +{ gint TextEntryDialog_private_offset; #line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" text_entry_dialog_parent_class = g_type_class_peek_parent (klass); @@ -356,20 +352,24 @@ static void text_entry_dialog_class_init (TextEntryDialogClass * klass) { gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "entry", FALSE, TextEntryDialog_private_offset + G_STRUCT_OFFSET (TextEntryDialogPrivate, entry)); #line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "label", FALSE, TextEntryDialog_private_offset + G_STRUCT_OFFSET (TextEntryDialogPrivate, label)); -#line 360 "TextEntry.c" +#line 356 "TextEntry.c" } -static void text_entry_dialog_instance_init (TextEntryDialog * self) { +static void +text_entry_dialog_instance_init (TextEntryDialog * self) +{ #line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" self->priv = TEXT_ENTRY_DIALOG_GET_PRIVATE (self); #line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 369 "TextEntry.c" +#line 367 "TextEntry.c" } -static void text_entry_dialog_finalize (GObject * obj) { +static void +text_entry_dialog_finalize (GObject * obj) +{ TextEntryDialog * self; #line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEXT_ENTRY_DIALOG, TextEntryDialog); @@ -383,7 +383,9 @@ static void text_entry_dialog_finalize (GObject * obj) { } -GType text_entry_dialog_get_type (void) { +GType +text_entry_dialog_get_type (void) +{ static volatile gsize text_entry_dialog_type_id__volatile = 0; if (g_once_init_enter (&text_entry_dialog_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TextEntryDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) text_entry_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TextEntryDialog), 0, (GInstanceInitFunc) text_entry_dialog_instance_init, NULL }; diff --git a/src/dialogs/WelcomeDialog.c b/src/dialogs/WelcomeDialog.c index 153175b..5cbd541 100644 --- a/src/dialogs/WelcomeDialog.c +++ b/src/dialogs/WelcomeDialog.c @@ -1,4 +1,4 @@ -/* WelcomeDialog.c generated by valac 0.36.6, the Vala compiler +/* WelcomeDialog.c generated by valac 0.40.4, the Vala compiler * generated from WelcomeDialog.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -8,6 +8,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -46,6 +47,11 @@ typedef struct _WelcomeDialogPrivate WelcomeDialogPrivate; typedef struct _SpitDataImportsWelcomeImportMetaHost SpitDataImportsWelcomeImportMetaHost; typedef struct _SpitDataImportsWelcomeImportMetaHostClass SpitDataImportsWelcomeImportMetaHostClass; +enum { + WELCOME_DIALOG_0_PROPERTY, + WELCOME_DIALOG_NUM_PROPERTIES +}; +static GParamSpec* welcome_dialog_properties[WELCOME_DIALOG_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) @@ -93,64 +99,92 @@ void welcome_service_entry_execute (WelcomeServiceEntry* self); GType welcome_dialog_get_type (void) G_GNUC_CONST; GType spit_data_imports_welcome_import_meta_host_get_type (void) G_GNUC_CONST; #define WELCOME_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_WELCOME_DIALOG, WelcomeDialogPrivate)) -enum { - WELCOME_DIALOG_DUMMY_PROPERTY -}; WelcomeDialog* welcome_dialog_new (GtkWindow* owner); -WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner); +WelcomeDialog* welcome_dialog_construct (GType object_type, + GtkWindow* owner); gint resources_use_header_bar (void); SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_new (WelcomeDialog* dialog); -SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_construct (GType object_type, WelcomeDialog* dialog); +SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_construct (GType object_type, + WelcomeDialog* dialog); static gboolean welcome_dialog_is_system_pictures_import_possible (void); #define RESOURCES_OK_LABEL _ ("_OK") gchar* get_display_pathname (GFile* file); GFile* app_dirs_get_import_dir (void); static void welcome_dialog_install_import_content (WelcomeDialog* self); void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImportMetaHost* self); -void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEntry* entry); -static void _vala_array_add4 (WelcomeServiceEntry** * array, int* length, int* size, WelcomeServiceEntry* value); -static void _vala_array_add5 (GtkCheckButton** * array, int* length, int* size, GtkCheckButton* value); -static void welcome_dialog_on_dismiss (WelcomeDialog* self, gint resp); -gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** selected_import_entries, int* selected_import_entries_length1, gboolean* do_system_pictures_import); -static void _welcome_dialog_on_dismiss_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self); -static void _vala_array_add6 (WelcomeServiceEntry** * array, int* length, int* size, WelcomeServiceEntry* value); -static WelcomeServiceEntry** _vala_array_dup1 (WelcomeServiceEntry** self, int length); +void welcome_dialog_install_service_entry (WelcomeDialog* self, + WelcomeServiceEntry* entry); +static void _vala_array_add4 (WelcomeServiceEntry** * array, + int* length, + int* size, + WelcomeServiceEntry* value); +static void _vala_array_add5 (GtkCheckButton** * array, + int* length, + int* size, + GtkCheckButton* value); +static void welcome_dialog_on_dismiss (WelcomeDialog* self, + gint resp); +gboolean welcome_dialog_execute (WelcomeDialog* self, + WelcomeServiceEntry*** selected_import_entries, + int* selected_import_entries_length1, + gboolean* do_system_pictures_import); +static void _welcome_dialog_on_dismiss_gtk_dialog_response (GtkDialog* _sender, + gint response_id, + gpointer self); +static void _vala_array_add6 (WelcomeServiceEntry** * array, + int* length, + int* size, + WelcomeServiceEntry* value); +static WelcomeServiceEntry** _vala_array_dup1 (WelcomeServiceEntry** self, + int length); static void welcome_dialog_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -gchar* welcome_service_entry_get_service_name (WelcomeServiceEntry* self) { +gchar* +welcome_service_entry_get_service_name (WelcomeServiceEntry* self) +{ #line 9 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" g_return_val_if_fail (IS_WELCOME_SERVICE_ENTRY (self), NULL); #line 9 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" return WELCOME_SERVICE_ENTRY_GET_INTERFACE (self)->get_service_name (self); -#line 129 "WelcomeDialog.c" +#line 157 "WelcomeDialog.c" } -void welcome_service_entry_execute (WelcomeServiceEntry* self) { +void +welcome_service_entry_execute (WelcomeServiceEntry* self) +{ #line 11 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" g_return_if_fail (IS_WELCOME_SERVICE_ENTRY (self)); #line 11 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" WELCOME_SERVICE_ENTRY_GET_INTERFACE (self)->execute (self); -#line 138 "WelcomeDialog.c" +#line 168 "WelcomeDialog.c" } -static void welcome_service_entry_base_init (WelcomeServiceEntryIface * iface) { +static void +welcome_service_entry_base_init (WelcomeServiceEntryIface * iface) +{ #line 8 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" static gboolean initialized = FALSE; #line 8 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" if (!initialized) { #line 8 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" initialized = TRUE; -#line 149 "WelcomeDialog.c" +#line 181 "WelcomeDialog.c" } } -GType welcome_service_entry_get_type (void) { +GType +welcome_service_entry_get_type (void) +{ static volatile gsize welcome_service_entry_type_id__volatile = 0; if (g_once_init_enter (&welcome_service_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (WelcomeServiceEntryIface), (GBaseInitFunc) welcome_service_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -163,122 +197,119 @@ GType welcome_service_entry_get_type (void) { } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 32 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" return self ? g_object_ref (self) : NULL; -#line 170 "WelcomeDialog.c" +#line 206 "WelcomeDialog.c" } -WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) { +WelcomeDialog* +welcome_dialog_construct (GType object_type, + GtkWindow* owner) +{ WelcomeDialog * self = NULL; - gint _tmp0_; - SpitDataImportsWelcomeImportMetaHost* _tmp1_; + SpitDataImportsWelcomeImportMetaHost* _tmp0_; gboolean show_system_pictures_import = FALSE; - gboolean _tmp2_; GtkWidget* ok_button = NULL; - GtkWidget* _tmp3_; - GtkWidget* _tmp4_; - GtkWindow* _tmp5_; + GtkWidget* _tmp1_; + GtkWidget* _tmp2_; GtkLabel* primary_text = NULL; - GtkLabel* _tmp6_; + GtkLabel* _tmp3_; + GtkLabel* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; GtkLabel* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; + GtkLabel* _tmp8_; + GtkLabel* _tmp9_; GtkLabel* _tmp10_; - GtkLabel* _tmp11_; - GtkLabel* _tmp12_; + gchar* _tmp11_; + gchar* _tmp12_; GtkLabel* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; - GtkLabel* _tmp16_; - GtkLabel* _tmp17_; + GtkLabel* _tmp14_; GtkImage* image = NULL; - GtkImage* _tmp18_; + GtkImage* _tmp15_; GtkBox* header_text = NULL; + GtkBox* _tmp16_; + GtkBox* _tmp17_; + GtkLabel* _tmp18_; GtkBox* _tmp19_; - GtkBox* _tmp20_; - GtkLabel* _tmp21_; - GtkBox* _tmp22_; - GtkLabel* _tmp23_; + GtkLabel* _tmp20_; GtkBox* header_content = NULL; + GtkBox* _tmp21_; + GtkBox* _tmp22_; + GtkImage* _tmp23_; GtkBox* _tmp24_; GtkBox* _tmp25_; - GtkImage* _tmp26_; - GtkBox* _tmp27_; - GtkBox* _tmp28_; GtkLabel* instructions = NULL; - GtkLabel* _tmp29_; + GtkLabel* _tmp26_; gchar* indent_prefix = NULL; - gchar* _tmp30_; - const gchar* _tmp31_ = NULL; - GtkTextDirection _tmp32_; + gchar* _tmp27_; + const gchar* _tmp28_ = NULL; gchar* arrow_glyph = NULL; + gchar* _tmp29_; + GtkLabel* _tmp30_; + const gchar* _tmp31_; + gchar* _tmp32_; gchar* _tmp33_; - GtkLabel* _tmp34_; - const gchar* _tmp35_; + const gchar* _tmp34_; + gchar* _tmp35_; gchar* _tmp36_; gchar* _tmp37_; - const gchar* _tmp38_; - gchar* _tmp39_; + gchar* _tmp38_; + const gchar* _tmp39_; gchar* _tmp40_; gchar* _tmp41_; gchar* _tmp42_; - const gchar* _tmp43_; - gchar* _tmp44_; + gchar* _tmp43_; + const gchar* _tmp44_; gchar* _tmp45_; gchar* _tmp46_; gchar* _tmp47_; - const gchar* _tmp48_; - gchar* _tmp49_; - gchar* _tmp50_; - gchar* _tmp51_; - gchar* _tmp52_; - GtkLabel* _tmp53_; - GtkLabel* _tmp54_; - GtkBox* _tmp55_; - GtkBox* _tmp56_; - GtkBox* _tmp57_; - GtkBox* _tmp58_; - gboolean _tmp59_; - GtkLabel* _tmp70_; - GtkLabel* _tmp71_; - GtkLabel* _tmp72_; - GtkLabel* _tmp73_; + gchar* _tmp48_; + GtkLabel* _tmp49_; + GtkLabel* _tmp50_; + GtkBox* _tmp51_; + GtkBox* _tmp52_; + GtkBox* _tmp53_; + GtkBox* _tmp54_; + gboolean _tmp55_; + GtkLabel* _tmp66_; + GtkLabel* _tmp67_; + GtkLabel* _tmp68_; + GtkLabel* _tmp69_; GtkBox* content = NULL; - GtkBox* _tmp74_; - GtkBox* _tmp75_; - GtkBox* _tmp76_; - GtkBox* _tmp77_; - GtkLabel* _tmp78_; - GtkCheckButton* _tmp79_; - GtkCheckButton* _tmp80_; - GtkCheckButton* _tmp81_; - GtkBox* _tmp82_; - GtkWidget* _tmp83_; - SpitDataImportsWelcomeImportMetaHost* _tmp84_; + GtkBox* _tmp70_; + GtkBox* _tmp71_; + GtkBox* _tmp72_; + GtkBox* _tmp73_; + GtkLabel* _tmp74_; + GtkCheckButton* _tmp75_; + GtkCheckButton* _tmp76_; + GtkCheckButton* _tmp77_; + GtkBox* _tmp78_; + GtkWidget* _tmp79_; + SpitDataImportsWelcomeImportMetaHost* _tmp80_; #line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" g_return_val_if_fail (GTK_IS_WINDOW (owner), NULL); #line 29 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp0_ = resources_use_header_bar (); -#line 29 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - self = (WelcomeDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL); + self = (WelcomeDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL); #line 30 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp1_ = spit_data_imports_welcome_import_meta_host_new (self); + _tmp0_ = spit_data_imports_welcome_import_meta_host_new (self); #line 30 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _g_object_unref0 (self->priv->import_meta_host); #line 30 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - self->priv->import_meta_host = _tmp1_; -#line 31 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp2_ = welcome_dialog_is_system_pictures_import_possible (); + self->priv->import_meta_host = _tmp0_; #line 31 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - show_system_pictures_import = _tmp2_; + show_system_pictures_import = welcome_dialog_is_system_pictures_import_possible (); #line 32 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp3_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_CLOSE); + _tmp1_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_CLOSE); #line 32 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp2_ = _g_object_ref0 (_tmp1_); #line 32 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - ok_button = _tmp4_; + ok_button = _tmp2_; #line 33 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CLOSE); #line 35 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" @@ -288,326 +319,322 @@ WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) { #line 37 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG); #line 38 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp5_ = owner; -#line 38 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp5_); + gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), owner); #line 40 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp6_ = (GtkLabel*) gtk_label_new (""); + _tmp3_ = (GtkLabel*) gtk_label_new (""); #line 40 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - g_object_ref_sink (_tmp6_); + g_object_ref_sink (_tmp3_); #line 40 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - primary_text = _tmp6_; + primary_text = _tmp3_; #line 41 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp7_ = primary_text; + _tmp4_ = primary_text; #line 41 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp8_ = g_strdup_printf ("%s", _ ("Welcome to Shotwell!")); + _tmp5_ = g_strdup_printf ("%s", _ ("Welcome to Shotwell!")); #line 41 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 41 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_label_set_markup (_tmp7_, _tmp9_); + gtk_label_set_markup (_tmp4_, _tmp6_); #line 41 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp6_); #line 43 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp10_ = primary_text; + _tmp7_ = primary_text; #line 43 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_label_set_xalign (_tmp10_, 0.0f); + gtk_label_set_xalign (_tmp7_, 0.0f); #line 44 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp11_ = primary_text; + _tmp8_ = primary_text; #line 44 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_label_set_yalign (_tmp11_, 0.5f); + gtk_label_set_yalign (_tmp8_, 0.5f); #line 45 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp12_ = (GtkLabel*) gtk_label_new (""); + _tmp9_ = (GtkLabel*) gtk_label_new (""); #line 45 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - g_object_ref_sink (_tmp12_); + g_object_ref_sink (_tmp9_); #line 45 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _g_object_unref0 (self->priv->secondary_text); #line 45 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - self->priv->secondary_text = _tmp12_; + self->priv->secondary_text = _tmp9_; #line 46 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp13_ = self->priv->secondary_text; + _tmp10_ = self->priv->secondary_text; #line 46 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp14_ = g_strdup_printf ("%s", _ ("To get started, import photos in any of these ways:")); + _tmp11_ = g_strdup_printf ("%s", _ ("To get started, import photos in any of these ways:")); #line 46 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp15_ = _tmp14_; + _tmp12_ = _tmp11_; #line 46 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_label_set_markup (_tmp13_, _tmp15_); + gtk_label_set_markup (_tmp10_, _tmp12_); #line 46 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp12_); #line 48 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp16_ = self->priv->secondary_text; + _tmp13_ = self->priv->secondary_text; #line 48 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_label_set_xalign (_tmp16_, 0.0f); + gtk_label_set_xalign (_tmp13_, 0.0f); #line 49 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp17_ = self->priv->secondary_text; + _tmp14_ = self->priv->secondary_text; #line 49 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_label_set_yalign (_tmp17_, 0.5f); + gtk_label_set_yalign (_tmp14_, 0.5f); #line 50 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp18_ = (GtkImage*) gtk_image_new_from_icon_name ("shotwell", GTK_ICON_SIZE_DIALOG); + _tmp15_ = (GtkImage*) gtk_image_new_from_icon_name ("shotwell", (GtkIconSize) GTK_ICON_SIZE_DIALOG); #line 50 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - g_object_ref_sink (_tmp18_); + g_object_ref_sink (_tmp15_); #line 50 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - image = _tmp18_; + image = _tmp15_; #line 52 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp19_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + _tmp16_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); #line 52 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - g_object_ref_sink (_tmp19_); + g_object_ref_sink (_tmp16_); #line 52 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - header_text = _tmp19_; + header_text = _tmp16_; #line 53 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp20_ = header_text; + _tmp17_ = header_text; #line 53 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp21_ = primary_text; + _tmp18_ = primary_text; #line 53 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_box_pack_start (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 5); + gtk_box_pack_start (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 5); #line 54 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp22_ = header_text; + _tmp19_ = header_text; #line 54 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp23_ = self->priv->secondary_text; + _tmp20_ = self->priv->secondary_text; #line 54 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 56 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp24_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); + _tmp21_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); #line 56 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - g_object_ref_sink (_tmp24_); + g_object_ref_sink (_tmp21_); #line 56 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - header_content = _tmp24_; + header_content = _tmp21_; #line 57 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp25_ = header_content; + _tmp22_ = header_content; #line 57 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp26_ = image; + _tmp23_ = image; #line 57 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_box_pack_start (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 58 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp27_ = header_content; + _tmp24_ = header_content; #line 58 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp28_ = header_text; + _tmp25_ = header_text; #line 58 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_box_pack_start (_tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 60 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp29_ = (GtkLabel*) gtk_label_new (""); + _tmp26_ = (GtkLabel*) gtk_label_new (""); #line 60 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - g_object_ref_sink (_tmp29_); + g_object_ref_sink (_tmp26_); #line 60 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - instructions = _tmp29_; + instructions = _tmp26_; #line 61 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp30_ = g_strdup (" "); + _tmp27_ = g_strdup (" "); #line 61 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - indent_prefix = _tmp30_; + indent_prefix = _tmp27_; #line 63 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp32_ = gtk_widget_get_direction (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); + if (gtk_widget_get_direction (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)) == GTK_TEXT_DIR_RTL) { #line 63 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - if (_tmp32_ == GTK_TEXT_DIR_RTL) { -#line 63 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp31_ = "◂"; -#line 403 "WelcomeDialog.c" + _tmp28_ = "◂"; +#line 430 "WelcomeDialog.c" } else { #line 63 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp31_ = "▸"; -#line 407 "WelcomeDialog.c" + _tmp28_ = "▸"; +#line 434 "WelcomeDialog.c" } #line 63 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp33_ = g_strdup (_tmp31_); + _tmp29_ = g_strdup (_tmp28_); #line 63 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - arrow_glyph = _tmp33_; + arrow_glyph = _tmp29_; #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp34_ = instructions; + _tmp30_ = instructions; #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp35_ = indent_prefix; + _tmp31_ = indent_prefix; #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp36_ = g_strconcat (_tmp35_, "• %s\n", NULL); + _tmp32_ = g_strconcat (_tmp31_, "• %s\n", NULL); #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp37_ = _tmp36_; + _tmp33_ = _tmp32_; #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp38_ = indent_prefix; + _tmp34_ = indent_prefix; #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp39_ = g_strconcat (_tmp38_, "• %s\n", NULL); + _tmp35_ = g_strconcat (_tmp34_, "• %s\n", NULL); #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp40_ = _tmp39_; + _tmp36_ = _tmp35_; #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp41_ = g_strconcat (_tmp37_, _tmp40_, NULL); + _tmp37_ = g_strconcat (_tmp33_, _tmp36_, NULL); #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp42_ = _tmp41_; + _tmp38_ = _tmp37_; #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp43_ = indent_prefix; + _tmp39_ = indent_prefix; #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp44_ = g_strconcat (_tmp43_, "• %s", NULL); + _tmp40_ = g_strconcat (_tmp39_, "• %s", NULL); #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp45_ = _tmp44_; + _tmp41_ = _tmp40_; #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp46_ = g_strconcat (_tmp42_, _tmp45_, NULL); + _tmp42_ = g_strconcat (_tmp38_, _tmp41_, NULL); #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp47_ = _tmp46_; + _tmp43_ = _tmp42_; #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp48_ = arrow_glyph; + _tmp44_ = arrow_glyph; #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp49_ = g_strdup_printf (_ ("Choose File %s Import From Folder"), _tmp48_); + _tmp45_ = g_strdup_printf (_ ("Choose File %s Import From Folder"), _tmp44_); #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp50_ = _tmp49_; + _tmp46_ = _tmp45_; #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp51_ = g_strdup_printf (_tmp47_, _tmp50_, _ ("Drag and drop photos onto the Shotwell window"), _ ("Connect a camera to your computer and import")); + _tmp47_ = g_strdup_printf (_tmp43_, _tmp46_, _ ("Drag and drop photos onto the Shotwell window"), _ ("Connect a camera to your computer and import")); #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp52_ = _tmp51_; + _tmp48_ = _tmp47_; #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_label_set_markup (_tmp34_, _tmp52_); + gtk_label_set_markup (_tmp30_, _tmp48_); #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _g_free0 (_tmp52_); + _g_free0 (_tmp48_); #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _g_free0 (_tmp50_); + _g_free0 (_tmp46_); #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _g_free0 (_tmp47_); + _g_free0 (_tmp43_); #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _g_free0 (_tmp45_); + _g_free0 (_tmp41_); #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _g_free0 (_tmp42_); + _g_free0 (_tmp38_); #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _g_free0 (_tmp40_); + _g_free0 (_tmp36_); #line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _g_free0 (_tmp37_); + _g_free0 (_tmp33_); #line 70 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp53_ = instructions; + _tmp49_ = instructions; #line 70 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_label_set_xalign (_tmp53_, 0.0f); + gtk_label_set_xalign (_tmp49_, 0.0f); #line 71 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp54_ = instructions; + _tmp50_ = instructions; #line 71 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_label_set_yalign (_tmp54_, 0.5f); + gtk_label_set_yalign (_tmp50_, 0.5f); #line 73 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp55_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); + _tmp51_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); #line 73 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - g_object_ref_sink (_tmp55_); + g_object_ref_sink (_tmp51_); #line 73 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _g_object_unref0 (self->priv->import_action_checkbox_packer); #line 73 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - self->priv->import_action_checkbox_packer = _tmp55_; + self->priv->import_action_checkbox_packer = _tmp51_; #line 75 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp56_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); + _tmp52_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); #line 75 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - g_object_ref_sink (_tmp56_); + g_object_ref_sink (_tmp52_); #line 75 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _g_object_unref0 (self->priv->external_import_action_checkbox_packer); #line 75 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - self->priv->external_import_action_checkbox_packer = _tmp56_; + self->priv->external_import_action_checkbox_packer = _tmp52_; #line 76 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp57_ = self->priv->import_action_checkbox_packer; + _tmp53_ = self->priv->import_action_checkbox_packer; #line 76 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp58_ = self->priv->external_import_action_checkbox_packer; + _tmp54_ = self->priv->external_import_action_checkbox_packer; #line 76 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget)); #line 78 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp59_ = show_system_pictures_import; + _tmp55_ = show_system_pictures_import; #line 78 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - if (_tmp59_) { -#line 501 "WelcomeDialog.c" - GFile* _tmp60_; - GFile* _tmp61_; - gchar* _tmp62_; - gchar* _tmp63_; - gchar* _tmp64_; - gchar* _tmp65_; - GtkCheckButton* _tmp66_; - GtkBox* _tmp67_; - GtkCheckButton* _tmp68_; - GtkCheckButton* _tmp69_; + if (_tmp55_) { +#line 528 "WelcomeDialog.c" + GFile* _tmp56_; + GFile* _tmp57_; + gchar* _tmp58_; + gchar* _tmp59_; + gchar* _tmp60_; + gchar* _tmp61_; + GtkCheckButton* _tmp62_; + GtkBox* _tmp63_; + GtkCheckButton* _tmp64_; + GtkCheckButton* _tmp65_; #line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp60_ = app_dirs_get_import_dir (); + _tmp56_ = app_dirs_get_import_dir (); #line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp61_ = _tmp60_; + _tmp57_ = _tmp56_; #line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp62_ = get_display_pathname (_tmp61_); + _tmp58_ = get_display_pathname (_tmp57_); #line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp63_ = _tmp62_; + _tmp59_ = _tmp58_; #line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp64_ = g_strdup_printf (_ ("_Import photos from your %s folder"), _tmp63_); + _tmp60_ = g_strdup_printf (_ ("_Import photos from your %s folder"), _tmp59_); #line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp65_ = _tmp64_; + _tmp61_ = _tmp60_; #line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp66_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp65_); + _tmp62_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp61_); #line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - g_object_ref_sink (_tmp66_); + g_object_ref_sink (_tmp62_); #line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _g_object_unref0 (self->priv->system_pictures_import_check); #line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - self->priv->system_pictures_import_check = _tmp66_; + self->priv->system_pictures_import_check = _tmp62_; #line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _g_free0 (_tmp65_); + _g_free0 (_tmp61_); #line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _g_free0 (_tmp63_); + _g_free0 (_tmp59_); #line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _g_object_unref0 (_tmp61_); + _g_object_unref0 (_tmp57_); #line 82 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp67_ = self->priv->import_action_checkbox_packer; + _tmp63_ = self->priv->import_action_checkbox_packer; #line 82 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp68_ = self->priv->system_pictures_import_check; + _tmp64_ = self->priv->system_pictures_import_check; #line 82 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget)); #line 83 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp69_ = self->priv->system_pictures_import_check; + _tmp65_ = self->priv->system_pictures_import_check; #line 83 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); -#line 548 "WelcomeDialog.c" + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); +#line 575 "WelcomeDialog.c" } #line 86 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp70_ = (GtkLabel*) gtk_label_new (_ ("You can also import photos in any of these ways:")); + _tmp66_ = (GtkLabel*) gtk_label_new (_ ("You can also import photos in any of these ways:")); #line 86 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - g_object_ref_sink (_tmp70_); + g_object_ref_sink (_tmp66_); #line 86 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _g_object_unref0 (self->priv->instruction_header); #line 86 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - self->priv->instruction_header = _tmp70_; + self->priv->instruction_header = _tmp66_; #line 88 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp71_ = self->priv->instruction_header; + _tmp67_ = self->priv->instruction_header; #line 88 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_label_set_xalign (_tmp71_, 0.0f); + gtk_label_set_xalign (_tmp67_, 0.0f); #line 89 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp72_ = self->priv->instruction_header; + _tmp68_ = self->priv->instruction_header; #line 89 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_label_set_yalign (_tmp72_, 0.5f); + gtk_label_set_yalign (_tmp68_, 0.5f); #line 90 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp73_ = self->priv->instruction_header; + _tmp69_ = self->priv->instruction_header; #line 90 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_widget_get_type (), GtkWidget), 20); + gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget), 20); #line 92 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp74_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 16); + _tmp70_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 16); #line 92 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - g_object_ref_sink (_tmp74_); + g_object_ref_sink (_tmp70_); #line 92 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - content = _tmp74_; + content = _tmp70_; #line 93 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp75_ = header_content; + _tmp71_ = header_content; #line 93 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 94 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp76_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); + _tmp72_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); #line 94 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - g_object_ref_sink (_tmp76_); + g_object_ref_sink (_tmp72_); #line 94 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _g_object_unref0 (self->priv->import_content); #line 94 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - self->priv->import_content = _tmp76_; + self->priv->import_content = _tmp72_; #line 95 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp77_ = self->priv->import_content; + _tmp73_ = self->priv->import_content; #line 95 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_widget_get_type (), GtkWidget)); #line 96 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp78_ = instructions; + _tmp74_ = instructions; #line 96 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 98 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp79_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_ ("_Don’t show this message again")); + _tmp75_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_ ("_Don’t show this message again")); #line 98 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - g_object_ref_sink (_tmp79_); + g_object_ref_sink (_tmp75_); #line 98 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _g_object_unref0 (self->priv->hide_button); #line 98 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - self->priv->hide_button = _tmp79_; + self->priv->hide_button = _tmp75_; #line 99 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp80_ = self->priv->hide_button; + _tmp76_ = self->priv->hide_button; #line 99 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); #line 100 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp81_ = self->priv->hide_button; + _tmp77_ = self->priv->hide_button; #line 100 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6); + gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6); #line 101 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL); #line 102 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" @@ -625,19 +652,19 @@ WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) { #line 108 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 12); #line 110 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp82_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); + _tmp78_ = gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); #line 110 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 112 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp83_ = ok_button; + _tmp79_ = ok_button; #line 112 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_widget_grab_focus (_tmp83_); + gtk_widget_grab_focus (_tmp79_); #line 114 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" welcome_dialog_install_import_content (self); #line 116 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp84_ = self->priv->import_meta_host; + _tmp80_ = self->priv->import_meta_host; #line 116 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - spit_data_imports_welcome_import_meta_host_start (_tmp84_); + spit_data_imports_welcome_import_meta_host_start (_tmp80_); #line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _g_object_unref0 (content); #line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" @@ -658,18 +685,22 @@ WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) { _g_object_unref0 (ok_button); #line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" return self; -#line 662 "WelcomeDialog.c" +#line 689 "WelcomeDialog.c" } -WelcomeDialog* welcome_dialog_new (GtkWindow* owner) { +WelcomeDialog* +welcome_dialog_new (GtkWindow* owner) +{ #line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" return welcome_dialog_construct (TYPE_WELCOME_DIALOG, owner); -#line 669 "WelcomeDialog.c" +#line 698 "WelcomeDialog.c" } -static void welcome_dialog_install_import_content (WelcomeDialog* self) { +static void +welcome_dialog_install_import_content (WelcomeDialog* self) +{ gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GtkCheckButton** _tmp2_; @@ -684,32 +715,32 @@ static void welcome_dialog_install_import_content (WelcomeDialog* self) { if (_tmp2__length1 > 0) { #line 121 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _tmp1_ = TRUE; -#line 688 "WelcomeDialog.c" +#line 719 "WelcomeDialog.c" } else { GtkCheckButton* _tmp3_; #line 121 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _tmp3_ = self->priv->system_pictures_import_check; #line 121 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _tmp1_ = _tmp3_ != NULL; -#line 695 "WelcomeDialog.c" +#line 726 "WelcomeDialog.c" } #line 121 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" if (_tmp1_) { -#line 699 "WelcomeDialog.c" +#line 730 "WelcomeDialog.c" gboolean _tmp4_; #line 122 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _tmp4_ = self->priv->import_content_already_installed; #line 122 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _tmp0_ = _tmp4_ == FALSE; -#line 705 "WelcomeDialog.c" +#line 736 "WelcomeDialog.c" } else { #line 121 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _tmp0_ = FALSE; -#line 709 "WelcomeDialog.c" +#line 740 "WelcomeDialog.c" } #line 120 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" if (_tmp0_) { -#line 713 "WelcomeDialog.c" +#line 744 "WelcomeDialog.c" GtkLabel* _tmp5_; GtkBox* _tmp6_; GtkBox* _tmp7_; @@ -733,138 +764,142 @@ static void welcome_dialog_install_import_content (WelcomeDialog* self) { gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); #line 127 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" self->priv->import_content_already_installed = TRUE; -#line 737 "WelcomeDialog.c" +#line 768 "WelcomeDialog.c" } } -static void _vala_array_add4 (WelcomeServiceEntry** * array, int* length, int* size, WelcomeServiceEntry* value) { +static void +_vala_array_add4 (WelcomeServiceEntry** * array, + int* length, + int* size, + WelcomeServiceEntry* value) +{ #line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" if ((*length) == (*size)) { #line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" *size = (*size) ? (2 * (*size)) : 4; #line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" *array = g_renew (WelcomeServiceEntry*, *array, (*size) + 1); -#line 749 "WelcomeDialog.c" +#line 785 "WelcomeDialog.c" } #line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" (*array)[(*length)++] = value; #line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" (*array)[*length] = NULL; -#line 755 "WelcomeDialog.c" +#line 791 "WelcomeDialog.c" } -static void _vala_array_add5 (GtkCheckButton** * array, int* length, int* size, GtkCheckButton* value) { +static void +_vala_array_add5 (GtkCheckButton** * array, + int* length, + int* size, + GtkCheckButton* value) +{ #line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" if ((*length) == (*size)) { #line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" *size = (*size) ? (2 * (*size)) : 4; #line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" *array = g_renew (GtkCheckButton*, *array, (*size) + 1); -#line 766 "WelcomeDialog.c" +#line 807 "WelcomeDialog.c" } #line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" (*array)[(*length)++] = value; #line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" (*array)[*length] = NULL; -#line 772 "WelcomeDialog.c" +#line 813 "WelcomeDialog.c" } -void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEntry* entry) { - WelcomeServiceEntry* _tmp0_; +void +welcome_dialog_install_service_entry (WelcomeDialog* self, + WelcomeServiceEntry* entry) +{ + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - WelcomeServiceEntry** _tmp5_; - gint _tmp5__length1; - WelcomeServiceEntry* _tmp6_; - WelcomeServiceEntry* _tmp7_; + WelcomeServiceEntry** _tmp4_; + gint _tmp4__length1; + WelcomeServiceEntry* _tmp5_; GtkCheckButton* entry_check = NULL; - WelcomeServiceEntry* _tmp8_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; + GtkCheckButton* _tmp10_; + GtkCheckButton* _tmp11_; + GtkCheckButton** _tmp12_; + gint _tmp12__length1; GtkCheckButton* _tmp13_; - GtkCheckButton* _tmp14_; - GtkCheckButton** _tmp15_; - gint _tmp15__length1; - GtkCheckButton* _tmp16_; - GtkBox* _tmp17_; + GtkBox* _tmp14_; #line 131 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" g_return_if_fail (IS_WELCOME_DIALOG (self)); #line 131 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" g_return_if_fail (IS_WELCOME_SERVICE_ENTRY (entry)); #line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp0_ = entry; -#line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp1_ = welcome_service_entry_get_service_name (_tmp0_); + _tmp0_ = welcome_service_entry_get_service_name (entry); #line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp3_ = g_strdup_printf ("WelcomeDialog: Installing service entry for %s", _tmp2_); + _tmp2_ = g_strdup_printf ("WelcomeDialog: Installing service entry for %s", _tmp1_); #line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - g_debug ("WelcomeDialog.vala:132: %s", _tmp4_); + g_debug ("WelcomeDialog.vala:132: %s", _tmp3_); #line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp5_ = self->priv->external_import_entries; + _tmp4_ = self->priv->external_import_entries; #line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp5__length1 = self->priv->external_import_entries_length1; + _tmp4__length1 = self->priv->external_import_entries_length1; #line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp6_ = entry; + _tmp5_ = _g_object_ref0 (entry); #line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp7_ = _g_object_ref0 (_tmp6_); -#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _vala_array_add4 (&self->priv->external_import_entries, &self->priv->external_import_entries_length1, &self->priv->_external_import_entries_size_, _tmp7_); -#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp8_ = entry; + _vala_array_add4 (&self->priv->external_import_entries, &self->priv->external_import_entries_length1, &self->priv->_external_import_entries_size_, _tmp5_); #line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp9_ = welcome_service_entry_get_service_name (_tmp8_); + _tmp6_ = welcome_service_entry_get_service_name (entry); #line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp10_ = _tmp9_; + _tmp7_ = _tmp6_; #line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp11_ = g_strdup_printf (_ ("Import photos from your %s library"), _tmp10_); + _tmp8_ = g_strdup_printf (_ ("Import photos from your %s library"), _tmp7_); #line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp12_ = _tmp11_; + _tmp9_ = _tmp8_; #line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp13_ = (GtkCheckButton*) gtk_check_button_new_with_label (_tmp12_); + _tmp10_ = (GtkCheckButton*) gtk_check_button_new_with_label (_tmp9_); #line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - g_object_ref_sink (_tmp13_); + g_object_ref_sink (_tmp10_); #line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp14_ = _tmp13_; + _tmp11_ = _tmp10_; #line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp9_); #line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp7_); #line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - entry_check = _tmp14_; + entry_check = _tmp11_; #line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp15_ = self->priv->external_import_checks; + _tmp12_ = self->priv->external_import_checks; #line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp15__length1 = self->priv->external_import_checks_length1; + _tmp12__length1 = self->priv->external_import_checks_length1; #line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp16_ = _g_object_ref0 (entry_check); + _tmp13_ = _g_object_ref0 (entry_check); #line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _vala_array_add5 (&self->priv->external_import_checks, &self->priv->external_import_checks_length1, &self->priv->_external_import_checks_size_, _tmp16_); + _vala_array_add5 (&self->priv->external_import_checks, &self->priv->external_import_checks_length1, &self->priv->_external_import_checks_size_, _tmp13_); #line 137 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); #line 138 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp17_ = self->priv->external_import_action_checkbox_packer; + _tmp14_ = self->priv->external_import_action_checkbox_packer; #line 138 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_widget_get_type (), GtkWidget)); #line 139 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" welcome_dialog_install_import_content (self); #line 131 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _g_object_unref0 (entry_check); -#line 868 "WelcomeDialog.c" +#line 903 "WelcomeDialog.c" } @@ -873,72 +908,89 @@ void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEn * for the fact that run()-ning this dialog can interfere with displaying * images from a camera; please see #4997 for details. */ -static void welcome_dialog_on_dismiss (WelcomeDialog* self, gint resp) { - gint _tmp0_; +static void +welcome_dialog_on_dismiss (WelcomeDialog* self, + gint resp) +{ #line 147 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" g_return_if_fail (IS_WELCOME_DIALOG (self)); #line 148 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp0_ = resp; -#line 148 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - if (_tmp0_ == ((gint) GTK_RESPONSE_CLOSE)) { + if (resp == ((gint) GTK_RESPONSE_CLOSE)) { #line 149 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" self->priv->ok_clicked = TRUE; -#line 887 "WelcomeDialog.c" +#line 922 "WelcomeDialog.c" } #line 151 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 152 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" gtk_main_quit (); -#line 893 "WelcomeDialog.c" +#line 928 "WelcomeDialog.c" } -static void _welcome_dialog_on_dismiss_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { +static void +_welcome_dialog_on_dismiss_gtk_dialog_response (GtkDialog* _sender, + gint response_id, + gpointer self) +{ #line 158 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" welcome_dialog_on_dismiss ((WelcomeDialog*) self, response_id); -#line 900 "WelcomeDialog.c" +#line 939 "WelcomeDialog.c" } -static void _vala_array_add6 (WelcomeServiceEntry** * array, int* length, int* size, WelcomeServiceEntry* value) { +static void +_vala_array_add6 (WelcomeServiceEntry** * array, + int* length, + int* size, + WelcomeServiceEntry* value) +{ #line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" if ((*length) == (*size)) { #line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" *size = (*size) ? (2 * (*size)) : 4; #line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" *array = g_renew (WelcomeServiceEntry*, *array, (*size) + 1); -#line 911 "WelcomeDialog.c" +#line 955 "WelcomeDialog.c" } #line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" (*array)[(*length)++] = value; #line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" (*array)[*length] = NULL; -#line 917 "WelcomeDialog.c" +#line 961 "WelcomeDialog.c" } -static WelcomeServiceEntry** _vala_array_dup1 (WelcomeServiceEntry** self, int length) { +static WelcomeServiceEntry** +_vala_array_dup1 (WelcomeServiceEntry** self, + int length) +{ WelcomeServiceEntry** result; int i; #line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" result = g_new0 (WelcomeServiceEntry*, length + 1); #line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" for (i = 0; i < length; i++) { -#line 928 "WelcomeDialog.c" +#line 975 "WelcomeDialog.c" WelcomeServiceEntry* _tmp0_; #line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" result[i] = _tmp0_; -#line 934 "WelcomeDialog.c" +#line 981 "WelcomeDialog.c" } #line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" return result; -#line 938 "WelcomeDialog.c" +#line 985 "WelcomeDialog.c" } -gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** selected_import_entries, int* selected_import_entries_length1, gboolean* do_system_pictures_import) { +gboolean +welcome_dialog_execute (WelcomeDialog* self, + WelcomeServiceEntry*** selected_import_entries, + int* selected_import_entries_length1, + gboolean* do_system_pictures_import) +{ WelcomeServiceEntry** _vala_selected_import_entries = NULL; int _vala_selected_import_entries_length1 = 0; gboolean _vala_do_system_pictures_import = FALSE; @@ -949,15 +1001,15 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel gboolean show_dialog = FALSE; gboolean _tmp2_; WelcomeServiceEntry** _result_ = NULL; - WelcomeServiceEntry** _tmp5_; + WelcomeServiceEntry** _tmp4_; gint _result__length1; gint __result__size_; - WelcomeServiceEntry** _tmp19_; - gint _tmp19__length1; - WelcomeServiceEntry** _tmp20_; - gint _tmp20__length1; - gboolean _tmp21_ = FALSE; - GtkCheckButton* _tmp22_; + WelcomeServiceEntry** _tmp17_; + gint _tmp17__length1; + WelcomeServiceEntry** _tmp18_; + gint _tmp18__length1; + gboolean _tmp19_ = FALSE; + GtkCheckButton* _tmp20_; #line 155 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" g_return_val_if_fail (IS_WELCOME_DIALOG (self), FALSE); #line 158 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" @@ -982,146 +1034,137 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel _tmp2_ = ok; #line 174 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" if (_tmp2_) { -#line 986 "WelcomeDialog.c" +#line 1038 "WelcomeDialog.c" GtkCheckButton* _tmp3_; - gboolean _tmp4_; #line 175 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _tmp3_ = self->priv->hide_button; #line 175 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp4_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 175 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - show_dialog = !_tmp4_; -#line 995 "WelcomeDialog.c" + show_dialog = !gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton)); +#line 1044 "WelcomeDialog.c" } #line 178 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp5_ = g_new0 (WelcomeServiceEntry*, 0 + 1); + _tmp4_ = g_new0 (WelcomeServiceEntry*, 0 + 1); #line 178 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _result_ = _tmp5_; + _result_ = _tmp4_; #line 178 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _result__length1 = 0; #line 178 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" __result__size_ = _result__length1; -#line 1005 "WelcomeDialog.c" +#line 1054 "WelcomeDialog.c" { gint i = 0; #line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" i = 0; -#line 1010 "WelcomeDialog.c" +#line 1059 "WelcomeDialog.c" { - gboolean _tmp6_ = FALSE; + gboolean _tmp5_ = FALSE; #line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp6_ = TRUE; + _tmp5_ = TRUE; #line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" while (TRUE) { -#line 1017 "WelcomeDialog.c" - gint _tmp8_; - WelcomeServiceEntry** _tmp9_; +#line 1066 "WelcomeDialog.c" + gint _tmp7_; + WelcomeServiceEntry** _tmp8_; + gint _tmp8__length1; + GtkCheckButton** _tmp9_; gint _tmp9__length1; - GtkCheckButton** _tmp10_; - gint _tmp10__length1; - gint _tmp11_; - GtkCheckButton* _tmp12_; - gboolean _tmp13_; + gint _tmp10_; + GtkCheckButton* _tmp11_; #line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - if (!_tmp6_) { -#line 1028 "WelcomeDialog.c" - gint _tmp7_; + if (!_tmp5_) { +#line 1076 "WelcomeDialog.c" + gint _tmp6_; #line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp7_ = i; + _tmp6_ = i; #line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - i = _tmp7_ + 1; -#line 1034 "WelcomeDialog.c" + i = _tmp6_ + 1; +#line 1082 "WelcomeDialog.c" } #line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp6_ = FALSE; + _tmp5_ = FALSE; #line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp8_ = i; + _tmp7_ = i; #line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp9_ = self->priv->external_import_entries; + _tmp8_ = self->priv->external_import_entries; #line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp9__length1 = self->priv->external_import_entries_length1; + _tmp8__length1 = self->priv->external_import_entries_length1; #line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - if (!(_tmp8_ < _tmp9__length1)) { + if (!(_tmp7_ < _tmp8__length1)) { #line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" break; -#line 1048 "WelcomeDialog.c" +#line 1096 "WelcomeDialog.c" } #line 180 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp10_ = self->priv->external_import_checks; -#line 180 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp10__length1 = self->priv->external_import_checks_length1; + _tmp9_ = self->priv->external_import_checks; #line 180 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp11_ = i; + _tmp9__length1 = self->priv->external_import_checks_length1; #line 180 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp12_ = _tmp10_[_tmp11_]; + _tmp10_ = i; #line 180 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp13_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_toggle_button_get_type (), GtkToggleButton)); + _tmp11_ = _tmp9_[_tmp10_]; #line 180 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - if (_tmp13_ == TRUE) { -#line 1062 "WelcomeDialog.c" - WelcomeServiceEntry** _tmp14_; - gint _tmp14__length1; - WelcomeServiceEntry** _tmp15_; - gint _tmp15__length1; - gint _tmp16_; - WelcomeServiceEntry* _tmp17_; - WelcomeServiceEntry* _tmp18_; + if (gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_toggle_button_get_type (), GtkToggleButton)) == TRUE) { +#line 1108 "WelcomeDialog.c" + WelcomeServiceEntry** _tmp12_; + gint _tmp12__length1; + WelcomeServiceEntry** _tmp13_; + gint _tmp13__length1; + gint _tmp14_; + WelcomeServiceEntry* _tmp15_; + WelcomeServiceEntry* _tmp16_; #line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp14_ = _result_; + _tmp12_ = _result_; #line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp14__length1 = _result__length1; + _tmp12__length1 = _result__length1; #line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp15_ = self->priv->external_import_entries; + _tmp13_ = self->priv->external_import_entries; #line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp15__length1 = self->priv->external_import_entries_length1; + _tmp13__length1 = self->priv->external_import_entries_length1; #line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp16_ = i; + _tmp14_ = i; #line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp17_ = _tmp15_[_tmp16_]; + _tmp15_ = _tmp13_[_tmp14_]; #line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp18_ = _g_object_ref0 (_tmp17_); + _tmp16_ = _g_object_ref0 (_tmp15_); #line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _vala_array_add6 (&_result_, &_result__length1, &__result__size_, _tmp18_); -#line 1086 "WelcomeDialog.c" + _vala_array_add6 (&_result_, &_result__length1, &__result__size_, _tmp16_); +#line 1132 "WelcomeDialog.c" } } } } #line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp19_ = _result_; + _tmp17_ = _result_; #line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp19__length1 = _result__length1; + _tmp17__length1 = _result__length1; #line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp20_ = (_tmp19_ != NULL) ? _vala_array_dup1 (_tmp19_, _tmp19__length1) : ((gpointer) _tmp19_); + _tmp18_ = (_tmp17_ != NULL) ? _vala_array_dup1 (_tmp17_, _tmp17__length1) : ((gpointer) _tmp17_); #line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp20__length1 = _tmp19__length1; + _tmp18__length1 = _tmp17__length1; #line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _vala_selected_import_entries = (_vala_array_free (_vala_selected_import_entries, _vala_selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL); #line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _vala_selected_import_entries = _tmp20_; + _vala_selected_import_entries = _tmp18_; #line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _vala_selected_import_entries_length1 = _tmp20__length1; -#line 185 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp22_ = self->priv->system_pictures_import_check; + _vala_selected_import_entries_length1 = _tmp18__length1; #line 185 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - if (_tmp22_ != NULL) { -#line 1109 "WelcomeDialog.c" - GtkCheckButton* _tmp23_; - gboolean _tmp24_; + _tmp20_ = self->priv->system_pictures_import_check; #line 185 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp23_ = self->priv->system_pictures_import_check; + if (_tmp20_ != NULL) { +#line 1155 "WelcomeDialog.c" + GtkCheckButton* _tmp21_; #line 185 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp24_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_toggle_button_get_type (), GtkToggleButton)); + _tmp21_ = self->priv->system_pictures_import_check; #line 185 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp21_ = _tmp24_; -#line 1118 "WelcomeDialog.c" + _tmp19_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_toggle_button_get_type (), GtkToggleButton)); +#line 1161 "WelcomeDialog.c" } else { #line 185 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp21_ = FALSE; -#line 1122 "WelcomeDialog.c" + _tmp19_ = FALSE; +#line 1165 "WelcomeDialog.c" } #line 184 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _vala_do_system_pictures_import = _tmp21_; + _vala_do_system_pictures_import = _tmp19_; #line 187 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" @@ -1132,39 +1175,39 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel if (selected_import_entries) { #line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" *selected_import_entries = _vala_selected_import_entries; -#line 1136 "WelcomeDialog.c" +#line 1179 "WelcomeDialog.c" } else { #line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _vala_selected_import_entries = (_vala_array_free (_vala_selected_import_entries, _vala_selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL); -#line 1140 "WelcomeDialog.c" +#line 1183 "WelcomeDialog.c" } #line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" if (selected_import_entries_length1) { #line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" *selected_import_entries_length1 = _vala_selected_import_entries_length1; -#line 1146 "WelcomeDialog.c" +#line 1189 "WelcomeDialog.c" } #line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" if (do_system_pictures_import) { #line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" *do_system_pictures_import = _vala_do_system_pictures_import; -#line 1152 "WelcomeDialog.c" +#line 1195 "WelcomeDialog.c" } #line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" return result; -#line 1156 "WelcomeDialog.c" +#line 1199 "WelcomeDialog.c" } -static gboolean welcome_dialog_is_system_pictures_import_possible (void) { +static gboolean +welcome_dialog_is_system_pictures_import_possible (void) +{ gboolean result = FALSE; GFile* system_pictures = NULL; GFile* _tmp0_; GFile* _tmp1_; - gboolean _tmp2_; - GFile* _tmp3_; - GFileType _tmp4_; - gboolean _tmp10_ = FALSE; + GFile* _tmp2_; + gboolean _tmp8_ = FALSE; GError * _inner_error_ = NULL; #line 193 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _tmp0_ = app_dirs_get_import_dir (); @@ -1173,73 +1216,69 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) { #line 194 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _tmp1_ = system_pictures; #line 194 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp2_ = g_file_query_exists (_tmp1_, NULL); -#line 194 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - if (!_tmp2_) { + if (!g_file_query_exists (_tmp1_, NULL)) { #line 195 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" result = FALSE; #line 195 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _g_object_unref0 (system_pictures); #line 195 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" return result; -#line 1186 "WelcomeDialog.c" +#line 1227 "WelcomeDialog.c" } #line 197 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp3_ = system_pictures; -#line 197 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp4_ = g_file_query_file_type (_tmp3_, G_FILE_QUERY_INFO_NONE, NULL); + _tmp2_ = system_pictures; #line 197 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - if (!(_tmp4_ == G_FILE_TYPE_DIRECTORY)) { + if (!(g_file_query_file_type (_tmp2_, G_FILE_QUERY_INFO_NONE, NULL) == G_FILE_TYPE_DIRECTORY)) { #line 198 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" result = FALSE; #line 198 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _g_object_unref0 (system_pictures); #line 198 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" return result; -#line 1200 "WelcomeDialog.c" +#line 1239 "WelcomeDialog.c" } { GFileEnumerator* syspics_child_enum = NULL; - GFile* _tmp5_; + GFile* _tmp3_; + GFileEnumerator* _tmp4_; + GFileInfo* _tmp5_ = NULL; GFileEnumerator* _tmp6_; - GFileInfo* _tmp7_ = NULL; - GFileEnumerator* _tmp8_; - GFileInfo* _tmp9_; + GFileInfo* _tmp7_; #line 201 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp5_ = system_pictures; + _tmp3_ = system_pictures; #line 201 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp6_ = g_file_enumerate_children (_tmp5_, "standard::*", G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); + _tmp4_ = g_file_enumerate_children (_tmp3_, "standard::*", G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); #line 201 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - syspics_child_enum = _tmp6_; + syspics_child_enum = _tmp4_; #line 201 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1217 "WelcomeDialog.c" +#line 1256 "WelcomeDialog.c" goto __catch24_g_error; } #line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp8_ = syspics_child_enum; + _tmp6_ = syspics_child_enum; #line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp9_ = g_file_enumerator_next_file (_tmp8_, NULL, &_inner_error_); + _tmp7_ = g_file_enumerator_next_file (_tmp6_, NULL, &_inner_error_); #line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _tmp7_ = _tmp9_; + _tmp5_ = _tmp7_; #line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _g_object_unref0 (syspics_child_enum); -#line 1230 "WelcomeDialog.c" +#line 1269 "WelcomeDialog.c" goto __catch24_g_error; } #line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - result = _tmp7_ != NULL; + result = _tmp5_ != NULL; #line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp5_); #line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _g_object_unref0 (syspics_child_enum); #line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" _g_object_unref0 (system_pictures); #line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" return result; -#line 1243 "WelcomeDialog.c" +#line 1282 "WelcomeDialog.c" } goto __finally24; __catch24_g_error: @@ -1257,7 +1296,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) { _g_object_unref0 (system_pictures); #line 205 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" return result; -#line 1261 "WelcomeDialog.c" +#line 1300 "WelcomeDialog.c" } __finally24: #line 200 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" @@ -1267,23 +1306,27 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) { #line 200 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" g_clear_error (&_inner_error_); #line 200 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" - return _tmp10_; -#line 1272 "WelcomeDialog.c" + return _tmp8_; +#line 1311 "WelcomeDialog.c" } -static void welcome_dialog_class_init (WelcomeDialogClass * klass) { +static void +welcome_dialog_class_init (WelcomeDialogClass * klass) +{ #line 14 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" welcome_dialog_parent_class = g_type_class_peek_parent (klass); #line 14 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" g_type_class_add_private (klass, sizeof (WelcomeDialogPrivate)); #line 14 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" G_OBJECT_CLASS (klass)->finalize = welcome_dialog_finalize; -#line 1283 "WelcomeDialog.c" +#line 1324 "WelcomeDialog.c" } -static void welcome_dialog_instance_init (WelcomeDialog * self) { +static void +welcome_dialog_instance_init (WelcomeDialog * self) +{ GtkCheckButton** _tmp0_; WelcomeServiceEntry** _tmp1_; #line 14 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" @@ -1310,11 +1353,13 @@ static void welcome_dialog_instance_init (WelcomeDialog * self) { self->priv->import_content_already_installed = FALSE; #line 26 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" self->priv->ok_clicked = FALSE; -#line 1314 "WelcomeDialog.c" +#line 1357 "WelcomeDialog.c" } -static void welcome_dialog_finalize (GObject * obj) { +static void +welcome_dialog_finalize (GObject * obj) +{ WelcomeDialog * self; #line 14 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_WELCOME_DIALOG, WelcomeDialog); @@ -1340,11 +1385,13 @@ static void welcome_dialog_finalize (GObject * obj) { _g_object_unref0 (self->priv->import_meta_host); #line 14 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala" G_OBJECT_CLASS (welcome_dialog_parent_class)->finalize (obj); -#line 1344 "WelcomeDialog.c" +#line 1389 "WelcomeDialog.c" } -GType welcome_dialog_get_type (void) { +GType +welcome_dialog_get_type (void) +{ static volatile gsize welcome_dialog_type_id__volatile = 0; if (g_once_init_enter (&welcome_dialog_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (WelcomeDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) welcome_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (WelcomeDialog), 0, (GInstanceInitFunc) welcome_dialog_instance_init, NULL }; @@ -1356,7 +1403,11 @@ GType welcome_dialog_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -1368,7 +1419,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/direct/Direct.c b/src/direct/Direct.c index 36ab376..48e5fab 100644 --- a/src/direct/Direct.c +++ b/src/direct/Direct.c @@ -1,4 +1,4 @@ -/* Direct.c generated by valac 0.36.6, the Vala compiler +/* Direct.c generated by valac 0.40.4, the Vala compiler * generated from Direct.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -15,6 +15,7 @@ * the preconfigure() method, implement it, and ensure in init() that it's been called. */ + #include #include #include @@ -36,31 +37,34 @@ void direct_terminate (void); void direct_photo_terminate (void); -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 21 "/home/jens/Source/shotwell/src/direct/Direct.vala" return self ? g_object_ref (self) : NULL; -#line 43 "Direct.c" +#line 46 "Direct.c" } -void direct_preconfigure (GFile* initial_file) { +void +direct_preconfigure (GFile* initial_file) +{ GFile* _tmp0_; - GFile* _tmp1_; #line 20 "/home/jens/Source/shotwell/src/direct/Direct.vala" g_return_if_fail (G_IS_FILE (initial_file)); #line 21 "/home/jens/Source/shotwell/src/direct/Direct.vala" - _tmp0_ = initial_file; -#line 21 "/home/jens/Source/shotwell/src/direct/Direct.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (initial_file); #line 21 "/home/jens/Source/shotwell/src/direct/Direct.vala" _g_object_unref0 (direct_initial_file); #line 21 "/home/jens/Source/shotwell/src/direct/Direct.vala" - direct_initial_file = _tmp1_; -#line 60 "Direct.c" + direct_initial_file = _tmp0_; +#line 62 "Direct.c" } -void direct_init (GError** error) { +void +direct_init (GError** error) +{ GFile* _tmp0_; GFile* _tmp1_; #line 25 "/home/jens/Source/shotwell/src/direct/Direct.vala" @@ -71,14 +75,16 @@ void direct_init (GError** error) { _tmp1_ = direct_initial_file; #line 27 "/home/jens/Source/shotwell/src/direct/Direct.vala" direct_photo_init (_tmp1_); -#line 75 "Direct.c" +#line 79 "Direct.c" } -void direct_terminate (void) { +void +direct_terminate (void) +{ #line 31 "/home/jens/Source/shotwell/src/direct/Direct.vala" direct_photo_terminate (); -#line 82 "Direct.c" +#line 88 "Direct.c" } diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c index 0a51b29..42b8670 100644 --- a/src/direct/DirectPhoto.c +++ b/src/direct/DirectPhoto.c @@ -1,4 +1,4 @@ -/* DirectPhoto.c generated by valac 0.36.6, the Vala compiler +/* DirectPhoto.c generated by valac 0.40.4, the Vala compiler * generated from DirectPhoto.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -232,6 +233,11 @@ typedef struct _BackingPhotoRowClass BackingPhotoRowClass; typedef struct _DirectPhoto DirectPhoto; typedef struct _DirectPhotoClass DirectPhotoClass; typedef struct _DirectPhotoPrivate DirectPhotoPrivate; +enum { + DIRECT_PHOTO_0_PROPERTY, + DIRECT_PHOTO_NUM_PROPERTIES +}; +static GParamSpec* direct_photo_properties[DIRECT_PHOTO_NUM_PROPERTIES]; #define TYPE_DATABASE_SOURCE_COLLECTION (database_source_collection_get_type ()) #define DATABASE_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection)) @@ -342,9 +348,9 @@ typedef struct _PhotoPreviewClass PhotoPreviewClass; #define _media_metadata_unref0(var) ((var == NULL) ? NULL : (var = (media_metadata_unref (var), NULL))) enum { DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL, - DIRECT_PHOTO_LAST_SIGNAL + DIRECT_PHOTO_NUM_SIGNALS }; -static guint direct_photo_signals[DIRECT_PHOTO_LAST_SIGNAL] = {0}; +static guint direct_photo_signals[DIRECT_PHOTO_NUM_SIGNALS] = {0}; typedef struct _DataCollectionPrivate DataCollectionPrivate; #define TYPE_MARKER (marker_get_type ()) @@ -860,32 +866,56 @@ static gpointer direct_photo_source_collection_parent_class = NULL; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; gpointer source_snapshot_ref (gpointer instance); void source_snapshot_unref (gpointer instance); -GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_snapshot (GValue* value, gpointer v_object); -void value_take_source_snapshot (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_snapshot (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_snapshot (GValue* value, + gpointer v_object); +void value_take_source_snapshot (GValue* value, + gpointer v_object); gpointer value_get_source_snapshot (const GValue* value); GType source_snapshot_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; @@ -897,9 +927,15 @@ EventID* event_id_dup (const EventID* self); void event_id_free (EventID* self); gpointer backing_file_state_ref (gpointer instance); void backing_file_state_unref (gpointer instance); -GParamSpec* param_spec_backing_file_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_file_state (GValue* value, gpointer v_object); -void value_take_backing_file_state (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_file_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_file_state (GValue* value, + gpointer v_object); +void value_take_backing_file_state (GValue* value, + gpointer v_object); gpointer value_get_backing_file_state (const GValue* value); GType backing_file_state_get_type (void) G_GNUC_CONST; GType rating_get_type (void) G_GNUC_CONST; @@ -917,9 +953,15 @@ void import_id_free (ImportID* self); GType photo_source_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -928,31 +970,43 @@ GType photo_get_type (void) G_GNUC_CONST; GType rotation_get_type (void) G_GNUC_CONST; gpointer photo_row_ref (gpointer instance); void photo_row_unref (gpointer instance); -GParamSpec* param_spec_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_row (GValue* value, gpointer v_object); -void value_take_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_row (GValue* value, + gpointer v_object); +void value_take_photo_row (GValue* value, + gpointer v_object); gpointer value_get_photo_row (const GValue* value); GType photo_row_get_type (void) G_GNUC_CONST; gpointer backing_photo_row_ref (gpointer instance); void backing_photo_row_unref (gpointer instance); -GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_photo_row (GValue* value, gpointer v_object); -void value_take_backing_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_photo_row (GValue* value, + gpointer v_object); +void value_take_backing_photo_row (GValue* value, + gpointer v_object); gpointer value_get_backing_photo_row (const GValue* value); GType backing_photo_row_get_type (void) G_GNUC_CONST; GType direct_photo_get_type (void) G_GNUC_CONST; #define DIRECT_PHOTO_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DIRECT_PHOTO, DirectPhotoPrivate)) -enum { - DIRECT_PHOTO_DUMMY_PROPERTY -}; GType database_source_collection_get_type (void) G_GNUC_CONST; GType direct_photo_source_collection_get_type (void) G_GNUC_CONST; #define DIRECT_PHOTO_PREVIEW_BEST_FIT 360 static DirectPhoto* direct_photo_new (PhotoRow* row); -static DirectPhoto* direct_photo_construct (GType object_type, PhotoRow* row); -Photo* photo_construct (GType object_type, PhotoRow* row); +static DirectPhoto* direct_photo_construct (GType object_type, + PhotoRow* row); +Photo* photo_construct (GType object_type, + PhotoRow* row); GType orientation_get_type (void) G_GNUC_CONST; -void direct_photo_fixup_orientation_after_reimport (DirectPhoto* self, Orientation dest); +void direct_photo_fixup_orientation_after_reimport (DirectPhoto* self, + Orientation dest); GType photo_id_get_type (void) G_GNUC_CONST; PhotoID* photo_id_dup (const PhotoID* self); void photo_id_free (PhotoID* self); @@ -963,85 +1017,157 @@ GType raw_developer_get_type (void) G_GNUC_CONST; void direct_photo_init (GFile* initial_file); void photo_init_photo (void); DirectPhotoSourceCollection* direct_photo_source_collection_new (GFile* initial_file); -DirectPhotoSourceCollection* direct_photo_source_collection_construct (GType object_type, GFile* initial_file); -gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto* * photo, gboolean reimport); -gboolean data_collection_add (DataCollection* self, DataObject* object); +DirectPhotoSourceCollection* direct_photo_source_collection_construct (GType object_type, + GFile* initial_file); +gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, + GFile* file, + DirectPhoto* * photo, + gboolean reimport); +gboolean data_collection_add (DataCollection* self, + DataObject* object); void direct_photo_terminate (void); void photo_terminate_photo (void); static void direct_photo_save_dims (DirectPhoto* self); GType backing_fetch_mode_get_type (void) G_GNUC_CONST; -GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error); +GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, + Scaling* scaling, + PhotoException exceptions, + BackingFetchMode fetch_mode, + GError** error); void scaling_for_original (Scaling* result); -void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result); +void dimensions_for_pixbuf (GdkPixbuf* pixbuf, + Dimensions* result); gchar* data_object_to_string (DataObject* self); GType import_result_get_type (void) G_GNUC_CONST; ImportResult direct_photo_demand_load (DirectPhoto* self); gpointer photo_reimport_master_state_ref (gpointer instance); void photo_reimport_master_state_unref (gpointer instance); -GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void photo_value_set_reimport_master_state (GValue* value, gpointer v_object); -void photo_value_take_reimport_master_state (GValue* value, gpointer v_object); +GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void photo_value_set_reimport_master_state (GValue* value, + gpointer v_object); +void photo_value_take_reimport_master_state (GValue* value, + gpointer v_object); gpointer photo_value_get_reimport_master_state (const GValue* value); GType photo_reimport_master_state_get_type (void) G_GNUC_CONST; -gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState* * reimport_state, GError** error); +gboolean photo_prepare_for_reimport_master (Photo* self, + PhotoReimportMasterState* * reimport_state, + GError** error); GQuark database_error_quark (void); -void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, GError** error); -ImportResult direct_photo_internal_import (GFile* file, DirectPhoto* * photo); +void photo_finish_reimport_master (Photo* self, + PhotoReimportMasterState* state, + GError** error); +ImportResult direct_photo_internal_import (GFile* file, + DirectPhoto* * photo); gpointer photo_import_params_ref (gpointer instance); void photo_import_params_unref (gpointer instance); -GParamSpec* param_spec_photo_import_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_import_params (GValue* value, gpointer v_object); -void value_take_photo_import_params (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_import_params (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_import_params (GValue* value, + gpointer v_object); +void value_take_photo_import_params (GValue* value, + gpointer v_object); gpointer value_get_photo_import_params (const GValue* value); GType photo_import_params_get_type (void) G_GNUC_CONST; void import_id_generate (ImportID* result); -PhotoImportParams* photo_import_params_new_create_placeholder (GFile* file, ImportID* import_id); -PhotoImportParams* photo_import_params_construct_create_placeholder (GType object_type, GFile* file, ImportID* import_id); +PhotoImportParams* photo_import_params_new_create_placeholder (GFile* file, + ImportID* import_id); +PhotoImportParams* photo_import_params_construct_create_placeholder (GType object_type, + GFile* file, + ImportID* import_id); void photo_create_pre_import (PhotoImportParams* params); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType photo_table_get_type (void) G_GNUC_CONST; PhotoTable* photo_table_get_instance (void); -void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result); +void photo_table_add (PhotoTable* self, + PhotoRow* photo_row, + PhotoID* result); GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; gpointer thumbnails_ref (gpointer instance); void thumbnails_unref (gpointer instance); -GParamSpec* param_spec_thumbnails (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_thumbnails (GValue* value, gpointer v_object); -void value_take_thumbnails (GValue* value, gpointer v_object); +GParamSpec* param_spec_thumbnails (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_thumbnails (GValue* value, + gpointer v_object); +void value_take_thumbnails (GValue* value, + gpointer v_object); gpointer value_get_thumbnails (const GValue* value); GType thumbnails_get_type (void) G_GNUC_CONST; -static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scaling* scaling, GError** error); -GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GError** error); -GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error); -GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInterpType interp, gboolean scale_up); -static void direct_photo_real_rotate (Photo* base, Rotation rotation); -void photo_rotate (Photo* self, Rotation rotation); -static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GError** error); -static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error); +static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, + Scaling* scaling, + GError** error); +GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); +GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, + Scaling* scaling, + GError** error); +GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, + GdkPixbuf* pixbuf, + GdkInterpType interp, + gboolean scale_up); +static void direct_photo_real_rotate (Photo* base, + Rotation rotation); +void photo_rotate (Photo* self, + Rotation rotation); +static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, + Scaling* scaling, + GError** error); +static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, + gint scale, + GError** error); PhotoMetadata* photo_source_get_metadata (PhotoSource* self); guint photo_metadata_get_preview_count (PhotoMetadata* self); gpointer photo_preview_ref (gpointer instance); void photo_preview_unref (gpointer instance); -GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_preview (GValue* value, gpointer v_object); -void value_take_photo_preview (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_preview (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_preview (GValue* value, + gpointer v_object); +void value_take_photo_preview (GValue* value, + gpointer v_object); gpointer value_get_photo_preview (const GValue* value); GType photo_preview_get_type (void) G_GNUC_CONST; -PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number); -GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error); +PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, + guint number); +GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, + GError** error); Orientation photo_get_orientation (Photo* self); -GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf); -static void direct_photo_real_notify_altered (DataObject* base, Alteration* alteration); -void data_object_notify_altered (DataObject* self, Alteration* alteration); +GdkPixbuf* orientation_rotate_pixbuf (Orientation self, + GdkPixbuf* pixbuf); +static void direct_photo_real_notify_altered (DataObject* base, + Alteration* alteration); +void data_object_notify_altered (DataObject* self, + Alteration* alteration); static gboolean direct_photo_real_has_user_generated_metadata (Photo* base); -static void direct_photo_real_set_user_metadata_for_export (Photo* base, PhotoMetadata* metadata); -static void direct_photo_real_apply_user_metadata_for_reimport (Photo* base, PhotoMetadata* metadata); +static void direct_photo_real_set_user_metadata_for_export (Photo* base, + PhotoMetadata* metadata); +static void direct_photo_real_apply_user_metadata_for_reimport (Photo* base, + PhotoMetadata* metadata); static gboolean direct_photo_real_is_trashed (MediaSource* base); static gboolean direct_photo_real_is_offline (MediaSource* base); static void direct_photo_real_trash (MediaSource* base); @@ -1052,72 +1178,110 @@ static void direct_photo_finalize (GObject * obj); GType marker_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; GType directory_monitor_get_type (void) G_GNUC_CONST; #define DIRECT_PHOTO_SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollectionPrivate)) -enum { - DIRECT_PHOTO_SOURCE_COLLECTION_DUMMY_PROPERTY -}; guint file_hash (GFile* file); -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self); -gboolean file_equal (GFile* a, GFile* b); -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); +static guint _file_hash_gee_hash_data_func (gconstpointer v, + gpointer self); +gboolean file_equal (GFile* a, + GFile* b); +static gboolean _file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); #define DIRECT_PHOTO_SOURCE_COLLECTION_DISCOVERED_FILES_BATCH_ADD 500 static gint64 direct_photo_source_collection_get_direct_key (DataSource* source); -static gint64 _direct_photo_source_collection_get_direct_key_get_source_database_key (DataSource* source, gpointer self); -DatabaseSourceCollection* database_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target); -DirectoryMonitor* directory_monitor_new (GFile* root, gboolean recurse, gboolean monitoring); -DirectoryMonitor* directory_monitor_construct (GType object_type, GFile* root, gboolean recurse, gboolean monitoring); -static void direct_photo_source_collection_on_file_discovered (DirectPhotoSourceCollection* self, GFile* file, GFileInfo* info); -static void _direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered (DirectoryMonitor* _sender, GFile* file, GFileInfo* info, gpointer self); +static gint64 _direct_photo_source_collection_get_direct_key_get_source_database_key (DataSource* source, + gpointer self); +DatabaseSourceCollection* database_source_collection_construct (GType object_type, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target); +DirectoryMonitor* directory_monitor_new (GFile* root, + gboolean recurse, + gboolean monitoring); +DirectoryMonitor* directory_monitor_construct (GType object_type, + GFile* root, + gboolean recurse, + gboolean monitoring); +static void direct_photo_source_collection_on_file_discovered (DirectPhotoSourceCollection* self, + GFile* file, + GFileInfo* info); +static void _direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered (DirectoryMonitor* _sender, + GFile* file, + GFileInfo* info, + gpointer self); static void direct_photo_source_collection_on_discovery_completed (DirectPhotoSourceCollection* self); -static void _direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self); +static void _direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, + gpointer self); void directory_monitor_start_discovery (DirectoryMonitor* self); -static gboolean direct_photo_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source); -void photo_get_photo_id (Photo* self, PhotoID* result); -static void direct_photo_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added); +static gboolean direct_photo_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source); +void photo_get_photo_id (Photo* self, + PhotoID* result); +static void direct_photo_source_collection_real_notify_items_added (DataCollection* base, + GeeIterable* added); GFile* media_source_get_file (MediaSource* self); -void data_collection_notify_items_added (DataCollection* self, GeeIterable* added); -static void direct_photo_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed); -void data_collection_notify_items_removed (DataCollection* self, GeeIterable* removed); -gboolean direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCollection* self, GFile* file); +void data_collection_notify_items_added (DataCollection* self, + GeeIterable* added); +static void direct_photo_source_collection_real_notify_items_removed (DataCollection* base, + GeeIterable* removed); +void data_collection_notify_items_removed (DataCollection* self, + GeeIterable* removed); +gboolean direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCollection* self, + GFile* file); gboolean photo_file_format_is_file_supported (GFile* file); static void direct_photo_source_collection_flush_prepared_photos (DirectPhotoSourceCollection* self); -GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); -gboolean direct_photo_source_collection_has_file (DirectPhotoSourceCollection* self, GFile* file); -void direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection* self, DirectPhoto* photo); +GeeCollection* data_collection_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); +gboolean direct_photo_source_collection_has_file (DirectPhotoSourceCollection* self, + GFile* file); +void direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection* self, + DirectPhoto* photo); void photo_discard_prefetched (Photo* self); gboolean photo_only_metadata_changed (Photo* self); PhotoFileFormat photo_get_file_format (Photo* self); gchar* import_result_to_string (ImportResult self); -gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollection* self, GFile* file); -DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self, GFile* file); +gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollection* self, + GFile* file); +DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self, + GFile* file); static void direct_photo_source_collection_finalize (DataCollection * obj); -static DirectPhoto* direct_photo_construct (GType object_type, PhotoRow* row) { +static DirectPhoto* +direct_photo_construct (GType object_type, + PhotoRow* row) +{ DirectPhoto * self = NULL; - PhotoRow* _tmp0_; #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_PHOTO_ROW (row), NULL); #line 18 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = row; -#line 18 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - self = (DirectPhoto*) photo_construct (object_type, _tmp0_); + self = (DirectPhoto*) photo_construct (object_type, row); #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return self; -#line 1114 "DirectPhoto.c" +#line 1276 "DirectPhoto.c" } -static DirectPhoto* direct_photo_new (PhotoRow* row) { +static DirectPhoto* +direct_photo_new (PhotoRow* row) +{ #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return direct_photo_construct (TYPE_DIRECT_PHOTO, row); -#line 1121 "DirectPhoto.c" +#line 1285 "DirectPhoto.c" } @@ -1135,103 +1299,100 @@ static DirectPhoto* direct_photo_new (PhotoRow* row) { * @param dest The orientation to set the photo to; usually, this should be a value * obtained by calling get_orientation() prior to export()ing a DirectPhoto. */ -void direct_photo_fixup_orientation_after_reimport (DirectPhoto* self, Orientation dest) { +void +direct_photo_fixup_orientation_after_reimport (DirectPhoto* self, + Orientation dest) +{ PhotoRow* _tmp0_; - Orientation _tmp1_; - BackingPhotoRow* _tmp2_; - Orientation _tmp3_; + BackingPhotoRow* _tmp1_; #line 35 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_DIRECT_PHOTO (self)); #line 36 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->row; #line 36 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = dest; -#line 36 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_->orientation = _tmp1_; -#line 37 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->backing_photo_row; + _tmp0_->orientation = dest; #line 37 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp3_ = dest; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->backing_photo_row; #line 37 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_->original_orientation = _tmp3_; -#line 1158 "DirectPhoto.c" + _tmp1_->original_orientation = dest; +#line 1319 "DirectPhoto.c" } -void direct_photo_init (GFile* initial_file) { - GFile* _tmp0_; - DirectPhotoSourceCollection* _tmp1_; +void +direct_photo_init (GFile* initial_file) +{ + DirectPhotoSourceCollection* _tmp0_; DirectPhoto* photo = NULL; gchar* reason = NULL; - DirectPhotoSourceCollection* _tmp2_; - GFile* _tmp3_; - DirectPhoto* _tmp4_ = NULL; - gchar* _tmp5_; - const gchar* _tmp6_; - DirectPhotoSourceCollection* _tmp8_; - DirectPhoto* _tmp9_; + DirectPhotoSourceCollection* _tmp1_; + DirectPhoto* _tmp2_ = NULL; + gchar* _tmp3_; + const gchar* _tmp4_; + DirectPhotoSourceCollection* _tmp6_; + DirectPhoto* _tmp7_; #line 40 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (G_IS_FILE (initial_file)); #line 41 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" photo_init_photo (); #line 43 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = initial_file; -#line 43 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = direct_photo_source_collection_new (_tmp0_); + _tmp0_ = direct_photo_source_collection_new (initial_file); #line 43 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _data_collection_unref0 (direct_photo_global); #line 43 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - direct_photo_global = _tmp1_; -#line 45 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = direct_photo_global; + direct_photo_global = _tmp0_; #line 45 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp3_ = initial_file; + _tmp1_ = direct_photo_global; #line 45 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp5_ = direct_photo_source_collection_fetch (_tmp2_, _tmp3_, &_tmp4_, FALSE); + _tmp3_ = direct_photo_source_collection_fetch (_tmp1_, initial_file, &_tmp2_, FALSE); #line 45 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (photo); #line 45 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - photo = _tmp4_; + photo = _tmp2_; #line 45 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - reason = _tmp5_; + reason = _tmp3_; #line 46 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp6_ = reason; + _tmp4_ = reason; #line 46 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp6_ != NULL) { -#line 1202 "DirectPhoto.c" - const gchar* _tmp7_; + if (_tmp4_ != NULL) { +#line 1359 "DirectPhoto.c" + const gchar* _tmp5_; #line 47 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp7_ = reason; + _tmp5_ = reason; #line 47 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - g_warning ("DirectPhoto.vala:47: fetch error: %s", _tmp7_); -#line 1208 "DirectPhoto.c" + g_warning ("DirectPhoto.vala:47: fetch error: %s", _tmp5_); +#line 1365 "DirectPhoto.c" } #line 48 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp8_ = direct_photo_global; + _tmp6_ = direct_photo_global; #line 48 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp9_ = photo; + _tmp7_ = photo; #line 48 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject)); #line 40 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_free0 (reason); #line 40 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (photo); -#line 1220 "DirectPhoto.c" +#line 1377 "DirectPhoto.c" } -void direct_photo_terminate (void) { +void +direct_photo_terminate (void) +{ #line 52 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" photo_terminate_photo (); -#line 1227 "DirectPhoto.c" +#line 1386 "DirectPhoto.c" } -static void direct_photo_save_dims (DirectPhoto* self) { +static void +direct_photo_save_dims (DirectPhoto* self) +{ GError * _inner_error_ = NULL; #line 57 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_DIRECT_PHOTO (self)); -#line 1235 "DirectPhoto.c" +#line 1396 "DirectPhoto.c" { GdkPixbuf* _tmp0_ = NULL; Scaling _tmp1_ = {0}; @@ -1246,7 +1407,7 @@ static void direct_photo_save_dims (DirectPhoto* self) { _tmp0_ = _tmp2_; #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1250 "DirectPhoto.c" +#line 1411 "DirectPhoto.c" goto __catch49_g_error; } #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1257,7 +1418,7 @@ static void direct_photo_save_dims (DirectPhoto* self) { _tmp3_->dim = _tmp4_; #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_tmp0_); -#line 1261 "DirectPhoto.c" +#line 1422 "DirectPhoto.c" } goto __finally49; __catch49_g_error: @@ -1279,7 +1440,7 @@ static void direct_photo_save_dims (DirectPhoto* self) { _g_free0 (_tmp6_); #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_error_free0 (e); -#line 1283 "DirectPhoto.c" +#line 1444 "DirectPhoto.c" } __finally49: #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1290,12 +1451,14 @@ static void direct_photo_save_dims (DirectPhoto* self) { g_clear_error (&_inner_error_); #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return; -#line 1294 "DirectPhoto.c" +#line 1455 "DirectPhoto.c" } } -ImportResult direct_photo_demand_load (DirectPhoto* self) { +ImportResult +direct_photo_demand_load (DirectPhoto* self) +{ ImportResult result = 0; gboolean _tmp0_; PhotoReimportMasterState* reimport_state = NULL; @@ -1312,7 +1475,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { result = IMPORT_RESULT_SUCCESS; #line 70 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1316 "DirectPhoto.c" +#line 1479 "DirectPhoto.c" } { PhotoReimportMasterState* _tmp1_ = NULL; @@ -1325,7 +1488,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { reimport_state = _tmp1_; #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1329 "DirectPhoto.c" +#line 1492 "DirectPhoto.c" goto __catch50_g_error; } #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1334,7 +1497,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { photo_finish_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp2_, &_inner_error_); #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1338 "DirectPhoto.c" +#line 1501 "DirectPhoto.c" goto __catch50_g_error; } } @@ -1362,7 +1525,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { _photo_reimport_master_state_unref0 (reimport_state); #line 79 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1366 "DirectPhoto.c" +#line 1529 "DirectPhoto.c" } __finally50: #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1375,7 +1538,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { g_clear_error (&_inner_error_); #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return 0; -#line 1379 "DirectPhoto.c" +#line 1542 "DirectPhoto.c" } #line 82 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv->loaded = TRUE; @@ -1387,53 +1550,53 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { _photo_reimport_master_state_unref0 (reimport_state); #line 84 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1391 "DirectPhoto.c" +#line 1554 "DirectPhoto.c" } -ImportResult direct_photo_internal_import (GFile* file, DirectPhoto* * photo) { +ImportResult +direct_photo_internal_import (GFile* file, + DirectPhoto* * photo) +{ DirectPhoto* _vala_photo = NULL; ImportResult result = 0; PhotoImportParams* params = NULL; - GFile* _tmp0_; - ImportID _tmp1_ = {0}; - PhotoImportParams* _tmp2_; + ImportID _tmp0_ = {0}; + PhotoImportParams* _tmp1_; + PhotoTable* _tmp2_; PhotoTable* _tmp3_; - PhotoTable* _tmp4_; - PhotoRow* _tmp5_; - PhotoID _tmp6_ = {0}; - PhotoRow* _tmp7_; - DirectPhoto* _tmp8_; + PhotoRow* _tmp4_; + PhotoID _tmp5_ = {0}; + PhotoRow* _tmp6_; + DirectPhoto* _tmp7_; #line 89 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (G_IS_FILE (file), 0); #line 90 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = file; -#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - import_id_generate (&_tmp1_); + import_id_generate (&_tmp0_); #line 90 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = photo_import_params_new_create_placeholder (_tmp0_, &_tmp1_); + _tmp1_ = photo_import_params_new_create_placeholder (file, &_tmp0_); #line 90 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - params = _tmp2_; + params = _tmp1_; #line 91 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" photo_create_pre_import (params); #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp3_ = photo_table_get_instance (); + _tmp2_ = photo_table_get_instance (); #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp5_ = params->row; + _tmp4_ = params->row; #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - photo_table_add (_tmp4_, _tmp5_, &_tmp6_); + photo_table_add (_tmp3_, _tmp4_, &_tmp5_); #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _database_table_unref0 (_tmp4_); + _database_table_unref0 (_tmp3_); #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp7_ = params->row; + _tmp6_ = params->row; #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp8_ = direct_photo_new (_tmp7_); + _tmp7_ = direct_photo_new (_tmp6_); #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_vala_photo); #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _vala_photo = _tmp8_; + _vala_photo = _tmp7_; #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" result = IMPORT_RESULT_SUCCESS; #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1442,19 +1605,23 @@ ImportResult direct_photo_internal_import (GFile* file, DirectPhoto* * photo) { if (photo) { #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" *photo = _vala_photo; -#line 1446 "DirectPhoto.c" +#line 1609 "DirectPhoto.c" } else { #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_vala_photo); -#line 1450 "DirectPhoto.c" +#line 1613 "DirectPhoto.c" } #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1454 "DirectPhoto.c" +#line 1617 "DirectPhoto.c" } -static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scaling* scaling, GError** error) { +static GdkPixbuf* +direct_photo_real_get_preview_pixbuf (MediaSource* base, + Scaling* scaling, + GError** error) +{ DirectPhoto * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_; @@ -1469,7 +1636,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali _tmp0_ = self->priv->preview; #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (_tmp0_ == NULL) { -#line 1473 "DirectPhoto.c" +#line 1640 "DirectPhoto.c" GdkPixbuf* _tmp1_ = NULL; GdkPixbuf* _tmp2_; GdkPixbuf* _tmp3_; @@ -1484,7 +1651,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali g_propagate_error (error, _inner_error_); #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return NULL; -#line 1488 "DirectPhoto.c" +#line 1655 "DirectPhoto.c" } #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp3_ = _tmp1_; @@ -1498,7 +1665,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali _tmp4_ = self->priv->preview; #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (_tmp4_ == NULL) { -#line 1502 "DirectPhoto.c" +#line 1669 "DirectPhoto.c" GdkPixbuf* _tmp5_ = NULL; Scaling _tmp6_; GdkPixbuf* _tmp7_; @@ -1517,7 +1684,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali _g_object_unref0 (_tmp1_); #line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return NULL; -#line 1521 "DirectPhoto.c" +#line 1688 "DirectPhoto.c" } #line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp8_ = _tmp5_; @@ -1529,11 +1696,11 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali self->priv->preview = _tmp8_; #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_tmp5_); -#line 1533 "DirectPhoto.c" +#line 1700 "DirectPhoto.c" } #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_tmp1_); -#line 1537 "DirectPhoto.c" +#line 1704 "DirectPhoto.c" } #line 107 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp9_ = self->priv->preview; @@ -1543,13 +1710,15 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali result = _tmp10_; #line 107 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1547 "DirectPhoto.c" +#line 1714 "DirectPhoto.c" } -static void direct_photo_real_rotate (Photo* base, Rotation rotation) { +static void +direct_photo_real_rotate (Photo* base, + Rotation rotation) +{ DirectPhoto * self; - Rotation _tmp0_; #line 110 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); #line 111 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1557,14 +1726,16 @@ static void direct_photo_real_rotate (Photo* base, Rotation rotation) { #line 112 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_signal_emit (self, direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL], 0, FALSE); #line 113 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = rotation; -#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - PHOTO_CLASS (direct_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_); -#line 1564 "DirectPhoto.c" + PHOTO_CLASS (direct_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), rotation); +#line 1731 "DirectPhoto.c" } -static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GError** error) { +static GdkPixbuf* +direct_photo_real_get_pixbuf (PhotoSource* base, + Scaling* scaling, + GError** error) +{ DirectPhoto * self; GdkPixbuf* result = NULL; GdkPixbuf* ret = NULL; @@ -1587,7 +1758,7 @@ static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scal g_propagate_error (error, _inner_error_); #line 117 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return NULL; -#line 1591 "DirectPhoto.c" +#line 1762 "DirectPhoto.c" } #line 118 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_signal_emit (self, direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL], 0, TRUE); @@ -1597,11 +1768,15 @@ static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scal result = ret; #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1601 "DirectPhoto.c" +#line 1772 "DirectPhoto.c" } -static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error) { +static GdkPixbuf* +direct_photo_real_get_thumbnail (ThumbnailSource* base, + gint scale, + GError** error) +{ DirectPhoto * self; GdkPixbuf* result = NULL; PhotoMetadata* metadata = NULL; @@ -1622,17 +1797,14 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s if (_tmp3_ == NULL) { #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp2_ = TRUE; -#line 1626 "DirectPhoto.c" +#line 1801 "DirectPhoto.c" } else { PhotoMetadata* _tmp4_; - guint _tmp5_; #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp4_ = metadata; #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp5_ = photo_metadata_get_preview_count (_tmp4_); -#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = _tmp5_ == ((guint) 0); -#line 1636 "DirectPhoto.c" + _tmp2_ = photo_metadata_get_preview_count (_tmp4_) == ((guint) 0); +#line 1808 "DirectPhoto.c" } #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (_tmp2_) { @@ -1640,30 +1812,29 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s _g_object_unref0 (_tmp1_); #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp1_ = NULL; -#line 1644 "DirectPhoto.c" +#line 1816 "DirectPhoto.c" } else { - GdkPixbuf* _tmp6_ = NULL; - PhotoMetadata* _tmp7_; + GdkPixbuf* _tmp5_ = NULL; + PhotoMetadata* _tmp6_; + PhotoPreview* _tmp7_; PhotoPreview* _tmp8_; - PhotoPreview* _tmp9_; + GdkPixbuf* _tmp9_; GdkPixbuf* _tmp10_; GdkPixbuf* _tmp11_; - Orientation _tmp12_; - GdkPixbuf* _tmp13_; #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp7_ = metadata; + _tmp6_ = metadata; #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp8_ = photo_metadata_get_preview (_tmp7_, (guint) 0); + _tmp7_ = photo_metadata_get_preview (_tmp6_, (guint) 0); #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp10_ = photo_preview_get_pixbuf (_tmp9_, &_inner_error_); + _tmp9_ = photo_preview_get_pixbuf (_tmp8_, &_inner_error_); #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _photo_preview_unref0 (_tmp9_); + _photo_preview_unref0 (_tmp8_); #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp6_ = _tmp11_; + _tmp5_ = _tmp10_; #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1674,19 +1845,17 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s _media_metadata_unref0 (metadata); #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return NULL; -#line 1678 "DirectPhoto.c" +#line 1849 "DirectPhoto.c" } #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp12_ = photo_get_orientation (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)); -#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp13_ = orientation_rotate_pixbuf (_tmp12_, _tmp6_); + _tmp11_ = orientation_rotate_pixbuf (photo_get_orientation (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)), _tmp5_); #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_tmp1_); #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = _tmp13_; + _tmp1_ = _tmp11_; #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _g_object_unref0 (_tmp6_); -#line 1690 "DirectPhoto.c" + _g_object_unref0 (_tmp5_); +#line 1859 "DirectPhoto.c" } #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" result = _tmp1_; @@ -1694,13 +1863,15 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s _media_metadata_unref0 (metadata); #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1698 "DirectPhoto.c" +#line 1867 "DirectPhoto.c" } -static void direct_photo_real_notify_altered (DataObject* base, Alteration* alteration) { +static void +direct_photo_real_notify_altered (DataObject* base, + Alteration* alteration) +{ DirectPhoto * self; - Alteration* _tmp0_; #line 130 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); #line 130 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1710,14 +1881,14 @@ static void direct_photo_real_notify_altered (DataObject* base, Alteration* alte #line 131 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv->preview = NULL; #line 133 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = alteration; -#line 133 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - DATA_OBJECT_CLASS (direct_photo_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_OBJECT, DataObject), _tmp0_); -#line 1717 "DirectPhoto.c" + DATA_OBJECT_CLASS (direct_photo_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_OBJECT, DataObject), alteration); +#line 1886 "DirectPhoto.c" } -static gboolean direct_photo_real_has_user_generated_metadata (Photo* base) { +static gboolean +direct_photo_real_has_user_generated_metadata (Photo* base) +{ DirectPhoto * self; gboolean result = FALSE; #line 136 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1726,31 +1897,39 @@ static gboolean direct_photo_real_has_user_generated_metadata (Photo* base) { result = FALSE; #line 138 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1730 "DirectPhoto.c" +#line 1901 "DirectPhoto.c" } -static void direct_photo_real_set_user_metadata_for_export (Photo* base, PhotoMetadata* metadata) { +static void +direct_photo_real_set_user_metadata_for_export (Photo* base, + PhotoMetadata* metadata) +{ DirectPhoto * self; #line 141 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); #line 141 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_PHOTO_METADATA (metadata)); -#line 1740 "DirectPhoto.c" +#line 1914 "DirectPhoto.c" } -static void direct_photo_real_apply_user_metadata_for_reimport (Photo* base, PhotoMetadata* metadata) { +static void +direct_photo_real_apply_user_metadata_for_reimport (Photo* base, + PhotoMetadata* metadata) +{ DirectPhoto * self; #line 145 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); #line 145 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_PHOTO_METADATA (metadata)); -#line 1750 "DirectPhoto.c" +#line 1927 "DirectPhoto.c" } -static gboolean direct_photo_real_is_trashed (MediaSource* base) { +static gboolean +direct_photo_real_is_trashed (MediaSource* base) +{ DirectPhoto * self; gboolean result = FALSE; #line 148 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1759,11 +1938,13 @@ static gboolean direct_photo_real_is_trashed (MediaSource* base) { result = FALSE; #line 150 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1763 "DirectPhoto.c" +#line 1942 "DirectPhoto.c" } -static gboolean direct_photo_real_is_offline (MediaSource* base) { +static gboolean +direct_photo_real_is_offline (MediaSource* base) +{ DirectPhoto * self; gboolean result = FALSE; #line 153 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1772,43 +1953,53 @@ static gboolean direct_photo_real_is_offline (MediaSource* base) { result = FALSE; #line 155 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1776 "DirectPhoto.c" +#line 1957 "DirectPhoto.c" } -static void direct_photo_real_trash (MediaSource* base) { +static void +direct_photo_real_trash (MediaSource* base) +{ DirectPhoto * self; #line 158 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); -#line 1784 "DirectPhoto.c" +#line 1967 "DirectPhoto.c" } -static void direct_photo_real_untrash (MediaSource* base) { +static void +direct_photo_real_untrash (MediaSource* base) +{ DirectPhoto * self; #line 162 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); -#line 1792 "DirectPhoto.c" +#line 1977 "DirectPhoto.c" } -static void direct_photo_real_mark_offline (MediaSource* base) { +static void +direct_photo_real_mark_offline (MediaSource* base) +{ DirectPhoto * self; #line 166 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); -#line 1800 "DirectPhoto.c" +#line 1987 "DirectPhoto.c" } -static void direct_photo_real_mark_online (MediaSource* base) { +static void +direct_photo_real_mark_online (MediaSource* base) +{ DirectPhoto * self; #line 170 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); -#line 1808 "DirectPhoto.c" +#line 1997 "DirectPhoto.c" } -static void direct_photo_class_init (DirectPhotoClass * klass) { +static void +direct_photo_class_init (DirectPhotoClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" direct_photo_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1845,22 +2036,26 @@ static void direct_photo_class_init (DirectPhotoClass * klass) { G_OBJECT_CLASS (klass)->finalize = direct_photo_finalize; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL] = g_signal_new ("can-rotate-changed", TYPE_DIRECT_PHOTO, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); -#line 1849 "DirectPhoto.c" +#line 2040 "DirectPhoto.c" } -static void direct_photo_instance_init (DirectPhoto * self) { +static void +direct_photo_instance_init (DirectPhoto * self) +{ #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv = DIRECT_PHOTO_GET_PRIVATE (self); #line 14 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv->preview = NULL; #line 15 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv->loaded = FALSE; -#line 1860 "DirectPhoto.c" +#line 2053 "DirectPhoto.c" } -static void direct_photo_finalize (GObject * obj) { +static void +direct_photo_finalize (GObject * obj) +{ DirectPhoto * self; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_PHOTO, DirectPhoto); @@ -1868,11 +2063,13 @@ static void direct_photo_finalize (GObject * obj) { _g_object_unref0 (self->priv->preview); #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" G_OBJECT_CLASS (direct_photo_parent_class)->finalize (obj); -#line 1872 "DirectPhoto.c" +#line 2067 "DirectPhoto.c" } -GType direct_photo_get_type (void) { +GType +direct_photo_get_type (void) +{ static volatile gsize direct_photo_type_id__volatile = 0; if (g_once_init_enter (&direct_photo_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DirectPhotoClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_photo_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectPhoto), 0, (GInstanceInitFunc) direct_photo_instance_init, NULL }; @@ -1884,363 +2081,370 @@ GType direct_photo_get_type (void) { } -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { +static guint +_file_hash_gee_hash_data_func (gconstpointer v, + gpointer self) +{ guint result; result = file_hash ((GFile*) v); #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1893 "DirectPhoto.c" +#line 2093 "DirectPhoto.c" } -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = file_equal ((GFile*) a, (GFile*) b); #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1902 "DirectPhoto.c" +#line 2106 "DirectPhoto.c" } -static gint64 _direct_photo_source_collection_get_direct_key_get_source_database_key (DataSource* source, gpointer self) { +static gint64 +_direct_photo_source_collection_get_direct_key_get_source_database_key (DataSource* source, + gpointer self) +{ gint64 result; result = direct_photo_source_collection_get_direct_key (source); #line 183 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1911 "DirectPhoto.c" +#line 2118 "DirectPhoto.c" } -static void _direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered (DirectoryMonitor* _sender, GFile* file, GFileInfo* info, gpointer self) { +static void +_direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered (DirectoryMonitor* _sender, + GFile* file, + GFileInfo* info, + gpointer self) +{ #line 187 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" direct_photo_source_collection_on_file_discovered ((DirectPhotoSourceCollection*) self, file, info); -#line 1918 "DirectPhoto.c" +#line 2130 "DirectPhoto.c" } -static void _direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) { +static void +_direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, + gpointer self) +{ #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" direct_photo_source_collection_on_discovery_completed ((DirectPhotoSourceCollection*) self); -#line 1925 "DirectPhoto.c" +#line 2140 "DirectPhoto.c" } -DirectPhotoSourceCollection* direct_photo_source_collection_construct (GType object_type, GFile* initial_file) { +DirectPhotoSourceCollection* +direct_photo_source_collection_construct (GType object_type, + GFile* initial_file) +{ DirectPhotoSourceCollection* self = NULL; GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; + DirectoryMonitor* _tmp2_; DirectoryMonitor* _tmp3_; DirectoryMonitor* _tmp4_; DirectoryMonitor* _tmp5_; - DirectoryMonitor* _tmp6_; #line 182 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (G_IS_FILE (initial_file), NULL); #line 183 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = (DirectPhotoSourceCollection*) database_source_collection_construct (object_type, "DirectPhotoSourceCollection", _direct_photo_source_collection_get_direct_key_get_source_database_key, NULL); #line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = initial_file; + _tmp0_ = g_file_get_parent (initial_file); #line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = g_file_get_parent (_tmp0_); -#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp3_ = directory_monitor_new (_tmp2_, FALSE, FALSE); + _tmp2_ = directory_monitor_new (_tmp1_, FALSE, FALSE); #line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (self->priv->monitor); #line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - self->priv->monitor = _tmp3_; + self->priv->monitor = _tmp2_; #line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 187 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp4_ = self->priv->monitor; + _tmp3_ = self->priv->monitor; #line 187 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - g_signal_connect (_tmp4_, "file-discovered", (GCallback) _direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered, self); + g_signal_connect (_tmp3_, "file-discovered", (GCallback) _direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered, self); #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp5_ = self->priv->monitor; + _tmp4_ = self->priv->monitor; #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - g_signal_connect (_tmp5_, "discovery-completed", (GCallback) _direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed, self); + g_signal_connect (_tmp4_, "discovery-completed", (GCallback) _direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed, self); #line 190 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp6_ = self->priv->monitor; + _tmp5_ = self->priv->monitor; #line 190 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - directory_monitor_start_discovery (_tmp6_); + directory_monitor_start_discovery (_tmp5_); #line 182 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return self; -#line 1970 "DirectPhoto.c" +#line 2185 "DirectPhoto.c" } -DirectPhotoSourceCollection* direct_photo_source_collection_new (GFile* initial_file) { +DirectPhotoSourceCollection* +direct_photo_source_collection_new (GFile* initial_file) +{ #line 182 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return direct_photo_source_collection_construct (TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, initial_file); -#line 1977 "DirectPhoto.c" +#line 2194 "DirectPhoto.c" } -static gboolean direct_photo_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) { +static gboolean +direct_photo_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source) +{ DirectPhotoSourceCollection * self; gboolean result = FALSE; - DataSource* _tmp0_; #line 193 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection); #line 193 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 194 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = source; -#line 194 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_DIRECT_PHOTO); + result = G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_DIRECT_PHOTO); #line 194 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1995 "DirectPhoto.c" +#line 2212 "DirectPhoto.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 198 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return self ? g_object_ref (self) : NULL; -#line 2002 "DirectPhoto.c" +#line 2221 "DirectPhoto.c" } -static gint64 direct_photo_source_collection_get_direct_key (DataSource* source) { +static gint64 +direct_photo_source_collection_get_direct_key (DataSource* source) +{ gint64 result = 0LL; DirectPhoto* photo = NULL; - DataSource* _tmp0_; - DirectPhoto* _tmp1_; + DirectPhoto* _tmp0_; PhotoID photo_id = {0}; - PhotoID _tmp2_ = {0}; - PhotoID _tmp3_; - gint64 _tmp4_; + PhotoID _tmp1_ = {0}; + PhotoID _tmp2_; + gint64 _tmp3_; #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL); #line 198 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = source; -#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_PHOTO, DirectPhoto)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DIRECT_PHOTO, DirectPhoto)); #line 198 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - photo = _tmp1_; + photo = _tmp0_; #line 199 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo), &_tmp2_); + photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo), &_tmp1_); #line 199 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - photo_id = _tmp2_; + photo_id = _tmp1_; #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp3_ = photo_id; + _tmp2_ = photo_id; #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp4_ = _tmp3_.id; + _tmp3_ = _tmp2_.id; #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - result = _tmp4_; + result = _tmp3_; #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (photo); #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2037 "DirectPhoto.c" +#line 2255 "DirectPhoto.c" } -static void direct_photo_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added) { +static void +direct_photo_source_collection_real_notify_items_added (DataCollection* base, + GeeIterable* added) +{ DirectPhotoSourceCollection * self; - GeeIterable* _tmp16_; #line 204 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection); #line 204 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (GEE_IS_ITERABLE (added)); -#line 2048 "DirectPhoto.c" +#line 2268 "DirectPhoto.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = added; + _tmp0_ = gee_iterable_iterator (added); #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); -#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" while (TRUE) { -#line 2061 "DirectPhoto.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 2278 "DirectPhoto.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; DirectPhoto* photo = NULL; - DataObject* _tmp6_; - DirectPhoto* _tmp7_; + DataObject* _tmp4_; + DirectPhoto* _tmp5_; GFile* file = NULL; - DirectPhoto* _tmp8_; + DirectPhoto* _tmp6_; + GFile* _tmp7_; + GeeHashMap* _tmp8_; GFile* _tmp9_; GeeHashMap* _tmp10_; GFile* _tmp11_; - gboolean _tmp12_; - GeeHashMap* _tmp13_; - GFile* _tmp14_; - DirectPhoto* _tmp15_; + DirectPhoto* _tmp12_; #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = _object_it; + _tmp1_ = _object_it; #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" break; -#line 2087 "DirectPhoto.c" +#line 2300 "DirectPhoto.c" } #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 206 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp6_ = object; + _tmp4_ = object; #line 206 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DIRECT_PHOTO, DirectPhoto)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DIRECT_PHOTO, DirectPhoto)); #line 206 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - photo = _tmp7_; + photo = _tmp5_; #line 207 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp8_ = photo; + _tmp6_ = photo; #line 207 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp9_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp7_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource)); #line 207 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - file = _tmp9_; + file = _tmp7_; #line 209 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp10_ = self->priv->file_map; + _tmp8_ = self->priv->file_map; #line 209 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp11_ = file; -#line 209 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp12_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_); + _tmp9_ = file; #line 209 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _vala_assert (!_tmp12_, "!file_map.has_key(file)"); + _vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_), "!file_map.has_key(file)"); #line 211 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp13_ = self->priv->file_map; + _tmp10_ = self->priv->file_map; #line 211 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp14_ = file; + _tmp11_ = file; #line 211 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp15_ = photo; + _tmp12_ = photo; #line 211 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp14_, _tmp15_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, _tmp12_); #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (file); #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (photo); #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (object); -#line 2129 "DirectPhoto.c" +#line 2340 "DirectPhoto.c" } #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_object_it); -#line 2133 "DirectPhoto.c" +#line 2344 "DirectPhoto.c" } #line 214 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp16_ = added; -#line 214 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp16_); -#line 2139 "DirectPhoto.c" + DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), added); +#line 2348 "DirectPhoto.c" } -static void direct_photo_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed) { +static void +direct_photo_source_collection_real_notify_items_removed (DataCollection* base, + GeeIterable* removed) +{ DirectPhotoSourceCollection * self; - GeeIterable* _tmp14_; #line 217 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection); #line 217 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); -#line 2150 "DirectPhoto.c" +#line 2361 "DirectPhoto.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; -#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = removed; + GeeIterator* _tmp0_; #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); + _tmp0_ = gee_iterable_iterator (removed); #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" while (TRUE) { -#line 2163 "DirectPhoto.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 2371 "DirectPhoto.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; DirectPhoto* photo = NULL; - DataObject* _tmp6_; - DirectPhoto* _tmp7_; + DataObject* _tmp4_; + DirectPhoto* _tmp5_; GFile* file = NULL; - DirectPhoto* _tmp8_; - GFile* _tmp9_; + DirectPhoto* _tmp6_; + GFile* _tmp7_; gboolean is_removed = FALSE; - GeeHashMap* _tmp10_; - GFile* _tmp11_; - gboolean _tmp12_; - gboolean _tmp13_; -#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = _object_it; + GeeHashMap* _tmp8_; + GFile* _tmp9_; + gboolean _tmp10_; + gboolean _tmp11_; #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" break; -#line 2188 "DirectPhoto.c" +#line 2393 "DirectPhoto.c" } #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 219 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp6_ = object; + _tmp4_ = object; #line 219 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DIRECT_PHOTO, DirectPhoto)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DIRECT_PHOTO, DirectPhoto)); #line 219 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - photo = _tmp7_; + photo = _tmp5_; #line 220 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp8_ = photo; + _tmp6_ = photo; #line 220 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp9_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp7_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource)); #line 220 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - file = _tmp9_; + file = _tmp7_; #line 222 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp10_ = self->priv->file_map; + _tmp8_ = self->priv->file_map; #line 222 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp11_ = file; + _tmp9_ = file; #line 222 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp12_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL); + _tmp10_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, NULL); #line 222 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - is_removed = _tmp12_; + is_removed = _tmp10_; #line 223 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp13_ = is_removed; + _tmp11_ = is_removed; #line 223 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _vala_assert (_tmp13_, "is_removed"); + _vala_assert (_tmp11_, "is_removed"); #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (file); #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (photo); #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (object); -#line 2226 "DirectPhoto.c" +#line 2431 "DirectPhoto.c" } #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_object_it); -#line 2230 "DirectPhoto.c" +#line 2435 "DirectPhoto.c" } #line 226 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp14_ = removed; -#line 226 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp14_); -#line 2236 "DirectPhoto.c" + DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), removed); +#line 2439 "DirectPhoto.c" } -gboolean direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCollection* self, GFile* file) { +gboolean +direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCollection* self, + GFile* file) +{ gboolean result = FALSE; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gboolean _tmp2_; #line 229 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), FALSE); #line 229 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2248,33 +2452,28 @@ gboolean direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCo #line 230 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp0_ = self->priv->file_map; #line 230 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = file; -#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - result = _tmp2_; + result = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 230 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2259 "DirectPhoto.c" +#line 2459 "DirectPhoto.c" } -static void direct_photo_source_collection_on_file_discovered (DirectPhotoSourceCollection* self, GFile* file, GFileInfo* info) { - GFile* _tmp0_; - gboolean _tmp1_; - GFile* _tmp2_; - gboolean _tmp3_; +static void +direct_photo_source_collection_on_file_discovered (DirectPhotoSourceCollection* self, + GFile* file, + GFileInfo* info) +{ DirectPhoto* photo = NULL; gchar* reason = NULL; - GFile* _tmp4_; - DirectPhoto* _tmp5_ = NULL; - gchar* _tmp6_; - const gchar* _tmp7_; - GeeCollection* _tmp9_; - DirectPhoto* _tmp10_; - GeeCollection* _tmp11_; - gint _tmp12_; - gint _tmp13_; + DirectPhoto* _tmp0_ = NULL; + gchar* _tmp1_; + const gchar* _tmp2_; + GeeCollection* _tmp4_; + DirectPhoto* _tmp5_; + GeeCollection* _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self)); #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2282,83 +2481,77 @@ static void direct_photo_source_collection_on_file_discovered (DirectPhotoSource #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 235 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = file; -#line 235 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = direct_photo_source_collection_has_source_for_file (self, _tmp0_); -#line 235 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp1_) { + if (direct_photo_source_collection_has_source_for_file (self, file)) { #line 236 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return; -#line 2293 "DirectPhoto.c" +#line 2488 "DirectPhoto.c" } #line 239 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = file; -#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp3_ = photo_file_format_is_file_supported (_tmp2_); -#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (!_tmp3_) { + if (!photo_file_format_is_file_supported (file)) { #line 240 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return; -#line 2303 "DirectPhoto.c" +#line 2494 "DirectPhoto.c" } #line 243 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp4_ = file; -#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp6_ = direct_photo_source_collection_fetch (self, _tmp4_, &_tmp5_, FALSE); + _tmp1_ = direct_photo_source_collection_fetch (self, file, &_tmp0_, FALSE); #line 243 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (photo); #line 243 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - photo = _tmp5_; + photo = _tmp0_; #line 243 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - reason = _tmp6_; + reason = _tmp1_; #line 244 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp7_ = reason; + _tmp2_ = reason; #line 244 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp7_ != NULL) { -#line 2319 "DirectPhoto.c" - const gchar* _tmp8_; + if (_tmp2_ != NULL) { +#line 2508 "DirectPhoto.c" + const gchar* _tmp3_; #line 245 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp8_ = reason; + _tmp3_ = reason; #line 245 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - g_warning ("DirectPhoto.vala:245: Error fetching file: %s", _tmp8_); -#line 2325 "DirectPhoto.c" + g_warning ("DirectPhoto.vala:245: Error fetching file: %s", _tmp3_); +#line 2514 "DirectPhoto.c" } #line 246 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp9_ = self->priv->prepared_photos; + _tmp4_ = self->priv->prepared_photos; #line 246 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp10_ = photo; + _tmp5_ = photo; #line 246 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - gee_collection_add (_tmp9_, _tmp10_); + gee_collection_add (_tmp4_, _tmp5_); #line 247 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp11_ = self->priv->prepared_photos; + _tmp6_ = self->priv->prepared_photos; #line 247 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp12_ = gee_collection_get_size (_tmp11_); + _tmp7_ = gee_collection_get_size (_tmp6_); #line 247 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp13_ = _tmp12_; + _tmp8_ = _tmp7_; #line 247 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp13_ >= DIRECT_PHOTO_SOURCE_COLLECTION_DISCOVERED_FILES_BATCH_ADD) { + if (_tmp8_ >= DIRECT_PHOTO_SOURCE_COLLECTION_DISCOVERED_FILES_BATCH_ADD) { #line 248 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" direct_photo_source_collection_flush_prepared_photos (self); -#line 2343 "DirectPhoto.c" +#line 2532 "DirectPhoto.c" } #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_free0 (reason); #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (photo); -#line 2349 "DirectPhoto.c" +#line 2538 "DirectPhoto.c" } -static void direct_photo_source_collection_on_discovery_completed (DirectPhotoSourceCollection* self) { +static void +direct_photo_source_collection_on_discovery_completed (DirectPhotoSourceCollection* self) +{ #line 251 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self)); #line 252 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" direct_photo_source_collection_flush_prepared_photos (self); -#line 2358 "DirectPhoto.c" +#line 2549 "DirectPhoto.c" } -static void direct_photo_source_collection_flush_prepared_photos (DirectPhotoSourceCollection* self) { +static void +direct_photo_source_collection_flush_prepared_photos (DirectPhotoSourceCollection* self) +{ GeeCollection* _tmp0_; GeeCollection* _tmp1_; GeeCollection* _tmp2_; @@ -2377,15 +2570,16 @@ static void direct_photo_source_collection_flush_prepared_photos (DirectPhotoSou _tmp3_ = self->priv->prepared_photos; #line 257 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" gee_collection_clear (_tmp3_); -#line 2381 "DirectPhoto.c" +#line 2574 "DirectPhoto.c" } -gboolean direct_photo_source_collection_has_file (DirectPhotoSourceCollection* self, GFile* file) { +gboolean +direct_photo_source_collection_has_file (DirectPhotoSourceCollection* self, + GFile* file) +{ gboolean result = FALSE; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gboolean _tmp2_; #line 260 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), FALSE); #line 260 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2393,71 +2587,67 @@ gboolean direct_photo_source_collection_has_file (DirectPhotoSourceCollection* s #line 261 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp0_ = self->priv->file_map; #line 261 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = file; -#line 261 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 261 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - result = _tmp2_; + result = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 261 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2404 "DirectPhoto.c" +#line 2594 "DirectPhoto.c" } -void direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection* self, DirectPhoto* photo) { - DirectPhoto* _tmp0_; +void +direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection* self, + DirectPhoto* photo) +{ DirectPhoto* reimported_photo = NULL; - DirectPhoto* _tmp1_; - GFile* _tmp2_; - GFile* _tmp3_; - DirectPhoto* _tmp4_ = NULL; - gchar* _tmp5_; - gchar* _tmp6_; + GFile* _tmp0_; + GFile* _tmp1_; + DirectPhoto* _tmp2_ = NULL; + gchar* _tmp3_; + gchar* _tmp4_; #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self)); #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_DIRECT_PHOTO (photo)); #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = photo; -#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - photo_discard_prefetched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo)); + photo_discard_prefetched (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo)); #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = photo; + _tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MEDIA_SOURCE, MediaSource)); #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp1_ = _tmp0_; #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp3_ = _tmp2_; -#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp5_ = direct_photo_source_collection_fetch (self, _tmp3_, &_tmp4_, TRUE); + _tmp3_ = direct_photo_source_collection_fetch (self, _tmp1_, &_tmp2_, TRUE); #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (reimported_photo); #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - reimported_photo = _tmp4_; + reimported_photo = _tmp2_; #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp4_); #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (reimported_photo); -#line 2445 "DirectPhoto.c" +#line 2632 "DirectPhoto.c" } -gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto* * photo, gboolean reimport) { +gchar* +direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, + GFile* file, + DirectPhoto* * photo, + gboolean reimport) +{ DirectPhoto* _vala_photo = NULL; gchar* result = NULL; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gpointer _tmp2_; - DirectPhoto* _tmp3_; + gpointer _tmp1_; + DirectPhoto* _tmp2_; ImportResult _result_ = 0; - GFile* _tmp25_; - DirectPhoto* _tmp26_ = NULL; - ImportResult _tmp27_; - gchar* _tmp28_ = NULL; - ImportResult _tmp29_; + DirectPhoto* _tmp20_ = NULL; + ImportResult _tmp21_; + gchar* _tmp22_ = NULL; + ImportResult _tmp23_; GError * _inner_error_ = NULL; #line 271 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), NULL); @@ -2466,166 +2656,152 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, #line 273 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp0_ = self->priv->file_map; #line 273 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = file; -#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 273 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_vala_photo); #line 273 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _vala_photo = (DirectPhoto*) _tmp2_; + _vala_photo = (DirectPhoto*) _tmp1_; #line 274 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp3_ = _vala_photo; + _tmp2_ = _vala_photo; #line 274 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp3_ != NULL) { -#line 2481 "DirectPhoto.c" + if (_tmp2_ != NULL) { +#line 2669 "DirectPhoto.c" gchar* reason = NULL; - gboolean _tmp4_; #line 275 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" reason = NULL; #line 277 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp4_ = reimport; -#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp4_) { -#line 2490 "DirectPhoto.c" + if (reimport) { +#line 2675 "DirectPhoto.c" { Orientation ori_tmp = 0; gboolean should_restore_ori = FALSE; - gboolean _tmp5_ = FALSE; - DirectPhoto* _tmp6_; - gboolean _tmp7_; + gboolean _tmp3_ = FALSE; + DirectPhoto* _tmp4_; PhotoReimportMasterState* reimport_state = NULL; - gboolean _tmp12_ = FALSE; - DirectPhoto* _tmp13_; - PhotoReimportMasterState* _tmp14_ = NULL; - gboolean _tmp15_; + gboolean _tmp7_ = FALSE; + DirectPhoto* _tmp8_; + PhotoReimportMasterState* _tmp9_ = NULL; + gboolean _tmp10_; #line 279 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" ori_tmp = ORIENTATION_TOP_LEFT; #line 280 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" should_restore_ori = FALSE; #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp6_ = _vala_photo; -#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp7_ = photo_only_metadata_changed (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo)); + _tmp4_ = _vala_photo; #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp7_) { + if (photo_only_metadata_changed (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO, Photo))) { #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp5_ = TRUE; -#line 2514 "DirectPhoto.c" + _tmp3_ = TRUE; +#line 2696 "DirectPhoto.c" } else { - DirectPhoto* _tmp8_; - PhotoFileFormat _tmp9_; -#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp8_ = _vala_photo; + DirectPhoto* _tmp5_; #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp9_ = photo_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo)); + _tmp5_ = _vala_photo; #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp5_ = _tmp9_ == PHOTO_FILE_FORMAT_JFIF; -#line 2524 "DirectPhoto.c" + _tmp3_ = photo_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO, Photo)) == PHOTO_FILE_FORMAT_JFIF; +#line 2703 "DirectPhoto.c" } #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp5_) { -#line 2528 "DirectPhoto.c" - DirectPhoto* _tmp10_; - Orientation _tmp11_; -#line 284 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp10_ = _vala_photo; + if (_tmp3_) { +#line 2707 "DirectPhoto.c" + DirectPhoto* _tmp6_; #line 284 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp11_ = photo_get_orientation (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PHOTO, Photo)); + _tmp6_ = _vala_photo; #line 284 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ori_tmp = _tmp11_; + ori_tmp = photo_get_orientation (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo)); #line 285 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" should_restore_ori = TRUE; -#line 2539 "DirectPhoto.c" +#line 2715 "DirectPhoto.c" } #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp13_ = _vala_photo; + _tmp8_ = _vala_photo; #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp15_ = photo_prepare_for_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO, Photo), &_tmp14_, &_inner_error_); + _tmp10_ = photo_prepare_for_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo), &_tmp9_, &_inner_error_); #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _photo_reimport_master_state_unref0 (reimport_state); #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - reimport_state = _tmp14_; + reimport_state = _tmp9_; #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp12_ = _tmp15_; + _tmp7_ = _tmp10_; #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 2555 "DirectPhoto.c" +#line 2731 "DirectPhoto.c" goto __catch51_g_error; } #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp12_) { -#line 2560 "DirectPhoto.c" - DirectPhoto* _tmp16_; - PhotoReimportMasterState* _tmp17_; - gboolean _tmp18_; + if (_tmp7_) { +#line 2736 "DirectPhoto.c" + DirectPhoto* _tmp11_; + PhotoReimportMasterState* _tmp12_; + gboolean _tmp13_; #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp16_ = _vala_photo; + _tmp11_ = _vala_photo; #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp17_ = reimport_state; + _tmp12_ = reimport_state; #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - photo_finish_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO, Photo), _tmp17_, &_inner_error_); + photo_finish_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO, Photo), _tmp12_, &_inner_error_); #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 2574 "DirectPhoto.c" +#line 2750 "DirectPhoto.c" goto __catch51_g_error; } #line 291 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp18_ = should_restore_ori; + _tmp13_ = should_restore_ori; #line 291 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp18_) { -#line 2581 "DirectPhoto.c" - DirectPhoto* _tmp19_; - Orientation _tmp20_; + if (_tmp13_) { +#line 2757 "DirectPhoto.c" + DirectPhoto* _tmp14_; + Orientation _tmp15_; #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp19_ = _vala_photo; + _tmp14_ = _vala_photo; #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp20_ = ori_tmp; + _tmp15_ = ori_tmp; #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - direct_photo_fixup_orientation_after_reimport (_tmp19_, _tmp20_); -#line 2590 "DirectPhoto.c" + direct_photo_fixup_orientation_after_reimport (_tmp14_, _tmp15_); +#line 2766 "DirectPhoto.c" } } else { - gchar* _tmp21_; + gchar* _tmp16_; #line 296 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp21_ = import_result_to_string (IMPORT_RESULT_FILE_ERROR); + _tmp16_ = import_result_to_string (IMPORT_RESULT_FILE_ERROR); #line 296 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_free0 (reason); #line 296 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - reason = _tmp21_; -#line 2600 "DirectPhoto.c" + reason = _tmp16_; +#line 2776 "DirectPhoto.c" } #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 2604 "DirectPhoto.c" +#line 2780 "DirectPhoto.c" } goto __finally51; __catch51_g_error: { GError* err = NULL; - GError* _tmp22_; - const gchar* _tmp23_; - gchar* _tmp24_; + GError* _tmp17_; + const gchar* _tmp18_; + gchar* _tmp19_; #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" err = _inner_error_; #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _inner_error_ = NULL; #line 299 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp22_ = err; + _tmp17_ = err; #line 299 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp23_ = _tmp22_->message; + _tmp18_ = _tmp17_->message; #line 299 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp24_ = g_strdup (_tmp23_); + _tmp19_ = g_strdup (_tmp18_); #line 299 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_free0 (reason); #line 299 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - reason = _tmp24_; + reason = _tmp19_; #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_error_free0 (err); -#line 2629 "DirectPhoto.c" +#line 2805 "DirectPhoto.c" } __finally51: #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2638,7 +2814,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, g_clear_error (&_inner_error_); #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return NULL; -#line 2642 "DirectPhoto.c" +#line 2818 "DirectPhoto.c" } } #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2647,71 +2823,70 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, if (photo) { #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" *photo = _vala_photo; -#line 2651 "DirectPhoto.c" +#line 2827 "DirectPhoto.c" } else { #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_vala_photo); -#line 2655 "DirectPhoto.c" +#line 2831 "DirectPhoto.c" } #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2659 "DirectPhoto.c" +#line 2835 "DirectPhoto.c" } #line 308 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp25_ = file; -#line 308 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp27_ = direct_photo_internal_import (_tmp25_, &_tmp26_); + _tmp21_ = direct_photo_internal_import (file, &_tmp20_); #line 308 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_vala_photo); #line 308 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _vala_photo = _tmp26_; + _vala_photo = _tmp20_; #line 308 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _result_ = _tmp27_; + _result_ = _tmp21_; #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp29_ = _result_; + _tmp23_ = _result_; #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp29_ == IMPORT_RESULT_SUCCESS) { + if (_tmp23_ == IMPORT_RESULT_SUCCESS) { #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _g_free0 (_tmp28_); + _g_free0 (_tmp22_); #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp28_ = NULL; -#line 2679 "DirectPhoto.c" + _tmp22_ = NULL; +#line 2853 "DirectPhoto.c" } else { - ImportResult _tmp30_; - gchar* _tmp31_; + ImportResult _tmp24_; + gchar* _tmp25_; #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp30_ = _result_; + _tmp24_ = _result_; #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp31_ = import_result_to_string (_tmp30_); + _tmp25_ = import_result_to_string (_tmp24_); #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _g_free0 (_tmp28_); + _g_free0 (_tmp22_); #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp28_ = _tmp31_; -#line 2691 "DirectPhoto.c" + _tmp22_ = _tmp25_; +#line 2865 "DirectPhoto.c" } #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - result = _tmp28_; + result = _tmp22_; #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (photo) { #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" *photo = _vala_photo; -#line 2699 "DirectPhoto.c" +#line 2873 "DirectPhoto.c" } else { #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_vala_photo); -#line 2703 "DirectPhoto.c" +#line 2877 "DirectPhoto.c" } #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2707 "DirectPhoto.c" +#line 2881 "DirectPhoto.c" } -gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollection* self, GFile* file) { +gboolean +direct_photo_source_collection_has_file_source (DirectPhotoSourceCollection* self, + GFile* file) +{ gboolean result = FALSE; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gboolean _tmp2_; #line 313 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), FALSE); #line 313 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2719,22 +2894,20 @@ gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollec #line 314 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp0_ = self->priv->file_map; #line 314 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = file; -#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - result = _tmp2_; + result = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 314 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2730 "DirectPhoto.c" +#line 2901 "DirectPhoto.c" } -DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self, GFile* file) { +DirectPhoto* +direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self, + GFile* file) +{ DirectPhoto* result = NULL; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 317 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), NULL); #line 317 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2742,18 +2915,18 @@ DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCo #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp0_ = self->priv->file_map; #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = file; -#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - result = (DirectPhoto*) _tmp2_; + result = (DirectPhoto*) _tmp1_; #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2753 "DirectPhoto.c" +#line 2924 "DirectPhoto.c" } -static void direct_photo_source_collection_class_init (DirectPhotoSourceCollectionClass * klass) { +static void +direct_photo_source_collection_class_init (DirectPhotoSourceCollectionClass * klass) +{ #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" direct_photo_source_collection_parent_class = g_type_class_peek_parent (klass); #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2766,11 +2939,13 @@ static void direct_photo_source_collection_class_init (DirectPhotoSourceCollecti ((DataCollectionClass *) klass)->notify_items_added = (void (*) (DataCollection *, GeeIterable*)) direct_photo_source_collection_real_notify_items_added; #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" ((DataCollectionClass *) klass)->notify_items_removed = (void (*) (DataCollection *, GeeIterable*)) direct_photo_source_collection_real_notify_items_removed; -#line 2770 "DirectPhoto.c" +#line 2943 "DirectPhoto.c" } -static void direct_photo_source_collection_instance_init (DirectPhotoSourceCollection * self) { +static void +direct_photo_source_collection_instance_init (DirectPhotoSourceCollection * self) +{ GeeArrayList* _tmp0_; GeeHashMap* _tmp1_; #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2783,11 +2958,13 @@ static void direct_photo_source_collection_instance_init (DirectPhotoSourceColle _tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv->file_map = _tmp1_; -#line 2787 "DirectPhoto.c" +#line 2962 "DirectPhoto.c" } -static void direct_photo_source_collection_finalize (DataCollection * obj) { +static void +direct_photo_source_collection_finalize (DataCollection * obj) +{ DirectPhotoSourceCollection * self; #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection); @@ -2799,11 +2976,13 @@ static void direct_photo_source_collection_finalize (DataCollection * obj) { _g_object_unref0 (self->priv->monitor); #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->finalize (obj); -#line 2803 "DirectPhoto.c" +#line 2980 "DirectPhoto.c" } -GType direct_photo_source_collection_get_type (void) { +GType +direct_photo_source_collection_get_type (void) +{ static volatile gsize direct_photo_source_collection_type_id__volatile = 0; if (g_once_init_enter (&direct_photo_source_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DirectPhotoSourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_photo_source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectPhotoSourceCollection), 0, (GInstanceInitFunc) direct_photo_source_collection_instance_init, NULL }; diff --git a/src/direct/DirectPhotoPage.c b/src/direct/DirectPhotoPage.c index ae2a47c..62620fb 100644 --- a/src/direct/DirectPhotoPage.c +++ b/src/direct/DirectPhotoPage.c @@ -1,4 +1,4 @@ -/* DirectPhotoPage.c generated by valac 0.36.6, the Vala compiler +/* DirectPhotoPage.c generated by valac 0.40.4, the Vala compiler * generated from DirectPhotoPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -211,6 +212,11 @@ typedef struct _ViewCollectionClass ViewCollectionClass; typedef struct _DirectViewCollection DirectViewCollection; typedef struct _DirectViewCollectionClass DirectViewCollectionClass; +enum { + DIRECT_PHOTO_PAGE_0_PROPERTY, + DIRECT_PHOTO_PAGE_NUM_PROPERTIES +}; +static GParamSpec* direct_photo_page_properties[DIRECT_PHOTO_PAGE_NUM_PROPERTIES]; #define TYPE_SOURCE_COLLECTION (source_collection_get_type ()) #define SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SOURCE_COLLECTION, SourceCollection)) @@ -371,6 +377,11 @@ typedef struct _Block7Data Block7Data; typedef struct _DirectFullscreenPhotoPage DirectFullscreenPhotoPage; typedef struct _DirectFullscreenPhotoPageClass DirectFullscreenPhotoPageClass; typedef struct _DirectFullscreenPhotoPagePrivate DirectFullscreenPhotoPagePrivate; +enum { + DIRECT_FULLSCREEN_PHOTO_PAGE_0_PROPERTY, + DIRECT_FULLSCREEN_PHOTO_PAGE_NUM_PROPERTIES +}; +static GParamSpec* direct_fullscreen_photo_page_properties[DIRECT_FULLSCREEN_PHOTO_PAGE_NUM_PROPERTIES]; struct _Page { GtkScrolledWindow parent_instance; @@ -602,9 +613,15 @@ GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType single_photo_page_get_type (void) G_GNUC_CONST; @@ -624,84 +641,151 @@ GType data_view_get_type (void) G_GNUC_CONST; GType direct_photo_page_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; GType direct_view_collection_get_type (void) G_GNUC_CONST; #define DIRECT_PHOTO_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPagePrivate)) -enum { - DIRECT_PHOTO_PAGE_DUMMY_PROPERTY -}; GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType direct_photo_source_collection_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; -static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap* map); -static void _direct_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, + GeeMap* map); +static void _direct_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); static void direct_photo_page_on_save (DirectPhotoPage* self); -static void _direct_photo_page_on_save_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _direct_photo_page_on_save_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void direct_photo_page_on_save_as (DirectPhotoPage* self); -static void _direct_photo_page_on_save_as_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _direct_photo_page_on_save_as_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void direct_photo_page_on_send_to (DirectPhotoPage* self); -static void _direct_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _direct_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void direct_photo_page_on_print (DirectPhotoPage* self); -static void _direct_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _direct_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void single_photo_page_on_previous_photo (SinglePhotoPage* self); -static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void single_photo_page_on_next_photo (SinglePhotoPage* self); -static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void editing_host_page_on_rotate_clockwise (EditingHostPage* self); -static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void editing_host_page_on_rotate_counterclockwise (EditingHostPage* self); -static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void editing_host_page_on_flip_horizontally (EditingHostPage* self); -static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void editing_host_page_on_flip_vertically (EditingHostPage* self); -static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void editing_host_page_on_enhance (EditingHostPage* self); -static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void editing_host_page_toggle_crop (EditingHostPage* self); -static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void editing_host_page_toggle_straighten (EditingHostPage* self); -static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void editing_host_page_toggle_redeye (EditingHostPage* self); -static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void editing_host_page_toggle_adjust (EditingHostPage* self); -static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void editing_host_page_on_revert (EditingHostPage* self); -static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void editing_host_page_on_adjust_date_time (EditingHostPage* self); -static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void editing_host_page_on_set_background (EditingHostPage* self); -static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void editing_host_page_on_increase_size (EditingHostPage* self); -static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void editing_host_page_on_decrease_size (EditingHostPage* self); -static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void editing_host_page_snap_zoom_to_min (EditingHostPage* self); -static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self); -static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void editing_host_page_snap_zoom_to_max (EditingHostPage* self); -static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); DirectPhotoPage* direct_photo_page_new (GFile* file); -DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file); -EditingHostPage* editing_host_page_construct (GType object_type, SourceCollection* sources, const gchar* name); +DirectPhotoPage* direct_photo_page_construct (GType object_type, + GFile* file); +EditingHostPage* editing_host_page_construct (GType object_type, + SourceCollection* sources, + const gchar* name); static gboolean direct_photo_page_check_editable_file (GFile* file); gpointer application_ref (gpointer instance); void application_unref (gpointer instance); -GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_application (GValue* value, gpointer v_object); -void value_take_application (GValue* value, gpointer v_object); +GParamSpec* param_spec_application (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_application (GValue* value, + gpointer v_object); +void value_take_application (GValue* value, + gpointer v_object); gpointer value_get_application (const GValue* value); GType application_get_type (void) G_GNUC_CONST; Application* application_get_instance (void); @@ -710,47 +794,80 @@ DirectViewCollection* direct_view_collection_new (void); DirectViewCollection* direct_view_collection_construct (GType object_type); ViewCollection* page_get_view (Page* self); static void direct_photo_page_on_selection_group_altered (DirectPhotoPage* self); -static void _direct_photo_page_on_selection_group_altered_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self); -static void direct_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); -void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static void direct_photo_page_real_add_actions (Page* base, GActionMap* map); -void page_add_actions (Page* self, GActionMap* map); -static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map); -void page_remove_actions (Page* self, GActionMap* map); -static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Page* base, int* result_length1); -InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1); +static void _direct_photo_page_on_selection_group_altered_view_collection_selection_group_altered (ViewCollection* _sender, + gpointer self); +static void direct_photo_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames); +void page_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames); +static void direct_photo_page_real_add_actions (Page* base, + GActionMap* map); +void page_add_actions (Page* self, + GActionMap* map); +static void direct_photo_page_real_remove_actions (Page* base, + GActionMap* map); +void page_remove_actions (Page* self, + GActionMap* map); +static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Page* base, + int* result_length1); +InjectionGroup** page_init_collect_injection_groups (Page* self, + int* result_length1); InjectionGroup* injection_group_new (const gchar* path); -InjectionGroup* injection_group_construct (GType object_type, const gchar* path); -void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator); -static void _vala_array_add64 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); -static void _vala_array_add65 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); -void app_window_error_message (const gchar* message, GtkWindow* parent); +InjectionGroup* injection_group_construct (GType object_type, + const gchar* path); +void injection_group_add_menu_item (InjectionGroup* self, + const gchar* name, + const gchar* action, + const gchar* accellerator); +static void _vala_array_add64 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value); +static void _vala_array_add65 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value); +void app_window_error_message (const gchar* message, + GtkWindow* parent); gboolean photo_file_format_is_file_supported (GFile* file); #define RESOURCES_APP_TITLE "Shotwell" static void direct_photo_page_real_realize (GtkWidget* base); GType direct_photo_get_type (void) G_GNUC_CONST; -DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self, GFile* file); -void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection* controller, Photo* starting_photo); +DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self, + GFile* file); +void editing_host_page_display_mirror_of (EditingHostPage* self, + ViewCollection* controller, + Photo* starting_photo); void app_window_panic (const gchar* msg); -static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo* new_photo); +static void direct_photo_page_real_photo_changing (EditingHostPage* base, + Photo* new_photo); Photo* editing_host_page_get_photo (EditingHostPage* self); -static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* self, gboolean should_allow_rotation); -static void _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed (DirectPhoto* _sender, gboolean b, gpointer self); +static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* self, + gboolean should_allow_rotation); +static void _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed (DirectPhoto* _sender, + gboolean b, + gpointer self); GType import_result_get_type (void) G_GNUC_CONST; ImportResult direct_photo_demand_load (DirectPhoto* self); GFile* direct_photo_page_get_current_file (DirectPhotoPage* self); GFile* media_source_get_file (MediaSource* self); -static gboolean direct_photo_page_real_on_context_buttonpress (Page* base, GdkEventButton* event); -gboolean page_popup_context_menu (Page* self, GtkMenu* context_menu, GdkEventButton* event); +static gboolean direct_photo_page_real_on_context_buttonpress (Page* base, + GdkEventButton* event); +gboolean page_popup_context_menu (Page* self, + GtkMenu* context_menu, + GdkEventButton* event); static GtkMenu* direct_photo_page_get_context_menu (DirectPhotoPage* self); static void direct_photo_page_update_zoom_menu_item_sensitivity (DirectPhotoPage* self); GType zoom_state_get_type (void) G_GNUC_CONST; ZoomState* zoom_state_dup (const ZoomState* self); void zoom_state_free (ZoomState* self); -void single_photo_page_get_zoom_state (SinglePhotoPage* self, ZoomState* result); +void single_photo_page_get_zoom_state (SinglePhotoPage* self, + ZoomState* result); gboolean zoom_state_is_max (ZoomState *self); gboolean editing_host_page_get_photo_missing (EditingHostPage* self); -void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); +void page_set_action_sensitive (Page* self, + const gchar* name, + gboolean sensitive); gboolean zoom_state_is_default (ZoomState *self); static void direct_photo_page_real_on_increase_size (EditingHostPage* base); static void direct_photo_page_real_on_decrease_size (EditingHostPage* base); @@ -760,446 +877,606 @@ PhotoFileFormat photo_get_file_format (Photo* self); gboolean photo_file_format_can_write (PhotoFileFormat self); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* page_get_command_manager (Page* self); void command_manager_reset (CommandManager* self); -static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, GdkEventButton* event); +static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, + GdkEventButton* event); GtkWindow* page_get_container (Page* self); void fullscreen_window_close (FullscreenWindow* self); -gboolean editing_host_page_on_double_click (EditingHostPage* self, GdkEventButton* event); -static void direct_photo_page_real_update_ui (EditingHostPage* base, gboolean missing); -void editing_host_page_update_ui (EditingHostPage* self, gboolean missing); -static void direct_photo_page_real_update_actions (Page* base, gint selected_count, gint count); +gboolean editing_host_page_on_double_click (EditingHostPage* self, + GdkEventButton* event); +static void direct_photo_page_real_update_ui (EditingHostPage* base, + gboolean missing); +void editing_host_page_update_ui (EditingHostPage* self, + gboolean missing); +static void direct_photo_page_real_update_actions (Page* base, + gint selected_count, + gint count); gint data_collection_get_count (DataCollection* self); gboolean photo_has_transformations (Photo* self); -gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* photo); -gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* photo); +gboolean editing_host_page_is_rotate_available (EditingHostPage* self, + Photo* photo); +gboolean editing_host_page_is_enhance_available (EditingHostPage* self, + Photo* photo); GType scaling_get_type (void) G_GNUC_CONST; GType scale_constraint_get_type (void) G_GNUC_CONST; Scaling* scaling_dup (const Scaling* self); void scaling_free (Scaling* self); -gboolean editing_tools_crop_tool_is_available (Photo* photo, Scaling* scaling); +gboolean editing_tools_crop_tool_is_available (Photo* photo, + Scaling* scaling); void scaling_for_original (Scaling* result); -gboolean editing_tools_redeye_tool_is_available (Photo* photo, Scaling* scaling); -void page_update_actions (Page* self, gint selected_count, gint count); -static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self, Photo* photo); +gboolean editing_tools_redeye_tool_is_available (Photo* photo, + Scaling* scaling); +void page_update_actions (Page* self, + gint selected_count, + gint count); +static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self, + Photo* photo); gboolean photo_has_alterations (Photo* self); void photo_remove_all_transformations (Photo* self); -GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message, const gchar* negative, const gchar* affirmative, const gchar* title, GtkWindow* parent); +GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message, + const gchar* negative, + const gchar* affirmative, + const gchar* title, + GtkWindow* parent); gchar* media_source_get_basename (MediaSource* self); GType jpeg_quality_get_type (void) G_GNUC_CONST; -static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint scale, ScaleConstraint constraint, JpegQuality quality, PhotoFileFormat format, gboolean copy_unmodified, gboolean save_metadata); +static void direct_photo_page_save (DirectPhotoPage* self, + GFile* dest, + gint scale, + ScaleConstraint constraint, + JpegQuality quality, + PhotoFileFormat format, + gboolean copy_unmodified, + gboolean save_metadata); gboolean direct_photo_page_check_quit (DirectPhotoPage* self); -static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* base, Photo* old_photo, Photo* new_photo); -void scaling_for_constraint (ScaleConstraint constraint, gint scale, gboolean scale_up, Scaling* result); -void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error); -gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto* * photo, gboolean reimport); -gboolean data_source_equals (DataSource* self, DataSource* source); +static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* base, + Photo* old_photo, + Photo* new_photo); +void scaling_for_constraint (ScaleConstraint constraint, + gint scale, + gboolean scale_up, + Scaling* result); +void photo_export (Photo* self, + GFile* dest_file, + Scaling* scaling, + JpegQuality quality, + PhotoFileFormat export_format, + gboolean direct_copy_unmodified, + gboolean export_metadata, + GError** error); +gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, + GFile* file, + DirectPhoto* * photo, + gboolean reimport); +gboolean data_source_equals (DataSource* self, + DataSource* source); GType direct_view_get_type (void) G_GNUC_CONST; DirectView* direct_view_new (DirectPhoto* source); -DirectView* direct_view_construct (GType object_type, DirectPhoto* source); -gboolean data_collection_add (DataCollection* self, DataObject* object); -void direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection* self, DirectPhoto* photo); +DirectView* direct_view_construct (GType object_type, + DirectPhoto* source); +gboolean data_collection_add (DataCollection* self, + DataObject* object); +void direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection* self, + DirectPhoto* photo); GType export_dialog_get_type (void) G_GNUC_CONST; ExportDialog* export_dialog_new (const gchar* title); -ExportDialog* export_dialog_construct (GType object_type, const gchar* title); +ExportDialog* export_dialog_construct (GType object_type, + const gchar* title); GType export_format_parameters_get_type (void) G_GNUC_CONST; GType export_format_mode_get_type (void) G_GNUC_CONST; ExportFormatParameters* export_format_parameters_dup (const ExportFormatParameters* self); void export_format_parameters_free (ExportFormatParameters* self); void export_format_parameters_last (ExportFormatParameters* result); -gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint* constraint, ExportFormatParameters* parameters); -gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParameters* params); -PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportFormatParameters* params); +gboolean export_dialog_execute (ExportDialog* self, + gint* scale, + ScaleConstraint* constraint, + ExportFormatParameters* parameters); +gchar* photo_get_export_basename_for_parameters (Photo* self, + ExportFormatParameters* params); +PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, + ExportFormatParameters* params); gpointer photo_file_format_properties_ref (gpointer instance); void photo_file_format_properties_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_properties (GValue* value, gpointer v_object); -void value_take_photo_file_format_properties (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_properties (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_properties (GValue* value, + gpointer v_object); +void value_take_photo_file_format_properties (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_properties (const GValue* value); GType photo_file_format_properties_get_type (void) G_GNUC_CONST; PhotoFileFormatProperties* photo_file_format_get_properties (PhotoFileFormat self); -gchar** photo_file_format_properties_get_known_extensions (PhotoFileFormatProperties* self, int* result_length1); +gchar** photo_file_format_properties_get_known_extensions (PhotoFileFormatProperties* self, + int* result_length1); GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); #define RESOURCES_CANCEL_LABEL _ ("_Cancel") #define RESOURCES_OK_LABEL _ ("_OK") void desktop_integration_send_to (GeeCollection* media); GeeList* view_collection_get_selected_sources (ViewCollection* self); -static gboolean direct_photo_page_real_on_app_key_pressed (Page* base, GdkEventKey* event); -void page_activate_action (Page* self, const gchar* name); -gboolean page_on_app_key_pressed (Page* self, GdkEventKey* event); +static gboolean direct_photo_page_real_on_app_key_pressed (Page* base, + GdkEventKey* event); +void page_activate_action (Page* self, + const gchar* name); +gboolean page_on_app_key_pressed (Page* self, + GdkEventKey* event); gint view_collection_get_selected_count (ViewCollection* self); gpointer print_manager_ref (gpointer instance); void print_manager_unref (gpointer instance); -GParamSpec* param_spec_print_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_print_manager (GValue* value, gpointer v_object); -void value_take_print_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_print_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_print_manager (GValue* value, + gpointer v_object); +void value_take_print_manager (GValue* value, + gpointer v_object); gpointer value_get_print_manager (const GValue* value); GType print_manager_get_type (void) G_GNUC_CONST; PrintManager* print_manager_get_instance (void); -void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print); -GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t); +void print_manager_spool_photo (PrintManager* self, + GeeCollection* to_print); +GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, + GType t); static Block7Data* block7_data_ref (Block7Data* _data7_); static void block7_data_unref (void * _userdata_); static gboolean __lambda17_ (Block7Data* _data7_); -void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_enable); +void editing_host_page_enable_rotate (EditingHostPage* self, + gboolean should_enable); static gboolean ___lambda17__gsource_func (gpointer self); -static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base, DataSource* source); +static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base, + DataSource* source); static void direct_photo_page_finalize (GObject * obj); GType direct_fullscreen_photo_page_get_type (void) G_GNUC_CONST; -enum { - DIRECT_FULLSCREEN_PHOTO_PAGE_DUMMY_PROPERTY -}; DirectFullscreenPhotoPage* direct_fullscreen_photo_page_new (GFile* file); -DirectFullscreenPhotoPage* direct_fullscreen_photo_page_construct (GType object_type, GFile* file); -static void direct_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +DirectFullscreenPhotoPage* direct_fullscreen_photo_page_construct (GType object_type, + GFile* file); +static void direct_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static const GActionEntry DIRECT_PHOTO_PAGE_entries[23] = {{"Save", _direct_photo_page_on_save_gsimple_action_activate_callback}, {"SaveAs", _direct_photo_page_on_save_as_gsimple_action_activate_callback}, {"SendTo", _direct_photo_page_on_send_to_gsimple_action_activate_callback}, {"Print", _direct_photo_page_on_print_gsimple_action_activate_callback}, {"PrevPhoto", _single_photo_page_on_previous_photo_gsimple_action_activate_callback}, {"NextPhoto", _single_photo_page_on_next_photo_gsimple_action_activate_callback}, {"RotateClockwise", _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback}, {"RotateCounterclockwise", _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback}, {"FlipHorizontally", _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback}, {"FlipVertically", _editing_host_page_on_flip_vertically_gsimple_action_activate_callback}, {"Enhance", _editing_host_page_on_enhance_gsimple_action_activate_callback}, {"Crop", _editing_host_page_toggle_crop_gsimple_action_activate_callback}, {"Straighten", _editing_host_page_toggle_straighten_gsimple_action_activate_callback}, {"RedEye", _editing_host_page_toggle_redeye_gsimple_action_activate_callback}, {"Adjust", _editing_host_page_toggle_adjust_gsimple_action_activate_callback}, {"Revert", _editing_host_page_on_revert_gsimple_action_activate_callback}, {"AdjustDateTime", _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback}, {"SetBackground", _editing_host_page_on_set_background_gsimple_action_activate_callback}, {"IncreaseSize", _editing_host_page_on_increase_size_gsimple_action_activate_callback}, {"DecreaseSize", _editing_host_page_on_decrease_size_gsimple_action_activate_callback}, {"ZoomFit", _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback}, {"Zoom100", _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback}, {"Zoom200", _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback}}; -static void _direct_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_direct_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 32 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_on_photos_altered ((DirectPhotoPage*) self, items); -#line 870 "DirectPhotoPage.c" +#line 1069 "DirectPhotoPage.c" } -static void _direct_photo_page_on_save_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_direct_photo_page_on_save_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_on_save ((DirectPhotoPage*) self); -#line 877 "DirectPhotoPage.c" +#line 1080 "DirectPhotoPage.c" } -static void _direct_photo_page_on_save_as_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_direct_photo_page_on_save_as_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_on_save_as ((DirectPhotoPage*) self); -#line 884 "DirectPhotoPage.c" +#line 1091 "DirectPhotoPage.c" } -static void _direct_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_direct_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_on_send_to ((DirectPhotoPage*) self); -#line 891 "DirectPhotoPage.c" +#line 1102 "DirectPhotoPage.c" } -static void _direct_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_direct_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_on_print ((DirectPhotoPage*) self); -#line 898 "DirectPhotoPage.c" +#line 1113 "DirectPhotoPage.c" } -static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" single_photo_page_on_previous_photo ((SinglePhotoPage*) self); -#line 905 "DirectPhotoPage.c" +#line 1124 "DirectPhotoPage.c" } -static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" single_photo_page_on_next_photo ((SinglePhotoPage*) self); -#line 912 "DirectPhotoPage.c" +#line 1135 "DirectPhotoPage.c" } -static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" editing_host_page_on_rotate_clockwise ((EditingHostPage*) self); -#line 919 "DirectPhotoPage.c" +#line 1146 "DirectPhotoPage.c" } -static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self); -#line 926 "DirectPhotoPage.c" +#line 1157 "DirectPhotoPage.c" } -static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" editing_host_page_on_flip_horizontally ((EditingHostPage*) self); -#line 933 "DirectPhotoPage.c" +#line 1168 "DirectPhotoPage.c" } -static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" editing_host_page_on_flip_vertically ((EditingHostPage*) self); -#line 940 "DirectPhotoPage.c" +#line 1179 "DirectPhotoPage.c" } -static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" editing_host_page_on_enhance ((EditingHostPage*) self); -#line 947 "DirectPhotoPage.c" +#line 1190 "DirectPhotoPage.c" } -static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" editing_host_page_toggle_crop ((EditingHostPage*) self); -#line 954 "DirectPhotoPage.c" +#line 1201 "DirectPhotoPage.c" } -static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" editing_host_page_toggle_straighten ((EditingHostPage*) self); -#line 961 "DirectPhotoPage.c" +#line 1212 "DirectPhotoPage.c" } -static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" editing_host_page_toggle_redeye ((EditingHostPage*) self); -#line 968 "DirectPhotoPage.c" +#line 1223 "DirectPhotoPage.c" } -static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" editing_host_page_toggle_adjust ((EditingHostPage*) self); -#line 975 "DirectPhotoPage.c" +#line 1234 "DirectPhotoPage.c" } -static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" editing_host_page_on_revert ((EditingHostPage*) self); -#line 982 "DirectPhotoPage.c" +#line 1245 "DirectPhotoPage.c" } -static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" editing_host_page_on_adjust_date_time ((EditingHostPage*) self); -#line 989 "DirectPhotoPage.c" +#line 1256 "DirectPhotoPage.c" } -static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" editing_host_page_on_set_background ((EditingHostPage*) self); -#line 996 "DirectPhotoPage.c" +#line 1267 "DirectPhotoPage.c" } -static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" editing_host_page_on_increase_size ((EditingHostPage*) self); -#line 1003 "DirectPhotoPage.c" +#line 1278 "DirectPhotoPage.c" } -static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" editing_host_page_on_decrease_size ((EditingHostPage*) self); -#line 1010 "DirectPhotoPage.c" +#line 1289 "DirectPhotoPage.c" } -static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" editing_host_page_snap_zoom_to_min ((EditingHostPage*) self); -#line 1017 "DirectPhotoPage.c" +#line 1300 "DirectPhotoPage.c" } -static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" editing_host_page_snap_zoom_to_isomorphic ((EditingHostPage*) self); -#line 1024 "DirectPhotoPage.c" +#line 1311 "DirectPhotoPage.c" } -static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" editing_host_page_snap_zoom_to_max ((EditingHostPage*) self); -#line 1031 "DirectPhotoPage.c" +#line 1322 "DirectPhotoPage.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 22 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return self ? g_object_ref (self) : NULL; -#line 1038 "DirectPhotoPage.c" +#line 1331 "DirectPhotoPage.c" } -static void _direct_photo_page_on_selection_group_altered_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) { +static void +_direct_photo_page_on_selection_group_altered_view_collection_selection_group_altered (ViewCollection* _sender, + gpointer self) +{ #line 28 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_on_selection_group_altered ((DirectPhotoPage*) self); -#line 1045 "DirectPhotoPage.c" +#line 1341 "DirectPhotoPage.c" } -DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file) { +DirectPhotoPage* +direct_photo_page_construct (GType object_type, + GFile* file) +{ DirectPhotoPage * self = NULL; DirectPhotoSourceCollection* _tmp0_; - GFile* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; - GFile* _tmp4_; - gboolean _tmp5_; - GFile* _tmp8_; - GFile* _tmp9_; - DirectViewCollection* _tmp10_; - GFile* _tmp11_; - GFile* _tmp12_; - DirectPhotoSourceCollection* _tmp13_; - ViewCollection* _tmp14_; - ViewCollection* _tmp15_; + GFile* _tmp5_; + DirectViewCollection* _tmp6_; + GFile* _tmp7_; + DirectPhotoSourceCollection* _tmp8_; + ViewCollection* _tmp9_; + ViewCollection* _tmp10_; #line 13 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 14 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = direct_photo_global; #line 14 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp1_ = file; -#line 14 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp2_ = g_file_get_basename (_tmp1_); + _tmp1_ = g_file_get_basename (file); #line 14 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 14 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - self = (DirectPhotoPage*) editing_host_page_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp3_); + self = (DirectPhotoPage*) editing_host_page_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp2_); #line 14 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp3_); -#line 16 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp4_ = file; -#line 16 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp5_ = direct_photo_page_check_editable_file (_tmp4_); + _g_free0 (_tmp2_); #line 16 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (!_tmp5_) { -#line 1085 "DirectPhotoPage.c" - Application* _tmp6_; - Application* _tmp7_; + if (!direct_photo_page_check_editable_file (file)) { +#line 1373 "DirectPhotoPage.c" + Application* _tmp3_; + Application* _tmp4_; #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp6_ = application_get_instance (); + _tmp3_ = application_get_instance (); #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - application_panic (_tmp7_); + application_panic (_tmp4_); #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _application_unref0 (_tmp7_); + _application_unref0 (_tmp4_); #line 19 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return self; -#line 1098 "DirectPhotoPage.c" +#line 1386 "DirectPhotoPage.c" } #line 22 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp8_ = file; -#line 22 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp9_ = _g_object_ref0 (_tmp8_); + _tmp5_ = _g_object_ref0 (file); #line 22 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (self->priv->initial_file); #line 22 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - self->priv->initial_file = _tmp9_; + self->priv->initial_file = _tmp5_; #line 23 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp10_ = direct_view_collection_new (); + _tmp6_ = direct_view_collection_new (); #line 23 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _data_collection_unref0 (self->priv->view_controller); #line 23 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - self->priv->view_controller = _tmp10_; -#line 24 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp11_ = file; + self->priv->view_controller = _tmp6_; #line 24 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp12_ = g_file_get_parent (_tmp11_); + _tmp7_ = g_file_get_parent (file); #line 24 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (self->priv->current_save_dir); #line 24 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - self->priv->current_save_dir = _tmp12_; + self->priv->current_save_dir = _tmp7_; #line 26 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp13_ = direct_photo_global; + _tmp8_ = direct_photo_global; #line 26 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _direct_photo_page_on_photos_altered_data_collection_items_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _direct_photo_page_on_photos_altered_data_collection_items_altered, self, 0); #line 28 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 28 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp15_ = _tmp14_; + _tmp10_ = _tmp9_; #line 28 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - g_signal_connect_object (_tmp15_, "selection-group-altered", (GCallback) _direct_photo_page_on_selection_group_altered_view_collection_selection_group_altered, self, 0); + g_signal_connect_object (_tmp10_, "selection-group-altered", (GCallback) _direct_photo_page_on_selection_group_altered_view_collection_selection_group_altered, self, 0); #line 28 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _data_collection_unref0 (_tmp15_); + _data_collection_unref0 (_tmp10_); #line 13 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return self; -#line 1136 "DirectPhotoPage.c" +#line 1420 "DirectPhotoPage.c" } -DirectPhotoPage* direct_photo_page_new (GFile* file) { +DirectPhotoPage* +direct_photo_page_new (GFile* file) +{ #line 13 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return direct_photo_page_construct (TYPE_DIRECT_PHOTO_PAGE, file); -#line 1143 "DirectPhotoPage.c" +#line 1429 "DirectPhotoPage.c" } -static void direct_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { +static void +direct_photo_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames) +{ DirectPhotoPage * self; - GeeList* _tmp0_; - GeeList* _tmp1_; - GeeList* _tmp2_; #line 35 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 35 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); #line 36 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = ui_filenames; -#line 36 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - PAGE_CLASS (direct_photo_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_); + PAGE_CLASS (direct_photo_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), ui_filenames); #line 38 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp1_ = ui_filenames; -#line 38 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "direct_context.ui"); -#line 39 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp2_ = ui_filenames; + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "direct_context.ui"); #line 39 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), "direct.ui"); -#line 1168 "DirectPhotoPage.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "direct.ui"); +#line 1448 "DirectPhotoPage.c" } -static void direct_photo_page_real_add_actions (Page* base, GActionMap* map) { +static void +direct_photo_page_real_add_actions (Page* base, + GActionMap* map) +{ DirectPhotoPage * self; - GActionMap* _tmp0_; - GActionMap* _tmp1_; #line 68 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 68 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 69 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = map; -#line 69 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - PAGE_CLASS (direct_photo_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_); -#line 71 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp1_ = map; + PAGE_CLASS (direct_photo_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), map); #line 71 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - g_action_map_add_action_entries (_tmp1_, DIRECT_PHOTO_PAGE_entries, G_N_ELEMENTS (DIRECT_PHOTO_PAGE_entries), self); -#line 1188 "DirectPhotoPage.c" + g_action_map_add_action_entries (map, DIRECT_PHOTO_PAGE_entries, G_N_ELEMENTS (DIRECT_PHOTO_PAGE_entries), self); +#line 1465 "DirectPhotoPage.c" } -static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map) { +static void +direct_photo_page_real_remove_actions (Page* base, + GActionMap* map) +{ DirectPhotoPage * self; - GActionMap* _tmp0_; #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = map; -#line 75 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - PAGE_CLASS (direct_photo_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_); -#line 1203 "DirectPhotoPage.c" + PAGE_CLASS (direct_photo_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), map); +#line 1480 "DirectPhotoPage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -1211,72 +1488,84 @@ static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map) entry_collection_length1 = G_N_ELEMENTS (DIRECT_PHOTO_PAGE_entries); #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (DIRECT_PHOTO_PAGE_entries); entry_it = entry_it + 1) { -#line 1215 "DirectPhotoPage.c" +#line 1492 "DirectPhotoPage.c" GActionEntry entry = {0}; #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" entry = entry_collection[entry_it]; -#line 1219 "DirectPhotoPage.c" +#line 1496 "DirectPhotoPage.c" { - GActionMap* _tmp1_; - GActionEntry _tmp2_; - const gchar* _tmp3_; -#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp1_ = map; + GActionEntry _tmp0_; + const gchar* _tmp1_; #line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp2_ = entry; + _tmp0_ = entry; #line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp3_ = _tmp2_.name; + _tmp1_ = _tmp0_.name; #line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - g_action_map_remove_action (_tmp1_, _tmp3_); -#line 1232 "DirectPhotoPage.c" + g_action_map_remove_action (map, _tmp1_); +#line 1506 "DirectPhotoPage.c" } } } } -static gpointer _injection_group_ref0 (gpointer self) { +static gpointer +_injection_group_ref0 (gpointer self) +{ #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return self ? injection_group_ref (self) : NULL; -#line 1242 "DirectPhotoPage.c" +#line 1518 "DirectPhotoPage.c" } -static void _vala_array_add64 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { +static void +_vala_array_add64 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value) +{ #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if ((*length) == (*size)) { #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" *size = (*size) ? (2 * (*size)) : 4; #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 1253 "DirectPhotoPage.c" +#line 1534 "DirectPhotoPage.c" } #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" (*array)[(*length)++] = value; #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" (*array)[*length] = NULL; -#line 1259 "DirectPhotoPage.c" +#line 1540 "DirectPhotoPage.c" } -static void _vala_array_add65 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { +static void +_vala_array_add65 (InjectionGroup** * array, + int* length, + int* size, + InjectionGroup* value) +{ #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if ((*length) == (*size)) { #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" *size = (*size) ? (2 * (*size)) : 4; #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 1270 "DirectPhotoPage.c" +#line 1556 "DirectPhotoPage.c" } #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" (*array)[(*length)++] = value; #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" (*array)[*length] = NULL; -#line 1276 "DirectPhotoPage.c" +#line 1562 "DirectPhotoPage.c" } -static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Page* base, int* result_length1) { +static InjectionGroup** +direct_photo_page_real_init_collect_injection_groups (Page* base, + int* result_length1) +{ DirectPhotoPage * self; InjectionGroup** result = NULL; InjectionGroup** groups = NULL; @@ -1342,7 +1631,7 @@ static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Pa if (result_length1) { #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" *result_length1 = _tmp8__length1; -#line 1346 "DirectPhotoPage.c" +#line 1635 "DirectPhotoPage.c" } #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = _tmp8_; @@ -1352,137 +1641,112 @@ static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Pa _injection_group_unref0 (print_group); #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 1356 "DirectPhotoPage.c" +#line 1645 "DirectPhotoPage.c" } -static gboolean direct_photo_page_check_editable_file (GFile* file) { +static gboolean +direct_photo_page_check_editable_file (GFile* file) +{ gboolean result = FALSE; - GFile* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; + gboolean _tmp2_; #line 97 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = file; -#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp1_ = g_file_get_path (_tmp0_); + _tmp0_ = g_file_get_path (file); #line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp3_ = g_file_test (_tmp2_, G_FILE_TEST_EXISTS); + _tmp2_ = !g_file_test (_tmp1_, G_FILE_TEST_EXISTS); #line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp4_ = !_tmp3_; + _g_free0 (_tmp1_); #line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp2_); -#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp4_) { -#line 1383 "DirectPhotoPage.c" - GFile* _tmp5_; + if (_tmp2_) { +#line 1668 "DirectPhotoPage.c" + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; -#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp5_ = file; #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp6_ = g_file_get_path (_tmp5_); + _tmp3_ = g_file_get_path (file); #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp8_ = g_strdup_printf (_ ("%s does not exist."), _tmp7_); + _tmp5_ = g_strdup_printf (_ ("%s does not exist."), _tmp4_); #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - app_window_error_message (_tmp9_, NULL); + app_window_error_message (_tmp6_, NULL); #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp6_); #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp7_); -#line 1405 "DirectPhotoPage.c" + _g_free0 (_tmp4_); +#line 1687 "DirectPhotoPage.c" } else { - GFile* _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; - gboolean _tmp13_; - gboolean _tmp14_; -#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp10_ = file; -#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp11_ = g_file_get_path (_tmp10_); + gchar* _tmp7_; + gchar* _tmp8_; + gboolean _tmp9_; #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp12_ = _tmp11_; + _tmp7_ = g_file_get_path (file); #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp13_ = g_file_test (_tmp12_, G_FILE_TEST_IS_REGULAR); + _tmp8_ = _tmp7_; #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp14_ = !_tmp13_; + _tmp9_ = !g_file_test (_tmp8_, G_FILE_TEST_IS_REGULAR); #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp8_); #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp14_) { -#line 1426 "DirectPhotoPage.c" - GFile* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; -#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp15_ = file; + if (_tmp9_) { +#line 1702 "DirectPhotoPage.c" + gchar* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp16_ = g_file_get_path (_tmp15_); + _tmp10_ = g_file_get_path (file); #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp17_ = _tmp16_; + _tmp11_ = _tmp10_; #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp18_ = g_strdup_printf (_ ("%s is not a file."), _tmp17_); + _tmp12_ = g_strdup_printf (_ ("%s is not a file."), _tmp11_); #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp19_ = _tmp18_; + _tmp13_ = _tmp12_; #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - app_window_error_message (_tmp19_, NULL); + app_window_error_message (_tmp13_, NULL); #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp19_); + _g_free0 (_tmp13_); #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp17_); -#line 1448 "DirectPhotoPage.c" + _g_free0 (_tmp11_); +#line 1721 "DirectPhotoPage.c" } else { - GFile* _tmp20_; - gboolean _tmp21_; -#line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp20_ = file; -#line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp21_ = photo_file_format_is_file_supported (_tmp20_); #line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (!_tmp21_) { -#line 1458 "DirectPhotoPage.c" - GFile* _tmp22_; - gchar* _tmp23_; - gchar* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; -#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp22_ = file; + if (!photo_file_format_is_file_supported (file)) { +#line 1725 "DirectPhotoPage.c" + gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp23_ = g_file_get_path (_tmp22_); + _tmp14_ = g_file_get_path (file); #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp24_ = _tmp23_; + _tmp15_ = _tmp14_; #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp25_ = g_strdup_printf (_ ("%s does not support the file format of\n%s."), RESOURCES_APP_TITLE, _tmp24_); + _tmp16_ = g_strdup_printf (_ ("%s does not support the file format of\n%s."), RESOURCES_APP_TITLE, _tmp15_); #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp26_ = _tmp25_; + _tmp17_ = _tmp16_; #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - app_window_error_message (_tmp26_, NULL); + app_window_error_message (_tmp17_, NULL); #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp17_); #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp24_); -#line 1480 "DirectPhotoPage.c" + _g_free0 (_tmp15_); +#line 1744 "DirectPhotoPage.c" } else { #line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = TRUE; #line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 1486 "DirectPhotoPage.c" +#line 1750 "DirectPhotoPage.c" } } } @@ -1490,11 +1754,13 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) { result = FALSE; #line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 1494 "DirectPhotoPage.c" +#line 1758 "DirectPhotoPage.c" } -static void direct_photo_page_real_realize (GtkWidget* base) { +static void +direct_photo_page_real_realize (GtkWidget* base) +{ DirectPhotoPage * self; DirectPhoto* photo = NULL; DirectPhotoSourceCollection* _tmp0_; @@ -1507,7 +1773,7 @@ static void direct_photo_page_real_realize (GtkWidget* base) { if (GTK_WIDGET_CLASS (direct_photo_page_parent_class)->realize != NULL) { #line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" GTK_WIDGET_CLASS (direct_photo_page_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), gtk_widget_get_type (), GtkWidget)); -#line 1511 "DirectPhotoPage.c" +#line 1777 "DirectPhotoPage.c" } #line 115 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = direct_photo_global; @@ -1521,7 +1787,7 @@ static void direct_photo_page_real_realize (GtkWidget* base) { _tmp3_ = photo; #line 117 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp3_ != NULL) { -#line 1525 "DirectPhotoPage.c" +#line 1791 "DirectPhotoPage.c" DirectViewCollection* _tmp4_; DirectPhoto* _tmp5_; #line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1530,7 +1796,7 @@ static void direct_photo_page_real_realize (GtkWidget* base) { _tmp5_ = photo; #line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" editing_host_page_display_mirror_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO, Photo)); -#line 1534 "DirectPhotoPage.c" +#line 1800 "DirectPhotoPage.c" } else { GFile* _tmp6_; gchar* _tmp7_; @@ -1553,7 +1819,7 @@ static void direct_photo_page_real_realize (GtkWidget* base) { _g_free0 (_tmp10_); #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp8_); -#line 1557 "DirectPhotoPage.c" +#line 1823 "DirectPhotoPage.c" } #line 123 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (self->priv->initial_file); @@ -1561,27 +1827,32 @@ static void direct_photo_page_real_realize (GtkWidget* base) { self->priv->initial_file = NULL; #line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (photo); -#line 1565 "DirectPhotoPage.c" +#line 1831 "DirectPhotoPage.c" } -static void _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed (DirectPhoto* _sender, gboolean b, gpointer self) { +static void +_direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed (DirectPhoto* _sender, + gboolean b, + gpointer self) +{ #line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_on_dphoto_can_rotate_changed ((DirectPhotoPage*) self, b); -#line 1572 "DirectPhotoPage.c" +#line 1842 "DirectPhotoPage.c" } -static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo* new_photo) { +static void +direct_photo_page_real_photo_changing (EditingHostPage* base, + Photo* new_photo) +{ DirectPhotoPage * self; Photo* _tmp0_; Photo* _tmp1_; gboolean _tmp2_; - Photo* _tmp8_; DirectPhoto* tmp = NULL; - Photo* _tmp9_; - DirectPhoto* _tmp10_; - DirectPhoto* _tmp11_; + DirectPhoto* _tmp8_; + DirectPhoto* _tmp9_; #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1596,7 +1867,7 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo* _g_object_unref0 (_tmp1_); #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp2_) { -#line 1600 "DirectPhotoPage.c" +#line 1871 "DirectPhotoPage.c" DirectPhoto* tmp = NULL; Photo* _tmp3_; DirectPhoto* _tmp4_; @@ -1609,7 +1880,7 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo* if (_tmp4_ == NULL) { #line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 1613 "DirectPhotoPage.c" +#line 1884 "DirectPhotoPage.c" } #line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" tmp = _tmp4_; @@ -1617,7 +1888,7 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo* _tmp5_ = tmp; #line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp5_ != NULL) { -#line 1621 "DirectPhotoPage.c" +#line 1892 "DirectPhotoPage.c" DirectPhoto* _tmp6_; guint _tmp7_; #line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1626,41 +1897,39 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo* g_signal_parse_name ("can-rotate-changed", TYPE_DIRECT_PHOTO, &_tmp7_, NULL, FALSE); #line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed, self); -#line 1630 "DirectPhotoPage.c" +#line 1901 "DirectPhotoPage.c" } #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (tmp); -#line 1634 "DirectPhotoPage.c" +#line 1905 "DirectPhotoPage.c" } #line 135 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp8_ = new_photo; -#line 135 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - direct_photo_demand_load (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DIRECT_PHOTO, DirectPhoto)); -#line 137 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp9_ = new_photo; + direct_photo_demand_load (G_TYPE_CHECK_INSTANCE_CAST (new_photo, TYPE_DIRECT_PHOTO, DirectPhoto)); #line 137 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_DIRECT_PHOTO) ? ((DirectPhoto*) _tmp9_) : NULL); + _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (new_photo, TYPE_DIRECT_PHOTO) ? ((DirectPhoto*) new_photo) : NULL); #line 137 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - tmp = _tmp10_; + tmp = _tmp8_; #line 139 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp11_ = tmp; + _tmp9_ = tmp; #line 139 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp11_ != NULL) { -#line 1650 "DirectPhotoPage.c" - DirectPhoto* _tmp12_; + if (_tmp9_ != NULL) { +#line 1917 "DirectPhotoPage.c" + DirectPhoto* _tmp10_; #line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp12_ = tmp; + _tmp10_ = tmp; #line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - g_signal_connect_object (_tmp12_, "can-rotate-changed", (GCallback) _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed, self, 0); -#line 1656 "DirectPhotoPage.c" + g_signal_connect_object (_tmp10_, "can-rotate-changed", (GCallback) _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed, self, 0); +#line 1923 "DirectPhotoPage.c" } #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (tmp); -#line 1660 "DirectPhotoPage.c" +#line 1927 "DirectPhotoPage.c" } -GFile* direct_photo_page_get_current_file (DirectPhotoPage* self) { +GFile* +direct_photo_page_get_current_file (DirectPhotoPage* self) +{ GFile* result = NULL; Photo* _tmp0_; Photo* _tmp1_; @@ -1682,16 +1951,18 @@ GFile* direct_photo_page_get_current_file (DirectPhotoPage* self) { result = _tmp3_; #line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 1686 "DirectPhotoPage.c" +#line 1955 "DirectPhotoPage.c" } -static gboolean direct_photo_page_real_on_context_buttonpress (Page* base, GdkEventButton* event) { +static gboolean +direct_photo_page_real_on_context_buttonpress (Page* base, + GdkEventButton* event) +{ DirectPhotoPage * self; gboolean result = FALSE; GtkMenu* _tmp0_; GtkMenu* _tmp1_; - GdkEventButton* _tmp2_; #line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1701,20 +1972,20 @@ static gboolean direct_photo_page_real_on_context_buttonpress (Page* base, GdkEv #line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = _tmp0_; #line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp2_ = event; -#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, _tmp2_); + page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, event); #line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp1_); #line 151 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = TRUE; #line 151 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 1714 "DirectPhotoPage.c" +#line 1983 "DirectPhotoPage.c" } -static GtkMenu* direct_photo_page_get_context_menu (DirectPhotoPage* self) { +static GtkMenu* +direct_photo_page_get_context_menu (DirectPhotoPage* self) +{ GtkMenu* result = NULL; GtkMenu* _tmp0_; GtkMenu* _tmp7_; @@ -1725,7 +1996,7 @@ static GtkMenu* direct_photo_page_get_context_menu (DirectPhotoPage* self) { _tmp0_ = self->priv->context_menu; #line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp0_ == NULL) { -#line 1729 "DirectPhotoPage.c" +#line 2000 "DirectPhotoPage.c" GMenuModel* model = NULL; GtkBuilder* _tmp1_; GObject* _tmp2_; @@ -1757,7 +2028,7 @@ static GtkMenu* direct_photo_page_get_context_menu (DirectPhotoPage* self) { gtk_menu_attach_to_widget (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL); #line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (model); -#line 1761 "DirectPhotoPage.c" +#line 2032 "DirectPhotoPage.c" } #line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp7_ = self->priv->context_menu; @@ -1767,64 +2038,54 @@ static GtkMenu* direct_photo_page_get_context_menu (DirectPhotoPage* self) { result = _tmp8_; #line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 1771 "DirectPhotoPage.c" +#line 2042 "DirectPhotoPage.c" } -static void direct_photo_page_update_zoom_menu_item_sensitivity (DirectPhotoPage* self) { +static void +direct_photo_page_update_zoom_menu_item_sensitivity (DirectPhotoPage* self) +{ gboolean _tmp0_ = FALSE; ZoomState _tmp1_ = {0}; - gboolean _tmp2_; - gboolean _tmp4_ = FALSE; - ZoomState _tmp5_ = {0}; - gboolean _tmp6_; + gboolean _tmp2_ = FALSE; + ZoomState _tmp3_ = {0}; #line 167 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); #line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_); #line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp2_ = zoom_state_is_max (&_tmp1_); + if (!zoom_state_is_max (&_tmp1_)) { #line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (!_tmp2_) { -#line 1790 "DirectPhotoPage.c" - gboolean _tmp3_; -#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp3_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = !_tmp3_; -#line 1796 "DirectPhotoPage.c" + _tmp0_ = !editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); +#line 2061 "DirectPhotoPage.c" } else { #line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = FALSE; -#line 1800 "DirectPhotoPage.c" +#line 2065 "DirectPhotoPage.c" } #line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_); #line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_); -#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp6_ = zoom_state_is_default (&_tmp5_); -#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (!_tmp6_) { -#line 1810 "DirectPhotoPage.c" - gboolean _tmp7_; + single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp3_); #line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp7_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + if (!zoom_state_is_default (&_tmp3_)) { #line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp4_ = !_tmp7_; -#line 1816 "DirectPhotoPage.c" + _tmp2_ = !editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); +#line 2075 "DirectPhotoPage.c" } else { #line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp4_ = FALSE; -#line 1820 "DirectPhotoPage.c" + _tmp2_ = FALSE; +#line 2079 "DirectPhotoPage.c" } #line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_); -#line 1824 "DirectPhotoPage.c" + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp2_); +#line 2083 "DirectPhotoPage.c" } -static void direct_photo_page_real_on_increase_size (EditingHostPage* base) { +static void +direct_photo_page_real_on_increase_size (EditingHostPage* base) +{ DirectPhotoPage * self; #line 172 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); @@ -1832,11 +2093,13 @@ static void direct_photo_page_real_on_increase_size (EditingHostPage* base) { EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_increase_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_update_zoom_menu_item_sensitivity (self); -#line 1836 "DirectPhotoPage.c" +#line 2097 "DirectPhotoPage.c" } -static void direct_photo_page_real_on_decrease_size (EditingHostPage* base) { +static void +direct_photo_page_real_on_decrease_size (EditingHostPage* base) +{ DirectPhotoPage * self; #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); @@ -1844,20 +2107,21 @@ static void direct_photo_page_real_on_decrease_size (EditingHostPage* base) { EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_decrease_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 181 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_update_zoom_menu_item_sensitivity (self); -#line 1848 "DirectPhotoPage.c" +#line 2111 "DirectPhotoPage.c" } -static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap* map) { +static void +direct_photo_page_on_photos_altered (DirectPhotoPage* self, + GeeMap* map) +{ gboolean contains = FALSE; - gboolean _tmp0_; + gboolean _tmp11_ = FALSE; + gboolean sensitive = FALSE; + gboolean _tmp12_; gboolean _tmp14_ = FALSE; gboolean _tmp15_; - gboolean sensitive = FALSE; - gboolean _tmp17_; - gboolean _tmp19_ = FALSE; - gboolean _tmp20_; - gboolean _tmp25_; + gboolean _tmp18_; #line 184 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); #line 184 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1865,161 +2129,143 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap* #line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" contains = FALSE; #line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp0_) { -#line 1872 "DirectPhotoPage.c" + if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { +#line 2134 "DirectPhotoPage.c" Photo* photo = NULL; - Photo* _tmp1_; + Photo* _tmp0_; #line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - photo = _tmp1_; -#line 1879 "DirectPhotoPage.c" + photo = _tmp0_; +#line 2141 "DirectPhotoPage.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp2_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; GeeSet* _tmp3_; - GeeSet* _tmp4_; - GeeSet* _tmp5_; - GeeIterator* _tmp6_; - GeeIterator* _tmp7_; -#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp2_ = map; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp3_ = gee_map_get_keys (_tmp2_); + _tmp1_ = gee_map_get_keys (map); #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp3_); #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _object_it = _tmp7_; + _object_it = _tmp5_; #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" while (TRUE) { -#line 1906 "DirectPhotoPage.c" - GeeIterator* _tmp8_; - gboolean _tmp9_; +#line 2165 "DirectPhotoPage.c" + GeeIterator* _tmp6_; DataObject* object = NULL; - GeeIterator* _tmp10_; - gpointer _tmp11_; - DataObject* _tmp12_; - Photo* _tmp13_; -#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp8_ = _object_it; + GeeIterator* _tmp7_; + gpointer _tmp8_; + DataObject* _tmp9_; + Photo* _tmp10_; #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp9_ = gee_iterator_next (_tmp8_); + _tmp6_ = _object_it; #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (!_tmp9_) { + if (!gee_iterator_next (_tmp6_)) { #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" break; -#line 1922 "DirectPhotoPage.c" +#line 2178 "DirectPhotoPage.c" } #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp10_ = _object_it; + _tmp7_ = _object_it; #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp11_ = gee_iterator_get (_tmp10_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - object = (DataObject*) _tmp11_; + object = (DataObject*) _tmp8_; #line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp12_ = object; + _tmp9_ = object; #line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp13_ = photo; + _tmp10_ = photo; #line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO, Photo) == _tmp13_) { + if (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo) == _tmp10_) { #line 190 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" contains = TRUE; #line 192 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (object); #line 192 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" break; -#line 1942 "DirectPhotoPage.c" +#line 2198 "DirectPhotoPage.c" } #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (object); -#line 1946 "DirectPhotoPage.c" +#line 2202 "DirectPhotoPage.c" } #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_object_it); -#line 1950 "DirectPhotoPage.c" +#line 2206 "DirectPhotoPage.c" } #line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (photo); -#line 1954 "DirectPhotoPage.c" +#line 2210 "DirectPhotoPage.c" } #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp15_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp15_) { -#line 1960 "DirectPhotoPage.c" - gboolean _tmp16_; -#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp16_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp14_ = !_tmp16_; -#line 1966 "DirectPhotoPage.c" + _tmp11_ = !editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); +#line 2216 "DirectPhotoPage.c" } else { #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp14_ = FALSE; -#line 1970 "DirectPhotoPage.c" + _tmp11_ = FALSE; +#line 2220 "DirectPhotoPage.c" } #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - sensitive = _tmp14_; + sensitive = _tmp11_; #line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp17_ = sensitive; + _tmp12_ = sensitive; #line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp17_) { -#line 1978 "DirectPhotoPage.c" - gboolean _tmp18_; + if (_tmp12_) { +#line 2228 "DirectPhotoPage.c" + gboolean _tmp13_; #line 199 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp18_ = contains; + _tmp13_ = contains; #line 199 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - sensitive = _tmp18_; -#line 1984 "DirectPhotoPage.c" + sensitive = _tmp13_; +#line 2234 "DirectPhotoPage.c" } #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp20_ = sensitive; -#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp20_) { -#line 1990 "DirectPhotoPage.c" - Photo* _tmp21_; - Photo* _tmp22_; - PhotoFileFormat _tmp23_; - gboolean _tmp24_; -#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp21_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp15_ = sensitive; #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp22_ = _tmp21_; + if (_tmp15_) { +#line 2240 "DirectPhotoPage.c" + Photo* _tmp16_; + Photo* _tmp17_; #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp23_ = photo_get_file_format (_tmp22_); + _tmp16_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp24_ = photo_file_format_can_write (_tmp23_); + _tmp17_ = _tmp16_; #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp19_ = _tmp24_; + _tmp14_ = photo_file_format_can_write (photo_get_file_format (_tmp17_)); #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp22_); -#line 2007 "DirectPhotoPage.c" + _g_object_unref0 (_tmp17_); +#line 2251 "DirectPhotoPage.c" } else { #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp19_ = FALSE; -#line 2011 "DirectPhotoPage.c" + _tmp14_ = FALSE; +#line 2255 "DirectPhotoPage.c" } #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Save", _tmp19_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Save", _tmp14_); #line 202 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp25_ = sensitive; + _tmp18_ = sensitive; #line 202 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp25_); -#line 2019 "DirectPhotoPage.c" + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp18_); +#line 2263 "DirectPhotoPage.c" } -static void direct_photo_page_on_selection_group_altered (DirectPhotoPage* self) { +static void +direct_photo_page_on_selection_group_altered (DirectPhotoPage* self) +{ CommandManager* _tmp0_; CommandManager* _tmp1_; #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2032,19 +2278,20 @@ static void direct_photo_page_on_selection_group_altered (DirectPhotoPage* self) command_manager_reset (_tmp1_); #line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _command_manager_unref0 (_tmp1_); -#line 2036 "DirectPhotoPage.c" +#line 2282 "DirectPhotoPage.c" } -static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, GdkEventButton* event) { +static gboolean +direct_photo_page_real_on_double_click (EditingHostPage* base, + GdkEventButton* event) +{ DirectPhotoPage * self; gboolean result = FALSE; FullscreenWindow* fs = NULL; GtkWindow* _tmp0_; FullscreenWindow* _tmp1_; FullscreenWindow* _tmp2_; - GdkEventButton* _tmp4_; - gboolean _tmp5_; #line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2057,7 +2304,7 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G if (_tmp1_ == NULL) { #line 216 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp0_); -#line 2061 "DirectPhotoPage.c" +#line 2308 "DirectPhotoPage.c" } #line 216 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" fs = _tmp1_; @@ -2065,7 +2312,7 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G _tmp2_ = fs; #line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp2_ != NULL) { -#line 2069 "DirectPhotoPage.c" +#line 2316 "DirectPhotoPage.c" FullscreenWindow* _tmp3_; #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = fs; @@ -2077,23 +2324,22 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G _g_object_unref0 (fs); #line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2081 "DirectPhotoPage.c" +#line 2328 "DirectPhotoPage.c" } #line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp4_ = event; -#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp5_ = EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_double_click (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp4_); -#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - result = _tmp5_; + result = EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_double_click (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), event); #line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (fs); #line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2093 "DirectPhotoPage.c" +#line 2336 "DirectPhotoPage.c" } -static void direct_photo_page_real_update_ui (EditingHostPage* base, gboolean missing) { +static void +direct_photo_page_real_update_ui (EditingHostPage* base, + gboolean missing) +{ DirectPhotoPage * self; gboolean sensitivity = FALSE; gboolean _tmp0_; @@ -2121,173 +2367,156 @@ static void direct_photo_page_real_update_ui (EditingHostPage* base, gboolean mi gboolean _tmp22_; gboolean _tmp23_; gboolean _tmp24_; - gboolean _tmp25_; - gboolean _tmp26_ = FALSE; - gboolean _tmp27_; - gboolean _tmp29_; + gboolean _tmp25_ = FALSE; #line 226 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = missing; -#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - sensitivity = !_tmp0_; + sensitivity = !missing; #line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp1_ = sensitivity; + _tmp0_ = sensitivity; #line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Save", _tmp1_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Save", _tmp0_); #line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp2_ = sensitivity; + _tmp1_ = sensitivity; #line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SaveAs", _tmp2_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SaveAs", _tmp1_); #line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp3_ = sensitivity; + _tmp2_ = sensitivity; #line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", _tmp3_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", _tmp2_); #line 232 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp4_ = sensitivity; + _tmp3_ = sensitivity; #line 232 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", _tmp4_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", _tmp3_); #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp5_ = sensitivity; + _tmp4_ = sensitivity; #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp5_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp4_); #line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp6_ = sensitivity; + _tmp5_ = sensitivity; #line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToFile", _tmp6_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToFile", _tmp5_); #line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp7_ = sensitivity; + _tmp6_ = sensitivity; #line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonUndo", _tmp7_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonUndo", _tmp6_); #line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp8_ = sensitivity; + _tmp7_ = sensitivity; #line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonRedo", _tmp8_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonRedo", _tmp7_); #line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp9_ = sensitivity; + _tmp8_ = sensitivity; #line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp9_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp8_); #line 240 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp10_ = sensitivity; + _tmp9_ = sensitivity; #line 240 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp10_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp9_); #line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp11_ = sensitivity; + _tmp10_ = sensitivity; #line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ZoomFit", _tmp11_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ZoomFit", _tmp10_); #line 242 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp12_ = sensitivity; + _tmp11_ = sensitivity; #line 242 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom100", _tmp12_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom100", _tmp11_); #line 243 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp13_ = sensitivity; + _tmp12_ = sensitivity; #line 243 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom200", _tmp13_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom200", _tmp12_); #line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp14_ = sensitivity; + _tmp13_ = sensitivity; #line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp14_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp13_); #line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp15_ = sensitivity; + _tmp14_ = sensitivity; #line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp15_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp14_); #line 247 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp16_ = sensitivity; + _tmp15_ = sensitivity; #line 247 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp16_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp15_); #line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp17_ = sensitivity; + _tmp16_ = sensitivity; #line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp17_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp16_); #line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp18_ = sensitivity; + _tmp17_ = sensitivity; #line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp18_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp17_); #line 250 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp19_ = sensitivity; + _tmp18_ = sensitivity; #line 250 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp19_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp18_); #line 251 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp20_ = sensitivity; + _tmp19_ = sensitivity; #line 251 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Straighten", _tmp20_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Straighten", _tmp19_); #line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp21_ = sensitivity; + _tmp20_ = sensitivity; #line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp21_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp20_); #line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp22_ = sensitivity; + _tmp21_ = sensitivity; #line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Adjust", _tmp22_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Adjust", _tmp21_); #line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp23_ = sensitivity; + _tmp22_ = sensitivity; #line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp23_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp22_); #line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp24_ = sensitivity; + _tmp23_ = sensitivity; #line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp24_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp23_); #line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp25_ = sensitivity; + _tmp24_ = sensitivity; #line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Fullscreen", _tmp25_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Fullscreen", _tmp24_); #line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp27_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { #line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp27_) { -#line 2239 "DirectPhotoPage.c" - gboolean _tmp28_; -#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp28_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp26_ = !_tmp28_; -#line 2245 "DirectPhotoPage.c" + _tmp25_ = !editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); +#line 2480 "DirectPhotoPage.c" } else { #line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp26_ = FALSE; -#line 2249 "DirectPhotoPage.c" + _tmp25_ = FALSE; +#line 2484 "DirectPhotoPage.c" } #line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp26_); -#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp29_ = missing; + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp25_); #line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->update_ui (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp29_); -#line 2257 "DirectPhotoPage.c" + EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->update_ui (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), missing); +#line 2490 "DirectPhotoPage.c" } -static void direct_photo_page_real_update_actions (Page* base, gint selected_count, gint count) { +static void +direct_photo_page_real_update_actions (Page* base, + gint selected_count, + gint count) +{ DirectPhotoPage * self; gboolean multiple = FALSE; ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_; + gboolean _tmp2_; + gboolean _tmp3_ = FALSE; gboolean revert_possible = FALSE; - gboolean _tmp12_ = FALSE; - gboolean _tmp13_; + gboolean _tmp8_ = FALSE; gboolean rotate_possible = FALSE; - gboolean _tmp17_ = FALSE; - gboolean _tmp18_; + gboolean _tmp11_ = FALSE; gboolean enhance_possible = FALSE; - gboolean _tmp22_; - gboolean _tmp23_; - gboolean _tmp24_; - gboolean _tmp25_; - gboolean _tmp26_; - gboolean _tmp27_; - gboolean _tmp28_; - gboolean _tmp29_; + gboolean _tmp14_; + gboolean _tmp15_; + gboolean _tmp16_; + gboolean _tmp17_; + gboolean _tmp18_; + gboolean _tmp19_; + gboolean _tmp20_; + gboolean _tmp21_; + Photo* _tmp28_; + Photo* _tmp29_; gboolean _tmp30_; - gboolean _tmp31_; - Photo* _tmp40_; - Photo* _tmp41_; - gboolean _tmp42_; - gint _tmp46_; - gint _tmp47_; #line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2295,439 +2524,369 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = _tmp0_; #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)); -#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp3_ = _tmp2_ > 1; + _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)) > 1; #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _data_collection_unref0 (_tmp1_); #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - multiple = _tmp3_; -#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp5_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp5_) { -#line 2310 "DirectPhotoPage.c" - gboolean _tmp6_ = FALSE; - Photo* _tmp7_; - Photo* _tmp8_; - gboolean _tmp9_; - gboolean _tmp10_; + multiple = _tmp2_; #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { +#line 2535 "DirectPhotoPage.c" + gboolean _tmp4_ = FALSE; + Photo* _tmp5_; + Photo* _tmp6_; + gboolean _tmp7_; #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp8_ = _tmp7_; + _tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp9_ = photo_has_transformations (_tmp8_); + _tmp6_ = _tmp5_; #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp10_ = _tmp9_; + _tmp7_ = photo_has_transformations (_tmp6_); #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp6_); #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp10_) { -#line 2328 "DirectPhotoPage.c" - gboolean _tmp11_; -#line 266 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp11_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + if (_tmp7_) { #line 266 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp6_ = !_tmp11_; -#line 2334 "DirectPhotoPage.c" + _tmp4_ = !editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); +#line 2552 "DirectPhotoPage.c" } else { #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp6_ = FALSE; -#line 2338 "DirectPhotoPage.c" + _tmp4_ = FALSE; +#line 2556 "DirectPhotoPage.c" } #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp4_ = _tmp6_; -#line 2342 "DirectPhotoPage.c" + _tmp3_ = _tmp4_; +#line 2560 "DirectPhotoPage.c" } else { #line 266 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp4_ = FALSE; -#line 2346 "DirectPhotoPage.c" + _tmp3_ = FALSE; +#line 2564 "DirectPhotoPage.c" } #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - revert_possible = _tmp4_; -#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp13_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + revert_possible = _tmp3_; #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp13_) { -#line 2354 "DirectPhotoPage.c" - Photo* _tmp14_; - Photo* _tmp15_; - gboolean _tmp16_; + if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { +#line 2570 "DirectPhotoPage.c" + Photo* _tmp9_; + Photo* _tmp10_; #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp14_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp9_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp15_ = _tmp14_; -#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp16_ = editing_host_page_is_rotate_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp15_); + _tmp10_ = _tmp9_; #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp12_ = _tmp16_; + _tmp8_ = editing_host_page_is_rotate_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp10_); #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp15_); -#line 2368 "DirectPhotoPage.c" + _g_object_unref0 (_tmp10_); +#line 2581 "DirectPhotoPage.c" } else { #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp12_ = FALSE; -#line 2372 "DirectPhotoPage.c" + _tmp8_ = FALSE; +#line 2585 "DirectPhotoPage.c" } #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - rotate_possible = _tmp12_; -#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp18_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + rotate_possible = _tmp8_; #line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp18_) { -#line 2380 "DirectPhotoPage.c" - Photo* _tmp19_; - Photo* _tmp20_; - gboolean _tmp21_; + if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { +#line 2591 "DirectPhotoPage.c" + Photo* _tmp12_; + Photo* _tmp13_; #line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp19_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp12_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp20_ = _tmp19_; -#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp21_ = editing_host_page_is_enhance_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp20_); + _tmp13_ = _tmp12_; #line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp17_ = _tmp21_; + _tmp11_ = editing_host_page_is_enhance_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp13_); #line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp20_); -#line 2394 "DirectPhotoPage.c" + _g_object_unref0 (_tmp13_); +#line 2602 "DirectPhotoPage.c" } else { #line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp17_ = FALSE; -#line 2398 "DirectPhotoPage.c" + _tmp11_ = FALSE; +#line 2606 "DirectPhotoPage.c" } #line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - enhance_possible = _tmp17_; + enhance_possible = _tmp11_; #line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp22_ = multiple; + _tmp14_ = multiple; #line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PrevPhoto", _tmp22_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PrevPhoto", _tmp14_); #line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp23_ = multiple; + _tmp15_ = multiple; #line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NextPhoto", _tmp23_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NextPhoto", _tmp15_); #line 272 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp24_ = rotate_possible; + _tmp16_ = rotate_possible; #line 272 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp24_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp16_); #line 273 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp25_ = rotate_possible; + _tmp17_ = rotate_possible; #line 273 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp25_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp17_); #line 274 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp26_ = rotate_possible; + _tmp18_ = rotate_possible; #line 274 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp26_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp18_); #line 275 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp27_ = rotate_possible; + _tmp19_ = rotate_possible; #line 275 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp27_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp19_); #line 276 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp28_ = revert_possible; + _tmp20_ = revert_possible; #line 276 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp28_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp20_); #line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp29_ = enhance_possible; + _tmp21_ = enhance_possible; #line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp29_); -#line 279 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp30_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp21_); #line 279 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp30_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))); #line 281 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp31_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 281 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp31_) { -#line 2442 "DirectPhotoPage.c" - Photo* _tmp32_; - Photo* _tmp33_; - Scaling _tmp34_ = {0}; - gboolean _tmp35_; - Photo* _tmp36_; - Photo* _tmp37_; - Scaling _tmp38_ = {0}; - gboolean _tmp39_; -#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp32_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { +#line 2646 "DirectPhotoPage.c" + Photo* _tmp22_; + Photo* _tmp23_; + Scaling _tmp24_ = {0}; + Photo* _tmp25_; + Photo* _tmp26_; + Scaling _tmp27_ = {0}; #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp33_ = _tmp32_; + _tmp22_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - scaling_for_original (&_tmp34_); + _tmp23_ = _tmp22_; #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp35_ = editing_tools_crop_tool_is_available (_tmp33_, &_tmp34_); + scaling_for_original (&_tmp24_); #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp35_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", editing_tools_crop_tool_is_available (_tmp23_, &_tmp24_)); #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp33_); -#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp36_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _g_object_unref0 (_tmp23_); #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp37_ = _tmp36_; + _tmp25_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - scaling_for_original (&_tmp38_); + _tmp26_ = _tmp25_; #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp39_ = editing_tools_redeye_tool_is_available (_tmp37_, &_tmp38_); + scaling_for_original (&_tmp27_); #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp39_); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", editing_tools_redeye_tool_is_available (_tmp26_, &_tmp27_)); #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp37_); -#line 2475 "DirectPhotoPage.c" + _g_object_unref0 (_tmp26_); +#line 2673 "DirectPhotoPage.c" } #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp40_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp28_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp41_ = _tmp40_; + _tmp29_ = _tmp28_; #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp42_ = _tmp41_ != NULL; + _tmp30_ = _tmp29_ != NULL; #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp41_); + _g_object_unref0 (_tmp29_); #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp42_) { -#line 2487 "DirectPhotoPage.c" - Photo* _tmp43_; - Photo* _tmp44_; - PhotoFileFormat _tmp45_; -#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp43_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + if (_tmp30_) { +#line 2685 "DirectPhotoPage.c" + Photo* _tmp31_; + Photo* _tmp32_; #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp44_ = _tmp43_; + _tmp31_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp45_ = photo_get_file_format (_tmp44_); + _tmp32_ = _tmp31_; #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp45_ != PHOTO_FILE_FORMAT_RAW); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", photo_get_file_format (_tmp32_) != PHOTO_FILE_FORMAT_RAW); #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp44_); -#line 2501 "DirectPhotoPage.c" + _g_object_unref0 (_tmp32_); +#line 2696 "DirectPhotoPage.c" } else { #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", FALSE); -#line 2505 "DirectPhotoPage.c" +#line 2700 "DirectPhotoPage.c" } #line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp46_ = selected_count; -#line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp47_ = count; -#line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - PAGE_CLASS (direct_photo_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp46_, _tmp47_); -#line 2513 "DirectPhotoPage.c" + PAGE_CLASS (direct_photo_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), selected_count, count); +#line 2704 "DirectPhotoPage.c" } -static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self, Photo* photo) { +static gboolean +direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self, + Photo* photo) +{ gboolean result = FALSE; - Photo* _tmp0_; + gboolean _tmp0_; + gboolean is_writeable = FALSE; Photo* _tmp1_; - gboolean _tmp2_; + Photo* _tmp2_; gboolean _tmp3_; - gboolean is_writeable = FALSE; - Photo* _tmp5_; - Photo* _tmp6_; - PhotoFileFormat _tmp7_; - gboolean _tmp8_; - gboolean _tmp9_; - const gchar* _tmp10_ = NULL; - gboolean _tmp11_; + const gchar* _tmp4_ = NULL; + gboolean _tmp5_; gchar* save_option = NULL; - gchar* _tmp12_; + gchar* _tmp6_; GtkResponseType response = 0; - Photo* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; - const gchar* _tmp18_; - GtkResponseType _tmp19_; - GtkResponseType _tmp20_; - GtkResponseType _tmp21_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + const gchar* _tmp11_; + GtkResponseType _tmp12_; + GtkResponseType _tmp13_; #line 298 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), FALSE); #line 298 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail ((photo == NULL) || IS_PHOTO (photo), FALSE); #line 301 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = photo; -#line 301 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp0_ == NULL) { + if (photo == NULL) { #line 302 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = TRUE; #line 302 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2555 "DirectPhotoPage.c" +#line 2740 "DirectPhotoPage.c" } #line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp1_ = photo; -#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp2_ = photo_has_alterations (_tmp1_); -#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (!_tmp2_) { + if (!photo_has_alterations (photo)) { #line 305 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = TRUE; #line 305 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2567 "DirectPhotoPage.c" +#line 2748 "DirectPhotoPage.c" } #line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp3_ = self->priv->drop_if_dirty; + _tmp0_ = self->priv->drop_if_dirty; #line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp3_) { -#line 2573 "DirectPhotoPage.c" - Photo* _tmp4_; -#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp4_ = photo; + if (_tmp0_) { #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - photo_remove_all_transformations (_tmp4_); + photo_remove_all_transformations (photo); #line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = TRUE; #line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2583 "DirectPhotoPage.c" +#line 2760 "DirectPhotoPage.c" } #line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp6_ = _tmp5_; -#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp7_ = photo_get_file_format (_tmp6_); + _tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp8_ = photo_file_format_can_write (_tmp7_); + _tmp2_ = _tmp1_; #line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp9_ = _tmp8_; + _tmp3_ = photo_file_format_can_write (photo_get_file_format (_tmp2_)); #line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp2_); #line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - is_writeable = _tmp9_; + is_writeable = _tmp3_; #line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp11_ = is_writeable; + _tmp5_ = is_writeable; #line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp11_) { + if (_tmp5_) { #line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp10_ = _ ("_Save"); -#line 2605 "DirectPhotoPage.c" + _tmp4_ = _ ("_Save"); +#line 2778 "DirectPhotoPage.c" } else { #line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp10_ = _ ("_Save a Copy"); -#line 2609 "DirectPhotoPage.c" + _tmp4_ = _ ("_Save a Copy"); +#line 2782 "DirectPhotoPage.c" } #line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp12_ = g_strdup (_tmp10_); + _tmp6_ = g_strdup (_tmp4_); #line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - save_option = _tmp12_; -#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp13_ = photo; + save_option = _tmp6_; #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp14_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp7_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MEDIA_SOURCE, MediaSource)); #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp15_ = _tmp14_; -#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp16_ = g_strdup_printf (_ ("Lose changes to %s?"), _tmp15_); + _tmp8_ = _tmp7_; #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp17_ = _tmp16_; + _tmp9_ = g_strdup_printf (_ ("Lose changes to %s?"), _tmp8_); #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp18_ = save_option; + _tmp10_ = _tmp9_; #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp19_ = app_window_negate_affirm_cancel_question (_tmp17_, _tmp18_, _ ("Close _without Saving"), NULL, NULL); + _tmp11_ = save_option; #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp20_ = _tmp19_; + _tmp12_ = app_window_negate_affirm_cancel_question (_tmp10_, _tmp11_, _ ("Close _without Saving"), NULL, NULL); #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp10_); #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp8_); #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - response = _tmp20_; + response = _tmp12_; #line 322 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp21_ = response; + _tmp13_ = response; #line 322 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp21_ == GTK_RESPONSE_YES) { -#line 2641 "DirectPhotoPage.c" - Photo* _tmp22_; + if (_tmp13_ == GTK_RESPONSE_YES) { #line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp22_ = photo; -#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - photo_remove_all_transformations (_tmp22_); -#line 2647 "DirectPhotoPage.c" + photo_remove_all_transformations (photo); +#line 2812 "DirectPhotoPage.c" } else { - GtkResponseType _tmp23_; + GtkResponseType _tmp14_; #line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp23_ = response; + _tmp14_ = response; #line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp23_ == GTK_RESPONSE_NO) { -#line 2654 "DirectPhotoPage.c" - gboolean _tmp24_; + if (_tmp14_ == GTK_RESPONSE_NO) { +#line 2819 "DirectPhotoPage.c" + gboolean _tmp15_; #line 325 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp24_ = is_writeable; + _tmp15_ = is_writeable; #line 325 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp24_) { -#line 2660 "DirectPhotoPage.c" - Photo* _tmp25_; - GFile* _tmp26_; - GFile* _tmp27_; - Photo* _tmp28_; - Photo* _tmp29_; - PhotoFileFormat _tmp30_; -#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp25_ = photo; + if (_tmp15_) { +#line 2825 "DirectPhotoPage.c" + GFile* _tmp16_; + GFile* _tmp17_; + Photo* _tmp18_; + Photo* _tmp19_; #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp26_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp16_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MEDIA_SOURCE, MediaSource)); #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp27_ = _tmp26_; + _tmp17_ = _tmp16_; #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp28_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp18_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp29_ = _tmp28_; + _tmp19_ = _tmp18_; #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp30_ = photo_get_file_format (_tmp29_); + direct_photo_page_save (self, _tmp17_, 0, SCALE_CONSTRAINT_ORIGINAL, JPEG_QUALITY_HIGH, photo_get_file_format (_tmp19_), FALSE, TRUE); #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - direct_photo_page_save (self, _tmp27_, 0, SCALE_CONSTRAINT_ORIGINAL, JPEG_QUALITY_HIGH, _tmp30_, FALSE, TRUE); + _g_object_unref0 (_tmp19_); #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp29_); -#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp27_); -#line 2685 "DirectPhotoPage.c" + _g_object_unref0 (_tmp17_); +#line 2844 "DirectPhotoPage.c" } else { #line 329 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_on_save_as (self); -#line 2689 "DirectPhotoPage.c" +#line 2848 "DirectPhotoPage.c" } } else { - gboolean _tmp31_ = FALSE; - gboolean _tmp32_ = FALSE; - GtkResponseType _tmp33_; + gboolean _tmp20_ = FALSE; + gboolean _tmp21_ = FALSE; + GtkResponseType _tmp22_; #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp33_ = response; + _tmp22_ = response; #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp33_ == GTK_RESPONSE_CANCEL) { + if (_tmp22_ == GTK_RESPONSE_CANCEL) { #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp32_ = TRUE; -#line 2701 "DirectPhotoPage.c" + _tmp21_ = TRUE; +#line 2860 "DirectPhotoPage.c" } else { - GtkResponseType _tmp34_; + GtkResponseType _tmp23_; #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp34_ = response; + _tmp23_ = response; #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp32_ = _tmp34_ == GTK_RESPONSE_DELETE_EVENT; -#line 2708 "DirectPhotoPage.c" + _tmp21_ = _tmp23_ == GTK_RESPONSE_DELETE_EVENT; +#line 2867 "DirectPhotoPage.c" } #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp32_) { + if (_tmp21_) { #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp31_ = TRUE; -#line 2714 "DirectPhotoPage.c" + _tmp20_ = TRUE; +#line 2873 "DirectPhotoPage.c" } else { - GtkResponseType _tmp35_; + GtkResponseType _tmp24_; #line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp35_ = response; + _tmp24_ = response; #line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp31_ = _tmp35_ == GTK_RESPONSE_CLOSE; -#line 2721 "DirectPhotoPage.c" + _tmp20_ = _tmp24_ == GTK_RESPONSE_CLOSE; +#line 2880 "DirectPhotoPage.c" } #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp31_) { + if (_tmp20_) { #line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = FALSE; #line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (save_option); #line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2731 "DirectPhotoPage.c" +#line 2890 "DirectPhotoPage.c" } } } @@ -2737,16 +2896,17 @@ static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self _g_free0 (save_option); #line 335 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2741 "DirectPhotoPage.c" +#line 2900 "DirectPhotoPage.c" } -gboolean direct_photo_page_check_quit (DirectPhotoPage* self) { +gboolean +direct_photo_page_check_quit (DirectPhotoPage* self) +{ gboolean result = FALSE; Photo* _tmp0_; Photo* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; #line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), FALSE); #line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2755,23 +2915,24 @@ gboolean direct_photo_page_check_quit (DirectPhotoPage* self) { _tmp1_ = _tmp0_; #line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp2_ = direct_photo_page_check_ok_to_close_photo (self, _tmp1_); -#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp3_ = _tmp2_; #line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp1_); #line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - result = _tmp3_; + result = _tmp2_; #line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2767 "DirectPhotoPage.c" +#line 2925 "DirectPhotoPage.c" } -static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* base, Photo* old_photo, Photo* new_photo) { +static gboolean +direct_photo_page_real_confirm_replace_photo (EditingHostPage* base, + Photo* old_photo, + Photo* new_photo) +{ DirectPhotoPage * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; - Photo* _tmp1_; #line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2779,98 +2940,75 @@ static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* b #line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (IS_PHOTO (new_photo), FALSE); #line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp1_ = old_photo; -#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp1_ != NULL) { -#line 2786 "DirectPhotoPage.c" - Photo* _tmp2_; - gboolean _tmp3_; -#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp2_ = old_photo; -#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp3_ = direct_photo_page_check_ok_to_close_photo (self, _tmp2_); + if (old_photo != NULL) { #line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = _tmp3_; -#line 2795 "DirectPhotoPage.c" + _tmp0_ = direct_photo_page_check_ok_to_close_photo (self, old_photo); +#line 2947 "DirectPhotoPage.c" } else { #line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = TRUE; -#line 2799 "DirectPhotoPage.c" +#line 2951 "DirectPhotoPage.c" } #line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = _tmp0_; #line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2805 "DirectPhotoPage.c" +#line 2957 "DirectPhotoPage.c" } -static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint scale, ScaleConstraint constraint, JpegQuality quality, PhotoFileFormat format, gboolean copy_unmodified, gboolean save_metadata) { +static void +direct_photo_page_save (DirectPhotoPage* self, + GFile* dest, + gint scale, + ScaleConstraint constraint, + JpegQuality quality, + PhotoFileFormat format, + gboolean copy_unmodified, + gboolean save_metadata) +{ Scaling scaling = {0}; - ScaleConstraint _tmp0_; - gint _tmp1_; - Scaling _tmp2_ = {0}; + Scaling _tmp0_ = {0}; DirectPhoto* photo = NULL; - DirectPhotoSourceCollection* _tmp18_; - GFile* _tmp19_; - DirectPhoto* _tmp20_ = NULL; - gchar* _tmp21_; - gchar* _tmp22_; - Photo* _tmp23_; - Photo* _tmp24_; + DirectPhotoSourceCollection* _tmp10_; + DirectPhoto* _tmp11_ = NULL; + gchar* _tmp12_; + gchar* _tmp13_; + Photo* _tmp14_; + Photo* _tmp15_; + DirectPhoto* _tmp16_; + gboolean _tmp17_; + DirectPhotoSourceCollection* _tmp22_; + DirectPhoto* _tmp23_; + DirectViewCollection* _tmp24_; DirectPhoto* _tmp25_; - gboolean _tmp26_; - gboolean _tmp27_; - DirectPhotoSourceCollection* _tmp32_; - DirectPhoto* _tmp33_; - DirectViewCollection* _tmp34_; - DirectPhoto* _tmp35_; GError * _inner_error_ = NULL; #line 346 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); #line 346 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (G_IS_FILE (dest)); #line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = constraint; + scaling_for_constraint (constraint, scale, FALSE, &_tmp0_); #line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp1_ = scale; -#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - scaling_for_constraint (_tmp0_, _tmp1_, FALSE, &_tmp2_); -#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - scaling = _tmp2_; -#line 2842 "DirectPhotoPage.c" + scaling = _tmp0_; +#line 2995 "DirectPhotoPage.c" { - Photo* _tmp3_; - Photo* _tmp4_; - GFile* _tmp5_; - Scaling _tmp6_; - JpegQuality _tmp7_; - PhotoFileFormat _tmp8_; - gboolean _tmp9_; - gboolean _tmp10_; -#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp4_ = _tmp3_; -#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp5_ = dest; -#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp6_ = scaling; -#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp7_ = quality; + Photo* _tmp1_; + Photo* _tmp2_; + Scaling _tmp3_; #line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp8_ = format; + _tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp9_ = copy_unmodified; + _tmp2_ = _tmp1_; #line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp10_ = save_metadata; + _tmp3_ = scaling; #line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - photo_export (_tmp4_, _tmp5_, &_tmp6_, _tmp7_, _tmp8_, _tmp9_, _tmp10_, &_inner_error_); + photo_export (_tmp2_, dest, &_tmp3_, quality, format, copy_unmodified, save_metadata, &_inner_error_); #line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp2_); #line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2874 "DirectPhotoPage.c" +#line 3012 "DirectPhotoPage.c" goto __catch52_g_error; } } @@ -2878,42 +3016,39 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca __catch52_g_error: { GError* err = NULL; - GFile* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; - GError* _tmp14_; - const gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; + gchar* _tmp4_; + gchar* _tmp5_; + GError* _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" err = _inner_error_; #line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _inner_error_ = NULL; #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp11_ = dest; + _tmp4_ = g_file_get_path (dest); #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp12_ = g_file_get_path (_tmp11_); -#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp13_ = _tmp12_; + _tmp5_ = _tmp4_; #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp14_ = err; + _tmp6_ = err; #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp15_ = _tmp14_->message; + _tmp7_ = _tmp6_->message; #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp16_ = g_strdup_printf (_ ("Error while saving to %s: %s"), _tmp13_, _tmp15_); + _tmp8_ = g_strdup_printf (_ ("Error while saving to %s: %s"), _tmp5_, _tmp7_); #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp17_ = _tmp16_; + _tmp9_ = _tmp8_; #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - app_window_error_message (_tmp17_, NULL); + app_window_error_message (_tmp9_, NULL); #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp9_); #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp5_); #line 356 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_error_free0 (err); #line 356 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return; -#line 2917 "DirectPhotoPage.c" +#line 3052 "DirectPhotoPage.c" } __finally52: #line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2924,90 +3059,86 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca g_clear_error (&_inner_error_); #line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return; -#line 2928 "DirectPhotoPage.c" +#line 3063 "DirectPhotoPage.c" } #line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp18_ = direct_photo_global; -#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp19_ = dest; + _tmp10_ = direct_photo_global; #line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp21_ = direct_photo_source_collection_fetch (_tmp18_, _tmp19_, &_tmp20_, TRUE); + _tmp12_ = direct_photo_source_collection_fetch (_tmp10_, dest, &_tmp11_, TRUE); #line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (photo); #line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - photo = _tmp20_; + photo = _tmp11_; #line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp22_ = _tmp21_; + _tmp13_ = _tmp12_; #line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp13_); #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp23_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp14_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp24_ = _tmp23_; -#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp25_ = photo; + _tmp15_ = _tmp14_; #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp26_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_SOURCE, DataSource)); + _tmp16_ = photo; #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp27_ = !_tmp26_; + _tmp17_ = !data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource)); #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp15_); #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp27_) { -#line 2958 "DirectPhotoPage.c" + if (_tmp17_) { +#line 3089 "DirectPhotoPage.c" DirectView* tmp_view = NULL; - DirectPhoto* _tmp28_; - DirectView* _tmp29_; - DirectViewCollection* _tmp30_; - DirectView* _tmp31_; + DirectPhoto* _tmp18_; + DirectView* _tmp19_; + DirectViewCollection* _tmp20_; + DirectView* _tmp21_; #line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp28_ = photo; + _tmp18_ = photo; #line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp29_ = direct_view_new (_tmp28_); + _tmp19_ = direct_view_new (_tmp18_); #line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - tmp_view = _tmp29_; + tmp_view = _tmp19_; #line 365 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp30_ = self->priv->view_controller; + _tmp20_ = self->priv->view_controller; #line 365 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp31_ = tmp_view; + _tmp21_ = tmp_view; #line 365 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_OBJECT, DataObject)); #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (tmp_view); -#line 2978 "DirectPhotoPage.c" +#line 3109 "DirectPhotoPage.c" } #line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp32_ = direct_photo_global; + _tmp22_ = direct_photo_global; #line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp33_ = photo; + _tmp23_ = photo; #line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - direct_photo_source_collection_reimport_photo (_tmp32_, _tmp33_); + direct_photo_source_collection_reimport_photo (_tmp22_, _tmp23_); #line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp34_ = self->priv->view_controller; + _tmp24_ = self->priv->view_controller; #line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp35_ = photo; + _tmp25_ = photo; #line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - editing_host_page_display_mirror_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo)); + editing_host_page_display_mirror_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO, Photo)); #line 346 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (photo); -#line 2994 "DirectPhotoPage.c" +#line 3125 "DirectPhotoPage.c" } -static void direct_photo_page_on_save (DirectPhotoPage* self) { +static void +direct_photo_page_on_save (DirectPhotoPage* self) +{ gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; Photo* _tmp2_; Photo* _tmp3_; gboolean _tmp4_; - gboolean _tmp5_; + Photo* _tmp7_; + Photo* _tmp8_; + GFile* _tmp9_; + GFile* _tmp10_; Photo* _tmp11_; Photo* _tmp12_; - GFile* _tmp13_; - GFile* _tmp14_; - Photo* _tmp15_; - Photo* _tmp16_; - PhotoFileFormat _tmp17_; #line 372 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3015,81 +3146,70 @@ static void direct_photo_page_on_save (DirectPhotoPage* self) { #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = _tmp2_; #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp4_ = photo_has_alterations (_tmp3_); -#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp5_ = !_tmp4_; + _tmp4_ = !photo_has_alterations (_tmp3_); #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp3_); #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp5_) { + if (_tmp4_) { #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = TRUE; -#line 3028 "DirectPhotoPage.c" +#line 3157 "DirectPhotoPage.c" } else { + Photo* _tmp5_; Photo* _tmp6_; - Photo* _tmp7_; - PhotoFileFormat _tmp8_; - gboolean _tmp9_; #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp8_ = photo_get_file_format (_tmp7_); + _tmp1_ = !photo_file_format_can_write (photo_get_file_format (_tmp6_)); #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp9_ = photo_file_format_can_write (_tmp8_); -#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp1_ = !_tmp9_; -#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp7_); -#line 3046 "DirectPhotoPage.c" + _g_object_unref0 (_tmp6_); +#line 3169 "DirectPhotoPage.c" } #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp1_) { #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = TRUE; -#line 3052 "DirectPhotoPage.c" +#line 3175 "DirectPhotoPage.c" } else { - gboolean _tmp10_; #line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp10_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = _tmp10_; -#line 3059 "DirectPhotoPage.c" + _tmp0_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); +#line 3179 "DirectPhotoPage.c" } #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp0_) { #line 375 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return; -#line 3065 "DirectPhotoPage.c" +#line 3185 "DirectPhotoPage.c" } #line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp12_ = _tmp11_; + _tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp13_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp8_ = _tmp7_; #line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp14_ = _tmp13_; + _tmp9_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource)); #line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp15_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp10_ = _tmp9_; #line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp16_ = _tmp15_; + _tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp17_ = photo_get_file_format (_tmp16_); + _tmp12_ = _tmp11_; #line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - direct_photo_page_save (self, _tmp14_, 0, SCALE_CONSTRAINT_ORIGINAL, JPEG_QUALITY_HIGH, _tmp17_, FALSE, TRUE); + direct_photo_page_save (self, _tmp10_, 0, SCALE_CONSTRAINT_ORIGINAL, JPEG_QUALITY_HIGH, photo_get_file_format (_tmp12_), FALSE, TRUE); #line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp12_); #line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp10_); #line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp12_); -#line 3089 "DirectPhotoPage.c" + _g_object_unref0 (_tmp8_); +#line 3207 "DirectPhotoPage.c" } -static void direct_photo_page_on_save_as (DirectPhotoPage* self) { +static void +direct_photo_page_on_save_as (DirectPhotoPage* self) +{ ExportDialog* export_dialog = NULL; ExportDialog* _tmp0_; gint scale = 0; @@ -3111,43 +3231,41 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) { Photo* _tmp12_; ExportFormatParameters _tmp13_; PhotoFileFormat _tmp14_; - PhotoFileFormat _tmp15_; gchar** output_format_extensions = NULL; - PhotoFileFormat _tmp16_; + PhotoFileFormat _tmp15_; + PhotoFileFormatProperties* _tmp16_; PhotoFileFormatProperties* _tmp17_; - PhotoFileFormatProperties* _tmp18_; - gint _tmp19_; + gint _tmp18_; + gchar** _tmp19_; gchar** _tmp20_; - gchar** _tmp21_; - gint _tmp21__length1; + gint _tmp20__length1; gint output_format_extensions_length1; gint _output_format_extensions_size_; GtkFileFilter* output_format_filter = NULL; - GtkFileFilter* _tmp22_; - gchar** _tmp23_; - gint _tmp23__length1; + GtkFileFilter* _tmp21_; + gchar** _tmp22_; + gint _tmp22__length1; GtkFileChooserDialog* save_as_dialog = NULL; + AppWindow* _tmp34_; AppWindow* _tmp35_; - AppWindow* _tmp36_; + GtkFileChooserDialog* _tmp36_; GtkFileChooserDialog* _tmp37_; GtkFileChooserDialog* _tmp38_; GtkFileChooserDialog* _tmp39_; - GtkFileChooserDialog* _tmp40_; - const gchar* _tmp41_; - GtkFileChooserDialog* _tmp42_; - GFile* _tmp43_; + const gchar* _tmp40_; + GtkFileChooserDialog* _tmp41_; + GFile* _tmp42_; + gchar* _tmp43_; gchar* _tmp44_; - gchar* _tmp45_; - GtkFileChooserDialog* _tmp46_; + GtkFileChooserDialog* _tmp45_; + GtkFileFilter* _tmp46_; GtkFileFilter* _tmp47_; - GtkFileFilter* _tmp48_; + GtkFileChooserDialog* _tmp48_; GtkFileChooserDialog* _tmp49_; - GtkFileChooserDialog* _tmp50_; gint response = 0; - GtkFileChooserDialog* _tmp51_; - gint _tmp52_; - gint _tmp53_; - GtkFileChooserDialog* _tmp72_; + GtkFileChooserDialog* _tmp50_; + gint _tmp51_; + GtkFileChooserDialog* _tmp70_; #line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); #line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3174,7 +3292,7 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) { _g_object_unref0 (export_dialog); #line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return; -#line 3178 "DirectPhotoPage.c" +#line 3296 "DirectPhotoPage.c" } #line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); @@ -3198,251 +3316,247 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) { _tmp13_ = export_params; #line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp14_ = photo_get_export_format_for_parameters (_tmp12_, &_tmp13_); -#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp15_ = _tmp14_; #line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp12_); #line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - effective_export_format = _tmp15_; + effective_export_format = _tmp14_; #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp16_ = effective_export_format; + _tmp15_ = effective_export_format; #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp17_ = photo_file_format_get_properties (_tmp16_); + _tmp16_ = photo_file_format_get_properties (_tmp15_); #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp20_ = photo_file_format_properties_get_known_extensions (_tmp18_, &_tmp19_); + _tmp19_ = photo_file_format_properties_get_known_extensions (_tmp17_, &_tmp18_); #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp21_ = _tmp20_; + _tmp20_ = _tmp19_; #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp21__length1 = _tmp19_; + _tmp20__length1 = _tmp18_; #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _photo_file_format_properties_unref0 (_tmp18_); + _photo_file_format_properties_unref0 (_tmp17_); #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - output_format_extensions = _tmp21_; + output_format_extensions = _tmp20_; #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - output_format_extensions_length1 = _tmp21__length1; + output_format_extensions_length1 = _tmp20__length1; #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _output_format_extensions_size_ = output_format_extensions_length1; #line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp22_ = gtk_file_filter_new (); + _tmp21_ = gtk_file_filter_new (); #line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - g_object_ref_sink (_tmp22_); + g_object_ref_sink (_tmp21_); #line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - output_format_filter = _tmp22_; + output_format_filter = _tmp21_; #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp23_ = output_format_extensions; + _tmp22_ = output_format_extensions; #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp23__length1 = output_format_extensions_length1; -#line 3238 "DirectPhotoPage.c" + _tmp22__length1 = output_format_extensions_length1; +#line 3354 "DirectPhotoPage.c" { gchar** extension_collection = NULL; gint extension_collection_length1 = 0; gint _extension_collection_size_ = 0; gint extension_it = 0; #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - extension_collection = _tmp23_; + extension_collection = _tmp22_; #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - extension_collection_length1 = _tmp23__length1; + extension_collection_length1 = _tmp22__length1; #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - for (extension_it = 0; extension_it < _tmp23__length1; extension_it = extension_it + 1) { -#line 3250 "DirectPhotoPage.c" - gchar* _tmp24_; + for (extension_it = 0; extension_it < _tmp22__length1; extension_it = extension_it + 1) { +#line 3366 "DirectPhotoPage.c" + gchar* _tmp23_; gchar* extension = NULL; #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp24_ = g_strdup (extension_collection[extension_it]); + _tmp23_ = g_strdup (extension_collection[extension_it]); #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - extension = _tmp24_; -#line 3257 "DirectPhotoPage.c" + extension = _tmp23_; +#line 3373 "DirectPhotoPage.c" { gchar* uppercase_extension = NULL; - const gchar* _tmp25_; - gchar* _tmp26_; - GtkFileFilter* _tmp27_; - const gchar* _tmp28_; + const gchar* _tmp24_; + gchar* _tmp25_; + GtkFileFilter* _tmp26_; + const gchar* _tmp27_; + gchar* _tmp28_; gchar* _tmp29_; - gchar* _tmp30_; - GtkFileFilter* _tmp31_; - const gchar* _tmp32_; + GtkFileFilter* _tmp30_; + const gchar* _tmp31_; + gchar* _tmp32_; gchar* _tmp33_; - gchar* _tmp34_; #line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp25_ = extension; + _tmp24_ = extension; #line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp26_ = g_utf8_strup (_tmp25_, (gssize) -1); + _tmp25_ = g_utf8_strup (_tmp24_, (gssize) -1); #line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - uppercase_extension = _tmp26_; + uppercase_extension = _tmp25_; #line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp27_ = output_format_filter; + _tmp26_ = output_format_filter; #line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp28_ = extension; + _tmp27_ = extension; #line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp29_ = g_strconcat ("*.", _tmp28_, NULL); + _tmp28_ = g_strconcat ("*.", _tmp27_, NULL); #line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp30_ = _tmp29_; + _tmp29_ = _tmp28_; #line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gtk_file_filter_add_pattern (_tmp27_, _tmp30_); + gtk_file_filter_add_pattern (_tmp26_, _tmp29_); #line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp30_); + _g_free0 (_tmp29_); #line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp31_ = output_format_filter; + _tmp30_ = output_format_filter; #line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp32_ = uppercase_extension; + _tmp31_ = uppercase_extension; #line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp33_ = g_strconcat ("*.", _tmp32_, NULL); + _tmp32_ = g_strconcat ("*.", _tmp31_, NULL); #line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp34_ = _tmp33_; + _tmp33_ = _tmp32_; #line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gtk_file_filter_add_pattern (_tmp31_, _tmp34_); + gtk_file_filter_add_pattern (_tmp30_, _tmp33_); #line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp34_); + _g_free0 (_tmp33_); #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (uppercase_extension); #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (extension); -#line 3304 "DirectPhotoPage.c" +#line 3420 "DirectPhotoPage.c" } } } #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp35_ = app_window_get_instance (); + _tmp34_ = app_window_get_instance (); #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp36_ = _tmp35_; + _tmp35_ = _tmp34_; #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp37_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_ ("Save As"), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SAVE, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL); + _tmp36_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_ ("Save As"), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SAVE, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL); #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - g_object_ref_sink (_tmp37_); + g_object_ref_sink (_tmp36_); #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp38_ = _tmp37_; + _tmp37_ = _tmp36_; #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp36_); + _g_object_unref0 (_tmp35_); #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - save_as_dialog = _tmp38_; + save_as_dialog = _tmp37_; #line 407 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp39_ = save_as_dialog; + _tmp38_ = save_as_dialog; #line 407 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE); + gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_file_chooser_get_type (), GtkFileChooser), FALSE); #line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp40_ = save_as_dialog; + _tmp39_ = save_as_dialog; #line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp41_ = filename; + _tmp40_ = filename; #line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gtk_file_chooser_set_current_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp41_); + gtk_file_chooser_set_current_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_file_chooser_get_type (), GtkFileChooser), _tmp40_); #line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp42_ = save_as_dialog; + _tmp41_ = save_as_dialog; #line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp43_ = self->priv->current_save_dir; + _tmp42_ = self->priv->current_save_dir; #line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp44_ = g_file_get_path (_tmp43_); + _tmp43_ = g_file_get_path (_tmp42_); #line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp45_ = _tmp44_; + _tmp44_ = _tmp43_; #line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp45_); + gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_file_chooser_get_type (), GtkFileChooser), _tmp44_); #line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp45_); + _g_free0 (_tmp44_); #line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp46_ = save_as_dialog; + _tmp45_ = save_as_dialog; #line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp47_ = output_format_filter; + _tmp46_ = output_format_filter; #line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp48_ = _g_object_ref0 (_tmp47_); + _tmp47_ = _g_object_ref0 (_tmp46_); #line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gtk_file_chooser_add_filter (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp48_); + gtk_file_chooser_add_filter (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_file_chooser_get_type (), GtkFileChooser), _tmp47_); #line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp49_ = save_as_dialog; + _tmp48_ = save_as_dialog; #line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gtk_file_chooser_set_do_overwrite_confirmation (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE); + gtk_file_chooser_set_do_overwrite_confirmation (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_file_chooser_get_type (), GtkFileChooser), TRUE); #line 412 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp50_ = save_as_dialog; + _tmp49_ = save_as_dialog; #line 412 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE); -#line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp51_ = save_as_dialog; + gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_file_chooser_get_type (), GtkFileChooser), FALSE); #line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp52_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_dialog_get_type (), GtkDialog)); + _tmp50_ = save_as_dialog; #line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - response = _tmp52_; + response = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_dialog_get_type (), GtkDialog)); #line 415 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp53_ = response; + _tmp51_ = response; #line 415 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp53_ == ((gint) GTK_RESPONSE_OK)) { -#line 3370 "DirectPhotoPage.c" - GtkFileChooserDialog* _tmp54_; - gchar* _tmp55_; - gchar* _tmp56_; - GFile* _tmp57_; - GFile* _tmp58_; - gint _tmp59_; - ScaleConstraint _tmp60_; - ExportFormatParameters _tmp61_; - JpegQuality _tmp62_; - PhotoFileFormat _tmp63_; + if (_tmp51_ == ((gint) GTK_RESPONSE_OK)) { +#line 3484 "DirectPhotoPage.c" + GtkFileChooserDialog* _tmp52_; + gchar* _tmp53_; + gchar* _tmp54_; + GFile* _tmp55_; + GFile* _tmp56_; + gint _tmp57_; + ScaleConstraint _tmp58_; + ExportFormatParameters _tmp59_; + JpegQuality _tmp60_; + PhotoFileFormat _tmp61_; + ExportFormatParameters _tmp62_; + ExportFormatMode _tmp63_; ExportFormatParameters _tmp64_; - ExportFormatMode _tmp65_; - ExportFormatParameters _tmp66_; - gboolean _tmp67_; - GtkFileChooserDialog* _tmp68_; - gchar* _tmp69_; - gchar* _tmp70_; - GFile* _tmp71_; + gboolean _tmp65_; + GtkFileChooserDialog* _tmp66_; + gchar* _tmp67_; + gchar* _tmp68_; + GFile* _tmp69_; #line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self->priv->drop_if_dirty = TRUE; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp54_ = save_as_dialog; + _tmp52_ = save_as_dialog; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp55_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); + _tmp53_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_file_chooser_get_type (), GtkFileChooser)); #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp56_ = _tmp55_; + _tmp54_ = _tmp53_; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp57_ = g_file_new_for_uri (_tmp56_); + _tmp55_ = g_file_new_for_uri (_tmp54_); #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp58_ = _tmp57_; + _tmp56_ = _tmp55_; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp59_ = scale; + _tmp57_ = scale; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp60_ = constraint; + _tmp58_ = constraint; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp61_ = export_params; + _tmp59_ = export_params; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp62_ = _tmp61_.quality; + _tmp60_ = _tmp59_.quality; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp63_ = effective_export_format; + _tmp61_ = effective_export_format; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp64_ = export_params; + _tmp62_ = export_params; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp65_ = _tmp64_.mode; + _tmp63_ = _tmp62_.mode; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp66_ = export_params; + _tmp64_ = export_params; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp67_ = _tmp66_.export_metadata; + _tmp65_ = _tmp64_.export_metadata; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - direct_photo_page_save (self, _tmp58_, _tmp59_, _tmp60_, _tmp62_, _tmp63_, _tmp65_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp67_); + direct_photo_page_save (self, _tmp56_, _tmp57_, _tmp58_, _tmp60_, _tmp61_, _tmp63_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp65_); #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp58_); + _g_object_unref0 (_tmp56_); #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp56_); + _g_free0 (_tmp54_); #line 422 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self->priv->drop_if_dirty = FALSE; #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp68_ = save_as_dialog; + _tmp66_ = save_as_dialog; #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp69_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); + _tmp67_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_file_chooser_get_type (), GtkFileChooser)); #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp70_ = _tmp69_; + _tmp68_ = _tmp67_; #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp71_ = g_file_new_for_path (_tmp70_); + _tmp69_ = g_file_new_for_path (_tmp68_); #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (self->priv->current_save_dir); #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - self->priv->current_save_dir = _tmp71_; + self->priv->current_save_dir = _tmp69_; #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp70_); -#line 3441 "DirectPhotoPage.c" + _g_free0 (_tmp68_); +#line 3555 "DirectPhotoPage.c" } #line 427 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp72_ = save_as_dialog; + _tmp70_ = save_as_dialog; #line 427 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_widget_get_type (), GtkWidget)); #line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (save_as_dialog); #line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3453,58 +3567,59 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) { _g_free0 (filename); #line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (export_dialog); -#line 3457 "DirectPhotoPage.c" +#line 3571 "DirectPhotoPage.c" } -static void direct_photo_page_on_send_to (DirectPhotoPage* self) { - gboolean _tmp0_; +static void +direct_photo_page_on_send_to (DirectPhotoPage* self) +{ #line 430 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); #line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp0_) { -#line 3469 "DirectPhotoPage.c" + if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { +#line 3582 "DirectPhotoPage.c" + ViewCollection* _tmp0_; ViewCollection* _tmp1_; - ViewCollection* _tmp2_; - GeeList* _tmp3_; - GeeCollection* _tmp4_; + GeeList* _tmp2_; + GeeCollection* _tmp3_; #line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp3_ = view_collection_get_selected_sources (_tmp2_); + _tmp2_ = view_collection_get_selected_sources (_tmp1_); #line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - desktop_integration_send_to (_tmp4_); + desktop_integration_send_to (_tmp3_); #line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _data_collection_unref0 (_tmp2_); -#line 3488 "DirectPhotoPage.c" + _data_collection_unref0 (_tmp1_); +#line 3601 "DirectPhotoPage.c" } } -static gboolean direct_photo_page_real_on_app_key_pressed (Page* base, GdkEventKey* event) { +static gboolean +direct_photo_page_real_on_app_key_pressed (Page* base, + GdkEventKey* event) +{ DirectPhotoPage * self; gboolean result = FALSE; gboolean handled = FALSE; - GdkEventKey* _tmp0_; - guint _tmp1_; + guint _tmp0_; + const gchar* _tmp1_; const gchar* _tmp2_; - const gchar* _tmp3_; - GQuark _tmp5_ = 0U; + GQuark _tmp4_ = 0U; #line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - static GQuark _tmp4_label0 = 0; + static GQuark _tmp3_label0 = 0; #line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - static GQuark _tmp4_label1 = 0; -#line 3506 "DirectPhotoPage.c" - gboolean _tmp6_ = FALSE; - gboolean _tmp7_; + static GQuark _tmp3_label1 = 0; +#line 3621 "DirectPhotoPage.c" + gboolean _tmp5_ = FALSE; + gboolean _tmp6_; #line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3512,87 +3627,80 @@ static gboolean direct_photo_page_real_on_app_key_pressed (Page* base, GdkEventK #line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" handled = TRUE; #line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = event; + _tmp0_ = event->keyval; #line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp1_ = _tmp0_->keyval; + _tmp1_ = gdk_keyval_name (_tmp0_); #line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp2_ = gdk_keyval_name (_tmp1_); -#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_); + _tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_); #line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("bracketright")))) { + if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("bracketright")))) { #line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" switch (0) { -#line 3529 "DirectPhotoPage.c" +#line 3642 "DirectPhotoPage.c" default: { #line 440 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise"); #line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" break; -#line 3536 "DirectPhotoPage.c" +#line 3649 "DirectPhotoPage.c" } } - } else if (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("bracketleft")))) { + } else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("bracketleft")))) { #line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" switch (0) { -#line 3542 "DirectPhotoPage.c" +#line 3655 "DirectPhotoPage.c" default: { #line 444 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise"); #line 445 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" break; -#line 3549 "DirectPhotoPage.c" +#line 3662 "DirectPhotoPage.c" } } } else { #line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" switch (0) { -#line 3555 "DirectPhotoPage.c" +#line 3668 "DirectPhotoPage.c" default: { #line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" handled = FALSE; #line 449 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" break; -#line 3562 "DirectPhotoPage.c" +#line 3675 "DirectPhotoPage.c" } } } #line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp7_ = handled; + _tmp6_ = handled; #line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp7_) { + if (_tmp6_) { #line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp6_ = TRUE; -#line 3572 "DirectPhotoPage.c" + _tmp5_ = TRUE; +#line 3685 "DirectPhotoPage.c" } else { - GdkEventKey* _tmp8_; - gboolean _tmp9_; -#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp8_ = event; #line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp9_ = PAGE_CLASS (direct_photo_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp8_); -#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp6_ = _tmp9_; -#line 3582 "DirectPhotoPage.c" + _tmp5_ = PAGE_CLASS (direct_photo_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), event); +#line 3689 "DirectPhotoPage.c" } #line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - result = _tmp6_; + result = _tmp5_; #line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 3588 "DirectPhotoPage.c" +#line 3695 "DirectPhotoPage.c" } -static void direct_photo_page_on_print (DirectPhotoPage* self) { +static void +direct_photo_page_on_print (DirectPhotoPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; #line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); #line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3600,60 +3708,62 @@ static void direct_photo_page_on_print (DirectPhotoPage* self) { #line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = _tmp0_; #line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp3_ = _tmp2_ > 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) > 0; #line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _data_collection_unref0 (_tmp1_); #line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp3_) { -#line 3611 "DirectPhotoPage.c" + if (_tmp2_) { +#line 3717 "DirectPhotoPage.c" + PrintManager* _tmp3_; PrintManager* _tmp4_; - PrintManager* _tmp5_; + ViewCollection* _tmp5_; ViewCollection* _tmp6_; - ViewCollection* _tmp7_; - GeeList* _tmp8_; - GeeCollection* _tmp9_; + GeeList* _tmp7_; + GeeCollection* _tmp8_; #line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp4_ = print_manager_get_instance (); + _tmp3_ = print_manager_get_instance (); #line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO); + _tmp7_ = view_collection_get_selected_sources_of_type (_tmp6_, TYPE_PHOTO); #line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection); #line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - print_manager_spool_photo (_tmp5_, _tmp9_); + print_manager_spool_photo (_tmp4_, _tmp8_); #line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _data_collection_unref0 (_tmp7_); + _data_collection_unref0 (_tmp6_); #line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _print_manager_unref0 (_tmp5_); -#line 3638 "DirectPhotoPage.c" + _print_manager_unref0 (_tmp4_); +#line 3744 "DirectPhotoPage.c" } } -static Block7Data* block7_data_ref (Block7Data* _data7_) { +static Block7Data* +block7_data_ref (Block7Data* _data7_) +{ #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_atomic_int_inc (&_data7_->_ref_count_); #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return _data7_; -#line 3648 "DirectPhotoPage.c" +#line 3756 "DirectPhotoPage.c" } -static void block7_data_unref (void * _userdata_) { +static void +block7_data_unref (void * _userdata_) +{ Block7Data* _data7_; _data7_ = (Block7Data*) _userdata_; #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (g_atomic_int_dec_and_test (&_data7_->_ref_count_)) { -#line 3657 "DirectPhotoPage.c" +#line 3767 "DirectPhotoPage.c" DirectPhotoPage* self; #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = _data7_->self; @@ -3661,41 +3771,44 @@ static void block7_data_unref (void * _userdata_) { _g_object_unref0 (self); #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_slice_free (Block7Data, _data7_); -#line 3665 "DirectPhotoPage.c" +#line 3775 "DirectPhotoPage.c" } } -static gboolean __lambda17_ (Block7Data* _data7_) { +static gboolean +__lambda17_ (Block7Data* _data7_) +{ DirectPhotoPage* self; gboolean result = FALSE; - gboolean _tmp0_; #line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = _data7_->self; #line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = _data7_->should_allow_rotation; -#line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - editing_host_page_enable_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp0_); + editing_host_page_enable_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _data7_->should_allow_rotation); #line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = FALSE; #line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 3684 "DirectPhotoPage.c" +#line 3793 "DirectPhotoPage.c" } -static gboolean ___lambda17__gsource_func (gpointer self) { +static gboolean +___lambda17__gsource_func (gpointer self) +{ gboolean result; result = __lambda17_ (self); #line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 3693 "DirectPhotoPage.c" +#line 3804 "DirectPhotoPage.c" } -static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* self, gboolean should_allow_rotation) { +static void +direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* self, + gboolean should_allow_rotation) +{ Block7Data* _data7_; - gboolean _tmp0_; #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3705,41 +3818,41 @@ static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* sel #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _data7_->self = g_object_ref (self); #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = should_allow_rotation; -#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _data7_->should_allow_rotation = _tmp0_; + _data7_->should_allow_rotation = should_allow_rotation; #line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda17__gsource_func, block7_data_ref (_data7_), block7_data_unref); #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" block7_data_unref (_data7_); #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _data7_ = NULL; -#line 3718 "DirectPhotoPage.c" +#line 3829 "DirectPhotoPage.c" } -static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base, DataSource* source) { +static DataView* +direct_photo_page_real_create_photo_view (EditingHostPage* base, + DataSource* source) +{ DirectPhotoPage * self; DataView* result = NULL; - DataSource* _tmp0_; - DirectView* _tmp1_; + DirectView* _tmp0_; #line 473 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 473 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 474 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = source; -#line 474 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp1_ = direct_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_PHOTO, DirectPhoto)); + _tmp0_ = direct_view_new (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DIRECT_PHOTO, DirectPhoto)); #line 474 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView); #line 474 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 3739 "DirectPhotoPage.c" +#line 3850 "DirectPhotoPage.c" } -static void direct_photo_page_class_init (DirectPhotoPageClass * klass) { +static void +direct_photo_page_class_init (DirectPhotoPageClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3776,22 +3889,26 @@ static void direct_photo_page_class_init (DirectPhotoPageClass * klass) { ((EditingHostPageClass *) klass)->create_photo_view = (DataView* (*) (EditingHostPage *, DataSource*)) direct_photo_page_real_create_photo_view; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" G_OBJECT_CLASS (klass)->finalize = direct_photo_page_finalize; -#line 3780 "DirectPhotoPage.c" +#line 3893 "DirectPhotoPage.c" } -static void direct_photo_page_instance_init (DirectPhotoPage * self) { +static void +direct_photo_page_instance_init (DirectPhotoPage * self) +{ #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self->priv = DIRECT_PHOTO_PAGE_GET_PRIVATE (self); #line 9 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self->priv->view_controller = NULL; #line 11 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self->priv->drop_if_dirty = FALSE; -#line 3791 "DirectPhotoPage.c" +#line 3906 "DirectPhotoPage.c" } -static void direct_photo_page_finalize (GObject * obj) { +static void +direct_photo_page_finalize (GObject * obj) +{ DirectPhotoPage * self; DirectPhotoSourceCollection* _tmp0_; guint _tmp1_; @@ -3813,11 +3930,13 @@ static void direct_photo_page_finalize (GObject * obj) { _g_object_unref0 (self->priv->context_menu); #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" G_OBJECT_CLASS (direct_photo_page_parent_class)->finalize (obj); -#line 3817 "DirectPhotoPage.c" +#line 3934 "DirectPhotoPage.c" } -GType direct_photo_page_get_type (void) { +GType +direct_photo_page_get_type (void) +{ static volatile gsize direct_photo_page_type_id__volatile = 0; if (g_once_init_enter (&direct_photo_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DirectPhotoPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_photo_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectPhotoPage), 0, (GInstanceInitFunc) direct_photo_page_instance_init, NULL }; @@ -3829,57 +3948,65 @@ GType direct_photo_page_get_type (void) { } -DirectFullscreenPhotoPage* direct_fullscreen_photo_page_construct (GType object_type, GFile* file) { +DirectFullscreenPhotoPage* +direct_fullscreen_photo_page_construct (GType object_type, + GFile* file) +{ DirectFullscreenPhotoPage * self = NULL; - GFile* _tmp0_; #line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 480 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = file; -#line 480 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - self = (DirectFullscreenPhotoPage*) direct_photo_page_construct (object_type, _tmp0_); + self = (DirectFullscreenPhotoPage*) direct_photo_page_construct (object_type, file); #line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return self; -#line 3844 "DirectPhotoPage.c" +#line 3963 "DirectPhotoPage.c" } -DirectFullscreenPhotoPage* direct_fullscreen_photo_page_new (GFile* file) { +DirectFullscreenPhotoPage* +direct_fullscreen_photo_page_new (GFile* file) +{ #line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return direct_fullscreen_photo_page_construct (TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE, file); -#line 3851 "DirectPhotoPage.c" +#line 3972 "DirectPhotoPage.c" } -static void direct_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { +static void +direct_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames) +{ DirectFullscreenPhotoPage * self; - GeeList* _tmp0_; #line 483 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE, DirectFullscreenPhotoPage); #line 483 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); #line 486 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = ui_filenames; -#line 486 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "direct_context.ui"); -#line 3866 "DirectPhotoPage.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "direct_context.ui"); +#line 3987 "DirectPhotoPage.c" } -static void direct_fullscreen_photo_page_class_init (DirectFullscreenPhotoPageClass * klass) { +static void +direct_fullscreen_photo_page_class_init (DirectFullscreenPhotoPageClass * klass) +{ #line 478 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_fullscreen_photo_page_parent_class = g_type_class_peek_parent (klass); #line 478 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" ((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) direct_fullscreen_photo_page_real_init_collect_ui_filenames; -#line 3875 "DirectPhotoPage.c" +#line 3998 "DirectPhotoPage.c" } -static void direct_fullscreen_photo_page_instance_init (DirectFullscreenPhotoPage * self) { +static void +direct_fullscreen_photo_page_instance_init (DirectFullscreenPhotoPage * self) +{ } -GType direct_fullscreen_photo_page_get_type (void) { +GType +direct_fullscreen_photo_page_get_type (void) +{ static volatile gsize direct_fullscreen_photo_page_type_id__volatile = 0; if (g_once_init_enter (&direct_fullscreen_photo_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DirectFullscreenPhotoPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_fullscreen_photo_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectFullscreenPhotoPage), 0, (GInstanceInitFunc) direct_fullscreen_photo_page_instance_init, NULL }; @@ -3891,7 +4018,11 @@ GType direct_fullscreen_photo_page_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -3903,7 +4034,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/direct/DirectView.c b/src/direct/DirectView.c index 7ad6acd..407d555 100644 --- a/src/direct/DirectView.c +++ b/src/direct/DirectView.c @@ -1,4 +1,4 @@ -/* DirectView.c generated by valac 0.36.6, the Vala compiler +/* DirectView.c generated by valac 0.40.4, the Vala compiler * generated from DirectView.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -77,6 +78,11 @@ typedef struct _DataSourceClass DataSourceClass; typedef struct _DirectView DirectView; typedef struct _DirectViewClass DirectViewClass; typedef struct _DirectViewPrivate DirectViewPrivate; +enum { + DIRECT_VIEW_0_PROPERTY, + DIRECT_VIEW_NUM_PROPERTIES +}; +static GParamSpec* direct_view_properties[DIRECT_VIEW_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) @@ -417,34 +423,45 @@ static gpointer direct_view_collection_direct_view_manager_parent_class = NULL; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_view_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; GType direct_view_get_type (void) G_GNUC_CONST; #define DIRECT_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DIRECT_VIEW, DirectViewPrivate)) -enum { - DIRECT_VIEW_DUMMY_PROPERTY -}; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType direct_photo_get_type (void) G_GNUC_CONST; DirectView* direct_view_new (DirectPhoto* source); -DirectView* direct_view_construct (GType object_type, DirectPhoto* source); +DirectView* direct_view_construct (GType object_type, + DirectPhoto* source); DataView* data_view_new (DataSource* source); -DataView* data_view_construct (GType object_type, DataSource* source); +DataView* data_view_construct (GType object_type, + DataSource* source); GFile* media_source_get_file (MediaSource* self); GFile* direct_view_get_file (DirectView* self); gchar* direct_view_get_collate_key (DirectView* self); @@ -453,90 +470,120 @@ GType marker_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType direct_view_collection_get_type (void) G_GNUC_CONST; -enum { - DIRECT_VIEW_COLLECTION_DUMMY_PROPERTY -}; DirectViewCollection* direct_view_collection_new (void); DirectViewCollection* direct_view_collection_construct (GType object_type); ViewCollection* view_collection_new (const gchar* name); -ViewCollection* view_collection_construct (GType object_type, const gchar* name); -void data_collection_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target); -static gint64 direct_view_collection_filename_comparator (void* a, void* b); -static gint64 _direct_view_collection_filename_comparator_comparator (void* a, void* b, gpointer self); +ViewCollection* view_collection_construct (GType object_type, + const gchar* name); +void data_collection_set_comparator (DataCollection* self, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target); +static gint64 direct_view_collection_filename_comparator (void* a, + void* b); +static gint64 _direct_view_collection_filename_comparator_comparator (void* a, + void* b, + gpointer self); GType source_collection_get_type (void) G_GNUC_CONST; gpointer view_manager_ref (gpointer instance); void view_manager_unref (gpointer instance); -GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_manager (GValue* value, gpointer v_object); -void value_take_view_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_manager (GValue* value, + gpointer v_object); +void value_take_view_manager (GValue* value, + gpointer v_object); gpointer value_get_view_manager (const GValue* value); GType view_manager_get_type (void) G_GNUC_CONST; gpointer view_collection_monitor_ref (gpointer instance); void view_collection_monitor_unref (gpointer instance); -GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void view_collection_value_set_monitor (GValue* value, gpointer v_object); -void view_collection_value_take_monitor (GValue* value, gpointer v_object); +GParamSpec* view_collection_param_spec_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void view_collection_value_set_monitor (GValue* value, + gpointer v_object); +void view_collection_value_take_monitor (GValue* value, + gpointer v_object); gpointer view_collection_value_get_monitor (const GValue* value); GType view_collection_monitor_get_type (void) G_GNUC_CONST; -ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target); +ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq, + GeeCollection* initial, + ProgressMonitor progress_monitor, + void* progress_monitor_target); GType database_source_collection_get_type (void) G_GNUC_CONST; GType direct_photo_source_collection_get_type (void) G_GNUC_CONST; static DirectViewCollectionDirectViewManager* direct_view_collection_direct_view_manager_new (void); static DirectViewCollectionDirectViewManager* direct_view_collection_direct_view_manager_construct (GType object_type); static GType direct_view_collection_direct_view_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -enum { - DIRECT_VIEW_COLLECTION_DIRECT_VIEW_MANAGER_DUMMY_PROPERTY -}; -static DataView* direct_view_collection_direct_view_manager_real_create_view (ViewManager* base, DataSource* source); +static DataView* direct_view_collection_direct_view_manager_real_create_view (ViewManager* base, + DataSource* source); ViewManager* view_manager_construct (GType object_type); -DirectView* direct_view_construct (GType object_type, DirectPhoto* source) { +DirectView* +direct_view_construct (GType object_type, + DirectPhoto* source) +{ DirectView * self = NULL; - DirectPhoto* _tmp0_; - DirectPhoto* _tmp1_; - GFile* _tmp2_; + GFile* _tmp0_; #line 11 "/home/jens/Source/shotwell/src/direct/DirectView.vala" g_return_val_if_fail (IS_DIRECT_PHOTO (source), NULL); #line 12 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - _tmp0_ = source; -#line 12 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - self = (DirectView*) data_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource)); -#line 14 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - _tmp1_ = source; + self = (DirectView*) data_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #line 14 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - _tmp2_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO, Photo), TYPE_MEDIA_SOURCE, MediaSource)); + _tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_PHOTO, Photo), TYPE_MEDIA_SOURCE, MediaSource)); #line 14 "/home/jens/Source/shotwell/src/direct/DirectView.vala" _g_object_unref0 (self->priv->file); #line 14 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - self->priv->file = _tmp2_; + self->priv->file = _tmp0_; #line 11 "/home/jens/Source/shotwell/src/direct/DirectView.vala" return self; -#line 522 "DirectView.c" +#line 563 "DirectView.c" } -DirectView* direct_view_new (DirectPhoto* source) { +DirectView* +direct_view_new (DirectPhoto* source) +{ #line 11 "/home/jens/Source/shotwell/src/direct/DirectView.vala" return direct_view_construct (TYPE_DIRECT_VIEW, source); -#line 529 "DirectView.c" +#line 572 "DirectView.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 18 "/home/jens/Source/shotwell/src/direct/DirectView.vala" return self ? g_object_ref (self) : NULL; -#line 536 "DirectView.c" +#line 581 "DirectView.c" } -GFile* direct_view_get_file (DirectView* self) { +GFile* +direct_view_get_file (DirectView* self) +{ GFile* result = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -550,11 +597,13 @@ GFile* direct_view_get_file (DirectView* self) { result = _tmp1_; #line 18 "/home/jens/Source/shotwell/src/direct/DirectView.vala" return result; -#line 554 "DirectView.c" +#line 601 "DirectView.c" } -gchar* direct_view_get_collate_key (DirectView* self) { +gchar* +direct_view_get_collate_key (DirectView* self) +{ gchar* result = NULL; const gchar* _tmp0_; const gchar* _tmp5_; @@ -565,7 +614,7 @@ gchar* direct_view_get_collate_key (DirectView* self) { _tmp0_ = self->priv->collate_key; #line 22 "/home/jens/Source/shotwell/src/direct/DirectView.vala" if (_tmp0_ == NULL) { -#line 569 "DirectView.c" +#line 618 "DirectView.c" GFile* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; @@ -584,7 +633,7 @@ gchar* direct_view_get_collate_key (DirectView* self) { self->priv->collate_key = _tmp4_; #line 23 "/home/jens/Source/shotwell/src/direct/DirectView.vala" _g_free0 (_tmp3_); -#line 588 "DirectView.c" +#line 637 "DirectView.c" } #line 25 "/home/jens/Source/shotwell/src/direct/DirectView.vala" _tmp5_ = self->priv->collate_key; @@ -594,31 +643,37 @@ gchar* direct_view_get_collate_key (DirectView* self) { result = _tmp6_; #line 25 "/home/jens/Source/shotwell/src/direct/DirectView.vala" return result; -#line 598 "DirectView.c" +#line 647 "DirectView.c" } -static void direct_view_class_init (DirectViewClass * klass) { +static void +direct_view_class_init (DirectViewClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala" direct_view_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala" g_type_class_add_private (klass, sizeof (DirectViewPrivate)); #line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala" G_OBJECT_CLASS (klass)->finalize = direct_view_finalize; -#line 609 "DirectView.c" +#line 660 "DirectView.c" } -static void direct_view_instance_init (DirectView * self) { +static void +direct_view_instance_init (DirectView * self) +{ #line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala" self->priv = DIRECT_VIEW_GET_PRIVATE (self); #line 9 "/home/jens/Source/shotwell/src/direct/DirectView.vala" self->priv->collate_key = NULL; -#line 618 "DirectView.c" +#line 671 "DirectView.c" } -static void direct_view_finalize (GObject * obj) { +static void +direct_view_finalize (GObject * obj) +{ DirectView * self; #line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_VIEW, DirectView); @@ -628,11 +683,13 @@ static void direct_view_finalize (GObject * obj) { _g_free0 (self->priv->collate_key); #line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala" G_OBJECT_CLASS (direct_view_parent_class)->finalize (obj); -#line 632 "DirectView.c" +#line 687 "DirectView.c" } -GType direct_view_get_type (void) { +GType +direct_view_get_type (void) +{ static volatile gsize direct_view_type_id__volatile = 0; if (g_once_init_enter (&direct_view_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DirectViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectView), 0, (GInstanceInitFunc) direct_view_instance_init, NULL }; @@ -644,16 +701,22 @@ GType direct_view_get_type (void) { } -static gint64 _direct_view_collection_filename_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_direct_view_collection_filename_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = direct_view_collection_filename_comparator (a, b); #line 39 "/home/jens/Source/shotwell/src/direct/DirectView.vala" return result; -#line 653 "DirectView.c" +#line 714 "DirectView.c" } -DirectViewCollection* direct_view_collection_construct (GType object_type) { +DirectViewCollection* +direct_view_collection_construct (GType object_type) +{ DirectViewCollection* self = NULL; DirectPhotoSourceCollection* _tmp0_; DirectViewCollectionDirectViewManager* _tmp1_; @@ -680,116 +743,122 @@ DirectViewCollection* direct_view_collection_construct (GType object_type) { _view_manager_unref0 (_tmp2_); #line 36 "/home/jens/Source/shotwell/src/direct/DirectView.vala" return self; -#line 684 "DirectView.c" +#line 747 "DirectView.c" } -DirectViewCollection* direct_view_collection_new (void) { +DirectViewCollection* +direct_view_collection_new (void) +{ #line 36 "/home/jens/Source/shotwell/src/direct/DirectView.vala" return direct_view_collection_construct (TYPE_DIRECT_VIEW_COLLECTION); -#line 691 "DirectView.c" +#line 756 "DirectView.c" } -static gint64 direct_view_collection_filename_comparator (void* a, void* b) { +static gint64 +direct_view_collection_filename_comparator (void* a, + void* b) +{ gint64 result = 0LL; DirectView* aview = NULL; - void* _tmp0_; DirectView* bview = NULL; - void* _tmp1_; - GCompareFunc _tmp2_; + GCompareFunc _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - gint _tmp7_; - gint64 _tmp8_; + gint64 _tmp5_; #line 44 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - _tmp0_ = a; -#line 44 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - aview = (DirectView*) _tmp0_; -#line 45 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - _tmp1_ = b; + aview = (DirectView*) a; #line 45 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - bview = (DirectView*) _tmp1_; -#line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - _tmp2_ = g_strcmp0; + bview = (DirectView*) b; #line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - _tmp3_ = direct_view_get_collate_key (G_TYPE_CHECK_INSTANCE_CAST (aview, TYPE_DIRECT_VIEW, DirectView)); + _tmp0_ = g_strcmp0; #line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - _tmp4_ = _tmp3_; -#line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - _tmp5_ = direct_view_get_collate_key (G_TYPE_CHECK_INSTANCE_CAST (bview, TYPE_DIRECT_VIEW, DirectView)); + _tmp1_ = direct_view_get_collate_key (G_TYPE_CHECK_INSTANCE_CAST (aview, TYPE_DIRECT_VIEW, DirectView)); #line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - _tmp6_ = _tmp5_; + _tmp2_ = _tmp1_; #line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - _tmp7_ = _tmp2_ (_tmp4_, _tmp6_); + _tmp3_ = direct_view_get_collate_key (G_TYPE_CHECK_INSTANCE_CAST (bview, TYPE_DIRECT_VIEW, DirectView)); #line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - _tmp8_ = (gint64) _tmp7_; + _tmp4_ = _tmp3_; #line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - _g_free0 (_tmp6_); + _tmp5_ = (gint64) _tmp0_ (_tmp2_, _tmp4_); #line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala" _g_free0 (_tmp4_); #line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - result = _tmp8_; + _g_free0 (_tmp2_); +#line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala" + result = _tmp5_; #line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala" return result; -#line 738 "DirectView.c" +#line 797 "DirectView.c" } -static DataView* direct_view_collection_direct_view_manager_real_create_view (ViewManager* base, DataSource* source) { +static DataView* +direct_view_collection_direct_view_manager_real_create_view (ViewManager* base, + DataSource* source) +{ DirectViewCollectionDirectViewManager * self; DataView* result = NULL; - DataSource* _tmp0_; - DirectView* _tmp1_; + DirectView* _tmp0_; #line 31 "/home/jens/Source/shotwell/src/direct/DirectView.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DIRECT_VIEW_COLLECTION_TYPE_DIRECT_VIEW_MANAGER, DirectViewCollectionDirectViewManager); #line 31 "/home/jens/Source/shotwell/src/direct/DirectView.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 32 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - _tmp0_ = source; -#line 32 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - _tmp1_ = direct_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_PHOTO, DirectPhoto)); + _tmp0_ = direct_view_new (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DIRECT_PHOTO, DirectPhoto)); #line 32 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView); #line 32 "/home/jens/Source/shotwell/src/direct/DirectView.vala" return result; -#line 759 "DirectView.c" +#line 818 "DirectView.c" } -static DirectViewCollectionDirectViewManager* direct_view_collection_direct_view_manager_construct (GType object_type) { +static DirectViewCollectionDirectViewManager* +direct_view_collection_direct_view_manager_construct (GType object_type) +{ DirectViewCollectionDirectViewManager* self = NULL; #line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala" self = (DirectViewCollectionDirectViewManager*) view_manager_construct (object_type); #line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala" return self; -#line 769 "DirectView.c" +#line 830 "DirectView.c" } -static DirectViewCollectionDirectViewManager* direct_view_collection_direct_view_manager_new (void) { +static DirectViewCollectionDirectViewManager* +direct_view_collection_direct_view_manager_new (void) +{ #line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala" return direct_view_collection_direct_view_manager_construct (DIRECT_VIEW_COLLECTION_TYPE_DIRECT_VIEW_MANAGER); -#line 776 "DirectView.c" +#line 839 "DirectView.c" } -static void direct_view_collection_direct_view_manager_class_init (DirectViewCollectionDirectViewManagerClass * klass) { +static void +direct_view_collection_direct_view_manager_class_init (DirectViewCollectionDirectViewManagerClass * klass) +{ #line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala" direct_view_collection_direct_view_manager_parent_class = g_type_class_peek_parent (klass); #line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala" ((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) direct_view_collection_direct_view_manager_real_create_view; -#line 785 "DirectView.c" +#line 850 "DirectView.c" } -static void direct_view_collection_direct_view_manager_instance_init (DirectViewCollectionDirectViewManager * self) { +static void +direct_view_collection_direct_view_manager_instance_init (DirectViewCollectionDirectViewManager * self) +{ } -static GType direct_view_collection_direct_view_manager_get_type (void) { +static GType +direct_view_collection_direct_view_manager_get_type (void) +{ static volatile gsize direct_view_collection_direct_view_manager_type_id__volatile = 0; if (g_once_init_enter (&direct_view_collection_direct_view_manager_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DirectViewCollectionDirectViewManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_view_collection_direct_view_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectViewCollectionDirectViewManager), 0, (GInstanceInitFunc) direct_view_collection_direct_view_manager_instance_init, NULL }; @@ -801,18 +870,24 @@ static GType direct_view_collection_direct_view_manager_get_type (void) { } -static void direct_view_collection_class_init (DirectViewCollectionClass * klass) { +static void +direct_view_collection_class_init (DirectViewCollectionClass * klass) +{ #line 29 "/home/jens/Source/shotwell/src/direct/DirectView.vala" direct_view_collection_parent_class = g_type_class_peek_parent (klass); -#line 808 "DirectView.c" +#line 879 "DirectView.c" } -static void direct_view_collection_instance_init (DirectViewCollection * self) { +static void +direct_view_collection_instance_init (DirectViewCollection * self) +{ } -GType direct_view_collection_get_type (void) { +GType +direct_view_collection_get_type (void) +{ static volatile gsize direct_view_collection_type_id__volatile = 0; if (g_once_init_enter (&direct_view_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DirectViewCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_view_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectViewCollection), 0, (GInstanceInitFunc) direct_view_collection_instance_init, NULL }; diff --git a/src/direct/DirectWindow.c b/src/direct/DirectWindow.c index 16c0212..74d510c 100644 --- a/src/direct/DirectWindow.c +++ b/src/direct/DirectWindow.c @@ -1,4 +1,4 @@ -/* DirectWindow.c generated by valac 0.36.6, the Vala compiler +/* DirectWindow.c generated by valac 0.40.4, the Vala compiler * generated from DirectWindow.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -93,6 +94,11 @@ typedef struct _EditingHostPageClass EditingHostPageClass; typedef struct _DirectPhotoPage DirectPhotoPage; typedef struct _DirectPhotoPageClass DirectPhotoPageClass; +enum { + DIRECT_WINDOW_0_PROPERTY, + DIRECT_WINDOW_NUM_PROPERTIES +}; +static GParamSpec* direct_window_properties[DIRECT_WINDOW_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define TYPE_DATA_COLLECTION (data_collection_get_type ()) @@ -291,19 +297,24 @@ GType single_photo_page_get_type (void) G_GNUC_CONST; GType editing_host_page_get_type (void) G_GNUC_CONST; GType direct_photo_page_get_type (void) G_GNUC_CONST; #define DIRECT_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DIRECT_WINDOW, DirectWindowPrivate)) -enum { - DIRECT_WINDOW_DUMMY_PROPERTY -}; DirectWindow* direct_window_new (GFile* file); -DirectWindow* direct_window_construct (GType object_type, GFile* file); +DirectWindow* direct_window_construct (GType object_type, + GFile* file); AppWindow* app_window_construct (GType object_type); DirectPhotoPage* direct_photo_page_new (GFile* file); -DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file); +DirectPhotoPage* direct_photo_page_construct (GType object_type, + GFile* file); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; @@ -312,16 +323,29 @@ static void direct_window_on_photo_changed (DirectWindow* self); GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; -static void _direct_window_on_photo_changed_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void _direct_window_on_photo_changed_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); GType data_view_get_type (void) G_GNUC_CONST; -static void _direct_window_on_photo_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self); -void page_window_set_current_page (PageWindow* self, Page* page); -void direct_window_update_title (DirectWindow* self, GFile* file, gboolean modified); +static void _direct_window_on_photo_changed_view_collection_items_state_changed (ViewCollection* _sender, + GeeIterable* changed, + gpointer self); +void page_window_set_current_page (PageWindow* self, + Page* page); +void direct_window_update_title (DirectWindow* self, + GFile* file, + gboolean modified); void page_switched_to (Page* self); GtkToolbar* page_get_toolbar (Page* self); void application_set_menubar (GMenuModel* model); @@ -333,9 +357,11 @@ gchar* get_display_pathname (GFile* file); #define RESOURCES_APP_TITLE "Shotwell" static void direct_window_real_on_fullscreen (AppWindow* base); GFile* direct_photo_page_get_current_file (DirectPhotoPage* self); -void app_window_go_fullscreen (AppWindow* self, Page* page); +void app_window_go_fullscreen (AppWindow* self, + Page* page); DirectFullscreenPhotoPage* direct_fullscreen_photo_page_new (GFile* file); -DirectFullscreenPhotoPage* direct_fullscreen_photo_page_construct (GType object_type, GFile* file); +DirectFullscreenPhotoPage* direct_fullscreen_photo_page_construct (GType object_type, + GFile* file); GType direct_fullscreen_photo_page_get_type (void) G_GNUC_CONST; static gchar* direct_window_real_get_app_role (AppWindow* base); #define RESOURCES_APP_DIRECT_ROLE _ ("Photo Viewer") @@ -352,152 +378,168 @@ gboolean direct_photo_page_check_quit (DirectPhotoPage* self); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); -void configuration_facade_set_direct_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions); +void configuration_facade_set_direct_window_state (ConfigurationFacade* self, + gboolean maximize, + Dimensions* dimensions); void app_window_on_quit (AppWindow* self); -static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* event); -static gboolean direct_window_real_button_press_event (GtkWidget* base, GdkEventButton* event); +static gboolean direct_window_real_delete_event (GtkWidget* base, + GdkEventAny* event); +static gboolean direct_window_real_button_press_event (GtkWidget* base, + GdkEventButton* event); void app_window_on_fullscreen (AppWindow* self); -static gboolean direct_window_real_key_press_event (GtkWidget* base, GdkEventKey* event); +static gboolean direct_window_real_key_press_event (GtkWidget* base, + GdkEventKey* event); static void direct_window_finalize (GObject * obj); -static void _direct_window_on_photo_changed_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_direct_window_on_photo_changed_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" direct_window_on_photo_changed ((DirectWindow*) self); -#line 368 "DirectWindow.c" +#line 403 "DirectWindow.c" } -static void _direct_window_on_photo_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) { +static void +_direct_window_on_photo_changed_view_collection_items_state_changed (ViewCollection* _sender, + GeeIterable* changed, + gpointer self) +{ #line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" direct_window_on_photo_changed ((DirectWindow*) self); -#line 375 "DirectWindow.c" +#line 414 "DirectWindow.c" } -DirectWindow* direct_window_construct (GType object_type, GFile* file) { +DirectWindow* +direct_window_construct (GType object_type, + GFile* file) +{ DirectWindow * self = NULL; - GFile* _tmp0_; + DirectPhotoPage* _tmp0_; DirectPhotoPage* _tmp1_; - DirectPhotoPage* _tmp2_; + ViewCollection* _tmp2_; ViewCollection* _tmp3_; - ViewCollection* _tmp4_; - DirectPhotoPage* _tmp5_; + DirectPhotoPage* _tmp4_; + ViewCollection* _tmp5_; ViewCollection* _tmp6_; - ViewCollection* _tmp7_; + DirectPhotoPage* _tmp7_; DirectPhotoPage* _tmp8_; - GFile* _tmp9_; - DirectPhotoPage* _tmp10_; GtkBox* layout = NULL; - GtkBox* _tmp11_; - DirectPhotoPage* _tmp12_; - DirectPhotoPage* _tmp13_; - GtkToolbar* _tmp14_; - GtkToolbar* _tmp15_; - DirectPhotoPage* _tmp16_; - GMenuModel* _tmp17_; - GMenuModel* _tmp18_; + GtkBox* _tmp9_; + DirectPhotoPage* _tmp10_; + DirectPhotoPage* _tmp11_; + GtkToolbar* _tmp12_; + GtkToolbar* _tmp13_; + DirectPhotoPage* _tmp14_; + GMenuModel* _tmp15_; + GMenuModel* _tmp16_; #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = (DirectWindow*) app_window_construct (object_type); #line 11 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp0_ = file; -#line 11 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp1_ = direct_photo_page_new (_tmp0_); + _tmp0_ = direct_photo_page_new (file); #line 11 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - g_object_ref_sink (_tmp1_); + g_object_ref_sink (_tmp0_); #line 11 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (self->priv->direct_photo_page); #line 11 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - self->priv->direct_photo_page = _tmp1_; + self->priv->direct_photo_page = _tmp0_; #line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp2_ = self->priv->direct_photo_page; + _tmp1_ = self->priv->direct_photo_page; #line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PAGE, Page)); + _tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page)); #line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _direct_window_on_photo_changed_data_collection_items_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _direct_window_on_photo_changed_data_collection_items_altered, self, 0); #line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _data_collection_unref0 (_tmp4_); + _data_collection_unref0 (_tmp3_); #line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp5_ = self->priv->direct_photo_page; + _tmp4_ = self->priv->direct_photo_page; #line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PAGE, Page)); + _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE, Page)); #line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - g_signal_connect_object (_tmp7_, "items-state-changed", (GCallback) _direct_window_on_photo_changed_view_collection_items_state_changed, self, 0); + g_signal_connect_object (_tmp6_, "items-state-changed", (GCallback) _direct_window_on_photo_changed_view_collection_items_state_changed, self, 0); #line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _data_collection_unref0 (_tmp7_); + _data_collection_unref0 (_tmp6_); #line 15 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp8_ = self->priv->direct_photo_page; + _tmp7_ = self->priv->direct_photo_page; #line 15 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - page_window_set_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page)); + page_window_set_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE, Page)); #line 17 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp9_ = file; -#line 17 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - direct_window_update_title (self, _tmp9_, FALSE); + direct_window_update_title (self, file, FALSE); #line 19 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp10_ = self->priv->direct_photo_page; + _tmp8_ = self->priv->direct_photo_page; #line 19 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - page_switched_to (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PAGE, Page)); + page_switched_to (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page)); #line 23 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp11_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + _tmp9_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); #line 23 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - g_object_ref_sink (_tmp11_); + g_object_ref_sink (_tmp9_); #line 23 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - layout = _tmp11_; + layout = _tmp9_; #line 24 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp12_ = self->priv->direct_photo_page; + _tmp10_ = self->priv->direct_photo_page; #line 24 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - gtk_box_pack_start (layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp13_ = self->priv->direct_photo_page; + _tmp11_ = self->priv->direct_photo_page; #line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp14_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE, Page)); + _tmp12_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE, Page)); #line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp15_ = _tmp14_; + _tmp13_ = _tmp12_; #line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - gtk_box_pack_end (layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_end (layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp13_); #line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp16_ = self->priv->direct_photo_page; + _tmp14_ = self->priv->direct_photo_page; #line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp17_ = page_get_menubar (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE, Page)); + _tmp15_ = page_get_menubar (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PAGE, Page)); #line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp18_ = _tmp17_; + _tmp16_ = _tmp15_; #line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - application_set_menubar (_tmp18_); + application_set_menubar (_tmp16_); #line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp16_); #line 29 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_widget_get_type (), GtkWidget)); #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (layout); #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return self; -#line 483 "DirectWindow.c" +#line 519 "DirectWindow.c" } -DirectWindow* direct_window_new (GFile* file) { +DirectWindow* +direct_window_new (GFile* file) +{ #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return direct_window_construct (TYPE_DIRECT_WINDOW, file); -#line 490 "DirectWindow.c" +#line 528 "DirectWindow.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return self ? g_object_ref (self) : NULL; -#line 497 "DirectWindow.c" +#line 537 "DirectWindow.c" } -DirectWindow* direct_window_get_app (void) { +DirectWindow* +direct_window_get_app (void) +{ DirectWindow* result = NULL; AppWindow* _tmp0_; DirectWindow* _tmp1_; @@ -509,11 +551,13 @@ DirectWindow* direct_window_get_app (void) { result = _tmp1_; #line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 513 "DirectWindow.c" +#line 555 "DirectWindow.c" } -DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self) { +DirectPhotoPage* +direct_window_get_direct_page (DirectWindow* self) +{ DirectPhotoPage* result = NULL; Page* _tmp0_; #line 36 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" @@ -524,74 +568,71 @@ DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 37 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 528 "DirectWindow.c" +#line 572 "DirectWindow.c" } -void direct_window_update_title (DirectWindow* self, GFile* file, gboolean modified) { +void +direct_window_update_title (DirectWindow* self, + GFile* file, + gboolean modified) +{ const gchar* _tmp0_ = NULL; - gboolean _tmp1_; - GFile* _tmp2_; - gchar* _tmp3_; - gchar* _tmp4_; - GFile* _tmp5_; - GFile* _tmp6_; - GFile* _tmp7_; + gchar* _tmp1_; + gchar* _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; #line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_if_fail (IS_DIRECT_WINDOW (self)); #line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_if_fail (G_IS_FILE (file)); #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp1_ = modified; -#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - if (_tmp1_) { + if (modified) { #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = "*"; -#line 555 "DirectWindow.c" +#line 598 "DirectWindow.c" } else { #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = ""; -#line 559 "DirectWindow.c" +#line 602 "DirectWindow.c" } #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp2_ = file; + _tmp1_ = g_file_get_basename (file); #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp3_ = g_file_get_basename (_tmp2_); + _tmp2_ = _tmp1_; #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp4_ = _tmp3_; + _tmp3_ = g_file_get_parent (file); #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp5_ = file; -#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp6_ = g_file_get_parent (_tmp5_); -#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp8_ = get_display_pathname (_tmp7_); + _tmp5_ = get_display_pathname (_tmp4_); #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp10_ = g_strdup_printf ("%s%s (%s) - %s", _tmp0_, _tmp4_, _tmp9_, RESOURCES_APP_TITLE); + _tmp7_ = g_strdup_printf ("%s%s (%s) - %s", _tmp0_, _tmp2_, _tmp6_, RESOURCES_APP_TITLE); #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp11_); + gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp8_); #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp8_); #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp6_); #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp4_); #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _g_free0 (_tmp4_); -#line 591 "DirectWindow.c" + _g_free0 (_tmp2_); +#line 630 "DirectWindow.c" } -static void direct_window_real_on_fullscreen (AppWindow* base) { +static void +direct_window_real_on_fullscreen (AppWindow* base) +{ DirectWindow * self; GFile* file = NULL; DirectPhotoPage* _tmp0_; @@ -626,11 +667,13 @@ static void direct_window_real_on_fullscreen (AppWindow* base) { _g_object_unref0 (_tmp5_); #line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (file); -#line 630 "DirectWindow.c" +#line 671 "DirectWindow.c" } -static gchar* direct_window_real_get_app_role (AppWindow* base) { +static gchar* +direct_window_real_get_app_role (AppWindow* base) +{ DirectWindow * self; gchar* result = NULL; gchar* _tmp0_; @@ -642,11 +685,13 @@ static gchar* direct_window_real_get_app_role (AppWindow* base) { result = _tmp0_; #line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 646 "DirectWindow.c" +#line 689 "DirectWindow.c" } -static void direct_window_on_photo_changed (DirectWindow* self) { +static void +direct_window_on_photo_changed (DirectWindow* self) +{ Photo* photo = NULL; DirectPhotoPage* _tmp0_; Photo* _tmp1_; @@ -663,12 +708,11 @@ static void direct_window_on_photo_changed (DirectWindow* self) { _tmp2_ = photo; #line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (_tmp2_ != NULL) { -#line 667 "DirectWindow.c" +#line 712 "DirectWindow.c" Photo* _tmp3_; GFile* _tmp4_; GFile* _tmp5_; Photo* _tmp6_; - gboolean _tmp7_; #line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp3_ = photo; #line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" @@ -678,29 +722,28 @@ static void direct_window_on_photo_changed (DirectWindow* self) { #line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp6_ = photo; #line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp7_ = photo_has_alterations (_tmp6_); -#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - direct_window_update_title (self, _tmp5_, _tmp7_); + direct_window_update_title (self, _tmp5_, photo_has_alterations (_tmp6_)); #line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (_tmp5_); -#line 687 "DirectWindow.c" +#line 729 "DirectWindow.c" } #line 55 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (photo); -#line 691 "DirectWindow.c" +#line 733 "DirectWindow.c" } -static void direct_window_real_on_quit (AppWindow* base) { +static void +direct_window_real_on_quit (AppWindow* base) +{ DirectWindow * self; DirectPhotoPage* _tmp0_; DirectPhotoPage* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; + ConfigFacade* _tmp3_; ConfigFacade* _tmp4_; - ConfigFacade* _tmp5_; - gboolean _tmp6_; - Dimensions _tmp7_; + gboolean _tmp5_; + Dimensions _tmp6_; #line 61 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); #line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" @@ -708,43 +751,43 @@ static void direct_window_real_on_quit (AppWindow* base) { #line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp1_ = _tmp0_; #line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp2_ = direct_photo_page_check_quit (_tmp1_); -#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp3_ = !_tmp2_; + _tmp2_ = !direct_photo_page_check_quit (_tmp1_); #line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (_tmp1_); #line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - if (_tmp3_) { + if (_tmp2_) { #line 63 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return; -#line 721 "DirectWindow.c" +#line 762 "DirectWindow.c" } #line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp4_ = config_facade_get_instance (); + _tmp3_ = config_facade_get_instance (); #line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->maximized; + _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->maximized; #line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->dimensions; + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->dimensions; #line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - configuration_facade_set_direct_window_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_, &_tmp7_); + configuration_facade_set_direct_window_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp5_, &_tmp6_); #line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" APP_WINDOW_CLASS (direct_window_parent_class)->on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)); -#line 737 "DirectWindow.c" +#line 778 "DirectWindow.c" } -static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* event) { +static gboolean +direct_window_real_delete_event (GtkWidget* base, + GdkEventAny* event) +{ DirectWindow * self; gboolean result = FALSE; DirectPhotoPage* _tmp0_; DirectPhotoPage* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_ = FALSE; + gboolean _tmp3_ = FALSE; #line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); #line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" @@ -754,128 +797,114 @@ static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* e #line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp1_ = _tmp0_; #line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp2_ = direct_photo_page_check_quit (_tmp1_); -#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp3_ = !_tmp2_; + _tmp2_ = !direct_photo_page_check_quit (_tmp1_); #line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (_tmp1_); #line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - if (_tmp3_) { + if (_tmp2_) { #line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = TRUE; #line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 769 "DirectWindow.c" +#line 810 "DirectWindow.c" } #line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (GTK_WIDGET_CLASS (direct_window_parent_class)->delete_event != NULL) { -#line 773 "DirectWindow.c" - GdkEventAny* _tmp5_; - gboolean _tmp6_; #line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp5_ = event; -#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp6_ = GTK_WIDGET_CLASS (direct_window_parent_class)->delete_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), _tmp5_); -#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp4_ = _tmp6_; -#line 782 "DirectWindow.c" + _tmp3_ = GTK_WIDGET_CLASS (direct_window_parent_class)->delete_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), event); +#line 816 "DirectWindow.c" } else { #line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp4_ = FALSE; -#line 786 "DirectWindow.c" + _tmp3_ = FALSE; +#line 820 "DirectWindow.c" } #line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - result = _tmp4_; + result = _tmp3_; #line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 792 "DirectWindow.c" +#line 826 "DirectWindow.c" } -static gboolean direct_window_real_button_press_event (GtkWidget* base, GdkEventButton* event) { +static gboolean +direct_window_real_button_press_event (GtkWidget* base, + GdkEventButton* event) +{ DirectWindow * self; gboolean result = FALSE; - GdkEventButton* _tmp0_; - GdkEventType _tmp1_; + GdkEventType _tmp0_; #line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); #line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_val_if_fail (event != NULL, FALSE); #line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp0_ = event; -#line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp1_ = _tmp0_->type; + _tmp0_ = event->type; #line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - if (_tmp1_ == GDK_2BUTTON_PRESS) { + if (_tmp0_ == GDK_2BUTTON_PRESS) { #line 79 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" app_window_on_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)); #line 81 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = TRUE; #line 81 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 817 "DirectWindow.c" +#line 851 "DirectWindow.c" } #line 84 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = FALSE; #line 84 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 823 "DirectWindow.c" +#line 857 "DirectWindow.c" } -static gboolean direct_window_real_key_press_event (GtkWidget* base, GdkEventKey* event) { +static gboolean +direct_window_real_key_press_event (GtkWidget* base, + GdkEventKey* event) +{ DirectWindow * self; gboolean result = FALSE; - GdkEventKey* _tmp0_; - guint _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_ = FALSE; + guint _tmp0_; + const gchar* _tmp1_; + gboolean _tmp2_ = FALSE; #line 87 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); #line 87 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_val_if_fail (event != NULL, FALSE); #line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp0_ = event; + _tmp0_ = event->keyval; #line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp1_ = _tmp0_->keyval; + _tmp1_ = gdk_keyval_name (_tmp0_); #line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp2_ = gdk_keyval_name (_tmp1_); -#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - if (g_strcmp0 (_tmp2_, "Escape") == 0) { + if (g_strcmp0 (_tmp1_, "Escape") == 0) { #line 90 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" app_window_on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)); #line 92 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = TRUE; #line 92 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 852 "DirectWindow.c" +#line 886 "DirectWindow.c" } #line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (GTK_WIDGET_CLASS (direct_window_parent_class)->key_press_event != NULL) { -#line 856 "DirectWindow.c" - GdkEventKey* _tmp4_; - gboolean _tmp5_; -#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp4_ = event; -#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp5_ = GTK_WIDGET_CLASS (direct_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), _tmp4_); #line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp3_ = _tmp5_; -#line 865 "DirectWindow.c" + _tmp2_ = GTK_WIDGET_CLASS (direct_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), event); +#line 892 "DirectWindow.c" } else { #line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp3_ = FALSE; -#line 869 "DirectWindow.c" + _tmp2_ = FALSE; +#line 896 "DirectWindow.c" } #line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - result = _tmp3_; + result = _tmp2_; #line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 875 "DirectWindow.c" +#line 902 "DirectWindow.c" } -static void direct_window_class_init (DirectWindowClass * klass) { +static void +direct_window_class_init (DirectWindowClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" direct_window_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" @@ -894,18 +923,22 @@ static void direct_window_class_init (DirectWindowClass * klass) { ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) direct_window_real_key_press_event; #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" G_OBJECT_CLASS (klass)->finalize = direct_window_finalize; -#line 898 "DirectWindow.c" +#line 927 "DirectWindow.c" } -static void direct_window_instance_init (DirectWindow * self) { +static void +direct_window_instance_init (DirectWindow * self) +{ #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self->priv = DIRECT_WINDOW_GET_PRIVATE (self); -#line 905 "DirectWindow.c" +#line 936 "DirectWindow.c" } -static void direct_window_finalize (GObject * obj) { +static void +direct_window_finalize (GObject * obj) +{ DirectWindow * self; #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_WINDOW, DirectWindow); @@ -913,11 +946,13 @@ static void direct_window_finalize (GObject * obj) { _g_object_unref0 (self->priv->direct_photo_page); #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" G_OBJECT_CLASS (direct_window_parent_class)->finalize (obj); -#line 917 "DirectWindow.c" +#line 950 "DirectWindow.c" } -GType direct_window_get_type (void) { +GType +direct_window_get_type (void) +{ static volatile gsize direct_window_type_id__volatile = 0; if (g_once_init_enter (&direct_window_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DirectWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectWindow), 0, (GInstanceInitFunc) direct_window_instance_init, NULL }; diff --git a/src/editing_tools/EditingTools.c b/src/editing_tools/EditingTools.c index 06abe20..629c926 100644 --- a/src/editing_tools/EditingTools.c +++ b/src/editing_tools/EditingTools.c @@ -1,4 +1,4 @@ -/* EditingTools.c generated by valac 0.36.6, the Vala compiler +/* EditingTools.c generated by valac 0.40.4, the Vala compiler * generated from EditingTools.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -15,6 +15,7 @@ * the preconfigure() method, implement it, and ensure in init() that it's been called. */ + #include #include #include @@ -41,6 +42,11 @@ typedef struct _EditingToolsEditingToolWindow EditingToolsEditingToolWindow; typedef struct _EditingToolsEditingToolWindowClass EditingToolsEditingToolWindowClass; typedef struct _EditingToolsEditingToolWindowPrivate EditingToolsEditingToolWindowPrivate; +enum { + EDITING_TOOLS_EDITING_TOOL_WINDOW_0_PROPERTY, + EDITING_TOOLS_EDITING_TOOL_WINDOW_NUM_PROPERTIES +}; +static GParamSpec* editing_tools_editing_tool_window_properties[EDITING_TOOLS_EDITING_TOOL_WINDOW_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define TYPE_PAGE_WINDOW (page_window_get_type ()) @@ -152,9 +158,9 @@ typedef struct _EditingToolsParamSpecPhotoCanvas EditingToolsParamSpecPhotoCanva enum { EDITING_TOOLS_PHOTO_CANVAS_NEW_SURFACE_SIGNAL, EDITING_TOOLS_PHOTO_CANVAS_RESIZED_SCALED_PIXBUF_SIGNAL, - EDITING_TOOLS_PHOTO_CANVAS_LAST_SIGNAL + EDITING_TOOLS_PHOTO_CANVAS_NUM_SIGNALS }; -static guint editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_LAST_SIGNAL] = {0}; +static guint editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_NUM_SIGNALS] = {0}; #define EDITING_TOOLS_TYPE_EDITING_TOOL (editing_tools_editing_tool_get_type ()) #define EDITING_TOOLS_EDITING_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)) @@ -185,9 +191,9 @@ enum { EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL, EDITING_TOOLS_EDITING_TOOL_CANCELLED_SIGNAL, EDITING_TOOLS_EDITING_TOOL_ABORTED_SIGNAL, - EDITING_TOOLS_EDITING_TOOL_LAST_SIGNAL + EDITING_TOOLS_EDITING_TOOL_NUM_SIGNALS }; -static guint editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_LAST_SIGNAL] = {0}; +static guint editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_NUM_SIGNALS] = {0}; #define EDITING_TOOLS_TYPE_CROP_TOOL (editing_tools_crop_tool_get_type ()) #define EDITING_TOOLS_CROP_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool)) @@ -293,6 +299,11 @@ typedef struct _CropCommandClass CropCommandClass; #define TYPE_BOX_COMPLEMENTS (box_complements_get_type ()) typedef struct _EditingToolsCropToolParamSpecConstraintDescription EditingToolsCropToolParamSpecConstraintDescription; +enum { + EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_0_PROPERTY, + EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_NUM_PROPERTIES +}; +static GParamSpec* editing_tools_crop_tool_crop_tool_window_properties[EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_NUM_PROPERTIES]; #define EDITING_TOOLS_TYPE_REDEYE_INSTANCE (editing_tools_redeye_instance_get_type ()) typedef struct _EditingToolsRedeyeInstance EditingToolsRedeyeInstance; @@ -361,6 +372,11 @@ typedef struct _AlterationClass AlterationClass; typedef struct _DataCollection DataCollection; typedef struct _DataCollectionClass DataCollectionClass; #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL))) +enum { + EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_0_PROPERTY, + EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_NUM_PROPERTIES +}; +static GParamSpec* editing_tools_redeye_tool_redeye_tool_window_properties[EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_NUM_PROPERTIES]; #define EDITING_TOOLS_TYPE_ADJUST_TOOL (editing_tools_adjust_tool_get_type ()) #define EDITING_TOOLS_ADJUST_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool)) @@ -457,6 +473,11 @@ typedef struct _EditingToolsAdjustToolSliderAdjustmentCommandClass EditingToolsA typedef struct _EditingToolsAdjustToolAdjustEnhanceCommand EditingToolsAdjustToolAdjustEnhanceCommand; typedef struct _EditingToolsAdjustToolAdjustEnhanceCommandClass EditingToolsAdjustToolAdjustEnhanceCommandClass; +enum { + EDITING_TOOLS_ADJUST_TOOL_ADJUST_TOOL_WINDOW_0_PROPERTY, + EDITING_TOOLS_ADJUST_TOOL_ADJUST_TOOL_WINDOW_NUM_PROPERTIES +}; +static GParamSpec* editing_tools_adjust_tool_adjust_tool_window_properties[EDITING_TOOLS_ADJUST_TOOL_ADJUST_TOOL_WINDOW_NUM_PROPERTIES]; #define TYPE_COMMAND_DESCRIPTION (command_description_get_type ()) #define COMMAND_DESCRIPTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMMAND_DESCRIPTION, CommandDescription)) @@ -467,9 +488,29 @@ typedef struct _CommandDescription CommandDescription; typedef struct _CommandDescriptionIface CommandDescriptionIface; typedef struct _CommandPrivate CommandPrivate; typedef struct _EditingToolsAdjustToolAdjustToolCommandPrivate EditingToolsAdjustToolAdjustToolCommandPrivate; +enum { + EDITING_TOOLS_ADJUST_TOOL_ADJUST_TOOL_COMMAND_0_PROPERTY, + EDITING_TOOLS_ADJUST_TOOL_ADJUST_TOOL_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* editing_tools_adjust_tool_adjust_tool_command_properties[EDITING_TOOLS_ADJUST_TOOL_ADJUST_TOOL_COMMAND_NUM_PROPERTIES]; typedef struct _EditingToolsAdjustToolAdjustResetCommandPrivate EditingToolsAdjustToolAdjustResetCommandPrivate; +enum { + EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_0_PROPERTY, + EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* editing_tools_adjust_tool_adjust_reset_command_properties[EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_NUM_PROPERTIES]; typedef struct _EditingToolsAdjustToolSliderAdjustmentCommandPrivate EditingToolsAdjustToolSliderAdjustmentCommandPrivate; +enum { + EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_0_PROPERTY, + EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* editing_tools_adjust_tool_slider_adjustment_command_properties[EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_NUM_PROPERTIES]; typedef struct _EditingToolsAdjustToolAdjustEnhanceCommandPrivate EditingToolsAdjustToolAdjustEnhanceCommandPrivate; +enum { + EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_0_PROPERTY, + EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_NUM_PROPERTIES +}; +static GParamSpec* editing_tools_adjust_tool_adjust_enhance_command_properties[EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_NUM_PROPERTIES]; #define TYPE_ENHANCE_SINGLE_COMMAND (enhance_single_command_get_type ()) #define ENHANCE_SINGLE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ENHANCE_SINGLE_COMMAND, EnhanceSingleCommand)) @@ -903,28 +944,41 @@ void editing_tools_init (GError** error); void editing_tools_terminate (void); GType editing_tools_editing_tool_window_get_type (void) G_GNUC_CONST; #define EDITING_TOOLS_EDITING_TOOL_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindowPrivate)) -enum { - EDITING_TOOLS_EDITING_TOOL_WINDOW_DUMMY_PROPERTY -}; #define EDITING_TOOLS_EDITING_TOOL_WINDOW_FRAME_BORDER 6 -EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GType object_type, GtkWindow* container); -static void editing_tools_editing_tool_window_suppress_warnings (EditingToolsEditingToolWindow* self, const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message); -static void _editing_tools_editing_tool_window_suppress_warnings_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self); -static void editing_tools_editing_tool_window_real_add (GtkContainer* base, GtkWidget* widget); +EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GType object_type, + GtkWindow* container); +static void editing_tools_editing_tool_window_suppress_warnings (EditingToolsEditingToolWindow* self, + const gchar* log_domain, + GLogLevelFlags log_levels, + const gchar* message); +static void _editing_tools_editing_tool_window_suppress_warnings_glog_func (const gchar* log_domain, + GLogLevelFlags log_levels, + const gchar* message, + gpointer self); +static void editing_tools_editing_tool_window_real_add (GtkContainer* base, + GtkWidget* widget); gboolean editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingToolWindow* self); -static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidget* base, GdkEventKey* event); +static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidget* base, + GdkEventKey* event); GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); -static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWidget* base, GdkEventButton* event); +static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWidget* base, + GdkEventButton* event); static void editing_tools_editing_tool_window_real_realize (GtkWidget* base); #define RESOURCES_TRANSIENT_WINDOW_OPACITY 0.90 static void editing_tools_editing_tool_window_finalize (GObject * obj); gpointer editing_tools_photo_canvas_ref (gpointer instance); void editing_tools_photo_canvas_unref (gpointer instance); -GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void editing_tools_value_set_photo_canvas (GValue* value, gpointer v_object); -void editing_tools_value_take_photo_canvas (GValue* value, gpointer v_object); +GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void editing_tools_value_set_photo_canvas (GValue* value, + gpointer v_object); +void editing_tools_value_take_photo_canvas (GValue* value, + gpointer v_object); gpointer editing_tools_value_get_photo_canvas (const GValue* value); GType editing_tools_photo_canvas_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; @@ -937,120 +991,246 @@ GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); #define EDITING_TOOLS_PHOTO_CANVAS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_TYPE_PHOTO_CANVAS, EditingToolsPhotoCanvasPrivate)) -enum { - EDITING_TOOLS_PHOTO_CANVAS_DUMMY_PROPERTY -}; -EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type, GtkWindow* container, GdkWindow* drawing_window, Photo* photo, cairo_t* default_ctx, Dimensions* surface_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position); -static cairo_surface_t* editing_tools_photo_canvas_pixbuf_to_surface (EditingToolsPhotoCanvas* self, cairo_t* default_ctx, GdkPixbuf* pixbuf, GdkRectangle* pos); -void editing_tools_photo_canvas_unscaled_to_raw_rect (EditingToolsPhotoCanvas* self, GdkRectangle* rectangle, GdkRectangle* result); -void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRectangle* result); -void editing_tools_photo_canvas_active_to_unscaled_point (EditingToolsPhotoCanvas* self, GdkPoint* active_point, GdkPoint* result); -void editing_tools_photo_canvas_get_scaled_pixbuf_position (EditingToolsPhotoCanvas* self, GdkRectangle* result); +EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type, + GtkWindow* container, + GdkWindow* drawing_window, + Photo* photo, + cairo_t* default_ctx, + Dimensions* surface_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position); +static cairo_surface_t* editing_tools_photo_canvas_pixbuf_to_surface (EditingToolsPhotoCanvas* self, + cairo_t* default_ctx, + GdkPixbuf* pixbuf, + GdkRectangle* pos); +void editing_tools_photo_canvas_unscaled_to_raw_rect (EditingToolsPhotoCanvas* self, + GdkRectangle* rectangle, + GdkRectangle* result); +void photo_unscaled_to_raw_rect (Photo* self, + GdkRectangle* unscaled_rect, + GdkRectangle* result); +void editing_tools_photo_canvas_active_to_unscaled_point (EditingToolsPhotoCanvas* self, + GdkPoint* active_point, + GdkPoint* result); +void editing_tools_photo_canvas_get_scaled_pixbuf_position (EditingToolsPhotoCanvas* self, + GdkRectangle* result); GType photo_exception_get_type (void) G_GNUC_CONST; -void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result); -void editing_tools_photo_canvas_active_to_unscaled_rect (EditingToolsPhotoCanvas* self, GdkRectangle* active_rect, GdkRectangle* result); -void editing_tools_photo_canvas_user_to_active_point (EditingToolsPhotoCanvas* self, GdkPoint* user_point, GdkPoint* result); -void editing_tools_photo_canvas_user_to_active_rect (EditingToolsPhotoCanvas* self, GdkRectangle* user_rect, GdkRectangle* result); +void media_source_get_dimensions (MediaSource* self, + PhotoException disallowed_steps, + Dimensions* result); +void editing_tools_photo_canvas_active_to_unscaled_rect (EditingToolsPhotoCanvas* self, + GdkRectangle* active_rect, + GdkRectangle* result); +void editing_tools_photo_canvas_user_to_active_point (EditingToolsPhotoCanvas* self, + GdkPoint* user_point, + GdkPoint* result); +void editing_tools_photo_canvas_user_to_active_rect (EditingToolsPhotoCanvas* self, + GdkRectangle* user_rect, + GdkRectangle* result); Photo* editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self); GtkWindow* editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* self); GdkWindow* editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanvas* self); cairo_t* editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* self); -void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self, Dimensions* result); +void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self, + Dimensions* result); GType scaling_get_type (void) G_GNUC_CONST; GType scale_constraint_get_type (void) G_GNUC_CONST; Scaling* scaling_dup (const Scaling* self); void scaling_free (Scaling* self); -void editing_tools_photo_canvas_get_scaling (EditingToolsPhotoCanvas* self, Scaling* result); -void scaling_for_viewport (Dimensions* viewport, gboolean scale_up, Scaling* result); -void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, cairo_t* default_ctx, Dimensions* surface_dim); +void editing_tools_photo_canvas_get_scaling (EditingToolsPhotoCanvas* self, + Scaling* result); +void scaling_for_viewport (Dimensions* viewport, + gboolean scale_up, + Scaling* result); +void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, + cairo_t* default_ctx, + Dimensions* surface_dim); cairo_surface_t* editing_tools_photo_canvas_get_scaled_surface (EditingToolsPhotoCanvas* self); GdkPixbuf* editing_tools_photo_canvas_get_scaled_pixbuf (EditingToolsPhotoCanvas* self); -void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position); +void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, + Dimensions* old_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position); void editing_tools_photo_canvas_repaint (EditingToolsPhotoCanvas* self); static void editing_tools_photo_canvas_real_repaint (EditingToolsPhotoCanvas* self); -void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, GdkPixbuf* pixbuf); -void set_source_color_from_string (cairo_t* ctx, const gchar* spec); -void paint_pixmap_with_background (cairo_t* ctx, GdkPixbuf* pixbuf, gint x, gint y); -void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, cairo_surface_t* surface, gboolean over); +void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, + GdkPixbuf* pixbuf); +void set_source_color_from_string (cairo_t* ctx, + const gchar* spec); +void paint_pixmap_with_background (cairo_t* ctx, + GdkPixbuf* pixbuf, + gint x, + gint y); +void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, + cairo_surface_t* surface, + gboolean over); GType box_get_type (void) G_GNUC_CONST; Box* box_dup (const Box* self); void box_free (Box* self); -void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* self, cairo_surface_t* surface, Box* source_area, gboolean over); +void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* self, + cairo_surface_t* surface, + Box* source_area, + gboolean over); gint box_get_width (Box *self); gint box_get_height (Box *self); -void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, cairo_t* ctx, Box* box); -void box_get_rectangle (Box *self, GdkRectangle* result); -void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_t* ctx, const gchar* text, gint x, gint y, gboolean use_scaled_pos); +void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, + cairo_t* ctx, + Box* box); +void box_get_rectangle (Box *self, + GdkRectangle* result); +void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, + cairo_t* ctx, + const gchar* text, + gint x, + gint y, + gboolean use_scaled_pos); #define RESOURCES_ONIMAGE_FONT_BACKGROUND "rgba(255,255,255,0.5)" #define RESOURCES_ONIMAGE_FONT_COLOR "#000000" -void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint x, gint y, gint width, gboolean use_scaled_pos); -void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint x, gint y, gint height, gboolean use_scaled_pos); -void editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas* self, gint x, gint y, gint width); -void editing_tools_photo_canvas_draw_circle (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint active_center_x, gint active_center_y, gint radius); -void editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* self, gint x, gint y, gint height); -void editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self, Box* box); -void editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self, Box* area); -static void g_cclosure_user_marshal_VOID__POINTER_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); +void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* self, + cairo_t* ctx, + gint x, + gint y, + gint width, + gboolean use_scaled_pos); +void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* self, + cairo_t* ctx, + gint x, + gint y, + gint height, + gboolean use_scaled_pos); +void editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas* self, + gint x, + gint y, + gint width); +void editing_tools_photo_canvas_draw_circle (EditingToolsPhotoCanvas* self, + cairo_t* ctx, + gint active_center_x, + gint active_center_y, + gint radius); +void editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* self, + gint x, + gint y, + gint height); +void editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self, + Box* box); +void editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self, + Box* area); +static void g_cclosure_user_marshal_VOID__POINTER_BOXED (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas * obj); gpointer editing_tools_editing_tool_ref (gpointer instance); void editing_tools_editing_tool_unref (gpointer instance); -GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void editing_tools_value_set_editing_tool (GValue* value, gpointer v_object); -void editing_tools_value_take_editing_tool (GValue* value, gpointer v_object); +GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void editing_tools_value_set_editing_tool (GValue* value, + gpointer v_object); +void editing_tools_value_take_editing_tool (GValue* value, + gpointer v_object); gpointer editing_tools_value_get_editing_tool (const GValue* value); GType editing_tools_editing_tool_get_type (void) G_GNUC_CONST; #define EDITING_TOOLS_EDITING_TOOL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingToolPrivate)) -enum { - EDITING_TOOLS_EDITING_TOOL_DUMMY_PROPERTY -}; -EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type, const gchar* name); -void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, EditingToolsPhotoCanvas* canvas); -static void editing_tools_editing_tool_real_activate (EditingToolsEditingTool* self, EditingToolsPhotoCanvas* canvas); +EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type, + const gchar* name); +void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, + EditingToolsPhotoCanvas* canvas); +static void editing_tools_editing_tool_real_activate (EditingToolsEditingTool* self, + EditingToolsPhotoCanvas* canvas); EditingToolsEditingToolWindow* editing_tools_editing_tool_get_tool_window (EditingToolsEditingTool* self); -gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self, GdkEventKey* event); -static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self); +gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self, + GdkEventKey* event); +static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, + GdkEventKey* event, + gpointer self); void editing_tools_editing_tool_deactivate (EditingToolsEditingTool* self); static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool* self); gboolean editing_tools_editing_tool_is_activated (EditingToolsEditingTool* self); static EditingToolsEditingToolWindow* editing_tools_editing_tool_real_get_tool_window (EditingToolsEditingTool* self); -GdkPixbuf* editing_tools_editing_tool_get_display_pixbuf (EditingToolsEditingTool* self, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error); -static GdkPixbuf* editing_tools_editing_tool_real_get_display_pixbuf (EditingToolsEditingTool* self, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error); -void dimensions_init (Dimensions *self, gint width, gint height); -void editing_tools_editing_tool_on_left_click (EditingToolsEditingTool* self, gint x, gint y); -static void editing_tools_editing_tool_real_on_left_click (EditingToolsEditingTool* self, gint x, gint y); -void editing_tools_editing_tool_on_left_released (EditingToolsEditingTool* self, gint x, gint y); -static void editing_tools_editing_tool_real_on_left_released (EditingToolsEditingTool* self, gint x, gint y); -void editing_tools_editing_tool_on_motion (EditingToolsEditingTool* self, gint x, gint y, GdkModifierType mask); -static void editing_tools_editing_tool_real_on_motion (EditingToolsEditingTool* self, gint x, gint y, GdkModifierType mask); +GdkPixbuf* editing_tools_editing_tool_get_display_pixbuf (EditingToolsEditingTool* self, + Scaling* scaling, + Photo* photo, + Dimensions* max_dim, + GError** error); +static GdkPixbuf* editing_tools_editing_tool_real_get_display_pixbuf (EditingToolsEditingTool* self, + Scaling* scaling, + Photo* photo, + Dimensions* max_dim, + GError** error); +void dimensions_init (Dimensions *self, + gint width, + gint height); +void editing_tools_editing_tool_on_left_click (EditingToolsEditingTool* self, + gint x, + gint y); +static void editing_tools_editing_tool_real_on_left_click (EditingToolsEditingTool* self, + gint x, + gint y); +void editing_tools_editing_tool_on_left_released (EditingToolsEditingTool* self, + gint x, + gint y); +static void editing_tools_editing_tool_real_on_left_released (EditingToolsEditingTool* self, + gint x, + gint y); +void editing_tools_editing_tool_on_motion (EditingToolsEditingTool* self, + gint x, + gint y, + GdkModifierType mask); +static void editing_tools_editing_tool_real_on_motion (EditingToolsEditingTool* self, + gint x, + gint y, + GdkModifierType mask); gboolean editing_tools_editing_tool_on_leave_notify_event (EditingToolsEditingTool* self); static gboolean editing_tools_editing_tool_real_on_leave_notify_event (EditingToolsEditingTool* self); -static gboolean editing_tools_editing_tool_real_on_keypress (EditingToolsEditingTool* self, GdkEventKey* event); +static gboolean editing_tools_editing_tool_real_on_keypress (EditingToolsEditingTool* self, + GdkEventKey* event); void editing_tools_editing_tool_notify_cancel (EditingToolsEditingTool* self); -void editing_tools_editing_tool_paint (EditingToolsEditingTool* self, cairo_t* ctx); -static void editing_tools_editing_tool_real_paint (EditingToolsEditingTool* self, cairo_t* ctx); +void editing_tools_editing_tool_paint (EditingToolsEditingTool* self, + cairo_t* ctx); +static void editing_tools_editing_tool_real_paint (EditingToolsEditingTool* self, + cairo_t* ctx); GType command_get_type (void) G_GNUC_CONST; -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); +static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); static void editing_tools_editing_tool_finalize (EditingToolsEditingTool * obj); GType editing_tools_crop_tool_get_type (void) G_GNUC_CONST; static GType editing_tools_crop_tool_crop_tool_window_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; GType box_location_get_type (void) G_GNUC_CONST; static gpointer editing_tools_crop_tool_constraint_description_ref (gpointer instance); static void editing_tools_crop_tool_constraint_description_unref (gpointer instance); -static GParamSpec* editing_tools_crop_tool_param_spec_constraint_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; -static void editing_tools_crop_tool_value_set_constraint_description (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void editing_tools_crop_tool_value_take_constraint_description (GValue* value, gpointer v_object) G_GNUC_UNUSED; +static GParamSpec* editing_tools_crop_tool_param_spec_constraint_description (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) G_GNUC_UNUSED; +static void editing_tools_crop_tool_value_set_constraint_description (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void editing_tools_crop_tool_value_take_constraint_description (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer editing_tools_crop_tool_value_get_constraint_description (const GValue* value) G_GNUC_UNUSED; static GType editing_tools_crop_tool_constraint_description_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static GType editing_tools_crop_tool_reticle_orientation_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static GType editing_tools_crop_tool_constraint_mode_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define EDITING_TOOLS_CROP_TOOL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropToolPrivate)) -enum { - EDITING_TOOLS_CROP_TOOL_DUMMY_PROPERTY -}; static EditingToolsCropToolReticleOrientation editing_tools_crop_tool_reticle_orientation_toggle (EditingToolsCropToolReticleOrientation self); static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_create_constraints (int* result_length1); -static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingToolsCropToolConstraintDescription** constraint_data, int constraint_data_length1); +static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingToolsCropToolConstraintDescription** constraint_data, + int constraint_data_length1); #define EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO (-1.0f) #define EDITING_TOOLS_CROP_TOOL_CROP_INIT_X_PCT 0.15 #define EDITING_TOOLS_CROP_TOOL_CROP_INIT_Y_PCT 0.15 @@ -1070,52 +1250,170 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool static EditingToolsCropTool* editing_tools_crop_tool_new (void); static EditingToolsCropTool* editing_tools_crop_tool_construct (GType object_type); EditingToolsCropTool* editing_tools_crop_tool_factory (void); -gboolean editing_tools_crop_tool_is_available (Photo* photo, Scaling* scaling); -void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensions* result); -void photo_get_original_dimensions (Photo* self, Dimensions* result); -static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_new (const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio); -static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_construct (GType object_type, const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio); -static void _vala_array_add7 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add8 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add9 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add10 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add11 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add12 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add13 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add14 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add15 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add16 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add17 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add18 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add19 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add20 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add21 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add22 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add23 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add24 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add25 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add26 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add27 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add28 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add29 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add30 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add31 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add32 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add33 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add34 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); -static void _vala_array_add35 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value); +gboolean editing_tools_crop_tool_is_available (Photo* photo, + Scaling* scaling); +void scaling_get_scaled_dimensions (Scaling *self, + Dimensions* original, + Dimensions* result); +void photo_get_original_dimensions (Photo* self, + Dimensions* result); +static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_new (const gchar* new_name, + gint new_basis_width, + gint new_basis_height, + gboolean new_pivotable, + gfloat new_aspect_ratio); +static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_construct (GType object_type, + const gchar* new_name, + gint new_basis_width, + gint new_basis_height, + gboolean new_pivotable, + gfloat new_aspect_ratio); +static void _vala_array_add7 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add8 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add9 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add10 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add11 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add12 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add13 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add14 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add15 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add16 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add17 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add18 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add19 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add20 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add21 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add22 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add23 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add24 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add25 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add26 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add27 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add28 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add29 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add30 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add31 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add32 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add33 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add34 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); +static void _vala_array_add35 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value); static void editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropTool* self); static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_selected_constraint (EditingToolsCropTool* self); -static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event); -static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event); -static gboolean editing_tools_crop_tool_on_height_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event); -static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self, Box* crop, Box* result); -static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Box* new_crop); -static void editing_tools_crop_tool_on_width_insert_text (EditingToolsCropTool* self, const gchar* text, gint length, gint* position); -static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool* self, GtkEntry* sender, const gchar* text, gint length, gint* position); -static void editing_tools_crop_tool_on_height_insert_text (EditingToolsCropTool* self, const gchar* text, gint length, gint* position); +static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCropTool* self, + GdkEventFocus* event); +static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsCropTool* self, + GdkEventFocus* event); +static gboolean editing_tools_crop_tool_on_height_entry_focus_out (EditingToolsCropTool* self, + GdkEventFocus* event); +static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self, + Box* crop, + Box* result); +static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, + Box* new_crop); +static void editing_tools_crop_tool_on_width_insert_text (EditingToolsCropTool* self, + const gchar* text, + gint length, + gint* position); +static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool* self, + GtkEntry* sender, + const gchar* text, + gint length, + gint* position); +static void editing_tools_crop_tool_on_height_insert_text (EditingToolsCropTool* self, + const gchar* text, + gint length, + gint* position); static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsCropTool* self); -static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint (EditingToolsCropTool* self, EditingToolsCropToolConstraintDescription* constraint, Photo* photo); +static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint (EditingToolsCropTool* self, + EditingToolsCropToolConstraintDescription* constraint, + Photo* photo); static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* self); static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCropTool* self); static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCropTool* self); @@ -1124,87 +1422,192 @@ GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); gint configuration_facade_get_last_crop_width (ConfigurationFacade* self); gint configuration_facade_get_last_crop_height (ConfigurationFacade* self); -void box_adjust_height (Box *self, gint height); -void box_adjust_width (Box *self, gint width); -static void editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool* self, Dimensions* result); -gboolean photo_get_straighten (Photo* self, gdouble* theta); -void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle_deg, gboolean preserve_geom, Box* result); -static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_last_constraint (EditingToolsCropTool* self, gint* index); +void box_adjust_height (Box *self, + gint height); +void box_adjust_width (Box *self, + gint width); +static void editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool* self, + Dimensions* result); +gboolean photo_get_straighten (Photo* self, + gdouble* theta); +void clamp_inside_rotated_image (Box* src, + gint img_w, + gint img_h, + gdouble angle_deg, + gboolean preserve_geom, + Box* result); +static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_last_constraint (EditingToolsCropTool* self, + gint* index); gint configuration_facade_get_last_crop_menu_choice (ConfigurationFacade* self); -static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas); -static void editing_tools_crop_tool_bind_canvas_handlers (EditingToolsCropTool* self, EditingToolsPhotoCanvas* canvas); -static void editing_tools_crop_tool_prepare_ctx (EditingToolsCropTool* self, cairo_t* ctx, Dimensions* dim); +static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base, + EditingToolsPhotoCanvas* canvas); +static void editing_tools_crop_tool_bind_canvas_handlers (EditingToolsCropTool* self, + EditingToolsPhotoCanvas* canvas); +static void editing_tools_crop_tool_prepare_ctx (EditingToolsCropTool* self, + cairo_t* ctx, + Dimensions* dim); static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_window_new (GtkWindow* container); -static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_window_construct (GType object_type, GtkWindow* container); +static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_window_construct (GType object_type, + GtkWindow* container); gboolean photo_has_crop (Photo* self); static gboolean editing_tools_crop_tool_constraint_description_is_separator (EditingToolsCropToolConstraintDescription* self); static void editing_tools_crop_tool_bind_window_handlers (EditingToolsCropTool* self); -gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions); -void box_init (Box *self, gint left, gint top, gint right, gint bottom); -void box_get_scaled_similar (Box *self, Dimensions* original, Dimensions* scaled, Box* result); -void dimensions_for_rectangle (GdkRectangle* rect, Dimensions* result); -static void _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self); -static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position); -static void _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self); -static void editing_tools_crop_tool_unbind_canvas_handlers (EditingToolsCropTool* self, EditingToolsPhotoCanvas* canvas); +gboolean photo_get_crop (Photo* self, + Box* crop, + PhotoException exceptions); +void box_init (Box *self, + gint left, + gint top, + gint right, + gint bottom); +void box_get_scaled_similar (Box *self, + Dimensions* original, + Dimensions* scaled, + Box* result); +void dimensions_for_rectangle (GdkRectangle* rect, + Dimensions* result); +static void _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, + cairo_t* ctx, + Dimensions* dim, + gpointer self); +static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* self, + Dimensions* old_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position); +static void _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, + Dimensions* old_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position, + gpointer self); +static void editing_tools_crop_tool_unbind_canvas_handlers (EditingToolsCropTool* self, + EditingToolsPhotoCanvas* canvas); static void editing_tools_crop_tool_on_crop_ok (EditingToolsCropTool* self); -static void _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked (GtkButton* _sender, gpointer self); -static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self); -static void _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); +static void _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked (GtkButton* _sender, + gpointer self); +static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, + gpointer self); +static void _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self); static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropTool* self); -static void _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); -static gboolean _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self); -static gboolean _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self); -static void _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self); -static void _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self); +static void _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self); +static gboolean _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, + GdkEventFocus* event, + gpointer self); +static gboolean _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, + GdkEventFocus* event, + gpointer self); +static void _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text (GtkEditable* _sender, + const gchar* new_text, + gint new_text_length, + gint* position, + gpointer self); +static void _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text (GtkEditable* _sender, + const gchar* new_text, + gint new_text_length, + gint* position, + gpointer self); static void editing_tools_crop_tool_unbind_window_handlers (EditingToolsCropTool* self); -static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingTool* base, GdkEventKey* event); +static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingTool* base, + GdkEventKey* event); static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* base); static EditingToolsEditingToolWindow* editing_tools_crop_tool_real_get_tool_window (EditingToolsEditingTool* base); -static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsEditingTool* base, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error); +static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsEditingTool* base, + Scaling* scaling, + Photo* photo, + Dimensions* max_dim, + GError** error); GType backing_fetch_mode_get_type (void) G_GNUC_CONST; -GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error); -void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result); -static void editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool* base, gint x, gint y); -void box_get_offset (Box *self, gint xofs, gint yofs, Box* result); -BoxLocation box_approx_location (Box *self, gint x, gint y); -static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y); -static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, gint x, gint y); -static void editing_tools_crop_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask); -static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCropTool* self, gint x, gint y); -static void editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base, cairo_t* default_ctx); -static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self, Box* crop); -void configuration_facade_set_last_crop_menu_choice (ConfigurationFacade* self, gint choice); -void configuration_facade_set_last_crop_width (ConfigurationFacade* self, gint choice); -void configuration_facade_set_last_crop_height (ConfigurationFacade* self, gint choice); +GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, + Scaling* scaling, + PhotoException exceptions, + BackingFetchMode fetch_mode, + GError** error); +void dimensions_for_pixbuf (GdkPixbuf* pixbuf, + Dimensions* result); +static void editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool* base, + gint x, + gint y); +void box_get_offset (Box *self, + gint xofs, + gint yofs, + Box* result); +BoxLocation box_approx_location (Box *self, + gint x, + gint y); +static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTool* base, + gint x, + gint y); +static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, + gint x, + gint y); +static void editing_tools_crop_tool_real_on_motion (EditingToolsEditingTool* base, + gint x, + gint y, + GdkModifierType mask); +static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCropTool* self, + gint x, + gint y); +static void editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base, + cairo_t* default_ctx); +static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self, + Box* crop); +void configuration_facade_set_last_crop_menu_choice (ConfigurationFacade* self, + gint choice); +void configuration_facade_set_last_crop_width (ConfigurationFacade* self, + gint choice); +void configuration_facade_set_last_crop_height (ConfigurationFacade* self, + gint choice); #define RESOURCES_CROP_LABEL _ ("Crop") #define RESOURCES_CROP_TOOLTIP _ ("Crop the photo’s size") -CropCommand* crop_command_new (Photo* photo, Box* crop, const gchar* name, const gchar* explanation); -CropCommand* crop_command_construct (GType object_type, Photo* photo, Box* crop, const gchar* name, const gchar* explanation); +CropCommand* crop_command_new (Photo* photo, + Box* crop, + const gchar* name, + const gchar* explanation); +CropCommand* crop_command_construct (GType object_type, + Photo* photo, + Box* crop, + const gchar* name, + const gchar* explanation); GType page_command_get_type (void) G_GNUC_CONST; GType single_data_source_command_get_type (void) G_GNUC_CONST; GType generic_photo_transformation_command_get_type (void) G_GNUC_CONST; GType crop_command_get_type (void) G_GNUC_CONST; -void box_get_dimensions (Box *self, Dimensions* result); -static gint editing_tools_crop_tool_eval_radial_line (EditingToolsCropTool* self, gdouble center_x, gdouble center_y, gdouble bounds_x, gdouble bounds_y, gdouble user_x); -static gboolean _box_equal (const Box * s1, const Box * s2); -static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box* new_crop); -gboolean box_equals (Box *self, Box* box); +void box_get_dimensions (Box *self, + Dimensions* result); +static gint editing_tools_crop_tool_eval_radial_line (EditingToolsCropTool* self, + gdouble center_x, + gdouble center_y, + gdouble bounds_x, + gdouble bounds_y, + gdouble user_x); +static gboolean _box_equal (const Box * s1, + const Box * s2); +static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, + Box* new_crop); +gboolean box_equals (Box *self, + Box* box); GType box_complements_get_type (void) G_GNUC_CONST; -BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal, gboolean* horizontal_enlarged, Box* vertical, gboolean* vertical_enlarged); -static void editing_tools_crop_tool_set_area_alpha (EditingToolsCropTool* self, Box* area, gdouble alpha); -void box_get_reduced (Box *self, gint amount, Box* result); -enum { - EDITING_TOOLS_CROP_TOOL_CONSTRAINT_DESCRIPTION_DUMMY_PROPERTY -}; +BoxComplements box_resized_complements (Box *self, + Box* resized, + Box* horizontal, + gboolean* horizontal_enlarged, + Box* vertical, + gboolean* vertical_enlarged); +static void editing_tools_crop_tool_set_area_alpha (EditingToolsCropTool* self, + Box* area, + gdouble alpha); +void box_get_reduced (Box *self, + gint amount, + Box* result); static void editing_tools_crop_tool_constraint_description_finalize (EditingToolsCropToolConstraintDescription * obj); -enum { - EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_DUMMY_PROPERTY -}; #define RESOURCES_CANCEL_LABEL _ ("_Cancel") #define EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING 8 -static gboolean editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (GtkTreeModel* model, GtkTreeIter* iter); -static gboolean _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self); +static gboolean editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (GtkTreeModel* model, + GtkTreeIter* iter); +static gboolean _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, + GtkTreeIter* iter, + gpointer self); static void editing_tools_crop_tool_crop_tool_window_finalize (GObject * obj); static void editing_tools_crop_tool_finalize (EditingToolsEditingTool * obj); GType editing_tools_redeye_instance_get_type (void) G_GNUC_CONST; @@ -1214,82 +1617,147 @@ void editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self); #define EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS 32 #define EDITING_TOOLS_REDEYE_INSTANCE_DEFAULT_RADIUS 10 static void editing_tools_redeye_instance_init (EditingToolsRedeyeInstance *self); -void editing_tools_redeye_instance_to_bounds_rect (EditingToolsRedeyeInstance* inst, GdkRectangle* result); -void editing_tools_redeye_instance_from_bounds_rect (GdkRectangle* rect, EditingToolsRedeyeInstance* result); +void editing_tools_redeye_instance_to_bounds_rect (EditingToolsRedeyeInstance* inst, + GdkRectangle* result); +void editing_tools_redeye_instance_from_bounds_rect (GdkRectangle* rect, + EditingToolsRedeyeInstance* result); GType editing_tools_redeye_tool_get_type (void) G_GNUC_CONST; static GType editing_tools_redeye_tool_redeye_tool_window_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define EDITING_TOOLS_REDEYE_TOOL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeToolPrivate)) -enum { - EDITING_TOOLS_REDEYE_TOOL_DUMMY_PROPERTY -}; static EditingToolsRedeyeTool* editing_tools_redeye_tool_new (void); static EditingToolsRedeyeTool* editing_tools_redeye_tool_construct (GType object_type); EditingToolsRedeyeTool* editing_tools_redeye_tool_factory (void); -gboolean editing_tools_redeye_tool_is_available (Photo* photo, Scaling* scaling); -static void editing_tools_redeye_tool_new_interaction_instance (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas, EditingToolsRedeyeInstance* result); -static void editing_tools_redeye_tool_prepare_ctx (EditingToolsRedeyeTool* self, cairo_t* ctx, Dimensions* dim); -static void editing_tools_redeye_tool_draw_redeye_instance (EditingToolsRedeyeTool* self, EditingToolsRedeyeInstance* inst); -static gboolean editing_tools_redeye_tool_on_size_slider_adjust (EditingToolsRedeyeTool* self, GtkScrollType type); +gboolean editing_tools_redeye_tool_is_available (Photo* photo, + Scaling* scaling); +static void editing_tools_redeye_tool_new_interaction_instance (EditingToolsRedeyeTool* self, + EditingToolsPhotoCanvas* canvas, + EditingToolsRedeyeInstance* result); +static void editing_tools_redeye_tool_prepare_ctx (EditingToolsRedeyeTool* self, + cairo_t* ctx, + Dimensions* dim); +static void editing_tools_redeye_tool_draw_redeye_instance (EditingToolsRedeyeTool* self, + EditingToolsRedeyeInstance* inst); +static gboolean editing_tools_redeye_tool_on_size_slider_adjust (EditingToolsRedeyeTool* self, + GtkScrollType type); static void editing_tools_redeye_tool_on_apply (EditingToolsRedeyeTool* self); -void derotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, GdkPoint* result); +void derotate_point_arb (GdkPoint* source_point, + gint img_w, + gint img_h, + gdouble angle, + GdkPoint* result); GType redeye_command_get_type (void) G_GNUC_CONST; #define RESOURCES_RED_EYE_LABEL _ ("Red-eye") #define RESOURCES_RED_EYE_TOOLTIP _ ("Reduce or eliminate any red-eye effects in the photo") -RedeyeCommand* redeye_command_new (Photo* photo, EditingToolsRedeyeInstance* redeye_instance, const gchar* name, const gchar* explanation); -RedeyeCommand* redeye_command_construct (GType object_type, Photo* photo, EditingToolsRedeyeInstance* redeye_instance, const gchar* name, const gchar* explanation); +RedeyeCommand* redeye_command_new (Photo* photo, + EditingToolsRedeyeInstance* redeye_instance, + const gchar* name, + const gchar* explanation); +RedeyeCommand* redeye_command_construct (GType object_type, + Photo* photo, + EditingToolsRedeyeInstance* redeye_instance, + const gchar* name, + const gchar* explanation); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* app_window_get_command_manager (void); -void command_manager_execute (CommandManager* self, Command* command); +void command_manager_execute (CommandManager* self, + Command* command); gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; -static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool* self, GeeMap* map); -GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error); +static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool* self, + GeeMap* map); +GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, + Scaling* scaling, + GError** error); static void editing_tools_redeye_tool_on_close (EditingToolsRedeyeTool* self); static void editing_tools_redeye_tool_on_canvas_resize (EditingToolsRedeyeTool* self); -static void editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas); -static void editing_tools_redeye_tool_bind_canvas_handlers (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas); +static void editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* base, + EditingToolsPhotoCanvas* canvas); +static void editing_tools_redeye_tool_bind_canvas_handlers (EditingToolsRedeyeTool* self, + EditingToolsPhotoCanvas* canvas); static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_tool_window_new (GtkWindow* container); -static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_tool_window_construct (GType object_type, GtkWindow* container); +static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_tool_window_construct (GType object_type, + GtkWindow* container); static void editing_tools_redeye_tool_bind_window_handlers (EditingToolsRedeyeTool* self); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; DataCollection* data_object_get_membership (DataObject* self); -static void _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool* base); -static void editing_tools_redeye_tool_unbind_canvas_handlers (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas); +static void editing_tools_redeye_tool_unbind_canvas_handlers (EditingToolsRedeyeTool* self, + EditingToolsPhotoCanvas* canvas); static void editing_tools_redeye_tool_unbind_window_handlers (EditingToolsRedeyeTool* self); -static void _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self); -static void _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self); -static void _editing_tools_redeye_tool_on_apply_gtk_button_clicked (GtkButton* _sender, gpointer self); -static void _editing_tools_redeye_tool_on_close_gtk_button_clicked (GtkButton* _sender, gpointer self); -static gboolean _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value (GtkRange* _sender, GtkScrollType scroll, gdouble new_value, gpointer self); +static void _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, + cairo_t* ctx, + Dimensions* dim, + gpointer self); +static void _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, + Dimensions* old_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position, + gpointer self); +static void _editing_tools_redeye_tool_on_apply_gtk_button_clicked (GtkButton* _sender, + gpointer self); +static void _editing_tools_redeye_tool_on_close_gtk_button_clicked (GtkButton* _sender, + gpointer self); +static gboolean _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value (GtkRange* _sender, + GtkScrollType scroll, + gdouble new_value, + gpointer self); static EditingToolsEditingToolWindow* editing_tools_redeye_tool_real_get_tool_window (EditingToolsEditingTool* base); -static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx); -static void editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingTool* base, gint x, gint y); -gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect); -static void editing_tools_redeye_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y); -static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask); -static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingTool* base, GdkEventKey* event); +static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base, + cairo_t* ctx); +static void editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingTool* base, + gint x, + gint y); +gboolean coord_in_rectangle (gint x, + gint y, + GdkRectangle* rect); +static void editing_tools_redeye_tool_real_on_left_released (EditingToolsEditingTool* base, + gint x, + gint y); +static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* base, + gint x, + gint y, + GdkModifierType mask); +static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingTool* base, + GdkEventKey* event); #define EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_REDEYE_TOOL_TYPE_REDEYE_TOOL_WINDOW, EditingToolsRedeyeToolRedeyeToolWindowPrivate)) -enum { - EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_DUMMY_PROPERTY -}; #define RESOURCES_APPLY_LABEL _ ("_Apply") #define EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_CONTROL_SPACING 8 static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject * obj); @@ -1298,64 +1766,112 @@ GType editing_tools_adjust_tool_get_type (void) G_GNUC_CONST; static GType editing_tools_adjust_tool_adjust_tool_window_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; gpointer one_shot_scheduler_ref (gpointer instance); void one_shot_scheduler_unref (gpointer instance); -GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_one_shot_scheduler (GValue* value, gpointer v_object); -void value_take_one_shot_scheduler (GValue* value, gpointer v_object); +GParamSpec* param_spec_one_shot_scheduler (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_one_shot_scheduler (GValue* value, + gpointer v_object); +void value_take_one_shot_scheduler (GValue* value, + gpointer v_object); gpointer value_get_one_shot_scheduler (const GValue* value); GType one_shot_scheduler_get_type (void) G_GNUC_CONST; #define EDITING_TOOLS_ADJUST_TOOL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustToolPrivate)) -enum { - EDITING_TOOLS_ADJUST_TOOL_DUMMY_PROPERTY -}; #define EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH 200 #define EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC ((guint) 100) static EditingToolsAdjustTool* editing_tools_adjust_tool_new (void); static EditingToolsAdjustTool* editing_tools_adjust_tool_construct (GType object_type); EditingToolsAdjustTool* editing_tools_adjust_tool_factory (void); -gboolean editing_tools_adjust_tool_is_available (Photo* photo, Scaling* scaling); -static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas); +gboolean editing_tools_adjust_tool_is_available (Photo* photo, + Scaling* scaling); +static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* base, + EditingToolsPhotoCanvas* canvas); static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_new (GtkWindow* container); -static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_construct (GType object_type, GtkWindow* container); +static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_construct (GType object_type, + GtkWindow* container); PixelTransformationBundle* photo_get_color_adjustments (Photo* self); GType rgb_histogram_manipulator_get_type (void) G_GNUC_CONST; -void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self, gint user_nub_pos); -void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self, gint user_nub_pos); -static void editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas); +void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self, + gint user_nub_pos); +void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self, + gint user_nub_pos); +static void editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTool* self, + EditingToolsPhotoCanvas* canvas); static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTool* self); -static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustTool* self, GdkPixbuf* source); -static void editing_tools_adjust_tool_on_photos_altered (EditingToolsAdjustTool* self, GeeMap* map); -static void _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustTool* self, + GdkPixbuf* source); +static void editing_tools_adjust_tool_on_photos_altered (EditingToolsAdjustTool* self, + GeeMap* map); +static void _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); static EditingToolsEditingToolWindow* editing_tools_adjust_tool_real_get_tool_window (EditingToolsEditingTool* base); static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool* base); -static void editing_tools_adjust_tool_unbind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas); +static void editing_tools_adjust_tool_unbind_canvas_handlers (EditingToolsAdjustTool* self, + EditingToolsPhotoCanvas* canvas); static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjustTool* self); -static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx); -void rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self, GdkPixbuf* source_pixbuf); -static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingToolsEditingTool* base, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error); +static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base, + cairo_t* ctx); +void rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self, + GdkPixbuf* source_pixbuf); +static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingToolsEditingTool* base, + Scaling* scaling, + Photo* photo, + Dimensions* max_dim, + GError** error); gboolean photo_has_color_adjustments (Photo* self); static void editing_tools_adjust_tool_on_reset (EditingToolsAdjustTool* self); static GType editing_tools_adjust_tool_adjust_tool_command_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static GType editing_tools_adjust_tool_adjust_reset_command_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_new (EditingToolsAdjustTool* owner, PixelTransformationBundle* current); -static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_construct (GType object_type, EditingToolsAdjustTool* owner, PixelTransformationBundle* current); +static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_new (EditingToolsAdjustTool* owner, + PixelTransformationBundle* current); +static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_construct (GType object_type, + EditingToolsAdjustTool* owner, + PixelTransformationBundle* current); static void editing_tools_adjust_tool_on_ok (EditingToolsAdjustTool* self); #define RESOURCES_ADJUST_LABEL _ ("Adjust") #define RESOURCES_ADJUST_TOOLTIP _ ("Adjust the photo’s color and tone") -AdjustColorsSingleCommand* adjust_colors_single_command_new (Photo* photo, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation); -AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_type, Photo* photo, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation); +AdjustColorsSingleCommand* adjust_colors_single_command_new (Photo* photo, + PixelTransformationBundle* transformations, + const gchar* name, + const gchar* explanation); +AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_type, + Photo* photo, + PixelTransformationBundle* transformations, + const gchar* name, + const gchar* explanation); GType adjust_colors_single_command_get_type (void) G_GNUC_CONST; -static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjustTool* self, PixelTransformationBundle* new_transformations); -static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustTool* self, PixelTransformation* new_transformation); -static void editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* self, PixelTransformation* new_transformation, const gchar* name); +static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjustTool* self, + PixelTransformationBundle* new_transformations); +static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustTool* self, + PixelTransformation* new_transformation); +static void editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* self, + PixelTransformation* new_transformation, + const gchar* name); static GType editing_tools_adjust_tool_slider_adjustment_command_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_new (EditingToolsAdjustTool* owner, PixelTransformation* old_transformation, PixelTransformation* new_transformation, const gchar* name); -static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_construct (GType object_type, EditingToolsAdjustTool* owner, PixelTransformation* old_transformation, PixelTransformation* new_transformation, const gchar* name); +static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_new (EditingToolsAdjustTool* owner, + PixelTransformation* old_transformation, + PixelTransformation* new_transformation, + const gchar* name); +static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_construct (GType object_type, + EditingToolsAdjustTool* owner, + PixelTransformation* old_transformation, + PixelTransformation* new_transformation, + const gchar* name); static void editing_tools_adjust_tool_on_temperature_adjustment (EditingToolsAdjustTool* self); static void editing_tools_adjust_tool_on_delayed_temperature_adjustment (EditingToolsAdjustTool* self); static void _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback (gpointer self); -OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target); -OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target); -void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule); +OneShotScheduler* one_shot_scheduler_new (const gchar* name, + OneShotCallback callback, + void* callback_target); +OneShotScheduler* one_shot_scheduler_construct (GType object_type, + const gchar* name, + OneShotCallback callback, + void* callback_target); +void one_shot_scheduler_after_timeout (OneShotScheduler* self, + guint msec, + gboolean reschedule); static void editing_tools_adjust_tool_on_tint_adjustment (EditingToolsAdjustTool* self); static void editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAdjustTool* self); static void _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback (gpointer self); @@ -1378,108 +1894,145 @@ static void editing_tools_adjust_tool_on_histogram_constraint (EditingToolsAdjus gint rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* self); gint rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator* self); static void editing_tools_adjust_tool_on_canvas_resize (EditingToolsAdjustTool* self); -static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustTool* self, GtkWidget* widget, GdkEventButton* event); -gboolean has_only_key_modifier (GdkModifierType field, GdkModifierType mask); -static void _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self); -static void _editing_tools_adjust_tool_on_ok_gtk_button_clicked (GtkButton* _sender, gpointer self); -static void _editing_tools_adjust_tool_on_reset_gtk_button_clicked (GtkButton* _sender, gpointer self); -static void _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self); -static void _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self); -static void _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self); -static void _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self); -static void _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self); -static void _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self); -static void _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self); -static void _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed (RGBHistogramManipulator* _sender, gpointer self); -static gboolean _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); +static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustTool* self, + GtkWidget* widget, + GdkEventButton* event); +gboolean has_only_key_modifier (GdkModifierType field, + GdkModifierType mask); +static void _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, + Dimensions* old_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position, + gpointer self); +static void _editing_tools_adjust_tool_on_ok_gtk_button_clicked (GtkButton* _sender, + gpointer self); +static void _editing_tools_adjust_tool_on_reset_gtk_button_clicked (GtkButton* _sender, + gpointer self); +static void _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed (GtkRange* _sender, + gpointer self); +static void _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed (GtkRange* _sender, + gpointer self); +static void _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed (GtkRange* _sender, + gpointer self); +static void _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed (GtkRange* _sender, + gpointer self); +static void _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed (GtkRange* _sender, + gpointer self); +static void _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed (GtkRange* _sender, + gpointer self); +static void _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed (GtkRange* _sender, + gpointer self); +static void _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed (RGBHistogramManipulator* _sender, + gpointer self); +static gboolean _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self); gboolean editing_tools_adjust_tool_enhance (EditingToolsAdjustTool* self); static GType editing_tools_adjust_tool_adjust_enhance_command_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_new (EditingToolsAdjustTool* owner, Photo* photo); -static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_construct (GType object_type, EditingToolsAdjustTool* owner, Photo* photo); -static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* self, PixelTransformationBundle* new_adjustments); -static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* self, PixelTransformation* transformation); -static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingTool* base, GdkEventKey* event); -enum { - EDITING_TOOLS_ADJUST_TOOL_ADJUST_TOOL_WINDOW_DUMMY_PROPERTY -}; +static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_new (EditingToolsAdjustTool* owner, + Photo* photo); +static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_construct (GType object_type, + EditingToolsAdjustTool* owner, + Photo* photo); +static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* self, + PixelTransformationBundle* new_adjustments); +static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* self, + PixelTransformation* transformation); +static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingTool* base, + GdkEventKey* event); #define RESOURCES_OK_LABEL _ ("_OK") RGBHistogramManipulator* rgb_histogram_manipulator_new (void); RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type); static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject * obj); GType command_description_get_type (void) G_GNUC_CONST; -enum { - EDITING_TOOLS_ADJUST_TOOL_ADJUST_TOOL_COMMAND_DUMMY_PROPERTY -}; static void editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated (EditingToolsAdjustToolAdjustToolCommand* self); -static void _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self); -static EditingToolsAdjustToolAdjustToolCommand* editing_tools_adjust_tool_adjust_tool_command_construct (GType object_type, EditingToolsAdjustTool* owner, const gchar* name, const gchar* explanation); -Command* command_construct (GType object_type, const gchar* name, const gchar* explanation); +static void _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, + gpointer self); +static EditingToolsAdjustToolAdjustToolCommand* editing_tools_adjust_tool_adjust_tool_command_construct (GType object_type, + EditingToolsAdjustTool* owner, + const gchar* name, + const gchar* explanation); +Command* command_construct (GType object_type, + const gchar* name, + const gchar* explanation); void command_manager_reset (CommandManager* self); static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject * obj); #define EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommandPrivate)) -enum { - EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_DUMMY_PROPERTY -}; static void editing_tools_adjust_tool_adjust_reset_command_real_execute (Command* base); static void editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* base); -static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Command* base, Command* command); +static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Command* base, + Command* command); static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject * obj); #define EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommandPrivate)) -enum { - EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_DUMMY_PROPERTY -}; static void editing_tools_adjust_tool_slider_adjustment_command_real_execute (Command* base); static void editing_tools_adjust_tool_slider_adjustment_command_real_undo (Command* base); static void editing_tools_adjust_tool_slider_adjustment_command_real_redo (Command* base); -static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compress (Command* base, Command* command); +static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compress (Command* base, + Command* command); void command_execute (Command* self); static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObject * obj); #define EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommandPrivate)) -enum { - EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_DUMMY_PROPERTY -}; #define RESOURCES_ENHANCE_LABEL _ ("Enhance") #define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo’s appearance") static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Command* base); PixelTransformationBundle* photo_get_enhance_transformations (Photo* self); static void editing_tools_adjust_tool_adjust_enhance_command_real_undo (Command* base); -static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (Command* base, Command* command); +static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (Command* base, + Command* command); GType enhance_single_command_get_type (void) G_GNUC_CONST; DataSource* single_data_source_command_get_source (SingleDataSourceCommand* self); -gboolean data_source_equals (DataSource* self, DataSource* source); +gboolean data_source_equals (DataSource* self, + DataSource* source); static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject * obj); static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -void editing_tools_preconfigure (void) { +void +editing_tools_preconfigure (void) +{ } -void editing_tools_init (GError** error) { +void +editing_tools_init (GError** error) +{ } -void editing_tools_terminate (void) { +void +editing_tools_terminate (void) +{ } -static void _editing_tools_editing_tool_window_suppress_warnings_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) { +static void +_editing_tools_editing_tool_window_suppress_warnings_glog_func (const gchar* log_domain, + GLogLevelFlags log_levels, + const gchar* message, + gpointer self) +{ #line 56 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_editing_tool_window_suppress_warnings ((EditingToolsEditingToolWindow*) self, log_domain, log_levels, message); -#line 1472 "EditingTools.c" +#line 2023 "EditingTools.c" } -EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GType object_type, GtkWindow* container) { +EditingToolsEditingToolWindow* +editing_tools_editing_tool_window_construct (GType object_type, + GtkWindow* container) +{ EditingToolsEditingToolWindow * self = NULL; - GtkWindow* _tmp0_; GtkFrame* outer_frame = NULL; + GtkFrame* _tmp0_; GtkFrame* _tmp1_; GtkFrame* _tmp2_; GtkFrame* _tmp3_; - GtkFrame* _tmp4_; #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (GTK_IS_WINDOW (container), NULL); #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -1487,31 +2040,29 @@ EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GTyp #line 35 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_window_set_decorated (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); #line 36 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = container; -#line 36 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_); + gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), container); #line 38 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = (GtkFrame*) gtk_frame_new (NULL); + _tmp0_ = (GtkFrame*) gtk_frame_new (NULL); #line 38 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp1_); + g_object_ref_sink (_tmp0_); #line 38 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - outer_frame = _tmp1_; + outer_frame = _tmp0_; #line 39 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (outer_frame, gtk_container_get_type (), GtkContainer), (guint) 0); #line 40 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_frame_set_shadow_type (outer_frame, GTK_SHADOW_OUT); #line 42 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = self->priv->layout_frame; + _tmp1_ = self->priv->layout_frame; #line 42 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), (guint) EDITING_TOOLS_EDITING_TOOL_WINDOW_FRAME_BORDER); + gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), (guint) EDITING_TOOLS_EDITING_TOOL_WINDOW_FRAME_BORDER); #line 43 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = self->priv->layout_frame; + _tmp2_ = self->priv->layout_frame; #line 43 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_frame_set_shadow_type (_tmp3_, GTK_SHADOW_NONE); + gtk_frame_set_shadow_type (_tmp2_, GTK_SHADOW_NONE); #line 45 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = self->priv->layout_frame; + _tmp3_ = self->priv->layout_frame; #line 45 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (outer_frame, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (outer_frame, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); #line 46 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" GTK_CONTAINER_CLASS (editing_tools_editing_tool_window_parent_class)->add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (outer_frame, gtk_widget_get_type (), GtkWidget)); #line 48 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -1528,14 +2079,16 @@ EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GTyp _g_object_unref0 (outer_frame); #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 1532 "EditingTools.c" +#line 2083 "EditingTools.c" } -static void editing_tools_editing_tool_window_real_add (GtkContainer* base, GtkWidget* widget) { +static void +editing_tools_editing_tool_window_real_add (GtkContainer* base, + GtkWidget* widget) +{ EditingToolsEditingToolWindow * self; GtkFrame* _tmp0_; - GtkWidget* _tmp1_; #line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow); #line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -1543,14 +2096,14 @@ static void editing_tools_editing_tool_window_real_add (GtkContainer* base, GtkW #line 64 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->layout_frame; #line 64 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = widget; -#line 64 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), _tmp1_); -#line 1550 "EditingTools.c" + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), widget); +#line 2101 "EditingTools.c" } -gboolean editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingToolWindow* self) { +gboolean +editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingToolWindow* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 67 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -1561,133 +2114,110 @@ gboolean editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingTo result = _tmp0_; #line 68 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 1565 "EditingTools.c" +#line 2118 "EditingTools.c" } -static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidget* base, GdkEventKey* event) { +static gboolean +editing_tools_editing_tool_window_real_key_press_event (GtkWidget* base, + GdkEventKey* event) +{ EditingToolsEditingToolWindow * self; gboolean result = FALSE; - GdkEventKey* _tmp0_; - gboolean _tmp1_; - AppWindow* _tmp2_; - AppWindow* _tmp3_; - GdkEventKey* _tmp4_; - gboolean _tmp5_ = FALSE; - gboolean _tmp6_; + AppWindow* _tmp0_; + AppWindow* _tmp1_; + gboolean _tmp2_ = FALSE; + gboolean _tmp3_; #line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow); #line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (event != NULL, FALSE); #line 72 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = event; -#line 72 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = GTK_WIDGET_CLASS (editing_tools_editing_tool_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), _tmp0_); -#line 72 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp1_) { + if (GTK_WIDGET_CLASS (editing_tools_editing_tool_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), event)) { #line 73 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = TRUE; #line 73 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 1593 "EditingTools.c" +#line 2142 "EditingTools.c" } #line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = app_window_get_instance (); -#line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = _tmp2_; + _tmp0_ = app_window_get_instance (); #line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = event; + _tmp1_ = _tmp0_; #line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp4_, &_tmp5_); + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), "key-press-event", event, &_tmp2_); #line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - result = _tmp6_; + result = _tmp3_; #line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 1611 "EditingTools.c" +#line 2158 "EditingTools.c" } -static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWidget* base, GdkEventButton* event) { +static gboolean +editing_tools_editing_tool_window_real_button_press_event (GtkWidget* base, + GdkEventButton* event) +{ EditingToolsEditingToolWindow * self; gboolean result = FALSE; - GdkEventButton* _tmp0_; - guint _tmp1_; - GdkEventButton* _tmp5_; - guint _tmp6_; - GdkEventButton* _tmp7_; - gdouble _tmp8_; - GdkEventButton* _tmp9_; - gdouble _tmp10_; - GdkEventButton* _tmp11_; - guint32 _tmp12_; + guint _tmp0_; + guint _tmp2_; + gdouble _tmp3_; + gdouble _tmp4_; + guint32 _tmp5_; #line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow); #line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (event != NULL, FALSE); #line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = event; -#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = _tmp0_->button; + _tmp0_ = event->button; #line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp1_ != ((guint) 1)) { -#line 1638 "EditingTools.c" - gboolean _tmp2_ = FALSE; + if (_tmp0_ != ((guint) 1)) { +#line 2181 "EditingTools.c" + gboolean _tmp1_ = FALSE; #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->button_press_event != NULL) { -#line 1642 "EditingTools.c" - GdkEventButton* _tmp3_; - gboolean _tmp4_; -#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = event; -#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp3_); #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = _tmp4_; -#line 1651 "EditingTools.c" + _tmp1_ = GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), event); +#line 2187 "EditingTools.c" } else { #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = TRUE; -#line 1655 "EditingTools.c" + _tmp1_ = TRUE; +#line 2191 "EditingTools.c" } #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - result = _tmp2_; + result = _tmp1_; #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 1661 "EditingTools.c" +#line 2197 "EditingTools.c" } #line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = event; + _tmp2_ = event->button; #line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _tmp5_->button; + _tmp3_ = event->x_root; #line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = event; + _tmp4_ = event->y_root; #line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = _tmp7_->x_root; + _tmp5_ = event->time; #line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = event; -#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = _tmp9_->y_root; -#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = event; -#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = _tmp11_->time; -#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_window_begin_move_drag (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), (gint) _tmp6_, (gint) _tmp8_, (gint) _tmp10_, _tmp12_); + gtk_window_begin_move_drag (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), (gint) _tmp2_, (gint) _tmp3_, (gint) _tmp4_, _tmp5_); #line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->user_moved = TRUE; #line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = TRUE; #line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 1687 "EditingTools.c" +#line 2215 "EditingTools.c" } -static void editing_tools_editing_tool_window_real_realize (GtkWidget* base) { +static void +editing_tools_editing_tool_window_real_realize (GtkWidget* base) +{ EditingToolsEditingToolWindow * self; #line 89 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow); @@ -1695,20 +2225,27 @@ static void editing_tools_editing_tool_window_real_realize (GtkWidget* base) { gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_TYPE (self, gtk_widget_get_type ()) ? ((GtkWidget*) self) : NULL, RESOURCES_TRANSIENT_WINDOW_OPACITY); #line 92 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget)); -#line 1699 "EditingTools.c" +#line 2229 "EditingTools.c" } -static void editing_tools_editing_tool_window_suppress_warnings (EditingToolsEditingToolWindow* self, const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message) { +static void +editing_tools_editing_tool_window_suppress_warnings (EditingToolsEditingToolWindow* self, + const gchar* log_domain, + GLogLevelFlags log_levels, + const gchar* message) +{ #line 95 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL_WINDOW (self)); #line 95 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (message != NULL); -#line 1708 "EditingTools.c" +#line 2243 "EditingTools.c" } -static void editing_tools_editing_tool_window_class_init (EditingToolsEditingToolWindowClass * klass) { +static void +editing_tools_editing_tool_window_class_init (EditingToolsEditingToolWindowClass * klass) +{ #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_editing_tool_window_parent_class = g_type_class_peek_parent (klass); #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -1723,11 +2260,13 @@ static void editing_tools_editing_tool_window_class_init (EditingToolsEditingToo ((GtkWidgetClass *) klass)->realize = (void (*) (GtkWidget *)) editing_tools_editing_tool_window_real_realize; #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (klass)->finalize = editing_tools_editing_tool_window_finalize; -#line 1727 "EditingTools.c" +#line 2264 "EditingTools.c" } -static void editing_tools_editing_tool_window_instance_init (EditingToolsEditingToolWindow * self) { +static void +editing_tools_editing_tool_window_instance_init (EditingToolsEditingToolWindow * self) +{ GtkFrame* _tmp0_; #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv = EDITING_TOOLS_EDITING_TOOL_WINDOW_GET_PRIVATE (self); @@ -1739,11 +2278,13 @@ static void editing_tools_editing_tool_window_instance_init (EditingToolsEditing self->priv->layout_frame = _tmp0_; #line 32 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->user_moved = FALSE; -#line 1743 "EditingTools.c" +#line 2282 "EditingTools.c" } -static void editing_tools_editing_tool_window_finalize (GObject * obj) { +static void +editing_tools_editing_tool_window_finalize (GObject * obj) +{ EditingToolsEditingToolWindow * self; GLogFunc _tmp0_; void* _tmp0__target; @@ -1759,11 +2300,13 @@ static void editing_tools_editing_tool_window_finalize (GObject * obj) { _g_object_unref0 (self->priv->layout_frame); #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (editing_tools_editing_tool_window_parent_class)->finalize (obj); -#line 1763 "EditingTools.c" +#line 2304 "EditingTools.c" } -GType editing_tools_editing_tool_window_get_type (void) { +GType +editing_tools_editing_tool_window_get_type (void) +{ static volatile gsize editing_tools_editing_tool_window_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_editing_tool_window_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditingToolsEditingToolWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_editing_tool_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsEditingToolWindow), 0, (GInstanceInitFunc) editing_tools_editing_tool_window_instance_init, NULL }; @@ -1775,38 +2318,44 @@ GType editing_tools_editing_tool_window_get_type (void) { } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self ? g_object_ref (self) : NULL; -#line 1782 "EditingTools.c" +#line 2327 "EditingTools.c" } -static gpointer _cairo_reference0 (gpointer self) { +static gpointer +_cairo_reference0 (gpointer self) +{ #line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self ? cairo_reference (self) : NULL; -#line 1789 "EditingTools.c" +#line 2336 "EditingTools.c" } -EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type, GtkWindow* container, GdkWindow* drawing_window, Photo* photo, cairo_t* default_ctx, Dimensions* surface_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position) { +EditingToolsPhotoCanvas* +editing_tools_photo_canvas_construct (GType object_type, + GtkWindow* container, + GdkWindow* drawing_window, + Photo* photo, + cairo_t* default_ctx, + Dimensions* surface_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position) +{ EditingToolsPhotoCanvas* self = NULL; GtkWindow* _tmp0_; - GtkWindow* _tmp1_; - GdkWindow* _tmp2_; - GdkWindow* _tmp3_; - Photo* _tmp4_; - Photo* _tmp5_; - cairo_t* _tmp6_; - cairo_t* _tmp7_; - Dimensions _tmp8_; - GdkRectangle _tmp9_; - GdkPixbuf* _tmp10_; - GdkPixbuf* _tmp11_; - cairo_t* _tmp12_; - GdkPixbuf* _tmp13_; - GdkRectangle _tmp14_; - cairo_surface_t* _tmp15_; + GdkWindow* _tmp1_; + Photo* _tmp2_; + cairo_t* _tmp3_; + Dimensions _tmp4_; + GdkRectangle _tmp5_; + GdkPixbuf* _tmp6_; + GdkRectangle _tmp7_; + cairo_surface_t* _tmp8_; #line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (GTK_IS_WINDOW (container), NULL); #line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -1824,72 +2373,62 @@ EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type #line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = (EditingToolsPhotoCanvas*) g_type_create_instance (object_type); #line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = container; -#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (container); #line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->container); #line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->container = _tmp1_; + self->priv->container = _tmp0_; #line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = drawing_window; -#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (drawing_window); #line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->drawing_window); #line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->drawing_window = _tmp3_; -#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = photo; + self->priv->drawing_window = _tmp1_; #line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp2_ = _g_object_ref0 (photo); #line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->photo); #line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->photo = _tmp5_; -#line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = default_ctx; + self->priv->photo = _tmp2_; #line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = _cairo_reference0 (_tmp6_); + _tmp3_ = _cairo_reference0 (default_ctx); #line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->default_ctx); #line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->default_ctx = _tmp7_; + self->priv->default_ctx = _tmp3_; #line 119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = *surface_dim; + _tmp4_ = *surface_dim; #line 119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->surface_dim = _tmp8_; + self->priv->surface_dim = _tmp4_; #line 120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = *scaled_position; + _tmp5_ = *scaled_position; #line 120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->scaled_position = _tmp9_; -#line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = scaled; + self->priv->scaled_position = _tmp5_; #line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = _g_object_ref0 (_tmp10_); + _tmp6_ = _g_object_ref0 (scaled); #line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->scaled_pixbuf); #line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->scaled_pixbuf = _tmp11_; + self->priv->scaled_pixbuf = _tmp6_; #line 122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = default_ctx; + _tmp7_ = *scaled_position; #line 122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = scaled; -#line 122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = *scaled_position; -#line 122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = editing_tools_photo_canvas_pixbuf_to_surface (self, _tmp12_, _tmp13_, &_tmp14_); + _tmp8_ = editing_tools_photo_canvas_pixbuf_to_surface (self, default_ctx, scaled, &_tmp7_); #line 122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_surface_destroy0 (self->priv->scaled); #line 122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->scaled = _tmp15_; + self->priv->scaled = _tmp8_; #line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 1889 "EditingTools.c" +#line 2424 "EditingTools.c" } -void editing_tools_photo_canvas_unscaled_to_raw_rect (EditingToolsPhotoCanvas* self, GdkRectangle* rectangle, GdkRectangle* result) { +void +editing_tools_photo_canvas_unscaled_to_raw_rect (EditingToolsPhotoCanvas* self, + GdkRectangle* rectangle, + GdkRectangle* result) +{ Photo* _tmp0_; GdkRectangle _tmp1_; GdkRectangle _tmp2_ = {0}; @@ -1907,11 +2446,15 @@ void editing_tools_photo_canvas_unscaled_to_raw_rect (EditingToolsPhotoCanvas* s *result = _tmp2_; #line 131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 1911 "EditingTools.c" +#line 2450 "EditingTools.c" } -void editing_tools_photo_canvas_active_to_unscaled_point (EditingToolsPhotoCanvas* self, GdkPoint* active_point, GdkPoint* result) { +void +editing_tools_photo_canvas_active_to_unscaled_point (EditingToolsPhotoCanvas* self, + GdkPoint* active_point, + GdkPoint* result) +{ GdkRectangle scaled_position = {0}; GdkRectangle _tmp0_ = {0}; Dimensions unscaled_dims = {0}; @@ -1987,11 +2530,15 @@ void editing_tools_photo_canvas_active_to_unscaled_point (EditingToolsPhotoCanva *result = _result_; #line 147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 1991 "EditingTools.c" +#line 2534 "EditingTools.c" } -void editing_tools_photo_canvas_active_to_unscaled_rect (EditingToolsPhotoCanvas* self, GdkRectangle* active_rect, GdkRectangle* result) { +void +editing_tools_photo_canvas_active_to_unscaled_rect (EditingToolsPhotoCanvas* self, + GdkRectangle* active_rect, + GdkRectangle* result) +{ GdkPoint upper_left = {0}; GdkPoint _tmp0_ = {0}; GdkPoint lower_right = {0}; @@ -2119,11 +2666,15 @@ void editing_tools_photo_canvas_active_to_unscaled_rect (EditingToolsPhotoCanvas *result = unscaled_rect; #line 167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 2123 "EditingTools.c" +#line 2670 "EditingTools.c" } -void editing_tools_photo_canvas_user_to_active_point (EditingToolsPhotoCanvas* self, GdkPoint* user_point, GdkPoint* result) { +void +editing_tools_photo_canvas_user_to_active_point (EditingToolsPhotoCanvas* self, + GdkPoint* user_point, + GdkPoint* result) +{ GdkRectangle active_offsets = {0}; GdkRectangle _tmp0_ = {0}; GdkPoint _result_ = {0}; @@ -2172,11 +2723,15 @@ void editing_tools_photo_canvas_user_to_active_point (EditingToolsPhotoCanvas* s *result = _result_; #line 177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 2176 "EditingTools.c" +#line 2727 "EditingTools.c" } -void editing_tools_photo_canvas_user_to_active_rect (EditingToolsPhotoCanvas* self, GdkRectangle* user_rect, GdkRectangle* result) { +void +editing_tools_photo_canvas_user_to_active_rect (EditingToolsPhotoCanvas* self, + GdkRectangle* user_rect, + GdkRectangle* result) +{ GdkPoint upper_left = {0}; GdkPoint _tmp0_ = {0}; GdkPoint lower_right = {0}; @@ -2304,11 +2859,13 @@ void editing_tools_photo_canvas_user_to_active_rect (EditingToolsPhotoCanvas* se *result = active_rect; #line 197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 2308 "EditingTools.c" +#line 2863 "EditingTools.c" } -Photo* editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self) { +Photo* +editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self) +{ Photo* result = NULL; Photo* _tmp0_; Photo* _tmp1_; @@ -2322,11 +2879,13 @@ Photo* editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self) { result = _tmp1_; #line 201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 2326 "EditingTools.c" +#line 2883 "EditingTools.c" } -GtkWindow* editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* self) { +GtkWindow* +editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* self) +{ GtkWindow* result = NULL; GtkWindow* _tmp0_; GtkWindow* _tmp1_; @@ -2340,11 +2899,13 @@ GtkWindow* editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* se result = _tmp1_; #line 205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 2344 "EditingTools.c" +#line 2903 "EditingTools.c" } -GdkWindow* editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanvas* self) { +GdkWindow* +editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanvas* self) +{ GdkWindow* result = NULL; GdkWindow* _tmp0_; GdkWindow* _tmp1_; @@ -2358,11 +2919,13 @@ GdkWindow* editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanva result = _tmp1_; #line 209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 2362 "EditingTools.c" +#line 2923 "EditingTools.c" } -cairo_t* editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* self) { +cairo_t* +editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* self) +{ cairo_t* result = NULL; cairo_t* _tmp0_; cairo_t* _tmp1_; @@ -2376,11 +2939,14 @@ cairo_t* editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* se result = _tmp1_; #line 213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 2380 "EditingTools.c" +#line 2943 "EditingTools.c" } -void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self, Dimensions* result) { +void +editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self, + Dimensions* result) +{ Dimensions _tmp0_; #line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); @@ -2390,11 +2956,14 @@ void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self, *result = _tmp0_; #line 217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 2394 "EditingTools.c" +#line 2960 "EditingTools.c" } -void editing_tools_photo_canvas_get_scaling (EditingToolsPhotoCanvas* self, Scaling* result) { +void +editing_tools_photo_canvas_get_scaling (EditingToolsPhotoCanvas* self, + Scaling* result) +{ Dimensions _tmp0_; Scaling _tmp1_ = {0}; #line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -2407,16 +2976,18 @@ void editing_tools_photo_canvas_get_scaling (EditingToolsPhotoCanvas* self, Scal *result = _tmp1_; #line 221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 2411 "EditingTools.c" +#line 2980 "EditingTools.c" } -void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, cairo_t* default_ctx, Dimensions* surface_dim) { +void +editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, + cairo_t* default_ctx, + Dimensions* surface_dim) +{ cairo_t* _tmp0_; - cairo_t* _tmp1_; + Dimensions _tmp1_; Dimensions _tmp2_; - cairo_t* _tmp3_; - Dimensions _tmp4_; #line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); #line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -2424,35 +2995,35 @@ void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, cair #line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (surface_dim != NULL); #line 225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = default_ctx; -#line 225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = _cairo_reference0 (_tmp0_); + _tmp0_ = _cairo_reference0 (default_ctx); #line 225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->default_ctx); #line 225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->default_ctx = _tmp1_; + self->priv->default_ctx = _tmp0_; #line 226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = *surface_dim; + _tmp1_ = *surface_dim; #line 226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->surface_dim = _tmp2_; + self->priv->surface_dim = _tmp1_; #line 228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = default_ctx; -#line 228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = *surface_dim; + _tmp2_ = *surface_dim; #line 228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_emit (self, editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_NEW_SURFACE_SIGNAL], 0, _tmp3_, &_tmp4_); -#line 2445 "EditingTools.c" + g_signal_emit (self, editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_NEW_SURFACE_SIGNAL], 0, default_ctx, &_tmp2_); +#line 3012 "EditingTools.c" } -static gpointer _cairo_surface_reference0 (gpointer self) { +static gpointer +_cairo_surface_reference0 (gpointer self) +{ #line 232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self ? cairo_surface_reference (self) : NULL; -#line 2452 "EditingTools.c" +#line 3021 "EditingTools.c" } -cairo_surface_t* editing_tools_photo_canvas_get_scaled_surface (EditingToolsPhotoCanvas* self) { +cairo_surface_t* +editing_tools_photo_canvas_get_scaled_surface (EditingToolsPhotoCanvas* self) +{ cairo_surface_t* result = NULL; cairo_surface_t* _tmp0_; cairo_surface_t* _tmp1_; @@ -2466,11 +3037,13 @@ cairo_surface_t* editing_tools_photo_canvas_get_scaled_surface (EditingToolsPhot result = _tmp1_; #line 232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 2470 "EditingTools.c" +#line 3041 "EditingTools.c" } -GdkPixbuf* editing_tools_photo_canvas_get_scaled_pixbuf (EditingToolsPhotoCanvas* self) { +GdkPixbuf* +editing_tools_photo_canvas_get_scaled_pixbuf (EditingToolsPhotoCanvas* self) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_; GdkPixbuf* _tmp1_; @@ -2484,11 +3057,14 @@ GdkPixbuf* editing_tools_photo_canvas_get_scaled_pixbuf (EditingToolsPhotoCanvas result = _tmp1_; #line 236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 2488 "EditingTools.c" +#line 3061 "EditingTools.c" } -void editing_tools_photo_canvas_get_scaled_pixbuf_position (EditingToolsPhotoCanvas* self, GdkRectangle* result) { +void +editing_tools_photo_canvas_get_scaled_pixbuf_position (EditingToolsPhotoCanvas* self, + GdkRectangle* result) +{ GdkRectangle _tmp0_; #line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); @@ -2498,21 +3074,23 @@ void editing_tools_photo_canvas_get_scaled_pixbuf_position (EditingToolsPhotoCan *result = _tmp0_; #line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 2502 "EditingTools.c" +#line 3078 "EditingTools.c" } -void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position) { +void +editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, + Dimensions* old_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position) +{ cairo_t* _tmp0_; - GdkPixbuf* _tmp1_; - GdkRectangle _tmp2_; - cairo_surface_t* _tmp3_; - GdkPixbuf* _tmp4_; - GdkPixbuf* _tmp5_; + GdkRectangle _tmp1_; + cairo_surface_t* _tmp2_; + GdkPixbuf* _tmp3_; + GdkRectangle _tmp4_; + Dimensions _tmp5_; GdkRectangle _tmp6_; - Dimensions _tmp7_; - GdkPixbuf* _tmp8_; - GdkRectangle _tmp9_; #line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); #line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -2524,58 +3102,59 @@ void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, D #line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->default_ctx; #line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = scaled; -#line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = *scaled_position; + _tmp1_ = *scaled_position; #line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = editing_tools_photo_canvas_pixbuf_to_surface (self, _tmp0_, _tmp1_, &_tmp2_); + _tmp2_ = editing_tools_photo_canvas_pixbuf_to_surface (self, _tmp0_, scaled, &_tmp1_); #line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_surface_destroy0 (self->priv->scaled); #line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->scaled = _tmp3_; + self->priv->scaled = _tmp2_; #line 245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = scaled; -#line 245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp3_ = _g_object_ref0 (scaled); #line 245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->scaled_pixbuf); #line 245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->scaled_pixbuf = _tmp5_; + self->priv->scaled_pixbuf = _tmp3_; #line 246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = *scaled_position; + _tmp4_ = *scaled_position; #line 246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->scaled_position = _tmp6_; + self->priv->scaled_position = _tmp4_; #line 248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = *old_dim; + _tmp5_ = *old_dim; #line 248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = scaled; -#line 248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = *scaled_position; + _tmp6_ = *scaled_position; #line 248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_emit (self, editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_RESIZED_SCALED_PIXBUF_SIGNAL], 0, &_tmp7_, _tmp8_, &_tmp9_); -#line 2557 "EditingTools.c" + g_signal_emit (self, editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_RESIZED_SCALED_PIXBUF_SIGNAL], 0, &_tmp5_, scaled, &_tmp6_); +#line 3129 "EditingTools.c" } -static void editing_tools_photo_canvas_real_repaint (EditingToolsPhotoCanvas* self) { +static void +editing_tools_photo_canvas_real_repaint (EditingToolsPhotoCanvas* self) +{ #line 251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_critical ("Type `%s' does not implement abstract method `editing_tools_photo_canvas_repaint'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 2566 "EditingTools.c" +#line 3140 "EditingTools.c" } -void editing_tools_photo_canvas_repaint (EditingToolsPhotoCanvas* self) { +void +editing_tools_photo_canvas_repaint (EditingToolsPhotoCanvas* self) +{ #line 251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); #line 251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_PHOTO_CANVAS_GET_CLASS (self)->repaint (self); -#line 2575 "EditingTools.c" +#line 3151 "EditingTools.c" } -void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, GdkPixbuf* pixbuf) { +void +editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, + GdkPixbuf* pixbuf) +{ cairo_t* _tmp0_; cairo_t* _tmp1_; cairo_t* _tmp2_; @@ -2585,12 +3164,11 @@ void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, Gdk gint _tmp6_; cairo_t* _tmp7_; cairo_t* _tmp8_; - GdkPixbuf* _tmp9_; - GdkRectangle _tmp10_; - gint _tmp11_; - GdkRectangle _tmp12_; - gint _tmp13_; - cairo_t* _tmp14_; + GdkRectangle _tmp9_; + gint _tmp10_; + GdkRectangle _tmp11_; + gint _tmp12_; + cairo_t* _tmp13_; #line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); #line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -2622,43 +3200,43 @@ void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, Gdk #line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = self->priv->default_ctx; #line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = pixbuf; -#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = self->priv->scaled_position; + _tmp9_ = self->priv->scaled_position; #line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = _tmp10_.x; + _tmp10_ = _tmp9_.x; #line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = self->priv->scaled_position; + _tmp11_ = self->priv->scaled_position; #line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = _tmp12_.y; + _tmp12_ = _tmp11_.y; #line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - paint_pixmap_with_background (_tmp8_, _tmp9_, _tmp11_, _tmp13_); + paint_pixmap_with_background (_tmp8_, pixbuf, _tmp10_, _tmp12_); #line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = self->priv->default_ctx; + _tmp13_ = self->priv->default_ctx; #line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_restore (_tmp14_); -#line 2641 "EditingTools.c" + cairo_restore (_tmp13_); +#line 3217 "EditingTools.c" } -void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, cairo_surface_t* surface, gboolean over) { +void +editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, + cairo_surface_t* surface, + gboolean over) +{ cairo_t* _tmp0_; - gboolean _tmp1_; - cairo_t* _tmp4_; - cairo_surface_t* _tmp5_; - GdkRectangle _tmp6_; - gint _tmp7_; - GdkRectangle _tmp8_; - gint _tmp9_; + cairo_t* _tmp3_; + cairo_surface_t* _tmp4_; + GdkRectangle _tmp5_; + gint _tmp6_; + GdkRectangle _tmp7_; + gint _tmp8_; + cairo_t* _tmp9_; cairo_t* _tmp10_; - cairo_t* _tmp11_; - cairo_surface_t* _tmp12_; + GdkRectangle _tmp11_; + gint _tmp12_; GdkRectangle _tmp13_; gint _tmp14_; - GdkRectangle _tmp15_; - gint _tmp16_; - cairo_t* _tmp17_; - cairo_t* _tmp18_; + cairo_t* _tmp15_; + cairo_t* _tmp16_; #line 273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); #line 273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -2668,108 +3246,103 @@ void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, ca #line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_save (_tmp0_); #line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = over; -#line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp1_ == FALSE) { -#line 2675 "EditingTools.c" - cairo_t* _tmp2_; + if (over == FALSE) { +#line 3251 "EditingTools.c" + cairo_t* _tmp1_; #line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = self->priv->default_ctx; + _tmp1_ = self->priv->default_ctx; #line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_operator (_tmp2_, CAIRO_OPERATOR_SOURCE); -#line 2681 "EditingTools.c" + cairo_set_operator (_tmp1_, CAIRO_OPERATOR_SOURCE); +#line 3257 "EditingTools.c" } else { - cairo_t* _tmp3_; + cairo_t* _tmp2_; #line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = self->priv->default_ctx; + _tmp2_ = self->priv->default_ctx; #line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_operator (_tmp3_, CAIRO_OPERATOR_OVER); -#line 2688 "EditingTools.c" + cairo_set_operator (_tmp2_, CAIRO_OPERATOR_OVER); +#line 3264 "EditingTools.c" } #line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = self->priv->default_ctx; + _tmp3_ = self->priv->default_ctx; #line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = self->priv->scaled; + _tmp4_ = self->priv->scaled; #line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = self->priv->scaled_position; + _tmp5_ = self->priv->scaled_position; #line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = _tmp6_.x; + _tmp6_ = _tmp5_.x; #line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = self->priv->scaled_position; + _tmp7_ = self->priv->scaled_position; #line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = _tmp8_.y; + _tmp8_ = _tmp7_.y; #line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_source_surface (_tmp4_, _tmp5_, (gdouble) _tmp7_, (gdouble) _tmp9_); + cairo_set_source_surface (_tmp3_, _tmp4_, (gdouble) _tmp6_, (gdouble) _tmp8_); #line 281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = self->priv->default_ctx; + _tmp9_ = self->priv->default_ctx; #line 281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_paint (_tmp10_); -#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = self->priv->default_ctx; + cairo_paint (_tmp9_); #line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = surface; + _tmp10_ = self->priv->default_ctx; #line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = self->priv->scaled_position; + _tmp11_ = self->priv->scaled_position; #line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = _tmp13_.x; + _tmp12_ = _tmp11_.x; #line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = self->priv->scaled_position; + _tmp13_ = self->priv->scaled_position; #line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = _tmp15_.y; + _tmp14_ = _tmp13_.y; #line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_source_surface (_tmp11_, _tmp12_, (gdouble) _tmp14_, (gdouble) _tmp16_); + cairo_set_source_surface (_tmp10_, surface, (gdouble) _tmp12_, (gdouble) _tmp14_); #line 283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = self->priv->default_ctx; + _tmp15_ = self->priv->default_ctx; #line 283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_paint (_tmp17_); + cairo_paint (_tmp15_); #line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = self->priv->default_ctx; + _tmp16_ = self->priv->default_ctx; #line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_restore (_tmp18_); -#line 2730 "EditingTools.c" + cairo_restore (_tmp16_); +#line 3304 "EditingTools.c" } -void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* self, cairo_surface_t* surface, Box* source_area, gboolean over) { +void +editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* self, + cairo_surface_t* surface, + Box* source_area, + gboolean over) +{ cairo_t* _tmp0_; - gboolean _tmp1_; - cairo_t* _tmp4_; - cairo_surface_t* _tmp5_; - GdkRectangle _tmp6_; - gint _tmp7_; - GdkRectangle _tmp8_; - gint _tmp9_; - cairo_t* _tmp10_; - GdkRectangle _tmp11_; - gint _tmp12_; - Box _tmp13_; - gint _tmp14_; - GdkRectangle _tmp15_; - gint _tmp16_; - Box _tmp17_; - gint _tmp18_; - gint _tmp19_; - gint _tmp20_; - cairo_t* _tmp21_; - cairo_t* _tmp22_; - cairo_surface_t* _tmp23_; - GdkRectangle _tmp24_; - gint _tmp25_; - GdkRectangle _tmp26_; - gint _tmp27_; - cairo_t* _tmp28_; + cairo_t* _tmp3_; + cairo_surface_t* _tmp4_; + GdkRectangle _tmp5_; + gint _tmp6_; + GdkRectangle _tmp7_; + gint _tmp8_; + cairo_t* _tmp9_; + GdkRectangle _tmp10_; + gint _tmp11_; + Box _tmp12_; + gint _tmp13_; + GdkRectangle _tmp14_; + gint _tmp15_; + Box _tmp16_; + gint _tmp17_; + cairo_t* _tmp18_; + cairo_t* _tmp19_; + GdkRectangle _tmp20_; + gint _tmp21_; + GdkRectangle _tmp22_; + gint _tmp23_; + cairo_t* _tmp24_; + GdkRectangle _tmp25_; + gint _tmp26_; + Box _tmp27_; + gint _tmp28_; GdkRectangle _tmp29_; gint _tmp30_; Box _tmp31_; gint _tmp32_; - GdkRectangle _tmp33_; - gint _tmp34_; - Box _tmp35_; - gint _tmp36_; - gint _tmp37_; - gint _tmp38_; - cairo_t* _tmp39_; - cairo_t* _tmp40_; + cairo_t* _tmp33_; + cairo_t* _tmp34_; #line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); #line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -2781,117 +3354,109 @@ void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* sel #line 288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_save (_tmp0_); #line 289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = over; -#line 289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp1_ == FALSE) { -#line 2788 "EditingTools.c" - cairo_t* _tmp2_; + if (over == FALSE) { +#line 3359 "EditingTools.c" + cairo_t* _tmp1_; #line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = self->priv->default_ctx; + _tmp1_ = self->priv->default_ctx; #line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_operator (_tmp2_, CAIRO_OPERATOR_SOURCE); -#line 2794 "EditingTools.c" + cairo_set_operator (_tmp1_, CAIRO_OPERATOR_SOURCE); +#line 3365 "EditingTools.c" } else { - cairo_t* _tmp3_; + cairo_t* _tmp2_; #line 292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = self->priv->default_ctx; + _tmp2_ = self->priv->default_ctx; #line 292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_operator (_tmp3_, CAIRO_OPERATOR_OVER); -#line 2801 "EditingTools.c" + cairo_set_operator (_tmp2_, CAIRO_OPERATOR_OVER); +#line 3372 "EditingTools.c" } #line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = self->priv->default_ctx; + _tmp3_ = self->priv->default_ctx; #line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = self->priv->scaled; + _tmp4_ = self->priv->scaled; #line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = self->priv->scaled_position; + _tmp5_ = self->priv->scaled_position; #line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = _tmp6_.x; + _tmp6_ = _tmp5_.x; #line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = self->priv->scaled_position; + _tmp7_ = self->priv->scaled_position; #line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = _tmp8_.y; + _tmp8_ = _tmp7_.y; #line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_source_surface (_tmp4_, _tmp5_, (gdouble) _tmp7_, (gdouble) _tmp9_); + cairo_set_source_surface (_tmp3_, _tmp4_, (gdouble) _tmp6_, (gdouble) _tmp8_); #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = self->priv->default_ctx; + _tmp9_ = self->priv->default_ctx; #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = self->priv->scaled_position; + _tmp10_ = self->priv->scaled_position; #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = _tmp11_.x; + _tmp11_ = _tmp10_.x; #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = *source_area; + _tmp12_ = *source_area; #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = _tmp13_.left; + _tmp13_ = _tmp12_.left; #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = self->priv->scaled_position; + _tmp14_ = self->priv->scaled_position; #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = _tmp15_.y; + _tmp15_ = _tmp14_.y; #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = *source_area; + _tmp16_ = *source_area; #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = _tmp17_.top; + _tmp17_ = _tmp16_.top; #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = box_get_width (source_area); -#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = box_get_height (source_area); -#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_rectangle (_tmp10_, (gdouble) (_tmp12_ + _tmp14_), (gdouble) (_tmp16_ + _tmp18_), (gdouble) _tmp19_, (gdouble) _tmp20_); + cairo_rectangle (_tmp9_, (gdouble) (_tmp11_ + _tmp13_), (gdouble) (_tmp15_ + _tmp17_), (gdouble) box_get_width (source_area), (gdouble) box_get_height (source_area)); #line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = self->priv->default_ctx; + _tmp18_ = self->priv->default_ctx; #line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_fill (_tmp21_); -#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = self->priv->default_ctx; + cairo_fill (_tmp18_); #line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = surface; + _tmp19_ = self->priv->default_ctx; #line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = self->priv->scaled_position; + _tmp20_ = self->priv->scaled_position; #line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = _tmp24_.x; + _tmp21_ = _tmp20_.x; #line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp26_ = self->priv->scaled_position; + _tmp22_ = self->priv->scaled_position; #line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp27_ = _tmp26_.y; + _tmp23_ = _tmp22_.y; #line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_source_surface (_tmp22_, _tmp23_, (gdouble) _tmp25_, (gdouble) _tmp27_); -#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_ = self->priv->default_ctx; + cairo_set_source_surface (_tmp19_, surface, (gdouble) _tmp21_, (gdouble) _tmp23_); #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp29_ = self->priv->scaled_position; -#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp30_ = _tmp29_.x; + _tmp24_ = self->priv->default_ctx; #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp31_ = *source_area; + _tmp25_ = self->priv->scaled_position; #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp32_ = _tmp31_.left; + _tmp26_ = _tmp25_.x; #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp33_ = self->priv->scaled_position; + _tmp27_ = *source_area; #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp34_ = _tmp33_.y; + _tmp28_ = _tmp27_.left; #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp35_ = *source_area; + _tmp29_ = self->priv->scaled_position; #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp36_ = _tmp35_.top; + _tmp30_ = _tmp29_.y; #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp37_ = box_get_width (source_area); + _tmp31_ = *source_area; #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp38_ = box_get_height (source_area); + _tmp32_ = _tmp31_.top; #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_rectangle (_tmp28_, (gdouble) (_tmp30_ + _tmp32_), (gdouble) (_tmp34_ + _tmp36_), (gdouble) _tmp37_, (gdouble) _tmp38_); + cairo_rectangle (_tmp24_, (gdouble) (_tmp26_ + _tmp28_), (gdouble) (_tmp30_ + _tmp32_), (gdouble) box_get_width (source_area), (gdouble) box_get_height (source_area)); #line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp39_ = self->priv->default_ctx; + _tmp33_ = self->priv->default_ctx; #line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_fill (_tmp39_); + cairo_fill (_tmp33_); #line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp40_ = self->priv->default_ctx; + _tmp34_ = self->priv->default_ctx; #line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_restore (_tmp40_); -#line 2891 "EditingTools.c" + cairo_restore (_tmp34_); +#line 3452 "EditingTools.c" } -void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, cairo_t* ctx, Box* box) { +void +editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, + cairo_t* ctx, + Box* box) +{ GdkRectangle rect = {0}; GdkRectangle _tmp0_ = {0}; gint _tmp1_; @@ -2900,16 +3465,14 @@ void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, cairo_t gint _tmp4_; GdkRectangle _tmp5_; gint _tmp6_; - cairo_t* _tmp7_; - GdkRectangle _tmp8_; - gint _tmp9_; - GdkRectangle _tmp10_; - gint _tmp11_; - GdkRectangle _tmp12_; - gint _tmp13_; - GdkRectangle _tmp14_; - gint _tmp15_; - cairo_t* _tmp16_; + GdkRectangle _tmp7_; + gint _tmp8_; + GdkRectangle _tmp9_; + gint _tmp10_; + GdkRectangle _tmp11_; + gint _tmp12_; + GdkRectangle _tmp13_; + gint _tmp14_; #line 308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); #line 308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -2937,60 +3500,48 @@ void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, cairo_t #line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" rect.y = _tmp4_ + _tmp6_; #line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = ctx; -#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = rect; + _tmp7_ = rect; #line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = _tmp8_.x; + _tmp8_ = _tmp7_.x; #line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = rect; + _tmp9_ = rect; #line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = _tmp10_.y; + _tmp10_ = _tmp9_.y; #line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = rect; + _tmp11_ = rect; #line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = _tmp12_.width; + _tmp12_ = _tmp11_.width; #line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = rect; + _tmp13_ = rect; #line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = _tmp14_.height; + _tmp14_ = _tmp13_.height; #line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_rectangle (_tmp7_, _tmp9_ + 0.5, _tmp11_ + 0.5, (gdouble) (_tmp13_ - 1), (gdouble) (_tmp15_ - 1)); -#line 314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = ctx; + cairo_rectangle (ctx, _tmp8_ + 0.5, _tmp10_ + 0.5, (gdouble) (_tmp12_ - 1), (gdouble) (_tmp14_ - 1)); #line 314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_stroke (_tmp16_); -#line 2964 "EditingTools.c" + cairo_stroke (ctx); +#line 3523 "EditingTools.c" } -void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_t* ctx, const gchar* text, gint x, gint y, gboolean use_scaled_pos) { - gboolean _tmp0_; +void +editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, + cairo_t* ctx, + const gchar* text, + gint x, + gint y, + gboolean use_scaled_pos) +{ cairo_text_extents_t extents = {0}; - cairo_t* _tmp7_; - const gchar* _tmp8_; - cairo_text_extents_t _tmp9_ = {0}; - gint _tmp10_; + cairo_text_extents_t _tmp4_ = {0}; + cairo_text_extents_t _tmp5_; + gdouble _tmp6_; + gint pane_border = 0; + cairo_text_extents_t _tmp7_; + gdouble _tmp8_; + cairo_text_extents_t _tmp9_; + gdouble _tmp10_; cairo_text_extents_t _tmp11_; gdouble _tmp12_; - cairo_t* _tmp13_; - gint pane_border = 0; - cairo_t* _tmp14_; - gint _tmp15_; - gint _tmp16_; - cairo_text_extents_t _tmp17_; - gdouble _tmp18_; - cairo_text_extents_t _tmp19_; - gdouble _tmp20_; - cairo_text_extents_t _tmp21_; - gdouble _tmp22_; - cairo_t* _tmp23_; - cairo_t* _tmp24_; - gint _tmp25_; - gint _tmp26_; - cairo_t* _tmp27_; - cairo_t* _tmp28_; - const gchar* _tmp29_; #line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); #line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -2998,99 +3549,63 @@ void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_ #line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (text != NULL); #line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = use_scaled_pos; -#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp0_) { -#line 3005 "EditingTools.c" + if (use_scaled_pos) { +#line 3554 "EditingTools.c" + GdkRectangle _tmp0_; gint _tmp1_; GdkRectangle _tmp2_; gint _tmp3_; - gint _tmp4_; - GdkRectangle _tmp5_; - gint _tmp6_; -#line 319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = x; #line 319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = self->priv->scaled_position; + _tmp0_ = self->priv->scaled_position; #line 319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = _tmp2_.x; + _tmp1_ = _tmp0_.x; #line 319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - x = _tmp1_ + _tmp3_; -#line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = y; + x = x + _tmp1_; #line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = self->priv->scaled_position; + _tmp2_ = self->priv->scaled_position; #line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _tmp5_.y; + _tmp3_ = _tmp2_.y; #line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - y = _tmp4_ + _tmp6_; -#line 3028 "EditingTools.c" + y = y + _tmp3_; +#line 3571 "EditingTools.c" } #line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = ctx; -#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = text; + cairo_text_extents (ctx, text, &_tmp4_); #line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_text_extents (_tmp7_, _tmp8_, &_tmp9_); -#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - extents = _tmp9_; -#line 324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = x; + extents = _tmp4_; #line 324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = extents; + _tmp5_ = extents; #line 324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = _tmp11_.width; + _tmp6_ = _tmp5_.width; #line 324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - x = _tmp10_ - (((gint) _tmp12_) / 2); -#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = ctx; + x = x - (((gint) _tmp6_) / 2); #line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - set_source_color_from_string (_tmp13_, RESOURCES_ONIMAGE_FONT_BACKGROUND); + set_source_color_from_string (ctx, RESOURCES_ONIMAGE_FONT_BACKGROUND); #line 328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" pane_border = 5; #line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = ctx; + _tmp7_ = extents; #line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = x; -#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = y; -#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = extents; -#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = _tmp17_.height; + _tmp8_ = _tmp7_.height; #line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = extents; + _tmp9_ = extents; #line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = _tmp19_.width; + _tmp10_ = _tmp9_.width; #line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = extents; + _tmp11_ = extents; #line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = _tmp21_.height; + _tmp12_ = _tmp11_.height; #line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_rectangle (_tmp14_, (gdouble) (_tmp15_ - pane_border), (_tmp16_ - pane_border) - _tmp18_, _tmp20_ + (2 * pane_border), _tmp22_ + (2 * pane_border)); -#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = ctx; + cairo_rectangle (ctx, (gdouble) (x - pane_border), (y - pane_border) - _tmp8_, _tmp10_ + (2 * pane_border), _tmp12_ + (2 * pane_border)); #line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_fill (_tmp23_); -#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = ctx; -#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = x; -#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp26_ = y; + cairo_fill (ctx); #line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_move_to (_tmp24_, (gdouble) _tmp25_, (gdouble) _tmp26_); + cairo_move_to (ctx, (gdouble) x, (gdouble) y); #line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp27_ = ctx; -#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - set_source_color_from_string (_tmp27_, RESOURCES_ONIMAGE_FONT_COLOR); -#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_ = ctx; + set_source_color_from_string (ctx, RESOURCES_ONIMAGE_FONT_COLOR); #line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp29_ = text; -#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_show_text (_tmp28_, _tmp29_); -#line 3094 "EditingTools.c" + cairo_show_text (ctx, text); +#line 3609 "EditingTools.c" } @@ -3105,72 +3620,46 @@ void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_ * @param use_scaled_pos Whether to use absolute window positioning or take into account the * position of the scaled image. */ -void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint x, gint y, gint width, gboolean use_scaled_pos) { - gboolean _tmp0_; - cairo_t* _tmp7_; - gint _tmp8_; - gint _tmp9_; - cairo_t* _tmp10_; - gint _tmp11_; - gint _tmp12_; - gint _tmp13_; - cairo_t* _tmp14_; +void +editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* self, + cairo_t* ctx, + gint x, + gint y, + gint width, + gboolean use_scaled_pos) +{ #line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); #line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (ctx != NULL); #line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = use_scaled_pos; -#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp0_) { -#line 3127 "EditingTools.c" + if (use_scaled_pos) { +#line 3638 "EditingTools.c" + GdkRectangle _tmp0_; gint _tmp1_; GdkRectangle _tmp2_; gint _tmp3_; - gint _tmp4_; - GdkRectangle _tmp5_; - gint _tmp6_; #line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = x; + _tmp0_ = self->priv->scaled_position; #line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = self->priv->scaled_position; -#line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = _tmp2_.x; + _tmp1_ = _tmp0_.x; #line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - x = _tmp1_ + _tmp3_; + x = x + _tmp1_; #line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = y; -#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = self->priv->scaled_position; + _tmp2_ = self->priv->scaled_position; #line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _tmp5_.y; + _tmp3_ = _tmp2_.y; #line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - y = _tmp4_ + _tmp6_; -#line 3150 "EditingTools.c" + y = y + _tmp3_; +#line 3655 "EditingTools.c" } #line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = ctx; -#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = x; -#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = y; -#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_move_to (_tmp7_, _tmp8_ + 0.5, _tmp9_ + 0.5); -#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = ctx; + cairo_move_to (ctx, x + 0.5, y + 0.5); #line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = x; -#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = width; -#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = y; -#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_line_to (_tmp10_, (gdouble) ((_tmp11_ + _tmp12_) - 1), _tmp13_ + 0.5); -#line 358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = ctx; + cairo_line_to (ctx, (gdouble) ((x + width) - 1), y + 0.5); #line 358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_stroke (_tmp14_); -#line 3174 "EditingTools.c" + cairo_stroke (ctx); +#line 3663 "EditingTools.c" } @@ -3185,76 +3674,55 @@ void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* s * @param use_scaled_pos Whether to use absolute window positioning or take into account the * position of the scaled image. */ -void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint x, gint y, gint height, gboolean use_scaled_pos) { - gboolean _tmp0_; - cairo_t* _tmp7_; - gint _tmp8_; - gint _tmp9_; - cairo_t* _tmp10_; - gint _tmp11_; - gint _tmp12_; - gint _tmp13_; - cairo_t* _tmp14_; +void +editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* self, + cairo_t* ctx, + gint x, + gint y, + gint height, + gboolean use_scaled_pos) +{ #line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); #line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (ctx != NULL); #line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = use_scaled_pos; -#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp0_) { -#line 3207 "EditingTools.c" + if (use_scaled_pos) { +#line 3692 "EditingTools.c" + GdkRectangle _tmp0_; gint _tmp1_; GdkRectangle _tmp2_; gint _tmp3_; - gint _tmp4_; - GdkRectangle _tmp5_; - gint _tmp6_; -#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = x; #line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = self->priv->scaled_position; + _tmp0_ = self->priv->scaled_position; #line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = _tmp2_.x; + _tmp1_ = _tmp0_.x; #line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - x = _tmp1_ + _tmp3_; -#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = y; + x = x + _tmp1_; #line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = self->priv->scaled_position; + _tmp2_ = self->priv->scaled_position; #line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _tmp5_.y; + _tmp3_ = _tmp2_.y; #line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - y = _tmp4_ + _tmp6_; -#line 3230 "EditingTools.c" + y = y + _tmp3_; +#line 3709 "EditingTools.c" } #line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = ctx; -#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = x; -#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = y; -#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_move_to (_tmp7_, _tmp8_ + 0.5, _tmp9_ + 0.5); -#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = ctx; -#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = x; -#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = y; -#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = height; + cairo_move_to (ctx, x + 0.5, y + 0.5); #line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_line_to (_tmp10_, _tmp11_ + 0.5, (gdouble) ((_tmp12_ + _tmp13_) - 1)); + cairo_line_to (ctx, x + 0.5, (gdouble) ((y + height) - 1)); #line 380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = ctx; -#line 380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_stroke (_tmp14_); -#line 3254 "EditingTools.c" + cairo_stroke (ctx); +#line 3717 "EditingTools.c" } -void editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas* self, gint x, gint y, gint width) { +void +editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas* self, + gint x, + gint y, + gint width) +{ cairo_t* _tmp0_; cairo_t* _tmp1_; cairo_t* _tmp2_; @@ -3266,13 +3734,10 @@ void editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas* cairo_t* _tmp8_; GdkRectangle _tmp9_; gint _tmp10_; - gint _tmp11_; - GdkRectangle _tmp12_; - gint _tmp13_; - gint _tmp14_; - gint _tmp15_; - cairo_t* _tmp16_; - cairo_t* _tmp17_; + GdkRectangle _tmp11_; + gint _tmp12_; + cairo_t* _tmp13_; + cairo_t* _tmp14_; #line 383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); #line 384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -3304,76 +3769,66 @@ void editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas* #line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = _tmp9_.x; #line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = x; -#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = self->priv->scaled_position; -#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = _tmp12_.y; -#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = y; + _tmp11_ = self->priv->scaled_position; #line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = width; + _tmp12_ = _tmp11_.y; #line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_rectangle (_tmp8_, (gdouble) (_tmp10_ + _tmp11_), (gdouble) (_tmp13_ + _tmp14_), (gdouble) (_tmp15_ - 1), (gdouble) 1); + cairo_rectangle (_tmp8_, (gdouble) (_tmp10_ + x), (gdouble) (_tmp12_ + y), (gdouble) (width - 1), (gdouble) 1); #line 390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = self->priv->default_ctx; + _tmp13_ = self->priv->default_ctx; #line 390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_fill (_tmp16_); + cairo_fill (_tmp13_); #line 392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = self->priv->default_ctx; + _tmp14_ = self->priv->default_ctx; #line 392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_restore (_tmp17_); -#line 3327 "EditingTools.c" + cairo_restore (_tmp14_); +#line 3786 "EditingTools.c" } -void editing_tools_photo_canvas_draw_circle (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint active_center_x, gint active_center_y, gint radius) { +void +editing_tools_photo_canvas_draw_circle (EditingToolsPhotoCanvas* self, + cairo_t* ctx, + gint active_center_x, + gint active_center_y, + gint radius) +{ gint center_x = 0; - gint _tmp0_; - GdkRectangle _tmp1_; - gint _tmp2_; + GdkRectangle _tmp0_; + gint _tmp1_; gint center_y = 0; + GdkRectangle _tmp2_; gint _tmp3_; - GdkRectangle _tmp4_; - gint _tmp5_; - cairo_t* _tmp6_; - gint _tmp7_; - cairo_t* _tmp8_; #line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); #line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (ctx != NULL); #line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = active_center_x; -#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = self->priv->scaled_position; + _tmp0_ = self->priv->scaled_position; #line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = _tmp1_.x; + _tmp1_ = _tmp0_.x; #line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - center_x = _tmp0_ + _tmp2_; + center_x = active_center_x + _tmp1_; #line 398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = active_center_y; -#line 398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = self->priv->scaled_position; + _tmp2_ = self->priv->scaled_position; #line 398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = _tmp4_.y; + _tmp3_ = _tmp2_.y; #line 398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - center_y = _tmp3_ + _tmp5_; -#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = ctx; -#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = radius; + center_y = active_center_y + _tmp3_; #line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_arc (_tmp6_, (gdouble) center_x, (gdouble) center_y, (gdouble) _tmp7_, (gdouble) 0, 2 * G_PI); + cairo_arc (ctx, (gdouble) center_x, (gdouble) center_y, (gdouble) radius, (gdouble) 0, 2 * G_PI); #line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = ctx; -#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_stroke (_tmp8_); -#line 3373 "EditingTools.c" + cairo_stroke (ctx); +#line 3823 "EditingTools.c" } -void editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* self, gint x, gint y, gint height) { +void +editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* self, + gint x, + gint y, + gint height) +{ cairo_t* _tmp0_; cairo_t* _tmp1_; cairo_t* _tmp2_; @@ -3385,13 +3840,10 @@ void editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* se cairo_t* _tmp8_; GdkRectangle _tmp9_; gint _tmp10_; - gint _tmp11_; - GdkRectangle _tmp12_; - gint _tmp13_; - gint _tmp14_; - gint _tmp15_; - cairo_t* _tmp16_; - cairo_t* _tmp17_; + GdkRectangle _tmp11_; + gint _tmp12_; + cairo_t* _tmp13_; + cairo_t* _tmp14_; #line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); #line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -3423,50 +3875,43 @@ void editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* se #line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = _tmp9_.x; #line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = x; -#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = self->priv->scaled_position; -#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = _tmp12_.y; -#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = y; + _tmp11_ = self->priv->scaled_position; #line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = height; + _tmp12_ = _tmp11_.y; #line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_rectangle (_tmp8_, (gdouble) (_tmp10_ + _tmp11_), (gdouble) (_tmp13_ + _tmp14_), (gdouble) 1, (gdouble) _tmp15_); + cairo_rectangle (_tmp8_, (gdouble) (_tmp10_ + x), (gdouble) (_tmp12_ + y), (gdouble) 1, (gdouble) height); #line 415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = self->priv->default_ctx; + _tmp13_ = self->priv->default_ctx; #line 415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_fill (_tmp16_); + cairo_fill (_tmp13_); #line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = self->priv->default_ctx; + _tmp14_ = self->priv->default_ctx; #line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_restore (_tmp17_); -#line 3446 "EditingTools.c" + cairo_restore (_tmp14_); +#line 3892 "EditingTools.c" } -void editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self, Box* box) { +void +editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self, + Box* box) +{ Box _tmp0_; gint _tmp1_; Box _tmp2_; gint _tmp3_; - gint _tmp4_; - Box _tmp5_; - gint _tmp6_; - Box _tmp7_; - gint _tmp8_; + Box _tmp4_; + gint _tmp5_; + Box _tmp6_; + gint _tmp7_; + Box _tmp8_; gint _tmp9_; Box _tmp10_; gint _tmp11_; Box _tmp12_; gint _tmp13_; - gint _tmp14_; - Box _tmp15_; - gint _tmp16_; - Box _tmp17_; - gint _tmp18_; - gint _tmp19_; + Box _tmp14_; + gint _tmp15_; #line 420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); #line 420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -3480,50 +3925,45 @@ void editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self, Box* b #line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_.top; #line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = box_get_width (box); -#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_erase_horizontal_line (self, _tmp1_, _tmp3_, _tmp4_); -#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = *box; + editing_tools_photo_canvas_erase_horizontal_line (self, _tmp1_, _tmp3_, box_get_width (box)); #line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _tmp5_.left; + _tmp4_ = *box; #line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = *box; + _tmp5_ = _tmp4_.left; #line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = _tmp7_.bottom; + _tmp6_ = *box; #line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = box_get_width (box); + _tmp7_ = _tmp6_.bottom; #line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_erase_horizontal_line (self, _tmp6_, _tmp8_, _tmp9_); + editing_tools_photo_canvas_erase_horizontal_line (self, _tmp5_, _tmp7_, box_get_width (box)); #line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = *box; -#line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = _tmp10_.left; + _tmp8_ = *box; #line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = *box; + _tmp9_ = _tmp8_.left; #line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = _tmp12_.top; + _tmp10_ = *box; #line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = box_get_height (box); + _tmp11_ = _tmp10_.top; #line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_erase_vertical_line (self, _tmp11_, _tmp13_, _tmp14_); + editing_tools_photo_canvas_erase_vertical_line (self, _tmp9_, _tmp11_, box_get_height (box)); #line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = *box; -#line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = _tmp15_.right; + _tmp12_ = *box; #line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = *box; + _tmp13_ = _tmp12_.right; #line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = _tmp17_.top; + _tmp14_ = *box; #line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = box_get_height (box); + _tmp15_ = _tmp14_.top; #line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_erase_vertical_line (self, _tmp16_, _tmp18_, _tmp19_); -#line 3523 "EditingTools.c" + editing_tools_photo_canvas_erase_vertical_line (self, _tmp13_, _tmp15_, box_get_height (box)); +#line 3960 "EditingTools.c" } -void editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self, Box* area) { +void +editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self, + Box* area) +{ GdkRectangle rect = {0}; GdkRectangle _tmp0_ = {0}; gint _tmp1_; @@ -3564,23 +4004,26 @@ void editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self, _tmp8_ = rect; #line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gdk_window_invalidate_rect (_tmp7_, &_tmp8_, FALSE); -#line 3568 "EditingTools.c" +#line 4008 "EditingTools.c" } -static cairo_surface_t* editing_tools_photo_canvas_pixbuf_to_surface (EditingToolsPhotoCanvas* self, cairo_t* default_ctx, GdkPixbuf* pixbuf, GdkRectangle* pos) { +static cairo_surface_t* +editing_tools_photo_canvas_pixbuf_to_surface (EditingToolsPhotoCanvas* self, + cairo_t* default_ctx, + GdkPixbuf* pixbuf, + GdkRectangle* pos) +{ cairo_surface_t* result = NULL; cairo_surface_t* surface = NULL; - cairo_t* _tmp0_; - cairo_surface_t* _tmp1_; - GdkRectangle _tmp2_; - gint _tmp3_; - GdkRectangle _tmp4_; - gint _tmp5_; - cairo_surface_t* _tmp6_; + cairo_surface_t* _tmp0_; + GdkRectangle _tmp1_; + gint _tmp2_; + GdkRectangle _tmp3_; + gint _tmp4_; + cairo_surface_t* _tmp5_; cairo_t* ctx = NULL; - cairo_t* _tmp7_; - GdkPixbuf* _tmp8_; + cairo_t* _tmp6_; #line 436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL); #line 436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -3590,29 +4033,25 @@ static cairo_surface_t* editing_tools_photo_canvas_pixbuf_to_surface (EditingToo #line 436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (pos != NULL, NULL); #line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = default_ctx; + _tmp0_ = cairo_get_target (default_ctx); #line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = cairo_get_target (_tmp0_); + _tmp1_ = *pos; #line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = *pos; -#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = _tmp2_.width; + _tmp2_ = _tmp1_.width; #line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = *pos; + _tmp3_ = *pos; #line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = _tmp4_.height; + _tmp4_ = _tmp3_.height; #line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = cairo_surface_create_similar (_tmp1_, CAIRO_CONTENT_COLOR_ALPHA, _tmp3_, _tmp5_); + _tmp5_ = cairo_surface_create_similar (_tmp0_, CAIRO_CONTENT_COLOR_ALPHA, _tmp2_, _tmp4_); #line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - surface = _tmp6_; + surface = _tmp5_; #line 440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = cairo_create (surface); + _tmp6_ = cairo_create (surface); #line 440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - ctx = _tmp7_; -#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = pixbuf; + ctx = _tmp6_; #line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - paint_pixmap_with_background (ctx, _tmp8_, 0, 0); + paint_pixmap_with_background (ctx, pixbuf, 0, 0); #line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_paint (ctx); #line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -3621,11 +4060,18 @@ static cairo_surface_t* editing_tools_photo_canvas_pixbuf_to_surface (EditingToo _cairo_destroy0 (ctx); #line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 3625 "EditingTools.c" +#line 4064 "EditingTools.c" } -static void g_cclosure_user_marshal_VOID__POINTER_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__POINTER_BOXED (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__POINTER_BOXED) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2); register GMarshalFunc_VOID__POINTER_BOXED callback; register GCClosure * cc; @@ -3640,23 +4086,30 @@ static void g_cclosure_user_marshal_VOID__POINTER_BOXED (GClosure * closure, GVa data1 = closure->data; #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data2 = param_values->data[0].v_pointer; -#line 3644 "EditingTools.c" +#line 4090 "EditingTools.c" } else { #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data1 = param_values->data[0].v_pointer; #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data2 = closure->data; -#line 3650 "EditingTools.c" +#line 4096 "EditingTools.c" } #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" callback = (GMarshalFunc_VOID__POINTER_BOXED) (marshal_data ? marshal_data : cc->callback); #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" callback (data1, g_value_get_pointer (param_values + 1), g_value_get_boxed (param_values + 2), data2); -#line 3656 "EditingTools.c" +#line 4102 "EditingTools.c" } -static void g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__BOXED_OBJECT_BOXED) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer arg_3, gpointer data2); register GMarshalFunc_VOID__BOXED_OBJECT_BOXED callback; register GCClosure * cc; @@ -3671,120 +4124,145 @@ static void g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED (GClosure * closure data1 = closure->data; #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data2 = param_values->data[0].v_pointer; -#line 3675 "EditingTools.c" +#line 4128 "EditingTools.c" } else { #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data1 = param_values->data[0].v_pointer; #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data2 = closure->data; -#line 3681 "EditingTools.c" +#line 4134 "EditingTools.c" } #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" callback = (GMarshalFunc_VOID__BOXED_OBJECT_BOXED) (marshal_data ? marshal_data : cc->callback); #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" callback (data1, g_value_get_boxed (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boxed (param_values + 3), data2); -#line 3687 "EditingTools.c" +#line 4140 "EditingTools.c" } -static void editing_tools_value_photo_canvas_init (GValue* value) { +static void +editing_tools_value_photo_canvas_init (GValue* value) +{ #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 3694 "EditingTools.c" +#line 4149 "EditingTools.c" } -static void editing_tools_value_photo_canvas_free_value (GValue* value) { +static void +editing_tools_value_photo_canvas_free_value (GValue* value) +{ #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (value->data[0].v_pointer) { #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_unref (value->data[0].v_pointer); -#line 3703 "EditingTools.c" +#line 4160 "EditingTools.c" } } -static void editing_tools_value_photo_canvas_copy_value (const GValue* src_value, GValue* dest_value) { +static void +editing_tools_value_photo_canvas_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (src_value->data[0].v_pointer) { #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" dest_value->data[0].v_pointer = editing_tools_photo_canvas_ref (src_value->data[0].v_pointer); -#line 3713 "EditingTools.c" +#line 4173 "EditingTools.c" } else { #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" dest_value->data[0].v_pointer = NULL; -#line 3717 "EditingTools.c" +#line 4177 "EditingTools.c" } } -static gpointer editing_tools_value_photo_canvas_peek_pointer (const GValue* value) { +static gpointer +editing_tools_value_photo_canvas_peek_pointer (const GValue* value) +{ #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return value->data[0].v_pointer; -#line 3725 "EditingTools.c" +#line 4187 "EditingTools.c" } -static gchar* editing_tools_value_photo_canvas_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +editing_tools_value_photo_canvas_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (collect_values[0].v_pointer) { -#line 3732 "EditingTools.c" +#line 4199 "EditingTools.c" EditingToolsPhotoCanvas * object; object = collect_values[0].v_pointer; #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (object->parent_instance.g_class == NULL) { #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3739 "EditingTools.c" +#line 4206 "EditingTools.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3743 "EditingTools.c" +#line 4210 "EditingTools.c" } #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = editing_tools_photo_canvas_ref (object); -#line 3747 "EditingTools.c" +#line 4214 "EditingTools.c" } else { #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 3751 "EditingTools.c" +#line 4218 "EditingTools.c" } #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return NULL; -#line 3755 "EditingTools.c" +#line 4222 "EditingTools.c" } -static gchar* editing_tools_value_photo_canvas_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +editing_tools_value_photo_canvas_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ EditingToolsPhotoCanvas ** object_p; object_p = collect_values[0].v_pointer; #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!object_p) { #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3766 "EditingTools.c" +#line 4238 "EditingTools.c" } #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!value->data[0].v_pointer) { #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *object_p = NULL; -#line 3772 "EditingTools.c" +#line 4244 "EditingTools.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *object_p = value->data[0].v_pointer; -#line 3776 "EditingTools.c" +#line 4248 "EditingTools.c" } else { #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *object_p = editing_tools_photo_canvas_ref (value->data[0].v_pointer); -#line 3780 "EditingTools.c" +#line 4252 "EditingTools.c" } #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return NULL; -#line 3784 "EditingTools.c" +#line 4256 "EditingTools.c" } -GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +editing_tools_param_spec_photo_canvas (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ EditingToolsParamSpecPhotoCanvas* spec; #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (g_type_is_a (object_type, EDITING_TOOLS_TYPE_PHOTO_CANVAS), NULL); @@ -3794,20 +4272,25 @@ GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return G_PARAM_SPEC (spec); -#line 3798 "EditingTools.c" +#line 4276 "EditingTools.c" } -gpointer editing_tools_value_get_photo_canvas (const GValue* value) { +gpointer +editing_tools_value_get_photo_canvas (const GValue* value) +{ #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS), NULL); #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return value->data[0].v_pointer; -#line 3807 "EditingTools.c" +#line 4287 "EditingTools.c" } -void editing_tools_value_set_photo_canvas (GValue* value, gpointer v_object) { +void +editing_tools_value_set_photo_canvas (GValue* value, + gpointer v_object) +{ EditingToolsPhotoCanvas * old; #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS)); @@ -3823,22 +4306,25 @@ void editing_tools_value_set_photo_canvas (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_ref (value->data[0].v_pointer); -#line 3827 "EditingTools.c" +#line 4310 "EditingTools.c" } else { #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 3831 "EditingTools.c" +#line 4314 "EditingTools.c" } #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (old) { #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_unref (old); -#line 3837 "EditingTools.c" +#line 4320 "EditingTools.c" } } -void editing_tools_value_take_photo_canvas (GValue* value, gpointer v_object) { +void +editing_tools_value_take_photo_canvas (GValue* value, + gpointer v_object) +{ EditingToolsPhotoCanvas * old; #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS)); @@ -3852,22 +4338,24 @@ void editing_tools_value_take_photo_canvas (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = v_object; -#line 3856 "EditingTools.c" +#line 4342 "EditingTools.c" } else { #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 3860 "EditingTools.c" +#line 4346 "EditingTools.c" } #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (old) { #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_unref (old); -#line 3866 "EditingTools.c" +#line 4352 "EditingTools.c" } } -static void editing_tools_photo_canvas_class_init (EditingToolsPhotoCanvasClass * klass) { +static void +editing_tools_photo_canvas_class_init (EditingToolsPhotoCanvasClass * klass) +{ #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_parent_class = g_type_class_peek_parent (klass); #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -3880,20 +4368,24 @@ static void editing_tools_photo_canvas_class_init (EditingToolsPhotoCanvasClass editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_NEW_SURFACE_SIGNAL] = g_signal_new ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__POINTER_BOXED, G_TYPE_NONE, 2, G_TYPE_POINTER, TYPE_DIMENSIONS); #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_RESIZED_SCALED_PIXBUF_SIGNAL] = g_signal_new ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED, G_TYPE_NONE, 3, TYPE_DIMENSIONS, gdk_pixbuf_get_type (), gdk_rectangle_get_type ()); -#line 3884 "EditingTools.c" +#line 4372 "EditingTools.c" } -static void editing_tools_photo_canvas_instance_init (EditingToolsPhotoCanvas * self) { +static void +editing_tools_photo_canvas_instance_init (EditingToolsPhotoCanvas * self) +{ #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv = EDITING_TOOLS_PHOTO_CANVAS_GET_PRIVATE (self); #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->ref_count = 1; -#line 3893 "EditingTools.c" +#line 4383 "EditingTools.c" } -static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas * obj) { +static void +editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas * obj) +{ EditingToolsPhotoCanvas * self; #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_PHOTO_CANVAS, EditingToolsPhotoCanvas); @@ -3911,11 +4403,13 @@ static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas * obj) _cairo_surface_destroy0 (self->priv->scaled); #line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->scaled_pixbuf); -#line 3915 "EditingTools.c" +#line 4407 "EditingTools.c" } -GType editing_tools_photo_canvas_get_type (void) { +GType +editing_tools_photo_canvas_get_type (void) +{ static volatile gsize editing_tools_photo_canvas_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_photo_canvas_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { editing_tools_value_photo_canvas_init, editing_tools_value_photo_canvas_free_value, editing_tools_value_photo_canvas_copy_value, editing_tools_value_photo_canvas_peek_pointer, "p", editing_tools_value_photo_canvas_collect_value, "p", editing_tools_value_photo_canvas_lcopy_value }; @@ -3929,18 +4423,22 @@ GType editing_tools_photo_canvas_get_type (void) { } -gpointer editing_tools_photo_canvas_ref (gpointer instance) { +gpointer +editing_tools_photo_canvas_ref (gpointer instance) +{ EditingToolsPhotoCanvas * self; self = instance; #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_atomic_int_inc (&self->ref_count); #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return instance; -#line 3940 "EditingTools.c" +#line 4436 "EditingTools.c" } -void editing_tools_photo_canvas_unref (gpointer instance) { +void +editing_tools_photo_canvas_unref (gpointer instance) +{ EditingToolsPhotoCanvas * self; self = instance; #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -3949,56 +4447,64 @@ void editing_tools_photo_canvas_unref (gpointer instance) { EDITING_TOOLS_PHOTO_CANVAS_GET_CLASS (self)->finalize (self); #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3953 "EditingTools.c" +#line 4451 "EditingTools.c" } } -EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type, const gchar* name) { +EditingToolsEditingTool* +editing_tools_editing_tool_construct (GType object_type, + const gchar* name) +{ EditingToolsEditingTool* self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (name != NULL, NULL); #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = (EditingToolsEditingTool*) g_type_create_instance (object_type); #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = name; -#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (name); #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (self->name); #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->name = _tmp1_; + self->name = _tmp0_; #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 3976 "EditingTools.c" +#line 4474 "EditingTools.c" } -static gpointer _editing_tools_photo_canvas_ref0 (gpointer self) { +static gpointer +_editing_tools_photo_canvas_ref0 (gpointer self) +{ #line 481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self ? editing_tools_photo_canvas_ref (self) : NULL; -#line 3983 "EditingTools.c" +#line 4483 "EditingTools.c" } -static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) { +static gboolean +_editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, + GdkEventKey* event, + gpointer self) +{ gboolean result; result = editing_tools_editing_tool_on_keypress ((EditingToolsEditingTool*) self, event); #line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 3992 "EditingTools.c" +#line 4496 "EditingTools.c" } -static void editing_tools_editing_tool_real_activate (EditingToolsEditingTool* self, EditingToolsPhotoCanvas* canvas) { +static void +editing_tools_editing_tool_real_activate (EditingToolsEditingTool* self, + EditingToolsPhotoCanvas* canvas) +{ EditingToolsPhotoCanvas* _tmp0_; EditingToolsEditingToolWindow* _tmp1_; EditingToolsPhotoCanvas* _tmp2_; - EditingToolsPhotoCanvas* _tmp3_; + EditingToolsEditingToolWindow* _tmp3_; EditingToolsEditingToolWindow* _tmp4_; - EditingToolsEditingToolWindow* _tmp5_; #line 476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); #line 478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -4010,47 +4516,50 @@ static void editing_tools_editing_tool_real_activate (EditingToolsEditingTool* s #line 479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_assert (_tmp1_ == NULL, "tool_window == null"); #line 481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = canvas; -#line 481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = _editing_tools_photo_canvas_ref0 (_tmp2_); + _tmp2_ = _editing_tools_photo_canvas_ref0 (canvas); #line 481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _editing_tools_photo_canvas_unref0 (self->canvas); #line 481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->canvas = _tmp3_; + self->canvas = _tmp2_; #line 483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = editing_tools_editing_tool_get_tool_window (self); + _tmp3_ = editing_tools_editing_tool_get_tool_window (self); #line 483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->tool_window); #line 483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->tool_window = _tmp4_; + self->priv->tool_window = _tmp3_; #line 484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = self->priv->tool_window; + _tmp4_ = self->priv->tool_window; #line 484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp5_ != NULL) { -#line 4031 "EditingTools.c" - EditingToolsEditingToolWindow* _tmp6_; + if (_tmp4_ != NULL) { +#line 4535 "EditingTools.c" + EditingToolsEditingToolWindow* _tmp5_; #line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = self->priv->tool_window; + _tmp5_ = self->priv->tool_window; #line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, self); -#line 4037 "EditingTools.c" + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, self); +#line 4541 "EditingTools.c" } #line 487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_emit (self, editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ACTIVATED_SIGNAL], 0); -#line 4041 "EditingTools.c" +#line 4545 "EditingTools.c" } -void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, EditingToolsPhotoCanvas* canvas) { +void +editing_tools_editing_tool_activate (EditingToolsEditingTool* self, + EditingToolsPhotoCanvas* canvas) +{ #line 476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self)); #line 476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->activate (self, canvas); -#line 4050 "EditingTools.c" +#line 4557 "EditingTools.c" } -static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool* self) { +static void +editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool* self) +{ gboolean _tmp0_ = FALSE; EditingToolsPhotoCanvas* _tmp1_; EditingToolsEditingToolWindow* _tmp3_; @@ -4058,23 +4567,23 @@ static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool* _tmp1_ = self->canvas; #line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp1_ == NULL) { -#line 4062 "EditingTools.c" +#line 4571 "EditingTools.c" EditingToolsEditingToolWindow* _tmp2_; #line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->tool_window; #line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = _tmp2_ == NULL; -#line 4068 "EditingTools.c" +#line 4577 "EditingTools.c" } else { #line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = FALSE; -#line 4072 "EditingTools.c" +#line 4581 "EditingTools.c" } #line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_) { #line 494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 4078 "EditingTools.c" +#line 4587 "EditingTools.c" } #line 496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _editing_tools_photo_canvas_unref0 (self->canvas); @@ -4084,7 +4593,7 @@ static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool* _tmp3_ = self->priv->tool_window; #line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp3_ != NULL) { -#line 4088 "EditingTools.c" +#line 4597 "EditingTools.c" EditingToolsEditingToolWindow* _tmp4_; guint _tmp5_; #line 499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -4097,24 +4606,28 @@ static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool* _g_object_unref0 (self->priv->tool_window); #line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->tool_window = NULL; -#line 4101 "EditingTools.c" +#line 4610 "EditingTools.c" } #line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_emit (self, editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_DEACTIVATED_SIGNAL], 0); -#line 4105 "EditingTools.c" +#line 4614 "EditingTools.c" } -void editing_tools_editing_tool_deactivate (EditingToolsEditingTool* self) { +void +editing_tools_editing_tool_deactivate (EditingToolsEditingTool* self) +{ #line 491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self)); #line 491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->deactivate (self); -#line 4114 "EditingTools.c" +#line 4625 "EditingTools.c" } -gboolean editing_tools_editing_tool_is_activated (EditingToolsEditingTool* self) { +gboolean +editing_tools_editing_tool_is_activated (EditingToolsEditingTool* self) +{ gboolean result = FALSE; EditingToolsPhotoCanvas* _tmp0_; #line 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -4125,30 +4638,40 @@ gboolean editing_tools_editing_tool_is_activated (EditingToolsEditingTool* self) result = _tmp0_ != NULL; #line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 4129 "EditingTools.c" +#line 4642 "EditingTools.c" } -static EditingToolsEditingToolWindow* editing_tools_editing_tool_real_get_tool_window (EditingToolsEditingTool* self) { +static EditingToolsEditingToolWindow* +editing_tools_editing_tool_real_get_tool_window (EditingToolsEditingTool* self) +{ EditingToolsEditingToolWindow* result = NULL; #line 511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = NULL; #line 511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 4139 "EditingTools.c" +#line 4654 "EditingTools.c" } -EditingToolsEditingToolWindow* editing_tools_editing_tool_get_tool_window (EditingToolsEditingTool* self) { +EditingToolsEditingToolWindow* +editing_tools_editing_tool_get_tool_window (EditingToolsEditingTool* self) +{ #line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), NULL); #line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->get_tool_window (self); -#line 4148 "EditingTools.c" +#line 4665 "EditingTools.c" } -static GdkPixbuf* editing_tools_editing_tool_real_get_display_pixbuf (EditingToolsEditingTool* self, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error) { +static GdkPixbuf* +editing_tools_editing_tool_real_get_display_pixbuf (EditingToolsEditingTool* self, + Scaling* scaling, + Photo* photo, + Dimensions* max_dim, + GError** error) +{ Dimensions _vala_max_dim = {0}; GdkPixbuf* result = NULL; #line 525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -4163,147 +4686,201 @@ static GdkPixbuf* editing_tools_editing_tool_real_get_display_pixbuf (EditingToo if (max_dim) { #line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *max_dim = _vala_max_dim; -#line 4167 "EditingTools.c" +#line 4690 "EditingTools.c" } #line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 4171 "EditingTools.c" +#line 4694 "EditingTools.c" } -GdkPixbuf* editing_tools_editing_tool_get_display_pixbuf (EditingToolsEditingTool* self, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error) { +GdkPixbuf* +editing_tools_editing_tool_get_display_pixbuf (EditingToolsEditingTool* self, + Scaling* scaling, + Photo* photo, + Dimensions* max_dim, + GError** error) +{ #line 525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), NULL); #line 525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->get_display_pixbuf (self, scaling, photo, max_dim, error); -#line 4180 "EditingTools.c" +#line 4709 "EditingTools.c" } -static void editing_tools_editing_tool_real_on_left_click (EditingToolsEditingTool* self, gint x, gint y) { +static void +editing_tools_editing_tool_real_on_left_click (EditingToolsEditingTool* self, + gint x, + gint y) +{ } -void editing_tools_editing_tool_on_left_click (EditingToolsEditingTool* self, gint x, gint y) { +void +editing_tools_editing_tool_on_left_click (EditingToolsEditingTool* self, + gint x, + gint y) +{ #line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self)); #line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_left_click (self, x, y); -#line 4193 "EditingTools.c" +#line 4730 "EditingTools.c" } -static void editing_tools_editing_tool_real_on_left_released (EditingToolsEditingTool* self, gint x, gint y) { +static void +editing_tools_editing_tool_real_on_left_released (EditingToolsEditingTool* self, + gint x, + gint y) +{ } -void editing_tools_editing_tool_on_left_released (EditingToolsEditingTool* self, gint x, gint y) { +void +editing_tools_editing_tool_on_left_released (EditingToolsEditingTool* self, + gint x, + gint y) +{ #line 535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self)); #line 535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_left_released (self, x, y); -#line 4206 "EditingTools.c" +#line 4751 "EditingTools.c" } -static void editing_tools_editing_tool_real_on_motion (EditingToolsEditingTool* self, gint x, gint y, GdkModifierType mask) { +static void +editing_tools_editing_tool_real_on_motion (EditingToolsEditingTool* self, + gint x, + gint y, + GdkModifierType mask) +{ } -void editing_tools_editing_tool_on_motion (EditingToolsEditingTool* self, gint x, gint y, GdkModifierType mask) { +void +editing_tools_editing_tool_on_motion (EditingToolsEditingTool* self, + gint x, + gint y, + GdkModifierType mask) +{ #line 538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self)); #line 538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_motion (self, x, y, mask); -#line 4219 "EditingTools.c" +#line 4774 "EditingTools.c" } -static gboolean editing_tools_editing_tool_real_on_leave_notify_event (EditingToolsEditingTool* self) { +static gboolean +editing_tools_editing_tool_real_on_leave_notify_event (EditingToolsEditingTool* self) +{ gboolean result = FALSE; #line 542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; #line 542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 4229 "EditingTools.c" +#line 4786 "EditingTools.c" } -gboolean editing_tools_editing_tool_on_leave_notify_event (EditingToolsEditingTool* self) { +gboolean +editing_tools_editing_tool_on_leave_notify_event (EditingToolsEditingTool* self) +{ #line 541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE); #line 541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_leave_notify_event (self); -#line 4238 "EditingTools.c" +#line 4797 "EditingTools.c" } -static gboolean editing_tools_editing_tool_real_on_keypress (EditingToolsEditingTool* self, GdkEventKey* event) { +static gboolean +editing_tools_editing_tool_real_on_keypress (EditingToolsEditingTool* self, + GdkEventKey* event) +{ gboolean result = FALSE; - GdkEventKey* _tmp0_; - guint _tmp1_; - const gchar* _tmp2_; + guint _tmp0_; + const gchar* _tmp1_; #line 545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (event != NULL, FALSE); #line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = event; -#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = _tmp0_->keyval; + _tmp0_ = event->keyval; #line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = gdk_keyval_name (_tmp1_); + _tmp1_ = gdk_keyval_name (_tmp0_); #line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (g_strcmp0 (_tmp2_, "Escape") == 0) { + if (g_strcmp0 (_tmp1_, "Escape") == 0) { #line 548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_editing_tool_notify_cancel (self); #line 550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = TRUE; #line 550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 4263 "EditingTools.c" +#line 4822 "EditingTools.c" } #line 553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; #line 553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 4269 "EditingTools.c" +#line 4828 "EditingTools.c" } -gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self, GdkEventKey* event) { +gboolean +editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self, + GdkEventKey* event) +{ #line 545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE); #line 545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_keypress (self, event); -#line 4278 "EditingTools.c" +#line 4840 "EditingTools.c" } -static void editing_tools_editing_tool_real_paint (EditingToolsEditingTool* self, cairo_t* ctx) { +static void +editing_tools_editing_tool_real_paint (EditingToolsEditingTool* self, + cairo_t* ctx) +{ #line 556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (ctx != NULL); -#line 4285 "EditingTools.c" +#line 4850 "EditingTools.c" } -void editing_tools_editing_tool_paint (EditingToolsEditingTool* self, cairo_t* ctx) { +void +editing_tools_editing_tool_paint (EditingToolsEditingTool* self, + cairo_t* ctx) +{ #line 556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self)); #line 556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->paint (self, ctx); -#line 4294 "EditingTools.c" +#line 4862 "EditingTools.c" } -void editing_tools_editing_tool_notify_cancel (EditingToolsEditingTool* self) { +void +editing_tools_editing_tool_notify_cancel (EditingToolsEditingTool* self) +{ #line 560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self)); #line 561 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_emit (self, editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_CANCELLED_SIGNAL], 0); -#line 4303 "EditingTools.c" +#line 4873 "EditingTools.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT_BOXED_BOOLEAN) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer arg_3, gboolean arg_4, gpointer data2); register GMarshalFunc_VOID__OBJECT_OBJECT_BOXED_BOOLEAN callback; register GCClosure * cc; @@ -4318,120 +4895,145 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN (GClosure data1 = closure->data; #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data2 = param_values->data[0].v_pointer; -#line 4322 "EditingTools.c" +#line 4899 "EditingTools.c" } else { #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data1 = param_values->data[0].v_pointer; #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data2 = closure->data; -#line 4328 "EditingTools.c" +#line 4905 "EditingTools.c" } #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT_BOXED_BOOLEAN) (marshal_data ? marshal_data : cc->callback); #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boxed (param_values + 3), g_value_get_boolean (param_values + 4), data2); -#line 4334 "EditingTools.c" +#line 4911 "EditingTools.c" } -static void editing_tools_value_editing_tool_init (GValue* value) { +static void +editing_tools_value_editing_tool_init (GValue* value) +{ #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 4341 "EditingTools.c" +#line 4920 "EditingTools.c" } -static void editing_tools_value_editing_tool_free_value (GValue* value) { +static void +editing_tools_value_editing_tool_free_value (GValue* value) +{ #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (value->data[0].v_pointer) { #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_editing_tool_unref (value->data[0].v_pointer); -#line 4350 "EditingTools.c" +#line 4931 "EditingTools.c" } } -static void editing_tools_value_editing_tool_copy_value (const GValue* src_value, GValue* dest_value) { +static void +editing_tools_value_editing_tool_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (src_value->data[0].v_pointer) { #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" dest_value->data[0].v_pointer = editing_tools_editing_tool_ref (src_value->data[0].v_pointer); -#line 4360 "EditingTools.c" +#line 4944 "EditingTools.c" } else { #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" dest_value->data[0].v_pointer = NULL; -#line 4364 "EditingTools.c" +#line 4948 "EditingTools.c" } } -static gpointer editing_tools_value_editing_tool_peek_pointer (const GValue* value) { +static gpointer +editing_tools_value_editing_tool_peek_pointer (const GValue* value) +{ #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return value->data[0].v_pointer; -#line 4372 "EditingTools.c" +#line 4958 "EditingTools.c" } -static gchar* editing_tools_value_editing_tool_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +editing_tools_value_editing_tool_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (collect_values[0].v_pointer) { -#line 4379 "EditingTools.c" +#line 4970 "EditingTools.c" EditingToolsEditingTool * object; object = collect_values[0].v_pointer; #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (object->parent_instance.g_class == NULL) { #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4386 "EditingTools.c" +#line 4977 "EditingTools.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4390 "EditingTools.c" +#line 4981 "EditingTools.c" } #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = editing_tools_editing_tool_ref (object); -#line 4394 "EditingTools.c" +#line 4985 "EditingTools.c" } else { #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 4398 "EditingTools.c" +#line 4989 "EditingTools.c" } #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return NULL; -#line 4402 "EditingTools.c" +#line 4993 "EditingTools.c" } -static gchar* editing_tools_value_editing_tool_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +editing_tools_value_editing_tool_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ EditingToolsEditingTool ** object_p; object_p = collect_values[0].v_pointer; #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!object_p) { #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 4413 "EditingTools.c" +#line 5009 "EditingTools.c" } #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!value->data[0].v_pointer) { #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *object_p = NULL; -#line 4419 "EditingTools.c" +#line 5015 "EditingTools.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *object_p = value->data[0].v_pointer; -#line 4423 "EditingTools.c" +#line 5019 "EditingTools.c" } else { #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *object_p = editing_tools_editing_tool_ref (value->data[0].v_pointer); -#line 4427 "EditingTools.c" +#line 5023 "EditingTools.c" } #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return NULL; -#line 4431 "EditingTools.c" +#line 5027 "EditingTools.c" } -GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +editing_tools_param_spec_editing_tool (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ EditingToolsParamSpecEditingTool* spec; #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (g_type_is_a (object_type, EDITING_TOOLS_TYPE_EDITING_TOOL), NULL); @@ -4441,20 +5043,25 @@ GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return G_PARAM_SPEC (spec); -#line 4445 "EditingTools.c" +#line 5047 "EditingTools.c" } -gpointer editing_tools_value_get_editing_tool (const GValue* value) { +gpointer +editing_tools_value_get_editing_tool (const GValue* value) +{ #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL), NULL); #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return value->data[0].v_pointer; -#line 4454 "EditingTools.c" +#line 5058 "EditingTools.c" } -void editing_tools_value_set_editing_tool (GValue* value, gpointer v_object) { +void +editing_tools_value_set_editing_tool (GValue* value, + gpointer v_object) +{ EditingToolsEditingTool * old; #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL)); @@ -4470,22 +5077,25 @@ void editing_tools_value_set_editing_tool (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_editing_tool_ref (value->data[0].v_pointer); -#line 4474 "EditingTools.c" +#line 5081 "EditingTools.c" } else { #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 4478 "EditingTools.c" +#line 5085 "EditingTools.c" } #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (old) { #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_editing_tool_unref (old); -#line 4484 "EditingTools.c" +#line 5091 "EditingTools.c" } } -void editing_tools_value_take_editing_tool (GValue* value, gpointer v_object) { +void +editing_tools_value_take_editing_tool (GValue* value, + gpointer v_object) +{ EditingToolsEditingTool * old; #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL)); @@ -4499,22 +5109,24 @@ void editing_tools_value_take_editing_tool (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = v_object; -#line 4503 "EditingTools.c" +#line 5113 "EditingTools.c" } else { #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 4507 "EditingTools.c" +#line 5117 "EditingTools.c" } #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (old) { #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_editing_tool_unref (old); -#line 4513 "EditingTools.c" +#line 5123 "EditingTools.c" } } -static void editing_tools_editing_tool_class_init (EditingToolsEditingToolClass * klass) { +static void +editing_tools_editing_tool_class_init (EditingToolsEditingToolClass * klass) +{ #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_editing_tool_parent_class = g_type_class_peek_parent (klass); #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -4551,11 +5163,13 @@ static void editing_tools_editing_tool_class_init (EditingToolsEditingToolClass editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_CANCELLED_SIGNAL] = g_signal_new ("cancelled", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ABORTED_SIGNAL] = g_signal_new ("aborted", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 4555 "EditingTools.c" +#line 5167 "EditingTools.c" } -static void editing_tools_editing_tool_instance_init (EditingToolsEditingTool * self) { +static void +editing_tools_editing_tool_instance_init (EditingToolsEditingTool * self) +{ #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv = EDITING_TOOLS_EDITING_TOOL_GET_PRIVATE (self); #line 448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -4564,11 +5178,13 @@ static void editing_tools_editing_tool_instance_init (EditingToolsEditingTool * self->priv->tool_window = NULL; #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->ref_count = 1; -#line 4568 "EditingTools.c" +#line 5182 "EditingTools.c" } -static void editing_tools_editing_tool_finalize (EditingToolsEditingTool * obj) { +static void +editing_tools_editing_tool_finalize (EditingToolsEditingTool * obj) +{ EditingToolsEditingTool * self; #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool); @@ -4582,11 +5198,13 @@ static void editing_tools_editing_tool_finalize (EditingToolsEditingTool * obj) _cairo_surface_destroy0 (self->surface); #line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (self->name); -#line 4586 "EditingTools.c" +#line 5202 "EditingTools.c" } -GType editing_tools_editing_tool_get_type (void) { +GType +editing_tools_editing_tool_get_type (void) +{ static volatile gsize editing_tools_editing_tool_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_editing_tool_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { editing_tools_value_editing_tool_init, editing_tools_value_editing_tool_free_value, editing_tools_value_editing_tool_copy_value, editing_tools_value_editing_tool_peek_pointer, "p", editing_tools_value_editing_tool_collect_value, "p", editing_tools_value_editing_tool_lcopy_value }; @@ -4600,18 +5218,22 @@ GType editing_tools_editing_tool_get_type (void) { } -gpointer editing_tools_editing_tool_ref (gpointer instance) { +gpointer +editing_tools_editing_tool_ref (gpointer instance) +{ EditingToolsEditingTool * self; self = instance; #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_atomic_int_inc (&self->ref_count); #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return instance; -#line 4611 "EditingTools.c" +#line 5231 "EditingTools.c" } -void editing_tools_editing_tool_unref (gpointer instance) { +void +editing_tools_editing_tool_unref (gpointer instance) +{ EditingToolsEditingTool * self; self = instance; #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -4620,33 +5242,37 @@ void editing_tools_editing_tool_unref (gpointer instance) { EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->finalize (self); #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_type_free_instance ((GTypeInstance *) self); -#line 4624 "EditingTools.c" +#line 5246 "EditingTools.c" } } -static EditingToolsCropToolReticleOrientation editing_tools_crop_tool_reticle_orientation_toggle (EditingToolsCropToolReticleOrientation self) { +static EditingToolsCropToolReticleOrientation +editing_tools_crop_tool_reticle_orientation_toggle (EditingToolsCropToolReticleOrientation self) +{ EditingToolsCropToolReticleOrientation result = 0; EditingToolsCropToolReticleOrientation _tmp0_ = 0; #line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (self == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE) { #line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT; -#line 4636 "EditingTools.c" +#line 5260 "EditingTools.c" } else { #line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE; -#line 4640 "EditingTools.c" +#line 5264 "EditingTools.c" } #line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp0_; #line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 4646 "EditingTools.c" +#line 5270 "EditingTools.c" } -static GType editing_tools_crop_tool_reticle_orientation_get_type (void) { +static GType +editing_tools_crop_tool_reticle_orientation_get_type (void) +{ static volatile gsize editing_tools_crop_tool_reticle_orientation_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_crop_tool_reticle_orientation_type_id__volatile)) { static const GEnumValue values[] = {{EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE, "EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE", "landscape"}, {EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT, "EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT", "portrait"}, {0, NULL, NULL}}; @@ -4658,7 +5284,9 @@ static GType editing_tools_crop_tool_reticle_orientation_get_type (void) { } -static GType editing_tools_crop_tool_constraint_mode_get_type (void) { +static GType +editing_tools_crop_tool_constraint_mode_get_type (void) +{ static volatile gsize editing_tools_crop_tool_constraint_mode_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_crop_tool_constraint_mode_type_id__volatile)) { static const GEnumValue values[] = {{EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL, "EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL", "normal"}, {EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM, "EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM", "custom"}, {0, NULL, NULL}}; @@ -4670,24 +5298,30 @@ static GType editing_tools_crop_tool_constraint_mode_get_type (void) { } -static EditingToolsCropTool* editing_tools_crop_tool_construct (GType object_type) { +static EditingToolsCropTool* +editing_tools_crop_tool_construct (GType object_type) +{ EditingToolsCropTool* self = NULL; #line 716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = (EditingToolsCropTool*) editing_tools_editing_tool_construct (object_type, "CropTool"); #line 715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 4680 "EditingTools.c" +#line 5310 "EditingTools.c" } -static EditingToolsCropTool* editing_tools_crop_tool_new (void) { +static EditingToolsCropTool* +editing_tools_crop_tool_new (void) +{ #line 715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return editing_tools_crop_tool_construct (EDITING_TOOLS_TYPE_CROP_TOOL); -#line 4687 "EditingTools.c" +#line 5319 "EditingTools.c" } -EditingToolsCropTool* editing_tools_crop_tool_factory (void) { +EditingToolsCropTool* +editing_tools_crop_tool_factory (void) +{ EditingToolsCropTool* result = NULL; EditingToolsCropTool* _tmp0_; #line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -4696,554 +5330,701 @@ EditingToolsCropTool* editing_tools_crop_tool_factory (void) { result = _tmp0_; #line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 4700 "EditingTools.c" +#line 5334 "EditingTools.c" } -gboolean editing_tools_crop_tool_is_available (Photo* photo, Scaling* scaling) { +gboolean +editing_tools_crop_tool_is_available (Photo* photo, + Scaling* scaling) +{ gboolean result = FALSE; Dimensions dim = {0}; - Photo* _tmp0_; + Dimensions _tmp0_ = {0}; Dimensions _tmp1_ = {0}; - Dimensions _tmp2_ = {0}; - gboolean _tmp3_ = FALSE; - Dimensions _tmp4_; - gint _tmp5_; + gboolean _tmp2_ = FALSE; + Dimensions _tmp3_; + gint _tmp4_; #line 723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_PHOTO (photo), FALSE); #line 723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (scaling != NULL, FALSE); #line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = photo; + photo_get_original_dimensions (photo, &_tmp0_); #line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - photo_get_original_dimensions (_tmp0_, &_tmp1_); + scaling_get_scaled_dimensions (scaling, &_tmp0_, &_tmp1_); #line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - scaling_get_scaled_dimensions (scaling, &_tmp1_, &_tmp2_); -#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - dim = _tmp2_; + dim = _tmp1_; #line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = dim; + _tmp3_ = dim; #line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = _tmp4_.width; + _tmp4_ = _tmp3_.width; #line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp5_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) { -#line 4731 "EditingTools.c" - Dimensions _tmp6_; - gint _tmp7_; + if (_tmp4_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) { +#line 5365 "EditingTools.c" + Dimensions _tmp5_; + gint _tmp6_; #line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = dim; + _tmp5_ = dim; #line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = _tmp6_.height; + _tmp6_ = _tmp5_.height; #line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = _tmp7_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; -#line 4740 "EditingTools.c" + _tmp2_ = _tmp6_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; +#line 5374 "EditingTools.c" } else { #line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = FALSE; -#line 4744 "EditingTools.c" + _tmp2_ = FALSE; +#line 5378 "EditingTools.c" } #line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - result = _tmp3_; + result = _tmp2_; #line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 4750 "EditingTools.c" +#line 5384 "EditingTools.c" } -static void _vala_array_add7 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add7 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 4761 "EditingTools.c" +#line 5400 "EditingTools.c" } #line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 4767 "EditingTools.c" +#line 5406 "EditingTools.c" } -static void _vala_array_add8 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add8 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 4778 "EditingTools.c" +#line 5422 "EditingTools.c" } #line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 4784 "EditingTools.c" +#line 5428 "EditingTools.c" } -static void _vala_array_add9 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add9 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 4795 "EditingTools.c" +#line 5444 "EditingTools.c" } #line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 4801 "EditingTools.c" +#line 5450 "EditingTools.c" } -static void _vala_array_add10 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add10 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 4812 "EditingTools.c" +#line 5466 "EditingTools.c" } #line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 4818 "EditingTools.c" +#line 5472 "EditingTools.c" } -static void _vala_array_add11 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add11 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 4829 "EditingTools.c" +#line 5488 "EditingTools.c" } #line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 4835 "EditingTools.c" +#line 5494 "EditingTools.c" } -static void _vala_array_add12 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add12 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 4846 "EditingTools.c" +#line 5510 "EditingTools.c" } #line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 4852 "EditingTools.c" +#line 5516 "EditingTools.c" } -static void _vala_array_add13 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add13 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 4863 "EditingTools.c" +#line 5532 "EditingTools.c" } #line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 4869 "EditingTools.c" +#line 5538 "EditingTools.c" } -static void _vala_array_add14 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add14 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 4880 "EditingTools.c" +#line 5554 "EditingTools.c" } #line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 4886 "EditingTools.c" +#line 5560 "EditingTools.c" } -static void _vala_array_add15 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add15 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 4897 "EditingTools.c" +#line 5576 "EditingTools.c" } #line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 4903 "EditingTools.c" +#line 5582 "EditingTools.c" } -static void _vala_array_add16 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add16 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 4914 "EditingTools.c" +#line 5598 "EditingTools.c" } #line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 4920 "EditingTools.c" +#line 5604 "EditingTools.c" } -static void _vala_array_add17 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add17 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 4931 "EditingTools.c" +#line 5620 "EditingTools.c" } #line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 4937 "EditingTools.c" +#line 5626 "EditingTools.c" } -static void _vala_array_add18 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add18 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 4948 "EditingTools.c" +#line 5642 "EditingTools.c" } #line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 4954 "EditingTools.c" +#line 5648 "EditingTools.c" } -static void _vala_array_add19 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add19 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 4965 "EditingTools.c" +#line 5664 "EditingTools.c" } #line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 4971 "EditingTools.c" +#line 5670 "EditingTools.c" } -static void _vala_array_add20 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add20 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 4982 "EditingTools.c" +#line 5686 "EditingTools.c" } #line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 4988 "EditingTools.c" +#line 5692 "EditingTools.c" } -static void _vala_array_add21 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add21 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 4999 "EditingTools.c" +#line 5708 "EditingTools.c" } #line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5005 "EditingTools.c" +#line 5714 "EditingTools.c" } -static void _vala_array_add22 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add22 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5016 "EditingTools.c" +#line 5730 "EditingTools.c" } #line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5022 "EditingTools.c" +#line 5736 "EditingTools.c" } -static void _vala_array_add23 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add23 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5033 "EditingTools.c" +#line 5752 "EditingTools.c" } #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5039 "EditingTools.c" +#line 5758 "EditingTools.c" } -static void _vala_array_add24 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add24 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5050 "EditingTools.c" +#line 5774 "EditingTools.c" } #line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5056 "EditingTools.c" +#line 5780 "EditingTools.c" } -static void _vala_array_add25 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add25 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5067 "EditingTools.c" +#line 5796 "EditingTools.c" } #line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5073 "EditingTools.c" +#line 5802 "EditingTools.c" } -static void _vala_array_add26 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add26 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5084 "EditingTools.c" +#line 5818 "EditingTools.c" } #line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5090 "EditingTools.c" +#line 5824 "EditingTools.c" } -static void _vala_array_add27 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add27 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5101 "EditingTools.c" +#line 5840 "EditingTools.c" } #line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5107 "EditingTools.c" +#line 5846 "EditingTools.c" } -static void _vala_array_add28 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add28 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5118 "EditingTools.c" +#line 5862 "EditingTools.c" } #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5124 "EditingTools.c" +#line 5868 "EditingTools.c" } -static void _vala_array_add29 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add29 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5135 "EditingTools.c" +#line 5884 "EditingTools.c" } #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5141 "EditingTools.c" +#line 5890 "EditingTools.c" } -static void _vala_array_add30 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add30 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5152 "EditingTools.c" +#line 5906 "EditingTools.c" } #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5158 "EditingTools.c" +#line 5912 "EditingTools.c" } -static void _vala_array_add31 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add31 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5169 "EditingTools.c" +#line 5928 "EditingTools.c" } #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5175 "EditingTools.c" +#line 5934 "EditingTools.c" } -static void _vala_array_add32 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add32 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5186 "EditingTools.c" +#line 5950 "EditingTools.c" } #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5192 "EditingTools.c" +#line 5956 "EditingTools.c" } -static void _vala_array_add33 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add33 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5203 "EditingTools.c" +#line 5972 "EditingTools.c" } #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5209 "EditingTools.c" +#line 5978 "EditingTools.c" } -static void _vala_array_add34 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add34 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5220 "EditingTools.c" +#line 5994 "EditingTools.c" } #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5226 "EditingTools.c" +#line 6000 "EditingTools.c" } -static void _vala_array_add35 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void +_vala_array_add35 (EditingToolsCropToolConstraintDescription** * array, + int* length, + int* size, + EditingToolsCropToolConstraintDescription* value) +{ #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5237 "EditingTools.c" +#line 6016 "EditingTools.c" } #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5243 "EditingTools.c" +#line 6022 "EditingTools.c" } -static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_create_constraints (int* result_length1) { +static EditingToolsCropToolConstraintDescription** +editing_tools_crop_tool_create_constraints (int* result_length1) +{ EditingToolsCropToolConstraintDescription** result = NULL; EditingToolsCropToolConstraintDescription** _result_ = NULL; EditingToolsCropToolConstraintDescription** _tmp0_; @@ -5586,91 +6367,90 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat if (result_length1) { #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *result_length1 = _tmp59__length1; -#line 5590 "EditingTools.c" +#line 6371 "EditingTools.c" } #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp59_; #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 5596 "EditingTools.c" +#line 6377 "EditingTools.c" } -static gpointer _editing_tools_crop_tool_constraint_description_ref0 (gpointer self) { +static gpointer +_editing_tools_crop_tool_constraint_description_ref0 (gpointer self) +{ #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self ? editing_tools_crop_tool_constraint_description_ref (self) : NULL; -#line 5603 "EditingTools.c" +#line 6386 "EditingTools.c" } -static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingToolsCropToolConstraintDescription** constraint_data, int constraint_data_length1) { +static GtkListStore* +editing_tools_crop_tool_create_constraint_list (EditingToolsCropToolConstraintDescription** constraint_data, + int constraint_data_length1) +{ GtkListStore* result = NULL; GtkListStore* _result_ = NULL; GtkListStore* _tmp0_; GtkTreeIter iter = {0}; - EditingToolsCropToolConstraintDescription** _tmp1_; - gint _tmp1__length1; #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = gtk_list_store_new (1, G_TYPE_STRING, G_TYPE_STRING, -1); #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_ = _tmp0_; -#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = constraint_data; -#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1__length1 = constraint_data_length1; -#line 5622 "EditingTools.c" +#line 6402 "EditingTools.c" { EditingToolsCropToolConstraintDescription** constraint_collection = NULL; gint constraint_collection_length1 = 0; gint _constraint_collection_size_ = 0; gint constraint_it = 0; #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - constraint_collection = _tmp1_; + constraint_collection = constraint_data; #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - constraint_collection_length1 = _tmp1__length1; + constraint_collection_length1 = constraint_data_length1; #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - for (constraint_it = 0; constraint_it < _tmp1__length1; constraint_it = constraint_it + 1) { -#line 5634 "EditingTools.c" - EditingToolsCropToolConstraintDescription* _tmp2_; + for (constraint_it = 0; constraint_it < constraint_data_length1; constraint_it = constraint_it + 1) { +#line 6414 "EditingTools.c" + EditingToolsCropToolConstraintDescription* _tmp1_; EditingToolsCropToolConstraintDescription* constraint = NULL; #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = _editing_tools_crop_tool_constraint_description_ref0 (constraint_collection[constraint_it]); + _tmp1_ = _editing_tools_crop_tool_constraint_description_ref0 (constraint_collection[constraint_it]); #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - constraint = _tmp2_; -#line 5641 "EditingTools.c" + constraint = _tmp1_; +#line 6421 "EditingTools.c" { - GtkListStore* _tmp3_; - GtkTreeIter _tmp4_ = {0}; - GtkListStore* _tmp5_; - GtkTreeIter _tmp6_; - EditingToolsCropToolConstraintDescription* _tmp7_; - const gchar* _tmp8_; - GValue _tmp9_ = {0}; + GtkListStore* _tmp2_; + GtkTreeIter _tmp3_ = {0}; + GtkListStore* _tmp4_; + GtkTreeIter _tmp5_; + EditingToolsCropToolConstraintDescription* _tmp6_; + const gchar* _tmp7_; + GValue _tmp8_ = {0}; #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = _result_; + _tmp2_ = _result_; #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_list_store_append (_tmp3_, &_tmp4_); + gtk_list_store_append (_tmp2_, &_tmp3_); #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - iter = _tmp4_; + iter = _tmp3_; #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = _result_; + _tmp4_ = _result_; #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = iter; + _tmp5_ = iter; #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = constraint; + _tmp6_ = constraint; #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = _tmp7_->name; + _tmp7_ = _tmp6_->name; #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_value_init (&_tmp9_, G_TYPE_STRING); + g_value_init (&_tmp8_, G_TYPE_STRING); #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_value_set_string (&_tmp9_, _tmp8_); + g_value_set_string (&_tmp8_, _tmp7_); #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_list_store_set_value (_tmp5_, &_tmp6_, 0, &_tmp9_); + gtk_list_store_set_value (_tmp4_, &_tmp5_, 0, &_tmp8_); #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - G_IS_VALUE (&_tmp9_) ? (g_value_unset (&_tmp9_), NULL) : NULL; + G_IS_VALUE (&_tmp8_) ? (g_value_unset (&_tmp8_), NULL) : NULL; #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _editing_tools_crop_tool_constraint_description_unref0 (constraint); -#line 5674 "EditingTools.c" +#line 6454 "EditingTools.c" } } } @@ -5678,11 +6458,13 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool result = _result_; #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 5682 "EditingTools.c" +#line 6462 "EditingTools.c" } -static void editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropTool* self) { +static void +editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropTool* self) +{ EditingToolsCropToolCropToolWindow* _tmp0_; GtkButton* _tmp1_; EditingToolsCropToolConstraintDescription* _tmp2_; @@ -5704,22 +6486,23 @@ static void editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropT gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), _tmp4_); #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _editing_tools_crop_tool_constraint_description_unref0 (_tmp3_); -#line 5708 "EditingTools.c" +#line 6490 "EditingTools.c" } -static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_selected_constraint (EditingToolsCropTool* self) { +static EditingToolsCropToolConstraintDescription* +editing_tools_crop_tool_get_selected_constraint (EditingToolsCropTool* self) +{ EditingToolsCropToolConstraintDescription* result = NULL; EditingToolsCropToolConstraintDescription* _result_ = NULL; EditingToolsCropToolConstraintDescription** _tmp0_; gint _tmp0__length1; EditingToolsCropToolCropToolWindow* _tmp1_; GtkComboBox* _tmp2_; - gint _tmp3_; + EditingToolsCropToolConstraintDescription* _tmp3_; EditingToolsCropToolConstraintDescription* _tmp4_; EditingToolsCropToolConstraintDescription* _tmp5_; - EditingToolsCropToolConstraintDescription* _tmp6_; - gfloat _tmp7_; + gfloat _tmp6_; #line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), NULL); #line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -5731,111 +6514,104 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se #line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp1_->constraint_combo; #line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = gtk_combo_box_get_active (_tmp2_); + _tmp3_ = _tmp0_[gtk_combo_box_get_active (_tmp2_)]; #line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = _tmp0_[_tmp3_]; + _tmp4_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp3_); #line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp4_); -#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _result_ = _tmp5_; + _result_ = _tmp4_; #line 785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _result_; + _tmp5_ = _result_; #line 785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = _tmp6_->aspect_ratio; + _tmp6_ = _tmp5_->aspect_ratio; #line 785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp7_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) { -#line 5748 "EditingTools.c" - EditingToolsCropToolConstraintDescription* _tmp8_; - EditingToolsPhotoCanvas* _tmp9_; - GdkRectangle _tmp10_ = {0}; - gint _tmp11_; - EditingToolsCropToolConstraintDescription* _tmp12_; - EditingToolsPhotoCanvas* _tmp13_; - GdkRectangle _tmp14_ = {0}; - gint _tmp15_; + if (_tmp6_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) { +#line 6529 "EditingTools.c" + EditingToolsCropToolConstraintDescription* _tmp7_; + EditingToolsPhotoCanvas* _tmp8_; + GdkRectangle _tmp9_ = {0}; + gint _tmp10_; + EditingToolsCropToolConstraintDescription* _tmp11_; + EditingToolsPhotoCanvas* _tmp12_; + GdkRectangle _tmp13_ = {0}; + gint _tmp14_; #line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = _result_; + _tmp7_ = _result_; #line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp9_, &_tmp10_); + editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp8_, &_tmp9_); #line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = _tmp10_.width; + _tmp10_ = _tmp9_.width; #line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_->basis_width = _tmp11_; + _tmp7_->basis_width = _tmp10_; #line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = _result_; + _tmp11_ = _result_; #line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp13_, &_tmp14_); + editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp12_, &_tmp13_); #line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = _tmp14_.height; + _tmp14_ = _tmp13_.height; #line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_->basis_height = _tmp15_; -#line 5777 "EditingTools.c" + _tmp11_->basis_height = _tmp14_; +#line 6558 "EditingTools.c" } else { - EditingToolsCropToolConstraintDescription* _tmp16_; - gfloat _tmp17_; + EditingToolsCropToolConstraintDescription* _tmp15_; + gfloat _tmp16_; #line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = _result_; + _tmp15_ = _result_; #line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = _tmp16_->aspect_ratio; + _tmp16_ = _tmp15_->aspect_ratio; #line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp17_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) { -#line 5787 "EditingTools.c" + if (_tmp16_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) { +#line 6568 "EditingTools.c" GdkScreen* screen = NULL; + GdkScreen* _tmp17_; GdkScreen* _tmp18_; - GdkScreen* _tmp19_; - EditingToolsCropToolConstraintDescription* _tmp20_; - GdkScreen* _tmp21_; - gint _tmp22_; - EditingToolsCropToolConstraintDescription* _tmp23_; - GdkScreen* _tmp24_; - gint _tmp25_; + EditingToolsCropToolConstraintDescription* _tmp19_; + GdkScreen* _tmp20_; + EditingToolsCropToolConstraintDescription* _tmp21_; + GdkScreen* _tmp22_; #line 789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = gdk_screen_get_default (); + _tmp17_ = gdk_screen_get_default (); #line 789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = _g_object_ref0 (_tmp18_); + _tmp18_ = _g_object_ref0 (_tmp17_); #line 789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - screen = _tmp19_; + screen = _tmp18_; #line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = _result_; + _tmp19_ = _result_; #line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = screen; + _tmp20_ = screen; #line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = gdk_screen_get_width (_tmp21_); -#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_->basis_width = _tmp22_; -#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = _result_; + _tmp19_->basis_width = gdk_screen_get_width (_tmp20_); #line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = screen; + _tmp21_ = _result_; #line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = gdk_screen_get_height (_tmp24_); + _tmp22_ = screen; #line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_->basis_height = _tmp25_; + _tmp21_->basis_height = gdk_screen_get_height (_tmp22_); #line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (screen); -#line 5821 "EditingTools.c" +#line 6596 "EditingTools.c" } } #line 794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _result_; #line 794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 5828 "EditingTools.c" +#line 6603 "EditingTools.c" } -static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event) { +static gboolean +editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCropTool* self, + GdkEventFocus* event) +{ gboolean result = FALSE; EditingToolsCropToolCropToolWindow* _tmp0_; EditingToolsCropToolCropToolWindow* _tmp1_; GtkEntry* _tmp2_; GtkEntry* _tmp3_; - GdkEventFocus* _tmp4_; - gboolean _tmp5_; #line 797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE); #line 797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -5853,25 +6629,22 @@ static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCr #line 798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_->most_recently_edited = _tmp3_; #line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = event; -#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = editing_tools_crop_tool_on_custom_entry_focus_out (self, _tmp4_); -#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - result = _tmp5_; + result = editing_tools_crop_tool_on_custom_entry_focus_out (self, event); #line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 5864 "EditingTools.c" +#line 6636 "EditingTools.c" } -static gboolean editing_tools_crop_tool_on_height_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event) { +static gboolean +editing_tools_crop_tool_on_height_entry_focus_out (EditingToolsCropTool* self, + GdkEventFocus* event) +{ gboolean result = FALSE; EditingToolsCropToolCropToolWindow* _tmp0_; EditingToolsCropToolCropToolWindow* _tmp1_; GtkEntry* _tmp2_; GtkEntry* _tmp3_; - GdkEventFocus* _tmp4_; - gboolean _tmp5_; #line 802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE); #line 802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -5889,51 +6662,48 @@ static gboolean editing_tools_crop_tool_on_height_entry_focus_out (EditingToolsC #line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_->most_recently_edited = _tmp3_; #line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = event; -#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = editing_tools_crop_tool_on_custom_entry_focus_out (self, _tmp4_); -#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - result = _tmp5_; + result = editing_tools_crop_tool_on_custom_entry_focus_out (self, event); #line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 5900 "EditingTools.c" +#line 6669 "EditingTools.c" } -static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event) { +static gboolean +editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsCropTool* self, + GdkEventFocus* event) +{ gboolean result = FALSE; gint width = 0; EditingToolsCropToolCropToolWindow* _tmp0_; GtkEntry* _tmp1_; const gchar* _tmp2_; const gchar* _tmp3_; - gint _tmp4_; gint height = 0; - EditingToolsCropToolCropToolWindow* _tmp5_; - GtkEntry* _tmp6_; + EditingToolsCropToolCropToolWindow* _tmp4_; + GtkEntry* _tmp5_; + const gchar* _tmp6_; const gchar* _tmp7_; - const gchar* _tmp8_; - gint _tmp9_; - gint _tmp10_; - gint _tmp16_; - gboolean _tmp22_ = FALSE; - gint _tmp23_; - gint _tmp24_; - gint _tmp27_; - gint _tmp28_; - gfloat _tmp29_; - gint _tmp63_; - gint _tmp64_; + gint _tmp8_; + gint _tmp14_; + gboolean _tmp20_ = FALSE; + gint _tmp21_; + gint _tmp22_; + gint _tmp25_; + gint _tmp26_; + gfloat _tmp27_; + gint _tmp61_; + gint _tmp62_; Box new_crop = {0}; + Box _tmp63_; + Box _tmp64_ = {0}; Box _tmp65_; - Box _tmp66_ = {0}; - Box _tmp67_; + Box _tmp66_; + EditingToolsPhotoCanvas* _tmp67_; Box _tmp68_; EditingToolsPhotoCanvas* _tmp69_; - Box _tmp70_; - EditingToolsPhotoCanvas* _tmp71_; - gint _tmp72_; - gint _tmp73_; + gint _tmp70_; + gint _tmp71_; #line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE); #line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -5947,311 +6717,310 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC #line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_; #line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = atoi (_tmp3_); -#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - width = _tmp4_; -#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = self->priv->crop_tool_window; + width = atoi (_tmp3_); #line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _tmp5_->custom_height_entry; + _tmp4_ = self->priv->crop_tool_window; #line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = gtk_entry_get_text (_tmp6_); + _tmp5_ = _tmp4_->custom_height_entry; #line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = _tmp7_; + _tmp6_ = gtk_entry_get_text (_tmp5_); #line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = atoi (_tmp8_); + _tmp7_ = _tmp6_; #line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - height = _tmp9_; + height = atoi (_tmp7_); #line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = width; + _tmp8_ = width; #line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp10_ < 1) { -#line 5970 "EditingTools.c" - EditingToolsCropToolCropToolWindow* _tmp11_; - GtkEntry* _tmp12_; - gint _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; + if (_tmp8_ < 1) { +#line 6736 "EditingTools.c" + EditingToolsCropToolCropToolWindow* _tmp9_; + GtkEntry* _tmp10_; + gint _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; #line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" width = 1; #line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = self->priv->crop_tool_window; + _tmp9_ = self->priv->crop_tool_window; #line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = _tmp11_->custom_width_entry; + _tmp10_ = _tmp9_->custom_width_entry; #line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = width; + _tmp11_ = width; #line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = g_strdup_printf ("%d", _tmp13_); + _tmp12_ = g_strdup_printf ("%d", _tmp11_); #line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = _tmp14_; + _tmp13_ = _tmp12_; #line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_entry_set_text (_tmp12_, _tmp15_); + gtk_entry_set_text (_tmp10_, _tmp13_); #line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_free0 (_tmp15_); -#line 5992 "EditingTools.c" + _g_free0 (_tmp13_); +#line 6758 "EditingTools.c" } #line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = height; + _tmp14_ = height; #line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp16_ < 1) { -#line 5998 "EditingTools.c" - EditingToolsCropToolCropToolWindow* _tmp17_; - GtkEntry* _tmp18_; - gint _tmp19_; - gchar* _tmp20_; - gchar* _tmp21_; + if (_tmp14_ < 1) { +#line 6764 "EditingTools.c" + EditingToolsCropToolCropToolWindow* _tmp15_; + GtkEntry* _tmp16_; + gint _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; #line 817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" height = 1; #line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = self->priv->crop_tool_window; + _tmp15_ = self->priv->crop_tool_window; #line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = _tmp17_->custom_height_entry; + _tmp16_ = _tmp15_->custom_height_entry; #line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = height; + _tmp17_ = height; #line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = g_strdup_printf ("%d", _tmp19_); + _tmp18_ = g_strdup_printf ("%d", _tmp17_); #line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = _tmp20_; + _tmp19_ = _tmp18_; #line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_entry_set_text (_tmp18_, _tmp21_); + gtk_entry_set_text (_tmp16_, _tmp19_); #line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_free0 (_tmp21_); -#line 6020 "EditingTools.c" + _g_free0 (_tmp19_); +#line 6786 "EditingTools.c" } #line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = width; + _tmp21_ = width; #line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = self->priv->custom_width; + _tmp22_ = self->priv->custom_width; #line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp23_ == _tmp24_) { -#line 6028 "EditingTools.c" - gint _tmp25_; - gint _tmp26_; + if (_tmp21_ == _tmp22_) { +#line 6794 "EditingTools.c" + gint _tmp23_; + gint _tmp24_; #line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = height; + _tmp23_ = height; #line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp26_ = self->priv->custom_height; + _tmp24_ = self->priv->custom_height; #line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = _tmp25_ == _tmp26_; -#line 6037 "EditingTools.c" + _tmp20_ = _tmp23_ == _tmp24_; +#line 6803 "EditingTools.c" } else { #line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = FALSE; -#line 6041 "EditingTools.c" + _tmp20_ = FALSE; +#line 6807 "EditingTools.c" } #line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp22_) { + if (_tmp20_) { #line 822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; #line 822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 6049 "EditingTools.c" +#line 6815 "EditingTools.c" } #line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp27_ = width; + _tmp25_ = width; #line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_ = height; + _tmp26_ = height; #line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->custom_aspect_ratio = ((gfloat) _tmp27_) / ((gfloat) _tmp28_); + self->priv->custom_aspect_ratio = ((gfloat) _tmp25_) / ((gfloat) _tmp26_); #line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp29_ = self->priv->custom_aspect_ratio; + _tmp27_ = self->priv->custom_aspect_ratio; #line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp29_ < EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO) { -#line 6061 "EditingTools.c" + if (_tmp27_ < EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO) { +#line 6827 "EditingTools.c" + EditingToolsCropToolCropToolWindow* _tmp28_; + GtkEntry* _tmp29_; EditingToolsCropToolCropToolWindow* _tmp30_; GtkEntry* _tmp31_; - EditingToolsCropToolCropToolWindow* _tmp32_; - GtkEntry* _tmp33_; #line 827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp30_ = self->priv->crop_tool_window; + _tmp28_ = self->priv->crop_tool_window; #line 827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp31_ = _tmp30_->most_recently_edited; + _tmp29_ = _tmp28_->most_recently_edited; #line 827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp32_ = self->priv->crop_tool_window; + _tmp30_ = self->priv->crop_tool_window; #line 827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp33_ = _tmp32_->custom_height_entry; + _tmp31_ = _tmp30_->custom_height_entry; #line 827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp31_ == _tmp33_) { -#line 6076 "EditingTools.c" - gint _tmp34_; - EditingToolsCropToolCropToolWindow* _tmp35_; - GtkEntry* _tmp36_; - gint _tmp37_; - gchar* _tmp38_; - gchar* _tmp39_; + if (_tmp29_ == _tmp31_) { +#line 6842 "EditingTools.c" + gint _tmp32_; + EditingToolsCropToolCropToolWindow* _tmp33_; + GtkEntry* _tmp34_; + gint _tmp35_; + gchar* _tmp36_; + gchar* _tmp37_; #line 828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp34_ = width; + _tmp32_ = width; #line 828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - height = (gint) (_tmp34_ / EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO); + height = (gint) (_tmp32_ / EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO); #line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp35_ = self->priv->crop_tool_window; + _tmp33_ = self->priv->crop_tool_window; #line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp36_ = _tmp35_->custom_height_entry; + _tmp34_ = _tmp33_->custom_height_entry; #line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp37_ = height; + _tmp35_ = height; #line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp38_ = g_strdup_printf ("%d", _tmp37_); + _tmp36_ = g_strdup_printf ("%d", _tmp35_); #line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp39_ = _tmp38_; + _tmp37_ = _tmp36_; #line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_entry_set_text (_tmp36_, _tmp39_); + gtk_entry_set_text (_tmp34_, _tmp37_); #line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_free0 (_tmp39_); -#line 6101 "EditingTools.c" + _g_free0 (_tmp37_); +#line 6867 "EditingTools.c" } else { - gint _tmp40_; - EditingToolsCropToolCropToolWindow* _tmp41_; - GtkEntry* _tmp42_; - gint _tmp43_; - gchar* _tmp44_; - gchar* _tmp45_; + gint _tmp38_; + EditingToolsCropToolCropToolWindow* _tmp39_; + GtkEntry* _tmp40_; + gint _tmp41_; + gchar* _tmp42_; + gchar* _tmp43_; #line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp40_ = height; + _tmp38_ = height; #line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - width = (gint) (_tmp40_ * EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO); + width = (gint) (_tmp38_ * EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO); #line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp41_ = self->priv->crop_tool_window; + _tmp39_ = self->priv->crop_tool_window; #line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp42_ = _tmp41_->custom_width_entry; + _tmp40_ = _tmp39_->custom_width_entry; #line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp43_ = width; + _tmp41_ = width; #line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp44_ = g_strdup_printf ("%d", _tmp43_); + _tmp42_ = g_strdup_printf ("%d", _tmp41_); #line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp45_ = _tmp44_; + _tmp43_ = _tmp42_; #line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_entry_set_text (_tmp42_, _tmp45_); + gtk_entry_set_text (_tmp40_, _tmp43_); #line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_free0 (_tmp45_); -#line 6127 "EditingTools.c" + _g_free0 (_tmp43_); +#line 6893 "EditingTools.c" } } else { - gfloat _tmp46_; + gfloat _tmp44_; #line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp46_ = self->priv->custom_aspect_ratio; + _tmp44_ = self->priv->custom_aspect_ratio; #line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp46_ > EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO) { -#line 6135 "EditingTools.c" + if (_tmp44_ > EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO) { +#line 6901 "EditingTools.c" + EditingToolsCropToolCropToolWindow* _tmp45_; + GtkEntry* _tmp46_; EditingToolsCropToolCropToolWindow* _tmp47_; GtkEntry* _tmp48_; - EditingToolsCropToolCropToolWindow* _tmp49_; - GtkEntry* _tmp50_; #line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp47_ = self->priv->crop_tool_window; + _tmp45_ = self->priv->crop_tool_window; #line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp48_ = _tmp47_->most_recently_edited; + _tmp46_ = _tmp45_->most_recently_edited; #line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp49_ = self->priv->crop_tool_window; + _tmp47_ = self->priv->crop_tool_window; #line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp50_ = _tmp49_->custom_height_entry; + _tmp48_ = _tmp47_->custom_height_entry; #line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp48_ == _tmp50_) { -#line 6150 "EditingTools.c" - gint _tmp51_; - EditingToolsCropToolCropToolWindow* _tmp52_; - GtkEntry* _tmp53_; - gint _tmp54_; - gchar* _tmp55_; - gchar* _tmp56_; + if (_tmp46_ == _tmp48_) { +#line 6916 "EditingTools.c" + gint _tmp49_; + EditingToolsCropToolCropToolWindow* _tmp50_; + GtkEntry* _tmp51_; + gint _tmp52_; + gchar* _tmp53_; + gchar* _tmp54_; #line 836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp51_ = width; + _tmp49_ = width; #line 836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - height = (gint) (_tmp51_ / EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO); + height = (gint) (_tmp49_ / EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO); #line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp52_ = self->priv->crop_tool_window; + _tmp50_ = self->priv->crop_tool_window; #line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp53_ = _tmp52_->custom_height_entry; + _tmp51_ = _tmp50_->custom_height_entry; #line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp54_ = height; + _tmp52_ = height; #line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp55_ = g_strdup_printf ("%d", _tmp54_); + _tmp53_ = g_strdup_printf ("%d", _tmp52_); #line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp56_ = _tmp55_; + _tmp54_ = _tmp53_; #line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_entry_set_text (_tmp53_, _tmp56_); + gtk_entry_set_text (_tmp51_, _tmp54_); #line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_free0 (_tmp56_); -#line 6175 "EditingTools.c" + _g_free0 (_tmp54_); +#line 6941 "EditingTools.c" } else { - gint _tmp57_; - EditingToolsCropToolCropToolWindow* _tmp58_; - GtkEntry* _tmp59_; - gint _tmp60_; - gchar* _tmp61_; - gchar* _tmp62_; + gint _tmp55_; + EditingToolsCropToolCropToolWindow* _tmp56_; + GtkEntry* _tmp57_; + gint _tmp58_; + gchar* _tmp59_; + gchar* _tmp60_; #line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp57_ = height; + _tmp55_ = height; #line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - width = (gint) (_tmp57_ * EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO); + width = (gint) (_tmp55_ * EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO); #line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp58_ = self->priv->crop_tool_window; + _tmp56_ = self->priv->crop_tool_window; #line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp59_ = _tmp58_->custom_width_entry; + _tmp57_ = _tmp56_->custom_width_entry; #line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp60_ = width; + _tmp58_ = width; #line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp61_ = g_strdup_printf ("%d", _tmp60_); + _tmp59_ = g_strdup_printf ("%d", _tmp58_); #line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp62_ = _tmp61_; + _tmp60_ = _tmp59_; #line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_entry_set_text (_tmp59_, _tmp62_); + gtk_entry_set_text (_tmp57_, _tmp60_); #line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_free0 (_tmp62_); -#line 6201 "EditingTools.c" + _g_free0 (_tmp60_); +#line 6967 "EditingTools.c" } } } #line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp63_ = width; + _tmp61_ = width; #line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp64_ = height; + _tmp62_ = height; #line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->custom_aspect_ratio = ((gfloat) _tmp63_) / ((gfloat) _tmp64_); + self->priv->custom_aspect_ratio = ((gfloat) _tmp61_) / ((gfloat) _tmp62_); #line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp65_ = self->priv->scaled_crop; + _tmp63_ = self->priv->scaled_crop; #line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_constrain_crop (self, &_tmp65_, &_tmp66_); + editing_tools_crop_tool_constrain_crop (self, &_tmp63_, &_tmp64_); #line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_crop = _tmp66_; + new_crop = _tmp64_; #line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp67_ = new_crop; + _tmp65_ = new_crop; #line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_crop_resized (self, &_tmp67_); + editing_tools_crop_tool_crop_resized (self, &_tmp65_); #line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp68_ = new_crop; + _tmp66_ = new_crop; #line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->scaled_crop = _tmp68_; + self->priv->scaled_crop = _tmp66_; #line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp69_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp67_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp70_ = new_crop; + _tmp68_ = new_crop; #line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_invalidate_area (_tmp69_, &_tmp70_); + editing_tools_photo_canvas_invalidate_area (_tmp67_, &_tmp68_); #line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp71_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp69_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_repaint (_tmp71_); + editing_tools_photo_canvas_repaint (_tmp69_); #line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp72_ = width; + _tmp70_ = width; #line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->custom_width = _tmp72_; + self->priv->custom_width = _tmp70_; #line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp73_ = height; + _tmp71_ = height; #line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->custom_height = _tmp73_; + self->priv->custom_height = _tmp71_; #line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; #line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 6247 "EditingTools.c" +#line 7013 "EditingTools.c" } -static void editing_tools_crop_tool_on_width_insert_text (EditingToolsCropTool* self, const gchar* text, gint length, gint* position) { +static void +editing_tools_crop_tool_on_width_insert_text (EditingToolsCropTool* self, + const gchar* text, + gint length, + gint* position) +{ EditingToolsCropToolCropToolWindow* _tmp0_; GtkEntry* _tmp1_; - const gchar* _tmp2_; - gint _tmp3_; #line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); #line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -6261,20 +7030,19 @@ static void editing_tools_crop_tool_on_width_insert_text (EditingToolsCropTool* #line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->custom_width_entry; #line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = text; -#line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = length; -#line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, _tmp2_, _tmp3_, position); -#line 6270 "EditingTools.c" + editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, text, length, position); +#line 7035 "EditingTools.c" } -static void editing_tools_crop_tool_on_height_insert_text (EditingToolsCropTool* self, const gchar* text, gint length, gint* position) { +static void +editing_tools_crop_tool_on_height_insert_text (EditingToolsCropTool* self, + const gchar* text, + gint length, + gint* position) +{ EditingToolsCropToolCropToolWindow* _tmp0_; GtkEntry* _tmp1_; - const gchar* _tmp2_; - gint _tmp3_; #line 863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); #line 863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -6284,42 +7052,42 @@ static void editing_tools_crop_tool_on_height_insert_text (EditingToolsCropTool* #line 864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->custom_height_entry; #line 864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = text; -#line 864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = length; -#line 864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, _tmp2_, _tmp3_, position); -#line 6293 "EditingTools.c" + editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, text, length, position); +#line 7057 "EditingTools.c" } -static gchar string_get (const gchar* self, glong index) { +static gchar +string_get (const gchar* self, + glong index) +{ gchar result = '\0'; - glong _tmp0_; - gchar _tmp1_; -#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar _tmp0_; +#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = index; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = ((gchar*) self)[index]; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 6311 "EditingTools.c" +#line 7075 "EditingTools.c" } -static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool* self, GtkEntry* sender, const gchar* text, gint length, gint* position) { +static void +editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool* self, + GtkEntry* sender, + const gchar* text, + gint length, + gint* position) +{ gboolean _tmp0_; - gint _tmp1_; gchar* new_text = NULL; - gchar* _tmp5_; - const gchar* _tmp21_; - gint _tmp22_; - gint _tmp23_; - GtkEntry* _tmp29_; + gchar* _tmp3_; + const gchar* _tmp13_; + gint _tmp14_; + gint _tmp15_; #line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); #line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -6332,157 +7100,131 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool* if (_tmp0_) { #line 869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 6336 "EditingTools.c" +#line 7104 "EditingTools.c" } #line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->entry_insert_in_progress = TRUE; #line 873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = length; -#line 873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp1_ == -1) { -#line 6344 "EditingTools.c" - const gchar* _tmp2_; - gint _tmp3_; - gint _tmp4_; -#line 874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = text; + if (length == -1) { +#line 7110 "EditingTools.c" + gint _tmp1_; + gint _tmp2_; #line 874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = strlen (_tmp2_); + _tmp1_ = strlen (text); #line 874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - length = (gint) _tmp4_; -#line 6356 "EditingTools.c" + length = (gint) _tmp2_; +#line 7119 "EditingTools.c" } #line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = g_strdup (""); + _tmp3_ = g_strdup (""); #line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_text = _tmp5_; -#line 6362 "EditingTools.c" + new_text = _tmp3_; +#line 7125 "EditingTools.c" { gint ctr = 0; #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ctr = 0; -#line 6367 "EditingTools.c" +#line 7130 "EditingTools.c" { - gboolean _tmp6_ = FALSE; + gboolean _tmp4_ = FALSE; #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = TRUE; + _tmp4_ = TRUE; #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" while (TRUE) { -#line 6374 "EditingTools.c" - gint _tmp8_; - gint _tmp9_; - const gchar* _tmp10_; - gint _tmp11_; - gchar _tmp12_; - gboolean _tmp13_; +#line 7137 "EditingTools.c" + gint _tmp6_; + gint _tmp7_; #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (!_tmp6_) { -#line 6383 "EditingTools.c" - gint _tmp7_; + if (!_tmp4_) { +#line 7142 "EditingTools.c" + gint _tmp5_; #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = ctr; + _tmp5_ = ctr; #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - ctr = _tmp7_ + 1; -#line 6389 "EditingTools.c" + ctr = _tmp5_ + 1; +#line 7148 "EditingTools.c" } #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = FALSE; -#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = ctr; + _tmp4_ = FALSE; #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = length; + _tmp6_ = ctr; #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (!(_tmp8_ < _tmp9_)) { + if (!(_tmp6_ < length)) { #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 6401 "EditingTools.c" +#line 7158 "EditingTools.c" } #line 879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = text; + _tmp7_ = ctr; #line 879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = ctr; -#line 879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = string_get (_tmp10_, (glong) _tmp11_); -#line 879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = g_ascii_isdigit (_tmp12_); -#line 879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp13_) { -#line 6413 "EditingTools.c" - const gchar* _tmp14_; - const gchar* _tmp15_; - gint _tmp16_; - gchar _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; -#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = new_text; + if (g_ascii_isdigit (string_get (text, (glong) _tmp7_))) { +#line 7164 "EditingTools.c" + const gchar* _tmp8_; + gint _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; #line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = text; + _tmp8_ = new_text; #line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = ctr; + _tmp9_ = ctr; #line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = string_get (_tmp15_, (glong) _tmp16_); + _tmp10_ = g_strdup_printf ("%c", (gchar) string_get (text, (glong) _tmp9_)); #line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = g_strdup_printf ("%c", (gchar) _tmp17_); + _tmp11_ = _tmp10_; #line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = _tmp18_; -#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = g_strconcat (_tmp14_, _tmp19_, NULL); + _tmp12_ = g_strconcat (_tmp8_, _tmp11_, NULL); #line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (new_text); #line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_text = _tmp20_; + new_text = _tmp12_; #line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_free0 (_tmp19_); -#line 6441 "EditingTools.c" + _g_free0 (_tmp11_); +#line 7186 "EditingTools.c" } } } } #line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = new_text; + _tmp13_ = new_text; #line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = strlen (_tmp21_); + _tmp14_ = strlen (_tmp13_); #line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = _tmp22_; + _tmp15_ = _tmp14_; #line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp23_ > 0) { -#line 6454 "EditingTools.c" - GtkEntry* _tmp24_; - const gchar* _tmp25_; - const gchar* _tmp26_; - gint _tmp27_; - gint _tmp28_; -#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = sender; + if (_tmp15_ > 0) { +#line 7199 "EditingTools.c" + const gchar* _tmp16_; + const gchar* _tmp17_; + gint _tmp18_; + gint _tmp19_; #line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = new_text; + _tmp16_ = new_text; #line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp26_ = new_text; + _tmp17_ = new_text; #line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp27_ = strlen (_tmp26_); + _tmp18_ = strlen (_tmp17_); #line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_ = _tmp27_; + _tmp19_ = _tmp18_; #line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), _tmp25_, (gint) _tmp28_, position); -#line 6472 "EditingTools.c" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (sender, gtk_editable_get_type (), GtkEditable), "insert-text", _tmp16_, (gint) _tmp19_, position); +#line 7214 "EditingTools.c" } #line 887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp29_ = sender; -#line 887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_stop_emission_by_name (_tmp29_, "insert-text"); + g_signal_stop_emission_by_name (sender, "insert-text"); #line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->entry_insert_in_progress = FALSE; #line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (new_text); -#line 6482 "EditingTools.c" +#line 7222 "EditingTools.c" } -static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsCropTool* self) { +static gfloat +editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsCropTool* self) +{ gfloat result = 0.0F; gfloat _result_ = 0.0F; EditingToolsCropToolConstraintDescription* _tmp0_; @@ -6490,7 +7232,7 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC gfloat _tmp2_; gfloat _tmp3_; gfloat _tmp4_; - EditingToolsCropToolReticleOrientation _tmp20_; + EditingToolsCropToolReticleOrientation _tmp18_; #line 892 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0.0F); #line 893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -6509,7 +7251,7 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC _tmp4_ = _result_; #line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp4_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) { -#line 6513 "EditingTools.c" +#line 7255 "EditingTools.c" EditingToolsPhotoCanvas* _tmp5_; GdkRectangle _tmp6_ = {0}; gint _tmp7_; @@ -6530,21 +7272,19 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC _tmp10_ = _tmp9_.height; #line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_ = ((gfloat) _tmp7_) / ((gfloat) _tmp10_); -#line 6534 "EditingTools.c" +#line 7276 "EditingTools.c" } else { gfloat _tmp11_; #line 898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = _result_; #line 898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp11_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) { -#line 6541 "EditingTools.c" +#line 7283 "EditingTools.c" GdkScreen* screen = NULL; GdkScreen* _tmp12_; GdkScreen* _tmp13_; GdkScreen* _tmp14_; - gint _tmp15_; - GdkScreen* _tmp16_; - gint _tmp17_; + GdkScreen* _tmp15_; #line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = gdk_screen_get_default (); #line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -6554,59 +7294,58 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = screen; #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = gdk_screen_get_width (_tmp14_); + _tmp15_ = screen; #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = screen; -#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = gdk_screen_get_height (_tmp16_); -#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _result_ = ((gfloat) _tmp15_) / ((gfloat) _tmp17_); + _result_ = ((gfloat) gdk_screen_get_width (_tmp14_)) / ((gfloat) gdk_screen_get_height (_tmp15_)); #line 898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (screen); -#line 6567 "EditingTools.c" +#line 7303 "EditingTools.c" } else { - gfloat _tmp18_; + gfloat _tmp16_; #line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = _result_; + _tmp16_ = _result_; #line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) { -#line 6574 "EditingTools.c" - gfloat _tmp19_; + if (_tmp16_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) { +#line 7310 "EditingTools.c" + gfloat _tmp17_; #line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = self->priv->custom_aspect_ratio; + _tmp17_ = self->priv->custom_aspect_ratio; #line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _result_ = _tmp19_; -#line 6580 "EditingTools.c" + _result_ = _tmp17_; +#line 7316 "EditingTools.c" } } } #line 904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = self->priv->reticle_orientation; + _tmp18_ = self->priv->reticle_orientation; #line 904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp20_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) { -#line 6588 "EditingTools.c" - gfloat _tmp21_; + if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) { +#line 7324 "EditingTools.c" + gfloat _tmp19_; #line 905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = _result_; + _tmp19_ = _result_; #line 905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _result_ = 1.0f / _tmp21_; -#line 6594 "EditingTools.c" + _result_ = 1.0f / _tmp19_; +#line 7330 "EditingTools.c" } #line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _result_; #line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 6600 "EditingTools.c" +#line 7336 "EditingTools.c" } -static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint (EditingToolsCropTool* self, EditingToolsCropToolConstraintDescription* constraint, Photo* photo) { +static gfloat +editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint (EditingToolsCropTool* self, + EditingToolsCropToolConstraintDescription* constraint, + Photo* photo) +{ gfloat result = 0.0F; gfloat _result_ = 0.0F; - EditingToolsCropToolConstraintDescription* _tmp0_; + gfloat _tmp0_; gfloat _tmp1_; - gfloat _tmp2_; - EditingToolsCropToolReticleOrientation _tmp18_; + EditingToolsCropToolReticleOrientation _tmp14_; #line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0.0F); #line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -6614,120 +7353,110 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint #line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_PHOTO (photo), 0.0F); #line 911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = constraint; + _tmp0_ = constraint->aspect_ratio; #line 911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = _tmp0_->aspect_ratio; -#line 911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _result_ = _tmp1_; + _result_ = _tmp0_; #line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = _result_; + _tmp1_ = _result_; #line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp2_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) { -#line 6627 "EditingTools.c" + if (_tmp1_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) { +#line 7364 "EditingTools.c" Dimensions orig_dim = {0}; - Photo* _tmp3_; - Dimensions _tmp4_ = {0}; + Dimensions _tmp2_ = {0}; + Dimensions _tmp3_; + gint _tmp4_; Dimensions _tmp5_; gint _tmp6_; - Dimensions _tmp7_; - gint _tmp8_; -#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = photo; #line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - photo_get_original_dimensions (_tmp3_, &_tmp4_); + photo_get_original_dimensions (photo, &_tmp2_); #line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - orig_dim = _tmp4_; + orig_dim = _tmp2_; #line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = orig_dim; + _tmp3_ = orig_dim; #line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _tmp5_.width; + _tmp4_ = _tmp3_.width; #line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = orig_dim; + _tmp5_ = orig_dim; #line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = _tmp7_.height; + _tmp6_ = _tmp5_.height; #line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _result_ = ((gfloat) _tmp6_) / ((gfloat) _tmp8_); -#line 6651 "EditingTools.c" + _result_ = ((gfloat) _tmp4_) / ((gfloat) _tmp6_); +#line 7385 "EditingTools.c" } else { - gfloat _tmp9_; + gfloat _tmp7_; #line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = _result_; + _tmp7_ = _result_; #line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp9_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) { -#line 6658 "EditingTools.c" + if (_tmp7_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) { +#line 7392 "EditingTools.c" GdkScreen* screen = NULL; + GdkScreen* _tmp8_; + GdkScreen* _tmp9_; GdkScreen* _tmp10_; GdkScreen* _tmp11_; - GdkScreen* _tmp12_; - gint _tmp13_; - GdkScreen* _tmp14_; - gint _tmp15_; #line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = gdk_screen_get_default (); + _tmp8_ = gdk_screen_get_default (); #line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = _g_object_ref0 (_tmp10_); + _tmp9_ = _g_object_ref0 (_tmp8_); #line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - screen = _tmp11_; + screen = _tmp9_; #line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = screen; + _tmp10_ = screen; #line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = gdk_screen_get_width (_tmp12_); + _tmp11_ = screen; #line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = screen; -#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = gdk_screen_get_height (_tmp14_); -#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _result_ = ((gfloat) _tmp13_) / ((gfloat) _tmp15_); + _result_ = ((gfloat) gdk_screen_get_width (_tmp10_)) / ((gfloat) gdk_screen_get_height (_tmp11_)); #line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (screen); -#line 6684 "EditingTools.c" +#line 7412 "EditingTools.c" } else { - gfloat _tmp16_; + gfloat _tmp12_; #line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = _result_; + _tmp12_ = _result_; #line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp16_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) { -#line 6691 "EditingTools.c" - gfloat _tmp17_; + if (_tmp12_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) { +#line 7419 "EditingTools.c" + gfloat _tmp13_; #line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = self->priv->custom_aspect_ratio; + _tmp13_ = self->priv->custom_aspect_ratio; #line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _result_ = _tmp17_; -#line 6697 "EditingTools.c" + _result_ = _tmp13_; +#line 7425 "EditingTools.c" } } } #line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = self->priv->reticle_orientation; + _tmp14_ = self->priv->reticle_orientation; #line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) { -#line 6705 "EditingTools.c" - gfloat _tmp19_; + if (_tmp14_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) { +#line 7433 "EditingTools.c" + gfloat _tmp15_; #line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = _result_; + _tmp15_ = _result_; #line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _result_ = 1.0f / _tmp19_; -#line 6711 "EditingTools.c" + _result_ = 1.0f / _tmp15_; +#line 7439 "EditingTools.c" } #line 925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _result_; #line 925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 6717 "EditingTools.c" +#line 7445 "EditingTools.c" } -static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* self) { +static void +editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* self) +{ EditingToolsCropToolConstraintDescription* selected_constraint = NULL; EditingToolsCropToolConstraintDescription* _tmp0_; EditingToolsCropToolConstraintDescription* _tmp1_; gfloat _tmp2_; - EditingToolsCropToolConstraintDescription* _tmp13_; - EditingToolsCropToolConstraintDescription* _tmp14_; - gboolean _tmp15_; - gboolean _tmp16_; - gfloat _tmp17_; - gfloat _tmp18_; + EditingToolsCropToolConstraintDescription* _tmp11_; + EditingToolsCropToolConstraintDescription* _tmp12_; + gboolean _tmp13_; + gboolean _tmp14_; + gfloat _tmp15_; #line 929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); #line 930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -6742,7 +7471,7 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se if (_tmp2_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) { #line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_set_custom_constraint_mode (self); -#line 6746 "EditingTools.c" +#line 7475 "EditingTools.c" } else { EditingToolsCropToolConstraintDescription* _tmp3_; gfloat _tmp4_; @@ -6754,115 +7483,106 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se _tmp4_ = _tmp3_->aspect_ratio; #line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp4_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 6758 "EditingTools.c" +#line 7487 "EditingTools.c" ConfigFacade* _tmp5_; ConfigFacade* _tmp6_; - gint _tmp7_; + ConfigFacade* _tmp7_; ConfigFacade* _tmp8_; - ConfigFacade* _tmp9_; + gint _tmp9_; gint _tmp10_; - gint _tmp11_; - gint _tmp12_; #line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = config_facade_get_instance (); #line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_; #line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = configuration_facade_get_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->custom_init_width = _tmp7_; + self->priv->custom_init_width = configuration_facade_get_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp6_); #line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = config_facade_get_instance (); + _tmp7_ = config_facade_get_instance (); #line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = configuration_facade_get_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + self->priv->custom_init_height = configuration_facade_get_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->custom_init_height = _tmp10_; -#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = self->priv->custom_init_width; + _tmp9_ = self->priv->custom_init_width; #line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = self->priv->custom_init_height; + _tmp10_ = self->priv->custom_init_height; #line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->custom_aspect_ratio = ((gfloat) _tmp11_) / ((gfloat) _tmp12_); -#line 6793 "EditingTools.c" + self->priv->custom_aspect_ratio = ((gfloat) _tmp9_) / ((gfloat) _tmp10_); +#line 7516 "EditingTools.c" } } #line 946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_update_pivot_button_state (self); #line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = editing_tools_crop_tool_get_selected_constraint (self); + _tmp11_ = editing_tools_crop_tool_get_selected_constraint (self); #line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = _tmp14_->is_pivotable; + _tmp13_ = _tmp12_->is_pivotable; #line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = !_tmp15_; + _tmp14_ = !_tmp13_; #line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _editing_tools_crop_tool_constraint_description_unref0 (_tmp14_); + _editing_tools_crop_tool_constraint_description_unref0 (_tmp12_); #line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp16_) { + if (_tmp14_) { #line 949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->reticle_orientation = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE; -#line 6812 "EditingTools.c" +#line 7535 "EditingTools.c" } #line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); + _tmp15_ = self->priv->pre_aspect_ratio; #line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = self->priv->pre_aspect_ratio; -#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp17_ != _tmp18_) { -#line 6820 "EditingTools.c" + if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) != _tmp15_) { +#line 7541 "EditingTools.c" Box new_crop = {0}; + Box _tmp16_; + Box _tmp17_ = {0}; + Box _tmp18_; Box _tmp19_; - Box _tmp20_ = {0}; + EditingToolsPhotoCanvas* _tmp20_; Box _tmp21_; - Box _tmp22_; - EditingToolsPhotoCanvas* _tmp23_; - Box _tmp24_; - EditingToolsPhotoCanvas* _tmp25_; - gfloat _tmp26_; + EditingToolsPhotoCanvas* _tmp22_; #line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = self->priv->scaled_crop; + _tmp16_ = self->priv->scaled_crop; #line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_constrain_crop (self, &_tmp19_, &_tmp20_); + editing_tools_crop_tool_constrain_crop (self, &_tmp16_, &_tmp17_); #line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_crop = _tmp20_; + new_crop = _tmp17_; #line 954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = new_crop; + _tmp18_ = new_crop; #line 954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_crop_resized (self, &_tmp21_); + editing_tools_crop_tool_crop_resized (self, &_tmp18_); #line 955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = new_crop; + _tmp19_ = new_crop; #line 955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->scaled_crop = _tmp22_; + self->priv->scaled_crop = _tmp19_; #line 956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = new_crop; + _tmp21_ = new_crop; #line 956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_invalidate_area (_tmp23_, &_tmp24_); + editing_tools_photo_canvas_invalidate_area (_tmp20_, &_tmp21_); #line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_repaint (_tmp25_); -#line 959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp26_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); + editing_tools_photo_canvas_repaint (_tmp22_); #line 959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->pre_aspect_ratio = _tmp26_; -#line 6858 "EditingTools.c" + self->priv->pre_aspect_ratio = editing_tools_crop_tool_get_constraint_aspect_ratio (self); +#line 7576 "EditingTools.c" } #line 929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _editing_tools_crop_tool_constraint_description_unref0 (selected_constraint); -#line 6862 "EditingTools.c" +#line 7580 "EditingTools.c" } -static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCropTool* self) { +static void +editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCropTool* self) +{ EditingToolsCropToolConstraintMode _tmp0_; gboolean _tmp1_ = FALSE; EditingToolsCropToolCropToolWindow* _tmp2_; @@ -6915,7 +7635,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM) { #line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 6919 "EditingTools.c" +#line 7639 "EditingTools.c" } #line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->crop_tool_window; @@ -6925,7 +7645,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop if (_tmp3_ == -1) { #line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = TRUE; -#line 6929 "EditingTools.c" +#line 7649 "EditingTools.c" } else { EditingToolsCropToolCropToolWindow* _tmp4_; gint _tmp5_; @@ -6935,11 +7655,11 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop _tmp5_ = _tmp4_->normal_height; #line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp5_ == -1; -#line 6939 "EditingTools.c" +#line 7659 "EditingTools.c" } #line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp1_) { -#line 6943 "EditingTools.c" +#line 7663 "EditingTools.c" EditingToolsCropToolCropToolWindow* _tmp6_; EditingToolsCropToolCropToolWindow* _tmp7_; EditingToolsCropToolCropToolWindow* _tmp8_; @@ -6957,7 +7677,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop _tmp7_->normal_width = _tmp9_; #line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_->normal_height = _tmp10_; -#line 6961 "EditingTools.c" +#line 7681 "EditingTools.c" } #line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = self->priv->crop_tool_window; @@ -7053,7 +7773,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop _tmp47_ = self->priv->reticle_orientation; #line 982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp47_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE) { -#line 7057 "EditingTools.c" +#line 7777 "EditingTools.c" EditingToolsCropToolCropToolWindow* _tmp48_; GtkEntry* _tmp49_; gint _tmp50_; @@ -7092,7 +7812,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop gtk_entry_set_text (_tmp54_, _tmp57_); #line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (_tmp57_); -#line 7096 "EditingTools.c" +#line 7816 "EditingTools.c" } else { EditingToolsCropToolCropToolWindow* _tmp58_; GtkEntry* _tmp59_; @@ -7132,7 +7852,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop gtk_entry_set_text (_tmp64_, _tmp67_); #line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (_tmp67_); -#line 7136 "EditingTools.c" +#line 7856 "EditingTools.c" } #line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp68_ = self->priv->custom_init_width; @@ -7146,11 +7866,13 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_widget_get_type (), GtkWidget)); #line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM; -#line 7150 "EditingTools.c" +#line 7870 "EditingTools.c" } -static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCropTool* self) { +static void +editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCropTool* self) +{ EditingToolsCropToolConstraintMode _tmp0_; EditingToolsCropToolCropToolWindow* _tmp1_; GtkBox* _tmp2_; @@ -7202,7 +7924,7 @@ static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCrop if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL) { #line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 7206 "EditingTools.c" +#line 7928 "EditingTools.c" } #line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->crop_tool_window; @@ -7312,167 +8034,146 @@ static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCrop gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget)); #line 1016 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL; -#line 7316 "EditingTools.c" +#line 8038 "EditingTools.c" } -static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self, Box* crop, Box* result) { +static void +editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self, + Box* crop, + Box* result) +{ gfloat user_aspect_ratio = 0.0F; gfloat _tmp0_; - gfloat _tmp1_; gfloat old_area = 0.0F; - gint _tmp3_; - gint _tmp4_; + gfloat _tmp2_; + gfloat _tmp3_; + gfloat _tmp4_; gfloat _tmp5_; - gfloat _tmp6_; - gdouble _tmp7_; - gfloat _tmp8_; - gfloat _tmp9_; - gdouble _tmp10_; Dimensions image_size = {0}; - Dimensions _tmp11_ = {0}; + Dimensions _tmp6_ = {0}; gdouble angle = 0.0; - EditingToolsPhotoCanvas* _tmp12_; - Photo* _tmp13_; - Photo* _tmp14_; - gdouble _tmp15_ = 0.0; - Box _tmp16_; - Dimensions _tmp17_; - gint _tmp18_; - Dimensions _tmp19_; - gint _tmp20_; - gdouble _tmp21_; - Box _tmp22_ = {0}; - gint _tmp23_; - gint _tmp24_; - gfloat _tmp25_; - Box _tmp30_; + EditingToolsPhotoCanvas* _tmp7_; + Photo* _tmp8_; + Photo* _tmp9_; + gdouble _tmp10_ = 0.0; + Box _tmp11_; + Dimensions _tmp12_; + gint _tmp13_; + Dimensions _tmp14_; + gint _tmp15_; + gdouble _tmp16_; + Box _tmp17_ = {0}; + gfloat _tmp18_; + Box _tmp21_; #line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); #line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (crop != NULL); #line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - user_aspect_ratio = _tmp0_; + user_aspect_ratio = editing_tools_crop_tool_get_constraint_aspect_ratio (self); #line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = user_aspect_ratio; + _tmp0_ = user_aspect_ratio; #line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp1_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 7363 "EditingTools.c" - Box _tmp2_; + if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { +#line 8080 "EditingTools.c" + Box _tmp1_; #line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = *crop; + _tmp1_ = *crop; #line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - *result = _tmp2_; + *result = _tmp1_; #line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 7371 "EditingTools.c" +#line 8088 "EditingTools.c" } #line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = box_get_width (crop); -#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = box_get_height (crop); -#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - old_area = (gfloat) (_tmp3_ * _tmp4_); + old_area = (gfloat) (box_get_width (crop) * box_get_height (crop)); #line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = old_area; + _tmp2_ = old_area; #line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = user_aspect_ratio; + _tmp3_ = user_aspect_ratio; #line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = sqrt ((gdouble) (_tmp5_ / _tmp6_)); -#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - box_adjust_height (crop, (gint) _tmp7_); -#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = old_area; + box_adjust_height (crop, (gint) sqrt ((gdouble) (_tmp2_ / _tmp3_))); #line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = user_aspect_ratio; + _tmp4_ = old_area; #line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = sqrt ((gdouble) (_tmp8_ * _tmp9_)); + _tmp5_ = user_aspect_ratio; #line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - box_adjust_width (crop, (gint) _tmp10_); + box_adjust_width (crop, (gint) sqrt ((gdouble) (_tmp4_ * _tmp5_))); #line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_get_photo_dimensions (self, &_tmp11_); + editing_tools_crop_tool_get_photo_dimensions (self, &_tmp6_); #line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - image_size = _tmp11_; + image_size = _tmp6_; #line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = editing_tools_photo_canvas_get_photo (_tmp12_); + _tmp8_ = editing_tools_photo_canvas_get_photo (_tmp7_); #line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = _tmp13_; + _tmp9_ = _tmp8_; #line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - photo_get_straighten (_tmp14_, &_tmp15_); + photo_get_straighten (_tmp9_, &_tmp10_); #line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - angle = _tmp15_; + angle = _tmp10_; #line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp9_); #line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = *crop; + _tmp11_ = *crop; #line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = image_size; + _tmp12_ = image_size; #line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = _tmp17_.width; + _tmp13_ = _tmp12_.width; #line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = image_size; + _tmp14_ = image_size; #line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = _tmp19_.height; + _tmp15_ = _tmp14_.height; #line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = angle; + _tmp16_ = angle; #line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - clamp_inside_rotated_image (&_tmp16_, _tmp18_, _tmp20_, _tmp21_, FALSE, &_tmp22_); + clamp_inside_rotated_image (&_tmp11_, _tmp13_, _tmp15_, _tmp16_, FALSE, &_tmp17_); #line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - *crop = _tmp22_; -#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = box_get_width (crop); + *crop = _tmp17_; #line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = box_get_height (crop); + _tmp18_ = user_aspect_ratio; #line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = user_aspect_ratio; -#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (((gfloat) _tmp23_) >= (_tmp24_ * _tmp25_)) { -#line 7435 "EditingTools.c" - gint _tmp26_; - gfloat _tmp27_; -#line 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp26_ = box_get_height (crop); + if (((gfloat) box_get_width (crop)) >= (box_get_height (crop) * _tmp18_)) { +#line 8140 "EditingTools.c" + gfloat _tmp19_; #line 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp27_ = user_aspect_ratio; + _tmp19_ = user_aspect_ratio; #line 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - box_adjust_width (crop, (gint) (_tmp26_ * _tmp27_)); -#line 7444 "EditingTools.c" + box_adjust_width (crop, (gint) (box_get_height (crop) * _tmp19_)); +#line 8146 "EditingTools.c" } else { - gint _tmp28_; - gfloat _tmp29_; -#line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_ = box_get_width (crop); + gfloat _tmp20_; #line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp29_ = user_aspect_ratio; + _tmp20_ = user_aspect_ratio; #line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - box_adjust_height (crop, (gint) (_tmp28_ / _tmp29_)); -#line 7454 "EditingTools.c" + box_adjust_height (crop, (gint) (box_get_width (crop) / _tmp20_)); +#line 8153 "EditingTools.c" } #line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp30_ = *crop; + _tmp21_ = *crop; #line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - *result = _tmp30_; + *result = _tmp21_; #line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 7462 "EditingTools.c" +#line 8161 "EditingTools.c" } -static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_last_constraint (EditingToolsCropTool* self, gint* index) { +static EditingToolsCropToolConstraintDescription* +editing_tools_crop_tool_get_last_constraint (EditingToolsCropTool* self, + gint* index) +{ gint _vala_index = 0; EditingToolsCropToolConstraintDescription* result = NULL; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - gint _tmp2_; - EditingToolsCropToolConstraintDescription* _tmp3_ = NULL; - gint _tmp4_; - EditingToolsCropToolConstraintDescription** _tmp5_; - gint _tmp5__length1; - EditingToolsCropToolConstraintDescription* _tmp9_; + EditingToolsCropToolConstraintDescription* _tmp2_ = NULL; + gint _tmp3_; + EditingToolsCropToolConstraintDescription** _tmp4_; + gint _tmp4__length1; + EditingToolsCropToolConstraintDescription* _tmp8_; #line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), NULL); #line 1045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -7480,406 +8181,360 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_la #line 1045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_; #line 1045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = configuration_facade_get_last_crop_menu_choice (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 1045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _vala_index = _tmp2_; + _vala_index = configuration_facade_get_last_crop_menu_choice (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 1045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp1_); #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = _vala_index; + _tmp3_ = _vala_index; #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = self->priv->constraints; + _tmp4_ = self->priv->constraints; #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5__length1 = self->priv->constraints_length1; + _tmp4__length1 = self->priv->constraints_length1; #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp4_ < _tmp5__length1) { -#line 7497 "EditingTools.c" - EditingToolsCropToolConstraintDescription** _tmp6_; - gint _tmp6__length1; - gint _tmp7_; - EditingToolsCropToolConstraintDescription* _tmp8_; + if (_tmp3_ < _tmp4__length1) { +#line 8196 "EditingTools.c" + EditingToolsCropToolConstraintDescription** _tmp5_; + gint _tmp5__length1; + gint _tmp6_; + EditingToolsCropToolConstraintDescription* _tmp7_; #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = self->priv->constraints; + _tmp5_ = self->priv->constraints; #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6__length1 = self->priv->constraints_length1; + _tmp5__length1 = self->priv->constraints_length1; #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = _vala_index; + _tmp6_ = _vala_index; #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = _tmp6_[_tmp7_]; + _tmp7_ = _tmp5_[_tmp6_]; #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = _tmp8_; -#line 7512 "EditingTools.c" + _tmp2_ = _tmp7_; +#line 8211 "EditingTools.c" } else { #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = NULL; -#line 7516 "EditingTools.c" + _tmp2_ = NULL; +#line 8215 "EditingTools.c" } #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp3_); + _tmp8_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp2_); #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - result = _tmp9_; + result = _tmp8_; #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (index) { #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *index = _vala_index; -#line 7526 "EditingTools.c" +#line 8225 "EditingTools.c" } #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 7530 "EditingTools.c" +#line 8229 "EditingTools.c" } -static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas) { +static void +editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base, + EditingToolsPhotoCanvas* canvas) +{ EditingToolsCropTool * self; - EditingToolsPhotoCanvas* _tmp0_; - EditingToolsPhotoCanvas* _tmp1_; - cairo_t* _tmp2_; - cairo_t* _tmp3_; - EditingToolsPhotoCanvas* _tmp4_; - Dimensions _tmp5_ = {0}; - cairo_surface_t* _tmp6_; - EditingToolsPhotoCanvas* _tmp7_; - GdkRectangle _tmp8_ = {0}; - gint _tmp9_; - EditingToolsPhotoCanvas* _tmp10_; - GdkRectangle _tmp11_ = {0}; - gint _tmp12_; - cairo_surface_t* _tmp13_; + cairo_t* _tmp0_; + cairo_t* _tmp1_; + Dimensions _tmp2_ = {0}; + cairo_surface_t* _tmp3_; + GdkRectangle _tmp4_ = {0}; + gint _tmp5_; + GdkRectangle _tmp6_ = {0}; + gint _tmp7_; + cairo_surface_t* _tmp8_; cairo_t* ctx = NULL; - cairo_surface_t* _tmp14_; - cairo_t* _tmp15_; - cairo_t* _tmp16_; - cairo_t* _tmp17_; - EditingToolsPhotoCanvas* _tmp18_; - GtkWindow* _tmp19_; - GtkWindow* _tmp20_; - EditingToolsCropToolCropToolWindow* _tmp21_; - EditingToolsCropToolCropToolWindow* _tmp22_; - GtkComboBox* _tmp23_; - GtkListStore* _tmp24_; - EditingToolsPhotoCanvas* _tmp25_; - Photo* _tmp26_; - Photo* _tmp27_; - gboolean _tmp28_; - gboolean _tmp29_; + cairo_surface_t* _tmp9_; + cairo_t* _tmp10_; + cairo_t* _tmp11_; + cairo_t* _tmp12_; + GtkWindow* _tmp13_; + GtkWindow* _tmp14_; + EditingToolsCropToolCropToolWindow* _tmp15_; + EditingToolsCropToolCropToolWindow* _tmp16_; + GtkComboBox* _tmp17_; + GtkListStore* _tmp18_; + Photo* _tmp19_; + Photo* _tmp20_; + gboolean _tmp21_; Dimensions uncropped_dim = {0}; - EditingToolsPhotoCanvas* _tmp61_; - Photo* _tmp62_; - Photo* _tmp63_; - Dimensions _tmp64_ = {0}; - Dimensions _tmp65_; + Photo* _tmp49_; + Photo* _tmp50_; + Dimensions _tmp51_ = {0}; + Dimensions _tmp52_; Box crop = {0}; - EditingToolsPhotoCanvas* _tmp66_; - Photo* _tmp67_; - Photo* _tmp68_; - Box _tmp69_ = {0}; - gboolean _tmp70_; - gboolean _tmp71_; - Dimensions _tmp84_; - EditingToolsPhotoCanvas* _tmp85_; - GdkRectangle _tmp86_ = {0}; - Dimensions _tmp87_ = {0}; - Box _tmp88_ = {0}; - ConfigFacade* _tmp89_; - ConfigFacade* _tmp90_; - gint _tmp91_; - ConfigFacade* _tmp92_; - ConfigFacade* _tmp93_; - gint _tmp94_; - gint _tmp95_; - gint _tmp96_; - gint _tmp97_; - gint _tmp98_; - EditingToolsPhotoCanvas* _tmp99_; - EditingToolsCropToolCropToolWindow* _tmp100_; - EditingToolsPhotoCanvas* _tmp101_; - Photo* _tmp102_; - Photo* _tmp103_; - gboolean _tmp104_; - gboolean _tmp105_; + Photo* _tmp53_; + Photo* _tmp54_; + Box _tmp55_ = {0}; + gboolean _tmp56_; + gboolean _tmp57_; + Dimensions _tmp70_; + GdkRectangle _tmp71_ = {0}; + Dimensions _tmp72_ = {0}; + Box _tmp73_ = {0}; + ConfigFacade* _tmp74_; + ConfigFacade* _tmp75_; + ConfigFacade* _tmp76_; + ConfigFacade* _tmp77_; + gint _tmp78_; + gint _tmp79_; + gint _tmp80_; + gint _tmp81_; + EditingToolsCropToolCropToolWindow* _tmp82_; + Photo* _tmp83_; + Photo* _tmp84_; + gboolean _tmp85_; Box new_crop = {0}; - Box _tmp114_; - Box _tmp115_ = {0}; - Box _tmp116_; - Box _tmp117_; - EditingToolsPhotoCanvas* _tmp118_; - Box _tmp119_; - EditingToolsPhotoCanvas* _tmp120_; - gfloat _tmp121_; + Box _tmp93_; + Box _tmp94_ = {0}; + Box _tmp95_; + Box _tmp96_; + Box _tmp97_; #line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool); #line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); #line 1051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = canvas; -#line 1051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_bind_canvas_handlers (self, _tmp0_); -#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = canvas; -#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = editing_tools_photo_canvas_get_default_ctx (_tmp1_); + editing_tools_crop_tool_bind_canvas_handlers (self, canvas); #line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = _tmp2_; + _tmp0_ = editing_tools_photo_canvas_get_default_ctx (canvas); #line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = canvas; + _tmp1_ = _tmp0_; #line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_get_surface_dim (_tmp4_, &_tmp5_); + editing_tools_photo_canvas_get_surface_dim (canvas, &_tmp2_); #line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_prepare_ctx (self, _tmp3_, &_tmp5_); + editing_tools_crop_tool_prepare_ctx (self, _tmp1_, &_tmp2_); #line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _cairo_destroy0 (_tmp3_); + _cairo_destroy0 (_tmp1_); #line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = self->priv->crop_surface; + _tmp3_ = self->priv->crop_surface; #line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp6_ != NULL) { + if (_tmp3_ != NULL) { #line 1056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_surface_destroy0 (self->priv->crop_surface); #line 1056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->crop_surface = NULL; -#line 7641 "EditingTools.c" +#line 8318 "EditingTools.c" } #line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = canvas; + editing_tools_photo_canvas_get_scaled_pixbuf_position (canvas, &_tmp4_); #line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp7_, &_tmp8_); -#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = _tmp8_.width; -#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = canvas; + _tmp5_ = _tmp4_.width; #line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp10_, &_tmp11_); + editing_tools_photo_canvas_get_scaled_pixbuf_position (canvas, &_tmp6_); #line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = _tmp11_.height; + _tmp7_ = _tmp6_.height; #line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp9_, _tmp12_); + _tmp8_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp5_, _tmp7_); #line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_surface_destroy0 (self->priv->crop_surface); #line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->crop_surface = _tmp13_; + self->priv->crop_surface = _tmp8_; #line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = self->priv->crop_surface; + _tmp9_ = self->priv->crop_surface; #line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = cairo_create (_tmp14_); + _tmp10_ = cairo_create (_tmp9_); #line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - ctx = _tmp15_; + ctx = _tmp10_; #line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = ctx; + _tmp11_ = ctx; #line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_source_rgba (_tmp16_, 0.0, 0.0, 0.0, 1.0); + cairo_set_source_rgba (_tmp11_, 0.0, 0.0, 0.0, 1.0); #line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = ctx; + _tmp12_ = ctx; #line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_paint (_tmp17_); + cairo_paint (_tmp12_); #line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = canvas; + _tmp13_ = editing_tools_photo_canvas_get_container (canvas); #line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = editing_tools_photo_canvas_get_container (_tmp18_); -#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = _tmp19_; + _tmp14_ = _tmp13_; #line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = editing_tools_crop_tool_crop_tool_window_new (_tmp20_); + _tmp15_ = editing_tools_crop_tool_crop_tool_window_new (_tmp14_); #line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp21_); + g_object_ref_sink (_tmp15_); #line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->crop_tool_window); #line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->crop_tool_window = _tmp21_; + self->priv->crop_tool_window = _tmp15_; #line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp14_); #line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = self->priv->crop_tool_window; + _tmp16_ = self->priv->crop_tool_window; #line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = _tmp22_->constraint_combo; + _tmp17_ = _tmp16_->constraint_combo; #line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = self->priv->constraint_list; + _tmp18_ = self->priv->constraint_list; #line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_combo_box_set_model (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_TREE_MODEL, GtkTreeModel)); -#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = canvas; + gtk_combo_box_set_model (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_tree_model_get_type (), GtkTreeModel)); #line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp26_ = editing_tools_photo_canvas_get_photo (_tmp25_); -#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp27_ = _tmp26_; + _tmp19_ = editing_tools_photo_canvas_get_photo (canvas); #line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_ = photo_has_crop (_tmp27_); + _tmp20_ = _tmp19_; #line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp29_ = !_tmp28_; + _tmp21_ = !photo_has_crop (_tmp20_); #line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp27_); + _g_object_unref0 (_tmp20_); #line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp29_) { -#line 7713 "EditingTools.c" + if (_tmp21_) { +#line 8380 "EditingTools.c" gint index = 0; EditingToolsCropToolConstraintDescription* desc = NULL; - gint _tmp30_ = 0; - EditingToolsCropToolConstraintDescription* _tmp31_; - gboolean _tmp32_ = FALSE; - EditingToolsCropToolConstraintDescription* _tmp33_; + gint _tmp22_ = 0; + EditingToolsCropToolConstraintDescription* _tmp23_; + gboolean _tmp24_ = FALSE; + EditingToolsCropToolConstraintDescription* _tmp25_; #line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp31_ = editing_tools_crop_tool_get_last_constraint (self, &_tmp30_); + _tmp23_ = editing_tools_crop_tool_get_last_constraint (self, &_tmp22_); #line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - index = _tmp30_; + index = _tmp22_; #line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - desc = _tmp31_; + desc = _tmp23_; #line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp33_ = desc; + _tmp25_ = desc; #line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp33_ != NULL) { -#line 7730 "EditingTools.c" - EditingToolsCropToolConstraintDescription* _tmp34_; - gboolean _tmp35_; + if (_tmp25_ != NULL) { +#line 8397 "EditingTools.c" + EditingToolsCropToolConstraintDescription* _tmp26_; #line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp34_ = desc; + _tmp26_ = desc; #line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp35_ = editing_tools_crop_tool_constraint_description_is_separator (_tmp34_); -#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp32_ = !_tmp35_; -#line 7739 "EditingTools.c" + _tmp24_ = !editing_tools_crop_tool_constraint_description_is_separator (_tmp26_); +#line 8403 "EditingTools.c" } else { #line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp32_ = FALSE; -#line 7743 "EditingTools.c" + _tmp24_ = FALSE; +#line 8407 "EditingTools.c" } #line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp32_) { -#line 7747 "EditingTools.c" - EditingToolsCropToolCropToolWindow* _tmp36_; - GtkComboBox* _tmp37_; - gint _tmp38_; + if (_tmp24_) { +#line 8411 "EditingTools.c" + EditingToolsCropToolCropToolWindow* _tmp27_; + GtkComboBox* _tmp28_; + gint _tmp29_; #line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp36_ = self->priv->crop_tool_window; + _tmp27_ = self->priv->crop_tool_window; #line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp37_ = _tmp36_->constraint_combo; + _tmp28_ = _tmp27_->constraint_combo; #line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp38_ = index; + _tmp29_ = index; #line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_combo_box_set_active (_tmp37_, _tmp38_); -#line 7759 "EditingTools.c" + gtk_combo_box_set_active (_tmp28_, _tmp29_); +#line 8423 "EditingTools.c" } #line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _editing_tools_crop_tool_constraint_description_unref0 (desc); -#line 7763 "EditingTools.c" +#line 8427 "EditingTools.c" } else { Photo* photo = NULL; - EditingToolsPhotoCanvas* _tmp39_; - Photo* _tmp40_; + Photo* _tmp30_; Dimensions cropped_dim = {0}; - Photo* _tmp41_; - Dimensions _tmp42_ = {0}; + Photo* _tmp31_; + Dimensions _tmp32_ = {0}; gfloat ratio = 0.0F; - Dimensions _tmp43_; - gint _tmp44_; - Dimensions _tmp45_; - gint _tmp46_; -#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp39_ = canvas; + Dimensions _tmp33_; + gint _tmp34_; + Dimensions _tmp35_; + gint _tmp36_; #line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp40_ = editing_tools_photo_canvas_get_photo (_tmp39_); + _tmp30_ = editing_tools_photo_canvas_get_photo (canvas); #line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - photo = _tmp40_; + photo = _tmp30_; #line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp41_ = photo; + _tmp31_ = photo; #line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp42_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp32_); #line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cropped_dim = _tmp42_; + cropped_dim = _tmp32_; #line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp43_ = cropped_dim; + _tmp33_ = cropped_dim; #line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp44_ = _tmp43_.width; + _tmp34_ = _tmp33_.width; #line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp45_ = cropped_dim; + _tmp35_ = cropped_dim; #line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp46_ = _tmp45_.height; + _tmp36_ = _tmp35_.height; #line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - ratio = ((gfloat) _tmp44_) / ((gfloat) _tmp46_); -#line 7798 "EditingTools.c" + ratio = ((gfloat) _tmp34_) / ((gfloat) _tmp36_); +#line 8459 "EditingTools.c" { gint index = 0; #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" index = 1; -#line 7803 "EditingTools.c" +#line 8464 "EditingTools.c" { - gboolean _tmp47_ = FALSE; + gboolean _tmp37_ = FALSE; #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp47_ = TRUE; + _tmp37_ = TRUE; #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" while (TRUE) { -#line 7810 "EditingTools.c" - gint _tmp49_; - EditingToolsCropToolConstraintDescription** _tmp50_; - gint _tmp50__length1; - gfloat _tmp51_; - EditingToolsCropToolConstraintDescription** _tmp52_; - gint _tmp52__length1; - gint _tmp53_; - EditingToolsCropToolConstraintDescription* _tmp54_; - Photo* _tmp55_; - gfloat _tmp56_; - gdouble _tmp57_; +#line 8471 "EditingTools.c" + gint _tmp39_; + EditingToolsCropToolConstraintDescription** _tmp40_; + gint _tmp40__length1; + gfloat _tmp41_; + EditingToolsCropToolConstraintDescription** _tmp42_; + gint _tmp42__length1; + gint _tmp43_; + EditingToolsCropToolConstraintDescription* _tmp44_; + Photo* _tmp45_; #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (!_tmp47_) { -#line 7824 "EditingTools.c" - gint _tmp48_; + if (!_tmp37_) { +#line 8483 "EditingTools.c" + gint _tmp38_; #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp48_ = index; + _tmp38_ = index; #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - index = _tmp48_ + 1; -#line 7830 "EditingTools.c" + index = _tmp38_ + 1; +#line 8489 "EditingTools.c" } #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp47_ = FALSE; + _tmp37_ = FALSE; #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp49_ = index; + _tmp39_ = index; #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp50_ = self->priv->constraints; + _tmp40_ = self->priv->constraints; #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp50__length1 = self->priv->constraints_length1; + _tmp40__length1 = self->priv->constraints_length1; #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (!(_tmp49_ < _tmp50__length1)) { + if (!(_tmp39_ < _tmp40__length1)) { #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 7844 "EditingTools.c" +#line 8503 "EditingTools.c" } #line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp51_ = ratio; -#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp52_ = self->priv->constraints; + _tmp41_ = ratio; #line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp52__length1 = self->priv->constraints_length1; + _tmp42_ = self->priv->constraints; #line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp53_ = index; + _tmp42__length1 = self->priv->constraints_length1; #line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp54_ = _tmp52_[_tmp53_]; + _tmp43_ = index; #line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp55_ = photo; + _tmp44_ = _tmp42_[_tmp43_]; #line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp56_ = editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint (self, _tmp54_, _tmp55_); + _tmp45_ = photo; #line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp57_ = fabs ((gdouble) (_tmp51_ - _tmp56_)); -#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp57_ < 0.005) { -#line 7864 "EditingTools.c" - EditingToolsCropToolCropToolWindow* _tmp58_; - GtkComboBox* _tmp59_; - gint _tmp60_; + if (fabs ((gdouble) (_tmp41_ - editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint (self, _tmp44_, _tmp45_))) < 0.005) { +#line 8519 "EditingTools.c" + EditingToolsCropToolCropToolWindow* _tmp46_; + GtkComboBox* _tmp47_; + gint _tmp48_; #line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp58_ = self->priv->crop_tool_window; + _tmp46_ = self->priv->crop_tool_window; #line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp59_ = _tmp58_->constraint_combo; + _tmp47_ = _tmp46_->constraint_combo; #line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp60_ = index; + _tmp48_ = index; #line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_combo_box_set_active (_tmp59_, _tmp60_); -#line 7876 "EditingTools.c" + gtk_combo_box_set_active (_tmp47_, _tmp48_); +#line 8531 "EditingTools.c" } } } } #line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (photo); -#line 7883 "EditingTools.c" +#line 8538 "EditingTools.c" } #line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_update_pivot_button_state (self); @@ -7888,361 +8543,375 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base #line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_bind_window_handlers (self); #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp61_ = canvas; -#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp62_ = editing_tools_photo_canvas_get_photo (_tmp61_); + _tmp49_ = editing_tools_photo_canvas_get_photo (canvas); #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp63_ = _tmp62_; + _tmp50_ = _tmp49_; #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp64_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp51_); #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp65_ = _tmp64_; + _tmp52_ = _tmp51_; #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp63_); + _g_object_unref0 (_tmp50_); #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - uncropped_dim = _tmp65_; + uncropped_dim = _tmp52_; #line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp66_ = canvas; + _tmp53_ = editing_tools_photo_canvas_get_photo (canvas); #line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp67_ = editing_tools_photo_canvas_get_photo (_tmp66_); + _tmp54_ = _tmp53_; #line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp68_ = _tmp67_; + _tmp56_ = photo_get_crop (_tmp54_, &_tmp55_, PHOTO_EXCEPTION_NONE); #line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp70_ = photo_get_crop (_tmp68_, &_tmp69_, PHOTO_EXCEPTION_NONE); + crop = _tmp55_; #line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - crop = _tmp69_; + _tmp57_ = !_tmp56_; #line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp71_ = !_tmp70_; + _g_object_unref0 (_tmp54_); #line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp68_); -#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp71_) { -#line 7921 "EditingTools.c" + if (_tmp57_) { +#line 8572 "EditingTools.c" gint xofs = 0; - Dimensions _tmp72_; - gint _tmp73_; + Dimensions _tmp58_; + gint _tmp59_; gint yofs = 0; - Dimensions _tmp74_; - gint _tmp75_; - gint _tmp76_; - gint _tmp77_; - Dimensions _tmp78_; - gint _tmp79_; - gint _tmp80_; - Dimensions _tmp81_; - gint _tmp82_; - gint _tmp83_; + Dimensions _tmp60_; + gint _tmp61_; + gint _tmp62_; + gint _tmp63_; + Dimensions _tmp64_; + gint _tmp65_; + gint _tmp66_; + Dimensions _tmp67_; + gint _tmp68_; + gint _tmp69_; #line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp72_ = uncropped_dim; + _tmp58_ = uncropped_dim; #line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp73_ = _tmp72_.width; + _tmp59_ = _tmp58_.width; #line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - xofs = (gint) (_tmp73_ * EDITING_TOOLS_CROP_TOOL_CROP_INIT_X_PCT); + xofs = (gint) (_tmp59_ * EDITING_TOOLS_CROP_TOOL_CROP_INIT_X_PCT); #line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp74_ = uncropped_dim; + _tmp60_ = uncropped_dim; #line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp75_ = _tmp74_.height; + _tmp61_ = _tmp60_.height; #line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - yofs = (gint) (_tmp75_ * EDITING_TOOLS_CROP_TOOL_CROP_INIT_Y_PCT); + yofs = (gint) (_tmp61_ * EDITING_TOOLS_CROP_TOOL_CROP_INIT_Y_PCT); #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp76_ = xofs; + _tmp62_ = xofs; #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp77_ = yofs; + _tmp63_ = yofs; #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp78_ = uncropped_dim; + _tmp64_ = uncropped_dim; #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp79_ = _tmp78_.width; + _tmp65_ = _tmp64_.width; #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp80_ = xofs; + _tmp66_ = xofs; #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp81_ = uncropped_dim; + _tmp67_ = uncropped_dim; #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp82_ = _tmp81_.height; + _tmp68_ = _tmp67_.height; #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp83_ = yofs; + _tmp69_ = yofs; #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - box_init (&crop, _tmp76_, _tmp77_, _tmp79_ - _tmp80_, _tmp82_ - _tmp83_); -#line 7966 "EditingTools.c" + box_init (&crop, _tmp62_, _tmp63_, _tmp65_ - _tmp66_, _tmp68_ - _tmp69_); +#line 8617 "EditingTools.c" } #line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp84_ = uncropped_dim; -#line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp85_ = canvas; + _tmp70_ = uncropped_dim; #line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp85_, &_tmp86_); + editing_tools_photo_canvas_get_scaled_pixbuf_position (canvas, &_tmp71_); #line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - dimensions_for_rectangle (&_tmp86_, &_tmp87_); + dimensions_for_rectangle (&_tmp71_, &_tmp72_); #line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - box_get_scaled_similar (&crop, &_tmp84_, &_tmp87_, &_tmp88_); + box_get_scaled_similar (&crop, &_tmp70_, &_tmp72_, &_tmp73_); #line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->scaled_crop = _tmp88_; + self->priv->scaled_crop = _tmp73_; #line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp89_ = config_facade_get_instance (); + _tmp74_ = config_facade_get_instance (); #line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp90_ = _tmp89_; + _tmp75_ = _tmp74_; #line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp91_ = configuration_facade_get_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + self->priv->custom_width = configuration_facade_get_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->custom_width = _tmp91_; -#line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp90_); -#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp92_ = config_facade_get_instance (); + _g_object_unref0 (_tmp75_); #line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp93_ = _tmp92_; + _tmp76_ = config_facade_get_instance (); #line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp94_ = configuration_facade_get_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp77_ = _tmp76_; #line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->custom_height = _tmp94_; + self->priv->custom_height = configuration_facade_get_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp93_); + _g_object_unref0 (_tmp77_); #line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp95_ = self->priv->custom_width; + _tmp78_ = self->priv->custom_width; #line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->custom_init_width = _tmp95_; + self->priv->custom_init_width = _tmp78_; #line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp96_ = self->priv->custom_height; + _tmp79_ = self->priv->custom_height; #line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->custom_init_height = _tmp96_; + self->priv->custom_init_height = _tmp79_; #line 1118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp97_ = self->priv->custom_init_width; + _tmp80_ = self->priv->custom_init_width; #line 1118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp98_ = self->priv->custom_init_height; + _tmp81_ = self->priv->custom_init_height; #line 1118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->pre_aspect_ratio = ((gfloat) _tmp97_) / ((gfloat) _tmp98_); + self->priv->pre_aspect_ratio = ((gfloat) _tmp80_) / ((gfloat) _tmp81_); #line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL; #line 1122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp99_ = canvas; -#line 1122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp99_); + EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), canvas); #line 1124 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp100_ = self->priv->crop_tool_window; + _tmp82_ = self->priv->crop_tool_window; #line 1124 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget)); -#line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp101_ = canvas; + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_widget_get_type (), GtkWidget)); #line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp102_ = editing_tools_photo_canvas_get_photo (_tmp101_); + _tmp83_ = editing_tools_photo_canvas_get_photo (canvas); #line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp103_ = _tmp102_; -#line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp104_ = photo_has_crop (_tmp103_); + _tmp84_ = _tmp83_; #line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp105_ = !_tmp104_; + _tmp85_ = !photo_has_crop (_tmp84_); #line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp103_); + _g_object_unref0 (_tmp84_); #line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp105_) { -#line 8038 "EditingTools.c" + if (_tmp85_) { +#line 8677 "EditingTools.c" EditingToolsCropToolConstraintDescription* desc = NULL; - EditingToolsCropToolConstraintDescription* _tmp106_; - gboolean _tmp107_ = FALSE; - gboolean _tmp108_ = FALSE; - EditingToolsCropToolConstraintDescription* _tmp109_; + EditingToolsCropToolConstraintDescription* _tmp86_; + gboolean _tmp87_ = FALSE; + gboolean _tmp88_ = FALSE; + EditingToolsCropToolConstraintDescription* _tmp89_; #line 1128 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp106_ = editing_tools_crop_tool_get_last_constraint (self, NULL); + _tmp86_ = editing_tools_crop_tool_get_last_constraint (self, NULL); #line 1128 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - desc = _tmp106_; -#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp109_ = desc; + desc = _tmp86_; #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp109_ != NULL) { -#line 8052 "EditingTools.c" - EditingToolsCropToolConstraintDescription* _tmp110_; - gboolean _tmp111_; + _tmp89_ = desc; #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp110_ = desc; + if (_tmp89_ != NULL) { +#line 8691 "EditingTools.c" + EditingToolsCropToolConstraintDescription* _tmp90_; #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp111_ = editing_tools_crop_tool_constraint_description_is_separator (_tmp110_); + _tmp90_ = desc; #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp108_ = !_tmp111_; -#line 8061 "EditingTools.c" + _tmp88_ = !editing_tools_crop_tool_constraint_description_is_separator (_tmp90_); +#line 8697 "EditingTools.c" } else { #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp108_ = FALSE; -#line 8065 "EditingTools.c" + _tmp88_ = FALSE; +#line 8701 "EditingTools.c" } #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp108_) { -#line 8069 "EditingTools.c" - EditingToolsCropToolConstraintDescription* _tmp112_; - gfloat _tmp113_; + if (_tmp88_) { +#line 8705 "EditingTools.c" + EditingToolsCropToolConstraintDescription* _tmp91_; + gfloat _tmp92_; #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp112_ = desc; + _tmp91_ = desc; #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp113_ = _tmp112_->aspect_ratio; + _tmp92_ = _tmp91_->aspect_ratio; #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp107_ = _tmp113_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO; -#line 8078 "EditingTools.c" + _tmp87_ = _tmp92_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO; +#line 8714 "EditingTools.c" } else { #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp107_ = FALSE; -#line 8082 "EditingTools.c" + _tmp87_ = FALSE; +#line 8718 "EditingTools.c" } #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp107_) { + if (_tmp87_) { #line 1130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_set_custom_constraint_mode (self); -#line 8088 "EditingTools.c" +#line 8724 "EditingTools.c" } #line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _editing_tools_crop_tool_constraint_description_unref0 (desc); -#line 8092 "EditingTools.c" +#line 8728 "EditingTools.c" } #line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp114_ = self->priv->scaled_crop; + _tmp93_ = self->priv->scaled_crop; #line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_constrain_crop (self, &_tmp114_, &_tmp115_); + editing_tools_crop_tool_constrain_crop (self, &_tmp93_, &_tmp94_); #line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_crop = _tmp115_; + new_crop = _tmp94_; #line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp116_ = new_crop; + _tmp95_ = new_crop; #line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_crop_resized (self, &_tmp116_); + editing_tools_crop_tool_crop_resized (self, &_tmp95_); #line 1140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp117_ = new_crop; + _tmp96_ = new_crop; #line 1140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->scaled_crop = _tmp117_; + self->priv->scaled_crop = _tmp96_; #line 1141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp118_ = canvas; + _tmp97_ = new_crop; #line 1141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp119_ = new_crop; -#line 1141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_invalidate_area (_tmp118_, &_tmp119_); -#line 1142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp120_ = canvas; + editing_tools_photo_canvas_invalidate_area (canvas, &_tmp97_); #line 1142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_repaint (_tmp120_); + editing_tools_photo_canvas_repaint (canvas); #line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp121_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->pre_aspect_ratio = _tmp121_; + self->priv->pre_aspect_ratio = editing_tools_crop_tool_get_constraint_aspect_ratio (self); #line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (ctx); -#line 8124 "EditingTools.c" +#line 8754 "EditingTools.c" } -static void _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self) { +static void +_editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, + cairo_t* ctx, + Dimensions* dim, + gpointer self) +{ #line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_prepare_ctx ((EditingToolsCropTool*) self, ctx, dim); -#line 8131 "EditingTools.c" +#line 8766 "EditingTools.c" } -static void _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) { +static void +_editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, + Dimensions* old_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position, + gpointer self) +{ #line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_on_resized_pixbuf ((EditingToolsCropTool*) self, old_dim, scaled, scaled_position); -#line 8138 "EditingTools.c" +#line 8779 "EditingTools.c" } -static void editing_tools_crop_tool_bind_canvas_handlers (EditingToolsCropTool* self, EditingToolsPhotoCanvas* canvas) { - EditingToolsPhotoCanvas* _tmp0_; - EditingToolsPhotoCanvas* _tmp1_; +static void +editing_tools_crop_tool_bind_canvas_handlers (EditingToolsCropTool* self, + EditingToolsPhotoCanvas* canvas) +{ #line 1147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); #line 1147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); #line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = canvas; -#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_connect (_tmp0_, "new-surface", (GCallback) _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self); + g_signal_connect (canvas, "new-surface", (GCallback) _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self); #line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = canvas; -#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_connect (_tmp1_, "resized-scaled-pixbuf", (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self); -#line 8157 "EditingTools.c" + g_signal_connect (canvas, "resized-scaled-pixbuf", (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self); +#line 8795 "EditingTools.c" } -static void editing_tools_crop_tool_unbind_canvas_handlers (EditingToolsCropTool* self, EditingToolsPhotoCanvas* canvas) { - EditingToolsPhotoCanvas* _tmp0_; +static void +editing_tools_crop_tool_unbind_canvas_handlers (EditingToolsCropTool* self, + EditingToolsPhotoCanvas* canvas) +{ + guint _tmp0_; guint _tmp1_; - EditingToolsPhotoCanvas* _tmp2_; - guint _tmp3_; #line 1152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); #line 1152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); #line 1153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = canvas; + g_signal_parse_name ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp0_, NULL, FALSE); #line 1153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_parse_name ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE); -#line 1153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self); -#line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = canvas; + g_signal_handlers_disconnect_matched (canvas, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self); #line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp3_, NULL, FALSE); + g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE); #line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self); -#line 8182 "EditingTools.c" + g_signal_handlers_disconnect_matched (canvas, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self); +#line 8817 "EditingTools.c" } -static void _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_editing_tools_crop_tool_on_crop_ok_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_on_crop_ok ((EditingToolsCropTool*) self); -#line 8189 "EditingTools.c" +#line 8827 "EditingTools.c" } -static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 1160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_editing_tool_notify_cancel ((EditingToolsEditingTool*) self); -#line 8196 "EditingTools.c" +#line 8837 "EditingTools.c" } -static void _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void +_editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self) +{ #line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_constraint_changed ((EditingToolsCropTool*) self); -#line 8203 "EditingTools.c" +#line 8847 "EditingTools.c" } -static void _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_on_pivot_button_clicked ((EditingToolsCropTool*) self); -#line 8210 "EditingTools.c" +#line 8857 "EditingTools.c" } -static gboolean _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) { +static gboolean +_editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, + GdkEventFocus* event, + gpointer self) +{ gboolean result; result = editing_tools_crop_tool_on_width_entry_focus_out ((EditingToolsCropTool*) self, event); #line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 8219 "EditingTools.c" +#line 8870 "EditingTools.c" } -static gboolean _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) { +static gboolean +_editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, + GdkEventFocus* event, + gpointer self) +{ gboolean result; result = editing_tools_crop_tool_on_height_entry_focus_out ((EditingToolsCropTool*) self, event); #line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 8228 "EditingTools.c" +#line 8883 "EditingTools.c" } -static void _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) { +static void +_editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text (GtkEditable* _sender, + const gchar* new_text, + gint new_text_length, + gint* position, + gpointer self) +{ #line 1167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_on_width_insert_text ((EditingToolsCropTool*) self, new_text, new_text_length, position); -#line 8235 "EditingTools.c" +#line 8896 "EditingTools.c" } -static void _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) { +static void +_editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text (GtkEditable* _sender, + const gchar* new_text, + gint new_text_length, + gint* position, + gpointer self) +{ #line 1168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_on_height_insert_text ((EditingToolsCropTool*) self, new_text, new_text_length, position); -#line 8242 "EditingTools.c" +#line 8909 "EditingTools.c" } -static void editing_tools_crop_tool_bind_window_handlers (EditingToolsCropTool* self) { +static void +editing_tools_crop_tool_bind_window_handlers (EditingToolsCropTool* self) +{ EditingToolsCropToolCropToolWindow* _tmp0_; EditingToolsCropToolCropToolWindow* _tmp1_; GtkButton* _tmp2_; @@ -8307,18 +8976,20 @@ static void editing_tools_crop_tool_bind_window_handlers (EditingToolsCropTool* #line 1167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _tmp13_->custom_width_entry; #line 1167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_editable_get_type (), GtkEditable), "insert-text", (GCallback) _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text, self); #line 1168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = self->priv->crop_tool_window; #line 1168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _tmp15_->custom_height_entry; #line 1168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text, self); -#line 8318 "EditingTools.c" + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_editable_get_type (), GtkEditable), "insert-text", (GCallback) _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text, self); +#line 8987 "EditingTools.c" } -static void editing_tools_crop_tool_unbind_window_handlers (EditingToolsCropTool* self) { +static void +editing_tools_crop_tool_unbind_window_handlers (EditingToolsCropTool* self) +{ EditingToolsCropToolCropToolWindow* _tmp0_; guint _tmp1_; EditingToolsCropToolCropToolWindow* _tmp2_; @@ -8403,70 +9074,62 @@ static void editing_tools_crop_tool_unbind_window_handlers (EditingToolsCropTool #line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = _tmp20_->custom_width_entry; #line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_parse_name ("insert-text", GTK_TYPE_EDITABLE, &_tmp22_, NULL, FALSE); + g_signal_parse_name ("insert-text", gtk_editable_get_type (), &_tmp22_, NULL, FALSE); #line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp22_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text, self); -#line 8410 "EditingTools.c" + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_editable_get_type (), GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp22_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text, self); +#line 9081 "EditingTools.c" } -static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingTool* base, GdkEventKey* event) { +static gboolean +editing_tools_crop_tool_real_on_keypress (EditingToolsEditingTool* base, + GdkEventKey* event) +{ EditingToolsCropTool * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GdkEventKey* _tmp2_; - guint _tmp3_; - const gchar* _tmp4_; - GdkEventKey* _tmp11_; - gboolean _tmp12_; + guint _tmp2_; + const gchar* _tmp3_; #line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool); #line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (event != NULL, FALSE); #line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = event; + _tmp2_ = event->keyval; #line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = _tmp2_->keyval; + _tmp3_ = gdk_keyval_name (_tmp2_); #line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = gdk_keyval_name (_tmp3_); -#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) { + if (g_strcmp0 (_tmp3_, "KP_Enter") == 0) { #line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = TRUE; -#line 8438 "EditingTools.c" +#line 9107 "EditingTools.c" } else { - GdkEventKey* _tmp5_; - guint _tmp6_; - const gchar* _tmp7_; -#line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = event; + guint _tmp4_; + const gchar* _tmp5_; #line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _tmp5_->keyval; + _tmp4_ = event->keyval; #line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = gdk_keyval_name (_tmp6_); + _tmp5_ = gdk_keyval_name (_tmp4_); #line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0; -#line 8451 "EditingTools.c" + _tmp1_ = g_strcmp0 (_tmp5_, "Enter") == 0; +#line 9117 "EditingTools.c" } #line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp1_) { #line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = TRUE; -#line 8457 "EditingTools.c" +#line 9123 "EditingTools.c" } else { - GdkEventKey* _tmp8_; - guint _tmp9_; - const gchar* _tmp10_; -#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = event; + guint _tmp6_; + const gchar* _tmp7_; #line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = _tmp8_->keyval; + _tmp6_ = event->keyval; #line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = gdk_keyval_name (_tmp9_); + _tmp7_ = gdk_keyval_name (_tmp6_); #line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0; -#line 8470 "EditingTools.c" + _tmp0_ = g_strcmp0 (_tmp7_, "Return") == 0; +#line 9133 "EditingTools.c" } #line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_) { @@ -8476,27 +9139,24 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo result = TRUE; #line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 8480 "EditingTools.c" +#line 9143 "EditingTools.c" } #line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = event; -#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp11_); -#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - result = _tmp12_; + result = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), event); #line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 8490 "EditingTools.c" +#line 9149 "EditingTools.c" } -static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropTool* self) { +static void +editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropTool* self) +{ EditingToolsCropToolConstraintDescription* _tmp0_; EditingToolsCropToolConstraintDescription* _tmp1_; gfloat _tmp2_; gboolean _tmp3_; EditingToolsCropToolReticleOrientation _tmp21_; - EditingToolsCropToolReticleOrientation _tmp22_; #line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); #line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -8511,7 +9171,7 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo _editing_tools_crop_tool_constraint_description_unref0 (_tmp1_); #line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp3_) { -#line 8515 "EditingTools.c" +#line 9175 "EditingTools.c" gchar* width_text = NULL; EditingToolsCropToolCropToolWindow* _tmp4_; GtkEntry* _tmp5_; @@ -8584,21 +9244,21 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo _g_free0 (height_text); #line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (width_text); -#line 8588 "EditingTools.c" +#line 9248 "EditingTools.c" } #line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = self->priv->reticle_orientation; #line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = editing_tools_crop_tool_reticle_orientation_toggle (_tmp21_); -#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->reticle_orientation = _tmp22_; + self->priv->reticle_orientation = editing_tools_crop_tool_reticle_orientation_toggle (_tmp21_); #line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_constraint_changed (self); -#line 8598 "EditingTools.c" +#line 9256 "EditingTools.c" } -static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* base) { +static void +editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* base) +{ EditingToolsCropTool * self; EditingToolsPhotoCanvas* _tmp0_; EditingToolsCropToolCropToolWindow* _tmp2_; @@ -8609,19 +9269,19 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ != NULL) { -#line 8613 "EditingTools.c" +#line 9273 "EditingTools.c" EditingToolsPhotoCanvas* _tmp1_; #line 1212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_unbind_canvas_handlers (self, _tmp1_); -#line 8619 "EditingTools.c" +#line 9279 "EditingTools.c" } #line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->crop_tool_window; #line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp2_ != NULL) { -#line 8625 "EditingTools.c" +#line 9285 "EditingTools.c" EditingToolsCropToolCropToolWindow* _tmp3_; EditingToolsCropToolCropToolWindow* _tmp4_; #line 1215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -8638,13 +9298,13 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba _g_object_unref0 (self->priv->crop_tool_window); #line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->crop_tool_window = NULL; -#line 8642 "EditingTools.c" +#line 9302 "EditingTools.c" } #line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp5_ != NULL) { -#line 8648 "EditingTools.c" +#line 9308 "EditingTools.c" GdkWindow* drawing_window = NULL; EditingToolsPhotoCanvas* _tmp6_; GdkWindow* _tmp7_; @@ -8689,7 +9349,7 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba _g_object_unref0 (display); #line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (drawing_window); -#line 8693 "EditingTools.c" +#line 9353 "EditingTools.c" } #line 1230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_surface_destroy0 (self->priv->crop_surface); @@ -8697,11 +9357,13 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba self->priv->crop_surface = NULL; #line 1232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)); -#line 8701 "EditingTools.c" +#line 9361 "EditingTools.c" } -static EditingToolsEditingToolWindow* editing_tools_crop_tool_real_get_tool_window (EditingToolsEditingTool* base) { +static EditingToolsEditingToolWindow* +editing_tools_crop_tool_real_get_tool_window (EditingToolsEditingTool* base) +{ EditingToolsCropTool * self; EditingToolsEditingToolWindow* result = NULL; EditingToolsCropToolCropToolWindow* _tmp0_; @@ -8716,21 +9378,25 @@ static EditingToolsEditingToolWindow* editing_tools_crop_tool_real_get_tool_wind result = _tmp1_; #line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 8720 "EditingTools.c" +#line 9382 "EditingTools.c" } -static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsEditingTool* base, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error) { +static GdkPixbuf* +editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsEditingTool* base, + Scaling* scaling, + Photo* photo, + Dimensions* max_dim, + GError** error) +{ EditingToolsCropTool * self; Dimensions _vala_max_dim = {0}; GdkPixbuf* result = NULL; - Photo* _tmp0_; - Dimensions _tmp1_ = {0}; - GdkPixbuf* _tmp2_ = NULL; - Photo* _tmp3_; - Scaling _tmp4_; - GdkPixbuf* _tmp5_; - GdkPixbuf* _tmp6_; + Dimensions _tmp0_ = {0}; + GdkPixbuf* _tmp1_ = NULL; + Scaling _tmp2_; + GdkPixbuf* _tmp3_; + GdkPixbuf* _tmp4_; GError * _inner_error_ = NULL; #line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool); @@ -8739,67 +9405,63 @@ static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsE #line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); #line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = photo; -#line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp1_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp0_); #line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _vala_max_dim = _tmp1_; + _vala_max_dim = _tmp0_; #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = photo; + _tmp2_ = *scaling; #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = *scaling; + _tmp3_ = photo_get_pixbuf_with_options (photo, &_tmp2_, PHOTO_EXCEPTION_CROP, BACKING_FETCH_MODE_BASELINE, &_inner_error_); #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = photo_get_pixbuf_with_options (_tmp3_, &_tmp4_, PHOTO_EXCEPTION_CROP, BACKING_FETCH_MODE_BASELINE, &_inner_error_); -#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = _tmp5_; + _tmp1_ = _tmp3_; #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_propagate_error (error, _inner_error_); #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return NULL; -#line 8762 "EditingTools.c" +#line 9424 "EditingTools.c" } #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _tmp2_; + _tmp4_ = _tmp1_; #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = NULL; + _tmp1_ = NULL; #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - result = _tmp6_; + result = _tmp4_; #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (max_dim) { #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *max_dim = _vala_max_dim; -#line 8776 "EditingTools.c" +#line 9438 "EditingTools.c" } #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 8780 "EditingTools.c" +#line 9442 "EditingTools.c" } -static void editing_tools_crop_tool_prepare_ctx (EditingToolsCropTool* self, cairo_t* ctx, Dimensions* dim) { - cairo_t* _tmp0_; - cairo_surface_t* _tmp1_; +static void +editing_tools_crop_tool_prepare_ctx (EditingToolsCropTool* self, + cairo_t* ctx, + Dimensions* dim) +{ + cairo_surface_t* _tmp0_; + cairo_t* _tmp1_; cairo_t* _tmp2_; cairo_t* _tmp3_; - cairo_t* _tmp4_; + cairo_surface_t* _tmp4_; cairo_t* _tmp5_; - cairo_surface_t* _tmp6_; + cairo_t* _tmp6_; cairo_t* _tmp7_; - cairo_t* _tmp8_; + cairo_surface_t* _tmp8_; cairo_t* _tmp9_; cairo_t* _tmp10_; - cairo_surface_t* _tmp11_; - cairo_t* _tmp12_; + cairo_t* _tmp11_; + cairo_surface_t* _tmp12_; cairo_t* _tmp13_; cairo_t* _tmp14_; - cairo_t* _tmp15_; - cairo_surface_t* _tmp16_; - cairo_t* _tmp17_; - cairo_t* _tmp18_; #line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); #line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -8807,105 +9469,99 @@ static void editing_tools_crop_tool_prepare_ctx (EditingToolsCropTool* self, cai #line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (dim != NULL); #line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = ctx; + _tmp0_ = cairo_get_target (ctx); #line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = cairo_get_target (_tmp0_); -#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = cairo_create (_tmp1_); + _tmp1_ = cairo_create (_tmp0_); #line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->wide_black_ctx); #line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->wide_black_ctx = _tmp2_; + self->priv->wide_black_ctx = _tmp1_; #line 1248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = self->priv->wide_black_ctx; + _tmp2_ = self->priv->wide_black_ctx; #line 1248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - set_source_color_from_string (_tmp3_, "#000"); + set_source_color_from_string (_tmp2_, "#000"); #line 1249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = self->priv->wide_black_ctx; + _tmp3_ = self->priv->wide_black_ctx; #line 1249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_line_width (_tmp4_, (gdouble) 1); + cairo_set_line_width (_tmp3_, (gdouble) 1); #line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = ctx; + _tmp4_ = cairo_get_target (ctx); #line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = cairo_get_target (_tmp5_); -#line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = cairo_create (_tmp6_); + _tmp5_ = cairo_create (_tmp4_); #line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->wide_white_ctx); #line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->wide_white_ctx = _tmp7_; + self->priv->wide_white_ctx = _tmp5_; #line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = self->priv->wide_white_ctx; + _tmp6_ = self->priv->wide_white_ctx; #line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - set_source_color_from_string (_tmp8_, "#FFF"); + set_source_color_from_string (_tmp6_, "#FFF"); #line 1253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = self->priv->wide_white_ctx; + _tmp7_ = self->priv->wide_white_ctx; #line 1253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_line_width (_tmp9_, (gdouble) 1); -#line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = ctx; + cairo_set_line_width (_tmp7_, (gdouble) 1); #line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = cairo_get_target (_tmp10_); + _tmp8_ = cairo_get_target (ctx); #line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = cairo_create (_tmp11_); + _tmp9_ = cairo_create (_tmp8_); #line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->thin_white_ctx); #line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->thin_white_ctx = _tmp12_; + self->priv->thin_white_ctx = _tmp9_; #line 1256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = self->priv->thin_white_ctx; + _tmp10_ = self->priv->thin_white_ctx; #line 1256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - set_source_color_from_string (_tmp13_, "#FFF"); + set_source_color_from_string (_tmp10_, "#FFF"); #line 1257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = self->priv->thin_white_ctx; + _tmp11_ = self->priv->thin_white_ctx; #line 1257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_line_width (_tmp14_, 0.5); -#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = ctx; + cairo_set_line_width (_tmp11_, 0.5); #line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = cairo_get_target (_tmp15_); + _tmp12_ = cairo_get_target (ctx); #line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = cairo_create (_tmp16_); + _tmp13_ = cairo_create (_tmp12_); #line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->text_ctx); #line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->text_ctx = _tmp17_; + self->priv->text_ctx = _tmp13_; #line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = self->priv->text_ctx; + _tmp14_ = self->priv->text_ctx; #line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_select_font_face (_tmp18_, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); -#line 8878 "EditingTools.c" + cairo_select_font_face (_tmp14_, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); +#line 9532 "EditingTools.c" } -static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position) { +static void +editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* self, + Dimensions* old_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position) +{ Dimensions new_dim = {0}; - GdkPixbuf* _tmp0_; - Dimensions _tmp1_ = {0}; + Dimensions _tmp0_ = {0}; Dimensions uncropped_dim = {0}; - EditingToolsPhotoCanvas* _tmp2_; + EditingToolsPhotoCanvas* _tmp1_; + Photo* _tmp2_; Photo* _tmp3_; - Photo* _tmp4_; - Dimensions _tmp5_ = {0}; - Dimensions _tmp6_; + Dimensions _tmp4_ = {0}; + Dimensions _tmp5_; Box crop = {0}; + Dimensions _tmp6_; Dimensions _tmp7_; - Dimensions _tmp8_; - Box _tmp9_ = {0}; + Box _tmp8_ = {0}; + Dimensions _tmp9_; Dimensions _tmp10_; - Dimensions _tmp11_; - Box _tmp12_ = {0}; - cairo_surface_t* _tmp13_; - GdkPixbuf* _tmp14_; + Box _tmp11_ = {0}; + cairo_surface_t* _tmp12_; + gint _tmp13_; + gint _tmp14_; gint _tmp15_; gint _tmp16_; - GdkPixbuf* _tmp17_; - gint _tmp18_; - gint _tmp19_; - cairo_surface_t* _tmp20_; + cairo_surface_t* _tmp17_; cairo_t* ctx = NULL; - cairo_surface_t* _tmp21_; - cairo_t* _tmp22_; + cairo_surface_t* _tmp18_; + cairo_t* _tmp19_; #line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); #line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -8915,86 +9571,84 @@ static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* sel #line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (scaled_position != NULL); #line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = scaled; -#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - dimensions_for_pixbuf (_tmp0_, &_tmp1_); + dimensions_for_pixbuf (scaled, &_tmp0_); #line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_dim = _tmp1_; + new_dim = _tmp0_; #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = editing_tools_photo_canvas_get_photo (_tmp2_); + _tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_); #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp5_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp4_); #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - uncropped_dim = _tmp6_; + uncropped_dim = _tmp5_; #line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = *old_dim; + _tmp6_ = *old_dim; #line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = uncropped_dim; + _tmp7_ = uncropped_dim; #line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - box_get_scaled_similar (&self->priv->scaled_crop, &_tmp7_, &_tmp8_, &_tmp9_); + box_get_scaled_similar (&self->priv->scaled_crop, &_tmp6_, &_tmp7_, &_tmp8_); #line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - crop = _tmp9_; + crop = _tmp8_; #line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = uncropped_dim; + _tmp9_ = uncropped_dim; #line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = new_dim; + _tmp10_ = new_dim; #line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - box_get_scaled_similar (&crop, &_tmp10_, &_tmp11_, &_tmp12_); + box_get_scaled_similar (&crop, &_tmp9_, &_tmp10_, &_tmp11_); #line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->scaled_crop = _tmp12_; + self->priv->scaled_crop = _tmp11_; #line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = self->priv->crop_surface; + _tmp12_ = self->priv->crop_surface; #line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp13_ != NULL) { + if (_tmp12_ != NULL) { #line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_surface_destroy0 (self->priv->crop_surface); #line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->crop_surface = NULL; -#line 8962 "EditingTools.c" +#line 9616 "EditingTools.c" } #line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = scaled; -#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = gdk_pixbuf_get_width (_tmp14_); -#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = _tmp15_; + _tmp13_ = gdk_pixbuf_get_width (scaled); #line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = scaled; + _tmp14_ = _tmp13_; #line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = gdk_pixbuf_get_height (_tmp17_); + _tmp15_ = gdk_pixbuf_get_height (scaled); #line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = _tmp18_; + _tmp16_ = _tmp15_; #line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp16_, _tmp19_); + _tmp17_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp14_, _tmp16_); #line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_surface_destroy0 (self->priv->crop_surface); #line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->crop_surface = _tmp20_; + self->priv->crop_surface = _tmp17_; #line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = self->priv->crop_surface; + _tmp18_ = self->priv->crop_surface; #line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = cairo_create (_tmp21_); + _tmp19_ = cairo_create (_tmp18_); #line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - ctx = _tmp22_; + ctx = _tmp19_; #line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 1.0); #line 1278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_paint (ctx); #line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (ctx); -#line 8994 "EditingTools.c" +#line 9644 "EditingTools.c" } -static void editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool* base, gint x, gint y) { +static void +editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool* base, + gint x, + gint y) +{ EditingToolsCropTool * self; GdkRectangle scaled_pixbuf_pos = {0}; EditingToolsPhotoCanvas* _tmp0_; @@ -9005,18 +9659,11 @@ static void editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool* GdkRectangle _tmp4_; gint _tmp5_; Box _tmp6_ = {0}; - gint _tmp7_; + GdkRectangle _tmp7_; gint _tmp8_; - BoxLocation _tmp9_; + GdkRectangle _tmp9_; gint _tmp10_; - GdkRectangle _tmp11_; - gint _tmp12_; - gint _tmp13_; - gint _tmp14_; - GdkRectangle _tmp15_; - gint _tmp16_; - gint _tmp17_; - EditingToolsPhotoCanvas* _tmp18_; + EditingToolsPhotoCanvas* _tmp11_; #line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool); #line 1283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -9038,51 +9685,39 @@ static void editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool* #line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" offset_scaled_crop = _tmp6_; #line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = x; -#line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = y; -#line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = box_approx_location (&offset_scaled_crop, _tmp7_, _tmp8_); -#line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->in_manipulation = _tmp9_; + self->priv->in_manipulation = box_approx_location (&offset_scaled_crop, x, y); #line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = x; + _tmp7_ = scaled_pixbuf_pos; #line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = scaled_pixbuf_pos; + _tmp8_ = _tmp7_.x; #line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = _tmp11_.x; -#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - x = _tmp10_ - _tmp12_; + x = x - _tmp8_; #line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = x; -#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->last_grab_x = _tmp13_; -#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = y; + self->priv->last_grab_x = x; #line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = scaled_pixbuf_pos; + _tmp9_ = scaled_pixbuf_pos; #line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = _tmp15_.y; -#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - y = _tmp14_ - _tmp16_; + _tmp10_ = _tmp9_.y; #line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = y; + y = y - _tmp10_; #line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->last_grab_y = _tmp17_; + self->priv->last_grab_y = y; #line 1294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_repaint (_tmp18_); -#line 9077 "EditingTools.c" + editing_tools_photo_canvas_repaint (_tmp11_); +#line 9710 "EditingTools.c" } -static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y) { +static void +editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTool* base, + gint x, + gint y) +{ EditingToolsCropTool * self; BoxLocation _tmp0_; - gint _tmp1_; - gint _tmp2_; - EditingToolsPhotoCanvas* _tmp3_; + EditingToolsPhotoCanvas* _tmp1_; #line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool); #line 1299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -9091,7 +9726,7 @@ static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTo if (_tmp0_ == BOX_LOCATION_OUTSIDE) { #line 1300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 9095 "EditingTools.c" +#line 9730 "EditingTools.c" } #line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->in_manipulation = BOX_LOCATION_OUTSIDE; @@ -9100,86 +9735,69 @@ static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTo #line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->last_grab_y = -1; #line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = x; -#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = y; -#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_update_cursor (self, _tmp1_, _tmp2_); + editing_tools_crop_tool_update_cursor (self, x, y); #line 1310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_repaint (_tmp3_); -#line 9113 "EditingTools.c" + editing_tools_photo_canvas_repaint (_tmp1_); +#line 9744 "EditingTools.c" } -static void editing_tools_crop_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask) { +static void +editing_tools_crop_tool_real_on_motion (EditingToolsEditingTool* base, + gint x, + gint y, + GdkModifierType mask) +{ EditingToolsCropTool * self; BoxLocation _tmp0_; - gint _tmp3_; - gint _tmp4_; - EditingToolsPhotoCanvas* _tmp5_; + EditingToolsPhotoCanvas* _tmp1_; #line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool); #line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->in_manipulation; #line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ != BOX_LOCATION_OUTSIDE) { -#line 9129 "EditingTools.c" - gint _tmp1_; - gint _tmp2_; -#line 1317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = x; #line 1317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = y; -#line 1317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_on_canvas_manipulation (self, _tmp1_, _tmp2_); -#line 9138 "EditingTools.c" + editing_tools_crop_tool_on_canvas_manipulation (self, x, y); +#line 9765 "EditingTools.c" } #line 1319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = x; -#line 1319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = y; -#line 1319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_update_cursor (self, _tmp3_, _tmp4_); + editing_tools_crop_tool_update_cursor (self, x, y); #line 1320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_repaint (_tmp5_); -#line 9150 "EditingTools.c" + editing_tools_photo_canvas_repaint (_tmp1_); +#line 9773 "EditingTools.c" } -static void editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base, cairo_t* default_ctx) { +static void +editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base, + cairo_t* default_ctx) +{ EditingToolsCropTool * self; gint w = 0; EditingToolsPhotoCanvas* _tmp0_; GdkWindow* _tmp1_; GdkWindow* _tmp2_; gint _tmp3_; - gint _tmp4_; gint h = 0; - EditingToolsPhotoCanvas* _tmp5_; + EditingToolsPhotoCanvas* _tmp4_; + GdkWindow* _tmp5_; GdkWindow* _tmp6_; - GdkWindow* _tmp7_; - gint _tmp8_; - gint _tmp9_; - cairo_t* _tmp10_; - cairo_t* _tmp11_; - cairo_t* _tmp12_; - cairo_t* _tmp13_; + gint _tmp7_; cairo_t* ctx = NULL; - cairo_surface_t* _tmp14_; - cairo_t* _tmp15_; + cairo_surface_t* _tmp8_; + cairo_t* _tmp9_; + Box _tmp10_; + gint _tmp11_; + Box _tmp12_; + gint _tmp13_; + EditingToolsPhotoCanvas* _tmp14_; + cairo_surface_t* _tmp15_; Box _tmp16_; - gint _tmp17_; - Box _tmp18_; - gint _tmp19_; - gint _tmp20_; - gint _tmp21_; - EditingToolsPhotoCanvas* _tmp22_; - cairo_surface_t* _tmp23_; - Box _tmp24_; #line 1323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool); #line 1323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -9192,48 +9810,36 @@ static void editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base, c _tmp2_ = _tmp1_; #line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = gdk_window_get_width (_tmp2_); -#line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = _tmp3_; #line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp2_); #line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - w = _tmp4_; -#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + w = _tmp3_; #line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = editing_tools_photo_canvas_get_drawing_window (_tmp5_); + _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = _tmp6_; + _tmp5_ = editing_tools_photo_canvas_get_drawing_window (_tmp4_); #line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = gdk_window_get_height (_tmp7_); + _tmp6_ = _tmp5_; #line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = _tmp8_; + _tmp7_ = gdk_window_get_height (_tmp6_); #line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - h = _tmp9_; -#line 1328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = default_ctx; + h = _tmp7_; #line 1328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_source_rgba (_tmp10_, 0.0, 0.0, 0.0, 1.0); -#line 1329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = default_ctx; + cairo_set_source_rgba (default_ctx, 0.0, 0.0, 0.0, 1.0); #line 1329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_rectangle (_tmp11_, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h); + cairo_rectangle (default_ctx, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h); #line 1330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = default_ctx; -#line 1330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_fill (_tmp12_); -#line 1331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = default_ctx; + cairo_fill (default_ctx); #line 1331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_paint (_tmp13_); + cairo_paint (default_ctx); #line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = self->priv->crop_surface; + _tmp8_ = self->priv->crop_surface; #line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = cairo_create (_tmp14_); + _tmp9_ = cairo_create (_tmp8_); #line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - ctx = _tmp15_; + ctx = _tmp9_; #line 1334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_operator (ctx, CAIRO_OPERATOR_SOURCE); #line 1335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -9243,78 +9849,73 @@ static void editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base, c #line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 0.0); #line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = self->priv->scaled_crop; -#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = _tmp16_.left; -#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = self->priv->scaled_crop; + _tmp10_ = self->priv->scaled_crop; #line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = _tmp18_.top; + _tmp11_ = _tmp10_.left; #line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = box_get_width (&self->priv->scaled_crop); + _tmp12_ = self->priv->scaled_crop; #line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = box_get_height (&self->priv->scaled_crop); + _tmp13_ = _tmp12_.top; #line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_rectangle (ctx, (gdouble) _tmp17_, (gdouble) _tmp19_, (gdouble) _tmp20_, (gdouble) _tmp21_); + cairo_rectangle (ctx, (gdouble) _tmp11_, (gdouble) _tmp13_, (gdouble) box_get_width (&self->priv->scaled_crop), (gdouble) box_get_height (&self->priv->scaled_crop)); #line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_fill (ctx); #line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = self->priv->crop_surface; + _tmp15_ = self->priv->crop_surface; #line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_paint_surface (_tmp22_, _tmp23_, TRUE); + editing_tools_photo_canvas_paint_surface (_tmp14_, _tmp15_, TRUE); #line 1346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = self->priv->scaled_crop; + _tmp16_ = self->priv->scaled_crop; #line 1346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_paint_crop_tool (self, &_tmp24_); + editing_tools_crop_tool_paint_crop_tool (self, &_tmp16_); #line 1323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (ctx); -#line 9274 "EditingTools.c" +#line 9876 "EditingTools.c" } -static void editing_tools_crop_tool_on_crop_ok (EditingToolsCropTool* self) { +static void +editing_tools_crop_tool_on_crop_ok (EditingToolsCropTool* self) +{ ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; EditingToolsCropToolCropToolWindow* _tmp2_; GtkComboBox* _tmp3_; - gint _tmp4_; + ConfigFacade* _tmp4_; ConfigFacade* _tmp5_; - ConfigFacade* _tmp6_; - gint _tmp7_; + gint _tmp6_; + ConfigFacade* _tmp7_; ConfigFacade* _tmp8_; - ConfigFacade* _tmp9_; - gint _tmp10_; + gint _tmp9_; Box crop = {0}; - EditingToolsPhotoCanvas* _tmp11_; - GdkRectangle _tmp12_ = {0}; - Dimensions _tmp13_ = {0}; - EditingToolsPhotoCanvas* _tmp14_; + EditingToolsPhotoCanvas* _tmp10_; + GdkRectangle _tmp11_ = {0}; + Dimensions _tmp12_ = {0}; + EditingToolsPhotoCanvas* _tmp13_; + Photo* _tmp14_; Photo* _tmp15_; - Photo* _tmp16_; - Dimensions _tmp17_ = {0}; - Box _tmp18_ = {0}; - Box _tmp19_; + Dimensions _tmp16_ = {0}; + Box _tmp17_ = {0}; + Box _tmp18_; GdkPixbuf* cropped = NULL; - EditingToolsPhotoCanvas* _tmp20_; + EditingToolsPhotoCanvas* _tmp19_; + GdkPixbuf* _tmp20_; GdkPixbuf* _tmp21_; - GdkPixbuf* _tmp22_; - Box _tmp23_; - gint _tmp24_; - Box _tmp25_; - gint _tmp26_; - gint _tmp27_; - gint _tmp28_; - GdkPixbuf* _tmp29_; - GdkPixbuf* _tmp30_; - EditingToolsPhotoCanvas* _tmp31_; - Photo* _tmp32_; - Photo* _tmp33_; - Box _tmp34_; - CropCommand* _tmp35_; - CropCommand* _tmp36_; - Dimensions _tmp37_ = {0}; + Box _tmp22_; + gint _tmp23_; + Box _tmp24_; + gint _tmp25_; + GdkPixbuf* _tmp26_; + GdkPixbuf* _tmp27_; + EditingToolsPhotoCanvas* _tmp28_; + Photo* _tmp29_; + Photo* _tmp30_; + Box _tmp31_; + CropCommand* _tmp32_; + CropCommand* _tmp33_; + Dimensions _tmp34_ = {0}; #line 1349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); #line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -9326,106 +9927,104 @@ static void editing_tools_crop_tool_on_crop_ok (EditingToolsCropTool* self) { #line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_->constraint_combo; #line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = gtk_combo_box_get_active (_tmp3_); -#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - configuration_facade_set_last_crop_menu_choice (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_); + configuration_facade_set_last_crop_menu_choice (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), gtk_combo_box_get_active (_tmp3_)); #line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp1_); #line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = config_facade_get_instance (); + _tmp4_ = config_facade_get_instance (); #line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = self->priv->custom_width; + _tmp6_ = self->priv->custom_width; #line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - configuration_facade_set_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp7_); + configuration_facade_set_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_); #line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp5_); #line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = config_facade_get_instance (); + _tmp7_ = config_facade_get_instance (); #line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = self->priv->custom_height; + _tmp9_ = self->priv->custom_height; #line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - configuration_facade_set_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp10_); + configuration_facade_set_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp9_); #line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp11_, &_tmp12_); + editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp10_, &_tmp11_); #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - dimensions_for_rectangle (&_tmp12_, &_tmp13_); + dimensions_for_rectangle (&_tmp11_, &_tmp12_); #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = editing_tools_photo_canvas_get_photo (_tmp14_); + _tmp14_ = editing_tools_photo_canvas_get_photo (_tmp13_); #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp17_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp16_); #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - box_get_scaled_similar (&self->priv->scaled_crop, &_tmp13_, &_tmp17_, &_tmp18_); + box_get_scaled_similar (&self->priv->scaled_crop, &_tmp12_, &_tmp16_, &_tmp17_); #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp15_); #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - crop = _tmp19_; + crop = _tmp18_; #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp20_); + _tmp20_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp19_); #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = self->priv->scaled_crop; -#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = _tmp23_.left; -#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = self->priv->scaled_crop; + _tmp22_ = self->priv->scaled_crop; #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp26_ = _tmp25_.top; + _tmp23_ = _tmp22_.left; #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp27_ = box_get_width (&self->priv->scaled_crop); + _tmp24_ = self->priv->scaled_crop; #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_ = box_get_height (&self->priv->scaled_crop); + _tmp25_ = _tmp24_.top; #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp29_ = gdk_pixbuf_new_subpixbuf (_tmp22_, _tmp24_, _tmp26_, _tmp27_, _tmp28_); + _tmp26_ = gdk_pixbuf_new_subpixbuf (_tmp21_, _tmp23_, _tmp25_, box_get_width (&self->priv->scaled_crop), box_get_height (&self->priv->scaled_crop)); #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp30_ = _tmp29_; + _tmp27_ = _tmp26_; #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp22_); + _g_object_unref0 (_tmp21_); #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cropped = _tmp30_; + cropped = _tmp27_; #line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp31_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp28_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp32_ = editing_tools_photo_canvas_get_photo (_tmp31_); + _tmp29_ = editing_tools_photo_canvas_get_photo (_tmp28_); #line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp33_ = _tmp32_; -#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp34_ = crop; + _tmp30_ = _tmp29_; #line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp35_ = crop_command_new (_tmp33_, &_tmp34_, RESOURCES_CROP_LABEL, RESOURCES_CROP_TOOLTIP); + _tmp31_ = crop; #line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp36_ = _tmp35_; + _tmp32_ = crop_command_new (_tmp30_, &_tmp31_, RESOURCES_CROP_LABEL, RESOURCES_CROP_TOOLTIP); #line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - box_get_dimensions (&crop, &_tmp37_); + _tmp33_ = _tmp32_; #line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_COMMAND, Command), cropped, &_tmp37_, TRUE); + box_get_dimensions (&crop, &_tmp34_); #line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp36_); + g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_COMMAND, Command), cropped, &_tmp34_, TRUE); #line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp33_); +#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _g_object_unref0 (_tmp30_); #line 1349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (cropped); -#line 9425 "EditingTools.c" +#line 10020 "EditingTools.c" } -static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, gint x, gint y) { +static void +editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, + gint x, + gint y) +{ GdkRectangle scaled_pos = {0}; EditingToolsPhotoCanvas* _tmp0_; GdkRectangle _tmp1_ = {0}; @@ -9436,11 +10035,8 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g gint _tmp5_; Box _tmp6_ = {0}; GdkCursorType cursor_type = 0; - gint _tmp7_; - gint _tmp8_; - BoxLocation _tmp9_; - GdkCursorType _tmp10_; - GdkCursorType _tmp11_; + GdkCursorType _tmp7_; + GdkCursorType _tmp8_; #line 1373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); #line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -9464,214 +10060,197 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g #line 1378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cursor_type = GDK_LEFT_PTR; #line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = x; -#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = y; -#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = box_approx_location (&offset_scaled_crop, _tmp7_, _tmp8_); -#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - switch (_tmp9_) { + switch (box_approx_location (&offset_scaled_crop, x, y)) { #line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_LEFT_SIDE: -#line 9477 "EditingTools.c" +#line 10067 "EditingTools.c" { #line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cursor_type = GDK_LEFT_SIDE; #line 1382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 9483 "EditingTools.c" +#line 10073 "EditingTools.c" } #line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_SIDE: -#line 9487 "EditingTools.c" +#line 10077 "EditingTools.c" { #line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cursor_type = GDK_TOP_SIDE; #line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 9493 "EditingTools.c" +#line 10083 "EditingTools.c" } #line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_RIGHT_SIDE: -#line 9497 "EditingTools.c" +#line 10087 "EditingTools.c" { #line 1389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cursor_type = GDK_RIGHT_SIDE; #line 1390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 9503 "EditingTools.c" +#line 10093 "EditingTools.c" } #line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_SIDE: -#line 9507 "EditingTools.c" +#line 10097 "EditingTools.c" { #line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cursor_type = GDK_BOTTOM_SIDE; #line 1394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 9513 "EditingTools.c" +#line 10103 "EditingTools.c" } #line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_LEFT: -#line 9517 "EditingTools.c" +#line 10107 "EditingTools.c" { #line 1397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cursor_type = GDK_TOP_LEFT_CORNER; #line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 9523 "EditingTools.c" +#line 10113 "EditingTools.c" } #line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_LEFT: -#line 9527 "EditingTools.c" +#line 10117 "EditingTools.c" { #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cursor_type = GDK_BOTTOM_LEFT_CORNER; #line 1402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 9533 "EditingTools.c" +#line 10123 "EditingTools.c" } #line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_RIGHT: -#line 9537 "EditingTools.c" +#line 10127 "EditingTools.c" { #line 1405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cursor_type = GDK_TOP_RIGHT_CORNER; #line 1406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 9543 "EditingTools.c" +#line 10133 "EditingTools.c" } #line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_RIGHT: -#line 9547 "EditingTools.c" +#line 10137 "EditingTools.c" { #line 1409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cursor_type = GDK_BOTTOM_RIGHT_CORNER; #line 1410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 9553 "EditingTools.c" +#line 10143 "EditingTools.c" } #line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_INSIDE: -#line 9557 "EditingTools.c" +#line 10147 "EditingTools.c" { #line 1413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cursor_type = GDK_FLEUR; #line 1414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 9563 "EditingTools.c" +#line 10153 "EditingTools.c" } default: { #line 1418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 9569 "EditingTools.c" +#line 10159 "EditingTools.c" } } #line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = cursor_type; + _tmp7_ = cursor_type; #line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = self->priv->current_cursor_type; + _tmp8_ = self->priv->current_cursor_type; #line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp10_ != _tmp11_) { -#line 9578 "EditingTools.c" + if (_tmp7_ != _tmp8_) { +#line 10168 "EditingTools.c" GdkWindow* drawing_window = NULL; - EditingToolsPhotoCanvas* _tmp12_; - GdkWindow* _tmp13_; + EditingToolsPhotoCanvas* _tmp9_; + GdkWindow* _tmp10_; GdkDisplay* display = NULL; - GdkWindow* _tmp14_; - GdkDisplay* _tmp15_; - GdkDisplay* _tmp16_; + GdkWindow* _tmp11_; + GdkDisplay* _tmp12_; + GdkDisplay* _tmp13_; GdkCursor* cursor = NULL; - GdkDisplay* _tmp17_; - GdkCursorType _tmp18_; - GdkCursor* _tmp19_; - GdkWindow* _tmp20_; - GdkCursor* _tmp21_; - GdkCursorType _tmp22_; + GdkDisplay* _tmp14_; + GdkCursorType _tmp15_; + GdkCursor* _tmp16_; + GdkWindow* _tmp17_; + GdkCursor* _tmp18_; + GdkCursorType _tmp19_; #line 1422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = editing_tools_photo_canvas_get_drawing_window (_tmp12_); + _tmp10_ = editing_tools_photo_canvas_get_drawing_window (_tmp9_); #line 1422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - drawing_window = _tmp13_; + drawing_window = _tmp10_; #line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = drawing_window; + _tmp11_ = drawing_window; #line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = gdk_window_get_display (_tmp14_); + _tmp12_ = gdk_window_get_display (_tmp11_); #line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = _g_object_ref0 (_tmp15_); + _tmp13_ = _g_object_ref0 (_tmp12_); #line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - display = _tmp16_; + display = _tmp13_; #line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = display; + _tmp14_ = display; #line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = cursor_type; + _tmp15_ = cursor_type; #line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = gdk_cursor_new_for_display (_tmp17_, _tmp18_); + _tmp16_ = gdk_cursor_new_for_display (_tmp14_, _tmp15_); #line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cursor = _tmp19_; + cursor = _tmp16_; #line 1425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = drawing_window; + _tmp17_ = drawing_window; #line 1425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = cursor; + _tmp18_ = cursor; #line 1425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gdk_window_set_cursor (_tmp20_, _tmp21_); + gdk_window_set_cursor (_tmp17_, _tmp18_); #line 1426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = cursor_type; + _tmp19_ = cursor_type; #line 1426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->current_cursor_type = _tmp22_; + self->priv->current_cursor_type = _tmp19_; #line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (cursor); #line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (display); #line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (drawing_window); -#line 9631 "EditingTools.c" +#line 10221 "EditingTools.c" } } -static gint editing_tools_crop_tool_eval_radial_line (EditingToolsCropTool* self, gdouble center_x, gdouble center_y, gdouble bounds_x, gdouble bounds_y, gdouble user_x) { +static gint +editing_tools_crop_tool_eval_radial_line (EditingToolsCropTool* self, + gdouble center_x, + gdouble center_y, + gdouble bounds_x, + gdouble bounds_y, + gdouble user_x) +{ gint result = 0; gdouble decision_slope = 0.0; - gdouble _tmp0_; - gdouble _tmp1_; - gdouble _tmp2_; - gdouble _tmp3_; gdouble decision_intercept = 0.0; - gdouble _tmp4_; - gdouble _tmp5_; - gdouble _tmp6_; #line 1430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0); #line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = bounds_y; -#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = center_y; -#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = bounds_x; -#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = center_x; -#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - decision_slope = (_tmp0_ - _tmp1_) / (_tmp2_ - _tmp3_); -#line 1433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = bounds_y; + decision_slope = (bounds_y - center_y) / (bounds_x - center_x); #line 1433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = bounds_x; -#line 1433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - decision_intercept = _tmp4_ - (decision_slope * _tmp5_); -#line 1435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = user_x; + decision_intercept = bounds_y - (decision_slope * bounds_x); #line 1435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - result = (gint) ((decision_slope * _tmp6_) + decision_intercept); + result = (gint) ((decision_slope * user_x) + decision_intercept); #line 1435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 9671 "EditingTools.c" +#line 10247 "EditingTools.c" } -static void editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool* self, Dimensions* result) { +static void +editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool* self, + Dimensions* result) +{ Dimensions photo_dims = {0}; EditingToolsPhotoCanvas* _tmp0_; Photo* _tmp1_; @@ -9691,19 +10270,17 @@ static void editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool* Dimensions _tmp13_; gint _tmp14_; gdouble _tmp15_; - gdouble _tmp16_; - gdouble _tmp17_; - EditingToolsPhotoCanvas* _tmp18_; - Photo* _tmp19_; - Photo* _tmp20_; - Dimensions _tmp21_ = {0}; - Dimensions _tmp22_; - gint _tmp23_; - gdouble _tmp24_; - Dimensions _tmp25_; - gint _tmp26_; - gdouble _tmp27_; - Dimensions _tmp28_ = {0}; + EditingToolsPhotoCanvas* _tmp16_; + Photo* _tmp17_; + Photo* _tmp18_; + Dimensions _tmp19_ = {0}; + Dimensions _tmp20_; + gint _tmp21_; + gdouble _tmp22_; + Dimensions _tmp23_; + gint _tmp24_; + gdouble _tmp25_; + Dimensions _tmp26_ = {0}; #line 1439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); #line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -9743,150 +10320,147 @@ static void editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool* #line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _tmp13_.height; #line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = MIN (((gdouble) _tmp8_) / _tmp10_, ((gdouble) _tmp12_) / _tmp14_); -#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - scale_factor = _tmp15_; + scale_factor = MIN (((gdouble) _tmp8_) / _tmp10_, ((gdouble) _tmp12_) / _tmp14_); #line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = scale_factor; + _tmp15_ = scale_factor; #line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = MIN (_tmp16_, 1.0); -#line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - scale_factor = _tmp17_; + scale_factor = MIN (_tmp15_, 1.0); #line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = editing_tools_photo_canvas_get_photo (_tmp18_); + _tmp17_ = editing_tools_photo_canvas_get_photo (_tmp16_); #line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = _tmp19_; + _tmp18_ = _tmp17_; #line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP | PHOTO_EXCEPTION_STRAIGHTEN, &_tmp21_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP | PHOTO_EXCEPTION_STRAIGHTEN, &_tmp19_); #line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - photo_dims = _tmp21_; + photo_dims = _tmp19_; #line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp18_); #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = photo_dims; + _tmp20_ = photo_dims; #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = _tmp22_.width; + _tmp21_ = _tmp20_.width; #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = scale_factor; + _tmp22_ = scale_factor; #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = photo_dims; + _tmp23_ = photo_dims; #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp26_ = _tmp25_.height; + _tmp24_ = _tmp23_.height; #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp27_ = scale_factor; + _tmp25_ = scale_factor; #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_.width = (gint) (_tmp23_ * _tmp24_); + _tmp26_.width = (gint) (_tmp21_ * _tmp22_); #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_.height = (gint) (_tmp26_ * _tmp27_); + _tmp26_.height = (gint) (_tmp24_ * _tmp25_); #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - *result = _tmp28_; + *result = _tmp26_; #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 9788 "EditingTools.c" +#line 10361 "EditingTools.c" } -static gboolean _box_equal (const Box * s1, const Box * s2) { +static gboolean +_box_equal (const Box * s1, + const Box * s2) +{ #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (s1 == s2) { #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return TRUE; -#line 9797 "EditingTools.c" +#line 10373 "EditingTools.c" } #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (s1 == NULL) { #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return FALSE; -#line 9803 "EditingTools.c" +#line 10379 "EditingTools.c" } #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (s2 == NULL) { #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return FALSE; -#line 9809 "EditingTools.c" +#line 10385 "EditingTools.c" } #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (s1->left != s2->left) { #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return FALSE; -#line 9815 "EditingTools.c" +#line 10391 "EditingTools.c" } #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (s1->top != s2->top) { #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return FALSE; -#line 9821 "EditingTools.c" +#line 10397 "EditingTools.c" } #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (s1->right != s2->right) { #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return FALSE; -#line 9827 "EditingTools.c" +#line 10403 "EditingTools.c" } #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (s1->bottom != s2->bottom) { #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return FALSE; -#line 9833 "EditingTools.c" +#line 10409 "EditingTools.c" } #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return TRUE; -#line 9837 "EditingTools.c" +#line 10413 "EditingTools.c" } -static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCropTool* self, gint x, gint y) { +static gboolean +editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCropTool* self, + gint x, + gint y) +{ gboolean result = FALSE; GdkRectangle scaled_pos = {0}; EditingToolsPhotoCanvas* _tmp0_; GdkRectangle _tmp1_ = {0}; - gint _tmp2_; - GdkRectangle _tmp3_; - gint _tmp4_; - gint _tmp5_; - gint _tmp11_; - GdkRectangle _tmp12_; - gint _tmp13_; - gint _tmp14_; + GdkRectangle _tmp2_; + gint _tmp3_; + GdkRectangle _tmp8_; + gint _tmp9_; gint left = 0; - Box _tmp20_; - gint _tmp21_; + Box _tmp14_; + gint _tmp15_; gint top = 0; - Box _tmp22_; - gint _tmp23_; + Box _tmp16_; + gint _tmp17_; gint right = 0; - Box _tmp24_; - gint _tmp25_; + Box _tmp18_; + gint _tmp19_; gint bottom = 0; - Box _tmp26_; - gint _tmp27_; + Box _tmp20_; + gint _tmp21_; gint center_x = 0; - gint _tmp28_; - gint _tmp29_; + gint _tmp22_; + gint _tmp23_; gint center_y = 0; - gint _tmp30_; - gint _tmp31_; - BoxLocation _tmp32_; + gint _tmp24_; + gint _tmp25_; + BoxLocation _tmp26_; gint width = 0; - gint _tmp199_; - gint _tmp200_; + gint _tmp137_; + gint _tmp138_; gint height = 0; - gint _tmp201_; - gint _tmp202_; + gint _tmp139_; + gint _tmp140_; Dimensions photo_dims = {0}; - Dimensions _tmp203_ = {0}; + Dimensions _tmp141_ = {0}; gdouble angle = 0.0; - EditingToolsPhotoCanvas* _tmp204_; - Photo* _tmp205_; - Photo* _tmp206_; - gdouble _tmp207_ = 0.0; + EditingToolsPhotoCanvas* _tmp142_; + Photo* _tmp143_; + Photo* _tmp144_; + gdouble _tmp145_ = 0.0; Box new_crop = {0}; - gfloat _tmp208_; - BoxLocation _tmp254_; - Box _tmp257_; - gfloat _tmp258_; + BoxLocation _tmp191_; + Box _tmp194_; #line 1453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE); #line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -9896,954 +10470,768 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop #line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" scaled_pos = _tmp1_; #line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = x; -#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = scaled_pos; + _tmp2_ = scaled_pos; #line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = _tmp3_.x; + _tmp3_ = _tmp2_.x; #line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - x = _tmp2_ - _tmp4_; + x = x - _tmp3_; #line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = x; -#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp5_ < 0) { + if (x < 0) { #line 1460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" x = 0; -#line 9913 "EditingTools.c" +#line 10483 "EditingTools.c" } else { - gint _tmp6_; - GdkRectangle _tmp7_; - gint _tmp8_; -#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = x; + GdkRectangle _tmp4_; + gint _tmp5_; #line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = scaled_pos; + _tmp4_ = scaled_pos; #line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = _tmp7_.width; + _tmp5_ = _tmp4_.width; #line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp6_ >= _tmp8_) { -#line 9926 "EditingTools.c" - GdkRectangle _tmp9_; - gint _tmp10_; + if (x >= _tmp5_) { +#line 10493 "EditingTools.c" + GdkRectangle _tmp6_; + gint _tmp7_; #line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = scaled_pos; + _tmp6_ = scaled_pos; #line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = _tmp9_.width; + _tmp7_ = _tmp6_.width; #line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - x = _tmp10_ - 1; -#line 9935 "EditingTools.c" + x = _tmp7_ - 1; +#line 10502 "EditingTools.c" } } #line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = y; -#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = scaled_pos; + _tmp8_ = scaled_pos; #line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = _tmp12_.y; + _tmp9_ = _tmp8_.y; #line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - y = _tmp11_ - _tmp13_; -#line 1465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = y; + y = y - _tmp9_; #line 1465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp14_ < 0) { + if (y < 0) { #line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" y = 0; -#line 9952 "EditingTools.c" +#line 10515 "EditingTools.c" } else { - gint _tmp15_; - GdkRectangle _tmp16_; - gint _tmp17_; -#line 1467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = y; + GdkRectangle _tmp10_; + gint _tmp11_; #line 1467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = scaled_pos; + _tmp10_ = scaled_pos; #line 1467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = _tmp16_.height; + _tmp11_ = _tmp10_.height; #line 1467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp15_ >= _tmp17_) { -#line 9965 "EditingTools.c" - GdkRectangle _tmp18_; - gint _tmp19_; + if (y >= _tmp11_) { +#line 10525 "EditingTools.c" + GdkRectangle _tmp12_; + gint _tmp13_; #line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = scaled_pos; + _tmp12_ = scaled_pos; #line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = _tmp18_.height; + _tmp13_ = _tmp12_.height; #line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - y = _tmp19_ - 1; -#line 9974 "EditingTools.c" + y = _tmp13_ - 1; +#line 10534 "EditingTools.c" } } #line 1472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = self->priv->scaled_crop; + _tmp14_ = self->priv->scaled_crop; #line 1472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = _tmp20_.left; + _tmp15_ = _tmp14_.left; #line 1472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - left = _tmp21_; + left = _tmp15_; #line 1473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = self->priv->scaled_crop; + _tmp16_ = self->priv->scaled_crop; #line 1473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = _tmp22_.top; + _tmp17_ = _tmp16_.top; #line 1473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - top = _tmp23_; + top = _tmp17_; #line 1474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = self->priv->scaled_crop; + _tmp18_ = self->priv->scaled_crop; #line 1474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = _tmp24_.right; + _tmp19_ = _tmp18_.right; #line 1474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - right = _tmp25_; + right = _tmp19_; #line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp26_ = self->priv->scaled_crop; + _tmp20_ = self->priv->scaled_crop; #line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp27_ = _tmp26_.bottom; + _tmp21_ = _tmp20_.bottom; #line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - bottom = _tmp27_; + bottom = _tmp21_; #line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_ = left; + _tmp22_ = left; #line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp29_ = right; + _tmp23_ = right; #line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - center_x = (_tmp28_ + _tmp29_) / 2; + center_x = (_tmp22_ + _tmp23_) / 2; #line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp30_ = top; + _tmp24_ = top; #line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp31_ = bottom; + _tmp25_ = bottom; #line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - center_y = (_tmp30_ + _tmp31_) / 2; + center_y = (_tmp24_ + _tmp25_) / 2; #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp32_ = self->priv->in_manipulation; + _tmp26_ = self->priv->in_manipulation; #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - switch (_tmp32_) { + switch (_tmp26_) { #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_LEFT_SIDE: -#line 10019 "EditingTools.c" +#line 10579 "EditingTools.c" { - gint _tmp33_; - gfloat _tmp34_; -#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp33_ = x; #line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - left = _tmp33_; -#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp34_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); + left = x; #line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp34_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 10031 "EditingTools.c" + if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { +#line 10585 "EditingTools.c" gfloat new_height = 0.0F; - gint _tmp35_; - gint _tmp36_; - gfloat _tmp37_; - gint _tmp38_; - gfloat _tmp39_; -#line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp35_ = right; + gint _tmp27_; + gint _tmp28_; + gint _tmp29_; + gfloat _tmp30_; #line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp36_ = left; + _tmp27_ = right; #line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp37_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); + _tmp28_ = left; #line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_height = ((gfloat) (_tmp35_ - _tmp36_)) / _tmp37_; + new_height = ((gfloat) (_tmp27_ - _tmp28_)) / editing_tools_crop_tool_get_constraint_aspect_ratio (self); #line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp38_ = top; + _tmp29_ = top; #line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp39_ = new_height; + _tmp30_ = new_height; #line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - bottom = _tmp38_ + ((gint) _tmp39_); -#line 10052 "EditingTools.c" + bottom = _tmp29_ + ((gint) _tmp30_); +#line 10603 "EditingTools.c" } #line 1488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10056 "EditingTools.c" +#line 10607 "EditingTools.c" } #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_SIDE: -#line 10060 "EditingTools.c" +#line 10611 "EditingTools.c" { - gint _tmp40_; - gfloat _tmp41_; #line 1491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp40_ = y; -#line 1491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - top = _tmp40_; -#line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp41_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); + top = y; #line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp41_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 10072 "EditingTools.c" + if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { +#line 10617 "EditingTools.c" gfloat new_width = 0.0F; - gint _tmp42_; - gint _tmp43_; - gfloat _tmp44_; - gint _tmp45_; - gfloat _tmp46_; -#line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp42_ = bottom; + gint _tmp31_; + gint _tmp32_; + gint _tmp33_; + gfloat _tmp34_; #line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp43_ = top; + _tmp31_ = bottom; #line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp44_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); + _tmp32_ = top; #line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_width = ((gfloat) (_tmp42_ - _tmp43_)) * _tmp44_; + new_width = ((gfloat) (_tmp31_ - _tmp32_)) * editing_tools_crop_tool_get_constraint_aspect_ratio (self); #line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp45_ = left; + _tmp33_ = left; #line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp46_ = new_width; + _tmp34_ = new_width; #line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - right = _tmp45_ + ((gint) _tmp46_); -#line 10093 "EditingTools.c" + right = _tmp33_ + ((gint) _tmp34_); +#line 10635 "EditingTools.c" } #line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10097 "EditingTools.c" +#line 10639 "EditingTools.c" } #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_RIGHT_SIDE: -#line 10101 "EditingTools.c" +#line 10643 "EditingTools.c" { - gint _tmp47_; - gfloat _tmp48_; #line 1499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp47_ = x; -#line 1499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - right = _tmp47_; -#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp48_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); + right = x; #line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp48_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 10113 "EditingTools.c" + if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { +#line 10649 "EditingTools.c" gfloat new_height = 0.0F; - gint _tmp49_; - gint _tmp50_; - gfloat _tmp51_; - gint _tmp52_; - gfloat _tmp53_; -#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp49_ = right; + gint _tmp35_; + gint _tmp36_; + gint _tmp37_; + gfloat _tmp38_; #line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp50_ = left; + _tmp35_ = right; #line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp51_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); + _tmp36_ = left; #line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_height = ((gfloat) (_tmp49_ - _tmp50_)) / _tmp51_; + new_height = ((gfloat) (_tmp35_ - _tmp36_)) / editing_tools_crop_tool_get_constraint_aspect_ratio (self); #line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp52_ = top; + _tmp37_ = top; #line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp53_ = new_height; + _tmp38_ = new_height; #line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - bottom = _tmp52_ + ((gint) _tmp53_); -#line 10134 "EditingTools.c" + bottom = _tmp37_ + ((gint) _tmp38_); +#line 10667 "EditingTools.c" } #line 1504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10138 "EditingTools.c" +#line 10671 "EditingTools.c" } #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_SIDE: -#line 10142 "EditingTools.c" +#line 10675 "EditingTools.c" { - gint _tmp54_; - gfloat _tmp55_; -#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp54_ = y; #line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - bottom = _tmp54_; -#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp55_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); + bottom = y; #line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp55_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 10154 "EditingTools.c" + if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { +#line 10681 "EditingTools.c" gfloat new_width = 0.0F; - gint _tmp56_; - gint _tmp57_; - gfloat _tmp58_; - gint _tmp59_; - gfloat _tmp60_; -#line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp56_ = bottom; + gint _tmp39_; + gint _tmp40_; + gint _tmp41_; + gfloat _tmp42_; #line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp57_ = top; + _tmp39_ = bottom; #line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp58_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); + _tmp40_ = top; #line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_width = ((gfloat) (_tmp56_ - _tmp57_)) * _tmp58_; + new_width = ((gfloat) (_tmp39_ - _tmp40_)) * editing_tools_crop_tool_get_constraint_aspect_ratio (self); #line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp59_ = left; + _tmp41_ = left; #line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp60_ = new_width; + _tmp42_ = new_width; #line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - right = _tmp59_ + ((gint) _tmp60_); -#line 10175 "EditingTools.c" + right = _tmp41_ + ((gint) _tmp42_); +#line 10699 "EditingTools.c" } #line 1512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10179 "EditingTools.c" +#line 10703 "EditingTools.c" } #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_LEFT: -#line 10183 "EditingTools.c" +#line 10707 "EditingTools.c" { - gfloat _tmp61_; #line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp61_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp61_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 10190 "EditingTools.c" - gint _tmp62_; - gint _tmp63_; -#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp62_ = y; + if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { #line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - top = _tmp62_; -#line 1517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp63_ = x; + top = y; #line 1517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - left = _tmp63_; -#line 10201 "EditingTools.c" + left = x; +#line 10715 "EditingTools.c" } else { - gint _tmp64_; - gint _tmp65_; - gint _tmp66_; - gint _tmp67_; - gint _tmp68_; - gint _tmp69_; - gint _tmp70_; -#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp64_ = y; -#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp65_ = center_x; -#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp66_ = center_y; + gint _tmp43_; + gint _tmp44_; + gint _tmp45_; + gint _tmp46_; #line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp67_ = left; + _tmp43_ = center_x; #line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp68_ = top; + _tmp44_ = center_y; #line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp69_ = x; + _tmp45_ = left; #line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp70_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp65_, (gdouble) _tmp66_, (gdouble) _tmp67_, (gdouble) _tmp68_, (gdouble) _tmp69_); + _tmp46_ = top; #line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp64_ < _tmp70_) { -#line 10226 "EditingTools.c" - gint _tmp71_; + if (y < editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp43_, (gdouble) _tmp44_, (gdouble) _tmp45_, (gdouble) _tmp46_, (gdouble) x)) { +#line 10731 "EditingTools.c" gfloat new_width = 0.0F; - gint _tmp72_; - gint _tmp73_; - gfloat _tmp74_; - gint _tmp75_; - gfloat _tmp76_; -#line 1520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp71_ = y; + gint _tmp47_; + gint _tmp48_; + gint _tmp49_; + gfloat _tmp50_; #line 1520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - top = _tmp71_; -#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp72_ = bottom; + top = y; #line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp73_ = top; + _tmp47_ = bottom; #line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp74_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); + _tmp48_ = top; #line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_width = ((gfloat) (_tmp72_ - _tmp73_)) * _tmp74_; + new_width = ((gfloat) (_tmp47_ - _tmp48_)) * editing_tools_crop_tool_get_constraint_aspect_ratio (self); #line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp75_ = right; + _tmp49_ = right; #line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp76_ = new_width; + _tmp50_ = new_width; #line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - left = _tmp75_ - ((gint) _tmp76_); -#line 10252 "EditingTools.c" + left = _tmp49_ - ((gint) _tmp50_); +#line 10751 "EditingTools.c" } else { - gint _tmp77_; gfloat new_height = 0.0F; - gint _tmp78_; - gint _tmp79_; - gfloat _tmp80_; - gint _tmp81_; - gfloat _tmp82_; -#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp77_ = x; + gint _tmp51_; + gint _tmp52_; + gint _tmp53_; + gfloat _tmp54_; #line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - left = _tmp77_; -#line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp78_ = right; + left = x; #line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp79_ = left; + _tmp51_ = right; #line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp80_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); + _tmp52_ = left; #line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_height = ((gfloat) (_tmp78_ - _tmp79_)) / _tmp80_; + new_height = ((gfloat) (_tmp51_ - _tmp52_)) / editing_tools_crop_tool_get_constraint_aspect_ratio (self); #line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp81_ = bottom; + _tmp53_ = bottom; #line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp82_ = new_height; + _tmp54_ = new_height; #line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - top = _tmp81_ - ((gint) _tmp82_); -#line 10279 "EditingTools.c" + top = _tmp53_ - ((gint) _tmp54_); +#line 10772 "EditingTools.c" } } #line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10284 "EditingTools.c" +#line 10777 "EditingTools.c" } #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_LEFT: -#line 10288 "EditingTools.c" +#line 10781 "EditingTools.c" { - gfloat _tmp83_; -#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp83_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); #line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp83_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 10295 "EditingTools.c" - gint _tmp84_; - gint _tmp85_; + if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { #line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp84_ = y; -#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - bottom = _tmp84_; -#line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp85_ = x; + bottom = y; #line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - left = _tmp85_; -#line 10306 "EditingTools.c" + left = x; +#line 10789 "EditingTools.c" } else { - gint _tmp86_; - gint _tmp87_; - gint _tmp88_; - gint _tmp89_; - gint _tmp90_; - gint _tmp91_; - gint _tmp92_; -#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp86_ = y; -#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp87_ = center_x; -#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp88_ = center_y; + gint _tmp55_; + gint _tmp56_; + gint _tmp57_; + gint _tmp58_; #line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp89_ = left; + _tmp55_ = center_x; #line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp90_ = bottom; + _tmp56_ = center_y; #line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp91_ = x; + _tmp57_ = left; #line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp92_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp87_, (gdouble) _tmp88_, (gdouble) _tmp89_, (gdouble) _tmp90_, (gdouble) _tmp91_); + _tmp58_ = bottom; #line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp86_ < _tmp92_) { -#line 10331 "EditingTools.c" - gint _tmp93_; + if (y < editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp55_, (gdouble) _tmp56_, (gdouble) _tmp57_, (gdouble) _tmp58_, (gdouble) x)) { +#line 10805 "EditingTools.c" gfloat new_height = 0.0F; - gint _tmp94_; - gint _tmp95_; - gfloat _tmp96_; - gint _tmp97_; - gfloat _tmp98_; -#line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp93_ = x; + gint _tmp59_; + gint _tmp60_; + gint _tmp61_; + gfloat _tmp62_; #line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - left = _tmp93_; + left = x; #line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp94_ = right; + _tmp59_ = right; #line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp95_ = left; + _tmp60_ = left; #line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp96_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_height = ((gfloat) (_tmp94_ - _tmp95_)) / _tmp96_; + new_height = ((gfloat) (_tmp59_ - _tmp60_)) / editing_tools_crop_tool_get_constraint_aspect_ratio (self); #line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp97_ = top; + _tmp61_ = top; #line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp98_ = new_height; + _tmp62_ = new_height; #line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - bottom = _tmp97_ + ((gint) _tmp98_); -#line 10357 "EditingTools.c" + bottom = _tmp61_ + ((gint) _tmp62_); +#line 10825 "EditingTools.c" } else { - gint _tmp99_; gfloat new_width = 0.0F; - gint _tmp100_; - gint _tmp101_; - gfloat _tmp102_; - gint _tmp103_; - gfloat _tmp104_; -#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp99_ = y; + gint _tmp63_; + gint _tmp64_; + gint _tmp65_; + gfloat _tmp66_; #line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - bottom = _tmp99_; -#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp100_ = bottom; + bottom = y; #line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp101_ = top; + _tmp63_ = bottom; #line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp102_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); + _tmp64_ = top; #line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_width = ((gfloat) (_tmp100_ - _tmp101_)) * _tmp102_; + new_width = ((gfloat) (_tmp63_ - _tmp64_)) * editing_tools_crop_tool_get_constraint_aspect_ratio (self); #line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp103_ = right; + _tmp65_ = right; #line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp104_ = new_width; + _tmp66_ = new_width; #line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - left = _tmp103_ - ((gint) _tmp104_); -#line 10384 "EditingTools.c" + left = _tmp65_ - ((gint) _tmp66_); +#line 10846 "EditingTools.c" } } #line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10389 "EditingTools.c" +#line 10851 "EditingTools.c" } #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_RIGHT: -#line 10393 "EditingTools.c" +#line 10855 "EditingTools.c" { - gfloat _tmp105_; -#line 1549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp105_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); #line 1549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp105_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 10400 "EditingTools.c" - gint _tmp106_; - gint _tmp107_; -#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp106_ = y; + if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { #line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - top = _tmp106_; + top = y; #line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp107_ = x; -#line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - right = _tmp107_; -#line 10411 "EditingTools.c" + right = x; +#line 10863 "EditingTools.c" } else { - gint _tmp108_; - gint _tmp109_; - gint _tmp110_; - gint _tmp111_; - gint _tmp112_; - gint _tmp113_; - gint _tmp114_; -#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp108_ = y; -#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp109_ = center_x; -#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp110_ = center_y; + gint _tmp67_; + gint _tmp68_; + gint _tmp69_; + gint _tmp70_; #line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp111_ = right; + _tmp67_ = center_x; #line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp112_ = top; + _tmp68_ = center_y; #line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp113_ = x; + _tmp69_ = right; #line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp114_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp109_, (gdouble) _tmp110_, (gdouble) _tmp111_, (gdouble) _tmp112_, (gdouble) _tmp113_); + _tmp70_ = top; #line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp108_ < _tmp114_) { -#line 10436 "EditingTools.c" - gint _tmp115_; + if (y < editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp67_, (gdouble) _tmp68_, (gdouble) _tmp69_, (gdouble) _tmp70_, (gdouble) x)) { +#line 10879 "EditingTools.c" gfloat new_width = 0.0F; - gint _tmp116_; - gint _tmp117_; - gfloat _tmp118_; - gint _tmp119_; - gfloat _tmp120_; -#line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp115_ = y; + gint _tmp71_; + gint _tmp72_; + gint _tmp73_; + gfloat _tmp74_; #line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - top = _tmp115_; -#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp116_ = bottom; + top = y; #line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp117_ = top; + _tmp71_ = bottom; #line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp118_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); + _tmp72_ = top; #line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_width = ((gfloat) (_tmp116_ - _tmp117_)) * _tmp118_; + new_width = ((gfloat) (_tmp71_ - _tmp72_)) * editing_tools_crop_tool_get_constraint_aspect_ratio (self); #line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp119_ = left; + _tmp73_ = left; #line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp120_ = new_width; + _tmp74_ = new_width; #line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - right = _tmp119_ + ((gint) _tmp120_); -#line 10462 "EditingTools.c" + right = _tmp73_ + ((gint) _tmp74_); +#line 10899 "EditingTools.c" } else { - gint _tmp121_; gfloat new_height = 0.0F; - gint _tmp122_; - gint _tmp123_; - gfloat _tmp124_; - gint _tmp125_; - gfloat _tmp126_; -#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp121_ = x; + gint _tmp75_; + gint _tmp76_; + gint _tmp77_; + gfloat _tmp78_; #line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - right = _tmp121_; + right = x; #line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp122_ = right; -#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp123_ = left; + _tmp75_ = right; #line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp124_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); + _tmp76_ = left; #line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_height = ((gfloat) (_tmp122_ - _tmp123_)) / _tmp124_; + new_height = ((gfloat) (_tmp75_ - _tmp76_)) / editing_tools_crop_tool_get_constraint_aspect_ratio (self); #line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp125_ = bottom; + _tmp77_ = bottom; #line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp126_ = new_height; + _tmp78_ = new_height; #line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - top = _tmp125_ - ((gint) _tmp126_); -#line 10489 "EditingTools.c" + top = _tmp77_ - ((gint) _tmp78_); +#line 10920 "EditingTools.c" } } #line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10494 "EditingTools.c" +#line 10925 "EditingTools.c" } #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_RIGHT: -#line 10498 "EditingTools.c" +#line 10929 "EditingTools.c" { - gfloat _tmp127_; -#line 1566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp127_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); #line 1566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp127_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 10505 "EditingTools.c" - gint _tmp128_; - gint _tmp129_; + if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { #line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp128_ = y; -#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - bottom = _tmp128_; -#line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp129_ = x; + bottom = y; #line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - right = _tmp129_; -#line 10516 "EditingTools.c" + right = x; +#line 10937 "EditingTools.c" } else { - gint _tmp130_; - gint _tmp131_; - gint _tmp132_; - gint _tmp133_; - gint _tmp134_; - gint _tmp135_; - gint _tmp136_; + gint _tmp79_; + gint _tmp80_; + gint _tmp81_; + gint _tmp82_; #line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp130_ = y; + _tmp79_ = center_x; #line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp131_ = center_x; + _tmp80_ = center_y; #line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp132_ = center_y; + _tmp81_ = right; #line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp133_ = right; + _tmp82_ = bottom; #line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp134_ = bottom; -#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp135_ = x; -#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp136_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp131_, (gdouble) _tmp132_, (gdouble) _tmp133_, (gdouble) _tmp134_, (gdouble) _tmp135_); -#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp130_ < _tmp136_) { -#line 10541 "EditingTools.c" - gint _tmp137_; + if (y < editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp79_, (gdouble) _tmp80_, (gdouble) _tmp81_, (gdouble) _tmp82_, (gdouble) x)) { +#line 10953 "EditingTools.c" gfloat new_height = 0.0F; - gint _tmp138_; - gint _tmp139_; - gfloat _tmp140_; - gint _tmp141_; - gfloat _tmp142_; + gint _tmp83_; + gint _tmp84_; + gint _tmp85_; + gfloat _tmp86_; #line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp137_ = x; -#line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - right = _tmp137_; -#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp138_ = right; + right = x; #line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp139_ = left; + _tmp83_ = right; #line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp140_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); + _tmp84_ = left; #line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_height = ((gfloat) (_tmp138_ - _tmp139_)) / _tmp140_; + new_height = ((gfloat) (_tmp83_ - _tmp84_)) / editing_tools_crop_tool_get_constraint_aspect_ratio (self); #line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp141_ = top; + _tmp85_ = top; #line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp142_ = new_height; + _tmp86_ = new_height; #line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - bottom = _tmp141_ + ((gint) _tmp142_); -#line 10567 "EditingTools.c" + bottom = _tmp85_ + ((gint) _tmp86_); +#line 10973 "EditingTools.c" } else { - gint _tmp143_; gfloat new_width = 0.0F; - gint _tmp144_; - gint _tmp145_; - gfloat _tmp146_; - gint _tmp147_; - gfloat _tmp148_; + gint _tmp87_; + gint _tmp88_; + gint _tmp89_; + gfloat _tmp90_; #line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp143_ = y; -#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - bottom = _tmp143_; -#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp144_ = bottom; + bottom = y; #line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp145_ = top; + _tmp87_ = bottom; #line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp146_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); + _tmp88_ = top; #line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_width = ((gfloat) (_tmp144_ - _tmp145_)) * _tmp146_; + new_width = ((gfloat) (_tmp87_ - _tmp88_)) * editing_tools_crop_tool_get_constraint_aspect_ratio (self); #line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp147_ = left; + _tmp89_ = left; #line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp148_ = new_width; + _tmp90_ = new_width; #line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - right = _tmp147_ + ((gint) _tmp148_); -#line 10594 "EditingTools.c" + right = _tmp89_ + ((gint) _tmp90_); +#line 10994 "EditingTools.c" } } #line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10599 "EditingTools.c" +#line 10999 "EditingTools.c" } #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_INSIDE: -#line 10603 "EditingTools.c" +#line 11003 "EditingTools.c" { - gint _tmp149_; - gint _tmp150_; + gint _tmp91_; + gint _tmp92_; gint delta_x = 0; - gint _tmp151_; - gint _tmp152_; + gint _tmp93_; gint delta_y = 0; - gint _tmp153_; - gint _tmp154_; - gint _tmp155_; - gint _tmp156_; + gint _tmp94_; gint width = 0; - gint _tmp157_; - gint _tmp158_; + gint _tmp95_; + gint _tmp96_; gint height = 0; - gint _tmp159_; - gint _tmp160_; - gint _tmp161_; - gint _tmp162_; - gint _tmp163_; - gint _tmp164_; - gint _tmp165_; - gint _tmp166_; - gint _tmp167_; - gint _tmp168_; - gint _tmp169_; - gint _tmp170_; - gint _tmp171_; - GdkRectangle _tmp172_; - gint _tmp173_; - gint _tmp176_; - GdkRectangle _tmp177_; - gint _tmp178_; + gint _tmp97_; + gint _tmp98_; + gint _tmp99_; + gint _tmp100_; + gint _tmp101_; + gint _tmp102_; + gint _tmp103_; + gint _tmp104_; + gint _tmp105_; + gint _tmp106_; + gint _tmp107_; + gint _tmp108_; + gint _tmp109_; + GdkRectangle _tmp110_; + gint _tmp111_; + gint _tmp114_; + GdkRectangle _tmp115_; + gint _tmp116_; gint adj_width = 0; - gint _tmp181_; - gint _tmp182_; + gint _tmp119_; + gint _tmp120_; gint adj_height = 0; - gint _tmp183_; - gint _tmp184_; - gint _tmp185_; - gint _tmp186_; - gint _tmp192_; - gint _tmp193_; + gint _tmp121_; + gint _tmp122_; + gint _tmp123_; + gint _tmp124_; + gint _tmp130_; + gint _tmp131_; #line 1583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp149_ = self->priv->last_grab_x; + _tmp91_ = self->priv->last_grab_x; #line 1583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _vala_assert (_tmp149_ >= 0, "last_grab_x >= 0"); + _vala_assert (_tmp91_ >= 0, "last_grab_x >= 0"); #line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp150_ = self->priv->last_grab_y; + _tmp92_ = self->priv->last_grab_y; #line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _vala_assert (_tmp150_ >= 0, "last_grab_y >= 0"); -#line 1586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp151_ = x; + _vala_assert (_tmp92_ >= 0, "last_grab_y >= 0"); #line 1586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp152_ = self->priv->last_grab_x; + _tmp93_ = self->priv->last_grab_x; #line 1586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - delta_x = _tmp151_ - _tmp152_; -#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp153_ = y; + delta_x = x - _tmp93_; #line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp154_ = self->priv->last_grab_y; + _tmp94_ = self->priv->last_grab_y; #line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - delta_y = _tmp153_ - _tmp154_; + delta_y = y - _tmp94_; #line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp155_ = x; -#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->last_grab_x = _tmp155_; -#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp156_ = y; + self->priv->last_grab_x = x; #line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->last_grab_y = _tmp156_; + self->priv->last_grab_y = y; #line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp157_ = right; + _tmp95_ = right; #line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp158_ = left; + _tmp96_ = left; #line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - width = (_tmp157_ - _tmp158_) + 1; + width = (_tmp95_ - _tmp96_) + 1; #line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp159_ = bottom; + _tmp97_ = bottom; #line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp160_ = top; + _tmp98_ = top; #line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - height = (_tmp159_ - _tmp160_) + 1; + height = (_tmp97_ - _tmp98_) + 1; #line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp161_ = left; + _tmp99_ = left; #line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp162_ = delta_x; + _tmp100_ = delta_x; #line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - left = _tmp161_ + _tmp162_; + left = _tmp99_ + _tmp100_; #line 1596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp163_ = top; + _tmp101_ = top; #line 1596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp164_ = delta_y; + _tmp102_ = delta_y; #line 1596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - top = _tmp163_ + _tmp164_; + top = _tmp101_ + _tmp102_; #line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp165_ = right; + _tmp103_ = right; #line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp166_ = delta_x; + _tmp104_ = delta_x; #line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - right = _tmp165_ + _tmp166_; + right = _tmp103_ + _tmp104_; #line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp167_ = bottom; + _tmp105_ = bottom; #line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp168_ = delta_y; + _tmp106_ = delta_y; #line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - bottom = _tmp167_ + _tmp168_; + bottom = _tmp105_ + _tmp106_; #line 1601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp169_ = left; + _tmp107_ = left; #line 1601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp169_ < 0) { + if (_tmp107_ < 0) { #line 1602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" left = 0; -#line 10717 "EditingTools.c" +#line 11105 "EditingTools.c" } #line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp170_ = top; + _tmp108_ = top; #line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp170_ < 0) { + if (_tmp108_ < 0) { #line 1605 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" top = 0; -#line 10725 "EditingTools.c" +#line 11113 "EditingTools.c" } #line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp171_ = right; + _tmp109_ = right; #line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp172_ = scaled_pos; + _tmp110_ = scaled_pos; #line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp173_ = _tmp172_.width; + _tmp111_ = _tmp110_.width; #line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp171_ >= _tmp173_) { -#line 10735 "EditingTools.c" - GdkRectangle _tmp174_; - gint _tmp175_; + if (_tmp109_ >= _tmp111_) { +#line 11123 "EditingTools.c" + GdkRectangle _tmp112_; + gint _tmp113_; #line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp174_ = scaled_pos; + _tmp112_ = scaled_pos; #line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp175_ = _tmp174_.width; + _tmp113_ = _tmp112_.width; #line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - right = _tmp175_ - 1; -#line 10744 "EditingTools.c" + right = _tmp113_ - 1; +#line 11132 "EditingTools.c" } #line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp176_ = bottom; + _tmp114_ = bottom; #line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp177_ = scaled_pos; + _tmp115_ = scaled_pos; #line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp178_ = _tmp177_.height; + _tmp116_ = _tmp115_.height; #line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp176_ >= _tmp178_) { -#line 10754 "EditingTools.c" - GdkRectangle _tmp179_; - gint _tmp180_; + if (_tmp114_ >= _tmp116_) { +#line 11142 "EditingTools.c" + GdkRectangle _tmp117_; + gint _tmp118_; #line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp179_ = scaled_pos; + _tmp117_ = scaled_pos; #line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp180_ = _tmp179_.height; + _tmp118_ = _tmp117_.height; #line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - bottom = _tmp180_ - 1; -#line 10763 "EditingTools.c" + bottom = _tmp118_ - 1; +#line 11151 "EditingTools.c" } #line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp181_ = right; + _tmp119_ = right; #line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp182_ = left; + _tmp120_ = left; #line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - adj_width = (_tmp181_ - _tmp182_) + 1; + adj_width = (_tmp119_ - _tmp120_) + 1; #line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp183_ = bottom; + _tmp121_ = bottom; #line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp184_ = top; + _tmp122_ = top; #line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - adj_height = (_tmp183_ - _tmp184_) + 1; + adj_height = (_tmp121_ - _tmp122_) + 1; #line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp185_ = adj_width; + _tmp123_ = adj_width; #line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp186_ = width; + _tmp124_ = width; #line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp185_ != _tmp186_) { -#line 10783 "EditingTools.c" - gint _tmp187_; + if (_tmp123_ != _tmp124_) { +#line 11171 "EditingTools.c" + gint _tmp125_; #line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp187_ = delta_x; + _tmp125_ = delta_x; #line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp187_ < 0) { -#line 10789 "EditingTools.c" - gint _tmp188_; - gint _tmp189_; + if (_tmp125_ < 0) { +#line 11177 "EditingTools.c" + gint _tmp126_; + gint _tmp127_; #line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp188_ = left; + _tmp126_ = left; #line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp189_ = width; + _tmp127_ = width; #line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - right = (_tmp188_ + _tmp189_) - 1; -#line 10798 "EditingTools.c" + right = (_tmp126_ + _tmp127_) - 1; +#line 11186 "EditingTools.c" } else { - gint _tmp190_; - gint _tmp191_; + gint _tmp128_; + gint _tmp129_; #line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp190_ = right; + _tmp128_ = right; #line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp191_ = width; + _tmp129_ = width; #line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - left = (_tmp190_ - _tmp191_) + 1; -#line 10808 "EditingTools.c" + left = (_tmp128_ - _tmp129_) + 1; +#line 11196 "EditingTools.c" } } #line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp192_ = adj_height; + _tmp130_ = adj_height; #line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp193_ = height; + _tmp131_ = height; #line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp192_ != _tmp193_) { -#line 10817 "EditingTools.c" - gint _tmp194_; + if (_tmp130_ != _tmp131_) { +#line 11205 "EditingTools.c" + gint _tmp132_; #line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp194_ = delta_y; + _tmp132_ = delta_y; #line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp194_ < 0) { -#line 10823 "EditingTools.c" - gint _tmp195_; - gint _tmp196_; + if (_tmp132_ < 0) { +#line 11211 "EditingTools.c" + gint _tmp133_; + gint _tmp134_; #line 1626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp195_ = top; + _tmp133_ = top; #line 1626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp196_ = height; + _tmp134_ = height; #line 1626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - bottom = (_tmp195_ + _tmp196_) - 1; -#line 10832 "EditingTools.c" + bottom = (_tmp133_ + _tmp134_) - 1; +#line 11220 "EditingTools.c" } else { - gint _tmp197_; - gint _tmp198_; + gint _tmp135_; + gint _tmp136_; #line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp197_ = bottom; + _tmp135_ = bottom; #line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp198_ = height; + _tmp136_ = height; #line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - top = (_tmp197_ - _tmp198_) + 1; -#line 10842 "EditingTools.c" + top = (_tmp135_ - _tmp136_) + 1; +#line 11230 "EditingTools.c" } } #line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10847 "EditingTools.c" +#line 11235 "EditingTools.c" } default: { @@ -10851,100 +11239,98 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop result = FALSE; #line 1634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 10855 "EditingTools.c" +#line 11243 "EditingTools.c" } } #line 1644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp199_ = right; + _tmp137_ = right; #line 1644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp200_ = left; + _tmp138_ = left; #line 1644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - width = (_tmp199_ - _tmp200_) + 1; + width = (_tmp137_ - _tmp138_) + 1; #line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp201_ = bottom; + _tmp139_ = bottom; #line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp202_ = top; + _tmp140_ = top; #line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - height = (_tmp201_ - _tmp202_) + 1; + height = (_tmp139_ - _tmp140_) + 1; #line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_get_photo_dimensions (self, &_tmp203_); + editing_tools_crop_tool_get_photo_dimensions (self, &_tmp141_); #line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - photo_dims = _tmp203_; + photo_dims = _tmp141_; #line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp204_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp142_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp205_ = editing_tools_photo_canvas_get_photo (_tmp204_); + _tmp143_ = editing_tools_photo_canvas_get_photo (_tmp142_); #line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp206_ = _tmp205_; + _tmp144_ = _tmp143_; #line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - photo_get_straighten (_tmp206_, &_tmp207_); + photo_get_straighten (_tmp144_, &_tmp145_); #line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - angle = _tmp207_; + angle = _tmp145_; #line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp206_); + _g_object_unref0 (_tmp144_); #line 1652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp208_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp208_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 10890 "EditingTools.c" - gint _tmp209_; - gint _tmp210_; - gint _tmp211_; - gint _tmp212_; - BoxLocation _tmp213_; - BoxLocation _tmp218_; - gint _tmp223_; - gint _tmp224_; - gint _tmp225_; - gint _tmp226_; - Box _tmp227_ = {0}; - Dimensions _tmp228_; - gint _tmp229_; - Dimensions _tmp230_; - gint _tmp231_; - gdouble _tmp232_; - BoxLocation _tmp233_; - Box _tmp234_ = {0}; + if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { +#line 11276 "EditingTools.c" + gint _tmp146_; + gint _tmp147_; + gint _tmp148_; + gint _tmp149_; + BoxLocation _tmp150_; + BoxLocation _tmp155_; + gint _tmp160_; + gint _tmp161_; + gint _tmp162_; + gint _tmp163_; + Box _tmp164_ = {0}; + Dimensions _tmp165_; + gint _tmp166_; + Dimensions _tmp167_; + gint _tmp168_; + gdouble _tmp169_; + BoxLocation _tmp170_; + Box _tmp171_ = {0}; #line 1653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp209_ = right; + _tmp146_ = right; #line 1653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp210_ = left; + _tmp147_ = left; #line 1653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - width = (_tmp209_ - _tmp210_) + 1; + width = (_tmp146_ - _tmp147_) + 1; #line 1654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp211_ = bottom; + _tmp148_ = bottom; #line 1654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp212_ = top; + _tmp149_ = top; #line 1654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - height = (_tmp211_ - _tmp212_) + 1; + height = (_tmp148_ - _tmp149_) + 1; #line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp213_ = self->priv->in_manipulation; + _tmp150_ = self->priv->in_manipulation; #line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - switch (_tmp213_) { + switch (_tmp150_) { #line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_LEFT_SIDE: #line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_LEFT: #line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_LEFT: -#line 10931 "EditingTools.c" +#line 11317 "EditingTools.c" { - gint _tmp214_; + gint _tmp151_; #line 1660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp214_ = width; + _tmp151_ = width; #line 1660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp214_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) { -#line 10938 "EditingTools.c" - gint _tmp215_; + if (_tmp151_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) { +#line 11324 "EditingTools.c" + gint _tmp152_; #line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp215_ = right; + _tmp152_ = right; #line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - left = _tmp215_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; -#line 10944 "EditingTools.c" + left = _tmp152_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; +#line 11330 "EditingTools.c" } #line 1662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10948 "EditingTools.c" +#line 11334 "EditingTools.c" } #line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_RIGHT_SIDE: @@ -10952,60 +11338,60 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop case BOX_LOCATION_TOP_RIGHT: #line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_RIGHT: -#line 10956 "EditingTools.c" +#line 11342 "EditingTools.c" { - gint _tmp216_; + gint _tmp153_; #line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp216_ = width; + _tmp153_ = width; #line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp216_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) { -#line 10963 "EditingTools.c" - gint _tmp217_; + if (_tmp153_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) { +#line 11349 "EditingTools.c" + gint _tmp154_; #line 1668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp217_ = left; + _tmp154_ = left; #line 1668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - right = _tmp217_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; -#line 10969 "EditingTools.c" + right = _tmp154_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; +#line 11355 "EditingTools.c" } #line 1669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10973 "EditingTools.c" +#line 11359 "EditingTools.c" } default: { #line 1672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10979 "EditingTools.c" +#line 11365 "EditingTools.c" } } #line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp218_ = self->priv->in_manipulation; + _tmp155_ = self->priv->in_manipulation; #line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - switch (_tmp218_) { + switch (_tmp155_) { #line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_SIDE: #line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_LEFT: #line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_RIGHT: -#line 10992 "EditingTools.c" +#line 11378 "EditingTools.c" { - gint _tmp219_; + gint _tmp156_; #line 1679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp219_ = height; + _tmp156_ = height; #line 1679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp219_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) { -#line 10999 "EditingTools.c" - gint _tmp220_; + if (_tmp156_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) { +#line 11385 "EditingTools.c" + gint _tmp157_; #line 1680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp220_ = bottom; + _tmp157_ = bottom; #line 1680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - top = _tmp220_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; -#line 11005 "EditingTools.c" + top = _tmp157_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; +#line 11391 "EditingTools.c" } #line 1681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 11009 "EditingTools.c" +#line 11395 "EditingTools.c" } #line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_SIDE: @@ -11013,226 +11399,220 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop case BOX_LOCATION_BOTTOM_LEFT: #line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_RIGHT: -#line 11017 "EditingTools.c" +#line 11403 "EditingTools.c" { - gint _tmp221_; + gint _tmp158_; #line 1686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp221_ = height; + _tmp158_ = height; #line 1686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp221_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) { -#line 11024 "EditingTools.c" - gint _tmp222_; + if (_tmp158_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) { +#line 11410 "EditingTools.c" + gint _tmp159_; #line 1687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp222_ = top; + _tmp159_ = top; #line 1687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - bottom = _tmp222_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; -#line 11030 "EditingTools.c" + bottom = _tmp159_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; +#line 11416 "EditingTools.c" } #line 1688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 11034 "EditingTools.c" +#line 11420 "EditingTools.c" } default: { #line 1691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 11040 "EditingTools.c" +#line 11426 "EditingTools.c" } } #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp223_ = left; + _tmp160_ = left; #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp224_ = top; + _tmp161_ = top; #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp225_ = right; + _tmp162_ = right; #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp226_ = bottom; + _tmp163_ = bottom; #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - box_init (&_tmp227_, _tmp223_, _tmp224_, _tmp225_, _tmp226_); + box_init (&_tmp164_, _tmp160_, _tmp161_, _tmp162_, _tmp163_); #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp228_ = photo_dims; + _tmp165_ = photo_dims; #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp229_ = _tmp228_.width; + _tmp166_ = _tmp165_.width; #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp230_ = photo_dims; + _tmp167_ = photo_dims; #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp231_ = _tmp230_.height; + _tmp168_ = _tmp167_.height; #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp232_ = angle; + _tmp169_ = angle; #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp233_ = self->priv->in_manipulation; + _tmp170_ = self->priv->in_manipulation; #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - clamp_inside_rotated_image (&_tmp227_, _tmp229_, _tmp231_, _tmp232_, _tmp233_ == BOX_LOCATION_INSIDE, &_tmp234_); + clamp_inside_rotated_image (&_tmp164_, _tmp166_, _tmp168_, _tmp169_, _tmp170_ == BOX_LOCATION_INSIDE, &_tmp171_); #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_crop = _tmp234_; -#line 11069 "EditingTools.c" + new_crop = _tmp171_; +#line 11455 "EditingTools.c" } else { - gint _tmp235_; - gint _tmp236_; - gint _tmp237_; - gint _tmp238_; + gint _tmp172_; + gint _tmp173_; + gint _tmp174_; + gint _tmp175_; Box adjusted = {0}; - Box _tmp239_; - Dimensions _tmp240_; - gint _tmp241_; - Dimensions _tmp242_; - gint _tmp243_; - gdouble _tmp244_; - BoxLocation _tmp245_; - Box _tmp246_ = {0}; - gboolean _tmp247_ = FALSE; - gboolean _tmp248_ = FALSE; - Box _tmp249_; - Box _tmp250_; + Box _tmp176_; + Dimensions _tmp177_; + gint _tmp178_; + Dimensions _tmp179_; + gint _tmp180_; + gdouble _tmp181_; + BoxLocation _tmp182_; + Box _tmp183_ = {0}; + gboolean _tmp184_ = FALSE; + gboolean _tmp185_ = FALSE; + Box _tmp186_; + Box _tmp187_; #line 1706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp235_ = left; + _tmp172_ = left; #line 1706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp236_ = top; + _tmp173_ = top; #line 1706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp237_ = right; + _tmp174_ = right; #line 1706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp238_ = bottom; + _tmp175_ = bottom; #line 1706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - box_init (&new_crop, _tmp235_, _tmp236_, _tmp237_, _tmp238_); + box_init (&new_crop, _tmp172_, _tmp173_, _tmp174_, _tmp175_); #line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp239_ = new_crop; + _tmp176_ = new_crop; #line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp240_ = photo_dims; + _tmp177_ = photo_dims; #line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp241_ = _tmp240_.width; + _tmp178_ = _tmp177_.width; #line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp242_ = photo_dims; + _tmp179_ = photo_dims; #line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp243_ = _tmp242_.height; + _tmp180_ = _tmp179_.height; #line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp244_ = angle; + _tmp181_ = angle; #line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp245_ = self->priv->in_manipulation; + _tmp182_ = self->priv->in_manipulation; #line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - clamp_inside_rotated_image (&_tmp239_, _tmp241_, _tmp243_, _tmp244_, _tmp245_ == BOX_LOCATION_INSIDE, &_tmp246_); + clamp_inside_rotated_image (&_tmp176_, _tmp178_, _tmp180_, _tmp181_, _tmp182_ == BOX_LOCATION_INSIDE, &_tmp183_); #line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - adjusted = _tmp246_; + adjusted = _tmp183_; #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp249_ = adjusted; + _tmp186_ = adjusted; #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp250_ = new_crop; + _tmp187_ = new_crop; #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_box_equal (&_tmp249_, &_tmp250_) != TRUE) { + if (_box_equal (&_tmp186_, &_tmp187_) != TRUE) { #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp248_ = TRUE; -#line 11124 "EditingTools.c" + _tmp185_ = TRUE; +#line 11510 "EditingTools.c" } else { - gint _tmp251_; + gint _tmp188_; #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp251_ = width; + _tmp188_ = width; #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp248_ = _tmp251_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; -#line 11131 "EditingTools.c" + _tmp185_ = _tmp188_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; +#line 11517 "EditingTools.c" } #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp248_) { + if (_tmp185_) { #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp247_ = TRUE; -#line 11137 "EditingTools.c" + _tmp184_ = TRUE; +#line 11523 "EditingTools.c" } else { - gint _tmp252_; + gint _tmp189_; #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp252_ = height; + _tmp189_ = height; #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp247_ = _tmp252_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; -#line 11144 "EditingTools.c" + _tmp184_ = _tmp189_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; +#line 11530 "EditingTools.c" } #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp247_) { -#line 11148 "EditingTools.c" - Box _tmp253_; + if (_tmp184_) { +#line 11534 "EditingTools.c" + Box _tmp190_; #line 1712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp253_ = self->priv->scaled_crop; + _tmp190_ = self->priv->scaled_crop; #line 1712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_crop = _tmp253_; -#line 11154 "EditingTools.c" + new_crop = _tmp190_; +#line 11540 "EditingTools.c" } } #line 1716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp254_ = self->priv->in_manipulation; + _tmp191_ = self->priv->in_manipulation; #line 1716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp254_ != BOX_LOCATION_INSIDE) { -#line 11161 "EditingTools.c" - Box _tmp255_; + if (_tmp191_ != BOX_LOCATION_INSIDE) { +#line 11547 "EditingTools.c" + Box _tmp192_; #line 1717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp255_ = new_crop; + _tmp192_ = new_crop; #line 1717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_crop_resized (self, &_tmp255_); -#line 11167 "EditingTools.c" + editing_tools_crop_tool_crop_resized (self, &_tmp192_); +#line 11553 "EditingTools.c" } else { - Box _tmp256_; + Box _tmp193_; #line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp256_ = new_crop; + _tmp193_ = new_crop; #line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_crop_moved (self, &_tmp256_); -#line 11174 "EditingTools.c" + editing_tools_crop_tool_crop_moved (self, &_tmp193_); +#line 11560 "EditingTools.c" } #line 1722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp257_ = new_crop; + _tmp194_ = new_crop; #line 1722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->scaled_crop = _tmp257_; + self->priv->scaled_crop = _tmp194_; #line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp258_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp258_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 11184 "EditingTools.c" - gint _tmp259_; - gint _tmp260_; - gint _tmp261_; - gint _tmp262_; -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp259_ = box_get_width (&self->priv->scaled_crop); + if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { +#line 11568 "EditingTools.c" + gint _tmp195_; + gint _tmp196_; #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->custom_init_width = _tmp259_; -#line 1726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp260_ = box_get_height (&self->priv->scaled_crop); + self->priv->custom_init_width = box_get_width (&self->priv->scaled_crop); #line 1726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->custom_init_height = _tmp260_; + self->priv->custom_init_height = box_get_height (&self->priv->scaled_crop); #line 1727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp261_ = self->priv->custom_init_width; + _tmp195_ = self->priv->custom_init_width; #line 1727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp262_ = self->priv->custom_init_height; + _tmp196_ = self->priv->custom_init_height; #line 1727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->custom_aspect_ratio = ((gfloat) _tmp261_) / ((gfloat) _tmp262_); -#line 11203 "EditingTools.c" + self->priv->custom_aspect_ratio = ((gfloat) _tmp195_) / ((gfloat) _tmp196_); +#line 11581 "EditingTools.c" } #line 1730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; #line 1730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 11209 "EditingTools.c" +#line 11587 "EditingTools.c" } -static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Box* new_crop) { +static void +editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, + Box* new_crop) +{ Box _tmp0_; - gboolean _tmp1_; - EditingToolsPhotoCanvas* _tmp2_; - Box _tmp3_; + EditingToolsPhotoCanvas* _tmp1_; + Box _tmp2_; Box horizontal = {0}; gboolean horizontal_enlarged = FALSE; Box vertical = {0}; gboolean vertical_enlarged = FALSE; BoxComplements complements = 0; - Box _tmp4_; - Box _tmp5_ = {0}; - gboolean _tmp6_ = FALSE; - Box _tmp7_ = {0}; - gboolean _tmp8_ = FALSE; + Box _tmp3_; + Box _tmp4_ = {0}; + gboolean _tmp5_ = FALSE; + Box _tmp6_ = {0}; + gboolean _tmp7_ = FALSE; + BoxComplements _tmp8_; BoxComplements _tmp9_; - BoxComplements _tmp10_; - gboolean _tmp11_ = FALSE; - BoxComplements _tmp12_; - gboolean _tmp17_ = FALSE; - BoxComplements _tmp18_; - Box _tmp23_; - EditingToolsPhotoCanvas* _tmp24_; - Box _tmp25_; + gboolean _tmp10_ = FALSE; + BoxComplements _tmp11_; + gboolean _tmp16_ = FALSE; + BoxComplements _tmp17_; + Box _tmp22_; + EditingToolsPhotoCanvas* _tmp23_; + Box _tmp24_; #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -11240,139 +11620,139 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo #line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = *new_crop; #line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = box_equals (&self->priv->scaled_crop, &_tmp0_); -#line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp1_) { + if (box_equals (&self->priv->scaled_crop, &_tmp0_)) { #line 1736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 11249 "EditingTools.c" +#line 11627 "EditingTools.c" } #line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = self->priv->scaled_crop; + _tmp2_ = self->priv->scaled_crop; #line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_invalidate_area (_tmp2_, &_tmp3_); + editing_tools_photo_canvas_invalidate_area (_tmp1_, &_tmp2_); #line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = *new_crop; + _tmp3_ = *new_crop; #line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = box_resized_complements (&self->priv->scaled_crop, &_tmp4_, &_tmp5_, &_tmp6_, &_tmp7_, &_tmp8_); + _tmp8_ = box_resized_complements (&self->priv->scaled_crop, &_tmp3_, &_tmp4_, &_tmp5_, &_tmp6_, &_tmp7_); #line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - horizontal = _tmp5_; + horizontal = _tmp4_; #line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - horizontal_enlarged = _tmp6_; + horizontal_enlarged = _tmp5_; #line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - vertical = _tmp7_; + vertical = _tmp6_; #line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - vertical_enlarged = _tmp8_; + vertical_enlarged = _tmp7_; #line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - complements = _tmp9_; + complements = _tmp8_; #line 1749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = complements; + _tmp9_ = complements; #line 1749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _vala_assert (_tmp10_ != BOX_COMPLEMENTS_NONE, "complements != BoxComplements.NONE"); + _vala_assert (_tmp9_ != BOX_COMPLEMENTS_NONE, "complements != BoxComplements.NONE"); #line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = complements; + _tmp11_ = complements; #line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp12_ == BOX_COMPLEMENTS_HORIZONTAL) { + if (_tmp11_ == BOX_COMPLEMENTS_HORIZONTAL) { #line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = TRUE; -#line 11281 "EditingTools.c" + _tmp10_ = TRUE; +#line 11659 "EditingTools.c" } else { - BoxComplements _tmp13_; + BoxComplements _tmp12_; #line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = complements; + _tmp12_ = complements; #line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = _tmp13_ == BOX_COMPLEMENTS_BOTH; -#line 11288 "EditingTools.c" + _tmp10_ = _tmp12_ == BOX_COMPLEMENTS_BOTH; +#line 11666 "EditingTools.c" } #line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp11_) { -#line 11292 "EditingTools.c" - gdouble _tmp14_ = 0.0; - gboolean _tmp15_; - Box _tmp16_; + if (_tmp10_) { +#line 11670 "EditingTools.c" + gdouble _tmp13_ = 0.0; + gboolean _tmp14_; + Box _tmp15_; #line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = horizontal_enlarged; + _tmp14_ = horizontal_enlarged; #line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp15_) { + if (_tmp14_) { #line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = 0.0; -#line 11302 "EditingTools.c" + _tmp13_ = 0.0; +#line 11680 "EditingTools.c" } else { #line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = 0.5; -#line 11306 "EditingTools.c" + _tmp13_ = 0.5; +#line 11684 "EditingTools.c" } #line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = horizontal; + _tmp15_ = horizontal; #line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_set_area_alpha (self, &_tmp16_, _tmp14_); -#line 11312 "EditingTools.c" + editing_tools_crop_tool_set_area_alpha (self, &_tmp15_, _tmp13_); +#line 11690 "EditingTools.c" } #line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = complements; + _tmp17_ = complements; #line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp18_ == BOX_COMPLEMENTS_VERTICAL) { + if (_tmp17_ == BOX_COMPLEMENTS_VERTICAL) { #line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = TRUE; -#line 11320 "EditingTools.c" + _tmp16_ = TRUE; +#line 11698 "EditingTools.c" } else { - BoxComplements _tmp19_; + BoxComplements _tmp18_; #line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = complements; + _tmp18_ = complements; #line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = _tmp19_ == BOX_COMPLEMENTS_BOTH; -#line 11327 "EditingTools.c" + _tmp16_ = _tmp18_ == BOX_COMPLEMENTS_BOTH; +#line 11705 "EditingTools.c" } #line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp17_) { -#line 11331 "EditingTools.c" - gdouble _tmp20_ = 0.0; - gboolean _tmp21_; - Box _tmp22_; + if (_tmp16_) { +#line 11709 "EditingTools.c" + gdouble _tmp19_ = 0.0; + gboolean _tmp20_; + Box _tmp21_; #line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = vertical_enlarged; + _tmp20_ = vertical_enlarged; #line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp21_) { + if (_tmp20_) { #line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = 0.0; -#line 11341 "EditingTools.c" + _tmp19_ = 0.0; +#line 11719 "EditingTools.c" } else { #line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = 0.5; -#line 11345 "EditingTools.c" + _tmp19_ = 0.5; +#line 11723 "EditingTools.c" } #line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = vertical; + _tmp21_ = vertical; #line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_set_area_alpha (self, &_tmp22_, _tmp20_); -#line 11351 "EditingTools.c" + editing_tools_crop_tool_set_area_alpha (self, &_tmp21_, _tmp19_); +#line 11729 "EditingTools.c" } #line 1757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = *new_crop; + _tmp22_ = *new_crop; #line 1757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_paint_crop_tool (self, &_tmp23_); + editing_tools_crop_tool_paint_crop_tool (self, &_tmp22_); #line 1758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = *new_crop; + _tmp24_ = *new_crop; #line 1758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_invalidate_area (_tmp24_, &_tmp25_); -#line 11363 "EditingTools.c" + editing_tools_photo_canvas_invalidate_area (_tmp23_, &_tmp24_); +#line 11741 "EditingTools.c" } -static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box* new_crop) { +static void +editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, + Box* new_crop) +{ Box _tmp0_; - gboolean _tmp1_; - EditingToolsPhotoCanvas* _tmp2_; + EditingToolsPhotoCanvas* _tmp1_; + Box _tmp2_; Box _tmp3_; Box _tmp4_; Box _tmp5_; - Box _tmp6_; - EditingToolsPhotoCanvas* _tmp7_; - Box _tmp8_; + EditingToolsPhotoCanvas* _tmp6_; + Box _tmp7_; #line 1761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); #line 1761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -11380,55 +11760,54 @@ static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box* #line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = *new_crop; #line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = box_equals (&self->priv->scaled_crop, &_tmp0_); -#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp1_) { + if (box_equals (&self->priv->scaled_crop, &_tmp0_)) { #line 1764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 11389 "EditingTools.c" +#line 11767 "EditingTools.c" } #line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = self->priv->scaled_crop; + _tmp2_ = self->priv->scaled_crop; #line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_invalidate_area (_tmp2_, &_tmp3_); + editing_tools_photo_canvas_invalidate_area (_tmp1_, &_tmp2_); #line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = self->priv->scaled_crop; + _tmp3_ = self->priv->scaled_crop; #line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_set_area_alpha (self, &_tmp4_, 0.5); + editing_tools_crop_tool_set_area_alpha (self, &_tmp3_, 0.5); #line 1770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = *new_crop; + _tmp4_ = *new_crop; #line 1770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_set_area_alpha (self, &_tmp5_, 0.0); + editing_tools_crop_tool_set_area_alpha (self, &_tmp4_, 0.0); #line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = *new_crop; + _tmp5_ = *new_crop; #line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_paint_crop_tool (self, &_tmp6_); + editing_tools_crop_tool_paint_crop_tool (self, &_tmp5_); #line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = *new_crop; + _tmp7_ = *new_crop; #line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_invalidate_area (_tmp7_, &_tmp8_); -#line 11415 "EditingTools.c" + editing_tools_photo_canvas_invalidate_area (_tmp6_, &_tmp7_); +#line 11793 "EditingTools.c" } -static void editing_tools_crop_tool_set_area_alpha (EditingToolsCropTool* self, Box* area, gdouble alpha) { +static void +editing_tools_crop_tool_set_area_alpha (EditingToolsCropTool* self, + Box* area, + gdouble alpha) +{ cairo_t* ctx = NULL; cairo_surface_t* _tmp0_; cairo_t* _tmp1_; - gdouble _tmp2_; - Box _tmp3_; - gint _tmp4_; - Box _tmp5_; - gint _tmp6_; - gint _tmp7_; - gint _tmp8_; - EditingToolsPhotoCanvas* _tmp9_; - cairo_surface_t* _tmp10_; - Box _tmp11_; + Box _tmp2_; + gint _tmp3_; + Box _tmp4_; + gint _tmp5_; + EditingToolsPhotoCanvas* _tmp6_; + cairo_surface_t* _tmp7_; + Box _tmp8_; #line 1778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); #line 1778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -11442,50 +11821,47 @@ static void editing_tools_crop_tool_set_area_alpha (EditingToolsCropTool* self, #line 1780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_operator (ctx, CAIRO_OPERATOR_SOURCE); #line 1781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = alpha; -#line 1781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, _tmp2_); + cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, alpha); #line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = *area; + _tmp2_ = *area; #line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = _tmp3_.left; + _tmp3_ = _tmp2_.left; #line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = *area; + _tmp4_ = *area; #line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _tmp5_.top; + _tmp5_ = _tmp4_.top; #line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = box_get_width (area); -#line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = box_get_height (area); -#line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_rectangle (ctx, (gdouble) _tmp4_, (gdouble) _tmp6_, (gdouble) _tmp7_, (gdouble) _tmp8_); + cairo_rectangle (ctx, (gdouble) _tmp3_, (gdouble) _tmp5_, (gdouble) box_get_width (area), (gdouble) box_get_height (area)); #line 1783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_fill (ctx); #line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = self->priv->crop_surface; + _tmp7_ = self->priv->crop_surface; #line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = *area; + _tmp8_ = *area; #line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_paint_surface_area (_tmp9_, _tmp10_, &_tmp11_, TRUE); + editing_tools_photo_canvas_paint_surface_area (_tmp6_, _tmp7_, &_tmp8_, TRUE); #line 1778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (ctx); -#line 11475 "EditingTools.c" +#line 11848 "EditingTools.c" } -static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self, Box* crop) { +static void +editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self, + Box* crop) +{ BoxLocation _tmp0_; - EditingToolsPhotoCanvas* _tmp65_; - cairo_t* _tmp66_; - Box _tmp67_; - EditingToolsPhotoCanvas* _tmp68_; - cairo_t* _tmp69_; - Box _tmp70_ = {0}; - EditingToolsPhotoCanvas* _tmp71_; - cairo_t* _tmp72_; - Box _tmp73_ = {0}; + EditingToolsPhotoCanvas* _tmp55_; + cairo_t* _tmp56_; + Box _tmp57_; + EditingToolsPhotoCanvas* _tmp58_; + cairo_t* _tmp59_; + Box _tmp60_ = {0}; + EditingToolsPhotoCanvas* _tmp61_; + cairo_t* _tmp62_; + Box _tmp63_ = {0}; #line 1787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); #line 1787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -11494,335 +11870,302 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self, _tmp0_ = self->priv->in_manipulation; #line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ != BOX_LOCATION_OUTSIDE) { -#line 11498 "EditingTools.c" +#line 11874 "EditingTools.c" gint one_third_x = 0; - gint _tmp1_; gint one_third_y = 0; - gint _tmp2_; - EditingToolsPhotoCanvas* _tmp3_; - cairo_t* _tmp4_; + EditingToolsPhotoCanvas* _tmp1_; + cairo_t* _tmp2_; + Box _tmp3_; + gint _tmp4_; Box _tmp5_; gint _tmp6_; - Box _tmp7_; - gint _tmp8_; - gint _tmp9_; - gint _tmp10_; - EditingToolsPhotoCanvas* _tmp11_; - cairo_t* _tmp12_; - Box _tmp13_; + gint _tmp7_; + EditingToolsPhotoCanvas* _tmp8_; + cairo_t* _tmp9_; + Box _tmp10_; + gint _tmp11_; + Box _tmp12_; + gint _tmp13_; gint _tmp14_; - Box _tmp15_; - gint _tmp16_; - gint _tmp17_; + EditingToolsPhotoCanvas* _tmp15_; + cairo_t* _tmp16_; + Box _tmp17_; gint _tmp18_; - EditingToolsPhotoCanvas* _tmp19_; - cairo_t* _tmp20_; - Box _tmp21_; - gint _tmp22_; - gint _tmp23_; + gint _tmp19_; + Box _tmp20_; + gint _tmp21_; + EditingToolsPhotoCanvas* _tmp22_; + cairo_t* _tmp23_; Box _tmp24_; gint _tmp25_; gint _tmp26_; - EditingToolsPhotoCanvas* _tmp27_; - cairo_t* _tmp28_; - Box _tmp29_; - gint _tmp30_; - gint _tmp31_; - Box _tmp32_; - gint _tmp33_; - gint _tmp34_; + Box _tmp27_; + gint _tmp28_; Box adj_crop = {0}; - EditingToolsPhotoCanvas* _tmp35_; - GdkRectangle _tmp36_ = {0}; - Dimensions _tmp37_ = {0}; - EditingToolsPhotoCanvas* _tmp38_; - Photo* _tmp39_; - Photo* _tmp40_; - Dimensions _tmp41_ = {0}; - Box _tmp42_ = {0}; - Box _tmp43_; + EditingToolsPhotoCanvas* _tmp29_; + GdkRectangle _tmp30_ = {0}; + Dimensions _tmp31_ = {0}; + EditingToolsPhotoCanvas* _tmp32_; + Photo* _tmp33_; + Photo* _tmp34_; + Dimensions _tmp35_ = {0}; + Box _tmp36_ = {0}; + Box _tmp37_; gchar* text = NULL; - gint _tmp44_; + gchar* _tmp38_; + gchar* _tmp39_; + gchar* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; + gchar* _tmp43_; + gchar* _tmp44_; gchar* _tmp45_; - gchar* _tmp46_; - gchar* _tmp47_; - gchar* _tmp48_; - gint _tmp49_; - gchar* _tmp50_; - gchar* _tmp51_; - gchar* _tmp52_; - gchar* _tmp53_; gint x = 0; - Box _tmp54_; - gint _tmp55_; - gint _tmp56_; + Box _tmp46_; + gint _tmp47_; gint y = 0; - Box _tmp57_; - gint _tmp58_; - gint _tmp59_; - EditingToolsPhotoCanvas* _tmp60_; - cairo_t* _tmp61_; - const gchar* _tmp62_; - gint _tmp63_; - gint _tmp64_; -#line 1790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = box_get_width (crop); + Box _tmp48_; + gint _tmp49_; + EditingToolsPhotoCanvas* _tmp50_; + cairo_t* _tmp51_; + const gchar* _tmp52_; + gint _tmp53_; + gint _tmp54_; #line 1790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - one_third_x = _tmp1_ / 3; -#line 1791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = box_get_height (crop); + one_third_x = box_get_width (crop) / 3; #line 1791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - one_third_y = _tmp2_ / 3; + one_third_y = box_get_height (crop) / 3; #line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = self->priv->thin_white_ctx; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = *crop; + _tmp2_ = self->priv->thin_white_ctx; #line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _tmp5_.left; + _tmp3_ = *crop; #line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = *crop; + _tmp4_ = _tmp3_.left; #line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = _tmp7_.top; + _tmp5_ = *crop; #line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = one_third_y; + _tmp6_ = _tmp5_.top; #line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = box_get_width (crop); + _tmp7_ = one_third_y; #line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_draw_horizontal_line (_tmp3_, _tmp4_, _tmp6_, _tmp8_ + _tmp9_, _tmp10_, TRUE); + editing_tools_photo_canvas_draw_horizontal_line (_tmp1_, _tmp2_, _tmp4_, _tmp6_ + _tmp7_, box_get_width (crop), TRUE); #line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = self->priv->thin_white_ctx; + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = *crop; + _tmp9_ = self->priv->thin_white_ctx; #line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = _tmp13_.left; + _tmp10_ = *crop; #line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = *crop; + _tmp11_ = _tmp10_.left; #line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = _tmp15_.top; + _tmp12_ = *crop; #line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = one_third_y; + _tmp13_ = _tmp12_.top; #line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = box_get_width (crop); + _tmp14_ = one_third_y; #line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_draw_horizontal_line (_tmp11_, _tmp12_, _tmp14_, _tmp16_ + (_tmp17_ * 2), _tmp18_, TRUE); + editing_tools_photo_canvas_draw_horizontal_line (_tmp8_, _tmp9_, _tmp11_, _tmp13_ + (_tmp14_ * 2), box_get_width (crop), TRUE); #line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = self->priv->thin_white_ctx; + _tmp16_ = self->priv->thin_white_ctx; #line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = *crop; + _tmp17_ = *crop; #line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = _tmp21_.left; + _tmp18_ = _tmp17_.left; #line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = one_third_x; + _tmp19_ = one_third_x; #line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = *crop; -#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = _tmp24_.top; + _tmp20_ = *crop; #line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp26_ = box_get_height (crop); + _tmp21_ = _tmp20_.top; #line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_draw_vertical_line (_tmp19_, _tmp20_, _tmp22_ + _tmp23_, _tmp25_, _tmp26_, TRUE); + editing_tools_photo_canvas_draw_vertical_line (_tmp15_, _tmp16_, _tmp18_ + _tmp19_, _tmp21_, box_get_height (crop), TRUE); #line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_ = self->priv->thin_white_ctx; + _tmp23_ = self->priv->thin_white_ctx; #line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp29_ = *crop; -#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp30_ = _tmp29_.left; + _tmp24_ = *crop; #line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp31_ = one_third_x; + _tmp25_ = _tmp24_.left; #line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp32_ = *crop; + _tmp26_ = one_third_x; #line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp33_ = _tmp32_.top; + _tmp27_ = *crop; #line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp34_ = box_get_height (crop); + _tmp28_ = _tmp27_.top; #line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_draw_vertical_line (_tmp27_, _tmp28_, _tmp30_ + (_tmp31_ * 2), _tmp33_, _tmp34_, TRUE); + editing_tools_photo_canvas_draw_vertical_line (_tmp22_, _tmp23_, _tmp25_ + (_tmp26_ * 2), _tmp28_, box_get_height (crop), TRUE); #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp29_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp35_, &_tmp36_); + editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp29_, &_tmp30_); #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - dimensions_for_rectangle (&_tmp36_, &_tmp37_); + dimensions_for_rectangle (&_tmp30_, &_tmp31_); #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp38_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp32_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp39_ = editing_tools_photo_canvas_get_photo (_tmp38_); + _tmp33_ = editing_tools_photo_canvas_get_photo (_tmp32_); #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp40_ = _tmp39_; + _tmp34_ = _tmp33_; #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp41_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp35_); #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - box_get_scaled_similar (&self->priv->scaled_crop, &_tmp37_, &_tmp41_, &_tmp42_); + box_get_scaled_similar (&self->priv->scaled_crop, &_tmp31_, &_tmp35_, &_tmp36_); #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp43_ = _tmp42_; + _tmp37_ = _tmp36_; #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp40_); + _g_object_unref0 (_tmp34_); #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - adj_crop = _tmp43_; -#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp44_ = box_get_width (&adj_crop); + adj_crop = _tmp37_; #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp45_ = g_strdup_printf ("%i", _tmp44_); + _tmp38_ = g_strdup_printf ("%i", box_get_width (&adj_crop)); #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp46_ = _tmp45_; + _tmp39_ = _tmp38_; #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp47_ = g_strconcat (_tmp46_, "x", NULL); + _tmp40_ = g_strconcat (_tmp39_, "x", NULL); #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp48_ = _tmp47_; + _tmp41_ = _tmp40_; #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp49_ = box_get_height (&adj_crop); + _tmp42_ = g_strdup_printf ("%i", box_get_height (&adj_crop)); #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp50_ = g_strdup_printf ("%i", _tmp49_); -#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp51_ = _tmp50_; + _tmp43_ = _tmp42_; #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp52_ = g_strconcat (_tmp48_, _tmp51_, NULL); + _tmp44_ = g_strconcat (_tmp41_, _tmp43_, NULL); #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp53_ = _tmp52_; + _tmp45_ = _tmp44_; #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_free0 (_tmp51_); + _g_free0 (_tmp43_); #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_free0 (_tmp48_); + _g_free0 (_tmp41_); #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_free0 (_tmp46_); + _g_free0 (_tmp39_); #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - text = _tmp53_; + text = _tmp45_; #line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp54_ = *crop; + _tmp46_ = *crop; #line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp55_ = _tmp54_.left; + _tmp47_ = _tmp46_.left; #line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp56_ = box_get_width (crop); -#line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - x = _tmp55_ + (_tmp56_ / 2); -#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp57_ = *crop; + x = _tmp47_ + (box_get_width (crop) / 2); #line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp58_ = _tmp57_.top; + _tmp48_ = *crop; #line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp59_ = box_get_height (crop); + _tmp49_ = _tmp48_.top; #line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - y = _tmp58_ + (_tmp59_ / 2); + y = _tmp49_ + (box_get_height (crop) / 2); #line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp60_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp50_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp61_ = self->priv->text_ctx; + _tmp51_ = self->priv->text_ctx; #line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp62_ = text; + _tmp52_ = text; #line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp63_ = x; + _tmp53_ = x; #line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp64_ = y; + _tmp54_ = y; #line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_draw_text (_tmp60_, _tmp61_, _tmp62_, _tmp63_, _tmp64_, TRUE); + editing_tools_photo_canvas_draw_text (_tmp50_, _tmp51_, _tmp52_, _tmp53_, _tmp54_, TRUE); #line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (text); -#line 11729 "EditingTools.c" +#line 12075 "EditingTools.c" } #line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp65_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp55_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp66_ = self->priv->wide_black_ctx; + _tmp56_ = self->priv->wide_black_ctx; #line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp67_ = *crop; + _tmp57_ = *crop; #line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_draw_box (_tmp65_, _tmp66_, &_tmp67_); + editing_tools_photo_canvas_draw_box (_tmp55_, _tmp56_, &_tmp57_); #line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp68_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp58_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp69_ = self->priv->wide_white_ctx; + _tmp59_ = self->priv->wide_white_ctx; #line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - box_get_reduced (crop, 1, &_tmp70_); + box_get_reduced (crop, 1, &_tmp60_); #line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_draw_box (_tmp68_, _tmp69_, &_tmp70_); + editing_tools_photo_canvas_draw_box (_tmp58_, _tmp59_, &_tmp60_); #line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp71_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp61_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp72_ = self->priv->wide_white_ctx; + _tmp62_ = self->priv->wide_white_ctx; #line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - box_get_reduced (crop, 2, &_tmp73_); + box_get_reduced (crop, 2, &_tmp63_); #line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_draw_box (_tmp71_, _tmp72_, &_tmp73_); -#line 11755 "EditingTools.c" + editing_tools_photo_canvas_draw_box (_tmp61_, _tmp62_, &_tmp63_); +#line 12101 "EditingTools.c" } -static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_construct (GType object_type, const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio) { +static EditingToolsCropToolConstraintDescription* +editing_tools_crop_tool_constraint_description_construct (GType object_type, + const gchar* new_name, + gint new_basis_width, + gint new_basis_height, + gboolean new_pivotable, + gfloat new_aspect_ratio) +{ EditingToolsCropToolConstraintDescription* self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - gint _tmp2_; - gint _tmp3_; - gfloat _tmp4_; - gboolean _tmp8_; + gchar* _tmp0_; #line 593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (new_name != NULL, NULL); #line 593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = (EditingToolsCropToolConstraintDescription*) g_type_create_instance (object_type); #line 595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = new_name; -#line 595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (new_name); #line 595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (self->name); #line 595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->name = _tmp1_; -#line 596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = new_basis_width; + self->name = _tmp0_; #line 596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->basis_width = _tmp2_; + self->basis_width = new_basis_width; #line 597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = new_basis_height; -#line 597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->basis_height = _tmp3_; -#line 598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = new_aspect_ratio; + self->basis_height = new_basis_height; #line 598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp4_ == EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS) { -#line 11791 "EditingTools.c" - gint _tmp5_; - gint _tmp6_; + if (new_aspect_ratio == EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS) { +#line 12131 "EditingTools.c" + gint _tmp1_; + gint _tmp2_; #line 599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = self->basis_width; + _tmp1_ = self->basis_width; #line 599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = self->basis_height; + _tmp2_ = self->basis_height; #line 599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->aspect_ratio = ((gfloat) _tmp5_) / ((gfloat) _tmp6_); -#line 11800 "EditingTools.c" + self->aspect_ratio = ((gfloat) _tmp1_) / ((gfloat) _tmp2_); +#line 12140 "EditingTools.c" } else { - gfloat _tmp7_; -#line 601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = new_aspect_ratio; #line 601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->aspect_ratio = _tmp7_; -#line 11807 "EditingTools.c" + self->aspect_ratio = new_aspect_ratio; +#line 12144 "EditingTools.c" } #line 602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = new_pivotable; -#line 602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->is_pivotable = _tmp8_; + self->is_pivotable = new_pivotable; #line 593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 11815 "EditingTools.c" +#line 12150 "EditingTools.c" } -static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_new (const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio) { +static EditingToolsCropToolConstraintDescription* +editing_tools_crop_tool_constraint_description_new (const gchar* new_name, + gint new_basis_width, + gint new_basis_height, + gboolean new_pivotable, + gfloat new_aspect_ratio) +{ #line 593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return editing_tools_crop_tool_constraint_description_construct (EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION, new_name, new_basis_width, new_basis_height, new_pivotable, new_aspect_ratio); -#line 11822 "EditingTools.c" +#line 12163 "EditingTools.c" } -static gboolean editing_tools_crop_tool_constraint_description_is_separator (EditingToolsCropToolConstraintDescription* self) { +static gboolean +editing_tools_crop_tool_constraint_description_is_separator (EditingToolsCropToolConstraintDescription* self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_; @@ -11832,124 +12175,149 @@ static gboolean editing_tools_crop_tool_constraint_description_is_separator (Edi _tmp1_ = self->is_pivotable; #line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!_tmp1_) { -#line 11836 "EditingTools.c" +#line 12179 "EditingTools.c" gfloat _tmp2_; #line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->aspect_ratio; #line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = _tmp2_ == EDITING_TOOLS_CROP_TOOL_SEPARATOR; -#line 11842 "EditingTools.c" +#line 12185 "EditingTools.c" } else { #line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = FALSE; -#line 11846 "EditingTools.c" +#line 12189 "EditingTools.c" } #line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp0_; #line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 11852 "EditingTools.c" +#line 12195 "EditingTools.c" } -static void editing_tools_crop_tool_value_constraint_description_init (GValue* value) { +static void +editing_tools_crop_tool_value_constraint_description_init (GValue* value) +{ #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 11859 "EditingTools.c" +#line 12204 "EditingTools.c" } -static void editing_tools_crop_tool_value_constraint_description_free_value (GValue* value) { +static void +editing_tools_crop_tool_value_constraint_description_free_value (GValue* value) +{ #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (value->data[0].v_pointer) { #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_constraint_description_unref (value->data[0].v_pointer); -#line 11868 "EditingTools.c" +#line 12215 "EditingTools.c" } } -static void editing_tools_crop_tool_value_constraint_description_copy_value (const GValue* src_value, GValue* dest_value) { +static void +editing_tools_crop_tool_value_constraint_description_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (src_value->data[0].v_pointer) { #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" dest_value->data[0].v_pointer = editing_tools_crop_tool_constraint_description_ref (src_value->data[0].v_pointer); -#line 11878 "EditingTools.c" +#line 12228 "EditingTools.c" } else { #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" dest_value->data[0].v_pointer = NULL; -#line 11882 "EditingTools.c" +#line 12232 "EditingTools.c" } } -static gpointer editing_tools_crop_tool_value_constraint_description_peek_pointer (const GValue* value) { +static gpointer +editing_tools_crop_tool_value_constraint_description_peek_pointer (const GValue* value) +{ #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return value->data[0].v_pointer; -#line 11890 "EditingTools.c" +#line 12242 "EditingTools.c" } -static gchar* editing_tools_crop_tool_value_constraint_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +editing_tools_crop_tool_value_constraint_description_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (collect_values[0].v_pointer) { -#line 11897 "EditingTools.c" +#line 12254 "EditingTools.c" EditingToolsCropToolConstraintDescription * object; object = collect_values[0].v_pointer; #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (object->parent_instance.g_class == NULL) { #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 11904 "EditingTools.c" +#line 12261 "EditingTools.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 11908 "EditingTools.c" +#line 12265 "EditingTools.c" } #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = editing_tools_crop_tool_constraint_description_ref (object); -#line 11912 "EditingTools.c" +#line 12269 "EditingTools.c" } else { #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 11916 "EditingTools.c" +#line 12273 "EditingTools.c" } #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return NULL; -#line 11920 "EditingTools.c" +#line 12277 "EditingTools.c" } -static gchar* editing_tools_crop_tool_value_constraint_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +editing_tools_crop_tool_value_constraint_description_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ EditingToolsCropToolConstraintDescription ** object_p; object_p = collect_values[0].v_pointer; #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!object_p) { #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 11931 "EditingTools.c" +#line 12293 "EditingTools.c" } #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!value->data[0].v_pointer) { #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *object_p = NULL; -#line 11937 "EditingTools.c" +#line 12299 "EditingTools.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *object_p = value->data[0].v_pointer; -#line 11941 "EditingTools.c" +#line 12303 "EditingTools.c" } else { #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *object_p = editing_tools_crop_tool_constraint_description_ref (value->data[0].v_pointer); -#line 11945 "EditingTools.c" +#line 12307 "EditingTools.c" } #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return NULL; -#line 11949 "EditingTools.c" +#line 12311 "EditingTools.c" } -static GParamSpec* editing_tools_crop_tool_param_spec_constraint_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +static GParamSpec* +editing_tools_crop_tool_param_spec_constraint_description (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ EditingToolsCropToolParamSpecConstraintDescription* spec; #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (g_type_is_a (object_type, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION), NULL); @@ -11959,20 +12327,25 @@ static GParamSpec* editing_tools_crop_tool_param_spec_constraint_description (co G_PARAM_SPEC (spec)->value_type = object_type; #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return G_PARAM_SPEC (spec); -#line 11963 "EditingTools.c" +#line 12331 "EditingTools.c" } -static gpointer editing_tools_crop_tool_value_get_constraint_description (const GValue* value) { +static gpointer +editing_tools_crop_tool_value_get_constraint_description (const GValue* value) +{ #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION), NULL); #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return value->data[0].v_pointer; -#line 11972 "EditingTools.c" +#line 12342 "EditingTools.c" } -static void editing_tools_crop_tool_value_set_constraint_description (GValue* value, gpointer v_object) { +static void +editing_tools_crop_tool_value_set_constraint_description (GValue* value, + gpointer v_object) +{ EditingToolsCropToolConstraintDescription * old; #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION)); @@ -11988,22 +12361,25 @@ static void editing_tools_crop_tool_value_set_constraint_description (GValue* va value->data[0].v_pointer = v_object; #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_constraint_description_ref (value->data[0].v_pointer); -#line 11992 "EditingTools.c" +#line 12365 "EditingTools.c" } else { #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 11996 "EditingTools.c" +#line 12369 "EditingTools.c" } #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (old) { #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_constraint_description_unref (old); -#line 12002 "EditingTools.c" +#line 12375 "EditingTools.c" } } -static void editing_tools_crop_tool_value_take_constraint_description (GValue* value, gpointer v_object) { +static void +editing_tools_crop_tool_value_take_constraint_description (GValue* value, + gpointer v_object) +{ EditingToolsCropToolConstraintDescription * old; #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION)); @@ -12017,38 +12393,44 @@ static void editing_tools_crop_tool_value_take_constraint_description (GValue* v g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = v_object; -#line 12021 "EditingTools.c" +#line 12397 "EditingTools.c" } else { #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 12025 "EditingTools.c" +#line 12401 "EditingTools.c" } #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (old) { #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_constraint_description_unref (old); -#line 12031 "EditingTools.c" +#line 12407 "EditingTools.c" } } -static void editing_tools_crop_tool_constraint_description_class_init (EditingToolsCropToolConstraintDescriptionClass * klass) { +static void +editing_tools_crop_tool_constraint_description_class_init (EditingToolsCropToolConstraintDescriptionClass * klass) +{ #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_constraint_description_parent_class = g_type_class_peek_parent (klass); #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsCropToolConstraintDescriptionClass *) klass)->finalize = editing_tools_crop_tool_constraint_description_finalize; -#line 12041 "EditingTools.c" +#line 12419 "EditingTools.c" } -static void editing_tools_crop_tool_constraint_description_instance_init (EditingToolsCropToolConstraintDescription * self) { +static void +editing_tools_crop_tool_constraint_description_instance_init (EditingToolsCropToolConstraintDescription * self) +{ #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->ref_count = 1; -#line 12048 "EditingTools.c" +#line 12428 "EditingTools.c" } -static void editing_tools_crop_tool_constraint_description_finalize (EditingToolsCropToolConstraintDescription * obj) { +static void +editing_tools_crop_tool_constraint_description_finalize (EditingToolsCropToolConstraintDescription * obj) +{ EditingToolsCropToolConstraintDescription * self; #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION, EditingToolsCropToolConstraintDescription); @@ -12056,11 +12438,13 @@ static void editing_tools_crop_tool_constraint_description_finalize (EditingTool g_signal_handlers_destroy (self); #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (self->name); -#line 12060 "EditingTools.c" +#line 12442 "EditingTools.c" } -static GType editing_tools_crop_tool_constraint_description_get_type (void) { +static GType +editing_tools_crop_tool_constraint_description_get_type (void) +{ static volatile gsize editing_tools_crop_tool_constraint_description_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_crop_tool_constraint_description_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { editing_tools_crop_tool_value_constraint_description_init, editing_tools_crop_tool_value_constraint_description_free_value, editing_tools_crop_tool_value_constraint_description_copy_value, editing_tools_crop_tool_value_constraint_description_peek_pointer, "p", editing_tools_crop_tool_value_constraint_description_collect_value, "p", editing_tools_crop_tool_value_constraint_description_lcopy_value }; @@ -12074,18 +12458,22 @@ static GType editing_tools_crop_tool_constraint_description_get_type (void) { } -static gpointer editing_tools_crop_tool_constraint_description_ref (gpointer instance) { +static gpointer +editing_tools_crop_tool_constraint_description_ref (gpointer instance) +{ EditingToolsCropToolConstraintDescription * self; self = instance; #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_atomic_int_inc (&self->ref_count); #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return instance; -#line 12085 "EditingTools.c" +#line 12471 "EditingTools.c" } -static void editing_tools_crop_tool_constraint_description_unref (gpointer instance) { +static void +editing_tools_crop_tool_constraint_description_unref (gpointer instance) +{ EditingToolsCropToolConstraintDescription * self; self = instance; #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -12094,260 +12482,270 @@ static void editing_tools_crop_tool_constraint_description_unref (gpointer insta EDITING_TOOLS_CROP_TOOL_CONSTRAINT_DESCRIPTION_GET_CLASS (self)->finalize (self); #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_type_free_instance ((GTypeInstance *) self); -#line 12098 "EditingTools.c" +#line 12486 "EditingTools.c" } } -static gboolean _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self) { +static gboolean +_editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, + GtkTreeIter* iter, + gpointer self) +{ gboolean result; result = editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (model, iter); #line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 12108 "EditingTools.c" +#line 12500 "EditingTools.c" } -static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_window_construct (GType object_type, GtkWindow* container) { +static EditingToolsCropToolCropToolWindow* +editing_tools_crop_tool_crop_tool_window_construct (GType object_type, + GtkWindow* container) +{ EditingToolsCropToolCropToolWindow * self = NULL; - GtkWindow* _tmp0_; + GtkButton* _tmp0_; GtkButton* _tmp1_; GtkButton* _tmp2_; GtkButton* _tmp3_; - GtkButton* _tmp4_; - GtkComboBox* _tmp5_; + GtkComboBox* _tmp4_; GtkCellRendererText* combo_text_renderer = NULL; - GtkCellRendererText* _tmp6_; + GtkCellRendererText* _tmp5_; + GtkComboBox* _tmp6_; GtkComboBox* _tmp7_; GtkComboBox* _tmp8_; GtkComboBox* _tmp9_; - GtkComboBox* _tmp10_; GtkImage* image = NULL; - GtkImage* _tmp11_; + GtkImage* _tmp10_; + GtkButton* _tmp11_; GtkButton* _tmp12_; - GtkButton* _tmp13_; + GtkEntry* _tmp13_; GtkEntry* _tmp14_; GtkEntry* _tmp15_; GtkEntry* _tmp16_; - GtkEntry* _tmp17_; + GtkBox* _tmp17_; GtkBox* _tmp18_; GtkBox* _tmp19_; - GtkBox* _tmp20_; - GtkButton* _tmp21_; - GtkBox* _tmp22_; - GtkButton* _tmp23_; + GtkButton* _tmp20_; + GtkBox* _tmp21_; + GtkButton* _tmp22_; + GtkBox* _tmp23_; GtkBox* _tmp24_; - GtkBox* _tmp25_; - GtkComboBox* _tmp26_; - GtkBox* _tmp27_; - GtkButton* _tmp28_; + GtkComboBox* _tmp25_; + GtkBox* _tmp26_; + GtkButton* _tmp27_; + GtkBox* _tmp28_; GtkBox* _tmp29_; GtkBox* _tmp30_; - GtkBox* _tmp31_; #line 641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (GTK_IS_WINDOW (container), NULL); #line 642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = container; -#line 642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self = (EditingToolsCropToolCropToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_); + self = (EditingToolsCropToolCropToolWindow*) editing_tools_editing_tool_window_construct (object_type, container); #line 644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = self->cancel_button; + _tmp0_ = self->cancel_button; #line 644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), _ ("Return to current photo dimensions")); + gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _ ("Return to current photo dimensions")); #line 645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = self->cancel_button; + _tmp1_ = self->cancel_button; #line 645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_button_set_image_position (_tmp2_, GTK_POS_LEFT); + gtk_button_set_image_position (_tmp1_, GTK_POS_LEFT); #line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = self->ok_button; + _tmp2_ = self->ok_button; #line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _ ("Set the crop for this photo")); + gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), _ ("Set the crop for this photo")); #line 648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = self->ok_button; + _tmp3_ = self->ok_button; #line 648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_button_set_image_position (_tmp4_, GTK_POS_LEFT); + gtk_button_set_image_position (_tmp3_, GTK_POS_LEFT); #line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = (GtkComboBox*) gtk_combo_box_new (); + _tmp4_ = (GtkComboBox*) gtk_combo_box_new (); #line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp5_); + g_object_ref_sink (_tmp4_); #line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->constraint_combo); #line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->constraint_combo = _tmp5_; + self->constraint_combo = _tmp4_; #line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = (GtkCellRendererText*) gtk_cell_renderer_text_new (); + _tmp5_ = (GtkCellRendererText*) gtk_cell_renderer_text_new (); #line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp6_); + g_object_ref_sink (_tmp5_); #line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - combo_text_renderer = _tmp6_; + combo_text_renderer = _tmp5_; #line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = self->constraint_combo; + _tmp6_ = self->constraint_combo; #line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); + gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); #line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = self->constraint_combo; + _tmp7_ = self->constraint_combo; #line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 0); + gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 0); #line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = self->constraint_combo; + _tmp8_ = self->constraint_combo; #line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_combo_box_set_row_separator_func (_tmp9_, _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func, NULL, NULL); + gtk_combo_box_set_row_separator_func (_tmp8_, _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func, NULL, NULL); #line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = self->constraint_combo; + _tmp9_ = self->constraint_combo; #line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_combo_box_set_active (_tmp10_, 0); + gtk_combo_box_set_active (_tmp9_, 0); #line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = (GtkImage*) gtk_image_new_from_icon_name ("crop-pivot-reticle", GTK_ICON_SIZE_LARGE_TOOLBAR); + _tmp10_ = (GtkImage*) gtk_image_new_from_icon_name ("crop-pivot-reticle", (GtkIconSize) GTK_ICON_SIZE_LARGE_TOOLBAR); #line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp11_); + g_object_ref_sink (_tmp10_); #line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - image = _tmp11_; + image = _tmp10_; #line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = self->pivot_reticle_button; + _tmp11_ = self->pivot_reticle_button; #line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_button_set_image (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget)); + gtk_button_set_image (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget)); #line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = self->pivot_reticle_button; + _tmp12_ = self->pivot_reticle_button; #line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), _ ("Pivot the crop rectangle between portrait and landscape orientations")); + gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), _ ("Pivot the crop rectangle between portrait and landscape orientations")); #line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = self->custom_width_entry; + _tmp13_ = self->custom_width_entry; #line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_entry_set_width_chars (_tmp14_, 4); + gtk_entry_set_width_chars (_tmp13_, 4); #line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = self->custom_width_entry; + _tmp14_ = self->custom_width_entry; #line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_set (_tmp15_, "editable", TRUE, NULL); + g_object_set (_tmp14_, "editable", TRUE, NULL); #line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = self->custom_height_entry; + _tmp15_ = self->custom_height_entry; #line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_entry_set_width_chars (_tmp16_, 4); + gtk_entry_set_width_chars (_tmp15_, 4); #line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = self->custom_height_entry; + _tmp16_ = self->custom_height_entry; #line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_set (_tmp17_, "editable", TRUE, NULL); + g_object_set (_tmp16_, "editable", TRUE, NULL); #line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING); + _tmp17_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING); #line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp18_); + g_object_ref_sink (_tmp17_); #line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->response_layout); #line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->response_layout = _tmp18_; + self->response_layout = _tmp17_; #line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = self->response_layout; + _tmp18_ = self->response_layout; #line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_box_set_homogeneous (_tmp19_, TRUE); + gtk_box_set_homogeneous (_tmp18_, TRUE); #line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = self->response_layout; + _tmp19_ = self->response_layout; #line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = self->cancel_button; + _tmp20_ = self->cancel_button; #line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget)); #line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = self->response_layout; + _tmp21_ = self->response_layout; #line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = self->ok_button; + _tmp22_ = self->ok_button; #line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget)); #line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING); + _tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING); #line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp24_); + g_object_ref_sink (_tmp23_); #line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->layout); #line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->layout = _tmp24_; + self->layout = _tmp23_; #line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = self->layout; + _tmp24_ = self->layout; #line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp26_ = self->constraint_combo; + _tmp25_ = self->constraint_combo; #line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget)); #line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp27_ = self->layout; + _tmp26_ = self->layout; #line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_ = self->pivot_reticle_button; + _tmp27_ = self->pivot_reticle_button; #line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget)); #line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp29_ = self->layout; + _tmp28_ = self->layout; #line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp30_ = self->response_layout; + _tmp29_ = self->response_layout; #line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget)); #line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp31_ = self->layout; + _tmp30_ = self->layout; #line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget)); #line 641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (image); #line 641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (combo_text_renderer); #line 641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 12290 "EditingTools.c" +#line 12682 "EditingTools.c" } -static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_window_new (GtkWindow* container) { +static EditingToolsCropToolCropToolWindow* +editing_tools_crop_tool_crop_tool_window_new (GtkWindow* container) +{ #line 641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return editing_tools_crop_tool_crop_tool_window_construct (EDITING_TOOLS_CROP_TOOL_TYPE_CROP_TOOL_WINDOW, container); -#line 12297 "EditingTools.c" +#line 12691 "EditingTools.c" } -static gboolean editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (GtkTreeModel* model, GtkTreeIter* iter) { +static gboolean +editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (GtkTreeModel* model, + GtkTreeIter* iter) +{ gboolean result = FALSE; GValue val = {0}; - GtkTreeModel* _tmp0_; - GtkTreeIter _tmp1_; - GValue _tmp2_ = {0}; + GtkTreeIter _tmp0_; + GValue _tmp1_ = {0}; + gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - gboolean _tmp5_; + gboolean _tmp4_; #line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE); #line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (iter != NULL, FALSE); #line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = model; + _tmp0_ = *iter; #line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = *iter; -#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_tree_model_get_value (_tmp0_, &_tmp1_, 0, &_tmp2_); + gtk_tree_model_get_value (model, &_tmp0_, 0, &_tmp1_); #line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL; #line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - val = _tmp2_; + val = _tmp1_; #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = g_value_dup_string (&val); + _tmp2_ = g_value_dup_string (&val); #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = g_strcmp0 (_tmp4_, "-") == 0; + _tmp4_ = g_strcmp0 (_tmp3_, "-") == 0; #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - result = _tmp5_; + result = _tmp4_; #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL; #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 12338 "EditingTools.c" +#line 12732 "EditingTools.c" } -static void editing_tools_crop_tool_crop_tool_window_class_init (EditingToolsCropToolCropToolWindowClass * klass) { +static void +editing_tools_crop_tool_crop_tool_window_class_init (EditingToolsCropToolCropToolWindowClass * klass) +{ #line 625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_crop_tool_window_parent_class = g_type_class_peek_parent (klass); #line 625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (klass)->finalize = editing_tools_crop_tool_crop_tool_window_finalize; -#line 12347 "EditingTools.c" +#line 12743 "EditingTools.c" } -static void editing_tools_crop_tool_crop_tool_window_instance_init (EditingToolsCropToolCropToolWindow * self) { +static void +editing_tools_crop_tool_crop_tool_window_instance_init (EditingToolsCropToolCropToolWindow * self) +{ GtkButton* _tmp0_; GtkButton* _tmp1_; GtkButton* _tmp2_; @@ -12400,11 +12798,13 @@ static void editing_tools_crop_tool_crop_tool_window_instance_init (EditingTools self->normal_width = -1; #line 639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->normal_height = -1; -#line 12404 "EditingTools.c" +#line 12802 "EditingTools.c" } -static void editing_tools_crop_tool_crop_tool_window_finalize (GObject * obj) { +static void +editing_tools_crop_tool_crop_tool_window_finalize (GObject * obj) +{ EditingToolsCropToolCropToolWindow * self; #line 625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_CROP_TOOL_TYPE_CROP_TOOL_WINDOW, EditingToolsCropToolCropToolWindow); @@ -12430,11 +12830,13 @@ static void editing_tools_crop_tool_crop_tool_window_finalize (GObject * obj) { _g_object_unref0 (self->layout); #line 625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (editing_tools_crop_tool_crop_tool_window_parent_class)->finalize (obj); -#line 12434 "EditingTools.c" +#line 12834 "EditingTools.c" } -static GType editing_tools_crop_tool_crop_tool_window_get_type (void) { +static GType +editing_tools_crop_tool_crop_tool_window_get_type (void) +{ static volatile gsize editing_tools_crop_tool_crop_tool_window_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_crop_tool_crop_tool_window_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditingToolsCropToolCropToolWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_crop_tool_crop_tool_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsCropToolCropToolWindow), 0, (GInstanceInitFunc) editing_tools_crop_tool_crop_tool_window_instance_init, NULL }; @@ -12446,7 +12848,9 @@ static GType editing_tools_crop_tool_crop_tool_window_get_type (void) { } -static void editing_tools_crop_tool_class_init (EditingToolsCropToolClass * klass) { +static void +editing_tools_crop_tool_class_init (EditingToolsCropToolClass * klass) +{ #line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_parent_class = g_type_class_peek_parent (klass); #line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -12471,11 +12875,13 @@ static void editing_tools_crop_tool_class_init (EditingToolsCropToolClass * klas ((EditingToolsEditingToolClass *) klass)->on_motion = (void (*) (EditingToolsEditingTool *, gint, gint, GdkModifierType)) editing_tools_crop_tool_real_on_motion; #line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_crop_tool_real_paint; -#line 12475 "EditingTools.c" +#line 12879 "EditingTools.c" } -static void editing_tools_crop_tool_instance_init (EditingToolsCropTool * self) { +static void +editing_tools_crop_tool_instance_init (EditingToolsCropTool * self) +{ gint _tmp0_; EditingToolsCropToolConstraintDescription** _tmp1_; gint _tmp2_; @@ -12543,11 +12949,13 @@ static void editing_tools_crop_tool_instance_init (EditingToolsCropTool * self) self->priv->custom_init_height = -1; #line 713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->pre_aspect_ratio = EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO; -#line 12547 "EditingTools.c" +#line 12953 "EditingTools.c" } -static void editing_tools_crop_tool_finalize (EditingToolsEditingTool * obj) { +static void +editing_tools_crop_tool_finalize (EditingToolsEditingTool * obj) +{ EditingToolsCropTool * self; #line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool); @@ -12569,11 +12977,13 @@ static void editing_tools_crop_tool_finalize (EditingToolsEditingTool * obj) { _g_object_unref0 (self->priv->constraint_list); #line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->finalize (obj); -#line 12573 "EditingTools.c" +#line 12981 "EditingTools.c" } -GType editing_tools_crop_tool_get_type (void) { +GType +editing_tools_crop_tool_get_type (void) +{ static volatile gsize editing_tools_crop_tool_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_crop_tool_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditingToolsCropToolClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_crop_tool_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsCropTool), 0, (GInstanceInitFunc) editing_tools_crop_tool_instance_init, NULL }; @@ -12585,7 +12995,9 @@ GType editing_tools_crop_tool_get_type (void) { } -static void editing_tools_redeye_instance_init (EditingToolsRedeyeInstance *self) { +static void +editing_tools_redeye_instance_init (EditingToolsRedeyeInstance *self) +{ GdkPoint default_center = {0}; GdkPoint _tmp0_; #line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -12598,11 +13010,14 @@ static void editing_tools_redeye_instance_init (EditingToolsRedeyeInstance *self (*self).center = _tmp0_; #line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*self).radius = EDITING_TOOLS_REDEYE_INSTANCE_DEFAULT_RADIUS; -#line 12602 "EditingTools.c" +#line 13014 "EditingTools.c" } -void editing_tools_redeye_instance_to_bounds_rect (EditingToolsRedeyeInstance* inst, GdkRectangle* result) { +void +editing_tools_redeye_instance_to_bounds_rect (EditingToolsRedeyeInstance* inst, + GdkRectangle* result) +{ GdkRectangle _result_ = {0}; EditingToolsRedeyeInstance _tmp0_; GdkPoint _tmp1_; @@ -12662,11 +13077,14 @@ void editing_tools_redeye_instance_to_bounds_rect (EditingToolsRedeyeInstance* i *result = _result_; #line 1839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 12666 "EditingTools.c" +#line 13081 "EditingTools.c" } -void editing_tools_redeye_instance_from_bounds_rect (GdkRectangle* rect, EditingToolsRedeyeInstance* result) { +void +editing_tools_redeye_instance_from_bounds_rect (GdkRectangle* rect, + EditingToolsRedeyeInstance* result) +{ GdkRectangle in_rect = {0}; GdkRectangle _tmp0_; EditingToolsRedeyeInstance _result_ = {0}; @@ -12724,11 +13142,13 @@ void editing_tools_redeye_instance_from_bounds_rect (GdkRectangle* rect, Editing *result = _result_; #line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 12728 "EditingTools.c" +#line 13146 "EditingTools.c" } -EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingToolsRedeyeInstance* self) { +EditingToolsRedeyeInstance* +editing_tools_redeye_instance_dup (const EditingToolsRedeyeInstance* self) +{ EditingToolsRedeyeInstance* dup; #line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" dup = g_new0 (EditingToolsRedeyeInstance, 1); @@ -12736,18 +13156,22 @@ EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingTool memcpy (dup, self, sizeof (EditingToolsRedeyeInstance)); #line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return dup; -#line 12740 "EditingTools.c" +#line 13160 "EditingTools.c" } -void editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self) { +void +editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self) +{ #line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_free (self); -#line 12747 "EditingTools.c" +#line 13169 "EditingTools.c" } -GType editing_tools_redeye_instance_get_type (void) { +GType +editing_tools_redeye_instance_get_type (void) +{ static volatile gsize editing_tools_redeye_instance_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_redeye_instance_type_id__volatile)) { GType editing_tools_redeye_instance_type_id; @@ -12758,24 +13182,30 @@ GType editing_tools_redeye_instance_get_type (void) { } -static EditingToolsRedeyeTool* editing_tools_redeye_tool_construct (GType object_type) { +static EditingToolsRedeyeTool* +editing_tools_redeye_tool_construct (GType object_type) +{ EditingToolsRedeyeTool* self = NULL; #line 1902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = (EditingToolsRedeyeTool*) editing_tools_editing_tool_construct (object_type, "RedeyeTool"); #line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 12768 "EditingTools.c" +#line 13194 "EditingTools.c" } -static EditingToolsRedeyeTool* editing_tools_redeye_tool_new (void) { +static EditingToolsRedeyeTool* +editing_tools_redeye_tool_new (void) +{ #line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return editing_tools_redeye_tool_construct (EDITING_TOOLS_TYPE_REDEYE_TOOL); -#line 12775 "EditingTools.c" +#line 13203 "EditingTools.c" } -EditingToolsRedeyeTool* editing_tools_redeye_tool_factory (void) { +EditingToolsRedeyeTool* +editing_tools_redeye_tool_factory (void) +{ EditingToolsRedeyeTool* result = NULL; EditingToolsRedeyeTool* _tmp0_; #line 1906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -12784,148 +13214,151 @@ EditingToolsRedeyeTool* editing_tools_redeye_tool_factory (void) { result = _tmp0_; #line 1906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 12788 "EditingTools.c" +#line 13218 "EditingTools.c" } -gboolean editing_tools_redeye_tool_is_available (Photo* photo, Scaling* scaling) { +gboolean +editing_tools_redeye_tool_is_available (Photo* photo, + Scaling* scaling) +{ gboolean result = FALSE; Dimensions dim = {0}; - Photo* _tmp0_; + Dimensions _tmp0_ = {0}; Dimensions _tmp1_ = {0}; - Dimensions _tmp2_ = {0}; - gboolean _tmp3_ = FALSE; - Dimensions _tmp4_; - gint _tmp5_; + gboolean _tmp2_ = FALSE; + Dimensions _tmp3_; + gint _tmp4_; #line 1909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_PHOTO (photo), FALSE); #line 1909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (scaling != NULL, FALSE); #line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = photo; + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp0_); #line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp1_); + scaling_get_scaled_dimensions (scaling, &_tmp0_, &_tmp1_); #line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - scaling_get_scaled_dimensions (scaling, &_tmp1_, &_tmp2_); -#line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - dim = _tmp2_; + dim = _tmp1_; #line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = dim; + _tmp3_ = dim; #line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = _tmp4_.width; + _tmp4_ = _tmp3_.width; #line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp5_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2)) { -#line 12819 "EditingTools.c" - Dimensions _tmp6_; - gint _tmp7_; + if (_tmp4_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2)) { +#line 13249 "EditingTools.c" + Dimensions _tmp5_; + gint _tmp6_; #line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = dim; + _tmp5_ = dim; #line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = _tmp6_.height; + _tmp6_ = _tmp5_.height; #line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = _tmp7_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2); -#line 12828 "EditingTools.c" + _tmp2_ = _tmp6_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2); +#line 13258 "EditingTools.c" } else { #line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = FALSE; -#line 12832 "EditingTools.c" + _tmp2_ = FALSE; +#line 13262 "EditingTools.c" } #line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - result = _tmp3_; + result = _tmp2_; #line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 12838 "EditingTools.c" +#line 13268 "EditingTools.c" } -static void editing_tools_redeye_tool_new_interaction_instance (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas, EditingToolsRedeyeInstance* result) { +static void +editing_tools_redeye_tool_new_interaction_instance (EditingToolsRedeyeTool* self, + EditingToolsPhotoCanvas* canvas, + EditingToolsRedeyeInstance* result) +{ GdkRectangle photo_bounds = {0}; - EditingToolsPhotoCanvas* _tmp0_; - GdkRectangle _tmp1_ = {0}; + GdkRectangle _tmp0_ = {0}; GdkPoint photo_center = {0}; - GdkPoint _tmp2_ = {0}; - GdkRectangle _tmp3_; - gint _tmp4_; - GdkRectangle _tmp5_; - gint _tmp6_; - GdkRectangle _tmp7_; - gint _tmp8_; - GdkRectangle _tmp9_; - gint _tmp10_; + GdkPoint _tmp1_ = {0}; + GdkRectangle _tmp2_; + gint _tmp3_; + GdkRectangle _tmp4_; + gint _tmp5_; + GdkRectangle _tmp6_; + gint _tmp7_; + GdkRectangle _tmp8_; + gint _tmp9_; EditingToolsRedeyeInstance _result_ = {0}; - GdkPoint _tmp11_; - gint _tmp12_; - GdkPoint _tmp13_; - gint _tmp14_; + GdkPoint _tmp10_; + gint _tmp11_; + GdkPoint _tmp12_; + gint _tmp13_; #line 1916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self)); #line 1916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); #line 1917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = canvas; -#line 1917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_); + editing_tools_photo_canvas_get_scaled_pixbuf_position (canvas, &_tmp0_); #line 1917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - photo_bounds = _tmp1_; + photo_bounds = _tmp0_; #line 1918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_.x = 0; + _tmp1_.x = 0; #line 1918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - photo_center = _tmp2_; + photo_center = _tmp1_; #line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = photo_bounds; + _tmp2_ = photo_bounds; #line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = _tmp3_.x; + _tmp3_ = _tmp2_.x; #line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = photo_bounds; + _tmp4_ = photo_bounds; #line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _tmp5_.width; + _tmp5_ = _tmp4_.width; #line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - photo_center.x = _tmp4_ + (_tmp6_ / 2); + photo_center.x = _tmp3_ + (_tmp5_ / 2); #line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = photo_bounds; + _tmp6_ = photo_bounds; #line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = _tmp7_.y; + _tmp7_ = _tmp6_.y; #line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = photo_bounds; + _tmp8_ = photo_bounds; #line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = _tmp9_.height; + _tmp9_ = _tmp8_.height; #line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - photo_center.y = _tmp8_ + (_tmp10_ / 2); + photo_center.y = _tmp7_ + (_tmp9_ / 2); #line 1922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_instance_init (&_result_); #line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = photo_center; + _tmp10_ = photo_center; #line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = _tmp11_.x; + _tmp11_ = _tmp10_.x; #line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _result_.center.x = _tmp12_; + _result_.center.x = _tmp11_; #line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = photo_center; + _tmp12_ = photo_center; #line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = _tmp13_.y; + _tmp13_ = _tmp12_.y; #line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _result_.center.y = _tmp14_; + _result_.center.y = _tmp13_; #line 1925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_.radius = EDITING_TOOLS_REDEYE_INSTANCE_DEFAULT_RADIUS; #line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *result = _result_; #line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 12915 "EditingTools.c" +#line 13346 "EditingTools.c" } -static void editing_tools_redeye_tool_prepare_ctx (EditingToolsRedeyeTool* self, cairo_t* ctx, Dimensions* dim) { - cairo_t* _tmp0_; - cairo_surface_t* _tmp1_; +static void +editing_tools_redeye_tool_prepare_ctx (EditingToolsRedeyeTool* self, + cairo_t* ctx, + Dimensions* dim) +{ + cairo_surface_t* _tmp0_; + cairo_t* _tmp1_; cairo_t* _tmp2_; cairo_t* _tmp3_; - cairo_t* _tmp4_; + cairo_surface_t* _tmp4_; cairo_t* _tmp5_; - cairo_surface_t* _tmp6_; + cairo_t* _tmp6_; cairo_t* _tmp7_; - cairo_t* _tmp8_; - cairo_t* _tmp9_; #line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self)); #line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -12933,46 +13366,45 @@ static void editing_tools_redeye_tool_prepare_ctx (EditingToolsRedeyeTool* self, #line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (dim != NULL); #line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = ctx; + _tmp0_ = cairo_get_target (ctx); #line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = cairo_get_target (_tmp0_); -#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = cairo_create (_tmp1_); + _tmp1_ = cairo_create (_tmp0_); #line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->wider_gray_ctx); #line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->wider_gray_ctx = _tmp2_; + self->priv->wider_gray_ctx = _tmp1_; #line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = self->priv->wider_gray_ctx; + _tmp2_ = self->priv->wider_gray_ctx; #line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - set_source_color_from_string (_tmp3_, "#111"); + set_source_color_from_string (_tmp2_, "#111"); #line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = self->priv->wider_gray_ctx; + _tmp3_ = self->priv->wider_gray_ctx; #line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_line_width (_tmp4_, (gdouble) 3); + cairo_set_line_width (_tmp3_, (gdouble) 3); #line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = ctx; + _tmp4_ = cairo_get_target (ctx); #line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = cairo_get_target (_tmp5_); -#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = cairo_create (_tmp6_); + _tmp5_ = cairo_create (_tmp4_); #line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->thin_white_ctx); #line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->thin_white_ctx = _tmp7_; + self->priv->thin_white_ctx = _tmp5_; #line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = self->priv->thin_white_ctx; + _tmp6_ = self->priv->thin_white_ctx; #line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - set_source_color_from_string (_tmp8_, "#FFF"); + set_source_color_from_string (_tmp6_, "#FFF"); #line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = self->priv->thin_white_ctx; + _tmp7_ = self->priv->thin_white_ctx; #line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_line_width (_tmp9_, (gdouble) 1); -#line 12972 "EditingTools.c" + cairo_set_line_width (_tmp7_, (gdouble) 1); +#line 13401 "EditingTools.c" } -static void editing_tools_redeye_tool_draw_redeye_instance (EditingToolsRedeyeTool* self, EditingToolsRedeyeInstance* inst) { +static void +editing_tools_redeye_tool_draw_redeye_instance (EditingToolsRedeyeTool* self, + EditingToolsRedeyeInstance* inst) +{ EditingToolsPhotoCanvas* _tmp0_; cairo_t* _tmp1_; EditingToolsRedeyeInstance _tmp2_; @@ -13041,16 +13473,18 @@ static void editing_tools_redeye_tool_draw_redeye_instance (EditingToolsRedeyeTo _tmp19_ = _tmp18_.radius; #line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_draw_circle (_tmp10_, _tmp11_, _tmp14_, _tmp17_, _tmp19_); -#line 13045 "EditingTools.c" +#line 13477 "EditingTools.c" } -static gboolean editing_tools_redeye_tool_on_size_slider_adjust (EditingToolsRedeyeTool* self, GtkScrollType type) { +static gboolean +editing_tools_redeye_tool_on_size_slider_adjust (EditingToolsRedeyeTool* self, + GtkScrollType type) +{ gboolean result = FALSE; EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_; GtkScale* _tmp1_; - gdouble _tmp2_; - EditingToolsPhotoCanvas* _tmp3_; + EditingToolsPhotoCanvas* _tmp2_; #line 1947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self), FALSE); #line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -13058,22 +13492,22 @@ static gboolean editing_tools_redeye_tool_on_size_slider_adjust (EditingToolsRed #line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->slider; #line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)); -#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->user_interaction_instance.radius = (gint) _tmp2_; + self->priv->user_interaction_instance.radius = (gint) gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)); #line 1951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_repaint (_tmp3_); + editing_tools_photo_canvas_repaint (_tmp2_); #line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; #line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 13073 "EditingTools.c" +#line 13505 "EditingTools.c" } -static void editing_tools_redeye_tool_on_apply (EditingToolsRedeyeTool* self) { +static void +editing_tools_redeye_tool_on_apply (EditingToolsRedeyeTool* self) +{ GdkRectangle bounds_rect_user = {0}; EditingToolsRedeyeInstance _tmp0_; GdkRectangle _tmp1_ = {0}; @@ -13230,111 +13664,108 @@ static void editing_tools_redeye_tool_on_apply (EditingToolsRedeyeTool* self) { _command_manager_unref0 (_tmp37_); #line 1956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (command); -#line 13234 "EditingTools.c" +#line 13668 "EditingTools.c" } -static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool* self, GeeMap* map) { - GeeMap* _tmp0_; - EditingToolsPhotoCanvas* _tmp1_; +static void +editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool* self, + GeeMap* map) +{ + EditingToolsPhotoCanvas* _tmp0_; + Photo* _tmp1_; Photo* _tmp2_; - Photo* _tmp3_; - gboolean _tmp4_; - gboolean _tmp5_; - EditingToolsPhotoCanvas* _tmp17_; + gboolean _tmp3_; + EditingToolsPhotoCanvas* _tmp15_; GError * _inner_error_ = NULL; #line 1987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self)); #line 1987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (GEE_IS_MAP (map)); #line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = map; -#line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_); + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = _tmp2_; + _tmp1_ = editing_tools_photo_canvas_get_photo (_tmp0_); #line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); + _tmp2_ = _tmp1_; #line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = !_tmp4_; + _tmp3_ = !gee_map_has_key (map, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject)); #line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp5_) { + if (_tmp3_) { #line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 13269 "EditingTools.c" +#line 13700 "EditingTools.c" } { - GdkPixbuf* _tmp6_ = NULL; - EditingToolsPhotoCanvas* _tmp7_; - Photo* _tmp8_; - Photo* _tmp9_; - EditingToolsPhotoCanvas* _tmp10_; - Scaling _tmp11_ = {0}; + GdkPixbuf* _tmp4_ = NULL; + EditingToolsPhotoCanvas* _tmp5_; + Photo* _tmp6_; + Photo* _tmp7_; + EditingToolsPhotoCanvas* _tmp8_; + Scaling _tmp9_ = {0}; + GdkPixbuf* _tmp10_; + GdkPixbuf* _tmp11_; GdkPixbuf* _tmp12_; - GdkPixbuf* _tmp13_; - GdkPixbuf* _tmp14_; #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = editing_tools_photo_canvas_get_photo (_tmp7_); + _tmp6_ = editing_tools_photo_canvas_get_photo (_tmp5_); #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_get_scaling (_tmp10_, &_tmp11_); + editing_tools_photo_canvas_get_scaling (_tmp8_, &_tmp9_); #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp11_, &_inner_error_); + _tmp10_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp9_, &_inner_error_); #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp7_); #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _tmp13_; + _tmp4_ = _tmp11_; #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 13301 "EditingTools.c" +#line 13732 "EditingTools.c" goto __catch26_g_error; } #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = _tmp6_; + _tmp12_ = _tmp4_; #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = NULL; + _tmp4_ = NULL; #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->current_pixbuf); #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->current_pixbuf = _tmp14_; + self->priv->current_pixbuf = _tmp12_; #line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp6_); -#line 13314 "EditingTools.c" + _g_object_unref0 (_tmp4_); +#line 13745 "EditingTools.c" } goto __finally26; __catch26_g_error: { GError* err = NULL; - GError* _tmp15_; - const gchar* _tmp16_; + GError* _tmp13_; + const gchar* _tmp14_; #line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" err = _inner_error_; #line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _inner_error_ = NULL; #line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = err; + _tmp13_ = err; #line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = _tmp15_->message; + _tmp14_ = _tmp13_->message; #line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_warning ("EditingTools.vala:1994: %s", _tmp16_); + g_warning ("EditingTools.vala:1994: %s", _tmp14_); #line 1995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ABORTED_SIGNAL], 0); #line 1997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_error_free0 (err); #line 1997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 13338 "EditingTools.c" +#line 13769 "EditingTools.c" } __finally26: #line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -13345,17 +13776,19 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool* g_clear_error (&_inner_error_); #line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 13349 "EditingTools.c" +#line 13780 "EditingTools.c" } #line 2000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 2000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_repaint (_tmp17_); -#line 13355 "EditingTools.c" + editing_tools_photo_canvas_repaint (_tmp15_); +#line 13786 "EditingTools.c" } -static void editing_tools_redeye_tool_on_close (EditingToolsRedeyeTool* self) { +static void +editing_tools_redeye_tool_on_close (EditingToolsRedeyeTool* self) +{ GdkPixbuf* _tmp0_; EditingToolsPhotoCanvas* _tmp1_; Photo* _tmp2_; @@ -13377,11 +13810,13 @@ static void editing_tools_redeye_tool_on_close (EditingToolsRedeyeTool* self) { g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL], 0, NULL, _tmp0_, &_tmp4_, FALSE); #line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp3_); -#line 13381 "EditingTools.c" +#line 13814 "EditingTools.c" } -static void editing_tools_redeye_tool_on_canvas_resize (EditingToolsRedeyeTool* self) { +static void +editing_tools_redeye_tool_on_canvas_resize (EditingToolsRedeyeTool* self) +{ GdkRectangle scaled_pixbuf_position = {0}; EditingToolsPhotoCanvas* _tmp0_; GdkRectangle _tmp1_ = {0}; @@ -13483,199 +13918,178 @@ static void editing_tools_redeye_tool_on_canvas_resize (EditingToolsRedeyeTool* _g_object_unref0 (self->priv->current_pixbuf); #line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->current_pixbuf = NULL; -#line 13487 "EditingTools.c" +#line 13922 "EditingTools.c" } -static void _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 2053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_on_photos_altered ((EditingToolsRedeyeTool*) self, items); -#line 13494 "EditingTools.c" +#line 13933 "EditingTools.c" } -static void editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas) { +static void +editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* base, + EditingToolsPhotoCanvas* canvas) +{ EditingToolsRedeyeTool * self; - EditingToolsPhotoCanvas* _tmp0_; - EditingToolsRedeyeInstance _tmp1_ = {0}; - EditingToolsPhotoCanvas* _tmp2_; - cairo_t* _tmp3_; - cairo_t* _tmp4_; - EditingToolsPhotoCanvas* _tmp5_; - Dimensions _tmp6_ = {0}; - EditingToolsPhotoCanvas* _tmp7_; - EditingToolsPhotoCanvas* _tmp8_; - GdkRectangle _tmp9_ = {0}; - EditingToolsPhotoCanvas* _tmp10_; - GdkPixbuf* _tmp11_; - EditingToolsPhotoCanvas* _tmp12_; - GtkWindow* _tmp13_; - GtkWindow* _tmp14_; - EditingToolsRedeyeToolRedeyeToolWindow* _tmp15_; - EditingToolsRedeyeToolRedeyeToolWindow* _tmp16_; - GtkScale* _tmp17_; - EditingToolsRedeyeInstance _tmp18_; - gint _tmp19_; + EditingToolsRedeyeInstance _tmp0_ = {0}; + cairo_t* _tmp1_; + cairo_t* _tmp2_; + Dimensions _tmp3_ = {0}; + GdkRectangle _tmp4_ = {0}; + GdkPixbuf* _tmp5_; + GtkWindow* _tmp6_; + GtkWindow* _tmp7_; + EditingToolsRedeyeToolRedeyeToolWindow* _tmp8_; + EditingToolsRedeyeToolRedeyeToolWindow* _tmp9_; + GtkScale* _tmp10_; + EditingToolsRedeyeInstance _tmp11_; + gint _tmp12_; GdkDisplay* display = NULL; - EditingToolsPhotoCanvas* _tmp20_; - GdkWindow* _tmp21_; - GdkWindow* _tmp22_; - GdkDisplay* _tmp23_; - GdkDisplay* _tmp24_; - GdkDisplay* _tmp25_; - GdkDisplay* _tmp26_; - GdkCursor* _tmp27_; - GdkDisplay* _tmp28_; - GdkCursor* _tmp29_; + GdkWindow* _tmp13_; + GdkWindow* _tmp14_; + GdkDisplay* _tmp15_; + GdkDisplay* _tmp16_; + GdkDisplay* _tmp17_; + GdkDisplay* _tmp18_; + GdkCursor* _tmp19_; + GdkDisplay* _tmp20_; + GdkCursor* _tmp21_; DataCollection* owner = NULL; - EditingToolsPhotoCanvas* _tmp30_; - Photo* _tmp31_; - Photo* _tmp32_; - DataCollection* _tmp33_; - DataCollection* _tmp34_; - DataCollection* _tmp35_; - EditingToolsPhotoCanvas* _tmp37_; + Photo* _tmp22_; + Photo* _tmp23_; + DataCollection* _tmp24_; + DataCollection* _tmp25_; + DataCollection* _tmp26_; #line 2032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool); #line 2032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); #line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = canvas; -#line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_redeye_tool_new_interaction_instance (self, _tmp0_, &_tmp1_); + editing_tools_redeye_tool_new_interaction_instance (self, canvas, &_tmp0_); #line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->user_interaction_instance = _tmp1_; + self->priv->user_interaction_instance = _tmp0_; #line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = canvas; + _tmp1_ = editing_tools_photo_canvas_get_default_ctx (canvas); #line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = editing_tools_photo_canvas_get_default_ctx (_tmp2_); -#line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = _tmp3_; -#line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = canvas; + _tmp2_ = _tmp1_; #line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_get_surface_dim (_tmp5_, &_tmp6_); + editing_tools_photo_canvas_get_surface_dim (canvas, &_tmp3_); #line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_redeye_tool_prepare_ctx (self, _tmp4_, &_tmp6_); + editing_tools_redeye_tool_prepare_ctx (self, _tmp2_, &_tmp3_); #line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _cairo_destroy0 (_tmp4_); -#line 2037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = canvas; + _cairo_destroy0 (_tmp2_); #line 2037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_redeye_tool_bind_canvas_handlers (self, _tmp7_); + editing_tools_redeye_tool_bind_canvas_handlers (self, canvas); #line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = canvas; + editing_tools_photo_canvas_get_scaled_pixbuf_position (canvas, &_tmp4_); #line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp8_, &_tmp9_); -#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->old_scaled_pixbuf_position = _tmp9_; -#line 2040 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = canvas; + self->priv->old_scaled_pixbuf_position = _tmp4_; #line 2040 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp10_); + _tmp5_ = editing_tools_photo_canvas_get_scaled_pixbuf (canvas); #line 2040 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->current_pixbuf); #line 2040 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->current_pixbuf = _tmp11_; + self->priv->current_pixbuf = _tmp5_; #line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = canvas; + _tmp6_ = editing_tools_photo_canvas_get_container (canvas); #line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = editing_tools_photo_canvas_get_container (_tmp12_); -#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = _tmp13_; + _tmp7_ = _tmp6_; #line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = editing_tools_redeye_tool_redeye_tool_window_new (_tmp14_); + _tmp8_ = editing_tools_redeye_tool_redeye_tool_window_new (_tmp7_); #line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp15_); + g_object_ref_sink (_tmp8_); #line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->redeye_tool_window); #line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->redeye_tool_window = _tmp15_; + self->priv->redeye_tool_window = _tmp8_; #line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp7_); #line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = self->priv->redeye_tool_window; + _tmp9_ = self->priv->redeye_tool_window; #line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = _tmp16_->slider; + _tmp10_ = _tmp9_->slider; #line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = self->priv->user_interaction_instance; + _tmp11_ = self->priv->user_interaction_instance; #line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = _tmp18_.radius; + _tmp12_ = _tmp11_.radius; #line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_range_get_type (), GtkRange), (gdouble) _tmp19_); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_range_get_type (), GtkRange), (gdouble) _tmp12_); #line 2045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_bind_window_handlers (self); #line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = canvas; -#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = editing_tools_photo_canvas_get_drawing_window (_tmp20_); + _tmp13_ = editing_tools_photo_canvas_get_drawing_window (canvas); #line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = _tmp21_; + _tmp14_ = _tmp13_; #line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = gdk_window_get_display (_tmp22_); + _tmp15_ = gdk_window_get_display (_tmp14_); #line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = _g_object_ref0 (_tmp23_); + _tmp16_ = _g_object_ref0 (_tmp15_); #line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = _tmp24_; + _tmp17_ = _tmp16_; #line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp22_); + _g_object_unref0 (_tmp14_); #line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - display = _tmp25_; + display = _tmp17_; #line 2048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp26_ = display; + _tmp18_ = display; #line 2048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp27_ = gdk_cursor_new_for_display (_tmp26_, GDK_LEFT_PTR); + _tmp19_ = gdk_cursor_new_for_display (_tmp18_, GDK_LEFT_PTR); #line 2048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->cached_arrow_cursor); #line 2048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->cached_arrow_cursor = _tmp27_; + self->priv->cached_arrow_cursor = _tmp19_; #line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_ = display; + _tmp20_ = display; #line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp29_ = gdk_cursor_new_for_display (_tmp28_, GDK_FLEUR); + _tmp21_ = gdk_cursor_new_for_display (_tmp20_, GDK_FLEUR); #line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->cached_grab_cursor); #line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->cached_grab_cursor = _tmp29_; + self->priv->cached_grab_cursor = _tmp21_; #line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp30_ = canvas; -#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp31_ = editing_tools_photo_canvas_get_photo (_tmp30_); + _tmp22_ = editing_tools_photo_canvas_get_photo (canvas); #line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp32_ = _tmp31_; + _tmp23_ = _tmp22_; #line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp33_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject)); + _tmp24_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_DATA_OBJECT, DataObject)); #line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp34_ = _tmp33_; + _tmp25_ = _tmp24_; #line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp32_); + _g_object_unref0 (_tmp23_); #line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - owner = _tmp34_; + owner = _tmp25_; #line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp35_ = owner; + _tmp26_ = owner; #line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp35_ != NULL) { -#line 13659 "EditingTools.c" - DataCollection* _tmp36_; + if (_tmp26_ != NULL) { +#line 14073 "EditingTools.c" + DataCollection* _tmp27_; #line 2053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp36_ = owner; + _tmp27_ = owner; #line 2053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_connect (_tmp36_, "items-altered", (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self); -#line 13665 "EditingTools.c" + g_signal_connect (_tmp27_, "items-altered", (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self); +#line 14079 "EditingTools.c" } #line 2055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp37_ = canvas; -#line 2055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp37_); + EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), canvas); #line 2032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _data_collection_unref0 (owner); #line 2032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (display); -#line 13675 "EditingTools.c" +#line 14087 "EditingTools.c" } -static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool* base) { +static void +editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool* base) +{ EditingToolsRedeyeTool * self; EditingToolsPhotoCanvas* _tmp0_; EditingToolsRedeyeToolRedeyeToolWindow* _tmp10_; @@ -13685,7 +14099,7 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool* _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ != NULL) { -#line 13689 "EditingTools.c" +#line 14103 "EditingTools.c" DataCollection* owner = NULL; EditingToolsPhotoCanvas* _tmp1_; Photo* _tmp2_; @@ -13712,7 +14126,7 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool* _tmp6_ = owner; #line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp6_ != NULL) { -#line 13716 "EditingTools.c" +#line 14130 "EditingTools.c" DataCollection* _tmp7_; guint _tmp8_; #line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -13721,7 +14135,7 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool* g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp8_, NULL, FALSE); #line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self); -#line 13725 "EditingTools.c" +#line 14139 "EditingTools.c" } #line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; @@ -13729,13 +14143,13 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool* editing_tools_redeye_tool_unbind_canvas_handlers (self, _tmp9_); #line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _data_collection_unref0 (owner); -#line 13733 "EditingTools.c" +#line 14147 "EditingTools.c" } #line 2067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = self->priv->redeye_tool_window; #line 2067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp10_ != NULL) { -#line 13739 "EditingTools.c" +#line 14153 "EditingTools.c" EditingToolsRedeyeToolRedeyeToolWindow* _tmp11_; EditingToolsRedeyeToolRedeyeToolWindow* _tmp12_; #line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -13752,96 +14166,114 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool* _g_object_unref0 (self->priv->redeye_tool_window); #line 2071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->redeye_tool_window = NULL; -#line 13756 "EditingTools.c" +#line 14170 "EditingTools.c" } #line 2074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)); -#line 13760 "EditingTools.c" +#line 14174 "EditingTools.c" } -static void _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self) { +static void +_editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, + cairo_t* ctx, + Dimensions* dim, + gpointer self) +{ #line 2078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_prepare_ctx ((EditingToolsRedeyeTool*) self, ctx, dim); -#line 13767 "EditingTools.c" +#line 14186 "EditingTools.c" } -static void _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) { +static void +_editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, + Dimensions* old_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position, + gpointer self) +{ #line 2079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_on_canvas_resize ((EditingToolsRedeyeTool*) self); -#line 13774 "EditingTools.c" +#line 14199 "EditingTools.c" } -static void editing_tools_redeye_tool_bind_canvas_handlers (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas) { - EditingToolsPhotoCanvas* _tmp0_; - EditingToolsPhotoCanvas* _tmp1_; +static void +editing_tools_redeye_tool_bind_canvas_handlers (EditingToolsRedeyeTool* self, + EditingToolsPhotoCanvas* canvas) +{ #line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self)); #line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); #line 2078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = canvas; -#line 2078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_connect (_tmp0_, "new-surface", (GCallback) _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self); + g_signal_connect (canvas, "new-surface", (GCallback) _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self); #line 2079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = canvas; -#line 2079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_connect (_tmp1_, "resized-scaled-pixbuf", (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self); -#line 13793 "EditingTools.c" + g_signal_connect (canvas, "resized-scaled-pixbuf", (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self); +#line 14215 "EditingTools.c" } -static void editing_tools_redeye_tool_unbind_canvas_handlers (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas) { - EditingToolsPhotoCanvas* _tmp0_; +static void +editing_tools_redeye_tool_unbind_canvas_handlers (EditingToolsRedeyeTool* self, + EditingToolsPhotoCanvas* canvas) +{ + guint _tmp0_; guint _tmp1_; - EditingToolsPhotoCanvas* _tmp2_; - guint _tmp3_; #line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self)); #line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); #line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = canvas; + g_signal_parse_name ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp0_, NULL, FALSE); #line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_parse_name ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE); -#line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self); -#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = canvas; + g_signal_handlers_disconnect_matched (canvas, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self); #line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp3_, NULL, FALSE); + g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE); #line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self); -#line 13818 "EditingTools.c" + g_signal_handlers_disconnect_matched (canvas, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self); +#line 14237 "EditingTools.c" } -static void _editing_tools_redeye_tool_on_apply_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_editing_tools_redeye_tool_on_apply_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 2088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_on_apply ((EditingToolsRedeyeTool*) self); -#line 13825 "EditingTools.c" +#line 14247 "EditingTools.c" } -static void _editing_tools_redeye_tool_on_close_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_editing_tools_redeye_tool_on_close_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 2089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_on_close ((EditingToolsRedeyeTool*) self); -#line 13832 "EditingTools.c" +#line 14257 "EditingTools.c" } -static gboolean _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value (GtkRange* _sender, GtkScrollType scroll, gdouble new_value, gpointer self) { +static gboolean +_editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value (GtkRange* _sender, + GtkScrollType scroll, + gdouble new_value, + gpointer self) +{ gboolean result; result = editing_tools_redeye_tool_on_size_slider_adjust ((EditingToolsRedeyeTool*) self, scroll); #line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 13841 "EditingTools.c" +#line 14271 "EditingTools.c" } -static void editing_tools_redeye_tool_bind_window_handlers (EditingToolsRedeyeTool* self) { +static void +editing_tools_redeye_tool_bind_window_handlers (EditingToolsRedeyeTool* self) +{ EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_; GtkButton* _tmp1_; EditingToolsRedeyeToolRedeyeToolWindow* _tmp2_; @@ -13868,11 +14300,13 @@ static void editing_tools_redeye_tool_bind_window_handlers (EditingToolsRedeyeTo _tmp5_ = _tmp4_->slider; #line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_range_get_type (), GtkRange), "change-value", (GCallback) _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value, self); -#line 13872 "EditingTools.c" +#line 14304 "EditingTools.c" } -static void editing_tools_redeye_tool_unbind_window_handlers (EditingToolsRedeyeTool* self) { +static void +editing_tools_redeye_tool_unbind_window_handlers (EditingToolsRedeyeTool* self) +{ EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_; GtkButton* _tmp1_; guint _tmp2_; @@ -13908,11 +14342,13 @@ static void editing_tools_redeye_tool_unbind_window_handlers (EditingToolsRedeye g_signal_parse_name ("change-value", gtk_range_get_type (), &_tmp8_, NULL, FALSE); #line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value, self); -#line 13912 "EditingTools.c" +#line 14346 "EditingTools.c" } -static EditingToolsEditingToolWindow* editing_tools_redeye_tool_real_get_tool_window (EditingToolsEditingTool* base) { +static EditingToolsEditingToolWindow* +editing_tools_redeye_tool_real_get_tool_window (EditingToolsEditingTool* base) +{ EditingToolsRedeyeTool * self; EditingToolsEditingToolWindow* result = NULL; EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_; @@ -13927,11 +14363,14 @@ static EditingToolsEditingToolWindow* editing_tools_redeye_tool_real_get_tool_wi result = _tmp1_; #line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 13931 "EditingTools.c" +#line 14367 "EditingTools.c" } -static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx) { +static void +editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base, + cairo_t* ctx) +{ EditingToolsRedeyeTool * self; GdkPixbuf* _tmp0_ = NULL; GdkPixbuf* _tmp1_; @@ -13951,7 +14390,7 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base, _tmp1_ = self->priv->current_pixbuf; #line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp1_ != NULL) { -#line 13955 "EditingTools.c" +#line 14394 "EditingTools.c" GdkPixbuf* _tmp2_; GdkPixbuf* _tmp3_; #line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -13962,7 +14401,7 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base, _g_object_unref0 (_tmp0_); #line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = _tmp3_; -#line 13966 "EditingTools.c" +#line 14405 "EditingTools.c" } else { EditingToolsPhotoCanvas* _tmp4_; GdkPixbuf* _tmp5_; @@ -13974,7 +14413,7 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base, _g_object_unref0 (_tmp0_); #line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = _tmp5_; -#line 13978 "EditingTools.c" +#line 14417 "EditingTools.c" } #line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; @@ -14000,74 +14439,72 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base, editing_tools_redeye_tool_draw_redeye_instance (self, &_tmp12_); #line 2103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp0_); -#line 14004 "EditingTools.c" +#line 14443 "EditingTools.c" } -static void editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingTool* base, gint x, gint y) { +static void +editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingTool* base, + gint x, + gint y) +{ EditingToolsRedeyeTool * self; GdkRectangle bounds_rect = {0}; EditingToolsRedeyeInstance _tmp0_; GdkRectangle _tmp1_ = {0}; - gint _tmp2_; - gint _tmp3_; - GdkRectangle _tmp4_; - gboolean _tmp5_; + GdkRectangle _tmp2_; #line 2114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool); #line 2115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->user_interaction_instance; #line 2115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_instance_to_bounds_rect (&_tmp0_, &_tmp1_); -#line 2115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - bounds_rect = _tmp1_; -#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = x; -#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = y; -#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = bounds_rect; +#line 2115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + bounds_rect = _tmp1_; #line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = coord_in_rectangle (_tmp2_, _tmp3_, &_tmp4_); + _tmp2_ = bounds_rect; #line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp5_) { -#line 14035 "EditingTools.c" - gint _tmp6_; - gint _tmp7_; - EditingToolsRedeyeInstance _tmp8_; - GdkPoint _tmp9_; + if (coord_in_rectangle (x, y, &_tmp2_)) { +#line 14469 "EditingTools.c" + EditingToolsRedeyeInstance _tmp3_; + GdkPoint _tmp4_; #line 2119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->is_reticle_move_in_progress = TRUE; #line 2120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = x; -#line 2120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->reticle_move_mouse_start_point.x = _tmp6_; -#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = y; + self->priv->reticle_move_mouse_start_point.x = x; #line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->reticle_move_mouse_start_point.y = _tmp7_; + self->priv->reticle_move_mouse_start_point.y = y; #line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = self->priv->user_interaction_instance; + _tmp3_ = self->priv->user_interaction_instance; #line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = _tmp8_.center; + _tmp4_ = _tmp3_.center; #line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->reticle_move_anchor = _tmp9_; -#line 14056 "EditingTools.c" + self->priv->reticle_move_anchor = _tmp4_; +#line 14484 "EditingTools.c" } } -static void editing_tools_redeye_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y) { +static void +editing_tools_redeye_tool_real_on_left_released (EditingToolsEditingTool* base, + gint x, + gint y) +{ EditingToolsRedeyeTool * self; #line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool); #line 2127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->is_reticle_move_in_progress = FALSE; -#line 14067 "EditingTools.c" +#line 14499 "EditingTools.c" } -static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask) { +static void +editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* base, + gint x, + gint y, + GdkModifierType mask) +{ EditingToolsRedeyeTool * self; gboolean _tmp0_; #line 2130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -14076,7 +14513,7 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b _tmp0_ = self->priv->is_reticle_move_in_progress; #line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_) { -#line 14080 "EditingTools.c" +#line 14517 "EditingTools.c" GdkRectangle active_region_rect = {0}; EditingToolsPhotoCanvas* _tmp1_; GdkRectangle _tmp2_ = {0}; @@ -14105,32 +14542,28 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b EditingToolsRedeyeInstance _tmp21_; gint _tmp22_; gint delta_x = 0; - gint _tmp23_; - GdkPoint _tmp24_; - gint _tmp25_; + GdkPoint _tmp23_; + gint _tmp24_; gint delta_y = 0; + GdkPoint _tmp25_; gint _tmp26_; GdkPoint _tmp27_; gint _tmp28_; - GdkPoint _tmp29_; - gint _tmp30_; + gint _tmp29_; + GdkPoint _tmp30_; gint _tmp31_; - GdkPoint _tmp32_; - gint _tmp33_; + gint _tmp32_; + GdkPoint _tmp33_; gint _tmp34_; - GdkPoint _tmp35_; + gint _tmp35_; gint _tmp36_; gint _tmp37_; - gint _tmp38_; + GdkPoint _tmp38_; gint _tmp39_; gint _tmp40_; - GdkPoint _tmp41_; + gint _tmp41_; gint _tmp42_; - gint _tmp43_; - gint _tmp44_; - gint _tmp45_; - gint _tmp46_; - EditingToolsPhotoCanvas* _tmp47_; + EditingToolsPhotoCanvas* _tmp43_; #line 2133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 2133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -14186,192 +14619,167 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b #line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" y_clamp_high = ((_tmp18_ + _tmp20_) - _tmp22_) - 1; #line 2147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = x; + _tmp23_ = self->priv->reticle_move_mouse_start_point; #line 2147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = self->priv->reticle_move_mouse_start_point; + _tmp24_ = _tmp23_.x; #line 2147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = _tmp24_.x; -#line 2147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - delta_x = _tmp23_ - _tmp25_; -#line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp26_ = y; + delta_x = x - _tmp24_; #line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp27_ = self->priv->reticle_move_mouse_start_point; + _tmp25_ = self->priv->reticle_move_mouse_start_point; #line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_ = _tmp27_.y; + _tmp26_ = _tmp25_.y; #line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - delta_y = _tmp26_ - _tmp28_; + delta_y = y - _tmp26_; #line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp29_ = self->priv->reticle_move_anchor; + _tmp27_ = self->priv->reticle_move_anchor; #line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp30_ = _tmp29_.x; + _tmp28_ = _tmp27_.x; #line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp31_ = delta_x; + _tmp29_ = delta_x; #line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->user_interaction_instance.center.x = _tmp30_ + _tmp31_; + self->priv->user_interaction_instance.center.x = _tmp28_ + _tmp29_; #line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp32_ = self->priv->reticle_move_anchor; + _tmp30_ = self->priv->reticle_move_anchor; #line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp33_ = _tmp32_.y; + _tmp31_ = _tmp30_.y; #line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp34_ = delta_y; + _tmp32_ = delta_y; #line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->user_interaction_instance.center.y = _tmp33_ + _tmp34_; + self->priv->user_interaction_instance.center.y = _tmp31_ + _tmp32_; #line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp35_ = self->priv->reticle_move_anchor; + _tmp33_ = self->priv->reticle_move_anchor; #line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp36_ = _tmp35_.x; + _tmp34_ = _tmp33_.x; #line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp37_ = delta_x; + _tmp35_ = delta_x; #line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp38_ = x_clamp_low; + _tmp36_ = x_clamp_low; #line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp39_ = x_clamp_high; + _tmp37_ = x_clamp_high; #line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp40_ = CLAMP (_tmp36_ + _tmp37_, _tmp38_, _tmp39_); -#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->user_interaction_instance.center.x = _tmp40_; -#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp41_ = self->priv->reticle_move_anchor; + self->priv->user_interaction_instance.center.x = CLAMP (_tmp34_ + _tmp35_, _tmp36_, _tmp37_); #line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp42_ = _tmp41_.y; + _tmp38_ = self->priv->reticle_move_anchor; #line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp43_ = delta_y; + _tmp39_ = _tmp38_.y; #line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp44_ = y_clamp_low; + _tmp40_ = delta_y; #line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp45_ = y_clamp_high; + _tmp41_ = y_clamp_low; #line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp46_ = CLAMP (_tmp42_ + _tmp43_, _tmp44_, _tmp45_); + _tmp42_ = y_clamp_high; #line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->user_interaction_instance.center.y = _tmp46_; + self->priv->user_interaction_instance.center.y = CLAMP (_tmp39_ + _tmp40_, _tmp41_, _tmp42_); #line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp47_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp43_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_repaint (_tmp47_); -#line 14253 "EditingTools.c" + editing_tools_photo_canvas_repaint (_tmp43_); +#line 14678 "EditingTools.c" } else { GdkRectangle bounds = {0}; - EditingToolsRedeyeInstance _tmp48_; - GdkRectangle _tmp49_ = {0}; - gint _tmp50_; - gint _tmp51_; - GdkRectangle _tmp52_; - gboolean _tmp53_; + EditingToolsRedeyeInstance _tmp44_; + GdkRectangle _tmp45_ = {0}; + GdkRectangle _tmp46_; #line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp48_ = self->priv->user_interaction_instance; + _tmp44_ = self->priv->user_interaction_instance; #line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_redeye_instance_to_bounds_rect (&_tmp48_, &_tmp49_); + editing_tools_redeye_instance_to_bounds_rect (&_tmp44_, &_tmp45_); #line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - bounds = _tmp49_; -#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp50_ = x; -#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp51_ = y; -#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp52_ = bounds; + bounds = _tmp45_; #line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp53_ = coord_in_rectangle (_tmp50_, _tmp51_, &_tmp52_); + _tmp46_ = bounds; #line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp53_) { -#line 14278 "EditingTools.c" - EditingToolsPhotoCanvas* _tmp54_; - GdkWindow* _tmp55_; - GdkWindow* _tmp56_; - GdkCursor* _tmp57_; + if (coord_in_rectangle (x, y, &_tmp46_)) { +#line 14694 "EditingTools.c" + EditingToolsPhotoCanvas* _tmp47_; + GdkWindow* _tmp48_; + GdkWindow* _tmp49_; + GdkCursor* _tmp50_; #line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp54_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp47_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp55_ = editing_tools_photo_canvas_get_drawing_window (_tmp54_); + _tmp48_ = editing_tools_photo_canvas_get_drawing_window (_tmp47_); #line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp56_ = _tmp55_; + _tmp49_ = _tmp48_; #line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp57_ = self->priv->cached_grab_cursor; + _tmp50_ = self->priv->cached_grab_cursor; #line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gdk_window_set_cursor (_tmp56_, _tmp57_); + gdk_window_set_cursor (_tmp49_, _tmp50_); #line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp56_); -#line 14295 "EditingTools.c" + _g_object_unref0 (_tmp49_); +#line 14711 "EditingTools.c" } else { - EditingToolsPhotoCanvas* _tmp58_; - GdkWindow* _tmp59_; - GdkWindow* _tmp60_; - GdkCursor* _tmp61_; + EditingToolsPhotoCanvas* _tmp51_; + GdkWindow* _tmp52_; + GdkWindow* _tmp53_; + GdkCursor* _tmp54_; #line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp58_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp51_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp59_ = editing_tools_photo_canvas_get_drawing_window (_tmp58_); + _tmp52_ = editing_tools_photo_canvas_get_drawing_window (_tmp51_); #line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp60_ = _tmp59_; + _tmp53_ = _tmp52_; #line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp61_ = self->priv->cached_arrow_cursor; + _tmp54_ = self->priv->cached_arrow_cursor; #line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gdk_window_set_cursor (_tmp60_, _tmp61_); + gdk_window_set_cursor (_tmp53_, _tmp54_); #line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp60_); -#line 14313 "EditingTools.c" + _g_object_unref0 (_tmp53_); +#line 14729 "EditingTools.c" } } } -static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingTool* base, GdkEventKey* event) { +static gboolean +editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingTool* base, + GdkEventKey* event) +{ EditingToolsRedeyeTool * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GdkEventKey* _tmp2_; - guint _tmp3_; - const gchar* _tmp4_; - GdkEventKey* _tmp11_; - gboolean _tmp12_; + guint _tmp2_; + const gchar* _tmp3_; #line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool); #line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (event != NULL, FALSE); #line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = event; -#line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = _tmp2_->keyval; + _tmp2_ = event->keyval; #line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = gdk_keyval_name (_tmp3_); + _tmp3_ = gdk_keyval_name (_tmp2_); #line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) { + if (g_strcmp0 (_tmp3_, "KP_Enter") == 0) { #line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = TRUE; -#line 14343 "EditingTools.c" +#line 14757 "EditingTools.c" } else { - GdkEventKey* _tmp5_; - guint _tmp6_; - const gchar* _tmp7_; + guint _tmp4_; + const gchar* _tmp5_; #line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = event; + _tmp4_ = event->keyval; #line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _tmp5_->keyval; -#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = gdk_keyval_name (_tmp6_); + _tmp5_ = gdk_keyval_name (_tmp4_); #line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0; -#line 14356 "EditingTools.c" + _tmp1_ = g_strcmp0 (_tmp5_, "Enter") == 0; +#line 14767 "EditingTools.c" } #line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp1_) { #line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = TRUE; -#line 14362 "EditingTools.c" +#line 14773 "EditingTools.c" } else { - GdkEventKey* _tmp8_; - guint _tmp9_; - const gchar* _tmp10_; -#line 2178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = event; + guint _tmp6_; + const gchar* _tmp7_; #line 2178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = _tmp8_->keyval; + _tmp6_ = event->keyval; #line 2178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = gdk_keyval_name (_tmp9_); + _tmp7_ = gdk_keyval_name (_tmp6_); #line 2178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0; -#line 14375 "EditingTools.c" + _tmp0_ = g_strcmp0 (_tmp7_, "Return") == 0; +#line 14783 "EditingTools.c" } #line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_) { @@ -14381,116 +14789,118 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT result = TRUE; #line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 14385 "EditingTools.c" +#line 14793 "EditingTools.c" } #line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = event; -#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp11_); -#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - result = _tmp12_; + result = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), event); #line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 14395 "EditingTools.c" +#line 14799 "EditingTools.c" } -static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_tool_window_construct (GType object_type, GtkWindow* container) { +static EditingToolsRedeyeToolRedeyeToolWindow* +editing_tools_redeye_tool_redeye_tool_window_construct (GType object_type, + GtkWindow* container) +{ EditingToolsRedeyeToolRedeyeToolWindow * self = NULL; - GtkWindow* _tmp0_; + GtkScale* _tmp0_; GtkScale* _tmp1_; - GtkScale* _tmp2_; + GtkButton* _tmp2_; GtkButton* _tmp3_; GtkButton* _tmp4_; GtkButton* _tmp5_; - GtkButton* _tmp6_; GtkBox* layout = NULL; - GtkBox* _tmp7_; - GtkLabel* _tmp8_; - GtkScale* _tmp9_; + GtkBox* _tmp6_; + GtkLabel* _tmp7_; + GtkScale* _tmp8_; + GtkButton* _tmp9_; GtkButton* _tmp10_; - GtkButton* _tmp11_; #line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (GTK_IS_WINDOW (container), NULL); #line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = container; -#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self = (EditingToolsRedeyeToolRedeyeToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_); + self = (EditingToolsRedeyeToolRedeyeToolWindow*) editing_tools_editing_tool_window_construct (object_type, container); #line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = self->slider; + _tmp0_ = self->slider; #line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), 80, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), 80, -1); #line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = self->slider; + _tmp1_ = self->slider; #line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_scale_set_draw_value (_tmp2_, FALSE); + gtk_scale_set_draw_value (_tmp1_, FALSE); #line 1873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = self->close_button; + _tmp2_ = self->close_button; #line 1873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _ ("Close the red-eye tool")); + gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), _ ("Close the red-eye tool")); #line 1874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = self->close_button; + _tmp3_ = self->close_button; #line 1874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_button_set_image_position (_tmp4_, GTK_POS_LEFT); + gtk_button_set_image_position (_tmp3_, GTK_POS_LEFT); #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = self->apply_button; + _tmp4_ = self->apply_button; #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), _ ("Remove any red-eye effects in the selected region")); + gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), _ ("Remove any red-eye effects in the selected region")); #line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = self->apply_button; + _tmp5_ = self->apply_button; #line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_button_set_image_position (_tmp6_, GTK_POS_LEFT); + gtk_button_set_image_position (_tmp5_, GTK_POS_LEFT); #line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_CONTROL_SPACING); + _tmp6_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_CONTROL_SPACING); #line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp7_); + g_object_ref_sink (_tmp6_); #line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - layout = _tmp7_; + layout = _tmp6_; #line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = self->priv->slider_label; + _tmp7_ = self->priv->slider_label; #line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget)); #line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = self->slider; + _tmp8_ = self->slider; #line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget)); #line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = self->close_button; + _tmp9_ = self->close_button; #line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); #line 1883 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = self->apply_button; + _tmp10_ = self->apply_button; #line 1883 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget)); #line 1885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_widget_get_type (), GtkWidget)); #line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (layout); #line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 14472 "EditingTools.c" +#line 14876 "EditingTools.c" } -static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_tool_window_new (GtkWindow* container) { +static EditingToolsRedeyeToolRedeyeToolWindow* +editing_tools_redeye_tool_redeye_tool_window_new (GtkWindow* container) +{ #line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return editing_tools_redeye_tool_redeye_tool_window_construct (EDITING_TOOLS_REDEYE_TOOL_TYPE_REDEYE_TOOL_WINDOW, container); -#line 14479 "EditingTools.c" +#line 14885 "EditingTools.c" } -static void editing_tools_redeye_tool_redeye_tool_window_class_init (EditingToolsRedeyeToolRedeyeToolWindowClass * klass) { +static void +editing_tools_redeye_tool_redeye_tool_window_class_init (EditingToolsRedeyeToolRedeyeToolWindowClass * klass) +{ #line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_redeye_tool_window_parent_class = g_type_class_peek_parent (klass); #line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_type_class_add_private (klass, sizeof (EditingToolsRedeyeToolRedeyeToolWindowPrivate)); #line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (klass)->finalize = editing_tools_redeye_tool_redeye_tool_window_finalize; -#line 14490 "EditingTools.c" +#line 14898 "EditingTools.c" } -static void editing_tools_redeye_tool_redeye_tool_window_instance_init (EditingToolsRedeyeToolRedeyeToolWindow * self) { +static void +editing_tools_redeye_tool_redeye_tool_window_instance_init (EditingToolsRedeyeToolRedeyeToolWindow * self) +{ GtkLabel* _tmp0_; GtkButton* _tmp1_; GtkButton* _tmp2_; @@ -14521,11 +14931,13 @@ static void editing_tools_redeye_tool_redeye_tool_window_instance_init (EditingT g_object_ref_sink (_tmp3_); #line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->slider = _tmp3_; -#line 14525 "EditingTools.c" +#line 14935 "EditingTools.c" } -static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject * obj) { +static void +editing_tools_redeye_tool_redeye_tool_window_finalize (GObject * obj) +{ EditingToolsRedeyeToolRedeyeToolWindow * self; #line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_REDEYE_TOOL_TYPE_REDEYE_TOOL_WINDOW, EditingToolsRedeyeToolRedeyeToolWindow); @@ -14539,11 +14951,13 @@ static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject * obj _g_object_unref0 (self->slider); #line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (editing_tools_redeye_tool_redeye_tool_window_parent_class)->finalize (obj); -#line 14543 "EditingTools.c" +#line 14955 "EditingTools.c" } -static GType editing_tools_redeye_tool_redeye_tool_window_get_type (void) { +static GType +editing_tools_redeye_tool_redeye_tool_window_get_type (void) +{ static volatile gsize editing_tools_redeye_tool_redeye_tool_window_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_redeye_tool_redeye_tool_window_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditingToolsRedeyeToolRedeyeToolWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_redeye_tool_redeye_tool_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsRedeyeToolRedeyeToolWindow), 0, (GInstanceInitFunc) editing_tools_redeye_tool_redeye_tool_window_instance_init, NULL }; @@ -14555,7 +14969,9 @@ static GType editing_tools_redeye_tool_redeye_tool_window_get_type (void) { } -static void editing_tools_redeye_tool_class_init (EditingToolsRedeyeToolClass * klass) { +static void +editing_tools_redeye_tool_class_init (EditingToolsRedeyeToolClass * klass) +{ #line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_parent_class = g_type_class_peek_parent (klass); #line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -14578,11 +14994,13 @@ static void editing_tools_redeye_tool_class_init (EditingToolsRedeyeToolClass * ((EditingToolsEditingToolClass *) klass)->on_motion = (void (*) (EditingToolsEditingTool *, gint, gint, GdkModifierType)) editing_tools_redeye_tool_real_on_motion; #line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_redeye_tool_real_on_keypress; -#line 14582 "EditingTools.c" +#line 14998 "EditingTools.c" } -static void editing_tools_redeye_tool_instance_init (EditingToolsRedeyeTool * self) { +static void +editing_tools_redeye_tool_instance_init (EditingToolsRedeyeTool * self) +{ #line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv = EDITING_TOOLS_REDEYE_TOOL_GET_PRIVATE (self); #line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -14595,11 +15013,13 @@ static void editing_tools_redeye_tool_instance_init (EditingToolsRedeyeTool * se self->priv->is_reticle_move_in_progress = FALSE; #line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->current_pixbuf = NULL; -#line 14599 "EditingTools.c" +#line 15017 "EditingTools.c" } -static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool * obj) { +static void +editing_tools_redeye_tool_finalize (EditingToolsEditingTool * obj) +{ EditingToolsRedeyeTool * self; #line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool); @@ -14617,11 +15037,13 @@ static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool * obj) { _g_object_unref0 (self->priv->current_pixbuf); #line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->finalize (obj); -#line 14621 "EditingTools.c" +#line 15041 "EditingTools.c" } -GType editing_tools_redeye_tool_get_type (void) { +GType +editing_tools_redeye_tool_get_type (void) +{ static volatile gsize editing_tools_redeye_tool_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_redeye_tool_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditingToolsRedeyeToolClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_redeye_tool_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsRedeyeTool), 0, (GInstanceInitFunc) editing_tools_redeye_tool_instance_init, NULL }; @@ -14633,24 +15055,30 @@ GType editing_tools_redeye_tool_get_type (void) { } -static EditingToolsAdjustTool* editing_tools_adjust_tool_construct (GType object_type) { +static EditingToolsAdjustTool* +editing_tools_adjust_tool_construct (GType object_type) +{ EditingToolsAdjustTool* self = NULL; #line 2501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = (EditingToolsAdjustTool*) editing_tools_editing_tool_construct (object_type, "AdjustTool"); #line 2500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 14643 "EditingTools.c" +#line 15067 "EditingTools.c" } -static EditingToolsAdjustTool* editing_tools_adjust_tool_new (void) { +static EditingToolsAdjustTool* +editing_tools_adjust_tool_new (void) +{ #line 2500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return editing_tools_adjust_tool_construct (EDITING_TOOLS_TYPE_ADJUST_TOOL); -#line 14650 "EditingTools.c" +#line 15076 "EditingTools.c" } -EditingToolsAdjustTool* editing_tools_adjust_tool_factory (void) { +EditingToolsAdjustTool* +editing_tools_adjust_tool_factory (void) +{ EditingToolsAdjustTool* result = NULL; EditingToolsAdjustTool* _tmp0_; #line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -14659,11 +15087,14 @@ EditingToolsAdjustTool* editing_tools_adjust_tool_factory (void) { result = _tmp0_; #line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 14663 "EditingTools.c" +#line 15091 "EditingTools.c" } -gboolean editing_tools_adjust_tool_is_available (Photo* photo, Scaling* scaling) { +gboolean +editing_tools_adjust_tool_is_available (Photo* photo, + Scaling* scaling) +{ gboolean result = FALSE; #line 2508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_PHOTO (photo), FALSE); @@ -14673,560 +15104,519 @@ gboolean editing_tools_adjust_tool_is_available (Photo* photo, Scaling* scaling) result = TRUE; #line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 14677 "EditingTools.c" +#line 15108 "EditingTools.c" } -static void _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_photos_altered ((EditingToolsAdjustTool*) self, items); -#line 14684 "EditingTools.c" +#line 15119 "EditingTools.c" } -static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas) { +static void +editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* base, + EditingToolsPhotoCanvas* canvas) +{ EditingToolsAdjustTool * self; - EditingToolsPhotoCanvas* _tmp0_; + GtkWindow* _tmp0_; GtkWindow* _tmp1_; - GtkWindow* _tmp2_; - EditingToolsAdjustToolAdjustToolWindow* _tmp3_; + EditingToolsAdjustToolAdjustToolWindow* _tmp2_; Photo* photo = NULL; - EditingToolsPhotoCanvas* _tmp4_; - Photo* _tmp5_; - Photo* _tmp6_; - PixelTransformationBundle* _tmp7_; - PixelTransformationBundle* _tmp8_; - PixelTransformer* _tmp9_; - PixelTransformer* _tmp10_; + Photo* _tmp3_; + Photo* _tmp4_; + PixelTransformationBundle* _tmp5_; + PixelTransformationBundle* _tmp6_; + PixelTransformer* _tmp7_; + PixelTransformer* _tmp8_; ExpansionTransformation* expansion_trans = NULL; - PixelTransformationBundle* _tmp11_; - PixelTransformation* _tmp12_; - EditingToolsAdjustToolAdjustToolWindow* _tmp13_; - RGBHistogramManipulator* _tmp14_; - ExpansionTransformation* _tmp15_; - gint _tmp16_; - EditingToolsAdjustToolAdjustToolWindow* _tmp17_; - RGBHistogramManipulator* _tmp18_; - ExpansionTransformation* _tmp19_; - gint _tmp20_; + PixelTransformationBundle* _tmp9_; + PixelTransformation* _tmp10_; + EditingToolsAdjustToolAdjustToolWindow* _tmp11_; + RGBHistogramManipulator* _tmp12_; + ExpansionTransformation* _tmp13_; + EditingToolsAdjustToolAdjustToolWindow* _tmp14_; + RGBHistogramManipulator* _tmp15_; + ExpansionTransformation* _tmp16_; ShadowDetailTransformation* shadows_trans = NULL; - PixelTransformationBundle* _tmp21_; - PixelTransformation* _tmp22_; - PixelTransformer* _tmp23_; - ShadowDetailTransformation* _tmp24_; - EditingToolsAdjustToolAdjustToolWindow* _tmp25_; - GtkScale* _tmp26_; - ShadowDetailTransformation* _tmp27_; - gfloat _tmp28_; + PixelTransformationBundle* _tmp17_; + PixelTransformation* _tmp18_; + PixelTransformer* _tmp19_; + ShadowDetailTransformation* _tmp20_; + EditingToolsAdjustToolAdjustToolWindow* _tmp21_; + GtkScale* _tmp22_; + ShadowDetailTransformation* _tmp23_; HighlightDetailTransformation* highlights_trans = NULL; - PixelTransformationBundle* _tmp29_; - PixelTransformation* _tmp30_; - PixelTransformer* _tmp31_; - HighlightDetailTransformation* _tmp32_; - EditingToolsAdjustToolAdjustToolWindow* _tmp33_; - GtkScale* _tmp34_; - HighlightDetailTransformation* _tmp35_; - gfloat _tmp36_; + PixelTransformationBundle* _tmp24_; + PixelTransformation* _tmp25_; + PixelTransformer* _tmp26_; + HighlightDetailTransformation* _tmp27_; + EditingToolsAdjustToolAdjustToolWindow* _tmp28_; + GtkScale* _tmp29_; + HighlightDetailTransformation* _tmp30_; TemperatureTransformation* temp_trans = NULL; - PixelTransformationBundle* _tmp37_; - PixelTransformation* _tmp38_; - PixelTransformer* _tmp39_; - TemperatureTransformation* _tmp40_; - EditingToolsAdjustToolAdjustToolWindow* _tmp41_; - GtkScale* _tmp42_; - TemperatureTransformation* _tmp43_; - gfloat _tmp44_; + PixelTransformationBundle* _tmp31_; + PixelTransformation* _tmp32_; + PixelTransformer* _tmp33_; + TemperatureTransformation* _tmp34_; + EditingToolsAdjustToolAdjustToolWindow* _tmp35_; + GtkScale* _tmp36_; + TemperatureTransformation* _tmp37_; TintTransformation* tint_trans = NULL; + PixelTransformationBundle* _tmp38_; + PixelTransformation* _tmp39_; + PixelTransformer* _tmp40_; + TintTransformation* _tmp41_; + EditingToolsAdjustToolAdjustToolWindow* _tmp42_; + GtkScale* _tmp43_; + TintTransformation* _tmp44_; + SaturationTransformation* sat_trans = NULL; PixelTransformationBundle* _tmp45_; PixelTransformation* _tmp46_; PixelTransformer* _tmp47_; - TintTransformation* _tmp48_; + SaturationTransformation* _tmp48_; EditingToolsAdjustToolAdjustToolWindow* _tmp49_; GtkScale* _tmp50_; - TintTransformation* _tmp51_; - gfloat _tmp52_; - SaturationTransformation* sat_trans = NULL; - PixelTransformationBundle* _tmp53_; - PixelTransformation* _tmp54_; - PixelTransformer* _tmp55_; - SaturationTransformation* _tmp56_; - EditingToolsAdjustToolAdjustToolWindow* _tmp57_; - GtkScale* _tmp58_; - SaturationTransformation* _tmp59_; - gfloat _tmp60_; + SaturationTransformation* _tmp51_; ExposureTransformation* exposure_trans = NULL; - PixelTransformationBundle* _tmp61_; - PixelTransformation* _tmp62_; - PixelTransformer* _tmp63_; - ExposureTransformation* _tmp64_; - EditingToolsAdjustToolAdjustToolWindow* _tmp65_; - GtkScale* _tmp66_; - ExposureTransformation* _tmp67_; - gfloat _tmp68_; + PixelTransformationBundle* _tmp52_; + PixelTransformation* _tmp53_; + PixelTransformer* _tmp54_; + ExposureTransformation* _tmp55_; + EditingToolsAdjustToolAdjustToolWindow* _tmp56_; + GtkScale* _tmp57_; + ExposureTransformation* _tmp58_; ContrastTransformation* contrast_trans = NULL; - PixelTransformationBundle* _tmp69_; - PixelTransformation* _tmp70_; - PixelTransformer* _tmp71_; - ContrastTransformation* _tmp72_; - EditingToolsAdjustToolAdjustToolWindow* _tmp73_; - GtkScale* _tmp74_; - ContrastTransformation* _tmp75_; - gfloat _tmp76_; - EditingToolsPhotoCanvas* _tmp77_; - EditingToolsPhotoCanvas* _tmp78_; - GdkPixbuf* _tmp79_; + PixelTransformationBundle* _tmp59_; + PixelTransformation* _tmp60_; + PixelTransformer* _tmp61_; + ContrastTransformation* _tmp62_; + EditingToolsAdjustToolAdjustToolWindow* _tmp63_; + GtkScale* _tmp64_; + ContrastTransformation* _tmp65_; + GdkPixbuf* _tmp66_; + GdkPixbuf* _tmp67_; + GdkPixbuf* _tmp68_; + GdkPixbuf* _tmp69_; + GdkPixbuf* _tmp70_; + gboolean _tmp71_ = FALSE; + GdkPixbuf* _tmp72_; + gint _tmp73_; + gint _tmp74_; + gboolean _tmp78_ = FALSE; + gboolean _tmp79_ = FALSE; GdkPixbuf* _tmp80_; - GdkPixbuf* _tmp81_; - EditingToolsPhotoCanvas* _tmp82_; + gint _tmp81_; + gint _tmp82_; GdkPixbuf* _tmp83_; - GdkPixbuf* _tmp84_; - gboolean _tmp85_ = FALSE; - GdkPixbuf* _tmp86_; - gint _tmp87_; - gint _tmp88_; - gboolean _tmp92_ = FALSE; - gboolean _tmp93_ = FALSE; - GdkPixbuf* _tmp94_; - gint _tmp95_; - gint _tmp96_; - GdkPixbuf* _tmp97_; - gint _tmp98_; - gint _tmp99_; - GdkPixbuf* _tmp116_; - GdkPixbuf* _tmp117_; + gint _tmp84_; + gint _tmp85_; + GdkPixbuf* _tmp102_; + GdkPixbuf* _tmp103_; DataCollection* owner = NULL; - EditingToolsPhotoCanvas* _tmp118_; - Photo* _tmp119_; - Photo* _tmp120_; - DataCollection* _tmp121_; - DataCollection* _tmp122_; - DataCollection* _tmp123_; - EditingToolsPhotoCanvas* _tmp125_; + Photo* _tmp104_; + Photo* _tmp105_; + DataCollection* _tmp106_; + DataCollection* _tmp107_; + DataCollection* _tmp108_; #line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool); #line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); #line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = canvas; -#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = editing_tools_photo_canvas_get_container (_tmp0_); + _tmp0_ = editing_tools_photo_canvas_get_container (canvas); #line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = editing_tools_adjust_tool_adjust_tool_window_new (_tmp2_); + _tmp2_ = editing_tools_adjust_tool_adjust_tool_window_new (_tmp1_); #line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp3_); + g_object_ref_sink (_tmp2_); #line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->adjust_tool_window); #line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->adjust_tool_window = _tmp3_; + self->priv->adjust_tool_window = _tmp2_; #line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp2_); -#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = canvas; + _g_object_unref0 (_tmp1_); #line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = editing_tools_photo_canvas_get_photo (_tmp4_); + _tmp3_ = editing_tools_photo_canvas_get_photo (canvas); #line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - photo = _tmp5_; + photo = _tmp3_; #line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = photo; + _tmp4_ = photo; #line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = photo_get_color_adjustments (_tmp6_); + _tmp5_ = photo_get_color_adjustments (_tmp4_); #line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_bundle_unref0 (self->priv->transformations); #line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->transformations = _tmp7_; + self->priv->transformations = _tmp5_; #line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = self->priv->transformations; + _tmp6_ = self->priv->transformations; #line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = pixel_transformation_bundle_generate_transformer (_tmp8_); + _tmp7_ = pixel_transformation_bundle_generate_transformer (_tmp6_); #line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformer_unref0 (self->priv->transformer); #line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->transformer = _tmp9_; + self->priv->transformer = _tmp7_; #line 2520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = pixel_transformer_new (); + _tmp8_ = pixel_transformer_new (); #line 2520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformer_unref0 (self->priv->histogram_transformer); #line 2520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->histogram_transformer = _tmp10_; + self->priv->histogram_transformer = _tmp8_; #line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = self->priv->transformations; + _tmp9_ = self->priv->transformations; #line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = pixel_transformation_bundle_get_transformation (_tmp11_, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION); + _tmp10_ = pixel_transformation_bundle_get_transformation (_tmp9_, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION); #line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - expansion_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation); + expansion_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation); #line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = self->priv->adjust_tool_window; + _tmp11_ = self->priv->adjust_tool_window; #line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = _tmp13_->histogram_manipulator; + _tmp12_ = _tmp11_->histogram_manipulator; #line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = expansion_trans; + _tmp13_ = expansion_trans; #line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = expansion_transformation_get_black_point (_tmp15_); -#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - rgb_histogram_manipulator_set_left_nub_position (_tmp14_, _tmp16_); -#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = self->priv->adjust_tool_window; + rgb_histogram_manipulator_set_left_nub_position (_tmp12_, expansion_transformation_get_black_point (_tmp13_)); #line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = _tmp17_->histogram_manipulator; + _tmp14_ = self->priv->adjust_tool_window; #line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = expansion_trans; + _tmp15_ = _tmp14_->histogram_manipulator; #line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = expansion_transformation_get_white_point (_tmp19_); + _tmp16_ = expansion_trans; #line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - rgb_histogram_manipulator_set_right_nub_position (_tmp18_, _tmp20_); + rgb_histogram_manipulator_set_right_nub_position (_tmp15_, expansion_transformation_get_white_point (_tmp16_)); #line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = self->priv->transformations; + _tmp17_ = self->priv->transformations; #line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = pixel_transformation_bundle_get_transformation (_tmp21_, PIXEL_TRANSFORMATION_TYPE_SHADOWS); + _tmp18_ = pixel_transformation_bundle_get_transformation (_tmp17_, PIXEL_TRANSFORMATION_TYPE_SHADOWS); #line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - shadows_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation); + shadows_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation); #line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = self->priv->histogram_transformer; + _tmp19_ = self->priv->histogram_transformer; #line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = shadows_trans; + _tmp20_ = shadows_trans; #line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - pixel_transformer_attach_transformation (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); -#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = self->priv->adjust_tool_window; + pixel_transformer_attach_transformation (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp26_ = _tmp25_->shadows_slider; + _tmp21_ = self->priv->adjust_tool_window; #line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp27_ = shadows_trans; + _tmp22_ = _tmp21_->shadows_slider; #line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_ = shadow_detail_transformation_get_parameter (_tmp27_); + _tmp23_ = shadows_trans; #line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_range_get_type (), GtkRange), (gdouble) _tmp28_); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_range_get_type (), GtkRange), (gdouble) shadow_detail_transformation_get_parameter (_tmp23_)); #line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp29_ = self->priv->transformations; + _tmp24_ = self->priv->transformations; #line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp30_ = pixel_transformation_bundle_get_transformation (_tmp29_, PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS); + _tmp25_ = pixel_transformation_bundle_get_transformation (_tmp24_, PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS); #line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - highlights_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation); + highlights_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation); #line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp31_ = self->priv->histogram_transformer; + _tmp26_ = self->priv->histogram_transformer; #line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp32_ = highlights_trans; + _tmp27_ = highlights_trans; #line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - pixel_transformer_attach_transformation (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); -#line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp33_ = self->priv->adjust_tool_window; + pixel_transformer_attach_transformation (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp34_ = _tmp33_->highlights_slider; + _tmp28_ = self->priv->adjust_tool_window; #line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp35_ = highlights_trans; + _tmp29_ = _tmp28_->highlights_slider; #line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp36_ = highlight_detail_transformation_get_parameter (_tmp35_); + _tmp30_ = highlights_trans; #line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_range_get_type (), GtkRange), (gdouble) _tmp36_); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_range_get_type (), GtkRange), (gdouble) highlight_detail_transformation_get_parameter (_tmp30_)); #line 2543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp37_ = self->priv->transformations; + _tmp31_ = self->priv->transformations; #line 2543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp38_ = pixel_transformation_bundle_get_transformation (_tmp37_, PIXEL_TRANSFORMATION_TYPE_TEMPERATURE); + _tmp32_ = pixel_transformation_bundle_get_transformation (_tmp31_, PIXEL_TRANSFORMATION_TYPE_TEMPERATURE); #line 2543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - temp_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation); + temp_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation); #line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp39_ = self->priv->histogram_transformer; + _tmp33_ = self->priv->histogram_transformer; #line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp40_ = temp_trans; + _tmp34_ = temp_trans; #line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - pixel_transformer_attach_transformation (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + pixel_transformer_attach_transformation (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp41_ = self->priv->adjust_tool_window; + _tmp35_ = self->priv->adjust_tool_window; #line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp42_ = _tmp41_->temperature_slider; + _tmp36_ = _tmp35_->temperature_slider; #line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp43_ = temp_trans; + _tmp37_ = temp_trans; #line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp44_ = temperature_transformation_get_parameter (_tmp43_); -#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_range_get_type (), GtkRange), (gdouble) _tmp44_); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_range_get_type (), GtkRange), (gdouble) temperature_transformation_get_parameter (_tmp37_)); #line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp45_ = self->priv->transformations; + _tmp38_ = self->priv->transformations; #line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp46_ = pixel_transformation_bundle_get_transformation (_tmp45_, PIXEL_TRANSFORMATION_TYPE_TINT); + _tmp39_ = pixel_transformation_bundle_get_transformation (_tmp38_, PIXEL_TRANSFORMATION_TYPE_TINT); #line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - tint_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_TINT_TRANSFORMATION, TintTransformation); + tint_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_TINT_TRANSFORMATION, TintTransformation); #line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp47_ = self->priv->histogram_transformer; + _tmp40_ = self->priv->histogram_transformer; #line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp48_ = tint_trans; + _tmp41_ = tint_trans; #line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - pixel_transformer_attach_transformation (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + pixel_transformer_attach_transformation (_tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp49_ = self->priv->adjust_tool_window; -#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp50_ = _tmp49_->tint_slider; + _tmp42_ = self->priv->adjust_tool_window; #line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp51_ = tint_trans; + _tmp43_ = _tmp42_->tint_slider; #line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp52_ = tint_transformation_get_parameter (_tmp51_); + _tmp44_ = tint_trans; #line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_range_get_type (), GtkRange), (gdouble) _tmp52_); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_range_get_type (), GtkRange), (gdouble) tint_transformation_get_parameter (_tmp44_)); #line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp53_ = self->priv->transformations; + _tmp45_ = self->priv->transformations; #line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp54_ = pixel_transformation_bundle_get_transformation (_tmp53_, PIXEL_TRANSFORMATION_TYPE_SATURATION); + _tmp46_ = pixel_transformation_bundle_get_transformation (_tmp45_, PIXEL_TRANSFORMATION_TYPE_SATURATION); #line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - sat_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation); + sat_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation); #line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp55_ = self->priv->histogram_transformer; + _tmp47_ = self->priv->histogram_transformer; #line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp56_ = sat_trans; + _tmp48_ = sat_trans; #line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - pixel_transformer_attach_transformation (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); -#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp57_ = self->priv->adjust_tool_window; + pixel_transformer_attach_transformation (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp58_ = _tmp57_->saturation_slider; + _tmp49_ = self->priv->adjust_tool_window; #line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp59_ = sat_trans; + _tmp50_ = _tmp49_->saturation_slider; #line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp60_ = saturation_transformation_get_parameter (_tmp59_); + _tmp51_ = sat_trans; #line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_range_get_type (), GtkRange), (gdouble) _tmp60_); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_range_get_type (), GtkRange), (gdouble) saturation_transformation_get_parameter (_tmp51_)); #line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp61_ = self->priv->transformations; + _tmp52_ = self->priv->transformations; #line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp62_ = pixel_transformation_bundle_get_transformation (_tmp61_, PIXEL_TRANSFORMATION_TYPE_EXPOSURE); + _tmp53_ = pixel_transformation_bundle_get_transformation (_tmp52_, PIXEL_TRANSFORMATION_TYPE_EXPOSURE); #line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - exposure_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation); + exposure_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation); #line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp63_ = self->priv->histogram_transformer; + _tmp54_ = self->priv->histogram_transformer; #line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp64_ = exposure_trans; + _tmp55_ = exposure_trans; #line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - pixel_transformer_attach_transformation (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); -#line 2563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp65_ = self->priv->adjust_tool_window; + pixel_transformer_attach_transformation (_tmp54_, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 2563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp66_ = _tmp65_->exposure_slider; + _tmp56_ = self->priv->adjust_tool_window; #line 2563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp67_ = exposure_trans; + _tmp57_ = _tmp56_->exposure_slider; #line 2563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp68_ = exposure_transformation_get_parameter (_tmp67_); + _tmp58_ = exposure_trans; #line 2563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_range_get_type (), GtkRange), (gdouble) _tmp68_); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_range_get_type (), GtkRange), (gdouble) exposure_transformation_get_parameter (_tmp58_)); #line 2566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp69_ = self->priv->transformations; + _tmp59_ = self->priv->transformations; #line 2566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp70_ = pixel_transformation_bundle_get_transformation (_tmp69_, PIXEL_TRANSFORMATION_TYPE_CONTRAST); + _tmp60_ = pixel_transformation_bundle_get_transformation (_tmp59_, PIXEL_TRANSFORMATION_TYPE_CONTRAST); #line 2566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - contrast_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation); + contrast_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation); #line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp71_ = self->priv->histogram_transformer; + _tmp61_ = self->priv->histogram_transformer; #line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp72_ = contrast_trans; + _tmp62_ = contrast_trans; #line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - pixel_transformer_attach_transformation (_tmp71_, G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); + pixel_transformer_attach_transformation (_tmp61_, G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation)); #line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp73_ = self->priv->adjust_tool_window; + _tmp63_ = self->priv->adjust_tool_window; #line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp74_ = _tmp73_->contrast_slider; + _tmp64_ = _tmp63_->contrast_slider; #line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp75_ = contrast_trans; + _tmp65_ = contrast_trans; #line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp76_ = contrast_transformation_get_parameter (_tmp75_); -#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_range_get_type (), GtkRange), (gdouble) _tmp76_); -#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp77_ = canvas; + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_range_get_type (), GtkRange), (gdouble) contrast_transformation_get_parameter (_tmp65_)); #line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_adjust_tool_bind_canvas_handlers (self, _tmp77_); + editing_tools_adjust_tool_bind_canvas_handlers (self, canvas); #line 2572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_bind_window_handlers (self); #line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp78_ = canvas; + _tmp66_ = editing_tools_photo_canvas_get_scaled_pixbuf (canvas); #line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp79_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp78_); + _tmp67_ = _tmp66_; #line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp80_ = _tmp79_; -#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp81_ = gdk_pixbuf_copy (_tmp80_); + _tmp68_ = gdk_pixbuf_copy (_tmp67_); #line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->draw_to_pixbuf); #line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->draw_to_pixbuf = _tmp81_; + self->priv->draw_to_pixbuf = _tmp68_; #line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp80_); -#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp82_ = canvas; + _g_object_unref0 (_tmp67_); #line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp83_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp82_); + _tmp69_ = editing_tools_photo_canvas_get_scaled_pixbuf (canvas); #line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp84_ = _tmp83_; + _tmp70_ = _tmp69_; #line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp84_); + editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp70_); #line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp84_); + _g_object_unref0 (_tmp70_); #line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp86_ = self->priv->draw_to_pixbuf; + _tmp72_ = self->priv->draw_to_pixbuf; #line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp87_ = gdk_pixbuf_get_width (_tmp86_); + _tmp73_ = gdk_pixbuf_get_width (_tmp72_); #line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp88_ = _tmp87_; + _tmp74_ = _tmp73_; #line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp88_ == 1) { -#line 15072 "EditingTools.c" - GdkPixbuf* _tmp89_; - gint _tmp90_; - gint _tmp91_; + if (_tmp74_ == 1) { +#line 15466 "EditingTools.c" + GdkPixbuf* _tmp75_; + gint _tmp76_; + gint _tmp77_; #line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp89_ = self->priv->draw_to_pixbuf; + _tmp75_ = self->priv->draw_to_pixbuf; #line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp90_ = gdk_pixbuf_get_height (_tmp89_); + _tmp76_ = gdk_pixbuf_get_height (_tmp75_); #line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp91_ = _tmp90_; + _tmp77_ = _tmp76_; #line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp85_ = _tmp91_ == 1; -#line 15084 "EditingTools.c" + _tmp71_ = _tmp77_ == 1; +#line 15478 "EditingTools.c" } else { #line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp85_ = FALSE; -#line 15088 "EditingTools.c" + _tmp71_ = FALSE; +#line 15482 "EditingTools.c" } #line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp85_) { + if (_tmp71_) { #line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->disable_histogram_refresh = TRUE; -#line 15094 "EditingTools.c" +#line 15488 "EditingTools.c" } #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp94_ = self->priv->draw_to_pixbuf; + _tmp80_ = self->priv->draw_to_pixbuf; #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp95_ = gdk_pixbuf_get_width (_tmp94_); + _tmp81_ = gdk_pixbuf_get_width (_tmp80_); #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp96_ = _tmp95_; + _tmp82_ = _tmp81_; #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp97_ = self->priv->draw_to_pixbuf; + _tmp83_ = self->priv->draw_to_pixbuf; #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp98_ = gdk_pixbuf_get_height (_tmp97_); + _tmp84_ = gdk_pixbuf_get_height (_tmp83_); #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp99_ = _tmp98_; + _tmp85_ = _tmp84_; #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if ((_tmp96_ * _tmp99_) > 8192) { -#line 15110 "EditingTools.c" - GdkPixbuf* _tmp100_; - gint _tmp101_; - gint _tmp102_; + if ((_tmp82_ * _tmp85_) > 8192) { +#line 15504 "EditingTools.c" + GdkPixbuf* _tmp86_; + gint _tmp87_; + gint _tmp88_; #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp100_ = self->priv->draw_to_pixbuf; + _tmp86_ = self->priv->draw_to_pixbuf; #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp101_ = gdk_pixbuf_get_width (_tmp100_); + _tmp87_ = gdk_pixbuf_get_width (_tmp86_); #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp102_ = _tmp101_; + _tmp88_ = _tmp87_; #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp93_ = _tmp102_ > 1; -#line 15122 "EditingTools.c" + _tmp79_ = _tmp88_ > 1; +#line 15516 "EditingTools.c" } else { #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp93_ = FALSE; -#line 15126 "EditingTools.c" + _tmp79_ = FALSE; +#line 15520 "EditingTools.c" } #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp93_) { -#line 15130 "EditingTools.c" - GdkPixbuf* _tmp103_; - gint _tmp104_; - gint _tmp105_; + if (_tmp79_) { +#line 15524 "EditingTools.c" + GdkPixbuf* _tmp89_; + gint _tmp90_; + gint _tmp91_; #line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp103_ = self->priv->draw_to_pixbuf; + _tmp89_ = self->priv->draw_to_pixbuf; #line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp104_ = gdk_pixbuf_get_height (_tmp103_); + _tmp90_ = gdk_pixbuf_get_height (_tmp89_); #line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp105_ = _tmp104_; + _tmp91_ = _tmp90_; #line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp92_ = _tmp105_ > 1; -#line 15142 "EditingTools.c" + _tmp78_ = _tmp91_ > 1; +#line 15536 "EditingTools.c" } else { #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp92_ = FALSE; -#line 15146 "EditingTools.c" + _tmp78_ = FALSE; +#line 15540 "EditingTools.c" } #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp92_) { -#line 15150 "EditingTools.c" - GdkPixbuf* _tmp106_; - GdkPixbuf* _tmp107_; - gint _tmp108_; - gint _tmp109_; - GdkPixbuf* _tmp110_; - gint _tmp111_; - gint _tmp112_; - GdkPixbuf* _tmp113_; + if (_tmp78_) { +#line 15544 "EditingTools.c" + GdkPixbuf* _tmp92_; + GdkPixbuf* _tmp93_; + gint _tmp94_; + gint _tmp95_; + GdkPixbuf* _tmp96_; + gint _tmp97_; + gint _tmp98_; + GdkPixbuf* _tmp99_; #line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp106_ = self->priv->draw_to_pixbuf; + _tmp92_ = self->priv->draw_to_pixbuf; #line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp107_ = self->priv->draw_to_pixbuf; + _tmp93_ = self->priv->draw_to_pixbuf; #line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp108_ = gdk_pixbuf_get_width (_tmp107_); + _tmp94_ = gdk_pixbuf_get_width (_tmp93_); #line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp109_ = _tmp108_; + _tmp95_ = _tmp94_; #line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp110_ = self->priv->draw_to_pixbuf; + _tmp96_ = self->priv->draw_to_pixbuf; #line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp111_ = gdk_pixbuf_get_height (_tmp110_); + _tmp97_ = gdk_pixbuf_get_height (_tmp96_); #line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp112_ = _tmp111_; + _tmp98_ = _tmp97_; #line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp113_ = gdk_pixbuf_scale_simple (_tmp106_, _tmp109_ / 2, _tmp112_ / 2, GDK_INTERP_HYPER); + _tmp99_ = gdk_pixbuf_scale_simple (_tmp92_, _tmp95_ / 2, _tmp98_ / 2, GDK_INTERP_HYPER); #line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->histogram_pixbuf); #line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->histogram_pixbuf = _tmp113_; -#line 15179 "EditingTools.c" + self->priv->histogram_pixbuf = _tmp99_; +#line 15573 "EditingTools.c" } else { - GdkPixbuf* _tmp114_; - GdkPixbuf* _tmp115_; + GdkPixbuf* _tmp100_; + GdkPixbuf* _tmp101_; #line 2592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp114_ = self->priv->draw_to_pixbuf; + _tmp100_ = self->priv->draw_to_pixbuf; #line 2592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp115_ = gdk_pixbuf_copy (_tmp114_); + _tmp101_ = gdk_pixbuf_copy (_tmp100_); #line 2592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->histogram_pixbuf); #line 2592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->histogram_pixbuf = _tmp115_; -#line 15191 "EditingTools.c" + self->priv->histogram_pixbuf = _tmp101_; +#line 15585 "EditingTools.c" } #line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp116_ = self->priv->histogram_pixbuf; + _tmp102_ = self->priv->histogram_pixbuf; #line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp117_ = gdk_pixbuf_copy (_tmp116_); + _tmp103_ = gdk_pixbuf_copy (_tmp102_); #line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->virgin_histogram_pixbuf); #line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->virgin_histogram_pixbuf = _tmp117_; -#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp118_ = canvas; + self->priv->virgin_histogram_pixbuf = _tmp103_; #line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp119_ = editing_tools_photo_canvas_get_photo (_tmp118_); + _tmp104_ = editing_tools_photo_canvas_get_photo (canvas); #line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp120_ = _tmp119_; + _tmp105_ = _tmp104_; #line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp121_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, TYPE_DATA_OBJECT, DataObject)); + _tmp106_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, TYPE_DATA_OBJECT, DataObject)); #line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp122_ = _tmp121_; + _tmp107_ = _tmp106_; #line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp120_); + _g_object_unref0 (_tmp105_); #line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - owner = _tmp122_; + owner = _tmp107_; #line 2597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp123_ = owner; + _tmp108_ = owner; #line 2597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp123_ != NULL) { -#line 15219 "EditingTools.c" - DataCollection* _tmp124_; + if (_tmp108_ != NULL) { +#line 15611 "EditingTools.c" + DataCollection* _tmp109_; #line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp124_ = owner; + _tmp109_ = owner; #line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_connect (_tmp124_, "items-altered", (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self); -#line 15225 "EditingTools.c" + g_signal_connect (_tmp109_, "items-altered", (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self); +#line 15617 "EditingTools.c" } #line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp125_ = canvas; -#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp125_); + EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), canvas); #line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _data_collection_unref0 (owner); #line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -15247,11 +15637,13 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba _pixel_transformation_unref0 (expansion_trans); #line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (photo); -#line 15251 "EditingTools.c" +#line 15641 "EditingTools.c" } -static EditingToolsEditingToolWindow* editing_tools_adjust_tool_real_get_tool_window (EditingToolsEditingTool* base) { +static EditingToolsEditingToolWindow* +editing_tools_adjust_tool_real_get_tool_window (EditingToolsEditingTool* base) +{ EditingToolsAdjustTool * self; EditingToolsEditingToolWindow* result = NULL; EditingToolsAdjustToolAdjustToolWindow* _tmp0_; @@ -15266,11 +15658,13 @@ static EditingToolsEditingToolWindow* editing_tools_adjust_tool_real_get_tool_wi result = _tmp1_; #line 2604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 15270 "EditingTools.c" +#line 15662 "EditingTools.c" } -static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool* base) { +static void +editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool* base) +{ EditingToolsAdjustTool * self; EditingToolsPhotoCanvas* _tmp0_; EditingToolsAdjustToolAdjustToolWindow* _tmp10_; @@ -15280,7 +15674,7 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool* _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ != NULL) { -#line 15284 "EditingTools.c" +#line 15678 "EditingTools.c" DataCollection* owner = NULL; EditingToolsPhotoCanvas* _tmp1_; Photo* _tmp2_; @@ -15307,7 +15701,7 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool* _tmp6_ = owner; #line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp6_ != NULL) { -#line 15311 "EditingTools.c" +#line 15705 "EditingTools.c" DataCollection* _tmp7_; guint _tmp8_; #line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -15316,7 +15710,7 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool* g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp8_, NULL, FALSE); #line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self); -#line 15320 "EditingTools.c" +#line 15714 "EditingTools.c" } #line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; @@ -15324,13 +15718,13 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool* editing_tools_adjust_tool_unbind_canvas_handlers (self, _tmp9_); #line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _data_collection_unref0 (owner); -#line 15328 "EditingTools.c" +#line 15722 "EditingTools.c" } #line 2616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = self->priv->adjust_tool_window; #line 2616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp10_ != NULL) { -#line 15334 "EditingTools.c" +#line 15728 "EditingTools.c" EditingToolsAdjustToolAdjustToolWindow* _tmp11_; EditingToolsAdjustToolAdjustToolWindow* _tmp12_; #line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -15347,7 +15741,7 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool* _g_object_unref0 (self->priv->adjust_tool_window); #line 2620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->adjust_tool_window = NULL; -#line 15351 "EditingTools.c" +#line 15745 "EditingTools.c" } #line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->draw_to_pixbuf); @@ -15363,11 +15757,14 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool* self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1; #line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)); -#line 15367 "EditingTools.c" +#line 15761 "EditingTools.c" } -static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx) { +static void +editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base, + cairo_t* ctx) +{ EditingToolsAdjustTool * self; gboolean _tmp0_; EditingToolsPhotoCanvas* _tmp10_; @@ -15380,7 +15777,7 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base, _tmp0_ = self->priv->suppress_effect_redraw; #line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!_tmp0_) { -#line 15384 "EditingTools.c" +#line 15781 "EditingTools.c" PixelTransformer* _tmp1_; GdkPixbuf* _tmp2_; PixelTransformer* _tmp3_; @@ -15405,7 +15802,7 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base, _tmp6_ = self->priv->disable_histogram_refresh; #line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!_tmp6_) { -#line 15409 "EditingTools.c" +#line 15806 "EditingTools.c" EditingToolsAdjustToolAdjustToolWindow* _tmp7_; RGBHistogramManipulator* _tmp8_; GdkPixbuf* _tmp9_; @@ -15417,7 +15814,7 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base, _tmp9_ = self->priv->histogram_pixbuf; #line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" rgb_histogram_manipulator_update_histogram (_tmp8_, _tmp9_); -#line 15421 "EditingTools.c" +#line 15818 "EditingTools.c" } } #line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -15426,23 +15823,25 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base, _tmp11_ = self->priv->draw_to_pixbuf; #line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_paint_pixbuf (_tmp10_, _tmp11_); -#line 15430 "EditingTools.c" +#line 15827 "EditingTools.c" } -static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingToolsEditingTool* base, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error) { +static GdkPixbuf* +editing_tools_adjust_tool_real_get_display_pixbuf (EditingToolsEditingTool* base, + Scaling* scaling, + Photo* photo, + Dimensions* max_dim, + GError** error) +{ EditingToolsAdjustTool * self; Dimensions _vala_max_dim = {0}; GdkPixbuf* result = NULL; - Photo* _tmp0_; - gboolean _tmp1_; - Photo* _tmp2_; - Dimensions _tmp3_ = {0}; - GdkPixbuf* _tmp4_ = NULL; - Photo* _tmp5_; - Scaling _tmp6_; - GdkPixbuf* _tmp7_; - GdkPixbuf* _tmp8_; + Dimensions _tmp0_ = {0}; + GdkPixbuf* _tmp1_ = NULL; + Scaling _tmp2_; + GdkPixbuf* _tmp3_; + GdkPixbuf* _tmp4_; GError * _inner_error_ = NULL; #line 2641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool); @@ -15451,11 +15850,7 @@ static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingTool #line 2641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); #line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = photo; -#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = photo_has_color_adjustments (_tmp0_); -#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (!_tmp1_) { + if (!photo_has_color_adjustments (photo)) { #line 2644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" dimensions_init (&_vala_max_dim, 0, 0); #line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -15464,55 +15859,53 @@ static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingTool if (max_dim) { #line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *max_dim = _vala_max_dim; -#line 15468 "EditingTools.c" +#line 15863 "EditingTools.c" } #line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 15472 "EditingTools.c" +#line 15867 "EditingTools.c" } #line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = photo; + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp0_); #line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp3_); -#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _vala_max_dim = _tmp3_; -#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = photo; + _vala_max_dim = _tmp0_; #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = *scaling; + _tmp2_ = *scaling; #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = photo_get_pixbuf_with_options (_tmp5_, &_tmp6_, PHOTO_EXCEPTION_ADJUST, BACKING_FETCH_MODE_BASELINE, &_inner_error_); + _tmp3_ = photo_get_pixbuf_with_options (photo, &_tmp2_, PHOTO_EXCEPTION_ADJUST, BACKING_FETCH_MODE_BASELINE, &_inner_error_); #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = _tmp7_; + _tmp1_ = _tmp3_; #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_propagate_error (error, _inner_error_); #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return NULL; -#line 15494 "EditingTools.c" +#line 15885 "EditingTools.c" } #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = _tmp4_; + _tmp4_ = _tmp1_; #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = NULL; + _tmp1_ = NULL; #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - result = _tmp8_; + result = _tmp4_; #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp1_); #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (max_dim) { #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *max_dim = _vala_max_dim; -#line 15508 "EditingTools.c" +#line 15899 "EditingTools.c" } #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 15512 "EditingTools.c" +#line 15903 "EditingTools.c" } -static void editing_tools_adjust_tool_on_reset (EditingToolsAdjustTool* self) { +static void +editing_tools_adjust_tool_on_reset (EditingToolsAdjustTool* self) +{ EditingToolsAdjustToolAdjustResetCommand* command = NULL; PixelTransformationBundle* _tmp0_; EditingToolsAdjustToolAdjustResetCommand* _tmp1_; @@ -15536,11 +15929,13 @@ static void editing_tools_adjust_tool_on_reset (EditingToolsAdjustTool* self) { _command_manager_unref0 (_tmp3_); #line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (command); -#line 15540 "EditingTools.c" +#line 15933 "EditingTools.c" } -static void editing_tools_adjust_tool_on_ok (EditingToolsAdjustTool* self) { +static void +editing_tools_adjust_tool_on_ok (EditingToolsAdjustTool* self) +{ EditingToolsEditingToolWindow* _tmp0_; EditingToolsEditingToolWindow* _tmp1_; EditingToolsPhotoCanvas* _tmp2_; @@ -15596,90 +15991,84 @@ static void editing_tools_adjust_tool_on_ok (EditingToolsAdjustTool* self) { _g_object_unref0 (_tmp7_); #line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp4_); -#line 15600 "EditingTools.c" +#line 15995 "EditingTools.c" } -static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjustTool* self, PixelTransformationBundle* new_transformations) { +static void +editing_tools_adjust_tool_update_transformations (EditingToolsAdjustTool* self, + PixelTransformationBundle* new_transformations) +{ #line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); #line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_transformations)); -#line 15609 "EditingTools.c" +#line 16007 "EditingTools.c" { GeeIterator* _transformation_it = NULL; - PixelTransformationBundle* _tmp0_; + GeeIterable* _tmp0_; GeeIterable* _tmp1_; - GeeIterable* _tmp2_; + GeeIterator* _tmp2_; GeeIterator* _tmp3_; - GeeIterator* _tmp4_; #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = new_transformations; + _tmp0_ = pixel_transformation_bundle_get_transformations (new_transformations); #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = pixel_transformation_bundle_get_transformations (_tmp0_); -#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = gee_iterable_iterator (_tmp2_); + _tmp2_ = gee_iterable_iterator (_tmp1_); #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _transformation_it = _tmp4_; + _transformation_it = _tmp3_; #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" while (TRUE) { -#line 15633 "EditingTools.c" - GeeIterator* _tmp5_; - gboolean _tmp6_; +#line 16028 "EditingTools.c" + GeeIterator* _tmp4_; PixelTransformation* transformation = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; - PixelTransformation* _tmp9_; -#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = _transformation_it; + GeeIterator* _tmp5_; + gpointer _tmp6_; + PixelTransformation* _tmp7_; #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = gee_iterator_next (_tmp5_); + _tmp4_ = _transformation_it; #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp4_)) { #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 15648 "EditingTools.c" +#line 16040 "EditingTools.c" } #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = _transformation_it; + _tmp5_ = _transformation_it; #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - transformation = (PixelTransformation*) _tmp8_; + transformation = (PixelTransformation*) _tmp6_; #line 2671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = transformation; + _tmp7_ = transformation; #line 2671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_adjust_tool_update_transformation (self, _tmp9_); + editing_tools_adjust_tool_update_transformation (self, _tmp7_); #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (transformation); -#line 15662 "EditingTools.c" +#line 16054 "EditingTools.c" } #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_transformation_it); -#line 15666 "EditingTools.c" +#line 16058 "EditingTools.c" } } -static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustTool* self, PixelTransformation* new_transformation) { +static void +editing_tools_adjust_tool_update_transformation (EditingToolsAdjustTool* self, + PixelTransformation* new_transformation) +{ PixelTransformation* old_transformation = NULL; PixelTransformationBundle* _tmp0_; PixelTransformation* _tmp1_; - PixelTransformationType _tmp2_; + PixelTransformer* _tmp2_; PixelTransformation* _tmp3_; - PixelTransformer* _tmp4_; - PixelTransformation* _tmp5_; - PixelTransformation* _tmp6_; - PixelTransformation* _tmp7_; - PixelTransformationType _tmp8_; - PixelTransformationBundle* _tmp12_; - PixelTransformation* _tmp13_; + PixelTransformationBundle* _tmp6_; #line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); #line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -15687,65 +16076,50 @@ static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustT #line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->transformations; #line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = new_transformation; -#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = pixel_transformation_get_transformation_type (_tmp1_); + _tmp1_ = pixel_transformation_bundle_get_transformation (_tmp0_, pixel_transformation_get_transformation_type (new_transformation)); #line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = pixel_transformation_bundle_get_transformation (_tmp0_, _tmp2_); -#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - old_transformation = _tmp3_; -#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = self->priv->transformer; + old_transformation = _tmp1_; #line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = old_transformation; + _tmp2_ = self->priv->transformer; #line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = new_transformation; + _tmp3_ = old_transformation; #line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - pixel_transformer_replace_transformation (_tmp4_, _tmp5_, _tmp6_); -#line 2679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = new_transformation; + pixel_transformer_replace_transformation (_tmp2_, _tmp3_, new_transformation); #line 2679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = pixel_transformation_get_transformation_type (_tmp7_); -#line 2679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp8_ != PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION) { -#line 15712 "EditingTools.c" - PixelTransformer* _tmp9_; - PixelTransformation* _tmp10_; - PixelTransformation* _tmp11_; -#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = self->priv->histogram_transformer; + if (pixel_transformation_get_transformation_type (new_transformation) != PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION) { +#line 16091 "EditingTools.c" + PixelTransformer* _tmp4_; + PixelTransformation* _tmp5_; #line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = old_transformation; + _tmp4_ = self->priv->histogram_transformer; #line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = new_transformation; + _tmp5_ = old_transformation; #line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - pixel_transformer_replace_transformation (_tmp9_, _tmp10_, _tmp11_); -#line 15724 "EditingTools.c" + pixel_transformer_replace_transformation (_tmp4_, _tmp5_, new_transformation); +#line 16100 "EditingTools.c" } #line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = self->priv->transformations; + _tmp6_ = self->priv->transformations; #line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = new_transformation; -#line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - pixel_transformation_bundle_set (_tmp12_, _tmp13_); + pixel_transformation_bundle_set (_tmp6_, new_transformation); #line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (old_transformation); -#line 15734 "EditingTools.c" +#line 16108 "EditingTools.c" } -static void editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* self, PixelTransformation* new_transformation, const gchar* name) { +static void +editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* self, + PixelTransformation* new_transformation, + const gchar* name) +{ PixelTransformation* old_transformation = NULL; PixelTransformationBundle* _tmp0_; PixelTransformation* _tmp1_; - PixelTransformationType _tmp2_; - PixelTransformation* _tmp3_; EditingToolsAdjustToolSliderAdjustmentCommand* command = NULL; - PixelTransformation* _tmp4_; - const gchar* _tmp5_; - EditingToolsAdjustToolSliderAdjustmentCommand* _tmp6_; - CommandManager* _tmp7_; - CommandManager* _tmp8_; + EditingToolsAdjustToolSliderAdjustmentCommand* _tmp2_; + CommandManager* _tmp3_; + CommandManager* _tmp4_; #line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); #line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -15755,45 +16129,41 @@ static void editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* se #line 2686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->transformations; #line 2686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = new_transformation; -#line 2686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = pixel_transformation_get_transformation_type (_tmp1_); -#line 2686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = pixel_transformation_bundle_get_transformation (_tmp0_, _tmp2_); + _tmp1_ = pixel_transformation_bundle_get_transformation (_tmp0_, pixel_transformation_get_transformation_type (new_transformation)); #line 2686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - old_transformation = _tmp3_; + old_transformation = _tmp1_; #line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = new_transformation; + _tmp2_ = editing_tools_adjust_tool_slider_adjustment_command_new (self, old_transformation, new_transformation, name); #line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = name; -#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = editing_tools_adjust_tool_slider_adjustment_command_new (self, old_transformation, _tmp4_, _tmp5_); -#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - command = _tmp6_; + command = _tmp2_; #line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = app_window_get_command_manager (); + _tmp3_ = app_window_get_command_manager (); #line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = _tmp7_; + _tmp4_ = _tmp3_; #line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command)); + command_manager_execute (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command)); #line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _command_manager_unref0 (_tmp8_); + _command_manager_unref0 (_tmp4_); #line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (command); #line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (old_transformation); -#line 15786 "EditingTools.c" +#line 16152 "EditingTools.c" } -static void _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback (gpointer self) { +static void +_editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback (gpointer self) +{ #line 2695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_delayed_temperature_adjustment ((EditingToolsAdjustTool*) self); -#line 15793 "EditingTools.c" +#line 16161 "EditingTools.c" } -static void editing_tools_adjust_tool_on_temperature_adjustment (EditingToolsAdjustTool* self) { +static void +editing_tools_adjust_tool_on_temperature_adjustment (EditingToolsAdjustTool* self) +{ OneShotScheduler* _tmp0_; OneShotScheduler* _tmp2_; #line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -15802,7 +16172,7 @@ static void editing_tools_adjust_tool_on_temperature_adjustment (EditingToolsAdj _tmp0_ = self->priv->temperature_scheduler; #line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ == NULL) { -#line 15806 "EditingTools.c" +#line 16176 "EditingTools.c" OneShotScheduler* _tmp1_; #line 2695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = one_shot_scheduler_new ("temperature", _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback, self); @@ -15810,22 +16180,23 @@ static void editing_tools_adjust_tool_on_temperature_adjustment (EditingToolsAdj _one_shot_scheduler_unref0 (self->priv->temperature_scheduler); #line 2695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->temperature_scheduler = _tmp1_; -#line 15814 "EditingTools.c" +#line 16184 "EditingTools.c" } #line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->temperature_scheduler; #line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE); -#line 15820 "EditingTools.c" +#line 16190 "EditingTools.c" } -static void editing_tools_adjust_tool_on_delayed_temperature_adjustment (EditingToolsAdjustTool* self) { +static void +editing_tools_adjust_tool_on_delayed_temperature_adjustment (EditingToolsAdjustTool* self) +{ TemperatureTransformation* new_temp_trans = NULL; EditingToolsAdjustToolAdjustToolWindow* _tmp0_; GtkScale* _tmp1_; - gdouble _tmp2_; - TemperatureTransformation* _tmp3_; + TemperatureTransformation* _tmp2_; #line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); #line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -15833,27 +16204,29 @@ static void editing_tools_adjust_tool_on_delayed_temperature_adjustment (Editing #line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->temperature_slider; #line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)); -#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = temperature_transformation_new ((gfloat) _tmp2_); + _tmp2_ = temperature_transformation_new ((gfloat) gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange))); #line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_temp_trans = _tmp3_; + new_temp_trans = _tmp2_; #line 2703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_temp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Temperature")); #line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (new_temp_trans); -#line 15846 "EditingTools.c" +#line 16215 "EditingTools.c" } -static void _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback (gpointer self) { +static void +_editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback (gpointer self) +{ #line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_delayed_tint_adjustment ((EditingToolsAdjustTool*) self); -#line 15853 "EditingTools.c" +#line 16224 "EditingTools.c" } -static void editing_tools_adjust_tool_on_tint_adjustment (EditingToolsAdjustTool* self) { +static void +editing_tools_adjust_tool_on_tint_adjustment (EditingToolsAdjustTool* self) +{ OneShotScheduler* _tmp0_; OneShotScheduler* _tmp2_; #line 2706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -15862,7 +16235,7 @@ static void editing_tools_adjust_tool_on_tint_adjustment (EditingToolsAdjustTool _tmp0_ = self->priv->tint_scheduler; #line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ == NULL) { -#line 15866 "EditingTools.c" +#line 16239 "EditingTools.c" OneShotScheduler* _tmp1_; #line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = one_shot_scheduler_new ("tint", _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback, self); @@ -15870,22 +16243,23 @@ static void editing_tools_adjust_tool_on_tint_adjustment (EditingToolsAdjustTool _one_shot_scheduler_unref0 (self->priv->tint_scheduler); #line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->tint_scheduler = _tmp1_; -#line 15874 "EditingTools.c" +#line 16247 "EditingTools.c" } #line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->tint_scheduler; #line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE); -#line 15880 "EditingTools.c" +#line 16253 "EditingTools.c" } -static void editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAdjustTool* self) { +static void +editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAdjustTool* self) +{ TintTransformation* new_tint_trans = NULL; EditingToolsAdjustToolAdjustToolWindow* _tmp0_; GtkScale* _tmp1_; - gdouble _tmp2_; - TintTransformation* _tmp3_; + TintTransformation* _tmp2_; #line 2712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); #line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -15893,27 +16267,29 @@ static void editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAd #line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->tint_slider; #line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)); -#line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = tint_transformation_new ((gfloat) _tmp2_); + _tmp2_ = tint_transformation_new ((gfloat) gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange))); #line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_tint_trans = _tmp3_; + new_tint_trans = _tmp2_; #line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_tint_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Tint")); #line 2712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (new_tint_trans); -#line 15906 "EditingTools.c" +#line 16278 "EditingTools.c" } -static void _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback (gpointer self) { +static void +_editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback (gpointer self) +{ #line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_delayed_contrast_adjustment ((EditingToolsAdjustTool*) self); -#line 15913 "EditingTools.c" +#line 16287 "EditingTools.c" } -static void editing_tools_adjust_tool_on_contrast_adjustment (EditingToolsAdjustTool* self) { +static void +editing_tools_adjust_tool_on_contrast_adjustment (EditingToolsAdjustTool* self) +{ OneShotScheduler* _tmp0_; OneShotScheduler* _tmp2_; #line 2718 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -15922,7 +16298,7 @@ static void editing_tools_adjust_tool_on_contrast_adjustment (EditingToolsAdjust _tmp0_ = self->priv->contrast_scheduler; #line 2719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ == NULL) { -#line 15926 "EditingTools.c" +#line 16302 "EditingTools.c" OneShotScheduler* _tmp1_; #line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = one_shot_scheduler_new ("contrast", _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback, self); @@ -15930,22 +16306,23 @@ static void editing_tools_adjust_tool_on_contrast_adjustment (EditingToolsAdjust _one_shot_scheduler_unref0 (self->priv->contrast_scheduler); #line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->contrast_scheduler = _tmp1_; -#line 15934 "EditingTools.c" +#line 16310 "EditingTools.c" } #line 2721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->contrast_scheduler; #line 2721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE); -#line 15940 "EditingTools.c" +#line 16316 "EditingTools.c" } -static void editing_tools_adjust_tool_on_delayed_contrast_adjustment (EditingToolsAdjustTool* self) { +static void +editing_tools_adjust_tool_on_delayed_contrast_adjustment (EditingToolsAdjustTool* self) +{ ContrastTransformation* new_exp_trans = NULL; EditingToolsAdjustToolAdjustToolWindow* _tmp0_; GtkScale* _tmp1_; - gdouble _tmp2_; - ContrastTransformation* _tmp3_; + ContrastTransformation* _tmp2_; #line 2724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); #line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -15953,27 +16330,29 @@ static void editing_tools_adjust_tool_on_delayed_contrast_adjustment (EditingToo #line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->contrast_slider; #line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)); -#line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = contrast_transformation_new ((gfloat) _tmp2_); + _tmp2_ = contrast_transformation_new ((gfloat) gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange))); #line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_exp_trans = _tmp3_; + new_exp_trans = _tmp2_; #line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Contrast")); #line 2724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (new_exp_trans); -#line 15966 "EditingTools.c" +#line 16341 "EditingTools.c" } -static void _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback (gpointer self) { +static void +_editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback (gpointer self) +{ #line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_delayed_saturation_adjustment ((EditingToolsAdjustTool*) self); -#line 15973 "EditingTools.c" +#line 16350 "EditingTools.c" } -static void editing_tools_adjust_tool_on_saturation_adjustment (EditingToolsAdjustTool* self) { +static void +editing_tools_adjust_tool_on_saturation_adjustment (EditingToolsAdjustTool* self) +{ OneShotScheduler* _tmp0_; OneShotScheduler* _tmp2_; #line 2731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -15982,7 +16361,7 @@ static void editing_tools_adjust_tool_on_saturation_adjustment (EditingToolsAdju _tmp0_ = self->priv->saturation_scheduler; #line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ == NULL) { -#line 15986 "EditingTools.c" +#line 16365 "EditingTools.c" OneShotScheduler* _tmp1_; #line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = one_shot_scheduler_new ("saturation", _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback, self); @@ -15990,22 +16369,23 @@ static void editing_tools_adjust_tool_on_saturation_adjustment (EditingToolsAdju _one_shot_scheduler_unref0 (self->priv->saturation_scheduler); #line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->saturation_scheduler = _tmp1_; -#line 15994 "EditingTools.c" +#line 16373 "EditingTools.c" } #line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->saturation_scheduler; #line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE); -#line 16000 "EditingTools.c" +#line 16379 "EditingTools.c" } -static void editing_tools_adjust_tool_on_delayed_saturation_adjustment (EditingToolsAdjustTool* self) { +static void +editing_tools_adjust_tool_on_delayed_saturation_adjustment (EditingToolsAdjustTool* self) +{ SaturationTransformation* new_sat_trans = NULL; EditingToolsAdjustToolAdjustToolWindow* _tmp0_; GtkScale* _tmp1_; - gdouble _tmp2_; - SaturationTransformation* _tmp3_; + SaturationTransformation* _tmp2_; #line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); #line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -16013,27 +16393,29 @@ static void editing_tools_adjust_tool_on_delayed_saturation_adjustment (EditingT #line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->saturation_slider; #line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)); + _tmp2_ = saturation_transformation_new ((gfloat) gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange))); #line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = saturation_transformation_new ((gfloat) _tmp2_); -#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_sat_trans = _tmp3_; + new_sat_trans = _tmp2_; #line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_sat_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Saturation")); #line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (new_sat_trans); -#line 16026 "EditingTools.c" +#line 16404 "EditingTools.c" } -static void _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback (gpointer self) { +static void +_editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback (gpointer self) +{ #line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_delayed_exposure_adjustment ((EditingToolsAdjustTool*) self); -#line 16033 "EditingTools.c" +#line 16413 "EditingTools.c" } -static void editing_tools_adjust_tool_on_exposure_adjustment (EditingToolsAdjustTool* self) { +static void +editing_tools_adjust_tool_on_exposure_adjustment (EditingToolsAdjustTool* self) +{ OneShotScheduler* _tmp0_; OneShotScheduler* _tmp2_; #line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -16042,7 +16424,7 @@ static void editing_tools_adjust_tool_on_exposure_adjustment (EditingToolsAdjust _tmp0_ = self->priv->exposure_scheduler; #line 2745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ == NULL) { -#line 16046 "EditingTools.c" +#line 16428 "EditingTools.c" OneShotScheduler* _tmp1_; #line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = one_shot_scheduler_new ("exposure", _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback, self); @@ -16050,22 +16432,23 @@ static void editing_tools_adjust_tool_on_exposure_adjustment (EditingToolsAdjust _one_shot_scheduler_unref0 (self->priv->exposure_scheduler); #line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->exposure_scheduler = _tmp1_; -#line 16054 "EditingTools.c" +#line 16436 "EditingTools.c" } #line 2748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->exposure_scheduler; #line 2748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE); -#line 16060 "EditingTools.c" +#line 16442 "EditingTools.c" } -static void editing_tools_adjust_tool_on_delayed_exposure_adjustment (EditingToolsAdjustTool* self) { +static void +editing_tools_adjust_tool_on_delayed_exposure_adjustment (EditingToolsAdjustTool* self) +{ ExposureTransformation* new_exp_trans = NULL; EditingToolsAdjustToolAdjustToolWindow* _tmp0_; GtkScale* _tmp1_; - gdouble _tmp2_; - ExposureTransformation* _tmp3_; + ExposureTransformation* _tmp2_; #line 2751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); #line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -16073,27 +16456,29 @@ static void editing_tools_adjust_tool_on_delayed_exposure_adjustment (EditingToo #line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->exposure_slider; #line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)); + _tmp2_ = exposure_transformation_new ((gfloat) gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange))); #line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = exposure_transformation_new ((gfloat) _tmp2_); -#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_exp_trans = _tmp3_; + new_exp_trans = _tmp2_; #line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Exposure")); #line 2751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (new_exp_trans); -#line 16086 "EditingTools.c" +#line 16467 "EditingTools.c" } -static void _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback (gpointer self) { +static void +_editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback (gpointer self) +{ #line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_delayed_shadows_adjustment ((EditingToolsAdjustTool*) self); -#line 16093 "EditingTools.c" +#line 16476 "EditingTools.c" } -static void editing_tools_adjust_tool_on_shadows_adjustment (EditingToolsAdjustTool* self) { +static void +editing_tools_adjust_tool_on_shadows_adjustment (EditingToolsAdjustTool* self) +{ OneShotScheduler* _tmp0_; OneShotScheduler* _tmp2_; #line 2757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -16102,7 +16487,7 @@ static void editing_tools_adjust_tool_on_shadows_adjustment (EditingToolsAdjustT _tmp0_ = self->priv->shadows_scheduler; #line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ == NULL) { -#line 16106 "EditingTools.c" +#line 16491 "EditingTools.c" OneShotScheduler* _tmp1_; #line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = one_shot_scheduler_new ("shadows", _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback, self); @@ -16110,22 +16495,23 @@ static void editing_tools_adjust_tool_on_shadows_adjustment (EditingToolsAdjustT _one_shot_scheduler_unref0 (self->priv->shadows_scheduler); #line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->shadows_scheduler = _tmp1_; -#line 16114 "EditingTools.c" +#line 16499 "EditingTools.c" } #line 2761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->shadows_scheduler; #line 2761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE); -#line 16120 "EditingTools.c" +#line 16505 "EditingTools.c" } -static void editing_tools_adjust_tool_on_delayed_shadows_adjustment (EditingToolsAdjustTool* self) { +static void +editing_tools_adjust_tool_on_delayed_shadows_adjustment (EditingToolsAdjustTool* self) +{ ShadowDetailTransformation* new_shadows_trans = NULL; EditingToolsAdjustToolAdjustToolWindow* _tmp0_; GtkScale* _tmp1_; - gdouble _tmp2_; - ShadowDetailTransformation* _tmp3_; + ShadowDetailTransformation* _tmp2_; #line 2764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); #line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -16133,27 +16519,29 @@ static void editing_tools_adjust_tool_on_delayed_shadows_adjustment (EditingTool #line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->shadows_slider; #line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)); + _tmp2_ = shadow_detail_transformation_new ((gfloat) gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange))); #line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = shadow_detail_transformation_new ((gfloat) _tmp2_); -#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_shadows_trans = _tmp3_; + new_shadows_trans = _tmp2_; #line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_shadows_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Shadows")); #line 2764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (new_shadows_trans); -#line 16146 "EditingTools.c" +#line 16530 "EditingTools.c" } -static void _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback (gpointer self) { +static void +_editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback (gpointer self) +{ #line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_delayed_highlights_adjustment ((EditingToolsAdjustTool*) self); -#line 16153 "EditingTools.c" +#line 16539 "EditingTools.c" } -static void editing_tools_adjust_tool_on_highlights_adjustment (EditingToolsAdjustTool* self) { +static void +editing_tools_adjust_tool_on_highlights_adjustment (EditingToolsAdjustTool* self) +{ OneShotScheduler* _tmp0_; OneShotScheduler* _tmp2_; #line 2770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -16162,7 +16550,7 @@ static void editing_tools_adjust_tool_on_highlights_adjustment (EditingToolsAdju _tmp0_ = self->priv->highlights_scheduler; #line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ == NULL) { -#line 16166 "EditingTools.c" +#line 16554 "EditingTools.c" OneShotScheduler* _tmp1_; #line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = one_shot_scheduler_new ("highlights", _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback, self); @@ -16170,22 +16558,23 @@ static void editing_tools_adjust_tool_on_highlights_adjustment (EditingToolsAdju _one_shot_scheduler_unref0 (self->priv->highlights_scheduler); #line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->highlights_scheduler = _tmp1_; -#line 16174 "EditingTools.c" +#line 16562 "EditingTools.c" } #line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->highlights_scheduler; #line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE); -#line 16180 "EditingTools.c" +#line 16568 "EditingTools.c" } -static void editing_tools_adjust_tool_on_delayed_highlights_adjustment (EditingToolsAdjustTool* self) { +static void +editing_tools_adjust_tool_on_delayed_highlights_adjustment (EditingToolsAdjustTool* self) +{ HighlightDetailTransformation* new_highlights_trans = NULL; EditingToolsAdjustToolAdjustToolWindow* _tmp0_; GtkScale* _tmp1_; - gdouble _tmp2_; - HighlightDetailTransformation* _tmp3_; + HighlightDetailTransformation* _tmp2_; #line 2777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); #line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -16193,30 +16582,28 @@ static void editing_tools_adjust_tool_on_delayed_highlights_adjustment (EditingT #line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->highlights_slider; #line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)); -#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = highlight_detail_transformation_new ((gfloat) _tmp2_); + _tmp2_ = highlight_detail_transformation_new ((gfloat) gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange))); #line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_highlights_trans = _tmp3_; + new_highlights_trans = _tmp2_; #line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_highlights_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Highlights")); #line 2777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (new_highlights_trans); -#line 16206 "EditingTools.c" +#line 16593 "EditingTools.c" } -static void editing_tools_adjust_tool_on_histogram_constraint (EditingToolsAdjustTool* self) { +static void +editing_tools_adjust_tool_on_histogram_constraint (EditingToolsAdjustTool* self) +{ gint expansion_black_point = 0; EditingToolsAdjustToolAdjustToolWindow* _tmp0_; RGBHistogramManipulator* _tmp1_; - gint _tmp2_; gint expansion_white_point = 0; - EditingToolsAdjustToolAdjustToolWindow* _tmp3_; - RGBHistogramManipulator* _tmp4_; - gint _tmp5_; + EditingToolsAdjustToolAdjustToolWindow* _tmp2_; + RGBHistogramManipulator* _tmp3_; ExpansionTransformation* new_exp_trans = NULL; - ExpansionTransformation* _tmp6_; + ExpansionTransformation* _tmp4_; #line 2783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); #line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -16224,30 +16611,28 @@ static void editing_tools_adjust_tool_on_histogram_constraint (EditingToolsAdjus #line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->histogram_manipulator; #line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = rgb_histogram_manipulator_get_left_nub_position (_tmp1_); -#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - expansion_black_point = _tmp2_; -#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = self->priv->adjust_tool_window; + expansion_black_point = rgb_histogram_manipulator_get_left_nub_position (_tmp1_); #line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = _tmp3_->histogram_manipulator; + _tmp2_ = self->priv->adjust_tool_window; #line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = rgb_histogram_manipulator_get_right_nub_position (_tmp4_); + _tmp3_ = _tmp2_->histogram_manipulator; #line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - expansion_white_point = _tmp5_; + expansion_white_point = rgb_histogram_manipulator_get_right_nub_position (_tmp3_); #line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = expansion_transformation_new_from_extrema (expansion_black_point, expansion_white_point); + _tmp4_ = expansion_transformation_new_from_extrema (expansion_black_point, expansion_white_point); #line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_exp_trans = _tmp6_; + new_exp_trans = _tmp4_; #line 2790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Contrast Expansion")); #line 2783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (new_exp_trans); -#line 16247 "EditingTools.c" +#line 16630 "EditingTools.c" } -static void editing_tools_adjust_tool_on_canvas_resize (EditingToolsAdjustTool* self) { +static void +editing_tools_adjust_tool_on_canvas_resize (EditingToolsAdjustTool* self) +{ EditingToolsPhotoCanvas* _tmp0_; GdkPixbuf* _tmp1_; GdkPixbuf* _tmp2_; @@ -16281,19 +16666,21 @@ static void editing_tools_adjust_tool_on_canvas_resize (EditingToolsAdjustTool* editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp6_); #line 2795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp6_); -#line 16285 "EditingTools.c" +#line 16670 "EditingTools.c" } -static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustTool* self, GtkWidget* widget, GdkEventButton* event) { +static gboolean +editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustTool* self, + GtkWidget* widget, + GdkEventButton* event) +{ gboolean result = FALSE; GtkScale* source = NULL; - GtkWidget* _tmp0_; - GtkScale* _tmp1_; + GtkScale* _tmp0_; + gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; - GdkEventButton* _tmp4_; - guint _tmp5_; + guint _tmp3_; #line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self), FALSE); #line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -16301,67 +16688,54 @@ static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustToo #line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (event != NULL, FALSE); #line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = widget; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (widget, gtk_scale_get_type (), GtkScale)); #line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_scale_get_type (), GtkScale)); -#line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - source = _tmp1_; -#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = event; + source = _tmp0_; #line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = _tmp4_->button; -#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp5_ == ((guint) 1)) { -#line 16316 "EditingTools.c" - GdkEventButton* _tmp6_; - GdkEventType _tmp7_; + _tmp3_ = event->button; #line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = event; + if (_tmp3_ == ((guint) 1)) { +#line 16699 "EditingTools.c" + GdkEventType _tmp4_; #line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = _tmp6_->type; + _tmp4_ = event->type; #line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = _tmp7_ == GDK_BUTTON_PRESS; -#line 16325 "EditingTools.c" + _tmp2_ = _tmp4_ == GDK_BUTTON_PRESS; +#line 16705 "EditingTools.c" } else { #line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = FALSE; -#line 16329 "EditingTools.c" + _tmp2_ = FALSE; +#line 16709 "EditingTools.c" } #line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp3_) { -#line 16333 "EditingTools.c" - GdkEventButton* _tmp8_; - GdkModifierType _tmp9_; - gboolean _tmp10_; -#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = event; -#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = _tmp8_->state; + if (_tmp2_) { +#line 16713 "EditingTools.c" + GdkModifierType _tmp5_; #line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = has_only_key_modifier (_tmp9_, GDK_CONTROL_MASK); + _tmp5_ = event->state; #line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = _tmp10_; -#line 16345 "EditingTools.c" + _tmp1_ = has_only_key_modifier (_tmp5_, GDK_CONTROL_MASK); +#line 16719 "EditingTools.c" } else { #line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = FALSE; -#line 16349 "EditingTools.c" + _tmp1_ = FALSE; +#line 16723 "EditingTools.c" } #line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp2_) { -#line 16353 "EditingTools.c" - GtkScale* _tmp11_; + if (_tmp1_) { +#line 16727 "EditingTools.c" + GtkScale* _tmp6_; #line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = source; + _tmp6_ = source; #line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), (gdouble) 0); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange), (gdouble) 0); #line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = TRUE; #line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (source); #line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 16365 "EditingTools.c" +#line 16739 "EditingTools.c" } #line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; @@ -16369,128 +16743,170 @@ static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustToo _g_object_unref0 (source); #line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 16373 "EditingTools.c" +#line 16747 "EditingTools.c" } -static void _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) { +static void +_editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, + Dimensions* old_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position, + gpointer self) +{ #line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_canvas_resize ((EditingToolsAdjustTool*) self); -#line 16380 "EditingTools.c" +#line 16760 "EditingTools.c" } -static void editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas) { - EditingToolsPhotoCanvas* _tmp0_; +static void +editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTool* self, + EditingToolsPhotoCanvas* canvas) +{ #line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); #line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); #line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = canvas; -#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_connect (_tmp0_, "resized-scaled-pixbuf", (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self); -#line 16394 "EditingTools.c" + g_signal_connect (canvas, "resized-scaled-pixbuf", (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self); +#line 16774 "EditingTools.c" } -static void editing_tools_adjust_tool_unbind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas) { - EditingToolsPhotoCanvas* _tmp0_; - guint _tmp1_; +static void +editing_tools_adjust_tool_unbind_canvas_handlers (EditingToolsAdjustTool* self, + EditingToolsPhotoCanvas* canvas) +{ + guint _tmp0_; #line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); #line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); #line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = canvas; -#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE); + g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp0_, NULL, FALSE); #line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self); -#line 16411 "EditingTools.c" + g_signal_handlers_disconnect_matched (canvas, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self); +#line 16791 "EditingTools.c" } -static void _editing_tools_adjust_tool_on_ok_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_editing_tools_adjust_tool_on_ok_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_ok ((EditingToolsAdjustTool*) self); -#line 16418 "EditingTools.c" +#line 16801 "EditingTools.c" } -static void _editing_tools_adjust_tool_on_reset_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_editing_tools_adjust_tool_on_reset_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 2822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_reset ((EditingToolsAdjustTool*) self); -#line 16425 "EditingTools.c" +#line 16811 "EditingTools.c" } -static void _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) { +static void +_editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed (GtkRange* _sender, + gpointer self) +{ #line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_exposure_adjustment ((EditingToolsAdjustTool*) self); -#line 16432 "EditingTools.c" +#line 16821 "EditingTools.c" } -static void _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) { +static void +_editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed (GtkRange* _sender, + gpointer self) +{ #line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_contrast_adjustment ((EditingToolsAdjustTool*) self); -#line 16439 "EditingTools.c" +#line 16831 "EditingTools.c" } -static void _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) { +static void +_editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed (GtkRange* _sender, + gpointer self) +{ #line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_saturation_adjustment ((EditingToolsAdjustTool*) self); -#line 16446 "EditingTools.c" +#line 16841 "EditingTools.c" } -static void _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) { +static void +_editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed (GtkRange* _sender, + gpointer self) +{ #line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_tint_adjustment ((EditingToolsAdjustTool*) self); -#line 16453 "EditingTools.c" +#line 16851 "EditingTools.c" } -static void _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) { +static void +_editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed (GtkRange* _sender, + gpointer self) +{ #line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_temperature_adjustment ((EditingToolsAdjustTool*) self); -#line 16460 "EditingTools.c" +#line 16861 "EditingTools.c" } -static void _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) { +static void +_editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed (GtkRange* _sender, + gpointer self) +{ #line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_shadows_adjustment ((EditingToolsAdjustTool*) self); -#line 16467 "EditingTools.c" +#line 16871 "EditingTools.c" } -static void _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) { +static void +_editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed (GtkRange* _sender, + gpointer self) +{ #line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_highlights_adjustment ((EditingToolsAdjustTool*) self); -#line 16474 "EditingTools.c" +#line 16881 "EditingTools.c" } -static void _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed (RGBHistogramManipulator* _sender, gpointer self) { +static void +_editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed (RGBHistogramManipulator* _sender, + gpointer self) +{ #line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_histogram_constraint ((EditingToolsAdjustTool*) self); -#line 16481 "EditingTools.c" +#line 16891 "EditingTools.c" } -static gboolean _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { +static gboolean +_editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self) +{ gboolean result; result = editing_tools_adjust_tool_on_hscale_reset ((EditingToolsAdjustTool*) self, _sender, event); #line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 16490 "EditingTools.c" +#line 16904 "EditingTools.c" } -static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTool* self) { +static void +editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTool* self) +{ EditingToolsAdjustToolAdjustToolWindow* _tmp0_; GtkButton* _tmp1_; EditingToolsAdjustToolAdjustToolWindow* _tmp2_; @@ -16637,11 +17053,13 @@ static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTo _tmp35_ = _tmp34_->highlights_slider; #line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self); -#line 16641 "EditingTools.c" +#line 17057 "EditingTools.c" } -static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjustTool* self) { +static void +editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjustTool* self) +{ EditingToolsAdjustToolAdjustToolWindow* _tmp0_; GtkButton* _tmp1_; guint _tmp2_; @@ -16842,11 +17260,13 @@ static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjust g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp53_, NULL, FALSE); #line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp53_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self); -#line 16846 "EditingTools.c" +#line 17264 "EditingTools.c" } -gboolean editing_tools_adjust_tool_enhance (EditingToolsAdjustTool* self) { +gboolean +editing_tools_adjust_tool_enhance (EditingToolsAdjustTool* self) +{ gboolean result = FALSE; EditingToolsAdjustToolAdjustEnhanceCommand* command = NULL; EditingToolsPhotoCanvas* _tmp0_; @@ -16886,75 +17306,74 @@ gboolean editing_tools_adjust_tool_enhance (EditingToolsAdjustTool* self) { _g_object_unref0 (command); #line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 16890 "EditingTools.c" +#line 17310 "EditingTools.c" } -static void editing_tools_adjust_tool_on_photos_altered (EditingToolsAdjustTool* self, GeeMap* map) { - GeeMap* _tmp0_; - EditingToolsPhotoCanvas* _tmp1_; +static void +editing_tools_adjust_tool_on_photos_altered (EditingToolsAdjustTool* self, + GeeMap* map) +{ + EditingToolsPhotoCanvas* _tmp0_; + Photo* _tmp1_; Photo* _tmp2_; - Photo* _tmp3_; - gboolean _tmp4_; - gboolean _tmp5_; + gboolean _tmp3_; PixelTransformationBundle* adjustments = NULL; - EditingToolsPhotoCanvas* _tmp6_; - Photo* _tmp7_; - Photo* _tmp8_; + EditingToolsPhotoCanvas* _tmp4_; + Photo* _tmp5_; + Photo* _tmp6_; + PixelTransformationBundle* _tmp7_; + PixelTransformationBundle* _tmp8_; PixelTransformationBundle* _tmp9_; - PixelTransformationBundle* _tmp10_; - PixelTransformationBundle* _tmp11_; #line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); #line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (GEE_IS_MAP (map)); #line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = map; -#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_); + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = _tmp2_; + _tmp1_ = editing_tools_photo_canvas_get_photo (_tmp0_); #line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); + _tmp2_ = _tmp1_; #line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = !_tmp4_; + _tmp3_ = !gee_map_has_key (map, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject)); #line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp5_) { + if (_tmp3_) { #line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 16930 "EditingTools.c" +#line 17347 "EditingTools.c" } #line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = editing_tools_photo_canvas_get_photo (_tmp6_); + _tmp5_ = editing_tools_photo_canvas_get_photo (_tmp4_); #line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = photo_get_color_adjustments (_tmp8_); + _tmp7_ = photo_get_color_adjustments (_tmp6_); #line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp6_); #line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - adjustments = _tmp10_; + adjustments = _tmp8_; #line 2876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = adjustments; + _tmp9_ = adjustments; #line 2876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_adjust_tool_set_adjustments (self, _tmp11_); + editing_tools_adjust_tool_set_adjustments (self, _tmp9_); #line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_bundle_unref0 (adjustments); -#line 16952 "EditingTools.c" +#line 17369 "EditingTools.c" } -static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* self, PixelTransformationBundle* new_adjustments) { - PixelTransformationBundle* _tmp0_; - EditingToolsPhotoCanvas* _tmp11_; +static void +editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* self, + PixelTransformationBundle* new_adjustments) +{ + EditingToolsPhotoCanvas* _tmp8_; #line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); #line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -16962,594 +17381,504 @@ static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* s #line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_unbind_window_handlers (self); #line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = new_adjustments; -#line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_adjust_tool_update_transformations (self, _tmp0_); -#line 16969 "EditingTools.c" + editing_tools_adjust_tool_update_transformations (self, new_adjustments); +#line 17386 "EditingTools.c" { GeeIterator* _adjustment_it = NULL; - PixelTransformationBundle* _tmp1_; - GeeIterable* _tmp2_; - GeeIterable* _tmp3_; - GeeIterator* _tmp4_; - GeeIterator* _tmp5_; -#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = new_adjustments; + GeeIterable* _tmp0_; + GeeIterable* _tmp1_; + GeeIterator* _tmp2_; + GeeIterator* _tmp3_; #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = pixel_transformation_bundle_get_transformations (_tmp1_); + _tmp0_ = pixel_transformation_bundle_get_transformations (new_adjustments); #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = gee_iterable_iterator (_tmp3_); + _tmp2_ = gee_iterable_iterator (_tmp1_); #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _adjustment_it = _tmp5_; + _adjustment_it = _tmp3_; #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" while (TRUE) { -#line 16993 "EditingTools.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 17407 "EditingTools.c" + GeeIterator* _tmp4_; PixelTransformation* adjustment = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - PixelTransformation* _tmp10_; -#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _adjustment_it; + GeeIterator* _tmp5_; + gpointer _tmp6_; + PixelTransformation* _tmp7_; #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp4_ = _adjustment_it; #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp4_)) { #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17008 "EditingTools.c" +#line 17419 "EditingTools.c" } #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = _adjustment_it; + _tmp5_ = _adjustment_it; #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - adjustment = (PixelTransformation*) _tmp9_; + adjustment = (PixelTransformation*) _tmp6_; #line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = adjustment; + _tmp7_ = adjustment; #line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_adjust_tool_update_slider (self, _tmp10_); + editing_tools_adjust_tool_update_slider (self, _tmp7_); #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (adjustment); -#line 17022 "EditingTools.c" +#line 17433 "EditingTools.c" } #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_adjustment_it); -#line 17026 "EditingTools.c" +#line 17437 "EditingTools.c" } #line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_bind_window_handlers (self); #line 2888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 2888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_repaint (_tmp11_); -#line 17034 "EditingTools.c" + editing_tools_photo_canvas_repaint (_tmp8_); +#line 17445 "EditingTools.c" } -static gpointer _pixel_transformation_ref0 (gpointer self) { +static gpointer +_pixel_transformation_ref0 (gpointer self) +{ #line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self ? pixel_transformation_ref (self) : NULL; -#line 17041 "EditingTools.c" +#line 17454 "EditingTools.c" } -static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* self, PixelTransformation* transformation) { - PixelTransformation* _tmp0_; - PixelTransformationType _tmp1_; +static void +editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* self, + PixelTransformation* transformation) +{ #line 2893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); #line 2893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (IS_PIXEL_TRANSFORMATION (transformation)); #line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = transformation; -#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = pixel_transformation_get_transformation_type (_tmp0_); -#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - switch (_tmp1_) { + switch (pixel_transformation_get_transformation_type (transformation)) { #line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION: -#line 17060 "EditingTools.c" +#line 17470 "EditingTools.c" { ExpansionTransformation* expansion = NULL; - PixelTransformation* _tmp2_; - ExpansionTransformation* _tmp3_; - gboolean _tmp4_; -#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = transformation; + ExpansionTransformation* _tmp0_; + gboolean _tmp1_; #line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = _pixel_transformation_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation)); + _tmp0_ = _pixel_transformation_ref0 (G_TYPE_CHECK_INSTANCE_CAST (transformation, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation)); #line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - expansion = _tmp3_; + expansion = _tmp0_; #line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = self->priv->disable_histogram_refresh; + _tmp1_ = self->priv->disable_histogram_refresh; #line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (!_tmp4_) { -#line 17076 "EditingTools.c" + if (!_tmp1_) { +#line 17483 "EditingTools.c" + EditingToolsAdjustToolAdjustToolWindow* _tmp2_; + RGBHistogramManipulator* _tmp3_; + ExpansionTransformation* _tmp4_; EditingToolsAdjustToolAdjustToolWindow* _tmp5_; RGBHistogramManipulator* _tmp6_; ExpansionTransformation* _tmp7_; - gint _tmp8_; - EditingToolsAdjustToolAdjustToolWindow* _tmp9_; - RGBHistogramManipulator* _tmp10_; - ExpansionTransformation* _tmp11_; - gint _tmp12_; #line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = self->priv->adjust_tool_window; -#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _tmp5_->histogram_manipulator; + _tmp2_ = self->priv->adjust_tool_window; #line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = expansion; + _tmp3_ = _tmp2_->histogram_manipulator; #line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = expansion_transformation_get_black_point (_tmp7_); + _tmp4_ = expansion; #line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - rgb_histogram_manipulator_set_left_nub_position (_tmp6_, _tmp8_); + rgb_histogram_manipulator_set_left_nub_position (_tmp3_, expansion_transformation_get_black_point (_tmp4_)); #line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = self->priv->adjust_tool_window; -#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = _tmp9_->histogram_manipulator; + _tmp5_ = self->priv->adjust_tool_window; #line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = expansion; + _tmp6_ = _tmp5_->histogram_manipulator; #line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = expansion_transformation_get_white_point (_tmp11_); + _tmp7_ = expansion; #line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - rgb_histogram_manipulator_set_right_nub_position (_tmp10_, _tmp12_); -#line 17105 "EditingTools.c" + rgb_histogram_manipulator_set_right_nub_position (_tmp6_, expansion_transformation_get_white_point (_tmp7_)); +#line 17506 "EditingTools.c" } #line 2904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (expansion); #line 2904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17111 "EditingTools.c" +#line 17512 "EditingTools.c" } #line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case PIXEL_TRANSFORMATION_TYPE_SHADOWS: -#line 17115 "EditingTools.c" +#line 17516 "EditingTools.c" { - EditingToolsAdjustToolAdjustToolWindow* _tmp13_; - GtkScale* _tmp14_; - PixelTransformation* _tmp15_; - gfloat _tmp16_; -#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = self->priv->adjust_tool_window; + EditingToolsAdjustToolAdjustToolWindow* _tmp8_; + GtkScale* _tmp9_; #line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = _tmp13_->shadows_slider; + _tmp8_ = self->priv->adjust_tool_window; #line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = transformation; + _tmp9_ = _tmp8_->shadows_slider; #line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = shadow_detail_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation)); -#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_range_get_type (), GtkRange), (gdouble) _tmp16_); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), (gdouble) shadow_detail_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (transformation, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation))); #line 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17133 "EditingTools.c" +#line 17528 "EditingTools.c" } #line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case PIXEL_TRANSFORMATION_TYPE_CONTRAST: -#line 17137 "EditingTools.c" +#line 17532 "EditingTools.c" { - EditingToolsAdjustToolAdjustToolWindow* _tmp17_; - GtkScale* _tmp18_; - PixelTransformation* _tmp19_; - gfloat _tmp20_; -#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = self->priv->adjust_tool_window; + EditingToolsAdjustToolAdjustToolWindow* _tmp10_; + GtkScale* _tmp11_; #line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = _tmp17_->contrast_slider; + _tmp10_ = self->priv->adjust_tool_window; #line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = transformation; + _tmp11_ = _tmp10_->contrast_slider; #line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = contrast_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation)); -#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_range_get_type (), GtkRange), (gdouble) _tmp20_); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), (gdouble) contrast_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (transformation, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation))); #line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17155 "EditingTools.c" +#line 17544 "EditingTools.c" } #line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS: -#line 17159 "EditingTools.c" +#line 17548 "EditingTools.c" { - EditingToolsAdjustToolAdjustToolWindow* _tmp21_; - GtkScale* _tmp22_; - PixelTransformation* _tmp23_; - gfloat _tmp24_; -#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = self->priv->adjust_tool_window; + EditingToolsAdjustToolAdjustToolWindow* _tmp12_; + GtkScale* _tmp13_; #line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = _tmp21_->highlights_slider; + _tmp12_ = self->priv->adjust_tool_window; #line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = transformation; + _tmp13_ = _tmp12_->highlights_slider; #line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = highlight_detail_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation)); -#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_range_get_type (), GtkRange), (gdouble) _tmp24_); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_range_get_type (), GtkRange), (gdouble) highlight_detail_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (transformation, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation))); #line 2919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17177 "EditingTools.c" +#line 17560 "EditingTools.c" } #line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case PIXEL_TRANSFORMATION_TYPE_EXPOSURE: -#line 17181 "EditingTools.c" +#line 17564 "EditingTools.c" { - EditingToolsAdjustToolAdjustToolWindow* _tmp25_; - GtkScale* _tmp26_; - PixelTransformation* _tmp27_; - gfloat _tmp28_; -#line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = self->priv->adjust_tool_window; + EditingToolsAdjustToolAdjustToolWindow* _tmp14_; + GtkScale* _tmp15_; #line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp26_ = _tmp25_->exposure_slider; + _tmp14_ = self->priv->adjust_tool_window; #line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp27_ = transformation; + _tmp15_ = _tmp14_->exposure_slider; #line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_ = exposure_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation)); -#line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_range_get_type (), GtkRange), (gdouble) _tmp28_); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_range_get_type (), GtkRange), (gdouble) exposure_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (transformation, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation))); #line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17199 "EditingTools.c" +#line 17576 "EditingTools.c" } #line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case PIXEL_TRANSFORMATION_TYPE_SATURATION: -#line 17203 "EditingTools.c" +#line 17580 "EditingTools.c" { - EditingToolsAdjustToolAdjustToolWindow* _tmp29_; - GtkScale* _tmp30_; - PixelTransformation* _tmp31_; - gfloat _tmp32_; -#line 2927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp29_ = self->priv->adjust_tool_window; + EditingToolsAdjustToolAdjustToolWindow* _tmp16_; + GtkScale* _tmp17_; #line 2927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp30_ = _tmp29_->saturation_slider; + _tmp16_ = self->priv->adjust_tool_window; #line 2927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp31_ = transformation; + _tmp17_ = _tmp16_->saturation_slider; #line 2927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp32_ = saturation_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation)); -#line 2927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_range_get_type (), GtkRange), (gdouble) _tmp32_); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_range_get_type (), GtkRange), (gdouble) saturation_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (transformation, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation))); #line 2929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17221 "EditingTools.c" +#line 17592 "EditingTools.c" } #line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case PIXEL_TRANSFORMATION_TYPE_TINT: -#line 17225 "EditingTools.c" +#line 17596 "EditingTools.c" { - EditingToolsAdjustToolAdjustToolWindow* _tmp33_; - GtkScale* _tmp34_; - PixelTransformation* _tmp35_; - gfloat _tmp36_; -#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp33_ = self->priv->adjust_tool_window; + EditingToolsAdjustToolAdjustToolWindow* _tmp18_; + GtkScale* _tmp19_; #line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp34_ = _tmp33_->tint_slider; + _tmp18_ = self->priv->adjust_tool_window; #line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp35_ = transformation; + _tmp19_ = _tmp18_->tint_slider; #line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp36_ = tint_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_TINT_TRANSFORMATION, TintTransformation)); -#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_range_get_type (), GtkRange), (gdouble) _tmp36_); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_range_get_type (), GtkRange), (gdouble) tint_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (transformation, TYPE_TINT_TRANSFORMATION, TintTransformation))); #line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17243 "EditingTools.c" +#line 17608 "EditingTools.c" } #line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case PIXEL_TRANSFORMATION_TYPE_TEMPERATURE: -#line 17247 "EditingTools.c" +#line 17612 "EditingTools.c" { - EditingToolsAdjustToolAdjustToolWindow* _tmp37_; - GtkScale* _tmp38_; - PixelTransformation* _tmp39_; - gfloat _tmp40_; -#line 2937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp37_ = self->priv->adjust_tool_window; + EditingToolsAdjustToolAdjustToolWindow* _tmp20_; + GtkScale* _tmp21_; #line 2937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp38_ = _tmp37_->temperature_slider; + _tmp20_ = self->priv->adjust_tool_window; #line 2937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp39_ = transformation; + _tmp21_ = _tmp20_->temperature_slider; #line 2937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp40_ = temperature_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation)); -#line 2937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_range_get_type (), GtkRange), (gdouble) _tmp40_); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_range_get_type (), GtkRange), (gdouble) temperature_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (transformation, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation))); #line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17265 "EditingTools.c" +#line 17624 "EditingTools.c" } default: { - PixelTransformation* _tmp41_; - PixelTransformationType _tmp42_; -#line 2942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp41_ = transformation; #line 2942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp42_ = pixel_transformation_get_transformation_type (_tmp41_); -#line 2942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_error ("EditingTools.vala:2942: Unknown adjustment: %d", (gint) _tmp42_); -#line 17277 "EditingTools.c" + g_error ("EditingTools.vala:2942: Unknown adjustment: %d", (gint) pixel_transformation_get_transformation_type (transformation)); +#line 17630 "EditingTools.c" } } } -static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustTool* self, GdkPixbuf* source) { +static void +editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustTool* self, + GdkPixbuf* source) +{ gint source_width = 0; - GdkPixbuf* _tmp0_; - gint _tmp1_; gint source_height = 0; - GdkPixbuf* _tmp2_; - gint _tmp3_; gint source_num_channels = 0; - GdkPixbuf* _tmp4_; - gint _tmp5_; gint source_rowstride = 0; - GdkPixbuf* _tmp6_; - gint _tmp7_; guchar* source_pixels = NULL; - GdkPixbuf* _tmp8_; - guint8* _tmp9_; + guint8* _tmp0_; gint source_pixels_length1; gint _source_pixels_size_; - gint _tmp10_; - gint _tmp11_; - gfloat* _tmp12_; + gint _tmp1_; + gint _tmp2_; + gfloat* _tmp3_; gint cache_pixel_index = 0; #line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); #line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (GDK_IS_PIXBUF (source)); #line 2947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = source; -#line 2947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = gdk_pixbuf_get_width (_tmp0_); -#line 2947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - source_width = _tmp1_; + source_width = gdk_pixbuf_get_width (source); #line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = source; -#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = gdk_pixbuf_get_height (_tmp2_); -#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - source_height = _tmp3_; -#line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = source; -#line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = gdk_pixbuf_get_n_channels (_tmp4_); + source_height = gdk_pixbuf_get_height (source); #line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - source_num_channels = _tmp5_; + source_num_channels = gdk_pixbuf_get_n_channels (source); #line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = source; -#line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = gdk_pixbuf_get_rowstride (_tmp6_); -#line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - source_rowstride = _tmp7_; + source_rowstride = gdk_pixbuf_get_rowstride (source); #line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = source; + _tmp0_ = gdk_pixbuf_get_pixels (source); #line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = gdk_pixbuf_get_pixels (_tmp8_); -#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - source_pixels = _tmp9_; + source_pixels = _tmp0_; #line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" source_pixels_length1 = -1; #line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _source_pixels_size_ = source_pixels_length1; #line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = source_width; + _tmp1_ = source_width; #line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = source_height; + _tmp2_ = source_height; #line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = g_new0 (gfloat, (3 * _tmp10_) * _tmp11_); + _tmp3_ = g_new0 (gfloat, (3 * _tmp1_) * _tmp2_); #line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->fp_pixel_cache = (g_free (self->priv->fp_pixel_cache), NULL); #line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->fp_pixel_cache = _tmp12_; + self->priv->fp_pixel_cache = _tmp3_; #line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->fp_pixel_cache_length1 = (3 * _tmp10_) * _tmp11_; + self->priv->fp_pixel_cache_length1 = (3 * _tmp1_) * _tmp2_; #line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1; #line 2954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cache_pixel_index = 0; -#line 17359 "EditingTools.c" +#line 17688 "EditingTools.c" { gint j = 0; #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" j = 0; -#line 17364 "EditingTools.c" +#line 17693 "EditingTools.c" { - gboolean _tmp13_ = FALSE; + gboolean _tmp4_ = FALSE; #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = TRUE; + _tmp4_ = TRUE; #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" while (TRUE) { -#line 17371 "EditingTools.c" - gint _tmp15_; - gint _tmp16_; +#line 17700 "EditingTools.c" + gint _tmp6_; + gint _tmp7_; gint row_start_index = 0; - gint _tmp17_; - gint _tmp18_; + gint _tmp8_; + gint _tmp9_; gint row_end_index = 0; - gint _tmp19_; - gint _tmp20_; - gint _tmp21_; + gint _tmp10_; + gint _tmp11_; + gint _tmp12_; #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (!_tmp13_) { -#line 17383 "EditingTools.c" - gint _tmp14_; + if (!_tmp4_) { +#line 17712 "EditingTools.c" + gint _tmp5_; #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = j; + _tmp5_ = j; #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - j = _tmp14_ + 1; -#line 17389 "EditingTools.c" + j = _tmp5_ + 1; +#line 17718 "EditingTools.c" } #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = FALSE; + _tmp4_ = FALSE; #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = j; + _tmp6_ = j; #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = source_height; + _tmp7_ = source_height; #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (!(_tmp15_ < _tmp16_)) { + if (!(_tmp6_ < _tmp7_)) { #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17401 "EditingTools.c" +#line 17730 "EditingTools.c" } #line 2957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = j; + _tmp8_ = j; #line 2957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = source_rowstride; + _tmp9_ = source_rowstride; #line 2957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - row_start_index = _tmp17_ * _tmp18_; + row_start_index = _tmp8_ * _tmp9_; #line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = row_start_index; + _tmp10_ = row_start_index; #line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = source_width; + _tmp11_ = source_width; #line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = source_num_channels; + _tmp12_ = source_num_channels; #line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - row_end_index = _tmp19_ + (_tmp20_ * _tmp21_); -#line 17417 "EditingTools.c" + row_end_index = _tmp10_ + (_tmp11_ * _tmp12_); +#line 17746 "EditingTools.c" { gint i = 0; - gint _tmp22_; + gint _tmp13_; #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = row_start_index; + _tmp13_ = row_start_index; #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - i = _tmp22_; -#line 17425 "EditingTools.c" + i = _tmp13_; +#line 17754 "EditingTools.c" { - gboolean _tmp23_ = FALSE; + gboolean _tmp14_ = FALSE; #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = TRUE; + _tmp14_ = TRUE; #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" while (TRUE) { -#line 17432 "EditingTools.c" - gint _tmp26_; +#line 17761 "EditingTools.c" + gint _tmp17_; + gint _tmp18_; + gfloat* _tmp19_; + gint _tmp19__length1; + gint _tmp20_; + guchar* _tmp21_; + gint _tmp21__length1; + gint _tmp22_; + guchar _tmp23_; + gfloat _tmp24_; + gfloat _tmp25_; + gfloat* _tmp26_; + gint _tmp26__length1; gint _tmp27_; - gfloat* _tmp28_; + guchar* _tmp28_; gint _tmp28__length1; gint _tmp29_; - guchar* _tmp30_; - gint _tmp30__length1; - gint _tmp31_; - guchar _tmp32_; - gfloat _tmp33_; - gfloat _tmp34_; - gfloat* _tmp35_; + guchar _tmp30_; + gfloat _tmp31_; + gfloat _tmp32_; + gfloat* _tmp33_; + gint _tmp33__length1; + gint _tmp34_; + guchar* _tmp35_; gint _tmp35__length1; gint _tmp36_; - guchar* _tmp37_; - gint _tmp37__length1; - gint _tmp38_; - guchar _tmp39_; - gfloat _tmp40_; - gfloat _tmp41_; - gfloat* _tmp42_; - gint _tmp42__length1; - gint _tmp43_; - guchar* _tmp44_; - gint _tmp44__length1; - gint _tmp45_; - guchar _tmp46_; - gfloat _tmp47_; - gfloat _tmp48_; + guchar _tmp37_; + gfloat _tmp38_; + gfloat _tmp39_; #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (!_tmp23_) { -#line 17464 "EditingTools.c" - gint _tmp24_; - gint _tmp25_; + if (!_tmp14_) { +#line 17793 "EditingTools.c" + gint _tmp15_; + gint _tmp16_; #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = i; + _tmp15_ = i; #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = source_num_channels; + _tmp16_ = source_num_channels; #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - i = _tmp24_ + _tmp25_; -#line 17473 "EditingTools.c" + i = _tmp15_ + _tmp16_; +#line 17802 "EditingTools.c" } #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = FALSE; + _tmp14_ = FALSE; #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp26_ = i; + _tmp17_ = i; #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp27_ = row_end_index; + _tmp18_ = row_end_index; #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (!(_tmp26_ < _tmp27_)) { + if (!(_tmp17_ < _tmp18_)) { #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17485 "EditingTools.c" +#line 17814 "EditingTools.c" } #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_ = self->priv->fp_pixel_cache; + _tmp19_ = self->priv->fp_pixel_cache; #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28__length1 = self->priv->fp_pixel_cache_length1; + _tmp19__length1 = self->priv->fp_pixel_cache_length1; #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp29_ = cache_pixel_index; + _tmp20_ = cache_pixel_index; #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cache_pixel_index = _tmp29_ + 1; + cache_pixel_index = _tmp20_ + 1; #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp30_ = source_pixels; + _tmp21_ = source_pixels; #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp30__length1 = source_pixels_length1; + _tmp21__length1 = source_pixels_length1; #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp31_ = i; + _tmp22_ = i; #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp32_ = _tmp30_[_tmp31_]; + _tmp23_ = _tmp21_[_tmp22_]; #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp33_ = rgb_lookup_table[_tmp32_]; + _tmp24_ = rgb_lookup_table[_tmp23_]; #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_[_tmp29_] = _tmp33_; + _tmp19_[_tmp20_] = _tmp24_; #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp34_ = _tmp28_[_tmp29_]; + _tmp25_ = _tmp19_[_tmp20_]; #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp35_ = self->priv->fp_pixel_cache; + _tmp26_ = self->priv->fp_pixel_cache; #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp35__length1 = self->priv->fp_pixel_cache_length1; + _tmp26__length1 = self->priv->fp_pixel_cache_length1; #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp36_ = cache_pixel_index; + _tmp27_ = cache_pixel_index; #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cache_pixel_index = _tmp36_ + 1; + cache_pixel_index = _tmp27_ + 1; #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp37_ = source_pixels; + _tmp28_ = source_pixels; #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp37__length1 = source_pixels_length1; + _tmp28__length1 = source_pixels_length1; #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp38_ = i; + _tmp29_ = i; #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp39_ = _tmp37_[_tmp38_ + 1]; + _tmp30_ = _tmp28_[_tmp29_ + 1]; #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp40_ = rgb_lookup_table[_tmp39_]; + _tmp31_ = rgb_lookup_table[_tmp30_]; #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp35_[_tmp36_] = _tmp40_; + _tmp26_[_tmp27_] = _tmp31_; #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp41_ = _tmp35_[_tmp36_]; + _tmp32_ = _tmp26_[_tmp27_]; #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp42_ = self->priv->fp_pixel_cache; + _tmp33_ = self->priv->fp_pixel_cache; #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp42__length1 = self->priv->fp_pixel_cache_length1; + _tmp33__length1 = self->priv->fp_pixel_cache_length1; #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp43_ = cache_pixel_index; + _tmp34_ = cache_pixel_index; #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cache_pixel_index = _tmp43_ + 1; + cache_pixel_index = _tmp34_ + 1; #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp44_ = source_pixels; + _tmp35_ = source_pixels; #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp44__length1 = source_pixels_length1; + _tmp35__length1 = source_pixels_length1; #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp45_ = i; + _tmp36_ = i; #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp46_ = _tmp44_[_tmp45_ + 2]; + _tmp37_ = _tmp35_[_tmp36_ + 2]; #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp47_ = rgb_lookup_table[_tmp46_]; + _tmp38_ = rgb_lookup_table[_tmp37_]; #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp42_[_tmp43_] = _tmp47_; + _tmp33_[_tmp34_] = _tmp38_; #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp48_ = _tmp42_[_tmp43_]; -#line 17553 "EditingTools.c" + _tmp39_ = _tmp33_[_tmp34_]; +#line 17882 "EditingTools.c" } } } @@ -17559,63 +17888,55 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo } -static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingTool* base, GdkEventKey* event) { +static gboolean +editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingTool* base, + GdkEventKey* event) +{ EditingToolsAdjustTool * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GdkEventKey* _tmp2_; - guint _tmp3_; - const gchar* _tmp4_; - GdkEventKey* _tmp11_; - gboolean _tmp12_; + guint _tmp2_; + const gchar* _tmp3_; #line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool); #line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (event != NULL, FALSE); #line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = event; + _tmp2_ = event->keyval; #line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = _tmp2_->keyval; + _tmp3_ = gdk_keyval_name (_tmp2_); #line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = gdk_keyval_name (_tmp3_); -#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) { + if (g_strcmp0 (_tmp3_, "KP_Enter") == 0) { #line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = TRUE; -#line 17587 "EditingTools.c" +#line 17914 "EditingTools.c" } else { - GdkEventKey* _tmp5_; - guint _tmp6_; - const gchar* _tmp7_; -#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = event; + guint _tmp4_; + const gchar* _tmp5_; #line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _tmp5_->keyval; + _tmp4_ = event->keyval; #line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = gdk_keyval_name (_tmp6_); + _tmp5_ = gdk_keyval_name (_tmp4_); #line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0; -#line 17600 "EditingTools.c" + _tmp1_ = g_strcmp0 (_tmp5_, "Enter") == 0; +#line 17924 "EditingTools.c" } #line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp1_) { #line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = TRUE; -#line 17606 "EditingTools.c" +#line 17930 "EditingTools.c" } else { - GdkEventKey* _tmp8_; - guint _tmp9_; - const gchar* _tmp10_; -#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = event; + guint _tmp6_; + const gchar* _tmp7_; #line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = _tmp8_->keyval; + _tmp6_ = event->keyval; #line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = gdk_keyval_name (_tmp9_); + _tmp7_ = gdk_keyval_name (_tmp6_); #line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0; -#line 17619 "EditingTools.c" + _tmp0_ = g_strcmp0 (_tmp7_, "Return") == 0; +#line 17940 "EditingTools.c" } #line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_) { @@ -17625,92 +17946,88 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT result = TRUE; #line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 17629 "EditingTools.c" +#line 17950 "EditingTools.c" } #line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = event; -#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp11_); -#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - result = _tmp12_; + result = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), event); #line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 17639 "EditingTools.c" +#line 17956 "EditingTools.c" } -static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_construct (GType object_type, GtkWindow* container) { +static EditingToolsAdjustToolAdjustToolWindow* +editing_tools_adjust_tool_adjust_tool_window_construct (GType object_type, + GtkWindow* container) +{ EditingToolsAdjustToolAdjustToolWindow * self = NULL; - GtkWindow* _tmp0_; GtkGrid* slider_organizer = NULL; - GtkGrid* _tmp1_; + GtkGrid* _tmp0_; GtkLabel* exposure_label = NULL; - GtkLabel* _tmp2_; + GtkLabel* _tmp1_; + GtkScale* _tmp2_; GtkScale* _tmp3_; GtkScale* _tmp4_; GtkScale* _tmp5_; - GtkScale* _tmp6_; GtkLabel* contrast_label = NULL; - GtkLabel* _tmp7_; + GtkLabel* _tmp6_; + GtkScale* _tmp7_; GtkScale* _tmp8_; GtkScale* _tmp9_; GtkScale* _tmp10_; - GtkScale* _tmp11_; GtkLabel* saturation_label = NULL; - GtkLabel* _tmp12_; + GtkLabel* _tmp11_; + GtkScale* _tmp12_; GtkScale* _tmp13_; GtkScale* _tmp14_; GtkScale* _tmp15_; - GtkScale* _tmp16_; GtkLabel* tint_label = NULL; - GtkLabel* _tmp17_; + GtkLabel* _tmp16_; + GtkScale* _tmp17_; GtkScale* _tmp18_; GtkScale* _tmp19_; GtkScale* _tmp20_; - GtkScale* _tmp21_; GtkLabel* temperature_label = NULL; - GtkLabel* _tmp22_; + GtkLabel* _tmp21_; + GtkScale* _tmp22_; GtkScale* _tmp23_; GtkScale* _tmp24_; GtkScale* _tmp25_; - GtkScale* _tmp26_; GtkLabel* shadows_label = NULL; - GtkLabel* _tmp27_; + GtkLabel* _tmp26_; + GtkScale* _tmp27_; GtkScale* _tmp28_; GtkScale* _tmp29_; GtkScale* _tmp30_; - GtkScale* _tmp31_; GtkLabel* highlights_label = NULL; - GtkLabel* _tmp32_; + GtkLabel* _tmp31_; + GtkScale* _tmp32_; GtkScale* _tmp33_; GtkScale* _tmp34_; GtkScale* _tmp35_; - GtkScale* _tmp36_; GtkBox* button_layouter = NULL; - GtkBox* _tmp37_; + GtkBox* _tmp36_; + GtkButton* _tmp37_; GtkButton* _tmp38_; GtkButton* _tmp39_; - GtkButton* _tmp40_; + RGBHistogramManipulator* _tmp40_; RGBHistogramManipulator* _tmp41_; RGBHistogramManipulator* _tmp42_; RGBHistogramManipulator* _tmp43_; - RGBHistogramManipulator* _tmp44_; GtkBox* pane_layouter = NULL; - GtkBox* _tmp45_; + GtkBox* _tmp44_; + RGBHistogramManipulator* _tmp45_; RGBHistogramManipulator* _tmp46_; - RGBHistogramManipulator* _tmp47_; #line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (GTK_IS_WINDOW (container), NULL); #line 2221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = container; -#line 2221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self = (EditingToolsAdjustToolAdjustToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_); + self = (EditingToolsAdjustToolAdjustToolWindow*) editing_tools_editing_tool_window_construct (object_type, container); #line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = (GtkGrid*) gtk_grid_new (); + _tmp0_ = (GtkGrid*) gtk_grid_new (); #line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp1_); + g_object_ref_sink (_tmp0_); #line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - slider_organizer = _tmp1_; + slider_organizer = _tmp0_; #line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_grid_set_column_homogeneous (slider_organizer, FALSE); #line 2225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -17722,11 +18039,11 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_ #line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget), 12); #line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Exposure:")); + _tmp1_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Exposure:")); #line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp2_); + g_object_ref_sink (_tmp1_); #line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - exposure_label = _tmp2_; + exposure_label = _tmp1_; #line 2231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); #line 2232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -17734,27 +18051,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_ #line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), 0, 0, 1, 1); #line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = self->exposure_slider; + _tmp2_ = self->exposure_slider; #line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), 1, 0, 1, 1); + gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), 1, 0, 1, 1); #line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = self->exposure_slider; + _tmp3_ = self->exposure_slider; #line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1); #line 2236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = self->exposure_slider; + _tmp4_ = self->exposure_slider; #line 2236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_scale_set_value_pos (_tmp5_, GTK_POS_RIGHT); + gtk_scale_set_value_pos (_tmp4_, GTK_POS_RIGHT); #line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = self->exposure_slider; + _tmp5_ = self->exposure_slider; #line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), 0); + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), 0); #line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Contrast:")); + _tmp6_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Contrast:")); #line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp7_); + g_object_ref_sink (_tmp6_); #line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - contrast_label = _tmp7_; + contrast_label = _tmp6_; #line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); #line 2241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -17762,27 +18079,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_ #line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), 0, 1, 1, 1); #line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = self->contrast_slider; + _tmp7_ = self->contrast_slider; #line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), 1, 1, 1, 1); + gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 1, 1, 1, 1); #line 2244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = self->contrast_slider; + _tmp8_ = self->contrast_slider; #line 2244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1); #line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = self->contrast_slider; + _tmp9_ = self->contrast_slider; #line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_scale_set_value_pos (_tmp10_, GTK_POS_RIGHT); + gtk_scale_set_value_pos (_tmp9_, GTK_POS_RIGHT); #line 2246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = self->contrast_slider; + _tmp10_ = self->contrast_slider; #line 2246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 0); + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 0); #line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Saturation:")); + _tmp11_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Saturation:")); #line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp12_); + g_object_ref_sink (_tmp11_); #line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - saturation_label = _tmp12_; + saturation_label = _tmp11_; #line 2249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); #line 2250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -17790,27 +18107,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_ #line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), 0, 2, 1, 1); #line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = self->saturation_slider; + _tmp12_ = self->saturation_slider; #line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 1, 2, 1, 1); + gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), 1, 2, 1, 1); #line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = self->saturation_slider; + _tmp13_ = self->saturation_slider; #line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1); #line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = self->saturation_slider; + _tmp14_ = self->saturation_slider; #line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_scale_set_value_pos (_tmp15_, GTK_POS_RIGHT); + gtk_scale_set_value_pos (_tmp14_, GTK_POS_RIGHT); #line 2255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = self->saturation_slider; + _tmp15_ = self->saturation_slider; #line 2255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), 0); + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), 0); #line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Tint:")); + _tmp16_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Tint:")); #line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp17_); + g_object_ref_sink (_tmp16_); #line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - tint_label = _tmp17_; + tint_label = _tmp16_; #line 2258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); #line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -17818,27 +18135,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_ #line 2260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), 0, 3, 1, 1); #line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = self->tint_slider; + _tmp17_ = self->tint_slider; #line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), 1, 3, 1, 1); + gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), 1, 3, 1, 1); #line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = self->tint_slider; + _tmp18_ = self->tint_slider; #line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1); #line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = self->tint_slider; + _tmp19_ = self->tint_slider; #line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_scale_set_value_pos (_tmp20_, GTK_POS_RIGHT); + gtk_scale_set_value_pos (_tmp19_, GTK_POS_RIGHT); #line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = self->tint_slider; + _tmp20_ = self->tint_slider; #line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), 0); + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), 0); #line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Temperature:")); + _tmp21_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Temperature:")); #line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp22_); + g_object_ref_sink (_tmp21_); #line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - temperature_label = _tmp22_; + temperature_label = _tmp21_; #line 2268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); #line 2269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -17846,27 +18163,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_ #line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), 0, 4, 1, 1); #line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = self->temperature_slider; + _tmp22_ = self->temperature_slider; #line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), 1, 4, 1, 1); + gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), 1, 4, 1, 1); #line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = self->temperature_slider; + _tmp23_ = self->temperature_slider; #line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1); #line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = self->temperature_slider; + _tmp24_ = self->temperature_slider; #line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_scale_set_value_pos (_tmp25_, GTK_POS_RIGHT); + gtk_scale_set_value_pos (_tmp24_, GTK_POS_RIGHT); #line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp26_ = self->temperature_slider; + _tmp25_ = self->temperature_slider; #line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), 0); + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), 0); #line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp27_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Shadows:")); + _tmp26_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Shadows:")); #line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp27_); + g_object_ref_sink (_tmp26_); #line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - shadows_label = _tmp27_; + shadows_label = _tmp26_; #line 2277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); #line 2278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -17874,27 +18191,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_ #line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), 0, 5, 1, 1); #line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_ = self->shadows_slider; + _tmp27_ = self->shadows_slider; #line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), 1, 5, 1, 1); + gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), 1, 5, 1, 1); #line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp29_ = self->shadows_slider; + _tmp28_ = self->shadows_slider; #line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1); #line 2282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp30_ = self->shadows_slider; + _tmp29_ = self->shadows_slider; #line 2282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_scale_set_value_pos (_tmp30_, GTK_POS_RIGHT); + gtk_scale_set_value_pos (_tmp29_, GTK_POS_RIGHT); #line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp31_ = self->shadows_slider; + _tmp30_ = self->shadows_slider; #line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), 5); + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), 5); #line 2287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp32_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Highlights:")); + _tmp31_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Highlights:")); #line 2287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp32_); + g_object_ref_sink (_tmp31_); #line 2287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - highlights_label = _tmp32_; + highlights_label = _tmp31_; #line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); #line 2289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -17902,75 +18219,75 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_ #line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), 0, 6, 1, 1); #line 2291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp33_ = self->highlights_slider; + _tmp32_ = self->highlights_slider; #line 2291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), 1, 6, 1, 1); + gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), 1, 6, 1, 1); #line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp34_ = self->highlights_slider; + _tmp33_ = self->highlights_slider; #line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1); #line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp35_ = self->highlights_slider; + _tmp34_ = self->highlights_slider; #line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_scale_set_value_pos (_tmp35_, GTK_POS_RIGHT); + gtk_scale_set_value_pos (_tmp34_, GTK_POS_RIGHT); #line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp36_ = self->highlights_slider; + _tmp35_ = self->highlights_slider; #line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget), 0); + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), 0); #line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp37_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); + _tmp36_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); #line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp37_); + g_object_ref_sink (_tmp36_); #line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - button_layouter = _tmp37_; + button_layouter = _tmp36_; #line 2297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_box_set_homogeneous (button_layouter, TRUE); #line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp38_ = self->cancel_button; + _tmp37_ = self->cancel_button; #line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1); + gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1); #line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp39_ = self->reset_button; + _tmp38_ = self->reset_button; #line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1); + gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1); #line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp40_ = self->ok_button; + _tmp39_ = self->ok_button; #line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1); + gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1); #line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp41_ = self->histogram_manipulator; + _tmp40_ = self->histogram_manipulator; #line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), 12); + gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), 12); #line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp42_ = self->histogram_manipulator; + _tmp41_ = self->histogram_manipulator; #line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), 12); + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), 12); #line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp43_ = self->histogram_manipulator; + _tmp42_ = self->histogram_manipulator; #line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), 12); + gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), 12); #line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp44_ = self->histogram_manipulator; + _tmp43_ = self->histogram_manipulator; #line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), 8); + gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), 8); #line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp45_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); + _tmp44_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); #line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp45_); + g_object_ref_sink (_tmp44_); #line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - pane_layouter = _tmp45_; + pane_layouter = _tmp44_; #line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp46_ = self->histogram_manipulator; + _tmp45_ = self->histogram_manipulator; #line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget)); #line 2309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget)); #line 2310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (button_layouter, gtk_widget_get_type (), GtkWidget)); #line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp47_ = self->histogram_manipulator; + _tmp46_ = self->histogram_manipulator; #line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_box_set_child_packing (pane_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget), FALSE, TRUE, (guint) 0, GTK_PACK_START); + gtk_box_set_child_packing (pane_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE, TRUE, (guint) 0, GTK_PACK_START); #line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_widget_get_type (), GtkWidget)); #line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -17995,27 +18312,33 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_ _g_object_unref0 (slider_organizer); #line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 17999 "EditingTools.c" +#line 18316 "EditingTools.c" } -static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_new (GtkWindow* container) { +static EditingToolsAdjustToolAdjustToolWindow* +editing_tools_adjust_tool_adjust_tool_window_new (GtkWindow* container) +{ #line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return editing_tools_adjust_tool_adjust_tool_window_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_WINDOW, container); -#line 18006 "EditingTools.c" +#line 18325 "EditingTools.c" } -static void editing_tools_adjust_tool_adjust_tool_window_class_init (EditingToolsAdjustToolAdjustToolWindowClass * klass) { +static void +editing_tools_adjust_tool_adjust_tool_window_class_init (EditingToolsAdjustToolAdjustToolWindowClass * klass) +{ #line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_adjust_tool_window_parent_class = g_type_class_peek_parent (klass); #line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_tool_window_finalize; -#line 18015 "EditingTools.c" +#line 18336 "EditingTools.c" } -static void editing_tools_adjust_tool_adjust_tool_window_instance_init (EditingToolsAdjustToolAdjustToolWindow * self) { +static void +editing_tools_adjust_tool_adjust_tool_window_instance_init (EditingToolsAdjustToolAdjustToolWindow * self) +{ GtkScale* _tmp0_; GtkScale* _tmp1_; GtkScale* _tmp2_; @@ -18093,11 +18416,13 @@ static void editing_tools_adjust_tool_adjust_tool_window_instance_init (EditingT g_object_ref_sink (_tmp10_); #line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->histogram_manipulator = _tmp10_; -#line 18097 "EditingTools.c" +#line 18420 "EditingTools.c" } -static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject * obj) { +static void +editing_tools_adjust_tool_adjust_tool_window_finalize (GObject * obj) +{ EditingToolsAdjustToolAdjustToolWindow * self; #line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_WINDOW, EditingToolsAdjustToolAdjustToolWindow); @@ -18125,11 +18450,13 @@ static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject * obj _g_object_unref0 (self->histogram_manipulator); #line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_tool_window_parent_class)->finalize (obj); -#line 18129 "EditingTools.c" +#line 18454 "EditingTools.c" } -static GType editing_tools_adjust_tool_adjust_tool_window_get_type (void) { +static GType +editing_tools_adjust_tool_adjust_tool_window_get_type (void) +{ static volatile gsize editing_tools_adjust_tool_adjust_tool_window_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_adjust_tool_adjust_tool_window_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditingToolsAdjustToolAdjustToolWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_adjust_tool_adjust_tool_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsAdjustToolAdjustToolWindow), 0, (GInstanceInitFunc) editing_tools_adjust_tool_adjust_tool_window_instance_init, NULL }; @@ -18141,19 +18468,23 @@ static GType editing_tools_adjust_tool_adjust_tool_window_get_type (void) { } -static void _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) { +static void +_editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, + gpointer self) +{ #line 2329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated ((EditingToolsAdjustToolAdjustToolCommand*) self); -#line 18148 "EditingTools.c" +#line 18478 "EditingTools.c" } -static EditingToolsAdjustToolAdjustToolCommand* editing_tools_adjust_tool_adjust_tool_command_construct (GType object_type, EditingToolsAdjustTool* owner, const gchar* name, const gchar* explanation) { +static EditingToolsAdjustToolAdjustToolCommand* +editing_tools_adjust_tool_adjust_tool_command_construct (GType object_type, + EditingToolsAdjustTool* owner, + const gchar* name, + const gchar* explanation) +{ EditingToolsAdjustToolAdjustToolCommand * self = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - EditingToolsAdjustTool* _tmp2_; - EditingToolsAdjustTool* _tmp3_; #line 2320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL); #line 2320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -18161,26 +18492,20 @@ static EditingToolsAdjustToolAdjustToolCommand* editing_tools_adjust_tool_adjust #line 2320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (explanation != NULL, NULL); #line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = name; -#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = explanation; -#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self = (EditingToolsAdjustToolAdjustToolCommand*) command_construct (object_type, _tmp0_, _tmp1_); + self = (EditingToolsAdjustToolAdjustToolCommand*) command_construct (object_type, name, explanation); #line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = owner; -#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->owner = _tmp2_; -#line 2324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = owner; + self->owner = owner; #line 2324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "deactivated", (GCallback) _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (owner, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "deactivated", (GCallback) _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated, self, 0); #line 2320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 18180 "EditingTools.c" +#line 18503 "EditingTools.c" } -static void editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated (EditingToolsAdjustToolAdjustToolCommand* self) { +static void +editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated (EditingToolsAdjustToolAdjustToolCommand* self) +{ CommandManager* _tmp0_; CommandManager* _tmp1_; #line 2332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -18193,24 +18518,30 @@ static void editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated ( command_manager_reset (_tmp1_); #line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _command_manager_unref0 (_tmp1_); -#line 18197 "EditingTools.c" +#line 18522 "EditingTools.c" } -static void editing_tools_adjust_tool_adjust_tool_command_class_init (EditingToolsAdjustToolAdjustToolCommandClass * klass) { +static void +editing_tools_adjust_tool_adjust_tool_command_class_init (EditingToolsAdjustToolAdjustToolCommandClass * klass) +{ #line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_adjust_tool_command_parent_class = g_type_class_peek_parent (klass); #line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_tool_command_finalize; -#line 18206 "EditingTools.c" +#line 18533 "EditingTools.c" } -static void editing_tools_adjust_tool_adjust_tool_command_instance_init (EditingToolsAdjustToolAdjustToolCommand * self) { +static void +editing_tools_adjust_tool_adjust_tool_command_instance_init (EditingToolsAdjustToolAdjustToolCommand * self) +{ } -static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject * obj) { +static void +editing_tools_adjust_tool_adjust_tool_command_finalize (GObject * obj) +{ EditingToolsAdjustToolAdjustToolCommand * self; EditingToolsAdjustTool* _tmp0_; #line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -18219,7 +18550,7 @@ static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject * ob _tmp0_ = self->owner; #line 2328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ != NULL) { -#line 18223 "EditingTools.c" +#line 18554 "EditingTools.c" EditingToolsAdjustTool* _tmp1_; guint _tmp2_; #line 2329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -18228,15 +18559,17 @@ static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject * ob g_signal_parse_name ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp2_, NULL, FALSE); #line 2329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated, self); -#line 18232 "EditingTools.c" +#line 18563 "EditingTools.c" } #line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_tool_command_parent_class)->finalize (obj); -#line 18236 "EditingTools.c" +#line 18567 "EditingTools.c" } -static GType editing_tools_adjust_tool_adjust_tool_command_get_type (void) { +static GType +editing_tools_adjust_tool_adjust_tool_command_get_type (void) +{ static volatile gsize editing_tools_adjust_tool_adjust_tool_command_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_adjust_tool_adjust_tool_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditingToolsAdjustToolAdjustToolCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_adjust_tool_adjust_tool_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsAdjustToolAdjustToolCommand), 0, (GInstanceInitFunc) editing_tools_adjust_tool_adjust_tool_command_instance_init, NULL }; @@ -18248,53 +18581,56 @@ static GType editing_tools_adjust_tool_adjust_tool_command_get_type (void) { } -static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_construct (GType object_type, EditingToolsAdjustTool* owner, PixelTransformationBundle* current) { +static EditingToolsAdjustToolAdjustResetCommand* +editing_tools_adjust_tool_adjust_reset_command_construct (GType object_type, + EditingToolsAdjustTool* owner, + PixelTransformationBundle* current) +{ EditingToolsAdjustToolAdjustResetCommand * self = NULL; - EditingToolsAdjustTool* _tmp0_; + PixelTransformationBundle* _tmp0_; PixelTransformationBundle* _tmp1_; PixelTransformationBundle* _tmp2_; - PixelTransformationBundle* _tmp3_; - PixelTransformationBundle* _tmp4_; #line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL); #line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (current), NULL); #line 2344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = owner; -#line 2344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self = (EditingToolsAdjustToolAdjustResetCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, _ ("Reset Colors"), _ ("Reset all color adjustments to original")); + self = (EditingToolsAdjustToolAdjustResetCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, owner, _ ("Reset Colors"), _ ("Reset all color adjustments to original")); #line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = current; -#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = pixel_transformation_bundle_copy (_tmp1_); + _tmp0_ = pixel_transformation_bundle_copy (current); #line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_bundle_unref0 (self->priv->original); #line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->original = _tmp2_; + self->priv->original = _tmp0_; #line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = pixel_transformation_bundle_new (); + _tmp1_ = pixel_transformation_bundle_new (); #line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_bundle_unref0 (self->priv->reset); #line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->reset = _tmp3_; + self->priv->reset = _tmp1_; #line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = self->priv->reset; + _tmp2_ = self->priv->reset; #line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - pixel_transformation_bundle_set_to_identity (_tmp4_); + pixel_transformation_bundle_set_to_identity (_tmp2_); #line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 18287 "EditingTools.c" +#line 18618 "EditingTools.c" } -static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_new (EditingToolsAdjustTool* owner, PixelTransformationBundle* current) { +static EditingToolsAdjustToolAdjustResetCommand* +editing_tools_adjust_tool_adjust_reset_command_new (EditingToolsAdjustTool* owner, + PixelTransformationBundle* current) +{ #line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return editing_tools_adjust_tool_adjust_reset_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, owner, current); -#line 18294 "EditingTools.c" +#line 18628 "EditingTools.c" } -static void editing_tools_adjust_tool_adjust_reset_command_real_execute (Command* base) { +static void +editing_tools_adjust_tool_adjust_reset_command_real_execute (Command* base) +{ EditingToolsAdjustToolAdjustResetCommand * self; EditingToolsAdjustTool* _tmp0_; PixelTransformationBundle* _tmp1_; @@ -18306,11 +18642,13 @@ static void editing_tools_adjust_tool_adjust_reset_command_real_execute (Command _tmp1_ = self->priv->reset; #line 2352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_); -#line 18310 "EditingTools.c" +#line 18646 "EditingTools.c" } -static void editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* base) { +static void +editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* base) +{ EditingToolsAdjustToolAdjustResetCommand * self; EditingToolsAdjustTool* _tmp0_; PixelTransformationBundle* _tmp1_; @@ -18322,57 +18660,57 @@ static void editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* b _tmp1_ = self->priv->original; #line 2356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_); -#line 18326 "EditingTools.c" +#line 18664 "EditingTools.c" } -static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Command* base, Command* command) { +static gboolean +editing_tools_adjust_tool_adjust_reset_command_real_compress (Command* base, + Command* command) +{ EditingToolsAdjustToolAdjustResetCommand * self; gboolean result = FALSE; EditingToolsAdjustToolAdjustResetCommand* reset_command = NULL; - Command* _tmp0_; + EditingToolsAdjustToolAdjustResetCommand* _tmp0_; EditingToolsAdjustToolAdjustResetCommand* _tmp1_; EditingToolsAdjustToolAdjustResetCommand* _tmp2_; - EditingToolsAdjustToolAdjustResetCommand* _tmp3_; + EditingToolsAdjustTool* _tmp3_; EditingToolsAdjustTool* _tmp4_; - EditingToolsAdjustTool* _tmp5_; #line 2359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand); #line 2359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_COMMAND (command), FALSE); #line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = command; -#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND) ? ((EditingToolsAdjustToolAdjustResetCommand*) _tmp0_) : NULL); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (command, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND) ? ((EditingToolsAdjustToolAdjustResetCommand*) command) : NULL); #line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - reset_command = _tmp1_; + reset_command = _tmp0_; #line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = reset_command; + _tmp1_ = reset_command; #line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; #line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (reset_command); #line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 18360 "EditingTools.c" +#line 18698 "EditingTools.c" } #line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = reset_command; + _tmp2_ = reset_command; #line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner; + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner; #line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner; + _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner; #line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp4_ != _tmp5_) { + if (_tmp3_ != _tmp4_) { #line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; #line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (reset_command); #line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 18376 "EditingTools.c" +#line 18714 "EditingTools.c" } #line 2368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = TRUE; @@ -18380,11 +18718,13 @@ static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Co _g_object_unref0 (reset_command); #line 2368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 18384 "EditingTools.c" +#line 18722 "EditingTools.c" } -static void editing_tools_adjust_tool_adjust_reset_command_class_init (EditingToolsAdjustToolAdjustResetCommandClass * klass) { +static void +editing_tools_adjust_tool_adjust_reset_command_class_init (EditingToolsAdjustToolAdjustResetCommandClass * klass) +{ #line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_adjust_reset_command_parent_class = g_type_class_peek_parent (klass); #line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -18397,18 +18737,22 @@ static void editing_tools_adjust_tool_adjust_reset_command_class_init (EditingTo ((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) editing_tools_adjust_tool_adjust_reset_command_real_compress; #line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_reset_command_finalize; -#line 18401 "EditingTools.c" +#line 18741 "EditingTools.c" } -static void editing_tools_adjust_tool_adjust_reset_command_instance_init (EditingToolsAdjustToolAdjustResetCommand * self) { +static void +editing_tools_adjust_tool_adjust_reset_command_instance_init (EditingToolsAdjustToolAdjustResetCommand * self) +{ #line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv = EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_GET_PRIVATE (self); -#line 18408 "EditingTools.c" +#line 18750 "EditingTools.c" } -static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject * obj) { +static void +editing_tools_adjust_tool_adjust_reset_command_finalize (GObject * obj) +{ EditingToolsAdjustToolAdjustResetCommand * self; #line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand); @@ -18418,11 +18762,13 @@ static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject * o _pixel_transformation_bundle_unref0 (self->priv->reset); #line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_reset_command_parent_class)->finalize (obj); -#line 18422 "EditingTools.c" +#line 18766 "EditingTools.c" } -static GType editing_tools_adjust_tool_adjust_reset_command_get_type (void) { +static GType +editing_tools_adjust_tool_adjust_reset_command_get_type (void) +{ static volatile gsize editing_tools_adjust_tool_adjust_reset_command_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_adjust_tool_adjust_reset_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditingToolsAdjustToolAdjustResetCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_adjust_tool_adjust_reset_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsAdjustToolAdjustResetCommand), 0, (GInstanceInitFunc) editing_tools_adjust_tool_adjust_reset_command_instance_init, NULL }; @@ -18434,20 +18780,17 @@ static GType editing_tools_adjust_tool_adjust_reset_command_get_type (void) { } -static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_construct (GType object_type, EditingToolsAdjustTool* owner, PixelTransformation* old_transformation, PixelTransformation* new_transformation, const gchar* name) { +static EditingToolsAdjustToolSliderAdjustmentCommand* +editing_tools_adjust_tool_slider_adjustment_command_construct (GType object_type, + EditingToolsAdjustTool* owner, + PixelTransformation* old_transformation, + PixelTransformation* new_transformation, + const gchar* name) +{ EditingToolsAdjustToolSliderAdjustmentCommand * self = NULL; - EditingToolsAdjustTool* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - PixelTransformation* _tmp3_; - PixelTransformation* _tmp4_; - PixelTransformation* _tmp5_; - PixelTransformation* _tmp6_; - PixelTransformation* _tmp7_; - PixelTransformationType _tmp8_; - PixelTransformation* _tmp9_; - PixelTransformationType _tmp10_; - PixelTransformationType _tmp11_; + PixelTransformation* _tmp0_; + PixelTransformation* _tmp1_; + PixelTransformationType _tmp2_; #line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL); #line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -18457,57 +18800,46 @@ static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_ #line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (name != NULL, NULL); #line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = owner; -#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = name; -#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = name; -#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self = (EditingToolsAdjustToolSliderAdjustmentCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_); + self = (EditingToolsAdjustToolSliderAdjustmentCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, owner, name, name); #line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = old_transformation; -#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = _pixel_transformation_ref0 (_tmp3_); + _tmp0_ = _pixel_transformation_ref0 (old_transformation); #line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (self->priv->old_transformation); #line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->old_transformation = _tmp4_; + self->priv->old_transformation = _tmp0_; #line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = new_transformation; -#line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = _pixel_transformation_ref0 (_tmp5_); + _tmp1_ = _pixel_transformation_ref0 (new_transformation); #line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (self->priv->new_transformation); #line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->new_transformation = _tmp6_; -#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = old_transformation; + self->priv->new_transformation = _tmp1_; #line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = pixel_transformation_get_transformation_type (_tmp7_); -#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->transformation_type = _tmp8_; -#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = new_transformation; + self->priv->transformation_type = pixel_transformation_get_transformation_type (old_transformation); #line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = pixel_transformation_get_transformation_type (_tmp9_); + _tmp2_ = self->priv->transformation_type; #line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = self->priv->transformation_type; -#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _vala_assert (_tmp10_ == _tmp11_, "new_transformation.get_transformation_type() == transformation_type"); + _vala_assert (pixel_transformation_get_transformation_type (new_transformation) == _tmp2_, "new_transformation.get_transformation_type() == transformation_type"); #line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 18500 "EditingTools.c" +#line 18825 "EditingTools.c" } -static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_new (EditingToolsAdjustTool* owner, PixelTransformation* old_transformation, PixelTransformation* new_transformation, const gchar* name) { +static EditingToolsAdjustToolSliderAdjustmentCommand* +editing_tools_adjust_tool_slider_adjustment_command_new (EditingToolsAdjustTool* owner, + PixelTransformation* old_transformation, + PixelTransformation* new_transformation, + const gchar* name) +{ #line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return editing_tools_adjust_tool_slider_adjustment_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, owner, old_transformation, new_transformation, name); -#line 18507 "EditingTools.c" +#line 18837 "EditingTools.c" } -static void editing_tools_adjust_tool_slider_adjustment_command_real_execute (Command* base) { +static void +editing_tools_adjust_tool_slider_adjustment_command_real_execute (Command* base) +{ EditingToolsAdjustToolSliderAdjustmentCommand * self; EditingToolsAdjustTool* _tmp0_; PixelTransformation* _tmp1_; @@ -18527,11 +18859,13 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_execute (Co _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 2390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_repaint (_tmp3_); -#line 18531 "EditingTools.c" +#line 18863 "EditingTools.c" } -static void editing_tools_adjust_tool_slider_adjustment_command_real_undo (Command* base) { +static void +editing_tools_adjust_tool_slider_adjustment_command_real_undo (Command* base) +{ EditingToolsAdjustToolSliderAdjustmentCommand * self; EditingToolsAdjustTool* _tmp0_; PixelTransformation* _tmp1_; @@ -18569,11 +18903,13 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_undo (Comma _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_repaint (_tmp7_); -#line 18573 "EditingTools.c" +#line 18907 "EditingTools.c" } -static void editing_tools_adjust_tool_slider_adjustment_command_real_redo (Command* base) { +static void +editing_tools_adjust_tool_slider_adjustment_command_real_redo (Command* base) +{ EditingToolsAdjustToolSliderAdjustmentCommand * self; EditingToolsAdjustTool* _tmp0_; PixelTransformation* _tmp1_; @@ -18611,106 +18947,108 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_redo (Comma _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_repaint (_tmp7_); -#line 18615 "EditingTools.c" +#line 18951 "EditingTools.c" } -static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compress (Command* base, Command* command) { +static gboolean +editing_tools_adjust_tool_slider_adjustment_command_real_compress (Command* base, + Command* command) +{ EditingToolsAdjustToolSliderAdjustmentCommand * self; gboolean result = FALSE; EditingToolsAdjustToolSliderAdjustmentCommand* slider_adjustment = NULL; - Command* _tmp0_; + EditingToolsAdjustToolSliderAdjustmentCommand* _tmp0_; EditingToolsAdjustToolSliderAdjustmentCommand* _tmp1_; EditingToolsAdjustToolSliderAdjustmentCommand* _tmp2_; - EditingToolsAdjustToolSliderAdjustmentCommand* _tmp3_; + EditingToolsAdjustTool* _tmp3_; EditingToolsAdjustTool* _tmp4_; - EditingToolsAdjustTool* _tmp5_; - EditingToolsAdjustToolSliderAdjustmentCommand* _tmp6_; + EditingToolsAdjustToolSliderAdjustmentCommand* _tmp5_; + PixelTransformationType _tmp6_; PixelTransformationType _tmp7_; - PixelTransformationType _tmp8_; + EditingToolsAdjustToolSliderAdjustmentCommand* _tmp8_; EditingToolsAdjustToolSliderAdjustmentCommand* _tmp9_; - EditingToolsAdjustToolSliderAdjustmentCommand* _tmp10_; + PixelTransformation* _tmp10_; PixelTransformation* _tmp11_; - PixelTransformation* _tmp12_; #line 2413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand); #line 2413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_COMMAND (command), FALSE); #line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = command; -#line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND) ? ((EditingToolsAdjustToolSliderAdjustmentCommand*) _tmp0_) : NULL); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (command, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND) ? ((EditingToolsAdjustToolSliderAdjustmentCommand*) command) : NULL); #line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - slider_adjustment = _tmp1_; + slider_adjustment = _tmp0_; #line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = slider_adjustment; + _tmp1_ = slider_adjustment; #line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; #line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (slider_adjustment); #line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 18656 "EditingTools.c" +#line 18992 "EditingTools.c" } #line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = slider_adjustment; + _tmp2_ = slider_adjustment; #line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner; + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner; #line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner; + _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner; #line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp4_ != _tmp5_) { + if (_tmp3_ != _tmp4_) { #line 2420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; #line 2420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (slider_adjustment); #line 2420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 18672 "EditingTools.c" +#line 19008 "EditingTools.c" } #line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = slider_adjustment; + _tmp5_ = slider_adjustment; #line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = _tmp6_->priv->transformation_type; + _tmp6_ = _tmp5_->priv->transformation_type; #line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = self->priv->transformation_type; + _tmp7_ = self->priv->transformation_type; #line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp7_ != _tmp8_) { + if (_tmp6_ != _tmp7_) { #line 2424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; #line 2424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (slider_adjustment); #line 2424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 18688 "EditingTools.c" +#line 19024 "EditingTools.c" } #line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = slider_adjustment; + _tmp8_ = slider_adjustment; #line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - command_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command)); + command_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_COMMAND, Command)); #line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = slider_adjustment; + _tmp9_ = slider_adjustment; #line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = _tmp10_->priv->new_transformation; + _tmp10_ = _tmp9_->priv->new_transformation; #line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = _pixel_transformation_ref0 (_tmp11_); + _tmp11_ = _pixel_transformation_ref0 (_tmp10_); #line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (self->priv->new_transformation); #line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->new_transformation = _tmp12_; + self->priv->new_transformation = _tmp11_; #line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = TRUE; #line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (slider_adjustment); #line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 18710 "EditingTools.c" +#line 19046 "EditingTools.c" } -static void editing_tools_adjust_tool_slider_adjustment_command_class_init (EditingToolsAdjustToolSliderAdjustmentCommandClass * klass) { +static void +editing_tools_adjust_tool_slider_adjustment_command_class_init (EditingToolsAdjustToolSliderAdjustmentCommandClass * klass) +{ #line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_slider_adjustment_command_parent_class = g_type_class_peek_parent (klass); #line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -18725,18 +19063,22 @@ static void editing_tools_adjust_tool_slider_adjustment_command_class_init (Edit ((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) editing_tools_adjust_tool_slider_adjustment_command_real_compress; #line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_slider_adjustment_command_finalize; -#line 18729 "EditingTools.c" +#line 19067 "EditingTools.c" } -static void editing_tools_adjust_tool_slider_adjustment_command_instance_init (EditingToolsAdjustToolSliderAdjustmentCommand * self) { +static void +editing_tools_adjust_tool_slider_adjustment_command_instance_init (EditingToolsAdjustToolSliderAdjustmentCommand * self) +{ #line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv = EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_GET_PRIVATE (self); -#line 18736 "EditingTools.c" +#line 19076 "EditingTools.c" } -static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObject * obj) { +static void +editing_tools_adjust_tool_slider_adjustment_command_finalize (GObject * obj) +{ EditingToolsAdjustToolSliderAdjustmentCommand * self; #line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand); @@ -18746,11 +19088,13 @@ static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObjec _pixel_transformation_unref0 (self->priv->old_transformation); #line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (editing_tools_adjust_tool_slider_adjustment_command_parent_class)->finalize (obj); -#line 18750 "EditingTools.c" +#line 19092 "EditingTools.c" } -static GType editing_tools_adjust_tool_slider_adjustment_command_get_type (void) { +static GType +editing_tools_adjust_tool_slider_adjustment_command_get_type (void) +{ static volatile gsize editing_tools_adjust_tool_slider_adjustment_command_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_adjust_tool_slider_adjustment_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditingToolsAdjustToolSliderAdjustmentCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_adjust_tool_slider_adjustment_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsAdjustToolSliderAdjustmentCommand), 0, (GInstanceInitFunc) editing_tools_adjust_tool_slider_adjustment_command_instance_init, NULL }; @@ -18762,51 +19106,51 @@ static GType editing_tools_adjust_tool_slider_adjustment_command_get_type (void) } -static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_construct (GType object_type, EditingToolsAdjustTool* owner, Photo* photo) { +static EditingToolsAdjustToolAdjustEnhanceCommand* +editing_tools_adjust_tool_adjust_enhance_command_construct (GType object_type, + EditingToolsAdjustTool* owner, + Photo* photo) +{ EditingToolsAdjustToolAdjustEnhanceCommand * self = NULL; - EditingToolsAdjustTool* _tmp0_; - Photo* _tmp1_; - Photo* _tmp2_; - Photo* _tmp3_; - PixelTransformationBundle* _tmp4_; + Photo* _tmp0_; + PixelTransformationBundle* _tmp1_; #line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL); #line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); #line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = owner; -#line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self = (EditingToolsAdjustToolAdjustEnhanceCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP); + self = (EditingToolsAdjustToolAdjustEnhanceCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, owner, RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP); #line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = photo; -#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp0_ = _g_object_ref0 (photo); #line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->photo); #line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->photo = _tmp2_; + self->priv->photo = _tmp0_; #line 2445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = photo; -#line 2445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = photo_get_color_adjustments (_tmp3_); + _tmp1_ = photo_get_color_adjustments (photo); #line 2445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_bundle_unref0 (self->priv->original); #line 2445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->original = _tmp4_; + self->priv->original = _tmp1_; #line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 18799 "EditingTools.c" +#line 19138 "EditingTools.c" } -static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_new (EditingToolsAdjustTool* owner, Photo* photo) { +static EditingToolsAdjustToolAdjustEnhanceCommand* +editing_tools_adjust_tool_adjust_enhance_command_new (EditingToolsAdjustTool* owner, + Photo* photo) +{ #line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return editing_tools_adjust_tool_adjust_enhance_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, owner, photo); -#line 18806 "EditingTools.c" +#line 19148 "EditingTools.c" } -static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Command* base) { +static void +editing_tools_adjust_tool_adjust_enhance_command_real_execute (Command* base) +{ EditingToolsAdjustToolAdjustEnhanceCommand * self; PixelTransformationBundle* _tmp0_; EditingToolsAdjustTool* _tmp3_; @@ -18817,7 +19161,7 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Comma _tmp0_ = self->priv->enhanced; #line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ == NULL) { -#line 18821 "EditingTools.c" +#line 19165 "EditingTools.c" Photo* _tmp1_; PixelTransformationBundle* _tmp2_; #line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -18828,7 +19172,7 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Comma _pixel_transformation_bundle_unref0 (self->priv->enhanced); #line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->enhanced = _tmp2_; -#line 18832 "EditingTools.c" +#line 19176 "EditingTools.c" } #line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner; @@ -18836,11 +19180,13 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Comma _tmp4_ = self->priv->enhanced; #line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_set_adjustments (_tmp3_, _tmp4_); -#line 18840 "EditingTools.c" +#line 19184 "EditingTools.c" } -static void editing_tools_adjust_tool_adjust_enhance_command_real_undo (Command* base) { +static void +editing_tools_adjust_tool_adjust_enhance_command_real_undo (Command* base) +{ EditingToolsAdjustToolAdjustEnhanceCommand * self; EditingToolsAdjustTool* _tmp0_; PixelTransformationBundle* _tmp1_; @@ -18852,91 +19198,85 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_undo (Command* _tmp1_ = self->priv->original; #line 2456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_); -#line 18856 "EditingTools.c" +#line 19202 "EditingTools.c" } -static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (Command* base, Command* command) { +static gboolean +editing_tools_adjust_tool_adjust_enhance_command_real_compress (Command* base, + Command* command) +{ EditingToolsAdjustToolAdjustEnhanceCommand * self; gboolean result = FALSE; EnhanceSingleCommand* enhance_single = NULL; - Command* _tmp0_; + EnhanceSingleCommand* _tmp0_; EnhanceSingleCommand* _tmp1_; - EnhanceSingleCommand* _tmp2_; EditingToolsAdjustToolAdjustEnhanceCommand* enhance_command = NULL; - Command* _tmp12_; - EditingToolsAdjustToolAdjustEnhanceCommand* _tmp13_; - EditingToolsAdjustToolAdjustEnhanceCommand* _tmp14_; - EditingToolsAdjustToolAdjustEnhanceCommand* _tmp15_; - EditingToolsAdjustTool* _tmp16_; - EditingToolsAdjustTool* _tmp17_; + EditingToolsAdjustToolAdjustEnhanceCommand* _tmp10_; + EditingToolsAdjustToolAdjustEnhanceCommand* _tmp11_; + EditingToolsAdjustToolAdjustEnhanceCommand* _tmp12_; + EditingToolsAdjustTool* _tmp13_; + EditingToolsAdjustTool* _tmp14_; #line 2459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand); #line 2459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_COMMAND (command), FALSE); #line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp0_ = command; -#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_ENHANCE_SINGLE_COMMAND) ? ((EnhanceSingleCommand*) _tmp0_) : NULL); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (command, TYPE_ENHANCE_SINGLE_COMMAND) ? ((EnhanceSingleCommand*) command) : NULL); #line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - enhance_single = _tmp1_; + enhance_single = _tmp0_; #line 2462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp2_ = enhance_single; + _tmp1_ = enhance_single; #line 2462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp2_ != NULL) { -#line 18888 "EditingTools.c" + if (_tmp1_ != NULL) { +#line 19233 "EditingTools.c" Photo* photo = NULL; - EnhanceSingleCommand* _tmp3_; - DataSource* _tmp4_; - Photo* _tmp5_; - EditingToolsAdjustTool* _tmp6_; - EditingToolsPhotoCanvas* _tmp7_; + EnhanceSingleCommand* _tmp2_; + DataSource* _tmp3_; + Photo* _tmp4_; + EditingToolsAdjustTool* _tmp5_; + EditingToolsPhotoCanvas* _tmp6_; + Photo* _tmp7_; Photo* _tmp8_; - Photo* _tmp9_; - gboolean _tmp10_; - gboolean _tmp11_; + gboolean _tmp9_; #line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp3_ = enhance_single; + _tmp2_ = enhance_single; #line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp4_ = single_data_source_command_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)); + _tmp3_ = single_data_source_command_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)); #line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO, Photo); -#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp5_ = photo; + photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO, Photo); #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner; + _tmp4_ = photo; #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner; #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = editing_tools_photo_canvas_get_photo (_tmp7_); + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = _tmp8_; + _tmp7_ = editing_tools_photo_canvas_get_photo (_tmp6_); #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_SOURCE, DataSource)); + _tmp8_ = _tmp7_; #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp11_ = _tmp10_; + _tmp9_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource)); #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - result = _tmp11_; + result = _tmp9_; #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (photo); #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (enhance_single); #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 18929 "EditingTools.c" +#line 19271 "EditingTools.c" } #line 2470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = command; -#line 2470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND) ? ((EditingToolsAdjustToolAdjustEnhanceCommand*) _tmp12_) : NULL); + _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (command, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND) ? ((EditingToolsAdjustToolAdjustEnhanceCommand*) command) : NULL); #line 2470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - enhance_command = _tmp13_; + enhance_command = _tmp10_; #line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = enhance_command; + _tmp11_ = enhance_command; #line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp14_ == NULL) { + if (_tmp11_ == NULL) { #line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; #line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -18945,16 +19285,16 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress ( _g_object_unref0 (enhance_single); #line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 18949 "EditingTools.c" +#line 19289 "EditingTools.c" } #line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = enhance_command; + _tmp12_ = enhance_command; #line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner; + _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner; #line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner; + _tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner; #line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp16_ != _tmp17_) { + if (_tmp13_ != _tmp14_) { #line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; #line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -18963,7 +19303,7 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress ( _g_object_unref0 (enhance_single); #line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 18967 "EditingTools.c" +#line 19307 "EditingTools.c" } #line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = TRUE; @@ -18973,11 +19313,13 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress ( _g_object_unref0 (enhance_single); #line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 18977 "EditingTools.c" +#line 19317 "EditingTools.c" } -static void editing_tools_adjust_tool_adjust_enhance_command_class_init (EditingToolsAdjustToolAdjustEnhanceCommandClass * klass) { +static void +editing_tools_adjust_tool_adjust_enhance_command_class_init (EditingToolsAdjustToolAdjustEnhanceCommandClass * klass) +{ #line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_adjust_enhance_command_parent_class = g_type_class_peek_parent (klass); #line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -18990,20 +19332,24 @@ static void editing_tools_adjust_tool_adjust_enhance_command_class_init (Editing ((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) editing_tools_adjust_tool_adjust_enhance_command_real_compress; #line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_enhance_command_finalize; -#line 18994 "EditingTools.c" +#line 19336 "EditingTools.c" } -static void editing_tools_adjust_tool_adjust_enhance_command_instance_init (EditingToolsAdjustToolAdjustEnhanceCommand * self) { +static void +editing_tools_adjust_tool_adjust_enhance_command_instance_init (EditingToolsAdjustToolAdjustEnhanceCommand * self) +{ #line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv = EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_GET_PRIVATE (self); #line 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->enhanced = NULL; -#line 19003 "EditingTools.c" +#line 19347 "EditingTools.c" } -static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject * obj) { +static void +editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject * obj) +{ EditingToolsAdjustToolAdjustEnhanceCommand * self; #line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand); @@ -19015,11 +19361,13 @@ static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject * _pixel_transformation_bundle_unref0 (self->priv->enhanced); #line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_enhance_command_parent_class)->finalize (obj); -#line 19019 "EditingTools.c" +#line 19365 "EditingTools.c" } -static GType editing_tools_adjust_tool_adjust_enhance_command_get_type (void) { +static GType +editing_tools_adjust_tool_adjust_enhance_command_get_type (void) +{ static volatile gsize editing_tools_adjust_tool_adjust_enhance_command_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_adjust_tool_adjust_enhance_command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditingToolsAdjustToolAdjustEnhanceCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_adjust_tool_adjust_enhance_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsAdjustToolAdjustEnhanceCommand), 0, (GInstanceInitFunc) editing_tools_adjust_tool_adjust_enhance_command_instance_init, NULL }; @@ -19031,7 +19379,9 @@ static GType editing_tools_adjust_tool_adjust_enhance_command_get_type (void) { } -static void editing_tools_adjust_tool_class_init (EditingToolsAdjustToolClass * klass) { +static void +editing_tools_adjust_tool_class_init (EditingToolsAdjustToolClass * klass) +{ #line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_parent_class = g_type_class_peek_parent (klass); #line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -19050,11 +19400,13 @@ static void editing_tools_adjust_tool_class_init (EditingToolsAdjustToolClass * ((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = (GdkPixbuf* (*) (EditingToolsEditingTool *, Scaling*, Photo*, Dimensions*, GError**)) editing_tools_adjust_tool_real_get_display_pixbuf; #line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_adjust_tool_real_on_keypress; -#line 19054 "EditingTools.c" +#line 19404 "EditingTools.c" } -static void editing_tools_adjust_tool_instance_init (EditingToolsAdjustTool * self) { +static void +editing_tools_adjust_tool_instance_init (EditingToolsAdjustTool * self) +{ #line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv = EDITING_TOOLS_ADJUST_TOOL_GET_PRIVATE (self); #line 2482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -19095,11 +19447,13 @@ static void editing_tools_adjust_tool_instance_init (EditingToolsAdjustTool * se self->priv->shadows_scheduler = NULL; #line 2498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->highlights_scheduler = NULL; -#line 19099 "EditingTools.c" +#line 19451 "EditingTools.c" } -static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool * obj) { +static void +editing_tools_adjust_tool_finalize (EditingToolsEditingTool * obj) +{ EditingToolsAdjustTool * self; #line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool); @@ -19135,11 +19489,13 @@ static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool * obj) { _one_shot_scheduler_unref0 (self->priv->highlights_scheduler); #line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->finalize (obj); -#line 19139 "EditingTools.c" +#line 19493 "EditingTools.c" } -GType editing_tools_adjust_tool_get_type (void) { +GType +editing_tools_adjust_tool_get_type (void) +{ static volatile gsize editing_tools_adjust_tool_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_adjust_tool_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditingToolsAdjustToolClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_adjust_tool_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsAdjustTool), 0, (GInstanceInitFunc) editing_tools_adjust_tool_instance_init, NULL }; @@ -19151,7 +19507,11 @@ GType editing_tools_adjust_tool_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -19163,7 +19523,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/editing_tools/RGBHistogramManipulator.c b/src/editing_tools/RGBHistogramManipulator.c index ffbf0b8..bb9a9b0 100644 --- a/src/editing_tools/RGBHistogramManipulator.c +++ b/src/editing_tools/RGBHistogramManipulator.c @@ -1,4 +1,4 @@ -/* RGBHistogramManipulator.c generated by valac 0.36.6, the Vala compiler +/* RGBHistogramManipulator.c generated by valac 0.40.4, the Vala compiler * generated from RGBHistogramManipulator.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -29,15 +30,20 @@ typedef struct _RGBHistogramManipulator RGBHistogramManipulator; typedef struct _RGBHistogramManipulatorClass RGBHistogramManipulatorClass; typedef struct _RGBHistogramManipulatorPrivate RGBHistogramManipulatorPrivate; +enum { + RGB_HISTOGRAM_MANIPULATOR_0_PROPERTY, + RGB_HISTOGRAM_MANIPULATOR_NUM_PROPERTIES +}; +static GParamSpec* rgb_histogram_manipulator_properties[RGB_HISTOGRAM_MANIPULATOR_NUM_PROPERTIES]; #define RGB_HISTOGRAM_MANIPULATOR_TYPE_LOCATION_CODE (rgb_histogram_manipulator_location_code_get_type ()) #define _rgb_histogram_unref0(var) ((var == NULL) ? NULL : (var = (rgb_histogram_unref (var), NULL))) #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) enum { RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL, - RGB_HISTOGRAM_MANIPULATOR_LAST_SIGNAL + RGB_HISTOGRAM_MANIPULATOR_NUM_SIGNALS }; -static guint rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_LAST_SIGNAL] = {0}; +static guint rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -84,9 +90,6 @@ static gboolean rgb_histogram_manipulator_paths_setup = FALSE; GType rgb_histogram_manipulator_get_type (void) G_GNUC_CONST; #define RGB_HISTOGRAM_MANIPULATOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulatorPrivate)) -enum { - RGB_HISTOGRAM_MANIPULATOR_DUMMY_PROPERTY -}; static GType rgb_histogram_manipulator_location_code_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE 13 #define RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH (RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE / 2) @@ -99,31 +102,58 @@ static GType rgb_histogram_manipulator_location_code_get_type (void) G_GNUC_CONS #define RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION (((((RGB_HISTOGRAM_MANIPULATOR_CONTROL_HEIGHT - RGB_HISTOGRAM_MANIPULATOR_TROUGH_HEIGHT) - RGB_HISTOGRAM_MANIPULATOR_TROUGH_BOTTOM_OFFSET) - ((RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE - RGB_HISTOGRAM_MANIPULATOR_TROUGH_HEIGHT) / 2)) - RGB_HISTOGRAM_MANIPULATOR_NUB_V_NUDGE) - 2) RGBHistogramManipulator* rgb_histogram_manipulator_new (void); RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type); -static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulator* self, GdkEventButton* event_record); -static gboolean _rgb_histogram_manipulator_on_button_press_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); -static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipulator* self, GdkEventButton* event_record); -static gboolean _rgb_histogram_manipulator_on_button_release_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); -static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipulator* self, GdkEventMotion* event_record); -static gboolean _rgb_histogram_manipulator_on_button_motion_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self); -static void rgb_histogram_manipulator_on_size_allocate (RGBHistogramManipulator* self, GtkAllocation* region); -static void _rgb_histogram_manipulator_on_size_allocate_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self); -static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_point (RGBHistogramManipulator* self, gint x, gint y); +static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulator* self, + GdkEventButton* event_record); +static gboolean _rgb_histogram_manipulator_on_button_press_gtk_widget_button_press_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self); +static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipulator* self, + GdkEventButton* event_record); +static gboolean _rgb_histogram_manipulator_on_button_release_gtk_widget_button_release_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self); +static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipulator* self, + GdkEventMotion* event_record); +static gboolean _rgb_histogram_manipulator_on_button_motion_gtk_widget_motion_notify_event (GtkWidget* _sender, + GdkEventMotion* event, + gpointer self); +static void rgb_histogram_manipulator_on_size_allocate (RGBHistogramManipulator* self, + GtkAllocation* region); +static void _rgb_histogram_manipulator_on_size_allocate_gtk_widget_size_allocate (GtkWidget* _sender, + GtkAllocation* allocation, + gpointer self); +static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_point (RGBHistogramManipulator* self, + gint x, + gint y); static void rgb_histogram_manipulator_force_update (RGBHistogramManipulator* self); static void rgb_histogram_manipulator_update_nub_extrema (RGBHistogramManipulator* self); -static gboolean rgb_histogram_manipulator_real_focus_out_event (GtkWidget* base, GdkEventFocus* event); -static gboolean rgb_histogram_manipulator_real_key_press_event (GtkWidget* base, GdkEventKey* event); -static gboolean rgb_histogram_manipulator_real_draw (GtkWidget* base, cairo_t* ctx); -static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area); -static void rgb_histogram_manipulator_draw_nub (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area, gint position); -void rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self, GdkPixbuf* source_pixbuf); +static gboolean rgb_histogram_manipulator_real_focus_out_event (GtkWidget* base, + GdkEventFocus* event); +static gboolean rgb_histogram_manipulator_real_key_press_event (GtkWidget* base, + GdkEventKey* event); +static gboolean rgb_histogram_manipulator_real_draw (GtkWidget* base, + cairo_t* ctx); +static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* self, + cairo_t* ctx, + GdkRectangle* area); +static void rgb_histogram_manipulator_draw_nub (RGBHistogramManipulator* self, + cairo_t* ctx, + GdkRectangle* area, + gint position); +void rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self, + GdkPixbuf* source_pixbuf); gint rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* self); gint rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator* self); -void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self, gint user_nub_pos); -void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self, gint user_nub_pos); +void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self, + gint user_nub_pos); +void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self, + gint user_nub_pos); static void rgb_histogram_manipulator_finalize (GObject * obj); -static GType rgb_histogram_manipulator_location_code_get_type (void) { +static GType +rgb_histogram_manipulator_location_code_get_type (void) +{ static volatile gsize rgb_histogram_manipulator_location_code_type_id__volatile = 0; if (g_once_init_enter (&rgb_histogram_manipulator_location_code_type_id__volatile)) { static const GEnumValue values[] = {{RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB", "left-nub"}, {RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB", "right-nub"}, {RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH", "left-trough"}, {RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH", "right-trough"}, {RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA", "insensitive-area"}, {0, NULL, NULL}}; @@ -135,41 +165,59 @@ static GType rgb_histogram_manipulator_location_code_get_type (void) { } -static gboolean _rgb_histogram_manipulator_on_button_press_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { +static gboolean +_rgb_histogram_manipulator_on_button_press_gtk_widget_button_press_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self) +{ gboolean result; result = rgb_histogram_manipulator_on_button_press ((RGBHistogramManipulator*) self, event); #line 57 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 144 "RGBHistogramManipulator.c" +#line 178 "RGBHistogramManipulator.c" } -static gboolean _rgb_histogram_manipulator_on_button_release_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { +static gboolean +_rgb_histogram_manipulator_on_button_release_gtk_widget_button_release_event (GtkWidget* _sender, + GdkEventButton* event, + gpointer self) +{ gboolean result; result = rgb_histogram_manipulator_on_button_release ((RGBHistogramManipulator*) self, event); #line 58 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 153 "RGBHistogramManipulator.c" +#line 191 "RGBHistogramManipulator.c" } -static gboolean _rgb_histogram_manipulator_on_button_motion_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self) { +static gboolean +_rgb_histogram_manipulator_on_button_motion_gtk_widget_motion_notify_event (GtkWidget* _sender, + GdkEventMotion* event, + gpointer self) +{ gboolean result; result = rgb_histogram_manipulator_on_button_motion ((RGBHistogramManipulator*) self, event); #line 59 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 162 "RGBHistogramManipulator.c" +#line 204 "RGBHistogramManipulator.c" } -static void _rgb_histogram_manipulator_on_size_allocate_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) { +static void +_rgb_histogram_manipulator_on_size_allocate_gtk_widget_size_allocate (GtkWidget* _sender, + GtkAllocation* allocation, + gpointer self) +{ #line 61 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" rgb_histogram_manipulator_on_size_allocate ((RGBHistogramManipulator*) self, allocation); -#line 169 "RGBHistogramManipulator.c" +#line 215 "RGBHistogramManipulator.c" } -RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type) { +RGBHistogramManipulator* +rgb_histogram_manipulator_construct (GType object_type) +{ RGBHistogramManipulator * self = NULL; gboolean _tmp0_; #line 36 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" @@ -177,12 +225,12 @@ RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type) #line 37 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), RGB_HISTOGRAM_MANIPULATOR_CONTROL_WIDTH, RGB_HISTOGRAM_MANIPULATOR_CONTROL_HEIGHT); #line 38 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - g_object_set (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "can-focus", TRUE, NULL); + gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), TRUE); #line 40 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" _tmp0_ = rgb_histogram_manipulator_paths_setup; #line 40 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" if (!_tmp0_) { -#line 186 "RGBHistogramManipulator.c" +#line 234 "RGBHistogramManipulator.c" GtkWidgetPath* _tmp1_; GtkWidgetPath* _tmp2_; GtkWidgetPath* _tmp3_; @@ -210,7 +258,7 @@ RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type) gtk_widget_path_iter_add_class (_tmp5_, 0, "default"); #line 48 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" rgb_histogram_manipulator_paths_setup = TRUE; -#line 214 "RGBHistogramManipulator.c" +#line 262 "RGBHistogramManipulator.c" } #line 51 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) GDK_BUTTON_PRESS_MASK); @@ -232,18 +280,23 @@ RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type) g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "size-allocate", (GCallback) _rgb_histogram_manipulator_on_size_allocate_gtk_widget_size_allocate, self, 0); #line 36 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return self; -#line 236 "RGBHistogramManipulator.c" +#line 284 "RGBHistogramManipulator.c" } -RGBHistogramManipulator* rgb_histogram_manipulator_new (void) { +RGBHistogramManipulator* +rgb_histogram_manipulator_new (void) +{ #line 36 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return rgb_histogram_manipulator_construct (TYPE_RGB_HISTOGRAM_MANIPULATOR); -#line 243 "RGBHistogramManipulator.c" +#line 293 "RGBHistogramManipulator.c" } -static void rgb_histogram_manipulator_on_size_allocate (RGBHistogramManipulator* self, GtkAllocation* region) { +static void +rgb_histogram_manipulator_on_size_allocate (RGBHistogramManipulator* self, + GtkAllocation* region) +{ GtkAllocation _tmp0_; gint _tmp1_; #line 64 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" @@ -256,260 +309,208 @@ static void rgb_histogram_manipulator_on_size_allocate (RGBHistogramManipulator* _tmp1_ = _tmp0_.width; #line 65 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" self->priv->offset = ((_tmp1_ - RGB_HISTOGRAM_GRAPHIC_WIDTH) - RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) / 2; -#line 260 "RGBHistogramManipulator.c" +#line 313 "RGBHistogramManipulator.c" } -static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_point (RGBHistogramManipulator* self, gint x, gint y) { +static RGBHistogramManipulatorLocationCode +rgb_histogram_manipulator_hit_test_point (RGBHistogramManipulator* self, + gint x, + gint y) +{ RGBHistogramManipulatorLocationCode result = 0; - gint _tmp0_; - gboolean _tmp1_ = FALSE; - gint _tmp2_; - gint _tmp3_; - gboolean _tmp6_ = FALSE; + gboolean _tmp0_ = FALSE; + gint _tmp1_; + gboolean _tmp3_ = FALSE; + gint _tmp4_; + gint _tmp6_; gint _tmp7_; gint _tmp8_; - gint _tmp11_; - gint _tmp12_; - gint _tmp13_; - gint _tmp14_; - gint _tmp15_; - gint _tmp16_; - gint _tmp17_; - gint _tmp18_; - gint _tmp19_; + gint _tmp9_; #line 68 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), 0); #line 69 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp0_ = y; -#line 69 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if (_tmp0_ < RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION) { + if (y < RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION) { #line 70 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA; #line 70 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 292 "RGBHistogramManipulator.c" +#line 339 "RGBHistogramManipulator.c" } #line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp2_ = x; -#line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp3_ = self->priv->left_nub_position; + _tmp1_ = self->priv->left_nub_position; #line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if (_tmp2_ > _tmp3_) { -#line 300 "RGBHistogramManipulator.c" - gint _tmp4_; - gint _tmp5_; -#line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp4_ = x; + if (x > _tmp1_) { +#line 345 "RGBHistogramManipulator.c" + gint _tmp2_; #line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp5_ = self->priv->left_nub_position; + _tmp2_ = self->priv->left_nub_position; #line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp1_ = _tmp4_ < (_tmp5_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE); -#line 309 "RGBHistogramManipulator.c" + _tmp0_ = x < (_tmp2_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE); +#line 351 "RGBHistogramManipulator.c" } else { #line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp1_ = FALSE; -#line 313 "RGBHistogramManipulator.c" + _tmp0_ = FALSE; +#line 355 "RGBHistogramManipulator.c" } #line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if (_tmp1_) { + if (_tmp0_) { #line 73 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB; #line 73 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 321 "RGBHistogramManipulator.c" +#line 363 "RGBHistogramManipulator.c" } #line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp7_ = x; + _tmp4_ = self->priv->right_nub_position; #line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp8_ = self->priv->right_nub_position; -#line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if (_tmp7_ > _tmp8_) { -#line 329 "RGBHistogramManipulator.c" - gint _tmp9_; - gint _tmp10_; -#line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp9_ = x; + if (x > _tmp4_) { +#line 369 "RGBHistogramManipulator.c" + gint _tmp5_; #line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp10_ = self->priv->right_nub_position; + _tmp5_ = self->priv->right_nub_position; #line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp6_ = _tmp9_ < (_tmp10_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE); -#line 338 "RGBHistogramManipulator.c" + _tmp3_ = x < (_tmp5_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE); +#line 375 "RGBHistogramManipulator.c" } else { #line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp6_ = FALSE; -#line 342 "RGBHistogramManipulator.c" + _tmp3_ = FALSE; +#line 379 "RGBHistogramManipulator.c" } #line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if (_tmp6_) { + if (_tmp3_) { #line 76 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB; #line 76 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 350 "RGBHistogramManipulator.c" +#line 387 "RGBHistogramManipulator.c" } #line 78 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp11_ = y; -#line 78 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if (_tmp11_ < ((RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION + RGB_HISTOGRAM_MANIPULATOR_NUB_V_NUDGE) + 1)) { + if (y < ((RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION + RGB_HISTOGRAM_MANIPULATOR_NUB_V_NUDGE) + 1)) { #line 79 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA; #line 79 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 360 "RGBHistogramManipulator.c" +#line 395 "RGBHistogramManipulator.c" } #line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp12_ = x; -#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp13_ = self->priv->left_nub_position; -#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp14_ = x; + _tmp6_ = self->priv->left_nub_position; #line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp15_ = self->priv->left_nub_position; -#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp16_ = x; -#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp17_ = self->priv->right_nub_position; + _tmp7_ = self->priv->left_nub_position; #line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp18_ = x; + _tmp8_ = self->priv->right_nub_position; #line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp19_ = self->priv->right_nub_position; + _tmp9_ = self->priv->right_nub_position; #line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if (((_tmp12_ - _tmp13_) * (_tmp14_ - _tmp15_)) < ((_tmp16_ - _tmp17_) * (_tmp18_ - _tmp19_))) { + if (((x - _tmp6_) * (x - _tmp7_)) < ((x - _tmp8_) * (x - _tmp9_))) { #line 83 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH; #line 83 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 384 "RGBHistogramManipulator.c" +#line 411 "RGBHistogramManipulator.c" } else { #line 85 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH; #line 85 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 390 "RGBHistogramManipulator.c" +#line 417 "RGBHistogramManipulator.c" } } -static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulator* self, GdkEventButton* event_record) { +static gboolean +rgb_histogram_manipulator_on_button_press (RGBHistogramManipulator* self, + GdkEventButton* event_record) +{ gboolean result = FALSE; - GdkEventButton* _tmp0_; - GdkEventButton* _tmp1_; - gdouble _tmp2_; - gint _tmp3_; + gdouble _tmp0_; + gint _tmp1_; RGBHistogramManipulatorLocationCode loc = 0; - GdkEventButton* _tmp4_; - gdouble _tmp5_; - GdkEventButton* _tmp6_; - gdouble _tmp7_; - RGBHistogramManipulatorLocationCode _tmp8_; + gdouble _tmp2_; + gdouble _tmp3_; gboolean retval = FALSE; - RGBHistogramManipulatorLocationCode _tmp9_; - GdkEventButton* _tmp26_; - GdkEventButton* _tmp27_; - gdouble _tmp28_; - gint _tmp29_; + RGBHistogramManipulatorLocationCode _tmp4_; + gdouble _tmp15_; + gint _tmp16_; #line 88 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), FALSE); #line 88 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" g_return_val_if_fail (event_record != NULL, FALSE); #line 91 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp0_ = event_record; + _tmp0_ = event_record->x; #line 91 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp1_ = event_record; + _tmp1_ = self->priv->offset; #line 91 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp2_ = _tmp1_->x; -#line 91 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp3_ = self->priv->offset; -#line 91 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp1_->x = _tmp2_ - _tmp3_; -#line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp4_ = event_record; + event_record->x = _tmp0_ - _tmp1_; #line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp5_ = _tmp4_->x; + _tmp2_ = event_record->x; #line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp6_ = event_record; + _tmp3_ = event_record->y; #line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp7_ = _tmp6_->y; -#line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp8_ = rgb_histogram_manipulator_hit_test_point (self, (gint) _tmp5_, (gint) _tmp7_); -#line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - loc = _tmp8_; + loc = rgb_histogram_manipulator_hit_test_point (self, (gint) _tmp2_, (gint) _tmp3_); #line 93 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" retval = TRUE; #line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp9_ = loc; + _tmp4_ = loc; #line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - switch (_tmp9_) { + switch (_tmp4_) { #line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB: -#line 447 "RGBHistogramManipulator.c" +#line 460 "RGBHistogramManipulator.c" { - GdkEventButton* _tmp10_; - gdouble _tmp11_; - gint _tmp12_; -#line 97 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp10_ = event_record; + gdouble _tmp5_; + gint _tmp6_; #line 97 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp11_ = _tmp10_->x; + _tmp5_ = event_record->x; #line 97 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - self->priv->track_start_x = (gint) _tmp11_; + self->priv->track_start_x = (gint) _tmp5_; #line 98 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp12_ = self->priv->left_nub_position; + _tmp6_ = self->priv->left_nub_position; #line 98 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - self->priv->track_nub_start_position = _tmp12_; + self->priv->track_nub_start_position = _tmp6_; #line 99 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" self->priv->is_left_nub_tracking = TRUE; #line 100 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" break; -#line 466 "RGBHistogramManipulator.c" +#line 476 "RGBHistogramManipulator.c" } #line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB: -#line 470 "RGBHistogramManipulator.c" +#line 480 "RGBHistogramManipulator.c" { - GdkEventButton* _tmp13_; - gdouble _tmp14_; - gint _tmp15_; + gdouble _tmp7_; + gint _tmp8_; #line 103 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp13_ = event_record; + _tmp7_ = event_record->x; #line 103 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp14_ = _tmp13_->x; -#line 103 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - self->priv->track_start_x = (gint) _tmp14_; + self->priv->track_start_x = (gint) _tmp7_; #line 104 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp15_ = self->priv->right_nub_position; + _tmp8_ = self->priv->right_nub_position; #line 104 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - self->priv->track_nub_start_position = _tmp15_; + self->priv->track_nub_start_position = _tmp8_; #line 105 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" self->priv->is_right_nub_tracking = TRUE; #line 106 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" break; -#line 489 "RGBHistogramManipulator.c" +#line 496 "RGBHistogramManipulator.c" } #line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH: -#line 493 "RGBHistogramManipulator.c" +#line 500 "RGBHistogramManipulator.c" { - GdkEventButton* _tmp16_; - gdouble _tmp17_; - gint _tmp18_; - gint _tmp19_; - gint _tmp20_; -#line 109 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp16_ = event_record; + gdouble _tmp9_; + gint _tmp10_; + gint _tmp11_; #line 109 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp17_ = _tmp16_->x; + _tmp9_ = event_record->x; #line 109 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - self->priv->left_nub_position = ((gint) _tmp17_) - RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH; + self->priv->left_nub_position = ((gint) _tmp9_) - RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH; #line 110 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp18_ = self->priv->left_nub_position; + _tmp10_ = self->priv->left_nub_position; #line 110 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp19_ = self->priv->left_nub_max; + _tmp11_ = self->priv->left_nub_max; #line 110 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp20_ = CLAMP (_tmp18_, 0, _tmp19_); -#line 110 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - self->priv->left_nub_position = _tmp20_; + self->priv->left_nub_position = CLAMP (_tmp10_, 0, _tmp11_); #line 111 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" rgb_histogram_manipulator_force_update (self); #line 112 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" @@ -518,31 +519,25 @@ static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulat rgb_histogram_manipulator_update_nub_extrema (self); #line 114 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" break; -#line 522 "RGBHistogramManipulator.c" +#line 523 "RGBHistogramManipulator.c" } #line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH: -#line 526 "RGBHistogramManipulator.c" +#line 527 "RGBHistogramManipulator.c" { - GdkEventButton* _tmp21_; - gdouble _tmp22_; - gint _tmp23_; - gint _tmp24_; - gint _tmp25_; -#line 117 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp21_ = event_record; + gdouble _tmp12_; + gint _tmp13_; + gint _tmp14_; #line 117 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp22_ = _tmp21_->x; + _tmp12_ = event_record->x; #line 117 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - self->priv->right_nub_position = ((gint) _tmp22_) - RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH; + self->priv->right_nub_position = ((gint) _tmp12_) - RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH; #line 118 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp23_ = self->priv->right_nub_position; + _tmp13_ = self->priv->right_nub_position; #line 118 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp24_ = self->priv->right_nub_min; + _tmp14_ = self->priv->right_nub_min; #line 118 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp25_ = CLAMP (_tmp23_, _tmp24_, 255); -#line 118 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - self->priv->right_nub_position = _tmp25_; + self->priv->right_nub_position = CLAMP (_tmp13_, _tmp14_, 255); #line 119 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" rgb_histogram_manipulator_force_update (self); #line 120 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" @@ -551,7 +546,7 @@ static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulat rgb_histogram_manipulator_update_nub_extrema (self); #line 122 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" break; -#line 555 "RGBHistogramManipulator.c" +#line 550 "RGBHistogramManipulator.c" } default: { @@ -559,28 +554,27 @@ static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulat retval = FALSE; #line 126 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" break; -#line 563 "RGBHistogramManipulator.c" +#line 558 "RGBHistogramManipulator.c" } } #line 130 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp26_ = event_record; -#line 130 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp27_ = event_record; -#line 130 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp28_ = _tmp27_->x; + _tmp15_ = event_record->x; #line 130 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp29_ = self->priv->offset; + _tmp16_ = self->priv->offset; #line 130 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp27_->x = _tmp28_ + _tmp29_; + event_record->x = _tmp15_ + _tmp16_; #line 132 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" result = retval; #line 132 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 580 "RGBHistogramManipulator.c" +#line 571 "RGBHistogramManipulator.c" } -static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipulator* self, GdkEventButton* event_record) { +static gboolean +rgb_histogram_manipulator_on_button_release (RGBHistogramManipulator* self, + GdkEventButton* event_record) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_; @@ -594,14 +588,14 @@ static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipul if (_tmp1_) { #line 136 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" _tmp0_ = TRUE; -#line 598 "RGBHistogramManipulator.c" +#line 592 "RGBHistogramManipulator.c" } else { gboolean _tmp2_; #line 136 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" _tmp2_ = self->priv->is_right_nub_tracking; #line 136 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" _tmp0_ = _tmp2_; -#line 605 "RGBHistogramManipulator.c" +#line 599 "RGBHistogramManipulator.c" } #line 136 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" if (_tmp0_) { @@ -609,7 +603,7 @@ static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipul g_signal_emit (self, rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL], 0); #line 138 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" rgb_histogram_manipulator_update_nub_extrema (self); -#line 613 "RGBHistogramManipulator.c" +#line 607 "RGBHistogramManipulator.c" } #line 141 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" self->priv->is_left_nub_tracking = FALSE; @@ -619,23 +613,22 @@ static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipul result = FALSE; #line 144 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 623 "RGBHistogramManipulator.c" +#line 617 "RGBHistogramManipulator.c" } -static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipulator* self, GdkEventMotion* event_record) { +static gboolean +rgb_histogram_manipulator_on_button_motion (RGBHistogramManipulator* self, + GdkEventMotion* event_record) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_; - GdkEventMotion* _tmp3_; - GdkEventMotion* _tmp4_; - gdouble _tmp5_; - gint _tmp6_; - gboolean _tmp7_; - GdkEventMotion* _tmp24_; - GdkEventMotion* _tmp25_; - gdouble _tmp26_; - gint _tmp27_; + gdouble _tmp3_; + gint _tmp4_; + gboolean _tmp5_; + gdouble _tmp18_; + gint _tmp19_; #line 147 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), FALSE); #line 147 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" @@ -644,17 +637,17 @@ static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipula _tmp1_ = self->priv->is_left_nub_tracking; #line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" if (!_tmp1_) { -#line 648 "RGBHistogramManipulator.c" +#line 641 "RGBHistogramManipulator.c" gboolean _tmp2_; #line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" _tmp2_ = self->priv->is_right_nub_tracking; #line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" _tmp0_ = !_tmp2_; -#line 654 "RGBHistogramManipulator.c" +#line 647 "RGBHistogramManipulator.c" } else { #line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" _tmp0_ = FALSE; -#line 658 "RGBHistogramManipulator.c" +#line 651 "RGBHistogramManipulator.c" } #line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" if (_tmp0_) { @@ -662,129 +655,106 @@ static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipula result = FALSE; #line 149 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 666 "RGBHistogramManipulator.c" +#line 659 "RGBHistogramManipulator.c" } #line 151 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp3_ = event_record; + _tmp3_ = event_record->x; #line 151 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp4_ = event_record; -#line 151 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp5_ = _tmp4_->x; -#line 151 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp6_ = self->priv->offset; + _tmp4_ = self->priv->offset; #line 151 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp4_->x = _tmp5_ - _tmp6_; + event_record->x = _tmp3_ - _tmp4_; #line 152 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp7_ = self->priv->is_left_nub_tracking; + _tmp5_ = self->priv->is_left_nub_tracking; #line 152 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if (_tmp7_) { -#line 682 "RGBHistogramManipulator.c" + if (_tmp5_) { +#line 671 "RGBHistogramManipulator.c" gint track_x_delta = 0; - GdkEventMotion* _tmp8_; - gdouble _tmp9_; + gdouble _tmp6_; + gint _tmp7_; + gint _tmp8_; + gint _tmp9_; gint _tmp10_; gint _tmp11_; - gint _tmp12_; - gint _tmp13_; - gint _tmp14_; - gint _tmp15_; -#line 153 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp8_ = event_record; #line 153 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp9_ = _tmp8_->x; + _tmp6_ = event_record->x; #line 153 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp10_ = self->priv->track_start_x; + _tmp7_ = self->priv->track_start_x; #line 153 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - track_x_delta = ((gint) _tmp9_) - _tmp10_; + track_x_delta = ((gint) _tmp6_) - _tmp7_; #line 154 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp11_ = self->priv->track_nub_start_position; + _tmp8_ = self->priv->track_nub_start_position; #line 154 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp12_ = track_x_delta; + _tmp9_ = track_x_delta; #line 154 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - self->priv->left_nub_position = _tmp11_ + _tmp12_; + self->priv->left_nub_position = _tmp8_ + _tmp9_; #line 155 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp13_ = self->priv->left_nub_position; + _tmp10_ = self->priv->left_nub_position; #line 155 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp14_ = self->priv->left_nub_max; + _tmp11_ = self->priv->left_nub_max; #line 155 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp15_ = CLAMP (_tmp13_, 0, _tmp14_); -#line 155 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - self->priv->left_nub_position = _tmp15_; -#line 714 "RGBHistogramManipulator.c" + self->priv->left_nub_position = CLAMP (_tmp10_, 0, _tmp11_); +#line 697 "RGBHistogramManipulator.c" } else { gint track_x_delta = 0; - GdkEventMotion* _tmp16_; - gdouble _tmp17_; - gint _tmp18_; - gint _tmp19_; - gint _tmp20_; - gint _tmp21_; - gint _tmp22_; - gint _tmp23_; -#line 157 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp16_ = event_record; + gdouble _tmp12_; + gint _tmp13_; + gint _tmp14_; + gint _tmp15_; + gint _tmp16_; + gint _tmp17_; #line 157 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp17_ = _tmp16_->x; + _tmp12_ = event_record->x; #line 157 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp18_ = self->priv->track_start_x; + _tmp13_ = self->priv->track_start_x; #line 157 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - track_x_delta = ((gint) _tmp17_) - _tmp18_; + track_x_delta = ((gint) _tmp12_) - _tmp13_; #line 158 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp19_ = self->priv->track_nub_start_position; + _tmp14_ = self->priv->track_nub_start_position; #line 158 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp20_ = track_x_delta; + _tmp15_ = track_x_delta; #line 158 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - self->priv->right_nub_position = _tmp19_ + _tmp20_; + self->priv->right_nub_position = _tmp14_ + _tmp15_; #line 159 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp21_ = self->priv->right_nub_position; + _tmp16_ = self->priv->right_nub_position; #line 159 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp22_ = self->priv->right_nub_min; + _tmp17_ = self->priv->right_nub_min; #line 159 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp23_ = CLAMP (_tmp21_, _tmp22_, 255); -#line 159 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - self->priv->right_nub_position = _tmp23_; -#line 747 "RGBHistogramManipulator.c" + self->priv->right_nub_position = CLAMP (_tmp16_, _tmp17_, 255); +#line 724 "RGBHistogramManipulator.c" } #line 162 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" rgb_histogram_manipulator_force_update (self); #line 163 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp24_ = event_record; -#line 163 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp25_ = event_record; -#line 163 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp26_ = _tmp25_->x; + _tmp18_ = event_record->x; #line 163 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp27_ = self->priv->offset; + _tmp19_ = self->priv->offset; #line 163 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp25_->x = _tmp26_ + _tmp27_; + event_record->x = _tmp18_ + _tmp19_; #line 165 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" result = TRUE; #line 165 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 765 "RGBHistogramManipulator.c" +#line 738 "RGBHistogramManipulator.c" } -static gboolean rgb_histogram_manipulator_real_focus_out_event (GtkWidget* base, GdkEventFocus* event) { +static gboolean +rgb_histogram_manipulator_real_focus_out_event (GtkWidget* base, + GdkEventFocus* event) +{ RGBHistogramManipulator * self; gboolean result = FALSE; - GdkEventFocus* _tmp0_; - gboolean _tmp1_; #line 168 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator); #line 168 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" g_return_val_if_fail (event != NULL, FALSE); #line 169 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp0_ = event; -#line 169 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp1_ = GTK_WIDGET_CLASS (rgb_histogram_manipulator_parent_class)->focus_out_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), _tmp0_); -#line 169 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if (_tmp1_) { + if (GTK_WIDGET_CLASS (rgb_histogram_manipulator_parent_class)->focus_out_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), event)) { #line 170 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" result = TRUE; #line 170 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 788 "RGBHistogramManipulator.c" +#line 758 "RGBHistogramManipulator.c" } #line 173 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); @@ -792,169 +762,142 @@ static gboolean rgb_histogram_manipulator_real_focus_out_event (GtkWidget* base, result = FALSE; #line 175 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 796 "RGBHistogramManipulator.c" +#line 766 "RGBHistogramManipulator.c" } -static gboolean rgb_histogram_manipulator_real_key_press_event (GtkWidget* base, GdkEventKey* event) { +static gboolean +rgb_histogram_manipulator_real_key_press_event (GtkWidget* base, + GdkEventKey* event) +{ RGBHistogramManipulator * self; gboolean result = FALSE; - GdkEventKey* _tmp0_; - gboolean _tmp1_; gint delta = 0; - gboolean _tmp2_ = FALSE; - GdkEventKey* _tmp3_; + gboolean _tmp0_ = FALSE; + guint _tmp1_; + gboolean _tmp3_ = FALSE; guint _tmp4_; - gboolean _tmp7_ = FALSE; - GdkEventKey* _tmp8_; - guint _tmp9_; - GdkEventKey* _tmp12_; - GdkModifierType _tmp13_; - gint _tmp15_; - GdkEventKey* _tmp16_; - GdkModifierType _tmp17_; + GdkModifierType _tmp6_; + gint _tmp8_; + GdkModifierType _tmp9_; #line 178 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator); #line 178 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" g_return_val_if_fail (event != NULL, FALSE); #line 179 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp0_ = event; -#line 179 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp1_ = GTK_WIDGET_CLASS (rgb_histogram_manipulator_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), _tmp0_); -#line 179 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if (_tmp1_) { + if (GTK_WIDGET_CLASS (rgb_histogram_manipulator_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), event)) { #line 180 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" result = TRUE; #line 180 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 831 "RGBHistogramManipulator.c" +#line 794 "RGBHistogramManipulator.c" } #line 183 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" delta = 0; #line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp3_ = event; -#line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp4_ = _tmp3_->keyval; + _tmp1_ = event->keyval; #line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if (_tmp4_ == ((guint) GDK_KEY_Left)) { + if (_tmp1_ == ((guint) GDK_KEY_Left)) { #line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp2_ = TRUE; -#line 843 "RGBHistogramManipulator.c" + _tmp0_ = TRUE; +#line 804 "RGBHistogramManipulator.c" } else { - GdkEventKey* _tmp5_; - guint _tmp6_; + guint _tmp2_; #line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp5_ = event; + _tmp2_ = event->keyval; #line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp6_ = _tmp5_->keyval; -#line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp2_ = _tmp6_ == ((guint) GDK_KEY_Up); -#line 853 "RGBHistogramManipulator.c" + _tmp0_ = _tmp2_ == ((guint) GDK_KEY_Up); +#line 811 "RGBHistogramManipulator.c" } #line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if (_tmp2_) { + if (_tmp0_) { #line 186 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" delta = -1; -#line 859 "RGBHistogramManipulator.c" +#line 817 "RGBHistogramManipulator.c" } #line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp8_ = event; -#line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp9_ = _tmp8_->keyval; + _tmp4_ = event->keyval; #line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if (_tmp9_ == ((guint) GDK_KEY_Right)) { + if (_tmp4_ == ((guint) GDK_KEY_Right)) { #line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp7_ = TRUE; -#line 869 "RGBHistogramManipulator.c" + _tmp3_ = TRUE; +#line 825 "RGBHistogramManipulator.c" } else { - GdkEventKey* _tmp10_; - guint _tmp11_; + guint _tmp5_; #line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp10_ = event; + _tmp5_ = event->keyval; #line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp11_ = _tmp10_->keyval; -#line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp7_ = _tmp11_ == ((guint) GDK_KEY_Down); -#line 879 "RGBHistogramManipulator.c" + _tmp3_ = _tmp5_ == ((guint) GDK_KEY_Down); +#line 832 "RGBHistogramManipulator.c" } #line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if (_tmp7_) { + if (_tmp3_) { #line 190 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" delta = 1; -#line 885 "RGBHistogramManipulator.c" +#line 838 "RGBHistogramManipulator.c" } #line 193 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp12_ = event; -#line 193 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp13_ = _tmp12_->state; + _tmp6_ = event->state; #line 193 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if (!((_tmp13_ & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)) { -#line 893 "RGBHistogramManipulator.c" - gint _tmp14_; + if (!((_tmp6_ & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)) { +#line 844 "RGBHistogramManipulator.c" + gint _tmp7_; #line 194 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp14_ = delta; + _tmp7_ = delta; #line 194 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - delta = _tmp14_ * 5; -#line 899 "RGBHistogramManipulator.c" + delta = _tmp7_ * 5; +#line 850 "RGBHistogramManipulator.c" } #line 197 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp15_ = delta; + _tmp8_ = delta; #line 197 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if (_tmp15_ == 0) { + if (_tmp8_ == 0) { #line 198 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" result = FALSE; #line 198 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 909 "RGBHistogramManipulator.c" +#line 860 "RGBHistogramManipulator.c" } #line 201 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp16_ = event; + _tmp9_ = event->state; #line 201 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp17_ = _tmp16_->state; -#line 201 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if ((_tmp17_ & GDK_SHIFT_MASK) == GDK_SHIFT_MASK) { -#line 917 "RGBHistogramManipulator.c" - gint _tmp18_; - gint _tmp19_; - gint _tmp20_; - gint _tmp21_; - gint _tmp22_; + if ((_tmp9_ & GDK_SHIFT_MASK) == GDK_SHIFT_MASK) { +#line 866 "RGBHistogramManipulator.c" + gint _tmp10_; + gint _tmp11_; + gint _tmp12_; + gint _tmp13_; #line 202 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp18_ = self->priv->right_nub_position; + _tmp10_ = self->priv->right_nub_position; #line 202 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp19_ = delta; + _tmp11_ = delta; #line 202 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - self->priv->right_nub_position = _tmp18_ + _tmp19_; + self->priv->right_nub_position = _tmp10_ + _tmp11_; #line 203 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp20_ = self->priv->right_nub_position; -#line 203 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp21_ = self->priv->right_nub_min; + _tmp12_ = self->priv->right_nub_position; #line 203 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp22_ = CLAMP (_tmp20_, _tmp21_, 255); + _tmp13_ = self->priv->right_nub_min; #line 203 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - self->priv->right_nub_position = _tmp22_; -#line 937 "RGBHistogramManipulator.c" + self->priv->right_nub_position = CLAMP (_tmp12_, _tmp13_, 255); +#line 883 "RGBHistogramManipulator.c" } else { - gint _tmp23_; - gint _tmp24_; - gint _tmp25_; - gint _tmp26_; - gint _tmp27_; + gint _tmp14_; + gint _tmp15_; + gint _tmp16_; + gint _tmp17_; #line 205 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp23_ = self->priv->left_nub_position; + _tmp14_ = self->priv->left_nub_position; #line 205 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp24_ = delta; + _tmp15_ = delta; #line 205 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - self->priv->left_nub_position = _tmp23_ + _tmp24_; -#line 206 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp25_ = self->priv->left_nub_position; + self->priv->left_nub_position = _tmp14_ + _tmp15_; #line 206 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp26_ = self->priv->left_nub_max; + _tmp16_ = self->priv->left_nub_position; #line 206 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp27_ = CLAMP (_tmp25_, 0, _tmp26_); + _tmp17_ = self->priv->left_nub_max; #line 206 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - self->priv->left_nub_position = _tmp27_; -#line 958 "RGBHistogramManipulator.c" + self->priv->left_nub_position = CLAMP (_tmp16_, 0, _tmp17_); +#line 901 "RGBHistogramManipulator.c" } #line 210 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" g_signal_emit (self, rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL], 0); @@ -966,11 +909,14 @@ static gboolean rgb_histogram_manipulator_real_key_press_event (GtkWidget* base, result = TRUE; #line 214 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 970 "RGBHistogramManipulator.c" +#line 913 "RGBHistogramManipulator.c" } -static gboolean rgb_histogram_manipulator_real_draw (GtkWidget* base, cairo_t* ctx) { +static gboolean +rgb_histogram_manipulator_real_draw (GtkWidget* base, + cairo_t* ctx) +{ RGBHistogramManipulator * self; gboolean result = FALSE; GtkBorder padding = {0}; @@ -988,14 +934,11 @@ static gboolean rgb_histogram_manipulator_real_draw (GtkWidget* base, cairo_t* c gint16 _tmp10_; gboolean _tmp11_; gboolean _tmp12_; - cairo_t* _tmp23_; - GdkRectangle _tmp24_; - cairo_t* _tmp25_; - GdkRectangle _tmp26_; - gint _tmp27_; - cairo_t* _tmp28_; - GdkRectangle _tmp29_; - gint _tmp30_; + GdkRectangle _tmp22_; + GdkRectangle _tmp23_; + gint _tmp24_; + GdkRectangle _tmp25_; + gint _tmp26_; #line 217 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator); #line 217 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" @@ -1040,85 +983,78 @@ static gboolean rgb_histogram_manipulator_real_draw (GtkWidget* base, cairo_t* c _tmp12_ = _tmp11_; #line 226 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" if (_tmp12_) { -#line 1044 "RGBHistogramManipulator.c" +#line 987 "RGBHistogramManipulator.c" GtkStyleContext* _tmp13_; - cairo_t* _tmp14_; - GdkRectangle _tmp15_; - gint _tmp16_; - GdkRectangle _tmp17_; - gint _tmp18_; - GdkRectangle _tmp19_; - gint _tmp20_; - GdkRectangle _tmp21_; - gint _tmp22_; + GdkRectangle _tmp14_; + gint _tmp15_; + GdkRectangle _tmp16_; + gint _tmp17_; + GdkRectangle _tmp18_; + gint _tmp19_; + GdkRectangle _tmp20_; + gint _tmp21_; #line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" _tmp13_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp14_ = ctx; + _tmp14_ = area; #line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp15_ = area; + _tmp15_ = _tmp14_.x; #line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp16_ = _tmp15_.x; + _tmp16_ = area; #line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp17_ = area; + _tmp17_ = _tmp16_.y; #line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp18_ = _tmp17_.y; + _tmp18_ = area; #line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp19_ = area; + _tmp19_ = _tmp18_.width; #line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp20_ = _tmp19_.width; + _tmp20_ = area; #line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp21_ = area; + _tmp21_ = _tmp20_.height; #line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp22_ = _tmp21_.height; -#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - gtk_render_focus (_tmp13_, _tmp14_, (gdouble) _tmp16_, (gdouble) _tmp18_, (gdouble) (_tmp20_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE), (gdouble) ((_tmp22_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH)); -#line 1077 "RGBHistogramManipulator.c" + gtk_render_focus (_tmp13_, ctx, (gdouble) _tmp15_, (gdouble) _tmp17_, (gdouble) (_tmp19_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE), (gdouble) ((_tmp21_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH)); +#line 1017 "RGBHistogramManipulator.c" } #line 232 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp23_ = ctx; -#line 232 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp24_ = area; + _tmp22_ = area; #line 232 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - rgb_histogram_manipulator_draw_histogram (self, _tmp23_, &_tmp24_); + rgb_histogram_manipulator_draw_histogram (self, ctx, &_tmp22_); #line 233 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp25_ = ctx; + _tmp23_ = area; #line 233 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp26_ = area; + _tmp24_ = self->priv->left_nub_position; #line 233 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp27_ = self->priv->left_nub_position; -#line 233 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - rgb_histogram_manipulator_draw_nub (self, _tmp25_, &_tmp26_, _tmp27_); -#line 234 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp28_ = ctx; + rgb_histogram_manipulator_draw_nub (self, ctx, &_tmp23_, _tmp24_); #line 234 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp29_ = area; + _tmp25_ = area; #line 234 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp30_ = self->priv->right_nub_position; + _tmp26_ = self->priv->right_nub_position; #line 234 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - rgb_histogram_manipulator_draw_nub (self, _tmp28_, &_tmp29_, _tmp30_); + rgb_histogram_manipulator_draw_nub (self, ctx, &_tmp25_, _tmp26_); #line 236 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" result = TRUE; #line 236 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 1105 "RGBHistogramManipulator.c" +#line 1039 "RGBHistogramManipulator.c" } -static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area) { +static void +rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* self, + cairo_t* ctx, + GdkRectangle* area) +{ RGBHistogram* _tmp0_; GdkPixbuf* histogram_graphic = NULL; RGBHistogram* _tmp1_; GdkPixbuf* _tmp2_; - cairo_t* _tmp3_; - GdkPixbuf* _tmp4_; - GdkRectangle _tmp5_; - gint _tmp6_; - GdkRectangle _tmp7_; + GdkPixbuf* _tmp3_; + GdkRectangle _tmp4_; + gint _tmp5_; + GdkRectangle _tmp6_; + gint _tmp7_; gint _tmp8_; - cairo_t* _tmp9_; - gint _tmp10_; - gint _tmp22_; + gint _tmp17_; #line 239 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self)); #line 239 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" @@ -1131,7 +1067,7 @@ static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* s if (_tmp0_ == NULL) { #line 241 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return; -#line 1135 "RGBHistogramManipulator.c" +#line 1071 "RGBHistogramManipulator.c" } #line 243 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" _tmp1_ = self->priv->histogram; @@ -1140,155 +1076,129 @@ static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* s #line 243 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" histogram_graphic = _tmp2_; #line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp3_ = ctx; -#line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp4_ = histogram_graphic; + _tmp3_ = histogram_graphic; #line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp5_ = *area; + _tmp4_ = *area; #line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp6_ = _tmp5_.x; + _tmp5_ = _tmp4_.x; #line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp7_ = *area; + _tmp6_ = *area; #line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp8_ = _tmp7_.y; + _tmp7_ = _tmp6_.y; #line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - gdk_cairo_set_source_pixbuf (_tmp3_, _tmp4_, (gdouble) (_tmp6_ + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp8_ + 2)); + gdk_cairo_set_source_pixbuf (ctx, _tmp3_, (gdouble) (_tmp5_ + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp7_ + 2)); #line 246 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp9_ = ctx; -#line 246 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - cairo_paint (_tmp9_); + cairo_paint (ctx); #line 248 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp10_ = self->priv->left_nub_position; + _tmp8_ = self->priv->left_nub_position; #line 248 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if (_tmp10_ > 0) { -#line 1165 "RGBHistogramManipulator.c" - cairo_t* _tmp11_; - GdkRectangle _tmp12_; + if (_tmp8_ > 0) { +#line 1097 "RGBHistogramManipulator.c" + GdkRectangle _tmp9_; + gint _tmp10_; + GdkRectangle _tmp11_; + gint _tmp12_; gint _tmp13_; - GdkRectangle _tmp14_; + GdkPixbuf* _tmp14_; gint _tmp15_; gint _tmp16_; - GdkPixbuf* _tmp17_; - gint _tmp18_; - gint _tmp19_; - cairo_t* _tmp20_; - cairo_t* _tmp21_; -#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp11_ = ctx; #line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp12_ = *area; + _tmp9_ = *area; #line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp13_ = _tmp12_.x; + _tmp10_ = _tmp9_.x; #line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp14_ = *area; + _tmp11_ = *area; #line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp15_ = _tmp14_.y; + _tmp12_ = _tmp11_.y; #line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp16_ = self->priv->left_nub_position; + _tmp13_ = self->priv->left_nub_position; #line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp17_ = histogram_graphic; + _tmp14_ = histogram_graphic; #line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp18_ = gdk_pixbuf_get_height (_tmp17_); + _tmp15_ = gdk_pixbuf_get_height (_tmp14_); #line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp19_ = _tmp18_; + _tmp16_ = _tmp15_; #line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - cairo_rectangle (_tmp11_, (gdouble) (_tmp13_ + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp15_ + 2), (gdouble) _tmp16_, (gdouble) _tmp19_); -#line 252 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp20_ = ctx; + cairo_rectangle (ctx, (gdouble) (_tmp10_ + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp12_ + 2), (gdouble) _tmp13_, (gdouble) _tmp16_); #line 252 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - cairo_set_source_rgba (_tmp20_, 0.0, 0.0, 0.0, 0.45); + cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 0.45); #line 253 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp21_ = ctx; -#line 253 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - cairo_fill (_tmp21_); -#line 1205 "RGBHistogramManipulator.c" + cairo_fill (ctx); +#line 1128 "RGBHistogramManipulator.c" } #line 256 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp22_ = self->priv->right_nub_position; + _tmp17_ = self->priv->right_nub_position; #line 256 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if (_tmp22_ < 255) { -#line 1211 "RGBHistogramManipulator.c" - cairo_t* _tmp23_; - GdkRectangle _tmp24_; + if (_tmp17_ < 255) { +#line 1134 "RGBHistogramManipulator.c" + GdkRectangle _tmp18_; + gint _tmp19_; + gint _tmp20_; + GdkRectangle _tmp21_; + gint _tmp22_; + GdkPixbuf* _tmp23_; + gint _tmp24_; gint _tmp25_; gint _tmp26_; - GdkRectangle _tmp27_; + GdkPixbuf* _tmp27_; gint _tmp28_; - GdkPixbuf* _tmp29_; - gint _tmp30_; - gint _tmp31_; - gint _tmp32_; - GdkPixbuf* _tmp33_; - gint _tmp34_; - gint _tmp35_; - cairo_t* _tmp36_; - cairo_t* _tmp37_; + gint _tmp29_; #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp23_ = ctx; + _tmp18_ = *area; #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp24_ = *area; + _tmp19_ = _tmp18_.x; #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp25_ = _tmp24_.x; -#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp26_ = self->priv->right_nub_position; + _tmp20_ = self->priv->right_nub_position; #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp27_ = *area; + _tmp21_ = *area; #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp28_ = _tmp27_.y; + _tmp22_ = _tmp21_.y; #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp29_ = histogram_graphic; + _tmp23_ = histogram_graphic; #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp30_ = gdk_pixbuf_get_width (_tmp29_); + _tmp24_ = gdk_pixbuf_get_width (_tmp23_); #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp31_ = _tmp30_; + _tmp25_ = _tmp24_; #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp32_ = self->priv->right_nub_position; + _tmp26_ = self->priv->right_nub_position; #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp33_ = histogram_graphic; + _tmp27_ = histogram_graphic; #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp34_ = gdk_pixbuf_get_height (_tmp33_); + _tmp28_ = gdk_pixbuf_get_height (_tmp27_); #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp35_ = _tmp34_; + _tmp29_ = _tmp28_; #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - cairo_rectangle (_tmp23_, (gdouble) ((_tmp25_ + _tmp26_) + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp28_ + 2), (gdouble) (_tmp31_ - _tmp32_), (gdouble) _tmp35_); -#line 261 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp36_ = ctx; + cairo_rectangle (ctx, (gdouble) ((_tmp19_ + _tmp20_) + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp22_ + 2), (gdouble) (_tmp25_ - _tmp26_), (gdouble) _tmp29_); #line 261 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - cairo_set_source_rgba (_tmp36_, 1.0, 1.0, 1.0, 0.45); -#line 262 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp37_ = ctx; + cairo_set_source_rgba (ctx, 1.0, 1.0, 1.0, 0.45); #line 262 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - cairo_fill (_tmp37_); -#line 1263 "RGBHistogramManipulator.c" + cairo_fill (ctx); +#line 1177 "RGBHistogramManipulator.c" } #line 239 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" _g_object_unref0 (histogram_graphic); -#line 1267 "RGBHistogramManipulator.c" +#line 1181 "RGBHistogramManipulator.c" } -static void rgb_histogram_manipulator_draw_nub (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area, gint position) { - cairo_t* _tmp0_; - GdkRectangle _tmp1_; - gint _tmp2_; +static void +rgb_histogram_manipulator_draw_nub (RGBHistogramManipulator* self, + cairo_t* ctx, + GdkRectangle* area, + gint position) +{ + GdkRectangle _tmp0_; + gint _tmp1_; + GdkRectangle _tmp2_; gint _tmp3_; GdkRectangle _tmp4_; gint _tmp5_; - cairo_t* _tmp6_; - GdkRectangle _tmp7_; - gint _tmp8_; + GdkRectangle _tmp6_; + gint _tmp7_; + GdkRectangle _tmp8_; gint _tmp9_; GdkRectangle _tmp10_; gint _tmp11_; - cairo_t* _tmp12_; - GdkRectangle _tmp13_; - gint _tmp14_; - gint _tmp15_; - GdkRectangle _tmp16_; - gint _tmp17_; - cairo_t* _tmp18_; - cairo_t* _tmp19_; - cairo_t* _tmp20_; #line 266 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self)); #line 266 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" @@ -1296,64 +1206,48 @@ static void rgb_histogram_manipulator_draw_nub (RGBHistogramManipulator* self, c #line 266 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" g_return_if_fail (area != NULL); #line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp0_ = ctx; -#line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp1_ = *area; -#line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp2_ = _tmp1_.x; + _tmp0_ = *area; #line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp3_ = position; + _tmp1_ = _tmp0_.x; #line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp4_ = *area; + _tmp2_ = *area; #line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp5_ = _tmp4_.y; + _tmp3_ = _tmp2_.y; #line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - cairo_move_to (_tmp0_, (gdouble) (_tmp2_ + _tmp3_), (gdouble) ((_tmp5_ + RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION) + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE)); -#line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp6_ = ctx; -#line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp7_ = *area; + cairo_move_to (ctx, (gdouble) (_tmp1_ + position), (gdouble) ((_tmp3_ + RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION) + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE)); #line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp8_ = _tmp7_.x; + _tmp4_ = *area; #line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp9_ = position; + _tmp5_ = _tmp4_.x; #line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp10_ = *area; + _tmp6_ = *area; #line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp11_ = _tmp10_.y; + _tmp7_ = _tmp6_.y; #line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - cairo_line_to (_tmp6_, (gdouble) ((_tmp8_ + _tmp9_) + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp11_ + RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION)); + cairo_line_to (ctx, (gdouble) ((_tmp5_ + position) + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp7_ + RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION)); #line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp12_ = ctx; + _tmp8_ = *area; #line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp13_ = *area; + _tmp9_ = _tmp8_.x; #line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp14_ = _tmp13_.x; -#line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp15_ = position; -#line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp16_ = *area; + _tmp10_ = *area; #line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp17_ = _tmp16_.y; + _tmp11_ = _tmp10_.y; #line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - cairo_line_to (_tmp12_, (gdouble) ((_tmp14_ + _tmp15_) + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE), (gdouble) ((_tmp17_ + RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION) + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE)); -#line 270 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp18_ = ctx; + cairo_line_to (ctx, (gdouble) ((_tmp9_ + position) + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE), (gdouble) ((_tmp11_ + RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION) + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE)); #line 270 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - cairo_close_path (_tmp18_); + cairo_close_path (ctx); #line 271 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp19_ = ctx; -#line 271 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - cairo_set_source_rgb (_tmp19_, 0.333, 0.333, 0.333); -#line 272 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp20_ = ctx; + cairo_set_source_rgb (ctx, 0.333, 0.333, 0.333); #line 272 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - cairo_fill (_tmp20_); -#line 1353 "RGBHistogramManipulator.c" + cairo_fill (ctx); +#line 1245 "RGBHistogramManipulator.c" } -static void rgb_histogram_manipulator_force_update (RGBHistogramManipulator* self) { +static void +rgb_histogram_manipulator_force_update (RGBHistogramManipulator* self) +{ GdkWindow* _tmp0_; #line 275 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self)); @@ -1361,11 +1255,13 @@ static void rgb_histogram_manipulator_force_update (RGBHistogramManipulator* sel _tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 276 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" gdk_window_invalidate_rect (_tmp0_, NULL, TRUE); -#line 1365 "RGBHistogramManipulator.c" +#line 1259 "RGBHistogramManipulator.c" } -static void rgb_histogram_manipulator_update_nub_extrema (RGBHistogramManipulator* self) { +static void +rgb_histogram_manipulator_update_nub_extrema (RGBHistogramManipulator* self) +{ gint _tmp0_; gint _tmp1_; #line 279 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" @@ -1378,32 +1274,34 @@ static void rgb_histogram_manipulator_update_nub_extrema (RGBHistogramManipulato _tmp1_ = self->priv->right_nub_position; #line 281 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" self->priv->left_nub_max = (_tmp1_ - RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) - 1; -#line 1382 "RGBHistogramManipulator.c" +#line 1278 "RGBHistogramManipulator.c" } -void rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self, GdkPixbuf* source_pixbuf) { - GdkPixbuf* _tmp0_; - RGBHistogram* _tmp1_; +void +rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self, + GdkPixbuf* source_pixbuf) +{ + RGBHistogram* _tmp0_; #line 286 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self)); #line 286 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" g_return_if_fail (GDK_IS_PIXBUF (source_pixbuf)); #line 287 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp0_ = source_pixbuf; -#line 287 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp1_ = rgb_histogram_new (_tmp0_); + _tmp0_ = rgb_histogram_new (source_pixbuf); #line 287 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" _rgb_histogram_unref0 (self->priv->histogram); #line 287 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - self->priv->histogram = _tmp1_; + self->priv->histogram = _tmp0_; #line 288 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" rgb_histogram_manipulator_force_update (self); -#line 1403 "RGBHistogramManipulator.c" +#line 1299 "RGBHistogramManipulator.c" } -gint rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* self) { +gint +rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* self) +{ gint result = 0; gint _tmp0_; #line 291 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" @@ -1414,11 +1312,13 @@ gint rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* s result = _tmp0_; #line 292 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 1418 "RGBHistogramManipulator.c" +#line 1316 "RGBHistogramManipulator.c" } -gint rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator* self) { +gint +rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator* self) +{ gint result = 0; gint _tmp0_; #line 295 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" @@ -1429,91 +1329,73 @@ gint rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator* result = _tmp0_; #line 296 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" return result; -#line 1433 "RGBHistogramManipulator.c" +#line 1333 "RGBHistogramManipulator.c" } -void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self, gint user_nub_pos) { +void +rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self, + gint user_nub_pos) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; - gint _tmp3_; - gint _tmp4_; - gint _tmp5_; #line 299 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self)); #line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp1_ = user_nub_pos; -#line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if (_tmp1_ >= 0) { -#line 1449 "RGBHistogramManipulator.c" - gint _tmp2_; + if (user_nub_pos >= 0) { #line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp2_ = user_nub_pos; -#line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp0_ = _tmp2_ <= 255; -#line 1455 "RGBHistogramManipulator.c" + _tmp0_ = user_nub_pos <= 255; +#line 1349 "RGBHistogramManipulator.c" } else { #line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" _tmp0_ = FALSE; -#line 1459 "RGBHistogramManipulator.c" +#line 1353 "RGBHistogramManipulator.c" } #line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" _vala_assert (_tmp0_, "(user_nub_pos >= 0) && (user_nub_pos <= 255)"); #line 301 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp3_ = user_nub_pos; -#line 301 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp4_ = self->priv->left_nub_max; + _tmp1_ = self->priv->left_nub_max; #line 301 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp5_ = CLAMP (_tmp3_, 0, _tmp4_); -#line 301 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - self->priv->left_nub_position = _tmp5_; + self->priv->left_nub_position = CLAMP (user_nub_pos, 0, _tmp1_); #line 302 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" rgb_histogram_manipulator_update_nub_extrema (self); -#line 1473 "RGBHistogramManipulator.c" +#line 1363 "RGBHistogramManipulator.c" } -void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self, gint user_nub_pos) { +void +rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self, + gint user_nub_pos) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; - gint _tmp3_; - gint _tmp4_; - gint _tmp5_; #line 305 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self)); #line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp1_ = user_nub_pos; -#line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - if (_tmp1_ >= 0) { -#line 1489 "RGBHistogramManipulator.c" - gint _tmp2_; -#line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp2_ = user_nub_pos; + if (user_nub_pos >= 0) { #line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp0_ = _tmp2_ <= 255; -#line 1495 "RGBHistogramManipulator.c" + _tmp0_ = user_nub_pos <= 255; +#line 1379 "RGBHistogramManipulator.c" } else { #line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" _tmp0_ = FALSE; -#line 1499 "RGBHistogramManipulator.c" +#line 1383 "RGBHistogramManipulator.c" } #line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" _vala_assert (_tmp0_, "(user_nub_pos >= 0) && (user_nub_pos <= 255)"); #line 307 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp3_ = user_nub_pos; -#line 307 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp4_ = self->priv->right_nub_min; -#line 307 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - _tmp5_ = CLAMP (_tmp3_, _tmp4_, 255); + _tmp1_ = self->priv->right_nub_min; #line 307 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" - self->priv->right_nub_position = _tmp5_; + self->priv->right_nub_position = CLAMP (user_nub_pos, _tmp1_, 255); #line 308 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" rgb_histogram_manipulator_update_nub_extrema (self); -#line 1513 "RGBHistogramManipulator.c" +#line 1393 "RGBHistogramManipulator.c" } -static void rgb_histogram_manipulator_class_init (RGBHistogramManipulatorClass * klass) { +static void +rgb_histogram_manipulator_class_init (RGBHistogramManipulatorClass * klass) +{ GtkWidgetPath* _tmp0_; GtkWidgetPath* _tmp1_; #line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" @@ -1538,11 +1420,13 @@ static void rgb_histogram_manipulator_class_init (RGBHistogramManipulatorClass * _tmp1_ = gtk_widget_path_new (); #line 24 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" rgb_histogram_manipulator_frame_draw_path = _tmp1_; -#line 1542 "RGBHistogramManipulator.c" +#line 1424 "RGBHistogramManipulator.c" } -static void rgb_histogram_manipulator_instance_init (RGBHistogramManipulator * self) { +static void +rgb_histogram_manipulator_instance_init (RGBHistogramManipulator * self) +{ #line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" self->priv = RGB_HISTOGRAM_MANIPULATOR_GET_PRIVATE (self); #line 20 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" @@ -1565,11 +1449,13 @@ static void rgb_histogram_manipulator_instance_init (RGBHistogramManipulator * s self->priv->track_nub_start_position = 0; #line 34 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" self->priv->offset = 0; -#line 1569 "RGBHistogramManipulator.c" +#line 1453 "RGBHistogramManipulator.c" } -static void rgb_histogram_manipulator_finalize (GObject * obj) { +static void +rgb_histogram_manipulator_finalize (GObject * obj) +{ RGBHistogramManipulator * self; #line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator); @@ -1577,11 +1463,13 @@ static void rgb_histogram_manipulator_finalize (GObject * obj) { _rgb_histogram_unref0 (self->priv->histogram); #line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala" G_OBJECT_CLASS (rgb_histogram_manipulator_parent_class)->finalize (obj); -#line 1581 "RGBHistogramManipulator.c" +#line 1467 "RGBHistogramManipulator.c" } -GType rgb_histogram_manipulator_get_type (void) { +GType +rgb_histogram_manipulator_get_type (void) +{ static volatile gsize rgb_histogram_manipulator_type_id__volatile = 0; if (g_once_init_enter (&rgb_histogram_manipulator_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RGBHistogramManipulatorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) rgb_histogram_manipulator_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RGBHistogramManipulator), 0, (GInstanceInitFunc) rgb_histogram_manipulator_instance_init, NULL }; diff --git a/src/editing_tools/StraightenTool.c b/src/editing_tools/StraightenTool.c index 11bf36a..9d00c58 100644 --- a/src/editing_tools/StraightenTool.c +++ b/src/editing_tools/StraightenTool.c @@ -1,4 +1,4 @@ -/* StraightenTool.c generated by valac 0.36.6, the Vala compiler +/* StraightenTool.c generated by valac 0.40.4, the Vala compiler * generated from StraightenTool.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -229,6 +230,11 @@ typedef struct _Box Box; #define _editing_tools_photo_canvas_unref0(var) ((var == NULL) ? NULL : (var = (editing_tools_photo_canvas_unref (var), NULL))) typedef struct _EditingToolsStraightenToolStraightenGuidePrivate EditingToolsStraightenToolStraightenGuidePrivate; typedef struct _EditingToolsStraightenToolParamSpecStraightenGuide EditingToolsStraightenToolParamSpecStraightenGuide; +enum { + EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_0_PROPERTY, + EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_NUM_PROPERTIES +}; +static GParamSpec* editing_tools_straighten_tool_straighten_tool_window_properties[EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_NUM_PROPERTIES]; #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; } @@ -386,16 +392,28 @@ static gpointer editing_tools_straighten_tool_straighten_tool_window_parent_clas gpointer editing_tools_editing_tool_ref (gpointer instance); void editing_tools_editing_tool_unref (gpointer instance); -GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void editing_tools_value_set_editing_tool (GValue* value, gpointer v_object); -void editing_tools_value_take_editing_tool (GValue* value, gpointer v_object); +GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void editing_tools_value_set_editing_tool (GValue* value, + gpointer v_object); +void editing_tools_value_take_editing_tool (GValue* value, + gpointer v_object); gpointer editing_tools_value_get_editing_tool (const GValue* value); GType editing_tools_editing_tool_get_type (void) G_GNUC_CONST; gpointer editing_tools_photo_canvas_ref (gpointer instance); void editing_tools_photo_canvas_unref (gpointer instance); -GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void editing_tools_value_set_photo_canvas (GValue* value, gpointer v_object); -void editing_tools_value_take_photo_canvas (GValue* value, gpointer v_object); +GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void editing_tools_value_set_photo_canvas (GValue* value, + gpointer v_object); +void editing_tools_value_take_photo_canvas (GValue* value, + gpointer v_object); gpointer editing_tools_value_get_photo_canvas (const GValue* value); GType editing_tools_photo_canvas_get_type (void) G_GNUC_CONST; GType editing_tools_editing_tool_window_get_type (void) G_GNUC_CONST; @@ -416,22 +434,31 @@ GType editing_tools_straighten_tool_get_type (void) G_GNUC_CONST; static GType editing_tools_straighten_tool_straighten_tool_window_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; gpointer one_shot_scheduler_ref (gpointer instance); void one_shot_scheduler_unref (gpointer instance); -GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_one_shot_scheduler (GValue* value, gpointer v_object); -void value_take_one_shot_scheduler (GValue* value, gpointer v_object); +GParamSpec* param_spec_one_shot_scheduler (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_one_shot_scheduler (GValue* value, + gpointer v_object); +void value_take_one_shot_scheduler (GValue* value, + gpointer v_object); gpointer value_get_one_shot_scheduler (const GValue* value); GType one_shot_scheduler_get_type (void) G_GNUC_CONST; static gpointer editing_tools_straighten_tool_straighten_guide_ref (gpointer instance); static void editing_tools_straighten_tool_straighten_guide_unref (gpointer instance); -static GParamSpec* editing_tools_straighten_tool_param_spec_straighten_guide (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; -static void editing_tools_straighten_tool_value_set_straighten_guide (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void editing_tools_straighten_tool_value_take_straighten_guide (GValue* value, gpointer v_object) G_GNUC_UNUSED; +static GParamSpec* editing_tools_straighten_tool_param_spec_straighten_guide (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) G_GNUC_UNUSED; +static void editing_tools_straighten_tool_value_set_straighten_guide (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void editing_tools_straighten_tool_value_take_straighten_guide (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer editing_tools_straighten_tool_value_get_straighten_guide (const GValue* value) G_GNUC_UNUSED; static GType editing_tools_straighten_tool_straighten_guide_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define EDITING_TOOLS_STRAIGHTEN_TOOL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenToolPrivate)) -enum { - EDITING_TOOLS_STRAIGHTEN_TOOL_DUMMY_PROPERTY -}; static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_straighten_guide_new (void); static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_straighten_guide_construct (GType object_type); #define EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_ANGLE (-15.0) @@ -444,12 +471,19 @@ static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_ #define EDITING_TOOLS_STRAIGHTEN_TOOL_REPAINT_ON_STOP_DELAY_MSEC 100 static EditingToolsStraightenTool* editing_tools_straighten_tool_new (void); static EditingToolsStraightenTool* editing_tools_straighten_tool_construct (GType object_type); -EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type, const gchar* name); +EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type, + const gchar* name); EditingToolsStraightenTool* editing_tools_straighten_tool_factory (void); -gboolean editing_tools_straighten_tool_is_available (Photo* photo, Scaling* scaling); +gboolean editing_tools_straighten_tool_is_available (Photo* photo, + Scaling* scaling); static void editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenTool* self); Photo* editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self); -void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, gboolean invert, GdkPoint* result); +void rotate_point_arb (GdkPoint* source_point, + gint img_w, + gint img_h, + gdouble angle, + gboolean invert, + GdkPoint* result); GType command_get_type (void) G_GNUC_CONST; GType page_command_get_type (void) G_GNUC_CONST; GType single_data_source_command_get_type (void) G_GNUC_CONST; @@ -458,113 +492,213 @@ GType straighten_command_get_type (void) G_GNUC_CONST; GType box_get_type (void) G_GNUC_CONST; Box* box_dup (const Box* self); void box_free (Box* self); -void box_from_center (GdkPoint* center, gint width, gint height, Box* result); +void box_from_center (GdkPoint* center, + gint width, + gint height, + Box* result); #define RESOURCES_STRAIGHTEN_LABEL _ ("Straighten") #define RESOURCES_STRAIGHTEN_TOOLTIP _ ("Straighten the photo") -StraightenCommand* straighten_command_new (Photo* photo, gdouble theta, Box* crop, const gchar* name, const gchar* explanation); -StraightenCommand* straighten_command_construct (GType object_type, Photo* photo, gdouble theta, Box* crop, const gchar* name, const gchar* explanation); +StraightenCommand* straighten_command_new (Photo* photo, + gdouble theta, + Box* crop, + const gchar* name, + const gchar* explanation); +StraightenCommand* straighten_command_construct (GType object_type, + Photo* photo, + gdouble theta, + Box* crop, + const gchar* name, + const gchar* explanation); static void editing_tools_straighten_tool_high_qual_repaint (EditingToolsStraightenTool* self); static void editing_tools_straighten_tool_update_rotated_surface (EditingToolsStraightenTool* self); void editing_tools_photo_canvas_repaint (EditingToolsPhotoCanvas* self); static void editing_tools_straighten_tool_on_slider_stopped_delayed (EditingToolsStraightenTool* self); -static void editing_tools_straighten_tool_real_on_left_click (EditingToolsEditingTool* base, gint x, gint y); -static void editing_tools_straighten_tool_straighten_guide_reset (EditingToolsStraightenToolStraightenGuide* self, gint x, gint y, gdouble angle); -static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y); -static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingToolsStraightenToolStraightenGuide* self, gint x, gint y); +static void editing_tools_straighten_tool_real_on_left_click (EditingToolsEditingTool* base, + gint x, + gint y); +static void editing_tools_straighten_tool_straighten_guide_reset (EditingToolsStraightenToolStraightenGuide* self, + gint x, + gint y, + gdouble angle); +static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEditingTool* base, + gint x, + gint y); +static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingToolsStraightenToolStraightenGuide* self, + gint x, + gint y); static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (EditingToolsStraightenToolStraightenGuide* self); static void editing_tools_straighten_tool_straighten_guide_clear (EditingToolsStraightenToolStraightenGuide* self); -static void editing_tools_straighten_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask); -static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEditingTool* base, GdkEventKey* event); +static void editing_tools_straighten_tool_real_on_motion (EditingToolsEditingTool* base, + gint x, + gint y, + GdkModifierType mask); +static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEditingTool* base, + GdkEventKey* event); void editing_tools_editing_tool_notify_cancel (EditingToolsEditingTool* self); -gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self, GdkEventKey* event); +gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self, + GdkEventKey* event); static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenTool* self); -void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self, Dimensions* result); -void dimensions_with_max (Dimensions *self, gint max_width, gint max_height, Dimensions* result); -static gboolean _dimensions_equal (const Dimensions * s1, const Dimensions * s2); +void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self, + Dimensions* result); +void dimensions_with_max (Dimensions *self, + gint max_width, + gint max_height, + Dimensions* result); +static gboolean _dimensions_equal (const Dimensions * s1, + const Dimensions * s2); GType photo_exception_get_type (void) G_GNUC_CONST; GType backing_fetch_mode_get_type (void) G_GNUC_CONST; -GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error); -void scaling_for_viewport (Dimensions* viewport, gboolean scale_up, Scaling* result); +GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, + Scaling* scaling, + PhotoException exceptions, + BackingFetchMode fetch_mode, + GError** error); +void scaling_for_viewport (Dimensions* viewport, + gboolean scale_up, + Scaling* result); gchar* data_object_to_string (DataObject* self); -void paint_pixmap_with_background (cairo_t* ctx, GdkPixbuf* pixbuf, gint x, gint y); +void paint_pixmap_with_background (cairo_t* ctx, + GdkPixbuf* pixbuf, + gint x, + gint y); static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStraightenTool* self); -void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble angle, gdouble* dest_width, gdouble* dest_height); -static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas); -void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, EditingToolsPhotoCanvas* canvas); -static void editing_tools_straighten_tool_bind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas); -void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result); -gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions); -gboolean photo_get_straighten (Photo* self, gdouble* theta); -void derotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, GdkPoint* result); -void box_get_center (Box *self, GdkPoint* result); +void compute_arb_rotated_size (gdouble src_width, + gdouble src_height, + gdouble angle, + gdouble* dest_width, + gdouble* dest_height); +static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool* base, + EditingToolsPhotoCanvas* canvas); +void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, + EditingToolsPhotoCanvas* canvas); +static void editing_tools_straighten_tool_bind_canvas_handlers (EditingToolsStraightenTool* self, + EditingToolsPhotoCanvas* canvas); +void media_source_get_dimensions (MediaSource* self, + PhotoException disallowed_steps, + Dimensions* result); +gboolean photo_get_crop (Photo* self, + Box* crop, + PhotoException exceptions); +gboolean photo_get_straighten (Photo* self, + gdouble* theta); +void derotate_point_arb (GdkPoint* source_point, + gint img_w, + gint img_h, + gdouble angle, + GdkPoint* result); +void box_get_center (Box *self, + GdkPoint* result); gint box_get_width (Box *self); gint box_get_height (Box *self); GdkWindow* editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanvas* self); GtkWindow* editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* self); static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_tool_straighten_tool_window_new (GtkWindow* container); -static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_tool_straighten_tool_window_construct (GType object_type, GtkWindow* container); +static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_tool_straighten_tool_window_construct (GType object_type, + GtkWindow* container); static void editing_tools_straighten_tool_bind_window_handlers (EditingToolsStraightenTool* self); static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTool* base); static void editing_tools_straighten_tool_unbind_window_handlers (EditingToolsStraightenTool* self); -static void editing_tools_straighten_tool_unbind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas); +static void editing_tools_straighten_tool_unbind_canvas_handlers (EditingToolsStraightenTool* self, + EditingToolsPhotoCanvas* canvas); void editing_tools_editing_tool_deactivate (EditingToolsEditingTool* self); -static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraightenTool* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position); -static void _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self); -static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self); -static void _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); -static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraightenTool* self, + Dimensions* old_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position); +static void _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, + Dimensions* old_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position, + gpointer self); +static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, + GdkEventKey* event, + gpointer self); +static void _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self); +static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, + gpointer self); static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraightenTool* self); -static void _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self); +static void _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed (GtkRange* _sender, + gpointer self); static void _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback (gpointer self); -OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target); -OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target); -void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule); +OneShotScheduler* one_shot_scheduler_new (const gchar* name, + OneShotCallback callback, + void* callback_target); +OneShotScheduler* one_shot_scheduler_construct (GType object_type, + const gchar* name, + OneShotCallback callback, + void* callback_target); +void one_shot_scheduler_after_timeout (OneShotScheduler* self, + guint msec, + gboolean reschedule); static EditingToolsEditingToolWindow* editing_tools_straighten_tool_real_get_tool_window (EditingToolsEditingTool* base); -static void editing_tools_straighten_tool_draw_rotated_source (EditingToolsStraightenTool* self, cairo_surface_t* src_surf, cairo_t* dest_ctx, gint src_width, gint src_height, gdouble angle); -static void editing_tools_straighten_tool_draw_superimposed_grid (EditingToolsStraightenTool* self, cairo_t* dest_ctx, gint width, gint height); -static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx); +static void editing_tools_straighten_tool_draw_rotated_source (EditingToolsStraightenTool* self, + cairo_surface_t* src_surf, + cairo_t* dest_ctx, + gint src_width, + gint src_height, + gdouble angle); +static void editing_tools_straighten_tool_draw_superimposed_grid (EditingToolsStraightenTool* self, + cairo_t* dest_ctx, + gint width, + gint height); +static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* base, + cairo_t* ctx); cairo_t* editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* self); -static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStraightenToolStraightenGuide* self, cairo_t* ctx); +static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStraightenToolStraightenGuide* self, + cairo_t* ctx); gdouble degrees_to_radians (gdouble theta); -void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint x, gint y, gint width, gboolean use_scaled_pos); -void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint x, gint y, gint height, gboolean use_scaled_pos); +void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* self, + cairo_t* ctx, + gint x, + gint y, + gint width, + gboolean use_scaled_pos); +void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* self, + cairo_t* ctx, + gint x, + gint y, + gint height, + gboolean use_scaled_pos); #define EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_GUIDE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE, EditingToolsStraightenToolStraightenGuidePrivate)) -enum { - EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_GUIDE_DUMMY_PROPERTY -}; static gdouble* _double_dup (gdouble* self); static void editing_tools_straighten_tool_straighten_guide_finalize (EditingToolsStraightenToolStraightenGuide * obj); -enum { - EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_DUMMY_PROPERTY -}; #define RESOURCES_CANCEL_LABEL _ ("_Cancel") #define EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING 8 -EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GType object_type, GtkWindow* container); +EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GType object_type, + GtkWindow* container); static void editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked (EditingToolsStraightenToolStraightenToolWindow* self); -static void _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self); static void editing_tools_straighten_tool_straighten_tool_window_finalize (GObject * obj); static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool * obj); static const gdouble EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH[2] = {(gdouble) 10, (gdouble) 10}; -static EditingToolsStraightenTool* editing_tools_straighten_tool_construct (GType object_type) { +static EditingToolsStraightenTool* +editing_tools_straighten_tool_construct (GType object_type) +{ EditingToolsStraightenTool* self = NULL; #line 190 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = (EditingToolsStraightenTool*) editing_tools_editing_tool_construct (object_type, "StraightenTool"); #line 189 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return self; -#line 557 "StraightenTool.c" +#line 687 "StraightenTool.c" } -static EditingToolsStraightenTool* editing_tools_straighten_tool_new (void) { +static EditingToolsStraightenTool* +editing_tools_straighten_tool_new (void) +{ #line 189 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return editing_tools_straighten_tool_construct (EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL); -#line 564 "StraightenTool.c" +#line 696 "StraightenTool.c" } -EditingToolsStraightenTool* editing_tools_straighten_tool_factory (void) { +EditingToolsStraightenTool* +editing_tools_straighten_tool_factory (void) +{ EditingToolsStraightenTool* result = NULL; EditingToolsStraightenTool* _tmp0_; #line 194 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -573,11 +707,14 @@ EditingToolsStraightenTool* editing_tools_straighten_tool_factory (void) { result = _tmp0_; #line 194 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 577 "StraightenTool.c" +#line 711 "StraightenTool.c" } -gboolean editing_tools_straighten_tool_is_available (Photo* photo, Scaling* scaling) { +gboolean +editing_tools_straighten_tool_is_available (Photo* photo, + Scaling* scaling) +{ gboolean result = FALSE; #line 197 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_val_if_fail (IS_PHOTO (photo), FALSE); @@ -587,7 +724,7 @@ gboolean editing_tools_straighten_tool_is_available (Photo* photo, Scaling* scal result = TRUE; #line 198 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 591 "StraightenTool.c" +#line 728 "StraightenTool.c" } @@ -599,34 +736,35 @@ gboolean editing_tools_straighten_tool_is_available (Photo* photo, Scaling* scal * case of a previously-uncropped Photo, the crop region will be set to the original dimensions * of the photo and centered at the Photo's center. */ -static void editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenTool* self) { +static void +editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenTool* self) +{ EditingToolsPhotoCanvas* _tmp0_; Photo* _tmp1_; Photo* _tmp2_; gdouble slider_val = 0.0; EditingToolsStraightenToolStraightenToolWindow* _tmp3_; GtkScale* _tmp4_; - gdouble _tmp5_; GdkPoint new_crop_center = {0}; - GdkPoint _tmp6_; - Dimensions _tmp7_; - gint _tmp8_; - Dimensions _tmp9_; - gint _tmp10_; - GdkPoint _tmp11_ = {0}; + GdkPoint _tmp5_; + Dimensions _tmp6_; + gint _tmp7_; + Dimensions _tmp8_; + gint _tmp9_; + GdkPoint _tmp10_ = {0}; StraightenCommand* command = NULL; - EditingToolsPhotoCanvas* _tmp12_; + EditingToolsPhotoCanvas* _tmp11_; + Photo* _tmp12_; Photo* _tmp13_; - Photo* _tmp14_; - GdkPoint _tmp15_; - gdouble _tmp16_; - gint _tmp17_; - gdouble _tmp18_; - gint _tmp19_; - Box _tmp20_ = {0}; + GdkPoint _tmp14_; + gdouble _tmp15_; + gint _tmp16_; + gdouble _tmp17_; + gint _tmp18_; + Box _tmp19_ = {0}; + StraightenCommand* _tmp20_; StraightenCommand* _tmp21_; - StraightenCommand* _tmp22_; - Dimensions _tmp23_; + Dimensions _tmp22_; #line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 210 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -644,60 +782,60 @@ static void editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenT #line 214 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = _tmp3_->angle_slider; #line 214 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange)); -#line 214 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - slider_val = _tmp5_; + slider_val = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange)); #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = self->priv->rotated_center; + _tmp5_ = self->priv->rotated_center; #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp7_ = self->priv->image_dims; + _tmp6_ = self->priv->image_dims; #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp8_ = _tmp7_.width; + _tmp7_ = _tmp6_.width; #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = self->priv->image_dims; + _tmp8_ = self->priv->image_dims; #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp10_ = _tmp9_.height; + _tmp9_ = _tmp8_.height; #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - rotate_point_arb (&_tmp6_, _tmp8_, _tmp10_, slider_val, FALSE, &_tmp11_); + rotate_point_arb (&_tmp5_, _tmp7_, _tmp9_, slider_val, FALSE, &_tmp10_); #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - new_crop_center = _tmp11_; + new_crop_center = _tmp10_; #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = editing_tools_photo_canvas_get_photo (_tmp12_); + _tmp12_ = editing_tools_photo_canvas_get_photo (_tmp11_); #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = new_crop_center; + _tmp14_ = new_crop_center; #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp16_ = self->priv->rotate_scale; + _tmp15_ = self->priv->rotate_scale; #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp17_ = self->priv->crop_width; + _tmp16_ = self->priv->crop_width; #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp18_ = self->priv->rotate_scale; + _tmp17_ = self->priv->rotate_scale; #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp19_ = self->priv->crop_height; + _tmp18_ = self->priv->crop_height; #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - box_from_center (&_tmp15_, (gint) (_tmp16_ * _tmp17_), (gint) (_tmp18_ * _tmp19_), &_tmp20_); + box_from_center (&_tmp14_, (gint) (_tmp15_ * _tmp16_), (gint) (_tmp17_ * _tmp18_), &_tmp19_); #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp21_ = straighten_command_new (_tmp14_, slider_val, &_tmp20_, RESOURCES_STRAIGHTEN_LABEL, RESOURCES_STRAIGHTEN_TOOLTIP); + _tmp20_ = straighten_command_new (_tmp13_, slider_val, &_tmp19_, RESOURCES_STRAIGHTEN_LABEL, RESOURCES_STRAIGHTEN_TOOLTIP); #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp13_); #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - command = _tmp22_; + command = _tmp21_; #line 224 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp23_ = self->priv->image_dims; + _tmp22_ = self->priv->image_dims; #line 224 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command), NULL, &_tmp23_, TRUE); + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command), NULL, &_tmp22_, TRUE); #line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (command); -#line 697 "StraightenTool.c" +#line 833 "StraightenTool.c" } -static void editing_tools_straighten_tool_high_qual_repaint (EditingToolsStraightenTool* self) { +static void +editing_tools_straighten_tool_high_qual_repaint (EditingToolsStraightenTool* self) +{ EditingToolsPhotoCanvas* _tmp0_; #line 227 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); @@ -709,186 +847,171 @@ static void editing_tools_straighten_tool_high_qual_repaint (EditingToolsStraigh _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 230 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_photo_canvas_repaint (_tmp0_); -#line 713 "StraightenTool.c" +#line 851 "StraightenTool.c" } -static void editing_tools_straighten_tool_on_slider_stopped_delayed (EditingToolsStraightenTool* self) { +static void +editing_tools_straighten_tool_on_slider_stopped_delayed (EditingToolsStraightenTool* self) +{ #line 233 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 234 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_high_qual_repaint (self); -#line 722 "StraightenTool.c" +#line 862 "StraightenTool.c" } -static void editing_tools_straighten_tool_real_on_left_click (EditingToolsEditingTool* base, gint x, gint y) { +static void +editing_tools_straighten_tool_real_on_left_click (EditingToolsEditingTool* base, + gint x, + gint y) +{ EditingToolsStraightenTool * self; EditingToolsStraightenToolStraightenGuide* _tmp0_; - gint _tmp1_; - gint _tmp2_; - gdouble _tmp3_; + gdouble _tmp1_; #line 237 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); #line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->priv->guide; #line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp1_ = x; -#line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = y; -#line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = self->priv->photo_angle; + _tmp1_ = self->priv->photo_angle; #line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_straighten_tool_straighten_guide_reset (_tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 744 "StraightenTool.c" + editing_tools_straighten_tool_straighten_guide_reset (_tmp0_, x, y, _tmp1_); +#line 882 "StraightenTool.c" } -static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y) { +static void +editing_tools_straighten_tool_real_on_left_released (EditingToolsEditingTool* base, + gint x, + gint y) +{ EditingToolsStraightenTool * self; EditingToolsStraightenToolStraightenGuide* _tmp0_; - gint _tmp1_; - gint _tmp2_; gdouble* a = NULL; + EditingToolsStraightenToolStraightenGuide* _tmp1_; + gdouble* _tmp2_; EditingToolsStraightenToolStraightenGuide* _tmp3_; gdouble* _tmp4_; - EditingToolsStraightenToolStraightenGuide* _tmp5_; - gdouble* _tmp6_; #line 241 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); #line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->priv->guide; #line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp1_ = x; -#line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = y; -#line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_straighten_tool_straighten_guide_update (_tmp0_, _tmp1_, _tmp2_); + editing_tools_straighten_tool_straighten_guide_update (_tmp0_, x, y); #line 243 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = self->priv->guide; + _tmp1_ = self->priv->guide; #line 243 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = editing_tools_straighten_tool_straighten_guide_get_angle (_tmp3_); + _tmp2_ = editing_tools_straighten_tool_straighten_guide_get_angle (_tmp1_); #line 243 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - a = _tmp4_; + a = _tmp2_; #line 244 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_ = self->priv->guide; + _tmp3_ = self->priv->guide; #line 244 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_straighten_tool_straighten_guide_clear (_tmp5_); + editing_tools_straighten_tool_straighten_guide_clear (_tmp3_); #line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = a; + _tmp4_ = a; #line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - if (_tmp6_ != NULL) { -#line 782 "StraightenTool.c" - EditingToolsStraightenToolStraightenToolWindow* _tmp7_; - GtkScale* _tmp8_; - gdouble* _tmp9_; + if (_tmp4_ != NULL) { +#line 918 "StraightenTool.c" + EditingToolsStraightenToolStraightenToolWindow* _tmp5_; + GtkScale* _tmp6_; + gdouble* _tmp7_; #line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp7_ = self->priv->window; + _tmp5_ = self->priv->window; #line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp8_ = _tmp7_->angle_slider; + _tmp6_ = _tmp5_->angle_slider; #line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = a; + _tmp7_ = a; #line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_range_get_type (), GtkRange), *_tmp9_); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange), *_tmp7_); #line 247 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_high_qual_repaint (self); -#line 796 "StraightenTool.c" +#line 932 "StraightenTool.c" } #line 241 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_free0 (a); -#line 800 "StraightenTool.c" +#line 936 "StraightenTool.c" } -static void editing_tools_straighten_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask) { +static void +editing_tools_straighten_tool_real_on_motion (EditingToolsEditingTool* base, + gint x, + gint y, + GdkModifierType mask) +{ EditingToolsStraightenTool * self; EditingToolsStraightenToolStraightenGuide* _tmp0_; - gint _tmp1_; - gint _tmp2_; - gboolean _tmp3_; #line 251 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); #line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->priv->guide; #line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp1_ = x; -#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = y; -#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = editing_tools_straighten_tool_straighten_guide_update (_tmp0_, _tmp1_, _tmp2_); -#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - if (_tmp3_) { -#line 822 "StraightenTool.c" - EditingToolsPhotoCanvas* _tmp4_; + if (editing_tools_straighten_tool_straighten_guide_update (_tmp0_, x, y)) { +#line 954 "StraightenTool.c" + EditingToolsPhotoCanvas* _tmp1_; #line 253 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 253 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_repaint (_tmp4_); -#line 828 "StraightenTool.c" + editing_tools_photo_canvas_repaint (_tmp1_); +#line 960 "StraightenTool.c" } } -static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEditingTool* base, GdkEventKey* event) { +static gboolean +editing_tools_straighten_tool_real_on_keypress (EditingToolsEditingTool* base, + GdkEventKey* event) +{ EditingToolsStraightenTool * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GdkEventKey* _tmp2_; - guint _tmp3_; - const gchar* _tmp4_; - GdkEventKey* _tmp11_; - guint _tmp12_; - const gchar* _tmp13_; - GdkEventKey* _tmp14_; - gboolean _tmp15_; + guint _tmp2_; + const gchar* _tmp3_; + guint _tmp8_; + const gchar* _tmp9_; #line 256 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); #line 256 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_val_if_fail (event != NULL, FALSE); #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = event; + _tmp2_ = event->keyval; #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = _tmp2_->keyval; + _tmp3_ = gdk_keyval_name (_tmp2_); #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = gdk_keyval_name (_tmp3_); -#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) { + if (g_strcmp0 (_tmp3_, "KP_Enter") == 0) { #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = TRUE; -#line 860 "StraightenTool.c" +#line 989 "StraightenTool.c" } else { - GdkEventKey* _tmp5_; - guint _tmp6_; - const gchar* _tmp7_; + guint _tmp4_; + const gchar* _tmp5_; #line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_ = event; + _tmp4_ = event->keyval; #line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = _tmp5_->keyval; + _tmp5_ = gdk_keyval_name (_tmp4_); #line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp7_ = gdk_keyval_name (_tmp6_); -#line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0; -#line 873 "StraightenTool.c" + _tmp1_ = g_strcmp0 (_tmp5_, "Enter") == 0; +#line 999 "StraightenTool.c" } #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp1_) { #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = TRUE; -#line 879 "StraightenTool.c" +#line 1005 "StraightenTool.c" } else { - GdkEventKey* _tmp8_; - guint _tmp9_; - const gchar* _tmp10_; -#line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp8_ = event; + guint _tmp6_; + const gchar* _tmp7_; #line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = _tmp8_->keyval; + _tmp6_ = event->keyval; #line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp10_ = gdk_keyval_name (_tmp9_); + _tmp7_ = gdk_keyval_name (_tmp6_); #line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0; -#line 892 "StraightenTool.c" + _tmp0_ = g_strcmp0 (_tmp7_, "Return") == 0; +#line 1015 "StraightenTool.c" } #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp0_) { @@ -898,74 +1021,73 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit result = TRUE; #line 261 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 902 "StraightenTool.c" +#line 1025 "StraightenTool.c" } #line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp11_ = event; + _tmp8_ = event->keyval; #line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = _tmp11_->keyval; + _tmp9_ = gdk_keyval_name (_tmp8_); #line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = gdk_keyval_name (_tmp12_); -#line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - if (g_strcmp0 (_tmp13_, "Escape") == 0) { + if (g_strcmp0 (_tmp9_, "Escape") == 0) { #line 265 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_editing_tool_notify_cancel (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)); #line 266 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" result = TRUE; #line 266 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 918 "StraightenTool.c" +#line 1039 "StraightenTool.c" } #line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = event; -#line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp14_); -#line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - result = _tmp15_; + result = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), event); #line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 928 "StraightenTool.c" +#line 1045 "StraightenTool.c" } -static gboolean _dimensions_equal (const Dimensions * s1, const Dimensions * s2) { +static gboolean +_dimensions_equal (const Dimensions * s1, + const Dimensions * s2) +{ #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (s1 == s2) { #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return TRUE; -#line 937 "StraightenTool.c" +#line 1057 "StraightenTool.c" } #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (s1 == NULL) { #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return FALSE; -#line 943 "StraightenTool.c" +#line 1063 "StraightenTool.c" } #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (s2 == NULL) { #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return FALSE; -#line 949 "StraightenTool.c" +#line 1069 "StraightenTool.c" } #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (s1->width != s2->width) { #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return FALSE; -#line 955 "StraightenTool.c" +#line 1075 "StraightenTool.c" } #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (s1->height != s2->height) { #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return FALSE; -#line 961 "StraightenTool.c" +#line 1081 "StraightenTool.c" } #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return TRUE; -#line 965 "StraightenTool.c" +#line 1085 "StraightenTool.c" } -static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenTool* self) { +static void +editing_tools_straighten_tool_prepare_image (EditingToolsStraightenTool* self) +{ Dimensions canvas_dims = {0}; EditingToolsPhotoCanvas* _tmp0_; Dimensions _tmp1_ = {0}; @@ -1022,7 +1144,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT if (_dimensions_equal (&_tmp3_, &_tmp4_) == TRUE) { #line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return; -#line 1026 "StraightenTool.c" +#line 1148 "StraightenTool.c" } #line 278 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = viewport; @@ -1030,7 +1152,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT self->priv->last_viewport = _tmp5_; #line 280 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" low_res_tmp = NULL; -#line 1034 "StraightenTool.c" +#line 1156 "StraightenTool.c" { GdkPixbuf* _tmp6_ = NULL; EditingToolsPhotoCanvas* _tmp7_; @@ -1061,7 +1183,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT _tmp6_ = _tmp13_; #line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1065 "StraightenTool.c" +#line 1187 "StraightenTool.c" goto __catch27_g_error; } #line 282 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1074,7 +1196,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT low_res_tmp = _tmp14_; #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp6_); -#line 1078 "StraightenTool.c" +#line 1200 "StraightenTool.c" } goto __finally27; __catch27_g_error: @@ -1114,7 +1236,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT low_res_tmp = _tmp20_; #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_error_free0 (e); -#line 1118 "StraightenTool.c" +#line 1240 "StraightenTool.c" } __finally27: #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1127,7 +1249,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT g_clear_error (&_inner_error_); #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return; -#line 1131 "StraightenTool.c" +#line 1253 "StraightenTool.c" } #line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp21_ = low_res_tmp; @@ -1205,11 +1327,13 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT _cairo_destroy0 (ctx); #line 272 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (low_res_tmp); -#line 1209 "StraightenTool.c" +#line 1331 "StraightenTool.c" } -static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStraightenTool* self) { +static void +editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStraightenTool* self) +{ gdouble width = 0.0; gdouble height = 0.0; gint _tmp0_; @@ -1222,23 +1346,19 @@ static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStrai Dimensions _tmp7_; gint _tmp8_; gdouble _tmp9_; - gdouble _tmp10_; - gdouble _tmp11_; - GdkPoint _tmp12_; + GdkPoint _tmp10_; gint radius_x = 0; - gdouble _tmp13_; + gdouble _tmp11_; gint radius_y = 0; - gdouble _tmp14_; - GdkPoint _tmp15_; + gdouble _tmp12_; + GdkPoint _tmp13_; + gint _tmp14_; + Dimensions _tmp15_; gint _tmp16_; - Dimensions _tmp17_; + GdkPoint _tmp17_; gint _tmp18_; - gint _tmp19_; - GdkPoint _tmp20_; - gint _tmp21_; - Dimensions _tmp22_; - gint _tmp23_; - gint _tmp24_; + Dimensions _tmp19_; + gint _tmp20_; #line 306 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1262,52 +1382,44 @@ static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStrai #line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = _tmp7_.height; #line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = MIN (_tmp6_ / width, _tmp8_ / height); -#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->rotate_scale = _tmp9_; -#line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp10_ = self->priv->rotate_scale; + self->priv->rotate_scale = MIN (_tmp6_ / width, _tmp8_ / height); #line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp11_ = MIN (_tmp10_, 1.0); + _tmp9_ = self->priv->rotate_scale; #line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->rotate_scale = _tmp11_; + self->priv->rotate_scale = MIN (_tmp9_, 1.0); #line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = self->priv->crop_center; + _tmp10_ = self->priv->crop_center; #line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->rotated_center = _tmp12_; + self->priv->rotated_center = _tmp10_; #line 316 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = self->priv->rotate_scale; + _tmp11_ = self->priv->rotate_scale; #line 316 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - radius_x = (gint) ((_tmp13_ * width) / 2); + radius_x = (gint) ((_tmp11_ * width) / 2); #line 317 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = self->priv->rotate_scale; + _tmp12_ = self->priv->rotate_scale; #line 317 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - radius_y = (gint) ((_tmp14_ * height) / 2); + radius_y = (gint) ((_tmp12_ * height) / 2); #line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = self->priv->rotated_center; + _tmp13_ = self->priv->rotated_center; #line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp16_ = _tmp15_.x; + _tmp14_ = _tmp13_.x; #line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp17_ = self->priv->image_dims; + _tmp15_ = self->priv->image_dims; #line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp18_ = _tmp17_.width; + _tmp16_ = _tmp15_.width; #line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp19_ = CLAMP (_tmp16_, radius_x, _tmp18_ - radius_x); -#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->rotated_center.x = _tmp19_; -#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp20_ = self->priv->rotated_center; + self->priv->rotated_center.x = CLAMP (_tmp14_, radius_x, _tmp16_ - radius_x); #line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp21_ = _tmp20_.y; + _tmp17_ = self->priv->rotated_center; #line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp22_ = self->priv->image_dims; + _tmp18_ = _tmp17_.y; #line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp23_ = _tmp22_.height; + _tmp19_ = self->priv->image_dims; #line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp24_ = CLAMP (_tmp21_, radius_y, _tmp23_ - radius_y); + _tmp20_ = _tmp19_.height; #line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->rotated_center.y = _tmp24_; -#line 1311 "StraightenTool.c" + self->priv->rotated_center.y = CLAMP (_tmp18_, radius_y, _tmp20_ - radius_y); +#line 1423 "StraightenTool.c" } @@ -1318,252 +1430,232 @@ static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStrai * * @param canvas The PhotoCanvas the tool's output should be painted to. */ -static gpointer _editing_tools_photo_canvas_ref0 (gpointer self) { +static gpointer +_editing_tools_photo_canvas_ref0 (gpointer self) +{ #line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return self ? editing_tools_photo_canvas_ref (self) : NULL; -#line 1325 "StraightenTool.c" +#line 1439 "StraightenTool.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return self ? g_object_ref (self) : NULL; -#line 1332 "StraightenTool.c" +#line 1448 "StraightenTool.c" } -static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas) { +static void +editing_tools_straighten_tool_real_activate (EditingToolsEditingTool* base, + EditingToolsPhotoCanvas* canvas) +{ EditingToolsStraightenTool * self; EditingToolsPhotoCanvas* _tmp0_; EditingToolsPhotoCanvas* _tmp1_; - EditingToolsPhotoCanvas* _tmp2_; - EditingToolsPhotoCanvas* _tmp3_; - EditingToolsPhotoCanvas* _tmp4_; + Photo* _tmp2_; + Photo* _tmp3_; + Dimensions _tmp4_ = {0}; + Box crop_region = {0}; Photo* _tmp5_; Photo* _tmp6_; - Dimensions _tmp7_ = {0}; - Box crop_region = {0}; - EditingToolsPhotoCanvas* _tmp8_; - Photo* _tmp9_; - Photo* _tmp10_; - Box _tmp11_ = {0}; - gboolean _tmp12_; - gboolean _tmp13_; + Box _tmp7_ = {0}; + gboolean _tmp8_; + gboolean _tmp9_; gdouble incoming_angle = 0.0; - EditingToolsPhotoCanvas* _tmp18_; - Photo* _tmp19_; - Photo* _tmp20_; - gdouble _tmp21_ = 0.0; - GdkPoint _tmp22_ = {0}; - Dimensions _tmp23_; - gint _tmp24_; - Dimensions _tmp25_; - gint _tmp26_; - gdouble _tmp27_; - GdkPoint _tmp28_ = {0}; - gint _tmp29_; - gint _tmp30_; + Photo* _tmp14_; + Photo* _tmp15_; + gdouble _tmp16_ = 0.0; + GdkPoint _tmp17_ = {0}; + Dimensions _tmp18_; + gint _tmp19_; + Dimensions _tmp20_; + gint _tmp21_; + gdouble _tmp22_; + GdkPoint _tmp23_ = {0}; GdkWindow* drawing_window = NULL; - EditingToolsPhotoCanvas* _tmp31_; - GdkWindow* _tmp32_; + GdkWindow* _tmp24_; GdkDisplay* display = NULL; - GdkDisplay* _tmp33_; - GdkDisplay* _tmp34_; + GdkDisplay* _tmp25_; + GdkDisplay* _tmp26_; GdkCursor* cursor = NULL; - GdkCursor* _tmp35_; - EditingToolsPhotoCanvas* _tmp36_; - GtkWindow* _tmp37_; - GtkWindow* _tmp38_; - EditingToolsStraightenToolStraightenToolWindow* _tmp39_; - EditingToolsStraightenToolStraightenToolWindow* _tmp40_; - GtkScale* _tmp41_; - gdouble _tmp42_; - gdouble _tmp43_; + GdkCursor* _tmp27_; + GtkWindow* _tmp28_; + GtkWindow* _tmp29_; + EditingToolsStraightenToolStraightenToolWindow* _tmp30_; + EditingToolsStraightenToolStraightenToolWindow* _tmp31_; + GtkScale* _tmp32_; + gdouble _tmp33_; + gdouble _tmp34_; gchar* tmp = NULL; - gdouble _tmp44_; - gchar* _tmp45_; - EditingToolsStraightenToolStraightenToolWindow* _tmp46_; - GtkLabel* _tmp47_; - EditingToolsStraightenToolStraightenToolWindow* _tmp48_; + gdouble _tmp35_; + gchar* _tmp36_; + EditingToolsStraightenToolStraightenToolWindow* _tmp37_; + GtkLabel* _tmp38_; + EditingToolsStraightenToolStraightenToolWindow* _tmp39_; #line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); #line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); #line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp0_ = canvas; -#line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp0_); -#line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp1_ = canvas; + EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), canvas); #line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = _editing_tools_photo_canvas_ref0 (_tmp1_); + _tmp0_ = _editing_tools_photo_canvas_ref0 (canvas); #line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _editing_tools_photo_canvas_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas); #line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas = _tmp2_; + G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas = _tmp0_; #line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_straighten_tool_bind_canvas_handlers (self, _tmp3_); -#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = canvas; + editing_tools_straighten_tool_bind_canvas_handlers (self, _tmp1_); #line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_ = editing_tools_photo_canvas_get_photo (_tmp4_); + _tmp2_ = editing_tools_photo_canvas_get_photo (canvas); #line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_STRAIGHTEN | PHOTO_EXCEPTION_CROP, &_tmp7_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_STRAIGHTEN | PHOTO_EXCEPTION_CROP, &_tmp4_); #line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->image_dims = _tmp7_; + self->priv->image_dims = _tmp4_; #line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _g_object_unref0 (_tmp6_); -#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp8_ = canvas; + _g_object_unref0 (_tmp3_); #line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = editing_tools_photo_canvas_get_photo (_tmp8_); + _tmp5_ = editing_tools_photo_canvas_get_photo (canvas); #line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp10_ = _tmp9_; + _tmp6_ = _tmp5_; #line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = photo_get_crop (_tmp10_, &_tmp11_, PHOTO_EXCEPTION_NONE); + _tmp8_ = photo_get_crop (_tmp6_, &_tmp7_, PHOTO_EXCEPTION_NONE); #line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - crop_region = _tmp11_; + crop_region = _tmp7_; #line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = !_tmp12_; + _tmp9_ = !_tmp8_; #line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp6_); #line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - if (_tmp13_) { -#line 1437 "StraightenTool.c" - Dimensions _tmp14_; - gint _tmp15_; - Dimensions _tmp16_; - gint _tmp17_; + if (_tmp9_) { +#line 1539 "StraightenTool.c" + Dimensions _tmp10_; + gint _tmp11_; + Dimensions _tmp12_; + gint _tmp13_; #line 339 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" crop_region.left = 0; #line 340 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = self->priv->image_dims; + _tmp10_ = self->priv->image_dims; #line 340 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = _tmp14_.width; + _tmp11_ = _tmp10_.width; #line 340 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - crop_region.right = _tmp15_; + crop_region.right = _tmp11_; #line 342 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" crop_region.top = 0; #line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp16_ = self->priv->image_dims; + _tmp12_ = self->priv->image_dims; #line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp17_ = _tmp16_.height; + _tmp13_ = _tmp12_.height; #line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - crop_region.bottom = _tmp17_; -#line 1458 "StraightenTool.c" + crop_region.bottom = _tmp13_; +#line 1560 "StraightenTool.c" } #line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" incoming_angle = 0.0; #line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp18_ = canvas; -#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp19_ = editing_tools_photo_canvas_get_photo (_tmp18_); + _tmp14_ = editing_tools_photo_canvas_get_photo (canvas); #line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp20_ = _tmp19_; + _tmp15_ = _tmp14_; #line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - photo_get_straighten (_tmp20_, &_tmp21_); + photo_get_straighten (_tmp15_, &_tmp16_); #line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - incoming_angle = _tmp21_; + incoming_angle = _tmp16_; #line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp15_); #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - box_get_center (&crop_region, &_tmp22_); + box_get_center (&crop_region, &_tmp17_); #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp23_ = self->priv->image_dims; + _tmp18_ = self->priv->image_dims; #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp24_ = _tmp23_.width; + _tmp19_ = _tmp18_.width; #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp25_ = self->priv->image_dims; + _tmp20_ = self->priv->image_dims; #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp26_ = _tmp25_.height; + _tmp21_ = _tmp20_.height; #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp27_ = incoming_angle; + _tmp22_ = incoming_angle; #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - derotate_point_arb (&_tmp22_, _tmp24_, _tmp26_, _tmp27_, &_tmp28_); + derotate_point_arb (&_tmp17_, _tmp19_, _tmp21_, _tmp22_, &_tmp23_); #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->crop_center = _tmp28_; -#line 354 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp29_ = box_get_width (&crop_region); + self->priv->crop_center = _tmp23_; #line 354 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->crop_width = _tmp29_; -#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp30_ = box_get_height (&crop_region); + self->priv->crop_width = box_get_width (&crop_region); #line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->crop_height = _tmp30_; + self->priv->crop_height = box_get_height (&crop_region); #line 357 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_adjust_for_rotation (self); #line 359 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_prepare_image (self); #line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp31_ = canvas; + _tmp24_ = editing_tools_photo_canvas_get_drawing_window (canvas); #line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp32_ = editing_tools_photo_canvas_get_drawing_window (_tmp31_); -#line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - drawing_window = _tmp32_; + drawing_window = _tmp24_; #line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp33_ = gdk_window_get_display (drawing_window); + _tmp25_ = gdk_window_get_display (drawing_window); #line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp34_ = _g_object_ref0 (_tmp33_); + _tmp26_ = _g_object_ref0 (_tmp25_); #line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - display = _tmp34_; + display = _tmp26_; #line 364 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp35_ = gdk_cursor_new_for_display (display, GDK_CROSSHAIR); + _tmp27_ = gdk_cursor_new_for_display (display, GDK_CROSSHAIR); #line 364 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cursor = _tmp35_; + cursor = _tmp27_; #line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gdk_window_set_cursor (drawing_window, cursor); #line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp36_ = canvas; -#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp37_ = editing_tools_photo_canvas_get_container (_tmp36_); + _tmp28_ = editing_tools_photo_canvas_get_container (canvas); #line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp38_ = _tmp37_; + _tmp29_ = _tmp28_; #line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp39_ = editing_tools_straighten_tool_straighten_tool_window_new (_tmp38_); + _tmp30_ = editing_tools_straighten_tool_straighten_tool_window_new (_tmp29_); #line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_object_ref_sink (_tmp39_); + g_object_ref_sink (_tmp30_); #line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (self->priv->window); #line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->window = _tmp39_; + self->priv->window = _tmp30_; #line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _g_object_unref0 (_tmp38_); + _g_object_unref0 (_tmp29_); #line 369 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_bind_window_handlers (self); #line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp40_ = self->priv->window; + _tmp31_ = self->priv->window; #line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp41_ = _tmp40_->angle_slider; + _tmp32_ = _tmp31_->angle_slider; #line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp42_ = incoming_angle; + _tmp33_ = incoming_angle; #line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_range_get_type (), GtkRange), _tmp42_); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_range_get_type (), GtkRange), _tmp33_); #line 373 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp43_ = incoming_angle; + _tmp34_ = incoming_angle; #line 373 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->photo_angle = _tmp43_; + self->priv->photo_angle = _tmp34_; #line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp44_ = incoming_angle; + _tmp35_ = incoming_angle; #line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp45_ = g_strdup_printf ("%2.1f°", _tmp44_); + _tmp36_ = g_strdup_printf ("%2.1f°", _tmp35_); #line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - tmp = _tmp45_; + tmp = _tmp36_; #line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp46_ = self->priv->window; + _tmp37_ = self->priv->window; #line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp47_ = _tmp46_->angle_label; + _tmp38_ = _tmp37_->angle_label; #line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_label_set_text (_tmp47_, tmp); + gtk_label_set_text (_tmp38_, tmp); #line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_high_qual_repaint (self); #line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp48_ = self->priv->window; + _tmp39_ = self->priv->window; #line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget)); #line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_free0 (tmp); #line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1572,14 +1664,16 @@ static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool _g_object_unref0 (display); #line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (drawing_window); -#line 1576 "StraightenTool.c" +#line 1668 "StraightenTool.c" } /** * Tears down the tool window and frees resources. */ -static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTool* base) { +static void +editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTool* base) +{ EditingToolsStraightenTool * self; EditingToolsStraightenToolStraightenToolWindow* _tmp0_; EditingToolsPhotoCanvas* _tmp2_; @@ -1589,7 +1683,7 @@ static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTo _tmp0_ = self->priv->window; #line 386 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp0_ != NULL) { -#line 1593 "StraightenTool.c" +#line 1687 "StraightenTool.c" EditingToolsStraightenToolStraightenToolWindow* _tmp1_; #line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_unbind_window_handlers (self); @@ -1601,13 +1695,13 @@ static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTo _g_object_unref0 (self->priv->window); #line 391 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->window = NULL; -#line 1605 "StraightenTool.c" +#line 1699 "StraightenTool.c" } #line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp2_ != NULL) { -#line 1611 "StraightenTool.c" +#line 1705 "StraightenTool.c" EditingToolsPhotoCanvas* _tmp3_; EditingToolsPhotoCanvas* _tmp4_; GdkWindow* _tmp5_; @@ -1626,83 +1720,104 @@ static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTo gdk_window_set_cursor (_tmp6_, NULL); #line 396 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp6_); -#line 1630 "StraightenTool.c" +#line 1724 "StraightenTool.c" } #line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)); -#line 1634 "StraightenTool.c" +#line 1728 "StraightenTool.c" } -static void _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) { +static void +_editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, + Dimensions* old_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position, + gpointer self) +{ #line 403 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_on_resized_pixbuf ((EditingToolsStraightenTool*) self, old_dim, scaled, scaled_position); -#line 1641 "StraightenTool.c" +#line 1741 "StraightenTool.c" } -static void editing_tools_straighten_tool_bind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas) { - EditingToolsPhotoCanvas* _tmp0_; +static void +editing_tools_straighten_tool_bind_canvas_handlers (EditingToolsStraightenTool* self, + EditingToolsPhotoCanvas* canvas) +{ #line 402 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 402 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); #line 403 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp0_ = canvas; -#line 403 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_signal_connect (_tmp0_, "resized-scaled-pixbuf", (GCallback) _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self); -#line 1655 "StraightenTool.c" + g_signal_connect (canvas, "resized-scaled-pixbuf", (GCallback) _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self); +#line 1755 "StraightenTool.c" } -static void editing_tools_straighten_tool_unbind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas) { - EditingToolsPhotoCanvas* _tmp0_; - guint _tmp1_; +static void +editing_tools_straighten_tool_unbind_canvas_handlers (EditingToolsStraightenTool* self, + EditingToolsPhotoCanvas* canvas) +{ + guint _tmp0_; #line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); #line 407 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp0_ = canvas; -#line 407 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE); + g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp0_, NULL, FALSE); #line 407 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self); -#line 1672 "StraightenTool.c" + g_signal_handlers_disconnect_matched (canvas, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self); +#line 1772 "StraightenTool.c" } -static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) { +static gboolean +_editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, + GdkEventKey* event, + gpointer self) +{ gboolean result; result = editing_tools_editing_tool_on_keypress ((EditingToolsEditingTool*) self, event); #line 411 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 1681 "StraightenTool.c" +#line 1785 "StraightenTool.c" } -static void _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_on_ok_clicked ((EditingToolsStraightenTool*) self); -#line 1688 "StraightenTool.c" +#line 1795 "StraightenTool.c" } -static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_editing_tool_notify_cancel ((EditingToolsEditingTool*) self); -#line 1695 "StraightenTool.c" +#line 1805 "StraightenTool.c" } -static void _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) { +static void +_editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed (GtkRange* _sender, + gpointer self) +{ #line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_on_angle_changed ((EditingToolsStraightenTool*) self); -#line 1702 "StraightenTool.c" +#line 1815 "StraightenTool.c" } -static void editing_tools_straighten_tool_bind_window_handlers (EditingToolsStraightenTool* self) { +static void +editing_tools_straighten_tool_bind_window_handlers (EditingToolsStraightenTool* self) +{ EditingToolsStraightenToolStraightenToolWindow* _tmp0_; EditingToolsStraightenToolStraightenToolWindow* _tmp1_; GtkButton* _tmp2_; @@ -1734,11 +1849,13 @@ static void editing_tools_straighten_tool_bind_window_handlers (EditingToolsStra _tmp6_ = _tmp5_->angle_slider; #line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed, self); -#line 1738 "StraightenTool.c" +#line 1853 "StraightenTool.c" } -static void editing_tools_straighten_tool_unbind_window_handlers (EditingToolsStraightenTool* self) { +static void +editing_tools_straighten_tool_unbind_window_handlers (EditingToolsStraightenTool* self) +{ EditingToolsStraightenToolStraightenToolWindow* _tmp0_; guint _tmp1_; EditingToolsStraightenToolStraightenToolWindow* _tmp2_; @@ -1782,32 +1899,34 @@ static void editing_tools_straighten_tool_unbind_window_handlers (EditingToolsSt g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp10_, NULL, FALSE); #line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed, self); -#line 1786 "StraightenTool.c" +#line 1903 "StraightenTool.c" } -static void _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback (gpointer self) { +static void +_editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback (gpointer self) +{ #line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_on_slider_stopped_delayed ((EditingToolsStraightenTool*) self); -#line 1793 "StraightenTool.c" +#line 1912 "StraightenTool.c" } -static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraightenTool* self) { +static void +editing_tools_straighten_tool_on_angle_changed (EditingToolsStraightenTool* self) +{ EditingToolsStraightenToolStraightenToolWindow* _tmp0_; GtkScale* _tmp1_; - gdouble _tmp2_; gchar* tmp = NULL; - EditingToolsStraightenToolStraightenToolWindow* _tmp3_; - GtkScale* _tmp4_; - gdouble _tmp5_; - gchar* _tmp6_; - EditingToolsStraightenToolStraightenToolWindow* _tmp7_; - GtkLabel* _tmp8_; - const gchar* _tmp9_; + EditingToolsStraightenToolStraightenToolWindow* _tmp2_; + GtkScale* _tmp3_; + gchar* _tmp4_; + EditingToolsStraightenToolStraightenToolWindow* _tmp5_; + GtkLabel* _tmp6_; + const gchar* _tmp7_; + OneShotScheduler* _tmp8_; OneShotScheduler* _tmp10_; - OneShotScheduler* _tmp12_; - EditingToolsPhotoCanvas* _tmp13_; + EditingToolsPhotoCanvas* _tmp11_; #line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1815,45 +1934,41 @@ static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraight #line 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = _tmp0_->angle_slider; #line 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)); -#line 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->photo_angle = _tmp2_; + self->priv->photo_angle = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)); #line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = self->priv->window; -#line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = _tmp3_->angle_slider; + _tmp2_ = self->priv->window; #line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange)); + _tmp3_ = _tmp2_->angle_slider; #line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = g_strdup_printf ("%2.1f°", _tmp5_); + _tmp4_ = g_strdup_printf ("%2.1f°", gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange))); #line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - tmp = _tmp6_; + tmp = _tmp4_; #line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp7_ = self->priv->window; + _tmp5_ = self->priv->window; #line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp8_ = _tmp7_->angle_label; + _tmp6_ = _tmp5_->angle_label; #line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = tmp; + _tmp7_ = tmp; #line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_label_set_text (_tmp8_, _tmp9_); + gtk_label_set_text (_tmp6_, _tmp7_); #line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp10_ = self->priv->slider_sched; + _tmp8_ = self->priv->slider_sched; #line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - if (_tmp10_ == NULL) { -#line 1844 "StraightenTool.c" - OneShotScheduler* _tmp11_; + if (_tmp8_ == NULL) { +#line 1959 "StraightenTool.c" + OneShotScheduler* _tmp9_; #line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp11_ = one_shot_scheduler_new ("straighten", _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback, self); + _tmp9_ = one_shot_scheduler_new ("straighten", _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback, self); #line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _one_shot_scheduler_unref0 (self->priv->slider_sched); #line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->slider_sched = _tmp11_; -#line 1852 "StraightenTool.c" + self->priv->slider_sched = _tmp9_; +#line 1967 "StraightenTool.c" } #line 431 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = self->priv->slider_sched; + _tmp10_ = self->priv->slider_sched; #line 431 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - one_shot_scheduler_after_timeout (_tmp12_, (guint) EDITING_TOOLS_STRAIGHTEN_TOOL_REPAINT_ON_STOP_DELAY_MSEC, TRUE); + one_shot_scheduler_after_timeout (_tmp10_, (guint) EDITING_TOOLS_STRAIGHTEN_TOOL_REPAINT_ON_STOP_DELAY_MSEC, TRUE); #line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->use_high_qual = FALSE; #line 435 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1861,19 +1976,24 @@ static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraight #line 436 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_update_rotated_surface (self); #line 437 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 437 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_repaint (_tmp13_); + editing_tools_photo_canvas_repaint (_tmp11_); #line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_free0 (tmp); -#line 1870 "StraightenTool.c" +#line 1985 "StraightenTool.c" } /** * @brief Called by the EditingHostPage when a resize event occurs. */ -static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraightenTool* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position) { +static void +editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraightenTool* self, + Dimensions* old_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position) +{ #line 443 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 443 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1884,7 +2004,7 @@ static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraigh g_return_if_fail (scaled_position != NULL); #line 444 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_prepare_image (self); -#line 1888 "StraightenTool.c" +#line 2008 "StraightenTool.c" } @@ -1892,7 +2012,9 @@ static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraigh * Returns a reference to the current StraightenTool instance's tool window; * the PhotoPage uses this to control the tool window's positioning, etc. */ -static EditingToolsEditingToolWindow* editing_tools_straighten_tool_real_get_tool_window (EditingToolsEditingTool* base) { +static EditingToolsEditingToolWindow* +editing_tools_straighten_tool_real_get_tool_window (EditingToolsEditingTool* base) +{ EditingToolsStraightenTool * self; EditingToolsEditingToolWindow* result = NULL; EditingToolsStraightenToolStraightenToolWindow* _tmp0_; @@ -1907,14 +2029,16 @@ static EditingToolsEditingToolWindow* editing_tools_straighten_tool_real_get_too result = _tmp1_; #line 452 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 1911 "StraightenTool.c" +#line 2033 "StraightenTool.c" } /** * Draw the rotated photo and grid. */ -static void editing_tools_straighten_tool_update_rotated_surface (EditingToolsStraightenTool* self) { +static void +editing_tools_straighten_tool_update_rotated_surface (EditingToolsStraightenTool* self) +{ cairo_surface_t* _tmp0_; cairo_t* _tmp1_; gint _tmp2_; @@ -1950,7 +2074,7 @@ static void editing_tools_straighten_tool_update_rotated_surface (EditingToolsSt _tmp8_ = self->priv->view_height; #line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_draw_superimposed_grid (self, _tmp6_, _tmp7_, _tmp8_); -#line 1954 "StraightenTool.c" +#line 2078 "StraightenTool.c" } @@ -1961,59 +2085,60 @@ static void editing_tools_straighten_tool_update_rotated_surface (EditingToolsSt * surfaces and contexts so it can have things set up exactly like it wants them, so * it's not used. */ -static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx) { +static void +editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* base, + cairo_t* ctx) +{ EditingToolsStraightenTool * self; gint w = 0; EditingToolsPhotoCanvas* _tmp0_; GdkWindow* _tmp1_; GdkWindow* _tmp2_; gint _tmp3_; - gint _tmp4_; gint h = 0; - EditingToolsPhotoCanvas* _tmp5_; + EditingToolsPhotoCanvas* _tmp4_; + GdkWindow* _tmp5_; GdkWindow* _tmp6_; - GdkWindow* _tmp7_; - gint _tmp8_; - gint _tmp9_; - EditingToolsPhotoCanvas* _tmp10_; - cairo_t* _tmp11_; + gint _tmp7_; + EditingToolsPhotoCanvas* _tmp8_; + cairo_t* _tmp9_; + cairo_t* _tmp10_; + EditingToolsPhotoCanvas* _tmp11_; cairo_t* _tmp12_; - EditingToolsPhotoCanvas* _tmp13_; - cairo_t* _tmp14_; + cairo_t* _tmp13_; + EditingToolsPhotoCanvas* _tmp14_; cairo_t* _tmp15_; - EditingToolsPhotoCanvas* _tmp16_; - cairo_t* _tmp17_; + cairo_t* _tmp16_; + EditingToolsPhotoCanvas* _tmp17_; cairo_t* _tmp18_; - EditingToolsPhotoCanvas* _tmp19_; - cairo_t* _tmp20_; + cairo_t* _tmp19_; + EditingToolsPhotoCanvas* _tmp20_; cairo_t* _tmp21_; - EditingToolsPhotoCanvas* _tmp22_; - cairo_t* _tmp23_; - cairo_t* _tmp24_; - gint _tmp25_; - gint _tmp26_; - EditingToolsPhotoCanvas* _tmp27_; - cairo_t* _tmp28_; - cairo_t* _tmp29_; - cairo_surface_t* _tmp30_; - EditingToolsPhotoCanvas* _tmp31_; - cairo_t* _tmp32_; - cairo_t* _tmp33_; - gint _tmp34_; - gint _tmp35_; - EditingToolsPhotoCanvas* _tmp36_; - cairo_t* _tmp37_; + cairo_t* _tmp22_; + gint _tmp23_; + gint _tmp24_; + EditingToolsPhotoCanvas* _tmp25_; + cairo_t* _tmp26_; + cairo_t* _tmp27_; + cairo_surface_t* _tmp28_; + EditingToolsPhotoCanvas* _tmp29_; + cairo_t* _tmp30_; + cairo_t* _tmp31_; + gint _tmp32_; + gint _tmp33_; + EditingToolsPhotoCanvas* _tmp34_; + cairo_t* _tmp35_; + cairo_t* _tmp36_; + EditingToolsPhotoCanvas* _tmp37_; cairo_t* _tmp38_; - EditingToolsPhotoCanvas* _tmp39_; - cairo_t* _tmp40_; + cairo_t* _tmp39_; + EditingToolsPhotoCanvas* _tmp40_; cairo_t* _tmp41_; - EditingToolsPhotoCanvas* _tmp42_; - cairo_t* _tmp43_; - cairo_t* _tmp44_; - EditingToolsStraightenToolStraightenGuide* _tmp45_; - EditingToolsPhotoCanvas* _tmp46_; - cairo_t* _tmp47_; - cairo_t* _tmp48_; + cairo_t* _tmp42_; + EditingToolsStraightenToolStraightenGuide* _tmp43_; + EditingToolsPhotoCanvas* _tmp44_; + cairo_t* _tmp45_; + cairo_t* _tmp46_; #line 471 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); #line 471 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2026,149 +2151,145 @@ static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* b _tmp2_ = _tmp1_; #line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = gdk_window_get_width (_tmp2_); -#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = _tmp3_; #line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp2_); #line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - w = _tmp4_; + w = _tmp3_; #line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = editing_tools_photo_canvas_get_drawing_window (_tmp5_); + _tmp5_ = editing_tools_photo_canvas_get_drawing_window (_tmp4_); #line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp7_ = _tmp6_; -#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp8_ = gdk_window_get_height (_tmp7_); + _tmp6_ = _tmp5_; #line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = _tmp8_; + _tmp7_ = gdk_window_get_height (_tmp6_); #line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - h = _tmp9_; + h = _tmp7_; #line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp11_ = editing_tools_photo_canvas_get_default_ctx (_tmp10_); + _tmp9_ = editing_tools_photo_canvas_get_default_ctx (_tmp8_); #line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_identity_matrix (_tmp12_); + cairo_identity_matrix (_tmp10_); #line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp12_); + _cairo_destroy0 (_tmp10_); #line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = editing_tools_photo_canvas_get_default_ctx (_tmp13_); + _tmp12_ = editing_tools_photo_canvas_get_default_ctx (_tmp11_); #line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = _tmp14_; + _tmp13_ = _tmp12_; #line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_set_source_rgba (_tmp15_, 0.0, 0.0, 0.0, 1.0); + cairo_set_source_rgba (_tmp13_, 0.0, 0.0, 0.0, 1.0); #line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp15_); + _cairo_destroy0 (_tmp13_); #line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp17_ = editing_tools_photo_canvas_get_default_ctx (_tmp16_); + _tmp15_ = editing_tools_photo_canvas_get_default_ctx (_tmp14_); #line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp18_ = _tmp17_; + _tmp16_ = _tmp15_; #line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_rectangle (_tmp18_, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h); + cairo_rectangle (_tmp16_, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h); #line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp18_); + _cairo_destroy0 (_tmp16_); #line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp20_ = editing_tools_photo_canvas_get_default_ctx (_tmp19_); + _tmp18_ = editing_tools_photo_canvas_get_default_ctx (_tmp17_); #line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp21_ = _tmp20_; + _tmp19_ = _tmp18_; #line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_fill (_tmp21_); + cairo_fill (_tmp19_); #line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp21_); + _cairo_destroy0 (_tmp19_); #line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp23_ = editing_tools_photo_canvas_get_default_ctx (_tmp22_); + _tmp21_ = editing_tools_photo_canvas_get_default_ctx (_tmp20_); #line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp24_ = _tmp23_; + _tmp22_ = _tmp21_; #line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp25_ = self->priv->view_width; + _tmp23_ = self->priv->view_width; #line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp26_ = self->priv->view_height; + _tmp24_ = self->priv->view_height; #line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_translate (_tmp24_, (w - _tmp25_) / 2.0, (h - _tmp26_) / 2.0); + cairo_translate (_tmp22_, (w - _tmp23_) / 2.0, (h - _tmp24_) / 2.0); #line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp24_); + _cairo_destroy0 (_tmp22_); #line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp28_ = editing_tools_photo_canvas_get_default_ctx (_tmp27_); + _tmp26_ = editing_tools_photo_canvas_get_default_ctx (_tmp25_); #line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp29_ = _tmp28_; + _tmp27_ = _tmp26_; #line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp30_ = self->priv->rotate_surf; + _tmp28_ = self->priv->rotate_surf; #line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_set_source_surface (_tmp29_, _tmp30_, (gdouble) 0, (gdouble) 0); + cairo_set_source_surface (_tmp27_, _tmp28_, (gdouble) 0, (gdouble) 0); #line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp29_); + _cairo_destroy0 (_tmp27_); #line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp31_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp29_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp32_ = editing_tools_photo_canvas_get_default_ctx (_tmp31_); + _tmp30_ = editing_tools_photo_canvas_get_default_ctx (_tmp29_); #line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp33_ = _tmp32_; + _tmp31_ = _tmp30_; #line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp34_ = self->priv->view_width; + _tmp32_ = self->priv->view_width; #line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp35_ = self->priv->view_height; + _tmp33_ = self->priv->view_height; #line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_rectangle (_tmp33_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp34_, (gdouble) _tmp35_); + cairo_rectangle (_tmp31_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp32_, (gdouble) _tmp33_); #line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp33_); + _cairo_destroy0 (_tmp31_); #line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp36_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp34_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp37_ = editing_tools_photo_canvas_get_default_ctx (_tmp36_); + _tmp35_ = editing_tools_photo_canvas_get_default_ctx (_tmp34_); #line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp38_ = _tmp37_; + _tmp36_ = _tmp35_; #line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_fill (_tmp38_); + cairo_fill (_tmp36_); #line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp38_); + _cairo_destroy0 (_tmp36_); #line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp39_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp40_ = editing_tools_photo_canvas_get_default_ctx (_tmp39_); + _tmp38_ = editing_tools_photo_canvas_get_default_ctx (_tmp37_); #line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp41_ = _tmp40_; + _tmp39_ = _tmp38_; #line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_paint (_tmp41_); + cairo_paint (_tmp39_); #line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp41_); + _cairo_destroy0 (_tmp39_); #line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp42_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp40_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp43_ = editing_tools_photo_canvas_get_default_ctx (_tmp42_); + _tmp41_ = editing_tools_photo_canvas_get_default_ctx (_tmp40_); #line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp44_ = _tmp43_; + _tmp42_ = _tmp41_; #line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_identity_matrix (_tmp44_); + cairo_identity_matrix (_tmp42_); #line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp44_); + _cairo_destroy0 (_tmp42_); #line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp45_ = self->priv->guide; + _tmp43_ = self->priv->guide; #line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp46_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp44_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp47_ = editing_tools_photo_canvas_get_default_ctx (_tmp46_); + _tmp45_ = editing_tools_photo_canvas_get_default_ctx (_tmp44_); #line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp48_ = _tmp47_; + _tmp46_ = _tmp45_; #line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_straighten_tool_straighten_guide_draw (_tmp45_, _tmp48_); + editing_tools_straighten_tool_straighten_guide_draw (_tmp43_, _tmp46_); #line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp48_); -#line 2172 "StraightenTool.c" + _cairo_destroy0 (_tmp46_); +#line 2293 "StraightenTool.c" } @@ -2182,43 +2303,31 @@ static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* b * @param src_height The height of the image data in src_surf in pixels. * @param angle The angle the source image should be rotated by, in degrees. */ -static void editing_tools_straighten_tool_draw_rotated_source (EditingToolsStraightenTool* self, cairo_surface_t* src_surf, cairo_t* dest_ctx, gint src_width, gint src_height, gdouble angle) { +static void +editing_tools_straighten_tool_draw_rotated_source (EditingToolsStraightenTool* self, + cairo_surface_t* src_surf, + cairo_t* dest_ctx, + gint src_width, + gint src_height, + gdouble angle) +{ gdouble angle_internal = 0.0; - gdouble _tmp0_; - gdouble _tmp1_; - cairo_t* _tmp2_; - cairo_t* _tmp3_; - cairo_t* _tmp4_; - gint _tmp5_; - gint _tmp6_; - cairo_t* _tmp7_; - cairo_t* _tmp8_; - cairo_t* _tmp9_; - gint _tmp10_; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; + gint _tmp3_; + gdouble _tmp4_; + gdouble _tmp5_; + gdouble _tmp6_; + GdkPoint _tmp7_; + gint _tmp8_; + gdouble _tmp9_; + GdkPoint _tmp10_; gint _tmp11_; - cairo_t* _tmp12_; - gdouble _tmp13_; - gdouble _tmp14_; - cairo_t* _tmp15_; - gdouble _tmp16_; - cairo_t* _tmp17_; - GdkPoint _tmp18_; - gint _tmp19_; - gdouble _tmp20_; - GdkPoint _tmp21_; - gint _tmp22_; - gdouble _tmp23_; - cairo_t* _tmp24_; - cairo_surface_t* _tmp25_; - cairo_filter_t _tmp26_ = 0; - gboolean _tmp27_; - cairo_t* _tmp28_; - cairo_pattern_t* _tmp29_; - cairo_t* _tmp30_; - gint _tmp31_; - gint _tmp32_; - cairo_t* _tmp33_; - cairo_t* _tmp34_; + gdouble _tmp12_; + cairo_filter_t _tmp13_ = 0; + gboolean _tmp14_; + cairo_pattern_t* _tmp15_; #line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2226,114 +2335,76 @@ static void editing_tools_straighten_tool_draw_rotated_source (EditingToolsStrai #line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (dest_ctx != NULL); #line 507 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp0_ = angle; -#line 507 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp1_ = degrees_to_radians (_tmp0_); -#line 507 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - angle_internal = _tmp1_; + angle_internal = degrees_to_radians (angle); #line 511 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = dest_ctx; -#line 511 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_identity_matrix (_tmp2_); -#line 512 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = dest_ctx; + cairo_identity_matrix (dest_ctx); #line 512 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_set_source_rgba (_tmp3_, 0.0, 0.0, 0.0, 1.0); -#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = dest_ctx; + cairo_set_source_rgba (dest_ctx, 0.0, 0.0, 0.0, 1.0); #line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_ = self->priv->view_width; + _tmp0_ = self->priv->view_width; #line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = self->priv->view_height; + _tmp1_ = self->priv->view_height; #line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp5_, (gdouble) _tmp6_); + cairo_rectangle (dest_ctx, (gdouble) 0, (gdouble) 0, (gdouble) _tmp0_, (gdouble) _tmp1_); #line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp7_ = dest_ctx; -#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_fill (_tmp7_); -#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp8_ = dest_ctx; + cairo_fill (dest_ctx); #line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_identity_matrix (_tmp8_); -#line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = dest_ctx; + cairo_identity_matrix (dest_ctx); #line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp10_ = self->priv->view_width; + _tmp2_ = self->priv->view_width; #line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp11_ = self->priv->view_height; + _tmp3_ = self->priv->view_height; #line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_translate (_tmp9_, (gdouble) (_tmp10_ / 2), (gdouble) (_tmp11_ / 2)); -#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = dest_ctx; + cairo_translate (dest_ctx, (gdouble) (_tmp2_ / 2), (gdouble) (_tmp3_ / 2)); #line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = self->priv->rotate_scale; + _tmp4_ = self->priv->rotate_scale; #line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = self->priv->rotate_scale; + _tmp5_ = self->priv->rotate_scale; #line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_scale (_tmp12_, 1.0 / _tmp13_, 1.0 / _tmp14_); + cairo_scale (dest_ctx, 1.0 / _tmp4_, 1.0 / _tmp5_); #line 523 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = dest_ctx; + _tmp6_ = angle_internal; #line 523 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp16_ = angle_internal; -#line 523 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_rotate (_tmp15_, _tmp16_); -#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp17_ = dest_ctx; + cairo_rotate (dest_ctx, _tmp6_); #line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp18_ = self->priv->rotated_center; + _tmp7_ = self->priv->rotated_center; #line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp19_ = _tmp18_.x; + _tmp8_ = _tmp7_.x; #line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp20_ = self->priv->preview_scale; + _tmp9_ = self->priv->preview_scale; #line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp21_ = self->priv->rotated_center; + _tmp10_ = self->priv->rotated_center; #line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp22_ = _tmp21_.y; + _tmp11_ = _tmp10_.y; #line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp23_ = self->priv->preview_scale; + _tmp12_ = self->priv->preview_scale; #line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_translate (_tmp17_, (-_tmp19_) * _tmp20_, (-_tmp22_) * _tmp23_); -#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp24_ = dest_ctx; + cairo_translate (dest_ctx, (-_tmp8_) * _tmp9_, (-_tmp11_) * _tmp12_); #line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp25_ = src_surf; -#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_set_source_surface (_tmp24_, _tmp25_, (gdouble) 0, (gdouble) 0); + cairo_set_source_surface (dest_ctx, src_surf, (gdouble) 0, (gdouble) 0); #line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp27_ = self->priv->use_high_qual; + _tmp14_ = self->priv->use_high_qual; #line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - if (_tmp27_) { + if (_tmp14_) { #line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp26_ = CAIRO_FILTER_BEST; -#line 2309 "StraightenTool.c" + _tmp13_ = CAIRO_FILTER_BEST; +#line 2392 "StraightenTool.c" } else { #line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp26_ = CAIRO_FILTER_NEAREST; -#line 2313 "StraightenTool.c" + _tmp13_ = CAIRO_FILTER_NEAREST; +#line 2396 "StraightenTool.c" } #line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp28_ = dest_ctx; -#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp29_ = cairo_get_source (_tmp28_); + _tmp15_ = cairo_get_source (dest_ctx); #line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_pattern_set_filter (_tmp29_, _tmp26_); + cairo_pattern_set_filter (_tmp15_, _tmp13_); #line 528 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp30_ = dest_ctx; -#line 528 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp31_ = src_width; -#line 528 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp32_ = src_height; -#line 528 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_rectangle (_tmp30_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp31_, (gdouble) _tmp32_); + cairo_rectangle (dest_ctx, (gdouble) 0, (gdouble) 0, (gdouble) src_width, (gdouble) src_height); #line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp33_ = dest_ctx; -#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_fill (_tmp33_); -#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp34_ = dest_ctx; + cairo_fill (dest_ctx); #line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_paint (_tmp34_); -#line 2337 "StraightenTool.c" + cairo_paint (dest_ctx); +#line 2408 "StraightenTool.c" } @@ -2344,211 +2415,126 @@ static void editing_tools_straighten_tool_draw_rotated_source (EditingToolsStrai * @param height The total height the grid should be drawn to. * @param dest_ctx The rendering context of the destination image. */ -static void editing_tools_straighten_tool_draw_superimposed_grid (EditingToolsStraightenTool* self, cairo_t* dest_ctx, gint width, gint height) { +static void +editing_tools_straighten_tool_draw_superimposed_grid (EditingToolsStraightenTool* self, + cairo_t* dest_ctx, + gint width, + gint height) +{ gint half_width = 0; - gint _tmp0_; gint quarter_width = 0; - gint _tmp1_; gint half_height = 0; - gint _tmp2_; gint quarter_height = 0; + EditingToolsPhotoCanvas* _tmp0_; + EditingToolsPhotoCanvas* _tmp1_; + EditingToolsPhotoCanvas* _tmp2_; gint _tmp3_; - cairo_t* _tmp4_; - cairo_t* _tmp5_; + EditingToolsPhotoCanvas* _tmp4_; + EditingToolsPhotoCanvas* _tmp5_; EditingToolsPhotoCanvas* _tmp6_; - cairo_t* _tmp7_; - gint _tmp8_; + EditingToolsPhotoCanvas* _tmp7_; + EditingToolsPhotoCanvas* _tmp8_; EditingToolsPhotoCanvas* _tmp9_; - cairo_t* _tmp10_; - gint _tmp11_; - EditingToolsPhotoCanvas* _tmp12_; - cairo_t* _tmp13_; - gint _tmp14_; - gint _tmp15_; - EditingToolsPhotoCanvas* _tmp16_; - cairo_t* _tmp17_; - gint _tmp18_; - EditingToolsPhotoCanvas* _tmp19_; - cairo_t* _tmp20_; - gint _tmp21_; - EditingToolsPhotoCanvas* _tmp22_; - cairo_t* _tmp23_; - gint _tmp24_; - gint _tmp25_; - cairo_t* _tmp26_; - EditingToolsPhotoCanvas* _tmp27_; - cairo_t* _tmp28_; - gint _tmp29_; - EditingToolsPhotoCanvas* _tmp30_; - cairo_t* _tmp31_; - gint _tmp32_; - EditingToolsPhotoCanvas* _tmp33_; - cairo_t* _tmp34_; - gint _tmp35_; - EditingToolsPhotoCanvas* _tmp36_; - cairo_t* _tmp37_; - gint _tmp38_; + EditingToolsPhotoCanvas* _tmp10_; #line 540 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 540 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (dest_ctx != NULL); #line 541 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp0_ = width; -#line 541 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - half_width = _tmp0_ / 2; -#line 542 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp1_ = width; + half_width = width / 2; #line 542 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - quarter_width = _tmp1_ / 4; + quarter_width = width / 4; #line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = height; -#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - half_height = _tmp2_ / 2; -#line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = height; + half_height = height / 2; #line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - quarter_height = _tmp3_ / 4; -#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = dest_ctx; + quarter_height = height / 4; #line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_identity_matrix (_tmp4_); + cairo_identity_matrix (dest_ctx); #line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_ = dest_ctx; -#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_set_source_rgba (_tmp5_, 1.0, 1.0, 1.0, 1.0); -#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + cairo_set_source_rgba (dest_ctx, 1.0, 1.0, 1.0, 1.0); #line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp7_ = dest_ctx; -#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp8_ = width; + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_draw_horizontal_line (_tmp6_, _tmp7_, 0, 0, _tmp8_, FALSE); + editing_tools_photo_canvas_draw_horizontal_line (_tmp0_, dest_ctx, 0, 0, width, FALSE); #line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp10_ = dest_ctx; -#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp11_ = width; -#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_draw_horizontal_line (_tmp9_, _tmp10_, 0, half_height, _tmp11_, FALSE); -#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + editing_tools_photo_canvas_draw_horizontal_line (_tmp1_, dest_ctx, 0, half_height, width, FALSE); #line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = dest_ctx; -#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = self->priv->view_height; + _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = width; + _tmp3_ = self->priv->view_height; #line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_draw_horizontal_line (_tmp12_, _tmp13_, 0, _tmp14_ - 1, _tmp15_, FALSE); -#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp17_ = dest_ctx; + editing_tools_photo_canvas_draw_horizontal_line (_tmp2_, dest_ctx, 0, _tmp3_ - 1, width, FALSE); #line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp18_ = height; + _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_draw_vertical_line (_tmp16_, _tmp17_, 0, 0, _tmp18_ + 1, FALSE); + editing_tools_photo_canvas_draw_vertical_line (_tmp4_, dest_ctx, 0, 0, height + 1, FALSE); #line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp20_ = dest_ctx; -#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp21_ = height; + _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_draw_vertical_line (_tmp19_, _tmp20_, half_width, 0, _tmp21_ + 1, FALSE); + editing_tools_photo_canvas_draw_vertical_line (_tmp5_, dest_ctx, half_width, 0, height + 1, FALSE); #line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp23_ = dest_ctx; -#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp24_ = width; -#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp25_ = height; + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_draw_vertical_line (_tmp22_, _tmp23_, _tmp24_ - 1, 0, _tmp25_ + 1, FALSE); -#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp26_ = dest_ctx; + editing_tools_photo_canvas_draw_vertical_line (_tmp6_, dest_ctx, width - 1, 0, height + 1, FALSE); #line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_set_source_rgba (_tmp26_, 1.0, 1.0, 1.0, 0.33); + cairo_set_source_rgba (dest_ctx, 1.0, 1.0, 1.0, 0.33); #line 560 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 560 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp28_ = dest_ctx; -#line 560 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp29_ = width; -#line 560 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_draw_horizontal_line (_tmp27_, _tmp28_, 0, quarter_height, _tmp29_, FALSE); -#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + editing_tools_photo_canvas_draw_horizontal_line (_tmp7_, dest_ctx, 0, quarter_height, width, FALSE); #line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp31_ = dest_ctx; + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp32_ = width; -#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_draw_horizontal_line (_tmp30_, _tmp31_, 0, half_height + quarter_height, _tmp32_, FALSE); -#line 562 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 562 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp34_ = dest_ctx; + editing_tools_photo_canvas_draw_horizontal_line (_tmp8_, dest_ctx, 0, half_height + quarter_height, width, FALSE); #line 562 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp35_ = height; + _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 562 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_draw_vertical_line (_tmp33_, _tmp34_, quarter_width, 0, _tmp35_, FALSE); -#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp36_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp37_ = dest_ctx; + editing_tools_photo_canvas_draw_vertical_line (_tmp9_, dest_ctx, quarter_width, 0, height, FALSE); #line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp38_ = height; + _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_draw_vertical_line (_tmp36_, _tmp37_, half_width + quarter_width, 0, _tmp38_, FALSE); -#line 2508 "StraightenTool.c" + editing_tools_photo_canvas_draw_vertical_line (_tmp10_, dest_ctx, half_width + quarter_width, 0, height, FALSE); +#line 2500 "StraightenTool.c" } -static void editing_tools_straighten_tool_straighten_guide_reset (EditingToolsStraightenToolStraightenGuide* self, gint x, gint y, gdouble angle) { - gint _tmp0_; - gint _tmp1_; - gint _tmp2_[2] = {0}; - gint _tmp3_; - gint _tmp4_; - gint _tmp5_[2] = {0}; - gdouble _tmp6_; +static void +editing_tools_straighten_tool_straighten_guide_reset (EditingToolsStraightenToolStraightenGuide* self, + gint x, + gint y, + gdouble angle) +{ + gint _tmp0_[2] = {0}; + gint _tmp1_[2] = {0}; #line 31 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_GUIDE (self)); #line 32 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp0_ = x; + _tmp0_[0] = x; #line 32 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp1_ = x; + _tmp0_[1] = x; #line 32 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_[0] = _tmp0_; -#line 32 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_[1] = _tmp1_; -#line 32 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - memcpy (self->priv->x, _tmp2_, 2 * sizeof (gint)); -#line 33 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = y; + memcpy (self->priv->x, _tmp0_, 2 * sizeof (gint)); #line 33 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = y; + _tmp1_[0] = y; #line 33 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_[0] = _tmp3_; + _tmp1_[1] = y; #line 33 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_[1] = _tmp4_; -#line 33 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - memcpy (self->priv->y, _tmp5_, 2 * sizeof (gint)); + memcpy (self->priv->y, _tmp1_, 2 * sizeof (gint)); #line 34 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->is_active = TRUE; #line 35 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = angle; -#line 35 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->angle0 = _tmp6_; -#line 2548 "StraightenTool.c" + self->priv->angle0 = angle; +#line 2530 "StraightenTool.c" } -static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingToolsStraightenToolStraightenGuide* self, gint x, gint y) { +static gboolean +editing_tools_straighten_tool_straighten_guide_update (EditingToolsStraightenToolStraightenGuide* self, + gint x, + gint y) +{ gboolean result = FALSE; gboolean _tmp0_; #line 38 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2557,47 +2543,45 @@ static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingTo _tmp0_ = self->priv->is_active; #line 39 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp0_) { -#line 2561 "StraightenTool.c" +#line 2547 "StraightenTool.c" gint _tmp1_; gint _tmp2_; - gint _tmp3_; - gint _tmp4_; -#line 40 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp1_ = x; #line 40 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->x[1] = _tmp1_; + self->priv->x[1] = x; #line 40 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = self->priv->x[1]; + _tmp1_ = self->priv->x[1]; #line 41 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = y; + self->priv->y[1] = y; #line 41 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->y[1] = _tmp3_; -#line 41 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = self->priv->y[1]; + _tmp2_ = self->priv->y[1]; #line 42 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" result = TRUE; #line 42 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 2582 "StraightenTool.c" +#line 2562 "StraightenTool.c" } #line 45 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" result = FALSE; #line 45 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 2588 "StraightenTool.c" +#line 2568 "StraightenTool.c" } -static void editing_tools_straighten_tool_straighten_guide_clear (EditingToolsStraightenToolStraightenGuide* self) { +static void +editing_tools_straighten_tool_straighten_guide_clear (EditingToolsStraightenToolStraightenGuide* self) +{ #line 48 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_GUIDE (self)); #line 49 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->is_active = FALSE; -#line 2597 "StraightenTool.c" +#line 2579 "StraightenTool.c" } -static gdouble* _double_dup (gdouble* self) { +static gdouble* +_double_dup (gdouble* self) +{ gdouble* dup; #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" dup = g_new0 (gdouble, 1); @@ -2605,18 +2589,22 @@ static gdouble* _double_dup (gdouble* self) { memcpy (dup, self, sizeof (gdouble)); #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return dup; -#line 2609 "StraightenTool.c" +#line 2593 "StraightenTool.c" } -static gpointer __double_dup0 (gpointer self) { +static gpointer +__double_dup0 (gpointer self) +{ #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return self ? _double_dup (self) : NULL; -#line 2616 "StraightenTool.c" +#line 2602 "StraightenTool.c" } -static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (EditingToolsStraightenToolStraightenGuide* self) { +static gdouble* +editing_tools_straighten_tool_straighten_guide_get_angle (EditingToolsStraightenToolStraightenGuide* self) +{ gdouble* result = NULL; gdouble dx = 0.0; gint _tmp0_; @@ -2630,8 +2618,6 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin gdouble _tmp7_; gdouble _tmp8_; gdouble _tmp9_; - gdouble _tmp10_; - gdouble _tmp11_; #line 52 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_val_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_GUIDE (self), NULL); #line 53 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2660,71 +2646,64 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin result = NULL; #line 58 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 2664 "StraightenTool.c" +#line 2650 "StraightenTool.c" } #line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = dy; #line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = fabs (_tmp8_); + _tmp9_ = dx; #line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp10_ = dx; -#line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp11_ = fabs (_tmp10_); -#line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - if (_tmp9_ > _tmp11_) { -#line 2676 "StraightenTool.c" + if (fabs (_tmp8_) > fabs (_tmp9_)) { +#line 2658 "StraightenTool.c" + gdouble _tmp10_; + gdouble _tmp11_; gdouble _tmp12_; gdouble _tmp13_; - gdouble _tmp14_; - gdouble _tmp15_; - gdouble _tmp16_; - gdouble* _tmp17_; -#line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = self->priv->angle0; + gdouble* _tmp14_; #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = dx; + _tmp10_ = self->priv->angle0; #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = dy; + _tmp11_ = dx; #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = atan (_tmp13_ / _tmp14_); + _tmp12_ = dy; #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp16_ = _tmp12_ + ((_tmp15_ / G_PI) * 180); + _tmp13_ = _tmp10_ + ((atan (_tmp11_ / _tmp12_) / G_PI) * 180); #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp17_ = __double_dup0 (&_tmp16_); + _tmp14_ = __double_dup0 (&_tmp13_); #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - result = _tmp17_; + result = _tmp14_; #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 2699 "StraightenTool.c" +#line 2678 "StraightenTool.c" } else { + gdouble _tmp15_; + gdouble _tmp16_; + gdouble _tmp17_; gdouble _tmp18_; - gdouble _tmp19_; - gdouble _tmp20_; - gdouble _tmp21_; - gdouble _tmp22_; - gdouble* _tmp23_; + gdouble* _tmp19_; #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp18_ = self->priv->angle0; + _tmp15_ = self->priv->angle0; #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp19_ = dy; + _tmp16_ = dy; #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp20_ = dx; + _tmp17_ = dx; #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp21_ = atan (_tmp19_ / _tmp20_); + _tmp18_ = _tmp15_ - ((atan (_tmp16_ / _tmp17_) / G_PI) * 180); #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp22_ = _tmp18_ - ((_tmp21_ / G_PI) * 180); + _tmp19_ = __double_dup0 (&_tmp18_); #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp23_ = __double_dup0 (&_tmp22_); -#line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - result = _tmp23_; + result = _tmp19_; #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 2723 "StraightenTool.c" +#line 2699 "StraightenTool.c" } } -static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStraightenToolStraightenGuide* self, cairo_t* ctx) { +static void +editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStraightenToolStraightenGuide* self, + cairo_t* ctx) +{ gboolean _tmp0_; gdouble* _tmp1_ = NULL; gdouble* _tmp2_; @@ -2736,28 +2715,18 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr gdouble alpha = 0.0; gboolean _tmp9_ = FALSE; gdouble _tmp10_; - cairo_t* _tmp12_; + gdouble _tmp12_; gdouble _tmp13_; - cairo_t* _tmp14_; - gdouble _tmp15_; - cairo_t* _tmp16_; + gint _tmp14_; + gint _tmp15_; + gint _tmp16_; gint _tmp17_; - gint _tmp18_; - cairo_t* _tmp19_; + gdouble _tmp18_; + gdouble _tmp19_; gint _tmp20_; gint _tmp21_; - cairo_t* _tmp22_; - cairo_t* _tmp23_; - gdouble _tmp24_; - cairo_t* _tmp25_; - gdouble _tmp26_; - cairo_t* _tmp27_; - gint _tmp28_; - gint _tmp29_; - cairo_t* _tmp30_; - gint _tmp31_; - gint _tmp32_; - cairo_t* _tmp33_; + gint _tmp22_; + gint _tmp23_; #line 67 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_GUIDE (self)); #line 67 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2768,7 +2737,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr if (!_tmp0_) { #line 69 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return; -#line 2772 "StraightenTool.c" +#line 2741 "StraightenTool.c" } #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = editing_tools_straighten_tool_straighten_guide_get_angle (self); @@ -2776,7 +2745,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr _tmp1_ = _tmp2_; #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp1_ == NULL) { -#line 2780 "StraightenTool.c" +#line 2749 "StraightenTool.c" gdouble _tmp3_; gdouble* _tmp4_; #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2787,7 +2756,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr _g_free0 (_tmp1_); #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = _tmp4_; -#line 2791 "StraightenTool.c" +#line 2760 "StraightenTool.c" } #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = _tmp1_; @@ -2809,7 +2778,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr _g_free0 (_tmp1_); #line 73 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return; -#line 2813 "StraightenTool.c" +#line 2782 "StraightenTool.c" } #line 75 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" alpha = 1.0; @@ -2819,206 +2788,215 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr if (_tmp10_ < EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_ANGLE) { #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp9_ = TRUE; -#line 2823 "StraightenTool.c" +#line 2792 "StraightenTool.c" } else { gdouble _tmp11_; #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp11_ = angle; #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp9_ = _tmp11_ > EDITING_TOOLS_STRAIGHTEN_TOOL_MAX_ANGLE; -#line 2830 "StraightenTool.c" +#line 2799 "StraightenTool.c" } #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp9_) { #line 77 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" alpha = 0.35; -#line 2836 "StraightenTool.c" +#line 2805 "StraightenTool.c" } #line 81 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = ctx; + _tmp12_ = alpha; #line 81 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = alpha; -#line 81 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_set_source_rgba (_tmp12_, 0.0, 0.0, 0.0, _tmp13_); -#line 82 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = ctx; + cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, _tmp12_); #line 82 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH[0]; + _tmp13_ = EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH[0]; #line 82 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_set_dash (_tmp14_, EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH, G_N_ELEMENTS (EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH), _tmp15_ / 2); -#line 83 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp16_ = ctx; + cairo_set_dash (ctx, EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH, G_N_ELEMENTS (EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH), _tmp13_ / 2); #line 83 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp17_ = self->priv->x[0]; + _tmp14_ = self->priv->x[0]; #line 83 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp18_ = self->priv->y[0]; + _tmp15_ = self->priv->y[0]; #line 83 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_move_to (_tmp16_, _tmp17_ + 0.5, _tmp18_ + 0.5); + cairo_move_to (ctx, _tmp14_ + 0.5, _tmp15_ + 0.5); #line 84 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp19_ = ctx; + _tmp16_ = self->priv->x[1]; #line 84 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp20_ = self->priv->x[1]; + _tmp17_ = self->priv->y[1]; #line 84 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp21_ = self->priv->y[1]; -#line 84 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_line_to (_tmp19_, _tmp20_ + 0.5, _tmp21_ + 0.5); -#line 85 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp22_ = ctx; + cairo_line_to (ctx, _tmp16_ + 0.5, _tmp17_ + 0.5); #line 85 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_stroke (_tmp22_); + cairo_stroke (ctx); #line 86 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp23_ = ctx; + _tmp18_ = EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH[0]; #line 86 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp24_ = EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH[0]; -#line 86 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_set_dash (_tmp23_, EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH, G_N_ELEMENTS (EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH), (-_tmp24_) / 2); -#line 87 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp25_ = ctx; + cairo_set_dash (ctx, EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH, G_N_ELEMENTS (EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH), (-_tmp18_) / 2); #line 87 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp26_ = alpha; + _tmp19_ = alpha; #line 87 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_set_source_rgba (_tmp25_, 1.0, 1.0, 1.0, _tmp26_); -#line 88 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp27_ = ctx; + cairo_set_source_rgba (ctx, 1.0, 1.0, 1.0, _tmp19_); #line 88 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp28_ = self->priv->x[0]; + _tmp20_ = self->priv->x[0]; #line 88 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp29_ = self->priv->y[0]; + _tmp21_ = self->priv->y[0]; #line 88 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_move_to (_tmp27_, _tmp28_ + 0.5, _tmp29_ + 0.5); + cairo_move_to (ctx, _tmp20_ + 0.5, _tmp21_ + 0.5); #line 89 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp30_ = ctx; + _tmp22_ = self->priv->x[1]; #line 89 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp31_ = self->priv->x[1]; + _tmp23_ = self->priv->y[1]; #line 89 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp32_ = self->priv->y[1]; -#line 89 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_line_to (_tmp30_, _tmp31_ + 0.5, _tmp32_ + 0.5); -#line 90 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp33_ = ctx; + cairo_line_to (ctx, _tmp22_ + 0.5, _tmp23_ + 0.5); #line 90 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_stroke (_tmp33_); + cairo_stroke (ctx); #line 67 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_free0 (_tmp1_); -#line 2904 "StraightenTool.c" +#line 2853 "StraightenTool.c" } -static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_straighten_guide_construct (GType object_type) { +static EditingToolsStraightenToolStraightenGuide* +editing_tools_straighten_tool_straighten_guide_construct (GType object_type) +{ EditingToolsStraightenToolStraightenGuide* self = NULL; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = (EditingToolsStraightenToolStraightenGuide*) g_type_create_instance (object_type); #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return self; -#line 2914 "StraightenTool.c" +#line 2865 "StraightenTool.c" } -static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_straighten_guide_new (void) { +static EditingToolsStraightenToolStraightenGuide* +editing_tools_straighten_tool_straighten_guide_new (void) +{ #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return editing_tools_straighten_tool_straighten_guide_construct (EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE); -#line 2921 "StraightenTool.c" +#line 2874 "StraightenTool.c" } -static void editing_tools_straighten_tool_value_straighten_guide_init (GValue* value) { +static void +editing_tools_straighten_tool_value_straighten_guide_init (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" value->data[0].v_pointer = NULL; -#line 2928 "StraightenTool.c" +#line 2883 "StraightenTool.c" } -static void editing_tools_straighten_tool_value_straighten_guide_free_value (GValue* value) { +static void +editing_tools_straighten_tool_value_straighten_guide_free_value (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_straighten_guide_unref (value->data[0].v_pointer); -#line 2937 "StraightenTool.c" +#line 2894 "StraightenTool.c" } } -static void editing_tools_straighten_tool_value_straighten_guide_copy_value (const GValue* src_value, GValue* dest_value) { +static void +editing_tools_straighten_tool_value_straighten_guide_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (src_value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" dest_value->data[0].v_pointer = editing_tools_straighten_tool_straighten_guide_ref (src_value->data[0].v_pointer); -#line 2947 "StraightenTool.c" +#line 2907 "StraightenTool.c" } else { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" dest_value->data[0].v_pointer = NULL; -#line 2951 "StraightenTool.c" +#line 2911 "StraightenTool.c" } } -static gpointer editing_tools_straighten_tool_value_straighten_guide_peek_pointer (const GValue* value) { +static gpointer +editing_tools_straighten_tool_value_straighten_guide_peek_pointer (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return value->data[0].v_pointer; -#line 2959 "StraightenTool.c" +#line 2921 "StraightenTool.c" } -static gchar* editing_tools_straighten_tool_value_straighten_guide_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +editing_tools_straighten_tool_value_straighten_guide_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (collect_values[0].v_pointer) { -#line 2966 "StraightenTool.c" +#line 2933 "StraightenTool.c" EditingToolsStraightenToolStraightenGuide * object; object = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (object->parent_instance.g_class == NULL) { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2973 "StraightenTool.c" +#line 2940 "StraightenTool.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2977 "StraightenTool.c" +#line 2944 "StraightenTool.c" } #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" value->data[0].v_pointer = editing_tools_straighten_tool_straighten_guide_ref (object); -#line 2981 "StraightenTool.c" +#line 2948 "StraightenTool.c" } else { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" value->data[0].v_pointer = NULL; -#line 2985 "StraightenTool.c" +#line 2952 "StraightenTool.c" } #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return NULL; -#line 2989 "StraightenTool.c" +#line 2956 "StraightenTool.c" } -static gchar* editing_tools_straighten_tool_value_straighten_guide_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +editing_tools_straighten_tool_value_straighten_guide_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ EditingToolsStraightenToolStraightenGuide ** object_p; object_p = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (!object_p) { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3000 "StraightenTool.c" +#line 2972 "StraightenTool.c" } #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (!value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" *object_p = NULL; -#line 3006 "StraightenTool.c" +#line 2978 "StraightenTool.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" *object_p = value->data[0].v_pointer; -#line 3010 "StraightenTool.c" +#line 2982 "StraightenTool.c" } else { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" *object_p = editing_tools_straighten_tool_straighten_guide_ref (value->data[0].v_pointer); -#line 3014 "StraightenTool.c" +#line 2986 "StraightenTool.c" } #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return NULL; -#line 3018 "StraightenTool.c" +#line 2990 "StraightenTool.c" } -static GParamSpec* editing_tools_straighten_tool_param_spec_straighten_guide (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +static GParamSpec* +editing_tools_straighten_tool_param_spec_straighten_guide (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ EditingToolsStraightenToolParamSpecStraightenGuide* spec; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_val_if_fail (g_type_is_a (object_type, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE), NULL); @@ -3028,20 +3006,25 @@ static GParamSpec* editing_tools_straighten_tool_param_spec_straighten_guide (co G_PARAM_SPEC (spec)->value_type = object_type; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return G_PARAM_SPEC (spec); -#line 3032 "StraightenTool.c" +#line 3010 "StraightenTool.c" } -static gpointer editing_tools_straighten_tool_value_get_straighten_guide (const GValue* value) { +static gpointer +editing_tools_straighten_tool_value_get_straighten_guide (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE), NULL); #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return value->data[0].v_pointer; -#line 3041 "StraightenTool.c" +#line 3021 "StraightenTool.c" } -static void editing_tools_straighten_tool_value_set_straighten_guide (GValue* value, gpointer v_object) { +static void +editing_tools_straighten_tool_value_set_straighten_guide (GValue* value, + gpointer v_object) +{ EditingToolsStraightenToolStraightenGuide * old; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE)); @@ -3057,22 +3040,25 @@ static void editing_tools_straighten_tool_value_set_straighten_guide (GValue* va value->data[0].v_pointer = v_object; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_straighten_guide_ref (value->data[0].v_pointer); -#line 3061 "StraightenTool.c" +#line 3044 "StraightenTool.c" } else { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" value->data[0].v_pointer = NULL; -#line 3065 "StraightenTool.c" +#line 3048 "StraightenTool.c" } #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_straighten_guide_unref (old); -#line 3071 "StraightenTool.c" +#line 3054 "StraightenTool.c" } } -static void editing_tools_straighten_tool_value_take_straighten_guide (GValue* value, gpointer v_object) { +static void +editing_tools_straighten_tool_value_take_straighten_guide (GValue* value, + gpointer v_object) +{ EditingToolsStraightenToolStraightenGuide * old; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE)); @@ -3086,54 +3072,62 @@ static void editing_tools_straighten_tool_value_take_straighten_guide (GValue* v g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" value->data[0].v_pointer = v_object; -#line 3090 "StraightenTool.c" +#line 3076 "StraightenTool.c" } else { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" value->data[0].v_pointer = NULL; -#line 3094 "StraightenTool.c" +#line 3080 "StraightenTool.c" } #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_straighten_guide_unref (old); -#line 3100 "StraightenTool.c" +#line 3086 "StraightenTool.c" } } -static void editing_tools_straighten_tool_straighten_guide_class_init (EditingToolsStraightenToolStraightenGuideClass * klass) { +static void +editing_tools_straighten_tool_straighten_guide_class_init (EditingToolsStraightenToolStraightenGuideClass * klass) +{ #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_straighten_guide_parent_class = g_type_class_peek_parent (klass); #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" ((EditingToolsStraightenToolStraightenGuideClass *) klass)->finalize = editing_tools_straighten_tool_straighten_guide_finalize; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_type_class_add_private (klass, sizeof (EditingToolsStraightenToolStraightenGuidePrivate)); -#line 3112 "StraightenTool.c" +#line 3100 "StraightenTool.c" } -static void editing_tools_straighten_tool_straighten_guide_instance_init (EditingToolsStraightenToolStraightenGuide * self) { +static void +editing_tools_straighten_tool_straighten_guide_instance_init (EditingToolsStraightenToolStraightenGuide * self) +{ #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv = EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_GUIDE_GET_PRIVATE (self); #line 26 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->is_active = FALSE; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->ref_count = 1; -#line 3123 "StraightenTool.c" +#line 3113 "StraightenTool.c" } -static void editing_tools_straighten_tool_straighten_guide_finalize (EditingToolsStraightenToolStraightenGuide * obj) { +static void +editing_tools_straighten_tool_straighten_guide_finalize (EditingToolsStraightenToolStraightenGuide * obj) +{ EditingToolsStraightenToolStraightenGuide * self; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE, EditingToolsStraightenToolStraightenGuide); #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_signal_handlers_destroy (self); -#line 3133 "StraightenTool.c" +#line 3125 "StraightenTool.c" } -static GType editing_tools_straighten_tool_straighten_guide_get_type (void) { +static GType +editing_tools_straighten_tool_straighten_guide_get_type (void) +{ static volatile gsize editing_tools_straighten_tool_straighten_guide_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_straighten_tool_straighten_guide_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { editing_tools_straighten_tool_value_straighten_guide_init, editing_tools_straighten_tool_value_straighten_guide_free_value, editing_tools_straighten_tool_value_straighten_guide_copy_value, editing_tools_straighten_tool_value_straighten_guide_peek_pointer, "p", editing_tools_straighten_tool_value_straighten_guide_collect_value, "p", editing_tools_straighten_tool_value_straighten_guide_lcopy_value }; @@ -3147,18 +3141,22 @@ static GType editing_tools_straighten_tool_straighten_guide_get_type (void) { } -static gpointer editing_tools_straighten_tool_straighten_guide_ref (gpointer instance) { +static gpointer +editing_tools_straighten_tool_straighten_guide_ref (gpointer instance) +{ EditingToolsStraightenToolStraightenGuide * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_atomic_int_inc (&self->ref_count); #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return instance; -#line 3158 "StraightenTool.c" +#line 3154 "StraightenTool.c" } -static void editing_tools_straighten_tool_straighten_guide_unref (gpointer instance) { +static void +editing_tools_straighten_tool_straighten_guide_unref (gpointer instance) +{ EditingToolsStraightenToolStraightenGuide * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -3167,7 +3165,7 @@ static void editing_tools_straighten_tool_straighten_guide_unref (gpointer insta EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_GUIDE_GET_CLASS (self)->finalize (self); #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3171 "StraightenTool.c" +#line 3169 "StraightenTool.c" } } @@ -3177,20 +3175,26 @@ static void editing_tools_straighten_tool_straighten_guide_unref (gpointer insta * * @param container The application's main window. */ -static void _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 147 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked ((EditingToolsStraightenToolStraightenToolWindow*) self); -#line 3184 "StraightenTool.c" +#line 3185 "StraightenTool.c" } -static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_tool_straighten_tool_window_construct (GType object_type, GtkWindow* container) { +static EditingToolsStraightenToolStraightenToolWindow* +editing_tools_straighten_tool_straighten_tool_window_construct (GType object_type, + GtkWindow* container) +{ EditingToolsStraightenToolStraightenToolWindow * self = NULL; - GtkWindow* _tmp0_; + GtkScale* _tmp0_; GtkScale* _tmp1_; GtkScale* _tmp2_; GtkScale* _tmp3_; - GtkScale* _tmp4_; + GtkLabel* _tmp4_; GtkLabel* _tmp5_; GtkLabel* _tmp6_; GtkLabel* _tmp7_; @@ -3199,145 +3203,142 @@ static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_ GtkLabel* _tmp10_; GtkLabel* _tmp11_; GtkLabel* _tmp12_; - GtkLabel* _tmp13_; GtkBox* slider_layout = NULL; - GtkBox* _tmp14_; - GtkScale* _tmp15_; + GtkBox* _tmp13_; + GtkScale* _tmp14_; GtkBox* button_layout = NULL; - GtkBox* _tmp16_; + GtkBox* _tmp15_; + GtkButton* _tmp16_; GtkButton* _tmp17_; GtkButton* _tmp18_; GtkButton* _tmp19_; GtkButton* _tmp20_; GtkButton* _tmp21_; - GtkButton* _tmp22_; GtkBox* main_layout = NULL; - GtkBox* _tmp23_; + GtkBox* _tmp22_; + GtkLabel* _tmp23_; GtkLabel* _tmp24_; - GtkLabel* _tmp25_; - GtkButton* _tmp26_; + GtkButton* _tmp25_; #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_val_if_fail (GTK_IS_WINDOW (container), NULL); #line 110 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp0_ = container; -#line 110 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self = (EditingToolsStraightenToolStraightenToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_); + self = (EditingToolsStraightenToolStraightenToolWindow*) editing_tools_editing_tool_window_construct (object_type, container); #line 112 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp1_ = self->angle_slider; + _tmp0_ = self->angle_slider; #line 112 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_range_set_min_slider_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_SLIDER_SIZE); + gtk_range_set_min_slider_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_SLIDER_SIZE); #line 113 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = self->angle_slider; + _tmp1_ = self->angle_slider; #line 113 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_SLIDER_SIZE, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_SLIDER_SIZE, -1); #line 114 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = self->angle_slider; + _tmp2_ = self->angle_slider; #line 114 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange), 0.0); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), 0.0); #line 115 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = self->angle_slider; + _tmp3_ = self->angle_slider; #line 115 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_scale_set_draw_value (_tmp4_, FALSE); + gtk_scale_set_draw_value (_tmp3_, FALSE); #line 117 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_ = self->description_label; + _tmp4_ = self->description_label; #line 117 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); + gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); #line 118 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = self->description_label; + _tmp5_ = self->description_label; #line 118 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); #line 119 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp7_ = self->description_label; + _tmp6_ = self->description_label; #line 119 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 0); + gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), 0); #line 120 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp8_ = self->description_label; + _tmp7_ = self->description_label; #line 120 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), 0); + gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 0); #line 122 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = self->angle_label; + _tmp8_ = self->angle_label; #line 122 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), 0); + gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), 0); #line 123 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp10_ = self->angle_label; + _tmp9_ = self->angle_label; #line 123 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 0); + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), 0); #line 124 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp11_ = self->angle_label; + _tmp10_ = self->angle_label; #line 124 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 0); + gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 0); #line 125 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = self->angle_label; + _tmp11_ = self->angle_label; #line 125 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), 0); + gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 0); #line 126 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = self->angle_label; + _tmp12_ = self->angle_label; #line 126 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_LABEL_SIZE, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_LABEL_SIZE, -1); #line 128 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); + _tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); #line 128 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_object_ref_sink (_tmp14_); + g_object_ref_sink (_tmp13_); #line 128 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - slider_layout = _tmp14_; + slider_layout = _tmp13_; #line 129 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = self->angle_slider; + _tmp14_ = self->angle_slider; #line 129 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_box_pack_start (slider_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (slider_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 131 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp16_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); + _tmp15_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); #line 131 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_object_ref_sink (_tmp16_); + g_object_ref_sink (_tmp15_); #line 131 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - button_layout = _tmp16_; + button_layout = _tmp15_; #line 132 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp17_ = self->cancel_button; + _tmp16_ = self->cancel_button; #line 132 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1); #line 133 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp18_ = self->reset_button; + _tmp17_ = self->reset_button; #line 133 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1); #line 134 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp19_ = self->ok_button; + _tmp18_ = self->ok_button; #line 134 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1); #line 135 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp20_ = self->cancel_button; + _tmp19_ = self->cancel_button; #line 135 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 136 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp21_ = self->reset_button; + _tmp20_ = self->reset_button; #line 136 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 137 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp22_ = self->ok_button; + _tmp21_ = self->ok_button; #line 137 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 139 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + _tmp22_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); #line 139 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_object_ref_sink (_tmp23_); + g_object_ref_sink (_tmp22_); #line 139 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - main_layout = _tmp23_; + main_layout = _tmp22_; #line 140 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp24_ = self->description_label; + _tmp23_ = self->description_label; #line 140 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 141 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (slider_layout, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 142 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp25_ = self->angle_label; + _tmp24_ = self->angle_label; #line 142 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 143 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (button_layout, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 145 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (main_layout, gtk_widget_get_type (), GtkWidget)); #line 147 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp26_ = self->reset_button; + _tmp25_ = self->reset_button; #line 147 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_signal_connect_object (_tmp26_, "clicked", (GCallback) _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp25_, "clicked", (GCallback) _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked, self, 0); #line 149 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gtk_window_set_position (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GTK_WIN_POS_CENTER_ON_PARENT); #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -3348,18 +3349,22 @@ static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_ _g_object_unref0 (slider_layout); #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return self; -#line 3352 "StraightenTool.c" +#line 3353 "StraightenTool.c" } -static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_tool_straighten_tool_window_new (GtkWindow* container) { +static EditingToolsStraightenToolStraightenToolWindow* +editing_tools_straighten_tool_straighten_tool_window_new (GtkWindow* container) +{ #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return editing_tools_straighten_tool_straighten_tool_window_construct (EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_TOOL_WINDOW, container); -#line 3359 "StraightenTool.c" +#line 3362 "StraightenTool.c" } -static void editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked (EditingToolsStraightenToolStraightenToolWindow* self) { +static void +editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked (EditingToolsStraightenToolStraightenToolWindow* self) +{ GtkScale* _tmp0_; #line 152 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_TOOL_WINDOW (self)); @@ -3367,20 +3372,24 @@ static void editing_tools_straighten_tool_straighten_tool_window_on_reset_clicke _tmp0_ = self->angle_slider; #line 153 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 0.0); -#line 3371 "StraightenTool.c" +#line 3376 "StraightenTool.c" } -static void editing_tools_straighten_tool_straighten_tool_window_class_init (EditingToolsStraightenToolStraightenToolWindowClass * klass) { +static void +editing_tools_straighten_tool_straighten_tool_window_class_init (EditingToolsStraightenToolStraightenToolWindowClass * klass) +{ #line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_straighten_tool_window_parent_class = g_type_class_peek_parent (klass); #line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" G_OBJECT_CLASS (klass)->finalize = editing_tools_straighten_tool_straighten_tool_window_finalize; -#line 3380 "StraightenTool.c" +#line 3387 "StraightenTool.c" } -static void editing_tools_straighten_tool_straighten_tool_window_instance_init (EditingToolsStraightenToolStraightenToolWindow * self) { +static void +editing_tools_straighten_tool_straighten_tool_window_instance_init (EditingToolsStraightenToolStraightenToolWindow * self) +{ GtkScale* _tmp0_; GtkLabel* _tmp1_; GtkLabel* _tmp2_; @@ -3423,11 +3432,13 @@ static void editing_tools_straighten_tool_straighten_tool_window_instance_init ( g_object_ref_sink (_tmp5_); #line 102 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->reset_button = _tmp5_; -#line 3427 "StraightenTool.c" +#line 3436 "StraightenTool.c" } -static void editing_tools_straighten_tool_straighten_tool_window_finalize (GObject * obj) { +static void +editing_tools_straighten_tool_straighten_tool_window_finalize (GObject * obj) +{ EditingToolsStraightenToolStraightenToolWindow * self; #line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_TOOL_WINDOW, EditingToolsStraightenToolStraightenToolWindow); @@ -3445,11 +3456,13 @@ static void editing_tools_straighten_tool_straighten_tool_window_finalize (GObje _g_object_unref0 (self->reset_button); #line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" G_OBJECT_CLASS (editing_tools_straighten_tool_straighten_tool_window_parent_class)->finalize (obj); -#line 3449 "StraightenTool.c" +#line 3460 "StraightenTool.c" } -static GType editing_tools_straighten_tool_straighten_tool_window_get_type (void) { +static GType +editing_tools_straighten_tool_straighten_tool_window_get_type (void) +{ static volatile gsize editing_tools_straighten_tool_straighten_tool_window_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_straighten_tool_straighten_tool_window_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditingToolsStraightenToolStraightenToolWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_straighten_tool_straighten_tool_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsStraightenToolStraightenToolWindow), 0, (GInstanceInitFunc) editing_tools_straighten_tool_straighten_tool_window_instance_init, NULL }; @@ -3461,7 +3474,9 @@ static GType editing_tools_straighten_tool_straighten_tool_window_get_type (void } -static void editing_tools_straighten_tool_class_init (EditingToolsStraightenToolClass * klass) { +static void +editing_tools_straighten_tool_class_init (EditingToolsStraightenToolClass * klass) +{ #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_parent_class = g_type_class_peek_parent (klass); #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -3484,11 +3499,13 @@ static void editing_tools_straighten_tool_class_init (EditingToolsStraightenTool ((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_straighten_tool_real_get_tool_window; #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" ((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_straighten_tool_real_paint; -#line 3488 "StraightenTool.c" +#line 3503 "StraightenTool.c" } -static void editing_tools_straighten_tool_instance_init (EditingToolsStraightenTool * self) { +static void +editing_tools_straighten_tool_instance_init (EditingToolsStraightenTool * self) +{ EditingToolsStraightenToolStraightenGuide* _tmp0_; #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv = EDITING_TOOLS_STRAIGHTEN_TOOL_GET_PRIVATE (self); @@ -3502,11 +3519,13 @@ static void editing_tools_straighten_tool_instance_init (EditingToolsStraightenT _tmp0_ = editing_tools_straighten_tool_straighten_guide_new (); #line 181 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->guide = _tmp0_; -#line 3506 "StraightenTool.c" +#line 3523 "StraightenTool.c" } -static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool * obj) { +static void +editing_tools_straighten_tool_finalize (EditingToolsEditingTool * obj) +{ EditingToolsStraightenTool * self; #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); @@ -3524,7 +3543,7 @@ static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool * ob _editing_tools_straighten_tool_straighten_guide_unref0 (self->priv->guide); #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->finalize (obj); -#line 3528 "StraightenTool.c" +#line 3547 "StraightenTool.c" } @@ -3532,7 +3551,9 @@ static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool * ob * An editing tool that allows one to introduce or remove a Dutch angle from * a photograph. */ -GType editing_tools_straighten_tool_get_type (void) { +GType +editing_tools_straighten_tool_get_type (void) +{ static volatile gsize editing_tools_straighten_tool_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_straighten_tool_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditingToolsStraightenToolClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_straighten_tool_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsStraightenTool), 0, (GInstanceInitFunc) editing_tools_straighten_tool_instance_init, NULL }; diff --git a/src/events/EventDirectoryItem.c b/src/events/EventDirectoryItem.c index 5141809..9862c4b 100644 --- a/src/events/EventDirectoryItem.c +++ b/src/events/EventDirectoryItem.c @@ -1,4 +1,4 @@ -/* EventDirectoryItem.c generated by valac 0.36.6, the Vala compiler +/* EventDirectoryItem.c generated by valac 0.40.4, the Vala compiler * generated from EventDirectoryItem.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -139,6 +140,11 @@ typedef struct _EventSourceClass EventSourceClass; typedef struct _Event Event; typedef struct _EventClass EventClass; +enum { + EVENT_DIRECTORY_ITEM_0_PROPERTY, + EVENT_DIRECTORY_ITEM_NUM_PROPERTIES +}; +static GParamSpec* event_directory_item_properties[EVENT_DIRECTORY_ITEM_NUM_PROPERTIES]; #define TYPE_SOURCE_COLLECTION (source_collection_get_type ()) #define SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SOURCE_COLLECTION, SourceCollection)) @@ -357,16 +363,28 @@ Scaling event_directory_item_squared_scaling = {0}; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_view_get_type (void) G_GNUC_CONST; @@ -381,48 +399,85 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST; GType event_source_get_type (void) G_GNUC_CONST; GType event_get_type (void) G_GNUC_CONST; #define EVENT_DIRECTORY_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItemPrivate)) -enum { - EVENT_DIRECTORY_ITEM_DUMMY_PROPERTY -}; GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType event_source_collection_get_type (void) G_GNUC_CONST; -static void event_directory_item_on_events_altered (EventDirectoryItem* self, GeeMap* map); -static void _event_directory_item_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void event_directory_item_on_events_altered (EventDirectoryItem* self, + GeeMap* map); +static void _event_directory_item_on_events_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); GType scaling_get_type (void) G_GNUC_CONST; GType scale_constraint_get_type (void) G_GNUC_CONST; Scaling* scaling_dup (const Scaling* self); void scaling_free (Scaling* self); -void scaling_to_fill_viewport (Dimensions* viewport, Scaling* result); +void scaling_to_fill_viewport (Dimensions* viewport, + Scaling* result); static gint event_directory_item_get_CROPPED_SCALE (void); -void dimensions_init (Dimensions *self, gint width, gint height); +void dimensions_init (Dimensions *self, + gint width, + gint height); EventDirectoryItem* event_directory_item_new (Event* event); -EventDirectoryItem* event_directory_item_construct (GType object_type, Event* event); +EventDirectoryItem* event_directory_item_construct (GType object_type, + Event* event); static gchar* event_directory_item_get_formatted_title (Event* event); gchar* event_source_get_comment (EventSource* self); -CheckerboardItem* checkerboard_item_construct (GType object_type, ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment); +CheckerboardItem* checkerboard_item_construct (GType object_type, + ThumbnailSource* source, + Dimensions* initial_pixbuf_dim, + const gchar* title, + const gchar* comment, + gboolean marked_up, + PangoAlignment alignment); GType media_source_get_type (void) G_GNUC_CONST; -static void event_directory_item_get_paul_lynde_rect (MediaSource* source, GdkRectangle* result); +static void event_directory_item_get_paul_lynde_rect (MediaSource* source, + GdkRectangle* result); MediaSource* event_get_primary_source (Event* self); -void checkerboard_item_clear_image (CheckerboardItem* self, Dimensions* dim); -void dimensions_for_rectangle (GdkRectangle* rect, Dimensions* result); -void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensions* result); +void checkerboard_item_clear_image (CheckerboardItem* self, + Dimensions* dim); +void dimensions_for_rectangle (GdkRectangle* rect, + Dimensions* result); +void scaling_get_scaled_dimensions (Scaling *self, + Dimensions* original, + Dimensions* result); GType photo_exception_get_type (void) G_GNUC_CONST; -void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result); -static GdkPixbuf* event_directory_item_get_paul_lynde (MediaSource* media, GdkRectangle* paul_lynde, GError** error); -GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, Scaling* scaling, GError** error); -void thumbnail_cache_fetch_async_scaled (ThumbnailSource* source, gint scale, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable); +void media_source_get_dimensions (MediaSource* self, + PhotoException disallowed_steps, + Dimensions* result); +static GdkPixbuf* event_directory_item_get_paul_lynde (MediaSource* media, + GdkRectangle* paul_lynde, + GError** error); +GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, + Scaling* scaling, + GError** error); +void thumbnail_cache_fetch_async_scaled (ThumbnailSource* source, + gint scale, + Dimensions* dim, + GdkInterpType interp, + ThumbnailCacheAsyncFetchCallback callback, + void* callback_target, + GCancellable* cancellable); GType thumbnail_cache_size_get_type (void) G_GNUC_CONST; #define THUMBNAIL_CACHE_DEFAULT_INTERP GDK_INTERP_HYPER static void ___lambda19_ (void); -static void ____lambda19__thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self); +static void ____lambda19__thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, + GdkPixbuf* unscaled, + Dimensions* dim, + GdkInterpType interp, + GError* err, + gpointer self); GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; -GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error); -void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result); -void clamp_rectangle (GdkRectangle* original, Dimensions* max, GdkRectangle* result); +GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, + Scaling* scaling, + GError** error); +void dimensions_for_pixbuf (GdkPixbuf* pixbuf, + Dimensions* result); +void clamp_rectangle (GdkRectangle* original, + Dimensions* max, + GdkRectangle* result); gboolean media_source_collection_has_photo (GeeCollection* media); GeeCollection* event_source_get_media (EventSource* self); gboolean media_source_collection_has_video (GeeCollection* media); @@ -432,392 +487,423 @@ gchar* data_object_get_name (DataObject* self); gchar* guarded_markup_escape_text (const gchar* plain); static void event_directory_item_real_exposed (CheckerboardItem* base); gboolean checkerboard_item_is_exposed (CheckerboardItem* self); -void checkerboard_item_set_image (CheckerboardItem* self, GdkPixbuf* pixbuf); +void checkerboard_item_set_image (CheckerboardItem* self, + GdkPixbuf* pixbuf); gchar* data_object_to_string (DataObject* self); -static void event_directory_item_update_comment (EventDirectoryItem* self, gboolean init); +static void event_directory_item_update_comment (EventDirectoryItem* self, + gboolean init); void checkerboard_item_exposed (CheckerboardItem* self); static void event_directory_item_real_unexposed (CheckerboardItem* base); void checkerboard_item_unexposed (CheckerboardItem* self); -void checkerboard_item_set_title (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment); +void checkerboard_item_set_title (CheckerboardItem* self, + const gchar* text, + gboolean marked_up, + PangoAlignment alignment); static void event_directory_item_real_thumbnail_altered (ThumbnailView* base); -static void event_directory_item_real_paint_shadow (CheckerboardItem* base, cairo_t* ctx, Dimensions* dimensions, GdkPoint* origin, gint radius, gfloat initial_alpha); -void checkerboard_item_paint_shadow (CheckerboardItem* self, cairo_t* ctx, Dimensions* dimensions, GdkPoint* origin, gint radius, gfloat initial_alpha); -static void event_directory_item_real_paint_border (CheckerboardItem* base, cairo_t* ctx, Dimensions* object_dimensions, GdkPoint* object_origin, gint border_width); -void checkerboard_item_get_border_dimensions (Dimensions* object_dim, gint border_width, Dimensions* result); -void checkerboard_item_get_border_origin (GdkPoint* object_origin, gint border_width, GdkPoint* result); -void draw_rounded_corners_filled (cairo_t* ctx, Dimensions* dim, GdkPoint* origin, gdouble radius_proportion); -static void event_directory_item_real_paint_image (CheckerboardItem* base, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin); -void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gdouble radius_proportion); +static void event_directory_item_real_paint_shadow (CheckerboardItem* base, + cairo_t* ctx, + Dimensions* dimensions, + GdkPoint* origin, + gint radius, + gfloat initial_alpha); +void checkerboard_item_paint_shadow (CheckerboardItem* self, + cairo_t* ctx, + Dimensions* dimensions, + GdkPoint* origin, + gint radius, + gfloat initial_alpha); +static void event_directory_item_real_paint_border (CheckerboardItem* base, + cairo_t* ctx, + Dimensions* object_dimensions, + GdkPoint* object_origin, + gint border_width); +void checkerboard_item_get_border_dimensions (Dimensions* object_dim, + gint border_width, + Dimensions* result); +void checkerboard_item_get_border_origin (GdkPoint* object_origin, + gint border_width, + GdkPoint* result); +void draw_rounded_corners_filled (cairo_t* ctx, + Dimensions* dim, + GdkPoint* origin, + gdouble radius_proportion); +static void event_directory_item_real_paint_image (CheckerboardItem* base, + cairo_t* ctx, + GdkPixbuf* pixbuf, + GdkPoint* origin); +void context_rounded_corners (cairo_t* cx, + Dimensions* dim, + GdkPoint* origin, + gdouble radius_proportion); gboolean is_string_empty (const gchar* s); void checkerboard_item_clear_comment (CheckerboardItem* self); -void checkerboard_item_set_comment (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment); +void checkerboard_item_set_comment (CheckerboardItem* self, + const gchar* text, + gboolean marked_up, + PangoAlignment alignment); gint thumbnail_cache_size_get_scale (ThumbnailCacheSize self); static void event_directory_item_finalize (GObject * obj); -static void _vala_event_directory_item_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); +static void _vala_event_directory_item_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); -static void _event_directory_item_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_event_directory_item_on_events_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 39 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" event_directory_item_on_events_altered ((EventDirectoryItem*) self, items); -#line 463 "EventDirectoryItem.c" +#line 560 "EventDirectoryItem.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 26 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return self ? g_object_ref (self) : NULL; -#line 470 "EventDirectoryItem.c" +#line 569 "EventDirectoryItem.c" } -EventDirectoryItem* event_directory_item_construct (GType object_type, Event* event) { +EventDirectoryItem* +event_directory_item_construct (GType object_type, + Event* event) +{ EventDirectoryItem * self = NULL; - Event* _tmp0_; + gint _tmp0_; gint _tmp1_; gint _tmp2_; gint _tmp3_; - gint _tmp4_; - Dimensions _tmp5_ = {0}; - Event* _tmp6_; + Dimensions _tmp4_ = {0}; + gchar* _tmp5_; + gchar* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; Event* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; - Event* _tmp12_; - Event* _tmp13_; - Event* _tmp14_; - MediaSource* _tmp15_; - MediaSource* _tmp16_; - GdkRectangle _tmp17_ = {0}; - GdkRectangle _tmp18_; - Dimensions _tmp19_ = {0}; - EventSourceCollection* _tmp20_; + MediaSource* _tmp10_; + MediaSource* _tmp11_; + GdkRectangle _tmp12_ = {0}; + GdkRectangle _tmp13_; + Dimensions _tmp14_ = {0}; + EventSourceCollection* _tmp15_; #line 22 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" g_return_val_if_fail (IS_EVENT (event), NULL); #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp0_ = event; + _tmp0_ = event_directory_item_get_CROPPED_SCALE (); #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp1_ = event_directory_item_get_CROPPED_SCALE (); + _tmp1_ = _tmp0_; #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp2_ = _tmp1_; + _tmp2_ = event_directory_item_get_CROPPED_SCALE (); #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp3_ = event_directory_item_get_CROPPED_SCALE (); + _tmp3_ = _tmp2_; #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = _tmp3_; + dimensions_init (&_tmp4_, _tmp1_, _tmp3_); #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - dimensions_init (&_tmp5_, _tmp2_, _tmp4_); + _tmp5_ = event_directory_item_get_formatted_title (event); #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp6_ = event; + _tmp6_ = _tmp5_; #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp7_ = event_directory_item_get_formatted_title (_tmp6_); + _tmp7_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_EVENT_SOURCE, EventSource)); #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _tmp8_ = _tmp7_; #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp9_ = event; -#line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp10_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_EVENT_SOURCE, EventSource)); -#line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp11_ = _tmp10_; -#line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - self = (EventDirectoryItem*) checkerboard_item_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), &_tmp5_, _tmp8_, _tmp11_, TRUE, PANGO_ALIGN_CENTER); -#line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_free0 (_tmp11_); + self = (EventDirectoryItem*) checkerboard_item_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), &_tmp4_, _tmp6_, _tmp8_, TRUE, PANGO_ALIGN_CENTER); #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_free0 (_tmp8_); +#line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" + _g_free0 (_tmp6_); #line 26 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp12_ = event; -#line 26 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp13_ = _g_object_ref0 (_tmp12_); + _tmp9_ = _g_object_ref0 (event); #line 26 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_object_unref0 (self->event); #line 26 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - self->event = _tmp13_; + self->event = _tmp9_; #line 29 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp14_ = event; + _tmp10_ = event_get_primary_source (event); #line 29 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp15_ = event_get_primary_source (_tmp14_); -#line 29 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp16_ = _tmp15_; + _tmp11_ = _tmp10_; #line 29 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - event_directory_item_get_paul_lynde_rect (_tmp16_, &_tmp17_); + event_directory_item_get_paul_lynde_rect (_tmp11_, &_tmp12_); #line 29 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - self->priv->paul_lynde = _tmp17_; + self->priv->paul_lynde = _tmp12_; #line 29 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp11_); #line 32 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp18_ = self->priv->paul_lynde; + _tmp13_ = self->priv->paul_lynde; #line 32 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - dimensions_for_rectangle (&_tmp18_, &_tmp19_); + dimensions_for_rectangle (&_tmp13_, &_tmp14_); #line 32 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp19_); + checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp14_); #line 35 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp20_ = event_global; + _tmp15_ = event_global; #line 35 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _event_directory_item_on_events_altered_data_collection_items_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _event_directory_item_on_events_altered_data_collection_items_altered, self, 0); #line 22 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return self; -#line 561 "EventDirectoryItem.c" +#line 648 "EventDirectoryItem.c" } -EventDirectoryItem* event_directory_item_new (Event* event) { +EventDirectoryItem* +event_directory_item_new (Event* event) +{ #line 22 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return event_directory_item_construct (TYPE_EVENT_DIRECTORY_ITEM, event); -#line 568 "EventDirectoryItem.c" +#line 657 "EventDirectoryItem.c" } -static void event_directory_item_get_paul_lynde_rect (MediaSource* source, GdkRectangle* result) { +static void +event_directory_item_get_paul_lynde_rect (MediaSource* source, + GdkRectangle* result) +{ Dimensions scaled = {0}; - MediaSource* _tmp0_; + Dimensions _tmp0_ = {0}; Dimensions _tmp1_ = {0}; - Dimensions _tmp2_ = {0}; GdkRectangle paul_lynde = {0}; - Dimensions _tmp3_; + Dimensions _tmp2_; + gint _tmp3_; gint _tmp4_; gint _tmp5_; - gint _tmp6_; - Dimensions _tmp7_; - gint _tmp8_; + Dimensions _tmp6_; + gint _tmp7_; + Dimensions _tmp8_; gint _tmp9_; - Dimensions _tmp10_; + gint _tmp10_; gint _tmp11_; - gint _tmp12_; + Dimensions _tmp12_; gint _tmp13_; - Dimensions _tmp14_; + gint _tmp14_; gint _tmp15_; gint _tmp16_; gint _tmp17_; - gint _tmp18_; - gint _tmp19_; - gint _tmp20_; #line 43 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" g_return_if_fail (IS_MEDIA_SOURCE (source)); #line 44 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp0_ = source; -#line 44 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - media_source_get_dimensions (_tmp0_, PHOTO_EXCEPTION_NONE, &_tmp1_); + media_source_get_dimensions (source, PHOTO_EXCEPTION_NONE, &_tmp0_); #line 44 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - scaling_get_scaled_dimensions (&event_directory_item_squared_scaling, &_tmp1_, &_tmp2_); + scaling_get_scaled_dimensions (&event_directory_item_squared_scaling, &_tmp0_, &_tmp1_); #line 44 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - scaled = _tmp2_; + scaled = _tmp1_; #line 46 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" memset (&paul_lynde, 0, sizeof (GdkRectangle)); #line 47 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp3_ = scaled; + _tmp2_ = scaled; #line 47 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = _tmp3_.width; + _tmp3_ = _tmp2_.width; #line 47 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp5_ = event_directory_item_get_CROPPED_SCALE (); + _tmp4_ = event_directory_item_get_CROPPED_SCALE (); #line 47 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp6_ = _tmp5_; -#line 47 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp7_ = scaled; + _tmp5_ = _tmp4_; #line 47 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp8_ = _tmp7_.width; + _tmp6_ = scaled; #line 47 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp9_ = CLAMP (_tmp4_ - _tmp6_, 0, _tmp8_); + _tmp7_ = _tmp6_.width; #line 47 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - paul_lynde.x = _tmp9_ / 2; + paul_lynde.x = CLAMP (_tmp3_ - _tmp5_, 0, _tmp7_) / 2; #line 48 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp10_ = scaled; + _tmp8_ = scaled; #line 48 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp11_ = _tmp10_.height; + _tmp9_ = _tmp8_.height; #line 48 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp12_ = event_directory_item_get_CROPPED_SCALE (); + _tmp10_ = event_directory_item_get_CROPPED_SCALE (); #line 48 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp13_ = _tmp12_; -#line 48 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp14_ = scaled; + _tmp11_ = _tmp10_; #line 48 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp15_ = _tmp14_.height; + _tmp12_ = scaled; #line 48 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp16_ = CLAMP (_tmp11_ - _tmp13_, 0, _tmp15_); + _tmp13_ = _tmp12_.height; #line 48 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - paul_lynde.y = _tmp16_ / 2; + paul_lynde.y = CLAMP (_tmp9_ - _tmp11_, 0, _tmp13_) / 2; #line 49 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp17_ = event_directory_item_get_CROPPED_SCALE (); + _tmp14_ = event_directory_item_get_CROPPED_SCALE (); #line 49 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp18_ = _tmp17_; + _tmp15_ = _tmp14_; #line 49 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - paul_lynde.width = _tmp18_; + paul_lynde.width = _tmp15_; #line 50 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp19_ = event_directory_item_get_CROPPED_SCALE (); + _tmp16_ = event_directory_item_get_CROPPED_SCALE (); #line 50 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp20_ = _tmp19_; + _tmp17_ = _tmp16_; #line 50 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - paul_lynde.height = _tmp20_; + paul_lynde.height = _tmp17_; #line 52 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" *result = paul_lynde; #line 52 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return; -#line 656 "EventDirectoryItem.c" +#line 739 "EventDirectoryItem.c" } -static void ___lambda19_ (void) { +static void +___lambda19_ (void) +{ } -static void ____lambda19__thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self) { +static void +____lambda19__thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, + GdkPixbuf* unscaled, + Dimensions* dim, + GdkInterpType interp, + GError* err, + gpointer self) +{ #line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" ___lambda19_ (); -#line 667 "EventDirectoryItem.c" +#line 759 "EventDirectoryItem.c" } -static gpointer _g_error_copy0 (gpointer self) { +static gpointer +_g_error_copy0 (gpointer self) +{ #line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return self ? g_error_copy (self) : NULL; -#line 674 "EventDirectoryItem.c" +#line 768 "EventDirectoryItem.c" } -static GdkPixbuf* event_directory_item_get_paul_lynde (MediaSource* media, GdkRectangle* paul_lynde, GError** error) { +static GdkPixbuf* +event_directory_item_get_paul_lynde (MediaSource* media, + GdkRectangle* paul_lynde, + GError** error) +{ GdkPixbuf* result = NULL; GdkPixbuf* pixbuf = NULL; Dimensions thumbnail_dimensions = {0}; - GdkPixbuf* _tmp17_; - Dimensions _tmp18_ = {0}; - gboolean _tmp19_ = FALSE; - Dimensions _tmp20_; - gint _tmp21_; - GdkRectangle _tmp22_; - gint _tmp23_; - GdkRectangle _tmp37_; - Dimensions _tmp38_; - GdkRectangle _tmp39_ = {0}; - GdkPixbuf* _tmp40_; - GdkRectangle _tmp41_; - gint _tmp42_; - GdkRectangle _tmp43_; - gint _tmp44_; - GdkRectangle _tmp45_; - gint _tmp46_; - GdkRectangle _tmp47_; - gint _tmp48_; - GdkPixbuf* _tmp49_; + GdkPixbuf* _tmp13_; + Dimensions _tmp14_ = {0}; + gboolean _tmp15_ = FALSE; + Dimensions _tmp16_; + gint _tmp17_; + GdkRectangle _tmp18_; + gint _tmp19_; + GdkRectangle _tmp32_; + Dimensions _tmp33_; + GdkRectangle _tmp34_ = {0}; + GdkPixbuf* _tmp35_; + GdkRectangle _tmp36_; + gint _tmp37_; + GdkRectangle _tmp38_; + gint _tmp39_; + GdkRectangle _tmp40_; + gint _tmp41_; + GdkRectangle _tmp42_; + gint _tmp43_; + GdkPixbuf* _tmp44_; GError * _inner_error_ = NULL; #line 56 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (media), NULL); #line 56 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" g_return_val_if_fail (paul_lynde != NULL, NULL); -#line 707 "EventDirectoryItem.c" +#line 805 "EventDirectoryItem.c" { GdkPixbuf* _tmp0_ = NULL; - MediaSource* _tmp1_; - Scaling _tmp2_; + Scaling _tmp1_; + GdkPixbuf* _tmp2_; GdkPixbuf* _tmp3_; - GdkPixbuf* _tmp4_; #line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp1_ = media; + _tmp1_ = event_directory_item_squared_scaling; #line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp2_ = event_directory_item_squared_scaling; + _tmp2_ = media_source_get_preview_pixbuf (media, &_tmp1_, &_inner_error_); #line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp3_ = media_source_get_preview_pixbuf (_tmp1_, &_tmp2_, &_inner_error_); -#line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp0_ = _tmp3_; + _tmp0_ = _tmp2_; #line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 724 "EventDirectoryItem.c" +#line 819 "EventDirectoryItem.c" goto __catch58_g_error; } #line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = _tmp0_; + _tmp3_ = _tmp0_; #line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _tmp0_ = NULL; #line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_object_unref0 (pixbuf); #line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - pixbuf = _tmp4_; + pixbuf = _tmp3_; #line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_object_unref0 (_tmp0_); -#line 737 "EventDirectoryItem.c" +#line 832 "EventDirectoryItem.c" } goto __finally58; __catch58_g_error: { GError* _error_ = NULL; - MediaSource* _tmp5_; - Dimensions _tmp6_ = {0}; - MediaSource* _tmp7_; + Dimensions _tmp4_ = {0}; #line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _error_ = _inner_error_; #line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _inner_error_ = NULL; #line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp5_ = media; + dimensions_init (&_tmp4_, (gint) THUMBNAIL_CACHE_SIZE_BIG, (gint) THUMBNAIL_CACHE_SIZE_BIG); #line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - dimensions_init (&_tmp6_, (gint) THUMBNAIL_CACHE_SIZE_BIG, (gint) THUMBNAIL_CACHE_SIZE_BIG); -#line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - thumbnail_cache_fetch_async_scaled (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), (gint) THUMBNAIL_CACHE_SIZE_BIG, &_tmp6_, THUMBNAIL_CACHE_DEFAULT_INTERP, ____lambda19__thumbnail_cache_async_fetch_callback, NULL, NULL); -#line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp7_ = media; + thumbnail_cache_fetch_async_scaled (G_TYPE_CHECK_INSTANCE_CAST (media, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), (gint) THUMBNAIL_CACHE_SIZE_BIG, &_tmp4_, THUMBNAIL_CACHE_DEFAULT_INTERP, ____lambda19__thumbnail_cache_async_fetch_callback, NULL, NULL); #line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO)) { -#line 760 "EventDirectoryItem.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (media, TYPE_LIBRARY_PHOTO)) { +#line 849 "EventDirectoryItem.c" LibraryPhoto* photo = NULL; - MediaSource* _tmp8_; - LibraryPhoto* _tmp9_; - GdkPixbuf* _tmp10_ = NULL; - LibraryPhoto* _tmp11_; - Scaling _tmp12_; - GdkPixbuf* _tmp13_; - GdkPixbuf* _tmp14_; -#line 66 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp8_ = media; + LibraryPhoto* _tmp5_; + GdkPixbuf* _tmp6_ = NULL; + LibraryPhoto* _tmp7_; + Scaling _tmp8_; + GdkPixbuf* _tmp9_; + GdkPixbuf* _tmp10_; #line 66 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (media, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 66 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - photo = _tmp9_; + photo = _tmp5_; #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp11_ = photo; + _tmp7_ = photo; #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp12_ = event_directory_item_squared_scaling; + _tmp8_ = event_directory_item_squared_scaling; #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp13_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp12_, &_inner_error_); + _tmp9_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp8_, &_inner_error_); #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp10_ = _tmp13_; + _tmp6_ = _tmp9_; #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_object_unref0 (photo); #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_error_free0 (_error_); -#line 789 "EventDirectoryItem.c" +#line 875 "EventDirectoryItem.c" goto __finally58; } #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp14_ = _tmp10_; + _tmp10_ = _tmp6_; #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp10_ = NULL; + _tmp6_ = NULL; #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_object_unref0 (pixbuf); #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - pixbuf = _tmp14_; + pixbuf = _tmp10_; #line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp6_); #line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_object_unref0 (photo); -#line 804 "EventDirectoryItem.c" +#line 890 "EventDirectoryItem.c" } else { - GError* _tmp15_; - GError* _tmp16_; + GError* _tmp11_; + GError* _tmp12_; #line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp15_ = _error_; + _tmp11_ = _error_; #line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp16_ = _g_error_copy0 (_tmp15_); + _tmp12_ = _g_error_copy0 (_tmp11_); #line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _inner_error_ = _tmp16_; + _inner_error_ = _tmp12_; #line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_error_free0 (_error_); -#line 816 "EventDirectoryItem.c" +#line 902 "EventDirectoryItem.c" goto __finally58; } #line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_error_free0 (_error_); -#line 821 "EventDirectoryItem.c" +#line 907 "EventDirectoryItem.c" } __finally58: #line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -828,71 +914,68 @@ static GdkPixbuf* event_directory_item_get_paul_lynde (MediaSource* media, GdkRe _g_object_unref0 (pixbuf); #line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return NULL; -#line 832 "EventDirectoryItem.c" +#line 918 "EventDirectoryItem.c" } #line 73 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp17_ = pixbuf; + _tmp13_ = pixbuf; #line 73 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - dimensions_for_pixbuf (_tmp17_, &_tmp18_); + dimensions_for_pixbuf (_tmp13_, &_tmp14_); #line 73 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - thumbnail_dimensions = _tmp18_; + thumbnail_dimensions = _tmp14_; #line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp20_ = thumbnail_dimensions; + _tmp16_ = thumbnail_dimensions; #line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp21_ = _tmp20_.width; + _tmp17_ = _tmp16_.width; #line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp22_ = *paul_lynde; + _tmp18_ = *paul_lynde; #line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp23_ = _tmp22_.width; + _tmp19_ = _tmp18_.width; #line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp21_ > (2 * _tmp23_)) { + if (_tmp17_ > (2 * _tmp19_)) { #line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp19_ = TRUE; -#line 852 "EventDirectoryItem.c" + _tmp15_ = TRUE; +#line 938 "EventDirectoryItem.c" } else { - Dimensions _tmp24_; - gint _tmp25_; - GdkRectangle _tmp26_; - gint _tmp27_; + Dimensions _tmp20_; + gint _tmp21_; + GdkRectangle _tmp22_; + gint _tmp23_; #line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp24_ = thumbnail_dimensions; + _tmp20_ = thumbnail_dimensions; #line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp25_ = _tmp24_.height; + _tmp21_ = _tmp20_.height; #line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp26_ = *paul_lynde; + _tmp22_ = *paul_lynde; #line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp27_ = _tmp26_.height; + _tmp23_ = _tmp22_.height; #line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp19_ = _tmp25_ > (_tmp27_ * 2); -#line 868 "EventDirectoryItem.c" + _tmp15_ = _tmp21_ > (_tmp23_ * 2); +#line 954 "EventDirectoryItem.c" } #line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp19_) { -#line 872 "EventDirectoryItem.c" + if (_tmp15_) { +#line 958 "EventDirectoryItem.c" LibraryPhoto* photo = NULL; - MediaSource* _tmp28_; - LibraryPhoto* _tmp29_; - GdkPixbuf* _tmp30_ = NULL; - LibraryPhoto* _tmp31_; - Scaling _tmp32_; - GdkPixbuf* _tmp33_; - GdkPixbuf* _tmp34_; - GdkPixbuf* _tmp35_; - Dimensions _tmp36_ = {0}; -#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp28_ = media; + LibraryPhoto* _tmp24_; + GdkPixbuf* _tmp25_ = NULL; + LibraryPhoto* _tmp26_; + Scaling _tmp27_; + GdkPixbuf* _tmp28_; + GdkPixbuf* _tmp29_; + GdkPixbuf* _tmp30_; + Dimensions _tmp31_ = {0}; #line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (media, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - photo = _tmp29_; + photo = _tmp24_; #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp31_ = photo; + _tmp26_ = photo; #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp32_ = event_directory_item_squared_scaling; + _tmp27_ = event_directory_item_squared_scaling; #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp33_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp32_, &_inner_error_); + _tmp28_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp27_, &_inner_error_); #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp30_ = _tmp33_; + _tmp25_ = _tmp28_; #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -903,269 +986,247 @@ static GdkPixbuf* event_directory_item_get_paul_lynde (MediaSource* media, GdkRe _g_object_unref0 (pixbuf); #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return NULL; -#line 907 "EventDirectoryItem.c" +#line 990 "EventDirectoryItem.c" } #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp34_ = _tmp30_; + _tmp29_ = _tmp25_; #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp30_ = NULL; + _tmp25_ = NULL; #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_object_unref0 (pixbuf); #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - pixbuf = _tmp34_; + pixbuf = _tmp29_; #line 79 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp35_ = pixbuf; + _tmp30_ = pixbuf; #line 79 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - dimensions_for_pixbuf (_tmp35_, &_tmp36_); + dimensions_for_pixbuf (_tmp30_, &_tmp31_); #line 79 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - thumbnail_dimensions = _tmp36_; + thumbnail_dimensions = _tmp31_; #line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_object_unref0 (_tmp30_); + _g_object_unref0 (_tmp25_); #line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_object_unref0 (photo); -#line 927 "EventDirectoryItem.c" +#line 1010 "EventDirectoryItem.c" } #line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp37_ = *paul_lynde; + _tmp32_ = *paul_lynde; #line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp38_ = thumbnail_dimensions; + _tmp33_ = thumbnail_dimensions; #line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - clamp_rectangle (&_tmp37_, &_tmp38_, &_tmp39_); + clamp_rectangle (&_tmp32_, &_tmp33_, &_tmp34_); #line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - *paul_lynde = _tmp39_; + *paul_lynde = _tmp34_; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp40_ = pixbuf; + _tmp35_ = pixbuf; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp41_ = *paul_lynde; + _tmp36_ = *paul_lynde; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp42_ = _tmp41_.x; + _tmp37_ = _tmp36_.x; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp43_ = *paul_lynde; + _tmp38_ = *paul_lynde; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp44_ = _tmp43_.y; + _tmp39_ = _tmp38_.y; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp45_ = *paul_lynde; + _tmp40_ = *paul_lynde; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp46_ = _tmp45_.width; + _tmp41_ = _tmp40_.width; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp47_ = *paul_lynde; + _tmp42_ = *paul_lynde; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp48_ = _tmp47_.height; + _tmp43_ = _tmp42_.height; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp49_ = gdk_pixbuf_new_subpixbuf (_tmp40_, _tmp42_, _tmp44_, _tmp46_, _tmp48_); + _tmp44_ = gdk_pixbuf_new_subpixbuf (_tmp35_, _tmp37_, _tmp39_, _tmp41_, _tmp43_); #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - result = _tmp49_; + result = _tmp44_; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_object_unref0 (pixbuf); #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return result; -#line 963 "EventDirectoryItem.c" +#line 1046 "EventDirectoryItem.c" } -static gchar* event_directory_item_get_formatted_title (Event* event) { +static gchar* +event_directory_item_get_formatted_title (Event* event) +{ gchar* result = NULL; gboolean has_photos = FALSE; - Event* _tmp0_; + GeeCollection* _tmp0_; GeeCollection* _tmp1_; - GeeCollection* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; + gboolean _tmp2_; gboolean has_videos = FALSE; - Event* _tmp5_; - GeeCollection* _tmp6_; - GeeCollection* _tmp7_; - gboolean _tmp8_; - gboolean _tmp9_; + GeeCollection* _tmp3_; + GeeCollection* _tmp4_; + gboolean _tmp5_; gint count = 0; - Event* _tmp10_; - gint _tmp11_; gchar* count_text = NULL; - gchar* _tmp12_; - gboolean _tmp13_ = FALSE; - gboolean _tmp14_; + gchar* _tmp6_; + gboolean _tmp7_ = FALSE; + gboolean _tmp8_; gchar* daterange = NULL; - Event* _tmp26_; - gchar* _tmp27_; + gchar* _tmp20_; gchar* name = NULL; - Event* _tmp28_; - gchar* _tmp29_; - gboolean _tmp30_ = FALSE; - const gchar* _tmp31_; + gchar* _tmp21_; + gboolean _tmp22_ = FALSE; + const gchar* _tmp23_; #line 90 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" g_return_val_if_fail (IS_EVENT (event), NULL); #line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp0_ = event; + _tmp0_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_EVENT_SOURCE, EventSource)); #line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp1_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_SOURCE, EventSource)); -#line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp3_ = media_source_collection_has_photo (_tmp2_); + _tmp2_ = media_source_collection_has_photo (_tmp1_); #line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = _tmp3_; + _g_object_unref0 (_tmp1_); #line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_object_unref0 (_tmp2_); -#line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - has_photos = _tmp4_; -#line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp5_ = event; + has_photos = _tmp2_; #line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp6_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_EVENT_SOURCE, EventSource)); + _tmp3_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_EVENT_SOURCE, EventSource)); #line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp7_ = _tmp6_; -#line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp8_ = media_source_collection_has_video (_tmp7_); + _tmp4_ = _tmp3_; #line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp9_ = _tmp8_; + _tmp5_ = media_source_collection_has_video (_tmp4_); #line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp4_); #line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - has_videos = _tmp9_; -#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp10_ = event; -#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp11_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_EVENT_SOURCE, EventSource)); + has_videos = _tmp5_; #line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - count = _tmp11_; + count = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_EVENT_SOURCE, EventSource)); #line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp12_ = g_strdup (""); + _tmp6_ = g_strdup (""); #line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - count_text = _tmp12_; + count_text = _tmp6_; #line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp14_ = has_photos; + _tmp8_ = has_photos; #line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp14_) { -#line 1040 "EventDirectoryItem.c" - gboolean _tmp15_; + if (_tmp8_) { +#line 1105 "EventDirectoryItem.c" + gboolean _tmp9_; #line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp15_ = has_videos; + _tmp9_ = has_videos; #line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp13_ = _tmp15_; -#line 1046 "EventDirectoryItem.c" + _tmp7_ = _tmp9_; +#line 1111 "EventDirectoryItem.c" } else { #line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp13_ = FALSE; -#line 1050 "EventDirectoryItem.c" + _tmp7_ = FALSE; +#line 1115 "EventDirectoryItem.c" } #line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp13_) { -#line 1054 "EventDirectoryItem.c" - gint _tmp16_; - gint _tmp17_; - gchar* _tmp18_; + if (_tmp7_) { +#line 1119 "EventDirectoryItem.c" + gint _tmp10_; + gint _tmp11_; + gchar* _tmp12_; #line 97 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp16_ = count; + _tmp10_ = count; #line 97 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp17_ = count; + _tmp11_ = count; #line 97 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp18_ = g_strdup_printf (ngettext ("%d Photo/Video", "%d Photos/Videos", (gulong) _tmp16_), _tmp17_); + _tmp12_ = g_strdup_printf (ngettext ("%d Photo/Video", "%d Photos/Videos", (gulong) _tmp10_), _tmp11_); #line 97 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_free0 (count_text); #line 97 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - count_text = _tmp18_; -#line 1068 "EventDirectoryItem.c" + count_text = _tmp12_; +#line 1133 "EventDirectoryItem.c" } else { - gboolean _tmp19_; + gboolean _tmp13_; #line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp19_ = has_videos; + _tmp13_ = has_videos; #line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp19_) { -#line 1075 "EventDirectoryItem.c" - gint _tmp20_; - gint _tmp21_; - gchar* _tmp22_; + if (_tmp13_) { +#line 1140 "EventDirectoryItem.c" + gint _tmp14_; + gint _tmp15_; + gchar* _tmp16_; #line 99 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp20_ = count; + _tmp14_ = count; #line 99 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp21_ = count; + _tmp15_ = count; #line 99 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp22_ = g_strdup_printf (ngettext ("%d Video", "%d Videos", (gulong) _tmp20_), _tmp21_); + _tmp16_ = g_strdup_printf (ngettext ("%d Video", "%d Videos", (gulong) _tmp14_), _tmp15_); #line 99 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_free0 (count_text); #line 99 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - count_text = _tmp22_; -#line 1089 "EventDirectoryItem.c" + count_text = _tmp16_; +#line 1154 "EventDirectoryItem.c" } else { - gint _tmp23_; - gint _tmp24_; - gchar* _tmp25_; + gint _tmp17_; + gint _tmp18_; + gchar* _tmp19_; #line 101 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp23_ = count; + _tmp17_ = count; #line 101 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp24_ = count; + _tmp18_ = count; #line 101 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp25_ = g_strdup_printf (ngettext ("%d Photo", "%d Photos", (gulong) _tmp23_), _tmp24_); + _tmp19_ = g_strdup_printf (ngettext ("%d Photo", "%d Photos", (gulong) _tmp17_), _tmp18_); #line 101 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_free0 (count_text); #line 101 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - count_text = _tmp25_; -#line 1104 "EventDirectoryItem.c" + count_text = _tmp19_; +#line 1169 "EventDirectoryItem.c" } } #line 103 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp26_ = event; -#line 103 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp27_ = event_get_formatted_daterange (_tmp26_); + _tmp20_ = event_get_formatted_daterange (event); #line 103 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - daterange = _tmp27_; -#line 104 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp28_ = event; + daterange = _tmp20_; #line 104 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp29_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject)); + _tmp21_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_DATA_OBJECT, DataObject)); #line 104 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - name = _tmp29_; + name = _tmp21_; #line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp31_ = daterange; + _tmp23_ = daterange; #line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp31_ == NULL) { + if (_tmp23_ == NULL) { #line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp30_ = TRUE; -#line 1125 "EventDirectoryItem.c" + _tmp22_ = TRUE; +#line 1186 "EventDirectoryItem.c" } else { - const gchar* _tmp32_; - const gchar* _tmp33_; + const gchar* _tmp24_; + const gchar* _tmp25_; #line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp32_ = daterange; + _tmp24_ = daterange; #line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp33_ = name; + _tmp25_ = name; #line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp30_ = g_strcmp0 (_tmp32_, _tmp33_) == 0; -#line 1135 "EventDirectoryItem.c" + _tmp22_ = g_strcmp0 (_tmp24_, _tmp25_) == 0; +#line 1196 "EventDirectoryItem.c" } #line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp30_) { -#line 1139 "EventDirectoryItem.c" - const gchar* _tmp34_; - gchar* _tmp35_; - gchar* _tmp36_; - const gchar* _tmp37_; - gchar* _tmp38_; - gchar* _tmp39_; - gchar* _tmp40_; - gchar* _tmp41_; + if (_tmp22_) { +#line 1200 "EventDirectoryItem.c" + const gchar* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + const gchar* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp34_ = name; + _tmp26_ = name; #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp35_ = guarded_markup_escape_text (_tmp34_); + _tmp27_ = guarded_markup_escape_text (_tmp26_); #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp36_ = _tmp35_; + _tmp28_ = _tmp27_; #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp37_ = count_text; + _tmp29_ = count_text; #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp38_ = guarded_markup_escape_text (_tmp37_); + _tmp30_ = guarded_markup_escape_text (_tmp29_); #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp39_ = _tmp38_; + _tmp31_ = _tmp30_; #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp40_ = g_strdup_printf ("%s\n%s", _tmp36_, _tmp39_); + _tmp32_ = g_strdup_printf ("%s\n%s", _tmp28_, _tmp31_); #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp41_ = _tmp40_; + _tmp33_ = _tmp32_; #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_free0 (_tmp39_); + _g_free0 (_tmp31_); #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_free0 (_tmp36_); + _g_free0 (_tmp28_); #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - result = _tmp41_; + result = _tmp33_; #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_free0 (name); #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -1174,49 +1235,49 @@ static gchar* event_directory_item_get_formatted_title (Event* event) { _g_free0 (count_text); #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return result; -#line 1178 "EventDirectoryItem.c" +#line 1239 "EventDirectoryItem.c" } else { - const gchar* _tmp42_; + const gchar* _tmp34_; + gchar* _tmp35_; + gchar* _tmp36_; + const gchar* _tmp37_; + gchar* _tmp38_; + gchar* _tmp39_; + const gchar* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; gchar* _tmp43_; gchar* _tmp44_; - const gchar* _tmp45_; - gchar* _tmp46_; - gchar* _tmp47_; - const gchar* _tmp48_; - gchar* _tmp49_; - gchar* _tmp50_; - gchar* _tmp51_; - gchar* _tmp52_; #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp42_ = name; + _tmp34_ = name; #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp43_ = guarded_markup_escape_text (_tmp42_); + _tmp35_ = guarded_markup_escape_text (_tmp34_); #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp44_ = _tmp43_; + _tmp36_ = _tmp35_; #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp45_ = count_text; + _tmp37_ = count_text; #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp46_ = guarded_markup_escape_text (_tmp45_); + _tmp38_ = guarded_markup_escape_text (_tmp37_); #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp47_ = _tmp46_; + _tmp39_ = _tmp38_; #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp48_ = daterange; + _tmp40_ = daterange; #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp49_ = guarded_markup_escape_text (_tmp48_); + _tmp41_ = guarded_markup_escape_text (_tmp40_); #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp50_ = _tmp49_; + _tmp42_ = _tmp41_; #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp51_ = g_strdup_printf ("%s\n%s\n%s", _tmp44_, _tmp47_, _tmp50_); + _tmp43_ = g_strdup_printf ("%s\n%s\n%s", _tmp36_, _tmp39_, _tmp42_); #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp52_ = _tmp51_; + _tmp44_ = _tmp43_; #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_free0 (_tmp50_); + _g_free0 (_tmp42_); #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_free0 (_tmp47_); + _g_free0 (_tmp39_); #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_free0 (_tmp44_); + _g_free0 (_tmp36_); #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - result = _tmp52_; + result = _tmp44_; #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_free0 (name); #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -1225,7 +1286,7 @@ static gchar* event_directory_item_get_formatted_title (Event* event) { _g_free0 (count_text); #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return result; -#line 1229 "EventDirectoryItem.c" +#line 1290 "EventDirectoryItem.c" } #line 90 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_free0 (name); @@ -1233,89 +1294,88 @@ static gchar* event_directory_item_get_formatted_title (Event* event) { _g_free0 (daterange); #line 90 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_free0 (count_text); -#line 1237 "EventDirectoryItem.c" +#line 1298 "EventDirectoryItem.c" } -static void event_directory_item_real_exposed (CheckerboardItem* base) { +static void +event_directory_item_real_exposed (CheckerboardItem* base) +{ EventDirectoryItem * self; - gboolean _tmp0_; GError * _inner_error_ = NULL; #line 116 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); #line 117 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp0_ = checkerboard_item_is_exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 117 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp0_) { + if (checkerboard_item_is_exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem))) { #line 118 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return; -#line 1253 "EventDirectoryItem.c" +#line 1313 "EventDirectoryItem.c" } { - GdkPixbuf* _tmp1_ = NULL; - Event* _tmp2_; + GdkPixbuf* _tmp0_ = NULL; + Event* _tmp1_; + MediaSource* _tmp2_; MediaSource* _tmp3_; - MediaSource* _tmp4_; - GdkRectangle _tmp5_; + GdkRectangle _tmp4_; + GdkPixbuf* _tmp5_; GdkPixbuf* _tmp6_; - GdkPixbuf* _tmp7_; #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp2_ = self->event; + _tmp1_ = self->event; #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp3_ = event_get_primary_source (_tmp2_); + _tmp2_ = event_get_primary_source (_tmp1_); #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp5_ = self->priv->paul_lynde; + _tmp4_ = self->priv->paul_lynde; #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp6_ = event_directory_item_get_paul_lynde (_tmp4_, &_tmp5_, &_inner_error_); + _tmp5_ = event_directory_item_get_paul_lynde (_tmp3_, &_tmp4_, &_inner_error_); #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp1_ = _tmp7_; + _tmp0_ = _tmp6_; #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1281 "EventDirectoryItem.c" +#line 1341 "EventDirectoryItem.c" goto __catch59_g_error; } #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp1_); + checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp0_); #line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_object_unref0 (_tmp1_); -#line 1288 "EventDirectoryItem.c" + _g_object_unref0 (_tmp0_); +#line 1348 "EventDirectoryItem.c" } goto __finally59; __catch59_g_error: { GError* err = NULL; - Event* _tmp8_; + Event* _tmp7_; + gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; - GError* _tmp11_; - const gchar* _tmp12_; + GError* _tmp10_; + const gchar* _tmp11_; #line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" err = _inner_error_; #line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _inner_error_ = NULL; #line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp8_ = self->event; + _tmp7_ = self->event; #line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); + _tmp8_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject)); #line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp11_ = err; + _tmp10_ = err; #line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp12_ = _tmp11_->message; + _tmp11_ = _tmp10_->message; #line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - g_critical ("EventDirectoryItem.vala:123: Unable to fetch preview for %s: %s", _tmp10_, _tmp12_); + g_critical ("EventDirectoryItem.vala:123: Unable to fetch preview for %s: %s", _tmp9_, _tmp11_); #line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp9_); #line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_error_free0 (err); -#line 1319 "EventDirectoryItem.c" +#line 1379 "EventDirectoryItem.c" } __finally59: #line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -1326,47 +1386,47 @@ static void event_directory_item_real_exposed (CheckerboardItem* base) { g_clear_error (&_inner_error_); #line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return; -#line 1330 "EventDirectoryItem.c" +#line 1390 "EventDirectoryItem.c" } #line 126 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" event_directory_item_update_comment (self, FALSE); #line 128 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" CHECKERBOARD_ITEM_CLASS (event_directory_item_parent_class)->exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 1336 "EventDirectoryItem.c" +#line 1396 "EventDirectoryItem.c" } -static void event_directory_item_real_unexposed (CheckerboardItem* base) { +static void +event_directory_item_real_unexposed (CheckerboardItem* base) +{ EventDirectoryItem * self; - gboolean _tmp0_; - GdkRectangle _tmp1_; - Dimensions _tmp2_ = {0}; + GdkRectangle _tmp0_; + Dimensions _tmp1_ = {0}; #line 131 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); #line 132 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp0_ = checkerboard_item_is_exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 132 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (!_tmp0_) { + if (!checkerboard_item_is_exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem))) { #line 133 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return; -#line 1353 "EventDirectoryItem.c" +#line 1412 "EventDirectoryItem.c" } #line 135 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp1_ = self->priv->paul_lynde; + _tmp0_ = self->priv->paul_lynde; #line 135 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - dimensions_for_rectangle (&_tmp1_, &_tmp2_); + dimensions_for_rectangle (&_tmp0_, &_tmp1_); #line 135 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp2_); + checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp1_); #line 137 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" CHECKERBOARD_ITEM_CLASS (event_directory_item_parent_class)->unexposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 1363 "EventDirectoryItem.c" +#line 1422 "EventDirectoryItem.c" } -static void event_directory_item_on_events_altered (EventDirectoryItem* self, GeeMap* map) { - GeeMap* _tmp0_; - Event* _tmp1_; - gboolean _tmp2_; +static void +event_directory_item_on_events_altered (EventDirectoryItem* self, + GeeMap* map) +{ + Event* _tmp0_; #line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" g_return_if_fail (IS_EVENT_DIRECTORY_ITEM (self)); #line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -1374,40 +1434,37 @@ static void event_directory_item_on_events_altered (EventDirectoryItem* self, Ge #line 141 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" event_directory_item_update_comment (self, FALSE); #line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp0_ = map; -#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp1_ = self->event; -#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp2_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = self->event; #line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp2_) { -#line 1385 "EventDirectoryItem.c" - Event* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; + if (gee_map_has_key (map, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject))) { +#line 1441 "EventDirectoryItem.c" + Event* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; #line 143 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp3_ = self->event; + _tmp1_ = self->event; #line 143 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = event_directory_item_get_formatted_title (_tmp3_); + _tmp2_ = event_directory_item_get_formatted_title (_tmp1_); #line 143 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 143 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - checkerboard_item_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp5_, TRUE, PANGO_ALIGN_CENTER); + checkerboard_item_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp3_, TRUE, PANGO_ALIGN_CENTER); #line 143 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_free0 (_tmp5_); -#line 1399 "EventDirectoryItem.c" + _g_free0 (_tmp3_); +#line 1455 "EventDirectoryItem.c" } } -static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) { +static void +event_directory_item_real_thumbnail_altered (ThumbnailView* base) +{ EventDirectoryItem * self; MediaSource* media = NULL; Event* _tmp0_; MediaSource* _tmp1_; MediaSource* _tmp2_; GdkRectangle _tmp3_ = {0}; - gboolean _tmp4_; GError * _inner_error_ = NULL; #line 146 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); @@ -1424,64 +1481,62 @@ static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) { #line 150 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" self->priv->paul_lynde = _tmp3_; #line 152 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = checkerboard_item_is_exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 152 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp4_) { -#line 1431 "EventDirectoryItem.c" + if (checkerboard_item_is_exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem))) { +#line 1486 "EventDirectoryItem.c" { - GdkPixbuf* _tmp5_ = NULL; - MediaSource* _tmp6_; - GdkRectangle _tmp7_; - GdkPixbuf* _tmp8_; + GdkPixbuf* _tmp4_ = NULL; + MediaSource* _tmp5_; + GdkRectangle _tmp6_; + GdkPixbuf* _tmp7_; #line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp6_ = media; + _tmp5_ = media; #line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp7_ = self->priv->paul_lynde; + _tmp6_ = self->priv->paul_lynde; #line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp8_ = event_directory_item_get_paul_lynde (_tmp6_, &_tmp7_, &_inner_error_); + _tmp7_ = event_directory_item_get_paul_lynde (_tmp5_, &_tmp6_, &_inner_error_); #line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp5_ = _tmp8_; + _tmp4_ = _tmp7_; #line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1447 "EventDirectoryItem.c" +#line 1502 "EventDirectoryItem.c" goto __catch60_g_error; } #line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp5_); + checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp4_); #line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_object_unref0 (_tmp5_); -#line 1454 "EventDirectoryItem.c" + _g_object_unref0 (_tmp4_); +#line 1509 "EventDirectoryItem.c" } goto __finally60; __catch60_g_error: { GError* err = NULL; - Event* _tmp9_; + Event* _tmp8_; + gchar* _tmp9_; gchar* _tmp10_; - gchar* _tmp11_; - GError* _tmp12_; - const gchar* _tmp13_; + GError* _tmp11_; + const gchar* _tmp12_; #line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" err = _inner_error_; #line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _inner_error_ = NULL; #line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp9_ = self->event; + _tmp8_ = self->event; #line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); + _tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); #line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp12_ = err; + _tmp11_ = err; #line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp13_ = _tmp12_->message; + _tmp12_ = _tmp11_->message; #line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - g_critical ("EventDirectoryItem.vala:156: Unable to fetch preview for %s: %s", _tmp11_, _tmp13_); + g_critical ("EventDirectoryItem.vala:156: Unable to fetch preview for %s: %s", _tmp10_, _tmp12_); #line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp10_); #line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_error_free0 (err); -#line 1485 "EventDirectoryItem.c" +#line 1540 "EventDirectoryItem.c" } __finally60: #line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -1494,38 +1549,43 @@ static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) { g_clear_error (&_inner_error_); #line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return; -#line 1498 "EventDirectoryItem.c" +#line 1553 "EventDirectoryItem.c" } } else { - GdkRectangle _tmp14_; - Dimensions _tmp15_ = {0}; + GdkRectangle _tmp13_; + Dimensions _tmp14_ = {0}; #line 159 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp14_ = self->priv->paul_lynde; + _tmp13_ = self->priv->paul_lynde; #line 159 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - dimensions_for_rectangle (&_tmp14_, &_tmp15_); + dimensions_for_rectangle (&_tmp13_, &_tmp14_); #line 159 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp15_); -#line 1509 "EventDirectoryItem.c" + checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp14_); +#line 1564 "EventDirectoryItem.c" } #line 162 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" THUMBNAIL_VIEW_CLASS (event_directory_item_parent_class)->thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), TYPE_THUMBNAIL_VIEW, ThumbnailView)); #line 146 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_object_unref0 (media); -#line 1515 "EventDirectoryItem.c" +#line 1570 "EventDirectoryItem.c" } -static void event_directory_item_real_paint_shadow (CheckerboardItem* base, cairo_t* ctx, Dimensions* dimensions, GdkPoint* origin, gint radius, gfloat initial_alpha) { +static void +event_directory_item_real_paint_shadow (CheckerboardItem* base, + cairo_t* ctx, + Dimensions* dimensions, + GdkPoint* origin, + gint radius, + gfloat initial_alpha) +{ EventDirectoryItem * self; Dimensions altered = {0}; Dimensions _tmp0_; gint _tmp1_; Dimensions _tmp2_; gint _tmp3_; - cairo_t* _tmp4_; - Dimensions _tmp5_; - GdkPoint _tmp6_; - gfloat _tmp7_; + Dimensions _tmp4_; + GdkPoint _tmp5_; #line 165 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); #line 165 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -1545,32 +1605,31 @@ static void event_directory_item_real_paint_shadow (CheckerboardItem* base, cair #line 167 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" dimensions_init (&altered, _tmp1_ - 25, _tmp3_ - 25); #line 168 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = ctx; -#line 168 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp5_ = altered; + _tmp4_ = altered; #line 168 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp6_ = *origin; + _tmp5_ = *origin; #line 168 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp7_ = initial_alpha; -#line 168 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - CHECKERBOARD_ITEM_CLASS (event_directory_item_parent_class)->paint_shadow (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp4_, &_tmp5_, &_tmp6_, 36, _tmp7_); -#line 1558 "EventDirectoryItem.c" + CHECKERBOARD_ITEM_CLASS (event_directory_item_parent_class)->paint_shadow (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), ctx, &_tmp4_, &_tmp5_, 36, initial_alpha); +#line 1614 "EventDirectoryItem.c" } -static void event_directory_item_real_paint_border (CheckerboardItem* base, cairo_t* ctx, Dimensions* object_dimensions, GdkPoint* object_origin, gint border_width) { +static void +event_directory_item_real_paint_border (CheckerboardItem* base, + cairo_t* ctx, + Dimensions* object_dimensions, + GdkPoint* object_origin, + gint border_width) +{ EventDirectoryItem * self; Dimensions dimensions = {0}; Dimensions _tmp0_; - gint _tmp1_; - Dimensions _tmp2_ = {0}; + Dimensions _tmp1_ = {0}; GdkPoint origin = {0}; - GdkPoint _tmp3_; - gint _tmp4_; - GdkPoint _tmp5_ = {0}; - cairo_t* _tmp6_; - Dimensions _tmp7_; - GdkPoint _tmp8_; + GdkPoint _tmp2_; + GdkPoint _tmp3_ = {0}; + Dimensions _tmp4_; + GdkPoint _tmp5_; #line 171 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); #line 171 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -1582,48 +1641,40 @@ static void event_directory_item_real_paint_border (CheckerboardItem* base, cair #line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _tmp0_ = *object_dimensions; #line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp1_ = border_width; -#line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - checkerboard_item_get_border_dimensions (&_tmp0_, _tmp1_, &_tmp2_); + checkerboard_item_get_border_dimensions (&_tmp0_, border_width, &_tmp1_); #line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - dimensions = _tmp2_; -#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp3_ = *object_origin; + dimensions = _tmp1_; #line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = border_width; + _tmp2_ = *object_origin; #line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - checkerboard_item_get_border_origin (&_tmp3_, _tmp4_, &_tmp5_); + checkerboard_item_get_border_origin (&_tmp2_, border_width, &_tmp3_); #line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - origin = _tmp5_; + origin = _tmp3_; #line 176 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp6_ = ctx; + _tmp4_ = dimensions; #line 176 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp7_ = dimensions; + _tmp5_ = origin; #line 176 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp8_ = origin; -#line 176 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - draw_rounded_corners_filled (_tmp6_, &_tmp7_, &_tmp8_, 6.0); -#line 1607 "EventDirectoryItem.c" + draw_rounded_corners_filled (ctx, &_tmp4_, &_tmp5_, 6.0); +#line 1660 "EventDirectoryItem.c" } -static void event_directory_item_real_paint_image (CheckerboardItem* base, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin) { +static void +event_directory_item_real_paint_image (CheckerboardItem* base, + cairo_t* ctx, + GdkPixbuf* pixbuf, + GdkPoint* origin) +{ EventDirectoryItem * self; Dimensions dimensions = {0}; - GdkPixbuf* _tmp0_; - Dimensions _tmp1_ = {0}; - GdkPixbuf* _tmp2_; - gboolean _tmp3_; - cairo_t* _tmp7_; - Dimensions _tmp8_; - GdkPoint _tmp9_; - cairo_t* _tmp10_; - GdkPixbuf* _tmp11_; - GdkPoint _tmp12_; - gint _tmp13_; - GdkPoint _tmp14_; - gint _tmp15_; - cairo_t* _tmp16_; + Dimensions _tmp0_ = {0}; + Dimensions _tmp3_; + GdkPoint _tmp4_; + GdkPoint _tmp5_; + gint _tmp6_; + GdkPoint _tmp7_; + gint _tmp8_; #line 179 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); #line 179 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -1633,67 +1684,52 @@ static void event_directory_item_real_paint_image (CheckerboardItem* base, cairo #line 179 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" g_return_if_fail (origin != NULL); #line 181 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp0_ = pixbuf; + dimensions_for_pixbuf (pixbuf, &_tmp0_); #line 181 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - dimensions_for_pixbuf (_tmp0_, &_tmp1_); -#line 181 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - dimensions = _tmp1_; -#line 183 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp2_ = pixbuf; + dimensions = _tmp0_; #line 183 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp3_ = gdk_pixbuf_get_has_alpha (_tmp2_); -#line 183 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp3_) { -#line 1648 "EventDirectoryItem.c" - cairo_t* _tmp4_; - Dimensions _tmp5_; - GdkPoint _tmp6_; -#line 184 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = ctx; + if (gdk_pixbuf_get_has_alpha (pixbuf)) { +#line 1693 "EventDirectoryItem.c" + Dimensions _tmp1_; + GdkPoint _tmp2_; #line 184 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp5_ = dimensions; + _tmp1_ = dimensions; #line 184 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp6_ = *origin; + _tmp2_ = *origin; #line 184 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - draw_rounded_corners_filled (_tmp4_, &_tmp5_, &_tmp6_, 6.0); -#line 1660 "EventDirectoryItem.c" + draw_rounded_corners_filled (ctx, &_tmp1_, &_tmp2_, 6.0); +#line 1702 "EventDirectoryItem.c" } #line 187 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp7_ = ctx; -#line 187 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp8_ = dimensions; + _tmp3_ = dimensions; #line 187 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp9_ = *origin; + _tmp4_ = *origin; #line 187 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - context_rounded_corners (_tmp7_, &_tmp8_, &_tmp9_, 6.0); -#line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp10_ = ctx; -#line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp11_ = pixbuf; + context_rounded_corners (ctx, &_tmp3_, &_tmp4_, 6.0); #line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp12_ = *origin; + _tmp5_ = *origin; #line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp13_ = _tmp12_.x; + _tmp6_ = _tmp5_.x; #line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp14_ = *origin; + _tmp7_ = *origin; #line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp15_ = _tmp14_.y; + _tmp8_ = _tmp7_.y; #line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - gdk_cairo_set_source_pixbuf (_tmp10_, _tmp11_, (gdouble) _tmp13_, (gdouble) _tmp15_); + gdk_cairo_set_source_pixbuf (ctx, pixbuf, (gdouble) _tmp6_, (gdouble) _tmp8_); #line 189 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp16_ = ctx; -#line 189 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - cairo_paint (_tmp16_); -#line 1688 "EventDirectoryItem.c" + cairo_paint (ctx); +#line 1722 "EventDirectoryItem.c" } -static void event_directory_item_update_comment (EventDirectoryItem* self, gboolean init) { +static void +event_directory_item_update_comment (EventDirectoryItem* self, + gboolean init) +{ gchar* comment = NULL; Event* _tmp0_; gchar* _tmp1_; const gchar* _tmp2_; - gboolean _tmp3_; #line 192 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" g_return_if_fail (IS_EVENT_DIRECTORY_ITEM (self)); #line 193 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -1705,57 +1741,47 @@ static void event_directory_item_update_comment (EventDirectoryItem* self, gbool #line 194 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _tmp2_ = comment; #line 194 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp3_ = is_string_empty (_tmp2_); -#line 194 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp3_) { + if (is_string_empty (_tmp2_)) { #line 195 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" checkerboard_item_clear_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 1714 "EventDirectoryItem.c" +#line 1748 "EventDirectoryItem.c" } else { - gboolean _tmp4_; -#line 196 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = init; #line 196 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (!_tmp4_) { -#line 1721 "EventDirectoryItem.c" - const gchar* _tmp5_; + if (!init) { +#line 1752 "EventDirectoryItem.c" + const gchar* _tmp3_; #line 197 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp5_ = comment; + _tmp3_ = comment; #line 197 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - checkerboard_item_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp5_, FALSE, PANGO_ALIGN_LEFT); -#line 1727 "EventDirectoryItem.c" + checkerboard_item_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp3_, FALSE, PANGO_ALIGN_LEFT); +#line 1758 "EventDirectoryItem.c" } else { #line 199 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" checkerboard_item_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), "", FALSE, PANGO_ALIGN_LEFT); -#line 1731 "EventDirectoryItem.c" +#line 1762 "EventDirectoryItem.c" } } #line 192 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_free0 (comment); -#line 1736 "EventDirectoryItem.c" +#line 1767 "EventDirectoryItem.c" } -static gint event_directory_item_get_CROPPED_SCALE (void) { +static gint +event_directory_item_get_CROPPED_SCALE (void) +{ gint result; - gint _tmp0_; - gint _tmp1_; - gint _tmp2_; -#line 10 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp0_ = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_MEDIUM); -#line 10 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp1_ = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_BIG); -#line 10 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp2_ = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_MEDIUM); #line 10 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - result = _tmp0_ + ((_tmp1_ - _tmp2_) / 2); + result = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_MEDIUM) + ((thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_BIG) - thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_MEDIUM)) / 2); #line 10 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return result; -#line 1755 "EventDirectoryItem.c" +#line 1779 "EventDirectoryItem.c" } -static void event_directory_item_class_init (EventDirectoryItemClass * klass) { +static void +event_directory_item_class_init (EventDirectoryItemClass * klass) +{ gint _tmp0_; gint _tmp1_; gint _tmp2_; @@ -1796,20 +1822,24 @@ static void event_directory_item_class_init (EventDirectoryItemClass * klass) { scaling_to_fill_viewport (&_tmp4_, &_tmp5_); #line 15 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" event_directory_item_squared_scaling = _tmp5_; -#line 1800 "EventDirectoryItem.c" +#line 1826 "EventDirectoryItem.c" } -static void event_directory_item_instance_init (EventDirectoryItem * self) { +static void +event_directory_item_instance_init (EventDirectoryItem * self) +{ #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" self->priv = EVENT_DIRECTORY_ITEM_GET_PRIVATE (self); #line 20 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" memset (&self->priv->paul_lynde, 0, sizeof (GdkRectangle)); -#line 1809 "EventDirectoryItem.c" +#line 1837 "EventDirectoryItem.c" } -static void event_directory_item_finalize (GObject * obj) { +static void +event_directory_item_finalize (GObject * obj) +{ EventDirectoryItem * self; EventSourceCollection* _tmp0_; guint _tmp1_; @@ -1825,11 +1855,13 @@ static void event_directory_item_finalize (GObject * obj) { _g_object_unref0 (self->event); #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" G_OBJECT_CLASS (event_directory_item_parent_class)->finalize (obj); -#line 1829 "EventDirectoryItem.c" +#line 1859 "EventDirectoryItem.c" } -GType event_directory_item_get_type (void) { +GType +event_directory_item_get_type (void) +{ static volatile gsize event_directory_item_type_id__volatile = 0; if (g_once_init_enter (&event_directory_item_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventDirectoryItemClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_directory_item_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventDirectoryItem), 0, (GInstanceInitFunc) event_directory_item_instance_init, NULL }; @@ -1841,18 +1873,23 @@ GType event_directory_item_get_type (void) { } -static void _vala_event_directory_item_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_event_directory_item_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ EventDirectoryItem * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" switch (property_id) { -#line 1850 "EventDirectoryItem.c" +#line 1887 "EventDirectoryItem.c" default: #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" break; -#line 1856 "EventDirectoryItem.c" +#line 1893 "EventDirectoryItem.c" } } diff --git a/src/events/EventPage.c b/src/events/EventPage.c index d701b8e..d7da2f4 100644 --- a/src/events/EventPage.c +++ b/src/events/EventPage.c @@ -1,4 +1,4 @@ -/* EventPage.c generated by valac 0.36.6, the Vala compiler +/* EventPage.c generated by valac 0.40.4, the Vala compiler * generated from EventPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -231,6 +232,11 @@ typedef struct _EventSourceClass EventSourceClass; typedef struct _Event Event; typedef struct _EventClass EventClass; +enum { + EVENT_PAGE_0_PROPERTY, + EVENT_PAGE_NUM_PROPERTIES +}; +static GParamSpec* event_page_properties[EVENT_PAGE_NUM_PROPERTIES]; #define TYPE_DATA_COLLECTION (data_collection_get_type ()) #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection)) @@ -437,6 +443,11 @@ typedef struct _LibraryWindowClass LibraryWindowClass; typedef struct _NoEventPage NoEventPage; typedef struct _NoEventPageClass NoEventPageClass; typedef struct _NoEventPagePrivate NoEventPagePrivate; +enum { + NO_EVENT_PAGE_0_PROPERTY, + NO_EVENT_PAGE_NUM_PROPERTIES +}; +static GParamSpec* no_event_page_properties[NO_EVENT_PAGE_NUM_PROPERTIES]; #define TYPE_VIEW_MANAGER (view_manager_get_type ()) #define VIEW_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIEW_MANAGER, ViewManager)) @@ -744,9 +755,15 @@ GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType checkerboard_page_get_type (void) G_GNUC_CONST; @@ -760,17 +777,29 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self); gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType search_view_filter_get_type (void) G_GNUC_CONST; gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; @@ -784,14 +813,17 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST; GType event_source_get_type (void) G_GNUC_CONST; GType event_get_type (void) G_GNUC_CONST; #define EVENT_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EVENT_PAGE, EventPagePrivate)) -enum { - EVENT_PAGE_DUMMY_PROPERTY -}; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -800,244 +832,359 @@ GType container_source_collection_get_type (void) G_GNUC_CONST; GType event_source_collection_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; -static void event_page_on_events_altered (EventPage* self, GeeMap* map); -static void _event_page_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void event_page_on_events_altered (EventPage* self, + GeeMap* map); +static void _event_page_on_events_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); GType view_collection_get_type (void) G_GNUC_CONST; ViewCollection* page_get_view (Page* self); void view_collection_halt_mirroring (ViewCollection* self); static void event_page_on_make_primary (EventPage* self); -static void _event_page_on_make_primary_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _event_page_on_make_primary_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void event_page_on_rename (EventPage* self); -static void _event_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _event_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void media_page_on_edit_comment (MediaPage* self); -static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); EventPage* event_page_new (Event* page_event); -EventPage* event_page_construct (GType object_type, Event* page_event); +EventPage* event_page_construct (GType object_type, + Event* page_event); gchar* data_object_get_name (DataObject* self); -CollectionPage* collection_page_construct (GType object_type, const gchar* page_name); -void event_mirror_photos (Event* self, ViewCollection* view, CreateView mirroring_ctor, void* mirroring_ctor_target); -DataView* media_page_create_thumbnail (MediaPage* self, DataSource* source); -static DataView* _media_page_create_thumbnail_create_view (DataSource* source, gpointer self); -void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path); +CollectionPage* collection_page_construct (GType object_type, + const gchar* page_name); +void event_mirror_photos (Event* self, + ViewCollection* view, + CreateView mirroring_ctor, + void* mirroring_ctor_target); +DataView* media_page_create_thumbnail (MediaPage* self, + DataSource* source); +static DataView* _media_page_create_thumbnail_create_view (DataSource* source, + gpointer self); +void checkerboard_page_init_page_context_menu (CheckerboardPage* self, + const gchar* path); Event* event_page_get_event (EventPage* self); -static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* event); +static gboolean event_page_real_on_app_key_pressed (Page* base, + GdkEventKey* event); gint view_collection_get_selected_count (ViewCollection* self); -gboolean page_on_app_key_pressed (Page* self, GdkEventKey* event); -static void event_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); -void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static void event_page_real_add_actions (Page* base, GActionMap* map); -void page_add_actions (Page* self, GActionMap* map); -static void event_page_real_remove_actions (Page* base, GActionMap* map); -void page_remove_actions (Page* self, GActionMap* map); -static void event_page_real_init_actions (Page* base, gint selected_count, gint count); -void page_init_actions (Page* self, gint selected_count, gint count); -static void event_page_real_update_actions (Page* base, gint selected_count, gint count); -void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); -void page_update_actions (Page* self, gint selected_count, gint count); -static void event_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by); +gboolean page_on_app_key_pressed (Page* self, + GdkEventKey* event); +static void event_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames); +void page_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames); +static void event_page_real_add_actions (Page* base, + GActionMap* map); +void page_add_actions (Page* self, + GActionMap* map); +static void event_page_real_remove_actions (Page* base, + GActionMap* map); +void page_remove_actions (Page* self, + GActionMap* map); +static void event_page_real_init_actions (Page* base, + gint selected_count, + gint count); +void page_init_actions (Page* self, + gint selected_count, + gint count); +static void event_page_real_update_actions (Page* base, + gint selected_count, + gint count); +void page_set_action_sensitive (Page* self, + const gchar* name, + gboolean sensitive); +void page_update_actions (Page* self, + gint selected_count, + gint count); +static void event_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); -void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by); -static void event_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by); -void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by); -void page_set_page_name (Page* self, const gchar* page_name); +void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, + gboolean* sort_order, + gint* sort_by); +static void event_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by); +void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, + gboolean sort_order, + gint sort_by); +void page_set_page_name (Page* self, + const gchar* page_name); static void event_page_real_on_edit_comment (MediaPage* base); gpointer multi_text_entry_dialog_mediator_ref (gpointer instance); void multi_text_entry_dialog_mediator_unref (gpointer instance); -GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object); -void value_take_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object); +GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_multi_text_entry_dialog_mediator (GValue* value, + gpointer v_object); +void value_take_multi_text_entry_dialog_mediator (GValue* value, + gpointer v_object); gpointer value_get_multi_text_entry_dialog_mediator (const GValue* value); GType multi_text_entry_dialog_mediator_get_type (void) G_GNUC_CONST; GType edit_comment_dialog_get_type (void) G_GNUC_CONST; gchar* event_source_get_comment (EventSource* self); -EditCommentDialog* edit_comment_dialog_new (const gchar* comment, gboolean is_event); -EditCommentDialog* edit_comment_dialog_construct (GType object_type, const gchar* comment, gboolean is_event); +EditCommentDialog* edit_comment_dialog_new (const gchar* comment, + gboolean is_event); +EditCommentDialog* edit_comment_dialog_construct (GType object_type, + const gchar* comment, + gboolean is_event); gchar* edit_comment_dialog_execute (EditCommentDialog* self); GType command_get_type (void) G_GNUC_CONST; GType page_command_get_type (void) G_GNUC_CONST; GType simple_proxyable_command_get_type (void) G_GNUC_CONST; GType edit_event_comment_command_get_type (void) G_GNUC_CONST; -EditEventCommentCommand* edit_event_comment_command_new (Event* event, const gchar* new_comment); -EditEventCommentCommand* edit_event_comment_command_construct (GType object_type, Event* event, const gchar* new_comment); +EditEventCommentCommand* edit_event_comment_command_new (Event* event, + const gchar* new_comment); +EditEventCommentCommand* edit_event_comment_command_construct (GType object_type, + Event* event, + const gchar* new_comment); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* page_get_command_manager (Page* self); -void command_manager_execute (CommandManager* self, Command* command); +void command_manager_execute (CommandManager* self, + Command* command); GType media_source_get_type (void) G_GNUC_CONST; -gboolean event_set_primary_source (Event* self, MediaSource* source); -DataView* view_collection_get_selected_at (ViewCollection* self, gint index); +gboolean event_set_primary_source (Event* self, + MediaSource* source); +DataView* view_collection_get_selected_at (ViewCollection* self, + gint index); DataSource* data_view_get_source (DataView* self); GType app_window_get_type (void) G_GNUC_CONST; GType library_window_get_type (void) G_GNUC_CONST; LibraryWindow* library_window_get_app (void); -void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event); +void library_window_rename_event_in_sidebar (LibraryWindow* self, + Event* event); static void event_page_finalize (GObject * obj); GType no_event_page_get_type (void) G_GNUC_CONST; -enum { - NO_EVENT_PAGE_DUMMY_PROPERTY -}; -Alteration* alteration_new (const gchar* subject, const gchar* detail); -Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail); +Alteration* alteration_new (const gchar* subject, + const gchar* detail); +Alteration* alteration_construct (GType object_type, + const gchar* subject, + const gchar* detail); #define NO_EVENT_PAGE_NAME _ ("No Event") NoEventPage* no_event_page_new (void); NoEventPage* no_event_page_construct (GType object_type); gpointer view_manager_ref (gpointer instance); void view_manager_unref (gpointer instance); -GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_manager (GValue* value, gpointer v_object); -void value_take_view_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_manager (GValue* value, + gpointer v_object); +void value_take_view_manager (GValue* value, + gpointer v_object); gpointer value_get_view_manager (const GValue* value); GType view_manager_get_type (void) G_GNUC_CONST; static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_new (NoEventPage* page); -static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_construct (GType object_type, NoEventPage* page); +static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_construct (GType object_type, + NoEventPage* page); GType collection_view_manager_get_type (void) G_GNUC_CONST; static GType no_event_page_no_event_view_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; gpointer view_collection_monitor_ref (gpointer instance); void view_collection_monitor_unref (gpointer instance); -GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void view_collection_value_set_monitor (GValue* value, gpointer v_object); -void view_collection_value_take_monitor (GValue* value, gpointer v_object); +GParamSpec* view_collection_param_spec_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void view_collection_value_set_monitor (GValue* value, + gpointer v_object); +void view_collection_value_take_monitor (GValue* value, + gpointer v_object); gpointer view_collection_value_get_monitor (const GValue* value); GType view_collection_monitor_get_type (void) G_GNUC_CONST; -ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target); +ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq, + GeeCollection* initial, + ProgressMonitor progress_monitor, + void* progress_monitor_target); GType media_source_collection_get_type (void) G_GNUC_CONST; GType library_photo_source_collection_get_type (void) G_GNUC_CONST; GType video_source_collection_get_type (void) G_GNUC_CONST; -static void no_event_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by); -static void no_event_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by); -enum { - NO_EVENT_PAGE_NO_EVENT_VIEW_MANAGER_DUMMY_PROPERTY -}; +static void no_event_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by); +static void no_event_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by); CollectionViewManager* collection_view_manager_new (CollectionPage* page); -CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page); -static gboolean no_event_page_no_event_view_manager_real_include_in_view (ViewManager* base, DataSource* source); +CollectionViewManager* collection_view_manager_construct (GType object_type, + CollectionPage* page); +static gboolean no_event_page_no_event_view_manager_real_include_in_view (ViewManager* base, + DataSource* source); GType event_id_get_type (void) G_GNUC_CONST; EventID* event_id_dup (const EventID* self); void event_id_free (EventID* self); -void media_source_get_event_id (MediaSource* self, EventID* result); +void media_source_get_event_id (MediaSource* self, + EventID* result); #define EVENT_ID_INVALID ((gint64) -1) -gboolean view_manager_include_in_view (ViewManager* self, DataSource* source); +gboolean view_manager_include_in_view (ViewManager* self, + DataSource* source); static void no_event_page_finalize (GObject * obj); static const GActionEntry EVENT_PAGE_entries[3] = {{"MakePrimary", _event_page_on_make_primary_gsimple_action_activate_callback}, {"Rename", _event_page_on_rename_gsimple_action_activate_callback}, {"EditEventComment", _media_page_on_edit_comment_gsimple_action_activate_callback}}; -static void _event_page_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_event_page_on_events_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 40 "/home/jens/Source/shotwell/src/events/EventPage.vala" event_page_on_events_altered ((EventPage*) self, items); -#line 940 "EventPage.c" +#line 1072 "EventPage.c" } -static void _event_page_on_make_primary_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_event_page_on_make_primary_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 50 "/home/jens/Source/shotwell/src/events/EventPage.vala" event_page_on_make_primary ((EventPage*) self); -#line 947 "EventPage.c" +#line 1083 "EventPage.c" } -static void _event_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_event_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 50 "/home/jens/Source/shotwell/src/events/EventPage.vala" event_page_on_rename ((EventPage*) self); -#line 954 "EventPage.c" +#line 1094 "EventPage.c" } -static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 50 "/home/jens/Source/shotwell/src/events/EventPage.vala" media_page_on_edit_comment ((MediaPage*) self); -#line 961 "EventPage.c" +#line 1105 "EventPage.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 13 "/home/jens/Source/shotwell/src/events/EventPage.vala" return self ? g_object_ref (self) : NULL; -#line 968 "EventPage.c" +#line 1114 "EventPage.c" } -static DataView* _media_page_create_thumbnail_create_view (DataSource* source, gpointer self) { +static DataView* +_media_page_create_thumbnail_create_view (DataSource* source, + gpointer self) +{ DataView* result; result = media_page_create_thumbnail ((MediaPage*) self, source); #line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala" return result; -#line 977 "EventPage.c" +#line 1126 "EventPage.c" } -EventPage* event_page_construct (GType object_type, Event* page_event) { +EventPage* +event_page_construct (GType object_type, + Event* page_event) +{ EventPage * self = NULL; - Event* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - Event* _tmp3_; - Event* _tmp4_; - Event* _tmp5_; - ViewCollection* _tmp6_; - ViewCollection* _tmp7_; - EventSourceCollection* _tmp8_; + Event* _tmp2_; + ViewCollection* _tmp3_; + ViewCollection* _tmp4_; + EventSourceCollection* _tmp5_; #line 10 "/home/jens/Source/shotwell/src/events/EventPage.vala" g_return_val_if_fail (IS_EVENT (page_event), NULL); #line 11 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp0_ = page_event; -#line 11 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (page_event, TYPE_DATA_OBJECT, DataObject)); #line 11 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 11 "/home/jens/Source/shotwell/src/events/EventPage.vala" - self = (EventPage*) collection_page_construct (object_type, _tmp2_); + self = (EventPage*) collection_page_construct (object_type, _tmp1_); #line 11 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _g_free0 (_tmp2_); -#line 13 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp3_ = page_event; + _g_free0 (_tmp1_); #line 13 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp2_ = _g_object_ref0 (page_event); #line 13 "/home/jens/Source/shotwell/src/events/EventPage.vala" _g_object_unref0 (self->priv->page_event); #line 13 "/home/jens/Source/shotwell/src/events/EventPage.vala" - self->priv->page_event = _tmp4_; + self->priv->page_event = _tmp2_; #line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp5_ = page_event; + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala" - event_mirror_photos (_tmp5_, _tmp7_, _media_page_create_thumbnail_create_view, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage)); + event_mirror_photos (page_event, _tmp4_, _media_page_create_thumbnail_create_view, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage)); #line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _data_collection_unref0 (_tmp7_); + _data_collection_unref0 (_tmp4_); #line 16 "/home/jens/Source/shotwell/src/events/EventPage.vala" checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "EventContextMenu"); #line 18 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp8_ = event_global; + _tmp5_ = event_global; #line 18 "/home/jens/Source/shotwell/src/events/EventPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _event_page_on_events_altered_data_collection_items_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _event_page_on_events_altered_data_collection_items_altered, self, 0); #line 10 "/home/jens/Source/shotwell/src/events/EventPage.vala" return self; -#line 1030 "EventPage.c" +#line 1173 "EventPage.c" } -EventPage* event_page_new (Event* page_event) { +EventPage* +event_page_new (Event* page_event) +{ #line 10 "/home/jens/Source/shotwell/src/events/EventPage.vala" return event_page_construct (TYPE_EVENT_PAGE, page_event); -#line 1037 "EventPage.c" +#line 1182 "EventPage.c" } -Event* event_page_get_event (EventPage* self) { +Event* +event_page_get_event (EventPage* self) +{ Event* result = NULL; Event* _tmp0_; Event* _tmp1_; @@ -1051,118 +1198,103 @@ Event* event_page_get_event (EventPage* self) { result = _tmp1_; #line 22 "/home/jens/Source/shotwell/src/events/EventPage.vala" return result; -#line 1055 "EventPage.c" +#line 1202 "EventPage.c" } -static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* event) { +static gboolean +event_page_real_on_app_key_pressed (Page* base, + GdkEventKey* event) +{ EventPage * self; gboolean result = FALSE; - GdkEventKey* _tmp0_; - guint _tmp1_; - const gchar* _tmp2_; - GdkEventKey* _tmp7_; - gboolean _tmp8_; + guint _tmp0_; + const gchar* _tmp1_; #line 25 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage); #line 25 "/home/jens/Source/shotwell/src/events/EventPage.vala" g_return_val_if_fail (event != NULL, FALSE); #line 30 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp0_ = event; -#line 30 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp1_ = _tmp0_->keyval; + _tmp0_ = event->keyval; #line 30 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp2_ = gdk_keyval_name (_tmp1_); + _tmp1_ = gdk_keyval_name (_tmp0_); #line 30 "/home/jens/Source/shotwell/src/events/EventPage.vala" - if (g_strcmp0 (_tmp2_, "F2") == 0) { -#line 1079 "EventPage.c" + if (g_strcmp0 (_tmp1_, "F2") == 0) { +#line 1224 "EventPage.c" + ViewCollection* _tmp2_; ViewCollection* _tmp3_; - ViewCollection* _tmp4_; - gint _tmp5_; - gboolean _tmp6_; + gboolean _tmp4_; #line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp5_ = view_collection_get_selected_count (_tmp4_); + _tmp4_ = view_collection_get_selected_count (_tmp3_) != 1; #line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp6_ = _tmp5_ != 1; + _data_collection_unref0 (_tmp3_); #line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _data_collection_unref0 (_tmp4_); -#line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala" - if (_tmp6_) { + if (_tmp4_) { #line 32 "/home/jens/Source/shotwell/src/events/EventPage.vala" result = TRUE; #line 32 "/home/jens/Source/shotwell/src/events/EventPage.vala" return result; -#line 1100 "EventPage.c" +#line 1242 "EventPage.c" } } #line 36 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp7_ = event; -#line 36 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp8_ = PAGE_CLASS (event_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp7_); -#line 36 "/home/jens/Source/shotwell/src/events/EventPage.vala" - result = _tmp8_; + result = PAGE_CLASS (event_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), event); #line 36 "/home/jens/Source/shotwell/src/events/EventPage.vala" return result; -#line 1111 "EventPage.c" +#line 1249 "EventPage.c" } -static void event_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { +static void +event_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames) +{ EventPage * self; - GeeList* _tmp0_; - GeeList* _tmp1_; #line 44 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage); #line 44 "/home/jens/Source/shotwell/src/events/EventPage.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); #line 45 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp0_ = ui_filenames; -#line 45 "/home/jens/Source/shotwell/src/events/EventPage.vala" - PAGE_CLASS (event_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_); -#line 47 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp1_ = ui_filenames; + PAGE_CLASS (event_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), ui_filenames); #line 47 "/home/jens/Source/shotwell/src/events/EventPage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "event.ui"); -#line 1131 "EventPage.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "event.ui"); +#line 1266 "EventPage.c" } -static void event_page_real_add_actions (Page* base, GActionMap* map) { +static void +event_page_real_add_actions (Page* base, + GActionMap* map) +{ EventPage * self; - GActionMap* _tmp0_; - GActionMap* _tmp1_; #line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage); #line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 57 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp0_ = map; -#line 57 "/home/jens/Source/shotwell/src/events/EventPage.vala" - PAGE_CLASS (event_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_); + PAGE_CLASS (event_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), map); #line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp1_ = map; -#line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala" - g_action_map_add_action_entries (_tmp1_, EVENT_PAGE_entries, G_N_ELEMENTS (EVENT_PAGE_entries), self); -#line 1151 "EventPage.c" + g_action_map_add_action_entries (map, EVENT_PAGE_entries, G_N_ELEMENTS (EVENT_PAGE_entries), self); +#line 1283 "EventPage.c" } -static void event_page_real_remove_actions (Page* base, GActionMap* map) { +static void +event_page_real_remove_actions (Page* base, + GActionMap* map) +{ EventPage * self; - GActionMap* _tmp0_; #line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage); #line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp0_ = map; -#line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala" - PAGE_CLASS (event_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_); -#line 1166 "EventPage.c" + PAGE_CLASS (event_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), map); +#line 1298 "EventPage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -1174,72 +1306,66 @@ static void event_page_real_remove_actions (Page* base, GActionMap* map) { entry_collection_length1 = G_N_ELEMENTS (EVENT_PAGE_entries); #line 64 "/home/jens/Source/shotwell/src/events/EventPage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (EVENT_PAGE_entries); entry_it = entry_it + 1) { -#line 1178 "EventPage.c" +#line 1310 "EventPage.c" GActionEntry entry = {0}; #line 64 "/home/jens/Source/shotwell/src/events/EventPage.vala" entry = entry_collection[entry_it]; -#line 1182 "EventPage.c" +#line 1314 "EventPage.c" { - GActionMap* _tmp1_; - GActionEntry _tmp2_; - const gchar* _tmp3_; -#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp1_ = map; + GActionEntry _tmp0_; + const gchar* _tmp1_; #line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp2_ = entry; + _tmp0_ = entry; #line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp3_ = _tmp2_.name; + _tmp1_ = _tmp0_.name; #line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala" - g_action_map_remove_action (_tmp1_, _tmp3_); -#line 1195 "EventPage.c" + g_action_map_remove_action (map, _tmp1_); +#line 1324 "EventPage.c" } } } } -static void event_page_real_init_actions (Page* base, gint selected_count, gint count) { +static void +event_page_real_init_actions (Page* base, + gint selected_count, + gint count) +{ EventPage * self; - gint _tmp0_; - gint _tmp1_; #line 69 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage); #line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp0_ = selected_count; -#line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp1_ = count; -#line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala" - PAGE_CLASS (event_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_, _tmp1_); -#line 1214 "EventPage.c" + PAGE_CLASS (event_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), selected_count, count); +#line 1341 "EventPage.c" } -static void event_page_real_update_actions (Page* base, gint selected_count, gint count) { +static void +event_page_real_update_actions (Page* base, + gint selected_count, + gint count) +{ EventPage * self; - gint _tmp0_; - gint _tmp1_; - gint _tmp2_; #line 73 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage); #line 74 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp0_ = selected_count; -#line 74 "/home/jens/Source/shotwell/src/events/EventPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MakePrimary", _tmp0_ == 1); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MakePrimary", selected_count == 1); #line 77 "/home/jens/Source/shotwell/src/events/EventPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToEvent", FALSE); #line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp1_ = selected_count; -#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp2_ = count; -#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala" - PAGE_CLASS (event_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp1_, _tmp2_); + PAGE_CLASS (event_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), selected_count, count); #line 83 "/home/jens/Source/shotwell/src/events/EventPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditEventComment", TRUE); -#line 1239 "EventPage.c" +#line 1361 "EventPage.c" } -static void event_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) { +static void +event_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by) +{ EventPage * self; gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; @@ -1265,23 +1391,25 @@ static void event_page_real_get_config_photos_sort (MediaPage* base, gboolean* s if (sort_order) { #line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala" *sort_order = _vala_sort_order; -#line 1269 "EventPage.c" +#line 1395 "EventPage.c" } #line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala" if (sort_by) { #line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala" *sort_by = _vala_sort_by; -#line 1275 "EventPage.c" +#line 1401 "EventPage.c" } } -static void event_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { +static void +event_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by) +{ EventPage * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - gboolean _tmp2_; - gint _tmp3_; #line 90 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage); #line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala" @@ -1289,58 +1417,52 @@ static void event_page_real_set_config_photos_sort (MediaPage* base, gboolean so #line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala" _tmp1_ = _tmp0_; #line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp2_ = sort_order; -#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp3_ = sort_by; -#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala" - configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); + configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), sort_order, sort_by); #line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala" _g_object_unref0 (_tmp1_); -#line 1300 "EventPage.c" +#line 1424 "EventPage.c" } -static void event_page_on_events_altered (EventPage* self, GeeMap* map) { - GeeMap* _tmp0_; - Event* _tmp1_; - gboolean _tmp2_; +static void +event_page_on_events_altered (EventPage* self, + GeeMap* map) +{ + Event* _tmp0_; #line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala" g_return_if_fail (IS_EVENT_PAGE (self)); #line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala" g_return_if_fail (GEE_IS_MAP (map)); #line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp0_ = map; -#line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp1_ = self->priv->page_event; -#line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp2_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = self->priv->page_event; #line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala" - if (_tmp2_) { -#line 1320 "EventPage.c" - Event* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; + if (gee_map_has_key (map, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject))) { +#line 1441 "EventPage.c" + Event* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; #line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp3_ = self->priv->page_event; + _tmp1_ = self->priv->page_event; #line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); + _tmp2_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); #line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala" - page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp5_); + page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp3_); #line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _g_free0 (_tmp5_); -#line 1334 "EventPage.c" + _g_free0 (_tmp3_); +#line 1455 "EventPage.c" } } -static void event_page_real_on_edit_comment (MediaPage* base) { +static void +event_page_real_on_edit_comment (MediaPage* base) +{ EventPage * self; ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; #line 99 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage); #line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala" @@ -1348,81 +1470,79 @@ static void event_page_real_on_edit_comment (MediaPage* base) { #line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala" _tmp1_ = _tmp0_; #line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0; #line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala" _data_collection_unref0 (_tmp1_); #line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala" - if (_tmp3_) { -#line 1359 "EventPage.c" + if (_tmp2_) { +#line 1479 "EventPage.c" EditCommentDialog* edit_comment_dialog = NULL; - Event* _tmp4_; + Event* _tmp3_; + gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; + EditCommentDialog* _tmp6_; EditCommentDialog* _tmp7_; - EditCommentDialog* _tmp8_; gchar* new_comment = NULL; - EditCommentDialog* _tmp9_; - gchar* _tmp10_; - const gchar* _tmp11_; + EditCommentDialog* _tmp8_; + gchar* _tmp9_; + const gchar* _tmp10_; EditEventCommentCommand* command = NULL; - Event* _tmp12_; - const gchar* _tmp13_; - EditEventCommentCommand* _tmp14_; + Event* _tmp11_; + const gchar* _tmp12_; + EditEventCommentCommand* _tmp13_; + CommandManager* _tmp14_; CommandManager* _tmp15_; - CommandManager* _tmp16_; - EditEventCommentCommand* _tmp17_; + EditEventCommentCommand* _tmp16_; #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp4_ = self->priv->page_event; + _tmp3_ = self->priv->page_event; #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp5_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_EVENT_SOURCE, EventSource)); + _tmp4_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_EVENT_SOURCE, EventSource)); #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp7_ = edit_comment_dialog_new (_tmp6_, TRUE); + _tmp6_ = edit_comment_dialog_new (_tmp5_, TRUE); #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala" - edit_comment_dialog = _tmp8_; + edit_comment_dialog = _tmp7_; #line 103 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp9_ = edit_comment_dialog; + _tmp8_ = edit_comment_dialog; #line 103 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp10_ = edit_comment_dialog_execute (_tmp9_); + _tmp9_ = edit_comment_dialog_execute (_tmp8_); #line 103 "/home/jens/Source/shotwell/src/events/EventPage.vala" - new_comment = _tmp10_; + new_comment = _tmp9_; #line 104 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp11_ = new_comment; + _tmp10_ = new_comment; #line 104 "/home/jens/Source/shotwell/src/events/EventPage.vala" - if (_tmp11_ == NULL) { + if (_tmp10_ == NULL) { #line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala" _g_free0 (new_comment); #line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala" _multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog); #line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala" return; -#line 1407 "EventPage.c" +#line 1527 "EventPage.c" } #line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp12_ = self->priv->page_event; + _tmp11_ = self->priv->page_event; #line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp13_ = new_comment; + _tmp12_ = new_comment; #line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp14_ = edit_event_comment_command_new (_tmp12_, _tmp13_); + _tmp13_ = edit_event_comment_command_new (_tmp11_, _tmp12_); #line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala" - command = _tmp14_; + command = _tmp13_; #line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp15_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp14_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp17_ = command; + _tmp16_ = command; #line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala" - command_manager_execute (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command)); #line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _command_manager_unref0 (_tmp16_); + _command_manager_unref0 (_tmp15_); #line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala" _g_object_unref0 (command); #line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala" @@ -1431,26 +1551,27 @@ static void event_page_real_on_edit_comment (MediaPage* base) { _multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog); #line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala" return; -#line 1435 "EventPage.c" +#line 1555 "EventPage.c" } #line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala" MEDIA_PAGE_CLASS (event_page_parent_class)->on_edit_comment (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_MEDIA_PAGE, MediaPage)); -#line 1439 "EventPage.c" +#line 1559 "EventPage.c" } -static void event_page_on_make_primary (EventPage* self) { +static void +event_page_on_make_primary (EventPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; - Event* _tmp4_; + gboolean _tmp2_; + Event* _tmp3_; + ViewCollection* _tmp4_; ViewCollection* _tmp5_; - ViewCollection* _tmp6_; + DataView* _tmp6_; DataView* _tmp7_; - DataView* _tmp8_; - DataSource* _tmp9_; - MediaSource* _tmp10_; + DataSource* _tmp8_; + MediaSource* _tmp9_; #line 115 "/home/jens/Source/shotwell/src/events/EventPage.vala" g_return_if_fail (IS_EVENT_PAGE (self)); #line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala" @@ -1458,44 +1579,44 @@ static void event_page_on_make_primary (EventPage* self) { #line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala" _tmp1_ = _tmp0_; #line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp3_ = _tmp2_ != 1; + _tmp2_ = view_collection_get_selected_count (_tmp1_) != 1; #line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala" _data_collection_unref0 (_tmp1_); #line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 117 "/home/jens/Source/shotwell/src/events/EventPage.vala" return; -#line 1471 "EventPage.c" +#line 1590 "EventPage.c" } #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp4_ = self->priv->page_event; + _tmp3_ = self->priv->page_event; #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp7_ = view_collection_get_selected_at (_tmp6_, 0); + _tmp6_ = view_collection_get_selected_at (_tmp5_, 0); #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp9_ = data_view_get_source (_tmp8_); + _tmp8_ = data_view_get_source (_tmp7_); #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource); #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - event_set_primary_source (_tmp4_, _tmp10_); + event_set_primary_source (_tmp3_, _tmp9_); #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp9_); #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _data_collection_unref0 (_tmp6_); -#line 1495 "EventPage.c" + _data_collection_unref0 (_tmp5_); +#line 1614 "EventPage.c" } -static void event_page_on_rename (EventPage* self) { +static void +event_page_on_rename (EventPage* self) +{ LibraryWindow* _tmp0_; LibraryWindow* _tmp1_; Event* _tmp2_; @@ -1511,11 +1632,13 @@ static void event_page_on_rename (EventPage* self) { library_window_rename_event_in_sidebar (_tmp1_, _tmp2_); #line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala" _g_object_unref0 (_tmp1_); -#line 1515 "EventPage.c" +#line 1636 "EventPage.c" } -static void event_page_class_init (EventPageClass * klass) { +static void +event_page_class_init (EventPageClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala" event_page_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala" @@ -1540,18 +1663,22 @@ static void event_page_class_init (EventPageClass * klass) { ((MediaPageClass *) klass)->on_edit_comment = (void (*) (MediaPage *)) event_page_real_on_edit_comment; #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala" G_OBJECT_CLASS (klass)->finalize = event_page_finalize; -#line 1544 "EventPage.c" +#line 1667 "EventPage.c" } -static void event_page_instance_init (EventPage * self) { +static void +event_page_instance_init (EventPage * self) +{ #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala" self->priv = EVENT_PAGE_GET_PRIVATE (self); -#line 1551 "EventPage.c" +#line 1676 "EventPage.c" } -static void event_page_finalize (GObject * obj) { +static void +event_page_finalize (GObject * obj) +{ EventPage * self; EventSourceCollection* _tmp0_; guint _tmp1_; @@ -1577,11 +1704,13 @@ static void event_page_finalize (GObject * obj) { _g_object_unref0 (self->priv->page_event); #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala" G_OBJECT_CLASS (event_page_parent_class)->finalize (obj); -#line 1581 "EventPage.c" +#line 1708 "EventPage.c" } -GType event_page_get_type (void) { +GType +event_page_get_type (void) +{ static volatile gsize event_page_type_id__volatile = 0; if (g_once_init_enter (&event_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventPage), 0, (GInstanceInitFunc) event_page_instance_init, NULL }; @@ -1593,7 +1722,9 @@ GType event_page_get_type (void) { } -NoEventPage* no_event_page_construct (GType object_type) { +NoEventPage* +no_event_page_construct (GType object_type) +{ NoEventPage * self = NULL; ViewManager* filter = NULL; NoEventPageNoEventViewManager* _tmp0_; @@ -1651,18 +1782,24 @@ NoEventPage* no_event_page_construct (GType object_type) { _view_manager_unref0 (filter); #line 145 "/home/jens/Source/shotwell/src/events/EventPage.vala" return self; -#line 1655 "EventPage.c" +#line 1786 "EventPage.c" } -NoEventPage* no_event_page_new (void) { +NoEventPage* +no_event_page_new (void) +{ #line 145 "/home/jens/Source/shotwell/src/events/EventPage.vala" return no_event_page_construct (TYPE_NO_EVENT_PAGE); -#line 1662 "EventPage.c" +#line 1795 "EventPage.c" } -static void no_event_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) { +static void +no_event_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by) +{ NoEventPage * self; gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; @@ -1688,23 +1825,25 @@ static void no_event_page_real_get_config_photos_sort (MediaPage* base, gboolean if (sort_order) { #line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala" *sort_order = _vala_sort_order; -#line 1692 "EventPage.c" +#line 1829 "EventPage.c" } #line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala" if (sort_by) { #line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala" *sort_by = _vala_sort_by; -#line 1698 "EventPage.c" +#line 1835 "EventPage.c" } } -static void no_event_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { +static void +no_event_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by) +{ NoEventPage * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - gboolean _tmp2_; - gint _tmp3_; #line 157 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NO_EVENT_PAGE, NoEventPage); #line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala" @@ -1712,94 +1851,92 @@ static void no_event_page_real_set_config_photos_sort (MediaPage* base, gboolean #line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala" _tmp1_ = _tmp0_; #line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp2_ = sort_order; -#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp3_ = sort_by; -#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala" - configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); + configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), sort_order, sort_by); #line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala" _g_object_unref0 (_tmp1_); -#line 1723 "EventPage.c" +#line 1858 "EventPage.c" } -static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_construct (GType object_type, NoEventPage* page) { +static NoEventPageNoEventViewManager* +no_event_page_no_event_view_manager_construct (GType object_type, + NoEventPage* page) +{ NoEventPageNoEventViewManager* self = NULL; - NoEventPage* _tmp0_; #line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala" g_return_val_if_fail (IS_NO_EVENT_PAGE (page), NULL); #line 133 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp0_ = page; -#line 133 "/home/jens/Source/shotwell/src/events/EventPage.vala" - self = (NoEventPageNoEventViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage)); + self = (NoEventPageNoEventViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_COLLECTION_PAGE, CollectionPage)); #line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala" return self; -#line 1738 "EventPage.c" +#line 1873 "EventPage.c" } -static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_new (NoEventPage* page) { +static NoEventPageNoEventViewManager* +no_event_page_no_event_view_manager_new (NoEventPage* page) +{ #line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala" return no_event_page_no_event_view_manager_construct (NO_EVENT_PAGE_TYPE_NO_EVENT_VIEW_MANAGER, page); -#line 1745 "EventPage.c" +#line 1882 "EventPage.c" } -static gboolean no_event_page_no_event_view_manager_real_include_in_view (ViewManager* base, DataSource* source) { +static gboolean +no_event_page_no_event_view_manager_real_include_in_view (ViewManager* base, + DataSource* source) +{ NoEventPageNoEventViewManager * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; - DataSource* _tmp1_; - EventID _tmp2_ = {0}; - gint64 _tmp3_; + EventID _tmp1_ = {0}; + gint64 _tmp2_; #line 137 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, NO_EVENT_PAGE_TYPE_NO_EVENT_VIEW_MANAGER, NoEventPageNoEventViewManager); #line 137 "/home/jens/Source/shotwell/src/events/EventPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp1_ = source; -#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala" - media_source_get_event_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp2_); + media_source_get_event_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource), &_tmp1_); #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp3_ = _tmp2_.id; + _tmp2_ = _tmp1_.id; #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala" - if (_tmp3_ != EVENT_ID_INVALID) { + if (_tmp2_ != EVENT_ID_INVALID) { #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala" _tmp0_ = FALSE; -#line 1770 "EventPage.c" +#line 1907 "EventPage.c" } else { - DataSource* _tmp4_; - gboolean _tmp5_; #line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp4_ = source; -#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp5_ = VIEW_MANAGER_CLASS (no_event_page_no_event_view_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManager), TYPE_VIEW_MANAGER, ViewManager), _tmp4_); -#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp0_ = _tmp5_; -#line 1780 "EventPage.c" + _tmp0_ = VIEW_MANAGER_CLASS (no_event_page_no_event_view_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManager), TYPE_VIEW_MANAGER, ViewManager), source); +#line 1911 "EventPage.c" } #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala" result = _tmp0_; #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala" return result; -#line 1786 "EventPage.c" +#line 1917 "EventPage.c" } -static void no_event_page_no_event_view_manager_class_init (NoEventPageNoEventViewManagerClass * klass) { +static void +no_event_page_no_event_view_manager_class_init (NoEventPageNoEventViewManagerClass * klass) +{ #line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala" no_event_page_no_event_view_manager_parent_class = g_type_class_peek_parent (klass); #line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala" ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) no_event_page_no_event_view_manager_real_include_in_view; -#line 1795 "EventPage.c" +#line 1928 "EventPage.c" } -static void no_event_page_no_event_view_manager_instance_init (NoEventPageNoEventViewManager * self) { +static void +no_event_page_no_event_view_manager_instance_init (NoEventPageNoEventViewManager * self) +{ } -static GType no_event_page_no_event_view_manager_get_type (void) { +static GType +no_event_page_no_event_view_manager_get_type (void) +{ static volatile gsize no_event_page_no_event_view_manager_type_id__volatile = 0; if (g_once_init_enter (&no_event_page_no_event_view_manager_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (NoEventPageNoEventViewManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) no_event_page_no_event_view_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NoEventPageNoEventViewManager), 0, (GInstanceInitFunc) no_event_page_no_event_view_manager_instance_init, NULL }; @@ -1811,7 +1948,9 @@ static GType no_event_page_no_event_view_manager_get_type (void) { } -static void no_event_page_class_init (NoEventPageClass * klass) { +static void +no_event_page_class_init (NoEventPageClass * klass) +{ Alteration* _tmp0_; #line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala" no_event_page_parent_class = g_type_class_peek_parent (klass); @@ -1825,25 +1964,31 @@ static void no_event_page_class_init (NoEventPageClass * klass) { _tmp0_ = alteration_new ("metadata", "event"); #line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala" no_event_page_no_event_page_alteration = _tmp0_; -#line 1829 "EventPage.c" +#line 1968 "EventPage.c" } -static void no_event_page_instance_init (NoEventPage * self) { +static void +no_event_page_instance_init (NoEventPage * self) +{ } -static void no_event_page_finalize (GObject * obj) { +static void +no_event_page_finalize (GObject * obj) +{ NoEventPage * self; #line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NO_EVENT_PAGE, NoEventPage); #line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala" G_OBJECT_CLASS (no_event_page_parent_class)->finalize (obj); -#line 1843 "EventPage.c" +#line 1986 "EventPage.c" } -GType no_event_page_get_type (void) { +GType +no_event_page_get_type (void) +{ static volatile gsize no_event_page_type_id__volatile = 0; if (g_once_init_enter (&no_event_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (NoEventPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) no_event_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NoEventPage), 0, (GInstanceInitFunc) no_event_page_instance_init, NULL }; diff --git a/src/events/Events.c b/src/events/Events.c index 270b9ad..055b112 100644 --- a/src/events/Events.c +++ b/src/events/Events.c @@ -1,4 +1,4 @@ -/* Events.c generated by valac 0.36.6, the Vala compiler +/* Events.c generated by valac 0.40.4, the Vala compiler * generated from Events.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include @@ -19,17 +20,21 @@ void events_terminate (void); void events_branch_terminate (void); -void events_init (GError** error) { +void +events_init (GError** error) +{ #line 10 "/home/jens/Source/shotwell/src/events/Events.vala" events_branch_init (); -#line 26 "Events.c" +#line 29 "Events.c" } -void events_terminate (void) { +void +events_terminate (void) +{ #line 14 "/home/jens/Source/shotwell/src/events/Events.vala" events_branch_terminate (); -#line 33 "Events.c" +#line 38 "Events.c" } diff --git a/src/events/EventsBranch.c b/src/events/EventsBranch.c index 17ff6eb..e50da5b 100644 --- a/src/events/EventsBranch.c +++ b/src/events/EventsBranch.c @@ -1,4 +1,4 @@ -/* EventsBranch.c generated by valac 0.36.6, the Vala compiler +/* EventsBranch.c generated by valac 0.40.4, the Vala compiler * generated from EventsBranch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -149,6 +150,11 @@ typedef struct _EventsNoEventEntryClass EventsNoEventEntryClass; typedef struct _EventsMasterDirectoryEntry EventsMasterDirectoryEntry; typedef struct _EventsMasterDirectoryEntryClass EventsMasterDirectoryEntryClass; +enum { + EVENTS_BRANCH_0_PROPERTY, + EVENTS_BRANCH_NUM_PROPERTIES +}; +static GParamSpec* events_branch_properties[EVENTS_BRANCH_NUM_PROPERTIES]; #define TYPE_DATA_COLLECTION (data_collection_get_type ()) #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection)) @@ -349,7 +355,17 @@ typedef struct _SidebarSimplePageEntryPrivate SidebarSimplePageEntryPrivate; typedef struct _SidebarExpandableEntry SidebarExpandableEntry; typedef struct _SidebarExpandableEntryIface SidebarExpandableEntryIface; typedef struct _EventsDirectoryEntryPrivate EventsDirectoryEntryPrivate; +enum { + EVENTS_DIRECTORY_ENTRY_0_PROPERTY, + EVENTS_DIRECTORY_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* events_directory_entry_properties[EVENTS_DIRECTORY_ENTRY_NUM_PROPERTIES]; typedef struct _EventsMasterDirectoryEntryPrivate EventsMasterDirectoryEntryPrivate; +enum { + EVENTS_MASTER_DIRECTORY_ENTRY_0_PROPERTY, + EVENTS_MASTER_DIRECTORY_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* events_master_directory_entry_properties[EVENTS_MASTER_DIRECTORY_ENTRY_NUM_PROPERTIES]; #define TYPE_CHECKERBOARD_PAGE (checkerboard_page_get_type ()) #define CHECKERBOARD_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHECKERBOARD_PAGE, CheckerboardPage)) @@ -381,6 +397,11 @@ typedef struct _EventsDirectoryPageClass EventsDirectoryPageClass; typedef struct _MasterEventsDirectoryPage MasterEventsDirectoryPage; typedef struct _MasterEventsDirectoryPageClass MasterEventsDirectoryPageClass; typedef struct _EventsYearDirectoryEntryPrivate EventsYearDirectoryEntryPrivate; +enum { + EVENTS_YEAR_DIRECTORY_ENTRY_0_PROPERTY, + EVENTS_YEAR_DIRECTORY_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* events_year_directory_entry_properties[EVENTS_YEAR_DIRECTORY_ENTRY_NUM_PROPERTIES]; #define SUB_EVENTS_DIRECTORY_PAGE_TYPE_DIRECTORY_TYPE (sub_events_directory_page_directory_type_get_type ()) @@ -394,7 +415,17 @@ typedef struct _EventsYearDirectoryEntryPrivate EventsYearDirectoryEntryPrivate; typedef struct _SubEventsDirectoryPage SubEventsDirectoryPage; typedef struct _SubEventsDirectoryPageClass SubEventsDirectoryPageClass; typedef struct _EventsMonthDirectoryEntryPrivate EventsMonthDirectoryEntryPrivate; +enum { + EVENTS_MONTH_DIRECTORY_ENTRY_0_PROPERTY, + EVENTS_MONTH_DIRECTORY_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* events_month_directory_entry_properties[EVENTS_MONTH_DIRECTORY_ENTRY_NUM_PROPERTIES]; typedef struct _EventsUndatedDirectoryEntryPrivate EventsUndatedDirectoryEntryPrivate; +enum { + EVENTS_UNDATED_DIRECTORY_ENTRY_0_PROPERTY, + EVENTS_UNDATED_DIRECTORY_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* events_undated_directory_entry_properties[EVENTS_UNDATED_DIRECTORY_ENTRY_NUM_PROPERTIES]; #define SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY (sidebar_internal_drop_target_entry_get_type ()) #define SIDEBAR_INTERNAL_DROP_TARGET_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY, SidebarInternalDropTargetEntry)) @@ -414,6 +445,11 @@ typedef struct _SidebarInternalDropTargetEntryIface SidebarInternalDropTargetEnt typedef struct _MediaSource MediaSource; typedef struct _MediaSourceClass MediaSourceClass; typedef struct _EventsEventEntryPrivate EventsEventEntryPrivate; +enum { + EVENTS_EVENT_ENTRY_0_PROPERTY, + EVENTS_EVENT_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* events_event_entry_properties[EVENTS_EVENT_ENTRY_NUM_PROPERTIES]; #define TYPE_MEDIA_PAGE (media_page_get_type ()) #define MEDIA_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_PAGE, MediaPage)) @@ -526,6 +562,11 @@ typedef struct _MovePhotosCommandClass MovePhotosCommandClass; typedef struct _SetEventCommand SetEventCommand; typedef struct _SetEventCommandClass SetEventCommandClass; typedef struct _EventsNoEventEntryPrivate EventsNoEventEntryPrivate; +enum { + EVENTS_NO_EVENT_ENTRY_0_PROPERTY, + EVENTS_NO_EVENT_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* events_no_event_entry_properties[EVENTS_NO_EVENT_ENTRY_NUM_PROPERTIES]; #define TYPE_NO_EVENT_PAGE (no_event_page_get_type ()) #define NO_EVENT_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NO_EVENT_PAGE, NoEventPage)) @@ -768,38 +809,57 @@ GType events_undated_directory_entry_get_type (void) G_GNUC_CONST; GType events_no_event_entry_get_type (void) G_GNUC_CONST; GType events_master_directory_entry_get_type (void) G_GNUC_CONST; #define EVENTS_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EVENTS_TYPE_BRANCH, EventsBranchPrivate)) -enum { - EVENTS_BRANCH_DUMMY_PROPERTY -}; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType event_source_collection_get_type (void) G_GNUC_CONST; -static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterable* added, GeeIterable* removed); -static void _events_branch_on_events_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self); +static void events_branch_on_events_added_removed (EventsBranch* self, + GeeIterable* added, + GeeIterable* removed); +static void _events_branch_on_events_added_removed_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self); gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; -static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered); -static void _events_branch_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void events_branch_on_events_altered (EventsBranch* self, + GeeMap* altered); +static void _events_branch_on_events_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); static void events_branch_on_no_event_collection_altered (EventsBranch* self); -static void _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered (EventSourceCollection* _sender, gpointer self); +static void _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered (EventSourceCollection* _sender, + gpointer self); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); static void events_branch_on_config_changed (EventsBranch* self); -static void _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed (ConfigurationFacade* _sender, gpointer self); +static void _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed (ConfigurationFacade* _sender, + gpointer self); #define RESOURCES_ICON_FOLDER "folder" #define RESOURCES_ICON_EVENTS "multiple-events" #define RESOURCES_ICON_ONE_EVENT "one-event" @@ -812,22 +872,41 @@ EventsMasterDirectoryEntry* events_master_directory_entry_new (void); EventsMasterDirectoryEntry* events_master_directory_entry_construct (GType object_type); EventsBranch* events_branch_new (void); EventsBranch* events_branch_construct (GType object_type); -SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized); -SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized); +SidebarHeader* sidebar_header_new (const gchar* name, + const gchar* tooltip, + gboolean emphasized); +SidebarHeader* sidebar_header_construct (GType object_type, + const gchar* name, + const gchar* tooltip, + gboolean emphasized); GType sidebar_grouping_get_type (void) G_GNUC_CONST; GType sidebar_header_get_type (void) G_GNUC_CONST; GType sidebar_tree_get_type (void) G_GNUC_CONST; GType sidebar_entry_get_type (void) G_GNUC_CONST; GType sidebar_branch_options_get_type (void) G_GNUC_CONST; -static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry* b); -static gint _events_branch_event_year_comparator_gcompare_func (gconstpointer a, gconstpointer b); -SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator); -SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator); -void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator); +static gint events_branch_event_year_comparator (SidebarEntry* a, + SidebarEntry* b); +static gint _events_branch_event_year_comparator_gcompare_func (gconstpointer a, + gconstpointer b); +SidebarBranch* sidebar_branch_new (SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator); +SidebarBranch* sidebar_branch_construct (GType object_type, + SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator); +void sidebar_branch_graft (SidebarBranch* self, + SidebarEntry* parent, + SidebarEntry* entry, + GCompareFunc comparator); SidebarEntry* sidebar_branch_get_root (SidebarBranch* self); GeeCollection* data_collection_get_all (DataCollection* self); -static void events_branch_add_event (EventsBranch* self, Event* event); -static void events_branch_show_no_events (EventsBranch* self, gboolean show); +static void events_branch_add_event (EventsBranch* self, + Event* event); +static void events_branch_show_no_events (EventsBranch* self, + gboolean show); GeeCollection* event_source_collection_get_no_event_objects (EventSourceCollection* self); void events_branch_init (void); gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* self); @@ -836,72 +915,110 @@ gboolean events_branch_is_user_renameable (EventsBranch* self); EventsMasterDirectoryEntry* events_branch_get_master_entry (EventsBranch* self); GType events_year_directory_entry_get_type (void) G_GNUC_CONST; gint events_year_directory_entry_get_year (EventsYearDirectoryEntry* self); -static gint events_branch_event_month_comparator (SidebarEntry* a, SidebarEntry* b); +static gint events_branch_event_month_comparator (SidebarEntry* a, + SidebarEntry* b); GType events_month_directory_entry_get_type (void) G_GNUC_CONST; gint events_month_directory_entry_get_month (EventsMonthDirectoryEntry* self); -static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b); +static gint events_branch_event_comparator (SidebarEntry* a, + SidebarEntry* b); Event* events_event_entry_get_event (EventsEventEntry* self); time_t event_source_get_start_time (EventSource* self); GType event_id_get_type (void) G_GNUC_CONST; EventID* event_id_dup (const EventID* self); void event_id_free (EventID* self); -void event_get_event_id (Event* self, EventID* result); -static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntry* b); +void event_get_event_id (Event* self, + EventID* result); +static gint events_branch_undated_event_comparator (SidebarEntry* a, + SidebarEntry* b); gchar* data_object_get_name (DataObject* self); gint64 data_source_get_instance_id (DataSource* self); -EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, Event* event); +EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, + Event* event); void sidebar_branch_reorder_all (SidebarBranch* self); -static void events_branch_remove_event (EventsBranch* self, Event* event); -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail); -static void events_branch_move_event (EventsBranch* self, Event* event); +static void events_branch_remove_event (EventsBranch* self, + Event* event); +gboolean alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail); +static void events_branch_move_event (EventsBranch* self, + Event* event); GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST; -static void events_branch_add_undated_event (EventsBranch* self, Event* event); -static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* event, struct tm* event_tm, SidebarEntry* * found_year); -static void events_branch_graft_event (EventsBranch* self, SidebarEntry* parent, Event* event, GCompareFunc comparator); -static gint _events_branch_event_comparator_gcompare_func (gconstpointer a, gconstpointer b); +static void events_branch_add_undated_event (EventsBranch* self, + Event* event); +static SidebarEntry* events_branch_find_event_month (EventsBranch* self, + Event* event, + struct tm* event_tm, + SidebarEntry* * found_year); +static void events_branch_graft_event (EventsBranch* self, + SidebarEntry* parent, + Event* event, + GCompareFunc comparator); +static gint _events_branch_event_comparator_gcompare_func (gconstpointer a, + gconstpointer b); #define SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT _ ("%Y") -EventsYearDirectoryEntry* events_year_directory_entry_new (const gchar* name, struct tm* tm); -EventsYearDirectoryEntry* events_year_directory_entry_construct (GType object_type, const gchar* name, struct tm* tm); -static gint _events_branch_event_month_comparator_gcompare_func (gconstpointer a, gconstpointer b); +EventsYearDirectoryEntry* events_year_directory_entry_new (const gchar* name, + struct tm* tm); +EventsYearDirectoryEntry* events_year_directory_entry_construct (GType object_type, + const gchar* name, + struct tm* tm); +static gint _events_branch_event_month_comparator_gcompare_func (gconstpointer a, + gconstpointer b); #define SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT _ ("%B") -EventsMonthDirectoryEntry* events_month_directory_entry_new (const gchar* name, struct tm* tm); -EventsMonthDirectoryEntry* events_month_directory_entry_construct (GType object_type, const gchar* name, struct tm* tm); -static void events_branch_move_to_undated_event (EventsBranch* self, Event* event); -static void events_branch_reparent_event (EventsBranch* self, Event* event, SidebarEntry* new_parent); -SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry); -void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry); -gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent); +EventsMonthDirectoryEntry* events_month_directory_entry_new (const gchar* name, + struct tm* tm); +EventsMonthDirectoryEntry* events_month_directory_entry_construct (GType object_type, + const gchar* name, + struct tm* tm); +static void events_branch_move_to_undated_event (EventsBranch* self, + Event* event); +static void events_branch_reparent_event (EventsBranch* self, + Event* event, + SidebarEntry* new_parent); +SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, + SidebarEntry* entry); +void sidebar_branch_prune (SidebarBranch* self, + SidebarEntry* entry); +gint sidebar_branch_get_child_count (SidebarBranch* self, + SidebarEntry* parent); static Block8Data* block8_data_ref (Block8Data* _data8_); static void block8_data_unref (void * _userdata_); -static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* event, struct tm* event_tm); -SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry* parent, Locator locator, void* locator_target); -static gboolean __lambda21_ (Block8Data* _data8_, SidebarEntry* entry); -static gboolean ___lambda21__locator (gconstpointer item, gpointer self); +static SidebarEntry* events_branch_find_event_year (EventsBranch* self, + Event* event, + struct tm* event_tm); +SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, + SidebarEntry* parent, + Locator locator, + void* locator_target); +static gboolean __lambda21_ (Block8Data* _data8_, + SidebarEntry* entry); +static gboolean ___lambda21__locator (gconstpointer item, + gpointer self); static Block9Data* block9_data_ref (Block9Data* _data9_); static void block9_data_unref (void * _userdata_); -static gboolean __lambda20_ (Block9Data* _data9_, SidebarEntry* entry); -static gboolean ___lambda20__locator (gconstpointer item, gpointer self); -gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry); -static gint _events_branch_undated_event_comparator_gcompare_func (gconstpointer a, gconstpointer b); +static gboolean __lambda20_ (Block9Data* _data9_, + SidebarEntry* entry); +static gboolean ___lambda20__locator (gconstpointer item, + gpointer self); +gboolean sidebar_branch_has_entry (SidebarBranch* self, + SidebarEntry* entry); +static gint _events_branch_undated_event_comparator_gcompare_func (gconstpointer a, + gconstpointer b); EventsEventEntry* events_event_entry_new (Event* event); -EventsEventEntry* events_event_entry_construct (GType object_type, Event* event); -void sidebar_branch_reparent (SidebarBranch* self, SidebarEntry* new_parent, SidebarEntry* entry); +EventsEventEntry* events_event_entry_construct (GType object_type, + Event* event); +void sidebar_branch_reparent (SidebarBranch* self, + SidebarEntry* new_parent, + SidebarEntry* entry); static void events_branch_finalize (GObject * obj); GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST; GType page_get_type (void) G_GNUC_CONST; GType sidebar_page_representative_get_type (void) G_GNUC_CONST; GType sidebar_contextable_get_type (void) G_GNUC_CONST; GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST; -enum { - EVENTS_DIRECTORY_ENTRY_DUMMY_PROPERTY -}; EventsDirectoryEntry* events_directory_entry_construct (GType object_type); SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type); static gchar* events_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base); static gboolean events_directory_entry_real_expand_on_select (SidebarExpandableEntry* base); -enum { - EVENTS_MASTER_DIRECTORY_ENTRY_DUMMY_PROPERTY -}; static gchar* events_master_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base); #define MASTER_EVENTS_DIRECTORY_PAGE_NAME _ ("All Events") static gchar* events_master_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base); @@ -912,75 +1029,81 @@ GType checkerboard_page_get_type (void) G_GNUC_CONST; GType events_directory_page_get_type (void) G_GNUC_CONST; GType master_events_directory_page_get_type (void) G_GNUC_CONST; #define EVENTS_YEAR_DIRECTORY_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntryPrivate)) -enum { - EVENTS_YEAR_DIRECTORY_ENTRY_DUMMY_PROPERTY -}; static gchar* events_year_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base); static Page* events_year_directory_entry_real_create_page (SidebarSimplePageEntry* base); GType sub_events_directory_page_directory_type_get_type (void) G_GNUC_CONST; -SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, struct tm* time); -SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time); +SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, + struct tm* time); +SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type, + SubEventsDirectoryPageDirectoryType type, + struct tm* time); GType sub_events_directory_page_get_type (void) G_GNUC_CONST; static void events_year_directory_entry_finalize (GObject * obj); #define EVENTS_MONTH_DIRECTORY_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntryPrivate)) -enum { - EVENTS_MONTH_DIRECTORY_ENTRY_DUMMY_PROPERTY -}; static gchar* events_month_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base); gint events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self); static Page* events_month_directory_entry_real_create_page (SidebarSimplePageEntry* base); static void events_month_directory_entry_finalize (GObject * obj); -enum { - EVENTS_UNDATED_DIRECTORY_ENTRY_DUMMY_PROPERTY -}; static gchar* events_undated_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base); #define SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME _ ("Undated") static Page* events_undated_directory_entry_real_create_page (SidebarSimplePageEntry* base); GType media_source_get_type (void) G_GNUC_CONST; GType sidebar_internal_drop_target_entry_get_type (void) G_GNUC_CONST; #define EVENTS_EVENT_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EVENTS_TYPE_EVENT_ENTRY, EventsEventEntryPrivate)) -enum { - EVENTS_EVENT_ENTRY_DUMMY_PROPERTY -}; static gchar* events_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base); static gchar* events_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base); static Page* events_event_entry_real_create_page (SidebarSimplePageEntry* base); EventPage* event_page_new (Event* page_event); -EventPage* event_page_construct (GType object_type, Event* page_event); +EventPage* event_page_construct (GType object_type, + Event* page_event); GType media_page_get_type (void) G_GNUC_CONST; GType collection_page_get_type (void) G_GNUC_CONST; GType event_page_get_type (void) G_GNUC_CONST; static gboolean events_event_entry_real_is_user_renameable (SidebarRenameableEntry* base); -static void events_event_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name); +static void events_event_entry_real_rename (SidebarRenameableEntry* base, + const gchar* new_name); gchar* event_prep_event_name (const gchar* name); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* app_window_get_command_manager (void); GType command_get_type (void) G_GNUC_CONST; -void command_manager_execute (CommandManager* self, Command* command); -RenameEventCommand* rename_event_command_new (Event* event, const gchar* new_name); -RenameEventCommand* rename_event_command_construct (GType object_type, Event* event, const gchar* new_name); +void command_manager_execute (CommandManager* self, + Command* command); +RenameEventCommand* rename_event_command_new (Event* event, + const gchar* new_name); +RenameEventCommand* rename_event_command_construct (GType object_type, + Event* event, + const gchar* new_name); GType page_command_get_type (void) G_GNUC_CONST; GType simple_proxyable_command_get_type (void) G_GNUC_CONST; GType rename_event_command_get_type (void) G_GNUC_CONST; -static gboolean events_event_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media); +static gboolean events_event_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, + GeeList* media); GType data_view_get_type (void) G_GNUC_CONST; DataView* data_view_new (DataSource* source); -DataView* data_view_construct (GType object_type, DataSource* source); -SetEventCommand* set_event_command_new (GeeIterable* iter, Event* new_event); -SetEventCommand* set_event_command_construct (GType object_type, GeeIterable* iter, Event* new_event); +DataView* data_view_construct (GType object_type, + DataSource* source); +SetEventCommand* set_event_command_new (GeeIterable* iter, + Event* new_event); +SetEventCommand* set_event_command_construct (GType object_type, + GeeIterable* iter, + Event* new_event); GType move_photos_command_get_type (void) G_GNUC_CONST; GType set_event_command_get_type (void) G_GNUC_CONST; -static gboolean events_event_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data); +static gboolean events_event_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, + GtkSelectionData* data); static void events_event_entry_finalize (GObject * obj); -enum { - EVENTS_NO_EVENT_ENTRY_DUMMY_PROPERTY -}; static gchar* events_no_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base); #define NO_EVENT_PAGE_NAME _ ("No Event") static gchar* events_no_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base); @@ -990,60 +1113,80 @@ NoEventPage* no_event_page_construct (GType object_type); GType no_event_page_get_type (void) G_GNUC_CONST; -static void _events_branch_on_events_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { +static void +_events_branch_on_events_added_removed_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self) +{ #line 47 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_branch_on_events_added_removed ((EventsBranch*) self, added, removed); -#line 997 "EventsBranch.c" +#line 1125 "EventsBranch.c" } -static void _events_branch_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_events_branch_on_events_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 48 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_branch_on_events_altered ((EventsBranch*) self, items); -#line 1004 "EventsBranch.c" +#line 1136 "EventsBranch.c" } -static void _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered (EventSourceCollection* _sender, gpointer self) { +static void +_events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered (EventSourceCollection* _sender, + gpointer self) +{ #line 49 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_branch_on_no_event_collection_altered ((EventsBranch*) self); -#line 1011 "EventsBranch.c" +#line 1146 "EventsBranch.c" } -static void _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed (ConfigurationFacade* _sender, gpointer self) { +static void +_events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed (ConfigurationFacade* _sender, + gpointer self) +{ #line 51 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_branch_on_config_changed ((EventsBranch*) self); -#line 1018 "EventsBranch.c" +#line 1156 "EventsBranch.c" } -static gint _events_branch_event_year_comparator_gcompare_func (gconstpointer a, gconstpointer b) { +static gint +_events_branch_event_year_comparator_gcompare_func (gconstpointer a, + gconstpointer b) +{ gint result; result = events_branch_event_year_comparator ((SidebarEntry*) a, (SidebarEntry*) b); #line 25 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1027 "EventsBranch.c" +#line 1168 "EventsBranch.c" } -EventsBranch* events_branch_construct (GType object_type) { +EventsBranch* +events_branch_construct (GType object_type) +{ EventsBranch * self = NULL; SidebarHeader* _tmp0_; SidebarHeader* _tmp1_; SidebarEntry* _tmp2_; SidebarEntry* _tmp3_; EventsMasterDirectoryEntry* _tmp4_; - EventSourceCollection* _tmp15_; + EventSourceCollection* _tmp14_; + GeeCollection* _tmp15_; GeeCollection* _tmp16_; - GeeCollection* _tmp17_; + gint _tmp17_; gint _tmp18_; - gint _tmp19_; + EventSourceCollection* _tmp19_; EventSourceCollection* _tmp20_; EventSourceCollection* _tmp21_; - EventSourceCollection* _tmp22_; + ConfigFacade* _tmp22_; ConfigFacade* _tmp23_; - ConfigFacade* _tmp24_; #line 25 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp0_ = sidebar_header_new (_ ("Events"), _ ("Browse through your events"), TRUE); #line 25 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -1062,7 +1205,7 @@ EventsBranch* events_branch_construct (GType object_type) { sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); #line 29 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_tmp3_); -#line 1066 "EventsBranch.c" +#line 1209 "EventsBranch.c" { GeeIterator* _object_it = NULL; EventSourceCollection* _tmp5_; @@ -1086,111 +1229,113 @@ EventsBranch* events_branch_construct (GType object_type) { _object_it = _tmp9_; #line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" while (TRUE) { -#line 1090 "EventsBranch.c" +#line 1233 "EventsBranch.c" GeeIterator* _tmp10_; - gboolean _tmp11_; DataObject* object = NULL; - GeeIterator* _tmp12_; - gpointer _tmp13_; - DataObject* _tmp14_; + GeeIterator* _tmp11_; + gpointer _tmp12_; + DataObject* _tmp13_; #line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp10_ = _object_it; #line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = gee_iterator_next (_tmp10_); -#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp11_) { + if (!gee_iterator_next (_tmp10_)) { #line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" break; -#line 1105 "EventsBranch.c" +#line 1245 "EventsBranch.c" } #line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = _object_it; + _tmp11_ = _object_it; #line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = gee_iterator_get (_tmp12_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - object = (DataObject*) _tmp13_; + object = (DataObject*) _tmp12_; #line 33 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = object; + _tmp13_ = object; #line 33 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_EVENT, Event)); + events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_EVENT, Event)); #line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (object); -#line 1119 "EventsBranch.c" +#line 1259 "EventsBranch.c" } #line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_object_it); -#line 1123 "EventsBranch.c" +#line 1263 "EventsBranch.c" } #line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = event_global; + _tmp14_ = event_global; #line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp16_ = event_source_collection_get_no_event_objects (_tmp15_); + _tmp15_ = event_source_collection_get_no_event_objects (_tmp14_); #line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp18_ = gee_collection_get_size (_tmp17_); + _tmp17_ = gee_collection_get_size (_tmp16_); #line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_show_no_events (self, _tmp19_ > 0); + events_branch_show_no_events (self, _tmp18_ > 0); #line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp17_); + _g_object_unref0 (_tmp16_); #line 38 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp20_ = event_global; + _tmp19_ = event_global; #line 38 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _events_branch_on_events_added_removed_data_collection_contents_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _events_branch_on_events_added_removed_data_collection_contents_altered, self, 0); #line 39 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp21_ = event_global; + _tmp20_ = event_global; #line 39 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _events_branch_on_events_altered_data_collection_items_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _events_branch_on_events_altered_data_collection_items_altered, self, 0); #line 40 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp22_ = event_global; + _tmp21_ = event_global; #line 40 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - g_signal_connect_object (_tmp22_, "no-event-collection-altered", (GCallback) _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered, self, 0); + g_signal_connect_object (_tmp21_, "no-event-collection-altered", (GCallback) _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered, self, 0); #line 43 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp23_ = config_facade_get_instance (); + _tmp22_ = config_facade_get_instance (); #line 43 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 43 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "events-sort-ascending-changed", (GCallback) _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "events-sort-ascending-changed", (GCallback) _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed, self, 0); #line 43 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp23_); #line 24 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return self; -#line 1161 "EventsBranch.c" +#line 1301 "EventsBranch.c" } -EventsBranch* events_branch_new (void) { +EventsBranch* +events_branch_new (void) +{ #line 24 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return events_branch_construct (EVENTS_TYPE_BRANCH); -#line 1168 "EventsBranch.c" +#line 1310 "EventsBranch.c" } -void events_branch_init (void) { +void +events_branch_init (void) +{ ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - gboolean _tmp2_; #line 55 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp0_ = config_facade_get_instance (); #line 55 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp1_ = _tmp0_; #line 55 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 55 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_sort_ascending = _tmp2_; + events_branch_sort_ascending = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 55 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_tmp1_); -#line 1186 "EventsBranch.c" +#line 1327 "EventsBranch.c" } -void events_branch_terminate (void) { +void +events_branch_terminate (void) +{ } -gboolean events_branch_is_user_renameable (EventsBranch* self) { +gboolean +events_branch_is_user_renameable (EventsBranch* self) +{ gboolean result = FALSE; #line 61 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (EVENTS_IS_BRANCH (self), FALSE); @@ -1198,18 +1343,22 @@ gboolean events_branch_is_user_renameable (EventsBranch* self) { result = TRUE; #line 62 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1202 "EventsBranch.c" +#line 1347 "EventsBranch.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 66 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return self ? g_object_ref (self) : NULL; -#line 1209 "EventsBranch.c" +#line 1356 "EventsBranch.c" } -EventsMasterDirectoryEntry* events_branch_get_master_entry (EventsBranch* self) { +EventsMasterDirectoryEntry* +events_branch_get_master_entry (EventsBranch* self) +{ EventsMasterDirectoryEntry* result = NULL; EventsMasterDirectoryEntry* _tmp0_; EventsMasterDirectoryEntry* _tmp1_; @@ -1223,558 +1372,435 @@ EventsMasterDirectoryEntry* events_branch_get_master_entry (EventsBranch* self) result = _tmp1_; #line 66 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1227 "EventsBranch.c" +#line 1376 "EventsBranch.c" } -static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry* b) { +static gint +events_branch_event_year_comparator (SidebarEntry* a, + SidebarEntry* b) +{ gint result = 0; - SidebarEntry* _tmp0_; - SidebarEntry* _tmp1_; - SidebarEntry* _tmp2_; - SidebarEntry* _tmp6_; - SidebarEntry* _tmp8_; - gboolean _tmp10_; + gboolean _tmp0_; gint _result_ = 0; - SidebarEntry* _tmp15_; - gint _tmp16_; - SidebarEntry* _tmp17_; - gint _tmp18_; - gint _tmp19_; + gint _tmp3_; #line 69 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 69 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0); #line 70 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = a; -#line 70 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = b; -#line 70 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp0_ == _tmp1_) { + if (a == b) { #line 71 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = 0; #line 71 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1259 "EventsBranch.c" +#line 1398 "EventsBranch.c" } #line 75 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = a; -#line 75 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) { -#line 1265 "EventsBranch.c" - SidebarEntry* _tmp3_; -#line 76 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = b; + if (G_TYPE_CHECK_INSTANCE_TYPE (a, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) { #line 76 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, EVENTS_TYPE_NO_EVENT_ENTRY)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (b, EVENTS_TYPE_NO_EVENT_ENTRY)) { #line 77 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = -1; #line 77 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1275 "EventsBranch.c" +#line 1408 "EventsBranch.c" } #line 78 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = 1; #line 78 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1281 "EventsBranch.c" +#line 1414 "EventsBranch.c" } else { - SidebarEntry* _tmp4_; -#line 79 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = b; #line 79 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) { -#line 1288 "EventsBranch.c" - SidebarEntry* _tmp5_; + if (G_TYPE_CHECK_INSTANCE_TYPE (b, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) { #line 80 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = a; -#line 80 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, EVENTS_TYPE_NO_EVENT_ENTRY)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (a, EVENTS_TYPE_NO_EVENT_ENTRY)) { #line 81 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = 1; #line 81 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1298 "EventsBranch.c" +#line 1424 "EventsBranch.c" } #line 82 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = -1; #line 82 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1304 "EventsBranch.c" +#line 1430 "EventsBranch.c" } } #line 85 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = a; -#line 85 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, EVENTS_TYPE_NO_EVENT_ENTRY)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (a, EVENTS_TYPE_NO_EVENT_ENTRY)) { #line 86 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = 1; #line 86 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1315 "EventsBranch.c" +#line 1439 "EventsBranch.c" } else { - SidebarEntry* _tmp7_; #line 87 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = b; -#line 87 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, EVENTS_TYPE_NO_EVENT_ENTRY)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (b, EVENTS_TYPE_NO_EVENT_ENTRY)) { #line 88 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = -1; #line 88 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1326 "EventsBranch.c" +#line 1447 "EventsBranch.c" } } #line 91 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = a; -#line 91 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (a, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY)) { #line 92 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = -1; #line 92 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1337 "EventsBranch.c" +#line 1456 "EventsBranch.c" } else { - SidebarEntry* _tmp9_; #line 93 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = b; -#line 93 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (b, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY)) { #line 94 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = 1; #line 94 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1348 "EventsBranch.c" +#line 1464 "EventsBranch.c" } } #line 96 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = events_branch_sort_ascending; + _tmp0_ = events_branch_sort_ascending; #line 96 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp10_) { -#line 1355 "EventsBranch.c" + if (!_tmp0_) { +#line 1471 "EventsBranch.c" SidebarEntry* swap = NULL; - SidebarEntry* _tmp11_; - SidebarEntry* _tmp12_; - SidebarEntry* _tmp13_; - SidebarEntry* _tmp14_; -#line 97 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = a; + SidebarEntry* _tmp1_; + SidebarEntry* _tmp2_; #line 97 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = _g_object_ref0 (_tmp11_); + _tmp1_ = _g_object_ref0 (a); #line 97 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - swap = _tmp12_; -#line 98 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = b; + swap = _tmp1_; #line 98 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - a = _tmp13_; + a = b; #line 99 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = swap; + _tmp2_ = swap; #line 99 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - b = _tmp14_; + b = _tmp2_; #line 96 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (swap); -#line 1377 "EventsBranch.c" +#line 1487 "EventsBranch.c" } #line 102 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = a; -#line 102 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp16_ = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry)); -#line 102 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp17_ = b; -#line 102 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp18_ = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry)); -#line 102 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _result_ = _tmp16_ - _tmp18_; + _result_ = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (a, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry)) - events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (b, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry)); #line 104 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp19_ = _result_; + _tmp3_ = _result_; #line 104 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_assert (_tmp19_ != 0, "result != 0"); + _vala_assert (_tmp3_ != 0, "result != 0"); #line 106 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = _result_; #line 106 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1397 "EventsBranch.c" +#line 1499 "EventsBranch.c" } -static gint events_branch_event_month_comparator (SidebarEntry* a, SidebarEntry* b) { +static gint +events_branch_event_month_comparator (SidebarEntry* a, + SidebarEntry* b) +{ gint result = 0; - SidebarEntry* _tmp0_; - SidebarEntry* _tmp1_; - gboolean _tmp2_; + gboolean _tmp0_; gint _result_ = 0; - SidebarEntry* _tmp7_; - gint _tmp8_; - SidebarEntry* _tmp9_; - gint _tmp10_; - gint _tmp11_; + gint _tmp3_; #line 109 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 109 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0); #line 110 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = a; -#line 110 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = b; -#line 110 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp0_ == _tmp1_) { + if (a == b) { #line 111 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = 0; #line 111 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1426 "EventsBranch.c" +#line 1521 "EventsBranch.c" } #line 113 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = events_branch_sort_ascending; + _tmp0_ = events_branch_sort_ascending; #line 113 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp2_) { -#line 1432 "EventsBranch.c" + if (!_tmp0_) { +#line 1527 "EventsBranch.c" SidebarEntry* swap = NULL; - SidebarEntry* _tmp3_; - SidebarEntry* _tmp4_; - SidebarEntry* _tmp5_; - SidebarEntry* _tmp6_; -#line 114 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = a; + SidebarEntry* _tmp1_; + SidebarEntry* _tmp2_; #line 114 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp1_ = _g_object_ref0 (a); #line 114 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - swap = _tmp4_; -#line 115 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = b; + swap = _tmp1_; #line 115 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - a = _tmp5_; + a = b; #line 116 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = swap; + _tmp2_ = swap; #line 116 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - b = _tmp6_; + b = _tmp2_; #line 113 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (swap); -#line 1454 "EventsBranch.c" +#line 1543 "EventsBranch.c" } #line 119 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = a; -#line 119 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry)); -#line 119 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = b; -#line 119 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry)); -#line 119 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _result_ = _tmp8_ - _tmp10_; + _result_ = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (a, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry)) - events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (b, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry)); #line 121 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = _result_; + _tmp3_ = _result_; #line 121 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_assert (_tmp11_ != 0, "result != 0"); + _vala_assert (_tmp3_ != 0, "result != 0"); #line 123 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = _result_; #line 123 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1474 "EventsBranch.c" +#line 1555 "EventsBranch.c" } -static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) { +static gint +events_branch_event_comparator (SidebarEntry* a, + SidebarEntry* b) +{ gint result = 0; - SidebarEntry* _tmp0_; - SidebarEntry* _tmp1_; - gboolean _tmp2_; + gboolean _tmp0_; gint64 _result_ = 0LL; - SidebarEntry* _tmp7_; - Event* _tmp8_; - Event* _tmp9_; - time_t _tmp10_; - SidebarEntry* _tmp11_; - Event* _tmp12_; - Event* _tmp13_; - time_t _tmp14_; - gint64 _tmp15_; - gint64 _tmp16_; - gint64 _tmp27_; - gint _tmp28_ = 0; - gint64 _tmp29_; + Event* _tmp3_; + Event* _tmp4_; + Event* _tmp5_; + Event* _tmp6_; + gint64 _tmp7_; + gint64 _tmp8_; + gint64 _tmp17_; + gint _tmp18_ = 0; + gint64 _tmp19_; #line 126 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 126 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0); #line 127 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = a; -#line 127 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = b; -#line 127 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp0_ == _tmp1_) { + if (a == b) { #line 128 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = 0; #line 128 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1511 "EventsBranch.c" +#line 1585 "EventsBranch.c" } #line 130 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = events_branch_sort_ascending; + _tmp0_ = events_branch_sort_ascending; #line 130 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp2_) { -#line 1517 "EventsBranch.c" + if (!_tmp0_) { +#line 1591 "EventsBranch.c" SidebarEntry* swap = NULL; - SidebarEntry* _tmp3_; - SidebarEntry* _tmp4_; - SidebarEntry* _tmp5_; - SidebarEntry* _tmp6_; -#line 131 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = a; + SidebarEntry* _tmp1_; + SidebarEntry* _tmp2_; #line 131 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp1_ = _g_object_ref0 (a); #line 131 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - swap = _tmp4_; + swap = _tmp1_; #line 132 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = b; -#line 132 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - a = _tmp5_; + a = b; #line 133 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = swap; + _tmp2_ = swap; #line 133 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - b = _tmp6_; + b = _tmp2_; #line 130 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (swap); -#line 1539 "EventsBranch.c" +#line 1607 "EventsBranch.c" } #line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = a; -#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); -#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = _tmp8_; + _tmp3_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (a, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); #line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_EVENT_SOURCE, EventSource)); -#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = b; -#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); + _tmp4_ = _tmp3_; #line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = _tmp12_; + _tmp5_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (b, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); #line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_EVENT_SOURCE, EventSource)); + _tmp6_ = _tmp5_; #line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = (gint64) (_tmp10_ - _tmp14_); + _tmp7_ = (gint64) (event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_EVENT_SOURCE, EventSource)) - event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT_SOURCE, EventSource))); #line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp6_); #line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp4_); #line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _result_ = _tmp15_; + _result_ = _tmp7_; #line 140 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp16_ = _result_; + _tmp8_ = _result_; #line 140 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp16_ == ((gint64) 0)) { -#line 1569 "EventsBranch.c" - SidebarEntry* _tmp17_; - Event* _tmp18_; - Event* _tmp19_; - EventID _tmp20_ = {0}; - gint64 _tmp21_; - SidebarEntry* _tmp22_; - Event* _tmp23_; - Event* _tmp24_; - EventID _tmp25_ = {0}; - gint64 _tmp26_; -#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp17_ = a; -#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp18_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); + if (_tmp8_ == ((gint64) 0)) { +#line 1629 "EventsBranch.c" + Event* _tmp9_; + Event* _tmp10_; + EventID _tmp11_ = {0}; + gint64 _tmp12_; + Event* _tmp13_; + Event* _tmp14_; + EventID _tmp15_ = {0}; + gint64 _tmp16_; #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp19_ = _tmp18_; + _tmp9_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (a, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - event_get_event_id (_tmp19_, &_tmp20_); + _tmp10_ = _tmp9_; #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp21_ = _tmp20_.id; + event_get_event_id (_tmp10_, &_tmp11_); #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp22_ = b; + _tmp12_ = _tmp11_.id; #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp23_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); + _tmp13_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (b, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp24_ = _tmp23_; + _tmp14_ = _tmp13_; #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - event_get_event_id (_tmp24_, &_tmp25_); + event_get_event_id (_tmp14_, &_tmp15_); #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp26_ = _tmp25_.id; + _tmp16_ = _tmp15_.id; #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _result_ = _tmp21_ - _tmp26_; + _result_ = _tmp12_ - _tmp16_; #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp14_); #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp19_); -#line 1606 "EventsBranch.c" + _g_object_unref0 (_tmp10_); +#line 1660 "EventsBranch.c" } #line 145 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp27_ = _result_; + _tmp17_ = _result_; #line 145 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_assert (_tmp27_ != ((gint64) 0), "result != 0"); + _vala_assert (_tmp17_ != ((gint64) 0), "result != 0"); #line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp29_ = _result_; + _tmp19_ = _result_; #line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp29_ < ((gint64) 0)) { + if (_tmp19_ < ((gint64) 0)) { #line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp28_ = -1; -#line 1618 "EventsBranch.c" + _tmp18_ = -1; +#line 1672 "EventsBranch.c" } else { #line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp28_ = 1; -#line 1622 "EventsBranch.c" + _tmp18_ = 1; +#line 1676 "EventsBranch.c" } #line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - result = _tmp28_; + result = _tmp18_; #line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1628 "EventsBranch.c" +#line 1682 "EventsBranch.c" } -static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntry* b) { +static gint +events_branch_undated_event_comparator (SidebarEntry* a, + SidebarEntry* b) +{ gint result = 0; - SidebarEntry* _tmp0_; - SidebarEntry* _tmp1_; - gboolean _tmp2_; + gboolean _tmp0_; gint ret = 0; - SidebarEntry* _tmp7_; + Event* _tmp3_; + Event* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + Event* _tmp7_; Event* _tmp8_; - Event* _tmp9_; + gchar* _tmp9_; gchar* _tmp10_; - gchar* _tmp11_; - SidebarEntry* _tmp12_; - Event* _tmp13_; - Event* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; - gint _tmp17_; - gint _tmp18_; - gint _tmp19_; + gint _tmp11_; + gint _tmp12_; #line 150 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 150 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0); #line 151 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = a; -#line 151 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = b; -#line 151 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp0_ == _tmp1_) { + if (a == b) { #line 152 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = 0; #line 152 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1665 "EventsBranch.c" +#line 1713 "EventsBranch.c" } #line 154 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = events_branch_sort_ascending; + _tmp0_ = events_branch_sort_ascending; #line 154 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp2_) { -#line 1671 "EventsBranch.c" + if (!_tmp0_) { +#line 1719 "EventsBranch.c" SidebarEntry* swap = NULL; - SidebarEntry* _tmp3_; - SidebarEntry* _tmp4_; - SidebarEntry* _tmp5_; - SidebarEntry* _tmp6_; -#line 155 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = a; + SidebarEntry* _tmp1_; + SidebarEntry* _tmp2_; #line 155 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp1_ = _g_object_ref0 (a); #line 155 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - swap = _tmp4_; -#line 156 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = b; + swap = _tmp1_; #line 156 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - a = _tmp5_; + a = b; #line 157 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = swap; + _tmp2_ = swap; #line 157 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - b = _tmp6_; + b = _tmp2_; #line 154 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (swap); -#line 1693 "EventsBranch.c" +#line 1735 "EventsBranch.c" } #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = a; + _tmp3_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (a, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); -#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = _tmp8_; -#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); -#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = _tmp10_; + _tmp4_ = _tmp3_; #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = b; + _tmp5_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject)); #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); + _tmp6_ = _tmp5_; #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = _tmp13_; + _tmp7_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (b, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); + _tmp8_ = _tmp7_; #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp16_ = _tmp15_; + _tmp9_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp17_ = g_utf8_collate (_tmp11_, _tmp16_); + _tmp10_ = _tmp9_; #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp18_ = _tmp17_; + _tmp11_ = g_utf8_collate (_tmp6_, _tmp10_); #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp10_); #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp8_); #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp6_); #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp4_); #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - ret = _tmp18_; + ret = _tmp11_; #line 163 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp19_ = ret; + _tmp12_ = ret; #line 163 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp19_ == 0) { -#line 1733 "EventsBranch.c" - SidebarEntry* _tmp20_; - Event* _tmp21_; - Event* _tmp22_; - gint64 _tmp23_; - SidebarEntry* _tmp24_; - Event* _tmp25_; - Event* _tmp26_; - gint64 _tmp27_; -#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp20_ = b; -#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp21_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); + if (_tmp12_ == 0) { +#line 1769 "EventsBranch.c" + Event* _tmp13_; + Event* _tmp14_; + Event* _tmp15_; + Event* _tmp16_; #line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp22_ = _tmp21_; + _tmp13_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (b, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); #line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp23_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_SOURCE, DataSource)); + _tmp14_ = _tmp13_; #line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp24_ = a; + _tmp15_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (a, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); #line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp25_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); -#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp26_ = _tmp25_; -#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp27_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource)); + _tmp16_ = _tmp15_; #line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - ret = (gint) (_tmp23_ - _tmp27_); + ret = (gint) (data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_SOURCE, DataSource)) - data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource))); #line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp26_); + _g_object_unref0 (_tmp16_); #line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp22_); -#line 1764 "EventsBranch.c" + _g_object_unref0 (_tmp14_); +#line 1788 "EventsBranch.c" } #line 167 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = ret; #line 167 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1770 "EventsBranch.c" +#line 1794 "EventsBranch.c" } -EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, Event* event) { +EventsEventEntry* +events_branch_get_entry_for_event (EventsBranch* self, + Event* event) +{ EventsEventEntry* result = NULL; GeeHashMap* _tmp0_; - Event* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 170 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL); #line 170 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -1782,23 +1808,22 @@ EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, Event* #line 171 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp0_ = self->priv->entry_map; #line 171 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = event; -#line 171 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), event); #line 171 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - result = (EventsEventEntry*) _tmp2_; + result = (EventsEventEntry*) _tmp1_; #line 171 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1793 "EventsBranch.c" +#line 1817 "EventsBranch.c" } -static void events_branch_on_config_changed (EventsBranch* self) { +static void +events_branch_on_config_changed (EventsBranch* self) +{ gboolean value = FALSE; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; #line 174 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -1807,23 +1832,23 @@ static void events_branch_on_config_changed (EventsBranch* self) { _tmp1_ = _tmp0_; #line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp2_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = _tmp2_; #line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_tmp1_); #line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - value = _tmp3_; + value = _tmp2_; #line 177 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_branch_sort_ascending = value; #line 178 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" sidebar_branch_reorder_all (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); -#line 1821 "EventsBranch.c" +#line 1844 "EventsBranch.c" } -static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterable* added, GeeIterable* removed) { - GeeIterable* _tmp0_; - GeeIterable* _tmp8_; +static void +events_branch_on_events_added_removed (EventsBranch* self, + GeeIterable* added, + GeeIterable* removed) +{ #line 181 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 181 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -1831,266 +1856,238 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab #line 181 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); #line 183 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = added; -#line 183 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp0_ != NULL) { -#line 1838 "EventsBranch.c" + if (added != NULL) { +#line 1861 "EventsBranch.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_; - GeeIterator* _tmp2_; -#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = added; + GeeIterator* _tmp0_; #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = gee_iterable_iterator (_tmp1_); + _tmp0_ = gee_iterable_iterator (added); #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _object_it = _tmp2_; + _object_it = _tmp0_; #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" while (TRUE) { -#line 1851 "EventsBranch.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 1871 "EventsBranch.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - DataObject* _tmp7_; -#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = _object_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + DataObject* _tmp4_; #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp1_ = _object_it; #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" break; -#line 1866 "EventsBranch.c" +#line 1883 "EventsBranch.c" } #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = _object_it; + _tmp2_ = _object_it; #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - object = (DataObject*) _tmp6_; + object = (DataObject*) _tmp3_; #line 185 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = object; + _tmp4_ = object; #line 185 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_EVENT, Event)); + events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_EVENT, Event)); #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (object); -#line 1880 "EventsBranch.c" +#line 1897 "EventsBranch.c" } #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_object_it); -#line 1884 "EventsBranch.c" +#line 1901 "EventsBranch.c" } } #line 188 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = removed; -#line 188 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp8_ != NULL) { -#line 1891 "EventsBranch.c" + if (removed != NULL) { +#line 1906 "EventsBranch.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp9_; - GeeIterator* _tmp10_; -#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = removed; + GeeIterator* _tmp5_; #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = gee_iterable_iterator (_tmp9_); + _tmp5_ = gee_iterable_iterator (removed); #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _object_it = _tmp10_; + _object_it = _tmp5_; #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" while (TRUE) { -#line 1904 "EventsBranch.c" - GeeIterator* _tmp11_; - gboolean _tmp12_; +#line 1916 "EventsBranch.c" + GeeIterator* _tmp6_; DataObject* object = NULL; - GeeIterator* _tmp13_; - gpointer _tmp14_; - DataObject* _tmp15_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + DataObject* _tmp9_; #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = _object_it; + _tmp6_ = _object_it; #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = gee_iterator_next (_tmp11_); -#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp12_) { + if (!gee_iterator_next (_tmp6_)) { #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" break; -#line 1919 "EventsBranch.c" +#line 1928 "EventsBranch.c" } #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = _object_it; + _tmp7_ = _object_it; #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = gee_iterator_get (_tmp13_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - object = (DataObject*) _tmp14_; + object = (DataObject*) _tmp8_; #line 190 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = object; + _tmp9_ = object; #line 190 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_remove_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_EVENT, Event)); + events_branch_remove_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_EVENT, Event)); #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (object); -#line 1933 "EventsBranch.c" +#line 1942 "EventsBranch.c" } #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_object_it); -#line 1937 "EventsBranch.c" +#line 1946 "EventsBranch.c" } } } -static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered) { +static void +events_branch_on_events_altered (EventsBranch* self, + GeeMap* altered) +{ #line 194 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 194 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (GEE_IS_MAP (altered)); -#line 1948 "EventsBranch.c" +#line 1960 "EventsBranch.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = altered; + _tmp0_ = gee_map_get_keys (altered); #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp2_ = _tmp1_; #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = _tmp2_; -#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" while (TRUE) { -#line 1975 "EventsBranch.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 1984 "EventsBranch.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp6_; + gpointer _tmp7_; Event* event = NULL; - DataObject* _tmp10_; - Event* _tmp11_; + DataObject* _tmp8_; + Event* _tmp9_; Alteration* alteration = NULL; - GeeMap* _tmp12_; - DataObject* _tmp13_; - gpointer _tmp14_; - Alteration* _tmp15_; - gboolean _tmp16_; -#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = _object_it; + DataObject* _tmp10_; + gpointer _tmp11_; + Alteration* _tmp12_; #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" break; -#line 1998 "EventsBranch.c" +#line 2002 "EventsBranch.c" } #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - object = (DataObject*) _tmp9_; + object = (DataObject*) _tmp7_; #line 196 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = object; + _tmp8_ = object; #line 196 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_EVENT, Event)); + _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_EVENT, Event)); #line 196 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - event = _tmp11_; + event = _tmp9_; #line 197 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = altered; -#line 197 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = object; + _tmp10_ = object; #line 197 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = gee_map_get (_tmp12_, _tmp13_); + _tmp11_ = gee_map_get (altered, _tmp10_); #line 197 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - alteration = (Alteration*) _tmp14_; + alteration = (Alteration*) _tmp11_; #line 199 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = alteration; + _tmp12_ = alteration; #line 199 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp16_ = alteration_has_detail (_tmp15_, "metadata", "time"); -#line 199 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp16_) { + if (alteration_has_detail (_tmp12_, "metadata", "time")) { #line 2026 "EventsBranch.c" - Event* _tmp17_; + Event* _tmp13_; #line 202 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp17_ = event; + _tmp13_ = event; #line 202 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_move_event (self, _tmp17_); + events_branch_move_event (self, _tmp13_); #line 2032 "EventsBranch.c" } else { - Alteration* _tmp18_; - gboolean _tmp19_; -#line 203 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp18_ = alteration; + Alteration* _tmp14_; #line 203 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp19_ = alteration_has_detail (_tmp18_, "metadata", "name"); + _tmp14_ = alteration; #line 203 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp19_) { -#line 2042 "EventsBranch.c" + if (alteration_has_detail (_tmp14_, "metadata", "name")) { +#line 2039 "EventsBranch.c" EventsEventEntry* entry = NULL; - GeeHashMap* _tmp20_; - Event* _tmp21_; - gpointer _tmp22_; + GeeHashMap* _tmp15_; + Event* _tmp16_; + gpointer _tmp17_; + EventsEventEntry* _tmp18_; + EventsEventEntry* _tmp19_; + Event* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; EventsEventEntry* _tmp23_; - EventsEventEntry* _tmp24_; - Event* _tmp25_; + Event* _tmp24_; + gchar* _tmp25_; gchar* _tmp26_; - gchar* _tmp27_; - EventsEventEntry* _tmp28_; - Event* _tmp29_; - gchar* _tmp30_; - gchar* _tmp31_; #line 204 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp20_ = self->priv->entry_map; + _tmp15_ = self->priv->entry_map; #line 204 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp21_ = event; + _tmp16_ = event; #line 204 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp22_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp21_); + _tmp17_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_); #line 204 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - entry = (EventsEventEntry*) _tmp22_; + entry = (EventsEventEntry*) _tmp17_; #line 205 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp23_ = entry; + _tmp18_ = entry; #line 205 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_assert (_tmp23_ != NULL, "entry != null"); + _vala_assert (_tmp18_ != NULL, "entry != null"); #line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp24_ = entry; + _tmp19_ = entry; #line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp25_ = event; + _tmp20_ = event; #line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp26_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject)); + _tmp21_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_OBJECT, DataObject)); #line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp27_ = _tmp26_; + _tmp22_ = _tmp21_; #line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry), "sidebar-name-changed", _tmp27_); + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry), "sidebar-name-changed", _tmp22_); #line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_free0 (_tmp27_); + _g_free0 (_tmp22_); #line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp28_ = entry; + _tmp23_ = entry; #line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp29_ = event; + _tmp24_ = event; #line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp30_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject)); + _tmp25_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_OBJECT, DataObject)); #line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp31_ = _tmp30_; + _tmp26_ = _tmp25_; #line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-tooltip-changed", _tmp31_); + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-tooltip-changed", _tmp26_); #line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_free0 (_tmp31_); + _g_free0 (_tmp26_); #line 203 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (entry); -#line 2094 "EventsBranch.c" +#line 2091 "EventsBranch.c" } } #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -2099,16 +2096,18 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered _g_object_unref0 (event); #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (object); -#line 2103 "EventsBranch.c" +#line 2100 "EventsBranch.c" } #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_object_it); -#line 2107 "EventsBranch.c" +#line 2104 "EventsBranch.c" } } -static void events_branch_on_no_event_collection_altered (EventsBranch* self) { +static void +events_branch_on_no_event_collection_altered (EventsBranch* self) +{ EventSourceCollection* _tmp0_; GeeCollection* _tmp1_; GeeCollection* _tmp2_; @@ -2130,35 +2129,44 @@ static void events_branch_on_no_event_collection_altered (EventsBranch* self) { events_branch_show_no_events (self, _tmp4_ > 0); #line 214 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_tmp2_); -#line 2134 "EventsBranch.c" +#line 2133 "EventsBranch.c" } -static void g_time_local (time_t time, struct tm* result) { +static void +g_time_local (time_t time, + struct tm* result) +{ struct tm _result_ = {0}; struct tm _tmp0_ = {0}; -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" localtime_r (&time, &_tmp0_); -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" *result = _result_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return; -#line 2149 "EventsBranch.c" +#line 2151 "EventsBranch.c" } -static gint _events_branch_event_comparator_gcompare_func (gconstpointer a, gconstpointer b) { +static gint +_events_branch_event_comparator_gcompare_func (gconstpointer a, + gconstpointer b) +{ gint result; result = events_branch_event_comparator ((SidebarEntry*) a, (SidebarEntry*) b); #line 230 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2158 "EventsBranch.c" +#line 2163 "EventsBranch.c" } -static gchar* g_time_format (struct tm *self, const gchar* format) { +static gchar* +g_time_format (struct tm *self, + const gchar* format) +{ gchar* result = NULL; gchar* buffer = NULL; gchar* _tmp0_; @@ -2166,370 +2174,343 @@ static gchar* g_time_format (struct tm *self, const gchar* format) { gint _buffer_size_; gchar* _tmp1_; gint _tmp1__length1; - const gchar* _tmp2_; + gchar* _tmp2_; + gint _tmp2__length1; gchar* _tmp3_; - gint _tmp3__length1; - gchar* _tmp4_; -#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2874 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (format != NULL, NULL); -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_new0 (gchar, 64); -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer = _tmp0_; -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer_length1 = 64; -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _buffer_size_ = buffer_length1; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = buffer; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1__length1 = buffer_length1; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = format; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self)); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = buffer; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3__length1 = buffer_length1; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = g_strdup ((const gchar*) _tmp3_); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + strftime (_tmp1_, _tmp1__length1, format, &(*self)); +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = buffer; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2__length1 = buffer_length1; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_strdup ((const gchar*) _tmp2_); +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp3_; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer = (g_free (buffer), NULL); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2204 "EventsBranch.c" +#line 2209 "EventsBranch.c" } -static gint _events_branch_event_month_comparator_gcompare_func (gconstpointer a, gconstpointer b) { +static gint +_events_branch_event_month_comparator_gcompare_func (gconstpointer a, + gconstpointer b) +{ gint result; result = events_branch_event_month_comparator ((SidebarEntry*) a, (SidebarEntry*) b); #line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2213 "EventsBranch.c" +#line 2221 "EventsBranch.c" } -static void events_branch_add_event (EventsBranch* self, Event* event) { +static void +events_branch_add_event (EventsBranch* self, + Event* event) +{ time_t event_time = 0; - Event* _tmp0_; - time_t _tmp1_; - time_t _tmp2_; + time_t _tmp0_; struct tm event_tm = {0}; - time_t _tmp4_; - struct tm _tmp5_ = {0}; + time_t _tmp1_; + struct tm _tmp2_ = {0}; SidebarEntry* year = NULL; SidebarEntry* month = NULL; - Event* _tmp6_; - struct tm _tmp7_; - SidebarEntry* _tmp8_ = NULL; - SidebarEntry* _tmp9_; - SidebarEntry* _tmp10_; - SidebarEntry* _tmp13_; - gchar* _tmp21_; - gchar* _tmp22_; - struct tm _tmp23_; - EventsMonthDirectoryEntry* _tmp24_; - SidebarEntry* _tmp25_; - SidebarEntry* _tmp26_; - SidebarEntry* _tmp27_; - Event* _tmp28_; + struct tm _tmp3_; + SidebarEntry* _tmp4_ = NULL; + SidebarEntry* _tmp5_; + SidebarEntry* _tmp6_; + SidebarEntry* _tmp8_; + gchar* _tmp16_; + gchar* _tmp17_; + struct tm _tmp18_; + EventsMonthDirectoryEntry* _tmp19_; + SidebarEntry* _tmp20_; + SidebarEntry* _tmp21_; + SidebarEntry* _tmp22_; #line 217 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 217 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (IS_EVENT (event)); #line 218 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = event; -#line 218 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_SOURCE, EventSource)); -#line 218 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - event_time = _tmp1_; + event_time = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_EVENT_SOURCE, EventSource)); #line 219 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = event_time; + _tmp0_ = event_time; #line 219 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp2_ == ((time_t) 0)) { -#line 2255 "EventsBranch.c" - Event* _tmp3_; + if (_tmp0_ == ((time_t) 0)) { #line 220 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = event; -#line 220 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_add_undated_event (self, _tmp3_); + events_branch_add_undated_event (self, event); #line 222 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return; -#line 2263 "EventsBranch.c" +#line 2262 "EventsBranch.c" } #line 225 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = event_time; + _tmp1_ = event_time; #line 225 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - g_time_local (_tmp4_, &_tmp5_); + g_time_local (_tmp1_, &_tmp2_); #line 225 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - event_tm = _tmp5_; -#line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = event; + event_tm = _tmp2_; #line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = event_tm; + _tmp3_ = event_tm; #line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = events_branch_find_event_month (self, _tmp6_, &_tmp7_, &_tmp8_); + _tmp5_ = events_branch_find_event_month (self, event, &_tmp3_, &_tmp4_); #line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (year); #line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - year = _tmp8_; + year = _tmp4_; #line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - month = _tmp9_; + month = _tmp5_; #line 229 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = month; + _tmp6_ = month; #line 229 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp10_ != NULL) { -#line 2287 "EventsBranch.c" - SidebarEntry* _tmp11_; - Event* _tmp12_; -#line 230 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = month; + if (_tmp6_ != NULL) { +#line 2284 "EventsBranch.c" + SidebarEntry* _tmp7_; #line 230 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = event; + _tmp7_ = month; #line 230 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_graft_event (self, _tmp11_, _tmp12_, _events_branch_event_comparator_gcompare_func); + events_branch_graft_event (self, _tmp7_, event, _events_branch_event_comparator_gcompare_func); #line 232 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (month); #line 232 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (year); #line 232 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return; -#line 2302 "EventsBranch.c" +#line 2296 "EventsBranch.c" } #line 235 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = year; + _tmp8_ = year; #line 235 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp13_ == NULL) { -#line 2308 "EventsBranch.c" - gchar* _tmp14_; - gchar* _tmp15_; - struct tm _tmp16_; - EventsYearDirectoryEntry* _tmp17_; - SidebarEntry* _tmp18_; - SidebarEntry* _tmp19_; - SidebarEntry* _tmp20_; + if (_tmp8_ == NULL) { +#line 2302 "EventsBranch.c" + gchar* _tmp9_; + gchar* _tmp10_; + struct tm _tmp11_; + EventsYearDirectoryEntry* _tmp12_; + SidebarEntry* _tmp13_; + SidebarEntry* _tmp14_; + SidebarEntry* _tmp15_; #line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT); + _tmp9_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT); #line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = _tmp14_; + _tmp10_ = _tmp9_; #line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp16_ = event_tm; + _tmp11_ = event_tm; #line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp17_ = events_year_directory_entry_new (_tmp15_, &_tmp16_); + _tmp12_ = events_year_directory_entry_new (_tmp10_, &_tmp11_); #line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (year); #line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - year = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SIDEBAR_TYPE_ENTRY, SidebarEntry); + year = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SIDEBAR_TYPE_ENTRY, SidebarEntry); #line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp10_); #line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp18_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp13_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp19_ = _tmp18_; + _tmp14_ = _tmp13_; #line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp20_ = year; + _tmp15_ = year; #line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp19_, _tmp20_, _events_branch_event_month_comparator_gcompare_func); + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp14_, _tmp15_, _events_branch_event_month_comparator_gcompare_func); #line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp19_); -#line 2340 "EventsBranch.c" + _g_object_unref0 (_tmp14_); +#line 2334 "EventsBranch.c" } #line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp21_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT); + _tmp16_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT); #line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp22_ = _tmp21_; + _tmp17_ = _tmp16_; #line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp23_ = event_tm; + _tmp18_ = event_tm; #line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp24_ = events_month_directory_entry_new (_tmp22_, &_tmp23_); + _tmp19_ = events_month_directory_entry_new (_tmp17_, &_tmp18_); #line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (month); #line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - month = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, SIDEBAR_TYPE_ENTRY, SidebarEntry); + month = G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SIDEBAR_TYPE_ENTRY, SidebarEntry); #line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp17_); #line 243 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp25_ = year; + _tmp20_ = year; #line 243 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp26_ = month; + _tmp21_ = month; #line 243 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp25_, _tmp26_, _events_branch_event_comparator_gcompare_func); -#line 245 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp27_ = month; + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp20_, _tmp21_, _events_branch_event_comparator_gcompare_func); #line 245 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp28_ = event; + _tmp22_ = month; #line 245 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_graft_event (self, _tmp27_, _tmp28_, _events_branch_event_comparator_gcompare_func); + events_branch_graft_event (self, _tmp22_, event, _events_branch_event_comparator_gcompare_func); #line 217 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (month); #line 217 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (year); -#line 2372 "EventsBranch.c" +#line 2364 "EventsBranch.c" } -static void events_branch_move_event (EventsBranch* self, Event* event) { +static void +events_branch_move_event (EventsBranch* self, + Event* event) +{ time_t event_time = 0; - Event* _tmp0_; - time_t _tmp1_; - time_t _tmp2_; + time_t _tmp0_; struct tm event_tm = {0}; - time_t _tmp4_; - struct tm _tmp5_ = {0}; + time_t _tmp1_; + struct tm _tmp2_ = {0}; SidebarEntry* year = NULL; SidebarEntry* month = NULL; - Event* _tmp6_; - struct tm _tmp7_; - SidebarEntry* _tmp8_ = NULL; - SidebarEntry* _tmp9_; - SidebarEntry* _tmp10_; - SidebarEntry* _tmp18_; - Event* _tmp25_; - SidebarEntry* _tmp26_; + struct tm _tmp3_; + SidebarEntry* _tmp4_ = NULL; + SidebarEntry* _tmp5_; + SidebarEntry* _tmp6_; + SidebarEntry* _tmp14_; + SidebarEntry* _tmp21_; #line 248 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 248 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (IS_EVENT (event)); #line 249 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = event; -#line 249 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_SOURCE, EventSource)); -#line 249 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - event_time = _tmp1_; + event_time = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_EVENT_SOURCE, EventSource)); #line 250 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = event_time; + _tmp0_ = event_time; #line 250 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp2_ == ((time_t) 0)) { -#line 2408 "EventsBranch.c" - Event* _tmp3_; -#line 251 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = event; + if (_tmp0_ == ((time_t) 0)) { #line 251 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_move_to_undated_event (self, _tmp3_); + events_branch_move_to_undated_event (self, event); #line 253 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return; -#line 2416 "EventsBranch.c" +#line 2399 "EventsBranch.c" } #line 256 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = event_time; + _tmp1_ = event_time; #line 256 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - g_time_local (_tmp4_, &_tmp5_); + g_time_local (_tmp1_, &_tmp2_); #line 256 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - event_tm = _tmp5_; + event_tm = _tmp2_; #line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = event; + _tmp3_ = event_tm; #line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = event_tm; -#line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = events_branch_find_event_month (self, _tmp6_, &_tmp7_, &_tmp8_); + _tmp5_ = events_branch_find_event_month (self, event, &_tmp3_, &_tmp4_); #line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (year); #line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - year = _tmp8_; + year = _tmp4_; #line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - month = _tmp9_; + month = _tmp5_; #line 261 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = year; + _tmp6_ = year; #line 261 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp10_ == NULL) { -#line 2440 "EventsBranch.c" - gchar* _tmp11_; - gchar* _tmp12_; - struct tm _tmp13_; - EventsYearDirectoryEntry* _tmp14_; - SidebarEntry* _tmp15_; - SidebarEntry* _tmp16_; - SidebarEntry* _tmp17_; + if (_tmp6_ == NULL) { +#line 2421 "EventsBranch.c" + gchar* _tmp7_; + gchar* _tmp8_; + struct tm _tmp9_; + EventsYearDirectoryEntry* _tmp10_; + SidebarEntry* _tmp11_; + SidebarEntry* _tmp12_; + SidebarEntry* _tmp13_; #line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT); + _tmp7_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT); #line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = event_tm; + _tmp9_ = event_tm; #line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = events_year_directory_entry_new (_tmp12_, &_tmp13_); + _tmp10_ = events_year_directory_entry_new (_tmp8_, &_tmp9_); #line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (year); #line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - year = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_ENTRY, SidebarEntry); + year = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SIDEBAR_TYPE_ENTRY, SidebarEntry); #line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp8_); #line 264 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp11_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 264 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp16_ = _tmp15_; + _tmp12_ = _tmp11_; #line 264 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp17_ = year; + _tmp13_ = year; #line 264 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp16_, _tmp17_, _events_branch_event_month_comparator_gcompare_func); + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp12_, _tmp13_, _events_branch_event_month_comparator_gcompare_func); #line 264 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp16_); -#line 2472 "EventsBranch.c" + _g_object_unref0 (_tmp12_); +#line 2453 "EventsBranch.c" } #line 267 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp18_ = month; + _tmp14_ = month; #line 267 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp18_ == NULL) { -#line 2478 "EventsBranch.c" - gchar* _tmp19_; - gchar* _tmp20_; - struct tm _tmp21_; - EventsMonthDirectoryEntry* _tmp22_; - SidebarEntry* _tmp23_; - SidebarEntry* _tmp24_; + if (_tmp14_ == NULL) { +#line 2459 "EventsBranch.c" + gchar* _tmp15_; + gchar* _tmp16_; + struct tm _tmp17_; + EventsMonthDirectoryEntry* _tmp18_; + SidebarEntry* _tmp19_; + SidebarEntry* _tmp20_; #line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp19_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT); + _tmp15_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT); #line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp20_ = _tmp19_; + _tmp16_ = _tmp15_; #line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp21_ = event_tm; + _tmp17_ = event_tm; #line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp22_ = events_month_directory_entry_new (_tmp20_, &_tmp21_); + _tmp18_ = events_month_directory_entry_new (_tmp16_, &_tmp17_); #line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (month); #line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - month = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, SIDEBAR_TYPE_ENTRY, SidebarEntry); + month = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SIDEBAR_TYPE_ENTRY, SidebarEntry); #line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp16_); #line 270 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp23_ = year; + _tmp19_ = year; #line 270 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp24_ = month; + _tmp20_ = month; #line 270 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp23_, _tmp24_, _events_branch_event_comparator_gcompare_func); -#line 2505 "EventsBranch.c" + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp19_, _tmp20_, _events_branch_event_comparator_gcompare_func); +#line 2486 "EventsBranch.c" } #line 273 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp25_ = event; -#line 273 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp26_ = month; + _tmp21_ = month; #line 273 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_reparent_event (self, _tmp25_, _tmp26_); + events_branch_reparent_event (self, event, _tmp21_); #line 248 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (month); #line 248 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (year); -#line 2517 "EventsBranch.c" +#line 2496 "EventsBranch.c" } -static void events_branch_remove_event (EventsBranch* self, Event* event) { +static void +events_branch_remove_event (EventsBranch* self, + Event* event) +{ SidebarEntry* entry = NULL; gboolean removed = FALSE; GeeHashMap* _tmp0_; - Event* _tmp1_; - gpointer _tmp2_ = NULL; + gpointer _tmp1_ = NULL; + gboolean _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; SidebarEntry* parent = NULL; + SidebarEntry* _tmp4_; SidebarEntry* _tmp5_; SidebarEntry* _tmp6_; SidebarEntry* _tmp7_; - SidebarEntry* _tmp8_; #line 276 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 276 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -2537,127 +2518,126 @@ static void events_branch_remove_event (EventsBranch* self, Event* event) { #line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp0_ = self->priv->entry_map; #line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = event; -#line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, &_tmp2_); + _tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), event, &_tmp1_); #line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (entry); #line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - entry = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_ENTRY, SidebarEntry); + entry = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry); #line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - removed = _tmp3_; + removed = _tmp2_; #line 281 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = removed; + _tmp3_ = removed; #line 281 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_assert (_tmp4_, "removed"); + _vala_assert (_tmp3_, "removed"); #line 283 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = entry; + _tmp4_ = entry; #line 283 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp5_); + _tmp5_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp4_); #line 283 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - parent = _tmp6_; + parent = _tmp5_; #line 284 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = parent; + _tmp6_ = parent; #line 284 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_assert (_tmp7_ != NULL, "parent != null"); + _vala_assert (_tmp6_ != NULL, "parent != null"); #line 286 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = entry; + _tmp7_ = entry; #line 286 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp8_); + sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp7_); #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" while (TRUE) { -#line 2570 "EventsBranch.c" - gboolean _tmp9_ = FALSE; - SidebarEntry* _tmp10_; - gint _tmp11_; +#line 2549 "EventsBranch.c" + gboolean _tmp8_ = FALSE; + SidebarEntry* _tmp9_; SidebarEntry* grandparent = NULL; + SidebarEntry* _tmp13_; + SidebarEntry* _tmp14_; SidebarEntry* _tmp15_; SidebarEntry* _tmp16_; SidebarEntry* _tmp17_; SidebarEntry* _tmp18_; - SidebarEntry* _tmp19_; - SidebarEntry* _tmp20_; -#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = parent; #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp10_); + _tmp9_ = parent; #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp11_ == 0) { -#line 2587 "EventsBranch.c" + if (sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp9_) == 0) { +#line 2563 "EventsBranch.c" + SidebarEntry* _tmp10_; + SidebarEntry* _tmp11_; SidebarEntry* _tmp12_; - SidebarEntry* _tmp13_; - SidebarEntry* _tmp14_; #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = parent; + _tmp10_ = parent; #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp11_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = _tmp12_ != _tmp14_; + _tmp8_ = _tmp10_ != _tmp12_; #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp14_); -#line 2601 "EventsBranch.c" + _g_object_unref0 (_tmp12_); +#line 2577 "EventsBranch.c" } else { #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = FALSE; -#line 2605 "EventsBranch.c" + _tmp8_ = FALSE; +#line 2581 "EventsBranch.c" } #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp9_) { + if (!_tmp8_) { #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" break; -#line 2611 "EventsBranch.c" +#line 2587 "EventsBranch.c" } #line 290 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = parent; + _tmp13_ = parent; #line 290 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp16_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp15_); + _tmp14_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp13_); #line 290 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - grandparent = _tmp16_; + grandparent = _tmp14_; #line 291 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp17_ = grandparent; + _tmp15_ = grandparent; #line 291 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_assert (_tmp17_ != NULL, "grandparent != null"); + _vala_assert (_tmp15_ != NULL, "grandparent != null"); #line 293 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp18_ = parent; + _tmp16_ = parent; #line 293 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp18_); + sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp16_); #line 295 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp19_ = grandparent; + _tmp17_ = grandparent; #line 295 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp20_ = _g_object_ref0 (_tmp19_); + _tmp18_ = _g_object_ref0 (_tmp17_); #line 295 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (parent); #line 295 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - parent = _tmp20_; + parent = _tmp18_; #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (grandparent); -#line 2637 "EventsBranch.c" +#line 2613 "EventsBranch.c" } #line 276 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (parent); #line 276 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (entry); -#line 2643 "EventsBranch.c" +#line 2619 "EventsBranch.c" } -static Block8Data* block8_data_ref (Block8Data* _data8_) { +static Block8Data* +block8_data_ref (Block8Data* _data8_) +{ #line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_atomic_int_inc (&_data8_->_ref_count_); #line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return _data8_; -#line 2652 "EventsBranch.c" +#line 2630 "EventsBranch.c" } -static void block8_data_unref (void * _userdata_) { +static void +block8_data_unref (void * _userdata_) +{ Block8Data* _data8_; _data8_ = (Block8Data*) _userdata_; #line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" if (g_atomic_int_dec_and_test (&_data8_->_ref_count_)) { -#line 2661 "EventsBranch.c" +#line 2641 "EventsBranch.c" EventsBranch* self; #line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = _data8_->self; @@ -2665,56 +2645,60 @@ static void block8_data_unref (void * _userdata_) { _g_object_unref0 (self); #line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_slice_free (Block8Data, _data8_); -#line 2669 "EventsBranch.c" +#line 2649 "EventsBranch.c" } } -static gboolean __lambda21_ (Block8Data* _data8_, SidebarEntry* entry) { +static gboolean +__lambda21_ (Block8Data* _data8_, + SidebarEntry* entry) +{ EventsBranch* self; gboolean result = FALSE; - SidebarEntry* _tmp0_; - gint _tmp1_; - gint _tmp2_; + gint _tmp0_; #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = _data8_->self; #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE); #line 309 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = entry; + _tmp0_ = _data8_->event_month; #line 309 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry)); -#line 309 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = _data8_->event_month; -#line 309 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - result = _tmp1_ == _tmp2_; + result = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (entry, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry)) == _tmp0_; #line 309 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2694 "EventsBranch.c" +#line 2671 "EventsBranch.c" } -static gboolean ___lambda21__locator (gconstpointer item, gpointer self) { +static gboolean +___lambda21__locator (gconstpointer item, + gpointer self) +{ gboolean result; result = __lambda21_ (self, (SidebarEntry*) item); #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2703 "EventsBranch.c" +#line 2683 "EventsBranch.c" } -static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* event, struct tm* event_tm, SidebarEntry* * found_year) { +static SidebarEntry* +events_branch_find_event_month (EventsBranch* self, + Event* event, + struct tm* event_tm, + SidebarEntry* * found_year) +{ SidebarEntry* _vala_found_year = NULL; SidebarEntry* result = NULL; Block8Data* _data8_; - Event* _tmp0_; - struct tm _tmp1_; + struct tm _tmp0_; + SidebarEntry* _tmp1_; SidebarEntry* _tmp2_; - SidebarEntry* _tmp3_; - struct tm _tmp4_; - gint _tmp5_; + struct tm _tmp3_; + gint _tmp4_; + SidebarEntry* _tmp5_; SidebarEntry* _tmp6_; - SidebarEntry* _tmp7_; #line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL); #line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -2728,19 +2712,17 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* #line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _data8_->self = g_object_ref (self); #line 301 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = event; -#line 301 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = *event_tm; + _tmp0_ = *event_tm; #line 301 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = events_branch_find_event_year (self, _tmp0_, &_tmp1_); + _tmp1_ = events_branch_find_event_year (self, event, &_tmp0_); #line 301 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_vala_found_year); #line 301 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_found_year = _tmp2_; + _vala_found_year = _tmp1_; #line 302 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = _vala_found_year; + _tmp2_ = _vala_found_year; #line 302 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = NULL; #line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -2751,28 +2733,28 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* if (found_year) { #line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" *found_year = _vala_found_year; -#line 2755 "EventsBranch.c" +#line 2737 "EventsBranch.c" } else { #line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_vala_found_year); -#line 2759 "EventsBranch.c" +#line 2741 "EventsBranch.c" } #line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2763 "EventsBranch.c" +#line 2745 "EventsBranch.c" } #line 305 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = *event_tm; + _tmp3_ = *event_tm; #line 305 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = _tmp4_.tm_mon; + _tmp4_ = _tmp3_.tm_mon; #line 305 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _data8_->event_month = _tmp5_ + 1; + _data8_->event_month = _tmp4_ + 1; #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = _vala_found_year; + _tmp5_ = _vala_found_year; #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp6_, ___lambda21__locator, _data8_); + _tmp6_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp5_, ___lambda21__locator, _data8_); #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - result = _tmp7_; + result = _tmp6_; #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" block8_data_unref (_data8_); #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -2781,33 +2763,37 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* if (found_year) { #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" *found_year = _vala_found_year; -#line 2785 "EventsBranch.c" +#line 2767 "EventsBranch.c" } else { #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_vala_found_year); -#line 2789 "EventsBranch.c" +#line 2771 "EventsBranch.c" } #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2793 "EventsBranch.c" +#line 2775 "EventsBranch.c" } -static Block9Data* block9_data_ref (Block9Data* _data9_) { +static Block9Data* +block9_data_ref (Block9Data* _data9_) +{ #line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_atomic_int_inc (&_data9_->_ref_count_); #line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return _data9_; -#line 2802 "EventsBranch.c" +#line 2786 "EventsBranch.c" } -static void block9_data_unref (void * _userdata_) { +static void +block9_data_unref (void * _userdata_) +{ Block9Data* _data9_; _data9_ = (Block9Data*) _userdata_; #line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) { -#line 2811 "EventsBranch.c" +#line 2797 "EventsBranch.c" EventsBranch* self; #line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = _data9_->self; @@ -2815,48 +2801,42 @@ static void block9_data_unref (void * _userdata_) { _g_object_unref0 (self); #line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_slice_free (Block9Data, _data9_); -#line 2819 "EventsBranch.c" +#line 2805 "EventsBranch.c" } } -static gboolean __lambda20_ (Block9Data* _data9_, SidebarEntry* entry) { +static gboolean +__lambda20_ (Block9Data* _data9_, + SidebarEntry* entry) +{ EventsBranch* self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - SidebarEntry* _tmp2_; #line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = _data9_->self; #line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE); #line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = entry; -#line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (entry, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) { #line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp1_ = TRUE; -#line 2840 "EventsBranch.c" +#line 2826 "EventsBranch.c" } else { - SidebarEntry* _tmp3_; -#line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = entry; #line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, EVENTS_TYPE_NO_EVENT_ENTRY); -#line 2847 "EventsBranch.c" + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (entry, EVENTS_TYPE_NO_EVENT_ENTRY); +#line 2830 "EventsBranch.c" } #line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" if (_tmp1_) { #line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp0_ = TRUE; -#line 2853 "EventsBranch.c" +#line 2836 "EventsBranch.c" } else { - SidebarEntry* _tmp4_; #line 318 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = entry; -#line 318 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY); -#line 2860 "EventsBranch.c" + _tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (entry, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY); +#line 2840 "EventsBranch.c" } #line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" if (_tmp0_) { @@ -2864,33 +2844,34 @@ static gboolean __lambda20_ (Block9Data* _data9_, SidebarEntry* entry) { result = FALSE; #line 319 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2868 "EventsBranch.c" +#line 2848 "EventsBranch.c" } else { - SidebarEntry* _tmp5_; - gint _tmp6_; -#line 321 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = entry; #line 321 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry)); -#line 321 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - result = _tmp6_ == _data9_->event_year; + result = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (entry, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry)) == _data9_->event_year; #line 321 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2880 "EventsBranch.c" +#line 2854 "EventsBranch.c" } } -static gboolean ___lambda20__locator (gconstpointer item, gpointer self) { +static gboolean +___lambda20__locator (gconstpointer item, + gpointer self) +{ gboolean result; result = __lambda20_ (self, (SidebarEntry*) item); #line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2890 "EventsBranch.c" +#line 2867 "EventsBranch.c" } -static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* event, struct tm* event_tm) { +static SidebarEntry* +events_branch_find_event_year (EventsBranch* self, + Event* event, + struct tm* event_tm) +{ SidebarEntry* result = NULL; Block9Data* _data9_; struct tm _tmp0_; @@ -2935,24 +2916,28 @@ static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* e _data9_ = NULL; #line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2939 "EventsBranch.c" +#line 2920 "EventsBranch.c" } -static gint _events_branch_undated_event_comparator_gcompare_func (gconstpointer a, gconstpointer b) { +static gint +_events_branch_undated_event_comparator_gcompare_func (gconstpointer a, + gconstpointer b) +{ gint result; result = events_branch_undated_event_comparator ((SidebarEntry*) a, (SidebarEntry*) b); #line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2948 "EventsBranch.c" +#line 2932 "EventsBranch.c" } -static void events_branch_add_undated_event (EventsBranch* self, Event* event) { +static void +events_branch_add_undated_event (EventsBranch* self, + Event* event) +{ EventsUndatedDirectoryEntry* _tmp0_; - gboolean _tmp1_; - EventsUndatedDirectoryEntry* _tmp5_; - Event* _tmp6_; + EventsUndatedDirectoryEntry* _tmp4_; #line 325 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 325 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -2960,40 +2945,37 @@ static void events_branch_add_undated_event (EventsBranch* self, Event* event) { #line 326 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp0_ = self->priv->undated_entry; #line 326 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 326 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp1_) { -#line 2967 "EventsBranch.c" + if (!sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry))) { +#line 2950 "EventsBranch.c" + SidebarEntry* _tmp1_; SidebarEntry* _tmp2_; - SidebarEntry* _tmp3_; - EventsUndatedDirectoryEntry* _tmp4_; + EventsUndatedDirectoryEntry* _tmp3_; #line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp1_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = self->priv->undated_entry; + _tmp3_ = self->priv->undated_entry; #line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _events_branch_undated_event_comparator_gcompare_func); + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _events_branch_undated_event_comparator_gcompare_func); #line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp3_); -#line 2981 "EventsBranch.c" + _g_object_unref0 (_tmp2_); +#line 2964 "EventsBranch.c" } #line 329 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = self->priv->undated_entry; -#line 329 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = event; + _tmp4_ = self->priv->undated_entry; #line 329 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_graft_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp6_, NULL); -#line 2989 "EventsBranch.c" + events_branch_graft_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), event, NULL); +#line 2970 "EventsBranch.c" } -static void events_branch_move_to_undated_event (EventsBranch* self, Event* event) { +static void +events_branch_move_to_undated_event (EventsBranch* self, + Event* event) +{ EventsUndatedDirectoryEntry* _tmp0_; - gboolean _tmp1_; - Event* _tmp5_; - EventsUndatedDirectoryEntry* _tmp6_; + EventsUndatedDirectoryEntry* _tmp4_; #line 332 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 332 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -3001,43 +2983,40 @@ static void events_branch_move_to_undated_event (EventsBranch* self, Event* even #line 333 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp0_ = self->priv->undated_entry; #line 333 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 333 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp1_) { -#line 3008 "EventsBranch.c" + if (!sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry))) { +#line 2988 "EventsBranch.c" + SidebarEntry* _tmp1_; SidebarEntry* _tmp2_; - SidebarEntry* _tmp3_; - EventsUndatedDirectoryEntry* _tmp4_; + EventsUndatedDirectoryEntry* _tmp3_; #line 334 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp1_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 334 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 334 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = self->priv->undated_entry; + _tmp3_ = self->priv->undated_entry; #line 334 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); #line 334 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp3_); -#line 3022 "EventsBranch.c" + _g_object_unref0 (_tmp2_); +#line 3002 "EventsBranch.c" } #line 336 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = event; + _tmp4_ = self->priv->undated_entry; #line 336 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = self->priv->undated_entry; -#line 336 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_reparent_event (self, _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 3030 "EventsBranch.c" + events_branch_reparent_event (self, event, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); +#line 3008 "EventsBranch.c" } -static void events_branch_graft_event (EventsBranch* self, SidebarEntry* parent, Event* event, GCompareFunc comparator) { +static void +events_branch_graft_event (EventsBranch* self, + SidebarEntry* parent, + Event* event, + GCompareFunc comparator) +{ EventsEventEntry* entry = NULL; - Event* _tmp0_; - EventsEventEntry* _tmp1_; - GeeHashMap* _tmp2_; - Event* _tmp3_; - SidebarEntry* _tmp4_; - GCompareFunc _tmp5_; + EventsEventEntry* _tmp0_; + GeeHashMap* _tmp1_; #line 339 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 339 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -3045,41 +3024,35 @@ static void events_branch_graft_event (EventsBranch* self, SidebarEntry* parent, #line 339 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (IS_EVENT (event)); #line 341 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = event; -#line 341 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = events_event_entry_new (_tmp0_); + _tmp0_ = events_event_entry_new (event); #line 341 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - entry = _tmp1_; -#line 342 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = self->priv->entry_map; + entry = _tmp0_; #line 342 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = event; + _tmp1_ = self->priv->entry_map; #line 342 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, entry); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), event, entry); #line 344 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = parent; -#line 344 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = comparator; -#line 344 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp5_); + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), parent, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), comparator); #line 339 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (entry); -#line 3068 "EventsBranch.c" +#line 3039 "EventsBranch.c" } -static void events_branch_reparent_event (EventsBranch* self, Event* event, SidebarEntry* new_parent) { +static void +events_branch_reparent_event (EventsBranch* self, + Event* event, + SidebarEntry* new_parent) +{ EventsEventEntry* entry = NULL; GeeHashMap* _tmp0_; - Event* _tmp1_; - gpointer _tmp2_; - EventsEventEntry* _tmp3_; + gpointer _tmp1_; + EventsEventEntry* _tmp2_; SidebarEntry* old_parent = NULL; - EventsEventEntry* _tmp4_; + EventsEventEntry* _tmp3_; + SidebarEntry* _tmp4_; SidebarEntry* _tmp5_; - SidebarEntry* _tmp6_; - SidebarEntry* _tmp7_; - EventsEventEntry* _tmp8_; + EventsEventEntry* _tmp6_; #line 347 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 347 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -3089,188 +3062,174 @@ static void events_branch_reparent_event (EventsBranch* self, Event* event, Side #line 348 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp0_ = self->priv->entry_map; #line 348 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = event; -#line 348 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), event); #line 348 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - entry = (EventsEventEntry*) _tmp2_; + entry = (EventsEventEntry*) _tmp1_; #line 349 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = entry; + _tmp2_ = entry; #line 349 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_assert (_tmp3_ != NULL, "entry != null"); + _vala_assert (_tmp2_ != NULL, "entry != null"); #line 351 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = entry; + _tmp3_ = entry; #line 351 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); + _tmp4_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); #line 351 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - old_parent = _tmp5_; + old_parent = _tmp4_; #line 352 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = old_parent; + _tmp5_ = old_parent; #line 352 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_assert (_tmp6_ != NULL, "old_parent != null"); -#line 354 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = new_parent; + _vala_assert (_tmp5_ != NULL, "old_parent != null"); #line 354 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = entry; + _tmp6_ = entry; #line 354 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_reparent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); + sidebar_branch_reparent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), new_parent, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" while (TRUE) { -#line 3120 "EventsBranch.c" - gboolean _tmp9_ = FALSE; - SidebarEntry* _tmp10_; - gint _tmp11_; +#line 3089 "EventsBranch.c" + gboolean _tmp7_ = FALSE; + SidebarEntry* _tmp8_; SidebarEntry* grandparent = NULL; + SidebarEntry* _tmp12_; + SidebarEntry* _tmp13_; + SidebarEntry* _tmp14_; SidebarEntry* _tmp15_; SidebarEntry* _tmp16_; SidebarEntry* _tmp17_; - SidebarEntry* _tmp18_; - SidebarEntry* _tmp19_; - SidebarEntry* _tmp20_; #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = old_parent; + _tmp8_ = old_parent; #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp10_); + if (sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp8_) == 0) { +#line 3103 "EventsBranch.c" + SidebarEntry* _tmp9_; + SidebarEntry* _tmp10_; + SidebarEntry* _tmp11_; #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp11_ == 0) { -#line 3137 "EventsBranch.c" - SidebarEntry* _tmp12_; - SidebarEntry* _tmp13_; - SidebarEntry* _tmp14_; -#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = old_parent; + _tmp9_ = old_parent; #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp10_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = _tmp13_; + _tmp11_ = _tmp10_; #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = _tmp12_ != _tmp14_; + _tmp7_ = _tmp9_ != _tmp11_; #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp14_); -#line 3151 "EventsBranch.c" + _g_object_unref0 (_tmp11_); +#line 3117 "EventsBranch.c" } else { #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = FALSE; -#line 3155 "EventsBranch.c" + _tmp7_ = FALSE; +#line 3121 "EventsBranch.c" } #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp9_) { + if (!_tmp7_) { #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" break; -#line 3161 "EventsBranch.c" +#line 3127 "EventsBranch.c" } #line 357 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = old_parent; + _tmp12_ = old_parent; #line 357 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp16_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp15_); + _tmp13_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp12_); #line 357 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - grandparent = _tmp16_; + grandparent = _tmp13_; #line 358 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp17_ = grandparent; + _tmp14_ = grandparent; #line 358 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_assert (_tmp17_ != NULL, "grandparent != null"); + _vala_assert (_tmp14_ != NULL, "grandparent != null"); #line 360 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp18_ = old_parent; + _tmp15_ = old_parent; #line 360 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp18_); + sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp15_); #line 362 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp19_ = grandparent; + _tmp16_ = grandparent; #line 362 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp20_ = _g_object_ref0 (_tmp19_); + _tmp17_ = _g_object_ref0 (_tmp16_); #line 362 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (old_parent); #line 362 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - old_parent = _tmp20_; + old_parent = _tmp17_; #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (grandparent); -#line 3187 "EventsBranch.c" +#line 3153 "EventsBranch.c" } #line 347 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (old_parent); #line 347 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (entry); -#line 3193 "EventsBranch.c" +#line 3159 "EventsBranch.c" } -static void events_branch_show_no_events (EventsBranch* self, gboolean show) { +static void +events_branch_show_no_events (EventsBranch* self, + gboolean show) +{ gboolean _tmp0_ = FALSE; - gboolean _tmp1_; #line 366 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = show; -#line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp1_) { -#line 3206 "EventsBranch.c" - EventsNoEventEntry* _tmp2_; - gboolean _tmp3_; -#line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = self->priv->no_event_entry; + if (show) { +#line 3172 "EventsBranch.c" + EventsNoEventEntry* _tmp1_; #line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); + _tmp1_ = self->priv->no_event_entry; #line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = !_tmp3_; -#line 3215 "EventsBranch.c" + _tmp0_ = !sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); +#line 3178 "EventsBranch.c" } else { #line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp0_ = FALSE; -#line 3219 "EventsBranch.c" +#line 3182 "EventsBranch.c" } #line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" if (_tmp0_) { -#line 3223 "EventsBranch.c" - SidebarEntry* _tmp4_; - SidebarEntry* _tmp5_; - EventsNoEventEntry* _tmp6_; +#line 3186 "EventsBranch.c" + SidebarEntry* _tmp2_; + SidebarEntry* _tmp3_; + EventsNoEventEntry* _tmp4_; #line 368 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 368 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 368 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = self->priv->no_event_entry; + _tmp4_ = self->priv->no_event_entry; #line 368 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); #line 368 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp5_); -#line 3237 "EventsBranch.c" + _g_object_unref0 (_tmp3_); +#line 3200 "EventsBranch.c" } else { - gboolean _tmp7_ = FALSE; - gboolean _tmp8_; + gboolean _tmp5_ = FALSE; #line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = show; + if (!show) { +#line 3205 "EventsBranch.c" + EventsNoEventEntry* _tmp6_; #line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp8_) { -#line 3245 "EventsBranch.c" - EventsNoEventEntry* _tmp9_; - gboolean _tmp10_; + _tmp6_ = self->priv->no_event_entry; #line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = self->priv->no_event_entry; -#line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = _tmp10_; -#line 3254 "EventsBranch.c" + _tmp5_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); +#line 3211 "EventsBranch.c" } else { #line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = FALSE; -#line 3258 "EventsBranch.c" + _tmp5_ = FALSE; +#line 3215 "EventsBranch.c" } #line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp7_) { -#line 3262 "EventsBranch.c" - EventsNoEventEntry* _tmp11_; + if (_tmp5_) { +#line 3219 "EventsBranch.c" + EventsNoEventEntry* _tmp7_; #line 370 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = self->priv->no_event_entry; + _tmp7_ = self->priv->no_event_entry; #line 370 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 3268 "EventsBranch.c" + sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); +#line 3225 "EventsBranch.c" } } } -static void events_branch_class_init (EventsBranchClass * klass) { +static void +events_branch_class_init (EventsBranchClass * klass) +{ gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; @@ -3297,11 +3256,13 @@ static void events_branch_class_init (EventsBranchClass * klass) { _tmp3_ = g_strdup (RESOURCES_ICON_NO_EVENT); #line 11 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_branch_no_event_icon = _tmp3_; -#line 3301 "EventsBranch.c" +#line 3260 "EventsBranch.c" } -static void events_branch_instance_init (EventsBranch * self) { +static void +events_branch_instance_init (EventsBranch * self) +{ GeeHashMap* _tmp0_; EventsUndatedDirectoryEntry* _tmp1_; EventsNoEventEntry* _tmp2_; @@ -3324,11 +3285,13 @@ static void events_branch_instance_init (EventsBranch * self) { _tmp3_ = events_master_directory_entry_new (); #line 22 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self->priv->all_events_entry = _tmp3_; -#line 3328 "EventsBranch.c" +#line 3289 "EventsBranch.c" } -static void events_branch_finalize (GObject * obj) { +static void +events_branch_finalize (GObject * obj) +{ EventsBranch * self; EventSourceCollection* _tmp0_; guint _tmp1_; @@ -3379,11 +3342,13 @@ static void events_branch_finalize (GObject * obj) { _g_object_unref0 (self->priv->all_events_entry); #line 7 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" G_OBJECT_CLASS (events_branch_parent_class)->finalize (obj); -#line 3383 "EventsBranch.c" +#line 3346 "EventsBranch.c" } -GType events_branch_get_type (void) { +GType +events_branch_get_type (void) +{ static volatile gsize events_branch_type_id__volatile = 0; if (g_once_init_enter (&events_branch_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsBranch), 0, (GInstanceInitFunc) events_branch_instance_init, NULL }; @@ -3395,17 +3360,21 @@ GType events_branch_get_type (void) { } -EventsDirectoryEntry* events_directory_entry_construct (GType object_type) { +EventsDirectoryEntry* +events_directory_entry_construct (GType object_type) +{ EventsDirectoryEntry * self = NULL; #line 375 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = (EventsDirectoryEntry*) sidebar_simple_page_entry_construct (object_type); #line 375 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return self; -#line 3405 "EventsBranch.c" +#line 3372 "EventsBranch.c" } -static gchar* events_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { +static gchar* +events_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) +{ EventsDirectoryEntry * self; gchar* result = NULL; const gchar* _tmp0_; @@ -3420,11 +3389,13 @@ static gchar* events_directory_entry_real_get_sidebar_icon (SidebarSimplePageEnt result = _tmp1_; #line 379 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3424 "EventsBranch.c" +#line 3393 "EventsBranch.c" } -static gboolean events_directory_entry_real_expand_on_select (SidebarExpandableEntry* base) { +static gboolean +events_directory_entry_real_expand_on_select (SidebarExpandableEntry* base) +{ EventsDirectoryEntry * self; gboolean result = FALSE; #line 382 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -3433,33 +3404,41 @@ static gboolean events_directory_entry_real_expand_on_select (SidebarExpandableE result = TRUE; #line 383 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3437 "EventsBranch.c" +#line 3408 "EventsBranch.c" } -static void events_directory_entry_class_init (EventsDirectoryEntryClass * klass) { +static void +events_directory_entry_class_init (EventsDirectoryEntryClass * klass) +{ #line 374 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_directory_entry_parent_class = g_type_class_peek_parent (klass); #line 374 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_directory_entry_real_get_sidebar_icon; -#line 3446 "EventsBranch.c" +#line 3419 "EventsBranch.c" } -static void events_directory_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) { +static void +events_directory_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) +{ #line 374 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_directory_entry_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 374 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) events_directory_entry_real_expand_on_select; -#line 3455 "EventsBranch.c" +#line 3430 "EventsBranch.c" } -static void events_directory_entry_instance_init (EventsDirectoryEntry * self) { +static void +events_directory_entry_instance_init (EventsDirectoryEntry * self) +{ } -GType events_directory_entry_get_type (void) { +GType +events_directory_entry_get_type (void) +{ static volatile gsize events_directory_entry_type_id__volatile = 0; if (g_once_init_enter (&events_directory_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsDirectoryEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_directory_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsDirectoryEntry), 0, (GInstanceInitFunc) events_directory_entry_instance_init, NULL }; @@ -3473,24 +3452,30 @@ GType events_directory_entry_get_type (void) { } -EventsMasterDirectoryEntry* events_master_directory_entry_construct (GType object_type) { +EventsMasterDirectoryEntry* +events_master_directory_entry_construct (GType object_type) +{ EventsMasterDirectoryEntry * self = NULL; #line 388 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = (EventsMasterDirectoryEntry*) events_directory_entry_construct (object_type); #line 388 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return self; -#line 3483 "EventsBranch.c" +#line 3464 "EventsBranch.c" } -EventsMasterDirectoryEntry* events_master_directory_entry_new (void) { +EventsMasterDirectoryEntry* +events_master_directory_entry_new (void) +{ #line 388 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return events_master_directory_entry_construct (EVENTS_TYPE_MASTER_DIRECTORY_ENTRY); -#line 3490 "EventsBranch.c" +#line 3473 "EventsBranch.c" } -static gchar* events_master_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +events_master_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ EventsMasterDirectoryEntry * self; gchar* result = NULL; gchar* _tmp0_; @@ -3502,11 +3487,13 @@ static gchar* events_master_directory_entry_real_get_sidebar_name (SidebarSimple result = _tmp0_; #line 392 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3506 "EventsBranch.c" +#line 3491 "EventsBranch.c" } -static gchar* events_master_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { +static gchar* +events_master_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) +{ EventsMasterDirectoryEntry * self; gchar* result = NULL; const gchar* _tmp0_; @@ -3521,11 +3508,13 @@ static gchar* events_master_directory_entry_real_get_sidebar_icon (SidebarSimple result = _tmp1_; #line 396 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3525 "EventsBranch.c" +#line 3512 "EventsBranch.c" } -static Page* events_master_directory_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +events_master_directory_entry_real_create_page (SidebarSimplePageEntry* base) +{ EventsMasterDirectoryEntry * self; Page* result = NULL; MasterEventsDirectoryPage* _tmp0_; @@ -3539,11 +3528,13 @@ static Page* events_master_directory_entry_real_create_page (SidebarSimplePageEn result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page); #line 400 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3543 "EventsBranch.c" +#line 3532 "EventsBranch.c" } -static void events_master_directory_entry_class_init (EventsMasterDirectoryEntryClass * klass) { +static void +events_master_directory_entry_class_init (EventsMasterDirectoryEntryClass * klass) +{ #line 387 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_master_directory_entry_parent_class = g_type_class_peek_parent (klass); #line 387 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -3552,15 +3543,19 @@ static void events_master_directory_entry_class_init (EventsMasterDirectoryEntry ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_master_directory_entry_real_get_sidebar_icon; #line 387 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_master_directory_entry_real_create_page; -#line 3556 "EventsBranch.c" +#line 3547 "EventsBranch.c" } -static void events_master_directory_entry_instance_init (EventsMasterDirectoryEntry * self) { +static void +events_master_directory_entry_instance_init (EventsMasterDirectoryEntry * self) +{ } -GType events_master_directory_entry_get_type (void) { +GType +events_master_directory_entry_get_type (void) +{ static volatile gsize events_master_directory_entry_type_id__volatile = 0; if (g_once_init_enter (&events_master_directory_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsMasterDirectoryEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_master_directory_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsMasterDirectoryEntry), 0, (GInstanceInitFunc) events_master_directory_entry_instance_init, NULL }; @@ -3572,11 +3567,14 @@ GType events_master_directory_entry_get_type (void) { } -EventsYearDirectoryEntry* events_year_directory_entry_construct (GType object_type, const gchar* name, struct tm* tm) { +EventsYearDirectoryEntry* +events_year_directory_entry_construct (GType object_type, + const gchar* name, + struct tm* tm) +{ EventsYearDirectoryEntry * self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - struct tm _tmp2_; + gchar* _tmp0_; + struct tm _tmp1_; #line 408 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (name != NULL, NULL); #line 408 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -3584,31 +3582,34 @@ EventsYearDirectoryEntry* events_year_directory_entry_construct (GType object_ty #line 408 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = (EventsYearDirectoryEntry*) events_directory_entry_construct (object_type); #line 409 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = name; -#line 409 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (name); #line 409 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_free0 (self->priv->name); #line 409 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - self->priv->name = _tmp1_; + self->priv->name = _tmp0_; #line 410 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = *tm; + _tmp1_ = *tm; #line 410 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - self->priv->tm = _tmp2_; + self->priv->tm = _tmp1_; #line 408 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return self; -#line 3601 "EventsBranch.c" +#line 3597 "EventsBranch.c" } -EventsYearDirectoryEntry* events_year_directory_entry_new (const gchar* name, struct tm* tm) { +EventsYearDirectoryEntry* +events_year_directory_entry_new (const gchar* name, + struct tm* tm) +{ #line 408 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return events_year_directory_entry_construct (EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, name, tm); -#line 3608 "EventsBranch.c" +#line 3607 "EventsBranch.c" } -static gchar* events_year_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +events_year_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ EventsYearDirectoryEntry * self; gchar* result = NULL; const gchar* _tmp0_; @@ -3623,11 +3624,13 @@ static gchar* events_year_directory_entry_real_get_sidebar_name (SidebarSimplePa result = _tmp1_; #line 414 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3627 "EventsBranch.c" +#line 3628 "EventsBranch.c" } -gint events_year_directory_entry_get_year (EventsYearDirectoryEntry* self) { +gint +events_year_directory_entry_get_year (EventsYearDirectoryEntry* self) +{ gint result = 0; struct tm _tmp0_; gint _tmp1_; @@ -3641,11 +3644,13 @@ gint events_year_directory_entry_get_year (EventsYearDirectoryEntry* self) { result = _tmp1_ + 1900; #line 418 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3645 "EventsBranch.c" +#line 3648 "EventsBranch.c" } -static Page* events_year_directory_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +events_year_directory_entry_real_create_page (SidebarSimplePageEntry* base) +{ EventsYearDirectoryEntry * self; Page* result = NULL; struct tm _tmp0_; @@ -3662,11 +3667,13 @@ static Page* events_year_directory_entry_real_create_page (SidebarSimplePageEntr result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); #line 422 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3666 "EventsBranch.c" +#line 3671 "EventsBranch.c" } -static void events_year_directory_entry_class_init (EventsYearDirectoryEntryClass * klass) { +static void +events_year_directory_entry_class_init (EventsYearDirectoryEntryClass * klass) +{ #line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_year_directory_entry_parent_class = g_type_class_peek_parent (klass); #line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -3677,18 +3684,22 @@ static void events_year_directory_entry_class_init (EventsYearDirectoryEntryClas ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_year_directory_entry_real_create_page; #line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" G_OBJECT_CLASS (klass)->finalize = events_year_directory_entry_finalize; -#line 3681 "EventsBranch.c" +#line 3688 "EventsBranch.c" } -static void events_year_directory_entry_instance_init (EventsYearDirectoryEntry * self) { +static void +events_year_directory_entry_instance_init (EventsYearDirectoryEntry * self) +{ #line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self->priv = EVENTS_YEAR_DIRECTORY_ENTRY_GET_PRIVATE (self); -#line 3688 "EventsBranch.c" +#line 3697 "EventsBranch.c" } -static void events_year_directory_entry_finalize (GObject * obj) { +static void +events_year_directory_entry_finalize (GObject * obj) +{ EventsYearDirectoryEntry * self; #line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry); @@ -3696,11 +3707,13 @@ static void events_year_directory_entry_finalize (GObject * obj) { _g_free0 (self->priv->name); #line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" G_OBJECT_CLASS (events_year_directory_entry_parent_class)->finalize (obj); -#line 3700 "EventsBranch.c" +#line 3711 "EventsBranch.c" } -GType events_year_directory_entry_get_type (void) { +GType +events_year_directory_entry_get_type (void) +{ static volatile gsize events_year_directory_entry_type_id__volatile = 0; if (g_once_init_enter (&events_year_directory_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsYearDirectoryEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_year_directory_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsYearDirectoryEntry), 0, (GInstanceInitFunc) events_year_directory_entry_instance_init, NULL }; @@ -3712,11 +3725,14 @@ GType events_year_directory_entry_get_type (void) { } -EventsMonthDirectoryEntry* events_month_directory_entry_construct (GType object_type, const gchar* name, struct tm* tm) { +EventsMonthDirectoryEntry* +events_month_directory_entry_construct (GType object_type, + const gchar* name, + struct tm* tm) +{ EventsMonthDirectoryEntry * self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - struct tm _tmp2_; + gchar* _tmp0_; + struct tm _tmp1_; #line 430 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (name != NULL, NULL); #line 430 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -3724,31 +3740,34 @@ EventsMonthDirectoryEntry* events_month_directory_entry_construct (GType object_ #line 430 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = (EventsMonthDirectoryEntry*) events_directory_entry_construct (object_type); #line 431 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = name; -#line 431 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (name); #line 431 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_free0 (self->priv->name); #line 431 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - self->priv->name = _tmp1_; + self->priv->name = _tmp0_; #line 432 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = *tm; + _tmp1_ = *tm; #line 432 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - self->priv->tm = _tmp2_; + self->priv->tm = _tmp1_; #line 430 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return self; -#line 3741 "EventsBranch.c" +#line 3755 "EventsBranch.c" } -EventsMonthDirectoryEntry* events_month_directory_entry_new (const gchar* name, struct tm* tm) { +EventsMonthDirectoryEntry* +events_month_directory_entry_new (const gchar* name, + struct tm* tm) +{ #line 430 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return events_month_directory_entry_construct (EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, name, tm); -#line 3748 "EventsBranch.c" +#line 3765 "EventsBranch.c" } -static gchar* events_month_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +events_month_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ EventsMonthDirectoryEntry * self; gchar* result = NULL; const gchar* _tmp0_; @@ -3763,11 +3782,13 @@ static gchar* events_month_directory_entry_real_get_sidebar_name (SidebarSimpleP result = _tmp1_; #line 436 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3767 "EventsBranch.c" +#line 3786 "EventsBranch.c" } -gint events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self) { +gint +events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self) +{ gint result = 0; struct tm _tmp0_; gint _tmp1_; @@ -3781,11 +3802,13 @@ gint events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self) { result = _tmp1_ + 1900; #line 440 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3785 "EventsBranch.c" +#line 3806 "EventsBranch.c" } -gint events_month_directory_entry_get_month (EventsMonthDirectoryEntry* self) { +gint +events_month_directory_entry_get_month (EventsMonthDirectoryEntry* self) +{ gint result = 0; struct tm _tmp0_; gint _tmp1_; @@ -3799,11 +3822,13 @@ gint events_month_directory_entry_get_month (EventsMonthDirectoryEntry* self) { result = _tmp1_ + 1; #line 444 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3803 "EventsBranch.c" +#line 3826 "EventsBranch.c" } -static Page* events_month_directory_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +events_month_directory_entry_real_create_page (SidebarSimplePageEntry* base) +{ EventsMonthDirectoryEntry * self; Page* result = NULL; struct tm _tmp0_; @@ -3820,11 +3845,13 @@ static Page* events_month_directory_entry_real_create_page (SidebarSimplePageEnt result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); #line 448 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3824 "EventsBranch.c" +#line 3849 "EventsBranch.c" } -static void events_month_directory_entry_class_init (EventsMonthDirectoryEntryClass * klass) { +static void +events_month_directory_entry_class_init (EventsMonthDirectoryEntryClass * klass) +{ #line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_month_directory_entry_parent_class = g_type_class_peek_parent (klass); #line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -3835,18 +3862,22 @@ static void events_month_directory_entry_class_init (EventsMonthDirectoryEntryCl ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_month_directory_entry_real_create_page; #line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" G_OBJECT_CLASS (klass)->finalize = events_month_directory_entry_finalize; -#line 3839 "EventsBranch.c" +#line 3866 "EventsBranch.c" } -static void events_month_directory_entry_instance_init (EventsMonthDirectoryEntry * self) { +static void +events_month_directory_entry_instance_init (EventsMonthDirectoryEntry * self) +{ #line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self->priv = EVENTS_MONTH_DIRECTORY_ENTRY_GET_PRIVATE (self); -#line 3846 "EventsBranch.c" +#line 3875 "EventsBranch.c" } -static void events_month_directory_entry_finalize (GObject * obj) { +static void +events_month_directory_entry_finalize (GObject * obj) +{ EventsMonthDirectoryEntry * self; #line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry); @@ -3854,11 +3885,13 @@ static void events_month_directory_entry_finalize (GObject * obj) { _g_free0 (self->priv->name); #line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" G_OBJECT_CLASS (events_month_directory_entry_parent_class)->finalize (obj); -#line 3858 "EventsBranch.c" +#line 3889 "EventsBranch.c" } -GType events_month_directory_entry_get_type (void) { +GType +events_month_directory_entry_get_type (void) +{ static volatile gsize events_month_directory_entry_type_id__volatile = 0; if (g_once_init_enter (&events_month_directory_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsMonthDirectoryEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_month_directory_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsMonthDirectoryEntry), 0, (GInstanceInitFunc) events_month_directory_entry_instance_init, NULL }; @@ -3870,24 +3903,30 @@ GType events_month_directory_entry_get_type (void) { } -EventsUndatedDirectoryEntry* events_undated_directory_entry_construct (GType object_type) { +EventsUndatedDirectoryEntry* +events_undated_directory_entry_construct (GType object_type) +{ EventsUndatedDirectoryEntry * self = NULL; #line 453 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = (EventsUndatedDirectoryEntry*) events_directory_entry_construct (object_type); #line 453 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return self; -#line 3880 "EventsBranch.c" +#line 3915 "EventsBranch.c" } -EventsUndatedDirectoryEntry* events_undated_directory_entry_new (void) { +EventsUndatedDirectoryEntry* +events_undated_directory_entry_new (void) +{ #line 453 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return events_undated_directory_entry_construct (EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY); -#line 3887 "EventsBranch.c" +#line 3924 "EventsBranch.c" } -static gchar* events_undated_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +events_undated_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ EventsUndatedDirectoryEntry * self; gchar* result = NULL; gchar* _tmp0_; @@ -3899,11 +3938,13 @@ static gchar* events_undated_directory_entry_real_get_sidebar_name (SidebarSimpl result = _tmp0_; #line 457 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3903 "EventsBranch.c" +#line 3942 "EventsBranch.c" } -static Page* events_undated_directory_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +events_undated_directory_entry_real_create_page (SidebarSimplePageEntry* base) +{ EventsUndatedDirectoryEntry * self; Page* result = NULL; struct tm _tmp0_ = {0}; @@ -3920,26 +3961,32 @@ static Page* events_undated_directory_entry_real_create_page (SidebarSimplePageE result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); #line 461 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3924 "EventsBranch.c" +#line 3965 "EventsBranch.c" } -static void events_undated_directory_entry_class_init (EventsUndatedDirectoryEntryClass * klass) { +static void +events_undated_directory_entry_class_init (EventsUndatedDirectoryEntryClass * klass) +{ #line 452 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_undated_directory_entry_parent_class = g_type_class_peek_parent (klass); #line 452 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_undated_directory_entry_real_get_sidebar_name; #line 452 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_undated_directory_entry_real_create_page; -#line 3935 "EventsBranch.c" +#line 3978 "EventsBranch.c" } -static void events_undated_directory_entry_instance_init (EventsUndatedDirectoryEntry * self) { +static void +events_undated_directory_entry_instance_init (EventsUndatedDirectoryEntry * self) +{ } -GType events_undated_directory_entry_get_type (void) { +GType +events_undated_directory_entry_get_type (void) +{ static volatile gsize events_undated_directory_entry_type_id__volatile = 0; if (g_once_init_enter (&events_undated_directory_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsUndatedDirectoryEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_undated_directory_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsUndatedDirectoryEntry), 0, (GInstanceInitFunc) events_undated_directory_entry_instance_init, NULL }; @@ -3951,36 +3998,40 @@ GType events_undated_directory_entry_get_type (void) { } -EventsEventEntry* events_event_entry_construct (GType object_type, Event* event) { +EventsEventEntry* +events_event_entry_construct (GType object_type, + Event* event) +{ EventsEventEntry * self = NULL; Event* _tmp0_; - Event* _tmp1_; #line 470 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (IS_EVENT (event), NULL); #line 470 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = (EventsEventEntry*) sidebar_simple_page_entry_construct (object_type); #line 471 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = event; -#line 471 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (event); #line 471 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (self->priv->event); #line 471 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - self->priv->event = _tmp1_; + self->priv->event = _tmp0_; #line 470 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return self; -#line 3973 "EventsBranch.c" +#line 4020 "EventsBranch.c" } -EventsEventEntry* events_event_entry_new (Event* event) { +EventsEventEntry* +events_event_entry_new (Event* event) +{ #line 470 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return events_event_entry_construct (EVENTS_TYPE_EVENT_ENTRY, event); -#line 3980 "EventsBranch.c" +#line 4029 "EventsBranch.c" } -Event* events_event_entry_get_event (EventsEventEntry* self) { +Event* +events_event_entry_get_event (EventsEventEntry* self) +{ Event* result = NULL; Event* _tmp0_; Event* _tmp1_; @@ -3994,11 +4045,13 @@ Event* events_event_entry_get_event (EventsEventEntry* self) { result = _tmp1_; #line 475 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3998 "EventsBranch.c" +#line 4049 "EventsBranch.c" } -static gchar* events_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +events_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ EventsEventEntry * self; gchar* result = NULL; Event* _tmp0_; @@ -4013,11 +4066,13 @@ static gchar* events_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* result = _tmp1_; #line 479 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 4017 "EventsBranch.c" +#line 4070 "EventsBranch.c" } -static gchar* events_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { +static gchar* +events_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) +{ EventsEventEntry * self; gchar* result = NULL; const gchar* _tmp0_; @@ -4032,11 +4087,13 @@ static gchar* events_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* result = _tmp1_; #line 483 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 4036 "EventsBranch.c" +#line 4091 "EventsBranch.c" } -static Page* events_event_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +events_event_entry_real_create_page (SidebarSimplePageEntry* base) +{ EventsEventEntry * self; Page* result = NULL; Event* _tmp0_; @@ -4053,11 +4110,13 @@ static Page* events_event_entry_real_create_page (SidebarSimplePageEntry* base) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); #line 487 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 4057 "EventsBranch.c" +#line 4114 "EventsBranch.c" } -static gboolean events_event_entry_real_is_user_renameable (SidebarRenameableEntry* base) { +static gboolean +events_event_entry_real_is_user_renameable (SidebarRenameableEntry* base) +{ EventsEventEntry * self; gboolean result = FALSE; #line 490 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -4066,74 +4125,77 @@ static gboolean events_event_entry_real_is_user_renameable (SidebarRenameableEnt result = TRUE; #line 491 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 4070 "EventsBranch.c" +#line 4129 "EventsBranch.c" } -static void events_event_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name) { +static void +events_event_entry_real_rename (SidebarRenameableEntry* base, + const gchar* new_name) +{ EventsEventEntry * self; gchar* prepped = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp0_; + const gchar* _tmp1_; #line 494 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry); #line 494 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (new_name != NULL); #line 495 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = new_name; -#line 495 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = event_prep_event_name (_tmp0_); + _tmp0_ = event_prep_event_name (new_name); #line 495 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - prepped = _tmp1_; + prepped = _tmp0_; #line 496 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = prepped; + _tmp1_ = prepped; #line 496 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp2_ != NULL) { -#line 4094 "EventsBranch.c" + if (_tmp1_ != NULL) { +#line 4153 "EventsBranch.c" + CommandManager* _tmp2_; CommandManager* _tmp3_; - CommandManager* _tmp4_; - Event* _tmp5_; - const gchar* _tmp6_; + Event* _tmp4_; + const gchar* _tmp5_; + RenameEventCommand* _tmp6_; RenameEventCommand* _tmp7_; - RenameEventCommand* _tmp8_; #line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = app_window_get_command_manager (); + _tmp2_ = app_window_get_command_manager (); #line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = self->priv->event; + _tmp4_ = self->priv->event; #line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = prepped; + _tmp5_ = prepped; #line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = rename_event_command_new (_tmp5_, _tmp6_); + _tmp6_ = rename_event_command_new (_tmp4_, _tmp5_); #line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - command_manager_execute (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command)); #line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _command_manager_unref0 (_tmp4_); -#line 4119 "EventsBranch.c" + _command_manager_unref0 (_tmp3_); +#line 4178 "EventsBranch.c" } #line 494 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_free0 (prepped); -#line 4123 "EventsBranch.c" +#line 4182 "EventsBranch.c" } -static gboolean events_event_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media) { +static gboolean +events_event_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, + GeeList* media) +{ EventsEventEntry * self; gboolean result = FALSE; GeeArrayList* views = NULL; GeeArrayList* _tmp0_; + CommandManager* _tmp15_; CommandManager* _tmp16_; - CommandManager* _tmp17_; - GeeArrayList* _tmp18_; - Event* _tmp19_; + GeeArrayList* _tmp17_; + Event* _tmp18_; + SetEventCommand* _tmp19_; SetEventCommand* _tmp20_; - SetEventCommand* _tmp21_; #line 500 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry); #line 500 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -4142,117 +4204,117 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD _tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 503 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" views = _tmp0_; -#line 4146 "EventsBranch.c" +#line 4208 "EventsBranch.c" { GeeList* _media_source_list = NULL; GeeList* _tmp1_; - GeeList* _tmp2_; gint _media_source_size = 0; - GeeList* _tmp3_; + GeeList* _tmp2_; + gint _tmp3_; gint _tmp4_; - gint _tmp5_; gint _media_source_index = 0; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = media; -#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (media); #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _media_source_list = _tmp2_; + _media_source_list = _tmp1_; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = _media_source_list; + _tmp2_ = _media_source_list; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _media_source_size = _tmp5_; + _media_source_size = _tmp4_; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _media_source_index = -1; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" while (TRUE) { -#line 4174 "EventsBranch.c" +#line 4233 "EventsBranch.c" + gint _tmp5_; gint _tmp6_; gint _tmp7_; - gint _tmp8_; MediaSource* media_source = NULL; - GeeList* _tmp9_; - gint _tmp10_; - gpointer _tmp11_; - GeeArrayList* _tmp12_; - MediaSource* _tmp13_; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + GeeArrayList* _tmp11_; + MediaSource* _tmp12_; + DataView* _tmp13_; DataView* _tmp14_; - DataView* _tmp15_; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = _media_source_index; + _tmp5_ = _media_source_index; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _media_source_index = _tmp6_ + 1; + _media_source_index = _tmp5_ + 1; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = _media_source_index; + _tmp6_ = _media_source_index; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = _media_source_size; + _tmp7_ = _media_source_size; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!(_tmp7_ < _tmp8_)) { + if (!(_tmp6_ < _tmp7_)) { #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" break; -#line 4198 "EventsBranch.c" +#line 4257 "EventsBranch.c" } #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = _media_source_list; + _tmp8_ = _media_source_list; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = _media_source_index; + _tmp9_ = _media_source_index; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = gee_list_get (_tmp9_, _tmp10_); + _tmp10_ = gee_list_get (_tmp8_, _tmp9_); #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - media_source = (MediaSource*) _tmp11_; + media_source = (MediaSource*) _tmp10_; #line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = views; + _tmp11_ = views; #line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = media_source; + _tmp12_ = media_source; #line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = data_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_SOURCE, DataSource)); + _tmp13_ = data_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_SOURCE, DataSource)); #line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_); #line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp14_); #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (media_source); -#line 4222 "EventsBranch.c" +#line 4281 "EventsBranch.c" } #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_media_source_list); -#line 4226 "EventsBranch.c" +#line 4285 "EventsBranch.c" } #line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp16_ = app_window_get_command_manager (); + _tmp15_ = app_window_get_command_manager (); #line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp18_ = views; + _tmp17_ = views; #line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp19_ = self->priv->event; + _tmp18_ = self->priv->event; #line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp20_ = set_event_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable), _tmp19_); + _tmp19_ = set_event_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable), _tmp18_); #line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp21_ = _tmp20_; + _tmp20_ = _tmp19_; #line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - command_manager_execute (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_COMMAND, Command)); #line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp21_); + _g_object_unref0 (_tmp20_); #line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _command_manager_unref0 (_tmp17_); + _command_manager_unref0 (_tmp16_); #line 509 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = TRUE; #line 509 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (views); #line 509 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 4252 "EventsBranch.c" +#line 4311 "EventsBranch.c" } -static gboolean events_event_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data) { +static gboolean +events_event_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, + GtkSelectionData* data) +{ EventsEventEntry * self; gboolean result = FALSE; #line 512 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -4263,11 +4325,13 @@ static gboolean events_event_entry_real_internal_drop_received_arbitrary (Sideba result = FALSE; #line 513 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 4267 "EventsBranch.c" +#line 4329 "EventsBranch.c" } -static void events_event_entry_class_init (EventsEventEntryClass * klass) { +static void +events_event_entry_class_init (EventsEventEntryClass * klass) +{ #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_event_entry_parent_class = g_type_class_peek_parent (klass); #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -4280,40 +4344,48 @@ static void events_event_entry_class_init (EventsEventEntryClass * klass) { ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_event_entry_real_create_page; #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" G_OBJECT_CLASS (klass)->finalize = events_event_entry_finalize; -#line 4284 "EventsBranch.c" +#line 4348 "EventsBranch.c" } -static void events_event_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) { +static void +events_event_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) +{ #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_event_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) events_event_entry_real_is_user_renameable; #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) events_event_entry_real_rename; -#line 4295 "EventsBranch.c" +#line 4361 "EventsBranch.c" } -static void events_event_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) { +static void +events_event_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) +{ #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_event_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface); #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) events_event_entry_real_internal_drop_received; #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) events_event_entry_real_internal_drop_received_arbitrary; -#line 4306 "EventsBranch.c" +#line 4374 "EventsBranch.c" } -static void events_event_entry_instance_init (EventsEventEntry * self) { +static void +events_event_entry_instance_init (EventsEventEntry * self) +{ #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self->priv = EVENTS_EVENT_ENTRY_GET_PRIVATE (self); -#line 4313 "EventsBranch.c" +#line 4383 "EventsBranch.c" } -static void events_event_entry_finalize (GObject * obj) { +static void +events_event_entry_finalize (GObject * obj) +{ EventsEventEntry * self; #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry); @@ -4321,11 +4393,13 @@ static void events_event_entry_finalize (GObject * obj) { _g_object_unref0 (self->priv->event); #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" G_OBJECT_CLASS (events_event_entry_parent_class)->finalize (obj); -#line 4325 "EventsBranch.c" +#line 4397 "EventsBranch.c" } -GType events_event_entry_get_type (void) { +GType +events_event_entry_get_type (void) +{ static volatile gsize events_event_entry_type_id__volatile = 0; if (g_once_init_enter (&events_event_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsEventEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_event_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsEventEntry), 0, (GInstanceInitFunc) events_event_entry_instance_init, NULL }; @@ -4341,24 +4415,30 @@ GType events_event_entry_get_type (void) { } -EventsNoEventEntry* events_no_event_entry_construct (GType object_type) { +EventsNoEventEntry* +events_no_event_entry_construct (GType object_type) +{ EventsNoEventEntry * self = NULL; #line 519 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = (EventsNoEventEntry*) sidebar_simple_page_entry_construct (object_type); #line 519 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return self; -#line 4351 "EventsBranch.c" +#line 4427 "EventsBranch.c" } -EventsNoEventEntry* events_no_event_entry_new (void) { +EventsNoEventEntry* +events_no_event_entry_new (void) +{ #line 519 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return events_no_event_entry_construct (EVENTS_TYPE_NO_EVENT_ENTRY); -#line 4358 "EventsBranch.c" +#line 4436 "EventsBranch.c" } -static gchar* events_no_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +events_no_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ EventsNoEventEntry * self; gchar* result = NULL; gchar* _tmp0_; @@ -4370,11 +4450,13 @@ static gchar* events_no_event_entry_real_get_sidebar_name (SidebarSimplePageEntr result = _tmp0_; #line 523 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 4374 "EventsBranch.c" +#line 4454 "EventsBranch.c" } -static gchar* events_no_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { +static gchar* +events_no_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) +{ EventsNoEventEntry * self; gchar* result = NULL; const gchar* _tmp0_; @@ -4389,11 +4471,13 @@ static gchar* events_no_event_entry_real_get_sidebar_icon (SidebarSimplePageEntr result = _tmp1_; #line 527 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 4393 "EventsBranch.c" +#line 4475 "EventsBranch.c" } -static Page* events_no_event_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +events_no_event_entry_real_create_page (SidebarSimplePageEntry* base) +{ EventsNoEventEntry * self; Page* result = NULL; NoEventPage* _tmp0_; @@ -4407,11 +4491,13 @@ static Page* events_no_event_entry_real_create_page (SidebarSimplePageEntry* bas result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page); #line 531 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 4411 "EventsBranch.c" +#line 4495 "EventsBranch.c" } -static void events_no_event_entry_class_init (EventsNoEventEntryClass * klass) { +static void +events_no_event_entry_class_init (EventsNoEventEntryClass * klass) +{ #line 518 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_no_event_entry_parent_class = g_type_class_peek_parent (klass); #line 518 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -4420,15 +4506,19 @@ static void events_no_event_entry_class_init (EventsNoEventEntryClass * klass) { ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_no_event_entry_real_get_sidebar_icon; #line 518 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_no_event_entry_real_create_page; -#line 4424 "EventsBranch.c" +#line 4510 "EventsBranch.c" } -static void events_no_event_entry_instance_init (EventsNoEventEntry * self) { +static void +events_no_event_entry_instance_init (EventsNoEventEntry * self) +{ } -GType events_no_event_entry_get_type (void) { +GType +events_no_event_entry_get_type (void) +{ static volatile gsize events_no_event_entry_type_id__volatile = 0; if (g_once_init_enter (&events_no_event_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsNoEventEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_no_event_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsNoEventEntry), 0, (GInstanceInitFunc) events_no_event_entry_instance_init, NULL }; diff --git a/src/events/EventsDirectoryPage.c b/src/events/EventsDirectoryPage.c index 44368cb..0eb6a88 100644 --- a/src/events/EventsDirectoryPage.c +++ b/src/events/EventsDirectoryPage.c @@ -1,4 +1,4 @@ -/* EventsDirectoryPage.c generated by valac 0.36.6, the Vala compiler +/* EventsDirectoryPage.c generated by valac 0.40.4, the Vala compiler * generated from EventsDirectoryPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -190,6 +191,11 @@ typedef struct _ViewManagerClass ViewManagerClass; typedef struct _EventsDirectoryPageEventsDirectorySearchViewFilter EventsDirectoryPageEventsDirectorySearchViewFilter; typedef struct _EventsDirectoryPageEventsDirectorySearchViewFilterClass EventsDirectoryPageEventsDirectorySearchViewFilterClass; +enum { + EVENTS_DIRECTORY_PAGE_0_PROPERTY, + EVENTS_DIRECTORY_PAGE_NUM_PROPERTIES +}; +static GParamSpec* events_directory_page_properties[EVENTS_DIRECTORY_PAGE_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _view_manager_unref0(var) ((var == NULL) ? NULL : (var = (view_manager_unref (var), NULL))) #define _view_filter_unref0(var) ((var == NULL) ? NULL : (var = (view_filter_unref (var), NULL))) @@ -534,6 +540,11 @@ typedef struct _IndexableIface IndexableIface; typedef struct _MasterEventsDirectoryPage MasterEventsDirectoryPage; typedef struct _MasterEventsDirectoryPageClass MasterEventsDirectoryPageClass; typedef struct _MasterEventsDirectoryPagePrivate MasterEventsDirectoryPagePrivate; +enum { + MASTER_EVENTS_DIRECTORY_PAGE_0_PROPERTY, + MASTER_EVENTS_DIRECTORY_PAGE_NUM_PROPERTIES +}; +static GParamSpec* master_events_directory_page_properties[MASTER_EVENTS_DIRECTORY_PAGE_NUM_PROPERTIES]; #define TYPE_SUB_EVENTS_DIRECTORY_PAGE (sub_events_directory_page_get_type ()) #define SUB_EVENTS_DIRECTORY_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SUB_EVENTS_DIRECTORY_PAGE, SubEventsDirectoryPage)) @@ -545,6 +556,11 @@ typedef struct _MasterEventsDirectoryPagePrivate MasterEventsDirectoryPagePrivat typedef struct _SubEventsDirectoryPage SubEventsDirectoryPage; typedef struct _SubEventsDirectoryPageClass SubEventsDirectoryPageClass; typedef struct _SubEventsDirectoryPagePrivate SubEventsDirectoryPagePrivate; +enum { + SUB_EVENTS_DIRECTORY_PAGE_0_PROPERTY, + SUB_EVENTS_DIRECTORY_PAGE_NUM_PROPERTIES +}; +static GParamSpec* sub_events_directory_page_properties[SUB_EVENTS_DIRECTORY_PAGE_NUM_PROPERTIES]; #define SUB_EVENTS_DIRECTORY_PAGE_TYPE_DIRECTORY_TYPE (sub_events_directory_page_directory_type_get_type ()) @@ -877,9 +893,15 @@ GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType checkerboard_page_get_type (void) G_GNUC_CONST; @@ -893,224 +915,359 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self); gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType search_view_filter_get_type (void) G_GNUC_CONST; gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; GType events_directory_page_get_type (void) G_GNUC_CONST; gpointer view_manager_ref (gpointer instance); void view_manager_unref (gpointer instance); -GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_manager (GValue* value, gpointer v_object); -void value_take_view_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_manager (GValue* value, + gpointer v_object); +void value_take_view_manager (GValue* value, + gpointer v_object); gpointer value_get_view_manager (const GValue* value); GType view_manager_get_type (void) G_GNUC_CONST; static GType events_directory_page_events_directory_search_view_filter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define EVENTS_DIRECTORY_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPagePrivate)) -enum { - EVENTS_DIRECTORY_PAGE_DUMMY_PROPERTY -}; -GAction* page_get_action (Page* self, const gchar* name); -static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value); -static void _events_directory_page_on_sort_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self); +GAction* page_get_action (Page* self, + const gchar* name); +static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, + GSimpleAction* action, + GVariant* value); +static void _events_directory_page_on_sort_changed_g_simple_action_change_state (GSimpleAction* _sender, + GVariant* value, + gpointer self); static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page_events_directory_search_view_filter_new (void); static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page_events_directory_search_view_filter_construct (GType object_type); #define EVENTS_DIRECTORY_PAGE_MIN_PHOTOS_FOR_PROGRESS_WINDOW 50 static void events_directory_page_on_rename (EventsDirectoryPage* self); -static void _events_directory_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _events_directory_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void events_directory_page_on_merge (EventsDirectoryPage* self); -static void _events_directory_page_on_merge_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _events_directory_page_on_merge_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void events_directory_page_on_edit_comment (EventsDirectoryPage* self); -static void _events_directory_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -void page_on_action_toggle (Page* self, GAction* action, GVariant* value); -static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void events_directory_page_on_display_comments (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value); -static void _events_directory_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); +static void _events_directory_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +void page_on_action_toggle (Page* self, + GAction* action, + GVariant* value); +static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void events_directory_page_on_display_comments (EventsDirectoryPage* self, + GSimpleAction* action, + GVariant* value); +static void _events_directory_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType event_source_get_type (void) G_GNUC_CONST; GType event_get_type (void) G_GNUC_CONST; -EventsDirectoryPage* events_directory_page_construct (GType object_type, const gchar* page_name, ViewManager* view_manager, GeeCollection* initial_events); -CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name); +EventsDirectoryPage* events_directory_page_construct (GType object_type, + const gchar* page_name, + ViewManager* view_manager, + GeeCollection* initial_events); +CheckerboardPage* checkerboard_page_construct (GType object_type, + const gchar* page_name); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; ViewCollection* page_get_view (Page* self); gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; -void data_collection_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target); -static Comparator events_directory_page_get_event_comparator (gboolean ascending, void** result_target, GDestroyNotify* result_target_destroy_notify); +void data_collection_set_comparator (DataCollection* self, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target); +static Comparator events_directory_page_get_event_comparator (gboolean ascending, + void** result_target, + GDestroyNotify* result_target_destroy_notify); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* self); -gboolean events_directory_page_event_comparator_predicate (DataObject* object, Alteration* alteration); -static gboolean _events_directory_page_event_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self); +gboolean events_directory_page_event_comparator_predicate (DataObject* object, + Alteration* alteration); +static gboolean _events_directory_page_event_comparator_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self); GType source_collection_get_type (void) G_GNUC_CONST; gpointer view_collection_monitor_ref (gpointer instance); void view_collection_monitor_unref (gpointer instance); -GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void view_collection_value_set_monitor (GValue* value, gpointer v_object); -void view_collection_value_take_monitor (GValue* value, gpointer v_object); +GParamSpec* view_collection_param_spec_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void view_collection_value_set_monitor (GValue* value, + gpointer v_object); +void view_collection_value_take_monitor (GValue* value, + gpointer v_object); gpointer view_collection_value_get_monitor (const GValue* value); GType view_collection_monitor_get_type (void) G_GNUC_CONST; -ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target); +ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq, + GeeCollection* initial, + ProgressMonitor progress_monitor, + void* progress_monitor_target); GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType event_source_collection_get_type (void) G_GNUC_CONST; -void data_collection_set_property (DataCollection* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target); +void data_collection_set_property (DataCollection* self, + const gchar* name, + GValue* val, + ValueEqualFunc value_equals, + void* value_equals_target); #define EVENT_PROP_SHOW_COMMENTS "show-comments" gboolean configuration_facade_get_display_event_comments (ConfigurationFacade* self); -void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path); +void checkerboard_page_init_item_context_menu (CheckerboardPage* self, + const gchar* path); GtkToolbar* page_get_toolbar (Page* self); #define RESOURCES_MERGE_LABEL _ ("Merge") #define RESOURCES_MERGE_TOOLTIP _ ("Combine events into a single event") -static void events_directory_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); -void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail); -static gint64 events_directory_page_event_ascending_comparator (void* a, void* b); +static void events_directory_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames); +void page_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames); +gboolean alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail); +static gint64 events_directory_page_event_ascending_comparator (void* a, + void* b); GType event_directory_item_get_type (void) G_GNUC_CONST; GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); time_t event_source_get_start_time (EventSource* self); -static gint64 events_directory_page_event_descending_comparator (void* a, void* b); -static gint64 _events_directory_page_event_ascending_comparator_comparator (void* a, void* b, gpointer self); -static gint64 _events_directory_page_event_descending_comparator_comparator (void* a, void* b, gpointer self); -static void events_directory_page_real_add_actions (Page* base, GActionMap* map); -void page_add_actions (Page* self, GActionMap* map); +static gint64 events_directory_page_event_descending_comparator (void* a, + void* b); +static gint64 _events_directory_page_event_ascending_comparator_comparator (void* a, + void* b, + gpointer self); +static gint64 _events_directory_page_event_descending_comparator_comparator (void* a, + void* b, + gpointer self); +static void events_directory_page_real_add_actions (Page* base, + GActionMap* map); +void page_add_actions (Page* self, + GActionMap* map); static GVariant* _variant_new14 (gboolean value); -static void events_directory_page_real_remove_actions (Page* base, GActionMap* map); -void page_remove_actions (Page* self, GActionMap* map); -static void events_directory_page_real_init_actions (Page* base, gint selected_count, gint count); -void page_init_actions (Page* self, gint selected_count, gint count); -static void events_directory_page_real_update_actions (Page* base, gint selected_count, gint count); -void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); -void page_update_actions (Page* self, gint selected_count, gint count); +static void events_directory_page_real_remove_actions (Page* base, + GActionMap* map); +void page_remove_actions (Page* self, + GActionMap* map); +static void events_directory_page_real_init_actions (Page* base, + gint selected_count, + gint count); +void page_init_actions (Page* self, + gint selected_count, + gint count); +static void events_directory_page_real_update_actions (Page* base, + gint selected_count, + gint count); +void page_set_action_sensitive (Page* self, + const gchar* name, + gboolean sensitive); +void page_update_actions (Page* self, + gint selected_count, + gint count); static gchar* events_directory_page_real_get_view_empty_message (CheckerboardPage* base); static gchar* events_directory_page_real_get_filter_no_match_message (CheckerboardPage* base); -static void events_directory_page_real_on_item_activated (CheckerboardPage* base, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers); +static void events_directory_page_real_on_item_activated (CheckerboardPage* base, + CheckerboardItem* item, + CheckerboardPageActivator activator, + CheckerboardPageKeyboardModifiers* modifiers); GType app_window_get_type (void) G_GNUC_CONST; GType library_window_get_type (void) G_GNUC_CONST; LibraryWindow* library_window_get_app (void); -void library_window_switch_to_event (LibraryWindow* self, Event* event); +void library_window_switch_to_event (LibraryWindow* self, + Event* event); #define LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING "ascending" gint view_collection_get_selected_count (ViewCollection* self); -DataView* view_collection_get_selected_at (ViewCollection* self, gint index); +DataView* view_collection_get_selected_at (ViewCollection* self, + gint index); gpointer text_entry_dialog_mediator_ref (gpointer instance); void text_entry_dialog_mediator_unref (gpointer instance); -GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_text_entry_dialog_mediator (GValue* value, gpointer v_object); -void value_take_text_entry_dialog_mediator (GValue* value, gpointer v_object); +GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_text_entry_dialog_mediator (GValue* value, + gpointer v_object); +void value_take_text_entry_dialog_mediator (GValue* value, + gpointer v_object); gpointer value_get_text_entry_dialog_mediator (const GValue* value); GType text_entry_dialog_mediator_get_type (void) G_GNUC_CONST; GType event_rename_dialog_get_type (void) G_GNUC_CONST; gchar* event_get_raw_name (Event* self); EventRenameDialog* event_rename_dialog_new (const gchar* event_name); -EventRenameDialog* event_rename_dialog_construct (GType object_type, const gchar* event_name); +EventRenameDialog* event_rename_dialog_construct (GType object_type, + const gchar* event_name); gchar* event_rename_dialog_execute (EventRenameDialog* self); GType command_get_type (void) G_GNUC_CONST; GType page_command_get_type (void) G_GNUC_CONST; GType simple_proxyable_command_get_type (void) G_GNUC_CONST; GType rename_event_command_get_type (void) G_GNUC_CONST; -RenameEventCommand* rename_event_command_new (Event* event, const gchar* new_name); -RenameEventCommand* rename_event_command_construct (GType object_type, Event* event, const gchar* new_name); +RenameEventCommand* rename_event_command_new (Event* event, + const gchar* new_name); +RenameEventCommand* rename_event_command_construct (GType object_type, + Event* event, + const gchar* new_name); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* page_get_command_manager (Page* self); -void command_manager_execute (CommandManager* self, Command* command); +void command_manager_execute (CommandManager* self, + Command* command); gpointer multi_text_entry_dialog_mediator_ref (gpointer instance); void multi_text_entry_dialog_mediator_unref (gpointer instance); -GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object); -void value_take_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object); +GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_multi_text_entry_dialog_mediator (GValue* value, + gpointer v_object); +void value_take_multi_text_entry_dialog_mediator (GValue* value, + gpointer v_object); gpointer value_get_multi_text_entry_dialog_mediator (const GValue* value); GType multi_text_entry_dialog_mediator_get_type (void) G_GNUC_CONST; GType edit_comment_dialog_get_type (void) G_GNUC_CONST; gchar* event_source_get_comment (EventSource* self); -EditCommentDialog* edit_comment_dialog_new (const gchar* comment, gboolean is_event); -EditCommentDialog* edit_comment_dialog_construct (GType object_type, const gchar* comment, gboolean is_event); +EditCommentDialog* edit_comment_dialog_new (const gchar* comment, + gboolean is_event); +EditCommentDialog* edit_comment_dialog_construct (GType object_type, + const gchar* comment, + gboolean is_event); gchar* edit_comment_dialog_execute (EditCommentDialog* self); GType edit_event_comment_command_get_type (void) G_GNUC_CONST; -EditEventCommentCommand* edit_event_comment_command_new (Event* event, const gchar* new_comment); -EditEventCommentCommand* edit_event_comment_command_construct (GType object_type, Event* event, const gchar* new_comment); +EditEventCommentCommand* edit_event_comment_command_new (Event* event, + const gchar* new_comment); +EditEventCommentCommand* edit_event_comment_command_construct (GType object_type, + Event* event, + const gchar* new_comment); GType move_photos_command_get_type (void) G_GNUC_CONST; GType merge_events_command_get_type (void) G_GNUC_CONST; GeeList* view_collection_get_selected (ViewCollection* self); MergeEventsCommand* merge_events_command_new (GeeIterable* iter); -MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterable* iter); -void checkerboard_page_set_display_comments (CheckerboardPage* self, gboolean display); -void configuration_facade_set_display_event_comments (ConfigurationFacade* self, gboolean display); +MergeEventsCommand* merge_events_command_construct (GType object_type, + GeeIterable* iter); +void checkerboard_page_set_display_comments (CheckerboardPage* self, + gboolean display); +void configuration_facade_set_display_event_comments (ConfigurationFacade* self, + gboolean display); static SearchViewFilter* events_directory_page_real_get_search_view_filter (CheckerboardPage* base); GType events_directory_page_event_directory_manager_get_type (void) G_GNUC_CONST; -enum { - EVENTS_DIRECTORY_PAGE_EVENT_DIRECTORY_MANAGER_DUMMY_PROPERTY -}; -static DataView* events_directory_page_event_directory_manager_real_create_view (ViewManager* base, DataSource* source); +static DataView* events_directory_page_event_directory_manager_real_create_view (ViewManager* base, + DataSource* source); EventDirectoryItem* event_directory_item_new (Event* event); -EventDirectoryItem* event_directory_item_construct (GType object_type, Event* event); +EventDirectoryItem* event_directory_item_construct (GType object_type, + Event* event); EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_manager_new (void); EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_manager_construct (GType object_type); ViewManager* view_manager_construct (GType object_type); -enum { - EVENTS_DIRECTORY_PAGE_EVENTS_DIRECTORY_SEARCH_VIEW_FILTER_DUMMY_PROPERTY -}; static guint events_directory_page_events_directory_search_view_filter_real_get_criteria (SearchViewFilter* base); GType search_filter_criteria_get_type (void) G_GNUC_CONST; -static gboolean events_directory_page_events_directory_search_view_filter_real_predicate (ViewFilter* base, DataView* view); +static gboolean events_directory_page_events_directory_search_view_filter_real_predicate (ViewFilter* base, + DataView* view); DataSource* data_view_get_source (DataView* self); gboolean is_string_empty (const gchar* s); const gchar* search_view_filter_get_search_filter (SearchViewFilter* self); GType indexable_get_type (void) G_GNUC_CONST; const gchar* indexable_get_indexable_keywords (Indexable* self); -gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, int* result_length1); +gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, + int* result_length1); SearchViewFilter* search_view_filter_construct (GType object_type); static void events_directory_page_finalize (GObject * obj); GType master_events_directory_page_get_type (void) G_GNUC_CONST; -enum { - MASTER_EVENTS_DIRECTORY_PAGE_DUMMY_PROPERTY -}; #define MASTER_EVENTS_DIRECTORY_PAGE_NAME _ ("All Events") MasterEventsDirectoryPage* master_events_directory_page_new (void); MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_type); GeeCollection* data_collection_get_all (DataCollection* self); GType sub_events_directory_page_get_type (void) G_GNUC_CONST; -enum { - SUB_EVENTS_DIRECTORY_PAGE_DUMMY_PROPERTY -}; GType sub_events_directory_page_directory_type_get_type (void) G_GNUC_CONST; #define SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME _ ("Undated") #define SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT _ ("%Y") #define SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT _ ("%B") -SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, struct tm* time); -SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time); -static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, struct tm* time); -static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time); +SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, + struct tm* time); +SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type, + SubEventsDirectoryPageDirectoryType type, + struct tm* time); +static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, + struct tm* time); +static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_construct (GType object_type, + SubEventsDirectoryPageDirectoryType type, + struct tm* time); static GType sub_events_directory_page_sub_event_directory_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; gint sub_events_directory_page_get_month (SubEventsDirectoryPage* self); static gint sub_events_directory_page_sub_event_directory_manager_get_month (SubEventsDirectoryPageSubEventDirectoryManager* self); @@ -1119,106 +1276,134 @@ static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubE SubEventsDirectoryPageDirectoryType sub_events_directory_page_get_event_directory_type (SubEventsDirectoryPage* self); static SubEventsDirectoryPageDirectoryType sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (SubEventsDirectoryPageSubEventDirectoryManager* self); #define SUB_EVENTS_DIRECTORY_PAGE_SUB_EVENT_DIRECTORY_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManagerPrivate)) -enum { - SUB_EVENTS_DIRECTORY_PAGE_SUB_EVENT_DIRECTORY_MANAGER_DUMMY_PROPERTY -}; -static gboolean sub_events_directory_page_sub_event_directory_manager_real_include_in_view (ViewManager* base, DataSource* source); -gboolean view_manager_include_in_view (ViewManager* self, DataSource* source); +static gboolean sub_events_directory_page_sub_event_directory_manager_real_include_in_view (ViewManager* base, + DataSource* source); +gboolean view_manager_include_in_view (ViewManager* self, + DataSource* source); static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager * obj); static const GActionEntry EVENTS_DIRECTORY_PAGE_entries[4] = {{"Rename", _events_directory_page_on_rename_gsimple_action_activate_callback}, {"Merge", _events_directory_page_on_merge_gsimple_action_activate_callback}, {"EditComment", _events_directory_page_on_edit_comment_gsimple_action_activate_callback}, {"ViewComment", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _events_directory_page_on_display_comments_gsimple_action_change_state_callback}}; -static void _events_directory_page_on_sort_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self) { +static void +_events_directory_page_on_sort_changed_g_simple_action_change_state (GSimpleAction* _sender, + GVariant* value, + gpointer self) +{ #line 77 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_on_sort_changed ((EventsDirectoryPage*) self, _sender, value); -#line 1135 "EventsDirectoryPage.c" +#line 1295 "EventsDirectoryPage.c" } -static void _events_directory_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_events_directory_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_on_rename ((EventsDirectoryPage*) self); -#line 1142 "EventsDirectoryPage.c" +#line 1306 "EventsDirectoryPage.c" } -static void _events_directory_page_on_merge_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_events_directory_page_on_merge_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_on_merge ((EventsDirectoryPage*) self); -#line 1149 "EventsDirectoryPage.c" +#line 1317 "EventsDirectoryPage.c" } -static void _events_directory_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_events_directory_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_on_edit_comment ((EventsDirectoryPage*) self); -#line 1156 "EventsDirectoryPage.c" +#line 1328 "EventsDirectoryPage.c" } -static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" page_on_action_toggle ((Page*) self, action, parameter); -#line 1163 "EventsDirectoryPage.c" +#line 1339 "EventsDirectoryPage.c" } -static void _events_directory_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_events_directory_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_on_display_comments ((EventsDirectoryPage*) self, action, value); -#line 1170 "EventsDirectoryPage.c" +#line 1350 "EventsDirectoryPage.c" } -static gboolean _events_directory_page_event_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) { +static gboolean +_events_directory_page_event_comparator_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self) +{ gboolean result; result = events_directory_page_event_comparator_predicate (object, alteration); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1179 "EventsDirectoryPage.c" +#line 1363 "EventsDirectoryPage.c" } -static gpointer _view_manager_ref0 (gpointer self) { +static gpointer +_view_manager_ref0 (gpointer self) +{ #line 59 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self ? view_manager_ref (self) : NULL; -#line 1186 "EventsDirectoryPage.c" +#line 1372 "EventsDirectoryPage.c" } -EventsDirectoryPage* events_directory_page_construct (GType object_type, const gchar* page_name, ViewManager* view_manager, GeeCollection* initial_events) { +EventsDirectoryPage* +events_directory_page_construct (GType object_type, + const gchar* page_name, + ViewManager* view_manager, + GeeCollection* initial_events) +{ EventsDirectoryPage * self = NULL; - const gchar* _tmp0_; + ViewCollection* _tmp0_; ViewCollection* _tmp1_; - ViewCollection* _tmp2_; + ConfigFacade* _tmp2_; ConfigFacade* _tmp3_; - ConfigFacade* _tmp4_; - gboolean _tmp5_; - void* _tmp6_; - GDestroyNotify _tmp7_; - Comparator _tmp8_; - Comparator _tmp9_; - void* _tmp9__target; - GDestroyNotify _tmp9__target_destroy_notify; - ViewCollection* _tmp10_; - ViewCollection* _tmp11_; - EventSourceCollection* _tmp12_; - ViewManager* _tmp13_; - GeeCollection* _tmp14_; - ViewCollectionMonitor* _tmp15_; - ViewCollectionMonitor* _tmp16_; - ViewCollection* _tmp17_; - ViewCollection* _tmp18_; - ConfigFacade* _tmp19_; - ConfigFacade* _tmp20_; - gboolean _tmp21_; - GValue _tmp22_ = {0}; - ViewManager* _tmp23_; - ViewManager* _tmp24_; + void* _tmp4_; + GDestroyNotify _tmp5_; + Comparator _tmp6_; + Comparator _tmp7_; + void* _tmp7__target; + GDestroyNotify _tmp7__target_destroy_notify; + ViewCollection* _tmp8_; + ViewCollection* _tmp9_; + EventSourceCollection* _tmp10_; + ViewCollectionMonitor* _tmp11_; + ViewCollectionMonitor* _tmp12_; + ViewCollection* _tmp13_; + ViewCollection* _tmp14_; + ConfigFacade* _tmp15_; + ConfigFacade* _tmp16_; + GValue _tmp17_ = {0}; + ViewManager* _tmp18_; GtkToolbar* toolbar = NULL; - GtkToolbar* _tmp25_; + GtkToolbar* _tmp19_; GtkToolButton* merge_button = NULL; - GtkToolButton* _tmp26_; + GtkToolButton* _tmp20_; #line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (page_name != NULL, NULL); #line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1226,103 +1411,91 @@ EventsDirectoryPage* events_directory_page_construct (GType object_type, const g #line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail ((initial_events == NULL) || GEE_IS_COLLECTION (initial_events), NULL); #line 47 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = page_name; -#line 47 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - self = (EventsDirectoryPage*) checkerboard_page_construct (object_type, _tmp0_); -#line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + self = (EventsDirectoryPage*) checkerboard_page_construct (object_type, page_name); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = _tmp1_; + _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = config_facade_get_instance (); + _tmp1_ = _tmp0_; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = _tmp3_; + _tmp2_ = config_facade_get_instance (); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp3_ = _tmp2_; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = events_directory_page_get_event_comparator (_tmp5_, &_tmp6_, &_tmp7_); + _tmp6_ = events_directory_page_get_event_comparator (configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)), &_tmp4_, &_tmp5_); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9__target = _tmp6_; + _tmp7__target = _tmp4_; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9__target_destroy_notify = _tmp7_; + _tmp7__target_destroy_notify = _tmp5_; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), _tmp9_, _tmp6_, _events_directory_page_event_comparator_predicate_comparator_predicate, NULL); + data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), _tmp7_, _tmp4_, _events_directory_page_event_comparator_predicate_comparator_predicate, NULL); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - (_tmp9__target_destroy_notify == NULL) ? NULL : (_tmp9__target_destroy_notify (_tmp9__target), NULL); + (_tmp7__target_destroy_notify == NULL) ? NULL : (_tmp7__target_destroy_notify (_tmp7__target), NULL); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = NULL; + _tmp7_ = NULL; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9__target = NULL; + _tmp7__target = NULL; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9__target_destroy_notify = NULL; + _tmp7__target_destroy_notify = NULL; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _data_collection_unref0 (_tmp2_); -#line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp11_ = _tmp10_; + _data_collection_unref0 (_tmp1_); #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp12_ = event_global; + _tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp13_ = view_manager; + _tmp9_ = _tmp8_; #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp14_ = initial_events; + _tmp10_ = event_global; #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp15_ = view_collection_monitor_source_collection (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp13_, NULL, _tmp14_, NULL, NULL); + _tmp11_ = view_collection_monitor_source_collection (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_SOURCE_COLLECTION, SourceCollection), view_manager, NULL, initial_events, NULL, NULL); #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp16_ = _tmp15_; + _tmp12_ = _tmp11_; #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _view_collection_monitor_unref0 (_tmp16_); + _view_collection_monitor_unref0 (_tmp12_); #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _data_collection_unref0 (_tmp11_); -#line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _data_collection_unref0 (_tmp9_); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp18_ = _tmp17_; + _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp19_ = config_facade_get_instance (); + _tmp14_ = _tmp13_; #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp20_ = _tmp19_; + _tmp15_ = config_facade_get_instance (); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp21_ = configuration_facade_get_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp16_ = _tmp15_; #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_value_init (&_tmp22_, G_TYPE_BOOLEAN); + g_value_init (&_tmp17_, G_TYPE_BOOLEAN); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_value_set_boolean (&_tmp22_, _tmp21_); + g_value_set_boolean (&_tmp17_, configuration_facade_get_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_COLLECTION, DataCollection), EVENT_PROP_SHOW_COMMENTS, &_tmp22_, NULL, NULL); + data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), EVENT_PROP_SHOW_COMMENTS, &_tmp17_, NULL, NULL); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - G_IS_VALUE (&_tmp22_) ? (g_value_unset (&_tmp22_), NULL) : NULL; + G_IS_VALUE (&_tmp17_) ? (g_value_unset (&_tmp17_), NULL) : NULL; #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp16_); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _data_collection_unref0 (_tmp18_); + _data_collection_unref0 (_tmp14_); #line 57 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "EventsDirectoryContextMenu"); #line 59 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp23_ = view_manager; -#line 59 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp24_ = _view_manager_ref0 (_tmp23_); + _tmp18_ = _view_manager_ref0 (view_manager); #line 59 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _view_manager_unref0 (self->view_manager); #line 59 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - self->view_manager = _tmp24_; + self->view_manager = _tmp18_; #line 62 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp25_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp19_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 62 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - toolbar = _tmp25_; + toolbar = _tmp19_; #line 65 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp26_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_MERGE_LABEL); + _tmp20_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_MERGE_LABEL); #line 65 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_object_ref_sink (_tmp26_); + g_object_ref_sink (_tmp20_); #line 65 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - merge_button = _tmp26_; + merge_button = _tmp20_; #line 66 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (merge_button, GTK_TYPE_ACTIONABLE, GtkActionable), "win.Merge"); + gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (merge_button, gtk_actionable_get_type (), GtkActionable), "win.Merge"); #line 67 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (merge_button, gtk_tool_item_get_type (), GtkToolItem), TRUE); #line 68 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1337,241 +1510,225 @@ EventsDirectoryPage* events_directory_page_construct (GType object_type, const g _g_object_unref0 (toolbar); #line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self; -#line 1341 "EventsDirectoryPage.c" +#line 1514 "EventsDirectoryPage.c" } -static void events_directory_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { +static void +events_directory_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames) +{ EventsDirectoryPage * self; - GeeList* _tmp0_; - GeeList* _tmp1_; #line 80 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage); #line 80 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); #line 81 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = ui_filenames; -#line 81 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "events_directory.ui"); -#line 83 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = ui_filenames; + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "events_directory.ui"); #line 83 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - PAGE_CLASS (events_directory_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp1_); -#line 1361 "EventsDirectoryPage.c" + PAGE_CLASS (events_directory_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), ui_filenames); +#line 1531 "EventsDirectoryPage.c" } -gboolean events_directory_page_event_comparator_predicate (DataObject* object, Alteration* alteration) { +gboolean +events_directory_page_event_comparator_predicate (DataObject* object, + Alteration* alteration) +{ gboolean result = FALSE; - Alteration* _tmp0_; - gboolean _tmp1_; #line 86 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 86 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 87 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = alteration; -#line 87 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "time"); -#line 87 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp1_; + result = alteration_has_detail (alteration, "metadata", "time"); #line 87 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1381 "EventsDirectoryPage.c" +#line 1548 "EventsDirectoryPage.c" } -static gint64 events_directory_page_event_ascending_comparator (void* a, void* b) { +static gint64 +events_directory_page_event_ascending_comparator (void* a, + void* b) +{ gint64 result = 0LL; time_t start_a = 0; - void* _tmp0_; - Event* _tmp1_; - time_t _tmp2_; + Event* _tmp0_; time_t start_b = 0; - void* _tmp3_; - Event* _tmp4_; - time_t _tmp5_; -#line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = a; -#line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((EventDirectoryItem*) _tmp0_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem)->event; + Event* _tmp1_; #line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_EVENT_SOURCE, EventSource)); + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST ((EventDirectoryItem*) a, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem)->event; #line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - start_a = _tmp2_; + start_a = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_SOURCE, EventSource)); #line 92 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = b; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((EventDirectoryItem*) b, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem)->event; #line 92 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST ((EventDirectoryItem*) _tmp3_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem)->event; -#line 92 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_EVENT_SOURCE, EventSource)); -#line 92 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - start_b = _tmp5_; + start_b = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_EVENT_SOURCE, EventSource)); #line 94 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = (gint64) (start_a - start_b); #line 94 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1415 "EventsDirectoryPage.c" +#line 1573 "EventsDirectoryPage.c" } -static gint64 events_directory_page_event_descending_comparator (void* a, void* b) { +static gint64 +events_directory_page_event_descending_comparator (void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; - void* _tmp1_; - gint64 _tmp2_; -#line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = b; -#line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = a; #line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = events_directory_page_event_ascending_comparator (_tmp0_, _tmp1_); -#line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp2_; + result = events_directory_page_event_ascending_comparator (b, a); #line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1434 "EventsDirectoryPage.c" +#line 1586 "EventsDirectoryPage.c" } -static gint64 _events_directory_page_event_ascending_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_events_directory_page_event_ascending_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = events_directory_page_event_ascending_comparator (a, b); #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1443 "EventsDirectoryPage.c" +#line 1599 "EventsDirectoryPage.c" } -static gint64 _events_directory_page_event_descending_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_events_directory_page_event_descending_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = events_directory_page_event_descending_comparator (a, b); #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1452 "EventsDirectoryPage.c" +#line 1612 "EventsDirectoryPage.c" } -static Comparator events_directory_page_get_event_comparator (gboolean ascending, void** result_target, GDestroyNotify* result_target_destroy_notify) { +static Comparator +events_directory_page_get_event_comparator (gboolean ascending, + void** result_target, + GDestroyNotify* result_target_destroy_notify) +{ Comparator result = NULL; - gboolean _tmp0_; -#line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = ascending; #line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp0_) { -#line 1463 "EventsDirectoryPage.c" - Comparator _tmp1_; - void* _tmp1__target; - GDestroyNotify _tmp1__target_destroy_notify; + if (ascending) { +#line 1624 "EventsDirectoryPage.c" + Comparator _tmp0_; + void* _tmp0__target; + GDestroyNotify _tmp0__target_destroy_notify; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = _events_directory_page_event_ascending_comparator_comparator; + _tmp0_ = _events_directory_page_event_ascending_comparator_comparator; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1__target = NULL; + _tmp0__target = NULL; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1__target_destroy_notify = NULL; + _tmp0__target_destroy_notify = NULL; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - *result_target = _tmp1__target; + *result_target = _tmp0__target; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - *result_target_destroy_notify = _tmp1__target_destroy_notify; + *result_target_destroy_notify = _tmp0__target_destroy_notify; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp1_; + result = _tmp0_; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1481 "EventsDirectoryPage.c" +#line 1642 "EventsDirectoryPage.c" } else { - Comparator _tmp2_; - void* _tmp2__target; - GDestroyNotify _tmp2__target_destroy_notify; + Comparator _tmp1_; + void* _tmp1__target; + GDestroyNotify _tmp1__target_destroy_notify; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = _events_directory_page_event_descending_comparator_comparator; + _tmp1_ = _events_directory_page_event_descending_comparator_comparator; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2__target = NULL; + _tmp1__target = NULL; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2__target_destroy_notify = NULL; + _tmp1__target_destroy_notify = NULL; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - *result_target = _tmp2__target; + *result_target = _tmp1__target; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - *result_target_destroy_notify = _tmp2__target_destroy_notify; + *result_target_destroy_notify = _tmp1__target_destroy_notify; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp2_; + result = _tmp1_; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1500 "EventsDirectoryPage.c" +#line 1661 "EventsDirectoryPage.c" } } -static GVariant* _variant_new14 (gboolean value) { +static GVariant* +_variant_new14 (gboolean value) +{ #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 1508 "EventsDirectoryPage.c" +#line 1671 "EventsDirectoryPage.c" } -static void events_directory_page_real_add_actions (Page* base, GActionMap* map) { +static void +events_directory_page_real_add_actions (Page* base, + GActionMap* map) +{ EventsDirectoryPage * self; - GActionMap* _tmp0_; - GActionMap* _tmp1_; gboolean display_comments = FALSE; - ConfigFacade* _tmp2_; - ConfigFacade* _tmp3_; - gboolean _tmp4_; - gboolean _tmp5_; - GAction* _tmp6_; - GAction* _tmp7_; - GVariant* _tmp8_; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + gboolean _tmp2_; + GAction* _tmp3_; + GAction* _tmp4_; + GVariant* _tmp5_; #line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage); #line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 118 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = map; -#line 118 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - PAGE_CLASS (events_directory_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); -#line 119 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = map; + PAGE_CLASS (events_directory_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map); #line 119 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_action_map_add_action_entries (_tmp1_, EVENTS_DIRECTORY_PAGE_entries, G_N_ELEMENTS (EVENTS_DIRECTORY_PAGE_entries), self); -#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = config_facade_get_instance (); + g_action_map_add_action_entries (map, EVENTS_DIRECTORY_PAGE_entries, G_N_ELEMENTS (EVENTS_DIRECTORY_PAGE_entries), self); #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_; + _tmp0_ = config_facade_get_instance (); #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = configuration_facade_get_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp1_ = _tmp0_; #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = _tmp4_; + _tmp2_ = configuration_facade_get_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - display_comments = _tmp5_; + display_comments = _tmp2_; #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment"); + _tmp3_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment"); #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = _variant_new14 (display_comments); + _tmp5_ = _variant_new14 (display_comments); #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_action_change_state (_tmp7_, _tmp8_); + g_action_change_state (_tmp4_, _tmp5_); #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_variant_unref0 (_tmp8_); + _g_variant_unref0 (_tmp5_); #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp7_); -#line 1560 "EventsDirectoryPage.c" + _g_object_unref0 (_tmp4_); +#line 1717 "EventsDirectoryPage.c" } -static void events_directory_page_real_remove_actions (Page* base, GActionMap* map) { +static void +events_directory_page_real_remove_actions (Page* base, + GActionMap* map) +{ EventsDirectoryPage * self; - GActionMap* _tmp0_; #line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage); #line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 126 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = map; -#line 126 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - PAGE_CLASS (events_directory_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); -#line 1575 "EventsDirectoryPage.c" + PAGE_CLASS (events_directory_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map); +#line 1732 "EventsDirectoryPage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -1583,99 +1740,85 @@ static void events_directory_page_real_remove_actions (Page* base, GActionMap* m entry_collection_length1 = G_N_ELEMENTS (EVENTS_DIRECTORY_PAGE_entries); #line 127 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (EVENTS_DIRECTORY_PAGE_entries); entry_it = entry_it + 1) { -#line 1587 "EventsDirectoryPage.c" +#line 1744 "EventsDirectoryPage.c" GActionEntry entry = {0}; #line 127 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" entry = entry_collection[entry_it]; -#line 1591 "EventsDirectoryPage.c" +#line 1748 "EventsDirectoryPage.c" { - GActionMap* _tmp1_; - GActionEntry _tmp2_; - const gchar* _tmp3_; -#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = map; + GActionEntry _tmp0_; + const gchar* _tmp1_; #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = entry; + _tmp0_ = entry; #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_.name; + _tmp1_ = _tmp0_.name; #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_action_map_remove_action (_tmp1_, _tmp3_); -#line 1604 "EventsDirectoryPage.c" + g_action_map_remove_action (map, _tmp1_); +#line 1758 "EventsDirectoryPage.c" } } } } -static void events_directory_page_real_init_actions (Page* base, gint selected_count, gint count) { +static void +events_directory_page_real_init_actions (Page* base, + gint selected_count, + gint count) +{ EventsDirectoryPage * self; - gint _tmp0_; - gint _tmp1_; GSimpleAction* action = NULL; - GAction* _tmp2_; - GSimpleAction* _tmp3_; + GAction* _tmp0_; + GSimpleAction* _tmp1_; #line 132 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage); #line 133 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = selected_count; -#line 133 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = count; -#line 133 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - PAGE_CLASS (events_directory_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_, _tmp1_); + PAGE_CLASS (events_directory_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), selected_count, count); #line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSortEvents"); + _tmp0_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSortEvents"); #line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL; + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL; #line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp3_ == NULL) { + if (_tmp1_ == NULL) { #line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp2_); -#line 1634 "EventsDirectoryPage.c" + _g_object_unref0 (_tmp0_); +#line 1786 "EventsDirectoryPage.c" } #line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - action = _tmp3_; + action = _tmp1_; #line 136 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _vala_assert (action != NULL, "action != null"); #line 137 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_signal_connect_object (action, "change-state", (GCallback) _events_directory_page_on_sort_changed_g_simple_action_change_state, self, 0); #line 132 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (action); -#line 1644 "EventsDirectoryPage.c" +#line 1796 "EventsDirectoryPage.c" } -static void events_directory_page_real_update_actions (Page* base, gint selected_count, gint count) { +static void +events_directory_page_real_update_actions (Page* base, + gint selected_count, + gint count) +{ EventsDirectoryPage * self; - gint _tmp0_; - gint _tmp1_; - gint _tmp2_; - gint _tmp3_; - gint _tmp4_; #line 140 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage); #line 141 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = selected_count; -#line 141 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Merge", _tmp0_ > 1); -#line 142 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = selected_count; + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Merge", selected_count > 1); #line 142 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rename", _tmp1_ == 1); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rename", selected_count == 1); #line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = selected_count; -#line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditComment", _tmp2_ == 1); -#line 145 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = selected_count; + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditComment", selected_count == 1); #line 145 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = count; -#line 145 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - PAGE_CLASS (events_directory_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp3_, _tmp4_); -#line 1675 "EventsDirectoryPage.c" + PAGE_CLASS (events_directory_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), selected_count, count); +#line 1816 "EventsDirectoryPage.c" } -static gchar* events_directory_page_real_get_view_empty_message (CheckerboardPage* base) { +static gchar* +events_directory_page_real_get_view_empty_message (CheckerboardPage* base) +{ EventsDirectoryPage * self; gchar* result = NULL; gchar* _tmp0_; @@ -1687,11 +1830,13 @@ static gchar* events_directory_page_real_get_view_empty_message (CheckerboardPag result = _tmp0_; #line 149 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1691 "EventsDirectoryPage.c" +#line 1834 "EventsDirectoryPage.c" } -static gchar* events_directory_page_real_get_filter_no_match_message (CheckerboardPage* base) { +static gchar* +events_directory_page_real_get_filter_no_match_message (CheckerboardPage* base) +{ EventsDirectoryPage * self; gchar* result = NULL; gchar* _tmp0_; @@ -1703,25 +1848,31 @@ static gchar* events_directory_page_real_get_filter_no_match_message (Checkerboa result = _tmp0_; #line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1707 "EventsDirectoryPage.c" +#line 1852 "EventsDirectoryPage.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 158 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self ? g_object_ref (self) : NULL; -#line 1714 "EventsDirectoryPage.c" +#line 1861 "EventsDirectoryPage.c" } -static void events_directory_page_real_on_item_activated (CheckerboardPage* base, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) { +static void +events_directory_page_real_on_item_activated (CheckerboardPage* base, + CheckerboardItem* item, + CheckerboardPageActivator activator, + CheckerboardPageKeyboardModifiers* modifiers) +{ EventsDirectoryPage * self; EventDirectoryItem* event = NULL; - CheckerboardItem* _tmp0_; - EventDirectoryItem* _tmp1_; + EventDirectoryItem* _tmp0_; + LibraryWindow* _tmp1_; LibraryWindow* _tmp2_; - LibraryWindow* _tmp3_; - Event* _tmp4_; + Event* _tmp3_; #line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage); #line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1729,40 +1880,39 @@ static void events_directory_page_real_on_item_activated (CheckerboardPage* base #line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (modifiers != NULL); #line 158 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = item; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (item, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem)); #line 158 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem)); -#line 158 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - event = _tmp1_; + event = _tmp0_; #line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = library_window_get_app (); + _tmp1_ = library_window_get_app (); #line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = event->event; + _tmp3_ = event->event; #line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - library_window_switch_to_event (_tmp3_, _tmp4_); + library_window_switch_to_event (_tmp2_, _tmp3_); #line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (event); -#line 1750 "EventsDirectoryPage.c" +#line 1899 "EventsDirectoryPage.c" } -static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value) { +static void +events_directory_page_on_sort_changed (EventsDirectoryPage* self, + GSimpleAction* action, + GVariant* value) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - GVariant* _tmp2_; - const gchar* _tmp3_; - void* _tmp4_; - GDestroyNotify _tmp5_; + const gchar* _tmp2_; + void* _tmp3_; + GDestroyNotify _tmp4_; + Comparator _tmp5_; Comparator _tmp6_; - Comparator _tmp7_; - void* _tmp7__target; - GDestroyNotify _tmp7__target_destroy_notify; - GSimpleAction* _tmp8_; - GVariant* _tmp9_; + void* _tmp6__target; + GDestroyNotify _tmp6__target_destroy_notify; #line 162 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self)); #line 162 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1772,68 +1922,63 @@ static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GS #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp1_ = _tmp0_; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = value; + _tmp2_ = g_variant_get_string (value, NULL); #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = g_variant_get_string (_tmp2_, NULL); + _tmp5_ = events_directory_page_get_event_comparator (g_strcmp0 (_tmp2_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0, &_tmp3_, &_tmp4_); #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = events_directory_page_get_event_comparator (g_strcmp0 (_tmp3_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0, &_tmp4_, &_tmp5_); + _tmp6_ = _tmp5_; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = _tmp6_; + _tmp6__target = _tmp3_; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7__target = _tmp4_; + _tmp6__target_destroy_notify = _tmp4_; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7__target_destroy_notify = _tmp5_; + data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), _tmp6_, _tmp3_, _events_directory_page_event_comparator_predicate_comparator_predicate, NULL); #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), _tmp7_, _tmp4_, _events_directory_page_event_comparator_predicate_comparator_predicate, NULL); + (_tmp6__target_destroy_notify == NULL) ? NULL : (_tmp6__target_destroy_notify (_tmp6__target), NULL); #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - (_tmp7__target_destroy_notify == NULL) ? NULL : (_tmp7__target_destroy_notify (_tmp7__target), NULL); + _tmp6_ = NULL; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = NULL; + _tmp6__target = NULL; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7__target = NULL; -#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7__target_destroy_notify = NULL; + _tmp6__target_destroy_notify = NULL; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _data_collection_unref0 (_tmp1_); #line 167 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = action; -#line 167 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = value; -#line 167 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_simple_action_set_state (_tmp8_, _tmp9_); -#line 1805 "EventsDirectoryPage.c" + g_simple_action_set_state (action, value); +#line 1949 "EventsDirectoryPage.c" } -static void events_directory_page_on_rename (EventsDirectoryPage* self) { +static void +events_directory_page_on_rename (EventsDirectoryPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; EventDirectoryItem* item = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; - DataView* _tmp6_; - EventDirectoryItem* _tmp7_; + DataView* _tmp5_; + EventDirectoryItem* _tmp6_; EventRenameDialog* rename_dialog = NULL; - EventDirectoryItem* _tmp8_; - Event* _tmp9_; + EventDirectoryItem* _tmp7_; + Event* _tmp8_; + gchar* _tmp9_; gchar* _tmp10_; - gchar* _tmp11_; + EventRenameDialog* _tmp11_; EventRenameDialog* _tmp12_; - EventRenameDialog* _tmp13_; gchar* new_name = NULL; - EventRenameDialog* _tmp14_; - gchar* _tmp15_; - const gchar* _tmp16_; + EventRenameDialog* _tmp13_; + gchar* _tmp14_; + const gchar* _tmp15_; RenameEventCommand* command = NULL; - EventDirectoryItem* _tmp17_; - Event* _tmp18_; - const gchar* _tmp19_; - RenameEventCommand* _tmp20_; + EventDirectoryItem* _tmp16_; + Event* _tmp17_; + const gchar* _tmp18_; + RenameEventCommand* _tmp19_; + CommandManager* _tmp20_; CommandManager* _tmp21_; - CommandManager* _tmp22_; - RenameEventCommand* _tmp23_; + RenameEventCommand* _tmp22_; #line 170 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self)); #line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1841,55 +1986,53 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) { #line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp1_ = _tmp0_; #line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_ != 1; + _tmp2_ = view_collection_get_selected_count (_tmp1_) != 1; #line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _data_collection_unref0 (_tmp1_); #line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return; -#line 1854 "EventsDirectoryPage.c" +#line 1997 "EventsDirectoryPage.c" } #line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = view_collection_get_selected_at (_tmp5_, 0); + _tmp5_ = view_collection_get_selected_at (_tmp4_, 0); #line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); #line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - item = _tmp7_; + item = _tmp6_; #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = item; + _tmp7_ = item; #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = _tmp8_->event; + _tmp8_ = _tmp7_->event; #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp10_ = event_get_raw_name (_tmp9_); + _tmp9_ = event_get_raw_name (_tmp8_); #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp12_ = event_rename_dialog_new (_tmp11_); + _tmp11_ = event_rename_dialog_new (_tmp10_); #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp10_); #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - rename_dialog = _tmp13_; + rename_dialog = _tmp12_; #line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp14_ = rename_dialog; + _tmp13_ = rename_dialog; #line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp15_ = event_rename_dialog_execute (_tmp14_); + _tmp14_ = event_rename_dialog_execute (_tmp13_); #line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - new_name = _tmp15_; + new_name = _tmp14_; #line 179 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp16_ = new_name; + _tmp15_ = new_name; #line 179 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp16_ == NULL) { + if (_tmp15_ == NULL) { #line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_free0 (new_name); #line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1898,28 +2041,28 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) { _g_object_unref0 (item); #line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return; -#line 1902 "EventsDirectoryPage.c" +#line 2045 "EventsDirectoryPage.c" } #line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp17_ = item; + _tmp16_ = item; #line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp18_ = _tmp17_->event; + _tmp17_ = _tmp16_->event; #line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp19_ = new_name; + _tmp18_ = new_name; #line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp20_ = rename_event_command_new (_tmp18_, _tmp19_); + _tmp19_ = rename_event_command_new (_tmp17_, _tmp18_); #line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - command = _tmp20_; + command = _tmp19_; #line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp23_ = command; + _tmp22_ = command; #line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command)); #line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _command_manager_unref0 (_tmp22_); + _command_manager_unref0 (_tmp21_); #line 170 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (command); #line 170 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1928,39 +2071,40 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) { _text_entry_dialog_mediator_unref0 (rename_dialog); #line 170 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (item); -#line 1932 "EventsDirectoryPage.c" +#line 2075 "EventsDirectoryPage.c" } -void events_directory_page_on_edit_comment (EventsDirectoryPage* self) { +void +events_directory_page_on_edit_comment (EventsDirectoryPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; EventDirectoryItem* item = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; - DataView* _tmp6_; - EventDirectoryItem* _tmp7_; + DataView* _tmp5_; + EventDirectoryItem* _tmp6_; EditCommentDialog* edit_comment_dialog = NULL; - EventDirectoryItem* _tmp8_; - Event* _tmp9_; + EventDirectoryItem* _tmp7_; + Event* _tmp8_; + gchar* _tmp9_; gchar* _tmp10_; - gchar* _tmp11_; + EditCommentDialog* _tmp11_; EditCommentDialog* _tmp12_; - EditCommentDialog* _tmp13_; gchar* new_comment = NULL; - EditCommentDialog* _tmp14_; - gchar* _tmp15_; - const gchar* _tmp16_; + EditCommentDialog* _tmp13_; + gchar* _tmp14_; + const gchar* _tmp15_; EditEventCommentCommand* command = NULL; - EventDirectoryItem* _tmp17_; - Event* _tmp18_; - const gchar* _tmp19_; - EditEventCommentCommand* _tmp20_; + EventDirectoryItem* _tmp16_; + Event* _tmp17_; + const gchar* _tmp18_; + EditEventCommentCommand* _tmp19_; + CommandManager* _tmp20_; CommandManager* _tmp21_; - CommandManager* _tmp22_; - EditEventCommentCommand* _tmp23_; + EditEventCommentCommand* _tmp22_; #line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self)); #line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1968,55 +2112,53 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) { #line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp1_ = _tmp0_; #line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_ != 1; + _tmp2_ = view_collection_get_selected_count (_tmp1_) != 1; #line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _data_collection_unref0 (_tmp1_); #line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return; -#line 1981 "EventsDirectoryPage.c" +#line 2123 "EventsDirectoryPage.c" } #line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = view_collection_get_selected_at (_tmp5_, 0); + _tmp5_ = view_collection_get_selected_at (_tmp4_, 0); #line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); #line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - item = _tmp7_; + item = _tmp6_; #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = item; + _tmp7_ = item; #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = _tmp8_->event; + _tmp8_ = _tmp7_->event; #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp10_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_EVENT_SOURCE, EventSource)); + _tmp9_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_EVENT_SOURCE, EventSource)); #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp12_ = edit_comment_dialog_new (_tmp11_, FALSE); + _tmp11_ = edit_comment_dialog_new (_tmp10_, FALSE); #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp10_); #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - edit_comment_dialog = _tmp13_; + edit_comment_dialog = _tmp12_; #line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp14_ = edit_comment_dialog; + _tmp13_ = edit_comment_dialog; #line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp15_ = edit_comment_dialog_execute (_tmp14_); + _tmp14_ = edit_comment_dialog_execute (_tmp13_); #line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - new_comment = _tmp15_; + new_comment = _tmp14_; #line 195 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp16_ = new_comment; + _tmp15_ = new_comment; #line 195 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp16_ == NULL) { + if (_tmp15_ == NULL) { #line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_free0 (new_comment); #line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2025,28 +2167,28 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) { _g_object_unref0 (item); #line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return; -#line 2029 "EventsDirectoryPage.c" +#line 2171 "EventsDirectoryPage.c" } #line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp17_ = item; + _tmp16_ = item; #line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp18_ = _tmp17_->event; + _tmp17_ = _tmp16_->event; #line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp19_ = new_comment; + _tmp18_ = new_comment; #line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp20_ = edit_event_comment_command_new (_tmp18_, _tmp19_); + _tmp19_ = edit_event_comment_command_new (_tmp17_, _tmp18_); #line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - command = _tmp20_; + command = _tmp19_; #line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp23_ = command; + _tmp22_ = command; #line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command)); #line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _command_manager_unref0 (_tmp22_); + _command_manager_unref0 (_tmp21_); #line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (command); #line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2055,25 +2197,26 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) { _multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog); #line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (item); -#line 2059 "EventsDirectoryPage.c" +#line 2201 "EventsDirectoryPage.c" } -static void events_directory_page_on_merge (EventsDirectoryPage* self) { +static void +events_directory_page_on_merge (EventsDirectoryPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; MergeEventsCommand* command = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + GeeList* _tmp5_; GeeList* _tmp6_; - GeeList* _tmp7_; + MergeEventsCommand* _tmp7_; MergeEventsCommand* _tmp8_; - MergeEventsCommand* _tmp9_; + CommandManager* _tmp9_; CommandManager* _tmp10_; - CommandManager* _tmp11_; - MergeEventsCommand* _tmp12_; + MergeEventsCommand* _tmp11_; #line 202 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self)); #line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2081,97 +2224,91 @@ static void events_directory_page_on_merge (EventsDirectoryPage* self) { #line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp1_ = _tmp0_; #line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_ <= 1; + _tmp2_ = view_collection_get_selected_count (_tmp1_) <= 1; #line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _data_collection_unref0 (_tmp1_); #line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return; -#line 2094 "EventsDirectoryPage.c" +#line 2235 "EventsDirectoryPage.c" } #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = view_collection_get_selected (_tmp5_); + _tmp5_ = view_collection_get_selected (_tmp4_); #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = merge_events_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = merge_events_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - command = _tmp9_; + command = _tmp8_; #line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp12_ = command; + _tmp11_ = command; #line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); #line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _command_manager_unref0 (_tmp11_); + _command_manager_unref0 (_tmp10_); #line 202 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (command); -#line 2126 "EventsDirectoryPage.c" +#line 2267 "EventsDirectoryPage.c" } -static void events_directory_page_on_display_comments (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value) { +static void +events_directory_page_on_display_comments (EventsDirectoryPage* self, + GSimpleAction* action, + GVariant* value) +{ gboolean display = FALSE; - GVariant* _tmp0_; - gboolean _tmp1_; - ConfigFacade* _tmp2_; - ConfigFacade* _tmp3_; - GSimpleAction* _tmp4_; - GVariant* _tmp5_; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; #line 210 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self)); #line 210 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); #line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = value; -#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - display = _tmp1_; + display = g_variant_get_boolean (value); #line 213 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" checkerboard_page_set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display); #line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = config_facade_get_instance (); + _tmp0_ = config_facade_get_instance (); #line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - configuration_facade_set_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display); + configuration_facade_set_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display); #line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp3_); -#line 217 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = action; + _g_object_unref0 (_tmp1_); #line 217 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = value; -#line 217 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_simple_action_set_state (_tmp4_, _tmp5_); -#line 2164 "EventsDirectoryPage.c" + g_simple_action_set_state (action, value); +#line 2297 "EventsDirectoryPage.c" } -static gpointer _view_filter_ref0 (gpointer self) { +static gpointer +_view_filter_ref0 (gpointer self) +{ #line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self ? view_filter_ref (self) : NULL; -#line 2171 "EventsDirectoryPage.c" +#line 2306 "EventsDirectoryPage.c" } -static SearchViewFilter* events_directory_page_real_get_search_view_filter (CheckerboardPage* base) { +static SearchViewFilter* +events_directory_page_real_get_search_view_filter (CheckerboardPage* base) +{ EventsDirectoryPage * self; SearchViewFilter* result = NULL; EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_; @@ -2186,62 +2323,72 @@ static SearchViewFilter* events_directory_page_real_get_search_view_filter (Chec result = _tmp1_; #line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2190 "EventsDirectoryPage.c" +#line 2327 "EventsDirectoryPage.c" } -static DataView* events_directory_page_event_directory_manager_real_create_view (ViewManager* base, DataSource* source) { +static DataView* +events_directory_page_event_directory_manager_real_create_view (ViewManager* base, + DataSource* source) +{ EventsDirectoryPageEventDirectoryManager * self; DataView* result = NULL; - DataSource* _tmp0_; - EventDirectoryItem* _tmp1_; + EventDirectoryItem* _tmp0_; #line 9 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER, EventsDirectoryPageEventDirectoryManager); #line 9 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 10 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = source; + _tmp0_ = event_directory_item_new (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_EVENT, Event)); #line 10 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = event_directory_item_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event)); -#line 10 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView); #line 10 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2211 "EventsDirectoryPage.c" +#line 2348 "EventsDirectoryPage.c" } -EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_manager_construct (GType object_type) { +EventsDirectoryPageEventDirectoryManager* +events_directory_page_event_directory_manager_construct (GType object_type) +{ EventsDirectoryPageEventDirectoryManager* self = NULL; #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = (EventsDirectoryPageEventDirectoryManager*) view_manager_construct (object_type); #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self; -#line 2221 "EventsDirectoryPage.c" +#line 2360 "EventsDirectoryPage.c" } -EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_manager_new (void) { +EventsDirectoryPageEventDirectoryManager* +events_directory_page_event_directory_manager_new (void) +{ #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return events_directory_page_event_directory_manager_construct (EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER); -#line 2228 "EventsDirectoryPage.c" +#line 2369 "EventsDirectoryPage.c" } -static void events_directory_page_event_directory_manager_class_init (EventsDirectoryPageEventDirectoryManagerClass * klass) { +static void +events_directory_page_event_directory_manager_class_init (EventsDirectoryPageEventDirectoryManagerClass * klass) +{ #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_event_directory_manager_parent_class = g_type_class_peek_parent (klass); #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" ((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) events_directory_page_event_directory_manager_real_create_view; -#line 2237 "EventsDirectoryPage.c" +#line 2380 "EventsDirectoryPage.c" } -static void events_directory_page_event_directory_manager_instance_init (EventsDirectoryPageEventDirectoryManager * self) { +static void +events_directory_page_event_directory_manager_instance_init (EventsDirectoryPageEventDirectoryManager * self) +{ } -GType events_directory_page_event_directory_manager_get_type (void) { +GType +events_directory_page_event_directory_manager_get_type (void) +{ static volatile gsize events_directory_page_event_directory_manager_type_id__volatile = 0; if (g_once_init_enter (&events_directory_page_event_directory_manager_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsDirectoryPageEventDirectoryManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_directory_page_event_directory_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsDirectoryPageEventDirectoryManager), 0, (GInstanceInitFunc) events_directory_page_event_directory_manager_instance_init, NULL }; @@ -2253,7 +2400,9 @@ GType events_directory_page_event_directory_manager_get_type (void) { } -static guint events_directory_page_events_directory_search_view_filter_real_get_criteria (SearchViewFilter* base) { +static guint +events_directory_page_events_directory_search_view_filter_real_get_criteria (SearchViewFilter* base) +{ EventsDirectoryPageEventsDirectorySearchViewFilter * self; guint result = 0U; #line 15 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2262,138 +2411,126 @@ static guint events_directory_page_events_directory_search_view_filter_real_get_ result = (guint) SEARCH_FILTER_CRITERIA_TEXT; #line 16 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2266 "EventsDirectoryPage.c" +#line 2415 "EventsDirectoryPage.c" } -static gboolean string_contains (const gchar* self, const gchar* needle) { +static gboolean +string_contains (const gchar* self, + const gchar* needle) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gchar* _tmp1_; -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = needle; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_ != NULL; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = strstr ((gchar*) self, (gchar*) needle); +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_ != NULL; +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2286 "EventsDirectoryPage.c" +#line 2435 "EventsDirectoryPage.c" } -static gboolean events_directory_page_events_directory_search_view_filter_real_predicate (ViewFilter* base, DataView* view) { +static gboolean +events_directory_page_events_directory_search_view_filter_real_predicate (ViewFilter* base, + DataView* view) +{ EventsDirectoryPageEventsDirectorySearchViewFilter * self; gboolean result = FALSE; - DataView* _tmp0_; + DataSource* _tmp0_; DataSource* _tmp1_; - DataSource* _tmp2_; - const gchar* _tmp3_; - gboolean _tmp4_; + const gchar* _tmp2_; Event* source = NULL; - DataView* _tmp5_; - DataSource* _tmp6_; + DataSource* _tmp3_; const gchar* event_keywords = NULL; - Event* _tmp7_; - const gchar* _tmp8_; - const gchar* _tmp9_; - gboolean _tmp10_; - gint _tmp11_; - gchar** _tmp12_; + Event* _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; + gint _tmp7_; + gchar** _tmp8_; #line 19 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_DIRECTORY_PAGE_TYPE_EVENTS_DIRECTORY_SEARCH_VIEW_FILTER, EventsDirectoryPageEventsDirectorySearchViewFilter); #line 19 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (IS_DATA_VIEW (view), FALSE); #line 20 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = view; + _tmp0_ = data_view_get_source (view); #line 20 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = data_view_get_source (_tmp0_); -#line 20 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 20 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_EVENT), "view.get_source() is Event"); + _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_EVENT), "view.get_source() is Event"); #line 20 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp2_); -#line 21 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = search_view_filter_get_search_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); + _g_object_unref0 (_tmp1_); #line 21 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = is_string_empty (_tmp3_); + _tmp2_ = search_view_filter_get_search_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 21 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp4_) { + if (is_string_empty (_tmp2_)) { #line 22 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = TRUE; #line 22 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2332 "EventsDirectoryPage.c" +#line 2476 "EventsDirectoryPage.c" } #line 24 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = view; + _tmp3_ = data_view_get_source (view); #line 24 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = data_view_get_source (_tmp5_); -#line 24 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - source = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT, Event); + source = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_EVENT, Event); #line 25 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = source; + _tmp4_ = source; #line 25 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_INDEXABLE, Indexable)); + _tmp5_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_INDEXABLE, Indexable)); #line 25 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - event_keywords = _tmp8_; -#line 26 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = event_keywords; + event_keywords = _tmp5_; #line 26 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp10_ = is_string_empty (_tmp9_); + _tmp6_ = event_keywords; #line 26 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp10_) { + if (is_string_empty (_tmp6_)) { #line 27 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = FALSE; #line 27 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (source); #line 27 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2358 "EventsDirectoryPage.c" +#line 2498 "EventsDirectoryPage.c" } #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp12_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp11_); -#line 2362 "EventsDirectoryPage.c" + _tmp8_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp7_); +#line 2502 "EventsDirectoryPage.c" { gchar** word_collection = NULL; gint word_collection_length1 = 0; gint _word_collection_size_ = 0; gint word_it = 0; #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - word_collection = _tmp12_; + word_collection = _tmp8_; #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - word_collection_length1 = _tmp11_; + word_collection_length1 = _tmp7_; #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - for (word_it = 0; word_it < _tmp11_; word_it = word_it + 1) { -#line 2374 "EventsDirectoryPage.c" + for (word_it = 0; word_it < _tmp7_; word_it = word_it + 1) { +#line 2514 "EventsDirectoryPage.c" const gchar* word = NULL; #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" word = word_collection[word_it]; -#line 2378 "EventsDirectoryPage.c" +#line 2518 "EventsDirectoryPage.c" { - const gchar* _tmp13_; - const gchar* _tmp14_; - gboolean _tmp15_; + const gchar* _tmp9_; + const gchar* _tmp10_; #line 31 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp13_ = event_keywords; + _tmp9_ = event_keywords; #line 31 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp14_ = word; + _tmp10_ = word; #line 31 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp15_ = string_contains (_tmp13_, _tmp14_); -#line 31 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (!_tmp15_) { + if (!string_contains (_tmp9_, _tmp10_)) { #line 32 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = FALSE; #line 32 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (source); #line 32 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2397 "EventsDirectoryPage.c" +#line 2534 "EventsDirectoryPage.c" } } } @@ -2404,43 +2541,53 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p _g_object_unref0 (source); #line 35 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2408 "EventsDirectoryPage.c" +#line 2545 "EventsDirectoryPage.c" } -static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page_events_directory_search_view_filter_construct (GType object_type) { +static EventsDirectoryPageEventsDirectorySearchViewFilter* +events_directory_page_events_directory_search_view_filter_construct (GType object_type) +{ EventsDirectoryPageEventsDirectorySearchViewFilter* self = NULL; #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = (EventsDirectoryPageEventsDirectorySearchViewFilter*) search_view_filter_construct (object_type); #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self; -#line 2418 "EventsDirectoryPage.c" +#line 2557 "EventsDirectoryPage.c" } -static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page_events_directory_search_view_filter_new (void) { +static EventsDirectoryPageEventsDirectorySearchViewFilter* +events_directory_page_events_directory_search_view_filter_new (void) +{ #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return events_directory_page_events_directory_search_view_filter_construct (EVENTS_DIRECTORY_PAGE_TYPE_EVENTS_DIRECTORY_SEARCH_VIEW_FILTER); -#line 2425 "EventsDirectoryPage.c" +#line 2566 "EventsDirectoryPage.c" } -static void events_directory_page_events_directory_search_view_filter_class_init (EventsDirectoryPageEventsDirectorySearchViewFilterClass * klass) { +static void +events_directory_page_events_directory_search_view_filter_class_init (EventsDirectoryPageEventsDirectorySearchViewFilterClass * klass) +{ #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_events_directory_search_view_filter_parent_class = g_type_class_peek_parent (klass); #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" ((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) events_directory_page_events_directory_search_view_filter_real_get_criteria; #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" ((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) events_directory_page_events_directory_search_view_filter_real_predicate; -#line 2436 "EventsDirectoryPage.c" +#line 2579 "EventsDirectoryPage.c" } -static void events_directory_page_events_directory_search_view_filter_instance_init (EventsDirectoryPageEventsDirectorySearchViewFilter * self) { +static void +events_directory_page_events_directory_search_view_filter_instance_init (EventsDirectoryPageEventsDirectorySearchViewFilter * self) +{ } -static GType events_directory_page_events_directory_search_view_filter_get_type (void) { +static GType +events_directory_page_events_directory_search_view_filter_get_type (void) +{ static volatile gsize events_directory_page_events_directory_search_view_filter_type_id__volatile = 0; if (g_once_init_enter (&events_directory_page_events_directory_search_view_filter_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsDirectoryPageEventsDirectorySearchViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_directory_page_events_directory_search_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsDirectoryPageEventsDirectorySearchViewFilter), 0, (GInstanceInitFunc) events_directory_page_events_directory_search_view_filter_instance_init, NULL }; @@ -2452,7 +2599,9 @@ static GType events_directory_page_events_directory_search_view_filter_get_type } -static void events_directory_page_class_init (EventsDirectoryPageClass * klass) { +static void +events_directory_page_class_init (EventsDirectoryPageClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2477,11 +2626,13 @@ static void events_directory_page_class_init (EventsDirectoryPageClass * klass) ((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) events_directory_page_real_get_search_view_filter; #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" G_OBJECT_CLASS (klass)->finalize = events_directory_page_finalize; -#line 2481 "EventsDirectoryPage.c" +#line 2630 "EventsDirectoryPage.c" } -static void events_directory_page_instance_init (EventsDirectoryPage * self) { +static void +events_directory_page_instance_init (EventsDirectoryPage * self) +{ EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self->priv = EVENTS_DIRECTORY_PAGE_GET_PRIVATE (self); @@ -2489,11 +2640,13 @@ static void events_directory_page_instance_init (EventsDirectoryPage * self) { _tmp0_ = events_directory_page_events_directory_search_view_filter_new (); #line 43 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self->priv->search_filter = _tmp0_; -#line 2493 "EventsDirectoryPage.c" +#line 2644 "EventsDirectoryPage.c" } -static void events_directory_page_finalize (GObject * obj) { +static void +events_directory_page_finalize (GObject * obj) +{ EventsDirectoryPage * self; GSimpleAction* action = NULL; GAction* _tmp0_; @@ -2511,7 +2664,7 @@ static void events_directory_page_finalize (GObject * obj) { if (_tmp1_ == NULL) { #line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (_tmp0_); -#line 2515 "EventsDirectoryPage.c" +#line 2668 "EventsDirectoryPage.c" } #line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" action = _tmp1_; @@ -2533,11 +2686,13 @@ static void events_directory_page_finalize (GObject * obj) { _view_filter_unref0 (self->priv->search_filter); #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" G_OBJECT_CLASS (events_directory_page_parent_class)->finalize (obj); -#line 2537 "EventsDirectoryPage.c" +#line 2690 "EventsDirectoryPage.c" } -GType events_directory_page_get_type (void) { +GType +events_directory_page_get_type (void) +{ static volatile gsize events_directory_page_type_id__volatile = 0; if (g_once_init_enter (&events_directory_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsDirectoryPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_directory_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsDirectoryPage), 0, (GInstanceInitFunc) events_directory_page_instance_init, NULL }; @@ -2549,7 +2704,9 @@ GType events_directory_page_get_type (void) { } -MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_type) { +MasterEventsDirectoryPage* +master_events_directory_page_construct (GType object_type) +{ MasterEventsDirectoryPage * self = NULL; EventsDirectoryPageEventDirectoryManager* _tmp0_; EventsDirectoryPageEventDirectoryManager* _tmp1_; @@ -2574,29 +2731,37 @@ MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_ _view_manager_unref0 (_tmp1_); #line 228 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self; -#line 2578 "EventsDirectoryPage.c" +#line 2735 "EventsDirectoryPage.c" } -MasterEventsDirectoryPage* master_events_directory_page_new (void) { +MasterEventsDirectoryPage* +master_events_directory_page_new (void) +{ #line 228 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return master_events_directory_page_construct (TYPE_MASTER_EVENTS_DIRECTORY_PAGE); -#line 2585 "EventsDirectoryPage.c" +#line 2744 "EventsDirectoryPage.c" } -static void master_events_directory_page_class_init (MasterEventsDirectoryPageClass * klass) { +static void +master_events_directory_page_class_init (MasterEventsDirectoryPageClass * klass) +{ #line 225 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" master_events_directory_page_parent_class = g_type_class_peek_parent (klass); -#line 2592 "EventsDirectoryPage.c" +#line 2753 "EventsDirectoryPage.c" } -static void master_events_directory_page_instance_init (MasterEventsDirectoryPage * self) { +static void +master_events_directory_page_instance_init (MasterEventsDirectoryPage * self) +{ } -GType master_events_directory_page_get_type (void) { +GType +master_events_directory_page_get_type (void) +{ static volatile gsize master_events_directory_page_type_id__volatile = 0; if (g_once_init_enter (&master_events_directory_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MasterEventsDirectoryPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) master_events_directory_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MasterEventsDirectoryPage), 0, (GInstanceInitFunc) master_events_directory_page_instance_init, NULL }; @@ -2608,7 +2773,9 @@ GType master_events_directory_page_get_type (void) { } -GType sub_events_directory_page_directory_type_get_type (void) { +GType +sub_events_directory_page_directory_type_get_type (void) +{ static volatile gsize sub_events_directory_page_directory_type_type_id__volatile = 0; if (g_once_init_enter (&sub_events_directory_page_directory_type_type_id__volatile)) { static const GEnumValue values[] = {{SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR, "SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR", "year"}, {SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH, "SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH", "month"}, {SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED, "SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED", "undated"}, {0, NULL, NULL}}; @@ -2620,7 +2787,10 @@ GType sub_events_directory_page_directory_type_get_type (void) { } -static gchar* g_time_format (struct tm *self, const gchar* format) { +static gchar* +g_time_format (struct tm *self, + const gchar* format) +{ gchar* result = NULL; gchar* buffer = NULL; gchar* _tmp0_; @@ -2628,314 +2798,301 @@ static gchar* g_time_format (struct tm *self, const gchar* format) { gint _buffer_size_; gchar* _tmp1_; gint _tmp1__length1; - const gchar* _tmp2_; + gchar* _tmp2_; + gint _tmp2__length1; gchar* _tmp3_; - gint _tmp3__length1; - gchar* _tmp4_; -#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2874 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (format != NULL, NULL); -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_new0 (gchar, 64); -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer = _tmp0_; -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer_length1 = 64; -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _buffer_size_ = buffer_length1; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = buffer; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1__length1 = buffer_length1; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = format; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self)); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = buffer; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3__length1 = buffer_length1; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = g_strdup ((const gchar*) _tmp3_); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + strftime (_tmp1_, _tmp1__length1, format, &(*self)); +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = buffer; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2__length1 = buffer_length1; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_strdup ((const gchar*) _tmp2_); +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp3_; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer = (g_free (buffer), NULL); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2666 "EventsDirectoryPage.c" +#line 2833 "EventsDirectoryPage.c" } -SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time) { +SubEventsDirectoryPage* +sub_events_directory_page_construct (GType object_type, + SubEventsDirectoryPageDirectoryType type, + struct tm* time) +{ SubEventsDirectoryPage * self = NULL; gchar* page_name = NULL; - SubEventsDirectoryPageDirectoryType _tmp0_; - const gchar* _tmp5_; - SubEventsDirectoryPageDirectoryType _tmp6_; - struct tm _tmp7_; - SubEventsDirectoryPageSubEventDirectoryManager* _tmp8_; - SubEventsDirectoryPageSubEventDirectoryManager* _tmp9_; + const gchar* _tmp3_; + struct tm _tmp4_; + SubEventsDirectoryPageSubEventDirectoryManager* _tmp5_; + SubEventsDirectoryPageSubEventDirectoryManager* _tmp6_; #line 286 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (time != NULL, NULL); #line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = type; -#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED) { -#line 2685 "EventsDirectoryPage.c" - gchar* _tmp1_; + if (type == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED) { +#line 2852 "EventsDirectoryPage.c" + gchar* _tmp0_; #line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = g_strdup (SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME); + _tmp0_ = g_strdup (SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME); #line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_free0 (page_name); #line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - page_name = _tmp1_; -#line 2693 "EventsDirectoryPage.c" + page_name = _tmp0_; +#line 2860 "EventsDirectoryPage.c" } else { - const gchar* _tmp2_ = NULL; - SubEventsDirectoryPageDirectoryType _tmp3_; - gchar* _tmp4_; -#line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = type; + const gchar* _tmp1_ = NULL; + gchar* _tmp2_; #line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp3_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR) { + if (type == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR) { #line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT; -#line 2704 "EventsDirectoryPage.c" + _tmp1_ = SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT; +#line 2868 "EventsDirectoryPage.c" } else { #line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT; -#line 2708 "EventsDirectoryPage.c" + _tmp1_ = SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT; +#line 2872 "EventsDirectoryPage.c" } #line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = g_time_format (time, _tmp2_); + _tmp2_ = g_time_format (time, _tmp1_); #line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_free0 (page_name); #line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - page_name = _tmp4_; -#line 2716 "EventsDirectoryPage.c" + page_name = _tmp2_; +#line 2880 "EventsDirectoryPage.c" } #line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = page_name; + _tmp3_ = page_name; #line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = type; -#line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = *time; + _tmp4_ = *time; #line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = sub_events_directory_page_sub_event_directory_manager_new (_tmp6_, &_tmp7_); + _tmp5_ = sub_events_directory_page_sub_event_directory_manager_new (type, &_tmp4_); #line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - self = (SubEventsDirectoryPage*) events_directory_page_construct (object_type, _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIEW_MANAGER, ViewManager), NULL); + self = (SubEventsDirectoryPage*) events_directory_page_construct (object_type, _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_VIEW_MANAGER, ViewManager), NULL); #line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _view_manager_unref0 (_tmp9_); + _view_manager_unref0 (_tmp6_); #line 286 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_free0 (page_name); #line 286 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self; -#line 2736 "EventsDirectoryPage.c" +#line 2898 "EventsDirectoryPage.c" } -SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) { +SubEventsDirectoryPage* +sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, + struct tm* time) +{ #line 286 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return sub_events_directory_page_construct (TYPE_SUB_EVENTS_DIRECTORY_PAGE, type, time); -#line 2743 "EventsDirectoryPage.c" +#line 2908 "EventsDirectoryPage.c" } -gint sub_events_directory_page_get_month (SubEventsDirectoryPage* self) { +gint +sub_events_directory_page_get_month (SubEventsDirectoryPage* self) +{ gint result = 0; ViewManager* _tmp0_; - gint _tmp1_; #line 297 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0); #line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager; #line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = sub_events_directory_page_sub_event_directory_manager_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager)); -#line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp1_; + result = sub_events_directory_page_sub_event_directory_manager_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager)); #line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2761 "EventsDirectoryPage.c" +#line 2925 "EventsDirectoryPage.c" } -gint sub_events_directory_page_get_year (SubEventsDirectoryPage* self) { +gint +sub_events_directory_page_get_year (SubEventsDirectoryPage* self) +{ gint result = 0; ViewManager* _tmp0_; - gint _tmp1_; #line 301 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0); #line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager; #line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = sub_events_directory_page_sub_event_directory_manager_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager)); -#line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp1_; + result = sub_events_directory_page_sub_event_directory_manager_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager)); #line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2779 "EventsDirectoryPage.c" +#line 2942 "EventsDirectoryPage.c" } -SubEventsDirectoryPageDirectoryType sub_events_directory_page_get_event_directory_type (SubEventsDirectoryPage* self) { +SubEventsDirectoryPageDirectoryType +sub_events_directory_page_get_event_directory_type (SubEventsDirectoryPage* self) +{ SubEventsDirectoryPageDirectoryType result = 0; ViewManager* _tmp0_; - SubEventsDirectoryPageDirectoryType _tmp1_; #line 305 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0); #line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager; #line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager)); -#line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp1_; + result = sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager)); #line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2797 "EventsDirectoryPage.c" +#line 2959 "EventsDirectoryPage.c" } -static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time) { +static SubEventsDirectoryPageSubEventDirectoryManager* +sub_events_directory_page_sub_event_directory_manager_construct (GType object_type, + SubEventsDirectoryPageDirectoryType type, + struct tm* time) +{ SubEventsDirectoryPageSubEventDirectoryManager* self = NULL; - SubEventsDirectoryPageDirectoryType _tmp0_; - SubEventsDirectoryPageDirectoryType _tmp3_; - struct tm _tmp4_; - gint _tmp5_; + struct tm _tmp2_; + gint _tmp3_; #line 249 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (time != NULL, NULL); #line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = (SubEventsDirectoryPageSubEventDirectoryManager*) events_directory_page_event_directory_manager_construct (object_type); #line 252 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = type; -#line 252 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) { -#line 2815 "EventsDirectoryPage.c" - struct tm _tmp1_; - gint _tmp2_; + if (type == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) { +#line 2977 "EventsDirectoryPage.c" + struct tm _tmp0_; + gint _tmp1_; #line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = *time; + _tmp0_ = *time; #line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = _tmp1_.tm_mon; + _tmp1_ = _tmp0_.tm_mon; #line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - self->priv->month = _tmp2_; -#line 2824 "EventsDirectoryPage.c" + self->priv->month = _tmp1_; +#line 2986 "EventsDirectoryPage.c" } #line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = type; -#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - self->priv->type = _tmp3_; + self->priv->type = type; #line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = *time; + _tmp2_ = *time; #line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = _tmp4_.tm_year; + _tmp3_ = _tmp2_.tm_year; #line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - self->priv->year = _tmp5_; + self->priv->year = _tmp3_; #line 249 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self; -#line 2838 "EventsDirectoryPage.c" +#line 2998 "EventsDirectoryPage.c" } -static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) { +static SubEventsDirectoryPageSubEventDirectoryManager* +sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, + struct tm* time) +{ #line 249 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return sub_events_directory_page_sub_event_directory_manager_construct (SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, type, time); -#line 2845 "EventsDirectoryPage.c" +#line 3008 "EventsDirectoryPage.c" } -static void g_time_local (time_t time, struct tm* result) { +static void +g_time_local (time_t time, + struct tm* result) +{ struct tm _result_ = {0}; struct tm _tmp0_ = {0}; -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" localtime_r (&time, &_tmp0_); -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" *result = _result_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return; -#line 2860 "EventsDirectoryPage.c" +#line 3026 "EventsDirectoryPage.c" } -static gboolean sub_events_directory_page_sub_event_directory_manager_real_include_in_view (ViewManager* base, DataSource* source) { +static gboolean +sub_events_directory_page_sub_event_directory_manager_real_include_in_view (ViewManager* base, + DataSource* source) +{ SubEventsDirectoryPageSubEventDirectoryManager * self; gboolean result = FALSE; - DataSource* _tmp0_; - gboolean _tmp1_; EventSource* event = NULL; - DataSource* _tmp2_; - EventSource* _tmp3_; + EventSource* _tmp0_; struct tm event_time = {0}; - EventSource* _tmp4_; - time_t _tmp5_; - struct tm _tmp6_ = {0}; - struct tm _tmp7_; - gint _tmp8_; - gint _tmp9_; + EventSource* _tmp1_; + struct tm _tmp2_ = {0}; + struct tm _tmp3_; + gint _tmp4_; + gint _tmp5_; #line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager); #line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = source; -#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = VIEW_MANAGER_CLASS (sub_events_directory_page_sub_event_directory_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER, EventsDirectoryPageEventDirectoryManager), TYPE_VIEW_MANAGER, ViewManager), _tmp0_); -#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (!_tmp1_) { + if (!VIEW_MANAGER_CLASS (sub_events_directory_page_sub_event_directory_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER, EventsDirectoryPageEventDirectoryManager), TYPE_VIEW_MANAGER, ViewManager), source)) { #line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = FALSE; #line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2893 "EventsDirectoryPage.c" +#line 3054 "EventsDirectoryPage.c" } #line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = source; -#line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EVENT_SOURCE, EventSource)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_EVENT_SOURCE, EventSource)); #line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - event = _tmp3_; -#line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = event; + event = _tmp0_; #line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = event_source_get_start_time (_tmp4_); + _tmp1_ = event; #line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_time_local (_tmp5_, &_tmp6_); + g_time_local (event_source_get_start_time (_tmp1_), &_tmp2_); #line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - event_time = _tmp6_; + event_time = _tmp2_; #line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = event_time; + _tmp3_ = event_time; #line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = _tmp7_.tm_year; + _tmp4_ = _tmp3_.tm_year; #line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = self->priv->year; + _tmp5_ = self->priv->year; #line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp8_ == _tmp9_) { -#line 2917 "EventsDirectoryPage.c" - SubEventsDirectoryPageDirectoryType _tmp10_; + if (_tmp4_ == _tmp5_) { +#line 3074 "EventsDirectoryPage.c" + SubEventsDirectoryPageDirectoryType _tmp6_; #line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp10_ = self->priv->type; + _tmp6_ = self->priv->type; #line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp10_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) { -#line 2923 "EventsDirectoryPage.c" - struct tm _tmp11_; - gint _tmp12_; - gint _tmp13_; + if (_tmp6_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) { +#line 3080 "EventsDirectoryPage.c" + struct tm _tmp7_; + gint _tmp8_; + gint _tmp9_; #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp11_ = event_time; + _tmp7_ = event_time; #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp12_ = _tmp11_.tm_mon; + _tmp8_ = _tmp7_.tm_mon; #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp13_ = self->priv->month; + _tmp9_ = self->priv->month; #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp12_ == _tmp13_; + result = _tmp8_ == _tmp9_; #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (event); #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2939 "EventsDirectoryPage.c" +#line 3096 "EventsDirectoryPage.c" } #line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = TRUE; @@ -2943,7 +3100,7 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu _g_object_unref0 (event); #line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2947 "EventsDirectoryPage.c" +#line 3104 "EventsDirectoryPage.c" } #line 270 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = FALSE; @@ -2951,11 +3108,13 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu _g_object_unref0 (event); #line 270 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2955 "EventsDirectoryPage.c" +#line 3112 "EventsDirectoryPage.c" } -static gint sub_events_directory_page_sub_event_directory_manager_get_month (SubEventsDirectoryPageSubEventDirectoryManager* self) { +static gint +sub_events_directory_page_sub_event_directory_manager_get_month (SubEventsDirectoryPageSubEventDirectoryManager* self) +{ gint result = 0; gint _tmp0_; #line 273 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2966,11 +3125,13 @@ static gint sub_events_directory_page_sub_event_directory_manager_get_month (Sub result = _tmp0_; #line 274 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2970 "EventsDirectoryPage.c" +#line 3129 "EventsDirectoryPage.c" } -static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubEventsDirectoryPageSubEventDirectoryManager* self) { +static gint +sub_events_directory_page_sub_event_directory_manager_get_year (SubEventsDirectoryPageSubEventDirectoryManager* self) +{ gint result = 0; gint _tmp0_; #line 277 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2981,11 +3142,13 @@ static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubE result = _tmp0_; #line 278 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2985 "EventsDirectoryPage.c" +#line 3146 "EventsDirectoryPage.c" } -static SubEventsDirectoryPageDirectoryType sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (SubEventsDirectoryPageSubEventDirectoryManager* self) { +static SubEventsDirectoryPageDirectoryType +sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (SubEventsDirectoryPageSubEventDirectoryManager* self) +{ SubEventsDirectoryPageDirectoryType result = 0; SubEventsDirectoryPageDirectoryType _tmp0_; #line 281 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2996,11 +3159,13 @@ static SubEventsDirectoryPageDirectoryType sub_events_directory_page_sub_event_d result = _tmp0_; #line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 3000 "EventsDirectoryPage.c" +#line 3163 "EventsDirectoryPage.c" } -static void sub_events_directory_page_sub_event_directory_manager_class_init (SubEventsDirectoryPageSubEventDirectoryManagerClass * klass) { +static void +sub_events_directory_page_sub_event_directory_manager_class_init (SubEventsDirectoryPageSubEventDirectoryManagerClass * klass) +{ #line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" sub_events_directory_page_sub_event_directory_manager_parent_class = g_type_class_peek_parent (klass); #line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -3009,32 +3174,38 @@ static void sub_events_directory_page_sub_event_directory_manager_class_init (Su g_type_class_add_private (klass, sizeof (SubEventsDirectoryPageSubEventDirectoryManagerPrivate)); #line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) sub_events_directory_page_sub_event_directory_manager_real_include_in_view; -#line 3013 "EventsDirectoryPage.c" +#line 3178 "EventsDirectoryPage.c" } -static void sub_events_directory_page_sub_event_directory_manager_instance_init (SubEventsDirectoryPageSubEventDirectoryManager * self) { +static void +sub_events_directory_page_sub_event_directory_manager_instance_init (SubEventsDirectoryPageSubEventDirectoryManager * self) +{ #line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self->priv = SUB_EVENTS_DIRECTORY_PAGE_SUB_EVENT_DIRECTORY_MANAGER_GET_PRIVATE (self); #line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self->priv->month = 0; #line 246 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self->priv->year = 0; -#line 3024 "EventsDirectoryPage.c" +#line 3191 "EventsDirectoryPage.c" } -static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager * obj) { +static void +sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager * obj) +{ SubEventsDirectoryPageSubEventDirectoryManager * self; #line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager); #line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" VIEW_MANAGER_CLASS (sub_events_directory_page_sub_event_directory_manager_parent_class)->finalize (obj); -#line 3034 "EventsDirectoryPage.c" +#line 3203 "EventsDirectoryPage.c" } -static GType sub_events_directory_page_sub_event_directory_manager_get_type (void) { +static GType +sub_events_directory_page_sub_event_directory_manager_get_type (void) +{ static volatile gsize sub_events_directory_page_sub_event_directory_manager_type_id__volatile = 0; if (g_once_init_enter (&sub_events_directory_page_sub_event_directory_manager_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SubEventsDirectoryPageSubEventDirectoryManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sub_events_directory_page_sub_event_directory_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SubEventsDirectoryPageSubEventDirectoryManager), 0, (GInstanceInitFunc) sub_events_directory_page_sub_event_directory_manager_instance_init, NULL }; @@ -3046,18 +3217,24 @@ static GType sub_events_directory_page_sub_event_directory_manager_get_type (voi } -static void sub_events_directory_page_class_init (SubEventsDirectoryPageClass * klass) { +static void +sub_events_directory_page_class_init (SubEventsDirectoryPageClass * klass) +{ #line 233 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" sub_events_directory_page_parent_class = g_type_class_peek_parent (klass); -#line 3053 "EventsDirectoryPage.c" +#line 3226 "EventsDirectoryPage.c" } -static void sub_events_directory_page_instance_init (SubEventsDirectoryPage * self) { +static void +sub_events_directory_page_instance_init (SubEventsDirectoryPage * self) +{ } -GType sub_events_directory_page_get_type (void) { +GType +sub_events_directory_page_get_type (void) +{ static volatile gsize sub_events_directory_page_type_id__volatile = 0; if (g_once_init_enter (&sub_events_directory_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SubEventsDirectoryPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sub_events_directory_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SubEventsDirectoryPage), 0, (GInstanceInitFunc) sub_events_directory_page_instance_init, NULL }; diff --git a/src/folders/Folders.c b/src/folders/Folders.c index eede6db..3ff8458 100644 --- a/src/folders/Folders.c +++ b/src/folders/Folders.c @@ -1,4 +1,4 @@ -/* Folders.c generated by valac 0.36.6, the Vala compiler +/* Folders.c generated by valac 0.40.4, the Vala compiler * generated from Folders.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -15,6 +15,7 @@ * the preconfigure() method, implement it, and ensure in init() that it's been called. */ + #include #include #include @@ -34,7 +35,9 @@ void folders_init (GError** error); void folders_terminate (void); -void folders_init (GError** error) { +void +folders_init (GError** error) +{ gchar* _tmp0_; gchar* _tmp1_; #line 22 "/home/jens/Source/shotwell/src/folders/Folders.vala" @@ -49,11 +52,13 @@ void folders_init (GError** error) { _g_free0 (folders_have_photos_icon); #line 23 "/home/jens/Source/shotwell/src/folders/Folders.vala" folders_have_photos_icon = _tmp1_; -#line 53 "Folders.c" +#line 56 "Folders.c" } -void folders_terminate (void) { +void +folders_terminate (void) +{ #line 27 "/home/jens/Source/shotwell/src/folders/Folders.vala" _g_free0 (folders_icon); #line 27 "/home/jens/Source/shotwell/src/folders/Folders.vala" @@ -62,7 +67,7 @@ void folders_terminate (void) { _g_free0 (folders_have_photos_icon); #line 28 "/home/jens/Source/shotwell/src/folders/Folders.vala" folders_have_photos_icon = NULL; -#line 66 "Folders.c" +#line 71 "Folders.c" } diff --git a/src/folders/FoldersBranch.c b/src/folders/FoldersBranch.c index ff8f49a..9b2f84f 100644 --- a/src/folders/FoldersBranch.c +++ b/src/folders/FoldersBranch.c @@ -1,4 +1,4 @@ -/* FoldersBranch.c generated by valac 0.36.6, the Vala compiler +/* FoldersBranch.c generated by valac 0.40.4, the Vala compiler * generated from FoldersBranch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -59,6 +60,11 @@ typedef struct _SidebarSimplePageEntryClass SidebarSimplePageEntryClass; typedef struct _FoldersSidebarEntry FoldersSidebarEntry; typedef struct _FoldersSidebarEntryClass FoldersSidebarEntryClass; +enum { + FOLDERS_BRANCH_0_PROPERTY, + FOLDERS_BRANCH_NUM_PROPERTIES +}; +static GParamSpec* folders_branch_properties[FOLDERS_BRANCH_NUM_PROPERTIES]; #define TYPE_DATA_COLLECTION (data_collection_get_type ()) #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection)) @@ -230,6 +236,11 @@ typedef struct _SidebarEmphasizableEntry SidebarEmphasizableEntry; typedef struct _SidebarEmphasizableEntryIface SidebarEmphasizableEntryIface; typedef struct _SidebarHeaderPrivate SidebarHeaderPrivate; typedef struct _FoldersRootPrivate FoldersRootPrivate; +enum { + FOLDERS_ROOT_0_PROPERTY, + FOLDERS_ROOT_NUM_PROPERTIES +}; +static GParamSpec* folders_root_properties[FOLDERS_ROOT_NUM_PROPERTIES]; #define SIDEBAR_TYPE_SELECTABLE_ENTRY (sidebar_selectable_entry_get_type ()) #define SIDEBAR_SELECTABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY, SidebarSelectableEntry)) @@ -266,6 +277,14 @@ typedef struct _SidebarContextable SidebarContextable; typedef struct _SidebarContextableIface SidebarContextableIface; typedef struct _SidebarSimplePageEntryPrivate SidebarSimplePageEntryPrivate; typedef struct _FoldersSidebarEntryPrivate FoldersSidebarEntryPrivate; +enum { + FOLDERS_SIDEBAR_ENTRY_0_PROPERTY, + FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY, + FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY, + FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY, + FOLDERS_SIDEBAR_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* folders_sidebar_entry_properties[FOLDERS_SIDEBAR_ENTRY_NUM_PROPERTIES]; #define TYPE_CHECKERBOARD_PAGE (checkerboard_page_get_type ()) #define CHECKERBOARD_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHECKERBOARD_PAGE, CheckerboardPage)) @@ -452,14 +471,17 @@ GType folders_branch_get_type (void) G_GNUC_CONST; GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST; GType folders_sidebar_entry_get_type (void) G_GNUC_CONST; #define FOLDERS_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), FOLDERS_TYPE_BRANCH, FoldersBranchPrivate)) -enum { - FOLDERS_BRANCH_DUMMY_PROPERTY -}; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -467,20 +489,35 @@ GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self); GType data_object_get_type (void) G_GNUC_CONST; -static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIterable* added, GeeIterable* removed); -static void _folders_branch_on_media_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self); +static void folders_branch_on_media_contents_altered (FoldersBranch* self, + GeeIterable* added, + GeeIterable* removed); +static void _folders_branch_on_media_contents_altered_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self); guint file_hash (GFile* file); -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self); -gboolean file_equal (GFile* a, GFile* b); -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); +static guint _file_hash_gee_hash_data_func (gconstpointer v, + gpointer self); +gboolean file_equal (GFile* a, + GFile* b); +static gboolean _file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); FoldersBranch* folders_branch_new (void); FoldersBranch* folders_branch_construct (GType object_type); FoldersRoot* folders_root_new (void); @@ -491,106 +528,153 @@ GType folders_root_get_type (void) G_GNUC_CONST; GType sidebar_tree_get_type (void) G_GNUC_CONST; GType sidebar_entry_get_type (void) G_GNUC_CONST; GType sidebar_branch_options_get_type (void) G_GNUC_CONST; -static gint folders_branch_comparator (SidebarEntry* a, SidebarEntry* b); -static gint _folders_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b); -SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator); -SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator); +static gint folders_branch_comparator (SidebarEntry* a, + SidebarEntry* b); +static gint _folders_branch_comparator_gcompare_func (gconstpointer a, + gconstpointer b); +SidebarBranch* sidebar_branch_new (SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator); +SidebarBranch* sidebar_branch_construct (GType object_type, + SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator); GeeCollection* data_collection_get_all (DataCollection* self); const gchar* folders_sidebar_entry_get_collation (FoldersSidebarEntry* self); gchar* sidebar_simple_page_entry_get_sidebar_name (SidebarSimplePageEntry* self); GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; -static void folders_branch_on_master_source_replaced (FoldersBranch* self, MediaSource* media_source, GFile* old_file, GFile* new_file); -static void folders_branch_remove_entry (FoldersBranch* self, GFile* file); -static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media); -static void _folders_branch_on_master_source_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self); +static void folders_branch_on_master_source_replaced (FoldersBranch* self, + MediaSource* media_source, + GFile* old_file, + GFile* new_file); +static void folders_branch_remove_entry (FoldersBranch* self, + GFile* file); +static void folders_branch_add_entry (FoldersBranch* self, + MediaSource* media); +static void _folders_branch_on_master_source_replaced_media_source_master_replaced (MediaSource* _sender, + GFile* old_file, + GFile* new_file, + gpointer self); GFile* media_source_get_file (MediaSource* self); FoldersSidebarEntry* folders_sidebar_entry_new (GFile* dir); -FoldersSidebarEntry* folders_sidebar_entry_construct (GType object_type, GFile* dir); +FoldersSidebarEntry* folders_sidebar_entry_construct (GType object_type, + GFile* dir); SidebarEntry* sidebar_branch_get_root (SidebarBranch* self); -void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator); +void sidebar_branch_graft (SidebarBranch* self, + SidebarEntry* parent, + SidebarEntry* entry, + GCompareFunc comparator); gint folders_sidebar_entry_get_count (FoldersSidebarEntry* self); -void folders_sidebar_entry_set_count (FoldersSidebarEntry* self, gint value); -gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent); +void folders_sidebar_entry_set_count (FoldersSidebarEntry* self, + gint value); +gint sidebar_branch_get_child_count (SidebarBranch* self, + SidebarEntry* parent); GFile* folders_sidebar_entry_get_dir (FoldersSidebarEntry* self); -SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry); -void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry); +SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, + SidebarEntry* entry); +void sidebar_branch_prune (SidebarBranch* self, + SidebarEntry* entry); static void folders_branch_finalize (GObject * obj); GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST; GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST; GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST; -enum { - FOLDERS_ROOT_DUMMY_PROPERTY -}; -SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized); -SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized); +SidebarHeader* sidebar_header_new (const gchar* name, + const gchar* tooltip, + gboolean emphasized); +SidebarHeader* sidebar_header_construct (GType object_type, + const gchar* name, + const gchar* tooltip, + gboolean emphasized); GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST; GType page_get_type (void) G_GNUC_CONST; GType sidebar_page_representative_get_type (void) G_GNUC_CONST; GType sidebar_contextable_get_type (void) G_GNUC_CONST; #define FOLDERS_SIDEBAR_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntryPrivate)) -enum { - FOLDERS_SIDEBAR_ENTRY_DUMMY_PROPERTY, - FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY, - FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY, - FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY -}; SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type); -static void folders_sidebar_entry_set_dir (FoldersSidebarEntry* self, GFile* value); -static void folders_sidebar_entry_set_collation (FoldersSidebarEntry* self, const gchar* value); +static void folders_sidebar_entry_set_dir (FoldersSidebarEntry* self, + GFile* value); +static void folders_sidebar_entry_set_collation (FoldersSidebarEntry* self, + const gchar* value); static gchar* folders_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base); static gchar* folders_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base); static gchar* folders_sidebar_entry_real_to_string (SidebarSimplePageEntry* base); static gboolean folders_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base); static Page* folders_sidebar_entry_real_create_page (SidebarSimplePageEntry* base); FoldersPage* folders_page_new (GFile* dir); -FoldersPage* folders_page_construct (GType object_type, GFile* dir); +FoldersPage* folders_page_construct (GType object_type, + GFile* dir); GType checkerboard_page_get_type (void) G_GNUC_CONST; GType media_page_get_type (void) G_GNUC_CONST; GType collection_page_get_type (void) G_GNUC_CONST; GType folders_page_get_type (void) G_GNUC_CONST; gchar* sidebar_simple_page_entry_get_sidebar_icon (SidebarSimplePageEntry* self); static void folders_sidebar_entry_finalize (GObject * obj); -static void _vala_folders_sidebar_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void _vala_folders_sidebar_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); - - -static void _folders_branch_on_media_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { +static void _vala_folders_sidebar_entry_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); +static void _vala_folders_sidebar_entry_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec); + + +static void +_folders_branch_on_media_contents_altered_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self) +{ #line 31 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" folders_branch_on_media_contents_altered ((FoldersBranch*) self, added, removed); -#line 563 "FoldersBranch.c" +#line 635 "FoldersBranch.c" } -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { +static guint +_file_hash_gee_hash_data_func (gconstpointer v, + gpointer self) +{ guint result; result = file_hash ((GFile*) v); #line 8 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return result; -#line 572 "FoldersBranch.c" +#line 647 "FoldersBranch.c" } -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = file_equal ((GFile*) a, (GFile*) b); #line 8 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return result; -#line 581 "FoldersBranch.c" +#line 660 "FoldersBranch.c" } -static gint _folders_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b) { +static gint +_folders_branch_comparator_gcompare_func (gconstpointer a, + gconstpointer b) +{ gint result; result = folders_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b); #line 13 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return result; -#line 590 "FoldersBranch.c" +#line 672 "FoldersBranch.c" } -FoldersBranch* folders_branch_construct (GType object_type) { +FoldersBranch* +folders_branch_construct (GType object_type) +{ FoldersBranch * self = NULL; FoldersRoot* _tmp0_; FoldersRoot* _tmp1_; @@ -612,7 +696,7 @@ FoldersBranch* folders_branch_construct (GType object_type) { _g_object_unref0 (self->priv->home_dir); #line 18 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" self->priv->home_dir = _tmp3_; -#line 616 "FoldersBranch.c" +#line 700 "FoldersBranch.c" { GeeIterator* _sources_it = NULL; MediaCollectionRegistry* _tmp4_; @@ -641,168 +725,149 @@ FoldersBranch* folders_branch_construct (GType object_type) { _sources_it = _tmp9_; #line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" while (TRUE) { -#line 645 "FoldersBranch.c" +#line 729 "FoldersBranch.c" GeeIterator* _tmp10_; - gboolean _tmp11_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp12_; - gpointer _tmp13_; - MediaSourceCollection* _tmp14_; + GeeIterator* _tmp11_; + gpointer _tmp12_; + MediaSourceCollection* _tmp13_; + GeeCollection* _tmp14_; GeeCollection* _tmp15_; - GeeCollection* _tmp16_; - MediaSourceCollection* _tmp17_; + MediaSourceCollection* _tmp16_; #line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _tmp10_ = _sources_it; #line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp11_ = gee_iterator_next (_tmp10_); -#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (!_tmp11_) { + if (!gee_iterator_next (_tmp10_)) { #line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" break; -#line 663 "FoldersBranch.c" +#line 744 "FoldersBranch.c" } #line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp12_ = _sources_it; + _tmp11_ = _sources_it; #line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp13_ = gee_iterator_get (_tmp12_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - sources = (MediaSourceCollection*) _tmp13_; + sources = (MediaSourceCollection*) _tmp12_; #line 22 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp14_ = sources; + _tmp13_ = sources; #line 22 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp15_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp14_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection)); #line 22 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 22 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - folders_branch_on_media_contents_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ITERABLE, GeeIterable), NULL); + folders_branch_on_media_contents_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable), NULL); #line 22 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp15_); #line 25 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp17_ = sources; + _tmp16_ = sources; #line 25 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _folders_branch_on_media_contents_altered_data_collection_contents_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _folders_branch_on_media_contents_altered_data_collection_contents_altered, self, 0); #line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _data_collection_unref0 (sources); -#line 687 "FoldersBranch.c" +#line 768 "FoldersBranch.c" } #line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (_sources_it); -#line 691 "FoldersBranch.c" +#line 772 "FoldersBranch.c" } #line 12 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return self; -#line 695 "FoldersBranch.c" +#line 776 "FoldersBranch.c" } -FoldersBranch* folders_branch_new (void) { +FoldersBranch* +folders_branch_new (void) +{ #line 12 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return folders_branch_construct (FOLDERS_TYPE_BRANCH); -#line 702 "FoldersBranch.c" +#line 785 "FoldersBranch.c" } -static gint folders_branch_comparator (SidebarEntry* a, SidebarEntry* b) { +static gint +folders_branch_comparator (SidebarEntry* a, + SidebarEntry* b) +{ gint result = 0; - SidebarEntry* _tmp0_; - SidebarEntry* _tmp1_; gint coll_key_equality = 0; - GCompareFunc _tmp2_; - SidebarEntry* _tmp3_; + GCompareFunc _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; const gchar* _tmp4_; - const gchar* _tmp5_; - SidebarEntry* _tmp6_; - const gchar* _tmp7_; - const gchar* _tmp8_; - gint _tmp9_; - gint _tmp10_; + gint _tmp5_; #line 34 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 34 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0); #line 35 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp0_ = a; -#line 35 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp1_ = b; -#line 35 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (_tmp0_ == _tmp1_) { + if (a == b) { #line 36 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" result = 0; #line 36 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return result; -#line 734 "FoldersBranch.c" +#line 811 "FoldersBranch.c" } #line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp2_ = g_strcmp0; -#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp3_ = a; + _tmp0_ = g_strcmp0; #line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp4_ = folders_sidebar_entry_get_collation (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry)); + _tmp1_ = folders_sidebar_entry_get_collation (G_TYPE_CHECK_INSTANCE_CAST (a, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry)); #line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp5_ = _tmp4_; -#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp6_ = b; -#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp7_ = folders_sidebar_entry_get_collation (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry)); + _tmp2_ = _tmp1_; #line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp8_ = _tmp7_; + _tmp3_ = folders_sidebar_entry_get_collation (G_TYPE_CHECK_INSTANCE_CAST (b, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry)); #line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp9_ = _tmp2_ (_tmp5_, _tmp8_); + _tmp4_ = _tmp3_; #line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - coll_key_equality = _tmp9_; + coll_key_equality = _tmp0_ (_tmp2_, _tmp4_); #line 41 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp10_ = coll_key_equality; + _tmp5_ = coll_key_equality; #line 41 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (_tmp10_ == 0) { -#line 758 "FoldersBranch.c" - GCompareFunc _tmp11_; - SidebarEntry* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; - SidebarEntry* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; - gint _tmp18_; - gint _tmp19_; -#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp11_ = g_strcmp0; -#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp12_ = a; -#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp13_ = sidebar_simple_page_entry_get_sidebar_name (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry)); + if (_tmp5_ == 0) { +#line 829 "FoldersBranch.c" + GCompareFunc _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + gint _tmp11_; #line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp14_ = _tmp13_; + _tmp6_ = g_strcmp0; #line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp15_ = b; + _tmp7_ = sidebar_simple_page_entry_get_sidebar_name (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (a, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry)); #line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp16_ = sidebar_simple_page_entry_get_sidebar_name (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry)); + _tmp8_ = _tmp7_; #line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp17_ = _tmp16_; + _tmp9_ = sidebar_simple_page_entry_get_sidebar_name (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (b, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry)); #line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp18_ = _tmp11_ (_tmp14_, _tmp17_); + _tmp10_ = _tmp9_; #line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp19_ = _tmp18_; + _tmp11_ = _tmp6_ (_tmp8_, _tmp10_); #line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp10_); #line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _g_free0 (_tmp14_); + _g_free0 (_tmp8_); #line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - result = _tmp19_; + result = _tmp11_; #line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return result; -#line 794 "FoldersBranch.c" +#line 856 "FoldersBranch.c" } #line 48 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" result = coll_key_equality; #line 48 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return result; -#line 800 "FoldersBranch.c" +#line 862 "FoldersBranch.c" } -static void folders_branch_on_master_source_replaced (FoldersBranch* self, MediaSource* media_source, GFile* old_file, GFile* new_file) { - GFile* _tmp0_; - MediaSource* _tmp1_; +static void +folders_branch_on_master_source_replaced (FoldersBranch* self, + MediaSource* media_source, + GFile* old_file, + GFile* new_file) +{ #line 51 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" g_return_if_fail (FOLDERS_IS_BRANCH (self)); #line 51 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" @@ -812,27 +877,30 @@ static void folders_branch_on_master_source_replaced (FoldersBranch* self, Media #line 51 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" g_return_if_fail (G_IS_FILE (new_file)); #line 52 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp0_ = old_file; -#line 52 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - folders_branch_remove_entry (self, _tmp0_); + folders_branch_remove_entry (self, old_file); #line 53 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp1_ = media_source; -#line 53 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - folders_branch_add_entry (self, _tmp1_); -#line 823 "FoldersBranch.c" + folders_branch_add_entry (self, media_source); +#line 884 "FoldersBranch.c" } -static void _folders_branch_on_master_source_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self) { +static void +_folders_branch_on_master_source_replaced_media_source_master_replaced (MediaSource* _sender, + GFile* old_file, + GFile* new_file, + gpointer self) +{ #line 60 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" folders_branch_on_master_source_replaced ((FoldersBranch*) self, _sender, old_file, new_file); -#line 830 "FoldersBranch.c" +#line 896 "FoldersBranch.c" } -static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIterable* added, GeeIterable* removed) { - GeeIterable* _tmp0_; - GeeIterable* _tmp9_; +static void +folders_branch_on_media_contents_altered (FoldersBranch* self, + GeeIterable* added, + GeeIterable* removed) +{ #line 56 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" g_return_if_fail (FOLDERS_IS_BRANCH (self)); #line 56 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" @@ -840,420 +908,403 @@ static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIt #line 56 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); #line 57 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp0_ = added; -#line 57 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (_tmp0_ != NULL) { -#line 847 "FoldersBranch.c" + if (added != NULL) { +#line 913 "FoldersBranch.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_; - GeeIterator* _tmp2_; -#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp1_ = added; + GeeIterator* _tmp0_; #line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp2_ = gee_iterable_iterator (_tmp1_); + _tmp0_ = gee_iterable_iterator (added); #line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _object_it = _tmp2_; + _object_it = _tmp0_; #line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" while (TRUE) { -#line 860 "FoldersBranch.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 923 "FoldersBranch.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - DataObject* _tmp7_; - DataObject* _tmp8_; + GeeIterator* _tmp2_; + gpointer _tmp3_; + DataObject* _tmp4_; + DataObject* _tmp5_; #line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp3_ = _object_it; + _tmp1_ = _object_it; #line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp4_ = gee_iterator_next (_tmp3_); -#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" break; -#line 876 "FoldersBranch.c" +#line 936 "FoldersBranch.c" } #line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp5_ = _object_it; + _tmp2_ = _object_it; #line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - object = (DataObject*) _tmp6_; + object = (DataObject*) _tmp3_; #line 59 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp7_ = object; + _tmp4_ = object; #line 59 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - folders_branch_add_entry (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource)); + folders_branch_add_entry (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource)); #line 60 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp8_ = object; + _tmp5_ = object; #line 60 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource), "master-replaced", (GCallback) _folders_branch_on_master_source_replaced_media_source_master_replaced, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource), "master-replaced", (GCallback) _folders_branch_on_master_source_replaced_media_source_master_replaced, self, 0); #line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (object); -#line 894 "FoldersBranch.c" +#line 954 "FoldersBranch.c" } #line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (_object_it); -#line 898 "FoldersBranch.c" +#line 958 "FoldersBranch.c" } } #line 64 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp9_ = removed; -#line 64 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (_tmp9_ != NULL) { -#line 905 "FoldersBranch.c" + if (removed != NULL) { +#line 963 "FoldersBranch.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp10_; - GeeIterator* _tmp11_; -#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp10_ = removed; + GeeIterator* _tmp6_; #line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp11_ = gee_iterable_iterator (_tmp10_); + _tmp6_ = gee_iterable_iterator (removed); #line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _object_it = _tmp11_; + _object_it = _tmp6_; #line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" while (TRUE) { -#line 918 "FoldersBranch.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 973 "FoldersBranch.c" + GeeIterator* _tmp7_; DataObject* object = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; - DataObject* _tmp16_; - GFile* _tmp17_; - GFile* _tmp18_; - DataObject* _tmp19_; - guint _tmp20_; -#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp12_ = _object_it; + GeeIterator* _tmp8_; + gpointer _tmp9_; + DataObject* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; + DataObject* _tmp13_; + guint _tmp14_; #line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp13_ = gee_iterator_next (_tmp12_); + _tmp7_ = _object_it; #line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp7_)) { #line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" break; -#line 937 "FoldersBranch.c" +#line 989 "FoldersBranch.c" } #line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp14_ = _object_it; + _tmp8_ = _object_it; #line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp9_ = gee_iterator_get (_tmp8_); #line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - object = (DataObject*) _tmp15_; + object = (DataObject*) _tmp9_; #line 66 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp16_ = object; + _tmp10_ = object; #line 66 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp17_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp11_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource)); #line 66 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp18_ = _tmp17_; + _tmp12_ = _tmp11_; #line 66 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - folders_branch_remove_entry (self, _tmp18_); + folders_branch_remove_entry (self, _tmp12_); #line 66 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp12_); #line 67 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp19_ = object; + _tmp13_ = object; #line 67 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - g_signal_parse_name ("master-replaced", TYPE_MEDIA_SOURCE, &_tmp20_, NULL, FALSE); + g_signal_parse_name ("master-replaced", TYPE_MEDIA_SOURCE, &_tmp14_, NULL, FALSE); #line 67 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_MEDIA_SOURCE, MediaSource), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _folders_branch_on_master_source_replaced_media_source_master_replaced, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _folders_branch_on_master_source_replaced_media_source_master_replaced, self); #line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (object); -#line 963 "FoldersBranch.c" +#line 1015 "FoldersBranch.c" } #line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (_object_it); -#line 967 "FoldersBranch.c" +#line 1019 "FoldersBranch.c" } } } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 96 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return self ? g_object_ref (self) : NULL; -#line 976 "FoldersBranch.c" +#line 1030 "FoldersBranch.c" } -static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) { +static void +folders_branch_add_entry (FoldersBranch* self, + MediaSource* media) +{ GFile* file = NULL; - MediaSource* _tmp0_; - GFile* _tmp1_; + GFile* _tmp0_; GeeArrayList* elements = NULL; - GeeArrayList* _tmp2_; + GeeArrayList* _tmp1_; GFile* parent = NULL; + GFile* _tmp2_; GFile* _tmp3_; - GFile* _tmp4_; FoldersSidebarEntry* parent_entry = NULL; #line 72 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" g_return_if_fail (FOLDERS_IS_BRANCH (self)); #line 72 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" g_return_if_fail (IS_MEDIA_SOURCE (media)); #line 73 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp0_ = media; + _tmp0_ = media_source_get_file (media); #line 73 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp1_ = media_source_get_file (_tmp0_); -#line 73 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - file = _tmp1_; + file = _tmp0_; #line 75 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp2_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 75 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - elements = _tmp2_; + elements = _tmp1_; #line 78 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp3_ = file; + _tmp2_ = file; #line 78 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp4_ = g_file_get_parent (_tmp3_); + _tmp3_ = g_file_get_parent (_tmp2_); #line 78 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - parent = _tmp4_; + parent = _tmp3_; #line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" while (TRUE) { -#line 1012 "FoldersBranch.c" - gboolean _tmp5_ = FALSE; - GFile* _tmp6_; +#line 1066 "FoldersBranch.c" + gboolean _tmp4_ = FALSE; + GFile* _tmp5_; + GFile* _tmp9_; GFile* _tmp10_; GFile* _tmp11_; GFile* _tmp12_; - GFile* _tmp13_; - gboolean _tmp14_; - gboolean _tmp15_; - GeeArrayList* _tmp16_; + gboolean _tmp13_; + GeeArrayList* _tmp14_; + GFile* _tmp15_; + GFile* _tmp16_; GFile* _tmp17_; - GFile* _tmp18_; - GFile* _tmp19_; #line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp6_ = parent; + _tmp5_ = parent; #line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (_tmp6_ != NULL) { -#line 1029 "FoldersBranch.c" - GFile* _tmp7_; + if (_tmp5_ != NULL) { +#line 1082 "FoldersBranch.c" + GFile* _tmp6_; + gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; #line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp7_ = parent; + _tmp6_ = parent; #line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp8_ = g_file_get_path (_tmp7_); + _tmp7_ = g_file_get_path (_tmp6_); #line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp5_ = _tmp9_ != NULL; + _tmp4_ = _tmp8_ != NULL; #line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _g_free0 (_tmp9_); -#line 1043 "FoldersBranch.c" + _g_free0 (_tmp8_); +#line 1096 "FoldersBranch.c" } else { #line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp5_ = FALSE; -#line 1047 "FoldersBranch.c" + _tmp4_ = FALSE; +#line 1100 "FoldersBranch.c" } #line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (!_tmp5_) { + if (!_tmp4_) { #line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" break; -#line 1053 "FoldersBranch.c" +#line 1106 "FoldersBranch.c" } #line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp10_ = parent; + _tmp9_ = parent; #line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp11_ = self->priv->home_dir; + _tmp10_ = self->priv->home_dir; #line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp12_ = g_file_get_parent (_tmp11_); + _tmp11_ = g_file_get_parent (_tmp10_); #line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp14_ = g_file_equal (_tmp10_, _tmp13_); + _tmp13_ = g_file_equal (_tmp9_, _tmp12_); #line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp15_ = _tmp14_; + _g_object_unref0 (_tmp12_); #line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _g_object_unref0 (_tmp13_); -#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (_tmp15_) { + if (_tmp13_) { #line 82 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" break; -#line 1073 "FoldersBranch.c" +#line 1124 "FoldersBranch.c" } #line 84 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp16_ = elements; + _tmp14_ = elements; #line 84 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp17_ = parent; + _tmp15_ = parent; #line 84 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); #line 86 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp18_ = parent; + _tmp16_ = parent; #line 86 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp19_ = g_file_get_parent (_tmp18_); + _tmp17_ = g_file_get_parent (_tmp16_); #line 86 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (parent); #line 86 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - parent = _tmp19_; -#line 1089 "FoldersBranch.c" + parent = _tmp17_; +#line 1140 "FoldersBranch.c" } #line 91 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" parent_entry = NULL; -#line 1093 "FoldersBranch.c" +#line 1144 "FoldersBranch.c" { gint ctr = 0; - GeeArrayList* _tmp20_; - gint _tmp21_; - gint _tmp22_; + GeeArrayList* _tmp18_; + gint _tmp19_; + gint _tmp20_; #line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp20_ = elements; + _tmp18_ = elements; #line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp22_ = _tmp21_; + _tmp20_ = _tmp19_; #line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - ctr = _tmp22_ - 1; -#line 1107 "FoldersBranch.c" + ctr = _tmp20_ - 1; +#line 1158 "FoldersBranch.c" { - gboolean _tmp23_ = FALSE; + gboolean _tmp21_ = FALSE; #line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp23_ = TRUE; + _tmp21_ = TRUE; #line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" while (TRUE) { -#line 1114 "FoldersBranch.c" - gint _tmp25_; +#line 1165 "FoldersBranch.c" + gint _tmp23_; GFile* parent_dir = NULL; - GeeArrayList* _tmp26_; - gint _tmp27_; - gpointer _tmp28_; + GeeArrayList* _tmp24_; + gint _tmp25_; + gpointer _tmp26_; FoldersSidebarEntry* old_parent_entry = NULL; - FoldersSidebarEntry* _tmp29_; - FoldersSidebarEntry* _tmp30_; - GeeHashMap* _tmp31_; - GFile* _tmp32_; - gpointer _tmp33_; - FoldersSidebarEntry* _tmp34_; - gint _tmp46_; + FoldersSidebarEntry* _tmp27_; + FoldersSidebarEntry* _tmp28_; + GeeHashMap* _tmp29_; + GFile* _tmp30_; + gpointer _tmp31_; + FoldersSidebarEntry* _tmp32_; + gint _tmp44_; #line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (!_tmp23_) { -#line 1130 "FoldersBranch.c" - gint _tmp24_; + if (!_tmp21_) { +#line 1181 "FoldersBranch.c" + gint _tmp22_; #line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp24_ = ctr; + _tmp22_ = ctr; #line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - ctr = _tmp24_ - 1; -#line 1136 "FoldersBranch.c" + ctr = _tmp22_ - 1; +#line 1187 "FoldersBranch.c" } #line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp23_ = FALSE; + _tmp21_ = FALSE; #line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp25_ = ctr; + _tmp23_ = ctr; #line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (!(_tmp25_ >= 0)) { + if (!(_tmp23_ >= 0)) { #line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" break; -#line 1146 "FoldersBranch.c" +#line 1197 "FoldersBranch.c" } #line 93 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp26_ = elements; + _tmp24_ = elements; #line 93 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp27_ = ctr; + _tmp25_ = ctr; #line 93 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp28_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp27_); + _tmp26_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp25_); #line 93 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - parent_dir = (GFile*) _tmp28_; + parent_dir = (GFile*) _tmp26_; #line 96 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp29_ = parent_entry; + _tmp27_ = parent_entry; #line 96 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp30_ = _g_object_ref0 (_tmp29_); + _tmp28_ = _g_object_ref0 (_tmp27_); #line 96 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - old_parent_entry = _tmp30_; + old_parent_entry = _tmp28_; #line 98 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp31_ = self->priv->entries; + _tmp29_ = self->priv->entries; #line 98 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp32_ = parent_dir; + _tmp30_ = parent_dir; #line 98 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp33_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp32_); + _tmp31_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp30_); #line 98 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (parent_entry); #line 98 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - parent_entry = (FoldersSidebarEntry*) _tmp33_; + parent_entry = (FoldersSidebarEntry*) _tmp31_; #line 99 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp34_ = parent_entry; + _tmp32_ = parent_entry; #line 99 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (_tmp34_ == NULL) { -#line 1176 "FoldersBranch.c" - GFile* _tmp35_; - FoldersSidebarEntry* _tmp36_; - GeeHashMap* _tmp37_; - GFile* _tmp38_; + if (_tmp32_ == NULL) { +#line 1227 "FoldersBranch.c" + GFile* _tmp33_; + FoldersSidebarEntry* _tmp34_; + GeeHashMap* _tmp35_; + GFile* _tmp36_; + FoldersSidebarEntry* _tmp37_; + SidebarEntry* _tmp38_ = NULL; FoldersSidebarEntry* _tmp39_; - SidebarEntry* _tmp40_ = NULL; - FoldersSidebarEntry* _tmp41_; - FoldersSidebarEntry* _tmp45_; + FoldersSidebarEntry* _tmp43_; #line 100 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp35_ = parent_dir; + _tmp33_ = parent_dir; #line 100 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp36_ = folders_sidebar_entry_new (_tmp35_); + _tmp34_ = folders_sidebar_entry_new (_tmp33_); #line 100 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (parent_entry); #line 100 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - parent_entry = _tmp36_; + parent_entry = _tmp34_; #line 101 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp37_ = self->priv->entries; + _tmp35_ = self->priv->entries; #line 101 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp38_ = parent_dir; + _tmp36_ = parent_dir; #line 101 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp39_ = parent_entry; + _tmp37_ = parent_entry; #line 101 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp38_, _tmp39_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp36_, _tmp37_); #line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp41_ = old_parent_entry; + _tmp39_ = old_parent_entry; #line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (_tmp41_ == NULL) { -#line 1205 "FoldersBranch.c" - SidebarEntry* _tmp42_; + if (_tmp39_ == NULL) { +#line 1256 "FoldersBranch.c" + SidebarEntry* _tmp40_; #line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp42_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp40_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _g_object_unref0 (_tmp40_); + _g_object_unref0 (_tmp38_); #line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp40_ = _tmp42_; -#line 1213 "FoldersBranch.c" + _tmp38_ = _tmp40_; +#line 1264 "FoldersBranch.c" } else { - FoldersSidebarEntry* _tmp43_; - SidebarEntry* _tmp44_; + FoldersSidebarEntry* _tmp41_; + SidebarEntry* _tmp42_; #line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp43_ = old_parent_entry; + _tmp41_ = old_parent_entry; #line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); + _tmp42_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); #line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _g_object_unref0 (_tmp40_); + _g_object_unref0 (_tmp38_); #line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp40_ = _tmp44_; -#line 1225 "FoldersBranch.c" + _tmp38_ = _tmp42_; +#line 1276 "FoldersBranch.c" } #line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp45_ = parent_entry; + _tmp43_ = parent_entry; #line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); #line 99 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _g_object_unref0 (_tmp40_); -#line 1233 "FoldersBranch.c" + _g_object_unref0 (_tmp38_); +#line 1284 "FoldersBranch.c" } #line 107 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp46_ = ctr; + _tmp44_ = ctr; #line 107 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (_tmp46_ == 0) { -#line 1239 "FoldersBranch.c" - FoldersSidebarEntry* _tmp47_; - gint _tmp48_; - gint _tmp49_; + if (_tmp44_ == 0) { +#line 1290 "FoldersBranch.c" + FoldersSidebarEntry* _tmp45_; + gint _tmp46_; + gint _tmp47_; #line 108 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp47_ = parent_entry; + _tmp45_ = parent_entry; #line 108 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp48_ = folders_sidebar_entry_get_count (_tmp47_); + _tmp46_ = folders_sidebar_entry_get_count (_tmp45_); #line 108 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp49_ = _tmp48_; + _tmp47_ = _tmp46_; #line 108 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - folders_sidebar_entry_set_count (_tmp47_, _tmp49_ + 1); -#line 1251 "FoldersBranch.c" + folders_sidebar_entry_set_count (_tmp45_, _tmp47_ + 1); +#line 1302 "FoldersBranch.c" } #line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (old_parent_entry); #line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (parent_dir); -#line 1257 "FoldersBranch.c" +#line 1308 "FoldersBranch.c" } } } @@ -1265,32 +1316,34 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) { _g_object_unref0 (elements); #line 72 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (file); -#line 1269 "FoldersBranch.c" +#line 1320 "FoldersBranch.c" } -static void folders_branch_remove_entry (FoldersBranch* self, GFile* file) { +static void +folders_branch_remove_entry (FoldersBranch* self, + GFile* file) +{ FoldersSidebarEntry* folder_entry = NULL; GeeHashMap* _tmp0_; GFile* _tmp1_; GFile* _tmp2_; - GFile* _tmp3_; - gpointer _tmp4_; + gpointer _tmp3_; + FoldersSidebarEntry* _tmp4_; FoldersSidebarEntry* _tmp5_; FoldersSidebarEntry* _tmp6_; - FoldersSidebarEntry* _tmp7_; + gint _tmp7_; gint _tmp8_; - gint _tmp9_; - gboolean _tmp10_ = FALSE; + gboolean _tmp9_ = FALSE; + FoldersSidebarEntry* _tmp10_; FoldersSidebarEntry* _tmp11_; - FoldersSidebarEntry* _tmp12_; + gint _tmp12_; gint _tmp13_; - gint _tmp14_; FoldersSidebarEntry* prune_point = NULL; + FoldersSidebarEntry* _tmp15_; + FoldersSidebarEntry* _tmp16_; FoldersSidebarEntry* _tmp17_; - FoldersSidebarEntry* _tmp18_; - FoldersSidebarEntry* _tmp19_; - FoldersSidebarEntry* _tmp40_; + FoldersSidebarEntry* _tmp37_; #line 112 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" g_return_if_fail (FOLDERS_IS_BRANCH (self)); #line 112 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" @@ -1298,223 +1351,219 @@ static void folders_branch_remove_entry (FoldersBranch* self, GFile* file) { #line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _tmp0_ = self->priv->entries; #line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp1_ = file; + _tmp1_ = g_file_get_parent (file); #line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp2_ = g_file_get_parent (_tmp1_); -#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_); + _tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_); #line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp5_ = (FoldersSidebarEntry*) _tmp4_; + _tmp4_ = (FoldersSidebarEntry*) _tmp3_; #line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - folder_entry = _tmp5_; + folder_entry = _tmp4_; #line 114 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp6_ = folder_entry; + _tmp5_ = folder_entry; #line 114 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (_tmp6_ == NULL) { + if (_tmp5_ == NULL) { #line 115 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (folder_entry); #line 115 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return; -#line 1323 "FoldersBranch.c" +#line 1374 "FoldersBranch.c" } #line 117 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp7_ = folder_entry; + _tmp6_ = folder_entry; #line 117 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp8_ = folders_sidebar_entry_get_count (_tmp7_); + _tmp7_ = folders_sidebar_entry_get_count (_tmp6_); #line 117 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 117 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _vala_assert (_tmp9_ > 0, "folder_entry.count > 0"); + _vala_assert (_tmp8_ > 0, "folder_entry.count > 0"); #line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp11_ = folder_entry; + _tmp10_ = folder_entry; #line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp12_ = folder_entry; + _tmp11_ = folder_entry; #line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp13_ = folders_sidebar_entry_get_count (_tmp12_); + _tmp12_ = folders_sidebar_entry_get_count (_tmp11_); #line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - folders_sidebar_entry_set_count (_tmp12_, _tmp14_ - 1); + folders_sidebar_entry_set_count (_tmp11_, _tmp13_ - 1); #line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if ((_tmp14_ - 1) > 0) { + if ((_tmp13_ - 1) > 0) { #line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp10_ = TRUE; -#line 1347 "FoldersBranch.c" + _tmp9_ = TRUE; +#line 1398 "FoldersBranch.c" } else { - FoldersSidebarEntry* _tmp15_; - gint _tmp16_; -#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp15_ = folder_entry; + FoldersSidebarEntry* _tmp14_; #line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp16_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); + _tmp14_ = folder_entry; #line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp10_ = _tmp16_ > 0; -#line 1357 "FoldersBranch.c" + _tmp9_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_ENTRY, SidebarEntry)) > 0; +#line 1405 "FoldersBranch.c" } #line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (_tmp10_) { + if (_tmp9_) { #line 121 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (folder_entry); #line 121 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return; -#line 1365 "FoldersBranch.c" +#line 1413 "FoldersBranch.c" } #line 124 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp17_ = folder_entry; + _tmp15_ = folder_entry; #line 124 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp18_ = _g_object_ref0 (_tmp17_); + _tmp16_ = _g_object_ref0 (_tmp15_); #line 124 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - prune_point = _tmp18_; + prune_point = _tmp16_; #line 125 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp19_ = prune_point; + _tmp17_ = prune_point; #line 125 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _vala_assert (_tmp19_ != NULL, "prune_point != null"); -#line 1377 "FoldersBranch.c" + _vala_assert (_tmp17_ != NULL, "prune_point != null"); +#line 1425 "FoldersBranch.c" { - gboolean _tmp20_ = FALSE; + gboolean _tmp18_ = FALSE; #line 127 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp20_ = TRUE; + _tmp18_ = TRUE; #line 127 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" while (TRUE) { -#line 1384 "FoldersBranch.c" +#line 1432 "FoldersBranch.c" gboolean removed = FALSE; - GeeHashMap* _tmp21_; - FoldersSidebarEntry* _tmp22_; - GFile* _tmp23_; - GFile* _tmp24_; - gboolean _tmp25_; - gboolean _tmp26_; + GeeHashMap* _tmp19_; + FoldersSidebarEntry* _tmp20_; + GFile* _tmp21_; + GFile* _tmp22_; + gboolean _tmp23_; + gboolean _tmp24_; FoldersSidebarEntry* parent = NULL; + FoldersSidebarEntry* _tmp25_; + SidebarEntry* _tmp26_; FoldersSidebarEntry* _tmp27_; - SidebarEntry* _tmp28_; - FoldersSidebarEntry* _tmp29_; - gboolean _tmp30_ = FALSE; - gboolean _tmp31_ = FALSE; - FoldersSidebarEntry* _tmp32_; - FoldersSidebarEntry* _tmp38_; - FoldersSidebarEntry* _tmp39_; + gboolean _tmp28_ = FALSE; + gboolean _tmp29_ = FALSE; + FoldersSidebarEntry* _tmp30_; + FoldersSidebarEntry* _tmp35_; + FoldersSidebarEntry* _tmp36_; #line 127 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (!_tmp20_) { -#line 1403 "FoldersBranch.c" + if (!_tmp18_) { +#line 1451 "FoldersBranch.c" } #line 127 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp20_ = FALSE; + _tmp18_ = FALSE; #line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp21_ = self->priv->entries; + _tmp19_ = self->priv->entries; #line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp22_ = prune_point; + _tmp20_ = prune_point; #line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp23_ = folders_sidebar_entry_get_dir (_tmp22_); + _tmp21_ = folders_sidebar_entry_get_dir (_tmp20_); #line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp24_ = _tmp23_; + _tmp22_ = _tmp21_; #line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp25_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_, NULL); + _tmp23_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, NULL); #line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - removed = _tmp25_; + removed = _tmp23_; #line 129 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp26_ = removed; + _tmp24_ = removed; #line 129 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _vala_assert (_tmp26_, "removed"); + _vala_assert (_tmp24_, "removed"); #line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp27_ = prune_point; + _tmp25_ = prune_point; #line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp28_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); + _tmp26_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); #line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp29_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, FOLDERS_TYPE_SIDEBAR_ENTRY) ? ((FoldersSidebarEntry*) _tmp28_) : NULL; + _tmp27_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, FOLDERS_TYPE_SIDEBAR_ENTRY) ? ((FoldersSidebarEntry*) _tmp26_) : NULL; #line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (_tmp29_ == NULL) { + if (_tmp27_ == NULL) { #line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _g_object_unref0 (_tmp28_); -#line 1433 "FoldersBranch.c" + _g_object_unref0 (_tmp26_); +#line 1481 "FoldersBranch.c" } #line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - parent = _tmp29_; + parent = _tmp27_; #line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp32_ = parent; + _tmp30_ = parent; #line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (_tmp32_ == NULL) { + if (_tmp30_ == NULL) { #line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp31_ = TRUE; -#line 1443 "FoldersBranch.c" + _tmp29_ = TRUE; +#line 1491 "FoldersBranch.c" } else { - FoldersSidebarEntry* _tmp33_; - gint _tmp34_; - gint _tmp35_; + FoldersSidebarEntry* _tmp31_; + gint _tmp32_; + gint _tmp33_; #line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp33_ = parent; + _tmp31_ = parent; #line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp34_ = folders_sidebar_entry_get_count (_tmp33_); + _tmp32_ = folders_sidebar_entry_get_count (_tmp31_); #line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp35_ = _tmp34_; + _tmp33_ = _tmp32_; #line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp31_ = _tmp35_ != 0; -#line 1456 "FoldersBranch.c" + _tmp29_ = _tmp33_ != 0; +#line 1504 "FoldersBranch.c" } #line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (_tmp31_) { + if (_tmp29_) { #line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp30_ = TRUE; -#line 1462 "FoldersBranch.c" + _tmp28_ = TRUE; +#line 1510 "FoldersBranch.c" } else { - FoldersSidebarEntry* _tmp36_; - gint _tmp37_; -#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp36_ = parent; + FoldersSidebarEntry* _tmp34_; #line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp37_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); + _tmp34_ = parent; #line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp30_ = _tmp37_ > 1; -#line 1472 "FoldersBranch.c" + _tmp28_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, SIDEBAR_TYPE_ENTRY, SidebarEntry)) > 1; +#line 1517 "FoldersBranch.c" } #line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (_tmp30_) { + if (_tmp28_) { #line 133 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (parent); #line 133 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" break; -#line 1480 "FoldersBranch.c" +#line 1525 "FoldersBranch.c" } #line 135 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp38_ = parent; + _tmp35_ = parent; #line 135 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp39_ = _g_object_ref0 (_tmp38_); + _tmp36_ = _g_object_ref0 (_tmp35_); #line 135 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (prune_point); #line 135 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - prune_point = _tmp39_; + prune_point = _tmp36_; #line 127 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (parent); -#line 1492 "FoldersBranch.c" +#line 1537 "FoldersBranch.c" } } #line 138 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp40_ = prune_point; + _tmp37_ = prune_point; #line 138 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); + sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); #line 112 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (prune_point); #line 112 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (folder_entry); -#line 1503 "FoldersBranch.c" +#line 1548 "FoldersBranch.c" } -static void folders_branch_class_init (FoldersBranchClass * klass) { +static void +folders_branch_class_init (FoldersBranchClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" folders_branch_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" g_type_class_add_private (klass, sizeof (FoldersBranchPrivate)); #line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" G_OBJECT_CLASS (klass)->finalize = folders_branch_finalize; -#line 1514 "FoldersBranch.c" +#line 1561 "FoldersBranch.c" } -static void folders_branch_instance_init (FoldersBranch * self) { +static void +folders_branch_instance_init (FoldersBranch * self) +{ GeeHashMap* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" self->priv = FOLDERS_BRANCH_GET_PRIVATE (self); @@ -1522,15 +1571,17 @@ static void folders_branch_instance_init (FoldersBranch * self) { _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, FOLDERS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 8 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" self->priv->entries = _tmp0_; -#line 1526 "FoldersBranch.c" +#line 1575 "FoldersBranch.c" } -static void folders_branch_finalize (GObject * obj) { +static void +folders_branch_finalize (GObject * obj) +{ FoldersBranch * self; #line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_TYPE_BRANCH, FoldersBranch); -#line 1534 "FoldersBranch.c" +#line 1585 "FoldersBranch.c" { GeeIterator* _sources_it = NULL; MediaCollectionRegistry* _tmp0_; @@ -1559,43 +1610,40 @@ static void folders_branch_finalize (GObject * obj) { _sources_it = _tmp5_; #line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" while (TRUE) { -#line 1563 "FoldersBranch.c" +#line 1614 "FoldersBranch.c" GeeIterator* _tmp6_; - gboolean _tmp7_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - MediaSourceCollection* _tmp10_; - guint _tmp11_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + MediaSourceCollection* _tmp9_; + guint _tmp10_; #line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _tmp6_ = _sources_it; #line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" break; -#line 1579 "FoldersBranch.c" +#line 1627 "FoldersBranch.c" } #line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp8_ = _sources_it; + _tmp7_ = _sources_it; #line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - sources = (MediaSourceCollection*) _tmp9_; + sources = (MediaSourceCollection*) _tmp8_; #line 31 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp10_ = sources; + _tmp9_ = sources; #line 31 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp11_, NULL, FALSE); + g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp10_, NULL, FALSE); #line 31 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _folders_branch_on_media_contents_altered_data_collection_contents_altered, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _folders_branch_on_media_contents_altered_data_collection_contents_altered, self); #line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _data_collection_unref0 (sources); -#line 1595 "FoldersBranch.c" +#line 1643 "FoldersBranch.c" } #line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (_sources_it); -#line 1599 "FoldersBranch.c" +#line 1647 "FoldersBranch.c" } #line 8 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (self->priv->entries); @@ -1603,11 +1651,13 @@ static void folders_branch_finalize (GObject * obj) { _g_object_unref0 (self->priv->home_dir); #line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" G_OBJECT_CLASS (folders_branch_parent_class)->finalize (obj); -#line 1607 "FoldersBranch.c" +#line 1655 "FoldersBranch.c" } -GType folders_branch_get_type (void) { +GType +folders_branch_get_type (void) +{ static volatile gsize folders_branch_type_id__volatile = 0; if (g_once_init_enter (&folders_branch_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (FoldersBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) folders_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FoldersBranch), 0, (GInstanceInitFunc) folders_branch_instance_init, NULL }; @@ -1619,35 +1669,45 @@ GType folders_branch_get_type (void) { } -FoldersRoot* folders_root_construct (GType object_type) { +FoldersRoot* +folders_root_construct (GType object_type) +{ FoldersRoot * self = NULL; #line 144 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" self = (FoldersRoot*) sidebar_header_construct (object_type, _ ("Folders"), _ ("Browse the library’s folder structure"), TRUE); #line 143 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return self; -#line 1629 "FoldersBranch.c" +#line 1681 "FoldersBranch.c" } -FoldersRoot* folders_root_new (void) { +FoldersRoot* +folders_root_new (void) +{ #line 143 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return folders_root_construct (FOLDERS_TYPE_ROOT); -#line 1636 "FoldersBranch.c" +#line 1690 "FoldersBranch.c" } -static void folders_root_class_init (FoldersRootClass * klass) { +static void +folders_root_class_init (FoldersRootClass * klass) +{ #line 142 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" folders_root_parent_class = g_type_class_peek_parent (klass); -#line 1643 "FoldersBranch.c" +#line 1699 "FoldersBranch.c" } -static void folders_root_instance_init (FoldersRoot * self) { +static void +folders_root_instance_init (FoldersRoot * self) +{ } -GType folders_root_get_type (void) { +GType +folders_root_get_type (void) +{ static volatile gsize folders_root_type_id__volatile = 0; if (g_once_init_enter (&folders_root_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (FoldersRootClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) folders_root_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FoldersRoot), 0, (GInstanceInitFunc) folders_root_instance_init, NULL }; @@ -1659,52 +1719,53 @@ GType folders_root_get_type (void) { } -FoldersSidebarEntry* folders_sidebar_entry_construct (GType object_type, GFile* dir) { +FoldersSidebarEntry* +folders_sidebar_entry_construct (GType object_type, + GFile* dir) +{ FoldersSidebarEntry * self = NULL; - GFile* _tmp0_; - GFile* _tmp1_; + gchar* _tmp0_; + gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; #line 169 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" g_return_val_if_fail (G_IS_FILE (dir), NULL); #line 169 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" self = (FoldersSidebarEntry*) sidebar_simple_page_entry_construct (object_type); #line 170 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp0_ = dir; -#line 170 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - folders_sidebar_entry_set_dir (self, _tmp0_); -#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp1_ = dir; -#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp2_ = g_file_get_path (_tmp1_); + folders_sidebar_entry_set_dir (self, dir); #line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp3_ = _tmp2_; + _tmp0_ = g_file_get_path (dir); #line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp4_ = g_utf8_collate_key_for_filename (_tmp3_, (gssize) -1); + _tmp1_ = _tmp0_; #line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp5_ = _tmp4_; + _tmp2_ = g_utf8_collate_key_for_filename (_tmp1_, (gssize) -1); #line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - folders_sidebar_entry_set_collation (self, _tmp5_); + _tmp3_ = _tmp2_; #line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _g_free0 (_tmp5_); + folders_sidebar_entry_set_collation (self, _tmp3_); #line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_free0 (_tmp3_); +#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" + _g_free0 (_tmp1_); #line 169 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return self; -#line 1697 "FoldersBranch.c" +#line 1754 "FoldersBranch.c" } -FoldersSidebarEntry* folders_sidebar_entry_new (GFile* dir) { +FoldersSidebarEntry* +folders_sidebar_entry_new (GFile* dir) +{ #line 169 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return folders_sidebar_entry_construct (FOLDERS_TYPE_SIDEBAR_ENTRY, dir); -#line 1704 "FoldersBranch.c" +#line 1763 "FoldersBranch.c" } -static gchar* folders_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +folders_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ FoldersSidebarEntry * self; gchar* result = NULL; GFile* _tmp0_; @@ -1719,11 +1780,13 @@ static gchar* folders_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntr result = _tmp1_; #line 175 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return result; -#line 1723 "FoldersBranch.c" +#line 1784 "FoldersBranch.c" } -static gchar* folders_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { +static gchar* +folders_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) +{ FoldersSidebarEntry * self; gchar* result = NULL; const gchar* _tmp0_ = NULL; @@ -1738,20 +1801,20 @@ static gchar* folders_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntr _tmp2_ = _tmp1_; #line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" if (_tmp2_ == 0) { -#line 1742 "FoldersBranch.c" +#line 1805 "FoldersBranch.c" const gchar* _tmp3_; #line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _tmp3_ = folders_icon; #line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _tmp0_ = _tmp3_; -#line 1748 "FoldersBranch.c" +#line 1811 "FoldersBranch.c" } else { const gchar* _tmp4_; #line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _tmp4_ = folders_have_photos_icon; #line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _tmp0_ = _tmp4_; -#line 1755 "FoldersBranch.c" +#line 1818 "FoldersBranch.c" } #line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _tmp5_ = g_strdup (_tmp0_); @@ -1759,11 +1822,13 @@ static gchar* folders_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntr result = _tmp5_; #line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return result; -#line 1763 "FoldersBranch.c" +#line 1826 "FoldersBranch.c" } -static gchar* folders_sidebar_entry_real_to_string (SidebarSimplePageEntry* base) { +static gchar* +folders_sidebar_entry_real_to_string (SidebarSimplePageEntry* base) +{ FoldersSidebarEntry * self; gchar* result = NULL; GFile* _tmp0_; @@ -1778,11 +1843,13 @@ static gchar* folders_sidebar_entry_real_to_string (SidebarSimplePageEntry* base result = _tmp1_; #line 183 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return result; -#line 1782 "FoldersBranch.c" +#line 1847 "FoldersBranch.c" } -static gboolean folders_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base) { +static gboolean +folders_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base) +{ FoldersSidebarEntry * self; gboolean result = FALSE; #line 186 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" @@ -1791,11 +1858,13 @@ static gboolean folders_sidebar_entry_real_expand_on_select (SidebarExpandableEn result = TRUE; #line 187 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return result; -#line 1795 "FoldersBranch.c" +#line 1862 "FoldersBranch.c" } -static Page* folders_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +folders_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) +{ FoldersSidebarEntry * self; Page* result = NULL; GFile* _tmp0_; @@ -1812,11 +1881,13 @@ static Page* folders_sidebar_entry_real_create_page (SidebarSimplePageEntry* bas result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); #line 191 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return result; -#line 1816 "FoldersBranch.c" +#line 1885 "FoldersBranch.c" } -GFile* folders_sidebar_entry_get_dir (FoldersSidebarEntry* self) { +GFile* +folders_sidebar_entry_get_dir (FoldersSidebarEntry* self) +{ GFile* result; GFile* _tmp0_; #line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" @@ -1827,34 +1898,36 @@ GFile* folders_sidebar_entry_get_dir (FoldersSidebarEntry* self) { result = _tmp0_; #line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return result; -#line 1831 "FoldersBranch.c" +#line 1902 "FoldersBranch.c" } -static void folders_sidebar_entry_set_dir (FoldersSidebarEntry* self, GFile* value) { +static void +folders_sidebar_entry_set_dir (FoldersSidebarEntry* self, + GFile* value) +{ #line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" g_return_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self)); #line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" if (folders_sidebar_entry_get_dir (self) != value) { -#line 1840 "FoldersBranch.c" +#line 1914 "FoldersBranch.c" GFile* _tmp0_; - GFile* _tmp1_; -#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp0_ = value; #line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (value); #line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_object_unref0 (self->priv->_dir); #line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - self->priv->_dir = _tmp1_; + self->priv->_dir = _tmp0_; #line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - g_object_notify ((GObject *) self, "dir"); -#line 1853 "FoldersBranch.c" + g_object_notify_by_pspec ((GObject *) self, folders_sidebar_entry_properties[FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY]); +#line 1924 "FoldersBranch.c" } } -const gchar* folders_sidebar_entry_get_collation (FoldersSidebarEntry* self) { +const gchar* +folders_sidebar_entry_get_collation (FoldersSidebarEntry* self) +{ const gchar* result; const gchar* _tmp0_; #line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" @@ -1865,34 +1938,36 @@ const gchar* folders_sidebar_entry_get_collation (FoldersSidebarEntry* self) { result = _tmp0_; #line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return result; -#line 1869 "FoldersBranch.c" +#line 1942 "FoldersBranch.c" } -static void folders_sidebar_entry_set_collation (FoldersSidebarEntry* self, const gchar* value) { +static void +folders_sidebar_entry_set_collation (FoldersSidebarEntry* self, + const gchar* value) +{ #line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" g_return_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self)); #line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" if (g_strcmp0 (value, folders_sidebar_entry_get_collation (self)) != 0) { -#line 1878 "FoldersBranch.c" - const gchar* _tmp0_; - gchar* _tmp1_; -#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp0_ = value; +#line 1954 "FoldersBranch.c" + gchar* _tmp0_; #line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (value); #line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" _g_free0 (self->priv->_collation); #line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - self->priv->_collation = _tmp1_; + self->priv->_collation = _tmp0_; #line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - g_object_notify ((GObject *) self, "collation"); -#line 1891 "FoldersBranch.c" + g_object_notify_by_pspec ((GObject *) self, folders_sidebar_entry_properties[FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY]); +#line 1964 "FoldersBranch.c" } } -gint folders_sidebar_entry_get_count (FoldersSidebarEntry* self) { +gint +folders_sidebar_entry_get_count (FoldersSidebarEntry* self) +{ gint result; gint _tmp0_; #line 154 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" @@ -1903,17 +1978,19 @@ gint folders_sidebar_entry_get_count (FoldersSidebarEntry* self) { result = _tmp0_; #line 155 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" return result; -#line 1907 "FoldersBranch.c" +#line 1982 "FoldersBranch.c" } -void folders_sidebar_entry_set_count (FoldersSidebarEntry* self, gint value) { +void +folders_sidebar_entry_set_count (FoldersSidebarEntry* self, + gint value) +{ gint prev_count = 0; gint _tmp0_; - gint _tmp1_; + gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; - gint _tmp4_; + gint _tmp3_; #line 158 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" g_return_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self)); #line 159 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" @@ -1921,75 +1998,75 @@ void folders_sidebar_entry_set_count (FoldersSidebarEntry* self, gint value) { #line 159 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" prev_count = _tmp0_; #line 160 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp1_ = value; -#line 160 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - self->priv->_count = _tmp1_; + self->priv->_count = value; #line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp4_ = prev_count; + _tmp3_ = prev_count; #line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (_tmp4_ == 0) { -#line 1932 "FoldersBranch.c" - gint _tmp5_; + if (_tmp3_ == 0) { +#line 2007 "FoldersBranch.c" + gint _tmp4_; #line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp5_ = self->priv->_count; + _tmp4_ = self->priv->_count; #line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp3_ = _tmp5_ == 1; -#line 1938 "FoldersBranch.c" + _tmp2_ = _tmp4_ == 1; +#line 2013 "FoldersBranch.c" } else { #line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp3_ = FALSE; -#line 1942 "FoldersBranch.c" + _tmp2_ = FALSE; +#line 2017 "FoldersBranch.c" } #line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (_tmp3_) { + if (_tmp2_) { #line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp2_ = TRUE; -#line 1948 "FoldersBranch.c" + _tmp1_ = TRUE; +#line 2023 "FoldersBranch.c" } else { - gboolean _tmp6_ = FALSE; - gint _tmp7_; + gboolean _tmp5_ = FALSE; + gint _tmp6_; #line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp7_ = prev_count; + _tmp6_ = prev_count; #line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (_tmp7_ == 1) { -#line 1956 "FoldersBranch.c" - gint _tmp8_; + if (_tmp6_ == 1) { +#line 2031 "FoldersBranch.c" + gint _tmp7_; #line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp8_ = self->priv->_count; + _tmp7_ = self->priv->_count; #line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp6_ = _tmp8_ == 0; -#line 1962 "FoldersBranch.c" + _tmp5_ = _tmp7_ == 0; +#line 2037 "FoldersBranch.c" } else { #line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp6_ = FALSE; -#line 1966 "FoldersBranch.c" + _tmp5_ = FALSE; +#line 2041 "FoldersBranch.c" } #line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp2_ = _tmp6_; -#line 1970 "FoldersBranch.c" + _tmp1_ = _tmp5_; +#line 2045 "FoldersBranch.c" } #line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - if (_tmp2_) { -#line 1974 "FoldersBranch.c" + if (_tmp1_) { +#line 2049 "FoldersBranch.c" + gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; #line 164 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp9_ = sidebar_simple_page_entry_get_sidebar_icon (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry)); + _tmp8_ = sidebar_simple_page_entry_get_sidebar_icon (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry)); #line 164 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 164 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-icon-changed", _tmp10_); + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-icon-changed", _tmp9_); #line 164 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - _g_free0 (_tmp10_); -#line 1985 "FoldersBranch.c" + _g_free0 (_tmp9_); +#line 2060 "FoldersBranch.c" } #line 158 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - g_object_notify ((GObject *) self, "count"); -#line 1989 "FoldersBranch.c" + g_object_notify_by_pspec ((GObject *) self, folders_sidebar_entry_properties[FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY]); +#line 2064 "FoldersBranch.c" } -static void folders_sidebar_entry_class_init (FoldersSidebarEntryClass * klass) { +static void +folders_sidebar_entry_class_init (FoldersSidebarEntryClass * klass) +{ #line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" folders_sidebar_entry_parent_class = g_type_class_peek_parent (klass); #line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" @@ -2009,34 +2086,40 @@ static void folders_sidebar_entry_class_init (FoldersSidebarEntryClass * klass) #line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" G_OBJECT_CLASS (klass)->finalize = folders_sidebar_entry_finalize; #line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY, g_param_spec_object ("dir", "dir", "dir", g_file_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY, folders_sidebar_entry_properties[FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY] = g_param_spec_object ("dir", "dir", "dir", g_file_get_type (), G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY, g_param_spec_string ("collation", "collation", "collation", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY, folders_sidebar_entry_properties[FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY] = g_param_spec_string ("collation", "collation", "collation", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY, g_param_spec_int ("count", "count", "count", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); -#line 2018 "FoldersBranch.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY, folders_sidebar_entry_properties[FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY] = g_param_spec_int ("count", "count", "count", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE)); +#line 2095 "FoldersBranch.c" } -static void folders_sidebar_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) { +static void +folders_sidebar_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) +{ #line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" folders_sidebar_entry_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) folders_sidebar_entry_real_expand_on_select; -#line 2027 "FoldersBranch.c" +#line 2106 "FoldersBranch.c" } -static void folders_sidebar_entry_instance_init (FoldersSidebarEntry * self) { +static void +folders_sidebar_entry_instance_init (FoldersSidebarEntry * self) +{ #line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" self->priv = FOLDERS_SIDEBAR_ENTRY_GET_PRIVATE (self); #line 152 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" self->priv->_count = 0; -#line 2036 "FoldersBranch.c" +#line 2117 "FoldersBranch.c" } -static void folders_sidebar_entry_finalize (GObject * obj) { +static void +folders_sidebar_entry_finalize (GObject * obj) +{ FoldersSidebarEntry * self; #line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry); @@ -2046,11 +2129,13 @@ static void folders_sidebar_entry_finalize (GObject * obj) { _g_free0 (self->priv->_collation); #line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" G_OBJECT_CLASS (folders_sidebar_entry_parent_class)->finalize (obj); -#line 2050 "FoldersBranch.c" +#line 2133 "FoldersBranch.c" } -GType folders_sidebar_entry_get_type (void) { +GType +folders_sidebar_entry_get_type (void) +{ static volatile gsize folders_sidebar_entry_type_id__volatile = 0; if (g_once_init_enter (&folders_sidebar_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (FoldersSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) folders_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FoldersSidebarEntry), 0, (GInstanceInitFunc) folders_sidebar_entry_instance_init, NULL }; @@ -2064,7 +2149,12 @@ GType folders_sidebar_entry_get_type (void) { } -static void _vala_folders_sidebar_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_folders_sidebar_entry_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ FoldersSidebarEntry * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry); #line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" @@ -2087,18 +2177,23 @@ static void _vala_folders_sidebar_entry_get_property (GObject * object, guint pr g_value_set_int (value, folders_sidebar_entry_get_count (self)); #line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" break; -#line 2091 "FoldersBranch.c" +#line 2181 "FoldersBranch.c" default: #line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" break; -#line 2097 "FoldersBranch.c" +#line 2187 "FoldersBranch.c" } } -static void _vala_folders_sidebar_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { +static void +_vala_folders_sidebar_entry_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec) +{ FoldersSidebarEntry * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry); #line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" @@ -2121,13 +2216,13 @@ static void _vala_folders_sidebar_entry_set_property (GObject * object, guint pr folders_sidebar_entry_set_count (self, g_value_get_int (value)); #line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" break; -#line 2125 "FoldersBranch.c" +#line 2220 "FoldersBranch.c" default: #line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala" break; -#line 2131 "FoldersBranch.c" +#line 2226 "FoldersBranch.c" } } diff --git a/src/folders/FoldersPage.c b/src/folders/FoldersPage.c index abc3f83..095b114 100644 --- a/src/folders/FoldersPage.c +++ b/src/folders/FoldersPage.c @@ -1,4 +1,4 @@ -/* FoldersPage.c generated by valac 0.36.6, the Vala compiler +/* FoldersPage.c generated by valac 0.40.4, the Vala compiler * generated from FoldersPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -230,6 +231,11 @@ typedef struct _CollectionViewManagerClass CollectionViewManagerClass; typedef struct _FoldersPageFolderViewManager FoldersPageFolderViewManager; typedef struct _FoldersPageFolderViewManagerClass FoldersPageFolderViewManagerClass; +enum { + FOLDERS_PAGE_0_PROPERTY, + FOLDERS_PAGE_NUM_PROPERTIES +}; +static GParamSpec* folders_page_properties[FOLDERS_PAGE_NUM_PROPERTIES]; #define _view_manager_unref0(var) ((var == NULL) ? NULL : (var = (view_manager_unref (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) @@ -569,9 +575,15 @@ GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType checkerboard_page_get_type (void) G_GNUC_CONST; @@ -585,17 +597,29 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self); gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType search_view_filter_get_type (void) G_GNUC_CONST; gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; @@ -607,27 +631,41 @@ GType collection_page_get_type (void) G_GNUC_CONST; GType folders_page_get_type (void) G_GNUC_CONST; gpointer view_manager_ref (gpointer instance); void view_manager_unref (gpointer instance); -GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_manager (GValue* value, gpointer v_object); -void value_take_view_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_manager (GValue* value, + gpointer v_object); +void value_take_view_manager (GValue* value, + gpointer v_object); gpointer value_get_view_manager (const GValue* value); GType view_manager_get_type (void) G_GNUC_CONST; GType collection_view_manager_get_type (void) G_GNUC_CONST; static GType folders_page_folder_view_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define FOLDERS_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), FOLDERS_TYPE_PAGE, FoldersPagePrivate)) -enum { - FOLDERS_PAGE_DUMMY_PROPERTY -}; FoldersPage* folders_page_new (GFile* dir); -FoldersPage* folders_page_construct (GType object_type, GFile* dir); -CollectionPage* collection_page_construct (GType object_type, const gchar* page_name); -static FoldersPageFolderViewManager* folders_page_folder_view_manager_new (FoldersPage* owner, GFile* dir); -static FoldersPageFolderViewManager* folders_page_folder_view_manager_construct (GType object_type, FoldersPage* owner, GFile* dir); +FoldersPage* folders_page_construct (GType object_type, + GFile* dir); +CollectionPage* collection_page_construct (GType object_type, + const gchar* page_name); +static FoldersPageFolderViewManager* folders_page_folder_view_manager_new (FoldersPage* owner, + GFile* dir); +static FoldersPageFolderViewManager* folders_page_folder_view_manager_construct (GType object_type, + FoldersPage* owner, + GFile* dir); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -635,9 +673,15 @@ GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); @@ -646,32 +690,57 @@ GType view_collection_get_type (void) G_GNUC_CONST; ViewCollection* page_get_view (Page* self); gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer view_collection_monitor_ref (gpointer instance); void view_collection_monitor_unref (gpointer instance); -GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void view_collection_value_set_monitor (GValue* value, gpointer v_object); -void view_collection_value_take_monitor (GValue* value, gpointer v_object); +GParamSpec* view_collection_param_spec_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void view_collection_value_set_monitor (GValue* value, + gpointer v_object); +void view_collection_value_take_monitor (GValue* value, + gpointer v_object); gpointer view_collection_value_get_monitor (const GValue* value); GType view_collection_monitor_get_type (void) G_GNUC_CONST; -ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target); -static void folders_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by); +ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq, + GeeCollection* initial, + ProgressMonitor progress_monitor, + void* progress_monitor_target); +static void folders_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); -void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by); -static void folders_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by); -void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by); -enum { - FOLDERS_PAGE_FOLDER_VIEW_MANAGER_DUMMY_PROPERTY -}; +void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, + gboolean* sort_order, + gint* sort_by); +static void folders_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by); +void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, + gboolean sort_order, + gint sort_by); CollectionViewManager* collection_view_manager_new (CollectionPage* page); -CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page); -static gboolean folders_page_folder_view_manager_real_include_in_view (ViewManager* base, DataSource* source); +CollectionViewManager* collection_view_manager_construct (GType object_type, + CollectionPage* page); +static gboolean folders_page_folder_view_manager_real_include_in_view (ViewManager* base, + DataSource* source); GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; GFile* media_source_get_file (MediaSource* self); @@ -679,128 +748,128 @@ static void folders_page_folder_view_manager_finalize (ViewManager * obj); static void folders_page_finalize (GObject * obj); -FoldersPage* folders_page_construct (GType object_type, GFile* dir) { +FoldersPage* +folders_page_construct (GType object_type, + GFile* dir) +{ FoldersPage * self = NULL; - GFile* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - GFile* _tmp3_; - FoldersPageFolderViewManager* _tmp4_; + FoldersPageFolderViewManager* _tmp2_; #line 24 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" g_return_val_if_fail (G_IS_FILE (dir), NULL); #line 25 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp0_ = dir; + _tmp0_ = g_file_get_path (dir); #line 25 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp1_ = g_file_get_path (_tmp0_); -#line 25 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 25 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - self = (FoldersPage*) collection_page_construct (object_type, _tmp2_); + self = (FoldersPage*) collection_page_construct (object_type, _tmp1_); #line 25 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 27 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp3_ = dir; -#line 27 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp4_ = folders_page_folder_view_manager_new (self, _tmp3_); + _tmp2_ = folders_page_folder_view_manager_new (self, dir); #line 27 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" _view_manager_unref0 (self->priv->view_manager); #line 27 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - self->priv->view_manager = _tmp4_; -#line 710 "FoldersPage.c" + self->priv->view_manager = _tmp2_; +#line 776 "FoldersPage.c" { GeeIterator* _sources_it = NULL; - MediaCollectionRegistry* _tmp5_; - MediaCollectionRegistry* _tmp6_; - GeeCollection* _tmp7_; - GeeCollection* _tmp8_; - GeeIterator* _tmp9_; - GeeIterator* _tmp10_; + MediaCollectionRegistry* _tmp3_; + MediaCollectionRegistry* _tmp4_; + GeeCollection* _tmp5_; + GeeCollection* _tmp6_; + GeeIterator* _tmp7_; + GeeIterator* _tmp8_; #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp5_ = media_collection_registry_get_instance (); + _tmp3_ = media_collection_registry_get_instance (); #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp7_ = media_collection_registry_get_all (_tmp6_); + _tmp5_ = media_collection_registry_get_all (_tmp4_); #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp6_); #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _media_collection_registry_unref0 (_tmp6_); + _media_collection_registry_unref0 (_tmp4_); #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _sources_it = _tmp10_; + _sources_it = _tmp8_; #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" while (TRUE) { -#line 739 "FoldersPage.c" - GeeIterator* _tmp11_; - gboolean _tmp12_; +#line 805 "FoldersPage.c" + GeeIterator* _tmp9_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp13_; - gpointer _tmp14_; - ViewCollection* _tmp15_; - ViewCollection* _tmp16_; - MediaSourceCollection* _tmp17_; - FoldersPageFolderViewManager* _tmp18_; - ViewCollectionMonitor* _tmp19_; - ViewCollectionMonitor* _tmp20_; + GeeIterator* _tmp10_; + gpointer _tmp11_; + ViewCollection* _tmp12_; + ViewCollection* _tmp13_; + MediaSourceCollection* _tmp14_; + FoldersPageFolderViewManager* _tmp15_; + ViewCollectionMonitor* _tmp16_; + ViewCollectionMonitor* _tmp17_; #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp11_ = _sources_it; + _tmp9_ = _sources_it; #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp12_ = gee_iterator_next (_tmp11_); -#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - if (!_tmp12_) { + if (!gee_iterator_next (_tmp9_)) { #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" break; -#line 759 "FoldersPage.c" +#line 822 "FoldersPage.c" } #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp13_ = _sources_it; + _tmp10_ = _sources_it; #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp14_ = gee_iterator_get (_tmp13_); + _tmp11_ = gee_iterator_get (_tmp10_); #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - sources = (MediaSourceCollection*) _tmp14_; + sources = (MediaSourceCollection*) _tmp11_; #line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp16_ = _tmp15_; + _tmp13_ = _tmp12_; #line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp17_ = sources; + _tmp14_ = sources; #line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp18_ = self->priv->view_manager; + _tmp15_ = self->priv->view_manager; #line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp19_ = view_collection_monitor_source_collection (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL); + _tmp16_ = view_collection_monitor_source_collection (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL); #line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp20_ = _tmp19_; + _tmp17_ = _tmp16_; #line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _view_collection_monitor_unref0 (_tmp20_); + _view_collection_monitor_unref0 (_tmp17_); #line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _data_collection_unref0 (_tmp16_); + _data_collection_unref0 (_tmp13_); #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" _data_collection_unref0 (sources); -#line 785 "FoldersPage.c" +#line 848 "FoldersPage.c" } #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" _g_object_unref0 (_sources_it); -#line 789 "FoldersPage.c" +#line 852 "FoldersPage.c" } #line 24 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" return self; -#line 793 "FoldersPage.c" +#line 856 "FoldersPage.c" } -FoldersPage* folders_page_new (GFile* dir) { +FoldersPage* +folders_page_new (GFile* dir) +{ #line 24 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" return folders_page_construct (FOLDERS_TYPE_PAGE, dir); -#line 800 "FoldersPage.c" +#line 865 "FoldersPage.c" } -static void folders_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) { +static void +folders_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by) +{ FoldersPage * self; gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; @@ -826,23 +895,25 @@ static void folders_page_real_get_config_photos_sort (MediaPage* base, gboolean* if (sort_order) { #line 33 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" *sort_order = _vala_sort_order; -#line 830 "FoldersPage.c" +#line 899 "FoldersPage.c" } #line 33 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" if (sort_by) { #line 33 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" *sort_by = _vala_sort_by; -#line 836 "FoldersPage.c" +#line 905 "FoldersPage.c" } } -static void folders_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { +static void +folders_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by) +{ FoldersPage * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - gboolean _tmp2_; - gint _tmp3_; #line 37 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_PAGE, FoldersPage); #line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" @@ -850,109 +921,111 @@ static void folders_page_real_set_config_photos_sort (MediaPage* base, gboolean #line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" _tmp1_ = _tmp0_; #line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp2_ = sort_order; -#line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp3_ = sort_by; -#line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); + configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), sort_order, sort_by); #line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" _g_object_unref0 (_tmp1_); -#line 861 "FoldersPage.c" +#line 928 "FoldersPage.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 14 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" return self ? g_object_ref (self) : NULL; -#line 868 "FoldersPage.c" +#line 937 "FoldersPage.c" } -static FoldersPageFolderViewManager* folders_page_folder_view_manager_construct (GType object_type, FoldersPage* owner, GFile* dir) { +static FoldersPageFolderViewManager* +folders_page_folder_view_manager_construct (GType object_type, + FoldersPage* owner, + GFile* dir) +{ FoldersPageFolderViewManager* self = NULL; - FoldersPage* _tmp0_; - GFile* _tmp1_; - GFile* _tmp2_; + GFile* _tmp0_; #line 11 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" g_return_val_if_fail (FOLDERS_IS_PAGE (owner), NULL); #line 11 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" g_return_val_if_fail (G_IS_FILE (dir), NULL); #line 12 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp0_ = owner; -#line 12 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - self = (FoldersPageFolderViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage)); + self = (FoldersPageFolderViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, TYPE_COLLECTION_PAGE, CollectionPage)); #line 14 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp1_ = dir; -#line 14 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp0_ = _g_object_ref0 (dir); #line 14 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" _g_object_unref0 (self->dir); #line 14 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - self->dir = _tmp2_; + self->dir = _tmp0_; #line 11 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" return self; -#line 895 "FoldersPage.c" +#line 962 "FoldersPage.c" } -static FoldersPageFolderViewManager* folders_page_folder_view_manager_new (FoldersPage* owner, GFile* dir) { +static FoldersPageFolderViewManager* +folders_page_folder_view_manager_new (FoldersPage* owner, + GFile* dir) +{ #line 11 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" return folders_page_folder_view_manager_construct (FOLDERS_PAGE_TYPE_FOLDER_VIEW_MANAGER, owner, dir); -#line 902 "FoldersPage.c" +#line 972 "FoldersPage.c" } -static gboolean folders_page_folder_view_manager_real_include_in_view (ViewManager* base, DataSource* source) { +static gboolean +folders_page_folder_view_manager_real_include_in_view (ViewManager* base, + DataSource* source) +{ FoldersPageFolderViewManager * self; gboolean result = FALSE; - DataSource* _tmp0_; + GFile* _tmp0_; GFile* _tmp1_; GFile* _tmp2_; - GFile* _tmp3_; - gboolean _tmp4_; - gboolean _tmp5_; + gboolean _tmp3_; #line 17 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_PAGE_TYPE_FOLDER_VIEW_MANAGER, FoldersPageFolderViewManager); #line 17 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp0_ = source; -#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp1_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp2_ = _tmp1_; + _tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource)); #line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp3_ = self->dir; + _tmp1_ = _tmp0_; #line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp4_ = g_file_has_prefix (_tmp2_, _tmp3_); + _tmp2_ = self->dir; #line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _tmp5_ = _tmp4_; + _tmp3_ = g_file_has_prefix (_tmp1_, _tmp2_); #line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" - result = _tmp5_; + result = _tmp3_; #line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" return result; -#line 937 "FoldersPage.c" +#line 1004 "FoldersPage.c" } -static void folders_page_folder_view_manager_class_init (FoldersPageFolderViewManagerClass * klass) { +static void +folders_page_folder_view_manager_class_init (FoldersPageFolderViewManagerClass * klass) +{ #line 8 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" folders_page_folder_view_manager_parent_class = g_type_class_peek_parent (klass); #line 8 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" ((ViewManagerClass *) klass)->finalize = folders_page_folder_view_manager_finalize; #line 8 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) folders_page_folder_view_manager_real_include_in_view; -#line 948 "FoldersPage.c" +#line 1017 "FoldersPage.c" } -static void folders_page_folder_view_manager_instance_init (FoldersPageFolderViewManager * self) { +static void +folders_page_folder_view_manager_instance_init (FoldersPageFolderViewManager * self) +{ } -static void folders_page_folder_view_manager_finalize (ViewManager * obj) { +static void +folders_page_folder_view_manager_finalize (ViewManager * obj) +{ FoldersPageFolderViewManager * self; #line 8 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_PAGE_TYPE_FOLDER_VIEW_MANAGER, FoldersPageFolderViewManager); @@ -960,11 +1033,13 @@ static void folders_page_folder_view_manager_finalize (ViewManager * obj) { _g_object_unref0 (self->dir); #line 8 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" VIEW_MANAGER_CLASS (folders_page_folder_view_manager_parent_class)->finalize (obj); -#line 964 "FoldersPage.c" +#line 1037 "FoldersPage.c" } -static GType folders_page_folder_view_manager_get_type (void) { +static GType +folders_page_folder_view_manager_get_type (void) +{ static volatile gsize folders_page_folder_view_manager_type_id__volatile = 0; if (g_once_init_enter (&folders_page_folder_view_manager_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (FoldersPageFolderViewManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) folders_page_folder_view_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FoldersPageFolderViewManager), 0, (GInstanceInitFunc) folders_page_folder_view_manager_instance_init, NULL }; @@ -976,7 +1051,9 @@ static GType folders_page_folder_view_manager_get_type (void) { } -static void folders_page_class_init (FoldersPageClass * klass) { +static void +folders_page_class_init (FoldersPageClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" folders_page_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" @@ -987,18 +1064,22 @@ static void folders_page_class_init (FoldersPageClass * klass) { ((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) folders_page_real_set_config_photos_sort; #line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" G_OBJECT_CLASS (klass)->finalize = folders_page_finalize; -#line 991 "FoldersPage.c" +#line 1068 "FoldersPage.c" } -static void folders_page_instance_init (FoldersPage * self) { +static void +folders_page_instance_init (FoldersPage * self) +{ #line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" self->priv = FOLDERS_PAGE_GET_PRIVATE (self); -#line 998 "FoldersPage.c" +#line 1077 "FoldersPage.c" } -static void folders_page_finalize (GObject * obj) { +static void +folders_page_finalize (GObject * obj) +{ FoldersPage * self; #line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_TYPE_PAGE, FoldersPage); @@ -1006,11 +1087,13 @@ static void folders_page_finalize (GObject * obj) { _view_manager_unref0 (self->priv->view_manager); #line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala" G_OBJECT_CLASS (folders_page_parent_class)->finalize (obj); -#line 1010 "FoldersPage.c" +#line 1091 "FoldersPage.c" } -GType folders_page_get_type (void) { +GType +folders_page_get_type (void) +{ static volatile gsize folders_page_type_id__volatile = 0; if (g_once_init_enter (&folders_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (FoldersPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) folders_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FoldersPage), 0, (GInstanceInitFunc) folders_page_instance_init, NULL }; diff --git a/src/graphics-processor.c b/src/graphics-processor.c index d0ce76a..da3b2d1 100644 --- a/src/graphics-processor.c +++ b/src/graphics-processor.c @@ -1,7 +1,8 @@ -/* graphics-processor.c generated by valac 0.36.6, the Vala compiler +/* graphics-processor.c generated by valac 0.40.4, the Vala compiler * generated from graphics-processor.vala, do not modify */ + #include #include #include @@ -39,515 +40,446 @@ extern gint jobs; gint jobs = -1; GeeHashMap* marshall_all_transformations (const gchar* filename); -gint _vala_main (gchar** args, int args_length1); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +gint _vala_main (gchar** args, + int args_length1); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); const GOptionEntry options[7] = {{"input", 'i', 0, G_OPTION_ARG_FILENAME, &input_file, "FILE to process", "FILE"}, {"output", 'o', 0, G_OPTION_ARG_FILENAME, &output_file, "destination FILE", "FILE"}, {"pipeline", 'p', 0, G_OPTION_ARG_FILENAME, &pipeline, "graphics PIPELINE to run", "PIPELINE"}, {"auto-enance", 'a', 0, G_OPTION_ARG_NONE, &auto_enhance, "run auto-enhance on input file", NULL}, {"format", 'f', 0, G_OPTION_ARG_STRING, &format, "Save output file in specific format [png, jpeg (default)]", NULL}, {"jobs", 'j', 0, G_OPTION_ARG_INT, &jobs, "Number of parallel jobs to run on an image", NULL}, {NULL, (gchar) 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL}}; -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, + glong maxlen) +{ glong result = 0L; gchar* end = NULL; gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 68 "graphics-processor.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 76 "graphics-processor.c" +#line 75 "graphics-processor.c" } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 88 "graphics-processor.c" +#line 84 "graphics-processor.c" } } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, + glong offset, + glong len) +{ gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + glong _tmp6_; + gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#line 112 "graphics-processor.c" - glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = _tmp2_ >= ((glong) 0); -#line 118 "graphics-processor.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = len >= ((glong) 0); +#line 105 "graphics-processor.c" } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 122 "graphics-processor.c" +#line 109 "graphics-processor.c" } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 126 "graphics-processor.c" - glong _tmp3_; - glong _tmp4_; - glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 138 "graphics-processor.c" +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = string_strnlen ((gchar*) self, offset + len); +#line 115 "graphics-processor.c" } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#line 148 "graphics-processor.c" + gint _tmp1_; + gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = (glong) _tmp2_; +#line 125 "graphics-processor.c" } -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp8_ < ((glong) 0)) { -#line 154 "graphics-processor.c" - glong _tmp9_; - glong _tmp10_; - glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 168 "graphics-processor.c" +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset < ((glong) 0)) { +#line 129 "graphics-processor.c" + glong _tmp3_; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 137 "graphics-processor.c" } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 178 "graphics-processor.c" + glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 144 "graphics-processor.c" } -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp14_ < ((glong) 0)) { -#line 184 "graphics-processor.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 193 "graphics-processor.c" +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (len < ((glong) 0)) { +#line 148 "graphics-processor.c" + glong _tmp5_; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp5_ - offset; +#line 154 "graphics-processor.c" } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 213 "graphics-processor.c" +#line 166 "graphics-processor.c" } -static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { +static gchar* +string_replace (const gchar* self, + const gchar* old, + const gchar* replacement) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if ((*((gchar*) self)) == '\0') { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 232 "graphics-processor.c" +#line 189 "graphics-processor.c" } else { - const gchar* _tmp2_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; -#line 239 "graphics-processor.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) old)) == '\0'; +#line 193 "graphics-processor.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = TRUE; -#line 245 "graphics-processor.c" +#line 199 "graphics-processor.c" } else { - const gchar* _tmp3_; - const gchar* _tmp4_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = replacement; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; -#line 255 "graphics-processor.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (old, replacement) == 0; +#line 203 "graphics-processor.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 259 "graphics-processor.c" - gchar* _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = g_strdup (self); -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 207 "graphics-processor.c" + gchar* _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = g_strdup (self); +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 267 "graphics-processor.c" +#line 215 "graphics-processor.c" } { GRegex* regex = NULL; - const gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - GRegex* _tmp9_; - GRegex* _tmp10_; - gchar* _tmp11_ = NULL; - GRegex* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = old; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = g_regex_escape_string (_tmp6_, -1); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = _tmp9_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp8_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - regex = _tmp10_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp3_; + gchar* _tmp4_; + GRegex* _tmp5_; + GRegex* _tmp6_; + gchar* _tmp7_ = NULL; + GRegex* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_regex_escape_string (old, -1); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = _tmp3_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp5_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp4_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + regex = _tmp6_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 299 "graphics-processor.c" +#line 243 "graphics-processor.c" goto __catch1_g_regex_error; } -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 308 "graphics-processor.c" +#line 252 "graphics-processor.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = regex; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = replacement; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp14_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = regex; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp9_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 324 "graphics-processor.c" +#line 266 "graphics-processor.c" goto __catch1_g_regex_error; } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 335 "graphics-processor.c" +#line 277 "graphics-processor.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = _tmp11_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = NULL; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp15_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp11_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = _tmp7_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = NULL; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp10_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp7_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 349 "graphics-processor.c" +#line 291 "graphics-processor.c" } goto __finally1; __catch1_g_regex_error: { GError* e = NULL; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 363 "graphics-processor.c" +#line 305 "graphics-processor.c" } __finally1: -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 374 "graphics-processor.c" +#line 316 "graphics-processor.c" } } -GeeHashMap* marshall_all_transformations (const gchar* filename) { +GeeHashMap* +marshall_all_transformations (const gchar* filename) +{ GeeHashMap* result = NULL; GError * _inner_error_ = NULL; #line 18 "/home/jens/Source/shotwell/src/graphics-processor.vala" g_return_val_if_fail (filename != NULL, NULL); -#line 384 "graphics-processor.c" +#line 328 "graphics-processor.c" { GKeyFile* keyfile = NULL; GKeyFile* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; GeeHashMap* map = NULL; - GeeHashMap* _tmp17_; + GeeHashMap* _tmp13_; gchar** objects = NULL; - GKeyFile* _tmp18_; - gsize _tmp19_; - gchar** _tmp20_; + GKeyFile* _tmp14_; + gsize _tmp15_; + gchar** _tmp16_; gint objects_length1; gint _objects_size_; - gchar** _tmp21_; - gint _tmp21__length1; + gchar** _tmp17_; + gint _tmp17__length1; #line 20 "/home/jens/Source/shotwell/src/graphics-processor.vala" _tmp0_ = g_key_file_new (); #line 20 "/home/jens/Source/shotwell/src/graphics-processor.vala" keyfile = _tmp0_; #line 21 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp1_ = filename; -#line 21 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp2_ = g_str_has_prefix (_tmp1_, "string:"); -#line 21 "/home/jens/Source/shotwell/src/graphics-processor.vala" - if (_tmp2_) { -#line 410 "graphics-processor.c" + if (g_str_has_prefix (filename, "string:")) { +#line 348 "graphics-processor.c" gchar* data = NULL; - const gchar* _tmp3_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - GKeyFile* _tmp10_; - const gchar* _tmp11_; - const gchar* _tmp12_; - gint _tmp13_; - gint _tmp14_; -#line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp3_ = filename; + GKeyFile* _tmp7_; + const gchar* _tmp8_; + const gchar* _tmp9_; + gint _tmp10_; + gint _tmp11_; #line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp4_ = string_substring (_tmp3_, (glong) 7, (glong) -1); + _tmp1_ = string_substring (filename, (glong) 7, (glong) -1); #line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp6_ = string_replace (_tmp5_, "&", "\n"); + _tmp3_ = string_replace (_tmp2_, "&", "\n"); #line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp8_ = g_strconcat ("[adjustments]\n", _tmp7_, NULL); + _tmp5_ = g_strconcat ("[adjustments]\n", _tmp4_, NULL); #line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp4_); #line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp2_); #line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala" - data = _tmp9_; + data = _tmp6_; #line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp10_ = keyfile; + _tmp7_ = keyfile; #line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp11_ = data; + _tmp8_ = data; #line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp12_ = data; + _tmp9_ = data; #line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp13_ = strlen (_tmp12_); + _tmp10_ = strlen (_tmp9_); #line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp14_ = _tmp13_; + _tmp11_ = _tmp10_; #line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala" - g_key_file_load_from_data (_tmp10_, _tmp11_, (gsize) _tmp14_, G_KEY_FILE_NONE, &_inner_error_); + g_key_file_load_from_data (_tmp7_, _tmp8_, (gsize) _tmp11_, G_KEY_FILE_NONE, &_inner_error_); #line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala" _g_free0 (data); #line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala" _g_key_file_unref0 (keyfile); -#line 462 "graphics-processor.c" +#line 397 "graphics-processor.c" goto __catch0_g_error; } #line 21 "/home/jens/Source/shotwell/src/graphics-processor.vala" _g_free0 (data); -#line 467 "graphics-processor.c" +#line 402 "graphics-processor.c" } else { - GKeyFile* _tmp15_; - const gchar* _tmp16_; + GKeyFile* _tmp12_; #line 25 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp15_ = keyfile; + _tmp12_ = keyfile; #line 25 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp16_ = filename; -#line 25 "/home/jens/Source/shotwell/src/graphics-processor.vala" - g_key_file_load_from_file (_tmp15_, _tmp16_, G_KEY_FILE_NONE, &_inner_error_); + g_key_file_load_from_file (_tmp12_, filename, G_KEY_FILE_NONE, &_inner_error_); #line 25 "/home/jens/Source/shotwell/src/graphics-processor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 25 "/home/jens/Source/shotwell/src/graphics-processor.vala" _g_key_file_unref0 (keyfile); -#line 481 "graphics-processor.c" +#line 413 "graphics-processor.c" goto __catch0_g_error; } } #line 28 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp17_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp13_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 28 "/home/jens/Source/shotwell/src/graphics-processor.vala" - map = _tmp17_; + map = _tmp13_; #line 30 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp18_ = keyfile; + _tmp14_ = keyfile; #line 30 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp20_ = g_key_file_get_groups (_tmp18_, &_tmp19_); + _tmp16_ = g_key_file_get_groups (_tmp14_, &_tmp15_); #line 30 "/home/jens/Source/shotwell/src/graphics-processor.vala" - objects = _tmp20_; + objects = _tmp16_; #line 30 "/home/jens/Source/shotwell/src/graphics-processor.vala" - objects_length1 = _tmp19_; + objects_length1 = _tmp15_; #line 30 "/home/jens/Source/shotwell/src/graphics-processor.vala" _objects_size_ = objects_length1; #line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp21_ = objects; + _tmp17_ = objects; #line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp21__length1 = objects_length1; -#line 503 "graphics-processor.c" + _tmp17__length1 = objects_length1; +#line 435 "graphics-processor.c" { gchar** object_collection = NULL; gint object_collection_length1 = 0; gint _object_collection_size_ = 0; gint object_it = 0; #line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala" - object_collection = _tmp21_; + object_collection = _tmp17_; #line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala" - object_collection_length1 = _tmp21__length1; + object_collection_length1 = _tmp17__length1; #line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala" - for (object_it = 0; object_it < _tmp21__length1; object_it = object_it + 1) { -#line 515 "graphics-processor.c" - gchar* _tmp22_; + for (object_it = 0; object_it < _tmp17__length1; object_it = object_it + 1) { +#line 447 "graphics-processor.c" + gchar* _tmp18_; gchar* object = NULL; #line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp22_ = g_strdup (object_collection[object_it]); + _tmp18_ = g_strdup (object_collection[object_it]); #line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala" - object = _tmp22_; -#line 522 "graphics-processor.c" + object = _tmp18_; +#line 454 "graphics-processor.c" { gchar** keys = NULL; - GKeyFile* _tmp23_; - const gchar* _tmp24_; - gsize _tmp25_; - gchar** _tmp26_; + GKeyFile* _tmp19_; + const gchar* _tmp20_; + gsize _tmp21_; + gchar** _tmp22_; gint keys_length1; gint _keys_size_; - gboolean _tmp27_ = FALSE; + gboolean _tmp23_ = FALSE; + gchar** _tmp24_; + gint _tmp24__length1; + KeyValueMap* key_map = NULL; + const gchar* _tmp26_; + KeyValueMap* _tmp27_; gchar** _tmp28_; gint _tmp28__length1; - KeyValueMap* key_map = NULL; - const gchar* _tmp30_; - KeyValueMap* _tmp31_; - gchar** _tmp32_; - gint _tmp32__length1; - GeeHashMap* _tmp41_; - const gchar* _tmp42_; - KeyValueMap* _tmp43_; + GeeHashMap* _tmp37_; + const gchar* _tmp38_; + KeyValueMap* _tmp39_; #line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp23_ = keyfile; + _tmp19_ = keyfile; #line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp24_ = object; + _tmp20_ = object; #line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp26_ = g_key_file_get_keys (_tmp23_, _tmp24_, &_tmp25_, &_inner_error_); + _tmp22_ = g_key_file_get_keys (_tmp19_, _tmp20_, &_tmp21_, &_inner_error_); #line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala" - keys = _tmp26_; + keys = _tmp22_; #line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala" - keys_length1 = _tmp25_; + keys_length1 = _tmp21_; #line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala" _keys_size_ = keys_length1; #line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala" @@ -560,87 +492,87 @@ GeeHashMap* marshall_all_transformations (const gchar* filename) { _g_object_unref0 (map); #line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala" _g_key_file_unref0 (keyfile); -#line 564 "graphics-processor.c" +#line 496 "graphics-processor.c" goto __catch0_g_error; } #line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp28_ = keys; + _tmp24_ = keys; #line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp28__length1 = keys_length1; + _tmp24__length1 = keys_length1; #line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala" - if (_tmp28_ == NULL) { + if (_tmp24_ == NULL) { #line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp27_ = TRUE; -#line 575 "graphics-processor.c" + _tmp23_ = TRUE; +#line 507 "graphics-processor.c" } else { - gchar** _tmp29_; - gint _tmp29__length1; + gchar** _tmp25_; + gint _tmp25__length1; #line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp29_ = keys; + _tmp25_ = keys; #line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp29__length1 = keys_length1; + _tmp25__length1 = keys_length1; #line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp27_ = _tmp29__length1 == 0; -#line 585 "graphics-processor.c" + _tmp23_ = _tmp25__length1 == 0; +#line 517 "graphics-processor.c" } #line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala" - if (_tmp27_) { + if (_tmp23_) { #line 34 "/home/jens/Source/shotwell/src/graphics-processor.vala" keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL); #line 34 "/home/jens/Source/shotwell/src/graphics-processor.vala" _g_free0 (object); #line 34 "/home/jens/Source/shotwell/src/graphics-processor.vala" continue; -#line 595 "graphics-processor.c" +#line 527 "graphics-processor.c" } #line 37 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp30_ = object; + _tmp26_ = object; #line 37 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp31_ = key_value_map_new (_tmp30_); + _tmp27_ = key_value_map_new (_tmp26_); #line 37 "/home/jens/Source/shotwell/src/graphics-processor.vala" - key_map = _tmp31_; + key_map = _tmp27_; #line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp32_ = keys; + _tmp28_ = keys; #line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp32__length1 = keys_length1; -#line 607 "graphics-processor.c" + _tmp28__length1 = keys_length1; +#line 539 "graphics-processor.c" { gchar** key_collection = NULL; gint key_collection_length1 = 0; gint _key_collection_size_ = 0; gint key_it = 0; #line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala" - key_collection = _tmp32_; + key_collection = _tmp28_; #line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala" - key_collection_length1 = _tmp32__length1; + key_collection_length1 = _tmp28__length1; #line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala" - for (key_it = 0; key_it < _tmp32__length1; key_it = key_it + 1) { -#line 619 "graphics-processor.c" - gchar* _tmp33_; + for (key_it = 0; key_it < _tmp28__length1; key_it = key_it + 1) { +#line 551 "graphics-processor.c" + gchar* _tmp29_; gchar* key = NULL; #line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp33_ = g_strdup (key_collection[key_it]); + _tmp29_ = g_strdup (key_collection[key_it]); #line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala" - key = _tmp33_; -#line 626 "graphics-processor.c" + key = _tmp29_; +#line 558 "graphics-processor.c" { - gchar* _tmp34_ = NULL; - GKeyFile* _tmp35_; + gchar* _tmp30_ = NULL; + GKeyFile* _tmp31_; + const gchar* _tmp32_; + const gchar* _tmp33_; + gchar* _tmp34_; + KeyValueMap* _tmp35_; const gchar* _tmp36_; - const gchar* _tmp37_; - gchar* _tmp38_; - KeyValueMap* _tmp39_; - const gchar* _tmp40_; #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp35_ = keyfile; + _tmp31_ = keyfile; #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp36_ = object; + _tmp32_ = object; #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp37_ = key; + _tmp33_ = key; #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp38_ = g_key_file_get_string (_tmp35_, _tmp36_, _tmp37_, &_inner_error_); + _tmp34_ = g_key_file_get_string (_tmp31_, _tmp32_, _tmp33_, &_inner_error_); #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp34_ = _tmp38_; + _tmp30_ = _tmp34_; #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala" @@ -657,38 +589,38 @@ GeeHashMap* marshall_all_transformations (const gchar* filename) { _g_object_unref0 (map); #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala" _g_key_file_unref0 (keyfile); -#line 661 "graphics-processor.c" +#line 593 "graphics-processor.c" goto __catch0_g_error; } #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp39_ = key_map; + _tmp35_ = key_map; #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp40_ = key; + _tmp36_ = key; #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala" - key_value_map_set_string (_tmp39_, _tmp40_, _tmp34_); + key_value_map_set_string (_tmp35_, _tmp36_, _tmp30_); #line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _g_free0 (_tmp34_); + _g_free0 (_tmp30_); #line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala" _g_free0 (key); -#line 674 "graphics-processor.c" +#line 606 "graphics-processor.c" } } } #line 41 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp41_ = map; + _tmp37_ = map; #line 41 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp42_ = object; + _tmp38_ = object; #line 41 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp43_ = key_map; + _tmp39_ = key_map; #line 41 "/home/jens/Source/shotwell/src/graphics-processor.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp42_, _tmp43_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp38_, _tmp39_); #line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala" _key_value_map_unref0 (key_map); #line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala" keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL); #line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala" _g_free0 (object); -#line 692 "graphics-processor.c" +#line 624 "graphics-processor.c" } } } @@ -700,24 +632,24 @@ GeeHashMap* marshall_all_transformations (const gchar* filename) { _g_key_file_unref0 (keyfile); #line 44 "/home/jens/Source/shotwell/src/graphics-processor.vala" return result; -#line 704 "graphics-processor.c" +#line 636 "graphics-processor.c" } goto __finally0; __catch0_g_error: { GError* err = NULL; - const gchar* _tmp44_; + const gchar* _tmp40_; #line 19 "/home/jens/Source/shotwell/src/graphics-processor.vala" err = _inner_error_; #line 19 "/home/jens/Source/shotwell/src/graphics-processor.vala" _inner_error_ = NULL; #line 46 "/home/jens/Source/shotwell/src/graphics-processor.vala" - _tmp44_ = err->message; + _tmp40_ = err->message; #line 46 "/home/jens/Source/shotwell/src/graphics-processor.vala" - g_error ("graphics-processor.vala:46: %s", _tmp44_); + g_error ("graphics-processor.vala:46: %s", _tmp40_); #line 19 "/home/jens/Source/shotwell/src/graphics-processor.vala" _g_error_free0 (err); -#line 721 "graphics-processor.c" +#line 653 "graphics-processor.c" } __finally0: #line 19 "/home/jens/Source/shotwell/src/graphics-processor.vala" @@ -726,11 +658,14 @@ GeeHashMap* marshall_all_transformations (const gchar* filename) { g_clear_error (&_inner_error_); #line 19 "/home/jens/Source/shotwell/src/graphics-processor.vala" return NULL; -#line 730 "graphics-processor.c" +#line 662 "graphics-processor.c" } -gint _vala_main (gchar** args, int args_length1) { +gint +_vala_main (gchar** args, + int args_length1) +{ gint result = 0; GOptionContext* ctx = NULL; GOptionContext* _tmp0_; @@ -779,7 +714,7 @@ gint _vala_main (gchar** args, int args_length1) { _tmp3_ = ctx; #line 54 "/home/jens/Source/shotwell/src/graphics-processor.vala" g_option_context_add_main_entries (_tmp3_, options, NULL); -#line 783 "graphics-processor.c" +#line 718 "graphics-processor.c" { GOptionContext* _tmp4_; #line 57 "/home/jens/Source/shotwell/src/graphics-processor.vala" @@ -788,7 +723,7 @@ gint _vala_main (gchar** args, int args_length1) { g_option_context_parse (_tmp4_, &args_length1, &args, &_inner_error_); #line 57 "/home/jens/Source/shotwell/src/graphics-processor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 792 "graphics-processor.c" +#line 727 "graphics-processor.c" goto __catch2_g_error; } } @@ -821,12 +756,12 @@ gint _vala_main (gchar** args, int args_length1) { _g_option_context_free0 (ctx); #line 61 "/home/jens/Source/shotwell/src/graphics-processor.vala" return result; -#line 825 "graphics-processor.c" +#line 760 "graphics-processor.c" } __finally2: #line 56 "/home/jens/Source/shotwell/src/graphics-processor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 830 "graphics-processor.c" +#line 765 "graphics-processor.c" gint _tmp8_ = 0; #line 56 "/home/jens/Source/shotwell/src/graphics-processor.vala" _g_option_context_free0 (ctx); @@ -836,7 +771,7 @@ gint _vala_main (gchar** args, int args_length1) { g_clear_error (&_inner_error_); #line 56 "/home/jens/Source/shotwell/src/graphics-processor.vala" return _tmp8_; -#line 840 "graphics-processor.c" +#line 775 "graphics-processor.c" } #line 64 "/home/jens/Source/shotwell/src/graphics-processor.vala" _tmp10_ = input_file; @@ -844,18 +779,18 @@ gint _vala_main (gchar** args, int args_length1) { if (_tmp10_ == NULL) { #line 64 "/home/jens/Source/shotwell/src/graphics-processor.vala" _tmp9_ = TRUE; -#line 848 "graphics-processor.c" +#line 783 "graphics-processor.c" } else { const gchar* _tmp11_; #line 64 "/home/jens/Source/shotwell/src/graphics-processor.vala" _tmp11_ = output_file; #line 64 "/home/jens/Source/shotwell/src/graphics-processor.vala" _tmp9_ = _tmp11_ == NULL; -#line 855 "graphics-processor.c" +#line 790 "graphics-processor.c" } #line 64 "/home/jens/Source/shotwell/src/graphics-processor.vala" if (_tmp9_) { -#line 859 "graphics-processor.c" +#line 794 "graphics-processor.c" GOptionContext* _tmp12_; gchar* _tmp13_; gchar* _tmp14_; @@ -877,23 +812,23 @@ gint _vala_main (gchar** args, int args_length1) { _g_option_context_free0 (ctx); #line 68 "/home/jens/Source/shotwell/src/graphics-processor.vala" return result; -#line 881 "graphics-processor.c" +#line 816 "graphics-processor.c" } #line 71 "/home/jens/Source/shotwell/src/graphics-processor.vala" _tmp16_ = auto_enhance; #line 71 "/home/jens/Source/shotwell/src/graphics-processor.vala" if (_tmp16_ == FALSE) { -#line 887 "graphics-processor.c" +#line 822 "graphics-processor.c" const gchar* _tmp17_; #line 71 "/home/jens/Source/shotwell/src/graphics-processor.vala" _tmp17_ = pipeline; #line 71 "/home/jens/Source/shotwell/src/graphics-processor.vala" _tmp15_ = _tmp17_ == NULL; -#line 893 "graphics-processor.c" +#line 828 "graphics-processor.c" } else { #line 71 "/home/jens/Source/shotwell/src/graphics-processor.vala" _tmp15_ = FALSE; -#line 897 "graphics-processor.c" +#line 832 "graphics-processor.c" } #line 71 "/home/jens/Source/shotwell/src/graphics-processor.vala" if (_tmp15_) { @@ -905,11 +840,11 @@ gint _vala_main (gchar** args, int args_length1) { _g_option_context_free0 (ctx); #line 74 "/home/jens/Source/shotwell/src/graphics-processor.vala" return result; -#line 909 "graphics-processor.c" +#line 844 "graphics-processor.c" } #line 77 "/home/jens/Source/shotwell/src/graphics-processor.vala" src = NULL; -#line 913 "graphics-processor.c" +#line 848 "graphics-processor.c" { GdkPixbuf* _tmp18_ = NULL; const gchar* _tmp19_; @@ -923,7 +858,7 @@ gint _vala_main (gchar** args, int args_length1) { _tmp18_ = _tmp20_; #line 79 "/home/jens/Source/shotwell/src/graphics-processor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 927 "graphics-processor.c" +#line 862 "graphics-processor.c" goto __catch3_g_error; } #line 79 "/home/jens/Source/shotwell/src/graphics-processor.vala" @@ -936,7 +871,7 @@ gint _vala_main (gchar** args, int args_length1) { src = _tmp21_; #line 78 "/home/jens/Source/shotwell/src/graphics-processor.vala" _g_object_unref0 (_tmp18_); -#line 940 "graphics-processor.c" +#line 875 "graphics-processor.c" } goto __finally3; __catch3_g_error: @@ -953,12 +888,12 @@ gint _vala_main (gchar** args, int args_length1) { g_error ("graphics-processor.vala:81: %s", _tmp22_); #line 78 "/home/jens/Source/shotwell/src/graphics-processor.vala" _g_error_free0 (err); -#line 957 "graphics-processor.c" +#line 892 "graphics-processor.c" } __finally3: #line 78 "/home/jens/Source/shotwell/src/graphics-processor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 962 "graphics-processor.c" +#line 897 "graphics-processor.c" gint _tmp23_ = 0; #line 78 "/home/jens/Source/shotwell/src/graphics-processor.vala" _g_object_unref0 (src); @@ -970,7 +905,7 @@ gint _vala_main (gchar** args, int args_length1) { g_clear_error (&_inner_error_); #line 78 "/home/jens/Source/shotwell/src/graphics-processor.vala" return _tmp23_; -#line 974 "graphics-processor.c" +#line 909 "graphics-processor.c" } #line 84 "/home/jens/Source/shotwell/src/graphics-processor.vala" _tmp24_ = src; @@ -984,7 +919,7 @@ gint _vala_main (gchar** args, int args_length1) { _tmp26_ = pipeline; #line 87 "/home/jens/Source/shotwell/src/graphics-processor.vala" if (_tmp26_ != NULL) { -#line 988 "graphics-processor.c" +#line 923 "graphics-processor.c" GeeHashMap* transformations = NULL; const gchar* _tmp27_; GeeHashMap* _tmp28_; @@ -1015,13 +950,13 @@ gint _vala_main (gchar** args, int args_length1) { _tmp32_ = map; #line 92 "/home/jens/Source/shotwell/src/graphics-processor.vala" if (_tmp32_ == NULL) { -#line 1019 "graphics-processor.c" +#line 954 "graphics-processor.c" PixelTransformationBundle* _tmp33_; #line 93 "/home/jens/Source/shotwell/src/graphics-processor.vala" _tmp33_ = adjustments; #line 93 "/home/jens/Source/shotwell/src/graphics-processor.vala" pixel_transformation_bundle_set_to_identity (_tmp33_); -#line 1025 "graphics-processor.c" +#line 960 "graphics-processor.c" } else { PixelTransformationBundle* _tmp34_; KeyValueMap* _tmp35_; @@ -1031,19 +966,19 @@ gint _vala_main (gchar** args, int args_length1) { _tmp35_ = map; #line 95 "/home/jens/Source/shotwell/src/graphics-processor.vala" pixel_transformation_bundle_load (_tmp34_, _tmp35_); -#line 1035 "graphics-processor.c" +#line 970 "graphics-processor.c" } #line 87 "/home/jens/Source/shotwell/src/graphics-processor.vala" _key_value_map_unref0 (map); #line 87 "/home/jens/Source/shotwell/src/graphics-processor.vala" _g_object_unref0 (transformations); -#line 1041 "graphics-processor.c" +#line 976 "graphics-processor.c" } #line 99 "/home/jens/Source/shotwell/src/graphics-processor.vala" _tmp36_ = auto_enhance; #line 99 "/home/jens/Source/shotwell/src/graphics-processor.vala" if (_tmp36_) { -#line 1047 "graphics-processor.c" +#line 982 "graphics-processor.c" GdkPixbuf* _tmp37_; PixelTransformationBundle* _tmp38_; #line 100 "/home/jens/Source/shotwell/src/graphics-processor.vala" @@ -1054,7 +989,7 @@ gint _vala_main (gchar** args, int args_length1) { _pixel_transformation_bundle_unref0 (adjustments); #line 100 "/home/jens/Source/shotwell/src/graphics-processor.vala" adjustments = _tmp38_; -#line 1058 "graphics-processor.c" +#line 993 "graphics-processor.c" } #line 103 "/home/jens/Source/shotwell/src/graphics-processor.vala" _tmp39_ = adjustments; @@ -1090,7 +1025,7 @@ gint _vala_main (gchar** args, int args_length1) { _tmp49_ = format; #line 111 "/home/jens/Source/shotwell/src/graphics-processor.vala" if (_tmp49_ == NULL) { -#line 1094 "graphics-processor.c" +#line 1029 "graphics-processor.c" gchar* content_type = NULL; const gchar* _tmp50_; gchar* _tmp51_; @@ -1106,7 +1041,7 @@ gint _vala_main (gchar** args, int args_length1) { _tmp52_ = content_type; #line 113 "/home/jens/Source/shotwell/src/graphics-processor.vala" if (g_strcmp0 (_tmp52_, "image/png") == 0) { -#line 1110 "graphics-processor.c" +#line 1045 "graphics-processor.c" gchar* _tmp53_; #line 114 "/home/jens/Source/shotwell/src/graphics-processor.vala" _tmp53_ = g_strdup ("png"); @@ -1114,7 +1049,7 @@ gint _vala_main (gchar** args, int args_length1) { _g_free0 (format); #line 114 "/home/jens/Source/shotwell/src/graphics-processor.vala" format = _tmp53_; -#line 1118 "graphics-processor.c" +#line 1053 "graphics-processor.c" } #line 117 "/home/jens/Source/shotwell/src/graphics-processor.vala" _tmp54_ = g_strdup ("jpeg"); @@ -1124,7 +1059,7 @@ gint _vala_main (gchar** args, int args_length1) { format = _tmp54_; #line 111 "/home/jens/Source/shotwell/src/graphics-processor.vala" _g_free0 (content_type); -#line 1128 "graphics-processor.c" +#line 1063 "graphics-processor.c" } { GdkPixbuf* _tmp55_; @@ -1140,7 +1075,7 @@ gint _vala_main (gchar** args, int args_length1) { gdk_pixbuf_save (_tmp55_, _tmp56_, _tmp57_, &_inner_error_, NULL, NULL); #line 121 "/home/jens/Source/shotwell/src/graphics-processor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1144 "graphics-processor.c" +#line 1079 "graphics-processor.c" goto __catch4_g_error; } } @@ -1159,12 +1094,12 @@ gint _vala_main (gchar** args, int args_length1) { g_error ("graphics-processor.vala:123: %s", _tmp58_); #line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala" _g_error_free0 (err); -#line 1163 "graphics-processor.c" +#line 1098 "graphics-processor.c" } __finally4: #line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1168 "graphics-processor.c" +#line 1103 "graphics-processor.c" gint _tmp59_ = 0; #line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala" _g_timer_destroy0 (timer); @@ -1184,7 +1119,7 @@ gint _vala_main (gchar** args, int args_length1) { g_clear_error (&_inner_error_); #line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala" return _tmp59_; -#line 1188 "graphics-processor.c" +#line 1123 "graphics-processor.c" } #line 126 "/home/jens/Source/shotwell/src/graphics-processor.vala" result = 0; @@ -1202,21 +1137,25 @@ gint _vala_main (gchar** args, int args_length1) { _g_option_context_free0 (ctx); #line 126 "/home/jens/Source/shotwell/src/graphics-processor.vala" return result; -#line 1206 "graphics-processor.c" +#line 1141 "graphics-processor.c" } -int main (int argc, char ** argv) { -#if !GLIB_CHECK_VERSION (2,35,0) - g_type_init (); -#endif +int +main (int argc, + char ** argv) +{ #line 50 "/home/jens/Source/shotwell/src/graphics-processor.vala" return _vala_main (argv, argc); -#line 1216 "graphics-processor.c" +#line 1151 "graphics-processor.c" } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -1228,7 +1167,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/library/FlaggedPage.c b/src/library/FlaggedPage.c index 16a31da..199e911 100644 --- a/src/library/FlaggedPage.c +++ b/src/library/FlaggedPage.c @@ -1,4 +1,4 @@ -/* FlaggedPage.c generated by valac 0.36.6, the Vala compiler +/* FlaggedPage.c generated by valac 0.40.4, the Vala compiler * generated from FlaggedPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -251,6 +252,11 @@ typedef struct _CollectionPageCollectionSearchViewFilterClass CollectionPageColl typedef struct _FlaggedPageFlaggedSearchViewFilter FlaggedPageFlaggedSearchViewFilter; typedef struct _FlaggedPageFlaggedSearchViewFilterClass FlaggedPageFlaggedSearchViewFilterClass; +enum { + FLAGGED_PAGE_0_PROPERTY, + FLAGGED_PAGE_NUM_PROPERTIES +}; +static GParamSpec* flagged_page_properties[FLAGGED_PAGE_NUM_PROPERTIES]; #define _view_manager_unref0(var) ((var == NULL) ? NULL : (var = (view_manager_unref (var), NULL))) #define _alteration_unref0(var) ((var == NULL) ? NULL : (var = (alteration_unref (var), NULL))) #define _view_filter_unref0(var) ((var == NULL) ? NULL : (var = (view_filter_unref (var), NULL))) @@ -686,9 +692,15 @@ GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType checkerboard_page_get_type (void) G_GNUC_CONST; @@ -702,17 +714,29 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self); gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType search_view_filter_get_type (void) G_GNUC_CONST; gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; @@ -724,42 +748,62 @@ GType collection_page_get_type (void) G_GNUC_CONST; GType flagged_page_get_type (void) G_GNUC_CONST; gpointer view_manager_ref (gpointer instance); void view_manager_unref (gpointer instance); -GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_manager (GValue* value, gpointer v_object); -void value_take_view_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_manager (GValue* value, + gpointer v_object); +void value_take_view_manager (GValue* value, + gpointer v_object); gpointer value_get_view_manager (const GValue* value); GType view_manager_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType default_search_view_filter_get_type (void) G_GNUC_CONST; GType collection_page_collection_search_view_filter_get_type (void) G_GNUC_CONST; static GType flagged_page_flagged_search_view_filter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define FLAGGED_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_FLAGGED_PAGE, FlaggedPagePrivate)) -enum { - FLAGGED_PAGE_DUMMY_PROPERTY -}; -Alteration* alteration_new (const gchar* subject, const gchar* detail); -Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail); +Alteration* alteration_new (const gchar* subject, + const gchar* detail); +Alteration* alteration_construct (GType object_type, + const gchar* subject, + const gchar* detail); static FlaggedPageFlaggedSearchViewFilter* flagged_page_flagged_search_view_filter_new (void); static FlaggedPageFlaggedSearchViewFilter* flagged_page_flagged_search_view_filter_construct (GType object_type); #define FLAGGED_PAGE_NAME _ ("Flagged") FlaggedPage* flagged_page_new (void); FlaggedPage* flagged_page_construct (GType object_type); -CollectionPage* collection_page_construct (GType object_type, const gchar* page_name); +CollectionPage* collection_page_construct (GType object_type, + const gchar* page_name); static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_new (FlaggedPage* owner); -static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_construct (GType object_type, FlaggedPage* owner); +static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_construct (GType object_type, + FlaggedPage* owner); GType collection_view_manager_get_type (void) G_GNUC_CONST; static GType flagged_page_flagged_view_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -767,9 +811,15 @@ GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); @@ -778,33 +828,49 @@ GType view_collection_get_type (void) G_GNUC_CONST; ViewCollection* page_get_view (Page* self); gpointer view_collection_monitor_ref (gpointer instance); void view_collection_monitor_unref (gpointer instance); -GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void view_collection_value_set_monitor (GValue* value, gpointer v_object); -void view_collection_value_take_monitor (GValue* value, gpointer v_object); +GParamSpec* view_collection_param_spec_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void view_collection_value_set_monitor (GValue* value, + gpointer v_object); +void view_collection_value_take_monitor (GValue* value, + gpointer v_object); gpointer view_collection_value_get_monitor (const GValue* value); GType view_collection_monitor_get_type (void) G_GNUC_CONST; -ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target); -static void flagged_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by); +ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq, + GeeCollection* initial, + ProgressMonitor progress_monitor, + void* progress_monitor_target); +static void flagged_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); -void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by); -static void flagged_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by); -void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by); +void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, + gboolean* sort_order, + gint* sort_by); +static void flagged_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by); +void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, + gboolean sort_order, + gint sort_by); static SearchViewFilter* flagged_page_real_get_search_view_filter (CheckerboardPage* base); -enum { - FLAGGED_PAGE_FLAGGED_VIEW_MANAGER_DUMMY_PROPERTY -}; CollectionViewManager* collection_view_manager_new (CollectionPage* page); -CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page); -static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewManager* base, DataSource* source); +CollectionViewManager* collection_view_manager_construct (GType object_type, + CollectionPage* page); +static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewManager* base, + DataSource* source); GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; GType flaggable_get_type (void) G_GNUC_CONST; gboolean flaggable_is_flagged (Flaggable* self); -enum { - FLAGGED_PAGE_FLAGGED_SEARCH_VIEW_FILTER_DUMMY_PROPERTY -}; static guint flagged_page_flagged_search_view_filter_real_get_criteria (SearchViewFilter* base); GType search_filter_criteria_get_type (void) G_GNUC_CONST; CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_new (void); @@ -812,7 +878,9 @@ CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view static void flagged_page_finalize (GObject * obj); -FlaggedPage* flagged_page_construct (GType object_type) { +FlaggedPage* +flagged_page_construct (GType object_type) +{ FlaggedPage * self = NULL; FlaggedPageFlaggedViewManager* _tmp0_; #line 34 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" @@ -823,7 +891,7 @@ FlaggedPage* flagged_page_construct (GType object_type) { _view_manager_unref0 (self->priv->view_manager); #line 36 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" self->priv->view_manager = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_MANAGER, ViewManager); -#line 827 "FlaggedPage.c" +#line 895 "FlaggedPage.c" { GeeIterator* _sources_it = NULL; MediaCollectionRegistry* _tmp1_; @@ -852,75 +920,78 @@ FlaggedPage* flagged_page_construct (GType object_type) { _sources_it = _tmp6_; #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" while (TRUE) { -#line 856 "FlaggedPage.c" +#line 924 "FlaggedPage.c" GeeIterator* _tmp7_; - gboolean _tmp8_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; + GeeIterator* _tmp8_; + gpointer _tmp9_; + ViewCollection* _tmp10_; ViewCollection* _tmp11_; - ViewCollection* _tmp12_; - MediaSourceCollection* _tmp13_; - ViewManager* _tmp14_; - Alteration* _tmp15_; + MediaSourceCollection* _tmp12_; + ViewManager* _tmp13_; + Alteration* _tmp14_; + ViewCollectionMonitor* _tmp15_; ViewCollectionMonitor* _tmp16_; - ViewCollectionMonitor* _tmp17_; #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _tmp7_ = _sources_it; #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _tmp8_ = gee_iterator_next (_tmp7_); -#line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp7_)) { #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" break; -#line 877 "FlaggedPage.c" +#line 942 "FlaggedPage.c" } #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _tmp9_ = _sources_it; + _tmp8_ = _sources_it; #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp9_ = gee_iterator_get (_tmp8_); #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - sources = (MediaSourceCollection*) _tmp10_; + sources = (MediaSourceCollection*) _tmp9_; #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _tmp13_ = sources; + _tmp12_ = sources; #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _tmp14_ = self->priv->view_manager; + _tmp13_ = self->priv->view_manager; #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _tmp15_ = self->priv->prereq; + _tmp14_ = self->priv->prereq; #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _tmp16_ = view_collection_monitor_source_collection (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp14_, _tmp15_, NULL, NULL, NULL); + _tmp15_ = view_collection_monitor_source_collection (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp13_, _tmp14_, NULL, NULL, NULL); #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _view_collection_monitor_unref0 (_tmp17_); + _view_collection_monitor_unref0 (_tmp16_); #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _data_collection_unref0 (_tmp12_); + _data_collection_unref0 (_tmp11_); #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _data_collection_unref0 (sources); -#line 905 "FlaggedPage.c" +#line 970 "FlaggedPage.c" } #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _g_object_unref0 (_sources_it); -#line 909 "FlaggedPage.c" +#line 974 "FlaggedPage.c" } #line 33 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return self; -#line 913 "FlaggedPage.c" +#line 978 "FlaggedPage.c" } -FlaggedPage* flagged_page_new (void) { +FlaggedPage* +flagged_page_new (void) +{ #line 33 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return flagged_page_construct (TYPE_FLAGGED_PAGE); -#line 920 "FlaggedPage.c" +#line 987 "FlaggedPage.c" } -static void flagged_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) { +static void +flagged_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by) +{ FlaggedPage * self; gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; @@ -946,23 +1017,25 @@ static void flagged_page_real_get_config_photos_sort (MediaPage* base, gboolean* if (sort_order) { #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" *sort_order = _vala_sort_order; -#line 950 "FlaggedPage.c" +#line 1021 "FlaggedPage.c" } #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" if (sort_by) { #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" *sort_by = _vala_sort_by; -#line 956 "FlaggedPage.c" +#line 1027 "FlaggedPage.c" } } -static void flagged_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { +static void +flagged_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by) +{ FlaggedPage * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - gboolean _tmp2_; - gint _tmp3_; #line 46 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLAGGED_PAGE, FlaggedPage); #line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" @@ -970,25 +1043,25 @@ static void flagged_page_real_set_config_photos_sort (MediaPage* base, gboolean #line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _tmp1_ = _tmp0_; #line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _tmp2_ = sort_order; -#line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _tmp3_ = sort_by; -#line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); + configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), sort_order, sort_by); #line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _g_object_unref0 (_tmp1_); -#line 981 "FlaggedPage.c" +#line 1050 "FlaggedPage.c" } -static gpointer _view_filter_ref0 (gpointer self) { +static gpointer +_view_filter_ref0 (gpointer self) +{ #line 51 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return self ? view_filter_ref (self) : NULL; -#line 988 "FlaggedPage.c" +#line 1059 "FlaggedPage.c" } -static SearchViewFilter* flagged_page_real_get_search_view_filter (CheckerboardPage* base) { +static SearchViewFilter* +flagged_page_real_get_search_view_filter (CheckerboardPage* base) +{ FlaggedPage * self; SearchViewFilter* result = NULL; FlaggedPageFlaggedSearchViewFilter* _tmp0_; @@ -1003,100 +1076,107 @@ static SearchViewFilter* flagged_page_real_get_search_view_filter (CheckerboardP result = _tmp1_; #line 51 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return result; -#line 1007 "FlaggedPage.c" +#line 1080 "FlaggedPage.c" } -static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_construct (GType object_type, FlaggedPage* owner) { +static FlaggedPageFlaggedViewManager* +flagged_page_flagged_view_manager_construct (GType object_type, + FlaggedPage* owner) +{ FlaggedPageFlaggedViewManager* self = NULL; - FlaggedPage* _tmp0_; #line 11 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" g_return_val_if_fail (IS_FLAGGED_PAGE (owner), NULL); #line 12 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _tmp0_ = owner; -#line 12 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - self = (FlaggedPageFlaggedViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage)); + self = (FlaggedPageFlaggedViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, TYPE_COLLECTION_PAGE, CollectionPage)); #line 11 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return self; -#line 1022 "FlaggedPage.c" +#line 1095 "FlaggedPage.c" } -static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_new (FlaggedPage* owner) { +static FlaggedPageFlaggedViewManager* +flagged_page_flagged_view_manager_new (FlaggedPage* owner) +{ #line 11 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return flagged_page_flagged_view_manager_construct (FLAGGED_PAGE_TYPE_FLAGGED_VIEW_MANAGER, owner); -#line 1029 "FlaggedPage.c" +#line 1104 "FlaggedPage.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 16 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return self ? g_object_ref (self) : NULL; -#line 1036 "FlaggedPage.c" +#line 1113 "FlaggedPage.c" } -static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewManager* base, DataSource* source) { +static gboolean +flagged_page_flagged_view_manager_real_include_in_view (ViewManager* base, + DataSource* source) +{ FlaggedPageFlaggedViewManager * self; gboolean result = FALSE; Flaggable* flaggable = NULL; - DataSource* _tmp0_; - Flaggable* _tmp1_; - gboolean _tmp2_ = FALSE; - Flaggable* _tmp3_; + Flaggable* _tmp0_; + gboolean _tmp1_ = FALSE; + Flaggable* _tmp2_; #line 15 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, FLAGGED_PAGE_TYPE_FLAGGED_VIEW_MANAGER, FlaggedPageFlaggedViewManager); #line 15 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 16 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _tmp0_ = source; -#line 16 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp0_) : NULL); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_FLAGGABLE) ? ((Flaggable*) source) : NULL); #line 16 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - flaggable = _tmp1_; + flaggable = _tmp0_; #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _tmp3_ = flaggable; + _tmp2_ = flaggable; #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - if (_tmp3_ != NULL) { -#line 1062 "FlaggedPage.c" - Flaggable* _tmp4_; - gboolean _tmp5_; + if (_tmp2_ != NULL) { +#line 1139 "FlaggedPage.c" + Flaggable* _tmp3_; #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _tmp4_ = flaggable; + _tmp3_ = flaggable; #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _tmp5_ = flaggable_is_flagged (_tmp4_); -#line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _tmp2_ = _tmp5_; -#line 1071 "FlaggedPage.c" + _tmp1_ = flaggable_is_flagged (_tmp3_); +#line 1145 "FlaggedPage.c" } else { #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - _tmp2_ = FALSE; -#line 1075 "FlaggedPage.c" + _tmp1_ = FALSE; +#line 1149 "FlaggedPage.c" } #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - result = _tmp2_; + result = _tmp1_; #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _g_object_unref0 (flaggable); #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return result; -#line 1083 "FlaggedPage.c" +#line 1157 "FlaggedPage.c" } -static void flagged_page_flagged_view_manager_class_init (FlaggedPageFlaggedViewManagerClass * klass) { +static void +flagged_page_flagged_view_manager_class_init (FlaggedPageFlaggedViewManagerClass * klass) +{ #line 10 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" flagged_page_flagged_view_manager_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) flagged_page_flagged_view_manager_real_include_in_view; -#line 1092 "FlaggedPage.c" +#line 1168 "FlaggedPage.c" } -static void flagged_page_flagged_view_manager_instance_init (FlaggedPageFlaggedViewManager * self) { +static void +flagged_page_flagged_view_manager_instance_init (FlaggedPageFlaggedViewManager * self) +{ } -static GType flagged_page_flagged_view_manager_get_type (void) { +static GType +flagged_page_flagged_view_manager_get_type (void) +{ static volatile gsize flagged_page_flagged_view_manager_type_id__volatile = 0; if (g_once_init_enter (&flagged_page_flagged_view_manager_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (FlaggedPageFlaggedViewManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) flagged_page_flagged_view_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FlaggedPageFlaggedViewManager), 0, (GInstanceInitFunc) flagged_page_flagged_view_manager_instance_init, NULL }; @@ -1108,7 +1188,9 @@ static GType flagged_page_flagged_view_manager_get_type (void) { } -static guint flagged_page_flagged_search_view_filter_real_get_criteria (SearchViewFilter* base) { +static guint +flagged_page_flagged_search_view_filter_real_get_criteria (SearchViewFilter* base) +{ FlaggedPageFlaggedSearchViewFilter * self; guint result = 0U; #line 23 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" @@ -1117,41 +1199,51 @@ static guint flagged_page_flagged_search_view_filter_real_get_criteria (SearchVi result = (guint) (((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH); #line 24 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return result; -#line 1121 "FlaggedPage.c" +#line 1203 "FlaggedPage.c" } -static FlaggedPageFlaggedSearchViewFilter* flagged_page_flagged_search_view_filter_construct (GType object_type) { +static FlaggedPageFlaggedSearchViewFilter* +flagged_page_flagged_search_view_filter_construct (GType object_type) +{ FlaggedPageFlaggedSearchViewFilter* self = NULL; #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" self = (FlaggedPageFlaggedSearchViewFilter*) collection_page_collection_search_view_filter_construct (object_type); #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return self; -#line 1131 "FlaggedPage.c" +#line 1215 "FlaggedPage.c" } -static FlaggedPageFlaggedSearchViewFilter* flagged_page_flagged_search_view_filter_new (void) { +static FlaggedPageFlaggedSearchViewFilter* +flagged_page_flagged_search_view_filter_new (void) +{ #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return flagged_page_flagged_search_view_filter_construct (FLAGGED_PAGE_TYPE_FLAGGED_SEARCH_VIEW_FILTER); -#line 1138 "FlaggedPage.c" +#line 1224 "FlaggedPage.c" } -static void flagged_page_flagged_search_view_filter_class_init (FlaggedPageFlaggedSearchViewFilterClass * klass) { +static void +flagged_page_flagged_search_view_filter_class_init (FlaggedPageFlaggedSearchViewFilterClass * klass) +{ #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" flagged_page_flagged_search_view_filter_parent_class = g_type_class_peek_parent (klass); #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" ((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) flagged_page_flagged_search_view_filter_real_get_criteria; -#line 1147 "FlaggedPage.c" +#line 1235 "FlaggedPage.c" } -static void flagged_page_flagged_search_view_filter_instance_init (FlaggedPageFlaggedSearchViewFilter * self) { +static void +flagged_page_flagged_search_view_filter_instance_init (FlaggedPageFlaggedSearchViewFilter * self) +{ } -static GType flagged_page_flagged_search_view_filter_get_type (void) { +static GType +flagged_page_flagged_search_view_filter_get_type (void) +{ static volatile gsize flagged_page_flagged_search_view_filter_type_id__volatile = 0; if (g_once_init_enter (&flagged_page_flagged_search_view_filter_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (FlaggedPageFlaggedSearchViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) flagged_page_flagged_search_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FlaggedPageFlaggedSearchViewFilter), 0, (GInstanceInitFunc) flagged_page_flagged_search_view_filter_instance_init, NULL }; @@ -1163,7 +1255,9 @@ static GType flagged_page_flagged_search_view_filter_get_type (void) { } -static void flagged_page_class_init (FlaggedPageClass * klass) { +static void +flagged_page_class_init (FlaggedPageClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" flagged_page_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" @@ -1176,11 +1270,13 @@ static void flagged_page_class_init (FlaggedPageClass * klass) { ((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) flagged_page_real_get_search_view_filter; #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" G_OBJECT_CLASS (klass)->finalize = flagged_page_finalize; -#line 1180 "FlaggedPage.c" +#line 1274 "FlaggedPage.c" } -static void flagged_page_instance_init (FlaggedPage * self) { +static void +flagged_page_instance_init (FlaggedPage * self) +{ Alteration* _tmp0_; FlaggedPageFlaggedSearchViewFilter* _tmp1_; #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" @@ -1193,11 +1289,13 @@ static void flagged_page_instance_init (FlaggedPage * self) { _tmp1_ = flagged_page_flagged_search_view_filter_new (); #line 31 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" self->priv->search_filter = _tmp1_; -#line 1197 "FlaggedPage.c" +#line 1293 "FlaggedPage.c" } -static void flagged_page_finalize (GObject * obj) { +static void +flagged_page_finalize (GObject * obj) +{ FlaggedPage * self; #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FLAGGED_PAGE, FlaggedPage); @@ -1209,11 +1307,13 @@ static void flagged_page_finalize (GObject * obj) { _view_filter_unref0 (self->priv->search_filter); #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" G_OBJECT_CLASS (flagged_page_parent_class)->finalize (obj); -#line 1213 "FlaggedPage.c" +#line 1311 "FlaggedPage.c" } -GType flagged_page_get_type (void) { +GType +flagged_page_get_type (void) +{ static volatile gsize flagged_page_type_id__volatile = 0; if (g_once_init_enter (&flagged_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (FlaggedPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) flagged_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FlaggedPage), 0, (GInstanceInitFunc) flagged_page_instance_init, NULL }; diff --git a/src/library/FlaggedSidebarEntry.c b/src/library/FlaggedSidebarEntry.c index 01f84fd..b42df00 100644 --- a/src/library/FlaggedSidebarEntry.c +++ b/src/library/FlaggedSidebarEntry.c @@ -1,4 +1,4 @@ -/* FlaggedSidebarEntry.c generated by valac 0.36.6, the Vala compiler +/* FlaggedSidebarEntry.c generated by valac 0.40.4, the Vala compiler * generated from FlaggedSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -149,6 +150,11 @@ typedef struct _MediaSourceClass MediaSourceClass; typedef struct _LibraryFlaggedSidebarEntry LibraryFlaggedSidebarEntry; typedef struct _LibraryFlaggedSidebarEntryClass LibraryFlaggedSidebarEntryClass; typedef struct _LibraryFlaggedSidebarEntryPrivate LibraryFlaggedSidebarEntryPrivate; +enum { + LIBRARY_FLAGGED_SIDEBAR_ENTRY_0_PROPERTY, + LIBRARY_FLAGGED_SIDEBAR_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* library_flagged_sidebar_entry_properties[LIBRARY_FLAGGED_SIDEBAR_ENTRY_NUM_PROPERTIES]; #define TYPE_DATA_COLLECTION (data_collection_get_type ()) #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection)) @@ -375,14 +381,17 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; GType sidebar_internal_drop_target_entry_get_type (void) G_GNUC_CONST; GType library_flagged_sidebar_entry_get_type (void) G_GNUC_CONST; -enum { - LIBRARY_FLAGGED_SIDEBAR_ENTRY_DUMMY_PROPERTY -}; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -390,20 +399,28 @@ GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self); static void library_flagged_sidebar_entry_on_flagged_contents_altered (LibraryFlaggedSidebarEntry* self); -static void _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered (MediaSourceCollection* _sender, gpointer self); +static void _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered (MediaSourceCollection* _sender, + gpointer self); LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_new (void); LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_construct (GType object_type); LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type); static gint library_flagged_sidebar_entry_get_total_flagged (LibraryFlaggedSidebarEntry* self); -void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value); +void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, + gboolean value); static gchar* library_flagged_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base); #define FLAGGED_PAGE_NAME _ ("Flagged") static gchar* library_flagged_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base); @@ -415,40 +432,56 @@ GType checkerboard_page_get_type (void) G_GNUC_CONST; GType media_page_get_type (void) G_GNUC_CONST; GType collection_page_get_type (void) G_GNUC_CONST; GType flagged_page_get_type (void) G_GNUC_CONST; -static gboolean library_flagged_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media); +static gboolean library_flagged_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, + GeeList* media); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* app_window_get_command_manager (void); GType command_get_type (void) G_GNUC_CONST; -void command_manager_execute (CommandManager* self, Command* command); -FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources, gboolean flag); -FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollection* sources, gboolean flag); +void command_manager_execute (CommandManager* self, + Command* command); +FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources, + gboolean flag); +FlagUnflagCommand* flag_unflag_command_construct (GType object_type, + GeeCollection* sources, + gboolean flag); GType page_command_get_type (void) G_GNUC_CONST; GType multiple_data_source_at_once_command_get_type (void) G_GNUC_CONST; GType flag_unflag_command_get_type (void) G_GNUC_CONST; -static gboolean library_flagged_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data); +static gboolean library_flagged_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, + GtkSelectionData* data); GeeCollection* media_source_collection_get_flagged (MediaSourceCollection* self); static void library_flagged_sidebar_entry_finalize (GObject * obj); -static void _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered (MediaSourceCollection* _sender, gpointer self) { +static void +_library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered (MediaSourceCollection* _sender, + gpointer self) +{ #line 17 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" library_flagged_sidebar_entry_on_flagged_contents_altered ((LibraryFlaggedSidebarEntry*) self); -#line 443 "FlaggedSidebarEntry.c" +#line 475 "FlaggedSidebarEntry.c" } -LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_construct (GType object_type) { +LibraryFlaggedSidebarEntry* +library_flagged_sidebar_entry_construct (GType object_type) +{ LibraryFlaggedSidebarEntry * self = NULL; - gint _tmp11_; #line 8 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" self = (LibraryFlaggedSidebarEntry*) library_hideable_page_entry_construct (object_type); -#line 452 "FlaggedSidebarEntry.c" +#line 485 "FlaggedSidebarEntry.c" { GeeIterator* _media_sources_it = NULL; MediaCollectionRegistry* _tmp0_; @@ -477,59 +510,58 @@ LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_construct (GType objec _media_sources_it = _tmp5_; #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" while (TRUE) { -#line 481 "FlaggedSidebarEntry.c" +#line 514 "FlaggedSidebarEntry.c" GeeIterator* _tmp6_; - gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - MediaSourceCollection* _tmp10_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + MediaSourceCollection* _tmp9_; #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" break; -#line 496 "FlaggedSidebarEntry.c" +#line 526 "FlaggedSidebarEntry.c" } #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp8_ = _media_sources_it; + _tmp7_ = _media_sources_it; #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - media_sources = (MediaSourceCollection*) _tmp9_; + media_sources = (MediaSourceCollection*) _tmp8_; #line 10 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp10_ = media_sources; + _tmp9_ = media_sources; #line 10 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - g_signal_connect_object (_tmp10_, "flagged-contents-altered", (GCallback) _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered, self, 0); + g_signal_connect_object (_tmp9_, "flagged-contents-altered", (GCallback) _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered, self, 0); #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" _data_collection_unref0 (media_sources); -#line 510 "FlaggedSidebarEntry.c" +#line 540 "FlaggedSidebarEntry.c" } #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" _g_object_unref0 (_media_sources_it); -#line 514 "FlaggedSidebarEntry.c" +#line 544 "FlaggedSidebarEntry.c" } #line 12 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp11_ = library_flagged_sidebar_entry_get_total_flagged (self); -#line 12 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp11_ != 0); + library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), library_flagged_sidebar_entry_get_total_flagged (self) != 0); #line 8 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" return self; -#line 522 "FlaggedSidebarEntry.c" +#line 550 "FlaggedSidebarEntry.c" } -LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_new (void) { +LibraryFlaggedSidebarEntry* +library_flagged_sidebar_entry_new (void) +{ #line 8 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" return library_flagged_sidebar_entry_construct (LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY); -#line 529 "FlaggedSidebarEntry.c" +#line 559 "FlaggedSidebarEntry.c" } -static gchar* library_flagged_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +library_flagged_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ LibraryFlaggedSidebarEntry * self; gchar* result = NULL; gchar* _tmp0_; @@ -541,11 +573,13 @@ static gchar* library_flagged_sidebar_entry_real_get_sidebar_name (SidebarSimple result = _tmp0_; #line 21 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" return result; -#line 545 "FlaggedSidebarEntry.c" +#line 577 "FlaggedSidebarEntry.c" } -static gchar* library_flagged_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { +static gchar* +library_flagged_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) +{ LibraryFlaggedSidebarEntry * self; gchar* result = NULL; gchar* _tmp0_; @@ -557,11 +591,13 @@ static gchar* library_flagged_sidebar_entry_real_get_sidebar_icon (SidebarSimple result = _tmp0_; #line 25 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" return result; -#line 561 "FlaggedSidebarEntry.c" +#line 595 "FlaggedSidebarEntry.c" } -static Page* library_flagged_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +library_flagged_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) +{ LibraryFlaggedSidebarEntry * self; Page* result = NULL; FlaggedPage* _tmp0_; @@ -575,18 +611,20 @@ static Page* library_flagged_sidebar_entry_real_create_page (SidebarSimplePageEn result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page); #line 29 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" return result; -#line 579 "FlaggedSidebarEntry.c" +#line 615 "FlaggedSidebarEntry.c" } -static gboolean library_flagged_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media) { +static gboolean +library_flagged_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, + GeeList* media) +{ LibraryFlaggedSidebarEntry * self; gboolean result = FALSE; CommandManager* _tmp0_; CommandManager* _tmp1_; - GeeList* _tmp2_; + FlagUnflagCommand* _tmp2_; FlagUnflagCommand* _tmp3_; - FlagUnflagCommand* _tmp4_; #line 32 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntry); #line 32 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" @@ -596,26 +634,27 @@ static gboolean library_flagged_sidebar_entry_real_internal_drop_received (Sideb #line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" _tmp1_ = _tmp0_; #line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp2_ = media; -#line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp3_ = flag_unflag_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), TRUE); + _tmp2_ = flag_unflag_command_new (G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_COLLECTION, GeeCollection), TRUE); #line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - command_manager_execute (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_COMMAND, Command)); #line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" _command_manager_unref0 (_tmp1_); #line 35 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" result = TRUE; #line 35 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" return result; -#line 615 "FlaggedSidebarEntry.c" +#line 651 "FlaggedSidebarEntry.c" } -static gboolean library_flagged_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data) { +static gboolean +library_flagged_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, + GtkSelectionData* data) +{ LibraryFlaggedSidebarEntry * self; gboolean result = FALSE; #line 38 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" @@ -626,30 +665,31 @@ static gboolean library_flagged_sidebar_entry_real_internal_drop_received_arbitr result = FALSE; #line 39 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" return result; -#line 630 "FlaggedSidebarEntry.c" +#line 669 "FlaggedSidebarEntry.c" } -static void library_flagged_sidebar_entry_on_flagged_contents_altered (LibraryFlaggedSidebarEntry* self) { - gint _tmp0_; +static void +library_flagged_sidebar_entry_on_flagged_contents_altered (LibraryFlaggedSidebarEntry* self) +{ #line 42 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" g_return_if_fail (LIBRARY_IS_FLAGGED_SIDEBAR_ENTRY (self)); #line 43 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp0_ = library_flagged_sidebar_entry_get_total_flagged (self); -#line 43 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp0_ != 0); -#line 642 "FlaggedSidebarEntry.c" + library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), library_flagged_sidebar_entry_get_total_flagged (self) != 0); +#line 680 "FlaggedSidebarEntry.c" } -static gint library_flagged_sidebar_entry_get_total_flagged (LibraryFlaggedSidebarEntry* self) { +static gint +library_flagged_sidebar_entry_get_total_flagged (LibraryFlaggedSidebarEntry* self) +{ gint result = 0; gint total = 0; #line 46 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" g_return_val_if_fail (LIBRARY_IS_FLAGGED_SIDEBAR_ENTRY (self), 0); #line 47 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" total = 0; -#line 653 "FlaggedSidebarEntry.c" +#line 693 "FlaggedSidebarEntry.c" { GeeIterator* _media_sources_it = NULL; MediaCollectionRegistry* _tmp0_; @@ -678,67 +718,66 @@ static gint library_flagged_sidebar_entry_get_total_flagged (LibraryFlaggedSideb _media_sources_it = _tmp5_; #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" while (TRUE) { -#line 682 "FlaggedSidebarEntry.c" +#line 722 "FlaggedSidebarEntry.c" GeeIterator* _tmp6_; - gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - gint _tmp10_; - MediaSourceCollection* _tmp11_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + gint _tmp9_; + MediaSourceCollection* _tmp10_; + GeeCollection* _tmp11_; GeeCollection* _tmp12_; - GeeCollection* _tmp13_; + gint _tmp13_; gint _tmp14_; - gint _tmp15_; #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" break; -#line 702 "FlaggedSidebarEntry.c" +#line 739 "FlaggedSidebarEntry.c" } #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp8_ = _media_sources_it; + _tmp7_ = _media_sources_it; #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - media_sources = (MediaSourceCollection*) _tmp9_; + media_sources = (MediaSourceCollection*) _tmp8_; #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp10_ = total; + _tmp9_ = total; #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp11_ = media_sources; + _tmp10_ = media_sources; #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp12_ = media_source_collection_get_flagged (_tmp11_); + _tmp11_ = media_source_collection_get_flagged (_tmp10_); #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp14_ = gee_collection_get_size (_tmp13_); + _tmp13_ = gee_collection_get_size (_tmp12_); #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - total = _tmp10_ + _tmp15_; + total = _tmp9_ + _tmp14_; #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp12_); #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" _data_collection_unref0 (media_sources); -#line 728 "FlaggedSidebarEntry.c" +#line 765 "FlaggedSidebarEntry.c" } #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" _g_object_unref0 (_media_sources_it); -#line 732 "FlaggedSidebarEntry.c" +#line 769 "FlaggedSidebarEntry.c" } #line 51 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" result = total; #line 51 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" return result; -#line 738 "FlaggedSidebarEntry.c" +#line 775 "FlaggedSidebarEntry.c" } -static void library_flagged_sidebar_entry_class_init (LibraryFlaggedSidebarEntryClass * klass) { +static void +library_flagged_sidebar_entry_class_init (LibraryFlaggedSidebarEntryClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" library_flagged_sidebar_entry_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" @@ -749,30 +788,36 @@ static void library_flagged_sidebar_entry_class_init (LibraryFlaggedSidebarEntry ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_flagged_sidebar_entry_real_create_page; #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" G_OBJECT_CLASS (klass)->finalize = library_flagged_sidebar_entry_finalize; -#line 753 "FlaggedSidebarEntry.c" +#line 792 "FlaggedSidebarEntry.c" } -static void library_flagged_sidebar_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) { +static void +library_flagged_sidebar_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) +{ #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" library_flagged_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) library_flagged_sidebar_entry_real_internal_drop_received; #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) library_flagged_sidebar_entry_real_internal_drop_received_arbitrary; -#line 764 "FlaggedSidebarEntry.c" +#line 805 "FlaggedSidebarEntry.c" } -static void library_flagged_sidebar_entry_instance_init (LibraryFlaggedSidebarEntry * self) { +static void +library_flagged_sidebar_entry_instance_init (LibraryFlaggedSidebarEntry * self) +{ } -static void library_flagged_sidebar_entry_finalize (GObject * obj) { +static void +library_flagged_sidebar_entry_finalize (GObject * obj) +{ LibraryFlaggedSidebarEntry * self; #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntry); -#line 776 "FlaggedSidebarEntry.c" +#line 821 "FlaggedSidebarEntry.c" { GeeIterator* _media_sources_it = NULL; MediaCollectionRegistry* _tmp0_; @@ -801,51 +846,50 @@ static void library_flagged_sidebar_entry_finalize (GObject * obj) { _media_sources_it = _tmp5_; #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" while (TRUE) { -#line 805 "FlaggedSidebarEntry.c" +#line 850 "FlaggedSidebarEntry.c" GeeIterator* _tmp6_; - gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - MediaSourceCollection* _tmp10_; - guint _tmp11_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + MediaSourceCollection* _tmp9_; + guint _tmp10_; #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" break; -#line 821 "FlaggedSidebarEntry.c" +#line 863 "FlaggedSidebarEntry.c" } #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp8_ = _media_sources_it; + _tmp7_ = _media_sources_it; #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - media_sources = (MediaSourceCollection*) _tmp9_; + media_sources = (MediaSourceCollection*) _tmp8_; #line 17 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - _tmp10_ = media_sources; + _tmp9_ = media_sources; #line 17 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - g_signal_parse_name ("flagged-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp11_, NULL, FALSE); + g_signal_parse_name ("flagged-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp10_, NULL, FALSE); #line 17 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered, self); + g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered, self); #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" _data_collection_unref0 (media_sources); -#line 837 "FlaggedSidebarEntry.c" +#line 879 "FlaggedSidebarEntry.c" } #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" _g_object_unref0 (_media_sources_it); -#line 841 "FlaggedSidebarEntry.c" +#line 883 "FlaggedSidebarEntry.c" } #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" G_OBJECT_CLASS (library_flagged_sidebar_entry_parent_class)->finalize (obj); -#line 845 "FlaggedSidebarEntry.c" +#line 887 "FlaggedSidebarEntry.c" } -GType library_flagged_sidebar_entry_get_type (void) { +GType +library_flagged_sidebar_entry_get_type (void) +{ static volatile gsize library_flagged_sidebar_entry_type_id__volatile = 0; if (g_once_init_enter (&library_flagged_sidebar_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryFlaggedSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_flagged_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryFlaggedSidebarEntry), 0, (GInstanceInitFunc) library_flagged_sidebar_entry_instance_init, NULL }; diff --git a/src/library/ImportQueuePage.c b/src/library/ImportQueuePage.c index c8d1841..df6b6a0 100644 --- a/src/library/ImportQueuePage.c +++ b/src/library/ImportQueuePage.c @@ -1,4 +1,4 @@ -/* ImportQueuePage.c generated by valac 0.36.6, the Vala compiler +/* ImportQueuePage.c generated by valac 0.40.4, the Vala compiler * generated from ImportQueuePage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -110,6 +111,11 @@ typedef struct _ImportQueuePagePrivate ImportQueuePagePrivate; typedef struct _BatchImport BatchImport; typedef struct _BatchImportClass BatchImportClass; +enum { + IMPORT_QUEUE_PAGE_0_PROPERTY, + IMPORT_QUEUE_PAGE_NUM_PROPERTIES +}; +static GParamSpec* import_queue_page_properties[IMPORT_QUEUE_PAGE_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define TYPE_DATA_OBJECT (data_object_get_type ()) @@ -300,9 +306,9 @@ typedef struct _VideoViewClass VideoViewClass; enum { IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL, IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL, - IMPORT_QUEUE_PAGE_LAST_SIGNAL + IMPORT_QUEUE_PAGE_NUM_SIGNALS }; -static guint import_queue_page_signals[IMPORT_QUEUE_PAGE_LAST_SIGNAL] = {0}; +static guint import_queue_page_signals[IMPORT_QUEUE_PAGE_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -449,9 +455,15 @@ GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType single_photo_page_get_type (void) G_GNUC_CONST; @@ -463,71 +475,130 @@ GType single_photo_page_update_reason_get_type (void) G_GNUC_CONST; GType import_queue_page_get_type (void) G_GNUC_CONST; GType batch_import_get_type (void) G_GNUC_CONST; #define IMPORT_QUEUE_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_IMPORT_QUEUE_PAGE, ImportQueuePagePrivate)) -enum { - IMPORT_QUEUE_PAGE_DUMMY_PROPERTY -}; #define IMPORT_QUEUE_PAGE_NAME _ ("Importing…") static void import_queue_page_on_stop (ImportQueuePage* self); -static void _import_queue_page_on_stop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _import_queue_page_on_stop_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); ImportQueuePage* import_queue_page_new (void); ImportQueuePage* import_queue_page_construct (GType object_type); -SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* page_name, gboolean scale_up_to_viewport); +SinglePhotoPage* single_photo_page_construct (GType object_type, + const gchar* page_name, + gboolean scale_up_to_viewport); GtkToolbar* page_get_toolbar (Page* self); -static void import_queue_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); -void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static void import_queue_page_real_add_actions (Page* base, GActionMap* map); -void page_add_actions (Page* self, GActionMap* map); -static void import_queue_page_real_remove_actions (Page* base, GActionMap* map); -void page_remove_actions (Page* self, GActionMap* map); -void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* batch_import, gboolean allow_user_cancel); -static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* batch_import); -static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, gpointer self); +static void import_queue_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames); +void page_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames); +static void import_queue_page_real_add_actions (Page* base, + GActionMap* map); +void page_add_actions (Page* self, + GActionMap* map); +static void import_queue_page_real_remove_actions (Page* base, + GActionMap* map); +void page_remove_actions (Page* self, + GActionMap* map); +void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, + BatchImport* batch_import, + gboolean allow_user_cancel); +static void import_queue_page_on_starting (ImportQueuePage* self, + BatchImport* batch_import); +static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, + gpointer self); static void import_queue_page_on_preparing (ImportQueuePage* self); -static void _import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender, gpointer self); -static void import_queue_page_on_progress (ImportQueuePage* self, guint64 completed_bytes, guint64 total_bytes); -static void _import_queue_page_on_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self); +static void _import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender, + gpointer self); +static void import_queue_page_on_progress (ImportQueuePage* self, + guint64 completed_bytes, + guint64 total_bytes); +static void _import_queue_page_on_progress_batch_import_progress (BatchImport* _sender, + guint64 completed_bytes, + guint64 total_bytes, + gpointer self); GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; -static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSource* source, GdkPixbuf* pixbuf, gint to_follow); +static void import_queue_page_on_imported (ImportQueuePage* self, + ThumbnailSource* source, + GdkPixbuf* pixbuf, + gint to_follow); GType media_source_get_type (void) G_GNUC_CONST; -static void _import_queue_page_on_imported_batch_import_imported (BatchImport* _sender, MediaSource* source, GdkPixbuf* pixbuf, gint to_follow, gpointer self); +static void _import_queue_page_on_imported_batch_import_imported (BatchImport* _sender, + MediaSource* source, + GdkPixbuf* pixbuf, + gint to_follow, + gpointer self); gpointer import_manifest_ref (gpointer instance); void import_manifest_unref (gpointer instance); -GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_import_manifest (GValue* value, gpointer v_object); -void value_take_import_manifest (GValue* value, gpointer v_object); +GParamSpec* param_spec_import_manifest (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_import_manifest (GValue* value, + gpointer v_object); +void value_take_import_manifest (GValue* value, + gpointer v_object); gpointer value_get_import_manifest (const GValue* value); GType import_manifest_get_type (void) G_GNUC_CONST; gpointer batch_import_roll_ref (gpointer instance); void batch_import_roll_unref (gpointer instance); -GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_roll (GValue* value, gpointer v_object); -void value_take_batch_import_roll (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_roll (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_roll (GValue* value, + gpointer v_object); +void value_take_batch_import_roll (GValue* value, + gpointer v_object); gpointer value_get_batch_import_roll (const GValue* value); GType batch_import_roll_get_type (void) G_GNUC_CONST; -static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchImport* batch_import, ImportManifest* manifest, BatchImportRoll* import_roll); -static void _import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self); +static void import_queue_page_on_import_complete (ImportQueuePage* self, + BatchImport* batch_import, + ImportManifest* manifest, + BatchImportRoll* import_roll); +static void _import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender, + ImportManifest* manifest, + BatchImportRoll* import_roll, + gpointer self); GType import_result_get_type (void) G_GNUC_CONST; -static void import_queue_page_on_fatal_error (ImportQueuePage* self, ImportResult _result_, const gchar* message); -static void _import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender, ImportResult _result_, const gchar* message, gpointer self); +static void import_queue_page_on_fatal_error (ImportQueuePage* self, + ImportResult _result_, + const gchar* message); +static void _import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender, + ImportResult _result_, + const gchar* message, + gpointer self); void batch_import_schedule (BatchImport* self); static void import_queue_page_update_stop_action (ImportQueuePage* self); gint import_queue_page_get_batch_count (ImportQueuePage* self); -void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); +void page_set_action_sensitive (Page* self, + const gchar* name, + gboolean sensitive); GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); void page_window_set_busy_cursor (PageWindow* self); void batch_import_user_halt (BatchImport* self); gboolean page_is_in_view (Page* self); GType direction_get_type (void) G_GNUC_CONST; -void single_photo_page_set_pixbuf (SinglePhotoPage* self, GdkPixbuf* unscaled, Dimensions* max_dim, Direction* direction); -void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result); +void single_photo_page_set_pixbuf (SinglePhotoPage* self, + GdkPixbuf* unscaled, + Dimensions* max_dim, + Direction* direction); +void dimensions_for_pixbuf (GdkPixbuf* pixbuf, + Dimensions* result); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; @@ -536,33 +607,43 @@ void data_collection_clear (DataCollection* self); GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; -gboolean data_collection_add (DataCollection* self, DataObject* object); +gboolean data_collection_add (DataCollection* self, + DataObject* object); PhotoView* photo_view_new (PhotoSource* source); -PhotoView* photo_view_construct (GType object_type, PhotoSource* source); +PhotoView* photo_view_construct (GType object_type, + PhotoSource* source); GType data_view_get_type (void) G_GNUC_CONST; GType thumbnail_view_get_type (void) G_GNUC_CONST; GType photo_view_get_type (void) G_GNUC_CONST; GType video_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; VideoView* video_view_new (VideoSource* source); -VideoView* video_view_construct (GType object_type, VideoSource* source); +VideoView* video_view_construct (GType object_type, + VideoSource* source); GType video_view_get_type (void) G_GNUC_CONST; gchar* data_object_get_name (DataObject* self); void single_photo_page_blank_display (SinglePhotoPage* self); void page_window_set_normal_cursor (PageWindow* self); -void app_window_error_message (const gchar* message, GtkWindow* parent); +void app_window_error_message (const gchar* message, + GtkWindow* parent); static void import_queue_page_finalize (GObject * obj); static const GActionEntry IMPORT_QUEUE_PAGE_entries[1] = {{"Stop", _import_queue_page_on_stop_gsimple_action_activate_callback}}; -static void _import_queue_page_on_stop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_import_queue_page_on_stop_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 62 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_stop ((ImportQueuePage*) self); -#line 562 "ImportQueuePage.c" +#line 641 "ImportQueuePage.c" } -ImportQueuePage* import_queue_page_construct (GType object_type) { +ImportQueuePage* +import_queue_page_construct (GType object_type) +{ ImportQueuePage * self = NULL; GtkToolbar* toolbar = NULL; GtkToolbar* _tmp0_; @@ -589,7 +670,7 @@ ImportQueuePage* import_queue_page_construct (GType object_type) { #line 32 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_tool_button_set_icon_name (stop_button, "stop"); #line 33 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (stop_button, GTK_TYPE_ACTIONABLE, GtkActionable), "win.Stop"); + gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (stop_button, gtk_actionable_get_type (), GtkActionable), "win.Stop"); #line 35 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (stop_button, gtk_tool_item_get_type (), GtkToolItem), -1); #line 38 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -630,69 +711,65 @@ ImportQueuePage* import_queue_page_construct (GType object_type) { _g_object_unref0 (toolbar); #line 24 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return self; -#line 634 "ImportQueuePage.c" +#line 715 "ImportQueuePage.c" } -ImportQueuePage* import_queue_page_new (void) { +ImportQueuePage* +import_queue_page_new (void) +{ #line 24 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return import_queue_page_construct (TYPE_IMPORT_QUEUE_PAGE); -#line 641 "ImportQueuePage.c" +#line 724 "ImportQueuePage.c" } -static void import_queue_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { +static void +import_queue_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames) +{ ImportQueuePage * self; - GeeList* _tmp0_; - GeeList* _tmp1_; #line 56 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage); #line 56 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); #line 57 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp0_ = ui_filenames; -#line 57 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "import_queue.ui"); -#line 59 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = ui_filenames; + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "import_queue.ui"); #line 59 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - PAGE_CLASS (import_queue_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp1_); -#line 661 "ImportQueuePage.c" + PAGE_CLASS (import_queue_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), ui_filenames); +#line 741 "ImportQueuePage.c" } -static void import_queue_page_real_add_actions (Page* base, GActionMap* map) { +static void +import_queue_page_real_add_actions (Page* base, + GActionMap* map) +{ ImportQueuePage * self; - GActionMap* _tmp0_; - GActionMap* _tmp1_; #line 66 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage); #line 66 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 67 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp0_ = map; -#line 67 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - PAGE_CLASS (import_queue_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_); -#line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = map; + PAGE_CLASS (import_queue_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), map); #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_action_map_add_action_entries (_tmp1_, IMPORT_QUEUE_PAGE_entries, G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries), self); -#line 681 "ImportQueuePage.c" + g_action_map_add_action_entries (map, IMPORT_QUEUE_PAGE_entries, G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries), self); +#line 758 "ImportQueuePage.c" } -static void import_queue_page_real_remove_actions (Page* base, GActionMap* map) { +static void +import_queue_page_real_remove_actions (Page* base, + GActionMap* map) +{ ImportQueuePage * self; - GActionMap* _tmp0_; #line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage); #line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp0_ = map; -#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - PAGE_CLASS (import_queue_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_); -#line 696 "ImportQueuePage.c" + PAGE_CLASS (import_queue_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), map); +#line 773 "ImportQueuePage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -704,89 +781,106 @@ static void import_queue_page_real_remove_actions (Page* base, GActionMap* map) entry_collection_length1 = G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries); #line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries); entry_it = entry_it + 1) { -#line 708 "ImportQueuePage.c" +#line 785 "ImportQueuePage.c" GActionEntry entry = {0}; #line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" entry = entry_collection[entry_it]; -#line 712 "ImportQueuePage.c" +#line 789 "ImportQueuePage.c" { - GActionMap* _tmp1_; - GActionEntry _tmp2_; - const gchar* _tmp3_; -#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = map; + GActionEntry _tmp0_; + const gchar* _tmp1_; #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_ = entry; + _tmp0_ = entry; #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp3_ = _tmp2_.name; + _tmp1_ = _tmp0_.name; #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_action_map_remove_action (_tmp1_, _tmp3_); -#line 725 "ImportQueuePage.c" + g_action_map_remove_action (map, _tmp1_); +#line 799 "ImportQueuePage.c" } } } } -static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, gpointer self) { +static void +_import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, + gpointer self) +{ #line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_starting ((ImportQueuePage*) self, _sender); -#line 735 "ImportQueuePage.c" +#line 812 "ImportQueuePage.c" } -static void _import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender, gpointer self) { +static void +_import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender, + gpointer self) +{ #line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_preparing ((ImportQueuePage*) self); -#line 742 "ImportQueuePage.c" +#line 822 "ImportQueuePage.c" } -static void _import_queue_page_on_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) { +static void +_import_queue_page_on_progress_batch_import_progress (BatchImport* _sender, + guint64 completed_bytes, + guint64 total_bytes, + gpointer self) +{ #line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_progress ((ImportQueuePage*) self, completed_bytes, total_bytes); -#line 749 "ImportQueuePage.c" +#line 834 "ImportQueuePage.c" } -static void _import_queue_page_on_imported_batch_import_imported (BatchImport* _sender, MediaSource* source, GdkPixbuf* pixbuf, gint to_follow, gpointer self) { +static void +_import_queue_page_on_imported_batch_import_imported (BatchImport* _sender, + MediaSource* source, + GdkPixbuf* pixbuf, + gint to_follow, + gpointer self) +{ #line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_imported ((ImportQueuePage*) self, source, pixbuf, to_follow); -#line 756 "ImportQueuePage.c" +#line 847 "ImportQueuePage.c" } -static void _import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { +static void +_import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender, + ImportManifest* manifest, + BatchImportRoll* import_roll, + gpointer self) +{ #line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_import_complete ((ImportQueuePage*) self, _sender, manifest, import_roll); -#line 763 "ImportQueuePage.c" +#line 859 "ImportQueuePage.c" } -static void _import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender, ImportResult _result_, const gchar* message, gpointer self) { +static void +_import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender, + ImportResult _result_, + const gchar* message, + gpointer self) +{ #line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_fatal_error ((ImportQueuePage*) self, _result_, message); -#line 770 "ImportQueuePage.c" +#line 871 "ImportQueuePage.c" } -void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* batch_import, gboolean allow_user_cancel) { +void +import_queue_page_enqueue_and_schedule (ImportQueuePage* self, + BatchImport* batch_import, + gboolean allow_user_cancel) +{ GeeArrayList* _tmp0_; - BatchImport* _tmp1_; - gboolean _tmp2_; - BatchImport* _tmp3_; - BatchImport* _tmp4_; - BatchImport* _tmp5_; - BatchImport* _tmp6_; - BatchImport* _tmp7_; - BatchImport* _tmp8_; - gboolean _tmp9_; - GeeArrayList* _tmp12_; - BatchImport* _tmp13_; - BatchImport* _tmp14_; - GeeArrayList* _tmp15_; - gint _tmp16_; - gint _tmp17_; + GeeArrayList* _tmp2_; + GeeArrayList* _tmp3_; + gint _tmp4_; + gint _tmp5_; #line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -794,83 +888,56 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* #line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->queue; #line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = batch_import; -#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _vala_assert (!_tmp2_, "!queue.contains(batch_import)"); + _vala_assert (!gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), batch_import), "!queue.contains(batch_import)"); #line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp3_ = batch_import; -#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_connect_object (_tmp3_, "starting", (GCallback) _import_queue_page_on_starting_batch_import_starting, self, 0); -#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp4_ = batch_import; + g_signal_connect_object (batch_import, "starting", (GCallback) _import_queue_page_on_starting_batch_import_starting, self, 0); #line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_connect_object (_tmp4_, "preparing", (GCallback) _import_queue_page_on_preparing_batch_import_preparing, self, 0); + g_signal_connect_object (batch_import, "preparing", (GCallback) _import_queue_page_on_preparing_batch_import_preparing, self, 0); #line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp5_ = batch_import; -#line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_connect_object (_tmp5_, "progress", (GCallback) _import_queue_page_on_progress_batch_import_progress, self, 0); -#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp6_ = batch_import; + g_signal_connect_object (batch_import, "progress", (GCallback) _import_queue_page_on_progress_batch_import_progress, self, 0); #line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_connect_object (_tmp6_, "imported", (GCallback) _import_queue_page_on_imported_batch_import_imported, self, 0); -#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp7_ = batch_import; + g_signal_connect_object (batch_import, "imported", (GCallback) _import_queue_page_on_imported_batch_import_imported, self, 0); #line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_connect_object (_tmp7_, "import-complete", (GCallback) _import_queue_page_on_import_complete_batch_import_import_complete, self, 0); + g_signal_connect_object (batch_import, "import-complete", (GCallback) _import_queue_page_on_import_complete_batch_import_import_complete, self, 0); #line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp8_ = batch_import; -#line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_connect_object (_tmp8_, "fatal-error", (GCallback) _import_queue_page_on_fatal_error_batch_import_fatal_error, self, 0); -#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp9_ = allow_user_cancel; + g_signal_connect_object (batch_import, "fatal-error", (GCallback) _import_queue_page_on_fatal_error_batch_import_fatal_error, self, 0); #line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - if (!_tmp9_) { -#line 831 "ImportQueuePage.c" - GeeHashSet* _tmp10_; - BatchImport* _tmp11_; + if (!allow_user_cancel) { +#line 907 "ImportQueuePage.c" + GeeHashSet* _tmp1_; #line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp10_ = self->priv->cancel_unallowed; + _tmp1_ = self->priv->cancel_unallowed; #line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp11_ = batch_import; -#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_); -#line 840 "ImportQueuePage.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), batch_import); +#line 913 "ImportQueuePage.c" } #line 92 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp12_ = self->priv->queue; -#line 92 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp13_ = batch_import; + _tmp2_ = self->priv->queue; #line 92 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), batch_import); #line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp14_ = batch_import; -#line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_emit (self, import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL], 0, _tmp14_); + g_signal_emit (self, import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL], 0, batch_import); #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp15_ = self->priv->queue; + _tmp3_ = self->priv->queue; #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp17_ = _tmp16_; + _tmp5_ = _tmp4_; #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - if (_tmp17_ == 1) { -#line 860 "ImportQueuePage.c" - BatchImport* _tmp18_; -#line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp18_ = batch_import; + if (_tmp5_ == 1) { #line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - batch_import_schedule (_tmp18_); -#line 866 "ImportQueuePage.c" + batch_import_schedule (batch_import); +#line 931 "ImportQueuePage.c" } #line 98 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); -#line 870 "ImportQueuePage.c" +#line 935 "ImportQueuePage.c" } -gint import_queue_page_get_batch_count (ImportQueuePage* self) { +gint +import_queue_page_get_batch_count (ImportQueuePage* self) +{ gint result = 0; GeeArrayList* _tmp0_; gint _tmp1_; @@ -887,15 +954,16 @@ gint import_queue_page_get_batch_count (ImportQueuePage* self) { result = _tmp2_; #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return result; -#line 891 "ImportQueuePage.c" +#line 958 "ImportQueuePage.c" } -static void import_queue_page_update_stop_action (ImportQueuePage* self) { +static void +import_queue_page_update_stop_action (ImportQueuePage* self) +{ gboolean _tmp0_ = FALSE; GeeHashSet* _tmp1_; BatchImport* _tmp2_; - gboolean _tmp3_; #line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -903,41 +971,43 @@ static void import_queue_page_update_stop_action (ImportQueuePage* self) { #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = self->priv->current_batch; #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp3_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); -#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - if (!_tmp3_) { -#line 910 "ImportQueuePage.c" - GeeArrayList* _tmp4_; + if (!gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_)) { +#line 976 "ImportQueuePage.c" + GeeArrayList* _tmp3_; + gint _tmp4_; gint _tmp5_; - gint _tmp6_; #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp4_ = self->priv->queue; + _tmp3_ = self->priv->queue; #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp0_ = _tmp6_ > 0; -#line 922 "ImportQueuePage.c" + _tmp0_ = _tmp5_ > 0; +#line 988 "ImportQueuePage.c" } else { #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = FALSE; -#line 926 "ImportQueuePage.c" +#line 992 "ImportQueuePage.c" } #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Stop", _tmp0_); -#line 930 "ImportQueuePage.c" +#line 996 "ImportQueuePage.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return self ? g_object_ref (self) : NULL; -#line 937 "ImportQueuePage.c" +#line 1005 "ImportQueuePage.c" } -static void import_queue_page_on_stop (ImportQueuePage* self) { +static void +import_queue_page_on_stop (ImportQueuePage* self) +{ GeeArrayList* _tmp0_; gint _tmp1_; gint _tmp2_; @@ -957,7 +1027,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { if (_tmp2_ == 0) { #line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return; -#line 961 "ImportQueuePage.c" +#line 1031 "ImportQueuePage.c" } #line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = app_window_get_instance (); @@ -969,7 +1039,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { _g_object_unref0 (_tmp4_); #line 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->stopped = TRUE; -#line 973 "ImportQueuePage.c" +#line 1043 "ImportQueuePage.c" { GeeArrayList* _batch_import_list = NULL; GeeArrayList* _tmp5_; @@ -997,7 +1067,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { _batch_import_index = -1; #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" while (TRUE) { -#line 1001 "ImportQueuePage.c" +#line 1071 "ImportQueuePage.c" gint _tmp10_; gint _tmp11_; gint _tmp12_; @@ -1018,7 +1088,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { if (!(_tmp11_ < _tmp12_)) { #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" break; -#line 1022 "ImportQueuePage.c" +#line 1092 "ImportQueuePage.c" } #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp13_ = _batch_import_list; @@ -1034,18 +1104,20 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { batch_import_user_halt (_tmp16_); #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (batch_import); -#line 1038 "ImportQueuePage.c" +#line 1108 "ImportQueuePage.c" } #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_batch_import_list); -#line 1042 "ImportQueuePage.c" +#line 1112 "ImportQueuePage.c" } } -static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* batch_import) { +static void +import_queue_page_on_starting (ImportQueuePage* self, + BatchImport* batch_import) +{ BatchImport* _tmp0_; - BatchImport* _tmp1_; #line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1053,18 +1125,18 @@ static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* b #line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); #line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp0_ = batch_import; -#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (batch_import); #line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (self->priv->current_batch); #line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - self->priv->current_batch = _tmp1_; -#line 1064 "ImportQueuePage.c" + self->priv->current_batch = _tmp0_; +#line 1134 "ImportQueuePage.c" } -static void import_queue_page_on_preparing (ImportQueuePage* self) { +static void +import_queue_page_on_preparing (ImportQueuePage* self) +{ GtkProgressBar* _tmp0_; GtkProgressBar* _tmp1_; #line 128 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1077,66 +1149,57 @@ static void import_queue_page_on_preparing (ImportQueuePage* self) { _tmp1_ = self->priv->progress_bar; #line 130 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_pulse (_tmp1_); -#line 1081 "ImportQueuePage.c" +#line 1153 "ImportQueuePage.c" } -static void import_queue_page_on_progress (ImportQueuePage* self, guint64 completed_bytes, guint64 total_bytes) { +static void +import_queue_page_on_progress (ImportQueuePage* self, + guint64 completed_bytes, + guint64 total_bytes) +{ gdouble _tmp0_ = 0.0; - guint64 _tmp1_; - guint64 _tmp2_; gdouble pct = 0.0; - GtkProgressBar* _tmp5_; + GtkProgressBar* _tmp1_; #line 133 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = completed_bytes; -#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_ = total_bytes; -#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - if (_tmp1_ <= _tmp2_) { -#line 1099 "ImportQueuePage.c" - guint64 _tmp3_; - guint64 _tmp4_; + if (completed_bytes <= total_bytes) { #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp3_ = completed_bytes; -#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp4_ = total_bytes; -#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp0_ = ((gdouble) _tmp3_) / ((gdouble) _tmp4_); -#line 1108 "ImportQueuePage.c" + _tmp0_ = ((gdouble) completed_bytes) / ((gdouble) total_bytes); +#line 1171 "ImportQueuePage.c" } else { #line 135 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = 0.0; -#line 1112 "ImportQueuePage.c" +#line 1175 "ImportQueuePage.c" } #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" pct = _tmp0_; #line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp5_ = self->priv->progress_bar; + _tmp1_ = self->priv->progress_bar; #line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_progress_bar_set_fraction (_tmp5_, pct); -#line 1120 "ImportQueuePage.c" + gtk_progress_bar_set_fraction (_tmp1_, pct); +#line 1183 "ImportQueuePage.c" } -static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSource* source, GdkPixbuf* pixbuf, gint to_follow) { +static void +import_queue_page_on_imported (ImportQueuePage* self, + ThumbnailSource* source, + GdkPixbuf* pixbuf, + gint to_follow) +{ gboolean _tmp0_ = FALSE; - gint _tmp1_; - GdkPixbuf* _tmp3_; - GdkPixbuf* _tmp4_; - Dimensions _tmp5_ = {0}; - ViewCollection* _tmp6_; - ViewCollection* _tmp7_; - gboolean _tmp8_ = FALSE; - ThumbnailSource* _tmp9_; - GtkProgressBar* _tmp22_; - GtkProgressBar* _tmp23_; - ThumbnailSource* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; - gchar* _tmp27_; - gchar* _tmp28_; + Dimensions _tmp1_ = {0}; + ViewCollection* _tmp2_; + ViewCollection* _tmp3_; + gboolean _tmp4_ = FALSE; + GtkProgressBar* _tmp13_; + GtkProgressBar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; #line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1144,158 +1207,126 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc #line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = to_follow; -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - if (_tmp1_ > 0) { + if (to_follow > 0) { #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = TRUE; -#line 1153 "ImportQueuePage.c" +#line 1214 "ImportQueuePage.c" } else { - gboolean _tmp2_; #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp0_ = !_tmp2_; -#line 1160 "ImportQueuePage.c" + _tmp0_ = !page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); +#line 1218 "ImportQueuePage.c" } #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp0_) { #line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return; -#line 1166 "ImportQueuePage.c" +#line 1224 "ImportQueuePage.c" } #line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp3_ = pixbuf; -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp4_ = pixbuf; + dimensions_for_pixbuf (pixbuf, &_tmp1_); #line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - dimensions_for_pixbuf (_tmp4_, &_tmp5_); -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp3_, &_tmp5_, NULL); + single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), pixbuf, &_tmp1_, NULL); #line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp7_ = _tmp6_; + _tmp3_ = _tmp2_; #line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection)); #line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _data_collection_unref0 (_tmp7_); -#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp9_ = source; -#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_LIBRARY_PHOTO)) { -#line 1188 "ImportQueuePage.c" - ViewCollection* _tmp10_; - ViewCollection* _tmp11_; - ThumbnailSource* _tmp12_; - PhotoView* _tmp13_; - PhotoView* _tmp14_; - gboolean _tmp15_; -#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _data_collection_unref0 (_tmp3_); #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp11_ = _tmp10_; + if (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_LIBRARY_PHOTO)) { +#line 1240 "ImportQueuePage.c" + ViewCollection* _tmp5_; + ViewCollection* _tmp6_; + PhotoView* _tmp7_; + PhotoView* _tmp8_; #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp12_ = source; + _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp13_ = photo_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp12_) : NULL, TYPE_PHOTO_SOURCE, PhotoSource)); + _tmp6_ = _tmp5_; #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp14_ = _tmp13_; + _tmp7_ = photo_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) source) : NULL, TYPE_PHOTO_SOURCE, PhotoSource)); #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp15_ = data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); + _tmp8_ = _tmp7_; #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp8_ = _tmp15_; + _tmp4_ = data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp8_); #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _data_collection_unref0 (_tmp11_); -#line 1213 "ImportQueuePage.c" + _data_collection_unref0 (_tmp6_); +#line 1259 "ImportQueuePage.c" } else { - ViewCollection* _tmp16_; - ViewCollection* _tmp17_; - ThumbnailSource* _tmp18_; - VideoView* _tmp19_; - VideoView* _tmp20_; - gboolean _tmp21_; -#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp17_ = _tmp16_; + ViewCollection* _tmp9_; + ViewCollection* _tmp10_; + VideoView* _tmp11_; + VideoView* _tmp12_; #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp18_ = source; + _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp19_ = video_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_VIDEO) ? ((Video*) _tmp18_) : NULL, TYPE_VIDEO_SOURCE, VideoSource)); + _tmp10_ = _tmp9_; #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp20_ = _tmp19_; + _tmp11_ = video_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_VIDEO) ? ((Video*) source) : NULL, TYPE_VIDEO_SOURCE, VideoSource)); #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp21_ = data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_OBJECT, DataObject)); + _tmp12_ = _tmp11_; #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp8_ = _tmp21_; + _tmp4_ = data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject)); #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp12_); #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _data_collection_unref0 (_tmp17_); -#line 1239 "ImportQueuePage.c" + _data_collection_unref0 (_tmp10_); +#line 1279 "ImportQueuePage.c" } #line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp22_ = self->priv->progress_bar; + _tmp13_ = self->priv->progress_bar; #line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_progress_bar_set_ellipsize (_tmp22_, PANGO_ELLIPSIZE_MIDDLE); -#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp23_ = self->priv->progress_bar; + gtk_progress_bar_set_ellipsize (_tmp13_, PANGO_ELLIPSIZE_MIDDLE); #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp24_ = source; + _tmp14_ = self->priv->progress_bar; #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp25_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_OBJECT, DataObject)); + _tmp15_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp26_ = _tmp25_; + _tmp16_ = _tmp15_; #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp27_ = g_strdup_printf (_ ("Imported %s"), _tmp26_); + _tmp17_ = g_strdup_printf (_ ("Imported %s"), _tmp16_); #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp28_ = _tmp27_; + _tmp18_ = _tmp17_; #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_progress_bar_set_text (_tmp23_, _tmp28_); + gtk_progress_bar_set_text (_tmp14_, _tmp18_); #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _g_free0 (_tmp28_); + _g_free0 (_tmp18_); #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _g_free0 (_tmp26_); -#line 1263 "ImportQueuePage.c" + _g_free0 (_tmp16_); +#line 1301 "ImportQueuePage.c" } -static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchImport* batch_import, ImportManifest* manifest, BatchImportRoll* import_roll) { +static void +import_queue_page_on_import_complete (ImportQueuePage* self, + BatchImport* batch_import, + ImportManifest* manifest, + BatchImportRoll* import_roll) +{ BatchImport* _tmp0_; - BatchImport* _tmp1_; - GeeArrayList* _tmp2_; + GeeArrayList* _tmp1_; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; - GeeArrayList* _tmp5_; - gpointer _tmp6_; - BatchImport* _tmp7_; - BatchImport* _tmp8_; + GeeArrayList* _tmp4_; + gpointer _tmp5_; + BatchImport* _tmp6_; gboolean removed = FALSE; - GeeArrayList* _tmp9_; - BatchImport* _tmp10_; - gboolean _tmp11_; - gboolean _tmp12_; - GeeHashSet* _tmp13_; - BatchImport* _tmp14_; - BatchImport* _tmp15_; - guint _tmp16_; - BatchImport* _tmp17_; - guint _tmp18_; - BatchImport* _tmp19_; - guint _tmp20_; - BatchImport* _tmp21_; - guint _tmp22_; - BatchImport* _tmp23_; - guint _tmp24_; - BatchImport* _tmp25_; - guint _tmp26_; - GeeArrayList* _tmp27_; - gint _tmp28_; - gint _tmp29_; - BatchImport* _tmp39_; + GeeArrayList* _tmp7_; + gboolean _tmp8_; + GeeHashSet* _tmp9_; + guint _tmp10_; + guint _tmp11_; + guint _tmp12_; + guint _tmp13_; + guint _tmp14_; + guint _tmp15_; + GeeArrayList* _tmp16_; + gint _tmp17_; + gint _tmp18_; #line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1305,177 +1336,156 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm #line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_BATCH_IMPORT_ROLL (import_roll)); #line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp0_ = batch_import; + _tmp0_ = self->priv->current_batch; #line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = self->priv->current_batch; -#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _vala_assert (_tmp0_ == _tmp1_, "batch_import == current_batch"); + _vala_assert (batch_import == _tmp0_, "batch_import == current_batch"); #line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (self->priv->current_batch); #line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->current_batch = NULL; #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_ = self->priv->queue; + _tmp1_ = self->priv->queue; #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _vala_assert (_tmp4_ > 0, "queue.size > 0"); + _vala_assert (_tmp3_ > 0, "queue.size > 0"); #line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp5_ = self->priv->queue; + _tmp4_ = self->priv->queue; #line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp6_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); + _tmp5_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); #line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp7_ = (BatchImport*) _tmp6_; + _tmp6_ = (BatchImport*) _tmp5_; #line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp8_ = batch_import; + _vala_assert (_tmp6_ == batch_import, "queue.get(0) == batch_import"); #line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _vala_assert (_tmp7_ == _tmp8_, "queue.get(0) == batch_import"); -#line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _g_object_unref0 (_tmp7_); -#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp9_ = self->priv->queue; + _g_object_unref0 (_tmp6_); #line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp10_ = batch_import; + _tmp7_ = self->priv->queue; #line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp11_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); -#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - removed = _tmp11_; + removed = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), batch_import); #line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp12_ = removed; + _tmp8_ = removed; #line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _vala_assert (_tmp12_, "removed"); -#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp13_ = self->priv->cancel_unallowed; + _vala_assert (_tmp8_, "removed"); #line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp14_ = batch_import; + _tmp9_ = self->priv->cancel_unallowed; #line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_); -#line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp15_ = batch_import; + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), batch_import); #line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_parse_name ("starting", TYPE_BATCH_IMPORT, &_tmp16_, NULL, FALSE); + g_signal_parse_name ("starting", TYPE_BATCH_IMPORT, &_tmp10_, NULL, FALSE); #line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _import_queue_page_on_starting_batch_import_starting, self); + g_signal_handlers_disconnect_matched (batch_import, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _import_queue_page_on_starting_batch_import_starting, self); #line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp17_ = batch_import; + g_signal_parse_name ("preparing", TYPE_BATCH_IMPORT, &_tmp11_, NULL, FALSE); #line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_parse_name ("preparing", TYPE_BATCH_IMPORT, &_tmp18_, NULL, FALSE); -#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_handlers_disconnect_matched (_tmp17_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _import_queue_page_on_preparing_batch_import_preparing, self); -#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp19_ = batch_import; + g_signal_handlers_disconnect_matched (batch_import, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _import_queue_page_on_preparing_batch_import_preparing, self); #line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_parse_name ("progress", TYPE_BATCH_IMPORT, &_tmp20_, NULL, FALSE); + g_signal_parse_name ("progress", TYPE_BATCH_IMPORT, &_tmp12_, NULL, FALSE); #line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_handlers_disconnect_matched (_tmp19_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _import_queue_page_on_progress_batch_import_progress, self); + g_signal_handlers_disconnect_matched (batch_import, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _import_queue_page_on_progress_batch_import_progress, self); #line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp21_ = batch_import; + g_signal_parse_name ("imported", TYPE_BATCH_IMPORT, &_tmp13_, NULL, FALSE); #line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_parse_name ("imported", TYPE_BATCH_IMPORT, &_tmp22_, NULL, FALSE); -#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_handlers_disconnect_matched (_tmp21_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp22_, 0, NULL, (GCallback) _import_queue_page_on_imported_batch_import_imported, self); -#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp23_ = batch_import; + g_signal_handlers_disconnect_matched (batch_import, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _import_queue_page_on_imported_batch_import_imported, self); #line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_parse_name ("import-complete", TYPE_BATCH_IMPORT, &_tmp24_, NULL, FALSE); + g_signal_parse_name ("import-complete", TYPE_BATCH_IMPORT, &_tmp14_, NULL, FALSE); #line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_handlers_disconnect_matched (_tmp23_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp24_, 0, NULL, (GCallback) _import_queue_page_on_import_complete_batch_import_import_complete, self); -#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp25_ = batch_import; + g_signal_handlers_disconnect_matched (batch_import, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _import_queue_page_on_import_complete_batch_import_import_complete, self); #line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_parse_name ("fatal-error", TYPE_BATCH_IMPORT, &_tmp26_, NULL, FALSE); + g_signal_parse_name ("fatal-error", TYPE_BATCH_IMPORT, &_tmp15_, NULL, FALSE); #line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_handlers_disconnect_matched (_tmp25_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _import_queue_page_on_fatal_error_batch_import_fatal_error, self); + g_signal_handlers_disconnect_matched (batch_import, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _import_queue_page_on_fatal_error_batch_import_fatal_error, self); #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp27_ = self->priv->queue; + _tmp16_ = self->priv->queue; #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp29_ = _tmp28_; + _tmp18_ = _tmp17_; #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - if (_tmp29_ > 0) { -#line 1400 "ImportQueuePage.c" - GeeArrayList* _tmp30_; - gpointer _tmp31_; - BatchImport* _tmp32_; + if (_tmp18_ > 0) { +#line 1409 "ImportQueuePage.c" + GeeArrayList* _tmp19_; + gpointer _tmp20_; + BatchImport* _tmp21_; #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp30_ = self->priv->queue; + _tmp19_ = self->priv->queue; #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp31_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); + _tmp20_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp32_ = (BatchImport*) _tmp31_; + _tmp21_ = (BatchImport*) _tmp20_; #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - batch_import_schedule (_tmp32_); + batch_import_schedule (_tmp21_); #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _g_object_unref0 (_tmp32_); -#line 1414 "ImportQueuePage.c" + _g_object_unref0 (_tmp21_); +#line 1423 "ImportQueuePage.c" } else { - GtkProgressBar* _tmp33_; - GtkProgressBar* _tmp34_; - GtkProgressBar* _tmp35_; - gboolean _tmp36_; + GtkProgressBar* _tmp22_; + GtkProgressBar* _tmp23_; + GtkProgressBar* _tmp24_; + gboolean _tmp25_; #line 186 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp33_ = self->priv->progress_bar; + _tmp22_ = self->priv->progress_bar; #line 186 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_progress_bar_set_ellipsize (_tmp33_, PANGO_ELLIPSIZE_NONE); + gtk_progress_bar_set_ellipsize (_tmp22_, PANGO_ELLIPSIZE_NONE); #line 187 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp34_ = self->priv->progress_bar; + _tmp23_ = self->priv->progress_bar; #line 187 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_progress_bar_set_text (_tmp34_, ""); + gtk_progress_bar_set_text (_tmp23_, ""); #line 188 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp35_ = self->priv->progress_bar; + _tmp24_ = self->priv->progress_bar; #line 188 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_progress_bar_set_fraction (_tmp35_, 0.0); + gtk_progress_bar_set_fraction (_tmp24_, 0.0); #line 195 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" single_photo_page_blank_display (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 198 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp36_ = self->priv->stopped; + _tmp25_ = self->priv->stopped; #line 198 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - if (_tmp36_) { -#line 1438 "ImportQueuePage.c" - AppWindow* _tmp37_; - AppWindow* _tmp38_; + if (_tmp25_) { +#line 1447 "ImportQueuePage.c" + AppWindow* _tmp26_; + AppWindow* _tmp27_; #line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp37_ = app_window_get_instance (); + _tmp26_ = app_window_get_instance (); #line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp38_ = _tmp37_; + _tmp27_ = _tmp26_; #line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_PAGE_WINDOW, PageWindow)); #line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _g_object_unref0 (_tmp38_); -#line 1449 "ImportQueuePage.c" + _g_object_unref0 (_tmp27_); +#line 1458 "ImportQueuePage.c" } #line 201 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->stopped = FALSE; -#line 1453 "ImportQueuePage.c" +#line 1462 "ImportQueuePage.c" } #line 204 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); #line 207 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp39_ = batch_import; -#line 207 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_emit (self, import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL], 0, _tmp39_); -#line 1461 "ImportQueuePage.c" + g_signal_emit (self, import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL], 0, batch_import); +#line 1468 "ImportQueuePage.c" } -static void import_queue_page_on_fatal_error (ImportQueuePage* self, ImportResult _result_, const gchar* message) { - const gchar* _tmp0_; +static void +import_queue_page_on_fatal_error (ImportQueuePage* self, + ImportResult _result_, + const gchar* message) +{ #line 210 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 210 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (message != NULL); #line 211 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp0_ = message; -#line 211 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - app_window_error_message (_tmp0_, NULL); -#line 1475 "ImportQueuePage.c" + app_window_error_message (message, NULL); +#line 1483 "ImportQueuePage.c" } -static void import_queue_page_class_init (ImportQueuePageClass * klass) { +static void +import_queue_page_class_init (ImportQueuePageClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1492,11 +1502,13 @@ static void import_queue_page_class_init (ImportQueuePageClass * klass) { import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL] = g_signal_new ("batch-added", TYPE_IMPORT_QUEUE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT); #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL] = g_signal_new ("batch-removed", TYPE_IMPORT_QUEUE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT); -#line 1496 "ImportQueuePage.c" +#line 1506 "ImportQueuePage.c" } -static void import_queue_page_instance_init (ImportQueuePage * self) { +static void +import_queue_page_instance_init (ImportQueuePage * self) +{ GeeArrayList* _tmp0_; GeeHashSet* _tmp1_; GtkProgressBar* _tmp2_; @@ -1520,11 +1532,13 @@ static void import_queue_page_instance_init (ImportQueuePage * self) { self->priv->progress_bar = _tmp2_; #line 14 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->stopped = FALSE; -#line 1524 "ImportQueuePage.c" +#line 1536 "ImportQueuePage.c" } -static void import_queue_page_finalize (GObject * obj) { +static void +import_queue_page_finalize (GObject * obj) +{ ImportQueuePage * self; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage); @@ -1538,11 +1552,13 @@ static void import_queue_page_finalize (GObject * obj) { _g_object_unref0 (self->priv->progress_bar); #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" G_OBJECT_CLASS (import_queue_page_parent_class)->finalize (obj); -#line 1542 "ImportQueuePage.c" +#line 1556 "ImportQueuePage.c" } -GType import_queue_page_get_type (void) { +GType +import_queue_page_get_type (void) +{ static volatile gsize import_queue_page_type_id__volatile = 0; if (g_once_init_enter (&import_queue_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ImportQueuePageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) import_queue_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ImportQueuePage), 0, (GInstanceInitFunc) import_queue_page_instance_init, NULL }; diff --git a/src/library/ImportQueueSidebarEntry.c b/src/library/ImportQueueSidebarEntry.c index bd9e970..b878989 100644 --- a/src/library/ImportQueueSidebarEntry.c +++ b/src/library/ImportQueueSidebarEntry.c @@ -1,4 +1,4 @@ -/* ImportQueueSidebarEntry.c generated by valac 0.36.6, the Vala compiler +/* ImportQueueSidebarEntry.c generated by valac 0.40.4, the Vala compiler * generated from ImportQueueSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -100,6 +101,11 @@ typedef struct _LibraryHideablePageEntryPrivate LibraryHideablePageEntryPrivate; typedef struct _LibraryImportQueueSidebarEntry LibraryImportQueueSidebarEntry; typedef struct _LibraryImportQueueSidebarEntryClass LibraryImportQueueSidebarEntryClass; typedef struct _LibraryImportQueueSidebarEntryPrivate LibraryImportQueueSidebarEntryPrivate; +enum { + LIBRARY_IMPORT_QUEUE_SIDEBAR_ENTRY_0_PROPERTY, + LIBRARY_IMPORT_QUEUE_SIDEBAR_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* library_import_queue_sidebar_entry_properties[LIBRARY_IMPORT_QUEUE_SIDEBAR_ENTRY_NUM_PROPERTIES]; #define TYPE_SINGLE_PHOTO_PAGE (single_photo_page_get_type ()) #define SINGLE_PHOTO_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)) @@ -201,17 +207,19 @@ GType sidebar_contextable_get_type (void) G_GNUC_CONST; GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST; GType library_hideable_page_entry_get_type (void) G_GNUC_CONST; GType library_import_queue_sidebar_entry_get_type (void) G_GNUC_CONST; -enum { - LIBRARY_IMPORT_QUEUE_SIDEBAR_ENTRY_DUMMY_PROPERTY -}; LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_new (void); LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_construct (GType object_type); LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type); static void library_import_queue_sidebar_entry_on_page_created (LibraryImportQueueSidebarEntry* self); -static void _library_import_queue_sidebar_entry_on_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, Page* page, gpointer self); +static void _library_import_queue_sidebar_entry_on_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, + Page* page, + gpointer self); static void library_import_queue_sidebar_entry_on_destroying_page (LibraryImportQueueSidebarEntry* self); -static void _library_import_queue_sidebar_entry_on_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, Page* page, gpointer self); -void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value); +static void _library_import_queue_sidebar_entry_on_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, + Page* page, + gpointer self); +void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, + gboolean value); static gchar* library_import_queue_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base); #define IMPORT_QUEUE_PAGE_NAME _ ("Importing…") static gchar* library_import_queue_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base); @@ -225,28 +233,46 @@ static ImportQueuePage* library_import_queue_sidebar_entry_get_queue_page (Libra Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self); static void library_import_queue_sidebar_entry_on_batch_added_or_removed (LibraryImportQueueSidebarEntry* self); GType batch_import_get_type (void) G_GNUC_CONST; -static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_added (ImportQueuePage* _sender, BatchImport* batch_import, gpointer self); -static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_removed (ImportQueuePage* _sender, BatchImport* batch_import, gpointer self); +static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_added (ImportQueuePage* _sender, + BatchImport* batch_import, + gpointer self); +static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_removed (ImportQueuePage* _sender, + BatchImport* batch_import, + gpointer self); gint import_queue_page_get_batch_count (ImportQueuePage* self); -void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self, BatchImport* batch_import, gboolean allow_user_cancel); -void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* batch_import, gboolean allow_user_cancel); - - -static void _library_import_queue_sidebar_entry_on_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, Page* page, gpointer self) { +void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self, + BatchImport* batch_import, + gboolean allow_user_cancel); +void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, + BatchImport* batch_import, + gboolean allow_user_cancel); + + +static void +_library_import_queue_sidebar_entry_on_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, + Page* page, + gpointer self) +{ #line 10 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" library_import_queue_sidebar_entry_on_page_created ((LibraryImportQueueSidebarEntry*) self); -#line 239 "ImportQueueSidebarEntry.c" +#line 259 "ImportQueueSidebarEntry.c" } -static void _library_import_queue_sidebar_entry_on_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, Page* page, gpointer self) { +static void +_library_import_queue_sidebar_entry_on_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, + Page* page, + gpointer self) +{ #line 11 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" library_import_queue_sidebar_entry_on_destroying_page ((LibraryImportQueueSidebarEntry*) self); -#line 246 "ImportQueueSidebarEntry.c" +#line 270 "ImportQueueSidebarEntry.c" } -LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_construct (GType object_type) { +LibraryImportQueueSidebarEntry* +library_import_queue_sidebar_entry_construct (GType object_type) +{ LibraryImportQueueSidebarEntry * self = NULL; #line 8 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" self = (LibraryImportQueueSidebarEntry*) library_hideable_page_entry_construct (object_type); @@ -258,18 +284,22 @@ LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_construct (GT library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), FALSE); #line 8 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" return self; -#line 262 "ImportQueueSidebarEntry.c" +#line 288 "ImportQueueSidebarEntry.c" } -LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_new (void) { +LibraryImportQueueSidebarEntry* +library_import_queue_sidebar_entry_new (void) +{ #line 8 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" return library_import_queue_sidebar_entry_construct (LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY); -#line 269 "ImportQueueSidebarEntry.c" +#line 297 "ImportQueueSidebarEntry.c" } -static gchar* library_import_queue_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +library_import_queue_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ LibraryImportQueueSidebarEntry * self; gchar* result = NULL; gchar* _tmp0_; @@ -281,11 +311,13 @@ static gchar* library_import_queue_sidebar_entry_real_get_sidebar_name (SidebarS result = _tmp0_; #line 20 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" return result; -#line 285 "ImportQueueSidebarEntry.c" +#line 315 "ImportQueueSidebarEntry.c" } -static gchar* library_import_queue_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { +static gchar* +library_import_queue_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) +{ LibraryImportQueueSidebarEntry * self; gchar* result = NULL; gchar* _tmp0_; @@ -297,11 +329,13 @@ static gchar* library_import_queue_sidebar_entry_real_get_sidebar_icon (SidebarS result = _tmp0_; #line 24 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" return result; -#line 301 "ImportQueueSidebarEntry.c" +#line 333 "ImportQueueSidebarEntry.c" } -static Page* library_import_queue_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +library_import_queue_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) +{ LibraryImportQueueSidebarEntry * self; Page* result = NULL; ImportQueuePage* _tmp0_; @@ -315,11 +349,13 @@ static Page* library_import_queue_sidebar_entry_real_create_page (SidebarSimpleP result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page); #line 28 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" return result; -#line 319 "ImportQueueSidebarEntry.c" +#line 353 "ImportQueueSidebarEntry.c" } -static ImportQueuePage* library_import_queue_sidebar_entry_get_queue_page (LibraryImportQueueSidebarEntry* self) { +static ImportQueuePage* +library_import_queue_sidebar_entry_get_queue_page (LibraryImportQueueSidebarEntry* self) +{ ImportQueuePage* result = NULL; Page* _tmp0_; ImportQueuePage* _tmp1_; @@ -333,31 +369,41 @@ static ImportQueuePage* library_import_queue_sidebar_entry_get_queue_page (Libra if (_tmp1_ == NULL) { #line 32 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" _g_object_unref0 (_tmp0_); -#line 337 "ImportQueueSidebarEntry.c" +#line 373 "ImportQueueSidebarEntry.c" } #line 32 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" result = _tmp1_; #line 32 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" return result; -#line 343 "ImportQueueSidebarEntry.c" +#line 379 "ImportQueueSidebarEntry.c" } -static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_added (ImportQueuePage* _sender, BatchImport* batch_import, gpointer self) { +static void +_library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_added (ImportQueuePage* _sender, + BatchImport* batch_import, + gpointer self) +{ #line 36 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" library_import_queue_sidebar_entry_on_batch_added_or_removed ((LibraryImportQueueSidebarEntry*) self); -#line 350 "ImportQueueSidebarEntry.c" +#line 390 "ImportQueueSidebarEntry.c" } -static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_removed (ImportQueuePage* _sender, BatchImport* batch_import, gpointer self) { +static void +_library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_removed (ImportQueuePage* _sender, + BatchImport* batch_import, + gpointer self) +{ #line 37 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" library_import_queue_sidebar_entry_on_batch_added_or_removed ((LibraryImportQueueSidebarEntry*) self); -#line 357 "ImportQueueSidebarEntry.c" +#line 401 "ImportQueueSidebarEntry.c" } -static void library_import_queue_sidebar_entry_on_page_created (LibraryImportQueueSidebarEntry* self) { +static void +library_import_queue_sidebar_entry_on_page_created (LibraryImportQueueSidebarEntry* self) +{ ImportQueuePage* _tmp0_; ImportQueuePage* _tmp1_; ImportQueuePage* _tmp2_; @@ -380,11 +426,13 @@ static void library_import_queue_sidebar_entry_on_page_created (LibraryImportQue g_signal_connect_object (_tmp3_, "batch-removed", (GCallback) _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_removed, self, 0); #line 37 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" _g_object_unref0 (_tmp3_); -#line 384 "ImportQueueSidebarEntry.c" +#line 430 "ImportQueueSidebarEntry.c" } -static void library_import_queue_sidebar_entry_on_destroying_page (LibraryImportQueueSidebarEntry* self) { +static void +library_import_queue_sidebar_entry_on_destroying_page (LibraryImportQueueSidebarEntry* self) +{ ImportQueuePage* _tmp0_; ImportQueuePage* _tmp1_; guint _tmp2_; @@ -413,14 +461,15 @@ static void library_import_queue_sidebar_entry_on_destroying_page (LibraryImport g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_removed, self); #line 42 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" _g_object_unref0 (_tmp4_); -#line 417 "ImportQueueSidebarEntry.c" +#line 465 "ImportQueueSidebarEntry.c" } -static void library_import_queue_sidebar_entry_on_batch_added_or_removed (LibraryImportQueueSidebarEntry* self) { +static void +library_import_queue_sidebar_entry_on_batch_added_or_removed (LibraryImportQueueSidebarEntry* self) +{ ImportQueuePage* _tmp0_; ImportQueuePage* _tmp1_; - gint _tmp2_; #line 45 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" g_return_if_fail (LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY (self)); #line 46 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" @@ -428,20 +477,20 @@ static void library_import_queue_sidebar_entry_on_batch_added_or_removed (Librar #line 46 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" _tmp1_ = _tmp0_; #line 46 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" - _tmp2_ = import_queue_page_get_batch_count (_tmp1_); -#line 46 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" - library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp2_ > 0); + library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), import_queue_page_get_batch_count (_tmp1_) > 0); #line 46 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" _g_object_unref0 (_tmp1_); -#line 437 "ImportQueueSidebarEntry.c" +#line 484 "ImportQueueSidebarEntry.c" } -void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self, BatchImport* batch_import, gboolean allow_user_cancel) { +void +library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self, + BatchImport* batch_import, + gboolean allow_user_cancel) +{ ImportQueuePage* _tmp0_; ImportQueuePage* _tmp1_; - BatchImport* _tmp2_; - gboolean _tmp3_; #line 49 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" g_return_if_fail (LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY (self)); #line 49 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" @@ -453,18 +502,16 @@ void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueue #line 53 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" _tmp1_ = _tmp0_; #line 53 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" - _tmp2_ = batch_import; -#line 53 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" - _tmp3_ = allow_user_cancel; -#line 53 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" - import_queue_page_enqueue_and_schedule (_tmp1_, _tmp2_, _tmp3_); + import_queue_page_enqueue_and_schedule (_tmp1_, batch_import, allow_user_cancel); #line 53 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" _g_object_unref0 (_tmp1_); -#line 464 "ImportQueueSidebarEntry.c" +#line 509 "ImportQueueSidebarEntry.c" } -static void library_import_queue_sidebar_entry_class_init (LibraryImportQueueSidebarEntryClass * klass) { +static void +library_import_queue_sidebar_entry_class_init (LibraryImportQueueSidebarEntryClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" library_import_queue_sidebar_entry_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" @@ -473,15 +520,19 @@ static void library_import_queue_sidebar_entry_class_init (LibraryImportQueueSid ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_import_queue_sidebar_entry_real_get_sidebar_icon; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_import_queue_sidebar_entry_real_create_page; -#line 477 "ImportQueueSidebarEntry.c" +#line 524 "ImportQueueSidebarEntry.c" } -static void library_import_queue_sidebar_entry_instance_init (LibraryImportQueueSidebarEntry * self) { +static void +library_import_queue_sidebar_entry_instance_init (LibraryImportQueueSidebarEntry * self) +{ } -GType library_import_queue_sidebar_entry_get_type (void) { +GType +library_import_queue_sidebar_entry_get_type (void) +{ static volatile gsize library_import_queue_sidebar_entry_type_id__volatile = 0; if (g_once_init_enter (&library_import_queue_sidebar_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryImportQueueSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_import_queue_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryImportQueueSidebarEntry), 0, (GInstanceInitFunc) library_import_queue_sidebar_entry_instance_init, NULL }; diff --git a/src/library/LastImportPage.c b/src/library/LastImportPage.c index fae86fe..6fdba61 100644 --- a/src/library/LastImportPage.c +++ b/src/library/LastImportPage.c @@ -1,4 +1,4 @@ -/* LastImportPage.c generated by valac 0.36.6, the Vala compiler +/* LastImportPage.c generated by valac 0.40.4, the Vala compiler * generated from LastImportPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -214,6 +215,11 @@ typedef struct _ImportID ImportID; typedef struct _Alteration Alteration; typedef struct _AlterationClass AlterationClass; +enum { + LAST_IMPORT_PAGE_0_PROPERTY, + LAST_IMPORT_PAGE_NUM_PROPERTIES +}; +static GParamSpec* last_import_page_properties[LAST_IMPORT_PAGE_NUM_PROPERTIES]; #define TYPE_DATA_COLLECTION (data_collection_get_type ()) #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection)) @@ -582,9 +588,15 @@ GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType checkerboard_page_get_type (void) G_GNUC_CONST; @@ -598,17 +610,29 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self); gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType search_view_filter_get_type (void) G_GNUC_CONST; gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; @@ -623,20 +647,29 @@ ImportID* import_id_dup (const ImportID* self); void import_id_free (ImportID* self); gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; #define LAST_IMPORT_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LAST_IMPORT_PAGE, LastImportPagePrivate)) -enum { - LAST_IMPORT_PAGE_DUMMY_PROPERTY -}; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -644,23 +677,35 @@ GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self); static void last_import_page_on_import_rolls_altered (LastImportPage* self); -static void _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, gpointer self); +static void _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, + gpointer self); #define IMPORT_ID_INVALID ((gint64) 0) -void import_id_init (ImportID *self, gint64 id); -Alteration* alteration_new (const gchar* subject, const gchar* detail); -Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail); +void import_id_init (ImportID *self, + gint64 id); +Alteration* alteration_new (const gchar* subject, + const gchar* detail); +Alteration* alteration_construct (GType object_type, + const gchar* subject, + const gchar* detail); #define LAST_IMPORT_PAGE_NAME _ ("Last Import") LastImportPage* last_import_page_new (void); LastImportPage* last_import_page_construct (GType object_type); -CollectionPage* collection_page_construct (GType object_type, const gchar* page_name); +CollectionPage* collection_page_construct (GType object_type, + const gchar* page_name); ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* self); GType view_collection_get_type (void) G_GNUC_CONST; ViewCollection* page_get_view (Page* self); @@ -668,56 +713,90 @@ void view_collection_halt_all_monitoring (ViewCollection* self); void data_collection_clear (DataCollection* self); gpointer view_manager_ref (gpointer instance); void view_manager_unref (gpointer instance); -GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_manager (GValue* value, gpointer v_object); -void value_take_view_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_manager (GValue* value, + gpointer v_object); +void value_take_view_manager (GValue* value, + gpointer v_object); gpointer value_get_view_manager (const GValue* value); GType view_manager_get_type (void) G_GNUC_CONST; gpointer view_collection_monitor_ref (gpointer instance); void view_collection_monitor_unref (gpointer instance); -GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void view_collection_value_set_monitor (GValue* value, gpointer v_object); -void view_collection_value_take_monitor (GValue* value, gpointer v_object); +GParamSpec* view_collection_param_spec_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void view_collection_value_set_monitor (GValue* value, + gpointer v_object); +void view_collection_value_take_monitor (GValue* value, + gpointer v_object); gpointer view_collection_value_get_monitor (const GValue* value); GType view_collection_monitor_get_type (void) G_GNUC_CONST; -ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target); -static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_new (LastImportPage* owner, ImportID* import_id); -static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_construct (GType object_type, LastImportPage* owner, ImportID* import_id); +ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq, + GeeCollection* initial, + ProgressMonitor progress_monitor, + void* progress_monitor_target); +static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_new (LastImportPage* owner, + ImportID* import_id); +static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_construct (GType object_type, + LastImportPage* owner, + ImportID* import_id); GType collection_view_manager_get_type (void) G_GNUC_CONST; static GType last_import_page_last_import_view_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -static void last_import_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by); +static void last_import_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); -void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by); -static void last_import_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by); -void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by); +void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, + gboolean* sort_order, + gint* sort_by); +static void last_import_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by); +void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, + gboolean sort_order, + gint sort_by); #define LAST_IMPORT_PAGE_LAST_IMPORT_VIEW_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, LastImportPageLastImportViewManagerPrivate)) -enum { - LAST_IMPORT_PAGE_LAST_IMPORT_VIEW_MANAGER_DUMMY_PROPERTY -}; CollectionViewManager* collection_view_manager_new (CollectionPage* page); -CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page); -static gboolean last_import_page_last_import_view_manager_real_include_in_view (ViewManager* base, DataSource* source); +CollectionViewManager* collection_view_manager_construct (GType object_type, + CollectionPage* page); +static gboolean last_import_page_last_import_view_manager_real_include_in_view (ViewManager* base, + DataSource* source); GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; -void media_source_get_import_id (MediaSource* self, ImportID* result); +void media_source_get_import_id (MediaSource* self, + ImportID* result); static void last_import_page_last_import_view_manager_finalize (ViewManager * obj); static void last_import_page_finalize (GObject * obj); -static void _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, gpointer self) { +static void +_last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, + gpointer self) +{ #line 41 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" last_import_page_on_import_rolls_altered ((LastImportPage*) self); -#line 713 "LastImportPage.c" +#line 790 "LastImportPage.c" } -LastImportPage* last_import_page_construct (GType object_type) { +LastImportPage* +last_import_page_construct (GType object_type) +{ LastImportPage * self = NULL; #line 28 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self = (LastImportPage*) collection_page_construct (object_type, LAST_IMPORT_PAGE_NAME); -#line 721 "LastImportPage.c" +#line 800 "LastImportPage.c" { GeeIterator* _col_it = NULL; MediaCollectionRegistry* _tmp0_; @@ -746,57 +825,58 @@ LastImportPage* last_import_page_construct (GType object_type) { _col_it = _tmp5_; #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" while (TRUE) { -#line 750 "LastImportPage.c" +#line 829 "LastImportPage.c" GeeIterator* _tmp6_; - gboolean _tmp7_; MediaSourceCollection* col = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - MediaSourceCollection* _tmp10_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + MediaSourceCollection* _tmp9_; #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp6_ = _col_it; #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" break; -#line 765 "LastImportPage.c" +#line 841 "LastImportPage.c" } #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp8_ = _col_it; + _tmp7_ = _col_it; #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - col = (MediaSourceCollection*) _tmp9_; + col = (MediaSourceCollection*) _tmp8_; #line 32 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp10_ = col; + _tmp9_ = col; #line 32 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - g_signal_connect_object (_tmp10_, "import-roll-altered", (GCallback) _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered, self, 0); + g_signal_connect_object (_tmp9_, "import-roll-altered", (GCallback) _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered, self, 0); #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _data_collection_unref0 (col); -#line 779 "LastImportPage.c" +#line 855 "LastImportPage.c" } #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _g_object_unref0 (_col_it); -#line 783 "LastImportPage.c" +#line 859 "LastImportPage.c" } #line 36 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" last_import_page_on_import_rolls_altered (self); #line 27 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return self; -#line 789 "LastImportPage.c" +#line 865 "LastImportPage.c" } -LastImportPage* last_import_page_new (void) { +LastImportPage* +last_import_page_new (void) +{ #line 27 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return last_import_page_construct (TYPE_LAST_IMPORT_PAGE); -#line 796 "LastImportPage.c" +#line 874 "LastImportPage.c" } -static void last_import_page_on_import_rolls_altered (LastImportPage* self) { +static void +last_import_page_on_import_rolls_altered (LastImportPage* self) +{ ImportID* current_last_import_id = NULL; MediaCollectionRegistry* _tmp0_; MediaCollectionRegistry* _tmp1_; @@ -830,7 +910,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { _tmp4_ = current_last_import_id; #line 50 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" if (_tmp4_ == NULL) { -#line 834 "LastImportPage.c" +#line 914 "LastImportPage.c" ViewCollection* _tmp5_; ViewCollection* _tmp6_; ViewCollection* _tmp7_; @@ -855,7 +935,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { _import_id_free0 (current_last_import_id); #line 54 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return; -#line 859 "LastImportPage.c" +#line 939 "LastImportPage.c" } #line 57 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp9_ = current_last_import_id; @@ -871,7 +951,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { _import_id_free0 (current_last_import_id); #line 58 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return; -#line 875 "LastImportPage.c" +#line 955 "LastImportPage.c" } #line 60 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp13_ = current_last_import_id; @@ -893,7 +973,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection)); #line 63 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _data_collection_unref0 (_tmp17_); -#line 897 "LastImportPage.c" +#line 977 "LastImportPage.c" { GeeIterator* _col_it = NULL; MediaCollectionRegistry* _tmp18_; @@ -922,76 +1002,77 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { _col_it = _tmp23_; #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" while (TRUE) { -#line 926 "LastImportPage.c" +#line 1006 "LastImportPage.c" GeeIterator* _tmp24_; - gboolean _tmp25_; MediaSourceCollection* col = NULL; - GeeIterator* _tmp26_; - gpointer _tmp27_; + GeeIterator* _tmp25_; + gpointer _tmp26_; + ViewCollection* _tmp27_; ViewCollection* _tmp28_; - ViewCollection* _tmp29_; - MediaSourceCollection* _tmp30_; - ImportID _tmp31_; + MediaSourceCollection* _tmp29_; + ImportID _tmp30_; + LastImportPageLastImportViewManager* _tmp31_; LastImportPageLastImportViewManager* _tmp32_; - LastImportPageLastImportViewManager* _tmp33_; - Alteration* _tmp34_; + Alteration* _tmp33_; + ViewCollectionMonitor* _tmp34_; ViewCollectionMonitor* _tmp35_; - ViewCollectionMonitor* _tmp36_; #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp24_ = _col_it; #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp25_ = gee_iterator_next (_tmp24_); -#line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - if (!_tmp25_) { + if (!gee_iterator_next (_tmp24_)) { #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" break; -#line 949 "LastImportPage.c" +#line 1026 "LastImportPage.c" } #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp26_ = _col_it; + _tmp25_ = _col_it; #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp27_ = gee_iterator_get (_tmp26_); + _tmp26_ = gee_iterator_get (_tmp25_); #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - col = (MediaSourceCollection*) _tmp27_; + col = (MediaSourceCollection*) _tmp26_; #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp27_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp29_ = _tmp28_; + _tmp28_ = _tmp27_; #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp30_ = col; + _tmp29_ = col; #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp31_ = self->priv->last_import_id; + _tmp30_ = self->priv->last_import_id; #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp32_ = last_import_page_last_import_view_manager_new (self, &_tmp31_); + _tmp31_ = last_import_page_last_import_view_manager_new (self, &_tmp30_); #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp33_ = _tmp32_; + _tmp32_ = _tmp31_; #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp34_ = self->priv->last_import_alteration; + _tmp33_ = self->priv->last_import_alteration; #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp35_ = view_collection_monitor_source_collection (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_VIEW_MANAGER, ViewManager), _tmp34_, NULL, NULL, NULL); + _tmp34_ = view_collection_monitor_source_collection (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_VIEW_MANAGER, ViewManager), _tmp33_, NULL, NULL, NULL); #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp36_ = _tmp35_; + _tmp35_ = _tmp34_; #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _view_collection_monitor_unref0 (_tmp36_); + _view_collection_monitor_unref0 (_tmp35_); #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _view_manager_unref0 (_tmp33_); + _view_manager_unref0 (_tmp32_); #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _data_collection_unref0 (_tmp29_); + _data_collection_unref0 (_tmp28_); #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _data_collection_unref0 (col); -#line 983 "LastImportPage.c" +#line 1060 "LastImportPage.c" } #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _g_object_unref0 (_col_it); -#line 987 "LastImportPage.c" +#line 1064 "LastImportPage.c" } #line 45 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _import_id_free0 (current_last_import_id); -#line 991 "LastImportPage.c" +#line 1068 "LastImportPage.c" } -static void last_import_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) { +static void +last_import_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by) +{ LastImportPage * self; gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; @@ -1017,23 +1098,25 @@ static void last_import_page_real_get_config_photos_sort (MediaPage* base, gbool if (sort_order) { #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" *sort_order = _vala_sort_order; -#line 1021 "LastImportPage.c" +#line 1102 "LastImportPage.c" } #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" if (sort_by) { #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" *sort_by = _vala_sort_by; -#line 1027 "LastImportPage.c" +#line 1108 "LastImportPage.c" } } -static void last_import_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { +static void +last_import_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by) +{ LastImportPage * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - gboolean _tmp2_; - gint _tmp3_; #line 75 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LAST_IMPORT_PAGE, LastImportPage); #line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -1041,77 +1124,79 @@ static void last_import_page_real_set_config_photos_sort (MediaPage* base, gbool #line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp1_ = _tmp0_; #line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp2_ = sort_order; -#line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp3_ = sort_by; -#line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); + configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), sort_order, sort_by); #line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _g_object_unref0 (_tmp1_); -#line 1052 "LastImportPage.c" +#line 1131 "LastImportPage.c" } -static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_construct (GType object_type, LastImportPage* owner, ImportID* import_id) { +static LastImportPageLastImportViewManager* +last_import_page_last_import_view_manager_construct (GType object_type, + LastImportPage* owner, + ImportID* import_id) +{ LastImportPageLastImportViewManager* self = NULL; - LastImportPage* _tmp0_; - ImportID _tmp1_; + ImportID _tmp0_; #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" g_return_val_if_fail (IS_LAST_IMPORT_PAGE (owner), NULL); #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" g_return_val_if_fail (import_id != NULL, NULL); #line 14 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp0_ = owner; -#line 14 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - self = (LastImportPageLastImportViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage)); + self = (LastImportPageLastImportViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, TYPE_COLLECTION_PAGE, CollectionPage)); #line 16 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp1_ = *import_id; + _tmp0_ = *import_id; #line 16 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - self->priv->import_id = _tmp1_; + self->priv->import_id = _tmp0_; #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return self; -#line 1074 "LastImportPage.c" +#line 1154 "LastImportPage.c" } -static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_new (LastImportPage* owner, ImportID* import_id) { +static LastImportPageLastImportViewManager* +last_import_page_last_import_view_manager_new (LastImportPage* owner, + ImportID* import_id) +{ #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return last_import_page_last_import_view_manager_construct (LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, owner, import_id); -#line 1081 "LastImportPage.c" +#line 1164 "LastImportPage.c" } -static gboolean last_import_page_last_import_view_manager_real_include_in_view (ViewManager* base, DataSource* source) { +static gboolean +last_import_page_last_import_view_manager_real_include_in_view (ViewManager* base, + DataSource* source) +{ LastImportPageLastImportViewManager * self; gboolean result = FALSE; - DataSource* _tmp0_; - ImportID _tmp1_ = {0}; - gint64 _tmp2_; - ImportID _tmp3_; - gint64 _tmp4_; + ImportID _tmp0_ = {0}; + gint64 _tmp1_; + ImportID _tmp2_; + gint64 _tmp3_; #line 19 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, LastImportPageLastImportViewManager); #line 19 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp0_ = source; + media_source_get_import_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource), &_tmp0_); #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - media_source_get_import_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp1_); + _tmp1_ = _tmp0_.id; #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp2_ = _tmp1_.id; + _tmp2_ = self->priv->import_id; #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp3_ = self->priv->import_id; + _tmp3_ = _tmp2_.id; #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp4_ = _tmp3_.id; -#line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - result = _tmp2_ == _tmp4_; + result = _tmp1_ == _tmp3_; #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return result; -#line 1111 "LastImportPage.c" +#line 1194 "LastImportPage.c" } -static void last_import_page_last_import_view_manager_class_init (LastImportPageLastImportViewManagerClass * klass) { +static void +last_import_page_last_import_view_manager_class_init (LastImportPageLastImportViewManagerClass * klass) +{ #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" last_import_page_last_import_view_manager_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -1120,28 +1205,34 @@ static void last_import_page_last_import_view_manager_class_init (LastImportPage g_type_class_add_private (klass, sizeof (LastImportPageLastImportViewManagerPrivate)); #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) last_import_page_last_import_view_manager_real_include_in_view; -#line 1124 "LastImportPage.c" +#line 1209 "LastImportPage.c" } -static void last_import_page_last_import_view_manager_instance_init (LastImportPageLastImportViewManager * self) { +static void +last_import_page_last_import_view_manager_instance_init (LastImportPageLastImportViewManager * self) +{ #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self->priv = LAST_IMPORT_PAGE_LAST_IMPORT_VIEW_MANAGER_GET_PRIVATE (self); -#line 1131 "LastImportPage.c" +#line 1218 "LastImportPage.c" } -static void last_import_page_last_import_view_manager_finalize (ViewManager * obj) { +static void +last_import_page_last_import_view_manager_finalize (ViewManager * obj) +{ LastImportPageLastImportViewManager * self; #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, LastImportPageLastImportViewManager); #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" VIEW_MANAGER_CLASS (last_import_page_last_import_view_manager_parent_class)->finalize (obj); -#line 1141 "LastImportPage.c" +#line 1230 "LastImportPage.c" } -static GType last_import_page_last_import_view_manager_get_type (void) { +static GType +last_import_page_last_import_view_manager_get_type (void) +{ static volatile gsize last_import_page_last_import_view_manager_type_id__volatile = 0; if (g_once_init_enter (&last_import_page_last_import_view_manager_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LastImportPageLastImportViewManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) last_import_page_last_import_view_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LastImportPageLastImportViewManager), 0, (GInstanceInitFunc) last_import_page_last_import_view_manager_instance_init, NULL }; @@ -1153,7 +1244,9 @@ static GType last_import_page_last_import_view_manager_get_type (void) { } -static void last_import_page_class_init (LastImportPageClass * klass) { +static void +last_import_page_class_init (LastImportPageClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" last_import_page_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -1164,11 +1257,13 @@ static void last_import_page_class_init (LastImportPageClass * klass) { ((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) last_import_page_real_set_config_photos_sort; #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" G_OBJECT_CLASS (klass)->finalize = last_import_page_finalize; -#line 1168 "LastImportPage.c" +#line 1261 "LastImportPage.c" } -static void last_import_page_instance_init (LastImportPage * self) { +static void +last_import_page_instance_init (LastImportPage * self) +{ Alteration* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self->priv = LAST_IMPORT_PAGE_GET_PRIVATE (self); @@ -1178,15 +1273,17 @@ static void last_import_page_instance_init (LastImportPage * self) { _tmp0_ = alteration_new ("metadata", "import-id"); #line 25 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self->priv->last_import_alteration = _tmp0_; -#line 1182 "LastImportPage.c" +#line 1277 "LastImportPage.c" } -static void last_import_page_finalize (GObject * obj) { +static void +last_import_page_finalize (GObject * obj) +{ LastImportPage * self; #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LAST_IMPORT_PAGE, LastImportPage); -#line 1190 "LastImportPage.c" +#line 1287 "LastImportPage.c" { GeeIterator* _col_it = NULL; MediaCollectionRegistry* _tmp0_; @@ -1215,53 +1312,52 @@ static void last_import_page_finalize (GObject * obj) { _col_it = _tmp5_; #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" while (TRUE) { -#line 1219 "LastImportPage.c" +#line 1316 "LastImportPage.c" GeeIterator* _tmp6_; - gboolean _tmp7_; MediaSourceCollection* col = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - MediaSourceCollection* _tmp10_; - guint _tmp11_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + MediaSourceCollection* _tmp9_; + guint _tmp10_; #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp6_ = _col_it; #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" break; -#line 1235 "LastImportPage.c" +#line 1329 "LastImportPage.c" } #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp8_ = _col_it; + _tmp7_ = _col_it; #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - col = (MediaSourceCollection*) _tmp9_; + col = (MediaSourceCollection*) _tmp8_; #line 41 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp10_ = col; + _tmp9_ = col; #line 41 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - g_signal_parse_name ("import-roll-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp11_, NULL, FALSE); + g_signal_parse_name ("import-roll-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp10_, NULL, FALSE); #line 41 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered, self); + g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered, self); #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _data_collection_unref0 (col); -#line 1251 "LastImportPage.c" +#line 1345 "LastImportPage.c" } #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _g_object_unref0 (_col_it); -#line 1255 "LastImportPage.c" +#line 1349 "LastImportPage.c" } #line 25 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _alteration_unref0 (self->priv->last_import_alteration); #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" G_OBJECT_CLASS (last_import_page_parent_class)->finalize (obj); -#line 1261 "LastImportPage.c" +#line 1355 "LastImportPage.c" } -GType last_import_page_get_type (void) { +GType +last_import_page_get_type (void) +{ static volatile gsize last_import_page_type_id__volatile = 0; if (g_once_init_enter (&last_import_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LastImportPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) last_import_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LastImportPage), 0, (GInstanceInitFunc) last_import_page_instance_init, NULL }; diff --git a/src/library/LastImportSidebarEntry.c b/src/library/LastImportSidebarEntry.c index 03684ca..8640578 100644 --- a/src/library/LastImportSidebarEntry.c +++ b/src/library/LastImportSidebarEntry.c @@ -1,4 +1,4 @@ -/* LastImportSidebarEntry.c generated by valac 0.36.6, the Vala compiler +/* LastImportSidebarEntry.c generated by valac 0.40.4, the Vala compiler * generated from LastImportSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -101,6 +102,11 @@ typedef struct _LibraryHideablePageEntryPrivate LibraryHideablePageEntryPrivate; typedef struct _LibraryLastImportSidebarEntry LibraryLastImportSidebarEntry; typedef struct _LibraryLastImportSidebarEntryClass LibraryLastImportSidebarEntryClass; typedef struct _LibraryLastImportSidebarEntryPrivate LibraryLastImportSidebarEntryPrivate; +enum { + LIBRARY_LAST_IMPORT_SIDEBAR_ENTRY_0_PROPERTY, + LIBRARY_LAST_IMPORT_SIDEBAR_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* library_last_import_sidebar_entry_properties[LIBRARY_LAST_IMPORT_SIDEBAR_ENTRY_NUM_PROPERTIES]; #define TYPE_DATA_COLLECTION (data_collection_get_type ()) #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection)) @@ -272,14 +278,17 @@ GType sidebar_contextable_get_type (void) G_GNUC_CONST; GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST; GType library_hideable_page_entry_get_type (void) G_GNUC_CONST; GType library_last_import_sidebar_entry_get_type (void) G_GNUC_CONST; -enum { - LIBRARY_LAST_IMPORT_SIDEBAR_ENTRY_DUMMY_PROPERTY -}; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -287,15 +296,22 @@ GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self); static void library_last_import_sidebar_entry_on_import_rolls_altered (LibraryLastImportSidebarEntry* self); -static void _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, gpointer self); +static void _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, + gpointer self); LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_new (void); LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_construct (GType object_type); LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type); @@ -303,7 +319,8 @@ GType import_id_get_type (void) G_GNUC_CONST; ImportID* import_id_dup (const ImportID* self); void import_id_free (ImportID* self); ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* self); -void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value); +void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, + gboolean value); static gchar* library_last_import_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base); #define LAST_IMPORT_PAGE_NAME _ ("Last Import") static gchar* library_last_import_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base); @@ -318,22 +335,27 @@ GType last_import_page_get_type (void) G_GNUC_CONST; static void library_last_import_sidebar_entry_finalize (GObject * obj); -static void _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, gpointer self) { +static void +_library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, + gpointer self) +{ #line 17 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" library_last_import_sidebar_entry_on_import_rolls_altered ((LibraryLastImportSidebarEntry*) self); -#line 325 "LastImportSidebarEntry.c" +#line 345 "LastImportSidebarEntry.c" } -LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_construct (GType object_type) { +LibraryLastImportSidebarEntry* +library_last_import_sidebar_entry_construct (GType object_type) +{ LibraryLastImportSidebarEntry * self = NULL; + MediaCollectionRegistry* _tmp10_; MediaCollectionRegistry* _tmp11_; - MediaCollectionRegistry* _tmp12_; + ImportID* _tmp12_; ImportID* _tmp13_; - ImportID* _tmp14_; #line 8 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" self = (LibraryLastImportSidebarEntry*) library_hideable_page_entry_construct (object_type); -#line 337 "LastImportSidebarEntry.c" +#line 359 "LastImportSidebarEntry.c" { GeeIterator* _media_sources_it = NULL; MediaCollectionRegistry* _tmp0_; @@ -362,69 +384,70 @@ LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_construct (GTyp _media_sources_it = _tmp5_; #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" while (TRUE) { -#line 366 "LastImportSidebarEntry.c" +#line 388 "LastImportSidebarEntry.c" GeeIterator* _tmp6_; - gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - MediaSourceCollection* _tmp10_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + MediaSourceCollection* _tmp9_; #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" break; -#line 381 "LastImportSidebarEntry.c" +#line 400 "LastImportSidebarEntry.c" } #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - _tmp8_ = _media_sources_it; + _tmp7_ = _media_sources_it; #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - media_sources = (MediaSourceCollection*) _tmp9_; + media_sources = (MediaSourceCollection*) _tmp8_; #line 10 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - _tmp10_ = media_sources; + _tmp9_ = media_sources; #line 10 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - g_signal_connect_object (_tmp10_, "import-roll-altered", (GCallback) _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered, self, 0); + g_signal_connect_object (_tmp9_, "import-roll-altered", (GCallback) _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered, self, 0); #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" _data_collection_unref0 (media_sources); -#line 395 "LastImportSidebarEntry.c" +#line 414 "LastImportSidebarEntry.c" } #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" _g_object_unref0 (_media_sources_it); -#line 399 "LastImportSidebarEntry.c" +#line 418 "LastImportSidebarEntry.c" } #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - _tmp11_ = media_collection_registry_get_instance (); + _tmp10_ = media_collection_registry_get_instance (); #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - _tmp13_ = media_collection_registry_get_last_import_id (_tmp12_); + _tmp12_ = media_collection_registry_get_last_import_id (_tmp11_); #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp14_ != NULL); + library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp13_ != NULL); #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - _import_id_free0 (_tmp14_); + _import_id_free0 (_tmp13_); #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - _media_collection_registry_unref0 (_tmp12_); + _media_collection_registry_unref0 (_tmp11_); #line 8 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" return self; -#line 417 "LastImportSidebarEntry.c" +#line 436 "LastImportSidebarEntry.c" } -LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_new (void) { +LibraryLastImportSidebarEntry* +library_last_import_sidebar_entry_new (void) +{ #line 8 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" return library_last_import_sidebar_entry_construct (LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY); -#line 424 "LastImportSidebarEntry.c" +#line 445 "LastImportSidebarEntry.c" } -static gchar* library_last_import_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +library_last_import_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ LibraryLastImportSidebarEntry * self; gchar* result = NULL; gchar* _tmp0_; @@ -436,11 +459,13 @@ static gchar* library_last_import_sidebar_entry_real_get_sidebar_name (SidebarSi result = _tmp0_; #line 21 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" return result; -#line 440 "LastImportSidebarEntry.c" +#line 463 "LastImportSidebarEntry.c" } -static gchar* library_last_import_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { +static gchar* +library_last_import_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) +{ LibraryLastImportSidebarEntry * self; gchar* result = NULL; gchar* _tmp0_; @@ -452,11 +477,13 @@ static gchar* library_last_import_sidebar_entry_real_get_sidebar_icon (SidebarSi result = _tmp0_; #line 25 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" return result; -#line 456 "LastImportSidebarEntry.c" +#line 481 "LastImportSidebarEntry.c" } -static Page* library_last_import_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +library_last_import_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) +{ LibraryLastImportSidebarEntry * self; Page* result = NULL; LastImportPage* _tmp0_; @@ -470,11 +497,13 @@ static Page* library_last_import_sidebar_entry_real_create_page (SidebarSimplePa result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page); #line 29 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" return result; -#line 474 "LastImportSidebarEntry.c" +#line 501 "LastImportSidebarEntry.c" } -static void library_last_import_sidebar_entry_on_import_rolls_altered (LibraryLastImportSidebarEntry* self) { +static void +library_last_import_sidebar_entry_on_import_rolls_altered (LibraryLastImportSidebarEntry* self) +{ MediaCollectionRegistry* _tmp0_; MediaCollectionRegistry* _tmp1_; ImportID* _tmp2_; @@ -495,11 +524,13 @@ static void library_last_import_sidebar_entry_on_import_rolls_altered (LibraryLa _import_id_free0 (_tmp3_); #line 33 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" _media_collection_registry_unref0 (_tmp1_); -#line 499 "LastImportSidebarEntry.c" +#line 528 "LastImportSidebarEntry.c" } -static void library_last_import_sidebar_entry_class_init (LibraryLastImportSidebarEntryClass * klass) { +static void +library_last_import_sidebar_entry_class_init (LibraryLastImportSidebarEntryClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" library_last_import_sidebar_entry_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" @@ -510,19 +541,23 @@ static void library_last_import_sidebar_entry_class_init (LibraryLastImportSideb ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_last_import_sidebar_entry_real_create_page; #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" G_OBJECT_CLASS (klass)->finalize = library_last_import_sidebar_entry_finalize; -#line 514 "LastImportSidebarEntry.c" +#line 545 "LastImportSidebarEntry.c" } -static void library_last_import_sidebar_entry_instance_init (LibraryLastImportSidebarEntry * self) { +static void +library_last_import_sidebar_entry_instance_init (LibraryLastImportSidebarEntry * self) +{ } -static void library_last_import_sidebar_entry_finalize (GObject * obj) { +static void +library_last_import_sidebar_entry_finalize (GObject * obj) +{ LibraryLastImportSidebarEntry * self; #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, LibraryLastImportSidebarEntry); -#line 526 "LastImportSidebarEntry.c" +#line 561 "LastImportSidebarEntry.c" { GeeIterator* _media_sources_it = NULL; MediaCollectionRegistry* _tmp0_; @@ -551,51 +586,50 @@ static void library_last_import_sidebar_entry_finalize (GObject * obj) { _media_sources_it = _tmp5_; #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" while (TRUE) { -#line 555 "LastImportSidebarEntry.c" +#line 590 "LastImportSidebarEntry.c" GeeIterator* _tmp6_; - gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - MediaSourceCollection* _tmp10_; - guint _tmp11_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + MediaSourceCollection* _tmp9_; + guint _tmp10_; #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" break; -#line 571 "LastImportSidebarEntry.c" +#line 603 "LastImportSidebarEntry.c" } #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - _tmp8_ = _media_sources_it; + _tmp7_ = _media_sources_it; #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - media_sources = (MediaSourceCollection*) _tmp9_; + media_sources = (MediaSourceCollection*) _tmp8_; #line 17 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - _tmp10_ = media_sources; + _tmp9_ = media_sources; #line 17 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - g_signal_parse_name ("import-roll-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp11_, NULL, FALSE); + g_signal_parse_name ("import-roll-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp10_, NULL, FALSE); #line 17 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered, self); + g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered, self); #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" _data_collection_unref0 (media_sources); -#line 587 "LastImportSidebarEntry.c" +#line 619 "LastImportSidebarEntry.c" } #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" _g_object_unref0 (_media_sources_it); -#line 591 "LastImportSidebarEntry.c" +#line 623 "LastImportSidebarEntry.c" } #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" G_OBJECT_CLASS (library_last_import_sidebar_entry_parent_class)->finalize (obj); -#line 595 "LastImportSidebarEntry.c" +#line 627 "LastImportSidebarEntry.c" } -GType library_last_import_sidebar_entry_get_type (void) { +GType +library_last_import_sidebar_entry_get_type (void) +{ static volatile gsize library_last_import_sidebar_entry_type_id__volatile = 0; if (g_once_init_enter (&library_last_import_sidebar_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryLastImportSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_last_import_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryLastImportSidebarEntry), 0, (GInstanceInitFunc) library_last_import_sidebar_entry_instance_init, NULL }; diff --git a/src/library/Library.c b/src/library/Library.c index 460fc05..e81e681 100644 --- a/src/library/Library.c +++ b/src/library/Library.c @@ -1,4 +1,4 @@ -/* Library.c generated by valac 0.36.6, the Vala compiler +/* Library.c generated by valac 0.40.4, the Vala compiler * generated from Library.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include @@ -21,7 +22,9 @@ void library_terminate (void); void library_trash_sidebar_entry_terminate (void); -void library_init (GError** error) { +void +library_init (GError** error) +{ gboolean _tmp0_; gboolean _tmp1_; #line 10 "/home/jens/Source/shotwell/src/library/Library.vala" @@ -32,14 +35,16 @@ void library_init (GError** error) { _tmp1_ = _tmp0_; #line 11 "/home/jens/Source/shotwell/src/library/Library.vala" photo_set_develop_raw_photos_to_files (TRUE); -#line 36 "Library.c" +#line 39 "Library.c" } -void library_terminate (void) { +void +library_terminate (void) +{ #line 15 "/home/jens/Source/shotwell/src/library/Library.vala" library_trash_sidebar_entry_terminate (); -#line 43 "Library.c" +#line 48 "Library.c" } diff --git a/src/library/LibraryBranch.c b/src/library/LibraryBranch.c index 1cd27cb..d46cc91 100644 --- a/src/library/LibraryBranch.c +++ b/src/library/LibraryBranch.c @@ -1,4 +1,4 @@ -/* LibraryBranch.c generated by valac 0.36.6, the Vala compiler +/* LibraryBranch.c generated by valac 0.40.4, the Vala compiler * generated from LibraryBranch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -119,6 +120,17 @@ typedef struct _LibraryOfflineSidebarEntryClass LibraryOfflineSidebarEntryClass; typedef struct _LibraryTrashSidebarEntry LibraryTrashSidebarEntry; typedef struct _LibraryTrashSidebarEntryClass LibraryTrashSidebarEntryClass; +enum { + LIBRARY_BRANCH_0_PROPERTY, + LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY, + LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY, + LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY, + LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY, + LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY, + LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY, + LIBRARY_BRANCH_NUM_PROPERTIES +}; +static GParamSpec* library_branch_properties[LIBRARY_BRANCH_NUM_PROPERTIES]; #define LIBRARY_BRANCH_TYPE_ENTRY_POSITION (library_branch_entry_position_get_type ()) #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) @@ -198,6 +210,11 @@ typedef struct _SidebarContextable SidebarContextable; typedef struct _SidebarContextableIface SidebarContextableIface; typedef struct _SidebarSimplePageEntryPrivate SidebarSimplePageEntryPrivate; typedef struct _LibraryPhotosEntryPrivate LibraryPhotosEntryPrivate; +enum { + LIBRARY_PHOTOS_ENTRY_0_PROPERTY, + LIBRARY_PHOTOS_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* library_photos_entry_properties[LIBRARY_PHOTOS_ENTRY_NUM_PROPERTIES]; #define TYPE_CHECKERBOARD_PAGE (checkerboard_page_get_type ()) #define CHECKERBOARD_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHECKERBOARD_PAGE, CheckerboardPage)) @@ -239,11 +256,17 @@ typedef struct _CollectionPageClass CollectionPageClass; typedef struct _LibraryMainPage LibraryMainPage; typedef struct _LibraryMainPageClass LibraryMainPageClass; typedef struct _LibraryHideablePageEntryPrivate LibraryHideablePageEntryPrivate; +enum { + LIBRARY_HIDEABLE_PAGE_ENTRY_0_PROPERTY, + LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY, + LIBRARY_HIDEABLE_PAGE_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* library_hideable_page_entry_properties[LIBRARY_HIDEABLE_PAGE_ENTRY_NUM_PROPERTIES]; enum { LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL, - LIBRARY_HIDEABLE_PAGE_ENTRY_LAST_SIGNAL + LIBRARY_HIDEABLE_PAGE_ENTRY_NUM_SIGNALS }; -static guint library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_LAST_SIGNAL] = {0}; +static guint library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_NUM_SIGNALS] = {0}; typedef struct _PagePrivate PagePrivate; #define TYPE_PAGE_WINDOW (page_window_get_type ()) @@ -378,6 +401,11 @@ typedef struct _DataSource DataSource; typedef struct _DataSourceClass DataSourceClass; typedef struct _CollectionPagePrivate CollectionPagePrivate; typedef struct _LibraryMainPagePrivate LibraryMainPagePrivate; +enum { + LIBRARY_MAIN_PAGE_0_PROPERTY, + LIBRARY_MAIN_PAGE_NUM_PROPERTIES +}; +static GParamSpec* library_main_page_properties[LIBRARY_MAIN_PAGE_NUM_PROPERTIES]; #define TYPE_DATA_COLLECTION (data_collection_get_type ()) #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection)) @@ -789,107 +817,150 @@ GType library_import_queue_sidebar_entry_get_type (void) G_GNUC_CONST; GType library_offline_sidebar_entry_get_type (void) G_GNUC_CONST; GType library_trash_sidebar_entry_get_type (void) G_GNUC_CONST; #define LIBRARY_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBRARY_TYPE_BRANCH, LibraryBranchPrivate)) -enum { - LIBRARY_BRANCH_DUMMY_PROPERTY, - LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY, - LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY, - LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY, - LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY, - LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY, - LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY -}; static GType library_branch_entry_position_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define LIBRARY_BRANCH_POSITION_DATA "x-photos-entry-position" LibraryBranch* library_branch_new (void); LibraryBranch* library_branch_construct (GType object_type); -SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized); -SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized); +SidebarHeader* sidebar_header_new (const gchar* name, + const gchar* tooltip, + gboolean emphasized); +SidebarHeader* sidebar_header_construct (GType object_type, + const gchar* name, + const gchar* tooltip, + gboolean emphasized); GType sidebar_grouping_get_type (void) G_GNUC_CONST; GType sidebar_header_get_type (void) G_GNUC_CONST; GType sidebar_tree_get_type (void) G_GNUC_CONST; GType sidebar_entry_get_type (void) G_GNUC_CONST; GType sidebar_branch_options_get_type (void) G_GNUC_CONST; -static gint library_branch_comparator (SidebarEntry* a, SidebarEntry* b); -static gint _library_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b); -SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator); -SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator); +static gint library_branch_comparator (SidebarEntry* a, + SidebarEntry* b); +static gint _library_branch_comparator_gcompare_func (gconstpointer a, + gconstpointer b); +SidebarBranch* sidebar_branch_new (SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator); +SidebarBranch* sidebar_branch_construct (GType object_type, + SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator); LibraryPhotosEntry* library_photos_entry_new (void); LibraryPhotosEntry* library_photos_entry_construct (GType object_type); -static void library_branch_set_photos_entry (LibraryBranch* self, LibraryPhotosEntry* value); +static void library_branch_set_photos_entry (LibraryBranch* self, + LibraryPhotosEntry* value); LibraryTrashSidebarEntry* library_trash_sidebar_entry_new (void); LibraryTrashSidebarEntry* library_trash_sidebar_entry_construct (GType object_type); -static void library_branch_set_trash_entry (LibraryBranch* self, LibraryTrashSidebarEntry* value); +static void library_branch_set_trash_entry (LibraryBranch* self, + LibraryTrashSidebarEntry* value); LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_new (void); LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_construct (GType object_type); -static void library_branch_set_last_imported_entry (LibraryBranch* self, LibraryLastImportSidebarEntry* value); +static void library_branch_set_last_imported_entry (LibraryBranch* self, + LibraryLastImportSidebarEntry* value); LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_new (void); LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_construct (GType object_type); -static void library_branch_set_flagged_entry (LibraryBranch* self, LibraryFlaggedSidebarEntry* value); +static void library_branch_set_flagged_entry (LibraryBranch* self, + LibraryFlaggedSidebarEntry* value); LibraryOfflineSidebarEntry* library_offline_sidebar_entry_new (void); LibraryOfflineSidebarEntry* library_offline_sidebar_entry_construct (GType object_type); -static void library_branch_set_offline_entry (LibraryBranch* self, LibraryOfflineSidebarEntry* value); +static void library_branch_set_offline_entry (LibraryBranch* self, + LibraryOfflineSidebarEntry* value); LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_new (void); LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_construct (GType object_type); -static void library_branch_set_import_queue_entry (LibraryBranch* self, LibraryImportQueueSidebarEntry* value); -static void library_branch_insert (LibraryBranch* self, SidebarEntry* entry, gint position); +static void library_branch_set_import_queue_entry (LibraryBranch* self, + LibraryImportQueueSidebarEntry* value); +static void library_branch_insert (LibraryBranch* self, + SidebarEntry* entry, + gint position); LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self); LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self); LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* self); static void library_branch_on_flagged_visibility_changed (LibraryBranch* self); -static void _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self); +static void _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, + gboolean visible, + gpointer self); LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBranch* self); static void library_branch_on_last_imported_visibility_changed (LibraryBranch* self); -static void _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self); +static void _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, + gboolean visible, + gpointer self); LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBranch* self); static void library_branch_on_import_queue_visibility_changed (LibraryBranch* self); -static void _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self); +static void _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, + gboolean visible, + gpointer self); LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* self); static void library_branch_on_offline_visibility_changed (LibraryBranch* self); -static void _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self); -void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator); +static void _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, + gboolean visible, + gpointer self); +void sidebar_branch_graft (SidebarBranch* self, + SidebarEntry* parent, + SidebarEntry* entry, + GCompareFunc comparator); SidebarEntry* sidebar_branch_get_root (SidebarBranch* self); -static void library_branch_update_entry_visibility (LibraryBranch* self, LibraryHideablePageEntry* entry, gint position); +static void library_branch_update_entry_visibility (LibraryBranch* self, + LibraryHideablePageEntry* entry, + gint position); gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self); -gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry); -void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry); +gboolean sidebar_branch_has_entry (SidebarBranch* self, + SidebarEntry* entry); +void sidebar_branch_prune (SidebarBranch* self, + SidebarEntry* entry); static void library_branch_finalize (GObject * obj); -static void _vala_library_branch_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void _vala_library_branch_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); +static void _vala_library_branch_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); +static void _vala_library_branch_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec); GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST; GType page_get_type (void) G_GNUC_CONST; GType sidebar_page_representative_get_type (void) G_GNUC_CONST; GType sidebar_contextable_get_type (void) G_GNUC_CONST; -enum { - LIBRARY_PHOTOS_ENTRY_DUMMY_PROPERTY -}; SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type); static gchar* library_photos_entry_real_get_sidebar_name (SidebarSimplePageEntry* base); static gchar* library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base); #define RESOURCES_ICON_PHOTOS "shotwell" static Page* library_photos_entry_real_create_page (SidebarSimplePageEntry* base); -LibraryMainPage* library_main_page_new (ProgressMonitor monitor, void* monitor_target); -LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor monitor, void* monitor_target); +LibraryMainPage* library_main_page_new (ProgressMonitor monitor, + void* monitor_target); +LibraryMainPage* library_main_page_construct (GType object_type, + ProgressMonitor monitor, + void* monitor_target); GType checkerboard_page_get_type (void) G_GNUC_CONST; GType media_page_get_type (void) G_GNUC_CONST; GType collection_page_get_type (void) G_GNUC_CONST; GType library_main_page_get_type (void) G_GNUC_CONST; #define LIBRARY_HIDEABLE_PAGE_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntryPrivate)) -enum { - LIBRARY_HIDEABLE_PAGE_ENTRY_DUMMY_PROPERTY, - LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY -}; LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type); -void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value); +void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, + gboolean value); static void library_hideable_page_entry_finalize (GObject * obj); -static void _vala_library_hideable_page_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void _vala_library_hideable_page_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); +static void _vala_library_hideable_page_entry_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); +static void _vala_library_hideable_page_entry_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec); GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; @@ -902,33 +973,49 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self); gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType search_view_filter_get_type (void) G_GNUC_CONST; gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; GType rating_get_type (void) G_GNUC_CONST; GType raw_developer_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; -enum { - LIBRARY_MAIN_PAGE_DUMMY_PROPERTY -}; #define LIBRARY_MAIN_PAGE_NAME _ ("Library") -CollectionPage* collection_page_construct (GType object_type, const gchar* page_name); +CollectionPage* collection_page_construct (GType object_type, + const gchar* page_name); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -936,9 +1023,15 @@ GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); @@ -947,39 +1040,74 @@ GType view_collection_get_type (void) G_GNUC_CONST; ViewCollection* page_get_view (Page* self); gpointer view_manager_ref (gpointer instance); void view_manager_unref (gpointer instance); -GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_manager (GValue* value, gpointer v_object); -void value_take_view_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_manager (GValue* value, + gpointer v_object); +void value_take_view_manager (GValue* value, + gpointer v_object); gpointer value_get_view_manager (const GValue* value); GType view_manager_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer view_collection_monitor_ref (gpointer instance); void view_collection_monitor_unref (gpointer instance); -GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void view_collection_value_set_monitor (GValue* value, gpointer v_object); -void view_collection_value_take_monitor (GValue* value, gpointer v_object); +GParamSpec* view_collection_param_spec_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void view_collection_value_set_monitor (GValue* value, + gpointer v_object); +void view_collection_value_take_monitor (GValue* value, + gpointer v_object); gpointer view_collection_value_get_monitor (const GValue* value); GType view_collection_monitor_get_type (void) G_GNUC_CONST; -ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target); +ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq, + GeeCollection* initial, + ProgressMonitor progress_monitor, + void* progress_monitor_target); CollectionViewManager* collection_view_manager_new (CollectionPage* page); -CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page); +CollectionViewManager* collection_view_manager_construct (GType object_type, + CollectionPage* page); GType collection_view_manager_get_type (void) G_GNUC_CONST; -static void library_main_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by); +static void library_main_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); -void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by); -static void library_main_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by); -void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by); - - -static GType library_branch_entry_position_get_type (void) { +void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, + gboolean* sort_order, + gint* sort_by); +static void library_main_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by); +void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, + gboolean sort_order, + gint sort_by); + + +static GType +library_branch_entry_position_get_type (void) +{ static volatile gsize library_branch_entry_position_type_id__volatile = 0; if (g_once_init_enter (&library_branch_entry_position_type_id__volatile)) { static const GEnumValue values[] = {{LIBRARY_BRANCH_ENTRY_POSITION_PHOTOS, "LIBRARY_BRANCH_ENTRY_POSITION_PHOTOS", "photos"}, {LIBRARY_BRANCH_ENTRY_POSITION_FLAGGED, "LIBRARY_BRANCH_ENTRY_POSITION_FLAGGED", "flagged"}, {LIBRARY_BRANCH_ENTRY_POSITION_LAST_IMPORTED, "LIBRARY_BRANCH_ENTRY_POSITION_LAST_IMPORTED", "last-imported"}, {LIBRARY_BRANCH_ENTRY_POSITION_IMPORT_QUEUE, "LIBRARY_BRANCH_ENTRY_POSITION_IMPORT_QUEUE", "import-queue"}, {LIBRARY_BRANCH_ENTRY_POSITION_OFFLINE, "LIBRARY_BRANCH_ENTRY_POSITION_OFFLINE", "offline"}, {LIBRARY_BRANCH_ENTRY_POSITION_TRASH, "LIBRARY_BRANCH_ENTRY_POSITION_TRASH", "trash"}, {0, NULL, NULL}}; @@ -991,44 +1119,65 @@ static GType library_branch_entry_position_get_type (void) { } -static gint _library_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b) { +static gint +_library_branch_comparator_gcompare_func (gconstpointer a, + gconstpointer b) +{ gint result; result = library_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b); #line 30 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return result; -#line 1000 "LibraryBranch.c" +#line 1131 "LibraryBranch.c" } -static void _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) { +static void +_library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, + gboolean visible, + gpointer self) +{ #line 43 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" library_branch_on_flagged_visibility_changed ((LibraryBranch*) self); -#line 1007 "LibraryBranch.c" +#line 1142 "LibraryBranch.c" } -static void _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) { +static void +_library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, + gboolean visible, + gpointer self) +{ #line 46 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" library_branch_on_last_imported_visibility_changed ((LibraryBranch*) self); -#line 1014 "LibraryBranch.c" +#line 1153 "LibraryBranch.c" } -static void _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) { +static void +_library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, + gboolean visible, + gpointer self) +{ #line 49 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" library_branch_on_import_queue_visibility_changed ((LibraryBranch*) self); -#line 1021 "LibraryBranch.c" +#line 1164 "LibraryBranch.c" } -static void _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) { +static void +_library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, + gboolean visible, + gpointer self) +{ #line 52 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" library_branch_on_offline_visibility_changed ((LibraryBranch*) self); -#line 1028 "LibraryBranch.c" +#line 1175 "LibraryBranch.c" } -LibraryBranch* library_branch_construct (GType object_type) { +LibraryBranch* +library_branch_construct (GType object_type) +{ LibraryBranch * self = NULL; SidebarHeader* _tmp0_; SidebarHeader* _tmp1_; @@ -1140,48 +1289,47 @@ LibraryBranch* library_branch_construct (GType object_type) { library_branch_on_offline_visibility_changed (self); #line 29 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return self; -#line 1144 "LibraryBranch.c" +#line 1293 "LibraryBranch.c" } -LibraryBranch* library_branch_new (void) { +LibraryBranch* +library_branch_new (void) +{ #line 29 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return library_branch_construct (LIBRARY_TYPE_BRANCH); -#line 1151 "LibraryBranch.c" +#line 1302 "LibraryBranch.c" } -static void library_branch_insert (LibraryBranch* self, SidebarEntry* entry, gint position) { +static void +library_branch_insert (LibraryBranch* self, + SidebarEntry* entry, + gint position) +{ SidebarEntry* _tmp0_; - gint _tmp1_; - SidebarEntry* _tmp2_; - SidebarEntry* _tmp3_; - SidebarEntry* _tmp4_; + SidebarEntry* _tmp1_; #line 56 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); #line 56 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); #line 57 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp0_ = entry; -#line 57 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp1_ = position; -#line 57 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - g_object_set_data_full (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA, (gpointer) ((gintptr) _tmp1_), NULL); -#line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + g_object_set_data_full (G_TYPE_CHECK_INSTANCE_CAST (entry, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA, (gpointer) ((gintptr) position), NULL); #line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp3_ = _tmp2_; + _tmp0_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp4_ = entry; + _tmp1_ = _tmp0_; #line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, _tmp4_, NULL); + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp1_, entry, NULL); #line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _g_object_unref0 (_tmp3_); -#line 1181 "LibraryBranch.c" + _g_object_unref0 (_tmp1_); +#line 1327 "LibraryBranch.c" } -static void library_branch_on_flagged_visibility_changed (LibraryBranch* self) { +static void +library_branch_on_flagged_visibility_changed (LibraryBranch* self) +{ LibraryFlaggedSidebarEntry* _tmp0_; #line 61 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); @@ -1189,11 +1337,13 @@ static void library_branch_on_flagged_visibility_changed (LibraryBranch* self) { _tmp0_ = self->priv->_flagged_entry; #line 62 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_FLAGGED); -#line 1193 "LibraryBranch.c" +#line 1341 "LibraryBranch.c" } -static void library_branch_on_last_imported_visibility_changed (LibraryBranch* self) { +static void +library_branch_on_last_imported_visibility_changed (LibraryBranch* self) +{ LibraryLastImportSidebarEntry* _tmp0_; #line 65 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); @@ -1201,11 +1351,13 @@ static void library_branch_on_last_imported_visibility_changed (LibraryBranch* s _tmp0_ = self->priv->_last_imported_entry; #line 66 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_LAST_IMPORTED); -#line 1205 "LibraryBranch.c" +#line 1355 "LibraryBranch.c" } -static void library_branch_on_import_queue_visibility_changed (LibraryBranch* self) { +static void +library_branch_on_import_queue_visibility_changed (LibraryBranch* self) +{ LibraryImportQueueSidebarEntry* _tmp0_; #line 69 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); @@ -1213,11 +1365,13 @@ static void library_branch_on_import_queue_visibility_changed (LibraryBranch* se _tmp0_ = self->priv->_import_queue_entry; #line 70 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_IMPORT_QUEUE); -#line 1217 "LibraryBranch.c" +#line 1369 "LibraryBranch.c" } -static void library_branch_on_offline_visibility_changed (LibraryBranch* self) { +static void +library_branch_on_offline_visibility_changed (LibraryBranch* self) +{ LibraryOfflineSidebarEntry* _tmp0_; #line 73 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); @@ -1225,94 +1379,70 @@ static void library_branch_on_offline_visibility_changed (LibraryBranch* self) { _tmp0_ = self->priv->_offline_entry; #line 74 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_OFFLINE); -#line 1229 "LibraryBranch.c" +#line 1383 "LibraryBranch.c" } -static void library_branch_update_entry_visibility (LibraryBranch* self, LibraryHideablePageEntry* entry, gint position) { - LibraryHideablePageEntry* _tmp0_; +static void +library_branch_update_entry_visibility (LibraryBranch* self, + LibraryHideablePageEntry* entry, + gint position) +{ + gboolean _tmp0_; gboolean _tmp1_; - gboolean _tmp2_; #line 77 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); #line 77 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" g_return_if_fail (LIBRARY_IS_HIDEABLE_PAGE_ENTRY (entry)); #line 78 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp0_ = entry; -#line 78 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp1_ = library_hideable_page_entry_get_visible (_tmp0_); + _tmp0_ = library_hideable_page_entry_get_visible (entry); #line 78 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 78 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - if (_tmp2_) { -#line 1249 "LibraryBranch.c" - LibraryHideablePageEntry* _tmp3_; - gboolean _tmp4_; -#line 79 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp3_ = entry; -#line 79 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp4_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); + if (_tmp1_) { #line 79 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - if (!_tmp4_) { -#line 1258 "LibraryBranch.c" - LibraryHideablePageEntry* _tmp5_; - gint _tmp6_; -#line 80 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp5_ = entry; -#line 80 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp6_ = position; + if (!sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry))) { #line 80 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp6_); -#line 1267 "LibraryBranch.c" + library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), position); +#line 1408 "LibraryBranch.c" } } else { - LibraryHideablePageEntry* _tmp7_; - gboolean _tmp8_; #line 81 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp7_ = entry; -#line 81 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp8_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 81 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - if (_tmp8_) { -#line 1278 "LibraryBranch.c" - LibraryHideablePageEntry* _tmp9_; -#line 82 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp9_ = entry; + if (sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry))) { #line 82 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 1284 "LibraryBranch.c" + sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry)); +#line 1415 "LibraryBranch.c" } } } -static gint library_branch_comparator (SidebarEntry* a, SidebarEntry* b) { +static gint +library_branch_comparator (SidebarEntry* a, + SidebarEntry* b) +{ gint result = 0; - SidebarEntry* _tmp0_; + gconstpointer _tmp0_; gconstpointer _tmp1_; - SidebarEntry* _tmp2_; - gconstpointer _tmp3_; #line 86 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 86 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0); #line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp0_ = a; -#line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp1_ = g_object_get_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA); + _tmp0_ = g_object_get_data (G_TYPE_CHECK_INSTANCE_CAST (a, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA); #line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp2_ = b; + _tmp1_ = g_object_get_data (G_TYPE_CHECK_INSTANCE_CAST (b, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA); #line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp3_ = g_object_get_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA); -#line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - result = ((gint) ((gintptr) _tmp1_)) - ((gint) ((gintptr) _tmp3_)); + result = ((gint) ((gintptr) _tmp0_)) - ((gint) ((gintptr) _tmp1_)); #line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return result; -#line 1312 "LibraryBranch.c" +#line 1440 "LibraryBranch.c" } -LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self) { +LibraryPhotosEntry* +library_branch_get_photos_entry (LibraryBranch* self) +{ LibraryPhotosEntry* result; LibraryPhotosEntry* _tmp0_; #line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" @@ -1323,41 +1453,45 @@ LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self) { result = _tmp0_; #line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return result; -#line 1327 "LibraryBranch.c" +#line 1457 "LibraryBranch.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return self ? g_object_ref (self) : NULL; -#line 1334 "LibraryBranch.c" +#line 1466 "LibraryBranch.c" } -static void library_branch_set_photos_entry (LibraryBranch* self, LibraryPhotosEntry* value) { +static void +library_branch_set_photos_entry (LibraryBranch* self, + LibraryPhotosEntry* value) +{ #line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); #line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" if (library_branch_get_photos_entry (self) != value) { -#line 1343 "LibraryBranch.c" +#line 1478 "LibraryBranch.c" LibraryPhotosEntry* _tmp0_; - LibraryPhotosEntry* _tmp1_; #line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp0_ = value; -#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (value); #line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" _g_object_unref0 (self->priv->_photos_entry); #line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - self->priv->_photos_entry = _tmp1_; + self->priv->_photos_entry = _tmp0_; #line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - g_object_notify ((GObject *) self, "photos-entry"); -#line 1356 "LibraryBranch.c" + g_object_notify_by_pspec ((GObject *) self, library_branch_properties[LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY]); +#line 1488 "LibraryBranch.c" } } -LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* self) { +LibraryFlaggedSidebarEntry* +library_branch_get_flagged_entry (LibraryBranch* self) +{ LibraryFlaggedSidebarEntry* result; LibraryFlaggedSidebarEntry* _tmp0_; #line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" @@ -1368,34 +1502,36 @@ LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* sel result = _tmp0_; #line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return result; -#line 1372 "LibraryBranch.c" +#line 1506 "LibraryBranch.c" } -static void library_branch_set_flagged_entry (LibraryBranch* self, LibraryFlaggedSidebarEntry* value) { +static void +library_branch_set_flagged_entry (LibraryBranch* self, + LibraryFlaggedSidebarEntry* value) +{ #line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); #line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" if (library_branch_get_flagged_entry (self) != value) { -#line 1381 "LibraryBranch.c" +#line 1518 "LibraryBranch.c" LibraryFlaggedSidebarEntry* _tmp0_; - LibraryFlaggedSidebarEntry* _tmp1_; -#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp0_ = value; #line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (value); #line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" _g_object_unref0 (self->priv->_flagged_entry); #line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - self->priv->_flagged_entry = _tmp1_; + self->priv->_flagged_entry = _tmp0_; #line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - g_object_notify ((GObject *) self, "flagged-entry"); -#line 1394 "LibraryBranch.c" + g_object_notify_by_pspec ((GObject *) self, library_branch_properties[LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY]); +#line 1528 "LibraryBranch.c" } } -LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBranch* self) { +LibraryLastImportSidebarEntry* +library_branch_get_last_imported_entry (LibraryBranch* self) +{ LibraryLastImportSidebarEntry* result; LibraryLastImportSidebarEntry* _tmp0_; #line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" @@ -1406,34 +1542,36 @@ LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBr result = _tmp0_; #line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return result; -#line 1410 "LibraryBranch.c" +#line 1546 "LibraryBranch.c" } -static void library_branch_set_last_imported_entry (LibraryBranch* self, LibraryLastImportSidebarEntry* value) { +static void +library_branch_set_last_imported_entry (LibraryBranch* self, + LibraryLastImportSidebarEntry* value) +{ #line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); #line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" if (library_branch_get_last_imported_entry (self) != value) { -#line 1419 "LibraryBranch.c" +#line 1558 "LibraryBranch.c" LibraryLastImportSidebarEntry* _tmp0_; - LibraryLastImportSidebarEntry* _tmp1_; -#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp0_ = value; #line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (value); #line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" _g_object_unref0 (self->priv->_last_imported_entry); #line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - self->priv->_last_imported_entry = _tmp1_; + self->priv->_last_imported_entry = _tmp0_; #line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - g_object_notify ((GObject *) self, "last-imported-entry"); -#line 1432 "LibraryBranch.c" + g_object_notify_by_pspec ((GObject *) self, library_branch_properties[LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY]); +#line 1568 "LibraryBranch.c" } } -LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBranch* self) { +LibraryImportQueueSidebarEntry* +library_branch_get_import_queue_entry (LibraryBranch* self) +{ LibraryImportQueueSidebarEntry* result; LibraryImportQueueSidebarEntry* _tmp0_; #line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" @@ -1444,34 +1582,36 @@ LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBr result = _tmp0_; #line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return result; -#line 1448 "LibraryBranch.c" +#line 1586 "LibraryBranch.c" } -static void library_branch_set_import_queue_entry (LibraryBranch* self, LibraryImportQueueSidebarEntry* value) { +static void +library_branch_set_import_queue_entry (LibraryBranch* self, + LibraryImportQueueSidebarEntry* value) +{ #line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); #line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" if (library_branch_get_import_queue_entry (self) != value) { -#line 1457 "LibraryBranch.c" +#line 1598 "LibraryBranch.c" LibraryImportQueueSidebarEntry* _tmp0_; - LibraryImportQueueSidebarEntry* _tmp1_; -#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp0_ = value; #line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (value); #line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" _g_object_unref0 (self->priv->_import_queue_entry); #line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - self->priv->_import_queue_entry = _tmp1_; + self->priv->_import_queue_entry = _tmp0_; #line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - g_object_notify ((GObject *) self, "import-queue-entry"); -#line 1470 "LibraryBranch.c" + g_object_notify_by_pspec ((GObject *) self, library_branch_properties[LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY]); +#line 1608 "LibraryBranch.c" } } -LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* self) { +LibraryOfflineSidebarEntry* +library_branch_get_offline_entry (LibraryBranch* self) +{ LibraryOfflineSidebarEntry* result; LibraryOfflineSidebarEntry* _tmp0_; #line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" @@ -1482,34 +1622,36 @@ LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* sel result = _tmp0_; #line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return result; -#line 1486 "LibraryBranch.c" +#line 1626 "LibraryBranch.c" } -static void library_branch_set_offline_entry (LibraryBranch* self, LibraryOfflineSidebarEntry* value) { +static void +library_branch_set_offline_entry (LibraryBranch* self, + LibraryOfflineSidebarEntry* value) +{ #line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); #line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" if (library_branch_get_offline_entry (self) != value) { -#line 1495 "LibraryBranch.c" +#line 1638 "LibraryBranch.c" LibraryOfflineSidebarEntry* _tmp0_; - LibraryOfflineSidebarEntry* _tmp1_; #line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp0_ = value; -#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (value); #line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" _g_object_unref0 (self->priv->_offline_entry); #line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - self->priv->_offline_entry = _tmp1_; + self->priv->_offline_entry = _tmp0_; #line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - g_object_notify ((GObject *) self, "offline-entry"); -#line 1508 "LibraryBranch.c" + g_object_notify_by_pspec ((GObject *) self, library_branch_properties[LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY]); +#line 1648 "LibraryBranch.c" } } -LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self) { +LibraryTrashSidebarEntry* +library_branch_get_trash_entry (LibraryBranch* self) +{ LibraryTrashSidebarEntry* result; LibraryTrashSidebarEntry* _tmp0_; #line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" @@ -1520,34 +1662,36 @@ LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self) { result = _tmp0_; #line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return result; -#line 1524 "LibraryBranch.c" +#line 1666 "LibraryBranch.c" } -static void library_branch_set_trash_entry (LibraryBranch* self, LibraryTrashSidebarEntry* value) { +static void +library_branch_set_trash_entry (LibraryBranch* self, + LibraryTrashSidebarEntry* value) +{ #line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); #line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" if (library_branch_get_trash_entry (self) != value) { -#line 1533 "LibraryBranch.c" +#line 1678 "LibraryBranch.c" LibraryTrashSidebarEntry* _tmp0_; - LibraryTrashSidebarEntry* _tmp1_; -#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp0_ = value; #line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (value); #line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" _g_object_unref0 (self->priv->_trash_entry); #line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - self->priv->_trash_entry = _tmp1_; + self->priv->_trash_entry = _tmp0_; #line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - g_object_notify ((GObject *) self, "trash-entry"); -#line 1546 "LibraryBranch.c" + g_object_notify_by_pspec ((GObject *) self, library_branch_properties[LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY]); +#line 1688 "LibraryBranch.c" } } -static void library_branch_class_init (LibraryBranchClass * klass) { +static void +library_branch_class_init (LibraryBranchClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" library_branch_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" @@ -1559,29 +1703,33 @@ static void library_branch_class_init (LibraryBranchClass * klass) { #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" G_OBJECT_CLASS (klass)->finalize = library_branch_finalize; #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY, g_param_spec_object ("photos-entry", "photos-entry", "photos-entry", LIBRARY_TYPE_PHOTOS_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY, library_branch_properties[LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY] = g_param_spec_object ("photos-entry", "photos-entry", "photos-entry", LIBRARY_TYPE_PHOTOS_ENTRY, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY, g_param_spec_object ("flagged-entry", "flagged-entry", "flagged-entry", LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY, library_branch_properties[LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY] = g_param_spec_object ("flagged-entry", "flagged-entry", "flagged-entry", LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY, g_param_spec_object ("last-imported-entry", "last-imported-entry", "last-imported-entry", LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY, library_branch_properties[LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY] = g_param_spec_object ("last-imported-entry", "last-imported-entry", "last-imported-entry", LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY, g_param_spec_object ("import-queue-entry", "import-queue-entry", "import-queue-entry", LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY, library_branch_properties[LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY] = g_param_spec_object ("import-queue-entry", "import-queue-entry", "import-queue-entry", LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY, g_param_spec_object ("offline-entry", "offline-entry", "offline-entry", LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY, library_branch_properties[LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY] = g_param_spec_object ("offline-entry", "offline-entry", "offline-entry", LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY, g_param_spec_object ("trash-entry", "trash-entry", "trash-entry", LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1574 "LibraryBranch.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY, library_branch_properties[LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY] = g_param_spec_object ("trash-entry", "trash-entry", "trash-entry", LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 1718 "LibraryBranch.c" } -static void library_branch_instance_init (LibraryBranch * self) { +static void +library_branch_instance_init (LibraryBranch * self) +{ #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" self->priv = LIBRARY_BRANCH_GET_PRIVATE (self); -#line 1581 "LibraryBranch.c" +#line 1727 "LibraryBranch.c" } -static void library_branch_finalize (GObject * obj) { +static void +library_branch_finalize (GObject * obj) +{ LibraryBranch * self; #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_BRANCH, LibraryBranch); @@ -1599,11 +1747,13 @@ static void library_branch_finalize (GObject * obj) { _g_object_unref0 (self->priv->_trash_entry); #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" G_OBJECT_CLASS (library_branch_parent_class)->finalize (obj); -#line 1603 "LibraryBranch.c" +#line 1751 "LibraryBranch.c" } -GType library_branch_get_type (void) { +GType +library_branch_get_type (void) +{ static volatile gsize library_branch_type_id__volatile = 0; if (g_once_init_enter (&library_branch_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryBranch), 0, (GInstanceInitFunc) library_branch_instance_init, NULL }; @@ -1615,7 +1765,12 @@ GType library_branch_get_type (void) { } -static void _vala_library_branch_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_library_branch_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ LibraryBranch * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, LIBRARY_TYPE_BRANCH, LibraryBranch); #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" @@ -1656,18 +1811,23 @@ static void _vala_library_branch_get_property (GObject * object, guint property_ g_value_set_object (value, library_branch_get_trash_entry (self)); #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" break; -#line 1660 "LibraryBranch.c" +#line 1815 "LibraryBranch.c" default: #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" break; -#line 1666 "LibraryBranch.c" +#line 1821 "LibraryBranch.c" } } -static void _vala_library_branch_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { +static void +_vala_library_branch_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec) +{ LibraryBranch * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, LIBRARY_TYPE_BRANCH, LibraryBranch); #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" @@ -1708,35 +1868,41 @@ static void _vala_library_branch_set_property (GObject * object, guint property_ library_branch_set_trash_entry (self, g_value_get_object (value)); #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" break; -#line 1712 "LibraryBranch.c" +#line 1872 "LibraryBranch.c" default: #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" break; -#line 1718 "LibraryBranch.c" +#line 1878 "LibraryBranch.c" } } -LibraryPhotosEntry* library_photos_entry_construct (GType object_type) { +LibraryPhotosEntry* +library_photos_entry_construct (GType object_type) +{ LibraryPhotosEntry * self = NULL; #line 93 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" self = (LibraryPhotosEntry*) sidebar_simple_page_entry_construct (object_type); #line 93 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return self; -#line 1729 "LibraryBranch.c" +#line 1891 "LibraryBranch.c" } -LibraryPhotosEntry* library_photos_entry_new (void) { +LibraryPhotosEntry* +library_photos_entry_new (void) +{ #line 93 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return library_photos_entry_construct (LIBRARY_TYPE_PHOTOS_ENTRY); -#line 1736 "LibraryBranch.c" +#line 1900 "LibraryBranch.c" } -static gchar* library_photos_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +library_photos_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ LibraryPhotosEntry * self; gchar* result = NULL; gchar* _tmp0_; @@ -1748,11 +1914,13 @@ static gchar* library_photos_entry_real_get_sidebar_name (SidebarSimplePageEntry result = _tmp0_; #line 97 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return result; -#line 1752 "LibraryBranch.c" +#line 1918 "LibraryBranch.c" } -static gchar* library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { +static gchar* +library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) +{ LibraryPhotosEntry * self; gchar* result = NULL; gchar* _tmp0_; @@ -1764,11 +1932,13 @@ static gchar* library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry result = _tmp0_; #line 101 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return result; -#line 1768 "LibraryBranch.c" +#line 1936 "LibraryBranch.c" } -static Page* library_photos_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +library_photos_entry_real_create_page (SidebarSimplePageEntry* base) +{ LibraryPhotosEntry * self; Page* result = NULL; LibraryMainPage* _tmp0_; @@ -1782,11 +1952,13 @@ static Page* library_photos_entry_real_create_page (SidebarSimplePageEntry* base result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page); #line 105 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return result; -#line 1786 "LibraryBranch.c" +#line 1956 "LibraryBranch.c" } -static void library_photos_entry_class_init (LibraryPhotosEntryClass * klass) { +static void +library_photos_entry_class_init (LibraryPhotosEntryClass * klass) +{ #line 91 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" library_photos_entry_parent_class = g_type_class_peek_parent (klass); #line 91 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" @@ -1795,15 +1967,19 @@ static void library_photos_entry_class_init (LibraryPhotosEntryClass * klass) { ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_get_sidebar_icon; #line 91 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_create_page; -#line 1799 "LibraryBranch.c" +#line 1971 "LibraryBranch.c" } -static void library_photos_entry_instance_init (LibraryPhotosEntry * self) { +static void +library_photos_entry_instance_init (LibraryPhotosEntry * self) +{ } -GType library_photos_entry_get_type (void) { +GType +library_photos_entry_get_type (void) +{ static volatile gsize library_photos_entry_type_id__volatile = 0; if (g_once_init_enter (&library_photos_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryPhotosEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_photos_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryPhotosEntry), 0, (GInstanceInitFunc) library_photos_entry_instance_init, NULL }; @@ -1815,17 +1991,21 @@ GType library_photos_entry_get_type (void) { } -LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type) { +LibraryHideablePageEntry* +library_hideable_page_entry_construct (GType object_type) +{ LibraryHideablePageEntry * self = NULL; #line 125 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" self = (LibraryHideablePageEntry*) sidebar_simple_page_entry_construct (object_type); #line 125 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return self; -#line 1825 "LibraryBranch.c" +#line 2003 "LibraryBranch.c" } -gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self) { +gboolean +library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self) +{ gboolean result; gboolean _tmp0_; #line 115 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" @@ -1836,42 +2016,38 @@ gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self result = _tmp0_; #line 115 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return result; -#line 1840 "LibraryBranch.c" +#line 2020 "LibraryBranch.c" } -void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value) { +void +library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, + gboolean value) +{ gboolean _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_; - gboolean _tmp3_; #line 116 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" g_return_if_fail (LIBRARY_IS_HIDEABLE_PAGE_ENTRY (self)); #line 117 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp0_ = value; -#line 117 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp1_ = self->priv->show_entry; + _tmp0_ = self->priv->show_entry; #line 117 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - if (_tmp0_ == _tmp1_) { + if (value == _tmp0_) { #line 118 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return; -#line 1859 "LibraryBranch.c" +#line 2037 "LibraryBranch.c" } #line 120 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp2_ = value; -#line 120 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - self->priv->show_entry = _tmp2_; -#line 121 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp3_ = value; + self->priv->show_entry = value; #line 121 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - g_signal_emit (self, library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL], 0, _tmp3_); + g_signal_emit (self, library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL], 0, value); #line 116 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - g_object_notify ((GObject *) self, "visible"); -#line 1871 "LibraryBranch.c" + g_object_notify_by_pspec ((GObject *) self, library_hideable_page_entry_properties[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY]); +#line 2045 "LibraryBranch.c" } -static void library_hideable_page_entry_class_init (LibraryHideablePageEntryClass * klass) { +static void +library_hideable_page_entry_class_init (LibraryHideablePageEntryClass * klass) +{ #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" library_hideable_page_entry_parent_class = g_type_class_peek_parent (klass); #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" @@ -1883,33 +2059,39 @@ static void library_hideable_page_entry_class_init (LibraryHideablePageEntryClas #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" G_OBJECT_CLASS (klass)->finalize = library_hideable_page_entry_finalize; #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY, g_param_spec_boolean ("visible", "visible", "visible", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY, library_hideable_page_entry_properties[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY] = g_param_spec_boolean ("visible", "visible", "visible", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE)); #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL] = g_signal_new ("visibility-changed", LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); -#line 1890 "LibraryBranch.c" +#line 2066 "LibraryBranch.c" } -static void library_hideable_page_entry_instance_init (LibraryHideablePageEntry * self) { +static void +library_hideable_page_entry_instance_init (LibraryHideablePageEntry * self) +{ #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" self->priv = LIBRARY_HIDEABLE_PAGE_ENTRY_GET_PRIVATE (self); #line 113 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" self->priv->show_entry = FALSE; -#line 1899 "LibraryBranch.c" +#line 2077 "LibraryBranch.c" } -static void library_hideable_page_entry_finalize (GObject * obj) { +static void +library_hideable_page_entry_finalize (GObject * obj) +{ LibraryHideablePageEntry * self; #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry); #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" G_OBJECT_CLASS (library_hideable_page_entry_parent_class)->finalize (obj); -#line 1909 "LibraryBranch.c" +#line 2089 "LibraryBranch.c" } -GType library_hideable_page_entry_get_type (void) { +GType +library_hideable_page_entry_get_type (void) +{ static volatile gsize library_hideable_page_entry_type_id__volatile = 0; if (g_once_init_enter (&library_hideable_page_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryHideablePageEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_hideable_page_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryHideablePageEntry), 0, (GInstanceInitFunc) library_hideable_page_entry_instance_init, NULL }; @@ -1921,7 +2103,12 @@ GType library_hideable_page_entry_get_type (void) { } -static void _vala_library_hideable_page_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_library_hideable_page_entry_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ LibraryHideablePageEntry * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry); #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" @@ -1932,18 +2119,23 @@ static void _vala_library_hideable_page_entry_get_property (GObject * object, gu g_value_set_boolean (value, library_hideable_page_entry_get_visible (self)); #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" break; -#line 1936 "LibraryBranch.c" +#line 2123 "LibraryBranch.c" default: #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" break; -#line 1942 "LibraryBranch.c" +#line 2129 "LibraryBranch.c" } } -static void _vala_library_hideable_page_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { +static void +_vala_library_hideable_page_entry_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec) +{ LibraryHideablePageEntry * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry); #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" @@ -1954,22 +2146,26 @@ static void _vala_library_hideable_page_entry_set_property (GObject * object, gu library_hideable_page_entry_set_visible (self, g_value_get_boolean (value)); #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" break; -#line 1958 "LibraryBranch.c" +#line 2150 "LibraryBranch.c" default: #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" break; -#line 1964 "LibraryBranch.c" +#line 2156 "LibraryBranch.c" } } -LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor monitor, void* monitor_target) { +LibraryMainPage* +library_main_page_construct (GType object_type, + ProgressMonitor monitor, + void* monitor_target) +{ LibraryMainPage * self = NULL; #line 133 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" self = (LibraryMainPage*) collection_page_construct (object_type, LIBRARY_MAIN_PAGE_NAME); -#line 1973 "LibraryBranch.c" +#line 2169 "LibraryBranch.c" { GeeIterator* _sources_it = NULL; MediaCollectionRegistry* _tmp0_; @@ -1998,83 +2194,81 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor _sources_it = _tmp5_; #line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" while (TRUE) { -#line 2002 "LibraryBranch.c" +#line 2198 "LibraryBranch.c" GeeIterator* _tmp6_; - gboolean _tmp7_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + ViewCollection* _tmp9_; ViewCollection* _tmp10_; - ViewCollection* _tmp11_; - MediaSourceCollection* _tmp12_; + MediaSourceCollection* _tmp11_; + CollectionViewManager* _tmp12_; CollectionViewManager* _tmp13_; - CollectionViewManager* _tmp14_; - ProgressMonitor _tmp15_; - void* _tmp15__target; - ViewCollectionMonitor* _tmp16_; - ViewCollectionMonitor* _tmp17_; + ViewCollectionMonitor* _tmp14_; + ViewCollectionMonitor* _tmp15_; #line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" _tmp6_ = _sources_it; #line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" break; -#line 2025 "LibraryBranch.c" +#line 2216 "LibraryBranch.c" } #line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp8_ = _sources_it; + _tmp7_ = _sources_it; #line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - sources = (MediaSourceCollection*) _tmp9_; + sources = (MediaSourceCollection*) _tmp8_; #line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp12_ = sources; + _tmp11_ = sources; #line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp13_ = collection_view_manager_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage)); + _tmp12_ = collection_view_manager_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage)); #line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp15_ = monitor; + _tmp14_ = view_collection_monitor_source_collection (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, monitor, monitor_target); #line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp15__target = monitor_target; + _tmp15_ = _tmp14_; #line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp16_ = view_collection_monitor_source_collection (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, _tmp15_, _tmp15__target); + _view_collection_monitor_unref0 (_tmp15_); #line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp17_ = _tmp16_; + _view_manager_unref0 (_tmp13_); #line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _view_collection_monitor_unref0 (_tmp17_); -#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _view_manager_unref0 (_tmp14_); -#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _data_collection_unref0 (_tmp11_); + _data_collection_unref0 (_tmp10_); #line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" _data_collection_unref0 (sources); -#line 2059 "LibraryBranch.c" +#line 2246 "LibraryBranch.c" } #line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" _g_object_unref0 (_sources_it); -#line 2063 "LibraryBranch.c" +#line 2250 "LibraryBranch.c" } #line 132 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return self; -#line 2067 "LibraryBranch.c" +#line 2254 "LibraryBranch.c" } -LibraryMainPage* library_main_page_new (ProgressMonitor monitor, void* monitor_target) { +LibraryMainPage* +library_main_page_new (ProgressMonitor monitor, + void* monitor_target) +{ #line 132 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" return library_main_page_construct (LIBRARY_TYPE_MAIN_PAGE, monitor, monitor_target); -#line 2074 "LibraryBranch.c" +#line 2264 "LibraryBranch.c" } -static void library_main_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) { +static void +library_main_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by) +{ LibraryMainPage * self; gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; @@ -2100,23 +2294,25 @@ static void library_main_page_real_get_config_photos_sort (MediaPage* base, gboo if (sort_order) { #line 139 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" *sort_order = _vala_sort_order; -#line 2104 "LibraryBranch.c" +#line 2298 "LibraryBranch.c" } #line 139 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" if (sort_by) { #line 139 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" *sort_by = _vala_sort_by; -#line 2110 "LibraryBranch.c" +#line 2304 "LibraryBranch.c" } } -static void library_main_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { +static void +library_main_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by) +{ LibraryMainPage * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - gboolean _tmp2_; - gint _tmp3_; #line 143 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_MAIN_PAGE, LibraryMainPage); #line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" @@ -2124,33 +2320,35 @@ static void library_main_page_real_set_config_photos_sort (MediaPage* base, gboo #line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" _tmp1_ = _tmp0_; #line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp2_ = sort_order; -#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - _tmp3_ = sort_by; -#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" - configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); + configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), sort_order, sort_by); #line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" _g_object_unref0 (_tmp1_); -#line 2135 "LibraryBranch.c" +#line 2327 "LibraryBranch.c" } -static void library_main_page_class_init (LibraryMainPageClass * klass) { +static void +library_main_page_class_init (LibraryMainPageClass * klass) +{ #line 129 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" library_main_page_parent_class = g_type_class_peek_parent (klass); #line 129 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" ((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) library_main_page_real_get_config_photos_sort; #line 129 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala" ((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) library_main_page_real_set_config_photos_sort; -#line 2146 "LibraryBranch.c" +#line 2340 "LibraryBranch.c" } -static void library_main_page_instance_init (LibraryMainPage * self) { +static void +library_main_page_instance_init (LibraryMainPage * self) +{ } -GType library_main_page_get_type (void) { +GType +library_main_page_get_type (void) +{ static volatile gsize library_main_page_type_id__volatile = 0; if (g_once_init_enter (&library_main_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryMainPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_main_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryMainPage), 0, (GInstanceInitFunc) library_main_page_instance_init, NULL }; diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c index bb92872..906dbab 100644 --- a/src/library/LibraryWindow.c +++ b/src/library/LibraryWindow.c @@ -1,4 +1,4 @@ -/* LibraryWindow.c generated by valac 0.36.6, the Vala compiler +/* LibraryWindow.c generated by valac 0.40.4, the Vala compiler * generated from LibraryWindow.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -247,6 +248,11 @@ typedef struct _BasicPropertiesClass BasicPropertiesClass; typedef struct _ExtendedPropertiesWindow ExtendedPropertiesWindow; typedef struct _ExtendedPropertiesWindowClass ExtendedPropertiesWindowClass; +enum { + LIBRARY_WINDOW_0_PROPERTY, + LIBRARY_WINDOW_NUM_PROPERTIES +}; +static GParamSpec* library_window_properties[LIBRARY_WINDOW_NUM_PROPERTIES]; #define SIDEBAR_TYPE_SELECTABLE_ENTRY (sidebar_selectable_entry_get_type ()) #define SIDEBAR_SELECTABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY, SidebarSelectableEntry)) @@ -920,6 +926,11 @@ typedef struct _LibraryPhotoPagePrivate LibraryPhotoPagePrivate; #define TYPE_RAW_DEVELOPER (raw_developer_get_type ()) typedef struct _LibraryWindowFullscreenPhotoPagePrivate LibraryWindowFullscreenPhotoPagePrivate; +enum { + LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_0_PROPERTY, + LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_NUM_PROPERTIES +}; +static GParamSpec* library_window_fullscreen_photo_page_properties[LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_NUM_PROPERTIES]; #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; } @@ -1224,9 +1235,15 @@ void dimensions_free (Dimensions* self); GType library_window_get_type (void) G_GNUC_CONST; gpointer one_shot_scheduler_ref (gpointer instance); void one_shot_scheduler_unref (gpointer instance); -GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_one_shot_scheduler (GValue* value, gpointer v_object); -void value_take_one_shot_scheduler (GValue* value, gpointer v_object); +GParamSpec* param_spec_one_shot_scheduler (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_one_shot_scheduler (GValue* value, + gpointer v_object); +void value_take_one_shot_scheduler (GValue* value, + gpointer v_object); gpointer value_get_one_shot_scheduler (const GValue* value); GType one_shot_scheduler_get_type (void) G_GNUC_CONST; GType sidebar_tree_get_type (void) G_GNUC_CONST; @@ -1243,9 +1260,15 @@ GType editing_host_page_get_type (void) G_GNUC_CONST; GType library_photo_page_get_type (void) G_GNUC_CONST; gpointer search_filter_actions_ref (gpointer instance); void search_filter_actions_unref (gpointer instance); -GParamSpec* param_spec_search_filter_actions (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_search_filter_actions (GValue* value, gpointer v_object); -void value_take_search_filter_actions (GValue* value, gpointer v_object); +GParamSpec* param_spec_search_filter_actions (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_search_filter_actions (GValue* value, + gpointer v_object); +void value_take_search_filter_actions (GValue* value, + gpointer v_object); gpointer value_get_search_filter_actions (const GValue* value); GType search_filter_actions_get_type (void) G_GNUC_CONST; GType search_filter_toolbar_get_type (void) G_GNUC_CONST; @@ -1253,30 +1276,52 @@ GType properties_get_type (void) G_GNUC_CONST; GType basic_properties_get_type (void) G_GNUC_CONST; GType extended_properties_window_get_type (void) G_GNUC_CONST; #define LIBRARY_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LIBRARY_WINDOW, LibraryWindowPrivate)) -enum { - LIBRARY_WINDOW_DUMMY_PROPERTY -}; GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST; GType sidebar_page_representative_get_type (void) G_GNUC_CONST; -static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepresentative* entry, Page* page); -static void _library_window_on_page_created_sidebar_tree_page_created (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self); -static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageRepresentative* entry, Page* page); -static void _library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self); -static void library_window_on_sidebar_entry_selected (LibraryWindow* self, SidebarSelectableEntry* selectable); -static void _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTree* _sender, SidebarSelectableEntry* selectable, gpointer self); -static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* self, SidebarSelectableEntry* selectable); -static void _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed (SidebarTree* _sender, SidebarSelectableEntry* removed, gpointer self); -static void library_window_unsubscribe_from_basic_information (LibraryWindow* self, Page* page); +static void library_window_on_page_created (LibraryWindow* self, + SidebarPageRepresentative* entry, + Page* page); +static void _library_window_on_page_created_sidebar_tree_page_created (SidebarTree* _sender, + SidebarPageRepresentative* entry, + Page* page, + gpointer self); +static void library_window_on_destroying_page (LibraryWindow* self, + SidebarPageRepresentative* entry, + Page* page); +static void _library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _sender, + SidebarPageRepresentative* entry, + Page* page, + gpointer self); +static void library_window_on_sidebar_entry_selected (LibraryWindow* self, + SidebarSelectableEntry* selectable); +static void _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTree* _sender, + SidebarSelectableEntry* selectable, + gpointer self); +static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* self, + SidebarSelectableEntry* selectable); +static void _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed (SidebarTree* _sender, + SidebarSelectableEntry* removed, + gpointer self); +static void library_window_unsubscribe_from_basic_information (LibraryWindow* self, + Page* page); Page* page_window_get_current_page (PageWindow* self); static void library_window_hide_extended_properties (LibraryWindow* self); -static void _library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender, gpointer self); +static void _library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender, + gpointer self); static void library_window_show_extended_properties (LibraryWindow* self); -static void _library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender, gpointer self); +static void _library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender, + gpointer self); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -1284,9 +1329,15 @@ GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); @@ -1296,52 +1347,95 @@ GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; -static void _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self); +static void _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self); static void library_window_on_media_altered (LibraryWindow* self); gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; -static void _library_window_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void _library_window_on_media_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); GType metadata_writer_get_type (void) G_GNUC_CONST; MetadataWriter* metadata_writer_get_instance (void); -static void library_window_on_metadata_writer_progress (LibraryWindow* self, guint completed, guint total); -static void _library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWriter* _sender, guint completed, guint total, gpointer self); +static void library_window_on_metadata_writer_progress (LibraryWindow* self, + guint completed, + guint total); +static void _library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWriter* _sender, + guint completed, + guint total, + gpointer self); GType directory_monitor_get_type (void) G_GNUC_CONST; GType library_monitor_get_type (void) G_GNUC_CONST; gpointer library_monitor_pool_ref (gpointer instance); void library_monitor_pool_unref (gpointer instance); -GParamSpec* param_spec_library_monitor_pool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_library_monitor_pool (GValue* value, gpointer v_object); -void value_take_library_monitor_pool (GValue* value, gpointer v_object); +GParamSpec* param_spec_library_monitor_pool (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_library_monitor_pool (GValue* value, + gpointer v_object); +void value_take_library_monitor_pool (GValue* value, + gpointer v_object); gpointer value_get_library_monitor_pool (const GValue* value); GType library_monitor_pool_get_type (void) G_GNUC_CONST; LibraryMonitorPool* library_monitor_pool_get_instance (void); LibraryMonitor* library_monitor_pool_get_monitor (LibraryMonitorPool* self); -static void library_window_on_library_monitor_destroyed (LibraryWindow* self, LibraryMonitor* monitor); -static void library_window_on_library_monitor_installed (LibraryWindow* self, LibraryMonitor* monitor); -static void _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self); -static void _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self); +static void library_window_on_library_monitor_destroyed (LibraryWindow* self, + LibraryMonitor* monitor); +static void library_window_on_library_monitor_installed (LibraryWindow* self, + LibraryMonitor* monitor); +static void _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, + LibraryMonitor* monitor, + gpointer self); +static void _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, + LibraryMonitor* monitor, + gpointer self); gpointer camera_table_ref (gpointer instance); void camera_table_unref (gpointer instance); -GParamSpec* param_spec_camera_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_camera_table (GValue* value, gpointer v_object); -void value_take_camera_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_camera_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_camera_table (GValue* value, + gpointer v_object); +void value_take_camera_table (GValue* value, + gpointer v_object); gpointer value_get_camera_table (const GValue* value); GType camera_table_get_type (void) G_GNUC_CONST; CameraTable* camera_table_get_instance (void); gpointer discovered_camera_ref (gpointer instance); void discovered_camera_unref (gpointer instance); -GParamSpec* param_spec_discovered_camera (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_discovered_camera (GValue* value, gpointer v_object); -void value_take_discovered_camera (GValue* value, gpointer v_object); +GParamSpec* param_spec_discovered_camera (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_discovered_camera (GValue* value, + gpointer v_object); +void value_take_discovered_camera (GValue* value, + gpointer v_object); gpointer value_get_discovered_camera (const GValue* value); GType discovered_camera_get_type (void) G_GNUC_CONST; -static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamera* camera); -static void _library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self); +static void library_window_on_camera_added (LibraryWindow* self, + DiscoveredCamera* camera); +static void _library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender, + DiscoveredCamera* camera, + gpointer self); static GType library_window_sidebar_root_position_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; GType library_window_target_type_get_type (void) G_GNUC_CONST; LibraryBranch* library_branch_new (void); @@ -1372,73 +1466,168 @@ BasicProperties* basic_properties_construct (GType object_type); #define LIBRARY_WINDOW_TAG_PATH_MIME_TYPE "shotwell/tag-path" #define LIBRARY_WINDOW_MEDIA_LIST_MIME_TYPE "shotwell/media-id-atom" static void library_window_on_file_import (LibraryWindow* self); -static void _library_window_on_file_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_window_on_file_import_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_window_on_external_library_import (LibraryWindow* self); -static void _library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_window_on_preferences (LibraryWindow* self); -static void _library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_window_on_empty_trash (LibraryWindow* self); -static void _library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_window_on_jump_to_event (LibraryWindow* self); -static void _library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_window_on_find (LibraryWindow* self); -static void _library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void library_window_on_new_search (LibraryWindow* self); -static void _library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void library_window_on_action_toggle (LibraryWindow* self, GAction* action, GVariant* value); -static void _library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void library_window_on_display_basic_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value); -static void _library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); -static void library_window_on_display_extended_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value); -static void _library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); -static void library_window_on_display_searchbar (LibraryWindow* self, GSimpleAction* action, GVariant* value); -static void _library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); -static void library_window_on_display_sidebar (LibraryWindow* self, GSimpleAction* action, GVariant* variant); -static void _library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); -static void library_window_on_display_toolbar (LibraryWindow* self, GSimpleAction* action, GVariant* variant); -static void _library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); -static void library_window_on_action_radio (LibraryWindow* self, GAction* action, GVariant* value); -static void _library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleAction* action, GVariant* value); -static void _library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); -LibraryWindow* library_window_new (ProgressMonitor progress_monitor, void* progress_monitor_target); -LibraryWindow* library_window_construct (GType object_type, ProgressMonitor progress_monitor, void* progress_monitor_target); +static void _library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void library_window_on_action_toggle (LibraryWindow* self, + GAction* action, + GVariant* value); +static void _library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void library_window_on_display_basic_properties (LibraryWindow* self, + GSimpleAction* action, + GVariant* value); +static void _library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); +static void library_window_on_display_extended_properties (LibraryWindow* self, + GSimpleAction* action, + GVariant* value); +static void _library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); +static void library_window_on_display_searchbar (LibraryWindow* self, + GSimpleAction* action, + GVariant* value); +static void _library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); +static void library_window_on_display_sidebar (LibraryWindow* self, + GSimpleAction* action, + GVariant* variant); +static void _library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); +static void library_window_on_display_toolbar (LibraryWindow* self, + GSimpleAction* action, + GVariant* variant); +static void _library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); +static void library_window_on_action_radio (LibraryWindow* self, + GAction* action, + GVariant* value); +static void _library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void library_window_on_events_sort_changed (LibraryWindow* self, + GSimpleAction* action, + GVariant* value); +static void _library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); +LibraryWindow* library_window_new (ProgressMonitor progress_monitor, + void* progress_monitor_target); +LibraryWindow* library_window_construct (GType object_type, + ProgressMonitor progress_monitor, + void* progress_monitor_target); AppWindow* app_window_construct (GType object_type); -static void library_window_external_drop_handler (LibraryWindow* self, GdkDragContext* context, SidebarEntry* entry, GtkSelectionData* data, guint info, guint time); -static void _library_window_external_drop_handler_sidebar_tree_external_drop_handler (GdkDragContext* context, SidebarEntry* entry, GtkSelectionData* data, guint info, guint time, gpointer self); -SidebarTree* sidebar_tree_new (GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target); -SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target); -void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position); +static void library_window_external_drop_handler (LibraryWindow* self, + GdkDragContext* context, + SidebarEntry* entry, + GtkSelectionData* data, + guint info, + guint time); +static void _library_window_external_drop_handler_sidebar_tree_external_drop_handler (GdkDragContext* context, + SidebarEntry* entry, + GtkSelectionData* data, + guint info, + guint time, + gpointer self); +SidebarTree* sidebar_tree_new (GtkTargetEntry* target_entries, + int target_entries_length1, + GdkDragAction actions, + SidebarTreeExternalDropHandler drop_handler, + void* drop_handler_target); +SidebarTree* sidebar_tree_construct (GType object_type, + GtkTargetEntry* target_entries, + int target_entries_length1, + GdkDragAction actions, + SidebarTreeExternalDropHandler drop_handler, + void* drop_handler_target); +void sidebar_tree_graft (SidebarTree* self, + SidebarBranch* branch, + gint position); ExtendedPropertiesWindow* extended_properties_window_new (GtkWindow* owner); -ExtendedPropertiesWindow* extended_properties_window_construct (GType object_type, GtkWindow* owner); +ExtendedPropertiesWindow* extended_properties_window_construct (GType object_type, + GtkWindow* owner); static void library_window_on_update_properties_now (LibraryWindow* self); static void _library_window_on_update_properties_now_one_shot_callback (gpointer self); -OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target); -OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target); +OneShotScheduler* one_shot_scheduler_new (const gchar* name, + OneShotCallback callback, + void* callback_target); +OneShotScheduler* one_shot_scheduler_construct (GType object_type, + const gchar* name, + OneShotCallback callback, + void* callback_target); SearchFilterToolbar* search_filter_toolbar_new (SearchFilterActions* actions); -SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchFilterActions* actions); -static void library_window_create_layout (LibraryWindow* self, Page* start_page); +SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, + SearchFilterActions* actions); +static void library_window_create_layout (LibraryWindow* self, + Page* start_page); GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST; GType library_photos_entry_get_type (void) G_GNUC_CONST; LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self); Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self); static void library_window_load_configuration (LibraryWindow* self); -void application_set_accels_for_action (const gchar* action, gchar** accel, int accel_length1); +void application_set_accels_for_action (const gchar* action, + gchar** accel, + int accel_length1); GFile* directory_monitor_get_root (DirectoryMonitor* self); static void library_window_on_library_monitor_discovery_started (LibraryWindow* self); -static void _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender, gpointer self); +static void _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender, + gpointer self); static void library_window_on_library_monitor_discovery_completed (LibraryWindow* self); -static void _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self); -static void _library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender, gpointer self); -static void library_window_on_library_monitor_auto_update_progress (LibraryWindow* self, gint completed_files, gint total_files); -static void _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress (LibraryMonitor* _sender, gint completed_files, gint total_files, gpointer self); +static void _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, + gpointer self); +static void _library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender, + gpointer self); +static void library_window_on_library_monitor_auto_update_progress (LibraryWindow* self, + gint completed_files, + gint total_files); +static void _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress (LibraryMonitor* _sender, + gint completed_files, + gint total_files, + gpointer self); static void library_window_on_library_monitor_auto_import_preparing (LibraryWindow* self); -static void _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender, gpointer self); -static void library_window_on_library_monitor_auto_import_progress (LibraryWindow* self, guint64 completed_bytes, guint64 total_bytes); -static void _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress (LibraryMonitor* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self); +static void _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender, + gpointer self); +static void library_window_on_library_monitor_auto_import_progress (LibraryWindow* self, + guint64 completed_bytes, + guint64 total_bytes); +static void _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress (LibraryMonitor* _sender, + guint64 completed_bytes, + guint64 total_bytes, + gpointer self); static void library_window_real_add_actions (AppWindow* base); void app_window_add_actions (AppWindow* self); -GActionEntry* search_filter_actions_get_actions (SearchFilterActions* self, int* result_length1); +GActionEntry* search_filter_actions_get_actions (SearchFilterActions* self, + int* result_length1); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); @@ -1448,68 +1637,111 @@ static gboolean library_window_is_sidebar_visible (LibraryWindow* self); static GVariant* _variant_new2 (gboolean value); static gboolean library_window_is_toolbar_visible (LibraryWindow* self); static GVariant* _variant_new3 (gboolean value); -static void library_window_real_switched_pages (PageWindow* base, Page* old_page, Page* new_page); -void page_window_switched_pages (PageWindow* self, Page* old_page, Page* new_page); +static void library_window_real_switched_pages (PageWindow* base, + Page* old_page, + Page* new_page); +void page_window_switched_pages (PageWindow* self, + Page* old_page, + Page* new_page); GType view_collection_get_type (void) G_GNUC_CONST; ViewCollection* page_get_view (Page* self); gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; -static void library_window_on_view_filter_installed (LibraryWindow* self, ViewFilter* filter); -static void _library_window_on_view_filter_installed_view_collection_view_filter_installed (ViewCollection* _sender, ViewFilter* filer, gpointer self); -static void library_window_on_view_filter_removed (LibraryWindow* self, ViewFilter* filter); -static void _library_window_on_view_filter_removed_view_collection_view_filter_removed (ViewCollection* _sender, ViewFilter* filer, gpointer self); -void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Page* old_page, Page* new_page); +static void library_window_on_view_filter_installed (LibraryWindow* self, + ViewFilter* filter); +static void _library_window_on_view_filter_installed_view_collection_view_filter_installed (ViewCollection* _sender, + ViewFilter* filer, + gpointer self); +static void library_window_on_view_filter_removed (LibraryWindow* self, + ViewFilter* filter); +static void _library_window_on_view_filter_removed_view_collection_view_filter_removed (ViewCollection* _sender, + ViewFilter* filer, + gpointer self); +void search_filter_actions_monitor_page_contents (SearchFilterActions* self, + Page* old_page, + Page* new_page); static void library_window_on_view_filter_refreshed (LibraryWindow* self); -static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender, gpointer self); +static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender, + gpointer self); gboolean view_collection_are_items_filtered_out (ViewCollection* self); static GVariant* _variant_new4 (gboolean value); static void library_window_real_show_all (GtkWidget* base); -GAction* page_get_common_action (Page* self, const gchar* name, gboolean log_warning); +GAction* page_get_common_action (Page* self, + const gchar* name, + gboolean log_warning); GType checkerboard_page_get_type (void) G_GNUC_CONST; -static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPage* page); -static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show, CheckerboardPage* page); +static void library_window_init_view_filter (LibraryWindow* self, + CheckerboardPage* page); +static void library_window_toggle_search_bar (LibraryWindow* self, + gboolean show, + CheckerboardPage* page); static gboolean library_window_should_show_search_bar (LibraryWindow* self); -static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean visible); +static void library_window_set_sidebar_visible (LibraryWindow* self, + gboolean visible); LibraryWindow* library_window_get_app (void); gboolean library_window_is_mount_uri_supported (const gchar* uri); static gchar* library_window_real_get_app_role (AppWindow* base); #define RESOURCES_APP_LIBRARY_ROLE _ ("Photo Manager") GType tag_get_type (void) G_GNUC_CONST; -void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag); +void library_window_rename_tag_in_sidebar (LibraryWindow* self, + Tag* tag); GType tags_sidebar_entry_get_type (void) G_GNUC_CONST; -TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self, Tag* tag); -gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* entry); +TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self, + Tag* tag); +gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, + SidebarEntry* entry); GType event_source_get_type (void) G_GNUC_CONST; GType event_get_type (void) G_GNUC_CONST; -void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event); +void library_window_rename_event_in_sidebar (LibraryWindow* self, + Event* event); GType events_event_entry_get_type (void) G_GNUC_CONST; -EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, Event* event); +EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, + Event* event); GType saved_search_get_type (void) G_GNUC_CONST; -void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch* search); +void library_window_rename_search_in_sidebar (LibraryWindow* self, + SavedSearch* search); GType searches_sidebar_entry_get_type (void) G_GNUC_CONST; -SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self, SavedSearch* search); +SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self, + SavedSearch* search); static void library_window_real_on_quit (AppWindow* base); -void configuration_facade_set_library_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions); -void configuration_facade_set_sidebar_position (ConfigurationFacade* self, gint position); +void configuration_facade_set_library_window_state (ConfigurationFacade* self, + gboolean maximize, + Dimensions* dimensions); +void configuration_facade_set_sidebar_position (ConfigurationFacade* self, + gint position); void app_window_on_quit (AppWindow* self); GType media_page_get_type (void) G_GNUC_CONST; GType collection_page_get_type (void) G_GNUC_CONST; GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; -static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, CollectionPage* page); +static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, + CollectionPage* page); gint view_collection_get_selected_count (ViewCollection* self); -GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t); +GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, + GType t); GType library_photo_get_type (void) G_GNUC_CONST; -GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t); -static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* page, CollectionPage* * collection, Photo* * start, ViewCollection* * view_collection); +GeeList* view_collection_get_sources_of_type (ViewCollection* self, + GType t); +static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, + Page* page, + CollectionPage* * collection, + Photo* * start, + ViewCollection* * view_collection); GType events_directory_page_get_type (void) G_GNUC_CONST; gint data_collection_get_count (DataCollection* self); -DataObject* data_collection_get_at (DataCollection* self, gint index); +DataObject* data_collection_get_at (DataCollection* self, + gint index); GType data_view_get_type (void) G_GNUC_CONST; DataSource* data_view_get_source (DataView* self); GType event_page_get_type (void) G_GNUC_CONST; @@ -1518,36 +1750,68 @@ gboolean editing_host_page_has_photo (EditingHostPage* self); Photo* editing_host_page_get_photo (EditingHostPage* self); static void library_window_real_on_fullscreen (AppWindow* base); static GType library_window_fullscreen_photo_page_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_new (CollectionPage* collection, Photo* start, ViewCollection* view); -static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_construct (GType object_type, CollectionPage* collection, Photo* start, ViewCollection* view); -void app_window_go_fullscreen (AppWindow* self, Page* page); +static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_new (CollectionPage* collection, + Photo* start, + ViewCollection* view); +static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_construct (GType object_type, + CollectionPage* collection, + Photo* start, + ViewCollection* view); +void app_window_go_fullscreen (AppWindow* self, + Page* page); #define RESOURCES_CANCEL_LABEL _ ("_Cancel") #define RESOURCES_OK_LABEL _ ("_OK") gboolean app_dirs_is_in_import_dir (GFile* file); GtkResponseType copy_files_dialog (void); -static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* uris, const gchar* job_name, gboolean copy_to_library, gboolean recurse); +static void library_window_dispatch_import_jobs (LibraryWindow* self, + GSList* uris, + const gchar* job_name, + gboolean copy_to_library, + gboolean recurse); static void _g_free0_ (gpointer var); -static void _g_slist_free__g_free0_ (GSList* self); +static inline void _g_slist_free__g_free0_ (GSList* self); GType data_imports_ui_data_imports_dialog_get_type (void) G_GNUC_CONST; DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_create_instance (void); -static void library_window_real_update_common_action_availability (AppWindow* base, Page* old_page, Page* new_page); -void app_window_update_common_action_availability (AppWindow* self, Page* old_page, Page* new_page); -void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name, gboolean sensitive); -static void library_window_real_update_common_actions (AppWindow* base, Page* page, gint selected_count, gint count); +static void library_window_real_update_common_action_availability (AppWindow* base, + Page* old_page, + Page* new_page); +void app_window_update_common_action_availability (AppWindow* self, + Page* old_page, + Page* new_page); +void app_window_set_common_action_sensitive (AppWindow* self, + const gchar* name, + gboolean sensitive); +static void library_window_real_update_common_actions (AppWindow* base, + Page* page, + gint selected_count, + gint count); static gboolean library_window_can_empty_trash (LibraryWindow* self); -void app_window_set_common_action_visible (AppWindow* self, const gchar* name, gboolean visible); +void app_window_set_common_action_visible (AppWindow* self, + const gchar* name, + gboolean visible); static gboolean library_window_can_jump_to_event (LibraryWindow* self); -void app_window_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count); +void app_window_update_common_actions (AppWindow* self, + Page* page, + gint selected_count, + gint count); GType library_photo_source_collection_get_type (void) G_GNUC_CONST; gint media_source_collection_get_trashcan_count (MediaSourceCollection* self); GType video_source_collection_get_type (void) G_GNUC_CONST; GeeCollection* media_source_collection_get_trashcan_contents (MediaSourceCollection* self); -void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const gchar* progress_dialog_text); +void remove_from_app (GeeCollection* sources, + const gchar* dialog_title, + const gchar* progress_dialog_text); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* app_window_get_command_manager (void); @@ -1556,99 +1820,194 @@ SavedSearchDialog* saved_search_dialog_new (void); SavedSearchDialog* saved_search_dialog_construct (GType object_type); GType saved_search_dialog_get_type (void) G_GNUC_CONST; void saved_search_dialog_show (SavedSearchDialog* self); -DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index); +DataSource* view_collection_get_selected_source_at (ViewCollection* self, + gint index); Event* media_source_get_event (MediaSource* self); -void library_window_switch_to_event (LibraryWindow* self, Event* event); +void library_window_switch_to_event (LibraryWindow* self, + Event* event); static GVariant* _variant_new5 (gboolean value); void search_filter_toolbar_take_focus (SearchFilterToolbar* self); static void library_window_on_clear_search (LibraryWindow* self); void search_filter_actions_reset (SearchFilterActions* self); gint library_window_get_events_sort (LibraryWindow* self); -void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self, gboolean sort); +void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self, + gboolean sort); void preferences_dialog_show_preferences (void); -void properties_update_properties (Properties* self, Page* page); -void configuration_facade_set_display_basic_properties (ConfigurationFacade* self, gboolean display); +void properties_update_properties (Properties* self, + Page* page); +void configuration_facade_set_display_basic_properties (ConfigurationFacade* self, + gboolean display); static gboolean _variant_get6 (GVariant* value); static GVariant* _variant_new7 (gboolean value); -void extended_properties_window_update_properties (ExtendedPropertiesWindow* self, Page* page); -void configuration_facade_set_display_search_bar (ConfigurationFacade* self, gboolean display); -void library_window_show_search_bar (LibraryWindow* self, gboolean display); +void extended_properties_window_update_properties (ExtendedPropertiesWindow* self, + Page* page); +void configuration_facade_set_display_search_bar (ConfigurationFacade* self, + gboolean display); +void library_window_show_search_bar (LibraryWindow* self, + gboolean display); static GVariant* _variant_new8 (gboolean value); -void configuration_facade_set_display_sidebar (ConfigurationFacade* self, gboolean display); +void configuration_facade_set_display_sidebar (ConfigurationFacade* self, + gboolean display); gboolean configuration_facade_get_display_sidebar (ConfigurationFacade* self); -static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean visible); +static void library_window_set_toolbar_visible (LibraryWindow* self, + gboolean visible); GtkToolbar* page_get_toolbar (Page* self); -void configuration_facade_set_display_toolbar (ConfigurationFacade* self, gboolean display); +void configuration_facade_set_display_toolbar (ConfigurationFacade* self, + gboolean display); gboolean configuration_facade_get_display_toolbar (ConfigurationFacade* self); -static void library_window_sync_extended_properties (LibraryWindow* self, gboolean show); +static void library_window_sync_extended_properties (LibraryWindow* self, + gboolean show); static GVariant* _variant_new9 (gboolean value); -void configuration_facade_set_display_extended_properties (ConfigurationFacade* self, gboolean display); +void configuration_facade_set_display_extended_properties (ConfigurationFacade* self, + gboolean display); GType batch_import_get_type (void) G_GNUC_CONST; -void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batch_import, gboolean allow_user_cancel); +void library_window_enqueue_batch_import (LibraryWindow* self, + BatchImport* batch_import, + gboolean allow_user_cancel); GType library_hideable_page_entry_get_type (void) G_GNUC_CONST; GType library_import_queue_sidebar_entry_get_type (void) G_GNUC_CONST; LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBranch* self); -void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self, BatchImport* batch_import, gboolean allow_user_cancel); +void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self, + BatchImport* batch_import, + gboolean allow_user_cancel); gpointer import_manifest_ref (gpointer instance); void import_manifest_unref (gpointer instance); -GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_import_manifest (GValue* value, gpointer v_object); -void value_take_import_manifest (GValue* value, gpointer v_object); +GParamSpec* param_spec_import_manifest (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_import_manifest (GValue* value, + gpointer v_object); +void value_take_import_manifest (GValue* value, + gpointer v_object); gpointer value_get_import_manifest (const GValue* value); GType import_manifest_get_type (void) G_GNUC_CONST; -static void library_window_import_reporter (LibraryWindow* self, ImportManifest* manifest); +static void library_window_import_reporter (LibraryWindow* self, + ImportManifest* manifest); gpointer import_ui_question_params_ref (gpointer instance); void import_ui_question_params_unref (gpointer instance); -GParamSpec* import_ui_param_spec_question_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void import_ui_value_set_question_params (GValue* value, gpointer v_object); -void import_ui_value_take_question_params (GValue* value, gpointer v_object); +GParamSpec* import_ui_param_spec_question_params (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void import_ui_value_set_question_params (GValue* value, + gpointer v_object); +void import_ui_value_take_question_params (GValue* value, + gpointer v_object); gpointer import_ui_value_get_question_params (const GValue* value); GType import_ui_question_params_get_type (void) G_GNUC_CONST; -gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest_id, ImportUIQuestionParams* question); +gboolean import_ui_report_manifest (ImportManifest* manifest, + gboolean show_dest_id, + ImportUIQuestionParams* question); GFile* app_dirs_get_import_dir (void); -GtkResponseType app_window_affirm_cancel_question (const gchar* message, const gchar* affirmative, const gchar* title, GtkWindow* parent); +GtkResponseType app_window_affirm_cancel_question (const gchar* message, + const gchar* affirmative, + const gchar* title, + GtkWindow* parent); AppWindow* app_window_get_instance (void); gpointer batch_import_job_ref (gpointer instance); void batch_import_job_unref (gpointer instance); -GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_job (GValue* value, gpointer v_object); -void value_take_batch_import_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_job (GValue* value, + gpointer v_object); +void value_take_batch_import_job (GValue* value, + gpointer v_object); gpointer value_get_batch_import_job (const GValue* value); GType batch_import_job_get_type (void) G_GNUC_CONST; GType file_import_job_get_type (void) G_GNUC_CONST; -void app_window_error_message (const gchar* message, GtkWindow* parent); -FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library, gboolean recurse); -FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library, gboolean recurse); +void app_window_error_message (const gchar* message, + GtkWindow* parent); +FileImportJob* file_import_job_new (GFile* file_or_dir, + gboolean copy_to_library, + gboolean recurse); +FileImportJob* file_import_job_construct (GType object_type, + GFile* file_or_dir, + gboolean copy_to_library, + gboolean recurse); gpointer batch_import_roll_ref (gpointer instance); void batch_import_roll_unref (gpointer instance); -GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_roll (GValue* value, gpointer v_object); -void value_take_batch_import_roll (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_roll (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_roll (GValue* value, + gpointer v_object); +void value_take_batch_import_roll (GValue* value, + gpointer v_object); gpointer value_get_batch_import_roll (const GValue* value); GType batch_import_roll_get_type (void) G_GNUC_CONST; -static void _library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self); -BatchImport* batch_import_new (GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest); -BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest); +static void _library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest, + BatchImportRoll* import_roll, + gpointer self); +BatchImport* batch_import_new (GeeIterable* jobs, + const gchar* name, + BatchImportImportReporter reporter, + void* reporter_target, + GeeArrayList* prefailed, + GeeArrayList* pre_already_imported, + GCancellable* cancellable, + BatchImportRoll* import_roll, + ImportManifest* skip_manifest); +BatchImport* batch_import_construct (GType object_type, + GeeIterable* jobs, + const gchar* name, + BatchImportImportReporter reporter, + void* reporter_target, + GeeArrayList* prefailed, + GeeArrayList* pre_already_imported, + GCancellable* cancellable, + BatchImportRoll* import_roll, + ImportManifest* skip_manifest); void library_window_switch_to_import_queue_page (LibraryWindow* self); static GdkDragAction library_window_get_drag_action (LibraryWindow* self); -static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext* context, gint x, gint y, guint time); -static void library_window_real_drag_data_received (GtkWidget* base, GdkDragContext* context, gint x, gint y, GtkSelectionData* selection_data, guint info, guint time); +static gboolean library_window_real_drag_motion (GtkWidget* base, + GdkDragContext* context, + gint x, + gint y, + guint time); +static void library_window_real_drag_data_received (GtkWidget* base, + GdkDragContext* context, + gint x, + gint y, + GtkSelectionData* selection_data, + guint info, + guint time); void library_window_switch_to_library_page (LibraryWindow* self); -void library_window_switch_to_page (LibraryWindow* self, Page* page); -void library_window_switch_to_tag (LibraryWindow* self, Tag* tag); -void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* search); -void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* controller, Photo* current); -DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source); +void library_window_switch_to_page (LibraryWindow* self, + Page* page); +void library_window_switch_to_tag (LibraryWindow* self, + Tag* tag); +void library_window_switch_to_saved_search (LibraryWindow* self, + SavedSearch* search); +void library_window_switch_to_photo_page (LibraryWindow* self, + CollectionPage* controller, + Photo* current); +DataView* view_collection_get_view_for_source (ViewCollection* self, + DataSource* source); LibraryPhotoPage* library_photo_page_new (void); LibraryPhotoPage* library_photo_page_construct (GType object_type); -void library_window_add_to_stack (LibraryWindow* self, Page* page); +void library_window_add_to_stack (LibraryWindow* self, + Page* page); void spin_event_loop (void); -void library_photo_page_display_for_collection (LibraryPhotoPage* self, CollectionPage* return_page, Photo* photo, ViewCollection* view); +void library_photo_page_display_for_collection (LibraryPhotoPage* self, + CollectionPage* return_page, + Photo* photo, + ViewCollection* view); GType camera_sidebar_entry_get_type (void) G_GNUC_CONST; -CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, DiscoveredCamera* camera); +CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, + DiscoveredCamera* camera); GType import_page_get_type (void) G_GNUC_CONST; -gboolean import_page_unmount_camera (ImportPage* self, GMount* mount); -static void library_window_remove_from_stack (LibraryWindow* self, Page* page); +gboolean import_page_unmount_camera (ImportPage* self, + GMount* mount); +static void library_window_remove_from_stack (LibraryWindow* self, + Page* page); gboolean configuration_facade_get_display_basic_properties (ConfigurationFacade* self); static GVariant* _variant_new10 (gboolean value); gboolean configuration_facade_get_display_extended_properties (ConfigurationFacade* self); @@ -1656,36 +2015,54 @@ static GVariant* _variant_new11 (gboolean value); static GVariant* _variant_new12 (gboolean value); gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* self); static GVariant* _variant_new13 (const gchar* value); -static void library_window_start_pulse_background_progress_bar (LibraryWindow* self, const gchar* label, gint priority); -static void library_window_stop_pulse_background_progress_bar (LibraryWindow* self, gint priority, gboolean clear); +static void library_window_start_pulse_background_progress_bar (LibraryWindow* self, + const gchar* label, + gint priority); +static void library_window_stop_pulse_background_progress_bar (LibraryWindow* self, + gint priority, + gboolean clear); static void library_window_show_background_progress_bar (LibraryWindow* self); static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow* self); static gboolean _library_window_on_pulse_background_progress_bar_gsource_func (gpointer self); -static void library_window_clear_background_progress_bar (LibraryWindow* self, gint priority); -static void library_window_update_background_progress_bar (LibraryWindow* self, const gchar* label, gint priority, gdouble count, gdouble total); +static void library_window_clear_background_progress_bar (LibraryWindow* self, + gint priority); +static void library_window_update_background_progress_bar (LibraryWindow* self, + const gchar* label, + gint priority, + gdouble count, + gdouble total); static void library_window_hide_background_progress_bar (LibraryWindow* self); gint configuration_facade_get_sidebar_position (ConfigurationFacade* self); gint library_window_get_PAGE_MIN_WIDTH (void); -static void library_window_real_set_current_page (PageWindow* base, Page* page); -void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable); +static void library_window_real_set_current_page (PageWindow* base, + Page* page); +void library_window_set_page_switching_enabled (LibraryWindow* self, + gboolean should_enable); void application_set_menubar (GMenuModel* model); void page_switching_from (Page* self); void sidebar_tree_enable_editing (SidebarTree* self); -void page_window_set_current_page (PageWindow* self, Page* page); +void page_window_set_current_page (PageWindow* self, + Page* page); void sidebar_tree_disable_editing (SidebarTree* self); GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST; gboolean sidebar_expandable_entry_expand_on_select (SidebarExpandableEntry* self); -gboolean sidebar_tree_expand_to_entry (SidebarTree* self, SidebarEntry* entry); -gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboolean mask_signal); +gboolean sidebar_tree_expand_to_entry (SidebarTree* self, + SidebarEntry* entry); +gboolean sidebar_tree_place_cursor (SidebarTree* self, + SidebarEntry* entry, + gboolean mask_signal); static void library_window_on_update_properties (LibraryWindow* self); -static void library_window_subscribe_for_basic_information (LibraryWindow* self, Page* page); +static void library_window_subscribe_for_basic_information (LibraryWindow* self, + Page* page); void page_switched_to (Page* self); GMenuModel* page_get_menubar (Page* self); void page_ready (Page* self); GType search_view_filter_get_type (void) G_GNUC_CONST; -void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchViewFilter* search_filter); +void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, + SearchViewFilter* search_filter); SearchViewFilter* checkerboard_page_get_search_view_filter (CheckerboardPage* self); -void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f); +void view_collection_install_view_filter (ViewCollection* self, + ViewFilter* f); DisabledViewFilter* disabled_view_filter_new (void); DisabledViewFilter* disabled_view_filter_construct (GType object_type); GType disabled_view_filter_get_type (void) G_GNUC_CONST; @@ -1696,132 +2073,208 @@ gboolean sidebar_branch_get_show_branch (SidebarBranch* self); GType events_directory_entry_get_type (void) G_GNUC_CONST; GType events_master_directory_entry_get_type (void) G_GNUC_CONST; EventsMasterDirectoryEntry* events_branch_get_master_entry (EventsBranch* self); -static void _library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self); -static void _library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); -static void _library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self); -static void _library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self); +static void _library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender, + GeeIterable* changed, + gpointer self); +static void _library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); +static void _library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self); +static void _library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender, + GeeCollection* changed, + gpointer self); void one_shot_scheduler_at_idle (OneShotScheduler* self); -void library_window_mounted_camera_shell_notification (LibraryWindow* self, const gchar* uri, gboolean at_startup); +void library_window_mounted_camera_shell_notification (LibraryWindow* self, + const gchar* uri, + gboolean at_startup); gchar* camera_table_get_port_uri (const gchar* port); gboolean is_string_empty (const gchar* s); -static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKey* event); -gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, GdkEventKey* event); +static gboolean library_window_real_key_press_event (GtkWidget* base, + GdkEventKey* event); +gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, + GdkEventKey* event); gint thumbnail_get_MAX_SCALE (void); #define CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING 24 GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType zoom_buffer_get_type (void) G_GNUC_CONST; GType single_photo_page_update_reason_get_type (void) G_GNUC_CONST; GType raw_developer_get_type (void) G_GNUC_CONST; #define LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPagePrivate)) -enum { - LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_DUMMY_PROPERTY -}; static void library_window_fullscreen_photo_page_real_switched_to (Page* base); static void library_window_fullscreen_photo_page_real_switching_from (Page* base); -static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); +static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames); static void library_window_fullscreen_photo_page_finalize (GObject * obj); static void library_window_finalize (GObject * obj); -static void _vala_library_window_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_library_window_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); static const gchar* LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES[3] = {"gphoto2:", "disk:", "file:"}; const GtkTargetEntry LIBRARY_WINDOW_DND_TARGET_ENTRIES[3] = {{"text/uri-list", (guint) GTK_TARGET_OTHER_APP, (guint) LIBRARY_WINDOW_TARGET_TYPE_URI_LIST}, {LIBRARY_WINDOW_MEDIA_LIST_MIME_TYPE, (guint) GTK_TARGET_SAME_APP, (guint) LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST}, {LIBRARY_WINDOW_TAG_PATH_MIME_TYPE, (guint) GTK_TARGET_SAME_WIDGET, (guint) LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH}}; static const GActionEntry LIBRARY_WINDOW_common_actions[13] = {{"CommonFileImport", _library_window_on_file_import_gsimple_action_activate_callback}, {"ExternalLibraryImport", _library_window_on_external_library_import_gsimple_action_activate_callback}, {"CommonPreferences", _library_window_on_preferences_gsimple_action_activate_callback}, {"CommonEmptyTrash", _library_window_on_empty_trash_gsimple_action_activate_callback}, {"CommonJumpToEvent", _library_window_on_jump_to_event_gsimple_action_activate_callback}, {"CommonFind", _library_window_on_find_gsimple_action_activate_callback}, {"CommonNewSearch", _library_window_on_new_search_gsimple_action_activate_callback}, {"CommonDisplayBasicProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_basic_properties_gsimple_action_change_state_callback}, {"CommonDisplayExtendedProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_extended_properties_gsimple_action_change_state_callback}, {"CommonDisplaySearchbar", NULL, NULL, "false", _library_window_on_display_searchbar_gsimple_action_change_state_callback}, {"CommonDisplaySidebar", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "true", _library_window_on_display_sidebar_gsimple_action_change_state_callback}, {"CommonDisplayToolbar", NULL, NULL, "true", _library_window_on_display_toolbar_gsimple_action_change_state_callback}, {"CommonSortEvents", _library_window_on_action_radio_gsimple_action_activate_callback, "s", "'ascending'", _library_window_on_events_sort_changed_gsimple_action_change_state_callback}}; -static void _library_window_on_page_created_sidebar_tree_page_created (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self) { +static void +_library_window_on_page_created_sidebar_tree_page_created (SidebarTree* _sender, + SidebarPageRepresentative* entry, + Page* page, + gpointer self) +{ #line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_page_created ((LibraryWindow*) self, entry, page); -#line 1744 "LibraryWindow.c" +#line 2150 "LibraryWindow.c" } -static void _library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self) { +static void +_library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _sender, + SidebarPageRepresentative* entry, + Page* page, + gpointer self) +{ #line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_destroying_page ((LibraryWindow*) self, entry, page); -#line 1751 "LibraryWindow.c" +#line 2162 "LibraryWindow.c" } -static void _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTree* _sender, SidebarSelectableEntry* selectable, gpointer self) { +static void +_library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTree* _sender, + SidebarSelectableEntry* selectable, + gpointer self) +{ #line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_sidebar_entry_selected ((LibraryWindow*) self, selectable); -#line 1758 "LibraryWindow.c" +#line 2173 "LibraryWindow.c" } -static void _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed (SidebarTree* _sender, SidebarSelectableEntry* removed, gpointer self) { +static void +_library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed (SidebarTree* _sender, + SidebarSelectableEntry* removed, + gpointer self) +{ #line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_sidebar_selected_entry_removed ((LibraryWindow*) self, removed); -#line 1765 "LibraryWindow.c" +#line 2184 "LibraryWindow.c" } -static void _library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender, gpointer self) { +static void +_library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender, + gpointer self) +{ #line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_hide_extended_properties ((LibraryWindow*) self); -#line 1772 "LibraryWindow.c" +#line 2194 "LibraryWindow.c" } -static void _library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender, gpointer self) { +static void +_library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender, + gpointer self) +{ #line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_show_extended_properties ((LibraryWindow*) self); -#line 1779 "LibraryWindow.c" +#line 2204 "LibraryWindow.c" } -static void _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { +static void +_library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self) +{ #line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_trashcan_contents_altered ((LibraryWindow*) self); -#line 1786 "LibraryWindow.c" +#line 2216 "LibraryWindow.c" } -static void _library_window_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_library_window_on_media_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_media_altered ((LibraryWindow*) self); -#line 1793 "LibraryWindow.c" +#line 2227 "LibraryWindow.c" } -static void _library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWriter* _sender, guint completed, guint total, gpointer self) { +static void +_library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWriter* _sender, + guint completed, + guint total, + gpointer self) +{ #line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_metadata_writer_progress ((LibraryWindow*) self, completed, total); -#line 1800 "LibraryWindow.c" +#line 2239 "LibraryWindow.c" } -static void _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) { +static void +_library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, + LibraryMonitor* monitor, + gpointer self) +{ #line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_installed ((LibraryWindow*) self, monitor); -#line 1807 "LibraryWindow.c" +#line 2250 "LibraryWindow.c" } -static void _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) { +static void +_library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, + LibraryMonitor* monitor, + gpointer self) +{ #line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_destroyed ((LibraryWindow*) self, monitor); -#line 1814 "LibraryWindow.c" +#line 2261 "LibraryWindow.c" } -static void _library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) { +static void +_library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender, + DiscoveredCamera* camera, + gpointer self) +{ #line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_camera_added ((LibraryWindow*) self, camera); -#line 1821 "LibraryWindow.c" +#line 2272 "LibraryWindow.c" } -static GType library_window_sidebar_root_position_get_type (void) { +static GType +library_window_sidebar_root_position_get_type (void) +{ static volatile gsize library_window_sidebar_root_position_type_id__volatile = 0; if (g_once_init_enter (&library_window_sidebar_root_position_type_id__volatile)) { static const GEnumValue values[] = {{LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_LIBRARY, "LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_LIBRARY", "library"}, {LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_CAMERAS, "LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_CAMERAS", "cameras"}, {LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_SAVED_SEARCH, "LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_SAVED_SEARCH", "saved-search"}, {LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_EVENTS, "LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_EVENTS", "events"}, {LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_FOLDERS, "LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_FOLDERS", "folders"}, {LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_TAGS, "LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_TAGS", "tags"}, {0, NULL, NULL}}; @@ -1833,7 +2286,9 @@ static GType library_window_sidebar_root_position_get_type (void) { } -GType library_window_target_type_get_type (void) { +GType +library_window_target_type_get_type (void) +{ static volatile gsize library_window_target_type_type_id__volatile = 0; if (g_once_init_enter (&library_window_target_type_type_id__volatile)) { static const GEnumValue values[] = {{LIBRARY_WINDOW_TARGET_TYPE_URI_LIST, "LIBRARY_WINDOW_TARGET_TYPE_URI_LIST", "uri-list"}, {LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST, "LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST", "media-list"}, {LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH, "LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH", "tag-path"}, {0, NULL, NULL}}; @@ -1845,126 +2300,199 @@ GType library_window_target_type_get_type (void) { } -static void _library_window_on_file_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_window_on_file_import_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_file_import ((LibraryWindow*) self); -#line 1852 "LibraryWindow.c" +#line 2311 "LibraryWindow.c" } -static void _library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_external_library_import ((LibraryWindow*) self); -#line 1859 "LibraryWindow.c" +#line 2322 "LibraryWindow.c" } -static void _library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_preferences ((LibraryWindow*) self); -#line 1866 "LibraryWindow.c" +#line 2333 "LibraryWindow.c" } -static void _library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_empty_trash ((LibraryWindow*) self); -#line 1873 "LibraryWindow.c" +#line 2344 "LibraryWindow.c" } -static void _library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_jump_to_event ((LibraryWindow*) self); -#line 1880 "LibraryWindow.c" +#line 2355 "LibraryWindow.c" } -static void _library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_find ((LibraryWindow*) self); -#line 1887 "LibraryWindow.c" +#line 2366 "LibraryWindow.c" } -static void _library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_new_search ((LibraryWindow*) self); -#line 1894 "LibraryWindow.c" +#line 2377 "LibraryWindow.c" } -static void _library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_action_toggle ((LibraryWindow*) self, action, parameter); -#line 1901 "LibraryWindow.c" +#line 2388 "LibraryWindow.c" } -static void _library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_display_basic_properties ((LibraryWindow*) self, action, value); -#line 1908 "LibraryWindow.c" +#line 2399 "LibraryWindow.c" } -static void _library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_display_extended_properties ((LibraryWindow*) self, action, value); -#line 1915 "LibraryWindow.c" +#line 2410 "LibraryWindow.c" } -static void _library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_display_searchbar ((LibraryWindow*) self, action, value); -#line 1922 "LibraryWindow.c" +#line 2421 "LibraryWindow.c" } -static void _library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_display_sidebar ((LibraryWindow*) self, action, value); -#line 1929 "LibraryWindow.c" +#line 2432 "LibraryWindow.c" } -static void _library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_display_toolbar ((LibraryWindow*) self, action, value); -#line 1936 "LibraryWindow.c" +#line 2443 "LibraryWindow.c" } -static void _library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_action_radio ((LibraryWindow*) self, action, parameter); -#line 1943 "LibraryWindow.c" +#line 2454 "LibraryWindow.c" } -static void _library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_events_sort_changed ((LibraryWindow*) self, action, value); -#line 1950 "LibraryWindow.c" +#line 2465 "LibraryWindow.c" } -static void _library_window_external_drop_handler_sidebar_tree_external_drop_handler (GdkDragContext* context, SidebarEntry* entry, GtkSelectionData* data, guint info, guint time, gpointer self) { +static void +_library_window_external_drop_handler_sidebar_tree_external_drop_handler (GdkDragContext* context, + SidebarEntry* entry, + GtkSelectionData* data, + guint info, + guint time, + gpointer self) +{ #line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_external_drop_handler ((LibraryWindow*) self, context, entry, data, info, time); -#line 1957 "LibraryWindow.c" +#line 2479 "LibraryWindow.c" } -static void _library_window_on_update_properties_now_one_shot_callback (gpointer self) { +static void +_library_window_on_update_properties_now_one_shot_callback (gpointer self) +{ #line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties_now ((LibraryWindow*) self); -#line 1964 "LibraryWindow.c" +#line 2488 "LibraryWindow.c" } -LibraryWindow* library_window_construct (GType object_type, ProgressMonitor progress_monitor, void* progress_monitor_target) { +LibraryWindow* +library_window_construct (GType object_type, + ProgressMonitor progress_monitor, + void* progress_monitor_target) +{ LibraryWindow * self = NULL; SidebarTree* _tmp0_; SidebarTree* _tmp1_; @@ -1995,30 +2523,30 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog Page* _tmp26_; Page* _tmp27_; GtkTargetEntry* main_window_dnd_targets = NULL; + GtkTargetEntry _tmp39_; GtkTargetEntry _tmp40_; - GtkTargetEntry _tmp41_; - GtkTargetEntry* _tmp42_; + GtkTargetEntry* _tmp41_; gint main_window_dnd_targets_length1; gint _main_window_dnd_targets_size_; - GtkTargetEntry* _tmp43_; - gint _tmp43__length1; + GtkTargetEntry* _tmp42_; + gint _tmp42__length1; + MetadataWriter* _tmp43_; MetadataWriter* _tmp44_; - MetadataWriter* _tmp45_; LibraryMonitor* monitor = NULL; + LibraryMonitorPool* _tmp45_; LibraryMonitorPool* _tmp46_; - LibraryMonitorPool* _tmp47_; + LibraryMonitor* _tmp47_; LibraryMonitor* _tmp48_; LibraryMonitor* _tmp49_; - LibraryMonitor* _tmp50_; + LibraryMonitorPool* _tmp51_; LibraryMonitorPool* _tmp52_; LibraryMonitorPool* _tmp53_; LibraryMonitorPool* _tmp54_; - LibraryMonitorPool* _tmp55_; + CameraTable* _tmp55_; CameraTable* _tmp56_; - CameraTable* _tmp57_; - GtkProgressBar* _tmp58_; + GtkProgressBar* _tmp57_; #line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - static const gchar* accels[] = {"f", "F8", NULL}; + static const gchar* accels[3] = {"f", "F8", NULL}; #line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = (LibraryWindow*) app_window_construct (object_type); #line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2129,7 +2657,7 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog _g_object_unref0 (_tmp27_); #line 185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_load_configuration (self); -#line 2133 "LibraryWindow.c" +#line 2661 "LibraryWindow.c" { GeeIterator* _media_sources_it = NULL; MediaCollectionRegistry* _tmp28_; @@ -2158,128 +2686,125 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog _media_sources_it = _tmp33_; #line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" while (TRUE) { -#line 2162 "LibraryWindow.c" +#line 2690 "LibraryWindow.c" GeeIterator* _tmp34_; - gboolean _tmp35_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp36_; - gpointer _tmp37_; + GeeIterator* _tmp35_; + gpointer _tmp36_; + MediaSourceCollection* _tmp37_; MediaSourceCollection* _tmp38_; - MediaSourceCollection* _tmp39_; #line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = _media_sources_it; #line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp35_ = gee_iterator_next (_tmp34_); -#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (!_tmp35_) { + if (!gee_iterator_next (_tmp34_)) { #line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 2178 "LibraryWindow.c" +#line 2703 "LibraryWindow.c" } #line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp36_ = _media_sources_it; + _tmp35_ = _media_sources_it; #line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp37_ = gee_iterator_get (_tmp36_); + _tmp36_ = gee_iterator_get (_tmp35_); #line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - media_sources = (MediaSourceCollection*) _tmp37_; + media_sources = (MediaSourceCollection*) _tmp36_; #line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp38_ = media_sources; + _tmp37_ = media_sources; #line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp38_, "trashcan-contents-altered", (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0); + g_signal_connect_object (_tmp37_, "trashcan-contents-altered", (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0); #line 189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp39_ = media_sources; + _tmp38_ = media_sources; #line 189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_media_altered_data_collection_items_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_media_altered_data_collection_items_altered, self, 0); #line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (media_sources); -#line 2196 "LibraryWindow.c" +#line 2721 "LibraryWindow.c" } #line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_media_sources_it); -#line 2200 "LibraryWindow.c" +#line 2725 "LibraryWindow.c" } #line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp40_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_URI_LIST]; + _tmp39_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_URI_LIST]; #line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp41_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST]; + _tmp40_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST]; #line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp42_ = g_new0 (GtkTargetEntry, 2); + _tmp41_ = g_new0 (GtkTargetEntry, 2); #line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp42_[0] = _tmp40_; + _tmp41_[0] = _tmp39_; #line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp42_[1] = _tmp41_; + _tmp41_[1] = _tmp40_; #line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - main_window_dnd_targets = _tmp42_; + main_window_dnd_targets = _tmp41_; #line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" main_window_dnd_targets_length1 = 2; #line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _main_window_dnd_targets_size_ = main_window_dnd_targets_length1; #line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp43_ = main_window_dnd_targets; + _tmp42_ = main_window_dnd_targets; #line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp43__length1 = main_window_dnd_targets_length1; + _tmp42__length1 = main_window_dnd_targets_length1; #line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_drag_dest_set (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), GTK_DEST_DEFAULT_ALL, _tmp43_, _tmp43__length1, (GDK_ACTION_COPY | GDK_ACTION_LINK) | GDK_ACTION_ASK); + gtk_drag_dest_set (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), GTK_DEST_DEFAULT_ALL, _tmp42_, _tmp42__length1, (GDK_ACTION_COPY | GDK_ACTION_LINK) | GDK_ACTION_ASK); #line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp44_ = metadata_writer_get_instance (); + _tmp43_ = metadata_writer_get_instance (); #line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp45_ = _tmp44_; + _tmp44_ = _tmp43_; #line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp45_, "progress", (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self, 0); + g_signal_connect_object (_tmp44_, "progress", (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self, 0); #line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp45_); + _g_object_unref0 (_tmp44_); #line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp46_ = library_monitor_pool_get_instance (); + _tmp45_ = library_monitor_pool_get_instance (); #line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp47_ = _tmp46_; + _tmp46_ = _tmp45_; #line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp48_ = library_monitor_pool_get_monitor (_tmp47_); + _tmp47_ = library_monitor_pool_get_monitor (_tmp46_); #line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp49_ = _tmp48_; + _tmp48_ = _tmp47_; #line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _library_monitor_pool_unref0 (_tmp47_); + _library_monitor_pool_unref0 (_tmp46_); #line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - monitor = _tmp49_; + monitor = _tmp48_; #line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp50_ = monitor; + _tmp49_ = monitor; #line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp50_ != NULL) { -#line 2248 "LibraryWindow.c" - LibraryMonitor* _tmp51_; + if (_tmp49_ != NULL) { +#line 2773 "LibraryWindow.c" + LibraryMonitor* _tmp50_; #line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp51_ = monitor; + _tmp50_ = monitor; #line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_on_library_monitor_installed (self, _tmp51_); -#line 2254 "LibraryWindow.c" + library_window_on_library_monitor_installed (self, _tmp50_); +#line 2779 "LibraryWindow.c" } #line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp52_ = library_monitor_pool_get_instance (); + _tmp51_ = library_monitor_pool_get_instance (); #line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp53_ = _tmp52_; + _tmp52_ = _tmp51_; #line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp53_, "monitor-installed", (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self, 0); + g_signal_connect_object (_tmp52_, "monitor-installed", (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self, 0); #line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _library_monitor_pool_unref0 (_tmp53_); + _library_monitor_pool_unref0 (_tmp52_); #line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp54_ = library_monitor_pool_get_instance (); + _tmp53_ = library_monitor_pool_get_instance (); #line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp55_ = _tmp54_; + _tmp54_ = _tmp53_; #line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp55_, "monitor-destroyed", (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self, 0); + g_signal_connect_object (_tmp54_, "monitor-destroyed", (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self, 0); #line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _library_monitor_pool_unref0 (_tmp55_); + _library_monitor_pool_unref0 (_tmp54_); #line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp56_ = camera_table_get_instance (); + _tmp55_ = camera_table_get_instance (); #line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp57_ = _tmp56_; + _tmp56_ = _tmp55_; #line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp57_, "camera-added", (GCallback) _library_window_on_camera_added_camera_table_camera_added, self, 0); + g_signal_connect_object (_tmp56_, "camera-added", (GCallback) _library_window_on_camera_added_camera_table_camera_added, self, 0); #line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _camera_table_unref0 (_tmp57_); + _camera_table_unref0 (_tmp56_); #line 214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp58_ = self->priv->background_progress_bar; + _tmp57_ = self->priv->background_progress_bar; #line 214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_progress_bar_set_show_text (_tmp58_, TRUE); + gtk_progress_bar_set_show_text (_tmp57_, TRUE); #line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" application_set_accels_for_action ("win.CommonDisplaySearchbar", accels, G_N_ELEMENTS (accels)); #line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2288,219 +2813,216 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog main_window_dnd_targets = (g_free (main_window_dnd_targets), NULL); #line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return self; -#line 2292 "LibraryWindow.c" +#line 2817 "LibraryWindow.c" } -LibraryWindow* library_window_new (ProgressMonitor progress_monitor, void* progress_monitor_target) { +LibraryWindow* +library_window_new (ProgressMonitor progress_monitor, + void* progress_monitor_target) +{ #line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return library_window_construct (TYPE_LIBRARY_WINDOW, progress_monitor, progress_monitor_target); -#line 2299 "LibraryWindow.c" +#line 2827 "LibraryWindow.c" } -static void _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender, gpointer self) { +static void +_library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender, + gpointer self) +{ #line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_discovery_started ((LibraryWindow*) self); -#line 2306 "LibraryWindow.c" +#line 2837 "LibraryWindow.c" } -static void _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) { +static void +_library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, + gpointer self) +{ #line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self); -#line 2313 "LibraryWindow.c" +#line 2847 "LibraryWindow.c" } -static void _library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender, gpointer self) { +static void +_library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender, + gpointer self) +{ #line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self); -#line 2320 "LibraryWindow.c" +#line 2857 "LibraryWindow.c" } -static void _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress (LibraryMonitor* _sender, gint completed_files, gint total_files, gpointer self) { +static void +_library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress (LibraryMonitor* _sender, + gint completed_files, + gint total_files, + gpointer self) +{ #line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_auto_update_progress ((LibraryWindow*) self, completed_files, total_files); -#line 2327 "LibraryWindow.c" +#line 2869 "LibraryWindow.c" } -static void _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender, gpointer self) { +static void +_library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender, + gpointer self) +{ #line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_auto_import_preparing ((LibraryWindow*) self); -#line 2334 "LibraryWindow.c" +#line 2879 "LibraryWindow.c" } -static void _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress (LibraryMonitor* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) { +static void +_library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress (LibraryMonitor* _sender, + guint64 completed_bytes, + guint64 total_bytes, + gpointer self) +{ #line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_auto_import_progress ((LibraryWindow*) self, completed_bytes, total_bytes); -#line 2341 "LibraryWindow.c" +#line 2891 "LibraryWindow.c" } -static void library_window_on_library_monitor_installed (LibraryWindow* self, LibraryMonitor* monitor) { - LibraryMonitor* _tmp0_; +static void +library_window_on_library_monitor_installed (LibraryWindow* self, + LibraryMonitor* monitor) +{ + GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; + gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - LibraryMonitor* _tmp5_; - LibraryMonitor* _tmp6_; - LibraryMonitor* _tmp7_; - LibraryMonitor* _tmp8_; - LibraryMonitor* _tmp9_; - LibraryMonitor* _tmp10_; #line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_MONITOR (monitor)); #line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = monitor; -#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor)); + _tmp0_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor)); #line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = g_file_get_path (_tmp2_); + _tmp2_ = g_file_get_path (_tmp1_); #line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:251: on_library_monitor_installed: %s", _tmp4_); + g_debug ("LibraryWindow.vala:251: on_library_monitor_installed: %s", _tmp3_); #line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp2_); -#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = monitor; + _g_object_unref0 (_tmp1_); #line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-started", (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self, 0); -#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = monitor; + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-started", (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self, 0); #line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-completed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-completed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self, 0); #line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = monitor; -#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "closed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self, 0); -#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = monitor; + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "closed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self, 0); #line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp8_, "auto-update-progress", (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self, 0); + g_signal_connect_object (monitor, "auto-update-progress", (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self, 0); #line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = monitor; -#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp9_, "auto-import-preparing", (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self, 0); -#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = monitor; + g_signal_connect_object (monitor, "auto-import-preparing", (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self, 0); #line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp10_, "auto-import-progress", (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self, 0); -#line 2401 "LibraryWindow.c" + g_signal_connect_object (monitor, "auto-import-progress", (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self, 0); +#line 2933 "LibraryWindow.c" } -static void library_window_on_library_monitor_destroyed (LibraryWindow* self, LibraryMonitor* monitor) { - LibraryMonitor* _tmp0_; +static void +library_window_on_library_monitor_destroyed (LibraryWindow* self, + LibraryMonitor* monitor) +{ + GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; + gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - LibraryMonitor* _tmp5_; + guint _tmp4_; + guint _tmp5_; guint _tmp6_; - LibraryMonitor* _tmp7_; + guint _tmp7_; guint _tmp8_; - LibraryMonitor* _tmp9_; - guint _tmp10_; - LibraryMonitor* _tmp11_; - guint _tmp12_; - LibraryMonitor* _tmp13_; - guint _tmp14_; - LibraryMonitor* _tmp15_; - guint _tmp16_; + guint _tmp9_; #line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_MONITOR (monitor)); #line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = monitor; -#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor)); + _tmp0_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor)); #line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = g_file_get_path (_tmp2_); + _tmp2_ = g_file_get_path (_tmp1_); #line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:262: on_library_monitor_destroyed: %s", _tmp4_); + g_debug ("LibraryWindow.vala:262: on_library_monitor_destroyed: %s", _tmp3_); #line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp2_); -#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = monitor; + _g_object_unref0 (_tmp1_); #line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_parse_name ("discovery-started", TYPE_DIRECTORY_MONITOR, &_tmp6_, NULL, FALSE); + g_signal_parse_name ("discovery-started", TYPE_DIRECTORY_MONITOR, &_tmp4_, NULL, FALSE); #line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self); -#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = monitor; + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self); #line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_parse_name ("discovery-completed", TYPE_DIRECTORY_MONITOR, &_tmp8_, NULL, FALSE); + g_signal_parse_name ("discovery-completed", TYPE_DIRECTORY_MONITOR, &_tmp5_, NULL, FALSE); #line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self); #line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = monitor; + g_signal_parse_name ("closed", TYPE_DIRECTORY_MONITOR, &_tmp6_, NULL, FALSE); #line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_parse_name ("closed", TYPE_DIRECTORY_MONITOR, &_tmp10_, NULL, FALSE); -#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self); -#line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = monitor; + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self); #line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_parse_name ("auto-update-progress", TYPE_LIBRARY_MONITOR, &_tmp12_, NULL, FALSE); + g_signal_parse_name ("auto-update-progress", TYPE_LIBRARY_MONITOR, &_tmp7_, NULL, FALSE); #line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self); + g_signal_handlers_disconnect_matched (monitor, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self); #line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = monitor; + g_signal_parse_name ("auto-import-preparing", TYPE_LIBRARY_MONITOR, &_tmp8_, NULL, FALSE); #line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_parse_name ("auto-import-preparing", TYPE_LIBRARY_MONITOR, &_tmp14_, NULL, FALSE); -#line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self); -#line 269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = monitor; + g_signal_handlers_disconnect_matched (monitor, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self); #line 269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_parse_name ("auto-import-progress", TYPE_LIBRARY_MONITOR, &_tmp16_, NULL, FALSE); + g_signal_parse_name ("auto-import-progress", TYPE_LIBRARY_MONITOR, &_tmp9_, NULL, FALSE); #line 269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self); -#line 2479 "LibraryWindow.c" + g_signal_handlers_disconnect_matched (monitor, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self); +#line 2993 "LibraryWindow.c" } -static GVariant* _variant_new1 (gboolean value) { +static GVariant* +_variant_new1 (gboolean value) +{ #line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 2486 "LibraryWindow.c" +#line 3002 "LibraryWindow.c" } -static GVariant* _variant_new2 (gboolean value) { +static GVariant* +_variant_new2 (gboolean value) +{ #line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 2493 "LibraryWindow.c" +#line 3011 "LibraryWindow.c" } -static GVariant* _variant_new3 (gboolean value) { +static GVariant* +_variant_new3 (gboolean value) +{ #line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 2500 "LibraryWindow.c" +#line 3020 "LibraryWindow.c" } -static void library_window_real_add_actions (AppWindow* base) { +static void +library_window_real_add_actions (AppWindow* base) +{ LibraryWindow * self; SearchFilterActions* _tmp0_; gint _tmp1_; @@ -2509,14 +3031,11 @@ static void library_window_real_add_actions (AppWindow* base) { GAction* _tmp4_; ConfigFacade* _tmp5_; ConfigFacade* _tmp6_; - gboolean _tmp7_; - GVariant* _tmp8_; - GAction* _tmp9_; - gboolean _tmp10_; + GVariant* _tmp7_; + GAction* _tmp8_; + GVariant* _tmp9_; + GAction* _tmp10_; GVariant* _tmp11_; - GAction* _tmp12_; - gboolean _tmp13_; - GVariant* _tmp14_; #line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2538,62 +3057,62 @@ static void library_window_real_add_actions (AppWindow* base) { #line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp5_; #line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp7_ = _variant_new1 (configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = _variant_new1 (_tmp7_); + g_action_change_state (_tmp4_, _tmp7_); #line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_action_change_state (_tmp4_, _tmp8_); -#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_variant_unref0 (_tmp8_); + _g_variant_unref0 (_tmp7_); #line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); #line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySidebar"); + _tmp8_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySidebar"); #line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = library_window_is_sidebar_visible (self); + _tmp9_ = _variant_new2 (library_window_is_sidebar_visible (self)); #line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = _variant_new2 (_tmp10_); + g_action_change_state (_tmp8_, _tmp9_); #line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_action_change_state (_tmp9_, _tmp11_); -#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_variant_unref0 (_tmp11_); + _g_variant_unref0 (_tmp9_); #line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayToolbar"); + _tmp10_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayToolbar"); #line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = library_window_is_toolbar_visible (self); + _tmp11_ = _variant_new3 (library_window_is_toolbar_visible (self)); #line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = _variant_new3 (_tmp13_); + g_action_change_state (_tmp10_, _tmp11_); #line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_action_change_state (_tmp12_, _tmp14_); -#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_variant_unref0 (_tmp14_); -#line 2571 "LibraryWindow.c" + _g_variant_unref0 (_tmp11_); +#line 3084 "LibraryWindow.c" } -static void _library_window_on_view_filter_installed_view_collection_view_filter_installed (ViewCollection* _sender, ViewFilter* filer, gpointer self) { +static void +_library_window_on_view_filter_installed_view_collection_view_filter_installed (ViewCollection* _sender, + ViewFilter* filer, + gpointer self) +{ #line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_view_filter_installed ((LibraryWindow*) self, filer); -#line 2578 "LibraryWindow.c" +#line 3095 "LibraryWindow.c" } -static void _library_window_on_view_filter_removed_view_collection_view_filter_removed (ViewCollection* _sender, ViewFilter* filer, gpointer self) { +static void +_library_window_on_view_filter_removed_view_collection_view_filter_removed (ViewCollection* _sender, + ViewFilter* filer, + gpointer self) +{ #line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_view_filter_removed ((LibraryWindow*) self, filer); -#line 2585 "LibraryWindow.c" +#line 3106 "LibraryWindow.c" } -static void library_window_real_switched_pages (PageWindow* base, Page* old_page, Page* new_page) { +static void +library_window_real_switched_pages (PageWindow* base, + Page* old_page, + Page* new_page) +{ LibraryWindow * self; - Page* _tmp0_; - Page* _tmp1_; - Page* _tmp2_; - Page* _tmp11_; - SearchFilterActions* _tmp18_; - Page* _tmp19_; - Page* _tmp20_; + SearchFilterActions* _tmp10_; #line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2601,158 +3120,142 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page #line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page)); #line 304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = old_page; -#line 304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = new_page; -#line 304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - PAGE_WINDOW_CLASS (library_window_parent_class)->switched_pages (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), _tmp0_, _tmp1_); -#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = old_page; + PAGE_WINDOW_CLASS (library_window_parent_class)->switched_pages (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), old_page, new_page); #line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp2_ != NULL) { -#line 2614 "LibraryWindow.c" - Page* _tmp3_; + if (old_page != NULL) { +#line 3127 "LibraryWindow.c" + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + guint _tmp2_; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; - guint _tmp6_; - Page* _tmp7_; - ViewCollection* _tmp8_; - ViewCollection* _tmp9_; - guint _tmp10_; -#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = old_page; + guint _tmp5_; #line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = page_get_view (_tmp3_); + _tmp0_ = page_get_view (old_page); #line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = _tmp4_; + _tmp1_ = _tmp0_; #line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_parse_name ("view-filter-installed", TYPE_VIEW_COLLECTION, &_tmp6_, NULL, FALSE); + g_signal_parse_name ("view-filter-installed", TYPE_VIEW_COLLECTION, &_tmp2_, NULL, FALSE); #line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self); + g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self); #line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp1_); #line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = old_page; + _tmp3_ = page_get_view (old_page); #line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = page_get_view (_tmp7_); + _tmp4_ = _tmp3_; #line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = _tmp8_; -#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_parse_name ("view-filter-removed", TYPE_VIEW_COLLECTION, &_tmp10_, NULL, FALSE); + g_signal_parse_name ("view-filter-removed", TYPE_VIEW_COLLECTION, &_tmp5_, NULL, FALSE); #line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self); + g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self); #line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _data_collection_unref0 (_tmp9_); -#line 2647 "LibraryWindow.c" + _data_collection_unref0 (_tmp4_); +#line 3154 "LibraryWindow.c" } #line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = new_page; -#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp11_ != NULL) { -#line 2653 "LibraryWindow.c" - Page* _tmp12_; - ViewCollection* _tmp13_; - ViewCollection* _tmp14_; - Page* _tmp15_; - ViewCollection* _tmp16_; - ViewCollection* _tmp17_; -#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = new_page; + if (new_page != NULL) { +#line 3158 "LibraryWindow.c" + ViewCollection* _tmp6_; + ViewCollection* _tmp7_; + ViewCollection* _tmp8_; + ViewCollection* _tmp9_; #line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = page_get_view (_tmp12_); + _tmp6_ = page_get_view (new_page); #line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = _tmp13_; + _tmp7_ = _tmp6_; #line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp14_, "view-filter-installed", (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self, 0); + g_signal_connect_object (_tmp7_, "view-filter-installed", (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self, 0); #line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _data_collection_unref0 (_tmp14_); -#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = new_page; + _data_collection_unref0 (_tmp7_); #line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = page_get_view (_tmp15_); + _tmp8_ = page_get_view (new_page); #line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = _tmp16_; + _tmp9_ = _tmp8_; #line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp17_, "view-filter-removed", (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self, 0); + g_signal_connect_object (_tmp9_, "view-filter-removed", (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self, 0); #line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _data_collection_unref0 (_tmp17_); -#line 2680 "LibraryWindow.c" + _data_collection_unref0 (_tmp9_); +#line 3179 "LibraryWindow.c" } #line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = self->priv->search_actions; + _tmp10_ = self->priv->search_actions; #line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = old_page; -#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp20_ = new_page; -#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - search_filter_actions_monitor_page_contents (_tmp18_, _tmp19_, _tmp20_); -#line 2690 "LibraryWindow.c" + search_filter_actions_monitor_page_contents (_tmp10_, old_page, new_page); +#line 3185 "LibraryWindow.c" } -static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender, gpointer self) { +static void +_library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender, + gpointer self) +{ #line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_view_filter_refreshed ((LibraryWindow*) self); -#line 2697 "LibraryWindow.c" +#line 3195 "LibraryWindow.c" } -static void library_window_on_view_filter_installed (LibraryWindow* self, ViewFilter* filter) { - ViewFilter* _tmp0_; +static void +library_window_on_view_filter_installed (LibraryWindow* self, + ViewFilter* filter) +{ #line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_VIEW_FILTER (filter)); #line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = filter; -#line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp0_, "refresh", (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self, 0); -#line 2711 "LibraryWindow.c" + g_signal_connect_object (filter, "refresh", (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self, 0); +#line 3209 "LibraryWindow.c" } -static void library_window_on_view_filter_removed (LibraryWindow* self, ViewFilter* filter) { - ViewFilter* _tmp0_; - guint _tmp1_; +static void +library_window_on_view_filter_removed (LibraryWindow* self, + ViewFilter* filter) +{ + guint _tmp0_; #line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_VIEW_FILTER (filter)); #line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = filter; + g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp0_, NULL, FALSE); #line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp1_, NULL, FALSE); -#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self); -#line 2728 "LibraryWindow.c" + g_signal_handlers_disconnect_matched (filter, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self); +#line 3226 "LibraryWindow.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return self ? g_object_ref (self) : NULL; -#line 2735 "LibraryWindow.c" +#line 3235 "LibraryWindow.c" } -static GVariant* _variant_new4 (gboolean value) { +static GVariant* +_variant_new4 (gboolean value) +{ #line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 2742 "LibraryWindow.c" +#line 3244 "LibraryWindow.c" } -static void library_window_on_view_filter_refreshed (LibraryWindow* self) { +static void +library_window_on_view_filter_refreshed (LibraryWindow* self) +{ Page* _tmp0_; Page* _tmp1_; ViewCollection* _tmp2_; ViewCollection* _tmp3_; gboolean _tmp4_; - gboolean _tmp5_; GAction* action = NULL; + GAction* _tmp5_; GAction* _tmp6_; GAction* _tmp7_; - GAction* _tmp8_; #line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2764,49 +3267,49 @@ static void library_window_on_view_filter_refreshed (LibraryWindow* self) { #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = view_collection_are_items_filtered_out (_tmp3_); -#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = !_tmp4_; + _tmp4_ = !view_collection_are_items_filtered_out (_tmp3_); #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp3_); #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp5_) { + if (_tmp4_) { #line 332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 2779 "LibraryWindow.c" +#line 3280 "LibraryWindow.c" } #line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar"); + _tmp5_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar"); #line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = _g_object_ref0 (_tmp6_); + _tmp6_ = _g_object_ref0 (_tmp5_); #line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - action = _tmp7_; + action = _tmp6_; #line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = action; + _tmp7_ = action; #line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp8_ != NULL) { -#line 2791 "LibraryWindow.c" - GAction* _tmp9_; - GVariant* _tmp10_; + if (_tmp7_ != NULL) { +#line 3292 "LibraryWindow.c" + GAction* _tmp8_; + GVariant* _tmp9_; #line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = action; + _tmp8_ = action; #line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = _variant_new4 (TRUE); + _tmp9_ = _variant_new4 (TRUE); #line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_action_change_state (_tmp9_, _tmp10_); + g_action_change_state (_tmp8_, _tmp9_); #line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_variant_unref0 (_tmp10_); -#line 2802 "LibraryWindow.c" + _g_variant_unref0 (_tmp9_); +#line 3303 "LibraryWindow.c" } #line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (action); -#line 2806 "LibraryWindow.c" +#line 3307 "LibraryWindow.c" } -static void library_window_real_show_all (GtkWidget* base) { +static void +library_window_real_show_all (GtkWidget* base) +{ LibraryWindow * self; GAction* basic_properties_action = NULL; Page* _tmp0_; @@ -2818,14 +3321,11 @@ static void library_window_real_show_all (GtkWidget* base) { GVariant* _tmp6_; GVariant* _tmp7_; gboolean _tmp8_; - gboolean _tmp9_; CheckerboardPage* current_page = NULL; - Page* _tmp11_; + Page* _tmp10_; + CheckerboardPage* _tmp11_; CheckerboardPage* _tmp12_; - CheckerboardPage* _tmp13_; - gboolean _tmp15_; - CheckerboardPage* _tmp16_; - gboolean _tmp17_; + CheckerboardPage* _tmp14_; #line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2853,64 +3353,60 @@ static void library_window_real_show_all (GtkWidget* base) { #line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = _tmp6_; #line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = g_variant_get_boolean (_tmp7_); -#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = !_tmp8_; + _tmp8_ = !g_variant_get_boolean (_tmp7_); #line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp7_); #line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp9_) { -#line 2864 "LibraryWindow.c" - GtkFrame* _tmp10_; + if (_tmp8_) { +#line 3362 "LibraryWindow.c" + GtkFrame* _tmp9_; #line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = self->priv->bottom_frame; + _tmp9_ = self->priv->bottom_frame; #line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget)); -#line 2870 "LibraryWindow.c" + gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); +#line 3368 "LibraryWindow.c" } #line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); + _tmp10_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); #line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp11_) : NULL; + _tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp10_) : NULL; #line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp12_ == NULL) { + if (_tmp11_ == NULL) { #line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp11_); -#line 2880 "LibraryWindow.c" + _g_object_unref0 (_tmp10_); +#line 3378 "LibraryWindow.c" } #line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - current_page = _tmp12_; + current_page = _tmp11_; #line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = current_page; + _tmp12_ = current_page; #line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp13_ != NULL) { -#line 2888 "LibraryWindow.c" - CheckerboardPage* _tmp14_; + if (_tmp12_ != NULL) { +#line 3386 "LibraryWindow.c" + CheckerboardPage* _tmp13_; #line 355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = current_page; + _tmp13_ = current_page; #line 355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_init_view_filter (self, _tmp14_); -#line 2894 "LibraryWindow.c" + library_window_init_view_filter (self, _tmp13_); +#line 3392 "LibraryWindow.c" } #line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = library_window_should_show_search_bar (self); -#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = current_page; + _tmp14_ = current_page; #line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_toggle_search_bar (self, _tmp15_, _tmp16_); + library_window_toggle_search_bar (self, library_window_should_show_search_bar (self), _tmp14_); #line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = library_window_is_sidebar_visible (self); -#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_set_sidebar_visible (self, _tmp17_); + library_window_set_sidebar_visible (self, library_window_is_sidebar_visible (self)); #line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (current_page); #line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (basic_properties_action); -#line 2910 "LibraryWindow.c" +#line 3404 "LibraryWindow.c" } -LibraryWindow* library_window_get_app (void) { +LibraryWindow* +library_window_get_app (void) +{ LibraryWindow* result = NULL; AppWindow* _tmp0_; AppWindow* _tmp1_; @@ -2927,15 +3423,17 @@ LibraryWindow* library_window_get_app (void) { result = _tmp2_; #line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 2931 "LibraryWindow.c" +#line 3427 "LibraryWindow.c" } -gboolean library_window_is_mount_uri_supported (const gchar* uri) { +gboolean +library_window_is_mount_uri_supported (const gchar* uri) +{ gboolean result = FALSE; #line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (uri != NULL, FALSE); -#line 2939 "LibraryWindow.c" +#line 3437 "LibraryWindow.c" { const gchar** scheme_collection = NULL; gint scheme_collection_length1 = 0; @@ -2947,37 +3445,31 @@ gboolean library_window_is_mount_uri_supported (const gchar* uri) { scheme_collection_length1 = G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES); #line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" for (scheme_it = 0; scheme_it < G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES); scheme_it = scheme_it + 1) { -#line 2951 "LibraryWindow.c" +#line 3449 "LibraryWindow.c" gchar* _tmp0_; gchar* scheme = NULL; #line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = g_strdup (scheme_collection[scheme_it]); #line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" scheme = _tmp0_; -#line 2958 "LibraryWindow.c" +#line 3456 "LibraryWindow.c" { const gchar* _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; -#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = uri; #line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = scheme; + _tmp1_ = scheme; #line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = g_str_has_prefix (_tmp1_, _tmp2_); -#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp3_) { + if (g_str_has_prefix (uri, _tmp1_)) { #line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; #line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (scheme); #line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 2977 "LibraryWindow.c" +#line 3469 "LibraryWindow.c" } #line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (scheme); -#line 2981 "LibraryWindow.c" +#line 3473 "LibraryWindow.c" } } } @@ -2985,11 +3477,13 @@ gboolean library_window_is_mount_uri_supported (const gchar* uri) { result = FALSE; #line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 2989 "LibraryWindow.c" +#line 3481 "LibraryWindow.c" } -static gchar* library_window_real_get_app_role (AppWindow* base) { +static gchar* +library_window_real_get_app_role (AppWindow* base) +{ LibraryWindow * self; gchar* result = NULL; gchar* _tmp0_; @@ -3001,16 +3495,18 @@ static gchar* library_window_real_get_app_role (AppWindow* base) { result = _tmp0_; #line 380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3005 "LibraryWindow.c" +#line 3499 "LibraryWindow.c" } -void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) { +void +library_window_rename_tag_in_sidebar (LibraryWindow* self, + Tag* tag) +{ TagsSidebarEntry* entry = NULL; TagsBranch* _tmp0_; - Tag* _tmp1_; + TagsSidebarEntry* _tmp1_; TagsSidebarEntry* _tmp2_; - TagsSidebarEntry* _tmp3_; #line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3018,42 +3514,42 @@ void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) { #line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->tags_branch; #line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = tag; -#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = tags_branch_get_entry_for_tag (_tmp0_, _tmp1_); + _tmp1_ = tags_branch_get_entry_for_tag (_tmp0_, tag); #line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - entry = _tmp2_; + entry = _tmp1_; #line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = entry; + _tmp2_ = entry; #line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp3_ != NULL) { -#line 3031 "LibraryWindow.c" - SidebarTree* _tmp4_; - TagsSidebarEntry* _tmp5_; + if (_tmp2_ != NULL) { +#line 3525 "LibraryWindow.c" + SidebarTree* _tmp3_; + TagsSidebarEntry* _tmp4_; #line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = self->priv->sidebar_tree; + _tmp3_ = self->priv->sidebar_tree; #line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = entry; + _tmp4_ = entry; #line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 3040 "LibraryWindow.c" + sidebar_tree_rename_entry_in_place (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); +#line 3534 "LibraryWindow.c" } else { #line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_debug ("LibraryWindow.vala:388: No tag entry found for rename"); -#line 3044 "LibraryWindow.c" +#line 3538 "LibraryWindow.c" } #line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 3048 "LibraryWindow.c" +#line 3542 "LibraryWindow.c" } -void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event) { +void +library_window_rename_event_in_sidebar (LibraryWindow* self, + Event* event) +{ EventsEventEntry* entry = NULL; EventsBranch* _tmp0_; - Event* _tmp1_; + EventsEventEntry* _tmp1_; EventsEventEntry* _tmp2_; - EventsEventEntry* _tmp3_; #line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3061,42 +3557,42 @@ void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event) #line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->events_branch; #line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = event; -#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = events_branch_get_entry_for_event (_tmp0_, _tmp1_); + _tmp1_ = events_branch_get_entry_for_event (_tmp0_, event); #line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - entry = _tmp2_; + entry = _tmp1_; #line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = entry; + _tmp2_ = entry; #line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp3_ != NULL) { -#line 3074 "LibraryWindow.c" - SidebarTree* _tmp4_; - EventsEventEntry* _tmp5_; + if (_tmp2_ != NULL) { +#line 3568 "LibraryWindow.c" + SidebarTree* _tmp3_; + EventsEventEntry* _tmp4_; #line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = self->priv->sidebar_tree; + _tmp3_ = self->priv->sidebar_tree; #line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = entry; + _tmp4_ = entry; #line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 3083 "LibraryWindow.c" + sidebar_tree_rename_entry_in_place (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); +#line 3577 "LibraryWindow.c" } else { #line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_debug ("LibraryWindow.vala:396: No event entry found for rename"); -#line 3087 "LibraryWindow.c" +#line 3581 "LibraryWindow.c" } #line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 3091 "LibraryWindow.c" +#line 3585 "LibraryWindow.c" } -void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch* search) { +void +library_window_rename_search_in_sidebar (LibraryWindow* self, + SavedSearch* search) +{ SearchesSidebarEntry* entry = NULL; SearchesBranch* _tmp0_; - SavedSearch* _tmp1_; + SearchesSidebarEntry* _tmp1_; SearchesSidebarEntry* _tmp2_; - SearchesSidebarEntry* _tmp3_; #line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3104,37 +3600,37 @@ void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch* #line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->saved_search_branch; #line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = search; + _tmp1_ = searches_branch_get_entry_for_saved_search (_tmp0_, search); #line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = searches_branch_get_entry_for_saved_search (_tmp0_, _tmp1_); -#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - entry = _tmp2_; + entry = _tmp1_; #line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = entry; + _tmp2_ = entry; #line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp3_ != NULL) { -#line 3117 "LibraryWindow.c" - SidebarTree* _tmp4_; - SearchesSidebarEntry* _tmp5_; + if (_tmp2_ != NULL) { +#line 3611 "LibraryWindow.c" + SidebarTree* _tmp3_; + SearchesSidebarEntry* _tmp4_; #line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = self->priv->sidebar_tree; + _tmp3_ = self->priv->sidebar_tree; #line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = entry; + _tmp4_ = entry; #line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 3126 "LibraryWindow.c" + sidebar_tree_rename_entry_in_place (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); +#line 3620 "LibraryWindow.c" } else { #line 404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_debug ("LibraryWindow.vala:404: No search entry found for rename"); -#line 3130 "LibraryWindow.c" +#line 3624 "LibraryWindow.c" } #line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 3134 "LibraryWindow.c" +#line 3628 "LibraryWindow.c" } -static void library_window_real_on_quit (AppWindow* base) { +static void +library_window_real_on_quit (AppWindow* base) +{ LibraryWindow * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; @@ -3175,133 +3671,133 @@ static void library_window_real_on_quit (AppWindow* base) { _g_object_unref0 (_tmp5_); #line 412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" APP_WINDOW_CLASS (library_window_parent_class)->on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)); -#line 3179 "LibraryWindow.c" +#line 3675 "LibraryWindow.c" } -static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, CollectionPage* page) { +static Photo* +library_window_get_start_fullscreen_photo (LibraryWindow* self, + CollectionPage* page) +{ Photo* result = NULL; ViewCollection* view = NULL; - CollectionPage* _tmp0_; - ViewCollection* _tmp1_; - GeeList* _tmp2_ = NULL; - ViewCollection* _tmp3_; - gint _tmp4_; + ViewCollection* _tmp0_; + GeeList* _tmp1_ = NULL; + ViewCollection* _tmp2_; GeeList* sources = NULL; - GeeList* _tmp9_; - Photo* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; - GeeList* _tmp12_; + GeeList* _tmp7_; + Photo* _tmp8_ = NULL; + gboolean _tmp9_ = FALSE; + GeeList* _tmp10_; #line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), NULL); #line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_COLLECTION_PAGE (page), NULL); #line 416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = page; + _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_PAGE, Page)); #line 416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page)); -#line 416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - view = _tmp1_; -#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = view; + view = _tmp0_; #line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = view_collection_get_selected_count (_tmp3_); + _tmp2_ = view; #line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp4_ > 0) { -#line 3212 "LibraryWindow.c" - ViewCollection* _tmp5_; - GeeList* _tmp6_; + if (view_collection_get_selected_count (_tmp2_) > 0) { +#line 3705 "LibraryWindow.c" + ViewCollection* _tmp3_; + GeeList* _tmp4_; #line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = view; + _tmp3_ = view; #line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = view_collection_get_selected_sources_of_type (_tmp5_, TYPE_LIBRARY_PHOTO); + _tmp4_ = view_collection_get_selected_sources_of_type (_tmp3_, TYPE_LIBRARY_PHOTO); #line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = _tmp6_; -#line 3223 "LibraryWindow.c" + _tmp1_ = _tmp4_; +#line 3716 "LibraryWindow.c" } else { - ViewCollection* _tmp7_; - GeeList* _tmp8_; + ViewCollection* _tmp5_; + GeeList* _tmp6_; #line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = view; + _tmp5_ = view; #line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = view_collection_get_sources_of_type (_tmp7_, TYPE_LIBRARY_PHOTO); + _tmp6_ = view_collection_get_sources_of_type (_tmp5_, TYPE_LIBRARY_PHOTO); #line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = _tmp8_; -#line 3235 "LibraryWindow.c" + _tmp1_ = _tmp6_; +#line 3728 "LibraryWindow.c" } #line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = _g_object_ref0 (_tmp2_); + _tmp7_ = _g_object_ref0 (_tmp1_); #line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - sources = _tmp9_; + sources = _tmp7_; #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = sources; + _tmp10_ = sources; #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp12_ != NULL) { -#line 3245 "LibraryWindow.c" - GeeList* _tmp13_; - gint _tmp14_; - gint _tmp15_; + if (_tmp10_ != NULL) { +#line 3738 "LibraryWindow.c" + GeeList* _tmp11_; + gint _tmp12_; + gint _tmp13_; #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = sources; + _tmp11_ = sources; #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = _tmp14_; + _tmp13_ = _tmp12_; #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = _tmp15_ != 0; -#line 3257 "LibraryWindow.c" + _tmp9_ = _tmp13_ != 0; +#line 3750 "LibraryWindow.c" } else { #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = FALSE; -#line 3261 "LibraryWindow.c" + _tmp9_ = FALSE; +#line 3754 "LibraryWindow.c" } #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp11_) { -#line 3265 "LibraryWindow.c" - GeeList* _tmp16_; - gpointer _tmp17_; + if (_tmp9_) { +#line 3758 "LibraryWindow.c" + GeeList* _tmp14_; + gpointer _tmp15_; #line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = sources; + _tmp14_ = sources; #line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = gee_list_get (_tmp16_, 0); + _tmp15_ = gee_list_get (_tmp14_, 0); #line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp17_, TYPE_PHOTO, Photo); -#line 3276 "LibraryWindow.c" + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp15_, TYPE_PHOTO, Photo); +#line 3769 "LibraryWindow.c" } else { #line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = NULL; -#line 3282 "LibraryWindow.c" + _tmp8_ = NULL; +#line 3775 "LibraryWindow.c" } #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - result = _tmp10_; + result = _tmp8_; #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (sources); #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3294 "LibraryWindow.c" +#line 3787 "LibraryWindow.c" } -static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* page, CollectionPage* * collection, Photo* * start, ViewCollection* * view_collection) { +static gboolean +library_window_get_fullscreen_photo (LibraryWindow* self, + Page* page, + CollectionPage* * collection, + Photo* * start, + ViewCollection* * view_collection) +{ CollectionPage* _vala_collection = NULL; Photo* _vala_start = NULL; ViewCollection* _vala_view_collection = NULL; gboolean result = FALSE; - Page* _tmp0_; - Page* _tmp8_; - Page* _tmp30_; #line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); #line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3319,36 +3815,31 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_view_collection = NULL; #line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = page; -#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_COLLECTION_PAGE)) { -#line 3326 "LibraryWindow.c" - Page* _tmp1_; - CollectionPage* _tmp2_; + if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_COLLECTION_PAGE)) { +#line 3820 "LibraryWindow.c" + CollectionPage* _tmp0_; Photo* photo = NULL; - CollectionPage* _tmp3_; + CollectionPage* _tmp1_; + Photo* _tmp2_; + Photo* _tmp3_; Photo* _tmp4_; Photo* _tmp5_; - Photo* _tmp6_; - Photo* _tmp7_; -#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = page; #line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COLLECTION_PAGE, CollectionPage)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_COLLECTION_PAGE, CollectionPage)); #line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); #line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_collection = _tmp2_; + _vala_collection = _tmp0_; #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = _vala_collection; + _tmp1_ = _vala_collection; #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = library_window_get_start_fullscreen_photo (self, _tmp3_); + _tmp2_ = library_window_get_start_fullscreen_photo (self, _tmp1_); #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - photo = _tmp4_; + photo = _tmp2_; #line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = photo; + _tmp3_ = photo; #line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp5_ == NULL) { + if (_tmp3_ == NULL) { #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3357,44 +3848,44 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3361 "LibraryWindow.c" +#line 3852 "LibraryWindow.c" } else { #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3365 "LibraryWindow.c" +#line 3856 "LibraryWindow.c" } #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3371 "LibraryWindow.c" +#line 3862 "LibraryWindow.c" } else { #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3375 "LibraryWindow.c" +#line 3866 "LibraryWindow.c" } #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3381 "LibraryWindow.c" +#line 3872 "LibraryWindow.c" } else { #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3385 "LibraryWindow.c" +#line 3876 "LibraryWindow.c" } #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3389 "LibraryWindow.c" +#line 3880 "LibraryWindow.c" } #line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = photo; + _tmp4_ = photo; #line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = _g_object_ref0 (_tmp6_); + _tmp5_ = _g_object_ref0 (_tmp4_); #line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); #line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_start = _tmp7_; + _vala_start = _tmp5_; #line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); #line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3407,78 +3898,70 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3411 "LibraryWindow.c" +#line 3902 "LibraryWindow.c" } else { #line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3415 "LibraryWindow.c" +#line 3906 "LibraryWindow.c" } #line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3421 "LibraryWindow.c" +#line 3912 "LibraryWindow.c" } else { #line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3425 "LibraryWindow.c" +#line 3916 "LibraryWindow.c" } #line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3431 "LibraryWindow.c" +#line 3922 "LibraryWindow.c" } else { #line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3435 "LibraryWindow.c" +#line 3926 "LibraryWindow.c" } #line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3439 "LibraryWindow.c" +#line 3930 "LibraryWindow.c" } #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = page; -#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENTS_DIRECTORY_PAGE)) { -#line 3445 "LibraryWindow.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_EVENTS_DIRECTORY_PAGE)) { +#line 3934 "LibraryWindow.c" ViewCollection* view = NULL; - Page* _tmp9_; - ViewCollection* _tmp10_; - ViewCollection* _tmp11_; - gint _tmp12_; + ViewCollection* _tmp6_; + ViewCollection* _tmp7_; Event* event = NULL; - ViewCollection* _tmp13_; - DataObject* _tmp14_; - DataView* _tmp15_; - DataSource* _tmp16_; - Event* _tmp17_; - Event* _tmp18_; + ViewCollection* _tmp8_; + DataObject* _tmp9_; + DataView* _tmp10_; + DataSource* _tmp11_; + Event* _tmp12_; + Event* _tmp13_; EventsEventEntry* entry = NULL; - EventsBranch* _tmp19_; - Event* _tmp20_; - EventsEventEntry* _tmp21_; - EventsEventEntry* _tmp22_; - EventsEventEntry* _tmp23_; - Page* _tmp24_; + EventsBranch* _tmp14_; + Event* _tmp15_; + EventsEventEntry* _tmp16_; + EventsEventEntry* _tmp17_; + EventsEventEntry* _tmp18_; + Page* _tmp19_; Photo* photo = NULL; - CollectionPage* _tmp25_; - Photo* _tmp26_; - Photo* _tmp27_; - Photo* _tmp28_; - Photo* _tmp29_; -#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = page; + CollectionPage* _tmp20_; + Photo* _tmp21_; + Photo* _tmp22_; + Photo* _tmp23_; + Photo* _tmp24_; #line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = page_get_view (_tmp9_); + _tmp6_ = page_get_view (page); #line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - view = _tmp10_; + view = _tmp6_; #line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = view; -#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp7_ = view; #line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp12_ == 0) { + if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection)) == 0) { #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3487,54 +3970,54 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3491 "LibraryWindow.c" +#line 3974 "LibraryWindow.c" } else { #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3495 "LibraryWindow.c" +#line 3978 "LibraryWindow.c" } #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3501 "LibraryWindow.c" +#line 3984 "LibraryWindow.c" } else { #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3505 "LibraryWindow.c" +#line 3988 "LibraryWindow.c" } #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3511 "LibraryWindow.c" +#line 3994 "LibraryWindow.c" } else { #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3515 "LibraryWindow.c" +#line 3998 "LibraryWindow.c" } #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3519 "LibraryWindow.c" +#line 4002 "LibraryWindow.c" } #line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = view; + _tmp8_ = view; #line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), 0); + _tmp9_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), 0); #line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_VIEW, DataView); + _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_VIEW, DataView); #line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = data_view_get_source (_tmp15_); + _tmp11_ = data_view_get_source (_tmp10_); #line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_EVENT, Event); + _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_EVENT, Event); #line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp10_); #line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - event = _tmp17_; + event = _tmp12_; #line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = event; + _tmp13_ = event; #line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp18_ == NULL) { + if (_tmp13_ == NULL) { #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3545,48 +4028,48 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3549 "LibraryWindow.c" +#line 4032 "LibraryWindow.c" } else { #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3553 "LibraryWindow.c" +#line 4036 "LibraryWindow.c" } #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3559 "LibraryWindow.c" +#line 4042 "LibraryWindow.c" } else { #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3563 "LibraryWindow.c" +#line 4046 "LibraryWindow.c" } #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3569 "LibraryWindow.c" +#line 4052 "LibraryWindow.c" } else { #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3573 "LibraryWindow.c" +#line 4056 "LibraryWindow.c" } #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3577 "LibraryWindow.c" +#line 4060 "LibraryWindow.c" } #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = self->priv->events_branch; + _tmp14_ = self->priv->events_branch; #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp20_ = event; + _tmp15_ = event; #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp21_ = events_branch_get_entry_for_event (_tmp19_, _tmp20_); + _tmp16_ = events_branch_get_entry_for_event (_tmp14_, _tmp15_); #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - entry = _tmp21_; + entry = _tmp16_; #line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_ = entry; + _tmp17_ = entry; #line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp22_ == NULL) { + if (_tmp17_ == NULL) { #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3599,54 +4082,54 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3603 "LibraryWindow.c" +#line 4086 "LibraryWindow.c" } else { #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3607 "LibraryWindow.c" +#line 4090 "LibraryWindow.c" } #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3613 "LibraryWindow.c" +#line 4096 "LibraryWindow.c" } else { #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3617 "LibraryWindow.c" +#line 4100 "LibraryWindow.c" } #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3623 "LibraryWindow.c" +#line 4106 "LibraryWindow.c" } else { #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3627 "LibraryWindow.c" +#line 4110 "LibraryWindow.c" } #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3631 "LibraryWindow.c" +#line 4114 "LibraryWindow.c" } #line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp23_ = entry; + _tmp18_ = entry; #line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); + _tmp19_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); #line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); #line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_collection = G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_EVENT_PAGE, EventPage), TYPE_COLLECTION_PAGE, CollectionPage); + _vala_collection = G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_EVENT_PAGE, EventPage), TYPE_COLLECTION_PAGE, CollectionPage); #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp25_ = _vala_collection; + _tmp20_ = _vala_collection; #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp26_ = library_window_get_start_fullscreen_photo (self, _tmp25_); + _tmp21_ = library_window_get_start_fullscreen_photo (self, _tmp20_); #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - photo = _tmp26_; + photo = _tmp21_; #line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp27_ = photo; + _tmp22_ = photo; #line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp27_ == NULL) { + if (_tmp22_ == NULL) { #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3661,44 +4144,44 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3665 "LibraryWindow.c" +#line 4148 "LibraryWindow.c" } else { #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3669 "LibraryWindow.c" +#line 4152 "LibraryWindow.c" } #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3675 "LibraryWindow.c" +#line 4158 "LibraryWindow.c" } else { #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3679 "LibraryWindow.c" +#line 4162 "LibraryWindow.c" } #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3685 "LibraryWindow.c" +#line 4168 "LibraryWindow.c" } else { #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3689 "LibraryWindow.c" +#line 4172 "LibraryWindow.c" } #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3693 "LibraryWindow.c" +#line 4176 "LibraryWindow.c" } #line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp28_ = photo; + _tmp23_ = photo; #line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp29_ = _g_object_ref0 (_tmp28_); + _tmp24_ = _g_object_ref0 (_tmp23_); #line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); #line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_start = _tmp29_; + _vala_start = _tmp24_; #line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); #line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3717,72 +4200,66 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3721 "LibraryWindow.c" +#line 4204 "LibraryWindow.c" } else { #line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3725 "LibraryWindow.c" +#line 4208 "LibraryWindow.c" } #line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3731 "LibraryWindow.c" +#line 4214 "LibraryWindow.c" } else { #line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3735 "LibraryWindow.c" +#line 4218 "LibraryWindow.c" } #line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3741 "LibraryWindow.c" +#line 4224 "LibraryWindow.c" } else { #line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3745 "LibraryWindow.c" +#line 4228 "LibraryWindow.c" } #line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3749 "LibraryWindow.c" +#line 4232 "LibraryWindow.c" } #line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp30_ = page; -#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO_PAGE)) { -#line 3755 "LibraryWindow.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_LIBRARY_PHOTO_PAGE)) { +#line 4236 "LibraryWindow.c" LibraryPhotoPage* photo_page = NULL; - Page* _tmp31_; - LibraryPhotoPage* _tmp32_; + LibraryPhotoPage* _tmp25_; CollectionPage* controller = NULL; - LibraryPhotoPage* _tmp33_; - CollectionPage* _tmp34_; - CollectionPage* _tmp35_; - LibraryPhotoPage* _tmp36_; - gboolean _tmp37_; - CollectionPage* _tmp38_; - CollectionPage* _tmp39_; - LibraryPhotoPage* _tmp40_; - Photo* _tmp41_; - LibraryPhotoPage* _tmp42_; - ViewCollection* _tmp43_; -#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp31_ = page; + LibraryPhotoPage* _tmp26_; + CollectionPage* _tmp27_; + CollectionPage* _tmp28_; + LibraryPhotoPage* _tmp29_; + CollectionPage* _tmp30_; + CollectionPage* _tmp31_; + LibraryPhotoPage* _tmp32_; + Photo* _tmp33_; + LibraryPhotoPage* _tmp34_; + ViewCollection* _tmp35_; #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage)); + _tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage)); #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - photo_page = _tmp32_; + photo_page = _tmp25_; #line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp33_ = photo_page; + _tmp26_ = photo_page; #line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp34_ = library_photo_page_get_controller_page (_tmp33_); + _tmp27_ = library_photo_page_get_controller_page (_tmp26_); #line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - controller = _tmp34_; + controller = _tmp27_; #line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp35_ = controller; + _tmp28_ = controller; #line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp35_ == NULL) { + if (_tmp28_ == NULL) { #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3793,42 +4270,40 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3797 "LibraryWindow.c" +#line 4274 "LibraryWindow.c" } else { #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3801 "LibraryWindow.c" +#line 4278 "LibraryWindow.c" } #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3807 "LibraryWindow.c" +#line 4284 "LibraryWindow.c" } else { #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3811 "LibraryWindow.c" +#line 4288 "LibraryWindow.c" } #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3817 "LibraryWindow.c" +#line 4294 "LibraryWindow.c" } else { #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3821 "LibraryWindow.c" +#line 4298 "LibraryWindow.c" } #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3825 "LibraryWindow.c" +#line 4302 "LibraryWindow.c" } #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp36_ = photo_page; -#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp37_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp29_ = photo_page; #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (!_tmp37_) { + if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_EDITING_HOST_PAGE, EditingHostPage))) { #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3839,60 +4314,60 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3843 "LibraryWindow.c" +#line 4318 "LibraryWindow.c" } else { #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3847 "LibraryWindow.c" +#line 4322 "LibraryWindow.c" } #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3853 "LibraryWindow.c" +#line 4328 "LibraryWindow.c" } else { #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3857 "LibraryWindow.c" +#line 4332 "LibraryWindow.c" } #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3863 "LibraryWindow.c" +#line 4338 "LibraryWindow.c" } else { #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3867 "LibraryWindow.c" +#line 4342 "LibraryWindow.c" } #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3871 "LibraryWindow.c" +#line 4346 "LibraryWindow.c" } #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp38_ = controller; + _tmp30_ = controller; #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp39_ = _g_object_ref0 (_tmp38_); + _tmp31_ = _g_object_ref0 (_tmp30_); #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_collection = _tmp39_; + _vala_collection = _tmp31_; #line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp40_ = photo_page; + _tmp32_ = photo_page; #line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp41_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp33_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); #line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_start = _tmp41_; + _vala_start = _tmp33_; #line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp42_ = photo_page; + _tmp34_ = photo_page; #line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp43_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PAGE, Page)); + _tmp35_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_PAGE, Page)); #line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); #line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_view_collection = _tmp43_; + _vala_view_collection = _tmp35_; #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3903,35 +4378,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3907 "LibraryWindow.c" +#line 4382 "LibraryWindow.c" } else { #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3911 "LibraryWindow.c" +#line 4386 "LibraryWindow.c" } #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3917 "LibraryWindow.c" +#line 4392 "LibraryWindow.c" } else { #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3921 "LibraryWindow.c" +#line 4396 "LibraryWindow.c" } #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3927 "LibraryWindow.c" +#line 4402 "LibraryWindow.c" } else { #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3931 "LibraryWindow.c" +#line 4406 "LibraryWindow.c" } #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3935 "LibraryWindow.c" +#line 4410 "LibraryWindow.c" } #line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; @@ -3939,39 +4414,41 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3943 "LibraryWindow.c" +#line 4418 "LibraryWindow.c" } else { #line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3947 "LibraryWindow.c" +#line 4422 "LibraryWindow.c" } #line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3953 "LibraryWindow.c" +#line 4428 "LibraryWindow.c" } else { #line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3957 "LibraryWindow.c" +#line 4432 "LibraryWindow.c" } #line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3963 "LibraryWindow.c" +#line 4438 "LibraryWindow.c" } else { #line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3967 "LibraryWindow.c" +#line 4442 "LibraryWindow.c" } #line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3971 "LibraryWindow.c" +#line 4446 "LibraryWindow.c" } -static void library_window_real_on_fullscreen (AppWindow* base) { +static void +library_window_real_on_fullscreen (AppWindow* base) +{ LibraryWindow * self; Page* current_page = NULL; Page* _tmp0_; @@ -4004,7 +4481,7 @@ static void library_window_real_on_fullscreen (AppWindow* base) { _g_object_unref0 (current_page); #line 494 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 4008 "LibraryWindow.c" +#line 4485 "LibraryWindow.c" } #line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view = NULL; @@ -4036,7 +4513,7 @@ static void library_window_real_on_fullscreen (AppWindow* base) { _g_object_unref0 (current_page); #line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 4040 "LibraryWindow.c" +#line 4517 "LibraryWindow.c" } #line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = collection; @@ -4064,27 +4541,31 @@ static void library_window_real_on_fullscreen (AppWindow* base) { _g_object_unref0 (collection); #line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (current_page); -#line 4068 "LibraryWindow.c" +#line 4545 "LibraryWindow.c" } -static void _g_free0_ (gpointer var) { +static void +_g_free0_ (gpointer var) +{ #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" var = (g_free (var), NULL); -#line 4075 "LibraryWindow.c" +#line 4554 "LibraryWindow.c" } -static void _g_slist_free__g_free0_ (GSList* self) { -#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_slist_foreach (self, (GFunc) _g_free0_, NULL); +static inline void +_g_slist_free__g_free0_ (GSList* self) +{ #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_slist_free (self); -#line 4084 "LibraryWindow.c" + g_slist_free_full (self, (GDestroyNotify) _g_free0_); +#line 4563 "LibraryWindow.c" } -static void library_window_on_file_import (LibraryWindow* self) { +static void +library_window_on_file_import (LibraryWindow* self) +{ GtkFileChooserDialog* import_dialog = NULL; GtkFileChooserDialog* _tmp0_; GtkFileChooserDialog* _tmp1_; @@ -4100,13 +4581,12 @@ static void library_window_on_file_import (LibraryWindow* self) { gint response = 0; GtkFileChooserDialog* _tmp10_; gint _tmp11_; - gint _tmp12_; - GtkFileChooserDialog* _tmp31_; - gchar* _tmp32_; - GtkCheckButton* _tmp33_; - gboolean _tmp34_; - gboolean _tmp35_; - GtkFileChooserDialog* _tmp36_; + GtkFileChooserDialog* _tmp28_; + gchar* _tmp29_; + GtkCheckButton* _tmp30_; + gboolean _tmp31_; + gboolean _tmp32_; + GtkFileChooserDialog* _tmp33_; #line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4118,17 +4598,17 @@ static void library_window_on_file_import (LibraryWindow* self) { #line 511 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = import_dialog; #line 511 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE); + gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_file_chooser_get_type (), GtkFileChooser), FALSE); #line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = import_dialog; #line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE); + gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_file_chooser_get_type (), GtkFileChooser), TRUE); #line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = import_dialog; #line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->import_dir; #line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp4_); + gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_file_chooser_get_type (), GtkFileChooser), _tmp4_); #line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = (GtkCheckButton*) gtk_check_button_new_with_label (_ ("Recurse Into Subfolders")); #line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4146,128 +4626,122 @@ static void library_window_on_file_import (LibraryWindow* self) { #line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = recursive; #line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_file_chooser_set_extra_widget (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); + gtk_file_chooser_set_extra_widget (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_file_chooser_get_type (), GtkFileChooser), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = import_dialog; #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_dialog_get_type (), GtkDialog)); -#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - response = _tmp11_; + response = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_dialog_get_type (), GtkDialog)); #line 521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = response; + _tmp11_ = response; #line 521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp12_ == ((gint) GTK_RESPONSE_OK)) { -#line 4161 "LibraryWindow.c" - GtkFileChooserDialog* _tmp13_; - GtkResponseType _tmp14_ = 0; - GtkFileChooserDialog* _tmp15_; + if (_tmp11_ == ((gint) GTK_RESPONSE_OK)) { +#line 4639 "LibraryWindow.c" + GtkFileChooserDialog* _tmp12_; + GtkResponseType _tmp13_ = 0; + GtkFileChooserDialog* _tmp14_; + gchar* _tmp15_; gchar* _tmp16_; - gchar* _tmp17_; + GFile* _tmp17_; GFile* _tmp18_; - GFile* _tmp19_; - gboolean _tmp20_; - gboolean _tmp21_; + gboolean _tmp19_; GtkResponseType copy_files_response = 0; - GtkResponseType _tmp23_; + GtkResponseType _tmp20_; #line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = import_dialog; + _tmp12_ = import_dialog; #line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget)); -#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = import_dialog; + gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget)); #line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); + _tmp14_ = import_dialog; #line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = _tmp16_; + _tmp15_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_file_chooser_get_type (), GtkFileChooser)); #line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = g_file_new_for_uri (_tmp17_); + _tmp16_ = _tmp15_; #line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = _tmp18_; + _tmp17_ = g_file_new_for_uri (_tmp16_); #line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp20_ = app_dirs_is_in_import_dir (_tmp19_); + _tmp18_ = _tmp17_; #line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp21_ = _tmp20_; + _tmp19_ = app_dirs_is_in_import_dir (_tmp18_); #line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp19_); + _g_object_unref0 (_tmp18_); #line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp16_); #line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp21_) { + if (_tmp19_) { #line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = GTK_RESPONSE_REJECT; -#line 4199 "LibraryWindow.c" + _tmp13_ = GTK_RESPONSE_REJECT; +#line 4674 "LibraryWindow.c" } else { - GtkResponseType _tmp22_; #line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_ = copy_files_dialog (); -#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = _tmp22_; -#line 4206 "LibraryWindow.c" + _tmp13_ = copy_files_dialog (); +#line 4678 "LibraryWindow.c" } #line 524 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - copy_files_response = _tmp14_; + copy_files_response = _tmp13_; #line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp23_ = copy_files_response; + _tmp20_ = copy_files_response; #line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp23_ != GTK_RESPONSE_CANCEL) { -#line 4214 "LibraryWindow.c" - GtkFileChooserDialog* _tmp24_; - GSList* _tmp25_; - GSList* _tmp26_; - GtkResponseType _tmp27_; - GtkCheckButton* _tmp28_; - gboolean _tmp29_; - gboolean _tmp30_; + if (_tmp20_ != GTK_RESPONSE_CANCEL) { +#line 4686 "LibraryWindow.c" + GtkFileChooserDialog* _tmp21_; + GSList* _tmp22_; + GSList* _tmp23_; + GtkResponseType _tmp24_; + GtkCheckButton* _tmp25_; + gboolean _tmp26_; + gboolean _tmp27_; #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_ = import_dialog; + _tmp21_ = import_dialog; #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp25_ = gtk_file_chooser_get_uris (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); + _tmp22_ = gtk_file_chooser_get_uris (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_file_chooser_get_type (), GtkFileChooser)); #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp26_ = _tmp25_; + _tmp23_ = _tmp22_; #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp27_ = copy_files_response; + _tmp24_ = copy_files_response; #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp28_ = recursive; + _tmp25_ = recursive; #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp29_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_toggle_button_get_type (), GtkToggleButton)); + _tmp26_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp30_ = _tmp29_; + _tmp27_ = _tmp26_; #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_dispatch_import_jobs (self, _tmp26_, "folders", _tmp27_ == GTK_RESPONSE_ACCEPT, _tmp30_); + library_window_dispatch_import_jobs (self, _tmp23_, "folders", _tmp24_ == GTK_RESPONSE_ACCEPT, _tmp27_); #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - __g_slist_free__g_free0_0 (_tmp26_); -#line 4240 "LibraryWindow.c" + __g_slist_free__g_free0_0 (_tmp23_); +#line 4712 "LibraryWindow.c" } } #line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp31_ = import_dialog; + _tmp28_ = import_dialog; #line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp32_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); + _tmp29_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_file_chooser_get_type (), GtkFileChooser)); #line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (self->priv->import_dir); #line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->import_dir = _tmp32_; + self->priv->import_dir = _tmp29_; #line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp33_ = recursive; + _tmp30_ = recursive; #line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp34_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_toggle_button_get_type (), GtkToggleButton)); + _tmp31_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp35_ = _tmp34_; + _tmp32_ = _tmp31_; #line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->import_recursive = _tmp35_; + self->priv->import_recursive = _tmp32_; #line 536 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp36_ = import_dialog; + _tmp33_ = import_dialog; #line 536 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget)); #line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (recursive); #line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (import_dialog); -#line 4267 "LibraryWindow.c" +#line 4739 "LibraryWindow.c" } -static void library_window_on_external_library_import (LibraryWindow* self) { +static void +library_window_on_external_library_import (LibraryWindow* self) +{ GtkDialog* import_dialog = NULL; DataImportsUIDataImportsDialog* _tmp0_; #line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4280,16 +4754,17 @@ static void library_window_on_external_library_import (LibraryWindow* self) { gtk_dialog_run (import_dialog); #line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (import_dialog); -#line 4284 "LibraryWindow.c" +#line 4758 "LibraryWindow.c" } -static void library_window_real_update_common_action_availability (AppWindow* base, Page* old_page, Page* new_page) { +static void +library_window_real_update_common_action_availability (AppWindow* base, + Page* old_page, + Page* new_page) +{ LibraryWindow * self; - Page* _tmp0_; - Page* _tmp1_; gboolean is_checkerboard = FALSE; - Page* _tmp2_; #line 545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4297,131 +4772,109 @@ static void library_window_real_update_common_action_availability (AppWindow* ba #line 545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page)); #line 546 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = old_page; -#line 546 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = new_page; -#line 546 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - APP_WINDOW_CLASS (library_window_parent_class)->update_common_action_availability (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), _tmp0_, _tmp1_); + APP_WINDOW_CLASS (library_window_parent_class)->update_common_action_availability (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), old_page, new_page); #line 548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = new_page; -#line 548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_CHECKERBOARD_PAGE); + is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (new_page, TYPE_CHECKERBOARD_PAGE); #line 550 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplaySearchbar", is_checkerboard); #line 551 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonFind", is_checkerboard); -#line 4314 "LibraryWindow.c" +#line 4783 "LibraryWindow.c" } -static void library_window_real_update_common_actions (AppWindow* base, Page* page, gint selected_count, gint count) { +static void +library_window_real_update_common_actions (AppWindow* base, + Page* page, + gint selected_count, + gint count) +{ LibraryWindow * self; CollectionPage* collection = NULL; Photo* start = NULL; gboolean can_fullscreen = FALSE; - Page* _tmp0_; - CollectionPage* _tmp1_ = NULL; - Photo* _tmp2_ = NULL; - gboolean _tmp3_; - gboolean _tmp4_; - gboolean _tmp5_; - Page* _tmp6_; - gint _tmp7_; - gint _tmp8_; + CollectionPage* _tmp0_ = NULL; + Photo* _tmp1_ = NULL; + gboolean _tmp2_; #line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); #line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = page; -#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = library_window_get_fullscreen_photo (self, _tmp0_, &_tmp1_, &_tmp2_, NULL); + _tmp2_ = library_window_get_fullscreen_photo (self, page, &_tmp0_, &_tmp1_, NULL); #line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (collection); #line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - collection = _tmp1_; + collection = _tmp0_; #line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (start); #line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - start = _tmp2_; + start = _tmp1_; #line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - can_fullscreen = _tmp3_; + can_fullscreen = _tmp2_; #line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = library_window_can_empty_trash (self); -#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", _tmp4_); + app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", library_window_can_empty_trash (self)); #line 563 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", TRUE); #line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = library_window_can_jump_to_event (self); -#line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", _tmp5_); + app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", library_window_can_jump_to_event (self)); #line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonFullscreen", can_fullscreen); #line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = page; -#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = selected_count; -#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = count; -#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - APP_WINDOW_CLASS (library_window_parent_class)->update_common_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), _tmp6_, _tmp7_, _tmp8_); + APP_WINDOW_CLASS (library_window_parent_class)->update_common_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), page, selected_count, count); #line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (start); #line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (collection); -#line 4374 "LibraryWindow.c" +#line 4830 "LibraryWindow.c" } -static void library_window_on_trashcan_contents_altered (LibraryWindow* self) { - gboolean _tmp0_; +static void +library_window_on_trashcan_contents_altered (LibraryWindow* self) +{ #line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = library_window_can_empty_trash (self); -#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", _tmp0_); -#line 4386 "LibraryWindow.c" + app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", library_window_can_empty_trash (self)); +#line 4841 "LibraryWindow.c" } -static gboolean library_window_can_empty_trash (LibraryWindow* self) { +static gboolean +library_window_can_empty_trash (LibraryWindow* self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; LibraryPhotoSourceCollection* _tmp1_; - gint _tmp2_; #line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); #line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = library_photo_global; #line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp2_ > 0) { + if (media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)) > 0) { #line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = TRUE; -#line 4405 "LibraryWindow.c" +#line 4859 "LibraryWindow.c" } else { - VideoSourceCollection* _tmp3_; - gint _tmp4_; -#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = video_global; + VideoSourceCollection* _tmp2_; #line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _tmp2_ = video_global; #line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = _tmp4_ > 0; -#line 4415 "LibraryWindow.c" + _tmp0_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)) > 0; +#line 4866 "LibraryWindow.c" } #line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp0_; #line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4421 "LibraryWindow.c" +#line 4872 "LibraryWindow.c" } -static void library_window_on_empty_trash (LibraryWindow* self) { +static void +library_window_on_empty_trash (LibraryWindow* self) +{ GeeArrayList* to_remove = NULL; GeeArrayList* _tmp0_; LibraryPhotoSourceCollection* _tmp1_; @@ -4470,11 +4923,13 @@ static void library_window_on_empty_trash (LibraryWindow* self) { _command_manager_unref0 (_tmp8_); #line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (to_remove); -#line 4474 "LibraryWindow.c" +#line 4927 "LibraryWindow.c" } -static void library_window_on_new_search (LibraryWindow* self) { +static void +library_window_on_new_search (LibraryWindow* self) +{ SavedSearchDialog* _tmp0_; SavedSearchDialog* _tmp1_; #line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4489,11 +4944,13 @@ static void library_window_on_new_search (LibraryWindow* self) { saved_search_dialog_show (_tmp1_); #line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 4493 "LibraryWindow.c" +#line 4948 "LibraryWindow.c" } -static gboolean library_window_can_jump_to_event (LibraryWindow* self) { +static gboolean +library_window_can_jump_to_event (LibraryWindow* self) +{ gboolean result = FALSE; ViewCollection* view = NULL; Page* _tmp0_; @@ -4501,7 +4958,6 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) { ViewCollection* _tmp2_; ViewCollection* _tmp3_; ViewCollection* _tmp4_; - gint _tmp5_; #line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); #line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4519,24 +4975,22 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) { #line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = view; #line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = view_collection_get_selected_count (_tmp4_); -#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp5_ == 1) { -#line 4526 "LibraryWindow.c" + if (view_collection_get_selected_count (_tmp4_) == 1) { +#line 4980 "LibraryWindow.c" DataSource* selected_source = NULL; - ViewCollection* _tmp6_; + ViewCollection* _tmp5_; + DataSource* _tmp6_; DataSource* _tmp7_; - DataSource* _tmp8_; #line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = view; + _tmp5_ = view; #line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = view_collection_get_selected_source_at (_tmp6_, 0); + _tmp6_ = view_collection_get_selected_source_at (_tmp5_, 0); #line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - selected_source = _tmp7_; + selected_source = _tmp6_; #line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = selected_source; + _tmp7_ = selected_source; #line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENT)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_EVENT)) { #line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; #line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4545,45 +4999,45 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) { _data_collection_unref0 (view); #line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4549 "LibraryWindow.c" +#line 5003 "LibraryWindow.c" } else { - DataSource* _tmp9_; + DataSource* _tmp8_; #line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = selected_source; + _tmp8_ = selected_source; #line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_MEDIA_SOURCE)) { -#line 4556 "LibraryWindow.c" - ViewCollection* _tmp10_; - DataSource* _tmp11_; - MediaSource* _tmp12_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_MEDIA_SOURCE)) { +#line 5010 "LibraryWindow.c" + ViewCollection* _tmp9_; + DataSource* _tmp10_; + MediaSource* _tmp11_; + Event* _tmp12_; Event* _tmp13_; - Event* _tmp14_; - gboolean _tmp15_; + gboolean _tmp14_; #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = view; + _tmp9_ = view; #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = view_collection_get_selected_source_at (_tmp10_, 0); + _tmp10_ = view_collection_get_selected_source_at (_tmp9_, 0); #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource); #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = media_source_get_event (_tmp12_); + _tmp12_ = media_source_get_event (_tmp11_); #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = _tmp14_ != NULL; + _tmp14_ = _tmp13_ != NULL; #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp13_); #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp11_); #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - result = _tmp15_; + result = _tmp14_; #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (selected_source); #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4587 "LibraryWindow.c" +#line 5041 "LibraryWindow.c" } else { #line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; @@ -4593,12 +5047,12 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) { _data_collection_unref0 (view); #line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4597 "LibraryWindow.c" +#line 5051 "LibraryWindow.c" } } #line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (selected_source); -#line 4602 "LibraryWindow.c" +#line 5056 "LibraryWindow.c" } else { #line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; @@ -4606,31 +5060,32 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) { _data_collection_unref0 (view); #line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4610 "LibraryWindow.c" +#line 5064 "LibraryWindow.c" } #line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 4614 "LibraryWindow.c" +#line 5068 "LibraryWindow.c" } -static void library_window_on_jump_to_event (LibraryWindow* self) { +static void +library_window_on_jump_to_event (LibraryWindow* self) +{ ViewCollection* view = NULL; Page* _tmp0_; Page* _tmp1_; ViewCollection* _tmp2_; ViewCollection* _tmp3_; ViewCollection* _tmp4_; - gint _tmp5_; MediaSource* media = NULL; - ViewCollection* _tmp6_; - DataSource* _tmp7_; + ViewCollection* _tmp5_; + DataSource* _tmp6_; + MediaSource* _tmp7_; MediaSource* _tmp8_; MediaSource* _tmp9_; - MediaSource* _tmp10_; + Event* _tmp10_; Event* _tmp11_; - Event* _tmp12_; - gboolean _tmp13_; + gboolean _tmp12_; #line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4648,85 +5103,87 @@ static void library_window_on_jump_to_event (LibraryWindow* self) { #line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = view; #line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = view_collection_get_selected_count (_tmp4_); -#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp5_ != 1) { + if (view_collection_get_selected_count (_tmp4_) != 1) { #line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); #line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 4659 "LibraryWindow.c" +#line 5112 "LibraryWindow.c" } #line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = view; + _tmp5_ = view; #line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = view_collection_get_selected_source_at (_tmp6_, 0); + _tmp6_ = view_collection_get_selected_source_at (_tmp5_, 0); #line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp7_) : NULL; + _tmp7_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp6_) : NULL; #line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp8_ == NULL) { + if (_tmp7_ == NULL) { #line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp7_); -#line 4671 "LibraryWindow.c" + _g_object_unref0 (_tmp6_); +#line 5124 "LibraryWindow.c" } #line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - media = _tmp8_; + media = _tmp7_; #line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = media; + _tmp8_ = media; #line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp9_ == NULL) { + if (_tmp8_ == NULL) { #line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (media); #line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); #line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 4685 "LibraryWindow.c" +#line 5138 "LibraryWindow.c" } #line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = media; + _tmp9_ = media; #line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = media_source_get_event (_tmp10_); + _tmp10_ = media_source_get_event (_tmp9_); #line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = _tmp12_ != NULL; + _tmp12_ = _tmp11_ != NULL; #line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp11_); #line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp13_) { -#line 4699 "LibraryWindow.c" - MediaSource* _tmp14_; + if (_tmp12_) { +#line 5152 "LibraryWindow.c" + MediaSource* _tmp13_; + Event* _tmp14_; Event* _tmp15_; - Event* _tmp16_; #line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = media; + _tmp13_ = media; #line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = media_source_get_event (_tmp14_); + _tmp14_ = media_source_get_event (_tmp13_); #line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_switch_to_event (self, _tmp16_); + library_window_switch_to_event (self, _tmp15_); #line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp16_); -#line 4713 "LibraryWindow.c" + _g_object_unref0 (_tmp15_); +#line 5166 "LibraryWindow.c" } #line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (media); #line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 4719 "LibraryWindow.c" +#line 5172 "LibraryWindow.c" } -static GVariant* _variant_new5 (gboolean value) { +static GVariant* +_variant_new5 (gboolean value) +{ #line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 4726 "LibraryWindow.c" +#line 5181 "LibraryWindow.c" } -static void library_window_on_find (LibraryWindow* self) { +static void +library_window_on_find (LibraryWindow* self) +{ GAction* action = NULL; GAction* _tmp0_; GAction* _tmp1_; @@ -4752,23 +5209,24 @@ static void library_window_on_find (LibraryWindow* self) { search_filter_toolbar_take_focus (_tmp3_); #line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (action); -#line 4756 "LibraryWindow.c" +#line 5213 "LibraryWindow.c" } -static void library_window_on_media_altered (LibraryWindow* self) { - gboolean _tmp0_; +static void +library_window_on_media_altered (LibraryWindow* self) +{ #line 629 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = library_window_can_jump_to_event (self); -#line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", _tmp0_); -#line 4768 "LibraryWindow.c" + app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", library_window_can_jump_to_event (self)); +#line 5224 "LibraryWindow.c" } -static void library_window_on_clear_search (LibraryWindow* self) { +static void +library_window_on_clear_search (LibraryWindow* self) +{ gboolean _tmp0_; #line 633 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); @@ -4776,18 +5234,20 @@ static void library_window_on_clear_search (LibraryWindow* self) { _tmp0_ = self->priv->is_search_toolbar_visible; #line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_) { -#line 4780 "LibraryWindow.c" +#line 5238 "LibraryWindow.c" SearchFilterActions* _tmp1_; #line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->search_actions; #line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_filter_actions_reset (_tmp1_); -#line 4786 "LibraryWindow.c" +#line 5244 "LibraryWindow.c" } } -gint library_window_get_events_sort (LibraryWindow* self) { +gint +library_window_get_events_sort (LibraryWindow* self) +{ gint result = 0; GSimpleAction* action = NULL; GAction* _tmp0_; @@ -4806,7 +5266,7 @@ gint library_window_get_events_sort (LibraryWindow* self) { _tmp3_ = action; #line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 4810 "LibraryWindow.c" +#line 5270 "LibraryWindow.c" gint _tmp4_ = 0; GSimpleAction* _tmp5_; GVariant* _tmp6_; @@ -4832,19 +5292,19 @@ gint library_window_get_events_sort (LibraryWindow* self) { if (_tmp10_) { #line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = 0; -#line 4836 "LibraryWindow.c" +#line 5296 "LibraryWindow.c" } else { #line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = 1; -#line 4840 "LibraryWindow.c" +#line 5300 "LibraryWindow.c" } #line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp4_; -#line 4844 "LibraryWindow.c" +#line 5304 "LibraryWindow.c" } else { #line 643 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = 1; -#line 4848 "LibraryWindow.c" +#line 5308 "LibraryWindow.c" } #line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp2_; @@ -4852,17 +5312,18 @@ gint library_window_get_events_sort (LibraryWindow* self) { _g_object_unref0 (action); #line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4856 "LibraryWindow.c" +#line 5316 "LibraryWindow.c" } -static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleAction* action, GVariant* value) { +static void +library_window_on_events_sort_changed (LibraryWindow* self, + GSimpleAction* action, + GVariant* value) +{ ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - GVariant* _tmp2_; - const gchar* _tmp3_; - GSimpleAction* _tmp4_; - GVariant* _tmp5_; + const gchar* _tmp2_; #line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4872,300 +5333,277 @@ static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleA #line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; #line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = value; + _tmp2_ = g_variant_get_string (value, NULL); #line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = g_variant_get_string (_tmp2_, NULL); -#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - configuration_facade_set_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), g_strcmp0 (_tmp3_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0); + configuration_facade_set_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), g_strcmp0 (_tmp2_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0); #line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); #line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = action; -#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = value; -#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_simple_action_set_state (_tmp4_, _tmp5_); -#line 4889 "LibraryWindow.c" + g_simple_action_set_state (action, value); +#line 5344 "LibraryWindow.c" } -static void library_window_on_preferences (LibraryWindow* self) { +static void +library_window_on_preferences (LibraryWindow* self) +{ #line 654 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" preferences_dialog_show_preferences (); -#line 4898 "LibraryWindow.c" +#line 5355 "LibraryWindow.c" } -static void library_window_on_display_basic_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value) { +static void +library_window_on_display_basic_properties (LibraryWindow* self, + GSimpleAction* action, + GVariant* value) +{ gboolean display = FALSE; - GVariant* _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_; - ConfigFacade* _tmp10_; - ConfigFacade* _tmp11_; - gboolean _tmp12_; - GSimpleAction* _tmp13_; - GVariant* _tmp14_; + gboolean _tmp0_; + ConfigFacade* _tmp8_; + ConfigFacade* _tmp9_; + gboolean _tmp10_; #line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); #line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = value; -#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - display = _tmp1_; + display = g_variant_get_boolean (value); #line 661 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = display; + _tmp0_ = display; #line 661 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp2_) { -#line 4926 "LibraryWindow.c" - BasicProperties* _tmp3_; - Page* _tmp4_; - Page* _tmp5_; - GtkFrame* _tmp6_; + if (_tmp0_) { +#line 5379 "LibraryWindow.c" + BasicProperties* _tmp1_; + Page* _tmp2_; + Page* _tmp3_; + GtkFrame* _tmp4_; #line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = self->priv->basic_properties; + _tmp1_ = self->priv->basic_properties; #line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); + _tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); #line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_); + properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PROPERTIES, Properties), _tmp3_); #line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp3_); #line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = self->priv->bottom_frame; + _tmp4_ = self->priv->bottom_frame; #line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); -#line 4945 "LibraryWindow.c" + gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); +#line 5398 "LibraryWindow.c" } else { - GtkPaned* _tmp7_; - GtkWidget* _tmp8_; + GtkPaned* _tmp5_; + GtkWidget* _tmp6_; #line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = self->priv->sidebar_paned; + _tmp5_ = self->priv->sidebar_paned; #line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = gtk_paned_get_child2 (_tmp7_); + _tmp6_ = gtk_paned_get_child2 (_tmp5_); #line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp8_ != NULL) { -#line 4955 "LibraryWindow.c" - GtkFrame* _tmp9_; + if (_tmp6_ != NULL) { +#line 5408 "LibraryWindow.c" + GtkFrame* _tmp7_; #line 666 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = self->priv->bottom_frame; + _tmp7_ = self->priv->bottom_frame; #line 666 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); -#line 4961 "LibraryWindow.c" + gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget)); +#line 5414 "LibraryWindow.c" } } #line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = config_facade_get_instance (); + _tmp8_ = config_facade_get_instance (); #line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = display; + _tmp10_ = display; #line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - configuration_facade_set_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_); + configuration_facade_set_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp10_); #line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp11_); -#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = action; -#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = value; + _g_object_unref0 (_tmp9_); #line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_simple_action_set_state (_tmp13_, _tmp14_); -#line 4980 "LibraryWindow.c" + g_simple_action_set_state (action, value); +#line 5429 "LibraryWindow.c" } -static gboolean _variant_get6 (GVariant* value) { +static gboolean +_variant_get6 (GVariant* value) +{ #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_get_boolean (value); -#line 4987 "LibraryWindow.c" +#line 5438 "LibraryWindow.c" } -static GVariant* _variant_new7 (gboolean value) { +static GVariant* +_variant_new7 (gboolean value) +{ #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 4994 "LibraryWindow.c" +#line 5447 "LibraryWindow.c" } -static void library_window_on_action_toggle (LibraryWindow* self, GAction* action, GVariant* value) { +static void +library_window_on_action_toggle (LibraryWindow* self, + GAction* action, + GVariant* value) +{ GVariant* new_state = NULL; - GAction* _tmp0_; + GVariant* _tmp0_; GVariant* _tmp1_; - GVariant* _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; + GVariant* _tmp3_; GVariant* _tmp4_; - GVariant* _tmp5_; - GAction* _tmp6_; #line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (G_IS_ACTION (action)); #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = action; -#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = g_action_get_state (_tmp0_); + _tmp0_ = g_action_get_state (action); #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = _variant_get6 (_tmp2_); + _tmp2_ = _variant_get6 (_tmp1_); #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = _variant_new7 (!_tmp3_); + _tmp3_ = _variant_new7 (!_tmp2_); #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_variant_unref0 (_tmp2_); + _g_variant_unref0 (_tmp1_); #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - new_state = _tmp5_; -#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = action; + new_state = _tmp4_; #line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_action_change_state (_tmp6_, new_state); + g_action_change_state (action, new_state); #line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (new_state); -#line 5033 "LibraryWindow.c" +#line 5484 "LibraryWindow.c" } -static void library_window_on_action_radio (LibraryWindow* self, GAction* action, GVariant* value) { - GAction* _tmp0_; - GVariant* _tmp1_; +static void +library_window_on_action_radio (LibraryWindow* self, + GAction* action, + GVariant* value) +{ #line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (G_IS_ACTION (action)); #line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = action; -#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = value; -#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_action_change_state (_tmp0_, _tmp1_); -#line 5050 "LibraryWindow.c" + g_action_change_state (action, value); +#line 5499 "LibraryWindow.c" } -static void library_window_on_display_extended_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value) { +static void +library_window_on_display_extended_properties (LibraryWindow* self, + GSimpleAction* action, + GVariant* value) +{ gboolean display = FALSE; - GVariant* _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_; - GSimpleAction* _tmp8_; - GVariant* _tmp9_; + gboolean _tmp0_; #line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); #line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = value; -#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - display = _tmp1_; + display = g_variant_get_boolean (value); #line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = display; + _tmp0_ = display; #line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp2_) { -#line 5075 "LibraryWindow.c" - ExtendedPropertiesWindow* _tmp3_; - Page* _tmp4_; - Page* _tmp5_; - ExtendedPropertiesWindow* _tmp6_; + if (_tmp0_) { +#line 5520 "LibraryWindow.c" + ExtendedPropertiesWindow* _tmp1_; + Page* _tmp2_; + Page* _tmp3_; + ExtendedPropertiesWindow* _tmp4_; #line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = self->priv->extended_properties; + _tmp1_ = self->priv->extended_properties; #line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); + _tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); #line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - extended_properties_window_update_properties (_tmp3_, _tmp5_); + extended_properties_window_update_properties (_tmp1_, _tmp3_); #line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp3_); #line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = self->priv->extended_properties; + _tmp4_ = self->priv->extended_properties; #line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); -#line 5094 "LibraryWindow.c" + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); +#line 5539 "LibraryWindow.c" } else { - ExtendedPropertiesWindow* _tmp7_; + ExtendedPropertiesWindow* _tmp5_; #line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = self->priv->extended_properties; + _tmp5_ = self->priv->extended_properties; #line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget)); -#line 5101 "LibraryWindow.c" + gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget)); +#line 5546 "LibraryWindow.c" } #line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = action; -#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = value; -#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_simple_action_set_state (_tmp8_, _tmp9_); -#line 5109 "LibraryWindow.c" + g_simple_action_set_state (action, value); +#line 5550 "LibraryWindow.c" } -static GVariant* _variant_new8 (gboolean value) { +static GVariant* +_variant_new8 (gboolean value) +{ #line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 5116 "LibraryWindow.c" +#line 5559 "LibraryWindow.c" } -static void library_window_on_display_searchbar (LibraryWindow* self, GSimpleAction* action, GVariant* value) { +static void +library_window_on_display_searchbar (LibraryWindow* self, + GSimpleAction* action, + GVariant* value) +{ gboolean is_shown = FALSE; - GVariant* _tmp0_; - gboolean _tmp1_; - ConfigFacade* _tmp2_; - ConfigFacade* _tmp3_; - GSimpleAction* _tmp4_; - GVariant* _tmp5_; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + GVariant* _tmp2_; #line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); #line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = value; -#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - is_shown = _tmp1_; + is_shown = g_variant_get_boolean (value); #line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = config_facade_get_instance (); + _tmp0_ = config_facade_get_instance (); #line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - configuration_facade_set_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), is_shown); + configuration_facade_set_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), is_shown); #line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 701 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_show_search_bar (self, is_shown); #line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = action; + _tmp2_ = _variant_new8 (is_shown); #line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = _variant_new8 (is_shown); + g_simple_action_set_state (action, _tmp2_); #line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_simple_action_set_state (_tmp4_, _tmp5_); -#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_variant_unref0 (_tmp5_); -#line 5156 "LibraryWindow.c" + _g_variant_unref0 (_tmp2_); +#line 5594 "LibraryWindow.c" } -void library_window_show_search_bar (LibraryWindow* self, gboolean display) { +void +library_window_show_search_bar (LibraryWindow* self, + gboolean display) +{ Page* _tmp0_; Page* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; - Page* _tmp5_; - CheckerboardPage* _tmp6_; - CheckerboardPage* _tmp7_; - gboolean _tmp8_; + Page* _tmp3_; + CheckerboardPage* _tmp4_; + CheckerboardPage* _tmp5_; #line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5180,104 +5618,88 @@ void library_window_show_search_bar (LibraryWindow* self, gboolean display) { if (_tmp2_) { #line 707 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 5184 "LibraryWindow.c" +#line 5622 "LibraryWindow.c" } #line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = display; -#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->is_search_toolbar_visible = _tmp3_; -#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = library_window_should_show_search_bar (self); + self->priv->is_search_toolbar_visible = display; #line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); + _tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); #line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp5_) : NULL; + _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp3_) : NULL; #line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp6_ == NULL) { + if (_tmp4_ == NULL) { #line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp5_); -#line 5200 "LibraryWindow.c" + _g_object_unref0 (_tmp3_); +#line 5634 "LibraryWindow.c" } #line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_toggle_search_bar (self, _tmp4_, _tmp7_); + library_window_toggle_search_bar (self, library_window_should_show_search_bar (self), _tmp5_); #line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp7_); -#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = display; + _g_object_unref0 (_tmp5_); #line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (!_tmp8_) { -#line 5212 "LibraryWindow.c" - SearchFilterActions* _tmp9_; + if (!display) { +#line 5644 "LibraryWindow.c" + SearchFilterActions* _tmp6_; #line 712 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = self->priv->search_actions; + _tmp6_ = self->priv->search_actions; #line 712 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - search_filter_actions_reset (_tmp9_); -#line 5218 "LibraryWindow.c" + search_filter_actions_reset (_tmp6_); +#line 5650 "LibraryWindow.c" } } -static void library_window_on_display_sidebar (LibraryWindow* self, GSimpleAction* action, GVariant* variant) { - GVariant* _tmp0_; - gboolean _tmp1_; - GSimpleAction* _tmp2_; - GVariant* _tmp3_; +static void +library_window_on_display_sidebar (LibraryWindow* self, + GSimpleAction* action, + GVariant* variant) +{ #line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); #line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = variant; -#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_set_sidebar_visible (self, _tmp1_); -#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = action; -#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = variant; + library_window_set_sidebar_visible (self, g_variant_get_boolean (variant)); #line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_simple_action_set_state (_tmp2_, _tmp3_); -#line 5244 "LibraryWindow.c" + g_simple_action_set_state (action, variant); +#line 5668 "LibraryWindow.c" } -static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean visible) { +static void +library_window_set_sidebar_visible (LibraryWindow* self, + gboolean visible) +{ GtkPaned* _tmp0_; - gboolean _tmp1_; + ConfigFacade* _tmp1_; ConfigFacade* _tmp2_; - ConfigFacade* _tmp3_; - gboolean _tmp4_; #line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 722 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->sidebar_paned; #line 722 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = visible; -#line 722 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_); + gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), visible); #line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = config_facade_get_instance (); + _tmp1_ = config_facade_get_instance (); #line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = _tmp2_; -#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = visible; + _tmp2_ = _tmp1_; #line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - configuration_facade_set_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_); + configuration_facade_set_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), visible); #line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp3_); -#line 5272 "LibraryWindow.c" + _g_object_unref0 (_tmp2_); +#line 5693 "LibraryWindow.c" } -static gboolean library_window_is_sidebar_visible (LibraryWindow* self) { +static gboolean +library_window_is_sidebar_visible (LibraryWindow* self) +{ gboolean result = FALSE; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; #line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); #line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5286,44 +5708,37 @@ static gboolean library_window_is_sidebar_visible (LibraryWindow* self) { _tmp1_ = _tmp0_; #line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = configuration_facade_get_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = _tmp2_; #line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); #line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - result = _tmp3_; + result = _tmp2_; #line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5298 "LibraryWindow.c" +#line 5718 "LibraryWindow.c" } -static void library_window_on_display_toolbar (LibraryWindow* self, GSimpleAction* action, GVariant* variant) { - GVariant* _tmp0_; - gboolean _tmp1_; - GSimpleAction* _tmp2_; - GVariant* _tmp3_; +static void +library_window_on_display_toolbar (LibraryWindow* self, + GSimpleAction* action, + GVariant* variant) +{ #line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); #line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = variant; -#line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_set_toolbar_visible (self, _tmp1_); -#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = action; -#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = variant; + library_window_set_toolbar_visible (self, g_variant_get_boolean (variant)); #line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_simple_action_set_state (_tmp2_, _tmp3_); -#line 5323 "LibraryWindow.c" + g_simple_action_set_state (action, variant); +#line 5735 "LibraryWindow.c" } -static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean visible) { +static void +library_window_set_toolbar_visible (LibraryWindow* self, + gboolean visible) +{ Page* _tmp0_; Page* _tmp1_; gboolean _tmp2_; @@ -5333,9 +5748,8 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi GtkToolbar* _tmp5_; GtkToolbar* _tmp6_; GtkToolbar* _tmp7_; + ConfigFacade* _tmp9_; ConfigFacade* _tmp10_; - ConfigFacade* _tmp11_; - gboolean _tmp12_; #line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5350,7 +5764,7 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi if (_tmp2_) { #line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 5354 "LibraryWindow.c" +#line 5768 "LibraryWindow.c" } #line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); @@ -5368,39 +5782,35 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi _tmp7_ = toolbar; #line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp7_ != NULL) { -#line 5372 "LibraryWindow.c" +#line 5786 "LibraryWindow.c" GtkRevealer* _tmp8_; - gboolean _tmp9_; #line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = self->priv->toolbar_revealer; #line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = visible; -#line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_revealer_set_reveal_child (_tmp8_, _tmp9_); -#line 5381 "LibraryWindow.c" + gtk_revealer_set_reveal_child (_tmp8_, visible); +#line 5792 "LibraryWindow.c" } #line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = config_facade_get_instance (); + _tmp9_ = config_facade_get_instance (); #line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = _tmp10_; -#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = visible; + _tmp10_ = _tmp9_; #line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - configuration_facade_set_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_); + configuration_facade_set_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), visible); #line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp10_); #line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (toolbar); -#line 5395 "LibraryWindow.c" +#line 5804 "LibraryWindow.c" } -static gboolean library_window_is_toolbar_visible (LibraryWindow* self) { +static gboolean +library_window_is_toolbar_visible (LibraryWindow* self) +{ gboolean result = FALSE; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; #line 748 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); #line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5409,52 +5819,57 @@ static gboolean library_window_is_toolbar_visible (LibraryWindow* self) { _tmp1_ = _tmp0_; #line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = configuration_facade_get_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = _tmp2_; #line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); #line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - result = _tmp3_; + result = _tmp2_; #line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5421 "LibraryWindow.c" +#line 5829 "LibraryWindow.c" } -static void library_window_show_extended_properties (LibraryWindow* self) { +static void +library_window_show_extended_properties (LibraryWindow* self) +{ #line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_sync_extended_properties (self, TRUE); -#line 5430 "LibraryWindow.c" +#line 5840 "LibraryWindow.c" } -static void library_window_hide_extended_properties (LibraryWindow* self) { +static void +library_window_hide_extended_properties (LibraryWindow* self) +{ #line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 757 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_sync_extended_properties (self, FALSE); -#line 5439 "LibraryWindow.c" +#line 5851 "LibraryWindow.c" } -static GVariant* _variant_new9 (gboolean value) { +static GVariant* +_variant_new9 (gboolean value) +{ #line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 5446 "LibraryWindow.c" +#line 5860 "LibraryWindow.c" } -static void library_window_sync_extended_properties (LibraryWindow* self, gboolean show) { +static void +library_window_sync_extended_properties (LibraryWindow* self, + gboolean show) +{ GAction* action = NULL; GAction* _tmp0_; GAction* _tmp1_; - gboolean _tmp2_; - GVariant* _tmp3_; + GVariant* _tmp2_; + ConfigFacade* _tmp3_; ConfigFacade* _tmp4_; - ConfigFacade* _tmp5_; - gboolean _tmp6_; #line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5464,35 +5879,33 @@ static void library_window_sync_extended_properties (LibraryWindow* self, gboole #line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" action = _tmp1_; #line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = show; -#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = _variant_new9 (_tmp2_); + _tmp2_ = _variant_new9 (show); #line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_action_change_state (action, _tmp3_); + g_action_change_state (action, _tmp2_); #line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_variant_unref0 (_tmp3_); -#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = config_facade_get_instance (); + _g_variant_unref0 (_tmp2_); #line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = _tmp4_; + _tmp3_ = config_facade_get_instance (); #line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = show; + _tmp4_ = _tmp3_; #line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - configuration_facade_set_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_); + configuration_facade_set_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), show); #line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (action); -#line 5487 "LibraryWindow.c" +#line 5898 "LibraryWindow.c" } -void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batch_import, gboolean allow_user_cancel) { +void +library_window_enqueue_batch_import (LibraryWindow* self, + BatchImport* batch_import, + gboolean allow_user_cancel) +{ LibraryBranch* _tmp0_; LibraryImportQueueSidebarEntry* _tmp1_; LibraryImportQueueSidebarEntry* _tmp2_; - BatchImport* _tmp3_; - gboolean _tmp4_; #line 768 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 768 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5504,37 +5917,43 @@ void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batc #line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; #line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = batch_import; -#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = allow_user_cancel; -#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_import_queue_sidebar_entry_enqueue_and_schedule (_tmp2_, _tmp3_, _tmp4_); -#line 5513 "LibraryWindow.c" + library_import_queue_sidebar_entry_enqueue_and_schedule (_tmp2_, batch_import, allow_user_cancel); +#line 5922 "LibraryWindow.c" } -static void library_window_import_reporter (LibraryWindow* self, ImportManifest* manifest) { - ImportManifest* _tmp0_; +static void +library_window_import_reporter (LibraryWindow* self, + ImportManifest* manifest) +{ #line 772 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 772 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_IMPORT_MANIFEST (manifest)); #line 773 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = manifest; -#line 773 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - import_ui_report_manifest (_tmp0_, TRUE, NULL); -#line 5527 "LibraryWindow.c" + import_ui_report_manifest (manifest, TRUE, NULL); +#line 5936 "LibraryWindow.c" } -static void _library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { +static void +_library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest, + BatchImportRoll* import_roll, + gpointer self) +{ #line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_import_reporter ((LibraryWindow*) self, manifest); -#line 5534 "LibraryWindow.c" +#line 5947 "LibraryWindow.c" } -static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* uris, const gchar* job_name, gboolean copy_to_library, gboolean recurse) { +static void +library_window_dispatch_import_jobs (LibraryWindow* self, + GSList* uris, + const gchar* job_name, + gboolean copy_to_library, + gboolean recurse) +{ gboolean _tmp0_ = FALSE; GFile* _tmp1_; GFile* _tmp2_; @@ -5543,11 +5962,10 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur const gchar* _tmp5_; gboolean _tmp6_; GeeArrayList* jobs = NULL; - GeeArrayList* _tmp15_; - GSList* _tmp16_; - GeeArrayList* _tmp30_; - gint _tmp31_; - gint _tmp32_; + GeeArrayList* _tmp14_; + GeeArrayList* _tmp26_; + gint _tmp27_; + gint _tmp28_; #line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5570,21 +5988,21 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur _g_object_unref0 (_tmp2_); #line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp6_) { -#line 5574 "LibraryWindow.c" +#line 5992 "LibraryWindow.c" gboolean _tmp7_; #line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = self->priv->notify_library_is_home_dir; #line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _tmp7_; -#line 5580 "LibraryWindow.c" +#line 5998 "LibraryWindow.c" } else { #line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = FALSE; -#line 5584 "LibraryWindow.c" +#line 6002 "LibraryWindow.c" } #line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_) { -#line 5588 "LibraryWindow.c" +#line 6006 "LibraryWindow.c" GtkResponseType response = 0; gchar* _tmp8_; gchar* _tmp9_; @@ -5592,7 +6010,6 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur AppWindow* _tmp11_; GtkResponseType _tmp12_; GtkResponseType _tmp13_; - GtkResponseType _tmp14_; #line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = g_strdup_printf (_ ("Shotwell is configured to import photos to your home directory.\n" "We recommend changing this in Edit %s Preference" \ "s.\n" "Do you want to continue importing photos?"), "▸"); @@ -5604,80 +6021,74 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur _tmp11_ = _tmp10_; #line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = app_window_affirm_cancel_question (_tmp9_, _ ("_Import"), _ ("Library Location"), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow)); -#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = _tmp12_; #line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp11_); #line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp9_); #line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - response = _tmp13_; + response = _tmp12_; #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = response; + _tmp13_ = response; #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp14_ == GTK_RESPONSE_CANCEL) { + if (_tmp13_ == GTK_RESPONSE_CANCEL) { #line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 5621 "LibraryWindow.c" +#line 6036 "LibraryWindow.c" } #line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->notify_library_is_home_dir = FALSE; -#line 5625 "LibraryWindow.c" +#line 6040 "LibraryWindow.c" } #line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); + _tmp14_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); #line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - jobs = _tmp15_; -#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = uris; -#line 5633 "LibraryWindow.c" + jobs = _tmp14_; +#line 6046 "LibraryWindow.c" { GSList* uri_collection = NULL; GSList* uri_it = NULL; #line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - uri_collection = _tmp16_; + uri_collection = uris; #line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) { -#line 5641 "LibraryWindow.c" - gchar* _tmp17_; +#line 6054 "LibraryWindow.c" + gchar* _tmp15_; gchar* uri = NULL; #line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = g_strdup ((const gchar*) uri_it->data); + _tmp15_ = g_strdup ((const gchar*) uri_it->data); #line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - uri = _tmp17_; -#line 5648 "LibraryWindow.c" + uri = _tmp15_; +#line 6061 "LibraryWindow.c" { GFile* file_or_dir = NULL; - const gchar* _tmp18_; - GFile* _tmp19_; - GFile* _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; - gboolean _tmp23_; - GeeArrayList* _tmp24_; - GFile* _tmp25_; - gboolean _tmp26_; - gboolean _tmp27_; - FileImportJob* _tmp28_; - FileImportJob* _tmp29_; + const gchar* _tmp16_; + GFile* _tmp17_; + GFile* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; + gboolean _tmp21_; + GeeArrayList* _tmp22_; + GFile* _tmp23_; + FileImportJob* _tmp24_; + FileImportJob* _tmp25_; #line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = uri; + _tmp16_ = uri; #line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = g_file_new_for_uri (_tmp18_); + _tmp17_ = g_file_new_for_uri (_tmp16_); #line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - file_or_dir = _tmp19_; + file_or_dir = _tmp17_; #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp20_ = file_or_dir; + _tmp18_ = file_or_dir; #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp21_ = g_file_get_path (_tmp20_); + _tmp19_ = g_file_get_path (_tmp18_); #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_ = _tmp21_; + _tmp20_ = _tmp19_; #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp23_ = _tmp22_ == NULL; + _tmp21_ = _tmp20_ == NULL; #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp20_); #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp23_) { + if (_tmp21_) { #line 795 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_error_message (_ ("Photos cannot be imported from this directory."), NULL); #line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5686,71 +6097,66 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur _g_free0 (uri); #line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" continue; -#line 5689 "LibraryWindow.c" +#line 6100 "LibraryWindow.c" } #line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_ = jobs; -#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp25_ = file_or_dir; -#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp26_ = copy_to_library; + _tmp22_ = jobs; #line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp27_ = recurse; + _tmp23_ = file_or_dir; #line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp28_ = file_import_job_new (_tmp25_, _tmp26_, _tmp27_); + _tmp24_ = file_import_job_new (_tmp23_, copy_to_library, recurse); #line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp29_ = _tmp28_; + _tmp25_ = _tmp24_; #line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp25_); #line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _batch_import_job_unref0 (_tmp29_); + _batch_import_job_unref0 (_tmp25_); #line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (file_or_dir); #line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 5711 "LibraryWindow.c" +#line 6118 "LibraryWindow.c" } } } #line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp30_ = jobs; + _tmp26_ = jobs; #line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp31_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp32_ = _tmp31_; + _tmp28_ = _tmp27_; #line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp32_ > 0) { -#line 5723 "LibraryWindow.c" + if (_tmp28_ > 0) { +#line 6130 "LibraryWindow.c" BatchImport* batch_import = NULL; - GeeArrayList* _tmp33_; - const gchar* _tmp34_; - BatchImport* _tmp35_; - BatchImport* _tmp36_; -#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp33_ = jobs; + GeeArrayList* _tmp29_; + BatchImport* _tmp30_; + BatchImport* _tmp31_; #line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp34_ = job_name; + _tmp29_ = jobs; #line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp35_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ITERABLE, GeeIterable), _tmp34_, _library_window_import_reporter_batch_import_import_reporter, self, NULL, NULL, NULL, NULL, NULL); + _tmp30_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ITERABLE, GeeIterable), job_name, _library_window_import_reporter_batch_import_import_reporter, self, NULL, NULL, NULL, NULL, NULL); #line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - batch_import = _tmp35_; + batch_import = _tmp30_; #line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp36_ = batch_import; + _tmp31_ = batch_import; #line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_enqueue_batch_import (self, _tmp36_, TRUE); + library_window_enqueue_batch_import (self, _tmp31_, TRUE); #line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_import_queue_page (self); #line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (batch_import); -#line 5745 "LibraryWindow.c" +#line 6149 "LibraryWindow.c" } #line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (jobs); -#line 5749 "LibraryWindow.c" +#line 6153 "LibraryWindow.c" } -static GdkDragAction library_window_get_drag_action (LibraryWindow* self) { +static GdkDragAction +library_window_get_drag_action (LibraryWindow* self) +{ GdkDragAction result = 0; GdkModifierType mask = 0; GdkWindow* _tmp0_; @@ -5797,31 +6203,31 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) { _tmp10_ = ctrl; #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp10_) { -#line 5800 "LibraryWindow.c" +#line 6206 "LibraryWindow.c" gboolean _tmp11_; #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = alt; #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = !_tmp11_; -#line 5806 "LibraryWindow.c" +#line 6212 "LibraryWindow.c" } else { #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = FALSE; -#line 5810 "LibraryWindow.c" +#line 6216 "LibraryWindow.c" } #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp9_) { -#line 5814 "LibraryWindow.c" +#line 6220 "LibraryWindow.c" gboolean _tmp12_; #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = shift; #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = !_tmp12_; -#line 5820 "LibraryWindow.c" +#line 6226 "LibraryWindow.c" } else { #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = FALSE; -#line 5824 "LibraryWindow.c" +#line 6230 "LibraryWindow.c" } #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_) { @@ -5829,7 +6235,7 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) { result = GDK_ACTION_COPY; #line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5832 "LibraryWindow.c" +#line 6238 "LibraryWindow.c" } else { gboolean _tmp13_ = FALSE; gboolean _tmp14_ = FALSE; @@ -5838,31 +6244,31 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) { _tmp15_ = ctrl; #line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp15_) { -#line 5841 "LibraryWindow.c" +#line 6247 "LibraryWindow.c" gboolean _tmp16_; #line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = alt; #line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _tmp16_; -#line 5847 "LibraryWindow.c" +#line 6253 "LibraryWindow.c" } else { #line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = FALSE; -#line 5851 "LibraryWindow.c" +#line 6257 "LibraryWindow.c" } #line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp14_) { -#line 5855 "LibraryWindow.c" +#line 6261 "LibraryWindow.c" gboolean _tmp17_; #line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = shift; #line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = !_tmp17_; -#line 5861 "LibraryWindow.c" +#line 6267 "LibraryWindow.c" } else { #line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = FALSE; -#line 5865 "LibraryWindow.c" +#line 6271 "LibraryWindow.c" } #line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp13_) { @@ -5870,7 +6276,7 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) { result = GDK_ACTION_ASK; #line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5873 "LibraryWindow.c" +#line 6279 "LibraryWindow.c" } else { gboolean _tmp18_ = FALSE; gboolean _tmp19_ = FALSE; @@ -5879,31 +6285,31 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) { _tmp20_ = ctrl; #line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp20_) { -#line 5882 "LibraryWindow.c" +#line 6288 "LibraryWindow.c" gboolean _tmp21_; #line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = alt; #line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = !_tmp21_; -#line 5888 "LibraryWindow.c" +#line 6294 "LibraryWindow.c" } else { #line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = FALSE; -#line 5892 "LibraryWindow.c" +#line 6298 "LibraryWindow.c" } #line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp19_) { -#line 5896 "LibraryWindow.c" +#line 6302 "LibraryWindow.c" gboolean _tmp22_; #line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = shift; #line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = _tmp22_; -#line 5902 "LibraryWindow.c" +#line 6308 "LibraryWindow.c" } else { #line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = FALSE; -#line 5906 "LibraryWindow.c" +#line 6312 "LibraryWindow.c" } #line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp18_) { @@ -5911,126 +6317,106 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) { result = GDK_ACTION_LINK; #line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5914 "LibraryWindow.c" +#line 6320 "LibraryWindow.c" } else { #line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = GDK_ACTION_DEFAULT; #line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5920 "LibraryWindow.c" +#line 6326 "LibraryWindow.c" } } } } -static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext* context, gint x, gint y, guint time) { +static gboolean +library_window_real_drag_motion (GtkWidget* base, + GdkDragContext* context, + gint x, + gint y, + guint time) +{ LibraryWindow * self; gboolean result = FALSE; GdkAtom target = 0U; - GdkDragContext* _tmp0_; - GtkTargetList* _tmp1_; + GtkTargetList* _tmp0_; + GdkAtom _tmp1_; GdkAtom _tmp2_; - GdkAtom _tmp3_; - GdkAtom _tmp4_; - GdkDragContext* _tmp7_; - GtkWidget* _tmp8_; + GtkWidget* _tmp3_; GdkDragAction drag_action = 0; - GdkDragAction _tmp11_; - GdkDragAction _tmp12_; - GdkDragContext* _tmp13_; - GdkDragAction _tmp14_; - guint _tmp15_; + GdkDragAction _tmp4_; + GdkDragAction _tmp5_; #line 830 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 830 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE); #line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = context; + _tmp0_ = gtk_drag_dest_get_target_list (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = gtk_drag_dest_get_target_list (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = gtk_drag_dest_find_target (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_, _tmp1_); -#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - target = _tmp2_; + target = gtk_drag_dest_find_target (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), context, _tmp0_); #line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = target; + _tmp1_ = target; #line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = GDK_NONE; + _tmp2_ = GDK_NONE; #line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp3_ == _tmp4_) { -#line 5962 "LibraryWindow.c" - GdkDragContext* _tmp5_; - guint _tmp6_; + if (_tmp1_ == _tmp2_) { #line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_debug ("LibraryWindow.vala:833: drag target is GDK_NONE"); #line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = context; -#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = time; -#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gdk_drag_status (_tmp5_, 0, (guint32) _tmp6_); + gdk_drag_status (context, 0, (guint32) time); #line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; #line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5977 "LibraryWindow.c" +#line 6372 "LibraryWindow.c" } #line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = context; -#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = gtk_drag_get_source_widget (_tmp7_); + _tmp3_ = gtk_drag_get_source_widget (context); #line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp8_ != NULL) { -#line 5985 "LibraryWindow.c" - GdkDragContext* _tmp9_; - guint _tmp10_; -#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = context; -#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = time; + if (_tmp3_ != NULL) { #line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gdk_drag_status (_tmp9_, GDK_ACTION_PRIVATE, (guint32) _tmp10_); + gdk_drag_status (context, GDK_ACTION_PRIVATE, (guint32) time); #line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; #line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5998 "LibraryWindow.c" +#line 6384 "LibraryWindow.c" } #line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = library_window_get_drag_action (self); -#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - drag_action = _tmp11_; + drag_action = library_window_get_drag_action (self); #line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = drag_action; + _tmp4_ = drag_action; #line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp12_ == GDK_ACTION_DEFAULT) { + if (_tmp4_ == GDK_ACTION_DEFAULT) { #line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" drag_action = GDK_ACTION_ASK; -#line 6010 "LibraryWindow.c" +#line 6394 "LibraryWindow.c" } #line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = context; + _tmp5_ = drag_action; #line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = drag_action; -#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = time; -#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gdk_drag_status (_tmp13_, _tmp14_, (guint32) _tmp15_); + gdk_drag_status (context, _tmp5_, (guint32) time); #line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; #line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 6024 "LibraryWindow.c" +#line 6404 "LibraryWindow.c" } -static void library_window_real_drag_data_received (GtkWidget* base, GdkDragContext* context, gint x, gint y, GtkSelectionData* selection_data, guint info, guint time) { +static void +library_window_real_drag_data_received (GtkWidget* base, + GdkDragContext* context, + gint x, + gint y, + GtkSelectionData* selection_data, + guint info, + guint time) +{ LibraryWindow * self; - GtkSelectionData* _tmp0_; - guchar* _tmp1_; - GdkDragContext* _tmp2_; - GtkWidget* _tmp3_; + guint8* _tmp0_; + GtkWidget* _tmp1_; #line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6038,69 +6424,48 @@ static void library_window_real_drag_data_received (GtkWidget* base, GdkDragCont #line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (selection_data != NULL); #line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = selection_data; -#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = gtk_selection_data_get_data (_tmp0_); + _tmp0_ = gtk_selection_data_get_data (selection_data); #line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (-1 < 0) { #line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_debug ("LibraryWindow.vala:860: failed to retrieve SelectionData"); -#line 6048 "LibraryWindow.c" +#line 6432 "LibraryWindow.c" } #line 864 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = context; -#line 864 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = gtk_drag_get_source_widget (_tmp2_); + _tmp1_ = gtk_drag_get_source_widget (context); #line 864 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp3_ == NULL) { -#line 6056 "LibraryWindow.c" - GdkDragContext* _tmp4_; - GtkSelectionData* _tmp5_; - guint _tmp6_; - guint _tmp7_; -#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = context; -#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = selection_data; -#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = info; -#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = time; + if (_tmp1_ == NULL) { #line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_external_drop_handler (self, _tmp4_, NULL, _tmp5_, _tmp6_, _tmp7_); -#line 6071 "LibraryWindow.c" + library_window_external_drop_handler (self, context, NULL, selection_data, info, time); +#line 6440 "LibraryWindow.c" } else { - GdkDragContext* _tmp8_; - guint _tmp9_; #line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = context; -#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = time; -#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_drag_finish (_tmp8_, FALSE, FALSE, (guint32) _tmp9_); -#line 6081 "LibraryWindow.c" + gtk_drag_finish (context, FALSE, FALSE, (guint32) time); +#line 6444 "LibraryWindow.c" } } -static void library_window_external_drop_handler (LibraryWindow* self, GdkDragContext* context, SidebarEntry* entry, GtkSelectionData* data, guint info, guint time) { +static void +library_window_external_drop_handler (LibraryWindow* self, + GdkDragContext* context, + SidebarEntry* entry, + GtkSelectionData* data, + guint info, + guint time) +{ gchar** uris_array = NULL; - GtkSelectionData* _tmp0_; + gchar** _tmp0_; gchar** _tmp1_; - gchar** _tmp2_; gint uris_array_length1; gint _uris_array_size_; GSList* uris = NULL; - gchar** _tmp3_; - gint _tmp3__length1; + gchar** _tmp2_; + gint _tmp2__length1; GdkDragAction selected_action = 0; - GdkDragContext* _tmp7_; - GdkDragAction _tmp8_; - GdkDragAction _tmp9_; - GSList* _tmp21_; - GdkDragAction _tmp22_; - GdkDragContext* _tmp23_; - guint _tmp24_; + GdkDragAction _tmp6_; + GSList* _tmp14_; + GdkDragAction _tmp15_; #line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6110,193 +6475,172 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo #line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (data != NULL); #line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = data; -#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = _tmp1_ = gtk_selection_data_get_uris (_tmp0_); + _tmp1_ = _tmp0_ = gtk_selection_data_get_uris (data); #line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - uris_array = _tmp2_; + uris_array = _tmp1_; #line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - uris_array_length1 = _vala_array_length (_tmp1_); + uris_array_length1 = _vala_array_length (_tmp0_); #line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _uris_array_size_ = uris_array_length1; #line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris = NULL; #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = uris_array; + _tmp2_ = uris_array; #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3__length1 = uris_array_length1; -#line 6128 "LibraryWindow.c" + _tmp2__length1 = uris_array_length1; +#line 6491 "LibraryWindow.c" { gchar** uri_collection = NULL; gint uri_collection_length1 = 0; gint _uri_collection_size_ = 0; gint uri_it = 0; #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - uri_collection = _tmp3_; + uri_collection = _tmp2_; #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - uri_collection_length1 = _tmp3__length1; + uri_collection_length1 = _tmp2__length1; #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - for (uri_it = 0; uri_it < _tmp3__length1; uri_it = uri_it + 1) { -#line 6140 "LibraryWindow.c" - gchar* _tmp4_; + for (uri_it = 0; uri_it < _tmp2__length1; uri_it = uri_it + 1) { +#line 6503 "LibraryWindow.c" + gchar* _tmp3_; gchar* uri = NULL; #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = g_strdup (uri_collection[uri_it]); + _tmp3_ = g_strdup (uri_collection[uri_it]); #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - uri = _tmp4_; -#line 6147 "LibraryWindow.c" + uri = _tmp3_; +#line 6510 "LibraryWindow.c" { - const gchar* _tmp5_; - gchar* _tmp6_; + const gchar* _tmp4_; + gchar* _tmp5_; #line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = uri; + _tmp4_ = uri; #line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = g_strdup (_tmp5_); + _tmp5_ = g_strdup (_tmp4_); #line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - uris = g_slist_append (uris, _tmp6_); + uris = g_slist_append (uris, _tmp5_); #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 6159 "LibraryWindow.c" +#line 6522 "LibraryWindow.c" } } } #line 878 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = context; -#line 878 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = gdk_drag_context_get_selected_action (_tmp7_); -#line 878 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - selected_action = _tmp8_; + selected_action = gdk_drag_context_get_selected_action (context); #line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = selected_action; + _tmp6_ = selected_action; #line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp9_ == GDK_ACTION_ASK) { -#line 6173 "LibraryWindow.c" + if (_tmp6_ == GDK_ACTION_ASK) { +#line 6532 "LibraryWindow.c" GtkResponseType _result_ = 0; - GSList* _tmp10_; - GtkResponseType _tmp18_; + GSList* _tmp7_; + GtkResponseType _tmp13_; #line 881 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _result_ = GTK_RESPONSE_REJECT; #line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = uris; -#line 6181 "LibraryWindow.c" + _tmp7_ = uris; +#line 6540 "LibraryWindow.c" { GSList* uri_collection = NULL; GSList* uri_it = NULL; #line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - uri_collection = _tmp10_; + uri_collection = _tmp7_; #line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) { -#line 6189 "LibraryWindow.c" - gchar* _tmp11_; +#line 6548 "LibraryWindow.c" + gchar* _tmp8_; gchar* uri = NULL; #line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = g_strdup ((const gchar*) uri_it->data); + _tmp8_ = g_strdup ((const gchar*) uri_it->data); #line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - uri = _tmp11_; -#line 6196 "LibraryWindow.c" + uri = _tmp8_; +#line 6555 "LibraryWindow.c" { - const gchar* _tmp12_; - GFile* _tmp13_; - GFile* _tmp14_; - gboolean _tmp15_; - gboolean _tmp16_; -#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = uri; + const gchar* _tmp9_; + GFile* _tmp10_; + GFile* _tmp11_; + gboolean _tmp12_; #line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = g_file_new_for_uri (_tmp12_); + _tmp9_ = uri; #line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = _tmp13_; + _tmp10_ = g_file_new_for_uri (_tmp9_); #line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = app_dirs_is_in_import_dir (_tmp14_); + _tmp11_ = _tmp10_; #line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = !_tmp15_; + _tmp12_ = !app_dirs_is_in_import_dir (_tmp11_); #line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp11_); #line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp16_) { -#line 6217 "LibraryWindow.c" - GtkResponseType _tmp17_; + if (_tmp12_) { #line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = copy_files_dialog (); -#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _result_ = _tmp17_; + _result_ = copy_files_dialog (); #line 886 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); #line 886 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 6227 "LibraryWindow.c" +#line 6579 "LibraryWindow.c" } #line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 6231 "LibraryWindow.c" +#line 6583 "LibraryWindow.c" } } } #line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = _result_; + _tmp13_ = _result_; #line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - switch (_tmp18_) { + switch (_tmp13_) { #line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" case GTK_RESPONSE_ACCEPT: -#line 6241 "LibraryWindow.c" +#line 6593 "LibraryWindow.c" { #line 892 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" selected_action = GDK_ACTION_COPY; #line 893 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 6247 "LibraryWindow.c" +#line 6599 "LibraryWindow.c" } #line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" case GTK_RESPONSE_REJECT: -#line 6251 "LibraryWindow.c" +#line 6603 "LibraryWindow.c" { #line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" selected_action = GDK_ACTION_LINK; #line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 6257 "LibraryWindow.c" +#line 6609 "LibraryWindow.c" } default: { - GdkDragContext* _tmp19_; - guint _tmp20_; -#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = context; #line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp20_ = time; -#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_drag_finish (_tmp19_, FALSE, FALSE, (guint32) _tmp20_); + gtk_drag_finish (context, FALSE, FALSE, (guint32) time); #line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" __g_slist_free__g_free0_0 (uris); #line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL); #line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 6275 "LibraryWindow.c" +#line 6621 "LibraryWindow.c" } } } #line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp21_ = uris; + _tmp14_ = uris; #line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_ = selected_action; + _tmp15_ = selected_action; #line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_dispatch_import_jobs (self, _tmp21_, "drag-and-drop", _tmp22_ == GDK_ACTION_COPY, TRUE); -#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp23_ = context; -#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_ = time; + library_window_dispatch_import_jobs (self, _tmp14_, "drag-and-drop", _tmp15_ == GDK_ACTION_COPY, TRUE); #line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_drag_finish (_tmp23_, TRUE, FALSE, (guint32) _tmp24_); + gtk_drag_finish (context, TRUE, FALSE, (guint32) time); #line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" __g_slist_free__g_free0_0 (uris); #line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL); -#line 6295 "LibraryWindow.c" +#line 6637 "LibraryWindow.c" } -void library_window_switch_to_library_page (LibraryWindow* self) { +void +library_window_switch_to_library_page (LibraryWindow* self) +{ LibraryBranch* _tmp0_; LibraryPhotosEntry* _tmp1_; LibraryPhotosEntry* _tmp2_; @@ -6318,16 +6662,18 @@ void library_window_switch_to_library_page (LibraryWindow* self) { library_window_switch_to_page (self, _tmp4_); #line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp4_); -#line 6321 "LibraryWindow.c" +#line 6665 "LibraryWindow.c" } -void library_window_switch_to_event (LibraryWindow* self, Event* event) { +void +library_window_switch_to_event (LibraryWindow* self, + Event* event) +{ EventsEventEntry* entry = NULL; EventsBranch* _tmp0_; - Event* _tmp1_; + EventsEventEntry* _tmp1_; EventsEventEntry* _tmp2_; - EventsEventEntry* _tmp3_; #line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6335,43 +6681,43 @@ void library_window_switch_to_event (LibraryWindow* self, Event* event) { #line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->events_branch; #line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = event; + _tmp1_ = events_branch_get_entry_for_event (_tmp0_, event); #line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = events_branch_get_entry_for_event (_tmp0_, _tmp1_); -#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - entry = _tmp2_; + entry = _tmp1_; #line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = entry; + _tmp2_ = entry; #line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp3_ != NULL) { -#line 6347 "LibraryWindow.c" - EventsEventEntry* _tmp4_; + if (_tmp2_ != NULL) { +#line 6691 "LibraryWindow.c" + EventsEventEntry* _tmp3_; + Page* _tmp4_; Page* _tmp5_; - Page* _tmp6_; #line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = entry; + _tmp3_ = entry; #line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); + _tmp4_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); #line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_switch_to_page (self, _tmp6_); + library_window_switch_to_page (self, _tmp5_); #line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp6_); -#line 6361 "LibraryWindow.c" + _g_object_unref0 (_tmp5_); +#line 6705 "LibraryWindow.c" } #line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 6365 "LibraryWindow.c" +#line 6709 "LibraryWindow.c" } -void library_window_switch_to_tag (LibraryWindow* self, Tag* tag) { +void +library_window_switch_to_tag (LibraryWindow* self, + Tag* tag) +{ TagsSidebarEntry* entry = NULL; TagsBranch* _tmp0_; - Tag* _tmp1_; + TagsSidebarEntry* _tmp1_; TagsSidebarEntry* _tmp2_; - TagsSidebarEntry* _tmp3_; #line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6379,43 +6725,43 @@ void library_window_switch_to_tag (LibraryWindow* self, Tag* tag) { #line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->tags_branch; #line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = tag; -#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = tags_branch_get_entry_for_tag (_tmp0_, _tmp1_); + _tmp1_ = tags_branch_get_entry_for_tag (_tmp0_, tag); #line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - entry = _tmp2_; + entry = _tmp1_; #line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = entry; + _tmp2_ = entry; #line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp3_ != NULL) { -#line 6391 "LibraryWindow.c" - TagsSidebarEntry* _tmp4_; + if (_tmp2_ != NULL) { +#line 6735 "LibraryWindow.c" + TagsSidebarEntry* _tmp3_; + Page* _tmp4_; Page* _tmp5_; - Page* _tmp6_; #line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = entry; + _tmp3_ = entry; #line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); + _tmp4_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); #line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_switch_to_page (self, _tmp6_); + library_window_switch_to_page (self, _tmp5_); #line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp6_); -#line 6405 "LibraryWindow.c" + _g_object_unref0 (_tmp5_); +#line 6749 "LibraryWindow.c" } #line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 6409 "LibraryWindow.c" +#line 6753 "LibraryWindow.c" } -void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* search) { +void +library_window_switch_to_saved_search (LibraryWindow* self, + SavedSearch* search) +{ SearchesSidebarEntry* entry = NULL; SearchesBranch* _tmp0_; - SavedSearch* _tmp1_; + SearchesSidebarEntry* _tmp1_; SearchesSidebarEntry* _tmp2_; - SearchesSidebarEntry* _tmp3_; #line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6423,49 +6769,47 @@ void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* se #line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->saved_search_branch; #line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = search; -#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = searches_branch_get_entry_for_saved_search (_tmp0_, _tmp1_); + _tmp1_ = searches_branch_get_entry_for_saved_search (_tmp0_, search); #line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - entry = _tmp2_; + entry = _tmp1_; #line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = entry; + _tmp2_ = entry; #line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp3_ != NULL) { -#line 6435 "LibraryWindow.c" - SearchesSidebarEntry* _tmp4_; + if (_tmp2_ != NULL) { +#line 6779 "LibraryWindow.c" + SearchesSidebarEntry* _tmp3_; + Page* _tmp4_; Page* _tmp5_; - Page* _tmp6_; #line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = entry; + _tmp3_ = entry; #line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); + _tmp4_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); #line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_switch_to_page (self, _tmp6_); + library_window_switch_to_page (self, _tmp5_); #line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp6_); -#line 6449 "LibraryWindow.c" + _g_object_unref0 (_tmp5_); +#line 6793 "LibraryWindow.c" } #line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 6453 "LibraryWindow.c" +#line 6797 "LibraryWindow.c" } -void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* controller, Photo* current) { - CollectionPage* _tmp0_; +void +library_window_switch_to_photo_page (LibraryWindow* self, + CollectionPage* controller, + Photo* current) +{ + ViewCollection* _tmp0_; ViewCollection* _tmp1_; - ViewCollection* _tmp2_; - Photo* _tmp3_; - DataView* _tmp4_; - DataView* _tmp5_; - LibraryPhotoPage* _tmp6_; - LibraryPhotoPage* _tmp9_; - CollectionPage* _tmp10_; - Photo* _tmp11_; - LibraryPhotoPage* _tmp12_; + DataView* _tmp2_; + DataView* _tmp3_; + LibraryPhotoPage* _tmp4_; + LibraryPhotoPage* _tmp7_; + LibraryPhotoPage* _tmp8_; #line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6473,63 +6817,57 @@ void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* c #line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PHOTO (current)); #line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = controller; + _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (controller, TYPE_PAGE, Page)); #line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page)); -#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = _tmp1_; -#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = current; + _tmp1_ = _tmp0_; #line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = view_collection_get_view_for_source (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource)); + _tmp2_ = view_collection_get_view_for_source (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (current, TYPE_DATA_SOURCE, DataSource)); #line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_assert (_tmp5_ != NULL, "controller.get_view().get_view_for_source(current) != null"); + _vala_assert (_tmp3_ != NULL, "controller.get_view().get_view_for_source(current) != null"); #line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp3_); #line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _data_collection_unref0 (_tmp2_); + _data_collection_unref0 (_tmp1_); #line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = self->priv->photo_page; + _tmp4_ = self->priv->photo_page; #line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp6_ == NULL) { -#line 6497 "LibraryWindow.c" - LibraryPhotoPage* _tmp7_; - LibraryPhotoPage* _tmp8_; + if (_tmp4_ == NULL) { +#line 6837 "LibraryWindow.c" + LibraryPhotoPage* _tmp5_; + LibraryPhotoPage* _tmp6_; #line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = library_photo_page_new (); + _tmp5_ = library_photo_page_new (); #line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_object_ref_sink (_tmp7_); + g_object_ref_sink (_tmp5_); #line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->photo_page); #line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->photo_page = _tmp7_; + self->priv->photo_page = _tmp5_; #line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = self->priv->photo_page; + _tmp6_ = self->priv->photo_page; #line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_add_to_stack (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page)); + library_window_add_to_stack (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE, Page)); #line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" spin_event_loop (); -#line 6514 "LibraryWindow.c" +#line 6854 "LibraryWindow.c" } #line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = self->priv->photo_page; -#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = controller; -#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = current; + _tmp7_ = self->priv->photo_page; #line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_photo_page_display_for_collection (_tmp9_, _tmp10_, _tmp11_, NULL); + library_photo_page_display_for_collection (_tmp7_, controller, current, NULL); #line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = self->priv->photo_page; + _tmp8_ = self->priv->photo_page; #line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE, Page)); -#line 6528 "LibraryWindow.c" + library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page)); +#line 6864 "LibraryWindow.c" } -void library_window_switch_to_import_queue_page (LibraryWindow* self) { +void +library_window_switch_to_import_queue_page (LibraryWindow* self) +{ LibraryBranch* _tmp0_; LibraryImportQueueSidebarEntry* _tmp1_; LibraryImportQueueSidebarEntry* _tmp2_; @@ -6551,26 +6889,27 @@ void library_window_switch_to_import_queue_page (LibraryWindow* self) { library_window_switch_to_page (self, _tmp4_); #line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp4_); -#line 6554 "LibraryWindow.c" +#line 6892 "LibraryWindow.c" } -static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamera* camera) { +static void +library_window_on_camera_added (LibraryWindow* self, + DiscoveredCamera* camera) +{ CameraSidebarEntry* entry = NULL; CameraBranch* _tmp0_; - DiscoveredCamera* _tmp1_; + CameraSidebarEntry* _tmp1_; CameraSidebarEntry* _tmp2_; - CameraSidebarEntry* _tmp3_; ImportPage* page = NULL; - CameraSidebarEntry* _tmp4_; - Page* _tmp5_; + CameraSidebarEntry* _tmp3_; + Page* _tmp4_; GFile* uri_file = NULL; - DiscoveredCamera* _tmp6_; - const gchar* _tmp7_; - GFile* _tmp8_; + const gchar* _tmp5_; + GFile* _tmp6_; GMount* mount = NULL; - gboolean _tmp13_ = FALSE; - GMount* _tmp14_; + gboolean _tmp11_ = FALSE; + GMount* _tmp12_; GError * _inner_error_ = NULL; #line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); @@ -6579,65 +6918,61 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer #line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->camera_branch; #line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = camera; + _tmp1_ = camera_branch_get_entry_for_camera (_tmp0_, camera); #line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = camera_branch_get_entry_for_camera (_tmp0_, _tmp1_); -#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - entry = _tmp2_; + entry = _tmp1_; #line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = entry; + _tmp2_ = entry; #line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); #line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 6595 "LibraryWindow.c" +#line 6932 "LibraryWindow.c" } #line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = entry; + _tmp3_ = entry; #line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); + _tmp4_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); #line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - page = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_IMPORT_PAGE, ImportPage); + page = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_IMPORT_PAGE, ImportPage); #line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = camera; + _tmp5_ = camera->uri; #line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = _tmp6_->uri; + _tmp6_ = g_file_new_for_uri (_tmp5_); #line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = g_file_new_for_uri (_tmp7_); -#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - uri_file = _tmp8_; + uri_file = _tmp6_; #line 962 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" mount = NULL; -#line 6613 "LibraryWindow.c" +#line 6948 "LibraryWindow.c" { - GMount* _tmp9_ = NULL; - GFile* _tmp10_; - GMount* _tmp11_; - GMount* _tmp12_; + GMount* _tmp7_ = NULL; + GFile* _tmp8_; + GMount* _tmp9_; + GMount* _tmp10_; #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = uri_file; + _tmp8_ = uri_file; #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = g_file_find_enclosing_mount (_tmp10_, NULL, &_inner_error_); + _tmp9_ = g_file_find_enclosing_mount (_tmp8_, NULL, &_inner_error_); #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = _tmp11_; + _tmp7_ = _tmp9_; #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6627 "LibraryWindow.c" +#line 6962 "LibraryWindow.c" goto __catch46_g_error; } #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = _tmp9_; + _tmp10_ = _tmp7_; #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = NULL; + _tmp7_ = NULL; #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - mount = _tmp12_; + mount = _tmp10_; #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp9_); -#line 6640 "LibraryWindow.c" + _g_object_unref0 (_tmp7_); +#line 6975 "LibraryWindow.c" } goto __finally46; __catch46_g_error: @@ -6649,7 +6984,7 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer _inner_error_ = NULL; #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_error_free0 (err); -#line 6652 "LibraryWindow.c" +#line 6987 "LibraryWindow.c" } __finally46: #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6668,63 +7003,54 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer g_clear_error (&_inner_error_); #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 6671 "LibraryWindow.c" +#line 7006 "LibraryWindow.c" } #line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = mount; + _tmp12_ = mount; #line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp14_ != NULL) { -#line 6677 "LibraryWindow.c" - DiscoveredCamera* _tmp15_; - const gchar* _tmp16_; - gboolean _tmp17_; -#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = camera; -#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = _tmp15_->uri; + if (_tmp12_ != NULL) { +#line 7012 "LibraryWindow.c" + const gchar* _tmp13_; #line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = g_str_has_prefix (_tmp16_, "file://"); + _tmp13_ = camera->uri; #line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = !_tmp17_; -#line 6689 "LibraryWindow.c" + _tmp11_ = !g_str_has_prefix (_tmp13_, "file://"); +#line 7018 "LibraryWindow.c" } else { #line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = FALSE; -#line 6693 "LibraryWindow.c" + _tmp11_ = FALSE; +#line 7022 "LibraryWindow.c" } #line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp13_) { -#line 6697 "LibraryWindow.c" - ImportPage* _tmp18_; - GMount* _tmp19_; - gboolean _tmp20_; -#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = page; + if (_tmp11_) { +#line 7026 "LibraryWindow.c" + ImportPage* _tmp14_; + GMount* _tmp15_; #line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = mount; + _tmp14_ = page; #line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp20_ = import_page_unmount_camera (_tmp18_, _tmp19_); + _tmp15_ = mount; #line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp20_) { -#line 6709 "LibraryWindow.c" - ImportPage* _tmp21_; + if (import_page_unmount_camera (_tmp14_, _tmp15_)) { +#line 7035 "LibraryWindow.c" + ImportPage* _tmp16_; #line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp21_ = page; + _tmp16_ = page; #line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PAGE, Page)); -#line 6715 "LibraryWindow.c" + library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE, Page)); +#line 7041 "LibraryWindow.c" } else { #line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_error_message ("Unable to unmount the camera at this time.", NULL); -#line 6719 "LibraryWindow.c" +#line 7045 "LibraryWindow.c" } } else { - ImportPage* _tmp22_; + ImportPage* _tmp17_; #line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_ = page; + _tmp17_ = page; #line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE, Page)); -#line 6727 "LibraryWindow.c" + library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PAGE, Page)); +#line 7053 "LibraryWindow.c" } #line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); @@ -6734,41 +7060,40 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer _g_object_unref0 (page); #line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 6737 "LibraryWindow.c" +#line 7063 "LibraryWindow.c" } -void library_window_add_to_stack (LibraryWindow* self, Page* page) { - Page* _tmp0_; +void +library_window_add_to_stack (LibraryWindow* self, + Page* page) +{ + GtkStack* _tmp0_; GtkStack* _tmp1_; - Page* _tmp2_; - GtkStack* _tmp3_; #line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); #line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = page; -#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget)); #line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = self->priv->stack; -#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = page; + _tmp0_ = self->priv->stack; #line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget)); #line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = self->priv->stack; + _tmp1_ = self->priv->stack; #line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); -#line 6764 "LibraryWindow.c" + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); +#line 7087 "LibraryWindow.c" } -static void library_window_remove_from_stack (LibraryWindow* self, Page* page) { +static void +library_window_remove_from_stack (LibraryWindow* self, + Page* page) +{ GtkStack* _tmp0_; - Page* _tmp1_; - GtkStack* _tmp2_; + GtkStack* _tmp1_; #line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6776,46 +7101,54 @@ static void library_window_remove_from_stack (LibraryWindow* self, Page* page) { #line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->stack; #line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = page; -#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); + gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget)); #line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = self->priv->stack; + _tmp1_ = self->priv->stack; #line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); -#line 6786 "LibraryWindow.c" + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); +#line 7109 "LibraryWindow.c" } -static GVariant* _variant_new10 (gboolean value) { +static GVariant* +_variant_new10 (gboolean value) +{ #line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 6793 "LibraryWindow.c" +#line 7118 "LibraryWindow.c" } -static GVariant* _variant_new11 (gboolean value) { +static GVariant* +_variant_new11 (gboolean value) +{ #line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 6800 "LibraryWindow.c" +#line 7127 "LibraryWindow.c" } -static GVariant* _variant_new12 (gboolean value) { +static GVariant* +_variant_new12 (gboolean value) +{ #line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 6807 "LibraryWindow.c" +#line 7136 "LibraryWindow.c" } -static GVariant* _variant_new13 (const gchar* value) { +static GVariant* +_variant_new13 (const gchar* value) +{ #line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 6814 "LibraryWindow.c" +#line 7145 "LibraryWindow.c" } -static void library_window_load_configuration (LibraryWindow* self) { +static void +library_window_load_configuration (LibraryWindow* self) +{ GAction* basic_display_action = NULL; GAction* _tmp0_; GAction* _tmp1_; @@ -6823,39 +7156,35 @@ static void library_window_load_configuration (LibraryWindow* self) { GAction* _tmp3_; ConfigFacade* _tmp4_; ConfigFacade* _tmp5_; - gboolean _tmp6_; - GVariant* _tmp7_; + GVariant* _tmp6_; GAction* extended_display_action = NULL; + GAction* _tmp7_; GAction* _tmp8_; GAction* _tmp9_; GAction* _tmp10_; - GAction* _tmp11_; + ConfigFacade* _tmp11_; ConfigFacade* _tmp12_; - ConfigFacade* _tmp13_; - gboolean _tmp14_; - GVariant* _tmp15_; + GVariant* _tmp13_; GAction* search_bar_display_action = NULL; + GAction* _tmp14_; + GAction* _tmp15_; GAction* _tmp16_; GAction* _tmp17_; - GAction* _tmp18_; - GAction* _tmp19_; - ConfigFacade* _tmp20_; - ConfigFacade* _tmp21_; - gboolean _tmp22_; - GVariant* _tmp23_; + ConfigFacade* _tmp18_; + ConfigFacade* _tmp19_; + GVariant* _tmp20_; GAction* sort_events_action = NULL; - GAction* _tmp24_; - GAction* _tmp25_; - GAction* _tmp26_; - const gchar* _tmp27_ = NULL; - ConfigFacade* _tmp28_; - ConfigFacade* _tmp29_; - gboolean _tmp30_; - gboolean _tmp31_; + GAction* _tmp21_; + GAction* _tmp22_; + GAction* _tmp23_; + const gchar* _tmp24_ = NULL; + ConfigFacade* _tmp25_; + ConfigFacade* _tmp26_; + gboolean _tmp27_; gchar* event_sort_val = NULL; - gchar* _tmp32_; - GAction* _tmp33_; - GVariant* _tmp34_; + gchar* _tmp28_; + GAction* _tmp29_; + GVariant* _tmp30_; #line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6875,109 +7204,101 @@ static void library_window_load_configuration (LibraryWindow* self) { #line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; #line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = configuration_facade_get_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = _variant_new10 (_tmp6_); + _tmp6_ = _variant_new10 (configuration_facade_get_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_action_change_state (_tmp3_, _tmp7_); + g_action_change_state (_tmp3_, _tmp6_); #line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_variant_unref0 (_tmp7_); + _g_variant_unref0 (_tmp6_); #line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); #line 1003 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayExtendedProperties"); + _tmp7_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayExtendedProperties"); #line 1003 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = _g_object_ref0 (_tmp8_); + _tmp8_ = _g_object_ref0 (_tmp7_); #line 1003 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - extended_display_action = _tmp9_; + extended_display_action = _tmp8_; #line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = extended_display_action; + _tmp9_ = extended_display_action; #line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_assert (_tmp10_ != NULL, "extended_display_action != null"); + _vala_assert (_tmp9_ != NULL, "extended_display_action != null"); #line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = extended_display_action; -#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = config_facade_get_instance (); + _tmp10_ = extended_display_action; #line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = _tmp12_; + _tmp11_ = config_facade_get_instance (); #line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = configuration_facade_get_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp12_ = _tmp11_; #line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = _variant_new11 (_tmp14_); + _tmp13_ = _variant_new11 (configuration_facade_get_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_action_change_state (_tmp11_, _tmp15_); + g_action_change_state (_tmp10_, _tmp13_); #line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_variant_unref0 (_tmp15_); + _g_variant_unref0 (_tmp13_); #line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp12_); #line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar"); + _tmp14_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar"); #line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = _g_object_ref0 (_tmp16_); + _tmp15_ = _g_object_ref0 (_tmp14_); #line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - search_bar_display_action = _tmp17_; + search_bar_display_action = _tmp15_; #line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = search_bar_display_action; + _tmp16_ = search_bar_display_action; #line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_assert (_tmp18_ != NULL, "search_bar_display_action != null"); -#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = search_bar_display_action; + _vala_assert (_tmp16_ != NULL, "search_bar_display_action != null"); #line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp20_ = config_facade_get_instance (); + _tmp17_ = search_bar_display_action; #line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp21_ = _tmp20_; + _tmp18_ = config_facade_get_instance (); #line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_ = configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp19_ = _tmp18_; #line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp23_ = _variant_new12 (_tmp22_); + _tmp20_ = _variant_new12 (configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_action_change_state (_tmp19_, _tmp23_); + g_action_change_state (_tmp17_, _tmp20_); #line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_variant_unref0 (_tmp23_); + _g_variant_unref0 (_tmp20_); #line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp21_); + _g_object_unref0 (_tmp19_); #line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonSortEvents"); + _tmp21_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonSortEvents"); #line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp25_ = _g_object_ref0 (_tmp24_); + _tmp22_ = _g_object_ref0 (_tmp21_); #line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - sort_events_action = _tmp25_; + sort_events_action = _tmp22_; #line 1012 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp26_ = sort_events_action; + _tmp23_ = sort_events_action; #line 1012 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_assert (_tmp26_ != NULL, "sort_events_action != null"); + _vala_assert (_tmp23_ != NULL, "sort_events_action != null"); #line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp28_ = config_facade_get_instance (); + _tmp25_ = config_facade_get_instance (); #line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp29_ = _tmp28_; + _tmp26_ = _tmp25_; #line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp30_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp27_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp31_ = _tmp30_; + _g_object_unref0 (_tmp26_); #line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp29_); + if (_tmp27_) { #line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp31_) { -#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING; -#line 6963 "LibraryWindow.c" + _tmp24_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING; +#line 7284 "LibraryWindow.c" } else { #line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING; -#line 6967 "LibraryWindow.c" + _tmp24_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING; +#line 7288 "LibraryWindow.c" } #line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp32_ = g_strdup (_tmp27_); + _tmp28_ = g_strdup (_tmp24_); #line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - event_sort_val = _tmp32_; + event_sort_val = _tmp28_; #line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp33_ = sort_events_action; + _tmp29_ = sort_events_action; #line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp34_ = _variant_new13 (event_sort_val); + _tmp30_ = _variant_new13 (event_sort_val); #line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_action_change_state (_tmp33_, _tmp34_); + g_action_change_state (_tmp29_, _tmp30_); #line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_variant_unref0 (_tmp34_); + _g_variant_unref0 (_tmp30_); #line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (event_sort_val); #line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6988,71 +7309,64 @@ static void library_window_load_configuration (LibraryWindow* self) { _g_object_unref0 (extended_display_action); #line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (basic_display_action); -#line 6991 "LibraryWindow.c" +#line 7312 "LibraryWindow.c" } -static gboolean _library_window_on_pulse_background_progress_bar_gsource_func (gpointer self) { +static gboolean +_library_window_on_pulse_background_progress_bar_gsource_func (gpointer self) +{ gboolean result; result = library_window_on_pulse_background_progress_bar ((LibraryWindow*) self); #line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 7000 "LibraryWindow.c" +#line 7323 "LibraryWindow.c" } -static void library_window_start_pulse_background_progress_bar (LibraryWindow* self, const gchar* label, gint priority) { +static void +library_window_start_pulse_background_progress_bar (LibraryWindow* self, + const gchar* label, + gint priority) +{ gint _tmp0_; - gint _tmp1_; - gint _tmp2_; - gint _tmp3_; - GtkProgressBar* _tmp4_; - const gchar* _tmp5_; - GtkProgressBar* _tmp6_; - guint _tmp7_; + GtkProgressBar* _tmp1_; + GtkProgressBar* _tmp2_; #line 1023 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1023 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (label != NULL); #line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = priority; -#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = self->priv->current_progress_priority; + _tmp0_ = self->priv->current_progress_priority; #line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp0_ < _tmp1_) { + if (priority < _tmp0_) { #line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7025 "LibraryWindow.c" +#line 7345 "LibraryWindow.c" } #line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = priority; -#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE); -#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = priority; + library_window_stop_pulse_background_progress_bar (self, priority, FALSE); #line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->current_progress_priority = _tmp3_; -#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = self->priv->background_progress_bar; + self->priv->current_progress_priority = priority; #line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = label; + _tmp1_ = self->priv->background_progress_bar; #line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_progress_bar_set_text (_tmp4_, _tmp5_); + gtk_progress_bar_set_text (_tmp1_, label); #line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = self->priv->background_progress_bar; + _tmp2_ = self->priv->background_progress_bar; #line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_progress_bar_pulse (_tmp6_); + gtk_progress_bar_pulse (_tmp2_); #line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_show_background_progress_bar (self); #line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) LIBRARY_WINDOW_BACKGROUND_PROGRESS_PULSE_MSEC, _library_window_on_pulse_background_progress_bar_gsource_func, g_object_ref (self), g_object_unref); -#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->background_progress_pulse_id = _tmp7_; -#line 7051 "LibraryWindow.c" + self->priv->background_progress_pulse_id = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) LIBRARY_WINDOW_BACKGROUND_PROGRESS_PULSE_MSEC, _library_window_on_pulse_background_progress_bar_gsource_func, g_object_ref (self), g_object_unref); +#line 7363 "LibraryWindow.c" } -static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow* self) { +static gboolean +library_window_on_pulse_background_progress_bar (LibraryWindow* self) +{ gboolean result = FALSE; GtkProgressBar* _tmp0_; #line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -7065,210 +7379,175 @@ static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow* result = TRUE; #line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 7068 "LibraryWindow.c" +#line 7382 "LibraryWindow.c" } -static void library_window_stop_pulse_background_progress_bar (LibraryWindow* self, gint priority, gboolean clear) { +static void +library_window_stop_pulse_background_progress_bar (LibraryWindow* self, + gint priority, + gboolean clear) +{ gint _tmp0_; - gint _tmp1_; - guint _tmp2_; - gboolean _tmp4_; + guint _tmp1_; #line 1045 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = priority; -#line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = self->priv->current_progress_priority; + _tmp0_ = self->priv->current_progress_priority; #line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp0_ < _tmp1_) { + if (priority < _tmp0_) { #line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7087 "LibraryWindow.c" +#line 7401 "LibraryWindow.c" } #line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = self->priv->background_progress_pulse_id; + _tmp1_ = self->priv->background_progress_pulse_id; #line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp2_ != ((guint) 0)) { -#line 7093 "LibraryWindow.c" - guint _tmp3_; + if (_tmp1_ != ((guint) 0)) { +#line 7407 "LibraryWindow.c" + guint _tmp2_; #line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = self->priv->background_progress_pulse_id; + _tmp2_ = self->priv->background_progress_pulse_id; #line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_source_remove (_tmp3_); + g_source_remove (_tmp2_); #line 1051 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_pulse_id = (guint) 0; -#line 7101 "LibraryWindow.c" +#line 7415 "LibraryWindow.c" } #line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = clear; -#line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp4_) { -#line 7107 "LibraryWindow.c" - gint _tmp5_; -#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = priority; + if (clear) { #line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_clear_background_progress_bar (self, _tmp5_); -#line 7113 "LibraryWindow.c" + library_window_clear_background_progress_bar (self, priority); +#line 7421 "LibraryWindow.c" } } -static void library_window_update_background_progress_bar (LibraryWindow* self, const gchar* label, gint priority, gdouble count, gdouble total) { +static void +library_window_update_background_progress_bar (LibraryWindow* self, + const gchar* label, + gint priority, + gdouble count, + gdouble total) +{ gint _tmp0_; - gint _tmp1_; - gint _tmp2_; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; - gdouble _tmp5_; - gint _tmp10_; + gboolean _tmp1_ = FALSE; + gboolean _tmp2_ = FALSE; gdouble fraction = 0.0; - gdouble _tmp11_; - gdouble _tmp12_; - GtkProgressBar* _tmp13_; - gdouble _tmp14_; - GtkProgressBar* _tmp15_; - const gchar* _tmp16_; - gdouble _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; + GtkProgressBar* _tmp3_; + gdouble _tmp4_; + GtkProgressBar* _tmp5_; + gdouble _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (label != NULL); #line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = priority; -#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = self->priv->current_progress_priority; + _tmp0_ = self->priv->current_progress_priority; #line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp0_ < _tmp1_) { + if (priority < _tmp0_) { #line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7148 "LibraryWindow.c" +#line 7453 "LibraryWindow.c" } #line 1063 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = priority; -#line 1063 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE); -#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = count; + library_window_stop_pulse_background_progress_bar (self, priority, FALSE); #line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp5_ <= 0.0) { + if (count <= 0.0) { #line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = TRUE; -#line 7160 "LibraryWindow.c" + _tmp2_ = TRUE; +#line 7461 "LibraryWindow.c" } else { - gdouble _tmp6_; -#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = total; #line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = _tmp6_ <= 0.0; -#line 7167 "LibraryWindow.c" + _tmp2_ = total <= 0.0; +#line 7465 "LibraryWindow.c" } #line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp4_) { + if (_tmp2_) { #line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = TRUE; -#line 7173 "LibraryWindow.c" + _tmp1_ = TRUE; +#line 7471 "LibraryWindow.c" } else { - gdouble _tmp7_; - gdouble _tmp8_; #line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = count; -#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = total; -#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = _tmp7_ >= _tmp8_; -#line 7183 "LibraryWindow.c" + _tmp1_ = count >= total; +#line 7475 "LibraryWindow.c" } #line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp3_) { -#line 7187 "LibraryWindow.c" - gint _tmp9_; -#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = priority; + if (_tmp1_) { #line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_clear_background_progress_bar (self, _tmp9_); + library_window_clear_background_progress_bar (self, priority); #line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7195 "LibraryWindow.c" +#line 7483 "LibraryWindow.c" } #line 1071 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = priority; -#line 1071 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->current_progress_priority = _tmp10_; -#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = count; + self->priv->current_progress_priority = priority; #line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = total; -#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - fraction = _tmp11_ / _tmp12_; + fraction = count / total; #line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = self->priv->background_progress_bar; + _tmp3_ = self->priv->background_progress_bar; #line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = fraction; + _tmp4_ = fraction; #line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_progress_bar_set_fraction (_tmp13_, _tmp14_); -#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = self->priv->background_progress_bar; + gtk_progress_bar_set_fraction (_tmp3_, _tmp4_); #line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = label; + _tmp5_ = self->priv->background_progress_bar; #line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = fraction; + _tmp6_ = fraction; #line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = g_strdup_printf (_ ("%s (%d%%)"), _tmp16_, (gint) (_tmp17_ * 100.0)); + _tmp7_ = g_strdup_printf (_ ("%s (%d%%)"), label, (gint) (_tmp6_ * 100.0)); #line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = _tmp18_; + _tmp8_ = _tmp7_; #line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_progress_bar_set_text (_tmp15_, _tmp19_); + gtk_progress_bar_set_text (_tmp5_, _tmp8_); #line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_free0 (_tmp19_); + _g_free0 (_tmp8_); #line 1076 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_show_background_progress_bar (self); -#line 7229 "LibraryWindow.c" +#line 7509 "LibraryWindow.c" } -static void library_window_clear_background_progress_bar (LibraryWindow* self, gint priority) { +static void +library_window_clear_background_progress_bar (LibraryWindow* self, + gint priority) +{ gint _tmp0_; - gint _tmp1_; - gint _tmp2_; - GtkProgressBar* _tmp3_; - GtkProgressBar* _tmp4_; + GtkProgressBar* _tmp1_; + GtkProgressBar* _tmp2_; #line 1085 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = priority; -#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = self->priv->current_progress_priority; + _tmp0_ = self->priv->current_progress_priority; #line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp0_ < _tmp1_) { + if (priority < _tmp0_) { #line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7249 "LibraryWindow.c" +#line 7528 "LibraryWindow.c" } #line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = priority; -#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE); + library_window_stop_pulse_background_progress_bar (self, priority, FALSE); #line 1091 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->current_progress_priority = 0; #line 1093 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = self->priv->background_progress_bar; + _tmp1_ = self->priv->background_progress_bar; #line 1093 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_progress_bar_set_fraction (_tmp3_, 0.0); + gtk_progress_bar_set_fraction (_tmp1_, 0.0); #line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = self->priv->background_progress_bar; + _tmp2_ = self->priv->background_progress_bar; #line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_progress_bar_set_text (_tmp4_, ""); + gtk_progress_bar_set_text (_tmp2_, ""); #line 1095 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_hide_background_progress_bar (self); -#line 7267 "LibraryWindow.c" +#line 7544 "LibraryWindow.c" } -static void library_window_show_background_progress_bar (LibraryWindow* self) { +static void +library_window_show_background_progress_bar (LibraryWindow* self) +{ gboolean _tmp0_; #line 1103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); @@ -7276,7 +7555,7 @@ static void library_window_show_background_progress_bar (LibraryWindow* self) { _tmp0_ = self->priv->background_progress_displayed; #line 1104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp0_) { -#line 7279 "LibraryWindow.c" +#line 7558 "LibraryWindow.c" GtkBox* _tmp1_; GtkFrame* _tmp2_; GtkFrame* _tmp3_; @@ -7292,12 +7571,14 @@ static void library_window_show_background_progress_bar (LibraryWindow* self) { gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); #line 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_displayed = TRUE; -#line 7295 "LibraryWindow.c" +#line 7574 "LibraryWindow.c" } } -static void library_window_hide_background_progress_bar (LibraryWindow* self) { +static void +library_window_hide_background_progress_bar (LibraryWindow* self) +{ gboolean _tmp0_; #line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); @@ -7305,7 +7586,7 @@ static void library_window_hide_background_progress_bar (LibraryWindow* self) { _tmp0_ = self->priv->background_progress_displayed; #line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_) { -#line 7308 "LibraryWindow.c" +#line 7589 "LibraryWindow.c" GtkBox* _tmp1_; GtkFrame* _tmp2_; #line 1113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -7316,104 +7597,101 @@ static void library_window_hide_background_progress_bar (LibraryWindow* self) { gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); #line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_displayed = FALSE; -#line 7319 "LibraryWindow.c" +#line 7600 "LibraryWindow.c" } } -static void library_window_on_library_monitor_discovery_started (LibraryWindow* self) { +static void +library_window_on_library_monitor_discovery_started (LibraryWindow* self) +{ #line 1118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_start_pulse_background_progress_bar (self, _ ("Updating library…"), LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY); -#line 7329 "LibraryWindow.c" +#line 7612 "LibraryWindow.c" } -static void library_window_on_library_monitor_discovery_completed (LibraryWindow* self) { +static void +library_window_on_library_monitor_discovery_completed (LibraryWindow* self) +{ #line 1122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_stop_pulse_background_progress_bar (self, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY, TRUE); -#line 7338 "LibraryWindow.c" +#line 7623 "LibraryWindow.c" } -static void library_window_on_library_monitor_auto_update_progress (LibraryWindow* self, gint completed_files, gint total_files) { - gint _tmp0_; +static void +library_window_on_library_monitor_auto_update_progress (LibraryWindow* self, + gint completed_files, + gint total_files) +{ #line 1126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1127 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = total_files; -#line 1127 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp0_ < LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES) { + if (total_files < LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES) { #line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY); -#line 7352 "LibraryWindow.c" +#line 7638 "LibraryWindow.c" } else { - gint _tmp1_; - gint _tmp2_; -#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = completed_files; #line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = total_files; -#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_update_background_progress_bar (self, _ ("Updating library…"), LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY, (gdouble) _tmp1_, (gdouble) _tmp2_); -#line 7362 "LibraryWindow.c" + library_window_update_background_progress_bar (self, _ ("Updating library…"), LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY, (gdouble) completed_files, (gdouble) total_files); +#line 7642 "LibraryWindow.c" } } -static void library_window_on_library_monitor_auto_import_preparing (LibraryWindow* self) { +static void +library_window_on_library_monitor_auto_import_preparing (LibraryWindow* self) +{ #line 1135 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_start_pulse_background_progress_bar (self, _ ("Preparing to auto-import photos…"), LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY); -#line 7372 "LibraryWindow.c" +#line 7654 "LibraryWindow.c" } -static void library_window_on_library_monitor_auto_import_progress (LibraryWindow* self, guint64 completed_bytes, guint64 total_bytes) { - guint64 _tmp0_; - guint64 _tmp1_; +static void +library_window_on_library_monitor_auto_import_progress (LibraryWindow* self, + guint64 completed_bytes, + guint64 total_bytes) +{ #line 1140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = completed_bytes; -#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = total_bytes; -#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_update_background_progress_bar (self, _ ("Auto-importing photos…"), LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY, (gdouble) _tmp0_, (gdouble) _tmp1_); -#line 7387 "LibraryWindow.c" + library_window_update_background_progress_bar (self, _ ("Auto-importing photos…"), LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY, (gdouble) completed_bytes, (gdouble) total_bytes); +#line 7667 "LibraryWindow.c" } -static void library_window_on_metadata_writer_progress (LibraryWindow* self, guint completed, guint total) { - guint _tmp0_; +static void +library_window_on_metadata_writer_progress (LibraryWindow* self, + guint completed, + guint total) +{ #line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = total; -#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp0_ < ((guint) LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES)) { + if (total < ((guint) LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES)) { #line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY); -#line 7401 "LibraryWindow.c" +#line 7682 "LibraryWindow.c" } else { - guint _tmp1_; - guint _tmp2_; -#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = completed; -#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = total; #line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_update_background_progress_bar (self, _ ("Writing metadata to files…"), LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY, (gdouble) _tmp1_, (gdouble) _tmp2_); -#line 7411 "LibraryWindow.c" + library_window_update_background_progress_bar (self, _ ("Writing metadata to files…"), LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY, (gdouble) completed, (gdouble) total); +#line 7686 "LibraryWindow.c" } } -static void library_window_create_layout (LibraryWindow* self, Page* start_page) { +static void +library_window_create_layout (LibraryWindow* self, + Page* start_page) +{ GtkScrolledWindow* scrolled_sidebar = NULL; GtkScrolledWindow* _tmp0_; SidebarTree* _tmp1_; @@ -7456,15 +7734,12 @@ static void library_window_create_layout (LibraryWindow* self, Page* start_page) GtkPaned* _tmp38_; ConfigFacade* _tmp39_; ConfigFacade* _tmp40_; - gint _tmp41_; - GtkStack* _tmp42_; + GtkStack* _tmp41_; + gint _tmp42_; gint _tmp43_; - gint _tmp44_; - GtkBox* _tmp45_; - GtkPaned* _tmp46_; - GtkBox* _tmp47_; - Page* _tmp48_; - Page* _tmp49_; + GtkBox* _tmp44_; + GtkPaned* _tmp45_; + GtkBox* _tmp46_; #line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -7618,111 +7893,95 @@ static void library_window_create_layout (LibraryWindow* self, Page* start_page) #line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp40_ = _tmp39_; #line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp41_ = configuration_facade_get_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_paned_set_position (_tmp38_, _tmp41_); + gtk_paned_set_position (_tmp38_, configuration_facade_get_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp40_); #line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp42_ = self->priv->stack; + _tmp41_ = self->priv->stack; #line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp43_ = library_window_get_PAGE_MIN_WIDTH (); + _tmp42_ = library_window_get_PAGE_MIN_WIDTH (); #line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp44_ = _tmp43_; + _tmp43_ = _tmp42_; #line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), _tmp44_, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), _tmp43_, -1); #line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp45_ = self->priv->layout; + _tmp44_ = self->priv->layout; #line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp46_ = self->priv->client_paned; + _tmp45_ = self->priv->client_paned; #line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_box_pack_end (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_end (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 1201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp47_ = self->priv->layout; + _tmp46_ = self->priv->layout; #line 1201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget)); #line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp48_ = start_page; -#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_switch_to_page (self, _tmp48_); -#line 1204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp49_ = start_page; + library_window_switch_to_page (self, start_page); #line 1204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (start_page, gtk_widget_get_type (), GtkWidget)); #line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (scrolled_sidebar); -#line 7654 "LibraryWindow.c" +#line 7923 "LibraryWindow.c" } -static void library_window_real_set_current_page (PageWindow* base, Page* page) { +static void +library_window_real_set_current_page (PageWindow* base, + Page* page) +{ LibraryWindow * self; - Page* _tmp0_; #line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); #line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = page; -#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_switch_to_page (self, _tmp0_); -#line 7669 "LibraryWindow.c" + library_window_switch_to_page (self, page); +#line 7938 "LibraryWindow.c" } -void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable) { - gboolean _tmp0_; +void +library_window_set_page_switching_enabled (LibraryWindow* self, + gboolean should_enable) +{ #line 1212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = should_enable; -#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->page_switching_enabled = _tmp0_; -#line 7681 "LibraryWindow.c" + self->priv->page_switching_enabled = should_enable; +#line 7950 "LibraryWindow.c" } -void library_window_switch_to_page (LibraryWindow* self, Page* page) { +void +library_window_switch_to_page (LibraryWindow* self, + Page* page) +{ gboolean _tmp0_; Page* _tmp1_; Page* _tmp2_; - Page* _tmp3_; - gboolean _tmp4_; + gboolean _tmp3_; Page* current_page = NULL; + Page* _tmp4_; Page* _tmp5_; - Page* _tmp6_; - GtkStack* _tmp16_; - Page* _tmp17_; - Page* _tmp18_; - Page* _tmp19_; - gboolean _tmp21_; - Page* _tmp22_; + GtkStack* _tmp15_; SidebarEntry* entry = NULL; - GeeHashMap* _tmp23_; - Page* _tmp24_; - gpointer _tmp25_; - SidebarEntry* _tmp26_; - Page* _tmp37_; - Page* _tmp39_; - Page* _tmp40_; - Page* _tmp41_; - Page* _tmp42_; - Page* _tmp43_; - GMenuModel* _tmp44_; - GMenuModel* _tmp45_; + GeeHashMap* _tmp17_; + gpointer _tmp18_; + SidebarEntry* _tmp19_; + Page* _tmp29_; + Page* _tmp30_; + GMenuModel* _tmp31_; + GMenuModel* _tmp32_; gboolean old = FALSE; - GtkSettings* _tmp46_; - gboolean _tmp47_; - gboolean _tmp48_; - GtkSettings* _tmp49_; - gboolean _tmp50_; - GtkSettings* _tmp51_; - gboolean _tmp52_; + GtkSettings* _tmp33_; + gboolean _tmp34_; + gboolean _tmp35_; + GtkSettings* _tmp36_; + gboolean _tmp37_; + GtkSettings* _tmp38_; + gboolean _tmp39_; GtkToolbar* toolbar = NULL; - Page* _tmp53_; - GtkToolbar* _tmp54_; - GtkToolbar* _tmp55_; - Page* _tmp61_; + GtkToolbar* _tmp40_; + GtkToolbar* _tmp41_; #line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -7733,306 +7992,270 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { if (!_tmp0_) { #line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7736 "LibraryWindow.c" +#line 7995 "LibraryWindow.c" } #line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = page; -#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); + _tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); #line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = _tmp1_ == _tmp3_; + _tmp3_ = page == _tmp2_; #line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp4_) { + if (_tmp3_) { #line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7752 "LibraryWindow.c" +#line 8009 "LibraryWindow.c" } #line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); + _tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); #line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - current_page = _tmp5_; + current_page = _tmp4_; #line 1224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = current_page; + _tmp5_ = current_page; #line 1224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp6_ != NULL) { -#line 7762 "LibraryWindow.c" + if (_tmp5_ != NULL) { +#line 8019 "LibraryWindow.c" GtkToolbar* toolbar = NULL; - Page* _tmp7_; + Page* _tmp6_; + GtkToolbar* _tmp7_; GtkToolbar* _tmp8_; - GtkToolbar* _tmp9_; + Page* _tmp11_; Page* _tmp12_; - Page* _tmp13_; - Page* _tmp15_; + Page* _tmp14_; #line 1225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), FALSE); #line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" application_set_menubar (NULL); #line 1228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = current_page; + _tmp6_ = current_page; #line 1228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = page_get_toolbar (_tmp7_); + _tmp7_ = page_get_toolbar (_tmp6_); #line 1228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - toolbar = _tmp8_; + toolbar = _tmp7_; #line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = toolbar; + _tmp8_ = toolbar; #line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp9_ != NULL) { -#line 7784 "LibraryWindow.c" - GtkRevealer* _tmp10_; - GtkToolbar* _tmp11_; + if (_tmp8_ != NULL) { +#line 8041 "LibraryWindow.c" + GtkRevealer* _tmp9_; + GtkToolbar* _tmp10_; #line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = self->priv->toolbar_revealer; + _tmp9_ = self->priv->toolbar_revealer; #line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = toolbar; + _tmp10_ = toolbar; #line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget)); -#line 7793 "LibraryWindow.c" + gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget)); +#line 8050 "LibraryWindow.c" } #line 1232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = current_page; + _tmp11_ = current_page; #line 1232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - page_switching_from (_tmp12_); + page_switching_from (_tmp11_); #line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = current_page; + _tmp12_ = current_page; #line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO_PAGE)) { -#line 7803 "LibraryWindow.c" - SidebarTree* _tmp14_; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_LIBRARY_PHOTO_PAGE)) { +#line 8060 "LibraryWindow.c" + SidebarTree* _tmp13_; #line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = self->priv->sidebar_tree; + _tmp13_ = self->priv->sidebar_tree; #line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - sidebar_tree_enable_editing (_tmp14_); -#line 7809 "LibraryWindow.c" + sidebar_tree_enable_editing (_tmp13_); +#line 8066 "LibraryWindow.c" } #line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = current_page; + _tmp14_ = current_page; #line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_unsubscribe_from_basic_information (self, _tmp15_); + library_window_unsubscribe_from_basic_information (self, _tmp14_); #line 1224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (toolbar); -#line 7817 "LibraryWindow.c" +#line 8074 "LibraryWindow.c" } #line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = self->priv->stack; -#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = page; + _tmp15_ = self->priv->stack; #line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_stack_set_visible_child (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget)); + gtk_stack_set_visible_child (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget)); #line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = page; -#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - PAGE_WINDOW_CLASS (library_window_parent_class)->set_current_page (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), _tmp18_); -#line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = page; + PAGE_WINDOW_CLASS (library_window_parent_class)->set_current_page (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), page); #line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_LIBRARY_PHOTO_PAGE)) { -#line 7833 "LibraryWindow.c" - SidebarTree* _tmp20_; + if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_LIBRARY_PHOTO_PAGE)) { +#line 8084 "LibraryWindow.c" + SidebarTree* _tmp16_; #line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp20_ = self->priv->sidebar_tree; + _tmp16_ = self->priv->sidebar_tree; #line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - sidebar_tree_disable_editing (_tmp20_); -#line 7839 "LibraryWindow.c" + sidebar_tree_disable_editing (_tmp16_); +#line 8090 "LibraryWindow.c" } #line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp21_ = library_window_should_show_search_bar (self); -#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_ = page; -#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_toggle_search_bar (self, _tmp21_, G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp22_) : NULL); + library_window_toggle_search_bar (self, library_window_should_show_search_bar (self), G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) page) : NULL); #line 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp23_ = self->priv->page_map; + _tmp17_ = self->priv->page_map; #line 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_ = page; + _tmp18_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), page); #line 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp25_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_); -#line 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - entry = (SidebarEntry*) _tmp25_; + entry = (SidebarEntry*) _tmp18_; #line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp26_ = entry; + _tmp19_ = entry; #line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp26_ != NULL) { -#line 7859 "LibraryWindow.c" + if (_tmp19_ != NULL) { +#line 8104 "LibraryWindow.c" SidebarExpandableEntry* expandable_entry = NULL; - SidebarEntry* _tmp27_; - SidebarExpandableEntry* _tmp28_; - gboolean _tmp29_ = FALSE; - SidebarExpandableEntry* _tmp30_; - SidebarTree* _tmp35_; - SidebarEntry* _tmp36_; + SidebarEntry* _tmp20_; + SidebarExpandableEntry* _tmp21_; + gboolean _tmp22_ = FALSE; + SidebarExpandableEntry* _tmp23_; + SidebarTree* _tmp27_; + SidebarEntry* _tmp28_; #line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp27_ = entry; + _tmp20_ = entry; #line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, SIDEBAR_TYPE_EXPANDABLE_ENTRY) ? ((SidebarExpandableEntry*) _tmp27_) : NULL); + _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, SIDEBAR_TYPE_EXPANDABLE_ENTRY) ? ((SidebarExpandableEntry*) _tmp20_) : NULL); #line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - expandable_entry = _tmp28_; -#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp30_ = expandable_entry; + expandable_entry = _tmp21_; #line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp30_ != NULL) { -#line 7877 "LibraryWindow.c" - SidebarExpandableEntry* _tmp31_; - gboolean _tmp32_; + _tmp23_ = expandable_entry; #line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp31_ = expandable_entry; + if (_tmp23_ != NULL) { +#line 8122 "LibraryWindow.c" + SidebarExpandableEntry* _tmp24_; #line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp32_ = sidebar_expandable_entry_expand_on_select (_tmp31_); + _tmp24_ = expandable_entry; #line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp29_ = _tmp32_; -#line 7886 "LibraryWindow.c" + _tmp22_ = sidebar_expandable_entry_expand_on_select (_tmp24_); +#line 8128 "LibraryWindow.c" } else { #line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp29_ = FALSE; -#line 7890 "LibraryWindow.c" + _tmp22_ = FALSE; +#line 8132 "LibraryWindow.c" } #line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp29_) { -#line 7894 "LibraryWindow.c" - SidebarTree* _tmp33_; - SidebarEntry* _tmp34_; + if (_tmp22_) { +#line 8136 "LibraryWindow.c" + SidebarTree* _tmp25_; + SidebarEntry* _tmp26_; #line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp33_ = self->priv->sidebar_tree; + _tmp25_ = self->priv->sidebar_tree; #line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp34_ = entry; + _tmp26_ = entry; #line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - sidebar_tree_expand_to_entry (_tmp33_, _tmp34_); -#line 7903 "LibraryWindow.c" + sidebar_tree_expand_to_entry (_tmp25_, _tmp26_); +#line 8145 "LibraryWindow.c" } #line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp35_ = self->priv->sidebar_tree; + _tmp27_ = self->priv->sidebar_tree; #line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp36_ = entry; + _tmp28_ = entry; #line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - sidebar_tree_place_cursor (_tmp35_, _tmp36_, TRUE); + sidebar_tree_place_cursor (_tmp27_, _tmp28_, TRUE); #line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (expandable_entry); -#line 7913 "LibraryWindow.c" +#line 8155 "LibraryWindow.c" } #line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties (self); #line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp37_ = page; -#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, TYPE_CHECKERBOARD_PAGE)) { -#line 7921 "LibraryWindow.c" - Page* _tmp38_; -#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp38_ = page; + if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_CHECKERBOARD_PAGE)) { #line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_init_view_filter (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)); -#line 7927 "LibraryWindow.c" + library_window_init_view_filter (self, G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)); +#line 8163 "LibraryWindow.c" } #line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp39_ = page; -#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget)); #line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp40_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); + _tmp29_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); #line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp41_ = _tmp40_; + _tmp30_ = _tmp29_; #line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_subscribe_for_basic_information (self, _tmp41_); + library_window_subscribe_for_basic_information (self, _tmp30_); #line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp41_); -#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp42_ = page; + _g_object_unref0 (_tmp30_); #line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - page_switched_to (_tmp42_); + page_switched_to (page); #line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp43_ = page; + _tmp31_ = page_get_menubar (page); #line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp44_ = page_get_menubar (_tmp43_); -#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp45_ = _tmp44_; + _tmp32_ = _tmp31_; #line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - application_set_menubar (_tmp45_); + application_set_menubar (_tmp32_); #line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp45_); + _g_object_unref0 (_tmp32_); #line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), TRUE); #line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp46_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); + _tmp33_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_object_get (_tmp46_, "gtk-shell-shows-menubar", &_tmp47_, NULL); + g_object_get (_tmp33_, "gtk-shell-shows-menubar", &_tmp34_, NULL); #line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp48_ = _tmp47_; + _tmp35_ = _tmp34_; #line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - old = _tmp48_; + old = _tmp35_; #line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp49_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); + _tmp36_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp50_ = old; + _tmp37_ = old; #line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_object_set (_tmp49_, "gtk-shell-shows-menubar", !_tmp50_, NULL); + g_object_set (_tmp36_, "gtk-shell-shows-menubar", !_tmp37_, NULL); #line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp51_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); + _tmp38_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp52_ = old; + _tmp39_ = old; #line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_object_set (_tmp51_, "gtk-shell-shows-menubar", _tmp52_, NULL); + g_object_set (_tmp38_, "gtk-shell-shows-menubar", _tmp39_, NULL); #line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp53_ = page; + _tmp40_ = page_get_toolbar (page); #line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp54_ = page_get_toolbar (_tmp53_); -#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - toolbar = _tmp54_; + toolbar = _tmp40_; #line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp55_ = toolbar; + _tmp41_ = toolbar; #line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp55_ != NULL) { -#line 7987 "LibraryWindow.c" - GtkRevealer* _tmp56_; - GtkToolbar* _tmp57_; - GtkToolbar* _tmp58_; - GtkRevealer* _tmp59_; - gboolean _tmp60_; + if (_tmp41_ != NULL) { +#line 8215 "LibraryWindow.c" + GtkRevealer* _tmp42_; + GtkToolbar* _tmp43_; + GtkToolbar* _tmp44_; + GtkRevealer* _tmp45_; #line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp56_ = self->priv->toolbar_revealer; + _tmp42_ = self->priv->toolbar_revealer; #line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp57_ = toolbar; + _tmp43_ = toolbar; #line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget)); #line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp58_ = toolbar; + _tmp44_ = toolbar; #line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget)); -#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp59_ = self->priv->toolbar_revealer; + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget)); #line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp60_ = library_window_is_toolbar_visible (self); + _tmp45_ = self->priv->toolbar_revealer; #line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_revealer_set_reveal_child (_tmp59_, _tmp60_); -#line 8009 "LibraryWindow.c" + gtk_revealer_set_reveal_child (_tmp45_, library_window_is_toolbar_visible (self)); +#line 8234 "LibraryWindow.c" } #line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp61_ = page; -#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - page_ready (_tmp61_); + page_ready (page); #line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (toolbar); #line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); #line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (current_page); -#line 8021 "LibraryWindow.c" +#line 8244 "LibraryWindow.c" } -static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPage* page) { +static void +library_window_init_view_filter (LibraryWindow* self, + CheckerboardPage* page) +{ SearchFilterToolbar* _tmp0_; - CheckerboardPage* _tmp1_; + SearchViewFilter* _tmp1_; SearchViewFilter* _tmp2_; - SearchViewFilter* _tmp3_; - CheckerboardPage* _tmp4_; - ViewCollection* _tmp5_; - ViewCollection* _tmp6_; - CheckerboardPage* _tmp7_; - SearchViewFilter* _tmp8_; - SearchViewFilter* _tmp9_; + ViewCollection* _tmp3_; + ViewCollection* _tmp4_; + SearchViewFilter* _tmp5_; + SearchViewFilter* _tmp6_; #line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8040,38 +8263,34 @@ static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPa #line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->search_toolbar; #line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = page; + _tmp1_ = checkerboard_page_get_search_view_filter (page); #line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = checkerboard_page_get_search_view_filter (_tmp1_); -#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - search_filter_toolbar_set_view_filter (_tmp0_, _tmp3_); + search_filter_toolbar_set_view_filter (_tmp0_, _tmp2_); #line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _view_filter_unref0 (_tmp3_); -#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = page; + _view_filter_unref0 (_tmp2_); #line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_PAGE, Page)); #line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = _tmp5_; -#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = page; + _tmp4_ = _tmp3_; #line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = checkerboard_page_get_search_view_filter (_tmp7_); + _tmp5_ = checkerboard_page_get_search_view_filter (page); #line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - view_collection_install_view_filter (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIEW_FILTER, ViewFilter)); + view_collection_install_view_filter (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_VIEW_FILTER, ViewFilter)); #line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _view_filter_unref0 (_tmp9_); + _view_filter_unref0 (_tmp6_); #line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _data_collection_unref0 (_tmp6_); -#line 8070 "LibraryWindow.c" + _data_collection_unref0 (_tmp4_); +#line 8287 "LibraryWindow.c" } -static gboolean library_window_should_show_search_bar (LibraryWindow* self) { +static gboolean +library_window_should_show_search_bar (LibraryWindow* self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; Page* _tmp1_; @@ -8089,30 +8308,32 @@ static gboolean library_window_should_show_search_bar (LibraryWindow* self) { _g_object_unref0 (_tmp2_); #line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_) { -#line 8092 "LibraryWindow.c" +#line 8311 "LibraryWindow.c" gboolean _tmp4_; #line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->is_search_toolbar_visible; #line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _tmp4_; -#line 8098 "LibraryWindow.c" +#line 8317 "LibraryWindow.c" } else { #line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = FALSE; -#line 8102 "LibraryWindow.c" +#line 8321 "LibraryWindow.c" } #line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp0_; #line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 8108 "LibraryWindow.c" +#line 8327 "LibraryWindow.c" } -static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show, CheckerboardPage* page) { +static void +library_window_toggle_search_bar (LibraryWindow* self, + gboolean show, + CheckerboardPage* page) +{ SearchFilterToolbar* _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_; #line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8120,102 +8341,79 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show #line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->search_toolbar; #line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = show; -#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_revealer_set_reveal_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_revealer_get_type (), GtkRevealer), _tmp1_); + gtk_revealer_set_reveal_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_revealer_get_type (), GtkRevealer), show); #line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = show; -#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp2_) { -#line 8130 "LibraryWindow.c" - CheckerboardPage* _tmp3_; - SearchFilterToolbar* _tmp4_; - CheckerboardPage* _tmp5_; + if (show) { +#line 8347 "LibraryWindow.c" + SearchFilterToolbar* _tmp1_; + SearchViewFilter* _tmp2_; + SearchViewFilter* _tmp3_; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; SearchViewFilter* _tmp6_; SearchViewFilter* _tmp7_; - CheckerboardPage* _tmp8_; - ViewCollection* _tmp9_; - ViewCollection* _tmp10_; - CheckerboardPage* _tmp11_; - SearchViewFilter* _tmp12_; - SearchViewFilter* _tmp13_; -#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = page; #line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_assert (NULL != _tmp3_, "null != page"); + _vala_assert (NULL != page, "null != page"); #line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = self->priv->search_toolbar; + _tmp1_ = self->priv->search_toolbar; #line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = page; + _tmp2_ = checkerboard_page_get_search_view_filter (page); #line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = checkerboard_page_get_search_view_filter (_tmp5_); -#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = _tmp6_; + _tmp3_ = _tmp2_; #line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - search_filter_toolbar_set_view_filter (_tmp4_, _tmp7_); + search_filter_toolbar_set_view_filter (_tmp1_, _tmp3_); #line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _view_filter_unref0 (_tmp7_); -#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = page; + _view_filter_unref0 (_tmp3_); #line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page)); -#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = _tmp9_; + _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_PAGE, Page)); #line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = page; + _tmp5_ = _tmp4_; #line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = checkerboard_page_get_search_view_filter (_tmp11_); + _tmp6_ = checkerboard_page_get_search_view_filter (page); #line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = _tmp12_; + _tmp7_ = _tmp6_; #line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - view_collection_install_view_filter (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_VIEW_FILTER, ViewFilter)); + view_collection_install_view_filter (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIEW_FILTER, ViewFilter)); #line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _view_filter_unref0 (_tmp13_); + _view_filter_unref0 (_tmp7_); #line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _data_collection_unref0 (_tmp10_); -#line 8176 "LibraryWindow.c" + _data_collection_unref0 (_tmp5_); +#line 8381 "LibraryWindow.c" } else { - CheckerboardPage* _tmp14_; -#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = page; #line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp14_ != NULL) { -#line 8183 "LibraryWindow.c" - CheckerboardPage* _tmp15_; - ViewCollection* _tmp16_; - ViewCollection* _tmp17_; - DisabledViewFilter* _tmp18_; - DisabledViewFilter* _tmp19_; -#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = page; + if (page != NULL) { +#line 8385 "LibraryWindow.c" + ViewCollection* _tmp8_; + ViewCollection* _tmp9_; + DisabledViewFilter* _tmp10_; + DisabledViewFilter* _tmp11_; #line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE, Page)); + _tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_PAGE, Page)); #line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = _tmp16_; + _tmp9_ = _tmp8_; #line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = disabled_view_filter_new (); + _tmp10_ = disabled_view_filter_new (); #line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = _tmp18_; + _tmp11_ = _tmp10_; #line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - view_collection_install_view_filter (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_VIEW_FILTER, ViewFilter)); + view_collection_install_view_filter (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_VIEW_FILTER, ViewFilter)); #line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _view_filter_unref0 (_tmp19_); + _view_filter_unref0 (_tmp11_); #line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _data_collection_unref0 (_tmp17_); -#line 8205 "LibraryWindow.c" + _data_collection_unref0 (_tmp9_); +#line 8404 "LibraryWindow.c" } } } -static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepresentative* entry, Page* page) { +static void +library_window_on_page_created (LibraryWindow* self, + SidebarPageRepresentative* entry, + Page* page) +{ GeeHashMap* _tmp0_; - Page* _tmp1_; - gboolean _tmp2_; - GeeHashMap* _tmp3_; - Page* _tmp4_; - SidebarPageRepresentative* _tmp5_; - Page* _tmp6_; + GeeHashMap* _tmp1_; #line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8225,37 +8423,28 @@ static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepr #line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->page_map; #line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = page; -#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_assert (!_tmp2_, "!page_map.has_key(page)"); -#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = self->priv->page_map; + _vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), page), "!page_map.has_key(page)"); #line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = page; + _tmp1_ = self->priv->page_map; #line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = entry; -#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = page; + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), page, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry)); #line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_add_to_stack (self, _tmp6_); -#line 8245 "LibraryWindow.c" + library_window_add_to_stack (self, page); +#line 8433 "LibraryWindow.c" } -static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageRepresentative* entry, Page* page) { +static void +library_window_on_destroying_page (LibraryWindow* self, + SidebarPageRepresentative* entry, + Page* page) +{ Page* _tmp0_; Page* _tmp1_; - Page* _tmp2_; - gboolean _tmp3_; - Page* _tmp9_; + gboolean _tmp2_; gboolean removed = FALSE; - GeeHashMap* _tmp10_; - Page* _tmp11_; - gboolean _tmp12_; + GeeHashMap* _tmp8_; + gboolean _tmp9_; #line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8263,115 +8452,109 @@ static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageR #line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); #line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = page; -#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); + _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); #line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = _tmp0_ == _tmp2_; + _tmp2_ = page == _tmp1_; #line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp3_) { -#line 8277 "LibraryWindow.c" - LibraryBranch* _tmp4_; + if (_tmp2_) { +#line 8464 "LibraryWindow.c" + LibraryBranch* _tmp3_; + LibraryPhotosEntry* _tmp4_; LibraryPhotosEntry* _tmp5_; - LibraryPhotosEntry* _tmp6_; + Page* _tmp6_; Page* _tmp7_; - Page* _tmp8_; #line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = self->priv->library_branch; + _tmp3_ = self->priv->library_branch; #line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = library_branch_get_photos_entry (_tmp4_); + _tmp4_ = library_branch_get_photos_entry (_tmp3_); #line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); + _tmp6_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); #line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_switch_to_page (self, _tmp8_); + library_window_switch_to_page (self, _tmp7_); #line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp8_); -#line 8297 "LibraryWindow.c" + _g_object_unref0 (_tmp7_); +#line 8484 "LibraryWindow.c" } #line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = page; -#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_remove_from_stack (self, _tmp9_); -#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = self->priv->page_map; + library_window_remove_from_stack (self, page); #line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = page; + _tmp8_ = self->priv->page_map; #line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL); + _tmp9_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), page, NULL); #line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - removed = _tmp12_; + removed = _tmp9_; #line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (removed, "removed"); -#line 8313 "LibraryWindow.c" +#line 8496 "LibraryWindow.c" } -static void library_window_on_sidebar_entry_selected (LibraryWindow* self, SidebarSelectableEntry* selectable) { +static void +library_window_on_sidebar_entry_selected (LibraryWindow* self, + SidebarSelectableEntry* selectable) +{ SidebarPageRepresentative* page_rep = NULL; - SidebarSelectableEntry* _tmp0_; + SidebarPageRepresentative* _tmp0_; SidebarPageRepresentative* _tmp1_; - SidebarPageRepresentative* _tmp2_; #line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable)); #line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = selectable; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (selectable, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) selectable) : NULL); #line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp0_) : NULL); -#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - page_rep = _tmp1_; + page_rep = _tmp0_; #line 1341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = page_rep; + _tmp1_ = page_rep; #line 1341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp2_ != NULL) { -#line 8336 "LibraryWindow.c" - SidebarPageRepresentative* _tmp3_; + if (_tmp1_ != NULL) { +#line 8519 "LibraryWindow.c" + SidebarPageRepresentative* _tmp2_; + Page* _tmp3_; Page* _tmp4_; - Page* _tmp5_; #line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = page_rep; + _tmp2_ = page_rep; #line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = sidebar_page_representative_get_page (_tmp3_); + _tmp3_ = sidebar_page_representative_get_page (_tmp2_); #line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_switch_to_page (self, _tmp5_); + library_window_switch_to_page (self, _tmp4_); #line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp5_); -#line 8350 "LibraryWindow.c" + _g_object_unref0 (_tmp4_); +#line 8533 "LibraryWindow.c" } #line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (page_rep); -#line 8354 "LibraryWindow.c" +#line 8537 "LibraryWindow.c" } -static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* self, SidebarSelectableEntry* selectable) { +static void +library_window_on_sidebar_selected_entry_removed (LibraryWindow* self, + SidebarSelectableEntry* selectable) +{ LibraryLastImportSidebarEntry* last_import_entry = NULL; LibraryBranch* _tmp0_; LibraryLastImportSidebarEntry* _tmp1_; LibraryLastImportSidebarEntry* _tmp2_; LibraryLastImportSidebarEntry* _tmp3_; gboolean _tmp4_ = FALSE; - SidebarSelectableEntry* _tmp5_; - gboolean _tmp12_ = FALSE; - SidebarSelectableEntry* _tmp13_; - gboolean _tmp21_ = FALSE; - SidebarSelectableEntry* _tmp22_; - LibraryBranch* _tmp30_; - LibraryPhotosEntry* _tmp31_; - LibraryPhotosEntry* _tmp32_; - Page* _tmp33_; - Page* _tmp34_; + gboolean _tmp11_ = FALSE; + gboolean _tmp18_ = FALSE; + LibraryBranch* _tmp25_; + LibraryPhotosEntry* _tmp26_; + LibraryPhotosEntry* _tmp27_; + Page* _tmp28_; + Page* _tmp29_; #line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8387,209 +8570,214 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel #line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" last_import_entry = _tmp3_; #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = selectable; -#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY)) { -#line 8393 "LibraryWindow.c" - LibraryLastImportSidebarEntry* _tmp6_; + if (G_TYPE_CHECK_INSTANCE_TYPE (selectable, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY)) { +#line 8574 "LibraryWindow.c" + LibraryLastImportSidebarEntry* _tmp5_; + gboolean _tmp6_; gboolean _tmp7_; - gboolean _tmp8_; #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = last_import_entry; + _tmp5_ = last_import_entry; #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = library_hideable_page_entry_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry)); + _tmp6_ = library_hideable_page_entry_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry)); #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = _tmp8_; -#line 8405 "LibraryWindow.c" + _tmp4_ = _tmp7_; +#line 8586 "LibraryWindow.c" } else { #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = FALSE; -#line 8409 "LibraryWindow.c" +#line 8590 "LibraryWindow.c" } #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { -#line 8413 "LibraryWindow.c" - LibraryLastImportSidebarEntry* _tmp9_; +#line 8594 "LibraryWindow.c" + LibraryLastImportSidebarEntry* _tmp8_; + Page* _tmp9_; Page* _tmp10_; - Page* _tmp11_; #line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = last_import_entry; + _tmp8_ = last_import_entry; #line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); + _tmp9_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); #line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_switch_to_page (self, _tmp11_); + library_window_switch_to_page (self, _tmp10_); #line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp10_); #line 1355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (last_import_entry); #line 1355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8431 "LibraryWindow.c" +#line 8612 "LibraryWindow.c" } #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = selectable; -#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, EVENTS_TYPE_EVENT_ENTRY)) { -#line 8437 "LibraryWindow.c" - EventsBranch* _tmp14_; - gboolean _tmp15_; -#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = self->priv->events_branch; + if (G_TYPE_CHECK_INSTANCE_TYPE (selectable, EVENTS_TYPE_EVENT_ENTRY)) { +#line 8616 "LibraryWindow.c" + EventsBranch* _tmp12_; #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp12_ = self->priv->events_branch; #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = _tmp15_; -#line 8446 "LibraryWindow.c" + _tmp11_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SIDEBAR_TYPE_BRANCH, SidebarBranch)); +#line 8622 "LibraryWindow.c" } else { #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = FALSE; -#line 8450 "LibraryWindow.c" + _tmp11_ = FALSE; +#line 8626 "LibraryWindow.c" } #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp12_) { -#line 8454 "LibraryWindow.c" - EventsBranch* _tmp16_; - EventsMasterDirectoryEntry* _tmp17_; - EventsMasterDirectoryEntry* _tmp18_; - Page* _tmp19_; - Page* _tmp20_; + if (_tmp11_) { +#line 8630 "LibraryWindow.c" + EventsBranch* _tmp13_; + EventsMasterDirectoryEntry* _tmp14_; + EventsMasterDirectoryEntry* _tmp15_; + Page* _tmp16_; + Page* _tmp17_; #line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = self->priv->events_branch; + _tmp13_ = self->priv->events_branch; #line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = events_branch_get_master_entry (_tmp16_); + _tmp14_ = events_branch_get_master_entry (_tmp13_); #line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = _tmp17_; + _tmp15_ = _tmp14_; #line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); + _tmp16_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); #line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp20_ = _tmp19_; + _tmp17_ = _tmp16_; #line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_switch_to_page (self, _tmp20_); + library_window_switch_to_page (self, _tmp17_); #line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp17_); #line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp15_); #line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (last_import_entry); #line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8480 "LibraryWindow.c" +#line 8656 "LibraryWindow.c" } #line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_ = selectable; -#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, EVENTS_TYPE_DIRECTORY_ENTRY)) { -#line 8486 "LibraryWindow.c" - EventsBranch* _tmp23_; - gboolean _tmp24_; -#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp23_ = self->priv->events_branch; + if (G_TYPE_CHECK_INSTANCE_TYPE (selectable, EVENTS_TYPE_DIRECTORY_ENTRY)) { +#line 8660 "LibraryWindow.c" + EventsBranch* _tmp19_; #line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp19_ = self->priv->events_branch; #line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp21_ = _tmp24_; -#line 8495 "LibraryWindow.c" + _tmp18_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SIDEBAR_TYPE_BRANCH, SidebarBranch)); +#line 8666 "LibraryWindow.c" } else { #line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp21_ = FALSE; -#line 8499 "LibraryWindow.c" + _tmp18_ = FALSE; +#line 8670 "LibraryWindow.c" } #line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp21_) { -#line 8503 "LibraryWindow.c" - EventsBranch* _tmp25_; - EventsMasterDirectoryEntry* _tmp26_; - EventsMasterDirectoryEntry* _tmp27_; - Page* _tmp28_; - Page* _tmp29_; + if (_tmp18_) { +#line 8674 "LibraryWindow.c" + EventsBranch* _tmp20_; + EventsMasterDirectoryEntry* _tmp21_; + EventsMasterDirectoryEntry* _tmp22_; + Page* _tmp23_; + Page* _tmp24_; #line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp25_ = self->priv->events_branch; + _tmp20_ = self->priv->events_branch; #line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp26_ = events_branch_get_master_entry (_tmp25_); + _tmp21_ = events_branch_get_master_entry (_tmp20_); #line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp27_ = _tmp26_; + _tmp22_ = _tmp21_; #line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp28_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); + _tmp23_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); #line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp29_ = _tmp28_; + _tmp24_ = _tmp23_; #line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_switch_to_page (self, _tmp29_); + library_window_switch_to_page (self, _tmp24_); #line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp29_); + _g_object_unref0 (_tmp24_); #line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp27_); + _g_object_unref0 (_tmp22_); #line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (last_import_entry); #line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8529 "LibraryWindow.c" +#line 8700 "LibraryWindow.c" } #line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp30_ = self->priv->library_branch; + _tmp25_ = self->priv->library_branch; #line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp31_ = library_branch_get_photos_entry (_tmp30_); + _tmp26_ = library_branch_get_photos_entry (_tmp25_); #line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp32_ = _tmp31_; + _tmp27_ = _tmp26_; #line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp33_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); + _tmp28_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); #line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp34_ = _tmp33_; + _tmp29_ = _tmp28_; #line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_switch_to_page (self, _tmp34_); + library_window_switch_to_page (self, _tmp29_); #line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp34_); + _g_object_unref0 (_tmp29_); #line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (last_import_entry); -#line 8547 "LibraryWindow.c" +#line 8718 "LibraryWindow.c" } -static void _library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) { +static void +_library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender, + GeeIterable* changed, + gpointer self) +{ #line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties ((LibraryWindow*) self); -#line 8554 "LibraryWindow.c" +#line 8729 "LibraryWindow.c" } -static void _library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties ((LibraryWindow*) self); -#line 8561 "LibraryWindow.c" +#line 8740 "LibraryWindow.c" } -static void _library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { +static void +_library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self) +{ #line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties ((LibraryWindow*) self); -#line 8568 "LibraryWindow.c" +#line 8752 "LibraryWindow.c" } -static void _library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) { +static void +_library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender, + GeeCollection* changed, + gpointer self) +{ #line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties ((LibraryWindow*) self); -#line 8575 "LibraryWindow.c" +#line 8763 "LibraryWindow.c" } -static void library_window_subscribe_for_basic_information (LibraryWindow* self, Page* page) { +static void +library_window_subscribe_for_basic_information (LibraryWindow* self, + Page* page) +{ ViewCollection* view = NULL; - Page* _tmp0_; - ViewCollection* _tmp1_; + ViewCollection* _tmp0_; #line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); #line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = page; -#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = page_get_view (_tmp0_); + _tmp0_ = page_get_view (page); #line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - view = _tmp1_; + view = _tmp0_; #line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (view, "items-state-changed", (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self, 0); #line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8600,51 +8788,53 @@ static void library_window_subscribe_for_basic_information (LibraryWindow* self, g_signal_connect_object (view, "items-visibility-changed", (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self, 0); #line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 8603 "LibraryWindow.c" +#line 8791 "LibraryWindow.c" } -static void library_window_unsubscribe_from_basic_information (LibraryWindow* self, Page* page) { +static void +library_window_unsubscribe_from_basic_information (LibraryWindow* self, + Page* page) +{ ViewCollection* view = NULL; - Page* _tmp0_; - ViewCollection* _tmp1_; + ViewCollection* _tmp0_; + guint _tmp1_; guint _tmp2_; guint _tmp3_; guint _tmp4_; - guint _tmp5_; #line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); #line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = page; + _tmp0_ = page_get_view (page); #line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = page_get_view (_tmp0_); -#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - view = _tmp1_; + view = _tmp0_; #line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp2_, NULL, FALSE); + g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp1_, NULL, FALSE); #line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self); + g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self); #line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE); + g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp2_, NULL, FALSE); #line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_items_altered, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_items_altered, self); #line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE); + g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE); #line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_contents_altered, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_contents_altered, self); #line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp5_, NULL, FALSE); + g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp4_, NULL, FALSE); #line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self); + g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self); #line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 8643 "LibraryWindow.c" +#line 8831 "LibraryWindow.c" } -static void library_window_on_update_properties (LibraryWindow* self) { +static void +library_window_on_update_properties (LibraryWindow* self) +{ OneShotScheduler* _tmp0_; #line 1394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); @@ -8652,11 +8842,13 @@ static void library_window_on_update_properties (LibraryWindow* self) { _tmp0_ = self->priv->properties_scheduler; #line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" one_shot_scheduler_at_idle (_tmp0_); -#line 8655 "LibraryWindow.c" +#line 8845 "LibraryWindow.c" } -static void library_window_on_update_properties_now (LibraryWindow* self) { +static void +library_window_on_update_properties_now (LibraryWindow* self) +{ GtkFrame* _tmp0_; gboolean _tmp1_; gboolean _tmp2_; @@ -8673,7 +8865,7 @@ static void library_window_on_update_properties_now (LibraryWindow* self) { _tmp2_ = _tmp1_; #line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 8676 "LibraryWindow.c" +#line 8868 "LibraryWindow.c" BasicProperties* _tmp3_; Page* _tmp4_; Page* _tmp5_; @@ -8687,7 +8879,7 @@ static void library_window_on_update_properties_now (LibraryWindow* self) { properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_); #line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 8690 "LibraryWindow.c" +#line 8882 "LibraryWindow.c" } #line 1402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->extended_properties; @@ -8697,7 +8889,7 @@ static void library_window_on_update_properties_now (LibraryWindow* self) { _tmp8_ = _tmp7_; #line 1402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_) { -#line 8700 "LibraryWindow.c" +#line 8892 "LibraryWindow.c" ExtendedPropertiesWindow* _tmp9_; Page* _tmp10_; Page* _tmp11_; @@ -8711,263 +8903,237 @@ static void library_window_on_update_properties_now (LibraryWindow* self) { extended_properties_window_update_properties (_tmp9_, _tmp11_); #line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp11_); -#line 8714 "LibraryWindow.c" +#line 8906 "LibraryWindow.c" } } -static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { +static gchar* +string_replace (const gchar* self, + const gchar* old, + const gchar* replacement) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if ((*((gchar*) self)) == '\0') { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 8734 "LibraryWindow.c" +#line 8930 "LibraryWindow.c" } else { - const gchar* _tmp2_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; -#line 8741 "LibraryWindow.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) old)) == '\0'; +#line 8934 "LibraryWindow.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = TRUE; -#line 8747 "LibraryWindow.c" +#line 8940 "LibraryWindow.c" } else { - const gchar* _tmp3_; - const gchar* _tmp4_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = replacement; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; -#line 8757 "LibraryWindow.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (old, replacement) == 0; +#line 8944 "LibraryWindow.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 8761 "LibraryWindow.c" - gchar* _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = g_strdup (self); -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 8948 "LibraryWindow.c" + gchar* _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = g_strdup (self); +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 8769 "LibraryWindow.c" +#line 8956 "LibraryWindow.c" } { GRegex* regex = NULL; - const gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - GRegex* _tmp9_; - GRegex* _tmp10_; - gchar* _tmp11_ = NULL; - GRegex* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = old; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = g_regex_escape_string (_tmp6_, -1); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = _tmp9_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp8_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - regex = _tmp10_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp3_; + gchar* _tmp4_; + GRegex* _tmp5_; + GRegex* _tmp6_; + gchar* _tmp7_ = NULL; + GRegex* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_regex_escape_string (old, -1); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = _tmp3_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp5_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp4_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + regex = _tmp6_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 8801 "LibraryWindow.c" +#line 8984 "LibraryWindow.c" goto __catch48_g_regex_error; } -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 8810 "LibraryWindow.c" +#line 8993 "LibraryWindow.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = regex; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = replacement; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp14_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = regex; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp9_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 8826 "LibraryWindow.c" +#line 9007 "LibraryWindow.c" goto __catch48_g_regex_error; } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 8837 "LibraryWindow.c" +#line 9018 "LibraryWindow.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = _tmp11_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = NULL; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp15_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp11_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = _tmp7_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = NULL; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp10_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp7_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 8851 "LibraryWindow.c" +#line 9032 "LibraryWindow.c" } goto __finally48; __catch48_g_regex_error: { GError* e = NULL; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 8865 "LibraryWindow.c" +#line 9046 "LibraryWindow.c" } __finally48: -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 8876 "LibraryWindow.c" +#line 9057 "LibraryWindow.c" } } -void library_window_mounted_camera_shell_notification (LibraryWindow* self, const gchar* uri, gboolean at_startup) { - const gchar* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; +void +library_window_mounted_camera_shell_notification (LibraryWindow* self, + const gchar* uri, + gboolean at_startup) +{ GFile* uri_file = NULL; - const gchar* _tmp4_; - GFile* _tmp5_; + GFile* _tmp0_; GMount* mount = NULL; gchar* alt_uri = NULL; - const gchar* _tmp12_; - gboolean _tmp13_; - gboolean _tmp18_; GError * _inner_error_ = NULL; #line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (uri != NULL); #line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = uri; -#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:1407: mount point reported: %s", _tmp0_); -#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = uri; -#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = library_window_is_mount_uri_supported (_tmp1_); + g_debug ("LibraryWindow.vala:1407: mount point reported: %s", uri); #line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (!_tmp2_) { -#line 8908 "LibraryWindow.c" - const gchar* _tmp3_; + if (!library_window_is_mount_uri_supported (uri)) { #line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = uri; -#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:1411: Unsupported mount scheme: %s", _tmp3_); + g_debug ("LibraryWindow.vala:1411: Unsupported mount scheme: %s", uri); #line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8916 "LibraryWindow.c" +#line 9084 "LibraryWindow.c" } #line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = uri; -#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = g_file_new_for_uri (_tmp4_); + _tmp0_ = g_file_new_for_uri (uri); #line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - uri_file = _tmp5_; + uri_file = _tmp0_; #line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" mount = NULL; -#line 8926 "LibraryWindow.c" +#line 9092 "LibraryWindow.c" { - GMount* _tmp6_ = NULL; - GFile* _tmp7_; - GMount* _tmp8_; - GMount* _tmp9_; + GMount* _tmp1_ = NULL; + GFile* _tmp2_; + GMount* _tmp3_; + GMount* _tmp4_; #line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = uri_file; + _tmp2_ = uri_file; #line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = g_file_find_enclosing_mount (_tmp7_, NULL, &_inner_error_); + _tmp3_ = g_file_find_enclosing_mount (_tmp2_, NULL, &_inner_error_); #line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = _tmp8_; + _tmp1_ = _tmp3_; #line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8940 "LibraryWindow.c" +#line 9106 "LibraryWindow.c" goto __catch47_g_error; } #line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = _tmp6_; + _tmp4_ = _tmp1_; #line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = NULL; + _tmp1_ = NULL; #line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); #line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - mount = _tmp9_; + mount = _tmp4_; #line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp6_); -#line 8953 "LibraryWindow.c" + _g_object_unref0 (_tmp1_); +#line 9119 "LibraryWindow.c" } goto __finally47; __catch47_g_error: { GError* err = NULL; - GError* _tmp10_; - const gchar* _tmp11_; + GError* _tmp5_; + const gchar* _tmp6_; #line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" err = _inner_error_; #line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _inner_error_ = NULL; #line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = err; + _tmp5_ = err; #line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = _tmp10_->message; + _tmp6_ = _tmp5_->message; #line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:1423: %s", _tmp11_); + g_debug ("LibraryWindow.vala:1423: %s", _tmp6_); #line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_error_free0 (err); #line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8976,7 +9142,7 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons _g_object_unref0 (uri_file); #line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8979 "LibraryWindow.c" +#line 9145 "LibraryWindow.c" } __finally47: #line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8991,79 +9157,58 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons g_clear_error (&_inner_error_); #line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8994 "LibraryWindow.c" +#line 9160 "LibraryWindow.c" } #line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" alt_uri = NULL; #line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = uri; -#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = g_str_has_prefix (_tmp12_, "file://"); -#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp13_) { -#line 9004 "LibraryWindow.c" - const gchar* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = uri; + if (g_str_has_prefix (uri, "file://")) { +#line 9166 "LibraryWindow.c" + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = string_replace (_tmp14_, "file://", "disk:"); + _tmp7_ = string_replace (uri, "file://", "disk:"); #line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = _tmp15_; + _tmp8_ = _tmp7_; #line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = camera_table_get_port_uri (_tmp16_); + _tmp9_ = camera_table_get_port_uri (_tmp8_); #line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (alt_uri); #line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - alt_uri = _tmp17_; + alt_uri = _tmp9_; #line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_free0 (_tmp16_); -#line 9023 "LibraryWindow.c" + _g_free0 (_tmp8_); +#line 9182 "LibraryWindow.c" } #line 1434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = at_startup; -#line 1434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp18_) { -#line 9029 "LibraryWindow.c" - const gchar* _tmp19_; - gboolean _tmp20_; - const gchar* _tmp23_; - gboolean _tmp24_; -#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = uri; -#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp20_ = is_string_empty (_tmp19_); + if (at_startup) { +#line 9186 "LibraryWindow.c" + const gchar* _tmp11_; #line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (!_tmp20_) { -#line 9040 "LibraryWindow.c" - GeeHashSet* _tmp21_; - const gchar* _tmp22_; + if (!is_string_empty (uri)) { +#line 9190 "LibraryWindow.c" + GeeHashSet* _tmp10_; #line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp21_ = library_window_initial_camera_uris; + _tmp10_ = library_window_initial_camera_uris; #line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_ = uri; -#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_); -#line 9049 "LibraryWindow.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), uri); +#line 9196 "LibraryWindow.c" } #line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp23_ = alt_uri; -#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_ = is_string_empty (_tmp23_); + _tmp11_ = alt_uri; #line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (!_tmp24_) { -#line 9057 "LibraryWindow.c" - GeeHashSet* _tmp25_; - const gchar* _tmp26_; + if (!is_string_empty (_tmp11_)) { +#line 9202 "LibraryWindow.c" + GeeHashSet* _tmp12_; + const gchar* _tmp13_; #line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp25_ = library_window_initial_camera_uris; + _tmp12_ = library_window_initial_camera_uris; #line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp26_ = alt_uri; + _tmp13_ = alt_uri; #line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_); -#line 9066 "LibraryWindow.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_); +#line 9211 "LibraryWindow.c" } } #line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -9072,11 +9217,14 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons _g_object_unref0 (mount); #line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (uri_file); -#line 9075 "LibraryWindow.c" +#line 9220 "LibraryWindow.c" } -static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKey* event) { +static gboolean +library_window_real_key_press_event (GtkWidget* base, + GdkEventKey* event) +{ LibraryWindow * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; @@ -9084,11 +9232,8 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe SidebarTree* _tmp2_; gboolean _tmp3_; gboolean _tmp4_; - GdkEventKey* _tmp11_; - gboolean _tmp12_; - GdkEventKey* _tmp13_; - guint _tmp14_; - const gchar* _tmp15_; + guint _tmp8_; + const gchar* _tmp9_; #line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -9101,43 +9246,34 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe _tmp4_ = _tmp3_; #line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { -#line 9104 "LibraryWindow.c" +#line 9249 "LibraryWindow.c" SidebarTree* _tmp5_; - GdkEventKey* _tmp6_; - gboolean _tmp7_; #line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = self->priv->sidebar_tree; #line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = event; -#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = sidebar_tree_is_keypress_interpreted (_tmp5_, _tmp6_); -#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = _tmp7_; -#line 9116 "LibraryWindow.c" + _tmp1_ = sidebar_tree_is_keypress_interpreted (_tmp5_, event); +#line 9255 "LibraryWindow.c" } else { #line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = FALSE; -#line 9120 "LibraryWindow.c" +#line 9259 "LibraryWindow.c" } #line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp1_) { -#line 9124 "LibraryWindow.c" - SidebarTree* _tmp8_; - GdkEventKey* _tmp9_; - gboolean _tmp10_ = FALSE; +#line 9263 "LibraryWindow.c" + SidebarTree* _tmp6_; + gboolean _tmp7_ = FALSE; #line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = self->priv->sidebar_tree; + _tmp6_ = self->priv->sidebar_tree; #line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = event; + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), "key-press-event", event, &_tmp7_); #line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp9_, &_tmp10_); -#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = _tmp10_; -#line 9136 "LibraryWindow.c" + _tmp0_ = _tmp7_; +#line 9272 "LibraryWindow.c" } else { #line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = FALSE; -#line 9140 "LibraryWindow.c" +#line 9276 "LibraryWindow.c" } #line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_) { @@ -9145,45 +9281,41 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe result = TRUE; #line 1446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 9148 "LibraryWindow.c" +#line 9284 "LibraryWindow.c" } #line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = event; -#line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = GTK_WIDGET_CLASS (library_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), _tmp11_); -#line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp12_) { + if (GTK_WIDGET_CLASS (library_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), event)) { #line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; #line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 9160 "LibraryWindow.c" +#line 9292 "LibraryWindow.c" } #line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = event; + _tmp8_ = event->keyval; #line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = _tmp13_->keyval; + _tmp9_ = gdk_keyval_name (_tmp8_); #line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = gdk_keyval_name (_tmp14_); -#line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (g_strcmp0 (_tmp15_, "Escape") == 0) { + if (g_strcmp0 (_tmp9_, "Escape") == 0) { #line 1453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_clear_search (self); #line 1454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; #line 1454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 9176 "LibraryWindow.c" +#line 9306 "LibraryWindow.c" } #line 1457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; #line 1457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 9182 "LibraryWindow.c" +#line 9312 "LibraryWindow.c" } -gint library_window_get_PAGE_MIN_WIDTH (void) { +gint +library_window_get_PAGE_MIN_WIDTH (void) +{ gint result; gint _tmp0_; gint _tmp1_; @@ -9195,25 +9327,29 @@ gint library_window_get_PAGE_MIN_WIDTH (void) { result = _tmp1_ + (CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING * 2); #line 12 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 9198 "LibraryWindow.c" +#line 9330 "LibraryWindow.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return self ? data_collection_ref (self) : NULL; -#line 9205 "LibraryWindow.c" +#line 9339 "LibraryWindow.c" } -static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_construct (GType object_type, CollectionPage* collection, Photo* start, ViewCollection* view) { +static LibraryWindowFullscreenPhotoPage* +library_window_fullscreen_photo_page_construct (GType object_type, + CollectionPage* collection, + Photo* start, + ViewCollection* view) +{ LibraryWindowFullscreenPhotoPage * self = NULL; CollectionPage* _tmp0_; - CollectionPage* _tmp1_; - Photo* _tmp2_; - Photo* _tmp3_; - ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + Photo* _tmp1_; + ViewCollection* _tmp2_; #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_COLLECTION_PAGE (collection), NULL); #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -9223,43 +9359,43 @@ static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_co #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = (LibraryWindowFullscreenPhotoPage*) library_photo_page_construct (object_type); #line 76 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = collection; -#line 76 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (collection); #line 76 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->collection); #line 76 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->collection = _tmp1_; + self->priv->collection = _tmp0_; #line 77 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = start; -#line 77 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (start); #line 77 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->start); #line 77 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->start = _tmp3_; -#line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = view; + self->priv->start = _tmp1_; #line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = _data_collection_ref0 (_tmp4_); + _tmp2_ = _data_collection_ref0 (view); #line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (self->priv->view); #line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->view = _tmp5_; + self->priv->view = _tmp2_; #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return self; -#line 9251 "LibraryWindow.c" +#line 9381 "LibraryWindow.c" } -static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_new (CollectionPage* collection, Photo* start, ViewCollection* view) { +static LibraryWindowFullscreenPhotoPage* +library_window_fullscreen_photo_page_new (CollectionPage* collection, + Photo* start, + ViewCollection* view) +{ #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return library_window_fullscreen_photo_page_construct (LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, collection, start, view); -#line 9258 "LibraryWindow.c" +#line 9392 "LibraryWindow.c" } -static void library_window_fullscreen_photo_page_real_switched_to (Page* base) { +static void +library_window_fullscreen_photo_page_real_switched_to (Page* base) +{ LibraryWindowFullscreenPhotoPage * self; CollectionPage* _tmp0_; Photo* _tmp1_; @@ -9276,34 +9412,38 @@ static void library_window_fullscreen_photo_page_real_switched_to (Page* base) { library_photo_page_display_for_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), _tmp0_, _tmp1_, _tmp2_); #line 84 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" PAGE_CLASS (library_window_fullscreen_photo_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), TYPE_PAGE, Page)); -#line 9279 "LibraryWindow.c" +#line 9415 "LibraryWindow.c" } -static void library_window_fullscreen_photo_page_real_switching_from (Page* base) { +static void +library_window_fullscreen_photo_page_real_switching_from (Page* base) +{ LibraryWindowFullscreenPhotoPage * self; #line 87 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage); -#line 9287 "LibraryWindow.c" +#line 9425 "LibraryWindow.c" } -static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { +static void +library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames) +{ LibraryWindowFullscreenPhotoPage * self; - GeeList* _tmp0_; #line 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage); #line 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); #line 93 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = ui_filenames; -#line 93 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui"); -#line 9302 "LibraryWindow.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui"); +#line 9440 "LibraryWindow.c" } -static void library_window_fullscreen_photo_page_class_init (LibraryWindowFullscreenPhotoPageClass * klass) { +static void +library_window_fullscreen_photo_page_class_init (LibraryWindowFullscreenPhotoPageClass * klass) +{ #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_fullscreen_photo_page_parent_class = g_type_class_peek_parent (klass); #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -9316,18 +9456,22 @@ static void library_window_fullscreen_photo_page_class_init (LibraryWindowFullsc ((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) library_window_fullscreen_photo_page_real_init_collect_ui_filenames; #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" G_OBJECT_CLASS (klass)->finalize = library_window_fullscreen_photo_page_finalize; -#line 9319 "LibraryWindow.c" +#line 9459 "LibraryWindow.c" } -static void library_window_fullscreen_photo_page_instance_init (LibraryWindowFullscreenPhotoPage * self) { +static void +library_window_fullscreen_photo_page_instance_init (LibraryWindowFullscreenPhotoPage * self) +{ #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv = LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_GET_PRIVATE (self); -#line 9326 "LibraryWindow.c" +#line 9468 "LibraryWindow.c" } -static void library_window_fullscreen_photo_page_finalize (GObject * obj) { +static void +library_window_fullscreen_photo_page_finalize (GObject * obj) +{ LibraryWindowFullscreenPhotoPage * self; #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage); @@ -9339,11 +9483,13 @@ static void library_window_fullscreen_photo_page_finalize (GObject * obj) { _data_collection_unref0 (self->priv->view); #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" G_OBJECT_CLASS (library_window_fullscreen_photo_page_parent_class)->finalize (obj); -#line 9342 "LibraryWindow.c" +#line 9486 "LibraryWindow.c" } -static GType library_window_fullscreen_photo_page_get_type (void) { +static GType +library_window_fullscreen_photo_page_get_type (void) +{ static volatile gsize library_window_fullscreen_photo_page_type_id__volatile = 0; if (g_once_init_enter (&library_window_fullscreen_photo_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryWindowFullscreenPhotoPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_window_fullscreen_photo_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryWindowFullscreenPhotoPage), 0, (GInstanceInitFunc) library_window_fullscreen_photo_page_instance_init, NULL }; @@ -9355,7 +9501,9 @@ static GType library_window_fullscreen_photo_page_get_type (void) { } -static void library_window_class_init (LibraryWindowClass * klass) { +static void +library_window_class_init (LibraryWindowClass * klass) +{ GeeHashSet* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_parent_class = g_type_class_peek_parent (klass); @@ -9393,11 +9541,13 @@ static void library_window_class_init (LibraryWindowClass * klass) { _tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_initial_camera_uris = _tmp0_; -#line 9396 "LibraryWindow.c" +#line 9544 "LibraryWindow.c" } -static void library_window_instance_init (LibraryWindow * self) { +static void +library_window_instance_init (LibraryWindow * self) +{ const gchar* _tmp0_; gchar* _tmp1_; GtkPaned* _tmp2_; @@ -9536,11 +9686,13 @@ static void library_window_instance_init (LibraryWindow * self) { self->priv->current_progress_priority = 0; #line 146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_pulse_id = (guint) 0; -#line 9539 "LibraryWindow.c" +#line 9689 "LibraryWindow.c" } -static void library_window_finalize (GObject * obj) { +static void +library_window_finalize (GObject * obj) +{ LibraryWindow * self; SidebarTree* _tmp0_; guint _tmp1_; @@ -9556,24 +9708,24 @@ static void library_window_finalize (GObject * obj) { guint _tmp11_; ExtendedPropertiesWindow* _tmp12_; guint _tmp13_; + MetadataWriter* _tmp27_; MetadataWriter* _tmp28_; - MetadataWriter* _tmp29_; - guint _tmp30_; + guint _tmp29_; LibraryMonitor* monitor = NULL; + LibraryMonitorPool* _tmp30_; LibraryMonitorPool* _tmp31_; - LibraryMonitorPool* _tmp32_; + LibraryMonitor* _tmp32_; LibraryMonitor* _tmp33_; LibraryMonitor* _tmp34_; - LibraryMonitor* _tmp35_; + LibraryMonitorPool* _tmp36_; LibraryMonitorPool* _tmp37_; - LibraryMonitorPool* _tmp38_; - guint _tmp39_; + guint _tmp38_; + LibraryMonitorPool* _tmp39_; LibraryMonitorPool* _tmp40_; - LibraryMonitorPool* _tmp41_; - guint _tmp42_; + guint _tmp41_; + CameraTable* _tmp42_; CameraTable* _tmp43_; - CameraTable* _tmp44_; - guint _tmp45_; + guint _tmp44_; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -9620,7 +9772,7 @@ static void library_window_finalize (GObject * obj) { g_signal_parse_name ("show", gtk_widget_get_type (), &_tmp13_, NULL, FALSE); #line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _library_window_show_extended_properties_gtk_widget_show, self); -#line 9623 "LibraryWindow.c" +#line 9775 "LibraryWindow.c" { GeeIterator* _media_sources_it = NULL; MediaCollectionRegistry* _tmp14_; @@ -9649,116 +9801,113 @@ static void library_window_finalize (GObject * obj) { _media_sources_it = _tmp19_; #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" while (TRUE) { -#line 9652 "LibraryWindow.c" +#line 9804 "LibraryWindow.c" GeeIterator* _tmp20_; - gboolean _tmp21_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp22_; - gpointer _tmp23_; - MediaSourceCollection* _tmp24_; - guint _tmp25_; - MediaSourceCollection* _tmp26_; - guint _tmp27_; + GeeIterator* _tmp21_; + gpointer _tmp22_; + MediaSourceCollection* _tmp23_; + guint _tmp24_; + MediaSourceCollection* _tmp25_; + guint _tmp26_; #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = _media_sources_it; #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp21_ = gee_iterator_next (_tmp20_); -#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (!_tmp21_) { + if (!gee_iterator_next (_tmp20_)) { #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 9670 "LibraryWindow.c" +#line 9819 "LibraryWindow.c" } #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_ = _media_sources_it; + _tmp21_ = _media_sources_it; #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp23_ = gee_iterator_get (_tmp22_); + _tmp22_ = gee_iterator_get (_tmp21_); #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - media_sources = (MediaSourceCollection*) _tmp23_; + media_sources = (MediaSourceCollection*) _tmp22_; #line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_ = media_sources; + _tmp23_ = media_sources; #line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp25_, NULL, FALSE); + g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp24_, NULL, FALSE); #line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self); + g_signal_handlers_disconnect_matched (_tmp23_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp24_, 0, NULL, (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self); #line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp26_ = media_sources; + _tmp25_ = media_sources; #line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp27_, NULL, FALSE); + g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp26_, NULL, FALSE); #line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp27_, 0, NULL, (GCallback) _library_window_on_media_altered_data_collection_items_altered, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _library_window_on_media_altered_data_collection_items_altered, self); #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (media_sources); -#line 9692 "LibraryWindow.c" +#line 9841 "LibraryWindow.c" } #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_media_sources_it); -#line 9696 "LibraryWindow.c" +#line 9845 "LibraryWindow.c" } #line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp28_ = metadata_writer_get_instance (); + _tmp27_ = metadata_writer_get_instance (); #line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp29_ = _tmp28_; + _tmp28_ = _tmp27_; #line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_parse_name ("progress", TYPE_METADATA_WRITER, &_tmp30_, NULL, FALSE); + g_signal_parse_name ("progress", TYPE_METADATA_WRITER, &_tmp29_, NULL, FALSE); #line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (_tmp29_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp30_, 0, NULL, (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self); + g_signal_handlers_disconnect_matched (_tmp28_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp29_, 0, NULL, (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self); #line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp29_); + _g_object_unref0 (_tmp28_); #line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp31_ = library_monitor_pool_get_instance (); + _tmp30_ = library_monitor_pool_get_instance (); #line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp32_ = _tmp31_; + _tmp31_ = _tmp30_; #line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp33_ = library_monitor_pool_get_monitor (_tmp32_); + _tmp32_ = library_monitor_pool_get_monitor (_tmp31_); #line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp34_ = _tmp33_; + _tmp33_ = _tmp32_; #line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _library_monitor_pool_unref0 (_tmp32_); + _library_monitor_pool_unref0 (_tmp31_); #line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - monitor = _tmp34_; + monitor = _tmp33_; #line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp35_ = monitor; + _tmp34_ = monitor; #line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp35_ != NULL) { -#line 9724 "LibraryWindow.c" - LibraryMonitor* _tmp36_; + if (_tmp34_ != NULL) { +#line 9873 "LibraryWindow.c" + LibraryMonitor* _tmp35_; #line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp36_ = monitor; + _tmp35_ = monitor; #line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_on_library_monitor_destroyed (self, _tmp36_); -#line 9730 "LibraryWindow.c" + library_window_on_library_monitor_destroyed (self, _tmp35_); +#line 9879 "LibraryWindow.c" } #line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp37_ = library_monitor_pool_get_instance (); + _tmp36_ = library_monitor_pool_get_instance (); #line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp38_ = _tmp37_; + _tmp37_ = _tmp36_; #line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_parse_name ("monitor-installed", TYPE_LIBRARY_MONITOR_POOL, &_tmp39_, NULL, FALSE); + g_signal_parse_name ("monitor-installed", TYPE_LIBRARY_MONITOR_POOL, &_tmp38_, NULL, FALSE); #line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (_tmp38_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp39_, 0, NULL, (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self); + g_signal_handlers_disconnect_matched (_tmp37_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp38_, 0, NULL, (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self); #line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _library_monitor_pool_unref0 (_tmp38_); + _library_monitor_pool_unref0 (_tmp37_); #line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp40_ = library_monitor_pool_get_instance (); + _tmp39_ = library_monitor_pool_get_instance (); #line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp41_ = _tmp40_; + _tmp40_ = _tmp39_; #line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_parse_name ("monitor-destroyed", TYPE_LIBRARY_MONITOR_POOL, &_tmp42_, NULL, FALSE); + g_signal_parse_name ("monitor-destroyed", TYPE_LIBRARY_MONITOR_POOL, &_tmp41_, NULL, FALSE); #line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (_tmp41_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp42_, 0, NULL, (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self); + g_signal_handlers_disconnect_matched (_tmp40_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp41_, 0, NULL, (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self); #line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _library_monitor_pool_unref0 (_tmp41_); + _library_monitor_pool_unref0 (_tmp40_); #line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp43_ = camera_table_get_instance (); + _tmp42_ = camera_table_get_instance (); #line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp44_ = _tmp43_; + _tmp43_ = _tmp42_; #line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_parse_name ("camera-added", TYPE_CAMERA_TABLE, &_tmp45_, NULL, FALSE); + g_signal_parse_name ("camera-added", TYPE_CAMERA_TABLE, &_tmp44_, NULL, FALSE); #line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (_tmp44_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp45_, 0, NULL, (GCallback) _library_window_on_camera_added_camera_table_camera_added, self); + g_signal_handlers_disconnect_matched (_tmp43_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp44_, 0, NULL, (GCallback) _library_window_on_camera_added_camera_table_camera_added, self); #line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _camera_table_unref0 (_tmp44_); + _camera_table_unref0 (_tmp43_); #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (monitor); #line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -9813,11 +9962,13 @@ static void library_window_finalize (GObject * obj) { _g_object_unref0 (self->priv->toolbar_revealer); #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" G_OBJECT_CLASS (library_window_parent_class)->finalize (obj); -#line 9816 "LibraryWindow.c" +#line 9965 "LibraryWindow.c" } -GType library_window_get_type (void) { +GType +library_window_get_type (void) +{ static volatile gsize library_window_type_id__volatile = 0; if (g_once_init_enter (&library_window_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryWindow), 0, (GInstanceInitFunc) library_window_instance_init, NULL }; @@ -9829,23 +9980,32 @@ GType library_window_get_type (void) { } -static void _vala_library_window_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_library_window_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ LibraryWindow * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" switch (property_id) { -#line 9837 "LibraryWindow.c" +#line 9993 "LibraryWindow.c" default: #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 9843 "LibraryWindow.c" +#line 9999 "LibraryWindow.c" } } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -9857,13 +10017,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -static gint _vala_array_length (gpointer array) { +static gint +_vala_array_length (gpointer array) +{ int length; length = 0; if (array) { diff --git a/src/library/OfflinePage.c b/src/library/OfflinePage.c index b3a06a0..3d18c3f 100644 --- a/src/library/OfflinePage.c +++ b/src/library/OfflinePage.c @@ -1,4 +1,4 @@ -/* OfflinePage.c generated by valac 0.36.6, the Vala compiler +/* OfflinePage.c generated by valac 0.40.4, the Vala compiler * generated from OfflinePage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -199,6 +200,11 @@ typedef struct _OfflinePageOfflineSearchViewFilterClass OfflinePageOfflineSearch typedef struct _MediaViewTracker MediaViewTracker; typedef struct _MediaViewTrackerClass MediaViewTrackerClass; +enum { + OFFLINE_PAGE_0_PROPERTY, + OFFLINE_PAGE_NUM_PROPERTIES +}; +static GParamSpec* offline_page_properties[OFFLINE_PAGE_NUM_PROPERTIES]; #define TYPE_DATA_COLLECTION (data_collection_get_type ()) #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection)) @@ -431,6 +437,11 @@ typedef struct _Dimensions Dimensions; typedef struct _MediaSourceItemPrivate MediaSourceItemPrivate; typedef struct _ThumbnailPrivate ThumbnailPrivate; typedef struct _OfflinePageOfflineViewPrivate OfflinePageOfflineViewPrivate; +enum { + OFFLINE_PAGE_OFFLINE_VIEW_0_PROPERTY, + OFFLINE_PAGE_OFFLINE_VIEW_NUM_PROPERTIES +}; +static GParamSpec* offline_page_offline_view_properties[OFFLINE_PAGE_OFFLINE_VIEW_NUM_PROPERTIES]; typedef struct _ViewFilterPrivate ViewFilterPrivate; typedef struct _SearchViewFilterPrivate SearchViewFilterPrivate; typedef struct _DefaultSearchViewFilterPrivate DefaultSearchViewFilterPrivate; @@ -723,9 +734,15 @@ GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType checkerboard_page_get_type (void) G_GNUC_CONST; @@ -739,17 +756,29 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self); gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType search_view_filter_get_type (void) G_GNUC_CONST; gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; @@ -758,14 +787,17 @@ GType default_search_view_filter_get_type (void) G_GNUC_CONST; static GType offline_page_offline_search_view_filter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; GType media_view_tracker_get_type (void) G_GNUC_CONST; #define OFFLINE_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_OFFLINE_PAGE, OfflinePagePrivate)) -enum { - OFFLINE_PAGE_DUMMY_PROPERTY -}; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -775,85 +807,135 @@ GType library_photo_source_collection_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; -static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeCollection* added, GeeCollection* removed); -static void _offline_page_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self); +static void offline_page_on_offline_contents_altered (OfflinePage* self, + GeeCollection* added, + GeeCollection* removed); +static void _offline_page_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self); GType video_source_collection_get_type (void) G_GNUC_CONST; static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filter_new (void); static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filter_construct (GType object_type); #define OFFLINE_PAGE_NAME _ ("Missing Files") static void offline_page_on_remove_from_library (OfflinePage* self); -static void _offline_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _offline_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); OfflinePage* offline_page_new (void); OfflinePage* offline_page_construct (GType object_type); -CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name); -void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path); -void page_init_toolbar (Page* self, const gchar* path); +CheckerboardPage* checkerboard_page_construct (GType object_type, + const gchar* page_name); +void checkerboard_page_init_item_context_menu (CheckerboardPage* self, + const gchar* path); +void page_init_toolbar (Page* self, + const gchar* path); GType view_collection_get_type (void) G_GNUC_CONST; ViewCollection* page_get_view (Page* self); MediaViewTracker* media_view_tracker_new (ViewCollection* collection); -MediaViewTracker* media_view_tracker_construct (GType object_type, ViewCollection* collection); +MediaViewTracker* media_view_tracker_construct (GType object_type, + ViewCollection* collection); GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceCollection* self); -static void offline_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); -void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static void offline_page_real_add_actions (Page* base, GActionMap* map); -void page_add_actions (Page* self, GActionMap* map); -static void offline_page_real_remove_actions (Page* base, GActionMap* map); -void page_remove_actions (Page* self, GActionMap* map); +static void offline_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames); +void page_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames); +static void offline_page_real_add_actions (Page* base, + GActionMap* map); +void page_add_actions (Page* self, + GActionMap* map); +static void offline_page_real_remove_actions (Page* base, + GActionMap* map); +void page_remove_actions (Page* self, + GActionMap* map); static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* base); -static void offline_page_real_update_actions (Page* base, gint selected_count, gint count); -void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); -void page_update_actions (Page* self, gint selected_count, gint count); -gboolean data_collection_add (DataCollection* self, DataObject* object); +static void offline_page_real_update_actions (Page* base, + gint selected_count, + gint count); +void page_set_action_sensitive (Page* self, + const gchar* name, + gboolean sensitive); +void page_update_actions (Page* self, + gint selected_count, + gint count); +gboolean data_collection_add (DataCollection* self, + DataObject* object); static OfflinePageOfflineView* offline_page_offline_view_new (MediaSource* source); -static OfflinePageOfflineView* offline_page_offline_view_construct (GType object_type, MediaSource* source); +static OfflinePageOfflineView* offline_page_offline_view_construct (GType object_type, + MediaSource* source); GType media_source_item_get_type (void) G_GNUC_CONST; GType thumbnail_get_type (void) G_GNUC_CONST; static GType offline_page_offline_view_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; GType marker_get_type (void) G_GNUC_CONST; Marker* data_collection_start_marking (DataCollection* self); -void marker_mark (Marker* self, DataObject* object); -DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source); -void data_collection_remove_marked (DataCollection* self, Marker* m); +void marker_mark (Marker* self, + DataObject* object); +DataView* view_collection_get_view_for_source (ViewCollection* self, + DataSource* source); +void data_collection_remove_marked (DataCollection* self, + Marker* m); GeeList* view_collection_get_selected_sources (ViewCollection* self); -gboolean remove_offline_dialog (GtkWindow* owner, gint count); +gboolean remove_offline_dialog (GtkWindow* owner, + gint count); GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); void page_window_set_busy_cursor (PageWindow* self); GType progress_dialog_get_type (void) G_GNUC_CONST; -ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable); -ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable); +ProgressDialog* progress_dialog_new (GtkWindow* owner, + const gchar* text, + GCancellable* cancellable); +ProgressDialog* progress_dialog_construct (GType object_type, + GtkWindow* owner, + const gchar* text, + GCancellable* cancellable); GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; GType video_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; -void media_source_collection_filter_media (GeeCollection* media, GeeCollection* photos, GeeCollection* videos); -void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCollection* sources, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed); -gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop); -static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self); +void media_source_collection_filter_media (GeeCollection* media, + GeeCollection* photos, + GeeCollection* videos); +void media_source_collection_remove_from_app (MediaSourceCollection* self, + GeeCollection* sources, + gboolean delete_backing, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_removed); +gboolean progress_dialog_monitor (ProgressDialog* self, + guint64 count, + guint64 total, + gboolean do_event_loop); +static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, + guint64 total, + gboolean do_event_loop, + gpointer self); void progress_dialog_close (ProgressDialog* self); void page_window_set_normal_cursor (PageWindow* self); static SearchViewFilter* offline_page_real_get_search_view_filter (CheckerboardPage* base); gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); -enum { - OFFLINE_PAGE_OFFLINE_VIEW_DUMMY_PROPERTY -}; gint thumbnail_get_DEFAULT_SCALE (void); -Thumbnail* thumbnail_new (MediaSource* media, gint scale); -Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scale); +Thumbnail* thumbnail_new (MediaSource* media, + gint scale); +Thumbnail* thumbnail_construct (GType object_type, + MediaSource* media, + gint scale); gboolean media_source_is_offline (MediaSource* self); -enum { - OFFLINE_PAGE_OFFLINE_SEARCH_VIEW_FILTER_DUMMY_PROPERTY -}; static guint offline_page_offline_search_view_filter_real_get_criteria (SearchViewFilter* base); GType search_filter_criteria_get_type (void) G_GNUC_CONST; DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type); @@ -861,21 +943,32 @@ static void offline_page_finalize (GObject * obj); static const GActionEntry OFFLINE_PAGE_entries[1] = {{"RemoveFromLibrary", _offline_page_on_remove_from_library_gsimple_action_activate_callback}}; -static void _offline_page_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { +static void +_offline_page_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self) +{ #line 45 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" offline_page_on_offline_contents_altered ((OfflinePage*) self, added, removed); -#line 868 "OfflinePage.c" +#line 955 "OfflinePage.c" } -static void _offline_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_offline_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 55 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" offline_page_on_remove_from_library ((OfflinePage*) self); -#line 875 "OfflinePage.c" +#line 966 "OfflinePage.c" } -OfflinePage* offline_page_construct (GType object_type) { +OfflinePage* +offline_page_construct (GType object_type) +{ OfflinePage * self = NULL; ViewCollection* _tmp0_; ViewCollection* _tmp1_; @@ -936,69 +1029,65 @@ OfflinePage* offline_page_construct (GType object_type) { _g_object_unref0 (_tmp10_); #line 28 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return self; -#line 940 "OfflinePage.c" +#line 1033 "OfflinePage.c" } -OfflinePage* offline_page_new (void) { +OfflinePage* +offline_page_new (void) +{ #line 28 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return offline_page_construct (TYPE_OFFLINE_PAGE); -#line 947 "OfflinePage.c" +#line 1042 "OfflinePage.c" } -static void offline_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { +static void +offline_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames) +{ OfflinePage * self; - GeeList* _tmp0_; - GeeList* _tmp1_; #line 49 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage); #line 49 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); #line 50 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp0_ = ui_filenames; -#line 50 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - PAGE_CLASS (offline_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); -#line 52 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp1_ = ui_filenames; + PAGE_CLASS (offline_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), ui_filenames); #line 52 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "offline.ui"); -#line 967 "OfflinePage.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "offline.ui"); +#line 1059 "OfflinePage.c" } -static void offline_page_real_add_actions (Page* base, GActionMap* map) { +static void +offline_page_real_add_actions (Page* base, + GActionMap* map) +{ OfflinePage * self; - GActionMap* _tmp0_; - GActionMap* _tmp1_; #line 59 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage); #line 59 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 60 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp0_ = map; -#line 60 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - PAGE_CLASS (offline_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); -#line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp1_ = map; + PAGE_CLASS (offline_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map); #line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - g_action_map_add_action_entries (_tmp1_, OFFLINE_PAGE_entries, G_N_ELEMENTS (OFFLINE_PAGE_entries), self); -#line 987 "OfflinePage.c" + g_action_map_add_action_entries (map, OFFLINE_PAGE_entries, G_N_ELEMENTS (OFFLINE_PAGE_entries), self); +#line 1076 "OfflinePage.c" } -static void offline_page_real_remove_actions (Page* base, GActionMap* map) { +static void +offline_page_real_remove_actions (Page* base, + GActionMap* map) +{ OfflinePage * self; - GActionMap* _tmp0_; #line 65 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage); #line 65 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp0_ = map; -#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - PAGE_CLASS (offline_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); -#line 1002 "OfflinePage.c" + PAGE_CLASS (offline_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map); +#line 1091 "OfflinePage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -1010,38 +1099,39 @@ static void offline_page_real_remove_actions (Page* base, GActionMap* map) { entry_collection_length1 = G_N_ELEMENTS (OFFLINE_PAGE_entries); #line 67 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (OFFLINE_PAGE_entries); entry_it = entry_it + 1) { -#line 1014 "OfflinePage.c" +#line 1103 "OfflinePage.c" GActionEntry entry = {0}; #line 67 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" entry = entry_collection[entry_it]; -#line 1018 "OfflinePage.c" +#line 1107 "OfflinePage.c" { - GActionMap* _tmp1_; - GActionEntry _tmp2_; - const gchar* _tmp3_; -#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp1_ = map; + GActionEntry _tmp0_; + const gchar* _tmp1_; #line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp2_ = entry; + _tmp0_ = entry; #line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp3_ = _tmp2_.name; + _tmp1_ = _tmp0_.name; #line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - g_action_map_remove_action (_tmp1_, _tmp3_); -#line 1031 "OfflinePage.c" + g_action_map_remove_action (map, _tmp1_); +#line 1117 "OfflinePage.c" } } } } -static gpointer _core_tracker_ref0 (gpointer self) { +static gpointer +_core_tracker_ref0 (gpointer self) +{ #line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return self ? core_tracker_ref (self) : NULL; -#line 1041 "OfflinePage.c" +#line 1129 "OfflinePage.c" } -static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* base) { +static CoreViewTracker* +offline_page_real_get_view_tracker (CheckerboardPage* base) +{ OfflinePage * self; CoreViewTracker* result = NULL; MediaViewTracker* _tmp0_; @@ -1056,34 +1146,31 @@ static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* ba result = _tmp1_; #line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return result; -#line 1060 "OfflinePage.c" +#line 1150 "OfflinePage.c" } -static void offline_page_real_update_actions (Page* base, gint selected_count, gint count) { +static void +offline_page_real_update_actions (Page* base, + gint selected_count, + gint count) +{ OfflinePage * self; - gint _tmp0_; - gint _tmp1_; - gint _tmp2_; #line 76 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage); #line 77 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp0_ = selected_count; -#line 77 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveFromLibrary", _tmp0_ > 0); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveFromLibrary", selected_count > 0); #line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp1_ = selected_count; -#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp2_ = count; -#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - PAGE_CLASS (offline_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp1_, _tmp2_); -#line 1081 "OfflinePage.c" + PAGE_CLASS (offline_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), selected_count, count); +#line 1166 "OfflinePage.c" } -static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeCollection* added, GeeCollection* removed) { - GeeCollection* _tmp0_; - GeeCollection* _tmp12_; +static void +offline_page_on_offline_contents_altered (OfflinePage* self, + GeeCollection* added, + GeeCollection* removed) +{ #line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_return_if_fail (IS_OFFLINE_PAGE (self)); #line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1091,193 +1178,184 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl #line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp0_ = added; -#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - if (_tmp0_ != NULL) { -#line 1098 "OfflinePage.c" + if (added != NULL) { +#line 1183 "OfflinePage.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp0_; #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp1_ = added; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_ITERABLE, GeeIterable)); #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _source_it = _tmp2_; + _source_it = _tmp0_; #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" while (TRUE) { -#line 1111 "OfflinePage.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 1193 "OfflinePage.c" + GeeIterator* _tmp1_; MediaSource* source = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - ViewCollection* _tmp7_; - ViewCollection* _tmp8_; - MediaSource* _tmp9_; - OfflinePageOfflineView* _tmp10_; - OfflinePageOfflineView* _tmp11_; -#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp3_ = _source_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; + MediaSource* _tmp6_; + OfflinePageOfflineView* _tmp7_; + OfflinePageOfflineView* _tmp8_; #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp1_ = _source_it; #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" break; -#line 1130 "OfflinePage.c" +#line 1209 "OfflinePage.c" } #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp5_ = _source_it; + _tmp2_ = _source_it; #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - source = (MediaSource*) _tmp6_; + source = (MediaSource*) _tmp3_; #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp8_ = _tmp7_; + _tmp5_ = _tmp4_; #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp9_ = source; + _tmp6_ = source; #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp10_ = offline_page_offline_view_new (_tmp9_); + _tmp7_ = offline_page_offline_view_new (_tmp6_); #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp8_); #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _data_collection_unref0 (_tmp8_); + _data_collection_unref0 (_tmp5_); #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (source); -#line 1156 "OfflinePage.c" +#line 1235 "OfflinePage.c" } #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (_source_it); -#line 1160 "OfflinePage.c" +#line 1239 "OfflinePage.c" } } #line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp12_ = removed; -#line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - if (_tmp12_ != NULL) { -#line 1167 "OfflinePage.c" + if (removed != NULL) { +#line 1244 "OfflinePage.c" Marker* marker = NULL; - ViewCollection* _tmp13_; - ViewCollection* _tmp14_; - Marker* _tmp15_; - Marker* _tmp16_; - ViewCollection* _tmp29_; - ViewCollection* _tmp30_; - Marker* _tmp31_; + ViewCollection* _tmp9_; + ViewCollection* _tmp10_; + Marker* _tmp11_; + Marker* _tmp12_; + ViewCollection* _tmp23_; + ViewCollection* _tmp24_; + Marker* _tmp25_; #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp14_ = _tmp13_; + _tmp10_ = _tmp9_; #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp15_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp11_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection)); #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp16_ = _tmp15_; + _tmp12_ = _tmp11_; #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _data_collection_unref0 (_tmp14_); + _data_collection_unref0 (_tmp10_); #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - marker = _tmp16_; -#line 1188 "OfflinePage.c" + marker = _tmp12_; +#line 1265 "OfflinePage.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp17_; - GeeIterator* _tmp18_; + GeeIterator* _tmp13_; #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp17_ = removed; + _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_ITERABLE, GeeIterable)); #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _source_it = _tmp18_; + _source_it = _tmp13_; #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" while (TRUE) { -#line 1201 "OfflinePage.c" - GeeIterator* _tmp19_; - gboolean _tmp20_; +#line 1275 "OfflinePage.c" + GeeIterator* _tmp14_; MediaSource* source = NULL; - GeeIterator* _tmp21_; - gpointer _tmp22_; - Marker* _tmp23_; - ViewCollection* _tmp24_; - ViewCollection* _tmp25_; - MediaSource* _tmp26_; - DataView* _tmp27_; - DataView* _tmp28_; -#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp19_ = _source_it; + GeeIterator* _tmp15_; + gpointer _tmp16_; + Marker* _tmp17_; + ViewCollection* _tmp18_; + ViewCollection* _tmp19_; + MediaSource* _tmp20_; + DataView* _tmp21_; + DataView* _tmp22_; #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp20_ = gee_iterator_next (_tmp19_); + _tmp14_ = _source_it; #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - if (!_tmp20_) { + if (!gee_iterator_next (_tmp14_)) { #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" break; -#line 1221 "OfflinePage.c" +#line 1292 "OfflinePage.c" } #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp21_ = _source_it; + _tmp15_ = _source_it; #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp22_ = gee_iterator_get (_tmp21_); + _tmp16_ = gee_iterator_get (_tmp15_); #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - source = (MediaSource*) _tmp22_; + source = (MediaSource*) _tmp16_; #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp23_ = marker; + _tmp17_ = marker; #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp18_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp25_ = _tmp24_; + _tmp19_ = _tmp18_; #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp26_ = source; + _tmp20_ = source; #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp27_ = view_collection_get_view_for_source (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource)); + _tmp21_ = view_collection_get_view_for_source (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_SOURCE, DataSource)); #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp28_ = _tmp27_; + _tmp22_ = _tmp21_; #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject)); + marker_mark (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject)); #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _g_object_unref0 (_tmp28_); + _g_object_unref0 (_tmp22_); #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _data_collection_unref0 (_tmp25_); + _data_collection_unref0 (_tmp19_); #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (source); -#line 1249 "OfflinePage.c" +#line 1320 "OfflinePage.c" } #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (_source_it); -#line 1253 "OfflinePage.c" +#line 1324 "OfflinePage.c" } #line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp30_ = _tmp29_; + _tmp24_ = _tmp23_; #line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp31_ = marker; + _tmp25_ = marker; #line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), _tmp31_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_COLLECTION, DataCollection), _tmp25_); #line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _data_collection_unref0 (_tmp30_); + _data_collection_unref0 (_tmp24_); #line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (marker); -#line 1267 "OfflinePage.c" +#line 1338 "OfflinePage.c" } } -static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) { +static gboolean +_progress_dialog_monitor_progress_monitor (guint64 current, + guint64 total, + gboolean do_event_loop, + gpointer self) +{ gboolean result; result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop); #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return result; -#line 1277 "OfflinePage.c" +#line 1353 "OfflinePage.c" } -static void offline_page_on_remove_from_library (OfflinePage* self) { +static void +offline_page_on_remove_from_library (OfflinePage* self) +{ GeeCollection* sources = NULL; ViewCollection* _tmp0_; ViewCollection* _tmp1_; @@ -1292,24 +1370,23 @@ static void offline_page_on_remove_from_library (OfflinePage* self) { gint _tmp10_; gint _tmp11_; gboolean _tmp12_; - gboolean _tmp13_; + AppWindow* _tmp13_; AppWindow* _tmp14_; - AppWindow* _tmp15_; ProgressDialog* progress = NULL; - GeeCollection* _tmp16_; + GeeCollection* _tmp15_; + gint _tmp16_; gint _tmp17_; - gint _tmp18_; GeeArrayList* photos = NULL; - GeeArrayList* _tmp22_; + GeeArrayList* _tmp21_; GeeArrayList* videos = NULL; - GeeArrayList* _tmp23_; - GeeCollection* _tmp24_; + GeeArrayList* _tmp22_; + GeeCollection* _tmp23_; + GeeArrayList* _tmp24_; GeeArrayList* _tmp25_; - GeeArrayList* _tmp26_; - ProgressDialog* _tmp27_; - ProgressDialog* _tmp38_; + ProgressDialog* _tmp26_; + ProgressDialog* _tmp37_; + AppWindow* _tmp39_; AppWindow* _tmp40_; - AppWindow* _tmp41_; #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_return_if_fail (IS_OFFLINE_PAGE (self)); #line 98 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1336,7 +1413,7 @@ static void offline_page_on_remove_from_library (OfflinePage* self) { _g_object_unref0 (sources); #line 101 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return; -#line 1340 "OfflinePage.c" +#line 1417 "OfflinePage.c" } #line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp7_ = app_window_get_instance (); @@ -1349,140 +1426,138 @@ static void offline_page_on_remove_from_library (OfflinePage* self) { #line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp11_ = _tmp10_; #line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp12_ = remove_offline_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), _tmp11_); -#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp13_ = !_tmp12_; + _tmp12_ = !remove_offline_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), _tmp11_); #line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (_tmp8_); #line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - if (_tmp13_) { + if (_tmp12_) { #line 104 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (sources); #line 104 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return; -#line 1364 "OfflinePage.c" +#line 1439 "OfflinePage.c" } #line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp14_ = app_window_get_instance (); + _tmp13_ = app_window_get_instance (); #line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PAGE_WINDOW, PageWindow)); #line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp14_); #line 108 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" progress = NULL; #line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp16_ = sources; + _tmp15_ = sources; #line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp17_ = gee_collection_get_size (_tmp16_); + _tmp16_ = gee_collection_get_size (_tmp15_); #line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - if (_tmp18_ >= 20) { -#line 1384 "OfflinePage.c" + if (_tmp17_ >= 20) { +#line 1459 "OfflinePage.c" + AppWindow* _tmp18_; AppWindow* _tmp19_; - AppWindow* _tmp20_; - ProgressDialog* _tmp21_; + ProgressDialog* _tmp20_; #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp19_ = app_window_get_instance (); + _tmp18_ = app_window_get_instance (); #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp21_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_window_get_type (), GtkWindow), _ ("Deleting…"), NULL); + _tmp20_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_window_get_type (), GtkWindow), _ ("Deleting…"), NULL); #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - g_object_ref_sink (_tmp21_); + g_object_ref_sink (_tmp20_); #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (progress); #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - progress = _tmp21_; + progress = _tmp20_; #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _g_object_unref0 (_tmp20_); -#line 1402 "OfflinePage.c" + _g_object_unref0 (_tmp19_); +#line 1477 "OfflinePage.c" } #line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp22_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp21_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - photos = _tmp22_; + photos = _tmp21_; #line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp23_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp22_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - videos = _tmp23_; + videos = _tmp22_; #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp24_ = sources; + _tmp23_ = sources; #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp25_ = photos; + _tmp24_ = photos; #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp26_ = videos; + _tmp25_ = videos; #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - media_source_collection_filter_media (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection)); + media_source_collection_filter_media (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection)); #line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp27_ = progress; + _tmp26_ = progress; #line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - if (_tmp27_ != NULL) { -#line 1424 "OfflinePage.c" - LibraryPhotoSourceCollection* _tmp28_; - GeeArrayList* _tmp29_; - ProgressDialog* _tmp30_; - VideoSourceCollection* _tmp31_; - GeeArrayList* _tmp32_; - ProgressDialog* _tmp33_; + if (_tmp26_ != NULL) { +#line 1499 "OfflinePage.c" + LibraryPhotoSourceCollection* _tmp27_; + GeeArrayList* _tmp28_; + ProgressDialog* _tmp29_; + VideoSourceCollection* _tmp30_; + GeeArrayList* _tmp31_; + ProgressDialog* _tmp32_; #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp28_ = library_photo_global; + _tmp27_ = library_photo_global; #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp29_ = photos; + _tmp28_ = photos; #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp30_ = progress; + _tmp29_ = progress; #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp30_, NULL); + media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp29_, NULL); #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp31_ = video_global; + _tmp30_ = video_global; #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp32_ = videos; + _tmp31_ = videos; #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp33_ = progress; + _tmp32_ = progress; #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp33_, NULL); -#line 1447 "OfflinePage.c" + media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp32_, NULL); +#line 1522 "OfflinePage.c" } else { - LibraryPhotoSourceCollection* _tmp34_; - GeeArrayList* _tmp35_; - VideoSourceCollection* _tmp36_; - GeeArrayList* _tmp37_; + LibraryPhotoSourceCollection* _tmp33_; + GeeArrayList* _tmp34_; + VideoSourceCollection* _tmp35_; + GeeArrayList* _tmp36_; #line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp34_ = library_photo_global; + _tmp33_ = library_photo_global; #line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp35_ = photos; + _tmp34_ = photos; #line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL); + media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL); #line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp36_ = video_global; + _tmp35_ = video_global; #line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp37_ = videos; + _tmp36_ = videos; #line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL); -#line 1465 "OfflinePage.c" + media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL); +#line 1540 "OfflinePage.c" } #line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp38_ = progress; + _tmp37_ = progress; #line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - if (_tmp38_ != NULL) { -#line 1471 "OfflinePage.c" - ProgressDialog* _tmp39_; + if (_tmp37_ != NULL) { +#line 1546 "OfflinePage.c" + ProgressDialog* _tmp38_; #line 125 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp39_ = progress; + _tmp38_ = progress; #line 125 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - progress_dialog_close (_tmp39_); -#line 1477 "OfflinePage.c" + progress_dialog_close (_tmp38_); +#line 1552 "OfflinePage.c" } #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp40_ = app_window_get_instance (); + _tmp39_ = app_window_get_instance (); #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp41_ = _tmp40_; + _tmp40_ = _tmp39_; #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PAGE_WINDOW, PageWindow)); #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _g_object_unref0 (_tmp41_); + _g_object_unref0 (_tmp40_); #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (videos); #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1491,18 +1566,22 @@ static void offline_page_on_remove_from_library (OfflinePage* self) { _g_object_unref0 (progress); #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (sources); -#line 1495 "OfflinePage.c" +#line 1570 "OfflinePage.c" } -static gpointer _view_filter_ref0 (gpointer self) { +static gpointer +_view_filter_ref0 (gpointer self) +{ #line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return self ? view_filter_ref (self) : NULL; -#line 1502 "OfflinePage.c" +#line 1579 "OfflinePage.c" } -static SearchViewFilter* offline_page_real_get_search_view_filter (CheckerboardPage* base) { +static SearchViewFilter* +offline_page_real_get_search_view_filter (CheckerboardPage* base) +{ OfflinePage * self; SearchViewFilter* result = NULL; OfflinePageOfflineSearchViewFilter* _tmp0_; @@ -1517,58 +1596,60 @@ static SearchViewFilter* offline_page_real_get_search_view_filter (CheckerboardP result = _tmp1_; #line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return result; -#line 1521 "OfflinePage.c" +#line 1600 "OfflinePage.c" } -static OfflinePageOfflineView* offline_page_offline_view_construct (GType object_type, MediaSource* source) { +static OfflinePageOfflineView* +offline_page_offline_view_construct (GType object_type, + MediaSource* source) +{ OfflinePageOfflineView * self = NULL; - MediaSource* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; - MediaSource* _tmp3_; - gboolean _tmp4_; #line 11 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL); #line 12 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp0_ = source; -#line 12 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp1_ = thumbnail_get_DEFAULT_SCALE (); + _tmp0_ = thumbnail_get_DEFAULT_SCALE (); #line 12 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 12 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - self = (OfflinePageOfflineView*) thumbnail_construct (object_type, _tmp0_, _tmp2_); -#line 14 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp3_ = source; -#line 14 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp4_ = media_source_is_offline (_tmp3_); + self = (OfflinePageOfflineView*) thumbnail_construct (object_type, source, _tmp1_); #line 14 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _vala_assert (_tmp4_, "source.is_offline()"); + _vala_assert (media_source_is_offline (source), "source.is_offline()"); #line 11 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return self; -#line 1550 "OfflinePage.c" +#line 1623 "OfflinePage.c" } -static OfflinePageOfflineView* offline_page_offline_view_new (MediaSource* source) { +static OfflinePageOfflineView* +offline_page_offline_view_new (MediaSource* source) +{ #line 11 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return offline_page_offline_view_construct (OFFLINE_PAGE_TYPE_OFFLINE_VIEW, source); -#line 1557 "OfflinePage.c" +#line 1632 "OfflinePage.c" } -static void offline_page_offline_view_class_init (OfflinePageOfflineViewClass * klass) { +static void +offline_page_offline_view_class_init (OfflinePageOfflineViewClass * klass) +{ #line 10 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" offline_page_offline_view_parent_class = g_type_class_peek_parent (klass); -#line 1564 "OfflinePage.c" +#line 1641 "OfflinePage.c" } -static void offline_page_offline_view_instance_init (OfflinePageOfflineView * self) { +static void +offline_page_offline_view_instance_init (OfflinePageOfflineView * self) +{ } -static GType offline_page_offline_view_get_type (void) { +static GType +offline_page_offline_view_get_type (void) +{ static volatile gsize offline_page_offline_view_type_id__volatile = 0; if (g_once_init_enter (&offline_page_offline_view_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (OfflinePageOfflineViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) offline_page_offline_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (OfflinePageOfflineView), 0, (GInstanceInitFunc) offline_page_offline_view_instance_init, NULL }; @@ -1580,7 +1661,9 @@ static GType offline_page_offline_view_get_type (void) { } -static guint offline_page_offline_search_view_filter_real_get_criteria (SearchViewFilter* base) { +static guint +offline_page_offline_search_view_filter_real_get_criteria (SearchViewFilter* base) +{ OfflinePageOfflineSearchViewFilter * self; guint result = 0U; #line 19 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1589,41 +1672,51 @@ static guint offline_page_offline_search_view_filter_real_get_criteria (SearchVi result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH); #line 20 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return result; -#line 1593 "OfflinePage.c" +#line 1676 "OfflinePage.c" } -static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filter_construct (GType object_type) { +static OfflinePageOfflineSearchViewFilter* +offline_page_offline_search_view_filter_construct (GType object_type) +{ OfflinePageOfflineSearchViewFilter* self = NULL; #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self = (OfflinePageOfflineSearchViewFilter*) default_search_view_filter_construct (object_type); #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return self; -#line 1603 "OfflinePage.c" +#line 1688 "OfflinePage.c" } -static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filter_new (void) { +static OfflinePageOfflineSearchViewFilter* +offline_page_offline_search_view_filter_new (void) +{ #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return offline_page_offline_search_view_filter_construct (OFFLINE_PAGE_TYPE_OFFLINE_SEARCH_VIEW_FILTER); -#line 1610 "OfflinePage.c" +#line 1697 "OfflinePage.c" } -static void offline_page_offline_search_view_filter_class_init (OfflinePageOfflineSearchViewFilterClass * klass) { +static void +offline_page_offline_search_view_filter_class_init (OfflinePageOfflineSearchViewFilterClass * klass) +{ #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" offline_page_offline_search_view_filter_parent_class = g_type_class_peek_parent (klass); #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" ((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) offline_page_offline_search_view_filter_real_get_criteria; -#line 1619 "OfflinePage.c" +#line 1708 "OfflinePage.c" } -static void offline_page_offline_search_view_filter_instance_init (OfflinePageOfflineSearchViewFilter * self) { +static void +offline_page_offline_search_view_filter_instance_init (OfflinePageOfflineSearchViewFilter * self) +{ } -static GType offline_page_offline_search_view_filter_get_type (void) { +static GType +offline_page_offline_search_view_filter_get_type (void) +{ static volatile gsize offline_page_offline_search_view_filter_type_id__volatile = 0; if (g_once_init_enter (&offline_page_offline_search_view_filter_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (OfflinePageOfflineSearchViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) offline_page_offline_search_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (OfflinePageOfflineSearchViewFilter), 0, (GInstanceInitFunc) offline_page_offline_search_view_filter_instance_init, NULL }; @@ -1635,7 +1728,9 @@ static GType offline_page_offline_search_view_filter_get_type (void) { } -static void offline_page_class_init (OfflinePageClass * klass) { +static void +offline_page_class_init (OfflinePageClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" offline_page_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1654,11 +1749,13 @@ static void offline_page_class_init (OfflinePageClass * klass) { ((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) offline_page_real_get_search_view_filter; #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" G_OBJECT_CLASS (klass)->finalize = offline_page_finalize; -#line 1658 "OfflinePage.c" +#line 1753 "OfflinePage.c" } -static void offline_page_instance_init (OfflinePage * self) { +static void +offline_page_instance_init (OfflinePage * self) +{ OfflinePageOfflineSearchViewFilter* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self->priv = OFFLINE_PAGE_GET_PRIVATE (self); @@ -1666,11 +1763,13 @@ static void offline_page_instance_init (OfflinePage * self) { _tmp0_ = offline_page_offline_search_view_filter_new (); #line 25 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self->priv->search_filter = _tmp0_; -#line 1670 "OfflinePage.c" +#line 1767 "OfflinePage.c" } -static void offline_page_finalize (GObject * obj) { +static void +offline_page_finalize (GObject * obj) +{ OfflinePage * self; LibraryPhotoSourceCollection* _tmp0_; guint _tmp1_; @@ -1696,11 +1795,13 @@ static void offline_page_finalize (GObject * obj) { _core_tracker_unref0 (self->priv->tracker); #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" G_OBJECT_CLASS (offline_page_parent_class)->finalize (obj); -#line 1700 "OfflinePage.c" +#line 1799 "OfflinePage.c" } -GType offline_page_get_type (void) { +GType +offline_page_get_type (void) +{ static volatile gsize offline_page_type_id__volatile = 0; if (g_once_init_enter (&offline_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (OfflinePageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) offline_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (OfflinePage), 0, (GInstanceInitFunc) offline_page_instance_init, NULL }; diff --git a/src/library/OfflineSidebarEntry.c b/src/library/OfflineSidebarEntry.c index 0be13f0..712a354 100644 --- a/src/library/OfflineSidebarEntry.c +++ b/src/library/OfflineSidebarEntry.c @@ -1,4 +1,4 @@ -/* OfflineSidebarEntry.c generated by valac 0.36.6, the Vala compiler +/* OfflineSidebarEntry.c generated by valac 0.40.4, the Vala compiler * generated from OfflineSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -101,6 +102,11 @@ typedef struct _LibraryHideablePageEntryPrivate LibraryHideablePageEntryPrivate; typedef struct _LibraryOfflineSidebarEntry LibraryOfflineSidebarEntry; typedef struct _LibraryOfflineSidebarEntryClass LibraryOfflineSidebarEntryClass; typedef struct _LibraryOfflineSidebarEntryPrivate LibraryOfflineSidebarEntryPrivate; +enum { + LIBRARY_OFFLINE_SIDEBAR_ENTRY_0_PROPERTY, + LIBRARY_OFFLINE_SIDEBAR_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* library_offline_sidebar_entry_properties[LIBRARY_OFFLINE_SIDEBAR_ENTRY_NUM_PROPERTIES]; #define TYPE_DATA_COLLECTION (data_collection_get_type ()) #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection)) @@ -284,14 +290,17 @@ GType sidebar_contextable_get_type (void) G_GNUC_CONST; GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST; GType library_hideable_page_entry_get_type (void) G_GNUC_CONST; GType library_offline_sidebar_entry_get_type (void) G_GNUC_CONST; -enum { - LIBRARY_OFFLINE_SIDEBAR_ENTRY_DUMMY_PROPERTY -}; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -299,9 +308,15 @@ GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); @@ -311,13 +326,20 @@ GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; -static void _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self); +static void _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self); LibraryOfflineSidebarEntry* library_offline_sidebar_entry_new (void); LibraryOfflineSidebarEntry* library_offline_sidebar_entry_construct (GType object_type); LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type); -static void _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self); +static void _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self); static gint library_offline_sidebar_entry_get_total_offline (LibraryOfflineSidebarEntry* self); -void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value); +void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, + gboolean value); GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceCollection* self); static gchar* library_offline_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base); #define OFFLINE_PAGE_NAME _ ("Missing Files") @@ -331,26 +353,37 @@ GType offline_page_get_type (void) G_GNUC_CONST; static void library_offline_sidebar_entry_finalize (GObject * obj); -static void _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { +static void +_library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self) +{ #line 18 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" library_offline_sidebar_entry_on_offline_contents_altered ((LibraryOfflineSidebarEntry*) self); -#line 338 "OfflineSidebarEntry.c" +#line 365 "OfflineSidebarEntry.c" } -static void _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { +static void +_library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self) +{ #line 11 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" library_offline_sidebar_entry_on_offline_contents_altered ((LibraryOfflineSidebarEntry*) self); -#line 345 "OfflineSidebarEntry.c" +#line 377 "OfflineSidebarEntry.c" } -LibraryOfflineSidebarEntry* library_offline_sidebar_entry_construct (GType object_type) { +LibraryOfflineSidebarEntry* +library_offline_sidebar_entry_construct (GType object_type) +{ LibraryOfflineSidebarEntry * self = NULL; - gint _tmp11_; #line 8 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" self = (LibraryOfflineSidebarEntry*) library_hideable_page_entry_construct (object_type); -#line 354 "OfflineSidebarEntry.c" +#line 387 "OfflineSidebarEntry.c" { GeeIterator* _media_sources_it = NULL; MediaCollectionRegistry* _tmp0_; @@ -379,78 +412,76 @@ LibraryOfflineSidebarEntry* library_offline_sidebar_entry_construct (GType objec _media_sources_it = _tmp5_; #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" while (TRUE) { -#line 383 "OfflineSidebarEntry.c" +#line 416 "OfflineSidebarEntry.c" GeeIterator* _tmp6_; - gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - MediaSourceCollection* _tmp10_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + MediaSourceCollection* _tmp9_; #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" break; -#line 398 "OfflineSidebarEntry.c" +#line 428 "OfflineSidebarEntry.c" } #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - _tmp8_ = _media_sources_it; + _tmp7_ = _media_sources_it; #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - media_sources = (MediaSourceCollection*) _tmp9_; + media_sources = (MediaSourceCollection*) _tmp8_; #line 11 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - _tmp10_ = media_sources; + _tmp9_ = media_sources; #line 11 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - g_signal_connect_object (_tmp10_, "offline-contents-altered", (GCallback) _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_offline_contents_altered, self, 0); + g_signal_connect_object (_tmp9_, "offline-contents-altered", (GCallback) _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_offline_contents_altered, self, 0); #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" _data_collection_unref0 (media_sources); -#line 412 "OfflineSidebarEntry.c" +#line 442 "OfflineSidebarEntry.c" } #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" _g_object_unref0 (_media_sources_it); -#line 416 "OfflineSidebarEntry.c" +#line 446 "OfflineSidebarEntry.c" } #line 13 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - _tmp11_ = library_offline_sidebar_entry_get_total_offline (self); -#line 13 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp11_ != 0); + library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), library_offline_sidebar_entry_get_total_offline (self) != 0); #line 8 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" return self; -#line 424 "OfflineSidebarEntry.c" +#line 452 "OfflineSidebarEntry.c" } -LibraryOfflineSidebarEntry* library_offline_sidebar_entry_new (void) { +LibraryOfflineSidebarEntry* +library_offline_sidebar_entry_new (void) +{ #line 8 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" return library_offline_sidebar_entry_construct (LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY); -#line 431 "OfflineSidebarEntry.c" +#line 461 "OfflineSidebarEntry.c" } -static void library_offline_sidebar_entry_on_offline_contents_altered (LibraryOfflineSidebarEntry* self) { - gint _tmp0_; +static void +library_offline_sidebar_entry_on_offline_contents_altered (LibraryOfflineSidebarEntry* self) +{ #line 21 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" g_return_if_fail (LIBRARY_IS_OFFLINE_SIDEBAR_ENTRY (self)); #line 22 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - _tmp0_ = library_offline_sidebar_entry_get_total_offline (self); -#line 22 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp0_ != 0); -#line 443 "OfflineSidebarEntry.c" + library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), library_offline_sidebar_entry_get_total_offline (self) != 0); +#line 472 "OfflineSidebarEntry.c" } -static gint library_offline_sidebar_entry_get_total_offline (LibraryOfflineSidebarEntry* self) { +static gint +library_offline_sidebar_entry_get_total_offline (LibraryOfflineSidebarEntry* self) +{ gint result = 0; gint total = 0; #line 25 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" g_return_val_if_fail (LIBRARY_IS_OFFLINE_SIDEBAR_ENTRY (self), 0); #line 26 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" total = 0; -#line 454 "OfflineSidebarEntry.c" +#line 485 "OfflineSidebarEntry.c" { GeeIterator* _media_sources_it = NULL; MediaCollectionRegistry* _tmp0_; @@ -479,67 +510,66 @@ static gint library_offline_sidebar_entry_get_total_offline (LibraryOfflineSideb _media_sources_it = _tmp5_; #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" while (TRUE) { -#line 483 "OfflineSidebarEntry.c" +#line 514 "OfflineSidebarEntry.c" GeeIterator* _tmp6_; - gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - gint _tmp10_; - MediaSourceCollection* _tmp11_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + gint _tmp9_; + MediaSourceCollection* _tmp10_; + GeeCollection* _tmp11_; GeeCollection* _tmp12_; - GeeCollection* _tmp13_; + gint _tmp13_; gint _tmp14_; - gint _tmp15_; #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" break; -#line 503 "OfflineSidebarEntry.c" +#line 531 "OfflineSidebarEntry.c" } #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - _tmp8_ = _media_sources_it; + _tmp7_ = _media_sources_it; #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - media_sources = (MediaSourceCollection*) _tmp9_; + media_sources = (MediaSourceCollection*) _tmp8_; #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - _tmp10_ = total; + _tmp9_ = total; #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - _tmp11_ = media_sources; + _tmp10_ = media_sources; #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - _tmp12_ = media_source_collection_get_offline_bin_contents (_tmp11_); + _tmp11_ = media_source_collection_get_offline_bin_contents (_tmp10_); #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - _tmp14_ = gee_collection_get_size (_tmp13_); + _tmp13_ = gee_collection_get_size (_tmp12_); #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - total = _tmp10_ + _tmp15_; + total = _tmp9_ + _tmp14_; #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp12_); #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" _data_collection_unref0 (media_sources); -#line 529 "OfflineSidebarEntry.c" +#line 557 "OfflineSidebarEntry.c" } #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" _g_object_unref0 (_media_sources_it); -#line 533 "OfflineSidebarEntry.c" +#line 561 "OfflineSidebarEntry.c" } #line 30 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" result = total; #line 30 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" return result; -#line 539 "OfflineSidebarEntry.c" +#line 567 "OfflineSidebarEntry.c" } -static gchar* library_offline_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +library_offline_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ LibraryOfflineSidebarEntry * self; gchar* result = NULL; gchar* _tmp0_; @@ -551,11 +581,13 @@ static gchar* library_offline_sidebar_entry_real_get_sidebar_name (SidebarSimple result = _tmp0_; #line 34 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" return result; -#line 555 "OfflineSidebarEntry.c" +#line 585 "OfflineSidebarEntry.c" } -static gchar* library_offline_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { +static gchar* +library_offline_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) +{ LibraryOfflineSidebarEntry * self; gchar* result = NULL; gchar* _tmp0_; @@ -567,11 +599,13 @@ static gchar* library_offline_sidebar_entry_real_get_sidebar_icon (SidebarSimple result = _tmp0_; #line 38 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" return result; -#line 571 "OfflineSidebarEntry.c" +#line 603 "OfflineSidebarEntry.c" } -static Page* library_offline_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +library_offline_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) +{ LibraryOfflineSidebarEntry * self; Page* result = NULL; OfflinePage* _tmp0_; @@ -585,11 +619,13 @@ static Page* library_offline_sidebar_entry_real_create_page (SidebarSimplePageEn result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page); #line 42 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" return result; -#line 589 "OfflineSidebarEntry.c" +#line 623 "OfflineSidebarEntry.c" } -static void library_offline_sidebar_entry_class_init (LibraryOfflineSidebarEntryClass * klass) { +static void +library_offline_sidebar_entry_class_init (LibraryOfflineSidebarEntryClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" library_offline_sidebar_entry_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" @@ -600,19 +636,23 @@ static void library_offline_sidebar_entry_class_init (LibraryOfflineSidebarEntry ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_offline_sidebar_entry_real_create_page; #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" G_OBJECT_CLASS (klass)->finalize = library_offline_sidebar_entry_finalize; -#line 604 "OfflineSidebarEntry.c" +#line 640 "OfflineSidebarEntry.c" } -static void library_offline_sidebar_entry_instance_init (LibraryOfflineSidebarEntry * self) { +static void +library_offline_sidebar_entry_instance_init (LibraryOfflineSidebarEntry * self) +{ } -static void library_offline_sidebar_entry_finalize (GObject * obj) { +static void +library_offline_sidebar_entry_finalize (GObject * obj) +{ LibraryOfflineSidebarEntry * self; #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, LibraryOfflineSidebarEntry); -#line 616 "OfflineSidebarEntry.c" +#line 656 "OfflineSidebarEntry.c" { GeeIterator* _media_sources_it = NULL; MediaCollectionRegistry* _tmp0_; @@ -641,51 +681,50 @@ static void library_offline_sidebar_entry_finalize (GObject * obj) { _media_sources_it = _tmp5_; #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" while (TRUE) { -#line 645 "OfflineSidebarEntry.c" +#line 685 "OfflineSidebarEntry.c" GeeIterator* _tmp6_; - gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - MediaSourceCollection* _tmp10_; - guint _tmp11_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + MediaSourceCollection* _tmp9_; + guint _tmp10_; #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" break; -#line 661 "OfflineSidebarEntry.c" +#line 698 "OfflineSidebarEntry.c" } #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - _tmp8_ = _media_sources_it; + _tmp7_ = _media_sources_it; #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - media_sources = (MediaSourceCollection*) _tmp9_; + media_sources = (MediaSourceCollection*) _tmp8_; #line 18 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - _tmp10_ = media_sources; + _tmp9_ = media_sources; #line 18 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp11_, NULL, FALSE); + g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp10_, NULL, FALSE); #line 18 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_trashcan_contents_altered, self); + g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_trashcan_contents_altered, self); #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" _data_collection_unref0 (media_sources); -#line 677 "OfflineSidebarEntry.c" +#line 714 "OfflineSidebarEntry.c" } #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" _g_object_unref0 (_media_sources_it); -#line 681 "OfflineSidebarEntry.c" +#line 718 "OfflineSidebarEntry.c" } #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" G_OBJECT_CLASS (library_offline_sidebar_entry_parent_class)->finalize (obj); -#line 685 "OfflineSidebarEntry.c" +#line 722 "OfflineSidebarEntry.c" } -GType library_offline_sidebar_entry_get_type (void) { +GType +library_offline_sidebar_entry_get_type (void) +{ static volatile gsize library_offline_sidebar_entry_type_id__volatile = 0; if (g_once_init_enter (&library_offline_sidebar_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryOfflineSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_offline_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryOfflineSidebarEntry), 0, (GInstanceInitFunc) library_offline_sidebar_entry_instance_init, NULL }; diff --git a/src/library/TrashPage.c b/src/library/TrashPage.c index 1e3ffc8..9d1f7a9 100644 --- a/src/library/TrashPage.c +++ b/src/library/TrashPage.c @@ -1,4 +1,4 @@ -/* TrashPage.c generated by valac 0.36.6, the Vala compiler +/* TrashPage.c generated by valac 0.40.4, the Vala compiler * generated from TrashPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -199,6 +200,11 @@ typedef struct _TrashPageTrashSearchViewFilterClass TrashPageTrashSearchViewFilt typedef struct _MediaViewTracker MediaViewTracker; typedef struct _MediaViewTrackerClass MediaViewTrackerClass; +enum { + TRASH_PAGE_0_PROPERTY, + TRASH_PAGE_NUM_PROPERTIES +}; +static GParamSpec* trash_page_properties[TRASH_PAGE_NUM_PROPERTIES]; #define _view_filter_unref0(var) ((var == NULL) ? NULL : (var = (view_filter_unref (var), NULL))) #define _core_tracker_unref0(var) ((var == NULL) ? NULL : (var = (core_tracker_unref (var), NULL))) @@ -432,6 +438,11 @@ typedef struct _Dimensions Dimensions; typedef struct _MediaSourceItemPrivate MediaSourceItemPrivate; typedef struct _ThumbnailPrivate ThumbnailPrivate; typedef struct _TrashPageTrashViewPrivate TrashPageTrashViewPrivate; +enum { + TRASH_PAGE_TRASH_VIEW_0_PROPERTY, + TRASH_PAGE_TRASH_VIEW_NUM_PROPERTIES +}; +static GParamSpec* trash_page_trash_view_properties[TRASH_PAGE_TRASH_VIEW_NUM_PROPERTIES]; typedef struct _ViewFilterPrivate ViewFilterPrivate; typedef struct _SearchViewFilterPrivate SearchViewFilterPrivate; typedef struct _DefaultSearchViewFilterPrivate DefaultSearchViewFilterPrivate; @@ -723,9 +734,15 @@ GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType checkerboard_page_get_type (void) G_GNUC_CONST; @@ -739,17 +756,29 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self); gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType search_view_filter_get_type (void) G_GNUC_CONST; gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; @@ -758,33 +787,45 @@ GType default_search_view_filter_get_type (void) G_GNUC_CONST; static GType trash_page_trash_search_view_filter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; GType media_view_tracker_get_type (void) G_GNUC_CONST; #define TRASH_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TRASH_PAGE, TrashPagePrivate)) -enum { - TRASH_PAGE_DUMMY_PROPERTY -}; static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_new (void); static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_construct (GType object_type); #define TRASH_PAGE_NAME _ ("Trash") static void trash_page_on_delete (TrashPage* self); -static void _trash_page_on_delete_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _trash_page_on_delete_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void trash_page_on_restore (TrashPage* self); -static void _trash_page_on_restore_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _trash_page_on_restore_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); TrashPage* trash_page_new (void); TrashPage* trash_page_construct (GType object_type); -CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name); -void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path); -void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path); -void page_init_toolbar (Page* self, const gchar* path); +CheckerboardPage* checkerboard_page_construct (GType object_type, + const gchar* page_name); +void checkerboard_page_init_item_context_menu (CheckerboardPage* self, + const gchar* path); +void checkerboard_page_init_page_context_menu (CheckerboardPage* self, + const gchar* path); +void page_init_toolbar (Page* self, + const gchar* path); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; ViewCollection* page_get_view (Page* self); MediaViewTracker* media_view_tracker_new (ViewCollection* collection); -MediaViewTracker* media_view_tracker_construct (GType object_type, ViewCollection* collection); +MediaViewTracker* media_view_tracker_construct (GType object_type, + ViewCollection* collection); GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; @@ -792,74 +833,113 @@ GType library_photo_source_collection_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; -static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollection* added, GeeCollection* removed); -static void _trash_page_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self); +static void trash_page_on_trashcan_contents_altered (TrashPage* self, + GeeCollection* added, + GeeCollection* removed); +static void _trash_page_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self); GType video_source_collection_get_type (void) G_GNUC_CONST; GeeCollection* media_source_collection_get_trashcan_contents (MediaSourceCollection* self); -static void trash_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); -void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static void trash_page_real_add_actions (Page* base, GActionMap* map); -void page_add_actions (Page* self, GActionMap* map); -static void trash_page_real_remove_actions (Page* base, GActionMap* map); -void page_remove_actions (Page* self, GActionMap* map); +static void trash_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames); +void page_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames); +static void trash_page_real_add_actions (Page* base, + GActionMap* map); +void page_add_actions (Page* self, + GActionMap* map); +static void trash_page_real_remove_actions (Page* base, + GActionMap* map); +void page_remove_actions (Page* self, + GActionMap* map); static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base); -static void trash_page_real_update_actions (Page* base, gint selected_count, gint count); -void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); -void page_set_common_action_important (Page* self, const gchar* name, gboolean important); -void page_update_actions (Page* self, gint selected_count, gint count); -gboolean data_collection_add (DataCollection* self, DataObject* object); +static void trash_page_real_update_actions (Page* base, + gint selected_count, + gint count); +void page_set_action_sensitive (Page* self, + const gchar* name, + gboolean sensitive); +void page_set_common_action_important (Page* self, + const gchar* name, + gboolean important); +void page_update_actions (Page* self, + gint selected_count, + gint count); +gboolean data_collection_add (DataCollection* self, + DataObject* object); static TrashPageTrashView* trash_page_trash_view_new (MediaSource* source); -static TrashPageTrashView* trash_page_trash_view_construct (GType object_type, MediaSource* source); +static TrashPageTrashView* trash_page_trash_view_construct (GType object_type, + MediaSource* source); GType media_source_item_get_type (void) G_GNUC_CONST; GType thumbnail_get_type (void) G_GNUC_CONST; static GType trash_page_trash_view_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; GType marker_get_type (void) G_GNUC_CONST; Marker* data_collection_start_marking (DataCollection* self); -void marker_mark (Marker* self, DataObject* object); -DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source); -void data_collection_remove_marked (DataCollection* self, Marker* m); +void marker_mark (Marker* self, + DataObject* object); +DataView* view_collection_get_view_for_source (ViewCollection* self, + DataSource* source); +void data_collection_remove_marked (DataCollection* self, + Marker* m); gint view_collection_get_selected_count (ViewCollection* self); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* page_get_command_manager (Page* self); GType command_get_type (void) G_GNUC_CONST; -void command_manager_execute (CommandManager* self, Command* command); +void command_manager_execute (CommandManager* self, + Command* command); GeeList* view_collection_get_selected_sources (ViewCollection* self); GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; -TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, gboolean to_trash); -TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type, GeeCollection* sources, gboolean to_trash); +TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, + gboolean to_trash); +TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type, + GeeCollection* sources, + gboolean to_trash); GType page_command_get_type (void) G_GNUC_CONST; GType trash_untrash_photos_command_get_type (void) G_GNUC_CONST; static gchar* trash_page_real_get_view_empty_message (CheckerboardPage* base); -void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const gchar* progress_dialog_text); +void remove_from_app (GeeCollection* sources, + const gchar* dialog_title, + const gchar* progress_dialog_text); static SearchViewFilter* trash_page_real_get_search_view_filter (CheckerboardPage* base); gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); -enum { - TRASH_PAGE_TRASH_VIEW_DUMMY_PROPERTY -}; gint thumbnail_get_DEFAULT_SCALE (void); -Thumbnail* thumbnail_new (MediaSource* media, gint scale); -Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scale); +Thumbnail* thumbnail_new (MediaSource* media, + gint scale); +Thumbnail* thumbnail_construct (GType object_type, + MediaSource* media, + gint scale); gboolean media_source_is_trashed (MediaSource* self); -enum { - TRASH_PAGE_TRASH_SEARCH_VIEW_FILTER_DUMMY_PROPERTY -}; static guint trash_page_trash_search_view_filter_real_get_criteria (SearchViewFilter* base); GType search_filter_criteria_get_type (void) G_GNUC_CONST; DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type); @@ -867,28 +947,43 @@ static void trash_page_finalize (GObject * obj); static const GActionEntry TRASH_PAGE_entries[2] = {{"Delete", _trash_page_on_delete_gsimple_action_activate_callback}, {"Restore", _trash_page_on_restore_gsimple_action_activate_callback}}; -static void _trash_page_on_delete_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_trash_page_on_delete_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 50 "/home/jens/Source/shotwell/src/library/TrashPage.vala" trash_page_on_delete ((TrashPage*) self); -#line 874 "TrashPage.c" +#line 958 "TrashPage.c" } -static void _trash_page_on_restore_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_trash_page_on_restore_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 50 "/home/jens/Source/shotwell/src/library/TrashPage.vala" trash_page_on_restore ((TrashPage*) self); -#line 881 "TrashPage.c" +#line 969 "TrashPage.c" } -static void _trash_page_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { +static void +_trash_page_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self) +{ #line 38 "/home/jens/Source/shotwell/src/library/TrashPage.vala" trash_page_on_trashcan_contents_altered ((TrashPage*) self, added, removed); -#line 888 "TrashPage.c" +#line 981 "TrashPage.c" } -TrashPage* trash_page_construct (GType object_type) { +TrashPage* +trash_page_construct (GType object_type) +{ TrashPage * self = NULL; ViewCollection* _tmp0_; ViewCollection* _tmp1_; @@ -951,69 +1046,65 @@ TrashPage* trash_page_construct (GType object_type) { _g_object_unref0 (_tmp10_); #line 28 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self; -#line 955 "TrashPage.c" +#line 1050 "TrashPage.c" } -TrashPage* trash_page_new (void) { +TrashPage* +trash_page_new (void) +{ #line 28 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return trash_page_construct (TYPE_TRASH_PAGE); -#line 962 "TrashPage.c" +#line 1059 "TrashPage.c" } -static void trash_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { +static void +trash_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames) +{ TrashPage * self; - GeeList* _tmp0_; - GeeList* _tmp1_; #line 44 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); #line 44 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); #line 45 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp0_ = ui_filenames; -#line 45 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - PAGE_CLASS (trash_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); -#line 47 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp1_ = ui_filenames; + PAGE_CLASS (trash_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), ui_filenames); #line 47 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "trash.ui"); -#line 982 "TrashPage.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "trash.ui"); +#line 1076 "TrashPage.c" } -static void trash_page_real_add_actions (Page* base, GActionMap* map) { +static void +trash_page_real_add_actions (Page* base, + GActionMap* map) +{ TrashPage * self; - GActionMap* _tmp0_; - GActionMap* _tmp1_; #line 55 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); #line 55 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 56 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp0_ = map; -#line 56 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - PAGE_CLASS (trash_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); -#line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp1_ = map; + PAGE_CLASS (trash_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map); #line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - g_action_map_add_action_entries (_tmp1_, TRASH_PAGE_entries, G_N_ELEMENTS (TRASH_PAGE_entries), self); -#line 1002 "TrashPage.c" + g_action_map_add_action_entries (map, TRASH_PAGE_entries, G_N_ELEMENTS (TRASH_PAGE_entries), self); +#line 1093 "TrashPage.c" } -static void trash_page_real_remove_actions (Page* base, GActionMap* map) { +static void +trash_page_real_remove_actions (Page* base, + GActionMap* map) +{ TrashPage * self; - GActionMap* _tmp0_; #line 61 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); #line 61 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp0_ = map; -#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - PAGE_CLASS (trash_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); -#line 1017 "TrashPage.c" + PAGE_CLASS (trash_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map); +#line 1108 "TrashPage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -1025,38 +1116,39 @@ static void trash_page_real_remove_actions (Page* base, GActionMap* map) { entry_collection_length1 = G_N_ELEMENTS (TRASH_PAGE_entries); #line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (TRASH_PAGE_entries); entry_it = entry_it + 1) { -#line 1029 "TrashPage.c" +#line 1120 "TrashPage.c" GActionEntry entry = {0}; #line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala" entry = entry_collection[entry_it]; -#line 1033 "TrashPage.c" +#line 1124 "TrashPage.c" { - GActionMap* _tmp1_; - GActionEntry _tmp2_; - const gchar* _tmp3_; + GActionEntry _tmp0_; + const gchar* _tmp1_; #line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp1_ = map; + _tmp0_ = entry; #line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp2_ = entry; + _tmp1_ = _tmp0_.name; #line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp3_ = _tmp2_.name; -#line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - g_action_map_remove_action (_tmp1_, _tmp3_); -#line 1046 "TrashPage.c" + g_action_map_remove_action (map, _tmp1_); +#line 1134 "TrashPage.c" } } } } -static gpointer _core_tracker_ref0 (gpointer self) { +static gpointer +_core_tracker_ref0 (gpointer self) +{ #line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self ? core_tracker_ref (self) : NULL; -#line 1056 "TrashPage.c" +#line 1146 "TrashPage.c" } -static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base) { +static CoreViewTracker* +trash_page_real_get_view_tracker (CheckerboardPage* base) +{ TrashPage * self; CoreViewTracker* result = NULL; MediaViewTracker* _tmp0_; @@ -1071,22 +1163,21 @@ static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base result = _tmp1_; #line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return result; -#line 1075 "TrashPage.c" +#line 1167 "TrashPage.c" } -static void trash_page_real_update_actions (Page* base, gint selected_count, gint count) { +static void +trash_page_real_update_actions (Page* base, + gint selected_count, + gint count) +{ TrashPage * self; gboolean has_selected = FALSE; - gint _tmp0_; - gint _tmp1_; - gint _tmp2_; #line 72 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); #line 73 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp0_ = selected_count; -#line 73 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - has_selected = _tmp0_ > 0; + has_selected = selected_count > 0; #line 75 "/home/jens/Source/shotwell/src/library/TrashPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Delete", has_selected); #line 76 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1094,18 +1185,16 @@ static void trash_page_real_update_actions (Page* base, gint selected_count, gin #line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala" page_set_common_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonEmptyTrash", TRUE); #line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp1_ = selected_count; -#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp2_ = count; -#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - PAGE_CLASS (trash_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp1_, _tmp2_); -#line 1103 "TrashPage.c" + PAGE_CLASS (trash_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), selected_count, count); +#line 1190 "TrashPage.c" } -static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollection* added, GeeCollection* removed) { - GeeCollection* _tmp0_; - GeeCollection* _tmp12_; +static void +trash_page_on_trashcan_contents_altered (TrashPage* self, + GeeCollection* added, + GeeCollection* removed) +{ #line 82 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail (IS_TRASH_PAGE (self)); #line 82 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1113,196 +1202,181 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect #line 82 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp0_ = added; -#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - if (_tmp0_ != NULL) { -#line 1120 "TrashPage.c" + if (added != NULL) { +#line 1207 "TrashPage.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; -#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp1_ = added; + GeeIterator* _tmp0_; #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_ITERABLE, GeeIterable)); #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _source_it = _tmp2_; + _source_it = _tmp0_; #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" while (TRUE) { -#line 1133 "TrashPage.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 1217 "TrashPage.c" + GeeIterator* _tmp1_; MediaSource* source = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - ViewCollection* _tmp7_; - ViewCollection* _tmp8_; - MediaSource* _tmp9_; - TrashPageTrashView* _tmp10_; - TrashPageTrashView* _tmp11_; + GeeIterator* _tmp2_; + gpointer _tmp3_; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; + MediaSource* _tmp6_; + TrashPageTrashView* _tmp7_; + TrashPageTrashView* _tmp8_; #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp3_ = _source_it; + _tmp1_ = _source_it; #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp4_ = gee_iterator_next (_tmp3_); -#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" break; -#line 1152 "TrashPage.c" +#line 1233 "TrashPage.c" } #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp5_ = _source_it; + _tmp2_ = _source_it; #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - source = (MediaSource*) _tmp6_; + source = (MediaSource*) _tmp3_; #line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp8_ = _tmp7_; + _tmp5_ = _tmp4_; #line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp9_ = source; + _tmp6_ = source; #line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp10_ = trash_page_trash_view_new (_tmp9_); + _tmp7_ = trash_page_trash_view_new (_tmp6_); #line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); #line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp8_); #line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _data_collection_unref0 (_tmp8_); + _data_collection_unref0 (_tmp5_); #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (source); -#line 1178 "TrashPage.c" +#line 1259 "TrashPage.c" } #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_source_it); -#line 1182 "TrashPage.c" +#line 1263 "TrashPage.c" } } #line 89 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp12_ = removed; -#line 89 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - if (_tmp12_ != NULL) { -#line 1189 "TrashPage.c" + if (removed != NULL) { +#line 1268 "TrashPage.c" Marker* marker = NULL; - ViewCollection* _tmp13_; - ViewCollection* _tmp14_; - Marker* _tmp15_; - Marker* _tmp16_; - ViewCollection* _tmp29_; - ViewCollection* _tmp30_; - Marker* _tmp31_; + ViewCollection* _tmp9_; + ViewCollection* _tmp10_; + Marker* _tmp11_; + Marker* _tmp12_; + ViewCollection* _tmp23_; + ViewCollection* _tmp24_; + Marker* _tmp25_; #line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp14_ = _tmp13_; + _tmp10_ = _tmp9_; #line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp15_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp11_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection)); #line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp16_ = _tmp15_; + _tmp12_ = _tmp11_; #line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _data_collection_unref0 (_tmp14_); + _data_collection_unref0 (_tmp10_); #line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - marker = _tmp16_; -#line 1210 "TrashPage.c" + marker = _tmp12_; +#line 1289 "TrashPage.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp17_; - GeeIterator* _tmp18_; + GeeIterator* _tmp13_; #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp17_ = removed; + _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_ITERABLE, GeeIterable)); #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _source_it = _tmp18_; + _source_it = _tmp13_; #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" while (TRUE) { -#line 1223 "TrashPage.c" - GeeIterator* _tmp19_; - gboolean _tmp20_; +#line 1299 "TrashPage.c" + GeeIterator* _tmp14_; MediaSource* source = NULL; - GeeIterator* _tmp21_; - gpointer _tmp22_; - Marker* _tmp23_; - ViewCollection* _tmp24_; - ViewCollection* _tmp25_; - MediaSource* _tmp26_; - DataView* _tmp27_; - DataView* _tmp28_; -#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp19_ = _source_it; + GeeIterator* _tmp15_; + gpointer _tmp16_; + Marker* _tmp17_; + ViewCollection* _tmp18_; + ViewCollection* _tmp19_; + MediaSource* _tmp20_; + DataView* _tmp21_; + DataView* _tmp22_; #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp20_ = gee_iterator_next (_tmp19_); + _tmp14_ = _source_it; #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - if (!_tmp20_) { + if (!gee_iterator_next (_tmp14_)) { #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" break; -#line 1243 "TrashPage.c" +#line 1316 "TrashPage.c" } #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp21_ = _source_it; + _tmp15_ = _source_it; #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp22_ = gee_iterator_get (_tmp21_); + _tmp16_ = gee_iterator_get (_tmp15_); #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - source = (MediaSource*) _tmp22_; + source = (MediaSource*) _tmp16_; #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp23_ = marker; + _tmp17_ = marker; #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp18_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp25_ = _tmp24_; + _tmp19_ = _tmp18_; #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp26_ = source; + _tmp20_ = source; #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp27_ = view_collection_get_view_for_source (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource)); + _tmp21_ = view_collection_get_view_for_source (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_SOURCE, DataSource)); #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp28_ = _tmp27_; + _tmp22_ = _tmp21_; #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject)); + marker_mark (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject)); #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _g_object_unref0 (_tmp28_); + _g_object_unref0 (_tmp22_); #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _data_collection_unref0 (_tmp25_); + _data_collection_unref0 (_tmp19_); #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (source); -#line 1271 "TrashPage.c" +#line 1344 "TrashPage.c" } #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_source_it); -#line 1275 "TrashPage.c" +#line 1348 "TrashPage.c" } #line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp30_ = _tmp29_; + _tmp24_ = _tmp23_; #line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp31_ = marker; + _tmp25_ = marker; #line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), _tmp31_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_COLLECTION, DataCollection), _tmp25_); #line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _data_collection_unref0 (_tmp30_); + _data_collection_unref0 (_tmp24_); #line 89 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (marker); -#line 1289 "TrashPage.c" +#line 1362 "TrashPage.c" } } -static void trash_page_on_restore (TrashPage* self) { +static void +trash_page_on_restore (TrashPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; + CommandManager* _tmp3_; CommandManager* _tmp4_; - CommandManager* _tmp5_; + ViewCollection* _tmp5_; ViewCollection* _tmp6_; - ViewCollection* _tmp7_; - GeeList* _tmp8_; - GeeCollection* _tmp9_; + GeeList* _tmp7_; + GeeCollection* _tmp8_; + TrashUntrashPhotosCommand* _tmp9_; TrashUntrashPhotosCommand* _tmp10_; - TrashUntrashPhotosCommand* _tmp11_; #line 97 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail (IS_TRASH_PAGE (self)); #line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1310,48 +1384,48 @@ static void trash_page_on_restore (TrashPage* self) { #line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = _tmp0_; #line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0; #line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp1_); #line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 99 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return; -#line 1323 "TrashPage.c" +#line 1395 "TrashPage.c" } #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp8_ = view_collection_get_selected_sources (_tmp7_); + _tmp7_ = view_collection_get_selected_sources (_tmp6_); #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection); #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp10_ = trash_untrash_photos_command_new (_tmp9_, FALSE); + _tmp9_ = trash_untrash_photos_command_new (_tmp8_, FALSE); #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command)); #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp10_); #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _data_collection_unref0 (_tmp7_); + _data_collection_unref0 (_tmp6_); #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _command_manager_unref0 (_tmp5_); -#line 1351 "TrashPage.c" + _command_manager_unref0 (_tmp4_); +#line 1423 "TrashPage.c" } -static gchar* trash_page_real_get_view_empty_message (CheckerboardPage* base) { +static gchar* +trash_page_real_get_view_empty_message (CheckerboardPage* base) +{ TrashPage * self; gchar* result = NULL; gchar* _tmp0_; @@ -1363,20 +1437,21 @@ static gchar* trash_page_real_get_view_empty_message (CheckerboardPage* base) { result = _tmp0_; #line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return result; -#line 1367 "TrashPage.c" +#line 1441 "TrashPage.c" } -static void trash_page_on_delete (TrashPage* self) { +static void +trash_page_on_delete (TrashPage* self) +{ const gchar* _tmp0_ = NULL; ViewCollection* _tmp1_; ViewCollection* _tmp2_; - gint _tmp3_; - gboolean _tmp4_; + gboolean _tmp3_; + ViewCollection* _tmp4_; ViewCollection* _tmp5_; - ViewCollection* _tmp6_; - GeeList* _tmp7_; - GeeCollection* _tmp8_; + GeeList* _tmp6_; + GeeCollection* _tmp7_; #line 109 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail (IS_TRASH_PAGE (self)); #line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1384,47 +1459,49 @@ static void trash_page_on_delete (TrashPage* self) { #line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp2_ = _tmp1_; #line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp3_ = view_collection_get_selected_count (_tmp2_); -#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp4_ = _tmp3_ == 1; + _tmp3_ = view_collection_get_selected_count (_tmp2_) == 1; #line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp2_); #line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - if (_tmp4_) { + if (_tmp3_) { #line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = "Deleting a Photo"; -#line 1397 "TrashPage.c" +#line 1470 "TrashPage.c" } else { #line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = _ ("Deleting Photos"); -#line 1401 "TrashPage.c" +#line 1474 "TrashPage.c" } #line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp7_ = view_collection_get_selected_sources (_tmp6_); + _tmp6_ = view_collection_get_selected_sources (_tmp5_); #line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection); #line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - remove_from_app (_tmp8_, _ ("Delete"), _tmp0_); + remove_from_app (_tmp7_, _ ("Delete"), _tmp0_); #line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _data_collection_unref0 (_tmp6_); -#line 1417 "TrashPage.c" + _data_collection_unref0 (_tmp5_); +#line 1490 "TrashPage.c" } -static gpointer _view_filter_ref0 (gpointer self) { +static gpointer +_view_filter_ref0 (gpointer self) +{ #line 115 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self ? view_filter_ref (self) : NULL; -#line 1424 "TrashPage.c" +#line 1499 "TrashPage.c" } -static SearchViewFilter* trash_page_real_get_search_view_filter (CheckerboardPage* base) { +static SearchViewFilter* +trash_page_real_get_search_view_filter (CheckerboardPage* base) +{ TrashPage * self; SearchViewFilter* result = NULL; TrashPageTrashSearchViewFilter* _tmp0_; @@ -1439,58 +1516,60 @@ static SearchViewFilter* trash_page_real_get_search_view_filter (CheckerboardPag result = _tmp1_; #line 115 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return result; -#line 1443 "TrashPage.c" +#line 1520 "TrashPage.c" } -static TrashPageTrashView* trash_page_trash_view_construct (GType object_type, MediaSource* source) { +static TrashPageTrashView* +trash_page_trash_view_construct (GType object_type, + MediaSource* source) +{ TrashPageTrashView * self = NULL; - MediaSource* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; - MediaSource* _tmp3_; - gboolean _tmp4_; #line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL); #line 12 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp0_ = source; -#line 12 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp1_ = thumbnail_get_DEFAULT_SCALE (); + _tmp0_ = thumbnail_get_DEFAULT_SCALE (); #line 12 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 12 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - self = (TrashPageTrashView*) thumbnail_construct (object_type, _tmp0_, _tmp2_); + self = (TrashPageTrashView*) thumbnail_construct (object_type, source, _tmp1_); #line 14 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp3_ = source; -#line 14 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp4_ = media_source_is_trashed (_tmp3_); -#line 14 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _vala_assert (_tmp4_, "source.is_trashed()"); + _vala_assert (media_source_is_trashed (source), "source.is_trashed()"); #line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self; -#line 1472 "TrashPage.c" +#line 1543 "TrashPage.c" } -static TrashPageTrashView* trash_page_trash_view_new (MediaSource* source) { +static TrashPageTrashView* +trash_page_trash_view_new (MediaSource* source) +{ #line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return trash_page_trash_view_construct (TRASH_PAGE_TYPE_TRASH_VIEW, source); -#line 1479 "TrashPage.c" +#line 1552 "TrashPage.c" } -static void trash_page_trash_view_class_init (TrashPageTrashViewClass * klass) { +static void +trash_page_trash_view_class_init (TrashPageTrashViewClass * klass) +{ #line 10 "/home/jens/Source/shotwell/src/library/TrashPage.vala" trash_page_trash_view_parent_class = g_type_class_peek_parent (klass); -#line 1486 "TrashPage.c" +#line 1561 "TrashPage.c" } -static void trash_page_trash_view_instance_init (TrashPageTrashView * self) { +static void +trash_page_trash_view_instance_init (TrashPageTrashView * self) +{ } -static GType trash_page_trash_view_get_type (void) { +static GType +trash_page_trash_view_get_type (void) +{ static volatile gsize trash_page_trash_view_type_id__volatile = 0; if (g_once_init_enter (&trash_page_trash_view_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TrashPageTrashViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) trash_page_trash_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TrashPageTrashView), 0, (GInstanceInitFunc) trash_page_trash_view_instance_init, NULL }; @@ -1502,7 +1581,9 @@ static GType trash_page_trash_view_get_type (void) { } -static guint trash_page_trash_search_view_filter_real_get_criteria (SearchViewFilter* base) { +static guint +trash_page_trash_search_view_filter_real_get_criteria (SearchViewFilter* base) +{ TrashPageTrashSearchViewFilter * self; guint result = 0U; #line 19 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1511,41 +1592,51 @@ static guint trash_page_trash_search_view_filter_real_get_criteria (SearchViewFi result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH); #line 20 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return result; -#line 1515 "TrashPage.c" +#line 1596 "TrashPage.c" } -static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_construct (GType object_type) { +static TrashPageTrashSearchViewFilter* +trash_page_trash_search_view_filter_construct (GType object_type) +{ TrashPageTrashSearchViewFilter* self = NULL; #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = (TrashPageTrashSearchViewFilter*) default_search_view_filter_construct (object_type); #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self; -#line 1525 "TrashPage.c" +#line 1608 "TrashPage.c" } -static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_new (void) { +static TrashPageTrashSearchViewFilter* +trash_page_trash_search_view_filter_new (void) +{ #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return trash_page_trash_search_view_filter_construct (TRASH_PAGE_TYPE_TRASH_SEARCH_VIEW_FILTER); -#line 1532 "TrashPage.c" +#line 1617 "TrashPage.c" } -static void trash_page_trash_search_view_filter_class_init (TrashPageTrashSearchViewFilterClass * klass) { +static void +trash_page_trash_search_view_filter_class_init (TrashPageTrashSearchViewFilterClass * klass) +{ #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala" trash_page_trash_search_view_filter_parent_class = g_type_class_peek_parent (klass); #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala" ((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) trash_page_trash_search_view_filter_real_get_criteria; -#line 1541 "TrashPage.c" +#line 1628 "TrashPage.c" } -static void trash_page_trash_search_view_filter_instance_init (TrashPageTrashSearchViewFilter * self) { +static void +trash_page_trash_search_view_filter_instance_init (TrashPageTrashSearchViewFilter * self) +{ } -static GType trash_page_trash_search_view_filter_get_type (void) { +static GType +trash_page_trash_search_view_filter_get_type (void) +{ static volatile gsize trash_page_trash_search_view_filter_type_id__volatile = 0; if (g_once_init_enter (&trash_page_trash_search_view_filter_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TrashPageTrashSearchViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) trash_page_trash_search_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TrashPageTrashSearchViewFilter), 0, (GInstanceInitFunc) trash_page_trash_search_view_filter_instance_init, NULL }; @@ -1557,7 +1648,9 @@ static GType trash_page_trash_search_view_filter_get_type (void) { } -static void trash_page_class_init (TrashPageClass * klass) { +static void +trash_page_class_init (TrashPageClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" trash_page_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1578,11 +1671,13 @@ static void trash_page_class_init (TrashPageClass * klass) { ((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) trash_page_real_get_search_view_filter; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" G_OBJECT_CLASS (klass)->finalize = trash_page_finalize; -#line 1582 "TrashPage.c" +#line 1675 "TrashPage.c" } -static void trash_page_instance_init (TrashPage * self) { +static void +trash_page_instance_init (TrashPage * self) +{ TrashPageTrashSearchViewFilter* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self->priv = TRASH_PAGE_GET_PRIVATE (self); @@ -1590,11 +1685,13 @@ static void trash_page_instance_init (TrashPage * self) { _tmp0_ = trash_page_trash_search_view_filter_new (); #line 25 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self->priv->search_filter = _tmp0_; -#line 1594 "TrashPage.c" +#line 1689 "TrashPage.c" } -static void trash_page_finalize (GObject * obj) { +static void +trash_page_finalize (GObject * obj) +{ TrashPage * self; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TRASH_PAGE, TrashPage); @@ -1604,11 +1701,13 @@ static void trash_page_finalize (GObject * obj) { _core_tracker_unref0 (self->priv->tracker); #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" G_OBJECT_CLASS (trash_page_parent_class)->finalize (obj); -#line 1608 "TrashPage.c" +#line 1705 "TrashPage.c" } -GType trash_page_get_type (void) { +GType +trash_page_get_type (void) +{ static volatile gsize trash_page_type_id__volatile = 0; if (g_once_init_enter (&trash_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TrashPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) trash_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TrashPage), 0, (GInstanceInitFunc) trash_page_instance_init, NULL }; diff --git a/src/library/TrashSidebarEntry.c b/src/library/TrashSidebarEntry.c index 9b8a030..796281b 100644 --- a/src/library/TrashSidebarEntry.c +++ b/src/library/TrashSidebarEntry.c @@ -1,4 +1,4 @@ -/* TrashSidebarEntry.c generated by valac 0.36.6, the Vala compiler +/* TrashSidebarEntry.c generated by valac 0.40.4, the Vala compiler * generated from TrashSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -138,6 +139,11 @@ typedef struct _MediaSourceClass MediaSourceClass; typedef struct _LibraryTrashSidebarEntry LibraryTrashSidebarEntry; typedef struct _LibraryTrashSidebarEntryClass LibraryTrashSidebarEntryClass; typedef struct _LibraryTrashSidebarEntryPrivate LibraryTrashSidebarEntryPrivate; +enum { + LIBRARY_TRASH_SIDEBAR_ENTRY_0_PROPERTY, + LIBRARY_TRASH_SIDEBAR_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* library_trash_sidebar_entry_properties[LIBRARY_TRASH_SIDEBAR_ENTRY_NUM_PROPERTIES]; #define TYPE_DATA_COLLECTION (data_collection_get_type ()) #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection)) @@ -325,14 +331,17 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; GType sidebar_internal_drop_target_entry_get_type (void) G_GNUC_CONST; GType library_trash_sidebar_entry_get_type (void) G_GNUC_CONST; -enum { - LIBRARY_TRASH_SIDEBAR_ENTRY_DUMMY_PROPERTY -}; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -340,15 +349,24 @@ GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self); static void library_trash_sidebar_entry_on_trashcan_contents_altered (LibraryTrashSidebarEntry* self); -static void _library_trash_sidebar_entry_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self); +static void _library_trash_sidebar_entry_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self); LibraryTrashSidebarEntry* library_trash_sidebar_entry_new (void); LibraryTrashSidebarEntry* library_trash_sidebar_entry_construct (GType object_type); SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type); @@ -361,22 +379,34 @@ static gchar* library_trash_sidebar_entry_get_current_icon (void); gint media_source_collection_get_trashcan_count (MediaSourceCollection* self); #define RESOURCES_ICON_TRASH_FULL "user-trash-full" #define RESOURCES_ICON_TRASH_EMPTY "user-trash" -static gboolean library_trash_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media); +static gboolean library_trash_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, + GeeList* media); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* app_window_get_command_manager (void); GType command_get_type (void) G_GNUC_CONST; -void command_manager_execute (CommandManager* self, Command* command); -TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, gboolean to_trash); -TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type, GeeCollection* sources, gboolean to_trash); +void command_manager_execute (CommandManager* self, + Command* command); +TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, + gboolean to_trash); +TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type, + GeeCollection* sources, + gboolean to_trash); GType page_command_get_type (void) G_GNUC_CONST; GType trash_untrash_photos_command_get_type (void) G_GNUC_CONST; -static gboolean library_trash_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data); +static gboolean library_trash_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, + GtkSelectionData* data); static Page* library_trash_sidebar_entry_real_create_page (SidebarSimplePageEntry* base); TrashPage* trash_page_new (void); TrashPage* trash_page_construct (GType object_type); @@ -385,18 +415,25 @@ GType trash_page_get_type (void) G_GNUC_CONST; static void library_trash_sidebar_entry_finalize (GObject * obj); -static void _library_trash_sidebar_entry_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { +static void +_library_trash_sidebar_entry_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self) +{ #line 16 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" library_trash_sidebar_entry_on_trashcan_contents_altered ((LibraryTrashSidebarEntry*) self); -#line 392 "TrashSidebarEntry.c" +#line 427 "TrashSidebarEntry.c" } -LibraryTrashSidebarEntry* library_trash_sidebar_entry_construct (GType object_type) { +LibraryTrashSidebarEntry* +library_trash_sidebar_entry_construct (GType object_type) +{ LibraryTrashSidebarEntry * self = NULL; #line 9 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" self = (LibraryTrashSidebarEntry*) sidebar_simple_page_entry_construct (object_type); -#line 400 "TrashSidebarEntry.c" +#line 437 "TrashSidebarEntry.c" { GeeIterator* _media_sources_it = NULL; MediaCollectionRegistry* _tmp0_; @@ -425,63 +462,68 @@ LibraryTrashSidebarEntry* library_trash_sidebar_entry_construct (GType object_ty _media_sources_it = _tmp5_; #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" while (TRUE) { -#line 429 "TrashSidebarEntry.c" +#line 466 "TrashSidebarEntry.c" GeeIterator* _tmp6_; - gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - MediaSourceCollection* _tmp10_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + MediaSourceCollection* _tmp9_; #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" break; -#line 444 "TrashSidebarEntry.c" +#line 478 "TrashSidebarEntry.c" } #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - _tmp8_ = _media_sources_it; + _tmp7_ = _media_sources_it; #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - media_sources = (MediaSourceCollection*) _tmp9_; + media_sources = (MediaSourceCollection*) _tmp8_; #line 11 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - _tmp10_ = media_sources; + _tmp9_ = media_sources; #line 11 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - g_signal_connect_object (_tmp10_, "trashcan-contents-altered", (GCallback) _library_trash_sidebar_entry_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0); + g_signal_connect_object (_tmp9_, "trashcan-contents-altered", (GCallback) _library_trash_sidebar_entry_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0); #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _data_collection_unref0 (media_sources); -#line 458 "TrashSidebarEntry.c" +#line 492 "TrashSidebarEntry.c" } #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _g_object_unref0 (_media_sources_it); -#line 462 "TrashSidebarEntry.c" +#line 496 "TrashSidebarEntry.c" } #line 9 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" return self; -#line 466 "TrashSidebarEntry.c" +#line 500 "TrashSidebarEntry.c" } -LibraryTrashSidebarEntry* library_trash_sidebar_entry_new (void) { +LibraryTrashSidebarEntry* +library_trash_sidebar_entry_new (void) +{ #line 9 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" return library_trash_sidebar_entry_construct (LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY); -#line 473 "TrashSidebarEntry.c" +#line 509 "TrashSidebarEntry.c" } -void library_trash_sidebar_entry_init (void) { +void +library_trash_sidebar_entry_init (void) +{ } -void library_trash_sidebar_entry_terminate (void) { +void +library_trash_sidebar_entry_terminate (void) +{ } -static gchar* library_trash_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +library_trash_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ LibraryTrashSidebarEntry * self; gchar* result = NULL; gchar* _tmp0_; @@ -493,11 +535,13 @@ static gchar* library_trash_sidebar_entry_real_get_sidebar_name (SidebarSimplePa result = _tmp0_; #line 26 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" return result; -#line 497 "TrashSidebarEntry.c" +#line 539 "TrashSidebarEntry.c" } -static gchar* library_trash_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { +static gchar* +library_trash_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) +{ LibraryTrashSidebarEntry * self; gchar* result = NULL; gchar* _tmp0_; @@ -509,13 +553,15 @@ static gchar* library_trash_sidebar_entry_real_get_sidebar_icon (SidebarSimplePa result = _tmp0_; #line 30 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" return result; -#line 513 "TrashSidebarEntry.c" +#line 557 "TrashSidebarEntry.c" } -static gchar* library_trash_sidebar_entry_get_current_icon (void) { +static gchar* +library_trash_sidebar_entry_get_current_icon (void) +{ gchar* result = NULL; - gchar* _tmp13_; + gchar* _tmp11_; { GeeIterator* _media_sources_it = NULL; MediaCollectionRegistry* _tmp0_; @@ -544,76 +590,72 @@ static gchar* library_trash_sidebar_entry_get_current_icon (void) { _media_sources_it = _tmp5_; #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" while (TRUE) { -#line 548 "TrashSidebarEntry.c" +#line 594 "TrashSidebarEntry.c" GeeIterator* _tmp6_; - gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - MediaSourceCollection* _tmp10_; - gint _tmp11_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + MediaSourceCollection* _tmp9_; #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" break; -#line 564 "TrashSidebarEntry.c" +#line 606 "TrashSidebarEntry.c" } #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - _tmp8_ = _media_sources_it; + _tmp7_ = _media_sources_it; #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - media_sources = (MediaSourceCollection*) _tmp9_; -#line 35 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - _tmp10_ = media_sources; + media_sources = (MediaSourceCollection*) _tmp8_; #line 35 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - _tmp11_ = media_source_collection_get_trashcan_count (_tmp10_); + _tmp9_ = media_sources; #line 35 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - if (_tmp11_ > 0) { -#line 578 "TrashSidebarEntry.c" - gchar* _tmp12_; + if (media_source_collection_get_trashcan_count (_tmp9_) > 0) { +#line 618 "TrashSidebarEntry.c" + gchar* _tmp10_; #line 36 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - _tmp12_ = g_strdup (RESOURCES_ICON_TRASH_FULL); + _tmp10_ = g_strdup (RESOURCES_ICON_TRASH_FULL); #line 36 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - result = _tmp12_; + result = _tmp10_; #line 36 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _data_collection_unref0 (media_sources); #line 36 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _g_object_unref0 (_media_sources_it); #line 36 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" return result; -#line 590 "TrashSidebarEntry.c" +#line 630 "TrashSidebarEntry.c" } #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _data_collection_unref0 (media_sources); -#line 594 "TrashSidebarEntry.c" +#line 634 "TrashSidebarEntry.c" } #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _g_object_unref0 (_media_sources_it); -#line 598 "TrashSidebarEntry.c" +#line 638 "TrashSidebarEntry.c" } #line 39 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - _tmp13_ = g_strdup (RESOURCES_ICON_TRASH_EMPTY); + _tmp11_ = g_strdup (RESOURCES_ICON_TRASH_EMPTY); #line 39 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - result = _tmp13_; + result = _tmp11_; #line 39 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" return result; -#line 606 "TrashSidebarEntry.c" +#line 646 "TrashSidebarEntry.c" } -static gboolean library_trash_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media) { +static gboolean +library_trash_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, + GeeList* media) +{ LibraryTrashSidebarEntry * self; gboolean result = FALSE; CommandManager* _tmp0_; CommandManager* _tmp1_; - GeeList* _tmp2_; + TrashUntrashPhotosCommand* _tmp2_; TrashUntrashPhotosCommand* _tmp3_; - TrashUntrashPhotosCommand* _tmp4_; #line 42 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry); #line 42 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" @@ -623,26 +665,27 @@ static gboolean library_trash_sidebar_entry_real_internal_drop_received (Sidebar #line 43 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _tmp1_ = _tmp0_; #line 43 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - _tmp2_ = media; + _tmp2_ = trash_untrash_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_COLLECTION, GeeCollection), TRUE); #line 43 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - _tmp3_ = trash_untrash_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), TRUE); + _tmp3_ = _tmp2_; #line 43 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - _tmp4_ = _tmp3_; + command_manager_execute (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_COMMAND, Command)); #line 43 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - command_manager_execute (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_COMMAND, Command)); -#line 43 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 43 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _command_manager_unref0 (_tmp1_); #line 45 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" result = TRUE; #line 45 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" return result; -#line 642 "TrashSidebarEntry.c" +#line 682 "TrashSidebarEntry.c" } -static gboolean library_trash_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data) { +static gboolean +library_trash_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, + GtkSelectionData* data) +{ LibraryTrashSidebarEntry * self; gboolean result = FALSE; #line 48 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" @@ -653,11 +696,13 @@ static gboolean library_trash_sidebar_entry_real_internal_drop_received_arbitrar result = FALSE; #line 49 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" return result; -#line 657 "TrashSidebarEntry.c" +#line 700 "TrashSidebarEntry.c" } -static Page* library_trash_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +library_trash_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) +{ LibraryTrashSidebarEntry * self; Page* result = NULL; TrashPage* _tmp0_; @@ -671,11 +716,13 @@ static Page* library_trash_sidebar_entry_real_create_page (SidebarSimplePageEntr result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page); #line 53 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" return result; -#line 675 "TrashSidebarEntry.c" +#line 720 "TrashSidebarEntry.c" } -static void library_trash_sidebar_entry_on_trashcan_contents_altered (LibraryTrashSidebarEntry* self) { +static void +library_trash_sidebar_entry_on_trashcan_contents_altered (LibraryTrashSidebarEntry* self) +{ gchar* _tmp0_; gchar* _tmp1_; #line 56 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" @@ -688,11 +735,13 @@ static void library_trash_sidebar_entry_on_trashcan_contents_altered (LibraryTra g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-icon-changed", _tmp1_); #line 57 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _g_free0 (_tmp1_); -#line 692 "TrashSidebarEntry.c" +#line 739 "TrashSidebarEntry.c" } -static void library_trash_sidebar_entry_class_init (LibraryTrashSidebarEntryClass * klass) { +static void +library_trash_sidebar_entry_class_init (LibraryTrashSidebarEntryClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" library_trash_sidebar_entry_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" @@ -703,30 +752,36 @@ static void library_trash_sidebar_entry_class_init (LibraryTrashSidebarEntryClas ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_trash_sidebar_entry_real_create_page; #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" G_OBJECT_CLASS (klass)->finalize = library_trash_sidebar_entry_finalize; -#line 707 "TrashSidebarEntry.c" +#line 756 "TrashSidebarEntry.c" } -static void library_trash_sidebar_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) { +static void +library_trash_sidebar_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) +{ #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" library_trash_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) library_trash_sidebar_entry_real_internal_drop_received; #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) library_trash_sidebar_entry_real_internal_drop_received_arbitrary; -#line 718 "TrashSidebarEntry.c" +#line 769 "TrashSidebarEntry.c" } -static void library_trash_sidebar_entry_instance_init (LibraryTrashSidebarEntry * self) { +static void +library_trash_sidebar_entry_instance_init (LibraryTrashSidebarEntry * self) +{ } -static void library_trash_sidebar_entry_finalize (GObject * obj) { +static void +library_trash_sidebar_entry_finalize (GObject * obj) +{ LibraryTrashSidebarEntry * self; #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry); -#line 730 "TrashSidebarEntry.c" +#line 785 "TrashSidebarEntry.c" { GeeIterator* _media_sources_it = NULL; MediaCollectionRegistry* _tmp0_; @@ -755,51 +810,50 @@ static void library_trash_sidebar_entry_finalize (GObject * obj) { _media_sources_it = _tmp5_; #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" while (TRUE) { -#line 759 "TrashSidebarEntry.c" +#line 814 "TrashSidebarEntry.c" GeeIterator* _tmp6_; - gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - MediaSourceCollection* _tmp10_; - guint _tmp11_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + MediaSourceCollection* _tmp9_; + guint _tmp10_; #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" break; -#line 775 "TrashSidebarEntry.c" +#line 827 "TrashSidebarEntry.c" } #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - _tmp8_ = _media_sources_it; + _tmp7_ = _media_sources_it; #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - media_sources = (MediaSourceCollection*) _tmp9_; + media_sources = (MediaSourceCollection*) _tmp8_; #line 16 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - _tmp10_ = media_sources; + _tmp9_ = media_sources; #line 16 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp11_, NULL, FALSE); + g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp10_, NULL, FALSE); #line 16 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_trash_sidebar_entry_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self); + g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_trash_sidebar_entry_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self); #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _data_collection_unref0 (media_sources); -#line 791 "TrashSidebarEntry.c" +#line 843 "TrashSidebarEntry.c" } #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _g_object_unref0 (_media_sources_it); -#line 795 "TrashSidebarEntry.c" +#line 847 "TrashSidebarEntry.c" } #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" G_OBJECT_CLASS (library_trash_sidebar_entry_parent_class)->finalize (obj); -#line 799 "TrashSidebarEntry.c" +#line 851 "TrashSidebarEntry.c" } -GType library_trash_sidebar_entry_get_type (void) { +GType +library_trash_sidebar_entry_get_type (void) +{ static volatile gsize library_trash_sidebar_entry_type_id__volatile = 0; if (g_once_init_enter (&library_trash_sidebar_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryTrashSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_trash_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryTrashSidebarEntry), 0, (GInstanceInitFunc) library_trash_sidebar_entry_instance_init, NULL }; diff --git a/src/main.c b/src/main.c index 5659731..2bdd384 100644 --- a/src/main.c +++ b/src/main.c @@ -1,4 +1,4 @@ -/* main.c generated by valac 0.36.6, the Vala compiler +/* main.c generated by valac 0.40.4, the Vala compiler * generated from main.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -454,16 +455,20 @@ gint commandline_options_entries_length1 = 0; static gint _commandline_options_entries_size_ = 0; GType shotwell_command_get_type (void) G_GNUC_CONST; -void library_exec (gchar** mounts, int mounts_length1); +void library_exec (gchar** mounts, + int mounts_length1); gboolean application_get_is_remote (void); void application_present_primary_instance (void); -void application_send_to_primary_instance (gchar** argv, int argv_length1); +void application_send_to_primary_instance (gchar** argv, + int argv_length1); void db_preconfigure (GFile* db_file); -GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname); +GFile* app_dirs_get_data_subdir (const gchar* name, + const gchar* subname); void library_app_init (GError** error); void app_window_panic (const gchar* msg); GType db_verify_result_get_type (void) G_GNUC_CONST; -DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version); +DbVerifyResult db_verify_database (gchar* * app_version, + gint* schema_version); #define RESOURCES_APP_VERSION _VERSION #define DATABASE_TABLE_SCHEMA_VERSION 20 #define RESOURCES_HOME_URL "https://wiki.gnome.org/Apps/Shotwell" @@ -475,16 +480,28 @@ void upgrades_init (void); GType progress_dialog_get_type (void) G_GNUC_CONST; gpointer aggregate_progress_monitor_ref (gpointer instance); void aggregate_progress_monitor_unref (gpointer instance); -GParamSpec* param_spec_aggregate_progress_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_aggregate_progress_monitor (GValue* value, gpointer v_object); -void value_take_aggregate_progress_monitor (GValue* value, gpointer v_object); +GParamSpec* param_spec_aggregate_progress_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_aggregate_progress_monitor (GValue* value, + gpointer v_object); +void value_take_aggregate_progress_monitor (GValue* value, + gpointer v_object); gpointer value_get_aggregate_progress_monitor (const GValue* value); GType aggregate_progress_monitor_get_type (void) G_GNUC_CONST; gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType photo_table_get_type (void) G_GNUC_CONST; @@ -498,71 +515,131 @@ GType video_table_get_type (void) G_GNUC_CONST; VideoTable* video_table_get_instance (void); gpointer upgrades_ref (gpointer instance); void upgrades_unref (gpointer instance); -GParamSpec* param_spec_upgrades (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_upgrades (GValue* value, gpointer v_object); -void value_take_upgrades (GValue* value, gpointer v_object); +GParamSpec* param_spec_upgrades (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_upgrades (GValue* value, + gpointer v_object); +void value_take_upgrades (GValue* value, + gpointer v_object); gpointer value_get_upgrades (const GValue* value); GType upgrades_get_type (void) G_GNUC_CONST; Upgrades* upgrades_get_instance (void); guint64 upgrades_get_step_count (Upgrades* self); -ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable); -ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable); -void progress_dialog_update_display_every (ProgressDialog* self, gint update_every); -void progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self, gint minimum_on_screen_time_msec); -gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop); -static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self); -AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target); -AggregateProgressMonitor* aggregate_progress_monitor_construct (GType object_type, guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target); -gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, guint64 count, guint64 total); -static gboolean _aggregate_progress_monitor_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self); +ProgressDialog* progress_dialog_new (GtkWindow* owner, + const gchar* text, + GCancellable* cancellable); +ProgressDialog* progress_dialog_construct (GType object_type, + GtkWindow* owner, + const gchar* text, + GCancellable* cancellable); +void progress_dialog_update_display_every (ProgressDialog* self, + gint update_every); +void progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self, + gint minimum_on_screen_time_msec); +gboolean progress_dialog_monitor (ProgressDialog* self, + guint64 count, + guint64 total, + gboolean do_event_loop); +static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, + guint64 total, + gboolean do_event_loop, + gpointer self); +AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target); +AggregateProgressMonitor* aggregate_progress_monitor_construct (GType object_type, + guint64 grand_total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target); +gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, + guint64 count, + guint64 total); +static gboolean _aggregate_progress_monitor_monitor_progress_monitor (guint64 current, + guint64 total, + gboolean do_event_loop, + gpointer self); void thumbnail_cache_init (void); void tombstone_init (void); void library_files_select_copy_function (void); -void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, const gchar* name); -void library_photo_init (ProgressMonitor monitor, void* monitor_target); -void video_init (ProgressMonitor monitor, void* monitor_target); -void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_target); +void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, + const gchar* name); +void library_photo_init (ProgressMonitor monitor, + void* monitor_target); +void video_init (ProgressMonitor monitor, + void* monitor_target); +void upgrades_execute (Upgrades* self, + ProgressMonitor monitor, + void* monitor_target); void library_monitor_pool_init (void); void media_collection_registry_init (void); gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; -void media_collection_registry_register_collection (MediaCollectionRegistry* self, MediaSourceCollection* collection); +void media_collection_registry_register_collection (MediaCollectionRegistry* self, + MediaSourceCollection* collection); GType library_photo_source_collection_get_type (void) G_GNUC_CONST; GType video_source_collection_get_type (void) G_GNUC_CONST; -void event_init (ProgressMonitor monitor, void* monitor_target); -void tag_init (ProgressMonitor monitor, void* monitor_target); +void event_init (ProgressMonitor monitor, + void* monitor_target); +void tag_init (ProgressMonitor monitor, + void* monitor_target); void metadata_writer_init (void); void desktop_integration_init (void); gpointer application_ref (gpointer instance); void application_unref (gpointer instance); -GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_application (GValue* value, gpointer v_object); -void value_take_application (GValue* value, gpointer v_object); +GParamSpec* param_spec_application (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_application (GValue* value, + gpointer v_object); +void value_take_application (GValue* value, + gpointer v_object); gpointer value_get_application (const GValue* value); GType application_get_type (void) G_GNUC_CONST; Application* application_get_instance (void); GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; GType library_window_get_type (void) G_GNUC_CONST; -LibraryWindow* library_window_new (ProgressMonitor progress_monitor, void* progress_monitor_target); -LibraryWindow* library_window_construct (GType object_type, ProgressMonitor progress_monitor, void* progress_monitor_target); -void library_window_mounted_camera_shell_notification (LibraryWindow* self, const gchar* uri, gboolean at_startup); +LibraryWindow* library_window_new (ProgressMonitor progress_monitor, + void* progress_monitor_target); +LibraryWindow* library_window_construct (GType object_type, + ProgressMonitor progress_monitor, + void* progress_monitor_target); +void library_window_mounted_camera_shell_notification (LibraryWindow* self, + const gchar* uri, + gboolean at_startup); GType welcome_service_entry_get_type (void) G_GNUC_CONST; GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; @@ -571,19 +648,32 @@ gboolean configuration_facade_get_show_welcome_dialog (ConfigurationFacade* self gint data_collection_get_count (DataCollection* self); GType welcome_dialog_get_type (void) G_GNUC_CONST; WelcomeDialog* welcome_dialog_new (GtkWindow* owner); -WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner); -void configuration_facade_set_show_welcome_dialog (ConfigurationFacade* self, gboolean show); -gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** selected_import_entries, int* selected_import_entries_length1, gboolean* do_system_pictures_import); +WelcomeDialog* welcome_dialog_construct (GType object_type, + GtkWindow* owner); +void configuration_facade_set_show_welcome_dialog (ConfigurationFacade* self, + gboolean show); +gboolean welcome_dialog_execute (WelcomeDialog* self, + WelcomeServiceEntry*** selected_import_entries, + int* selected_import_entries_length1, + gboolean* do_system_pictures_import); void welcome_service_entry_execute (WelcomeServiceEntry* self); gpointer import_manifest_ref (gpointer instance); void import_manifest_unref (gpointer instance); -GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_import_manifest (GValue* value, gpointer v_object); -void value_take_import_manifest (GValue* value, gpointer v_object); +GParamSpec* param_spec_import_manifest (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_import_manifest (GValue* value, + gpointer v_object); +void value_take_import_manifest (GValue* value, + gpointer v_object); gpointer value_get_import_manifest (const GValue* value); GType import_manifest_get_type (void) G_GNUC_CONST; void run_system_pictures_import (ImportManifest* external_exclusion_manifest); -void application_start (Application* self, gchar** argv, int argv_length1); +void application_start (Application* self, + gchar** argv, + int argv_length1); void desktop_integration_terminate (void); void metadata_writer_terminate (void); void tag_terminate (void); @@ -597,29 +687,68 @@ void video_terminate (void); void library_app_terminate (void); gpointer batch_import_job_ref (gpointer instance); void batch_import_job_unref (gpointer instance); -GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_job (GValue* value, gpointer v_object); -void value_take_batch_import_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_job (GValue* value, + gpointer v_object); +void value_take_batch_import_job (GValue* value, + gpointer v_object); gpointer value_get_batch_import_job (const GValue* value); GType batch_import_job_get_type (void) G_GNUC_CONST; GType file_import_job_get_type (void) G_GNUC_CONST; GFile* app_dirs_get_import_dir (void); -FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library, gboolean recurse); -FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library, gboolean recurse); +FileImportJob* file_import_job_new (GFile* file_or_dir, + gboolean copy_to_library, + gboolean recurse); +FileImportJob* file_import_job_construct (GType object_type, + GFile* file_or_dir, + gboolean copy_to_library, + gboolean recurse); AppWindow* app_window_get_instance (void); GType batch_import_get_type (void) G_GNUC_CONST; gpointer batch_import_roll_ref (gpointer instance); void batch_import_roll_unref (gpointer instance); -GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_roll (GValue* value, gpointer v_object); -void value_take_batch_import_roll (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_roll (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_roll (GValue* value, + gpointer v_object); +void value_take_batch_import_roll (GValue* value, + gpointer v_object); gpointer value_get_batch_import_roll (const GValue* value); GType batch_import_roll_get_type (void) G_GNUC_CONST; -void report_system_pictures_import (ImportManifest* manifest, BatchImportRoll* import_roll); -static void _report_system_pictures_import_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self); -BatchImport* batch_import_new (GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest); -BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest); -void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batch_import, gboolean allow_user_cancel); +void report_system_pictures_import (ImportManifest* manifest, + BatchImportRoll* import_roll); +static void _report_system_pictures_import_batch_import_import_reporter (ImportManifest* manifest, + BatchImportRoll* import_roll, + gpointer self); +BatchImport* batch_import_new (GeeIterable* jobs, + const gchar* name, + BatchImportImportReporter reporter, + void* reporter_target, + GeeArrayList* prefailed, + GeeArrayList* pre_already_imported, + GCancellable* cancellable, + BatchImportRoll* import_roll, + ImportManifest* skip_manifest); +BatchImport* batch_import_construct (GType object_type, + GeeIterable* jobs, + const gchar* name, + BatchImportImportReporter reporter, + void* reporter_target, + GeeArrayList* prefailed, + GeeArrayList* pre_already_imported, + GCancellable* cancellable, + BatchImportRoll* import_roll, + ImportManifest* skip_manifest); +void library_window_enqueue_batch_import (LibraryWindow* self, + BatchImport* batch_import, + gboolean allow_user_cancel); void library_window_switch_to_import_queue_page (LibraryWindow* self); GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; @@ -627,37 +756,75 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; gpointer batch_import_result_ref (gpointer instance); void batch_import_result_unref (gpointer instance); -GParamSpec* param_spec_batch_import_result (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_result (GValue* value, gpointer v_object); -void value_take_batch_import_result (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_result (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_result (GValue* value, + gpointer v_object); +void value_take_batch_import_result (GValue* value, + gpointer v_object); gpointer value_get_batch_import_result (const GValue* value); GType batch_import_result_get_type (void) G_GNUC_CONST; gpointer import_ui_question_params_ref (gpointer instance); void import_ui_question_params_unref (gpointer instance); -GParamSpec* import_ui_param_spec_question_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void import_ui_value_set_question_params (GValue* value, gpointer v_object); -void import_ui_value_take_question_params (GValue* value, gpointer v_object); +GParamSpec* import_ui_param_spec_question_params (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void import_ui_value_set_question_params (GValue* value, + gpointer v_object); +void import_ui_value_take_question_params (GValue* value, + gpointer v_object); gpointer import_ui_value_get_question_params (const GValue* value); GType import_ui_question_params_get_type (void) G_GNUC_CONST; -gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest_id, ImportUIQuestionParams* question); -void editing_exec (const gchar* filename, gboolean fullscreen); +gboolean import_ui_report_manifest (ImportManifest* manifest, + gboolean show_dest_id, + ImportUIQuestionParams* question); +void editing_exec (const gchar* filename, + gboolean fullscreen); void direct_preconfigure (GFile* initial_file); void direct_app_init (GError** error); GType direct_window_get_type (void) G_GNUC_CONST; DirectWindow* direct_window_new (GFile* file); -DirectWindow* direct_window_construct (GType object_type, GFile* file); -GAction* app_window_get_common_action (AppWindow* self, const gchar* name); +DirectWindow* direct_window_construct (GType object_type, + GFile* file); +GAction* app_window_get_common_action (AppWindow* self, + const gchar* name); void direct_app_terminate (void); GOptionEntry* commandline_options_get_options (int* result_length1); -static GOptionEntry* _vala_array_dup22 (GOptionEntry* self, int length); -static void _vala_array_add73 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value); -static void _vala_array_add74 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value); -static void _vala_array_add75 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value); -static void _vala_array_add76 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value); -static void _vala_array_add77 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value); -static void _vala_array_add78 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value); -static GOptionEntry* _vala_array_dup23 (GOptionEntry* self, int length); -void _vala_main (gchar** args, int args_length1); +static GOptionEntry* _vala_array_dup22 (GOptionEntry* self, + int length); +static void _vala_array_add73 (GOptionEntry* * array, + int* length, + int* size, + const GOptionEntry* value); +static void _vala_array_add74 (GOptionEntry* * array, + int* length, + int* size, + const GOptionEntry* value); +static void _vala_array_add75 (GOptionEntry* * array, + int* length, + int* size, + const GOptionEntry* value); +static void _vala_array_add76 (GOptionEntry* * array, + int* length, + int* size, + const GOptionEntry* value); +static void _vala_array_add77 (GOptionEntry* * array, + int* length, + int* size, + const GOptionEntry* value); +static void _vala_array_add78 (GOptionEntry* * array, + int* length, + int* size, + const GOptionEntry* value); +static GOptionEntry* _vala_array_dup23 (GOptionEntry* self, + int length); +void _vala_main (gchar** args, + int args_length1); void app_dirs_init (const gchar* arg0); GFile* app_dirs_get_install_dir (void); GFile* app_dirs_get_lib_dir (void); @@ -665,7 +832,10 @@ GFile* app_dirs_get_lib_dir (void); void app_dirs_terminate (void); #define RESOURCES_GIT_VERSION _GIT_VERSION gboolean library_window_is_mount_uri_supported (const gchar* uri); -static void _vala_array_add79 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add79 (gchar** * array, + int* length, + int* size, + gchar* value); gboolean is_string_empty (const gchar* s); #define DEBUG_LIBRARY_PREFIX "L" #define DEBUG_VIEWER_PREFIX "V" @@ -677,17 +847,26 @@ void app_dirs_set_data_dir (const gchar* user_data_dir); void app_dirs_try_migrate_data (void); void app_dirs_verify_data_dir (void); void app_dirs_verify_cache_dir (void); -void international_support_init (const gchar* package_name, gchar** args, int args_length1, const gchar* locale); +void international_support_init (const gchar* package_name, + gchar** args, + int args_length1, + const gchar* locale); #define INTERNATIONAL_SUPPORT_SYSTEM_LOCALE "" void resources_init (void); void resources_terminate (void); void application_terminate (void); void debug_terminate (void); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -GType shotwell_command_get_type (void) { +GType +shotwell_command_get_type (void) +{ static volatile gsize shotwell_command_type_id__volatile = 0; if (g_once_init_enter (&shotwell_command_type_id__volatile)) { static const GEnumValue values[] = {{SHOTWELL_COMMAND_MOUNTED_CAMERA, "SHOTWELL_COMMAND_MOUNTED_CAMERA", "mounted-camera"}, {0, NULL, NULL}}; @@ -699,147 +878,149 @@ GType shotwell_command_get_type (void) { } -static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) { +static gboolean +_progress_dialog_monitor_progress_monitor (guint64 current, + guint64 total, + gboolean do_event_loop, + gpointer self) +{ gboolean result; result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop); #line 113 "/home/jens/Source/shotwell/src/main.vala" return result; -#line 708 "main.c" +#line 892 "main.c" } -static gboolean _aggregate_progress_monitor_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) { +static gboolean +_aggregate_progress_monitor_monitor_progress_monitor (guint64 current, + guint64 total, + gboolean do_event_loop, + gpointer self) +{ gboolean result; result = aggregate_progress_monitor_monitor ((AggregateProgressMonitor*) self, current, total); #line 114 "/home/jens/Source/shotwell/src/main.vala" return result; -#line 717 "main.c" +#line 906 "main.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 186 "/home/jens/Source/shotwell/src/main.vala" return self ? g_object_ref (self) : NULL; -#line 724 "main.c" +#line 915 "main.c" } -void library_exec (gchar** mounts, int mounts_length1) { +void +library_exec (gchar** mounts, + int mounts_length1) +{ gboolean _tmp0_; - gboolean _tmp1_; + GFile* _tmp1_; + GFile* _tmp2_; GFile* _tmp3_; GFile* _tmp4_; - GFile* _tmp5_; - GFile* _tmp6_; gchar* errormsg = NULL; gchar* app_version = NULL; gint schema_version = 0; DbVerifyResult _result_ = 0; - gchar* _tmp9_ = NULL; - gint _tmp10_ = 0; - DbVerifyResult _tmp11_; - DbVerifyResult _tmp12_; - const gchar* _tmp29_; + gchar* _tmp7_ = NULL; + gint _tmp8_ = 0; + DbVerifyResult _tmp9_; + DbVerifyResult _tmp10_; + const gchar* _tmp27_; ProgressDialog* progress_dialog = NULL; AggregateProgressMonitor* aggregate_monitor = NULL; ProgressMonitor monitor = NULL; void* monitor_target; GDestroyNotify monitor_target_destroy_notify; - gboolean _tmp35_; - AggregateProgressMonitor* _tmp65_; - ProgressMonitor _tmp67_; - void* _tmp67__target; - AggregateProgressMonitor* _tmp68_; - ProgressMonitor _tmp70_; - void* _tmp70__target; - AggregateProgressMonitor* _tmp71_; - Upgrades* _tmp73_; - Upgrades* _tmp74_; + gboolean _tmp33_; + AggregateProgressMonitor* _tmp58_; + ProgressMonitor _tmp60_; + void* _tmp60__target; + AggregateProgressMonitor* _tmp61_; + ProgressMonitor _tmp63_; + void* _tmp63__target; + AggregateProgressMonitor* _tmp64_; + Upgrades* _tmp66_; + Upgrades* _tmp67_; MediaCollectionRegistry* registry = NULL; - MediaCollectionRegistry* _tmp75_; - MediaCollectionRegistry* _tmp76_; - LibraryPhotoSourceCollection* _tmp77_; - MediaCollectionRegistry* _tmp78_; - VideoSourceCollection* _tmp79_; - AggregateProgressMonitor* _tmp80_; - ProgressMonitor _tmp82_; - void* _tmp82__target; - AggregateProgressMonitor* _tmp83_; - ProgressMonitor _tmp85_; - void* _tmp85__target; - Application* _tmp86_; - Application* _tmp87_; - AggregateProgressMonitor* _tmp88_; + MediaCollectionRegistry* _tmp68_; + MediaCollectionRegistry* _tmp69_; + LibraryPhotoSourceCollection* _tmp70_; + MediaCollectionRegistry* _tmp71_; + VideoSourceCollection* _tmp72_; + AggregateProgressMonitor* _tmp73_; + ProgressMonitor _tmp75_; + void* _tmp75__target; + AggregateProgressMonitor* _tmp76_; + ProgressMonitor _tmp78_; + void* _tmp78__target; + Application* _tmp79_; + Application* _tmp80_; + AggregateProgressMonitor* _tmp81_; LibraryWindow* library_window = NULL; - ProgressMonitor _tmp90_; - void* _tmp90__target; - LibraryWindow* _tmp91_; - AggregateProgressMonitor* _tmp92_; - ProgressDialog* _tmp94_; - gchar** _tmp96_; - gint _tmp96__length1; - LibraryWindow* _tmp100_; + ProgressMonitor _tmp83_; + void* _tmp83__target; + LibraryWindow* _tmp84_; + AggregateProgressMonitor* _tmp85_; + ProgressDialog* _tmp87_; + LibraryWindow* _tmp92_; WelcomeServiceEntry** selected_import_entries = NULL; - WelcomeServiceEntry** _tmp101_; + WelcomeServiceEntry** _tmp93_; gint selected_import_entries_length1; gint _selected_import_entries_size_; - gboolean _tmp102_ = FALSE; - ConfigFacade* _tmp103_; - ConfigFacade* _tmp104_; - gboolean _tmp105_; - gboolean _tmp106_; - WelcomeServiceEntry** _tmp120_; - gint _tmp120__length1; - gboolean _tmp124_; - GTimer* _tmp125_; - gdouble _tmp126_; - Application* _tmp127_; - Application* _tmp128_; + gboolean _tmp94_ = FALSE; + ConfigFacade* _tmp95_; + ConfigFacade* _tmp96_; + gboolean _tmp97_; + WelcomeServiceEntry** _tmp110_; + gint _tmp110__length1; + gboolean _tmp114_; + GTimer* _tmp115_; + gdouble _tmp116_; + Application* _tmp117_; + Application* _tmp118_; GError * _inner_error_ = NULL; #line 16 "/home/jens/Source/shotwell/src/main.vala" - _tmp0_ = application_get_is_remote (); -#line 16 "/home/jens/Source/shotwell/src/main.vala" - was_already_running = _tmp0_; + was_already_running = application_get_is_remote (); #line 18 "/home/jens/Source/shotwell/src/main.vala" - _tmp1_ = was_already_running; + _tmp0_ = was_already_running; #line 18 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp1_) { -#line 808 "main.c" - gchar** _tmp2_; - gint _tmp2__length1; + if (_tmp0_) { #line 25 "/home/jens/Source/shotwell/src/main.vala" application_present_primary_instance (); #line 26 "/home/jens/Source/shotwell/src/main.vala" - _tmp2_ = mounts; -#line 26 "/home/jens/Source/shotwell/src/main.vala" - _tmp2__length1 = mounts_length1; -#line 26 "/home/jens/Source/shotwell/src/main.vala" - application_send_to_primary_instance (_tmp2_, _tmp2__length1); + application_send_to_primary_instance (mounts, mounts_length1); #line 27 "/home/jens/Source/shotwell/src/main.vala" return; -#line 821 "main.c" +#line 1002 "main.c" } #line 31 "/home/jens/Source/shotwell/src/main.vala" - _tmp3_ = app_dirs_get_data_subdir ("data", NULL); -#line 31 "/home/jens/Source/shotwell/src/main.vala" - _tmp4_ = _tmp3_; + _tmp1_ = app_dirs_get_data_subdir ("data", NULL); #line 31 "/home/jens/Source/shotwell/src/main.vala" - _tmp5_ = g_file_get_child (_tmp4_, "photo.db"); + _tmp2_ = _tmp1_; #line 31 "/home/jens/Source/shotwell/src/main.vala" - _tmp6_ = _tmp5_; + _tmp3_ = g_file_get_child (_tmp2_, "photo.db"); #line 31 "/home/jens/Source/shotwell/src/main.vala" - db_preconfigure (_tmp6_); + _tmp4_ = _tmp3_; #line 31 "/home/jens/Source/shotwell/src/main.vala" - _g_object_unref0 (_tmp6_); + db_preconfigure (_tmp4_); #line 31 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (_tmp4_); -#line 837 "main.c" +#line 31 "/home/jens/Source/shotwell/src/main.vala" + _g_object_unref0 (_tmp2_); +#line 1018 "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 843 "main.c" +#line 1024 "main.c" goto __catch233_g_error; } } @@ -847,23 +1028,23 @@ void library_exec (gchar** mounts, int mounts_length1) { __catch233_g_error: { GError* err = NULL; - GError* _tmp7_; - const gchar* _tmp8_; + GError* _tmp5_; + const gchar* _tmp6_; #line 34 "/home/jens/Source/shotwell/src/main.vala" err = _inner_error_; #line 34 "/home/jens/Source/shotwell/src/main.vala" _inner_error_ = NULL; #line 37 "/home/jens/Source/shotwell/src/main.vala" - _tmp7_ = err; + _tmp5_ = err; #line 37 "/home/jens/Source/shotwell/src/main.vala" - _tmp8_ = _tmp7_->message; + _tmp6_ = _tmp5_->message; #line 37 "/home/jens/Source/shotwell/src/main.vala" - app_window_panic (_tmp8_); + app_window_panic (_tmp6_); #line 39 "/home/jens/Source/shotwell/src/main.vala" _g_error_free0 (err); #line 39 "/home/jens/Source/shotwell/src/main.vala" return; -#line 867 "main.c" +#line 1048 "main.c" } __finally233: #line 34 "/home/jens/Source/shotwell/src/main.vala" @@ -874,171 +1055,171 @@ void library_exec (gchar** mounts, int mounts_length1) { g_clear_error (&_inner_error_); #line 34 "/home/jens/Source/shotwell/src/main.vala" return; -#line 878 "main.c" +#line 1059 "main.c" } #line 43 "/home/jens/Source/shotwell/src/main.vala" g_message ("main.vala:43: Verifying database…"); #line 44 "/home/jens/Source/shotwell/src/main.vala" errormsg = NULL; #line 47 "/home/jens/Source/shotwell/src/main.vala" - _tmp11_ = db_verify_database (&_tmp9_, &_tmp10_); + _tmp9_ = db_verify_database (&_tmp7_, &_tmp8_); #line 47 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (app_version); #line 47 "/home/jens/Source/shotwell/src/main.vala" - app_version = _tmp9_; + app_version = _tmp7_; #line 47 "/home/jens/Source/shotwell/src/main.vala" - schema_version = _tmp10_; + schema_version = _tmp8_; #line 47 "/home/jens/Source/shotwell/src/main.vala" - _result_ = _tmp11_; + _result_ = _tmp9_; #line 48 "/home/jens/Source/shotwell/src/main.vala" - _tmp12_ = _result_; + _tmp10_ = _result_; #line 48 "/home/jens/Source/shotwell/src/main.vala" - switch (_tmp12_) { + switch (_tmp10_) { #line 48 "/home/jens/Source/shotwell/src/main.vala" case DB_VERIFY_RESULT_OK: -#line 900 "main.c" +#line 1081 "main.c" { #line 51 "/home/jens/Source/shotwell/src/main.vala" break; -#line 904 "main.c" +#line 1085 "main.c" } #line 48 "/home/jens/Source/shotwell/src/main.vala" case DB_VERIFY_RESULT_FUTURE_VERSION: -#line 908 "main.c" +#line 1089 "main.c" { - const gchar* _tmp13_; - gint _tmp14_; - gchar* _tmp15_; + const gchar* _tmp11_; + gint _tmp12_; + gchar* _tmp13_; #line 54 "/home/jens/Source/shotwell/src/main.vala" - _tmp13_ = app_version; + _tmp11_ = app_version; #line 54 "/home/jens/Source/shotwell/src/main.vala" - _tmp14_ = schema_version; + _tmp12_ = schema_version; #line 54 "/home/jens/Source/shotwell/src/main.vala" - _tmp15_ = g_strdup_printf (_ ("Your photo library is not compatible with this version of Shotwell. It" \ + _tmp13_ = g_strdup_printf (_ ("Your photo library is not compatible with this version of Shotwell. It" \ " appears it was created by Shotwell %s (schema %d). This version is %s" \ -" (schema %d). Please use the latest version of Shotwell."), _tmp13_, _tmp14_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION); +" (schema %d). Please use the latest version of Shotwell."), _tmp11_, _tmp12_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION); #line 54 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (errormsg); #line 54 "/home/jens/Source/shotwell/src/main.vala" - errormsg = _tmp15_; + errormsg = _tmp13_; #line 56 "/home/jens/Source/shotwell/src/main.vala" break; -#line 925 "main.c" +#line 1106 "main.c" } #line 48 "/home/jens/Source/shotwell/src/main.vala" case DB_VERIFY_RESULT_UPGRADE_ERROR: -#line 929 "main.c" +#line 1110 "main.c" { - const gchar* _tmp16_; - gint _tmp17_; - gchar* _tmp18_; + const gchar* _tmp14_; + gint _tmp15_; + gchar* _tmp16_; #line 59 "/home/jens/Source/shotwell/src/main.vala" - _tmp16_ = app_version; + _tmp14_ = app_version; #line 59 "/home/jens/Source/shotwell/src/main.vala" - _tmp17_ = schema_version; + _tmp15_ = schema_version; #line 59 "/home/jens/Source/shotwell/src/main.vala" - _tmp18_ = g_strdup_printf (_ ("Shotwell was unable to upgrade your photo library from version %s (sch" \ + _tmp16_ = g_strdup_printf (_ ("Shotwell was unable to upgrade your photo library from version %s (sch" \ "ema %d) to %s (schema %d). For more information please check the Shotw" \ -"ell Wiki at %s"), _tmp16_, _tmp17_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION, RESOURCES_HOME_URL); +"ell Wiki at %s"), _tmp14_, _tmp15_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION, RESOURCES_HOME_URL); #line 59 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (errormsg); #line 59 "/home/jens/Source/shotwell/src/main.vala" - errormsg = _tmp18_; + errormsg = _tmp16_; #line 62 "/home/jens/Source/shotwell/src/main.vala" break; -#line 946 "main.c" +#line 1127 "main.c" } #line 48 "/home/jens/Source/shotwell/src/main.vala" case DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE: -#line 950 "main.c" +#line 1131 "main.c" { - const gchar* _tmp19_; - gint _tmp20_; - GFile* _tmp21_; - GFile* _tmp22_; + const gchar* _tmp17_; + gint _tmp18_; + GFile* _tmp19_; + GFile* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; gchar* _tmp23_; - gchar* _tmp24_; - gchar* _tmp25_; #line 65 "/home/jens/Source/shotwell/src/main.vala" - _tmp19_ = app_version; + _tmp17_ = app_version; #line 65 "/home/jens/Source/shotwell/src/main.vala" - _tmp20_ = schema_version; + _tmp18_ = schema_version; #line 65 "/home/jens/Source/shotwell/src/main.vala" - _tmp21_ = app_dirs_get_data_dir (); + _tmp19_ = app_dirs_get_data_dir (); #line 65 "/home/jens/Source/shotwell/src/main.vala" - _tmp22_ = _tmp21_; + _tmp20_ = _tmp19_; #line 65 "/home/jens/Source/shotwell/src/main.vala" - _tmp23_ = g_file_get_path (_tmp22_); + _tmp21_ = g_file_get_path (_tmp20_); #line 65 "/home/jens/Source/shotwell/src/main.vala" - _tmp24_ = _tmp23_; + _tmp22_ = _tmp21_; #line 65 "/home/jens/Source/shotwell/src/main.vala" - _tmp25_ = g_strdup_printf (_ ("Your photo library is not compatible with this version of Shotwell. It" \ + _tmp23_ = g_strdup_printf (_ ("Your photo library is not compatible with this version of Shotwell. It" \ " appears it was created by Shotwell %s (schema %d). This version is %s" \ " (schema %d). Please clear your library by deleting %s and re-import y" \ -"our photos."), _tmp19_, _tmp20_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION, _tmp24_); +"our photos."), _tmp17_, _tmp18_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION, _tmp22_); #line 65 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (errormsg); #line 65 "/home/jens/Source/shotwell/src/main.vala" - errormsg = _tmp25_; + errormsg = _tmp23_; #line 65 "/home/jens/Source/shotwell/src/main.vala" - _g_free0 (_tmp24_); + _g_free0 (_tmp22_); #line 65 "/home/jens/Source/shotwell/src/main.vala" - _g_object_unref0 (_tmp22_); + _g_object_unref0 (_tmp20_); #line 68 "/home/jens/Source/shotwell/src/main.vala" break; -#line 983 "main.c" +#line 1164 "main.c" } default: { - DbVerifyResult _tmp26_; - GEnumValue* _tmp27_; - gchar* _tmp28_; + DbVerifyResult _tmp24_; + GEnumValue* _tmp25_; + gchar* _tmp26_; #line 71 "/home/jens/Source/shotwell/src/main.vala" - _tmp26_ = _result_; + _tmp24_ = _result_; #line 72 "/home/jens/Source/shotwell/src/main.vala" - _tmp27_ = g_enum_get_value (g_type_class_ref (DB_TYPE_VERIFY_RESULT), _tmp26_); + _tmp25_ = g_enum_get_value (g_type_class_ref (DB_TYPE_VERIFY_RESULT), _tmp24_); #line 71 "/home/jens/Source/shotwell/src/main.vala" - _tmp28_ = g_strdup_printf (_ ("Unknown error attempting to verify Shotwell’s database: %s"), (_tmp27_ != NULL) ? _tmp27_->value_name : NULL); + _tmp26_ = g_strdup_printf (_ ("Unknown error attempting to verify Shotwell’s database: %s"), (_tmp25_ != NULL) ? _tmp25_->value_name : NULL); #line 71 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (errormsg); #line 71 "/home/jens/Source/shotwell/src/main.vala" - errormsg = _tmp28_; + errormsg = _tmp26_; #line 73 "/home/jens/Source/shotwell/src/main.vala" break; -#line 1002 "main.c" +#line 1183 "main.c" } } #line 76 "/home/jens/Source/shotwell/src/main.vala" - _tmp29_ = errormsg; + _tmp27_ = errormsg; #line 76 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp29_ != NULL) { -#line 1009 "main.c" + if (_tmp27_ != NULL) { +#line 1190 "main.c" GtkMessageDialog* dialog = NULL; - const gchar* _tmp30_; + const gchar* _tmp28_; + GtkMessageDialog* _tmp29_; + GtkMessageDialog* _tmp30_; GtkMessageDialog* _tmp31_; GtkMessageDialog* _tmp32_; - GtkMessageDialog* _tmp33_; - GtkMessageDialog* _tmp34_; #line 77 "/home/jens/Source/shotwell/src/main.vala" - _tmp30_ = errormsg; + _tmp28_ = errormsg; #line 77 "/home/jens/Source/shotwell/src/main.vala" - _tmp31_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp30_); + _tmp29_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp28_); #line 77 "/home/jens/Source/shotwell/src/main.vala" - g_object_ref_sink (_tmp31_); + g_object_ref_sink (_tmp29_); #line 77 "/home/jens/Source/shotwell/src/main.vala" - dialog = _tmp31_; + dialog = _tmp29_; #line 79 "/home/jens/Source/shotwell/src/main.vala" - _tmp32_ = dialog; + _tmp30_ = dialog; #line 79 "/home/jens/Source/shotwell/src/main.vala" - gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE); + gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE); #line 80 "/home/jens/Source/shotwell/src/main.vala" - _tmp33_ = dialog; + _tmp31_ = dialog; #line 80 "/home/jens/Source/shotwell/src/main.vala" - gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_dialog_get_type (), GtkDialog)); + gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_dialog_get_type (), GtkDialog)); #line 81 "/home/jens/Source/shotwell/src/main.vala" - _tmp34_ = dialog; + _tmp32_ = dialog; #line 81 "/home/jens/Source/shotwell/src/main.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget)); #line 83 "/home/jens/Source/shotwell/src/main.vala" database_table_terminate (); #line 85 "/home/jens/Source/shotwell/src/main.vala" @@ -1049,7 +1230,7 @@ void library_exec (gchar** mounts, int mounts_length1) { _g_free0 (errormsg); #line 85 "/home/jens/Source/shotwell/src/main.vala" return; -#line 1046 "main.c" +#line 1227 "main.c" } #line 88 "/home/jens/Source/shotwell/src/main.vala" upgrades_init (); @@ -1064,142 +1245,127 @@ void library_exec (gchar** mounts, int mounts_length1) { #line 92 "/home/jens/Source/shotwell/src/main.vala" monitor_target_destroy_notify = NULL; #line 94 "/home/jens/Source/shotwell/src/main.vala" - _tmp35_ = commandline_options_no_startup_progress; + _tmp33_ = commandline_options_no_startup_progress; #line 94 "/home/jens/Source/shotwell/src/main.vala" - if (!_tmp35_) { -#line 1064 "main.c" + if (!_tmp33_) { +#line 1245 "main.c" guint64 grand_total = 0ULL; - PhotoTable* _tmp36_; - PhotoTable* _tmp37_; - gint _tmp38_; - EventTable* _tmp39_; - EventTable* _tmp40_; - gint _tmp41_; - TagTable* _tmp42_; - TagTable* _tmp43_; - gint _tmp44_; - VideoTable* _tmp45_; - VideoTable* _tmp46_; - gint _tmp47_; - Upgrades* _tmp48_; - Upgrades* _tmp49_; - guint64 _tmp50_; - guint64 _tmp51_; - guint64 _tmp52_; -#line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp36_ = photo_table_get_instance (); -#line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp37_ = _tmp36_; -#line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp38_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_DATABASE_TABLE, DatabaseTable)); -#line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp39_ = event_table_get_instance (); + PhotoTable* _tmp34_; + PhotoTable* _tmp35_; + EventTable* _tmp36_; + EventTable* _tmp37_; + TagTable* _tmp38_; + TagTable* _tmp39_; + VideoTable* _tmp40_; + VideoTable* _tmp41_; + Upgrades* _tmp42_; + Upgrades* _tmp43_; + guint64 _tmp44_; + guint64 _tmp45_; #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp40_ = _tmp39_; + _tmp34_ = photo_table_get_instance (); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp41_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATABASE_TABLE, DatabaseTable)); -#line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp42_ = tag_table_get_instance (); -#line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp43_ = _tmp42_; + _tmp35_ = _tmp34_; #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp44_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_DATABASE_TABLE, DatabaseTable)); + _tmp36_ = event_table_get_instance (); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp45_ = video_table_get_instance (); + _tmp37_ = _tmp36_; #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp46_ = _tmp45_; + _tmp38_ = tag_table_get_instance (); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp47_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_DATABASE_TABLE, DatabaseTable)); + _tmp39_ = _tmp38_; #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp48_ = upgrades_get_instance (); + _tmp40_ = video_table_get_instance (); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp49_ = _tmp48_; + _tmp41_ = _tmp40_; #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp50_ = upgrades_get_step_count (_tmp49_); + _tmp42_ = upgrades_get_instance (); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp51_ = (((_tmp38_ + _tmp41_) + _tmp44_) + _tmp47_) + _tmp50_; + _tmp43_ = _tmp42_; #line 98 "/home/jens/Source/shotwell/src/main.vala" - _upgrades_unref0 (_tmp49_); + _tmp44_ = (((database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_DATABASE_TABLE, DatabaseTable)) + database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_DATABASE_TABLE, DatabaseTable))) + database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_DATABASE_TABLE, DatabaseTable))) + database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_DATABASE_TABLE, DatabaseTable))) + upgrades_get_step_count (_tmp43_); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _database_table_unref0 (_tmp46_); + _upgrades_unref0 (_tmp43_); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _database_table_unref0 (_tmp43_); + _database_table_unref0 (_tmp41_); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _database_table_unref0 (_tmp40_); + _database_table_unref0 (_tmp39_); #line 98 "/home/jens/Source/shotwell/src/main.vala" _database_table_unref0 (_tmp37_); #line 98 "/home/jens/Source/shotwell/src/main.vala" - grand_total = _tmp51_; + _database_table_unref0 (_tmp35_); +#line 98 "/home/jens/Source/shotwell/src/main.vala" + grand_total = _tmp44_; #line 103 "/home/jens/Source/shotwell/src/main.vala" - _tmp52_ = grand_total; + _tmp45_ = grand_total; #line 103 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp52_ > ((guint64) 5000)) { -#line 1131 "main.c" - ProgressDialog* _tmp53_; - ProgressDialog* _tmp54_; + if (_tmp45_ > ((guint64) 5000)) { +#line 1297 "main.c" + ProgressDialog* _tmp46_; + ProgressDialog* _tmp47_; + ProgressDialog* _tmp48_; + guint64 _tmp54_; ProgressDialog* _tmp55_; - guint64 _tmp61_; - ProgressDialog* _tmp62_; - AggregateProgressMonitor* _tmp63_; - AggregateProgressMonitor* _tmp64_; + AggregateProgressMonitor* _tmp56_; + AggregateProgressMonitor* _tmp57_; #line 104 "/home/jens/Source/shotwell/src/main.vala" - _tmp53_ = progress_dialog_new (NULL, _ ("Loading Shotwell"), NULL); + _tmp46_ = progress_dialog_new (NULL, _ ("Loading Shotwell"), NULL); #line 104 "/home/jens/Source/shotwell/src/main.vala" - g_object_ref_sink (_tmp53_); + g_object_ref_sink (_tmp46_); #line 104 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (progress_dialog); #line 104 "/home/jens/Source/shotwell/src/main.vala" - progress_dialog = _tmp53_; + progress_dialog = _tmp46_; #line 105 "/home/jens/Source/shotwell/src/main.vala" - _tmp54_ = progress_dialog; + _tmp47_ = progress_dialog; #line 105 "/home/jens/Source/shotwell/src/main.vala" - progress_dialog_update_display_every (_tmp54_, 100); + progress_dialog_update_display_every (_tmp47_, 100); #line 106 "/home/jens/Source/shotwell/src/main.vala" - _tmp55_ = progress_dialog; + _tmp48_ = progress_dialog; #line 106 "/home/jens/Source/shotwell/src/main.vala" - progress_dialog_set_minimum_on_screen_time_msec (_tmp55_, 250); -#line 1155 "main.c" + progress_dialog_set_minimum_on_screen_time_msec (_tmp48_, 250); +#line 1321 "main.c" { - GdkPixbuf* _tmp56_ = NULL; - GdkPixbuf* _tmp57_; - ProgressDialog* _tmp58_; + GdkPixbuf* _tmp49_ = NULL; + GdkPixbuf* _tmp50_; + ProgressDialog* _tmp51_; #line 108 "/home/jens/Source/shotwell/src/main.vala" - _tmp57_ = gdk_pixbuf_new_from_resource ("/org/gnome/Shotwell/icons/shotwell.svg", &_inner_error_); + _tmp50_ = gdk_pixbuf_new_from_resource ("/org/gnome/Shotwell/icons/shotwell.svg", &_inner_error_); #line 108 "/home/jens/Source/shotwell/src/main.vala" - _tmp56_ = _tmp57_; + _tmp49_ = _tmp50_; #line 108 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1166 "main.c" +#line 1332 "main.c" goto __catch234_g_error; } #line 108 "/home/jens/Source/shotwell/src/main.vala" - _tmp58_ = progress_dialog; + _tmp51_ = progress_dialog; #line 108 "/home/jens/Source/shotwell/src/main.vala" - gtk_window_set_icon (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_window_get_type (), GtkWindow), _tmp56_); + gtk_window_set_icon (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_window_get_type (), GtkWindow), _tmp49_); #line 107 "/home/jens/Source/shotwell/src/main.vala" - _g_object_unref0 (_tmp56_); -#line 1175 "main.c" + _g_object_unref0 (_tmp49_); +#line 1341 "main.c" } goto __finally234; __catch234_g_error: { GError* err = NULL; - GError* _tmp59_; - const gchar* _tmp60_; + GError* _tmp52_; + const gchar* _tmp53_; #line 107 "/home/jens/Source/shotwell/src/main.vala" err = _inner_error_; #line 107 "/home/jens/Source/shotwell/src/main.vala" _inner_error_ = NULL; #line 110 "/home/jens/Source/shotwell/src/main.vala" - _tmp59_ = err; + _tmp52_ = err; #line 110 "/home/jens/Source/shotwell/src/main.vala" - _tmp60_ = _tmp59_->message; + _tmp53_ = _tmp52_->message; #line 110 "/home/jens/Source/shotwell/src/main.vala" g_debug ("main.vala:110: Warning - could not load application icon for loading w" \ -"indow: %s", _tmp60_); +"indow: %s", _tmp53_); #line 107 "/home/jens/Source/shotwell/src/main.vala" _g_error_free0 (err); -#line 1195 "main.c" +#line 1361 "main.c" } __finally234: #line 107 "/home/jens/Source/shotwell/src/main.vala" @@ -1226,20 +1392,20 @@ void library_exec (gchar** mounts, int mounts_length1) { g_clear_error (&_inner_error_); #line 107 "/home/jens/Source/shotwell/src/main.vala" return; -#line 1222 "main.c" +#line 1388 "main.c" } #line 113 "/home/jens/Source/shotwell/src/main.vala" - _tmp61_ = grand_total; + _tmp54_ = grand_total; #line 113 "/home/jens/Source/shotwell/src/main.vala" - _tmp62_ = progress_dialog; + _tmp55_ = progress_dialog; #line 113 "/home/jens/Source/shotwell/src/main.vala" - _tmp63_ = aggregate_progress_monitor_new (_tmp61_, _progress_dialog_monitor_progress_monitor, _tmp62_); + _tmp56_ = aggregate_progress_monitor_new (_tmp54_, _progress_dialog_monitor_progress_monitor, _tmp55_); #line 113 "/home/jens/Source/shotwell/src/main.vala" _aggregate_progress_monitor_unref0 (aggregate_monitor); #line 113 "/home/jens/Source/shotwell/src/main.vala" - aggregate_monitor = _tmp63_; + aggregate_monitor = _tmp56_; #line 114 "/home/jens/Source/shotwell/src/main.vala" - _tmp64_ = aggregate_monitor; + _tmp57_ = aggregate_monitor; #line 114 "/home/jens/Source/shotwell/src/main.vala" (monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL); #line 114 "/home/jens/Source/shotwell/src/main.vala" @@ -1251,10 +1417,10 @@ void library_exec (gchar** mounts, int mounts_length1) { #line 114 "/home/jens/Source/shotwell/src/main.vala" monitor = _aggregate_progress_monitor_monitor_progress_monitor; #line 114 "/home/jens/Source/shotwell/src/main.vala" - monitor_target = aggregate_progress_monitor_ref (_tmp64_); + monitor_target = aggregate_progress_monitor_ref (_tmp57_); #line 114 "/home/jens/Source/shotwell/src/main.vala" monitor_target_destroy_notify = aggregate_progress_monitor_unref; -#line 1250 "main.c" +#line 1416 "main.c" } } #line 118 "/home/jens/Source/shotwell/src/main.vala" @@ -1264,162 +1430,162 @@ void library_exec (gchar** mounts, int mounts_length1) { #line 121 "/home/jens/Source/shotwell/src/main.vala" library_files_select_copy_function (); #line 123 "/home/jens/Source/shotwell/src/main.vala" - _tmp65_ = aggregate_monitor; + _tmp58_ = aggregate_monitor; #line 123 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp65_ != NULL) { -#line 1263 "main.c" - AggregateProgressMonitor* _tmp66_; + if (_tmp58_ != NULL) { +#line 1429 "main.c" + AggregateProgressMonitor* _tmp59_; #line 124 "/home/jens/Source/shotwell/src/main.vala" - _tmp66_ = aggregate_monitor; + _tmp59_ = aggregate_monitor; #line 124 "/home/jens/Source/shotwell/src/main.vala" - aggregate_progress_monitor_next_step (_tmp66_, "LibraryPhoto.init"); -#line 1269 "main.c" + aggregate_progress_monitor_next_step (_tmp59_, "LibraryPhoto.init"); +#line 1435 "main.c" } #line 125 "/home/jens/Source/shotwell/src/main.vala" - _tmp67_ = monitor; + _tmp60_ = monitor; #line 125 "/home/jens/Source/shotwell/src/main.vala" - _tmp67__target = monitor_target; + _tmp60__target = monitor_target; #line 125 "/home/jens/Source/shotwell/src/main.vala" - library_photo_init (_tmp67_, _tmp67__target); + library_photo_init (_tmp60_, _tmp60__target); #line 126 "/home/jens/Source/shotwell/src/main.vala" - _tmp68_ = aggregate_monitor; + _tmp61_ = aggregate_monitor; #line 126 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp68_ != NULL) { -#line 1281 "main.c" - AggregateProgressMonitor* _tmp69_; + if (_tmp61_ != NULL) { +#line 1447 "main.c" + AggregateProgressMonitor* _tmp62_; #line 127 "/home/jens/Source/shotwell/src/main.vala" - _tmp69_ = aggregate_monitor; + _tmp62_ = aggregate_monitor; #line 127 "/home/jens/Source/shotwell/src/main.vala" - aggregate_progress_monitor_next_step (_tmp69_, "Video.init"); -#line 1287 "main.c" + aggregate_progress_monitor_next_step (_tmp62_, "Video.init"); +#line 1453 "main.c" } #line 128 "/home/jens/Source/shotwell/src/main.vala" - _tmp70_ = monitor; + _tmp63_ = monitor; #line 128 "/home/jens/Source/shotwell/src/main.vala" - _tmp70__target = monitor_target; + _tmp63__target = monitor_target; #line 128 "/home/jens/Source/shotwell/src/main.vala" - video_init (_tmp70_, _tmp70__target); + video_init (_tmp63_, _tmp63__target); #line 129 "/home/jens/Source/shotwell/src/main.vala" - _tmp71_ = aggregate_monitor; + _tmp64_ = aggregate_monitor; #line 129 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp71_ != NULL) { -#line 1299 "main.c" - AggregateProgressMonitor* _tmp72_; + if (_tmp64_ != NULL) { +#line 1465 "main.c" + AggregateProgressMonitor* _tmp65_; #line 130 "/home/jens/Source/shotwell/src/main.vala" - _tmp72_ = aggregate_monitor; + _tmp65_ = aggregate_monitor; #line 130 "/home/jens/Source/shotwell/src/main.vala" - aggregate_progress_monitor_next_step (_tmp72_, "Upgrades.execute"); -#line 1305 "main.c" + aggregate_progress_monitor_next_step (_tmp65_, "Upgrades.execute"); +#line 1471 "main.c" } #line 131 "/home/jens/Source/shotwell/src/main.vala" - _tmp73_ = upgrades_get_instance (); + _tmp66_ = upgrades_get_instance (); #line 131 "/home/jens/Source/shotwell/src/main.vala" - _tmp74_ = _tmp73_; + _tmp67_ = _tmp66_; #line 131 "/home/jens/Source/shotwell/src/main.vala" - upgrades_execute (_tmp74_, NULL, NULL); + upgrades_execute (_tmp67_, NULL, NULL); #line 131 "/home/jens/Source/shotwell/src/main.vala" - _upgrades_unref0 (_tmp74_); + _upgrades_unref0 (_tmp67_); #line 133 "/home/jens/Source/shotwell/src/main.vala" library_monitor_pool_init (); #line 134 "/home/jens/Source/shotwell/src/main.vala" media_collection_registry_init (); #line 135 "/home/jens/Source/shotwell/src/main.vala" - _tmp75_ = media_collection_registry_get_instance (); + _tmp68_ = media_collection_registry_get_instance (); #line 135 "/home/jens/Source/shotwell/src/main.vala" - registry = _tmp75_; + registry = _tmp68_; #line 136 "/home/jens/Source/shotwell/src/main.vala" - _tmp76_ = registry; + _tmp69_ = registry; #line 136 "/home/jens/Source/shotwell/src/main.vala" - _tmp77_ = library_photo_global; + _tmp70_ = library_photo_global; #line 136 "/home/jens/Source/shotwell/src/main.vala" - media_collection_registry_register_collection (_tmp76_, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + media_collection_registry_register_collection (_tmp69_, G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 137 "/home/jens/Source/shotwell/src/main.vala" - _tmp78_ = registry; + _tmp71_ = registry; #line 137 "/home/jens/Source/shotwell/src/main.vala" - _tmp79_ = video_global; + _tmp72_ = video_global; #line 137 "/home/jens/Source/shotwell/src/main.vala" - media_collection_registry_register_collection (_tmp78_, G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + media_collection_registry_register_collection (_tmp71_, G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 139 "/home/jens/Source/shotwell/src/main.vala" - _tmp80_ = aggregate_monitor; + _tmp73_ = aggregate_monitor; #line 139 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp80_ != NULL) { -#line 1339 "main.c" - AggregateProgressMonitor* _tmp81_; + if (_tmp73_ != NULL) { +#line 1505 "main.c" + AggregateProgressMonitor* _tmp74_; #line 140 "/home/jens/Source/shotwell/src/main.vala" - _tmp81_ = aggregate_monitor; + _tmp74_ = aggregate_monitor; #line 140 "/home/jens/Source/shotwell/src/main.vala" - aggregate_progress_monitor_next_step (_tmp81_, "Event.init"); -#line 1345 "main.c" + aggregate_progress_monitor_next_step (_tmp74_, "Event.init"); +#line 1511 "main.c" } #line 141 "/home/jens/Source/shotwell/src/main.vala" - _tmp82_ = monitor; + _tmp75_ = monitor; #line 141 "/home/jens/Source/shotwell/src/main.vala" - _tmp82__target = monitor_target; + _tmp75__target = monitor_target; #line 141 "/home/jens/Source/shotwell/src/main.vala" - event_init (_tmp82_, _tmp82__target); + event_init (_tmp75_, _tmp75__target); #line 142 "/home/jens/Source/shotwell/src/main.vala" - _tmp83_ = aggregate_monitor; + _tmp76_ = aggregate_monitor; #line 142 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp83_ != NULL) { -#line 1357 "main.c" - AggregateProgressMonitor* _tmp84_; + if (_tmp76_ != NULL) { +#line 1523 "main.c" + AggregateProgressMonitor* _tmp77_; #line 143 "/home/jens/Source/shotwell/src/main.vala" - _tmp84_ = aggregate_monitor; + _tmp77_ = aggregate_monitor; #line 143 "/home/jens/Source/shotwell/src/main.vala" - aggregate_progress_monitor_next_step (_tmp84_, "Tag.init"); -#line 1363 "main.c" + aggregate_progress_monitor_next_step (_tmp77_, "Tag.init"); +#line 1529 "main.c" } #line 144 "/home/jens/Source/shotwell/src/main.vala" - _tmp85_ = monitor; + _tmp78_ = monitor; #line 144 "/home/jens/Source/shotwell/src/main.vala" - _tmp85__target = monitor_target; + _tmp78__target = monitor_target; #line 144 "/home/jens/Source/shotwell/src/main.vala" - tag_init (_tmp85_, _tmp85__target); + tag_init (_tmp78_, _tmp78__target); #line 146 "/home/jens/Source/shotwell/src/main.vala" metadata_writer_init (); #line 147 "/home/jens/Source/shotwell/src/main.vala" desktop_integration_init (); #line 149 "/home/jens/Source/shotwell/src/main.vala" - _tmp86_ = application_get_instance (); + _tmp79_ = application_get_instance (); #line 149 "/home/jens/Source/shotwell/src/main.vala" - _tmp87_ = _tmp86_; + _tmp80_ = _tmp79_; #line 149 "/home/jens/Source/shotwell/src/main.vala" - g_signal_emit_by_name (_tmp87_, "init-done"); + g_signal_emit_by_name (_tmp80_, "init-done"); #line 149 "/home/jens/Source/shotwell/src/main.vala" - _application_unref0 (_tmp87_); + _application_unref0 (_tmp80_); #line 152 "/home/jens/Source/shotwell/src/main.vala" - _tmp88_ = aggregate_monitor; + _tmp81_ = aggregate_monitor; #line 152 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp88_ != NULL) { -#line 1387 "main.c" - AggregateProgressMonitor* _tmp89_; + if (_tmp81_ != NULL) { +#line 1553 "main.c" + AggregateProgressMonitor* _tmp82_; #line 153 "/home/jens/Source/shotwell/src/main.vala" - _tmp89_ = aggregate_monitor; + _tmp82_ = aggregate_monitor; #line 153 "/home/jens/Source/shotwell/src/main.vala" - aggregate_progress_monitor_next_step (_tmp89_, "LibraryWindow"); -#line 1393 "main.c" + aggregate_progress_monitor_next_step (_tmp82_, "LibraryWindow"); +#line 1559 "main.c" } #line 154 "/home/jens/Source/shotwell/src/main.vala" - _tmp90_ = monitor; + _tmp83_ = monitor; #line 154 "/home/jens/Source/shotwell/src/main.vala" - _tmp90__target = monitor_target; + _tmp83__target = monitor_target; #line 154 "/home/jens/Source/shotwell/src/main.vala" - _tmp91_ = library_window_new (_tmp90_, _tmp90__target); + _tmp84_ = library_window_new (_tmp83_, _tmp83__target); #line 154 "/home/jens/Source/shotwell/src/main.vala" - g_object_ref_sink (_tmp91_); + g_object_ref_sink (_tmp84_); #line 154 "/home/jens/Source/shotwell/src/main.vala" - library_window = _tmp91_; + library_window = _tmp84_; #line 156 "/home/jens/Source/shotwell/src/main.vala" - _tmp92_ = aggregate_monitor; + _tmp85_ = aggregate_monitor; #line 156 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp92_ != NULL) { -#line 1409 "main.c" - AggregateProgressMonitor* _tmp93_; + if (_tmp85_ != NULL) { +#line 1575 "main.c" + AggregateProgressMonitor* _tmp86_; #line 157 "/home/jens/Source/shotwell/src/main.vala" - _tmp93_ = aggregate_monitor; + _tmp86_ = aggregate_monitor; #line 157 "/home/jens/Source/shotwell/src/main.vala" - aggregate_progress_monitor_next_step (_tmp93_, "done"); -#line 1415 "main.c" + aggregate_progress_monitor_next_step (_tmp86_, "done"); +#line 1581 "main.c" } #line 162 "/home/jens/Source/shotwell/src/main.vala" (monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL); @@ -1440,228 +1606,219 @@ void library_exec (gchar** mounts, int mounts_length1) { #line 163 "/home/jens/Source/shotwell/src/main.vala" aggregate_monitor = NULL; #line 164 "/home/jens/Source/shotwell/src/main.vala" - _tmp94_ = progress_dialog; + _tmp87_ = progress_dialog; #line 164 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp94_ != NULL) { -#line 1439 "main.c" - ProgressDialog* _tmp95_; + if (_tmp87_ != NULL) { +#line 1605 "main.c" + ProgressDialog* _tmp88_; #line 165 "/home/jens/Source/shotwell/src/main.vala" - _tmp95_ = progress_dialog; + _tmp88_ = progress_dialog; #line 165 "/home/jens/Source/shotwell/src/main.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, gtk_widget_get_type (), GtkWidget)); -#line 1445 "main.c" + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, gtk_widget_get_type (), GtkWidget)); +#line 1611 "main.c" } #line 166 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (progress_dialog); #line 166 "/home/jens/Source/shotwell/src/main.vala" progress_dialog = NULL; -#line 169 "/home/jens/Source/shotwell/src/main.vala" - _tmp96_ = mounts; -#line 169 "/home/jens/Source/shotwell/src/main.vala" - _tmp96__length1 = mounts_length1; -#line 1455 "main.c" +#line 1617 "main.c" { gchar** mount_collection = NULL; gint mount_collection_length1 = 0; gint _mount_collection_size_ = 0; gint mount_it = 0; #line 169 "/home/jens/Source/shotwell/src/main.vala" - mount_collection = _tmp96_; + mount_collection = mounts; #line 169 "/home/jens/Source/shotwell/src/main.vala" - mount_collection_length1 = _tmp96__length1; + mount_collection_length1 = mounts_length1; #line 169 "/home/jens/Source/shotwell/src/main.vala" - for (mount_it = 0; mount_it < _tmp96__length1; mount_it = mount_it + 1) { -#line 1467 "main.c" - gchar* _tmp97_; + for (mount_it = 0; mount_it < mounts_length1; mount_it = mount_it + 1) { +#line 1629 "main.c" + gchar* _tmp89_; gchar* mount = NULL; #line 169 "/home/jens/Source/shotwell/src/main.vala" - _tmp97_ = g_strdup (mount_collection[mount_it]); + _tmp89_ = g_strdup (mount_collection[mount_it]); #line 169 "/home/jens/Source/shotwell/src/main.vala" - mount = _tmp97_; -#line 1474 "main.c" + mount = _tmp89_; +#line 1636 "main.c" { - LibraryWindow* _tmp98_; - const gchar* _tmp99_; + LibraryWindow* _tmp90_; + const gchar* _tmp91_; #line 170 "/home/jens/Source/shotwell/src/main.vala" - _tmp98_ = library_window; + _tmp90_ = library_window; #line 170 "/home/jens/Source/shotwell/src/main.vala" - _tmp99_ = mount; + _tmp91_ = mount; #line 170 "/home/jens/Source/shotwell/src/main.vala" - library_window_mounted_camera_shell_notification (_tmp98_, _tmp99_, TRUE); + library_window_mounted_camera_shell_notification (_tmp90_, _tmp91_, TRUE); #line 169 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (mount); -#line 1486 "main.c" +#line 1648 "main.c" } } } #line 172 "/home/jens/Source/shotwell/src/main.vala" - _tmp100_ = library_window; + _tmp92_ = library_window; #line 172 "/home/jens/Source/shotwell/src/main.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, gtk_widget_get_type (), GtkWidget)); #line 174 "/home/jens/Source/shotwell/src/main.vala" - _tmp101_ = g_new0 (WelcomeServiceEntry*, 0 + 1); + _tmp93_ = g_new0 (WelcomeServiceEntry*, 0 + 1); #line 174 "/home/jens/Source/shotwell/src/main.vala" - selected_import_entries = _tmp101_; + selected_import_entries = _tmp93_; #line 174 "/home/jens/Source/shotwell/src/main.vala" selected_import_entries_length1 = 0; #line 174 "/home/jens/Source/shotwell/src/main.vala" _selected_import_entries_size_ = selected_import_entries_length1; #line 175 "/home/jens/Source/shotwell/src/main.vala" - _tmp103_ = config_facade_get_instance (); + _tmp95_ = config_facade_get_instance (); #line 175 "/home/jens/Source/shotwell/src/main.vala" - _tmp104_ = _tmp103_; + _tmp96_ = _tmp95_; #line 175 "/home/jens/Source/shotwell/src/main.vala" - _tmp105_ = configuration_facade_get_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp97_ = configuration_facade_get_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 175 "/home/jens/Source/shotwell/src/main.vala" - _tmp106_ = _tmp105_; + _g_object_unref0 (_tmp96_); #line 175 "/home/jens/Source/shotwell/src/main.vala" - _g_object_unref0 (_tmp104_); -#line 175 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp106_) { -#line 1514 "main.c" - LibraryPhotoSourceCollection* _tmp107_; - gint _tmp108_; -#line 176 "/home/jens/Source/shotwell/src/main.vala" - _tmp107_ = library_photo_global; + if (_tmp97_) { +#line 1674 "main.c" + LibraryPhotoSourceCollection* _tmp98_; #line 176 "/home/jens/Source/shotwell/src/main.vala" - _tmp108_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp98_ = library_photo_global; #line 176 "/home/jens/Source/shotwell/src/main.vala" - _tmp102_ = _tmp108_ == 0; -#line 1523 "main.c" + _tmp94_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, TYPE_DATA_COLLECTION, DataCollection)) == 0; +#line 1680 "main.c" } else { #line 175 "/home/jens/Source/shotwell/src/main.vala" - _tmp102_ = FALSE; -#line 1527 "main.c" + _tmp94_ = FALSE; +#line 1684 "main.c" } #line 175 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp102_) { -#line 1531 "main.c" + if (_tmp94_) { +#line 1688 "main.c" WelcomeDialog* welcome = NULL; - LibraryWindow* _tmp109_; - WelcomeDialog* _tmp110_; - ConfigFacade* _tmp111_; - ConfigFacade* _tmp112_; - WelcomeDialog* _tmp113_; - WelcomeServiceEntry** _tmp114_ = NULL; - gint _tmp115_; - gboolean _tmp116_ = FALSE; - gboolean _tmp117_; + LibraryWindow* _tmp99_; + WelcomeDialog* _tmp100_; + ConfigFacade* _tmp101_; + ConfigFacade* _tmp102_; + WelcomeDialog* _tmp103_; + WelcomeServiceEntry** _tmp104_ = NULL; + gint _tmp105_; + gboolean _tmp106_ = FALSE; + gboolean _tmp107_; #line 177 "/home/jens/Source/shotwell/src/main.vala" - _tmp109_ = library_window; + _tmp99_ = library_window; #line 177 "/home/jens/Source/shotwell/src/main.vala" - _tmp110_ = welcome_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_window_get_type (), GtkWindow)); + _tmp100_ = welcome_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, gtk_window_get_type (), GtkWindow)); #line 177 "/home/jens/Source/shotwell/src/main.vala" - g_object_ref_sink (_tmp110_); + g_object_ref_sink (_tmp100_); #line 177 "/home/jens/Source/shotwell/src/main.vala" - welcome = _tmp110_; + welcome = _tmp100_; #line 178 "/home/jens/Source/shotwell/src/main.vala" - _tmp111_ = config_facade_get_instance (); + _tmp101_ = config_facade_get_instance (); #line 178 "/home/jens/Source/shotwell/src/main.vala" - _tmp112_ = _tmp111_; + _tmp102_ = _tmp101_; #line 178 "/home/jens/Source/shotwell/src/main.vala" - _tmp113_ = welcome; + _tmp103_ = welcome; #line 178 "/home/jens/Source/shotwell/src/main.vala" - _tmp117_ = welcome_dialog_execute (_tmp113_, &_tmp114_, &_tmp115_, &_tmp116_); + _tmp107_ = welcome_dialog_execute (_tmp103_, &_tmp104_, &_tmp105_, &_tmp106_); #line 178 "/home/jens/Source/shotwell/src/main.vala" selected_import_entries = (_vala_array_free (selected_import_entries, selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL); #line 178 "/home/jens/Source/shotwell/src/main.vala" - selected_import_entries = _tmp114_; + selected_import_entries = _tmp104_; #line 178 "/home/jens/Source/shotwell/src/main.vala" - selected_import_entries_length1 = _tmp115_; + selected_import_entries_length1 = _tmp105_; #line 178 "/home/jens/Source/shotwell/src/main.vala" _selected_import_entries_size_ = selected_import_entries_length1; #line 178 "/home/jens/Source/shotwell/src/main.vala" - do_system_pictures_import = _tmp116_; + do_system_pictures_import = _tmp106_; #line 178 "/home/jens/Source/shotwell/src/main.vala" - configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp117_); + configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp107_); #line 178 "/home/jens/Source/shotwell/src/main.vala" - _g_object_unref0 (_tmp112_); + _g_object_unref0 (_tmp102_); #line 175 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (welcome); -#line 1574 "main.c" +#line 1731 "main.c" } else { - ConfigFacade* _tmp118_; - ConfigFacade* _tmp119_; + ConfigFacade* _tmp108_; + ConfigFacade* _tmp109_; #line 181 "/home/jens/Source/shotwell/src/main.vala" - _tmp118_ = config_facade_get_instance (); + _tmp108_ = config_facade_get_instance (); #line 181 "/home/jens/Source/shotwell/src/main.vala" - _tmp119_ = _tmp118_; + _tmp109_ = _tmp108_; #line 181 "/home/jens/Source/shotwell/src/main.vala" - configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), FALSE); + configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), FALSE); #line 181 "/home/jens/Source/shotwell/src/main.vala" - _g_object_unref0 (_tmp119_); -#line 1586 "main.c" + _g_object_unref0 (_tmp109_); +#line 1743 "main.c" } #line 184 "/home/jens/Source/shotwell/src/main.vala" - _tmp120_ = selected_import_entries; + _tmp110_ = selected_import_entries; #line 184 "/home/jens/Source/shotwell/src/main.vala" - _tmp120__length1 = selected_import_entries_length1; + _tmp110__length1 = selected_import_entries_length1; #line 184 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp120__length1 > 0) { -#line 1594 "main.c" - WelcomeServiceEntry** _tmp121_; - gint _tmp121__length1; + if (_tmp110__length1 > 0) { +#line 1751 "main.c" + WelcomeServiceEntry** _tmp111_; + gint _tmp111__length1; #line 185 "/home/jens/Source/shotwell/src/main.vala" do_external_import = TRUE; #line 186 "/home/jens/Source/shotwell/src/main.vala" - _tmp121_ = selected_import_entries; + _tmp111_ = selected_import_entries; #line 186 "/home/jens/Source/shotwell/src/main.vala" - _tmp121__length1 = selected_import_entries_length1; -#line 1603 "main.c" + _tmp111__length1 = selected_import_entries_length1; +#line 1760 "main.c" { WelcomeServiceEntry** entry_collection = NULL; gint entry_collection_length1 = 0; gint _entry_collection_size_ = 0; gint entry_it = 0; #line 186 "/home/jens/Source/shotwell/src/main.vala" - entry_collection = _tmp121_; + entry_collection = _tmp111_; #line 186 "/home/jens/Source/shotwell/src/main.vala" - entry_collection_length1 = _tmp121__length1; + entry_collection_length1 = _tmp111__length1; #line 186 "/home/jens/Source/shotwell/src/main.vala" - for (entry_it = 0; entry_it < _tmp121__length1; entry_it = entry_it + 1) { -#line 1615 "main.c" - WelcomeServiceEntry* _tmp122_; + for (entry_it = 0; entry_it < _tmp111__length1; entry_it = entry_it + 1) { +#line 1772 "main.c" + WelcomeServiceEntry* _tmp112_; WelcomeServiceEntry* entry = NULL; #line 186 "/home/jens/Source/shotwell/src/main.vala" - _tmp122_ = _g_object_ref0 (entry_collection[entry_it]); + _tmp112_ = _g_object_ref0 (entry_collection[entry_it]); #line 186 "/home/jens/Source/shotwell/src/main.vala" - entry = _tmp122_; -#line 1622 "main.c" + entry = _tmp112_; +#line 1779 "main.c" { - WelcomeServiceEntry* _tmp123_; + WelcomeServiceEntry* _tmp113_; #line 187 "/home/jens/Source/shotwell/src/main.vala" - _tmp123_ = entry; + _tmp113_ = entry; #line 187 "/home/jens/Source/shotwell/src/main.vala" - welcome_service_entry_execute (_tmp123_); + welcome_service_entry_execute (_tmp113_); #line 186 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (entry); -#line 1631 "main.c" +#line 1788 "main.c" } } } } #line 189 "/home/jens/Source/shotwell/src/main.vala" - _tmp124_ = do_system_pictures_import; + _tmp114_ = do_system_pictures_import; #line 189 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp124_) { + if (_tmp114_) { #line 193 "/home/jens/Source/shotwell/src/main.vala" run_system_pictures_import (NULL); -#line 1642 "main.c" +#line 1799 "main.c" } #line 196 "/home/jens/Source/shotwell/src/main.vala" - _tmp125_ = startup_timer; + _tmp115_ = startup_timer; #line 196 "/home/jens/Source/shotwell/src/main.vala" - _tmp126_ = g_timer_elapsed (_tmp125_, NULL); + _tmp116_ = g_timer_elapsed (_tmp115_, NULL); #line 196 "/home/jens/Source/shotwell/src/main.vala" - g_debug ("main.vala:196: %lf seconds to Gtk.main()", _tmp126_); + g_debug ("main.vala:196: %lf seconds to Gtk.main()", _tmp116_); #line 198 "/home/jens/Source/shotwell/src/main.vala" - _tmp127_ = application_get_instance (); + _tmp117_ = application_get_instance (); #line 198 "/home/jens/Source/shotwell/src/main.vala" - _tmp128_ = _tmp127_; + _tmp118_ = _tmp117_; #line 198 "/home/jens/Source/shotwell/src/main.vala" - application_start (_tmp128_, NULL, 0); + application_start (_tmp118_, NULL, 0); #line 198 "/home/jens/Source/shotwell/src/main.vala" - _application_unref0 (_tmp128_); + _application_unref0 (_tmp118_); #line 200 "/home/jens/Source/shotwell/src/main.vala" desktop_integration_terminate (); #line 201 "/home/jens/Source/shotwell/src/main.vala" @@ -1706,18 +1863,24 @@ 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 1702 "main.c" +#line 1859 "main.c" } -static void _report_system_pictures_import_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { +static void +_report_system_pictures_import_batch_import_import_reporter (ImportManifest* manifest, + BatchImportRoll* import_roll, + gpointer self) +{ #line 225 "/home/jens/Source/shotwell/src/main.vala" report_system_pictures_import (manifest, import_roll); -#line 1709 "main.c" +#line 1870 "main.c" } -void run_system_pictures_import (ImportManifest* external_exclusion_manifest) { +void +run_system_pictures_import (ImportManifest* external_exclusion_manifest) +{ gboolean _tmp0_; GeeArrayList* jobs = NULL; GeeArrayList* _tmp1_; @@ -1730,11 +1893,10 @@ void run_system_pictures_import (ImportManifest* external_exclusion_manifest) { AppWindow* _tmp7_; BatchImport* batch_import = NULL; GeeArrayList* _tmp8_; - ImportManifest* _tmp9_; - BatchImport* _tmp10_; - LibraryWindow* _tmp11_; - BatchImport* _tmp12_; - LibraryWindow* _tmp13_; + BatchImport* _tmp9_; + LibraryWindow* _tmp10_; + BatchImport* _tmp11_; + LibraryWindow* _tmp12_; #line 216 "/home/jens/Source/shotwell/src/main.vala" g_return_if_fail ((external_exclusion_manifest == NULL) || IS_IMPORT_MANIFEST (external_exclusion_manifest)); #line 217 "/home/jens/Source/shotwell/src/main.vala" @@ -1743,7 +1905,7 @@ void run_system_pictures_import (ImportManifest* external_exclusion_manifest) { if (!_tmp0_) { #line 218 "/home/jens/Source/shotwell/src/main.vala" return; -#line 1739 "main.c" +#line 1901 "main.c" } #line 220 "/home/jens/Source/shotwell/src/main.vala" _tmp1_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); @@ -1772,35 +1934,35 @@ void run_system_pictures_import (ImportManifest* external_exclusion_manifest) { #line 225 "/home/jens/Source/shotwell/src/main.vala" _tmp8_ = jobs; #line 225 "/home/jens/Source/shotwell/src/main.vala" - _tmp9_ = external_exclusion_manifest; -#line 225 "/home/jens/Source/shotwell/src/main.vala" - _tmp10_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable), "startup_import", _report_system_pictures_import_batch_import_import_reporter, NULL, NULL, NULL, NULL, NULL, _tmp9_); + _tmp9_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable), "startup_import", _report_system_pictures_import_batch_import_import_reporter, NULL, NULL, NULL, NULL, NULL, external_exclusion_manifest); #line 225 "/home/jens/Source/shotwell/src/main.vala" - batch_import = _tmp10_; + batch_import = _tmp9_; #line 227 "/home/jens/Source/shotwell/src/main.vala" - _tmp11_ = library_window; + _tmp10_ = library_window; #line 227 "/home/jens/Source/shotwell/src/main.vala" - _tmp12_ = batch_import; + _tmp11_ = batch_import; #line 227 "/home/jens/Source/shotwell/src/main.vala" - library_window_enqueue_batch_import (_tmp11_, _tmp12_, TRUE); + library_window_enqueue_batch_import (_tmp10_, _tmp11_, TRUE); #line 229 "/home/jens/Source/shotwell/src/main.vala" - _tmp13_ = library_window; + _tmp12_ = library_window; #line 229 "/home/jens/Source/shotwell/src/main.vala" - library_window_switch_to_import_queue_page (_tmp13_); + library_window_switch_to_import_queue_page (_tmp12_); #line 216 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (batch_import); #line 216 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (library_window); #line 216 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (jobs); -#line 1789 "main.c" +#line 1949 "main.c" } -void report_system_pictures_import (ImportManifest* manifest, BatchImportRoll* import_roll) { +void +report_system_pictures_import (ImportManifest* manifest, + BatchImportRoll* import_roll) +{ gboolean _tmp0_ = FALSE; gboolean _tmp1_; - ImportManifest* _tmp6_; #line 232 "/home/jens/Source/shotwell/src/main.vala" g_return_if_fail (IS_IMPORT_MANIFEST (manifest)); #line 232 "/home/jens/Source/shotwell/src/main.vala" @@ -1809,77 +1971,71 @@ void report_system_pictures_import (ImportManifest* manifest, BatchImportRoll* i _tmp1_ = do_external_import; #line 239 "/home/jens/Source/shotwell/src/main.vala" if (_tmp1_) { -#line 1805 "main.c" - ImportManifest* _tmp2_; - GeeList* _tmp3_; +#line 1967 "main.c" + GeeList* _tmp2_; + gint _tmp3_; gint _tmp4_; - gint _tmp5_; -#line 239 "/home/jens/Source/shotwell/src/main.vala" - _tmp2_ = manifest; #line 239 "/home/jens/Source/shotwell/src/main.vala" - _tmp3_ = _tmp2_->all; + _tmp2_ = manifest->all; #line 239 "/home/jens/Source/shotwell/src/main.vala" - _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 239 "/home/jens/Source/shotwell/src/main.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 239 "/home/jens/Source/shotwell/src/main.vala" - _tmp0_ = _tmp5_ == 0; -#line 1820 "main.c" + _tmp0_ = _tmp4_ == 0; +#line 1979 "main.c" } else { #line 239 "/home/jens/Source/shotwell/src/main.vala" _tmp0_ = FALSE; -#line 1824 "main.c" +#line 1983 "main.c" } #line 239 "/home/jens/Source/shotwell/src/main.vala" if (_tmp0_) { #line 240 "/home/jens/Source/shotwell/src/main.vala" return; -#line 1830 "main.c" +#line 1989 "main.c" } #line 242 "/home/jens/Source/shotwell/src/main.vala" - _tmp6_ = manifest; -#line 242 "/home/jens/Source/shotwell/src/main.vala" - import_ui_report_manifest (_tmp6_, TRUE, NULL); -#line 1836 "main.c" + import_ui_report_manifest (manifest, TRUE, NULL); +#line 1993 "main.c" } -void editing_exec (const gchar* filename, gboolean fullscreen) { +void +editing_exec (const gchar* filename, + gboolean fullscreen) +{ GFile* initial_file = NULL; - const gchar* _tmp0_; + GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; DirectWindow* direct_window = NULL; - GFile* _tmp5_; + GFile* _tmp4_; + DirectWindow* _tmp5_; DirectWindow* _tmp6_; - DirectWindow* _tmp7_; - GTimer* _tmp8_; - gdouble _tmp9_; - gboolean _tmp10_; - Application* _tmp15_; - Application* _tmp16_; + GTimer* _tmp7_; + gdouble _tmp8_; + Application* _tmp13_; + Application* _tmp14_; GError * _inner_error_ = NULL; #line 245 "/home/jens/Source/shotwell/src/main.vala" g_return_if_fail (filename != NULL); #line 246 "/home/jens/Source/shotwell/src/main.vala" - _tmp0_ = filename; + _tmp0_ = g_file_new_for_commandline_arg (filename); #line 246 "/home/jens/Source/shotwell/src/main.vala" - _tmp1_ = g_file_new_for_commandline_arg (_tmp0_); -#line 246 "/home/jens/Source/shotwell/src/main.vala" - initial_file = _tmp1_; + initial_file = _tmp0_; #line 249 "/home/jens/Source/shotwell/src/main.vala" - _tmp2_ = initial_file; + _tmp1_ = initial_file; #line 249 "/home/jens/Source/shotwell/src/main.vala" - direct_preconfigure (_tmp2_); + direct_preconfigure (_tmp1_); #line 250 "/home/jens/Source/shotwell/src/main.vala" db_preconfigure (NULL); -#line 1869 "main.c" +#line 2025 "main.c" { #line 254 "/home/jens/Source/shotwell/src/main.vala" direct_app_init (&_inner_error_); #line 254 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1875 "main.c" +#line 2031 "main.c" goto __catch235_g_error; } } @@ -1887,25 +2043,25 @@ void editing_exec (const gchar* filename, gboolean fullscreen) { __catch235_g_error: { GError* err = NULL; - GError* _tmp3_; - const gchar* _tmp4_; + GError* _tmp2_; + const gchar* _tmp3_; #line 253 "/home/jens/Source/shotwell/src/main.vala" err = _inner_error_; #line 253 "/home/jens/Source/shotwell/src/main.vala" _inner_error_ = NULL; #line 256 "/home/jens/Source/shotwell/src/main.vala" - _tmp3_ = err; + _tmp2_ = err; #line 256 "/home/jens/Source/shotwell/src/main.vala" - _tmp4_ = _tmp3_->message; + _tmp3_ = _tmp2_->message; #line 256 "/home/jens/Source/shotwell/src/main.vala" - app_window_panic (_tmp4_); + app_window_panic (_tmp3_); #line 258 "/home/jens/Source/shotwell/src/main.vala" _g_error_free0 (err); #line 258 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (initial_file); #line 258 "/home/jens/Source/shotwell/src/main.vala" return; -#line 1901 "main.c" +#line 2057 "main.c" } __finally235: #line 253 "/home/jens/Source/shotwell/src/main.vala" @@ -1918,67 +2074,65 @@ void editing_exec (const gchar* filename, gboolean fullscreen) { g_clear_error (&_inner_error_); #line 253 "/home/jens/Source/shotwell/src/main.vala" return; -#line 1914 "main.c" +#line 2070 "main.c" } #line 262 "/home/jens/Source/shotwell/src/main.vala" desktop_integration_init (); #line 268 "/home/jens/Source/shotwell/src/main.vala" - _tmp5_ = initial_file; + _tmp4_ = initial_file; #line 268 "/home/jens/Source/shotwell/src/main.vala" - _tmp6_ = direct_window_new (_tmp5_); + _tmp5_ = direct_window_new (_tmp4_); #line 268 "/home/jens/Source/shotwell/src/main.vala" - g_object_ref_sink (_tmp6_); + g_object_ref_sink (_tmp5_); #line 268 "/home/jens/Source/shotwell/src/main.vala" - direct_window = _tmp6_; + direct_window = _tmp5_; #line 269 "/home/jens/Source/shotwell/src/main.vala" - _tmp7_ = direct_window; + _tmp6_ = direct_window; #line 269 "/home/jens/Source/shotwell/src/main.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); #line 271 "/home/jens/Source/shotwell/src/main.vala" - _tmp8_ = startup_timer; + _tmp7_ = startup_timer; #line 271 "/home/jens/Source/shotwell/src/main.vala" - _tmp9_ = g_timer_elapsed (_tmp8_, NULL); + _tmp8_ = g_timer_elapsed (_tmp7_, NULL); #line 271 "/home/jens/Source/shotwell/src/main.vala" - g_debug ("main.vala:271: %lf seconds to Gtk.main()", _tmp9_); + g_debug ("main.vala:271: %lf seconds to Gtk.main()", _tmp8_); #line 273 "/home/jens/Source/shotwell/src/main.vala" - _tmp10_ = fullscreen; -#line 273 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp10_) { -#line 1940 "main.c" + if (fullscreen) { +#line 2094 "main.c" GAction* action = NULL; - DirectWindow* _tmp11_; - GAction* _tmp12_; - GAction* _tmp13_; + DirectWindow* _tmp9_; + GAction* _tmp10_; + GAction* _tmp11_; #line 274 "/home/jens/Source/shotwell/src/main.vala" - _tmp11_ = direct_window; + _tmp9_ = direct_window; #line 274 "/home/jens/Source/shotwell/src/main.vala" - _tmp12_ = app_window_get_common_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_APP_WINDOW, AppWindow), "CommonFullscreen"); + _tmp10_ = app_window_get_common_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_APP_WINDOW, AppWindow), "CommonFullscreen"); #line 274 "/home/jens/Source/shotwell/src/main.vala" - action = _tmp12_; + action = _tmp10_; #line 275 "/home/jens/Source/shotwell/src/main.vala" - _tmp13_ = action; + _tmp11_ = action; #line 275 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp13_ != NULL) { -#line 1955 "main.c" - GAction* _tmp14_; + if (_tmp11_ != NULL) { +#line 2109 "main.c" + GAction* _tmp12_; #line 276 "/home/jens/Source/shotwell/src/main.vala" - _tmp14_ = action; + _tmp12_ = action; #line 276 "/home/jens/Source/shotwell/src/main.vala" - g_action_activate (_tmp14_, NULL); -#line 1961 "main.c" + g_action_activate (_tmp12_, NULL); +#line 2115 "main.c" } #line 273 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (action); -#line 1965 "main.c" +#line 2119 "main.c" } #line 280 "/home/jens/Source/shotwell/src/main.vala" - _tmp15_ = application_get_instance (); + _tmp13_ = application_get_instance (); #line 280 "/home/jens/Source/shotwell/src/main.vala" - _tmp16_ = _tmp15_; + _tmp14_ = _tmp13_; #line 280 "/home/jens/Source/shotwell/src/main.vala" - application_start (_tmp16_, NULL, 0); + application_start (_tmp14_, NULL, 0); #line 280 "/home/jens/Source/shotwell/src/main.vala" - _application_unref0 (_tmp16_); + _application_unref0 (_tmp14_); #line 282 "/home/jens/Source/shotwell/src/main.vala" desktop_integration_terminate (); #line 285 "/home/jens/Source/shotwell/src/main.vala" @@ -1987,115 +2141,153 @@ void editing_exec (const gchar* filename, gboolean fullscreen) { _g_object_unref0 (direct_window); #line 245 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (initial_file); -#line 1983 "main.c" +#line 2137 "main.c" } -static GOptionEntry* _vala_array_dup22 (GOptionEntry* self, int length) { +static GOptionEntry* +_vala_array_dup22 (GOptionEntry* self, + int length) +{ #line 300 "/home/jens/Source/shotwell/src/main.vala" return g_memdup (self, length * sizeof (GOptionEntry)); -#line 1990 "main.c" +#line 2147 "main.c" } -static void _vala_array_add73 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) { +static void +_vala_array_add73 (GOptionEntry* * array, + int* length, + int* size, + const GOptionEntry* value) +{ #line 304 "/home/jens/Source/shotwell/src/main.vala" if ((*length) == (*size)) { #line 304 "/home/jens/Source/shotwell/src/main.vala" *size = (*size) ? (2 * (*size)) : 4; #line 304 "/home/jens/Source/shotwell/src/main.vala" *array = g_renew (GOptionEntry, *array, *size); -#line 2001 "main.c" +#line 2163 "main.c" } #line 304 "/home/jens/Source/shotwell/src/main.vala" (*array)[(*length)++] = *value; -#line 2005 "main.c" +#line 2167 "main.c" } -static void _vala_array_add74 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) { +static void +_vala_array_add74 (GOptionEntry* * array, + int* length, + int* size, + const GOptionEntry* value) +{ #line 308 "/home/jens/Source/shotwell/src/main.vala" if ((*length) == (*size)) { #line 308 "/home/jens/Source/shotwell/src/main.vala" *size = (*size) ? (2 * (*size)) : 4; #line 308 "/home/jens/Source/shotwell/src/main.vala" *array = g_renew (GOptionEntry, *array, *size); -#line 2016 "main.c" +#line 2183 "main.c" } #line 308 "/home/jens/Source/shotwell/src/main.vala" (*array)[(*length)++] = *value; -#line 2020 "main.c" +#line 2187 "main.c" } -static void _vala_array_add75 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) { +static void +_vala_array_add75 (GOptionEntry* * array, + int* length, + int* size, + const GOptionEntry* value) +{ #line 312 "/home/jens/Source/shotwell/src/main.vala" if ((*length) == (*size)) { #line 312 "/home/jens/Source/shotwell/src/main.vala" *size = (*size) ? (2 * (*size)) : 4; #line 312 "/home/jens/Source/shotwell/src/main.vala" *array = g_renew (GOptionEntry, *array, *size); -#line 2031 "main.c" +#line 2203 "main.c" } #line 312 "/home/jens/Source/shotwell/src/main.vala" (*array)[(*length)++] = *value; -#line 2035 "main.c" +#line 2207 "main.c" } -static void _vala_array_add76 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) { +static void +_vala_array_add76 (GOptionEntry* * array, + int* length, + int* size, + const GOptionEntry* value) +{ #line 316 "/home/jens/Source/shotwell/src/main.vala" if ((*length) == (*size)) { #line 316 "/home/jens/Source/shotwell/src/main.vala" *size = (*size) ? (2 * (*size)) : 4; #line 316 "/home/jens/Source/shotwell/src/main.vala" *array = g_renew (GOptionEntry, *array, *size); -#line 2046 "main.c" +#line 2223 "main.c" } #line 316 "/home/jens/Source/shotwell/src/main.vala" (*array)[(*length)++] = *value; -#line 2050 "main.c" +#line 2227 "main.c" } -static void _vala_array_add77 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) { +static void +_vala_array_add77 (GOptionEntry* * array, + int* length, + int* size, + const GOptionEntry* value) +{ #line 320 "/home/jens/Source/shotwell/src/main.vala" if ((*length) == (*size)) { #line 320 "/home/jens/Source/shotwell/src/main.vala" *size = (*size) ? (2 * (*size)) : 4; #line 320 "/home/jens/Source/shotwell/src/main.vala" *array = g_renew (GOptionEntry, *array, *size); -#line 2061 "main.c" +#line 2243 "main.c" } #line 320 "/home/jens/Source/shotwell/src/main.vala" (*array)[(*length)++] = *value; -#line 2065 "main.c" +#line 2247 "main.c" } -static void _vala_array_add78 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) { +static void +_vala_array_add78 (GOptionEntry* * array, + int* length, + int* size, + const GOptionEntry* value) +{ #line 323 "/home/jens/Source/shotwell/src/main.vala" if ((*length) == (*size)) { #line 323 "/home/jens/Source/shotwell/src/main.vala" *size = (*size) ? (2 * (*size)) : 4; #line 323 "/home/jens/Source/shotwell/src/main.vala" *array = g_renew (GOptionEntry, *array, *size); -#line 2076 "main.c" +#line 2263 "main.c" } #line 323 "/home/jens/Source/shotwell/src/main.vala" (*array)[(*length)++] = *value; -#line 2080 "main.c" +#line 2267 "main.c" } -static GOptionEntry* _vala_array_dup23 (GOptionEntry* self, int length) { +static GOptionEntry* +_vala_array_dup23 (GOptionEntry* self, + int length) +{ #line 325 "/home/jens/Source/shotwell/src/main.vala" return g_memdup (self, length * sizeof (GOptionEntry)); -#line 2087 "main.c" +#line 2277 "main.c" } -GOptionEntry* commandline_options_get_options (int* result_length1) { +GOptionEntry* +commandline_options_get_options (int* result_length1) +{ GOptionEntry* result = NULL; GOptionEntry* _tmp0_; gint _tmp0__length1; @@ -2141,7 +2333,7 @@ GOptionEntry* commandline_options_get_options (int* result_length1) { _tmp0__length1 = commandline_options_entries_length1; #line 299 "/home/jens/Source/shotwell/src/main.vala" if (_tmp0_ != NULL) { -#line 2137 "main.c" +#line 2329 "main.c" GOptionEntry* _tmp1_; gint _tmp1__length1; GOptionEntry* _tmp2_; @@ -2164,13 +2356,13 @@ GOptionEntry* commandline_options_get_options (int* result_length1) { if (result_length1) { #line 300 "/home/jens/Source/shotwell/src/main.vala" *result_length1 = _tmp3__length1; -#line 2160 "main.c" +#line 2352 "main.c" } #line 300 "/home/jens/Source/shotwell/src/main.vala" result = _tmp3_; #line 300 "/home/jens/Source/shotwell/src/main.vala" return result; -#line 2166 "main.c" +#line 2358 "main.c" } #line 302 "/home/jens/Source/shotwell/src/main.vala" _tmp4_.long_name = "datadir"; @@ -2332,93 +2524,89 @@ GOptionEntry* commandline_options_get_options (int* result_length1) { if (result_length1) { #line 325 "/home/jens/Source/shotwell/src/main.vala" *result_length1 = _tmp24__length1; -#line 2328 "main.c" +#line 2520 "main.c" } #line 325 "/home/jens/Source/shotwell/src/main.vala" result = _tmp24_; #line 325 "/home/jens/Source/shotwell/src/main.vala" return result; -#line 2334 "main.c" +#line 2526 "main.c" } -static void _vala_array_add79 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add79 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 390 "/home/jens/Source/shotwell/src/main.vala" if ((*length) == (*size)) { #line 390 "/home/jens/Source/shotwell/src/main.vala" *size = (*size) ? (2 * (*size)) : 4; #line 390 "/home/jens/Source/shotwell/src/main.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 2345 "main.c" +#line 2542 "main.c" } #line 390 "/home/jens/Source/shotwell/src/main.vala" (*array)[(*length)++] = value; #line 390 "/home/jens/Source/shotwell/src/main.vala" (*array)[*length] = NULL; -#line 2351 "main.c" +#line 2548 "main.c" } -static gboolean string_contains (const gchar* self, const gchar* needle) { +static gboolean +string_contains (const gchar* self, + const gchar* needle) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gchar* _tmp1_; -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = needle; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_ != NULL; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = strstr ((gchar*) self, (gchar*) needle); +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_ != NULL; +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2371 "main.c" +#line 2568 "main.c" } -void _vala_main (gchar** args, int args_length1) { - gchar** _tmp0_; - gint _tmp0__length1; - const gchar* _tmp1_; +void +_vala_main (gchar** args, + int args_length1) +{ + const gchar* _tmp0_; + GFile* _tmp1_; GFile* _tmp2_; - GFile* _tmp3_; - gboolean _tmp4_; - gboolean _tmp20_; + gboolean _tmp3_; + gboolean _tmp18_; gchar** mounts = NULL; - gchar** _tmp21_; + gchar** _tmp19_; gint mounts_length1; gint _mounts_size_; gchar* filename = NULL; - const gchar* _tmp42_ = NULL; + const gchar* _tmp35_ = NULL; + const gchar* _tmp36_; + GDateTime* _tmp41_; + GDateTime* _tmp42_; const gchar* _tmp43_; - gboolean _tmp44_; - GDateTime* _tmp51_; - GDateTime* _tmp52_; - const gchar* _tmp53_; + const gchar* _tmp44_; + const gchar* _tmp45_; + GTimer* _tmp47_; + GTimer* _tmp48_; + const gchar* _tmp49_; + gboolean _tmp53_ = FALSE; const gchar* _tmp54_; - gboolean _tmp55_; - const gchar* _tmp56_; - gchar** _tmp58_; - gint _tmp58__length1; - GTimer* _tmp59_; - GTimer* _tmp60_; - const gchar* _tmp61_; - gboolean _tmp62_; - gboolean _tmp66_ = FALSE; - const gchar* _tmp67_; - gboolean _tmp68_; GError * _inner_error_ = NULL; #line 333 "/home/jens/Source/shotwell/src/main.vala" - _tmp0_ = args; -#line 333 "/home/jens/Source/shotwell/src/main.vala" - _tmp0__length1 = args_length1; -#line 333 "/home/jens/Source/shotwell/src/main.vala" - _tmp1_ = _tmp0_[0]; + _tmp0_ = args[0]; #line 333 "/home/jens/Source/shotwell/src/main.vala" - app_dirs_init (_tmp1_); + app_dirs_init (_tmp0_); #line 338 "/home/jens/Source/shotwell/src/main.vala" gexiv2_initialize (); #line 339 "/home/jens/Source/shotwell/src/main.vala" @@ -2426,62 +2614,62 @@ void _vala_main (gchar** args, int args_length1) { #line 343 "/home/jens/Source/shotwell/src/main.vala" gexiv2_log_set_level (GEXIV2_LOG_LEVEL_DEBUG); #line 349 "/home/jens/Source/shotwell/src/main.vala" - _tmp2_ = app_dirs_get_install_dir (); + _tmp1_ = app_dirs_get_install_dir (); #line 349 "/home/jens/Source/shotwell/src/main.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 349 "/home/jens/Source/shotwell/src/main.vala" - _tmp4_ = _tmp3_ == NULL; + _tmp3_ = _tmp2_ == NULL; #line 349 "/home/jens/Source/shotwell/src/main.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 349 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp4_) { -#line 2431 "main.c" + if (_tmp3_) { +#line 2619 "main.c" + GFile* _tmp4_; GFile* _tmp5_; - GFile* _tmp6_; + gchar* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; #line 350 "/home/jens/Source/shotwell/src/main.vala" - _tmp5_ = app_dirs_get_lib_dir (); + _tmp4_ = app_dirs_get_lib_dir (); #line 350 "/home/jens/Source/shotwell/src/main.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 350 "/home/jens/Source/shotwell/src/main.vala" - _tmp7_ = g_file_get_path (_tmp6_); + _tmp6_ = g_file_get_path (_tmp5_); #line 350 "/home/jens/Source/shotwell/src/main.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 350 "/home/jens/Source/shotwell/src/main.vala" - _tmp9_ = g_strconcat (_tmp8_, "/misc", NULL); + _tmp8_ = g_strconcat (_tmp7_, "/misc", NULL); #line 350 "/home/jens/Source/shotwell/src/main.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 350 "/home/jens/Source/shotwell/src/main.vala" - g_setenv ("GSETTINGS_SCHEMA_DIR", _tmp10_, TRUE); + g_setenv ("GSETTINGS_SCHEMA_DIR", _tmp9_, TRUE); #line 350 "/home/jens/Source/shotwell/src/main.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp9_); #line 350 "/home/jens/Source/shotwell/src/main.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp7_); #line 350 "/home/jens/Source/shotwell/src/main.vala" - _g_object_unref0 (_tmp6_); -#line 2458 "main.c" + _g_object_unref0 (_tmp5_); +#line 2646 "main.c" } { - gint _tmp11_; + gint _tmp10_; + GOptionEntry* _tmp11_; GOptionEntry* _tmp12_; - GOptionEntry* _tmp13_; - gint _tmp13__length1; + gint _tmp12__length1; #line 356 "/home/jens/Source/shotwell/src/main.vala" - _tmp12_ = commandline_options_get_options (&_tmp11_); + _tmp11_ = commandline_options_get_options (&_tmp10_); #line 356 "/home/jens/Source/shotwell/src/main.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 356 "/home/jens/Source/shotwell/src/main.vala" - _tmp13__length1 = _tmp11_; + _tmp12__length1 = _tmp10_; #line 356 "/home/jens/Source/shotwell/src/main.vala" - gtk_init_with_args (&args_length1, &args, _ ("[FILE]"), _tmp13_, RESOURCES_APP_GETTEXT_PACKAGE, &_inner_error_); + gtk_init_with_args (&args_length1, &args, _ ("[FILE]"), _tmp12_, RESOURCES_APP_GETTEXT_PACKAGE, &_inner_error_); #line 356 "/home/jens/Source/shotwell/src/main.vala" - _tmp13_ = (g_free (_tmp13_), NULL); + _tmp12_ = (g_free (_tmp12_), NULL); #line 356 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2477 "main.c" +#line 2665 "main.c" goto __catch236_g_error; } } @@ -2489,44 +2677,38 @@ void _vala_main (gchar** args, int args_length1) { __catch236_g_error: { GError* e = NULL; - GError* _tmp14_; - const gchar* _tmp15_; + GError* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_; gchar* _tmp16_; - gchar* _tmp17_; - gchar** _tmp18_; - gint _tmp18__length1; - const gchar* _tmp19_; + const gchar* _tmp17_; #line 355 "/home/jens/Source/shotwell/src/main.vala" e = _inner_error_; #line 355 "/home/jens/Source/shotwell/src/main.vala" _inner_error_ = NULL; #line 359 "/home/jens/Source/shotwell/src/main.vala" - _tmp14_ = e; + _tmp13_ = e; #line 359 "/home/jens/Source/shotwell/src/main.vala" - _tmp15_ = _tmp14_->message; + _tmp14_ = _tmp13_->message; #line 359 "/home/jens/Source/shotwell/src/main.vala" - _tmp16_ = g_strconcat (_tmp15_, "\n", NULL); + _tmp15_ = g_strconcat (_tmp14_, "\n", NULL); #line 359 "/home/jens/Source/shotwell/src/main.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 359 "/home/jens/Source/shotwell/src/main.vala" - g_print ("%s", _tmp17_); + g_print ("%s", _tmp16_); #line 359 "/home/jens/Source/shotwell/src/main.vala" - _g_free0 (_tmp17_); -#line 360 "/home/jens/Source/shotwell/src/main.vala" - _tmp18_ = args; + _g_free0 (_tmp16_); #line 360 "/home/jens/Source/shotwell/src/main.vala" - _tmp18__length1 = args_length1; + _tmp17_ = args[0]; #line 360 "/home/jens/Source/shotwell/src/main.vala" - _tmp19_ = _tmp18_[0]; -#line 360 "/home/jens/Source/shotwell/src/main.vala" - g_print (_ ("Run “%s --help” to see a full list of available command line options.\n"), _tmp19_); + g_print (_ ("Run “%s --help” to see a full list of available command line options.\n"), _tmp17_); #line 361 "/home/jens/Source/shotwell/src/main.vala" app_dirs_terminate (); #line 362 "/home/jens/Source/shotwell/src/main.vala" _g_error_free0 (e); #line 362 "/home/jens/Source/shotwell/src/main.vala" return; -#line 2522 "main.c" +#line 2704 "main.c" } __finally236: #line 355 "/home/jens/Source/shotwell/src/main.vala" @@ -2537,310 +2719,273 @@ void _vala_main (gchar** args, int args_length1) { g_clear_error (&_inner_error_); #line 355 "/home/jens/Source/shotwell/src/main.vala" return; -#line 2533 "main.c" +#line 2715 "main.c" } #line 365 "/home/jens/Source/shotwell/src/main.vala" - _tmp20_ = commandline_options_show_version; + _tmp18_ = commandline_options_show_version; #line 365 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp20_) { + if (_tmp18_) { #line 366 "/home/jens/Source/shotwell/src/main.vala" if (RESOURCES_GIT_VERSION != NULL) { #line 367 "/home/jens/Source/shotwell/src/main.vala" g_print ("%s %s (%s)\n", RESOURCES_APP_TITLE, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION); -#line 2543 "main.c" +#line 2725 "main.c" } else { #line 369 "/home/jens/Source/shotwell/src/main.vala" g_print ("%s %s\n", RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); -#line 2547 "main.c" +#line 2729 "main.c" } #line 371 "/home/jens/Source/shotwell/src/main.vala" app_dirs_terminate (); #line 373 "/home/jens/Source/shotwell/src/main.vala" return; -#line 2553 "main.c" +#line 2735 "main.c" } #line 383 "/home/jens/Source/shotwell/src/main.vala" - _tmp21_ = g_new0 (gchar*, 0 + 1); + _tmp19_ = g_new0 (gchar*, 0 + 1); #line 383 "/home/jens/Source/shotwell/src/main.vala" - mounts = _tmp21_; + mounts = _tmp19_; #line 383 "/home/jens/Source/shotwell/src/main.vala" mounts_length1 = 0; #line 383 "/home/jens/Source/shotwell/src/main.vala" _mounts_size_ = mounts_length1; #line 384 "/home/jens/Source/shotwell/src/main.vala" filename = NULL; -#line 2565 "main.c" +#line 2747 "main.c" { gint ctr = 0; #line 386 "/home/jens/Source/shotwell/src/main.vala" ctr = 1; -#line 2570 "main.c" +#line 2752 "main.c" { - gboolean _tmp22_ = FALSE; + gboolean _tmp20_ = FALSE; #line 386 "/home/jens/Source/shotwell/src/main.vala" - _tmp22_ = TRUE; + _tmp20_ = TRUE; #line 386 "/home/jens/Source/shotwell/src/main.vala" while (TRUE) { -#line 2577 "main.c" - gint _tmp24_; - gchar** _tmp25_; - gint _tmp25__length1; +#line 2759 "main.c" + gint _tmp22_; gchar* arg = NULL; - gchar** _tmp26_; - gint _tmp26__length1; - gint _tmp27_; - const gchar* _tmp28_; - gchar* _tmp29_; - const gchar* _tmp30_; - gboolean _tmp31_; + gint _tmp23_; + const gchar* _tmp24_; + gchar* _tmp25_; + const gchar* _tmp26_; #line 386 "/home/jens/Source/shotwell/src/main.vala" - if (!_tmp22_) { -#line 2591 "main.c" - gint _tmp23_; + if (!_tmp20_) { +#line 2768 "main.c" + gint _tmp21_; #line 386 "/home/jens/Source/shotwell/src/main.vala" - _tmp23_ = ctr; + _tmp21_ = ctr; #line 386 "/home/jens/Source/shotwell/src/main.vala" - ctr = _tmp23_ + 1; -#line 2597 "main.c" + ctr = _tmp21_ + 1; +#line 2774 "main.c" } #line 386 "/home/jens/Source/shotwell/src/main.vala" - _tmp22_ = FALSE; -#line 386 "/home/jens/Source/shotwell/src/main.vala" - _tmp24_ = ctr; -#line 386 "/home/jens/Source/shotwell/src/main.vala" - _tmp25_ = args; + _tmp20_ = FALSE; #line 386 "/home/jens/Source/shotwell/src/main.vala" - _tmp25__length1 = args_length1; + _tmp22_ = ctr; #line 386 "/home/jens/Source/shotwell/src/main.vala" - if (!(_tmp24_ < _tmp25__length1)) { + if (!(_tmp22_ < args_length1)) { #line 386 "/home/jens/Source/shotwell/src/main.vala" break; -#line 2611 "main.c" +#line 2784 "main.c" } #line 387 "/home/jens/Source/shotwell/src/main.vala" - _tmp26_ = args; + _tmp23_ = ctr; #line 387 "/home/jens/Source/shotwell/src/main.vala" - _tmp26__length1 = args_length1; + _tmp24_ = args[_tmp23_]; #line 387 "/home/jens/Source/shotwell/src/main.vala" - _tmp27_ = ctr; + _tmp25_ = g_strdup (_tmp24_); #line 387 "/home/jens/Source/shotwell/src/main.vala" - _tmp28_ = _tmp26_[_tmp27_]; -#line 387 "/home/jens/Source/shotwell/src/main.vala" - _tmp29_ = g_strdup (_tmp28_); -#line 387 "/home/jens/Source/shotwell/src/main.vala" - arg = _tmp29_; -#line 389 "/home/jens/Source/shotwell/src/main.vala" - _tmp30_ = arg; + arg = _tmp25_; #line 389 "/home/jens/Source/shotwell/src/main.vala" - _tmp31_ = library_window_is_mount_uri_supported (_tmp30_); + _tmp26_ = arg; #line 389 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp31_) { -#line 2631 "main.c" - gchar** _tmp32_; - gint _tmp32__length1; - const gchar* _tmp33_; - gchar* _tmp34_; + if (library_window_is_mount_uri_supported (_tmp26_)) { +#line 2798 "main.c" + gchar** _tmp27_; + gint _tmp27__length1; + const gchar* _tmp28_; + gchar* _tmp29_; #line 390 "/home/jens/Source/shotwell/src/main.vala" - _tmp32_ = mounts; + _tmp27_ = mounts; #line 390 "/home/jens/Source/shotwell/src/main.vala" - _tmp32__length1 = mounts_length1; + _tmp27__length1 = mounts_length1; #line 390 "/home/jens/Source/shotwell/src/main.vala" - _tmp33_ = arg; + _tmp28_ = arg; #line 390 "/home/jens/Source/shotwell/src/main.vala" - _tmp34_ = g_strdup (_tmp33_); + _tmp29_ = g_strdup (_tmp28_); #line 390 "/home/jens/Source/shotwell/src/main.vala" - _vala_array_add79 (&mounts, &mounts_length1, &_mounts_size_, _tmp34_); -#line 2646 "main.c" + _vala_array_add79 (&mounts, &mounts_length1, &_mounts_size_, _tmp29_); +#line 2813 "main.c" } else { - gboolean _tmp35_ = FALSE; - const gchar* _tmp36_; - gboolean _tmp37_; -#line 391 "/home/jens/Source/shotwell/src/main.vala" - _tmp36_ = filename; -#line 391 "/home/jens/Source/shotwell/src/main.vala" - _tmp37_ = is_string_empty (_tmp36_); + gboolean _tmp30_ = FALSE; + const gchar* _tmp31_; #line 391 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp37_) { -#line 2657 "main.c" - const gchar* _tmp38_; - gboolean _tmp39_; + _tmp31_ = filename; #line 391 "/home/jens/Source/shotwell/src/main.vala" - _tmp38_ = arg; + if (is_string_empty (_tmp31_)) { +#line 2821 "main.c" + const gchar* _tmp32_; #line 391 "/home/jens/Source/shotwell/src/main.vala" - _tmp39_ = string_contains (_tmp38_, "://"); + _tmp32_ = arg; #line 391 "/home/jens/Source/shotwell/src/main.vala" - _tmp35_ = !_tmp39_; -#line 2666 "main.c" + _tmp30_ = !string_contains (_tmp32_, "://"); +#line 2827 "main.c" } else { #line 391 "/home/jens/Source/shotwell/src/main.vala" - _tmp35_ = FALSE; -#line 2670 "main.c" + _tmp30_ = FALSE; +#line 2831 "main.c" } #line 391 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp35_) { -#line 2674 "main.c" - const gchar* _tmp40_; - gchar* _tmp41_; + if (_tmp30_) { +#line 2835 "main.c" + const gchar* _tmp33_; + gchar* _tmp34_; #line 392 "/home/jens/Source/shotwell/src/main.vala" - _tmp40_ = arg; + _tmp33_ = arg; #line 392 "/home/jens/Source/shotwell/src/main.vala" - _tmp41_ = g_strdup (_tmp40_); + _tmp34_ = g_strdup (_tmp33_); #line 392 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (filename); #line 392 "/home/jens/Source/shotwell/src/main.vala" - filename = _tmp41_; -#line 2685 "main.c" + filename = _tmp34_; +#line 2846 "main.c" } } #line 386 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (arg); -#line 2690 "main.c" +#line 2851 "main.c" } } } #line 396 "/home/jens/Source/shotwell/src/main.vala" - _tmp43_ = filename; + _tmp36_ = filename; #line 396 "/home/jens/Source/shotwell/src/main.vala" - _tmp44_ = is_string_empty (_tmp43_); + if (is_string_empty (_tmp36_)) { #line 396 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp44_) { -#line 396 "/home/jens/Source/shotwell/src/main.vala" - _tmp42_ = DEBUG_LIBRARY_PREFIX; -#line 2702 "main.c" + _tmp35_ = DEBUG_LIBRARY_PREFIX; +#line 2861 "main.c" } else { #line 396 "/home/jens/Source/shotwell/src/main.vala" - _tmp42_ = DEBUG_VIEWER_PREFIX; -#line 2706 "main.c" + _tmp35_ = DEBUG_VIEWER_PREFIX; +#line 2865 "main.c" } #line 396 "/home/jens/Source/shotwell/src/main.vala" - debug_init (_tmp42_); + debug_init (_tmp35_); #line 398 "/home/jens/Source/shotwell/src/main.vala" if (RESOURCES_GIT_VERSION != NULL) { -#line 2712 "main.c" - const gchar* _tmp45_ = NULL; - const gchar* _tmp46_; - gboolean _tmp47_; -#line 400 "/home/jens/Source/shotwell/src/main.vala" - _tmp46_ = filename; +#line 2871 "main.c" + const gchar* _tmp37_ = NULL; + const gchar* _tmp38_; #line 400 "/home/jens/Source/shotwell/src/main.vala" - _tmp47_ = is_string_empty (_tmp46_); + _tmp38_ = filename; #line 400 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp47_) { + if (is_string_empty (_tmp38_)) { #line 400 "/home/jens/Source/shotwell/src/main.vala" - _tmp45_ = RESOURCES_APP_LIBRARY_ROLE; -#line 2724 "main.c" + _tmp37_ = RESOURCES_APP_LIBRARY_ROLE; +#line 2880 "main.c" } else { #line 400 "/home/jens/Source/shotwell/src/main.vala" - _tmp45_ = RESOURCES_APP_DIRECT_ROLE; -#line 2728 "main.c" + _tmp37_ = RESOURCES_APP_DIRECT_ROLE; +#line 2884 "main.c" } #line 399 "/home/jens/Source/shotwell/src/main.vala" - g_message ("main.vala:399: Shotwell %s %s (%s)", _tmp45_, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION); -#line 2732 "main.c" + g_message ("main.vala:399: Shotwell %s %s (%s)", _tmp37_, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION); +#line 2888 "main.c" } else { - const gchar* _tmp48_ = NULL; - const gchar* _tmp49_; - gboolean _tmp50_; + const gchar* _tmp39_ = NULL; + const gchar* _tmp40_; #line 404 "/home/jens/Source/shotwell/src/main.vala" - _tmp49_ = filename; + _tmp40_ = filename; #line 404 "/home/jens/Source/shotwell/src/main.vala" - _tmp50_ = is_string_empty (_tmp49_); + if (is_string_empty (_tmp40_)) { #line 404 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp50_) { -#line 404 "/home/jens/Source/shotwell/src/main.vala" - _tmp48_ = RESOURCES_APP_LIBRARY_ROLE; -#line 2745 "main.c" + _tmp39_ = RESOURCES_APP_LIBRARY_ROLE; +#line 2898 "main.c" } else { #line 404 "/home/jens/Source/shotwell/src/main.vala" - _tmp48_ = RESOURCES_APP_DIRECT_ROLE; -#line 2749 "main.c" + _tmp39_ = RESOURCES_APP_DIRECT_ROLE; +#line 2902 "main.c" } #line 403 "/home/jens/Source/shotwell/src/main.vala" - g_message ("main.vala:403: Shotwell %s %s", _tmp48_, RESOURCES_APP_VERSION); -#line 2753 "main.c" + g_message ("main.vala:403: Shotwell %s %s", _tmp39_, RESOURCES_APP_VERSION); +#line 2906 "main.c" } #line 407 "/home/jens/Source/shotwell/src/main.vala" - _tmp51_ = g_date_time_new_now_local (); + _tmp41_ = g_date_time_new_now_local (); #line 407 "/home/jens/Source/shotwell/src/main.vala" - _tmp52_ = _tmp51_; + _tmp42_ = _tmp41_; #line 407 "/home/jens/Source/shotwell/src/main.vala" - _tmp53_ = g_date_time_get_timezone_abbreviation (_tmp52_); + _tmp43_ = g_date_time_get_timezone_abbreviation (_tmp42_); #line 407 "/home/jens/Source/shotwell/src/main.vala" - g_debug ("main.vala:407: Shotwell is running in timezone %s", _tmp53_); + g_debug ("main.vala:407: Shotwell is running in timezone %s", _tmp43_); #line 407 "/home/jens/Source/shotwell/src/main.vala" - _g_date_time_unref0 (_tmp52_); -#line 412 "/home/jens/Source/shotwell/src/main.vala" - _tmp54_ = filename; + _g_date_time_unref0 (_tmp42_); #line 412 "/home/jens/Source/shotwell/src/main.vala" - _tmp55_ = is_string_empty (_tmp54_); + _tmp44_ = filename; #line 412 "/home/jens/Source/shotwell/src/main.vala" - application_init (!_tmp55_); + application_init (!is_string_empty (_tmp44_)); #line 415 "/home/jens/Source/shotwell/src/main.vala" - _tmp56_ = commandline_options_data_dir; + _tmp45_ = commandline_options_data_dir; #line 415 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp56_ != NULL) { -#line 2775 "main.c" - const gchar* _tmp57_; + if (_tmp45_ != NULL) { +#line 2926 "main.c" + const gchar* _tmp46_; #line 416 "/home/jens/Source/shotwell/src/main.vala" - _tmp57_ = commandline_options_data_dir; + _tmp46_ = commandline_options_data_dir; #line 416 "/home/jens/Source/shotwell/src/main.vala" - app_dirs_set_data_dir (_tmp57_); -#line 2781 "main.c" + app_dirs_set_data_dir (_tmp46_); +#line 2932 "main.c" } else { #line 418 "/home/jens/Source/shotwell/src/main.vala" app_dirs_try_migrate_data (); -#line 2785 "main.c" +#line 2936 "main.c" } #line 421 "/home/jens/Source/shotwell/src/main.vala" app_dirs_verify_data_dir (); #line 422 "/home/jens/Source/shotwell/src/main.vala" app_dirs_verify_cache_dir (); #line 425 "/home/jens/Source/shotwell/src/main.vala" - _tmp58_ = args; -#line 425 "/home/jens/Source/shotwell/src/main.vala" - _tmp58__length1 = args_length1; -#line 425 "/home/jens/Source/shotwell/src/main.vala" - international_support_init (RESOURCES_APP_GETTEXT_PACKAGE, _tmp58_, _tmp58__length1, INTERNATIONAL_SUPPORT_SYSTEM_LOCALE); + international_support_init (RESOURCES_APP_GETTEXT_PACKAGE, args, args_length1, INTERNATIONAL_SUPPORT_SYSTEM_LOCALE); #line 427 "/home/jens/Source/shotwell/src/main.vala" - _tmp59_ = g_timer_new (); + _tmp47_ = g_timer_new (); #line 427 "/home/jens/Source/shotwell/src/main.vala" _g_timer_destroy0 (startup_timer); #line 427 "/home/jens/Source/shotwell/src/main.vala" - startup_timer = _tmp59_; + startup_timer = _tmp47_; #line 428 "/home/jens/Source/shotwell/src/main.vala" - _tmp60_ = startup_timer; + _tmp48_ = startup_timer; #line 428 "/home/jens/Source/shotwell/src/main.vala" - g_timer_start (_tmp60_); + g_timer_start (_tmp48_); #line 431 "/home/jens/Source/shotwell/src/main.vala" g_set_application_name (RESOURCES_APP_TITLE); #line 435 "/home/jens/Source/shotwell/src/main.vala" resources_init (); #line 440 "/home/jens/Source/shotwell/src/main.vala" - _tmp61_ = filename; + _tmp49_ = filename; #line 440 "/home/jens/Source/shotwell/src/main.vala" - _tmp62_ = is_string_empty (_tmp61_); -#line 440 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp62_) { -#line 2817 "main.c" - gchar** _tmp63_; - gint _tmp63__length1; + if (is_string_empty (_tmp49_)) { +#line 2962 "main.c" + gchar** _tmp50_; + gint _tmp50__length1; #line 441 "/home/jens/Source/shotwell/src/main.vala" - _tmp63_ = mounts; + _tmp50_ = mounts; #line 441 "/home/jens/Source/shotwell/src/main.vala" - _tmp63__length1 = mounts_length1; + _tmp50__length1 = mounts_length1; #line 441 "/home/jens/Source/shotwell/src/main.vala" - library_exec (_tmp63_, _tmp63__length1); -#line 2826 "main.c" + library_exec (_tmp50_, _tmp50__length1); +#line 2971 "main.c" } else { - const gchar* _tmp64_; - gboolean _tmp65_; + const gchar* _tmp51_; + gboolean _tmp52_; #line 443 "/home/jens/Source/shotwell/src/main.vala" - _tmp64_ = filename; + _tmp51_ = filename; #line 443 "/home/jens/Source/shotwell/src/main.vala" - _tmp65_ = commandline_options_fullscreen; + _tmp52_ = commandline_options_fullscreen; #line 443 "/home/jens/Source/shotwell/src/main.vala" - editing_exec (_tmp64_, _tmp65_); -#line 2836 "main.c" + editing_exec (_tmp51_, _tmp52_); +#line 2981 "main.c" } #line 446 "/home/jens/Source/shotwell/src/main.vala" resources_terminate (); @@ -2851,122 +2996,120 @@ void _vala_main (gchar** args, int args_length1) { #line 449 "/home/jens/Source/shotwell/src/main.vala" app_dirs_terminate (); #line 454 "/home/jens/Source/shotwell/src/main.vala" - _tmp67_ = filename; -#line 454 "/home/jens/Source/shotwell/src/main.vala" - _tmp68_ = is_string_empty (_tmp67_); + _tmp54_ = filename; #line 454 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp68_) { -#line 2852 "main.c" - gboolean _tmp69_; + if (is_string_empty (_tmp54_)) { +#line 2995 "main.c" + gboolean _tmp55_; #line 454 "/home/jens/Source/shotwell/src/main.vala" - _tmp69_ = was_already_running; + _tmp55_ = was_already_running; #line 454 "/home/jens/Source/shotwell/src/main.vala" - _tmp66_ = !_tmp69_; -#line 2858 "main.c" + _tmp53_ = !_tmp55_; +#line 3001 "main.c" } else { #line 454 "/home/jens/Source/shotwell/src/main.vala" - _tmp66_ = FALSE; -#line 2862 "main.c" + _tmp53_ = FALSE; +#line 3005 "main.c" } #line 454 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp66_) { -#line 2866 "main.c" + if (_tmp53_) { +#line 3009 "main.c" gchar* orig_path = NULL; - GFile* _tmp70_; - GFile* _tmp71_; - GFile* _tmp72_; - GFile* _tmp73_; - gchar* _tmp74_; - gchar* _tmp75_; + GFile* _tmp56_; + GFile* _tmp57_; + GFile* _tmp58_; + GFile* _tmp59_; + gchar* _tmp60_; + gchar* _tmp61_; gchar* backup_path = NULL; - const gchar* _tmp76_; - gchar* _tmp77_; + const gchar* _tmp62_; + gchar* _tmp63_; #line 455 "/home/jens/Source/shotwell/src/main.vala" - _tmp70_ = app_dirs_get_data_subdir ("data", NULL); + _tmp56_ = app_dirs_get_data_subdir ("data", NULL); #line 455 "/home/jens/Source/shotwell/src/main.vala" - _tmp71_ = _tmp70_; + _tmp57_ = _tmp56_; #line 455 "/home/jens/Source/shotwell/src/main.vala" - _tmp72_ = g_file_get_child (_tmp71_, "photo.db"); + _tmp58_ = g_file_get_child (_tmp57_, "photo.db"); #line 455 "/home/jens/Source/shotwell/src/main.vala" - _tmp73_ = _tmp72_; + _tmp59_ = _tmp58_; #line 455 "/home/jens/Source/shotwell/src/main.vala" - _tmp74_ = g_file_get_path (_tmp73_); + _tmp60_ = g_file_get_path (_tmp59_); #line 455 "/home/jens/Source/shotwell/src/main.vala" - _tmp75_ = _tmp74_; + _tmp61_ = _tmp60_; #line 455 "/home/jens/Source/shotwell/src/main.vala" - _g_object_unref0 (_tmp73_); + _g_object_unref0 (_tmp59_); #line 455 "/home/jens/Source/shotwell/src/main.vala" - _g_object_unref0 (_tmp71_); + _g_object_unref0 (_tmp57_); #line 455 "/home/jens/Source/shotwell/src/main.vala" - orig_path = _tmp75_; + orig_path = _tmp61_; #line 456 "/home/jens/Source/shotwell/src/main.vala" - _tmp76_ = orig_path; + _tmp62_ = orig_path; #line 456 "/home/jens/Source/shotwell/src/main.vala" - _tmp77_ = g_strconcat (_tmp76_, ".bak", NULL); + _tmp63_ = g_strconcat (_tmp62_, ".bak", NULL); #line 456 "/home/jens/Source/shotwell/src/main.vala" - backup_path = _tmp77_; -#line 2901 "main.c" + backup_path = _tmp63_; +#line 3044 "main.c" { GFile* src = NULL; - const gchar* _tmp78_; - GFile* _tmp79_; + const gchar* _tmp64_; + GFile* _tmp65_; GFile* dest = NULL; - const gchar* _tmp80_; - GFile* _tmp81_; - GFile* _tmp82_; - GFile* _tmp83_; + const gchar* _tmp66_; + GFile* _tmp67_; + GFile* _tmp68_; + GFile* _tmp69_; #line 458 "/home/jens/Source/shotwell/src/main.vala" - _tmp78_ = orig_path; + _tmp64_ = orig_path; #line 458 "/home/jens/Source/shotwell/src/main.vala" - _tmp79_ = g_file_new_for_commandline_arg (_tmp78_); + _tmp65_ = g_file_new_for_commandline_arg (_tmp64_); #line 458 "/home/jens/Source/shotwell/src/main.vala" - src = _tmp79_; + src = _tmp65_; #line 459 "/home/jens/Source/shotwell/src/main.vala" - _tmp80_ = backup_path; + _tmp66_ = backup_path; #line 459 "/home/jens/Source/shotwell/src/main.vala" - _tmp81_ = g_file_new_for_commandline_arg (_tmp80_); + _tmp67_ = g_file_new_for_commandline_arg (_tmp66_); #line 459 "/home/jens/Source/shotwell/src/main.vala" - dest = _tmp81_; + dest = _tmp67_; #line 460 "/home/jens/Source/shotwell/src/main.vala" - _tmp82_ = src; + _tmp68_ = src; #line 460 "/home/jens/Source/shotwell/src/main.vala" - _tmp83_ = dest; + _tmp69_ = dest; #line 460 "/home/jens/Source/shotwell/src/main.vala" - g_file_copy (_tmp82_, _tmp83_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &_inner_error_); + g_file_copy (_tmp68_, _tmp69_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &_inner_error_); #line 460 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 460 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (dest); #line 460 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (src); -#line 2935 "main.c" +#line 3078 "main.c" goto __catch237_g_error; } #line 457 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (dest); #line 457 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (src); -#line 2942 "main.c" +#line 3085 "main.c" } goto __finally237; __catch237_g_error: { GError* _error_ = NULL; - GError* _tmp84_; - const gchar* _tmp85_; + GError* _tmp70_; + const gchar* _tmp71_; #line 457 "/home/jens/Source/shotwell/src/main.vala" _error_ = _inner_error_; #line 457 "/home/jens/Source/shotwell/src/main.vala" _inner_error_ = NULL; #line 464 "/home/jens/Source/shotwell/src/main.vala" - _tmp84_ = _error_; + _tmp70_ = _error_; #line 464 "/home/jens/Source/shotwell/src/main.vala" - _tmp85_ = _tmp84_->message; + _tmp71_ = _tmp70_->message; #line 464 "/home/jens/Source/shotwell/src/main.vala" - g_warning ("main.vala:464: Failed to create backup file of database: %s", _tmp85_); + g_warning ("main.vala:464: Failed to create backup file of database: %s", _tmp71_); #line 457 "/home/jens/Source/shotwell/src/main.vala" _g_error_free0 (_error_); -#line 2962 "main.c" +#line 3105 "main.c" } __finally237: #line 457 "/home/jens/Source/shotwell/src/main.vala" @@ -2985,7 +3128,7 @@ void _vala_main (gchar** args, int args_length1) { g_clear_error (&_inner_error_); #line 457 "/home/jens/Source/shotwell/src/main.vala" return; -#line 2981 "main.c" +#line 3124 "main.c" } #line 467 "/home/jens/Source/shotwell/src/main.vala" sync (); @@ -2993,29 +3136,33 @@ void _vala_main (gchar** args, int args_length1) { _g_free0 (backup_path); #line 454 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (orig_path); -#line 2989 "main.c" +#line 3132 "main.c" } #line 330 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (filename); #line 330 "/home/jens/Source/shotwell/src/main.vala" mounts = (_vala_array_free (mounts, mounts_length1, (GDestroyNotify) g_free), NULL); -#line 2995 "main.c" +#line 3138 "main.c" } -int main (int argc, char ** argv) { -#if !GLIB_CHECK_VERSION (2,35,0) - g_type_init (); -#endif +int +main (int argc, + char ** argv) +{ #line 330 "/home/jens/Source/shotwell/src/main.vala" _vala_main (argv, argc); #line 330 "/home/jens/Source/shotwell/src/main.vala" return 0; -#line 3007 "main.c" +#line 3150 "main.c" } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -3027,7 +3174,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/photos/BmpSupport.c b/src/photos/BmpSupport.c index e6f204c..b56b3ed 100644 --- a/src/photos/BmpSupport.c +++ b/src/photos/BmpSupport.c @@ -1,4 +1,4 @@ -/* BmpSupport.c generated by valac 0.36.6, the Vala compiler +/* BmpSupport.c generated by valac 0.40.4, the Vala compiler * generated from BmpSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -482,17 +483,20 @@ static PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_instance = NULL; gpointer photo_file_format_properties_ref (gpointer instance); void photo_file_format_properties_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_properties (GValue* value, gpointer v_object); -void value_take_photo_file_format_properties (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_properties (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_properties (GValue* value, + gpointer v_object); +void value_take_photo_file_format_properties (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_properties (const GValue* value); GType photo_file_format_properties_get_type (void) G_GNUC_CONST; GType photo_file_format_get_type (void) G_GNUC_CONST; GType photo_file_format_flags_get_type (void) G_GNUC_CONST; GType photos_bmp_file_format_properties_get_type (void) G_GNUC_CONST; -enum { - PHOTOS_BMP_FILE_FORMAT_PROPERTIES_DUMMY_PROPERTY -}; void photos_bmp_file_format_properties_init (void); PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_new (void); PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_construct (GType object_type); @@ -501,44 +505,73 @@ static PhotoFileFormat photos_bmp_file_format_properties_real_get_file_format (P static PhotoFileFormatFlags photos_bmp_file_format_properties_real_get_flags (PhotoFileFormatProperties* base); static gchar* photos_bmp_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base); static gchar* photos_bmp_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base); -static gchar** photos_bmp_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup8 (gchar** self, int length); +static gchar** photos_bmp_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1); +static gchar** _vala_array_dup8 (gchar** self, + int length); static gchar* photos_bmp_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base); -static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup9 (gchar** self, int length); +static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1); +static gchar** _vala_array_dup9 (gchar** self, + int length); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); static void photos_bmp_file_format_properties_finalize (PhotoFileFormatProperties * obj); gpointer photo_file_sniffer_ref (gpointer instance); void photo_file_sniffer_unref (gpointer instance); -GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_sniffer (GValue* value, gpointer v_object); -void value_take_photo_file_sniffer (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_sniffer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_sniffer (GValue* value, + gpointer v_object); +void value_take_photo_file_sniffer (GValue* value, + gpointer v_object); gpointer value_get_photo_file_sniffer (const GValue* value); GType photo_file_sniffer_get_type (void) G_GNUC_CONST; gpointer detected_photo_information_ref (gpointer instance); void detected_photo_information_unref (gpointer instance); -GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_detected_photo_information (GValue* value, gpointer v_object); -void value_take_detected_photo_information (GValue* value, gpointer v_object); +GParamSpec* param_spec_detected_photo_information (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_detected_photo_information (GValue* value, + gpointer v_object); +void value_take_detected_photo_information (GValue* value, + gpointer v_object); gpointer value_get_detected_photo_information (const GValue* value); GType detected_photo_information_get_type (void) G_GNUC_CONST; GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; GType gdk_sniffer_get_type (void) G_GNUC_CONST; GType photos_bmp_sniffer_get_type (void) G_GNUC_CONST; -enum { - PHOTOS_BMP_SNIFFER_DUMMY_PROPERTY -}; -PhotosBmpSniffer* photos_bmp_sniffer_new (GFile* file, PhotoFileSnifferOptions options); -PhotosBmpSniffer* photos_bmp_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error); -static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error); -DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error); +PhotosBmpSniffer* photos_bmp_sniffer_new (GFile* file, + PhotoFileSnifferOptions options); +PhotosBmpSniffer* photos_bmp_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +GdkSniffer* gdk_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, + GError** error); +static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error); +DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, + gboolean* is_corrupted, + GError** error); gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -547,65 +580,90 @@ Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; GType gdk_reader_get_type (void) G_GNUC_CONST; GType photos_bmp_reader_get_type (void) G_GNUC_CONST; -enum { - PHOTOS_BMP_READER_DUMMY_PROPERTY -}; PhotosBmpReader* photos_bmp_reader_new (const gchar* filepath); -PhotosBmpReader* photos_bmp_reader_construct (GType object_type, const gchar* filepath); -GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error); +PhotosBmpReader* photos_bmp_reader_construct (GType object_type, + const gchar* filepath); +GdkReader* gdk_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, + Dimensions* full, + Dimensions* scaled, + GError** error); GType scale_constraint_get_type (void) G_GNUC_CONST; -void dimensions_get_scaled_by_constraint (Dimensions *self, gint scale, ScaleConstraint constraint, Dimensions* result); +void dimensions_get_scaled_by_constraint (Dimensions *self, + gint scale, + ScaleConstraint constraint, + Dimensions* result); gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self); GType photo_file_writer_get_type (void) G_GNUC_CONST; GType jpeg_quality_get_type (void) G_GNUC_CONST; GType photos_bmp_writer_get_type (void) G_GNUC_CONST; -enum { - PHOTOS_BMP_WRITER_DUMMY_PROPERTY -}; PhotosBmpWriter* photos_bmp_writer_new (const gchar* filepath); -PhotosBmpWriter* photos_bmp_writer_construct (GType object_type, const gchar* filepath); -PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static void photos_bmp_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error); +PhotosBmpWriter* photos_bmp_writer_construct (GType object_type, + const gchar* filepath); +PhotoFileWriter* photo_file_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static void photos_bmp_writer_real_write (PhotoFileWriter* base, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error); GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST; GType photos_bmp_metadata_writer_get_type (void) G_GNUC_CONST; -enum { - PHOTOS_BMP_METADATA_WRITER_DUMMY_PROPERTY -}; PhotosBmpMetadataWriter* photos_bmp_metadata_writer_new (const gchar* filepath); -PhotosBmpMetadataWriter* photos_bmp_metadata_writer_construct (GType object_type, const gchar* filepath); -PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static void photos_bmp_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error); +PhotosBmpMetadataWriter* photos_bmp_metadata_writer_construct (GType object_type, + const gchar* filepath); +PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static void photos_bmp_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, + PhotoMetadata* metadata, + GError** error); gpointer photo_file_format_driver_ref (gpointer instance); void photo_file_format_driver_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_driver (GValue* value, gpointer v_object); -void value_take_photo_file_format_driver (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_driver (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_driver (GValue* value, + gpointer v_object); +void value_take_photo_file_format_driver (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_driver (const GValue* value); GType photo_file_format_driver_get_type (void) G_GNUC_CONST; GType photos_bmp_file_format_driver_get_type (void) G_GNUC_CONST; -enum { - PHOTOS_BMP_FILE_FORMAT_DRIVER_DUMMY_PROPERTY -}; void photos_bmp_file_format_driver_init (void); PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_new (void); PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_construct (GType object_type); PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_get_instance (void); static PhotoFileFormatProperties* photos_bmp_file_format_driver_real_get_properties (PhotoFileFormatDriver* base); -static PhotoFileReader* photos_bmp_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath); +static PhotoFileReader* photos_bmp_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath); static gboolean photos_bmp_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base); static gboolean photos_bmp_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base); -static PhotoFileWriter* photos_bmp_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath); -static PhotoFileMetadataWriter* photos_bmp_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath); -static PhotoFileSniffer* photos_bmp_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options); +static PhotoFileWriter* photos_bmp_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath); +static PhotoFileMetadataWriter* photos_bmp_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath); +static PhotoFileSniffer* photos_bmp_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options); static PhotoMetadata* photos_bmp_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base); PhotoMetadata* photo_metadata_new (void); PhotoMetadata* photo_metadata_construct (GType object_type); @@ -614,7 +672,9 @@ static void photos_bmp_file_format_driver_finalize (PhotoFileFormatDriver * obj) static const guint8 PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE[2] = {(guint8) 0x42, (guint8) 0x4D}; -void photos_bmp_file_format_properties_init (void) { +void +photos_bmp_file_format_properties_init (void) +{ PhotosBmpFileFormatProperties* _tmp0_; #line 16 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0_ = photos_bmp_file_format_properties_new (); @@ -622,18 +682,22 @@ void photos_bmp_file_format_properties_init (void) { _photo_file_format_properties_unref0 (photos_bmp_file_format_properties_instance); #line 16 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" photos_bmp_file_format_properties_instance = _tmp0_; -#line 626 "BmpSupport.c" +#line 686 "BmpSupport.c" } -static gpointer _photo_file_format_properties_ref0 (gpointer self) { +static gpointer +_photo_file_format_properties_ref0 (gpointer self) +{ #line 20 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return self ? photo_file_format_properties_ref (self) : NULL; -#line 633 "BmpSupport.c" +#line 695 "BmpSupport.c" } -PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_get_instance (void) { +PhotosBmpFileFormatProperties* +photos_bmp_file_format_properties_get_instance (void) +{ PhotosBmpFileFormatProperties* result = NULL; PhotosBmpFileFormatProperties* _tmp0_; PhotosBmpFileFormatProperties* _tmp1_; @@ -645,11 +709,13 @@ PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_get_instance (v result = _tmp1_; #line 20 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 649 "BmpSupport.c" +#line 713 "BmpSupport.c" } -static PhotoFileFormat photos_bmp_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) { +static PhotoFileFormat +photos_bmp_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) +{ PhotosBmpFileFormatProperties * self; PhotoFileFormat result = 0; #line 23 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -658,11 +724,13 @@ static PhotoFileFormat photos_bmp_file_format_properties_real_get_file_format (P result = PHOTO_FILE_FORMAT_BMP; #line 24 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 662 "BmpSupport.c" +#line 728 "BmpSupport.c" } -static PhotoFileFormatFlags photos_bmp_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) { +static PhotoFileFormatFlags +photos_bmp_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) +{ PhotosBmpFileFormatProperties * self; PhotoFileFormatFlags result = 0; #line 27 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -671,11 +739,13 @@ static PhotoFileFormatFlags photos_bmp_file_format_properties_real_get_flags (Ph result = PHOTO_FILE_FORMAT_FLAGS_NONE; #line 28 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 675 "BmpSupport.c" +#line 743 "BmpSupport.c" } -static gchar* photos_bmp_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) { +static gchar* +photos_bmp_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) +{ PhotosBmpFileFormatProperties * self; gchar* result = NULL; gchar* _tmp0_; @@ -687,11 +757,13 @@ static gchar* photos_bmp_file_format_properties_real_get_user_visible_name (Phot result = _tmp0_; #line 32 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 691 "BmpSupport.c" +#line 761 "BmpSupport.c" } -static gchar* photos_bmp_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) { +static gchar* +photos_bmp_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) +{ PhotosBmpFileFormatProperties * self; gchar* result = NULL; gchar** _tmp0_; @@ -712,32 +784,38 @@ static gchar* photos_bmp_file_format_properties_real_get_default_extension (Phot result = _tmp2_; #line 36 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 716 "BmpSupport.c" +#line 788 "BmpSupport.c" } -static gchar** _vala_array_dup8 (gchar** self, int length) { +static gchar** +_vala_array_dup8 (gchar** self, + int length) +{ gchar** result; int i; #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" result = g_new0 (gchar*, length + 1); #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" for (i = 0; i < length; i++) { -#line 727 "BmpSupport.c" +#line 802 "BmpSupport.c" gchar* _tmp0_; #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0_ = g_strdup (self[i]); #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" result[i] = _tmp0_; -#line 733 "BmpSupport.c" +#line 808 "BmpSupport.c" } #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 737 "BmpSupport.c" +#line 812 "BmpSupport.c" } -static gchar** photos_bmp_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +photos_bmp_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1) +{ PhotosBmpFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -764,17 +842,19 @@ static gchar** photos_bmp_file_format_properties_real_get_known_extensions (Phot if (result_length1) { #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" *result_length1 = _tmp2__length1; -#line 768 "BmpSupport.c" +#line 846 "BmpSupport.c" } #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" result = _tmp2_; #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 774 "BmpSupport.c" +#line 852 "BmpSupport.c" } -static gchar* photos_bmp_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) { +static gchar* +photos_bmp_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) +{ PhotosBmpFileFormatProperties * self; gchar* result = NULL; gchar** _tmp0_; @@ -795,32 +875,38 @@ static gchar* photos_bmp_file_format_properties_real_get_default_mime_type (Phot result = _tmp2_; #line 44 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 799 "BmpSupport.c" +#line 879 "BmpSupport.c" } -static gchar** _vala_array_dup9 (gchar** self, int length) { +static gchar** +_vala_array_dup9 (gchar** self, + int length) +{ gchar** result; int i; #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" result = g_new0 (gchar*, length + 1); #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" for (i = 0; i < length; i++) { -#line 810 "BmpSupport.c" +#line 893 "BmpSupport.c" gchar* _tmp0_; #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0_ = g_strdup (self[i]); #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" result[i] = _tmp0_; -#line 816 "BmpSupport.c" +#line 899 "BmpSupport.c" } #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 820 "BmpSupport.c" +#line 903 "BmpSupport.c" } -static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +photos_bmp_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1) +{ PhotosBmpFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -847,34 +933,40 @@ static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileF if (result_length1) { #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" *result_length1 = _tmp2__length1; -#line 851 "BmpSupport.c" +#line 937 "BmpSupport.c" } #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" result = _tmp2_; #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 857 "BmpSupport.c" +#line 943 "BmpSupport.c" } -PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_construct (GType object_type) { +PhotosBmpFileFormatProperties* +photos_bmp_file_format_properties_construct (GType object_type) +{ PhotosBmpFileFormatProperties* self = NULL; #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = (PhotosBmpFileFormatProperties*) photo_file_format_properties_construct (object_type); #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return self; -#line 867 "BmpSupport.c" +#line 955 "BmpSupport.c" } -PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_new (void) { +PhotosBmpFileFormatProperties* +photos_bmp_file_format_properties_new (void) +{ #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return photos_bmp_file_format_properties_construct (PHOTOS_TYPE_BMP_FILE_FORMAT_PROPERTIES); -#line 874 "BmpSupport.c" +#line 964 "BmpSupport.c" } -static void photos_bmp_file_format_properties_class_init (PhotosBmpFileFormatPropertiesClass * klass) { +static void +photos_bmp_file_format_properties_class_init (PhotosBmpFileFormatPropertiesClass * klass) +{ gchar* _tmp0_; gchar* _tmp1_; gchar** _tmp2_; @@ -922,25 +1014,31 @@ static void photos_bmp_file_format_properties_class_init (PhotosBmpFileFormatPro photos_bmp_file_format_properties_KNOWN_MIME_TYPES = _tmp4_; #line 11 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" photos_bmp_file_format_properties_KNOWN_MIME_TYPES_length1 = 1; -#line 926 "BmpSupport.c" +#line 1018 "BmpSupport.c" } -static void photos_bmp_file_format_properties_instance_init (PhotosBmpFileFormatProperties * self) { +static void +photos_bmp_file_format_properties_instance_init (PhotosBmpFileFormatProperties * self) +{ } -static void photos_bmp_file_format_properties_finalize (PhotoFileFormatProperties * obj) { +static void +photos_bmp_file_format_properties_finalize (PhotoFileFormatProperties * obj) +{ PhotosBmpFileFormatProperties * self; #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTOS_TYPE_BMP_FILE_FORMAT_PROPERTIES, PhotosBmpFileFormatProperties); #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" PHOTO_FILE_FORMAT_PROPERTIES_CLASS (photos_bmp_file_format_properties_parent_class)->finalize (obj); -#line 940 "BmpSupport.c" +#line 1036 "BmpSupport.c" } -GType photos_bmp_file_format_properties_get_type (void) { +GType +photos_bmp_file_format_properties_get_type (void) +{ static volatile gsize photos_bmp_file_format_properties_type_id__volatile = 0; if (g_once_init_enter (&photos_bmp_file_format_properties_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosBmpFileFormatPropertiesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_bmp_file_format_properties_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosBmpFileFormatProperties), 0, (GInstanceInitFunc) photos_bmp_file_format_properties_instance_init, NULL }; @@ -952,82 +1050,83 @@ GType photos_bmp_file_format_properties_get_type (void) { } -PhotosBmpSniffer* photos_bmp_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { +PhotosBmpSniffer* +photos_bmp_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options) +{ PhotosBmpSniffer* self = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; #line 55 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 56 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = file; -#line 56 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp1_ = options; -#line 56 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - self = (PhotosBmpSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_); + self = (PhotosBmpSniffer*) gdk_sniffer_construct (object_type, file, options); #line 55 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return self; -#line 970 "BmpSupport.c" +#line 1066 "BmpSupport.c" } -PhotosBmpSniffer* photos_bmp_sniffer_new (GFile* file, PhotoFileSnifferOptions options) { +PhotosBmpSniffer* +photos_bmp_sniffer_new (GFile* file, + PhotoFileSnifferOptions options) +{ #line 55 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return photos_bmp_sniffer_construct (PHOTOS_TYPE_BMP_SNIFFER, file, options); -#line 977 "BmpSupport.c" +#line 1076 "BmpSupport.c" } -static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) { +static gboolean +photos_bmp_sniffer_is_bmp_file (GFile* file, + GError** error) +{ gboolean result = FALSE; GFileInputStream* instream = NULL; - GFile* _tmp0_; - GFileInputStream* _tmp1_; + GFileInputStream* _tmp0_; guint8* file_lead_sequence = NULL; - guint8* _tmp3_; + guint8* _tmp2_; gint file_lead_sequence_length1; gint _file_lead_sequence_size_; - GFileInputStream* _tmp4_; - guint8* _tmp5_; - gint _tmp5__length1; + GFileInputStream* _tmp3_; + guint8* _tmp4_; + gint _tmp4__length1; GError * _inner_error_ = NULL; #line 59 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = file; + _tmp0_ = g_file_read (file, NULL, &_inner_error_); #line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp1_ = g_file_read (_tmp0_, NULL, &_inner_error_); -#line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - instream = _tmp1_; + instream = _tmp0_; #line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1004 "BmpSupport.c" - gboolean _tmp2_ = FALSE; +#line 1103 "BmpSupport.c" + gboolean _tmp1_ = FALSE; #line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_propagate_error (error, _inner_error_); #line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - return _tmp2_; -#line 1010 "BmpSupport.c" + return _tmp1_; +#line 1109 "BmpSupport.c" } #line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp3_ = g_new0 (guint8, G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE)); + _tmp2_ = g_new0 (guint8, G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE)); #line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - file_lead_sequence = _tmp3_; + file_lead_sequence = _tmp2_; #line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" file_lead_sequence_length1 = G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE); #line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _file_lead_sequence_size_ = file_lead_sequence_length1; #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp4_ = instream; + _tmp3_ = instream; #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp5_ = file_lead_sequence; + _tmp4_ = file_lead_sequence; #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp5__length1 = file_lead_sequence_length1; + _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 (_tmp4_, g_input_stream_get_type (), GInputStream), _tmp5_, (gsize) _tmp5__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 1030 "BmpSupport.c" - gboolean _tmp6_ = FALSE; +#line 1129 "BmpSupport.c" + gboolean _tmp5_ = FALSE; #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_propagate_error (error, _inner_error_); #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1035,62 +1134,62 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) { #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _g_object_unref0 (instream); #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - return _tmp6_; -#line 1040 "BmpSupport.c" + return _tmp5_; +#line 1139 "BmpSupport.c" } { gint i = 0; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" i = 0; -#line 1046 "BmpSupport.c" +#line 1145 "BmpSupport.c" { - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp7_ = TRUE; + _tmp6_ = TRUE; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" while (TRUE) { -#line 1053 "BmpSupport.c" - gint _tmp9_; - guint8* _tmp10_; - gint _tmp10__length1; - gint _tmp11_; - guint8 _tmp12_; - gint _tmp13_; - guint8 _tmp14_; +#line 1152 "BmpSupport.c" + gint _tmp8_; + guint8* _tmp9_; + gint _tmp9__length1; + gint _tmp10_; + guint8 _tmp11_; + gint _tmp12_; + guint8 _tmp13_; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - if (!_tmp7_) { -#line 1063 "BmpSupport.c" - gint _tmp8_; + if (!_tmp6_) { +#line 1162 "BmpSupport.c" + gint _tmp7_; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp8_ = i; + _tmp7_ = i; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - i = _tmp8_ + 1; -#line 1069 "BmpSupport.c" + i = _tmp7_ + 1; +#line 1168 "BmpSupport.c" } #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp7_ = FALSE; + _tmp6_ = FALSE; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp9_ = i; + _tmp8_ = i; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - if (!(_tmp9_ < G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE))) { + if (!(_tmp8_ < G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE))) { #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" break; -#line 1079 "BmpSupport.c" +#line 1178 "BmpSupport.c" } #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp10_ = file_lead_sequence; + _tmp9_ = file_lead_sequence; #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp10__length1 = file_lead_sequence_length1; + _tmp9__length1 = file_lead_sequence_length1; #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp11_ = i; + _tmp10_ = i; #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp12_ = _tmp10_[_tmp11_]; + _tmp11_ = _tmp9_[_tmp10_]; #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp13_ = i; + _tmp12_ = i; #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp14_ = PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE[_tmp13_]; + _tmp13_ = PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE[_tmp12_]; #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - if (_tmp12_ != _tmp14_) { + if (_tmp11_ != _tmp13_) { #line 68 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" result = FALSE; #line 68 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1099,7 +1198,7 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) { _g_object_unref0 (instream); #line 68 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1103 "BmpSupport.c" +#line 1202 "BmpSupport.c" } } } @@ -1112,32 +1211,37 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) { _g_object_unref0 (instream); #line 71 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1116 "BmpSupport.c" +#line 1215 "BmpSupport.c" } -static gpointer _detected_photo_information_ref0 (gpointer self) { +static gpointer +_detected_photo_information_ref0 (gpointer self) +{ #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return self ? detected_photo_information_ref (self) : NULL; -#line 1123 "BmpSupport.c" +#line 1224 "BmpSupport.c" } -static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error) { +static DetectedPhotoInformation* +photos_bmp_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error) +{ PhotosBmpSniffer * self; gboolean _vala_is_corrupted = FALSE; DetectedPhotoInformation* result = NULL; gboolean _tmp0_ = FALSE; GFile* _tmp1_; - gboolean _tmp2_; DetectedPhotoInformation* detected = NULL; - gboolean _tmp3_ = FALSE; + gboolean _tmp2_ = FALSE; + DetectedPhotoInformation* _tmp3_; DetectedPhotoInformation* _tmp4_; - DetectedPhotoInformation* _tmp5_; - DetectedPhotoInformation* _tmp6_ = NULL; - DetectedPhotoInformation* _tmp7_; - PhotoFileFormat _tmp8_; - DetectedPhotoInformation* _tmp10_; + DetectedPhotoInformation* _tmp5_ = NULL; + DetectedPhotoInformation* _tmp6_; + PhotoFileFormat _tmp7_; + DetectedPhotoInformation* _tmp9_; GError * _inner_error_ = NULL; #line 74 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_SNIFFER, PhotosBmpSniffer); @@ -1146,16 +1250,14 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp2_ = photos_bmp_sniffer_is_bmp_file (_tmp1_, &_inner_error_); -#line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = _tmp2_; + _tmp0_ = photos_bmp_sniffer_is_bmp_file (_tmp1_, &_inner_error_); #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_propagate_error (error, _inner_error_); #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return NULL; -#line 1159 "BmpSupport.c" +#line 1261 "BmpSupport.c" } #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (!_tmp0_) { @@ -1165,30 +1267,30 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer if (is_corrupted) { #line 79 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1169 "BmpSupport.c" +#line 1271 "BmpSupport.c" } #line 79 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1173 "BmpSupport.c" +#line 1275 "BmpSupport.c" } #line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp4_ = PHOTO_FILE_SNIFFER_CLASS (photos_bmp_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp3_, &_inner_error_); + _tmp3_ = PHOTO_FILE_SNIFFER_CLASS (photos_bmp_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp2_, &_inner_error_); #line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _vala_is_corrupted = _tmp3_; + _vala_is_corrupted = _tmp2_; #line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - detected = _tmp4_; + detected = _tmp3_; #line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_propagate_error (error, _inner_error_); #line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return NULL; -#line 1187 "BmpSupport.c" +#line 1289 "BmpSupport.c" } #line 82 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp5_ = detected; + _tmp4_ = detected; #line 82 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - if (_tmp5_ == NULL) { + if (_tmp4_ == NULL) { #line 83 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" result = NULL; #line 83 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1197,62 +1299,68 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer if (is_corrupted) { #line 83 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1201 "BmpSupport.c" +#line 1303 "BmpSupport.c" } #line 83 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1205 "BmpSupport.c" +#line 1307 "BmpSupport.c" } #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp7_ = detected; + _tmp6_ = detected; #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp8_ = _tmp7_->file_format; + _tmp7_ = _tmp6_->file_format; #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - if (_tmp8_ == PHOTO_FILE_FORMAT_BMP) { -#line 1213 "BmpSupport.c" - DetectedPhotoInformation* _tmp9_; + if (_tmp7_ == PHOTO_FILE_FORMAT_BMP) { +#line 1315 "BmpSupport.c" + DetectedPhotoInformation* _tmp8_; #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp9_ = detected; + _tmp8_ = detected; #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp6_ = _tmp9_; -#line 1219 "BmpSupport.c" + _tmp5_ = _tmp8_; +#line 1321 "BmpSupport.c" } else { #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp6_ = NULL; -#line 1223 "BmpSupport.c" + _tmp5_ = NULL; +#line 1325 "BmpSupport.c" } #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp10_ = _detected_photo_information_ref0 (_tmp6_); + _tmp9_ = _detected_photo_information_ref0 (_tmp5_); #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - result = _tmp10_; + result = _tmp9_; #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _detected_photo_information_unref0 (detected); #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (is_corrupted) { #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1235 "BmpSupport.c" +#line 1337 "BmpSupport.c" } #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1239 "BmpSupport.c" +#line 1341 "BmpSupport.c" } -static void photos_bmp_sniffer_class_init (PhotosBmpSnifferClass * klass) { +static void +photos_bmp_sniffer_class_init (PhotosBmpSnifferClass * klass) +{ #line 52 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" photos_bmp_sniffer_parent_class = g_type_class_peek_parent (klass); #line 52 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) photos_bmp_sniffer_real_sniff; -#line 1248 "BmpSupport.c" +#line 1352 "BmpSupport.c" } -static void photos_bmp_sniffer_instance_init (PhotosBmpSniffer * self) { +static void +photos_bmp_sniffer_instance_init (PhotosBmpSniffer * self) +{ } -GType photos_bmp_sniffer_get_type (void) { +GType +photos_bmp_sniffer_get_type (void) +{ static volatile gsize photos_bmp_sniffer_type_id__volatile = 0; if (g_once_init_enter (&photos_bmp_sniffer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosBmpSnifferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_bmp_sniffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosBmpSniffer), 0, (GInstanceInitFunc) photos_bmp_sniffer_instance_init, NULL }; @@ -1264,29 +1372,36 @@ GType photos_bmp_sniffer_get_type (void) { } -PhotosBmpReader* photos_bmp_reader_construct (GType object_type, const gchar* filepath) { +PhotosBmpReader* +photos_bmp_reader_construct (GType object_type, + const gchar* filepath) +{ PhotosBmpReader* self = NULL; - const gchar* _tmp0_; #line 90 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 91 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = filepath; -#line 91 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - self = (PhotosBmpReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_BMP); + self = (PhotosBmpReader*) gdk_reader_construct (object_type, filepath, PHOTO_FILE_FORMAT_BMP); #line 90 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return self; -#line 1279 "BmpSupport.c" +#line 1387 "BmpSupport.c" } -PhotosBmpReader* photos_bmp_reader_new (const gchar* filepath) { +PhotosBmpReader* +photos_bmp_reader_new (const gchar* filepath) +{ #line 90 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return photos_bmp_reader_construct (PHOTOS_TYPE_BMP_READER, filepath); -#line 1286 "BmpSupport.c" +#line 1396 "BmpSupport.c" } -static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error) { +static GdkPixbuf* +photos_bmp_reader_real_scaled_read (PhotoFileReader* base, + Dimensions* full, + Dimensions* scaled, + GError** error) +{ PhotosBmpReader * self; GdkPixbuf* result = NULL; GdkPixbuf* _result_ = NULL; @@ -1311,7 +1426,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim if (_tmp3_ > 9999) { #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp1_ = TRUE; -#line 1315 "BmpSupport.c" +#line 1430 "BmpSupport.c" } else { Dimensions _tmp4_; gint _tmp5_; @@ -1321,11 +1436,11 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim _tmp5_ = _tmp4_.height; #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp1_ = _tmp5_ > 9999; -#line 1325 "BmpSupport.c" +#line 1440 "BmpSupport.c" } #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (_tmp1_) { -#line 1329 "BmpSupport.c" +#line 1444 "BmpSupport.c" gboolean _tmp6_ = FALSE; Dimensions _tmp7_; gint _tmp8_; @@ -1337,7 +1452,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim if (_tmp8_ < 100) { #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp6_ = TRUE; -#line 1341 "BmpSupport.c" +#line 1456 "BmpSupport.c" } else { Dimensions _tmp9_; gint _tmp10_; @@ -1347,19 +1462,19 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim _tmp10_ = _tmp9_.height; #line 105 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp6_ = _tmp10_ < 100; -#line 1351 "BmpSupport.c" +#line 1466 "BmpSupport.c" } #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0_ = _tmp6_; -#line 1355 "BmpSupport.c" +#line 1470 "BmpSupport.c" } else { #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0_ = FALSE; -#line 1359 "BmpSupport.c" +#line 1474 "BmpSupport.c" } #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (_tmp0_) { -#line 1363 "BmpSupport.c" +#line 1478 "BmpSupport.c" Dimensions prefetch_dimensions = {0}; Dimensions _tmp11_ = {0}; GdkPixbuf* _tmp12_ = NULL; @@ -1410,7 +1525,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim _g_object_unref0 (_result_); #line 109 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return NULL; -#line 1414 "BmpSupport.c" +#line 1529 "BmpSupport.c" } #line 109 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp21_ = _tmp12_; @@ -1438,7 +1553,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim _result_ = _tmp27_; #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _g_object_unref0 (_tmp12_); -#line 1442 "BmpSupport.c" +#line 1557 "BmpSupport.c" } else { GdkPixbuf* _tmp28_ = NULL; gchar* _tmp29_; @@ -1478,7 +1593,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim _g_object_unref0 (_result_); #line 114 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return NULL; -#line 1482 "BmpSupport.c" +#line 1597 "BmpSupport.c" } #line 114 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp37_ = _tmp28_; @@ -1490,30 +1605,36 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim _result_ = _tmp37_; #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _g_object_unref0 (_tmp28_); -#line 1494 "BmpSupport.c" +#line 1609 "BmpSupport.c" } #line 118 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" result = _result_; #line 118 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1500 "BmpSupport.c" +#line 1615 "BmpSupport.c" } -static void photos_bmp_reader_class_init (PhotosBmpReaderClass * klass) { +static void +photos_bmp_reader_class_init (PhotosBmpReaderClass * klass) +{ #line 89 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" photos_bmp_reader_parent_class = g_type_class_peek_parent (klass); #line 89 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) photos_bmp_reader_real_scaled_read; -#line 1509 "BmpSupport.c" +#line 1626 "BmpSupport.c" } -static void photos_bmp_reader_instance_init (PhotosBmpReader * self) { +static void +photos_bmp_reader_instance_init (PhotosBmpReader * self) +{ } -GType photos_bmp_reader_get_type (void) { +GType +photos_bmp_reader_get_type (void) +{ static volatile gsize photos_bmp_reader_type_id__volatile = 0; if (g_once_init_enter (&photos_bmp_reader_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosBmpReaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_bmp_reader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosBmpReader), 0, (GInstanceInitFunc) photos_bmp_reader_instance_init, NULL }; @@ -1525,73 +1646,83 @@ GType photos_bmp_reader_get_type (void) { } -PhotosBmpWriter* photos_bmp_writer_construct (GType object_type, const gchar* filepath) { +PhotosBmpWriter* +photos_bmp_writer_construct (GType object_type, + const gchar* filepath) +{ PhotosBmpWriter* self = NULL; - const gchar* _tmp0_; #line 123 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 124 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = filepath; -#line 124 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - self = (PhotosBmpWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_BMP); + self = (PhotosBmpWriter*) photo_file_writer_construct (object_type, filepath, PHOTO_FILE_FORMAT_BMP); #line 123 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return self; -#line 1540 "BmpSupport.c" +#line 1661 "BmpSupport.c" } -PhotosBmpWriter* photos_bmp_writer_new (const gchar* filepath) { +PhotosBmpWriter* +photos_bmp_writer_new (const gchar* filepath) +{ #line 123 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return photos_bmp_writer_construct (PHOTOS_TYPE_BMP_WRITER, filepath); -#line 1547 "BmpSupport.c" +#line 1670 "BmpSupport.c" } -static void photos_bmp_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) { +static void +photos_bmp_writer_real_write (PhotoFileWriter* base, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error) +{ PhotosBmpWriter * self; - GdkPixbuf* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; GError * _inner_error_ = NULL; #line 127 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_WRITER, PhotosBmpWriter); #line 127 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = pixbuf; + _tmp0_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp1_ = _tmp0_; #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp2_ = _tmp1_; -#line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - gdk_pixbuf_save (_tmp0_, _tmp2_, "bmp", &_inner_error_, NULL, NULL); + gdk_pixbuf_save (pixbuf, _tmp1_, "bmp", &_inner_error_, NULL, NULL); #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_propagate_error (error, _inner_error_); #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return; -#line 1577 "BmpSupport.c" +#line 1702 "BmpSupport.c" } } -static void photos_bmp_writer_class_init (PhotosBmpWriterClass * klass) { +static void +photos_bmp_writer_class_init (PhotosBmpWriterClass * klass) +{ #line 122 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" photos_bmp_writer_parent_class = g_type_class_peek_parent (klass); #line 122 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" ((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) photos_bmp_writer_real_write; -#line 1587 "BmpSupport.c" +#line 1714 "BmpSupport.c" } -static void photos_bmp_writer_instance_init (PhotosBmpWriter * self) { +static void +photos_bmp_writer_instance_init (PhotosBmpWriter * self) +{ } -GType photos_bmp_writer_get_type (void) { +GType +photos_bmp_writer_get_type (void) +{ static volatile gsize photos_bmp_writer_type_id__volatile = 0; if (g_once_init_enter (&photos_bmp_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosBmpWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_bmp_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosBmpWriter), 0, (GInstanceInitFunc) photos_bmp_writer_instance_init, NULL }; @@ -1603,52 +1734,64 @@ GType photos_bmp_writer_get_type (void) { } -PhotosBmpMetadataWriter* photos_bmp_metadata_writer_construct (GType object_type, const gchar* filepath) { +PhotosBmpMetadataWriter* +photos_bmp_metadata_writer_construct (GType object_type, + const gchar* filepath) +{ PhotosBmpMetadataWriter* self = NULL; - const gchar* _tmp0_; #line 133 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 134 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = filepath; -#line 134 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - self = (PhotosBmpMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_BMP); + self = (PhotosBmpMetadataWriter*) photo_file_metadata_writer_construct (object_type, filepath, PHOTO_FILE_FORMAT_BMP); #line 133 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return self; -#line 1618 "BmpSupport.c" +#line 1749 "BmpSupport.c" } -PhotosBmpMetadataWriter* photos_bmp_metadata_writer_new (const gchar* filepath) { +PhotosBmpMetadataWriter* +photos_bmp_metadata_writer_new (const gchar* filepath) +{ #line 133 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return photos_bmp_metadata_writer_construct (PHOTOS_TYPE_BMP_METADATA_WRITER, filepath); -#line 1625 "BmpSupport.c" +#line 1758 "BmpSupport.c" } -static void photos_bmp_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error) { +static void +photos_bmp_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, + PhotoMetadata* metadata, + GError** error) +{ PhotosBmpMetadataWriter * self; #line 137 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_METADATA_WRITER, PhotosBmpMetadataWriter); #line 137 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_if_fail (IS_PHOTO_METADATA (metadata)); -#line 1635 "BmpSupport.c" +#line 1772 "BmpSupport.c" } -static void photos_bmp_metadata_writer_class_init (PhotosBmpMetadataWriterClass * klass) { +static void +photos_bmp_metadata_writer_class_init (PhotosBmpMetadataWriterClass * klass) +{ #line 132 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" photos_bmp_metadata_writer_parent_class = g_type_class_peek_parent (klass); #line 132 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) photos_bmp_metadata_writer_real_write_metadata; -#line 1644 "BmpSupport.c" +#line 1783 "BmpSupport.c" } -static void photos_bmp_metadata_writer_instance_init (PhotosBmpMetadataWriter * self) { +static void +photos_bmp_metadata_writer_instance_init (PhotosBmpMetadataWriter * self) +{ } -GType photos_bmp_metadata_writer_get_type (void) { +GType +photos_bmp_metadata_writer_get_type (void) +{ static volatile gsize photos_bmp_metadata_writer_type_id__volatile = 0; if (g_once_init_enter (&photos_bmp_metadata_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosBmpMetadataWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_bmp_metadata_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosBmpMetadataWriter), 0, (GInstanceInitFunc) photos_bmp_metadata_writer_instance_init, NULL }; @@ -1660,7 +1803,9 @@ GType photos_bmp_metadata_writer_get_type (void) { } -void photos_bmp_file_format_driver_init (void) { +void +photos_bmp_file_format_driver_init (void) +{ PhotosBmpFileFormatDriver* _tmp0_; #line 146 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0_ = photos_bmp_file_format_driver_new (); @@ -1670,18 +1815,22 @@ void photos_bmp_file_format_driver_init (void) { photos_bmp_file_format_driver_instance = _tmp0_; #line 147 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" photos_bmp_file_format_properties_init (); -#line 1674 "BmpSupport.c" +#line 1819 "BmpSupport.c" } -static gpointer _photo_file_format_driver_ref0 (gpointer self) { +static gpointer +_photo_file_format_driver_ref0 (gpointer self) +{ #line 151 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return self ? photo_file_format_driver_ref (self) : NULL; -#line 1681 "BmpSupport.c" +#line 1828 "BmpSupport.c" } -PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_get_instance (void) { +PhotosBmpFileFormatDriver* +photos_bmp_file_format_driver_get_instance (void) +{ PhotosBmpFileFormatDriver* result = NULL; PhotosBmpFileFormatDriver* _tmp0_; PhotosBmpFileFormatDriver* _tmp1_; @@ -1693,11 +1842,13 @@ PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_get_instance (void) { result = _tmp1_; #line 151 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1697 "BmpSupport.c" +#line 1846 "BmpSupport.c" } -static PhotoFileFormatProperties* photos_bmp_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) { +static PhotoFileFormatProperties* +photos_bmp_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) +{ PhotosBmpFileFormatDriver * self; PhotoFileFormatProperties* result = NULL; PhotosBmpFileFormatProperties* _tmp0_; @@ -1709,32 +1860,34 @@ static PhotoFileFormatProperties* photos_bmp_file_format_driver_real_get_propert result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties); #line 155 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1713 "BmpSupport.c" +#line 1864 "BmpSupport.c" } -static PhotoFileReader* photos_bmp_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileReader* +photos_bmp_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath) +{ PhotosBmpFileFormatDriver * self; PhotoFileReader* result = NULL; - const gchar* _tmp0_; - PhotosBmpReader* _tmp1_; + PhotosBmpReader* _tmp0_; #line 158 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver); #line 158 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 159 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = filepath; -#line 159 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp1_ = photos_bmp_reader_new (_tmp0_); + _tmp0_ = photos_bmp_reader_new (filepath); #line 159 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_READER, PhotoFileReader); #line 159 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1734 "BmpSupport.c" +#line 1885 "BmpSupport.c" } -static gboolean photos_bmp_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) { +static gboolean +photos_bmp_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) +{ PhotosBmpFileFormatDriver * self; gboolean result = FALSE; #line 162 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1743,11 +1896,13 @@ static gboolean photos_bmp_file_format_driver_real_can_write_image (PhotoFileFor result = TRUE; #line 163 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1747 "BmpSupport.c" +#line 1900 "BmpSupport.c" } -static gboolean photos_bmp_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) { +static gboolean +photos_bmp_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) +{ PhotosBmpFileFormatDriver * self; gboolean result = FALSE; #line 166 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1756,77 +1911,77 @@ static gboolean photos_bmp_file_format_driver_real_can_write_metadata (PhotoFile result = FALSE; #line 167 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1760 "BmpSupport.c" +#line 1915 "BmpSupport.c" } -static PhotoFileWriter* photos_bmp_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileWriter* +photos_bmp_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ PhotosBmpFileFormatDriver * self; PhotoFileWriter* result = NULL; - const gchar* _tmp0_; - PhotosBmpWriter* _tmp1_; + PhotosBmpWriter* _tmp0_; #line 170 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver); #line 170 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 171 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = filepath; + _tmp0_ = photos_bmp_writer_new (filepath); #line 171 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp1_ = photos_bmp_writer_new (_tmp0_); -#line 171 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter); #line 171 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1781 "BmpSupport.c" +#line 1936 "BmpSupport.c" } -static PhotoFileMetadataWriter* photos_bmp_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileMetadataWriter* +photos_bmp_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ PhotosBmpFileFormatDriver * self; PhotoFileMetadataWriter* result = NULL; - const gchar* _tmp0_; - PhotosBmpMetadataWriter* _tmp1_; + PhotosBmpMetadataWriter* _tmp0_; #line 174 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver); #line 174 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 175 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = filepath; -#line 175 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp1_ = photos_bmp_metadata_writer_new (_tmp0_); + _tmp0_ = photos_bmp_metadata_writer_new (filepath); #line 175 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter); #line 175 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1802 "BmpSupport.c" +#line 1957 "BmpSupport.c" } -static PhotoFileSniffer* photos_bmp_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) { +static PhotoFileSniffer* +photos_bmp_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options) +{ PhotosBmpFileFormatDriver * self; PhotoFileSniffer* result = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; - PhotosBmpSniffer* _tmp2_; + PhotosBmpSniffer* _tmp0_; #line 178 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver); #line 178 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 179 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = file; -#line 179 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp1_ = options; -#line 179 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp2_ = photos_bmp_sniffer_new (_tmp0_, _tmp1_); + _tmp0_ = photos_bmp_sniffer_new (file, options); #line 179 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); #line 179 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1826 "BmpSupport.c" +#line 1979 "BmpSupport.c" } -static PhotoMetadata* photos_bmp_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) { +static PhotoMetadata* +photos_bmp_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) +{ PhotosBmpFileFormatDriver * self; PhotoMetadata* result = NULL; PhotoMetadata* _tmp0_; @@ -1838,28 +1993,34 @@ static PhotoMetadata* photos_bmp_file_format_driver_real_create_metadata (PhotoF result = _tmp0_; #line 183 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1842 "BmpSupport.c" +#line 1997 "BmpSupport.c" } -PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_construct (GType object_type) { +PhotosBmpFileFormatDriver* +photos_bmp_file_format_driver_construct (GType object_type) +{ PhotosBmpFileFormatDriver* self = NULL; #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = (PhotosBmpFileFormatDriver*) photo_file_format_driver_construct (object_type); #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return self; -#line 1852 "BmpSupport.c" +#line 2009 "BmpSupport.c" } -PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_new (void) { +PhotosBmpFileFormatDriver* +photos_bmp_file_format_driver_new (void) +{ #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return photos_bmp_file_format_driver_construct (PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER); -#line 1859 "BmpSupport.c" +#line 2018 "BmpSupport.c" } -static void photos_bmp_file_format_driver_class_init (PhotosBmpFileFormatDriverClass * klass) { +static void +photos_bmp_file_format_driver_class_init (PhotosBmpFileFormatDriverClass * klass) +{ #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" photos_bmp_file_format_driver_parent_class = g_type_class_peek_parent (klass); #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1880,25 +2041,31 @@ static void photos_bmp_file_format_driver_class_init (PhotosBmpFileFormatDriverC ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) photos_bmp_file_format_driver_real_create_sniffer; #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*) (PhotoFileFormatDriver *)) photos_bmp_file_format_driver_real_create_metadata; -#line 1884 "BmpSupport.c" +#line 2045 "BmpSupport.c" } -static void photos_bmp_file_format_driver_instance_init (PhotosBmpFileFormatDriver * self) { +static void +photos_bmp_file_format_driver_instance_init (PhotosBmpFileFormatDriver * self) +{ } -static void photos_bmp_file_format_driver_finalize (PhotoFileFormatDriver * obj) { +static void +photos_bmp_file_format_driver_finalize (PhotoFileFormatDriver * obj) +{ PhotosBmpFileFormatDriver * self; #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver); #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" PHOTO_FILE_FORMAT_DRIVER_CLASS (photos_bmp_file_format_driver_parent_class)->finalize (obj); -#line 1898 "BmpSupport.c" +#line 2063 "BmpSupport.c" } -GType photos_bmp_file_format_driver_get_type (void) { +GType +photos_bmp_file_format_driver_get_type (void) +{ static volatile gsize photos_bmp_file_format_driver_type_id__volatile = 0; if (g_once_init_enter (&photos_bmp_file_format_driver_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosBmpFileFormatDriverClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_bmp_file_format_driver_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosBmpFileFormatDriver), 0, (GInstanceInitFunc) photos_bmp_file_format_driver_instance_init, NULL }; diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c index 304cc1a..25539cc 100644 --- a/src/photos/GRaw.c +++ b/src/photos/GRaw.c @@ -1,4 +1,4 @@ -/* GRaw.c generated by valac 0.36.6, the Vala compiler +/* GRaw.c generated by valac 0.40.4, the Vala compiler * generated from GRaw.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -179,20 +180,31 @@ GType graw_interpolation_quality_get_type (void) G_GNUC_CONST; GType graw_use_camera_matrix_get_type (void) G_GNUC_CONST; gpointer graw_processed_image_ref (gpointer instance); void graw_processed_image_unref (gpointer instance); -GParamSpec* graw_param_spec_processed_image (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void graw_value_set_processed_image (GValue* value, gpointer v_object); -void graw_value_take_processed_image (GValue* value, gpointer v_object); +GParamSpec* graw_param_spec_processed_image (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void graw_value_set_processed_image (GValue* value, + gpointer v_object); +void graw_value_take_processed_image (GValue* value, + gpointer v_object); gpointer graw_value_get_processed_image (const GValue* value); GType graw_processed_image_get_type (void) G_GNUC_CONST; #define GRAW_PROCESSED_IMAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GRAW_TYPE_PROCESSED_IMAGE, GRawProcessedImagePrivate)) -enum { - GRAW_PROCESSED_IMAGE_DUMMY_PROPERTY -}; -GRawProcessedImage* graw_processed_image_new (libraw_data_t* proc, GError** error); -GRawProcessedImage* graw_processed_image_construct (GType object_type, libraw_data_t* proc, GError** error); -void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GError** error); -GRawProcessedImage* graw_processed_image_new_from_thumb (libraw_data_t* proc, GError** error); -GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type, libraw_data_t* proc, GError** error); +GRawProcessedImage* graw_processed_image_new (libraw_data_t* proc, + GError** error); +GRawProcessedImage* graw_processed_image_construct (GType object_type, + libraw_data_t* proc, + GError** error); +void graw_throw_exception (const gchar* caller, + enum LibRaw_errors _result_, + GError** error); +GRawProcessedImage* graw_processed_image_new_from_thumb (libraw_data_t* proc, + GError** error); +GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type, + libraw_data_t* proc, + GError** error); GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self); gushort graw_processed_image_get_width (GRawProcessedImage* self); gushort graw_processed_image_get_height (GRawProcessedImage* self); @@ -203,38 +215,60 @@ guint graw_processed_image_get_data_size (GRawProcessedImage* self); static void graw_processed_image_finalize (GRawProcessedImage * obj); gpointer graw_processor_ref (gpointer instance); void graw_processor_unref (gpointer instance); -GParamSpec* graw_param_spec_processor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void graw_value_set_processor (GValue* value, gpointer v_object); -void graw_value_take_processor (GValue* value, gpointer v_object); +GParamSpec* graw_param_spec_processor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void graw_value_set_processor (GValue* value, + gpointer v_object); +void graw_value_take_processor (GValue* value, + gpointer v_object); gpointer graw_value_get_processor (const GValue* value); GType graw_processor_get_type (void) G_GNUC_CONST; #define GRAW_PROCESSOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GRAW_TYPE_PROCESSOR, GRawProcessorPrivate)) -enum { - GRAW_PROCESSOR_DUMMY_PROPERTY -}; GRawProcessor* graw_processor_new (enum LibRaw_constructor_flags options); -GRawProcessor* graw_processor_construct (GType object_type, enum LibRaw_constructor_flags options); -void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error); +GRawProcessor* graw_processor_construct (GType object_type, + enum LibRaw_constructor_flags options); +void graw_processor_adjust_sizes_info_only (GRawProcessor* self, + GError** error); libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self); libraw_iparams_t graw_processor_get_image_params (GRawProcessor* self); libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self); libraw_thumbnail_t graw_processor_get_thumbnail (GRawProcessor* self); -GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** error); -GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError** error); -void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer_length1, GError** error); -void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GError** error); -void graw_processor_process (GRawProcessor* self, GError** error); -void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename, GError** error); -void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GError** error); +GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, + GError** error); +GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, + GError** error); +void graw_processor_open_buffer (GRawProcessor* self, + guint8* buffer, + int buffer_length1, + GError** error); +void graw_processor_open_file (GRawProcessor* self, + const gchar* filename, + GError** error); +void graw_processor_process (GRawProcessor* self, + GError** error); +void graw_processor_ppm_tiff_writer (GRawProcessor* self, + const gchar* filename, + GError** error); +void graw_processor_thumb_writer (GRawProcessor* self, + const gchar* filename, + GError** error); void graw_processor_recycle (GRawProcessor* self); -void graw_processor_unpack (GRawProcessor* self, GError** error); -void graw_processor_unpack_thumb (GRawProcessor* self, GError** error); -void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean half_size); +void graw_processor_unpack (GRawProcessor* self, + GError** error); +void graw_processor_unpack_thumb (GRawProcessor* self, + GError** error); +void graw_processor_configure_for_rgb_display (GRawProcessor* self, + gboolean half_size); libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self); static void graw_processor_finalize (GRawProcessor * obj); -GType graw_colorspace_get_type (void) { +GType +graw_colorspace_get_type (void) +{ static volatile gsize graw_colorspace_type_id__volatile = 0; if (g_once_init_enter (&graw_colorspace_type_id__volatile)) { static const GEnumValue values[] = {{GRAW_COLORSPACE_RAW, "GRAW_COLORSPACE_RAW", "raw"}, {GRAW_COLORSPACE_SRGB, "GRAW_COLORSPACE_SRGB", "srgb"}, {GRAW_COLORSPACE_ADOBE, "GRAW_COLORSPACE_ADOBE", "adobe"}, {GRAW_COLORSPACE_WIDE, "GRAW_COLORSPACE_WIDE", "wide"}, {GRAW_COLORSPACE_PROPHOTO, "GRAW_COLORSPACE_PROPHOTO", "prophoto"}, {GRAW_COLORSPACE_XYZ, "GRAW_COLORSPACE_XYZ", "xyz"}, {0, NULL, NULL}}; @@ -246,12 +280,16 @@ GType graw_colorspace_get_type (void) { } -GQuark graw_exception_quark (void) { +GQuark +graw_exception_quark (void) +{ return g_quark_from_static_string ("graw_exception-quark"); } -GType graw_flip_get_type (void) { +GType +graw_flip_get_type (void) +{ static volatile gsize graw_flip_type_id__volatile = 0; if (g_once_init_enter (&graw_flip_type_id__volatile)) { static const GEnumValue values[] = {{GRAW_FLIP_FROM_SOURCE, "GRAW_FLIP_FROM_SOURCE", "from-source"}, {GRAW_FLIP_NONE, "GRAW_FLIP_NONE", "none"}, {GRAW_FLIP_UPSIDE_DOWN, "GRAW_FLIP_UPSIDE_DOWN", "upside-down"}, {GRAW_FLIP_COUNTERCLOCKWISE, "GRAW_FLIP_COUNTERCLOCKWISE", "counterclockwise"}, {GRAW_FLIP_CLOCKWISE, "GRAW_FLIP_CLOCKWISE", "clockwise"}, {0, NULL, NULL}}; @@ -263,7 +301,9 @@ GType graw_flip_get_type (void) { } -GType graw_fuji_rotate_get_type (void) { +GType +graw_fuji_rotate_get_type (void) +{ static volatile gsize graw_fuji_rotate_type_id__volatile = 0; if (g_once_init_enter (&graw_fuji_rotate_type_id__volatile)) { static const GEnumValue values[] = {{GRAW_FUJI_ROTATE_USE, "GRAW_FUJI_ROTATE_USE", "use"}, {GRAW_FUJI_ROTATE_DONT_USE, "GRAW_FUJI_ROTATE_DONT_USE", "dont-use"}, {0, NULL, NULL}}; @@ -275,7 +315,9 @@ GType graw_fuji_rotate_get_type (void) { } -GType graw_highlight_mode_get_type (void) { +GType +graw_highlight_mode_get_type (void) +{ static volatile gsize graw_highlight_mode_type_id__volatile = 0; if (g_once_init_enter (&graw_highlight_mode_type_id__volatile)) { static const GEnumValue values[] = {{GRAW_HIGHLIGHT_MODE_CLIP, "GRAW_HIGHLIGHT_MODE_CLIP", "clip"}, {GRAW_HIGHLIGHT_MODE_UNCLIP, "GRAW_HIGHLIGHT_MODE_UNCLIP", "unclip"}, {GRAW_HIGHLIGHT_MODE_BLEND, "GRAW_HIGHLIGHT_MODE_BLEND", "blend"}, {GRAW_HIGHLIGHT_MODE_REBUILD, "GRAW_HIGHLIGHT_MODE_REBUILD", "rebuild"}, {0, NULL, NULL}}; @@ -287,7 +329,9 @@ GType graw_highlight_mode_get_type (void) { } -GType graw_interpolation_quality_get_type (void) { +GType +graw_interpolation_quality_get_type (void) +{ static volatile gsize graw_interpolation_quality_type_id__volatile = 0; if (g_once_init_enter (&graw_interpolation_quality_type_id__volatile)) { static const GEnumValue values[] = {{GRAW_INTERPOLATION_QUALITY_LINEAR, "GRAW_INTERPOLATION_QUALITY_LINEAR", "linear"}, {GRAW_INTERPOLATION_QUALITY_VNG, "GRAW_INTERPOLATION_QUALITY_VNG", "vng"}, {GRAW_INTERPOLATION_QUALITY_PPG, "GRAW_INTERPOLATION_QUALITY_PPG", "ppg"}, {GRAW_INTERPOLATION_QUALITY_AHD, "GRAW_INTERPOLATION_QUALITY_AHD", "ahd"}, {0, NULL, NULL}}; @@ -299,7 +343,9 @@ GType graw_interpolation_quality_get_type (void) { } -GType graw_use_camera_matrix_get_type (void) { +GType +graw_use_camera_matrix_get_type (void) +{ static volatile gsize graw_use_camera_matrix_type_id__volatile = 0; if (g_once_init_enter (&graw_use_camera_matrix_type_id__volatile)) { static const GEnumValue values[] = {{GRAW_USE_CAMERA_MATRIX_IGNORE, "GRAW_USE_CAMERA_MATRIX_IGNORE", "ignore"}, {GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_PROFILE, "GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_PROFILE", "embedded-color-profile"}, {GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_DATA, "GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_DATA", "embedded-color-data"}, {0, NULL, NULL}}; @@ -311,27 +357,30 @@ GType graw_use_camera_matrix_get_type (void) { } -GRawProcessedImage* graw_processed_image_construct (GType object_type, libraw_data_t* proc, GError** error) { +GRawProcessedImage* +graw_processed_image_construct (GType object_type, + libraw_data_t* proc, + GError** error) +{ GRawProcessedImage* self = NULL; enum LibRaw_errors _result_ = 0; - libraw_data_t* _tmp0_; - libraw_processed_image_t* _tmp1_; - enum LibRaw_errors _tmp2_; + libraw_processed_image_t* _tmp0_; + enum LibRaw_errors _tmp1_; + libraw_processed_image_t* _tmp2_; libraw_processed_image_t* _tmp3_; - libraw_processed_image_t* _tmp4_; - guint8* _tmp5_; - gint _tmp5__length1; - libraw_processed_image_t* _tmp6_; - gushort _tmp7_; - libraw_processed_image_t* _tmp8_; - gushort _tmp9_; - libraw_processed_image_t* _tmp10_; - gushort _tmp11_; - libraw_processed_image_t* _tmp12_; - gushort _tmp13_; - libraw_processed_image_t* _tmp14_; - gushort _tmp15_; - GdkPixbuf* _tmp16_; + guint8* _tmp4_; + gint _tmp4__length1; + libraw_processed_image_t* _tmp5_; + gushort _tmp6_; + libraw_processed_image_t* _tmp7_; + gushort _tmp8_; + libraw_processed_image_t* _tmp9_; + gushort _tmp10_; + libraw_processed_image_t* _tmp11_; + gushort _tmp12_; + libraw_processed_image_t* _tmp13_; + gushort _tmp14_; + GdkPixbuf* _tmp15_; GError * _inner_error_ = NULL; #line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (proc != NULL, NULL); @@ -340,17 +389,15 @@ GRawProcessedImage* graw_processed_image_construct (GType object_type, libraw_da #line 113 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _result_ = LIBRAW_SUCCESS; #line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp0_ = proc; -#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_dcraw_make_mem_image (_tmp0_, &_result_); + _tmp0_ = libraw_dcraw_make_mem_image (proc, &_result_); #line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _free0 (self->priv->image); #line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - self->priv->image = _tmp1_; + self->priv->image = _tmp0_; #line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp2_ = _result_; + _tmp1_ = _result_; #line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - graw_throw_exception ("ProcessedImage", _tmp2_, &_inner_error_); + graw_throw_exception ("ProcessedImage", _tmp1_, &_inner_error_); #line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -361,7 +408,7 @@ GRawProcessedImage* graw_processed_image_construct (GType object_type, libraw_da _graw_processed_image_unref0 (self); #line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 365 "GRaw.c" +#line 412 "GRaw.c" } else { #line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -369,81 +416,87 @@ GRawProcessedImage* graw_processed_image_construct (GType object_type, libraw_da g_clear_error (&_inner_error_); #line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 373 "GRaw.c" +#line 420 "GRaw.c" } } #line 116 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp3_ = self->priv->image; + _tmp2_ = self->priv->image; #line 116 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _vala_assert (_tmp3_ != NULL, "image != null"); + _vala_assert (_tmp2_ != NULL, "image != null"); #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp4_ = self->priv->image; + _tmp3_ = self->priv->image; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp5_ = _tmp4_->data; + _tmp4_ = _tmp3_->data; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp5__length1 = _tmp4_->data_size; + _tmp4__length1 = _tmp3_->data_size; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp6_ = self->priv->image; + _tmp5_ = self->priv->image; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp7_ = _tmp6_->bits; + _tmp6_ = _tmp5_->bits; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp8_ = self->priv->image; + _tmp7_ = self->priv->image; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp9_ = _tmp8_->width; + _tmp8_ = _tmp7_->width; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp10_ = self->priv->image; + _tmp9_ = self->priv->image; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp11_ = _tmp10_->height; + _tmp10_ = _tmp9_->height; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp12_ = self->priv->image; + _tmp11_ = self->priv->image; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp13_ = _tmp12_->width; + _tmp12_ = _tmp11_->width; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp14_ = self->priv->image; + _tmp13_ = self->priv->image; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp15_ = _tmp14_->colors; + _tmp14_ = _tmp13_->colors; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp16_ = gdk_pixbuf_new_from_data (_tmp5_, GDK_COLORSPACE_RGB, FALSE, (gint) _tmp7_, (gint) _tmp9_, (gint) _tmp11_, (gint) (_tmp13_ * _tmp15_), (GdkPixbufDestroyNotify) NULL, NULL); + _tmp15_ = gdk_pixbuf_new_from_data (_tmp4_, GDK_COLORSPACE_RGB, FALSE, (gint) _tmp6_, (gint) _tmp8_, (gint) _tmp10_, (gint) (_tmp12_ * _tmp14_), (GdkPixbufDestroyNotify) NULL, NULL); #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_object_unref0 (self->priv->pixbuf); #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - self->priv->pixbuf = _tmp16_; + self->priv->pixbuf = _tmp15_; #line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return self; -#line 414 "GRaw.c" +#line 461 "GRaw.c" } -GRawProcessedImage* graw_processed_image_new (libraw_data_t* proc, GError** error) { +GRawProcessedImage* +graw_processed_image_new (libraw_data_t* proc, + GError** error) +{ #line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return graw_processed_image_construct (GRAW_TYPE_PROCESSED_IMAGE, proc, error); -#line 421 "GRaw.c" +#line 471 "GRaw.c" } -GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type, libraw_data_t* proc, GError** error) { +GRawProcessedImage* +graw_processed_image_construct_from_thumb (GType object_type, + libraw_data_t* proc, + GError** error) +{ GRawProcessedImage* self = NULL; enum LibRaw_errors _result_ = 0; - libraw_data_t* _tmp0_; - libraw_processed_image_t* _tmp1_; - enum LibRaw_errors _tmp2_; - libraw_processed_image_t* _tmp3_; - libraw_processed_image_t* _tmp17_; - GdkPixbuf* _tmp18_; + libraw_processed_image_t* _tmp0_; + enum LibRaw_errors _tmp1_; + libraw_processed_image_t* _tmp2_; + libraw_processed_image_t* _tmp16_; + GdkPixbuf* _tmp17_; + gint _tmp18_; gint _tmp19_; - gint _tmp20_; - libraw_processed_image_t* _tmp21_; - GdkPixbuf* _tmp22_; + libraw_processed_image_t* _tmp20_; + GdkPixbuf* _tmp21_; + gint _tmp22_; gint _tmp23_; - gint _tmp24_; - libraw_processed_image_t* _tmp25_; - GdkPixbuf* _tmp26_; + libraw_processed_image_t* _tmp24_; + GdkPixbuf* _tmp25_; + gint _tmp26_; gint _tmp27_; - gint _tmp28_; - libraw_processed_image_t* _tmp29_; - GdkPixbuf* _tmp30_; + libraw_processed_image_t* _tmp28_; + GdkPixbuf* _tmp29_; + gint _tmp30_; gint _tmp31_; - gint _tmp32_; GError * _inner_error_ = NULL; #line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (proc != NULL, NULL); @@ -452,17 +505,15 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type #line 125 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _result_ = LIBRAW_SUCCESS; #line 126 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp0_ = proc; -#line 126 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_dcraw_make_mem_thumb (_tmp0_, &_result_); + _tmp0_ = libraw_dcraw_make_mem_thumb (proc, &_result_); #line 126 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _free0 (self->priv->image); #line 126 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - self->priv->image = _tmp1_; + self->priv->image = _tmp0_; #line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp2_ = _result_; + _tmp1_ = _result_; #line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - graw_throw_exception ("ProcessedImage.from_thumb", _tmp2_, &_inner_error_); + graw_throw_exception ("ProcessedImage.from_thumb", _tmp1_, &_inner_error_); #line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -473,7 +524,7 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type _graw_processed_image_unref0 (self); #line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 477 "GRaw.c" +#line 528 "GRaw.c" } else { #line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -481,94 +532,94 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type g_clear_error (&_inner_error_); #line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 485 "GRaw.c" +#line 536 "GRaw.c" } } #line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp3_ = self->priv->image; + _tmp2_ = self->priv->image; #line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _vala_assert (_tmp3_ != NULL, "image != null"); -#line 492 "GRaw.c" + _vala_assert (_tmp2_ != NULL, "image != null"); +#line 543 "GRaw.c" { GBytes* bytes = NULL; - libraw_processed_image_t* _tmp4_; - guint8* _tmp5_; - gint _tmp5__length1; - GBytes* _tmp6_; - GdkPixbuf* _tmp7_ = NULL; - GBytes* _tmp8_; + libraw_processed_image_t* _tmp3_; + guint8* _tmp4_; + gint _tmp4__length1; + GBytes* _tmp5_; + GdkPixbuf* _tmp6_ = NULL; + GBytes* _tmp7_; + GMemoryInputStream* _tmp8_; GMemoryInputStream* _tmp9_; - GMemoryInputStream* _tmp10_; + GdkPixbuf* _tmp10_; GdkPixbuf* _tmp11_; GdkPixbuf* _tmp12_; - GdkPixbuf* _tmp13_; #line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp4_ = self->priv->image; + _tmp3_ = self->priv->image; #line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp5_ = _tmp4_->data; + _tmp4_ = _tmp3_->data; #line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp5__length1 = _tmp4_->data_size; + _tmp4__length1 = _tmp3_->data_size; #line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp6_ = g_bytes_new_static (_tmp5_, _tmp5__length1); + _tmp5_ = g_bytes_new_static (_tmp4_, _tmp4__length1); #line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - bytes = _tmp6_; + bytes = _tmp5_; #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp8_ = bytes; + _tmp7_ = bytes; #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp9_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp8_); + _tmp8_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp7_); #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp11_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); + _tmp10_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp9_); #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp7_ = _tmp12_; + _tmp6_ = _tmp11_; #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_bytes_unref0 (bytes); -#line 534 "GRaw.c" +#line 585 "GRaw.c" goto __catch33_g_error; } #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp13_ = _tmp7_; + _tmp12_ = _tmp6_; #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp7_ = NULL; + _tmp6_ = NULL; #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_object_unref0 (self->priv->pixbuf); #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - self->priv->pixbuf = _tmp13_; + self->priv->pixbuf = _tmp12_; #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_bytes_unref0 (bytes); -#line 549 "GRaw.c" +#line 600 "GRaw.c" } goto __finally33; __catch33_g_error: { GError* err = NULL; - GError* _tmp14_; - const gchar* _tmp15_; - GError* _tmp16_; + GError* _tmp13_; + const gchar* _tmp14_; + GError* _tmp15_; #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" err = _inner_error_; #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _inner_error_ = NULL; #line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp14_ = err; + _tmp13_ = err; #line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp15_ = _tmp14_->message; + _tmp14_ = _tmp13_->message; #line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp16_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_THUMBNAIL, _tmp15_); + _tmp15_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_THUMBNAIL, _tmp14_); #line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp16_; + _inner_error_ = _tmp15_; #line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_error_free0 (err); -#line 572 "GRaw.c" +#line 623 "GRaw.c" goto __finally33; } __finally33: @@ -582,7 +633,7 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type _graw_processed_image_unref0 (self); #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 586 "GRaw.c" +#line 637 "GRaw.c" } else { #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -590,63 +641,68 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type g_clear_error (&_inner_error_); #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 594 "GRaw.c" +#line 645 "GRaw.c" } } #line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp17_ = self->priv->image; + _tmp16_ = self->priv->image; #line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp18_ = self->priv->pixbuf; + _tmp17_ = self->priv->pixbuf; #line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp19_ = gdk_pixbuf_get_width (_tmp18_); + _tmp18_ = gdk_pixbuf_get_width (_tmp17_); #line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp17_->width = (gushort) _tmp20_; + _tmp16_->width = (gushort) _tmp19_; #line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp21_ = self->priv->image; + _tmp20_ = self->priv->image; #line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp22_ = self->priv->pixbuf; + _tmp21_ = self->priv->pixbuf; #line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp23_ = gdk_pixbuf_get_height (_tmp22_); + _tmp22_ = gdk_pixbuf_get_height (_tmp21_); #line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp21_->height = (gushort) _tmp24_; + _tmp20_->height = (gushort) _tmp23_; #line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp25_ = self->priv->image; + _tmp24_ = self->priv->image; #line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp26_ = self->priv->pixbuf; + _tmp25_ = self->priv->pixbuf; #line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp27_ = gdk_pixbuf_get_n_channels (_tmp26_); + _tmp26_ = gdk_pixbuf_get_n_channels (_tmp25_); #line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp28_ = _tmp27_; + _tmp27_ = _tmp26_; #line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp25_->colors = (gushort) _tmp28_; + _tmp24_->colors = (gushort) _tmp27_; #line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp29_ = self->priv->image; + _tmp28_ = self->priv->image; #line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp30_ = self->priv->pixbuf; + _tmp29_ = self->priv->pixbuf; #line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp31_ = gdk_pixbuf_get_bits_per_sample (_tmp30_); + _tmp30_ = gdk_pixbuf_get_bits_per_sample (_tmp29_); #line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp32_ = _tmp31_; + _tmp31_ = _tmp30_; #line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp29_->bits = (gushort) _tmp32_; + _tmp28_->bits = (gushort) _tmp31_; #line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return self; -#line 639 "GRaw.c" +#line 690 "GRaw.c" } -GRawProcessedImage* graw_processed_image_new_from_thumb (libraw_data_t* proc, GError** error) { +GRawProcessedImage* +graw_processed_image_new_from_thumb (libraw_data_t* proc, + GError** error) +{ #line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return graw_processed_image_construct_from_thumb (GRAW_TYPE_PROCESSED_IMAGE, proc, error); -#line 646 "GRaw.c" +#line 700 "GRaw.c" } -GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self) { +GdkPixbuf* +graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_; GdkPixbuf* _tmp1_; @@ -660,11 +716,13 @@ GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self) { result = _tmp1_; #line 150 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 664 "GRaw.c" +#line 720 "GRaw.c" } -gushort graw_processed_image_get_width (GRawProcessedImage* self) { +gushort +graw_processed_image_get_width (GRawProcessedImage* self) +{ gushort result; libraw_processed_image_t* _tmp0_; gushort _tmp1_; @@ -678,11 +736,13 @@ gushort graw_processed_image_get_width (GRawProcessedImage* self) { result = _tmp1_; #line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 682 "GRaw.c" +#line 740 "GRaw.c" } -gushort graw_processed_image_get_height (GRawProcessedImage* self) { +gushort +graw_processed_image_get_height (GRawProcessedImage* self) +{ gushort result; libraw_processed_image_t* _tmp0_; gushort _tmp1_; @@ -696,11 +756,13 @@ gushort graw_processed_image_get_height (GRawProcessedImage* self) { result = _tmp1_; #line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 700 "GRaw.c" +#line 760 "GRaw.c" } -gushort graw_processed_image_get_colors (GRawProcessedImage* self) { +gushort +graw_processed_image_get_colors (GRawProcessedImage* self) +{ gushort result; libraw_processed_image_t* _tmp0_; gushort _tmp1_; @@ -714,11 +776,13 @@ gushort graw_processed_image_get_colors (GRawProcessedImage* self) { result = _tmp1_; #line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 718 "GRaw.c" +#line 780 "GRaw.c" } -gushort graw_processed_image_get_bits (GRawProcessedImage* self) { +gushort +graw_processed_image_get_bits (GRawProcessedImage* self) +{ gushort result; libraw_processed_image_t* _tmp0_; gushort _tmp1_; @@ -732,11 +796,13 @@ gushort graw_processed_image_get_bits (GRawProcessedImage* self) { result = _tmp1_; #line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 736 "GRaw.c" +#line 800 "GRaw.c" } -guint8* graw_processed_image_get_data (GRawProcessedImage* self) { +guint8* +graw_processed_image_get_data (GRawProcessedImage* self) +{ guint8* result; libraw_processed_image_t* _tmp0_; guint8* _tmp1_; @@ -753,11 +819,13 @@ guint8* graw_processed_image_get_data (GRawProcessedImage* self) { result = _tmp1_; #line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 757 "GRaw.c" +#line 823 "GRaw.c" } -guint graw_processed_image_get_data_size (GRawProcessedImage* self) { +guint +graw_processed_image_get_data_size (GRawProcessedImage* self) +{ guint result; libraw_processed_image_t* _tmp0_; guint _tmp1_; @@ -771,108 +839,133 @@ guint graw_processed_image_get_data_size (GRawProcessedImage* self) { result = _tmp1_; #line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 775 "GRaw.c" +#line 843 "GRaw.c" } -static void graw_value_processed_image_init (GValue* value) { +static void +graw_value_processed_image_init (GValue* value) +{ #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = NULL; -#line 782 "GRaw.c" +#line 852 "GRaw.c" } -static void graw_value_processed_image_free_value (GValue* value) { +static void +graw_value_processed_image_free_value (GValue* value) +{ #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (value->data[0].v_pointer) { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" graw_processed_image_unref (value->data[0].v_pointer); -#line 791 "GRaw.c" +#line 863 "GRaw.c" } } -static void graw_value_processed_image_copy_value (const GValue* src_value, GValue* dest_value) { +static void +graw_value_processed_image_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (src_value->data[0].v_pointer) { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" dest_value->data[0].v_pointer = graw_processed_image_ref (src_value->data[0].v_pointer); -#line 801 "GRaw.c" +#line 876 "GRaw.c" } else { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" dest_value->data[0].v_pointer = NULL; -#line 805 "GRaw.c" +#line 880 "GRaw.c" } } -static gpointer graw_value_processed_image_peek_pointer (const GValue* value) { +static gpointer +graw_value_processed_image_peek_pointer (const GValue* value) +{ #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return value->data[0].v_pointer; -#line 813 "GRaw.c" +#line 890 "GRaw.c" } -static gchar* graw_value_processed_image_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +graw_value_processed_image_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (collect_values[0].v_pointer) { -#line 820 "GRaw.c" +#line 902 "GRaw.c" GRawProcessedImage * object; object = collect_values[0].v_pointer; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (object->parent_instance.g_class == NULL) { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 827 "GRaw.c" +#line 909 "GRaw.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 831 "GRaw.c" +#line 913 "GRaw.c" } #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = graw_processed_image_ref (object); -#line 835 "GRaw.c" +#line 917 "GRaw.c" } else { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = NULL; -#line 839 "GRaw.c" +#line 921 "GRaw.c" } #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 843 "GRaw.c" +#line 925 "GRaw.c" } -static gchar* graw_value_processed_image_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +graw_value_processed_image_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ GRawProcessedImage ** object_p; object_p = collect_values[0].v_pointer; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (!object_p) { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 854 "GRaw.c" +#line 941 "GRaw.c" } #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (!value->data[0].v_pointer) { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" *object_p = NULL; -#line 860 "GRaw.c" +#line 947 "GRaw.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" *object_p = value->data[0].v_pointer; -#line 864 "GRaw.c" +#line 951 "GRaw.c" } else { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" *object_p = graw_processed_image_ref (value->data[0].v_pointer); -#line 868 "GRaw.c" +#line 955 "GRaw.c" } #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 872 "GRaw.c" +#line 959 "GRaw.c" } -GParamSpec* graw_param_spec_processed_image (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +graw_param_spec_processed_image (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ GRawParamSpecProcessedImage* spec; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (g_type_is_a (object_type, GRAW_TYPE_PROCESSED_IMAGE), NULL); @@ -882,20 +975,25 @@ GParamSpec* graw_param_spec_processed_image (const gchar* name, const gchar* nic G_PARAM_SPEC (spec)->value_type = object_type; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return G_PARAM_SPEC (spec); -#line 886 "GRaw.c" +#line 979 "GRaw.c" } -gpointer graw_value_get_processed_image (const GValue* value) { +gpointer +graw_value_get_processed_image (const GValue* value) +{ #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE), NULL); #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return value->data[0].v_pointer; -#line 895 "GRaw.c" +#line 990 "GRaw.c" } -void graw_value_set_processed_image (GValue* value, gpointer v_object) { +void +graw_value_set_processed_image (GValue* value, + gpointer v_object) +{ GRawProcessedImage * old; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE)); @@ -911,22 +1009,25 @@ void graw_value_set_processed_image (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" graw_processed_image_ref (value->data[0].v_pointer); -#line 915 "GRaw.c" +#line 1013 "GRaw.c" } else { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = NULL; -#line 919 "GRaw.c" +#line 1017 "GRaw.c" } #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (old) { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" graw_processed_image_unref (old); -#line 925 "GRaw.c" +#line 1023 "GRaw.c" } } -void graw_value_take_processed_image (GValue* value, gpointer v_object) { +void +graw_value_take_processed_image (GValue* value, + gpointer v_object) +{ GRawProcessedImage * old; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE)); @@ -940,44 +1041,50 @@ void graw_value_take_processed_image (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = v_object; -#line 944 "GRaw.c" +#line 1045 "GRaw.c" } else { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = NULL; -#line 948 "GRaw.c" +#line 1049 "GRaw.c" } #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (old) { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" graw_processed_image_unref (old); -#line 954 "GRaw.c" +#line 1055 "GRaw.c" } } -static void graw_processed_image_class_init (GRawProcessedImageClass * klass) { +static void +graw_processed_image_class_init (GRawProcessedImageClass * klass) +{ #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" graw_processed_image_parent_class = g_type_class_peek_parent (klass); #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" ((GRawProcessedImageClass *) klass)->finalize = graw_processed_image_finalize; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_type_class_add_private (klass, sizeof (GRawProcessedImagePrivate)); -#line 966 "GRaw.c" +#line 1069 "GRaw.c" } -static void graw_processed_image_instance_init (GRawProcessedImage * self) { +static void +graw_processed_image_instance_init (GRawProcessedImage * self) +{ #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self->priv = GRAW_PROCESSED_IMAGE_GET_PRIVATE (self); #line 74 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self->priv->pixbuf = NULL; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self->ref_count = 1; -#line 977 "GRaw.c" +#line 1082 "GRaw.c" } -static void graw_processed_image_finalize (GRawProcessedImage * obj) { +static void +graw_processed_image_finalize (GRawProcessedImage * obj) +{ GRawProcessedImage * self; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GRAW_TYPE_PROCESSED_IMAGE, GRawProcessedImage); @@ -987,11 +1094,13 @@ static void graw_processed_image_finalize (GRawProcessedImage * obj) { _free0 (self->priv->image); #line 74 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_object_unref0 (self->priv->pixbuf); -#line 991 "GRaw.c" +#line 1098 "GRaw.c" } -GType graw_processed_image_get_type (void) { +GType +graw_processed_image_get_type (void) +{ static volatile gsize graw_processed_image_type_id__volatile = 0; if (g_once_init_enter (&graw_processed_image_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { graw_value_processed_image_init, graw_value_processed_image_free_value, graw_value_processed_image_copy_value, graw_value_processed_image_peek_pointer, "p", graw_value_processed_image_collect_value, "p", graw_value_processed_image_lcopy_value }; @@ -1005,18 +1114,22 @@ GType graw_processed_image_get_type (void) { } -gpointer graw_processed_image_ref (gpointer instance) { +gpointer +graw_processed_image_ref (gpointer instance) +{ GRawProcessedImage * self; self = instance; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_atomic_int_inc (&self->ref_count); #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return instance; -#line 1016 "GRaw.c" +#line 1127 "GRaw.c" } -void graw_processed_image_unref (gpointer instance) { +void +graw_processed_image_unref (gpointer instance) +{ GRawProcessedImage * self; self = instance; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1025,50 +1138,52 @@ void graw_processed_image_unref (gpointer instance) { GRAW_PROCESSED_IMAGE_GET_CLASS (self)->finalize (self); #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1029 "GRaw.c" +#line 1142 "GRaw.c" } } -GRawProcessor* graw_processor_construct (GType object_type, enum LibRaw_constructor_flags options) { +GRawProcessor* +graw_processor_construct (GType object_type, + enum LibRaw_constructor_flags options) +{ GRawProcessor* self = NULL; - enum LibRaw_constructor_flags _tmp0_; - libraw_data_t* _tmp1_; + libraw_data_t* _tmp0_; #line 163 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self = (GRawProcessor*) g_type_create_instance (object_type); #line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp0_ = options; -#line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_init (_tmp0_); + _tmp0_ = libraw_init (options); #line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _libraw_close0 (self->priv->proc); #line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - self->priv->proc = _tmp1_; + self->priv->proc = _tmp0_; #line 163 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return self; -#line 1050 "GRaw.c" +#line 1163 "GRaw.c" } -GRawProcessor* graw_processor_new (enum LibRaw_constructor_flags options) { +GRawProcessor* +graw_processor_new (enum LibRaw_constructor_flags options) +{ #line 163 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return graw_processor_construct (GRAW_TYPE_PROCESSOR, options); -#line 1057 "GRaw.c" +#line 1172 "GRaw.c" } -void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error) { +void +graw_processor_adjust_sizes_info_only (GRawProcessor* self, + GError** error) +{ libraw_data_t* _tmp0_; - enum LibRaw_errors _tmp1_; GError * _inner_error_ = NULL; #line 167 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); #line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_adjust_sizes_info_only (_tmp0_); -#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - graw_throw_exception ("adjust_sizes_info_only", _tmp1_, &_inner_error_); + graw_throw_exception ("adjust_sizes_info_only", libraw_adjust_sizes_info_only (_tmp0_), &_inner_error_); #line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1077,7 +1192,7 @@ void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error) g_propagate_error (error, _inner_error_); #line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1081 "GRaw.c" +#line 1196 "GRaw.c" } else { #line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1085,13 +1200,15 @@ void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error) g_clear_error (&_inner_error_); #line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1089 "GRaw.c" +#line 1204 "GRaw.c" } } } -static libraw_imgother_t libraw_get_image_other (libraw_data_t* self) { +static libraw_imgother_t +libraw_get_image_other (libraw_data_t* self) +{ libraw_imgother_t result = {0}; libraw_imgother_t _tmp0_; #line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi" @@ -1100,27 +1217,28 @@ static libraw_imgother_t libraw_get_image_other (libraw_data_t* self) { result = _tmp0_; #line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi" return result; -#line 1104 "GRaw.c" +#line 1221 "GRaw.c" } -libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self) { +libraw_imgother_t +graw_processor_get_image_other (GRawProcessor* self) +{ libraw_imgother_t result = {0}; libraw_data_t* _tmp0_; - libraw_imgother_t _tmp1_; #line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_get_image_other (_tmp0_); -#line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - result = _tmp1_; + result = libraw_get_image_other (_tmp0_); #line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 1120 "GRaw.c" +#line 1236 "GRaw.c" } -static libraw_iparams_t libraw_get_image_params (libraw_data_t* self) { +static libraw_iparams_t +libraw_get_image_params (libraw_data_t* self) +{ libraw_iparams_t result = {0}; libraw_iparams_t _tmp0_; #line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi" @@ -1129,27 +1247,28 @@ static libraw_iparams_t libraw_get_image_params (libraw_data_t* self) { result = _tmp0_; #line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi" return result; -#line 1133 "GRaw.c" +#line 1251 "GRaw.c" } -libraw_iparams_t graw_processor_get_image_params (GRawProcessor* self) { +libraw_iparams_t +graw_processor_get_image_params (GRawProcessor* self) +{ libraw_iparams_t result = {0}; libraw_data_t* _tmp0_; - libraw_iparams_t _tmp1_; #line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_get_image_params (_tmp0_); -#line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - result = _tmp1_; + result = libraw_get_image_params (_tmp0_); #line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 1149 "GRaw.c" +#line 1266 "GRaw.c" } -static libraw_image_sizes_t libraw_get_sizes (libraw_data_t* self) { +static libraw_image_sizes_t +libraw_get_sizes (libraw_data_t* self) +{ libraw_image_sizes_t result = {0}; libraw_image_sizes_t _tmp0_; #line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi" @@ -1158,27 +1277,28 @@ static libraw_image_sizes_t libraw_get_sizes (libraw_data_t* self) { result = _tmp0_; #line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi" return result; -#line 1162 "GRaw.c" +#line 1281 "GRaw.c" } -libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self) { +libraw_image_sizes_t +graw_processor_get_sizes (GRawProcessor* self) +{ libraw_image_sizes_t result = {0}; libraw_data_t* _tmp0_; - libraw_image_sizes_t _tmp1_; #line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_get_sizes (_tmp0_); -#line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - result = _tmp1_; + result = libraw_get_sizes (_tmp0_); #line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 1178 "GRaw.c" +#line 1296 "GRaw.c" } -static libraw_thumbnail_t libraw_get_thumbnail (libraw_data_t* self) { +static libraw_thumbnail_t +libraw_get_thumbnail (libraw_data_t* self) +{ libraw_thumbnail_t result = {0}; libraw_thumbnail_t _tmp0_; #line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi" @@ -1187,27 +1307,29 @@ static libraw_thumbnail_t libraw_get_thumbnail (libraw_data_t* self) { result = _tmp0_; #line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi" return result; -#line 1191 "GRaw.c" +#line 1311 "GRaw.c" } -libraw_thumbnail_t graw_processor_get_thumbnail (GRawProcessor* self) { +libraw_thumbnail_t +graw_processor_get_thumbnail (GRawProcessor* self) +{ libraw_thumbnail_t result = {0}; libraw_data_t* _tmp0_; - libraw_thumbnail_t _tmp1_; #line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_get_thumbnail (_tmp0_); -#line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - result = _tmp1_; + result = libraw_get_thumbnail (_tmp0_); #line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 1207 "GRaw.c" +#line 1326 "GRaw.c" } -GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** error) { +GRawProcessedImage* +graw_processor_make_mem_image (GRawProcessor* self, + GError** error) +{ GRawProcessedImage* result = NULL; GRawProcessedImage* _tmp0_ = NULL; libraw_data_t* _tmp1_; @@ -1230,7 +1352,7 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** g_propagate_error (error, _inner_error_); #line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 1234 "GRaw.c" +#line 1356 "GRaw.c" } else { #line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1238,7 +1360,7 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** g_clear_error (&_inner_error_); #line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 1242 "GRaw.c" +#line 1364 "GRaw.c" } } #line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1251,11 +1373,14 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** _graw_processed_image_unref0 (_tmp0_); #line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 1255 "GRaw.c" +#line 1377 "GRaw.c" } -GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError** error) { +GRawProcessedImage* +graw_processor_make_thumb_image (GRawProcessor* self, + GError** error) +{ GRawProcessedImage* result = NULL; GRawProcessedImage* _tmp0_ = NULL; libraw_data_t* _tmp1_; @@ -1278,7 +1403,7 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError g_propagate_error (error, _inner_error_); #line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 1282 "GRaw.c" +#line 1407 "GRaw.c" } else { #line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1286,7 +1411,7 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError g_clear_error (&_inner_error_); #line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 1290 "GRaw.c" +#line 1415 "GRaw.c" } } #line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1299,28 +1424,24 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError _graw_processed_image_unref0 (_tmp0_); #line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 1303 "GRaw.c" +#line 1428 "GRaw.c" } -void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer_length1, GError** error) { +void +graw_processor_open_buffer (GRawProcessor* self, + guint8* buffer, + int buffer_length1, + GError** error) +{ libraw_data_t* _tmp0_; - guint8* _tmp1_; - gint _tmp1__length1; - enum LibRaw_errors _tmp2_; GError * _inner_error_ = NULL; #line 195 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); #line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = buffer; -#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1__length1 = buffer_length1; -#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp2_ = libraw_open_buffer (_tmp0_, _tmp1_, _tmp1__length1); -#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - graw_throw_exception ("open_buffer", _tmp2_, &_inner_error_); + graw_throw_exception ("open_buffer", libraw_open_buffer (_tmp0_, buffer, buffer_length1), &_inner_error_); #line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1329,7 +1450,7 @@ void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer g_propagate_error (error, _inner_error_); #line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1333 "GRaw.c" +#line 1454 "GRaw.c" } else { #line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1337,16 +1458,18 @@ void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer g_clear_error (&_inner_error_); #line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1341 "GRaw.c" +#line 1462 "GRaw.c" } } } -void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GError** error) { +void +graw_processor_open_file (GRawProcessor* self, + const gchar* filename, + GError** error) +{ libraw_data_t* _tmp0_; - const gchar* _tmp1_; - enum LibRaw_errors _tmp2_; GError * _inner_error_ = NULL; #line 199 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1355,11 +1478,7 @@ void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GErro #line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = filename; -#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp2_ = libraw_open_file (_tmp0_, _tmp1_); -#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - graw_throw_exception ("open_file", _tmp2_, &_inner_error_); + graw_throw_exception ("open_file", libraw_open_file (_tmp0_, filename), &_inner_error_); #line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1368,7 +1487,7 @@ void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GErro g_propagate_error (error, _inner_error_); #line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1372 "GRaw.c" +#line 1491 "GRaw.c" } else { #line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1376,24 +1495,24 @@ void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GErro g_clear_error (&_inner_error_); #line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1380 "GRaw.c" +#line 1499 "GRaw.c" } } } -void graw_processor_process (GRawProcessor* self, GError** error) { +void +graw_processor_process (GRawProcessor* self, + GError** error) +{ libraw_data_t* _tmp0_; - enum LibRaw_errors _tmp1_; GError * _inner_error_ = NULL; #line 203 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); #line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_dcraw_process (_tmp0_); -#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - graw_throw_exception ("process", _tmp1_, &_inner_error_); + graw_throw_exception ("process", libraw_dcraw_process (_tmp0_), &_inner_error_); #line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1402,7 +1521,7 @@ void graw_processor_process (GRawProcessor* self, GError** error) { g_propagate_error (error, _inner_error_); #line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1406 "GRaw.c" +#line 1525 "GRaw.c" } else { #line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1410,16 +1529,18 @@ void graw_processor_process (GRawProcessor* self, GError** error) { g_clear_error (&_inner_error_); #line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1414 "GRaw.c" +#line 1533 "GRaw.c" } } } -void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename, GError** error) { +void +graw_processor_ppm_tiff_writer (GRawProcessor* self, + const gchar* filename, + GError** error) +{ libraw_data_t* _tmp0_; - const gchar* _tmp1_; - enum LibRaw_errors _tmp2_; GError * _inner_error_ = NULL; #line 207 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1428,11 +1549,7 @@ void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename, #line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = filename; -#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp2_ = libraw_dcraw_ppm_tiff_writer (_tmp0_, _tmp1_); -#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - graw_throw_exception ("ppm_tiff_writer", _tmp2_, &_inner_error_); + graw_throw_exception ("ppm_tiff_writer", libraw_dcraw_ppm_tiff_writer (_tmp0_, filename), &_inner_error_); #line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1441,7 +1558,7 @@ void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename, g_propagate_error (error, _inner_error_); #line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1445 "GRaw.c" +#line 1562 "GRaw.c" } else { #line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1449,16 +1566,18 @@ void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename, g_clear_error (&_inner_error_); #line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1453 "GRaw.c" +#line 1570 "GRaw.c" } } } -void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GError** error) { +void +graw_processor_thumb_writer (GRawProcessor* self, + const gchar* filename, + GError** error) +{ libraw_data_t* _tmp0_; - const gchar* _tmp1_; - enum LibRaw_errors _tmp2_; GError * _inner_error_ = NULL; #line 211 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1467,11 +1586,7 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE #line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = filename; -#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp2_ = libraw_dcraw_thumb_writer (_tmp0_, _tmp1_); -#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - graw_throw_exception ("thumb_writer", _tmp2_, &_inner_error_); + graw_throw_exception ("thumb_writer", libraw_dcraw_thumb_writer (_tmp0_, filename), &_inner_error_); #line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1480,7 +1595,7 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE g_propagate_error (error, _inner_error_); #line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1484 "GRaw.c" +#line 1599 "GRaw.c" } else { #line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1488,13 +1603,15 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE g_clear_error (&_inner_error_); #line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1492 "GRaw.c" +#line 1607 "GRaw.c" } } } -void graw_processor_recycle (GRawProcessor* self) { +void +graw_processor_recycle (GRawProcessor* self) +{ libraw_data_t* _tmp0_; #line 215 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1502,22 +1619,22 @@ void graw_processor_recycle (GRawProcessor* self) { _tmp0_ = self->priv->proc; #line 216 "/home/jens/Source/shotwell/src/photos/GRaw.vala" libraw_recycle (_tmp0_); -#line 1506 "GRaw.c" +#line 1623 "GRaw.c" } -void graw_processor_unpack (GRawProcessor* self, GError** error) { +void +graw_processor_unpack (GRawProcessor* self, + GError** error) +{ libraw_data_t* _tmp0_; - enum LibRaw_errors _tmp1_; GError * _inner_error_ = NULL; #line 219 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); #line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_unpack (_tmp0_); -#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - graw_throw_exception ("unpack", _tmp1_, &_inner_error_); + graw_throw_exception ("unpack", libraw_unpack (_tmp0_), &_inner_error_); #line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1526,7 +1643,7 @@ void graw_processor_unpack (GRawProcessor* self, GError** error) { g_propagate_error (error, _inner_error_); #line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1530 "GRaw.c" +#line 1647 "GRaw.c" } else { #line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1534,24 +1651,24 @@ void graw_processor_unpack (GRawProcessor* self, GError** error) { g_clear_error (&_inner_error_); #line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1538 "GRaw.c" +#line 1655 "GRaw.c" } } } -void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) { +void +graw_processor_unpack_thumb (GRawProcessor* self, + GError** error) +{ libraw_data_t* _tmp0_; - enum LibRaw_errors _tmp1_; GError * _inner_error_ = NULL; #line 223 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); #line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_unpack_thumb (_tmp0_); -#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - graw_throw_exception ("unpack_thumb", _tmp1_, &_inner_error_); + graw_throw_exception ("unpack_thumb", libraw_unpack_thumb (_tmp0_), &_inner_error_); #line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1560,7 +1677,7 @@ void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) { g_propagate_error (error, _inner_error_); #line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1564 "GRaw.c" +#line 1681 "GRaw.c" } else { #line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1568,67 +1685,54 @@ void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) { g_clear_error (&_inner_error_); #line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1572 "GRaw.c" +#line 1689 "GRaw.c" } } } -static void lib_raw_output_params_set_chromatic_aberrations (libraw_output_params_t* params, gdouble red_multiplier, gdouble green_multiplier) { - libraw_output_params_t* _tmp0_; +static void +lib_raw_output_params_set_chromatic_aberrations (libraw_output_params_t* params, + gdouble red_multiplier, + gdouble green_multiplier) +{ + gdouble _tmp0_; gdouble _tmp1_; - gdouble _tmp2_; - libraw_output_params_t* _tmp3_; - gdouble _tmp4_; - gdouble _tmp5_; -#line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp0_ = params; -#line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp1_ = red_multiplier; #line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi" - (*_tmp0_).aber[0] = _tmp1_; + (*params).aber[0] = red_multiplier; #line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp2_ = (*_tmp0_).aber[0]; -#line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp3_ = params; -#line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp4_ = green_multiplier; + _tmp0_ = (*params).aber[0]; #line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi" - (*_tmp3_).aber[2] = _tmp4_; + (*params).aber[2] = green_multiplier; #line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp5_ = (*_tmp3_).aber[2]; -#line 1601 "GRaw.c" + _tmp1_ = (*params).aber[2]; +#line 1710 "GRaw.c" } -static void lib_raw_output_params_set_gamma_curve (libraw_output_params_t* params, gdouble power, gdouble slope) { - libraw_output_params_t* _tmp0_; +static void +lib_raw_output_params_set_gamma_curve (libraw_output_params_t* params, + gdouble power, + gdouble slope) +{ + gdouble _tmp0_; gdouble _tmp1_; - gdouble _tmp2_; - libraw_output_params_t* _tmp3_; - gdouble _tmp4_; - gdouble _tmp5_; -#line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp0_ = params; -#line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp1_ = power; #line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi" - (*_tmp0_).gamm[0] = 1.0 / _tmp1_; + (*params).gamm[0] = 1.0 / power; #line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp2_ = (*_tmp0_).gamm[0]; + _tmp0_ = (*params).gamm[0]; #line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp3_ = params; + (*params).gamm[1] = slope; #line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp4_ = slope; -#line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi" - (*_tmp3_).gamm[1] = _tmp4_; -#line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp5_ = (*_tmp3_).gamm[1]; -#line 1628 "GRaw.c" + _tmp1_ = (*params).gamm[1]; +#line 1729 "GRaw.c" } -void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean half_size) { +void +graw_processor_configure_for_rgb_display (GRawProcessor* self, + gboolean half_size) +{ libraw_output_params_t* _tmp0_; libraw_output_params_t* _tmp1_; libraw_output_params_t* _tmp2_; @@ -1637,7 +1741,7 @@ void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean hal libraw_output_params_t* _tmp5_; libraw_output_params_t* _tmp6_; libraw_output_params_t* _tmp7_; - gboolean _tmp8_; + libraw_output_params_t* _tmp8_; libraw_output_params_t* _tmp9_; libraw_output_params_t* _tmp10_; libraw_output_params_t* _tmp11_; @@ -1659,7 +1763,6 @@ void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean hal libraw_output_params_t* _tmp27_; libraw_output_params_t* _tmp28_; libraw_output_params_t* _tmp29_; - libraw_output_params_t* _tmp30_; #line 230 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); #line 235 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1685,80 +1788,80 @@ void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean hal #line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp7_ = _tmp6_; #line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp8_ = half_size; -#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp7_).half_size = _tmp8_; + (*_tmp7_).half_size = half_size; #line 244 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp9_ = graw_processor_get_output_params (self); + _tmp8_ = graw_processor_get_output_params (self); #line 244 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 244 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp10_).highlight = (gint) GRAW_HIGHLIGHT_MODE_CLIP; + (*_tmp9_).highlight = (gint) GRAW_HIGHLIGHT_MODE_CLIP; #line 245 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp11_ = graw_processor_get_output_params (self); + _tmp10_ = graw_processor_get_output_params (self); #line 245 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 245 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp12_).use_auto_wb = TRUE; + (*_tmp11_).use_auto_wb = TRUE; #line 246 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp13_ = graw_processor_get_output_params (self); + _tmp12_ = graw_processor_get_output_params (self); #line 246 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 246 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp14_).use_camera_wb = TRUE; + (*_tmp13_).use_camera_wb = TRUE; #line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp15_ = graw_processor_get_output_params (self); + _tmp14_ = graw_processor_get_output_params (self); #line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp16_).use_camera_matrix = (gint) GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_PROFILE; + (*_tmp15_).use_camera_matrix = (gint) GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_PROFILE; #line 248 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp17_ = graw_processor_get_output_params (self); + _tmp16_ = graw_processor_get_output_params (self); #line 248 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 248 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp18_).output_color = (gint) GRAW_COLORSPACE_SRGB; + (*_tmp17_).output_color = (gint) GRAW_COLORSPACE_SRGB; #line 253 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp19_ = graw_processor_get_output_params (self); + _tmp18_ = graw_processor_get_output_params (self); #line 253 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 253 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp20_).output_bps = 8; + (*_tmp19_).output_bps = 8; #line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp21_ = graw_processor_get_output_params (self); + _tmp20_ = graw_processor_get_output_params (self); #line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp22_).user_flip = (gint) GRAW_FLIP_FROM_SOURCE; + (*_tmp21_).user_flip = (gint) GRAW_FLIP_FROM_SOURCE; #line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp23_ = graw_processor_get_output_params (self); + _tmp22_ = graw_processor_get_output_params (self); #line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp24_).user_qual = (gint) GRAW_INTERPOLATION_QUALITY_PPG; + (*_tmp23_).user_qual = (gint) GRAW_INTERPOLATION_QUALITY_PPG; #line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp25_ = graw_processor_get_output_params (self); + _tmp24_ = graw_processor_get_output_params (self); #line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp26_ = _tmp25_; + _tmp25_ = _tmp24_; #line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp26_).no_auto_bright = TRUE; + (*_tmp25_).no_auto_bright = TRUE; #line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp27_ = graw_processor_get_output_params (self); + _tmp26_ = graw_processor_get_output_params (self); #line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp28_ = _tmp27_; + _tmp27_ = _tmp26_; #line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp28_).auto_bright_thr = 0.01f; + (*_tmp27_).auto_bright_thr = 0.01f; #line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp29_ = graw_processor_get_output_params (self); + _tmp28_ = graw_processor_get_output_params (self); #line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp30_ = _tmp29_; + _tmp29_ = _tmp28_; #line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp30_).use_fuji_rotate = (gint) GRAW_FUJI_ROTATE_USE; -#line 1758 "GRaw.c" + (*_tmp29_).use_fuji_rotate = (gint) GRAW_FUJI_ROTATE_USE; +#line 1859 "GRaw.c" } -libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self) { +libraw_output_params_t* +graw_processor_get_output_params (GRawProcessor* self) +{ libraw_output_params_t* result; libraw_data_t* _tmp0_; #line 156 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1769,108 +1872,133 @@ libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self) { result = &_tmp0_->params; #line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 1773 "GRaw.c" +#line 1876 "GRaw.c" } -static void graw_value_processor_init (GValue* value) { +static void +graw_value_processor_init (GValue* value) +{ #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = NULL; -#line 1780 "GRaw.c" +#line 1885 "GRaw.c" } -static void graw_value_processor_free_value (GValue* value) { +static void +graw_value_processor_free_value (GValue* value) +{ #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (value->data[0].v_pointer) { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" graw_processor_unref (value->data[0].v_pointer); -#line 1789 "GRaw.c" +#line 1896 "GRaw.c" } } -static void graw_value_processor_copy_value (const GValue* src_value, GValue* dest_value) { +static void +graw_value_processor_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (src_value->data[0].v_pointer) { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" dest_value->data[0].v_pointer = graw_processor_ref (src_value->data[0].v_pointer); -#line 1799 "GRaw.c" +#line 1909 "GRaw.c" } else { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" dest_value->data[0].v_pointer = NULL; -#line 1803 "GRaw.c" +#line 1913 "GRaw.c" } } -static gpointer graw_value_processor_peek_pointer (const GValue* value) { +static gpointer +graw_value_processor_peek_pointer (const GValue* value) +{ #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return value->data[0].v_pointer; -#line 1811 "GRaw.c" +#line 1923 "GRaw.c" } -static gchar* graw_value_processor_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +graw_value_processor_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (collect_values[0].v_pointer) { -#line 1818 "GRaw.c" +#line 1935 "GRaw.c" GRawProcessor * object; object = collect_values[0].v_pointer; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (object->parent_instance.g_class == NULL) { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1825 "GRaw.c" +#line 1942 "GRaw.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1829 "GRaw.c" +#line 1946 "GRaw.c" } #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = graw_processor_ref (object); -#line 1833 "GRaw.c" +#line 1950 "GRaw.c" } else { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = NULL; -#line 1837 "GRaw.c" +#line 1954 "GRaw.c" } #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 1841 "GRaw.c" +#line 1958 "GRaw.c" } -static gchar* graw_value_processor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +graw_value_processor_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ GRawProcessor ** object_p; object_p = collect_values[0].v_pointer; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (!object_p) { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1852 "GRaw.c" +#line 1974 "GRaw.c" } #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (!value->data[0].v_pointer) { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" *object_p = NULL; -#line 1858 "GRaw.c" +#line 1980 "GRaw.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" *object_p = value->data[0].v_pointer; -#line 1862 "GRaw.c" +#line 1984 "GRaw.c" } else { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" *object_p = graw_processor_ref (value->data[0].v_pointer); -#line 1866 "GRaw.c" +#line 1988 "GRaw.c" } #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 1870 "GRaw.c" +#line 1992 "GRaw.c" } -GParamSpec* graw_param_spec_processor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +graw_param_spec_processor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ GRawParamSpecProcessor* spec; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (g_type_is_a (object_type, GRAW_TYPE_PROCESSOR), NULL); @@ -1880,20 +2008,25 @@ GParamSpec* graw_param_spec_processor (const gchar* name, const gchar* nick, con G_PARAM_SPEC (spec)->value_type = object_type; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return G_PARAM_SPEC (spec); -#line 1884 "GRaw.c" +#line 2012 "GRaw.c" } -gpointer graw_value_get_processor (const GValue* value) { +gpointer +graw_value_get_processor (const GValue* value) +{ #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR), NULL); #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return value->data[0].v_pointer; -#line 1893 "GRaw.c" +#line 2023 "GRaw.c" } -void graw_value_set_processor (GValue* value, gpointer v_object) { +void +graw_value_set_processor (GValue* value, + gpointer v_object) +{ GRawProcessor * old; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR)); @@ -1909,22 +2042,25 @@ void graw_value_set_processor (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" graw_processor_ref (value->data[0].v_pointer); -#line 1913 "GRaw.c" +#line 2046 "GRaw.c" } else { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = NULL; -#line 1917 "GRaw.c" +#line 2050 "GRaw.c" } #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (old) { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" graw_processor_unref (old); -#line 1923 "GRaw.c" +#line 2056 "GRaw.c" } } -void graw_value_take_processor (GValue* value, gpointer v_object) { +void +graw_value_take_processor (GValue* value, + gpointer v_object) +{ GRawProcessor * old; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR)); @@ -1938,42 +2074,48 @@ void graw_value_take_processor (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = v_object; -#line 1942 "GRaw.c" +#line 2078 "GRaw.c" } else { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = NULL; -#line 1946 "GRaw.c" +#line 2082 "GRaw.c" } #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (old) { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" graw_processor_unref (old); -#line 1952 "GRaw.c" +#line 2088 "GRaw.c" } } -static void graw_processor_class_init (GRawProcessorClass * klass) { +static void +graw_processor_class_init (GRawProcessorClass * klass) +{ #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" graw_processor_parent_class = g_type_class_peek_parent (klass); #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" ((GRawProcessorClass *) klass)->finalize = graw_processor_finalize; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_type_class_add_private (klass, sizeof (GRawProcessorPrivate)); -#line 1964 "GRaw.c" +#line 2102 "GRaw.c" } -static void graw_processor_instance_init (GRawProcessor * self) { +static void +graw_processor_instance_init (GRawProcessor * self) +{ #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self->priv = GRAW_PROCESSOR_GET_PRIVATE (self); #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self->ref_count = 1; -#line 1973 "GRaw.c" +#line 2113 "GRaw.c" } -static void graw_processor_finalize (GRawProcessor * obj) { +static void +graw_processor_finalize (GRawProcessor * obj) +{ GRawProcessor * self; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GRAW_TYPE_PROCESSOR, GRawProcessor); @@ -1981,11 +2123,13 @@ static void graw_processor_finalize (GRawProcessor * obj) { g_signal_handlers_destroy (self); #line 161 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _libraw_close0 (self->priv->proc); -#line 1985 "GRaw.c" +#line 2127 "GRaw.c" } -GType graw_processor_get_type (void) { +GType +graw_processor_get_type (void) +{ static volatile gsize graw_processor_type_id__volatile = 0; if (g_once_init_enter (&graw_processor_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { graw_value_processor_init, graw_value_processor_free_value, graw_value_processor_copy_value, graw_value_processor_peek_pointer, "p", graw_value_processor_collect_value, "p", graw_value_processor_lcopy_value }; @@ -1999,18 +2143,22 @@ GType graw_processor_get_type (void) { } -gpointer graw_processor_ref (gpointer instance) { +gpointer +graw_processor_ref (gpointer instance) +{ GRawProcessor * self; self = instance; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_atomic_int_inc (&self->ref_count); #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return instance; -#line 2010 "GRaw.c" +#line 2156 "GRaw.c" } -void graw_processor_unref (gpointer instance) { +void +graw_processor_unref (gpointer instance) +{ GRawProcessor * self; self = instance; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2019,60 +2167,46 @@ void graw_processor_unref (gpointer instance) { GRAW_PROCESSOR_GET_CLASS (self)->finalize (self); #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2023 "GRaw.c" +#line 2171 "GRaw.c" } } -void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GError** error) { - enum LibRaw_errors _tmp0_; +void +graw_throw_exception (const gchar* caller, + enum LibRaw_errors _result_, + GError** error) +{ gchar* msg = NULL; - const gchar* _tmp7_; - enum LibRaw_errors _tmp8_; - const gchar* _tmp9_; - gchar* _tmp10_; - enum LibRaw_errors _tmp11_; + const gchar* _tmp2_; + gchar* _tmp3_; GError * _inner_error_ = NULL; #line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (caller != NULL); #line 267 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp0_ = _result_; -#line 267 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - if (_tmp0_ == LIBRAW_SUCCESS) { + if (_result_ == LIBRAW_SUCCESS) { #line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2045 "GRaw.c" +#line 2191 "GRaw.c" } else { - enum LibRaw_errors _tmp1_; -#line 269 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = _result_; #line 269 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - if (_tmp1_ > 0) { -#line 2052 "GRaw.c" - const gchar* _tmp2_; - enum LibRaw_errors _tmp3_; - enum LibRaw_errors _tmp4_; - const gchar* _tmp5_; - GError* _tmp6_; -#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp2_ = caller; -#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp3_ = _result_; + if (_result_ > 0) { +#line 2195 "GRaw.c" + const gchar* _tmp0_; + GError* _tmp1_; #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp4_ = _result_; + _tmp0_ = g_strerror ((gint) _result_); #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp5_ = g_strerror ((gint) _tmp4_); + _tmp1_ = g_error_new (GRAW_EXCEPTION, GRAW_EXCEPTION_SYSTEM_ERROR, "%s: System error %d: %s", caller, (gint) _result_, _tmp0_); #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp6_ = g_error_new (GRAW_EXCEPTION, GRAW_EXCEPTION_SYSTEM_ERROR, "%s: System error %d: %s", _tmp2_, (gint) _tmp3_, _tmp5_); -#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp6_; + _inner_error_ = _tmp1_; #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_propagate_error (error, _inner_error_); #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2076 "GRaw.c" +#line 2210 "GRaw.c" } else { #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2080,36 +2214,30 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2084 "GRaw.c" +#line 2218 "GRaw.c" } } } #line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp7_ = caller; -#line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp8_ = _result_; -#line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp9_ = libraw_strerror (_tmp8_); + _tmp2_ = libraw_strerror (_result_); #line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp10_ = g_strdup_printf ("%s: %s", _tmp7_, _tmp9_); + _tmp3_ = g_strdup_printf ("%s: %s", caller, _tmp2_); #line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - msg = _tmp10_; + msg = _tmp3_; #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp11_ = _result_; -#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - switch (_tmp11_) { + switch (_result_) { #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_UNSPECIFIED_ERROR: -#line 2104 "GRaw.c" +#line 2232 "GRaw.c" { - const gchar* _tmp12_; - GError* _tmp13_; + const gchar* _tmp4_; + GError* _tmp5_; #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp12_ = msg; + _tmp4_ = msg; #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp13_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSPECIFIED, _tmp12_); + _tmp5_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSPECIFIED, _tmp4_); #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp13_; + _inner_error_ = _tmp5_; #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2118,7 +2246,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2122 "GRaw.c" +#line 2250 "GRaw.c" } else { #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2128,21 +2256,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2132 "GRaw.c" +#line 2260 "GRaw.c" } } #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_FILE_UNSUPPORTED: -#line 2137 "GRaw.c" +#line 2265 "GRaw.c" { - const gchar* _tmp14_; - GError* _tmp15_; + const gchar* _tmp6_; + GError* _tmp7_; #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp14_ = msg; + _tmp6_ = msg; #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp15_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_FILE, _tmp14_); + _tmp7_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_FILE, _tmp6_); #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp15_; + _inner_error_ = _tmp7_; #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2151,7 +2279,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2155 "GRaw.c" +#line 2283 "GRaw.c" } else { #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2161,21 +2289,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2165 "GRaw.c" +#line 2293 "GRaw.c" } } #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_REQUEST_FOR_NONEXISTENT_IMAGE: -#line 2170 "GRaw.c" +#line 2298 "GRaw.c" { - const gchar* _tmp16_; - GError* _tmp17_; + const gchar* _tmp8_; + GError* _tmp9_; #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp16_ = msg; + _tmp8_ = msg; #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp17_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_NONEXISTANT_IMAGE, _tmp16_); + _tmp9_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_NONEXISTANT_IMAGE, _tmp8_); #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp17_; + _inner_error_ = _tmp9_; #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2184,7 +2312,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2188 "GRaw.c" +#line 2316 "GRaw.c" } else { #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2194,21 +2322,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2198 "GRaw.c" +#line 2326 "GRaw.c" } } #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_OUT_OF_ORDER_CALL: -#line 2203 "GRaw.c" +#line 2331 "GRaw.c" { - const gchar* _tmp18_; - GError* _tmp19_; + const gchar* _tmp10_; + GError* _tmp11_; #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp18_ = msg; + _tmp10_ = msg; #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp19_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_OUT_OF_ORDER_CALL, _tmp18_); + _tmp11_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_OUT_OF_ORDER_CALL, _tmp10_); #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp19_; + _inner_error_ = _tmp11_; #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2217,7 +2345,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2221 "GRaw.c" +#line 2349 "GRaw.c" } else { #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2227,21 +2355,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2231 "GRaw.c" +#line 2359 "GRaw.c" } } #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_NO_THUMBNAIL: -#line 2236 "GRaw.c" +#line 2364 "GRaw.c" { - const gchar* _tmp20_; - GError* _tmp21_; + const gchar* _tmp12_; + GError* _tmp13_; #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp20_ = msg; + _tmp12_ = msg; #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp21_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_NO_THUMBNAIL, _tmp20_); + _tmp13_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_NO_THUMBNAIL, _tmp12_); #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp21_; + _inner_error_ = _tmp13_; #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2250,7 +2378,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2254 "GRaw.c" +#line 2382 "GRaw.c" } else { #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2260,21 +2388,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2264 "GRaw.c" +#line 2392 "GRaw.c" } } #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_UNSUPPORTED_THUMBNAIL: -#line 2269 "GRaw.c" +#line 2397 "GRaw.c" { - const gchar* _tmp22_; - GError* _tmp23_; + const gchar* _tmp14_; + GError* _tmp15_; #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp22_ = msg; + _tmp14_ = msg; #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp23_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_THUMBNAIL, _tmp22_); + _tmp15_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_THUMBNAIL, _tmp14_); #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp23_; + _inner_error_ = _tmp15_; #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2283,7 +2411,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2287 "GRaw.c" +#line 2415 "GRaw.c" } else { #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2293,21 +2421,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2297 "GRaw.c" +#line 2425 "GRaw.c" } } #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_UNSUFFICIENT_MEMORY: -#line 2302 "GRaw.c" +#line 2430 "GRaw.c" { - const gchar* _tmp24_; - GError* _tmp25_; + const gchar* _tmp16_; + GError* _tmp17_; #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp24_ = msg; + _tmp16_ = msg; #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp25_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_OUT_OF_MEMORY, _tmp24_); + _tmp17_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_OUT_OF_MEMORY, _tmp16_); #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp25_; + _inner_error_ = _tmp17_; #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2316,7 +2444,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2320 "GRaw.c" +#line 2448 "GRaw.c" } else { #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2326,21 +2454,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2330 "GRaw.c" +#line 2458 "GRaw.c" } } #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_DATA_ERROR: -#line 2335 "GRaw.c" +#line 2463 "GRaw.c" { - const gchar* _tmp26_; - GError* _tmp27_; + const gchar* _tmp18_; + GError* _tmp19_; #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp26_ = msg; + _tmp18_ = msg; #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp27_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_DATA_ERROR, _tmp26_); + _tmp19_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_DATA_ERROR, _tmp18_); #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp27_; + _inner_error_ = _tmp19_; #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2349,7 +2477,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2353 "GRaw.c" +#line 2481 "GRaw.c" } else { #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2359,21 +2487,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2363 "GRaw.c" +#line 2491 "GRaw.c" } } #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_IO_ERROR: -#line 2368 "GRaw.c" +#line 2496 "GRaw.c" { - const gchar* _tmp28_; - GError* _tmp29_; + const gchar* _tmp20_; + GError* _tmp21_; #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp28_ = msg; + _tmp20_ = msg; #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp29_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_IO_ERROR, _tmp28_); + _tmp21_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_IO_ERROR, _tmp20_); #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp29_; + _inner_error_ = _tmp21_; #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2382,7 +2510,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2386 "GRaw.c" +#line 2514 "GRaw.c" } else { #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2392,21 +2520,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2396 "GRaw.c" +#line 2524 "GRaw.c" } } #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_CANCELLED_BY_CALLBACK: -#line 2401 "GRaw.c" +#line 2529 "GRaw.c" { - const gchar* _tmp30_; - GError* _tmp31_; + const gchar* _tmp22_; + GError* _tmp23_; #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp30_ = msg; + _tmp22_ = msg; #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp31_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_CANCELLED_BY_CALLBACK, _tmp30_); + _tmp23_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_CANCELLED_BY_CALLBACK, _tmp22_); #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp31_; + _inner_error_ = _tmp23_; #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2415,7 +2543,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2419 "GRaw.c" +#line 2547 "GRaw.c" } else { #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2425,21 +2553,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2429 "GRaw.c" +#line 2557 "GRaw.c" } } #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_BAD_CROP: -#line 2434 "GRaw.c" +#line 2562 "GRaw.c" { - const gchar* _tmp32_; - GError* _tmp33_; + const gchar* _tmp24_; + GError* _tmp25_; #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp32_ = msg; + _tmp24_ = msg; #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp33_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_BAD_CROP, _tmp32_); + _tmp25_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_BAD_CROP, _tmp24_); #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp33_; + _inner_error_ = _tmp25_; #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2448,7 +2576,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2452 "GRaw.c" +#line 2580 "GRaw.c" } else { #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2458,7 +2586,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2462 "GRaw.c" +#line 2590 "GRaw.c" } } default: @@ -2467,12 +2595,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 309 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2471 "GRaw.c" +#line 2599 "GRaw.c" } } #line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); -#line 2476 "GRaw.c" +#line 2604 "GRaw.c" } diff --git a/src/photos/GdkSupport.c b/src/photos/GdkSupport.c index 8955711..c0b4e05 100644 --- a/src/photos/GdkSupport.c +++ b/src/photos/GdkSupport.c @@ -1,4 +1,4 @@ -/* GdkSupport.c generated by valac 0.36.6, the Vala compiler +/* GdkSupport.c generated by valac 0.40.4, the Vala compiler * generated from GdkSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -222,17 +223,29 @@ static gpointer gdk_sniffer_parent_class = NULL; gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -240,76 +253,111 @@ GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); GType gdk_reader_get_type (void) G_GNUC_CONST; -enum { - GDK_READER_DUMMY_PROPERTY -}; GType photo_file_format_get_type (void) G_GNUC_CONST; -GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static PhotoMetadata* gdk_reader_real_read_metadata (PhotoFileReader* base, GError** error); +GdkReader* gdk_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +PhotoFileReader* photo_file_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static PhotoMetadata* gdk_reader_real_read_metadata (PhotoFileReader* base, + GError** error); PhotoMetadata* photo_metadata_new (void); PhotoMetadata* photo_metadata_construct (GType object_type); -void media_metadata_read_from_file (MediaMetadata* self, GFile* file, GError** error); +void media_metadata_read_from_file (MediaMetadata* self, + GFile* file, + GError** error); GFile* photo_file_adapter_get_file (PhotoFileAdapter* self); -static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, GError** error); +static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, + GError** error); gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self); -static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error); +static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, + Dimensions* full, + Dimensions* scaled, + GError** error); gpointer photo_file_sniffer_ref (gpointer instance); void photo_file_sniffer_unref (gpointer instance); -GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_sniffer (GValue* value, gpointer v_object); -void value_take_photo_file_sniffer (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_sniffer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_sniffer (GValue* value, + gpointer v_object); +void value_take_photo_file_sniffer (GValue* value, + gpointer v_object); gpointer value_get_photo_file_sniffer (const GValue* value); GType photo_file_sniffer_get_type (void) G_GNUC_CONST; gpointer detected_photo_information_ref (gpointer instance); void detected_photo_information_unref (gpointer instance); -GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_detected_photo_information (GValue* value, gpointer v_object); -void value_take_detected_photo_information (GValue* value, gpointer v_object); +GParamSpec* param_spec_detected_photo_information (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_detected_photo_information (GValue* value, + gpointer v_object); +void value_take_detected_photo_information (GValue* value, + gpointer v_object); gpointer value_get_detected_photo_information (const GValue* value); GType detected_photo_information_get_type (void) G_GNUC_CONST; GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; GType gdk_sniffer_get_type (void) G_GNUC_CONST; #define GDK_SNIFFER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_GDK_SNIFFER, GdkSnifferPrivate)) -enum { - GDK_SNIFFER_DUMMY_PROPERTY -}; -GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error); +GdkSniffer* gdk_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error); DetectedPhotoInformation* detected_photo_information_new (void); DetectedPhotoInformation* detected_photo_information_construct (GType object_type); -static void gdk_sniffer_on_size_prepared (GdkSniffer* self, GdkPixbufLoader* loader, gint width, gint height); -static void _gdk_sniffer_on_size_prepared_gdk_pixbuf_loader_size_prepared (GdkPixbufLoader* _sender, gint width, gint height, gpointer self); -static void gdk_sniffer_on_area_prepared (GdkSniffer* self, GdkPixbufLoader* pixbuf_loader); -static void _gdk_sniffer_on_area_prepared_gdk_pixbuf_loader_area_prepared (GdkPixbufLoader* _sender, gpointer self); +static void gdk_sniffer_on_size_prepared (GdkSniffer* self, + GdkPixbufLoader* loader, + gint width, + gint height); +static void _gdk_sniffer_on_size_prepared_gdk_pixbuf_loader_size_prepared (GdkPixbufLoader* _sender, + gint width, + gint height, + gpointer self); +static void gdk_sniffer_on_area_prepared (GdkSniffer* self, + GdkPixbufLoader* pixbuf_loader); +static void _gdk_sniffer_on_area_prepared_gdk_pixbuf_loader_area_prepared (GdkPixbufLoader* _sender, + gpointer self); gchar* photo_metadata_exif_hash (PhotoMetadata* self); gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self); -static guint8* _vala_array_dup5 (guint8* self, int length); -void dimensions_init (Dimensions *self, gint width, gint height); +static guint8* _vala_array_dup5 (guint8* self, + int length); +void dimensions_init (Dimensions *self, + gint width, + gint height); PhotoFileFormat photo_file_format_from_pixbuf_name (const gchar* name); static void gdk_sniffer_finalize (PhotoFileSniffer * obj); -GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { +GdkReader* +gdk_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format) +{ GdkReader* self = NULL; - const gchar* _tmp0_; - PhotoFileFormat _tmp1_; #line 8 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 9 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp0_ = filepath; -#line 9 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp1_ = file_format; -#line 9 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - self = (GdkReader*) photo_file_reader_construct (object_type, _tmp0_, _tmp1_); + self = (GdkReader*) photo_file_reader_construct (object_type, filepath, file_format); #line 8 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return self; -#line 309 "GdkSupport.c" +#line 354 "GdkSupport.c" } -static PhotoMetadata* gdk_reader_real_read_metadata (PhotoFileReader* base, GError** error) { +static PhotoMetadata* +gdk_reader_real_read_metadata (PhotoFileReader* base, + GError** error) +{ GdkReader * self; PhotoMetadata* result = NULL; PhotoMetadata* metadata = NULL; @@ -339,17 +387,20 @@ static PhotoMetadata* gdk_reader_real_read_metadata (PhotoFileReader* base, GErr _media_metadata_unref0 (metadata); #line 14 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 343 "GdkSupport.c" +#line 391 "GdkSupport.c" } #line 16 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" result = metadata; #line 16 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return result; -#line 349 "GdkSupport.c" +#line 397 "GdkSupport.c" } -static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, GError** error) { +static GdkPixbuf* +gdk_reader_real_unscaled_read (PhotoFileReader* base, + GError** error) +{ GdkReader * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; @@ -379,7 +430,7 @@ static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, GError** g_propagate_error (error, _inner_error_); #line 20 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 383 "GdkSupport.c" +#line 434 "GdkSupport.c" } #line 20 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp5_ = _tmp0_; @@ -391,11 +442,16 @@ static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, GError** _g_object_unref0 (_tmp0_); #line 20 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return result; -#line 395 "GdkSupport.c" +#line 446 "GdkSupport.c" } -static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error) { +static GdkPixbuf* +gdk_reader_real_scaled_read (PhotoFileReader* base, + Dimensions* full, + Dimensions* scaled, + GError** error) +{ GdkReader * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; @@ -441,7 +497,7 @@ static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, Dimensions g_propagate_error (error, _inner_error_); #line 24 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 445 "GdkSupport.c" +#line 501 "GdkSupport.c" } #line 24 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp9_ = _tmp0_; @@ -453,11 +509,13 @@ static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, Dimensions _g_object_unref0 (_tmp0_); #line 24 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return result; -#line 457 "GdkSupport.c" +#line 513 "GdkSupport.c" } -static void gdk_reader_class_init (GdkReaderClass * klass) { +static void +gdk_reader_class_init (GdkReaderClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" gdk_reader_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -466,15 +524,19 @@ static void gdk_reader_class_init (GdkReaderClass * klass) { ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) gdk_reader_real_unscaled_read; #line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) gdk_reader_real_scaled_read; -#line 470 "GdkSupport.c" +#line 528 "GdkSupport.c" } -static void gdk_reader_instance_init (GdkReader * self) { +static void +gdk_reader_instance_init (GdkReader * self) +{ } -GType gdk_reader_get_type (void) { +GType +gdk_reader_get_type (void) +{ static volatile gsize gdk_reader_type_id__volatile = 0; if (g_once_init_enter (&gdk_reader_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (GdkReaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gdk_reader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (GdkReader), 0, (GInstanceInitFunc) gdk_reader_instance_init, NULL }; @@ -486,53 +548,68 @@ GType gdk_reader_get_type (void) { } -GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { +GdkSniffer* +gdk_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options) +{ GdkSniffer* self = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; #line 33 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 34 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp0_ = file; -#line 34 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp1_ = options; -#line 34 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - self = (GdkSniffer*) photo_file_sniffer_construct (object_type, _tmp0_, _tmp1_); + self = (GdkSniffer*) photo_file_sniffer_construct (object_type, file, options); #line 33 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return self; -#line 504 "GdkSupport.c" +#line 564 "GdkSupport.c" } -static void _gdk_sniffer_on_size_prepared_gdk_pixbuf_loader_size_prepared (GdkPixbufLoader* _sender, gint width, gint height, gpointer self) { +static void +_gdk_sniffer_on_size_prepared_gdk_pixbuf_loader_size_prepared (GdkPixbufLoader* _sender, + gint width, + gint height, + gpointer self) +{ #line 41 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" gdk_sniffer_on_size_prepared ((GdkSniffer*) self, _sender, width, height); -#line 511 "GdkSupport.c" +#line 576 "GdkSupport.c" } -static void _gdk_sniffer_on_area_prepared_gdk_pixbuf_loader_area_prepared (GdkPixbufLoader* _sender, gpointer self) { +static void +_gdk_sniffer_on_area_prepared_gdk_pixbuf_loader_area_prepared (GdkPixbufLoader* _sender, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" gdk_sniffer_on_area_prepared ((GdkSniffer*) self, _sender); -#line 518 "GdkSupport.c" +#line 586 "GdkSupport.c" } -static guint8* _vala_array_dup5 (guint8* self, int length) { +static guint8* +_vala_array_dup5 (guint8* self, + int length) +{ #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return g_memdup (self, length * sizeof (guint8)); -#line 525 "GdkSupport.c" +#line 596 "GdkSupport.c" } -static gpointer _detected_photo_information_ref0 (gpointer self) { +static gpointer +_detected_photo_information_ref0 (gpointer self) +{ #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return self ? detected_photo_information_ref (self) : NULL; -#line 532 "GdkSupport.c" +#line 605 "GdkSupport.c" } -static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error) { +static DetectedPhotoInformation* +gdk_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error) +{ GdkSniffer * self; gboolean _vala_is_corrupted = FALSE; DetectedPhotoInformation* result = NULL; @@ -560,12 +637,12 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, GFileInputStream* fins = NULL; GFile* _tmp29_; GFileInputStream* _tmp30_; - GFileInputStream* _tmp54_; - gboolean _tmp56_; - gboolean _tmp61_ = FALSE; - gboolean _tmp62_; + GFileInputStream* _tmp53_; + gboolean _tmp55_; + gboolean _tmp60_ = FALSE; + gboolean _tmp61_; + DetectedPhotoInformation* _tmp63_; DetectedPhotoInformation* _tmp64_; - DetectedPhotoInformation* _tmp65_; GError * _inner_error_ = NULL; #line 37 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GDK_SNIFFER, GdkSniffer); @@ -593,7 +670,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 46 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp4_) { -#line 597 "GdkSupport.c" +#line 674 "GdkSupport.c" GChecksum* _tmp5_; #line 47 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp5_ = g_checksum_new (G_CHECKSUM_MD5); @@ -601,7 +678,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_checksum_free0 (md5_checksum); #line 47 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" md5_checksum = _tmp5_; -#line 605 "GdkSupport.c" +#line 682 "GdkSupport.c" } #line 49 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp6_ = self->priv->detected; @@ -611,7 +688,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _media_metadata_unref0 (_tmp6_->metadata); #line 49 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp6_->metadata = _tmp7_; -#line 615 "GdkSupport.c" +#line 692 "GdkSupport.c" { DetectedPhotoInformation* _tmp8_; PhotoMetadata* _tmp9_; @@ -626,7 +703,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_METADATA, MediaMetadata), _tmp10_, &_inner_error_); #line 51 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 630 "GdkSupport.c" +#line 707 "GdkSupport.c" goto __catch34_g_error; } } @@ -647,7 +724,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp11_->metadata = NULL; #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_error_free0 (err); -#line 651 "GdkSupport.c" +#line 728 "GdkSupport.c" } __finally34: #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -660,13 +737,13 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_object_unref0 (pixbuf_loader); #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 664 "GdkSupport.c" +#line 741 "GdkSupport.c" } #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp13_) { -#line 670 "GdkSupport.c" +#line 747 "GdkSupport.c" DetectedPhotoInformation* _tmp14_; PhotoMetadata* _tmp15_; #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -675,15 +752,15 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp15_ = _tmp14_->metadata; #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp12_ = _tmp15_ != NULL; -#line 679 "GdkSupport.c" +#line 756 "GdkSupport.c" } else { #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp12_ = FALSE; -#line 683 "GdkSupport.c" +#line 760 "GdkSupport.c" } #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp12_) { -#line 687 "GdkSupport.c" +#line 764 "GdkSupport.c" DetectedPhotoInformation* _tmp16_; DetectedPhotoInformation* _tmp17_; PhotoMetadata* _tmp18_; @@ -716,13 +793,13 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_free0 (_tmp20_->thumbnail_md5); #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp20_->thumbnail_md5 = _tmp23_; -#line 720 "GdkSupport.c" +#line 797 "GdkSupport.c" } #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp25_) { -#line 726 "GdkSupport.c" +#line 803 "GdkSupport.c" guint8* _tmp26_; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp26_ = g_new0 (guint8, 64 * 1024); @@ -734,7 +811,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp24__length1 = 64 * 1024; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" __tmp24__size_ = _tmp24__length1; -#line 738 "GdkSupport.c" +#line 815 "GdkSupport.c" } else { guint8* _tmp27_; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -747,7 +824,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp24__length1 = 8 * 1024; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" __tmp24__size_ = _tmp24__length1; -#line 751 "GdkSupport.c" +#line 828 "GdkSupport.c" } #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp28_ = (_tmp24_ != NULL) ? _vala_array_dup5 (_tmp24_, _tmp24__length1) : ((gpointer) _tmp24_); @@ -781,7 +858,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_object_unref0 (pixbuf_loader); #line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 785 "GdkSupport.c" +#line 862 "GdkSupport.c" } { gboolean _tmp31_ = FALSE; @@ -789,24 +866,23 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp31_ = TRUE; #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" while (TRUE) { -#line 793 "GdkSupport.c" +#line 870 "GdkSupport.c" gsize bytes_read = 0UL; GFileInputStream* _tmp32_; guint8* _tmp33_; gint _tmp33__length1; - gssize _tmp34_; + gsize _tmp34_; gsize _tmp35_; gsize _tmp36_; - gsize _tmp37_; - gboolean _tmp38_; - gboolean _tmp42_ = FALSE; - gboolean _tmp43_; + gboolean _tmp37_; + gboolean _tmp41_ = FALSE; + gboolean _tmp42_; + gboolean _tmp47_ = FALSE; gboolean _tmp48_ = FALSE; - gboolean _tmp49_ = FALSE; - gboolean _tmp50_; + gboolean _tmp49_; #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (!_tmp31_) { -#line 810 "GdkSupport.c" +#line 886 "GdkSupport.c" } #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp31_ = FALSE; @@ -817,9 +893,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp33__length1 = buffer_length1; #line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp34_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, g_input_stream_get_type (), GInputStream), _tmp33_, (gsize) _tmp33__length1, NULL, &_inner_error_); -#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - bytes_read = (gsize) _tmp34_; + bytes_read = (gsize) g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, g_input_stream_get_type (), GInputStream), _tmp33_, (gsize) _tmp33__length1, NULL, &_inner_error_); #line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -836,75 +910,75 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_object_unref0 (pixbuf_loader); #line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 840 "GdkSupport.c" +#line 914 "GdkSupport.c" } #line 71 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp35_ = bytes_read; + _tmp34_ = bytes_read; #line 71 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp35_ <= ((gsize) 0)) { + if (_tmp34_ <= ((gsize) 0)) { #line 72 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" break; -#line 848 "GdkSupport.c" +#line 922 "GdkSupport.c" } #line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp36_ = count; + _tmp35_ = count; #line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp37_ = bytes_read; + _tmp36_ = bytes_read; #line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - count = _tmp36_ + _tmp37_; + count = _tmp35_ + _tmp36_; #line 76 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp38_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; + _tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 76 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp38_) { -#line 860 "GdkSupport.c" - GChecksum* _tmp39_; - guint8* _tmp40_; - gint _tmp40__length1; - gsize _tmp41_; + if (_tmp37_) { +#line 934 "GdkSupport.c" + GChecksum* _tmp38_; + guint8* _tmp39_; + gint _tmp39__length1; + gsize _tmp40_; #line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp39_ = md5_checksum; + _tmp38_ = md5_checksum; #line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp40_ = buffer; + _tmp39_ = buffer; #line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp40__length1 = buffer_length1; + _tmp39__length1 = buffer_length1; #line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp41_ = bytes_read; + _tmp40_ = bytes_read; #line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - g_checksum_update (_tmp39_, _tmp40_, _tmp41_); -#line 875 "GdkSupport.c" + g_checksum_update (_tmp38_, _tmp39_, _tmp40_); +#line 949 "GdkSupport.c" } #line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp43_ = self->priv->size_ready; + _tmp42_ = self->priv->size_ready; #line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (!_tmp43_) { + if (!_tmp42_) { #line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp42_ = TRUE; -#line 883 "GdkSupport.c" + _tmp41_ = TRUE; +#line 957 "GdkSupport.c" } else { - gboolean _tmp44_; + gboolean _tmp43_; #line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp44_ = self->priv->area_prepared; + _tmp43_ = self->priv->area_prepared; #line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp42_ = !_tmp44_; -#line 890 "GdkSupport.c" + _tmp41_ = !_tmp43_; +#line 964 "GdkSupport.c" } #line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp42_) { -#line 894 "GdkSupport.c" - GdkPixbufLoader* _tmp45_; - guint8* _tmp46_; - gint _tmp46__length1; - gsize _tmp47_; + if (_tmp41_) { +#line 968 "GdkSupport.c" + GdkPixbufLoader* _tmp44_; + guint8* _tmp45_; + gint _tmp45__length1; + gsize _tmp46_; #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp45_ = pixbuf_loader; + _tmp44_ = pixbuf_loader; #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp46_ = buffer; + _tmp45_ = buffer; #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp46__length1 = buffer_length1; + _tmp45__length1 = buffer_length1; #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp47_ = bytes_read; + _tmp46_ = bytes_read; #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - gdk_pixbuf_loader_write (_tmp45_, _tmp46_ + 0, (gsize) (((gint) _tmp47_) - 0), &_inner_error_); + gdk_pixbuf_loader_write (_tmp44_, _tmp45_ + 0, (gsize) (((gint) _tmp46_) - 0), &_inner_error_); #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -921,56 +995,56 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_object_unref0 (pixbuf_loader); #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 925 "GdkSupport.c" +#line 999 "GdkSupport.c" } } #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp50_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; + _tmp49_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (!_tmp50_) { -#line 932 "GdkSupport.c" - gboolean _tmp51_; + if (!_tmp49_) { +#line 1006 "GdkSupport.c" + gboolean _tmp50_; #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp51_ = self->priv->size_ready; + _tmp50_ = self->priv->size_ready; #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp49_ = _tmp51_; -#line 938 "GdkSupport.c" + _tmp48_ = _tmp50_; +#line 1012 "GdkSupport.c" } else { #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp49_ = FALSE; -#line 942 "GdkSupport.c" + _tmp48_ = FALSE; +#line 1016 "GdkSupport.c" } #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp49_) { -#line 946 "GdkSupport.c" - gboolean _tmp52_; + if (_tmp48_) { +#line 1020 "GdkSupport.c" + gboolean _tmp51_; #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp52_ = self->priv->area_prepared; + _tmp51_ = self->priv->area_prepared; #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp48_ = _tmp52_; -#line 952 "GdkSupport.c" + _tmp47_ = _tmp51_; +#line 1026 "GdkSupport.c" } else { #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp48_ = FALSE; -#line 956 "GdkSupport.c" + _tmp47_ = FALSE; +#line 1030 "GdkSupport.c" } #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp48_) { + if (_tmp47_) { #line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" break; -#line 962 "GdkSupport.c" +#line 1036 "GdkSupport.c" } } } { - GdkPixbufLoader* _tmp53_; + GdkPixbufLoader* _tmp52_; #line 90 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp53_ = pixbuf_loader; + _tmp52_ = pixbuf_loader; #line 90 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - gdk_pixbuf_loader_close (_tmp53_, &_inner_error_); + gdk_pixbuf_loader_close (_tmp52_, &_inner_error_); #line 90 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 974 "GdkSupport.c" +#line 1048 "GdkSupport.c" goto __catch35_g_error; } } @@ -984,7 +1058,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _inner_error_ = NULL; #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_error_free0 (err); -#line 988 "GdkSupport.c" +#line 1062 "GdkSupport.c" } __finally35: #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1003,18 +1077,18 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_object_unref0 (pixbuf_loader); #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 1007 "GdkSupport.c" +#line 1081 "GdkSupport.c" } #line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp54_ = fins; + _tmp53_ = fins; #line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp54_ != NULL) { -#line 1013 "GdkSupport.c" - GFileInputStream* _tmp55_; + if (_tmp53_ != NULL) { +#line 1087 "GdkSupport.c" + GFileInputStream* _tmp54_; #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp55_ = fins; + _tmp54_ = fins; #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); + g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1031,55 +1105,55 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_object_unref0 (pixbuf_loader); #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 1035 "GdkSupport.c" +#line 1109 "GdkSupport.c" } } #line 97 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp56_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; + _tmp55_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 97 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp56_) { -#line 1042 "GdkSupport.c" - DetectedPhotoInformation* _tmp57_; - GChecksum* _tmp58_; - const gchar* _tmp59_; - gchar* _tmp60_; + if (_tmp55_) { +#line 1116 "GdkSupport.c" + DetectedPhotoInformation* _tmp56_; + GChecksum* _tmp57_; + const gchar* _tmp58_; + gchar* _tmp59_; #line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp57_ = self->priv->detected; + _tmp56_ = self->priv->detected; #line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp58_ = md5_checksum; + _tmp57_ = md5_checksum; #line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp59_ = g_checksum_get_string (_tmp58_); + _tmp58_ = g_checksum_get_string (_tmp57_); #line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp60_ = g_strdup (_tmp59_); + _tmp59_ = g_strdup (_tmp58_); #line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _g_free0 (_tmp57_->md5); + _g_free0 (_tmp56_->md5); #line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp57_->md5 = _tmp60_; -#line 1059 "GdkSupport.c" + _tmp56_->md5 = _tmp59_; +#line 1133 "GdkSupport.c" } #line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp62_ = self->priv->size_ready; + _tmp61_ = self->priv->size_ready; #line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (!_tmp62_) { + if (!_tmp61_) { #line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp61_ = TRUE; -#line 1067 "GdkSupport.c" + _tmp60_ = TRUE; +#line 1141 "GdkSupport.c" } else { - gboolean _tmp63_; + gboolean _tmp62_; #line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp63_ = self->priv->area_prepared; + _tmp62_ = self->priv->area_prepared; #line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp61_ = !_tmp63_; -#line 1074 "GdkSupport.c" + _tmp60_ = !_tmp62_; +#line 1148 "GdkSupport.c" } #line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _vala_is_corrupted = _tmp61_; + _vala_is_corrupted = _tmp60_; #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp64_ = self->priv->detected; + _tmp63_ = self->priv->detected; #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp65_ = _detected_photo_information_ref0 (_tmp64_); + _tmp64_ = _detected_photo_information_ref0 (_tmp63_); #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - result = _tmp65_; + result = _tmp64_; #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (fins); #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1094,18 +1168,21 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, if (is_corrupted) { #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1098 "GdkSupport.c" +#line 1172 "GdkSupport.c" } #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return result; -#line 1102 "GdkSupport.c" +#line 1176 "GdkSupport.c" } -static void gdk_sniffer_on_size_prepared (GdkSniffer* self, GdkPixbufLoader* loader, gint width, gint height) { +static void +gdk_sniffer_on_size_prepared (GdkSniffer* self, + GdkPixbufLoader* loader, + gint width, + gint height) +{ DetectedPhotoInformation* _tmp0_; - gint _tmp1_; - gint _tmp2_; #line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_if_fail (IS_GDK_SNIFFER (self)); #line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1113,130 +1190,115 @@ static void gdk_sniffer_on_size_prepared (GdkSniffer* self, GdkPixbufLoader* loa #line 107 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp0_ = self->priv->detected; #line 107 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp1_ = width; -#line 107 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp2_ = height; -#line 107 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - dimensions_init (&_tmp0_->image_dim, _tmp1_, _tmp2_); + dimensions_init (&_tmp0_->image_dim, width, height); #line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self->priv->size_ready = TRUE; -#line 1124 "GdkSupport.c" +#line 1197 "GdkSupport.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return self ? g_object_ref (self) : NULL; -#line 1131 "GdkSupport.c" +#line 1206 "GdkSupport.c" } -static void gdk_sniffer_on_area_prepared (GdkSniffer* self, GdkPixbufLoader* pixbuf_loader) { +static void +gdk_sniffer_on_area_prepared (GdkSniffer* self, + GdkPixbufLoader* pixbuf_loader) +{ GdkPixbuf* pixbuf = NULL; - GdkPixbufLoader* _tmp0_; + GdkPixbuf* _tmp0_; GdkPixbuf* _tmp1_; GdkPixbuf* _tmp2_; - GdkPixbuf* _tmp3_; - DetectedPhotoInformation* _tmp4_; - GdkPixbuf* _tmp5_; - GdkColorspace _tmp6_; + DetectedPhotoInformation* _tmp3_; + GdkPixbuf* _tmp4_; + DetectedPhotoInformation* _tmp5_; + GdkPixbuf* _tmp6_; DetectedPhotoInformation* _tmp7_; GdkPixbuf* _tmp8_; - gint _tmp9_; - DetectedPhotoInformation* _tmp10_; - GdkPixbuf* _tmp11_; - gint _tmp12_; GdkPixbufFormat* format = NULL; - GdkPixbufLoader* _tmp13_; - GdkPixbufFormat* _tmp14_; - DetectedPhotoInformation* _tmp15_; - GdkPixbufFormat* _tmp16_; - gchar* _tmp17_; - DetectedPhotoInformation* _tmp18_; - DetectedPhotoInformation* _tmp19_; - const gchar* _tmp20_; - PhotoFileFormat _tmp21_; + GdkPixbufFormat* _tmp9_; + DetectedPhotoInformation* _tmp10_; + GdkPixbufFormat* _tmp11_; + gchar* _tmp12_; + DetectedPhotoInformation* _tmp13_; + DetectedPhotoInformation* _tmp14_; + const gchar* _tmp15_; #line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_if_fail (IS_GDK_SNIFFER (self)); #line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_if_fail (GDK_IS_PIXBUF_LOADER (pixbuf_loader)); #line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp0_ = pixbuf_loader; + _tmp0_ = gdk_pixbuf_loader_get_pixbuf (pixbuf_loader); #line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp1_ = gdk_pixbuf_loader_get_pixbuf (_tmp0_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); -#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - pixbuf = _tmp2_; + pixbuf = _tmp1_; #line 113 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp3_ = pixbuf; + _tmp2_ = pixbuf; #line 113 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 114 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (pixbuf); #line 114 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return; -#line 1180 "GdkSupport.c" +#line 1250 "GdkSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp4_ = self->priv->detected; -#line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp5_ = pixbuf; + _tmp3_ = self->priv->detected; #line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp6_ = gdk_pixbuf_get_colorspace (_tmp5_); + _tmp4_ = pixbuf; #line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp4_->colorspace = _tmp6_; + _tmp3_->colorspace = gdk_pixbuf_get_colorspace (_tmp4_); #line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp7_ = self->priv->detected; + _tmp5_ = self->priv->detected; #line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp8_ = pixbuf; + _tmp6_ = pixbuf; #line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp9_ = gdk_pixbuf_get_n_channels (_tmp8_); -#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp7_->channels = _tmp9_; -#line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp10_ = self->priv->detected; + _tmp5_->channels = gdk_pixbuf_get_n_channels (_tmp6_); #line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp11_ = pixbuf; + _tmp7_ = self->priv->detected; #line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp12_ = gdk_pixbuf_get_bits_per_sample (_tmp11_); + _tmp8_ = pixbuf; #line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp10_->bits_per_channel = _tmp12_; -#line 120 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp13_ = pixbuf_loader; + _tmp7_->bits_per_channel = gdk_pixbuf_get_bits_per_sample (_tmp8_); #line 120 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp14_ = gdk_pixbuf_loader_get_format (_tmp13_); + _tmp9_ = gdk_pixbuf_loader_get_format (pixbuf_loader); #line 120 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - format = _tmp14_; + format = _tmp9_; #line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp15_ = self->priv->detected; + _tmp10_ = self->priv->detected; #line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp16_ = format; + _tmp11_ = format; #line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp17_ = gdk_pixbuf_format_get_name (_tmp16_); + _tmp12_ = gdk_pixbuf_format_get_name (_tmp11_); #line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _g_free0 (_tmp15_->format_name); + _g_free0 (_tmp10_->format_name); #line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp15_->format_name = _tmp17_; -#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp18_ = self->priv->detected; + _tmp10_->format_name = _tmp12_; #line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp19_ = self->priv->detected; + _tmp13_ = self->priv->detected; #line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp20_ = _tmp19_->format_name; + _tmp14_ = self->priv->detected; #line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp21_ = photo_file_format_from_pixbuf_name (_tmp20_); + _tmp15_ = _tmp14_->format_name; #line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp18_->file_format = _tmp21_; + _tmp13_->file_format = photo_file_format_from_pixbuf_name (_tmp15_); #line 124 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self->priv->area_prepared = TRUE; #line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (pixbuf); -#line 1236 "GdkSupport.c" +#line 1296 "GdkSupport.c" } -static void gdk_sniffer_class_init (GdkSnifferClass * klass) { +static void +gdk_sniffer_class_init (GdkSnifferClass * klass) +{ #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" gdk_sniffer_parent_class = g_type_class_peek_parent (klass); #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1245,11 +1307,13 @@ static void gdk_sniffer_class_init (GdkSnifferClass * klass) { g_type_class_add_private (klass, sizeof (GdkSnifferPrivate)); #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) gdk_sniffer_real_sniff; -#line 1249 "GdkSupport.c" +#line 1311 "GdkSupport.c" } -static void gdk_sniffer_instance_init (GdkSniffer * self) { +static void +gdk_sniffer_instance_init (GdkSniffer * self) +{ #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self->priv = GDK_SNIFFER_GET_PRIVATE (self); #line 29 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1258,11 +1322,13 @@ static void gdk_sniffer_instance_init (GdkSniffer * self) { self->priv->size_ready = FALSE; #line 31 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self->priv->area_prepared = FALSE; -#line 1262 "GdkSupport.c" +#line 1326 "GdkSupport.c" } -static void gdk_sniffer_finalize (PhotoFileSniffer * obj) { +static void +gdk_sniffer_finalize (PhotoFileSniffer * obj) +{ GdkSniffer * self; #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_GDK_SNIFFER, GdkSniffer); @@ -1270,11 +1336,13 @@ static void gdk_sniffer_finalize (PhotoFileSniffer * obj) { _detected_photo_information_unref0 (self->priv->detected); #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" PHOTO_FILE_SNIFFER_CLASS (gdk_sniffer_parent_class)->finalize (obj); -#line 1274 "GdkSupport.c" +#line 1340 "GdkSupport.c" } -GType gdk_sniffer_get_type (void) { +GType +gdk_sniffer_get_type (void) +{ static volatile gsize gdk_sniffer_type_id__volatile = 0; if (g_once_init_enter (&gdk_sniffer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (GdkSnifferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gdk_sniffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (GdkSniffer), 0, (GInstanceInitFunc) gdk_sniffer_instance_init, NULL }; diff --git a/src/photos/JfifSupport.c b/src/photos/JfifSupport.c index 190c4c2..e4e9217 100644 --- a/src/photos/JfifSupport.c +++ b/src/photos/JfifSupport.c @@ -1,4 +1,4 @@ -/* JfifSupport.c generated by valac 0.36.6, the Vala compiler +/* JfifSupport.c generated by valac 0.40.4, the Vala compiler * generated from JfifSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -481,31 +482,55 @@ static gpointer jfif_metadata_writer_parent_class = NULL; gpointer photo_file_format_driver_ref (gpointer instance); void photo_file_format_driver_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_driver (GValue* value, gpointer v_object); -void value_take_photo_file_format_driver (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_driver (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_driver (GValue* value, + gpointer v_object); +void value_take_photo_file_format_driver (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_driver (const GValue* value); GType photo_file_format_driver_get_type (void) G_GNUC_CONST; gpointer photo_file_format_properties_ref (gpointer instance); void photo_file_format_properties_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_properties (GValue* value, gpointer v_object); -void value_take_photo_file_format_properties (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_properties (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_properties (GValue* value, + gpointer v_object); +void value_take_photo_file_format_properties (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_properties (const GValue* value); GType photo_file_format_properties_get_type (void) G_GNUC_CONST; gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -514,15 +539,18 @@ GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST; GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; gpointer photo_file_sniffer_ref (gpointer instance); void photo_file_sniffer_unref (gpointer instance); -GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_sniffer (GValue* value, gpointer v_object); -void value_take_photo_file_sniffer (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_sniffer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_sniffer (GValue* value, + gpointer v_object); +void value_take_photo_file_sniffer (GValue* value, + gpointer v_object); gpointer value_get_photo_file_sniffer (const GValue* value); GType photo_file_sniffer_get_type (void) G_GNUC_CONST; GType jfif_file_format_driver_get_type (void) G_GNUC_CONST; -enum { - JFIF_FILE_FORMAT_DRIVER_DUMMY_PROPERTY -}; void jfif_file_format_driver_init (void); JfifFileFormatDriver* jfif_file_format_driver_new (void); JfifFileFormatDriver* jfif_file_format_driver_construct (GType object_type); @@ -531,9 +559,11 @@ JfifFileFormatDriver* jfif_file_format_driver_get_instance (void); static PhotoFileFormatProperties* jfif_file_format_driver_real_get_properties (PhotoFileFormatDriver* base); GType jfif_file_format_properties_get_type (void) G_GNUC_CONST; JfifFileFormatProperties* jfif_file_format_properties_get_instance (void); -static PhotoFileReader* jfif_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath); +static PhotoFileReader* jfif_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath); JfifReader* jfif_reader_new (const gchar* filepath); -JfifReader* jfif_reader_construct (GType object_type, const gchar* filepath); +JfifReader* jfif_reader_construct (GType object_type, + const gchar* filepath); GType gdk_reader_get_type (void) G_GNUC_CONST; GType jfif_reader_get_type (void) G_GNUC_CONST; static PhotoMetadata* jfif_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base); @@ -541,74 +571,98 @@ PhotoMetadata* photo_metadata_new (void); PhotoMetadata* photo_metadata_construct (GType object_type); static gboolean jfif_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base); static gboolean jfif_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base); -static PhotoFileWriter* jfif_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath); +static PhotoFileWriter* jfif_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath); JfifWriter* jfif_writer_new (const gchar* filepath); -JfifWriter* jfif_writer_construct (GType object_type, const gchar* filepath); +JfifWriter* jfif_writer_construct (GType object_type, + const gchar* filepath); GType jfif_writer_get_type (void) G_GNUC_CONST; -static PhotoFileMetadataWriter* jfif_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath); +static PhotoFileMetadataWriter* jfif_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath); JfifMetadataWriter* jfif_metadata_writer_new (const gchar* filepath); -JfifMetadataWriter* jfif_metadata_writer_construct (GType object_type, const gchar* filepath); +JfifMetadataWriter* jfif_metadata_writer_construct (GType object_type, + const gchar* filepath); GType jfif_metadata_writer_get_type (void) G_GNUC_CONST; -static PhotoFileSniffer* jfif_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options); -JfifSniffer* jfif_sniffer_new (GFile* file, PhotoFileSnifferOptions options); -JfifSniffer* jfif_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); +static PhotoFileSniffer* jfif_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options); +JfifSniffer* jfif_sniffer_new (GFile* file, + PhotoFileSnifferOptions options); +JfifSniffer* jfif_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); GType gdk_sniffer_get_type (void) G_GNUC_CONST; GType jfif_sniffer_get_type (void) G_GNUC_CONST; PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type); static void jfif_file_format_driver_finalize (PhotoFileFormatDriver * obj); GType photo_file_format_get_type (void) G_GNUC_CONST; GType photo_file_format_flags_get_type (void) G_GNUC_CONST; -enum { - JFIF_FILE_FORMAT_PROPERTIES_DUMMY_PROPERTY -}; JfifFileFormatProperties* jfif_file_format_properties_new (void); JfifFileFormatProperties* jfif_file_format_properties_construct (GType object_type); static PhotoFileFormat jfif_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base); static PhotoFileFormatFlags jfif_file_format_properties_real_get_flags (PhotoFileFormatProperties* base); static gchar* jfif_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base); static gchar* jfif_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base); -static gchar** jfif_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup6 (gchar** self, int length); +static gchar** jfif_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1); +static gchar** _vala_array_dup6 (gchar** self, + int length); static gchar* jfif_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base); -static gchar** jfif_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup7 (gchar** self, int length); +static gchar** jfif_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1); +static gchar** _vala_array_dup7 (gchar** self, + int length); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); static void jfif_file_format_properties_finalize (PhotoFileFormatProperties * obj); gpointer detected_photo_information_ref (gpointer instance); void detected_photo_information_unref (gpointer instance); -GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_detected_photo_information (GValue* value, gpointer v_object); -void value_take_detected_photo_information (GValue* value, gpointer v_object); +GParamSpec* param_spec_detected_photo_information (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_detected_photo_information (GValue* value, + gpointer v_object); +void value_take_detected_photo_information (GValue* value, + gpointer v_object); gpointer value_get_detected_photo_information (const GValue* value); GType detected_photo_information_get_type (void) G_GNUC_CONST; -enum { - JFIF_SNIFFER_DUMMY_PROPERTY -}; -GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error); -gboolean jpeg_is_jpeg (GFile* file, GError** error); -DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error); +GdkSniffer* gdk_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error); +gboolean jpeg_is_jpeg (GFile* file, + GError** error); +DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, + gboolean* is_corrupted, + GError** error); GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); -enum { - JFIF_READER_DUMMY_PROPERTY -}; -GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); +GdkReader* gdk_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); GType jpeg_quality_get_type (void) G_GNUC_CONST; -enum { - JFIF_WRITER_DUMMY_PROPERTY -}; -PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static void jfif_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error); +PhotoFileWriter* photo_file_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static void jfif_writer_real_write (PhotoFileWriter* base, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error); gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self); gchar* jpeg_quality_get_pct_text (JpegQuality self); -enum { - JFIF_METADATA_WRITER_DUMMY_PROPERTY -}; -PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static void jfif_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error); -void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** error); +PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static void jfif_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, + PhotoMetadata* metadata, + GError** error); +void photo_metadata_write_to_file (PhotoMetadata* self, + GFile* file, + GError** error); GFile* photo_file_adapter_get_file (PhotoFileAdapter* self); #define JPEG_MARKER_PREFIX ((guint8) 0xFF) GType jpeg_marker_get_type (void) G_GNUC_CONST; @@ -616,12 +670,18 @@ guint8 jpeg_marker_get_byte (JpegMarker self); gint jpeg_quality_get_pct (JpegQuality self); JpegQuality* jpeg_quality_get_all (int* result_length1); gchar* jpeg_quality_to_string (JpegQuality self); -gboolean jpeg_is_jpeg_stream (GInputStream* ins, GError** error); -gint jpeg_read_marker (GInputStream* fins, JpegMarker* marker, GError** error); -gboolean jpeg_is_jpeg_bytes (GBytes* bytes, GError** error); - - -void jfif_file_format_driver_init (void) { +gboolean jpeg_is_jpeg_stream (GInputStream* ins, + GError** error); +gint jpeg_read_marker (GInputStream* fins, + JpegMarker* marker, + GError** error); +gboolean jpeg_is_jpeg_bytes (GBytes* bytes, + GError** error); + + +void +jfif_file_format_driver_init (void) +{ JfifFileFormatDriver* _tmp0_; #line 11 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp0_ = jfif_file_format_driver_new (); @@ -631,18 +691,22 @@ void jfif_file_format_driver_init (void) { jfif_file_format_driver_instance = _tmp0_; #line 12 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" jfif_file_format_properties_init (); -#line 635 "JfifSupport.c" +#line 695 "JfifSupport.c" } -static gpointer _photo_file_format_driver_ref0 (gpointer self) { +static gpointer +_photo_file_format_driver_ref0 (gpointer self) +{ #line 16 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self ? photo_file_format_driver_ref (self) : NULL; -#line 642 "JfifSupport.c" +#line 704 "JfifSupport.c" } -JfifFileFormatDriver* jfif_file_format_driver_get_instance (void) { +JfifFileFormatDriver* +jfif_file_format_driver_get_instance (void) +{ JfifFileFormatDriver* result = NULL; JfifFileFormatDriver* _tmp0_; JfifFileFormatDriver* _tmp1_; @@ -654,11 +718,13 @@ JfifFileFormatDriver* jfif_file_format_driver_get_instance (void) { result = _tmp1_; #line 16 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 658 "JfifSupport.c" +#line 722 "JfifSupport.c" } -static PhotoFileFormatProperties* jfif_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) { +static PhotoFileFormatProperties* +jfif_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) +{ JfifFileFormatDriver * self; PhotoFileFormatProperties* result = NULL; JfifFileFormatProperties* _tmp0_; @@ -670,32 +736,34 @@ static PhotoFileFormatProperties* jfif_file_format_driver_real_get_properties (P result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties); #line 20 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 674 "JfifSupport.c" +#line 740 "JfifSupport.c" } -static PhotoFileReader* jfif_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileReader* +jfif_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath) +{ JfifFileFormatDriver * self; PhotoFileReader* result = NULL; - const gchar* _tmp0_; - JfifReader* _tmp1_; + JfifReader* _tmp0_; #line 23 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver); #line 23 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 24 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = filepath; -#line 24 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = jfif_reader_new (_tmp0_); + _tmp0_ = jfif_reader_new (filepath); #line 24 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_READER, PhotoFileReader); #line 24 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 695 "JfifSupport.c" +#line 761 "JfifSupport.c" } -static PhotoMetadata* jfif_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) { +static PhotoMetadata* +jfif_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) +{ JfifFileFormatDriver * self; PhotoMetadata* result = NULL; PhotoMetadata* _tmp0_; @@ -707,11 +775,13 @@ static PhotoMetadata* jfif_file_format_driver_real_create_metadata (PhotoFileFor result = _tmp0_; #line 28 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 711 "JfifSupport.c" +#line 779 "JfifSupport.c" } -static gboolean jfif_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) { +static gboolean +jfif_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) +{ JfifFileFormatDriver * self; gboolean result = FALSE; #line 31 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -720,11 +790,13 @@ static gboolean jfif_file_format_driver_real_can_write_image (PhotoFileFormatDri result = TRUE; #line 32 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 724 "JfifSupport.c" +#line 794 "JfifSupport.c" } -static gboolean jfif_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) { +static gboolean +jfif_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) +{ JfifFileFormatDriver * self; gboolean result = FALSE; #line 35 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -733,94 +805,98 @@ static gboolean jfif_file_format_driver_real_can_write_metadata (PhotoFileFormat result = TRUE; #line 36 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 737 "JfifSupport.c" +#line 809 "JfifSupport.c" } -static PhotoFileWriter* jfif_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileWriter* +jfif_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ JfifFileFormatDriver * self; PhotoFileWriter* result = NULL; - const gchar* _tmp0_; - JfifWriter* _tmp1_; + JfifWriter* _tmp0_; #line 39 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver); #line 39 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 40 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = filepath; -#line 40 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = jfif_writer_new (_tmp0_); + _tmp0_ = jfif_writer_new (filepath); #line 40 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter); #line 40 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 758 "JfifSupport.c" +#line 830 "JfifSupport.c" } -static PhotoFileMetadataWriter* jfif_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileMetadataWriter* +jfif_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ JfifFileFormatDriver * self; PhotoFileMetadataWriter* result = NULL; - const gchar* _tmp0_; - JfifMetadataWriter* _tmp1_; + JfifMetadataWriter* _tmp0_; #line 43 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver); #line 43 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 44 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = filepath; + _tmp0_ = jfif_metadata_writer_new (filepath); #line 44 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = jfif_metadata_writer_new (_tmp0_); -#line 44 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter); #line 44 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 779 "JfifSupport.c" +#line 851 "JfifSupport.c" } -static PhotoFileSniffer* jfif_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) { +static PhotoFileSniffer* +jfif_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options) +{ JfifFileFormatDriver * self; PhotoFileSniffer* result = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; - JfifSniffer* _tmp2_; + JfifSniffer* _tmp0_; #line 47 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver); #line 47 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 48 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = file; + _tmp0_ = jfif_sniffer_new (file, options); #line 48 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = options; -#line 48 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp2_ = jfif_sniffer_new (_tmp0_, _tmp1_); -#line 48 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); #line 48 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 803 "JfifSupport.c" +#line 873 "JfifSupport.c" } -JfifFileFormatDriver* jfif_file_format_driver_construct (GType object_type) { +JfifFileFormatDriver* +jfif_file_format_driver_construct (GType object_type) +{ JfifFileFormatDriver* self = NULL; #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = (JfifFileFormatDriver*) photo_file_format_driver_construct (object_type); #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 813 "JfifSupport.c" +#line 885 "JfifSupport.c" } -JfifFileFormatDriver* jfif_file_format_driver_new (void) { +JfifFileFormatDriver* +jfif_file_format_driver_new (void) +{ #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return jfif_file_format_driver_construct (TYPE_JFIF_FILE_FORMAT_DRIVER); -#line 820 "JfifSupport.c" +#line 894 "JfifSupport.c" } -static void jfif_file_format_driver_class_init (JfifFileFormatDriverClass * klass) { +static void +jfif_file_format_driver_class_init (JfifFileFormatDriverClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" jfif_file_format_driver_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -841,25 +917,31 @@ static void jfif_file_format_driver_class_init (JfifFileFormatDriverClass * klas ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) jfif_file_format_driver_real_create_metadata_writer; #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) jfif_file_format_driver_real_create_sniffer; -#line 845 "JfifSupport.c" +#line 921 "JfifSupport.c" } -static void jfif_file_format_driver_instance_init (JfifFileFormatDriver * self) { +static void +jfif_file_format_driver_instance_init (JfifFileFormatDriver * self) +{ } -static void jfif_file_format_driver_finalize (PhotoFileFormatDriver * obj) { +static void +jfif_file_format_driver_finalize (PhotoFileFormatDriver * obj) +{ JfifFileFormatDriver * self; #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver); #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" PHOTO_FILE_FORMAT_DRIVER_CLASS (jfif_file_format_driver_parent_class)->finalize (obj); -#line 859 "JfifSupport.c" +#line 939 "JfifSupport.c" } -GType jfif_file_format_driver_get_type (void) { +GType +jfif_file_format_driver_get_type (void) +{ static volatile gsize jfif_file_format_driver_type_id__volatile = 0; if (g_once_init_enter (&jfif_file_format_driver_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (JfifFileFormatDriverClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) jfif_file_format_driver_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (JfifFileFormatDriver), 0, (GInstanceInitFunc) jfif_file_format_driver_instance_init, NULL }; @@ -871,7 +953,9 @@ GType jfif_file_format_driver_get_type (void) { } -void jfif_file_format_properties_init (void) { +void +jfif_file_format_properties_init (void) +{ JfifFileFormatProperties* _tmp0_; #line 64 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp0_ = jfif_file_format_properties_new (); @@ -879,18 +963,22 @@ void jfif_file_format_properties_init (void) { _photo_file_format_properties_unref0 (jfif_file_format_properties_instance); #line 64 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" jfif_file_format_properties_instance = _tmp0_; -#line 883 "JfifSupport.c" +#line 967 "JfifSupport.c" } -static gpointer _photo_file_format_properties_ref0 (gpointer self) { +static gpointer +_photo_file_format_properties_ref0 (gpointer self) +{ #line 68 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self ? photo_file_format_properties_ref (self) : NULL; -#line 890 "JfifSupport.c" +#line 976 "JfifSupport.c" } -JfifFileFormatProperties* jfif_file_format_properties_get_instance (void) { +JfifFileFormatProperties* +jfif_file_format_properties_get_instance (void) +{ JfifFileFormatProperties* result = NULL; JfifFileFormatProperties* _tmp0_; JfifFileFormatProperties* _tmp1_; @@ -902,11 +990,13 @@ JfifFileFormatProperties* jfif_file_format_properties_get_instance (void) { result = _tmp1_; #line 68 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 906 "JfifSupport.c" +#line 994 "JfifSupport.c" } -static PhotoFileFormat jfif_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) { +static PhotoFileFormat +jfif_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) +{ JfifFileFormatProperties * self; PhotoFileFormat result = 0; #line 71 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -915,11 +1005,13 @@ static PhotoFileFormat jfif_file_format_properties_real_get_file_format (PhotoFi result = PHOTO_FILE_FORMAT_JFIF; #line 72 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 919 "JfifSupport.c" +#line 1009 "JfifSupport.c" } -static PhotoFileFormatFlags jfif_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) { +static PhotoFileFormatFlags +jfif_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) +{ JfifFileFormatProperties * self; PhotoFileFormatFlags result = 0; #line 75 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -928,11 +1020,13 @@ static PhotoFileFormatFlags jfif_file_format_properties_real_get_flags (PhotoFil result = PHOTO_FILE_FORMAT_FLAGS_NONE; #line 76 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 932 "JfifSupport.c" +#line 1024 "JfifSupport.c" } -static gchar* jfif_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) { +static gchar* +jfif_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) +{ JfifFileFormatProperties * self; gchar* result = NULL; gchar* _tmp0_; @@ -944,11 +1038,13 @@ static gchar* jfif_file_format_properties_real_get_default_extension (PhotoFileF result = _tmp0_; #line 80 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 948 "JfifSupport.c" +#line 1042 "JfifSupport.c" } -static gchar* jfif_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) { +static gchar* +jfif_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) +{ JfifFileFormatProperties * self; gchar* result = NULL; gchar* _tmp0_; @@ -960,32 +1056,38 @@ static gchar* jfif_file_format_properties_real_get_user_visible_name (PhotoFileF result = _tmp0_; #line 84 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 964 "JfifSupport.c" +#line 1060 "JfifSupport.c" } -static gchar** _vala_array_dup6 (gchar** self, int length) { +static gchar** +_vala_array_dup6 (gchar** self, + int length) +{ gchar** result; int i; #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = g_new0 (gchar*, length + 1); #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" for (i = 0; i < length; i++) { -#line 975 "JfifSupport.c" +#line 1074 "JfifSupport.c" gchar* _tmp0_; #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp0_ = g_strdup (self[i]); #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result[i] = _tmp0_; -#line 981 "JfifSupport.c" +#line 1080 "JfifSupport.c" } #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 985 "JfifSupport.c" +#line 1084 "JfifSupport.c" } -static gchar** jfif_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +jfif_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1) +{ JfifFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -1012,17 +1114,19 @@ static gchar** jfif_file_format_properties_real_get_known_extensions (PhotoFileF if (result_length1) { #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *result_length1 = _tmp2__length1; -#line 1016 "JfifSupport.c" +#line 1118 "JfifSupport.c" } #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = _tmp2_; #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1022 "JfifSupport.c" +#line 1124 "JfifSupport.c" } -static gchar* jfif_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) { +static gchar* +jfif_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) +{ JfifFileFormatProperties * self; gchar* result = NULL; gchar** _tmp0_; @@ -1043,32 +1147,38 @@ static gchar* jfif_file_format_properties_real_get_default_mime_type (PhotoFileF result = _tmp2_; #line 92 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1047 "JfifSupport.c" +#line 1151 "JfifSupport.c" } -static gchar** _vala_array_dup7 (gchar** self, int length) { +static gchar** +_vala_array_dup7 (gchar** self, + int length) +{ gchar** result; int i; #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = g_new0 (gchar*, length + 1); #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" for (i = 0; i < length; i++) { -#line 1058 "JfifSupport.c" +#line 1165 "JfifSupport.c" gchar* _tmp0_; #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp0_ = g_strdup (self[i]); #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result[i] = _tmp0_; -#line 1064 "JfifSupport.c" +#line 1171 "JfifSupport.c" } #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1068 "JfifSupport.c" +#line 1175 "JfifSupport.c" } -static gchar** jfif_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +jfif_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1) +{ JfifFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -1095,34 +1205,40 @@ static gchar** jfif_file_format_properties_real_get_mime_types (PhotoFileFormatP if (result_length1) { #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *result_length1 = _tmp2__length1; -#line 1099 "JfifSupport.c" +#line 1209 "JfifSupport.c" } #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = _tmp2_; #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1105 "JfifSupport.c" +#line 1215 "JfifSupport.c" } -JfifFileFormatProperties* jfif_file_format_properties_construct (GType object_type) { +JfifFileFormatProperties* +jfif_file_format_properties_construct (GType object_type) +{ JfifFileFormatProperties* self = NULL; #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = (JfifFileFormatProperties*) photo_file_format_properties_construct (object_type); #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 1115 "JfifSupport.c" +#line 1227 "JfifSupport.c" } -JfifFileFormatProperties* jfif_file_format_properties_new (void) { +JfifFileFormatProperties* +jfif_file_format_properties_new (void) +{ #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return jfif_file_format_properties_construct (TYPE_JFIF_FILE_FORMAT_PROPERTIES); -#line 1122 "JfifSupport.c" +#line 1236 "JfifSupport.c" } -static void jfif_file_format_properties_class_init (JfifFileFormatPropertiesClass * klass) { +static void +jfif_file_format_properties_class_init (JfifFileFormatPropertiesClass * klass) +{ gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; @@ -1180,25 +1296,31 @@ static void jfif_file_format_properties_class_init (JfifFileFormatPropertiesClas jfif_file_format_properties_KNOWN_MIME_TYPES = _tmp6_; #line 57 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" jfif_file_format_properties_KNOWN_MIME_TYPES_length1 = 1; -#line 1184 "JfifSupport.c" +#line 1300 "JfifSupport.c" } -static void jfif_file_format_properties_instance_init (JfifFileFormatProperties * self) { +static void +jfif_file_format_properties_instance_init (JfifFileFormatProperties * self) +{ } -static void jfif_file_format_properties_finalize (PhotoFileFormatProperties * obj) { +static void +jfif_file_format_properties_finalize (PhotoFileFormatProperties * obj) +{ JfifFileFormatProperties * self; #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_JFIF_FILE_FORMAT_PROPERTIES, JfifFileFormatProperties); #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" PHOTO_FILE_FORMAT_PROPERTIES_CLASS (jfif_file_format_properties_parent_class)->finalize (obj); -#line 1198 "JfifSupport.c" +#line 1318 "JfifSupport.c" } -GType jfif_file_format_properties_get_type (void) { +GType +jfif_file_format_properties_get_type (void) +{ static volatile gsize jfif_file_format_properties_type_id__volatile = 0; if (g_once_init_enter (&jfif_file_format_properties_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (JfifFileFormatPropertiesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) jfif_file_format_properties_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (JfifFileFormatProperties), 0, (GInstanceInitFunc) jfif_file_format_properties_instance_init, NULL }; @@ -1210,53 +1332,59 @@ GType jfif_file_format_properties_get_type (void) { } -JfifSniffer* jfif_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { +JfifSniffer* +jfif_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options) +{ JfifSniffer* self = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; #line 101 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 102 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = file; -#line 102 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = options; -#line 102 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - self = (JfifSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_); + self = (JfifSniffer*) gdk_sniffer_construct (object_type, file, options); #line 101 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 1228 "JfifSupport.c" +#line 1348 "JfifSupport.c" } -JfifSniffer* jfif_sniffer_new (GFile* file, PhotoFileSnifferOptions options) { +JfifSniffer* +jfif_sniffer_new (GFile* file, + PhotoFileSnifferOptions options) +{ #line 101 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return jfif_sniffer_construct (TYPE_JFIF_SNIFFER, file, options); -#line 1235 "JfifSupport.c" +#line 1358 "JfifSupport.c" } -static gpointer _detected_photo_information_ref0 (gpointer self) { +static gpointer +_detected_photo_information_ref0 (gpointer self) +{ #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self ? detected_photo_information_ref (self) : NULL; -#line 1242 "JfifSupport.c" +#line 1367 "JfifSupport.c" } -static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error) { +static DetectedPhotoInformation* +jfif_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error) +{ JfifSniffer * self; gboolean _vala_is_corrupted = FALSE; DetectedPhotoInformation* result = NULL; gboolean _tmp0_ = FALSE; GFile* _tmp1_; - gboolean _tmp2_; DetectedPhotoInformation* detected = NULL; - gboolean _tmp3_ = FALSE; + gboolean _tmp2_ = FALSE; + DetectedPhotoInformation* _tmp3_; DetectedPhotoInformation* _tmp4_; - DetectedPhotoInformation* _tmp5_; - DetectedPhotoInformation* _tmp6_ = NULL; - DetectedPhotoInformation* _tmp7_; - PhotoFileFormat _tmp8_; - DetectedPhotoInformation* _tmp10_; + DetectedPhotoInformation* _tmp5_ = NULL; + DetectedPhotoInformation* _tmp6_; + PhotoFileFormat _tmp7_; + DetectedPhotoInformation* _tmp9_; GError * _inner_error_ = NULL; #line 105 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_SNIFFER, JfifSniffer); @@ -1265,16 +1393,14 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base #line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; #line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp2_ = jpeg_is_jpeg (_tmp1_, &_inner_error_); -#line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = _tmp2_; + _tmp0_ = jpeg_is_jpeg (_tmp1_, &_inner_error_); #line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return NULL; -#line 1278 "JfifSupport.c" +#line 1404 "JfifSupport.c" } #line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (!_tmp0_) { @@ -1284,30 +1410,30 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base if (is_corrupted) { #line 110 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1288 "JfifSupport.c" +#line 1414 "JfifSupport.c" } #line 110 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1292 "JfifSupport.c" +#line 1418 "JfifSupport.c" } #line 112 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp4_ = PHOTO_FILE_SNIFFER_CLASS (jfif_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp3_, &_inner_error_); + _tmp3_ = PHOTO_FILE_SNIFFER_CLASS (jfif_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp2_, &_inner_error_); #line 112 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _vala_is_corrupted = _tmp3_; + _vala_is_corrupted = _tmp2_; #line 112 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - detected = _tmp4_; + detected = _tmp3_; #line 112 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 112 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #line 112 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return NULL; -#line 1306 "JfifSupport.c" +#line 1432 "JfifSupport.c" } #line 113 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp5_ = detected; + _tmp4_ = detected; #line 113 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - if (_tmp5_ == NULL) { + if (_tmp4_ == NULL) { #line 114 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = NULL; #line 114 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1316,62 +1442,68 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base if (is_corrupted) { #line 114 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1320 "JfifSupport.c" +#line 1446 "JfifSupport.c" } #line 114 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1324 "JfifSupport.c" +#line 1450 "JfifSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp7_ = detected; + _tmp6_ = detected; #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp8_ = _tmp7_->file_format; + _tmp7_ = _tmp6_->file_format; #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - if (_tmp8_ == PHOTO_FILE_FORMAT_JFIF) { -#line 1332 "JfifSupport.c" - DetectedPhotoInformation* _tmp9_; + if (_tmp7_ == PHOTO_FILE_FORMAT_JFIF) { +#line 1458 "JfifSupport.c" + DetectedPhotoInformation* _tmp8_; #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp9_ = detected; + _tmp8_ = detected; #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp6_ = _tmp9_; -#line 1338 "JfifSupport.c" + _tmp5_ = _tmp8_; +#line 1464 "JfifSupport.c" } else { #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp6_ = NULL; -#line 1342 "JfifSupport.c" + _tmp5_ = NULL; +#line 1468 "JfifSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp10_ = _detected_photo_information_ref0 (_tmp6_); + _tmp9_ = _detected_photo_information_ref0 (_tmp5_); #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = _tmp10_; + result = _tmp9_; #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _detected_photo_information_unref0 (detected); #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (is_corrupted) { #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1354 "JfifSupport.c" +#line 1480 "JfifSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1358 "JfifSupport.c" +#line 1484 "JfifSupport.c" } -static void jfif_sniffer_class_init (JfifSnifferClass * klass) { +static void +jfif_sniffer_class_init (JfifSnifferClass * klass) +{ #line 100 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" jfif_sniffer_parent_class = g_type_class_peek_parent (klass); #line 100 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) jfif_sniffer_real_sniff; -#line 1367 "JfifSupport.c" +#line 1495 "JfifSupport.c" } -static void jfif_sniffer_instance_init (JfifSniffer * self) { +static void +jfif_sniffer_instance_init (JfifSniffer * self) +{ } -GType jfif_sniffer_get_type (void) { +GType +jfif_sniffer_get_type (void) +{ static volatile gsize jfif_sniffer_type_id__volatile = 0; if (g_once_init_enter (&jfif_sniffer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (JfifSnifferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) jfif_sniffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (JfifSniffer), 0, (GInstanceInitFunc) jfif_sniffer_instance_init, NULL }; @@ -1383,40 +1515,48 @@ GType jfif_sniffer_get_type (void) { } -JfifReader* jfif_reader_construct (GType object_type, const gchar* filepath) { +JfifReader* +jfif_reader_construct (GType object_type, + const gchar* filepath) +{ JfifReader* self = NULL; - const gchar* _tmp0_; #line 121 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 122 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = filepath; -#line 122 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - self = (JfifReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_JFIF); + self = (JfifReader*) gdk_reader_construct (object_type, filepath, PHOTO_FILE_FORMAT_JFIF); #line 121 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 1398 "JfifSupport.c" +#line 1530 "JfifSupport.c" } -JfifReader* jfif_reader_new (const gchar* filepath) { +JfifReader* +jfif_reader_new (const gchar* filepath) +{ #line 121 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return jfif_reader_construct (TYPE_JFIF_READER, filepath); -#line 1405 "JfifSupport.c" +#line 1539 "JfifSupport.c" } -static void jfif_reader_class_init (JfifReaderClass * klass) { +static void +jfif_reader_class_init (JfifReaderClass * klass) +{ #line 120 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" jfif_reader_parent_class = g_type_class_peek_parent (klass); -#line 1412 "JfifSupport.c" +#line 1548 "JfifSupport.c" } -static void jfif_reader_instance_init (JfifReader * self) { +static void +jfif_reader_instance_init (JfifReader * self) +{ } -GType jfif_reader_get_type (void) { +GType +jfif_reader_get_type (void) +{ static volatile gsize jfif_reader_type_id__volatile = 0; if (g_once_init_enter (&jfif_reader_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (JfifReaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) jfif_reader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (JfifReader), 0, (GInstanceInitFunc) jfif_reader_instance_init, NULL }; @@ -1428,84 +1568,91 @@ GType jfif_reader_get_type (void) { } -JfifWriter* jfif_writer_construct (GType object_type, const gchar* filepath) { +JfifWriter* +jfif_writer_construct (GType object_type, + const gchar* filepath) +{ JfifWriter* self = NULL; - const gchar* _tmp0_; #line 127 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 128 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = filepath; -#line 128 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - self = (JfifWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_JFIF); + self = (JfifWriter*) photo_file_writer_construct (object_type, filepath, PHOTO_FILE_FORMAT_JFIF); #line 127 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 1443 "JfifSupport.c" +#line 1583 "JfifSupport.c" } -JfifWriter* jfif_writer_new (const gchar* filepath) { +JfifWriter* +jfif_writer_new (const gchar* filepath) +{ #line 127 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return jfif_writer_construct (TYPE_JFIF_WRITER, filepath); -#line 1450 "JfifSupport.c" +#line 1592 "JfifSupport.c" } -static void jfif_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) { +static void +jfif_writer_real_write (PhotoFileWriter* base, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error) +{ JfifWriter * self; - GdkPixbuf* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; - JpegQuality _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; + gchar* _tmp3_; GError * _inner_error_ = NULL; #line 131 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_WRITER, JfifWriter); #line 131 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = pixbuf; -#line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp0_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp2_ = _tmp1_; -#line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp3_ = quality; + _tmp1_ = _tmp0_; #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp4_ = jpeg_quality_get_pct_text (_tmp3_); + _tmp2_ = jpeg_quality_get_pct_text (quality); #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - gdk_pixbuf_save (_tmp0_, _tmp2_, "jpeg", &_inner_error_, "quality", _tmp5_, NULL); + gdk_pixbuf_save (pixbuf, _tmp1_, "jpeg", &_inner_error_, "quality", _tmp3_, NULL); #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp3_); #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return; -#line 1491 "JfifSupport.c" +#line 1632 "JfifSupport.c" } } -static void jfif_writer_class_init (JfifWriterClass * klass) { +static void +jfif_writer_class_init (JfifWriterClass * klass) +{ #line 126 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" jfif_writer_parent_class = g_type_class_peek_parent (klass); #line 126 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" ((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) jfif_writer_real_write; -#line 1501 "JfifSupport.c" +#line 1644 "JfifSupport.c" } -static void jfif_writer_instance_init (JfifWriter * self) { +static void +jfif_writer_instance_init (JfifWriter * self) +{ } -GType jfif_writer_get_type (void) { +GType +jfif_writer_get_type (void) +{ static volatile gsize jfif_writer_type_id__volatile = 0; if (g_once_init_enter (&jfif_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (JfifWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) jfif_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (JfifWriter), 0, (GInstanceInitFunc) jfif_writer_instance_init, NULL }; @@ -1517,73 +1664,82 @@ GType jfif_writer_get_type (void) { } -JfifMetadataWriter* jfif_metadata_writer_construct (GType object_type, const gchar* filepath) { +JfifMetadataWriter* +jfif_metadata_writer_construct (GType object_type, + const gchar* filepath) +{ JfifMetadataWriter* self = NULL; - const gchar* _tmp0_; #line 137 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 138 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = filepath; -#line 138 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - self = (JfifMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_JFIF); + self = (JfifMetadataWriter*) photo_file_metadata_writer_construct (object_type, filepath, PHOTO_FILE_FORMAT_JFIF); #line 137 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 1532 "JfifSupport.c" +#line 1679 "JfifSupport.c" } -JfifMetadataWriter* jfif_metadata_writer_new (const gchar* filepath) { +JfifMetadataWriter* +jfif_metadata_writer_new (const gchar* filepath) +{ #line 137 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return jfif_metadata_writer_construct (TYPE_JFIF_METADATA_WRITER, filepath); -#line 1539 "JfifSupport.c" +#line 1688 "JfifSupport.c" } -static void jfif_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error) { +static void +jfif_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, + PhotoMetadata* metadata, + GError** error) +{ JfifMetadataWriter * self; - PhotoMetadata* _tmp0_; + GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; GError * _inner_error_ = NULL; #line 141 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_METADATA_WRITER, JfifMetadataWriter); #line 141 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_if_fail (IS_PHOTO_METADATA (metadata)); #line 142 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = metadata; -#line 142 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp0_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 142 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 142 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - photo_metadata_write_to_file (_tmp0_, _tmp2_, &_inner_error_); + photo_metadata_write_to_file (metadata, _tmp1_, &_inner_error_); #line 142 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 142 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 142 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #line 142 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return; -#line 1569 "JfifSupport.c" +#line 1719 "JfifSupport.c" } } -static void jfif_metadata_writer_class_init (JfifMetadataWriterClass * klass) { +static void +jfif_metadata_writer_class_init (JfifMetadataWriterClass * klass) +{ #line 136 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" jfif_metadata_writer_parent_class = g_type_class_peek_parent (klass); #line 136 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) jfif_metadata_writer_real_write_metadata; -#line 1579 "JfifSupport.c" +#line 1731 "JfifSupport.c" } -static void jfif_metadata_writer_instance_init (JfifMetadataWriter * self) { +static void +jfif_metadata_writer_instance_init (JfifMetadataWriter * self) +{ } -GType jfif_metadata_writer_get_type (void) { +GType +jfif_metadata_writer_get_type (void) +{ static volatile gsize jfif_metadata_writer_type_id__volatile = 0; if (g_once_init_enter (&jfif_metadata_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (JfifMetadataWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) jfif_metadata_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (JfifMetadataWriter), 0, (GInstanceInitFunc) jfif_metadata_writer_instance_init, NULL }; @@ -1595,17 +1751,21 @@ GType jfif_metadata_writer_get_type (void) { } -guint8 jpeg_marker_get_byte (JpegMarker self) { +guint8 +jpeg_marker_get_byte (JpegMarker self) +{ guint8 result = 0U; #line 160 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = (guint8) self; #line 160 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1605 "JfifSupport.c" +#line 1763 "JfifSupport.c" } -GType jpeg_marker_get_type (void) { +GType +jpeg_marker_get_type (void) +{ static volatile gsize jpeg_marker_type_id__volatile = 0; if (g_once_init_enter (&jpeg_marker_type_id__volatile)) { static const GEnumValue values[] = {{JPEG_MARKER_INVALID, "JPEG_MARKER_INVALID", "invalid"}, {JPEG_MARKER_SOI, "JPEG_MARKER_SOI", "soi"}, {JPEG_MARKER_EOI, "JPEG_MARKER_EOI", "eoi"}, {JPEG_MARKER_APP0, "JPEG_MARKER_APP0", "app0"}, {JPEG_MARKER_APP1, "JPEG_MARKER_APP1", "app1"}, {0, NULL, NULL}}; @@ -1617,17 +1777,21 @@ GType jpeg_marker_get_type (void) { } -gint jpeg_quality_get_pct (JpegQuality self) { +gint +jpeg_quality_get_pct (JpegQuality self) +{ gint result = 0; #line 171 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = (gint) self; #line 171 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1627 "JfifSupport.c" +#line 1789 "JfifSupport.c" } -gchar* jpeg_quality_get_pct_text (JpegQuality self) { +gchar* +jpeg_quality_get_pct_text (JpegQuality self) +{ gchar* result = NULL; gchar* _tmp0_; #line 175 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1636,11 +1800,13 @@ gchar* jpeg_quality_get_pct_text (JpegQuality self) { result = _tmp0_; #line 175 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1640 "JfifSupport.c" +#line 1804 "JfifSupport.c" } -JpegQuality* jpeg_quality_get_all (int* result_length1) { +JpegQuality* +jpeg_quality_get_all (int* result_length1) +{ JpegQuality* result = NULL; JpegQuality* _tmp0_; JpegQuality* _tmp1_; @@ -1663,23 +1829,25 @@ JpegQuality* jpeg_quality_get_all (int* result_length1) { if (result_length1) { #line 179 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *result_length1 = _tmp1__length1; -#line 1667 "JfifSupport.c" +#line 1833 "JfifSupport.c" } #line 179 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = _tmp1_; #line 179 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1673 "JfifSupport.c" +#line 1839 "JfifSupport.c" } -gchar* jpeg_quality_to_string (JpegQuality self) { +gchar* +jpeg_quality_to_string (JpegQuality self) +{ gchar* result = NULL; #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" switch (self) { #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" case JPEG_QUALITY_LOW: -#line 1683 "JfifSupport.c" +#line 1851 "JfifSupport.c" { gchar* _tmp0_; #line 185 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1688,11 +1856,11 @@ gchar* jpeg_quality_to_string (JpegQuality self) { result = _tmp0_; #line 185 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1692 "JfifSupport.c" +#line 1860 "JfifSupport.c" } #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" case JPEG_QUALITY_MEDIUM: -#line 1696 "JfifSupport.c" +#line 1864 "JfifSupport.c" { gchar* _tmp1_; #line 188 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1701,11 +1869,11 @@ gchar* jpeg_quality_to_string (JpegQuality self) { result = _tmp1_; #line 188 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1705 "JfifSupport.c" +#line 1873 "JfifSupport.c" } #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" case JPEG_QUALITY_HIGH: -#line 1709 "JfifSupport.c" +#line 1877 "JfifSupport.c" { gchar* _tmp2_; #line 191 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1714,11 +1882,11 @@ gchar* jpeg_quality_to_string (JpegQuality self) { result = _tmp2_; #line 191 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1718 "JfifSupport.c" +#line 1886 "JfifSupport.c" } #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" case JPEG_QUALITY_MAXIMUM: -#line 1722 "JfifSupport.c" +#line 1890 "JfifSupport.c" { gchar* _tmp3_; #line 194 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1727,12 +1895,12 @@ gchar* jpeg_quality_to_string (JpegQuality self) { result = _tmp3_; #line 194 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1731 "JfifSupport.c" +#line 1899 "JfifSupport.c" } default: #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" break; -#line 1736 "JfifSupport.c" +#line 1904 "JfifSupport.c" } #line 197 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_warn_if_reached (); @@ -1740,11 +1908,13 @@ gchar* jpeg_quality_to_string (JpegQuality self) { result = NULL; #line 199 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1744 "JfifSupport.c" +#line 1912 "JfifSupport.c" } -GType jpeg_quality_get_type (void) { +GType +jpeg_quality_get_type (void) +{ static volatile gsize jpeg_quality_type_id__volatile = 0; if (g_once_init_enter (&jpeg_quality_type_id__volatile)) { static const GEnumValue values[] = {{JPEG_QUALITY_LOW, "JPEG_QUALITY_LOW", "low"}, {JPEG_QUALITY_MEDIUM, "JPEG_QUALITY_MEDIUM", "medium"}, {JPEG_QUALITY_HIGH, "JPEG_QUALITY_HIGH", "high"}, {JPEG_QUALITY_MAXIMUM, "JPEG_QUALITY_MAXIMUM", "maximum"}, {0, NULL, NULL}}; @@ -1756,206 +1926,196 @@ GType jpeg_quality_get_type (void) { } -gboolean jpeg_is_jpeg (GFile* file, GError** error) { +gboolean +jpeg_is_jpeg (GFile* file, + GError** error) +{ gboolean result = FALSE; GFileInputStream* fins = NULL; - GFile* _tmp0_; - GFileInputStream* _tmp1_; - gboolean _tmp3_ = FALSE; - GFileInputStream* _tmp4_; - gboolean _tmp5_; + GFileInputStream* _tmp0_; + gboolean _tmp2_ = FALSE; + GFileInputStream* _tmp3_; GError * _inner_error_ = NULL; #line 203 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = file; + _tmp0_ = g_file_read (file, NULL, &_inner_error_); #line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = g_file_read (_tmp0_, NULL, &_inner_error_); -#line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - fins = _tmp1_; + fins = _tmp0_; #line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1779 "JfifSupport.c" - gboolean _tmp2_ = FALSE; +#line 1948 "JfifSupport.c" + gboolean _tmp1_ = FALSE; #line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - return _tmp2_; -#line 1785 "JfifSupport.c" + return _tmp1_; +#line 1954 "JfifSupport.c" } #line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp4_ = fins; -#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp5_ = jpeg_is_jpeg_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, g_input_stream_get_type (), GInputStream), &_inner_error_); + _tmp3_ = fins; #line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp3_ = _tmp5_; + _tmp2_ = jpeg_is_jpeg_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_input_stream_get_type (), GInputStream), &_inner_error_); #line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1795 "JfifSupport.c" - gboolean _tmp6_ = FALSE; +#line 1962 "JfifSupport.c" + gboolean _tmp4_ = FALSE; #line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _g_object_unref0 (fins); #line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - return _tmp6_; -#line 1803 "JfifSupport.c" + return _tmp4_; +#line 1970 "JfifSupport.c" } #line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = _tmp3_; + result = _tmp2_; #line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _g_object_unref0 (fins); #line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1811 "JfifSupport.c" +#line 1978 "JfifSupport.c" } -gboolean jpeg_is_jpeg_stream (GInputStream* ins, GError** error) { +gboolean +jpeg_is_jpeg_stream (GInputStream* ins, + GError** error) +{ gboolean result = FALSE; JpegMarker marker = 0; gint segment_length = 0; - GInputStream* _tmp0_; - JpegMarker _tmp1_ = 0; - gint _tmp2_; - gboolean _tmp4_ = FALSE; + JpegMarker _tmp0_ = 0; + gint _tmp1_; + gboolean _tmp3_ = FALSE; GError * _inner_error_ = NULL; #line 208 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (G_IS_INPUT_STREAM (ins), FALSE); #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = ins; -#line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp2_ = jpeg_read_marker (_tmp0_, &_tmp1_, &_inner_error_); + _tmp1_ = jpeg_read_marker (ins, &_tmp0_, &_inner_error_); #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - marker = _tmp1_; + marker = _tmp0_; #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - segment_length = _tmp2_; + segment_length = _tmp1_; #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1836 "JfifSupport.c" - gboolean _tmp3_ = FALSE; +#line 2003 "JfifSupport.c" + gboolean _tmp2_ = FALSE; #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - return _tmp3_; -#line 1842 "JfifSupport.c" + return _tmp2_; +#line 2009 "JfifSupport.c" } #line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (marker == JPEG_MARKER_SOI) { #line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp4_ = segment_length == 0; -#line 1848 "JfifSupport.c" + _tmp3_ = segment_length == 0; +#line 2015 "JfifSupport.c" } else { #line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp4_ = FALSE; -#line 1852 "JfifSupport.c" + _tmp3_ = FALSE; +#line 2019 "JfifSupport.c" } #line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = _tmp4_; + result = _tmp3_; #line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1858 "JfifSupport.c" +#line 2025 "JfifSupport.c" } -gboolean jpeg_is_jpeg_bytes (GBytes* bytes, GError** error) { +gboolean +jpeg_is_jpeg_bytes (GBytes* bytes, + GError** error) +{ gboolean result = FALSE; GMemoryInputStream* mins = NULL; - GBytes* _tmp0_; - GMemoryInputStream* _tmp1_; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_; + GMemoryInputStream* _tmp0_; + gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; #line 216 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (bytes != NULL, FALSE); #line 217 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = bytes; + _tmp0_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (bytes); #line 217 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp0_); -#line 217 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - mins = _tmp1_; -#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp3_ = jpeg_is_jpeg_stream (G_TYPE_CHECK_INSTANCE_CAST (mins, g_input_stream_get_type (), GInputStream), &_inner_error_); + mins = _tmp0_; #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp2_ = _tmp3_; + _tmp1_ = jpeg_is_jpeg_stream (G_TYPE_CHECK_INSTANCE_CAST (mins, g_input_stream_get_type (), GInputStream), &_inner_error_); #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1884 "JfifSupport.c" - gboolean _tmp4_ = FALSE; +#line 2048 "JfifSupport.c" + gboolean _tmp2_ = FALSE; #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _g_object_unref0 (mins); #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - return _tmp4_; -#line 1892 "JfifSupport.c" + return _tmp2_; +#line 2056 "JfifSupport.c" } #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = _tmp2_; + result = _tmp1_; #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _g_object_unref0 (mins); #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1900 "JfifSupport.c" +#line 2064 "JfifSupport.c" } -gint jpeg_read_marker (GInputStream* fins, JpegMarker* marker, GError** error) { +gint +jpeg_read_marker (GInputStream* fins, + JpegMarker* marker, + GError** error) +{ JpegMarker _vala_marker = 0; gint result = 0; GDataInputStream* dins = NULL; - GInputStream* _tmp0_; + GDataInputStream* _tmp0_; GDataInputStream* _tmp1_; - GDataInputStream* _tmp2_; - guint8 _tmp3_ = 0U; - GDataInputStream* _tmp4_; - guint8 _tmp5_; - guint8 _tmp7_ = 0U; - GDataInputStream* _tmp8_; - guint8 _tmp9_; - gboolean _tmp11_ = FALSE; - JpegMarker _tmp12_; + guint8 _tmp2_ = 0U; + GDataInputStream* _tmp3_; + guint8 _tmp5_ = 0U; + GDataInputStream* _tmp6_; + gboolean _tmp8_ = FALSE; + JpegMarker _tmp9_; guint16 length = 0U; - GDataInputStream* _tmp14_; - guint16 _tmp15_; - gboolean _tmp17_ = FALSE; - guint16 _tmp18_; - guint16 _tmp23_; + GDataInputStream* _tmp11_; + gboolean _tmp13_ = FALSE; + guint16 _tmp14_; + guint16 _tmp16_; GError * _inner_error_ = NULL; #line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (G_IS_INPUT_STREAM (fins), 0); #line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _vala_marker = JPEG_MARKER_INVALID; #line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = fins; + _tmp0_ = g_data_input_stream_new (fins); #line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = g_data_input_stream_new (_tmp0_); -#line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - dins = _tmp1_; + dins = _tmp0_; #line 226 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp2_ = dins; + _tmp1_ = dins; #line 226 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - g_data_input_stream_set_byte_order (_tmp2_, G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN); -#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp4_ = dins; + g_data_input_stream_set_byte_order (_tmp1_, G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN); #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp5_ = g_data_input_stream_read_byte (_tmp4_, NULL, &_inner_error_); + _tmp3_ = dins; #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp3_ = _tmp5_; + _tmp2_ = g_data_input_stream_read_byte (_tmp3_, NULL, &_inner_error_); #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1948 "JfifSupport.c" - gint _tmp6_ = 0; +#line 2108 "JfifSupport.c" + gint _tmp4_ = 0; #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _g_object_unref0 (dins); #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - return _tmp6_; -#line 1956 "JfifSupport.c" + return _tmp4_; +#line 2116 "JfifSupport.c" } #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - if (_tmp3_ != JPEG_MARKER_PREFIX) { + if (_tmp2_ != JPEG_MARKER_PREFIX) { #line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = -1; #line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1964,49 +2124,47 @@ gint jpeg_read_marker (GInputStream* fins, JpegMarker* marker, GError** error) { if (marker) { #line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *marker = _vala_marker; -#line 1968 "JfifSupport.c" +#line 2128 "JfifSupport.c" } #line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1972 "JfifSupport.c" +#line 2132 "JfifSupport.c" } #line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp8_ = dins; -#line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp9_ = g_data_input_stream_read_byte (_tmp8_, NULL, &_inner_error_); + _tmp6_ = dins; #line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp7_ = _tmp9_; + _tmp5_ = g_data_input_stream_read_byte (_tmp6_, NULL, &_inner_error_); #line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1982 "JfifSupport.c" - gint _tmp10_ = 0; +#line 2140 "JfifSupport.c" + gint _tmp7_ = 0; #line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _g_object_unref0 (dins); #line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - return _tmp10_; -#line 1990 "JfifSupport.c" + return _tmp7_; +#line 2148 "JfifSupport.c" } #line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _vala_marker = (JpegMarker) _tmp7_; + _vala_marker = (JpegMarker) _tmp5_; #line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp12_ = _vala_marker; + _tmp9_ = _vala_marker; #line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - if (_tmp12_ == JPEG_MARKER_SOI) { + if (_tmp9_ == JPEG_MARKER_SOI) { #line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp11_ = TRUE; -#line 2000 "JfifSupport.c" + _tmp8_ = TRUE; +#line 2158 "JfifSupport.c" } else { - JpegMarker _tmp13_; + JpegMarker _tmp10_; #line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp13_ = _vala_marker; + _tmp10_ = _vala_marker; #line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp11_ = _tmp13_ == JPEG_MARKER_EOI; -#line 2007 "JfifSupport.c" + _tmp8_ = _tmp10_ == JPEG_MARKER_EOI; +#line 2165 "JfifSupport.c" } #line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - if (_tmp11_) { + if (_tmp8_) { #line 234 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = 0; #line 234 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -2015,60 +2173,48 @@ gint jpeg_read_marker (GInputStream* fins, JpegMarker* marker, GError** error) { if (marker) { #line 234 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *marker = _vala_marker; -#line 2019 "JfifSupport.c" +#line 2177 "JfifSupport.c" } #line 234 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 2023 "JfifSupport.c" +#line 2181 "JfifSupport.c" } #line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp14_ = dins; -#line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp15_ = g_data_input_stream_read_uint16 (_tmp14_, NULL, &_inner_error_); + _tmp11_ = dins; #line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - length = _tmp15_; + length = g_data_input_stream_read_uint16 (_tmp11_, NULL, &_inner_error_); #line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2033 "JfifSupport.c" - gint _tmp16_ = 0; +#line 2189 "JfifSupport.c" + gint _tmp12_ = 0; #line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _g_object_unref0 (dins); #line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - return _tmp16_; -#line 2041 "JfifSupport.c" + return _tmp12_; +#line 2197 "JfifSupport.c" } #line 238 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp18_ = length; -#line 238 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - if (((gint) _tmp18_) < 2) { -#line 2047 "JfifSupport.c" - GInputStream* _tmp19_; + _tmp14_ = length; #line 238 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp19_ = fins; + if (((gint) _tmp14_) < 2) { #line 238 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp17_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, g_seekable_get_type ()); -#line 2053 "JfifSupport.c" + _tmp13_ = G_TYPE_CHECK_INSTANCE_TYPE (fins, g_seekable_get_type ()); +#line 2205 "JfifSupport.c" } else { #line 238 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp17_ = FALSE; -#line 2057 "JfifSupport.c" + _tmp13_ = FALSE; +#line 2209 "JfifSupport.c" } #line 238 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - if (_tmp17_) { -#line 2061 "JfifSupport.c" - guint16 _tmp20_; - GInputStream* _tmp21_; - gint64 _tmp22_; -#line 239 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp20_ = length; -#line 239 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp21_ = fins; + if (_tmp13_) { +#line 2213 "JfifSupport.c" + guint16 _tmp15_; #line 239 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp22_ = g_seekable_tell (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, g_seekable_get_type ()) ? ((GSeekable*) _tmp21_) : NULL); + _tmp15_ = length; #line 239 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - g_debug ("Invalid length %Xh at ofs %" G_GINT64_FORMAT "Xh", _tmp20_, _tmp22_ - 2); + g_debug ("Invalid length %Xh at ofs %" G_GINT64_FORMAT "Xh", _tmp15_, g_seekable_tell (G_TYPE_CHECK_INSTANCE_TYPE (fins, g_seekable_get_type ()) ? ((GSeekable*) fins) : NULL) - 2); #line 242 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = -1; #line 242 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -2077,27 +2223,27 @@ gint jpeg_read_marker (GInputStream* fins, JpegMarker* marker, GError** error) { if (marker) { #line 242 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *marker = _vala_marker; -#line 2081 "JfifSupport.c" +#line 2227 "JfifSupport.c" } #line 242 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 2085 "JfifSupport.c" +#line 2231 "JfifSupport.c" } #line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp23_ = length; + _tmp16_ = length; #line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = _tmp23_ - 2; + result = _tmp16_ - 2; #line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _g_object_unref0 (dins); #line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (marker) { #line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *marker = _vala_marker; -#line 2097 "JfifSupport.c" +#line 2243 "JfifSupport.c" } #line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 2101 "JfifSupport.c" +#line 2247 "JfifSupport.c" } diff --git a/src/photos/PhotoFileAdapter.c b/src/photos/PhotoFileAdapter.c index 4f46fdc..72dcc4f 100644 --- a/src/photos/PhotoFileAdapter.c +++ b/src/photos/PhotoFileAdapter.c @@ -1,4 +1,4 @@ -/* PhotoFileAdapter.c generated by valac 0.36.6, the Vala compiler +/* PhotoFileAdapter.c generated by valac 0.40.4, the Vala compiler * generated from PhotoFileAdapter.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -19,6 +19,7 @@ /* atomicity on the filesystem.*/ /**/ + #include #include #include @@ -202,17 +203,22 @@ static gpointer photo_file_metadata_writer_parent_class = NULL; gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_format_get_type (void) G_GNUC_CONST; #define PHOTO_FILE_ADAPTER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapterPrivate)) -enum { - PHOTO_FILE_ADAPTER_DUMMY_PROPERTY -}; -PhotoFileAdapter* photo_file_adapter_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); +PhotoFileAdapter* photo_file_adapter_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); gboolean photo_file_adapter_file_exists (PhotoFileAdapter* self); gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self); GFile* photo_file_adapter_get_file (PhotoFileAdapter* self); @@ -221,9 +227,15 @@ static void photo_file_adapter_finalize (PhotoFileAdapter * obj); GType photo_file_reader_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -232,91 +244,117 @@ Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); GType photo_file_reader_role_get_type (void) G_GNUC_CONST; #define PHOTO_FILE_READER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_FILE_READER, PhotoFileReaderPrivate)) -enum { - PHOTO_FILE_READER_DUMMY_PROPERTY -}; -PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); +PhotoFileReader* photo_file_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); GType photo_file_writer_get_type (void) G_GNUC_CONST; GQuark photo_format_error_quark (void); -PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError** error); -PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gchar* filepath, GError** error); +PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, + GError** error); +PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, + const gchar* filepath, + GError** error); GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST; -PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileReader* self, GError** error); -PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self, const gchar* filepath, GError** error); -PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error); -static PhotoMetadata* photo_file_reader_real_read_metadata (PhotoFileReader* self, GError** error); -GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self, GError** error); -static GdkPixbuf* photo_file_reader_real_unscaled_read (PhotoFileReader* self, GError** error); -GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error); -static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error); -GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp); -void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role); +PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileReader* self, + GError** error); +PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self, + const gchar* filepath, + GError** error); +PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, + GError** error); +static PhotoMetadata* photo_file_reader_real_read_metadata (PhotoFileReader* self, + GError** error); +GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self, + GError** error); +static GdkPixbuf* photo_file_reader_real_unscaled_read (PhotoFileReader* self, + GError** error); +GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, + Dimensions* full, + Dimensions* scaled, + GError** error); +static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, + Dimensions* full, + Dimensions* scaled, + GError** error); +GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, + Dimensions* resized, + GdkInterpType interp); +void photo_file_reader_set_role (PhotoFileReader* self, + PhotoFileReaderRole role); PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self); static void photo_file_reader_finalize (PhotoFileAdapter * obj); GType jpeg_quality_get_type (void) G_GNUC_CONST; -enum { - PHOTO_FILE_WRITER_DUMMY_PROPERTY -}; -PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); +PhotoFileWriter* photo_file_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); PhotoFileReader* photo_file_writer_create_reader (PhotoFileWriter* self); -PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gchar* filepath); -void photo_file_writer_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error); -static void photo_file_writer_real_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error); -enum { - PHOTO_FILE_METADATA_WRITER_DUMMY_PROPERTY -}; -PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); +PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, + const gchar* filepath); +void photo_file_writer_write (PhotoFileWriter* self, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error); +static void photo_file_writer_real_write (PhotoFileWriter* self, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error); +PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); PhotoFileReader* photo_file_metadata_writer_create_reader (PhotoFileMetadataWriter* self); -void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error); -static void photo_file_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error); - - -PhotoFileAdapter* photo_file_adapter_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { +void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, + PhotoMetadata* metadata, + GError** error); +static void photo_file_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* self, + PhotoMetadata* metadata, + GError** error); + + +PhotoFileAdapter* +photo_file_adapter_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format) +{ PhotoFileAdapter* self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - PhotoFileFormat _tmp2_; + gchar* _tmp0_; #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" self = (PhotoFileAdapter*) g_type_create_instance (object_type); #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp0_ = filepath; -#line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (filepath); #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _g_free0 (self->priv->filepath); #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - self->priv->filepath = _tmp1_; -#line 27 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp2_ = file_format; + self->priv->filepath = _tmp0_; #line 27 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - self->priv->file_format = _tmp2_; + self->priv->file_format = file_format; #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return self; -#line 298 "PhotoFileAdapter.c" +#line 335 "PhotoFileAdapter.c" } -gboolean photo_file_adapter_file_exists (PhotoFileAdapter* self) { +gboolean +photo_file_adapter_file_exists (PhotoFileAdapter* self) +{ gboolean result = FALSE; const gchar* _tmp0_; - gboolean _tmp1_; #line 30 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), FALSE); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _tmp0_ = self->priv->filepath; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp1_ = g_file_test (_tmp0_, G_FILE_TEST_IS_REGULAR); -#line 31 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - result = _tmp1_; + result = g_file_test (_tmp0_, G_FILE_TEST_IS_REGULAR); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return result; -#line 316 "PhotoFileAdapter.c" +#line 352 "PhotoFileAdapter.c" } -gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self) { +gchar* +photo_file_adapter_get_filepath (PhotoFileAdapter* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -330,31 +368,35 @@ gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self) { result = _tmp1_; #line 35 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return result; -#line 334 "PhotoFileAdapter.c" +#line 372 "PhotoFileAdapter.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return self ? g_object_ref (self) : NULL; -#line 341 "PhotoFileAdapter.c" +#line 381 "PhotoFileAdapter.c" } -GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) { +GFile* +photo_file_adapter_get_file (PhotoFileAdapter* self) +{ GFile* result = NULL; GFile* _result_ = NULL; GError * _inner_error_ = NULL; #line 38 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), NULL); -#line 351 "PhotoFileAdapter.c" +#line 393 "PhotoFileAdapter.c" { GFile* _tmp0_; #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _tmp0_ = self->priv->file; #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_rec_mutex_lock (&self->priv->__lock_file); -#line 358 "PhotoFileAdapter.c" +#line 400 "PhotoFileAdapter.c" { GFile* _tmp1_; GFile* _tmp4_; @@ -363,7 +405,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) { _tmp1_ = self->priv->file; #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (_tmp1_ == NULL) { -#line 367 "PhotoFileAdapter.c" +#line 409 "PhotoFileAdapter.c" const gchar* _tmp2_; GFile* _tmp3_; #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -374,7 +416,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) { _g_object_unref0 (self->priv->file); #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" self->priv->file = _tmp3_; -#line 378 "PhotoFileAdapter.c" +#line 420 "PhotoFileAdapter.c" } #line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _tmp4_ = self->priv->file; @@ -384,7 +426,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) { _g_object_unref0 (_result_); #line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _result_ = _tmp5_; -#line 388 "PhotoFileAdapter.c" +#line 430 "PhotoFileAdapter.c" } __finally28: { @@ -393,7 +435,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) { _tmp6_ = self->priv->file; #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_rec_mutex_unlock (&self->priv->__lock_file); -#line 397 "PhotoFileAdapter.c" +#line 439 "PhotoFileAdapter.c" } #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -405,18 +447,20 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) { g_clear_error (&_inner_error_); #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return NULL; -#line 409 "PhotoFileAdapter.c" +#line 451 "PhotoFileAdapter.c" } } #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" result = _result_; #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return result; -#line 416 "PhotoFileAdapter.c" +#line 458 "PhotoFileAdapter.c" } -PhotoFileFormat photo_file_adapter_get_file_format (PhotoFileAdapter* self) { +PhotoFileFormat +photo_file_adapter_get_file_format (PhotoFileAdapter* self) +{ PhotoFileFormat result = 0; PhotoFileFormat _tmp0_; #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -427,108 +471,133 @@ PhotoFileFormat photo_file_adapter_get_file_format (PhotoFileAdapter* self) { result = _tmp0_; #line 51 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return result; -#line 431 "PhotoFileAdapter.c" +#line 475 "PhotoFileAdapter.c" } -static void value_photo_file_adapter_init (GValue* value) { +static void +value_photo_file_adapter_init (GValue* value) +{ #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" value->data[0].v_pointer = NULL; -#line 438 "PhotoFileAdapter.c" +#line 484 "PhotoFileAdapter.c" } -static void value_photo_file_adapter_free_value (GValue* value) { +static void +value_photo_file_adapter_free_value (GValue* value) +{ #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (value->data[0].v_pointer) { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" photo_file_adapter_unref (value->data[0].v_pointer); -#line 447 "PhotoFileAdapter.c" +#line 495 "PhotoFileAdapter.c" } } -static void value_photo_file_adapter_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_photo_file_adapter_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (src_value->data[0].v_pointer) { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" dest_value->data[0].v_pointer = photo_file_adapter_ref (src_value->data[0].v_pointer); -#line 457 "PhotoFileAdapter.c" +#line 508 "PhotoFileAdapter.c" } else { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" dest_value->data[0].v_pointer = NULL; -#line 461 "PhotoFileAdapter.c" +#line 512 "PhotoFileAdapter.c" } } -static gpointer value_photo_file_adapter_peek_pointer (const GValue* value) { +static gpointer +value_photo_file_adapter_peek_pointer (const GValue* value) +{ #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return value->data[0].v_pointer; -#line 469 "PhotoFileAdapter.c" +#line 522 "PhotoFileAdapter.c" } -static gchar* value_photo_file_adapter_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_file_adapter_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (collect_values[0].v_pointer) { -#line 476 "PhotoFileAdapter.c" +#line 534 "PhotoFileAdapter.c" PhotoFileAdapter * object; object = collect_values[0].v_pointer; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (object->parent_instance.g_class == NULL) { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 483 "PhotoFileAdapter.c" +#line 541 "PhotoFileAdapter.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 487 "PhotoFileAdapter.c" +#line 545 "PhotoFileAdapter.c" } #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" value->data[0].v_pointer = photo_file_adapter_ref (object); -#line 491 "PhotoFileAdapter.c" +#line 549 "PhotoFileAdapter.c" } else { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" value->data[0].v_pointer = NULL; -#line 495 "PhotoFileAdapter.c" +#line 553 "PhotoFileAdapter.c" } #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return NULL; -#line 499 "PhotoFileAdapter.c" +#line 557 "PhotoFileAdapter.c" } -static gchar* value_photo_file_adapter_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_file_adapter_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoFileAdapter ** object_p; object_p = collect_values[0].v_pointer; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (!object_p) { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 510 "PhotoFileAdapter.c" +#line 573 "PhotoFileAdapter.c" } #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (!value->data[0].v_pointer) { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" *object_p = NULL; -#line 516 "PhotoFileAdapter.c" +#line 579 "PhotoFileAdapter.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" *object_p = value->data[0].v_pointer; -#line 520 "PhotoFileAdapter.c" +#line 583 "PhotoFileAdapter.c" } else { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" *object_p = photo_file_adapter_ref (value->data[0].v_pointer); -#line 524 "PhotoFileAdapter.c" +#line 587 "PhotoFileAdapter.c" } #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return NULL; -#line 528 "PhotoFileAdapter.c" +#line 591 "PhotoFileAdapter.c" } -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPhotoFileAdapter* spec; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PHOTO_FILE_ADAPTER), NULL); @@ -538,20 +607,25 @@ GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return G_PARAM_SPEC (spec); -#line 542 "PhotoFileAdapter.c" +#line 611 "PhotoFileAdapter.c" } -gpointer value_get_photo_file_adapter (const GValue* value) { +gpointer +value_get_photo_file_adapter (const GValue* value) +{ #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_ADAPTER), NULL); #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return value->data[0].v_pointer; -#line 551 "PhotoFileAdapter.c" +#line 622 "PhotoFileAdapter.c" } -void value_set_photo_file_adapter (GValue* value, gpointer v_object) { +void +value_set_photo_file_adapter (GValue* value, + gpointer v_object) +{ PhotoFileAdapter * old; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_ADAPTER)); @@ -567,22 +641,25 @@ void value_set_photo_file_adapter (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" photo_file_adapter_ref (value->data[0].v_pointer); -#line 571 "PhotoFileAdapter.c" +#line 645 "PhotoFileAdapter.c" } else { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" value->data[0].v_pointer = NULL; -#line 575 "PhotoFileAdapter.c" +#line 649 "PhotoFileAdapter.c" } #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (old) { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" photo_file_adapter_unref (old); -#line 581 "PhotoFileAdapter.c" +#line 655 "PhotoFileAdapter.c" } } -void value_take_photo_file_adapter (GValue* value, gpointer v_object) { +void +value_take_photo_file_adapter (GValue* value, + gpointer v_object) +{ PhotoFileAdapter * old; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_ADAPTER)); @@ -596,33 +673,37 @@ void value_take_photo_file_adapter (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" value->data[0].v_pointer = v_object; -#line 600 "PhotoFileAdapter.c" +#line 677 "PhotoFileAdapter.c" } else { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" value->data[0].v_pointer = NULL; -#line 604 "PhotoFileAdapter.c" +#line 681 "PhotoFileAdapter.c" } #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (old) { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" photo_file_adapter_unref (old); -#line 610 "PhotoFileAdapter.c" +#line 687 "PhotoFileAdapter.c" } } -static void photo_file_adapter_class_init (PhotoFileAdapterClass * klass) { +static void +photo_file_adapter_class_init (PhotoFileAdapterClass * klass) +{ #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" photo_file_adapter_parent_class = g_type_class_peek_parent (klass); #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" ((PhotoFileAdapterClass *) klass)->finalize = photo_file_adapter_finalize; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_type_class_add_private (klass, sizeof (PhotoFileAdapterPrivate)); -#line 622 "PhotoFileAdapter.c" +#line 701 "PhotoFileAdapter.c" } -static void photo_file_adapter_instance_init (PhotoFileAdapter * self) { +static void +photo_file_adapter_instance_init (PhotoFileAdapter * self) +{ #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" self->priv = PHOTO_FILE_ADAPTER_GET_PRIVATE (self); #line 23 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -631,11 +712,13 @@ static void photo_file_adapter_instance_init (PhotoFileAdapter * self) { self->priv->file = NULL; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" self->ref_count = 1; -#line 635 "PhotoFileAdapter.c" +#line 716 "PhotoFileAdapter.c" } -static void photo_file_adapter_finalize (PhotoFileAdapter * obj) { +static void +photo_file_adapter_finalize (PhotoFileAdapter * obj) +{ PhotoFileAdapter * self; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter); @@ -647,11 +730,13 @@ static void photo_file_adapter_finalize (PhotoFileAdapter * obj) { g_rec_mutex_clear (&self->priv->__lock_file); #line 23 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _g_object_unref0 (self->priv->file); -#line 651 "PhotoFileAdapter.c" +#line 734 "PhotoFileAdapter.c" } -GType photo_file_adapter_get_type (void) { +GType +photo_file_adapter_get_type (void) +{ static volatile gsize photo_file_adapter_type_id__volatile = 0; if (g_once_init_enter (&photo_file_adapter_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_photo_file_adapter_init, value_photo_file_adapter_free_value, value_photo_file_adapter_copy_value, value_photo_file_adapter_peek_pointer, "p", value_photo_file_adapter_collect_value, "p", value_photo_file_adapter_lcopy_value }; @@ -665,18 +750,22 @@ GType photo_file_adapter_get_type (void) { } -gpointer photo_file_adapter_ref (gpointer instance) { +gpointer +photo_file_adapter_ref (gpointer instance) +{ PhotoFileAdapter * self; self = instance; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_atomic_int_inc (&self->ref_count); #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return instance; -#line 676 "PhotoFileAdapter.c" +#line 763 "PhotoFileAdapter.c" } -void photo_file_adapter_unref (gpointer instance) { +void +photo_file_adapter_unref (gpointer instance) +{ PhotoFileAdapter * self; self = instance; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -685,12 +774,14 @@ void photo_file_adapter_unref (gpointer instance) { PHOTO_FILE_ADAPTER_GET_CLASS (self)->finalize (self); #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_type_free_instance ((GTypeInstance *) self); -#line 689 "PhotoFileAdapter.c" +#line 778 "PhotoFileAdapter.c" } } -GType photo_file_reader_role_get_type (void) { +GType +photo_file_reader_role_get_type (void) +{ static volatile gsize photo_file_reader_role_type_id__volatile = 0; if (g_once_init_enter (&photo_file_reader_role_type_id__volatile)) { static const GEnumValue values[] = {{PHOTO_FILE_READER_ROLE_DEFAULT, "PHOTO_FILE_READER_ROLE_DEFAULT", "default"}, {PHOTO_FILE_READER_ROLE_THUMBNAIL, "PHOTO_FILE_READER_ROLE_THUMBNAIL", "thumbnail"}, {0, NULL, NULL}}; @@ -702,50 +793,48 @@ GType photo_file_reader_role_get_type (void) { } -PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { +PhotoFileReader* +photo_file_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format) +{ PhotoFileReader* self = NULL; - const gchar* _tmp0_; - PhotoFileFormat _tmp1_; #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp0_ = filepath; -#line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp1_ = file_format; -#line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - self = (PhotoFileReader*) photo_file_adapter_construct (object_type, _tmp0_, _tmp1_); + self = (PhotoFileReader*) photo_file_adapter_construct (object_type, filepath, file_format); #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return self; -#line 720 "PhotoFileAdapter.c" +#line 809 "PhotoFileAdapter.c" } -PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError** error) { +PhotoFileWriter* +photo_file_reader_create_writer (PhotoFileReader* self, + GError** error) +{ PhotoFileWriter* result = NULL; PhotoFileWriter* _tmp0_ = NULL; - PhotoFileFormat _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; + PhotoFileWriter* _tmp3_; PhotoFileWriter* _tmp4_; PhotoFileWriter* _tmp5_; - PhotoFileWriter* _tmp6_; GError * _inner_error_ = NULL; #line 71 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL); #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp1_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp2_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp4_ = photo_file_format_create_writer (_tmp1_, _tmp3_, &_inner_error_); + _tmp3_ = photo_file_format_create_writer (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)), _tmp2_, &_inner_error_); #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp0_ = _tmp5_; + _tmp0_ = _tmp4_; #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -754,7 +843,7 @@ PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError* g_propagate_error (error, _inner_error_); #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return NULL; -#line 758 "PhotoFileAdapter.c" +#line 847 "PhotoFileAdapter.c" } else { #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -762,49 +851,49 @@ PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError* g_clear_error (&_inner_error_); #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return NULL; -#line 766 "PhotoFileAdapter.c" +#line 855 "PhotoFileAdapter.c" } } #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp6_ = _tmp0_; + _tmp5_ = _tmp0_; #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _tmp0_ = NULL; #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - result = _tmp6_; + result = _tmp5_; #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _photo_file_adapter_unref0 (_tmp0_); #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return result; -#line 779 "PhotoFileAdapter.c" +#line 868 "PhotoFileAdapter.c" } -PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileReader* self, GError** error) { +PhotoFileMetadataWriter* +photo_file_reader_create_metadata_writer (PhotoFileReader* self, + GError** error) +{ PhotoFileMetadataWriter* result = NULL; PhotoFileMetadataWriter* _tmp0_ = NULL; - PhotoFileFormat _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; + PhotoFileMetadataWriter* _tmp3_; PhotoFileMetadataWriter* _tmp4_; PhotoFileMetadataWriter* _tmp5_; - PhotoFileMetadataWriter* _tmp6_; GError * _inner_error_ = NULL; #line 75 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL); #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp1_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp2_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp4_ = photo_file_format_create_metadata_writer (_tmp1_, _tmp3_, &_inner_error_); + _tmp3_ = photo_file_format_create_metadata_writer (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)), _tmp2_, &_inner_error_); #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp0_ = _tmp5_; + _tmp0_ = _tmp4_; #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -813,7 +902,7 @@ PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileRead g_propagate_error (error, _inner_error_); #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return NULL; -#line 817 "PhotoFileAdapter.c" +#line 906 "PhotoFileAdapter.c" } else { #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -821,60 +910,77 @@ PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileRead g_clear_error (&_inner_error_); #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return NULL; -#line 825 "PhotoFileAdapter.c" +#line 914 "PhotoFileAdapter.c" } } #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp6_ = _tmp0_; + _tmp5_ = _tmp0_; #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _tmp0_ = NULL; #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - result = _tmp6_; + result = _tmp5_; #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _photo_file_adapter_unref0 (_tmp0_); #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return result; -#line 838 "PhotoFileAdapter.c" +#line 927 "PhotoFileAdapter.c" } -static PhotoMetadata* photo_file_reader_real_read_metadata (PhotoFileReader* self, GError** error) { +static PhotoMetadata* +photo_file_reader_real_read_metadata (PhotoFileReader* self, + GError** error) +{ #line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_reader_read_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return NULL; -#line 847 "PhotoFileAdapter.c" +#line 939 "PhotoFileAdapter.c" } -PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error) { +PhotoMetadata* +photo_file_reader_read_metadata (PhotoFileReader* self, + GError** error) +{ #line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL); #line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return PHOTO_FILE_READER_GET_CLASS (self)->read_metadata (self, error); -#line 856 "PhotoFileAdapter.c" +#line 951 "PhotoFileAdapter.c" } -static GdkPixbuf* photo_file_reader_real_unscaled_read (PhotoFileReader* self, GError** error) { +static GdkPixbuf* +photo_file_reader_real_unscaled_read (PhotoFileReader* self, + GError** error) +{ #line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_reader_unscaled_read'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return NULL; -#line 865 "PhotoFileAdapter.c" +#line 963 "PhotoFileAdapter.c" } -GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self, GError** error) { +GdkPixbuf* +photo_file_reader_unscaled_read (PhotoFileReader* self, + GError** error) +{ #line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL); #line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return PHOTO_FILE_READER_GET_CLASS (self)->unscaled_read (self, error); -#line 874 "PhotoFileAdapter.c" +#line 975 "PhotoFileAdapter.c" } -static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error) { +static GdkPixbuf* +photo_file_reader_real_scaled_read (PhotoFileReader* self, + Dimensions* full, + Dimensions* scaled, + GError** error) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; GdkPixbuf* _tmp1_; @@ -895,7 +1001,7 @@ static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dim g_propagate_error (error, _inner_error_); #line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return NULL; -#line 899 "PhotoFileAdapter.c" +#line 1005 "PhotoFileAdapter.c" } #line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _tmp2_ = *scaled; @@ -907,32 +1013,39 @@ static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dim _g_object_unref0 (_tmp0_); #line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return result; -#line 911 "PhotoFileAdapter.c" +#line 1017 "PhotoFileAdapter.c" } -GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error) { +GdkPixbuf* +photo_file_reader_scaled_read (PhotoFileReader* self, + Dimensions* full, + Dimensions* scaled, + GError** error) +{ #line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL); #line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return PHOTO_FILE_READER_GET_CLASS (self)->scaled_read (self, full, scaled, error); -#line 920 "PhotoFileAdapter.c" +#line 1031 "PhotoFileAdapter.c" } -void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role) { - PhotoFileReaderRole _tmp0_; +void +photo_file_reader_set_role (PhotoFileReader* self, + PhotoFileReaderRole role) +{ #line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_if_fail (IS_PHOTO_FILE_READER (self)); #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp0_ = role; -#line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - self->priv->role = _tmp0_; -#line 932 "PhotoFileAdapter.c" + self->priv->role = role; +#line 1043 "PhotoFileAdapter.c" } -PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self) { +PhotoFileReaderRole +photo_file_reader_get_role (PhotoFileReader* self) +{ PhotoFileReaderRole result = 0; PhotoFileReaderRole _tmp0_; #line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -943,11 +1056,13 @@ PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self) { result = _tmp0_; #line 92 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return result; -#line 947 "PhotoFileAdapter.c" +#line 1060 "PhotoFileAdapter.c" } -static void photo_file_reader_class_init (PhotoFileReaderClass * klass) { +static void +photo_file_reader_class_init (PhotoFileReaderClass * klass) +{ #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" photo_file_reader_parent_class = g_type_class_peek_parent (klass); #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -960,30 +1075,36 @@ static void photo_file_reader_class_init (PhotoFileReaderClass * klass) { ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) photo_file_reader_real_unscaled_read; #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) photo_file_reader_real_scaled_read; -#line 964 "PhotoFileAdapter.c" +#line 1079 "PhotoFileAdapter.c" } -static void photo_file_reader_instance_init (PhotoFileReader * self) { +static void +photo_file_reader_instance_init (PhotoFileReader * self) +{ #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" self->priv = PHOTO_FILE_READER_GET_PRIVATE (self); #line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" self->priv->role = PHOTO_FILE_READER_ROLE_DEFAULT; -#line 973 "PhotoFileAdapter.c" +#line 1090 "PhotoFileAdapter.c" } -static void photo_file_reader_finalize (PhotoFileAdapter * obj) { +static void +photo_file_reader_finalize (PhotoFileAdapter * obj) +{ PhotoFileReader * self; #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_READER, PhotoFileReader); #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" PHOTO_FILE_ADAPTER_CLASS (photo_file_reader_parent_class)->finalize (obj); -#line 983 "PhotoFileAdapter.c" +#line 1102 "PhotoFileAdapter.c" } -GType photo_file_reader_get_type (void) { +GType +photo_file_reader_get_type (void) +{ static volatile gsize photo_file_reader_type_id__volatile = 0; if (g_once_init_enter (&photo_file_reader_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoFileReaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_file_reader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoFileReader), 0, (GInstanceInitFunc) photo_file_reader_instance_init, NULL }; @@ -995,85 +1116,98 @@ GType photo_file_reader_get_type (void) { } -PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { +PhotoFileWriter* +photo_file_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format) +{ PhotoFileWriter* self = NULL; - const gchar* _tmp0_; - PhotoFileFormat _tmp1_; #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp0_ = filepath; -#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp1_ = file_format; -#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - self = (PhotoFileWriter*) photo_file_adapter_construct (object_type, _tmp0_, _tmp1_); + self = (PhotoFileWriter*) photo_file_adapter_construct (object_type, filepath, file_format); #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return self; -#line 1013 "PhotoFileAdapter.c" +#line 1132 "PhotoFileAdapter.c" } -PhotoFileReader* photo_file_writer_create_reader (PhotoFileWriter* self) { +PhotoFileReader* +photo_file_writer_create_reader (PhotoFileWriter* self) +{ PhotoFileReader* result = NULL; - PhotoFileFormat _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; + PhotoFileReader* _tmp2_; PhotoFileReader* _tmp3_; - PhotoFileReader* _tmp4_; #line 105 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_WRITER (self), NULL); #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp0_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp0_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp3_ = photo_file_format_create_reader (_tmp0_, _tmp2_); + _tmp2_ = photo_file_format_create_reader (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)), _tmp1_); #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - result = _tmp4_; + result = _tmp3_; #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return result; -#line 1042 "PhotoFileAdapter.c" +#line 1160 "PhotoFileAdapter.c" } -static void photo_file_writer_real_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) { +static void +photo_file_writer_real_write (PhotoFileWriter* self, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error) +{ #line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_writer_write'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return; -#line 1051 "PhotoFileAdapter.c" +#line 1174 "PhotoFileAdapter.c" } -void photo_file_writer_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) { +void +photo_file_writer_write (PhotoFileWriter* self, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error) +{ #line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_if_fail (IS_PHOTO_FILE_WRITER (self)); #line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" PHOTO_FILE_WRITER_GET_CLASS (self)->write (self, pixbuf, quality, error); -#line 1060 "PhotoFileAdapter.c" +#line 1188 "PhotoFileAdapter.c" } -static void photo_file_writer_class_init (PhotoFileWriterClass * klass) { +static void +photo_file_writer_class_init (PhotoFileWriterClass * klass) +{ #line 100 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" photo_file_writer_parent_class = g_type_class_peek_parent (klass); #line 100 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" ((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) photo_file_writer_real_write; -#line 1069 "PhotoFileAdapter.c" +#line 1199 "PhotoFileAdapter.c" } -static void photo_file_writer_instance_init (PhotoFileWriter * self) { +static void +photo_file_writer_instance_init (PhotoFileWriter * self) +{ } -GType photo_file_writer_get_type (void) { +GType +photo_file_writer_get_type (void) +{ static volatile gsize photo_file_writer_type_id__volatile = 0; if (g_once_init_enter (&photo_file_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoFileWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_file_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoFileWriter), 0, (GInstanceInitFunc) photo_file_writer_instance_init, NULL }; @@ -1085,85 +1219,96 @@ GType photo_file_writer_get_type (void) { } -PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { +PhotoFileMetadataWriter* +photo_file_metadata_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format) +{ PhotoFileMetadataWriter* self = NULL; - const gchar* _tmp0_; - PhotoFileFormat _tmp1_; #line 117 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp0_ = filepath; -#line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp1_ = file_format; -#line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - self = (PhotoFileMetadataWriter*) photo_file_adapter_construct (object_type, _tmp0_, _tmp1_); + self = (PhotoFileMetadataWriter*) photo_file_adapter_construct (object_type, filepath, file_format); #line 117 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return self; -#line 1103 "PhotoFileAdapter.c" +#line 1235 "PhotoFileAdapter.c" } -PhotoFileReader* photo_file_metadata_writer_create_reader (PhotoFileMetadataWriter* self) { +PhotoFileReader* +photo_file_metadata_writer_create_reader (PhotoFileMetadataWriter* self) +{ PhotoFileReader* result = NULL; - PhotoFileFormat _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; + PhotoFileReader* _tmp2_; PhotoFileReader* _tmp3_; - PhotoFileReader* _tmp4_; #line 121 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_METADATA_WRITER (self), NULL); #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp0_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp0_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp3_ = photo_file_format_create_reader (_tmp0_, _tmp2_); + _tmp2_ = photo_file_format_create_reader (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)), _tmp1_); #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - result = _tmp4_; + result = _tmp3_; #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return result; -#line 1132 "PhotoFileAdapter.c" +#line 1263 "PhotoFileAdapter.c" } -static void photo_file_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error) { +static void +photo_file_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* self, + PhotoMetadata* metadata, + GError** error) +{ #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_metadata_writer_write_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return; -#line 1141 "PhotoFileAdapter.c" +#line 1276 "PhotoFileAdapter.c" } -void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error) { +void +photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, + PhotoMetadata* metadata, + GError** error) +{ #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_if_fail (IS_PHOTO_FILE_METADATA_WRITER (self)); #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" PHOTO_FILE_METADATA_WRITER_GET_CLASS (self)->write_metadata (self, metadata, error); -#line 1150 "PhotoFileAdapter.c" +#line 1289 "PhotoFileAdapter.c" } -static void photo_file_metadata_writer_class_init (PhotoFileMetadataWriterClass * klass) { +static void +photo_file_metadata_writer_class_init (PhotoFileMetadataWriterClass * klass) +{ #line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" photo_file_metadata_writer_parent_class = g_type_class_peek_parent (klass); #line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) photo_file_metadata_writer_real_write_metadata; -#line 1159 "PhotoFileAdapter.c" +#line 1300 "PhotoFileAdapter.c" } -static void photo_file_metadata_writer_instance_init (PhotoFileMetadataWriter * self) { +static void +photo_file_metadata_writer_instance_init (PhotoFileMetadataWriter * self) +{ } -GType photo_file_metadata_writer_get_type (void) { +GType +photo_file_metadata_writer_get_type (void) +{ static volatile gsize photo_file_metadata_writer_type_id__volatile = 0; if (g_once_init_enter (&photo_file_metadata_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoFileMetadataWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_file_metadata_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoFileMetadataWriter), 0, (GInstanceInitFunc) photo_file_metadata_writer_instance_init, NULL }; diff --git a/src/photos/PhotoFileFormat.c b/src/photos/PhotoFileFormat.c index 604499f..3b3520c 100644 --- a/src/photos/PhotoFileFormat.c +++ b/src/photos/PhotoFileFormat.c @@ -1,4 +1,4 @@ -/* PhotoFileFormat.c generated by valac 0.36.6, the Vala compiler +/* PhotoFileFormat.c generated by valac 0.40.4, the Vala compiler * generated from PhotoFileFormat.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -261,47 +262,73 @@ static gpointer photo_file_format_properties_parent_class = NULL; GQuark photo_format_error_quark (void); GType photo_file_format_get_type (void) G_GNUC_CONST; -PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataApplicableTest test, void* test_target, int* result_length1); +PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataApplicableTest test, + void* test_target, + int* result_length1); PhotoFileFormat* photo_file_format_get_supported (int* result_length1); -static void _vala_array_add46 (PhotoFileFormat* * array, int* length, int* size, PhotoFileFormat value); +static void _vala_array_add46 (PhotoFileFormat* * array, + int* length, + int* size, + PhotoFileFormat value); PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1); static gboolean ___lambda4_ (PhotoFileFormat format); gboolean photo_file_format_can_write (PhotoFileFormat self); -static gboolean ____lambda4__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self); -static PhotoFileFormat* _vala_array_dup2 (PhotoFileFormat* self, int length); +static gboolean ____lambda4__photo_file_format_data_applicable_test (PhotoFileFormat format, + gpointer self); +static PhotoFileFormat* _vala_array_dup2 (PhotoFileFormat* self, + int length); PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1); static gboolean ___lambda26_ (PhotoFileFormat format); gboolean photo_file_format_can_write_image (PhotoFileFormat self); -static gboolean ____lambda26__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self); -static PhotoFileFormat* _vala_array_dup3 (PhotoFileFormat* self, int length); +static gboolean ____lambda26__photo_file_format_data_applicable_test (PhotoFileFormat format, + gpointer self); +static PhotoFileFormat* _vala_array_dup3 (PhotoFileFormat* self, + int length); PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_length1); static gboolean ___lambda27_ (PhotoFileFormat format); gboolean photo_file_format_can_write_metadata (PhotoFileFormat self); -static gboolean ____lambda27__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self); -static PhotoFileFormat* _vala_array_dup4 (PhotoFileFormat* self, int length); +static gboolean ____lambda27__photo_file_format_data_applicable_test (PhotoFileFormat format, + gpointer self); +static PhotoFileFormat* _vala_array_dup4 (PhotoFileFormat* self, + int length); PhotoFileFormat* photo_file_format_get_writeable (int* result_length1); PhotoFileFormat* photo_file_format_get_image_writeable (int* result_length1); PhotoFileFormat* photo_file_format_get_metadata_writeable (int* result_length1); PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basename); -void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext); +void disassemble_filename (const gchar* basename, + gchar* * name, + gchar* * ext); gboolean is_string_empty (const gchar* s); gpointer photo_file_format_driver_ref (gpointer instance); void photo_file_format_driver_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_driver (GValue* value, gpointer v_object); -void value_take_photo_file_format_driver (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_driver (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_driver (GValue* value, + gpointer v_object); +void value_take_photo_file_format_driver (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_driver (const GValue* value); GType photo_file_format_driver_get_type (void) G_GNUC_CONST; static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self); gpointer photo_file_format_properties_ref (gpointer instance); void photo_file_format_properties_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_properties (GValue* value, gpointer v_object); -void value_take_photo_file_format_properties (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_properties (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_properties (GValue* value, + gpointer v_object); +void value_take_photo_file_format_properties (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_properties (const GValue* value); GType photo_file_format_properties_get_type (void) G_GNUC_CONST; PhotoFileFormatProperties* photo_file_format_driver_get_properties (PhotoFileFormatDriver* self); -gboolean photo_file_format_properties_is_recognized_extension (PhotoFileFormatProperties* self, const gchar* ext); +gboolean photo_file_format_properties_is_recognized_extension (PhotoFileFormatProperties* self, + const gchar* ext); gboolean photo_file_format_is_file_supported (GFile* file); gboolean photo_file_format_is_basename_supported (const gchar* basename); PhotoFileFormat photo_file_format_get_system_default_format (void); @@ -328,41 +355,72 @@ PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_get_instance (void); GType photos_bmp_file_format_driver_get_type (void) G_GNUC_CONST; PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_get_instance (void); PhotoFileFormatProperties* photo_file_format_get_properties (PhotoFileFormat self); -gchar* photo_file_format_get_default_basename (PhotoFileFormat self, const gchar* name); +gchar* photo_file_format_get_default_basename (PhotoFileFormat self, + const gchar* name); gchar* photo_file_format_properties_get_default_extension (PhotoFileFormatProperties* self); gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; -PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gchar* filepath); -PhotoFileReader* photo_file_format_driver_create_reader (PhotoFileFormatDriver* self, const gchar* filepath); +PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, + const gchar* filepath); +PhotoFileReader* photo_file_format_driver_create_reader (PhotoFileFormatDriver* self, + const gchar* filepath); gboolean photo_file_format_driver_can_write_image (PhotoFileFormatDriver* self); gboolean photo_file_format_driver_can_write_metadata (PhotoFileFormatDriver* self); GType photo_file_writer_get_type (void) G_GNUC_CONST; -PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gchar* filepath, GError** error); -PhotoFileWriter* photo_file_format_driver_create_writer (PhotoFileFormatDriver* self, const gchar* filepath); +PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, + const gchar* filepath, + GError** error); +PhotoFileWriter* photo_file_format_driver_create_writer (PhotoFileFormatDriver* self, + const gchar* filepath); GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST; -PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self, const gchar* filepath, GError** error); -PhotoFileMetadataWriter* photo_file_format_driver_create_metadata_writer (PhotoFileFormatDriver* self, const gchar* filepath); +PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self, + const gchar* filepath, + GError** error); +PhotoFileMetadataWriter* photo_file_format_driver_create_metadata_writer (PhotoFileFormatDriver* self, + const gchar* filepath); GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; gpointer photo_file_sniffer_ref (gpointer instance); void photo_file_sniffer_unref (gpointer instance); -GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_sniffer (GValue* value, gpointer v_object); -void value_take_photo_file_sniffer (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_sniffer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_sniffer (GValue* value, + gpointer v_object); +void value_take_photo_file_sniffer (GValue* value, + gpointer v_object); gpointer value_get_photo_file_sniffer (const GValue* value); GType photo_file_sniffer_get_type (void) G_GNUC_CONST; -PhotoFileSniffer* photo_file_format_create_sniffer (PhotoFileFormat self, GFile* file, PhotoFileSnifferOptions options); -PhotoFileSniffer* photo_file_format_driver_create_sniffer (PhotoFileFormatDriver* self, GFile* file, PhotoFileSnifferOptions options); +PhotoFileSniffer* photo_file_format_create_sniffer (PhotoFileFormat self, + GFile* file, + PhotoFileSnifferOptions options); +PhotoFileSniffer* photo_file_format_driver_create_sniffer (PhotoFileFormatDriver* self, + GFile* file, + PhotoFileSnifferOptions options); gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -370,68 +428,94 @@ PhotoMetadata* photo_file_format_create_metadata (PhotoFileFormat self); PhotoMetadata* photo_file_format_driver_create_metadata (PhotoFileFormatDriver* self); gchar* photo_file_format_get_default_mime_type (PhotoFileFormat self); gchar* photo_file_format_properties_get_default_mime_type (PhotoFileFormatProperties* self); -gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_length1); -gchar** photo_file_format_properties_get_mime_types (PhotoFileFormatProperties* self, int* result_length1); +gchar** photo_file_format_get_mime_types (PhotoFileFormat self, + int* result_length1); +gchar** photo_file_format_properties_get_mime_types (PhotoFileFormatProperties* self, + int* result_length1); gchar** photo_file_format_get_editable_mime_types (int* result_length1); -static void _vala_array_add47 (gchar** * array, int* length, int* size, gchar* value); -enum { - PHOTO_FILE_FORMAT_DRIVER_DUMMY_PROPERTY -}; +static void _vala_array_add47 (gchar** * array, + int* length, + int* size, + gchar* value); static PhotoFileFormatProperties* photo_file_format_driver_real_get_properties (PhotoFileFormatDriver* self); -static PhotoFileReader* photo_file_format_driver_real_create_reader (PhotoFileFormatDriver* self, const gchar* filepath); +static PhotoFileReader* photo_file_format_driver_real_create_reader (PhotoFileFormatDriver* self, + const gchar* filepath); static PhotoMetadata* photo_file_format_driver_real_create_metadata (PhotoFileFormatDriver* self); static gboolean photo_file_format_driver_real_can_write_image (PhotoFileFormatDriver* self); static gboolean photo_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* self); -static PhotoFileWriter* photo_file_format_driver_real_create_writer (PhotoFileFormatDriver* self, const gchar* filepath); -static PhotoFileMetadataWriter* photo_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* self, const gchar* filepath); -static PhotoFileSniffer* photo_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* self, GFile* file, PhotoFileSnifferOptions options); +static PhotoFileWriter* photo_file_format_driver_real_create_writer (PhotoFileFormatDriver* self, + const gchar* filepath); +static PhotoFileMetadataWriter* photo_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* self, + const gchar* filepath); +static PhotoFileSniffer* photo_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* self, + GFile* file, + PhotoFileSnifferOptions options); PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type); static void photo_file_format_driver_finalize (PhotoFileFormatDriver * obj); GType photo_file_format_flags_get_type (void) G_GNUC_CONST; -enum { - PHOTO_FILE_FORMAT_PROPERTIES_DUMMY_PROPERTY -}; PhotoFileFormat photo_file_format_properties_get_file_format (PhotoFileFormatProperties* self); static PhotoFileFormat photo_file_format_properties_real_get_file_format (PhotoFileFormatProperties* self); PhotoFileFormatFlags photo_file_format_properties_get_flags (PhotoFileFormatProperties* self); static PhotoFileFormatFlags photo_file_format_properties_real_get_flags (PhotoFileFormatProperties* self); -static gboolean photo_file_format_properties_real_is_recognized_extension (PhotoFileFormatProperties* self, const gchar* ext); -gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1); -gchar** photo_file_format_properties_get_known_extensions (PhotoFileFormatProperties* self, int* result_length1); +static gboolean photo_file_format_properties_real_is_recognized_extension (PhotoFileFormatProperties* self, + const gchar* ext); +gboolean is_in_ci_array (const gchar* str, + gchar** strings, + int strings_length1); +gchar** photo_file_format_properties_get_known_extensions (PhotoFileFormatProperties* self, + int* result_length1); static gchar* photo_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* self); -static gchar** photo_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* self, int* result_length1); +static gchar** photo_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* self, + int* result_length1); static gchar* photo_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* self); -static gchar** photo_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* self, int* result_length1); +static gchar** photo_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* self, + int* result_length1); gchar* photo_file_format_properties_get_user_visible_name (PhotoFileFormatProperties* self); static gchar* photo_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* self); -GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatProperties* self, GFile* file); +GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatProperties* self, + GFile* file); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); static void photo_file_format_properties_finalize (PhotoFileFormatProperties * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -GQuark photo_format_error_quark (void) { +GQuark +photo_format_error_quark (void) +{ return g_quark_from_static_string ("photo_format_error-quark"); } -static void _vala_array_add46 (PhotoFileFormat* * array, int* length, int* size, PhotoFileFormat value) { +static void +_vala_array_add46 (PhotoFileFormat* * array, + int* length, + int* size, + PhotoFileFormat value) +{ #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if ((*length) == (*size)) { #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *size = (*size) ? (2 * (*size)) : 4; #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *array = g_renew (PhotoFileFormat, *array, *size); -#line 427 "PhotoFileFormat.c" +#line 507 "PhotoFileFormat.c" } #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" (*array)[(*length)++] = value; -#line 431 "PhotoFileFormat.c" +#line 511 "PhotoFileFormat.c" } -PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataApplicableTest test, void* test_target, int* result_length1) { +PhotoFileFormat* +photo_file_format_data_find_applicable (PhotoFileFormatDataApplicableTest test, + void* test_target, + int* result_length1) +{ PhotoFileFormat* result = NULL; PhotoFileFormat* applicable = NULL; PhotoFileFormat* _tmp0_; @@ -439,8 +523,8 @@ PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataAppl gint _applicable_size_; gint _tmp1_; PhotoFileFormat* _tmp2_; - PhotoFileFormat* _tmp8_; - gint _tmp8__length1; + PhotoFileFormat* _tmp6_; + gint _tmp6__length1; #line 23 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = g_new0 (PhotoFileFormat, 0); #line 23 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -451,7 +535,7 @@ PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataAppl _applicable_size_ = applicable_length1; #line 24 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp2_ = photo_file_format_get_supported (&_tmp1_); -#line 455 "PhotoFileFormat.c" +#line 539 "PhotoFileFormat.c" { PhotoFileFormat* format_collection = NULL; gint format_collection_length1 = 0; @@ -463,97 +547,92 @@ PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataAppl format_collection_length1 = _tmp1_; #line 24 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" for (format_it = 0; format_it < _tmp1_; format_it = format_it + 1) { -#line 467 "PhotoFileFormat.c" +#line 551 "PhotoFileFormat.c" PhotoFileFormat format = 0; #line 24 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" format = format_collection[format_it]; -#line 471 "PhotoFileFormat.c" +#line 555 "PhotoFileFormat.c" { - PhotoFileFormatDataApplicableTest _tmp3_; - void* _tmp3__target; - PhotoFileFormat _tmp4_; - gboolean _tmp5_; -#line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = test; -#line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3__target = test_target; -#line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = format; + PhotoFileFormat _tmp3_; #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp5_ = _tmp3_ (_tmp4_, _tmp3__target); + _tmp3_ = format; #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp5_) { -#line 487 "PhotoFileFormat.c" - PhotoFileFormat* _tmp6_; - gint _tmp6__length1; - PhotoFileFormat _tmp7_; + if (test (_tmp3_, test_target)) { +#line 562 "PhotoFileFormat.c" + PhotoFileFormat* _tmp4_; + gint _tmp4__length1; + PhotoFileFormat _tmp5_; #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp6_ = applicable; + _tmp4_ = applicable; #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp6__length1 = applicable_length1; + _tmp4__length1 = applicable_length1; #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp7_ = format; + _tmp5_ = format; #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _vala_array_add46 (&applicable, &applicable_length1, &_applicable_size_, _tmp7_); -#line 499 "PhotoFileFormat.c" + _vala_array_add46 (&applicable, &applicable_length1, &_applicable_size_, _tmp5_); +#line 574 "PhotoFileFormat.c" } } } #line 24 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" format_collection = (g_free (format_collection), NULL); -#line 505 "PhotoFileFormat.c" +#line 580 "PhotoFileFormat.c" } #line 29 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp8_ = applicable; + _tmp6_ = applicable; #line 29 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp8__length1 = applicable_length1; + _tmp6__length1 = applicable_length1; #line 29 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (result_length1) { #line 29 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - *result_length1 = _tmp8__length1; -#line 515 "PhotoFileFormat.c" + *result_length1 = _tmp6__length1; +#line 590 "PhotoFileFormat.c" } #line 29 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp8_; + result = _tmp6_; #line 29 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 521 "PhotoFileFormat.c" +#line 596 "PhotoFileFormat.c" } -static gboolean ___lambda4_ (PhotoFileFormat format) { +static gboolean +___lambda4_ (PhotoFileFormat format) +{ gboolean result = FALSE; - PhotoFileFormat _tmp0_; - gboolean _tmp1_; -#line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = format; #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp1_ = photo_file_format_can_write (_tmp0_); -#line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp1_; + result = photo_file_format_can_write (format); #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 537 "PhotoFileFormat.c" +#line 608 "PhotoFileFormat.c" } -static gboolean ____lambda4__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) { +static gboolean +____lambda4__photo_file_format_data_applicable_test (PhotoFileFormat format, + gpointer self) +{ gboolean result; result = ___lambda4_ (format); #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 546 "PhotoFileFormat.c" +#line 620 "PhotoFileFormat.c" } -static PhotoFileFormat* _vala_array_dup2 (PhotoFileFormat* self, int length) { +static PhotoFileFormat* +_vala_array_dup2 (PhotoFileFormat* self, + int length) +{ #line 36 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return g_memdup (self, length * sizeof (PhotoFileFormat)); -#line 553 "PhotoFileFormat.c" +#line 630 "PhotoFileFormat.c" } -PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) { +PhotoFileFormat* +photo_file_format_data_get_writeable (int* result_length1) +{ PhotoFileFormat* result = NULL; PhotoFileFormat* _tmp0_; gint _tmp0__length1; @@ -569,7 +648,7 @@ PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) { _tmp0__length1 = photo_file_format_data_writeable_length1; #line 33 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (_tmp0_ == NULL) { -#line 573 "PhotoFileFormat.c" +#line 652 "PhotoFileFormat.c" gint _tmp1_; PhotoFileFormat* _tmp2_; #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -582,7 +661,7 @@ PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) { photo_file_format_data_writeable_length1 = _tmp1_; #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_format_data_writeable_size_ = photo_file_format_data_writeable_length1; -#line 586 "PhotoFileFormat.c" +#line 665 "PhotoFileFormat.c" } #line 36 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp3_ = photo_file_format_data_writeable; @@ -600,49 +679,53 @@ PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) { if (result_length1) { #line 36 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *result_length1 = _tmp5__length1; -#line 604 "PhotoFileFormat.c" +#line 683 "PhotoFileFormat.c" } #line 36 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = _tmp5_; #line 36 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 610 "PhotoFileFormat.c" +#line 689 "PhotoFileFormat.c" } -static gboolean ___lambda26_ (PhotoFileFormat format) { +static gboolean +___lambda26_ (PhotoFileFormat format) +{ gboolean result = FALSE; - PhotoFileFormat _tmp0_; - gboolean _tmp1_; -#line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = format; #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp1_ = photo_file_format_can_write_image (_tmp0_); -#line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp1_; + result = photo_file_format_can_write_image (format); #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 626 "PhotoFileFormat.c" +#line 701 "PhotoFileFormat.c" } -static gboolean ____lambda26__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) { +static gboolean +____lambda26__photo_file_format_data_applicable_test (PhotoFileFormat format, + gpointer self) +{ gboolean result; result = ___lambda26_ (format); #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 635 "PhotoFileFormat.c" +#line 713 "PhotoFileFormat.c" } -static PhotoFileFormat* _vala_array_dup3 (PhotoFileFormat* self, int length) { +static PhotoFileFormat* +_vala_array_dup3 (PhotoFileFormat* self, + int length) +{ #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return g_memdup (self, length * sizeof (PhotoFileFormat)); -#line 642 "PhotoFileFormat.c" +#line 723 "PhotoFileFormat.c" } -PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1) { +PhotoFileFormat* +photo_file_format_data_get_image_writeable (int* result_length1) +{ PhotoFileFormat* result = NULL; PhotoFileFormat* _tmp0_; gint _tmp0__length1; @@ -658,7 +741,7 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1 _tmp0__length1 = photo_file_format_data_image_writeable_length1; #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (_tmp0_ == NULL) { -#line 662 "PhotoFileFormat.c" +#line 745 "PhotoFileFormat.c" gint _tmp1_; PhotoFileFormat* _tmp2_; #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -671,7 +754,7 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1 photo_file_format_data_image_writeable_length1 = _tmp1_; #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_format_data_image_writeable_size_ = photo_file_format_data_image_writeable_length1; -#line 675 "PhotoFileFormat.c" +#line 758 "PhotoFileFormat.c" } #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp3_ = photo_file_format_data_image_writeable; @@ -689,49 +772,53 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1 if (result_length1) { #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *result_length1 = _tmp5__length1; -#line 693 "PhotoFileFormat.c" +#line 776 "PhotoFileFormat.c" } #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = _tmp5_; #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 699 "PhotoFileFormat.c" +#line 782 "PhotoFileFormat.c" } -static gboolean ___lambda27_ (PhotoFileFormat format) { +static gboolean +___lambda27_ (PhotoFileFormat format) +{ gboolean result = FALSE; - PhotoFileFormat _tmp0_; - gboolean _tmp1_; -#line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = format; #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp1_ = photo_file_format_can_write_metadata (_tmp0_); -#line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp1_; + result = photo_file_format_can_write_metadata (format); #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 715 "PhotoFileFormat.c" +#line 794 "PhotoFileFormat.c" } -static gboolean ____lambda27__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) { +static gboolean +____lambda27__photo_file_format_data_applicable_test (PhotoFileFormat format, + gpointer self) +{ gboolean result; result = ___lambda27_ (format); #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 724 "PhotoFileFormat.c" +#line 806 "PhotoFileFormat.c" } -static PhotoFileFormat* _vala_array_dup4 (PhotoFileFormat* self, int length) { +static PhotoFileFormat* +_vala_array_dup4 (PhotoFileFormat* self, + int length) +{ #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return g_memdup (self, length * sizeof (PhotoFileFormat)); -#line 731 "PhotoFileFormat.c" +#line 816 "PhotoFileFormat.c" } -PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_length1) { +PhotoFileFormat* +photo_file_format_data_get_metadata_writeable (int* result_length1) +{ PhotoFileFormat* result = NULL; PhotoFileFormat* _tmp0_; gint _tmp0__length1; @@ -747,7 +834,7 @@ PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_leng _tmp0__length1 = photo_file_format_data_metadata_writeable_length1; #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (_tmp0_ == NULL) { -#line 751 "PhotoFileFormat.c" +#line 838 "PhotoFileFormat.c" gint _tmp1_; PhotoFileFormat* _tmp2_; #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -760,7 +847,7 @@ PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_leng photo_file_format_data_metadata_writeable_length1 = _tmp1_; #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_format_data_metadata_writeable_size_ = photo_file_format_data_metadata_writeable_length1; -#line 764 "PhotoFileFormat.c" +#line 851 "PhotoFileFormat.c" } #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp3_ = photo_file_format_data_metadata_writeable; @@ -778,17 +865,19 @@ PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_leng if (result_length1) { #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *result_length1 = _tmp5__length1; -#line 782 "PhotoFileFormat.c" +#line 869 "PhotoFileFormat.c" } #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = _tmp5_; #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 788 "PhotoFileFormat.c" +#line 875 "PhotoFileFormat.c" } -PhotoFileFormat* photo_file_format_get_supported (int* result_length1) { +PhotoFileFormat* +photo_file_format_get_supported (int* result_length1) +{ PhotoFileFormat* result = NULL; PhotoFileFormat* _tmp0_; PhotoFileFormat* _tmp1_; @@ -813,17 +902,19 @@ PhotoFileFormat* photo_file_format_get_supported (int* result_length1) { if (result_length1) { #line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *result_length1 = _tmp1__length1; -#line 817 "PhotoFileFormat.c" +#line 906 "PhotoFileFormat.c" } #line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = _tmp1_; #line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 823 "PhotoFileFormat.c" +#line 912 "PhotoFileFormat.c" } -PhotoFileFormat* photo_file_format_get_writeable (int* result_length1) { +PhotoFileFormat* +photo_file_format_get_writeable (int* result_length1) +{ PhotoFileFormat* result = NULL; gint _tmp0_; PhotoFileFormat* _tmp1_; @@ -839,17 +930,19 @@ PhotoFileFormat* photo_file_format_get_writeable (int* result_length1) { if (result_length1) { #line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *result_length1 = _tmp2__length1; -#line 843 "PhotoFileFormat.c" +#line 934 "PhotoFileFormat.c" } #line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = _tmp2_; #line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 849 "PhotoFileFormat.c" +#line 940 "PhotoFileFormat.c" } -PhotoFileFormat* photo_file_format_get_image_writeable (int* result_length1) { +PhotoFileFormat* +photo_file_format_get_image_writeable (int* result_length1) +{ PhotoFileFormat* result = NULL; gint _tmp0_; PhotoFileFormat* _tmp1_; @@ -865,17 +958,19 @@ PhotoFileFormat* photo_file_format_get_image_writeable (int* result_length1) { if (result_length1) { #line 73 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *result_length1 = _tmp2__length1; -#line 869 "PhotoFileFormat.c" +#line 962 "PhotoFileFormat.c" } #line 73 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = _tmp2_; #line 73 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 875 "PhotoFileFormat.c" +#line 968 "PhotoFileFormat.c" } -PhotoFileFormat* photo_file_format_get_metadata_writeable (int* result_length1) { +PhotoFileFormat* +photo_file_format_get_metadata_writeable (int* result_length1) +{ PhotoFileFormat* result = NULL; gint _tmp0_; PhotoFileFormat* _tmp1_; @@ -891,47 +986,43 @@ PhotoFileFormat* photo_file_format_get_metadata_writeable (int* result_length1) if (result_length1) { #line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *result_length1 = _tmp2__length1; -#line 895 "PhotoFileFormat.c" +#line 990 "PhotoFileFormat.c" } #line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = _tmp2_; #line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 901 "PhotoFileFormat.c" +#line 996 "PhotoFileFormat.c" } -PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basename) { +PhotoFileFormat +photo_file_format_get_by_basename_extension (const gchar* basename) +{ PhotoFileFormat result = 0; gchar* name = NULL; gchar* ext = NULL; - const gchar* _tmp0_; + gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - const gchar* _tmp3_; - gboolean _tmp4_; - gint _tmp5_; - PhotoFileFormat* _tmp6_; + const gchar* _tmp2_; + gint _tmp3_; + PhotoFileFormat* _tmp4_; #line 80 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (basename != NULL, 0); #line 82 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = basename; -#line 82 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - disassemble_filename (_tmp0_, &_tmp1_, &_tmp2_); + disassemble_filename (basename, &_tmp0_, &_tmp1_); #line 82 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (name); #line 82 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - name = _tmp1_; + name = _tmp0_; #line 82 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (ext); #line 82 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ext = _tmp2_; + ext = _tmp1_; #line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = ext; + _tmp2_ = ext; #line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = is_string_empty (_tmp3_); -#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp4_) { + if (is_string_empty (_tmp2_)) { #line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_UNKNOWN; #line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -940,58 +1031,55 @@ PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basena _g_free0 (name); #line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 944 "PhotoFileFormat.c" +#line 1035 "PhotoFileFormat.c" } #line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp6_ = photo_file_format_get_supported (&_tmp5_); -#line 948 "PhotoFileFormat.c" + _tmp4_ = photo_file_format_get_supported (&_tmp3_); +#line 1039 "PhotoFileFormat.c" { PhotoFileFormat* file_format_collection = NULL; gint file_format_collection_length1 = 0; gint _file_format_collection_size_ = 0; gint file_format_it = 0; #line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - file_format_collection = _tmp6_; + file_format_collection = _tmp4_; #line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - file_format_collection_length1 = _tmp5_; + file_format_collection_length1 = _tmp3_; #line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - for (file_format_it = 0; file_format_it < _tmp5_; file_format_it = file_format_it + 1) { -#line 960 "PhotoFileFormat.c" + for (file_format_it = 0; file_format_it < _tmp3_; file_format_it = file_format_it + 1) { +#line 1051 "PhotoFileFormat.c" PhotoFileFormat file_format = 0; #line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" file_format = file_format_collection[file_format_it]; -#line 964 "PhotoFileFormat.c" +#line 1055 "PhotoFileFormat.c" { - PhotoFileFormat _tmp7_; - PhotoFileFormatDriver* _tmp8_; - PhotoFileFormatDriver* _tmp9_; - PhotoFileFormatProperties* _tmp10_; - PhotoFileFormatProperties* _tmp11_; - const gchar* _tmp12_; - gboolean _tmp13_; - gboolean _tmp14_; + PhotoFileFormat _tmp5_; + PhotoFileFormatDriver* _tmp6_; + PhotoFileFormatDriver* _tmp7_; + PhotoFileFormatProperties* _tmp8_; + PhotoFileFormatProperties* _tmp9_; + const gchar* _tmp10_; + gboolean _tmp11_; #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp7_ = file_format; + _tmp5_ = file_format; #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp8_ = photo_file_format_get_driver (_tmp7_); -#line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp9_ = _tmp8_; + _tmp6_ = photo_file_format_get_driver (_tmp5_); #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp10_ = photo_file_format_driver_get_properties (_tmp9_); + _tmp7_ = _tmp6_; #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp11_ = _tmp10_; + _tmp8_ = photo_file_format_driver_get_properties (_tmp7_); #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp12_ = ext; + _tmp9_ = _tmp8_; #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp13_ = photo_file_format_properties_is_recognized_extension (_tmp11_, _tmp12_); + _tmp10_ = ext; #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp14_ = _tmp13_; + _tmp11_ = photo_file_format_properties_is_recognized_extension (_tmp9_, _tmp10_); #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _photo_file_format_properties_unref0 (_tmp11_); + _photo_file_format_properties_unref0 (_tmp9_); #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _photo_file_format_driver_unref0 (_tmp9_); + _photo_file_format_driver_unref0 (_tmp7_); #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp14_) { + if (_tmp11_) { #line 89 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = file_format; #line 89 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1002,13 +1090,13 @@ PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basena _g_free0 (name); #line 89 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1006 "PhotoFileFormat.c" +#line 1094 "PhotoFileFormat.c" } } } #line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" file_format_collection = (g_free (file_format_collection), NULL); -#line 1012 "PhotoFileFormat.c" +#line 1100 "PhotoFileFormat.c" } #line 92 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_UNKNOWN; @@ -1018,70 +1106,62 @@ PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basena _g_free0 (name); #line 92 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1022 "PhotoFileFormat.c" +#line 1110 "PhotoFileFormat.c" } -gboolean photo_file_format_is_file_supported (GFile* file) { +gboolean +photo_file_format_is_file_supported (GFile* file) +{ gboolean result = FALSE; - GFile* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; + gboolean _tmp2_; #line 95 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 96 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = file; -#line 96 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp1_ = g_file_get_basename (_tmp0_); -#line 96 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = _tmp1_; + _tmp0_ = g_file_get_basename (file); #line 96 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = photo_file_format_is_basename_supported (_tmp2_); + _tmp1_ = _tmp0_; #line 96 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = _tmp3_; + _tmp2_ = photo_file_format_is_basename_supported (_tmp1_); #line 96 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 96 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp4_; + result = _tmp2_; #line 96 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1051 "PhotoFileFormat.c" +#line 1135 "PhotoFileFormat.c" } -gboolean photo_file_format_is_basename_supported (const gchar* basename) { +gboolean +photo_file_format_is_basename_supported (const gchar* basename) +{ gboolean result = FALSE; gchar* name = NULL; gchar* ext = NULL; - const gchar* _tmp0_; + gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - const gchar* _tmp3_; - gboolean _tmp4_; - gint _tmp5_; - PhotoFileFormat* _tmp6_; + const gchar* _tmp2_; + gint _tmp3_; + PhotoFileFormat* _tmp4_; #line 99 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (basename != NULL, FALSE); #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = basename; -#line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - disassemble_filename (_tmp0_, &_tmp1_, &_tmp2_); + disassemble_filename (basename, &_tmp0_, &_tmp1_); #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (name); #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - name = _tmp1_; + name = _tmp0_; #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (ext); #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ext = _tmp2_; -#line 103 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = ext; + ext = _tmp1_; #line 103 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = is_string_empty (_tmp3_); + _tmp2_ = ext; #line 103 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp4_) { + if (is_string_empty (_tmp2_)) { #line 104 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = FALSE; #line 104 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1090,58 +1170,55 @@ gboolean photo_file_format_is_basename_supported (const gchar* basename) { _g_free0 (name); #line 104 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1094 "PhotoFileFormat.c" +#line 1174 "PhotoFileFormat.c" } #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp6_ = photo_file_format_get_supported (&_tmp5_); -#line 1098 "PhotoFileFormat.c" + _tmp4_ = photo_file_format_get_supported (&_tmp3_); +#line 1178 "PhotoFileFormat.c" { PhotoFileFormat* format_collection = NULL; gint format_collection_length1 = 0; gint _format_collection_size_ = 0; gint format_it = 0; #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - format_collection = _tmp6_; + format_collection = _tmp4_; #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - format_collection_length1 = _tmp5_; + format_collection_length1 = _tmp3_; #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - for (format_it = 0; format_it < _tmp5_; format_it = format_it + 1) { -#line 1110 "PhotoFileFormat.c" + for (format_it = 0; format_it < _tmp3_; format_it = format_it + 1) { +#line 1190 "PhotoFileFormat.c" PhotoFileFormat format = 0; #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" format = format_collection[format_it]; -#line 1114 "PhotoFileFormat.c" +#line 1194 "PhotoFileFormat.c" { - PhotoFileFormat _tmp7_; - PhotoFileFormatDriver* _tmp8_; - PhotoFileFormatDriver* _tmp9_; - PhotoFileFormatProperties* _tmp10_; - PhotoFileFormatProperties* _tmp11_; - const gchar* _tmp12_; - gboolean _tmp13_; - gboolean _tmp14_; -#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp7_ = format; + PhotoFileFormat _tmp5_; + PhotoFileFormatDriver* _tmp6_; + PhotoFileFormatDriver* _tmp7_; + PhotoFileFormatProperties* _tmp8_; + PhotoFileFormatProperties* _tmp9_; + const gchar* _tmp10_; + gboolean _tmp11_; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp8_ = photo_file_format_get_driver (_tmp7_); + _tmp5_ = format; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp9_ = _tmp8_; + _tmp6_ = photo_file_format_get_driver (_tmp5_); #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp10_ = photo_file_format_driver_get_properties (_tmp9_); + _tmp7_ = _tmp6_; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp11_ = _tmp10_; + _tmp8_ = photo_file_format_driver_get_properties (_tmp7_); #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp12_ = ext; + _tmp9_ = _tmp8_; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp13_ = photo_file_format_properties_is_recognized_extension (_tmp11_, _tmp12_); + _tmp10_ = ext; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp14_ = _tmp13_; + _tmp11_ = photo_file_format_properties_is_recognized_extension (_tmp9_, _tmp10_); #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _photo_file_format_properties_unref0 (_tmp11_); + _photo_file_format_properties_unref0 (_tmp9_); #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _photo_file_format_driver_unref0 (_tmp9_); + _photo_file_format_driver_unref0 (_tmp7_); #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp14_) { + if (_tmp11_) { #line 108 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = TRUE; #line 108 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1152,13 +1229,13 @@ gboolean photo_file_format_is_basename_supported (const gchar* basename) { _g_free0 (name); #line 108 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1156 "PhotoFileFormat.c" +#line 1233 "PhotoFileFormat.c" } } } #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" format_collection = (g_free (format_collection), NULL); -#line 1162 "PhotoFileFormat.c" +#line 1239 "PhotoFileFormat.c" } #line 111 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = FALSE; @@ -1168,174 +1245,173 @@ gboolean photo_file_format_is_basename_supported (const gchar* basename) { _g_free0 (name); #line 111 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1172 "PhotoFileFormat.c" +#line 1249 "PhotoFileFormat.c" } -PhotoFileFormat photo_file_format_get_system_default_format (void) { +PhotoFileFormat +photo_file_format_get_system_default_format (void) +{ PhotoFileFormat result = 0; #line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_JFIF; #line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1182 "PhotoFileFormat.c" +#line 1261 "PhotoFileFormat.c" } -PhotoFileFormat photo_file_format_get_by_file_extension (GFile* file) { +PhotoFileFormat +photo_file_format_get_by_file_extension (GFile* file) +{ PhotoFileFormat result = 0; - GFile* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - PhotoFileFormat _tmp3_; - PhotoFileFormat _tmp4_; + PhotoFileFormat _tmp2_; #line 119 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (G_IS_FILE (file), 0); #line 120 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = file; -#line 120 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp1_ = g_file_get_basename (_tmp0_); + _tmp0_ = g_file_get_basename (file); #line 120 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = _tmp1_; -#line 120 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = photo_file_format_get_by_basename_extension (_tmp2_); + _tmp1_ = _tmp0_; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = _tmp3_; + _tmp2_ = photo_file_format_get_by_basename_extension (_tmp1_); #line 120 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 120 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp4_; + result = _tmp2_; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1211 "PhotoFileFormat.c" +#line 1286 "PhotoFileFormat.c" } -gint photo_file_format_serialize (PhotoFileFormat self) { +gint +photo_file_format_serialize (PhotoFileFormat self) +{ gint result = 0; #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (self) { #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_JFIF: -#line 1221 "PhotoFileFormat.c" +#line 1298 "PhotoFileFormat.c" { #line 127 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = 0; #line 127 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1227 "PhotoFileFormat.c" +#line 1304 "PhotoFileFormat.c" } #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_RAW: -#line 1231 "PhotoFileFormat.c" +#line 1308 "PhotoFileFormat.c" { #line 130 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = 1; #line 130 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1237 "PhotoFileFormat.c" +#line 1314 "PhotoFileFormat.c" } #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_PNG: -#line 1241 "PhotoFileFormat.c" +#line 1318 "PhotoFileFormat.c" { #line 133 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = 2; #line 133 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1247 "PhotoFileFormat.c" +#line 1324 "PhotoFileFormat.c" } #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_TIFF: -#line 1251 "PhotoFileFormat.c" +#line 1328 "PhotoFileFormat.c" { #line 136 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = 3; #line 136 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1257 "PhotoFileFormat.c" +#line 1334 "PhotoFileFormat.c" } #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_BMP: -#line 1261 "PhotoFileFormat.c" +#line 1338 "PhotoFileFormat.c" { #line 139 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = 4; #line 139 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1267 "PhotoFileFormat.c" +#line 1344 "PhotoFileFormat.c" } default: #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_UNKNOWN: -#line 1272 "PhotoFileFormat.c" +#line 1349 "PhotoFileFormat.c" { #line 143 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = -1; #line 143 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1278 "PhotoFileFormat.c" +#line 1355 "PhotoFileFormat.c" } } } -PhotoFileFormat photo_file_format_unserialize (gint value) { +PhotoFileFormat +photo_file_format_unserialize (gint value) +{ PhotoFileFormat result = 0; - gint _tmp0_; #line 149 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = value; -#line 149 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - switch (_tmp0_) { + switch (value) { #line 149 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case 0: -#line 1293 "PhotoFileFormat.c" +#line 1369 "PhotoFileFormat.c" { #line 151 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_JFIF; #line 151 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1299 "PhotoFileFormat.c" +#line 1375 "PhotoFileFormat.c" } #line 149 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case 1: -#line 1303 "PhotoFileFormat.c" +#line 1379 "PhotoFileFormat.c" { #line 154 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_RAW; #line 154 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1309 "PhotoFileFormat.c" +#line 1385 "PhotoFileFormat.c" } #line 149 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case 2: -#line 1313 "PhotoFileFormat.c" +#line 1389 "PhotoFileFormat.c" { #line 157 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_PNG; #line 157 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1319 "PhotoFileFormat.c" +#line 1395 "PhotoFileFormat.c" } #line 149 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case 3: -#line 1323 "PhotoFileFormat.c" +#line 1399 "PhotoFileFormat.c" { #line 160 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_TIFF; #line 160 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1329 "PhotoFileFormat.c" +#line 1405 "PhotoFileFormat.c" } #line 149 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case 4: -#line 1333 "PhotoFileFormat.c" +#line 1409 "PhotoFileFormat.c" { #line 163 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_BMP; #line 163 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1339 "PhotoFileFormat.c" +#line 1415 "PhotoFileFormat.c" } default: { @@ -1343,251 +1419,251 @@ PhotoFileFormat photo_file_format_unserialize (gint value) { result = PHOTO_FILE_FORMAT_UNKNOWN; #line 166 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1347 "PhotoFileFormat.c" +#line 1423 "PhotoFileFormat.c" } } } -PhotoFileFormat photo_file_format_from_gphoto_type (const gchar* type) { +PhotoFileFormat +photo_file_format_from_gphoto_type (const gchar* type) +{ PhotoFileFormat result = 0; const gchar* _tmp0_; - const gchar* _tmp1_; - GQuark _tmp3_ = 0U; + GQuark _tmp2_ = 0U; #line 170 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (type != NULL, 0); #line 171 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = type; #line 171 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp1_ = _tmp0_; -#line 171 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_); + _tmp2_ = (NULL == _tmp0_) ? 0 : g_quark_from_string (_tmp0_); #line 171 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp3_ == g_quark_from_string (GP_MIME_JPEG)) { + if (_tmp2_ == g_quark_from_string (GP_MIME_JPEG)) { #line 171 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1370 "PhotoFileFormat.c" +#line 1445 "PhotoFileFormat.c" default: { #line 173 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_JFIF; #line 173 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1377 "PhotoFileFormat.c" +#line 1452 "PhotoFileFormat.c" } } - } else if ((_tmp3_ == g_quark_from_string (GP_MIME_RAW)) || (_tmp3_ == g_quark_from_string (GP_MIME_CRW))) { + } else if ((_tmp2_ == g_quark_from_string (GP_MIME_RAW)) || (_tmp2_ == g_quark_from_string (GP_MIME_CRW))) { #line 171 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1383 "PhotoFileFormat.c" +#line 1458 "PhotoFileFormat.c" default: { #line 177 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_RAW; #line 177 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1390 "PhotoFileFormat.c" +#line 1465 "PhotoFileFormat.c" } } - } else if (_tmp3_ == g_quark_from_string (GP_MIME_PNG)) { + } else if (_tmp2_ == g_quark_from_string (GP_MIME_PNG)) { #line 171 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1396 "PhotoFileFormat.c" +#line 1471 "PhotoFileFormat.c" default: { #line 180 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_PNG; #line 180 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1403 "PhotoFileFormat.c" +#line 1478 "PhotoFileFormat.c" } } - } else if (_tmp3_ == g_quark_from_string (GP_MIME_TIFF)) { + } else if (_tmp2_ == g_quark_from_string (GP_MIME_TIFF)) { #line 171 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1409 "PhotoFileFormat.c" +#line 1484 "PhotoFileFormat.c" default: { #line 183 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_TIFF; #line 183 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1416 "PhotoFileFormat.c" +#line 1491 "PhotoFileFormat.c" } } - } else if (_tmp3_ == g_quark_from_string (GP_MIME_BMP)) { + } else if (_tmp2_ == g_quark_from_string (GP_MIME_BMP)) { #line 171 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1422 "PhotoFileFormat.c" +#line 1497 "PhotoFileFormat.c" default: { #line 186 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_BMP; #line 186 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1429 "PhotoFileFormat.c" +#line 1504 "PhotoFileFormat.c" } } } else { #line 171 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1435 "PhotoFileFormat.c" +#line 1510 "PhotoFileFormat.c" default: { #line 190 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_UNKNOWN; #line 190 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1442 "PhotoFileFormat.c" +#line 1517 "PhotoFileFormat.c" } } } } -PhotoFileFormat photo_file_format_from_pixbuf_name (const gchar* name) { +PhotoFileFormat +photo_file_format_from_pixbuf_name (const gchar* name) +{ PhotoFileFormat result = 0; const gchar* _tmp0_; - const gchar* _tmp1_; - GQuark _tmp3_ = 0U; + GQuark _tmp2_ = 0U; #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - static GQuark _tmp2_label0 = 0; + static GQuark _tmp1_label0 = 0; #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - static GQuark _tmp2_label1 = 0; + static GQuark _tmp1_label1 = 0; #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - static GQuark _tmp2_label2 = 0; + static GQuark _tmp1_label2 = 0; #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - static GQuark _tmp2_label3 = 0; + static GQuark _tmp1_label3 = 0; #line 195 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (name != NULL, 0); #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = name; #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp1_ = _tmp0_; -#line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_); + _tmp2_ = (NULL == _tmp0_) ? 0 : g_quark_from_string (_tmp0_); #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("jpeg")))) { + if (_tmp2_ == ((0 != _tmp1_label0) ? _tmp1_label0 : (_tmp1_label0 = g_quark_from_static_string ("jpeg")))) { #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1474 "PhotoFileFormat.c" +#line 1548 "PhotoFileFormat.c" default: { #line 198 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_JFIF; #line 198 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1481 "PhotoFileFormat.c" +#line 1555 "PhotoFileFormat.c" } } - } else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("png")))) { + } else if (_tmp2_ == ((0 != _tmp1_label1) ? _tmp1_label1 : (_tmp1_label1 = g_quark_from_static_string ("png")))) { #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1487 "PhotoFileFormat.c" +#line 1561 "PhotoFileFormat.c" default: { #line 201 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_PNG; #line 201 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1494 "PhotoFileFormat.c" +#line 1568 "PhotoFileFormat.c" } } - } else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("tiff")))) { + } else if (_tmp2_ == ((0 != _tmp1_label2) ? _tmp1_label2 : (_tmp1_label2 = g_quark_from_static_string ("tiff")))) { #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1500 "PhotoFileFormat.c" +#line 1574 "PhotoFileFormat.c" default: { #line 204 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_TIFF; #line 204 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1507 "PhotoFileFormat.c" +#line 1581 "PhotoFileFormat.c" } } - } else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("bmp")))) { + } else if (_tmp2_ == ((0 != _tmp1_label3) ? _tmp1_label3 : (_tmp1_label3 = g_quark_from_static_string ("bmp")))) { #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1513 "PhotoFileFormat.c" +#line 1587 "PhotoFileFormat.c" default: { #line 207 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_BMP; #line 207 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1520 "PhotoFileFormat.c" +#line 1594 "PhotoFileFormat.c" } } } else { #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1526 "PhotoFileFormat.c" +#line 1600 "PhotoFileFormat.c" default: { #line 210 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_UNKNOWN; #line 210 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1533 "PhotoFileFormat.c" +#line 1607 "PhotoFileFormat.c" } } } } -void photo_file_format_init (PhotoFileFormat self) { +void +photo_file_format_init (PhotoFileFormat self) +{ #line 215 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (self) { #line 215 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_JFIF: -#line 1545 "PhotoFileFormat.c" +#line 1621 "PhotoFileFormat.c" { #line 217 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" jfif_file_format_driver_init (); #line 218 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" break; -#line 1551 "PhotoFileFormat.c" +#line 1627 "PhotoFileFormat.c" } #line 215 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_RAW: -#line 1555 "PhotoFileFormat.c" +#line 1631 "PhotoFileFormat.c" { #line 221 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" raw_file_format_driver_init (); #line 222 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" break; -#line 1561 "PhotoFileFormat.c" +#line 1637 "PhotoFileFormat.c" } #line 215 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_PNG: -#line 1565 "PhotoFileFormat.c" +#line 1641 "PhotoFileFormat.c" { #line 225 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" png_file_format_driver_init (); #line 226 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" break; -#line 1571 "PhotoFileFormat.c" +#line 1647 "PhotoFileFormat.c" } #line 215 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_TIFF: -#line 1575 "PhotoFileFormat.c" +#line 1651 "PhotoFileFormat.c" { #line 229 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photos_tiff_file_format_driver_init (); #line 230 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" break; -#line 1581 "PhotoFileFormat.c" +#line 1657 "PhotoFileFormat.c" } #line 215 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_BMP: -#line 1585 "PhotoFileFormat.c" +#line 1661 "PhotoFileFormat.c" { #line 233 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photos_bmp_file_format_driver_init (); #line 234 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" break; -#line 1591 "PhotoFileFormat.c" +#line 1667 "PhotoFileFormat.c" } default: { @@ -1596,19 +1672,21 @@ void photo_file_format_init (PhotoFileFormat self) { _tmp0_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), self); #line 237 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_error ("PhotoFileFormat.vala:237: Unsupported file format %s", (_tmp0_ != NULL) ? _tmp0_->value_name : NULL); -#line 1600 "PhotoFileFormat.c" +#line 1676 "PhotoFileFormat.c" } } } -static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self) { +static PhotoFileFormatDriver* +photo_file_format_get_driver (PhotoFileFormat self) +{ PhotoFileFormatDriver* result = NULL; #line 242 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (self) { #line 242 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_JFIF: -#line 1612 "PhotoFileFormat.c" +#line 1690 "PhotoFileFormat.c" { JfifFileFormatDriver* _tmp0_; #line 244 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1617,11 +1695,11 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_DRIVER, PhotoFileFormatDriver); #line 244 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1621 "PhotoFileFormat.c" +#line 1699 "PhotoFileFormat.c" } #line 242 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_RAW: -#line 1625 "PhotoFileFormat.c" +#line 1703 "PhotoFileFormat.c" { RawFileFormatDriver* _tmp1_; #line 247 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1630,11 +1708,11 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_FORMAT_DRIVER, PhotoFileFormatDriver); #line 247 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1634 "PhotoFileFormat.c" +#line 1712 "PhotoFileFormat.c" } #line 242 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_PNG: -#line 1638 "PhotoFileFormat.c" +#line 1716 "PhotoFileFormat.c" { PngFileFormatDriver* _tmp2_; #line 250 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1643,11 +1721,11 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_FORMAT_DRIVER, PhotoFileFormatDriver); #line 250 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1647 "PhotoFileFormat.c" +#line 1725 "PhotoFileFormat.c" } #line 242 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_TIFF: -#line 1651 "PhotoFileFormat.c" +#line 1729 "PhotoFileFormat.c" { PhotosTiffFileFormatDriver* _tmp3_; #line 253 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1656,11 +1734,11 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO_FILE_FORMAT_DRIVER, PhotoFileFormatDriver); #line 253 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1660 "PhotoFileFormat.c" +#line 1738 "PhotoFileFormat.c" } #line 242 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_BMP: -#line 1664 "PhotoFileFormat.c" +#line 1742 "PhotoFileFormat.c" { PhotosBmpFileFormatDriver* _tmp4_; #line 256 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1669,7 +1747,7 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self result = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_FORMAT_DRIVER, PhotoFileFormatDriver); #line 256 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1673 "PhotoFileFormat.c" +#line 1751 "PhotoFileFormat.c" } default: { @@ -1678,13 +1756,15 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self _tmp5_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), self); #line 259 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_error ("PhotoFileFormat.vala:259: Unsupported file format %s", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL); -#line 1682 "PhotoFileFormat.c" +#line 1760 "PhotoFileFormat.c" } } } -PhotoFileFormatProperties* photo_file_format_get_properties (PhotoFileFormat self) { +PhotoFileFormatProperties* +photo_file_format_get_properties (PhotoFileFormat self) +{ PhotoFileFormatProperties* result = NULL; PhotoFileFormatDriver* _tmp0_; PhotoFileFormatDriver* _tmp1_; @@ -1704,54 +1784,56 @@ PhotoFileFormatProperties* photo_file_format_get_properties (PhotoFileFormat sel result = _tmp3_; #line 264 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1708 "PhotoFileFormat.c" +#line 1788 "PhotoFileFormat.c" } -gchar* photo_file_format_get_default_basename (PhotoFileFormat self, const gchar* name) { +gchar* +photo_file_format_get_default_basename (PhotoFileFormat self, + const gchar* name) +{ gchar* result = NULL; - const gchar* _tmp0_; + PhotoFileFormatProperties* _tmp0_; PhotoFileFormatProperties* _tmp1_; - PhotoFileFormatProperties* _tmp2_; + gchar* _tmp2_; gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; #line 268 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (name != NULL, NULL); #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = name; -#line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp1_ = photo_file_format_get_properties (self); + _tmp0_ = photo_file_format_get_properties (self); #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = photo_file_format_properties_get_default_extension (_tmp2_); + _tmp2_ = photo_file_format_properties_get_default_extension (_tmp1_); #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp5_ = g_strdup_printf ("%s.%s", _tmp0_, _tmp4_); + _tmp4_ = g_strdup_printf ("%s.%s", name, _tmp3_); #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _photo_file_format_properties_unref0 (_tmp2_); + _photo_file_format_properties_unref0 (_tmp1_); #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp6_; + result = _tmp5_; #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1745 "PhotoFileFormat.c" +#line 1825 "PhotoFileFormat.c" } -PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gchar* filepath) { +PhotoFileReader* +photo_file_format_create_reader (PhotoFileFormat self, + const gchar* filepath) +{ PhotoFileReader* result = NULL; PhotoFileFormatDriver* _tmp0_; PhotoFileFormatDriver* _tmp1_; - const gchar* _tmp2_; + PhotoFileReader* _tmp2_; PhotoFileReader* _tmp3_; - PhotoFileReader* _tmp4_; #line 272 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 273 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1759,106 +1841,100 @@ PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gc #line 273 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp1_ = _tmp0_; #line 273 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = filepath; -#line 273 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = photo_file_format_driver_create_reader (_tmp1_, _tmp2_); + _tmp2_ = photo_file_format_driver_create_reader (_tmp1_, filepath); #line 273 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 273 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_format_driver_unref0 (_tmp1_); #line 273 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp4_; + result = _tmp3_; #line 273 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1774 "PhotoFileFormat.c" +#line 1854 "PhotoFileFormat.c" } -gboolean photo_file_format_can_write (PhotoFileFormat self) { +gboolean +photo_file_format_can_write (PhotoFileFormat self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; - gboolean _tmp1_; -#line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp1_ = photo_file_format_can_write_image (self); #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp1_) { -#line 1786 "PhotoFileFormat.c" - gboolean _tmp2_; + if (photo_file_format_can_write_image (self)) { #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = photo_file_format_can_write_metadata (self); -#line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = _tmp2_; -#line 1792 "PhotoFileFormat.c" + _tmp0_ = photo_file_format_can_write_metadata (self); +#line 1867 "PhotoFileFormat.c" } else { #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = FALSE; -#line 1796 "PhotoFileFormat.c" +#line 1871 "PhotoFileFormat.c" } #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = _tmp0_; #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1802 "PhotoFileFormat.c" +#line 1877 "PhotoFileFormat.c" } -gboolean photo_file_format_can_write_image (PhotoFileFormat self) { +gboolean +photo_file_format_can_write_image (PhotoFileFormat self) +{ gboolean result = FALSE; PhotoFileFormatDriver* _tmp0_; PhotoFileFormatDriver* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; #line 282 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = photo_file_format_get_driver (self); #line 282 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp1_ = _tmp0_; #line 282 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp2_ = photo_file_format_driver_can_write_image (_tmp1_); -#line 282 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = _tmp2_; #line 282 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_format_driver_unref0 (_tmp1_); #line 282 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp3_; + result = _tmp2_; #line 282 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1826 "PhotoFileFormat.c" +#line 1900 "PhotoFileFormat.c" } -gboolean photo_file_format_can_write_metadata (PhotoFileFormat self) { +gboolean +photo_file_format_can_write_metadata (PhotoFileFormat self) +{ gboolean result = FALSE; PhotoFileFormatDriver* _tmp0_; PhotoFileFormatDriver* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; #line 286 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = photo_file_format_get_driver (self); #line 286 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp1_ = _tmp0_; #line 286 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp2_ = photo_file_format_driver_can_write_metadata (_tmp1_); -#line 286 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = _tmp2_; #line 286 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_format_driver_unref0 (_tmp1_); #line 286 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp3_; + result = _tmp2_; #line 286 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1850 "PhotoFileFormat.c" +#line 1923 "PhotoFileFormat.c" } -PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gchar* filepath, GError** error) { +PhotoFileWriter* +photo_file_format_create_writer (PhotoFileFormat self, + const gchar* filepath, + GError** error) +{ PhotoFileWriter* result = NULL; PhotoFileWriter* writer = NULL; PhotoFileFormatDriver* _tmp0_; PhotoFileFormatDriver* _tmp1_; - const gchar* _tmp2_; + PhotoFileWriter* _tmp2_; PhotoFileWriter* _tmp3_; PhotoFileWriter* _tmp4_; - PhotoFileWriter* _tmp5_; GError * _inner_error_ = NULL; #line 289 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (filepath != NULL, NULL); @@ -1867,28 +1943,26 @@ PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gc #line 290 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp1_ = _tmp0_; #line 290 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = filepath; -#line 290 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = photo_file_format_driver_create_writer (_tmp1_, _tmp2_); + _tmp2_ = photo_file_format_driver_create_writer (_tmp1_, filepath); #line 290 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 290 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_format_driver_unref0 (_tmp1_); #line 290 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - writer = _tmp4_; + writer = _tmp3_; #line 291 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp5_ = writer; + _tmp4_ = writer; #line 291 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp5_ == NULL) { -#line 1884 "PhotoFileFormat.c" - GEnumValue* _tmp6_; - GError* _tmp7_; + if (_tmp4_ == NULL) { +#line 1958 "PhotoFileFormat.c" + GEnumValue* _tmp5_; + GError* _tmp6_; #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp6_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), self); + _tmp5_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), self); #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp7_ = g_error_new (PHOTO_FORMAT_ERROR, PHOTO_FORMAT_ERROR_READ_ONLY, "File format %s is read-only", (_tmp6_ != NULL) ? _tmp6_->value_name : NULL); + _tmp6_ = g_error_new (PHOTO_FORMAT_ERROR, PHOTO_FORMAT_ERROR_READ_ONLY, "File format %s is read-only", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL); #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _inner_error_ = _tmp7_; + _inner_error_ = _tmp6_; #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (_inner_error_->domain == PHOTO_FORMAT_ERROR) { #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1897,7 +1971,7 @@ PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gc _photo_file_adapter_unref0 (writer); #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 1901 "PhotoFileFormat.c" +#line 1975 "PhotoFileFormat.c" } else { #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_adapter_unref0 (writer); @@ -1907,26 +1981,29 @@ PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gc g_clear_error (&_inner_error_); #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 1911 "PhotoFileFormat.c" +#line 1985 "PhotoFileFormat.c" } } #line 294 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = writer; #line 294 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1918 "PhotoFileFormat.c" +#line 1992 "PhotoFileFormat.c" } -PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self, const gchar* filepath, GError** error) { +PhotoFileMetadataWriter* +photo_file_format_create_metadata_writer (PhotoFileFormat self, + const gchar* filepath, + GError** error) +{ PhotoFileMetadataWriter* result = NULL; PhotoFileMetadataWriter* writer = NULL; PhotoFileFormatDriver* _tmp0_; PhotoFileFormatDriver* _tmp1_; - const gchar* _tmp2_; + PhotoFileMetadataWriter* _tmp2_; PhotoFileMetadataWriter* _tmp3_; PhotoFileMetadataWriter* _tmp4_; - PhotoFileMetadataWriter* _tmp5_; GError * _inner_error_ = NULL; #line 297 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (filepath != NULL, NULL); @@ -1935,28 +2012,26 @@ PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileForm #line 298 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp1_ = _tmp0_; #line 298 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = filepath; + _tmp2_ = photo_file_format_driver_create_metadata_writer (_tmp1_, filepath); #line 298 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = photo_file_format_driver_create_metadata_writer (_tmp1_, _tmp2_); -#line 298 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 298 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_format_driver_unref0 (_tmp1_); #line 298 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - writer = _tmp4_; + writer = _tmp3_; #line 299 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp5_ = writer; + _tmp4_ = writer; #line 299 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp5_ == NULL) { -#line 1952 "PhotoFileFormat.c" - GEnumValue* _tmp6_; - GError* _tmp7_; + if (_tmp4_ == NULL) { +#line 2027 "PhotoFileFormat.c" + GEnumValue* _tmp5_; + GError* _tmp6_; #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp6_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), self); + _tmp5_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), self); #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp7_ = g_error_new (PHOTO_FORMAT_ERROR, PHOTO_FORMAT_ERROR_READ_ONLY, "File format %s metadata is read-only", (_tmp6_ != NULL) ? _tmp6_->value_name : NULL); + _tmp6_ = g_error_new (PHOTO_FORMAT_ERROR, PHOTO_FORMAT_ERROR_READ_ONLY, "File format %s metadata is read-only", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL); #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _inner_error_ = _tmp7_; + _inner_error_ = _tmp6_; #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (_inner_error_->domain == PHOTO_FORMAT_ERROR) { #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1965,7 +2040,7 @@ PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileForm _photo_file_adapter_unref0 (writer); #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 1969 "PhotoFileFormat.c" +#line 2044 "PhotoFileFormat.c" } else { #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_adapter_unref0 (writer); @@ -1975,25 +2050,27 @@ PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileForm g_clear_error (&_inner_error_); #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 1979 "PhotoFileFormat.c" +#line 2054 "PhotoFileFormat.c" } } #line 302 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = writer; #line 302 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1986 "PhotoFileFormat.c" +#line 2061 "PhotoFileFormat.c" } -PhotoFileSniffer* photo_file_format_create_sniffer (PhotoFileFormat self, GFile* file, PhotoFileSnifferOptions options) { +PhotoFileSniffer* +photo_file_format_create_sniffer (PhotoFileFormat self, + GFile* file, + PhotoFileSnifferOptions options) +{ PhotoFileSniffer* result = NULL; PhotoFileFormatDriver* _tmp0_; PhotoFileFormatDriver* _tmp1_; - GFile* _tmp2_; - PhotoFileSnifferOptions _tmp3_; - PhotoFileSniffer* _tmp4_; - PhotoFileSniffer* _tmp5_; + PhotoFileSniffer* _tmp2_; + PhotoFileSniffer* _tmp3_; #line 305 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2001,24 +2078,22 @@ PhotoFileSniffer* photo_file_format_create_sniffer (PhotoFileFormat self, GFile* #line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp1_ = _tmp0_; #line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = file; -#line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = options; + _tmp2_ = photo_file_format_driver_create_sniffer (_tmp1_, file, options); #line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = photo_file_format_driver_create_sniffer (_tmp1_, _tmp2_, _tmp3_); -#line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_format_driver_unref0 (_tmp1_); #line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp5_; + result = _tmp3_; #line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 2018 "PhotoFileFormat.c" +#line 2091 "PhotoFileFormat.c" } -PhotoMetadata* photo_file_format_create_metadata (PhotoFileFormat self) { +PhotoMetadata* +photo_file_format_create_metadata (PhotoFileFormat self) +{ PhotoMetadata* result = NULL; PhotoFileFormatDriver* _tmp0_; PhotoFileFormatDriver* _tmp1_; @@ -2038,11 +2113,13 @@ PhotoMetadata* photo_file_format_create_metadata (PhotoFileFormat self) { result = _tmp3_; #line 310 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 2042 "PhotoFileFormat.c" +#line 2117 "PhotoFileFormat.c" } -gchar* photo_file_format_get_default_mime_type (PhotoFileFormat self) { +gchar* +photo_file_format_get_default_mime_type (PhotoFileFormat self) +{ gchar* result = NULL; PhotoFileFormatDriver* _tmp0_; PhotoFileFormatDriver* _tmp1_; @@ -2070,11 +2147,14 @@ gchar* photo_file_format_get_default_mime_type (PhotoFileFormat self) { result = _tmp5_; #line 314 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 2074 "PhotoFileFormat.c" +#line 2151 "PhotoFileFormat.c" } -gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_length1) { +gchar** +photo_file_format_get_mime_types (PhotoFileFormat self, + int* result_length1) +{ gchar** result = NULL; PhotoFileFormatDriver* _tmp0_; PhotoFileFormatDriver* _tmp1_; @@ -2112,34 +2192,41 @@ gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_leng if (result_length1) { #line 318 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *result_length1 = _tmp7__length1; -#line 2116 "PhotoFileFormat.c" +#line 2196 "PhotoFileFormat.c" } #line 318 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = _tmp7_; #line 318 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 2122 "PhotoFileFormat.c" +#line 2202 "PhotoFileFormat.c" } -static void _vala_array_add47 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add47 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if ((*length) == (*size)) { #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *size = (*size) ? (2 * (*size)) : 4; #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 2133 "PhotoFileFormat.c" +#line 2218 "PhotoFileFormat.c" } #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" (*array)[(*length)++] = value; #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" (*array)[*length] = NULL; -#line 2139 "PhotoFileFormat.c" +#line 2224 "PhotoFileFormat.c" } -gchar** photo_file_format_get_editable_mime_types (int* result_length1) { +gchar** +photo_file_format_get_editable_mime_types (int* result_length1) +{ gchar** result = NULL; gchar** mime_types = NULL; gchar** _tmp0_; @@ -2159,7 +2246,7 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) { _mime_types_size_ = mime_types_length1; #line 324 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp2_ = photo_file_format_get_supported (&_tmp1_); -#line 2163 "PhotoFileFormat.c" +#line 2250 "PhotoFileFormat.c" { PhotoFileFormat* file_format_collection = NULL; gint file_format_collection_length1 = 0; @@ -2171,11 +2258,11 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) { file_format_collection_length1 = _tmp1_; #line 324 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" for (file_format_it = 0; file_format_it < _tmp1_; file_format_it = file_format_it + 1) { -#line 2175 "PhotoFileFormat.c" +#line 2262 "PhotoFileFormat.c" PhotoFileFormat file_format = 0; #line 324 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" file_format = file_format_collection[file_format_it]; -#line 2179 "PhotoFileFormat.c" +#line 2266 "PhotoFileFormat.c" { PhotoFileFormat _tmp3_; gint _tmp4_; @@ -2184,7 +2271,7 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) { _tmp3_ = file_format; #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp5_ = photo_file_format_get_mime_types (_tmp3_, &_tmp4_); -#line 2188 "PhotoFileFormat.c" +#line 2275 "PhotoFileFormat.c" { gchar** mime_type_collection = NULL; gint mime_type_collection_length1 = 0; @@ -2196,14 +2283,14 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) { mime_type_collection_length1 = _tmp4_; #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" for (mime_type_it = 0; mime_type_it < _tmp4_; mime_type_it = mime_type_it + 1) { -#line 2200 "PhotoFileFormat.c" +#line 2287 "PhotoFileFormat.c" gchar* _tmp6_; gchar* mime_type = NULL; #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp6_ = g_strdup (mime_type_collection[mime_type_it]); #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" mime_type = _tmp6_; -#line 2207 "PhotoFileFormat.c" +#line 2294 "PhotoFileFormat.c" { gchar** _tmp7_; gint _tmp7__length1; @@ -2221,18 +2308,18 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) { _vala_array_add47 (&mime_types, &mime_types_length1, &_mime_types_size_, _tmp9_); #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (mime_type); -#line 2225 "PhotoFileFormat.c" +#line 2312 "PhotoFileFormat.c" } } #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" mime_type_collection = (_vala_array_free (mime_type_collection, mime_type_collection_length1, (GDestroyNotify) g_free), NULL); -#line 2230 "PhotoFileFormat.c" +#line 2317 "PhotoFileFormat.c" } } } #line 324 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" file_format_collection = (g_free (file_format_collection), NULL); -#line 2236 "PhotoFileFormat.c" +#line 2323 "PhotoFileFormat.c" } #line 329 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp10_ = mime_types; @@ -2242,17 +2329,19 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) { if (result_length1) { #line 329 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *result_length1 = _tmp10__length1; -#line 2246 "PhotoFileFormat.c" +#line 2333 "PhotoFileFormat.c" } #line 329 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = _tmp10_; #line 329 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 2252 "PhotoFileFormat.c" +#line 2339 "PhotoFileFormat.c" } -GType photo_file_format_get_type (void) { +GType +photo_file_format_get_type (void) +{ static volatile gsize photo_file_format_type_id__volatile = 0; if (g_once_init_enter (&photo_file_format_type_id__volatile)) { static const GEnumValue values[] = {{PHOTO_FILE_FORMAT_JFIF, "PHOTO_FILE_FORMAT_JFIF", "jfif"}, {PHOTO_FILE_FORMAT_RAW, "PHOTO_FILE_FORMAT_RAW", "raw"}, {PHOTO_FILE_FORMAT_PNG, "PHOTO_FILE_FORMAT_PNG", "png"}, {PHOTO_FILE_FORMAT_TIFF, "PHOTO_FILE_FORMAT_TIFF", "tiff"}, {PHOTO_FILE_FORMAT_BMP, "PHOTO_FILE_FORMAT_BMP", "bmp"}, {PHOTO_FILE_FORMAT_UNKNOWN, "PHOTO_FILE_FORMAT_UNKNOWN", "unknown"}, {0, NULL, NULL}}; @@ -2264,260 +2353,329 @@ GType photo_file_format_get_type (void) { } -static PhotoFileFormatProperties* photo_file_format_driver_real_get_properties (PhotoFileFormatDriver* self) { +static PhotoFileFormatProperties* +photo_file_format_driver_real_get_properties (PhotoFileFormatDriver* self) +{ #line 345 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_get_properties'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 345 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2273 "PhotoFileFormat.c" +#line 2364 "PhotoFileFormat.c" } -PhotoFileFormatProperties* photo_file_format_driver_get_properties (PhotoFileFormatDriver* self) { +PhotoFileFormatProperties* +photo_file_format_driver_get_properties (PhotoFileFormatDriver* self) +{ #line 345 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL); #line 345 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->get_properties (self); -#line 2282 "PhotoFileFormat.c" +#line 2375 "PhotoFileFormat.c" } -static PhotoFileReader* photo_file_format_driver_real_create_reader (PhotoFileFormatDriver* self, const gchar* filepath) { +static PhotoFileReader* +photo_file_format_driver_real_create_reader (PhotoFileFormatDriver* self, + const gchar* filepath) +{ #line 347 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_create_reader'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 347 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2291 "PhotoFileFormat.c" +#line 2387 "PhotoFileFormat.c" } -PhotoFileReader* photo_file_format_driver_create_reader (PhotoFileFormatDriver* self, const gchar* filepath) { +PhotoFileReader* +photo_file_format_driver_create_reader (PhotoFileFormatDriver* self, + const gchar* filepath) +{ #line 347 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL); #line 347 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->create_reader (self, filepath); -#line 2300 "PhotoFileFormat.c" +#line 2399 "PhotoFileFormat.c" } -static PhotoMetadata* photo_file_format_driver_real_create_metadata (PhotoFileFormatDriver* self) { +static PhotoMetadata* +photo_file_format_driver_real_create_metadata (PhotoFileFormatDriver* self) +{ #line 349 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_create_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 349 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2309 "PhotoFileFormat.c" +#line 2410 "PhotoFileFormat.c" } -PhotoMetadata* photo_file_format_driver_create_metadata (PhotoFileFormatDriver* self) { +PhotoMetadata* +photo_file_format_driver_create_metadata (PhotoFileFormatDriver* self) +{ #line 349 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL); #line 349 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->create_metadata (self); -#line 2318 "PhotoFileFormat.c" +#line 2421 "PhotoFileFormat.c" } -static gboolean photo_file_format_driver_real_can_write_image (PhotoFileFormatDriver* self) { +static gboolean +photo_file_format_driver_real_can_write_image (PhotoFileFormatDriver* self) +{ gboolean _tmp0_ = FALSE; #line 351 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_can_write_image'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 351 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return _tmp0_; -#line 2328 "PhotoFileFormat.c" +#line 2433 "PhotoFileFormat.c" } -gboolean photo_file_format_driver_can_write_image (PhotoFileFormatDriver* self) { +gboolean +photo_file_format_driver_can_write_image (PhotoFileFormatDriver* self) +{ #line 351 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), FALSE); #line 351 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->can_write_image (self); -#line 2337 "PhotoFileFormat.c" +#line 2444 "PhotoFileFormat.c" } -static gboolean photo_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* self) { +static gboolean +photo_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* self) +{ gboolean _tmp0_ = FALSE; #line 353 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_can_write_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 353 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return _tmp0_; -#line 2347 "PhotoFileFormat.c" +#line 2456 "PhotoFileFormat.c" } -gboolean photo_file_format_driver_can_write_metadata (PhotoFileFormatDriver* self) { +gboolean +photo_file_format_driver_can_write_metadata (PhotoFileFormatDriver* self) +{ #line 353 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), FALSE); #line 353 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->can_write_metadata (self); -#line 2356 "PhotoFileFormat.c" +#line 2467 "PhotoFileFormat.c" } -static PhotoFileWriter* photo_file_format_driver_real_create_writer (PhotoFileFormatDriver* self, const gchar* filepath) { +static PhotoFileWriter* +photo_file_format_driver_real_create_writer (PhotoFileFormatDriver* self, + const gchar* filepath) +{ #line 355 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_create_writer'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 355 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2365 "PhotoFileFormat.c" +#line 2479 "PhotoFileFormat.c" } -PhotoFileWriter* photo_file_format_driver_create_writer (PhotoFileFormatDriver* self, const gchar* filepath) { +PhotoFileWriter* +photo_file_format_driver_create_writer (PhotoFileFormatDriver* self, + const gchar* filepath) +{ #line 355 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL); #line 355 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->create_writer (self, filepath); -#line 2374 "PhotoFileFormat.c" +#line 2491 "PhotoFileFormat.c" } -static PhotoFileMetadataWriter* photo_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* self, const gchar* filepath) { +static PhotoFileMetadataWriter* +photo_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* self, + const gchar* filepath) +{ #line 357 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_create_metadata_writer'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 357 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2383 "PhotoFileFormat.c" +#line 2503 "PhotoFileFormat.c" } -PhotoFileMetadataWriter* photo_file_format_driver_create_metadata_writer (PhotoFileFormatDriver* self, const gchar* filepath) { +PhotoFileMetadataWriter* +photo_file_format_driver_create_metadata_writer (PhotoFileFormatDriver* self, + const gchar* filepath) +{ #line 357 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL); #line 357 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->create_metadata_writer (self, filepath); -#line 2392 "PhotoFileFormat.c" +#line 2515 "PhotoFileFormat.c" } -static PhotoFileSniffer* photo_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* self, GFile* file, PhotoFileSnifferOptions options) { +static PhotoFileSniffer* +photo_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* self, + GFile* file, + PhotoFileSnifferOptions options) +{ #line 359 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_create_sniffer'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 359 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2401 "PhotoFileFormat.c" +#line 2528 "PhotoFileFormat.c" } -PhotoFileSniffer* photo_file_format_driver_create_sniffer (PhotoFileFormatDriver* self, GFile* file, PhotoFileSnifferOptions options) { +PhotoFileSniffer* +photo_file_format_driver_create_sniffer (PhotoFileFormatDriver* self, + GFile* file, + PhotoFileSnifferOptions options) +{ #line 359 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL); #line 359 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->create_sniffer (self, file, options); -#line 2410 "PhotoFileFormat.c" +#line 2541 "PhotoFileFormat.c" } -PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type) { +PhotoFileFormatDriver* +photo_file_format_driver_construct (GType object_type) +{ PhotoFileFormatDriver* self = NULL; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" self = (PhotoFileFormatDriver*) g_type_create_instance (object_type); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return self; -#line 2420 "PhotoFileFormat.c" +#line 2553 "PhotoFileFormat.c" } -static void value_photo_file_format_driver_init (GValue* value) { +static void +value_photo_file_format_driver_init (GValue* value) +{ #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 2427 "PhotoFileFormat.c" +#line 2562 "PhotoFileFormat.c" } -static void value_photo_file_format_driver_free_value (GValue* value) { +static void +value_photo_file_format_driver_free_value (GValue* value) +{ #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (value->data[0].v_pointer) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_driver_unref (value->data[0].v_pointer); -#line 2436 "PhotoFileFormat.c" +#line 2573 "PhotoFileFormat.c" } } -static void value_photo_file_format_driver_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_photo_file_format_driver_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (src_value->data[0].v_pointer) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" dest_value->data[0].v_pointer = photo_file_format_driver_ref (src_value->data[0].v_pointer); -#line 2446 "PhotoFileFormat.c" +#line 2586 "PhotoFileFormat.c" } else { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" dest_value->data[0].v_pointer = NULL; -#line 2450 "PhotoFileFormat.c" +#line 2590 "PhotoFileFormat.c" } } -static gpointer value_photo_file_format_driver_peek_pointer (const GValue* value) { +static gpointer +value_photo_file_format_driver_peek_pointer (const GValue* value) +{ #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return value->data[0].v_pointer; -#line 2458 "PhotoFileFormat.c" +#line 2600 "PhotoFileFormat.c" } -static gchar* value_photo_file_format_driver_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_file_format_driver_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (collect_values[0].v_pointer) { -#line 2465 "PhotoFileFormat.c" +#line 2612 "PhotoFileFormat.c" PhotoFileFormatDriver * object; object = collect_values[0].v_pointer; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (object->parent_instance.g_class == NULL) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2472 "PhotoFileFormat.c" +#line 2619 "PhotoFileFormat.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.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 2476 "PhotoFileFormat.c" +#line 2623 "PhotoFileFormat.c" } #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = photo_file_format_driver_ref (object); -#line 2480 "PhotoFileFormat.c" +#line 2627 "PhotoFileFormat.c" } else { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 2484 "PhotoFileFormat.c" +#line 2631 "PhotoFileFormat.c" } #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2488 "PhotoFileFormat.c" +#line 2635 "PhotoFileFormat.c" } -static gchar* value_photo_file_format_driver_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_file_format_driver_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoFileFormatDriver ** object_p; object_p = collect_values[0].v_pointer; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (!object_p) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2499 "PhotoFileFormat.c" +#line 2651 "PhotoFileFormat.c" } #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (!value->data[0].v_pointer) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *object_p = NULL; -#line 2505 "PhotoFileFormat.c" +#line 2657 "PhotoFileFormat.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *object_p = value->data[0].v_pointer; -#line 2509 "PhotoFileFormat.c" +#line 2661 "PhotoFileFormat.c" } else { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *object_p = photo_file_format_driver_ref (value->data[0].v_pointer); -#line 2513 "PhotoFileFormat.c" +#line 2665 "PhotoFileFormat.c" } #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2517 "PhotoFileFormat.c" +#line 2669 "PhotoFileFormat.c" } -GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_photo_file_format_driver (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPhotoFileFormatDriver* spec; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PHOTO_FILE_FORMAT_DRIVER), NULL); @@ -2527,20 +2685,25 @@ GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar* G_PARAM_SPEC (spec)->value_type = object_type; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return G_PARAM_SPEC (spec); -#line 2531 "PhotoFileFormat.c" +#line 2689 "PhotoFileFormat.c" } -gpointer value_get_photo_file_format_driver (const GValue* value) { +gpointer +value_get_photo_file_format_driver (const GValue* value) +{ #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_DRIVER), NULL); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return value->data[0].v_pointer; -#line 2540 "PhotoFileFormat.c" +#line 2700 "PhotoFileFormat.c" } -void value_set_photo_file_format_driver (GValue* value, gpointer v_object) { +void +value_set_photo_file_format_driver (GValue* value, + gpointer v_object) +{ PhotoFileFormatDriver * old; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_DRIVER)); @@ -2556,22 +2719,25 @@ void value_set_photo_file_format_driver (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_driver_ref (value->data[0].v_pointer); -#line 2560 "PhotoFileFormat.c" +#line 2723 "PhotoFileFormat.c" } else { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 2564 "PhotoFileFormat.c" +#line 2727 "PhotoFileFormat.c" } #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (old) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_driver_unref (old); -#line 2570 "PhotoFileFormat.c" +#line 2733 "PhotoFileFormat.c" } } -void value_take_photo_file_format_driver (GValue* value, gpointer v_object) { +void +value_take_photo_file_format_driver (GValue* value, + gpointer v_object) +{ PhotoFileFormatDriver * old; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_DRIVER)); @@ -2585,22 +2751,24 @@ void value_take_photo_file_format_driver (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = v_object; -#line 2589 "PhotoFileFormat.c" +#line 2755 "PhotoFileFormat.c" } else { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 2593 "PhotoFileFormat.c" +#line 2759 "PhotoFileFormat.c" } #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (old) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_driver_unref (old); -#line 2599 "PhotoFileFormat.c" +#line 2765 "PhotoFileFormat.c" } } -static void photo_file_format_driver_class_init (PhotoFileFormatDriverClass * klass) { +static void +photo_file_format_driver_class_init (PhotoFileFormatDriverClass * klass) +{ #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_driver_parent_class = g_type_class_peek_parent (klass); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2621,28 +2789,34 @@ static void photo_file_format_driver_class_init (PhotoFileFormatDriverClass * kl ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) photo_file_format_driver_real_create_metadata_writer; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) photo_file_format_driver_real_create_sniffer; -#line 2625 "PhotoFileFormat.c" +#line 2793 "PhotoFileFormat.c" } -static void photo_file_format_driver_instance_init (PhotoFileFormatDriver * self) { +static void +photo_file_format_driver_instance_init (PhotoFileFormatDriver * self) +{ #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" self->ref_count = 1; -#line 2632 "PhotoFileFormat.c" +#line 2802 "PhotoFileFormat.c" } -static void photo_file_format_driver_finalize (PhotoFileFormatDriver * obj) { +static void +photo_file_format_driver_finalize (PhotoFileFormatDriver * obj) +{ PhotoFileFormatDriver * self; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_FORMAT_DRIVER, PhotoFileFormatDriver); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_signal_handlers_destroy (self); -#line 2642 "PhotoFileFormat.c" +#line 2814 "PhotoFileFormat.c" } -GType photo_file_format_driver_get_type (void) { +GType +photo_file_format_driver_get_type (void) +{ static volatile gsize photo_file_format_driver_type_id__volatile = 0; if (g_once_init_enter (&photo_file_format_driver_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_photo_file_format_driver_init, value_photo_file_format_driver_free_value, value_photo_file_format_driver_copy_value, value_photo_file_format_driver_peek_pointer, "p", value_photo_file_format_driver_collect_value, "p", value_photo_file_format_driver_lcopy_value }; @@ -2656,18 +2830,22 @@ GType photo_file_format_driver_get_type (void) { } -gpointer photo_file_format_driver_ref (gpointer instance) { +gpointer +photo_file_format_driver_ref (gpointer instance) +{ PhotoFileFormatDriver * self; self = instance; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_atomic_int_inc (&self->ref_count); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return instance; -#line 2667 "PhotoFileFormat.c" +#line 2843 "PhotoFileFormat.c" } -void photo_file_format_driver_unref (gpointer instance) { +void +photo_file_format_driver_unref (gpointer instance) +{ PhotoFileFormatDriver * self; self = instance; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2676,12 +2854,14 @@ void photo_file_format_driver_unref (gpointer instance) { PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->finalize (self); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2680 "PhotoFileFormat.c" +#line 2858 "PhotoFileFormat.c" } } -GType photo_file_format_flags_get_type (void) { +GType +photo_file_format_flags_get_type (void) +{ static volatile gsize photo_file_format_flags_type_id__volatile = 0; if (g_once_init_enter (&photo_file_format_flags_type_id__volatile)) { static const GEnumValue values[] = {{PHOTO_FILE_FORMAT_FLAGS_NONE, "PHOTO_FILE_FORMAT_FLAGS_NONE", "none"}, {0, NULL, NULL}}; @@ -2693,408 +2873,460 @@ GType photo_file_format_flags_get_type (void) { } -static PhotoFileFormat photo_file_format_properties_real_get_file_format (PhotoFileFormatProperties* self) { +static PhotoFileFormat +photo_file_format_properties_real_get_file_format (PhotoFileFormatProperties* self) +{ #line 374 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_file_format'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 374 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return 0; -#line 2702 "PhotoFileFormat.c" +#line 2884 "PhotoFileFormat.c" } -PhotoFileFormat photo_file_format_properties_get_file_format (PhotoFileFormatProperties* self) { +PhotoFileFormat +photo_file_format_properties_get_file_format (PhotoFileFormatProperties* self) +{ #line 374 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), 0); #line 374 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_file_format (self); -#line 2711 "PhotoFileFormat.c" +#line 2895 "PhotoFileFormat.c" } -static PhotoFileFormatFlags photo_file_format_properties_real_get_flags (PhotoFileFormatProperties* self) { +static PhotoFileFormatFlags +photo_file_format_properties_real_get_flags (PhotoFileFormatProperties* self) +{ #line 376 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_flags'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 376 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return 0; -#line 2720 "PhotoFileFormat.c" +#line 2906 "PhotoFileFormat.c" } -PhotoFileFormatFlags photo_file_format_properties_get_flags (PhotoFileFormatProperties* self) { +PhotoFileFormatFlags +photo_file_format_properties_get_flags (PhotoFileFormatProperties* self) +{ #line 376 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), 0); #line 376 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_flags (self); -#line 2729 "PhotoFileFormat.c" +#line 2917 "PhotoFileFormat.c" } -static gboolean photo_file_format_properties_real_is_recognized_extension (PhotoFileFormatProperties* self, const gchar* ext) { +static gboolean +photo_file_format_properties_real_is_recognized_extension (PhotoFileFormatProperties* self, + const gchar* ext) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gint _tmp1_; + gint _tmp0_; + gchar** _tmp1_; gchar** _tmp2_; - gchar** _tmp3_; - gint _tmp3__length1; - gboolean _tmp4_; - gboolean _tmp5_; + gint _tmp2__length1; + gboolean _tmp3_; #line 380 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (ext != NULL, FALSE); #line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = ext; -#line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = photo_file_format_properties_get_known_extensions (self, &_tmp1_); + _tmp1_ = photo_file_format_properties_get_known_extensions (self, &_tmp0_); #line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = _tmp2_; -#line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3__length1 = _tmp1_; + _tmp2_ = _tmp1_; #line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = is_in_ci_array (_tmp0_, _tmp3_, _tmp1_); + _tmp2__length1 = _tmp0_; #line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp5_ = _tmp4_; + _tmp3_ = is_in_ci_array (ext, _tmp2_, _tmp0_); #line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = (_vala_array_free (_tmp3_, _tmp3__length1, (GDestroyNotify) g_free), NULL); + _tmp2_ = (_vala_array_free (_tmp2_, _tmp2__length1, (GDestroyNotify) g_free), NULL); #line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp5_; + result = _tmp3_; #line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 2762 "PhotoFileFormat.c" +#line 2947 "PhotoFileFormat.c" } -gboolean photo_file_format_properties_is_recognized_extension (PhotoFileFormatProperties* self, const gchar* ext) { +gboolean +photo_file_format_properties_is_recognized_extension (PhotoFileFormatProperties* self, + const gchar* ext) +{ #line 380 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), FALSE); #line 380 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->is_recognized_extension (self, ext); -#line 2771 "PhotoFileFormat.c" +#line 2959 "PhotoFileFormat.c" } -static gchar* photo_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* self) { +static gchar* +photo_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* self) +{ #line 384 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_default_extension'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 384 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2780 "PhotoFileFormat.c" +#line 2970 "PhotoFileFormat.c" } -gchar* photo_file_format_properties_get_default_extension (PhotoFileFormatProperties* self) { +gchar* +photo_file_format_properties_get_default_extension (PhotoFileFormatProperties* self) +{ #line 384 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL); #line 384 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_default_extension (self); -#line 2789 "PhotoFileFormat.c" +#line 2981 "PhotoFileFormat.c" } -static gchar** photo_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* self, int* result_length1) { +static gchar** +photo_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* self, + int* result_length1) +{ #line 386 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_known_extensions'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 386 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2798 "PhotoFileFormat.c" +#line 2993 "PhotoFileFormat.c" } -gchar** photo_file_format_properties_get_known_extensions (PhotoFileFormatProperties* self, int* result_length1) { +gchar** +photo_file_format_properties_get_known_extensions (PhotoFileFormatProperties* self, + int* result_length1) +{ #line 386 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL); #line 386 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_known_extensions (self, result_length1); -#line 2807 "PhotoFileFormat.c" +#line 3005 "PhotoFileFormat.c" } -static gchar* photo_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* self) { +static gchar* +photo_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* self) +{ #line 388 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_default_mime_type'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 388 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2816 "PhotoFileFormat.c" +#line 3016 "PhotoFileFormat.c" } -gchar* photo_file_format_properties_get_default_mime_type (PhotoFileFormatProperties* self) { +gchar* +photo_file_format_properties_get_default_mime_type (PhotoFileFormatProperties* self) +{ #line 388 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL); #line 388 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_default_mime_type (self); -#line 2825 "PhotoFileFormat.c" +#line 3027 "PhotoFileFormat.c" } -static gchar** photo_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* self, int* result_length1) { +static gchar** +photo_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* self, + int* result_length1) +{ #line 390 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_mime_types'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 390 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2834 "PhotoFileFormat.c" +#line 3039 "PhotoFileFormat.c" } -gchar** photo_file_format_properties_get_mime_types (PhotoFileFormatProperties* self, int* result_length1) { +gchar** +photo_file_format_properties_get_mime_types (PhotoFileFormatProperties* self, + int* result_length1) +{ #line 390 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL); #line 390 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_mime_types (self, result_length1); -#line 2843 "PhotoFileFormat.c" +#line 3051 "PhotoFileFormat.c" } -static gchar* photo_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* self) { +static gchar* +photo_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* self) +{ #line 397 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_user_visible_name'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 397 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2852 "PhotoFileFormat.c" +#line 3062 "PhotoFileFormat.c" } -gchar* photo_file_format_properties_get_user_visible_name (PhotoFileFormatProperties* self) { +gchar* +photo_file_format_properties_get_user_visible_name (PhotoFileFormatProperties* self) +{ #line 397 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL); #line 397 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_user_visible_name (self); -#line 2861 "PhotoFileFormat.c" +#line 3073 "PhotoFileFormat.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return self ? g_object_ref (self) : NULL; -#line 2868 "PhotoFileFormat.c" +#line 3082 "PhotoFileFormat.c" } -GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatProperties* self, GFile* file) { +GFile* +photo_file_format_properties_convert_file_extension (PhotoFileFormatProperties* self, + GFile* file) +{ GFile* result = NULL; gchar* name = NULL; gchar* ext = NULL; - GFile* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - const gchar* _tmp6_; - GFile* _tmp11_; - GFile* _tmp12_; - GFile* _tmp13_; - const gchar* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; - GFile* _tmp19_; - GFile* _tmp20_; + gboolean _tmp4_ = FALSE; + const gchar* _tmp5_; + GFile* _tmp8_; + GFile* _tmp9_; + const gchar* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + GFile* _tmp15_; + GFile* _tmp16_; #line 401 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL); #line 401 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 403 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = file; -#line 403 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp1_ = g_file_get_basename (_tmp0_); + _tmp0_ = g_file_get_basename (file); #line 403 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 403 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - disassemble_filename (_tmp2_, &_tmp3_, &_tmp4_); + disassemble_filename (_tmp1_, &_tmp2_, &_tmp3_); #line 403 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (name); #line 403 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - name = _tmp3_; + name = _tmp2_; #line 403 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (ext); #line 403 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ext = _tmp4_; + ext = _tmp3_; #line 403 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _g_free0 (_tmp2_); -#line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp6_ = ext; + _g_free0 (_tmp1_); #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp6_ != NULL) { -#line 2919 "PhotoFileFormat.c" - const gchar* _tmp7_; - gboolean _tmp8_; + _tmp5_ = ext; #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp7_ = ext; + if (_tmp5_ != NULL) { +#line 3132 "PhotoFileFormat.c" + const gchar* _tmp6_; #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp8_ = photo_file_format_properties_is_recognized_extension (self, _tmp7_); + _tmp6_ = ext; #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp5_ = _tmp8_; -#line 2928 "PhotoFileFormat.c" + _tmp4_ = photo_file_format_properties_is_recognized_extension (self, _tmp6_); +#line 3138 "PhotoFileFormat.c" } else { #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp5_ = FALSE; -#line 2932 "PhotoFileFormat.c" + _tmp4_ = FALSE; +#line 3142 "PhotoFileFormat.c" } #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp5_) { -#line 2936 "PhotoFileFormat.c" - GFile* _tmp9_; - GFile* _tmp10_; -#line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp9_ = file; + if (_tmp4_) { +#line 3146 "PhotoFileFormat.c" + GFile* _tmp7_; #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp10_ = _g_object_ref0 (_tmp9_); + _tmp7_ = _g_object_ref0 (file); #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp10_; + result = _tmp7_; #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (ext); #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (name); #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 2951 "PhotoFileFormat.c" +#line 3158 "PhotoFileFormat.c" } #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp11_ = file; + _tmp8_ = g_file_get_parent (file); #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp12_ = g_file_get_parent (_tmp11_); + _tmp9_ = _tmp8_; #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp13_ = _tmp12_; + _tmp10_ = name; #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp14_ = name; + _tmp11_ = photo_file_format_properties_get_default_extension (self); #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp15_ = photo_file_format_properties_get_default_extension (self); + _tmp12_ = _tmp11_; #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp16_ = _tmp15_; -#line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp17_ = g_strdup_printf ("%s.%s", _tmp14_, _tmp16_); + _tmp13_ = g_strdup_printf ("%s.%s", _tmp10_, _tmp12_); #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp18_ = _tmp17_; + _tmp14_ = _tmp13_; #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp19_ = g_file_get_child (_tmp13_, _tmp18_); + _tmp15_ = g_file_get_child (_tmp9_, _tmp14_); #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp20_ = _tmp19_; + _tmp16_ = _tmp15_; #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp14_); #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp12_); #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp9_); #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp20_; + result = _tmp16_; #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (ext); #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (name); #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 2987 "PhotoFileFormat.c" +#line 3192 "PhotoFileFormat.c" } -PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type) { +PhotoFileFormatProperties* +photo_file_format_properties_construct (GType object_type) +{ PhotoFileFormatProperties* self = NULL; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" self = (PhotoFileFormatProperties*) g_type_create_instance (object_type); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return self; -#line 2997 "PhotoFileFormat.c" +#line 3204 "PhotoFileFormat.c" } -static void value_photo_file_format_properties_init (GValue* value) { +static void +value_photo_file_format_properties_init (GValue* value) +{ #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 3004 "PhotoFileFormat.c" +#line 3213 "PhotoFileFormat.c" } -static void value_photo_file_format_properties_free_value (GValue* value) { +static void +value_photo_file_format_properties_free_value (GValue* value) +{ #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (value->data[0].v_pointer) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_properties_unref (value->data[0].v_pointer); -#line 3013 "PhotoFileFormat.c" +#line 3224 "PhotoFileFormat.c" } } -static void value_photo_file_format_properties_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_photo_file_format_properties_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (src_value->data[0].v_pointer) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" dest_value->data[0].v_pointer = photo_file_format_properties_ref (src_value->data[0].v_pointer); -#line 3023 "PhotoFileFormat.c" +#line 3237 "PhotoFileFormat.c" } else { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" dest_value->data[0].v_pointer = NULL; -#line 3027 "PhotoFileFormat.c" +#line 3241 "PhotoFileFormat.c" } } -static gpointer value_photo_file_format_properties_peek_pointer (const GValue* value) { +static gpointer +value_photo_file_format_properties_peek_pointer (const GValue* value) +{ #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return value->data[0].v_pointer; -#line 3035 "PhotoFileFormat.c" +#line 3251 "PhotoFileFormat.c" } -static gchar* value_photo_file_format_properties_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_file_format_properties_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (collect_values[0].v_pointer) { -#line 3042 "PhotoFileFormat.c" +#line 3263 "PhotoFileFormat.c" PhotoFileFormatProperties * object; object = collect_values[0].v_pointer; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (object->parent_instance.g_class == NULL) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3049 "PhotoFileFormat.c" +#line 3270 "PhotoFileFormat.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.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 3053 "PhotoFileFormat.c" +#line 3274 "PhotoFileFormat.c" } #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = photo_file_format_properties_ref (object); -#line 3057 "PhotoFileFormat.c" +#line 3278 "PhotoFileFormat.c" } else { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 3061 "PhotoFileFormat.c" +#line 3282 "PhotoFileFormat.c" } #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 3065 "PhotoFileFormat.c" +#line 3286 "PhotoFileFormat.c" } -static gchar* value_photo_file_format_properties_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_file_format_properties_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoFileFormatProperties ** object_p; object_p = collect_values[0].v_pointer; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (!object_p) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3076 "PhotoFileFormat.c" +#line 3302 "PhotoFileFormat.c" } #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (!value->data[0].v_pointer) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *object_p = NULL; -#line 3082 "PhotoFileFormat.c" +#line 3308 "PhotoFileFormat.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *object_p = value->data[0].v_pointer; -#line 3086 "PhotoFileFormat.c" +#line 3312 "PhotoFileFormat.c" } else { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *object_p = photo_file_format_properties_ref (value->data[0].v_pointer); -#line 3090 "PhotoFileFormat.c" +#line 3316 "PhotoFileFormat.c" } #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 3094 "PhotoFileFormat.c" +#line 3320 "PhotoFileFormat.c" } -GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_photo_file_format_properties (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPhotoFileFormatProperties* spec; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PHOTO_FILE_FORMAT_PROPERTIES), NULL); @@ -3104,20 +3336,25 @@ GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return G_PARAM_SPEC (spec); -#line 3108 "PhotoFileFormat.c" +#line 3340 "PhotoFileFormat.c" } -gpointer value_get_photo_file_format_properties (const GValue* value) { +gpointer +value_get_photo_file_format_properties (const GValue* value) +{ #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_PROPERTIES), NULL); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return value->data[0].v_pointer; -#line 3117 "PhotoFileFormat.c" +#line 3351 "PhotoFileFormat.c" } -void value_set_photo_file_format_properties (GValue* value, gpointer v_object) { +void +value_set_photo_file_format_properties (GValue* value, + gpointer v_object) +{ PhotoFileFormatProperties * old; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_PROPERTIES)); @@ -3133,22 +3370,25 @@ void value_set_photo_file_format_properties (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_properties_ref (value->data[0].v_pointer); -#line 3137 "PhotoFileFormat.c" +#line 3374 "PhotoFileFormat.c" } else { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 3141 "PhotoFileFormat.c" +#line 3378 "PhotoFileFormat.c" } #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (old) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_properties_unref (old); -#line 3147 "PhotoFileFormat.c" +#line 3384 "PhotoFileFormat.c" } } -void value_take_photo_file_format_properties (GValue* value, gpointer v_object) { +void +value_take_photo_file_format_properties (GValue* value, + gpointer v_object) +{ PhotoFileFormatProperties * old; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_PROPERTIES)); @@ -3162,22 +3402,24 @@ void value_take_photo_file_format_properties (GValue* value, gpointer v_object) g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = v_object; -#line 3166 "PhotoFileFormat.c" +#line 3406 "PhotoFileFormat.c" } else { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 3170 "PhotoFileFormat.c" +#line 3410 "PhotoFileFormat.c" } #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (old) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_properties_unref (old); -#line 3176 "PhotoFileFormat.c" +#line 3416 "PhotoFileFormat.c" } } -static void photo_file_format_properties_class_init (PhotoFileFormatPropertiesClass * klass) { +static void +photo_file_format_properties_class_init (PhotoFileFormatPropertiesClass * klass) +{ #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_properties_parent_class = g_type_class_peek_parent (klass); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -3198,28 +3440,34 @@ static void photo_file_format_properties_class_init (PhotoFileFormatPropertiesCl ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*) (PhotoFileFormatProperties *, int*)) photo_file_format_properties_real_get_mime_types; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*) (PhotoFileFormatProperties *)) photo_file_format_properties_real_get_user_visible_name; -#line 3202 "PhotoFileFormat.c" +#line 3444 "PhotoFileFormat.c" } -static void photo_file_format_properties_instance_init (PhotoFileFormatProperties * self) { +static void +photo_file_format_properties_instance_init (PhotoFileFormatProperties * self) +{ #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" self->ref_count = 1; -#line 3209 "PhotoFileFormat.c" +#line 3453 "PhotoFileFormat.c" } -static void photo_file_format_properties_finalize (PhotoFileFormatProperties * obj) { +static void +photo_file_format_properties_finalize (PhotoFileFormatProperties * obj) +{ PhotoFileFormatProperties * self; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_signal_handlers_destroy (self); -#line 3219 "PhotoFileFormat.c" +#line 3465 "PhotoFileFormat.c" } -GType photo_file_format_properties_get_type (void) { +GType +photo_file_format_properties_get_type (void) +{ static volatile gsize photo_file_format_properties_type_id__volatile = 0; if (g_once_init_enter (&photo_file_format_properties_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_photo_file_format_properties_init, value_photo_file_format_properties_free_value, value_photo_file_format_properties_copy_value, value_photo_file_format_properties_peek_pointer, "p", value_photo_file_format_properties_collect_value, "p", value_photo_file_format_properties_lcopy_value }; @@ -3233,18 +3481,22 @@ GType photo_file_format_properties_get_type (void) { } -gpointer photo_file_format_properties_ref (gpointer instance) { +gpointer +photo_file_format_properties_ref (gpointer instance) +{ PhotoFileFormatProperties * self; self = instance; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_atomic_int_inc (&self->ref_count); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return instance; -#line 3244 "PhotoFileFormat.c" +#line 3494 "PhotoFileFormat.c" } -void photo_file_format_properties_unref (gpointer instance) { +void +photo_file_format_properties_unref (gpointer instance) +{ PhotoFileFormatProperties * self; self = instance; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -3253,12 +3505,16 @@ void photo_file_format_properties_unref (gpointer instance) { PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->finalize (self); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3257 "PhotoFileFormat.c" +#line 3509 "PhotoFileFormat.c" } } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -3270,7 +3526,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/photos/PhotoFileSniffer.c b/src/photos/PhotoFileSniffer.c index e632525..04d5d07 100644 --- a/src/photos/PhotoFileSniffer.c +++ b/src/photos/PhotoFileSniffer.c @@ -1,4 +1,4 @@ -/* PhotoFileSniffer.c generated by valac 0.36.6, the Vala compiler +/* PhotoFileSniffer.c generated by valac 0.40.4, the Vala compiler * generated from PhotoFileSniffer.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -180,181 +181,239 @@ static gpointer photo_file_interrogator_parent_class = NULL; gpointer detected_photo_information_ref (gpointer instance); void detected_photo_information_unref (gpointer instance); -GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_detected_photo_information (GValue* value, gpointer v_object); -void value_take_detected_photo_information (GValue* value, gpointer v_object); +GParamSpec* param_spec_detected_photo_information (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_detected_photo_information (GValue* value, + gpointer v_object); +void value_take_detected_photo_information (GValue* value, + gpointer v_object); gpointer value_get_detected_photo_information (const GValue* value); GType detected_photo_information_get_type (void) G_GNUC_CONST; GType photo_file_format_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); -enum { - DETECTED_PHOTO_INFORMATION_DUMMY_PROPERTY -}; -void dimensions_init (Dimensions *self, gint width, gint height); +void dimensions_init (Dimensions *self, + gint width, + gint height); DetectedPhotoInformation* detected_photo_information_new (void); DetectedPhotoInformation* detected_photo_information_construct (GType object_type); static void detected_photo_information_finalize (DetectedPhotoInformation * obj); gpointer photo_file_sniffer_ref (gpointer instance); void photo_file_sniffer_unref (gpointer instance); -GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_sniffer (GValue* value, gpointer v_object); -void value_take_photo_file_sniffer (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_sniffer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_sniffer (GValue* value, + gpointer v_object); +void value_take_photo_file_sniffer (GValue* value, + gpointer v_object); gpointer value_get_photo_file_sniffer (const GValue* value); GType photo_file_sniffer_get_type (void) G_GNUC_CONST; GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; -enum { - PHOTO_FILE_SNIFFER_DUMMY_PROPERTY -}; -PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error); -static DetectedPhotoInformation* photo_file_sniffer_real_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error); +PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, + gboolean* is_corrupted, + GError** error); +static DetectedPhotoInformation* photo_file_sniffer_real_sniff (PhotoFileSniffer* self, + gboolean* is_corrupted, + GError** error); static void photo_file_sniffer_finalize (PhotoFileSniffer * obj); gpointer photo_file_interrogator_ref (gpointer instance); void photo_file_interrogator_unref (gpointer instance); -GParamSpec* param_spec_photo_file_interrogator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_interrogator (GValue* value, gpointer v_object); -void value_take_photo_file_interrogator (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_interrogator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_interrogator (GValue* value, + gpointer v_object); +void value_take_photo_file_interrogator (GValue* value, + gpointer v_object); gpointer value_get_photo_file_interrogator (const GValue* value); GType photo_file_interrogator_get_type (void) G_GNUC_CONST; #define PHOTO_FILE_INTERROGATOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_FILE_INTERROGATOR, PhotoFileInterrogatorPrivate)) -enum { - PHOTO_FILE_INTERROGATOR_DUMMY_PROPERTY -}; -PhotoFileInterrogator* photo_file_interrogator_new (GFile* file, PhotoFileSnifferOptions options); -PhotoFileInterrogator* photo_file_interrogator_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); +PhotoFileInterrogator* photo_file_interrogator_new (GFile* file, + PhotoFileSnifferOptions options); +PhotoFileInterrogator* photo_file_interrogator_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); DetectedPhotoInformation* photo_file_interrogator_get_detected_photo_information (PhotoFileInterrogator* self); gboolean photo_file_interrogator_get_is_photo_corrupted (PhotoFileInterrogator* self); -void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** error); +void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, + GError** error); PhotoFileFormat* photo_file_format_get_supported (int* result_length1); -PhotoFileSniffer* photo_file_format_create_sniffer (PhotoFileFormat self, GFile* file, PhotoFileSnifferOptions options); +PhotoFileSniffer* photo_file_format_create_sniffer (PhotoFileFormat self, + GFile* file, + PhotoFileSnifferOptions options); static void photo_file_interrogator_finalize (PhotoFileInterrogator * obj); -DetectedPhotoInformation* detected_photo_information_construct (GType object_type) { +DetectedPhotoInformation* +detected_photo_information_construct (GType object_type) +{ DetectedPhotoInformation* self = NULL; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self = (DetectedPhotoInformation*) g_type_create_instance (object_type); #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return self; -#line 250 "PhotoFileSniffer.c" +#line 282 "PhotoFileSniffer.c" } -DetectedPhotoInformation* detected_photo_information_new (void) { +DetectedPhotoInformation* +detected_photo_information_new (void) +{ #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return detected_photo_information_construct (TYPE_DETECTED_PHOTO_INFORMATION); -#line 257 "PhotoFileSniffer.c" +#line 291 "PhotoFileSniffer.c" } -static void value_detected_photo_information_init (GValue* value) { +static void +value_detected_photo_information_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 264 "PhotoFileSniffer.c" +#line 300 "PhotoFileSniffer.c" } -static void value_detected_photo_information_free_value (GValue* value) { +static void +value_detected_photo_information_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" detected_photo_information_unref (value->data[0].v_pointer); -#line 273 "PhotoFileSniffer.c" +#line 311 "PhotoFileSniffer.c" } } -static void value_detected_photo_information_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_detected_photo_information_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" dest_value->data[0].v_pointer = detected_photo_information_ref (src_value->data[0].v_pointer); -#line 283 "PhotoFileSniffer.c" +#line 324 "PhotoFileSniffer.c" } else { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" dest_value->data[0].v_pointer = NULL; -#line 287 "PhotoFileSniffer.c" +#line 328 "PhotoFileSniffer.c" } } -static gpointer value_detected_photo_information_peek_pointer (const GValue* value) { +static gpointer +value_detected_photo_information_peek_pointer (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return value->data[0].v_pointer; -#line 295 "PhotoFileSniffer.c" +#line 338 "PhotoFileSniffer.c" } -static gchar* value_detected_photo_information_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_detected_photo_information_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (collect_values[0].v_pointer) { -#line 302 "PhotoFileSniffer.c" +#line 350 "PhotoFileSniffer.c" DetectedPhotoInformation * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 309 "PhotoFileSniffer.c" +#line 357 "PhotoFileSniffer.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.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 313 "PhotoFileSniffer.c" +#line 361 "PhotoFileSniffer.c" } #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = detected_photo_information_ref (object); -#line 317 "PhotoFileSniffer.c" +#line 365 "PhotoFileSniffer.c" } else { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 321 "PhotoFileSniffer.c" +#line 369 "PhotoFileSniffer.c" } #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return NULL; -#line 325 "PhotoFileSniffer.c" +#line 373 "PhotoFileSniffer.c" } -static gchar* value_detected_photo_information_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_detected_photo_information_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ DetectedPhotoInformation ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 336 "PhotoFileSniffer.c" +#line 389 "PhotoFileSniffer.c" } #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" *object_p = NULL; -#line 342 "PhotoFileSniffer.c" +#line 395 "PhotoFileSniffer.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" *object_p = value->data[0].v_pointer; -#line 346 "PhotoFileSniffer.c" +#line 399 "PhotoFileSniffer.c" } else { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" *object_p = detected_photo_information_ref (value->data[0].v_pointer); -#line 350 "PhotoFileSniffer.c" +#line 403 "PhotoFileSniffer.c" } #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return NULL; -#line 354 "PhotoFileSniffer.c" +#line 407 "PhotoFileSniffer.c" } -GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_detected_photo_information (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecDetectedPhotoInformation* spec; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_DETECTED_PHOTO_INFORMATION), NULL); @@ -364,20 +423,25 @@ GParamSpec* param_spec_detected_photo_information (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return G_PARAM_SPEC (spec); -#line 368 "PhotoFileSniffer.c" +#line 427 "PhotoFileSniffer.c" } -gpointer value_get_detected_photo_information (const GValue* value) { +gpointer +value_get_detected_photo_information (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DETECTED_PHOTO_INFORMATION), NULL); #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return value->data[0].v_pointer; -#line 377 "PhotoFileSniffer.c" +#line 438 "PhotoFileSniffer.c" } -void value_set_detected_photo_information (GValue* value, gpointer v_object) { +void +value_set_detected_photo_information (GValue* value, + gpointer v_object) +{ DetectedPhotoInformation * old; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DETECTED_PHOTO_INFORMATION)); @@ -393,22 +457,25 @@ void value_set_detected_photo_information (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" detected_photo_information_ref (value->data[0].v_pointer); -#line 397 "PhotoFileSniffer.c" +#line 461 "PhotoFileSniffer.c" } else { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 401 "PhotoFileSniffer.c" +#line 465 "PhotoFileSniffer.c" } #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" detected_photo_information_unref (old); -#line 407 "PhotoFileSniffer.c" +#line 471 "PhotoFileSniffer.c" } } -void value_take_detected_photo_information (GValue* value, gpointer v_object) { +void +value_take_detected_photo_information (GValue* value, + gpointer v_object) +{ DetectedPhotoInformation * old; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DETECTED_PHOTO_INFORMATION)); @@ -422,31 +489,35 @@ void value_take_detected_photo_information (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = v_object; -#line 426 "PhotoFileSniffer.c" +#line 493 "PhotoFileSniffer.c" } else { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 430 "PhotoFileSniffer.c" +#line 497 "PhotoFileSniffer.c" } #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" detected_photo_information_unref (old); -#line 436 "PhotoFileSniffer.c" +#line 503 "PhotoFileSniffer.c" } } -static void detected_photo_information_class_init (DetectedPhotoInformationClass * klass) { +static void +detected_photo_information_class_init (DetectedPhotoInformationClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" detected_photo_information_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" ((DetectedPhotoInformationClass *) klass)->finalize = detected_photo_information_finalize; -#line 446 "PhotoFileSniffer.c" +#line 515 "PhotoFileSniffer.c" } -static void detected_photo_information_instance_init (DetectedPhotoInformation * self) { +static void +detected_photo_information_instance_init (DetectedPhotoInformation * self) +{ #line 8 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self->file_format = PHOTO_FILE_FORMAT_UNKNOWN; #line 9 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -469,11 +540,13 @@ static void detected_photo_information_instance_init (DetectedPhotoInformation * self->bits_per_channel = 0; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self->ref_count = 1; -#line 473 "PhotoFileSniffer.c" +#line 544 "PhotoFileSniffer.c" } -static void detected_photo_information_finalize (DetectedPhotoInformation * obj) { +static void +detected_photo_information_finalize (DetectedPhotoInformation * obj) +{ DetectedPhotoInformation * self; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DETECTED_PHOTO_INFORMATION, DetectedPhotoInformation); @@ -489,11 +562,13 @@ static void detected_photo_information_finalize (DetectedPhotoInformation * obj) _g_free0 (self->thumbnail_md5); #line 13 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _g_free0 (self->format_name); -#line 493 "PhotoFileSniffer.c" +#line 566 "PhotoFileSniffer.c" } -GType detected_photo_information_get_type (void) { +GType +detected_photo_information_get_type (void) +{ static volatile gsize detected_photo_information_type_id__volatile = 0; if (g_once_init_enter (&detected_photo_information_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_detected_photo_information_init, value_detected_photo_information_free_value, value_detected_photo_information_copy_value, value_detected_photo_information_peek_pointer, "p", value_detected_photo_information_collect_value, "p", value_detected_photo_information_lcopy_value }; @@ -507,18 +582,22 @@ GType detected_photo_information_get_type (void) { } -gpointer detected_photo_information_ref (gpointer instance) { +gpointer +detected_photo_information_ref (gpointer instance) +{ DetectedPhotoInformation * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return instance; -#line 518 "PhotoFileSniffer.c" +#line 595 "PhotoFileSniffer.c" } -void detected_photo_information_unref (gpointer instance) { +void +detected_photo_information_unref (gpointer instance) +{ DetectedPhotoInformation * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -527,12 +606,14 @@ void detected_photo_information_unref (gpointer instance) { DETECTED_PHOTO_INFORMATION_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_type_free_instance ((GTypeInstance *) self); -#line 531 "PhotoFileSniffer.c" +#line 610 "PhotoFileSniffer.c" } } -GType photo_file_sniffer_options_get_type (void) { +GType +photo_file_sniffer_options_get_type (void) +{ static volatile gsize photo_file_sniffer_options_type_id__volatile = 0; if (g_once_init_enter (&photo_file_sniffer_options_type_id__volatile)) { static const GEnumValue values[] = {{PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL, "PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL", "get-all"}, {PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, "PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5", "no-md5"}, {0, NULL, NULL}}; @@ -544,161 +625,191 @@ GType photo_file_sniffer_options_get_type (void) { } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return self ? g_object_ref (self) : NULL; -#line 551 "PhotoFileSniffer.c" +#line 634 "PhotoFileSniffer.c" } -PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { +PhotoFileSniffer* +photo_file_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options) +{ PhotoFileSniffer* self = NULL; GFile* _tmp0_; - GFile* _tmp1_; - PhotoFileSnifferOptions _tmp2_; - PhotoFileSnifferOptions _tmp3_; #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self = (PhotoFileSniffer*) g_type_create_instance (object_type); #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - _tmp0_ = file; -#line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (file); #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _g_object_unref0 (self->file); #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - self->file = _tmp1_; -#line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - _tmp2_ = options; + self->file = _tmp0_; #line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - self->options = _tmp2_; -#line 46 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - _tmp3_ = options; + self->options = options; #line 46 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - self->calc_md5 = (_tmp3_ & PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5) == 0; + self->calc_md5 = (options & PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5) == 0; #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return self; -#line 583 "PhotoFileSniffer.c" +#line 661 "PhotoFileSniffer.c" } -static DetectedPhotoInformation* photo_file_sniffer_real_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error) { +static DetectedPhotoInformation* +photo_file_sniffer_real_sniff (PhotoFileSniffer* self, + gboolean* is_corrupted, + GError** error) +{ #line 49 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_sniffer_sniff'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 49 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return NULL; -#line 592 "PhotoFileSniffer.c" +#line 674 "PhotoFileSniffer.c" } -DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error) { +DetectedPhotoInformation* +photo_file_sniffer_sniff (PhotoFileSniffer* self, + gboolean* is_corrupted, + GError** error) +{ #line 49 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (IS_PHOTO_FILE_SNIFFER (self), NULL); #line 49 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return PHOTO_FILE_SNIFFER_GET_CLASS (self)->sniff (self, is_corrupted, error); -#line 601 "PhotoFileSniffer.c" +#line 687 "PhotoFileSniffer.c" } -static void value_photo_file_sniffer_init (GValue* value) { +static void +value_photo_file_sniffer_init (GValue* value) +{ #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 608 "PhotoFileSniffer.c" +#line 696 "PhotoFileSniffer.c" } -static void value_photo_file_sniffer_free_value (GValue* value) { +static void +value_photo_file_sniffer_free_value (GValue* value) +{ #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (value->data[0].v_pointer) { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" photo_file_sniffer_unref (value->data[0].v_pointer); -#line 617 "PhotoFileSniffer.c" +#line 707 "PhotoFileSniffer.c" } } -static void value_photo_file_sniffer_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_photo_file_sniffer_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (src_value->data[0].v_pointer) { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" dest_value->data[0].v_pointer = photo_file_sniffer_ref (src_value->data[0].v_pointer); -#line 627 "PhotoFileSniffer.c" +#line 720 "PhotoFileSniffer.c" } else { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" dest_value->data[0].v_pointer = NULL; -#line 631 "PhotoFileSniffer.c" +#line 724 "PhotoFileSniffer.c" } } -static gpointer value_photo_file_sniffer_peek_pointer (const GValue* value) { +static gpointer +value_photo_file_sniffer_peek_pointer (const GValue* value) +{ #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return value->data[0].v_pointer; -#line 639 "PhotoFileSniffer.c" +#line 734 "PhotoFileSniffer.c" } -static gchar* value_photo_file_sniffer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_file_sniffer_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (collect_values[0].v_pointer) { -#line 646 "PhotoFileSniffer.c" +#line 746 "PhotoFileSniffer.c" PhotoFileSniffer * object; object = collect_values[0].v_pointer; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (object->parent_instance.g_class == NULL) { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 653 "PhotoFileSniffer.c" +#line 753 "PhotoFileSniffer.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.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 657 "PhotoFileSniffer.c" +#line 757 "PhotoFileSniffer.c" } #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = photo_file_sniffer_ref (object); -#line 661 "PhotoFileSniffer.c" +#line 761 "PhotoFileSniffer.c" } else { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 665 "PhotoFileSniffer.c" +#line 765 "PhotoFileSniffer.c" } #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return NULL; -#line 669 "PhotoFileSniffer.c" +#line 769 "PhotoFileSniffer.c" } -static gchar* value_photo_file_sniffer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_file_sniffer_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoFileSniffer ** object_p; object_p = collect_values[0].v_pointer; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (!object_p) { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 680 "PhotoFileSniffer.c" +#line 785 "PhotoFileSniffer.c" } #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (!value->data[0].v_pointer) { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" *object_p = NULL; -#line 686 "PhotoFileSniffer.c" +#line 791 "PhotoFileSniffer.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" *object_p = value->data[0].v_pointer; -#line 690 "PhotoFileSniffer.c" +#line 795 "PhotoFileSniffer.c" } else { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" *object_p = photo_file_sniffer_ref (value->data[0].v_pointer); -#line 694 "PhotoFileSniffer.c" +#line 799 "PhotoFileSniffer.c" } #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return NULL; -#line 698 "PhotoFileSniffer.c" +#line 803 "PhotoFileSniffer.c" } -GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_photo_file_sniffer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPhotoFileSniffer* spec; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PHOTO_FILE_SNIFFER), NULL); @@ -708,20 +819,25 @@ GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return G_PARAM_SPEC (spec); -#line 712 "PhotoFileSniffer.c" +#line 823 "PhotoFileSniffer.c" } -gpointer value_get_photo_file_sniffer (const GValue* value) { +gpointer +value_get_photo_file_sniffer (const GValue* value) +{ #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_SNIFFER), NULL); #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return value->data[0].v_pointer; -#line 721 "PhotoFileSniffer.c" +#line 834 "PhotoFileSniffer.c" } -void value_set_photo_file_sniffer (GValue* value, gpointer v_object) { +void +value_set_photo_file_sniffer (GValue* value, + gpointer v_object) +{ PhotoFileSniffer * old; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_SNIFFER)); @@ -737,22 +853,25 @@ void value_set_photo_file_sniffer (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" photo_file_sniffer_ref (value->data[0].v_pointer); -#line 741 "PhotoFileSniffer.c" +#line 857 "PhotoFileSniffer.c" } else { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 745 "PhotoFileSniffer.c" +#line 861 "PhotoFileSniffer.c" } #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (old) { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" photo_file_sniffer_unref (old); -#line 751 "PhotoFileSniffer.c" +#line 867 "PhotoFileSniffer.c" } } -void value_take_photo_file_sniffer (GValue* value, gpointer v_object) { +void +value_take_photo_file_sniffer (GValue* value, + gpointer v_object) +{ PhotoFileSniffer * old; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_SNIFFER)); @@ -766,40 +885,46 @@ void value_take_photo_file_sniffer (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = v_object; -#line 770 "PhotoFileSniffer.c" +#line 889 "PhotoFileSniffer.c" } else { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 774 "PhotoFileSniffer.c" +#line 893 "PhotoFileSniffer.c" } #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (old) { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" photo_file_sniffer_unref (old); -#line 780 "PhotoFileSniffer.c" +#line 899 "PhotoFileSniffer.c" } } -static void photo_file_sniffer_class_init (PhotoFileSnifferClass * klass) { +static void +photo_file_sniffer_class_init (PhotoFileSnifferClass * klass) +{ #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" photo_file_sniffer_parent_class = g_type_class_peek_parent (klass); #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" ((PhotoFileSnifferClass *) klass)->finalize = photo_file_sniffer_finalize; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) photo_file_sniffer_real_sniff; -#line 792 "PhotoFileSniffer.c" +#line 913 "PhotoFileSniffer.c" } -static void photo_file_sniffer_instance_init (PhotoFileSniffer * self) { +static void +photo_file_sniffer_instance_init (PhotoFileSniffer * self) +{ #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self->ref_count = 1; -#line 799 "PhotoFileSniffer.c" +#line 922 "PhotoFileSniffer.c" } -static void photo_file_sniffer_finalize (PhotoFileSniffer * obj) { +static void +photo_file_sniffer_finalize (PhotoFileSniffer * obj) +{ PhotoFileSniffer * self; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); @@ -807,11 +932,13 @@ static void photo_file_sniffer_finalize (PhotoFileSniffer * obj) { g_signal_handlers_destroy (self); #line 38 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _g_object_unref0 (self->file); -#line 811 "PhotoFileSniffer.c" +#line 936 "PhotoFileSniffer.c" } -GType photo_file_sniffer_get_type (void) { +GType +photo_file_sniffer_get_type (void) +{ static volatile gsize photo_file_sniffer_type_id__volatile = 0; if (g_once_init_enter (&photo_file_sniffer_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_photo_file_sniffer_init, value_photo_file_sniffer_free_value, value_photo_file_sniffer_copy_value, value_photo_file_sniffer_peek_pointer, "p", value_photo_file_sniffer_collect_value, "p", value_photo_file_sniffer_lcopy_value }; @@ -825,18 +952,22 @@ GType photo_file_sniffer_get_type (void) { } -gpointer photo_file_sniffer_ref (gpointer instance) { +gpointer +photo_file_sniffer_ref (gpointer instance) +{ PhotoFileSniffer * self; self = instance; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_atomic_int_inc (&self->ref_count); #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return instance; -#line 836 "PhotoFileSniffer.c" +#line 965 "PhotoFileSniffer.c" } -void photo_file_sniffer_unref (gpointer instance) { +void +photo_file_sniffer_unref (gpointer instance) +{ PhotoFileSniffer * self; self = instance; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -845,53 +976,58 @@ void photo_file_sniffer_unref (gpointer instance) { PHOTO_FILE_SNIFFER_GET_CLASS (self)->finalize (self); #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_type_free_instance ((GTypeInstance *) self); -#line 849 "PhotoFileSniffer.c" +#line 980 "PhotoFileSniffer.c" } } -PhotoFileInterrogator* photo_file_interrogator_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { +PhotoFileInterrogator* +photo_file_interrogator_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options) +{ PhotoFileInterrogator* self = NULL; GFile* _tmp0_; - GFile* _tmp1_; - PhotoFileSnifferOptions _tmp2_; #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self = (PhotoFileInterrogator*) g_type_create_instance (object_type); #line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - _tmp0_ = file; -#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (file); #line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _g_object_unref0 (self->priv->file); #line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - self->priv->file = _tmp1_; + self->priv->file = _tmp0_; #line 70 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - _tmp2_ = options; -#line 70 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - self->priv->options = _tmp2_; + self->priv->options = options; #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return self; -#line 877 "PhotoFileSniffer.c" +#line 1006 "PhotoFileSniffer.c" } -PhotoFileInterrogator* photo_file_interrogator_new (GFile* file, PhotoFileSnifferOptions options) { +PhotoFileInterrogator* +photo_file_interrogator_new (GFile* file, + PhotoFileSnifferOptions options) +{ #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return photo_file_interrogator_construct (TYPE_PHOTO_FILE_INTERROGATOR, file, options); -#line 884 "PhotoFileSniffer.c" +#line 1016 "PhotoFileSniffer.c" } -static gpointer _detected_photo_information_ref0 (gpointer self) { +static gpointer +_detected_photo_information_ref0 (gpointer self) +{ #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return self ? detected_photo_information_ref (self) : NULL; -#line 891 "PhotoFileSniffer.c" +#line 1025 "PhotoFileSniffer.c" } -DetectedPhotoInformation* photo_file_interrogator_get_detected_photo_information (PhotoFileInterrogator* self) { +DetectedPhotoInformation* +photo_file_interrogator_get_detected_photo_information (PhotoFileInterrogator* self) +{ DetectedPhotoInformation* result = NULL; DetectedPhotoInformation* _tmp0_; DetectedPhotoInformation* _tmp1_; @@ -905,11 +1041,13 @@ DetectedPhotoInformation* photo_file_interrogator_get_detected_photo_information result = _tmp1_; #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return result; -#line 909 "PhotoFileSniffer.c" +#line 1045 "PhotoFileSniffer.c" } -gboolean photo_file_interrogator_get_is_photo_corrupted (PhotoFileInterrogator* self) { +gboolean +photo_file_interrogator_get_is_photo_corrupted (PhotoFileInterrogator* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 80 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -920,11 +1058,14 @@ gboolean photo_file_interrogator_get_is_photo_corrupted (PhotoFileInterrogator* result = _tmp0_; #line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return result; -#line 924 "PhotoFileSniffer.c" +#line 1062 "PhotoFileSniffer.c" } -void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** error) { +void +photo_file_interrogator_interrogate (PhotoFileInterrogator* self, + GError** error) +{ gint _tmp0_; PhotoFileFormat* _tmp1_; GError * _inner_error_ = NULL; @@ -932,7 +1073,7 @@ void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** g_return_if_fail (IS_PHOTO_FILE_INTERROGATOR (self)); #line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _tmp1_ = photo_file_format_get_supported (&_tmp0_); -#line 936 "PhotoFileSniffer.c" +#line 1077 "PhotoFileSniffer.c" { PhotoFileFormat* file_format_collection = NULL; gint file_format_collection_length1 = 0; @@ -944,11 +1085,11 @@ void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** file_format_collection_length1 = _tmp0_; #line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" for (file_format_it = 0; file_format_it < _tmp0_; file_format_it = file_format_it + 1) { -#line 948 "PhotoFileSniffer.c" +#line 1089 "PhotoFileSniffer.c" PhotoFileFormat file_format = 0; #line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" file_format = file_format_collection[file_format_it]; -#line 952 "PhotoFileSniffer.c" +#line 1093 "PhotoFileSniffer.c" { PhotoFileSniffer* sniffer = NULL; PhotoFileFormat _tmp2_; @@ -991,7 +1132,7 @@ void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** file_format_collection = (g_free (file_format_collection), NULL); #line 89 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return; -#line 995 "PhotoFileSniffer.c" +#line 1136 "PhotoFileSniffer.c" } #line 89 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _tmp10_ = _tmp6_; @@ -1005,21 +1146,21 @@ void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** _tmp12_ = self->priv->detected; #line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (_tmp12_ != NULL) { -#line 1009 "PhotoFileSniffer.c" +#line 1150 "PhotoFileSniffer.c" gboolean _tmp13_; #line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _tmp13_ = is_corrupted; #line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _tmp11_ = !_tmp13_; -#line 1015 "PhotoFileSniffer.c" +#line 1156 "PhotoFileSniffer.c" } else { #line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _tmp11_ = FALSE; -#line 1019 "PhotoFileSniffer.c" +#line 1160 "PhotoFileSniffer.c" } #line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (_tmp11_) { -#line 1023 "PhotoFileSniffer.c" +#line 1164 "PhotoFileSniffer.c" DetectedPhotoInformation* _tmp14_; PhotoFileFormat _tmp15_; PhotoFileFormat _tmp16_; @@ -1037,14 +1178,14 @@ void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** _photo_file_sniffer_unref0 (sniffer); #line 93 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" break; -#line 1041 "PhotoFileSniffer.c" +#line 1182 "PhotoFileSniffer.c" } else { gboolean _tmp17_; #line 94 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _tmp17_ = is_corrupted; #line 94 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (_tmp17_) { -#line 1048 "PhotoFileSniffer.c" +#line 1189 "PhotoFileSniffer.c" GFile* _tmp18_; gchar* _tmp19_; gchar* _tmp20_; @@ -1071,121 +1212,146 @@ void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** _photo_file_sniffer_unref0 (sniffer); #line 99 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" break; -#line 1074 "PhotoFileSniffer.c" +#line 1215 "PhotoFileSniffer.c" } } #line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _detected_photo_information_unref0 (_tmp6_); #line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _photo_file_sniffer_unref0 (sniffer); -#line 1081 "PhotoFileSniffer.c" +#line 1222 "PhotoFileSniffer.c" } } #line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" file_format_collection = (g_free (file_format_collection), NULL); -#line 1086 "PhotoFileSniffer.c" +#line 1227 "PhotoFileSniffer.c" } } -static void value_photo_file_interrogator_init (GValue* value) { +static void +value_photo_file_interrogator_init (GValue* value) +{ #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 1094 "PhotoFileSniffer.c" +#line 1237 "PhotoFileSniffer.c" } -static void value_photo_file_interrogator_free_value (GValue* value) { +static void +value_photo_file_interrogator_free_value (GValue* value) +{ #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (value->data[0].v_pointer) { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" photo_file_interrogator_unref (value->data[0].v_pointer); -#line 1103 "PhotoFileSniffer.c" +#line 1248 "PhotoFileSniffer.c" } } -static void value_photo_file_interrogator_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_photo_file_interrogator_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (src_value->data[0].v_pointer) { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" dest_value->data[0].v_pointer = photo_file_interrogator_ref (src_value->data[0].v_pointer); -#line 1113 "PhotoFileSniffer.c" +#line 1261 "PhotoFileSniffer.c" } else { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" dest_value->data[0].v_pointer = NULL; -#line 1117 "PhotoFileSniffer.c" +#line 1265 "PhotoFileSniffer.c" } } -static gpointer value_photo_file_interrogator_peek_pointer (const GValue* value) { +static gpointer +value_photo_file_interrogator_peek_pointer (const GValue* value) +{ #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return value->data[0].v_pointer; -#line 1125 "PhotoFileSniffer.c" +#line 1275 "PhotoFileSniffer.c" } -static gchar* value_photo_file_interrogator_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_file_interrogator_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (collect_values[0].v_pointer) { -#line 1132 "PhotoFileSniffer.c" +#line 1287 "PhotoFileSniffer.c" PhotoFileInterrogator * object; object = collect_values[0].v_pointer; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (object->parent_instance.g_class == NULL) { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1139 "PhotoFileSniffer.c" +#line 1294 "PhotoFileSniffer.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.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 1143 "PhotoFileSniffer.c" +#line 1298 "PhotoFileSniffer.c" } #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = photo_file_interrogator_ref (object); -#line 1147 "PhotoFileSniffer.c" +#line 1302 "PhotoFileSniffer.c" } else { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 1151 "PhotoFileSniffer.c" +#line 1306 "PhotoFileSniffer.c" } #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return NULL; -#line 1155 "PhotoFileSniffer.c" +#line 1310 "PhotoFileSniffer.c" } -static gchar* value_photo_file_interrogator_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_file_interrogator_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoFileInterrogator ** object_p; object_p = collect_values[0].v_pointer; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (!object_p) { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1166 "PhotoFileSniffer.c" +#line 1326 "PhotoFileSniffer.c" } #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (!value->data[0].v_pointer) { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" *object_p = NULL; -#line 1172 "PhotoFileSniffer.c" +#line 1332 "PhotoFileSniffer.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" *object_p = value->data[0].v_pointer; -#line 1176 "PhotoFileSniffer.c" +#line 1336 "PhotoFileSniffer.c" } else { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" *object_p = photo_file_interrogator_ref (value->data[0].v_pointer); -#line 1180 "PhotoFileSniffer.c" +#line 1340 "PhotoFileSniffer.c" } #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return NULL; -#line 1184 "PhotoFileSniffer.c" +#line 1344 "PhotoFileSniffer.c" } -GParamSpec* param_spec_photo_file_interrogator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_photo_file_interrogator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPhotoFileInterrogator* spec; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PHOTO_FILE_INTERROGATOR), NULL); @@ -1195,20 +1361,25 @@ GParamSpec* param_spec_photo_file_interrogator (const gchar* name, const gchar* G_PARAM_SPEC (spec)->value_type = object_type; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return G_PARAM_SPEC (spec); -#line 1198 "PhotoFileSniffer.c" +#line 1364 "PhotoFileSniffer.c" } -gpointer value_get_photo_file_interrogator (const GValue* value) { +gpointer +value_get_photo_file_interrogator (const GValue* value) +{ #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_INTERROGATOR), NULL); #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return value->data[0].v_pointer; -#line 1207 "PhotoFileSniffer.c" +#line 1375 "PhotoFileSniffer.c" } -void value_set_photo_file_interrogator (GValue* value, gpointer v_object) { +void +value_set_photo_file_interrogator (GValue* value, + gpointer v_object) +{ PhotoFileInterrogator * old; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_INTERROGATOR)); @@ -1224,22 +1395,25 @@ void value_set_photo_file_interrogator (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" photo_file_interrogator_ref (value->data[0].v_pointer); -#line 1227 "PhotoFileSniffer.c" +#line 1398 "PhotoFileSniffer.c" } else { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 1231 "PhotoFileSniffer.c" +#line 1402 "PhotoFileSniffer.c" } #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (old) { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" photo_file_interrogator_unref (old); -#line 1237 "PhotoFileSniffer.c" +#line 1408 "PhotoFileSniffer.c" } } -void value_take_photo_file_interrogator (GValue* value, gpointer v_object) { +void +value_take_photo_file_interrogator (GValue* value, + gpointer v_object) +{ PhotoFileInterrogator * old; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_INTERROGATOR)); @@ -1253,33 +1427,37 @@ void value_take_photo_file_interrogator (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = v_object; -#line 1256 "PhotoFileSniffer.c" +#line 1430 "PhotoFileSniffer.c" } else { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 1260 "PhotoFileSniffer.c" +#line 1434 "PhotoFileSniffer.c" } #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (old) { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" photo_file_interrogator_unref (old); -#line 1266 "PhotoFileSniffer.c" +#line 1440 "PhotoFileSniffer.c" } } -static void photo_file_interrogator_class_init (PhotoFileInterrogatorClass * klass) { +static void +photo_file_interrogator_class_init (PhotoFileInterrogatorClass * klass) +{ #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" photo_file_interrogator_parent_class = g_type_class_peek_parent (klass); #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" ((PhotoFileInterrogatorClass *) klass)->finalize = photo_file_interrogator_finalize; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_type_class_add_private (klass, sizeof (PhotoFileInterrogatorPrivate)); -#line 1278 "PhotoFileSniffer.c" +#line 1454 "PhotoFileSniffer.c" } -static void photo_file_interrogator_instance_init (PhotoFileInterrogator * self) { +static void +photo_file_interrogator_instance_init (PhotoFileInterrogator * self) +{ #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self->priv = PHOTO_FILE_INTERROGATOR_GET_PRIVATE (self); #line 64 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -1288,11 +1466,13 @@ static void photo_file_interrogator_instance_init (PhotoFileInterrogator * self) self->priv->is_photo_corrupted = FALSE; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self->ref_count = 1; -#line 1291 "PhotoFileSniffer.c" +#line 1469 "PhotoFileSniffer.c" } -static void photo_file_interrogator_finalize (PhotoFileInterrogator * obj) { +static void +photo_file_interrogator_finalize (PhotoFileInterrogator * obj) +{ PhotoFileInterrogator * self; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_INTERROGATOR, PhotoFileInterrogator); @@ -1302,11 +1482,13 @@ static void photo_file_interrogator_finalize (PhotoFileInterrogator * obj) { _g_object_unref0 (self->priv->file); #line 64 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _detected_photo_information_unref0 (self->priv->detected); -#line 1305 "PhotoFileSniffer.c" +#line 1485 "PhotoFileSniffer.c" } -GType photo_file_interrogator_get_type (void) { +GType +photo_file_interrogator_get_type (void) +{ static volatile gsize photo_file_interrogator_type_id__volatile = 0; if (g_once_init_enter (&photo_file_interrogator_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_photo_file_interrogator_init, value_photo_file_interrogator_free_value, value_photo_file_interrogator_copy_value, value_photo_file_interrogator_peek_pointer, "p", value_photo_file_interrogator_collect_value, "p", value_photo_file_interrogator_lcopy_value }; @@ -1320,18 +1502,22 @@ GType photo_file_interrogator_get_type (void) { } -gpointer photo_file_interrogator_ref (gpointer instance) { +gpointer +photo_file_interrogator_ref (gpointer instance) +{ PhotoFileInterrogator * self; self = instance; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_atomic_int_inc (&self->ref_count); #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return instance; -#line 1330 "PhotoFileSniffer.c" +#line 1514 "PhotoFileSniffer.c" } -void photo_file_interrogator_unref (gpointer instance) { +void +photo_file_interrogator_unref (gpointer instance) +{ PhotoFileInterrogator * self; self = instance; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -1340,7 +1526,7 @@ void photo_file_interrogator_unref (gpointer instance) { PHOTO_FILE_INTERROGATOR_GET_CLASS (self)->finalize (self); #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1343 "PhotoFileSniffer.c" +#line 1529 "PhotoFileSniffer.c" } } diff --git a/src/photos/PhotoMetadata.c b/src/photos/PhotoMetadata.c index 144f24a..a04ad12 100644 --- a/src/photos/PhotoMetadata.c +++ b/src/photos/PhotoMetadata.c @@ -1,4 +1,4 @@ -/* PhotoMetadata.c generated by valac 0.36.6, the Vala compiler +/* PhotoMetadata.c generated by valac 0.40.4, the Vala compiler * generated from PhotoMetadata.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -23,6 +23,7 @@ /* http://www.exiv2.org/metadata.html*/ /**/ + #include #include #include @@ -484,99 +485,165 @@ static gpointer photo_metadata_internal_photo_preview_parent_class = NULL; GType metadata_domain_get_type (void) G_GNUC_CONST; gpointer keyword_transformer_ref (gpointer instance); void keyword_transformer_unref (gpointer instance); -GParamSpec* param_spec_keyword_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_keyword_transformer (GValue* value, gpointer v_object); -void value_take_keyword_transformer (GValue* value, gpointer v_object); +GParamSpec* param_spec_keyword_transformer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_keyword_transformer (GValue* value, + gpointer v_object); +void value_take_keyword_transformer (GValue* value, + gpointer v_object); gpointer value_get_keyword_transformer (const GValue* value); GType keyword_transformer_get_type (void) G_GNUC_CONST; -enum { - KEYWORD_TRANSFORMER_DUMMY_PROPERTY -}; -GeeList* keyword_transformer_transform (KeywordTransformer* self, const gchar* input, GError** error); -static GeeList* keyword_transformer_real_transform (KeywordTransformer* self, const gchar* input, GError** error); +GeeList* keyword_transformer_transform (KeywordTransformer* self, + const gchar* input, + GError** error); +static GeeList* keyword_transformer_real_transform (KeywordTransformer* self, + const gchar* input, + GError** error); KeywordTransformer* keyword_transformer_construct (GType object_type); static void keyword_transformer_finalize (KeywordTransformer * obj); GType null_keyword_transformer_get_type (void) G_GNUC_CONST; -enum { - NULL_KEYWORD_TRANSFORMER_DUMMY_PROPERTY -}; -static GeeList* null_keyword_transformer_real_transform (KeywordTransformer* base, const gchar* input, GError** error); +static GeeList* null_keyword_transformer_real_transform (KeywordTransformer* base, + const gchar* input, + GError** error); NullKeywordTransformer* null_keyword_transformer_new (void); NullKeywordTransformer* null_keyword_transformer_construct (GType object_type); GType acd_see_keyword_transformer_get_type (void) G_GNUC_CONST; #define ACD_SEE_KEYWORD_TRANSFORMER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ACD_SEE_KEYWORD_TRANSFORMER, ACDSeeKeywordTransformerPrivate)) -enum { - ACD_SEE_KEYWORD_TRANSFORMER_DUMMY_PROPERTY -}; ACDSeeKeywordTransformer* acd_see_keyword_transformer_new (void); ACDSeeKeywordTransformer* acd_see_keyword_transformer_construct (GType object_type); -static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* name, gchar** attribute_names, gchar** attribute_values, GError** error); -static void _acd_see_keyword_transformer_on_start_gmarkup_parser_start_element_func (GMarkupParseContext* context, const gchar* element_name, gchar** attribute_names, gchar** attribute_values, gpointer self, GError** error); -static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* name, GError** error); -static void _acd_see_keyword_transformer_on_end_gmarkup_parser_end_element_func (GMarkupParseContext* context, const gchar* element_name, gpointer self, GError** error); -static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* text, GError** error); -static void _acd_see_keyword_transformer_on_text_gmarkup_parser_text_func (GMarkupParseContext* context, const gchar* text, gsize text_len, gpointer self, GError** error); -static void acd_see_keyword_transformer_on_error (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, GError* _error_); -static void _acd_see_keyword_transformer_on_error_gmarkup_parser_error_func (GMarkupParseContext* context, GError* _error_, gpointer self); -static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer* base, const gchar* input, GError** error); +static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self, + GMarkupParseContext* ctx, + const gchar* name, + gchar** attribute_names, + gchar** attribute_values, + GError** error); +static void _acd_see_keyword_transformer_on_start_gmarkup_parser_start_element_func (GMarkupParseContext* context, + const gchar* element_name, + gchar** attribute_names, + gchar** attribute_values, + gpointer self, + GError** error); +static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self, + GMarkupParseContext* ctx, + const gchar* name, + GError** error); +static void _acd_see_keyword_transformer_on_end_gmarkup_parser_end_element_func (GMarkupParseContext* context, + const gchar* element_name, + gpointer self, + GError** error); +static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, + GMarkupParseContext* ctx, + const gchar* text, + GError** error); +static void _acd_see_keyword_transformer_on_text_gmarkup_parser_text_func (GMarkupParseContext* context, + const gchar* text, + gsize text_len, + gpointer self, + GError** error); +static void acd_see_keyword_transformer_on_error (ACDSeeKeywordTransformer* self, + GMarkupParseContext* ctx, + GError* _error_); +static void _acd_see_keyword_transformer_on_error_gmarkup_parser_error_func (GMarkupParseContext* context, + GError* _error_, + gpointer self); +static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer* base, + const gchar* input, + GError** error); static void acd_see_keyword_transformer_finalize (KeywordTransformer * obj); gpointer hierarchical_keyword_field_ref (gpointer instance); void hierarchical_keyword_field_unref (gpointer instance); -GParamSpec* param_spec_hierarchical_keyword_field (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_hierarchical_keyword_field (GValue* value, gpointer v_object); -void value_take_hierarchical_keyword_field (GValue* value, gpointer v_object); +GParamSpec* param_spec_hierarchical_keyword_field (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_hierarchical_keyword_field (GValue* value, + gpointer v_object); +void value_take_hierarchical_keyword_field (GValue* value, + gpointer v_object); gpointer value_get_hierarchical_keyword_field (const GValue* value); GType hierarchical_keyword_field_get_type (void) G_GNUC_CONST; -enum { - HIERARCHICAL_KEYWORD_FIELD_DUMMY_PROPERTY -}; -HierarchicalKeywordField* hierarchical_keyword_field_new (const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer); -HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_type, const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer); +HierarchicalKeywordField* hierarchical_keyword_field_new (const gchar* field_name, + const gchar* path_separator, + gboolean wants_leading_separator, + gboolean is_writeable, + KeywordTransformer* transformer); +HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_type, + const gchar* field_name, + const gchar* path_separator, + gboolean wants_leading_separator, + gboolean is_writeable, + KeywordTransformer* transformer); static void hierarchical_keyword_field_finalize (HierarchicalKeywordField * obj); gpointer photo_preview_ref (gpointer instance); void photo_preview_unref (gpointer instance); -GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_preview (GValue* value, gpointer v_object); -void value_take_photo_preview (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_preview (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_preview (GValue* value, + gpointer v_object); +void value_take_photo_preview (GValue* value, + gpointer v_object); gpointer value_get_photo_preview (const GValue* value); GType photo_preview_get_type (void) G_GNUC_CONST; GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); #define PHOTO_PREVIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_PREVIEW, PhotoPreviewPrivate)) -enum { - PHOTO_PREVIEW_DUMMY_PROPERTY -}; -PhotoPreview* photo_preview_construct (GType object_type, const gchar* name, Dimensions* dimensions, guint32 size, const gchar* mime_type, const gchar* extension); +PhotoPreview* photo_preview_construct (GType object_type, + const gchar* name, + Dimensions* dimensions, + guint32 size, + const gchar* mime_type, + const gchar* extension); gchar* photo_preview_get_name (PhotoPreview* self); -void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result); +void photo_preview_get_pixel_dimensions (PhotoPreview* self, + Dimensions* result); guint32 photo_preview_get_size (PhotoPreview* self); gchar* photo_preview_get_mime_type (PhotoPreview* self); gchar* photo_preview_get_extension (PhotoPreview* self); -GBytes* photo_preview_flatten (PhotoPreview* self, GError** error); -static GBytes* photo_preview_real_flatten (PhotoPreview* self, GError** error); -GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error); -static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** error); +GBytes* photo_preview_flatten (PhotoPreview* self, + GError** error); +static GBytes* photo_preview_real_flatten (PhotoPreview* self, + GError** error); +GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, + GError** error); +static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, + GError** error); static void photo_preview_finalize (PhotoPreview * obj); gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; gpointer metadata_date_time_ref (gpointer instance); void metadata_date_time_unref (gpointer instance); -GParamSpec* param_spec_metadata_date_time (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_metadata_date_time (GValue* value, gpointer v_object); -void value_take_metadata_date_time (GValue* value, gpointer v_object); +GParamSpec* param_spec_metadata_date_time (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_metadata_date_time (GValue* value, + gpointer v_object); +void value_take_metadata_date_time (GValue* value, + gpointer v_object); gpointer value_get_metadata_date_time (const GValue* value); GType metadata_date_time_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; #define PHOTO_METADATA_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_METADATA, PhotoMetadataPrivate)) -enum { - PHOTO_METADATA_DUMMY_PROPERTY -}; GType photo_metadata_set_option_get_type (void) G_GNUC_CONST; GType prepare_input_text_options_get_type (void) G_GNUC_CONST; #define PHOTO_METADATA_PREPARE_STRING_OPTIONS (((((PREPARE_INPUT_TEXT_OPTIONS_INVALID_IS_NULL | PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL) | PREPARE_INPUT_TEXT_OPTIONS_STRIP) | PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF) | PREPARE_INPUT_TEXT_OPTIONS_NORMALIZE) | PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) @@ -584,179 +651,352 @@ GType prepare_input_text_options_get_type (void) G_GNUC_CONST; PhotoMetadata* photo_metadata_new (void); PhotoMetadata* photo_metadata_construct (GType object_type); MediaMetadata* media_metadata_construct (GType object_type); -static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file, GError** error); -void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** error); -void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int buffer_length1, gint length, GError** error); -void photo_metadata_read_from_app1_segment (PhotoMetadata* self, GBytes* buffer, GError** error); +static void photo_metadata_real_read_from_file (MediaMetadata* base, + GFile* file, + GError** error); +void photo_metadata_write_to_file (PhotoMetadata* self, + GFile* file, + GError** error); +void photo_metadata_read_from_buffer (PhotoMetadata* self, + guint8* buffer, + int buffer_length1, + gint length, + GError** error); +void photo_metadata_read_from_app1_segment (PhotoMetadata* self, + GBytes* buffer, + GError** error); MetadataDomain photo_metadata_get_tag_domain (const gchar* tag); -gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain); +gboolean photo_metadata_has_domain (PhotoMetadata* self, + MetadataDomain domain); gboolean photo_metadata_has_exif (PhotoMetadata* self); gboolean photo_metadata_has_xmp (PhotoMetadata* self); gboolean photo_metadata_has_iptc (PhotoMetadata* self); -gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain domain); +gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, + MetadataDomain domain); gboolean photo_metadata_can_write_exif (PhotoMetadata* self); gboolean photo_metadata_can_write_xmp (PhotoMetadata* self); gboolean photo_metadata_can_write_iptc (PhotoMetadata* self); -gboolean photo_metadata_has_tag (PhotoMetadata* self, const gchar* tag); -static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify); -GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain domain, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify); -GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify); -gchar* photo_metadata_get_tag_label (PhotoMetadata* self, const gchar* tag); -gchar* photo_metadata_get_tag_description (PhotoMetadata* self, const gchar* tag); -gchar* photo_metadata_get_string (PhotoMetadata* self, const gchar* tag, PrepareInputTextOptions options); -gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length); +gboolean photo_metadata_has_tag (PhotoMetadata* self, + const gchar* tag); +static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify); +GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, + MetadataDomain domain, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify); +GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify); +gchar* photo_metadata_get_tag_label (PhotoMetadata* self, + const gchar* tag); +gchar* photo_metadata_get_tag_description (PhotoMetadata* self, + const gchar* tag); +gchar* photo_metadata_get_string (PhotoMetadata* self, + const gchar* tag, + PrepareInputTextOptions options); +gchar* prepare_input_text (const gchar* text, + PrepareInputTextOptions options, + gint dest_length); #define DEFAULT_USER_TEXT_INPUT_LENGTH 1024 -gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, const gchar* tag, PrepareInputTextOptions options); -gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int tags_length1); -gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar** tags, int tags_length1); -GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* tag); -GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar** tags, int tags_length1); -void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gchar* value, PrepareInputTextOptions options); -static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, int tags_length1, PhotoMetadataSetOption option, PhotoMetadataSetGenericValue setter, void* setter_target); -void photo_metadata_set_all_string (PhotoMetadata* self, gchar** tags, int tags_length1, const gchar* value, PhotoMetadataSetOption option); +gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, + const gchar* tag, + PrepareInputTextOptions options); +gchar* photo_metadata_get_first_string (PhotoMetadata* self, + gchar** tags, + int tags_length1); +gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, + gchar** tags, + int tags_length1); +GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, + const gchar* tag); +GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, + gchar** tags, + int tags_length1); +void photo_metadata_set_string (PhotoMetadata* self, + const gchar* tag, + const gchar* value, + PrepareInputTextOptions options); +static void photo_metadata_set_all_generic (PhotoMetadata* self, + gchar** tags, + int tags_length1, + PhotoMetadataSetOption option, + PhotoMetadataSetGenericValue setter, + void* setter_target); +void photo_metadata_set_all_string (PhotoMetadata* self, + gchar** tags, + int tags_length1, + const gchar* value, + PhotoMetadataSetOption option); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static void __lambda5_ (Block1Data* _data1_, const gchar* tag); -static void ___lambda5__photo_metadata_set_generic_value (const gchar* tag, gpointer self); -void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, GeeCollection* collection); -static void _vala_array_add48 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add49 (gchar** * array, int* length, int* size, gchar* value); -void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags, int tags_length1, GeeCollection* values, PhotoMetadataSetOption option); +static void __lambda5_ (Block1Data* _data1_, + const gchar* tag); +static void ___lambda5__photo_metadata_set_generic_value (const gchar* tag, + gpointer self); +void photo_metadata_set_string_multiple (PhotoMetadata* self, + const gchar* tag, + GeeCollection* collection); +static void _vala_array_add48 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add49 (gchar** * array, + int* length, + int* size, + gchar* value); +void photo_metadata_set_all_string_multiple (PhotoMetadata* self, + gchar** tags, + int tags_length1, + GeeCollection* values, + PhotoMetadataSetOption option); static Block2Data* block2_data_ref (Block2Data* _data2_); static void block2_data_unref (void * _userdata_); -static void __lambda6_ (Block2Data* _data2_, const gchar* tag); -static void ___lambda6__photo_metadata_set_generic_value (const gchar* tag, gpointer self); -gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong* value); -gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int tags_length1, glong* value); -void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value); -void photo_metadata_set_all_long (PhotoMetadata* self, gchar** tags, int tags_length1, glong value, PhotoMetadataSetOption option); +static void __lambda6_ (Block2Data* _data2_, + const gchar* tag); +static void ___lambda6__photo_metadata_set_generic_value (const gchar* tag, + gpointer self); +gboolean photo_metadata_get_long (PhotoMetadata* self, + const gchar* tag, + glong* value); +gboolean photo_metadata_get_first_long (PhotoMetadata* self, + gchar** tags, + int tags_length1, + glong* value); +void photo_metadata_set_long (PhotoMetadata* self, + const gchar* tag, + glong value); +void photo_metadata_set_all_long (PhotoMetadata* self, + gchar** tags, + int tags_length1, + glong value, + PhotoMetadataSetOption option); static Block3Data* block3_data_ref (Block3Data* _data3_); static void block3_data_unref (void * _userdata_); -static void __lambda7_ (Block3Data* _data3_, const gchar* tag); -static void ___lambda7__photo_metadata_set_generic_value (const gchar* tag, gpointer self); +static void __lambda7_ (Block3Data* _data3_, + const gchar* tag); +static void ___lambda7__photo_metadata_set_generic_value (const gchar* tag, + gpointer self); GType metadata_rational_get_type (void) G_GNUC_CONST; MetadataRational* metadata_rational_dup (const MetadataRational* self); void metadata_rational_free (MetadataRational* self); -gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, MetadataRational* rational); -void metadata_rational_init (MetadataRational *self, gint numerator, gint denominator); -gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, int tags_length1, MetadataRational* rational); -void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, MetadataRational* rational); +gboolean photo_metadata_get_rational (PhotoMetadata* self, + const gchar* tag, + MetadataRational* rational); +void metadata_rational_init (MetadataRational *self, + gint numerator, + gint denominator); +gboolean photo_metadata_get_first_rational (PhotoMetadata* self, + gchar** tags, + int tags_length1, + MetadataRational* rational); +void photo_metadata_set_rational (PhotoMetadata* self, + const gchar* tag, + MetadataRational* rational); gchar* metadata_rational_to_string (MetadataRational *self); -void photo_metadata_set_all_rational (PhotoMetadata* self, gchar** tags, int tags_length1, MetadataRational* rational, PhotoMetadataSetOption option); +void photo_metadata_set_all_rational (PhotoMetadata* self, + gchar** tags, + int tags_length1, + MetadataRational* rational, + PhotoMetadataSetOption option); static Block4Data* block4_data_ref (Block4Data* _data4_); static void block4_data_unref (void * _userdata_); -static void __lambda8_ (Block4Data* _data4_, const gchar* tag); -static void ___lambda8__photo_metadata_set_generic_value (const gchar* tag, gpointer self); -MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar* tag); +static void __lambda8_ (Block4Data* _data4_, + const gchar* tag); +static void ___lambda8__photo_metadata_set_generic_value (const gchar* tag, + gpointer self); +MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, + const gchar* tag); GQuark metadata_date_time_error_quark (void); -MetadataDateTime* metadata_date_time_new_from_xmp (const gchar* label, GError** error); -MetadataDateTime* metadata_date_time_construct_from_xmp (GType object_type, const gchar* label, GError** error); -MetadataDateTime* metadata_date_time_new_from_exif (const gchar* label, GError** error); -MetadataDateTime* metadata_date_time_construct_from_exif (GType object_type, const gchar* label, GError** error); -MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar** tags, int tags_length1); -void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, MetadataDateTime* date_time); +MetadataDateTime* metadata_date_time_new_from_xmp (const gchar* label, + GError** error); +MetadataDateTime* metadata_date_time_construct_from_xmp (GType object_type, + const gchar* label, + GError** error); +MetadataDateTime* metadata_date_time_new_from_exif (const gchar* label, + GError** error); +MetadataDateTime* metadata_date_time_construct_from_exif (GType object_type, + const gchar* label, + GError** error); +MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, + gchar** tags, + int tags_length1); +void photo_metadata_set_date_time (PhotoMetadata* self, + const gchar* tag, + MetadataDateTime* date_time); gchar* metadata_date_time_get_exif_label (MetadataDateTime* self); gchar* metadata_date_time_get_xmp_label (MetadataDateTime* self); const gchar* metadata_domain_to_string (MetadataDomain self); -void photo_metadata_set_all_date_time (PhotoMetadata* self, gchar** tags, int tags_length1, MetadataDateTime* date_time, PhotoMetadataSetOption option); +void photo_metadata_set_all_date_time (PhotoMetadata* self, + gchar** tags, + int tags_length1, + MetadataDateTime* date_time, + PhotoMetadataSetOption option); static Block5Data* block5_data_ref (Block5Data* _data5_); static void block5_data_unref (void * _userdata_); -static void __lambda9_ (Block5Data* _data5_, const gchar* tag); -static void ___lambda9__photo_metadata_set_generic_value (const gchar* tag, gpointer self); +static void __lambda9_ (Block5Data* _data5_, + const gchar* tag); +static void ___lambda9__photo_metadata_set_generic_value (const gchar* tag, + gpointer self); gchar* photo_metadata_exif_hash (PhotoMetadata* self); gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self); guint photo_metadata_get_preview_count (PhotoMetadata* self); -PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number); -static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_new (PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props); -static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_construct (GType object_type, PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props); +PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, + guint number); +static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_new (PhotoMetadata* owner, + const gchar* name, + guint number, + GExiv2PreviewProperties* props); +static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_construct (GType object_type, + PhotoMetadata* owner, + const gchar* name, + guint number, + GExiv2PreviewProperties* props); static GType photo_metadata_internal_photo_preview_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self); -void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag); -void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_length1); -void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain); +void photo_metadata_remove_tag (PhotoMetadata* self, + const gchar* tag); +void photo_metadata_remove_tags (PhotoMetadata* self, + gchar** tags, + int tags_length1); +void photo_metadata_clear_domain (PhotoMetadata* self, + MetadataDomain domain); void photo_metadata_clear (PhotoMetadata* self); MetadataDateTime* photo_metadata_get_modification_date_time (PhotoMetadata* self); -void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option); +void photo_metadata_set_modification_date_time (PhotoMetadata* self, + MetadataDateTime* date_time, + PhotoMetadataSetOption option); MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self); -void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option); +void photo_metadata_set_exposure_date_time (PhotoMetadata* self, + MetadataDateTime* date_time, + PhotoMetadataSetOption option); MetadataDateTime* photo_metadata_get_digitized_date_time (PhotoMetadata* self); -void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option); +void photo_metadata_set_digitized_date_time (PhotoMetadata* self, + MetadataDateTime* date_time, + PhotoMetadataSetOption option); static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetadata* base); Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self); -void dimensions_init (Dimensions *self, gint width, gint height); -void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim, PhotoMetadataSetOption option); +void dimensions_init (Dimensions *self, + gint width, + gint height); +void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, + Dimensions* dim, + PhotoMetadataSetOption option); static gchar* photo_metadata_real_get_title (MediaMetadata* base); gboolean is_string_empty (const gchar* s); -void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMetadataSetOption option); +void photo_metadata_set_title (PhotoMetadata* self, + const gchar* title, + PhotoMetadataSetOption option); static gchar* photo_metadata_real_get_comment (MediaMetadata* base); -void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, PhotoMetadataSetOption option); +void photo_metadata_set_comment (PhotoMetadata* self, + const gchar* comment, + PhotoMetadataSetOption option); static Block6Data* block6_data_ref (Block6Data* _data6_); static void block6_data_unref (void * _userdata_); -static void ___lambda10_ (Block6Data* _data6_, const gchar* tag); -static void ____lambda10__photo_metadata_set_generic_value (const gchar* tag, gpointer self); -GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify); +static void ___lambda10_ (Block6Data* _data6_, + const gchar* tag); +static void ____lambda10__photo_metadata_set_generic_value (const gchar* tag, + gpointer self); +GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify); gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag); gpointer hierarchical_tag_index_ref (gpointer instance); void hierarchical_tag_index_unref (gpointer instance); -GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_hierarchical_tag_index (GValue* value, gpointer v_object); -void value_take_hierarchical_tag_index (GValue* value, gpointer v_object); +GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_hierarchical_tag_index (GValue* value, + gpointer v_object); +void value_take_hierarchical_tag_index (GValue* value, + gpointer v_object); gpointer value_get_hierarchical_tag_index (const GValue* value); GType hierarchical_tag_index_get_type (void) G_GNUC_CONST; -static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* self, HierarchicalTagIndex* index); +static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* self, + HierarchicalTagIndex* index); GeeCollection* hierarchical_tag_index_get_all_paths (HierarchicalTagIndex* self); #define TAG_PATH_SEPARATOR_STRING "/" -void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, PhotoMetadataSetOption option); +void photo_metadata_set_keywords (PhotoMetadata* self, + GeeCollection* keywords, + PhotoMetadataSetOption option); HierarchicalTagIndex* hierarchical_tag_index_new (void); HierarchicalTagIndex* hierarchical_tag_index_construct (GType object_type); GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_path); -void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, const gchar* tag, const gchar* path); +void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, + const gchar* tag, + const gchar* path); GeeCollection* hierarchical_tag_index_get_all_tags (HierarchicalTagIndex* self); gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self); GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self); -gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, const gchar* foreign_separator); +gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, + const gchar* foreign_separator); gboolean photo_metadata_has_orientation (PhotoMetadata* self); GType orientation_get_type (void) G_GNUC_CONST; Orientation photo_metadata_get_orientation (PhotoMetadata* self); -void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientation); -gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar* * long_ref, gdouble* latitude, gchar* * lat_ref, gdouble* altitude); -gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exposure); +void photo_metadata_set_orientation (PhotoMetadata* self, + Orientation orientation); +gboolean photo_metadata_get_gps (PhotoMetadata* self, + gdouble* longitude, + gchar* * long_ref, + gdouble* latitude, + gchar* * lat_ref, + gdouble* altitude); +gboolean photo_metadata_get_exposure (PhotoMetadata* self, + MetadataRational* exposure); gchar* photo_metadata_get_exposure_string (PhotoMetadata* self); gboolean metadata_rational_is_valid (MetadataRational *self); -gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso); +gboolean photo_metadata_get_iso (PhotoMetadata* self, + glong* iso); gchar* photo_metadata_get_iso_string (PhotoMetadata* self); -gboolean photo_metadata_get_aperture (PhotoMetadata* self, MetadataRational* aperture); -gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_formatted); +gboolean photo_metadata_get_aperture (PhotoMetadata* self, + MetadataRational* aperture); +gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, + gboolean pango_formatted); gchar* photo_metadata_get_camera_make (PhotoMetadata* self); gchar* photo_metadata_get_camera_model (PhotoMetadata* self); -gboolean photo_metadata_get_flash (PhotoMetadata* self, glong* flash); +gboolean photo_metadata_get_flash (PhotoMetadata* self, + glong* flash); gchar* photo_metadata_get_flash_string (PhotoMetadata* self); -gboolean photo_metadata_get_focal_length (PhotoMetadata* self, MetadataRational* focal_length); +gboolean photo_metadata_get_focal_length (PhotoMetadata* self, + MetadataRational* focal_length); gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self); gchar* photo_metadata_get_artist (PhotoMetadata* self); gchar* photo_metadata_get_copyright (PhotoMetadata* self); gchar* photo_metadata_get_software (PhotoMetadata* self); -void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, const gchar* version); +void photo_metadata_set_software (PhotoMetadata* self, + const gchar* software, + const gchar* version); void photo_metadata_remove_software (PhotoMetadata* self); gchar* photo_metadata_get_exposure_bias (PhotoMetadata* self); GType rating_get_type (void) G_GNUC_CONST; Rating photo_metadata_get_rating (PhotoMetadata* self); Rating rating_unserialize (gint value); -void photo_metadata_set_rating (PhotoMetadata* self, Rating rating); +void photo_metadata_set_rating (PhotoMetadata* self, + Rating rating); gint rating_serialize (Rating self); -enum { - PHOTO_METADATA_INTERNAL_PHOTO_PREVIEW_DUMMY_PROPERTY -}; -static GBytes* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* base, GError** error); +static GBytes* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* base, + GError** error); static void photo_metadata_internal_photo_preview_finalize (PhotoPreview * obj); static void photo_metadata_finalize (MediaMetadata * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); extern const gint RESOURCES_rating_thresholds[6]; -GType metadata_domain_get_type (void) { +GType +metadata_domain_get_type (void) +{ static volatile gsize metadata_domain_type_id__volatile = 0; if (g_once_init_enter (&metadata_domain_type_id__volatile)) { static const GEnumValue values[] = {{METADATA_DOMAIN_UNKNOWN, "METADATA_DOMAIN_UNKNOWN", "unknown"}, {METADATA_DOMAIN_EXIF, "METADATA_DOMAIN_EXIF", "exif"}, {METADATA_DOMAIN_XMP, "METADATA_DOMAIN_XMP", "xmp"}, {METADATA_DOMAIN_IPTC, "METADATA_DOMAIN_IPTC", "iptc"}, {0, NULL, NULL}}; @@ -768,132 +1008,167 @@ GType metadata_domain_get_type (void) { } -static GeeList* keyword_transformer_real_transform (KeywordTransformer* self, const gchar* input, GError** error) { +static GeeList* +keyword_transformer_real_transform (KeywordTransformer* self, + const gchar* input, + GError** error) +{ #line 32 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_critical ("Type `%s' does not implement abstract method `keyword_transformer_transform'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 32 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 777 "PhotoMetadata.c" +#line 1021 "PhotoMetadata.c" } -GeeList* keyword_transformer_transform (KeywordTransformer* self, const gchar* input, GError** error) { +GeeList* +keyword_transformer_transform (KeywordTransformer* self, + const gchar* input, + GError** error) +{ #line 32 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_KEYWORD_TRANSFORMER (self), NULL); #line 32 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return KEYWORD_TRANSFORMER_GET_CLASS (self)->transform (self, input, error); -#line 786 "PhotoMetadata.c" +#line 1034 "PhotoMetadata.c" } -KeywordTransformer* keyword_transformer_construct (GType object_type) { +KeywordTransformer* +keyword_transformer_construct (GType object_type) +{ KeywordTransformer* self = NULL; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = (KeywordTransformer*) g_type_create_instance (object_type); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 796 "PhotoMetadata.c" +#line 1046 "PhotoMetadata.c" } -static void value_keyword_transformer_init (GValue* value) { +static void +value_keyword_transformer_init (GValue* value) +{ #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 803 "PhotoMetadata.c" +#line 1055 "PhotoMetadata.c" } -static void value_keyword_transformer_free_value (GValue* value) { +static void +value_keyword_transformer_free_value (GValue* value) +{ #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" keyword_transformer_unref (value->data[0].v_pointer); -#line 812 "PhotoMetadata.c" +#line 1066 "PhotoMetadata.c" } } -static void value_keyword_transformer_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_keyword_transformer_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (src_value->data[0].v_pointer) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = keyword_transformer_ref (src_value->data[0].v_pointer); -#line 822 "PhotoMetadata.c" +#line 1079 "PhotoMetadata.c" } else { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 826 "PhotoMetadata.c" +#line 1083 "PhotoMetadata.c" } } -static gpointer value_keyword_transformer_peek_pointer (const GValue* value) { +static gpointer +value_keyword_transformer_peek_pointer (const GValue* value) +{ #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return value->data[0].v_pointer; -#line 834 "PhotoMetadata.c" +#line 1093 "PhotoMetadata.c" } -static gchar* value_keyword_transformer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_keyword_transformer_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (collect_values[0].v_pointer) { -#line 841 "PhotoMetadata.c" +#line 1105 "PhotoMetadata.c" KeywordTransformer * object; object = collect_values[0].v_pointer; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (object->parent_instance.g_class == NULL) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 848 "PhotoMetadata.c" +#line 1112 "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 852 "PhotoMetadata.c" +#line 1116 "PhotoMetadata.c" } #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = keyword_transformer_ref (object); -#line 856 "PhotoMetadata.c" +#line 1120 "PhotoMetadata.c" } else { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 860 "PhotoMetadata.c" +#line 1124 "PhotoMetadata.c" } #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 864 "PhotoMetadata.c" +#line 1128 "PhotoMetadata.c" } -static gchar* value_keyword_transformer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_keyword_transformer_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ KeywordTransformer ** object_p; object_p = collect_values[0].v_pointer; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" 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 875 "PhotoMetadata.c" +#line 1144 "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 881 "PhotoMetadata.c" +#line 1150 "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 885 "PhotoMetadata.c" +#line 1154 "PhotoMetadata.c" } else { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = keyword_transformer_ref (value->data[0].v_pointer); -#line 889 "PhotoMetadata.c" +#line 1158 "PhotoMetadata.c" } #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 893 "PhotoMetadata.c" +#line 1162 "PhotoMetadata.c" } -GParamSpec* param_spec_keyword_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_keyword_transformer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecKeywordTransformer* spec; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_KEYWORD_TRANSFORMER), NULL); @@ -903,20 +1178,25 @@ GParamSpec* param_spec_keyword_transformer (const gchar* name, const gchar* nick G_PARAM_SPEC (spec)->value_type = object_type; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return G_PARAM_SPEC (spec); -#line 907 "PhotoMetadata.c" +#line 1182 "PhotoMetadata.c" } -gpointer value_get_keyword_transformer (const GValue* value) { +gpointer +value_get_keyword_transformer (const GValue* value) +{ #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEYWORD_TRANSFORMER), NULL); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return value->data[0].v_pointer; -#line 916 "PhotoMetadata.c" +#line 1193 "PhotoMetadata.c" } -void value_set_keyword_transformer (GValue* value, gpointer v_object) { +void +value_set_keyword_transformer (GValue* value, + gpointer v_object) +{ KeywordTransformer * old; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEYWORD_TRANSFORMER)); @@ -932,22 +1212,25 @@ void value_set_keyword_transformer (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keyword_transformer_ref (value->data[0].v_pointer); -#line 936 "PhotoMetadata.c" +#line 1216 "PhotoMetadata.c" } else { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 940 "PhotoMetadata.c" +#line 1220 "PhotoMetadata.c" } #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (old) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keyword_transformer_unref (old); -#line 946 "PhotoMetadata.c" +#line 1226 "PhotoMetadata.c" } } -void value_take_keyword_transformer (GValue* value, gpointer v_object) { +void +value_take_keyword_transformer (GValue* value, + gpointer v_object) +{ KeywordTransformer * old; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEYWORD_TRANSFORMER)); @@ -961,50 +1244,58 @@ void value_take_keyword_transformer (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = v_object; -#line 965 "PhotoMetadata.c" +#line 1248 "PhotoMetadata.c" } else { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 969 "PhotoMetadata.c" +#line 1252 "PhotoMetadata.c" } #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (old) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keyword_transformer_unref (old); -#line 975 "PhotoMetadata.c" +#line 1258 "PhotoMetadata.c" } } -static void keyword_transformer_class_init (KeywordTransformerClass * klass) { +static void +keyword_transformer_class_init (KeywordTransformerClass * klass) +{ #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keyword_transformer_parent_class = g_type_class_peek_parent (klass); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((KeywordTransformerClass *) klass)->finalize = keyword_transformer_finalize; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((KeywordTransformerClass *) klass)->transform = (GeeList* (*) (KeywordTransformer *, const gchar*, GError**)) keyword_transformer_real_transform; -#line 987 "PhotoMetadata.c" +#line 1272 "PhotoMetadata.c" } -static void keyword_transformer_instance_init (KeywordTransformer * self) { +static void +keyword_transformer_instance_init (KeywordTransformer * self) +{ #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->ref_count = 1; -#line 994 "PhotoMetadata.c" +#line 1281 "PhotoMetadata.c" } -static void keyword_transformer_finalize (KeywordTransformer * obj) { +static void +keyword_transformer_finalize (KeywordTransformer * obj) +{ KeywordTransformer * self; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_signal_handlers_destroy (self); -#line 1004 "PhotoMetadata.c" +#line 1293 "PhotoMetadata.c" } -GType keyword_transformer_get_type (void) { +GType +keyword_transformer_get_type (void) +{ static volatile gsize keyword_transformer_type_id__volatile = 0; if (g_once_init_enter (&keyword_transformer_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_keyword_transformer_init, value_keyword_transformer_free_value, value_keyword_transformer_copy_value, value_keyword_transformer_peek_pointer, "p", value_keyword_transformer_collect_value, "p", value_keyword_transformer_lcopy_value }; @@ -1018,18 +1309,22 @@ GType keyword_transformer_get_type (void) { } -gpointer keyword_transformer_ref (gpointer instance) { +gpointer +keyword_transformer_ref (gpointer instance) +{ KeywordTransformer * self; self = instance; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&self->ref_count); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return instance; -#line 1029 "PhotoMetadata.c" +#line 1322 "PhotoMetadata.c" } -void keyword_transformer_unref (gpointer instance) { +void +keyword_transformer_unref (gpointer instance) +{ KeywordTransformer * self; self = instance; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1038,17 +1333,20 @@ void keyword_transformer_unref (gpointer instance) { KEYWORD_TRANSFORMER_GET_CLASS (self)->finalize (self); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1042 "PhotoMetadata.c" +#line 1337 "PhotoMetadata.c" } } -static GeeList* null_keyword_transformer_real_transform (KeywordTransformer* base, const gchar* input, GError** error) { +static GeeList* +null_keyword_transformer_real_transform (KeywordTransformer* base, + const gchar* input, + GError** error) +{ NullKeywordTransformer * self; GeeList* result = NULL; GeeArrayList* _result_ = NULL; GeeArrayList* _tmp0_; - const gchar* _tmp1_; #line 36 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_KEYWORD_TRANSFORMER, NullKeywordTransformer); #line 36 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1058,48 +1356,56 @@ static GeeList* null_keyword_transformer_real_transform (KeywordTransformer* bas #line 37 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _result_ = _tmp0_; #line 38 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = input; -#line 38 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_result_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_result_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), input); #line 40 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_result_, GEE_TYPE_LIST, GeeList); #line 40 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1069 "PhotoMetadata.c" +#line 1365 "PhotoMetadata.c" } -NullKeywordTransformer* null_keyword_transformer_construct (GType object_type) { +NullKeywordTransformer* +null_keyword_transformer_construct (GType object_type) +{ NullKeywordTransformer* self = NULL; #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = (NullKeywordTransformer*) keyword_transformer_construct (object_type); #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 1079 "PhotoMetadata.c" +#line 1377 "PhotoMetadata.c" } -NullKeywordTransformer* null_keyword_transformer_new (void) { +NullKeywordTransformer* +null_keyword_transformer_new (void) +{ #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return null_keyword_transformer_construct (TYPE_NULL_KEYWORD_TRANSFORMER); -#line 1086 "PhotoMetadata.c" +#line 1386 "PhotoMetadata.c" } -static void null_keyword_transformer_class_init (NullKeywordTransformerClass * klass) { +static void +null_keyword_transformer_class_init (NullKeywordTransformerClass * klass) +{ #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" null_keyword_transformer_parent_class = g_type_class_peek_parent (klass); #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((KeywordTransformerClass *) klass)->transform = (GeeList* (*) (KeywordTransformer *, const gchar*, GError**)) null_keyword_transformer_real_transform; -#line 1095 "PhotoMetadata.c" +#line 1397 "PhotoMetadata.c" } -static void null_keyword_transformer_instance_init (NullKeywordTransformer * self) { +static void +null_keyword_transformer_instance_init (NullKeywordTransformer * self) +{ } -GType null_keyword_transformer_get_type (void) { +GType +null_keyword_transformer_get_type (void) +{ static volatile gsize null_keyword_transformer_type_id__volatile = 0; if (g_once_init_enter (&null_keyword_transformer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (NullKeywordTransformerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) null_keyword_transformer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NullKeywordTransformer), 0, (GInstanceInitFunc) null_keyword_transformer_instance_init, NULL }; @@ -1111,35 +1417,59 @@ GType null_keyword_transformer_get_type (void) { } -static void _acd_see_keyword_transformer_on_start_gmarkup_parser_start_element_func (GMarkupParseContext* context, const gchar* element_name, gchar** attribute_names, gchar** attribute_values, gpointer self, GError** error) { +static void +_acd_see_keyword_transformer_on_start_gmarkup_parser_start_element_func (GMarkupParseContext* context, + const gchar* element_name, + gchar** attribute_names, + gchar** attribute_values, + gpointer self, + GError** error) +{ #line 64 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" acd_see_keyword_transformer_on_start ((ACDSeeKeywordTransformer*) self, context, element_name, attribute_names, attribute_values, error); -#line 1118 "PhotoMetadata.c" +#line 1431 "PhotoMetadata.c" } -static void _acd_see_keyword_transformer_on_end_gmarkup_parser_end_element_func (GMarkupParseContext* context, const gchar* element_name, gpointer self, GError** error) { +static void +_acd_see_keyword_transformer_on_end_gmarkup_parser_end_element_func (GMarkupParseContext* context, + const gchar* element_name, + gpointer self, + GError** error) +{ #line 65 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" acd_see_keyword_transformer_on_end ((ACDSeeKeywordTransformer*) self, context, element_name, error); -#line 1125 "PhotoMetadata.c" +#line 1443 "PhotoMetadata.c" } -static void _acd_see_keyword_transformer_on_text_gmarkup_parser_text_func (GMarkupParseContext* context, const gchar* text, gsize text_len, gpointer self, GError** error) { +static void +_acd_see_keyword_transformer_on_text_gmarkup_parser_text_func (GMarkupParseContext* context, + const gchar* text, + gsize text_len, + gpointer self, + GError** error) +{ #line 66 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" acd_see_keyword_transformer_on_text ((ACDSeeKeywordTransformer*) self, context, text, error); -#line 1132 "PhotoMetadata.c" +#line 1456 "PhotoMetadata.c" } -static void _acd_see_keyword_transformer_on_error_gmarkup_parser_error_func (GMarkupParseContext* context, GError* _error_, gpointer self) { +static void +_acd_see_keyword_transformer_on_error_gmarkup_parser_error_func (GMarkupParseContext* context, + GError* _error_, + gpointer self) +{ #line 67 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" acd_see_keyword_transformer_on_error ((ACDSeeKeywordTransformer*) self, context, _error_); -#line 1139 "PhotoMetadata.c" +#line 1467 "PhotoMetadata.c" } -ACDSeeKeywordTransformer* acd_see_keyword_transformer_construct (GType object_type) { +ACDSeeKeywordTransformer* +acd_see_keyword_transformer_construct (GType object_type) +{ ACDSeeKeywordTransformer* self = NULL; GeeArrayList* _tmp0_; GeeArrayQueue* _tmp1_; @@ -1169,36 +1499,42 @@ ACDSeeKeywordTransformer* acd_see_keyword_transformer_construct (GType object_ty self->priv->stack = _tmp1_; #line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 1173 "PhotoMetadata.c" +#line 1503 "PhotoMetadata.c" } -ACDSeeKeywordTransformer* acd_see_keyword_transformer_new (void) { +ACDSeeKeywordTransformer* +acd_see_keyword_transformer_new (void) +{ #line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return acd_see_keyword_transformer_construct (TYPE_ACD_SEE_KEYWORD_TRANSFORMER); -#line 1180 "PhotoMetadata.c" +#line 1512 "PhotoMetadata.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? g_object_ref (self) : NULL; -#line 1187 "PhotoMetadata.c" +#line 1521 "PhotoMetadata.c" } -static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer* base, const gchar* input, GError** error) { +static GeeList* +acd_see_keyword_transformer_real_transform (KeywordTransformer* base, + const gchar* input, + GError** error) +{ ACDSeeKeywordTransformer * self; GeeList* result = NULL; GMarkupParseContext* ctx = NULL; GMarkupParser _tmp0_; GMarkupParseContext* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - gint _tmp4_; - gint _tmp5_; - GeeArrayList* _tmp6_; - GeeList* _tmp7_; + gint _tmp2_; + gint _tmp3_; + GeeArrayList* _tmp4_; + GeeList* _tmp5_; GError * _inner_error_ = NULL; #line 72 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ACD_SEE_KEYWORD_TRANSFORMER, ACDSeeKeywordTransformer); @@ -1211,15 +1547,11 @@ static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer* #line 73 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ctx = _tmp1_; #line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = input; -#line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = input; + _tmp2_ = strlen (input); #line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = strlen (_tmp3_); -#line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_markup_parse_context_parse (ctx, _tmp2_, (gssize) _tmp5_, &_inner_error_); + g_markup_parse_context_parse (ctx, input, (gssize) _tmp3_, &_inner_error_); #line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1228,30 +1560,30 @@ static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer* _g_markup_parse_context_unref0 (ctx); #line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 1232 "PhotoMetadata.c" +#line 1564 "PhotoMetadata.c" } #line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = self->priv->result; + _tmp4_ = self->priv->result; #line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList)); #line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp7_; + result = _tmp5_; #line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_markup_parse_context_unref0 (ctx); #line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1244 "PhotoMetadata.c" +#line 1576 "PhotoMetadata.c" } -static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* name, gchar** attribute_names, gchar** attribute_values, GError** error) { - const gchar* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - gchar** _tmp3_; - gint _tmp3__length1; - gchar** _tmp4_; - gint _tmp4__length1; +static void +acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self, + GMarkupParseContext* ctx, + const gchar* name, + gchar** attribute_names, + gchar** attribute_values, + GError** error) +{ GError * _inner_error_ = NULL; #line 80 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_ACD_SEE_KEYWORD_TRANSFORMER (self)); @@ -1262,33 +1594,19 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self #line 88 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->assigned = FALSE; #line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = name; -#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (g_strcmp0 (_tmp0_, "Categories") == 0) { + if (g_strcmp0 (name, "Categories") == 0) { #line 90 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1271 "PhotoMetadata.c" +#line 1601 "PhotoMetadata.c" } #line 93 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = name; -#line 93 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (g_strcmp0 (_tmp1_, "Category") != 0) { + if (g_strcmp0 (name, "Category") != 0) { #line 94 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1279 "PhotoMetadata.c" +#line 1607 "PhotoMetadata.c" } #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = name; -#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = attribute_names; -#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3__length1 = _vala_array_length (attribute_names); -#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = attribute_values; -#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4__length1 = _vala_array_length (attribute_values); -#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_markup_collect_attributes (_tmp2_, _tmp3_, _tmp4_, &_inner_error_, G_MARKUP_COLLECT_BOOLEAN, "Assigned", &self->priv->assigned, G_MARKUP_COLLECT_INVALID); + g_markup_collect_attributes (name, attribute_names, attribute_values, &_inner_error_, G_MARKUP_COLLECT_BOOLEAN, "Assigned", &self->priv->assigned, G_MARKUP_COLLECT_INVALID); #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1297,7 +1615,7 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self g_propagate_error (error, _inner_error_); #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1301 "PhotoMetadata.c" +#line 1619 "PhotoMetadata.c" } else { #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1305,14 +1623,18 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self g_clear_error (&_inner_error_); #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1309 "PhotoMetadata.c" +#line 1627 "PhotoMetadata.c" } } } -static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* name, GError** error) { - const gchar* _tmp0_; +static void +acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self, + GMarkupParseContext* ctx, + const gchar* name, + GError** error) +{ #line 104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_ACD_SEE_KEYWORD_TRANSFORMER (self)); #line 104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1320,31 +1642,32 @@ static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self, #line 104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (name != NULL); #line 106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = name; -#line 106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (g_strcmp0 (_tmp0_, "Category") == 0) { -#line 1327 "PhotoMetadata.c" - GeeArrayQueue* _tmp1_; - gpointer _tmp2_; - gchar* _tmp3_; + if (g_strcmp0 (name, "Category") == 0) { +#line 1647 "PhotoMetadata.c" + GeeArrayQueue* _tmp0_; + gpointer _tmp1_; + gchar* _tmp2_; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = self->priv->stack; + _tmp0_ = self->priv->stack; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = gee_deque_poll_tail (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_DEQUE, GeeDeque)); + _tmp1_ = gee_deque_poll_tail (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_DEQUE, GeeDeque)); #line 107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = (gchar*) _tmp2_; + _tmp2_ = (gchar*) _tmp1_; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp3_); -#line 1339 "PhotoMetadata.c" + _g_free0 (_tmp2_); +#line 1659 "PhotoMetadata.c" } } -static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* text, GError** error) { - const gchar* _tmp0_; - GeeArrayQueue* _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; +static void +acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, + GMarkupParseContext* ctx, + const gchar* text, + GError** error) +{ + GeeArrayQueue* _tmp0_; + gboolean _tmp1_; #line 111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_ACD_SEE_KEYWORD_TRANSFORMER (self)); #line 111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1352,148 +1675,146 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, #line 111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (text != NULL); #line 113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = text; -#line 113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (g_strcmp0 (_tmp0_, "") == 0) { + if (g_strcmp0 (text, "") == 0) { #line 114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1361 "PhotoMetadata.c" +#line 1682 "PhotoMetadata.c" } #line 117 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = self->priv->stack; -#line 117 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = text; + _tmp0_ = self->priv->stack; #line 117 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gee_deque_offer_tail (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_DEQUE, GeeDeque), _tmp2_); + gee_deque_offer_tail (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_DEQUE, GeeDeque), text); #line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = self->priv->assigned; + _tmp1_ = self->priv->assigned; #line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp3_) { -#line 1373 "PhotoMetadata.c" + if (_tmp1_) { +#line 1692 "PhotoMetadata.c" GString* builder = NULL; - GString* _tmp4_; - GString* _tmp13_; - gssize _tmp14_; - GeeArrayList* _tmp18_; - GString* _tmp19_; - const gchar* _tmp20_; + GString* _tmp2_; + GString* _tmp10_; + gssize _tmp11_; + GeeArrayList* _tmp15_; + GString* _tmp16_; + const gchar* _tmp17_; #line 119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = g_string_new (""); + _tmp2_ = g_string_new (""); #line 119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - builder = _tmp4_; -#line 1385 "PhotoMetadata.c" + builder = _tmp2_; +#line 1704 "PhotoMetadata.c" { GeeIterator* _f_it = NULL; - GeeArrayQueue* _tmp5_; - GeeIterator* _tmp6_; + GeeArrayQueue* _tmp3_; + GeeIterator* _tmp4_; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = self->priv->stack; + _tmp3_ = self->priv->stack; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp4_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _f_it = _tmp6_; + _f_it = _tmp4_; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 1398 "PhotoMetadata.c" - GeeIterator* _tmp7_; - gboolean _tmp8_; +#line 1717 "PhotoMetadata.c" + GeeIterator* _tmp5_; gchar* f = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; - GString* _tmp11_; - const gchar* _tmp12_; -#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = _f_it; + GeeIterator* _tmp6_; + gpointer _tmp7_; + GString* _tmp8_; + const gchar* _tmp9_; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = gee_iterator_next (_tmp7_); + _tmp5_ = _f_it; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp5_)) { #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 1414 "PhotoMetadata.c" +#line 1730 "PhotoMetadata.c" } #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = _f_it; + _tmp6_ = _f_it; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - f = (gchar*) _tmp10_; + f = (gchar*) _tmp7_; #line 121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = builder; + _tmp8_ = builder; #line 121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = f; + _tmp9_ = f; #line 121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_string_append_printf (_tmp11_, "%s|", _tmp12_); + g_string_append_printf (_tmp8_, "%s|", _tmp9_); #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (f); -#line 1430 "PhotoMetadata.c" +#line 1746 "PhotoMetadata.c" } #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_f_it); -#line 1434 "PhotoMetadata.c" +#line 1750 "PhotoMetadata.c" } #line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = builder; + _tmp10_ = builder; #line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = _tmp13_->len; + _tmp11_ = _tmp10_->len; #line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp14_ > ((gssize) 0)) { -#line 1442 "PhotoMetadata.c" - GString* _tmp15_; - GString* _tmp16_; - gssize _tmp17_; + if (_tmp11_ > ((gssize) 0)) { +#line 1758 "PhotoMetadata.c" + GString* _tmp12_; + GString* _tmp13_; + gssize _tmp14_; #line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = builder; + _tmp12_ = builder; #line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = builder; + _tmp13_ = builder; #line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = _tmp16_->len; + _tmp14_ = _tmp13_->len; #line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_string_truncate (_tmp15_, (gsize) (_tmp17_ - 1)); -#line 1454 "PhotoMetadata.c" + g_string_truncate (_tmp12_, (gsize) (_tmp14_ - 1)); +#line 1770 "PhotoMetadata.c" } #line 126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = self->priv->result; + _tmp15_ = self->priv->result; #line 126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = builder; + _tmp16_ = builder; #line 126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = _tmp19_->str; + _tmp17_ = _tmp16_->str; #line 126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); #line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_string_free0 (builder); -#line 1466 "PhotoMetadata.c" +#line 1782 "PhotoMetadata.c" } } -static gpointer _g_error_copy0 (gpointer self) { +static gpointer +_g_error_copy0 (gpointer self) +{ #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? g_error_copy (self) : NULL; -#line 1474 "PhotoMetadata.c" +#line 1792 "PhotoMetadata.c" } -static void acd_see_keyword_transformer_on_error (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, GError* _error_) { +static void +acd_see_keyword_transformer_on_error (ACDSeeKeywordTransformer* self, + GMarkupParseContext* ctx, + GError* _error_) +{ GError* _tmp0_; - GError* _tmp1_; #line 130 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_ACD_SEE_KEYWORD_TRANSFORMER (self)); #line 130 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (ctx != NULL); #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = _error_; -#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = _g_error_copy0 (_tmp0_); + _tmp0_ = _g_error_copy0 (_error_); #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_error_free0 (self->priv->error); #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->error = _tmp1_; -#line 1493 "PhotoMetadata.c" + self->priv->error = _tmp0_; +#line 1812 "PhotoMetadata.c" } -static void acd_see_keyword_transformer_class_init (ACDSeeKeywordTransformerClass * klass) { +static void +acd_see_keyword_transformer_class_init (ACDSeeKeywordTransformerClass * klass) +{ #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" acd_see_keyword_transformer_parent_class = g_type_class_peek_parent (klass); #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1502,18 +1823,22 @@ static void acd_see_keyword_transformer_class_init (ACDSeeKeywordTransformerClas g_type_class_add_private (klass, sizeof (ACDSeeKeywordTransformerPrivate)); #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((KeywordTransformerClass *) klass)->transform = (GeeList* (*) (KeywordTransformer *, const gchar*, GError**)) acd_see_keyword_transformer_real_transform; -#line 1506 "PhotoMetadata.c" +#line 1827 "PhotoMetadata.c" } -static void acd_see_keyword_transformer_instance_init (ACDSeeKeywordTransformer * self) { +static void +acd_see_keyword_transformer_instance_init (ACDSeeKeywordTransformer * self) +{ #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv = ACD_SEE_KEYWORD_TRANSFORMER_GET_PRIVATE (self); -#line 1513 "PhotoMetadata.c" +#line 1836 "PhotoMetadata.c" } -static void acd_see_keyword_transformer_finalize (KeywordTransformer * obj) { +static void +acd_see_keyword_transformer_finalize (KeywordTransformer * obj) +{ ACDSeeKeywordTransformer * self; #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ACD_SEE_KEYWORD_TRANSFORMER, ACDSeeKeywordTransformer); @@ -1525,11 +1850,13 @@ static void acd_see_keyword_transformer_finalize (KeywordTransformer * obj) { _g_object_unref0 (self->priv->result); #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" KEYWORD_TRANSFORMER_CLASS (acd_see_keyword_transformer_parent_class)->finalize (obj); -#line 1529 "PhotoMetadata.c" +#line 1854 "PhotoMetadata.c" } -GType acd_see_keyword_transformer_get_type (void) { +GType +acd_see_keyword_transformer_get_type (void) +{ static volatile gsize acd_see_keyword_transformer_type_id__volatile = 0; if (g_once_init_enter (&acd_see_keyword_transformer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ACDSeeKeywordTransformerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) acd_see_keyword_transformer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ACDSeeKeywordTransformer), 0, (GInstanceInitFunc) acd_see_keyword_transformer_instance_init, NULL }; @@ -1541,23 +1868,27 @@ GType acd_see_keyword_transformer_get_type (void) { } -static gpointer _keyword_transformer_ref0 (gpointer self) { +static gpointer +_keyword_transformer_ref0 (gpointer self) +{ #line 154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? keyword_transformer_ref (self) : NULL; -#line 1548 "PhotoMetadata.c" +#line 1877 "PhotoMetadata.c" } -HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_type, const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer) { +HierarchicalKeywordField* +hierarchical_keyword_field_construct (GType object_type, + const gchar* field_name, + const gchar* path_separator, + gboolean wants_leading_separator, + gboolean is_writeable, + KeywordTransformer* transformer) +{ HierarchicalKeywordField* self = NULL; - const gchar* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_; - gboolean _tmp4_; - gboolean _tmp5_; - KeywordTransformer* _tmp6_; - KeywordTransformer* _tmp7_; + KeywordTransformer* _tmp2_; #line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (field_name != NULL, NULL); #line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1567,148 +1898,169 @@ HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_typ #line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = (HierarchicalKeywordField*) g_type_create_instance (object_type); #line 150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = field_name; -#line 150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (field_name); #line 150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->field_name); #line 150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->field_name = _tmp1_; -#line 151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = path_separator; + self->field_name = _tmp0_; #line 151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (path_separator); #line 151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->path_separator); #line 151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->path_separator = _tmp3_; + self->path_separator = _tmp1_; #line 152 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = wants_leading_separator; -#line 152 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->wants_leading_separator = _tmp4_; -#line 153 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = is_writeable; + self->wants_leading_separator = wants_leading_separator; #line 153 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->is_writeable = _tmp5_; + self->is_writeable = is_writeable; #line 154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = transformer; -#line 154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = _keyword_transformer_ref0 (_tmp6_); + _tmp2_ = _keyword_transformer_ref0 (transformer); #line 154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _keyword_transformer_unref0 (self->transformer); #line 154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->transformer = _tmp7_; + self->transformer = _tmp2_; #line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 1604 "PhotoMetadata.c" +#line 1925 "PhotoMetadata.c" } -HierarchicalKeywordField* hierarchical_keyword_field_new (const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer) { +HierarchicalKeywordField* +hierarchical_keyword_field_new (const gchar* field_name, + const gchar* path_separator, + gboolean wants_leading_separator, + gboolean is_writeable, + KeywordTransformer* transformer) +{ #line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return hierarchical_keyword_field_construct (TYPE_HIERARCHICAL_KEYWORD_FIELD, field_name, path_separator, wants_leading_separator, is_writeable, transformer); -#line 1611 "PhotoMetadata.c" +#line 1938 "PhotoMetadata.c" } -static void value_hierarchical_keyword_field_init (GValue* value) { +static void +value_hierarchical_keyword_field_init (GValue* value) +{ #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1618 "PhotoMetadata.c" +#line 1947 "PhotoMetadata.c" } -static void value_hierarchical_keyword_field_free_value (GValue* value) { +static void +value_hierarchical_keyword_field_free_value (GValue* value) +{ #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (value->data[0].v_pointer) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" hierarchical_keyword_field_unref (value->data[0].v_pointer); -#line 1627 "PhotoMetadata.c" +#line 1958 "PhotoMetadata.c" } } -static void value_hierarchical_keyword_field_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_hierarchical_keyword_field_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (src_value->data[0].v_pointer) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = hierarchical_keyword_field_ref (src_value->data[0].v_pointer); -#line 1637 "PhotoMetadata.c" +#line 1971 "PhotoMetadata.c" } else { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 1641 "PhotoMetadata.c" +#line 1975 "PhotoMetadata.c" } } -static gpointer value_hierarchical_keyword_field_peek_pointer (const GValue* value) { +static gpointer +value_hierarchical_keyword_field_peek_pointer (const GValue* value) +{ #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return value->data[0].v_pointer; -#line 1649 "PhotoMetadata.c" +#line 1985 "PhotoMetadata.c" } -static gchar* value_hierarchical_keyword_field_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_hierarchical_keyword_field_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (collect_values[0].v_pointer) { -#line 1656 "PhotoMetadata.c" +#line 1997 "PhotoMetadata.c" HierarchicalKeywordField * object; object = collect_values[0].v_pointer; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (object->parent_instance.g_class == NULL) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1663 "PhotoMetadata.c" +#line 2004 "PhotoMetadata.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1667 "PhotoMetadata.c" +#line 2008 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = hierarchical_keyword_field_ref (object); -#line 1671 "PhotoMetadata.c" +#line 2012 "PhotoMetadata.c" } else { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1675 "PhotoMetadata.c" +#line 2016 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 1679 "PhotoMetadata.c" +#line 2020 "PhotoMetadata.c" } -static gchar* value_hierarchical_keyword_field_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_hierarchical_keyword_field_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ HierarchicalKeywordField ** object_p; object_p = collect_values[0].v_pointer; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!object_p) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1690 "PhotoMetadata.c" +#line 2036 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!value->data[0].v_pointer) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = NULL; -#line 1696 "PhotoMetadata.c" +#line 2042 "PhotoMetadata.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = value->data[0].v_pointer; -#line 1700 "PhotoMetadata.c" +#line 2046 "PhotoMetadata.c" } else { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = hierarchical_keyword_field_ref (value->data[0].v_pointer); -#line 1704 "PhotoMetadata.c" +#line 2050 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 1708 "PhotoMetadata.c" +#line 2054 "PhotoMetadata.c" } -GParamSpec* param_spec_hierarchical_keyword_field (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_hierarchical_keyword_field (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecHierarchicalKeywordField* spec; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_HIERARCHICAL_KEYWORD_FIELD), NULL); @@ -1718,20 +2070,25 @@ GParamSpec* param_spec_hierarchical_keyword_field (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return G_PARAM_SPEC (spec); -#line 1722 "PhotoMetadata.c" +#line 2074 "PhotoMetadata.c" } -gpointer value_get_hierarchical_keyword_field (const GValue* value) { +gpointer +value_get_hierarchical_keyword_field (const GValue* value) +{ #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_KEYWORD_FIELD), NULL); #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return value->data[0].v_pointer; -#line 1731 "PhotoMetadata.c" +#line 2085 "PhotoMetadata.c" } -void value_set_hierarchical_keyword_field (GValue* value, gpointer v_object) { +void +value_set_hierarchical_keyword_field (GValue* value, + gpointer v_object) +{ HierarchicalKeywordField * old; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_KEYWORD_FIELD)); @@ -1747,22 +2104,25 @@ void value_set_hierarchical_keyword_field (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" hierarchical_keyword_field_ref (value->data[0].v_pointer); -#line 1751 "PhotoMetadata.c" +#line 2108 "PhotoMetadata.c" } else { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1755 "PhotoMetadata.c" +#line 2112 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (old) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" hierarchical_keyword_field_unref (old); -#line 1761 "PhotoMetadata.c" +#line 2118 "PhotoMetadata.c" } } -void value_take_hierarchical_keyword_field (GValue* value, gpointer v_object) { +void +value_take_hierarchical_keyword_field (GValue* value, + gpointer v_object) +{ HierarchicalKeywordField * old; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_KEYWORD_FIELD)); @@ -1776,38 +2136,44 @@ void value_take_hierarchical_keyword_field (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = v_object; -#line 1780 "PhotoMetadata.c" +#line 2140 "PhotoMetadata.c" } else { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1784 "PhotoMetadata.c" +#line 2144 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (old) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" hierarchical_keyword_field_unref (old); -#line 1790 "PhotoMetadata.c" +#line 2150 "PhotoMetadata.c" } } -static void hierarchical_keyword_field_class_init (HierarchicalKeywordFieldClass * klass) { +static void +hierarchical_keyword_field_class_init (HierarchicalKeywordFieldClass * klass) +{ #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" hierarchical_keyword_field_parent_class = g_type_class_peek_parent (klass); #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((HierarchicalKeywordFieldClass *) klass)->finalize = hierarchical_keyword_field_finalize; -#line 1800 "PhotoMetadata.c" +#line 2162 "PhotoMetadata.c" } -static void hierarchical_keyword_field_instance_init (HierarchicalKeywordField * self) { +static void +hierarchical_keyword_field_instance_init (HierarchicalKeywordField * self) +{ #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->ref_count = 1; -#line 1807 "PhotoMetadata.c" +#line 2171 "PhotoMetadata.c" } -static void hierarchical_keyword_field_finalize (HierarchicalKeywordField * obj) { +static void +hierarchical_keyword_field_finalize (HierarchicalKeywordField * obj) +{ HierarchicalKeywordField * self; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HIERARCHICAL_KEYWORD_FIELD, HierarchicalKeywordField); @@ -1819,11 +2185,13 @@ static void hierarchical_keyword_field_finalize (HierarchicalKeywordField * obj) _g_free0 (self->path_separator); #line 142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _keyword_transformer_unref0 (self->transformer); -#line 1823 "PhotoMetadata.c" +#line 2189 "PhotoMetadata.c" } -GType hierarchical_keyword_field_get_type (void) { +GType +hierarchical_keyword_field_get_type (void) +{ static volatile gsize hierarchical_keyword_field_type_id__volatile = 0; if (g_once_init_enter (&hierarchical_keyword_field_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_hierarchical_keyword_field_init, value_hierarchical_keyword_field_free_value, value_hierarchical_keyword_field_copy_value, value_hierarchical_keyword_field_peek_pointer, "p", value_hierarchical_keyword_field_collect_value, "p", value_hierarchical_keyword_field_lcopy_value }; @@ -1837,18 +2205,22 @@ GType hierarchical_keyword_field_get_type (void) { } -gpointer hierarchical_keyword_field_ref (gpointer instance) { +gpointer +hierarchical_keyword_field_ref (gpointer instance) +{ HierarchicalKeywordField * self; self = instance; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&self->ref_count); #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return instance; -#line 1848 "PhotoMetadata.c" +#line 2218 "PhotoMetadata.c" } -void hierarchical_keyword_field_unref (gpointer instance) { +void +hierarchical_keyword_field_unref (gpointer instance) +{ HierarchicalKeywordField * self; self = instance; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1857,21 +2229,24 @@ void hierarchical_keyword_field_unref (gpointer instance) { HIERARCHICAL_KEYWORD_FIELD_GET_CLASS (self)->finalize (self); #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1861 "PhotoMetadata.c" +#line 2233 "PhotoMetadata.c" } } -PhotoPreview* photo_preview_construct (GType object_type, const gchar* name, Dimensions* dimensions, guint32 size, const gchar* mime_type, const gchar* extension) { +PhotoPreview* +photo_preview_construct (GType object_type, + const gchar* name, + Dimensions* dimensions, + guint32 size, + const gchar* mime_type, + const gchar* extension) +{ PhotoPreview* self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - Dimensions _tmp2_; - guint32 _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; + gchar* _tmp0_; + Dimensions _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; #line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (name != NULL, NULL); #line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1883,44 +2258,38 @@ PhotoPreview* photo_preview_construct (GType object_type, const gchar* name, Dim #line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = (PhotoPreview*) g_type_create_instance (object_type); #line 166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = name; -#line 166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (name); #line 166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->priv->name); #line 166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->name = _tmp1_; + self->priv->name = _tmp0_; #line 167 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = *dimensions; + _tmp1_ = *dimensions; #line 167 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->dimensions = _tmp2_; + self->priv->dimensions = _tmp1_; #line 168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = size; -#line 168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->size = _tmp3_; -#line 169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = mime_type; + self->priv->size = size; #line 169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = g_strdup (_tmp4_); + _tmp2_ = g_strdup (mime_type); #line 169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->priv->mime_type); #line 169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->mime_type = _tmp5_; + self->priv->mime_type = _tmp2_; #line 170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = extension; -#line 170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp3_ = g_strdup (extension); #line 170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->priv->extension); #line 170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->extension = _tmp7_; + self->priv->extension = _tmp3_; #line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 1920 "PhotoMetadata.c" +#line 2287 "PhotoMetadata.c" } -gchar* photo_preview_get_name (PhotoPreview* self) { +gchar* +photo_preview_get_name (PhotoPreview* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -1934,11 +2303,14 @@ gchar* photo_preview_get_name (PhotoPreview* self) { result = _tmp1_; #line 174 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1938 "PhotoMetadata.c" +#line 2307 "PhotoMetadata.c" } -void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result) { +void +photo_preview_get_pixel_dimensions (PhotoPreview* self, + Dimensions* result) +{ Dimensions _tmp0_; #line 177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_PREVIEW (self)); @@ -1948,11 +2320,13 @@ void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result) *result = _tmp0_; #line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1952 "PhotoMetadata.c" +#line 2324 "PhotoMetadata.c" } -guint32 photo_preview_get_size (PhotoPreview* self) { +guint32 +photo_preview_get_size (PhotoPreview* self) +{ guint32 result = 0U; guint32 _tmp0_; #line 181 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1963,11 +2337,13 @@ guint32 photo_preview_get_size (PhotoPreview* self) { result = _tmp0_; #line 182 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1967 "PhotoMetadata.c" +#line 2341 "PhotoMetadata.c" } -gchar* photo_preview_get_mime_type (PhotoPreview* self) { +gchar* +photo_preview_get_mime_type (PhotoPreview* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -1981,11 +2357,13 @@ gchar* photo_preview_get_mime_type (PhotoPreview* self) { result = _tmp1_; #line 186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1985 "PhotoMetadata.c" +#line 2361 "PhotoMetadata.c" } -gchar* photo_preview_get_extension (PhotoPreview* self) { +gchar* +photo_preview_get_extension (PhotoPreview* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -1999,29 +2377,38 @@ gchar* photo_preview_get_extension (PhotoPreview* self) { result = _tmp1_; #line 190 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2003 "PhotoMetadata.c" +#line 2381 "PhotoMetadata.c" } -static GBytes* photo_preview_real_flatten (PhotoPreview* self, GError** error) { +static GBytes* +photo_preview_real_flatten (PhotoPreview* self, + GError** error) +{ #line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_critical ("Type `%s' does not implement abstract method `photo_preview_flatten'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 2012 "PhotoMetadata.c" +#line 2393 "PhotoMetadata.c" } -GBytes* photo_preview_flatten (PhotoPreview* self, GError** error) { +GBytes* +photo_preview_flatten (PhotoPreview* self, + GError** error) +{ #line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL); #line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return PHOTO_PREVIEW_GET_CLASS (self)->flatten (self, error); -#line 2021 "PhotoMetadata.c" +#line 2405 "PhotoMetadata.c" } -static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** error) { +static GdkPixbuf* +photo_preview_real_get_pixbuf (PhotoPreview* self, + GError** error) +{ GdkPixbuf* result = NULL; GBytes* flattened = NULL; GBytes* _tmp0_; @@ -2036,7 +2423,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er g_propagate_error (error, _inner_error_); #line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 2040 "PhotoMetadata.c" +#line 2427 "PhotoMetadata.c" } { GdkPixbuf* _tmp1_ = NULL; @@ -2059,7 +2446,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er _tmp1_ = _tmp5_; #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2063 "PhotoMetadata.c" +#line 2450 "PhotoMetadata.c" goto __catch29_g_error; } #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2074,7 +2461,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er _g_bytes_unref0 (flattened); #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2078 "PhotoMetadata.c" +#line 2465 "PhotoMetadata.c" } goto __finally29; __catch29_g_error: @@ -2103,7 +2490,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er _g_bytes_unref0 (flattened); #line 206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2107 "PhotoMetadata.c" +#line 2494 "PhotoMetadata.c" } __finally29: #line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2112,117 +2499,145 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er _g_bytes_unref0 (flattened); #line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 2116 "PhotoMetadata.c" +#line 2503 "PhotoMetadata.c" } -GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error) { +GdkPixbuf* +photo_preview_get_pixbuf (PhotoPreview* self, + GError** error) +{ #line 195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL); #line 195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return PHOTO_PREVIEW_GET_CLASS (self)->get_pixbuf (self, error); -#line 2125 "PhotoMetadata.c" +#line 2515 "PhotoMetadata.c" } -static void value_photo_preview_init (GValue* value) { +static void +value_photo_preview_init (GValue* value) +{ #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2132 "PhotoMetadata.c" +#line 2524 "PhotoMetadata.c" } -static void value_photo_preview_free_value (GValue* value) { +static void +value_photo_preview_free_value (GValue* value) +{ #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (value->data[0].v_pointer) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_preview_unref (value->data[0].v_pointer); -#line 2141 "PhotoMetadata.c" +#line 2535 "PhotoMetadata.c" } } -static void value_photo_preview_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_photo_preview_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (src_value->data[0].v_pointer) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = photo_preview_ref (src_value->data[0].v_pointer); -#line 2151 "PhotoMetadata.c" +#line 2548 "PhotoMetadata.c" } else { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 2155 "PhotoMetadata.c" +#line 2552 "PhotoMetadata.c" } } -static gpointer value_photo_preview_peek_pointer (const GValue* value) { +static gpointer +value_photo_preview_peek_pointer (const GValue* value) +{ #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return value->data[0].v_pointer; -#line 2163 "PhotoMetadata.c" +#line 2562 "PhotoMetadata.c" } -static gchar* value_photo_preview_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_preview_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (collect_values[0].v_pointer) { -#line 2170 "PhotoMetadata.c" +#line 2574 "PhotoMetadata.c" PhotoPreview * object; object = collect_values[0].v_pointer; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (object->parent_instance.g_class == NULL) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2177 "PhotoMetadata.c" +#line 2581 "PhotoMetadata.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2181 "PhotoMetadata.c" +#line 2585 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = photo_preview_ref (object); -#line 2185 "PhotoMetadata.c" +#line 2589 "PhotoMetadata.c" } else { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2189 "PhotoMetadata.c" +#line 2593 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 2193 "PhotoMetadata.c" +#line 2597 "PhotoMetadata.c" } -static gchar* value_photo_preview_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_preview_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoPreview ** object_p; object_p = collect_values[0].v_pointer; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!object_p) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2204 "PhotoMetadata.c" +#line 2613 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!value->data[0].v_pointer) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = NULL; -#line 2210 "PhotoMetadata.c" +#line 2619 "PhotoMetadata.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = value->data[0].v_pointer; -#line 2214 "PhotoMetadata.c" +#line 2623 "PhotoMetadata.c" } else { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = photo_preview_ref (value->data[0].v_pointer); -#line 2218 "PhotoMetadata.c" +#line 2627 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 2222 "PhotoMetadata.c" +#line 2631 "PhotoMetadata.c" } -GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_photo_preview (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPhotoPreview* spec; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PHOTO_PREVIEW), NULL); @@ -2232,20 +2647,25 @@ GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, cons G_PARAM_SPEC (spec)->value_type = object_type; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return G_PARAM_SPEC (spec); -#line 2236 "PhotoMetadata.c" +#line 2651 "PhotoMetadata.c" } -gpointer value_get_photo_preview (const GValue* value) { +gpointer +value_get_photo_preview (const GValue* value) +{ #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_PREVIEW), NULL); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return value->data[0].v_pointer; -#line 2245 "PhotoMetadata.c" +#line 2662 "PhotoMetadata.c" } -void value_set_photo_preview (GValue* value, gpointer v_object) { +void +value_set_photo_preview (GValue* value, + gpointer v_object) +{ PhotoPreview * old; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_PREVIEW)); @@ -2261,22 +2681,25 @@ void value_set_photo_preview (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_preview_ref (value->data[0].v_pointer); -#line 2265 "PhotoMetadata.c" +#line 2685 "PhotoMetadata.c" } else { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2269 "PhotoMetadata.c" +#line 2689 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (old) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_preview_unref (old); -#line 2275 "PhotoMetadata.c" +#line 2695 "PhotoMetadata.c" } } -void value_take_photo_preview (GValue* value, gpointer v_object) { +void +value_take_photo_preview (GValue* value, + gpointer v_object) +{ PhotoPreview * old; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_PREVIEW)); @@ -2290,22 +2713,24 @@ void value_take_photo_preview (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = v_object; -#line 2294 "PhotoMetadata.c" +#line 2717 "PhotoMetadata.c" } else { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2298 "PhotoMetadata.c" +#line 2721 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (old) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_preview_unref (old); -#line 2304 "PhotoMetadata.c" +#line 2727 "PhotoMetadata.c" } } -static void photo_preview_class_init (PhotoPreviewClass * klass) { +static void +photo_preview_class_init (PhotoPreviewClass * klass) +{ #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_preview_parent_class = g_type_class_peek_parent (klass); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2316,20 +2741,24 @@ static void photo_preview_class_init (PhotoPreviewClass * klass) { ((PhotoPreviewClass *) klass)->flatten = (GBytes* (*) (PhotoPreview *, GError**)) photo_preview_real_flatten; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((PhotoPreviewClass *) klass)->get_pixbuf = (GdkPixbuf* (*) (PhotoPreview *, GError**)) photo_preview_real_get_pixbuf; -#line 2320 "PhotoMetadata.c" +#line 2745 "PhotoMetadata.c" } -static void photo_preview_instance_init (PhotoPreview * self) { +static void +photo_preview_instance_init (PhotoPreview * self) +{ #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv = PHOTO_PREVIEW_GET_PRIVATE (self); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->ref_count = 1; -#line 2329 "PhotoMetadata.c" +#line 2756 "PhotoMetadata.c" } -static void photo_preview_finalize (PhotoPreview * obj) { +static void +photo_preview_finalize (PhotoPreview * obj) +{ PhotoPreview * self; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_PREVIEW, PhotoPreview); @@ -2341,11 +2770,13 @@ static void photo_preview_finalize (PhotoPreview * obj) { _g_free0 (self->priv->mime_type); #line 163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->priv->extension); -#line 2345 "PhotoMetadata.c" +#line 2774 "PhotoMetadata.c" } -GType photo_preview_get_type (void) { +GType +photo_preview_get_type (void) +{ static volatile gsize photo_preview_type_id__volatile = 0; if (g_once_init_enter (&photo_preview_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_photo_preview_init, value_photo_preview_free_value, value_photo_preview_copy_value, value_photo_preview_peek_pointer, "p", value_photo_preview_collect_value, "p", value_photo_preview_lcopy_value }; @@ -2359,18 +2790,22 @@ GType photo_preview_get_type (void) { } -gpointer photo_preview_ref (gpointer instance) { +gpointer +photo_preview_ref (gpointer instance) +{ PhotoPreview * self; self = instance; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&self->ref_count); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return instance; -#line 2370 "PhotoMetadata.c" +#line 2803 "PhotoMetadata.c" } -void photo_preview_unref (gpointer instance) { +void +photo_preview_unref (gpointer instance) +{ PhotoPreview * self; self = instance; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2379,12 +2814,14 @@ void photo_preview_unref (gpointer instance) { PHOTO_PREVIEW_GET_CLASS (self)->finalize (self); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2383 "PhotoMetadata.c" +#line 2818 "PhotoMetadata.c" } } -GType photo_metadata_set_option_get_type (void) { +GType +photo_metadata_set_option_get_type (void) +{ static volatile gsize photo_metadata_set_option_type_id__volatile = 0; if (g_once_init_enter (&photo_metadata_set_option_type_id__volatile)) { static const GEnumValue values[] = {{PHOTO_METADATA_SET_OPTION_ALL_DOMAINS, "PHOTO_METADATA_SET_OPTION_ALL_DOMAINS", "all-domains"}, {PHOTO_METADATA_SET_OPTION_ONLY_IF_DOMAIN_PRESENT, "PHOTO_METADATA_SET_OPTION_ONLY_IF_DOMAIN_PRESENT", "only-if-domain-present"}, {PHOTO_METADATA_SET_OPTION_AT_LEAST_DEFAULT_DOMAIN, "PHOTO_METADATA_SET_OPTION_AT_LEAST_DEFAULT_DOMAIN", "at-least-default-domain"}, {0, NULL, NULL}}; @@ -2396,36 +2833,41 @@ GType photo_metadata_set_option_get_type (void) { } -PhotoMetadata* photo_metadata_construct (GType object_type) { +PhotoMetadata* +photo_metadata_construct (GType object_type) +{ PhotoMetadata* self = NULL; #line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = (PhotoMetadata*) media_metadata_construct (object_type); #line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 2406 "PhotoMetadata.c" +#line 2845 "PhotoMetadata.c" } -PhotoMetadata* photo_metadata_new (void) { +PhotoMetadata* +photo_metadata_new (void) +{ #line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return photo_metadata_construct (TYPE_PHOTO_METADATA); -#line 2413 "PhotoMetadata.c" +#line 2854 "PhotoMetadata.c" } -static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file, GError** error) { +static void +photo_metadata_real_read_from_file (MediaMetadata* base, + GFile* file, + GError** error) +{ PhotoMetadata * self; GExiv2Metadata* _tmp0_; GExiv2Metadata* _tmp1_; - GFile* _tmp2_; + gchar* _tmp2_; gchar* _tmp3_; gchar* _tmp4_; - GFile* _tmp5_; - gchar* _tmp6_; + gchar* _tmp5_; + ExifData* _tmp6_; gchar* _tmp7_; - ExifData* _tmp8_; - GFile* _tmp9_; - gchar* _tmp10_; GError * _inner_error_ = NULL; #line 257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata); @@ -2444,54 +2886,51 @@ static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file #line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = self->priv->exiv2; #line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = file; -#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = g_file_get_path (_tmp2_); + _tmp2_ = g_file_get_path (file); #line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gexiv2_metadata_open_path (_tmp1_, _tmp4_, &_inner_error_); + gexiv2_metadata_open_path (_tmp1_, _tmp3_, &_inner_error_); #line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_propagate_error (error, _inner_error_); #line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 2463 "PhotoMetadata.c" +#line 2903 "PhotoMetadata.c" } #line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = file; -#line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = g_file_get_path (_tmp5_); + _tmp4_ = g_file_get_path (file); #line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = exif_data_new_from_file (_tmp7_); + _tmp6_ = exif_data_new_from_file (_tmp5_); #line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _exif_data_unref0 (self->priv->exif); #line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->exif = _tmp8_; + self->priv->exif = _tmp6_; #line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp7_); -#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = file; + _g_free0 (_tmp5_); #line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = g_file_get_basename (_tmp9_); + _tmp7_ = g_file_get_basename (file); #line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->priv->source_name); #line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->source_name = _tmp10_; -#line 2487 "PhotoMetadata.c" + self->priv->source_name = _tmp7_; +#line 2923 "PhotoMetadata.c" } -void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** error) { +void +photo_metadata_write_to_file (PhotoMetadata* self, + GFile* file, + GError** error) +{ GExiv2Metadata* _tmp0_; - GFile* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; GError * _inner_error_ = NULL; #line 266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); @@ -2500,137 +2939,97 @@ void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** er #line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = file; + _tmp1_ = g_file_get_path (file); #line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = g_file_get_path (_tmp1_); -#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gexiv2_metadata_save_file (_tmp0_, _tmp3_, &_inner_error_); + gexiv2_metadata_save_file (_tmp0_, _tmp2_, &_inner_error_); #line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_propagate_error (error, _inner_error_); #line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 2519 "PhotoMetadata.c" +#line 2956 "PhotoMetadata.c" } } -void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int buffer_length1, gint length, GError** error) { - gint _tmp0_; - guint8* _tmp2_; - gint _tmp2__length1; - gint _tmp3_; - GExiv2Metadata* _tmp4_; - GExiv2Metadata* _tmp5_; - guint8* _tmp6_; - gint _tmp6__length1; - gint _tmp7_; - guint8* _tmp8_; - gint _tmp8__length1; - gint _tmp9_; - ExifData* _tmp10_; - gint _tmp11_; - gchar* _tmp12_; +void +photo_metadata_read_from_buffer (PhotoMetadata* self, + guint8* buffer, + int buffer_length1, + gint length, + GError** error) +{ + GExiv2Metadata* _tmp0_; + GExiv2Metadata* _tmp1_; + ExifData* _tmp2_; + gchar* _tmp3_; GError * _inner_error_ = NULL; #line 270 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = length; -#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp0_ <= 0) { -#line 2547 "PhotoMetadata.c" - guint8* _tmp1_; - gint _tmp1__length1; -#line 272 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = buffer; + if (length <= 0) { #line 272 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1__length1 = buffer_length1; -#line 272 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - length = _tmp1__length1; -#line 2556 "PhotoMetadata.c" + length = buffer_length1; +#line 2979 "PhotoMetadata.c" } #line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = buffer; -#line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2__length1 = buffer_length1; -#line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = length; -#line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _vala_assert (_tmp2__length1 >= _tmp3_, "buffer.length >= length"); + _vala_assert (buffer_length1 >= length, "buffer.length >= length"); #line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = gexiv2_metadata_new (); + _tmp0_ = gexiv2_metadata_new (); #line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (self->priv->exiv2); #line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->exiv2 = _tmp4_; + self->priv->exiv2 = _tmp0_; #line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _exif_data_unref0 (self->priv->exif); #line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->exif = NULL; #line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = self->priv->exiv2; -#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = buffer; -#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6__length1 = buffer_length1; -#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = length; + _tmp1_ = self->priv->exiv2; #line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gexiv2_metadata_open_buf (_tmp5_, _tmp6_, (glong) _tmp7_, &_inner_error_); + gexiv2_metadata_open_buf (_tmp1_, buffer, (glong) length, &_inner_error_); #line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_propagate_error (error, _inner_error_); #line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 2592 "PhotoMetadata.c" +#line 3003 "PhotoMetadata.c" } #line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = buffer; -#line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8__length1 = buffer_length1; -#line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = length; -#line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = exif_data_new_from_data (_tmp8_, (gsize) _tmp9_); + _tmp2_ = exif_data_new_from_data (buffer, (gsize) length); #line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _exif_data_unref0 (self->priv->exif); #line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->exif = _tmp10_; -#line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = length; + self->priv->exif = _tmp2_; #line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = g_strdup_printf ("", _tmp11_); + _tmp3_ = g_strdup_printf ("", length); #line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->priv->source_name); #line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->source_name = _tmp12_; -#line 2614 "PhotoMetadata.c" + self->priv->source_name = _tmp3_; +#line 3017 "PhotoMetadata.c" } -void photo_metadata_read_from_app1_segment (PhotoMetadata* self, GBytes* buffer, GError** error) { +void +photo_metadata_read_from_app1_segment (PhotoMetadata* self, + GBytes* buffer, + GError** error) +{ GExiv2Metadata* _tmp0_; GExiv2Metadata* _tmp1_; - GBytes* _tmp2_; - gsize _tmp3_; - guint8* _tmp4_; - GBytes* _tmp5_; - gsize _tmp6_; - GBytes* _tmp7_; - gsize _tmp8_; - guint8* _tmp9_; - GBytes* _tmp10_; - gsize _tmp11_; - ExifData* _tmp12_; - GBytes* _tmp13_; - gsize _tmp14_; - gchar* _tmp15_; + gsize _tmp2_; + guint8* _tmp3_; + gsize _tmp4_; + guint8* _tmp5_; + ExifData* _tmp6_; + gchar* _tmp7_; GError * _inner_error_ = NULL; #line 284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); @@ -2649,344 +3048,289 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, GBytes* buffer, #line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = self->priv->exiv2; #line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = buffer; -#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = g_bytes_get_data (_tmp2_, &_tmp3_); -#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = buffer; -#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = g_bytes_get_size (_tmp5_); + _tmp3_ = g_bytes_get_data (buffer, &_tmp2_); #line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gexiv2_metadata_from_app1_segment (_tmp1_, _tmp4_, (glong) _tmp6_, &_inner_error_); + gexiv2_metadata_from_app1_segment (_tmp1_, _tmp3_, (glong) g_bytes_get_size (buffer), &_inner_error_); #line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_propagate_error (error, _inner_error_); #line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 2668 "PhotoMetadata.c" +#line 3061 "PhotoMetadata.c" } #line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = buffer; + _tmp5_ = g_bytes_get_data (buffer, &_tmp4_); #line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = g_bytes_get_data (_tmp7_, &_tmp8_); -#line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = buffer; -#line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = g_bytes_get_size (_tmp10_); -#line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = exif_data_new_from_data (_tmp9_, _tmp11_); + _tmp6_ = exif_data_new_from_data (_tmp5_, g_bytes_get_size (buffer)); #line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _exif_data_unref0 (self->priv->exif); #line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->exif = _tmp12_; -#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = buffer; + self->priv->exif = _tmp6_; #line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = g_bytes_get_size (_tmp13_); -#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = g_strdup_printf ("", _tmp14_); + _tmp7_ = g_strdup_printf ("", g_bytes_get_size (buffer)); #line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->priv->source_name); #line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->source_name = _tmp15_; -#line 2694 "PhotoMetadata.c" + self->priv->source_name = _tmp7_; +#line 3077 "PhotoMetadata.c" } -MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) { +MetadataDomain +photo_metadata_get_tag_domain (const gchar* tag) +{ MetadataDomain result = 0; - const gchar* _tmp0_; - gboolean _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; - const gchar* _tmp4_; - gboolean _tmp5_; #line 293 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, 0); #line 294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; -#line 294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = gexiv2_metadata_is_exif_tag (_tmp0_); -#line 294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp1_) { + if (gexiv2_metadata_is_exif_tag (tag)) { #line 295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = METADATA_DOMAIN_EXIF; #line 295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2718 "PhotoMetadata.c" +#line 3093 "PhotoMetadata.c" } #line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tag; -#line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = gexiv2_metadata_is_xmp_tag (_tmp2_); -#line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp3_) { + if (gexiv2_metadata_is_xmp_tag (tag)) { #line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = METADATA_DOMAIN_XMP; #line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2730 "PhotoMetadata.c" +#line 3101 "PhotoMetadata.c" } #line 300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = tag; -#line 300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = gexiv2_metadata_is_iptc_tag (_tmp4_); -#line 300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp5_) { + if (gexiv2_metadata_is_iptc_tag (tag)) { #line 301 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = METADATA_DOMAIN_IPTC; #line 301 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2742 "PhotoMetadata.c" +#line 3109 "PhotoMetadata.c" } #line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = METADATA_DOMAIN_UNKNOWN; #line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2748 "PhotoMetadata.c" +#line 3115 "PhotoMetadata.c" } -gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain) { +gboolean +photo_metadata_has_domain (PhotoMetadata* self, + MetadataDomain domain) +{ gboolean result = FALSE; - MetadataDomain _tmp0_; #line 306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = domain; -#line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - switch (_tmp0_) { + switch (domain) { #line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 2763 "PhotoMetadata.c" +#line 3130 "PhotoMetadata.c" { - GExiv2Metadata* _tmp1_; - gboolean _tmp2_; + GExiv2Metadata* _tmp0_; #line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = self->priv->exiv2; -#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = gexiv2_metadata_has_exif (_tmp1_); + _tmp0_ = self->priv->exiv2; #line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp2_; + result = gexiv2_metadata_has_exif (_tmp0_); #line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2775 "PhotoMetadata.c" +#line 3139 "PhotoMetadata.c" } #line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 2779 "PhotoMetadata.c" +#line 3143 "PhotoMetadata.c" { - GExiv2Metadata* _tmp3_; - gboolean _tmp4_; -#line 312 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = self->priv->exiv2; + GExiv2Metadata* _tmp1_; #line 312 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = gexiv2_metadata_has_xmp (_tmp3_); + _tmp1_ = self->priv->exiv2; #line 312 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp4_; + result = gexiv2_metadata_has_xmp (_tmp1_); #line 312 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2791 "PhotoMetadata.c" +#line 3152 "PhotoMetadata.c" } #line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 2795 "PhotoMetadata.c" +#line 3156 "PhotoMetadata.c" { - GExiv2Metadata* _tmp5_; - gboolean _tmp6_; -#line 315 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = self->priv->exiv2; + GExiv2Metadata* _tmp2_; #line 315 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = gexiv2_metadata_has_iptc (_tmp5_); + _tmp2_ = self->priv->exiv2; #line 315 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp6_; + result = gexiv2_metadata_has_iptc (_tmp2_); #line 315 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2807 "PhotoMetadata.c" +#line 3165 "PhotoMetadata.c" } default: #line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_UNKNOWN: -#line 2812 "PhotoMetadata.c" +#line 3170 "PhotoMetadata.c" { #line 319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = FALSE; #line 319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2818 "PhotoMetadata.c" +#line 3176 "PhotoMetadata.c" } } } -gboolean photo_metadata_has_exif (PhotoMetadata* self) { +gboolean +photo_metadata_has_exif (PhotoMetadata* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 323 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = photo_metadata_has_domain (self, METADATA_DOMAIN_EXIF); -#line 324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp0_; + result = photo_metadata_has_domain (self, METADATA_DOMAIN_EXIF); #line 324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2835 "PhotoMetadata.c" +#line 3192 "PhotoMetadata.c" } -gboolean photo_metadata_has_xmp (PhotoMetadata* self) { +gboolean +photo_metadata_has_xmp (PhotoMetadata* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 327 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 328 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = photo_metadata_has_domain (self, METADATA_DOMAIN_XMP); -#line 328 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp0_; + result = photo_metadata_has_domain (self, METADATA_DOMAIN_XMP); #line 328 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2850 "PhotoMetadata.c" +#line 3206 "PhotoMetadata.c" } -gboolean photo_metadata_has_iptc (PhotoMetadata* self) { +gboolean +photo_metadata_has_iptc (PhotoMetadata* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 331 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 332 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = photo_metadata_has_domain (self, METADATA_DOMAIN_IPTC); -#line 332 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp0_; + result = photo_metadata_has_domain (self, METADATA_DOMAIN_IPTC); #line 332 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2865 "PhotoMetadata.c" +#line 3220 "PhotoMetadata.c" } -gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain domain) { +gboolean +photo_metadata_can_write_to_domain (PhotoMetadata* self, + MetadataDomain domain) +{ gboolean result = FALSE; - MetadataDomain _tmp0_; #line 335 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = domain; -#line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - switch (_tmp0_) { + switch (domain) { #line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 2880 "PhotoMetadata.c" +#line 3235 "PhotoMetadata.c" { - GExiv2Metadata* _tmp1_; - gboolean _tmp2_; -#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = self->priv->exiv2; + GExiv2Metadata* _tmp0_; #line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = gexiv2_metadata_get_supports_exif (_tmp1_); + _tmp0_ = self->priv->exiv2; #line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp2_; + result = gexiv2_metadata_get_supports_exif (_tmp0_); #line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2892 "PhotoMetadata.c" +#line 3244 "PhotoMetadata.c" } #line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 2896 "PhotoMetadata.c" +#line 3248 "PhotoMetadata.c" { - GExiv2Metadata* _tmp3_; - gboolean _tmp4_; -#line 341 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = self->priv->exiv2; + GExiv2Metadata* _tmp1_; #line 341 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = gexiv2_metadata_get_supports_xmp (_tmp3_); + _tmp1_ = self->priv->exiv2; #line 341 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp4_; + result = gexiv2_metadata_get_supports_xmp (_tmp1_); #line 341 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2908 "PhotoMetadata.c" +#line 3257 "PhotoMetadata.c" } #line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 2912 "PhotoMetadata.c" +#line 3261 "PhotoMetadata.c" { - GExiv2Metadata* _tmp5_; - gboolean _tmp6_; -#line 344 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = self->priv->exiv2; + GExiv2Metadata* _tmp2_; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = gexiv2_metadata_get_supports_iptc (_tmp5_); + _tmp2_ = self->priv->exiv2; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp6_; + result = gexiv2_metadata_get_supports_iptc (_tmp2_); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2924 "PhotoMetadata.c" +#line 3270 "PhotoMetadata.c" } default: #line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_UNKNOWN: -#line 2929 "PhotoMetadata.c" +#line 3275 "PhotoMetadata.c" { #line 348 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = FALSE; #line 348 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2935 "PhotoMetadata.c" +#line 3281 "PhotoMetadata.c" } } } -gboolean photo_metadata_can_write_exif (PhotoMetadata* self) { +gboolean +photo_metadata_can_write_exif (PhotoMetadata* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 352 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 353 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_EXIF); -#line 353 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp0_; + result = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_EXIF); #line 353 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2952 "PhotoMetadata.c" +#line 3297 "PhotoMetadata.c" } -gboolean photo_metadata_can_write_xmp (PhotoMetadata* self) { +gboolean +photo_metadata_can_write_xmp (PhotoMetadata* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 356 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 357 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_XMP); -#line 357 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp0_; + result = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_XMP); #line 357 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2967 "PhotoMetadata.c" +#line 3311 "PhotoMetadata.c" } -gboolean photo_metadata_can_write_iptc (PhotoMetadata* self) { +gboolean +photo_metadata_can_write_iptc (PhotoMetadata* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 360 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 361 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_IPTC); -#line 361 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp0_; + result = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_IPTC); #line 361 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2982 "PhotoMetadata.c" +#line 3325 "PhotoMetadata.c" } -gboolean photo_metadata_has_tag (PhotoMetadata* self, const gchar* tag) { +gboolean +photo_metadata_has_tag (PhotoMetadata* self, + const gchar* tag) +{ gboolean result = FALSE; GExiv2Metadata* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; #line 364 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 364 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2994,35 +3338,30 @@ gboolean photo_metadata_has_tag (PhotoMetadata* self, const gchar* tag) { #line 365 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 365 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = tag; -#line 365 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = gexiv2_metadata_has_tag (_tmp0_, _tmp1_); -#line 365 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp2_; + result = gexiv2_metadata_has_tag (_tmp0_, tag); #line 365 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3005 "PhotoMetadata.c" +#line 3345 "PhotoMetadata.c" } -static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify) { +static GeeSet* +photo_metadata_create_string_set (PhotoMetadata* self, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify) +{ GeeSet* result = NULL; - GCompareDataFunc _tmp0_; - void* _tmp0__target; #line 368 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = compare_func; -#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0__target = compare_func_target; -#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp0_ == NULL) { -#line 3021 "PhotoMetadata.c" - GeeHashSet* _tmp1_; + if (compare_func == NULL) { +#line 3360 "PhotoMetadata.c" + GeeHashSet* _tmp0_; #line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SET, GeeSet); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet); #line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL); #line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3033,18 +3372,18 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa compare_func_target_destroy_notify = NULL; #line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3037 "PhotoMetadata.c" +#line 3376 "PhotoMetadata.c" } else { - GCompareDataFunc _tmp2_; - void* _tmp2__target; - GDestroyNotify _tmp2__target_destroy_notify; - GeeTreeSet* _tmp3_; + GCompareDataFunc _tmp1_; + void* _tmp1__target; + GDestroyNotify _tmp1__target_destroy_notify; + GeeTreeSet* _tmp2_; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = compare_func; + _tmp1_ = compare_func; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2__target = compare_func_target; + _tmp1__target = compare_func_target; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2__target_destroy_notify = compare_func_target_destroy_notify; + _tmp1__target_destroy_notify = compare_func_target_destroy_notify; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func = NULL; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3052,9 +3391,9 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target_destroy_notify = NULL; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, _tmp2_, _tmp2__target, _tmp2__target_destroy_notify); + _tmp2_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, _tmp1_, _tmp1__target, _tmp1__target_destroy_notify); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_SET, GeeSet); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_SET, GeeSet); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3065,7 +3404,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa compare_func_target_destroy_notify = NULL; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3069 "PhotoMetadata.c" +#line 3408 "PhotoMetadata.c" } #line 368 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL); @@ -3075,26 +3414,31 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa compare_func_target = NULL; #line 368 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target_destroy_notify = NULL; -#line 3079 "PhotoMetadata.c" +#line 3418 "PhotoMetadata.c" } -GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain domain, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify) { +GeeCollection* +photo_metadata_get_tags (PhotoMetadata* self, + MetadataDomain domain, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify) +{ GeeCollection* result = NULL; gchar** tags = NULL; gint tags_length1; gint _tags_size_; - MetadataDomain _tmp0_; - gboolean _tmp10_ = FALSE; - gchar** _tmp11_; - gint _tmp11__length1; + gboolean _tmp9_ = FALSE; + gchar** _tmp10_; + gint _tmp10__length1; GeeCollection* collection = NULL; - GCompareDataFunc _tmp13_; - void* _tmp13__target; - GDestroyNotify _tmp13__target_destroy_notify; - GeeSet* _tmp14_; - gchar** _tmp15_; - gint _tmp15__length1; + GCompareDataFunc _tmp12_; + void* _tmp12__target; + GDestroyNotify _tmp12__target_destroy_notify; + GeeSet* _tmp13_; + gchar** _tmp14_; + gint _tmp14__length1; #line 376 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 378 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3104,105 +3448,103 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma #line 378 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tags_size_ = tags_length1; #line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = domain; -#line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - switch (_tmp0_) { + switch (domain) { #line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 3113 "PhotoMetadata.c" +#line 3455 "PhotoMetadata.c" { - GExiv2Metadata* _tmp1_; + GExiv2Metadata* _tmp0_; + gchar** _tmp1_; gchar** _tmp2_; - gchar** _tmp3_; #line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = self->priv->exiv2; + _tmp0_ = self->priv->exiv2; #line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _tmp2_ = gexiv2_metadata_get_exif_tags (_tmp1_); + _tmp2_ = _tmp1_ = gexiv2_metadata_get_exif_tags (_tmp0_); #line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL); #line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tags = _tmp3_; + tags = _tmp2_; #line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tags_length1 = _vala_array_length (_tmp2_); + tags_length1 = _vala_array_length (_tmp1_); #line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tags_size_ = tags_length1; #line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 3132 "PhotoMetadata.c" +#line 3474 "PhotoMetadata.c" } #line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 3136 "PhotoMetadata.c" +#line 3478 "PhotoMetadata.c" { - GExiv2Metadata* _tmp4_; + GExiv2Metadata* _tmp3_; + gchar** _tmp4_; gchar** _tmp5_; - gchar** _tmp6_; #line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = self->priv->exiv2; + _tmp3_ = self->priv->exiv2; #line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = _tmp5_ = gexiv2_metadata_get_xmp_tags (_tmp4_); + _tmp5_ = _tmp4_ = gexiv2_metadata_get_xmp_tags (_tmp3_); #line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL); #line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tags = _tmp6_; + tags = _tmp5_; #line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tags_length1 = _vala_array_length (_tmp5_); + tags_length1 = _vala_array_length (_tmp4_); #line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tags_size_ = tags_length1; #line 386 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 3155 "PhotoMetadata.c" +#line 3497 "PhotoMetadata.c" } #line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 3159 "PhotoMetadata.c" +#line 3501 "PhotoMetadata.c" { - GExiv2Metadata* _tmp7_; + GExiv2Metadata* _tmp6_; + gchar** _tmp7_; gchar** _tmp8_; - gchar** _tmp9_; #line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = self->priv->exiv2; + _tmp6_ = self->priv->exiv2; #line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = _tmp8_ = gexiv2_metadata_get_iptc_tags (_tmp7_); + _tmp8_ = _tmp7_ = gexiv2_metadata_get_iptc_tags (_tmp6_); #line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL); #line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tags = _tmp9_; + tags = _tmp8_; #line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tags_length1 = _vala_array_length (_tmp8_); + tags_length1 = _vala_array_length (_tmp7_); #line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tags_size_ = tags_length1; #line 390 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 3178 "PhotoMetadata.c" +#line 3520 "PhotoMetadata.c" } default: #line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 3183 "PhotoMetadata.c" +#line 3525 "PhotoMetadata.c" } #line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = tags; + _tmp10_ = tags; #line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11__length1 = tags_length1; + _tmp10__length1 = tags_length1; #line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp11_ == NULL) { + if (_tmp10_ == NULL) { #line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = TRUE; -#line 3193 "PhotoMetadata.c" + _tmp9_ = TRUE; +#line 3535 "PhotoMetadata.c" } else { - gchar** _tmp12_; - gint _tmp12__length1; + gchar** _tmp11_; + gint _tmp11__length1; #line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = tags; + _tmp11_ = tags; #line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12__length1 = tags_length1; + _tmp11__length1 = tags_length1; #line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = _tmp12__length1 == 0; -#line 3203 "PhotoMetadata.c" + _tmp9_ = _tmp11__length1 == 0; +#line 3545 "PhotoMetadata.c" } #line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp10_) { + if (_tmp9_) { #line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; #line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3217,14 +3559,14 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma compare_func_target_destroy_notify = NULL; #line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3221 "PhotoMetadata.c" +#line 3563 "PhotoMetadata.c" } #line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = compare_func; + _tmp12_ = compare_func; #line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13__target = compare_func_target; + _tmp12__target = compare_func_target; #line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13__target_destroy_notify = compare_func_target_destroy_notify; + _tmp12__target_destroy_notify = compare_func_target_destroy_notify; #line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func = NULL; #line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3232,45 +3574,45 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma #line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target_destroy_notify = NULL; #line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = photo_metadata_create_string_set (self, _tmp13_, _tmp13__target, _tmp13__target_destroy_notify); + _tmp13_ = photo_metadata_create_string_set (self, _tmp12_, _tmp12__target, _tmp12__target_destroy_notify); #line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - collection = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection); + collection = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection); #line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = tags; + _tmp14_ = tags; #line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15__length1 = tags_length1; -#line 3243 "PhotoMetadata.c" + _tmp14__length1 = tags_length1; +#line 3585 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; #line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection = _tmp15_; + tag_collection = _tmp14_; #line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection_length1 = _tmp15__length1; + tag_collection_length1 = _tmp14__length1; #line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (tag_it = 0; tag_it < _tmp15__length1; tag_it = tag_it + 1) { -#line 3255 "PhotoMetadata.c" - gchar* _tmp16_; + for (tag_it = 0; tag_it < _tmp14__length1; tag_it = tag_it + 1) { +#line 3597 "PhotoMetadata.c" + gchar* _tmp15_; gchar* tag = NULL; #line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = g_strdup (tag_collection[tag_it]); + _tmp15_ = g_strdup (tag_collection[tag_it]); #line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag = _tmp16_; -#line 3262 "PhotoMetadata.c" + tag = _tmp15_; +#line 3604 "PhotoMetadata.c" { - GeeCollection* _tmp17_; - const gchar* _tmp18_; + GeeCollection* _tmp16_; + const gchar* _tmp17_; #line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = collection; + _tmp16_ = collection; #line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = tag; + _tmp17_ = tag; #line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gee_collection_add (_tmp17_, _tmp18_); + gee_collection_add (_tmp16_, _tmp17_); #line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 3274 "PhotoMetadata.c" +#line 3616 "PhotoMetadata.c" } } } @@ -3288,11 +3630,16 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma compare_func_target_destroy_notify = NULL; #line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3292 "PhotoMetadata.c" +#line 3634 "PhotoMetadata.c" } -GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify) { +GeeCollection* +photo_metadata_get_all_tags (PhotoMetadata* self, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify) +{ GeeCollection* result = NULL; GeeCollection* all_tags = NULL; GCompareDataFunc _tmp0_; @@ -3342,7 +3689,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp4_ = exif_tags; #line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_ != NULL) { -#line 3346 "PhotoMetadata.c" +#line 3693 "PhotoMetadata.c" GeeCollection* _tmp5_; gint _tmp6_; gint _tmp7_; @@ -3354,15 +3701,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp7_ = _tmp6_; #line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp7_ > 0; -#line 3358 "PhotoMetadata.c" +#line 3705 "PhotoMetadata.c" } else { #line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = FALSE; -#line 3362 "PhotoMetadata.c" +#line 3709 "PhotoMetadata.c" } #line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_) { -#line 3366 "PhotoMetadata.c" +#line 3713 "PhotoMetadata.c" GeeCollection* _tmp8_; GeeCollection* _tmp9_; #line 409 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3371,7 +3718,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp9_ = exif_tags; #line 409 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add_all (_tmp8_, _tmp9_); -#line 3375 "PhotoMetadata.c" +#line 3722 "PhotoMetadata.c" } #line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = photo_metadata_get_tags (self, METADATA_DOMAIN_XMP, NULL, NULL, NULL); @@ -3381,7 +3728,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp12_ = xmp_tags; #line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp12_ != NULL) { -#line 3385 "PhotoMetadata.c" +#line 3732 "PhotoMetadata.c" GeeCollection* _tmp13_; gint _tmp14_; gint _tmp15_; @@ -3393,15 +3740,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp15_ = _tmp14_; #line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = _tmp15_ > 0; -#line 3397 "PhotoMetadata.c" +#line 3744 "PhotoMetadata.c" } else { #line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = FALSE; -#line 3401 "PhotoMetadata.c" +#line 3748 "PhotoMetadata.c" } #line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp11_) { -#line 3405 "PhotoMetadata.c" +#line 3752 "PhotoMetadata.c" GeeCollection* _tmp16_; GeeCollection* _tmp17_; #line 413 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3410,7 +3757,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp17_ = xmp_tags; #line 413 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add_all (_tmp16_, _tmp17_); -#line 3414 "PhotoMetadata.c" +#line 3761 "PhotoMetadata.c" } #line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = photo_metadata_get_tags (self, METADATA_DOMAIN_IPTC, NULL, NULL, NULL); @@ -3420,7 +3767,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp20_ = iptc_tags; #line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp20_ != NULL) { -#line 3424 "PhotoMetadata.c" +#line 3771 "PhotoMetadata.c" GeeCollection* _tmp21_; gint _tmp22_; gint _tmp23_; @@ -3432,15 +3779,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp23_ = _tmp22_; #line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = _tmp23_ > 0; -#line 3436 "PhotoMetadata.c" +#line 3783 "PhotoMetadata.c" } else { #line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = FALSE; -#line 3440 "PhotoMetadata.c" +#line 3787 "PhotoMetadata.c" } #line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp19_) { -#line 3444 "PhotoMetadata.c" +#line 3791 "PhotoMetadata.c" GeeCollection* _tmp24_; GeeCollection* _tmp25_; #line 417 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3449,7 +3796,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp25_ = iptc_tags; #line 417 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add_all (_tmp24_, _tmp25_); -#line 3453 "PhotoMetadata.c" +#line 3800 "PhotoMetadata.c" } #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp27_ = all_tags; @@ -3459,17 +3806,17 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp29_ = _tmp28_; #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp29_ > 0) { -#line 3463 "PhotoMetadata.c" +#line 3810 "PhotoMetadata.c" GeeCollection* _tmp30_; #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp30_ = all_tags; #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = _tmp30_; -#line 3469 "PhotoMetadata.c" +#line 3816 "PhotoMetadata.c" } else { #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = NULL; -#line 3473 "PhotoMetadata.c" +#line 3820 "PhotoMetadata.c" } #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp31_ = _g_object_ref0 (_tmp26_); @@ -3493,65 +3840,67 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun compare_func_target_destroy_notify = NULL; #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3497 "PhotoMetadata.c" +#line 3844 "PhotoMetadata.c" } -gchar* photo_metadata_get_tag_label (PhotoMetadata* self, const gchar* tag) { +gchar* +photo_metadata_get_tag_label (PhotoMetadata* self, + const gchar* tag) +{ gchar* result = NULL; const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp1_; #line 422 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 422 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, NULL); #line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; -#line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = gexiv2_metadata_get_tag_label (_tmp0_); + _tmp0_ = gexiv2_metadata_get_tag_label (tag); #line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_tmp0_); #line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp2_; + result = _tmp1_; #line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3520 "PhotoMetadata.c" +#line 3867 "PhotoMetadata.c" } -gchar* photo_metadata_get_tag_description (PhotoMetadata* self, const gchar* tag) { +gchar* +photo_metadata_get_tag_description (PhotoMetadata* self, + const gchar* tag) +{ gchar* result = NULL; const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp1_; #line 426 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 426 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, NULL); #line 427 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; -#line 427 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = gexiv2_metadata_get_tag_description (_tmp0_); + _tmp0_ = gexiv2_metadata_get_tag_description (tag); #line 427 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_tmp0_); #line 427 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp2_; + result = _tmp1_; #line 427 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3543 "PhotoMetadata.c" +#line 3890 "PhotoMetadata.c" } -gchar* photo_metadata_get_string (PhotoMetadata* self, const gchar* tag, PrepareInputTextOptions options) { +gchar* +photo_metadata_get_string (PhotoMetadata* self, + const gchar* tag, + PrepareInputTextOptions options) +{ gchar* result = NULL; GExiv2Metadata* _tmp0_; - const gchar* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - PrepareInputTextOptions _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; + gchar* _tmp4_; #line 430 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 430 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3559,36 +3908,34 @@ gchar* photo_metadata_get_string (PhotoMetadata* self, const gchar* tag, Prepare #line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = tag; + _tmp1_ = gexiv2_metadata_get_tag_string (_tmp0_, tag); #line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = gexiv2_metadata_get_tag_string (_tmp0_, _tmp1_); + _tmp2_ = _tmp1_; #line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _tmp2_; -#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = options; + _tmp3_ = prepare_input_text (_tmp2_, options, DEFAULT_USER_TEXT_INPUT_LENGTH); #line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = prepare_input_text (_tmp3_, _tmp4_, DEFAULT_USER_TEXT_INPUT_LENGTH); -#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp6_; + result = _tmp4_; #line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3580 "PhotoMetadata.c" +#line 3925 "PhotoMetadata.c" } -gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, const gchar* tag, PrepareInputTextOptions options) { +gchar* +photo_metadata_get_string_interpreted (PhotoMetadata* self, + const gchar* tag, + PrepareInputTextOptions options) +{ gchar* result = NULL; GExiv2Metadata* _tmp0_; - const gchar* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - PrepareInputTextOptions _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; + gchar* _tmp4_; #line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3596,85 +3943,79 @@ gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, const gchar* #line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = tag; -#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = gexiv2_metadata_get_tag_interpreted_string (_tmp0_, _tmp1_); -#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _tmp2_; + _tmp1_ = gexiv2_metadata_get_tag_interpreted_string (_tmp0_, tag); #line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = options; + _tmp2_ = _tmp1_; #line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = prepare_input_text (_tmp3_, _tmp4_, DEFAULT_USER_TEXT_INPUT_LENGTH); + _tmp3_ = prepare_input_text (_tmp2_, options, DEFAULT_USER_TEXT_INPUT_LENGTH); #line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp6_; + result = _tmp4_; #line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3617 "PhotoMetadata.c" +#line 3960 "PhotoMetadata.c" } -gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int tags_length1) { +gchar* +photo_metadata_get_first_string (PhotoMetadata* self, + gchar** tags, + int tags_length1) +{ gchar* result = NULL; - gchar** _tmp0_; - gint _tmp0__length1; #line 438 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tags; -#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0__length1 = tags_length1; -#line 3631 "PhotoMetadata.c" +#line 3972 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; #line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection = _tmp0_; + tag_collection = tags; #line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection_length1 = _tmp0__length1; + tag_collection_length1 = tags_length1; #line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 3643 "PhotoMetadata.c" - gchar* _tmp1_; + for (tag_it = 0; tag_it < tags_length1; tag_it = tag_it + 1) { +#line 3984 "PhotoMetadata.c" + gchar* _tmp0_; gchar* tag = NULL; #line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (tag_collection[tag_it]); + _tmp0_ = g_strdup (tag_collection[tag_it]); #line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag = _tmp1_; -#line 3650 "PhotoMetadata.c" + tag = _tmp0_; +#line 3991 "PhotoMetadata.c" { gchar* value = NULL; - const gchar* _tmp2_; - gchar* _tmp3_; - const gchar* _tmp4_; + const gchar* _tmp1_; + gchar* _tmp2_; + const gchar* _tmp3_; #line 440 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tag; + _tmp1_ = tag; #line 440 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = photo_metadata_get_string (self, _tmp2_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); + _tmp2_ = photo_metadata_get_string (self, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 440 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - value = _tmp3_; + value = _tmp2_; #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = value; + _tmp3_ = value; #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_ != NULL) { + if (_tmp3_ != NULL) { #line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = value; #line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); #line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3672 "PhotoMetadata.c" +#line 4013 "PhotoMetadata.c" } #line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); #line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 3678 "PhotoMetadata.c" +#line 4019 "PhotoMetadata.c" } } } @@ -3682,68 +4023,66 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t result = NULL; #line 445 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3686 "PhotoMetadata.c" +#line 4027 "PhotoMetadata.c" } -gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar** tags, int tags_length1) { +gchar* +photo_metadata_get_first_string_interpreted (PhotoMetadata* self, + gchar** tags, + int tags_length1) +{ gchar* result = NULL; - gchar** _tmp0_; - gint _tmp0__length1; #line 448 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tags; -#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0__length1 = tags_length1; -#line 3700 "PhotoMetadata.c" +#line 4039 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; #line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection = _tmp0_; + tag_collection = tags; #line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection_length1 = _tmp0__length1; + tag_collection_length1 = tags_length1; #line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 3712 "PhotoMetadata.c" - gchar* _tmp1_; + for (tag_it = 0; tag_it < tags_length1; tag_it = tag_it + 1) { +#line 4051 "PhotoMetadata.c" + gchar* _tmp0_; gchar* tag = NULL; #line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (tag_collection[tag_it]); + _tmp0_ = g_strdup (tag_collection[tag_it]); #line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag = _tmp1_; -#line 3719 "PhotoMetadata.c" + tag = _tmp0_; +#line 4058 "PhotoMetadata.c" { gchar* value = NULL; - const gchar* _tmp2_; - gchar* _tmp3_; - const gchar* _tmp4_; + const gchar* _tmp1_; + gchar* _tmp2_; + const gchar* _tmp3_; #line 450 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tag; + _tmp1_ = tag; #line 450 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = photo_metadata_get_string_interpreted (self, _tmp2_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); + _tmp2_ = photo_metadata_get_string_interpreted (self, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 450 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - value = _tmp3_; + value = _tmp2_; #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = value; + _tmp3_ = value; #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_ != NULL) { + if (_tmp3_ != NULL) { #line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = value; #line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); #line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3741 "PhotoMetadata.c" +#line 4080 "PhotoMetadata.c" } #line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); #line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 3747 "PhotoMetadata.c" +#line 4086 "PhotoMetadata.c" } } } @@ -3751,33 +4090,35 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar** result = NULL; #line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3755 "PhotoMetadata.c" +#line 4094 "PhotoMetadata.c" } -GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* tag) { +GeeList* +photo_metadata_get_string_multiple (PhotoMetadata* self, + const gchar* tag) +{ GeeList* result = NULL; gchar** values = NULL; GExiv2Metadata* _tmp0_; - const gchar* _tmp1_; + gchar** _tmp1_; gchar** _tmp2_; - gchar** _tmp3_; gint values_length1; gint _values_size_; - gboolean _tmp4_ = FALSE; - gchar** _tmp5_; - gint _tmp5__length1; + gboolean _tmp3_ = FALSE; + gchar** _tmp4_; + gint _tmp4__length1; GeeList* list = NULL; - GeeArrayList* _tmp7_; + GeeArrayList* _tmp6_; GeeHashSet* collection = NULL; - GeeHashSet* _tmp8_; - gchar** _tmp9_; - gint _tmp9__length1; - GeeList* _tmp22_ = NULL; - GeeList* _tmp23_; - gint _tmp24_; - gint _tmp25_; - GeeList* _tmp27_; + GeeHashSet* _tmp7_; + gchar** _tmp8_; + gint _tmp8__length1; + GeeList* _tmp20_ = NULL; + GeeList* _tmp21_; + gint _tmp22_; + gint _tmp23_; + GeeList* _tmp25_; #line 464 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 464 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3785,164 +4126,159 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t #line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = tag; -#line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _tmp2_ = gexiv2_metadata_get_tag_multiple (_tmp0_, _tmp1_); + _tmp2_ = _tmp1_ = gexiv2_metadata_get_tag_multiple (_tmp0_, tag); #line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - values = _tmp3_; + values = _tmp2_; #line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - values_length1 = _vala_array_length (_tmp2_); + values_length1 = _vala_array_length (_tmp1_); #line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _values_size_ = values_length1; #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = values; + _tmp4_ = values; #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5__length1 = values_length1; + _tmp4__length1 = values_length1; #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp5_ == NULL) { + if (_tmp4_ == NULL) { #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = TRUE; -#line 3806 "PhotoMetadata.c" + _tmp3_ = TRUE; +#line 4145 "PhotoMetadata.c" } else { - gchar** _tmp6_; - gint _tmp6__length1; + gchar** _tmp5_; + gint _tmp5__length1; #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = values; + _tmp5_ = values; #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6__length1 = values_length1; + _tmp5__length1 = values_length1; #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = _tmp6__length1 == 0; -#line 3816 "PhotoMetadata.c" + _tmp3_ = _tmp5__length1 == 0; +#line 4155 "PhotoMetadata.c" } #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_) { + if (_tmp3_) { #line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; #line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL); #line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3826 "PhotoMetadata.c" +#line 4165 "PhotoMetadata.c" } #line 469 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp6_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 469 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - list = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_LIST, GeeList); + list = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList); #line 471 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp7_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 471 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - collection = _tmp8_; + collection = _tmp7_; #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = values; + _tmp8_ = values; #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9__length1 = values_length1; -#line 3840 "PhotoMetadata.c" + _tmp8__length1 = values_length1; +#line 4179 "PhotoMetadata.c" { gchar** value_collection = NULL; gint value_collection_length1 = 0; gint _value_collection_size_ = 0; gint value_it = 0; #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - value_collection = _tmp9_; + value_collection = _tmp8_; #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - value_collection_length1 = _tmp9__length1; + value_collection_length1 = _tmp8__length1; #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (value_it = 0; value_it < _tmp9__length1; value_it = value_it + 1) { -#line 3852 "PhotoMetadata.c" - gchar* _tmp10_; + for (value_it = 0; value_it < _tmp8__length1; value_it = value_it + 1) { +#line 4191 "PhotoMetadata.c" + gchar* _tmp9_; gchar* value = NULL; #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = g_strdup (value_collection[value_it]); + _tmp9_ = g_strdup (value_collection[value_it]); #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - value = _tmp10_; -#line 3859 "PhotoMetadata.c" + value = _tmp9_; +#line 4198 "PhotoMetadata.c" { gchar* prepped = NULL; - const gchar* _tmp11_; - gchar* _tmp12_; - gboolean _tmp13_ = FALSE; - const gchar* _tmp14_; + const gchar* _tmp10_; + gchar* _tmp11_; + gboolean _tmp12_ = FALSE; + const gchar* _tmp13_; #line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = value; + _tmp10_ = value; #line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = prepare_input_text (_tmp11_, PHOTO_METADATA_PREPARE_STRING_OPTIONS, DEFAULT_USER_TEXT_INPUT_LENGTH); + _tmp11_ = prepare_input_text (_tmp10_, PHOTO_METADATA_PREPARE_STRING_OPTIONS, DEFAULT_USER_TEXT_INPUT_LENGTH); #line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - prepped = _tmp12_; + prepped = _tmp11_; #line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = prepped; + _tmp13_ = prepped; #line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp14_ != NULL) { -#line 3876 "PhotoMetadata.c" - GeeHashSet* _tmp15_; - const gchar* _tmp16_; - gboolean _tmp17_; -#line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = collection; + if (_tmp13_ != NULL) { +#line 4215 "PhotoMetadata.c" + GeeHashSet* _tmp14_; + const gchar* _tmp15_; #line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = prepped; + _tmp14_ = collection; #line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_); + _tmp15_ = prepped; #line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = !_tmp17_; -#line 3888 "PhotoMetadata.c" + _tmp12_ = !gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); +#line 4224 "PhotoMetadata.c" } else { #line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = FALSE; -#line 3892 "PhotoMetadata.c" + _tmp12_ = FALSE; +#line 4228 "PhotoMetadata.c" } #line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp13_) { -#line 3896 "PhotoMetadata.c" - GeeList* _tmp18_; + if (_tmp12_) { +#line 4232 "PhotoMetadata.c" + GeeList* _tmp16_; + const gchar* _tmp17_; + GeeHashSet* _tmp18_; const gchar* _tmp19_; - GeeHashSet* _tmp20_; - const gchar* _tmp21_; #line 477 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = list; + _tmp16_ = list; #line 477 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = prepped; + _tmp17_ = prepped; #line 477 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_); #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = collection; + _tmp18_ = collection; #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp21_ = prepped; + _tmp19_ = prepped; #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); -#line 3913 "PhotoMetadata.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_); +#line 4249 "PhotoMetadata.c" } #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (prepped); #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); -#line 3919 "PhotoMetadata.c" +#line 4255 "PhotoMetadata.c" } } } #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23_ = list; + _tmp21_ = list; #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp24_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp22_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp25_ = _tmp24_; + _tmp23_ = _tmp22_; #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp25_ > 0) { -#line 3931 "PhotoMetadata.c" - GeeList* _tmp26_; + if (_tmp23_ > 0) { +#line 4267 "PhotoMetadata.c" + GeeList* _tmp24_; #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp26_ = list; + _tmp24_ = list; #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = _tmp26_; -#line 3937 "PhotoMetadata.c" + _tmp20_ = _tmp24_; +#line 4273 "PhotoMetadata.c" } else { #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = NULL; -#line 3941 "PhotoMetadata.c" + _tmp20_ = NULL; +#line 4277 "PhotoMetadata.c" } #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp27_ = _g_object_ref0 (_tmp22_); + _tmp25_ = _g_object_ref0 (_tmp20_); #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp27_; + result = _tmp25_; #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (collection); #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3951,89 +4287,87 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL); #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3955 "PhotoMetadata.c" +#line 4291 "PhotoMetadata.c" } -GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar** tags, int tags_length1) { +GeeList* +photo_metadata_get_first_string_multiple (PhotoMetadata* self, + gchar** tags, + int tags_length1) +{ GeeList* result = NULL; - gchar** _tmp0_; - gint _tmp0__length1; #line 491 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tags; -#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0__length1 = tags_length1; -#line 3969 "PhotoMetadata.c" +#line 4303 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; #line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection = _tmp0_; + tag_collection = tags; #line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection_length1 = _tmp0__length1; + tag_collection_length1 = tags_length1; #line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 3981 "PhotoMetadata.c" - gchar* _tmp1_; + for (tag_it = 0; tag_it < tags_length1; tag_it = tag_it + 1) { +#line 4315 "PhotoMetadata.c" + gchar* _tmp0_; gchar* tag = NULL; #line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (tag_collection[tag_it]); + _tmp0_ = g_strdup (tag_collection[tag_it]); #line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag = _tmp1_; -#line 3988 "PhotoMetadata.c" + tag = _tmp0_; +#line 4322 "PhotoMetadata.c" { GeeList* values = NULL; - const gchar* _tmp2_; - GeeList* _tmp3_; - gboolean _tmp4_ = FALSE; - GeeList* _tmp5_; + const gchar* _tmp1_; + GeeList* _tmp2_; + gboolean _tmp3_ = FALSE; + GeeList* _tmp4_; #line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tag; + _tmp1_ = tag; #line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = photo_metadata_get_string_multiple (self, _tmp2_); + _tmp2_ = photo_metadata_get_string_multiple (self, _tmp1_); #line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - values = _tmp3_; + values = _tmp2_; #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = values; + _tmp4_ = values; #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp5_ != NULL) { -#line 4005 "PhotoMetadata.c" - GeeList* _tmp6_; + if (_tmp4_ != NULL) { +#line 4339 "PhotoMetadata.c" + GeeList* _tmp5_; + gint _tmp6_; gint _tmp7_; - gint _tmp8_; #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = values; + _tmp5_ = values; #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = _tmp8_ > 0; -#line 4017 "PhotoMetadata.c" + _tmp3_ = _tmp7_ > 0; +#line 4351 "PhotoMetadata.c" } else { #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = FALSE; -#line 4021 "PhotoMetadata.c" + _tmp3_ = FALSE; +#line 4355 "PhotoMetadata.c" } #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_) { + if (_tmp3_) { #line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = values; #line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); #line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4031 "PhotoMetadata.c" +#line 4365 "PhotoMetadata.c" } #line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); #line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 4037 "PhotoMetadata.c" +#line 4371 "PhotoMetadata.c" } } } @@ -4041,20 +4375,21 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar** result = NULL; #line 498 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4045 "PhotoMetadata.c" +#line 4379 "PhotoMetadata.c" } -void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gchar* value, PrepareInputTextOptions options) { +void +photo_metadata_set_string (PhotoMetadata* self, + const gchar* tag, + const gchar* value, + PrepareInputTextOptions options) +{ gchar* prepped = NULL; - const gchar* _tmp0_; - PrepareInputTextOptions _tmp1_; - gchar* _tmp2_; + gchar* _tmp0_; + const gchar* _tmp1_; + GExiv2Metadata* _tmp2_; const gchar* _tmp3_; - GExiv2Metadata* _tmp6_; - const gchar* _tmp7_; - const gchar* _tmp8_; - gboolean _tmp9_; #line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4062,296 +4397,203 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch #line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (value != NULL); #line 502 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = value; -#line 502 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = options; + _tmp0_ = prepare_input_text (value, options, DEFAULT_USER_TEXT_INPUT_LENGTH); #line 502 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = prepare_input_text (_tmp0_, _tmp1_, DEFAULT_USER_TEXT_INPUT_LENGTH); -#line 502 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - prepped = _tmp2_; + prepped = _tmp0_; #line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = prepped; + _tmp1_ = prepped; #line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp3_ == NULL) { -#line 4077 "PhotoMetadata.c" - const gchar* _tmp4_; - const gchar* _tmp5_; -#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = tag; -#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = value; + if (_tmp1_ == NULL) { #line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_warning ("PhotoMetadata.vala:504: Not setting tag %s to string %s: invalid UTF-8", _tmp4_, _tmp5_); + g_warning ("PhotoMetadata.vala:504: Not setting tag %s to string %s: invalid UTF-8", tag, value); #line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (prepped); #line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 4090 "PhotoMetadata.c" +#line 4414 "PhotoMetadata.c" } #line 509 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = self->priv->exiv2; -#line 509 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = tag; -#line 509 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = prepped; + _tmp2_ = self->priv->exiv2; #line 509 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = gexiv2_metadata_set_tag_string (_tmp6_, _tmp7_, _tmp8_); + _tmp3_ = prepped; #line 509 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp9_) { -#line 4102 "PhotoMetadata.c" - const gchar* _tmp10_; - const gchar* _tmp11_; - const gchar* _tmp12_; -#line 510 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = tag; -#line 510 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = value; + if (!gexiv2_metadata_set_tag_string (_tmp2_, tag, _tmp3_)) { +#line 4422 "PhotoMetadata.c" + const gchar* _tmp4_; #line 510 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = self->priv->source_name; + _tmp4_ = self->priv->source_name; #line 510 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_warning ("PhotoMetadata.vala:510: Unable to set tag %s to string %s from source " \ -"%s", _tmp10_, _tmp11_, _tmp12_); -#line 4114 "PhotoMetadata.c" +"%s", tag, value, _tmp4_); +#line 4428 "PhotoMetadata.c" } #line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (prepped); -#line 4118 "PhotoMetadata.c" +#line 4432 "PhotoMetadata.c" } -static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, int tags_length1, PhotoMetadataSetOption option, PhotoMetadataSetGenericValue setter, void* setter_target) { +static void +photo_metadata_set_all_generic (PhotoMetadata* self, + gchar** tags, + int tags_length1, + PhotoMetadataSetOption option, + PhotoMetadataSetGenericValue setter, + void* setter_target) +{ gboolean written = FALSE; - gchar** _tmp0_; - gint _tmp0__length1; - gboolean _tmp9_ = FALSE; - gboolean _tmp10_ = FALSE; - PhotoMetadataSetOption _tmp11_; + gboolean _tmp4_ = FALSE; + gboolean _tmp5_ = FALSE; #line 515 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 516 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" written = FALSE; -#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tags; -#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0__length1 = tags_length1; -#line 4137 "PhotoMetadata.c" +#line 4451 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; #line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection = _tmp0_; + tag_collection = tags; #line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection_length1 = _tmp0__length1; + tag_collection_length1 = tags_length1; #line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 4149 "PhotoMetadata.c" - gchar* _tmp1_; + for (tag_it = 0; tag_it < tags_length1; tag_it = tag_it + 1) { +#line 4463 "PhotoMetadata.c" + gchar* _tmp0_; gchar* tag = NULL; #line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (tag_collection[tag_it]); + _tmp0_ = g_strdup (tag_collection[tag_it]); #line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag = _tmp1_; -#line 4156 "PhotoMetadata.c" + tag = _tmp0_; +#line 4470 "PhotoMetadata.c" { - gboolean _tmp2_ = FALSE; - PhotoMetadataSetOption _tmp3_; + gboolean _tmp1_ = FALSE; #line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = option; + if (option == PHOTO_METADATA_SET_OPTION_ALL_DOMAINS) { #line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp3_ == PHOTO_METADATA_SET_OPTION_ALL_DOMAINS) { -#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = TRUE; -#line 4166 "PhotoMetadata.c" + _tmp1_ = TRUE; +#line 4477 "PhotoMetadata.c" } else { - const gchar* _tmp4_; - MetadataDomain _tmp5_; - gboolean _tmp6_; -#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = tag; + const gchar* _tmp2_; #line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = photo_metadata_get_tag_domain (_tmp4_); + _tmp2_ = tag; #line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = photo_metadata_has_domain (self, _tmp5_); -#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = _tmp6_; -#line 4179 "PhotoMetadata.c" + _tmp1_ = photo_metadata_has_domain (self, photo_metadata_get_tag_domain (_tmp2_)); +#line 4484 "PhotoMetadata.c" } #line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp2_) { -#line 4183 "PhotoMetadata.c" - PhotoMetadataSetGenericValue _tmp7_; - void* _tmp7__target; - const gchar* _tmp8_; -#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = setter; -#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7__target = setter_target; + if (_tmp1_) { +#line 4488 "PhotoMetadata.c" + const gchar* _tmp3_; #line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = tag; + _tmp3_ = tag; #line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ (_tmp8_, _tmp7__target); + setter (_tmp3_, setter_target); #line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" written = TRUE; -#line 4197 "PhotoMetadata.c" +#line 4496 "PhotoMetadata.c" } #line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 4201 "PhotoMetadata.c" +#line 4500 "PhotoMetadata.c" } } } #line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = option; -#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp11_ == PHOTO_METADATA_SET_OPTION_AT_LEAST_DEFAULT_DOMAIN) { -#line 4209 "PhotoMetadata.c" - gboolean _tmp12_; + if (option == PHOTO_METADATA_SET_OPTION_AT_LEAST_DEFAULT_DOMAIN) { +#line 4506 "PhotoMetadata.c" + gboolean _tmp6_; #line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = written; + _tmp6_ = written; #line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = !_tmp12_; -#line 4215 "PhotoMetadata.c" + _tmp5_ = !_tmp6_; +#line 4512 "PhotoMetadata.c" } else { #line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = FALSE; -#line 4219 "PhotoMetadata.c" + _tmp5_ = FALSE; +#line 4516 "PhotoMetadata.c" } #line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp10_) { -#line 4223 "PhotoMetadata.c" - gchar** _tmp13_; - gint _tmp13__length1; -#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = tags; -#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13__length1 = tags_length1; + if (_tmp5_) { #line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = _tmp13__length1 > 0; -#line 4232 "PhotoMetadata.c" + _tmp4_ = tags_length1 > 0; +#line 4522 "PhotoMetadata.c" } else { #line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = FALSE; -#line 4236 "PhotoMetadata.c" + _tmp4_ = FALSE; +#line 4526 "PhotoMetadata.c" } #line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp9_) { -#line 4240 "PhotoMetadata.c" + if (_tmp4_) { +#line 4530 "PhotoMetadata.c" MetadataDomain default_domain = 0; - gchar** _tmp14_; - gint _tmp14__length1; - const gchar* _tmp15_; - MetadataDomain _tmp16_; - PhotoMetadataSetGenericValue _tmp17_; - void* _tmp17__target; - gchar** _tmp18_; - gint _tmp18__length1; - const gchar* _tmp19_; -#line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = tags; -#line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14__length1 = tags_length1; -#line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = _tmp14_[0]; + const gchar* _tmp7_; + const gchar* _tmp8_; #line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = photo_metadata_get_tag_domain (_tmp15_); + _tmp7_ = tags[0]; #line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - default_domain = _tmp16_; -#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = setter; -#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17__target = setter_target; -#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = tags; + default_domain = photo_metadata_get_tag_domain (_tmp7_); #line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18__length1 = tags_length1; + _tmp8_ = tags[0]; #line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = _tmp18_[0]; -#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ (_tmp19_, _tmp17__target); -#line 4273 "PhotoMetadata.c" + setter (_tmp8_, setter_target); +#line 4542 "PhotoMetadata.c" { gint ctr = 0; #line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ctr = 1; -#line 4278 "PhotoMetadata.c" +#line 4547 "PhotoMetadata.c" { - gboolean _tmp20_ = FALSE; + gboolean _tmp9_ = FALSE; #line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = TRUE; + _tmp9_ = TRUE; #line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 4285 "PhotoMetadata.c" - gint _tmp22_; - gchar** _tmp23_; - gint _tmp23__length1; - gchar** _tmp24_; - gint _tmp24__length1; - gint _tmp25_; - const gchar* _tmp26_; - MetadataDomain _tmp27_; - MetadataDomain _tmp28_; +#line 4554 "PhotoMetadata.c" + gint _tmp11_; + gint _tmp12_; + const gchar* _tmp13_; + MetadataDomain _tmp14_; #line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp20_) { -#line 4297 "PhotoMetadata.c" - gint _tmp21_; + if (!_tmp9_) { +#line 4561 "PhotoMetadata.c" + gint _tmp10_; #line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp21_ = ctr; + _tmp10_ = ctr; #line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - ctr = _tmp21_ + 1; -#line 4303 "PhotoMetadata.c" + ctr = _tmp10_ + 1; +#line 4567 "PhotoMetadata.c" } #line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = FALSE; -#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = ctr; + _tmp9_ = FALSE; #line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23_ = tags; + _tmp11_ = ctr; #line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23__length1 = tags_length1; -#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!(_tmp22_ < _tmp23__length1)) { + if (!(_tmp11_ < tags_length1)) { #line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 4317 "PhotoMetadata.c" +#line 4577 "PhotoMetadata.c" } #line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp24_ = tags; -#line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp24__length1 = tags_length1; -#line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp25_ = ctr; -#line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp26_ = _tmp24_[_tmp25_]; + _tmp12_ = ctr; #line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp27_ = photo_metadata_get_tag_domain (_tmp26_); + _tmp13_ = tags[_tmp12_]; #line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp28_ = default_domain; + _tmp14_ = default_domain; #line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp27_ == _tmp28_) { -#line 4333 "PhotoMetadata.c" - PhotoMetadataSetGenericValue _tmp29_; - void* _tmp29__target; - gchar** _tmp30_; - gint _tmp30__length1; - gint _tmp31_; - const gchar* _tmp32_; -#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp29_ = setter; -#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp29__target = setter_target; -#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp30_ = tags; -#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp30__length1 = tags_length1; + if (photo_metadata_get_tag_domain (_tmp13_) == _tmp14_) { +#line 4587 "PhotoMetadata.c" + gint _tmp15_; + const gchar* _tmp16_; #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp31_ = ctr; + _tmp15_ = ctr; #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp32_ = _tmp30_[_tmp31_]; + _tmp16_ = tags[_tmp15_]; #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp29_ (_tmp32_, _tmp29__target); -#line 4354 "PhotoMetadata.c" + setter (_tmp16_, setter_target); +#line 4596 "PhotoMetadata.c" } } } @@ -4360,21 +4602,25 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i } -static Block1Data* block1_data_ref (Block1Data* _data1_) { +static Block1Data* +block1_data_ref (Block1Data* _data1_) +{ #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&_data1_->_ref_count_); #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data1_; -#line 4368 "PhotoMetadata.c" +#line 4612 "PhotoMetadata.c" } -static void block1_data_unref (void * _userdata_) { +static void +block1_data_unref (void * _userdata_) +{ Block1Data* _data1_; _data1_ = (Block1Data*) _userdata_; #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { -#line 4377 "PhotoMetadata.c" +#line 4623 "PhotoMetadata.c" PhotoMetadata* self; #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data1_->self; @@ -4384,43 +4630,45 @@ static void block1_data_unref (void * _userdata_) { _media_metadata_unref0 (self); #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block1Data, _data1_); -#line 4387 "PhotoMetadata.c" +#line 4633 "PhotoMetadata.c" } } -static void __lambda5_ (Block1Data* _data1_, const gchar* tag) { +static void +__lambda5_ (Block1Data* _data1_, + const gchar* tag) +{ PhotoMetadata* self; - const gchar* _tmp0_; - const gchar* _tmp1_; #line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data1_->self; #line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); #line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; -#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = _data1_->value; -#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string (self, _tmp0_, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 4406 "PhotoMetadata.c" + photo_metadata_set_string (self, tag, _data1_->value, PHOTO_METADATA_PREPARE_STRING_OPTIONS); +#line 4649 "PhotoMetadata.c" } -static void ___lambda5__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { +static void +___lambda5__photo_metadata_set_generic_value (const gchar* tag, + gpointer self) +{ #line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __lambda5_ (self, tag); -#line 4413 "PhotoMetadata.c" +#line 4659 "PhotoMetadata.c" } -void photo_metadata_set_all_string (PhotoMetadata* self, gchar** tags, int tags_length1, const gchar* value, PhotoMetadataSetOption option) { +void +photo_metadata_set_all_string (PhotoMetadata* self, + gchar** tags, + int tags_length1, + const gchar* value, + PhotoMetadataSetOption option) +{ Block1Data* _data1_; - const gchar* _tmp0_; - gchar* _tmp1_; - gchar** _tmp2_; - gint _tmp2__length1; - PhotoMetadataSetOption _tmp3_; + gchar* _tmp0_; #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4432,77 +4680,81 @@ void photo_metadata_set_all_string (PhotoMetadata* self, gchar** tags, int tags_ #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data1_->self = media_metadata_ref (self); #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = value; -#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (value); #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_data1_->value); #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _data1_->value = _tmp1_; -#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tags; -#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2__length1 = tags_length1; -#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = option; + _data1_->value = _tmp0_; #line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_all_generic (self, _tmp2_, _tmp2__length1, _tmp3_, ___lambda5__photo_metadata_set_generic_value, _data1_); + photo_metadata_set_all_generic (self, tags, tags_length1, option, ___lambda5__photo_metadata_set_generic_value, _data1_); #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" block1_data_unref (_data1_); #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data1_ = NULL; -#line 4454 "PhotoMetadata.c" +#line 4694 "PhotoMetadata.c" } -static void _vala_array_add48 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add48 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if ((*length) == (*size)) { #line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *size = (*size) ? (2 * (*size)) : 4; #line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 4465 "PhotoMetadata.c" +#line 4710 "PhotoMetadata.c" } #line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (*array)[(*length)++] = value; #line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (*array)[*length] = NULL; -#line 4471 "PhotoMetadata.c" +#line 4716 "PhotoMetadata.c" } -static void _vala_array_add49 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add49 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if ((*length) == (*size)) { #line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *size = (*size) ? (2 * (*size)) : 4; #line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 4482 "PhotoMetadata.c" +#line 4732 "PhotoMetadata.c" } #line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (*array)[(*length)++] = value; #line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (*array)[*length] = NULL; -#line 4488 "PhotoMetadata.c" +#line 4738 "PhotoMetadata.c" } -void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, GeeCollection* collection) { +void +photo_metadata_set_string_multiple (PhotoMetadata* self, + const gchar* tag, + GeeCollection* collection) +{ gchar** values = NULL; gchar** _tmp0_; gint values_length1; gint _values_size_; + gchar** _tmp12_; + gint _tmp12__length1; + gchar** _tmp13_; + gint _tmp13__length1; + GExiv2Metadata* _tmp14_; gchar** _tmp15_; gint _tmp15__length1; - gchar** _tmp16_; - gint _tmp16__length1; - GExiv2Metadata* _tmp17_; - const gchar* _tmp18_; - gchar** _tmp19_; - gint _tmp19__length1; - gboolean _tmp20_; #line 542 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 542 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4517,161 +4769,149 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, values_length1 = 0; #line 543 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _values_size_ = values_length1; -#line 4520 "PhotoMetadata.c" +#line 4772 "PhotoMetadata.c" { GeeIterator* _value_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; -#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = collection; + GeeIterator* _tmp1_; #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (collection, GEE_TYPE_ITERABLE, GeeIterable)); #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _value_it = _tmp2_; + _value_it = _tmp1_; #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 4533 "PhotoMetadata.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 4782 "PhotoMetadata.c" + GeeIterator* _tmp2_; gchar* value = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; gchar* prepped = NULL; + const gchar* _tmp5_; + gchar* _tmp6_; const gchar* _tmp7_; - gchar* _tmp8_; - const gchar* _tmp9_; -#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _value_it; #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _value_it; #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 4551 "PhotoMetadata.c" +#line 4797 "PhotoMetadata.c" } #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = _value_it; + _tmp3_ = _value_it; #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - value = (gchar*) _tmp6_; + value = (gchar*) _tmp4_; #line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = value; + _tmp5_ = value; #line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = prepare_input_text (_tmp7_, PHOTO_METADATA_PREPARE_STRING_OPTIONS, -1); + _tmp6_ = prepare_input_text (_tmp5_, PHOTO_METADATA_PREPARE_STRING_OPTIONS, -1); #line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - prepped = _tmp8_; + prepped = _tmp6_; #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = prepped; + _tmp7_ = prepped; #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp9_ != NULL) { -#line 4569 "PhotoMetadata.c" - gchar** _tmp10_; - gint _tmp10__length1; - const gchar* _tmp11_; - gchar* _tmp12_; + if (_tmp7_ != NULL) { +#line 4815 "PhotoMetadata.c" + gchar** _tmp8_; + gint _tmp8__length1; + const gchar* _tmp9_; + gchar* _tmp10_; #line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = values; + _tmp8_ = values; #line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10__length1 = values_length1; + _tmp8__length1 = values_length1; #line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = prepped; + _tmp9_ = prepped; #line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = g_strdup (_tmp11_); + _tmp10_ = g_strdup (_tmp9_); #line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _vala_array_add48 (&values, &values_length1, &_values_size_, _tmp12_); -#line 4584 "PhotoMetadata.c" + _vala_array_add48 (&values, &values_length1, &_values_size_, _tmp10_); +#line 4830 "PhotoMetadata.c" } else { - const gchar* _tmp13_; - const gchar* _tmp14_; -#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = value; + const gchar* _tmp11_; #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = tag; + _tmp11_ = value; #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_warning ("PhotoMetadata.vala:549: Unable to set string %s to %s: invalid UTF-8", _tmp13_, _tmp14_); -#line 4594 "PhotoMetadata.c" + g_warning ("PhotoMetadata.vala:549: Unable to set string %s to %s: invalid UTF-8", _tmp11_, tag); +#line 4837 "PhotoMetadata.c" } #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (prepped); #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); -#line 4600 "PhotoMetadata.c" +#line 4843 "PhotoMetadata.c" } #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_value_it); -#line 4604 "PhotoMetadata.c" +#line 4847 "PhotoMetadata.c" } #line 552 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = values; + _tmp12_ = values; #line 552 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15__length1 = values_length1; + _tmp12__length1 = values_length1; #line 552 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp15__length1 == 0) { + if (_tmp12__length1 == 0) { #line 553 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL); #line 553 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 4616 "PhotoMetadata.c" +#line 4859 "PhotoMetadata.c" } #line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = values; + _tmp13_ = values; #line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16__length1 = values_length1; + _tmp13__length1 = values_length1; #line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_array_add49 (&values, &values_length1, &_values_size_, NULL); #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = self->priv->exiv2; -#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = tag; -#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = values; + _tmp14_ = self->priv->exiv2; #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19__length1 = values_length1; + _tmp15_ = values; #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = gexiv2_metadata_set_tag_multiple (_tmp17_, _tmp18_, _tmp19_); + _tmp15__length1 = values_length1; #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp20_) { -#line 4636 "PhotoMetadata.c" - gchar** _tmp21_; - gint _tmp21__length1; - const gchar* _tmp22_; - const gchar* _tmp23_; + if (!gexiv2_metadata_set_tag_multiple (_tmp14_, tag, _tmp15_)) { +#line 4875 "PhotoMetadata.c" + gchar** _tmp16_; + gint _tmp16__length1; + const gchar* _tmp17_; #line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp21_ = values; + _tmp16_ = values; #line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp21__length1 = values_length1; + _tmp16__length1 = values_length1; #line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = tag; -#line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23_ = self->priv->source_name; + _tmp17_ = self->priv->source_name; #line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_warning ("PhotoMetadata.vala:562: Unable to set %d strings to tag %s from source" \ -" %s", _tmp21__length1, _tmp22_, _tmp23_); -#line 4651 "PhotoMetadata.c" +" %s", _tmp16__length1, tag, _tmp17_); +#line 4887 "PhotoMetadata.c" } #line 542 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL); -#line 4655 "PhotoMetadata.c" +#line 4891 "PhotoMetadata.c" } -static Block2Data* block2_data_ref (Block2Data* _data2_) { +static Block2Data* +block2_data_ref (Block2Data* _data2_) +{ #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&_data2_->_ref_count_); #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data2_; -#line 4664 "PhotoMetadata.c" +#line 4902 "PhotoMetadata.c" } -static void block2_data_unref (void * _userdata_) { +static void +block2_data_unref (void * _userdata_) +{ Block2Data* _data2_; _data2_ = (Block2Data*) _userdata_; #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { -#line 4673 "PhotoMetadata.c" +#line 4913 "PhotoMetadata.c" PhotoMetadata* self; #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data2_->self; @@ -4681,43 +4921,45 @@ static void block2_data_unref (void * _userdata_) { _media_metadata_unref0 (self); #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block2Data, _data2_); -#line 4683 "PhotoMetadata.c" +#line 4923 "PhotoMetadata.c" } } -static void __lambda6_ (Block2Data* _data2_, const gchar* tag) { +static void +__lambda6_ (Block2Data* _data2_, + const gchar* tag) +{ PhotoMetadata* self; - const gchar* _tmp0_; - GeeCollection* _tmp1_; #line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data2_->self; #line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); #line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; -#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = _data2_->values; -#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string_multiple (self, _tmp0_, _tmp1_); -#line 4702 "PhotoMetadata.c" + photo_metadata_set_string_multiple (self, tag, _data2_->values); +#line 4939 "PhotoMetadata.c" } -static void ___lambda6__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { +static void +___lambda6__photo_metadata_set_generic_value (const gchar* tag, + gpointer self) +{ #line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __lambda6_ (self, tag); -#line 4709 "PhotoMetadata.c" +#line 4949 "PhotoMetadata.c" } -void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags, int tags_length1, GeeCollection* values, PhotoMetadataSetOption option) { +void +photo_metadata_set_all_string_multiple (PhotoMetadata* self, + gchar** tags, + int tags_length1, + GeeCollection* values, + PhotoMetadataSetOption option) +{ Block2Data* _data2_; GeeCollection* _tmp0_; - GeeCollection* _tmp1_; - gchar** _tmp2_; - gint _tmp2__length1; - PhotoMetadataSetOption _tmp3_; #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4729,47 +4971,35 @@ void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags, #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data2_->self = media_metadata_ref (self); #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = values; -#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (values); #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_data2_->values); #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _data2_->values = _tmp1_; -#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tags; + _data2_->values = _tmp0_; #line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2__length1 = tags_length1; -#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = option; -#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_all_generic (self, _tmp2_, _tmp2__length1, _tmp3_, ___lambda6__photo_metadata_set_generic_value, _data2_); + photo_metadata_set_all_generic (self, tags, tags_length1, option, ___lambda6__photo_metadata_set_generic_value, _data2_); #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" block2_data_unref (_data2_); #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data2_ = NULL; -#line 4750 "PhotoMetadata.c" +#line 4984 "PhotoMetadata.c" } -gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong* value) { +gboolean +photo_metadata_get_long (PhotoMetadata* self, + const gchar* tag, + glong* value) +{ glong _vala_value = 0L; gboolean result = FALSE; - const gchar* _tmp0_; - gboolean _tmp1_; - GExiv2Metadata* _tmp2_; - const gchar* _tmp3_; - glong _tmp4_; + GExiv2Metadata* _tmp0_; #line 569 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 569 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, FALSE); #line 570 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; -#line 570 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = photo_metadata_has_tag (self, _tmp0_); -#line 570 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp1_) { + if (!photo_metadata_has_tag (self, tag)) { #line 571 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_value = (glong) 0; #line 573 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4778,77 +5008,72 @@ gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong* if (value) { #line 573 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *value = _vala_value; -#line 4780 "PhotoMetadata.c" +#line 5010 "PhotoMetadata.c" } #line 573 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4784 "PhotoMetadata.c" +#line 5014 "PhotoMetadata.c" } #line 576 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = self->priv->exiv2; -#line 576 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = tag; -#line 576 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = gexiv2_metadata_get_tag_long (_tmp2_, _tmp3_); + _tmp0_ = self->priv->exiv2; #line 576 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _vala_value = _tmp4_; + _vala_value = gexiv2_metadata_get_tag_long (_tmp0_, tag); #line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = TRUE; #line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (value) { #line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *value = _vala_value; -#line 4800 "PhotoMetadata.c" +#line 5026 "PhotoMetadata.c" } #line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4804 "PhotoMetadata.c" +#line 5030 "PhotoMetadata.c" } -gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int tags_length1, glong* value) { +gboolean +photo_metadata_get_first_long (PhotoMetadata* self, + gchar** tags, + int tags_length1, + glong* value) +{ glong _vala_value = 0L; gboolean result = FALSE; - gchar** _tmp0_; - gint _tmp0__length1; #line 581 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tags; -#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0__length1 = tags_length1; -#line 4819 "PhotoMetadata.c" +#line 5044 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; #line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection = _tmp0_; + tag_collection = tags; #line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection_length1 = _tmp0__length1; + tag_collection_length1 = tags_length1; #line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 4831 "PhotoMetadata.c" - gchar* _tmp1_; + for (tag_it = 0; tag_it < tags_length1; tag_it = tag_it + 1) { +#line 5056 "PhotoMetadata.c" + gchar* _tmp0_; gchar* tag = NULL; #line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (tag_collection[tag_it]); + _tmp0_ = g_strdup (tag_collection[tag_it]); #line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag = _tmp1_; -#line 4838 "PhotoMetadata.c" + tag = _tmp0_; +#line 5063 "PhotoMetadata.c" { - const gchar* _tmp2_; - glong _tmp3_ = 0L; - gboolean _tmp4_; + const gchar* _tmp1_; + glong _tmp2_ = 0L; + gboolean _tmp3_; #line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tag; + _tmp1_ = tag; #line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = photo_metadata_get_long (self, _tmp2_, &_tmp3_); + _tmp3_ = photo_metadata_get_long (self, _tmp1_, &_tmp2_); #line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _vala_value = _tmp3_; + _vala_value = _tmp2_; #line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_) { + if (_tmp3_) { #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = TRUE; #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4857,15 +5082,15 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t if (value) { #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *value = _vala_value; -#line 4859 "PhotoMetadata.c" +#line 5084 "PhotoMetadata.c" } #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4863 "PhotoMetadata.c" +#line 5088 "PhotoMetadata.c" } #line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 4867 "PhotoMetadata.c" +#line 5092 "PhotoMetadata.c" } } } @@ -4877,19 +5102,20 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t if (value) { #line 589 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *value = _vala_value; -#line 4879 "PhotoMetadata.c" +#line 5104 "PhotoMetadata.c" } #line 589 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4883 "PhotoMetadata.c" +#line 5108 "PhotoMetadata.c" } -void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value) { +void +photo_metadata_set_long (PhotoMetadata* self, + const gchar* tag, + glong value) +{ GExiv2Metadata* _tmp0_; - const gchar* _tmp1_; - glong _tmp2_; - gboolean _tmp3_; #line 592 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 592 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4897,46 +5123,38 @@ void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value #line 593 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 593 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = tag; -#line 593 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = value; -#line 593 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = gexiv2_metadata_set_tag_long (_tmp0_, _tmp1_, _tmp2_); -#line 593 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp3_) { -#line 4906 "PhotoMetadata.c" - const gchar* _tmp4_; - glong _tmp5_; - const gchar* _tmp6_; -#line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = tag; -#line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = value; + if (!gexiv2_metadata_set_tag_long (_tmp0_, tag, value)) { +#line 5126 "PhotoMetadata.c" + const gchar* _tmp1_; #line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = self->priv->source_name; + _tmp1_ = self->priv->source_name; #line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_warning ("PhotoMetadata.vala:594: Unable to set tag %s to long %ld from source %" \ -"s", _tmp4_, _tmp5_, _tmp6_); -#line 4918 "PhotoMetadata.c" +"s", tag, value, _tmp1_); +#line 5132 "PhotoMetadata.c" } } -static Block3Data* block3_data_ref (Block3Data* _data3_) { +static Block3Data* +block3_data_ref (Block3Data* _data3_) +{ #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&_data3_->_ref_count_); #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data3_; -#line 4928 "PhotoMetadata.c" +#line 5144 "PhotoMetadata.c" } -static void block3_data_unref (void * _userdata_) { +static void +block3_data_unref (void * _userdata_) +{ Block3Data* _data3_; _data3_ = (Block3Data*) _userdata_; #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { -#line 4937 "PhotoMetadata.c" +#line 5155 "PhotoMetadata.c" PhotoMetadata* self; #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data3_->self; @@ -4944,42 +5162,44 @@ static void block3_data_unref (void * _userdata_) { _media_metadata_unref0 (self); #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block3Data, _data3_); -#line 4945 "PhotoMetadata.c" +#line 5163 "PhotoMetadata.c" } } -static void __lambda7_ (Block3Data* _data3_, const gchar* tag) { +static void +__lambda7_ (Block3Data* _data3_, + const gchar* tag) +{ PhotoMetadata* self; - const gchar* _tmp0_; - glong _tmp1_; #line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data3_->self; #line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); #line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; -#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = _data3_->value; -#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_long (self, _tmp0_, _tmp1_); -#line 4964 "PhotoMetadata.c" + photo_metadata_set_long (self, tag, _data3_->value); +#line 5179 "PhotoMetadata.c" } -static void ___lambda7__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { +static void +___lambda7__photo_metadata_set_generic_value (const gchar* tag, + gpointer self) +{ #line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __lambda7_ (self, tag); -#line 4971 "PhotoMetadata.c" +#line 5189 "PhotoMetadata.c" } -void photo_metadata_set_all_long (PhotoMetadata* self, gchar** tags, int tags_length1, glong value, PhotoMetadataSetOption option) { +void +photo_metadata_set_all_long (PhotoMetadata* self, + gchar** tags, + int tags_length1, + glong value, + PhotoMetadataSetOption option) +{ Block3Data* _data3_; - glong _tmp0_; - gchar** _tmp1_; - gint _tmp1__length1; - PhotoMetadataSetOption _tmp2_; #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4989,36 +5209,31 @@ void photo_metadata_set_all_long (PhotoMetadata* self, gchar** tags, int tags_le #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data3_->self = media_metadata_ref (self); #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = value; -#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _data3_->value = _tmp0_; -#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = tags; -#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1__length1 = tags_length1; + _data3_->value = value; #line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = option; -#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_all_generic (self, _tmp1_, _tmp1__length1, _tmp2_, ___lambda7__photo_metadata_set_generic_value, _data3_); + photo_metadata_set_all_generic (self, tags, tags_length1, option, ___lambda7__photo_metadata_set_generic_value, _data3_); #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" block3_data_unref (_data3_); #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data3_ = NULL; -#line 5005 "PhotoMetadata.c" +#line 5217 "PhotoMetadata.c" } -gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, MetadataRational* rational) { +gboolean +photo_metadata_get_rational (PhotoMetadata* self, + const gchar* tag, + MetadataRational* rational) +{ MetadataRational _vala_rational = {0}; gboolean result = FALSE; gint numerator = 0; gint denominator = 0; gboolean _result_ = FALSE; GExiv2Metadata* _tmp0_; - const gchar* _tmp1_; + gint _tmp1_ = 0; gint _tmp2_ = 0; - gint _tmp3_ = 0; - gboolean _tmp4_; + gboolean _tmp3_; #line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5026,15 +5241,13 @@ gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, Met #line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = tag; + _tmp3_ = gexiv2_metadata_get_exif_tag_rational (_tmp0_, tag, &_tmp1_, &_tmp2_); #line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = gexiv2_metadata_get_exif_tag_rational (_tmp0_, _tmp1_, &_tmp2_, &_tmp3_); + numerator = _tmp1_; #line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - numerator = _tmp2_; + denominator = _tmp2_; #line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - denominator = _tmp3_; -#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _result_ = _tmp4_; + _result_ = _tmp3_; #line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" metadata_rational_init (&_vala_rational, numerator, denominator); #line 607 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5043,57 +5256,56 @@ gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, Met if (rational) { #line 607 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *rational = _vala_rational; -#line 5044 "PhotoMetadata.c" +#line 5257 "PhotoMetadata.c" } #line 607 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5048 "PhotoMetadata.c" +#line 5261 "PhotoMetadata.c" } -gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, int tags_length1, MetadataRational* rational) { +gboolean +photo_metadata_get_first_rational (PhotoMetadata* self, + gchar** tags, + int tags_length1, + MetadataRational* rational) +{ MetadataRational _vala_rational = {0}; gboolean result = FALSE; - gchar** _tmp0_; - gint _tmp0__length1; #line 610 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tags; -#line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0__length1 = tags_length1; -#line 5063 "PhotoMetadata.c" +#line 5275 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; #line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection = _tmp0_; + tag_collection = tags; #line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection_length1 = _tmp0__length1; + tag_collection_length1 = tags_length1; #line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 5075 "PhotoMetadata.c" - gchar* _tmp1_; + for (tag_it = 0; tag_it < tags_length1; tag_it = tag_it + 1) { +#line 5287 "PhotoMetadata.c" + gchar* _tmp0_; gchar* tag = NULL; #line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (tag_collection[tag_it]); + _tmp0_ = g_strdup (tag_collection[tag_it]); #line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag = _tmp1_; -#line 5082 "PhotoMetadata.c" + tag = _tmp0_; +#line 5294 "PhotoMetadata.c" { - const gchar* _tmp2_; - MetadataRational _tmp3_ = {0}; - gboolean _tmp4_; + const gchar* _tmp1_; + MetadataRational _tmp2_ = {0}; + gboolean _tmp3_; #line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tag; + _tmp1_ = tag; #line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = photo_metadata_get_rational (self, _tmp2_, &_tmp3_); + _tmp3_ = photo_metadata_get_rational (self, _tmp1_, &_tmp2_); #line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _vala_rational = _tmp3_; + _vala_rational = _tmp2_; #line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_) { + if (_tmp3_) { #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = TRUE; #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5102,15 +5314,15 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i if (rational) { #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *rational = _vala_rational; -#line 5103 "PhotoMetadata.c" +#line 5315 "PhotoMetadata.c" } #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5107 "PhotoMetadata.c" +#line 5319 "PhotoMetadata.c" } #line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 5111 "PhotoMetadata.c" +#line 5323 "PhotoMetadata.c" } } } @@ -5122,22 +5334,24 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i if (rational) { #line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *rational = _vala_rational; -#line 5123 "PhotoMetadata.c" +#line 5335 "PhotoMetadata.c" } #line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5127 "PhotoMetadata.c" +#line 5339 "PhotoMetadata.c" } -void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, MetadataRational* rational) { +void +photo_metadata_set_rational (PhotoMetadata* self, + const gchar* tag, + MetadataRational* rational) +{ GExiv2Metadata* _tmp0_; - const gchar* _tmp1_; - MetadataRational _tmp2_; - gint _tmp3_; - MetadataRational _tmp4_; - gint _tmp5_; - gboolean _tmp6_; + MetadataRational _tmp1_; + gint _tmp2_; + MetadataRational _tmp3_; + gint _tmp4_; #line 621 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 621 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5147,57 +5361,54 @@ void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, Metadat #line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = tag; -#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = *rational; + _tmp1_ = *rational; #line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _tmp2_.numerator; -#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = *rational; + _tmp2_ = _tmp1_.numerator; #line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = _tmp4_.denominator; + _tmp3_ = *rational; #line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = gexiv2_metadata_set_exif_tag_rational (_tmp0_, _tmp1_, _tmp3_, _tmp5_); + _tmp4_ = _tmp3_.denominator; #line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp6_) { -#line 5161 "PhotoMetadata.c" + if (!gexiv2_metadata_set_exif_tag_rational (_tmp0_, tag, _tmp2_, _tmp4_)) { +#line 5371 "PhotoMetadata.c" + gchar* _tmp5_; + gchar* _tmp6_; const gchar* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - const gchar* _tmp10_; #line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = tag; + _tmp5_ = metadata_rational_to_string (rational); #line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = metadata_rational_to_string (rational); + _tmp6_ = _tmp5_; #line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = _tmp8_; -#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = self->priv->source_name; + _tmp7_ = self->priv->source_name; #line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_warning ("PhotoMetadata.vala:623: Unable to set tag %s to rational %s from sourc" \ -"e %s", _tmp7_, _tmp9_, _tmp10_); +"e %s", tag, _tmp6_, _tmp7_); #line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp9_); -#line 5178 "PhotoMetadata.c" + _g_free0 (_tmp6_); +#line 5385 "PhotoMetadata.c" } } -static Block4Data* block4_data_ref (Block4Data* _data4_) { +static Block4Data* +block4_data_ref (Block4Data* _data4_) +{ #line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&_data4_->_ref_count_); #line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data4_; -#line 5188 "PhotoMetadata.c" +#line 5397 "PhotoMetadata.c" } -static void block4_data_unref (void * _userdata_) { +static void +block4_data_unref (void * _userdata_) +{ Block4Data* _data4_; _data4_ = (Block4Data*) _userdata_; #line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) { -#line 5197 "PhotoMetadata.c" +#line 5408 "PhotoMetadata.c" PhotoMetadata* self; #line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data4_->self; @@ -5205,42 +5416,48 @@ static void block4_data_unref (void * _userdata_) { _media_metadata_unref0 (self); #line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block4Data, _data4_); -#line 5205 "PhotoMetadata.c" +#line 5416 "PhotoMetadata.c" } } -static void __lambda8_ (Block4Data* _data4_, const gchar* tag) { +static void +__lambda8_ (Block4Data* _data4_, + const gchar* tag) +{ PhotoMetadata* self; - const gchar* _tmp0_; - MetadataRational _tmp1_; + MetadataRational _tmp0_; #line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data4_->self; #line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); #line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; + _tmp0_ = _data4_->rational; #line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = _data4_->rational; -#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_rational (self, _tmp0_, &_tmp1_); -#line 5224 "PhotoMetadata.c" + photo_metadata_set_rational (self, tag, &_tmp0_); +#line 5435 "PhotoMetadata.c" } -static void ___lambda8__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { +static void +___lambda8__photo_metadata_set_generic_value (const gchar* tag, + gpointer self) +{ #line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __lambda8_ (self, tag); -#line 5231 "PhotoMetadata.c" +#line 5445 "PhotoMetadata.c" } -void photo_metadata_set_all_rational (PhotoMetadata* self, gchar** tags, int tags_length1, MetadataRational* rational, PhotoMetadataSetOption option) { +void +photo_metadata_set_all_rational (PhotoMetadata* self, + gchar** tags, + int tags_length1, + MetadataRational* rational, + PhotoMetadataSetOption option) +{ Block4Data* _data4_; MetadataRational _tmp0_; - gchar** _tmp1_; - gint _tmp1__length1; - PhotoMetadataSetOption _tmp2_; #line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5256,95 +5473,83 @@ void photo_metadata_set_all_rational (PhotoMetadata* self, gchar** tags, int tag #line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data4_->rational = _tmp0_; #line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = tags; -#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1__length1 = tags_length1; -#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = option; -#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_all_generic (self, _tmp1_, _tmp1__length1, _tmp2_, ___lambda8__photo_metadata_set_generic_value, _data4_); + photo_metadata_set_all_generic (self, tags, tags_length1, option, ___lambda8__photo_metadata_set_generic_value, _data4_); #line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" block4_data_unref (_data4_); #line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data4_ = NULL; -#line 5267 "PhotoMetadata.c" +#line 5478 "PhotoMetadata.c" } -MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar* tag) { +MetadataDateTime* +photo_metadata_get_date_time (PhotoMetadata* self, + const gchar* tag) +{ MetadataDateTime* result = NULL; gchar* value = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp0_; + const gchar* _tmp1_; GError * _inner_error_ = NULL; #line 632 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 632 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, NULL); #line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; + _tmp0_ = photo_metadata_get_string (self, tag, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = photo_metadata_get_string (self, _tmp0_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - value = _tmp1_; + value = _tmp0_; #line 634 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = value; + _tmp1_ = value; #line 634 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; #line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); #line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5298 "PhotoMetadata.c" +#line 5509 "PhotoMetadata.c" } { - const gchar* _tmp3_; - MetadataDomain _tmp4_; -#line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = tag; #line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = photo_metadata_get_tag_domain (_tmp3_); -#line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - switch (_tmp4_) { + switch (photo_metadata_get_tag_domain (tag)) { #line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 5311 "PhotoMetadata.c" +#line 5516 "PhotoMetadata.c" { - MetadataDateTime* _tmp5_ = NULL; - const gchar* _tmp6_; - MetadataDateTime* _tmp7_; - MetadataDateTime* _tmp8_; + MetadataDateTime* _tmp2_ = NULL; + const gchar* _tmp3_; + MetadataDateTime* _tmp4_; + MetadataDateTime* _tmp5_; #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = value; + _tmp3_ = value; #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = metadata_date_time_new_from_xmp (_tmp6_, &_inner_error_); + _tmp4_ = metadata_date_time_new_from_xmp (_tmp3_, &_inner_error_); #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = _tmp7_; + _tmp2_ = _tmp4_; #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5325 "PhotoMetadata.c" +#line 5530 "PhotoMetadata.c" goto __catch30_g_error; } #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = _tmp5_; + _tmp5_ = _tmp2_; #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = NULL; + _tmp2_ = NULL; #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp8_; + result = _tmp5_; #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _metadata_date_time_unref0 (_tmp5_); + _metadata_date_time_unref0 (_tmp2_); #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5340 "PhotoMetadata.c" +#line 5545 "PhotoMetadata.c" } #line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 5344 "PhotoMetadata.c" +#line 5549 "PhotoMetadata.c" { #line 645 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; @@ -5352,41 +5557,41 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar _g_free0 (value); #line 645 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5352 "PhotoMetadata.c" +#line 5557 "PhotoMetadata.c" } default: #line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 5357 "PhotoMetadata.c" +#line 5562 "PhotoMetadata.c" { - MetadataDateTime* _tmp9_ = NULL; - const gchar* _tmp10_; - MetadataDateTime* _tmp11_; - MetadataDateTime* _tmp12_; + MetadataDateTime* _tmp6_ = NULL; + const gchar* _tmp7_; + MetadataDateTime* _tmp8_; + MetadataDateTime* _tmp9_; #line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = value; + _tmp7_ = value; #line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = metadata_date_time_new_from_exif (_tmp10_, &_inner_error_); + _tmp8_ = metadata_date_time_new_from_exif (_tmp7_, &_inner_error_); #line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = _tmp11_; + _tmp6_ = _tmp8_; #line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5371 "PhotoMetadata.c" +#line 5576 "PhotoMetadata.c" goto __catch30_g_error; } #line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = _tmp9_; + _tmp9_ = _tmp6_; #line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = NULL; + _tmp6_ = NULL; #line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp12_; + result = _tmp9_; #line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _metadata_date_time_unref0 (_tmp9_); + _metadata_date_time_unref0 (_tmp6_); #line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); #line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5386 "PhotoMetadata.c" +#line 5591 "PhotoMetadata.c" } } } @@ -5394,24 +5599,21 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar __catch30_g_error: { GError* err = NULL; - const gchar* _tmp13_; - const gchar* _tmp14_; - GError* _tmp15_; - const gchar* _tmp16_; + const gchar* _tmp10_; + GError* _tmp11_; + const gchar* _tmp12_; #line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" err = _inner_error_; #line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _inner_error_ = NULL; #line 652 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = tag; -#line 652 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = self->priv->source_name; + _tmp10_ = self->priv->source_name; #line 652 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = err; + _tmp11_ = err; #line 652 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = _tmp15_->message; + _tmp12_ = _tmp11_->message; #line 652 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_warning ("PhotoMetadata.vala:652: Unable to read date/time %s from source %s: %s", _tmp13_, _tmp14_, _tmp16_); + g_warning ("PhotoMetadata.vala:652: Unable to read date/time %s from source %s: %s", tag, _tmp10_, _tmp12_); #line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; #line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5420,7 +5622,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar _g_free0 (value); #line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5420 "PhotoMetadata.c" +#line 5622 "PhotoMetadata.c" } __finally30: #line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5431,68 +5633,66 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar g_clear_error (&_inner_error_); #line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 5431 "PhotoMetadata.c" +#line 5633 "PhotoMetadata.c" } -MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar** tags, int tags_length1) { +MetadataDateTime* +photo_metadata_get_first_date_time (PhotoMetadata* self, + gchar** tags, + int tags_length1) +{ MetadataDateTime* result = NULL; - gchar** _tmp0_; - gint _tmp0__length1; #line 658 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tags; -#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0__length1 = tags_length1; -#line 5445 "PhotoMetadata.c" +#line 5645 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; #line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection = _tmp0_; + tag_collection = tags; #line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection_length1 = _tmp0__length1; + tag_collection_length1 = tags_length1; #line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 5457 "PhotoMetadata.c" - gchar* _tmp1_; + for (tag_it = 0; tag_it < tags_length1; tag_it = tag_it + 1) { +#line 5657 "PhotoMetadata.c" + gchar* _tmp0_; gchar* tag = NULL; #line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (tag_collection[tag_it]); + _tmp0_ = g_strdup (tag_collection[tag_it]); #line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag = _tmp1_; -#line 5464 "PhotoMetadata.c" + tag = _tmp0_; +#line 5664 "PhotoMetadata.c" { MetadataDateTime* date_time = NULL; - const gchar* _tmp2_; + const gchar* _tmp1_; + MetadataDateTime* _tmp2_; MetadataDateTime* _tmp3_; - MetadataDateTime* _tmp4_; #line 660 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tag; + _tmp1_ = tag; #line 660 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = photo_metadata_get_date_time (self, _tmp2_); + _tmp2_ = photo_metadata_get_date_time (self, _tmp1_); #line 660 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - date_time = _tmp3_; + date_time = _tmp2_; #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = date_time; + _tmp3_ = date_time; #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_ != NULL) { + if (_tmp3_ != NULL) { #line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = date_time; #line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); #line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5486 "PhotoMetadata.c" +#line 5686 "PhotoMetadata.c" } #line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _metadata_date_time_unref0 (date_time); #line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 5492 "PhotoMetadata.c" +#line 5692 "PhotoMetadata.c" } } } @@ -5500,13 +5700,15 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar result = NULL; #line 665 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5500 "PhotoMetadata.c" +#line 5700 "PhotoMetadata.c" } -void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, MetadataDateTime* date_time) { - const gchar* _tmp0_; - MetadataDomain _tmp1_; +void +photo_metadata_set_date_time (PhotoMetadata* self, + const gchar* tag, + MetadataDateTime* date_time) +{ #line 668 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 668 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5514,112 +5716,93 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada #line 668 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_METADATA_DATE_TIME (date_time)); #line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; -#line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = photo_metadata_get_tag_domain (_tmp0_); -#line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - switch (_tmp1_) { + switch (photo_metadata_get_tag_domain (tag)) { #line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 5521 "PhotoMetadata.c" +#line 5719 "PhotoMetadata.c" { - const gchar* _tmp2_; - MetadataDateTime* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; -#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tag; -#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = date_time; + gchar* _tmp0_; + gchar* _tmp1_; #line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = metadata_date_time_get_exif_label (_tmp3_); + _tmp0_ = metadata_date_time_get_exif_label (date_time); #line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = _tmp4_; + _tmp1_ = _tmp0_; #line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string (self, _tmp2_, _tmp5_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); + photo_metadata_set_string (self, tag, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp1_); #line 672 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 5541 "PhotoMetadata.c" +#line 5733 "PhotoMetadata.c" } #line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 5545 "PhotoMetadata.c" +#line 5737 "PhotoMetadata.c" { - const gchar* _tmp6_; - MetadataDateTime* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; -#line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = tag; -#line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = date_time; + gchar* _tmp2_; + gchar* _tmp3_; #line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = metadata_date_time_get_xmp_label (_tmp7_); + _tmp2_ = metadata_date_time_get_xmp_label (date_time); #line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = _tmp8_; + _tmp3_ = _tmp2_; #line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string (self, _tmp6_, _tmp9_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); + photo_metadata_set_string (self, tag, _tmp3_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp3_); #line 676 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 5565 "PhotoMetadata.c" +#line 5751 "PhotoMetadata.c" } default: #line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 5570 "PhotoMetadata.c" +#line 5756 "PhotoMetadata.c" { - const gchar* _tmp10_; - const gchar* _tmp11_; - const gchar* _tmp12_; - MetadataDomain _tmp13_; - GEnumValue* _tmp14_; + const gchar* _tmp4_; + GEnumValue* _tmp5_; #line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = tag; -#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = self->priv->source_name; -#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = tag; -#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = photo_metadata_get_tag_domain (_tmp12_); + _tmp4_ = self->priv->source_name; #line 682 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = g_enum_get_value (g_type_class_ref (TYPE_METADATA_DOMAIN), _tmp13_); + _tmp5_ = g_enum_get_value (g_type_class_ref (TYPE_METADATA_DOMAIN), photo_metadata_get_tag_domain (tag)); #line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_warning ("PhotoMetadata.vala:681: Cannot set date/time for %s from source %s: un" \ -"supported metadata domain %s", _tmp10_, _tmp11_, (_tmp14_ != NULL) ? _tmp14_->value_name : NULL); +"supported metadata domain %s", tag, _tmp4_, (_tmp5_ != NULL) ? _tmp5_->value_name : NULL); #line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 5591 "PhotoMetadata.c" +#line 5768 "PhotoMetadata.c" } } } -static gpointer _metadata_date_time_ref0 (gpointer self) { +static gpointer +_metadata_date_time_ref0 (gpointer self) +{ #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? metadata_date_time_ref (self) : NULL; -#line 5600 "PhotoMetadata.c" +#line 5779 "PhotoMetadata.c" } -static Block5Data* block5_data_ref (Block5Data* _data5_) { +static Block5Data* +block5_data_ref (Block5Data* _data5_) +{ #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&_data5_->_ref_count_); #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data5_; -#line 5609 "PhotoMetadata.c" +#line 5790 "PhotoMetadata.c" } -static void block5_data_unref (void * _userdata_) { +static void +block5_data_unref (void * _userdata_) +{ Block5Data* _data5_; _data5_ = (Block5Data*) _userdata_; #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) { -#line 5618 "PhotoMetadata.c" +#line 5801 "PhotoMetadata.c" PhotoMetadata* self; #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data5_->self; @@ -5629,43 +5812,45 @@ static void block5_data_unref (void * _userdata_) { _media_metadata_unref0 (self); #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block5Data, _data5_); -#line 5628 "PhotoMetadata.c" +#line 5811 "PhotoMetadata.c" } } -static void __lambda9_ (Block5Data* _data5_, const gchar* tag) { +static void +__lambda9_ (Block5Data* _data5_, + const gchar* tag) +{ PhotoMetadata* self; - const gchar* _tmp0_; - MetadataDateTime* _tmp1_; #line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data5_->self; #line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); #line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; -#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = _data5_->date_time; -#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_date_time (self, _tmp0_, _tmp1_); -#line 5647 "PhotoMetadata.c" + photo_metadata_set_date_time (self, tag, _data5_->date_time); +#line 5827 "PhotoMetadata.c" } -static void ___lambda9__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { +static void +___lambda9__photo_metadata_set_generic_value (const gchar* tag, + gpointer self) +{ #line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __lambda9_ (self, tag); -#line 5654 "PhotoMetadata.c" +#line 5837 "PhotoMetadata.c" } -void photo_metadata_set_all_date_time (PhotoMetadata* self, gchar** tags, int tags_length1, MetadataDateTime* date_time, PhotoMetadataSetOption option) { +void +photo_metadata_set_all_date_time (PhotoMetadata* self, + gchar** tags, + int tags_length1, + MetadataDateTime* date_time, + PhotoMetadataSetOption option) +{ Block5Data* _data5_; MetadataDateTime* _tmp0_; - MetadataDateTime* _tmp1_; - gchar** _tmp2_; - gint _tmp2__length1; - PhotoMetadataSetOption _tmp3_; #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5677,30 +5862,24 @@ void photo_metadata_set_all_date_time (PhotoMetadata* self, gchar** tags, int ta #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data5_->self = media_metadata_ref (self); #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = date_time; -#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = _metadata_date_time_ref0 (_tmp0_); + _tmp0_ = _metadata_date_time_ref0 (date_time); #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _metadata_date_time_unref0 (_data5_->date_time); #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _data5_->date_time = _tmp1_; -#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tags; + _data5_->date_time = _tmp0_; #line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2__length1 = tags_length1; -#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = option; -#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_all_generic (self, _tmp2_, _tmp2__length1, _tmp3_, ___lambda9__photo_metadata_set_generic_value, _data5_); + photo_metadata_set_all_generic (self, tags, tags_length1, option, ___lambda9__photo_metadata_set_generic_value, _data5_); #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" block5_data_unref (_data5_); #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data5_ = NULL; -#line 5695 "PhotoMetadata.c" +#line 5872 "PhotoMetadata.c" } -gchar* photo_metadata_exif_hash (PhotoMetadata* self) { +gchar* +photo_metadata_exif_hash (PhotoMetadata* self) +{ gchar* result = NULL; ExifData* _tmp0_; const gchar* _tmp1_; @@ -5732,13 +5911,13 @@ gchar* photo_metadata_exif_hash (PhotoMetadata* self) { result = NULL; #line 694 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5731 "PhotoMetadata.c" +#line 5910 "PhotoMetadata.c" } #line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = self->priv->metadata_hash; #line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp1_ != NULL) { -#line 5737 "PhotoMetadata.c" +#line 5916 "PhotoMetadata.c" const gchar* _tmp2_; gchar* _tmp3_; #line 697 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5749,7 +5928,7 @@ gchar* photo_metadata_exif_hash (PhotoMetadata* self) { result = _tmp3_; #line 697 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5748 "PhotoMetadata.c" +#line 5927 "PhotoMetadata.c" } #line 700 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" hash = NULL; @@ -5797,21 +5976,21 @@ gchar* photo_metadata_exif_hash (PhotoMetadata* self) { _tmp16_ = saved_size; #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp16_ > ((guint) 0)) { -#line 5796 "PhotoMetadata.c" +#line 5975 "PhotoMetadata.c" guchar* _tmp17_; #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = saved_data; #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = _tmp17_ != NULL; -#line 5802 "PhotoMetadata.c" +#line 5981 "PhotoMetadata.c" } else { #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = FALSE; -#line 5806 "PhotoMetadata.c" +#line 5985 "PhotoMetadata.c" } #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp15_) { -#line 5810 "PhotoMetadata.c" +#line 5989 "PhotoMetadata.c" GChecksum* md5 = NULL; GChecksum* _tmp18_; GChecksum* _tmp19_; @@ -5857,17 +6036,19 @@ gchar* photo_metadata_exif_hash (PhotoMetadata* self) { self->priv->metadata_hash = _tmp27_; #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_checksum_free0 (md5); -#line 5856 "PhotoMetadata.c" +#line 6035 "PhotoMetadata.c" } #line 725 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = hash; #line 725 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5862 "PhotoMetadata.c" +#line 6041 "PhotoMetadata.c" } -gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self) { +gchar* +photo_metadata_thumbnail_hash (PhotoMetadata* self) +{ gchar* result = NULL; const gchar* _tmp0_; guchar* buffer = NULL; @@ -5883,7 +6064,7 @@ gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self) { _tmp0_ = self->priv->thumbnail_md5; #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ != NULL) { -#line 5882 "PhotoMetadata.c" +#line 6063 "PhotoMetadata.c" const gchar* _tmp1_; gchar* _tmp2_; #line 731 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5894,7 +6075,7 @@ gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self) { result = _tmp2_; #line 731 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5893 "PhotoMetadata.c" +#line 6074 "PhotoMetadata.c" } #line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = self->priv->exiv2; @@ -5910,7 +6091,7 @@ gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self) { _buffer_size_ = buffer_length1; #line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp6_) { -#line 5909 "PhotoMetadata.c" +#line 6090 "PhotoMetadata.c" GChecksum* md5 = NULL; GChecksum* _tmp7_; GChecksum* _tmp8_; @@ -5961,7 +6142,7 @@ gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self) { buffer = (g_free (buffer), NULL); #line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5960 "PhotoMetadata.c" +#line 6141 "PhotoMetadata.c" } #line 744 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; @@ -5969,11 +6150,13 @@ gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self) { buffer = (g_free (buffer), NULL); #line 744 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5968 "PhotoMetadata.c" +#line 6149 "PhotoMetadata.c" } -guint photo_metadata_get_preview_count (PhotoMetadata* self) { +guint +photo_metadata_get_preview_count (PhotoMetadata* self) +{ guint result = 0U; GExiv2PreviewProperties** props = NULL; GExiv2Metadata* _tmp0_; @@ -6002,7 +6185,7 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) { _tmp4__length1 = props_length1; #line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_ != NULL) { -#line 6001 "PhotoMetadata.c" +#line 6184 "PhotoMetadata.c" GExiv2PreviewProperties** _tmp5_; gint _tmp5__length1; #line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6011,21 +6194,24 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) { _tmp5__length1 = props_length1; #line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp5__length1; -#line 6010 "PhotoMetadata.c" +#line 6193 "PhotoMetadata.c" } else { #line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = 0; -#line 6014 "PhotoMetadata.c" +#line 6197 "PhotoMetadata.c" } #line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = (guint) _tmp3_; #line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6020 "PhotoMetadata.c" +#line 6203 "PhotoMetadata.c" } -PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) { +PhotoPreview* +photo_metadata_get_preview (PhotoMetadata* self, + guint number) +{ PhotoPreview* result = NULL; GExiv2PreviewProperties** props = NULL; GExiv2Metadata* _tmp0_; @@ -6036,13 +6222,11 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) { gboolean _tmp3_ = FALSE; GExiv2PreviewProperties** _tmp4_; gint _tmp4__length1; - const gchar* _tmp7_; - guint _tmp8_; - GExiv2PreviewProperties** _tmp9_; - gint _tmp9__length1; - guint _tmp10_; - GExiv2PreviewProperties* _tmp11_; - PhotoMetadataInternalPhotoPreview* _tmp12_; + const gchar* _tmp6_; + GExiv2PreviewProperties** _tmp7_; + gint _tmp7__length1; + GExiv2PreviewProperties* _tmp8_; + PhotoMetadataInternalPhotoPreview* _tmp9_; #line 754 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6063,20 +6247,17 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) { if (_tmp4_ == NULL) { #line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = TRUE; -#line 6062 "PhotoMetadata.c" +#line 6246 "PhotoMetadata.c" } else { GExiv2PreviewProperties** _tmp5_; gint _tmp5__length1; - guint _tmp6_; #line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = props; #line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5__length1 = props_length1; #line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = number; -#line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = ((guint) _tmp5__length1) <= _tmp6_; -#line 6075 "PhotoMetadata.c" + _tmp3_ = ((guint) _tmp5__length1) <= number; +#line 6256 "PhotoMetadata.c" } #line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_) { @@ -6084,31 +6265,29 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) { result = NULL; #line 757 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6083 "PhotoMetadata.c" +#line 6264 "PhotoMetadata.c" } #line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = self->priv->source_name; -#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = number; + _tmp6_ = self->priv->source_name; #line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = props; + _tmp7_ = props; #line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9__length1 = props_length1; + _tmp7__length1 = props_length1; #line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = number; + _tmp8_ = _tmp7_[number]; #line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = _tmp9_[_tmp10_]; + _tmp9_ = photo_metadata_internal_photo_preview_new (self, _tmp6_, number, _tmp8_); #line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = photo_metadata_internal_photo_preview_new (self, _tmp7_, _tmp8_, _tmp11_); -#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_PREVIEW, PhotoPreview); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO_PREVIEW, PhotoPreview); #line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6103 "PhotoMetadata.c" +#line 6280 "PhotoMetadata.c" } -void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) { +void +photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) +{ GExiv2Metadata* _tmp0_; ExifData* _tmp1_; #line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6121,7 +6300,7 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) { _tmp1_ = self->priv->exif; #line 764 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp1_ != NULL) { -#line 6120 "PhotoMetadata.c" +#line 6299 "PhotoMetadata.c" ExifMem* _tmp2_; ExifMem* _tmp3_; ExifData* _tmp4_; @@ -6148,14 +6327,16 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) { _tmp7_ = self->priv->exif; #line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_->size = (guint) 0; -#line 6147 "PhotoMetadata.c" +#line 6326 "PhotoMetadata.c" } } -void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag) { +void +photo_metadata_remove_tag (PhotoMetadata* self, + const gchar* tag) +{ GExiv2Metadata* _tmp0_; - const gchar* _tmp1_; #line 771 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 771 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6163,113 +6344,111 @@ void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag) { #line 772 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 772 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = tag; -#line 772 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gexiv2_metadata_clear_tag (_tmp0_, _tmp1_); -#line 6165 "PhotoMetadata.c" + gexiv2_metadata_clear_tag (_tmp0_, tag); +#line 6344 "PhotoMetadata.c" } -void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_length1) { - gchar** _tmp0_; - gint _tmp0__length1; +void +photo_metadata_remove_tags (PhotoMetadata* self, + gchar** tags, + int tags_length1) +{ #line 775 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tags; -#line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0__length1 = tags_length1; -#line 6178 "PhotoMetadata.c" +#line 6355 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; #line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection = _tmp0_; + tag_collection = tags; #line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection_length1 = _tmp0__length1; + tag_collection_length1 = tags_length1; #line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 6190 "PhotoMetadata.c" - gchar* _tmp1_; + for (tag_it = 0; tag_it < tags_length1; tag_it = tag_it + 1) { +#line 6367 "PhotoMetadata.c" + gchar* _tmp0_; gchar* tag = NULL; #line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (tag_collection[tag_it]); + _tmp0_ = g_strdup (tag_collection[tag_it]); #line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag = _tmp1_; -#line 6197 "PhotoMetadata.c" + tag = _tmp0_; +#line 6374 "PhotoMetadata.c" { - const gchar* _tmp2_; + const gchar* _tmp1_; #line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tag; + _tmp1_ = tag; #line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_remove_tag (self, _tmp2_); + photo_metadata_remove_tag (self, _tmp1_); #line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 6206 "PhotoMetadata.c" +#line 6383 "PhotoMetadata.c" } } } } -void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) { - MetadataDomain _tmp0_; +void +photo_metadata_clear_domain (PhotoMetadata* self, + MetadataDomain domain) +{ #line 780 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = domain; -#line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - switch (_tmp0_) { + switch (domain) { #line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 6223 "PhotoMetadata.c" +#line 6400 "PhotoMetadata.c" { - GExiv2Metadata* _tmp1_; + GExiv2Metadata* _tmp0_; #line 783 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = self->priv->exiv2; + _tmp0_ = self->priv->exiv2; #line 783 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gexiv2_metadata_clear_exif (_tmp1_); + gexiv2_metadata_clear_exif (_tmp0_); #line 784 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 6232 "PhotoMetadata.c" +#line 6409 "PhotoMetadata.c" } #line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 6236 "PhotoMetadata.c" +#line 6413 "PhotoMetadata.c" { - GExiv2Metadata* _tmp2_; + GExiv2Metadata* _tmp1_; #line 787 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = self->priv->exiv2; + _tmp1_ = self->priv->exiv2; #line 787 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gexiv2_metadata_clear_xmp (_tmp2_); + gexiv2_metadata_clear_xmp (_tmp1_); #line 788 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 6245 "PhotoMetadata.c" +#line 6422 "PhotoMetadata.c" } #line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 6249 "PhotoMetadata.c" +#line 6426 "PhotoMetadata.c" { - GExiv2Metadata* _tmp3_; + GExiv2Metadata* _tmp2_; #line 791 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = self->priv->exiv2; + _tmp2_ = self->priv->exiv2; #line 791 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gexiv2_metadata_clear_iptc (_tmp3_); + gexiv2_metadata_clear_iptc (_tmp2_); #line 792 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 6258 "PhotoMetadata.c" +#line 6435 "PhotoMetadata.c" } default: #line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 6263 "PhotoMetadata.c" +#line 6440 "PhotoMetadata.c" } } -void photo_metadata_clear (PhotoMetadata* self) { +void +photo_metadata_clear (PhotoMetadata* self) +{ GExiv2Metadata* _tmp0_; #line 796 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); @@ -6277,11 +6456,13 @@ void photo_metadata_clear (PhotoMetadata* self) { _tmp0_ = self->priv->exiv2; #line 797 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gexiv2_metadata_clear (_tmp0_); -#line 6276 "PhotoMetadata.c" +#line 6455 "PhotoMetadata.c" } -MetadataDateTime* photo_metadata_get_modification_date_time (PhotoMetadata* self) { +MetadataDateTime* +photo_metadata_get_modification_date_time (PhotoMetadata* self) +{ MetadataDateTime* result = NULL; gchar** _tmp0_; gint _tmp0__length1; @@ -6298,51 +6479,48 @@ MetadataDateTime* photo_metadata_get_modification_date_time (PhotoMetadata* self result = _tmp1_; #line 808 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6297 "PhotoMetadata.c" +#line 6478 "PhotoMetadata.c" } -void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) { - MetadataDateTime* _tmp0_; +void +photo_metadata_set_modification_date_time (PhotoMetadata* self, + MetadataDateTime* date_time, + PhotoMetadataSetOption option) +{ #line 811 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 811 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail ((date_time == NULL) || IS_METADATA_DATE_TIME (date_time)); #line 813 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = date_time; -#line 813 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp0_ != NULL) { -#line 6311 "PhotoMetadata.c" - gchar** _tmp1_; - gint _tmp1__length1; - MetadataDateTime* _tmp2_; - PhotoMetadataSetOption _tmp3_; -#line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = photo_metadata_DATE_TIME_TAGS; -#line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1__length1 = photo_metadata_DATE_TIME_TAGS_length1; + if (date_time != NULL) { +#line 6493 "PhotoMetadata.c" + gchar** _tmp0_; + gint _tmp0__length1; #line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = date_time; + _tmp0_ = photo_metadata_DATE_TIME_TAGS; #line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = option; + _tmp0__length1 = photo_metadata_DATE_TIME_TAGS_length1; #line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_); -#line 6326 "PhotoMetadata.c" + photo_metadata_set_all_date_time (self, _tmp0_, _tmp0__length1, date_time, option); +#line 6502 "PhotoMetadata.c" } else { - gchar** _tmp4_; - gint _tmp4__length1; + gchar** _tmp1_; + gint _tmp1__length1; #line 816 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = photo_metadata_DATE_TIME_TAGS; + _tmp1_ = photo_metadata_DATE_TIME_TAGS; #line 816 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4__length1 = photo_metadata_DATE_TIME_TAGS_length1; + _tmp1__length1 = photo_metadata_DATE_TIME_TAGS_length1; #line 816 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1); -#line 6336 "PhotoMetadata.c" + photo_metadata_remove_tags (self, _tmp1_, _tmp1__length1); +#line 6512 "PhotoMetadata.c" } } -MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self) { +MetadataDateTime* +photo_metadata_get_exposure_date_time (PhotoMetadata* self) +{ MetadataDateTime* result = NULL; gchar** _tmp0_; gint _tmp0__length1; @@ -6359,51 +6537,48 @@ MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self) { result = _tmp1_; #line 829 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6358 "PhotoMetadata.c" +#line 6536 "PhotoMetadata.c" } -void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) { - MetadataDateTime* _tmp0_; +void +photo_metadata_set_exposure_date_time (PhotoMetadata* self, + MetadataDateTime* date_time, + PhotoMetadataSetOption option) +{ #line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail ((date_time == NULL) || IS_METADATA_DATE_TIME (date_time)); #line 834 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = date_time; -#line 834 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp0_ != NULL) { -#line 6372 "PhotoMetadata.c" - gchar** _tmp1_; - gint _tmp1__length1; - MetadataDateTime* _tmp2_; - PhotoMetadataSetOption _tmp3_; -#line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS; -#line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1; + if (date_time != NULL) { +#line 6551 "PhotoMetadata.c" + gchar** _tmp0_; + gint _tmp0__length1; #line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = date_time; + _tmp0_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS; #line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = option; + _tmp0__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1; #line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_); -#line 6387 "PhotoMetadata.c" + photo_metadata_set_all_date_time (self, _tmp0_, _tmp0__length1, date_time, option); +#line 6560 "PhotoMetadata.c" } else { - gchar** _tmp4_; - gint _tmp4__length1; + gchar** _tmp1_; + gint _tmp1__length1; #line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS; + _tmp1_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS; #line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1; + _tmp1__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1; #line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1); -#line 6397 "PhotoMetadata.c" + photo_metadata_remove_tags (self, _tmp1_, _tmp1__length1); +#line 6570 "PhotoMetadata.c" } } -MetadataDateTime* photo_metadata_get_digitized_date_time (PhotoMetadata* self) { +MetadataDateTime* +photo_metadata_get_digitized_date_time (PhotoMetadata* self) +{ MetadataDateTime* result = NULL; gchar** _tmp0_; gint _tmp0__length1; @@ -6420,51 +6595,48 @@ MetadataDateTime* photo_metadata_get_digitized_date_time (PhotoMetadata* self) { result = _tmp1_; #line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6419 "PhotoMetadata.c" +#line 6594 "PhotoMetadata.c" } -void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) { - MetadataDateTime* _tmp0_; +void +photo_metadata_set_digitized_date_time (PhotoMetadata* self, + MetadataDateTime* date_time, + PhotoMetadataSetOption option) +{ #line 849 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 849 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail ((date_time == NULL) || IS_METADATA_DATE_TIME (date_time)); #line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = date_time; -#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp0_ != NULL) { -#line 6433 "PhotoMetadata.c" - gchar** _tmp1_; - gint _tmp1__length1; - MetadataDateTime* _tmp2_; - PhotoMetadataSetOption _tmp3_; -#line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS; + if (date_time != NULL) { +#line 6609 "PhotoMetadata.c" + gchar** _tmp0_; + gint _tmp0__length1; #line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1; -#line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = date_time; + _tmp0_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS; #line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = option; + _tmp0__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1; #line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_); -#line 6448 "PhotoMetadata.c" + photo_metadata_set_all_date_time (self, _tmp0_, _tmp0__length1, date_time, option); +#line 6618 "PhotoMetadata.c" } else { - gchar** _tmp4_; - gint _tmp4__length1; + gchar** _tmp1_; + gint _tmp1__length1; #line 854 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS; + _tmp1_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS; #line 854 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1; + _tmp1__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1; #line 854 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1); -#line 6458 "PhotoMetadata.c" + photo_metadata_remove_tags (self, _tmp1_, _tmp1__length1); +#line 6628 "PhotoMetadata.c" } } -static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetadata* base) { +static MetadataDateTime* +photo_metadata_real_get_creation_date_time (MediaMetadata* base) +{ PhotoMetadata * self; MetadataDateTime* result = NULL; MetadataDateTime* creation = NULL; @@ -6480,7 +6652,7 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada _tmp1_ = creation; #line 859 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp1_ == NULL) { -#line 6479 "PhotoMetadata.c" +#line 6651 "PhotoMetadata.c" MetadataDateTime* _tmp2_; #line 860 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = photo_metadata_get_digitized_date_time (self); @@ -6488,24 +6660,28 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada _metadata_date_time_unref0 (creation); #line 860 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" creation = _tmp2_; -#line 6487 "PhotoMetadata.c" +#line 6659 "PhotoMetadata.c" } #line 862 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = creation; #line 862 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6493 "PhotoMetadata.c" +#line 6665 "PhotoMetadata.c" } -static gpointer _dimensions_dup0 (gpointer self) { +static gpointer +_dimensions_dup0 (gpointer self) +{ #line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? dimensions_dup (self) : NULL; -#line 6500 "PhotoMetadata.c" +#line 6674 "PhotoMetadata.c" } -Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { +Dimensions* +photo_metadata_get_pixel_dimensions (PhotoMetadata* self) +{ Dimensions* result = NULL; gchar** _tmp0_; gint _tmp0__length1; @@ -6523,19 +6699,19 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { _tmp1__length1 = photo_metadata_HEIGHT_TAGS_length1; #line 881 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_assert (_tmp0__length1 == _tmp1__length1, "WIDTH_TAGS.length == HEIGHT_TAGS.length"); -#line 6522 "PhotoMetadata.c" +#line 6698 "PhotoMetadata.c" { gint ctr = 0; #line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ctr = 0; -#line 6527 "PhotoMetadata.c" +#line 6703 "PhotoMetadata.c" { gboolean _tmp2_ = FALSE; #line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = TRUE; #line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 6534 "PhotoMetadata.c" +#line 6710 "PhotoMetadata.c" gint _tmp4_; gchar** _tmp5_; gint _tmp5__length1; @@ -6559,13 +6735,13 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { Dimensions* _tmp19_; #line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp2_) { -#line 6558 "PhotoMetadata.c" +#line 6734 "PhotoMetadata.c" gint _tmp3_; #line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = ctr; #line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ctr = _tmp3_ + 1; -#line 6564 "PhotoMetadata.c" +#line 6740 "PhotoMetadata.c" } #line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = FALSE; @@ -6579,7 +6755,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { if (!(_tmp4_ < _tmp5__length1)) { #line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 6578 "PhotoMetadata.c" +#line 6754 "PhotoMetadata.c" } #line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = photo_metadata_WIDTH_TAGS; @@ -6597,7 +6773,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { if (!_tmp10_) { #line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" continue; -#line 6596 "PhotoMetadata.c" +#line 6772 "PhotoMetadata.c" } #line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = photo_metadata_HEIGHT_TAGS; @@ -6615,7 +6791,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { if (!_tmp15_) { #line 891 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" continue; -#line 6614 "PhotoMetadata.c" +#line 6790 "PhotoMetadata.c" } #line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = width; @@ -6629,7 +6805,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { result = _tmp19_; #line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6628 "PhotoMetadata.c" +#line 6804 "PhotoMetadata.c" } } } @@ -6637,363 +6813,330 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { result = NULL; #line 896 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6636 "PhotoMetadata.c" +#line 6812 "PhotoMetadata.c" } -void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim, PhotoMetadataSetOption option) { - Dimensions* _tmp0_; +void +photo_metadata_set_pixel_dimensions (PhotoMetadata* self, + Dimensions* dim, + PhotoMetadataSetOption option) +{ #line 899 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 900 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = dim; -#line 900 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp0_ != NULL) { -#line 6648 "PhotoMetadata.c" - gchar** _tmp1_; - gint _tmp1__length1; - Dimensions* _tmp2_; + if (dim != NULL) { +#line 6825 "PhotoMetadata.c" + gchar** _tmp0_; + gint _tmp0__length1; + gint _tmp1_; + gchar** _tmp2_; + gint _tmp2__length1; gint _tmp3_; - PhotoMetadataSetOption _tmp4_; - gchar** _tmp5_; - gint _tmp5__length1; - Dimensions* _tmp6_; - gint _tmp7_; - PhotoMetadataSetOption _tmp8_; -#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = photo_metadata_WIDTH_TAGS; #line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1__length1 = photo_metadata_WIDTH_TAGS_length1; + _tmp0_ = photo_metadata_WIDTH_TAGS; #line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = dim; + _tmp0__length1 = photo_metadata_WIDTH_TAGS_length1; #line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = (*_tmp2_).width; + _tmp1_ = (*dim).width; #line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = option; -#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_all_long (self, _tmp1_, _tmp1__length1, (glong) _tmp3_, _tmp4_); -#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = photo_metadata_HEIGHT_TAGS; -#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5__length1 = photo_metadata_HEIGHT_TAGS_length1; + photo_metadata_set_all_long (self, _tmp0_, _tmp0__length1, (glong) _tmp1_, option); #line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = dim; + _tmp2_ = photo_metadata_HEIGHT_TAGS; #line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = (*_tmp6_).height; + _tmp2__length1 = photo_metadata_HEIGHT_TAGS_length1; #line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = option; + _tmp3_ = (*dim).height; #line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_all_long (self, _tmp5_, _tmp5__length1, (glong) _tmp7_, _tmp8_); -#line 6683 "PhotoMetadata.c" + photo_metadata_set_all_long (self, _tmp2_, _tmp2__length1, (glong) _tmp3_, option); +#line 6848 "PhotoMetadata.c" } else { - gchar** _tmp9_; - gint _tmp9__length1; - gchar** _tmp10_; - gint _tmp10__length1; + gchar** _tmp4_; + gint _tmp4__length1; + gchar** _tmp5_; + gint _tmp5__length1; #line 904 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = photo_metadata_WIDTH_TAGS; + _tmp4_ = photo_metadata_WIDTH_TAGS; #line 904 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9__length1 = photo_metadata_WIDTH_TAGS_length1; + _tmp4__length1 = photo_metadata_WIDTH_TAGS_length1; #line 904 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_remove_tags (self, _tmp9_, _tmp9__length1); + photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1); #line 905 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = photo_metadata_HEIGHT_TAGS; + _tmp5_ = photo_metadata_HEIGHT_TAGS; #line 905 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10__length1 = photo_metadata_HEIGHT_TAGS_length1; + _tmp5__length1 = photo_metadata_HEIGHT_TAGS_length1; #line 905 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_remove_tags (self, _tmp10_, _tmp10__length1); -#line 6701 "PhotoMetadata.c" + photo_metadata_remove_tags (self, _tmp5_, _tmp5__length1); +#line 6866 "PhotoMetadata.c" } } -static gchar* string_strip (const gchar* self) { +static gchar* +string_strip (const gchar* self) +{ gchar* result = NULL; gchar* _result_ = NULL; gchar* _tmp0_; const gchar* _tmp1_; -#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1248 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _result_; -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 6725 "PhotoMetadata.c" +#line 6892 "PhotoMetadata.c" } -static gboolean string_contains (const gchar* self, const gchar* needle) { +static gboolean +string_contains (const gchar* self, + const gchar* needle) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gchar* _tmp1_; -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = needle; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_ != NULL; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = strstr ((gchar*) self, (gchar*) needle); +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_ != NULL; +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 6745 "PhotoMetadata.c" +#line 6912 "PhotoMetadata.c" } -static gchar* photo_metadata_real_get_title (MediaMetadata* base) { +static gchar* +photo_metadata_real_get_title (MediaMetadata* base) +{ PhotoMetadata * self; gchar* result = NULL; GeeList* _tmp0_ = NULL; - gboolean _tmp1_; GeeList* titles = NULL; - GeeList* _tmp5_; - gchar* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; - GeeList* _tmp8_; + GeeList* _tmp4_; + gchar* _tmp5_ = NULL; + gboolean _tmp6_ = FALSE; + GeeList* _tmp7_; gchar* title = NULL; - gchar* _tmp14_; - const gchar* _tmp15_; - const gchar* _tmp18_ = NULL; + gchar* _tmp13_; + const gchar* _tmp14_; + const gchar* _tmp17_ = NULL; + gboolean _tmp18_ = FALSE; gboolean _tmp19_ = FALSE; - gboolean _tmp20_ = FALSE; - const gchar* _tmp21_; - gboolean _tmp22_; - gchar* _tmp28_; + const gchar* _tmp20_; + gchar* _tmp24_; #line 939 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata); #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG); -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp1_) { -#line 6774 "PhotoMetadata.c" - GeeList* _tmp2_; + if (photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG)) { +#line 6939 "PhotoMetadata.c" + GeeList* _tmp1_; #line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = photo_metadata_get_string_multiple (self, PHOTO_METADATA_IPHOTO_TITLE_TAG); + _tmp1_ = photo_metadata_get_string_multiple (self, PHOTO_METADATA_IPHOTO_TITLE_TAG); #line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_tmp0_); #line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = _tmp2_; -#line 6782 "PhotoMetadata.c" + _tmp0_ = _tmp1_; +#line 6947 "PhotoMetadata.c" } else { - gchar** _tmp3_; - gint _tmp3__length1; - GeeList* _tmp4_; + gchar** _tmp2_; + gint _tmp2__length1; + GeeList* _tmp3_; #line 949 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = photo_metadata_STANDARD_TITLE_TAGS; + _tmp2_ = photo_metadata_STANDARD_TITLE_TAGS; #line 949 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1; + _tmp2__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1; #line 949 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = photo_metadata_get_first_string_multiple (self, _tmp3_, _tmp3__length1); + _tmp3_ = photo_metadata_get_first_string_multiple (self, _tmp2_, _tmp2__length1); #line 949 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_tmp0_); #line 949 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = _tmp4_; -#line 6797 "PhotoMetadata.c" + _tmp0_ = _tmp3_; +#line 6962 "PhotoMetadata.c" } #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = _g_object_ref0 (_tmp0_); + _tmp4_ = _g_object_ref0 (_tmp0_); #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - titles = _tmp5_; + titles = _tmp4_; #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = titles; + _tmp7_ = titles; #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp8_ != NULL) { -#line 6807 "PhotoMetadata.c" - GeeList* _tmp9_; + if (_tmp7_ != NULL) { +#line 6972 "PhotoMetadata.c" + GeeList* _tmp8_; + gint _tmp9_; gint _tmp10_; - gint _tmp11_; #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = titles; + _tmp8_ = titles; #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = _tmp11_ > 0; -#line 6819 "PhotoMetadata.c" + _tmp6_ = _tmp10_ > 0; +#line 6984 "PhotoMetadata.c" } else { #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = FALSE; -#line 6823 "PhotoMetadata.c" + _tmp6_ = FALSE; +#line 6988 "PhotoMetadata.c" } #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp7_) { -#line 6827 "PhotoMetadata.c" - GeeList* _tmp12_; - gpointer _tmp13_; + if (_tmp6_) { +#line 6992 "PhotoMetadata.c" + GeeList* _tmp11_; + gpointer _tmp12_; #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = titles; + _tmp11_ = titles; #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = gee_list_get (_tmp12_, 0); + _tmp12_ = gee_list_get (_tmp11_, 0); #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = (gchar*) _tmp13_; -#line 6838 "PhotoMetadata.c" + _tmp5_ = (gchar*) _tmp12_; +#line 7003 "PhotoMetadata.c" } else { #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = NULL; -#line 6844 "PhotoMetadata.c" + _tmp5_ = NULL; +#line 7009 "PhotoMetadata.c" } #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = g_strdup (_tmp6_); + _tmp13_ = g_strdup (_tmp5_); #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - title = _tmp14_; + title = _tmp13_; #line 957 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = title; + _tmp14_ = title; #line 957 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp15_ != NULL) { -#line 6854 "PhotoMetadata.c" - const gchar* _tmp16_; - gchar* _tmp17_; + if (_tmp14_ != NULL) { +#line 7019 "PhotoMetadata.c" + const gchar* _tmp15_; + gchar* _tmp16_; #line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = title; + _tmp15_ = title; #line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = string_strip (_tmp16_); + _tmp16_ = string_strip (_tmp15_); #line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (title); #line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - title = _tmp17_; -#line 6865 "PhotoMetadata.c" + title = _tmp16_; +#line 7030 "PhotoMetadata.c" } #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp21_ = title; -#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = is_string_empty (_tmp21_); -#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp22_) { -#line 6873 "PhotoMetadata.c" - const gchar* _tmp23_; - gboolean _tmp24_; + _tmp20_ = title; #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23_ = title; + if (!is_string_empty (_tmp20_)) { +#line 7036 "PhotoMetadata.c" + const gchar* _tmp21_; #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp24_ = string_contains (_tmp23_, "\n"); + _tmp21_ = title; #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = !_tmp24_; -#line 6882 "PhotoMetadata.c" + _tmp19_ = !string_contains (_tmp21_, "\n"); +#line 7042 "PhotoMetadata.c" } else { #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = FALSE; -#line 6886 "PhotoMetadata.c" + _tmp19_ = FALSE; +#line 7046 "PhotoMetadata.c" } #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp20_) { -#line 6890 "PhotoMetadata.c" - const gchar* _tmp25_; - gboolean _tmp26_; -#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp25_ = title; + if (_tmp19_) { +#line 7050 "PhotoMetadata.c" + const gchar* _tmp22_; #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp26_ = string_contains (_tmp25_, "\r"); + _tmp22_ = title; #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = !_tmp26_; -#line 6899 "PhotoMetadata.c" + _tmp18_ = !string_contains (_tmp22_, "\r"); +#line 7056 "PhotoMetadata.c" } else { #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = FALSE; -#line 6903 "PhotoMetadata.c" + _tmp18_ = FALSE; +#line 7060 "PhotoMetadata.c" } #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp19_) { -#line 6907 "PhotoMetadata.c" - const gchar* _tmp27_; + if (_tmp18_) { +#line 7064 "PhotoMetadata.c" + const gchar* _tmp23_; #line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp27_ = title; + _tmp23_ = title; #line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = _tmp27_; -#line 6913 "PhotoMetadata.c" + _tmp17_ = _tmp23_; +#line 7070 "PhotoMetadata.c" } else { #line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = NULL; -#line 6917 "PhotoMetadata.c" + _tmp17_ = NULL; +#line 7074 "PhotoMetadata.c" } #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp28_ = g_strdup (_tmp18_); + _tmp24_ = g_strdup (_tmp17_); #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp28_; + result = _tmp24_; #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (title); #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (titles); #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_tmp0_); #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6933 "PhotoMetadata.c" +#line 7090 "PhotoMetadata.c" } -void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMetadataSetOption option) { - const gchar* _tmp0_; - gboolean _tmp1_; +void +photo_metadata_set_title (PhotoMetadata* self, + const gchar* title, + PhotoMetadataSetOption option) +{ #line 965 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 966 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = title; -#line 966 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = is_string_empty (_tmp0_); -#line 966 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp1_) { -#line 6948 "PhotoMetadata.c" - gboolean _tmp2_; + if (!is_string_empty (title)) { #line 967 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG); -#line 967 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp2_) { -#line 6954 "PhotoMetadata.c" - const gchar* _tmp3_; -#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = title; + if (photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG)) { #line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string (self, PHOTO_METADATA_IPHOTO_TITLE_TAG, _tmp3_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 6960 "PhotoMetadata.c" + photo_metadata_set_string (self, PHOTO_METADATA_IPHOTO_TITLE_TAG, title, PHOTO_METADATA_PREPARE_STRING_OPTIONS); +#line 7107 "PhotoMetadata.c" } else { - gchar** _tmp4_; - gint _tmp4__length1; - const gchar* _tmp5_; - PhotoMetadataSetOption _tmp6_; + gchar** _tmp0_; + gint _tmp0__length1; #line 970 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = photo_metadata_STANDARD_TITLE_TAGS; + _tmp0_ = photo_metadata_STANDARD_TITLE_TAGS; #line 970 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1; + _tmp0__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1; #line 970 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = title; -#line 970 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = option; -#line 970 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_all_string (self, _tmp4_, _tmp4__length1, _tmp5_, _tmp6_); -#line 6976 "PhotoMetadata.c" + photo_metadata_set_all_string (self, _tmp0_, _tmp0__length1, title, option); +#line 7117 "PhotoMetadata.c" } } else { - gchar** _tmp7_; - gint _tmp7__length1; + gchar** _tmp1_; + gint _tmp1__length1; #line 972 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = photo_metadata_STANDARD_TITLE_TAGS; + _tmp1_ = photo_metadata_STANDARD_TITLE_TAGS; #line 972 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1; + _tmp1__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1; #line 972 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_remove_tags (self, _tmp7_, _tmp7__length1); -#line 6987 "PhotoMetadata.c" + photo_metadata_remove_tags (self, _tmp1_, _tmp1__length1); +#line 7128 "PhotoMetadata.c" } } -static gchar* photo_metadata_real_get_comment (MediaMetadata* base) { +static gchar* +photo_metadata_real_get_comment (MediaMetadata* base) +{ PhotoMetadata * self; gchar* result = NULL; gchar** _tmp0_; @@ -7011,25 +7154,29 @@ static gchar* photo_metadata_real_get_comment (MediaMetadata* base) { result = _tmp1_; #line 982 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 7010 "PhotoMetadata.c" +#line 7153 "PhotoMetadata.c" } -static Block6Data* block6_data_ref (Block6Data* _data6_) { +static Block6Data* +block6_data_ref (Block6Data* _data6_) +{ #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&_data6_->_ref_count_); #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data6_; -#line 7019 "PhotoMetadata.c" +#line 7164 "PhotoMetadata.c" } -static void block6_data_unref (void * _userdata_) { +static void +block6_data_unref (void * _userdata_) +{ Block6Data* _data6_; _data6_ = (Block6Data*) _userdata_; #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) { -#line 7028 "PhotoMetadata.c" +#line 7175 "PhotoMetadata.c" PhotoMetadata* self; #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data6_->self; @@ -7039,42 +7186,43 @@ static void block6_data_unref (void * _userdata_) { _media_metadata_unref0 (self); #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block6Data, _data6_); -#line 7038 "PhotoMetadata.c" +#line 7185 "PhotoMetadata.c" } } -static void ___lambda10_ (Block6Data* _data6_, const gchar* tag) { +static void +___lambda10_ (Block6Data* _data6_, + const gchar* tag) +{ PhotoMetadata* self; - const gchar* _tmp0_; - const gchar* _tmp1_; #line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data6_->self; #line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); #line 991 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; -#line 991 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = _data6_->comment; -#line 991 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string (self, _tmp0_, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS & (~PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF)); -#line 7057 "PhotoMetadata.c" + photo_metadata_set_string (self, tag, _data6_->comment, PHOTO_METADATA_PREPARE_STRING_OPTIONS & (~PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF)); +#line 7201 "PhotoMetadata.c" } -static void ____lambda10__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { +static void +____lambda10__photo_metadata_set_generic_value (const gchar* tag, + gpointer self) +{ #line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ___lambda10_ (self, tag); -#line 7064 "PhotoMetadata.c" +#line 7211 "PhotoMetadata.c" } -void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, PhotoMetadataSetOption option) { +void +photo_metadata_set_comment (PhotoMetadata* self, + const gchar* comment, + PhotoMetadataSetOption option) +{ Block6Data* _data6_; - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; + gchar* _tmp0_; #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7084,60 +7232,56 @@ void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, Phot #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data6_->self = media_metadata_ref (self); #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = comment; -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (comment); #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_data6_->comment); #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _data6_->comment = _tmp1_; -#line 989 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = _data6_->comment; + _data6_->comment = _tmp0_; #line 989 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = is_string_empty (_tmp2_); -#line 989 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp3_) { -#line 7096 "PhotoMetadata.c" - gchar** _tmp4_; - gint _tmp4__length1; - PhotoMetadataSetOption _tmp5_; -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = photo_metadata_COMMENT_TAGS; + if (!is_string_empty (_data6_->comment)) { +#line 7238 "PhotoMetadata.c" + gchar** _tmp1_; + gint _tmp1__length1; #line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4__length1 = photo_metadata_COMMENT_TAGS_length1; + _tmp1_ = photo_metadata_COMMENT_TAGS; #line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = option; + _tmp1__length1 = photo_metadata_COMMENT_TAGS_length1; #line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_all_generic (self, _tmp4_, _tmp4__length1, _tmp5_, ____lambda10__photo_metadata_set_generic_value, _data6_); -#line 7108 "PhotoMetadata.c" + photo_metadata_set_all_generic (self, _tmp1_, _tmp1__length1, option, ____lambda10__photo_metadata_set_generic_value, _data6_); +#line 7247 "PhotoMetadata.c" } else { - gchar** _tmp6_; - gint _tmp6__length1; + gchar** _tmp2_; + gint _tmp2__length1; #line 995 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = photo_metadata_COMMENT_TAGS; + _tmp2_ = photo_metadata_COMMENT_TAGS; #line 995 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6__length1 = photo_metadata_COMMENT_TAGS_length1; + _tmp2__length1 = photo_metadata_COMMENT_TAGS_length1; #line 995 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_remove_tags (self, _tmp6_, _tmp6__length1); -#line 7118 "PhotoMetadata.c" + photo_metadata_remove_tags (self, _tmp2_, _tmp2__length1); +#line 7257 "PhotoMetadata.c" } #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" block6_data_unref (_data6_); #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data6_ = NULL; -#line 7124 "PhotoMetadata.c" +#line 7263 "PhotoMetadata.c" } -GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify) { +GeeSet* +photo_metadata_get_keywords (PhotoMetadata* self, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify) +{ GeeSet* result = NULL; GeeSet* keywords = NULL; gchar** _tmp0_; gint _tmp0__length1; - GeeSet* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; - GeeSet* _tmp24_; - GeeSet* _tmp29_; + GeeSet* _tmp21_ = NULL; + gboolean _tmp22_ = FALSE; + GeeSet* _tmp23_; + GeeSet* _tmp28_; #line 1015 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 1016 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7146,7 +7290,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa _tmp0_ = photo_metadata_KEYWORD_TAGS; #line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_KEYWORD_TAGS_length1; -#line 7145 "PhotoMetadata.c" +#line 7289 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; @@ -7158,14 +7302,14 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa tag_collection_length1 = _tmp0__length1; #line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 7157 "PhotoMetadata.c" +#line 7301 "PhotoMetadata.c" gchar* _tmp1_; gchar* tag = NULL; #line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); #line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp1_; -#line 7164 "PhotoMetadata.c" +#line 7308 "PhotoMetadata.c" { GeeCollection* values = NULL; const gchar* _tmp2_; @@ -7182,7 +7326,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa _tmp5_ = values; #line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp5_ != NULL) { -#line 7181 "PhotoMetadata.c" +#line 7325 "PhotoMetadata.c" GeeCollection* _tmp6_; gint _tmp7_; gint _tmp8_; @@ -7194,21 +7338,21 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa _tmp8_ = _tmp7_; #line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = _tmp8_ > 0; -#line 7193 "PhotoMetadata.c" +#line 7337 "PhotoMetadata.c" } else { #line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = FALSE; -#line 7197 "PhotoMetadata.c" +#line 7341 "PhotoMetadata.c" } #line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_) { -#line 7201 "PhotoMetadata.c" +#line 7345 "PhotoMetadata.c" GeeSet* _tmp9_; #line 1020 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = keywords; #line 1020 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp9_ == NULL) { -#line 7207 "PhotoMetadata.c" +#line 7351 "PhotoMetadata.c" GCompareDataFunc _tmp10_; void* _tmp10__target; GDestroyNotify _tmp10__target_destroy_notify; @@ -7231,7 +7375,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa _g_object_unref0 (keywords); #line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keywords = _tmp11_; -#line 7230 "PhotoMetadata.c" +#line 7374 "PhotoMetadata.c" } { GeeIterator* _current_value_it = NULL; @@ -7245,101 +7389,98 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa _current_value_it = _tmp13_; #line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 7244 "PhotoMetadata.c" +#line 7388 "PhotoMetadata.c" GeeIterator* _tmp14_; - gboolean _tmp15_; gchar* current_value = NULL; - GeeIterator* _tmp16_; - gpointer _tmp17_; - GeeSet* _tmp18_; - const gchar* _tmp19_; + GeeIterator* _tmp15_; + gpointer _tmp16_; + GeeSet* _tmp17_; + const gchar* _tmp18_; + gchar* _tmp19_; gchar* _tmp20_; - gchar* _tmp21_; #line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = _current_value_it; #line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = gee_iterator_next (_tmp14_); -#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp15_) { + if (!gee_iterator_next (_tmp14_)) { #line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 7262 "PhotoMetadata.c" +#line 7403 "PhotoMetadata.c" } #line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = _current_value_it; + _tmp15_ = _current_value_it; #line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = gee_iterator_get (_tmp16_); + _tmp16_ = gee_iterator_get (_tmp15_); #line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - current_value = (gchar*) _tmp17_; + current_value = (gchar*) _tmp16_; #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = keywords; + _tmp17_ = keywords; #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = current_value; + _tmp18_ = current_value; #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp19_); + _tmp19_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp18_); #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp21_ = _tmp20_; + _tmp20_ = _tmp19_; #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_); #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp21_); + _g_free0 (_tmp20_); #line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_value); -#line 7284 "PhotoMetadata.c" +#line 7425 "PhotoMetadata.c" } #line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_value_it); -#line 7288 "PhotoMetadata.c" +#line 7429 "PhotoMetadata.c" } } #line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); #line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 7295 "PhotoMetadata.c" +#line 7436 "PhotoMetadata.c" } } } #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp24_ = keywords; + _tmp23_ = keywords; #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp24_ != NULL) { -#line 7303 "PhotoMetadata.c" - GeeSet* _tmp25_; + if (_tmp23_ != NULL) { +#line 7444 "PhotoMetadata.c" + GeeSet* _tmp24_; + gint _tmp25_; gint _tmp26_; - gint _tmp27_; #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp25_ = keywords; + _tmp24_ = keywords; #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp25_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp27_ = _tmp26_; + _tmp26_ = _tmp25_; #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23_ = _tmp27_ > 0; -#line 7315 "PhotoMetadata.c" + _tmp22_ = _tmp26_ > 0; +#line 7456 "PhotoMetadata.c" } else { #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23_ = FALSE; -#line 7319 "PhotoMetadata.c" + _tmp22_ = FALSE; +#line 7460 "PhotoMetadata.c" } #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp23_) { -#line 7323 "PhotoMetadata.c" - GeeSet* _tmp28_; + if (_tmp22_) { +#line 7464 "PhotoMetadata.c" + GeeSet* _tmp27_; #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp28_ = keywords; + _tmp27_ = keywords; #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = _tmp28_; -#line 7329 "PhotoMetadata.c" + _tmp21_ = _tmp27_; +#line 7470 "PhotoMetadata.c" } else { #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = NULL; -#line 7333 "PhotoMetadata.c" + _tmp21_ = NULL; +#line 7474 "PhotoMetadata.c" } #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp29_ = _g_object_ref0 (_tmp22_); + _tmp28_ = _g_object_ref0 (_tmp21_); #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp29_; + result = _tmp28_; #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (keywords); #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7352,353 +7493,293 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa compare_func_target_destroy_notify = NULL; #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 7351 "PhotoMetadata.c" +#line 7492 "PhotoMetadata.c" } -static gpointer _hierarchical_keyword_field_ref0 (gpointer self) { +static gpointer +_hierarchical_keyword_field_ref0 (gpointer self) +{ #line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? hierarchical_keyword_field_ref (self) : NULL; -#line 7358 "PhotoMetadata.c" +#line 7501 "PhotoMetadata.c" } -static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { +static gchar* +string_replace (const gchar* self, + const gchar* old, + const gchar* replacement) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if ((*((gchar*) self)) == '\0') { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 7377 "PhotoMetadata.c" +#line 7524 "PhotoMetadata.c" } else { - const gchar* _tmp2_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; -#line 7384 "PhotoMetadata.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) old)) == '\0'; +#line 7528 "PhotoMetadata.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = TRUE; -#line 7390 "PhotoMetadata.c" +#line 7534 "PhotoMetadata.c" } else { - const gchar* _tmp3_; - const gchar* _tmp4_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = replacement; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; -#line 7400 "PhotoMetadata.c" - } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (old, replacement) == 0; +#line 7538 "PhotoMetadata.c" + } +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 7404 "PhotoMetadata.c" - gchar* _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = g_strdup (self); -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 7542 "PhotoMetadata.c" + gchar* _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = g_strdup (self); +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 7412 "PhotoMetadata.c" +#line 7550 "PhotoMetadata.c" } { GRegex* regex = NULL; - const gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - GRegex* _tmp9_; - GRegex* _tmp10_; - gchar* _tmp11_ = NULL; - GRegex* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = old; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = g_regex_escape_string (_tmp6_, -1); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = _tmp9_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp8_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - regex = _tmp10_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp3_; + gchar* _tmp4_; + GRegex* _tmp5_; + GRegex* _tmp6_; + gchar* _tmp7_ = NULL; + GRegex* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_regex_escape_string (old, -1); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = _tmp3_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp5_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp4_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + regex = _tmp6_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 7444 "PhotoMetadata.c" +#line 7578 "PhotoMetadata.c" goto __catch31_g_regex_error; } -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 7453 "PhotoMetadata.c" +#line 7587 "PhotoMetadata.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = regex; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = replacement; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp14_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = regex; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp9_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 7469 "PhotoMetadata.c" +#line 7601 "PhotoMetadata.c" goto __catch31_g_regex_error; } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 7480 "PhotoMetadata.c" +#line 7612 "PhotoMetadata.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = _tmp11_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = NULL; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp15_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp11_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = _tmp7_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = NULL; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp10_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp7_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 7494 "PhotoMetadata.c" +#line 7626 "PhotoMetadata.c" } goto __finally31; __catch31_g_regex_error: { GError* e = NULL; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 7508 "PhotoMetadata.c" +#line 7640 "PhotoMetadata.c" } __finally31: -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 7519 "PhotoMetadata.c" +#line 7651 "PhotoMetadata.c" } } -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, + glong maxlen) +{ glong result = 0L; gchar* end = NULL; gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 7543 "PhotoMetadata.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 7551 "PhotoMetadata.c" +#line 7676 "PhotoMetadata.c" } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 7563 "PhotoMetadata.c" +#line 7685 "PhotoMetadata.c" } } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, + glong offset, + glong len) +{ gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + glong _tmp6_; + gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#line 7587 "PhotoMetadata.c" - glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = _tmp2_ >= ((glong) 0); -#line 7593 "PhotoMetadata.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = len >= ((glong) 0); +#line 7706 "PhotoMetadata.c" } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 7597 "PhotoMetadata.c" +#line 7710 "PhotoMetadata.c" } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 7601 "PhotoMetadata.c" +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = string_strnlen ((gchar*) self, offset + len); +#line 7716 "PhotoMetadata.c" + } else { + gint _tmp1_; + gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = (glong) _tmp2_; +#line 7726 "PhotoMetadata.c" + } +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset < ((glong) 0)) { +#line 7730 "PhotoMetadata.c" glong _tmp3_; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 7738 "PhotoMetadata.c" + } else { glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 7745 "PhotoMetadata.c" + } +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (len < ((glong) 0)) { +#line 7749 "PhotoMetadata.c" glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 7613 "PhotoMetadata.c" - } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#line 7623 "PhotoMetadata.c" - } -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp8_ < ((glong) 0)) { -#line 7629 "PhotoMetadata.c" - glong _tmp9_; - glong _tmp10_; - glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 7643 "PhotoMetadata.c" - } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 7653 "PhotoMetadata.c" - } -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp14_ < ((glong) 0)) { -#line 7659 "PhotoMetadata.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 7668 "PhotoMetadata.c" - } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp5_ - offset; +#line 7755 "PhotoMetadata.c" + } +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 7688 "PhotoMetadata.c" +#line 7767 "PhotoMetadata.c" } -static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* self, HierarchicalTagIndex* index) { +static void +photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* self, + HierarchicalTagIndex* index) +{ HierarchicalKeywordField** _tmp0_; gint _tmp0__length1; - HierarchicalTagIndex* _tmp4_; - HierarchicalKeywordField** _tmp5_; - gint _tmp5__length1; + HierarchicalKeywordField** _tmp4_; + gint _tmp4__length1; #line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7707,7 +7788,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se _tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; #line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; -#line 7706 "PhotoMetadata.c" +#line 7787 "PhotoMetadata.c" { HierarchicalKeywordField** current_field_collection = NULL; gint current_field_collection_length1 = 0; @@ -7719,14 +7800,14 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se current_field_collection_length1 = _tmp0__length1; #line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (current_field_it = 0; current_field_it < _tmp0__length1; current_field_it = current_field_it + 1) { -#line 7718 "PhotoMetadata.c" +#line 7799 "PhotoMetadata.c" HierarchicalKeywordField* _tmp1_; HierarchicalKeywordField* current_field = NULL; #line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]); #line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_field = _tmp1_; -#line 7725 "PhotoMetadata.c" +#line 7806 "PhotoMetadata.c" { HierarchicalKeywordField* _tmp2_; const gchar* _tmp3_; @@ -7738,192 +7819,186 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se photo_metadata_remove_tag (self, _tmp3_); #line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (current_field); -#line 7737 "PhotoMetadata.c" +#line 7818 "PhotoMetadata.c" } } } #line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = index; -#line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_ == NULL) { + if (index == NULL) { #line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 7747 "PhotoMetadata.c" +#line 7826 "PhotoMetadata.c" } #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; + _tmp4_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; -#line 7753 "PhotoMetadata.c" + _tmp4__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; +#line 7832 "PhotoMetadata.c" { HierarchicalKeywordField** current_field_collection = NULL; gint current_field_collection_length1 = 0; gint _current_field_collection_size_ = 0; gint current_field_it = 0; #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - current_field_collection = _tmp5_; + current_field_collection = _tmp4_; #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - current_field_collection_length1 = _tmp5__length1; + current_field_collection_length1 = _tmp4__length1; #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (current_field_it = 0; current_field_it < _tmp5__length1; current_field_it = current_field_it + 1) { -#line 7765 "PhotoMetadata.c" - HierarchicalKeywordField* _tmp6_; + for (current_field_it = 0; current_field_it < _tmp4__length1; current_field_it = current_field_it + 1) { +#line 7844 "PhotoMetadata.c" + HierarchicalKeywordField* _tmp5_; HierarchicalKeywordField* current_field = NULL; #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]); + _tmp5_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]); #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - current_field = _tmp6_; -#line 7772 "PhotoMetadata.c" + current_field = _tmp5_; +#line 7851 "PhotoMetadata.c" { - HierarchicalKeywordField* _tmp7_; - gboolean _tmp8_; + HierarchicalKeywordField* _tmp6_; + gboolean _tmp7_; GeeSet* writeable_set = NULL; - GeeTreeSet* _tmp9_; - HierarchicalKeywordField* _tmp29_; - const gchar* _tmp30_; - GeeSet* _tmp31_; + GeeTreeSet* _tmp8_; + HierarchicalKeywordField* _tmp26_; + const gchar* _tmp27_; + GeeSet* _tmp28_; #line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = current_field; + _tmp6_ = current_field; #line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = _tmp7_->is_writeable; + _tmp7_ = _tmp6_->is_writeable; #line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp8_) { + if (!_tmp7_) { #line 1040 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (current_field); #line 1040 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" continue; -#line 7791 "PhotoMetadata.c" +#line 7870 "PhotoMetadata.c" } #line 1042 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp8_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 1042 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - writeable_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_SET, GeeSet); -#line 7797 "PhotoMetadata.c" + writeable_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_SET, GeeSet); +#line 7876 "PhotoMetadata.c" { GeeIterator* _current_path_it = NULL; - HierarchicalTagIndex* _tmp10_; - GeeCollection* _tmp11_; - GeeCollection* _tmp12_; - GeeIterator* _tmp13_; - GeeIterator* _tmp14_; -#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = index; + GeeCollection* _tmp9_; + GeeCollection* _tmp10_; + GeeIterator* _tmp11_; + GeeIterator* _tmp12_; #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = hierarchical_tag_index_get_all_paths (_tmp10_); + _tmp9_ = hierarchical_tag_index_get_all_paths (index); #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp10_); #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _current_path_it = _tmp14_; + _current_path_it = _tmp12_; #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 7821 "PhotoMetadata.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 7897 "PhotoMetadata.c" + GeeIterator* _tmp13_; gchar* current_path = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; + GeeIterator* _tmp14_; + gpointer _tmp15_; gchar* writeable_path = NULL; - const gchar* _tmp19_; + const gchar* _tmp16_; + HierarchicalKeywordField* _tmp17_; + const gchar* _tmp18_; + gchar* _tmp19_; HierarchicalKeywordField* _tmp20_; - const gchar* _tmp21_; - gchar* _tmp22_; - HierarchicalKeywordField* _tmp23_; - gboolean _tmp24_; - GeeSet* _tmp27_; - const gchar* _tmp28_; + gboolean _tmp21_; + GeeSet* _tmp24_; + const gchar* _tmp25_; #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = _current_path_it; + _tmp13_ = _current_path_it; #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = gee_iterator_next (_tmp15_); -#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp13_)) { #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 7844 "PhotoMetadata.c" +#line 7917 "PhotoMetadata.c" } #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = _current_path_it; + _tmp14_ = _current_path_it; #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp15_ = gee_iterator_get (_tmp14_); #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - current_path = (gchar*) _tmp18_; + current_path = (gchar*) _tmp15_; #line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = current_path; + _tmp16_ = current_path; #line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = current_field; + _tmp17_ = current_field; #line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp21_ = _tmp20_->path_separator; + _tmp18_ = _tmp17_->path_separator; #line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = string_replace (_tmp19_, TAG_PATH_SEPARATOR_STRING, _tmp21_); + _tmp19_ = string_replace (_tmp16_, TAG_PATH_SEPARATOR_STRING, _tmp18_); #line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - writeable_path = _tmp22_; + writeable_path = _tmp19_; #line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23_ = current_field; + _tmp20_ = current_field; #line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp24_ = _tmp23_->wants_leading_separator; + _tmp21_ = _tmp20_->wants_leading_separator; #line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp24_) { -#line 7868 "PhotoMetadata.c" - const gchar* _tmp25_; - gchar* _tmp26_; + if (!_tmp21_) { +#line 7941 "PhotoMetadata.c" + const gchar* _tmp22_; + gchar* _tmp23_; #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp25_ = writeable_path; + _tmp22_ = writeable_path; #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp26_ = string_substring (_tmp25_, (glong) 1, (glong) -1); + _tmp23_ = string_substring (_tmp22_, (glong) 1, (glong) -1); #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (writeable_path); #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - writeable_path = _tmp26_; -#line 7879 "PhotoMetadata.c" + writeable_path = _tmp23_; +#line 7952 "PhotoMetadata.c" } #line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp27_ = writeable_set; + _tmp24_ = writeable_set; #line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp28_ = writeable_path; + _tmp25_ = writeable_path; #line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_); #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (writeable_path); #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_path); -#line 7891 "PhotoMetadata.c" +#line 7964 "PhotoMetadata.c" } #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_path_it); -#line 7895 "PhotoMetadata.c" +#line 7968 "PhotoMetadata.c" } #line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp29_ = current_field; + _tmp26_ = current_field; #line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp30_ = _tmp29_->field_name; + _tmp27_ = _tmp26_->field_name; #line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp31_ = writeable_set; + _tmp28_ = writeable_set; #line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string_multiple (self, _tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection)); + photo_metadata_set_string_multiple (self, _tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (writeable_set); #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (current_field); -#line 7909 "PhotoMetadata.c" +#line 7982 "PhotoMetadata.c" } } } } -void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, PhotoMetadataSetOption option) { +void +photo_metadata_set_keywords (PhotoMetadata* self, + GeeCollection* keywords, + PhotoMetadataSetOption option) +{ HierarchicalTagIndex* htag_index = NULL; HierarchicalTagIndex* _tmp0_; GeeSet* flat_keywords = NULL; GeeTreeSet* _tmp1_; - GeeCollection* _tmp2_; - GeeCollection* _tmp28_; #line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7937,203 +8012,186 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, #line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" flat_keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SET, GeeSet); #line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = keywords; -#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp2_ != NULL) { -#line 7939 "PhotoMetadata.c" - GeeSet* _tmp24_; - HierarchicalTagIndex* _tmp25_; - GeeCollection* _tmp26_; - GeeCollection* _tmp27_; + if (keywords != NULL) { +#line 8012 "PhotoMetadata.c" + GeeSet* _tmp19_; + HierarchicalTagIndex* _tmp20_; + GeeCollection* _tmp21_; + GeeCollection* _tmp22_; { GeeIterator* _keyword_it = NULL; - GeeCollection* _tmp3_; - GeeIterator* _tmp4_; + GeeIterator* _tmp2_; #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = keywords; + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (keywords, GEE_TYPE_ITERABLE, GeeIterable)); #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _keyword_it = _tmp4_; + _keyword_it = _tmp2_; #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 7956 "PhotoMetadata.c" - GeeIterator* _tmp5_; - gboolean _tmp6_; +#line 8026 "PhotoMetadata.c" + GeeIterator* _tmp3_; gchar* keyword = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; - const gchar* _tmp9_; - gboolean _tmp10_; -#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = _keyword_it; + GeeIterator* _tmp4_; + gpointer _tmp5_; + const gchar* _tmp6_; #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = gee_iterator_next (_tmp5_); + _tmp3_ = _keyword_it; #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp3_)) { #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 7972 "PhotoMetadata.c" +#line 8038 "PhotoMetadata.c" } #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = _keyword_it; + _tmp4_ = _keyword_it; #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - keyword = (gchar*) _tmp8_; -#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = keyword; + keyword = (gchar*) _tmp5_; #line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = g_str_has_prefix (_tmp9_, TAG_PATH_SEPARATOR_STRING); + _tmp6_ = keyword; #line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp10_) { -#line 7986 "PhotoMetadata.c" + if (g_str_has_prefix (_tmp6_, TAG_PATH_SEPARATOR_STRING)) { +#line 8050 "PhotoMetadata.c" GeeCollection* path_components = NULL; - const gchar* _tmp11_; - GeeList* _tmp12_; + const gchar* _tmp7_; + GeeList* _tmp8_; #line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = keyword; + _tmp7_ = keyword; #line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = hierarchical_tag_utilities_enumerate_path_components (_tmp11_); + _tmp8_ = hierarchical_tag_utilities_enumerate_path_components (_tmp7_); #line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - path_components = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection); -#line 7996 "PhotoMetadata.c" + path_components = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection); +#line 8060 "PhotoMetadata.c" { GeeIterator* _component_it = NULL; - GeeCollection* _tmp13_; - GeeIterator* _tmp14_; + GeeCollection* _tmp9_; + GeeIterator* _tmp10_; #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = path_components; + _tmp9_ = path_components; #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _component_it = _tmp14_; + _component_it = _tmp10_; #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 8009 "PhotoMetadata.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 8073 "PhotoMetadata.c" + GeeIterator* _tmp11_; gchar* component = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; - HierarchicalTagIndex* _tmp19_; - const gchar* _tmp20_; - const gchar* _tmp21_; + GeeIterator* _tmp12_; + gpointer _tmp13_; + HierarchicalTagIndex* _tmp14_; + const gchar* _tmp15_; + const gchar* _tmp16_; #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = _component_it; + _tmp11_ = _component_it; #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = gee_iterator_next (_tmp15_); -#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp11_)) { #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 8026 "PhotoMetadata.c" +#line 8087 "PhotoMetadata.c" } #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = _component_it; + _tmp12_ = _component_it; #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - component = (gchar*) _tmp18_; + component = (gchar*) _tmp13_; #line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = htag_index; + _tmp14_ = htag_index; #line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = component; + _tmp15_ = component; #line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp21_ = keyword; + _tmp16_ = keyword; #line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - hierarchical_tag_index_add_path (_tmp19_, _tmp20_, _tmp21_); + hierarchical_tag_index_add_path (_tmp14_, _tmp15_, _tmp16_); #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (component); -#line 8044 "PhotoMetadata.c" +#line 8105 "PhotoMetadata.c" } #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_component_it); -#line 8048 "PhotoMetadata.c" +#line 8109 "PhotoMetadata.c" } #line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (path_components); -#line 8052 "PhotoMetadata.c" +#line 8113 "PhotoMetadata.c" } else { - GeeSet* _tmp22_; - const gchar* _tmp23_; + GeeSet* _tmp17_; + const gchar* _tmp18_; #line 1069 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = flat_keywords; + _tmp17_ = flat_keywords; #line 1069 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23_ = keyword; + _tmp18_ = keyword; #line 1069 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_); -#line 8062 "PhotoMetadata.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection), _tmp18_); +#line 8123 "PhotoMetadata.c" } #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (keyword); -#line 8066 "PhotoMetadata.c" +#line 8127 "PhotoMetadata.c" } #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_keyword_it); -#line 8070 "PhotoMetadata.c" +#line 8131 "PhotoMetadata.c" } #line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp24_ = flat_keywords; + _tmp19_ = flat_keywords; #line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp25_ = htag_index; + _tmp20_ = htag_index; #line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp26_ = hierarchical_tag_index_get_all_tags (_tmp25_); + _tmp21_ = hierarchical_tag_index_get_all_tags (_tmp20_); #line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp27_ = _tmp26_; + _tmp22_ = _tmp21_; #line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_); + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection), _tmp22_); #line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_object_unref0 (_tmp27_); -#line 8084 "PhotoMetadata.c" + _g_object_unref0 (_tmp22_); +#line 8145 "PhotoMetadata.c" } #line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp28_ = keywords; -#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp28_ != NULL) { -#line 8090 "PhotoMetadata.c" - gchar** _tmp29_; - gint _tmp29__length1; - GeeSet* _tmp30_; - PhotoMetadataSetOption _tmp31_; - HierarchicalTagIndex* _tmp32_; -#line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp29_ = photo_metadata_KEYWORD_TAGS; + if (keywords != NULL) { +#line 8149 "PhotoMetadata.c" + gchar** _tmp23_; + gint _tmp23__length1; + GeeSet* _tmp24_; + HierarchicalTagIndex* _tmp25_; #line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp29__length1 = photo_metadata_KEYWORD_TAGS_length1; + _tmp23_ = photo_metadata_KEYWORD_TAGS; #line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp30_ = flat_keywords; + _tmp23__length1 = photo_metadata_KEYWORD_TAGS_length1; #line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp31_ = option; + _tmp24_ = flat_keywords; #line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_all_string_multiple (self, _tmp29_, _tmp29__length1, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), _tmp31_); + photo_metadata_set_all_string_multiple (self, _tmp23_, _tmp23__length1, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), option); #line 1078 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp32_ = htag_index; + _tmp25_ = htag_index; #line 1078 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_internal_set_hierarchical_keywords (self, _tmp32_); -#line 8110 "PhotoMetadata.c" + photo_metadata_internal_set_hierarchical_keywords (self, _tmp25_); +#line 8166 "PhotoMetadata.c" } else { - gchar** _tmp33_; - gint _tmp33__length1; + gchar** _tmp26_; + gint _tmp26__length1; #line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp33_ = photo_metadata_KEYWORD_TAGS; + _tmp26_ = photo_metadata_KEYWORD_TAGS; #line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp33__length1 = photo_metadata_KEYWORD_TAGS_length1; + _tmp26__length1 = photo_metadata_KEYWORD_TAGS_length1; #line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_remove_tags (self, _tmp33_, _tmp33__length1); + photo_metadata_remove_tags (self, _tmp26_, _tmp26__length1); #line 1081 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_internal_set_hierarchical_keywords (self, NULL); -#line 8122 "PhotoMetadata.c" +#line 8178 "PhotoMetadata.c" } #line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (flat_keywords); #line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_tag_index_unref0 (htag_index); -#line 8128 "PhotoMetadata.c" +#line 8184 "PhotoMetadata.c" } -gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { +gboolean +photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) +{ gboolean result = FALSE; HierarchicalKeywordField** _tmp0_; gint _tmp0__length1; @@ -8143,7 +8201,7 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { _tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; #line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; -#line 8142 "PhotoMetadata.c" +#line 8200 "PhotoMetadata.c" { HierarchicalKeywordField** field_collection = NULL; gint field_collection_length1 = 0; @@ -8155,14 +8213,14 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { field_collection_length1 = _tmp0__length1; #line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (field_it = 0; field_it < _tmp0__length1; field_it = field_it + 1) { -#line 8154 "PhotoMetadata.c" +#line 8212 "PhotoMetadata.c" HierarchicalKeywordField* _tmp1_; HierarchicalKeywordField* field = NULL; #line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]); #line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" field = _tmp1_; -#line 8161 "PhotoMetadata.c" +#line 8219 "PhotoMetadata.c" { GeeCollection* values = NULL; HierarchicalKeywordField* _tmp2_; @@ -8182,7 +8240,7 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { _tmp6_ = values; #line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp6_ != NULL) { -#line 8181 "PhotoMetadata.c" +#line 8239 "PhotoMetadata.c" GeeCollection* _tmp7_; gint _tmp8_; gint _tmp9_; @@ -8194,11 +8252,11 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { _tmp9_ = _tmp8_; #line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _tmp9_ > 0; -#line 8193 "PhotoMetadata.c" +#line 8251 "PhotoMetadata.c" } else { #line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = FALSE; -#line 8197 "PhotoMetadata.c" +#line 8255 "PhotoMetadata.c" } #line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp5_) { @@ -8210,13 +8268,13 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { _hierarchical_keyword_field_unref0 (field); #line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8209 "PhotoMetadata.c" +#line 8267 "PhotoMetadata.c" } #line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); #line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (field); -#line 8215 "PhotoMetadata.c" +#line 8273 "PhotoMetadata.c" } } } @@ -8224,195 +8282,191 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { result = FALSE; #line 1093 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8223 "PhotoMetadata.c" +#line 8281 "PhotoMetadata.c" } -GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { +GeeSet* +photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) +{ GeeSet* result = NULL; - gboolean _tmp0_; GeeSet* h_keywords = NULL; - GeeSet* _tmp1_; - HierarchicalKeywordField** _tmp2_; - gint _tmp2__length1; + GeeSet* _tmp0_; + HierarchicalKeywordField** _tmp1_; + gint _tmp1__length1; GError * _inner_error_ = NULL; #line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = photo_metadata_has_hierarchical_keywords (self); -#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _vala_assert (_tmp0_, "has_hierarchical_keywords()"); + _vala_assert (photo_metadata_has_hierarchical_keywords (self), "has_hierarchical_keywords()"); #line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = photo_metadata_create_string_set (self, NULL, NULL, NULL); + _tmp0_ = photo_metadata_create_string_set (self, NULL, NULL, NULL); #line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - h_keywords = _tmp1_; + h_keywords = _tmp0_; #line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; + _tmp1_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; #line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; -#line 8249 "PhotoMetadata.c" + _tmp1__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; +#line 8306 "PhotoMetadata.c" { HierarchicalKeywordField** field_collection = NULL; gint field_collection_length1 = 0; gint _field_collection_size_ = 0; gint field_it = 0; #line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - field_collection = _tmp2_; + field_collection = _tmp1_; #line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - field_collection_length1 = _tmp2__length1; + field_collection_length1 = _tmp1__length1; #line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (field_it = 0; field_it < _tmp2__length1; field_it = field_it + 1) { -#line 8261 "PhotoMetadata.c" - HierarchicalKeywordField* _tmp3_; + for (field_it = 0; field_it < _tmp1__length1; field_it = field_it + 1) { +#line 8318 "PhotoMetadata.c" + HierarchicalKeywordField* _tmp2_; HierarchicalKeywordField* field = NULL; #line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]); + _tmp2_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]); #line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - field = _tmp3_; -#line 8268 "PhotoMetadata.c" + field = _tmp2_; +#line 8325 "PhotoMetadata.c" { GeeCollection* values = NULL; - HierarchicalKeywordField* _tmp4_; - const gchar* _tmp5_; - GeeList* _tmp6_; - gboolean _tmp7_ = FALSE; - GeeCollection* _tmp8_; + HierarchicalKeywordField* _tmp3_; + const gchar* _tmp4_; + GeeList* _tmp5_; + gboolean _tmp6_ = FALSE; + GeeCollection* _tmp7_; GeeArrayList* transformed_values = NULL; - GeeArrayList* _tmp12_; + GeeArrayList* _tmp11_; #line 1102 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = field; + _tmp3_ = field; #line 1102 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = _tmp4_->field_name; + _tmp4_ = _tmp3_->field_name; #line 1102 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = photo_metadata_get_string_multiple (self, _tmp5_); + _tmp5_ = photo_metadata_get_string_multiple (self, _tmp4_); #line 1102 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - values = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection); + values = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection); #line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = values; + _tmp7_ = values; #line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp8_ == NULL) { + if (_tmp7_ == NULL) { #line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = TRUE; -#line 8292 "PhotoMetadata.c" + _tmp6_ = TRUE; +#line 8349 "PhotoMetadata.c" } else { - GeeCollection* _tmp9_; + GeeCollection* _tmp8_; + gint _tmp9_; gint _tmp10_; - gint _tmp11_; #line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = values; + _tmp8_ = values; #line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = gee_collection_get_size (_tmp9_); + _tmp9_ = gee_collection_get_size (_tmp8_); #line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = _tmp11_ < 1; -#line 8305 "PhotoMetadata.c" + _tmp6_ = _tmp10_ < 1; +#line 8362 "PhotoMetadata.c" } #line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp7_) { + if (_tmp6_) { #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (field); #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" continue; -#line 8315 "PhotoMetadata.c" +#line 8372 "PhotoMetadata.c" } #line 1107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp11_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 1107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - transformed_values = _tmp12_; -#line 8321 "PhotoMetadata.c" + transformed_values = _tmp11_; +#line 8378 "PhotoMetadata.c" { GeeIterator* _current_value_it = NULL; - GeeCollection* _tmp13_; - GeeIterator* _tmp14_; + GeeCollection* _tmp12_; + GeeIterator* _tmp13_; #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = values; + _tmp12_ = values; #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _current_value_it = _tmp14_; + _current_value_it = _tmp13_; #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 8334 "PhotoMetadata.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 8391 "PhotoMetadata.c" + GeeIterator* _tmp14_; gchar* current_value = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; -#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = _current_value_it; + GeeIterator* _tmp15_; + gpointer _tmp16_; #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = gee_iterator_next (_tmp15_); + _tmp14_ = _current_value_it; #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp14_)) { #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 8348 "PhotoMetadata.c" +#line 8402 "PhotoMetadata.c" } #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = _current_value_it; + _tmp15_ = _current_value_it; #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp16_ = gee_iterator_get (_tmp15_); #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - current_value = (gchar*) _tmp18_; -#line 8356 "PhotoMetadata.c" + current_value = (gchar*) _tmp16_; +#line 8410 "PhotoMetadata.c" { GeeList* transformed = NULL; - HierarchicalKeywordField* _tmp19_; - KeywordTransformer* _tmp20_; - const gchar* _tmp21_; + HierarchicalKeywordField* _tmp17_; + KeywordTransformer* _tmp18_; + const gchar* _tmp19_; + GeeList* _tmp20_; + GeeArrayList* _tmp21_; GeeList* _tmp22_; - GeeArrayList* _tmp23_; - GeeList* _tmp24_; #line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = field; + _tmp17_ = field; #line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = _tmp19_->transformer; + _tmp18_ = _tmp17_->transformer; #line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp21_ = current_value; + _tmp19_ = current_value; #line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = keyword_transformer_transform (_tmp20_, _tmp21_, &_inner_error_); + _tmp20_ = keyword_transformer_transform (_tmp18_, _tmp19_, &_inner_error_); #line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - transformed = _tmp22_; + transformed = _tmp20_; #line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8377 "PhotoMetadata.c" +#line 8431 "PhotoMetadata.c" goto __catch32_g_error; } #line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23_ = transformed_values; + _tmp21_ = transformed_values; #line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp24_ = transformed; + _tmp22_ = transformed; #line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gee_array_list_add_all (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection)); + gee_array_list_add_all (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (transformed); -#line 8388 "PhotoMetadata.c" +#line 8442 "PhotoMetadata.c" } goto __finally32; __catch32_g_error: { GError* _error_ = NULL; + const gchar* _tmp23_; + GError* _tmp24_; const gchar* _tmp25_; - GError* _tmp26_; - const gchar* _tmp27_; #line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _error_ = _inner_error_; #line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _inner_error_ = NULL; #line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp25_ = current_value; + _tmp23_ = current_value; #line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp26_ = _error_; + _tmp24_ = _error_; #line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp27_ = _tmp26_->message; + _tmp25_ = _tmp24_->message; #line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_critical ("PhotoMetadata.vala:1113: Failed to transform tag value %s: %s", _tmp25_, _tmp27_); + g_critical ("PhotoMetadata.vala:1113: Failed to transform tag value %s: %s", _tmp23_, _tmp25_); #line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_error_free0 (_error_); -#line 8411 "PhotoMetadata.c" +#line 8465 "PhotoMetadata.c" } __finally32: #line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8435,113 +8489,113 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { g_clear_error (&_inner_error_); #line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 8434 "PhotoMetadata.c" +#line 8488 "PhotoMetadata.c" } #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_value); -#line 8438 "PhotoMetadata.c" +#line 8492 "PhotoMetadata.c" } #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_value_it); -#line 8442 "PhotoMetadata.c" +#line 8496 "PhotoMetadata.c" } { GeeArrayList* _current_value_list = NULL; - GeeArrayList* _tmp28_; - GeeArrayList* _tmp29_; + GeeArrayList* _tmp26_; + GeeArrayList* _tmp27_; gint _current_value_size = 0; - GeeArrayList* _tmp30_; - gint _tmp31_; - gint _tmp32_; + GeeArrayList* _tmp28_; + gint _tmp29_; + gint _tmp30_; gint _current_value_index = 0; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp28_ = transformed_values; + _tmp26_ = transformed_values; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp29_ = _g_object_ref0 (_tmp28_); + _tmp27_ = _g_object_ref0 (_tmp26_); #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _current_value_list = _tmp29_; + _current_value_list = _tmp27_; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp30_ = _current_value_list; + _tmp28_ = _current_value_list; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp31_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp29_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp32_ = _tmp31_; + _tmp30_ = _tmp29_; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _current_value_size = _tmp32_; + _current_value_size = _tmp30_; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _current_value_index = -1; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 8471 "PhotoMetadata.c" +#line 8525 "PhotoMetadata.c" + gint _tmp31_; + gint _tmp32_; gint _tmp33_; - gint _tmp34_; - gint _tmp35_; gchar* current_value = NULL; - GeeArrayList* _tmp36_; - gint _tmp37_; - gpointer _tmp38_; + GeeArrayList* _tmp34_; + gint _tmp35_; + gpointer _tmp36_; gchar* canonicalized = NULL; + const gchar* _tmp37_; + HierarchicalKeywordField* _tmp38_; const gchar* _tmp39_; - HierarchicalKeywordField* _tmp40_; + gchar* _tmp40_; const gchar* _tmp41_; - gchar* _tmp42_; - const gchar* _tmp43_; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp33_ = _current_value_index; + _tmp31_ = _current_value_index; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _current_value_index = _tmp33_ + 1; + _current_value_index = _tmp31_ + 1; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp34_ = _current_value_index; + _tmp32_ = _current_value_index; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp35_ = _current_value_size; + _tmp33_ = _current_value_size; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!(_tmp34_ < _tmp35_)) { + if (!(_tmp32_ < _tmp33_)) { #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 8497 "PhotoMetadata.c" +#line 8551 "PhotoMetadata.c" } #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp36_ = _current_value_list; + _tmp34_ = _current_value_list; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp37_ = _current_value_index; + _tmp35_ = _current_value_index; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp38_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp37_); + _tmp36_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp35_); #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - current_value = (gchar*) _tmp38_; + current_value = (gchar*) _tmp36_; #line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp39_ = current_value; + _tmp37_ = current_value; #line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp40_ = field; + _tmp38_ = field; #line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp41_ = _tmp40_->path_separator; + _tmp39_ = _tmp38_->path_separator; #line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp42_ = hierarchical_tag_utilities_canonicalize (_tmp39_, _tmp41_); + _tmp40_ = hierarchical_tag_utilities_canonicalize (_tmp37_, _tmp39_); #line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - canonicalized = _tmp42_; + canonicalized = _tmp40_; #line 1124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp43_ = canonicalized; + _tmp41_ = canonicalized; #line 1124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp43_ != NULL) { -#line 8521 "PhotoMetadata.c" - GeeSet* _tmp44_; - const gchar* _tmp45_; + if (_tmp41_ != NULL) { +#line 8575 "PhotoMetadata.c" + GeeSet* _tmp42_; + const gchar* _tmp43_; #line 1125 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp44_ = h_keywords; + _tmp42_ = h_keywords; #line 1125 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp45_ = canonicalized; + _tmp43_ = canonicalized; #line 1125 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection), _tmp45_); -#line 8530 "PhotoMetadata.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection), _tmp43_); +#line 8584 "PhotoMetadata.c" } #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (canonicalized); #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_value); -#line 8536 "PhotoMetadata.c" +#line 8590 "PhotoMetadata.c" } #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_value_list); -#line 8540 "PhotoMetadata.c" +#line 8594 "PhotoMetadata.c" } #line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (transformed_values); @@ -8549,7 +8603,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { _g_object_unref0 (values); #line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (field); -#line 8548 "PhotoMetadata.c" +#line 8602 "PhotoMetadata.c" } } } @@ -8557,108 +8611,113 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { result = h_keywords; #line 1129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8556 "PhotoMetadata.c" +#line 8610 "PhotoMetadata.c" } -gboolean photo_metadata_has_orientation (PhotoMetadata* self) { +gboolean +photo_metadata_has_orientation (PhotoMetadata* self) +{ gboolean result = FALSE; GExiv2Metadata* _tmp0_; - GExiv2Orientation _tmp1_; #line 1132 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 1133 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 1133 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = gexiv2_metadata_get_orientation (_tmp0_); -#line 1133 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp1_ == GEXIV2_ORIENTATION_UNSPECIFIED; + result = gexiv2_metadata_get_orientation (_tmp0_) == GEXIV2_ORIENTATION_UNSPECIFIED; #line 1133 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8574 "PhotoMetadata.c" +#line 8627 "PhotoMetadata.c" } -Orientation photo_metadata_get_orientation (PhotoMetadata* self) { +Orientation +photo_metadata_get_orientation (PhotoMetadata* self) +{ Orientation result = 0; GExiv2Orientation orientation = 0; GExiv2Metadata* _tmp0_; - GExiv2Orientation _tmp1_; + gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; - GExiv2Orientation _tmp4_; + GExiv2Orientation _tmp3_; #line 1137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), 0); #line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = gexiv2_metadata_get_orientation (_tmp0_); -#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - orientation = _tmp1_; + orientation = gexiv2_metadata_get_orientation (_tmp0_); #line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = orientation; + _tmp3_ = orientation; #line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_ == GEXIV2_ORIENTATION_UNSPECIFIED) { + if (_tmp3_ == GEXIV2_ORIENTATION_UNSPECIFIED) { #line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = TRUE; -#line 8600 "PhotoMetadata.c" + _tmp2_ = TRUE; +#line 8652 "PhotoMetadata.c" } else { - GExiv2Orientation _tmp5_; + GExiv2Orientation _tmp4_; #line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = orientation; + _tmp4_ = orientation; #line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _tmp5_ < ORIENTATION_MIN; -#line 8607 "PhotoMetadata.c" + _tmp2_ = _tmp4_ < ORIENTATION_MIN; +#line 8659 "PhotoMetadata.c" } #line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp3_) { + if (_tmp2_) { #line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = TRUE; -#line 8613 "PhotoMetadata.c" + _tmp1_ = TRUE; +#line 8665 "PhotoMetadata.c" } else { - GExiv2Orientation _tmp6_; + GExiv2Orientation _tmp5_; #line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = orientation; + _tmp5_ = orientation; #line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = _tmp6_ > ORIENTATION_MAX; -#line 8620 "PhotoMetadata.c" + _tmp1_ = _tmp5_ > ORIENTATION_MAX; +#line 8672 "PhotoMetadata.c" } #line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp2_) { + if (_tmp1_) { #line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = ORIENTATION_TOP_LEFT; #line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8628 "PhotoMetadata.c" +#line 8680 "PhotoMetadata.c" } else { - GExiv2Orientation _tmp7_; + GExiv2Orientation _tmp6_; #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = orientation; + _tmp6_ = orientation; #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = (Orientation) _tmp7_; + result = (Orientation) _tmp6_; #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8637 "PhotoMetadata.c" +#line 8689 "PhotoMetadata.c" } } -void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientation) { +void +photo_metadata_set_orientation (PhotoMetadata* self, + Orientation orientation) +{ GExiv2Metadata* _tmp0_; - Orientation _tmp1_; #line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = orientation; -#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gexiv2_metadata_set_orientation (_tmp0_, (GExiv2Orientation) _tmp1_); -#line 8653 "PhotoMetadata.c" + gexiv2_metadata_set_orientation (_tmp0_, (GExiv2Orientation) orientation); +#line 8705 "PhotoMetadata.c" } -gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar* * long_ref, gdouble* latitude, gchar* * lat_ref, gdouble* altitude) { +gboolean +photo_metadata_get_gps (PhotoMetadata* self, + gdouble* longitude, + gchar* * long_ref, + gdouble* latitude, + gchar* * lat_ref, + gdouble* altitude) +{ gdouble _vala_longitude = 0.0; gchar* _vala_long_ref = NULL; gdouble _vala_latitude = 0.0; @@ -8700,43 +8759,43 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar* if (longitude) { #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *longitude = _vala_longitude; -#line 8699 "PhotoMetadata.c" +#line 8758 "PhotoMetadata.c" } #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (long_ref) { #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *long_ref = _vala_long_ref; -#line 8705 "PhotoMetadata.c" +#line 8764 "PhotoMetadata.c" } else { #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_long_ref); -#line 8709 "PhotoMetadata.c" +#line 8768 "PhotoMetadata.c" } #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (latitude) { #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *latitude = _vala_latitude; -#line 8715 "PhotoMetadata.c" +#line 8774 "PhotoMetadata.c" } #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (lat_ref) { #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *lat_ref = _vala_lat_ref; -#line 8721 "PhotoMetadata.c" +#line 8780 "PhotoMetadata.c" } else { #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_lat_ref); -#line 8725 "PhotoMetadata.c" +#line 8784 "PhotoMetadata.c" } #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (altitude) { #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *altitude = _vala_altitude; -#line 8731 "PhotoMetadata.c" +#line 8790 "PhotoMetadata.c" } #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8735 "PhotoMetadata.c" +#line 8794 "PhotoMetadata.c" } #line 1162 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = photo_metadata_get_string (self, "Exif.GPSInfo.GPSLongitudeRef", PHOTO_METADATA_PREPARE_STRING_OPTIONS); @@ -8756,47 +8815,50 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar* if (longitude) { #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *longitude = _vala_longitude; -#line 8755 "PhotoMetadata.c" +#line 8814 "PhotoMetadata.c" } #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (long_ref) { #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *long_ref = _vala_long_ref; -#line 8761 "PhotoMetadata.c" +#line 8820 "PhotoMetadata.c" } else { #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_long_ref); -#line 8765 "PhotoMetadata.c" +#line 8824 "PhotoMetadata.c" } #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (latitude) { #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *latitude = _vala_latitude; -#line 8771 "PhotoMetadata.c" +#line 8830 "PhotoMetadata.c" } #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (lat_ref) { #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *lat_ref = _vala_lat_ref; -#line 8777 "PhotoMetadata.c" +#line 8836 "PhotoMetadata.c" } else { #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_lat_ref); -#line 8781 "PhotoMetadata.c" +#line 8840 "PhotoMetadata.c" } #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (altitude) { #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *altitude = _vala_altitude; -#line 8787 "PhotoMetadata.c" +#line 8846 "PhotoMetadata.c" } #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8791 "PhotoMetadata.c" +#line 8850 "PhotoMetadata.c" } -gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exposure) { +gboolean +photo_metadata_get_exposure (PhotoMetadata* self, + MetadataRational* exposure) +{ MetadataRational _vala_exposure = {0}; gboolean result = FALSE; MetadataRational _tmp0_ = {0}; @@ -8813,21 +8875,22 @@ gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exp if (exposure) { #line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *exposure = _vala_exposure; -#line 8812 "PhotoMetadata.c" +#line 8874 "PhotoMetadata.c" } #line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8816 "PhotoMetadata.c" +#line 8878 "PhotoMetadata.c" } -gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) { +gchar* +photo_metadata_get_exposure_string (PhotoMetadata* self) +{ gchar* result = NULL; MetadataRational exposure_time = {0}; MetadataRational _tmp0_ = {0}; gboolean _tmp1_; - gboolean _tmp2_; - gchar* _tmp3_; + gchar* _tmp2_; #line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 1174 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8840,29 +8903,30 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) { result = NULL; #line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8839 "PhotoMetadata.c" +#line 8902 "PhotoMetadata.c" } #line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = metadata_rational_is_valid (&exposure_time); -#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp2_) { + if (!metadata_rational_is_valid (&exposure_time)) { #line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; #line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8849 "PhotoMetadata.c" +#line 8910 "PhotoMetadata.c" } #line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ExposureTime", PHOTO_METADATA_PREPARE_STRING_OPTIONS); + _tmp2_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ExposureTime", PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp3_; + result = _tmp2_; #line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8857 "PhotoMetadata.c" +#line 8918 "PhotoMetadata.c" } -gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) { +gboolean +photo_metadata_get_iso (PhotoMetadata* self, + glong* iso) +{ glong _vala_iso = 0L; gboolean result = FALSE; gboolean fetched_ok = FALSE; @@ -8889,11 +8953,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) { if (iso) { #line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *iso = _vala_iso; -#line 8888 "PhotoMetadata.c" +#line 8952 "PhotoMetadata.c" } #line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8892 "PhotoMetadata.c" +#line 8956 "PhotoMetadata.c" } #line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = _vala_iso; @@ -8901,14 +8965,14 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) { if (_tmp4_ < ((glong) 6)) { #line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = TRUE; -#line 8900 "PhotoMetadata.c" +#line 8964 "PhotoMetadata.c" } else { glong _tmp5_; #line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _vala_iso; #line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp5_ > ((glong) 409600); -#line 8907 "PhotoMetadata.c" +#line 8971 "PhotoMetadata.c" } #line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_) { @@ -8918,11 +8982,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) { if (iso) { #line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *iso = _vala_iso; -#line 8917 "PhotoMetadata.c" +#line 8981 "PhotoMetadata.c" } #line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8921 "PhotoMetadata.c" +#line 8985 "PhotoMetadata.c" } #line 1194 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = TRUE; @@ -8930,15 +8994,17 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) { if (iso) { #line 1194 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *iso = _vala_iso; -#line 8929 "PhotoMetadata.c" +#line 8993 "PhotoMetadata.c" } #line 1194 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8933 "PhotoMetadata.c" +#line 8997 "PhotoMetadata.c" } -gchar* photo_metadata_get_iso_string (PhotoMetadata* self) { +gchar* +photo_metadata_get_iso_string (PhotoMetadata* self) +{ gchar* result = NULL; glong iso = 0L; glong _tmp0_ = 0L; @@ -8956,7 +9022,7 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) { result = NULL; #line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8955 "PhotoMetadata.c" +#line 9021 "PhotoMetadata.c" } #line 1202 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ISOSpeedRatings", PHOTO_METADATA_PREPARE_STRING_OPTIONS); @@ -8964,11 +9030,14 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) { result = _tmp2_; #line 1202 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8963 "PhotoMetadata.c" +#line 9029 "PhotoMetadata.c" } -gboolean photo_metadata_get_aperture (PhotoMetadata* self, MetadataRational* aperture) { +gboolean +photo_metadata_get_aperture (PhotoMetadata* self, + MetadataRational* aperture) +{ MetadataRational _vala_aperture = {0}; gboolean result = FALSE; MetadataRational _tmp0_ = {0}; @@ -8985,15 +9054,18 @@ gboolean photo_metadata_get_aperture (PhotoMetadata* self, MetadataRational* ape if (aperture) { #line 1206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *aperture = _vala_aperture; -#line 8984 "PhotoMetadata.c" +#line 9053 "PhotoMetadata.c" } #line 1206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8988 "PhotoMetadata.c" +#line 9057 "PhotoMetadata.c" } -gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_formatted) { +gchar* +photo_metadata_get_aperture_string (PhotoMetadata* self, + gboolean pango_formatted) +{ gchar* result = NULL; MetadataRational aperture = {0}; MetadataRational _tmp0_ = {0}; @@ -9005,14 +9077,13 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f gint _tmp5_; gdouble _tmp6_; const gchar* _tmp7_ = NULL; - gboolean _tmp8_; - const gchar* _tmp9_ = NULL; + const gchar* _tmp8_ = NULL; + gdouble _tmp9_; gdouble _tmp10_; - gdouble _tmp11_; + gchar* _tmp11_; gchar* _tmp12_; gchar* _tmp13_; gchar* _tmp14_; - gchar* _tmp15_; #line 1209 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 1211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9025,7 +9096,7 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f result = NULL; #line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9024 "PhotoMetadata.c" +#line 9095 "PhotoMetadata.c" } #line 1214 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = aperture; @@ -9042,50 +9113,50 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f #line 1215 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" aperture_value = ((gint) (_tmp6_ * 10.0)) / 10.0; #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = pango_formatted; -#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp8_) { + if (pango_formatted) { #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = "f/"; -#line 9046 "PhotoMetadata.c" +#line 9115 "PhotoMetadata.c" } else { #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = "f/"; -#line 9050 "PhotoMetadata.c" +#line 9119 "PhotoMetadata.c" } #line 1218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = aperture_value; + _tmp9_ = aperture_value; #line 1218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (fmod (_tmp10_, 1) == ((gdouble) 0)) { + if (fmod (_tmp9_, 1) == ((gdouble) 0)) { #line 1218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = "%.0f"; -#line 9058 "PhotoMetadata.c" + _tmp8_ = "%.0f"; +#line 9127 "PhotoMetadata.c" } else { #line 1218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = "%.1f"; -#line 9062 "PhotoMetadata.c" + _tmp8_ = "%.1f"; +#line 9131 "PhotoMetadata.c" } #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = aperture_value; + _tmp10_ = aperture_value; #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = g_strdup_printf (_tmp9_, _tmp11_); + _tmp11_ = g_strdup_printf (_tmp8_, _tmp10_); #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = g_strconcat (_tmp7_, _tmp13_, NULL); + _tmp13_ = g_strconcat (_tmp7_, _tmp12_, NULL); #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp12_); #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp15_; + result = _tmp14_; #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9080 "PhotoMetadata.c" +#line 9149 "PhotoMetadata.c" } -gchar* photo_metadata_get_camera_make (PhotoMetadata* self) { +gchar* +photo_metadata_get_camera_make (PhotoMetadata* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9096,11 +9167,13 @@ gchar* photo_metadata_get_camera_make (PhotoMetadata* self) { result = _tmp0_; #line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9095 "PhotoMetadata.c" +#line 9166 "PhotoMetadata.c" } -gchar* photo_metadata_get_camera_model (PhotoMetadata* self) { +gchar* +photo_metadata_get_camera_model (PhotoMetadata* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9111,11 +9184,14 @@ gchar* photo_metadata_get_camera_model (PhotoMetadata* self) { result = _tmp0_; #line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9110 "PhotoMetadata.c" +#line 9183 "PhotoMetadata.c" } -gboolean photo_metadata_get_flash (PhotoMetadata* self, glong* flash) { +gboolean +photo_metadata_get_flash (PhotoMetadata* self, + glong* flash) +{ glong _vala_flash = 0L; gboolean result = FALSE; glong _tmp0_ = 0L; @@ -9132,15 +9208,17 @@ gboolean photo_metadata_get_flash (PhotoMetadata* self, glong* flash) { if (flash) { #line 1231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *flash = _vala_flash; -#line 9131 "PhotoMetadata.c" +#line 9207 "PhotoMetadata.c" } #line 1231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9135 "PhotoMetadata.c" +#line 9211 "PhotoMetadata.c" } -gchar* photo_metadata_get_flash_string (PhotoMetadata* self) { +gchar* +photo_metadata_get_flash_string (PhotoMetadata* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 1234 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9151,11 +9229,14 @@ gchar* photo_metadata_get_flash_string (PhotoMetadata* self) { result = _tmp0_; #line 1236 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9150 "PhotoMetadata.c" +#line 9228 "PhotoMetadata.c" } -gboolean photo_metadata_get_focal_length (PhotoMetadata* self, MetadataRational* focal_length) { +gboolean +photo_metadata_get_focal_length (PhotoMetadata* self, + MetadataRational* focal_length) +{ MetadataRational _vala_focal_length = {0}; gboolean result = FALSE; MetadataRational _tmp0_ = {0}; @@ -9172,15 +9253,17 @@ gboolean photo_metadata_get_focal_length (PhotoMetadata* self, MetadataRational* if (focal_length) { #line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *focal_length = _vala_focal_length; -#line 9171 "PhotoMetadata.c" +#line 9252 "PhotoMetadata.c" } #line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9175 "PhotoMetadata.c" +#line 9256 "PhotoMetadata.c" } -gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self) { +gchar* +photo_metadata_get_focal_length_string (PhotoMetadata* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9191,11 +9274,13 @@ gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self) { result = _tmp0_; #line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9190 "PhotoMetadata.c" +#line 9273 "PhotoMetadata.c" } -gchar* photo_metadata_get_artist (PhotoMetadata* self) { +gchar* +photo_metadata_get_artist (PhotoMetadata* self) +{ gchar* result = NULL; gchar** _tmp0_; gint _tmp0__length1; @@ -9212,11 +9297,13 @@ gchar* photo_metadata_get_artist (PhotoMetadata* self) { result = _tmp1_; #line 1254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9211 "PhotoMetadata.c" +#line 9296 "PhotoMetadata.c" } -gchar* photo_metadata_get_copyright (PhotoMetadata* self) { +gchar* +photo_metadata_get_copyright (PhotoMetadata* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 1257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9227,11 +9314,13 @@ gchar* photo_metadata_get_copyright (PhotoMetadata* self) { result = _tmp0_; #line 1258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9226 "PhotoMetadata.c" +#line 9313 "PhotoMetadata.c" } -gchar* photo_metadata_get_software (PhotoMetadata* self) { +gchar* +photo_metadata_get_software (PhotoMetadata* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 1261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9242,16 +9331,17 @@ gchar* photo_metadata_get_software (PhotoMetadata* self) { result = _tmp0_; #line 1262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9241 "PhotoMetadata.c" +#line 9330 "PhotoMetadata.c" } -void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, const gchar* version) { - const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; - gboolean _tmp4_; +void +photo_metadata_set_software (PhotoMetadata* self, + const gchar* software, + const gchar* version) +{ + gchar* _tmp0_; + gchar* _tmp1_; #line 1265 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 1265 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9259,38 +9349,27 @@ void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, co #line 1265 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (version != NULL); #line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = software; -#line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = version; + _tmp0_ = g_strdup_printf ("%s %s", software, version); #line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = g_strdup_printf ("%s %s", _tmp0_, _tmp1_); -#line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string (self, "Exif.Image.Software", _tmp3_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); + photo_metadata_set_string (self, "Exif.Image.Software", _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp3_); -#line 1269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = photo_metadata_has_iptc (self); + _g_free0 (_tmp1_); #line 1269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_) { -#line 9273 "PhotoMetadata.c" - const gchar* _tmp5_; - const gchar* _tmp6_; + if (photo_metadata_has_iptc (self)) { #line 1270 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = software; -#line 1270 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string (self, "Iptc.Application2.Program", _tmp5_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = version; + photo_metadata_set_string (self, "Iptc.Application2.Program", software, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string (self, "Iptc.Application2.ProgramVersion", _tmp6_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 9284 "PhotoMetadata.c" + photo_metadata_set_string (self, "Iptc.Application2.ProgramVersion", version, PHOTO_METADATA_PREPARE_STRING_OPTIONS); +#line 9361 "PhotoMetadata.c" } } -void photo_metadata_remove_software (PhotoMetadata* self) { +void +photo_metadata_remove_software (PhotoMetadata* self) +{ #line 1275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 1276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9299,11 +9378,13 @@ void photo_metadata_remove_software (PhotoMetadata* self) { photo_metadata_remove_tag (self, "Iptc.Application2.Program"); #line 1278 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tag (self, "Iptc.Application2.ProgramVersion"); -#line 9298 "PhotoMetadata.c" +#line 9377 "PhotoMetadata.c" } -gchar* photo_metadata_get_exposure_bias (PhotoMetadata* self) { +gchar* +photo_metadata_get_exposure_bias (PhotoMetadata* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9314,23 +9395,23 @@ gchar* photo_metadata_get_exposure_bias (PhotoMetadata* self) { result = _tmp0_; #line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9313 "PhotoMetadata.c" +#line 9394 "PhotoMetadata.c" } -Rating photo_metadata_get_rating (PhotoMetadata* self) { +Rating +photo_metadata_get_rating (PhotoMetadata* self) +{ Rating result = 0; gchar* rating_string = NULL; gchar** _tmp0_; gint _tmp0__length1; gchar* _tmp1_; const gchar* _tmp2_; - gchar* _tmp6_; - const gchar* _tmp7_; + gchar* _tmp4_; + const gchar* _tmp5_; gint int_percent_rating = 0; - const gchar* _tmp8_; - gint _tmp9_; - Rating _tmp18_; + const gchar* _tmp6_; #line 1293 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), 0); #line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9345,227 +9426,208 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) { _tmp2_ = rating_string; #line 1295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp2_ != NULL) { -#line 9344 "PhotoMetadata.c" +#line 9425 "PhotoMetadata.c" const gchar* _tmp3_; - gint _tmp4_; - Rating _tmp5_; #line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = rating_string; #line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = atoi (_tmp3_); -#line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = rating_unserialize (_tmp4_); -#line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp5_; + result = rating_unserialize (atoi (_tmp3_)); #line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (rating_string); #line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9360 "PhotoMetadata.c" +#line 9435 "PhotoMetadata.c" } #line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = photo_metadata_get_string (self, "Exif.Image.RatingPercent", PHOTO_METADATA_PREPARE_STRING_OPTIONS); + _tmp4_ = photo_metadata_get_string (self, "Exif.Image.RatingPercent", PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (rating_string); #line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - rating_string = _tmp6_; + rating_string = _tmp4_; #line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = rating_string; + _tmp5_ = rating_string; #line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp7_ == NULL) { + if (_tmp5_ == NULL) { #line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = RATING_UNRATED; #line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (rating_string); #line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9378 "PhotoMetadata.c" +#line 9453 "PhotoMetadata.c" } #line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = rating_string; -#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = atoi (_tmp8_); + _tmp6_ = rating_string; #line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - int_percent_rating = _tmp9_; -#line 9386 "PhotoMetadata.c" + int_percent_rating = atoi (_tmp6_); +#line 9459 "PhotoMetadata.c" { gint i = 0; #line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" i = 5; -#line 9391 "PhotoMetadata.c" +#line 9464 "PhotoMetadata.c" { - gboolean _tmp10_ = FALSE; + gboolean _tmp7_ = FALSE; #line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = TRUE; + _tmp7_ = TRUE; #line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 9398 "PhotoMetadata.c" +#line 9471 "PhotoMetadata.c" + gint _tmp9_; + gint _tmp10_; + gint _tmp11_; gint _tmp12_; - gint _tmp13_; - gint _tmp14_; - gint _tmp15_; #line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp10_) { -#line 9405 "PhotoMetadata.c" - gint _tmp11_; + if (!_tmp7_) { +#line 9478 "PhotoMetadata.c" + gint _tmp8_; #line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = i; + _tmp8_ = i; #line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - i = _tmp11_ - 1; -#line 9411 "PhotoMetadata.c" + i = _tmp8_ - 1; +#line 9484 "PhotoMetadata.c" } #line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = FALSE; + _tmp7_ = FALSE; #line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = i; + _tmp9_ = i; #line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!(_tmp12_ >= 0)) { + if (!(_tmp9_ >= 0)) { #line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 9421 "PhotoMetadata.c" +#line 9494 "PhotoMetadata.c" } #line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = int_percent_rating; + _tmp10_ = int_percent_rating; #line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = i; + _tmp11_ = i; #line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = RESOURCES_rating_thresholds[_tmp14_]; + _tmp12_ = RESOURCES_rating_thresholds[_tmp11_]; #line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp13_ >= _tmp15_) { -#line 9431 "PhotoMetadata.c" - gint _tmp16_; - Rating _tmp17_; -#line 1306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = i; + if (_tmp10_ >= _tmp12_) { +#line 9504 "PhotoMetadata.c" + gint _tmp13_; #line 1306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = rating_unserialize (_tmp16_); + _tmp13_ = i; #line 1306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp17_; + result = rating_unserialize (_tmp13_); #line 1306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (rating_string); #line 1306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9444 "PhotoMetadata.c" +#line 9514 "PhotoMetadata.c" } } } } #line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = rating_unserialize (-1); -#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp18_; + result = rating_unserialize (-1); #line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (rating_string); #line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9457 "PhotoMetadata.c" +#line 9525 "PhotoMetadata.c" } -void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) { +void +photo_metadata_set_rating (PhotoMetadata* self, + Rating rating) +{ gint int_rating = 0; - Rating _tmp0_; - gint _tmp1_; - gint _tmp2_; - gchar* _tmp3_; + gint _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gint _tmp3_; gchar* _tmp4_; - gint _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - gint _tmp8_; + gchar* _tmp5_; + gint _tmp6_; #line 1316 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 1317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = rating; -#line 1317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = rating_serialize (_tmp0_); -#line 1317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - int_rating = _tmp1_; + int_rating = rating_serialize (rating); #line 1318 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = int_rating; + _tmp0_ = int_rating; #line 1318 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = g_strdup_printf ("%i", _tmp2_); + _tmp1_ = g_strdup_printf ("%i", _tmp0_); #line 1318 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 1318 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string (self, "Xmp.xmp.Rating", _tmp4_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); + photo_metadata_set_string (self, "Xmp.xmp.Rating", _tmp2_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 1318 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp2_); #line 1319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = int_rating; + _tmp3_ = int_rating; #line 1319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = g_strdup_printf ("%i", _tmp5_); + _tmp4_ = g_strdup_printf ("%i", _tmp3_); #line 1319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 1319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string (self, "Exif.Image.Rating", _tmp7_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); + photo_metadata_set_string (self, "Exif.Image.Rating", _tmp5_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 1319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp5_); #line 1321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = int_rating; + _tmp6_ = int_rating; #line 1321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (0 <= _tmp8_) { -#line 9504 "PhotoMetadata.c" - gint _tmp9_; - gint _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; + if (0 <= _tmp6_) { +#line 9569 "PhotoMetadata.c" + gint _tmp7_; + gint _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; #line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = int_rating; + _tmp7_ = int_rating; #line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = RESOURCES_rating_thresholds[_tmp9_]; + _tmp8_ = RESOURCES_rating_thresholds[_tmp7_]; #line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = g_strdup_printf ("%i", _tmp10_); + _tmp9_ = g_strdup_printf ("%i", _tmp8_); #line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp12_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); + photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp10_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp12_); -#line 9521 "PhotoMetadata.c" + _g_free0 (_tmp10_); +#line 9586 "PhotoMetadata.c" } else { - gint _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; + gint _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; #line 1324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = int_rating; + _tmp11_ = int_rating; #line 1324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = g_strdup_printf ("%i", _tmp13_); + _tmp12_ = g_strdup_printf ("%i", _tmp11_); #line 1324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = _tmp14_; + _tmp13_ = _tmp12_; #line 1324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp15_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); + photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp13_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 1324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp15_); -#line 9536 "PhotoMetadata.c" + _g_free0 (_tmp13_); +#line 9601 "PhotoMetadata.c" } } -static gpointer _media_metadata_ref0 (gpointer self) { +static gpointer +_media_metadata_ref0 (gpointer self) +{ #line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? media_metadata_ref (self) : NULL; -#line 9544 "PhotoMetadata.c" +#line 9611 "PhotoMetadata.c" } -static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_construct (GType object_type, PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props) { +static PhotoMetadataInternalPhotoPreview* +photo_metadata_internal_photo_preview_construct (GType object_type, + PhotoMetadata* owner, + const gchar* name, + guint number, + GExiv2PreviewProperties* props) +{ PhotoMetadataInternalPhotoPreview* self = NULL; - const gchar* _tmp0_; - GExiv2PreviewProperties* _tmp1_; - guint32 _tmp2_; - GExiv2PreviewProperties* _tmp3_; - guint32 _tmp4_; - Dimensions _tmp5_ = {0}; - GExiv2PreviewProperties* _tmp6_; - guint32 _tmp7_; - GExiv2PreviewProperties* _tmp8_; - const gchar* _tmp9_; - GExiv2PreviewProperties* _tmp10_; - const gchar* _tmp11_; - PhotoMetadata* _tmp12_; - PhotoMetadata* _tmp13_; - guint _tmp14_; + Dimensions _tmp0_ = {0}; + const gchar* _tmp1_; + const gchar* _tmp2_; + PhotoMetadata* _tmp3_; #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (owner), NULL); #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9573,57 +9635,43 @@ static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_ #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (GEXIV2_IS_PREVIEW_PROPERTIES (props), NULL); #line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = name; -#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = props; -#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = gexiv2_preview_properties_get_width (_tmp1_); -#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = props; -#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = gexiv2_preview_properties_get_height (_tmp3_); -#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - dimensions_init (&_tmp5_, (gint) _tmp2_, (gint) _tmp4_); -#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = props; -#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = gexiv2_preview_properties_get_size (_tmp6_); + dimensions_init (&_tmp0_, (gint) gexiv2_preview_properties_get_width (props), (gint) gexiv2_preview_properties_get_height (props)); #line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = props; + _tmp1_ = gexiv2_preview_properties_get_mime_type (props); #line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = gexiv2_preview_properties_get_mime_type (_tmp8_); + _tmp2_ = gexiv2_preview_properties_get_extension (props); #line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = props; -#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = gexiv2_preview_properties_get_extension (_tmp10_); -#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self = (PhotoMetadataInternalPhotoPreview*) photo_preview_construct (object_type, _tmp0_, &_tmp5_, _tmp7_, _tmp9_, _tmp11_); -#line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = owner; + self = (PhotoMetadataInternalPhotoPreview*) photo_preview_construct (object_type, name, &_tmp0_, gexiv2_preview_properties_get_size (props), _tmp1_, _tmp2_); #line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = _media_metadata_ref0 (_tmp12_); + _tmp3_ = _media_metadata_ref0 (owner); #line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _media_metadata_unref0 (self->owner); #line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->owner = _tmp13_; + self->owner = _tmp3_; #line 236 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = number; -#line 236 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->number = _tmp14_; + self->number = number; #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 9611 "PhotoMetadata.c" +#line 9651 "PhotoMetadata.c" } -static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_new (PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props) { +static PhotoMetadataInternalPhotoPreview* +photo_metadata_internal_photo_preview_new (PhotoMetadata* owner, + const gchar* name, + guint number, + GExiv2PreviewProperties* props) +{ #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return photo_metadata_internal_photo_preview_construct (PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, owner, name, number, props); -#line 9618 "PhotoMetadata.c" +#line 9663 "PhotoMetadata.c" } -static GBytes* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* base, GError** error) { +static GBytes* +photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* base, + GError** error) +{ PhotoMetadataInternalPhotoPreview * self; GBytes* result = NULL; GExiv2PreviewProperties** props = NULL; @@ -9668,7 +9716,7 @@ static GBytes* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* _tmp5__length1 = props_length1; #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp5_ != NULL) { -#line 9667 "PhotoMetadata.c" +#line 9715 "PhotoMetadata.c" GExiv2PreviewProperties** _tmp6_; gint _tmp6__length1; guint _tmp7_; @@ -9680,11 +9728,11 @@ static GBytes* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* _tmp7_ = self->number; #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = ((guint) _tmp6__length1) > _tmp7_; -#line 9679 "PhotoMetadata.c" +#line 9727 "PhotoMetadata.c" } else { #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = FALSE; -#line 9683 "PhotoMetadata.c" +#line 9731 "PhotoMetadata.c" } #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_assert (_tmp4_, "props != null && props.length > number"); @@ -9716,26 +9764,32 @@ static GBytes* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* result = _tmp18_; #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9715 "PhotoMetadata.c" +#line 9763 "PhotoMetadata.c" } -static void photo_metadata_internal_photo_preview_class_init (PhotoMetadataInternalPhotoPreviewClass * klass) { +static void +photo_metadata_internal_photo_preview_class_init (PhotoMetadataInternalPhotoPreviewClass * klass) +{ #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_internal_photo_preview_parent_class = g_type_class_peek_parent (klass); #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((PhotoPreviewClass *) klass)->finalize = photo_metadata_internal_photo_preview_finalize; #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((PhotoPreviewClass *) klass)->flatten = (GBytes* (*) (PhotoPreview *, GError**)) photo_metadata_internal_photo_preview_real_flatten; -#line 9726 "PhotoMetadata.c" +#line 9776 "PhotoMetadata.c" } -static void photo_metadata_internal_photo_preview_instance_init (PhotoMetadataInternalPhotoPreview * self) { +static void +photo_metadata_internal_photo_preview_instance_init (PhotoMetadataInternalPhotoPreview * self) +{ } -static void photo_metadata_internal_photo_preview_finalize (PhotoPreview * obj) { +static void +photo_metadata_internal_photo_preview_finalize (PhotoPreview * obj) +{ PhotoMetadataInternalPhotoPreview * self; #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, PhotoMetadataInternalPhotoPreview); @@ -9743,11 +9797,13 @@ static void photo_metadata_internal_photo_preview_finalize (PhotoPreview * obj) _media_metadata_unref0 (self->owner); #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" PHOTO_PREVIEW_CLASS (photo_metadata_internal_photo_preview_parent_class)->finalize (obj); -#line 9742 "PhotoMetadata.c" +#line 9796 "PhotoMetadata.c" } -static GType photo_metadata_internal_photo_preview_get_type (void) { +static GType +photo_metadata_internal_photo_preview_get_type (void) +{ static volatile gsize photo_metadata_internal_photo_preview_type_id__volatile = 0; if (g_once_init_enter (&photo_metadata_internal_photo_preview_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoMetadataInternalPhotoPreviewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_metadata_internal_photo_preview_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoMetadataInternalPhotoPreview), 0, (GInstanceInitFunc) photo_metadata_internal_photo_preview_instance_init, NULL }; @@ -9759,7 +9815,9 @@ static GType photo_metadata_internal_photo_preview_get_type (void) { } -static void photo_metadata_class_init (PhotoMetadataClass * klass) { +static void +photo_metadata_class_init (PhotoMetadataClass * klass) +{ gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; @@ -10096,11 +10154,13 @@ static void photo_metadata_class_init (PhotoMetadataClass * klass) { photo_metadata_RATING_TAGS = _tmp63_; #line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_RATING_TAGS_length1 = 5; -#line 10095 "PhotoMetadata.c" +#line 10153 "PhotoMetadata.c" } -static void photo_metadata_instance_init (PhotoMetadata * self) { +static void +photo_metadata_instance_init (PhotoMetadata * self) +{ GExiv2Metadata* _tmp0_; gchar* _tmp1_; #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -10119,11 +10179,13 @@ static void photo_metadata_instance_init (PhotoMetadata * self) { self->priv->metadata_hash = NULL; #line 252 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->thumbnail_md5 = NULL; -#line 10118 "PhotoMetadata.c" +#line 10178 "PhotoMetadata.c" } -static void photo_metadata_finalize (MediaMetadata * obj) { +static void +photo_metadata_finalize (MediaMetadata * obj) +{ PhotoMetadata * self; #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_METADATA, PhotoMetadata); @@ -10139,11 +10201,13 @@ static void photo_metadata_finalize (MediaMetadata * obj) { _g_free0 (self->priv->thumbnail_md5); #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" MEDIA_METADATA_CLASS (photo_metadata_parent_class)->finalize (obj); -#line 10138 "PhotoMetadata.c" +#line 10200 "PhotoMetadata.c" } -GType photo_metadata_get_type (void) { +GType +photo_metadata_get_type (void) +{ static volatile gsize photo_metadata_type_id__volatile = 0; if (g_once_init_enter (&photo_metadata_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoMetadataClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_metadata_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoMetadata), 0, (GInstanceInitFunc) photo_metadata_instance_init, NULL }; @@ -10155,7 +10219,11 @@ GType photo_metadata_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -10167,13 +10235,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -static gint _vala_array_length (gpointer array) { +static gint +_vala_array_length (gpointer array) +{ int length; length = 0; if (array) { diff --git a/src/photos/Photos.c b/src/photos/Photos.c index d859d37..4b69412 100644 --- a/src/photos/Photos.c +++ b/src/photos/Photos.c @@ -1,4 +1,4 @@ -/* Photos.c generated by valac 0.36.6, the Vala compiler +/* Photos.c generated by valac 0.40.4, the Vala compiler * generated from Photos.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -15,6 +15,7 @@ * the preconfigure() method, implement it, and ensure in init() that it's been called. */ + #include #include @@ -40,16 +41,20 @@ void photo_file_format_init (PhotoFileFormat self); void photos_terminate (void); -void photos_preconfigure (void) { +void +photos_preconfigure (void) +{ } -void photos_init (GError** error) { +void +photos_init (GError** error) +{ gint _tmp0_; PhotoFileFormat* _tmp1_; #line 23 "/home/jens/Source/shotwell/src/photos/Photos.vala" _tmp1_ = photo_file_format_get_supported (&_tmp0_); -#line 53 "Photos.c" +#line 58 "Photos.c" { PhotoFileFormat* format_collection = NULL; gint format_collection_length1 = 0; @@ -61,28 +66,30 @@ void photos_init (GError** error) { format_collection_length1 = _tmp0_; #line 23 "/home/jens/Source/shotwell/src/photos/Photos.vala" for (format_it = 0; format_it < _tmp0_; format_it = format_it + 1) { -#line 65 "Photos.c" +#line 70 "Photos.c" PhotoFileFormat format = 0; #line 23 "/home/jens/Source/shotwell/src/photos/Photos.vala" format = format_collection[format_it]; -#line 69 "Photos.c" +#line 74 "Photos.c" { PhotoFileFormat _tmp2_; #line 24 "/home/jens/Source/shotwell/src/photos/Photos.vala" _tmp2_ = format; #line 24 "/home/jens/Source/shotwell/src/photos/Photos.vala" photo_file_format_init (_tmp2_); -#line 76 "Photos.c" +#line 81 "Photos.c" } } #line 23 "/home/jens/Source/shotwell/src/photos/Photos.vala" format_collection = (g_free (format_collection), NULL); -#line 81 "Photos.c" +#line 86 "Photos.c" } } -void photos_terminate (void) { +void +photos_terminate (void) +{ } diff --git a/src/photos/PngSupport.c b/src/photos/PngSupport.c index 28fa710..41e90da 100644 --- a/src/photos/PngSupport.c +++ b/src/photos/PngSupport.c @@ -1,4 +1,4 @@ -/* PngSupport.c generated by valac 0.36.6, the Vala compiler +/* PngSupport.c generated by valac 0.40.4, the Vala compiler * generated from PngSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -481,17 +482,20 @@ static PngFileFormatDriver* png_file_format_driver_instance = NULL; gpointer photo_file_format_properties_ref (gpointer instance); void photo_file_format_properties_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_properties (GValue* value, gpointer v_object); -void value_take_photo_file_format_properties (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_properties (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_properties (GValue* value, + gpointer v_object); +void value_take_photo_file_format_properties (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_properties (const GValue* value); GType photo_file_format_properties_get_type (void) G_GNUC_CONST; GType photo_file_format_get_type (void) G_GNUC_CONST; GType photo_file_format_flags_get_type (void) G_GNUC_CONST; GType png_file_format_properties_get_type (void) G_GNUC_CONST; -enum { - PNG_FILE_FORMAT_PROPERTIES_DUMMY_PROPERTY -}; void png_file_format_properties_init (void); PngFileFormatProperties* png_file_format_properties_new (void); PngFileFormatProperties* png_file_format_properties_construct (GType object_type); @@ -500,44 +504,73 @@ static PhotoFileFormat png_file_format_properties_real_get_file_format (PhotoFil static PhotoFileFormatFlags png_file_format_properties_real_get_flags (PhotoFileFormatProperties* base); static gchar* png_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base); static gchar* png_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base); -static gchar** png_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup12 (gchar** self, int length); +static gchar** png_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1); +static gchar** _vala_array_dup12 (gchar** self, + int length); static gchar* png_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base); -static gchar** png_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup13 (gchar** self, int length); +static gchar** png_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1); +static gchar** _vala_array_dup13 (gchar** self, + int length); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); static void png_file_format_properties_finalize (PhotoFileFormatProperties * obj); gpointer photo_file_sniffer_ref (gpointer instance); void photo_file_sniffer_unref (gpointer instance); -GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_sniffer (GValue* value, gpointer v_object); -void value_take_photo_file_sniffer (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_sniffer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_sniffer (GValue* value, + gpointer v_object); +void value_take_photo_file_sniffer (GValue* value, + gpointer v_object); gpointer value_get_photo_file_sniffer (const GValue* value); GType photo_file_sniffer_get_type (void) G_GNUC_CONST; gpointer detected_photo_information_ref (gpointer instance); void detected_photo_information_unref (gpointer instance); -GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_detected_photo_information (GValue* value, gpointer v_object); -void value_take_detected_photo_information (GValue* value, gpointer v_object); +GParamSpec* param_spec_detected_photo_information (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_detected_photo_information (GValue* value, + gpointer v_object); +void value_take_detected_photo_information (GValue* value, + gpointer v_object); gpointer value_get_detected_photo_information (const GValue* value); GType detected_photo_information_get_type (void) G_GNUC_CONST; GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; GType gdk_sniffer_get_type (void) G_GNUC_CONST; GType png_sniffer_get_type (void) G_GNUC_CONST; -enum { - PNG_SNIFFER_DUMMY_PROPERTY -}; -PngSniffer* png_sniffer_new (GFile* file, PhotoFileSnifferOptions options); -PngSniffer* png_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -static gboolean png_sniffer_is_png_file (GFile* file, GError** error); -static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error); -DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error); +PngSniffer* png_sniffer_new (GFile* file, + PhotoFileSnifferOptions options); +PngSniffer* png_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +GdkSniffer* gdk_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +static gboolean png_sniffer_is_png_file (GFile* file, + GError** error); +static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error); +DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, + gboolean* is_corrupted, + GError** error); gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -546,67 +579,94 @@ Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; GType gdk_reader_get_type (void) G_GNUC_CONST; GType png_reader_get_type (void) G_GNUC_CONST; -enum { - PNG_READER_DUMMY_PROPERTY -}; PngReader* png_reader_new (const gchar* filepath); -PngReader* png_reader_construct (GType object_type, const gchar* filepath); -GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error); +PngReader* png_reader_construct (GType object_type, + const gchar* filepath); +GdkReader* gdk_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, + Dimensions* full, + Dimensions* scaled, + GError** error); GType scale_constraint_get_type (void) G_GNUC_CONST; -void dimensions_get_scaled_by_constraint (Dimensions *self, gint scale, ScaleConstraint constraint, Dimensions* result); +void dimensions_get_scaled_by_constraint (Dimensions *self, + gint scale, + ScaleConstraint constraint, + Dimensions* result); gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self); GType photo_file_writer_get_type (void) G_GNUC_CONST; GType jpeg_quality_get_type (void) G_GNUC_CONST; GType png_writer_get_type (void) G_GNUC_CONST; -enum { - PNG_WRITER_DUMMY_PROPERTY -}; PngWriter* png_writer_new (const gchar* filepath); -PngWriter* png_writer_construct (GType object_type, const gchar* filepath); -PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static void png_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error); +PngWriter* png_writer_construct (GType object_type, + const gchar* filepath); +PhotoFileWriter* photo_file_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static void png_writer_real_write (PhotoFileWriter* base, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error); GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST; GType png_metadata_writer_get_type (void) G_GNUC_CONST; -enum { - PNG_METADATA_WRITER_DUMMY_PROPERTY -}; PngMetadataWriter* png_metadata_writer_new (const gchar* filepath); -PngMetadataWriter* png_metadata_writer_construct (GType object_type, const gchar* filepath); -PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static void png_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error); -void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** error); +PngMetadataWriter* png_metadata_writer_construct (GType object_type, + const gchar* filepath); +PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static void png_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, + PhotoMetadata* metadata, + GError** error); +void photo_metadata_write_to_file (PhotoMetadata* self, + GFile* file, + GError** error); GFile* photo_file_adapter_get_file (PhotoFileAdapter* self); gpointer photo_file_format_driver_ref (gpointer instance); void photo_file_format_driver_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_driver (GValue* value, gpointer v_object); -void value_take_photo_file_format_driver (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_driver (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_driver (GValue* value, + gpointer v_object); +void value_take_photo_file_format_driver (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_driver (const GValue* value); GType photo_file_format_driver_get_type (void) G_GNUC_CONST; GType png_file_format_driver_get_type (void) G_GNUC_CONST; -enum { - PNG_FILE_FORMAT_DRIVER_DUMMY_PROPERTY -}; void png_file_format_driver_init (void); PngFileFormatDriver* png_file_format_driver_new (void); PngFileFormatDriver* png_file_format_driver_construct (GType object_type); PngFileFormatDriver* png_file_format_driver_get_instance (void); static PhotoFileFormatProperties* png_file_format_driver_real_get_properties (PhotoFileFormatDriver* base); -static PhotoFileReader* png_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath); +static PhotoFileReader* png_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath); static gboolean png_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base); static gboolean png_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base); -static PhotoFileWriter* png_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath); -static PhotoFileMetadataWriter* png_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath); -static PhotoFileSniffer* png_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options); +static PhotoFileWriter* png_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath); +static PhotoFileMetadataWriter* png_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath); +static PhotoFileSniffer* png_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options); static PhotoMetadata* png_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base); PhotoMetadata* photo_metadata_new (void); PhotoMetadata* photo_metadata_construct (GType object_type); @@ -615,7 +675,9 @@ static void png_file_format_driver_finalize (PhotoFileFormatDriver * obj); static const guint8 PNG_SNIFFER_MAGIC_SEQUENCE[8] = {(guint8) 137, (guint8) 80, (guint8) 78, (guint8) 71, (guint8) 13, (guint8) 10, (guint8) 26, (guint8) 10}; -void png_file_format_properties_init (void) { +void +png_file_format_properties_init (void) +{ PngFileFormatProperties* _tmp0_; #line 14 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = png_file_format_properties_new (); @@ -623,18 +685,22 @@ void png_file_format_properties_init (void) { _photo_file_format_properties_unref0 (png_file_format_properties_instance); #line 14 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_file_format_properties_instance = _tmp0_; -#line 627 "PngSupport.c" +#line 689 "PngSupport.c" } -static gpointer _photo_file_format_properties_ref0 (gpointer self) { +static gpointer +_photo_file_format_properties_ref0 (gpointer self) +{ #line 18 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self ? photo_file_format_properties_ref (self) : NULL; -#line 634 "PngSupport.c" +#line 698 "PngSupport.c" } -PngFileFormatProperties* png_file_format_properties_get_instance (void) { +PngFileFormatProperties* +png_file_format_properties_get_instance (void) +{ PngFileFormatProperties* result = NULL; PngFileFormatProperties* _tmp0_; PngFileFormatProperties* _tmp1_; @@ -646,11 +712,13 @@ PngFileFormatProperties* png_file_format_properties_get_instance (void) { result = _tmp1_; #line 18 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 650 "PngSupport.c" +#line 716 "PngSupport.c" } -static PhotoFileFormat png_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) { +static PhotoFileFormat +png_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) +{ PngFileFormatProperties * self; PhotoFileFormat result = 0; #line 21 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -659,11 +727,13 @@ static PhotoFileFormat png_file_format_properties_real_get_file_format (PhotoFil result = PHOTO_FILE_FORMAT_PNG; #line 22 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 663 "PngSupport.c" +#line 731 "PngSupport.c" } -static PhotoFileFormatFlags png_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) { +static PhotoFileFormatFlags +png_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) +{ PngFileFormatProperties * self; PhotoFileFormatFlags result = 0; #line 25 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -672,11 +742,13 @@ static PhotoFileFormatFlags png_file_format_properties_real_get_flags (PhotoFile result = PHOTO_FILE_FORMAT_FLAGS_NONE; #line 26 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 676 "PngSupport.c" +#line 746 "PngSupport.c" } -static gchar* png_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) { +static gchar* +png_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) +{ PngFileFormatProperties * self; gchar* result = NULL; gchar* _tmp0_; @@ -688,11 +760,13 @@ static gchar* png_file_format_properties_real_get_user_visible_name (PhotoFileFo result = _tmp0_; #line 30 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 692 "PngSupport.c" +#line 764 "PngSupport.c" } -static gchar* png_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) { +static gchar* +png_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) +{ PngFileFormatProperties * self; gchar* result = NULL; gchar** _tmp0_; @@ -713,32 +787,38 @@ static gchar* png_file_format_properties_real_get_default_extension (PhotoFileFo result = _tmp2_; #line 34 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 717 "PngSupport.c" +#line 791 "PngSupport.c" } -static gchar** _vala_array_dup12 (gchar** self, int length) { +static gchar** +_vala_array_dup12 (gchar** self, + int length) +{ gchar** result; int i; #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result = g_new0 (gchar*, length + 1); #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" for (i = 0; i < length; i++) { -#line 728 "PngSupport.c" +#line 805 "PngSupport.c" gchar* _tmp0_; #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = g_strdup (self[i]); #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result[i] = _tmp0_; -#line 734 "PngSupport.c" +#line 811 "PngSupport.c" } #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 738 "PngSupport.c" +#line 815 "PngSupport.c" } -static gchar** png_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +png_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1) +{ PngFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -765,17 +845,19 @@ static gchar** png_file_format_properties_real_get_known_extensions (PhotoFileFo if (result_length1) { #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" *result_length1 = _tmp2__length1; -#line 769 "PngSupport.c" +#line 849 "PngSupport.c" } #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result = _tmp2_; #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 775 "PngSupport.c" +#line 855 "PngSupport.c" } -static gchar* png_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) { +static gchar* +png_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) +{ PngFileFormatProperties * self; gchar* result = NULL; gchar** _tmp0_; @@ -796,32 +878,38 @@ static gchar* png_file_format_properties_real_get_default_mime_type (PhotoFileFo result = _tmp2_; #line 42 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 800 "PngSupport.c" +#line 882 "PngSupport.c" } -static gchar** _vala_array_dup13 (gchar** self, int length) { +static gchar** +_vala_array_dup13 (gchar** self, + int length) +{ gchar** result; int i; #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result = g_new0 (gchar*, length + 1); #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" for (i = 0; i < length; i++) { -#line 811 "PngSupport.c" +#line 896 "PngSupport.c" gchar* _tmp0_; #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = g_strdup (self[i]); #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result[i] = _tmp0_; -#line 817 "PngSupport.c" +#line 902 "PngSupport.c" } #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 821 "PngSupport.c" +#line 906 "PngSupport.c" } -static gchar** png_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +png_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1) +{ PngFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -848,34 +936,40 @@ static gchar** png_file_format_properties_real_get_mime_types (PhotoFileFormatPr if (result_length1) { #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" *result_length1 = _tmp2__length1; -#line 852 "PngSupport.c" +#line 940 "PngSupport.c" } #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result = _tmp2_; #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 858 "PngSupport.c" +#line 946 "PngSupport.c" } -PngFileFormatProperties* png_file_format_properties_construct (GType object_type) { +PngFileFormatProperties* +png_file_format_properties_construct (GType object_type) +{ PngFileFormatProperties* self = NULL; #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = (PngFileFormatProperties*) photo_file_format_properties_construct (object_type); #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self; -#line 868 "PngSupport.c" +#line 958 "PngSupport.c" } -PngFileFormatProperties* png_file_format_properties_new (void) { +PngFileFormatProperties* +png_file_format_properties_new (void) +{ #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return png_file_format_properties_construct (TYPE_PNG_FILE_FORMAT_PROPERTIES); -#line 875 "PngSupport.c" +#line 967 "PngSupport.c" } -static void png_file_format_properties_class_init (PngFileFormatPropertiesClass * klass) { +static void +png_file_format_properties_class_init (PngFileFormatPropertiesClass * klass) +{ gchar* _tmp0_; gchar** _tmp1_; gchar* _tmp2_; @@ -918,25 +1012,31 @@ static void png_file_format_properties_class_init (PngFileFormatPropertiesClass png_file_format_properties_KNOWN_MIME_TYPES = _tmp3_; #line 9 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_file_format_properties_KNOWN_MIME_TYPES_length1 = 1; -#line 922 "PngSupport.c" +#line 1016 "PngSupport.c" } -static void png_file_format_properties_instance_init (PngFileFormatProperties * self) { +static void +png_file_format_properties_instance_init (PngFileFormatProperties * self) +{ } -static void png_file_format_properties_finalize (PhotoFileFormatProperties * obj) { +static void +png_file_format_properties_finalize (PhotoFileFormatProperties * obj) +{ PngFileFormatProperties * self; #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PNG_FILE_FORMAT_PROPERTIES, PngFileFormatProperties); #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" PHOTO_FILE_FORMAT_PROPERTIES_CLASS (png_file_format_properties_parent_class)->finalize (obj); -#line 936 "PngSupport.c" +#line 1034 "PngSupport.c" } -GType png_file_format_properties_get_type (void) { +GType +png_file_format_properties_get_type (void) +{ static volatile gsize png_file_format_properties_type_id__volatile = 0; if (g_once_init_enter (&png_file_format_properties_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PngFileFormatPropertiesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) png_file_format_properties_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PngFileFormatProperties), 0, (GInstanceInitFunc) png_file_format_properties_instance_init, NULL }; @@ -948,82 +1048,83 @@ GType png_file_format_properties_get_type (void) { } -PngSniffer* png_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { +PngSniffer* +png_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options) +{ PngSniffer* self = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; #line 53 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 54 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = file; -#line 54 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp1_ = options; -#line 54 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - self = (PngSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_); + self = (PngSniffer*) gdk_sniffer_construct (object_type, file, options); #line 53 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self; -#line 966 "PngSupport.c" +#line 1064 "PngSupport.c" } -PngSniffer* png_sniffer_new (GFile* file, PhotoFileSnifferOptions options) { +PngSniffer* +png_sniffer_new (GFile* file, + PhotoFileSnifferOptions options) +{ #line 53 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return png_sniffer_construct (TYPE_PNG_SNIFFER, file, options); -#line 973 "PngSupport.c" +#line 1074 "PngSupport.c" } -static gboolean png_sniffer_is_png_file (GFile* file, GError** error) { +static gboolean +png_sniffer_is_png_file (GFile* file, + GError** error) +{ gboolean result = FALSE; GFileInputStream* instream = NULL; - GFile* _tmp0_; - GFileInputStream* _tmp1_; + GFileInputStream* _tmp0_; guint8* file_lead_sequence = NULL; - guint8* _tmp3_; + guint8* _tmp2_; gint file_lead_sequence_length1; gint _file_lead_sequence_size_; - GFileInputStream* _tmp4_; - guint8* _tmp5_; - gint _tmp5__length1; + GFileInputStream* _tmp3_; + guint8* _tmp4_; + gint _tmp4__length1; GError * _inner_error_ = NULL; #line 57 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = file; + _tmp0_ = g_file_read (file, NULL, &_inner_error_); #line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp1_ = g_file_read (_tmp0_, NULL, &_inner_error_); -#line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - instream = _tmp1_; + instream = _tmp0_; #line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1000 "PngSupport.c" - gboolean _tmp2_ = FALSE; +#line 1101 "PngSupport.c" + gboolean _tmp1_ = FALSE; #line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_propagate_error (error, _inner_error_); #line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - return _tmp2_; -#line 1006 "PngSupport.c" + return _tmp1_; +#line 1107 "PngSupport.c" } #line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp3_ = g_new0 (guint8, G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE)); + _tmp2_ = g_new0 (guint8, G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE)); #line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - file_lead_sequence = _tmp3_; + file_lead_sequence = _tmp2_; #line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" file_lead_sequence_length1 = G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE); #line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _file_lead_sequence_size_ = file_lead_sequence_length1; #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp4_ = instream; + _tmp3_ = instream; #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp5_ = file_lead_sequence; + _tmp4_ = file_lead_sequence; #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp5__length1 = file_lead_sequence_length1; + _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 (_tmp4_, g_input_stream_get_type (), GInputStream), _tmp5_, (gsize) _tmp5__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 1026 "PngSupport.c" - gboolean _tmp6_ = FALSE; +#line 1127 "PngSupport.c" + gboolean _tmp5_ = FALSE; #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_propagate_error (error, _inner_error_); #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1031,62 +1132,62 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) { #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _g_object_unref0 (instream); #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - return _tmp6_; -#line 1036 "PngSupport.c" + return _tmp5_; +#line 1137 "PngSupport.c" } { gint i = 0; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" i = 0; -#line 1042 "PngSupport.c" +#line 1143 "PngSupport.c" { - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp7_ = TRUE; + _tmp6_ = TRUE; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" while (TRUE) { -#line 1049 "PngSupport.c" - gint _tmp9_; - guint8* _tmp10_; - gint _tmp10__length1; - gint _tmp11_; - guint8 _tmp12_; - gint _tmp13_; - guint8 _tmp14_; +#line 1150 "PngSupport.c" + gint _tmp8_; + guint8* _tmp9_; + gint _tmp9__length1; + gint _tmp10_; + guint8 _tmp11_; + gint _tmp12_; + guint8 _tmp13_; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - if (!_tmp7_) { -#line 1059 "PngSupport.c" - gint _tmp8_; + if (!_tmp6_) { +#line 1160 "PngSupport.c" + gint _tmp7_; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp8_ = i; + _tmp7_ = i; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - i = _tmp8_ + 1; -#line 1065 "PngSupport.c" + i = _tmp7_ + 1; +#line 1166 "PngSupport.c" } #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp7_ = FALSE; + _tmp6_ = FALSE; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp9_ = i; + _tmp8_ = i; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - if (!(_tmp9_ < G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE))) { + if (!(_tmp8_ < G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE))) { #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" break; -#line 1075 "PngSupport.c" +#line 1176 "PngSupport.c" } #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp10_ = file_lead_sequence; + _tmp9_ = file_lead_sequence; #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp10__length1 = file_lead_sequence_length1; + _tmp9__length1 = file_lead_sequence_length1; #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp11_ = i; + _tmp10_ = i; #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp12_ = _tmp10_[_tmp11_]; + _tmp11_ = _tmp9_[_tmp10_]; #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp13_ = i; + _tmp12_ = i; #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp14_ = PNG_SNIFFER_MAGIC_SEQUENCE[_tmp13_]; + _tmp13_ = PNG_SNIFFER_MAGIC_SEQUENCE[_tmp12_]; #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - if (_tmp12_ != _tmp14_) { + if (_tmp11_ != _tmp13_) { #line 66 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result = FALSE; #line 66 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1095,7 +1196,7 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) { _g_object_unref0 (instream); #line 66 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1099 "PngSupport.c" +#line 1200 "PngSupport.c" } } } @@ -1108,32 +1209,37 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) { _g_object_unref0 (instream); #line 69 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1112 "PngSupport.c" +#line 1213 "PngSupport.c" } -static gpointer _detected_photo_information_ref0 (gpointer self) { +static gpointer +_detected_photo_information_ref0 (gpointer self) +{ #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self ? detected_photo_information_ref (self) : NULL; -#line 1119 "PngSupport.c" +#line 1222 "PngSupport.c" } -static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error) { +static DetectedPhotoInformation* +png_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error) +{ PngSniffer * self; gboolean _vala_is_corrupted = FALSE; DetectedPhotoInformation* result = NULL; gboolean _tmp0_ = FALSE; GFile* _tmp1_; - gboolean _tmp2_; DetectedPhotoInformation* detected = NULL; - gboolean _tmp3_ = FALSE; + gboolean _tmp2_ = FALSE; + DetectedPhotoInformation* _tmp3_; DetectedPhotoInformation* _tmp4_; - DetectedPhotoInformation* _tmp5_; - DetectedPhotoInformation* _tmp6_ = NULL; - DetectedPhotoInformation* _tmp7_; - PhotoFileFormat _tmp8_; - DetectedPhotoInformation* _tmp10_; + DetectedPhotoInformation* _tmp5_ = NULL; + DetectedPhotoInformation* _tmp6_; + PhotoFileFormat _tmp7_; + DetectedPhotoInformation* _tmp9_; GError * _inner_error_ = NULL; #line 72 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_SNIFFER, PngSniffer); @@ -1142,16 +1248,14 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base, #line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; #line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp2_ = png_sniffer_is_png_file (_tmp1_, &_inner_error_); -#line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = _tmp2_; + _tmp0_ = png_sniffer_is_png_file (_tmp1_, &_inner_error_); #line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_propagate_error (error, _inner_error_); #line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return NULL; -#line 1155 "PngSupport.c" +#line 1259 "PngSupport.c" } #line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (!_tmp0_) { @@ -1161,30 +1265,30 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base, if (is_corrupted) { #line 77 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1165 "PngSupport.c" +#line 1269 "PngSupport.c" } #line 77 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1169 "PngSupport.c" +#line 1273 "PngSupport.c" } #line 79 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp4_ = PHOTO_FILE_SNIFFER_CLASS (png_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp3_, &_inner_error_); + _tmp3_ = PHOTO_FILE_SNIFFER_CLASS (png_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp2_, &_inner_error_); #line 79 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _vala_is_corrupted = _tmp3_; + _vala_is_corrupted = _tmp2_; #line 79 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - detected = _tmp4_; + detected = _tmp3_; #line 79 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 79 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_propagate_error (error, _inner_error_); #line 79 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return NULL; -#line 1183 "PngSupport.c" +#line 1287 "PngSupport.c" } #line 80 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp5_ = detected; + _tmp4_ = detected; #line 80 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - if (_tmp5_ == NULL) { + if (_tmp4_ == NULL) { #line 81 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result = NULL; #line 81 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1193,62 +1297,68 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base, if (is_corrupted) { #line 81 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1197 "PngSupport.c" +#line 1301 "PngSupport.c" } #line 81 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1201 "PngSupport.c" +#line 1305 "PngSupport.c" } #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp7_ = detected; + _tmp6_ = detected; #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp8_ = _tmp7_->file_format; + _tmp7_ = _tmp6_->file_format; #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - if (_tmp8_ == PHOTO_FILE_FORMAT_PNG) { -#line 1209 "PngSupport.c" - DetectedPhotoInformation* _tmp9_; + if (_tmp7_ == PHOTO_FILE_FORMAT_PNG) { +#line 1313 "PngSupport.c" + DetectedPhotoInformation* _tmp8_; #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp9_ = detected; + _tmp8_ = detected; #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp6_ = _tmp9_; -#line 1215 "PngSupport.c" + _tmp5_ = _tmp8_; +#line 1319 "PngSupport.c" } else { #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp6_ = NULL; -#line 1219 "PngSupport.c" + _tmp5_ = NULL; +#line 1323 "PngSupport.c" } #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp10_ = _detected_photo_information_ref0 (_tmp6_); + _tmp9_ = _detected_photo_information_ref0 (_tmp5_); #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - result = _tmp10_; + result = _tmp9_; #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _detected_photo_information_unref0 (detected); #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (is_corrupted) { #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1231 "PngSupport.c" +#line 1335 "PngSupport.c" } #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1235 "PngSupport.c" +#line 1339 "PngSupport.c" } -static void png_sniffer_class_init (PngSnifferClass * klass) { +static void +png_sniffer_class_init (PngSnifferClass * klass) +{ #line 50 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_sniffer_parent_class = g_type_class_peek_parent (klass); #line 50 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) png_sniffer_real_sniff; -#line 1244 "PngSupport.c" +#line 1350 "PngSupport.c" } -static void png_sniffer_instance_init (PngSniffer * self) { +static void +png_sniffer_instance_init (PngSniffer * self) +{ } -GType png_sniffer_get_type (void) { +GType +png_sniffer_get_type (void) +{ static volatile gsize png_sniffer_type_id__volatile = 0; if (g_once_init_enter (&png_sniffer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PngSnifferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) png_sniffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PngSniffer), 0, (GInstanceInitFunc) png_sniffer_instance_init, NULL }; @@ -1260,29 +1370,36 @@ GType png_sniffer_get_type (void) { } -PngReader* png_reader_construct (GType object_type, const gchar* filepath) { +PngReader* +png_reader_construct (GType object_type, + const gchar* filepath) +{ PngReader* self = NULL; - const gchar* _tmp0_; #line 88 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 89 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = filepath; -#line 89 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - self = (PngReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_PNG); + self = (PngReader*) gdk_reader_construct (object_type, filepath, PHOTO_FILE_FORMAT_PNG); #line 88 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self; -#line 1275 "PngSupport.c" +#line 1385 "PngSupport.c" } -PngReader* png_reader_new (const gchar* filepath) { +PngReader* +png_reader_new (const gchar* filepath) +{ #line 88 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return png_reader_construct (TYPE_PNG_READER, filepath); -#line 1282 "PngSupport.c" +#line 1394 "PngSupport.c" } -static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error) { +static GdkPixbuf* +png_reader_real_scaled_read (PhotoFileReader* base, + Dimensions* full, + Dimensions* scaled, + GError** error) +{ PngReader * self; GdkPixbuf* result = NULL; GdkPixbuf* _result_ = NULL; @@ -1307,7 +1424,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions if (_tmp3_ > 9999) { #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp1_ = TRUE; -#line 1311 "PngSupport.c" +#line 1428 "PngSupport.c" } else { Dimensions _tmp4_; gint _tmp5_; @@ -1317,11 +1434,11 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions _tmp5_ = _tmp4_.height; #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp1_ = _tmp5_ > 9999; -#line 1321 "PngSupport.c" +#line 1438 "PngSupport.c" } #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (_tmp1_) { -#line 1325 "PngSupport.c" +#line 1442 "PngSupport.c" gboolean _tmp6_ = FALSE; Dimensions _tmp7_; gint _tmp8_; @@ -1333,7 +1450,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions if (_tmp8_ < 100) { #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp6_ = TRUE; -#line 1337 "PngSupport.c" +#line 1454 "PngSupport.c" } else { Dimensions _tmp9_; gint _tmp10_; @@ -1343,19 +1460,19 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions _tmp10_ = _tmp9_.height; #line 103 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp6_ = _tmp10_ < 100; -#line 1347 "PngSupport.c" +#line 1464 "PngSupport.c" } #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = _tmp6_; -#line 1351 "PngSupport.c" +#line 1468 "PngSupport.c" } else { #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = FALSE; -#line 1355 "PngSupport.c" +#line 1472 "PngSupport.c" } #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (_tmp0_) { -#line 1359 "PngSupport.c" +#line 1476 "PngSupport.c" Dimensions prefetch_dimensions = {0}; Dimensions _tmp11_ = {0}; GdkPixbuf* _tmp12_ = NULL; @@ -1406,7 +1523,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions _g_object_unref0 (_result_); #line 107 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return NULL; -#line 1410 "PngSupport.c" +#line 1527 "PngSupport.c" } #line 107 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp21_ = _tmp12_; @@ -1434,7 +1551,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions _result_ = _tmp27_; #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _g_object_unref0 (_tmp12_); -#line 1438 "PngSupport.c" +#line 1555 "PngSupport.c" } else { GdkPixbuf* _tmp28_ = NULL; gchar* _tmp29_; @@ -1474,7 +1591,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions _g_object_unref0 (_result_); #line 112 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return NULL; -#line 1478 "PngSupport.c" +#line 1595 "PngSupport.c" } #line 112 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp37_ = _tmp28_; @@ -1486,30 +1603,36 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions _result_ = _tmp37_; #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _g_object_unref0 (_tmp28_); -#line 1490 "PngSupport.c" +#line 1607 "PngSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result = _result_; #line 116 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1496 "PngSupport.c" +#line 1613 "PngSupport.c" } -static void png_reader_class_init (PngReaderClass * klass) { +static void +png_reader_class_init (PngReaderClass * klass) +{ #line 87 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_reader_parent_class = g_type_class_peek_parent (klass); #line 87 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) png_reader_real_scaled_read; -#line 1505 "PngSupport.c" +#line 1624 "PngSupport.c" } -static void png_reader_instance_init (PngReader * self) { +static void +png_reader_instance_init (PngReader * self) +{ } -GType png_reader_get_type (void) { +GType +png_reader_get_type (void) +{ static volatile gsize png_reader_type_id__volatile = 0; if (g_once_init_enter (&png_reader_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PngReaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) png_reader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PngReader), 0, (GInstanceInitFunc) png_reader_instance_init, NULL }; @@ -1521,73 +1644,83 @@ GType png_reader_get_type (void) { } -PngWriter* png_writer_construct (GType object_type, const gchar* filepath) { +PngWriter* +png_writer_construct (GType object_type, + const gchar* filepath) +{ PngWriter* self = NULL; - const gchar* _tmp0_; #line 121 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 122 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = filepath; -#line 122 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - self = (PngWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_PNG); + self = (PngWriter*) photo_file_writer_construct (object_type, filepath, PHOTO_FILE_FORMAT_PNG); #line 121 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self; -#line 1536 "PngSupport.c" +#line 1659 "PngSupport.c" } -PngWriter* png_writer_new (const gchar* filepath) { +PngWriter* +png_writer_new (const gchar* filepath) +{ #line 121 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return png_writer_construct (TYPE_PNG_WRITER, filepath); -#line 1543 "PngSupport.c" +#line 1668 "PngSupport.c" } -static void png_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) { +static void +png_writer_real_write (PhotoFileWriter* base, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error) +{ PngWriter * self; - GdkPixbuf* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; GError * _inner_error_ = NULL; #line 125 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_WRITER, PngWriter); #line 125 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); #line 126 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = pixbuf; -#line 126 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp0_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 126 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 126 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - gdk_pixbuf_save (_tmp0_, _tmp2_, "png", &_inner_error_, "compression", "9", NULL, NULL); + gdk_pixbuf_save (pixbuf, _tmp1_, "png", &_inner_error_, "compression", "9", NULL, NULL); #line 126 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 126 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 126 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_propagate_error (error, _inner_error_); #line 126 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return; -#line 1573 "PngSupport.c" +#line 1700 "PngSupport.c" } } -static void png_writer_class_init (PngWriterClass * klass) { +static void +png_writer_class_init (PngWriterClass * klass) +{ #line 120 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_writer_parent_class = g_type_class_peek_parent (klass); #line 120 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" ((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) png_writer_real_write; -#line 1583 "PngSupport.c" +#line 1712 "PngSupport.c" } -static void png_writer_instance_init (PngWriter * self) { +static void +png_writer_instance_init (PngWriter * self) +{ } -GType png_writer_get_type (void) { +GType +png_writer_get_type (void) +{ static volatile gsize png_writer_type_id__volatile = 0; if (g_once_init_enter (&png_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PngWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) png_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PngWriter), 0, (GInstanceInitFunc) png_writer_instance_init, NULL }; @@ -1599,73 +1732,82 @@ GType png_writer_get_type (void) { } -PngMetadataWriter* png_metadata_writer_construct (GType object_type, const gchar* filepath) { +PngMetadataWriter* +png_metadata_writer_construct (GType object_type, + const gchar* filepath) +{ PngMetadataWriter* self = NULL; - const gchar* _tmp0_; #line 131 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 132 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = filepath; -#line 132 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - self = (PngMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_PNG); + self = (PngMetadataWriter*) photo_file_metadata_writer_construct (object_type, filepath, PHOTO_FILE_FORMAT_PNG); #line 131 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self; -#line 1614 "PngSupport.c" +#line 1747 "PngSupport.c" } -PngMetadataWriter* png_metadata_writer_new (const gchar* filepath) { +PngMetadataWriter* +png_metadata_writer_new (const gchar* filepath) +{ #line 131 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return png_metadata_writer_construct (TYPE_PNG_METADATA_WRITER, filepath); -#line 1621 "PngSupport.c" +#line 1756 "PngSupport.c" } -static void png_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error) { +static void +png_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, + PhotoMetadata* metadata, + GError** error) +{ PngMetadataWriter * self; - PhotoMetadata* _tmp0_; + GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; GError * _inner_error_ = NULL; #line 135 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_METADATA_WRITER, PngMetadataWriter); #line 135 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_if_fail (IS_PHOTO_METADATA (metadata)); #line 136 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = metadata; + _tmp0_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 136 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp1_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp1_ = _tmp0_; #line 136 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp2_ = _tmp1_; + photo_metadata_write_to_file (metadata, _tmp1_, &_inner_error_); #line 136 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - photo_metadata_write_to_file (_tmp0_, _tmp2_, &_inner_error_); -#line 136 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 136 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 136 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_propagate_error (error, _inner_error_); #line 136 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return; -#line 1651 "PngSupport.c" +#line 1787 "PngSupport.c" } } -static void png_metadata_writer_class_init (PngMetadataWriterClass * klass) { +static void +png_metadata_writer_class_init (PngMetadataWriterClass * klass) +{ #line 130 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_metadata_writer_parent_class = g_type_class_peek_parent (klass); #line 130 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) png_metadata_writer_real_write_metadata; -#line 1661 "PngSupport.c" +#line 1799 "PngSupport.c" } -static void png_metadata_writer_instance_init (PngMetadataWriter * self) { +static void +png_metadata_writer_instance_init (PngMetadataWriter * self) +{ } -GType png_metadata_writer_get_type (void) { +GType +png_metadata_writer_get_type (void) +{ static volatile gsize png_metadata_writer_type_id__volatile = 0; if (g_once_init_enter (&png_metadata_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PngMetadataWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) png_metadata_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PngMetadataWriter), 0, (GInstanceInitFunc) png_metadata_writer_instance_init, NULL }; @@ -1677,7 +1819,9 @@ GType png_metadata_writer_get_type (void) { } -void png_file_format_driver_init (void) { +void +png_file_format_driver_init (void) +{ PngFileFormatDriver* _tmp0_; #line 144 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = png_file_format_driver_new (); @@ -1687,18 +1831,22 @@ void png_file_format_driver_init (void) { png_file_format_driver_instance = _tmp0_; #line 145 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_file_format_properties_init (); -#line 1691 "PngSupport.c" +#line 1835 "PngSupport.c" } -static gpointer _photo_file_format_driver_ref0 (gpointer self) { +static gpointer +_photo_file_format_driver_ref0 (gpointer self) +{ #line 149 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self ? photo_file_format_driver_ref (self) : NULL; -#line 1698 "PngSupport.c" +#line 1844 "PngSupport.c" } -PngFileFormatDriver* png_file_format_driver_get_instance (void) { +PngFileFormatDriver* +png_file_format_driver_get_instance (void) +{ PngFileFormatDriver* result = NULL; PngFileFormatDriver* _tmp0_; PngFileFormatDriver* _tmp1_; @@ -1710,11 +1858,13 @@ PngFileFormatDriver* png_file_format_driver_get_instance (void) { result = _tmp1_; #line 149 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1714 "PngSupport.c" +#line 1862 "PngSupport.c" } -static PhotoFileFormatProperties* png_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) { +static PhotoFileFormatProperties* +png_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) +{ PngFileFormatDriver * self; PhotoFileFormatProperties* result = NULL; PngFileFormatProperties* _tmp0_; @@ -1726,32 +1876,34 @@ static PhotoFileFormatProperties* png_file_format_driver_real_get_properties (Ph result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties); #line 153 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1730 "PngSupport.c" +#line 1880 "PngSupport.c" } -static PhotoFileReader* png_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileReader* +png_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath) +{ PngFileFormatDriver * self; PhotoFileReader* result = NULL; - const gchar* _tmp0_; - PngReader* _tmp1_; + PngReader* _tmp0_; #line 156 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver); #line 156 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 157 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = filepath; -#line 157 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp1_ = png_reader_new (_tmp0_); + _tmp0_ = png_reader_new (filepath); #line 157 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_READER, PhotoFileReader); #line 157 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1751 "PngSupport.c" +#line 1901 "PngSupport.c" } -static gboolean png_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) { +static gboolean +png_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) +{ PngFileFormatDriver * self; gboolean result = FALSE; #line 160 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1760,11 +1912,13 @@ static gboolean png_file_format_driver_real_can_write_image (PhotoFileFormatDriv result = TRUE; #line 161 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1764 "PngSupport.c" +#line 1916 "PngSupport.c" } -static gboolean png_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) { +static gboolean +png_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) +{ PngFileFormatDriver * self; gboolean result = FALSE; #line 164 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1773,77 +1927,77 @@ static gboolean png_file_format_driver_real_can_write_metadata (PhotoFileFormatD result = TRUE; #line 165 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1777 "PngSupport.c" +#line 1931 "PngSupport.c" } -static PhotoFileWriter* png_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileWriter* +png_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ PngFileFormatDriver * self; PhotoFileWriter* result = NULL; - const gchar* _tmp0_; - PngWriter* _tmp1_; + PngWriter* _tmp0_; #line 168 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver); #line 168 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 169 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = filepath; + _tmp0_ = png_writer_new (filepath); #line 169 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp1_ = png_writer_new (_tmp0_); -#line 169 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter); #line 169 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1798 "PngSupport.c" +#line 1952 "PngSupport.c" } -static PhotoFileMetadataWriter* png_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileMetadataWriter* +png_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ PngFileFormatDriver * self; PhotoFileMetadataWriter* result = NULL; - const gchar* _tmp0_; - PngMetadataWriter* _tmp1_; + PngMetadataWriter* _tmp0_; #line 172 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver); #line 172 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 173 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = filepath; -#line 173 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp1_ = png_metadata_writer_new (_tmp0_); + _tmp0_ = png_metadata_writer_new (filepath); #line 173 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter); #line 173 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1819 "PngSupport.c" +#line 1973 "PngSupport.c" } -static PhotoFileSniffer* png_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) { +static PhotoFileSniffer* +png_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options) +{ PngFileFormatDriver * self; PhotoFileSniffer* result = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; - PngSniffer* _tmp2_; + PngSniffer* _tmp0_; #line 176 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver); #line 176 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 177 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = file; -#line 177 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp1_ = options; + _tmp0_ = png_sniffer_new (file, options); #line 177 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp2_ = png_sniffer_new (_tmp0_, _tmp1_); -#line 177 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); #line 177 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1843 "PngSupport.c" +#line 1995 "PngSupport.c" } -static PhotoMetadata* png_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) { +static PhotoMetadata* +png_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) +{ PngFileFormatDriver * self; PhotoMetadata* result = NULL; PhotoMetadata* _tmp0_; @@ -1855,28 +2009,34 @@ static PhotoMetadata* png_file_format_driver_real_create_metadata (PhotoFileForm result = _tmp0_; #line 181 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1859 "PngSupport.c" +#line 2013 "PngSupport.c" } -PngFileFormatDriver* png_file_format_driver_construct (GType object_type) { +PngFileFormatDriver* +png_file_format_driver_construct (GType object_type) +{ PngFileFormatDriver* self = NULL; #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = (PngFileFormatDriver*) photo_file_format_driver_construct (object_type); #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self; -#line 1869 "PngSupport.c" +#line 2025 "PngSupport.c" } -PngFileFormatDriver* png_file_format_driver_new (void) { +PngFileFormatDriver* +png_file_format_driver_new (void) +{ #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return png_file_format_driver_construct (TYPE_PNG_FILE_FORMAT_DRIVER); -#line 1876 "PngSupport.c" +#line 2034 "PngSupport.c" } -static void png_file_format_driver_class_init (PngFileFormatDriverClass * klass) { +static void +png_file_format_driver_class_init (PngFileFormatDriverClass * klass) +{ #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_file_format_driver_parent_class = g_type_class_peek_parent (klass); #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1897,25 +2057,31 @@ static void png_file_format_driver_class_init (PngFileFormatDriverClass * klass) ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) png_file_format_driver_real_create_sniffer; #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*) (PhotoFileFormatDriver *)) png_file_format_driver_real_create_metadata; -#line 1901 "PngSupport.c" +#line 2061 "PngSupport.c" } -static void png_file_format_driver_instance_init (PngFileFormatDriver * self) { +static void +png_file_format_driver_instance_init (PngFileFormatDriver * self) +{ } -static void png_file_format_driver_finalize (PhotoFileFormatDriver * obj) { +static void +png_file_format_driver_finalize (PhotoFileFormatDriver * obj) +{ PngFileFormatDriver * self; #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver); #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" PHOTO_FILE_FORMAT_DRIVER_CLASS (png_file_format_driver_parent_class)->finalize (obj); -#line 1915 "PngSupport.c" +#line 2079 "PngSupport.c" } -GType png_file_format_driver_get_type (void) { +GType +png_file_format_driver_get_type (void) +{ static volatile gsize png_file_format_driver_type_id__volatile = 0; if (g_once_init_enter (&png_file_format_driver_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PngFileFormatDriverClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) png_file_format_driver_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PngFileFormatDriver), 0, (GInstanceInitFunc) png_file_format_driver_instance_init, NULL }; diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c index c22f941..bd5b4b7 100644 --- a/src/photos/RawSupport.c +++ b/src/photos/RawSupport.c @@ -1,4 +1,4 @@ -/* RawSupport.c generated by valac 0.36.6, the Vala compiler +/* RawSupport.c generated by valac 0.40.4, the Vala compiler * generated from RawSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -480,31 +481,55 @@ static gpointer raw_reader_parent_class = NULL; gpointer photo_file_format_driver_ref (gpointer instance); void photo_file_format_driver_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_driver (GValue* value, gpointer v_object); -void value_take_photo_file_format_driver (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_driver (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_driver (GValue* value, + gpointer v_object); +void value_take_photo_file_format_driver (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_driver (const GValue* value); GType photo_file_format_driver_get_type (void) G_GNUC_CONST; gpointer photo_file_format_properties_ref (gpointer instance); void photo_file_format_properties_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_properties (GValue* value, gpointer v_object); -void value_take_photo_file_format_properties (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_properties (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_properties (GValue* value, + gpointer v_object); +void value_take_photo_file_format_properties (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_properties (const GValue* value); GType photo_file_format_properties_get_type (void) G_GNUC_CONST; gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -513,15 +538,18 @@ GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST; GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; gpointer photo_file_sniffer_ref (gpointer instance); void photo_file_sniffer_unref (gpointer instance); -GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_sniffer (GValue* value, gpointer v_object); -void value_take_photo_file_sniffer (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_sniffer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_sniffer (GValue* value, + gpointer v_object); +void value_take_photo_file_sniffer (GValue* value, + gpointer v_object); gpointer value_get_photo_file_sniffer (const GValue* value); GType photo_file_sniffer_get_type (void) G_GNUC_CONST; GType raw_file_format_driver_get_type (void) G_GNUC_CONST; -enum { - RAW_FILE_FORMAT_DRIVER_DUMMY_PROPERTY -}; void raw_file_format_driver_init (void); RawFileFormatDriver* raw_file_format_driver_new (void); RawFileFormatDriver* raw_file_format_driver_construct (GType object_type); @@ -530,132 +558,201 @@ RawFileFormatDriver* raw_file_format_driver_get_instance (void); static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (PhotoFileFormatDriver* base); GType raw_file_format_properties_get_type (void) G_GNUC_CONST; RawFileFormatProperties* raw_file_format_properties_get_instance (void); -static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath); +static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath); RawReader* raw_reader_new (const gchar* filepath); -RawReader* raw_reader_construct (GType object_type, const gchar* filepath); +RawReader* raw_reader_construct (GType object_type, + const gchar* filepath); GType raw_reader_get_type (void) G_GNUC_CONST; static PhotoMetadata* raw_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base); PhotoMetadata* photo_metadata_new (void); PhotoMetadata* photo_metadata_construct (GType object_type); static gboolean raw_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base); static gboolean raw_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base); -static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath); -static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath); -static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options); -RawSniffer* raw_sniffer_new (GFile* file, PhotoFileSnifferOptions options); -RawSniffer* raw_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); +static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath); +static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath); +static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options); +RawSniffer* raw_sniffer_new (GFile* file, + PhotoFileSnifferOptions options); +RawSniffer* raw_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); GType raw_sniffer_get_type (void) G_GNUC_CONST; PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type); static void raw_file_format_driver_finalize (PhotoFileFormatDriver * obj); GType photo_file_format_get_type (void) G_GNUC_CONST; GType photo_file_format_flags_get_type (void) G_GNUC_CONST; -enum { - RAW_FILE_FORMAT_PROPERTIES_DUMMY_PROPERTY -}; RawFileFormatProperties* raw_file_format_properties_new (void); RawFileFormatProperties* raw_file_format_properties_construct (GType object_type); static PhotoFileFormat raw_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base); static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base); static PhotoFileFormatFlags raw_file_format_properties_real_get_flags (PhotoFileFormatProperties* base); static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base); -static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup10 (gchar** self, int length); +static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1); +static gchar** _vala_array_dup10 (gchar** self, + int length); static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base); -static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup11 (gchar** self, int length); +static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1); +static gchar** _vala_array_dup11 (gchar** self, + int length); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); static void raw_file_format_properties_finalize (PhotoFileFormatProperties * obj); gpointer detected_photo_information_ref (gpointer instance); void detected_photo_information_unref (gpointer instance); -GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_detected_photo_information (GValue* value, gpointer v_object); -void value_take_detected_photo_information (GValue* value, gpointer v_object); +GParamSpec* param_spec_detected_photo_information (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_detected_photo_information (GValue* value, + gpointer v_object); +void value_take_detected_photo_information (GValue* value, + gpointer v_object); gpointer value_get_detected_photo_information (const GValue* value); GType detected_photo_information_get_type (void) G_GNUC_CONST; -enum { - RAW_SNIFFER_DUMMY_PROPERTY -}; -PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error); +PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error); DetectedPhotoInformation* detected_photo_information_new (void); DetectedPhotoInformation* detected_photo_information_construct (GType object_type); gpointer graw_processor_ref (gpointer instance); void graw_processor_unref (gpointer instance); -GParamSpec* graw_param_spec_processor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void graw_value_set_processor (GValue* value, gpointer v_object); -void graw_value_take_processor (GValue* value, gpointer v_object); +GParamSpec* graw_param_spec_processor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void graw_value_set_processor (GValue* value, + gpointer v_object); +void graw_value_take_processor (GValue* value, + gpointer v_object); gpointer graw_value_get_processor (const GValue* value); GType graw_processor_get_type (void) G_GNUC_CONST; GRawProcessor* graw_processor_new (enum LibRaw_constructor_flags options); -GRawProcessor* graw_processor_construct (GType object_type, enum LibRaw_constructor_flags options); +GRawProcessor* graw_processor_construct (GType object_type, + enum LibRaw_constructor_flags options); libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self); GType graw_flip_get_type (void) G_GNUC_CONST; GQuark graw_exception_quark (void); -void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GError** error); -void graw_processor_unpack (GRawProcessor* self, GError** error); -void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error); +void graw_processor_open_file (GRawProcessor* self, + const gchar* filename, + GError** error); +void graw_processor_unpack (GRawProcessor* self, + GError** error); +void graw_processor_adjust_sizes_info_only (GRawProcessor* self, + GError** error); GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self); -void dimensions_init (Dimensions *self, gint width, gint height); -PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error); +void dimensions_init (Dimensions *self, + gint width, + gint height); +PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, + GError** error); gchar* photo_metadata_exif_hash (PhotoMetadata* self); gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self); -gchar* md5_file (GFile* file, GError** error); -enum { - RAW_READER_DUMMY_PROPERTY -}; -PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GError** error); -void media_metadata_read_from_file (MediaMetadata* self, GFile* file, GError** error); +gchar* md5_file (GFile* file, + GError** error); +PhotoFileReader* photo_file_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, + GError** error); +void media_metadata_read_from_file (MediaMetadata* self, + GFile* file, + GError** error); GFile* photo_file_adapter_get_file (PhotoFileAdapter* self); -static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** error); -void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean half_size); +static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, + GError** error); +void graw_processor_configure_for_rgb_display (GRawProcessor* self, + gboolean half_size); gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self); -void graw_processor_process (GRawProcessor* self, GError** error); +void graw_processor_process (GRawProcessor* self, + GError** error); gpointer graw_processed_image_ref (gpointer instance); void graw_processed_image_unref (gpointer instance); -GParamSpec* graw_param_spec_processed_image (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void graw_value_set_processed_image (GValue* value, gpointer v_object); -void graw_value_take_processed_image (GValue* value, gpointer v_object); +GParamSpec* graw_param_spec_processed_image (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void graw_value_set_processed_image (GValue* value, + gpointer v_object); +void graw_value_take_processed_image (GValue* value, + gpointer v_object); gpointer graw_value_get_processed_image (const GValue* value); GType graw_processed_image_get_type (void) G_GNUC_CONST; -GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** error); +GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, + GError** error); GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self); -static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error); +static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, + Dimensions* full, + Dimensions* scaled, + GError** error); GType photo_file_reader_role_get_type (void) G_GNUC_CONST; PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self); -void graw_processor_unpack_thumb (GRawProcessor* self, GError** error); -GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError** error); -GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp); +void graw_processor_unpack_thumb (GRawProcessor* self, + GError** error); +GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, + GError** error); +GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, + Dimensions* resized, + GdkInterpType interp); GType raw_developer_get_type (void) G_GNUC_CONST; RawDeveloper* raw_developer_as_array (int* result_length1); gchar* raw_developer_to_string (RawDeveloper self); RawDeveloper raw_developer_from_string (const gchar* value); gchar* raw_developer_get_label (RawDeveloper self); -gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d); +gboolean raw_developer_is_equivalent (RawDeveloper self, + RawDeveloper d); gpointer backing_photo_row_ref (gpointer instance); void backing_photo_row_unref (gpointer instance); -GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_photo_row (GValue* value, gpointer v_object); -void value_take_backing_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_photo_row (GValue* value, + gpointer v_object); +void value_take_backing_photo_row (GValue* value, + gpointer v_object); gpointer value_get_backing_photo_row (const GValue* value); GType backing_photo_row_get_type (void) G_GNUC_CONST; -BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, const gchar* raw_filepath, const gchar* camera_development_filename, GError** error); +BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, + const gchar* raw_filepath, + const gchar* camera_development_filename, + GError** error); BackingPhotoRow* backing_photo_row_new (void); BackingPhotoRow* backing_photo_row_construct (GType object_type); -void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext); +void disassemble_filename (const gchar* basename, + gchar* * name, + gchar* * ext); gchar* library_files_convert_basename (const gchar* basename); -GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error); -gboolean claim_file (GFile* file, GError** error); +GFile* generate_unique_file (GFile* dir, + const gchar* basename, + gboolean* collision, + GError** error); +gboolean claim_file (GFile* file, + GError** error); GType backing_photo_id_get_type (void) G_GNUC_CONST; BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self); void backing_photo_id_free (BackingPhotoID* self); GType orientation_get_type (void) G_GNUC_CONST; -void raw_file_format_driver_init (void) { +void +raw_file_format_driver_init (void) +{ RawFileFormatDriver* _tmp0_; #line 11 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = raw_file_format_driver_new (); @@ -665,18 +762,22 @@ void raw_file_format_driver_init (void) { raw_file_format_driver_instance = _tmp0_; #line 12 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_file_format_properties_init (); -#line 669 "RawSupport.c" +#line 766 "RawSupport.c" } -static gpointer _photo_file_format_driver_ref0 (gpointer self) { +static gpointer +_photo_file_format_driver_ref0 (gpointer self) +{ #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self ? photo_file_format_driver_ref (self) : NULL; -#line 676 "RawSupport.c" +#line 775 "RawSupport.c" } -RawFileFormatDriver* raw_file_format_driver_get_instance (void) { +RawFileFormatDriver* +raw_file_format_driver_get_instance (void) +{ RawFileFormatDriver* result = NULL; RawFileFormatDriver* _tmp0_; RawFileFormatDriver* _tmp1_; @@ -688,11 +789,13 @@ RawFileFormatDriver* raw_file_format_driver_get_instance (void) { result = _tmp1_; #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 692 "RawSupport.c" +#line 793 "RawSupport.c" } -static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) { +static PhotoFileFormatProperties* +raw_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) +{ RawFileFormatDriver * self; PhotoFileFormatProperties* result = NULL; RawFileFormatProperties* _tmp0_; @@ -704,32 +807,34 @@ static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (Ph result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties); #line 20 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 708 "RawSupport.c" +#line 811 "RawSupport.c" } -static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileReader* +raw_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath) +{ RawFileFormatDriver * self; PhotoFileReader* result = NULL; - const gchar* _tmp0_; - RawReader* _tmp1_; + RawReader* _tmp0_; #line 23 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver); #line 23 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp0_ = filepath; -#line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = raw_reader_new (_tmp0_); + _tmp0_ = raw_reader_new (filepath); #line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_READER, PhotoFileReader); #line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 729 "RawSupport.c" +#line 832 "RawSupport.c" } -static PhotoMetadata* raw_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) { +static PhotoMetadata* +raw_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) +{ RawFileFormatDriver * self; PhotoMetadata* result = NULL; PhotoMetadata* _tmp0_; @@ -741,11 +846,13 @@ static PhotoMetadata* raw_file_format_driver_real_create_metadata (PhotoFileForm result = _tmp0_; #line 28 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 745 "RawSupport.c" +#line 850 "RawSupport.c" } -static gboolean raw_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) { +static gboolean +raw_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) +{ RawFileFormatDriver * self; gboolean result = FALSE; #line 31 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -754,11 +861,13 @@ static gboolean raw_file_format_driver_real_can_write_image (PhotoFileFormatDriv result = FALSE; #line 32 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 758 "RawSupport.c" +#line 865 "RawSupport.c" } -static gboolean raw_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) { +static gboolean +raw_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) +{ RawFileFormatDriver * self; gboolean result = FALSE; #line 35 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -767,11 +876,14 @@ static gboolean raw_file_format_driver_real_can_write_metadata (PhotoFileFormatD result = FALSE; #line 36 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 771 "RawSupport.c" +#line 880 "RawSupport.c" } -static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileWriter* +raw_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ RawFileFormatDriver * self; PhotoFileWriter* result = NULL; #line 39 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -782,11 +894,14 @@ static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileForm result = NULL; #line 40 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 786 "RawSupport.c" +#line 898 "RawSupport.c" } -static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileMetadataWriter* +raw_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ RawFileFormatDriver * self; PhotoFileMetadataWriter* result = NULL; #line 43 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -797,52 +912,56 @@ static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writ result = NULL; #line 44 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 801 "RawSupport.c" +#line 916 "RawSupport.c" } -static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) { +static PhotoFileSniffer* +raw_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options) +{ RawFileFormatDriver * self; PhotoFileSniffer* result = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; - RawSniffer* _tmp2_; + RawSniffer* _tmp0_; #line 47 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver); #line 47 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp0_ = file; + _tmp0_ = raw_sniffer_new (file, options); #line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = options; -#line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp2_ = raw_sniffer_new (_tmp0_, _tmp1_); -#line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); #line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 825 "RawSupport.c" +#line 938 "RawSupport.c" } -RawFileFormatDriver* raw_file_format_driver_construct (GType object_type) { +RawFileFormatDriver* +raw_file_format_driver_construct (GType object_type) +{ RawFileFormatDriver* self = NULL; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = (RawFileFormatDriver*) photo_file_format_driver_construct (object_type); #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 835 "RawSupport.c" +#line 950 "RawSupport.c" } -RawFileFormatDriver* raw_file_format_driver_new (void) { +RawFileFormatDriver* +raw_file_format_driver_new (void) +{ #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return raw_file_format_driver_construct (TYPE_RAW_FILE_FORMAT_DRIVER); -#line 842 "RawSupport.c" +#line 959 "RawSupport.c" } -static void raw_file_format_driver_class_init (RawFileFormatDriverClass * klass) { +static void +raw_file_format_driver_class_init (RawFileFormatDriverClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_file_format_driver_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -863,25 +982,31 @@ static void raw_file_format_driver_class_init (RawFileFormatDriverClass * klass) ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) raw_file_format_driver_real_create_metadata_writer; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) raw_file_format_driver_real_create_sniffer; -#line 867 "RawSupport.c" +#line 986 "RawSupport.c" } -static void raw_file_format_driver_instance_init (RawFileFormatDriver * self) { +static void +raw_file_format_driver_instance_init (RawFileFormatDriver * self) +{ } -static void raw_file_format_driver_finalize (PhotoFileFormatDriver * obj) { +static void +raw_file_format_driver_finalize (PhotoFileFormatDriver * obj) +{ RawFileFormatDriver * self; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver); #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" PHOTO_FILE_FORMAT_DRIVER_CLASS (raw_file_format_driver_parent_class)->finalize (obj); -#line 881 "RawSupport.c" +#line 1004 "RawSupport.c" } -GType raw_file_format_driver_get_type (void) { +GType +raw_file_format_driver_get_type (void) +{ static volatile gsize raw_file_format_driver_type_id__volatile = 0; if (g_once_init_enter (&raw_file_format_driver_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RawFileFormatDriverClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) raw_file_format_driver_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RawFileFormatDriver), 0, (GInstanceInitFunc) raw_file_format_driver_instance_init, NULL }; @@ -893,7 +1018,9 @@ GType raw_file_format_driver_get_type (void) { } -void raw_file_format_properties_init (void) { +void +raw_file_format_properties_init (void) +{ RawFileFormatProperties* _tmp0_; #line 122 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = raw_file_format_properties_new (); @@ -901,18 +1028,22 @@ void raw_file_format_properties_init (void) { _photo_file_format_properties_unref0 (raw_file_format_properties_instance); #line 122 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_file_format_properties_instance = _tmp0_; -#line 905 "RawSupport.c" +#line 1032 "RawSupport.c" } -static gpointer _photo_file_format_properties_ref0 (gpointer self) { +static gpointer +_photo_file_format_properties_ref0 (gpointer self) +{ #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self ? photo_file_format_properties_ref (self) : NULL; -#line 912 "RawSupport.c" +#line 1041 "RawSupport.c" } -RawFileFormatProperties* raw_file_format_properties_get_instance (void) { +RawFileFormatProperties* +raw_file_format_properties_get_instance (void) +{ RawFileFormatProperties* result = NULL; RawFileFormatProperties* _tmp0_; RawFileFormatProperties* _tmp1_; @@ -924,11 +1055,13 @@ RawFileFormatProperties* raw_file_format_properties_get_instance (void) { result = _tmp1_; #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 928 "RawSupport.c" +#line 1059 "RawSupport.c" } -static PhotoFileFormat raw_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) { +static PhotoFileFormat +raw_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) +{ RawFileFormatProperties * self; PhotoFileFormat result = 0; #line 129 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -937,11 +1070,13 @@ static PhotoFileFormat raw_file_format_properties_real_get_file_format (PhotoFil result = PHOTO_FILE_FORMAT_RAW; #line 130 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 941 "RawSupport.c" +#line 1074 "RawSupport.c" } -static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) { +static gchar* +raw_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) +{ RawFileFormatProperties * self; gchar* result = NULL; gchar* _tmp0_; @@ -953,11 +1088,13 @@ static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFo result = _tmp0_; #line 134 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 957 "RawSupport.c" +#line 1092 "RawSupport.c" } -static PhotoFileFormatFlags raw_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) { +static PhotoFileFormatFlags +raw_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) +{ RawFileFormatProperties * self; PhotoFileFormatFlags result = 0; #line 137 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -966,11 +1103,13 @@ static PhotoFileFormatFlags raw_file_format_properties_real_get_flags (PhotoFile result = PHOTO_FILE_FORMAT_FLAGS_NONE; #line 138 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 970 "RawSupport.c" +#line 1107 "RawSupport.c" } -static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) { +static gchar* +raw_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) +{ RawFileFormatProperties * self; gchar* result = NULL; gchar* _tmp0_; @@ -982,32 +1121,38 @@ static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFo result = _tmp0_; #line 145 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 986 "RawSupport.c" +#line 1125 "RawSupport.c" } -static gchar** _vala_array_dup10 (gchar** self, int length) { +static gchar** +_vala_array_dup10 (gchar** self, + int length) +{ gchar** result; int i; #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = g_new0 (gchar*, length + 1); #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" for (i = 0; i < length; i++) { -#line 997 "RawSupport.c" +#line 1139 "RawSupport.c" gchar* _tmp0_; #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = g_strdup (self[i]); #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result[i] = _tmp0_; -#line 1003 "RawSupport.c" +#line 1145 "RawSupport.c" } #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1007 "RawSupport.c" +#line 1149 "RawSupport.c" } -static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +raw_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1) +{ RawFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -1034,17 +1179,19 @@ static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFo if (result_length1) { #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *result_length1 = _tmp2__length1; -#line 1038 "RawSupport.c" +#line 1183 "RawSupport.c" } #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp2_; #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1044 "RawSupport.c" +#line 1189 "RawSupport.c" } -static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) { +static gchar* +raw_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) +{ RawFileFormatProperties * self; gchar* result = NULL; gchar** _tmp0_; @@ -1065,32 +1212,38 @@ static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFo result = _tmp2_; #line 153 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1069 "RawSupport.c" +#line 1216 "RawSupport.c" } -static gchar** _vala_array_dup11 (gchar** self, int length) { +static gchar** +_vala_array_dup11 (gchar** self, + int length) +{ gchar** result; int i; #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = g_new0 (gchar*, length + 1); #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" for (i = 0; i < length; i++) { -#line 1080 "RawSupport.c" +#line 1230 "RawSupport.c" gchar* _tmp0_; #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = g_strdup (self[i]); #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result[i] = _tmp0_; -#line 1086 "RawSupport.c" +#line 1236 "RawSupport.c" } #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1090 "RawSupport.c" +#line 1240 "RawSupport.c" } -static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1) +{ RawFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -1117,34 +1270,40 @@ static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatPr if (result_length1) { #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *result_length1 = _tmp2__length1; -#line 1121 "RawSupport.c" +#line 1274 "RawSupport.c" } #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp2_; #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1127 "RawSupport.c" +#line 1280 "RawSupport.c" } -RawFileFormatProperties* raw_file_format_properties_construct (GType object_type) { +RawFileFormatProperties* +raw_file_format_properties_construct (GType object_type) +{ RawFileFormatProperties* self = NULL; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = (RawFileFormatProperties*) photo_file_format_properties_construct (object_type); #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 1137 "RawSupport.c" +#line 1292 "RawSupport.c" } -RawFileFormatProperties* raw_file_format_properties_new (void) { +RawFileFormatProperties* +raw_file_format_properties_new (void) +{ #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return raw_file_format_properties_construct (TYPE_RAW_FILE_FORMAT_PROPERTIES); -#line 1144 "RawSupport.c" +#line 1301 "RawSupport.c" } -static void raw_file_format_properties_class_init (RawFileFormatPropertiesClass * klass) { +static void +raw_file_format_properties_class_init (RawFileFormatPropertiesClass * klass) +{ gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; @@ -1612,25 +1771,31 @@ static void raw_file_format_properties_class_init (RawFileFormatPropertiesClass raw_file_format_properties_KNOWN_MIME_TYPES = _tmp88_; #line 59 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_file_format_properties_KNOWN_MIME_TYPES_length1 = 51; -#line 1616 "RawSupport.c" +#line 1775 "RawSupport.c" } -static void raw_file_format_properties_instance_init (RawFileFormatProperties * self) { +static void +raw_file_format_properties_instance_init (RawFileFormatProperties * self) +{ } -static void raw_file_format_properties_finalize (PhotoFileFormatProperties * obj) { +static void +raw_file_format_properties_finalize (PhotoFileFormatProperties * obj) +{ RawFileFormatProperties * self; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties); #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" PHOTO_FILE_FORMAT_PROPERTIES_CLASS (raw_file_format_properties_parent_class)->finalize (obj); -#line 1630 "RawSupport.c" +#line 1793 "RawSupport.c" } -GType raw_file_format_properties_get_type (void) { +GType +raw_file_format_properties_get_type (void) +{ static volatile gsize raw_file_format_properties_type_id__volatile = 0; if (g_once_init_enter (&raw_file_format_properties_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RawFileFormatPropertiesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) raw_file_format_properties_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RawFileFormatProperties), 0, (GInstanceInitFunc) raw_file_format_properties_instance_init, NULL }; @@ -1642,39 +1807,46 @@ GType raw_file_format_properties_get_type (void) { } -RawSniffer* raw_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { +RawSniffer* +raw_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options) +{ RawSniffer* self = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 163 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp0_ = file; -#line 163 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = options; -#line 163 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - self = (RawSniffer*) photo_file_sniffer_construct (object_type, _tmp0_, _tmp1_); + self = (RawSniffer*) photo_file_sniffer_construct (object_type, file, options); #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 1660 "RawSupport.c" +#line 1823 "RawSupport.c" } -RawSniffer* raw_sniffer_new (GFile* file, PhotoFileSnifferOptions options) { +RawSniffer* +raw_sniffer_new (GFile* file, + PhotoFileSnifferOptions options) +{ #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return raw_sniffer_construct (TYPE_RAW_SNIFFER, file, options); -#line 1667 "RawSupport.c" +#line 1833 "RawSupport.c" } -static gpointer _g_error_copy0 (gpointer self) { +static gpointer +_g_error_copy0 (gpointer self) +{ #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self ? g_error_copy (self) : NULL; -#line 1674 "RawSupport.c" +#line 1842 "RawSupport.c" } -static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error) { +static DetectedPhotoInformation* +raw_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error) +{ RawSniffer * self; gboolean _vala_is_corrupted = FALSE; DetectedPhotoInformation* result = NULL; @@ -1687,26 +1859,24 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, libraw_output_params_t* _tmp4_; DetectedPhotoInformation* _tmp14_; GRawProcessor* _tmp15_; - libraw_image_sizes_t _tmp16_; - gushort _tmp17_; - GRawProcessor* _tmp18_; - libraw_image_sizes_t _tmp19_; - gushort _tmp20_; + gushort _tmp16_; + GRawProcessor* _tmp17_; + gushort _tmp18_; + DetectedPhotoInformation* _tmp19_; + DetectedPhotoInformation* _tmp20_; DetectedPhotoInformation* _tmp21_; - DetectedPhotoInformation* _tmp22_; - DetectedPhotoInformation* _tmp23_; RawReader* reader = NULL; - GFile* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; - RawReader* _tmp27_; - RawReader* _tmp28_; - DetectedPhotoInformation* _tmp34_; - PhotoMetadata* _tmp35_; - gboolean _tmp44_; + GFile* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + RawReader* _tmp25_; + RawReader* _tmp26_; + DetectedPhotoInformation* _tmp32_; + PhotoMetadata* _tmp33_; + gboolean _tmp42_; + DetectedPhotoInformation* _tmp48_; + gchar* _tmp49_; DetectedPhotoInformation* _tmp50_; - gchar* _tmp51_; - DetectedPhotoInformation* _tmp52_; GError * _inner_error_ = NULL; #line 166 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_SNIFFER, RawSniffer); @@ -1728,7 +1898,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _tmp4_ = _tmp3_; #line 173 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" (*_tmp4_).user_flip = (gint) GRAW_FLIP_NONE; -#line 1732 "RawSupport.c" +#line 1902 "RawSupport.c" { GRawProcessor* _tmp5_; GFile* _tmp6_; @@ -1752,7 +1922,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { -#line 1756 "RawSupport.c" +#line 1926 "RawSupport.c" goto __catch36_graw_exception; } #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1765,7 +1935,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, g_clear_error (&_inner_error_); #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 1769 "RawSupport.c" +#line 1939 "RawSupport.c" } #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp9_ = processor; @@ -1775,7 +1945,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { -#line 1779 "RawSupport.c" +#line 1949 "RawSupport.c" goto __catch36_graw_exception; } #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1788,7 +1958,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, g_clear_error (&_inner_error_); #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 1792 "RawSupport.c" +#line 1962 "RawSupport.c" } #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp10_ = processor; @@ -1798,7 +1968,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { -#line 1802 "RawSupport.c" +#line 1972 "RawSupport.c" goto __catch36_graw_exception; } #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1811,7 +1981,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, g_clear_error (&_inner_error_); #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 1815 "RawSupport.c" +#line 1985 "RawSupport.c" } } goto __finally36; @@ -1841,11 +2011,11 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (is_corrupted) { #line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1845 "RawSupport.c" +#line 2015 "RawSupport.c" } #line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1849 "RawSupport.c" +#line 2019 "RawSupport.c" } #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp12_ = exception; @@ -1855,7 +2025,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _inner_error_ = _tmp13_; #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_error_free0 (exception); -#line 1859 "RawSupport.c" +#line 2029 "RawSupport.c" goto __finally36; } __finally36: @@ -1869,81 +2039,77 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _detected_photo_information_unref0 (detected); #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 1873 "RawSupport.c" +#line 2043 "RawSupport.c" } #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp14_ = detected; #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp15_ = processor; #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp16_ = graw_processor_get_sizes (_tmp15_); -#line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp17_ = _tmp16_.iwidth; + _tmp16_ = graw_processor_get_sizes (_tmp15_).iwidth; #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp18_ = processor; -#line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp19_ = graw_processor_get_sizes (_tmp18_); + _tmp17_ = processor; #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp20_ = _tmp19_.iheight; + _tmp18_ = graw_processor_get_sizes (_tmp17_).iheight; #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - dimensions_init (&_tmp14_->image_dim, (gint) _tmp17_, (gint) _tmp20_); + dimensions_init (&_tmp14_->image_dim, (gint) _tmp16_, (gint) _tmp18_); #line 187 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp21_ = detected; + _tmp19_ = detected; #line 187 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp21_->colorspace = GDK_COLORSPACE_RGB; + _tmp19_->colorspace = GDK_COLORSPACE_RGB; #line 188 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp22_ = detected; + _tmp20_ = detected; #line 188 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp22_->channels = 3; + _tmp20_->channels = 3; #line 189 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp23_ = detected; + _tmp21_ = detected; #line 189 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp23_->bits_per_channel = 8; + _tmp21_->bits_per_channel = 8; #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; + _tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp25_ = g_file_get_path (_tmp24_); + _tmp23_ = g_file_get_path (_tmp22_); #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp26_ = _tmp25_; + _tmp24_ = _tmp23_; #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp27_ = raw_reader_new (_tmp26_); + _tmp25_ = raw_reader_new (_tmp24_); #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp28_ = _tmp27_; + _tmp26_ = _tmp25_; #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp24_); #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - reader = _tmp28_; -#line 1917 "RawSupport.c" + reader = _tmp26_; +#line 2083 "RawSupport.c" { - PhotoMetadata* _tmp29_ = NULL; - RawReader* _tmp30_; + PhotoMetadata* _tmp27_ = NULL; + RawReader* _tmp28_; + PhotoMetadata* _tmp29_; + DetectedPhotoInformation* _tmp30_; PhotoMetadata* _tmp31_; - DetectedPhotoInformation* _tmp32_; - PhotoMetadata* _tmp33_; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp30_ = reader; + _tmp28_ = reader; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp31_ = photo_file_reader_read_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_PHOTO_FILE_READER, PhotoFileReader), &_inner_error_); + _tmp29_ = photo_file_reader_read_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_PHOTO_FILE_READER, PhotoFileReader), &_inner_error_); #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp29_ = _tmp31_; + _tmp27_ = _tmp29_; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1932 "RawSupport.c" +#line 2098 "RawSupport.c" goto __catch37_g_error; } #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp32_ = detected; + _tmp30_ = detected; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp33_ = _tmp29_; + _tmp31_ = _tmp27_; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp29_ = NULL; + _tmp27_ = NULL; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _media_metadata_unref0 (_tmp32_->metadata); + _media_metadata_unref0 (_tmp30_->metadata); #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp32_->metadata = _tmp33_; + _tmp30_->metadata = _tmp31_; #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _media_metadata_unref0 (_tmp29_); -#line 1947 "RawSupport.c" + _media_metadata_unref0 (_tmp27_); +#line 2113 "RawSupport.c" } goto __finally37; __catch37_g_error: @@ -1955,7 +2121,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _inner_error_ = NULL; #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_error_free0 (err); -#line 1959 "RawSupport.c" +#line 2125 "RawSupport.c" } __finally37: #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1970,65 +2136,65 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _detected_photo_information_unref0 (detected); #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 1974 "RawSupport.c" +#line 2140 "RawSupport.c" } #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp34_ = detected; + _tmp32_ = detected; #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp35_ = _tmp34_->metadata; + _tmp33_ = _tmp32_->metadata; #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp35_ != NULL) { -#line 1982 "RawSupport.c" - DetectedPhotoInformation* _tmp36_; - DetectedPhotoInformation* _tmp37_; - PhotoMetadata* _tmp38_; - gchar* _tmp39_; - DetectedPhotoInformation* _tmp40_; - DetectedPhotoInformation* _tmp41_; - PhotoMetadata* _tmp42_; - gchar* _tmp43_; + if (_tmp33_ != NULL) { +#line 2148 "RawSupport.c" + DetectedPhotoInformation* _tmp34_; + DetectedPhotoInformation* _tmp35_; + PhotoMetadata* _tmp36_; + gchar* _tmp37_; + DetectedPhotoInformation* _tmp38_; + DetectedPhotoInformation* _tmp39_; + PhotoMetadata* _tmp40_; + gchar* _tmp41_; #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp36_ = detected; + _tmp34_ = detected; #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp37_ = detected; + _tmp35_ = detected; #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp38_ = _tmp37_->metadata; + _tmp36_ = _tmp35_->metadata; #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp39_ = photo_metadata_exif_hash (_tmp38_); + _tmp37_ = photo_metadata_exif_hash (_tmp36_); #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp36_->exif_md5); + _g_free0 (_tmp34_->exif_md5); #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp36_->exif_md5 = _tmp39_; + _tmp34_->exif_md5 = _tmp37_; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp40_ = detected; + _tmp38_ = detected; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp41_ = detected; + _tmp39_ = detected; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp42_ = _tmp41_->metadata; + _tmp40_ = _tmp39_->metadata; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp43_ = photo_metadata_thumbnail_hash (_tmp42_); + _tmp41_ = photo_metadata_thumbnail_hash (_tmp40_); #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp40_->thumbnail_md5); + _g_free0 (_tmp38_->thumbnail_md5); #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp40_->thumbnail_md5 = _tmp43_; -#line 2015 "RawSupport.c" + _tmp38_->thumbnail_md5 = _tmp41_; +#line 2181 "RawSupport.c" } #line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp44_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; + _tmp42_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp44_) { -#line 2021 "RawSupport.c" - gchar* _tmp45_ = NULL; - GFile* _tmp46_; + if (_tmp42_) { +#line 2187 "RawSupport.c" + gchar* _tmp43_ = NULL; + GFile* _tmp44_; + gchar* _tmp45_; + DetectedPhotoInformation* _tmp46_; gchar* _tmp47_; - DetectedPhotoInformation* _tmp48_; - gchar* _tmp49_; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp46_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; + _tmp44_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp47_ = md5_file (_tmp46_, &_inner_error_); + _tmp45_ = md5_file (_tmp44_, &_inner_error_); #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp45_ = _tmp47_; + _tmp43_ = _tmp45_; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2041,34 +2207,34 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _detected_photo_information_unref0 (detected); #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2045 "RawSupport.c" +#line 2211 "RawSupport.c" } #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp48_ = detected; + _tmp46_ = detected; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp49_ = _tmp45_; + _tmp47_ = _tmp43_; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp45_ = NULL; + _tmp43_ = NULL; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp48_->md5); + _g_free0 (_tmp46_->md5); #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp48_->md5 = _tmp49_; + _tmp46_->md5 = _tmp47_; #line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp45_); -#line 2059 "RawSupport.c" + _g_free0 (_tmp43_); +#line 2225 "RawSupport.c" } #line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp50_ = detected; + _tmp48_ = detected; #line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp51_ = g_strdup ("raw"); + _tmp49_ = g_strdup ("raw"); #line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp50_->format_name); + _g_free0 (_tmp48_->format_name); #line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp50_->format_name = _tmp51_; + _tmp48_->format_name = _tmp49_; #line 207 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp52_ = detected; + _tmp50_ = detected; #line 207 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp52_->file_format = PHOTO_FILE_FORMAT_RAW; + _tmp50_->file_format = PHOTO_FILE_FORMAT_RAW; #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = detected; #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2079,28 +2245,34 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (is_corrupted) { #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 2083 "RawSupport.c" +#line 2249 "RawSupport.c" } #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2087 "RawSupport.c" +#line 2253 "RawSupport.c" } -static void raw_sniffer_class_init (RawSnifferClass * klass) { +static void +raw_sniffer_class_init (RawSnifferClass * klass) +{ #line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_sniffer_parent_class = g_type_class_peek_parent (klass); #line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) raw_sniffer_real_sniff; -#line 2096 "RawSupport.c" +#line 2264 "RawSupport.c" } -static void raw_sniffer_instance_init (RawSniffer * self) { +static void +raw_sniffer_instance_init (RawSniffer * self) +{ } -GType raw_sniffer_get_type (void) { +GType +raw_sniffer_get_type (void) +{ static volatile gsize raw_sniffer_type_id__volatile = 0; if (g_once_init_enter (&raw_sniffer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RawSnifferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) raw_sniffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RawSniffer), 0, (GInstanceInitFunc) raw_sniffer_instance_init, NULL }; @@ -2112,29 +2284,34 @@ GType raw_sniffer_get_type (void) { } -RawReader* raw_reader_construct (GType object_type, const gchar* filepath) { +RawReader* +raw_reader_construct (GType object_type, + const gchar* filepath) +{ RawReader* self = NULL; - const gchar* _tmp0_; #line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 215 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp0_ = filepath; -#line 215 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - self = (RawReader*) photo_file_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_RAW); + self = (RawReader*) photo_file_reader_construct (object_type, filepath, PHOTO_FILE_FORMAT_RAW); #line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 2127 "RawSupport.c" +#line 2299 "RawSupport.c" } -RawReader* raw_reader_new (const gchar* filepath) { +RawReader* +raw_reader_new (const gchar* filepath) +{ #line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return raw_reader_construct (TYPE_RAW_READER, filepath); -#line 2134 "RawSupport.c" +#line 2308 "RawSupport.c" } -static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GError** error) { +static PhotoMetadata* +raw_reader_real_read_metadata (PhotoFileReader* base, + GError** error) +{ RawReader * self; PhotoMetadata* result = NULL; PhotoMetadata* metadata = NULL; @@ -2164,17 +2341,20 @@ static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GErr _media_metadata_unref0 (metadata); #line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2168 "RawSupport.c" +#line 2345 "RawSupport.c" } #line 222 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = metadata; #line 222 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2174 "RawSupport.c" +#line 2351 "RawSupport.c" } -static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** error) { +static GdkPixbuf* +raw_reader_real_unscaled_read (PhotoFileReader* base, + GError** error) +{ RawReader * self; GdkPixbuf* result = NULL; GRawProcessor* processor = NULL; @@ -2229,7 +2409,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2233 "RawSupport.c" +#line 2413 "RawSupport.c" } #line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp8_ = processor; @@ -2243,7 +2423,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2247 "RawSupport.c" +#line 2427 "RawSupport.c" } #line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp9_ = processor; @@ -2257,7 +2437,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2261 "RawSupport.c" +#line 2441 "RawSupport.c" } #line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp11_ = processor; @@ -2273,7 +2453,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2277 "RawSupport.c" +#line 2457 "RawSupport.c" } #line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp13_ = graw_processed_image_get_pixbuf_copy (_tmp10_); @@ -2285,11 +2465,16 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2289 "RawSupport.c" +#line 2469 "RawSupport.c" } -static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error) { +static GdkPixbuf* +raw_reader_real_scaled_read (PhotoFileReader* base, + Dimensions* full, + Dimensions* scaled, + GError** error) +{ RawReader * self; GdkPixbuf* result = NULL; gdouble width_proportion = 0.0; @@ -2315,17 +2500,17 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions GRawProcessor* _tmp17_; gchar* _tmp18_; gchar* _tmp19_; + GRawProcessor* _tmp29_; GRawProcessor* _tmp30_; - GRawProcessor* _tmp31_; GRawProcessedImage* image = NULL; - GRawProcessor* _tmp32_; + GRawProcessor* _tmp31_; + GRawProcessedImage* _tmp32_; GRawProcessedImage* _tmp33_; - GRawProcessedImage* _tmp34_; + GdkPixbuf* _tmp34_; GdkPixbuf* _tmp35_; - GdkPixbuf* _tmp36_; - Dimensions _tmp37_; + Dimensions _tmp36_; + GdkPixbuf* _tmp37_; GdkPixbuf* _tmp38_; - GdkPixbuf* _tmp39_; GError * _inner_error_ = NULL; #line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader); @@ -2357,17 +2542,17 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _tmp9_ = width_proportion; #line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp9_ < 0.5) { -#line 2361 "RawSupport.c" +#line 2546 "RawSupport.c" gdouble _tmp10_; #line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp10_ = height_proportion; #line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp8_ = _tmp10_ < 0.5; -#line 2367 "RawSupport.c" +#line 2552 "RawSupport.c" } else { #line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp8_ = FALSE; -#line 2371 "RawSupport.c" +#line 2556 "RawSupport.c" } #line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" half_size = _tmp8_; @@ -2407,68 +2592,65 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2411 "RawSupport.c" +#line 2596 "RawSupport.c" } { - PhotoFileReaderRole _tmp20_; #line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp20_ = photo_file_reader_get_role (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_READER, PhotoFileReader)); -#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp20_ == PHOTO_FILE_READER_ROLE_THUMBNAIL) { -#line 2419 "RawSupport.c" - GRawProcessor* _tmp21_; + if (photo_file_reader_get_role (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_READER, PhotoFileReader)) == PHOTO_FILE_READER_ROLE_THUMBNAIL) { +#line 2601 "RawSupport.c" + GRawProcessor* _tmp20_; GRawProcessedImage* image = NULL; - GRawProcessor* _tmp22_; + GRawProcessor* _tmp21_; + GRawProcessedImage* _tmp22_; GRawProcessedImage* _tmp23_; - GRawProcessedImage* _tmp24_; + GdkPixbuf* _tmp24_; GdkPixbuf* _tmp25_; - GdkPixbuf* _tmp26_; - Dimensions _tmp27_; + Dimensions _tmp26_; + GdkPixbuf* _tmp27_; GdkPixbuf* _tmp28_; - GdkPixbuf* _tmp29_; #line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp21_ = processor; + _tmp20_ = processor; #line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - graw_processor_unpack_thumb (_tmp21_, &_inner_error_); + graw_processor_unpack_thumb (_tmp20_, &_inner_error_); #line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2436 "RawSupport.c" +#line 2618 "RawSupport.c" goto __catch38_g_error; } #line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp22_ = processor; + _tmp21_ = processor; #line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp23_ = graw_processor_make_thumb_image (_tmp22_, &_inner_error_); + _tmp22_ = graw_processor_make_thumb_image (_tmp21_, &_inner_error_); #line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - image = _tmp23_; + image = _tmp22_; #line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2447 "RawSupport.c" +#line 2629 "RawSupport.c" goto __catch38_g_error; } #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp24_ = image; + _tmp23_ = image; #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp25_ = graw_processed_image_get_pixbuf_copy (_tmp24_); + _tmp24_ = graw_processed_image_get_pixbuf_copy (_tmp23_); #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp26_ = _tmp25_; + _tmp25_ = _tmp24_; #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp27_ = *scaled; + _tmp26_ = *scaled; #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp28_ = resize_pixbuf (_tmp26_, &_tmp27_, GDK_INTERP_BILINEAR); + _tmp27_ = resize_pixbuf (_tmp25_, &_tmp26_, GDK_INTERP_BILINEAR); #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp29_ = _tmp28_; + _tmp28_ = _tmp27_; #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_object_unref0 (_tmp26_); + _g_object_unref0 (_tmp25_); #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = _tmp29_; + result = _tmp28_; #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processed_image_unref0 (image); #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2472 "RawSupport.c" +#line 2654 "RawSupport.c" } } goto __finally38; @@ -2481,7 +2663,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _inner_error_ = NULL; #line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_error_free0 (_error_); -#line 2485 "RawSupport.c" +#line 2667 "RawSupport.c" } __finally38: #line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2492,12 +2674,12 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2496 "RawSupport.c" +#line 2678 "RawSupport.c" } #line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp30_ = processor; + _tmp29_ = processor; #line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - graw_processor_unpack (_tmp30_, &_inner_error_); + graw_processor_unpack (_tmp29_, &_inner_error_); #line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2506,12 +2688,12 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2510 "RawSupport.c" +#line 2692 "RawSupport.c" } #line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp31_ = processor; + _tmp30_ = processor; #line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - graw_processor_process (_tmp31_, &_inner_error_); + graw_processor_process (_tmp30_, &_inner_error_); #line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2520,14 +2702,14 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2524 "RawSupport.c" +#line 2706 "RawSupport.c" } #line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp32_ = processor; + _tmp31_ = processor; #line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp33_ = graw_processor_make_mem_image (_tmp32_, &_inner_error_); + _tmp32_ = graw_processor_make_mem_image (_tmp31_, &_inner_error_); #line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - image = _tmp33_; + image = _tmp32_; #line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2536,35 +2718,37 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2540 "RawSupport.c" +#line 2722 "RawSupport.c" } #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp34_ = image; + _tmp33_ = image; #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp35_ = graw_processed_image_get_pixbuf_copy (_tmp34_); + _tmp34_ = graw_processed_image_get_pixbuf_copy (_tmp33_); #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp36_ = _tmp35_; + _tmp35_ = _tmp34_; #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp37_ = *scaled; + _tmp36_ = *scaled; #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp38_ = resize_pixbuf (_tmp36_, &_tmp37_, GDK_INTERP_BILINEAR); + _tmp37_ = resize_pixbuf (_tmp35_, &_tmp36_, GDK_INTERP_BILINEAR); #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp39_ = _tmp38_; + _tmp38_ = _tmp37_; #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_object_unref0 (_tmp36_); + _g_object_unref0 (_tmp35_); #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = _tmp39_; + result = _tmp38_; #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processed_image_unref0 (image); #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2564 "RawSupport.c" +#line 2746 "RawSupport.c" } -static void raw_reader_class_init (RawReaderClass * klass) { +static void +raw_reader_class_init (RawReaderClass * klass) +{ #line 213 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_reader_parent_class = g_type_class_peek_parent (klass); #line 213 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2573,15 +2757,19 @@ static void raw_reader_class_init (RawReaderClass * klass) { ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) raw_reader_real_unscaled_read; #line 213 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) raw_reader_real_scaled_read; -#line 2577 "RawSupport.c" +#line 2761 "RawSupport.c" } -static void raw_reader_instance_init (RawReader * self) { +static void +raw_reader_instance_init (RawReader * self) +{ } -GType raw_reader_get_type (void) { +GType +raw_reader_get_type (void) +{ static volatile gsize raw_reader_type_id__volatile = 0; if (g_once_init_enter (&raw_reader_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RawReaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) raw_reader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RawReader), 0, (GInstanceInitFunc) raw_reader_instance_init, NULL }; @@ -2593,7 +2781,9 @@ GType raw_reader_get_type (void) { } -RawDeveloper* raw_developer_as_array (int* result_length1) { +RawDeveloper* +raw_developer_as_array (int* result_length1) +{ RawDeveloper* result = NULL; RawDeveloper* _tmp0_; RawDeveloper* _tmp1_; @@ -2614,23 +2804,25 @@ RawDeveloper* raw_developer_as_array (int* result_length1) { if (result_length1) { #line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *result_length1 = _tmp1__length1; -#line 2618 "RawSupport.c" +#line 2808 "RawSupport.c" } #line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp1_; #line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2624 "RawSupport.c" +#line 2814 "RawSupport.c" } -gchar* raw_developer_to_string (RawDeveloper self) { +gchar* +raw_developer_to_string (RawDeveloper self) +{ gchar* result = NULL; #line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (self) { #line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_SHOTWELL: -#line 2634 "RawSupport.c" +#line 2826 "RawSupport.c" { gchar* _tmp0_; #line 282 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2639,11 +2831,11 @@ gchar* raw_developer_to_string (RawDeveloper self) { result = _tmp0_; #line 282 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2643 "RawSupport.c" +#line 2835 "RawSupport.c" } #line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_CAMERA: -#line 2647 "RawSupport.c" +#line 2839 "RawSupport.c" { gchar* _tmp1_; #line 284 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2652,11 +2844,11 @@ gchar* raw_developer_to_string (RawDeveloper self) { result = _tmp1_; #line 284 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2656 "RawSupport.c" +#line 2848 "RawSupport.c" } #line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_EMBEDDED: -#line 2660 "RawSupport.c" +#line 2852 "RawSupport.c" { gchar* _tmp2_; #line 286 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2665,99 +2857,100 @@ gchar* raw_developer_to_string (RawDeveloper self) { result = _tmp2_; #line 286 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2669 "RawSupport.c" +#line 2861 "RawSupport.c" } default: { #line 288 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_assert_not_reached (); -#line 2675 "RawSupport.c" +#line 2867 "RawSupport.c" } } } -RawDeveloper raw_developer_from_string (const gchar* value) { +RawDeveloper +raw_developer_from_string (const gchar* value) +{ RawDeveloper result = 0; const gchar* _tmp0_; - const gchar* _tmp1_; - GQuark _tmp3_ = 0U; + GQuark _tmp2_ = 0U; #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - static GQuark _tmp2_label0 = 0; + static GQuark _tmp1_label0 = 0; #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - static GQuark _tmp2_label1 = 0; + static GQuark _tmp1_label1 = 0; #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - static GQuark _tmp2_label2 = 0; + static GQuark _tmp1_label2 = 0; #line 292 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (value != NULL, 0); #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = value; #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = _tmp0_; -#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_); + _tmp2_ = (NULL == _tmp0_) ? 0 : g_quark_from_string (_tmp0_); #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("SHOTWELL")))) { + if (_tmp2_ == ((0 != _tmp1_label0) ? _tmp1_label0 : (_tmp1_label0 = g_quark_from_static_string ("SHOTWELL")))) { #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2704 "RawSupport.c" +#line 2895 "RawSupport.c" default: { #line 295 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = RAW_DEVELOPER_SHOTWELL; #line 295 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2711 "RawSupport.c" +#line 2902 "RawSupport.c" } } - } else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("CAMERA")))) { + } else if (_tmp2_ == ((0 != _tmp1_label1) ? _tmp1_label1 : (_tmp1_label1 = g_quark_from_static_string ("CAMERA")))) { #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2717 "RawSupport.c" +#line 2908 "RawSupport.c" default: { #line 297 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = RAW_DEVELOPER_CAMERA; #line 297 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2724 "RawSupport.c" +#line 2915 "RawSupport.c" } } - } else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("EMBEDDED")))) { + } else if (_tmp2_ == ((0 != _tmp1_label2) ? _tmp1_label2 : (_tmp1_label2 = g_quark_from_static_string ("EMBEDDED")))) { #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2730 "RawSupport.c" +#line 2921 "RawSupport.c" default: { #line 299 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = RAW_DEVELOPER_EMBEDDED; #line 299 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2737 "RawSupport.c" +#line 2928 "RawSupport.c" } } } else { #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2743 "RawSupport.c" +#line 2934 "RawSupport.c" default: { #line 301 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_assert_not_reached (); -#line 2748 "RawSupport.c" +#line 2939 "RawSupport.c" } } } } -gchar* raw_developer_get_label (RawDeveloper self) { +gchar* +raw_developer_get_label (RawDeveloper self) +{ gchar* result = NULL; #line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (self) { #line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_SHOTWELL: -#line 2761 "RawSupport.c" +#line 2954 "RawSupport.c" { gchar* _tmp0_; #line 308 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2766,13 +2959,13 @@ gchar* raw_developer_get_label (RawDeveloper self) { result = _tmp0_; #line 308 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2770 "RawSupport.c" +#line 2963 "RawSupport.c" } #line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_CAMERA: #line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_EMBEDDED: -#line 2776 "RawSupport.c" +#line 2969 "RawSupport.c" { gchar* _tmp1_; #line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2781,121 +2974,116 @@ gchar* raw_developer_get_label (RawDeveloper self) { result = _tmp1_; #line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2785 "RawSupport.c" +#line 2978 "RawSupport.c" } default: { #line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_assert_not_reached (); -#line 2791 "RawSupport.c" +#line 2984 "RawSupport.c" } } } -gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d) { +gboolean +raw_developer_is_equivalent (RawDeveloper self, + RawDeveloper d) +{ gboolean result = FALSE; - RawDeveloper _tmp0_; + gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; #line 320 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp0_ = d; -#line 320 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (self == _tmp0_) { + if (self == d) { #line 321 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = TRUE; #line 321 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2810 "RawSupport.c" +#line 3003 "RawSupport.c" } #line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (self == RAW_DEVELOPER_CAMERA) { -#line 2814 "RawSupport.c" - RawDeveloper _tmp3_; -#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp3_ = d; #line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp2_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED; -#line 2820 "RawSupport.c" + _tmp1_ = d == RAW_DEVELOPER_EMBEDDED; +#line 3009 "RawSupport.c" } else { #line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp2_ = FALSE; -#line 2824 "RawSupport.c" + _tmp1_ = FALSE; +#line 3013 "RawSupport.c" } #line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp2_) { + if (_tmp1_) { #line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = TRUE; -#line 2830 "RawSupport.c" + _tmp0_ = TRUE; +#line 3019 "RawSupport.c" } else { - gboolean _tmp4_ = FALSE; + gboolean _tmp2_ = FALSE; #line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (self == RAW_DEVELOPER_EMBEDDED) { -#line 2835 "RawSupport.c" - RawDeveloper _tmp5_; #line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp5_ = d; -#line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp4_ = _tmp5_ == RAW_DEVELOPER_CAMERA; -#line 2841 "RawSupport.c" + _tmp2_ = d == RAW_DEVELOPER_CAMERA; +#line 3026 "RawSupport.c" } else { #line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp4_ = FALSE; -#line 2845 "RawSupport.c" + _tmp2_ = FALSE; +#line 3030 "RawSupport.c" } #line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = _tmp4_; -#line 2849 "RawSupport.c" + _tmp0_ = _tmp2_; +#line 3034 "RawSupport.c" } #line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp1_) { + if (_tmp0_) { #line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = TRUE; #line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2857 "RawSupport.c" +#line 3042 "RawSupport.c" } #line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = FALSE; #line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2863 "RawSupport.c" +#line 3048 "RawSupport.c" } -BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, const gchar* raw_filepath, const gchar* camera_development_filename, GError** error) { +BackingPhotoRow* +raw_developer_create_backing_row_for_development (RawDeveloper self, + const gchar* raw_filepath, + const gchar* camera_development_filename, + GError** error) +{ BackingPhotoRow* result = NULL; BackingPhotoRow* ns = NULL; BackingPhotoRow* _tmp0_; GFile* master = NULL; - const gchar* _tmp1_; - GFile* _tmp2_; + GFile* _tmp1_; gchar* name = NULL; gchar* ext = NULL; - GFile* _tmp3_; + GFile* _tmp2_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; + gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; gchar* basename = NULL; - const gchar* _tmp8_; gchar* newbasename = NULL; - const gchar* _tmp27_; - gchar* _tmp28_; + const gchar* _tmp24_; + gchar* _tmp25_; gboolean c = FALSE; GFile* new_back = NULL; - GFile* _tmp29_; - GFile* _tmp30_; + GFile* _tmp26_; + GFile* _tmp27_; + GFile* _tmp28_; + const gchar* _tmp29_; + gboolean _tmp30_ = FALSE; GFile* _tmp31_; - const gchar* _tmp32_; - gboolean _tmp33_ = FALSE; - GFile* _tmp34_; - GFile* _tmp35_; + GFile* _tmp32_; + GFile* _tmp33_; + BackingPhotoRow* _tmp34_; + BackingPhotoRow* _tmp35_; GFile* _tmp36_; - BackingPhotoRow* _tmp37_; - BackingPhotoRow* _tmp38_; - GFile* _tmp39_; - gchar* _tmp40_; + gchar* _tmp37_; GError * _inner_error_ = NULL; #line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (raw_filepath != NULL, NULL); @@ -2904,149 +3092,142 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper #line 334 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" ns = _tmp0_; #line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = raw_filepath; + _tmp1_ = g_file_new_for_path (raw_filepath); #line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp2_ = g_file_new_for_path (_tmp1_); -#line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - master = _tmp2_; + master = _tmp1_; #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp3_ = master; + _tmp2_ = master; #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp4_ = g_file_get_basename (_tmp3_); + _tmp3_ = g_file_get_basename (_tmp2_); #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - disassemble_filename (_tmp5_, &_tmp6_, &_tmp7_); + disassemble_filename (_tmp4_, &_tmp5_, &_tmp6_); #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (name); #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - name = _tmp6_; + name = _tmp5_; #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (ext); #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ext = _tmp7_; + ext = _tmp6_; #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp5_); -#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp8_ = camera_development_filename; + _g_free0 (_tmp4_); #line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp8_ == NULL) { -#line 2935 "RawSupport.c" - gchar* _tmp9_ = NULL; - const gchar* _tmp16_; - gchar* _tmp17_; + if (camera_development_filename == NULL) { +#line 3119 "RawSupport.c" + gchar* _tmp7_ = NULL; + const gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + const gchar* _tmp17_; gchar* _tmp18_; - const gchar* _tmp19_; + gchar* _tmp19_; gchar* _tmp20_; gchar* _tmp21_; gchar* _tmp22_; - gchar* _tmp23_; - gchar* _tmp24_; #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (self != RAW_DEVELOPER_CAMERA) { -#line 2948 "RawSupport.c" +#line 3132 "RawSupport.c" + gchar* _tmp8_; + gchar* _tmp9_; gchar* _tmp10_; gchar* _tmp11_; gchar* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; -#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp10_ = raw_developer_to_string (self); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp11_ = _tmp10_; + _tmp8_ = raw_developer_to_string (self); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp12_ = g_utf8_strdown (_tmp11_, (gssize) -1); + _tmp9_ = _tmp8_; #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp13_ = _tmp12_; + _tmp10_ = g_utf8_strdown (_tmp9_, (gssize) -1); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp14_ = g_strconcat ("_", _tmp13_, NULL); + _tmp11_ = _tmp10_; #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp9_); + _tmp12_ = g_strconcat ("_", _tmp11_, NULL); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp9_ = _tmp14_; + _g_free0 (_tmp7_); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp13_); + _tmp7_ = _tmp12_; #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp11_); -#line 2972 "RawSupport.c" +#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_free0 (_tmp9_); +#line 3156 "RawSupport.c" } else { - gchar* _tmp15_; + gchar* _tmp13_; #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp15_ = g_strdup (""); + _tmp13_ = g_strdup (""); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp7_); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp9_ = _tmp15_; -#line 2981 "RawSupport.c" + _tmp7_ = _tmp13_; +#line 3165 "RawSupport.c" } #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp16_ = name; + _tmp14_ = name; #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp17_ = g_strconcat (_tmp16_, "_", NULL); + _tmp15_ = g_strconcat (_tmp14_, "_", NULL); #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp18_ = _tmp17_; + _tmp16_ = _tmp15_; #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp19_ = ext; + _tmp17_ = ext; #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp20_ = g_strconcat (_tmp18_, _tmp19_, NULL); + _tmp18_ = g_strconcat (_tmp16_, _tmp17_, NULL); #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp21_ = _tmp20_; + _tmp19_ = _tmp18_; #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp22_ = g_strconcat (_tmp21_, _tmp9_, NULL); + _tmp20_ = g_strconcat (_tmp19_, _tmp7_, NULL); #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp23_ = _tmp22_; + _tmp21_ = _tmp20_; #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp24_ = g_strconcat (_tmp23_, ".jpg", NULL); + _tmp22_ = g_strconcat (_tmp21_, ".jpg", NULL); #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (basename); #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - basename = _tmp24_; -#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp23_); + basename = _tmp22_; #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp21_); #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp19_); +#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_free0 (_tmp16_); #line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp9_); -#line 3013 "RawSupport.c" + _g_free0 (_tmp7_); +#line 3197 "RawSupport.c" } else { - const gchar* _tmp25_; - gchar* _tmp26_; -#line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp25_ = camera_development_filename; + gchar* _tmp23_; #line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp26_ = g_strdup (_tmp25_); + _tmp23_ = g_strdup (camera_development_filename); #line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (basename); #line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - basename = _tmp26_; -#line 3025 "RawSupport.c" + basename = _tmp23_; +#line 3206 "RawSupport.c" } #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp27_ = basename; + _tmp24_ = basename; #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp28_ = library_files_convert_basename (_tmp27_); + _tmp25_ = library_files_convert_basename (_tmp24_); #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - newbasename = _tmp28_; + newbasename = _tmp25_; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp29_ = master; + _tmp26_ = master; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp30_ = g_file_get_parent (_tmp29_); + _tmp27_ = g_file_get_parent (_tmp26_); #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp31_ = _tmp30_; + _tmp28_ = _tmp27_; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp32_ = newbasename; + _tmp29_ = newbasename; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp34_ = generate_unique_file (_tmp31_, _tmp32_, &_tmp33_, &_inner_error_); + _tmp31_ = generate_unique_file (_tmp28_, _tmp29_, &_tmp30_, &_inner_error_); #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - c = _tmp33_; + c = _tmp30_; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp35_ = _tmp34_; + _tmp32_ = _tmp31_; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_object_unref0 (_tmp31_); + _g_object_unref0 (_tmp28_); #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - new_back = _tmp35_; + new_back = _tmp32_; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -3065,12 +3246,12 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper _backing_photo_row_unref0 (ns); #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 3069 "RawSupport.c" +#line 3250 "RawSupport.c" } #line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp36_ = new_back; + _tmp33_ = new_back; #line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - claim_file (_tmp36_, &_inner_error_); + claim_file (_tmp33_, &_inner_error_); #line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -3091,22 +3272,22 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper _backing_photo_row_unref0 (ns); #line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 3095 "RawSupport.c" +#line 3276 "RawSupport.c" } #line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp37_ = ns; + _tmp34_ = ns; #line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp37_->file_format = PHOTO_FILE_FORMAT_JFIF; + _tmp34_->file_format = PHOTO_FILE_FORMAT_JFIF; #line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp38_ = ns; + _tmp35_ = ns; #line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp39_ = new_back; + _tmp36_ = new_back; #line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp40_ = g_file_get_path (_tmp39_); + _tmp37_ = g_file_get_path (_tmp36_); #line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp38_->filepath); + _g_free0 (_tmp35_->filepath); #line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp38_->filepath = _tmp40_; + _tmp35_->filepath = _tmp37_; #line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = ns; #line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -3123,11 +3304,13 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper _g_object_unref0 (master); #line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 3127 "RawSupport.c" +#line 3308 "RawSupport.c" } -GType raw_developer_get_type (void) { +GType +raw_developer_get_type (void) +{ static volatile gsize raw_developer_type_id__volatile = 0; if (g_once_init_enter (&raw_developer_type_id__volatile)) { static const GEnumValue values[] = {{RAW_DEVELOPER_SHOTWELL, "RAW_DEVELOPER_SHOTWELL", "shotwell"}, {RAW_DEVELOPER_CAMERA, "RAW_DEVELOPER_CAMERA", "camera"}, {RAW_DEVELOPER_EMBEDDED, "RAW_DEVELOPER_EMBEDDED", "embedded"}, {0, NULL, NULL}}; diff --git a/src/photos/TiffSupport.c b/src/photos/TiffSupport.c index 70e930b..d17a83b 100644 --- a/src/photos/TiffSupport.c +++ b/src/photos/TiffSupport.c @@ -1,4 +1,4 @@ -/* TiffSupport.c generated by valac 0.36.6, the Vala compiler +/* TiffSupport.c generated by valac 0.40.4, the Vala compiler * generated from TiffSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -471,31 +472,55 @@ static gpointer photos_tiff_metadata_writer_parent_class = NULL; gpointer photo_file_format_driver_ref (gpointer instance); void photo_file_format_driver_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_driver (GValue* value, gpointer v_object); -void value_take_photo_file_format_driver (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_driver (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_driver (GValue* value, + gpointer v_object); +void value_take_photo_file_format_driver (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_driver (const GValue* value); GType photo_file_format_driver_get_type (void) G_GNUC_CONST; gpointer photo_file_format_properties_ref (gpointer instance); void photo_file_format_properties_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_properties (GValue* value, gpointer v_object); -void value_take_photo_file_format_properties (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_properties (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_properties (GValue* value, + gpointer v_object); +void value_take_photo_file_format_properties (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_properties (const GValue* value); GType photo_file_format_properties_get_type (void) G_GNUC_CONST; gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -504,15 +529,18 @@ GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST; GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; gpointer photo_file_sniffer_ref (gpointer instance); void photo_file_sniffer_unref (gpointer instance); -GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_sniffer (GValue* value, gpointer v_object); -void value_take_photo_file_sniffer (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_sniffer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_sniffer (GValue* value, + gpointer v_object); +void value_take_photo_file_sniffer (GValue* value, + gpointer v_object); gpointer value_get_photo_file_sniffer (const GValue* value); GType photo_file_sniffer_get_type (void) G_GNUC_CONST; GType photos_tiff_file_format_driver_get_type (void) G_GNUC_CONST; -enum { - PHOTOS_TIFF_FILE_FORMAT_DRIVER_DUMMY_PROPERTY -}; void photos_tiff_file_format_driver_init (void); PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_new (void); PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_construct (GType object_type); @@ -521,9 +549,11 @@ PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_get_instance (void); static PhotoFileFormatProperties* photos_tiff_file_format_driver_real_get_properties (PhotoFileFormatDriver* base); GType photos_tiff_file_format_properties_get_type (void) G_GNUC_CONST; PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_get_instance (void); -static PhotoFileReader* photos_tiff_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath); +static PhotoFileReader* photos_tiff_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath); PhotosTiffReader* photos_tiff_reader_new (const gchar* filepath); -PhotosTiffReader* photos_tiff_reader_construct (GType object_type, const gchar* filepath); +PhotosTiffReader* photos_tiff_reader_construct (GType object_type, + const gchar* filepath); GType gdk_reader_get_type (void) G_GNUC_CONST; GType photos_tiff_reader_get_type (void) G_GNUC_CONST; static PhotoMetadata* photos_tiff_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base); @@ -531,82 +561,109 @@ PhotoMetadata* photo_metadata_new (void); PhotoMetadata* photo_metadata_construct (GType object_type); static gboolean photos_tiff_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base); static gboolean photos_tiff_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base); -static PhotoFileWriter* photos_tiff_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath); +static PhotoFileWriter* photos_tiff_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath); PhotosTiffWriter* photos_tiff_writer_new (const gchar* filepath); -PhotosTiffWriter* photos_tiff_writer_construct (GType object_type, const gchar* filepath); +PhotosTiffWriter* photos_tiff_writer_construct (GType object_type, + const gchar* filepath); GType photos_tiff_writer_get_type (void) G_GNUC_CONST; -static PhotoFileMetadataWriter* photos_tiff_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath); +static PhotoFileMetadataWriter* photos_tiff_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath); PhotosTiffMetadataWriter* photos_tiff_metadata_writer_new (const gchar* filepath); -PhotosTiffMetadataWriter* photos_tiff_metadata_writer_construct (GType object_type, const gchar* filepath); +PhotosTiffMetadataWriter* photos_tiff_metadata_writer_construct (GType object_type, + const gchar* filepath); GType photos_tiff_metadata_writer_get_type (void) G_GNUC_CONST; -static PhotoFileSniffer* photos_tiff_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options); -PhotosTiffSniffer* photos_tiff_sniffer_new (GFile* file, PhotoFileSnifferOptions options); -PhotosTiffSniffer* photos_tiff_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); +static PhotoFileSniffer* photos_tiff_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options); +PhotosTiffSniffer* photos_tiff_sniffer_new (GFile* file, + PhotoFileSnifferOptions options); +PhotosTiffSniffer* photos_tiff_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); GType gdk_sniffer_get_type (void) G_GNUC_CONST; GType photos_tiff_sniffer_get_type (void) G_GNUC_CONST; PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type); static void photos_tiff_file_format_driver_finalize (PhotoFileFormatDriver * obj); GType photo_file_format_get_type (void) G_GNUC_CONST; GType photo_file_format_flags_get_type (void) G_GNUC_CONST; -enum { - PHOTOS_TIFF_FILE_FORMAT_PROPERTIES_DUMMY_PROPERTY -}; PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_new (void); PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_construct (GType object_type); static PhotoFileFormat photos_tiff_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base); static PhotoFileFormatFlags photos_tiff_file_format_properties_real_get_flags (PhotoFileFormatProperties* base); static gchar* photos_tiff_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base); static gchar* photos_tiff_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base); -static gchar** photos_tiff_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup14 (gchar** self, int length); +static gchar** photos_tiff_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1); +static gchar** _vala_array_dup14 (gchar** self, + int length); static gchar* photos_tiff_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base); -static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup15 (gchar** self, int length); +static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1); +static gchar** _vala_array_dup15 (gchar** self, + int length); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); static void photos_tiff_file_format_properties_finalize (PhotoFileFormatProperties * obj); gpointer detected_photo_information_ref (gpointer instance); void detected_photo_information_unref (gpointer instance); -GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_detected_photo_information (GValue* value, gpointer v_object); -void value_take_detected_photo_information (GValue* value, gpointer v_object); +GParamSpec* param_spec_detected_photo_information (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_detected_photo_information (GValue* value, + gpointer v_object); +void value_take_detected_photo_information (GValue* value, + gpointer v_object); gpointer value_get_detected_photo_information (const GValue* value); GType detected_photo_information_get_type (void) G_GNUC_CONST; -enum { - PHOTOS_TIFF_SNIFFER_DUMMY_PROPERTY -}; -GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error); -gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error); -DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error); +GdkSniffer* gdk_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error); +gboolean photos_is_tiff (GFile* file, + GCancellable* cancellable, + GError** error); +DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, + gboolean* is_corrupted, + GError** error); GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); -enum { - PHOTOS_TIFF_READER_DUMMY_PROPERTY -}; -GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); +GdkReader* gdk_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); GType jpeg_quality_get_type (void) G_GNUC_CONST; -enum { - PHOTOS_TIFF_WRITER_DUMMY_PROPERTY -}; #define PHOTOS_TIFF_WRITER_COMPRESSION_NONE "1" #define PHOTOS_TIFF_WRITER_COMPRESSION_HUFFMAN "2" #define PHOTOS_TIFF_WRITER_COMPRESSION_LZW "5" #define PHOTOS_TIFF_WRITER_COMPRESSION_JPEG "7" #define PHOTOS_TIFF_WRITER_COMPRESSION_DEFLATE "8" -PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static void photos_tiff_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error); +PhotoFileWriter* photo_file_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static void photos_tiff_writer_real_write (PhotoFileWriter* base, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error); gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self); -enum { - PHOTOS_TIFF_METADATA_WRITER_DUMMY_PROPERTY -}; -PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static void photos_tiff_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error); -void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** error); +PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static void photos_tiff_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, + PhotoMetadata* metadata, + GError** error); +void photo_metadata_write_to_file (PhotoMetadata* self, + GFile* file, + GError** error); GFile* photo_file_adapter_get_file (PhotoFileAdapter* self); -void photos_tiff_file_format_driver_init (void) { +void +photos_tiff_file_format_driver_init (void) +{ PhotosTiffFileFormatDriver* _tmp0_; #line 13 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp0_ = photos_tiff_file_format_driver_new (); @@ -616,18 +673,22 @@ void photos_tiff_file_format_driver_init (void) { photos_tiff_file_format_driver_instance = _tmp0_; #line 14 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_file_format_properties_init (); -#line 620 "TiffSupport.c" +#line 677 "TiffSupport.c" } -static gpointer _photo_file_format_driver_ref0 (gpointer self) { +static gpointer +_photo_file_format_driver_ref0 (gpointer self) +{ #line 18 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self ? photo_file_format_driver_ref (self) : NULL; -#line 627 "TiffSupport.c" +#line 686 "TiffSupport.c" } -PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_get_instance (void) { +PhotosTiffFileFormatDriver* +photos_tiff_file_format_driver_get_instance (void) +{ PhotosTiffFileFormatDriver* result = NULL; PhotosTiffFileFormatDriver* _tmp0_; PhotosTiffFileFormatDriver* _tmp1_; @@ -639,11 +700,13 @@ PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_get_instance (void) { result = _tmp1_; #line 18 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 643 "TiffSupport.c" +#line 704 "TiffSupport.c" } -static PhotoFileFormatProperties* photos_tiff_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) { +static PhotoFileFormatProperties* +photos_tiff_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) +{ PhotosTiffFileFormatDriver * self; PhotoFileFormatProperties* result = NULL; PhotosTiffFileFormatProperties* _tmp0_; @@ -655,32 +718,34 @@ static PhotoFileFormatProperties* photos_tiff_file_format_driver_real_get_proper result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties); #line 22 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 659 "TiffSupport.c" +#line 722 "TiffSupport.c" } -static PhotoFileReader* photos_tiff_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileReader* +photos_tiff_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath) +{ PhotosTiffFileFormatDriver * self; PhotoFileReader* result = NULL; - const gchar* _tmp0_; - PhotosTiffReader* _tmp1_; + PhotosTiffReader* _tmp0_; #line 25 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver); #line 25 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 26 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = filepath; -#line 26 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp1_ = photos_tiff_reader_new (_tmp0_); + _tmp0_ = photos_tiff_reader_new (filepath); #line 26 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_READER, PhotoFileReader); #line 26 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 680 "TiffSupport.c" +#line 743 "TiffSupport.c" } -static PhotoMetadata* photos_tiff_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) { +static PhotoMetadata* +photos_tiff_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) +{ PhotosTiffFileFormatDriver * self; PhotoMetadata* result = NULL; PhotoMetadata* _tmp0_; @@ -692,11 +757,13 @@ static PhotoMetadata* photos_tiff_file_format_driver_real_create_metadata (Photo result = _tmp0_; #line 30 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 696 "TiffSupport.c" +#line 761 "TiffSupport.c" } -static gboolean photos_tiff_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) { +static gboolean +photos_tiff_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) +{ PhotosTiffFileFormatDriver * self; gboolean result = FALSE; #line 33 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -705,11 +772,13 @@ static gboolean photos_tiff_file_format_driver_real_can_write_image (PhotoFileFo result = TRUE; #line 34 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 709 "TiffSupport.c" +#line 776 "TiffSupport.c" } -static gboolean photos_tiff_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) { +static gboolean +photos_tiff_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) +{ PhotosTiffFileFormatDriver * self; gboolean result = FALSE; #line 37 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -718,94 +787,98 @@ static gboolean photos_tiff_file_format_driver_real_can_write_metadata (PhotoFil result = TRUE; #line 38 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 722 "TiffSupport.c" +#line 791 "TiffSupport.c" } -static PhotoFileWriter* photos_tiff_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileWriter* +photos_tiff_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ PhotosTiffFileFormatDriver * self; PhotoFileWriter* result = NULL; - const gchar* _tmp0_; - PhotosTiffWriter* _tmp1_; + PhotosTiffWriter* _tmp0_; #line 41 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver); #line 41 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 42 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = filepath; -#line 42 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp1_ = photos_tiff_writer_new (_tmp0_); + _tmp0_ = photos_tiff_writer_new (filepath); #line 42 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter); #line 42 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 743 "TiffSupport.c" +#line 812 "TiffSupport.c" } -static PhotoFileMetadataWriter* photos_tiff_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileMetadataWriter* +photos_tiff_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ PhotosTiffFileFormatDriver * self; PhotoFileMetadataWriter* result = NULL; - const gchar* _tmp0_; - PhotosTiffMetadataWriter* _tmp1_; + PhotosTiffMetadataWriter* _tmp0_; #line 45 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver); #line 45 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 46 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = filepath; -#line 46 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp1_ = photos_tiff_metadata_writer_new (_tmp0_); + _tmp0_ = photos_tiff_metadata_writer_new (filepath); #line 46 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter); #line 46 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 764 "TiffSupport.c" +#line 833 "TiffSupport.c" } -static PhotoFileSniffer* photos_tiff_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) { +static PhotoFileSniffer* +photos_tiff_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options) +{ PhotosTiffFileFormatDriver * self; PhotoFileSniffer* result = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; - PhotosTiffSniffer* _tmp2_; + PhotosTiffSniffer* _tmp0_; #line 49 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver); #line 49 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 50 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = file; + _tmp0_ = photos_tiff_sniffer_new (file, options); #line 50 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp1_ = options; -#line 50 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp2_ = photos_tiff_sniffer_new (_tmp0_, _tmp1_); -#line 50 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); #line 50 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 788 "TiffSupport.c" +#line 855 "TiffSupport.c" } -PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_construct (GType object_type) { +PhotosTiffFileFormatDriver* +photos_tiff_file_format_driver_construct (GType object_type) +{ PhotosTiffFileFormatDriver* self = NULL; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = (PhotosTiffFileFormatDriver*) photo_file_format_driver_construct (object_type); #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self; -#line 798 "TiffSupport.c" +#line 867 "TiffSupport.c" } -PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_new (void) { +PhotosTiffFileFormatDriver* +photos_tiff_file_format_driver_new (void) +{ #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return photos_tiff_file_format_driver_construct (PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER); -#line 805 "TiffSupport.c" +#line 876 "TiffSupport.c" } -static void photos_tiff_file_format_driver_class_init (PhotosTiffFileFormatDriverClass * klass) { +static void +photos_tiff_file_format_driver_class_init (PhotosTiffFileFormatDriverClass * klass) +{ #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_file_format_driver_parent_class = g_type_class_peek_parent (klass); #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -826,25 +899,31 @@ static void photos_tiff_file_format_driver_class_init (PhotosTiffFileFormatDrive ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) photos_tiff_file_format_driver_real_create_metadata_writer; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) photos_tiff_file_format_driver_real_create_sniffer; -#line 830 "TiffSupport.c" +#line 903 "TiffSupport.c" } -static void photos_tiff_file_format_driver_instance_init (PhotosTiffFileFormatDriver * self) { +static void +photos_tiff_file_format_driver_instance_init (PhotosTiffFileFormatDriver * self) +{ } -static void photos_tiff_file_format_driver_finalize (PhotoFileFormatDriver * obj) { +static void +photos_tiff_file_format_driver_finalize (PhotoFileFormatDriver * obj) +{ PhotosTiffFileFormatDriver * self; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver); #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" PHOTO_FILE_FORMAT_DRIVER_CLASS (photos_tiff_file_format_driver_parent_class)->finalize (obj); -#line 844 "TiffSupport.c" +#line 921 "TiffSupport.c" } -GType photos_tiff_file_format_driver_get_type (void) { +GType +photos_tiff_file_format_driver_get_type (void) +{ static volatile gsize photos_tiff_file_format_driver_type_id__volatile = 0; if (g_once_init_enter (&photos_tiff_file_format_driver_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosTiffFileFormatDriverClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_tiff_file_format_driver_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosTiffFileFormatDriver), 0, (GInstanceInitFunc) photos_tiff_file_format_driver_instance_init, NULL }; @@ -856,7 +935,9 @@ GType photos_tiff_file_format_driver_get_type (void) { } -void photos_tiff_file_format_properties_init (void) { +void +photos_tiff_file_format_properties_init (void) +{ PhotosTiffFileFormatProperties* _tmp0_; #line 66 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp0_ = photos_tiff_file_format_properties_new (); @@ -864,18 +945,22 @@ void photos_tiff_file_format_properties_init (void) { _photo_file_format_properties_unref0 (photos_tiff_file_format_properties_instance); #line 66 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_file_format_properties_instance = _tmp0_; -#line 868 "TiffSupport.c" +#line 949 "TiffSupport.c" } -static gpointer _photo_file_format_properties_ref0 (gpointer self) { +static gpointer +_photo_file_format_properties_ref0 (gpointer self) +{ #line 70 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self ? photo_file_format_properties_ref (self) : NULL; -#line 875 "TiffSupport.c" +#line 958 "TiffSupport.c" } -PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_get_instance (void) { +PhotosTiffFileFormatProperties* +photos_tiff_file_format_properties_get_instance (void) +{ PhotosTiffFileFormatProperties* result = NULL; PhotosTiffFileFormatProperties* _tmp0_; PhotosTiffFileFormatProperties* _tmp1_; @@ -887,11 +972,13 @@ PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_get_instance result = _tmp1_; #line 70 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 891 "TiffSupport.c" +#line 976 "TiffSupport.c" } -static PhotoFileFormat photos_tiff_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) { +static PhotoFileFormat +photos_tiff_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) +{ PhotosTiffFileFormatProperties * self; PhotoFileFormat result = 0; #line 73 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -900,11 +987,13 @@ static PhotoFileFormat photos_tiff_file_format_properties_real_get_file_format ( result = PHOTO_FILE_FORMAT_TIFF; #line 74 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 904 "TiffSupport.c" +#line 991 "TiffSupport.c" } -static PhotoFileFormatFlags photos_tiff_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) { +static PhotoFileFormatFlags +photos_tiff_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) +{ PhotosTiffFileFormatProperties * self; PhotoFileFormatFlags result = 0; #line 77 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -913,11 +1002,13 @@ static PhotoFileFormatFlags photos_tiff_file_format_properties_real_get_flags (P result = PHOTO_FILE_FORMAT_FLAGS_NONE; #line 78 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 917 "TiffSupport.c" +#line 1006 "TiffSupport.c" } -static gchar* photos_tiff_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) { +static gchar* +photos_tiff_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) +{ PhotosTiffFileFormatProperties * self; gchar* result = NULL; gchar* _tmp0_; @@ -929,11 +1020,13 @@ static gchar* photos_tiff_file_format_properties_real_get_default_extension (Pho result = _tmp0_; #line 82 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 933 "TiffSupport.c" +#line 1024 "TiffSupport.c" } -static gchar* photos_tiff_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) { +static gchar* +photos_tiff_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) +{ PhotosTiffFileFormatProperties * self; gchar* result = NULL; gchar* _tmp0_; @@ -945,32 +1038,38 @@ static gchar* photos_tiff_file_format_properties_real_get_user_visible_name (Pho result = _tmp0_; #line 86 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 949 "TiffSupport.c" +#line 1042 "TiffSupport.c" } -static gchar** _vala_array_dup14 (gchar** self, int length) { +static gchar** +_vala_array_dup14 (gchar** self, + int length) +{ gchar** result; int i; #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result = g_new0 (gchar*, length + 1); #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" for (i = 0; i < length; i++) { -#line 960 "TiffSupport.c" +#line 1056 "TiffSupport.c" gchar* _tmp0_; #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp0_ = g_strdup (self[i]); #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result[i] = _tmp0_; -#line 966 "TiffSupport.c" +#line 1062 "TiffSupport.c" } #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 970 "TiffSupport.c" +#line 1066 "TiffSupport.c" } -static gchar** photos_tiff_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +photos_tiff_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1) +{ PhotosTiffFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -997,17 +1096,19 @@ static gchar** photos_tiff_file_format_properties_real_get_known_extensions (Pho if (result_length1) { #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" *result_length1 = _tmp2__length1; -#line 1001 "TiffSupport.c" +#line 1100 "TiffSupport.c" } #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result = _tmp2_; #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1007 "TiffSupport.c" +#line 1106 "TiffSupport.c" } -static gchar* photos_tiff_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) { +static gchar* +photos_tiff_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) +{ PhotosTiffFileFormatProperties * self; gchar* result = NULL; gchar** _tmp0_; @@ -1028,32 +1129,38 @@ static gchar* photos_tiff_file_format_properties_real_get_default_mime_type (Pho result = _tmp2_; #line 94 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1032 "TiffSupport.c" +#line 1133 "TiffSupport.c" } -static gchar** _vala_array_dup15 (gchar** self, int length) { +static gchar** +_vala_array_dup15 (gchar** self, + int length) +{ gchar** result; int i; #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result = g_new0 (gchar*, length + 1); #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" for (i = 0; i < length; i++) { -#line 1043 "TiffSupport.c" +#line 1147 "TiffSupport.c" gchar* _tmp0_; #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp0_ = g_strdup (self[i]); #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result[i] = _tmp0_; -#line 1049 "TiffSupport.c" +#line 1153 "TiffSupport.c" } #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1053 "TiffSupport.c" +#line 1157 "TiffSupport.c" } -static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +photos_tiff_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1) +{ PhotosTiffFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -1080,34 +1187,40 @@ static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFile if (result_length1) { #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" *result_length1 = _tmp2__length1; -#line 1084 "TiffSupport.c" +#line 1191 "TiffSupport.c" } #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result = _tmp2_; #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1090 "TiffSupport.c" +#line 1197 "TiffSupport.c" } -PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_construct (GType object_type) { +PhotosTiffFileFormatProperties* +photos_tiff_file_format_properties_construct (GType object_type) +{ PhotosTiffFileFormatProperties* self = NULL; #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = (PhotosTiffFileFormatProperties*) photo_file_format_properties_construct (object_type); #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self; -#line 1100 "TiffSupport.c" +#line 1209 "TiffSupport.c" } -PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_new (void) { +PhotosTiffFileFormatProperties* +photos_tiff_file_format_properties_new (void) +{ #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return photos_tiff_file_format_properties_construct (PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES); -#line 1107 "TiffSupport.c" +#line 1218 "TiffSupport.c" } -static void photos_tiff_file_format_properties_class_init (PhotosTiffFileFormatPropertiesClass * klass) { +static void +photos_tiff_file_format_properties_class_init (PhotosTiffFileFormatPropertiesClass * klass) +{ gchar* _tmp0_; gchar* _tmp1_; gchar** _tmp2_; @@ -1155,25 +1268,31 @@ static void photos_tiff_file_format_properties_class_init (PhotosTiffFileFormatP photos_tiff_file_format_properties_KNOWN_MIME_TYPES = _tmp4_; #line 59 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_file_format_properties_KNOWN_MIME_TYPES_length1 = 1; -#line 1159 "TiffSupport.c" +#line 1272 "TiffSupport.c" } -static void photos_tiff_file_format_properties_instance_init (PhotosTiffFileFormatProperties * self) { +static void +photos_tiff_file_format_properties_instance_init (PhotosTiffFileFormatProperties * self) +{ } -static void photos_tiff_file_format_properties_finalize (PhotoFileFormatProperties * obj) { +static void +photos_tiff_file_format_properties_finalize (PhotoFileFormatProperties * obj) +{ PhotosTiffFileFormatProperties * self; #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES, PhotosTiffFileFormatProperties); #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" PHOTO_FILE_FORMAT_PROPERTIES_CLASS (photos_tiff_file_format_properties_parent_class)->finalize (obj); -#line 1173 "TiffSupport.c" +#line 1290 "TiffSupport.c" } -GType photos_tiff_file_format_properties_get_type (void) { +GType +photos_tiff_file_format_properties_get_type (void) +{ static volatile gsize photos_tiff_file_format_properties_type_id__volatile = 0; if (g_once_init_enter (&photos_tiff_file_format_properties_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosTiffFileFormatPropertiesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_tiff_file_format_properties_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosTiffFileFormatProperties), 0, (GInstanceInitFunc) photos_tiff_file_format_properties_instance_init, NULL }; @@ -1185,53 +1304,59 @@ GType photos_tiff_file_format_properties_get_type (void) { } -PhotosTiffSniffer* photos_tiff_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { +PhotosTiffSniffer* +photos_tiff_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options) +{ PhotosTiffSniffer* self = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; #line 103 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 104 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = file; -#line 104 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp1_ = options; -#line 104 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - self = (PhotosTiffSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_); + self = (PhotosTiffSniffer*) gdk_sniffer_construct (object_type, file, options); #line 103 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self; -#line 1203 "TiffSupport.c" +#line 1320 "TiffSupport.c" } -PhotosTiffSniffer* photos_tiff_sniffer_new (GFile* file, PhotoFileSnifferOptions options) { +PhotosTiffSniffer* +photos_tiff_sniffer_new (GFile* file, + PhotoFileSnifferOptions options) +{ #line 103 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return photos_tiff_sniffer_construct (PHOTOS_TYPE_TIFF_SNIFFER, file, options); -#line 1210 "TiffSupport.c" +#line 1330 "TiffSupport.c" } -static gpointer _detected_photo_information_ref0 (gpointer self) { +static gpointer +_detected_photo_information_ref0 (gpointer self) +{ #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self ? detected_photo_information_ref (self) : NULL; -#line 1217 "TiffSupport.c" +#line 1339 "TiffSupport.c" } -static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error) { +static DetectedPhotoInformation* +photos_tiff_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error) +{ PhotosTiffSniffer * self; gboolean _vala_is_corrupted = FALSE; DetectedPhotoInformation* result = NULL; gboolean _tmp0_ = FALSE; GFile* _tmp1_; - gboolean _tmp2_; DetectedPhotoInformation* detected = NULL; - gboolean _tmp3_ = FALSE; + gboolean _tmp2_ = FALSE; + DetectedPhotoInformation* _tmp3_; DetectedPhotoInformation* _tmp4_; - DetectedPhotoInformation* _tmp5_; - DetectedPhotoInformation* _tmp6_ = NULL; - DetectedPhotoInformation* _tmp7_; - PhotoFileFormat _tmp8_; - DetectedPhotoInformation* _tmp10_; + DetectedPhotoInformation* _tmp5_ = NULL; + DetectedPhotoInformation* _tmp6_; + PhotoFileFormat _tmp7_; + DetectedPhotoInformation* _tmp9_; GError * _inner_error_ = NULL; #line 107 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_SNIFFER, PhotosTiffSniffer); @@ -1240,16 +1365,14 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp2_ = photos_is_tiff (_tmp1_, NULL, &_inner_error_); -#line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = _tmp2_; + _tmp0_ = photos_is_tiff (_tmp1_, NULL, &_inner_error_); #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_propagate_error (error, _inner_error_); #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return NULL; -#line 1253 "TiffSupport.c" +#line 1376 "TiffSupport.c" } #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (!_tmp0_) { @@ -1259,30 +1382,30 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe if (is_corrupted) { #line 112 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1263 "TiffSupport.c" +#line 1386 "TiffSupport.c" } #line 112 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1267 "TiffSupport.c" +#line 1390 "TiffSupport.c" } #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp4_ = PHOTO_FILE_SNIFFER_CLASS (photos_tiff_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp3_, &_inner_error_); + _tmp3_ = PHOTO_FILE_SNIFFER_CLASS (photos_tiff_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp2_, &_inner_error_); #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _vala_is_corrupted = _tmp3_; + _vala_is_corrupted = _tmp2_; #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - detected = _tmp4_; + detected = _tmp3_; #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_propagate_error (error, _inner_error_); #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return NULL; -#line 1281 "TiffSupport.c" +#line 1404 "TiffSupport.c" } #line 115 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp5_ = detected; + _tmp4_ = detected; #line 115 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - if (_tmp5_ == NULL) { + if (_tmp4_ == NULL) { #line 116 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result = NULL; #line 116 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1291,62 +1414,68 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe if (is_corrupted) { #line 116 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1295 "TiffSupport.c" +#line 1418 "TiffSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1299 "TiffSupport.c" +#line 1422 "TiffSupport.c" } #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp7_ = detected; + _tmp6_ = detected; #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp8_ = _tmp7_->file_format; + _tmp7_ = _tmp6_->file_format; #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - if (_tmp8_ == PHOTO_FILE_FORMAT_TIFF) { -#line 1307 "TiffSupport.c" - DetectedPhotoInformation* _tmp9_; + if (_tmp7_ == PHOTO_FILE_FORMAT_TIFF) { +#line 1430 "TiffSupport.c" + DetectedPhotoInformation* _tmp8_; #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp9_ = detected; + _tmp8_ = detected; #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp6_ = _tmp9_; -#line 1313 "TiffSupport.c" + _tmp5_ = _tmp8_; +#line 1436 "TiffSupport.c" } else { #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp6_ = NULL; -#line 1317 "TiffSupport.c" + _tmp5_ = NULL; +#line 1440 "TiffSupport.c" } #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp10_ = _detected_photo_information_ref0 (_tmp6_); + _tmp9_ = _detected_photo_information_ref0 (_tmp5_); #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - result = _tmp10_; + result = _tmp9_; #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _detected_photo_information_unref0 (detected); #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (is_corrupted) { #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1329 "TiffSupport.c" +#line 1452 "TiffSupport.c" } #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1333 "TiffSupport.c" +#line 1456 "TiffSupport.c" } -static void photos_tiff_sniffer_class_init (PhotosTiffSnifferClass * klass) { +static void +photos_tiff_sniffer_class_init (PhotosTiffSnifferClass * klass) +{ #line 102 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_sniffer_parent_class = g_type_class_peek_parent (klass); #line 102 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) photos_tiff_sniffer_real_sniff; -#line 1342 "TiffSupport.c" +#line 1467 "TiffSupport.c" } -static void photos_tiff_sniffer_instance_init (PhotosTiffSniffer * self) { +static void +photos_tiff_sniffer_instance_init (PhotosTiffSniffer * self) +{ } -GType photos_tiff_sniffer_get_type (void) { +GType +photos_tiff_sniffer_get_type (void) +{ static volatile gsize photos_tiff_sniffer_type_id__volatile = 0; if (g_once_init_enter (&photos_tiff_sniffer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosTiffSnifferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_tiff_sniffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosTiffSniffer), 0, (GInstanceInitFunc) photos_tiff_sniffer_instance_init, NULL }; @@ -1358,40 +1487,48 @@ GType photos_tiff_sniffer_get_type (void) { } -PhotosTiffReader* photos_tiff_reader_construct (GType object_type, const gchar* filepath) { +PhotosTiffReader* +photos_tiff_reader_construct (GType object_type, + const gchar* filepath) +{ PhotosTiffReader* self = NULL; - const gchar* _tmp0_; #line 123 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 124 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = filepath; -#line 124 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - self = (PhotosTiffReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_TIFF); + self = (PhotosTiffReader*) gdk_reader_construct (object_type, filepath, PHOTO_FILE_FORMAT_TIFF); #line 123 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self; -#line 1373 "TiffSupport.c" +#line 1502 "TiffSupport.c" } -PhotosTiffReader* photos_tiff_reader_new (const gchar* filepath) { +PhotosTiffReader* +photos_tiff_reader_new (const gchar* filepath) +{ #line 123 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return photos_tiff_reader_construct (PHOTOS_TYPE_TIFF_READER, filepath); -#line 1380 "TiffSupport.c" +#line 1511 "TiffSupport.c" } -static void photos_tiff_reader_class_init (PhotosTiffReaderClass * klass) { +static void +photos_tiff_reader_class_init (PhotosTiffReaderClass * klass) +{ #line 122 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_reader_parent_class = g_type_class_peek_parent (klass); -#line 1387 "TiffSupport.c" +#line 1520 "TiffSupport.c" } -static void photos_tiff_reader_instance_init (PhotosTiffReader * self) { +static void +photos_tiff_reader_instance_init (PhotosTiffReader * self) +{ } -GType photos_tiff_reader_get_type (void) { +GType +photos_tiff_reader_get_type (void) +{ static volatile gsize photos_tiff_reader_type_id__volatile = 0; if (g_once_init_enter (&photos_tiff_reader_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosTiffReaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_tiff_reader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosTiffReader), 0, (GInstanceInitFunc) photos_tiff_reader_instance_init, NULL }; @@ -1403,73 +1540,83 @@ GType photos_tiff_reader_get_type (void) { } -PhotosTiffWriter* photos_tiff_writer_construct (GType object_type, const gchar* filepath) { +PhotosTiffWriter* +photos_tiff_writer_construct (GType object_type, + const gchar* filepath) +{ PhotosTiffWriter* self = NULL; - const gchar* _tmp0_; #line 135 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 136 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = filepath; -#line 136 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - self = (PhotosTiffWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_TIFF); + self = (PhotosTiffWriter*) photo_file_writer_construct (object_type, filepath, PHOTO_FILE_FORMAT_TIFF); #line 135 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self; -#line 1418 "TiffSupport.c" +#line 1555 "TiffSupport.c" } -PhotosTiffWriter* photos_tiff_writer_new (const gchar* filepath) { +PhotosTiffWriter* +photos_tiff_writer_new (const gchar* filepath) +{ #line 135 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return photos_tiff_writer_construct (PHOTOS_TYPE_TIFF_WRITER, filepath); -#line 1425 "TiffSupport.c" +#line 1564 "TiffSupport.c" } -static void photos_tiff_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) { +static void +photos_tiff_writer_real_write (PhotoFileWriter* base, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error) +{ PhotosTiffWriter * self; - GdkPixbuf* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; GError * _inner_error_ = NULL; #line 139 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_WRITER, PhotosTiffWriter); #line 139 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = pixbuf; -#line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp0_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - gdk_pixbuf_save (_tmp0_, _tmp2_, "tiff", &_inner_error_, "compression", PHOTOS_TIFF_WRITER_COMPRESSION_LZW, NULL); + gdk_pixbuf_save (pixbuf, _tmp1_, "tiff", &_inner_error_, "compression", PHOTOS_TIFF_WRITER_COMPRESSION_LZW, NULL); #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_propagate_error (error, _inner_error_); #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return; -#line 1455 "TiffSupport.c" +#line 1596 "TiffSupport.c" } } -static void photos_tiff_writer_class_init (PhotosTiffWriterClass * klass) { +static void +photos_tiff_writer_class_init (PhotosTiffWriterClass * klass) +{ #line 128 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_writer_parent_class = g_type_class_peek_parent (klass); #line 128 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" ((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) photos_tiff_writer_real_write; -#line 1465 "TiffSupport.c" +#line 1608 "TiffSupport.c" } -static void photos_tiff_writer_instance_init (PhotosTiffWriter * self) { +static void +photos_tiff_writer_instance_init (PhotosTiffWriter * self) +{ } -GType photos_tiff_writer_get_type (void) { +GType +photos_tiff_writer_get_type (void) +{ static volatile gsize photos_tiff_writer_type_id__volatile = 0; if (g_once_init_enter (&photos_tiff_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosTiffWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_tiff_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosTiffWriter), 0, (GInstanceInitFunc) photos_tiff_writer_instance_init, NULL }; @@ -1481,73 +1628,82 @@ GType photos_tiff_writer_get_type (void) { } -PhotosTiffMetadataWriter* photos_tiff_metadata_writer_construct (GType object_type, const gchar* filepath) { +PhotosTiffMetadataWriter* +photos_tiff_metadata_writer_construct (GType object_type, + const gchar* filepath) +{ PhotosTiffMetadataWriter* self = NULL; - const gchar* _tmp0_; #line 145 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 146 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = filepath; -#line 146 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - self = (PhotosTiffMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_TIFF); + self = (PhotosTiffMetadataWriter*) photo_file_metadata_writer_construct (object_type, filepath, PHOTO_FILE_FORMAT_TIFF); #line 145 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self; -#line 1496 "TiffSupport.c" +#line 1643 "TiffSupport.c" } -PhotosTiffMetadataWriter* photos_tiff_metadata_writer_new (const gchar* filepath) { +PhotosTiffMetadataWriter* +photos_tiff_metadata_writer_new (const gchar* filepath) +{ #line 145 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return photos_tiff_metadata_writer_construct (PHOTOS_TYPE_TIFF_METADATA_WRITER, filepath); -#line 1503 "TiffSupport.c" +#line 1652 "TiffSupport.c" } -static void photos_tiff_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error) { +static void +photos_tiff_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, + PhotoMetadata* metadata, + GError** error) +{ PhotosTiffMetadataWriter * self; - PhotoMetadata* _tmp0_; + GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; GError * _inner_error_ = NULL; #line 149 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_METADATA_WRITER, PhotosTiffMetadataWriter); #line 149 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_if_fail (IS_PHOTO_METADATA (metadata)); #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = metadata; -#line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp1_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp0_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - photo_metadata_write_to_file (_tmp0_, _tmp2_, &_inner_error_); + photo_metadata_write_to_file (metadata, _tmp1_, &_inner_error_); #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_propagate_error (error, _inner_error_); #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return; -#line 1533 "TiffSupport.c" +#line 1683 "TiffSupport.c" } } -static void photos_tiff_metadata_writer_class_init (PhotosTiffMetadataWriterClass * klass) { +static void +photos_tiff_metadata_writer_class_init (PhotosTiffMetadataWriterClass * klass) +{ #line 144 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_metadata_writer_parent_class = g_type_class_peek_parent (klass); #line 144 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) photos_tiff_metadata_writer_real_write_metadata; -#line 1543 "TiffSupport.c" +#line 1695 "TiffSupport.c" } -static void photos_tiff_metadata_writer_instance_init (PhotosTiffMetadataWriter * self) { +static void +photos_tiff_metadata_writer_instance_init (PhotosTiffMetadataWriter * self) +{ } -GType photos_tiff_metadata_writer_get_type (void) { +GType +photos_tiff_metadata_writer_get_type (void) +{ static volatile gsize photos_tiff_metadata_writer_type_id__volatile = 0; if (g_once_init_enter (&photos_tiff_metadata_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosTiffMetadataWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_tiff_metadata_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosTiffMetadataWriter), 0, (GInstanceInitFunc) photos_tiff_metadata_writer_instance_init, NULL }; @@ -1559,62 +1715,55 @@ GType photos_tiff_metadata_writer_get_type (void) { } -gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) { +gboolean +photos_is_tiff (GFile* file, + GCancellable* cancellable, + GError** error) +{ gboolean result = FALSE; GFileInputStream* _tmp0_ = NULL; - GFile* _tmp1_; - GFileInputStream* _tmp2_; + GFileInputStream* _tmp1_; GDataInputStream* dins = NULL; - GDataInputStream* _tmp4_; + GDataInputStream* _tmp3_; GDataStreamByteOrder order = 0; - guint16 _tmp5_ = 0U; - GDataInputStream* _tmp6_; - GCancellable* _tmp7_; - guint16 _tmp8_; - GDataInputStream* _tmp10_; - GDataStreamByteOrder _tmp11_; + guint16 _tmp4_ = 0U; + GDataInputStream* _tmp5_; + GDataInputStream* _tmp7_; + GDataStreamByteOrder _tmp8_; guint16 lue = 0U; - GDataInputStream* _tmp12_; - GCancellable* _tmp13_; - guint16 _tmp14_; - guint16 _tmp16_; + GDataInputStream* _tmp9_; + guint16 _tmp11_; GError * _inner_error_ = NULL; #line 154 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 154 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable), FALSE); #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp1_ = file; -#line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp2_ = g_file_read (_tmp1_, NULL, &_inner_error_); + _tmp1_ = g_file_read (file, NULL, &_inner_error_); #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = _tmp2_; + _tmp0_ = _tmp1_; #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1595 "TiffSupport.c" - gboolean _tmp3_ = FALSE; +#line 1748 "TiffSupport.c" + gboolean _tmp2_ = FALSE; #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_propagate_error (error, _inner_error_); #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - return _tmp3_; -#line 1601 "TiffSupport.c" + return _tmp2_; +#line 1754 "TiffSupport.c" } #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp4_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), 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 = _tmp4_; + dins = _tmp3_; #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp6_ = dins; + _tmp5_ = dins; #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp7_ = cancellable; -#line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp8_ = g_data_input_stream_read_uint16 (_tmp6_, _tmp7_, &_inner_error_); -#line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp5_ = _tmp8_; + _tmp4_ = g_data_input_stream_read_uint16 (_tmp5_, cancellable, &_inner_error_); #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1617 "TiffSupport.c" - gboolean _tmp9_ = FALSE; +#line 1766 "TiffSupport.c" + gboolean _tmp6_ = FALSE; #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_propagate_error (error, _inner_error_); #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1622,30 +1771,30 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _g_object_unref0 (_tmp0_); #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - return _tmp9_; -#line 1627 "TiffSupport.c" + return _tmp6_; +#line 1776 "TiffSupport.c" } #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - switch (_tmp5_) { + switch (_tmp4_) { #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" case 0x4949: -#line 1633 "TiffSupport.c" +#line 1782 "TiffSupport.c" { #line 161 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" order = G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN; #line 162 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" break; -#line 1639 "TiffSupport.c" +#line 1788 "TiffSupport.c" } #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" case 0x4D4D: -#line 1643 "TiffSupport.c" +#line 1792 "TiffSupport.c" { #line 165 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" order = G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN; #line 166 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" break; -#line 1649 "TiffSupport.c" +#line 1798 "TiffSupport.c" } default: { @@ -1657,27 +1806,23 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) _g_object_unref0 (_tmp0_); #line 169 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1661 "TiffSupport.c" +#line 1810 "TiffSupport.c" } } #line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp10_ = dins; + _tmp7_ = dins; #line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp11_ = order; + _tmp8_ = order; #line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - g_data_input_stream_set_byte_order (_tmp10_, _tmp11_); -#line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp12_ = dins; -#line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp13_ = cancellable; + g_data_input_stream_set_byte_order (_tmp7_, _tmp8_); #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp14_ = g_data_input_stream_read_uint16 (_tmp12_, _tmp13_, &_inner_error_); + _tmp9_ = dins; #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - lue = _tmp14_; + lue = g_data_input_stream_read_uint16 (_tmp9_, cancellable, &_inner_error_); #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1680 "TiffSupport.c" - gboolean _tmp15_ = FALSE; +#line 1825 "TiffSupport.c" + gboolean _tmp10_ = FALSE; #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_propagate_error (error, _inner_error_); #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1685,13 +1830,13 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _g_object_unref0 (_tmp0_); #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - return _tmp15_; -#line 1690 "TiffSupport.c" + return _tmp10_; +#line 1835 "TiffSupport.c" } #line 176 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp16_ = lue; + _tmp11_ = lue; #line 176 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - if (((gint) _tmp16_) != 42) { + if (((gint) _tmp11_) != 42) { #line 177 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result = FALSE; #line 177 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1700,7 +1845,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) _g_object_unref0 (_tmp0_); #line 177 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1704 "TiffSupport.c" +#line 1849 "TiffSupport.c" } #line 180 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result = TRUE; @@ -1710,7 +1855,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) _g_object_unref0 (_tmp0_); #line 180 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1714 "TiffSupport.c" +#line 1859 "TiffSupport.c" } diff --git a/src/plugins/DataImportsInterfaces.c b/src/plugins/DataImportsInterfaces.c index 49b2b48..eb06253 100644 --- a/src/plugins/DataImportsInterfaces.c +++ b/src/plugins/DataImportsInterfaces.c @@ -1,4 +1,4 @@ -/* DataImportsInterfaces.c generated by valac 0.36.6, the Vala compiler +/* DataImportsInterfaces.c generated by valac 0.40.4, the Vala compiler * generated from DataImportsInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -299,7 +300,8 @@ GQuark spit_data_imports_data_import_error_quark (void); GType spit_pluggable_info_get_type (void) G_GNUC_CONST; SpitPluggableInfo* spit_pluggable_info_dup (const SpitPluggableInfo* self); void spit_pluggable_info_free (SpitPluggableInfo* self); -void spit_pluggable_info_copy (const SpitPluggableInfo* self, SpitPluggableInfo* dest); +void spit_pluggable_info_copy (const SpitPluggableInfo* self, + SpitPluggableInfo* dest); void spit_pluggable_info_destroy (SpitPluggableInfo* self); GType spit_pluggable_get_type (void) G_GNUC_CONST; GType spit_host_interface_get_type (void) G_GNUC_CONST; @@ -318,8 +320,10 @@ SpitDataImportsService* spit_data_imports_data_importer_get_service (SpitDataImp void spit_data_imports_data_importer_start (SpitDataImportsDataImporter* self); gboolean spit_data_imports_data_importer_is_running (SpitDataImportsDataImporter* self); void spit_data_imports_data_importer_stop (SpitDataImportsDataImporter* self); -void spit_data_imports_data_importer_on_library_selected (SpitDataImportsDataImporter* self, SpitDataImportsImportableLibrary* library); -void spit_data_imports_data_importer_on_file_selected (SpitDataImportsDataImporter* self, GFile* file); +void spit_data_imports_data_importer_on_library_selected (SpitDataImportsDataImporter* self, + SpitDataImportsImportableLibrary* library); +void spit_data_imports_data_importer_on_file_selected (SpitDataImportsDataImporter* self, + GFile* file); void spit_data_imports_data_importer_reserved0 (SpitDataImportsDataImporter* self); static void spit_data_imports_data_importer_real_reserved0 (SpitDataImportsDataImporter* self); void spit_data_imports_data_importer_reserved1 (SpitDataImportsDataImporter* self); @@ -337,7 +341,8 @@ static void spit_data_imports_data_importer_real_reserved6 (SpitDataImportsDataI void spit_data_imports_data_importer_reserved7 (SpitDataImportsDataImporter* self); static void spit_data_imports_data_importer_real_reserved7 (SpitDataImportsDataImporter* self); gchar* spit_data_imports_importable_library_get_display_name (SpitDataImportsImportableLibrary* self); -SpitDataImportsImportableTag** spit_data_imports_importable_media_item_get_tags (SpitDataImportsImportableMediaItem* self, int* result_length1); +SpitDataImportsImportableTag** spit_data_imports_importable_media_item_get_tags (SpitDataImportsImportableMediaItem* self, + int* result_length1); SpitDataImportsImportableEvent* spit_data_imports_importable_media_item_get_event (SpitDataImportsImportableMediaItem* self); SpitDataImportsImportableRating* spit_data_imports_importable_media_item_get_rating (SpitDataImportsImportableMediaItem* self); gchar* spit_data_imports_importable_media_item_get_title (SpitDataImportsImportableMediaItem* self); @@ -370,18 +375,39 @@ void spit_data_imports_dialog_pane_reserved6 (SpitDataImportsDialogPane* self); static void spit_data_imports_dialog_pane_real_reserved6 (SpitDataImportsDialogPane* self); void spit_data_imports_dialog_pane_reserved7 (SpitDataImportsDialogPane* self); static void spit_data_imports_dialog_pane_real_reserved7 (SpitDataImportsDialogPane* self); -void spit_data_imports_plugin_host_post_error (SpitDataImportsPluginHost* self, GError* err); -void spit_data_imports_plugin_host_post_error_message (SpitDataImportsPluginHost* self, const gchar* msg); +void spit_data_imports_plugin_host_post_error (SpitDataImportsPluginHost* self, + GError* err); +void spit_data_imports_plugin_host_post_error_message (SpitDataImportsPluginHost* self, + const gchar* msg); void spit_data_imports_plugin_host_start_importing (SpitDataImportsPluginHost* self); void spit_data_imports_plugin_host_stop_importing (SpitDataImportsPluginHost* self); SpitDataImportsDataImporter* spit_data_imports_plugin_host_get_data_importer (SpitDataImportsPluginHost* self); -void spit_data_imports_plugin_host_install_dialog_pane (SpitDataImportsPluginHost* self, SpitDataImportsDialogPane* pane, SpitDataImportsPluginHostButtonMode mode); -void spit_data_imports_plugin_host_install_static_message_pane (SpitDataImportsPluginHost* self, const gchar* message, SpitDataImportsPluginHostButtonMode mode); -void spit_data_imports_plugin_host_install_library_selection_pane (SpitDataImportsPluginHost* self, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label); -void spit_data_imports_plugin_host_install_import_progress_pane (SpitDataImportsPluginHost* self, const gchar* message); -void spit_data_imports_plugin_host_update_import_progress_pane (SpitDataImportsPluginHost* self, gdouble progress, const gchar* progress_message); -void spit_data_imports_plugin_host_prepare_media_items_for_import (SpitDataImportsPluginHost* self, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message); -void spit_data_imports_plugin_host_finalize_import (SpitDataImportsPluginHost* self, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message); +void spit_data_imports_plugin_host_install_dialog_pane (SpitDataImportsPluginHost* self, + SpitDataImportsDialogPane* pane, + SpitDataImportsPluginHostButtonMode mode); +void spit_data_imports_plugin_host_install_static_message_pane (SpitDataImportsPluginHost* self, + const gchar* message, + SpitDataImportsPluginHostButtonMode mode); +void spit_data_imports_plugin_host_install_library_selection_pane (SpitDataImportsPluginHost* self, + const gchar* welcome_message, + SpitDataImportsImportableLibrary** discovered_libraries, + int discovered_libraries_length1, + const gchar* file_select_label); +void spit_data_imports_plugin_host_install_import_progress_pane (SpitDataImportsPluginHost* self, + const gchar* message); +void spit_data_imports_plugin_host_update_import_progress_pane (SpitDataImportsPluginHost* self, + gdouble progress, + const gchar* progress_message); +void spit_data_imports_plugin_host_prepare_media_items_for_import (SpitDataImportsPluginHost* self, + SpitDataImportsImportableMediaItem** items, + int items_length1, + gdouble progress, + gdouble host_progress_delta, + const gchar* progress_message); +void spit_data_imports_plugin_host_finalize_import (SpitDataImportsPluginHost* self, + SpitDataImportsImportedItemsCountCallback report_imported_items_count, + void* report_imported_items_count_target, + const gchar* finalize_message); void spit_data_imports_plugin_host_reserved0 (SpitDataImportsPluginHost* self); static void spit_data_imports_plugin_host_real_reserved0 (SpitDataImportsPluginHost* self); void spit_data_imports_plugin_host_reserved1 (SpitDataImportsPluginHost* self); @@ -398,7 +424,8 @@ void spit_data_imports_plugin_host_reserved6 (SpitDataImportsPluginHost* self); static void spit_data_imports_plugin_host_real_reserved6 (SpitDataImportsPluginHost* self); void spit_data_imports_plugin_host_reserved7 (SpitDataImportsPluginHost* self); static void spit_data_imports_plugin_host_real_reserved7 (SpitDataImportsPluginHost* self); -SpitDataImportsDataImporter* spit_data_imports_service_create_data_importer (SpitDataImportsService* self, SpitDataImportsPluginHost* host); +SpitDataImportsDataImporter* spit_data_imports_service_create_data_importer (SpitDataImportsService* self, + SpitDataImportsPluginHost* host); void spit_data_imports_service_reserved0 (SpitDataImportsService* self); static void spit_data_imports_service_real_reserved0 (SpitDataImportsService* self); void spit_data_imports_service_reserved1 (SpitDataImportsService* self); @@ -417,7 +444,9 @@ void spit_data_imports_service_reserved7 (SpitDataImportsService* self); static void spit_data_imports_service_real_reserved7 (SpitDataImportsService* self); -GQuark spit_data_imports_data_import_error_quark (void) { +GQuark +spit_data_imports_data_import_error_quark (void) +{ return g_quark_from_static_string ("spit_data_imports_data_import_error-quark"); } @@ -425,12 +454,14 @@ GQuark spit_data_imports_data_import_error_quark (void) { /** * Returns a {@link Service} object describing the service to which this connects. */ -SpitDataImportsService* spit_data_imports_data_importer_get_service (SpitDataImportsDataImporter* self) { +SpitDataImportsService* +spit_data_imports_data_importer_get_service (SpitDataImportsDataImporter* self) +{ #line 53 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self), NULL); #line 53 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" return SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->get_service (self); -#line 434 "DataImportsInterfaces.c" +#line 465 "DataImportsInterfaces.c" } @@ -439,24 +470,28 @@ SpitDataImportsService* spit_data_imports_data_importer_get_service (SpitDataImp * to the shared services provided by the {@link PluginHost}. Through the host’s interface, * this data importer can install user interface panes and query configuration information. */ -void spit_data_imports_data_importer_start (SpitDataImportsDataImporter* self) { +void +spit_data_imports_data_importer_start (SpitDataImportsDataImporter* self) +{ #line 60 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self)); #line 60 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->start (self); -#line 448 "DataImportsInterfaces.c" +#line 481 "DataImportsInterfaces.c" } /** * Returns true if this data importer is in the running state; false otherwise. */ -gboolean spit_data_imports_data_importer_is_running (SpitDataImportsDataImporter* self) { +gboolean +spit_data_imports_data_importer_is_running (SpitDataImportsDataImporter* self) +{ #line 65 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self), FALSE); #line 65 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" return SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->is_running (self); -#line 460 "DataImportsInterfaces.c" +#line 495 "DataImportsInterfaces.c" } @@ -464,144 +499,186 @@ gboolean spit_data_imports_data_importer_is_running (SpitDataImportsDataImporter * Causes this data importer to enter a non-running state. This data importer should stop all * data access operations and cease use of the shared services provided by the {@link PluginHost}. */ -void spit_data_imports_data_importer_stop (SpitDataImportsDataImporter* self) { +void +spit_data_imports_data_importer_stop (SpitDataImportsDataImporter* self) +{ #line 71 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self)); #line 71 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->stop (self); -#line 473 "DataImportsInterfaces.c" +#line 510 "DataImportsInterfaces.c" } /** * Causes this data importer to enter start the import of a library. */ -void spit_data_imports_data_importer_on_library_selected (SpitDataImportsDataImporter* self, SpitDataImportsImportableLibrary* library) { +void +spit_data_imports_data_importer_on_library_selected (SpitDataImportsDataImporter* self, + SpitDataImportsImportableLibrary* library) +{ #line 76 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self)); #line 76 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->on_library_selected (self, library); -#line 485 "DataImportsInterfaces.c" +#line 525 "DataImportsInterfaces.c" } /** * Causes this data importer to enter start the import of a library file. */ -void spit_data_imports_data_importer_on_file_selected (SpitDataImportsDataImporter* self, GFile* file) { +void +spit_data_imports_data_importer_on_file_selected (SpitDataImportsDataImporter* self, + GFile* file) +{ #line 81 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self)); #line 81 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->on_file_selected (self, file); -#line 497 "DataImportsInterfaces.c" +#line 540 "DataImportsInterfaces.c" } -static void spit_data_imports_data_importer_real_reserved0 (SpitDataImportsDataImporter* self) { +static void +spit_data_imports_data_importer_real_reserved0 (SpitDataImportsDataImporter* self) +{ } -void spit_data_imports_data_importer_reserved0 (SpitDataImportsDataImporter* self) { +void +spit_data_imports_data_importer_reserved0 (SpitDataImportsDataImporter* self) +{ #line 86 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self)); #line 86 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->reserved0 (self); -#line 510 "DataImportsInterfaces.c" +#line 557 "DataImportsInterfaces.c" } -static void spit_data_imports_data_importer_real_reserved1 (SpitDataImportsDataImporter* self) { +static void +spit_data_imports_data_importer_real_reserved1 (SpitDataImportsDataImporter* self) +{ } -void spit_data_imports_data_importer_reserved1 (SpitDataImportsDataImporter* self) { +void +spit_data_imports_data_importer_reserved1 (SpitDataImportsDataImporter* self) +{ #line 87 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self)); #line 87 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->reserved1 (self); -#line 523 "DataImportsInterfaces.c" +#line 574 "DataImportsInterfaces.c" } -static void spit_data_imports_data_importer_real_reserved2 (SpitDataImportsDataImporter* self) { +static void +spit_data_imports_data_importer_real_reserved2 (SpitDataImportsDataImporter* self) +{ } -void spit_data_imports_data_importer_reserved2 (SpitDataImportsDataImporter* self) { +void +spit_data_imports_data_importer_reserved2 (SpitDataImportsDataImporter* self) +{ #line 88 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self)); #line 88 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->reserved2 (self); -#line 536 "DataImportsInterfaces.c" +#line 591 "DataImportsInterfaces.c" } -static void spit_data_imports_data_importer_real_reserved3 (SpitDataImportsDataImporter* self) { +static void +spit_data_imports_data_importer_real_reserved3 (SpitDataImportsDataImporter* self) +{ } -void spit_data_imports_data_importer_reserved3 (SpitDataImportsDataImporter* self) { +void +spit_data_imports_data_importer_reserved3 (SpitDataImportsDataImporter* self) +{ #line 89 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self)); #line 89 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->reserved3 (self); -#line 549 "DataImportsInterfaces.c" +#line 608 "DataImportsInterfaces.c" } -static void spit_data_imports_data_importer_real_reserved4 (SpitDataImportsDataImporter* self) { +static void +spit_data_imports_data_importer_real_reserved4 (SpitDataImportsDataImporter* self) +{ } -void spit_data_imports_data_importer_reserved4 (SpitDataImportsDataImporter* self) { +void +spit_data_imports_data_importer_reserved4 (SpitDataImportsDataImporter* self) +{ #line 90 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self)); #line 90 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->reserved4 (self); -#line 562 "DataImportsInterfaces.c" +#line 625 "DataImportsInterfaces.c" } -static void spit_data_imports_data_importer_real_reserved5 (SpitDataImportsDataImporter* self) { +static void +spit_data_imports_data_importer_real_reserved5 (SpitDataImportsDataImporter* self) +{ } -void spit_data_imports_data_importer_reserved5 (SpitDataImportsDataImporter* self) { +void +spit_data_imports_data_importer_reserved5 (SpitDataImportsDataImporter* self) +{ #line 91 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self)); #line 91 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->reserved5 (self); -#line 575 "DataImportsInterfaces.c" +#line 642 "DataImportsInterfaces.c" } -static void spit_data_imports_data_importer_real_reserved6 (SpitDataImportsDataImporter* self) { +static void +spit_data_imports_data_importer_real_reserved6 (SpitDataImportsDataImporter* self) +{ } -void spit_data_imports_data_importer_reserved6 (SpitDataImportsDataImporter* self) { +void +spit_data_imports_data_importer_reserved6 (SpitDataImportsDataImporter* self) +{ #line 92 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self)); #line 92 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->reserved6 (self); -#line 588 "DataImportsInterfaces.c" +#line 659 "DataImportsInterfaces.c" } -static void spit_data_imports_data_importer_real_reserved7 (SpitDataImportsDataImporter* self) { +static void +spit_data_imports_data_importer_real_reserved7 (SpitDataImportsDataImporter* self) +{ } -void spit_data_imports_data_importer_reserved7 (SpitDataImportsDataImporter* self) { +void +spit_data_imports_data_importer_reserved7 (SpitDataImportsDataImporter* self) +{ #line 93 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORTER (self)); #line 93 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DATA_IMPORTER_GET_INTERFACE (self)->reserved7 (self); -#line 601 "DataImportsInterfaces.c" +#line 676 "DataImportsInterfaces.c" } -static void spit_data_imports_data_importer_base_init (SpitDataImportsDataImporterIface * iface) { +static void +spit_data_imports_data_importer_base_init (SpitDataImportsDataImporterIface * iface) +{ #line 49 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" static gboolean initialized = FALSE; #line 49 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" @@ -624,7 +701,7 @@ static void spit_data_imports_data_importer_base_init (SpitDataImportsDataImport iface->reserved6 = spit_data_imports_data_importer_real_reserved6; #line 49 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" iface->reserved7 = spit_data_imports_data_importer_real_reserved7; -#line 628 "DataImportsInterfaces.c" +#line 705 "DataImportsInterfaces.c" } } @@ -639,7 +716,9 @@ static void spit_data_imports_data_importer_base_init (SpitDataImportsDataImport * a non-running state and do not begin running until start( ) is invoked. Data importers * run until stop( ) is invoked. */ -GType spit_data_imports_data_importer_get_type (void) { +GType +spit_data_imports_data_importer_get_type (void) +{ static volatile gsize spit_data_imports_data_importer_type_id__volatile = 0; if (g_once_init_enter (&spit_data_imports_data_importer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsDataImporterIface), (GBaseInitFunc) spit_data_imports_data_importer_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -652,23 +731,27 @@ GType spit_data_imports_data_importer_get_type (void) { } -gchar* spit_data_imports_importable_library_get_display_name (SpitDataImportsImportableLibrary* self) { +gchar* +spit_data_imports_importable_library_get_display_name (SpitDataImportsImportableLibrary* self) +{ #line 102 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_LIBRARY (self), NULL); #line 102 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" return SPIT_DATA_IMPORTS_IMPORTABLE_LIBRARY_GET_INTERFACE (self)->get_display_name (self); -#line 661 "DataImportsInterfaces.c" +#line 742 "DataImportsInterfaces.c" } -static void spit_data_imports_importable_library_base_init (SpitDataImportsImportableLibraryIface * iface) { +static void +spit_data_imports_importable_library_base_init (SpitDataImportsImportableLibraryIface * iface) +{ #line 101 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" static gboolean initialized = FALSE; #line 101 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" if (!initialized) { #line 101 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" initialized = TRUE; -#line 672 "DataImportsInterfaces.c" +#line 755 "DataImportsInterfaces.c" } } @@ -678,7 +761,9 @@ static void spit_data_imports_importable_library_base_init (SpitDataImportsImpor * * Developers of data import plugins provide a class that implements this interface. */ -GType spit_data_imports_importable_library_get_type (void) { +GType +spit_data_imports_importable_library_get_type (void) +{ static volatile gsize spit_data_imports_importable_library_type_id__volatile = 0; if (g_once_init_enter (&spit_data_imports_importable_library_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsImportableLibraryIface), (GBaseInitFunc) spit_data_imports_importable_library_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -691,77 +776,94 @@ GType spit_data_imports_importable_library_get_type (void) { } -SpitDataImportsImportableTag** spit_data_imports_importable_media_item_get_tags (SpitDataImportsImportableMediaItem* self, int* result_length1) { +SpitDataImportsImportableTag** +spit_data_imports_importable_media_item_get_tags (SpitDataImportsImportableMediaItem* self, + int* result_length1) +{ #line 111 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_MEDIA_ITEM (self), NULL); #line 111 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" return SPIT_DATA_IMPORTS_IMPORTABLE_MEDIA_ITEM_GET_INTERFACE (self)->get_tags (self, result_length1); -#line 700 "DataImportsInterfaces.c" +#line 788 "DataImportsInterfaces.c" } -SpitDataImportsImportableEvent* spit_data_imports_importable_media_item_get_event (SpitDataImportsImportableMediaItem* self) { +SpitDataImportsImportableEvent* +spit_data_imports_importable_media_item_get_event (SpitDataImportsImportableMediaItem* self) +{ #line 113 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_MEDIA_ITEM (self), NULL); #line 113 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" return SPIT_DATA_IMPORTS_IMPORTABLE_MEDIA_ITEM_GET_INTERFACE (self)->get_event (self); -#line 709 "DataImportsInterfaces.c" +#line 799 "DataImportsInterfaces.c" } -SpitDataImportsImportableRating* spit_data_imports_importable_media_item_get_rating (SpitDataImportsImportableMediaItem* self) { +SpitDataImportsImportableRating* +spit_data_imports_importable_media_item_get_rating (SpitDataImportsImportableMediaItem* self) +{ #line 115 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_MEDIA_ITEM (self), NULL); #line 115 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" return SPIT_DATA_IMPORTS_IMPORTABLE_MEDIA_ITEM_GET_INTERFACE (self)->get_rating (self); -#line 718 "DataImportsInterfaces.c" +#line 810 "DataImportsInterfaces.c" } -gchar* spit_data_imports_importable_media_item_get_title (SpitDataImportsImportableMediaItem* self) { +gchar* +spit_data_imports_importable_media_item_get_title (SpitDataImportsImportableMediaItem* self) +{ #line 117 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_MEDIA_ITEM (self), NULL); #line 117 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" return SPIT_DATA_IMPORTS_IMPORTABLE_MEDIA_ITEM_GET_INTERFACE (self)->get_title (self); -#line 727 "DataImportsInterfaces.c" +#line 821 "DataImportsInterfaces.c" } -gchar* spit_data_imports_importable_media_item_get_folder_path (SpitDataImportsImportableMediaItem* self) { +gchar* +spit_data_imports_importable_media_item_get_folder_path (SpitDataImportsImportableMediaItem* self) +{ #line 119 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_MEDIA_ITEM (self), NULL); #line 119 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" return SPIT_DATA_IMPORTS_IMPORTABLE_MEDIA_ITEM_GET_INTERFACE (self)->get_folder_path (self); -#line 736 "DataImportsInterfaces.c" +#line 832 "DataImportsInterfaces.c" } -gchar* spit_data_imports_importable_media_item_get_filename (SpitDataImportsImportableMediaItem* self) { +gchar* +spit_data_imports_importable_media_item_get_filename (SpitDataImportsImportableMediaItem* self) +{ #line 121 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_MEDIA_ITEM (self), NULL); #line 121 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" return SPIT_DATA_IMPORTS_IMPORTABLE_MEDIA_ITEM_GET_INTERFACE (self)->get_filename (self); -#line 745 "DataImportsInterfaces.c" +#line 843 "DataImportsInterfaces.c" } -time_t* spit_data_imports_importable_media_item_get_exposure_time (SpitDataImportsImportableMediaItem* self) { +time_t* +spit_data_imports_importable_media_item_get_exposure_time (SpitDataImportsImportableMediaItem* self) +{ #line 123 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_MEDIA_ITEM (self), NULL); #line 123 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" return SPIT_DATA_IMPORTS_IMPORTABLE_MEDIA_ITEM_GET_INTERFACE (self)->get_exposure_time (self); -#line 754 "DataImportsInterfaces.c" +#line 854 "DataImportsInterfaces.c" } -static void spit_data_imports_importable_media_item_base_init (SpitDataImportsImportableMediaItemIface * iface) { +static void +spit_data_imports_importable_media_item_base_init (SpitDataImportsImportableMediaItemIface * iface) +{ #line 110 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" static gboolean initialized = FALSE; #line 110 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" if (!initialized) { #line 110 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" initialized = TRUE; -#line 765 "DataImportsInterfaces.c" +#line 867 "DataImportsInterfaces.c" } } @@ -771,7 +873,9 @@ static void spit_data_imports_importable_media_item_base_init (SpitDataImportsIm * * Developers of data import plugins provide a class that implements this interface. */ -GType spit_data_imports_importable_media_item_get_type (void) { +GType +spit_data_imports_importable_media_item_get_type (void) +{ static volatile gsize spit_data_imports_importable_media_item_type_id__volatile = 0; if (g_once_init_enter (&spit_data_imports_importable_media_item_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsImportableMediaItemIface), (GBaseInitFunc) spit_data_imports_importable_media_item_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -784,32 +888,38 @@ GType spit_data_imports_importable_media_item_get_type (void) { } -gchar* spit_data_imports_importable_tag_get_name (SpitDataImportsImportableTag* self) { +gchar* +spit_data_imports_importable_tag_get_name (SpitDataImportsImportableTag* self) +{ #line 132 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_TAG (self), NULL); #line 132 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" return SPIT_DATA_IMPORTS_IMPORTABLE_TAG_GET_INTERFACE (self)->get_name (self); -#line 793 "DataImportsInterfaces.c" +#line 899 "DataImportsInterfaces.c" } -SpitDataImportsImportableTag* spit_data_imports_importable_tag_get_parent (SpitDataImportsImportableTag* self) { +SpitDataImportsImportableTag* +spit_data_imports_importable_tag_get_parent (SpitDataImportsImportableTag* self) +{ #line 134 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_TAG (self), NULL); #line 134 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" return SPIT_DATA_IMPORTS_IMPORTABLE_TAG_GET_INTERFACE (self)->get_parent (self); -#line 802 "DataImportsInterfaces.c" +#line 910 "DataImportsInterfaces.c" } -static void spit_data_imports_importable_tag_base_init (SpitDataImportsImportableTagIface * iface) { +static void +spit_data_imports_importable_tag_base_init (SpitDataImportsImportableTagIface * iface) +{ #line 131 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" static gboolean initialized = FALSE; #line 131 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" if (!initialized) { #line 131 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" initialized = TRUE; -#line 813 "DataImportsInterfaces.c" +#line 923 "DataImportsInterfaces.c" } } @@ -819,7 +929,9 @@ static void spit_data_imports_importable_tag_base_init (SpitDataImportsImportabl * * Developers of data import plugins provide a class that implements this interface. */ -GType spit_data_imports_importable_tag_get_type (void) { +GType +spit_data_imports_importable_tag_get_type (void) +{ static volatile gsize spit_data_imports_importable_tag_type_id__volatile = 0; if (g_once_init_enter (&spit_data_imports_importable_tag_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsImportableTagIface), (GBaseInitFunc) spit_data_imports_importable_tag_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -832,23 +944,27 @@ GType spit_data_imports_importable_tag_get_type (void) { } -gchar* spit_data_imports_importable_event_get_name (SpitDataImportsImportableEvent* self) { +gchar* +spit_data_imports_importable_event_get_name (SpitDataImportsImportableEvent* self) +{ #line 143 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_EVENT (self), NULL); #line 143 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" return SPIT_DATA_IMPORTS_IMPORTABLE_EVENT_GET_INTERFACE (self)->get_name (self); -#line 841 "DataImportsInterfaces.c" +#line 955 "DataImportsInterfaces.c" } -static void spit_data_imports_importable_event_base_init (SpitDataImportsImportableEventIface * iface) { +static void +spit_data_imports_importable_event_base_init (SpitDataImportsImportableEventIface * iface) +{ #line 142 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" static gboolean initialized = FALSE; #line 142 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" if (!initialized) { #line 142 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" initialized = TRUE; -#line 852 "DataImportsInterfaces.c" +#line 968 "DataImportsInterfaces.c" } } @@ -858,7 +974,9 @@ static void spit_data_imports_importable_event_base_init (SpitDataImportsImporta * * Developers of data import plugins provide a class that implements this interface. */ -GType spit_data_imports_importable_event_get_type (void) { +GType +spit_data_imports_importable_event_get_type (void) +{ static volatile gsize spit_data_imports_importable_event_type_id__volatile = 0; if (g_once_init_enter (&spit_data_imports_importable_event_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsImportableEventIface), (GBaseInitFunc) spit_data_imports_importable_event_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -871,41 +989,49 @@ GType spit_data_imports_importable_event_get_type (void) { } -gboolean spit_data_imports_importable_rating_is_unrated (SpitDataImportsImportableRating* self) { +gboolean +spit_data_imports_importable_rating_is_unrated (SpitDataImportsImportableRating* self) +{ #line 155 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_RATING (self), FALSE); #line 155 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" return SPIT_DATA_IMPORTS_IMPORTABLE_RATING_GET_INTERFACE (self)->is_unrated (self); -#line 880 "DataImportsInterfaces.c" +#line 1000 "DataImportsInterfaces.c" } -gboolean spit_data_imports_importable_rating_is_rejected (SpitDataImportsImportableRating* self) { +gboolean +spit_data_imports_importable_rating_is_rejected (SpitDataImportsImportableRating* self) +{ #line 157 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_RATING (self), FALSE); #line 157 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" return SPIT_DATA_IMPORTS_IMPORTABLE_RATING_GET_INTERFACE (self)->is_rejected (self); -#line 889 "DataImportsInterfaces.c" +#line 1011 "DataImportsInterfaces.c" } -gint spit_data_imports_importable_rating_get_value (SpitDataImportsImportableRating* self) { +gint +spit_data_imports_importable_rating_get_value (SpitDataImportsImportableRating* self) +{ #line 159 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_RATING (self), 0); #line 159 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" return SPIT_DATA_IMPORTS_IMPORTABLE_RATING_GET_INTERFACE (self)->get_value (self); -#line 898 "DataImportsInterfaces.c" +#line 1022 "DataImportsInterfaces.c" } -static void spit_data_imports_importable_rating_base_init (SpitDataImportsImportableRatingIface * iface) { +static void +spit_data_imports_importable_rating_base_init (SpitDataImportsImportableRatingIface * iface) +{ #line 154 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" static gboolean initialized = FALSE; #line 154 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" if (!initialized) { #line 154 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" initialized = TRUE; -#line 909 "DataImportsInterfaces.c" +#line 1035 "DataImportsInterfaces.c" } } @@ -918,7 +1044,9 @@ static void spit_data_imports_importable_rating_base_init (SpitDataImportsImport * 1 and 5, unless the rating object is unrated or rejected, in which case the * value is unspecified. */ -GType spit_data_imports_importable_rating_get_type (void) { +GType +spit_data_imports_importable_rating_get_type (void) +{ static volatile gsize spit_data_imports_importable_rating_type_id__volatile = 0; if (g_once_init_enter (&spit_data_imports_importable_rating_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsImportableRatingIface), (GBaseInitFunc) spit_data_imports_importable_rating_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -935,7 +1063,9 @@ GType spit_data_imports_importable_rating_get_type (void) { * Describes how the on-screen publishing dialog box should look and behave when an associated * pane is installed in the on-screen publishing dialog box. */ -GType spit_data_imports_dialog_pane_geometry_options_get_type (void) { +GType +spit_data_imports_dialog_pane_geometry_options_get_type (void) +{ static volatile gsize spit_data_imports_dialog_pane_geometry_options_type_id__volatile = 0; if (g_once_init_enter (&spit_data_imports_dialog_pane_geometry_options_type_id__volatile)) { static const GEnumValue values[] = {{SPIT_DATA_IMPORTS_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, "SPIT_DATA_IMPORTS_DIALOG_PANE_GEOMETRY_OPTIONS_NONE", "none"}, {SPIT_DATA_IMPORTS_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE, "SPIT_DATA_IMPORTS_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE", "extended-size"}, {SPIT_DATA_IMPORTS_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE, "SPIT_DATA_IMPORTS_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE", "resizable"}, {SPIT_DATA_IMPORTS_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE, "SPIT_DATA_IMPORTS_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE", "colossal-size"}, {0, NULL, NULL}}; @@ -950,12 +1080,14 @@ GType spit_data_imports_dialog_pane_geometry_options_get_type (void) { /** * Returns the Gtk.Widget that is this pane's on-screen representation. */ -GtkWidget* spit_data_imports_dialog_pane_get_widget (SpitDataImportsDialogPane* self) { +GtkWidget* +spit_data_imports_dialog_pane_get_widget (SpitDataImportsDialogPane* self) +{ #line 204 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self), NULL); #line 204 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" return SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->get_widget (self); -#line 959 "DataImportsInterfaces.c" +#line 1091 "DataImportsInterfaces.c" } @@ -963,12 +1095,14 @@ GtkWidget* spit_data_imports_dialog_pane_get_widget (SpitDataImportsDialogPane* * Returns a {@link GeometryOptions} bitfield describing how the on-screen publishing dialog * box should look and behave when this pane is installed. */ -SpitDataImportsDialogPaneGeometryOptions spit_data_imports_dialog_pane_get_preferred_geometry (SpitDataImportsDialogPane* self) { +SpitDataImportsDialogPaneGeometryOptions +spit_data_imports_dialog_pane_get_preferred_geometry (SpitDataImportsDialogPane* self) +{ #line 210 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self), 0); #line 210 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" return SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->get_preferred_geometry (self); -#line 972 "DataImportsInterfaces.c" +#line 1106 "DataImportsInterfaces.c" } @@ -976,12 +1110,14 @@ SpitDataImportsDialogPaneGeometryOptions spit_data_imports_dialog_pane_get_prefe * Invoked automatically by Shotwell when this pane has been installed into the on-screen * publishing dialog box and become visible to the user. */ -void spit_data_imports_dialog_pane_on_pane_installed (SpitDataImportsDialogPane* self) { +void +spit_data_imports_dialog_pane_on_pane_installed (SpitDataImportsDialogPane* self) +{ #line 216 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self)); #line 216 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->on_pane_installed (self); -#line 985 "DataImportsInterfaces.c" +#line 1121 "DataImportsInterfaces.c" } @@ -989,120 +1125,156 @@ void spit_data_imports_dialog_pane_on_pane_installed (SpitDataImportsDialogPane* * Invoked automatically by Shotwell when this pane has been removed from the on-screen * publishing dialog box and is no longer visible to the user. */ -void spit_data_imports_dialog_pane_on_pane_uninstalled (SpitDataImportsDialogPane* self) { +void +spit_data_imports_dialog_pane_on_pane_uninstalled (SpitDataImportsDialogPane* self) +{ #line 222 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self)); #line 222 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->on_pane_uninstalled (self); -#line 998 "DataImportsInterfaces.c" +#line 1136 "DataImportsInterfaces.c" } -static void spit_data_imports_dialog_pane_real_reserved0 (SpitDataImportsDialogPane* self) { +static void +spit_data_imports_dialog_pane_real_reserved0 (SpitDataImportsDialogPane* self) +{ } -void spit_data_imports_dialog_pane_reserved0 (SpitDataImportsDialogPane* self) { +void +spit_data_imports_dialog_pane_reserved0 (SpitDataImportsDialogPane* self) +{ #line 227 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self)); #line 227 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->reserved0 (self); -#line 1011 "DataImportsInterfaces.c" +#line 1153 "DataImportsInterfaces.c" } -static void spit_data_imports_dialog_pane_real_reserved1 (SpitDataImportsDialogPane* self) { +static void +spit_data_imports_dialog_pane_real_reserved1 (SpitDataImportsDialogPane* self) +{ } -void spit_data_imports_dialog_pane_reserved1 (SpitDataImportsDialogPane* self) { +void +spit_data_imports_dialog_pane_reserved1 (SpitDataImportsDialogPane* self) +{ #line 228 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self)); #line 228 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->reserved1 (self); -#line 1024 "DataImportsInterfaces.c" +#line 1170 "DataImportsInterfaces.c" } -static void spit_data_imports_dialog_pane_real_reserved2 (SpitDataImportsDialogPane* self) { +static void +spit_data_imports_dialog_pane_real_reserved2 (SpitDataImportsDialogPane* self) +{ } -void spit_data_imports_dialog_pane_reserved2 (SpitDataImportsDialogPane* self) { +void +spit_data_imports_dialog_pane_reserved2 (SpitDataImportsDialogPane* self) +{ #line 229 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self)); #line 229 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->reserved2 (self); -#line 1037 "DataImportsInterfaces.c" +#line 1187 "DataImportsInterfaces.c" } -static void spit_data_imports_dialog_pane_real_reserved3 (SpitDataImportsDialogPane* self) { +static void +spit_data_imports_dialog_pane_real_reserved3 (SpitDataImportsDialogPane* self) +{ } -void spit_data_imports_dialog_pane_reserved3 (SpitDataImportsDialogPane* self) { +void +spit_data_imports_dialog_pane_reserved3 (SpitDataImportsDialogPane* self) +{ #line 230 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self)); #line 230 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->reserved3 (self); -#line 1050 "DataImportsInterfaces.c" +#line 1204 "DataImportsInterfaces.c" } -static void spit_data_imports_dialog_pane_real_reserved4 (SpitDataImportsDialogPane* self) { +static void +spit_data_imports_dialog_pane_real_reserved4 (SpitDataImportsDialogPane* self) +{ } -void spit_data_imports_dialog_pane_reserved4 (SpitDataImportsDialogPane* self) { +void +spit_data_imports_dialog_pane_reserved4 (SpitDataImportsDialogPane* self) +{ #line 231 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self)); #line 231 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->reserved4 (self); -#line 1063 "DataImportsInterfaces.c" +#line 1221 "DataImportsInterfaces.c" } -static void spit_data_imports_dialog_pane_real_reserved5 (SpitDataImportsDialogPane* self) { +static void +spit_data_imports_dialog_pane_real_reserved5 (SpitDataImportsDialogPane* self) +{ } -void spit_data_imports_dialog_pane_reserved5 (SpitDataImportsDialogPane* self) { +void +spit_data_imports_dialog_pane_reserved5 (SpitDataImportsDialogPane* self) +{ #line 232 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self)); #line 232 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->reserved5 (self); -#line 1076 "DataImportsInterfaces.c" +#line 1238 "DataImportsInterfaces.c" } -static void spit_data_imports_dialog_pane_real_reserved6 (SpitDataImportsDialogPane* self) { +static void +spit_data_imports_dialog_pane_real_reserved6 (SpitDataImportsDialogPane* self) +{ } -void spit_data_imports_dialog_pane_reserved6 (SpitDataImportsDialogPane* self) { +void +spit_data_imports_dialog_pane_reserved6 (SpitDataImportsDialogPane* self) +{ #line 233 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self)); #line 233 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->reserved6 (self); -#line 1089 "DataImportsInterfaces.c" +#line 1255 "DataImportsInterfaces.c" } -static void spit_data_imports_dialog_pane_real_reserved7 (SpitDataImportsDialogPane* self) { +static void +spit_data_imports_dialog_pane_real_reserved7 (SpitDataImportsDialogPane* self) +{ } -void spit_data_imports_dialog_pane_reserved7 (SpitDataImportsDialogPane* self) { +void +spit_data_imports_dialog_pane_reserved7 (SpitDataImportsDialogPane* self) +{ #line 234 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (self)); #line 234 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_DIALOG_PANE_GET_INTERFACE (self)->reserved7 (self); -#line 1102 "DataImportsInterfaces.c" +#line 1272 "DataImportsInterfaces.c" } -static void spit_data_imports_dialog_pane_base_init (SpitDataImportsDialogPaneIface * iface) { +static void +spit_data_imports_dialog_pane_base_init (SpitDataImportsDialogPaneIface * iface) +{ #line 167 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" static gboolean initialized = FALSE; #line 167 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" @@ -1125,7 +1297,7 @@ static void spit_data_imports_dialog_pane_base_init (SpitDataImportsDialogPaneIf iface->reserved6 = spit_data_imports_dialog_pane_real_reserved6; #line 167 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" iface->reserved7 = spit_data_imports_dialog_pane_real_reserved7; -#line 1129 "DataImportsInterfaces.c" +#line 1301 "DataImportsInterfaces.c" } } @@ -1135,7 +1307,9 @@ static void spit_data_imports_dialog_pane_base_init (SpitDataImportsDialogPaneIf * communicate status to and to get information from the user. * */ -GType spit_data_imports_dialog_pane_get_type (void) { +GType +spit_data_imports_dialog_pane_get_type (void) +{ static volatile gsize spit_data_imports_dialog_pane_type_id__volatile = 0; if (g_once_init_enter (&spit_data_imports_dialog_pane_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsDialogPaneIface), (GBaseInitFunc) spit_data_imports_dialog_pane_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -1152,7 +1326,9 @@ GType spit_data_imports_dialog_pane_get_type (void) { * Specifies the label text on the push button control that appears in the * lower-right-hand corner of the on-screen publishing dialog box. */ -GType spit_data_imports_plugin_host_button_mode_get_type (void) { +GType +spit_data_imports_plugin_host_button_mode_get_type (void) +{ static volatile gsize spit_data_imports_plugin_host_button_mode_type_id__volatile = 0; if (g_once_init_enter (&spit_data_imports_plugin_host_button_mode_type_id__volatile)) { static const GEnumValue values[] = {{SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE, "SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE", "close"}, {SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CANCEL, "SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CANCEL", "cancel"}, {0, NULL, NULL}}; @@ -1170,12 +1346,15 @@ GType spit_data_imports_plugin_host_button_mode_get_type (void) { * * @param err An error object that describes the kind of error that occurred. */ -void spit_data_imports_plugin_host_post_error (SpitDataImportsPluginHost* self, GError* err) { +void +spit_data_imports_plugin_host_post_error (SpitDataImportsPluginHost* self, + GError* err) +{ #line 271 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self)); #line 271 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->post_error (self, err); -#line 1179 "DataImportsInterfaces.c" +#line 1358 "DataImportsInterfaces.c" } @@ -1185,12 +1364,15 @@ void spit_data_imports_plugin_host_post_error (SpitDataImportsPluginHost* self, * * @param msg A message that describes the kind of error that occurred. */ -void spit_data_imports_plugin_host_post_error_message (SpitDataImportsPluginHost* self, const gchar* msg) { +void +spit_data_imports_plugin_host_post_error_message (SpitDataImportsPluginHost* self, + const gchar* msg) +{ #line 279 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self)); #line 279 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->post_error_message (self, msg); -#line 1194 "DataImportsInterfaces.c" +#line 1376 "DataImportsInterfaces.c" } @@ -1199,12 +1381,14 @@ void spit_data_imports_plugin_host_post_error_message (SpitDataImportsPluginHost * * Calling this method starts the import activity for this host. */ -void spit_data_imports_plugin_host_start_importing (SpitDataImportsPluginHost* self) { +void +spit_data_imports_plugin_host_start_importing (SpitDataImportsPluginHost* self) +{ #line 286 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self)); #line 286 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->start_importing (self); -#line 1208 "DataImportsInterfaces.c" +#line 1392 "DataImportsInterfaces.c" } @@ -1214,24 +1398,28 @@ void spit_data_imports_plugin_host_start_importing (SpitDataImportsPluginHost* s * Calling this method stops all import activity and hides the on-screen import * dialog box. */ -void spit_data_imports_plugin_host_stop_importing (SpitDataImportsPluginHost* self) { +void +spit_data_imports_plugin_host_stop_importing (SpitDataImportsPluginHost* self) +{ #line 294 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self)); #line 294 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->stop_importing (self); -#line 1223 "DataImportsInterfaces.c" +#line 1409 "DataImportsInterfaces.c" } /** * Returns a reference to the {@link DataImporter} object that this is currently hosting. */ -SpitDataImportsDataImporter* spit_data_imports_plugin_host_get_data_importer (SpitDataImportsPluginHost* self) { +SpitDataImportsDataImporter* +spit_data_imports_plugin_host_get_data_importer (SpitDataImportsPluginHost* self) +{ #line 299 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self), NULL); #line 299 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" return SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->get_data_importer (self); -#line 1235 "DataImportsInterfaces.c" +#line 1423 "DataImportsInterfaces.c" } @@ -1253,12 +1441,16 @@ SpitDataImportsDataImporter* spit_data_imports_plugin_host_get_data_importer (Sp * should be ButtonMode.CLOSE, because all cancellable actions have already * occurred. */ -void spit_data_imports_plugin_host_install_dialog_pane (SpitDataImportsPluginHost* self, SpitDataImportsDialogPane* pane, SpitDataImportsPluginHostButtonMode mode) { +void +spit_data_imports_plugin_host_install_dialog_pane (SpitDataImportsPluginHost* self, + SpitDataImportsDialogPane* pane, + SpitDataImportsPluginHostButtonMode mode) +{ #line 319 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self)); #line 319 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->install_dialog_pane (self, pane, mode); -#line 1262 "DataImportsInterfaces.c" +#line 1454 "DataImportsInterfaces.c" } @@ -1288,12 +1480,16 @@ void spit_data_imports_plugin_host_install_dialog_pane (SpitDataImportsPluginHos * should be ButtonMode.CLOSE, because all cancellable actions have already * occurred. */ -void spit_data_imports_plugin_host_install_static_message_pane (SpitDataImportsPluginHost* self, const gchar* message, SpitDataImportsPluginHostButtonMode mode) { +void +spit_data_imports_plugin_host_install_static_message_pane (SpitDataImportsPluginHost* self, + const gchar* message, + SpitDataImportsPluginHostButtonMode mode) +{ #line 348 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self)); #line 348 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->install_static_message_pane (self, message, mode); -#line 1297 "DataImportsInterfaces.c" +#line 1493 "DataImportsInterfaces.c" } @@ -1317,12 +1513,18 @@ void spit_data_imports_plugin_host_install_static_message_pane (SpitDataImportsP * option. If this label is null, the * user will not be presented with a file selection option. */ -void spit_data_imports_plugin_host_install_library_selection_pane (SpitDataImportsPluginHost* self, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) { +void +spit_data_imports_plugin_host_install_library_selection_pane (SpitDataImportsPluginHost* self, + const gchar* welcome_message, + SpitDataImportsImportableLibrary** discovered_libraries, + int discovered_libraries_length1, + const gchar* file_select_label) +{ #line 371 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self)); #line 371 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->install_library_selection_pane (self, welcome_message, discovered_libraries, discovered_libraries_length1, file_select_label); -#line 1326 "DataImportsInterfaces.c" +#line 1528 "DataImportsInterfaces.c" } @@ -1334,12 +1536,15 @@ void spit_data_imports_plugin_host_install_library_selection_pane (SpitDataImpor * * @param message the text to be displayed above the progress bar. */ -void spit_data_imports_plugin_host_install_import_progress_pane (SpitDataImportsPluginHost* self, const gchar* message) { +void +spit_data_imports_plugin_host_install_import_progress_pane (SpitDataImportsPluginHost* self, + const gchar* message) +{ #line 385 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self)); #line 385 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->install_import_progress_pane (self, message); -#line 1343 "DataImportsInterfaces.c" +#line 1548 "DataImportsInterfaces.c" } @@ -1354,12 +1559,16 @@ void spit_data_imports_plugin_host_install_import_progress_pane (SpitDataImports * @param progress_label the text to be displayed below the progress bar. If that * parameter is null, the message will be left unchanged. */ -void spit_data_imports_plugin_host_update_import_progress_pane (SpitDataImportsPluginHost* self, gdouble progress, const gchar* progress_message) { +void +spit_data_imports_plugin_host_update_import_progress_pane (SpitDataImportsPluginHost* self, + gdouble progress, + const gchar* progress_message) +{ #line 400 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self)); #line 400 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->update_import_progress_pane (self, progress, progress_message); -#line 1363 "DataImportsInterfaces.c" +#line 1572 "DataImportsInterfaces.c" } @@ -1382,12 +1591,19 @@ void spit_data_imports_plugin_host_update_import_progress_pane (SpitDataImportsP * @param progress_message the text to be displayed below the progress bar. If that * parameter is null, the message will be left unchanged. */ -void spit_data_imports_plugin_host_prepare_media_items_for_import (SpitDataImportsPluginHost* self, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message) { +void +spit_data_imports_plugin_host_prepare_media_items_for_import (SpitDataImportsPluginHost* self, + SpitDataImportsImportableMediaItem** items, + int items_length1, + gdouble progress, + gdouble host_progress_delta, + const gchar* progress_message) +{ #line 424 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self)); #line 424 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->prepare_media_items_for_import (self, items, items_length1, progress, host_progress_delta, progress_message); -#line 1391 "DataImportsInterfaces.c" +#line 1607 "DataImportsInterfaces.c" } @@ -1407,120 +1623,159 @@ void spit_data_imports_plugin_host_prepare_media_items_for_import (SpitDataImpor * @param finalize_message the text to be displayed below the progress bar. If that * parameter is null, the message will be left unchanged. */ -void spit_data_imports_plugin_host_finalize_import (SpitDataImportsPluginHost* self, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message) { +void +spit_data_imports_plugin_host_finalize_import (SpitDataImportsPluginHost* self, + SpitDataImportsImportedItemsCountCallback report_imported_items_count, + void* report_imported_items_count_target, + const gchar* finalize_message) +{ #line 447 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self)); #line 447 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->finalize_import (self, report_imported_items_count, report_imported_items_count_target, finalize_message); -#line 1416 "DataImportsInterfaces.c" +#line 1637 "DataImportsInterfaces.c" } -static void spit_data_imports_plugin_host_real_reserved0 (SpitDataImportsPluginHost* self) { +static void +spit_data_imports_plugin_host_real_reserved0 (SpitDataImportsPluginHost* self) +{ } -void spit_data_imports_plugin_host_reserved0 (SpitDataImportsPluginHost* self) { +void +spit_data_imports_plugin_host_reserved0 (SpitDataImportsPluginHost* self) +{ #line 455 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self)); #line 455 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->reserved0 (self); -#line 1429 "DataImportsInterfaces.c" +#line 1654 "DataImportsInterfaces.c" } -static void spit_data_imports_plugin_host_real_reserved1 (SpitDataImportsPluginHost* self) { +static void +spit_data_imports_plugin_host_real_reserved1 (SpitDataImportsPluginHost* self) +{ } -void spit_data_imports_plugin_host_reserved1 (SpitDataImportsPluginHost* self) { +void +spit_data_imports_plugin_host_reserved1 (SpitDataImportsPluginHost* self) +{ #line 456 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self)); #line 456 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->reserved1 (self); -#line 1442 "DataImportsInterfaces.c" +#line 1671 "DataImportsInterfaces.c" } -static void spit_data_imports_plugin_host_real_reserved2 (SpitDataImportsPluginHost* self) { +static void +spit_data_imports_plugin_host_real_reserved2 (SpitDataImportsPluginHost* self) +{ } -void spit_data_imports_plugin_host_reserved2 (SpitDataImportsPluginHost* self) { +void +spit_data_imports_plugin_host_reserved2 (SpitDataImportsPluginHost* self) +{ #line 457 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self)); #line 457 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->reserved2 (self); -#line 1455 "DataImportsInterfaces.c" +#line 1688 "DataImportsInterfaces.c" } -static void spit_data_imports_plugin_host_real_reserved3 (SpitDataImportsPluginHost* self) { +static void +spit_data_imports_plugin_host_real_reserved3 (SpitDataImportsPluginHost* self) +{ } -void spit_data_imports_plugin_host_reserved3 (SpitDataImportsPluginHost* self) { +void +spit_data_imports_plugin_host_reserved3 (SpitDataImportsPluginHost* self) +{ #line 458 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self)); #line 458 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->reserved3 (self); -#line 1468 "DataImportsInterfaces.c" +#line 1705 "DataImportsInterfaces.c" } -static void spit_data_imports_plugin_host_real_reserved4 (SpitDataImportsPluginHost* self) { +static void +spit_data_imports_plugin_host_real_reserved4 (SpitDataImportsPluginHost* self) +{ } -void spit_data_imports_plugin_host_reserved4 (SpitDataImportsPluginHost* self) { +void +spit_data_imports_plugin_host_reserved4 (SpitDataImportsPluginHost* self) +{ #line 459 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self)); #line 459 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->reserved4 (self); -#line 1481 "DataImportsInterfaces.c" +#line 1722 "DataImportsInterfaces.c" } -static void spit_data_imports_plugin_host_real_reserved5 (SpitDataImportsPluginHost* self) { +static void +spit_data_imports_plugin_host_real_reserved5 (SpitDataImportsPluginHost* self) +{ } -void spit_data_imports_plugin_host_reserved5 (SpitDataImportsPluginHost* self) { +void +spit_data_imports_plugin_host_reserved5 (SpitDataImportsPluginHost* self) +{ #line 460 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self)); #line 460 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->reserved5 (self); -#line 1494 "DataImportsInterfaces.c" +#line 1739 "DataImportsInterfaces.c" } -static void spit_data_imports_plugin_host_real_reserved6 (SpitDataImportsPluginHost* self) { +static void +spit_data_imports_plugin_host_real_reserved6 (SpitDataImportsPluginHost* self) +{ } -void spit_data_imports_plugin_host_reserved6 (SpitDataImportsPluginHost* self) { +void +spit_data_imports_plugin_host_reserved6 (SpitDataImportsPluginHost* self) +{ #line 461 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self)); #line 461 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->reserved6 (self); -#line 1507 "DataImportsInterfaces.c" +#line 1756 "DataImportsInterfaces.c" } -static void spit_data_imports_plugin_host_real_reserved7 (SpitDataImportsPluginHost* self) { +static void +spit_data_imports_plugin_host_real_reserved7 (SpitDataImportsPluginHost* self) +{ } -void spit_data_imports_plugin_host_reserved7 (SpitDataImportsPluginHost* self) { +void +spit_data_imports_plugin_host_reserved7 (SpitDataImportsPluginHost* self) +{ #line 462 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (self)); #line 462 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_PLUGIN_HOST_GET_INTERFACE (self)->reserved7 (self); -#line 1520 "DataImportsInterfaces.c" +#line 1773 "DataImportsInterfaces.c" } -static void spit_data_imports_plugin_host_base_init (SpitDataImportsPluginHostIface * iface) { +static void +spit_data_imports_plugin_host_base_init (SpitDataImportsPluginHostIface * iface) +{ #line 254 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" static gboolean initialized = FALSE; #line 254 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" @@ -1543,7 +1798,7 @@ static void spit_data_imports_plugin_host_base_init (SpitDataImportsPluginHostIf iface->reserved6 = spit_data_imports_plugin_host_real_reserved6; #line 254 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" iface->reserved7 = spit_data_imports_plugin_host_real_reserved7; -#line 1547 "DataImportsInterfaces.c" +#line 1802 "DataImportsInterfaces.c" } } @@ -1557,7 +1812,9 @@ static void spit_data_imports_plugin_host_base_init (SpitDataImportsPluginHostIf * {@link DataImporter} is in the running state. This ensures that non-running data importers * don’t destructively interfere with the actively running importer. */ -GType spit_data_imports_plugin_host_get_type (void) { +GType +spit_data_imports_plugin_host_get_type (void) +{ static volatile gsize spit_data_imports_plugin_host_type_id__volatile = 0; if (g_once_init_enter (&spit_data_imports_plugin_host_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsPluginHostIface), (GBaseInitFunc) spit_data_imports_plugin_host_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -1575,120 +1832,157 @@ GType spit_data_imports_plugin_host_get_type (void) { * A factory method that instantiates and returns a new {@link DataImporter} object * that this Service describes. */ -SpitDataImportsDataImporter* spit_data_imports_service_create_data_importer (SpitDataImportsService* self, SpitDataImportsPluginHost* host) { +SpitDataImportsDataImporter* +spit_data_imports_service_create_data_importer (SpitDataImportsService* self, + SpitDataImportsPluginHost* host) +{ #line 475 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (self), NULL); #line 475 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" return SPIT_DATA_IMPORTS_SERVICE_GET_INTERFACE (self)->create_data_importer (self, host); -#line 1584 "DataImportsInterfaces.c" +#line 1844 "DataImportsInterfaces.c" } -static void spit_data_imports_service_real_reserved0 (SpitDataImportsService* self) { +static void +spit_data_imports_service_real_reserved0 (SpitDataImportsService* self) +{ } -void spit_data_imports_service_reserved0 (SpitDataImportsService* self) { +void +spit_data_imports_service_reserved0 (SpitDataImportsService* self) +{ #line 480 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (self)); #line 480 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_SERVICE_GET_INTERFACE (self)->reserved0 (self); -#line 1597 "DataImportsInterfaces.c" +#line 1861 "DataImportsInterfaces.c" } -static void spit_data_imports_service_real_reserved1 (SpitDataImportsService* self) { +static void +spit_data_imports_service_real_reserved1 (SpitDataImportsService* self) +{ } -void spit_data_imports_service_reserved1 (SpitDataImportsService* self) { +void +spit_data_imports_service_reserved1 (SpitDataImportsService* self) +{ #line 481 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (self)); #line 481 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_SERVICE_GET_INTERFACE (self)->reserved1 (self); -#line 1610 "DataImportsInterfaces.c" +#line 1878 "DataImportsInterfaces.c" } -static void spit_data_imports_service_real_reserved2 (SpitDataImportsService* self) { +static void +spit_data_imports_service_real_reserved2 (SpitDataImportsService* self) +{ } -void spit_data_imports_service_reserved2 (SpitDataImportsService* self) { +void +spit_data_imports_service_reserved2 (SpitDataImportsService* self) +{ #line 482 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (self)); #line 482 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_SERVICE_GET_INTERFACE (self)->reserved2 (self); -#line 1623 "DataImportsInterfaces.c" +#line 1895 "DataImportsInterfaces.c" } -static void spit_data_imports_service_real_reserved3 (SpitDataImportsService* self) { +static void +spit_data_imports_service_real_reserved3 (SpitDataImportsService* self) +{ } -void spit_data_imports_service_reserved3 (SpitDataImportsService* self) { +void +spit_data_imports_service_reserved3 (SpitDataImportsService* self) +{ #line 483 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (self)); #line 483 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_SERVICE_GET_INTERFACE (self)->reserved3 (self); -#line 1636 "DataImportsInterfaces.c" +#line 1912 "DataImportsInterfaces.c" } -static void spit_data_imports_service_real_reserved4 (SpitDataImportsService* self) { +static void +spit_data_imports_service_real_reserved4 (SpitDataImportsService* self) +{ } -void spit_data_imports_service_reserved4 (SpitDataImportsService* self) { +void +spit_data_imports_service_reserved4 (SpitDataImportsService* self) +{ #line 484 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (self)); #line 484 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_SERVICE_GET_INTERFACE (self)->reserved4 (self); -#line 1649 "DataImportsInterfaces.c" +#line 1929 "DataImportsInterfaces.c" } -static void spit_data_imports_service_real_reserved5 (SpitDataImportsService* self) { +static void +spit_data_imports_service_real_reserved5 (SpitDataImportsService* self) +{ } -void spit_data_imports_service_reserved5 (SpitDataImportsService* self) { +void +spit_data_imports_service_reserved5 (SpitDataImportsService* self) +{ #line 485 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (self)); #line 485 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_SERVICE_GET_INTERFACE (self)->reserved5 (self); -#line 1662 "DataImportsInterfaces.c" +#line 1946 "DataImportsInterfaces.c" } -static void spit_data_imports_service_real_reserved6 (SpitDataImportsService* self) { +static void +spit_data_imports_service_real_reserved6 (SpitDataImportsService* self) +{ } -void spit_data_imports_service_reserved6 (SpitDataImportsService* self) { +void +spit_data_imports_service_reserved6 (SpitDataImportsService* self) +{ #line 486 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (self)); #line 486 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_SERVICE_GET_INTERFACE (self)->reserved6 (self); -#line 1675 "DataImportsInterfaces.c" +#line 1963 "DataImportsInterfaces.c" } -static void spit_data_imports_service_real_reserved7 (SpitDataImportsService* self) { +static void +spit_data_imports_service_real_reserved7 (SpitDataImportsService* self) +{ } -void spit_data_imports_service_reserved7 (SpitDataImportsService* self) { +void +spit_data_imports_service_reserved7 (SpitDataImportsService* self) +{ #line 487 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (self)); #line 487 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" SPIT_DATA_IMPORTS_SERVICE_GET_INTERFACE (self)->reserved7 (self); -#line 1688 "DataImportsInterfaces.c" +#line 1980 "DataImportsInterfaces.c" } -static void spit_data_imports_service_base_init (SpitDataImportsServiceIface * iface) { +static void +spit_data_imports_service_base_init (SpitDataImportsServiceIface * iface) +{ #line 470 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" static gboolean initialized = FALSE; #line 470 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" @@ -1711,7 +2005,7 @@ static void spit_data_imports_service_base_init (SpitDataImportsServiceIface * i iface->reserved6 = spit_data_imports_service_real_reserved6; #line 470 "/home/jens/Source/shotwell/src/plugins/DataImportsInterfaces.vala" iface->reserved7 = spit_data_imports_service_real_reserved7; -#line 1715 "DataImportsInterfaces.c" +#line 2009 "DataImportsInterfaces.c" } } @@ -1721,7 +2015,9 @@ static void spit_data_imports_service_base_init (SpitDataImportsServiceIface * i * * Developers of data import plugins provide a class that implements this interface. */ -GType spit_data_imports_service_get_type (void) { +GType +spit_data_imports_service_get_type (void) +{ static volatile gsize spit_data_imports_service_type_id__volatile = 0; if (g_once_init_enter (&spit_data_imports_service_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsServiceIface), (GBaseInitFunc) spit_data_imports_service_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; diff --git a/src/plugins/ManifestWidget.c b/src/plugins/ManifestWidget.c index dc9624f..e5bad34 100644 --- a/src/plugins/ManifestWidget.c +++ b/src/plugins/ManifestWidget.c @@ -1,4 +1,4 @@ -/* ManifestWidget.c generated by valac 0.36.6, the Vala compiler +/* ManifestWidget.c generated by valac 0.40.4, the Vala compiler * generated from ManifestWidget.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -39,9 +40,19 @@ typedef struct _PluginsManifestWidgetMediatorPrivate PluginsManifestWidgetMediat typedef struct _PluginsManifestListView PluginsManifestListView; typedef struct _PluginsManifestListViewClass PluginsManifestListViewClass; +enum { + PLUGINS_MANIFEST_WIDGET_MEDIATOR_0_PROPERTY, + PLUGINS_MANIFEST_WIDGET_MEDIATOR_NUM_PROPERTIES +}; +static GParamSpec* plugins_manifest_widget_mediator_properties[PLUGINS_MANIFEST_WIDGET_MEDIATOR_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) typedef struct _PluginsManifestListViewPrivate PluginsManifestListViewPrivate; +enum { + PLUGINS_MANIFEST_LIST_VIEW_0_PROPERTY, + PLUGINS_MANIFEST_LIST_VIEW_NUM_PROPERTIES +}; +static GParamSpec* plugins_manifest_list_view_properties[PLUGINS_MANIFEST_LIST_VIEW_NUM_PROPERTIES]; #define PLUGINS_MANIFEST_LIST_VIEW_TYPE_COLUMN (plugins_manifest_list_view_column_get_type ()) @@ -57,8 +68,8 @@ typedef struct _PluginsExtensionPointClass PluginsExtensionPointClass; #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) #define _gtk_icon_info_free0(var) ((var == NULL) ? NULL : (var = (gtk_icon_info_free (var), NULL))) #define _plugins_extension_point_unref0(var) ((var == NULL) ? NULL : (var = (plugins_extension_point_unref (var), NULL))) -#define _gtk_tree_path_free0(var) ((var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL))) -#define __g_list_free__gtk_tree_path_free0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__gtk_tree_path_free0_ (var), NULL))) +#define __vala_GtkTreePath_free0(var) ((var == NULL) ? NULL : (var = (_vala_GtkTreePath_free (var), NULL))) +#define __g_list_free___vala_GtkTreePath_free0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free___vala_GtkTreePath_free0_ (var), NULL))) struct _PluginsManifestWidgetMediator { GtkBox parent_instance; @@ -104,31 +115,33 @@ static gpointer plugins_manifest_list_view_parent_class = NULL; GType plugins_manifest_widget_mediator_get_type (void) G_GNUC_CONST; GType plugins_manifest_list_view_get_type (void) G_GNUC_CONST; #define PLUGINS_MANIFEST_WIDGET_MEDIATOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR, PluginsManifestWidgetMediatorPrivate)) -enum { - PLUGINS_MANIFEST_WIDGET_MEDIATOR_DUMMY_PROPERTY -}; PluginsManifestListView* plugins_manifest_list_view_new (void); PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type); PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_new (void); PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_construct (GType object_type); static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMediator* self); -static void _plugins_manifest_widget_mediator_on_about_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void _plugins_manifest_widget_mediator_on_about_gtk_button_clicked (GtkButton* _sender, + gpointer self); static void plugins_manifest_widget_mediator_on_selection_changed (PluginsManifestWidgetMediator* self); -static void _plugins_manifest_widget_mediator_on_selection_changed_gtk_tree_selection_changed (GtkTreeSelection* _sender, gpointer self); +static void _plugins_manifest_widget_mediator_on_selection_changed_gtk_tree_selection_changed (GtkTreeSelection* _sender, + gpointer self); static void plugins_manifest_widget_mediator_set_about_button_sensitivity (PluginsManifestWidgetMediator* self); -gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* self, int* result_length1); -gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info); +gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* self, + int* result_length1); +gboolean plugins_get_pluggable_info (const gchar* id, + SpitPluggableInfo* info); gboolean is_string_empty (const gchar* s); -static void _vala_array_add52 (gchar** * array, int* length, int* size, gchar* value); -GdkPixbuf* resources_get_icon (const gchar* name, gint scale); +static void _vala_array_add52 (gchar** * array, + int* length, + int* size, + gchar* value); +GdkPixbuf* resources_get_icon (const gchar* name, + gint scale); #define RESOURCES_ICON_GENERIC_PLUGIN "generic-plugin.png" #define RESOURCES_DEFAULT_ICON_SCALE 24 gchar* plugins_get_pluggable_name (const gchar* id); static void plugins_manifest_widget_mediator_finalize (GObject * obj); #define PLUGINS_MANIFEST_LIST_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PLUGINS_TYPE_MANIFEST_LIST_VIEW, PluginsManifestListViewPrivate)) -enum { - PLUGINS_MANIFEST_LIST_VIEW_DUMMY_PROPERTY -}; static GType plugins_manifest_list_view_column_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE 24 #define PLUGINS_MANIFEST_LIST_VIEW_ICON_X_PADDING 6 @@ -136,48 +149,88 @@ static GType plugins_manifest_list_view_column_get_type (void) G_GNUC_CONST G_GN GtkIconTheme* resources_get_icon_theme_engine (void); gpointer plugins_extension_point_ref (gpointer instance); void plugins_extension_point_unref (gpointer instance); -GParamSpec* plugins_param_spec_extension_point (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void plugins_value_set_extension_point (GValue* value, gpointer v_object); -void plugins_value_take_extension_point (GValue* value, gpointer v_object); +GParamSpec* plugins_param_spec_extension_point (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void plugins_value_set_extension_point (GValue* value, + gpointer v_object); +void plugins_value_take_extension_point (GValue* value, + gpointer v_object); gpointer plugins_value_get_extension_point (const GValue* value); GType plugins_extension_point_get_type (void) G_GNUC_CONST; -GeeCollection* plugins_get_extension_points (GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify); -gint plugins_compare_extension_point_names (void* a, void* b); -static gint _plugins_compare_extension_point_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); +GeeCollection* plugins_get_extension_points (GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify); +gint plugins_compare_extension_point_names (void* a, + void* b); +static gint _plugins_compare_extension_point_names_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self); const gchar* plugins_extension_point_get_icon_name (PluginsExtensionPoint* self); const gchar* plugins_extension_point_get_name (PluginsExtensionPoint* self); -GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled); +GeeCollection* plugins_get_pluggables_for_type (GType type, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify, + gboolean include_disabled); GType plugins_extension_point_get_pluggable_type (PluginsExtensionPoint* self); -gint plugins_compare_pluggable_names (void* a, void* b); -static gint _plugins_compare_pluggable_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); -gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled); -static gchar* plugins_manifest_list_view_get_id_at_path (PluginsManifestListView* self, GtkTreePath* path, GtkTreeIter* iter); -static void _vala_array_add53 (gchar** * array, int* length, int* size, gchar* value); -static void _gtk_tree_path_free0_ (gpointer var); -static void _g_list_free__gtk_tree_path_free0_ (GList* self); -static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* base, GdkEventButton* event); -void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled); +gint plugins_compare_pluggable_names (void* a, + void* b); +static gint _plugins_compare_pluggable_names_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self); +gboolean plugins_get_pluggable_enabled (const gchar* id, + gboolean* enabled); +static GtkTreePath* _vala_GtkTreePath_copy (GtkTreePath* self); +static gchar* plugins_manifest_list_view_get_id_at_path (PluginsManifestListView* self, + GtkTreePath* path, + GtkTreeIter* iter); +static void _vala_array_add53 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_GtkTreePath_free (GtkTreePath* self); +static void __vala_GtkTreePath_free0_ (gpointer var); +static inline void _g_list_free___vala_GtkTreePath_free0_ (GList* self); +static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* base, + GdkEventButton* event); +void plugins_set_pluggable_enabled (const gchar* id, + gboolean enabled); static void plugins_manifest_list_view_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); -static void _plugins_manifest_widget_mediator_on_about_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_plugins_manifest_widget_mediator_on_about_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 25 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" plugins_manifest_widget_mediator_on_about ((PluginsManifestWidgetMediator*) self); -#line 170 "ManifestWidget.c" +#line 218 "ManifestWidget.c" } -static void _plugins_manifest_widget_mediator_on_selection_changed_gtk_tree_selection_changed (GtkTreeSelection* _sender, gpointer self) { +static void +_plugins_manifest_widget_mediator_on_selection_changed_gtk_tree_selection_changed (GtkTreeSelection* _sender, + gpointer self) +{ #line 26 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" plugins_manifest_widget_mediator_on_selection_changed ((PluginsManifestWidgetMediator*) self); -#line 177 "ManifestWidget.c" +#line 228 "ManifestWidget.c" } -PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_construct (GType object_type) { +PluginsManifestWidgetMediator* +plugins_manifest_widget_mediator_construct (GType object_type) +{ PluginsManifestWidgetMediator * self = NULL; GtkScrolledWindow* _tmp0_; PluginsManifestListView* _tmp1_; @@ -206,65 +259,78 @@ PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_construct (GType plugins_manifest_widget_mediator_set_about_button_sensitivity (self); #line 20 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" return self; -#line 210 "ManifestWidget.c" +#line 263 "ManifestWidget.c" } -PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_new (void) { +PluginsManifestWidgetMediator* +plugins_manifest_widget_mediator_new (void) +{ #line 20 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" return plugins_manifest_widget_mediator_construct (PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR); -#line 217 "ManifestWidget.c" +#line 272 "ManifestWidget.c" } -static gchar* string_strip (const gchar* self) { +static gchar* +string_strip (const gchar* self) +{ gchar* result = NULL; gchar* _result_ = NULL; gchar* _tmp0_; const gchar* _tmp1_; -#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1248 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _result_; -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 240 "ManifestWidget.c" +#line 297 "ManifestWidget.c" } -static void _vala_array_add52 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add52 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if ((*length) == (*size)) { #line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" *size = (*size) ? (2 * (*size)) : 4; #line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 251 "ManifestWidget.c" +#line 313 "ManifestWidget.c" } #line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" (*array)[(*length)++] = value; #line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" (*array)[*length] = NULL; -#line 257 "ManifestWidget.c" +#line 319 "ManifestWidget.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" return self ? g_object_ref (self) : NULL; -#line 264 "ManifestWidget.c" +#line 328 "ManifestWidget.c" } -static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMediator* self) { +static void +plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMediator* self) +{ gchar** ids = NULL; PluginsManifestListView* _tmp0_; gint _tmp1_; @@ -287,46 +353,46 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi SpitPluggableInfo _tmp10_; const gchar* _tmp11_; GtkAboutDialog* about_dialog = NULL; + GtkAboutDialog* _tmp30_; GtkAboutDialog* _tmp31_; - GtkAboutDialog* _tmp32_; - gchar** _tmp33_; - gint _tmp33__length1; - GtkAboutDialog* _tmp34_; - SpitPluggableInfo _tmp35_; - const gchar* _tmp36_; - GtkAboutDialog* _tmp37_; - SpitPluggableInfo _tmp38_; - const gchar* _tmp39_; - GtkAboutDialog* _tmp40_; - SpitPluggableInfo _tmp41_; - const gchar* _tmp42_; - GtkAboutDialog* _tmp43_; - SpitPluggableInfo _tmp44_; - gboolean _tmp45_; - GdkPixbuf* _tmp46_ = NULL; - gboolean _tmp47_ = FALSE; - SpitPluggableInfo _tmp48_; - GdkPixbuf** _tmp49_; - gint _tmp49__length1; + gchar** _tmp32_; + gint _tmp32__length1; + GtkAboutDialog* _tmp33_; + SpitPluggableInfo _tmp34_; + const gchar* _tmp35_; + GtkAboutDialog* _tmp36_; + SpitPluggableInfo _tmp37_; + const gchar* _tmp38_; + GtkAboutDialog* _tmp39_; + SpitPluggableInfo _tmp40_; + const gchar* _tmp41_; + GtkAboutDialog* _tmp42_; + SpitPluggableInfo _tmp43_; + gboolean _tmp44_; + GdkPixbuf* _tmp45_ = NULL; + gboolean _tmp46_ = FALSE; + SpitPluggableInfo _tmp47_; + GdkPixbuf** _tmp48_; + gint _tmp48__length1; + GtkAboutDialog* _tmp56_; GtkAboutDialog* _tmp57_; - GtkAboutDialog* _tmp58_; - const gchar* _tmp59_; + const gchar* _tmp58_; + gchar* _tmp59_; gchar* _tmp60_; - gchar* _tmp61_; - GtkAboutDialog* _tmp62_; - SpitPluggableInfo _tmp63_; - const gchar* _tmp64_; - GtkAboutDialog* _tmp65_; - SpitPluggableInfo _tmp66_; - const gchar* _tmp67_; - GtkAboutDialog* _tmp68_; - SpitPluggableInfo _tmp69_; - const gchar* _tmp70_; - GtkAboutDialog* _tmp71_; - SpitPluggableInfo _tmp72_; - const gchar* _tmp73_; + GtkAboutDialog* _tmp61_; + SpitPluggableInfo _tmp62_; + const gchar* _tmp63_; + GtkAboutDialog* _tmp64_; + SpitPluggableInfo _tmp65_; + const gchar* _tmp66_; + GtkAboutDialog* _tmp67_; + SpitPluggableInfo _tmp68_; + const gchar* _tmp69_; + GtkAboutDialog* _tmp70_; + SpitPluggableInfo _tmp71_; + const gchar* _tmp72_; + GtkAboutDialog* _tmp73_; GtkAboutDialog* _tmp74_; - GtkAboutDialog* _tmp75_; #line 31 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" g_return_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self)); #line 32 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -349,7 +415,7 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi ids = (_vala_array_free (ids, ids_length1, (GDestroyNotify) g_free), NULL); #line 34 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" return; -#line 353 "ManifestWidget.c" +#line 419 "ManifestWidget.c" } #line 36 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp4_ = ids; @@ -369,7 +435,7 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi _tmp8_ = plugins_get_pluggable_info (_tmp7_, &info); #line 39 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (!_tmp8_) { -#line 373 "ManifestWidget.c" +#line 439 "ManifestWidget.c" const gchar* _tmp9_; #line 40 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp9_ = id; @@ -383,7 +449,7 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi ids = (_vala_array_free (ids, ids_length1, (GDestroyNotify) g_free), NULL); #line 42 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" return; -#line 387 "ManifestWidget.c" +#line 453 "ManifestWidget.c" } #line 47 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" authors = NULL; @@ -397,7 +463,7 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi _tmp11_ = _tmp10_.authors; #line 48 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (_tmp11_ != NULL) { -#line 401 "ManifestWidget.c" +#line 467 "ManifestWidget.c" gchar** split = NULL; SpitPluggableInfo _tmp12_; const gchar* _tmp13_; @@ -417,19 +483,19 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi split_length1 = _vala_array_length (_tmp14_); #line 49 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _split_size_ = split_length1; -#line 421 "ManifestWidget.c" +#line 487 "ManifestWidget.c" { gint ctr = 0; #line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" ctr = 0; -#line 426 "ManifestWidget.c" +#line 492 "ManifestWidget.c" { gboolean _tmp16_ = FALSE; #line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp16_ = TRUE; #line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" while (TRUE) { -#line 433 "ManifestWidget.c" +#line 499 "ManifestWidget.c" gint _tmp18_; gchar** _tmp19_; gint _tmp19__length1; @@ -440,16 +506,15 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi const gchar* _tmp22_; gchar* _tmp23_; const gchar* _tmp24_; - gboolean _tmp25_; #line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (!_tmp16_) { -#line 447 "ManifestWidget.c" +#line 512 "ManifestWidget.c" gint _tmp17_; #line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp17_ = ctr; #line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" ctr = _tmp17_ + 1; -#line 453 "ManifestWidget.c" +#line 518 "ManifestWidget.c" } #line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp16_ = FALSE; @@ -463,7 +528,7 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi if (!(_tmp18_ < _tmp19__length1)) { #line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" break; -#line 467 "ManifestWidget.c" +#line 532 "ManifestWidget.c" } #line 51 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp20_ = split; @@ -480,221 +545,219 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi #line 52 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp24_ = stripped; #line 52 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp25_ = is_string_empty (_tmp24_); -#line 52 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - if (!_tmp25_) { -#line 487 "ManifestWidget.c" - gchar** _tmp26_; - gint _tmp26__length1; - gchar** _tmp28_; - gint _tmp28__length1; - const gchar* _tmp29_; - gchar* _tmp30_; + if (!is_string_empty (_tmp24_)) { +#line 550 "ManifestWidget.c" + gchar** _tmp25_; + gint _tmp25__length1; + gchar** _tmp27_; + gint _tmp27__length1; + const gchar* _tmp28_; + gchar* _tmp29_; #line 53 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp26_ = authors; + _tmp25_ = authors; #line 53 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp26__length1 = authors_length1; + _tmp25__length1 = authors_length1; #line 53 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - if (_tmp26_ == NULL) { -#line 500 "ManifestWidget.c" - gchar** _tmp27_; + if (_tmp25_ == NULL) { +#line 563 "ManifestWidget.c" + gchar** _tmp26_; #line 54 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp27_ = g_new0 (gchar*, 0 + 1); + _tmp26_ = g_new0 (gchar*, 0 + 1); #line 54 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" authors = (_vala_array_free (authors, authors_length1, (GDestroyNotify) g_free), NULL); #line 54 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - authors = _tmp27_; + authors = _tmp26_; #line 54 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" authors_length1 = 0; #line 54 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _authors_size_ = authors_length1; -#line 512 "ManifestWidget.c" +#line 575 "ManifestWidget.c" } #line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp28_ = authors; + _tmp27_ = authors; #line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp28__length1 = authors_length1; + _tmp27__length1 = authors_length1; #line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp29_ = stripped; + _tmp28_ = stripped; #line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp30_ = g_strdup (_tmp29_); + _tmp29_ = g_strdup (_tmp28_); #line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _vala_array_add52 (&authors, &authors_length1, &_authors_size_, _tmp30_); -#line 524 "ManifestWidget.c" + _vala_array_add52 (&authors, &authors_length1, &_authors_size_, _tmp29_); +#line 587 "ManifestWidget.c" } #line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _g_free0 (stripped); -#line 528 "ManifestWidget.c" +#line 591 "ManifestWidget.c" } } } #line 48 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL); -#line 534 "ManifestWidget.c" +#line 597 "ManifestWidget.c" } #line 61 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp31_ = (GtkAboutDialog*) gtk_about_dialog_new (); + _tmp30_ = (GtkAboutDialog*) gtk_about_dialog_new (); #line 61 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - g_object_ref_sink (_tmp31_); + g_object_ref_sink (_tmp30_); #line 61 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - about_dialog = _tmp31_; + about_dialog = _tmp30_; #line 62 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp32_ = about_dialog; + _tmp31_ = about_dialog; #line 62 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp33_ = authors; + _tmp32_ = authors; #line 62 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp33__length1 = authors_length1; + _tmp32__length1 = authors_length1; #line 62 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_about_dialog_set_authors (_tmp32_, _tmp33_); + gtk_about_dialog_set_authors (_tmp31_, _tmp32_); #line 63 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp34_ = about_dialog; + _tmp33_ = about_dialog; #line 63 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp35_ = info; + _tmp34_ = info; #line 63 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp36_ = _tmp35_.brief_description; + _tmp35_ = _tmp34_.brief_description; #line 63 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_about_dialog_set_comments (_tmp34_, _tmp36_); + gtk_about_dialog_set_comments (_tmp33_, _tmp35_); #line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp37_ = about_dialog; + _tmp36_ = about_dialog; #line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp38_ = info; + _tmp37_ = info; #line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp39_ = _tmp38_.copyright; + _tmp38_ = _tmp37_.copyright; #line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_about_dialog_set_copyright (_tmp37_, _tmp39_); + gtk_about_dialog_set_copyright (_tmp36_, _tmp38_); #line 65 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp40_ = about_dialog; + _tmp39_ = about_dialog; #line 65 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp41_ = info; + _tmp40_ = info; #line 65 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp42_ = _tmp41_.license; + _tmp41_ = _tmp40_.license; #line 65 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_about_dialog_set_license (_tmp40_, _tmp42_); + gtk_about_dialog_set_license (_tmp39_, _tmp41_); #line 66 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp43_ = about_dialog; + _tmp42_ = about_dialog; #line 66 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp44_ = info; + _tmp43_ = info; #line 66 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp45_ = _tmp44_.is_license_wordwrapped; + _tmp44_ = _tmp43_.is_license_wordwrapped; #line 66 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_about_dialog_set_wrap_license (_tmp43_, _tmp45_); + gtk_about_dialog_set_wrap_license (_tmp42_, _tmp44_); #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp48_ = info; + _tmp47_ = info; #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp49_ = _tmp48_.icons; + _tmp48_ = _tmp47_.icons; #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp49__length1 = _tmp48_.icons_length1; + _tmp48__length1 = _tmp47_.icons_length1; #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - if (_tmp49_ != NULL) { -#line 590 "ManifestWidget.c" - SpitPluggableInfo _tmp50_; - GdkPixbuf** _tmp51_; - gint _tmp51__length1; + if (_tmp48_ != NULL) { +#line 653 "ManifestWidget.c" + SpitPluggableInfo _tmp49_; + GdkPixbuf** _tmp50_; + gint _tmp50__length1; #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp50_ = info; + _tmp49_ = info; #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp51_ = _tmp50_.icons; + _tmp50_ = _tmp49_.icons; #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp51__length1 = _tmp50_.icons_length1; + _tmp50__length1 = _tmp49_.icons_length1; #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp47_ = _tmp51__length1 > 0; -#line 602 "ManifestWidget.c" + _tmp46_ = _tmp50__length1 > 0; +#line 665 "ManifestWidget.c" } else { #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp47_ = FALSE; -#line 606 "ManifestWidget.c" + _tmp46_ = FALSE; +#line 669 "ManifestWidget.c" } #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - if (_tmp47_) { -#line 610 "ManifestWidget.c" - SpitPluggableInfo _tmp52_; - GdkPixbuf** _tmp53_; - gint _tmp53__length1; + if (_tmp46_) { +#line 673 "ManifestWidget.c" + SpitPluggableInfo _tmp51_; + GdkPixbuf** _tmp52_; + gint _tmp52__length1; + GdkPixbuf* _tmp53_; GdkPixbuf* _tmp54_; - GdkPixbuf* _tmp55_; #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp52_ = info; + _tmp51_ = info; #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp53_ = _tmp52_.icons; + _tmp52_ = _tmp51_.icons; #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp53__length1 = _tmp52_.icons_length1; + _tmp52__length1 = _tmp51_.icons_length1; #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp54_ = _tmp53_[0]; + _tmp53_ = _tmp52_[0]; #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp55_ = _g_object_ref0 (_tmp54_); + _tmp54_ = _g_object_ref0 (_tmp53_); #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _g_object_unref0 (_tmp46_); + _g_object_unref0 (_tmp45_); #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp46_ = _tmp55_; -#line 630 "ManifestWidget.c" + _tmp45_ = _tmp54_; +#line 693 "ManifestWidget.c" } else { - GdkPixbuf* _tmp56_; + GdkPixbuf* _tmp55_; #line 68 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp56_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE); + _tmp55_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE); #line 68 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _g_object_unref0 (_tmp46_); + _g_object_unref0 (_tmp45_); #line 68 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp46_ = _tmp56_; -#line 639 "ManifestWidget.c" + _tmp45_ = _tmp55_; +#line 702 "ManifestWidget.c" } #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp57_ = about_dialog; + _tmp56_ = about_dialog; #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_about_dialog_set_logo (_tmp57_, _tmp46_); + gtk_about_dialog_set_logo (_tmp56_, _tmp45_); #line 69 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp58_ = about_dialog; + _tmp57_ = about_dialog; #line 69 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp59_ = id; + _tmp58_ = id; #line 69 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp60_ = plugins_get_pluggable_name (_tmp59_); + _tmp59_ = plugins_get_pluggable_name (_tmp58_); #line 69 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp61_ = _tmp60_; + _tmp60_ = _tmp59_; #line 69 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_about_dialog_set_program_name (_tmp58_, _tmp61_); + gtk_about_dialog_set_program_name (_tmp57_, _tmp60_); #line 69 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _g_free0 (_tmp61_); + _g_free0 (_tmp60_); #line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp62_ = about_dialog; + _tmp61_ = about_dialog; #line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp63_ = info; + _tmp62_ = info; #line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp64_ = _tmp63_.translators; + _tmp63_ = _tmp62_.translators; #line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_about_dialog_set_translator_credits (_tmp62_, _tmp64_); + gtk_about_dialog_set_translator_credits (_tmp61_, _tmp63_); #line 71 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp65_ = about_dialog; + _tmp64_ = about_dialog; #line 71 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp66_ = info; + _tmp65_ = info; #line 71 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp67_ = _tmp66_.version; + _tmp66_ = _tmp65_.version; #line 71 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_about_dialog_set_version (_tmp65_, _tmp67_); + gtk_about_dialog_set_version (_tmp64_, _tmp66_); #line 72 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp68_ = about_dialog; + _tmp67_ = about_dialog; #line 72 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp69_ = info; + _tmp68_ = info; #line 72 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp70_ = _tmp69_.website_url; + _tmp69_ = _tmp68_.website_url; #line 72 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_about_dialog_set_website (_tmp68_, _tmp70_); + gtk_about_dialog_set_website (_tmp67_, _tmp69_); #line 73 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp71_ = about_dialog; + _tmp70_ = about_dialog; #line 73 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp72_ = info; + _tmp71_ = info; #line 73 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp73_ = _tmp72_.website_name; + _tmp72_ = _tmp71_.website_name; #line 73 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_about_dialog_set_website_label (_tmp71_, _tmp73_); + gtk_about_dialog_set_website_label (_tmp70_, _tmp72_); #line 75 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp74_ = about_dialog; + _tmp73_ = about_dialog; #line 75 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_dialog_get_type (), GtkDialog)); + gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_dialog_get_type (), GtkDialog)); #line 77 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp75_ = about_dialog; + _tmp74_ = about_dialog; #line 77 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget)); #line 31 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _g_object_unref0 (_tmp46_); + _g_object_unref0 (_tmp45_); #line 31 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _g_object_unref0 (about_dialog); #line 31 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -705,20 +768,24 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi _g_free0 (id); #line 31 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" ids = (_vala_array_free (ids, ids_length1, (GDestroyNotify) g_free), NULL); -#line 709 "ManifestWidget.c" +#line 772 "ManifestWidget.c" } -static void plugins_manifest_widget_mediator_on_selection_changed (PluginsManifestWidgetMediator* self) { +static void +plugins_manifest_widget_mediator_on_selection_changed (PluginsManifestWidgetMediator* self) +{ #line 80 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" g_return_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self)); #line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" plugins_manifest_widget_mediator_set_about_button_sensitivity (self); -#line 718 "ManifestWidget.c" +#line 783 "ManifestWidget.c" } -static void plugins_manifest_widget_mediator_set_about_button_sensitivity (PluginsManifestWidgetMediator* self) { +static void +plugins_manifest_widget_mediator_set_about_button_sensitivity (PluginsManifestWidgetMediator* self) +{ gchar** ids = NULL; PluginsManifestListView* _tmp0_; gint _tmp1_; @@ -744,11 +811,13 @@ static void plugins_manifest_widget_mediator_set_about_button_sensitivity (Plugi gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), ids_length1 == 1); #line 84 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" ids = (_vala_array_free (ids, ids_length1, (GDestroyNotify) g_free), NULL); -#line 748 "ManifestWidget.c" +#line 815 "ManifestWidget.c" } -static void plugins_manifest_widget_mediator_class_init (PluginsManifestWidgetMediatorClass * klass) { +static void +plugins_manifest_widget_mediator_class_init (PluginsManifestWidgetMediatorClass * klass) +{ gint PluginsManifestWidgetMediator_private_offset; #line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" plugins_manifest_widget_mediator_parent_class = g_type_class_peek_parent (klass); @@ -764,11 +833,13 @@ static void plugins_manifest_widget_mediator_class_init (PluginsManifestWidgetMe gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "about_button", FALSE, PluginsManifestWidgetMediator_private_offset + G_STRUCT_OFFSET (PluginsManifestWidgetMediatorPrivate, about_button)); #line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "list_bin", FALSE, PluginsManifestWidgetMediator_private_offset + G_STRUCT_OFFSET (PluginsManifestWidgetMediatorPrivate, list_bin)); -#line 768 "ManifestWidget.c" +#line 837 "ManifestWidget.c" } -static void plugins_manifest_widget_mediator_instance_init (PluginsManifestWidgetMediator * self) { +static void +plugins_manifest_widget_mediator_instance_init (PluginsManifestWidgetMediator * self) +{ PluginsManifestListView* _tmp0_; #line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" self->priv = PLUGINS_MANIFEST_WIDGET_MEDIATOR_GET_PRIVATE (self); @@ -780,11 +851,13 @@ static void plugins_manifest_widget_mediator_instance_init (PluginsManifestWidge self->priv->list = _tmp0_; #line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 784 "ManifestWidget.c" +#line 855 "ManifestWidget.c" } -static void plugins_manifest_widget_mediator_finalize (GObject * obj) { +static void +plugins_manifest_widget_mediator_finalize (GObject * obj) +{ PluginsManifestWidgetMediator * self; #line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR, PluginsManifestWidgetMediator); @@ -796,11 +869,13 @@ static void plugins_manifest_widget_mediator_finalize (GObject * obj) { _g_object_unref0 (self->priv->list); #line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" G_OBJECT_CLASS (plugins_manifest_widget_mediator_parent_class)->finalize (obj); -#line 800 "ManifestWidget.c" +#line 873 "ManifestWidget.c" } -GType plugins_manifest_widget_mediator_get_type (void) { +GType +plugins_manifest_widget_mediator_get_type (void) +{ static volatile gsize plugins_manifest_widget_mediator_type_id__volatile = 0; if (g_once_init_enter (&plugins_manifest_widget_mediator_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PluginsManifestWidgetMediatorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) plugins_manifest_widget_mediator_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PluginsManifestWidgetMediator), 0, (GInstanceInitFunc) plugins_manifest_widget_mediator_instance_init, NULL }; @@ -812,7 +887,9 @@ GType plugins_manifest_widget_mediator_get_type (void) { } -static GType plugins_manifest_list_view_column_get_type (void) { +static GType +plugins_manifest_list_view_column_get_type (void) +{ static volatile gsize plugins_manifest_list_view_column_type_id__volatile = 0; if (g_once_init_enter (&plugins_manifest_list_view_column_type_id__volatile)) { static const GEnumValue values[] = {{PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ENABLED, "PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ENABLED", "enabled"}, {PLUGINS_MANIFEST_LIST_VIEW_COLUMN_CAN_ENABLE, "PLUGINS_MANIFEST_LIST_VIEW_COLUMN_CAN_ENABLE", "can-enable"}, {PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ICON, "PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ICON", "icon"}, {PLUGINS_MANIFEST_LIST_VIEW_COLUMN_NAME, "PLUGINS_MANIFEST_LIST_VIEW_COLUMN_NAME", "name"}, {PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ID, "PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ID", "id"}, {PLUGINS_MANIFEST_LIST_VIEW_COLUMN_N_COLUMNS, "PLUGINS_MANIFEST_LIST_VIEW_COLUMN_N_COLUMNS", "n-columns"}, {0, NULL, NULL}}; @@ -824,25 +901,35 @@ static GType plugins_manifest_list_view_column_get_type (void) { } -static gint _plugins_compare_extension_point_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gint +_plugins_compare_extension_point_names_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gint result; result = plugins_compare_extension_point_names (a, b); #line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" return result; -#line 833 "ManifestWidget.c" +#line 914 "ManifestWidget.c" } -static gint _plugins_compare_pluggable_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gint +_plugins_compare_pluggable_names_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gint result; result = plugins_compare_pluggable_names (a, b); #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" return result; -#line 842 "ManifestWidget.c" +#line 927 "ManifestWidget.c" } -PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type) { +PluginsManifestListView* +plugins_manifest_list_view_construct (GType object_type) +{ PluginsManifestListView * self = NULL; GtkTreeStore* _tmp0_; GtkCellRendererToggle* checkbox_renderer = NULL; @@ -883,7 +970,7 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type #line 117 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp0_ = self->priv->store; #line 117 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_tree_view_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel)); + gtk_tree_view_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_tree_model_get_type (), GtkTreeModel)); #line 119 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp1_ = (GtkCellRendererToggle*) gtk_cell_renderer_toggle_new (); #line 119 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -937,43 +1024,43 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type #line 132 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp12_ = checkbox_renderer; #line 132 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE); + gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE); #line 133 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp13_ = column; #line 133 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp14_ = icon_renderer; #line 133 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE); + gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE); #line 134 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp15_ = column; #line 134 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp16_ = text_renderer; #line 134 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_cell_layout_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); + gtk_cell_layout_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); #line 136 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp17_ = column; #line 136 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp18_ = checkbox_renderer; #line 136 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_cell_renderer_get_type (), GtkCellRenderer), "active", (gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ENABLED); + gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_cell_renderer_get_type (), GtkCellRenderer), "active", (gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ENABLED); #line 137 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp19_ = column; #line 137 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp20_ = checkbox_renderer; #line 137 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_cell_renderer_get_type (), GtkCellRenderer), "visible", (gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_CAN_ENABLE); + gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_cell_renderer_get_type (), GtkCellRenderer), "visible", (gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_CAN_ENABLE); #line 138 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp21_ = column; #line 138 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp22_ = icon_renderer; #line 138 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", (gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ICON); + gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", (gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ICON); #line 139 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp23_ = column; #line 139 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp24_ = text_renderer; #line 139 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", (gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_NAME); + gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", (gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_NAME); #line 141 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp25_ = column; #line 141 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -998,7 +1085,7 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type _tmp27_ = resources_get_icon_theme_engine (); #line 151 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" icon_theme = _tmp27_; -#line 1002 "ManifestWidget.c" +#line 1089 "ManifestWidget.c" { GeeIterator* _extension_point_it = NULL; GeeCollection* _tmp28_; @@ -1019,154 +1106,151 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type _extension_point_it = _tmp31_; #line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" while (TRUE) { -#line 1023 "ManifestWidget.c" +#line 1110 "ManifestWidget.c" GeeIterator* _tmp32_; - gboolean _tmp33_; PluginsExtensionPoint* extension_point = NULL; - GeeIterator* _tmp34_; - gpointer _tmp35_; + GeeIterator* _tmp33_; + gpointer _tmp34_; GtkTreeIter category_iter = {0}; - GtkTreeStore* _tmp36_; - GtkTreeIter _tmp37_ = {0}; + GtkTreeStore* _tmp35_; + GtkTreeIter _tmp36_ = {0}; GdkPixbuf* icon = NULL; - PluginsExtensionPoint* _tmp38_; + PluginsExtensionPoint* _tmp37_; + const gchar* _tmp38_; const gchar* _tmp39_; - const gchar* _tmp40_; - GtkTreeStore* _tmp59_; - GtkTreeIter _tmp60_; - PluginsExtensionPoint* _tmp61_; + GtkTreeStore* _tmp58_; + GtkTreeIter _tmp59_; + PluginsExtensionPoint* _tmp60_; + const gchar* _tmp61_; const gchar* _tmp62_; - const gchar* _tmp63_; - GdkPixbuf* _tmp64_; + GdkPixbuf* _tmp63_; GeeCollection* pluggables = NULL; - PluginsExtensionPoint* _tmp65_; + PluginsExtensionPoint* _tmp64_; + GType _tmp65_; GType _tmp66_; - GType _tmp67_; - GeeCollection* _tmp68_; + GeeCollection* _tmp67_; #line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp32_ = _extension_point_it; #line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp33_ = gee_iterator_next (_tmp32_); -#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - if (!_tmp33_) { + if (!gee_iterator_next (_tmp32_)) { #line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" break; -#line 1055 "ManifestWidget.c" +#line 1139 "ManifestWidget.c" } #line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp34_ = _extension_point_it; + _tmp33_ = _extension_point_it; #line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp35_ = gee_iterator_get (_tmp34_); + _tmp34_ = gee_iterator_get (_tmp33_); #line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - extension_point = (PluginsExtensionPoint*) _tmp35_; + extension_point = (PluginsExtensionPoint*) _tmp34_; #line 157 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp36_ = self->priv->store; + _tmp35_ = self->priv->store; #line 157 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_tree_store_append (_tmp36_, &_tmp37_, NULL); + gtk_tree_store_append (_tmp35_, &_tmp36_, NULL); #line 157 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - category_iter = _tmp37_; + category_iter = _tmp36_; #line 159 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" icon = NULL; #line 160 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp38_ = extension_point; + _tmp37_ = extension_point; #line 160 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp39_ = plugins_extension_point_get_icon_name (_tmp38_); + _tmp38_ = plugins_extension_point_get_icon_name (_tmp37_); #line 160 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp40_ = _tmp39_; + _tmp39_ = _tmp38_; #line 160 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - if (_tmp40_ != NULL) { -#line 1079 "ManifestWidget.c" + if (_tmp39_ != NULL) { +#line 1163 "ManifestWidget.c" GtkIconInfo* icon_info = NULL; - GtkIconTheme* _tmp41_; - PluginsExtensionPoint* _tmp42_; + GtkIconTheme* _tmp40_; + PluginsExtensionPoint* _tmp41_; + const gchar* _tmp42_; const gchar* _tmp43_; - const gchar* _tmp44_; + GThemedIcon* _tmp44_; GThemedIcon* _tmp45_; - GThemedIcon* _tmp46_; + GtkIconInfo* _tmp46_; GtkIconInfo* _tmp47_; GtkIconInfo* _tmp48_; - GtkIconInfo* _tmp49_; #line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp41_ = icon_theme; + _tmp40_ = icon_theme; #line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp42_ = extension_point; + _tmp41_ = extension_point; #line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp43_ = plugins_extension_point_get_icon_name (_tmp42_); + _tmp42_ = plugins_extension_point_get_icon_name (_tmp41_); #line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp44_ = _tmp43_; + _tmp43_ = _tmp42_; #line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp45_ = (GThemedIcon*) g_themed_icon_new (_tmp44_); + _tmp44_ = (GThemedIcon*) g_themed_icon_new (_tmp43_); #line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp46_ = _tmp45_; + _tmp45_ = _tmp44_; #line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp47_ = gtk_icon_theme_lookup_by_gicon (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, g_icon_get_type (), GIcon), PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE, 0); + _tmp46_ = gtk_icon_theme_lookup_by_gicon (_tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, g_icon_get_type (), GIcon), PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE, 0); #line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp48_ = _tmp47_; + _tmp47_ = _tmp46_; #line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _g_object_unref0 (_tmp46_); + _g_object_unref0 (_tmp45_); #line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - icon_info = _tmp48_; + icon_info = _tmp47_; #line 163 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp49_ = icon_info; + _tmp48_ = icon_info; #line 163 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - if (_tmp49_ != NULL) { -#line 1114 "ManifestWidget.c" + if (_tmp48_ != NULL) { +#line 1198 "ManifestWidget.c" { - GdkPixbuf* _tmp50_ = NULL; - GtkIconInfo* _tmp51_; + GdkPixbuf* _tmp49_ = NULL; + GtkIconInfo* _tmp50_; + GdkPixbuf* _tmp51_; GdkPixbuf* _tmp52_; - GdkPixbuf* _tmp53_; #line 165 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp51_ = icon_info; + _tmp50_ = icon_info; #line 165 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp52_ = gtk_icon_info_load_icon (_tmp51_, &_inner_error_); + _tmp51_ = gtk_icon_info_load_icon (_tmp50_, &_inner_error_); #line 165 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp50_ = _tmp52_; + _tmp49_ = _tmp51_; #line 165 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1128 "ManifestWidget.c" +#line 1212 "ManifestWidget.c" goto __catch41_g_error; } #line 165 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp53_ = _tmp50_; + _tmp52_ = _tmp49_; #line 165 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp50_ = NULL; + _tmp49_ = NULL; #line 165 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _g_object_unref0 (icon); #line 165 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - icon = _tmp53_; + icon = _tmp52_; #line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _g_object_unref0 (_tmp50_); -#line 1141 "ManifestWidget.c" + _g_object_unref0 (_tmp49_); +#line 1225 "ManifestWidget.c" } goto __finally41; __catch41_g_error: { GError* err = NULL; - PluginsExtensionPoint* _tmp54_; + PluginsExtensionPoint* _tmp53_; + const gchar* _tmp54_; const gchar* _tmp55_; - const gchar* _tmp56_; - GError* _tmp57_; - const gchar* _tmp58_; + GError* _tmp56_; + const gchar* _tmp57_; #line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" err = _inner_error_; #line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _inner_error_ = NULL; #line 167 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp54_ = extension_point; + _tmp53_ = extension_point; #line 167 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp55_ = plugins_extension_point_get_icon_name (_tmp54_); + _tmp54_ = plugins_extension_point_get_icon_name (_tmp53_); #line 167 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp56_ = _tmp55_; + _tmp55_ = _tmp54_; #line 167 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp57_ = err; + _tmp56_ = err; #line 167 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp58_ = _tmp57_->message; + _tmp57_ = _tmp56_->message; #line 167 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - g_warning ("ManifestWidget.vala:167: Unable to load icon %s: %s", _tmp56_, _tmp58_); + g_warning ("ManifestWidget.vala:167: Unable to load icon %s: %s", _tmp55_, _tmp57_); #line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _g_error_free0 (err); -#line 1170 "ManifestWidget.c" +#line 1254 "ManifestWidget.c" } __finally41: #line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1195,221 +1279,218 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type g_clear_error (&_inner_error_); #line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" return NULL; -#line 1199 "ManifestWidget.c" +#line 1283 "ManifestWidget.c" } } #line 160 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _gtk_icon_info_free0 (icon_info); -#line 1204 "ManifestWidget.c" +#line 1288 "ManifestWidget.c" } #line 172 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp59_ = self->priv->store; + _tmp58_ = self->priv->store; #line 172 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp60_ = category_iter; + _tmp59_ = category_iter; #line 172 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp61_ = extension_point; + _tmp60_ = extension_point; #line 172 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp62_ = plugins_extension_point_get_name (_tmp61_); + _tmp61_ = plugins_extension_point_get_name (_tmp60_); #line 172 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp63_ = _tmp62_; + _tmp62_ = _tmp61_; #line 172 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp64_ = icon; + _tmp63_ = icon; #line 172 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_tree_store_set (_tmp59_, &_tmp60_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_NAME, _tmp63_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_CAN_ENABLE, FALSE, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ICON, _tmp64_, -1); + gtk_tree_store_set (_tmp58_, &_tmp59_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_NAME, _tmp62_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_CAN_ENABLE, FALSE, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ICON, _tmp63_, -1); #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp65_ = extension_point; + _tmp64_ = extension_point; #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp66_ = plugins_extension_point_get_pluggable_type (_tmp65_); + _tmp65_ = plugins_extension_point_get_pluggable_type (_tmp64_); #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp67_ = _tmp66_; + _tmp66_ = _tmp65_; #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp68_ = plugins_get_pluggables_for_type (_tmp67_, _plugins_compare_pluggable_names_gcompare_data_func, NULL, NULL, TRUE); + _tmp67_ = plugins_get_pluggables_for_type (_tmp66_, _plugins_compare_pluggable_names_gcompare_data_func, NULL, NULL, TRUE); #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - pluggables = _tmp68_; -#line 1230 "ManifestWidget.c" + pluggables = _tmp67_; +#line 1314 "ManifestWidget.c" { GeeIterator* _pluggable_it = NULL; - GeeCollection* _tmp69_; - GeeIterator* _tmp70_; + GeeCollection* _tmp68_; + GeeIterator* _tmp69_; #line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp69_ = pluggables; + _tmp68_ = pluggables; #line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp70_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp69_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_ITERABLE, GeeIterable)); #line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _pluggable_it = _tmp70_; + _pluggable_it = _tmp69_; #line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" while (TRUE) { -#line 1243 "ManifestWidget.c" - GeeIterator* _tmp71_; - gboolean _tmp72_; +#line 1327 "ManifestWidget.c" + GeeIterator* _tmp70_; SpitPluggable* pluggable = NULL; - GeeIterator* _tmp73_; - gpointer _tmp74_; + GeeIterator* _tmp71_; + gpointer _tmp72_; gboolean enabled = FALSE; - SpitPluggable* _tmp75_; - const gchar* _tmp76_; - gboolean _tmp77_ = FALSE; - gboolean _tmp78_; + SpitPluggable* _tmp73_; + const gchar* _tmp74_; + gboolean _tmp75_ = FALSE; + gboolean _tmp76_; SpitPluggableInfo info = {0}; - SpitPluggable* _tmp79_; - GdkPixbuf* _tmp80_ = NULL; - gboolean _tmp81_ = FALSE; - SpitPluggableInfo _tmp82_; - GdkPixbuf** _tmp83_; - gint _tmp83__length1; - GdkPixbuf* _tmp91_; + SpitPluggable* _tmp77_; + GdkPixbuf* _tmp78_ = NULL; + gboolean _tmp79_ = FALSE; + SpitPluggableInfo _tmp80_; + GdkPixbuf** _tmp81_; + gint _tmp81__length1; + GdkPixbuf* _tmp89_; GtkTreeIter plugin_iter = {0}; - GtkTreeStore* _tmp92_; - GtkTreeIter _tmp93_; - GtkTreeIter _tmp94_ = {0}; - GtkTreeStore* _tmp95_; - GtkTreeIter _tmp96_; - gboolean _tmp97_; + GtkTreeStore* _tmp90_; + GtkTreeIter _tmp91_; + GtkTreeIter _tmp92_ = {0}; + GtkTreeStore* _tmp93_; + GtkTreeIter _tmp94_; + gboolean _tmp95_; + SpitPluggable* _tmp96_; + const gchar* _tmp97_; SpitPluggable* _tmp98_; const gchar* _tmp99_; - SpitPluggable* _tmp100_; - const gchar* _tmp101_; - GdkPixbuf* _tmp102_; + GdkPixbuf* _tmp100_; #line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp71_ = _pluggable_it; -#line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp72_ = gee_iterator_next (_tmp71_); + _tmp70_ = _pluggable_it; #line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - if (!_tmp72_) { + if (!gee_iterator_next (_tmp70_)) { #line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" break; -#line 1282 "ManifestWidget.c" +#line 1363 "ManifestWidget.c" } #line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp73_ = _pluggable_it; + _tmp71_ = _pluggable_it; #line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp74_ = gee_iterator_get (_tmp73_); + _tmp72_ = gee_iterator_get (_tmp71_); #line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - pluggable = (SpitPluggable*) _tmp74_; + pluggable = (SpitPluggable*) _tmp72_; #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp75_ = pluggable; + _tmp73_ = pluggable; #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp76_ = spit_pluggable_get_id (_tmp75_); + _tmp74_ = spit_pluggable_get_id (_tmp73_); #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp78_ = plugins_get_pluggable_enabled (_tmp76_, &_tmp77_); + _tmp76_ = plugins_get_pluggable_enabled (_tmp74_, &_tmp75_); #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - enabled = _tmp77_; + enabled = _tmp75_; #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - if (!_tmp78_) { + if (!_tmp76_) { #line 180 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _g_object_unref0 (pluggable); #line 180 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" continue; -#line 1304 "ManifestWidget.c" +#line 1385 "ManifestWidget.c" } #line 182 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" memset (&info, 0, sizeof (SpitPluggableInfo)); #line 183 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp79_ = pluggable; + _tmp77_ = pluggable; #line 183 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - spit_pluggable_get_info (_tmp79_, &info); + spit_pluggable_get_info (_tmp77_, &info); #line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp82_ = info; + _tmp80_ = info; #line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp83_ = _tmp82_.icons; + _tmp81_ = _tmp80_.icons; #line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp83__length1 = _tmp82_.icons_length1; + _tmp81__length1 = _tmp80_.icons_length1; #line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - if (_tmp83_ != NULL) { -#line 1320 "ManifestWidget.c" - SpitPluggableInfo _tmp84_; - GdkPixbuf** _tmp85_; - gint _tmp85__length1; + if (_tmp81_ != NULL) { +#line 1401 "ManifestWidget.c" + SpitPluggableInfo _tmp82_; + GdkPixbuf** _tmp83_; + gint _tmp83__length1; #line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp84_ = info; + _tmp82_ = info; #line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp85_ = _tmp84_.icons; + _tmp83_ = _tmp82_.icons; #line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp85__length1 = _tmp84_.icons_length1; + _tmp83__length1 = _tmp82_.icons_length1; #line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp81_ = _tmp85__length1 > 0; -#line 1332 "ManifestWidget.c" + _tmp79_ = _tmp83__length1 > 0; +#line 1413 "ManifestWidget.c" } else { #line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp81_ = FALSE; -#line 1336 "ManifestWidget.c" + _tmp79_ = FALSE; +#line 1417 "ManifestWidget.c" } #line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - if (_tmp81_) { -#line 1340 "ManifestWidget.c" - SpitPluggableInfo _tmp86_; - GdkPixbuf** _tmp87_; - gint _tmp87__length1; - GdkPixbuf* _tmp88_; - GdkPixbuf* _tmp89_; + if (_tmp79_) { +#line 1421 "ManifestWidget.c" + SpitPluggableInfo _tmp84_; + GdkPixbuf** _tmp85_; + gint _tmp85__length1; + GdkPixbuf* _tmp86_; + GdkPixbuf* _tmp87_; #line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp86_ = info; + _tmp84_ = info; #line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp87_ = _tmp86_.icons; + _tmp85_ = _tmp84_.icons; #line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp87__length1 = _tmp86_.icons_length1; + _tmp85__length1 = _tmp84_.icons_length1; #line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp88_ = _tmp87_[0]; + _tmp86_ = _tmp85_[0]; #line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp89_ = _g_object_ref0 (_tmp88_); + _tmp87_ = _g_object_ref0 (_tmp86_); #line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _g_object_unref0 (_tmp80_); + _g_object_unref0 (_tmp78_); #line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp80_ = _tmp89_; -#line 1360 "ManifestWidget.c" + _tmp78_ = _tmp87_; +#line 1441 "ManifestWidget.c" } else { - GdkPixbuf* _tmp90_; + GdkPixbuf* _tmp88_; #line 187 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp90_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE); + _tmp88_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE); #line 187 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _g_object_unref0 (_tmp80_); + _g_object_unref0 (_tmp78_); #line 187 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp80_ = _tmp90_; -#line 1369 "ManifestWidget.c" + _tmp78_ = _tmp88_; +#line 1450 "ManifestWidget.c" } #line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp91_ = _g_object_ref0 (_tmp80_); + _tmp89_ = _g_object_ref0 (_tmp78_); #line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _g_object_unref0 (icon); #line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - icon = _tmp91_; + icon = _tmp89_; #line 190 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp92_ = self->priv->store; + _tmp90_ = self->priv->store; #line 190 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp93_ = category_iter; + _tmp91_ = category_iter; #line 190 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_tree_store_append (_tmp92_, &_tmp94_, &_tmp93_); + gtk_tree_store_append (_tmp90_, &_tmp92_, &_tmp91_); #line 190 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - plugin_iter = _tmp94_; + plugin_iter = _tmp92_; #line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp95_ = self->priv->store; + _tmp93_ = self->priv->store; #line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp96_ = plugin_iter; + _tmp94_ = plugin_iter; #line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp97_ = enabled; + _tmp95_ = enabled; #line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp98_ = pluggable; + _tmp96_ = pluggable; #line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp99_ = spit_pluggable_get_pluggable_name (_tmp98_); + _tmp97_ = spit_pluggable_get_pluggable_name (_tmp96_); #line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp100_ = pluggable; + _tmp98_ = pluggable; #line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp101_ = spit_pluggable_get_id (_tmp100_); + _tmp99_ = spit_pluggable_get_id (_tmp98_); #line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp102_ = icon; + _tmp100_ = icon; #line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_tree_store_set (_tmp95_, &_tmp96_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ENABLED, _tmp97_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_NAME, _tmp99_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ID, _tmp101_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_CAN_ENABLE, TRUE, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ICON, _tmp102_, -1); + gtk_tree_store_set (_tmp93_, &_tmp94_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ENABLED, _tmp95_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_NAME, _tmp97_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ID, _tmp99_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_CAN_ENABLE, TRUE, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ICON, _tmp100_, -1); #line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _g_object_unref0 (_tmp80_); + _g_object_unref0 (_tmp78_); #line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" spit_pluggable_info_destroy (&info); #line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _g_object_unref0 (pluggable); -#line 1409 "ManifestWidget.c" +#line 1490 "ManifestWidget.c" } #line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _g_object_unref0 (_pluggable_it); -#line 1413 "ManifestWidget.c" +#line 1494 "ManifestWidget.c" } #line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _g_object_unref0 (pluggables); @@ -1417,11 +1498,11 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type _g_object_unref0 (icon); #line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _plugins_extension_point_unref0 (extension_point); -#line 1421 "ManifestWidget.c" +#line 1502 "ManifestWidget.c" } #line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _g_object_unref0 (_extension_point_it); -#line 1425 "ManifestWidget.c" +#line 1506 "ManifestWidget.c" } #line 197 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" gtk_tree_view_expand_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView)); @@ -1437,58 +1518,90 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type _g_object_unref0 (checkbox_renderer); #line 116 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" return self; -#line 1441 "ManifestWidget.c" +#line 1522 "ManifestWidget.c" } -PluginsManifestListView* plugins_manifest_list_view_new (void) { +PluginsManifestListView* +plugins_manifest_list_view_new (void) +{ #line 116 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" return plugins_manifest_list_view_construct (PLUGINS_TYPE_MANIFEST_LIST_VIEW); -#line 1448 "ManifestWidget.c" +#line 1531 "ManifestWidget.c" } -static gpointer _gtk_tree_path_copy0 (gpointer self) { +static GtkTreePath* +_vala_GtkTreePath_copy (GtkTreePath* self) +{ #line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - return self ? gtk_tree_path_copy (self) : NULL; -#line 1455 "ManifestWidget.c" + return g_boxed_copy (gtk_tree_path_get_type (), self); +#line 1540 "ManifestWidget.c" } -static void _vala_array_add53 (gchar** * array, int* length, int* size, gchar* value) { +static gpointer +__vala_GtkTreePath_copy0 (gpointer self) +{ +#line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" + return self ? _vala_GtkTreePath_copy (self) : NULL; +#line 1549 "ManifestWidget.c" +} + + +static void +_vala_array_add53 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 208 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if ((*length) == (*size)) { #line 208 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" *size = (*size) ? (2 * (*size)) : 4; #line 208 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 1466 "ManifestWidget.c" +#line 1565 "ManifestWidget.c" } #line 208 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" (*array)[(*length)++] = value; #line 208 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" (*array)[*length] = NULL; -#line 1472 "ManifestWidget.c" +#line 1571 "ManifestWidget.c" } -static void _gtk_tree_path_free0_ (gpointer var) { -#line 211 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - (var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL)); -#line 1479 "ManifestWidget.c" +static void +_vala_GtkTreePath_free (GtkTreePath* self) +{ +#line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" + g_boxed_free (gtk_tree_path_get_type (), self); +#line 1580 "ManifestWidget.c" } -static void _g_list_free__gtk_tree_path_free0_ (GList* self) { +static void +__vala_GtkTreePath_free0_ (gpointer var) +{ #line 211 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - g_list_foreach (self, (GFunc) _gtk_tree_path_free0_, NULL); + (var == NULL) ? NULL : (var = (_vala_GtkTreePath_free (var), NULL)); +#line 1589 "ManifestWidget.c" +} + + +static inline void +_g_list_free___vala_GtkTreePath_free0_ (GList* self) +{ #line 211 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - g_list_free (self); -#line 1488 "ManifestWidget.c" + g_list_free_full (self, (GDestroyNotify) __vala_GtkTreePath_free0_); +#line 1598 "ManifestWidget.c" } -gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* self, int* result_length1) { +gchar** +plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* self, + int* result_length1) +{ gchar** result = NULL; gchar** ids = NULL; gchar** _tmp0_; @@ -1518,7 +1631,7 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se selected = _tmp2_; #line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp3_ = selected; -#line 1522 "ManifestWidget.c" +#line 1635 "ManifestWidget.c" { GList* path_collection = NULL; GList* path_it = NULL; @@ -1526,14 +1639,14 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se path_collection = _tmp3_; #line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" for (path_it = path_collection; path_it != NULL; path_it = path_it->next) { -#line 1530 "ManifestWidget.c" +#line 1643 "ManifestWidget.c" GtkTreePath* _tmp4_; GtkTreePath* path = NULL; #line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp4_ = _gtk_tree_path_copy0 ((GtkTreePath*) path_it->data); + _tmp4_ = __vala_GtkTreePath_copy0 ((GtkTreePath*) path_it->data); #line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" path = _tmp4_; -#line 1537 "ManifestWidget.c" +#line 1650 "ManifestWidget.c" { GtkTreeIter iter = {0}; gchar* id = NULL; @@ -1553,7 +1666,7 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se _tmp8_ = id; #line 207 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (_tmp8_ != NULL) { -#line 1557 "ManifestWidget.c" +#line 1670 "ManifestWidget.c" gchar** _tmp9_; gint _tmp9__length1; const gchar* _tmp10_; @@ -1568,13 +1681,13 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se _tmp11_ = g_strdup (_tmp10_); #line 208 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _vala_array_add53 (&ids, &ids_length1, &_ids_size_, _tmp11_); -#line 1572 "ManifestWidget.c" +#line 1685 "ManifestWidget.c" } #line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _g_free0 (id); #line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _gtk_tree_path_free0 (path); -#line 1578 "ManifestWidget.c" + __vala_GtkTreePath_free0 (path); +#line 1691 "ManifestWidget.c" } } } @@ -1586,30 +1699,33 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se if (result_length1) { #line 211 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" *result_length1 = _tmp12__length1; -#line 1590 "ManifestWidget.c" +#line 1703 "ManifestWidget.c" } #line 211 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" result = _tmp12_; #line 211 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - __g_list_free__gtk_tree_path_free0_0 (selected); + __g_list_free___vala_GtkTreePath_free0_0 (selected); #line 211 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" return result; -#line 1598 "ManifestWidget.c" +#line 1711 "ManifestWidget.c" } -static gchar* plugins_manifest_list_view_get_id_at_path (PluginsManifestListView* self, GtkTreePath* path, GtkTreeIter* iter) { +static gchar* +plugins_manifest_list_view_get_id_at_path (PluginsManifestListView* self, + GtkTreePath* path, + GtkTreeIter* iter) +{ GtkTreeIter _vala_iter = {0}; gchar* result = NULL; GtkTreeStore* _tmp0_; - GtkTreePath* _tmp1_; - GtkTreeIter _tmp2_ = {0}; - gboolean _tmp3_; + GtkTreeIter _tmp1_ = {0}; + gboolean _tmp2_; const gchar* id = NULL; - GtkTreeStore* _tmp4_; - GtkTreeIter _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; + GtkTreeStore* _tmp3_; + GtkTreeIter _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; #line 214 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" g_return_val_if_fail (PLUGINS_IS_MANIFEST_LIST_VIEW (self), NULL); #line 214 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1617,241 +1733,208 @@ static gchar* plugins_manifest_list_view_get_id_at_path (PluginsManifestListView #line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp0_ = self->priv->store; #line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp1_ = path; -#line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp3_ = gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp2_, _tmp1_); + _tmp2_ = gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp1_, path); #line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _vala_iter = _tmp2_; + _vala_iter = _tmp1_; #line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - if (!_tmp3_) { + if (!_tmp2_) { #line 216 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" result = NULL; #line 216 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (iter) { #line 216 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" *iter = _vala_iter; -#line 1634 "ManifestWidget.c" +#line 1748 "ManifestWidget.c" } #line 216 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" return result; -#line 1638 "ManifestWidget.c" +#line 1752 "ManifestWidget.c" } #line 219 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp4_ = self->priv->store; + _tmp3_ = self->priv->store; #line 219 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp5_ = _vala_iter; + _tmp4_ = _vala_iter; #line 219 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_tree_model_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp5_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ID, &id, -1); + gtk_tree_model_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp4_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ID, &id, -1); #line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp6_ = id; + _tmp5_ = id; #line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp6_ = g_strdup (_tmp5_); #line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - result = _tmp7_; + result = _tmp6_; #line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (iter) { #line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" *iter = _vala_iter; -#line 1656 "ManifestWidget.c" +#line 1770 "ManifestWidget.c" } #line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" return result; -#line 1660 "ManifestWidget.c" +#line 1774 "ManifestWidget.c" } -static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* base, GdkEventButton* event) { +static gboolean +plugins_manifest_list_view_real_button_press_event (GtkWidget* base, + GdkEventButton* event) +{ PluginsManifestListView * self; gboolean result = FALSE; GtkTreePath* path = NULL; GtkTreeViewColumn* col = NULL; gint cellx = 0; gint celly = 0; - GdkEventButton* _tmp0_; + gdouble _tmp0_; gdouble _tmp1_; - GdkEventButton* _tmp2_; - gdouble _tmp3_; - GtkTreePath* _tmp4_ = NULL; - GtkTreeViewColumn* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; - gboolean _tmp8_; - GtkTreeViewColumn* _tmp9_; - gboolean _tmp12_ = FALSE; - gint _tmp13_; + GtkTreePath* _tmp2_ = NULL; + GtkTreeViewColumn* _tmp3_ = NULL; + gint _tmp4_ = 0; + gint _tmp5_ = 0; + gboolean _tmp6_; + GtkTreeViewColumn* _tmp7_; + gboolean _tmp8_ = FALSE; + gint _tmp9_; GtkTreeIter iter = {0}; gchar* id = NULL; - GtkTreePath* _tmp17_; - GtkTreeIter _tmp18_ = {0}; - gchar* _tmp19_; - const gchar* _tmp20_; + GtkTreePath* _tmp11_; + GtkTreeIter _tmp12_ = {0}; + gchar* _tmp13_; + const gchar* _tmp14_; gboolean enabled = FALSE; - const gchar* _tmp23_; - gboolean _tmp24_ = FALSE; - gboolean _tmp25_; - gboolean _tmp28_; - const gchar* _tmp29_; - gboolean _tmp30_; - GtkTreeStore* _tmp31_; - GtkTreeIter _tmp32_; - gboolean _tmp33_; + const gchar* _tmp15_; + gboolean _tmp16_ = FALSE; + gboolean _tmp17_; + gboolean _tmp18_; + const gchar* _tmp19_; + gboolean _tmp20_; + GtkTreeStore* _tmp21_; + GtkTreeIter _tmp22_; + gboolean _tmp23_; #line 232 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_MANIFEST_LIST_VIEW, PluginsManifestListView); #line 232 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" g_return_val_if_fail (event != NULL, FALSE); #line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp0_ = event; -#line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp1_ = _tmp0_->x; -#line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp2_ = event; + _tmp0_ = event->x; #line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp3_ = _tmp2_->y; + _tmp1_ = event->y; #line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp8_ = gtk_tree_view_get_path_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), (gint) _tmp1_, (gint) _tmp3_, &_tmp4_, &_tmp5_, &_tmp6_, &_tmp7_); + _tmp6_ = gtk_tree_view_get_path_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), (gint) _tmp0_, (gint) _tmp1_, &_tmp2_, &_tmp3_, &_tmp4_, &_tmp5_); #line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - path = _tmp4_; + path = _tmp2_; #line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _g_object_unref0 (col); #line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp9_ = _g_object_ref0 (_tmp5_); + _tmp7_ = _g_object_ref0 (_tmp3_); #line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - col = _tmp9_; + col = _tmp7_; #line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - cellx = _tmp6_; + cellx = _tmp4_; #line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - celly = _tmp7_; + celly = _tmp5_; #line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - if (!_tmp8_) { -#line 1729 "ManifestWidget.c" - GdkEventButton* _tmp10_; - gboolean _tmp11_; -#line 239 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp10_ = event; -#line 239 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp11_ = GTK_WIDGET_CLASS (plugins_manifest_list_view_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp10_); + if (!_tmp6_) { #line 239 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - result = _tmp11_; + result = GTK_WIDGET_CLASS (plugins_manifest_list_view_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), event); #line 239 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _g_object_unref0 (col); #line 239 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 239 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" return result; -#line 1744 "ManifestWidget.c" +#line 1848 "ManifestWidget.c" } #line 244 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp13_ = cellx; + _tmp9_ = cellx; #line 244 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - if (_tmp13_ < (PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE + PLUGINS_MANIFEST_LIST_VIEW_ICON_X_PADDING)) { + if (_tmp9_ < (PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE + PLUGINS_MANIFEST_LIST_VIEW_ICON_X_PADDING)) { #line 244 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp12_ = TRUE; -#line 1752 "ManifestWidget.c" + _tmp8_ = TRUE; +#line 1856 "ManifestWidget.c" } else { - gint _tmp14_; + gint _tmp10_; #line 244 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp14_ = cellx; + _tmp10_ = cellx; #line 244 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp12_ = _tmp14_ > (2 * (PLUGINS_MANIFEST_LIST_VIEW_ICON_X_PADDING + PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE)); -#line 1759 "ManifestWidget.c" + _tmp8_ = _tmp10_ > (2 * (PLUGINS_MANIFEST_LIST_VIEW_ICON_X_PADDING + PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE)); +#line 1863 "ManifestWidget.c" } #line 244 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - if (_tmp12_) { -#line 1763 "ManifestWidget.c" - GdkEventButton* _tmp15_; - gboolean _tmp16_; -#line 245 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp15_ = event; + if (_tmp8_) { #line 245 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp16_ = GTK_WIDGET_CLASS (plugins_manifest_list_view_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp15_); -#line 245 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - result = _tmp16_; + result = GTK_WIDGET_CLASS (plugins_manifest_list_view_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), event); #line 245 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _g_object_unref0 (col); #line 245 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 245 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" return result; -#line 1778 "ManifestWidget.c" +#line 1875 "ManifestWidget.c" } #line 248 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp17_ = path; + _tmp11_ = path; #line 248 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp19_ = plugins_manifest_list_view_get_id_at_path (self, _tmp17_, &_tmp18_); + _tmp13_ = plugins_manifest_list_view_get_id_at_path (self, _tmp11_, &_tmp12_); #line 248 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - iter = _tmp18_; + iter = _tmp12_; #line 248 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - id = _tmp19_; + id = _tmp13_; #line 249 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp20_ = id; + _tmp14_ = id; #line 249 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - if (_tmp20_ == NULL) { -#line 1792 "ManifestWidget.c" - GdkEventButton* _tmp21_; - gboolean _tmp22_; -#line 250 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp21_ = event; -#line 250 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp22_ = GTK_WIDGET_CLASS (plugins_manifest_list_view_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp21_); + if (_tmp14_ == NULL) { #line 250 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - result = _tmp22_; + result = GTK_WIDGET_CLASS (plugins_manifest_list_view_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), event); #line 250 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _g_free0 (id); #line 250 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _g_object_unref0 (col); #line 250 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 250 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" return result; -#line 1809 "ManifestWidget.c" +#line 1899 "ManifestWidget.c" } #line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp23_ = id; + _tmp15_ = id; #line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp25_ = plugins_get_pluggable_enabled (_tmp23_, &_tmp24_); + _tmp17_ = plugins_get_pluggable_enabled (_tmp15_, &_tmp16_); #line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - enabled = _tmp24_; + enabled = _tmp16_; #line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - if (!_tmp25_) { -#line 1819 "ManifestWidget.c" - GdkEventButton* _tmp26_; - gboolean _tmp27_; -#line 254 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp26_ = event; -#line 254 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp27_ = GTK_WIDGET_CLASS (plugins_manifest_list_view_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp26_); + if (!_tmp17_) { #line 254 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - result = _tmp27_; + result = GTK_WIDGET_CLASS (plugins_manifest_list_view_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), event); #line 254 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _g_free0 (id); #line 254 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _g_object_unref0 (col); #line 254 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 254 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" return result; -#line 1836 "ManifestWidget.c" +#line 1919 "ManifestWidget.c" } #line 257 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp28_ = enabled; + _tmp18_ = enabled; #line 257 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - enabled = !_tmp28_; + enabled = !_tmp18_; #line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp29_ = id; + _tmp19_ = id; #line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp30_ = enabled; + _tmp20_ = enabled; #line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - plugins_set_pluggable_enabled (_tmp29_, _tmp30_); + plugins_set_pluggable_enabled (_tmp19_, _tmp20_); #line 260 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp31_ = self->priv->store; + _tmp21_ = self->priv->store; #line 260 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp32_ = iter; + _tmp22_ = iter; #line 260 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp33_ = enabled; + _tmp23_ = enabled; #line 260 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - gtk_tree_store_set (_tmp31_, &_tmp32_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ENABLED, _tmp33_, -1); + gtk_tree_store_set (_tmp21_, &_tmp22_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ENABLED, _tmp23_, -1); #line 262 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" result = TRUE; #line 262 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1859,14 +1942,16 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b #line 262 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _g_object_unref0 (col); #line 262 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 262 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" return result; -#line 1866 "ManifestWidget.c" +#line 1949 "ManifestWidget.c" } -static void plugins_manifest_list_view_class_init (PluginsManifestListViewClass * klass) { +static void +plugins_manifest_list_view_class_init (PluginsManifestListViewClass * klass) +{ #line 94 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" plugins_manifest_list_view_parent_class = g_type_class_peek_parent (klass); #line 94 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1875,11 +1960,13 @@ static void plugins_manifest_list_view_class_init (PluginsManifestListViewClass ((GtkWidgetClass *) klass)->button_press_event = (gboolean (*) (GtkWidget *, GdkEventButton*)) plugins_manifest_list_view_real_button_press_event; #line 94 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" G_OBJECT_CLASS (klass)->finalize = plugins_manifest_list_view_finalize; -#line 1879 "ManifestWidget.c" +#line 1964 "ManifestWidget.c" } -static void plugins_manifest_list_view_instance_init (PluginsManifestListView * self) { +static void +plugins_manifest_list_view_instance_init (PluginsManifestListView * self) +{ GtkTreeStore* _tmp0_; #line 94 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" self->priv = PLUGINS_MANIFEST_LIST_VIEW_GET_PRIVATE (self); @@ -1887,11 +1974,13 @@ static void plugins_manifest_list_view_instance_init (PluginsManifestListView * _tmp0_ = gtk_tree_store_new ((gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_N_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, gdk_pixbuf_get_type (), G_TYPE_STRING, G_TYPE_STRING); #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" self->priv->store = _tmp0_; -#line 1891 "ManifestWidget.c" +#line 1978 "ManifestWidget.c" } -static void plugins_manifest_list_view_finalize (GObject * obj) { +static void +plugins_manifest_list_view_finalize (GObject * obj) +{ PluginsManifestListView * self; #line 94 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_MANIFEST_LIST_VIEW, PluginsManifestListView); @@ -1899,11 +1988,13 @@ static void plugins_manifest_list_view_finalize (GObject * obj) { _g_object_unref0 (self->priv->store); #line 94 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" G_OBJECT_CLASS (plugins_manifest_list_view_parent_class)->finalize (obj); -#line 1903 "ManifestWidget.c" +#line 1992 "ManifestWidget.c" } -GType plugins_manifest_list_view_get_type (void) { +GType +plugins_manifest_list_view_get_type (void) +{ static volatile gsize plugins_manifest_list_view_type_id__volatile = 0; if (g_once_init_enter (&plugins_manifest_list_view_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PluginsManifestListViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) plugins_manifest_list_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PluginsManifestListView), 0, (GInstanceInitFunc) plugins_manifest_list_view_instance_init, NULL }; @@ -1915,7 +2006,11 @@ GType plugins_manifest_list_view_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -1927,13 +2022,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -static gint _vala_array_length (gpointer array) { +static gint +_vala_array_length (gpointer array) +{ int length; length = 0; if (array) { diff --git a/src/plugins/Plugins.c b/src/plugins/Plugins.c index f6a6639..55b8513 100644 --- a/src/plugins/Plugins.c +++ b/src/plugins/Plugins.c @@ -1,4 +1,4 @@ -/* Plugins.c generated by valac 0.36.6, the Vala compiler +/* Plugins.c generated by valac 0.40.4, the Vala compiler * generated from Plugins.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -95,9 +96,9 @@ typedef struct _PluginsNotifierPrivate PluginsNotifierPrivate; typedef struct _PluginsParamSpecNotifier PluginsParamSpecNotifier; enum { PLUGINS_NOTIFIER_PLUGGABLE_ACTIVATION_SIGNAL, - PLUGINS_NOTIFIER_LAST_SIGNAL + PLUGINS_NOTIFIER_NUM_SIGNALS }; -static guint plugins_notifier_signals[PLUGINS_NOTIFIER_LAST_SIGNAL] = {0}; +static guint plugins_notifier_signals[PLUGINS_NOTIFIER_NUM_SIGNALS] = {0}; #define _plugins_extension_point_unref0(var) ((var == NULL) ? NULL : (var = (plugins_extension_point_unref (var), NULL))) #define _plugins_pluggable_rep_unref0(var) ((var == NULL) ? NULL : (var = (plugins_pluggable_rep_unref (var), NULL))) @@ -230,163 +231,237 @@ static PluginsNotifier* plugins_notifier_instance = NULL; #define PLUGINS_MAX_SPIT_INTERFACE 0 gpointer plugins_extension_point_ref (gpointer instance); void plugins_extension_point_unref (gpointer instance); -GParamSpec* plugins_param_spec_extension_point (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void plugins_value_set_extension_point (GValue* value, gpointer v_object); -void plugins_value_take_extension_point (GValue* value, gpointer v_object); +GParamSpec* plugins_param_spec_extension_point (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void plugins_value_set_extension_point (GValue* value, + gpointer v_object); +void plugins_value_take_extension_point (GValue* value, + gpointer v_object); gpointer plugins_value_get_extension_point (const GValue* value); GType plugins_extension_point_get_type (void) G_GNUC_CONST; #define PLUGINS_EXTENSION_POINT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PLUGINS_TYPE_EXTENSION_POINT, PluginsExtensionPointPrivate)) -enum { - PLUGINS_EXTENSION_POINT_DUMMY_PROPERTY -}; -PluginsExtensionPoint* plugins_extension_point_new (GType pluggable_type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1); -PluginsExtensionPoint* plugins_extension_point_construct (GType object_type, GType pluggable_type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1); -static void plugins_extension_point_set_pluggable_type (PluginsExtensionPoint* self, GType value); -static void plugins_extension_point_set_name (PluginsExtensionPoint* self, const gchar* value); -static void plugins_extension_point_set_icon_name (PluginsExtensionPoint* self, const gchar* value); -static void plugins_extension_point_set_core_ids (PluginsExtensionPoint* self, gchar** value, int value_length1); +PluginsExtensionPoint* plugins_extension_point_new (GType pluggable_type, + const gchar* name, + const gchar* icon_name, + gchar** core_ids, + int core_ids_length1); +PluginsExtensionPoint* plugins_extension_point_construct (GType object_type, + GType pluggable_type, + const gchar* name, + const gchar* icon_name, + gchar** core_ids, + int core_ids_length1); +static void plugins_extension_point_set_pluggable_type (PluginsExtensionPoint* self, + GType value); +static void plugins_extension_point_set_name (PluginsExtensionPoint* self, + const gchar* value); +static void plugins_extension_point_set_icon_name (PluginsExtensionPoint* self, + const gchar* value); +static void plugins_extension_point_set_core_ids (PluginsExtensionPoint* self, + gchar** value, + int value_length1); GType plugins_extension_point_get_pluggable_type (PluginsExtensionPoint* self); const gchar* plugins_extension_point_get_name (PluginsExtensionPoint* self); const gchar* plugins_extension_point_get_icon_name (PluginsExtensionPoint* self); -gchar** plugins_extension_point_get_core_ids (PluginsExtensionPoint* self, int* result_length1); -static gchar** _vala_array_dup16 (gchar** self, int length); +gchar** plugins_extension_point_get_core_ids (PluginsExtensionPoint* self, + int* result_length1); +static gchar** _vala_array_dup16 (gchar** self, + int length); static void plugins_extension_point_finalize (PluginsExtensionPoint * obj); gpointer plugins_module_rep_ref (gpointer instance); void plugins_module_rep_unref (gpointer instance); -GParamSpec* plugins_param_spec_module_rep (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void plugins_value_set_module_rep (GValue* value, gpointer v_object); -void plugins_value_take_module_rep (GValue* value, gpointer v_object); +GParamSpec* plugins_param_spec_module_rep (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void plugins_value_set_module_rep (GValue* value, + gpointer v_object); +void plugins_value_take_module_rep (GValue* value, + gpointer v_object); gpointer plugins_value_get_module_rep (const GValue* value); GType plugins_module_rep_get_type (void) G_GNUC_CONST; -enum { - PLUGINS_MODULE_REP_DUMMY_PROPERTY -}; static PluginsModuleRep* plugins_module_rep_new (GFile* file); -static PluginsModuleRep* plugins_module_rep_construct (GType object_type, GFile* file); +static PluginsModuleRep* plugins_module_rep_construct (GType object_type, + GFile* file); PluginsModuleRep* plugins_module_rep_open (GFile* file); static void plugins_module_rep_finalize (PluginsModuleRep * obj); gpointer plugins_pluggable_rep_ref (gpointer instance); void plugins_pluggable_rep_unref (gpointer instance); -GParamSpec* plugins_param_spec_pluggable_rep (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void plugins_value_set_pluggable_rep (GValue* value, gpointer v_object); -void plugins_value_take_pluggable_rep (GValue* value, gpointer v_object); +GParamSpec* plugins_param_spec_pluggable_rep (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void plugins_value_set_pluggable_rep (GValue* value, + gpointer v_object); +void plugins_value_take_pluggable_rep (GValue* value, + gpointer v_object); gpointer plugins_value_get_pluggable_rep (const GValue* value); GType plugins_pluggable_rep_get_type (void) G_GNUC_CONST; #define PLUGINS_PLUGGABLE_REP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PLUGINS_TYPE_PLUGGABLE_REP, PluginsPluggableRepPrivate)) -enum { - PLUGINS_PLUGGABLE_REP_DUMMY_PROPERTY -}; PluginsPluggableRep* plugins_pluggable_rep_new (SpitPluggable* pluggable); -PluginsPluggableRep* plugins_pluggable_rep_construct (GType object_type, SpitPluggable* pluggable); -static void plugins_pluggable_rep_set_pluggable (PluginsPluggableRep* self, SpitPluggable* value); -static void plugins_pluggable_rep_set_id (PluginsPluggableRep* self, const gchar* value); +PluginsPluggableRep* plugins_pluggable_rep_construct (GType object_type, + SpitPluggable* pluggable); +static void plugins_pluggable_rep_set_pluggable (PluginsPluggableRep* self, + SpitPluggable* value); +static void plugins_pluggable_rep_set_id (PluginsPluggableRep* self, + const gchar* value); void plugins_pluggable_rep_activate (PluginsPluggableRep* self); gboolean plugins_is_core_pluggable (SpitPluggable* pluggable); SpitPluggable* plugins_pluggable_rep_get_pluggable (PluginsPluggableRep* self); -static void plugins_pluggable_rep_set_is_core (PluginsPluggableRep* self, gboolean value); +static void plugins_pluggable_rep_set_is_core (PluginsPluggableRep* self, + gboolean value); GType fuzzy_property_state_get_type (void) G_GNUC_CONST; GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); -FuzzyPropertyState configuration_facade_is_plugin_enabled (ConfigurationFacade* self, const gchar* id); +FuzzyPropertyState configuration_facade_is_plugin_enabled (ConfigurationFacade* self, + const gchar* id); const gchar* plugins_pluggable_rep_get_id (PluginsPluggableRep* self); gboolean plugins_pluggable_rep_get_is_core (PluginsPluggableRep* self); -static void plugins_pluggable_rep_set_activated (PluginsPluggableRep* self, gboolean value); +static void plugins_pluggable_rep_set_activated (PluginsPluggableRep* self, + gboolean value); gboolean plugins_pluggable_rep_is_enabled (PluginsPluggableRep* self); -gboolean plugins_pluggable_rep_set_enabled (PluginsPluggableRep* self, gboolean enabled); -void configuration_facade_set_plugin_enabled (ConfigurationFacade* self, const gchar* id, gboolean enabled); +gboolean plugins_pluggable_rep_set_enabled (PluginsPluggableRep* self, + gboolean enabled); +void configuration_facade_set_plugin_enabled (ConfigurationFacade* self, + const gchar* id, + gboolean enabled); gboolean plugins_pluggable_rep_get_activated (PluginsPluggableRep* self); static void plugins_pluggable_rep_finalize (PluginsPluggableRep * obj); void plugins_init (GError** error); GFile* app_dirs_get_user_plugins_dir (void); -static void _vala_array_add50 (GFile** * array, int* length, int* size, GFile* value); +static void _vala_array_add50 (GFile** * array, + int* length, + int* size, + GFile* value); GFile* app_dirs_get_system_plugins_dir (void); -static void _vala_array_add51 (GFile** * array, int* length, int* size, GFile* value); -void plugins_search_for_plugins (GFile* dir, GError** error); +static void _vala_array_add51 (GFile** * array, + int* length, + int* size, + GFile* value); +void plugins_search_for_plugins (GFile* dir, + GError** error); void plugins_terminate (void); gpointer plugins_notifier_ref (gpointer instance); void plugins_notifier_unref (gpointer instance); -GParamSpec* plugins_param_spec_notifier (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void plugins_value_set_notifier (GValue* value, gpointer v_object); -void plugins_value_take_notifier (GValue* value, gpointer v_object); +GParamSpec* plugins_param_spec_notifier (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void plugins_value_set_notifier (GValue* value, + gpointer v_object); +void plugins_value_take_notifier (GValue* value, + gpointer v_object); gpointer plugins_value_get_notifier (const GValue* value); GType plugins_notifier_get_type (void) G_GNUC_CONST; -enum { - PLUGINS_NOTIFIER_DUMMY_PROPERTY -}; static PluginsNotifier* plugins_notifier_new (void); static PluginsNotifier* plugins_notifier_construct (GType object_type); PluginsNotifier* plugins_notifier_get_instance (void); -static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); +static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); static void plugins_notifier_finalize (PluginsNotifier * obj); -void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1); +void plugins_register_extension_point (GType type, + const gchar* name, + const gchar* icon_name, + gchar** core_ids, + int core_ids_length1); GeeCollection* plugins_get_pluggables (gboolean include_disabled); PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle); -static SpitPluggable** _vala_array_dup17 (SpitPluggable** self, int length); +static SpitPluggable** _vala_array_dup17 (SpitPluggable** self, + int length); gchar* plugins_get_pluggable_module_id (SpitPluggable* needle); -GeeCollection* plugins_get_extension_points (GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify); -GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled); +GeeCollection* plugins_get_extension_points (GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify); +GeeCollection* plugins_get_pluggables_for_type (GType type, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify, + gboolean include_disabled); gchar* plugins_get_pluggable_name (const gchar* id); -gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info); -gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled); -void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled); +gboolean plugins_get_pluggable_info (const gchar* id, + SpitPluggableInfo* info); +gboolean plugins_get_pluggable_enabled (const gchar* id, + gboolean* enabled); +void plugins_set_pluggable_enabled (const gchar* id, + gboolean enabled); GFile* plugins_get_pluggable_module_file (SpitPluggable* pluggable); -gint plugins_compare_pluggable_names (void* a, void* b); -gint plugins_compare_extension_point_names (void* a, void* b); +gint plugins_compare_pluggable_names (void* a, + void* b); +gint plugins_compare_extension_point_names (void* a, + void* b); gboolean plugins_is_shared_library (GFile* file); -void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext); +void disassemble_filename (const gchar* basename, + gchar* * name, + gchar* * ext); #define UTIL_FILE_ATTRIBUTES "standard::*,time::*,id::file,id::filesystem,etag::value" void plugins_load_module (GFile* file); GType prepare_input_text_options_get_type (void) G_GNUC_CONST; -gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +gchar* prepare_input_text (const gchar* text, + PrepareInputTextOptions options, + gint dest_length); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); const gchar* PLUGINS_SHARED_LIB_EXTS[2] = {"so", "la"}; -PluginsExtensionPoint* plugins_extension_point_construct (GType object_type, GType pluggable_type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1) { +PluginsExtensionPoint* +plugins_extension_point_construct (GType object_type, + GType pluggable_type, + const gchar* name, + const gchar* icon_name, + gchar** core_ids, + int core_ids_length1) +{ PluginsExtensionPoint* self = NULL; - GType _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - gchar** _tmp3_; - gint _tmp3__length1; #line 25 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (name != NULL, NULL); #line 25 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self = (PluginsExtensionPoint*) g_type_create_instance (object_type); #line 26 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = pluggable_type; -#line 26 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - plugins_extension_point_set_pluggable_type (self, _tmp0_); -#line 27 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = name; + plugins_extension_point_set_pluggable_type (self, pluggable_type); #line 27 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - plugins_extension_point_set_name (self, _tmp1_); + plugins_extension_point_set_name (self, name); #line 28 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = icon_name; -#line 28 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - plugins_extension_point_set_icon_name (self, _tmp2_); -#line 29 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = core_ids; -#line 29 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3__length1 = core_ids_length1; + plugins_extension_point_set_icon_name (self, icon_name); #line 29 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - plugins_extension_point_set_core_ids (self, _tmp3_, _tmp3__length1); + plugins_extension_point_set_core_ids (self, core_ids, core_ids_length1); #line 25 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return self; -#line 379 "Plugins.c" +#line 446 "Plugins.c" } -PluginsExtensionPoint* plugins_extension_point_new (GType pluggable_type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1) { +PluginsExtensionPoint* +plugins_extension_point_new (GType pluggable_type, + const gchar* name, + const gchar* icon_name, + gchar** core_ids, + int core_ids_length1) +{ #line 25 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return plugins_extension_point_construct (PLUGINS_TYPE_EXTENSION_POINT, pluggable_type, name, icon_name, core_ids, core_ids_length1); -#line 386 "Plugins.c" +#line 459 "Plugins.c" } -GType plugins_extension_point_get_pluggable_type (PluginsExtensionPoint* self) { +GType +plugins_extension_point_get_pluggable_type (PluginsExtensionPoint* self) +{ GType result; GType _tmp0_; #line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -397,23 +472,25 @@ GType plugins_extension_point_get_pluggable_type (PluginsExtensionPoint* self) { result = _tmp0_; #line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 401 "Plugins.c" +#line 476 "Plugins.c" } -static void plugins_extension_point_set_pluggable_type (PluginsExtensionPoint* self, GType value) { - GType _tmp0_; +static void +plugins_extension_point_set_pluggable_type (PluginsExtensionPoint* self, + GType value) +{ #line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (PLUGINS_IS_EXTENSION_POINT (self)); #line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = value; -#line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - self->priv->_pluggable_type = _tmp0_; -#line 413 "Plugins.c" + self->priv->_pluggable_type = value; +#line 488 "Plugins.c" } -const gchar* plugins_extension_point_get_name (PluginsExtensionPoint* self) { +const gchar* +plugins_extension_point_get_name (PluginsExtensionPoint* self) +{ const gchar* result; const gchar* _tmp0_; #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -424,28 +501,30 @@ const gchar* plugins_extension_point_get_name (PluginsExtensionPoint* self) { result = _tmp0_; #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 428 "Plugins.c" +#line 505 "Plugins.c" } -static void plugins_extension_point_set_name (PluginsExtensionPoint* self, const gchar* value) { - const gchar* _tmp0_; - gchar* _tmp1_; +static void +plugins_extension_point_set_name (PluginsExtensionPoint* self, + const gchar* value) +{ + gchar* _tmp0_; #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (PLUGINS_IS_EXTENSION_POINT (self)); #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = value; -#line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (value); #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_free0 (self->priv->_name); #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - self->priv->_name = _tmp1_; -#line 445 "Plugins.c" + self->priv->_name = _tmp0_; +#line 522 "Plugins.c" } -const gchar* plugins_extension_point_get_icon_name (PluginsExtensionPoint* self) { +const gchar* +plugins_extension_point_get_icon_name (PluginsExtensionPoint* self) +{ const gchar* result; const gchar* _tmp0_; #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -456,28 +535,31 @@ const gchar* plugins_extension_point_get_icon_name (PluginsExtensionPoint* self) result = _tmp0_; #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 460 "Plugins.c" +#line 539 "Plugins.c" } -static void plugins_extension_point_set_icon_name (PluginsExtensionPoint* self, const gchar* value) { - const gchar* _tmp0_; - gchar* _tmp1_; +static void +plugins_extension_point_set_icon_name (PluginsExtensionPoint* self, + const gchar* value) +{ + gchar* _tmp0_; #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (PLUGINS_IS_EXTENSION_POINT (self)); #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = value; -#line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (value); #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_free0 (self->priv->_icon_name); #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - self->priv->_icon_name = _tmp1_; -#line 477 "Plugins.c" + self->priv->_icon_name = _tmp0_; +#line 556 "Plugins.c" } -gchar** plugins_extension_point_get_core_ids (PluginsExtensionPoint* self, int* result_length1) { +gchar** +plugins_extension_point_get_core_ids (PluginsExtensionPoint* self, + int* result_length1) +{ gchar** result; gchar** _tmp0_; gint _tmp0__length1; @@ -497,162 +579,188 @@ gchar** plugins_extension_point_get_core_ids (PluginsExtensionPoint* self, int* if (result_length1) { #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *result_length1 = _tmp1__length1; -#line 501 "Plugins.c" +#line 583 "Plugins.c" } #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result = _tmp1_; #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 507 "Plugins.c" +#line 589 "Plugins.c" } -static gchar** _vala_array_dup16 (gchar** self, int length) { +static gchar** +_vala_array_dup16 (gchar** self, + int length) +{ gchar** result; int i; #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result = g_new0 (gchar*, length + 1); #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" for (i = 0; i < length; i++) { -#line 518 "Plugins.c" +#line 603 "Plugins.c" gchar* _tmp0_; #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = g_strdup (self[i]); #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result[i] = _tmp0_; -#line 524 "Plugins.c" +#line 609 "Plugins.c" } #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 528 "Plugins.c" +#line 613 "Plugins.c" } -static void plugins_extension_point_set_core_ids (PluginsExtensionPoint* self, gchar** value, int value_length1) { +static void +plugins_extension_point_set_core_ids (PluginsExtensionPoint* self, + gchar** value, + int value_length1) +{ gchar** _tmp0_; gint _tmp0__length1; - gchar** _tmp1_; - gint _tmp1__length1; #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (PLUGINS_IS_EXTENSION_POINT (self)); #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = value; + _tmp0_ = (value != NULL) ? _vala_array_dup16 (value, value_length1) : ((gpointer) value); #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0__length1 = value_length1; -#line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup16 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); -#line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1__length1 = _tmp0__length1; #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->priv->_core_ids = (_vala_array_free (self->priv->_core_ids, self->priv->_core_ids_length1, (GDestroyNotify) g_free), NULL); #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - self->priv->_core_ids = _tmp1_; + self->priv->_core_ids = _tmp0_; #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - self->priv->_core_ids_length1 = _tmp1__length1; + self->priv->_core_ids_length1 = _tmp0__length1; #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->priv->__core_ids_size_ = self->priv->_core_ids_length1; -#line 555 "Plugins.c" +#line 638 "Plugins.c" } -static void plugins_value_extension_point_init (GValue* value) { +static void +plugins_value_extension_point_init (GValue* value) +{ #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 562 "Plugins.c" +#line 647 "Plugins.c" } -static void plugins_value_extension_point_free_value (GValue* value) { +static void +plugins_value_extension_point_free_value (GValue* value) +{ #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (value->data[0].v_pointer) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_extension_point_unref (value->data[0].v_pointer); -#line 571 "Plugins.c" +#line 658 "Plugins.c" } } -static void plugins_value_extension_point_copy_value (const GValue* src_value, GValue* dest_value) { +static void +plugins_value_extension_point_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (src_value->data[0].v_pointer) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" dest_value->data[0].v_pointer = plugins_extension_point_ref (src_value->data[0].v_pointer); -#line 581 "Plugins.c" +#line 671 "Plugins.c" } else { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" dest_value->data[0].v_pointer = NULL; -#line 585 "Plugins.c" +#line 675 "Plugins.c" } } -static gpointer plugins_value_extension_point_peek_pointer (const GValue* value) { +static gpointer +plugins_value_extension_point_peek_pointer (const GValue* value) +{ #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return value->data[0].v_pointer; -#line 593 "Plugins.c" +#line 685 "Plugins.c" } -static gchar* plugins_value_extension_point_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +plugins_value_extension_point_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (collect_values[0].v_pointer) { -#line 600 "Plugins.c" +#line 697 "Plugins.c" PluginsExtensionPoint * object; object = collect_values[0].v_pointer; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (object->parent_instance.g_class == NULL) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 607 "Plugins.c" +#line 704 "Plugins.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.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 611 "Plugins.c" +#line 708 "Plugins.c" } #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = plugins_extension_point_ref (object); -#line 615 "Plugins.c" +#line 712 "Plugins.c" } else { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 619 "Plugins.c" +#line 716 "Plugins.c" } #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return NULL; -#line 623 "Plugins.c" +#line 720 "Plugins.c" } -static gchar* plugins_value_extension_point_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +plugins_value_extension_point_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PluginsExtensionPoint ** object_p; object_p = collect_values[0].v_pointer; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!object_p) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 634 "Plugins.c" +#line 736 "Plugins.c" } #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!value->data[0].v_pointer) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = NULL; -#line 640 "Plugins.c" +#line 742 "Plugins.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = value->data[0].v_pointer; -#line 644 "Plugins.c" +#line 746 "Plugins.c" } else { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = plugins_extension_point_ref (value->data[0].v_pointer); -#line 648 "Plugins.c" +#line 750 "Plugins.c" } #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return NULL; -#line 652 "Plugins.c" +#line 754 "Plugins.c" } -GParamSpec* plugins_param_spec_extension_point (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +plugins_param_spec_extension_point (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ PluginsParamSpecExtensionPoint* spec; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (g_type_is_a (object_type, PLUGINS_TYPE_EXTENSION_POINT), NULL); @@ -662,20 +770,25 @@ GParamSpec* plugins_param_spec_extension_point (const gchar* name, const gchar* G_PARAM_SPEC (spec)->value_type = object_type; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return G_PARAM_SPEC (spec); -#line 666 "Plugins.c" +#line 774 "Plugins.c" } -gpointer plugins_value_get_extension_point (const GValue* value) { +gpointer +plugins_value_get_extension_point (const GValue* value) +{ #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_EXTENSION_POINT), NULL); #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return value->data[0].v_pointer; -#line 675 "Plugins.c" +#line 785 "Plugins.c" } -void plugins_value_set_extension_point (GValue* value, gpointer v_object) { +void +plugins_value_set_extension_point (GValue* value, + gpointer v_object) +{ PluginsExtensionPoint * old; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_EXTENSION_POINT)); @@ -691,22 +804,25 @@ void plugins_value_set_extension_point (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_extension_point_ref (value->data[0].v_pointer); -#line 695 "Plugins.c" +#line 808 "Plugins.c" } else { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 699 "Plugins.c" +#line 812 "Plugins.c" } #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (old) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_extension_point_unref (old); -#line 705 "Plugins.c" +#line 818 "Plugins.c" } } -void plugins_value_take_extension_point (GValue* value, gpointer v_object) { +void +plugins_value_take_extension_point (GValue* value, + gpointer v_object) +{ PluginsExtensionPoint * old; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_EXTENSION_POINT)); @@ -720,42 +836,48 @@ void plugins_value_take_extension_point (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = v_object; -#line 724 "Plugins.c" +#line 840 "Plugins.c" } else { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 728 "Plugins.c" +#line 844 "Plugins.c" } #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (old) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_extension_point_unref (old); -#line 734 "Plugins.c" +#line 850 "Plugins.c" } } -static void plugins_extension_point_class_init (PluginsExtensionPointClass * klass) { +static void +plugins_extension_point_class_init (PluginsExtensionPointClass * klass) +{ #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_extension_point_parent_class = g_type_class_peek_parent (klass); #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" ((PluginsExtensionPointClass *) klass)->finalize = plugins_extension_point_finalize; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_type_class_add_private (klass, sizeof (PluginsExtensionPointPrivate)); -#line 746 "Plugins.c" +#line 864 "Plugins.c" } -static void plugins_extension_point_instance_init (PluginsExtensionPoint * self) { +static void +plugins_extension_point_instance_init (PluginsExtensionPoint * self) +{ #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->priv = PLUGINS_EXTENSION_POINT_GET_PRIVATE (self); #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->ref_count = 1; -#line 755 "Plugins.c" +#line 875 "Plugins.c" } -static void plugins_extension_point_finalize (PluginsExtensionPoint * obj) { +static void +plugins_extension_point_finalize (PluginsExtensionPoint * obj) +{ PluginsExtensionPoint * self; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_EXTENSION_POINT, PluginsExtensionPoint); @@ -767,11 +889,13 @@ static void plugins_extension_point_finalize (PluginsExtensionPoint * obj) { _g_free0 (self->priv->_icon_name); #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->priv->_core_ids = (_vala_array_free (self->priv->_core_ids, self->priv->_core_ids_length1, (GDestroyNotify) g_free), NULL); -#line 771 "Plugins.c" +#line 893 "Plugins.c" } -GType plugins_extension_point_get_type (void) { +GType +plugins_extension_point_get_type (void) +{ static volatile gsize plugins_extension_point_type_id__volatile = 0; if (g_once_init_enter (&plugins_extension_point_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { plugins_value_extension_point_init, plugins_value_extension_point_free_value, plugins_value_extension_point_copy_value, plugins_value_extension_point_peek_pointer, "p", plugins_value_extension_point_collect_value, "p", plugins_value_extension_point_lcopy_value }; @@ -785,18 +909,22 @@ GType plugins_extension_point_get_type (void) { } -gpointer plugins_extension_point_ref (gpointer instance) { +gpointer +plugins_extension_point_ref (gpointer instance) +{ PluginsExtensionPoint * self; self = instance; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_atomic_int_inc (&self->ref_count); #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return instance; -#line 796 "Plugins.c" +#line 922 "Plugins.c" } -void plugins_extension_point_unref (gpointer instance) { +void +plugins_extension_point_unref (gpointer instance) +{ PluginsExtensionPoint * self; self = instance; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -805,217 +933,244 @@ void plugins_extension_point_unref (gpointer instance) { PLUGINS_EXTENSION_POINT_GET_CLASS (self)->finalize (self); #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_type_free_instance ((GTypeInstance *) self); -#line 809 "Plugins.c" +#line 937 "Plugins.c" } } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 41 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return self ? g_object_ref (self) : NULL; -#line 817 "Plugins.c" +#line 947 "Plugins.c" } -static PluginsModuleRep* plugins_module_rep_construct (GType object_type, GFile* file) { +static PluginsModuleRep* +plugins_module_rep_construct (GType object_type, + GFile* file) +{ PluginsModuleRep* self = NULL; GFile* _tmp0_; - GFile* _tmp1_; - GFile* _tmp2_; - gchar* _tmp3_; - gchar* _tmp4_; - GModule* _tmp5_; + gchar* _tmp1_; + gchar* _tmp2_; + GModule* _tmp3_; #line 40 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 40 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self = (PluginsModuleRep*) g_type_create_instance (object_type); #line 41 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = file; -#line 41 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (file); #line 41 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (self->file); #line 41 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - self->file = _tmp1_; + self->file = _tmp0_; #line 43 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = file; + _tmp1_ = g_file_get_path (file); #line 43 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = g_file_get_path (_tmp2_); -#line 43 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 43 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp5_ = g_module_open (_tmp4_, G_MODULE_BIND_LAZY); + _tmp3_ = g_module_open (_tmp2_, G_MODULE_BIND_LAZY); #line 43 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_module_close0 (self->module); #line 43 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - self->module = _tmp5_; + self->module = _tmp3_; #line 43 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp2_); #line 40 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return self; -#line 857 "Plugins.c" +#line 984 "Plugins.c" } -static PluginsModuleRep* plugins_module_rep_new (GFile* file) { +static PluginsModuleRep* +plugins_module_rep_new (GFile* file) +{ #line 40 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return plugins_module_rep_construct (PLUGINS_TYPE_MODULE_REP, file); -#line 864 "Plugins.c" +#line 993 "Plugins.c" } -static gpointer _plugins_module_rep_ref0 (gpointer self) { +static gpointer +_plugins_module_rep_ref0 (gpointer self) +{ #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return self ? plugins_module_rep_ref (self) : NULL; -#line 871 "Plugins.c" +#line 1002 "Plugins.c" } -PluginsModuleRep* plugins_module_rep_open (GFile* file) { +PluginsModuleRep* +plugins_module_rep_open (GFile* file) +{ PluginsModuleRep* result = NULL; PluginsModuleRep* module_rep = NULL; - GFile* _tmp0_; - PluginsModuleRep* _tmp1_; - PluginsModuleRep* _tmp2_ = NULL; - PluginsModuleRep* _tmp3_; - GModule* _tmp4_; - PluginsModuleRep* _tmp6_; + PluginsModuleRep* _tmp0_; + PluginsModuleRep* _tmp1_ = NULL; + PluginsModuleRep* _tmp2_; + GModule* _tmp3_; + PluginsModuleRep* _tmp5_; #line 54 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 55 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = file; + _tmp0_ = plugins_module_rep_new (file); #line 55 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = plugins_module_rep_new (_tmp0_); -#line 55 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - module_rep = _tmp1_; + module_rep = _tmp0_; #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = module_rep; + _tmp2_ = module_rep; #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp4_ = _tmp3_->module; + _tmp3_ = _tmp2_->module; #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp4_ != NULL) { -#line 898 "Plugins.c" - PluginsModuleRep* _tmp5_; + if (_tmp3_ != NULL) { +#line 1028 "Plugins.c" + PluginsModuleRep* _tmp4_; #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp5_ = module_rep; + _tmp4_ = module_rep; #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = _tmp5_; -#line 904 "Plugins.c" + _tmp1_ = _tmp4_; +#line 1034 "Plugins.c" } else { #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = NULL; -#line 908 "Plugins.c" + _tmp1_ = NULL; +#line 1038 "Plugins.c" } #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp6_ = _plugins_module_rep_ref0 (_tmp2_); + _tmp5_ = _plugins_module_rep_ref0 (_tmp1_); #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - result = _tmp6_; + result = _tmp5_; #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_module_rep_unref0 (module_rep); #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 918 "Plugins.c" +#line 1048 "Plugins.c" } -static void plugins_value_module_rep_init (GValue* value) { +static void +plugins_value_module_rep_init (GValue* value) +{ #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 925 "Plugins.c" +#line 1057 "Plugins.c" } -static void plugins_value_module_rep_free_value (GValue* value) { +static void +plugins_value_module_rep_free_value (GValue* value) +{ #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (value->data[0].v_pointer) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_module_rep_unref (value->data[0].v_pointer); -#line 934 "Plugins.c" +#line 1068 "Plugins.c" } } -static void plugins_value_module_rep_copy_value (const GValue* src_value, GValue* dest_value) { +static void +plugins_value_module_rep_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (src_value->data[0].v_pointer) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" dest_value->data[0].v_pointer = plugins_module_rep_ref (src_value->data[0].v_pointer); -#line 944 "Plugins.c" +#line 1081 "Plugins.c" } else { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" dest_value->data[0].v_pointer = NULL; -#line 948 "Plugins.c" +#line 1085 "Plugins.c" } } -static gpointer plugins_value_module_rep_peek_pointer (const GValue* value) { +static gpointer +plugins_value_module_rep_peek_pointer (const GValue* value) +{ #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return value->data[0].v_pointer; -#line 956 "Plugins.c" +#line 1095 "Plugins.c" } -static gchar* plugins_value_module_rep_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +plugins_value_module_rep_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (collect_values[0].v_pointer) { -#line 963 "Plugins.c" +#line 1107 "Plugins.c" PluginsModuleRep * object; object = collect_values[0].v_pointer; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (object->parent_instance.g_class == NULL) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 970 "Plugins.c" +#line 1114 "Plugins.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.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 974 "Plugins.c" +#line 1118 "Plugins.c" } #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = plugins_module_rep_ref (object); -#line 978 "Plugins.c" +#line 1122 "Plugins.c" } else { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 982 "Plugins.c" +#line 1126 "Plugins.c" } #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return NULL; -#line 986 "Plugins.c" +#line 1130 "Plugins.c" } -static gchar* plugins_value_module_rep_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +plugins_value_module_rep_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PluginsModuleRep ** object_p; object_p = collect_values[0].v_pointer; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!object_p) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 997 "Plugins.c" +#line 1146 "Plugins.c" } #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!value->data[0].v_pointer) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = NULL; -#line 1003 "Plugins.c" +#line 1152 "Plugins.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = value->data[0].v_pointer; -#line 1007 "Plugins.c" +#line 1156 "Plugins.c" } else { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = plugins_module_rep_ref (value->data[0].v_pointer); -#line 1011 "Plugins.c" +#line 1160 "Plugins.c" } #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return NULL; -#line 1015 "Plugins.c" +#line 1164 "Plugins.c" } -GParamSpec* plugins_param_spec_module_rep (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +plugins_param_spec_module_rep (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ PluginsParamSpecModuleRep* spec; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (g_type_is_a (object_type, PLUGINS_TYPE_MODULE_REP), NULL); @@ -1025,20 +1180,25 @@ GParamSpec* plugins_param_spec_module_rep (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return G_PARAM_SPEC (spec); -#line 1029 "Plugins.c" +#line 1184 "Plugins.c" } -gpointer plugins_value_get_module_rep (const GValue* value) { +gpointer +plugins_value_get_module_rep (const GValue* value) +{ #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MODULE_REP), NULL); #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return value->data[0].v_pointer; -#line 1038 "Plugins.c" +#line 1195 "Plugins.c" } -void plugins_value_set_module_rep (GValue* value, gpointer v_object) { +void +plugins_value_set_module_rep (GValue* value, + gpointer v_object) +{ PluginsModuleRep * old; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MODULE_REP)); @@ -1054,22 +1214,25 @@ void plugins_value_set_module_rep (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_module_rep_ref (value->data[0].v_pointer); -#line 1058 "Plugins.c" +#line 1218 "Plugins.c" } else { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 1062 "Plugins.c" +#line 1222 "Plugins.c" } #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (old) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_module_rep_unref (old); -#line 1068 "Plugins.c" +#line 1228 "Plugins.c" } } -void plugins_value_take_module_rep (GValue* value, gpointer v_object) { +void +plugins_value_take_module_rep (GValue* value, + gpointer v_object) +{ PluginsModuleRep * old; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MODULE_REP)); @@ -1083,31 +1246,35 @@ void plugins_value_take_module_rep (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = v_object; -#line 1087 "Plugins.c" +#line 1250 "Plugins.c" } else { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 1091 "Plugins.c" +#line 1254 "Plugins.c" } #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (old) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_module_rep_unref (old); -#line 1097 "Plugins.c" +#line 1260 "Plugins.c" } } -static void plugins_module_rep_class_init (PluginsModuleRepClass * klass) { +static void +plugins_module_rep_class_init (PluginsModuleRepClass * klass) +{ #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_module_rep_parent_class = g_type_class_peek_parent (klass); #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" ((PluginsModuleRepClass *) klass)->finalize = plugins_module_rep_finalize; -#line 1107 "Plugins.c" +#line 1272 "Plugins.c" } -static void plugins_module_rep_instance_init (PluginsModuleRep * self) { +static void +plugins_module_rep_instance_init (PluginsModuleRep * self) +{ #line 36 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->spit_module = NULL; #line 37 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1116,11 +1283,13 @@ static void plugins_module_rep_instance_init (PluginsModuleRep * self) { self->id = NULL; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->ref_count = 1; -#line 1120 "Plugins.c" +#line 1287 "Plugins.c" } -static void plugins_module_rep_finalize (PluginsModuleRep * obj) { +static void +plugins_module_rep_finalize (PluginsModuleRep * obj) +{ PluginsModuleRep * self; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_MODULE_REP, PluginsModuleRep); @@ -1138,11 +1307,13 @@ static void plugins_module_rep_finalize (PluginsModuleRep * obj) { _g_object_unref0 (self->spit_module); #line 38 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_free0 (self->id); -#line 1142 "Plugins.c" +#line 1311 "Plugins.c" } -GType plugins_module_rep_get_type (void) { +GType +plugins_module_rep_get_type (void) +{ static volatile gsize plugins_module_rep_type_id__volatile = 0; if (g_once_init_enter (&plugins_module_rep_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { plugins_value_module_rep_init, plugins_value_module_rep_free_value, plugins_value_module_rep_copy_value, plugins_value_module_rep_peek_pointer, "p", plugins_value_module_rep_collect_value, "p", plugins_value_module_rep_lcopy_value }; @@ -1156,18 +1327,22 @@ GType plugins_module_rep_get_type (void) { } -gpointer plugins_module_rep_ref (gpointer instance) { +gpointer +plugins_module_rep_ref (gpointer instance) +{ PluginsModuleRep * self; self = instance; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_atomic_int_inc (&self->ref_count); #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return instance; -#line 1167 "Plugins.c" +#line 1340 "Plugins.c" } -void plugins_module_rep_unref (gpointer instance) { +void +plugins_module_rep_unref (gpointer instance) +{ PluginsModuleRep * self; self = instance; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1176,138 +1351,135 @@ void plugins_module_rep_unref (gpointer instance) { PLUGINS_MODULE_REP_GET_CLASS (self)->finalize (self); #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1180 "Plugins.c" +#line 1355 "Plugins.c" } } -PluginsPluggableRep* plugins_pluggable_rep_construct (GType object_type, SpitPluggable* pluggable) { +PluginsPluggableRep* +plugins_pluggable_rep_construct (GType object_type, + SpitPluggable* pluggable) +{ PluginsPluggableRep* self = NULL; - SpitPluggable* _tmp0_; - SpitPluggable* _tmp1_; - const gchar* _tmp2_; + const gchar* _tmp0_; #line 70 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (SPIT_IS_PLUGGABLE (pluggable), NULL); #line 70 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self = (PluginsPluggableRep*) g_type_create_instance (object_type); #line 71 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = pluggable; -#line 71 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - plugins_pluggable_rep_set_pluggable (self, _tmp0_); + plugins_pluggable_rep_set_pluggable (self, pluggable); #line 72 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = pluggable; + _tmp0_ = spit_pluggable_get_id (pluggable); #line 72 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = spit_pluggable_get_id (_tmp1_); -#line 72 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - plugins_pluggable_rep_set_id (self, _tmp2_); + plugins_pluggable_rep_set_id (self, _tmp0_); #line 70 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return self; -#line 1206 "Plugins.c" +#line 1378 "Plugins.c" } -PluginsPluggableRep* plugins_pluggable_rep_new (SpitPluggable* pluggable) { +PluginsPluggableRep* +plugins_pluggable_rep_new (SpitPluggable* pluggable) +{ #line 70 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return plugins_pluggable_rep_construct (PLUGINS_TYPE_PLUGGABLE_REP, pluggable); -#line 1213 "Plugins.c" +#line 1387 "Plugins.c" } -void plugins_pluggable_rep_activate (PluginsPluggableRep* self) { +void +plugins_pluggable_rep_activate (PluginsPluggableRep* self) +{ SpitPluggable* _tmp0_; - gboolean _tmp1_; FuzzyPropertyState saved_state = 0; + ConfigFacade* _tmp1_; ConfigFacade* _tmp2_; - ConfigFacade* _tmp3_; - const gchar* _tmp4_; - FuzzyPropertyState _tmp5_; - FuzzyPropertyState _tmp6_; - gboolean _tmp7_ = FALSE; - gboolean _tmp8_ = FALSE; - gboolean _tmp9_; - SpitPluggable* _tmp14_; - gboolean _tmp15_; + const gchar* _tmp3_; + FuzzyPropertyState _tmp4_; + gboolean _tmp5_ = FALSE; + gboolean _tmp6_ = FALSE; + gboolean _tmp7_; + SpitPluggable* _tmp12_; + gboolean _tmp13_; #line 75 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (PLUGINS_IS_PLUGGABLE_REP (self)); #line 78 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = self->priv->_pluggable; #line 78 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = plugins_is_core_pluggable (_tmp0_); -#line 78 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - plugins_pluggable_rep_set_is_core (self, _tmp1_); + plugins_pluggable_rep_set_is_core (self, plugins_is_core_pluggable (_tmp0_)); #line 80 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = config_facade_get_instance (); + _tmp1_ = config_facade_get_instance (); #line 80 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = _tmp2_; -#line 80 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp4_ = self->priv->_id; + _tmp2_ = _tmp1_; #line 80 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp5_ = configuration_facade_is_plugin_enabled (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_); + _tmp3_ = self->priv->_id; #line 80 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp6_ = _tmp5_; + _tmp4_ = configuration_facade_is_plugin_enabled (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp3_); #line 80 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 80 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - saved_state = _tmp6_; + saved_state = _tmp4_; #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp9_ = self->priv->_is_core; + _tmp7_ = self->priv->_is_core; #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp9_) { -#line 1257 "Plugins.c" - FuzzyPropertyState _tmp10_; + if (_tmp7_) { +#line 1427 "Plugins.c" + FuzzyPropertyState _tmp8_; #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp10_ = saved_state; + _tmp8_ = saved_state; #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp8_ = _tmp10_ != FUZZY_PROPERTY_STATE_DISABLED; -#line 1263 "Plugins.c" + _tmp6_ = _tmp8_ != FUZZY_PROPERTY_STATE_DISABLED; +#line 1433 "Plugins.c" } else { #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp8_ = FALSE; -#line 1267 "Plugins.c" + _tmp6_ = FALSE; +#line 1437 "Plugins.c" } #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp8_) { + if (_tmp6_) { #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp7_ = TRUE; -#line 1273 "Plugins.c" + _tmp5_ = TRUE; +#line 1443 "Plugins.c" } else { - gboolean _tmp11_ = FALSE; - gboolean _tmp12_; + gboolean _tmp9_ = FALSE; + gboolean _tmp10_; #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp12_ = self->priv->_is_core; + _tmp10_ = self->priv->_is_core; #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (!_tmp12_) { -#line 1281 "Plugins.c" - FuzzyPropertyState _tmp13_; + if (!_tmp10_) { +#line 1451 "Plugins.c" + FuzzyPropertyState _tmp11_; #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp13_ = saved_state; + _tmp11_ = saved_state; #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp11_ = _tmp13_ == FUZZY_PROPERTY_STATE_ENABLED; -#line 1287 "Plugins.c" + _tmp9_ = _tmp11_ == FUZZY_PROPERTY_STATE_ENABLED; +#line 1457 "Plugins.c" } else { #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp11_ = FALSE; -#line 1291 "Plugins.c" + _tmp9_ = FALSE; +#line 1461 "Plugins.c" } #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp7_ = _tmp11_; -#line 1295 "Plugins.c" + _tmp5_ = _tmp9_; +#line 1465 "Plugins.c" } #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - self->priv->enabled = _tmp7_; + self->priv->enabled = _tmp5_; #line 85 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp14_ = self->priv->_pluggable; + _tmp12_ = self->priv->_pluggable; #line 85 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp15_ = self->priv->enabled; + _tmp13_ = self->priv->enabled; #line 85 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - spit_pluggable_activation (_tmp14_, _tmp15_); + spit_pluggable_activation (_tmp12_, _tmp13_); #line 87 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_pluggable_rep_set_activated (self, TRUE); -#line 1307 "Plugins.c" +#line 1477 "Plugins.c" } -gboolean plugins_pluggable_rep_is_enabled (PluginsPluggableRep* self) { +gboolean +plugins_pluggable_rep_is_enabled (PluginsPluggableRep* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 90 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1318,66 +1490,59 @@ gboolean plugins_pluggable_rep_is_enabled (PluginsPluggableRep* self) { result = _tmp0_; #line 91 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 1322 "Plugins.c" +#line 1494 "Plugins.c" } -gboolean plugins_pluggable_rep_set_enabled (PluginsPluggableRep* self, gboolean enabled) { +gboolean +plugins_pluggable_rep_set_enabled (PluginsPluggableRep* self, + gboolean enabled) +{ gboolean result = FALSE; gboolean _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_; - ConfigFacade* _tmp3_; - ConfigFacade* _tmp4_; - const gchar* _tmp5_; - gboolean _tmp6_; - SpitPluggable* _tmp7_; - gboolean _tmp8_; + ConfigFacade* _tmp1_; + ConfigFacade* _tmp2_; + const gchar* _tmp3_; + SpitPluggable* _tmp4_; #line 95 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (PLUGINS_IS_PLUGGABLE_REP (self), FALSE); #line 96 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = enabled; -#line 96 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = self->priv->enabled; + _tmp0_ = self->priv->enabled; #line 96 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp0_ == _tmp1_) { + if (enabled == _tmp0_) { #line 97 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result = FALSE; #line 97 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 1349 "Plugins.c" +#line 1518 "Plugins.c" } #line 99 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = enabled; -#line 99 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - self->priv->enabled = _tmp2_; + self->priv->enabled = enabled; #line 100 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = config_facade_get_instance (); + _tmp1_ = config_facade_get_instance (); #line 100 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp4_ = _tmp3_; -#line 100 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp5_ = self->priv->_id; + _tmp2_ = _tmp1_; #line 100 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp6_ = enabled; + _tmp3_ = self->priv->_id; #line 100 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - configuration_facade_set_plugin_enabled (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp5_, _tmp6_); + configuration_facade_set_plugin_enabled (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp3_, enabled); #line 100 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp2_); #line 101 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp7_ = self->priv->_pluggable; + _tmp4_ = self->priv->_pluggable; #line 101 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp8_ = enabled; -#line 101 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - spit_pluggable_activation (_tmp7_, _tmp8_); + spit_pluggable_activation (_tmp4_, enabled); #line 103 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result = TRUE; #line 103 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 1377 "Plugins.c" +#line 1540 "Plugins.c" } -SpitPluggable* plugins_pluggable_rep_get_pluggable (PluginsPluggableRep* self) { +SpitPluggable* +plugins_pluggable_rep_get_pluggable (PluginsPluggableRep* self) +{ SpitPluggable* result; SpitPluggable* _tmp0_; #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1388,28 +1553,30 @@ SpitPluggable* plugins_pluggable_rep_get_pluggable (PluginsPluggableRep* self) { result = _tmp0_; #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 1392 "Plugins.c" +#line 1557 "Plugins.c" } -static void plugins_pluggable_rep_set_pluggable (PluginsPluggableRep* self, SpitPluggable* value) { +static void +plugins_pluggable_rep_set_pluggable (PluginsPluggableRep* self, + SpitPluggable* value) +{ SpitPluggable* _tmp0_; - SpitPluggable* _tmp1_; #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (PLUGINS_IS_PLUGGABLE_REP (self)); #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = value; -#line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (value); #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (self->priv->_pluggable); #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - self->priv->_pluggable = _tmp1_; -#line 1409 "Plugins.c" + self->priv->_pluggable = _tmp0_; +#line 1574 "Plugins.c" } -const gchar* plugins_pluggable_rep_get_id (PluginsPluggableRep* self) { +const gchar* +plugins_pluggable_rep_get_id (PluginsPluggableRep* self) +{ const gchar* result; const gchar* _tmp0_; #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1420,28 +1587,30 @@ const gchar* plugins_pluggable_rep_get_id (PluginsPluggableRep* self) { result = _tmp0_; #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 1424 "Plugins.c" +#line 1591 "Plugins.c" } -static void plugins_pluggable_rep_set_id (PluginsPluggableRep* self, const gchar* value) { - const gchar* _tmp0_; - gchar* _tmp1_; +static void +plugins_pluggable_rep_set_id (PluginsPluggableRep* self, + const gchar* value) +{ + gchar* _tmp0_; #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (PLUGINS_IS_PLUGGABLE_REP (self)); #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = value; -#line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (value); #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_free0 (self->priv->_id); #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - self->priv->_id = _tmp1_; -#line 1441 "Plugins.c" + self->priv->_id = _tmp0_; +#line 1608 "Plugins.c" } -gboolean plugins_pluggable_rep_get_is_core (PluginsPluggableRep* self) { +gboolean +plugins_pluggable_rep_get_is_core (PluginsPluggableRep* self) +{ gboolean result; gboolean _tmp0_; #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1452,23 +1621,25 @@ gboolean plugins_pluggable_rep_get_is_core (PluginsPluggableRep* self) { result = _tmp0_; #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 1456 "Plugins.c" +#line 1625 "Plugins.c" } -static void plugins_pluggable_rep_set_is_core (PluginsPluggableRep* self, gboolean value) { - gboolean _tmp0_; +static void +plugins_pluggable_rep_set_is_core (PluginsPluggableRep* self, + gboolean value) +{ #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (PLUGINS_IS_PLUGGABLE_REP (self)); #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = value; -#line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - self->priv->_is_core = _tmp0_; -#line 1468 "Plugins.c" + self->priv->_is_core = value; +#line 1637 "Plugins.c" } -gboolean plugins_pluggable_rep_get_activated (PluginsPluggableRep* self) { +gboolean +plugins_pluggable_rep_get_activated (PluginsPluggableRep* self) +{ gboolean result; gboolean _tmp0_; #line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1479,120 +1650,145 @@ gboolean plugins_pluggable_rep_get_activated (PluginsPluggableRep* self) { result = _tmp0_; #line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 1483 "Plugins.c" +#line 1654 "Plugins.c" } -static void plugins_pluggable_rep_set_activated (PluginsPluggableRep* self, gboolean value) { - gboolean _tmp0_; +static void +plugins_pluggable_rep_set_activated (PluginsPluggableRep* self, + gboolean value) +{ #line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (PLUGINS_IS_PLUGGABLE_REP (self)); #line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = value; -#line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - self->priv->_activated = _tmp0_; -#line 1495 "Plugins.c" + self->priv->_activated = value; +#line 1666 "Plugins.c" } -static void plugins_value_pluggable_rep_init (GValue* value) { +static void +plugins_value_pluggable_rep_init (GValue* value) +{ #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 1502 "Plugins.c" +#line 1675 "Plugins.c" } -static void plugins_value_pluggable_rep_free_value (GValue* value) { +static void +plugins_value_pluggable_rep_free_value (GValue* value) +{ #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (value->data[0].v_pointer) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_pluggable_rep_unref (value->data[0].v_pointer); -#line 1511 "Plugins.c" +#line 1686 "Plugins.c" } } -static void plugins_value_pluggable_rep_copy_value (const GValue* src_value, GValue* dest_value) { +static void +plugins_value_pluggable_rep_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (src_value->data[0].v_pointer) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" dest_value->data[0].v_pointer = plugins_pluggable_rep_ref (src_value->data[0].v_pointer); -#line 1521 "Plugins.c" +#line 1699 "Plugins.c" } else { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" dest_value->data[0].v_pointer = NULL; -#line 1525 "Plugins.c" +#line 1703 "Plugins.c" } } -static gpointer plugins_value_pluggable_rep_peek_pointer (const GValue* value) { +static gpointer +plugins_value_pluggable_rep_peek_pointer (const GValue* value) +{ #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return value->data[0].v_pointer; -#line 1533 "Plugins.c" +#line 1713 "Plugins.c" } -static gchar* plugins_value_pluggable_rep_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +plugins_value_pluggable_rep_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (collect_values[0].v_pointer) { -#line 1540 "Plugins.c" +#line 1725 "Plugins.c" PluginsPluggableRep * object; object = collect_values[0].v_pointer; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (object->parent_instance.g_class == NULL) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1547 "Plugins.c" +#line 1732 "Plugins.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.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 1551 "Plugins.c" +#line 1736 "Plugins.c" } #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = plugins_pluggable_rep_ref (object); -#line 1555 "Plugins.c" +#line 1740 "Plugins.c" } else { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 1559 "Plugins.c" +#line 1744 "Plugins.c" } #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return NULL; -#line 1563 "Plugins.c" +#line 1748 "Plugins.c" } -static gchar* plugins_value_pluggable_rep_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +plugins_value_pluggable_rep_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PluginsPluggableRep ** object_p; object_p = collect_values[0].v_pointer; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!object_p) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1574 "Plugins.c" +#line 1764 "Plugins.c" } #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!value->data[0].v_pointer) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = NULL; -#line 1580 "Plugins.c" +#line 1770 "Plugins.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = value->data[0].v_pointer; -#line 1584 "Plugins.c" +#line 1774 "Plugins.c" } else { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = plugins_pluggable_rep_ref (value->data[0].v_pointer); -#line 1588 "Plugins.c" +#line 1778 "Plugins.c" } #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return NULL; -#line 1592 "Plugins.c" +#line 1782 "Plugins.c" } -GParamSpec* plugins_param_spec_pluggable_rep (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +plugins_param_spec_pluggable_rep (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ PluginsParamSpecPluggableRep* spec; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (g_type_is_a (object_type, PLUGINS_TYPE_PLUGGABLE_REP), NULL); @@ -1602,20 +1798,25 @@ GParamSpec* plugins_param_spec_pluggable_rep (const gchar* name, const gchar* ni G_PARAM_SPEC (spec)->value_type = object_type; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return G_PARAM_SPEC (spec); -#line 1606 "Plugins.c" +#line 1802 "Plugins.c" } -gpointer plugins_value_get_pluggable_rep (const GValue* value) { +gpointer +plugins_value_get_pluggable_rep (const GValue* value) +{ #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_PLUGGABLE_REP), NULL); #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return value->data[0].v_pointer; -#line 1615 "Plugins.c" +#line 1813 "Plugins.c" } -void plugins_value_set_pluggable_rep (GValue* value, gpointer v_object) { +void +plugins_value_set_pluggable_rep (GValue* value, + gpointer v_object) +{ PluginsPluggableRep * old; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_PLUGGABLE_REP)); @@ -1631,22 +1832,25 @@ void plugins_value_set_pluggable_rep (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_pluggable_rep_ref (value->data[0].v_pointer); -#line 1635 "Plugins.c" +#line 1836 "Plugins.c" } else { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 1639 "Plugins.c" +#line 1840 "Plugins.c" } #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (old) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_pluggable_rep_unref (old); -#line 1645 "Plugins.c" +#line 1846 "Plugins.c" } } -void plugins_value_take_pluggable_rep (GValue* value, gpointer v_object) { +void +plugins_value_take_pluggable_rep (GValue* value, + gpointer v_object) +{ PluginsPluggableRep * old; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_PLUGGABLE_REP)); @@ -1660,33 +1864,37 @@ void plugins_value_take_pluggable_rep (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = v_object; -#line 1664 "Plugins.c" +#line 1868 "Plugins.c" } else { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 1668 "Plugins.c" +#line 1872 "Plugins.c" } #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (old) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_pluggable_rep_unref (old); -#line 1674 "Plugins.c" +#line 1878 "Plugins.c" } } -static void plugins_pluggable_rep_class_init (PluginsPluggableRepClass * klass) { +static void +plugins_pluggable_rep_class_init (PluginsPluggableRepClass * klass) +{ #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_pluggable_rep_parent_class = g_type_class_peek_parent (klass); #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" ((PluginsPluggableRepClass *) klass)->finalize = plugins_pluggable_rep_finalize; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_type_class_add_private (klass, sizeof (PluginsPluggableRepPrivate)); -#line 1686 "Plugins.c" +#line 1892 "Plugins.c" } -static void plugins_pluggable_rep_instance_init (PluginsPluggableRep * self) { +static void +plugins_pluggable_rep_instance_init (PluginsPluggableRep * self) +{ #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->priv = PLUGINS_PLUGGABLE_REP_GET_PRIVATE (self); #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1697,11 +1905,13 @@ static void plugins_pluggable_rep_instance_init (PluginsPluggableRep * self) { self->priv->enabled = FALSE; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->ref_count = 1; -#line 1701 "Plugins.c" +#line 1909 "Plugins.c" } -static void plugins_pluggable_rep_finalize (PluginsPluggableRep * obj) { +static void +plugins_pluggable_rep_finalize (PluginsPluggableRep * obj) +{ PluginsPluggableRep * self; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_PLUGGABLE_REP, PluginsPluggableRep); @@ -1711,11 +1921,13 @@ static void plugins_pluggable_rep_finalize (PluginsPluggableRep * obj) { _g_object_unref0 (self->priv->_pluggable); #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_free0 (self->priv->_id); -#line 1715 "Plugins.c" +#line 1925 "Plugins.c" } -GType plugins_pluggable_rep_get_type (void) { +GType +plugins_pluggable_rep_get_type (void) +{ static volatile gsize plugins_pluggable_rep_type_id__volatile = 0; if (g_once_init_enter (&plugins_pluggable_rep_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { plugins_value_pluggable_rep_init, plugins_value_pluggable_rep_free_value, plugins_value_pluggable_rep_copy_value, plugins_value_pluggable_rep_peek_pointer, "p", plugins_value_pluggable_rep_collect_value, "p", plugins_value_pluggable_rep_lcopy_value }; @@ -1729,18 +1941,22 @@ GType plugins_pluggable_rep_get_type (void) { } -gpointer plugins_pluggable_rep_ref (gpointer instance) { +gpointer +plugins_pluggable_rep_ref (gpointer instance) +{ PluginsPluggableRep * self; self = instance; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_atomic_int_inc (&self->ref_count); #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return instance; -#line 1740 "Plugins.c" +#line 1954 "Plugins.c" } -void plugins_pluggable_rep_unref (gpointer instance) { +void +plugins_pluggable_rep_unref (gpointer instance) +{ PluginsPluggableRep * self; self = instance; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1749,46 +1965,58 @@ void plugins_pluggable_rep_unref (gpointer instance) { PLUGINS_PLUGGABLE_REP_GET_CLASS (self)->finalize (self); #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1753 "Plugins.c" +#line 1969 "Plugins.c" } } -static void _vala_array_add50 (GFile** * array, int* length, int* size, GFile* value) { +static void +_vala_array_add50 (GFile** * array, + int* length, + int* size, + GFile* value) +{ #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if ((*length) == (*size)) { #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *size = (*size) ? (2 * (*size)) : 4; #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *array = g_renew (GFile*, *array, (*size) + 1); -#line 1765 "Plugins.c" +#line 1986 "Plugins.c" } #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" (*array)[(*length)++] = value; #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" (*array)[*length] = NULL; -#line 1771 "Plugins.c" +#line 1992 "Plugins.c" } -static void _vala_array_add51 (GFile** * array, int* length, int* size, GFile* value) { +static void +_vala_array_add51 (GFile** * array, + int* length, + int* size, + GFile* value) +{ #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if ((*length) == (*size)) { #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *size = (*size) ? (2 * (*size)) : 4; #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *array = g_renew (GFile*, *array, (*size) + 1); -#line 1782 "Plugins.c" +#line 2008 "Plugins.c" } #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" (*array)[(*length)++] = value; #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" (*array)[*length] = NULL; -#line 1788 "Plugins.c" +#line 2014 "Plugins.c" } -void plugins_init (GError** error) { +void +plugins_init (GError** error) +{ GFile** _tmp0_; GFile** _tmp1_; gint _tmp1__length1; @@ -1800,9 +2028,8 @@ void plugins_init (GError** error) { GeeHashMap* _tmp6_; GeeHashMap* _tmp7_; GeeHashSet* _tmp8_; - gboolean _tmp9_; - GFile** _tmp10_; - gint _tmp10__length1; + GFile** _tmp9_; + gint _tmp9__length1; GError * _inner_error_ = NULL; #line 114 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = g_new0 (GFile*, 0 + 1); @@ -1855,50 +2082,48 @@ void plugins_init (GError** error) { #line 121 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_core_ids = _tmp8_; #line 125 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp9_ = g_module_supported (); -#line 125 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (!_tmp9_) { + if (!g_module_supported ()) { #line 126 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_warning ("Plugins.vala:126: Plugins not support: GModule not supported on this p" \ "latform."); #line 128 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 1866 "Plugins.c" +#line 2091 "Plugins.c" } #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp10_ = plugins_search_dirs; + _tmp9_ = plugins_search_dirs; #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp10__length1 = plugins_search_dirs_length1; -#line 1872 "Plugins.c" + _tmp9__length1 = plugins_search_dirs_length1; +#line 2097 "Plugins.c" { GFile** dir_collection = NULL; gint dir_collection_length1 = 0; gint _dir_collection_size_ = 0; gint dir_it = 0; #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - dir_collection = _tmp10_; + dir_collection = _tmp9_; #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - dir_collection_length1 = _tmp10__length1; + dir_collection_length1 = _tmp9__length1; #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - for (dir_it = 0; dir_it < _tmp10__length1; dir_it = dir_it + 1) { -#line 1884 "Plugins.c" - GFile* _tmp11_; + for (dir_it = 0; dir_it < _tmp9__length1; dir_it = dir_it + 1) { +#line 2109 "Plugins.c" + GFile* _tmp10_; GFile* dir = NULL; #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp11_ = _g_object_ref0 (dir_collection[dir_it]); + _tmp10_ = _g_object_ref0 (dir_collection[dir_it]); #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - dir = _tmp11_; -#line 1891 "Plugins.c" + dir = _tmp10_; +#line 2116 "Plugins.c" { { - GFile* _tmp12_; + GFile* _tmp11_; #line 133 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp12_ = dir; + _tmp11_ = dir; #line 133 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - plugins_search_for_plugins (_tmp12_, &_inner_error_); + plugins_search_for_plugins (_tmp11_, &_inner_error_); #line 133 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1901 "Plugins.c" +#line 2126 "Plugins.c" goto __catch39_g_error; } } @@ -1906,32 +2131,32 @@ void plugins_init (GError** error) { __catch39_g_error: { GError* err = NULL; - GFile* _tmp13_; + GFile* _tmp12_; + gchar* _tmp13_; gchar* _tmp14_; - gchar* _tmp15_; - GError* _tmp16_; - const gchar* _tmp17_; + GError* _tmp15_; + const gchar* _tmp16_; #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" err = _inner_error_; #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _inner_error_ = NULL; #line 135 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp13_ = dir; + _tmp12_ = dir; #line 135 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp14_ = g_file_get_path (_tmp13_); + _tmp13_ = g_file_get_path (_tmp12_); #line 135 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 135 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp16_ = err; + _tmp15_ = err; #line 135 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp17_ = _tmp16_->message; + _tmp16_ = _tmp15_->message; #line 135 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - g_debug ("Plugins.vala:135: Unable to search directory %s for plugins: %s", _tmp15_, _tmp17_); + g_debug ("Plugins.vala:135: Unable to search directory %s for plugins: %s", _tmp14_, _tmp16_); #line 135 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp14_); #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_error_free0 (err); -#line 1934 "Plugins.c" +#line 2159 "Plugins.c" } __finally39: #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1942,18 +2167,20 @@ void plugins_init (GError** error) { _g_object_unref0 (dir); #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 1945 "Plugins.c" +#line 2170 "Plugins.c" } #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (dir); -#line 1949 "Plugins.c" +#line 2174 "Plugins.c" } } } } -void plugins_terminate (void) { +void +plugins_terminate (void) +{ #line 141 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_search_dirs = (_vala_array_free (plugins_search_dirs, plugins_search_dirs_length1, (GDestroyNotify) g_object_unref), NULL); #line 141 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1978,35 +2205,43 @@ void plugins_terminate (void) { _g_object_unref0 (plugins_core_ids); #line 145 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_core_ids = NULL; -#line 1981 "Plugins.c" +#line 2208 "Plugins.c" } -static PluginsNotifier* plugins_notifier_construct (GType object_type) { +static PluginsNotifier* +plugins_notifier_construct (GType object_type) +{ PluginsNotifier* self = NULL; #line 153 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self = (PluginsNotifier*) g_type_create_instance (object_type); #line 153 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return self; -#line 1991 "Plugins.c" +#line 2220 "Plugins.c" } -static PluginsNotifier* plugins_notifier_new (void) { +static PluginsNotifier* +plugins_notifier_new (void) +{ #line 153 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return plugins_notifier_construct (PLUGINS_TYPE_NOTIFIER); -#line 1998 "Plugins.c" +#line 2229 "Plugins.c" } -static gpointer _plugins_notifier_ref0 (gpointer self) { +static gpointer +_plugins_notifier_ref0 (gpointer self) +{ #line 160 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return self ? plugins_notifier_ref (self) : NULL; -#line 2005 "Plugins.c" +#line 2238 "Plugins.c" } -PluginsNotifier* plugins_notifier_get_instance (void) { +PluginsNotifier* +plugins_notifier_get_instance (void) +{ PluginsNotifier* result = NULL; PluginsNotifier* _tmp0_; PluginsNotifier* _tmp2_; @@ -2015,7 +2250,7 @@ PluginsNotifier* plugins_notifier_get_instance (void) { _tmp0_ = plugins_notifier_instance; #line 157 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp0_ == NULL) { -#line 2018 "Plugins.c" +#line 2253 "Plugins.c" PluginsNotifier* _tmp1_; #line 158 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp1_ = plugins_notifier_new (); @@ -2023,7 +2258,7 @@ PluginsNotifier* plugins_notifier_get_instance (void) { _plugins_notifier_unref0 (plugins_notifier_instance); #line 158 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_notifier_instance = _tmp1_; -#line 2026 "Plugins.c" +#line 2261 "Plugins.c" } #line 160 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp2_ = plugins_notifier_instance; @@ -2033,11 +2268,18 @@ PluginsNotifier* plugins_notifier_get_instance (void) { result = _tmp3_; #line 160 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 2036 "Plugins.c" +#line 2271 "Plugins.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_BOOLEAN) (gpointer data1, gpointer arg_1, gboolean arg_2, gpointer data2); register GMarshalFunc_VOID__OBJECT_BOOLEAN callback; register GCClosure * cc; @@ -2052,120 +2294,145 @@ static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, GV data1 = closure->data; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" data2 = param_values->data[0].v_pointer; -#line 2055 "Plugins.c" +#line 2297 "Plugins.c" } else { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" data1 = param_values->data[0].v_pointer; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" data2 = closure->data; -#line 2061 "Plugins.c" +#line 2303 "Plugins.c" } #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" callback = (GMarshalFunc_VOID__OBJECT_BOOLEAN) (marshal_data ? marshal_data : cc->callback); #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_boolean (param_values + 2), data2); -#line 2067 "Plugins.c" +#line 2309 "Plugins.c" } -static void plugins_value_notifier_init (GValue* value) { +static void +plugins_value_notifier_init (GValue* value) +{ #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 2074 "Plugins.c" +#line 2318 "Plugins.c" } -static void plugins_value_notifier_free_value (GValue* value) { +static void +plugins_value_notifier_free_value (GValue* value) +{ #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (value->data[0].v_pointer) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_notifier_unref (value->data[0].v_pointer); -#line 2083 "Plugins.c" +#line 2329 "Plugins.c" } } -static void plugins_value_notifier_copy_value (const GValue* src_value, GValue* dest_value) { +static void +plugins_value_notifier_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (src_value->data[0].v_pointer) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" dest_value->data[0].v_pointer = plugins_notifier_ref (src_value->data[0].v_pointer); -#line 2093 "Plugins.c" +#line 2342 "Plugins.c" } else { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" dest_value->data[0].v_pointer = NULL; -#line 2097 "Plugins.c" +#line 2346 "Plugins.c" } } -static gpointer plugins_value_notifier_peek_pointer (const GValue* value) { +static gpointer +plugins_value_notifier_peek_pointer (const GValue* value) +{ #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return value->data[0].v_pointer; -#line 2105 "Plugins.c" +#line 2356 "Plugins.c" } -static gchar* plugins_value_notifier_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +plugins_value_notifier_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (collect_values[0].v_pointer) { -#line 2112 "Plugins.c" +#line 2368 "Plugins.c" PluginsNotifier * object; object = collect_values[0].v_pointer; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (object->parent_instance.g_class == NULL) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2119 "Plugins.c" +#line 2375 "Plugins.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.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 2123 "Plugins.c" +#line 2379 "Plugins.c" } #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = plugins_notifier_ref (object); -#line 2127 "Plugins.c" +#line 2383 "Plugins.c" } else { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 2131 "Plugins.c" +#line 2387 "Plugins.c" } #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return NULL; -#line 2135 "Plugins.c" +#line 2391 "Plugins.c" } -static gchar* plugins_value_notifier_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +plugins_value_notifier_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PluginsNotifier ** object_p; object_p = collect_values[0].v_pointer; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!object_p) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2146 "Plugins.c" +#line 2407 "Plugins.c" } #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!value->data[0].v_pointer) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = NULL; -#line 2152 "Plugins.c" +#line 2413 "Plugins.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = value->data[0].v_pointer; -#line 2156 "Plugins.c" +#line 2417 "Plugins.c" } else { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = plugins_notifier_ref (value->data[0].v_pointer); -#line 2160 "Plugins.c" +#line 2421 "Plugins.c" } #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return NULL; -#line 2164 "Plugins.c" +#line 2425 "Plugins.c" } -GParamSpec* plugins_param_spec_notifier (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +plugins_param_spec_notifier (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ PluginsParamSpecNotifier* spec; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (g_type_is_a (object_type, PLUGINS_TYPE_NOTIFIER), NULL); @@ -2175,20 +2442,25 @@ GParamSpec* plugins_param_spec_notifier (const gchar* name, const gchar* nick, c G_PARAM_SPEC (spec)->value_type = object_type; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return G_PARAM_SPEC (spec); -#line 2178 "Plugins.c" +#line 2445 "Plugins.c" } -gpointer plugins_value_get_notifier (const GValue* value) { +gpointer +plugins_value_get_notifier (const GValue* value) +{ #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_NOTIFIER), NULL); #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return value->data[0].v_pointer; -#line 2187 "Plugins.c" +#line 2456 "Plugins.c" } -void plugins_value_set_notifier (GValue* value, gpointer v_object) { +void +plugins_value_set_notifier (GValue* value, + gpointer v_object) +{ PluginsNotifier * old; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_NOTIFIER)); @@ -2204,22 +2476,25 @@ void plugins_value_set_notifier (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_notifier_ref (value->data[0].v_pointer); -#line 2207 "Plugins.c" +#line 2479 "Plugins.c" } else { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 2211 "Plugins.c" +#line 2483 "Plugins.c" } #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (old) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_notifier_unref (old); -#line 2217 "Plugins.c" +#line 2489 "Plugins.c" } } -void plugins_value_take_notifier (GValue* value, gpointer v_object) { +void +plugins_value_take_notifier (GValue* value, + gpointer v_object) +{ PluginsNotifier * old; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_NOTIFIER)); @@ -2233,50 +2508,58 @@ void plugins_value_take_notifier (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = v_object; -#line 2236 "Plugins.c" +#line 2511 "Plugins.c" } else { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 2240 "Plugins.c" +#line 2515 "Plugins.c" } #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (old) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_notifier_unref (old); -#line 2246 "Plugins.c" +#line 2521 "Plugins.c" } } -static void plugins_notifier_class_init (PluginsNotifierClass * klass) { +static void +plugins_notifier_class_init (PluginsNotifierClass * klass) +{ #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_notifier_parent_class = g_type_class_peek_parent (klass); #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" ((PluginsNotifierClass *) klass)->finalize = plugins_notifier_finalize; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_notifier_signals[PLUGINS_NOTIFIER_PLUGGABLE_ACTIVATION_SIGNAL] = g_signal_new ("pluggable-activation", PLUGINS_TYPE_NOTIFIER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, SPIT_TYPE_PLUGGABLE, G_TYPE_BOOLEAN); -#line 2258 "Plugins.c" +#line 2535 "Plugins.c" } -static void plugins_notifier_instance_init (PluginsNotifier * self) { +static void +plugins_notifier_instance_init (PluginsNotifier * self) +{ #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->ref_count = 1; -#line 2265 "Plugins.c" +#line 2544 "Plugins.c" } -static void plugins_notifier_finalize (PluginsNotifier * obj) { +static void +plugins_notifier_finalize (PluginsNotifier * obj) +{ PluginsNotifier * self; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_NOTIFIER, PluginsNotifier); #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_signal_handlers_destroy (self); -#line 2275 "Plugins.c" +#line 2556 "Plugins.c" } -GType plugins_notifier_get_type (void) { +GType +plugins_notifier_get_type (void) +{ static volatile gsize plugins_notifier_type_id__volatile = 0; if (g_once_init_enter (&plugins_notifier_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { plugins_value_notifier_init, plugins_value_notifier_free_value, plugins_value_notifier_copy_value, plugins_value_notifier_peek_pointer, "p", plugins_value_notifier_collect_value, "p", plugins_value_notifier_lcopy_value }; @@ -2290,18 +2573,22 @@ GType plugins_notifier_get_type (void) { } -gpointer plugins_notifier_ref (gpointer instance) { +gpointer +plugins_notifier_ref (gpointer instance) +{ PluginsNotifier * self; self = instance; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_atomic_int_inc (&self->ref_count); #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return instance; -#line 2300 "Plugins.c" +#line 2585 "Plugins.c" } -void plugins_notifier_unref (gpointer instance) { +void +plugins_notifier_unref (gpointer instance) +{ PluginsNotifier * self; self = instance; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2310,223 +2597,179 @@ void plugins_notifier_unref (gpointer instance) { PLUGINS_NOTIFIER_GET_CLASS (self)->finalize (self); #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2313 "Plugins.c" +#line 2600 "Plugins.c" } } -void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1) { +void +plugins_register_extension_point (GType type, + const gchar* name, + const gchar* icon_name, + gchar** core_ids, + int core_ids_length1) +{ GeeHashMap* _tmp0_; - GType _tmp1_; - gboolean _tmp2_; - GeeHashMap* _tmp3_; - GType _tmp4_; - GType _tmp5_; - const gchar* _tmp6_; - const gchar* _tmp7_; - gchar** _tmp8_; - gint _tmp8__length1; - PluginsExtensionPoint* _tmp9_; - PluginsExtensionPoint* _tmp10_; - gchar** _tmp11_; - gint _tmp11__length1; + GeeHashMap* _tmp1_; + PluginsExtensionPoint* _tmp2_; + PluginsExtensionPoint* _tmp3_; #line 164 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (name != NULL); #line 166 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = plugins_extension_points; #line 166 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = type; -#line 166 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp1_)); -#line 166 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _vala_assert (!_tmp2_, "!extension_points.has_key(type)"); -#line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = plugins_extension_points; -#line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp4_ = type; -#line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp5_ = type; + _vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) type)), "!extension_points.has_key(type)"); #line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp6_ = name; + _tmp1_ = plugins_extension_points; #line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp7_ = icon_name; + _tmp2_ = plugins_extension_point_new (type, name, icon_name, core_ids, core_ids_length1); #line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp8_ = core_ids; -#line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp8__length1 = core_ids_length1; -#line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp9_ = plugins_extension_point_new (_tmp5_, _tmp6_, _tmp7_, _tmp8_, _tmp8__length1); -#line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp10_ = _tmp9_; + _tmp3_ = _tmp2_; #line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp4_), _tmp10_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) type), _tmp3_); #line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _plugins_extension_point_unref0 (_tmp10_); -#line 171 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp11_ = core_ids; + _plugins_extension_point_unref0 (_tmp3_); #line 171 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp11__length1 = core_ids_length1; -#line 171 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp11_ != NULL) { -#line 2371 "Plugins.c" - gchar** _tmp12_; - gint _tmp12__length1; -#line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp12_ = core_ids; -#line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp12__length1 = core_ids_length1; -#line 2378 "Plugins.c" + if (core_ids != NULL) { +#line 2634 "Plugins.c" { gchar** core_id_collection = NULL; gint core_id_collection_length1 = 0; gint _core_id_collection_size_ = 0; gint core_id_it = 0; #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - core_id_collection = _tmp12_; + core_id_collection = core_ids; #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - core_id_collection_length1 = _tmp12__length1; + core_id_collection_length1 = core_ids_length1; #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - for (core_id_it = 0; core_id_it < _tmp12__length1; core_id_it = core_id_it + 1) { -#line 2390 "Plugins.c" - gchar* _tmp13_; + for (core_id_it = 0; core_id_it < core_ids_length1; core_id_it = core_id_it + 1) { +#line 2646 "Plugins.c" + gchar* _tmp4_; gchar* core_id = NULL; #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp13_ = g_strdup (core_id_collection[core_id_it]); + _tmp4_ = g_strdup (core_id_collection[core_id_it]); #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - core_id = _tmp13_; -#line 2397 "Plugins.c" + core_id = _tmp4_; +#line 2653 "Plugins.c" { - GeeHashSet* _tmp14_; - const gchar* _tmp15_; + GeeHashSet* _tmp5_; + const gchar* _tmp6_; #line 173 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp14_ = plugins_core_ids; + _tmp5_ = plugins_core_ids; #line 173 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp15_ = core_id; + _tmp6_ = core_id; #line 173 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp6_); #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_free0 (core_id); -#line 2409 "Plugins.c" +#line 2665 "Plugins.c" } } } } { GeeIterator* _pluggable_rep_it = NULL; - GeeHashMap* _tmp16_; - GeeCollection* _tmp17_; - GeeCollection* _tmp18_; - GeeCollection* _tmp19_; - GeeIterator* _tmp20_; - GeeIterator* _tmp21_; + GeeHashMap* _tmp7_; + GeeCollection* _tmp8_; + GeeCollection* _tmp9_; + GeeCollection* _tmp10_; + GeeIterator* _tmp11_; + GeeIterator* _tmp12_; #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp16_ = plugins_pluggable_table; + _tmp7_ = plugins_pluggable_table; #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp17_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp8_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp18_ = _tmp17_; + _tmp9_ = _tmp8_; #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp19_ = _tmp18_; + _tmp10_ = _tmp9_; #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp21_ = _tmp20_; + _tmp12_ = _tmp11_; #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _g_object_unref0 (_tmp19_); + _g_object_unref0 (_tmp10_); #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _pluggable_rep_it = _tmp21_; + _pluggable_rep_it = _tmp12_; #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" while (TRUE) { -#line 2440 "Plugins.c" - GeeIterator* _tmp22_; - gboolean _tmp23_; +#line 2696 "Plugins.c" + GeeIterator* _tmp13_; PluginsPluggableRep* pluggable_rep = NULL; - GeeIterator* _tmp24_; - gpointer _tmp25_; - PluginsPluggableRep* _tmp26_; - SpitPluggable* _tmp27_; - SpitPluggable* _tmp28_; - GType _tmp29_; - GType _tmp30_; - gboolean _tmp31_; - PluginsPluggableRep* _tmp32_; - PluginsNotifier* _tmp33_; - PluginsNotifier* _tmp34_; - PluginsPluggableRep* _tmp35_; - SpitPluggable* _tmp36_; - SpitPluggable* _tmp37_; - PluginsPluggableRep* _tmp38_; - gboolean _tmp39_; -#line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp22_ = _pluggable_rep_it; + GeeIterator* _tmp14_; + gpointer _tmp15_; + PluginsPluggableRep* _tmp16_; + SpitPluggable* _tmp17_; + SpitPluggable* _tmp18_; + PluginsPluggableRep* _tmp19_; + PluginsNotifier* _tmp20_; + PluginsNotifier* _tmp21_; + PluginsPluggableRep* _tmp22_; + SpitPluggable* _tmp23_; + SpitPluggable* _tmp24_; + PluginsPluggableRep* _tmp25_; #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp23_ = gee_iterator_next (_tmp22_); + _tmp13_ = _pluggable_rep_it; #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (!_tmp23_) { + if (!gee_iterator_next (_tmp13_)) { #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" break; -#line 2468 "Plugins.c" +#line 2717 "Plugins.c" } #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp24_ = _pluggable_rep_it; + _tmp14_ = _pluggable_rep_it; #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp25_ = gee_iterator_get (_tmp24_); + _tmp15_ = gee_iterator_get (_tmp14_); #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - pluggable_rep = (PluginsPluggableRep*) _tmp25_; -#line 178 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp26_ = pluggable_rep; -#line 178 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp27_ = plugins_pluggable_rep_get_pluggable (_tmp26_); + pluggable_rep = (PluginsPluggableRep*) _tmp15_; #line 178 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp28_ = _tmp27_; + _tmp16_ = pluggable_rep; #line 178 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp29_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, G_TYPE_OBJECT, GObject)); + _tmp17_ = plugins_pluggable_rep_get_pluggable (_tmp16_); #line 178 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp30_ = type; + _tmp18_ = _tmp17_; #line 178 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp31_ = g_type_is_a (_tmp29_, _tmp30_); -#line 178 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (!_tmp31_) { + if (!g_type_is_a (G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, G_TYPE_OBJECT, GObject)), type)) { #line 179 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_pluggable_rep_unref0 (pluggable_rep); #line 179 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" continue; -#line 2494 "Plugins.c" +#line 2737 "Plugins.c" } #line 181 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp32_ = pluggable_rep; + _tmp19_ = pluggable_rep; #line 181 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - plugins_pluggable_rep_activate (_tmp32_); -#line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp33_ = plugins_notifier_get_instance (); + plugins_pluggable_rep_activate (_tmp19_); #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp34_ = _tmp33_; + _tmp20_ = plugins_notifier_get_instance (); #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp35_ = pluggable_rep; + _tmp21_ = _tmp20_; #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp36_ = plugins_pluggable_rep_get_pluggable (_tmp35_); + _tmp22_ = pluggable_rep; #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp37_ = _tmp36_; + _tmp23_ = plugins_pluggable_rep_get_pluggable (_tmp22_); #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp38_ = pluggable_rep; + _tmp24_ = _tmp23_; #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp39_ = plugins_pluggable_rep_is_enabled (_tmp38_); + _tmp25_ = pluggable_rep; #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - g_signal_emit (_tmp34_, plugins_notifier_signals[PLUGINS_NOTIFIER_PLUGGABLE_ACTIVATION_SIGNAL], 0, _tmp37_, _tmp39_); + g_signal_emit (_tmp21_, plugins_notifier_signals[PLUGINS_NOTIFIER_PLUGGABLE_ACTIVATION_SIGNAL], 0, _tmp24_, plugins_pluggable_rep_is_enabled (_tmp25_)); #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _plugins_notifier_unref0 (_tmp34_); + _plugins_notifier_unref0 (_tmp21_); #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_pluggable_rep_unref0 (pluggable_rep); -#line 2520 "Plugins.c" +#line 2761 "Plugins.c" } #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (_pluggable_rep_it); -#line 2524 "Plugins.c" +#line 2765 "Plugins.c" } } -GeeCollection* plugins_get_pluggables (gboolean include_disabled) { +GeeCollection* +plugins_get_pluggables (gboolean include_disabled) +{ GeeCollection* result = NULL; GeeCollection* all = NULL; GeeHashSet* _tmp0_; @@ -2534,7 +2777,7 @@ GeeCollection* plugins_get_pluggables (gboolean include_disabled) { _tmp0_ = gee_hash_set_new (SPIT_TYPE_PLUGGABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 187 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" all = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); -#line 2537 "Plugins.c" +#line 2780 "Plugins.c" { GeeIterator* _pluggable_rep_it = NULL; GeeHashMap* _tmp1_; @@ -2561,154 +2804,146 @@ GeeCollection* plugins_get_pluggables (gboolean include_disabled) { _pluggable_rep_it = _tmp6_; #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" while (TRUE) { -#line 2564 "Plugins.c" +#line 2807 "Plugins.c" GeeIterator* _tmp7_; - gboolean _tmp8_; PluginsPluggableRep* pluggable_rep = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; - gboolean _tmp11_ = FALSE; - PluginsPluggableRep* _tmp12_; + GeeIterator* _tmp8_; + gpointer _tmp9_; + gboolean _tmp10_ = FALSE; + PluginsPluggableRep* _tmp11_; + gboolean _tmp12_; gboolean _tmp13_; - gboolean _tmp14_; #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp7_ = _pluggable_rep_it; #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp8_ = gee_iterator_next (_tmp7_); -#line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp7_)) { #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" break; -#line 2582 "Plugins.c" +#line 2822 "Plugins.c" } #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp9_ = _pluggable_rep_it; + _tmp8_ = _pluggable_rep_it; #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp9_ = gee_iterator_get (_tmp8_); #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - pluggable_rep = (PluginsPluggableRep*) _tmp10_; + pluggable_rep = (PluginsPluggableRep*) _tmp9_; #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp12_ = pluggable_rep; + _tmp11_ = pluggable_rep; #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp13_ = plugins_pluggable_rep_get_activated (_tmp12_); + _tmp12_ = plugins_pluggable_rep_get_activated (_tmp11_); #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp14_) { -#line 2598 "Plugins.c" - gboolean _tmp15_ = FALSE; - gboolean _tmp16_; + if (_tmp13_) { +#line 2838 "Plugins.c" + gboolean _tmp14_ = FALSE; #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp16_ = include_disabled; + if (include_disabled) { #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp16_) { -#line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp15_ = TRUE; -#line 2607 "Plugins.c" + _tmp14_ = TRUE; +#line 2844 "Plugins.c" } else { - PluginsPluggableRep* _tmp17_; - gboolean _tmp18_; -#line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp17_ = pluggable_rep; + PluginsPluggableRep* _tmp15_; #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp18_ = plugins_pluggable_rep_is_enabled (_tmp17_); + _tmp15_ = pluggable_rep; #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp15_ = _tmp18_; -#line 2617 "Plugins.c" + _tmp14_ = plugins_pluggable_rep_is_enabled (_tmp15_); +#line 2851 "Plugins.c" } #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp11_ = _tmp15_; -#line 2621 "Plugins.c" + _tmp10_ = _tmp14_; +#line 2855 "Plugins.c" } else { #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp11_ = FALSE; -#line 2625 "Plugins.c" + _tmp10_ = FALSE; +#line 2859 "Plugins.c" } #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp11_) { -#line 2629 "Plugins.c" - GeeCollection* _tmp19_; - PluginsPluggableRep* _tmp20_; - SpitPluggable* _tmp21_; - SpitPluggable* _tmp22_; + if (_tmp10_) { +#line 2863 "Plugins.c" + GeeCollection* _tmp16_; + PluginsPluggableRep* _tmp17_; + SpitPluggable* _tmp18_; + SpitPluggable* _tmp19_; #line 190 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp19_ = all; + _tmp16_ = all; #line 190 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp20_ = pluggable_rep; + _tmp17_ = pluggable_rep; #line 190 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp21_ = plugins_pluggable_rep_get_pluggable (_tmp20_); + _tmp18_ = plugins_pluggable_rep_get_pluggable (_tmp17_); #line 190 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp22_ = _tmp21_; + _tmp19_ = _tmp18_; #line 190 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - gee_collection_add (_tmp19_, _tmp22_); -#line 2644 "Plugins.c" + gee_collection_add (_tmp16_, _tmp19_); +#line 2878 "Plugins.c" } #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_pluggable_rep_unref0 (pluggable_rep); -#line 2648 "Plugins.c" +#line 2882 "Plugins.c" } #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (_pluggable_rep_it); -#line 2652 "Plugins.c" +#line 2886 "Plugins.c" } #line 193 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result = all; #line 193 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 2658 "Plugins.c" +#line 2892 "Plugins.c" } -gboolean plugins_is_core_pluggable (SpitPluggable* pluggable) { +gboolean +plugins_is_core_pluggable (SpitPluggable* pluggable) +{ gboolean result = FALSE; GeeHashSet* _tmp0_; - SpitPluggable* _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; + const gchar* _tmp1_; #line 196 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (SPIT_IS_PLUGGABLE (pluggable), FALSE); #line 197 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = plugins_core_ids; #line 197 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = pluggable; -#line 197 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = spit_pluggable_get_id (_tmp1_); + _tmp1_ = spit_pluggable_get_id (pluggable); #line 197 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); -#line 197 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - result = _tmp3_; + result = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); #line 197 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 2682 "Plugins.c" +#line 2912 "Plugins.c" } -static SpitPluggable** _vala_array_dup17 (SpitPluggable** self, int length) { +static SpitPluggable** +_vala_array_dup17 (SpitPluggable** self, + int length) +{ SpitPluggable** result; int i; #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result = g_new0 (SpitPluggable*, length + 1); #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" for (i = 0; i < length; i++) { -#line 2693 "Plugins.c" +#line 2926 "Plugins.c" SpitPluggable* _tmp0_; #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result[i] = _tmp0_; -#line 2699 "Plugins.c" +#line 2932 "Plugins.c" } #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 2703 "Plugins.c" +#line 2936 "Plugins.c" } -PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) { +PluginsModuleRep* +plugins_get_module_for_pluggable (SpitPluggable* needle) +{ PluginsModuleRep* result = NULL; #line 200 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (SPIT_IS_PLUGGABLE (needle), NULL); -#line 2711 "Plugins.c" +#line 2946 "Plugins.c" { GeeIterator* _module_rep_it = NULL; GeeHashMap* _tmp0_; @@ -2735,97 +2970,91 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) { _module_rep_it = _tmp5_; #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" while (TRUE) { -#line 2738 "Plugins.c" +#line 2973 "Plugins.c" GeeIterator* _tmp6_; - gboolean _tmp7_; PluginsModuleRep* module_rep = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp7_; + gpointer _tmp8_; SpitPluggable** pluggables = NULL; - PluginsModuleRep* _tmp10_; - SpitModule* _tmp11_; - gint _tmp12_; + PluginsModuleRep* _tmp9_; + SpitModule* _tmp10_; + gint _tmp11_; + SpitPluggable** _tmp12_; SpitPluggable** _tmp13_; - SpitPluggable** _tmp14_; - gint _tmp14__length1; + gint _tmp13__length1; gint pluggables_length1; gint _pluggables_size_; - SpitPluggable** _tmp15_; - gint _tmp15__length1; + SpitPluggable** _tmp14_; + gint _tmp14__length1; #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp6_ = _module_rep_it; #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" break; -#line 2763 "Plugins.c" +#line 2995 "Plugins.c" } #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp8_ = _module_rep_it; + _tmp7_ = _module_rep_it; #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - module_rep = (PluginsModuleRep*) _tmp9_; + module_rep = (PluginsModuleRep*) _tmp8_; #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp10_ = module_rep; + _tmp9_ = module_rep; #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp11_ = _tmp10_->spit_module; + _tmp10_ = _tmp9_->spit_module; #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp13_ = spit_module_get_pluggables (_tmp11_, &_tmp12_); + _tmp12_ = spit_module_get_pluggables (_tmp10_, &_tmp11_); #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp14_ = (_tmp13_ != NULL) ? _vala_array_dup17 (_tmp13_, _tmp12_) : ((gpointer) _tmp13_); + _tmp13_ = (_tmp12_ != NULL) ? _vala_array_dup17 (_tmp12_, _tmp11_) : ((gpointer) _tmp12_); #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp14__length1 = _tmp12_; + _tmp13__length1 = _tmp11_; #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - pluggables = _tmp14_; + pluggables = _tmp13_; #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - pluggables_length1 = _tmp14__length1; + pluggables_length1 = _tmp13__length1; #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _pluggables_size_ = pluggables_length1; #line 203 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp15_ = pluggables; + _tmp14_ = pluggables; #line 203 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp15__length1 = pluggables_length1; + _tmp14__length1 = pluggables_length1; #line 203 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp15_ != NULL) { -#line 2793 "Plugins.c" - SpitPluggable** _tmp16_; - gint _tmp16__length1; + if (_tmp14_ != NULL) { +#line 3025 "Plugins.c" + SpitPluggable** _tmp15_; + gint _tmp15__length1; #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp16_ = pluggables; + _tmp15_ = pluggables; #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp16__length1 = pluggables_length1; -#line 2800 "Plugins.c" + _tmp15__length1 = pluggables_length1; +#line 3032 "Plugins.c" { SpitPluggable** pluggable_collection = NULL; gint pluggable_collection_length1 = 0; gint _pluggable_collection_size_ = 0; gint pluggable_it = 0; #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - pluggable_collection = _tmp16_; + pluggable_collection = _tmp15_; #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - pluggable_collection_length1 = _tmp16__length1; + pluggable_collection_length1 = _tmp15__length1; #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - for (pluggable_it = 0; pluggable_it < _tmp16__length1; pluggable_it = pluggable_it + 1) { -#line 2812 "Plugins.c" - SpitPluggable* _tmp17_; + for (pluggable_it = 0; pluggable_it < _tmp15__length1; pluggable_it = pluggable_it + 1) { +#line 3044 "Plugins.c" + SpitPluggable* _tmp16_; SpitPluggable* pluggable = NULL; #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp17_ = _g_object_ref0 (pluggable_collection[pluggable_it]); + _tmp16_ = _g_object_ref0 (pluggable_collection[pluggable_it]); #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - pluggable = _tmp17_; -#line 2819 "Plugins.c" + pluggable = _tmp16_; +#line 3051 "Plugins.c" { - SpitPluggable* _tmp18_; - SpitPluggable* _tmp19_; -#line 205 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp18_ = pluggable; + SpitPluggable* _tmp17_; #line 205 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp19_ = needle; + _tmp17_ = pluggable; #line 205 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp18_ == _tmp19_) { + if (_tmp17_ == needle) { #line 206 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result = module_rep; #line 206 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2836,11 +3065,11 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) { _g_object_unref0 (_module_rep_it); #line 206 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 2839 "Plugins.c" +#line 3068 "Plugins.c" } #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (pluggable); -#line 2843 "Plugins.c" +#line 3072 "Plugins.c" } } } @@ -2849,71 +3078,74 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) { pluggables = (_vala_array_free (pluggables, pluggables_length1, (GDestroyNotify) g_object_unref), NULL); #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_module_rep_unref0 (module_rep); -#line 2852 "Plugins.c" +#line 3081 "Plugins.c" } #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (_module_rep_it); -#line 2856 "Plugins.c" +#line 3085 "Plugins.c" } #line 211 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result = NULL; #line 211 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 2862 "Plugins.c" +#line 3091 "Plugins.c" } -gchar* plugins_get_pluggable_module_id (SpitPluggable* needle) { +gchar* +plugins_get_pluggable_module_id (SpitPluggable* needle) +{ gchar* result = NULL; PluginsModuleRep* module_rep = NULL; - SpitPluggable* _tmp0_; - PluginsModuleRep* _tmp1_; - const gchar* _tmp2_ = NULL; - PluginsModuleRep* _tmp3_; - gchar* _tmp7_; + PluginsModuleRep* _tmp0_; + const gchar* _tmp1_ = NULL; + PluginsModuleRep* _tmp2_; + gchar* _tmp6_; #line 214 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (SPIT_IS_PLUGGABLE (needle), NULL); #line 215 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = needle; -#line 215 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = plugins_get_module_for_pluggable (_tmp0_); + _tmp0_ = plugins_get_module_for_pluggable (needle); #line 215 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - module_rep = _tmp1_; + module_rep = _tmp0_; #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = module_rep; + _tmp2_ = module_rep; #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp3_ != NULL) { -#line 2886 "Plugins.c" - PluginsModuleRep* _tmp4_; - SpitModule* _tmp5_; - const gchar* _tmp6_; + if (_tmp2_ != NULL) { +#line 3114 "Plugins.c" + PluginsModuleRep* _tmp3_; + SpitModule* _tmp4_; + const gchar* _tmp5_; #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp4_ = module_rep; + _tmp3_ = module_rep; #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp5_ = _tmp4_->spit_module; + _tmp4_ = _tmp3_->spit_module; #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp6_ = spit_module_get_id (_tmp5_); + _tmp5_ = spit_module_get_id (_tmp4_); #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = _tmp6_; -#line 2898 "Plugins.c" + _tmp1_ = _tmp5_; +#line 3126 "Plugins.c" } else { #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = NULL; -#line 2902 "Plugins.c" + _tmp1_ = NULL; +#line 3130 "Plugins.c" } #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp7_ = g_strdup (_tmp2_); + _tmp6_ = g_strdup (_tmp1_); #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - result = _tmp7_; + result = _tmp6_; #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_module_rep_unref0 (module_rep); #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 2912 "Plugins.c" +#line 3140 "Plugins.c" } -GeeCollection* plugins_get_extension_points (GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify) { +GeeCollection* +plugins_get_extension_points (GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify) +{ GeeCollection* result = NULL; GeeCollection* sorted = NULL; GCompareDataFunc _tmp0_; @@ -2964,34 +3196,34 @@ GeeCollection* plugins_get_extension_points (GCompareDataFunc compare_func, void compare_func_target_destroy_notify = NULL; #line 224 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 2967 "Plugins.c" +#line 3199 "Plugins.c" } -GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled) { +GeeCollection* +plugins_get_pluggables_for_type (GType type, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify, + gboolean include_disabled) +{ GeeCollection* result = NULL; GeeHashMap* _tmp0_; - GType _tmp1_; - gboolean _tmp2_; GeeCollection* for_type = NULL; - GCompareDataFunc _tmp3_; - void* _tmp3__target; - GDestroyNotify _tmp3__target_destroy_notify; - GeeTreeSet* _tmp4_; + GCompareDataFunc _tmp1_; + void* _tmp1__target; + GDestroyNotify _tmp1__target_destroy_notify; + GeeTreeSet* _tmp2_; #line 230 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = plugins_extension_points; #line 230 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = type; -#line 230 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp1_)); -#line 230 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _vala_assert (_tmp2_, "extension_points.has_key(type)"); + _vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) type)), "extension_points.has_key(type)"); #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = compare_func; + _tmp1_ = compare_func; #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3__target = compare_func_target; + _tmp1__target = compare_func_target; #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3__target_destroy_notify = compare_func_target_destroy_notify; + _tmp1__target_destroy_notify = compare_func_target_destroy_notify; #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" compare_func = NULL; #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2999,155 +3231,137 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" compare_func_target_destroy_notify = NULL; #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp4_ = gee_tree_set_new (SPIT_TYPE_PLUGGABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp3_, _tmp3__target, _tmp3__target_destroy_notify); + _tmp2_ = gee_tree_set_new (SPIT_TYPE_PLUGGABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp1_, _tmp1__target, _tmp1__target_destroy_notify); #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - for_type = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection); -#line 3005 "Plugins.c" + for_type = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); +#line 3237 "Plugins.c" { GeeIterator* _pluggable_rep_it = NULL; - GeeHashMap* _tmp5_; + GeeHashMap* _tmp3_; + GeeCollection* _tmp4_; + GeeCollection* _tmp5_; GeeCollection* _tmp6_; - GeeCollection* _tmp7_; - GeeCollection* _tmp8_; - GeeIterator* _tmp9_; - GeeIterator* _tmp10_; + GeeIterator* _tmp7_; + GeeIterator* _tmp8_; #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp5_ = plugins_pluggable_table; + _tmp3_ = plugins_pluggable_table; #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp6_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp6_); #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _pluggable_rep_it = _tmp10_; + _pluggable_rep_it = _tmp8_; #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" while (TRUE) { -#line 3032 "Plugins.c" - GeeIterator* _tmp11_; - gboolean _tmp12_; +#line 3264 "Plugins.c" + GeeIterator* _tmp9_; PluginsPluggableRep* pluggable_rep = NULL; - GeeIterator* _tmp13_; - gpointer _tmp14_; - gboolean _tmp15_ = FALSE; - gboolean _tmp16_ = FALSE; - PluginsPluggableRep* _tmp17_; - gboolean _tmp18_; - gboolean _tmp19_; -#line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp11_ = _pluggable_rep_it; + GeeIterator* _tmp10_; + gpointer _tmp11_; + gboolean _tmp12_ = FALSE; + gboolean _tmp13_ = FALSE; + PluginsPluggableRep* _tmp14_; + gboolean _tmp15_; + gboolean _tmp16_; #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp12_ = gee_iterator_next (_tmp11_); + _tmp9_ = _pluggable_rep_it; #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (!_tmp12_) { + if (!gee_iterator_next (_tmp9_)) { #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" break; -#line 3051 "Plugins.c" +#line 3280 "Plugins.c" } #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp13_ = _pluggable_rep_it; + _tmp10_ = _pluggable_rep_it; #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp14_ = gee_iterator_get (_tmp13_); + _tmp11_ = gee_iterator_get (_tmp10_); #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - pluggable_rep = (PluginsPluggableRep*) _tmp14_; + pluggable_rep = (PluginsPluggableRep*) _tmp11_; #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp17_ = pluggable_rep; + _tmp14_ = pluggable_rep; #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp18_ = plugins_pluggable_rep_get_activated (_tmp17_); + _tmp15_ = plugins_pluggable_rep_get_activated (_tmp14_); #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp19_ = _tmp18_; + _tmp16_ = _tmp15_; #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp19_) { -#line 3067 "Plugins.c" - PluginsPluggableRep* _tmp20_; - SpitPluggable* _tmp21_; - SpitPluggable* _tmp22_; - GType _tmp23_; - GType _tmp24_; - gboolean _tmp25_; -#line 235 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp20_ = pluggable_rep; -#line 235 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp21_ = plugins_pluggable_rep_get_pluggable (_tmp20_); -#line 235 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp22_ = _tmp21_; + if (_tmp16_) { +#line 3296 "Plugins.c" + PluginsPluggableRep* _tmp17_; + SpitPluggable* _tmp18_; + SpitPluggable* _tmp19_; #line 235 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp23_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, G_TYPE_OBJECT, GObject)); + _tmp17_ = pluggable_rep; #line 235 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp24_ = type; + _tmp18_ = plugins_pluggable_rep_get_pluggable (_tmp17_); #line 235 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp25_ = g_type_is_a (_tmp23_, _tmp24_); + _tmp19_ = _tmp18_; #line 235 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp16_ = _tmp25_; -#line 3088 "Plugins.c" + _tmp13_ = g_type_is_a (G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, G_TYPE_OBJECT, GObject)), type); +#line 3308 "Plugins.c" } else { #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp16_ = FALSE; -#line 3092 "Plugins.c" + _tmp13_ = FALSE; +#line 3312 "Plugins.c" } #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp16_) { -#line 3096 "Plugins.c" - gboolean _tmp26_ = FALSE; - gboolean _tmp27_; + if (_tmp13_) { +#line 3316 "Plugins.c" + gboolean _tmp20_ = FALSE; #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp27_ = include_disabled; + if (include_disabled) { #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp27_) { -#line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp26_ = TRUE; -#line 3105 "Plugins.c" + _tmp20_ = TRUE; +#line 3322 "Plugins.c" } else { - PluginsPluggableRep* _tmp28_; - gboolean _tmp29_; -#line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp28_ = pluggable_rep; + PluginsPluggableRep* _tmp21_; #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp29_ = plugins_pluggable_rep_is_enabled (_tmp28_); + _tmp21_ = pluggable_rep; #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp26_ = _tmp29_; -#line 3115 "Plugins.c" + _tmp20_ = plugins_pluggable_rep_is_enabled (_tmp21_); +#line 3329 "Plugins.c" } #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp15_ = _tmp26_; -#line 3119 "Plugins.c" + _tmp12_ = _tmp20_; +#line 3333 "Plugins.c" } else { #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp15_ = FALSE; -#line 3123 "Plugins.c" + _tmp12_ = FALSE; +#line 3337 "Plugins.c" } #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp15_) { -#line 3127 "Plugins.c" - GeeCollection* _tmp30_; - PluginsPluggableRep* _tmp31_; - SpitPluggable* _tmp32_; - SpitPluggable* _tmp33_; + if (_tmp12_) { +#line 3341 "Plugins.c" + GeeCollection* _tmp22_; + PluginsPluggableRep* _tmp23_; + SpitPluggable* _tmp24_; + SpitPluggable* _tmp25_; #line 237 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp30_ = for_type; + _tmp22_ = for_type; #line 237 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp31_ = pluggable_rep; + _tmp23_ = pluggable_rep; #line 237 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp32_ = plugins_pluggable_rep_get_pluggable (_tmp31_); + _tmp24_ = plugins_pluggable_rep_get_pluggable (_tmp23_); #line 237 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp33_ = _tmp32_; + _tmp25_ = _tmp24_; #line 237 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - gee_collection_add (_tmp30_, _tmp33_); -#line 3142 "Plugins.c" + gee_collection_add (_tmp22_, _tmp25_); +#line 3356 "Plugins.c" } #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_pluggable_rep_unref0 (pluggable_rep); -#line 3146 "Plugins.c" +#line 3360 "Plugins.c" } #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (_pluggable_rep_it); -#line 3150 "Plugins.c" +#line 3364 "Plugins.c" } #line 241 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result = for_type; @@ -3161,98 +3375,99 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com compare_func_target_destroy_notify = NULL; #line 241 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3164 "Plugins.c" +#line 3378 "Plugins.c" } -gchar* plugins_get_pluggable_name (const gchar* id) { +gchar* +plugins_get_pluggable_name (const gchar* id) +{ gchar* result = NULL; PluginsPluggableRep* pluggable_rep = NULL; GeeHashMap* _tmp0_; - const gchar* _tmp1_; - gpointer _tmp2_; - const gchar* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - PluginsPluggableRep* _tmp5_; - gchar* _tmp13_; + gpointer _tmp1_; + const gchar* _tmp2_ = NULL; + gboolean _tmp3_ = FALSE; + PluginsPluggableRep* _tmp4_; + gchar* _tmp12_; #line 244 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (id != NULL, NULL); #line 245 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = plugins_pluggable_table; #line 245 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = id; + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), id); #line 245 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 245 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - pluggable_rep = (PluginsPluggableRep*) _tmp2_; + pluggable_rep = (PluginsPluggableRep*) _tmp1_; #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp5_ = pluggable_rep; + _tmp4_ = pluggable_rep; #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp5_ != NULL) { -#line 3192 "Plugins.c" - PluginsPluggableRep* _tmp6_; + if (_tmp4_ != NULL) { +#line 3405 "Plugins.c" + PluginsPluggableRep* _tmp5_; + gboolean _tmp6_; gboolean _tmp7_; - gboolean _tmp8_; #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp6_ = pluggable_rep; + _tmp5_ = pluggable_rep; #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp7_ = plugins_pluggable_rep_get_activated (_tmp6_); + _tmp6_ = plugins_pluggable_rep_get_activated (_tmp5_); #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp4_ = _tmp8_; -#line 3204 "Plugins.c" + _tmp3_ = _tmp7_; +#line 3417 "Plugins.c" } else { #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp4_ = FALSE; -#line 3208 "Plugins.c" + _tmp3_ = FALSE; +#line 3421 "Plugins.c" } #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp4_) { -#line 3212 "Plugins.c" - PluginsPluggableRep* _tmp9_; + if (_tmp3_) { +#line 3425 "Plugins.c" + PluginsPluggableRep* _tmp8_; + SpitPluggable* _tmp9_; SpitPluggable* _tmp10_; - SpitPluggable* _tmp11_; - const gchar* _tmp12_; + const gchar* _tmp11_; #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp9_ = pluggable_rep; + _tmp8_ = pluggable_rep; #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp10_ = plugins_pluggable_rep_get_pluggable (_tmp9_); + _tmp9_ = plugins_pluggable_rep_get_pluggable (_tmp8_); #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp12_ = spit_pluggable_get_pluggable_name (_tmp11_); + _tmp11_ = spit_pluggable_get_pluggable_name (_tmp10_); #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = _tmp12_; -#line 3227 "Plugins.c" + _tmp2_ = _tmp11_; +#line 3440 "Plugins.c" } else { #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = NULL; -#line 3231 "Plugins.c" + _tmp2_ = NULL; +#line 3444 "Plugins.c" } #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp13_ = g_strdup (_tmp3_); + _tmp12_ = g_strdup (_tmp2_); #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - result = _tmp13_; + result = _tmp12_; #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_pluggable_rep_unref0 (pluggable_rep); #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3241 "Plugins.c" +#line 3454 "Plugins.c" } -gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info) { +gboolean +plugins_get_pluggable_info (const gchar* id, + SpitPluggableInfo* info) +{ gboolean result = FALSE; PluginsPluggableRep* pluggable_rep = NULL; GeeHashMap* _tmp0_; - const gchar* _tmp1_; - gpointer _tmp2_; - gboolean _tmp3_ = FALSE; - PluginsPluggableRep* _tmp4_; - PluginsPluggableRep* _tmp8_; + gpointer _tmp1_; + gboolean _tmp2_ = FALSE; + PluginsPluggableRep* _tmp3_; + PluginsPluggableRep* _tmp7_; + SpitPluggable* _tmp8_; SpitPluggable* _tmp9_; - SpitPluggable* _tmp10_; #line 251 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (id != NULL, FALSE); #line 251 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3260,104 +3475,101 @@ gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info) { #line 252 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = plugins_pluggable_table; #line 252 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = id; -#line 252 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), id); #line 252 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - pluggable_rep = (PluginsPluggableRep*) _tmp2_; + pluggable_rep = (PluginsPluggableRep*) _tmp1_; #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp4_ = pluggable_rep; + _tmp3_ = pluggable_rep; #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp4_ == NULL) { + if (_tmp3_ == NULL) { #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = TRUE; -#line 3274 "Plugins.c" + _tmp2_ = TRUE; +#line 3487 "Plugins.c" } else { - PluginsPluggableRep* _tmp5_; + PluginsPluggableRep* _tmp4_; + gboolean _tmp5_; gboolean _tmp6_; - gboolean _tmp7_; #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp5_ = pluggable_rep; + _tmp4_ = pluggable_rep; #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp6_ = plugins_pluggable_rep_get_activated (_tmp5_); + _tmp5_ = plugins_pluggable_rep_get_activated (_tmp4_); #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = !_tmp7_; -#line 3287 "Plugins.c" + _tmp2_ = !_tmp6_; +#line 3500 "Plugins.c" } #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp3_) { + if (_tmp2_) { #line 254 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result = FALSE; #line 254 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_pluggable_rep_unref0 (pluggable_rep); #line 254 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3297 "Plugins.c" +#line 3510 "Plugins.c" } #line 256 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp8_ = pluggable_rep; + _tmp7_ = pluggable_rep; #line 256 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp9_ = plugins_pluggable_rep_get_pluggable (_tmp8_); + _tmp8_ = plugins_pluggable_rep_get_pluggable (_tmp7_); #line 256 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 256 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - spit_pluggable_get_info (_tmp10_, info); + spit_pluggable_get_info (_tmp9_, info); #line 258 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result = TRUE; #line 258 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_pluggable_rep_unref0 (pluggable_rep); #line 258 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3313 "Plugins.c" +#line 3526 "Plugins.c" } -gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled) { +gboolean +plugins_get_pluggable_enabled (const gchar* id, + gboolean* enabled) +{ gboolean _vala_enabled = FALSE; gboolean result = FALSE; PluginsPluggableRep* pluggable_rep = NULL; GeeHashMap* _tmp0_; - const gchar* _tmp1_; - gpointer _tmp2_; - gboolean _tmp3_ = FALSE; - PluginsPluggableRep* _tmp4_; - PluginsPluggableRep* _tmp8_; - gboolean _tmp9_; + gpointer _tmp1_; + gboolean _tmp2_ = FALSE; + PluginsPluggableRep* _tmp3_; + PluginsPluggableRep* _tmp7_; #line 261 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (id != NULL, FALSE); #line 262 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = plugins_pluggable_table; #line 262 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = id; + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), id); #line 262 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 262 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - pluggable_rep = (PluginsPluggableRep*) _tmp2_; + pluggable_rep = (PluginsPluggableRep*) _tmp1_; #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp4_ = pluggable_rep; + _tmp3_ = pluggable_rep; #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp4_ == NULL) { + if (_tmp3_ == NULL) { #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = TRUE; -#line 3344 "Plugins.c" + _tmp2_ = TRUE; +#line 3556 "Plugins.c" } else { - PluginsPluggableRep* _tmp5_; + PluginsPluggableRep* _tmp4_; + gboolean _tmp5_; gboolean _tmp6_; - gboolean _tmp7_; #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp5_ = pluggable_rep; + _tmp4_ = pluggable_rep; #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp6_ = plugins_pluggable_rep_get_activated (_tmp5_); + _tmp5_ = plugins_pluggable_rep_get_activated (_tmp4_); #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = !_tmp7_; -#line 3357 "Plugins.c" + _tmp2_ = !_tmp6_; +#line 3569 "Plugins.c" } #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp3_) { + if (_tmp2_) { #line 264 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _vala_enabled = FALSE; #line 266 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3368,18 +3580,16 @@ gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled) { if (enabled) { #line 266 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *enabled = _vala_enabled; -#line 3371 "Plugins.c" +#line 3583 "Plugins.c" } #line 266 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3375 "Plugins.c" +#line 3587 "Plugins.c" } #line 269 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp8_ = pluggable_rep; -#line 269 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp9_ = plugins_pluggable_rep_is_enabled (_tmp8_); + _tmp7_ = pluggable_rep; #line 269 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _vala_enabled = _tmp9_; + _vala_enabled = plugins_pluggable_rep_is_enabled (_tmp7_); #line 271 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result = TRUE; #line 271 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3388,247 +3598,224 @@ gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled) { if (enabled) { #line 271 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *enabled = _vala_enabled; -#line 3391 "Plugins.c" +#line 3601 "Plugins.c" } #line 271 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3395 "Plugins.c" +#line 3605 "Plugins.c" } -void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled) { +void +plugins_set_pluggable_enabled (const gchar* id, + gboolean enabled) +{ PluginsPluggableRep* pluggable_rep = NULL; GeeHashMap* _tmp0_; - const gchar* _tmp1_; - gpointer _tmp2_; - gboolean _tmp3_ = FALSE; - PluginsPluggableRep* _tmp4_; - PluginsPluggableRep* _tmp8_; - gboolean _tmp9_; - gboolean _tmp10_; + gpointer _tmp1_; + gboolean _tmp2_ = FALSE; + PluginsPluggableRep* _tmp3_; + PluginsPluggableRep* _tmp7_; #line 274 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (id != NULL); #line 275 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = plugins_pluggable_table; #line 275 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = id; + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), id); #line 275 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 275 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - pluggable_rep = (PluginsPluggableRep*) _tmp2_; + pluggable_rep = (PluginsPluggableRep*) _tmp1_; #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp4_ = pluggable_rep; + _tmp3_ = pluggable_rep; #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp4_ == NULL) { + if (_tmp3_ == NULL) { #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = TRUE; -#line 3425 "Plugins.c" + _tmp2_ = TRUE; +#line 3633 "Plugins.c" } else { - PluginsPluggableRep* _tmp5_; + PluginsPluggableRep* _tmp4_; + gboolean _tmp5_; gboolean _tmp6_; - gboolean _tmp7_; #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp5_ = pluggable_rep; + _tmp4_ = pluggable_rep; #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp6_ = plugins_pluggable_rep_get_activated (_tmp5_); + _tmp5_ = plugins_pluggable_rep_get_activated (_tmp4_); #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = !_tmp7_; -#line 3438 "Plugins.c" + _tmp2_ = !_tmp6_; +#line 3646 "Plugins.c" } #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp3_) { + if (_tmp2_) { #line 277 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_pluggable_rep_unref0 (pluggable_rep); #line 277 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 3446 "Plugins.c" +#line 3654 "Plugins.c" } #line 279 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp8_ = pluggable_rep; + _tmp7_ = pluggable_rep; #line 279 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp9_ = enabled; -#line 279 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp10_ = plugins_pluggable_rep_set_enabled (_tmp8_, _tmp9_); -#line 279 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp10_) { -#line 3456 "Plugins.c" - PluginsNotifier* _tmp11_; - PluginsNotifier* _tmp12_; - PluginsPluggableRep* _tmp13_; - SpitPluggable* _tmp14_; - SpitPluggable* _tmp15_; - gboolean _tmp16_; -#line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp11_ = plugins_notifier_get_instance (); + if (plugins_pluggable_rep_set_enabled (_tmp7_, enabled)) { +#line 3660 "Plugins.c" + PluginsNotifier* _tmp8_; + PluginsNotifier* _tmp9_; + PluginsPluggableRep* _tmp10_; + SpitPluggable* _tmp11_; + SpitPluggable* _tmp12_; #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp12_ = _tmp11_; + _tmp8_ = plugins_notifier_get_instance (); #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp13_ = pluggable_rep; + _tmp9_ = _tmp8_; #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp14_ = plugins_pluggable_rep_get_pluggable (_tmp13_); + _tmp10_ = pluggable_rep; #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp15_ = _tmp14_; + _tmp11_ = plugins_pluggable_rep_get_pluggable (_tmp10_); #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp16_ = enabled; + _tmp12_ = _tmp11_; #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - g_signal_emit (_tmp12_, plugins_notifier_signals[PLUGINS_NOTIFIER_PLUGGABLE_ACTIVATION_SIGNAL], 0, _tmp15_, _tmp16_); + g_signal_emit (_tmp9_, plugins_notifier_signals[PLUGINS_NOTIFIER_PLUGGABLE_ACTIVATION_SIGNAL], 0, _tmp12_, enabled); #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _plugins_notifier_unref0 (_tmp12_); -#line 3479 "Plugins.c" + _plugins_notifier_unref0 (_tmp9_); +#line 3680 "Plugins.c" } #line 274 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_pluggable_rep_unref0 (pluggable_rep); -#line 3483 "Plugins.c" +#line 3684 "Plugins.c" } -GFile* plugins_get_pluggable_module_file (SpitPluggable* pluggable) { +GFile* +plugins_get_pluggable_module_file (SpitPluggable* pluggable) +{ GFile* result = NULL; PluginsModuleRep* module_rep = NULL; - SpitPluggable* _tmp0_; - PluginsModuleRep* _tmp1_; - GFile* _tmp2_ = NULL; - PluginsModuleRep* _tmp3_; - GFile* _tmp6_; + PluginsModuleRep* _tmp0_; + GFile* _tmp1_ = NULL; + PluginsModuleRep* _tmp2_; + GFile* _tmp5_; #line 283 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (SPIT_IS_PLUGGABLE (pluggable), NULL); #line 284 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = pluggable; -#line 284 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = plugins_get_module_for_pluggable (_tmp0_); + _tmp0_ = plugins_get_module_for_pluggable (pluggable); #line 284 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - module_rep = _tmp1_; + module_rep = _tmp0_; #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = module_rep; + _tmp2_ = module_rep; #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp3_ != NULL) { -#line 3507 "Plugins.c" - PluginsModuleRep* _tmp4_; - GFile* _tmp5_; + if (_tmp2_ != NULL) { +#line 3707 "Plugins.c" + PluginsModuleRep* _tmp3_; + GFile* _tmp4_; #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp4_ = module_rep; + _tmp3_ = module_rep; #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp5_ = _tmp4_->file; + _tmp4_ = _tmp3_->file; #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = _tmp5_; -#line 3516 "Plugins.c" + _tmp1_ = _tmp4_; +#line 3716 "Plugins.c" } else { #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = NULL; -#line 3520 "Plugins.c" + _tmp1_ = NULL; +#line 3720 "Plugins.c" } #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp6_ = _g_object_ref0 (_tmp2_); + _tmp5_ = _g_object_ref0 (_tmp1_); #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - result = _tmp6_; + result = _tmp5_; #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_module_rep_unref0 (module_rep); #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3530 "Plugins.c" +#line 3730 "Plugins.c" } -gint plugins_compare_pluggable_names (void* a, void* b) { +gint +plugins_compare_pluggable_names (void* a, + void* b) +{ gint result = 0; SpitPluggable* apluggable = NULL; - void* _tmp0_; SpitPluggable* bpluggable = NULL; - void* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - gint _tmp4_; -#line 290 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = a; + const gchar* _tmp0_; + const gchar* _tmp1_; #line 290 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - apluggable = (SpitPluggable*) _tmp0_; + apluggable = (SpitPluggable*) a; #line 291 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = b; -#line 291 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - bpluggable = (SpitPluggable*) _tmp1_; -#line 293 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (apluggable, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + bpluggable = (SpitPluggable*) b; #line 293 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (bpluggable, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp0_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (apluggable, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 293 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp4_ = g_utf8_collate (_tmp2_, _tmp3_); + _tmp1_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (bpluggable, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 293 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - result = _tmp4_; + result = g_utf8_collate (_tmp0_, _tmp1_); #line 293 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3561 "Plugins.c" +#line 3755 "Plugins.c" } -gint plugins_compare_extension_point_names (void* a, void* b) { +gint +plugins_compare_extension_point_names (void* a, + void* b) +{ gint result = 0; PluginsExtensionPoint* apoint = NULL; - void* _tmp0_; PluginsExtensionPoint* bpoint = NULL; - void* _tmp1_; + const gchar* _tmp0_; + const gchar* _tmp1_; const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; - const gchar* _tmp5_; - gint _tmp6_; -#line 297 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = a; #line 297 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - apoint = (PluginsExtensionPoint*) _tmp0_; + apoint = (PluginsExtensionPoint*) a; #line 298 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = b; -#line 298 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - bpoint = (PluginsExtensionPoint*) _tmp1_; + bpoint = (PluginsExtensionPoint*) b; #line 300 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = plugins_extension_point_get_name (G_TYPE_CHECK_INSTANCE_CAST (apoint, PLUGINS_TYPE_EXTENSION_POINT, PluginsExtensionPoint)); + _tmp0_ = plugins_extension_point_get_name (G_TYPE_CHECK_INSTANCE_CAST (apoint, PLUGINS_TYPE_EXTENSION_POINT, PluginsExtensionPoint)); #line 300 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 300 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp4_ = plugins_extension_point_get_name (G_TYPE_CHECK_INSTANCE_CAST (bpoint, PLUGINS_TYPE_EXTENSION_POINT, PluginsExtensionPoint)); + _tmp2_ = plugins_extension_point_get_name (G_TYPE_CHECK_INSTANCE_CAST (bpoint, PLUGINS_TYPE_EXTENSION_POINT, PluginsExtensionPoint)); #line 300 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 300 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp6_ = g_utf8_collate (_tmp3_, _tmp5_); -#line 300 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - result = _tmp6_; + result = g_utf8_collate (_tmp1_, _tmp3_); #line 300 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3598 "Plugins.c" +#line 3786 "Plugins.c" } -gboolean plugins_is_shared_library (GFile* file) { +gboolean +plugins_is_shared_library (GFile* file) +{ gboolean result = FALSE; gchar* name = NULL; gchar* ext = NULL; - GFile* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; #line 303 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = file; -#line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = g_file_get_basename (_tmp0_); + _tmp0_ = g_file_get_basename (file); #line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - disassemble_filename (_tmp2_, &_tmp3_, &_tmp4_); + disassemble_filename (_tmp1_, &_tmp2_, &_tmp3_); #line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_free0 (name); #line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - name = _tmp3_; + name = _tmp2_; #line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_free0 (ext); #line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - ext = _tmp4_; + ext = _tmp3_; #line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _g_free0 (_tmp2_); -#line 3631 "Plugins.c" + _g_free0 (_tmp1_); +#line 3818 "Plugins.c" { const gchar** shared_ext_collection = NULL; gint shared_ext_collection_length1 = 0; @@ -3640,23 +3827,23 @@ gboolean plugins_is_shared_library (GFile* file) { shared_ext_collection_length1 = G_N_ELEMENTS (PLUGINS_SHARED_LIB_EXTS); #line 307 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" for (shared_ext_it = 0; shared_ext_it < G_N_ELEMENTS (PLUGINS_SHARED_LIB_EXTS); shared_ext_it = shared_ext_it + 1) { -#line 3643 "Plugins.c" - gchar* _tmp5_; +#line 3830 "Plugins.c" + gchar* _tmp4_; gchar* shared_ext = NULL; #line 307 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp5_ = g_strdup (shared_ext_collection[shared_ext_it]); + _tmp4_ = g_strdup (shared_ext_collection[shared_ext_it]); #line 307 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - shared_ext = _tmp5_; -#line 3650 "Plugins.c" + shared_ext = _tmp4_; +#line 3837 "Plugins.c" { + const gchar* _tmp5_; const gchar* _tmp6_; - const gchar* _tmp7_; #line 308 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp6_ = ext; + _tmp5_ = ext; #line 308 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp7_ = shared_ext; + _tmp6_ = shared_ext; #line 308 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (g_strcmp0 (_tmp6_, _tmp7_) == 0) { + if (g_strcmp0 (_tmp5_, _tmp6_) == 0) { #line 309 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result = TRUE; #line 309 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3667,11 +3854,11 @@ gboolean plugins_is_shared_library (GFile* file) { _g_free0 (name); #line 309 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3670 "Plugins.c" +#line 3857 "Plugins.c" } #line 307 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_free0 (shared_ext); -#line 3674 "Plugins.c" +#line 3861 "Plugins.c" } } } @@ -3683,76 +3870,70 @@ gboolean plugins_is_shared_library (GFile* file) { _g_free0 (name); #line 312 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3686 "Plugins.c" +#line 3873 "Plugins.c" } -void plugins_search_for_plugins (GFile* dir, GError** error) { - GFile* _tmp0_; +void +plugins_search_for_plugins (GFile* dir, + GError** error) +{ + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; GFileEnumerator* enumerator = NULL; - GFile* _tmp3_; - GFileEnumerator* _tmp4_; + GFileEnumerator* _tmp2_; GError * _inner_error_ = NULL; #line 315 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (G_IS_FILE (dir)); #line 316 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = dir; -#line 316 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = g_file_get_path (_tmp0_); + _tmp0_ = g_file_get_path (dir); #line 316 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 316 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - g_debug ("Plugins.vala:316: Searching %s for plugins…", _tmp2_); + g_debug ("Plugins.vala:316: Searching %s for plugins…", _tmp1_); #line 316 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 320 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = dir; + _tmp2_ = g_file_enumerate_children (dir, UTIL_FILE_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); #line 320 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp4_ = g_file_enumerate_children (_tmp3_, UTIL_FILE_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); -#line 320 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - enumerator = _tmp4_; + enumerator = _tmp2_; #line 320 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 320 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_propagate_error (error, _inner_error_); #line 320 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 3722 "Plugins.c" +#line 3906 "Plugins.c" } { - gboolean _tmp5_ = FALSE; + gboolean _tmp3_ = FALSE; #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp5_ = TRUE; + _tmp3_ = TRUE; #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" while (TRUE) { -#line 3730 "Plugins.c" +#line 3914 "Plugins.c" GFileInfo* info = NULL; - GFileEnumerator* _tmp6_; + GFileEnumerator* _tmp4_; + GFileInfo* _tmp5_; + GFileInfo* _tmp6_; GFileInfo* _tmp7_; - GFileInfo* _tmp8_; - GFileInfo* _tmp9_; - gboolean _tmp10_; GFile* file = NULL; - GFile* _tmp11_; - GFileInfo* _tmp12_; - const gchar* _tmp13_; - GFile* _tmp14_; - GFileInfo* _tmp15_; - GFileType _tmp16_; + GFileInfo* _tmp8_; + const gchar* _tmp9_; + GFile* _tmp10_; + GFileInfo* _tmp11_; #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (!_tmp5_) { -#line 3746 "Plugins.c" + if (!_tmp3_) { +#line 3927 "Plugins.c" } #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp5_ = FALSE; + _tmp3_ = FALSE; #line 323 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp6_ = enumerator; + _tmp4_ = enumerator; #line 323 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp7_ = g_file_enumerator_next_file (_tmp6_, NULL, &_inner_error_); + _tmp5_ = g_file_enumerator_next_file (_tmp4_, NULL, &_inner_error_); #line 323 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - info = _tmp7_; + info = _tmp5_; #line 323 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 323 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3761,59 +3942,53 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { _g_object_unref0 (enumerator); #line 323 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 3764 "Plugins.c" +#line 3945 "Plugins.c" } #line 324 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp8_ = info; + _tmp6_ = info; #line 324 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp8_ == NULL) { + if (_tmp6_ == NULL) { #line 325 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (info); #line 325 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" break; -#line 3774 "Plugins.c" +#line 3955 "Plugins.c" } #line 327 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp9_ = info; -#line 327 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp10_ = g_file_info_get_is_hidden (_tmp9_); + _tmp7_ = info; #line 327 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp10_) { + if (g_file_info_get_is_hidden (_tmp7_)) { #line 328 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (info); #line 328 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" continue; -#line 3786 "Plugins.c" +#line 3965 "Plugins.c" } #line 330 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp11_ = dir; -#line 330 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp12_ = info; + _tmp8_ = info; #line 330 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp13_ = g_file_info_get_name (_tmp12_); + _tmp9_ = g_file_info_get_name (_tmp8_); #line 330 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp14_ = g_file_get_child (_tmp11_, _tmp13_); + _tmp10_ = g_file_get_child (dir, _tmp9_); #line 330 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - file = _tmp14_; -#line 332 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp15_ = info; + file = _tmp10_; #line 332 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp16_ = g_file_info_get_file_type (_tmp15_); + _tmp11_ = info; #line 332 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - switch (_tmp16_) { + switch (g_file_info_get_file_type (_tmp11_)) { #line 332 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" case G_FILE_TYPE_DIRECTORY: -#line 3806 "Plugins.c" +#line 3981 "Plugins.c" { { - GFile* _tmp17_; + GFile* _tmp12_; #line 335 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp17_ = file; + _tmp12_ = file; #line 335 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - plugins_search_for_plugins (_tmp17_, &_inner_error_); + plugins_search_for_plugins (_tmp12_, &_inner_error_); #line 335 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3816 "Plugins.c" +#line 3991 "Plugins.c" goto __catch40_g_error; } } @@ -3821,32 +3996,32 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { __catch40_g_error: { GError* err = NULL; - GFile* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; - GError* _tmp21_; - const gchar* _tmp22_; + GFile* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + GError* _tmp16_; + const gchar* _tmp17_; #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" err = _inner_error_; #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _inner_error_ = NULL; #line 337 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp18_ = file; + _tmp13_ = file; #line 337 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp19_ = g_file_get_path (_tmp18_); + _tmp14_ = g_file_get_path (_tmp13_); #line 337 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp20_ = _tmp19_; + _tmp15_ = _tmp14_; #line 337 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp21_ = err; + _tmp16_ = err; #line 337 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp22_ = _tmp21_->message; + _tmp17_ = _tmp16_->message; #line 337 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - g_warning ("Plugins.vala:337: Unable to search directory %s for plugins: %s", _tmp20_, _tmp22_); + g_warning ("Plugins.vala:337: Unable to search directory %s for plugins: %s", _tmp15_, _tmp17_); #line 337 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp15_); #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_error_free0 (err); -#line 3849 "Plugins.c" +#line 4024 "Plugins.c" } __finally40: #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3861,199 +4036,186 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { _g_object_unref0 (enumerator); #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 3864 "Plugins.c" +#line 4039 "Plugins.c" } #line 339 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" break; -#line 3868 "Plugins.c" +#line 4043 "Plugins.c" } #line 332 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" case G_FILE_TYPE_REGULAR: -#line 3872 "Plugins.c" +#line 4047 "Plugins.c" { - GFile* _tmp23_; - gboolean _tmp24_; + GFile* _tmp18_; #line 342 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp23_ = file; + _tmp18_ = file; #line 342 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp24_ = plugins_is_shared_library (_tmp23_); -#line 342 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp24_) { -#line 3882 "Plugins.c" - GFile* _tmp25_; + if (plugins_is_shared_library (_tmp18_)) { +#line 4054 "Plugins.c" + GFile* _tmp19_; #line 343 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp25_ = file; + _tmp19_ = file; #line 343 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - plugins_load_module (_tmp25_); -#line 3888 "Plugins.c" + plugins_load_module (_tmp19_); +#line 4060 "Plugins.c" } #line 344 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" break; -#line 3892 "Plugins.c" +#line 4064 "Plugins.c" } default: { #line 348 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" break; -#line 3898 "Plugins.c" +#line 4070 "Plugins.c" } } #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (file); #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (info); -#line 3905 "Plugins.c" +#line 4077 "Plugins.c" } } #line 315 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (enumerator); -#line 3910 "Plugins.c" +#line 4082 "Plugins.c" } -void plugins_load_module (GFile* file) { +void +plugins_load_module (GFile* file) +{ PluginsModuleRep* module_rep = NULL; - GFile* _tmp0_; + PluginsModuleRep* _tmp0_; PluginsModuleRep* _tmp1_; - PluginsModuleRep* _tmp2_; void* entry = NULL; - PluginsModuleRep* _tmp7_; - GModule* _tmp8_; - void* _tmp9_ = NULL; - gboolean _tmp10_; + PluginsModuleRep* _tmp5_; + GModule* _tmp6_; + void* _tmp7_ = NULL; + gboolean _tmp8_; SpitEntryPoint spit_entry_point = NULL; - void* _tmp14_; - gboolean _tmp15_ = FALSE; + void* _tmp11_; + gboolean _tmp12_ = FALSE; SpitEntryPointParams params = {0}; - GFile* _tmp16_; - GFile* _tmp17_; - PluginsModuleRep* _tmp18_; - SpitEntryPoint _tmp19_; - SpitModule* _tmp20_; - SpitEntryPointParams _tmp21_; - gint _tmp22_; - gboolean _tmp26_ = FALSE; - SpitEntryPointParams _tmp27_; - gint _tmp28_; + GFile* _tmp13_; + PluginsModuleRep* _tmp14_; + SpitEntryPoint _tmp15_; + SpitModule* _tmp16_; + SpitEntryPointParams _tmp17_; + gint _tmp18_; + gboolean _tmp21_ = FALSE; + SpitEntryPointParams _tmp22_; + gint _tmp23_; + PluginsModuleRep* _tmp30_; + SpitEntryPointParams _tmp31_; + gint _tmp32_; + PluginsModuleRep* _tmp33_; + SpitModule* _tmp34_; PluginsModuleRep* _tmp36_; - SpitEntryPointParams _tmp37_; - gint _tmp38_; - PluginsModuleRep* _tmp39_; - SpitModule* _tmp40_; + SpitModule* _tmp37_; PluginsModuleRep* _tmp42_; - SpitModule* _tmp43_; - PluginsModuleRep* _tmp49_; - PluginsModuleRep* _tmp50_; - SpitModule* _tmp51_; - const gchar* _tmp52_; - gchar* _tmp53_; + PluginsModuleRep* _tmp43_; + SpitModule* _tmp44_; + const gchar* _tmp45_; + gchar* _tmp46_; + PluginsModuleRep* _tmp47_; + const gchar* _tmp48_; + GeeHashMap* _tmp53_; PluginsModuleRep* _tmp54_; const gchar* _tmp55_; - GeeHashMap* _tmp61_; PluginsModuleRep* _tmp62_; - const gchar* _tmp63_; - gboolean _tmp64_; - PluginsModuleRep* _tmp72_; - SpitModule* _tmp73_; + SpitModule* _tmp63_; + const gchar* _tmp64_; + PluginsModuleRep* _tmp65_; + SpitModule* _tmp66_; + const gchar* _tmp67_; + PluginsModuleRep* _tmp68_; + const gchar* _tmp69_; + gchar* _tmp70_; + gchar* _tmp71_; + GeeHashMap* _tmp72_; + PluginsModuleRep* _tmp73_; const gchar* _tmp74_; PluginsModuleRep* _tmp75_; - SpitModule* _tmp76_; - const gchar* _tmp77_; - PluginsModuleRep* _tmp78_; - const gchar* _tmp79_; - GFile* _tmp80_; - gchar* _tmp81_; - gchar* _tmp82_; - GeeHashMap* _tmp83_; - PluginsModuleRep* _tmp84_; - const gchar* _tmp85_; - PluginsModuleRep* _tmp86_; - PluginsModuleRep* _tmp87_; - SpitModule* _tmp88_; - gint _tmp89_; - SpitPluggable** _tmp90_; + PluginsModuleRep* _tmp76_; + SpitModule* _tmp77_; + gint _tmp78_; + SpitPluggable** _tmp79_; #line 353 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (G_IS_FILE (file)); #line 354 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = file; -#line 354 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = plugins_module_rep_open (_tmp0_); + _tmp0_ = plugins_module_rep_open (file); #line 354 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - module_rep = _tmp1_; + module_rep = _tmp0_; #line 355 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = module_rep; + _tmp1_ = module_rep; #line 355 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp2_ == NULL) { -#line 3987 "Plugins.c" - GFile* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - const gchar* _tmp6_; + if (_tmp1_ == NULL) { +#line 4155 "Plugins.c" + gchar* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; #line 356 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = file; + _tmp2_ = g_file_get_path (file); #line 356 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp4_ = g_file_get_path (_tmp3_); -#line 356 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 356 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp6_ = g_module_error (); + _tmp4_ = g_module_error (); #line 356 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - g_critical ("Plugins.vala:356: Unable to load module %s: %s", _tmp5_, _tmp6_); + g_critical ("Plugins.vala:356: Unable to load module %s: %s", _tmp3_, _tmp4_); #line 356 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp3_); #line 358 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_module_rep_unref0 (module_rep); #line 358 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 4008 "Plugins.c" +#line 4173 "Plugins.c" } #line 363 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp7_ = module_rep; + _tmp5_ = module_rep; #line 363 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp8_ = _tmp7_->module; + _tmp6_ = _tmp5_->module; #line 363 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp10_ = g_module_symbol (_tmp8_, SPIT_ENTRY_POINT_NAME, &_tmp9_); + _tmp8_ = g_module_symbol (_tmp6_, SPIT_ENTRY_POINT_NAME, &_tmp7_); #line 363 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - entry = _tmp9_; + entry = _tmp7_; #line 363 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (!_tmp10_) { -#line 4020 "Plugins.c" - GFile* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; + if (!_tmp8_) { +#line 4185 "Plugins.c" + gchar* _tmp9_; + gchar* _tmp10_; #line 364 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp11_ = file; + _tmp9_ = g_file_get_path (file); #line 364 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp12_ = g_file_get_path (_tmp11_); -#line 364 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp13_ = _tmp12_; + _tmp10_ = _tmp9_; #line 364 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_critical ("Plugins.vala:364: Unable to load module %s: well-known entry point %s " \ -"not found", _tmp13_, SPIT_ENTRY_POINT_NAME); +"not found", _tmp10_, SPIT_ENTRY_POINT_NAME); #line 364 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp10_); #line 367 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_module_rep_unref0 (module_rep); #line 367 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 4038 "Plugins.c" +#line 4200 "Plugins.c" } #line 370 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp14_ = entry; + _tmp11_ = entry; #line 370 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - spit_entry_point = (SpitEntryPoint) _tmp14_; + spit_entry_point = (SpitEntryPoint) _tmp11_; #line 372 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (PLUGINS_MIN_SPIT_INTERFACE <= SPIT_CURRENT_INTERFACE) { #line 372 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp15_ = SPIT_CURRENT_INTERFACE <= PLUGINS_MAX_SPIT_INTERFACE; -#line 4048 "Plugins.c" + _tmp12_ = SPIT_CURRENT_INTERFACE <= PLUGINS_MAX_SPIT_INTERFACE; +#line 4210 "Plugins.c" } else { #line 372 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp15_ = FALSE; -#line 4052 "Plugins.c" + _tmp12_ = FALSE; +#line 4214 "Plugins.c" } #line 372 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _vala_assert (_tmp15_, "MIN_SPIT_INTERFACE <= Spit.CURRENT_INTERFACE && Spit.CURRENT_INTERFACE <= MAX_SPIT_INTERFACE"); + _vala_assert (_tmp12_, "MIN_SPIT_INTERFACE <= Spit.CURRENT_INTERFACE && Spit.CURRENT_INTERFACE <= MAX_SPIT_INTERFACE"); #line 373 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" memset (¶ms, 0, sizeof (SpitEntryPointParams)); #line 374 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -4063,344 +4225,323 @@ void plugins_load_module (GFile* file) { #line 376 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" params.module_spit_interface = SPIT_UNSUPPORTED_INTERFACE; #line 377 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp16_ = file; -#line 377 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp17_ = _g_object_ref0 (_tmp16_); + _tmp13_ = _g_object_ref0 (file); #line 377 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (params.module_file); #line 377 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - params.module_file = _tmp17_; + params.module_file = _tmp13_; #line 379 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp18_ = module_rep; + _tmp14_ = module_rep; #line 379 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp19_ = spit_entry_point; + _tmp15_ = spit_entry_point; #line 379 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp20_ = _tmp19_ (¶ms); + _tmp16_ = _tmp15_ (¶ms); #line 379 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _g_object_unref0 (_tmp18_->spit_module); + _g_object_unref0 (_tmp14_->spit_module); #line 379 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp18_->spit_module = _tmp20_; + _tmp14_->spit_module = _tmp16_; #line 380 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp21_ = params; + _tmp17_ = params; #line 380 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp22_ = _tmp21_.module_spit_interface; + _tmp18_ = _tmp17_.module_spit_interface; #line 380 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp22_ == SPIT_UNSUPPORTED_INTERFACE) { -#line 4088 "Plugins.c" - GFile* _tmp23_; - gchar* _tmp24_; - gchar* _tmp25_; -#line 381 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp23_ = file; + if (_tmp18_ == SPIT_UNSUPPORTED_INTERFACE) { +#line 4248 "Plugins.c" + gchar* _tmp19_; + gchar* _tmp20_; #line 381 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp24_ = g_file_get_path (_tmp23_); + _tmp19_ = g_file_get_path (file); #line 381 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp25_ = _tmp24_; + _tmp20_ = _tmp19_; #line 381 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_critical ("Plugins.vala:381: Unable to load module %s: module reports no support " \ -"for SPIT interfaces %d to %d", _tmp25_, PLUGINS_MIN_SPIT_INTERFACE, PLUGINS_MAX_SPIT_INTERFACE); +"for SPIT interfaces %d to %d", _tmp20_, PLUGINS_MIN_SPIT_INTERFACE, PLUGINS_MAX_SPIT_INTERFACE); #line 381 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _g_free0 (_tmp25_); + _g_free0 (_tmp20_); #line 384 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" spit_entry_point_params_destroy (¶ms); #line 384 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_module_rep_unref0 (module_rep); #line 384 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 4108 "Plugins.c" +#line 4265 "Plugins.c" } #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp27_ = params; + _tmp22_ = params; #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp28_ = _tmp27_.module_spit_interface; + _tmp23_ = _tmp22_.module_spit_interface; #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp28_ < PLUGINS_MIN_SPIT_INTERFACE) { + if (_tmp23_ < PLUGINS_MIN_SPIT_INTERFACE) { #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp26_ = TRUE; -#line 4118 "Plugins.c" + _tmp21_ = TRUE; +#line 4275 "Plugins.c" } else { - SpitEntryPointParams _tmp29_; - gint _tmp30_; + SpitEntryPointParams _tmp24_; + gint _tmp25_; #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp29_ = params; + _tmp24_ = params; #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp30_ = _tmp29_.module_spit_interface; + _tmp25_ = _tmp24_.module_spit_interface; #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp26_ = _tmp30_ > PLUGINS_MAX_SPIT_INTERFACE; -#line 4128 "Plugins.c" + _tmp21_ = _tmp25_ > PLUGINS_MAX_SPIT_INTERFACE; +#line 4285 "Plugins.c" } #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp26_) { -#line 4132 "Plugins.c" - GFile* _tmp31_; - gchar* _tmp32_; - gchar* _tmp33_; - PluginsModuleRep* _tmp34_; - gint _tmp35_; -#line 388 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp31_ = file; + if (_tmp21_) { +#line 4289 "Plugins.c" + gchar* _tmp26_; + gchar* _tmp27_; + PluginsModuleRep* _tmp28_; + gint _tmp29_; #line 388 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp32_ = g_file_get_path (_tmp31_); + _tmp26_ = g_file_get_path (file); #line 388 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp33_ = _tmp32_; + _tmp27_ = _tmp26_; #line 388 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp34_ = module_rep; + _tmp28_ = module_rep; #line 388 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp35_ = _tmp34_->spit_interface; + _tmp29_ = _tmp28_->spit_interface; #line 388 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_critical ("Plugins.vala:388: Unable to load module %s: module reports unsupported" \ -" SPIT version %d (out of range %d to %d)", _tmp33_, _tmp35_, PLUGINS_MIN_SPIT_INTERFACE, PLUGINS_MAX_SPIT_INTERFACE); +" SPIT version %d (out of range %d to %d)", _tmp27_, _tmp29_, PLUGINS_MIN_SPIT_INTERFACE, PLUGINS_MAX_SPIT_INTERFACE); #line 388 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _g_free0 (_tmp33_); + _g_free0 (_tmp27_); #line 391 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" spit_entry_point_params_destroy (¶ms); #line 391 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_module_rep_unref0 (module_rep); #line 391 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 4158 "Plugins.c" +#line 4312 "Plugins.c" } #line 394 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp36_ = module_rep; + _tmp30_ = module_rep; #line 394 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp37_ = params; + _tmp31_ = params; #line 394 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp38_ = _tmp37_.module_spit_interface; + _tmp32_ = _tmp31_.module_spit_interface; #line 394 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp36_->spit_interface = _tmp38_; + _tmp30_->spit_interface = _tmp32_; #line 397 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp39_ = module_rep; + _tmp33_ = module_rep; #line 397 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp40_ = _tmp39_->spit_module; + _tmp34_ = _tmp33_->spit_module; #line 397 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, SPIT_TYPE_MODULE)) { -#line 4174 "Plugins.c" - PluginsModuleRep* _tmp41_; + if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp34_, SPIT_TYPE_MODULE)) { +#line 4328 "Plugins.c" + PluginsModuleRep* _tmp35_; #line 398 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp41_ = module_rep; + _tmp35_ = module_rep; #line 398 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _g_object_unref0 (_tmp41_->spit_module); + _g_object_unref0 (_tmp35_->spit_module); #line 398 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp41_->spit_module = NULL; -#line 4182 "Plugins.c" + _tmp35_->spit_module = NULL; +#line 4336 "Plugins.c" } #line 400 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp42_ = module_rep; + _tmp36_ = module_rep; #line 400 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp43_ = _tmp42_->spit_module; + _tmp37_ = _tmp36_->spit_module; #line 400 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp43_ == NULL) { -#line 4190 "Plugins.c" - GFile* _tmp44_; - gchar* _tmp45_; - gchar* _tmp46_; - PluginsModuleRep* _tmp47_; - gint _tmp48_; + if (_tmp37_ == NULL) { +#line 4344 "Plugins.c" + gchar* _tmp38_; + gchar* _tmp39_; + PluginsModuleRep* _tmp40_; + gint _tmp41_; #line 401 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp44_ = file; + _tmp38_ = g_file_get_path (file); #line 401 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp45_ = g_file_get_path (_tmp44_); + _tmp39_ = _tmp38_; #line 401 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp46_ = _tmp45_; + _tmp40_ = module_rep; #line 401 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp47_ = module_rep; -#line 401 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp48_ = _tmp47_->spit_interface; + _tmp41_ = _tmp40_->spit_interface; #line 401 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_critical ("Plugins.vala:401: Unable to load module %s (SPIT %d): no spit module r" \ -"eturned", _tmp46_, _tmp48_); +"eturned", _tmp39_, _tmp41_); #line 401 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _g_free0 (_tmp46_); + _g_free0 (_tmp39_); #line 404 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" spit_entry_point_params_destroy (¶ms); #line 404 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_module_rep_unref0 (module_rep); #line 404 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 4216 "Plugins.c" +#line 4367 "Plugins.c" } #line 409 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp49_ = module_rep; + _tmp42_ = module_rep; #line 409 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp50_ = module_rep; + _tmp43_ = module_rep; #line 409 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp51_ = _tmp50_->spit_module; + _tmp44_ = _tmp43_->spit_module; #line 409 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp52_ = spit_module_get_id (_tmp51_); + _tmp45_ = spit_module_get_id (_tmp44_); #line 409 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp53_ = prepare_input_text (_tmp52_, PREPARE_INPUT_TEXT_OPTIONS_DEFAULT, -1); + _tmp46_ = prepare_input_text (_tmp45_, PREPARE_INPUT_TEXT_OPTIONS_DEFAULT, -1); #line 409 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _g_free0 (_tmp49_->id); + _g_free0 (_tmp42_->id); #line 409 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp49_->id = _tmp53_; + _tmp42_->id = _tmp46_; #line 410 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp54_ = module_rep; + _tmp47_ = module_rep; #line 410 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp55_ = _tmp54_->id; + _tmp48_ = _tmp47_->id; #line 410 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp55_ == NULL) { -#line 4238 "Plugins.c" - GFile* _tmp56_; - gchar* _tmp57_; - gchar* _tmp58_; - PluginsModuleRep* _tmp59_; - gint _tmp60_; + if (_tmp48_ == NULL) { +#line 4389 "Plugins.c" + gchar* _tmp49_; + gchar* _tmp50_; + PluginsModuleRep* _tmp51_; + gint _tmp52_; #line 411 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp56_ = file; + _tmp49_ = g_file_get_path (file); #line 411 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp57_ = g_file_get_path (_tmp56_); + _tmp50_ = _tmp49_; #line 411 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp58_ = _tmp57_; + _tmp51_ = module_rep; #line 411 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp59_ = module_rep; -#line 411 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp60_ = _tmp59_->spit_interface; + _tmp52_ = _tmp51_->spit_interface; #line 411 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_critical ("Plugins.vala:411: Unable to load module %s (SPIT %d): invalid or empty" \ -" module name", _tmp58_, _tmp60_); +" module name", _tmp50_, _tmp52_); #line 411 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _g_free0 (_tmp58_); + _g_free0 (_tmp50_); #line 414 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" spit_entry_point_params_destroy (¶ms); #line 414 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_module_rep_unref0 (module_rep); #line 414 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 4264 "Plugins.c" +#line 4412 "Plugins.c" } #line 417 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp61_ = plugins_module_table; -#line 417 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp62_ = module_rep; + _tmp53_ = plugins_module_table; #line 417 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp63_ = _tmp62_->id; + _tmp54_ = module_rep; #line 417 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp64_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp63_); + _tmp55_ = _tmp54_->id; #line 417 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - if (_tmp64_) { -#line 4276 "Plugins.c" - GFile* _tmp65_; - gchar* _tmp66_; - gchar* _tmp67_; - PluginsModuleRep* _tmp68_; - gint _tmp69_; - PluginsModuleRep* _tmp70_; - const gchar* _tmp71_; -#line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp65_ = file; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp55_)) { +#line 4422 "Plugins.c" + gchar* _tmp56_; + gchar* _tmp57_; + PluginsModuleRep* _tmp58_; + gint _tmp59_; + PluginsModuleRep* _tmp60_; + const gchar* _tmp61_; #line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp66_ = g_file_get_path (_tmp65_); + _tmp56_ = g_file_get_path (file); #line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp67_ = _tmp66_; + _tmp57_ = _tmp56_; #line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp68_ = module_rep; + _tmp58_ = module_rep; #line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp69_ = _tmp68_->spit_interface; + _tmp59_ = _tmp58_->spit_interface; #line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp70_ = module_rep; + _tmp60_ = module_rep; #line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp71_ = _tmp70_->id; + _tmp61_ = _tmp60_->id; #line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_critical ("Plugins.vala:418: Not loading module %s (SPIT %d): module with name \"" \ -"%s\" already loaded", _tmp67_, _tmp69_, _tmp71_); +"%s\" already loaded", _tmp57_, _tmp59_, _tmp61_); #line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _g_free0 (_tmp67_); + _g_free0 (_tmp57_); #line 421 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" spit_entry_point_params_destroy (¶ms); #line 421 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_module_rep_unref0 (module_rep); #line 421 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 4308 "Plugins.c" +#line 4451 "Plugins.c" } #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp72_ = module_rep; + _tmp62_ = module_rep; #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp73_ = _tmp72_->spit_module; + _tmp63_ = _tmp62_->spit_module; #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp74_ = spit_module_get_module_name (_tmp73_); + _tmp64_ = spit_module_get_module_name (_tmp63_); #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp75_ = module_rep; + _tmp65_ = module_rep; #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp76_ = _tmp75_->spit_module; + _tmp66_ = _tmp65_->spit_module; #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp77_ = spit_module_get_version (_tmp76_); + _tmp67_ = spit_module_get_version (_tmp66_); #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp78_ = module_rep; + _tmp68_ = module_rep; #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp79_ = _tmp78_->id; + _tmp69_ = _tmp68_->id; #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp80_ = file; + _tmp70_ = g_file_get_path (file); #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp81_ = g_file_get_path (_tmp80_); + _tmp71_ = _tmp70_; #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp82_ = _tmp81_; + g_debug ("Plugins.vala:424: Loaded SPIT module \"%s %s\" (%s) [%s]", _tmp64_, _tmp67_, _tmp69_, _tmp71_); #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - g_debug ("Plugins.vala:424: Loaded SPIT module \"%s %s\" (%s) [%s]", _tmp74_, _tmp77_, _tmp79_, _tmp82_); -#line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _g_free0 (_tmp82_); + _g_free0 (_tmp71_); #line 428 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp83_ = plugins_module_table; + _tmp72_ = plugins_module_table; #line 428 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp84_ = module_rep; + _tmp73_ = module_rep; #line 428 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp85_ = _tmp84_->id; + _tmp74_ = _tmp73_->id; #line 428 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp86_ = module_rep; + _tmp75_ = module_rep; #line 428 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp85_, _tmp86_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp74_, _tmp75_); #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp87_ = module_rep; + _tmp76_ = module_rep; #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp88_ = _tmp87_->spit_module; + _tmp77_ = _tmp76_->spit_module; #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp90_ = spit_module_get_pluggables (_tmp88_, &_tmp89_); -#line 4352 "Plugins.c" + _tmp79_ = spit_module_get_pluggables (_tmp77_, &_tmp78_); +#line 4493 "Plugins.c" { SpitPluggable** pluggable_collection = NULL; gint pluggable_collection_length1 = 0; gint _pluggable_collection_size_ = 0; gint pluggable_it = 0; #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - pluggable_collection = _tmp90_; + pluggable_collection = _tmp79_; #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - pluggable_collection_length1 = _tmp89_; + pluggable_collection_length1 = _tmp78_; #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - for (pluggable_it = 0; pluggable_it < _tmp89_; pluggable_it = pluggable_it + 1) { -#line 4364 "Plugins.c" - SpitPluggable* _tmp91_; + for (pluggable_it = 0; pluggable_it < _tmp78_; pluggable_it = pluggable_it + 1) { +#line 4505 "Plugins.c" + SpitPluggable* _tmp80_; SpitPluggable* pluggable = NULL; #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp91_ = _g_object_ref0 (pluggable_collection[pluggable_it]); + _tmp80_ = _g_object_ref0 (pluggable_collection[pluggable_it]); #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - pluggable = _tmp91_; -#line 4371 "Plugins.c" + pluggable = _tmp80_; +#line 4512 "Plugins.c" { - GeeHashMap* _tmp92_; - SpitPluggable* _tmp93_; - const gchar* _tmp94_; - SpitPluggable* _tmp95_; - PluginsPluggableRep* _tmp96_; - PluginsPluggableRep* _tmp97_; + GeeHashMap* _tmp81_; + SpitPluggable* _tmp82_; + const gchar* _tmp83_; + SpitPluggable* _tmp84_; + PluginsPluggableRep* _tmp85_; + PluginsPluggableRep* _tmp86_; #line 432 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp92_ = plugins_pluggable_table; + _tmp81_ = plugins_pluggable_table; #line 432 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp93_ = pluggable; + _tmp82_ = pluggable; #line 432 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp94_ = spit_pluggable_get_id (_tmp93_); + _tmp83_ = spit_pluggable_get_id (_tmp82_); #line 432 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp95_ = pluggable; + _tmp84_ = pluggable; #line 432 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp96_ = plugins_pluggable_rep_new (_tmp95_); + _tmp85_ = plugins_pluggable_rep_new (_tmp84_); #line 432 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp97_ = _tmp96_; + _tmp86_ = _tmp85_; #line 432 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp94_, _tmp97_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp83_, _tmp86_); #line 432 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _plugins_pluggable_rep_unref0 (_tmp97_); + _plugins_pluggable_rep_unref0 (_tmp86_); #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (pluggable); -#line 4397 "Plugins.c" +#line 4538 "Plugins.c" } } } @@ -4408,11 +4549,15 @@ void plugins_load_module (GFile* file) { spit_entry_point_params_destroy (¶ms); #line 353 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_module_rep_unref0 (module_rep); -#line 4405 "Plugins.c" +#line 4546 "Plugins.c" } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -4424,7 +4569,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/plugins/PublishingInterfaces.c b/src/plugins/PublishingInterfaces.c index 745d106..54059fb 100644 --- a/src/plugins/PublishingInterfaces.c +++ b/src/plugins/PublishingInterfaces.c @@ -1,4 +1,4 @@ -/* PublishingInterfaces.c generated by valac 0.36.6, the Vala compiler +/* PublishingInterfaces.c generated by valac 0.40.4, the Vala compiler * generated from PublishingInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -94,9 +95,9 @@ typedef struct _SpitPublishingAuthenticatorIface SpitPublishingAuthenticatorIfac enum { SPIT_PUBLISHING_AUTHENTICATOR_AUTHENTICATED_SIGNAL, SPIT_PUBLISHING_AUTHENTICATOR_AUTHENTICATION_FAILED_SIGNAL, - SPIT_PUBLISHING_AUTHENTICATOR_LAST_SIGNAL + SPIT_PUBLISHING_AUTHENTICATOR_NUM_SIGNALS }; -static guint spit_publishing_authenticator_signals[SPIT_PUBLISHING_AUTHENTICATOR_LAST_SIGNAL] = {0}; +static guint spit_publishing_authenticator_signals[SPIT_PUBLISHING_AUTHENTICATOR_NUM_SIGNALS] = {0}; #define SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY (spit_publishing_authenticator_factory_get_type ()) #define SPIT_PUBLISHING_AUTHENTICATOR_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory)) @@ -306,7 +307,8 @@ GQuark spit_publishing_publishing_error_quark (void); GType spit_pluggable_info_get_type (void) G_GNUC_CONST; SpitPluggableInfo* spit_pluggable_info_dup (const SpitPluggableInfo* self); void spit_pluggable_info_free (SpitPluggableInfo* self); -void spit_pluggable_info_copy (const SpitPluggableInfo* self, SpitPluggableInfo* dest); +void spit_pluggable_info_copy (const SpitPluggableInfo* self, + SpitPluggableInfo* dest); void spit_pluggable_info_destroy (SpitPluggableInfo* self); GType spit_pluggable_get_type (void) G_GNUC_CONST; GType spit_host_interface_get_type (void) G_GNUC_CONST; @@ -358,20 +360,37 @@ void spit_publishing_dialog_pane_reserved6 (SpitPublishingDialogPane* self); static void spit_publishing_dialog_pane_real_reserved6 (SpitPublishingDialogPane* self); void spit_publishing_dialog_pane_reserved7 (SpitPublishingDialogPane* self); static void spit_publishing_dialog_pane_real_reserved7 (SpitPublishingDialogPane* self); -void spit_publishing_plugin_host_post_error (SpitPublishingPluginHost* self, GError* err); +void spit_publishing_plugin_host_post_error (SpitPublishingPluginHost* self, + GError* err); void spit_publishing_plugin_host_stop_publishing (SpitPublishingPluginHost* self); SpitPublishingPublisher* spit_publishing_plugin_host_get_publisher (SpitPublishingPluginHost* self); -void spit_publishing_plugin_host_install_dialog_pane (SpitPublishingPluginHost* self, SpitPublishingDialogPane* pane, SpitPublishingPluginHostButtonMode mode); -void spit_publishing_plugin_host_install_static_message_pane (SpitPublishingPluginHost* self, const gchar* message, SpitPublishingPluginHostButtonMode mode); -void spit_publishing_plugin_host_install_pango_message_pane (SpitPublishingPluginHost* self, const gchar* markup, SpitPublishingPluginHostButtonMode mode); +void spit_publishing_plugin_host_install_dialog_pane (SpitPublishingPluginHost* self, + SpitPublishingDialogPane* pane, + SpitPublishingPluginHostButtonMode mode); +void spit_publishing_plugin_host_install_static_message_pane (SpitPublishingPluginHost* self, + const gchar* message, + SpitPublishingPluginHostButtonMode mode); +void spit_publishing_plugin_host_install_pango_message_pane (SpitPublishingPluginHost* self, + const gchar* markup, + SpitPublishingPluginHostButtonMode mode); void spit_publishing_plugin_host_install_success_pane (SpitPublishingPluginHost* self); void spit_publishing_plugin_host_install_account_fetch_wait_pane (SpitPublishingPluginHost* self); void spit_publishing_plugin_host_install_login_wait_pane (SpitPublishingPluginHost* self); -void spit_publishing_plugin_host_install_welcome_pane (SpitPublishingPluginHost* self, const gchar* welcome_message, SpitPublishingLoginCallback on_login_clicked, void* on_login_clicked_target); -void spit_publishing_plugin_host_set_service_locked (SpitPublishingPluginHost* self, gboolean is_locked); -void spit_publishing_plugin_host_set_dialog_default_widget (SpitPublishingPluginHost* self, GtkWidget* widget); -SpitPublishingPublishable** spit_publishing_plugin_host_get_publishables (SpitPublishingPluginHost* self, int* result_length1); -SpitPublishingProgressCallback spit_publishing_plugin_host_serialize_publishables (SpitPublishingPluginHost* self, gint content_major_axis, gboolean strip_metadata, void** result_target, GDestroyNotify* result_target_destroy_notify); +void spit_publishing_plugin_host_install_welcome_pane (SpitPublishingPluginHost* self, + const gchar* welcome_message, + SpitPublishingLoginCallback on_login_clicked, + void* on_login_clicked_target); +void spit_publishing_plugin_host_set_service_locked (SpitPublishingPluginHost* self, + gboolean is_locked); +void spit_publishing_plugin_host_set_dialog_default_widget (SpitPublishingPluginHost* self, + GtkWidget* widget); +SpitPublishingPublishable** spit_publishing_plugin_host_get_publishables (SpitPublishingPluginHost* self, + int* result_length1); +SpitPublishingProgressCallback spit_publishing_plugin_host_serialize_publishables (SpitPublishingPluginHost* self, + gint content_major_axis, + gboolean strip_metadata, + void** result_target, + GDestroyNotify* result_target_destroy_notify); SpitPublishingPublisherMediaType spit_publishing_plugin_host_get_publishable_media_type (SpitPublishingPluginHost* self); void spit_publishing_plugin_host_reserved0 (SpitPublishingPluginHost* self); static void spit_publishing_plugin_host_real_reserved0 (SpitPublishingPluginHost* self); @@ -391,8 +410,10 @@ void spit_publishing_plugin_host_reserved7 (SpitPublishingPluginHost* self); static void spit_publishing_plugin_host_real_reserved7 (SpitPublishingPluginHost* self); GFile* spit_publishing_publishable_get_serialized_file (SpitPublishingPublishable* self); gchar* spit_publishing_publishable_get_publishing_name (SpitPublishingPublishable* self); -gchar* spit_publishing_publishable_get_param_string (SpitPublishingPublishable* self, const gchar* name); -gchar** spit_publishing_publishable_get_publishing_keywords (SpitPublishingPublishable* self, int* result_length1); +gchar* spit_publishing_publishable_get_param_string (SpitPublishingPublishable* self, + const gchar* name); +gchar** spit_publishing_publishable_get_publishing_keywords (SpitPublishingPublishable* self, + int* result_length1); SpitPublishingPublisherMediaType spit_publishing_publishable_get_media_type (SpitPublishingPublishable* self); GDateTime* spit_publishing_publishable_get_exposure_date_time (SpitPublishingPublishable* self); void spit_publishing_publishable_reserved0 (SpitPublishingPublishable* self); @@ -415,7 +436,8 @@ static void spit_publishing_publishable_real_reserved7 (SpitPublishingPublishabl #define SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_TITLE "title" #define SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT "comment" #define SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_EVENTCOMMENT "eventcomment" -SpitPublishingPublisher* spit_publishing_service_create_publisher (SpitPublishingService* self, SpitPublishingPluginHost* host); +SpitPublishingPublisher* spit_publishing_service_create_publisher (SpitPublishingService* self, + SpitPublishingPluginHost* host); SpitPublishingPublisherMediaType spit_publishing_service_get_supported_media (SpitPublishingService* self); void spit_publishing_service_reserved0 (SpitPublishingService* self); static void spit_publishing_service_real_reserved0 (SpitPublishingService* self); @@ -441,10 +463,14 @@ void spit_publishing_authenticator_refresh (SpitPublishingAuthenticator* self); GHashTable* spit_publishing_authenticator_get_authentication_parameter (SpitPublishingAuthenticator* self); GType spit_publishing_authenticator_factory_get_type (void) G_GNUC_CONST; GeeList* spit_publishing_authenticator_factory_get_available_authenticators (SpitPublishingAuthenticatorFactory* self); -SpitPublishingAuthenticator* spit_publishing_authenticator_factory_create (SpitPublishingAuthenticatorFactory* self, const gchar* provider, SpitPublishingPluginHost* host); +SpitPublishingAuthenticator* spit_publishing_authenticator_factory_create (SpitPublishingAuthenticatorFactory* self, + const gchar* provider, + SpitPublishingPluginHost* host); -GQuark spit_publishing_publishing_error_quark (void) { +GQuark +spit_publishing_publishing_error_quark (void) +{ return g_quark_from_static_string ("spit_publishing_publishing_error-quark"); } @@ -455,7 +481,9 @@ GQuark spit_publishing_publishing_error_quark (void) { * Values can be masked together, for example: {{{(MediaType.PHOTO | MediaType.VIDEO)}}} * indicates that a publishing service supports the upload of both photos and videos. */ -GType spit_publishing_publisher_media_type_get_type (void) { +GType +spit_publishing_publisher_media_type_get_type (void) +{ static volatile gsize spit_publishing_publisher_media_type_type_id__volatile = 0; if (g_once_init_enter (&spit_publishing_publisher_media_type_type_id__volatile)) { static const GEnumValue values[] = {{SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_NONE, "SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_NONE", "none"}, {SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO, "SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO", "photo"}, {SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO, "SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO", "video"}, {0, NULL, NULL}}; @@ -470,12 +498,14 @@ GType spit_publishing_publisher_media_type_get_type (void) { /** * Returns a {@link Service} object describing the service to which this connects. */ -SpitPublishingService* spit_publishing_publisher_get_service (SpitPublishingPublisher* self) { +SpitPublishingService* +spit_publishing_publisher_get_service (SpitPublishingPublisher* self) +{ #line 121 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self), NULL); #line 121 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->get_service (self); -#line 479 "PublishingInterfaces.c" +#line 509 "PublishingInterfaces.c" } @@ -485,24 +515,28 @@ SpitPublishingService* spit_publishing_publisher_get_service (SpitPublishingPubl * this publisher can install user interface panes and query configuration information. * Only running services should perform network operations. */ -void spit_publishing_publisher_start (SpitPublishingPublisher* self) { +void +spit_publishing_publisher_start (SpitPublishingPublisher* self) +{ #line 129 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self)); #line 129 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->start (self); -#line 494 "PublishingInterfaces.c" +#line 526 "PublishingInterfaces.c" } /** * Returns true if this publisher is in the running state; false otherwise. */ -gboolean spit_publishing_publisher_is_running (SpitPublishingPublisher* self) { +gboolean +spit_publishing_publisher_is_running (SpitPublishingPublisher* self) +{ #line 134 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self), FALSE); #line 134 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->is_running (self); -#line 506 "PublishingInterfaces.c" +#line 540 "PublishingInterfaces.c" } @@ -510,120 +544,156 @@ gboolean spit_publishing_publisher_is_running (SpitPublishingPublisher* self) { * Causes this publisher to enter a non-running state. This publisher should stop all * network operations and cease use of the shared services provided by the {@link PluginHost}. */ -void spit_publishing_publisher_stop (SpitPublishingPublisher* self) { +void +spit_publishing_publisher_stop (SpitPublishingPublisher* self) +{ #line 140 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self)); #line 140 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->stop (self); -#line 519 "PublishingInterfaces.c" +#line 555 "PublishingInterfaces.c" } -static void spit_publishing_publisher_real_reserved0 (SpitPublishingPublisher* self) { +static void +spit_publishing_publisher_real_reserved0 (SpitPublishingPublisher* self) +{ } -void spit_publishing_publisher_reserved0 (SpitPublishingPublisher* self) { +void +spit_publishing_publisher_reserved0 (SpitPublishingPublisher* self) +{ #line 145 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self)); #line 145 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved0 (self); -#line 532 "PublishingInterfaces.c" +#line 572 "PublishingInterfaces.c" } -static void spit_publishing_publisher_real_reserved1 (SpitPublishingPublisher* self) { +static void +spit_publishing_publisher_real_reserved1 (SpitPublishingPublisher* self) +{ } -void spit_publishing_publisher_reserved1 (SpitPublishingPublisher* self) { +void +spit_publishing_publisher_reserved1 (SpitPublishingPublisher* self) +{ #line 146 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self)); #line 146 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved1 (self); -#line 545 "PublishingInterfaces.c" +#line 589 "PublishingInterfaces.c" } -static void spit_publishing_publisher_real_reserved2 (SpitPublishingPublisher* self) { +static void +spit_publishing_publisher_real_reserved2 (SpitPublishingPublisher* self) +{ } -void spit_publishing_publisher_reserved2 (SpitPublishingPublisher* self) { +void +spit_publishing_publisher_reserved2 (SpitPublishingPublisher* self) +{ #line 147 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self)); #line 147 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved2 (self); -#line 558 "PublishingInterfaces.c" +#line 606 "PublishingInterfaces.c" } -static void spit_publishing_publisher_real_reserved3 (SpitPublishingPublisher* self) { +static void +spit_publishing_publisher_real_reserved3 (SpitPublishingPublisher* self) +{ } -void spit_publishing_publisher_reserved3 (SpitPublishingPublisher* self) { +void +spit_publishing_publisher_reserved3 (SpitPublishingPublisher* self) +{ #line 148 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self)); #line 148 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved3 (self); -#line 571 "PublishingInterfaces.c" +#line 623 "PublishingInterfaces.c" } -static void spit_publishing_publisher_real_reserved4 (SpitPublishingPublisher* self) { +static void +spit_publishing_publisher_real_reserved4 (SpitPublishingPublisher* self) +{ } -void spit_publishing_publisher_reserved4 (SpitPublishingPublisher* self) { +void +spit_publishing_publisher_reserved4 (SpitPublishingPublisher* self) +{ #line 149 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self)); #line 149 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved4 (self); -#line 584 "PublishingInterfaces.c" +#line 640 "PublishingInterfaces.c" } -static void spit_publishing_publisher_real_reserved5 (SpitPublishingPublisher* self) { +static void +spit_publishing_publisher_real_reserved5 (SpitPublishingPublisher* self) +{ } -void spit_publishing_publisher_reserved5 (SpitPublishingPublisher* self) { +void +spit_publishing_publisher_reserved5 (SpitPublishingPublisher* self) +{ #line 150 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self)); #line 150 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved5 (self); -#line 597 "PublishingInterfaces.c" +#line 657 "PublishingInterfaces.c" } -static void spit_publishing_publisher_real_reserved6 (SpitPublishingPublisher* self) { +static void +spit_publishing_publisher_real_reserved6 (SpitPublishingPublisher* self) +{ } -void spit_publishing_publisher_reserved6 (SpitPublishingPublisher* self) { +void +spit_publishing_publisher_reserved6 (SpitPublishingPublisher* self) +{ #line 151 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self)); #line 151 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved6 (self); -#line 610 "PublishingInterfaces.c" +#line 674 "PublishingInterfaces.c" } -static void spit_publishing_publisher_real_reserved7 (SpitPublishingPublisher* self) { +static void +spit_publishing_publisher_real_reserved7 (SpitPublishingPublisher* self) +{ } -void spit_publishing_publisher_reserved7 (SpitPublishingPublisher* self) { +void +spit_publishing_publisher_reserved7 (SpitPublishingPublisher* self) +{ #line 152 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self)); #line 152 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved7 (self); -#line 623 "PublishingInterfaces.c" +#line 691 "PublishingInterfaces.c" } -static void spit_publishing_publisher_base_init (SpitPublishingPublisherIface * iface) { +static void +spit_publishing_publisher_base_init (SpitPublishingPublisherIface * iface) +{ #line 105 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" static gboolean initialized = FALSE; #line 105 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" @@ -646,7 +716,7 @@ static void spit_publishing_publisher_base_init (SpitPublishingPublisherIface * iface->reserved6 = spit_publishing_publisher_real_reserved6; #line 105 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" iface->reserved7 = spit_publishing_publisher_real_reserved7; -#line 650 "PublishingInterfaces.c" +#line 720 "PublishingInterfaces.c" } } @@ -661,7 +731,9 @@ static void spit_publishing_publisher_base_init (SpitPublishingPublisherIface * * a non-running state and do not begin running until start( ) is invoked. Publishers * run until stop( ) is invoked. */ -GType spit_publishing_publisher_get_type (void) { +GType +spit_publishing_publisher_get_type (void) +{ static volatile gsize spit_publishing_publisher_type_id__volatile = 0; if (g_once_init_enter (&spit_publishing_publisher_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitPublishingPublisherIface), (GBaseInitFunc) spit_publishing_publisher_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -678,7 +750,9 @@ GType spit_publishing_publisher_get_type (void) { * Describes how the on-screen publishing dialog box should look and behave when an associated * pane is installed in the on-screen publishing dialog box. */ -GType spit_publishing_dialog_pane_geometry_options_get_type (void) { +GType +spit_publishing_dialog_pane_geometry_options_get_type (void) +{ static volatile gsize spit_publishing_dialog_pane_geometry_options_type_id__volatile = 0; if (g_once_init_enter (&spit_publishing_dialog_pane_geometry_options_type_id__volatile)) { static const GEnumValue values[] = {{SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, "SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE", "none"}, {SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE, "SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE", "extended-size"}, {SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE, "SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE", "resizable"}, {SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE, "SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE", "colossal-size"}, {0, NULL, NULL}}; @@ -693,12 +767,14 @@ GType spit_publishing_dialog_pane_geometry_options_get_type (void) { /** * Returns the Gtk.Widget that is this pane's on-screen representation. */ -GtkWidget* spit_publishing_dialog_pane_get_widget (SpitPublishingDialogPane* self) { +GtkWidget* +spit_publishing_dialog_pane_get_widget (SpitPublishingDialogPane* self) +{ #line 197 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self), NULL); #line 197 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->get_widget (self); -#line 702 "PublishingInterfaces.c" +#line 778 "PublishingInterfaces.c" } @@ -706,12 +782,14 @@ GtkWidget* spit_publishing_dialog_pane_get_widget (SpitPublishingDialogPane* sel * Returns a {@link GeometryOptions} bitfield describing how the on-screen publishing dialog * box should look and behave when this pane is installed. */ -SpitPublishingDialogPaneGeometryOptions spit_publishing_dialog_pane_get_preferred_geometry (SpitPublishingDialogPane* self) { +SpitPublishingDialogPaneGeometryOptions +spit_publishing_dialog_pane_get_preferred_geometry (SpitPublishingDialogPane* self) +{ #line 203 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self), 0); #line 203 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->get_preferred_geometry (self); -#line 715 "PublishingInterfaces.c" +#line 793 "PublishingInterfaces.c" } @@ -719,12 +797,14 @@ SpitPublishingDialogPaneGeometryOptions spit_publishing_dialog_pane_get_preferre * Invoked automatically by Shotwell when this pane has been installed into the on-screen * publishing dialog box and become visible to the user. */ -void spit_publishing_dialog_pane_on_pane_installed (SpitPublishingDialogPane* self) { +void +spit_publishing_dialog_pane_on_pane_installed (SpitPublishingDialogPane* self) +{ #line 209 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self)); #line 209 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->on_pane_installed (self); -#line 728 "PublishingInterfaces.c" +#line 808 "PublishingInterfaces.c" } @@ -732,120 +812,156 @@ void spit_publishing_dialog_pane_on_pane_installed (SpitPublishingDialogPane* se * Invoked automatically by Shotwell when this pane has been removed from the on-screen * publishing dialog box and is no longer visible to the user. */ -void spit_publishing_dialog_pane_on_pane_uninstalled (SpitPublishingDialogPane* self) { +void +spit_publishing_dialog_pane_on_pane_uninstalled (SpitPublishingDialogPane* self) +{ #line 215 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self)); #line 215 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->on_pane_uninstalled (self); -#line 741 "PublishingInterfaces.c" +#line 823 "PublishingInterfaces.c" } -static void spit_publishing_dialog_pane_real_reserved0 (SpitPublishingDialogPane* self) { +static void +spit_publishing_dialog_pane_real_reserved0 (SpitPublishingDialogPane* self) +{ } -void spit_publishing_dialog_pane_reserved0 (SpitPublishingDialogPane* self) { +void +spit_publishing_dialog_pane_reserved0 (SpitPublishingDialogPane* self) +{ #line 220 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self)); #line 220 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved0 (self); -#line 754 "PublishingInterfaces.c" +#line 840 "PublishingInterfaces.c" } -static void spit_publishing_dialog_pane_real_reserved1 (SpitPublishingDialogPane* self) { +static void +spit_publishing_dialog_pane_real_reserved1 (SpitPublishingDialogPane* self) +{ } -void spit_publishing_dialog_pane_reserved1 (SpitPublishingDialogPane* self) { +void +spit_publishing_dialog_pane_reserved1 (SpitPublishingDialogPane* self) +{ #line 221 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self)); #line 221 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved1 (self); -#line 767 "PublishingInterfaces.c" +#line 857 "PublishingInterfaces.c" } -static void spit_publishing_dialog_pane_real_reserved2 (SpitPublishingDialogPane* self) { +static void +spit_publishing_dialog_pane_real_reserved2 (SpitPublishingDialogPane* self) +{ } -void spit_publishing_dialog_pane_reserved2 (SpitPublishingDialogPane* self) { +void +spit_publishing_dialog_pane_reserved2 (SpitPublishingDialogPane* self) +{ #line 222 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self)); #line 222 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved2 (self); -#line 780 "PublishingInterfaces.c" +#line 874 "PublishingInterfaces.c" } -static void spit_publishing_dialog_pane_real_reserved3 (SpitPublishingDialogPane* self) { +static void +spit_publishing_dialog_pane_real_reserved3 (SpitPublishingDialogPane* self) +{ } -void spit_publishing_dialog_pane_reserved3 (SpitPublishingDialogPane* self) { +void +spit_publishing_dialog_pane_reserved3 (SpitPublishingDialogPane* self) +{ #line 223 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self)); #line 223 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved3 (self); -#line 793 "PublishingInterfaces.c" +#line 891 "PublishingInterfaces.c" } -static void spit_publishing_dialog_pane_real_reserved4 (SpitPublishingDialogPane* self) { +static void +spit_publishing_dialog_pane_real_reserved4 (SpitPublishingDialogPane* self) +{ } -void spit_publishing_dialog_pane_reserved4 (SpitPublishingDialogPane* self) { +void +spit_publishing_dialog_pane_reserved4 (SpitPublishingDialogPane* self) +{ #line 224 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self)); #line 224 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved4 (self); -#line 806 "PublishingInterfaces.c" +#line 908 "PublishingInterfaces.c" } -static void spit_publishing_dialog_pane_real_reserved5 (SpitPublishingDialogPane* self) { +static void +spit_publishing_dialog_pane_real_reserved5 (SpitPublishingDialogPane* self) +{ } -void spit_publishing_dialog_pane_reserved5 (SpitPublishingDialogPane* self) { +void +spit_publishing_dialog_pane_reserved5 (SpitPublishingDialogPane* self) +{ #line 225 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self)); #line 225 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved5 (self); -#line 819 "PublishingInterfaces.c" +#line 925 "PublishingInterfaces.c" } -static void spit_publishing_dialog_pane_real_reserved6 (SpitPublishingDialogPane* self) { +static void +spit_publishing_dialog_pane_real_reserved6 (SpitPublishingDialogPane* self) +{ } -void spit_publishing_dialog_pane_reserved6 (SpitPublishingDialogPane* self) { +void +spit_publishing_dialog_pane_reserved6 (SpitPublishingDialogPane* self) +{ #line 226 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self)); #line 226 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved6 (self); -#line 832 "PublishingInterfaces.c" +#line 942 "PublishingInterfaces.c" } -static void spit_publishing_dialog_pane_real_reserved7 (SpitPublishingDialogPane* self) { +static void +spit_publishing_dialog_pane_real_reserved7 (SpitPublishingDialogPane* self) +{ } -void spit_publishing_dialog_pane_reserved7 (SpitPublishingDialogPane* self) { +void +spit_publishing_dialog_pane_reserved7 (SpitPublishingDialogPane* self) +{ #line 227 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self)); #line 227 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved7 (self); -#line 845 "PublishingInterfaces.c" +#line 959 "PublishingInterfaces.c" } -static void spit_publishing_dialog_pane_base_init (SpitPublishingDialogPaneIface * iface) { +static void +spit_publishing_dialog_pane_base_init (SpitPublishingDialogPaneIface * iface) +{ #line 160 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" static gboolean initialized = FALSE; #line 160 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" @@ -868,7 +984,7 @@ static void spit_publishing_dialog_pane_base_init (SpitPublishingDialogPaneIface iface->reserved6 = spit_publishing_dialog_pane_real_reserved6; #line 160 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" iface->reserved7 = spit_publishing_dialog_pane_real_reserved7; -#line 872 "PublishingInterfaces.c" +#line 988 "PublishingInterfaces.c" } } @@ -878,7 +994,9 @@ static void spit_publishing_dialog_pane_base_init (SpitPublishingDialogPaneIface * communicate status to and to get information from the user. * */ -GType spit_publishing_dialog_pane_get_type (void) { +GType +spit_publishing_dialog_pane_get_type (void) +{ static volatile gsize spit_publishing_dialog_pane_type_id__volatile = 0; if (g_once_init_enter (&spit_publishing_dialog_pane_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitPublishingDialogPaneIface), (GBaseInitFunc) spit_publishing_dialog_pane_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -895,7 +1013,9 @@ GType spit_publishing_dialog_pane_get_type (void) { * Specifies the label text on the push button control that appears in the * lower-right-hand corner of the on-screen publishing dialog box. */ -GType spit_publishing_plugin_host_button_mode_get_type (void) { +GType +spit_publishing_plugin_host_button_mode_get_type (void) +{ static volatile gsize spit_publishing_plugin_host_button_mode_type_id__volatile = 0; if (g_once_init_enter (&spit_publishing_plugin_host_button_mode_type_id__volatile)) { static const GEnumValue values[] = {{SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE, "SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE", "close"}, {SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL, "SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL", "cancel"}, {0, NULL, NULL}}; @@ -913,12 +1033,15 @@ GType spit_publishing_plugin_host_button_mode_get_type (void) { * * @param err An error object that describes the kind of error that occurred. */ -void spit_publishing_plugin_host_post_error (SpitPublishingPluginHost* self, GError* err) { +void +spit_publishing_plugin_host_post_error (SpitPublishingPluginHost* self, + GError* err) +{ #line 277 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 277 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->post_error (self, err); -#line 922 "PublishingInterfaces.c" +#line 1045 "PublishingInterfaces.c" } @@ -928,24 +1051,28 @@ void spit_publishing_plugin_host_post_error (SpitPublishingPluginHost* self, GEr * Calling this method stops all network activity and hides the on-screen publishing * dialog box. */ -void spit_publishing_plugin_host_stop_publishing (SpitPublishingPluginHost* self) { +void +spit_publishing_plugin_host_stop_publishing (SpitPublishingPluginHost* self) +{ #line 285 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 285 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->stop_publishing (self); -#line 937 "PublishingInterfaces.c" +#line 1062 "PublishingInterfaces.c" } /** * Returns a reference to the {@link Publisher} object that this is currently hosting. */ -SpitPublishingPublisher* spit_publishing_plugin_host_get_publisher (SpitPublishingPluginHost* self) { +SpitPublishingPublisher* +spit_publishing_plugin_host_get_publisher (SpitPublishingPluginHost* self) +{ #line 290 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self), NULL); #line 290 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->get_publisher (self); -#line 949 "PublishingInterfaces.c" +#line 1076 "PublishingInterfaces.c" } @@ -967,12 +1094,16 @@ SpitPublishingPublisher* spit_publishing_plugin_host_get_publisher (SpitPublishi * should be ButtonMode.CLOSE, because all cancellable publishing actions have already * occurred. */ -void spit_publishing_plugin_host_install_dialog_pane (SpitPublishingPluginHost* self, SpitPublishingDialogPane* pane, SpitPublishingPluginHostButtonMode mode) { +void +spit_publishing_plugin_host_install_dialog_pane (SpitPublishingPluginHost* self, + SpitPublishingDialogPane* pane, + SpitPublishingPluginHostButtonMode mode) +{ #line 310 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 310 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_dialog_pane (self, pane, mode); -#line 976 "PublishingInterfaces.c" +#line 1107 "PublishingInterfaces.c" } @@ -1002,12 +1133,16 @@ void spit_publishing_plugin_host_install_dialog_pane (SpitPublishingPluginHost* * should be ButtonMode.CLOSE, because all cancellable publishing actions have already * occurred. */ -void spit_publishing_plugin_host_install_static_message_pane (SpitPublishingPluginHost* self, const gchar* message, SpitPublishingPluginHostButtonMode mode) { +void +spit_publishing_plugin_host_install_static_message_pane (SpitPublishingPluginHost* self, + const gchar* message, + SpitPublishingPluginHostButtonMode mode) +{ #line 339 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 339 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_static_message_pane (self, message, mode); -#line 1011 "PublishingInterfaces.c" +#line 1146 "PublishingInterfaces.c" } @@ -1029,12 +1164,16 @@ void spit_publishing_plugin_host_install_static_message_pane (SpitPublishingPlug * should be ButtonMode.CLOSE, because all cancellable publishing actions have already * occurred. */ -void spit_publishing_plugin_host_install_pango_message_pane (SpitPublishingPluginHost* self, const gchar* markup, SpitPublishingPluginHostButtonMode mode) { +void +spit_publishing_plugin_host_install_pango_message_pane (SpitPublishingPluginHost* self, + const gchar* markup, + SpitPublishingPluginHostButtonMode mode) +{ #line 360 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 360 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_pango_message_pane (self, markup, mode); -#line 1038 "PublishingInterfaces.c" +#line 1177 "PublishingInterfaces.c" } @@ -1050,12 +1189,14 @@ void spit_publishing_plugin_host_install_pango_message_pane (SpitPublishingPlugi * If an error has posted, the {@link PluginHost} will not honor * this request. */ -void spit_publishing_plugin_host_install_success_pane (SpitPublishingPluginHost* self) { +void +spit_publishing_plugin_host_install_success_pane (SpitPublishingPluginHost* self) +{ #line 375 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 375 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_success_pane (self); -#line 1059 "PublishingInterfaces.c" +#line 1200 "PublishingInterfaces.c" } @@ -1073,12 +1214,14 @@ void spit_publishing_plugin_host_install_success_pane (SpitPublishingPluginHost* * * If an error has posted, the {@link PluginHost} will not honor this request. */ -void spit_publishing_plugin_host_install_account_fetch_wait_pane (SpitPublishingPluginHost* self) { +void +spit_publishing_plugin_host_install_account_fetch_wait_pane (SpitPublishingPluginHost* self) +{ #line 391 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 391 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_account_fetch_wait_pane (self); -#line 1082 "PublishingInterfaces.c" +#line 1225 "PublishingInterfaces.c" } @@ -1093,12 +1236,14 @@ void spit_publishing_plugin_host_install_account_fetch_wait_pane (SpitPublishing * * If an error has posted, the {@link PluginHost} will not honor this request. */ -void spit_publishing_plugin_host_install_login_wait_pane (SpitPublishingPluginHost* self) { +void +spit_publishing_plugin_host_install_login_wait_pane (SpitPublishingPluginHost* self) +{ #line 405 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 405 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_login_wait_pane (self); -#line 1102 "PublishingInterfaces.c" +#line 1247 "PublishingInterfaces.c" } @@ -1122,12 +1267,17 @@ void spit_publishing_plugin_host_install_login_wait_pane (SpitPublishingPluginHo * @param on_login_clicked specifies the callback that is invoked when the user clicks * the “Login” button. */ -void spit_publishing_plugin_host_install_welcome_pane (SpitPublishingPluginHost* self, const gchar* welcome_message, SpitPublishingLoginCallback on_login_clicked, void* on_login_clicked_target) { +void +spit_publishing_plugin_host_install_welcome_pane (SpitPublishingPluginHost* self, + const gchar* welcome_message, + SpitPublishingLoginCallback on_login_clicked, + void* on_login_clicked_target) +{ #line 427 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 427 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_welcome_pane (self, welcome_message, on_login_clicked, on_login_clicked_target); -#line 1131 "PublishingInterfaces.c" +#line 1281 "PublishingInterfaces.c" } @@ -1145,12 +1295,15 @@ void spit_publishing_plugin_host_install_welcome_pane (SpitPublishingPluginHost* * When is_locked is false, the combo box is sensitive, allowing the user to freely switch * from the current service to another service. */ -void spit_publishing_plugin_host_set_service_locked (SpitPublishingPluginHost* self, gboolean is_locked) { +void +spit_publishing_plugin_host_set_service_locked (SpitPublishingPluginHost* self, + gboolean is_locked) +{ #line 444 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 444 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->set_service_locked (self, is_locked); -#line 1154 "PublishingInterfaces.c" +#line 1307 "PublishingInterfaces.c" } @@ -1164,12 +1317,15 @@ void spit_publishing_plugin_host_set_service_locked (SpitPublishingPluginHost* s * @param widget a reference to the widget to designate as the default widget for the * publishing dialog. */ -void spit_publishing_plugin_host_set_dialog_default_widget (SpitPublishingPluginHost* self, GtkWidget* widget) { +void +spit_publishing_plugin_host_set_dialog_default_widget (SpitPublishingPluginHost* self, + GtkWidget* widget) +{ #line 456 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 456 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->set_dialog_default_widget (self, widget); -#line 1173 "PublishingInterfaces.c" +#line 1329 "PublishingInterfaces.c" } @@ -1177,12 +1333,15 @@ void spit_publishing_plugin_host_set_dialog_default_widget (SpitPublishingPlugin * Returns an array of the publishable media items that the user has selected for upload to the * remote service. */ -SpitPublishingPublishable** spit_publishing_plugin_host_get_publishables (SpitPublishingPluginHost* self, int* result_length1) { +SpitPublishingPublishable** +spit_publishing_plugin_host_get_publishables (SpitPublishingPluginHost* self, + int* result_length1) +{ #line 462 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self), NULL); #line 462 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->get_publishables (self, result_length1); -#line 1186 "PublishingInterfaces.c" +#line 1345 "PublishingInterfaces.c" } @@ -1216,12 +1375,18 @@ SpitPublishingPublishable** spit_publishing_plugin_host_get_publishables (SpitPu * metadata will be left intact. The value of this parameter has no * effect on video publishables. */ -SpitPublishingProgressCallback spit_publishing_plugin_host_serialize_publishables (SpitPublishingPluginHost* self, gint content_major_axis, gboolean strip_metadata, void** result_target, GDestroyNotify* result_target_destroy_notify) { +SpitPublishingProgressCallback +spit_publishing_plugin_host_serialize_publishables (SpitPublishingPluginHost* self, + gint content_major_axis, + gboolean strip_metadata, + void** result_target, + GDestroyNotify* result_target_destroy_notify) +{ #line 494 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self), NULL); #line 494 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->serialize_publishables (self, content_major_axis, strip_metadata, result_target, result_target_destroy_notify); -#line 1225 "PublishingInterfaces.c" +#line 1390 "PublishingInterfaces.c" } @@ -1230,120 +1395,156 @@ SpitPublishingProgressCallback spit_publishing_plugin_host_serialize_publishable * in the set of publishable media items that the user has selected for upload to the remote * service. */ -SpitPublishingPublisherMediaType spit_publishing_plugin_host_get_publishable_media_type (SpitPublishingPluginHost* self) { +SpitPublishingPublisherMediaType +spit_publishing_plugin_host_get_publishable_media_type (SpitPublishingPluginHost* self) +{ #line 502 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self), 0); #line 502 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->get_publishable_media_type (self); -#line 1239 "PublishingInterfaces.c" +#line 1406 "PublishingInterfaces.c" } -static void spit_publishing_plugin_host_real_reserved0 (SpitPublishingPluginHost* self) { +static void +spit_publishing_plugin_host_real_reserved0 (SpitPublishingPluginHost* self) +{ } -void spit_publishing_plugin_host_reserved0 (SpitPublishingPluginHost* self) { +void +spit_publishing_plugin_host_reserved0 (SpitPublishingPluginHost* self) +{ #line 507 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 507 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved0 (self); -#line 1252 "PublishingInterfaces.c" +#line 1423 "PublishingInterfaces.c" } -static void spit_publishing_plugin_host_real_reserved1 (SpitPublishingPluginHost* self) { +static void +spit_publishing_plugin_host_real_reserved1 (SpitPublishingPluginHost* self) +{ } -void spit_publishing_plugin_host_reserved1 (SpitPublishingPluginHost* self) { +void +spit_publishing_plugin_host_reserved1 (SpitPublishingPluginHost* self) +{ #line 508 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 508 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved1 (self); -#line 1265 "PublishingInterfaces.c" +#line 1440 "PublishingInterfaces.c" } -static void spit_publishing_plugin_host_real_reserved2 (SpitPublishingPluginHost* self) { +static void +spit_publishing_plugin_host_real_reserved2 (SpitPublishingPluginHost* self) +{ } -void spit_publishing_plugin_host_reserved2 (SpitPublishingPluginHost* self) { +void +spit_publishing_plugin_host_reserved2 (SpitPublishingPluginHost* self) +{ #line 509 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 509 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved2 (self); -#line 1278 "PublishingInterfaces.c" +#line 1457 "PublishingInterfaces.c" } -static void spit_publishing_plugin_host_real_reserved3 (SpitPublishingPluginHost* self) { +static void +spit_publishing_plugin_host_real_reserved3 (SpitPublishingPluginHost* self) +{ } -void spit_publishing_plugin_host_reserved3 (SpitPublishingPluginHost* self) { +void +spit_publishing_plugin_host_reserved3 (SpitPublishingPluginHost* self) +{ #line 510 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 510 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved3 (self); -#line 1291 "PublishingInterfaces.c" +#line 1474 "PublishingInterfaces.c" } -static void spit_publishing_plugin_host_real_reserved4 (SpitPublishingPluginHost* self) { +static void +spit_publishing_plugin_host_real_reserved4 (SpitPublishingPluginHost* self) +{ } -void spit_publishing_plugin_host_reserved4 (SpitPublishingPluginHost* self) { +void +spit_publishing_plugin_host_reserved4 (SpitPublishingPluginHost* self) +{ #line 511 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 511 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved4 (self); -#line 1304 "PublishingInterfaces.c" +#line 1491 "PublishingInterfaces.c" } -static void spit_publishing_plugin_host_real_reserved5 (SpitPublishingPluginHost* self) { +static void +spit_publishing_plugin_host_real_reserved5 (SpitPublishingPluginHost* self) +{ } -void spit_publishing_plugin_host_reserved5 (SpitPublishingPluginHost* self) { +void +spit_publishing_plugin_host_reserved5 (SpitPublishingPluginHost* self) +{ #line 512 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 512 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved5 (self); -#line 1317 "PublishingInterfaces.c" +#line 1508 "PublishingInterfaces.c" } -static void spit_publishing_plugin_host_real_reserved6 (SpitPublishingPluginHost* self) { +static void +spit_publishing_plugin_host_real_reserved6 (SpitPublishingPluginHost* self) +{ } -void spit_publishing_plugin_host_reserved6 (SpitPublishingPluginHost* self) { +void +spit_publishing_plugin_host_reserved6 (SpitPublishingPluginHost* self) +{ #line 513 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 513 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved6 (self); -#line 1330 "PublishingInterfaces.c" +#line 1525 "PublishingInterfaces.c" } -static void spit_publishing_plugin_host_real_reserved7 (SpitPublishingPluginHost* self) { +static void +spit_publishing_plugin_host_real_reserved7 (SpitPublishingPluginHost* self) +{ } -void spit_publishing_plugin_host_reserved7 (SpitPublishingPluginHost* self) { +void +spit_publishing_plugin_host_reserved7 (SpitPublishingPluginHost* self) +{ #line 514 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 514 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved7 (self); -#line 1343 "PublishingInterfaces.c" +#line 1542 "PublishingInterfaces.c" } -static void spit_publishing_plugin_host_base_init (SpitPublishingPluginHostIface * iface) { +static void +spit_publishing_plugin_host_base_init (SpitPublishingPluginHostIface * iface) +{ #line 260 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" static gboolean initialized = FALSE; #line 260 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" @@ -1366,7 +1567,7 @@ static void spit_publishing_plugin_host_base_init (SpitPublishingPluginHostIface iface->reserved6 = spit_publishing_plugin_host_real_reserved6; #line 260 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" iface->reserved7 = spit_publishing_plugin_host_real_reserved7; -#line 1370 "PublishingInterfaces.c" +#line 1571 "PublishingInterfaces.c" } } @@ -1383,7 +1584,9 @@ static void spit_publishing_plugin_host_base_init (SpitPublishingPluginHostIface * {@link Publisher} is in the running state. This ensures that non-running publishers * don’t destructively interfere with the actively running publisher. */ -GType spit_publishing_plugin_host_get_type (void) { +GType +spit_publishing_plugin_host_get_type (void) +{ static volatile gsize spit_publishing_plugin_host_type_id__volatile = 0; if (g_once_init_enter (&spit_publishing_plugin_host_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitPublishingPluginHostIface), (GBaseInitFunc) spit_publishing_plugin_host_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -1404,12 +1607,14 @@ GType spit_publishing_plugin_host_get_type (void) { * You should use this file handle to read into memory the binary data you will send over * the network to the remote publishing service when this publishable is uploaded. */ -GFile* spit_publishing_publishable_get_serialized_file (SpitPublishingPublishable* self) { +GFile* +spit_publishing_publishable_get_serialized_file (SpitPublishingPublishable* self) +{ #line 535 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL); #line 535 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_serialized_file (self); -#line 1413 "PublishingInterfaces.c" +#line 1618 "PublishingInterfaces.c" } @@ -1420,12 +1625,14 @@ GFile* spit_publishing_publishable_get_serialized_file (SpitPublishingPublishabl * and provide a fallback value. One possible option for a fallback is: * get_param_string(Spit.Publishing.Publishable.PARAM_STRING_BASENAME) */ -gchar* spit_publishing_publishable_get_publishing_name (SpitPublishingPublishable* self) { +gchar* +spit_publishing_publishable_get_publishing_name (SpitPublishingPublishable* self) +{ #line 544 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL); #line 544 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_publishing_name (self); -#line 1429 "PublishingInterfaces.c" +#line 1636 "PublishingInterfaces.c" } @@ -1433,12 +1640,15 @@ gchar* spit_publishing_publishable_get_publishing_name (SpitPublishingPublishabl * Returns a string value from the publishable corresponding with the parameter name * provided, or null if there is no value for this name. */ -gchar* spit_publishing_publishable_get_param_string (SpitPublishingPublishable* self, const gchar* name) { +gchar* +spit_publishing_publishable_get_param_string (SpitPublishingPublishable* self, + const gchar* name) +{ #line 550 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL); #line 550 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_param_string (self, name); -#line 1442 "PublishingInterfaces.c" +#line 1652 "PublishingInterfaces.c" } @@ -1446,144 +1656,185 @@ gchar* spit_publishing_publishable_get_param_string (SpitPublishingPublishable* * Returns an array of strings that should be used to tag or mark this publishable on the * remote service, or null if this publishable has no tags or markings. */ -gchar** spit_publishing_publishable_get_publishing_keywords (SpitPublishingPublishable* self, int* result_length1) { +gchar** +spit_publishing_publishable_get_publishing_keywords (SpitPublishingPublishable* self, + int* result_length1) +{ #line 556 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL); #line 556 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_publishing_keywords (self, result_length1); -#line 1455 "PublishingInterfaces.c" +#line 1668 "PublishingInterfaces.c" } /** * Returns the kind of media item this publishable encapsulates. */ -SpitPublishingPublisherMediaType spit_publishing_publishable_get_media_type (SpitPublishingPublishable* self) { +SpitPublishingPublisherMediaType +spit_publishing_publishable_get_media_type (SpitPublishingPublishable* self) +{ #line 561 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), 0); #line 561 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_media_type (self); -#line 1467 "PublishingInterfaces.c" +#line 1682 "PublishingInterfaces.c" } /** * Returns the creation timestamp on the file. */ -GDateTime* spit_publishing_publishable_get_exposure_date_time (SpitPublishingPublishable* self) { +GDateTime* +spit_publishing_publishable_get_exposure_date_time (SpitPublishingPublishable* self) +{ #line 566 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL); #line 566 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_exposure_date_time (self); -#line 1479 "PublishingInterfaces.c" +#line 1696 "PublishingInterfaces.c" } -static void spit_publishing_publishable_real_reserved0 (SpitPublishingPublishable* self) { +static void +spit_publishing_publishable_real_reserved0 (SpitPublishingPublishable* self) +{ } -void spit_publishing_publishable_reserved0 (SpitPublishingPublishable* self) { +void +spit_publishing_publishable_reserved0 (SpitPublishingPublishable* self) +{ #line 571 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self)); #line 571 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved0 (self); -#line 1492 "PublishingInterfaces.c" +#line 1713 "PublishingInterfaces.c" } -static void spit_publishing_publishable_real_reserved1 (SpitPublishingPublishable* self) { +static void +spit_publishing_publishable_real_reserved1 (SpitPublishingPublishable* self) +{ } -void spit_publishing_publishable_reserved1 (SpitPublishingPublishable* self) { +void +spit_publishing_publishable_reserved1 (SpitPublishingPublishable* self) +{ #line 572 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self)); #line 572 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved1 (self); -#line 1505 "PublishingInterfaces.c" +#line 1730 "PublishingInterfaces.c" } -static void spit_publishing_publishable_real_reserved2 (SpitPublishingPublishable* self) { +static void +spit_publishing_publishable_real_reserved2 (SpitPublishingPublishable* self) +{ } -void spit_publishing_publishable_reserved2 (SpitPublishingPublishable* self) { +void +spit_publishing_publishable_reserved2 (SpitPublishingPublishable* self) +{ #line 573 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self)); #line 573 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved2 (self); -#line 1518 "PublishingInterfaces.c" +#line 1747 "PublishingInterfaces.c" } -static void spit_publishing_publishable_real_reserved3 (SpitPublishingPublishable* self) { +static void +spit_publishing_publishable_real_reserved3 (SpitPublishingPublishable* self) +{ } -void spit_publishing_publishable_reserved3 (SpitPublishingPublishable* self) { +void +spit_publishing_publishable_reserved3 (SpitPublishingPublishable* self) +{ #line 574 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self)); #line 574 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved3 (self); -#line 1531 "PublishingInterfaces.c" +#line 1764 "PublishingInterfaces.c" } -static void spit_publishing_publishable_real_reserved4 (SpitPublishingPublishable* self) { +static void +spit_publishing_publishable_real_reserved4 (SpitPublishingPublishable* self) +{ } -void spit_publishing_publishable_reserved4 (SpitPublishingPublishable* self) { +void +spit_publishing_publishable_reserved4 (SpitPublishingPublishable* self) +{ #line 575 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self)); #line 575 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved4 (self); -#line 1544 "PublishingInterfaces.c" +#line 1781 "PublishingInterfaces.c" } -static void spit_publishing_publishable_real_reserved5 (SpitPublishingPublishable* self) { +static void +spit_publishing_publishable_real_reserved5 (SpitPublishingPublishable* self) +{ } -void spit_publishing_publishable_reserved5 (SpitPublishingPublishable* self) { +void +spit_publishing_publishable_reserved5 (SpitPublishingPublishable* self) +{ #line 576 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self)); #line 576 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved5 (self); -#line 1557 "PublishingInterfaces.c" +#line 1798 "PublishingInterfaces.c" } -static void spit_publishing_publishable_real_reserved6 (SpitPublishingPublishable* self) { +static void +spit_publishing_publishable_real_reserved6 (SpitPublishingPublishable* self) +{ } -void spit_publishing_publishable_reserved6 (SpitPublishingPublishable* self) { +void +spit_publishing_publishable_reserved6 (SpitPublishingPublishable* self) +{ #line 577 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self)); #line 577 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved6 (self); -#line 1570 "PublishingInterfaces.c" +#line 1815 "PublishingInterfaces.c" } -static void spit_publishing_publishable_real_reserved7 (SpitPublishingPublishable* self) { +static void +spit_publishing_publishable_real_reserved7 (SpitPublishingPublishable* self) +{ } -void spit_publishing_publishable_reserved7 (SpitPublishingPublishable* self) { +void +spit_publishing_publishable_reserved7 (SpitPublishingPublishable* self) +{ #line 578 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self)); #line 578 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved7 (self); -#line 1583 "PublishingInterfaces.c" +#line 1832 "PublishingInterfaces.c" } -static void spit_publishing_publishable_base_init (SpitPublishingPublishableIface * iface) { +static void +spit_publishing_publishable_base_init (SpitPublishingPublishableIface * iface) +{ #line 521 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" static gboolean initialized = FALSE; #line 521 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" @@ -1606,7 +1857,7 @@ static void spit_publishing_publishable_base_init (SpitPublishingPublishableIfac iface->reserved6 = spit_publishing_publishable_real_reserved6; #line 521 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" iface->reserved7 = spit_publishing_publishable_real_reserved7; -#line 1610 "PublishingInterfaces.c" +#line 1861 "PublishingInterfaces.c" } } @@ -1615,7 +1866,9 @@ static void spit_publishing_publishable_base_init (SpitPublishingPublishableIfac * Describes an underlying media item (such as a photo or a video) that your plugin * uploads to a remote publishing service. */ -GType spit_publishing_publishable_get_type (void) { +GType +spit_publishing_publishable_get_type (void) +{ static volatile gsize spit_publishing_publishable_type_id__volatile = 0; if (g_once_init_enter (&spit_publishing_publishable_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitPublishingPublishableIface), (GBaseInitFunc) spit_publishing_publishable_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -1632,132 +1885,171 @@ GType spit_publishing_publishable_get_type (void) { * A factory method that instantiates and returns a new {@link Publisher} object that * encapsulates a connection to the remote publishing service that this Service describes. */ -SpitPublishingPublisher* spit_publishing_service_create_publisher (SpitPublishingService* self, SpitPublishingPluginHost* host) { +SpitPublishingPublisher* +spit_publishing_service_create_publisher (SpitPublishingService* self, + SpitPublishingPluginHost* host) +{ #line 591 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (self), NULL); #line 591 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->create_publisher (self, host); -#line 1641 "PublishingInterfaces.c" +#line 1897 "PublishingInterfaces.c" } /** * Returns the kinds of media that this service can work with. */ -SpitPublishingPublisherMediaType spit_publishing_service_get_supported_media (SpitPublishingService* self) { +SpitPublishingPublisherMediaType +spit_publishing_service_get_supported_media (SpitPublishingService* self) +{ #line 596 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (self), 0); #line 596 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->get_supported_media (self); -#line 1653 "PublishingInterfaces.c" +#line 1911 "PublishingInterfaces.c" } -static void spit_publishing_service_real_reserved0 (SpitPublishingService* self) { +static void +spit_publishing_service_real_reserved0 (SpitPublishingService* self) +{ } -void spit_publishing_service_reserved0 (SpitPublishingService* self) { +void +spit_publishing_service_reserved0 (SpitPublishingService* self) +{ #line 601 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self)); #line 601 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved0 (self); -#line 1666 "PublishingInterfaces.c" +#line 1928 "PublishingInterfaces.c" } -static void spit_publishing_service_real_reserved1 (SpitPublishingService* self) { +static void +spit_publishing_service_real_reserved1 (SpitPublishingService* self) +{ } -void spit_publishing_service_reserved1 (SpitPublishingService* self) { +void +spit_publishing_service_reserved1 (SpitPublishingService* self) +{ #line 602 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self)); #line 602 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved1 (self); -#line 1679 "PublishingInterfaces.c" +#line 1945 "PublishingInterfaces.c" } -static void spit_publishing_service_real_reserved2 (SpitPublishingService* self) { +static void +spit_publishing_service_real_reserved2 (SpitPublishingService* self) +{ } -void spit_publishing_service_reserved2 (SpitPublishingService* self) { +void +spit_publishing_service_reserved2 (SpitPublishingService* self) +{ #line 603 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self)); #line 603 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved2 (self); -#line 1692 "PublishingInterfaces.c" +#line 1962 "PublishingInterfaces.c" } -static void spit_publishing_service_real_reserved3 (SpitPublishingService* self) { +static void +spit_publishing_service_real_reserved3 (SpitPublishingService* self) +{ } -void spit_publishing_service_reserved3 (SpitPublishingService* self) { +void +spit_publishing_service_reserved3 (SpitPublishingService* self) +{ #line 604 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self)); #line 604 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved3 (self); -#line 1705 "PublishingInterfaces.c" +#line 1979 "PublishingInterfaces.c" } -static void spit_publishing_service_real_reserved4 (SpitPublishingService* self) { +static void +spit_publishing_service_real_reserved4 (SpitPublishingService* self) +{ } -void spit_publishing_service_reserved4 (SpitPublishingService* self) { +void +spit_publishing_service_reserved4 (SpitPublishingService* self) +{ #line 605 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self)); #line 605 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved4 (self); -#line 1718 "PublishingInterfaces.c" +#line 1996 "PublishingInterfaces.c" } -static void spit_publishing_service_real_reserved5 (SpitPublishingService* self) { +static void +spit_publishing_service_real_reserved5 (SpitPublishingService* self) +{ } -void spit_publishing_service_reserved5 (SpitPublishingService* self) { +void +spit_publishing_service_reserved5 (SpitPublishingService* self) +{ #line 606 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self)); #line 606 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved5 (self); -#line 1731 "PublishingInterfaces.c" +#line 2013 "PublishingInterfaces.c" } -static void spit_publishing_service_real_reserved6 (SpitPublishingService* self) { +static void +spit_publishing_service_real_reserved6 (SpitPublishingService* self) +{ } -void spit_publishing_service_reserved6 (SpitPublishingService* self) { +void +spit_publishing_service_reserved6 (SpitPublishingService* self) +{ #line 607 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self)); #line 607 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved6 (self); -#line 1744 "PublishingInterfaces.c" +#line 2030 "PublishingInterfaces.c" } -static void spit_publishing_service_real_reserved7 (SpitPublishingService* self) { +static void +spit_publishing_service_real_reserved7 (SpitPublishingService* self) +{ } -void spit_publishing_service_reserved7 (SpitPublishingService* self) { +void +spit_publishing_service_reserved7 (SpitPublishingService* self) +{ #line 608 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self)); #line 608 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved7 (self); -#line 1757 "PublishingInterfaces.c" +#line 2047 "PublishingInterfaces.c" } -static void spit_publishing_service_base_init (SpitPublishingServiceIface * iface) { +static void +spit_publishing_service_base_init (SpitPublishingServiceIface * iface) +{ #line 586 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" static gboolean initialized = FALSE; #line 586 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" @@ -1780,7 +2072,7 @@ static void spit_publishing_service_base_init (SpitPublishingServiceIface * ifac iface->reserved6 = spit_publishing_service_real_reserved6; #line 586 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" iface->reserved7 = spit_publishing_service_real_reserved7; -#line 1784 "PublishingInterfaces.c" +#line 2076 "PublishingInterfaces.c" } } @@ -1790,7 +2082,9 @@ static void spit_publishing_service_base_init (SpitPublishingServiceIface * ifac * * Developers of publishing plugins provide a class that implements this interface. */ -GType spit_publishing_service_get_type (void) { +GType +spit_publishing_service_get_type (void) +{ static volatile gsize spit_publishing_service_type_id__volatile = 0; if (g_once_init_enter (&spit_publishing_service_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitPublishingServiceIface), (GBaseInitFunc) spit_publishing_service_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -1804,52 +2098,64 @@ GType spit_publishing_service_get_type (void) { } -void spit_publishing_authenticator_authenticate (SpitPublishingAuthenticator* self) { +void +spit_publishing_authenticator_authenticate (SpitPublishingAuthenticator* self) +{ #line 615 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self)); #line 615 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->authenticate (self); -#line 1813 "PublishingInterfaces.c" +#line 2109 "PublishingInterfaces.c" } -gboolean spit_publishing_authenticator_can_logout (SpitPublishingAuthenticator* self) { +gboolean +spit_publishing_authenticator_can_logout (SpitPublishingAuthenticator* self) +{ #line 616 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self), FALSE); #line 616 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->can_logout (self); -#line 1822 "PublishingInterfaces.c" +#line 2120 "PublishingInterfaces.c" } -void spit_publishing_authenticator_logout (SpitPublishingAuthenticator* self) { +void +spit_publishing_authenticator_logout (SpitPublishingAuthenticator* self) +{ #line 617 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self)); #line 617 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->logout (self); -#line 1831 "PublishingInterfaces.c" +#line 2131 "PublishingInterfaces.c" } -void spit_publishing_authenticator_refresh (SpitPublishingAuthenticator* self) { +void +spit_publishing_authenticator_refresh (SpitPublishingAuthenticator* self) +{ #line 618 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self)); #line 618 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->refresh (self); -#line 1840 "PublishingInterfaces.c" +#line 2142 "PublishingInterfaces.c" } -GHashTable* spit_publishing_authenticator_get_authentication_parameter (SpitPublishingAuthenticator* self) { +GHashTable* +spit_publishing_authenticator_get_authentication_parameter (SpitPublishingAuthenticator* self) +{ #line 620 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self), NULL); #line 620 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->get_authentication_parameter (self); -#line 1849 "PublishingInterfaces.c" +#line 2153 "PublishingInterfaces.c" } -static void spit_publishing_authenticator_base_init (SpitPublishingAuthenticatorIface * iface) { +static void +spit_publishing_authenticator_base_init (SpitPublishingAuthenticatorIface * iface) +{ #line 611 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" static gboolean initialized = FALSE; #line 611 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" @@ -1860,12 +2166,14 @@ static void spit_publishing_authenticator_base_init (SpitPublishingAuthenticator spit_publishing_authenticator_signals[SPIT_PUBLISHING_AUTHENTICATOR_AUTHENTICATED_SIGNAL] = g_signal_new ("authenticated", SPIT_PUBLISHING_TYPE_AUTHENTICATOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 611 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" spit_publishing_authenticator_signals[SPIT_PUBLISHING_AUTHENTICATOR_AUTHENTICATION_FAILED_SIGNAL] = g_signal_new ("authentication-failed", SPIT_PUBLISHING_TYPE_AUTHENTICATOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 1864 "PublishingInterfaces.c" +#line 2170 "PublishingInterfaces.c" } } -GType spit_publishing_authenticator_get_type (void) { +GType +spit_publishing_authenticator_get_type (void) +{ static volatile gsize spit_publishing_authenticator_type_id__volatile = 0; if (g_once_init_enter (&spit_publishing_authenticator_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitPublishingAuthenticatorIface), (GBaseInitFunc) spit_publishing_authenticator_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -1878,37 +2186,47 @@ GType spit_publishing_authenticator_get_type (void) { } -GeeList* spit_publishing_authenticator_factory_get_available_authenticators (SpitPublishingAuthenticatorFactory* self) { +GeeList* +spit_publishing_authenticator_factory_get_available_authenticators (SpitPublishingAuthenticatorFactory* self) +{ #line 628 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR_FACTORY (self), NULL); #line 628 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_AUTHENTICATOR_FACTORY_GET_INTERFACE (self)->get_available_authenticators (self); -#line 1887 "PublishingInterfaces.c" +#line 2197 "PublishingInterfaces.c" } -SpitPublishingAuthenticator* spit_publishing_authenticator_factory_create (SpitPublishingAuthenticatorFactory* self, const gchar* provider, SpitPublishingPluginHost* host) { +SpitPublishingAuthenticator* +spit_publishing_authenticator_factory_create (SpitPublishingAuthenticatorFactory* self, + const gchar* provider, + SpitPublishingPluginHost* host) +{ #line 629 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR_FACTORY (self), NULL); #line 629 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_AUTHENTICATOR_FACTORY_GET_INTERFACE (self)->create (self, provider, host); -#line 1896 "PublishingInterfaces.c" +#line 2210 "PublishingInterfaces.c" } -static void spit_publishing_authenticator_factory_base_init (SpitPublishingAuthenticatorFactoryIface * iface) { +static void +spit_publishing_authenticator_factory_base_init (SpitPublishingAuthenticatorFactoryIface * iface) +{ #line 623 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" static gboolean initialized = FALSE; #line 623 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" if (!initialized) { #line 623 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" initialized = TRUE; -#line 1907 "PublishingInterfaces.c" +#line 2223 "PublishingInterfaces.c" } } -GType spit_publishing_authenticator_factory_get_type (void) { +GType +spit_publishing_authenticator_factory_get_type (void) +{ static volatile gsize spit_publishing_authenticator_factory_type_id__volatile = 0; if (g_once_init_enter (&spit_publishing_authenticator_factory_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitPublishingAuthenticatorFactoryIface), (GBaseInitFunc) spit_publishing_authenticator_factory_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; diff --git a/src/plugins/SpitInterfaces.c b/src/plugins/SpitInterfaces.c index 83c548d..d890484 100644 --- a/src/plugins/SpitInterfaces.c +++ b/src/plugins/SpitInterfaces.c @@ -1,4 +1,4 @@ -/* SpitInterfaces.c generated by valac 0.36.6, the Vala compiler +/* SpitInterfaces.c generated by valac 0.40.4, the Vala compiler * generated from SpitInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -130,16 +131,20 @@ struct _SpitHostInterfaceIface { #define SPIT_UNSUPPORTED_INTERFACE -1 #define SPIT_CURRENT_INTERFACE 0 -gint spit_negotiate_interfaces (gint min_host_interface, gint max_host_interface, gint plugin_interface); +gint spit_negotiate_interfaces (gint min_host_interface, + gint max_host_interface, + gint plugin_interface); GType spit_entry_point_params_get_type (void) G_GNUC_CONST; SpitEntryPointParams* spit_entry_point_params_dup (const SpitEntryPointParams* self); void spit_entry_point_params_free (SpitEntryPointParams* self); -void spit_entry_point_params_copy (const SpitEntryPointParams* self, SpitEntryPointParams* dest); +void spit_entry_point_params_copy (const SpitEntryPointParams* self, + SpitEntryPointParams* dest); void spit_entry_point_params_destroy (SpitEntryPointParams* self); GType spit_pluggable_info_get_type (void) G_GNUC_CONST; SpitPluggableInfo* spit_pluggable_info_dup (const SpitPluggableInfo* self); void spit_pluggable_info_free (SpitPluggableInfo* self); -void spit_pluggable_info_copy (const SpitPluggableInfo* self, SpitPluggableInfo* dest); +void spit_pluggable_info_copy (const SpitPluggableInfo* self, + SpitPluggableInfo* dest); void spit_pluggable_info_destroy (SpitPluggableInfo* self); GType spit_pluggable_get_type (void) G_GNUC_CONST; GType spit_module_get_type (void) G_GNUC_CONST; @@ -147,7 +152,8 @@ GType spit_module_get_type (void) G_GNUC_CONST; const gchar* spit_module_get_module_name (SpitModule* self); const gchar* spit_module_get_version (SpitModule* self); const gchar* spit_module_get_id (SpitModule* self); -SpitPluggable** spit_module_get_pluggables (SpitModule* self, int* result_length1); +SpitPluggable** spit_module_get_pluggables (SpitModule* self, + int* result_length1); void spit_module_reserved0 (SpitModule* self); static void spit_module_real_reserved0 (SpitModule* self); void spit_module_reserved1 (SpitModule* self); @@ -164,12 +170,17 @@ void spit_module_reserved6 (SpitModule* self); static void spit_module_real_reserved6 (SpitModule* self); void spit_module_reserved7 (SpitModule* self); static void spit_module_real_reserved7 (SpitModule* self); -static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length); -gint spit_pluggable_get_pluggable_interface (SpitPluggable* self, gint min_host_interface, gint max_host_interface); +static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, + int length); +gint spit_pluggable_get_pluggable_interface (SpitPluggable* self, + gint min_host_interface, + gint max_host_interface); const gchar* spit_pluggable_get_id (SpitPluggable* self); const gchar* spit_pluggable_get_pluggable_name (SpitPluggable* self); -void spit_pluggable_get_info (SpitPluggable* self, SpitPluggableInfo* info); -void spit_pluggable_activation (SpitPluggable* self, gboolean enabled); +void spit_pluggable_get_info (SpitPluggable* self, + SpitPluggableInfo* info); +void spit_pluggable_activation (SpitPluggable* self, + gboolean enabled); void spit_pluggable_reserved0 (SpitPluggable* self); static void spit_pluggable_real_reserved0 (SpitPluggable* self); void spit_pluggable_reserved1 (SpitPluggable* self); @@ -188,15 +199,32 @@ void spit_pluggable_reserved7 (SpitPluggable* self); static void spit_pluggable_real_reserved7 (SpitPluggable* self); GType spit_host_interface_get_type (void) G_GNUC_CONST; GFile* spit_host_interface_get_module_file (SpitHostInterface* self); -gboolean spit_host_interface_get_config_bool (SpitHostInterface* self, const gchar* key, gboolean def); -void spit_host_interface_set_config_bool (SpitHostInterface* self, const gchar* key, gboolean val); -gint spit_host_interface_get_config_int (SpitHostInterface* self, const gchar* key, gint def); -void spit_host_interface_set_config_int (SpitHostInterface* self, const gchar* key, gint val); -gchar* spit_host_interface_get_config_string (SpitHostInterface* self, const gchar* key, const gchar* def); -void spit_host_interface_set_config_string (SpitHostInterface* self, const gchar* key, const gchar* val); -gdouble spit_host_interface_get_config_double (SpitHostInterface* self, const gchar* key, gdouble def); -void spit_host_interface_set_config_double (SpitHostInterface* self, const gchar* key, gdouble val); -void spit_host_interface_unset_config_key (SpitHostInterface* self, const gchar* key); +gboolean spit_host_interface_get_config_bool (SpitHostInterface* self, + const gchar* key, + gboolean def); +void spit_host_interface_set_config_bool (SpitHostInterface* self, + const gchar* key, + gboolean val); +gint spit_host_interface_get_config_int (SpitHostInterface* self, + const gchar* key, + gint def); +void spit_host_interface_set_config_int (SpitHostInterface* self, + const gchar* key, + gint val); +gchar* spit_host_interface_get_config_string (SpitHostInterface* self, + const gchar* key, + const gchar* def); +void spit_host_interface_set_config_string (SpitHostInterface* self, + const gchar* key, + const gchar* val); +gdouble spit_host_interface_get_config_double (SpitHostInterface* self, + const gchar* key, + gdouble def); +void spit_host_interface_set_config_double (SpitHostInterface* self, + const gchar* key, + gdouble val); +void spit_host_interface_unset_config_key (SpitHostInterface* self, + const gchar* key); void spit_host_interface_reserved0 (SpitHostInterface* self); static void spit_host_interface_real_reserved0 (SpitHostInterface* self); void spit_host_interface_reserved1 (SpitHostInterface* self); @@ -213,8 +241,12 @@ void spit_host_interface_reserved6 (SpitHostInterface* self); static void spit_host_interface_real_reserved6 (SpitHostInterface* self); void spit_host_interface_reserved7 (SpitHostInterface* self); static void spit_host_interface_real_reserved7 (SpitHostInterface* self); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); /** @@ -229,61 +261,55 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify * * @return The plugin's interface version if supported, {@link UNSUPPORTED_INTERFACE} otherwise. */ -gint spit_negotiate_interfaces (gint min_host_interface, gint max_host_interface, gint plugin_interface) { +gint +spit_negotiate_interfaces (gint min_host_interface, + gint max_host_interface, + gint plugin_interface) +{ gint result = 0; gint _tmp0_ = 0; gboolean _tmp1_ = FALSE; - gint _tmp2_; - gint _tmp3_; -#line 47 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" - _tmp2_ = min_host_interface; -#line 47 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" - _tmp3_ = plugin_interface; #line 47 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" - if (_tmp2_ > _tmp3_) { + if (min_host_interface > plugin_interface) { #line 47 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" _tmp1_ = TRUE; -#line 247 "SpitInterfaces.c" +#line 277 "SpitInterfaces.c" } else { - gint _tmp4_; - gint _tmp5_; #line 47 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" - _tmp4_ = max_host_interface; -#line 47 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" - _tmp5_ = plugin_interface; -#line 47 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" - _tmp1_ = _tmp4_ < _tmp5_; -#line 257 "SpitInterfaces.c" + _tmp1_ = max_host_interface < plugin_interface; +#line 281 "SpitInterfaces.c" } #line 47 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" if (_tmp1_) { #line 48 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" _tmp0_ = SPIT_UNSUPPORTED_INTERFACE; -#line 263 "SpitInterfaces.c" +#line 287 "SpitInterfaces.c" } else { - gint _tmp6_; #line 48 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" - _tmp6_ = plugin_interface; -#line 48 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" - _tmp0_ = _tmp6_; -#line 270 "SpitInterfaces.c" + _tmp0_ = plugin_interface; +#line 291 "SpitInterfaces.c" } #line 47 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" result = _tmp0_; #line 47 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" return result; -#line 276 "SpitInterfaces.c" +#line 297 "SpitInterfaces.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 62 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" return self ? g_object_ref (self) : NULL; -#line 283 "SpitInterfaces.c" +#line 306 "SpitInterfaces.c" } -void spit_entry_point_params_copy (const SpitEntryPointParams* self, SpitEntryPointParams* dest) { +void +spit_entry_point_params_copy (const SpitEntryPointParams* self, + SpitEntryPointParams* dest) +{ gint _tmp0_; gint _tmp1_; gint _tmp2_; @@ -309,18 +335,22 @@ void spit_entry_point_params_copy (const SpitEntryPointParams* self, SpitEntryPo _g_object_unref0 ((*dest).module_file); #line 62 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" (*dest).module_file = _tmp4_; -#line 313 "SpitInterfaces.c" +#line 339 "SpitInterfaces.c" } -void spit_entry_point_params_destroy (SpitEntryPointParams* self) { +void +spit_entry_point_params_destroy (SpitEntryPointParams* self) +{ #line 79 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" _g_object_unref0 ((*self).module_file); -#line 320 "SpitInterfaces.c" +#line 348 "SpitInterfaces.c" } -SpitEntryPointParams* spit_entry_point_params_dup (const SpitEntryPointParams* self) { +SpitEntryPointParams* +spit_entry_point_params_dup (const SpitEntryPointParams* self) +{ SpitEntryPointParams* dup; #line 62 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" dup = g_new0 (SpitEntryPointParams, 1); @@ -328,20 +358,24 @@ SpitEntryPointParams* spit_entry_point_params_dup (const SpitEntryPointParams* s spit_entry_point_params_copy (self, dup); #line 62 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" return dup; -#line 332 "SpitInterfaces.c" +#line 362 "SpitInterfaces.c" } -void spit_entry_point_params_free (SpitEntryPointParams* self) { +void +spit_entry_point_params_free (SpitEntryPointParams* self) +{ #line 62 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" spit_entry_point_params_destroy (self); #line 62 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_free (self); -#line 341 "SpitInterfaces.c" +#line 373 "SpitInterfaces.c" } -GType spit_entry_point_params_get_type (void) { +GType +spit_entry_point_params_get_type (void) +{ static volatile gsize spit_entry_point_params_type_id__volatile = 0; if (g_once_init_enter (&spit_entry_point_params_type_id__volatile)) { GType spit_entry_point_params_type_id; @@ -355,12 +389,14 @@ GType spit_entry_point_params_get_type (void) { /** * Returns a user-visible string describing the module. */ -const gchar* spit_module_get_module_name (SpitModule* self) { +const gchar* +spit_module_get_module_name (SpitModule* self) +{ #line 117 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_val_if_fail (SPIT_IS_MODULE (self), NULL); #line 117 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" return SPIT_MODULE_GET_INTERFACE (self)->get_module_name (self); -#line 364 "SpitInterfaces.c" +#line 400 "SpitInterfaces.c" } @@ -370,12 +406,14 @@ const gchar* spit_module_get_module_name (SpitModule* self) { * Note that this may be programmatically interpreted at some point, so use a widespread * versioning scheme. */ -const gchar* spit_module_get_version (SpitModule* self) { +const gchar* +spit_module_get_version (SpitModule* self) +{ #line 125 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_val_if_fail (SPIT_IS_MODULE (self), NULL); #line 125 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" return SPIT_MODULE_GET_INTERFACE (self)->get_version (self); -#line 379 "SpitInterfaces.c" +#line 417 "SpitInterfaces.c" } @@ -389,12 +427,14 @@ const gchar* spit_module_get_version (SpitModule* self) { * Best practice: use a reverse-DNS-order scheme, a la Java's packages * (i.e. "org.yorba.shotwell.frotz"). */ -const gchar* spit_module_get_id (SpitModule* self) { +const gchar* +spit_module_get_id (SpitModule* self) +{ #line 137 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_val_if_fail (SPIT_IS_MODULE (self), NULL); #line 137 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" return SPIT_MODULE_GET_INTERFACE (self)->get_id (self); -#line 398 "SpitInterfaces.c" +#line 438 "SpitInterfaces.c" } @@ -403,120 +443,157 @@ const gchar* spit_module_get_id (SpitModule* self) { * * May return NULL or an empty array. */ -SpitPluggable** spit_module_get_pluggables (SpitModule* self, int* result_length1) { +SpitPluggable** +spit_module_get_pluggables (SpitModule* self, + int* result_length1) +{ #line 144 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_val_if_fail (SPIT_IS_MODULE (self), NULL); #line 144 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" return SPIT_MODULE_GET_INTERFACE (self)->get_pluggables (self, result_length1); -#line 412 "SpitInterfaces.c" +#line 455 "SpitInterfaces.c" } -static void spit_module_real_reserved0 (SpitModule* self) { +static void +spit_module_real_reserved0 (SpitModule* self) +{ } -void spit_module_reserved0 (SpitModule* self) { +void +spit_module_reserved0 (SpitModule* self) +{ #line 149 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_MODULE (self)); #line 149 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_MODULE_GET_INTERFACE (self)->reserved0 (self); -#line 425 "SpitInterfaces.c" +#line 472 "SpitInterfaces.c" } -static void spit_module_real_reserved1 (SpitModule* self) { +static void +spit_module_real_reserved1 (SpitModule* self) +{ } -void spit_module_reserved1 (SpitModule* self) { +void +spit_module_reserved1 (SpitModule* self) +{ #line 150 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_MODULE (self)); #line 150 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_MODULE_GET_INTERFACE (self)->reserved1 (self); -#line 438 "SpitInterfaces.c" +#line 489 "SpitInterfaces.c" } -static void spit_module_real_reserved2 (SpitModule* self) { +static void +spit_module_real_reserved2 (SpitModule* self) +{ } -void spit_module_reserved2 (SpitModule* self) { +void +spit_module_reserved2 (SpitModule* self) +{ #line 151 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_MODULE (self)); #line 151 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_MODULE_GET_INTERFACE (self)->reserved2 (self); -#line 451 "SpitInterfaces.c" +#line 506 "SpitInterfaces.c" } -static void spit_module_real_reserved3 (SpitModule* self) { +static void +spit_module_real_reserved3 (SpitModule* self) +{ } -void spit_module_reserved3 (SpitModule* self) { +void +spit_module_reserved3 (SpitModule* self) +{ #line 152 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_MODULE (self)); #line 152 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_MODULE_GET_INTERFACE (self)->reserved3 (self); -#line 464 "SpitInterfaces.c" +#line 523 "SpitInterfaces.c" } -static void spit_module_real_reserved4 (SpitModule* self) { +static void +spit_module_real_reserved4 (SpitModule* self) +{ } -void spit_module_reserved4 (SpitModule* self) { +void +spit_module_reserved4 (SpitModule* self) +{ #line 153 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_MODULE (self)); #line 153 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_MODULE_GET_INTERFACE (self)->reserved4 (self); -#line 477 "SpitInterfaces.c" +#line 540 "SpitInterfaces.c" } -static void spit_module_real_reserved5 (SpitModule* self) { +static void +spit_module_real_reserved5 (SpitModule* self) +{ } -void spit_module_reserved5 (SpitModule* self) { +void +spit_module_reserved5 (SpitModule* self) +{ #line 154 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_MODULE (self)); #line 154 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_MODULE_GET_INTERFACE (self)->reserved5 (self); -#line 490 "SpitInterfaces.c" +#line 557 "SpitInterfaces.c" } -static void spit_module_real_reserved6 (SpitModule* self) { +static void +spit_module_real_reserved6 (SpitModule* self) +{ } -void spit_module_reserved6 (SpitModule* self) { +void +spit_module_reserved6 (SpitModule* self) +{ #line 155 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_MODULE (self)); #line 155 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_MODULE_GET_INTERFACE (self)->reserved6 (self); -#line 503 "SpitInterfaces.c" +#line 574 "SpitInterfaces.c" } -static void spit_module_real_reserved7 (SpitModule* self) { +static void +spit_module_real_reserved7 (SpitModule* self) +{ } -void spit_module_reserved7 (SpitModule* self) { +void +spit_module_reserved7 (SpitModule* self) +{ #line 156 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_MODULE (self)); #line 156 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_MODULE_GET_INTERFACE (self)->reserved7 (self); -#line 516 "SpitInterfaces.c" +#line 591 "SpitInterfaces.c" } -static void spit_module_base_init (SpitModuleIface * iface) { +static void +spit_module_base_init (SpitModuleIface * iface) +{ #line 113 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" static gboolean initialized = FALSE; #line 113 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" @@ -539,7 +616,7 @@ static void spit_module_base_init (SpitModuleIface * iface) { iface->reserved6 = spit_module_real_reserved6; #line 113 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" iface->reserved7 = spit_module_real_reserved7; -#line 543 "SpitInterfaces.c" +#line 620 "SpitInterfaces.c" } } @@ -555,7 +632,9 @@ static void spit_module_base_init (SpitModuleIface * iface) { * should be only one in the library file. The module should implement a g_module_unload method * and drop the reference there. */ -GType spit_module_get_type (void) { +GType +spit_module_get_type (void) +{ static volatile gsize spit_module_type_id__volatile = 0; if (g_once_init_enter (&spit_module_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitModuleIface), (GBaseInitFunc) spit_module_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -568,28 +647,34 @@ GType spit_module_get_type (void) { } -static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) { +static GdkPixbuf** +_vala_array_dup1 (GdkPixbuf** self, + int length) +{ GdkPixbuf** result; int i; #line 162 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" result = g_new0 (GdkPixbuf*, length + 1); #line 162 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" for (i = 0; i < length; i++) { -#line 579 "SpitInterfaces.c" +#line 661 "SpitInterfaces.c" GdkPixbuf* _tmp0_; #line 162 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 162 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" result[i] = _tmp0_; -#line 585 "SpitInterfaces.c" +#line 667 "SpitInterfaces.c" } #line 162 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" return result; -#line 589 "SpitInterfaces.c" +#line 671 "SpitInterfaces.c" } -void spit_pluggable_info_copy (const SpitPluggableInfo* self, SpitPluggableInfo* dest) { +void +spit_pluggable_info_copy (const SpitPluggableInfo* self, + SpitPluggableInfo* dest) +{ const gchar* _tmp0_; gchar* _tmp1_; const gchar* _tmp2_; @@ -693,11 +778,13 @@ void spit_pluggable_info_copy (const SpitPluggableInfo* self, SpitPluggableInfo* (*dest).icons = _tmp18_; #line 162 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" (*dest).icons_length1 = _tmp18__length1; -#line 697 "SpitInterfaces.c" +#line 782 "SpitInterfaces.c" } -void spit_pluggable_info_destroy (SpitPluggableInfo* self) { +void +spit_pluggable_info_destroy (SpitPluggableInfo* self) +{ #line 163 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" _g_free0 ((*self).version); #line 164 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" @@ -716,11 +803,13 @@ void spit_pluggable_info_destroy (SpitPluggableInfo* self) { _g_free0 ((*self).translators); #line 179 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" (*self).icons = (_vala_array_free ((*self).icons, (*self).icons_length1, (GDestroyNotify) g_object_unref), NULL); -#line 720 "SpitInterfaces.c" +#line 807 "SpitInterfaces.c" } -SpitPluggableInfo* spit_pluggable_info_dup (const SpitPluggableInfo* self) { +SpitPluggableInfo* +spit_pluggable_info_dup (const SpitPluggableInfo* self) +{ SpitPluggableInfo* dup; #line 162 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" dup = g_new0 (SpitPluggableInfo, 1); @@ -728,20 +817,24 @@ SpitPluggableInfo* spit_pluggable_info_dup (const SpitPluggableInfo* self) { spit_pluggable_info_copy (self, dup); #line 162 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" return dup; -#line 732 "SpitInterfaces.c" +#line 821 "SpitInterfaces.c" } -void spit_pluggable_info_free (SpitPluggableInfo* self) { +void +spit_pluggable_info_free (SpitPluggableInfo* self) +{ #line 162 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" spit_pluggable_info_destroy (self); #line 162 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_free (self); -#line 741 "SpitInterfaces.c" +#line 832 "SpitInterfaces.c" } -GType spit_pluggable_info_get_type (void) { +GType +spit_pluggable_info_get_type (void) +{ static volatile gsize spit_pluggable_info_type_id__volatile = 0; if (g_once_init_enter (&spit_pluggable_info_type_id__volatile)) { GType spit_pluggable_info_type_id; @@ -773,12 +866,16 @@ GType spit_pluggable_info_get_type (void) { * @return The version number supported by the host and the Pluggable or * {@link UNSUPPORTED_INTERFACE}. */ -gint spit_pluggable_get_pluggable_interface (SpitPluggable* self, gint min_host_interface, gint max_host_interface) { +gint +spit_pluggable_get_pluggable_interface (SpitPluggable* self, + gint min_host_interface, + gint max_host_interface) +{ #line 210 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_val_if_fail (SPIT_IS_PLUGGABLE (self), 0); #line 210 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" return SPIT_PLUGGABLE_GET_INTERFACE (self)->get_pluggable_interface (self, min_host_interface, max_host_interface); -#line 782 "SpitInterfaces.c" +#line 879 "SpitInterfaces.c" } @@ -788,36 +885,43 @@ gint spit_pluggable_get_pluggable_interface (SpitPluggable* self, gint min_host_ * Like {@link Module.get_id}, best practice is to use a reverse-DNS-order scheme to avoid * conflicts. */ -const gchar* spit_pluggable_get_id (SpitPluggable* self) { +const gchar* +spit_pluggable_get_id (SpitPluggable* self) +{ #line 218 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_val_if_fail (SPIT_IS_PLUGGABLE (self), NULL); #line 218 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" return SPIT_PLUGGABLE_GET_INTERFACE (self)->get_id (self); -#line 797 "SpitInterfaces.c" +#line 896 "SpitInterfaces.c" } /** * Returns a user-visible name for the Pluggable. */ -const gchar* spit_pluggable_get_pluggable_name (SpitPluggable* self) { +const gchar* +spit_pluggable_get_pluggable_name (SpitPluggable* self) +{ #line 223 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_val_if_fail (SPIT_IS_PLUGGABLE (self), NULL); #line 223 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" return SPIT_PLUGGABLE_GET_INTERFACE (self)->get_pluggable_name (self); -#line 809 "SpitInterfaces.c" +#line 910 "SpitInterfaces.c" } /** * Returns extra information about the Pluggable that is used to identify it to the user. */ -void spit_pluggable_get_info (SpitPluggable* self, SpitPluggableInfo* info) { +void +spit_pluggable_get_info (SpitPluggable* self, + SpitPluggableInfo* info) +{ #line 228 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_PLUGGABLE (self)); #line 228 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_PLUGGABLE_GET_INTERFACE (self)->get_info (self, info); -#line 821 "SpitInterfaces.c" +#line 925 "SpitInterfaces.c" } @@ -834,120 +938,157 @@ void spit_pluggable_get_info (SpitPluggable* self, SpitPluggableInfo* info) { * * @param enabled ``true`` if the Pluggable has been enabled, ``false`` otherwise. */ -void spit_pluggable_activation (SpitPluggable* self, gboolean enabled) { +void +spit_pluggable_activation (SpitPluggable* self, + gboolean enabled) +{ #line 243 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_PLUGGABLE (self)); #line 243 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_PLUGGABLE_GET_INTERFACE (self)->activation (self, enabled); -#line 843 "SpitInterfaces.c" +#line 950 "SpitInterfaces.c" } -static void spit_pluggable_real_reserved0 (SpitPluggable* self) { +static void +spit_pluggable_real_reserved0 (SpitPluggable* self) +{ } -void spit_pluggable_reserved0 (SpitPluggable* self) { +void +spit_pluggable_reserved0 (SpitPluggable* self) +{ #line 248 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_PLUGGABLE (self)); #line 248 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_PLUGGABLE_GET_INTERFACE (self)->reserved0 (self); -#line 856 "SpitInterfaces.c" +#line 967 "SpitInterfaces.c" } -static void spit_pluggable_real_reserved1 (SpitPluggable* self) { +static void +spit_pluggable_real_reserved1 (SpitPluggable* self) +{ } -void spit_pluggable_reserved1 (SpitPluggable* self) { +void +spit_pluggable_reserved1 (SpitPluggable* self) +{ #line 249 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_PLUGGABLE (self)); #line 249 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_PLUGGABLE_GET_INTERFACE (self)->reserved1 (self); -#line 869 "SpitInterfaces.c" +#line 984 "SpitInterfaces.c" } -static void spit_pluggable_real_reserved2 (SpitPluggable* self) { +static void +spit_pluggable_real_reserved2 (SpitPluggable* self) +{ } -void spit_pluggable_reserved2 (SpitPluggable* self) { +void +spit_pluggable_reserved2 (SpitPluggable* self) +{ #line 250 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_PLUGGABLE (self)); #line 250 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_PLUGGABLE_GET_INTERFACE (self)->reserved2 (self); -#line 882 "SpitInterfaces.c" +#line 1001 "SpitInterfaces.c" } -static void spit_pluggable_real_reserved3 (SpitPluggable* self) { +static void +spit_pluggable_real_reserved3 (SpitPluggable* self) +{ } -void spit_pluggable_reserved3 (SpitPluggable* self) { +void +spit_pluggable_reserved3 (SpitPluggable* self) +{ #line 251 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_PLUGGABLE (self)); #line 251 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_PLUGGABLE_GET_INTERFACE (self)->reserved3 (self); -#line 895 "SpitInterfaces.c" +#line 1018 "SpitInterfaces.c" } -static void spit_pluggable_real_reserved4 (SpitPluggable* self) { +static void +spit_pluggable_real_reserved4 (SpitPluggable* self) +{ } -void spit_pluggable_reserved4 (SpitPluggable* self) { +void +spit_pluggable_reserved4 (SpitPluggable* self) +{ #line 252 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_PLUGGABLE (self)); #line 252 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_PLUGGABLE_GET_INTERFACE (self)->reserved4 (self); -#line 908 "SpitInterfaces.c" +#line 1035 "SpitInterfaces.c" } -static void spit_pluggable_real_reserved5 (SpitPluggable* self) { +static void +spit_pluggable_real_reserved5 (SpitPluggable* self) +{ } -void spit_pluggable_reserved5 (SpitPluggable* self) { +void +spit_pluggable_reserved5 (SpitPluggable* self) +{ #line 253 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_PLUGGABLE (self)); #line 253 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_PLUGGABLE_GET_INTERFACE (self)->reserved5 (self); -#line 921 "SpitInterfaces.c" +#line 1052 "SpitInterfaces.c" } -static void spit_pluggable_real_reserved6 (SpitPluggable* self) { +static void +spit_pluggable_real_reserved6 (SpitPluggable* self) +{ } -void spit_pluggable_reserved6 (SpitPluggable* self) { +void +spit_pluggable_reserved6 (SpitPluggable* self) +{ #line 254 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_PLUGGABLE (self)); #line 254 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_PLUGGABLE_GET_INTERFACE (self)->reserved6 (self); -#line 934 "SpitInterfaces.c" +#line 1069 "SpitInterfaces.c" } -static void spit_pluggable_real_reserved7 (SpitPluggable* self) { +static void +spit_pluggable_real_reserved7 (SpitPluggable* self) +{ } -void spit_pluggable_reserved7 (SpitPluggable* self) { +void +spit_pluggable_reserved7 (SpitPluggable* self) +{ #line 255 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_PLUGGABLE (self)); #line 255 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_PLUGGABLE_GET_INTERFACE (self)->reserved7 (self); -#line 947 "SpitInterfaces.c" +#line 1086 "SpitInterfaces.c" } -static void spit_pluggable_base_init (SpitPluggableIface * iface) { +static void +spit_pluggable_base_init (SpitPluggableIface * iface) +{ #line 188 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" static gboolean initialized = FALSE; #line 188 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" @@ -970,7 +1111,7 @@ static void spit_pluggable_base_init (SpitPluggableIface * iface) { iface->reserved6 = spit_pluggable_real_reserved6; #line 188 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" iface->reserved7 = spit_pluggable_real_reserved7; -#line 974 "SpitInterfaces.c" +#line 1115 "SpitInterfaces.c" } } @@ -981,7 +1122,9 @@ static void spit_pluggable_base_init (SpitPluggableIface * iface) { * Each plugin in a module needs to implement this interface at a minimum. Extension * points may have (and probably will have) specific interface requirements as well. */ -GType spit_pluggable_get_type (void) { +GType +spit_pluggable_get_type (void) +{ static volatile gsize spit_pluggable_type_id__volatile = 0; if (g_once_init_enter (&spit_pluggable_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitPluggableIface), (GBaseInitFunc) spit_pluggable_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -998,12 +1141,14 @@ GType spit_pluggable_get_type (void) { * Returns a File object representing the library file (.so/la.) that the plugin was loaded * from. */ -GFile* spit_host_interface_get_module_file (SpitHostInterface* self) { +GFile* +spit_host_interface_get_module_file (SpitHostInterface* self) +{ #line 274 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_val_if_fail (SPIT_IS_HOST_INTERFACE (self), NULL); #line 274 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" return SPIT_HOST_INTERFACE_GET_INTERFACE (self)->get_module_file (self); -#line 1007 "SpitInterfaces.c" +#line 1152 "SpitInterfaces.c" } @@ -1015,12 +1160,16 @@ GFile* spit_host_interface_get_module_file (SpitHostInterface* self) { * * @return The value associated with key, def if not set. */ -gboolean spit_host_interface_get_config_bool (SpitHostInterface* self, const gchar* key, gboolean def) { +gboolean +spit_host_interface_get_config_bool (SpitHostInterface* self, + const gchar* key, + gboolean def) +{ #line 284 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_val_if_fail (SPIT_IS_HOST_INTERFACE (self), FALSE); #line 284 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" return SPIT_HOST_INTERFACE_GET_INTERFACE (self)->get_config_bool (self, key, def); -#line 1024 "SpitInterfaces.c" +#line 1173 "SpitInterfaces.c" } @@ -1030,12 +1179,16 @@ gboolean spit_host_interface_get_config_bool (SpitHostInterface* self, const gch * @param key The name of the value to be stored. * @param val The value to be stored. */ -void spit_host_interface_set_config_bool (SpitHostInterface* self, const gchar* key, gboolean val) { +void +spit_host_interface_set_config_bool (SpitHostInterface* self, + const gchar* key, + gboolean val) +{ #line 292 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_HOST_INTERFACE (self)); #line 292 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_HOST_INTERFACE_GET_INTERFACE (self)->set_config_bool (self, key, val); -#line 1039 "SpitInterfaces.c" +#line 1192 "SpitInterfaces.c" } @@ -1047,12 +1200,16 @@ void spit_host_interface_set_config_bool (SpitHostInterface* self, const gchar* * * @return The value associated with key, def if not set. */ -gint spit_host_interface_get_config_int (SpitHostInterface* self, const gchar* key, gint def) { +gint +spit_host_interface_get_config_int (SpitHostInterface* self, + const gchar* key, + gint def) +{ #line 302 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_val_if_fail (SPIT_IS_HOST_INTERFACE (self), 0); #line 302 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" return SPIT_HOST_INTERFACE_GET_INTERFACE (self)->get_config_int (self, key, def); -#line 1056 "SpitInterfaces.c" +#line 1213 "SpitInterfaces.c" } @@ -1062,12 +1219,16 @@ gint spit_host_interface_get_config_int (SpitHostInterface* self, const gchar* k * @param key The name of the value to be stored. * @param val The value to be stored. */ -void spit_host_interface_set_config_int (SpitHostInterface* self, const gchar* key, gint val) { +void +spit_host_interface_set_config_int (SpitHostInterface* self, + const gchar* key, + gint val) +{ #line 310 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_HOST_INTERFACE (self)); #line 310 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_HOST_INTERFACE_GET_INTERFACE (self)->set_config_int (self, key, val); -#line 1071 "SpitInterfaces.c" +#line 1232 "SpitInterfaces.c" } @@ -1079,12 +1240,16 @@ void spit_host_interface_set_config_int (SpitHostInterface* self, const gchar* k * * @return The value associated with key, def if not set. */ -gchar* spit_host_interface_get_config_string (SpitHostInterface* self, const gchar* key, const gchar* def) { +gchar* +spit_host_interface_get_config_string (SpitHostInterface* self, + const gchar* key, + const gchar* def) +{ #line 320 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_val_if_fail (SPIT_IS_HOST_INTERFACE (self), NULL); #line 320 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" return SPIT_HOST_INTERFACE_GET_INTERFACE (self)->get_config_string (self, key, def); -#line 1088 "SpitInterfaces.c" +#line 1253 "SpitInterfaces.c" } @@ -1094,12 +1259,16 @@ gchar* spit_host_interface_get_config_string (SpitHostInterface* self, const gch * @param key The name of the value to be stored. * @param val The value to be stored. */ -void spit_host_interface_set_config_string (SpitHostInterface* self, const gchar* key, const gchar* val) { +void +spit_host_interface_set_config_string (SpitHostInterface* self, + const gchar* key, + const gchar* val) +{ #line 328 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_HOST_INTERFACE (self)); #line 328 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_HOST_INTERFACE_GET_INTERFACE (self)->set_config_string (self, key, val); -#line 1103 "SpitInterfaces.c" +#line 1272 "SpitInterfaces.c" } @@ -1111,12 +1280,16 @@ void spit_host_interface_set_config_string (SpitHostInterface* self, const gchar * * @return The value associated with key, def if not set. */ -gdouble spit_host_interface_get_config_double (SpitHostInterface* self, const gchar* key, gdouble def) { +gdouble +spit_host_interface_get_config_double (SpitHostInterface* self, + const gchar* key, + gdouble def) +{ #line 338 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_val_if_fail (SPIT_IS_HOST_INTERFACE (self), 0.0); #line 338 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" return SPIT_HOST_INTERFACE_GET_INTERFACE (self)->get_config_double (self, key, def); -#line 1120 "SpitInterfaces.c" +#line 1293 "SpitInterfaces.c" } @@ -1126,132 +1299,173 @@ gdouble spit_host_interface_get_config_double (SpitHostInterface* self, const gc * @param key The name of the value to be stored. * @param val The value to be stored. */ -void spit_host_interface_set_config_double (SpitHostInterface* self, const gchar* key, gdouble val) { +void +spit_host_interface_set_config_double (SpitHostInterface* self, + const gchar* key, + gdouble val) +{ #line 346 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_HOST_INTERFACE (self)); #line 346 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_HOST_INTERFACE_GET_INTERFACE (self)->set_config_double (self, key, val); -#line 1135 "SpitInterfaces.c" +#line 1312 "SpitInterfaces.c" } /** * Delete the value from the persistent configuration store. */ -void spit_host_interface_unset_config_key (SpitHostInterface* self, const gchar* key) { +void +spit_host_interface_unset_config_key (SpitHostInterface* self, + const gchar* key) +{ #line 351 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_HOST_INTERFACE (self)); #line 351 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_HOST_INTERFACE_GET_INTERFACE (self)->unset_config_key (self, key); -#line 1147 "SpitInterfaces.c" +#line 1327 "SpitInterfaces.c" } -static void spit_host_interface_real_reserved0 (SpitHostInterface* self) { +static void +spit_host_interface_real_reserved0 (SpitHostInterface* self) +{ } -void spit_host_interface_reserved0 (SpitHostInterface* self) { +void +spit_host_interface_reserved0 (SpitHostInterface* self) +{ #line 356 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_HOST_INTERFACE (self)); #line 356 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_HOST_INTERFACE_GET_INTERFACE (self)->reserved0 (self); -#line 1160 "SpitInterfaces.c" +#line 1344 "SpitInterfaces.c" } -static void spit_host_interface_real_reserved1 (SpitHostInterface* self) { +static void +spit_host_interface_real_reserved1 (SpitHostInterface* self) +{ } -void spit_host_interface_reserved1 (SpitHostInterface* self) { +void +spit_host_interface_reserved1 (SpitHostInterface* self) +{ #line 357 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_HOST_INTERFACE (self)); #line 357 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_HOST_INTERFACE_GET_INTERFACE (self)->reserved1 (self); -#line 1173 "SpitInterfaces.c" +#line 1361 "SpitInterfaces.c" } -static void spit_host_interface_real_reserved2 (SpitHostInterface* self) { +static void +spit_host_interface_real_reserved2 (SpitHostInterface* self) +{ } -void spit_host_interface_reserved2 (SpitHostInterface* self) { +void +spit_host_interface_reserved2 (SpitHostInterface* self) +{ #line 358 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_HOST_INTERFACE (self)); #line 358 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_HOST_INTERFACE_GET_INTERFACE (self)->reserved2 (self); -#line 1186 "SpitInterfaces.c" +#line 1378 "SpitInterfaces.c" } -static void spit_host_interface_real_reserved3 (SpitHostInterface* self) { +static void +spit_host_interface_real_reserved3 (SpitHostInterface* self) +{ } -void spit_host_interface_reserved3 (SpitHostInterface* self) { +void +spit_host_interface_reserved3 (SpitHostInterface* self) +{ #line 359 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_HOST_INTERFACE (self)); #line 359 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_HOST_INTERFACE_GET_INTERFACE (self)->reserved3 (self); -#line 1199 "SpitInterfaces.c" +#line 1395 "SpitInterfaces.c" } -static void spit_host_interface_real_reserved4 (SpitHostInterface* self) { +static void +spit_host_interface_real_reserved4 (SpitHostInterface* self) +{ } -void spit_host_interface_reserved4 (SpitHostInterface* self) { +void +spit_host_interface_reserved4 (SpitHostInterface* self) +{ #line 360 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_HOST_INTERFACE (self)); #line 360 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_HOST_INTERFACE_GET_INTERFACE (self)->reserved4 (self); -#line 1212 "SpitInterfaces.c" +#line 1412 "SpitInterfaces.c" } -static void spit_host_interface_real_reserved5 (SpitHostInterface* self) { +static void +spit_host_interface_real_reserved5 (SpitHostInterface* self) +{ } -void spit_host_interface_reserved5 (SpitHostInterface* self) { +void +spit_host_interface_reserved5 (SpitHostInterface* self) +{ #line 361 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_HOST_INTERFACE (self)); #line 361 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_HOST_INTERFACE_GET_INTERFACE (self)->reserved5 (self); -#line 1225 "SpitInterfaces.c" +#line 1429 "SpitInterfaces.c" } -static void spit_host_interface_real_reserved6 (SpitHostInterface* self) { +static void +spit_host_interface_real_reserved6 (SpitHostInterface* self) +{ } -void spit_host_interface_reserved6 (SpitHostInterface* self) { +void +spit_host_interface_reserved6 (SpitHostInterface* self) +{ #line 362 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_HOST_INTERFACE (self)); #line 362 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_HOST_INTERFACE_GET_INTERFACE (self)->reserved6 (self); -#line 1238 "SpitInterfaces.c" +#line 1446 "SpitInterfaces.c" } -static void spit_host_interface_real_reserved7 (SpitHostInterface* self) { +static void +spit_host_interface_real_reserved7 (SpitHostInterface* self) +{ } -void spit_host_interface_reserved7 (SpitHostInterface* self) { +void +spit_host_interface_reserved7 (SpitHostInterface* self) +{ #line 363 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" g_return_if_fail (SPIT_IS_HOST_INTERFACE (self)); #line 363 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" SPIT_HOST_INTERFACE_GET_INTERFACE (self)->reserved7 (self); -#line 1251 "SpitInterfaces.c" +#line 1463 "SpitInterfaces.c" } -static void spit_host_interface_base_init (SpitHostInterfaceIface * iface) { +static void +spit_host_interface_base_init (SpitHostInterfaceIface * iface) +{ #line 269 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" static gboolean initialized = FALSE; #line 269 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" @@ -1274,7 +1488,7 @@ static void spit_host_interface_base_init (SpitHostInterfaceIface * iface) { iface->reserved6 = spit_host_interface_real_reserved6; #line 269 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" iface->reserved7 = spit_host_interface_real_reserved7; -#line 1278 "SpitInterfaces.c" +#line 1492 "SpitInterfaces.c" } } @@ -1290,7 +1504,9 @@ static void spit_host_interface_base_init (SpitHostInterfaceIface * iface) { * also allows the extension point to extend HostInterface to offer other services applicable to the * type of plugin. */ -GType spit_host_interface_get_type (void) { +GType +spit_host_interface_get_type (void) +{ static volatile gsize spit_host_interface_type_id__volatile = 0; if (g_once_init_enter (&spit_host_interface_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitHostInterfaceIface), (GBaseInitFunc) spit_host_interface_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -1303,7 +1519,11 @@ GType spit_host_interface_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -1315,7 +1535,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/plugins/StandardHostInterface.c b/src/plugins/StandardHostInterface.c index c1b8599..4dfc7ed 100644 --- a/src/plugins/StandardHostInterface.c +++ b/src/plugins/StandardHostInterface.c @@ -1,4 +1,4 @@ -/* StandardHostInterface.c generated by valac 0.36.6, the Vala compiler +/* StandardHostInterface.c generated by valac 0.40.4, the Vala compiler * generated from StandardHostInterface.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include "shotwell-plugin-dev-1.0.h" @@ -27,6 +28,11 @@ typedef struct _PluginsStandardHostInterface PluginsStandardHostInterface; typedef struct _PluginsStandardHostInterfaceClass PluginsStandardHostInterfaceClass; typedef struct _PluginsStandardHostInterfacePrivate PluginsStandardHostInterfacePrivate; +enum { + PLUGINS_STANDARD_HOST_INTERFACE_0_PROPERTY, + PLUGINS_STANDARD_HOST_INTERFACE_NUM_PROPERTIES +}; +static GParamSpec* plugins_standard_host_interface_properties[PLUGINS_STANDARD_HOST_INTERFACE_NUM_PROPERTIES]; #define _g_free0(var) (var = (g_free (var), NULL)) #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) @@ -72,48 +78,100 @@ static SpitHostInterfaceIface * plugins_standard_host_interface_spit_host_interf GType plugins_standard_host_interface_get_type (void) G_GNUC_CONST; #define PLUGINS_STANDARD_HOST_INTERFACE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterfacePrivate)) -enum { - PLUGINS_STANDARD_HOST_INTERFACE_DUMMY_PROPERTY -}; -PluginsStandardHostInterface* plugins_standard_host_interface_new (SpitPluggable* pluggable, const gchar* config_domain); -PluginsStandardHostInterface* plugins_standard_host_interface_construct (GType object_type, SpitPluggable* pluggable, const gchar* config_domain); +PluginsStandardHostInterface* plugins_standard_host_interface_new (SpitPluggable* pluggable, + const gchar* config_domain); +PluginsStandardHostInterface* plugins_standard_host_interface_construct (GType object_type, + SpitPluggable* pluggable, + const gchar* config_domain); static gchar* plugins_standard_host_interface_parse_key (const gchar* id); GFile* plugins_get_pluggable_module_file (SpitPluggable* pluggable); static GFile* plugins_standard_host_interface_real_get_module_file (SpitHostInterface* base); -static gboolean plugins_standard_host_interface_real_get_config_bool (SpitHostInterface* base, const gchar* key, gboolean def); +static gboolean plugins_standard_host_interface_real_get_config_bool (SpitHostInterface* base, + const gchar* key, + gboolean def); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); -gboolean configuration_facade_get_plugin_bool (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gboolean def); -static void plugins_standard_host_interface_real_set_config_bool (SpitHostInterface* base, const gchar* key, gboolean val); -void configuration_facade_set_plugin_bool (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gboolean val); -static gint plugins_standard_host_interface_real_get_config_int (SpitHostInterface* base, const gchar* key, gint def); -gint configuration_facade_get_plugin_int (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gint def); -static void plugins_standard_host_interface_real_set_config_int (SpitHostInterface* base, const gchar* key, gint val); -void configuration_facade_set_plugin_int (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gint val); -static gchar* plugins_standard_host_interface_real_get_config_string (SpitHostInterface* base, const gchar* key, const gchar* def); -gchar* configuration_facade_get_plugin_string (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* def); -static void plugins_standard_host_interface_real_set_config_string (SpitHostInterface* base, const gchar* key, const gchar* val); -void configuration_facade_set_plugin_string (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* val); -static gdouble plugins_standard_host_interface_real_get_config_double (SpitHostInterface* base, const gchar* key, gdouble def); -gdouble configuration_facade_get_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble def); -static void plugins_standard_host_interface_real_set_config_double (SpitHostInterface* base, const gchar* key, gdouble val); -void configuration_facade_set_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble val); -static void plugins_standard_host_interface_real_unset_config_key (SpitHostInterface* base, const gchar* key); -void configuration_facade_unset_plugin_key (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key); +gboolean configuration_facade_get_plugin_bool (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gboolean def); +static void plugins_standard_host_interface_real_set_config_bool (SpitHostInterface* base, + const gchar* key, + gboolean val); +void configuration_facade_set_plugin_bool (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gboolean val); +static gint plugins_standard_host_interface_real_get_config_int (SpitHostInterface* base, + const gchar* key, + gint def); +gint configuration_facade_get_plugin_int (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gint def); +static void plugins_standard_host_interface_real_set_config_int (SpitHostInterface* base, + const gchar* key, + gint val); +void configuration_facade_set_plugin_int (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gint val); +static gchar* plugins_standard_host_interface_real_get_config_string (SpitHostInterface* base, + const gchar* key, + const gchar* def); +gchar* configuration_facade_get_plugin_string (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + const gchar* def); +static void plugins_standard_host_interface_real_set_config_string (SpitHostInterface* base, + const gchar* key, + const gchar* val); +void configuration_facade_set_plugin_string (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + const gchar* val); +static gdouble plugins_standard_host_interface_real_get_config_double (SpitHostInterface* base, + const gchar* key, + gdouble def); +gdouble configuration_facade_get_plugin_double (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gdouble def); +static void plugins_standard_host_interface_real_set_config_double (SpitHostInterface* base, + const gchar* key, + gdouble val); +void configuration_facade_set_plugin_double (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key, + gdouble val); +static void plugins_standard_host_interface_real_unset_config_key (SpitHostInterface* base, + const gchar* key); +void configuration_facade_unset_plugin_key (ConfigurationFacade* self, + const gchar* domain, + const gchar* id, + const gchar* key); static void plugins_standard_host_interface_finalize (GObject * obj); -PluginsStandardHostInterface* plugins_standard_host_interface_construct (GType object_type, SpitPluggable* pluggable, const gchar* config_domain) { +PluginsStandardHostInterface* +plugins_standard_host_interface_construct (GType object_type, + SpitPluggable* pluggable, + const gchar* config_domain) +{ PluginsStandardHostInterface * self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - SpitPluggable* _tmp2_; - const gchar* _tmp3_; - gchar* _tmp4_; - SpitPluggable* _tmp5_; - GFile* _tmp6_; - SpitPluggable* _tmp7_; + gchar* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + GFile* _tmp3_; #line 15 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" g_return_val_if_fail (SPIT_IS_PLUGGABLE (pluggable), NULL); #line 15 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -121,165 +179,160 @@ PluginsStandardHostInterface* plugins_standard_host_interface_construct (GType o #line 15 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = (PluginsStandardHostInterface*) g_object_new (object_type, NULL); #line 16 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp0_ = config_domain; -#line 16 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (config_domain); #line 16 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _g_free0 (self->priv->config_domain); #line 16 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - self->priv->config_domain = _tmp1_; -#line 17 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp2_ = pluggable; + self->priv->config_domain = _tmp0_; #line 17 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp3_ = spit_pluggable_get_id (_tmp2_); + _tmp1_ = spit_pluggable_get_id (pluggable); #line 17 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp4_ = plugins_standard_host_interface_parse_key (_tmp3_); + _tmp2_ = plugins_standard_host_interface_parse_key (_tmp1_); #line 17 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _g_free0 (self->priv->config_id); #line 17 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - self->priv->config_id = _tmp4_; + self->priv->config_id = _tmp2_; #line 18 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp5_ = pluggable; -#line 18 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp6_ = plugins_get_pluggable_module_file (_tmp5_); + _tmp3_ = plugins_get_pluggable_module_file (pluggable); #line 18 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _g_object_unref0 (self->priv->module_file); #line 18 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - self->priv->module_file = _tmp6_; -#line 19 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp7_ = pluggable; + self->priv->module_file = _tmp3_; #line 19 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - spit_pluggable_get_info (_tmp7_, &self->priv->info); + spit_pluggable_get_info (pluggable, &self->priv->info); #line 15 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" return self; -#line 156 "StandardHostInterface.c" +#line 206 "StandardHostInterface.c" } -PluginsStandardHostInterface* plugins_standard_host_interface_new (SpitPluggable* pluggable, const gchar* config_domain) { +PluginsStandardHostInterface* +plugins_standard_host_interface_new (SpitPluggable* pluggable, + const gchar* config_domain) +{ #line 15 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" return plugins_standard_host_interface_construct (PLUGINS_TYPE_STANDARD_HOST_INTERFACE, pluggable, config_domain); -#line 163 "StandardHostInterface.c" +#line 216 "StandardHostInterface.c" } -static gchar* plugins_standard_host_interface_parse_key (const gchar* id) { +static gchar* +plugins_standard_host_interface_parse_key (const gchar* id) +{ gchar* result = NULL; const gchar* _tmp0_; - const gchar* _tmp1_; - GQuark _tmp3_ = 0U; + GQuark _tmp2_ = 0U; #line 25 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - static GQuark _tmp2_label0 = 0; + static GQuark _tmp1_label0 = 0; #line 25 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - static GQuark _tmp2_label1 = 0; + static GQuark _tmp1_label1 = 0; #line 25 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - static GQuark _tmp2_label2 = 0; + static GQuark _tmp1_label2 = 0; #line 25 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - static GQuark _tmp2_label3 = 0; + static GQuark _tmp1_label3 = 0; #line 22 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" g_return_val_if_fail (id != NULL, NULL); #line 25 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _tmp0_ = id; #line 25 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp1_ = _tmp0_; -#line 25 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_); + _tmp2_ = (NULL == _tmp0_) ? 0 : g_quark_from_string (_tmp0_); #line 25 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("org.yorba.shotwell.publishing.facebook")))) { + if (_tmp2_ == ((0 != _tmp1_label0) ? _tmp1_label0 : (_tmp1_label0 = g_quark_from_static_string ("org.yorba.shotwell.publishing.facebook")))) { #line 25 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" switch (0) { -#line 192 "StandardHostInterface.c" +#line 244 "StandardHostInterface.c" default: { - gchar* _tmp4_; + gchar* _tmp3_; #line 27 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp4_ = g_strdup ("facebook"); + _tmp3_ = g_strdup ("facebook"); #line 27 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - result = _tmp4_; + result = _tmp3_; #line 27 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" return result; -#line 202 "StandardHostInterface.c" +#line 254 "StandardHostInterface.c" } } - } else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("org.yorba.shotwell.publishing.picasa")))) { + } else if (_tmp2_ == ((0 != _tmp1_label1) ? _tmp1_label1 : (_tmp1_label1 = g_quark_from_static_string ("org.yorba.shotwell.publishing.picasa")))) { #line 25 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" switch (0) { -#line 208 "StandardHostInterface.c" +#line 260 "StandardHostInterface.c" default: { - gchar* _tmp5_; + gchar* _tmp4_; #line 30 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp5_ = g_strdup ("picasa"); + _tmp4_ = g_strdup ("picasa"); #line 30 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - result = _tmp5_; + result = _tmp4_; #line 30 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" return result; -#line 218 "StandardHostInterface.c" +#line 270 "StandardHostInterface.c" } } - } else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("org.yorba.shotwell.publishing.flickr")))) { + } else if (_tmp2_ == ((0 != _tmp1_label2) ? _tmp1_label2 : (_tmp1_label2 = g_quark_from_static_string ("org.yorba.shotwell.publishing.flickr")))) { #line 25 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" switch (0) { -#line 224 "StandardHostInterface.c" +#line 276 "StandardHostInterface.c" default: { - gchar* _tmp6_; + gchar* _tmp5_; #line 33 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp6_ = g_strdup ("flickr"); + _tmp5_ = g_strdup ("flickr"); #line 33 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - result = _tmp6_; + result = _tmp5_; #line 33 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" return result; -#line 234 "StandardHostInterface.c" +#line 286 "StandardHostInterface.c" } } - } else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("org.yorba.shotwell.publishing.youtube")))) { + } else if (_tmp2_ == ((0 != _tmp1_label3) ? _tmp1_label3 : (_tmp1_label3 = g_quark_from_static_string ("org.yorba.shotwell.publishing.youtube")))) { #line 25 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" switch (0) { -#line 240 "StandardHostInterface.c" +#line 292 "StandardHostInterface.c" default: { - gchar* _tmp7_; + gchar* _tmp6_; #line 36 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp7_ = g_strdup ("youtube"); + _tmp6_ = g_strdup ("youtube"); #line 36 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - result = _tmp7_; + result = _tmp6_; #line 36 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" return result; -#line 250 "StandardHostInterface.c" +#line 302 "StandardHostInterface.c" } } } else { #line 25 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" switch (0) { -#line 256 "StandardHostInterface.c" +#line 308 "StandardHostInterface.c" default: { - const gchar* _tmp8_; - gchar* _tmp9_; -#line 39 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp8_ = id; + gchar* _tmp7_; #line 39 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp9_ = g_strdup (_tmp8_); + _tmp7_ = g_strdup (id); #line 39 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - result = _tmp9_; + result = _tmp7_; #line 39 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" return result; -#line 269 "StandardHostInterface.c" +#line 318 "StandardHostInterface.c" } } } } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 44 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" return self ? g_object_ref (self) : NULL; -#line 279 "StandardHostInterface.c" +#line 330 "StandardHostInterface.c" } -static GFile* plugins_standard_host_interface_real_get_module_file (SpitHostInterface* base) { +static GFile* +plugins_standard_host_interface_real_get_module_file (SpitHostInterface* base) +{ PluginsStandardHostInterface * self; GFile* result = NULL; GFile* _tmp0_; @@ -294,21 +347,22 @@ static GFile* plugins_standard_host_interface_real_get_module_file (SpitHostInte result = _tmp1_; #line 44 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" return result; -#line 298 "StandardHostInterface.c" +#line 351 "StandardHostInterface.c" } -static gboolean plugins_standard_host_interface_real_get_config_bool (SpitHostInterface* base, const gchar* key, gboolean def) { +static gboolean +plugins_standard_host_interface_real_get_config_bool (SpitHostInterface* base, + const gchar* key, + gboolean def) +{ PluginsStandardHostInterface * self; gboolean result = FALSE; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; - gboolean _tmp7_; + gboolean _tmp4_; #line 47 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); #line 47 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -322,31 +376,27 @@ static gboolean plugins_standard_host_interface_real_get_config_bool (SpitHostIn #line 48 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _tmp3_ = self->priv->config_id; #line 48 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp4_ = key; -#line 48 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp5_ = def; -#line 48 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp6_ = configuration_facade_get_plugin_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_, _tmp4_, _tmp5_); -#line 48 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp7_ = _tmp6_; + _tmp4_ = configuration_facade_get_plugin_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_, key, def); #line 48 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _g_object_unref0 (_tmp1_); #line 48 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - result = _tmp7_; + result = _tmp4_; #line 48 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" return result; -#line 339 "StandardHostInterface.c" +#line 387 "StandardHostInterface.c" } -static void plugins_standard_host_interface_real_set_config_bool (SpitHostInterface* base, const gchar* key, gboolean val) { +static void +plugins_standard_host_interface_real_set_config_bool (SpitHostInterface* base, + const gchar* key, + gboolean val) +{ PluginsStandardHostInterface * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; - gboolean _tmp5_; #line 51 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); #line 51 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -360,28 +410,25 @@ static void plugins_standard_host_interface_real_set_config_bool (SpitHostInterf #line 52 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _tmp3_ = self->priv->config_id; #line 52 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp4_ = key; -#line 52 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp5_ = val; -#line 52 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - configuration_facade_set_plugin_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_, _tmp4_, _tmp5_); + configuration_facade_set_plugin_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_, key, val); #line 52 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _g_object_unref0 (_tmp1_); -#line 371 "StandardHostInterface.c" +#line 417 "StandardHostInterface.c" } -static gint plugins_standard_host_interface_real_get_config_int (SpitHostInterface* base, const gchar* key, gint def) { +static gint +plugins_standard_host_interface_real_get_config_int (SpitHostInterface* base, + const gchar* key, + gint def) +{ PluginsStandardHostInterface * self; gint result = 0; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; - gint _tmp5_; - gint _tmp6_; - gint _tmp7_; + gint _tmp4_; #line 55 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); #line 55 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -395,31 +442,27 @@ static gint plugins_standard_host_interface_real_get_config_int (SpitHostInterfa #line 56 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _tmp3_ = self->priv->config_id; #line 56 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp4_ = key; -#line 56 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp5_ = def; -#line 56 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp6_ = configuration_facade_get_plugin_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_, _tmp4_, _tmp5_); -#line 56 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp7_ = _tmp6_; + _tmp4_ = configuration_facade_get_plugin_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_, key, def); #line 56 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _g_object_unref0 (_tmp1_); #line 56 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - result = _tmp7_; + result = _tmp4_; #line 56 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" return result; -#line 412 "StandardHostInterface.c" +#line 453 "StandardHostInterface.c" } -static void plugins_standard_host_interface_real_set_config_int (SpitHostInterface* base, const gchar* key, gint val) { +static void +plugins_standard_host_interface_real_set_config_int (SpitHostInterface* base, + const gchar* key, + gint val) +{ PluginsStandardHostInterface * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; - gint _tmp5_; #line 59 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); #line 59 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -433,28 +476,26 @@ static void plugins_standard_host_interface_real_set_config_int (SpitHostInterfa #line 60 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _tmp3_ = self->priv->config_id; #line 60 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp4_ = key; -#line 60 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp5_ = val; -#line 60 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - configuration_facade_set_plugin_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_, _tmp4_, _tmp5_); + configuration_facade_set_plugin_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_, key, val); #line 60 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _g_object_unref0 (_tmp1_); -#line 444 "StandardHostInterface.c" +#line 483 "StandardHostInterface.c" } -static gchar* plugins_standard_host_interface_real_get_config_string (SpitHostInterface* base, const gchar* key, const gchar* def) { +static gchar* +plugins_standard_host_interface_real_get_config_string (SpitHostInterface* base, + const gchar* key, + const gchar* def) +{ PluginsStandardHostInterface * self; gchar* result = NULL; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; - const gchar* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; + gchar* _tmp4_; + gchar* _tmp5_; #line 63 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); #line 63 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -468,31 +509,29 @@ static gchar* plugins_standard_host_interface_real_get_config_string (SpitHostIn #line 64 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _tmp3_ = self->priv->config_id; #line 64 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp4_ = key; -#line 64 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp5_ = def; + _tmp4_ = configuration_facade_get_plugin_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_, key, def); #line 64 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp6_ = configuration_facade_get_plugin_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_, _tmp4_, _tmp5_); -#line 64 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 64 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _g_object_unref0 (_tmp1_); #line 64 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - result = _tmp7_; + result = _tmp5_; #line 64 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" return result; -#line 485 "StandardHostInterface.c" +#line 522 "StandardHostInterface.c" } -static void plugins_standard_host_interface_real_set_config_string (SpitHostInterface* base, const gchar* key, const gchar* val) { +static void +plugins_standard_host_interface_real_set_config_string (SpitHostInterface* base, + const gchar* key, + const gchar* val) +{ PluginsStandardHostInterface * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; - const gchar* _tmp5_; #line 67 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); #line 67 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -506,28 +545,25 @@ static void plugins_standard_host_interface_real_set_config_string (SpitHostInte #line 68 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _tmp3_ = self->priv->config_id; #line 68 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp4_ = key; -#line 68 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp5_ = val; -#line 68 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - configuration_facade_set_plugin_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_, _tmp4_, _tmp5_); + configuration_facade_set_plugin_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_, key, val); #line 68 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _g_object_unref0 (_tmp1_); -#line 517 "StandardHostInterface.c" +#line 552 "StandardHostInterface.c" } -static gdouble plugins_standard_host_interface_real_get_config_double (SpitHostInterface* base, const gchar* key, gdouble def) { +static gdouble +plugins_standard_host_interface_real_get_config_double (SpitHostInterface* base, + const gchar* key, + gdouble def) +{ PluginsStandardHostInterface * self; gdouble result = 0.0; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; - gdouble _tmp5_; - gdouble _tmp6_; - gdouble _tmp7_; + gdouble _tmp4_; #line 71 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); #line 71 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -541,31 +577,27 @@ static gdouble plugins_standard_host_interface_real_get_config_double (SpitHostI #line 72 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _tmp3_ = self->priv->config_id; #line 72 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp4_ = key; -#line 72 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp5_ = def; -#line 72 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp6_ = configuration_facade_get_plugin_double (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_, _tmp4_, _tmp5_); -#line 72 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp7_ = _tmp6_; + _tmp4_ = configuration_facade_get_plugin_double (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_, key, def); #line 72 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _g_object_unref0 (_tmp1_); #line 72 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - result = _tmp7_; + result = _tmp4_; #line 72 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" return result; -#line 558 "StandardHostInterface.c" +#line 588 "StandardHostInterface.c" } -static void plugins_standard_host_interface_real_set_config_double (SpitHostInterface* base, const gchar* key, gdouble val) { +static void +plugins_standard_host_interface_real_set_config_double (SpitHostInterface* base, + const gchar* key, + gdouble val) +{ PluginsStandardHostInterface * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; - gdouble _tmp5_; #line 75 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); #line 75 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -579,24 +611,22 @@ static void plugins_standard_host_interface_real_set_config_double (SpitHostInte #line 76 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _tmp3_ = self->priv->config_id; #line 76 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp4_ = key; -#line 76 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp5_ = val; -#line 76 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - configuration_facade_set_plugin_double (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_, _tmp4_, _tmp5_); + configuration_facade_set_plugin_double (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_, key, val); #line 76 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _g_object_unref0 (_tmp1_); -#line 590 "StandardHostInterface.c" +#line 618 "StandardHostInterface.c" } -static void plugins_standard_host_interface_real_unset_config_key (SpitHostInterface* base, const gchar* key) { +static void +plugins_standard_host_interface_real_unset_config_key (SpitHostInterface* base, + const gchar* key) +{ PluginsStandardHostInterface * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; #line 79 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); #line 79 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -610,27 +640,29 @@ static void plugins_standard_host_interface_real_unset_config_key (SpitHostInter #line 80 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _tmp3_ = self->priv->config_id; #line 80 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - _tmp4_ = key; -#line 80 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - configuration_facade_unset_plugin_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_, _tmp4_); + configuration_facade_unset_plugin_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_, key); #line 80 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _g_object_unref0 (_tmp1_); -#line 619 "StandardHostInterface.c" +#line 647 "StandardHostInterface.c" } -static void plugins_standard_host_interface_class_init (PluginsStandardHostInterfaceClass * klass) { +static void +plugins_standard_host_interface_class_init (PluginsStandardHostInterfaceClass * klass) +{ #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" plugins_standard_host_interface_parent_class = g_type_class_peek_parent (klass); #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" g_type_class_add_private (klass, sizeof (PluginsStandardHostInterfacePrivate)); #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" G_OBJECT_CLASS (klass)->finalize = plugins_standard_host_interface_finalize; -#line 630 "StandardHostInterface.c" +#line 660 "StandardHostInterface.c" } -static void plugins_standard_host_interface_spit_host_interface_interface_init (SpitHostInterfaceIface * iface) { +static void +plugins_standard_host_interface_spit_host_interface_interface_init (SpitHostInterfaceIface * iface) +{ #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" plugins_standard_host_interface_spit_host_interface_parent_iface = g_type_interface_peek_parent (iface); #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -653,18 +685,22 @@ static void plugins_standard_host_interface_spit_host_interface_interface_init ( iface->set_config_double = (void (*) (SpitHostInterface *, const gchar*, gdouble)) plugins_standard_host_interface_real_set_config_double; #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" iface->unset_config_key = (void (*) (SpitHostInterface *, const gchar*)) plugins_standard_host_interface_real_unset_config_key; -#line 657 "StandardHostInterface.c" +#line 689 "StandardHostInterface.c" } -static void plugins_standard_host_interface_instance_init (PluginsStandardHostInterface * self) { +static void +plugins_standard_host_interface_instance_init (PluginsStandardHostInterface * self) +{ #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self->priv = PLUGINS_STANDARD_HOST_INTERFACE_GET_PRIVATE (self); -#line 664 "StandardHostInterface.c" +#line 698 "StandardHostInterface.c" } -static void plugins_standard_host_interface_finalize (GObject * obj) { +static void +plugins_standard_host_interface_finalize (GObject * obj) +{ PluginsStandardHostInterface * self; #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); @@ -678,11 +714,13 @@ static void plugins_standard_host_interface_finalize (GObject * obj) { spit_pluggable_info_destroy (&self->priv->info); #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" G_OBJECT_CLASS (plugins_standard_host_interface_parent_class)->finalize (obj); -#line 682 "StandardHostInterface.c" +#line 718 "StandardHostInterface.c" } -GType plugins_standard_host_interface_get_type (void) { +GType +plugins_standard_host_interface_get_type (void) +{ static volatile gsize plugins_standard_host_interface_type_id__volatile = 0; if (g_once_init_enter (&plugins_standard_host_interface_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PluginsStandardHostInterfaceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) plugins_standard_host_interface_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PluginsStandardHostInterface), 0, (GInstanceInitFunc) plugins_standard_host_interface_instance_init, NULL }; diff --git a/src/plugins/TransitionsInterfaces.c b/src/plugins/TransitionsInterfaces.c index 0e06742..248a2e9 100644 --- a/src/plugins/TransitionsInterfaces.c +++ b/src/plugins/TransitionsInterfaces.c @@ -1,4 +1,4 @@ -/* TransitionsInterfaces.c generated by valac 0.36.6, the Vala compiler +/* TransitionsInterfaces.c generated by valac 0.40.4, the Vala compiler * generated from TransitionsInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -31,6 +32,16 @@ typedef struct _SpitTransitionsVisuals SpitTransitionsVisuals; typedef struct _SpitTransitionsVisualsClass SpitTransitionsVisualsClass; typedef struct _SpitTransitionsVisualsPrivate SpitTransitionsVisualsPrivate; +enum { + SPIT_TRANSITIONS_VISUALS_0_PROPERTY, + SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF_PROPERTY, + SPIT_TRANSITIONS_VISUALS_FROM_POS_PROPERTY, + SPIT_TRANSITIONS_VISUALS_TO_PIXBUF_PROPERTY, + SPIT_TRANSITIONS_VISUALS_TO_POS_PROPERTY, + SPIT_TRANSITIONS_VISUALS_BG_COLOR_PROPERTY, + SPIT_TRANSITIONS_VISUALS_NUM_PROPERTIES +}; +static GParamSpec* spit_transitions_visuals_properties[SPIT_TRANSITIONS_VISUALS_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define SPIT_TRANSITIONS_TYPE_MOTION (spit_transitions_motion_get_type ()) @@ -43,6 +54,16 @@ typedef struct _SpitTransitionsVisualsPrivate SpitTransitionsVisualsPrivate; typedef struct _SpitTransitionsMotion SpitTransitionsMotion; typedef struct _SpitTransitionsMotionClass SpitTransitionsMotionClass; typedef struct _SpitTransitionsMotionPrivate SpitTransitionsMotionPrivate; +enum { + SPIT_TRANSITIONS_MOTION_0_PROPERTY, + SPIT_TRANSITIONS_MOTION_DIRECTION_PROPERTY, + SPIT_TRANSITIONS_MOTION_FPS_PROPERTY, + SPIT_TRANSITIONS_MOTION_DURATION_MSEC_PROPERTY, + SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES_PROPERTY, + SPIT_TRANSITIONS_MOTION_TICK_MSEC_PROPERTY, + SPIT_TRANSITIONS_MOTION_NUM_PROPERTIES +}; +static GParamSpec* spit_transitions_motion_properties[SPIT_TRANSITIONS_MOTION_NUM_PROPERTIES]; #define SPIT_TYPE_PLUGGABLE (spit_pluggable_get_type ()) #define SPIT_PLUGGABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPIT_TYPE_PLUGGABLE, SpitPluggable)) @@ -226,21 +247,27 @@ static gpointer spit_transitions_motion_parent_class = NULL; GType spit_transitions_direction_get_type (void) G_GNUC_CONST; GType spit_transitions_visuals_get_type (void) G_GNUC_CONST; #define SPIT_TRANSITIONS_VISUALS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_TRANSITIONS_TYPE_VISUALS, SpitTransitionsVisualsPrivate)) -enum { - SPIT_TRANSITIONS_VISUALS_DUMMY_PROPERTY, - SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF_PROPERTY, - SPIT_TRANSITIONS_VISUALS_FROM_POS_PROPERTY, - SPIT_TRANSITIONS_VISUALS_TO_PIXBUF_PROPERTY, - SPIT_TRANSITIONS_VISUALS_TO_POS_PROPERTY, - SPIT_TRANSITIONS_VISUALS_BG_COLOR_PROPERTY -}; -SpitTransitionsVisuals* spit_transitions_visuals_new (GdkPixbuf* from_pixbuf, GdkRectangle* from_pos, GdkPixbuf* to_pixbuf, GdkRectangle* to_pos, GdkRGBA* bg_color); -SpitTransitionsVisuals* spit_transitions_visuals_construct (GType object_type, GdkPixbuf* from_pixbuf, GdkRectangle* from_pos, GdkPixbuf* to_pixbuf, GdkRectangle* to_pos, GdkRGBA* bg_color); -static void spit_transitions_visuals_set_from_pixbuf (SpitTransitionsVisuals* self, GdkPixbuf* value); -static void spit_transitions_visuals_set_from_pos (SpitTransitionsVisuals* self, GdkRectangle * value); -static void spit_transitions_visuals_set_to_pixbuf (SpitTransitionsVisuals* self, GdkPixbuf* value); -static void spit_transitions_visuals_set_to_pos (SpitTransitionsVisuals* self, GdkRectangle * value); -static void spit_transitions_visuals_set_bg_color (SpitTransitionsVisuals* self, GdkRGBA * value); +SpitTransitionsVisuals* spit_transitions_visuals_new (GdkPixbuf* from_pixbuf, + GdkRectangle* from_pos, + GdkPixbuf* to_pixbuf, + GdkRectangle* to_pos, + GdkRGBA* bg_color); +SpitTransitionsVisuals* spit_transitions_visuals_construct (GType object_type, + GdkPixbuf* from_pixbuf, + GdkRectangle* from_pos, + GdkPixbuf* to_pixbuf, + GdkRectangle* to_pos, + GdkRGBA* bg_color); +static void spit_transitions_visuals_set_from_pixbuf (SpitTransitionsVisuals* self, + GdkPixbuf* value); +static void spit_transitions_visuals_set_from_pos (SpitTransitionsVisuals* self, + GdkRectangle * value); +static void spit_transitions_visuals_set_to_pixbuf (SpitTransitionsVisuals* self, + GdkPixbuf* value); +static void spit_transitions_visuals_set_to_pos (SpitTransitionsVisuals* self, + GdkRectangle * value); +static void spit_transitions_visuals_set_bg_color (SpitTransitionsVisuals* self, + GdkRGBA * value); void spit_transitions_visuals_reserved0 (SpitTransitionsVisuals* self); static void spit_transitions_visuals_real_reserved0 (SpitTransitionsVisuals* self); void spit_transitions_visuals_reserved1 (SpitTransitionsVisuals* self); @@ -258,31 +285,43 @@ static void spit_transitions_visuals_real_reserved6 (SpitTransitionsVisuals* sel void spit_transitions_visuals_reserved7 (SpitTransitionsVisuals* self); static void spit_transitions_visuals_real_reserved7 (SpitTransitionsVisuals* self); GdkPixbuf* spit_transitions_visuals_get_from_pixbuf (SpitTransitionsVisuals* self); -void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRectangle * result); -static gboolean _cairo_rectangle_int_equal (const cairo_rectangle_int_t * s1, const cairo_rectangle_int_t * s2); +void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, + GdkRectangle * result); +static gboolean _cairo_rectangle_int_equal (const cairo_rectangle_int_t * s1, + const cairo_rectangle_int_t * s2); GdkPixbuf* spit_transitions_visuals_get_to_pixbuf (SpitTransitionsVisuals* self); -void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRectangle * result); -void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGBA * result); -static gboolean _gdk_rgba_equal (const GdkRGBA * s1, const GdkRGBA * s2); +void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, + GdkRectangle * result); +void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, + GdkRGBA * result); +static gboolean _gdk_rgba_equal (const GdkRGBA * s1, + const GdkRGBA * s2); static void spit_transitions_visuals_finalize (GObject * obj); -static void _vala_spit_transitions_visuals_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void _vala_spit_transitions_visuals_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); +static void _vala_spit_transitions_visuals_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); +static void _vala_spit_transitions_visuals_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec); GType spit_transitions_motion_get_type (void) G_GNUC_CONST; #define SPIT_TRANSITIONS_MOTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_TRANSITIONS_TYPE_MOTION, SpitTransitionsMotionPrivate)) -enum { - SPIT_TRANSITIONS_MOTION_DUMMY_PROPERTY, - SPIT_TRANSITIONS_MOTION_DIRECTION_PROPERTY, - SPIT_TRANSITIONS_MOTION_FPS_PROPERTY, - SPIT_TRANSITIONS_MOTION_DURATION_MSEC_PROPERTY, - SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES_PROPERTY, - SPIT_TRANSITIONS_MOTION_TICK_MSEC_PROPERTY -}; -SpitTransitionsMotion* spit_transitions_motion_new (SpitTransitionsDirection direction, gint fps, gint duration_msec); -SpitTransitionsMotion* spit_transitions_motion_construct (GType object_type, SpitTransitionsDirection direction, gint fps, gint duration_msec); -static void spit_transitions_motion_set_direction (SpitTransitionsMotion* self, SpitTransitionsDirection value); -static void spit_transitions_motion_set_fps (SpitTransitionsMotion* self, gint value); -static void spit_transitions_motion_set_duration_msec (SpitTransitionsMotion* self, gint value); -gdouble spit_transitions_motion_get_alpha (SpitTransitionsMotion* self, gint frame_number); +SpitTransitionsMotion* spit_transitions_motion_new (SpitTransitionsDirection direction, + gint fps, + gint duration_msec); +SpitTransitionsMotion* spit_transitions_motion_construct (GType object_type, + SpitTransitionsDirection direction, + gint fps, + gint duration_msec); +static void spit_transitions_motion_set_direction (SpitTransitionsMotion* self, + SpitTransitionsDirection value); +static void spit_transitions_motion_set_fps (SpitTransitionsMotion* self, + gint value); +static void spit_transitions_motion_set_duration_msec (SpitTransitionsMotion* self, + gint value); +gdouble spit_transitions_motion_get_alpha (SpitTransitionsMotion* self, + gint frame_number); gint spit_transitions_motion_get_total_frames (SpitTransitionsMotion* self); void spit_transitions_motion_reserved0 (SpitTransitionsMotion* self); static void spit_transitions_motion_real_reserved0 (SpitTransitionsMotion* self); @@ -305,18 +344,26 @@ gint spit_transitions_motion_get_fps (SpitTransitionsMotion* self); gint spit_transitions_motion_get_duration_msec (SpitTransitionsMotion* self); gint spit_transitions_motion_get_tick_msec (SpitTransitionsMotion* self); static void spit_transitions_motion_finalize (GObject * obj); -static void _vala_spit_transitions_motion_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void _vala_spit_transitions_motion_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); +static void _vala_spit_transitions_motion_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); +static void _vala_spit_transitions_motion_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec); GType spit_pluggable_info_get_type (void) G_GNUC_CONST; SpitPluggableInfo* spit_pluggable_info_dup (const SpitPluggableInfo* self); void spit_pluggable_info_free (SpitPluggableInfo* self); -void spit_pluggable_info_copy (const SpitPluggableInfo* self, SpitPluggableInfo* dest); +void spit_pluggable_info_copy (const SpitPluggableInfo* self, + SpitPluggableInfo* dest); void spit_pluggable_info_destroy (SpitPluggableInfo* self); GType spit_pluggable_get_type (void) G_GNUC_CONST; GType spit_host_interface_get_type (void) G_GNUC_CONST; GType spit_transitions_effect_get_type (void) G_GNUC_CONST; GType spit_transitions_descriptor_get_type (void) G_GNUC_CONST; -SpitTransitionsEffect* spit_transitions_descriptor_create (SpitTransitionsDescriptor* self, SpitHostInterface* host); +SpitTransitionsEffect* spit_transitions_descriptor_create (SpitTransitionsDescriptor* self, + SpitHostInterface* host); void spit_transitions_descriptor_reserved0 (SpitTransitionsDescriptor* self); static void spit_transitions_descriptor_real_reserved0 (SpitTransitionsDescriptor* self); void spit_transitions_descriptor_reserved1 (SpitTransitionsDescriptor* self); @@ -333,11 +380,24 @@ void spit_transitions_descriptor_reserved6 (SpitTransitionsDescriptor* self); static void spit_transitions_descriptor_real_reserved6 (SpitTransitionsDescriptor* self); void spit_transitions_descriptor_reserved7 (SpitTransitionsDescriptor* self); static void spit_transitions_descriptor_real_reserved7 (SpitTransitionsDescriptor* self); -void spit_transitions_effect_get_fps (SpitTransitionsEffect* self, gint* desired_fps, gint* min_fps); -void spit_transitions_effect_start (SpitTransitionsEffect* self, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion); +void spit_transitions_effect_get_fps (SpitTransitionsEffect* self, + gint* desired_fps, + gint* min_fps); +void spit_transitions_effect_start (SpitTransitionsEffect* self, + SpitTransitionsVisuals* visuals, + SpitTransitionsMotion* motion); gboolean spit_transitions_effect_needs_clear_background (SpitTransitionsEffect* self); -void spit_transitions_effect_paint (SpitTransitionsEffect* self, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number); -void spit_transitions_effect_advance (SpitTransitionsEffect* self, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number); +void spit_transitions_effect_paint (SpitTransitionsEffect* self, + SpitTransitionsVisuals* visuals, + SpitTransitionsMotion* motion, + cairo_t* ctx, + gint width, + gint height, + gint frame_number); +void spit_transitions_effect_advance (SpitTransitionsEffect* self, + SpitTransitionsVisuals* visuals, + SpitTransitionsMotion* motion, + gint frame_number); void spit_transitions_effect_cancel (SpitTransitionsEffect* self); void spit_transitions_effect_reserved0 (SpitTransitionsEffect* self); static void spit_transitions_effect_real_reserved0 (SpitTransitionsEffect* self); @@ -367,7 +427,9 @@ static void spit_transitions_effect_real_reserved7 (SpitTransitionsEffect* self) * * UP, DOWN, and diagonals may be added at some point. */ -GType spit_transitions_direction_get_type (void) { +GType +spit_transitions_direction_get_type (void) +{ static volatile gsize spit_transitions_direction_type_id__volatile = 0; if (g_once_init_enter (&spit_transitions_direction_type_id__volatile)) { static const GEnumValue values[] = {{SPIT_TRANSITIONS_DIRECTION_LEFT, "SPIT_TRANSITIONS_DIRECTION_LEFT", "left"}, {SPIT_TRANSITIONS_DIRECTION_RIGHT, "SPIT_TRANSITIONS_DIRECTION_RIGHT", "right"}, {SPIT_TRANSITIONS_DIRECTION_FORWARD, "SPIT_TRANSITIONS_DIRECTION_FORWARD", "forward"}, {SPIT_TRANSITIONS_DIRECTION_BACKWARD, "SPIT_TRANSITIONS_DIRECTION_BACKWARD", "backward"}, {0, NULL, NULL}}; @@ -379,13 +441,18 @@ GType spit_transitions_direction_get_type (void) { } -SpitTransitionsVisuals* spit_transitions_visuals_construct (GType object_type, GdkPixbuf* from_pixbuf, GdkRectangle* from_pos, GdkPixbuf* to_pixbuf, GdkRectangle* to_pos, GdkRGBA* bg_color) { +SpitTransitionsVisuals* +spit_transitions_visuals_construct (GType object_type, + GdkPixbuf* from_pixbuf, + GdkRectangle* from_pos, + GdkPixbuf* to_pixbuf, + GdkRectangle* to_pos, + GdkRGBA* bg_color) +{ SpitTransitionsVisuals * self = NULL; - GdkPixbuf* _tmp0_; + GdkRectangle _tmp0_; GdkRectangle _tmp1_; - GdkPixbuf* _tmp2_; - GdkRectangle _tmp3_; - GdkRGBA _tmp4_; + GdkRGBA _tmp2_; #line 94 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail ((from_pixbuf == NULL) || GDK_IS_PIXBUF (from_pixbuf), NULL); #line 94 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -399,143 +466,179 @@ SpitTransitionsVisuals* spit_transitions_visuals_construct (GType object_type, G #line 94 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" self = (SpitTransitionsVisuals*) g_object_new (object_type, NULL); #line 96 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = from_pixbuf; -#line 96 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - spit_transitions_visuals_set_from_pixbuf (self, _tmp0_); + spit_transitions_visuals_set_from_pixbuf (self, from_pixbuf); #line 97 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp1_ = *from_pos; + _tmp0_ = *from_pos; #line 97 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - spit_transitions_visuals_set_from_pos (self, &_tmp1_); -#line 98 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp2_ = to_pixbuf; + spit_transitions_visuals_set_from_pos (self, &_tmp0_); #line 98 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - spit_transitions_visuals_set_to_pixbuf (self, _tmp2_); + spit_transitions_visuals_set_to_pixbuf (self, to_pixbuf); #line 99 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp3_ = *to_pos; + _tmp1_ = *to_pos; #line 99 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - spit_transitions_visuals_set_to_pos (self, &_tmp3_); + spit_transitions_visuals_set_to_pos (self, &_tmp1_); #line 100 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp4_ = *bg_color; + _tmp2_ = *bg_color; #line 100 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - spit_transitions_visuals_set_bg_color (self, &_tmp4_); + spit_transitions_visuals_set_bg_color (self, &_tmp2_); #line 94 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return self; -#line 424 "TransitionsInterfaces.c" +#line 487 "TransitionsInterfaces.c" } -SpitTransitionsVisuals* spit_transitions_visuals_new (GdkPixbuf* from_pixbuf, GdkRectangle* from_pos, GdkPixbuf* to_pixbuf, GdkRectangle* to_pos, GdkRGBA* bg_color) { +SpitTransitionsVisuals* +spit_transitions_visuals_new (GdkPixbuf* from_pixbuf, + GdkRectangle* from_pos, + GdkPixbuf* to_pixbuf, + GdkRectangle* to_pos, + GdkRGBA* bg_color) +{ #line 94 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return spit_transitions_visuals_construct (SPIT_TRANSITIONS_TYPE_VISUALS, from_pixbuf, from_pos, to_pixbuf, to_pos, bg_color); -#line 431 "TransitionsInterfaces.c" +#line 500 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_real_reserved0 (SpitTransitionsVisuals* self) { +static void +spit_transitions_visuals_real_reserved0 (SpitTransitionsVisuals* self) +{ } -void spit_transitions_visuals_reserved0 (SpitTransitionsVisuals* self) { +void +spit_transitions_visuals_reserved0 (SpitTransitionsVisuals* self) +{ #line 106 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 106 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved0 (self); -#line 444 "TransitionsInterfaces.c" +#line 517 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_real_reserved1 (SpitTransitionsVisuals* self) { +static void +spit_transitions_visuals_real_reserved1 (SpitTransitionsVisuals* self) +{ } -void spit_transitions_visuals_reserved1 (SpitTransitionsVisuals* self) { +void +spit_transitions_visuals_reserved1 (SpitTransitionsVisuals* self) +{ #line 107 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 107 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved1 (self); -#line 457 "TransitionsInterfaces.c" +#line 534 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_real_reserved2 (SpitTransitionsVisuals* self) { +static void +spit_transitions_visuals_real_reserved2 (SpitTransitionsVisuals* self) +{ } -void spit_transitions_visuals_reserved2 (SpitTransitionsVisuals* self) { +void +spit_transitions_visuals_reserved2 (SpitTransitionsVisuals* self) +{ #line 108 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 108 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved2 (self); -#line 470 "TransitionsInterfaces.c" +#line 551 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_real_reserved3 (SpitTransitionsVisuals* self) { +static void +spit_transitions_visuals_real_reserved3 (SpitTransitionsVisuals* self) +{ } -void spit_transitions_visuals_reserved3 (SpitTransitionsVisuals* self) { +void +spit_transitions_visuals_reserved3 (SpitTransitionsVisuals* self) +{ #line 109 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 109 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved3 (self); -#line 483 "TransitionsInterfaces.c" +#line 568 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_real_reserved4 (SpitTransitionsVisuals* self) { +static void +spit_transitions_visuals_real_reserved4 (SpitTransitionsVisuals* self) +{ } -void spit_transitions_visuals_reserved4 (SpitTransitionsVisuals* self) { +void +spit_transitions_visuals_reserved4 (SpitTransitionsVisuals* self) +{ #line 110 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 110 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved4 (self); -#line 496 "TransitionsInterfaces.c" +#line 585 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_real_reserved5 (SpitTransitionsVisuals* self) { +static void +spit_transitions_visuals_real_reserved5 (SpitTransitionsVisuals* self) +{ } -void spit_transitions_visuals_reserved5 (SpitTransitionsVisuals* self) { +void +spit_transitions_visuals_reserved5 (SpitTransitionsVisuals* self) +{ #line 111 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 111 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved5 (self); -#line 509 "TransitionsInterfaces.c" +#line 602 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_real_reserved6 (SpitTransitionsVisuals* self) { +static void +spit_transitions_visuals_real_reserved6 (SpitTransitionsVisuals* self) +{ } -void spit_transitions_visuals_reserved6 (SpitTransitionsVisuals* self) { +void +spit_transitions_visuals_reserved6 (SpitTransitionsVisuals* self) +{ #line 112 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 112 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved6 (self); -#line 522 "TransitionsInterfaces.c" +#line 619 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_real_reserved7 (SpitTransitionsVisuals* self) { +static void +spit_transitions_visuals_real_reserved7 (SpitTransitionsVisuals* self) +{ } -void spit_transitions_visuals_reserved7 (SpitTransitionsVisuals* self) { +void +spit_transitions_visuals_reserved7 (SpitTransitionsVisuals* self) +{ #line 113 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 113 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved7 (self); -#line 535 "TransitionsInterfaces.c" +#line 636 "TransitionsInterfaces.c" } -GdkPixbuf* spit_transitions_visuals_get_from_pixbuf (SpitTransitionsVisuals* self) { +GdkPixbuf* +spit_transitions_visuals_get_from_pixbuf (SpitTransitionsVisuals* self) +{ GdkPixbuf* result; GdkPixbuf* _tmp0_; #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -546,41 +649,46 @@ GdkPixbuf* spit_transitions_visuals_get_from_pixbuf (SpitTransitionsVisuals* sel result = _tmp0_; #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 550 "TransitionsInterfaces.c" +#line 653 "TransitionsInterfaces.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return self ? g_object_ref (self) : NULL; -#line 557 "TransitionsInterfaces.c" +#line 662 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_set_from_pixbuf (SpitTransitionsVisuals* self, GdkPixbuf* value) { +static void +spit_transitions_visuals_set_from_pixbuf (SpitTransitionsVisuals* self, + GdkPixbuf* value) +{ #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (spit_transitions_visuals_get_from_pixbuf (self) != value) { -#line 566 "TransitionsInterfaces.c" +#line 674 "TransitionsInterfaces.c" GdkPixbuf* _tmp0_; - GdkPixbuf* _tmp1_; #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = value; -#line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (value); #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" _g_object_unref0 (self->priv->_from_pixbuf); #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_from_pixbuf = _tmp1_; + self->priv->_from_pixbuf = _tmp0_; #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "from-pixbuf"); -#line 579 "TransitionsInterfaces.c" + g_object_notify_by_pspec ((GObject *) self, spit_transitions_visuals_properties[SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF_PROPERTY]); +#line 684 "TransitionsInterfaces.c" } } -void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRectangle * result) { +void +spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, + GdkRectangle * result) +{ GdkRectangle _tmp0_; #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); @@ -590,79 +698,87 @@ void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRec *result = _tmp0_; #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return; -#line 594 "TransitionsInterfaces.c" +#line 702 "TransitionsInterfaces.c" } -static gboolean _cairo_rectangle_int_equal (const cairo_rectangle_int_t * s1, const cairo_rectangle_int_t * s2) { +static gboolean +_cairo_rectangle_int_equal (const cairo_rectangle_int_t * s1, + const cairo_rectangle_int_t * s2) +{ #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (s1 == s2) { #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return TRUE; -#line 603 "TransitionsInterfaces.c" +#line 714 "TransitionsInterfaces.c" } #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (s1 == NULL) { #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return FALSE; -#line 609 "TransitionsInterfaces.c" +#line 720 "TransitionsInterfaces.c" } #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (s2 == NULL) { #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return FALSE; -#line 615 "TransitionsInterfaces.c" +#line 726 "TransitionsInterfaces.c" } #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (s1->x != s2->x) { #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return FALSE; -#line 621 "TransitionsInterfaces.c" +#line 732 "TransitionsInterfaces.c" } #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (s1->y != s2->y) { #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return FALSE; -#line 627 "TransitionsInterfaces.c" +#line 738 "TransitionsInterfaces.c" } #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (s1->width != s2->width) { #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return FALSE; -#line 633 "TransitionsInterfaces.c" +#line 744 "TransitionsInterfaces.c" } #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (s1->height != s2->height) { #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return FALSE; -#line 639 "TransitionsInterfaces.c" +#line 750 "TransitionsInterfaces.c" } #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return TRUE; -#line 643 "TransitionsInterfaces.c" +#line 754 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_set_from_pos (SpitTransitionsVisuals* self, GdkRectangle * value) { +static void +spit_transitions_visuals_set_from_pos (SpitTransitionsVisuals* self, + GdkRectangle * value) +{ GdkRectangle old_value; #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (_cairo_rectangle_int_equal (value, (spit_transitions_visuals_get_from_pos (self, &old_value), &old_value)) != TRUE) { -#line 653 "TransitionsInterfaces.c" +#line 767 "TransitionsInterfaces.c" GdkRectangle _tmp0_; #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" _tmp0_ = *value; #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" self->priv->_from_pos = _tmp0_; #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "from-pos"); -#line 661 "TransitionsInterfaces.c" + g_object_notify_by_pspec ((GObject *) self, spit_transitions_visuals_properties[SPIT_TRANSITIONS_VISUALS_FROM_POS_PROPERTY]); +#line 775 "TransitionsInterfaces.c" } } -GdkPixbuf* spit_transitions_visuals_get_to_pixbuf (SpitTransitionsVisuals* self) { +GdkPixbuf* +spit_transitions_visuals_get_to_pixbuf (SpitTransitionsVisuals* self) +{ GdkPixbuf* result; GdkPixbuf* _tmp0_; #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -673,34 +789,37 @@ GdkPixbuf* spit_transitions_visuals_get_to_pixbuf (SpitTransitionsVisuals* self) result = _tmp0_; #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 677 "TransitionsInterfaces.c" +#line 793 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_set_to_pixbuf (SpitTransitionsVisuals* self, GdkPixbuf* value) { +static void +spit_transitions_visuals_set_to_pixbuf (SpitTransitionsVisuals* self, + GdkPixbuf* value) +{ #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (spit_transitions_visuals_get_to_pixbuf (self) != value) { -#line 686 "TransitionsInterfaces.c" +#line 805 "TransitionsInterfaces.c" GdkPixbuf* _tmp0_; - GdkPixbuf* _tmp1_; #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = value; -#line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (value); #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" _g_object_unref0 (self->priv->_to_pixbuf); #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_to_pixbuf = _tmp1_; + self->priv->_to_pixbuf = _tmp0_; #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "to-pixbuf"); -#line 699 "TransitionsInterfaces.c" + g_object_notify_by_pspec ((GObject *) self, spit_transitions_visuals_properties[SPIT_TRANSITIONS_VISUALS_TO_PIXBUF_PROPERTY]); +#line 815 "TransitionsInterfaces.c" } } -void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRectangle * result) { +void +spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, + GdkRectangle * result) +{ GdkRectangle _tmp0_; #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); @@ -710,30 +829,36 @@ void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRecta *result = _tmp0_; #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return; -#line 714 "TransitionsInterfaces.c" +#line 833 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_set_to_pos (SpitTransitionsVisuals* self, GdkRectangle * value) { +static void +spit_transitions_visuals_set_to_pos (SpitTransitionsVisuals* self, + GdkRectangle * value) +{ GdkRectangle old_value; #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (_cairo_rectangle_int_equal (value, (spit_transitions_visuals_get_to_pos (self, &old_value), &old_value)) != TRUE) { -#line 724 "TransitionsInterfaces.c" +#line 846 "TransitionsInterfaces.c" GdkRectangle _tmp0_; #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" _tmp0_ = *value; #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" self->priv->_to_pos = _tmp0_; #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "to-pos"); -#line 732 "TransitionsInterfaces.c" + g_object_notify_by_pspec ((GObject *) self, spit_transitions_visuals_properties[SPIT_TRANSITIONS_VISUALS_TO_POS_PROPERTY]); +#line 854 "TransitionsInterfaces.c" } } -void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGBA * result) { +void +spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, + GdkRGBA * result) +{ GdkRGBA _tmp0_; #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); @@ -743,79 +868,87 @@ void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGB *result = _tmp0_; #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return; -#line 747 "TransitionsInterfaces.c" +#line 872 "TransitionsInterfaces.c" } -static gboolean _gdk_rgba_equal (const GdkRGBA * s1, const GdkRGBA * s2) { +static gboolean +_gdk_rgba_equal (const GdkRGBA * s1, + const GdkRGBA * s2) +{ #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (s1 == s2) { #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return TRUE; -#line 756 "TransitionsInterfaces.c" +#line 884 "TransitionsInterfaces.c" } #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (s1 == NULL) { #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return FALSE; -#line 762 "TransitionsInterfaces.c" +#line 890 "TransitionsInterfaces.c" } #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (s2 == NULL) { #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return FALSE; -#line 768 "TransitionsInterfaces.c" +#line 896 "TransitionsInterfaces.c" } #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (s1->red != s2->red) { #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return FALSE; -#line 774 "TransitionsInterfaces.c" +#line 902 "TransitionsInterfaces.c" } #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (s1->green != s2->green) { #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return FALSE; -#line 780 "TransitionsInterfaces.c" +#line 908 "TransitionsInterfaces.c" } #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (s1->blue != s2->blue) { #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return FALSE; -#line 786 "TransitionsInterfaces.c" +#line 914 "TransitionsInterfaces.c" } #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (s1->alpha != s2->alpha) { #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return FALSE; -#line 792 "TransitionsInterfaces.c" +#line 920 "TransitionsInterfaces.c" } #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return TRUE; -#line 796 "TransitionsInterfaces.c" +#line 924 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_set_bg_color (SpitTransitionsVisuals* self, GdkRGBA * value) { +static void +spit_transitions_visuals_set_bg_color (SpitTransitionsVisuals* self, + GdkRGBA * value) +{ GdkRGBA old_value; #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (_gdk_rgba_equal (value, (spit_transitions_visuals_get_bg_color (self, &old_value), &old_value)) != TRUE) { -#line 806 "TransitionsInterfaces.c" +#line 937 "TransitionsInterfaces.c" GdkRGBA _tmp0_; #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" _tmp0_ = *value; #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" self->priv->_bg_color = _tmp0_; #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "bg-color"); -#line 814 "TransitionsInterfaces.c" + g_object_notify_by_pspec ((GObject *) self, spit_transitions_visuals_properties[SPIT_TRANSITIONS_VISUALS_BG_COLOR_PROPERTY]); +#line 945 "TransitionsInterfaces.c" } } -static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * klass) { +static void +spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * klass) +{ #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_visuals_parent_class = g_type_class_peek_parent (klass); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -842,56 +975,60 @@ static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * k G_OBJECT_CLASS (klass)->set_property = _vala_spit_transitions_visuals_set_property; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_CLASS (klass)->finalize = spit_transitions_visuals_finalize; -#line 846 "TransitionsInterfaces.c" +#line 979 "TransitionsInterfaces.c" /** * Returns the starting pixbuf (the pixbuf currently on the display). * * If transitioning from a blank screen, this will return null. */ #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF_PROPERTY, g_param_spec_object ("from-pixbuf", "from-pixbuf", "from-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 854 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF_PROPERTY, spit_transitions_visuals_properties[SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF_PROPERTY] = g_param_spec_object ("from-pixbuf", "from-pixbuf", "from-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 987 "TransitionsInterfaces.c" /** * Returns the position of the starting pixbuf on the display. * * If transitioning from a blank screen, this will be zeroed. */ #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_POS_PROPERTY, g_param_spec_boxed ("from-pos", "from-pos", "from-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 862 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_POS_PROPERTY, spit_transitions_visuals_properties[SPIT_TRANSITIONS_VISUALS_FROM_POS_PROPERTY] = g_param_spec_boxed ("from-pos", "from-pos", "from-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 995 "TransitionsInterfaces.c" /** * Returns the ending pixbuf (the pixbuf that the transition should result in). * * If transitioning to a blank screen, this will return null. */ #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_PIXBUF_PROPERTY, g_param_spec_object ("to-pixbuf", "to-pixbuf", "to-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 870 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_PIXBUF_PROPERTY, spit_transitions_visuals_properties[SPIT_TRANSITIONS_VISUALS_TO_PIXBUF_PROPERTY] = g_param_spec_object ("to-pixbuf", "to-pixbuf", "to-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 1003 "TransitionsInterfaces.c" /** * Returns the position of the ending pixbuf on the display. * * If transitioning to a blank screen, this will be zeroed. */ #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_POS_PROPERTY, g_param_spec_boxed ("to-pos", "to-pos", "to-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 878 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_POS_PROPERTY, spit_transitions_visuals_properties[SPIT_TRANSITIONS_VISUALS_TO_POS_PROPERTY] = g_param_spec_boxed ("to-pos", "to-pos", "to-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 1011 "TransitionsInterfaces.c" /** * Returns the background color of the viewport. */ #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_BG_COLOR_PROPERTY, g_param_spec_boxed ("bg-color", "bg-color", "bg-color", gdk_rgba_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 884 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_BG_COLOR_PROPERTY, spit_transitions_visuals_properties[SPIT_TRANSITIONS_VISUALS_BG_COLOR_PROPERTY] = g_param_spec_boxed ("bg-color", "bg-color", "bg-color", gdk_rgba_get_type (), G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 1017 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_instance_init (SpitTransitionsVisuals * self) { +static void +spit_transitions_visuals_instance_init (SpitTransitionsVisuals * self) +{ #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" self->priv = SPIT_TRANSITIONS_VISUALS_GET_PRIVATE (self); -#line 891 "TransitionsInterfaces.c" +#line 1026 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_finalize (GObject * obj) { +static void +spit_transitions_visuals_finalize (GObject * obj) +{ SpitTransitionsVisuals * self; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_TRANSITIONS_TYPE_VISUALS, SpitTransitionsVisuals); @@ -901,7 +1038,7 @@ static void spit_transitions_visuals_finalize (GObject * obj) { _g_object_unref0 (self->priv->_to_pixbuf); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_CLASS (spit_transitions_visuals_parent_class)->finalize (obj); -#line 905 "TransitionsInterfaces.c" +#line 1042 "TransitionsInterfaces.c" } @@ -919,7 +1056,9 @@ static void spit_transitions_visuals_finalize (GObject * obj) { * zeroed. Like the prior case, the transition should move toward a blank screen of the background * color. */ -GType spit_transitions_visuals_get_type (void) { +GType +spit_transitions_visuals_get_type (void) +{ static volatile gsize spit_transitions_visuals_type_id__volatile = 0; if (g_once_init_enter (&spit_transitions_visuals_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitTransitionsVisualsClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) spit_transitions_visuals_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SpitTransitionsVisuals), 0, (GInstanceInitFunc) spit_transitions_visuals_instance_init, NULL }; @@ -931,7 +1070,12 @@ GType spit_transitions_visuals_get_type (void) { } -static void _vala_spit_transitions_visuals_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_spit_transitions_visuals_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ SpitTransitionsVisuals * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SPIT_TRANSITIONS_TYPE_VISUALS, SpitTransitionsVisuals); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -944,14 +1088,14 @@ static void _vala_spit_transitions_visuals_get_property (GObject * object, guint break; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" case SPIT_TRANSITIONS_VISUALS_FROM_POS_PROPERTY: -#line 948 "TransitionsInterfaces.c" +#line 1092 "TransitionsInterfaces.c" { GdkRectangle boxed; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_visuals_get_from_pos (self, &boxed); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_boxed (value, &boxed); -#line 955 "TransitionsInterfaces.c" +#line 1099 "TransitionsInterfaces.c" } #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; @@ -963,42 +1107,47 @@ static void _vala_spit_transitions_visuals_get_property (GObject * object, guint break; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" case SPIT_TRANSITIONS_VISUALS_TO_POS_PROPERTY: -#line 967 "TransitionsInterfaces.c" +#line 1111 "TransitionsInterfaces.c" { GdkRectangle boxed; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_visuals_get_to_pos (self, &boxed); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_boxed (value, &boxed); -#line 974 "TransitionsInterfaces.c" +#line 1118 "TransitionsInterfaces.c" } #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" case SPIT_TRANSITIONS_VISUALS_BG_COLOR_PROPERTY: -#line 980 "TransitionsInterfaces.c" +#line 1124 "TransitionsInterfaces.c" { GdkRGBA boxed; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_visuals_get_bg_color (self, &boxed); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_boxed (value, &boxed); -#line 987 "TransitionsInterfaces.c" +#line 1131 "TransitionsInterfaces.c" } #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 991 "TransitionsInterfaces.c" +#line 1135 "TransitionsInterfaces.c" default: #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 997 "TransitionsInterfaces.c" +#line 1141 "TransitionsInterfaces.c" } } -static void _vala_spit_transitions_visuals_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { +static void +_vala_spit_transitions_visuals_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec) +{ SpitTransitionsVisuals * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SPIT_TRANSITIONS_TYPE_VISUALS, SpitTransitionsVisuals); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1033,46 +1182,46 @@ static void _vala_spit_transitions_visuals_set_property (GObject * object, guint spit_transitions_visuals_set_bg_color (self, g_value_get_boxed (value)); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 1037 "TransitionsInterfaces.c" +#line 1186 "TransitionsInterfaces.c" default: #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 1043 "TransitionsInterfaces.c" +#line 1192 "TransitionsInterfaces.c" } } -SpitTransitionsMotion* spit_transitions_motion_construct (GType object_type, SpitTransitionsDirection direction, gint fps, gint duration_msec) { +SpitTransitionsMotion* +spit_transitions_motion_construct (GType object_type, + SpitTransitionsDirection direction, + gint fps, + gint duration_msec) +{ SpitTransitionsMotion * self = NULL; - SpitTransitionsDirection _tmp0_; - gint _tmp1_; - gint _tmp2_; #line 157 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" self = (SpitTransitionsMotion*) g_object_new (object_type, NULL); #line 158 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = direction; -#line 158 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - spit_transitions_motion_set_direction (self, _tmp0_); + spit_transitions_motion_set_direction (self, direction); #line 159 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp1_ = fps; -#line 159 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - spit_transitions_motion_set_fps (self, _tmp1_); -#line 160 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp2_ = duration_msec; + spit_transitions_motion_set_fps (self, fps); #line 160 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - spit_transitions_motion_set_duration_msec (self, _tmp2_); + spit_transitions_motion_set_duration_msec (self, duration_msec); #line 157 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return self; -#line 1069 "TransitionsInterfaces.c" +#line 1214 "TransitionsInterfaces.c" } -SpitTransitionsMotion* spit_transitions_motion_new (SpitTransitionsDirection direction, gint fps, gint duration_msec) { +SpitTransitionsMotion* +spit_transitions_motion_new (SpitTransitionsDirection direction, + gint fps, + gint duration_msec) +{ #line 157 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return spit_transitions_motion_construct (SPIT_TRANSITIONS_TYPE_MOTION, direction, fps, duration_msec); -#line 1076 "TransitionsInterfaces.c" +#line 1225 "TransitionsInterfaces.c" } @@ -1080,132 +1229,166 @@ SpitTransitionsMotion* spit_transitions_motion_new (SpitTransitionsDirection dir * Returns a value from 0.0 to 1.0 that represents the percentage of the transition's completion * for the specified frame. */ -gdouble spit_transitions_motion_get_alpha (SpitTransitionsMotion* self, gint frame_number) { +gdouble +spit_transitions_motion_get_alpha (SpitTransitionsMotion* self, + gint frame_number) +{ gdouble result = 0.0; gint _tmp0_; gint _tmp1_; - gint _tmp2_; #line 167 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_MOTION (self), 0.0); #line 168 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = frame_number; + _tmp0_ = spit_transitions_motion_get_total_frames (self); #line 168 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp1_ = spit_transitions_motion_get_total_frames (self); + _tmp1_ = _tmp0_; #line 168 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp2_ = _tmp1_; -#line 168 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - result = ((gdouble) _tmp0_) / ((gdouble) _tmp2_); + result = ((gdouble) frame_number) / ((gdouble) _tmp1_); #line 168 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 1101 "TransitionsInterfaces.c" +#line 1250 "TransitionsInterfaces.c" } -static void spit_transitions_motion_real_reserved0 (SpitTransitionsMotion* self) { +static void +spit_transitions_motion_real_reserved0 (SpitTransitionsMotion* self) +{ } -void spit_transitions_motion_reserved0 (SpitTransitionsMotion* self) { +void +spit_transitions_motion_reserved0 (SpitTransitionsMotion* self) +{ #line 174 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 174 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved0 (self); -#line 1114 "TransitionsInterfaces.c" +#line 1267 "TransitionsInterfaces.c" } -static void spit_transitions_motion_real_reserved1 (SpitTransitionsMotion* self) { +static void +spit_transitions_motion_real_reserved1 (SpitTransitionsMotion* self) +{ } -void spit_transitions_motion_reserved1 (SpitTransitionsMotion* self) { +void +spit_transitions_motion_reserved1 (SpitTransitionsMotion* self) +{ #line 175 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 175 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved1 (self); -#line 1127 "TransitionsInterfaces.c" +#line 1284 "TransitionsInterfaces.c" } -static void spit_transitions_motion_real_reserved2 (SpitTransitionsMotion* self) { +static void +spit_transitions_motion_real_reserved2 (SpitTransitionsMotion* self) +{ } -void spit_transitions_motion_reserved2 (SpitTransitionsMotion* self) { +void +spit_transitions_motion_reserved2 (SpitTransitionsMotion* self) +{ #line 176 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 176 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved2 (self); -#line 1140 "TransitionsInterfaces.c" +#line 1301 "TransitionsInterfaces.c" } -static void spit_transitions_motion_real_reserved3 (SpitTransitionsMotion* self) { +static void +spit_transitions_motion_real_reserved3 (SpitTransitionsMotion* self) +{ } -void spit_transitions_motion_reserved3 (SpitTransitionsMotion* self) { +void +spit_transitions_motion_reserved3 (SpitTransitionsMotion* self) +{ #line 177 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 177 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved3 (self); -#line 1153 "TransitionsInterfaces.c" +#line 1318 "TransitionsInterfaces.c" } -static void spit_transitions_motion_real_reserved4 (SpitTransitionsMotion* self) { +static void +spit_transitions_motion_real_reserved4 (SpitTransitionsMotion* self) +{ } -void spit_transitions_motion_reserved4 (SpitTransitionsMotion* self) { +void +spit_transitions_motion_reserved4 (SpitTransitionsMotion* self) +{ #line 178 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 178 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved4 (self); -#line 1166 "TransitionsInterfaces.c" +#line 1335 "TransitionsInterfaces.c" } -static void spit_transitions_motion_real_reserved5 (SpitTransitionsMotion* self) { +static void +spit_transitions_motion_real_reserved5 (SpitTransitionsMotion* self) +{ } -void spit_transitions_motion_reserved5 (SpitTransitionsMotion* self) { +void +spit_transitions_motion_reserved5 (SpitTransitionsMotion* self) +{ #line 179 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 179 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved5 (self); -#line 1179 "TransitionsInterfaces.c" +#line 1352 "TransitionsInterfaces.c" } -static void spit_transitions_motion_real_reserved6 (SpitTransitionsMotion* self) { +static void +spit_transitions_motion_real_reserved6 (SpitTransitionsMotion* self) +{ } -void spit_transitions_motion_reserved6 (SpitTransitionsMotion* self) { +void +spit_transitions_motion_reserved6 (SpitTransitionsMotion* self) +{ #line 180 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 180 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved6 (self); -#line 1192 "TransitionsInterfaces.c" +#line 1369 "TransitionsInterfaces.c" } -static void spit_transitions_motion_real_reserved7 (SpitTransitionsMotion* self) { +static void +spit_transitions_motion_real_reserved7 (SpitTransitionsMotion* self) +{ } -void spit_transitions_motion_reserved7 (SpitTransitionsMotion* self) { +void +spit_transitions_motion_reserved7 (SpitTransitionsMotion* self) +{ #line 181 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 181 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved7 (self); -#line 1205 "TransitionsInterfaces.c" +#line 1386 "TransitionsInterfaces.c" } -SpitTransitionsDirection spit_transitions_motion_get_direction (SpitTransitionsMotion* self) { +SpitTransitionsDirection +spit_transitions_motion_get_direction (SpitTransitionsMotion* self) +{ SpitTransitionsDirection result; SpitTransitionsDirection _tmp0_; #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1216,29 +1399,30 @@ SpitTransitionsDirection spit_transitions_motion_get_direction (SpitTransitionsM result = _tmp0_; #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 1220 "TransitionsInterfaces.c" +#line 1403 "TransitionsInterfaces.c" } -static void spit_transitions_motion_set_direction (SpitTransitionsMotion* self, SpitTransitionsDirection value) { +static void +spit_transitions_motion_set_direction (SpitTransitionsMotion* self, + SpitTransitionsDirection value) +{ #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (spit_transitions_motion_get_direction (self) != value) { -#line 1229 "TransitionsInterfaces.c" - SpitTransitionsDirection _tmp0_; -#line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = value; #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_direction = _tmp0_; + self->priv->_direction = value; #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "direction"); -#line 1237 "TransitionsInterfaces.c" + g_object_notify_by_pspec ((GObject *) self, spit_transitions_motion_properties[SPIT_TRANSITIONS_MOTION_DIRECTION_PROPERTY]); +#line 1419 "TransitionsInterfaces.c" } } -gint spit_transitions_motion_get_fps (SpitTransitionsMotion* self) { +gint +spit_transitions_motion_get_fps (SpitTransitionsMotion* self) +{ gint result; gint _tmp0_; #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1249,29 +1433,30 @@ gint spit_transitions_motion_get_fps (SpitTransitionsMotion* self) { result = _tmp0_; #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 1253 "TransitionsInterfaces.c" +#line 1437 "TransitionsInterfaces.c" } -static void spit_transitions_motion_set_fps (SpitTransitionsMotion* self, gint value) { +static void +spit_transitions_motion_set_fps (SpitTransitionsMotion* self, + gint value) +{ #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (spit_transitions_motion_get_fps (self) != value) { -#line 1262 "TransitionsInterfaces.c" - gint _tmp0_; #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = value; + self->priv->_fps = value; #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_fps = _tmp0_; -#line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "fps"); -#line 1270 "TransitionsInterfaces.c" + g_object_notify_by_pspec ((GObject *) self, spit_transitions_motion_properties[SPIT_TRANSITIONS_MOTION_FPS_PROPERTY]); +#line 1453 "TransitionsInterfaces.c" } } -gint spit_transitions_motion_get_duration_msec (SpitTransitionsMotion* self) { +gint +spit_transitions_motion_get_duration_msec (SpitTransitionsMotion* self) +{ gint result; gint _tmp0_; #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1282,29 +1467,30 @@ gint spit_transitions_motion_get_duration_msec (SpitTransitionsMotion* self) { result = _tmp0_; #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 1286 "TransitionsInterfaces.c" +#line 1471 "TransitionsInterfaces.c" } -static void spit_transitions_motion_set_duration_msec (SpitTransitionsMotion* self, gint value) { +static void +spit_transitions_motion_set_duration_msec (SpitTransitionsMotion* self, + gint value) +{ #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" if (spit_transitions_motion_get_duration_msec (self) != value) { -#line 1295 "TransitionsInterfaces.c" - gint _tmp0_; -#line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = value; #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_duration_msec = _tmp0_; + self->priv->_duration_msec = value; #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "duration-msec"); -#line 1303 "TransitionsInterfaces.c" + g_object_notify_by_pspec ((GObject *) self, spit_transitions_motion_properties[SPIT_TRANSITIONS_MOTION_DURATION_MSEC_PROPERTY]); +#line 1487 "TransitionsInterfaces.c" } } -gint spit_transitions_motion_get_total_frames (SpitTransitionsMotion* self) { +gint +spit_transitions_motion_get_total_frames (SpitTransitionsMotion* self) +{ gint result; gint _tmp0_; gint _tmp1_; @@ -1318,11 +1504,13 @@ gint spit_transitions_motion_get_total_frames (SpitTransitionsMotion* self) { result = (gint) (((gdouble) _tmp0_) * (((gdouble) _tmp1_) / 1000.0)); #line 144 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 1322 "TransitionsInterfaces.c" +#line 1508 "TransitionsInterfaces.c" } -gint spit_transitions_motion_get_tick_msec (SpitTransitionsMotion* self) { +gint +spit_transitions_motion_get_tick_msec (SpitTransitionsMotion* self) +{ gint result; gint _tmp0_; #line 152 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1333,11 +1521,13 @@ gint spit_transitions_motion_get_tick_msec (SpitTransitionsMotion* self) { result = (gint) (1000.0 / ((gdouble) _tmp0_)); #line 153 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 1337 "TransitionsInterfaces.c" +#line 1525 "TransitionsInterfaces.c" } -static void spit_transitions_motion_class_init (SpitTransitionsMotionClass * klass) { +static void +spit_transitions_motion_class_init (SpitTransitionsMotionClass * klass) +{ #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_motion_parent_class = g_type_class_peek_parent (klass); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1364,55 +1554,59 @@ static void spit_transitions_motion_class_init (SpitTransitionsMotionClass * kla G_OBJECT_CLASS (klass)->set_property = _vala_spit_transitions_motion_set_property; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_CLASS (klass)->finalize = spit_transitions_motion_finalize; -#line 1368 "TransitionsInterfaces.c" +#line 1558 "TransitionsInterfaces.c" /** * Returns the direction the transition should occur in (if pertinent to the {@link Effect}. */ #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_DIRECTION_PROPERTY, g_param_spec_enum ("direction", "direction", "direction", SPIT_TRANSITIONS_TYPE_DIRECTION, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1374 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_DIRECTION_PROPERTY, spit_transitions_motion_properties[SPIT_TRANSITIONS_MOTION_DIRECTION_PROPERTY] = g_param_spec_enum ("direction", "direction", "direction", SPIT_TRANSITIONS_TYPE_DIRECTION, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 1564 "TransitionsInterfaces.c" /** * Returns the frames per second of the {@link Effect}. */ #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_FPS_PROPERTY, g_param_spec_int ("fps", "fps", "fps", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1380 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_FPS_PROPERTY, spit_transitions_motion_properties[SPIT_TRANSITIONS_MOTION_FPS_PROPERTY] = g_param_spec_int ("fps", "fps", "fps", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 1570 "TransitionsInterfaces.c" /** * Returns the amount of time the transition should take (in milliseconds). */ #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_DURATION_MSEC_PROPERTY, g_param_spec_int ("duration-msec", "duration-msec", "duration-msec", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1386 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_DURATION_MSEC_PROPERTY, spit_transitions_motion_properties[SPIT_TRANSITIONS_MOTION_DURATION_MSEC_PROPERTY] = g_param_spec_int ("duration-msec", "duration-msec", "duration-msec", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 1576 "TransitionsInterfaces.c" /** * Returns the number of frames that should be required to perform the transition in the * expected {@link duration_msec}. */ #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES_PROPERTY, g_param_spec_int ("total-frames", "total-frames", "total-frames", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1393 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES_PROPERTY, spit_transitions_motion_properties[SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES_PROPERTY] = g_param_spec_int ("total-frames", "total-frames", "total-frames", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 1583 "TransitionsInterfaces.c" /** * Returns the approximate time between each frame draw (in milliseconds). */ #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_TICK_MSEC_PROPERTY, g_param_spec_int ("tick-msec", "tick-msec", "tick-msec", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1399 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_TICK_MSEC_PROPERTY, spit_transitions_motion_properties[SPIT_TRANSITIONS_MOTION_TICK_MSEC_PROPERTY] = g_param_spec_int ("tick-msec", "tick-msec", "tick-msec", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 1589 "TransitionsInterfaces.c" } -static void spit_transitions_motion_instance_init (SpitTransitionsMotion * self) { +static void +spit_transitions_motion_instance_init (SpitTransitionsMotion * self) +{ #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" self->priv = SPIT_TRANSITIONS_MOTION_GET_PRIVATE (self); -#line 1406 "TransitionsInterfaces.c" +#line 1598 "TransitionsInterfaces.c" } -static void spit_transitions_motion_finalize (GObject * obj) { +static void +spit_transitions_motion_finalize (GObject * obj) +{ SpitTransitionsMotion * self; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_TRANSITIONS_TYPE_MOTION, SpitTransitionsMotion); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_CLASS (spit_transitions_motion_parent_class)->finalize (obj); -#line 1416 "TransitionsInterfaces.c" +#line 1610 "TransitionsInterfaces.c" } @@ -1422,7 +1616,9 @@ static void spit_transitions_motion_finalize (GObject * obj) { * Some of Motion's information may not apply to a transition effect (such as Direction for a * fade effect). */ -GType spit_transitions_motion_get_type (void) { +GType +spit_transitions_motion_get_type (void) +{ static volatile gsize spit_transitions_motion_type_id__volatile = 0; if (g_once_init_enter (&spit_transitions_motion_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitTransitionsMotionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) spit_transitions_motion_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SpitTransitionsMotion), 0, (GInstanceInitFunc) spit_transitions_motion_instance_init, NULL }; @@ -1434,7 +1630,12 @@ GType spit_transitions_motion_get_type (void) { } -static void _vala_spit_transitions_motion_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_spit_transitions_motion_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ SpitTransitionsMotion * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SPIT_TRANSITIONS_TYPE_MOTION, SpitTransitionsMotion); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1469,18 +1670,23 @@ static void _vala_spit_transitions_motion_get_property (GObject * object, guint g_value_set_int (value, spit_transitions_motion_get_tick_msec (self)); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 1473 "TransitionsInterfaces.c" +#line 1674 "TransitionsInterfaces.c" default: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 1479 "TransitionsInterfaces.c" +#line 1680 "TransitionsInterfaces.c" } } -static void _vala_spit_transitions_motion_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { +static void +_vala_spit_transitions_motion_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec) +{ SpitTransitionsMotion * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SPIT_TRANSITIONS_TYPE_MOTION, SpitTransitionsMotion); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1503,13 +1709,13 @@ static void _vala_spit_transitions_motion_set_property (GObject * object, guint spit_transitions_motion_set_duration_msec (self, g_value_get_int (value)); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 1507 "TransitionsInterfaces.c" +#line 1713 "TransitionsInterfaces.c" default: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 1513 "TransitionsInterfaces.c" +#line 1719 "TransitionsInterfaces.c" } } @@ -1517,120 +1723,157 @@ static void _vala_spit_transitions_motion_set_property (GObject * object, guint /** * Returns an instance of the {@link Effect} this descriptor represents. */ -SpitTransitionsEffect* spit_transitions_descriptor_create (SpitTransitionsDescriptor* self, SpitHostInterface* host) { +SpitTransitionsEffect* +spit_transitions_descriptor_create (SpitTransitionsDescriptor* self, + SpitHostInterface* host) +{ #line 191 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self), NULL); #line 191 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->create (self, host); -#line 1526 "TransitionsInterfaces.c" +#line 1735 "TransitionsInterfaces.c" } -static void spit_transitions_descriptor_real_reserved0 (SpitTransitionsDescriptor* self) { +static void +spit_transitions_descriptor_real_reserved0 (SpitTransitionsDescriptor* self) +{ } -void spit_transitions_descriptor_reserved0 (SpitTransitionsDescriptor* self) { +void +spit_transitions_descriptor_reserved0 (SpitTransitionsDescriptor* self) +{ #line 196 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 196 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved0 (self); -#line 1539 "TransitionsInterfaces.c" +#line 1752 "TransitionsInterfaces.c" } -static void spit_transitions_descriptor_real_reserved1 (SpitTransitionsDescriptor* self) { +static void +spit_transitions_descriptor_real_reserved1 (SpitTransitionsDescriptor* self) +{ } -void spit_transitions_descriptor_reserved1 (SpitTransitionsDescriptor* self) { +void +spit_transitions_descriptor_reserved1 (SpitTransitionsDescriptor* self) +{ #line 197 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 197 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved1 (self); -#line 1552 "TransitionsInterfaces.c" +#line 1769 "TransitionsInterfaces.c" } -static void spit_transitions_descriptor_real_reserved2 (SpitTransitionsDescriptor* self) { +static void +spit_transitions_descriptor_real_reserved2 (SpitTransitionsDescriptor* self) +{ } -void spit_transitions_descriptor_reserved2 (SpitTransitionsDescriptor* self) { +void +spit_transitions_descriptor_reserved2 (SpitTransitionsDescriptor* self) +{ #line 198 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 198 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved2 (self); -#line 1565 "TransitionsInterfaces.c" +#line 1786 "TransitionsInterfaces.c" } -static void spit_transitions_descriptor_real_reserved3 (SpitTransitionsDescriptor* self) { +static void +spit_transitions_descriptor_real_reserved3 (SpitTransitionsDescriptor* self) +{ } -void spit_transitions_descriptor_reserved3 (SpitTransitionsDescriptor* self) { +void +spit_transitions_descriptor_reserved3 (SpitTransitionsDescriptor* self) +{ #line 199 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 199 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved3 (self); -#line 1578 "TransitionsInterfaces.c" +#line 1803 "TransitionsInterfaces.c" } -static void spit_transitions_descriptor_real_reserved4 (SpitTransitionsDescriptor* self) { +static void +spit_transitions_descriptor_real_reserved4 (SpitTransitionsDescriptor* self) +{ } -void spit_transitions_descriptor_reserved4 (SpitTransitionsDescriptor* self) { +void +spit_transitions_descriptor_reserved4 (SpitTransitionsDescriptor* self) +{ #line 200 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 200 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved4 (self); -#line 1591 "TransitionsInterfaces.c" +#line 1820 "TransitionsInterfaces.c" } -static void spit_transitions_descriptor_real_reserved5 (SpitTransitionsDescriptor* self) { +static void +spit_transitions_descriptor_real_reserved5 (SpitTransitionsDescriptor* self) +{ } -void spit_transitions_descriptor_reserved5 (SpitTransitionsDescriptor* self) { +void +spit_transitions_descriptor_reserved5 (SpitTransitionsDescriptor* self) +{ #line 201 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 201 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved5 (self); -#line 1604 "TransitionsInterfaces.c" +#line 1837 "TransitionsInterfaces.c" } -static void spit_transitions_descriptor_real_reserved6 (SpitTransitionsDescriptor* self) { +static void +spit_transitions_descriptor_real_reserved6 (SpitTransitionsDescriptor* self) +{ } -void spit_transitions_descriptor_reserved6 (SpitTransitionsDescriptor* self) { +void +spit_transitions_descriptor_reserved6 (SpitTransitionsDescriptor* self) +{ #line 202 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 202 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved6 (self); -#line 1617 "TransitionsInterfaces.c" +#line 1854 "TransitionsInterfaces.c" } -static void spit_transitions_descriptor_real_reserved7 (SpitTransitionsDescriptor* self) { +static void +spit_transitions_descriptor_real_reserved7 (SpitTransitionsDescriptor* self) +{ } -void spit_transitions_descriptor_reserved7 (SpitTransitionsDescriptor* self) { +void +spit_transitions_descriptor_reserved7 (SpitTransitionsDescriptor* self) +{ #line 203 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 203 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved7 (self); -#line 1630 "TransitionsInterfaces.c" +#line 1871 "TransitionsInterfaces.c" } -static void spit_transitions_descriptor_base_init (SpitTransitionsDescriptorIface * iface) { +static void +spit_transitions_descriptor_base_init (SpitTransitionsDescriptorIface * iface) +{ #line 187 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" static gboolean initialized = FALSE; #line 187 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1653,7 +1896,7 @@ static void spit_transitions_descriptor_base_init (SpitTransitionsDescriptorIfac iface->reserved6 = spit_transitions_descriptor_real_reserved6; #line 187 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" iface->reserved7 = spit_transitions_descriptor_real_reserved7; -#line 1657 "TransitionsInterfaces.c" +#line 1900 "TransitionsInterfaces.c" } } @@ -1661,7 +1904,9 @@ static void spit_transitions_descriptor_base_init (SpitTransitionsDescriptorIfac /** * A Descriptor offers a factory method for creating {@link Effect} instances. */ -GType spit_transitions_descriptor_get_type (void) { +GType +spit_transitions_descriptor_get_type (void) +{ static volatile gsize spit_transitions_descriptor_type_id__volatile = 0; if (g_once_init_enter (&spit_transitions_descriptor_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitTransitionsDescriptorIface), (GBaseInitFunc) spit_transitions_descriptor_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -1685,12 +1930,16 @@ GType spit_transitions_descriptor_get_type (void) { * @param min_fps The minimum FPS before the effect is consider "ruined". * Return zero if any FPS is acceptable. */ -void spit_transitions_effect_get_fps (SpitTransitionsEffect* self, gint* desired_fps, gint* min_fps) { +void +spit_transitions_effect_get_fps (SpitTransitionsEffect* self, + gint* desired_fps, + gint* min_fps) +{ #line 240 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 240 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->get_fps (self, desired_fps, min_fps); -#line 1694 "TransitionsInterfaces.c" +#line 1943 "TransitionsInterfaces.c" } @@ -1699,24 +1948,30 @@ void spit_transitions_effect_get_fps (SpitTransitionsEffect* self, gint* desired * * All state should be reset. The frame number, which is not supplied, is one. */ -void spit_transitions_effect_start (SpitTransitionsEffect* self, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) { +void +spit_transitions_effect_start (SpitTransitionsEffect* self, + SpitTransitionsVisuals* visuals, + SpitTransitionsMotion* motion) +{ #line 247 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 247 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->start (self, visuals, motion); -#line 1708 "TransitionsInterfaces.c" +#line 1961 "TransitionsInterfaces.c" } /** * Return true if the Effect needs the background cleared prior to calling {@link paint}. */ -gboolean spit_transitions_effect_needs_clear_background (SpitTransitionsEffect* self) { +gboolean +spit_transitions_effect_needs_clear_background (SpitTransitionsEffect* self) +{ #line 252 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self), FALSE); #line 252 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->needs_clear_background (self); -#line 1720 "TransitionsInterfaces.c" +#line 1975 "TransitionsInterfaces.c" } @@ -1731,12 +1986,20 @@ gboolean spit_transitions_effect_needs_clear_background (SpitTransitionsEffect* * @param height The height (in pixels) of the Cairo surface. * @param frame_number The ''one-based'' frame being drawn. */ -void spit_transitions_effect_paint (SpitTransitionsEffect* self, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { +void +spit_transitions_effect_paint (SpitTransitionsEffect* self, + SpitTransitionsVisuals* visuals, + SpitTransitionsMotion* motion, + cairo_t* ctx, + gint width, + gint height, + gint frame_number) +{ #line 265 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 265 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->paint (self, visuals, motion, ctx, width, height, frame_number); -#line 1740 "TransitionsInterfaces.c" +#line 2003 "TransitionsInterfaces.c" } @@ -1749,12 +2012,17 @@ void spit_transitions_effect_paint (SpitTransitionsEffect* self, SpitTransitions * * @param frame_number The ''one-based'' frame being advanced to. */ -void spit_transitions_effect_advance (SpitTransitionsEffect* self, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) { +void +spit_transitions_effect_advance (SpitTransitionsEffect* self, + SpitTransitionsVisuals* visuals, + SpitTransitionsMotion* motion, + gint frame_number) +{ #line 277 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 277 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->advance (self, visuals, motion, frame_number); -#line 1758 "TransitionsInterfaces.c" +#line 2026 "TransitionsInterfaces.c" } @@ -1763,120 +2031,156 @@ void spit_transitions_effect_advance (SpitTransitionsEffect* self, SpitTransitio * * It only needs to reset state if {@link start} is called again. */ -void spit_transitions_effect_cancel (SpitTransitionsEffect* self) { +void +spit_transitions_effect_cancel (SpitTransitionsEffect* self) +{ #line 284 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 284 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->cancel (self); -#line 1772 "TransitionsInterfaces.c" +#line 2042 "TransitionsInterfaces.c" } -static void spit_transitions_effect_real_reserved0 (SpitTransitionsEffect* self) { +static void +spit_transitions_effect_real_reserved0 (SpitTransitionsEffect* self) +{ } -void spit_transitions_effect_reserved0 (SpitTransitionsEffect* self) { +void +spit_transitions_effect_reserved0 (SpitTransitionsEffect* self) +{ #line 289 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 289 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved0 (self); -#line 1785 "TransitionsInterfaces.c" +#line 2059 "TransitionsInterfaces.c" } -static void spit_transitions_effect_real_reserved1 (SpitTransitionsEffect* self) { +static void +spit_transitions_effect_real_reserved1 (SpitTransitionsEffect* self) +{ } -void spit_transitions_effect_reserved1 (SpitTransitionsEffect* self) { +void +spit_transitions_effect_reserved1 (SpitTransitionsEffect* self) +{ #line 290 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 290 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved1 (self); -#line 1798 "TransitionsInterfaces.c" +#line 2076 "TransitionsInterfaces.c" } -static void spit_transitions_effect_real_reserved2 (SpitTransitionsEffect* self) { +static void +spit_transitions_effect_real_reserved2 (SpitTransitionsEffect* self) +{ } -void spit_transitions_effect_reserved2 (SpitTransitionsEffect* self) { +void +spit_transitions_effect_reserved2 (SpitTransitionsEffect* self) +{ #line 291 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 291 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved2 (self); -#line 1811 "TransitionsInterfaces.c" +#line 2093 "TransitionsInterfaces.c" } -static void spit_transitions_effect_real_reserved3 (SpitTransitionsEffect* self) { +static void +spit_transitions_effect_real_reserved3 (SpitTransitionsEffect* self) +{ } -void spit_transitions_effect_reserved3 (SpitTransitionsEffect* self) { +void +spit_transitions_effect_reserved3 (SpitTransitionsEffect* self) +{ #line 292 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 292 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved3 (self); -#line 1824 "TransitionsInterfaces.c" +#line 2110 "TransitionsInterfaces.c" } -static void spit_transitions_effect_real_reserved4 (SpitTransitionsEffect* self) { +static void +spit_transitions_effect_real_reserved4 (SpitTransitionsEffect* self) +{ } -void spit_transitions_effect_reserved4 (SpitTransitionsEffect* self) { +void +spit_transitions_effect_reserved4 (SpitTransitionsEffect* self) +{ #line 293 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 293 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved4 (self); -#line 1837 "TransitionsInterfaces.c" +#line 2127 "TransitionsInterfaces.c" } -static void spit_transitions_effect_real_reserved5 (SpitTransitionsEffect* self) { +static void +spit_transitions_effect_real_reserved5 (SpitTransitionsEffect* self) +{ } -void spit_transitions_effect_reserved5 (SpitTransitionsEffect* self) { +void +spit_transitions_effect_reserved5 (SpitTransitionsEffect* self) +{ #line 294 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 294 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved5 (self); -#line 1850 "TransitionsInterfaces.c" +#line 2144 "TransitionsInterfaces.c" } -static void spit_transitions_effect_real_reserved6 (SpitTransitionsEffect* self) { +static void +spit_transitions_effect_real_reserved6 (SpitTransitionsEffect* self) +{ } -void spit_transitions_effect_reserved6 (SpitTransitionsEffect* self) { +void +spit_transitions_effect_reserved6 (SpitTransitionsEffect* self) +{ #line 295 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 295 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved6 (self); -#line 1863 "TransitionsInterfaces.c" +#line 2161 "TransitionsInterfaces.c" } -static void spit_transitions_effect_real_reserved7 (SpitTransitionsEffect* self) { +static void +spit_transitions_effect_real_reserved7 (SpitTransitionsEffect* self) +{ } -void spit_transitions_effect_reserved7 (SpitTransitionsEffect* self) { +void +spit_transitions_effect_reserved7 (SpitTransitionsEffect* self) +{ #line 296 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 296 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved7 (self); -#line 1876 "TransitionsInterfaces.c" +#line 2178 "TransitionsInterfaces.c" } -static void spit_transitions_effect_base_init (SpitTransitionsEffectIface * iface) { +static void +spit_transitions_effect_base_init (SpitTransitionsEffectIface * iface) +{ #line 229 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" static gboolean initialized = FALSE; #line 229 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1899,7 +2203,7 @@ static void spit_transitions_effect_base_init (SpitTransitionsEffectIface * ifac iface->reserved6 = spit_transitions_effect_real_reserved6; #line 229 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" iface->reserved7 = spit_transitions_effect_real_reserved7; -#line 1903 "TransitionsInterfaces.c" +#line 2207 "TransitionsInterfaces.c" } } @@ -1927,7 +2231,9 @@ static void spit_transitions_effect_base_init (SpitTransitionsEffectIface * ifac * * An instance may be reused and should be prepared for restarts. */ -GType spit_transitions_effect_get_type (void) { +GType +spit_transitions_effect_get_type (void) +{ static volatile gsize spit_transitions_effect_type_id__volatile = 0; if (g_once_init_enter (&spit_transitions_effect_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitTransitionsEffectIface), (GBaseInitFunc) spit_transitions_effect_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; diff --git a/src/publishing/APIGlue.c b/src/publishing/APIGlue.c index 08c99ff..66f79d9 100644 --- a/src/publishing/APIGlue.c +++ b/src/publishing/APIGlue.c @@ -1,4 +1,4 @@ -/* APIGlue.c generated by valac 0.36.6, the Vala compiler +/* APIGlue.c generated by valac 0.40.4, the Vala compiler * generated from APIGlue.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include "shotwell-plugin-dev-1.0.h" @@ -67,6 +68,11 @@ typedef struct _ThumbnailSourceClass ThumbnailSourceClass; typedef struct _MediaSource MediaSource; typedef struct _MediaSourceClass MediaSourceClass; +enum { + PUBLISHING_GLUE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER_0_PROPERTY, + PUBLISHING_GLUE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER_NUM_PROPERTIES +}; +static GParamSpec* publishing_glue_media_source_publishable_wrapper_properties[PUBLISHING_GLUE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) @@ -277,11 +283,9 @@ GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; #define PUBLISHING_GLUE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapperPrivate)) -enum { - PUBLISHING_GLUE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER_DUMMY_PROPERTY -}; PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_new (MediaSource* to_wrap); -PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_construct (GType object_type, MediaSource* to_wrap); +PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_construct (GType object_type, + MediaSource* to_wrap); static void publishing_glue_media_source_publishable_wrapper_setup_parameters (PublishingGlueMediaSourcePublishableWrapper* self); void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMediaSourcePublishableWrapper* self); gchar* media_source_get_basename (MediaSource* self); @@ -291,7 +295,10 @@ GType event_source_get_type (void) G_GNUC_CONST; GType event_get_type (void) G_GNUC_CONST; Event* media_source_get_event (MediaSource* self); gchar* event_source_get_comment (EventSource* self); -GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (PublishingGlueMediaSourcePublishableWrapper* self, gint content_major_axis, gboolean strip_metadata, GError** error); +GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (PublishingGlueMediaSourcePublishableWrapper* self, + gint content_major_axis, + gboolean strip_metadata, + GError** error); GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; @@ -304,83 +311,119 @@ Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); Scaling* scaling_dup (const Scaling* self); void scaling_free (Scaling* self); -void scaling_for_best_fit (gint pixels, gboolean scale_up, Scaling* result); +void scaling_for_best_fit (gint pixels, + gboolean scale_up, + Scaling* result); void scaling_for_original (Scaling* result); GType jpeg_quality_get_type (void) G_GNUC_CONST; GType photo_file_format_get_type (void) G_GNUC_CONST; -void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error); +void photo_export (Photo* self, + GFile* dest_file, + Scaling* scaling, + JpegQuality quality, + PhotoFileFormat export_format, + gboolean direct_copy_unmodified, + gboolean export_metadata, + GError** error); gchar* data_object_get_name (DataObject* self); GType video_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; -void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext); +void disassemble_filename (const gchar* basename, + gchar* * name, + gchar* * ext); GFile* media_source_get_file (MediaSource* self); -void video_export (Video* self, GFile* dest_file, GError** error); +void video_export (Video* self, + GFile* dest_file, + GError** error); static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishing_name (SpitPublishingPublishable* base); -static gchar* publishing_glue_media_source_publishable_wrapper_real_get_param_string (SpitPublishingPublishable* base, const gchar* name); -static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publishing_keywords (SpitPublishingPublishable* base, int* result_length1); +static gchar* publishing_glue_media_source_publishable_wrapper_real_get_param_string (SpitPublishingPublishable* base, + const gchar* name); +static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publishing_keywords (SpitPublishingPublishable* base, + int* result_length1); GType tag_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType tag_source_collection_get_type (void) G_GNUC_CONST; -GeeSortedSet* tag_source_collection_fetch_sorted_for_source (TagSourceCollection* self, MediaSource* photo); -static void _vala_array_add63 (gchar** * array, int* length, int* size, gchar* value); -static gchar** _vala_array_dup20 (gchar** self, int length); +GeeSortedSet* tag_source_collection_fetch_sorted_for_source (TagSourceCollection* self, + MediaSource* photo); +static void _vala_array_add63 (gchar** * array, + int* length, + int* size, + gchar* value); +static gchar** _vala_array_dup20 (gchar** self, + int length); static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable_wrapper_real_get_media_type (SpitPublishingPublishable* base); static GFile* publishing_glue_media_source_publishable_wrapper_real_get_serialized_file (SpitPublishingPublishable* base); static GDateTime* publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time (SpitPublishingPublishable* base); time_t media_source_get_exposure_time (MediaSource* self); static void publishing_glue_media_source_publishable_wrapper_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 16 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return self ? g_object_ref (self) : NULL; -#line 349 "APIGlue.c" +#line 388 "APIGlue.c" } -PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_construct (GType object_type, MediaSource* to_wrap) { +PublishingGlueMediaSourcePublishableWrapper* +publishing_glue_media_source_publishable_wrapper_construct (GType object_type, + MediaSource* to_wrap) +{ PublishingGlueMediaSourcePublishableWrapper * self = NULL; MediaSource* _tmp0_; - MediaSource* _tmp1_; #line 15 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (to_wrap), NULL); #line 15 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" self = (PublishingGlueMediaSourcePublishableWrapper*) g_object_new (object_type, NULL); #line 16 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp0_ = to_wrap; -#line 16 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (to_wrap); #line 16 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (self->priv->wrapped); #line 16 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - self->priv->wrapped = _tmp1_; + self->priv->wrapped = _tmp0_; #line 17 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" publishing_glue_media_source_publishable_wrapper_setup_parameters (self); #line 15 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return self; -#line 373 "APIGlue.c" +#line 412 "APIGlue.c" } -PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_new (MediaSource* to_wrap) { +PublishingGlueMediaSourcePublishableWrapper* +publishing_glue_media_source_publishable_wrapper_new (MediaSource* to_wrap) +{ #line 15 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return publishing_glue_media_source_publishable_wrapper_construct (PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, to_wrap); -#line 380 "APIGlue.c" +#line 421 "APIGlue.c" } -void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMediaSourcePublishableWrapper* self) { +void +publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMediaSourcePublishableWrapper* self) +{ GFile* _tmp0_; GFile* _tmp1_; gchar* _tmp2_; @@ -394,7 +437,7 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe if (_tmp0_ == NULL) { #line 22 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return; -#line 398 "APIGlue.c" +#line 441 "APIGlue.c" } #line 24 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _tmp1_ = self->priv->serialized_file; @@ -406,7 +449,7 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe g_debug ("APIGlue.vala:24: cleaning up temporary publishing file '%s'.", _tmp3_); #line 24 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_free0 (_tmp3_); -#line 410 "APIGlue.c" +#line 453 "APIGlue.c" { GFile* _tmp4_; #line 27 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" @@ -415,7 +458,7 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe g_file_delete (_tmp4_, NULL, &_inner_error_); #line 27 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 419 "APIGlue.c" +#line 462 "APIGlue.c" goto __catch43_g_error; } } @@ -442,7 +485,7 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe _g_free0 (_tmp7_); #line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_error_free0 (err); -#line 446 "APIGlue.c" +#line 489 "APIGlue.c" } __finally43: #line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" @@ -453,17 +496,19 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe g_clear_error (&_inner_error_); #line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return; -#line 457 "APIGlue.c" +#line 500 "APIGlue.c" } #line 32 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (self->priv->serialized_file); #line 32 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" self->priv->serialized_file = NULL; -#line 463 "APIGlue.c" +#line 506 "APIGlue.c" } -static void publishing_glue_media_source_publishable_wrapper_setup_parameters (PublishingGlueMediaSourcePublishableWrapper* self) { +static void +publishing_glue_media_source_publishable_wrapper_setup_parameters (PublishingGlueMediaSourcePublishableWrapper* self) +{ GeeMap* _tmp0_; MediaSource* _tmp1_; gchar* _tmp2_; @@ -530,7 +575,7 @@ static void publishing_glue_media_source_publishable_wrapper_setup_parameters (P _g_object_unref0 (_tmp14_); #line 40 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" if (_tmp15_) { -#line 534 "APIGlue.c" +#line 579 "APIGlue.c" GeeMap* _tmp16_; MediaSource* _tmp17_; Event* _tmp18_; @@ -555,23 +600,28 @@ static void publishing_glue_media_source_publishable_wrapper_setup_parameters (P _g_free0 (_tmp21_); #line 41 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (_tmp19_); -#line 559 "APIGlue.c" +#line 604 "APIGlue.c" } else { GeeMap* _tmp22_; #line 43 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _tmp22_ = self->priv->param_string; #line 43 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" gee_map_set (_tmp22_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_EVENTCOMMENT, ""); -#line 566 "APIGlue.c" +#line 611 "APIGlue.c" } } -GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (PublishingGlueMediaSourcePublishableWrapper* self, gint content_major_axis, gboolean strip_metadata, GError** error) { +GFile* +publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (PublishingGlueMediaSourcePublishableWrapper* self, + gint content_major_axis, + gboolean strip_metadata, + GError** error) +{ GFile* result = NULL; MediaSource* _tmp0_; - GFile* _tmp63_; - GFile* _tmp64_; + GFile* _tmp60_; + GFile* _tmp61_; GError * _inner_error_ = NULL; #line 46 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" g_return_val_if_fail (PUBLISHING_GLUE_IS_MEDIA_SOURCE_PUBLISHABLE_WRAPPER (self), NULL); @@ -579,7 +629,7 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing _tmp0_ = self->priv->wrapped; #line 49 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO)) { -#line 583 "APIGlue.c" +#line 633 "APIGlue.c" LibraryPhoto* photo = NULL; MediaSource* _tmp1_; LibraryPhoto* _tmp2_; @@ -597,8 +647,8 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing GFile* _tmp13_; gchar* _tmp14_; gchar* _tmp15_; - GFile* _tmp30_; - GFile* _tmp31_; + GFile* _tmp27_; + GFile* _tmp28_; #line 50 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _tmp1_ = self->priv->wrapped; #line 50 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" @@ -646,52 +696,43 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing _g_free0 (_tmp15_); #line 55 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_free0 (_tmp12_); -#line 649 "APIGlue.c" +#line 699 "APIGlue.c" { Scaling _tmp16_ = {0}; - gint _tmp17_; Scaling scaling = {0}; - LibraryPhoto* _tmp21_; - GFile* _tmp22_; - Scaling _tmp23_; - gboolean _tmp24_; -#line 58 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp17_ = content_major_axis; + LibraryPhoto* _tmp19_; + GFile* _tmp20_; + Scaling _tmp21_; #line 58 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - if (_tmp17_ > 0) { -#line 662 "APIGlue.c" - gint _tmp18_; - Scaling _tmp19_ = {0}; -#line 59 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp18_ = content_major_axis; + if (content_major_axis > 0) { +#line 708 "APIGlue.c" + Scaling _tmp17_ = {0}; #line 59 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - scaling_for_best_fit (_tmp18_, FALSE, &_tmp19_); + scaling_for_best_fit (content_major_axis, FALSE, &_tmp17_); #line 59 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp16_ = _tmp19_; -#line 671 "APIGlue.c" + _tmp16_ = _tmp17_; +#line 714 "APIGlue.c" } else { - Scaling _tmp20_ = {0}; + Scaling _tmp18_ = {0}; #line 59 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - scaling_for_original (&_tmp20_); + scaling_for_original (&_tmp18_); #line 59 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp16_ = _tmp20_; -#line 678 "APIGlue.c" + _tmp16_ = _tmp18_; +#line 721 "APIGlue.c" } #line 58 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" scaling = _tmp16_; #line 60 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp21_ = photo; + _tmp19_ = photo; #line 60 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp22_ = to_file; + _tmp20_ = to_file; #line 60 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp23_ = scaling; + _tmp21_ = scaling; #line 60 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp24_ = strip_metadata; -#line 60 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PHOTO, Photo), _tmp22_, &_tmp23_, JPEG_QUALITY_HIGH, PHOTO_FILE_FORMAT_JFIF, FALSE, !_tmp24_, &_inner_error_); + photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PHOTO, Photo), _tmp20_, &_tmp21_, JPEG_QUALITY_HIGH, PHOTO_FILE_FORMAT_JFIF, FALSE, !strip_metadata, &_inner_error_); #line 60 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 694 "APIGlue.c" +#line 735 "APIGlue.c" goto __catch44_g_error; } } @@ -699,32 +740,32 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing __catch44_g_error: { GError* err = NULL; - LibraryPhoto* _tmp25_; - gchar* _tmp26_; - gchar* _tmp27_; - GError* _tmp28_; - GError* _tmp29_; + LibraryPhoto* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + GError* _tmp25_; + GError* _tmp26_; #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" err = _inner_error_; #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _inner_error_ = NULL; #line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp25_ = photo; + _tmp22_ = photo; #line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp26_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject)); + _tmp23_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject)); #line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp27_ = _tmp26_; + _tmp24_ = _tmp23_; #line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp28_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, "unable to serialize photo '%s' for publishing.", _tmp27_); + _tmp25_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, "unable to serialize photo '%s' for publishing.", _tmp24_); #line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp29_ = _tmp28_; + _tmp26_ = _tmp25_; #line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _g_free0 (_tmp27_); + _g_free0 (_tmp24_); #line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _inner_error_ = _tmp29_; + _inner_error_ = _tmp26_; #line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_error_free0 (err); -#line 727 "APIGlue.c" +#line 768 "APIGlue.c" goto __finally44; } __finally44: @@ -740,7 +781,7 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing _g_object_unref0 (photo); #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return NULL; -#line 743 "APIGlue.c" +#line 784 "APIGlue.c" } else { #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (to_file); @@ -752,136 +793,136 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing g_clear_error (&_inner_error_); #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return NULL; -#line 755 "APIGlue.c" +#line 796 "APIGlue.c" } } #line 66 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp30_ = to_file; + _tmp27_ = to_file; #line 66 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp31_ = _g_object_ref0 (_tmp30_); + _tmp28_ = _g_object_ref0 (_tmp27_); #line 66 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (self->priv->serialized_file); #line 66 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - self->priv->serialized_file = _tmp31_; + self->priv->serialized_file = _tmp28_; #line 49 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (to_file); #line 49 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (photo); -#line 770 "APIGlue.c" +#line 811 "APIGlue.c" } else { - MediaSource* _tmp32_; + MediaSource* _tmp29_; #line 67 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp32_ = self->priv->wrapped; + _tmp29_ = self->priv->wrapped; #line 67 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, TYPE_VIDEO)) { -#line 777 "APIGlue.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, TYPE_VIDEO)) { +#line 818 "APIGlue.c" Video* video = NULL; - MediaSource* _tmp33_; - Video* _tmp34_; + MediaSource* _tmp30_; + Video* _tmp31_; gchar* basename = NULL; gchar* extension = NULL; - Video* _tmp35_; - GFile* _tmp36_; - GFile* _tmp37_; - gchar* _tmp38_; - gchar* _tmp39_; - gchar* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; + Video* _tmp32_; + GFile* _tmp33_; + GFile* _tmp34_; + gchar* _tmp35_; + gchar* _tmp36_; + gchar* _tmp37_ = NULL; + gchar* _tmp38_ = NULL; GFile* to_file = NULL; - gint _tmp42_; - const gchar* _tmp43_; - gchar* _tmp44_; - gchar* _tmp45_; - GFile* _tmp46_; - GFile* _tmp47_; - Video* _tmp48_; + gint _tmp39_; + const gchar* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; + GFile* _tmp43_; + GFile* _tmp44_; + Video* _tmp45_; + gchar* _tmp46_; + gchar* _tmp47_; + GFile* _tmp48_; gchar* _tmp49_; gchar* _tmp50_; - GFile* _tmp51_; - gchar* _tmp52_; - gchar* _tmp53_; - GFile* _tmp61_; - GFile* _tmp62_; + GFile* _tmp58_; + GFile* _tmp59_; #line 68 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp33_ = self->priv->wrapped; + _tmp30_ = self->priv->wrapped; #line 68 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp34_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_VIDEO, Video)); + _tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_VIDEO, Video)); #line 68 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - video = _tmp34_; + video = _tmp31_; #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp35_ = video; + _tmp32_ = video; #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp36_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp33_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_MEDIA_SOURCE, MediaSource)); #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp37_ = _tmp36_; + _tmp34_ = _tmp33_; #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp38_ = g_file_get_basename (_tmp37_); + _tmp35_ = g_file_get_basename (_tmp34_); #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp39_ = _tmp38_; + _tmp36_ = _tmp35_; #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - disassemble_filename (_tmp39_, &_tmp40_, &_tmp41_); + disassemble_filename (_tmp36_, &_tmp37_, &_tmp38_); #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_free0 (basename); #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - basename = _tmp40_; + basename = _tmp37_; #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_free0 (extension); #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - extension = _tmp41_; + extension = _tmp38_; #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _g_free0 (_tmp39_); + _g_free0 (_tmp36_); #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _g_object_unref0 (_tmp37_); + _g_object_unref0 (_tmp34_); #line 74 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp42_ = publishing_glue_media_source_publishable_wrapper_name_ticker; + _tmp39_ = publishing_glue_media_source_publishable_wrapper_name_ticker; #line 74 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - publishing_glue_media_source_publishable_wrapper_name_ticker = _tmp42_ + 1; + publishing_glue_media_source_publishable_wrapper_name_ticker = _tmp39_ + 1; #line 74 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp43_ = extension; + _tmp40_ = extension; #line 74 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp44_ = g_strdup_printf ("publishing-%d.%s", _tmp42_, _tmp43_); + _tmp41_ = g_strdup_printf ("publishing-%d.%s", _tmp39_, _tmp40_); #line 74 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp45_ = _tmp44_; + _tmp42_ = _tmp41_; #line 74 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp46_ = g_file_new_for_path (_tmp45_); + _tmp43_ = g_file_new_for_path (_tmp42_); #line 74 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp47_ = _tmp46_; + _tmp44_ = _tmp43_; #line 74 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _g_free0 (_tmp45_); + _g_free0 (_tmp42_); #line 74 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - to_file = _tmp47_; + to_file = _tmp44_; #line 77 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp48_ = video; + _tmp45_ = video; #line 77 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp49_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_DATA_SOURCE, DataSource)); + _tmp46_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_DATA_SOURCE, DataSource)); #line 77 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp50_ = _tmp49_; + _tmp47_ = _tmp46_; #line 77 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp51_ = to_file; + _tmp48_ = to_file; #line 77 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp52_ = g_file_get_path (_tmp51_); + _tmp49_ = g_file_get_path (_tmp48_); #line 77 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp53_ = _tmp52_; + _tmp50_ = _tmp49_; #line 77 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" g_debug ("APIGlue.vala:77: writing video '%s' to temporary file '%s' for publish" \ -"ing.", _tmp50_, _tmp53_); -#line 77 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _g_free0 (_tmp53_); +"ing.", _tmp47_, _tmp50_); #line 77 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_free0 (_tmp50_); -#line 871 "APIGlue.c" +#line 77 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" + _g_free0 (_tmp47_); +#line 912 "APIGlue.c" { - Video* _tmp54_; - GFile* _tmp55_; + Video* _tmp51_; + GFile* _tmp52_; #line 80 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp54_ = video; + _tmp51_ = video; #line 80 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp55_ = to_file; + _tmp52_ = to_file; #line 80 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - video_export (_tmp54_, _tmp55_, &_inner_error_); + video_export (_tmp51_, _tmp52_, &_inner_error_); #line 80 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 883 "APIGlue.c" +#line 924 "APIGlue.c" goto __catch45_g_error; } } @@ -889,32 +930,32 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing __catch45_g_error: { GError* err = NULL; - Video* _tmp56_; - gchar* _tmp57_; - gchar* _tmp58_; - GError* _tmp59_; - GError* _tmp60_; + Video* _tmp53_; + gchar* _tmp54_; + gchar* _tmp55_; + GError* _tmp56_; + GError* _tmp57_; #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" err = _inner_error_; #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _inner_error_ = NULL; #line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp56_ = video; + _tmp53_ = video; #line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp57_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_DATA_OBJECT, DataObject)); + _tmp54_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_DATA_OBJECT, DataObject)); #line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp58_ = _tmp57_; + _tmp55_ = _tmp54_; #line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp59_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, "unable to serialize video '%s' for publishing.", _tmp58_); + _tmp56_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, "unable to serialize video '%s' for publishing.", _tmp55_); #line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp60_ = _tmp59_; + _tmp57_ = _tmp56_; #line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _g_free0 (_tmp58_); + _g_free0 (_tmp55_); #line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _inner_error_ = _tmp60_; + _inner_error_ = _tmp57_; #line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_error_free0 (err); -#line 916 "APIGlue.c" +#line 957 "APIGlue.c" goto __finally45; } __finally45: @@ -934,7 +975,7 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing _g_object_unref0 (video); #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return NULL; -#line 936 "APIGlue.c" +#line 977 "APIGlue.c" } else { #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (to_file); @@ -950,17 +991,17 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing g_clear_error (&_inner_error_); #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return NULL; -#line 952 "APIGlue.c" +#line 993 "APIGlue.c" } } #line 86 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp61_ = to_file; + _tmp58_ = to_file; #line 86 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp62_ = _g_object_ref0 (_tmp61_); + _tmp59_ = _g_object_ref0 (_tmp58_); #line 86 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (self->priv->serialized_file); #line 86 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - self->priv->serialized_file = _tmp62_; + self->priv->serialized_file = _tmp59_; #line 67 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (to_file); #line 67 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" @@ -969,27 +1010,29 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing _g_free0 (basename); #line 67 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (video); -#line 971 "APIGlue.c" +#line 1012 "APIGlue.c" } else { #line 88 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" g_error ("APIGlue.vala:88: MediaSourcePublishableWrapper.serialize_for_publishin" \ "g( ): unknown media type."); -#line 975 "APIGlue.c" +#line 1016 "APIGlue.c" } } #line 91 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp63_ = self->priv->serialized_file; + _tmp60_ = self->priv->serialized_file; #line 91 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp64_ = _g_object_ref0 (_tmp63_); + _tmp61_ = _g_object_ref0 (_tmp60_); #line 91 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - result = _tmp64_; + result = _tmp61_; #line 91 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return result; -#line 986 "APIGlue.c" +#line 1027 "APIGlue.c" } -static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishing_name (SpitPublishingPublishable* base) { +static gchar* +publishing_glue_media_source_publishable_wrapper_real_get_publishing_name (SpitPublishingPublishable* base) +{ PublishingGlueMediaSourcePublishableWrapper * self; gchar* result = NULL; gchar* _tmp0_ = NULL; @@ -1011,7 +1054,7 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishi _g_free0 (_tmp3_); #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" if (_tmp4_) { -#line 1012 "APIGlue.c" +#line 1055 "APIGlue.c" MediaSource* _tmp5_; gchar* _tmp6_; #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" @@ -1022,7 +1065,7 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishi _g_free0 (_tmp0_); #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _tmp0_ = _tmp6_; -#line 1023 "APIGlue.c" +#line 1066 "APIGlue.c" } else { gchar* _tmp7_; #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" @@ -1031,22 +1074,24 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishi _g_free0 (_tmp0_); #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _tmp0_ = _tmp7_; -#line 1032 "APIGlue.c" +#line 1075 "APIGlue.c" } #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" result = _tmp0_; #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return result; -#line 1038 "APIGlue.c" +#line 1081 "APIGlue.c" } -static gchar* publishing_glue_media_source_publishable_wrapper_real_get_param_string (SpitPublishingPublishable* base, const gchar* name) { +static gchar* +publishing_glue_media_source_publishable_wrapper_real_get_param_string (SpitPublishingPublishable* base, + const gchar* name) +{ PublishingGlueMediaSourcePublishableWrapper * self; gchar* result = NULL; GeeMap* _tmp0_; - const gchar* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 98 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper); #line 98 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" @@ -1054,56 +1099,65 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_param_st #line 99 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _tmp0_ = self->priv->param_string; #line 99 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp1_ = name; + _tmp1_ = gee_map_get (_tmp0_, name); #line 99 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp2_ = gee_map_get (_tmp0_, _tmp1_); -#line 99 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - result = (gchar*) _tmp2_; + result = (gchar*) _tmp1_; #line 99 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return result; -#line 1062 "APIGlue.c" +#line 1105 "APIGlue.c" } -static void _vala_array_add63 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add63 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" if ((*length) == (*size)) { #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" *size = (*size) ? (2 * (*size)) : 4; #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 1073 "APIGlue.c" +#line 1121 "APIGlue.c" } #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" (*array)[(*length)++] = value; #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" (*array)[*length] = NULL; -#line 1079 "APIGlue.c" +#line 1127 "APIGlue.c" } -static gchar** _vala_array_dup20 (gchar** self, int length) { +static gchar** +_vala_array_dup20 (gchar** self, + int length) +{ gchar** result; int i; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" result = g_new0 (gchar*, length + 1); #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" for (i = 0; i < length; i++) { -#line 1090 "APIGlue.c" +#line 1141 "APIGlue.c" gchar* _tmp0_; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _tmp0_ = g_strdup (self[i]); #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" result[i] = _tmp0_; -#line 1096 "APIGlue.c" +#line 1147 "APIGlue.c" } #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return result; -#line 1100 "APIGlue.c" +#line 1151 "APIGlue.c" } -static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publishing_keywords (SpitPublishingPublishable* base, int* result_length1) { +static gchar** +publishing_glue_media_source_publishable_wrapper_real_get_publishing_keywords (SpitPublishingPublishable* base, + int* result_length1) +{ PublishingGlueMediaSourcePublishableWrapper * self; gchar** result = NULL; gchar** _result_ = NULL; @@ -1115,15 +1169,15 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish MediaSource* _tmp2_; GeeSortedSet* _tmp3_; GeeCollection* _tmp4_; - gchar** _tmp14_ = NULL; - gint _tmp14__length1 = 0; - gint __tmp14__size_ = 0; - gchar** _tmp15_; - gint _tmp15__length1; + gchar** _tmp13_ = NULL; + gint _tmp13__length1 = 0; + gint __tmp13__size_ = 0; + gchar** _tmp14_; + gint _tmp14__length1; + gchar** _tmp16_; + gint _tmp16__length1; gchar** _tmp17_; gint _tmp17__length1; - gchar** _tmp18_; - gint _tmp18__length1; #line 102 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper); #line 103 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" @@ -1146,7 +1200,7 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish _tmp4_ = tagset; #line 106 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" if (_tmp4_ != NULL) { -#line 1147 "APIGlue.c" +#line 1201 "APIGlue.c" { GeeIterator* _tag_it = NULL; GeeCollection* _tmp5_; @@ -1159,107 +1213,106 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish _tag_it = _tmp6_; #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" while (TRUE) { -#line 1160 "APIGlue.c" +#line 1214 "APIGlue.c" GeeIterator* _tmp7_; - gboolean _tmp8_; Tag* tag = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; - gchar** _tmp11_; - gint _tmp11__length1; - Tag* _tmp12_; - gchar* _tmp13_; + GeeIterator* _tmp8_; + gpointer _tmp9_; + gchar** _tmp10_; + gint _tmp10__length1; + Tag* _tmp11_; + gchar* _tmp12_; #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _tmp7_ = _tag_it; #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp8_ = gee_iterator_next (_tmp7_); -#line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp7_)) { #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" break; -#line 1178 "APIGlue.c" +#line 1229 "APIGlue.c" } #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp9_ = _tag_it; + _tmp8_ = _tag_it; #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp9_ = gee_iterator_get (_tmp8_); #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - tag = (Tag*) _tmp10_; + tag = (Tag*) _tmp9_; #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp11_ = _result_; + _tmp10_ = _result_; #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp11__length1 = _result__length1; + _tmp10__length1 = _result__length1; #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp12_ = tag; + _tmp11_ = tag; #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp13_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject)); + _tmp12_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject)); #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _vala_array_add63 (&_result_, &_result__length1, &__result__size_, _tmp13_); + _vala_array_add63 (&_result_, &_result__length1, &__result__size_, _tmp12_); #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (tag); -#line 1198 "APIGlue.c" +#line 1249 "APIGlue.c" } #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (_tag_it); -#line 1202 "APIGlue.c" +#line 1253 "APIGlue.c" } } #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp15_ = _result_; + _tmp14_ = _result_; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp15__length1 = _result__length1; + _tmp14__length1 = _result__length1; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - if (_tmp15__length1 > 0) { -#line 1211 "APIGlue.c" - gchar** _tmp16_; - gint _tmp16__length1; + if (_tmp14__length1 > 0) { +#line 1262 "APIGlue.c" + gchar** _tmp15_; + gint _tmp15__length1; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp16_ = _result_; + _tmp15_ = _result_; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp16__length1 = _result__length1; + _tmp15__length1 = _result__length1; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp14_ = _tmp16_; + _tmp13_ = _tmp15_; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp14__length1 = _tmp16__length1; + _tmp13__length1 = _tmp15__length1; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - __tmp14__size_ = _tmp14__length1; -#line 1224 "APIGlue.c" + __tmp13__size_ = _tmp13__length1; +#line 1275 "APIGlue.c" } else { #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp14_ = NULL; + _tmp13_ = NULL; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp14__length1 = 0; + _tmp13__length1 = 0; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - __tmp14__size_ = _tmp14__length1; -#line 1232 "APIGlue.c" + __tmp13__size_ = _tmp13__length1; +#line 1283 "APIGlue.c" } #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp17_ = (_tmp14_ != NULL) ? _vala_array_dup20 (_tmp14_, _tmp14__length1) : ((gpointer) _tmp14_); + _tmp16_ = (_tmp13_ != NULL) ? _vala_array_dup20 (_tmp13_, _tmp13__length1) : ((gpointer) _tmp13_); #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp17__length1 = _tmp14__length1; + _tmp16__length1 = _tmp13__length1; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp18__length1 = _tmp17__length1; + _tmp17__length1 = _tmp16__length1; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" if (result_length1) { #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - *result_length1 = _tmp18__length1; -#line 1246 "APIGlue.c" + *result_length1 = _tmp17__length1; +#line 1297 "APIGlue.c" } #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - result = _tmp18_; + result = _tmp17_; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (tagset); #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) g_free), NULL); #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return result; -#line 1256 "APIGlue.c" +#line 1307 "APIGlue.c" } -static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable_wrapper_real_get_media_type (SpitPublishingPublishable* base) { +static SpitPublishingPublisherMediaType +publishing_glue_media_source_publishable_wrapper_real_get_media_type (SpitPublishingPublishable* base) +{ PublishingGlueMediaSourcePublishableWrapper * self; SpitPublishingPublisherMediaType result = 0; MediaSource* _tmp0_; @@ -1273,7 +1326,7 @@ static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO; #line 117 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return result; -#line 1274 "APIGlue.c" +#line 1327 "APIGlue.c" } else { MediaSource* _tmp1_; #line 118 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" @@ -1284,19 +1337,21 @@ static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO; #line 119 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return result; -#line 1285 "APIGlue.c" +#line 1338 "APIGlue.c" } else { #line 121 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_NONE; #line 121 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return result; -#line 1291 "APIGlue.c" +#line 1344 "APIGlue.c" } } } -static GFile* publishing_glue_media_source_publishable_wrapper_real_get_serialized_file (SpitPublishingPublishable* base) { +static GFile* +publishing_glue_media_source_publishable_wrapper_real_get_serialized_file (SpitPublishingPublishable* base) +{ PublishingGlueMediaSourcePublishableWrapper * self; GFile* result = NULL; GFile* _tmp0_; @@ -1311,44 +1366,47 @@ static GFile* publishing_glue_media_source_publishable_wrapper_real_get_serializ result = _tmp1_; #line 125 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return result; -#line 1312 "APIGlue.c" +#line 1367 "APIGlue.c" } -static GDateTime* publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time (SpitPublishingPublishable* base) { +static GDateTime* +publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time (SpitPublishingPublishable* base) +{ PublishingGlueMediaSourcePublishableWrapper * self; GDateTime* result = NULL; MediaSource* _tmp0_; - time_t _tmp1_; - GDateTime* _tmp2_; + GDateTime* _tmp1_; #line 128 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper); #line 129 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _tmp0_ = self->priv->wrapped; #line 129 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp1_ = media_source_get_exposure_time (_tmp0_); -#line 129 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp2_ = g_date_time_new_from_unix_local ((gint64) _tmp1_); + _tmp1_ = g_date_time_new_from_unix_local ((gint64) media_source_get_exposure_time (_tmp0_)); #line 129 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - result = _tmp2_; + result = _tmp1_; #line 129 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return result; -#line 1334 "APIGlue.c" +#line 1388 "APIGlue.c" } -static void publishing_glue_media_source_publishable_wrapper_class_init (PublishingGlueMediaSourcePublishableWrapperClass * klass) { +static void +publishing_glue_media_source_publishable_wrapper_class_init (PublishingGlueMediaSourcePublishableWrapperClass * klass) +{ #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" publishing_glue_media_source_publishable_wrapper_parent_class = g_type_class_peek_parent (klass); #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" g_type_class_add_private (klass, sizeof (PublishingGlueMediaSourcePublishableWrapperPrivate)); #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" G_OBJECT_CLASS (klass)->finalize = publishing_glue_media_source_publishable_wrapper_finalize; -#line 1345 "APIGlue.c" +#line 1401 "APIGlue.c" } -static void publishing_glue_media_source_publishable_wrapper_spit_publishing_publishable_interface_init (SpitPublishingPublishableIface * iface) { +static void +publishing_glue_media_source_publishable_wrapper_spit_publishing_publishable_interface_init (SpitPublishingPublishableIface * iface) +{ #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" publishing_glue_media_source_publishable_wrapper_spit_publishing_publishable_parent_iface = g_type_interface_peek_parent (iface); #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" @@ -1363,11 +1421,13 @@ static void publishing_glue_media_source_publishable_wrapper_spit_publishing_pub iface->get_serialized_file = (GFile* (*) (SpitPublishingPublishable *)) publishing_glue_media_source_publishable_wrapper_real_get_serialized_file; #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" iface->get_exposure_date_time = (GDateTime* (*) (SpitPublishingPublishable *)) publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time; -#line 1364 "APIGlue.c" +#line 1422 "APIGlue.c" } -static void publishing_glue_media_source_publishable_wrapper_instance_init (PublishingGlueMediaSourcePublishableWrapper * self) { +static void +publishing_glue_media_source_publishable_wrapper_instance_init (PublishingGlueMediaSourcePublishableWrapper * self) +{ GeeHashMap* _tmp0_; #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" self->priv = PUBLISHING_GLUE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER_GET_PRIVATE (self); @@ -1377,11 +1437,13 @@ static void publishing_glue_media_source_publishable_wrapper_instance_init (Publ _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 13 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" self->priv->param_string = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap); -#line 1378 "APIGlue.c" +#line 1438 "APIGlue.c" } -static void publishing_glue_media_source_publishable_wrapper_finalize (GObject * obj) { +static void +publishing_glue_media_source_publishable_wrapper_finalize (GObject * obj) +{ PublishingGlueMediaSourcePublishableWrapper * self; #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper); @@ -1393,11 +1455,13 @@ static void publishing_glue_media_source_publishable_wrapper_finalize (GObject * _g_object_unref0 (self->priv->param_string); #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" G_OBJECT_CLASS (publishing_glue_media_source_publishable_wrapper_parent_class)->finalize (obj); -#line 1394 "APIGlue.c" +#line 1456 "APIGlue.c" } -GType publishing_glue_media_source_publishable_wrapper_get_type (void) { +GType +publishing_glue_media_source_publishable_wrapper_get_type (void) +{ static volatile gsize publishing_glue_media_source_publishable_wrapper_type_id__volatile = 0; if (g_once_init_enter (&publishing_glue_media_source_publishable_wrapper_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingGlueMediaSourcePublishableWrapperClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_glue_media_source_publishable_wrapper_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGlueMediaSourcePublishableWrapper), 0, (GInstanceInitFunc) publishing_glue_media_source_publishable_wrapper_instance_init, NULL }; @@ -1411,7 +1475,11 @@ GType publishing_glue_media_source_publishable_wrapper_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -1423,7 +1491,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/publishing/Publishing.c b/src/publishing/Publishing.c index a502118..4bcc4db 100644 --- a/src/publishing/Publishing.c +++ b/src/publishing/Publishing.c @@ -1,4 +1,4 @@ -/* Publishing.c generated by valac 0.36.6, the Vala compiler +/* Publishing.c generated by valac 0.40.4, the Vala compiler * generated from Publishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -18,86 +19,128 @@ void publishing_init (GError** error); -static void _vala_array_add54 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add55 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add56 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add57 (gchar** * array, int* length, int* size, gchar* value); -void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1); +static void _vala_array_add54 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add55 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add56 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add57 (gchar** * array, + int* length, + int* size, + gchar* value); +void plugins_register_extension_point (GType type, + const gchar* name, + const gchar* icon_name, + gchar** core_ids, + int core_ids_length1); #define RESOURCES_PUBLISH "applications-internet" void publishing_terminate (void); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -static void _vala_array_add54 (gchar** * array, int* length, int* size, gchar* value) { +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); + + +static void +_vala_array_add54 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" if ((*length) == (*size)) { #line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 40 "Publishing.c" +#line 66 "Publishing.c" } #line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" (*array)[(*length)++] = value; #line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" (*array)[*length] = NULL; -#line 46 "Publishing.c" +#line 72 "Publishing.c" } -static void _vala_array_add55 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add55 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" if ((*length) == (*size)) { #line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 57 "Publishing.c" +#line 88 "Publishing.c" } #line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" (*array)[(*length)++] = value; #line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" (*array)[*length] = NULL; -#line 63 "Publishing.c" +#line 94 "Publishing.c" } -static void _vala_array_add56 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add56 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" if ((*length) == (*size)) { #line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 74 "Publishing.c" +#line 110 "Publishing.c" } #line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" (*array)[(*length)++] = value; #line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" (*array)[*length] = NULL; -#line 80 "Publishing.c" +#line 116 "Publishing.c" } -static void _vala_array_add57 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add57 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" if ((*length) == (*size)) { #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 91 "Publishing.c" +#line 132 "Publishing.c" } #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" (*array)[(*length)++] = value; #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" (*array)[*length] = NULL; -#line 97 "Publishing.c" +#line 138 "Publishing.c" } -void publishing_init (GError** error) { +void +publishing_init (GError** error) +{ gchar** core_ids = NULL; gchar** _tmp0_; gint core_ids_length1; @@ -164,15 +207,21 @@ void publishing_init (GError** error) { plugins_register_extension_point (SPIT_PUBLISHING_TYPE_SERVICE, _ ("Publishing"), RESOURCES_PUBLISH, _tmp9_, _tmp9__length1); #line 9 "/home/jens/Source/shotwell/src/publishing/Publishing.vala" core_ids = (_vala_array_free (core_ids, core_ids_length1, (GDestroyNotify) g_free), NULL); -#line 168 "Publishing.c" +#line 211 "Publishing.c" } -void publishing_terminate (void) { +void +publishing_terminate (void) +{ } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -184,7 +233,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/publishing/PublishingPluginHost.c b/src/publishing/PublishingPluginHost.c index aee15c9..8ee8e8d 100644 --- a/src/publishing/PublishingPluginHost.c +++ b/src/publishing/PublishingPluginHost.c @@ -1,4 +1,4 @@ -/* PublishingPluginHost.c generated by valac 0.36.6, the Vala compiler +/* PublishingPluginHost.c generated by valac 0.40.4, the Vala compiler * generated from PublishingPluginHost.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include "shotwell-plugin-dev-1.0.h" @@ -50,6 +51,11 @@ typedef struct _SpitPublishingConcretePublishingHostPrivate SpitPublishingConcre typedef struct _PublishingUIPublishingDialog PublishingUIPublishingDialog; typedef struct _PublishingUIPublishingDialogClass PublishingUIPublishingDialogClass; +enum { + SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_0_PROPERTY, + SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_NUM_PROPERTIES +}; +static GParamSpec* spit_publishing_concrete_publishing_host_properties[SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER (publishing_glue_media_source_publishable_wrapper_get_type ()) @@ -172,47 +178,74 @@ GType plugins_standard_host_interface_get_type (void) G_GNUC_CONST; GType spit_publishing_concrete_publishing_host_get_type (void) G_GNUC_CONST; GType publishing_ui_publishing_dialog_get_type (void) G_GNUC_CONST; #define SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHostPrivate)) -enum { - SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_DUMMY_PROPERTY -}; #define SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_PREPARE_STATUS_DESCRIPTION _ ("Preparing for upload") #define SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_UPLOAD_STATUS_DESCRIPTION _ ("Uploading %d of %d") #define SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_STATUS_PREPARATION_FRACTION 0.3 #define SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_STATUS_UPLOAD_FRACTION 0.7 -SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_new (SpitPublishingService* service, PublishingUIPublishingDialog* dialog, SpitPublishingPublishable** publishables, int publishables_length1); -SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_construct (GType object_type, SpitPublishingService* service, PublishingUIPublishingDialog* dialog, SpitPublishingPublishable** publishables, int publishables_length1); -PluginsStandardHostInterface* plugins_standard_host_interface_new (SpitPluggable* pluggable, const gchar* config_domain); -PluginsStandardHostInterface* plugins_standard_host_interface_construct (GType object_type, SpitPluggable* pluggable, const gchar* config_domain); -static SpitPublishingPublishable** _vala_array_dup18 (SpitPublishingPublishable** self, int length); +SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_new (SpitPublishingService* service, + PublishingUIPublishingDialog* dialog, + SpitPublishingPublishable** publishables, + int publishables_length1); +SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_construct (GType object_type, + SpitPublishingService* service, + PublishingUIPublishingDialog* dialog, + SpitPublishingPublishable** publishables, + int publishables_length1); +PluginsStandardHostInterface* plugins_standard_host_interface_new (SpitPluggable* pluggable, + const gchar* config_domain); +PluginsStandardHostInterface* plugins_standard_host_interface_construct (GType object_type, + SpitPluggable* pluggable, + const gchar* config_domain); +static SpitPublishingPublishable** _vala_array_dup18 (SpitPublishingPublishable** self, + int length); static void spit_publishing_concrete_publishing_host_on_login_clicked (SpitPublishingConcretePublishingHost* self); static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingConcretePublishingHost* self); GType publishing_glue_media_source_publishable_wrapper_get_type (void) G_GNUC_CONST; void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMediaSourcePublishableWrapper* self); -static void spit_publishing_concrete_publishing_host_report_plugin_upload_progress (SpitPublishingConcretePublishingHost* self, gint file_number, gdouble fraction_complete); +static void spit_publishing_concrete_publishing_host_report_plugin_upload_progress (SpitPublishingConcretePublishingHost* self, + gint file_number, + gdouble fraction_complete); SpitPublishingDialogPane* publishing_ui_publishing_dialog_get_active_pane (PublishingUIPublishingDialog* self); GType publishing_ui_concrete_dialog_pane_get_type (void) G_GNUC_CONST; GType publishing_ui_progress_pane_get_type (void) G_GNUC_CONST; -void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, const gchar* status_text, gdouble progress); +void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, + const gchar* status_text, + gdouble progress); static void spit_publishing_concrete_publishing_host_install_progress_pane (SpitPublishingConcretePublishingHost* self); PublishingUIProgressPane* publishing_ui_progress_pane_new (void); PublishingUIProgressPane* publishing_ui_progress_pane_construct (GType object_type); -void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog* self, SpitPublishingDialogPane* pane); -void spit_publishing_concrete_publishing_host_set_button_mode (SpitPublishingConcretePublishingHost* self, SpitPublishingPluginHostButtonMode mode); -static void spit_publishing_concrete_publishing_host_real_install_dialog_pane (SpitPublishingPluginHost* base, SpitPublishingDialogPane* pane, SpitPublishingPluginHostButtonMode button_mode); -static void spit_publishing_concrete_publishing_host_real_post_error (SpitPublishingPluginHost* base, GError* err); -PublishingUIStaticMessagePane* publishing_ui_static_message_pane_new (const gchar* message_string, gboolean enable_markup); -PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GType object_type, const gchar* message_string, gboolean enable_markup); +void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog* self, + SpitPublishingDialogPane* pane); +void spit_publishing_concrete_publishing_host_set_button_mode (SpitPublishingConcretePublishingHost* self, + SpitPublishingPluginHostButtonMode mode); +static void spit_publishing_concrete_publishing_host_real_install_dialog_pane (SpitPublishingPluginHost* base, + SpitPublishingDialogPane* pane, + SpitPublishingPluginHostButtonMode button_mode); +static void spit_publishing_concrete_publishing_host_real_post_error (SpitPublishingPluginHost* base, + GError* err); +PublishingUIStaticMessagePane* publishing_ui_static_message_pane_new (const gchar* message_string, + gboolean enable_markup); +PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GType object_type, + const gchar* message_string, + gboolean enable_markup); GType publishing_ui_static_message_pane_get_type (void) G_GNUC_CONST; void publishing_ui_publishing_dialog_set_close_button_mode (PublishingUIPublishingDialog* self); void publishing_ui_publishing_dialog_unlock_service (PublishingUIPublishingDialog* self); static void spit_publishing_concrete_publishing_host_real_stop_publishing (SpitPublishingPluginHost* base); void spit_publishing_concrete_publishing_host_start_publishing (SpitPublishingConcretePublishingHost* self); static SpitPublishingPublisher* spit_publishing_concrete_publishing_host_real_get_publisher (SpitPublishingPluginHost* base); -static void spit_publishing_concrete_publishing_host_real_install_static_message_pane (SpitPublishingPluginHost* base, const gchar* message, SpitPublishingPluginHostButtonMode button_mode); -static void spit_publishing_concrete_publishing_host_real_install_pango_message_pane (SpitPublishingPluginHost* base, const gchar* markup, SpitPublishingPluginHostButtonMode button_mode); +static void spit_publishing_concrete_publishing_host_real_install_static_message_pane (SpitPublishingPluginHost* base, + const gchar* message, + SpitPublishingPluginHostButtonMode button_mode); +static void spit_publishing_concrete_publishing_host_real_install_pango_message_pane (SpitPublishingPluginHost* base, + const gchar* markup, + SpitPublishingPluginHostButtonMode button_mode); static void spit_publishing_concrete_publishing_host_real_install_success_pane (SpitPublishingPluginHost* base); -PublishingUISuccessPane* publishing_ui_success_pane_new (SpitPublishingPublisherMediaType published_media, gint num_uploaded); -PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type, SpitPublishingPublisherMediaType published_media, gint num_uploaded); +PublishingUISuccessPane* publishing_ui_success_pane_new (SpitPublishingPublisherMediaType published_media, + gint num_uploaded); +PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type, + SpitPublishingPublisherMediaType published_media, + gint num_uploaded); GType publishing_ui_success_pane_get_type (void) G_GNUC_CONST; static void spit_publishing_concrete_publishing_host_real_install_account_fetch_wait_pane (SpitPublishingPluginHost* base); PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_new (void); @@ -222,159 +255,175 @@ static void spit_publishing_concrete_publishing_host_real_install_login_wait_pan PublishingUILoginWaitPane* publishing_ui_login_wait_pane_new (void); PublishingUILoginWaitPane* publishing_ui_login_wait_pane_construct (GType object_type); GType publishing_ui_login_wait_pane_get_type (void) G_GNUC_CONST; -static void spit_publishing_concrete_publishing_host_real_install_welcome_pane (SpitPublishingPluginHost* base, const gchar* welcome_message, SpitPublishingLoginCallback login_clicked_callback, void* login_clicked_callback_target); +static void spit_publishing_concrete_publishing_host_real_install_welcome_pane (SpitPublishingPluginHost* base, + const gchar* welcome_message, + SpitPublishingLoginCallback login_clicked_callback, + void* login_clicked_callback_target); GType publishing_ui_login_welcome_pane_get_type (void) G_GNUC_CONST; PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_new (const gchar* service_welcome_message); -PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType object_type, const gchar* service_welcome_message); -static void _spit_publishing_concrete_publishing_host_on_login_clicked_publishing_ui_login_welcome_pane_login_requested (PublishingUILoginWelcomePane* _sender, gpointer self); -static void spit_publishing_concrete_publishing_host_real_set_service_locked (SpitPublishingPluginHost* base, gboolean locked); +PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType object_type, + const gchar* service_welcome_message); +static void _spit_publishing_concrete_publishing_host_on_login_clicked_publishing_ui_login_welcome_pane_login_requested (PublishingUILoginWelcomePane* _sender, + gpointer self); +static void spit_publishing_concrete_publishing_host_real_set_service_locked (SpitPublishingPluginHost* base, + gboolean locked); void publishing_ui_publishing_dialog_lock_service (PublishingUIPublishingDialog* self); void publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublishingDialog* self); -static void spit_publishing_concrete_publishing_host_real_set_dialog_default_widget (SpitPublishingPluginHost* base, GtkWidget* widget); +static void spit_publishing_concrete_publishing_host_real_set_dialog_default_widget (SpitPublishingPluginHost* base, + GtkWidget* widget); static SpitPublishingPublisherMediaType spit_publishing_concrete_publishing_host_real_get_publishable_media_type (SpitPublishingPluginHost* base); -static SpitPublishingPublishable** spit_publishing_concrete_publishing_host_real_get_publishables (SpitPublishingPluginHost* base, int* result_length1); -static SpitPublishingPublishable** _vala_array_dup19 (SpitPublishingPublishable** self, int length); -static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_real_serialize_publishables (SpitPublishingPluginHost* base, gint content_major_axis, gboolean strip_metadata, void** result_target, GDestroyNotify* result_target_destroy_notify); +static SpitPublishingPublishable** spit_publishing_concrete_publishing_host_real_get_publishables (SpitPublishingPluginHost* base, + int* result_length1); +static SpitPublishingPublishable** _vala_array_dup19 (SpitPublishingPublishable** self, + int length); +static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_real_serialize_publishables (SpitPublishingPluginHost* base, + gint content_major_axis, + gboolean strip_metadata, + void** result_target, + GDestroyNotify* result_target_destroy_notify); void spin_event_loop (void); -GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (PublishingGlueMediaSourcePublishableWrapper* self, gint content_major_axis, gboolean strip_metadata, GError** error); -static void _spit_publishing_concrete_publishing_host_report_plugin_upload_progress_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self); +GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (PublishingGlueMediaSourcePublishableWrapper* self, + gint content_major_axis, + gboolean strip_metadata, + GError** error); +static void _spit_publishing_concrete_publishing_host_report_plugin_upload_progress_spit_publishing_progress_callback (gint file_number, + gdouble fraction_complete, + gpointer self); static void spit_publishing_concrete_publishing_host_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" return self ? g_object_ref (self) : NULL; -#line 250 "PublishingPluginHost.c" +#line 307 "PublishingPluginHost.c" } -static SpitPublishingPublishable** _vala_array_dup18 (SpitPublishingPublishable** self, int length) { +static SpitPublishingPublishable** +_vala_array_dup18 (SpitPublishingPublishable** self, + int length) +{ SpitPublishingPublishable** result; int i; #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" result = g_new0 (SpitPublishingPublishable*, length + 1); #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" for (i = 0; i < length; i++) { -#line 261 "PublishingPluginHost.c" +#line 321 "PublishingPluginHost.c" SpitPublishingPublishable* _tmp0_; #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" result[i] = _tmp0_; -#line 267 "PublishingPluginHost.c" +#line 327 "PublishingPluginHost.c" } #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" return result; -#line 271 "PublishingPluginHost.c" +#line 331 "PublishingPluginHost.c" } -SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_construct (GType object_type, SpitPublishingService* service, PublishingUIPublishingDialog* dialog, SpitPublishingPublishable** publishables, int publishables_length1) { +SpitPublishingConcretePublishingHost* +spit_publishing_concrete_publishing_host_construct (GType object_type, + SpitPublishingService* service, + PublishingUIPublishingDialog* dialog, + SpitPublishingPublishable** publishables, + int publishables_length1) +{ SpitPublishingConcretePublishingHost * self = NULL; - SpitPublishingService* _tmp0_; - PublishingUIPublishingDialog* _tmp1_; - SpitPublishingPublishable** _tmp2_; - gint _tmp2__length1; - SpitPublishingPublishable** _tmp3_; - gint _tmp3__length1; - SpitPublishingPublishable** _tmp4_; - gint _tmp4__length1; - SpitPublishingService* _tmp9_; - SpitPublishingPublisher* _tmp10_; + SpitPublishingPublishable** _tmp0_; + gint _tmp0__length1; + SpitPublishingPublisher* _tmp4_; #line 24 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL); #line 24 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (dialog), NULL); #line 26 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp0_ = service; -#line 26 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - self = (SpitPublishingConcretePublishingHost*) plugins_standard_host_interface_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_PLUGGABLE, SpitPluggable), "sharing"); -#line 27 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp1_ = dialog; + self = (SpitPublishingConcretePublishingHost*) plugins_standard_host_interface_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (service, SPIT_TYPE_PLUGGABLE, SpitPluggable), "sharing"); #line 27 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - self->priv->dialog = _tmp1_; -#line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp2_ = publishables; + self->priv->dialog = dialog; #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp2__length1 = publishables_length1; + _tmp0_ = (publishables != NULL) ? _vala_array_dup18 (publishables, publishables_length1) : ((gpointer) publishables); #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp3_ = (_tmp2_ != NULL) ? _vala_array_dup18 (_tmp2_, _tmp2__length1) : ((gpointer) _tmp2_); -#line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp3__length1 = _tmp2__length1; + _tmp0__length1 = publishables_length1; #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL); #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - self->priv->publishables = _tmp3_; + self->priv->publishables = _tmp0_; #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - self->priv->publishables_length1 = _tmp3__length1; + self->priv->publishables_length1 = _tmp0__length1; #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" self->priv->_publishables_size_ = self->priv->publishables_length1; -#line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp4_ = publishables; -#line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp4__length1 = publishables_length1; -#line 319 "PublishingPluginHost.c" +#line 366 "PublishingPluginHost.c" { SpitPublishingPublishable** curr_publishable_collection = NULL; gint curr_publishable_collection_length1 = 0; gint _curr_publishable_collection_size_ = 0; gint curr_publishable_it = 0; #line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - curr_publishable_collection = _tmp4_; + curr_publishable_collection = publishables; #line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - curr_publishable_collection_length1 = _tmp4__length1; + curr_publishable_collection_length1 = publishables_length1; #line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - for (curr_publishable_it = 0; curr_publishable_it < _tmp4__length1; curr_publishable_it = curr_publishable_it + 1) { -#line 331 "PublishingPluginHost.c" - SpitPublishingPublishable* _tmp5_; + for (curr_publishable_it = 0; curr_publishable_it < publishables_length1; curr_publishable_it = curr_publishable_it + 1) { +#line 378 "PublishingPluginHost.c" + SpitPublishingPublishable* _tmp1_; SpitPublishingPublishable* curr_publishable = NULL; #line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp5_ = _g_object_ref0 (curr_publishable_collection[curr_publishable_it]); + _tmp1_ = _g_object_ref0 (curr_publishable_collection[curr_publishable_it]); #line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - curr_publishable = _tmp5_; -#line 338 "PublishingPluginHost.c" + curr_publishable = _tmp1_; +#line 385 "PublishingPluginHost.c" { - SpitPublishingPublisherMediaType _tmp6_; - SpitPublishingPublishable* _tmp7_; - SpitPublishingPublisherMediaType _tmp8_; -#line 31 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp6_ = self->priv->media_type; + SpitPublishingPublisherMediaType _tmp2_; + SpitPublishingPublishable* _tmp3_; #line 31 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp7_ = curr_publishable; + _tmp2_ = self->priv->media_type; #line 31 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp8_ = spit_publishing_publishable_get_media_type (_tmp7_); + _tmp3_ = curr_publishable; #line 31 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - self->priv->media_type = _tmp6_ | _tmp8_; + self->priv->media_type = _tmp2_ | spit_publishing_publishable_get_media_type (_tmp3_); #line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _g_object_unref0 (curr_publishable); -#line 353 "PublishingPluginHost.c" +#line 397 "PublishingPluginHost.c" } } } #line 33 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp9_ = service; -#line 33 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp10_ = spit_publishing_service_create_publisher (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost)); + _tmp4_ = spit_publishing_service_create_publisher (service, G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost)); #line 33 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _g_object_unref0 (self->priv->active_publisher); #line 33 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - self->priv->active_publisher = _tmp10_; + self->priv->active_publisher = _tmp4_; #line 24 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" return self; -#line 367 "PublishingPluginHost.c" +#line 409 "PublishingPluginHost.c" } -SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_new (SpitPublishingService* service, PublishingUIPublishingDialog* dialog, SpitPublishingPublishable** publishables, int publishables_length1) { +SpitPublishingConcretePublishingHost* +spit_publishing_concrete_publishing_host_new (SpitPublishingService* service, + PublishingUIPublishingDialog* dialog, + SpitPublishingPublishable** publishables, + int publishables_length1) +{ #line 24 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" return spit_publishing_concrete_publishing_host_construct (SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, service, dialog, publishables, publishables_length1); -#line 374 "PublishingPluginHost.c" +#line 421 "PublishingPluginHost.c" } -static void spit_publishing_concrete_publishing_host_on_login_clicked (SpitPublishingConcretePublishingHost* self) { +static void +spit_publishing_concrete_publishing_host_on_login_clicked (SpitPublishingConcretePublishingHost* self) +{ SpitPublishingLoginCallback _tmp0_; void* _tmp0__target; #line 36 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" @@ -385,7 +434,7 @@ static void spit_publishing_concrete_publishing_host_on_login_clicked (SpitPubli _tmp0__target = self->priv->current_login_callback_target; #line 37 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" if (_tmp0_ != NULL) { -#line 389 "PublishingPluginHost.c" +#line 438 "PublishingPluginHost.c" SpitPublishingLoginCallback _tmp1_; void* _tmp1__target; #line 38 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" @@ -394,12 +443,14 @@ static void spit_publishing_concrete_publishing_host_on_login_clicked (SpitPubli _tmp1__target = self->priv->current_login_callback_target; #line 38 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _tmp1_ (_tmp1__target); -#line 398 "PublishingPluginHost.c" +#line 447 "PublishingPluginHost.c" } } -static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingConcretePublishingHost* self) { +static void +spit_publishing_concrete_publishing_host_clean_up (SpitPublishingConcretePublishingHost* self) +{ SpitPublishingPublishable** _tmp0_; gint _tmp0__length1; #line 41 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" @@ -408,7 +459,7 @@ static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingCon _tmp0_ = self->priv->publishables; #line 42 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _tmp0__length1 = self->priv->publishables_length1; -#line 412 "PublishingPluginHost.c" +#line 463 "PublishingPluginHost.c" { SpitPublishingPublishable** publishable_collection = NULL; gint publishable_collection_length1 = 0; @@ -420,14 +471,14 @@ static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingCon publishable_collection_length1 = _tmp0__length1; #line 42 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" for (publishable_it = 0; publishable_it < _tmp0__length1; publishable_it = publishable_it + 1) { -#line 424 "PublishingPluginHost.c" +#line 475 "PublishingPluginHost.c" SpitPublishingPublishable* _tmp1_; SpitPublishingPublishable* publishable = NULL; #line 42 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _tmp1_ = _g_object_ref0 (publishable_collection[publishable_it]); #line 42 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" publishable = _tmp1_; -#line 431 "PublishingPluginHost.c" +#line 482 "PublishingPluginHost.c" { SpitPublishingPublishable* _tmp2_; #line 43 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" @@ -436,14 +487,18 @@ static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingCon publishing_glue_media_source_publishable_wrapper_clean_up (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper)); #line 42 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _g_object_unref0 (publishable); -#line 440 "PublishingPluginHost.c" +#line 491 "PublishingPluginHost.c" } } } } -static void spit_publishing_concrete_publishing_host_report_plugin_upload_progress (SpitPublishingConcretePublishingHost* self, gint file_number, gdouble fraction_complete) { +static void +spit_publishing_concrete_publishing_host_report_plugin_upload_progress (SpitPublishingConcretePublishingHost* self, + gint file_number, + gdouble fraction_complete) +{ PublishingUIPublishingDialog* _tmp0_; SpitPublishingDialogPane* _tmp1_; SpitPublishingDialogPane* _tmp2_; @@ -452,15 +507,13 @@ static void spit_publishing_concrete_publishing_host_report_plugin_upload_progre PublishingUIPublishingDialog* _tmp4_; SpitPublishingDialogPane* _tmp5_; gchar* status_string = NULL; - gint _tmp6_; - SpitPublishingPublishable** _tmp7_; - gint _tmp7__length1; - gchar* _tmp8_; + SpitPublishingPublishable** _tmp6_; + gint _tmp6__length1; + gchar* _tmp7_; gdouble status_fraction = 0.0; - gdouble _tmp9_; - PublishingUIProgressPane* _tmp10_; - const gchar* _tmp11_; - gdouble _tmp12_; + PublishingUIProgressPane* _tmp8_; + const gchar* _tmp9_; + gdouble _tmp10_; #line 46 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self)); #line 48 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" @@ -477,7 +530,7 @@ static void spit_publishing_concrete_publishing_host_report_plugin_upload_progre if (_tmp3_) { #line 49 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" return; -#line 481 "PublishingPluginHost.c" +#line 534 "PublishingPluginHost.c" } #line 51 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _tmp4_ = self->priv->dialog; @@ -486,36 +539,34 @@ static void spit_publishing_concrete_publishing_host_report_plugin_upload_progre #line 51 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" pane = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_UI_TYPE_PROGRESS_PANE, PublishingUIProgressPane); #line 53 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp6_ = file_number; -#line 53 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp7_ = self->priv->publishables; + _tmp6_ = self->priv->publishables; #line 53 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp7__length1 = self->priv->publishables_length1; + _tmp6__length1 = self->priv->publishables_length1; #line 53 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp8_ = g_strdup_printf (SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_UPLOAD_STATUS_DESCRIPTION, _tmp6_, _tmp7__length1); + _tmp7_ = g_strdup_printf (SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_UPLOAD_STATUS_DESCRIPTION, file_number, _tmp6__length1); #line 53 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - status_string = _tmp8_; + status_string = _tmp7_; #line 55 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp9_ = fraction_complete; -#line 55 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - status_fraction = SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_STATUS_PREPARATION_FRACTION + (SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_STATUS_UPLOAD_FRACTION * _tmp9_); + status_fraction = SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_STATUS_PREPARATION_FRACTION + (SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_STATUS_UPLOAD_FRACTION * fraction_complete); #line 58 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp10_ = pane; + _tmp8_ = pane; #line 58 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp11_ = status_string; + _tmp9_ = status_string; #line 58 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp12_ = status_fraction; + _tmp10_ = status_fraction; #line 58 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - publishing_ui_progress_pane_set_status (_tmp10_, _tmp11_, _tmp12_); + publishing_ui_progress_pane_set_status (_tmp8_, _tmp9_, _tmp10_); #line 46 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _g_free0 (status_string); #line 46 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _g_object_unref0 (pane); -#line 515 "PublishingPluginHost.c" +#line 564 "PublishingPluginHost.c" } -static void spit_publishing_concrete_publishing_host_install_progress_pane (SpitPublishingConcretePublishingHost* self) { +static void +spit_publishing_concrete_publishing_host_install_progress_pane (SpitPublishingConcretePublishingHost* self) +{ PublishingUIProgressPane* progress_pane = NULL; PublishingUIProgressPane* _tmp0_; PublishingUIPublishingDialog* _tmp1_; @@ -533,17 +584,19 @@ static void spit_publishing_concrete_publishing_host_install_progress_pane (Spit spit_publishing_concrete_publishing_host_set_button_mode (self, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); #line 61 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _g_object_unref0 (progress_pane); -#line 537 "PublishingPluginHost.c" +#line 588 "PublishingPluginHost.c" } -static void spit_publishing_concrete_publishing_host_real_install_dialog_pane (SpitPublishingPluginHost* base, SpitPublishingDialogPane* pane, SpitPublishingPluginHostButtonMode button_mode) { +static void +spit_publishing_concrete_publishing_host_real_install_dialog_pane (SpitPublishingPluginHost* base, + SpitPublishingDialogPane* pane, + SpitPublishingPluginHostButtonMode button_mode) +{ SpitPublishingConcretePublishingHost * self; gboolean _tmp0_ = FALSE; SpitPublishingPublisher* _tmp1_; - PublishingUIPublishingDialog* _tmp4_; - SpitPublishingDialogPane* _tmp5_; - SpitPublishingPluginHostButtonMode _tmp6_; + PublishingUIPublishingDialog* _tmp3_; #line 68 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost); #line 68 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" @@ -557,39 +610,35 @@ static void spit_publishing_concrete_publishing_host_real_install_dialog_pane (S if (_tmp1_ == NULL) { #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _tmp0_ = TRUE; -#line 560 "PublishingPluginHost.c" +#line 613 "PublishingPluginHost.c" } else { SpitPublishingPublisher* _tmp2_; - gboolean _tmp3_; #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _tmp2_ = self->priv->active_publisher; #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp3_ = spit_publishing_publisher_is_running (_tmp2_); -#line 72 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp0_ = !_tmp3_; -#line 570 "PublishingPluginHost.c" + _tmp0_ = !spit_publishing_publisher_is_running (_tmp2_); +#line 620 "PublishingPluginHost.c" } #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" if (_tmp0_) { #line 73 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" return; -#line 576 "PublishingPluginHost.c" +#line 626 "PublishingPluginHost.c" } #line 75 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp4_ = self->priv->dialog; -#line 75 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp5_ = pane; + _tmp3_ = self->priv->dialog; #line 75 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - publishing_ui_publishing_dialog_install_pane (_tmp4_, _tmp5_); -#line 77 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp6_ = button_mode; + publishing_ui_publishing_dialog_install_pane (_tmp3_, pane); #line 77 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - spit_publishing_concrete_publishing_host_set_button_mode (self, _tmp6_); -#line 588 "PublishingPluginHost.c" + spit_publishing_concrete_publishing_host_set_button_mode (self, button_mode); +#line 634 "PublishingPluginHost.c" } -static void spit_publishing_concrete_publishing_host_real_post_error (SpitPublishingPluginHost* base, GError* err) { +static void +spit_publishing_concrete_publishing_host_real_post_error (SpitPublishingPluginHost* base, + GError* err) +{ SpitPublishingConcretePublishingHost * self; gchar* msg = NULL; SpitPublishingPublisher* _tmp0_; @@ -599,20 +648,19 @@ static void spit_publishing_concrete_publishing_host_real_post_error (SpitPublis gchar* _tmp4_; gchar* _tmp5_; const gchar* _tmp6_; - GError* _tmp7_; - const gchar* _tmp8_; + const gchar* _tmp7_; + gchar* _tmp8_; gchar* _tmp9_; gchar* _tmp10_; - gchar* _tmp11_; - const gchar* _tmp12_; - gchar* _tmp13_; - PublishingUIPublishingDialog* _tmp14_; - const gchar* _tmp15_; + const gchar* _tmp11_; + gchar* _tmp12_; + PublishingUIPublishingDialog* _tmp13_; + const gchar* _tmp14_; + PublishingUIStaticMessagePane* _tmp15_; PublishingUIStaticMessagePane* _tmp16_; - PublishingUIStaticMessagePane* _tmp17_; + PublishingUIPublishingDialog* _tmp17_; PublishingUIPublishingDialog* _tmp18_; - PublishingUIPublishingDialog* _tmp19_; - SpitPublishingPublisher* _tmp20_; + SpitPublishingPublisher* _tmp19_; #line 80 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost); #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" @@ -634,65 +682,64 @@ static void spit_publishing_concrete_publishing_host_real_post_error (SpitPublis #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _tmp6_ = msg; #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp7_ = err; -#line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp8_ = _tmp7_->message; + _tmp7_ = err->message; #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp9_ = g_markup_printf_escaped ("\n\n%s\n\n", _tmp8_); + _tmp8_ = g_markup_printf_escaped ("\n\n%s\n\n", _tmp7_); #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp11_ = g_strconcat (_tmp6_, _tmp10_, NULL); + _tmp10_ = g_strconcat (_tmp6_, _tmp9_, NULL); #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _g_free0 (msg); #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - msg = _tmp11_; + msg = _tmp10_; #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp9_); #line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp12_ = msg; + _tmp11_ = msg; #line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp13_ = g_strconcat (_tmp12_, _ ("To try publishing to another service, select one from the above menu."), NULL); + _tmp12_ = g_strconcat (_tmp11_, _ ("To try publishing to another service, select one from the above menu."), NULL); #line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _g_free0 (msg); #line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - msg = _tmp13_; + msg = _tmp12_; #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp14_ = self->priv->dialog; + _tmp13_ = self->priv->dialog; #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp15_ = msg; + _tmp14_ = msg; #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp16_ = publishing_ui_static_message_pane_new (_tmp15_, TRUE); + _tmp15_ = publishing_ui_static_message_pane_new (_tmp14_, TRUE); #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - publishing_ui_publishing_dialog_install_pane (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane)); + publishing_ui_publishing_dialog_install_pane (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane)); #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _g_object_unref0 (_tmp17_); + _g_object_unref0 (_tmp16_); #line 87 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp18_ = self->priv->dialog; + _tmp17_ = self->priv->dialog; #line 87 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - publishing_ui_publishing_dialog_set_close_button_mode (_tmp18_); + publishing_ui_publishing_dialog_set_close_button_mode (_tmp17_); #line 88 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp19_ = self->priv->dialog; + _tmp18_ = self->priv->dialog; #line 88 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - publishing_ui_publishing_dialog_unlock_service (_tmp19_); + publishing_ui_publishing_dialog_unlock_service (_tmp18_); #line 90 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp20_ = self->priv->active_publisher; + _tmp19_ = self->priv->active_publisher; #line 90 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - spit_publishing_publisher_stop (_tmp20_); + spit_publishing_publisher_stop (_tmp19_); #line 95 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" spit_publishing_concrete_publishing_host_clean_up (self); #line 80 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _g_free0 (msg); -#line 688 "PublishingPluginHost.c" +#line 734 "PublishingPluginHost.c" } -static void spit_publishing_concrete_publishing_host_real_stop_publishing (SpitPublishingPluginHost* base) { +static void +spit_publishing_concrete_publishing_host_real_stop_publishing (SpitPublishingPluginHost* base) +{ SpitPublishingConcretePublishingHost * self; SpitPublishingPublisher* _tmp0_; - gboolean _tmp1_; #line 98 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost); #line 99 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" @@ -701,53 +748,52 @@ static void spit_publishing_concrete_publishing_host_real_stop_publishing (SpitP #line 101 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _tmp0_ = self->priv->active_publisher; #line 101 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp1_ = spit_publishing_publisher_is_running (_tmp0_); -#line 101 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - if (_tmp1_) { -#line 706 "PublishingPluginHost.c" - SpitPublishingPublisher* _tmp2_; + if (spit_publishing_publisher_is_running (_tmp0_)) { +#line 751 "PublishingPluginHost.c" + SpitPublishingPublisher* _tmp1_; #line 102 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp2_ = self->priv->active_publisher; + _tmp1_ = self->priv->active_publisher; #line 102 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - spit_publishing_publisher_stop (_tmp2_); -#line 712 "PublishingPluginHost.c" + spit_publishing_publisher_stop (_tmp1_); +#line 757 "PublishingPluginHost.c" } #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" spit_publishing_concrete_publishing_host_clean_up (self); #line 106 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" self->priv->publishing_halted = TRUE; -#line 718 "PublishingPluginHost.c" +#line 763 "PublishingPluginHost.c" } -void spit_publishing_concrete_publishing_host_start_publishing (SpitPublishingConcretePublishingHost* self) { +void +spit_publishing_concrete_publishing_host_start_publishing (SpitPublishingConcretePublishingHost* self) +{ SpitPublishingPublisher* _tmp0_; - gboolean _tmp1_; - SpitPublishingPublisher* _tmp2_; + SpitPublishingPublisher* _tmp1_; #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self)); #line 110 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _tmp0_ = self->priv->active_publisher; #line 110 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp1_ = spit_publishing_publisher_is_running (_tmp0_); -#line 110 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - if (_tmp1_) { + if (spit_publishing_publisher_is_running (_tmp0_)) { #line 111 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" return; -#line 736 "PublishingPluginHost.c" +#line 780 "PublishingPluginHost.c" } #line 113 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" g_debug ("PublishingPluginHost.vala:113: ConcretePublishingHost.start_publishing" \ "( ): invoked."); #line 115 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp2_ = self->priv->active_publisher; + _tmp1_ = self->priv->active_publisher; #line 115 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - spit_publishing_publisher_start (_tmp2_); -#line 744 "PublishingPluginHost.c" + spit_publishing_publisher_start (_tmp1_); +#line 788 "PublishingPluginHost.c" } -static SpitPublishingPublisher* spit_publishing_concrete_publishing_host_real_get_publisher (SpitPublishingPluginHost* base) { +static SpitPublishingPublisher* +spit_publishing_concrete_publishing_host_real_get_publisher (SpitPublishingPluginHost* base) +{ SpitPublishingConcretePublishingHost * self; SpitPublishingPublisher* result = NULL; SpitPublishingPublisher* _tmp0_; @@ -762,110 +808,107 @@ static SpitPublishingPublisher* spit_publishing_concrete_publishing_host_real_ge result = _tmp1_; #line 119 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" return result; -#line 763 "PublishingPluginHost.c" +#line 809 "PublishingPluginHost.c" } -static void spit_publishing_concrete_publishing_host_real_install_static_message_pane (SpitPublishingPluginHost* base, const gchar* message, SpitPublishingPluginHostButtonMode button_mode) { +static void +spit_publishing_concrete_publishing_host_real_install_static_message_pane (SpitPublishingPluginHost* base, + const gchar* message, + SpitPublishingPluginHostButtonMode button_mode) +{ SpitPublishingConcretePublishingHost * self; - SpitPublishingPluginHostButtonMode _tmp0_; - PublishingUIPublishingDialog* _tmp1_; - const gchar* _tmp2_; - PublishingUIStaticMessagePane* _tmp3_; - PublishingUIStaticMessagePane* _tmp4_; + PublishingUIPublishingDialog* _tmp0_; + PublishingUIStaticMessagePane* _tmp1_; + PublishingUIStaticMessagePane* _tmp2_; #line 122 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost); #line 122 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" g_return_if_fail (message != NULL); #line 125 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp0_ = button_mode; -#line 125 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - spit_publishing_concrete_publishing_host_set_button_mode (self, _tmp0_); + spit_publishing_concrete_publishing_host_set_button_mode (self, button_mode); #line 127 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp1_ = self->priv->dialog; -#line 127 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp2_ = message; + _tmp0_ = self->priv->dialog; #line 127 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp3_ = publishing_ui_static_message_pane_new (_tmp2_, FALSE); + _tmp1_ = publishing_ui_static_message_pane_new (message, FALSE); #line 127 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 127 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - publishing_ui_publishing_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane)); + publishing_ui_publishing_dialog_install_pane (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane)); #line 127 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _g_object_unref0 (_tmp4_); -#line 794 "PublishingPluginHost.c" + _g_object_unref0 (_tmp2_); +#line 838 "PublishingPluginHost.c" } -static void spit_publishing_concrete_publishing_host_real_install_pango_message_pane (SpitPublishingPluginHost* base, const gchar* markup, SpitPublishingPluginHostButtonMode button_mode) { +static void +spit_publishing_concrete_publishing_host_real_install_pango_message_pane (SpitPublishingPluginHost* base, + const gchar* markup, + SpitPublishingPluginHostButtonMode button_mode) +{ SpitPublishingConcretePublishingHost * self; - SpitPublishingPluginHostButtonMode _tmp0_; - PublishingUIPublishingDialog* _tmp1_; - const gchar* _tmp2_; - PublishingUIStaticMessagePane* _tmp3_; - PublishingUIStaticMessagePane* _tmp4_; + PublishingUIPublishingDialog* _tmp0_; + PublishingUIStaticMessagePane* _tmp1_; + PublishingUIStaticMessagePane* _tmp2_; #line 130 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost); #line 130 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" g_return_if_fail (markup != NULL); #line 132 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp0_ = button_mode; -#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - spit_publishing_concrete_publishing_host_set_button_mode (self, _tmp0_); -#line 134 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp1_ = self->priv->dialog; + spit_publishing_concrete_publishing_host_set_button_mode (self, button_mode); #line 134 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp2_ = markup; + _tmp0_ = self->priv->dialog; #line 134 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp3_ = publishing_ui_static_message_pane_new (_tmp2_, TRUE); + _tmp1_ = publishing_ui_static_message_pane_new (markup, TRUE); #line 134 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 134 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - publishing_ui_publishing_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane)); + publishing_ui_publishing_dialog_install_pane (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane)); #line 134 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _g_object_unref0 (_tmp4_); -#line 825 "PublishingPluginHost.c" + _g_object_unref0 (_tmp2_); +#line 867 "PublishingPluginHost.c" } -static void spit_publishing_concrete_publishing_host_real_install_success_pane (SpitPublishingPluginHost* base) { +static void +spit_publishing_concrete_publishing_host_real_install_success_pane (SpitPublishingPluginHost* base) +{ SpitPublishingConcretePublishingHost * self; PublishingUIPublishingDialog* _tmp0_; - SpitPublishingPublisherMediaType _tmp1_; - SpitPublishingPublishable** _tmp2_; - gint _tmp2__length1; + SpitPublishingPublishable** _tmp1_; + gint _tmp1__length1; + PublishingUISuccessPane* _tmp2_; PublishingUISuccessPane* _tmp3_; - PublishingUISuccessPane* _tmp4_; - PublishingUIPublishingDialog* _tmp5_; + PublishingUIPublishingDialog* _tmp4_; #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost); #line 138 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _tmp0_ = self->priv->dialog; #line 138 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp1_ = spit_publishing_plugin_host_get_publishable_media_type (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost)); + _tmp1_ = self->priv->publishables; #line 138 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp2_ = self->priv->publishables; + _tmp1__length1 = self->priv->publishables_length1; #line 138 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp2__length1 = self->priv->publishables_length1; -#line 138 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp3_ = publishing_ui_success_pane_new (_tmp1_, _tmp2__length1); + _tmp2_ = publishing_ui_success_pane_new (spit_publishing_plugin_host_get_publishable_media_type (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost)), _tmp1__length1); #line 138 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 138 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - publishing_ui_publishing_dialog_install_pane (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane)); + publishing_ui_publishing_dialog_install_pane (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane)); #line 138 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 140 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp5_ = self->priv->dialog; + _tmp4_ = self->priv->dialog; #line 140 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - publishing_ui_publishing_dialog_set_close_button_mode (_tmp5_); + publishing_ui_publishing_dialog_set_close_button_mode (_tmp4_); #line 144 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" spit_publishing_concrete_publishing_host_clean_up (self); -#line 862 "PublishingPluginHost.c" +#line 903 "PublishingPluginHost.c" } -static void spit_publishing_concrete_publishing_host_real_install_account_fetch_wait_pane (SpitPublishingPluginHost* base) { +static void +spit_publishing_concrete_publishing_host_real_install_account_fetch_wait_pane (SpitPublishingPluginHost* base) +{ SpitPublishingConcretePublishingHost * self; PublishingUIPublishingDialog* _tmp0_; PublishingUIAccountFetchWaitPane* _tmp1_; @@ -884,11 +927,13 @@ static void spit_publishing_concrete_publishing_host_real_install_account_fetch_ _g_object_unref0 (_tmp2_); #line 149 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" spit_publishing_concrete_publishing_host_set_button_mode (self, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); -#line 885 "PublishingPluginHost.c" +#line 928 "PublishingPluginHost.c" } -static void spit_publishing_concrete_publishing_host_real_install_login_wait_pane (SpitPublishingPluginHost* base) { +static void +spit_publishing_concrete_publishing_host_real_install_login_wait_pane (SpitPublishingPluginHost* base) +{ SpitPublishingConcretePublishingHost * self; PublishingUIPublishingDialog* _tmp0_; PublishingUILoginWaitPane* _tmp1_; @@ -905,146 +950,141 @@ static void spit_publishing_concrete_publishing_host_real_install_login_wait_pan publishing_ui_publishing_dialog_install_pane (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane)); #line 153 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _g_object_unref0 (_tmp2_); -#line 906 "PublishingPluginHost.c" +#line 951 "PublishingPluginHost.c" } -static void _spit_publishing_concrete_publishing_host_on_login_clicked_publishing_ui_login_welcome_pane_login_requested (PublishingUILoginWelcomePane* _sender, gpointer self) { +static void +_spit_publishing_concrete_publishing_host_on_login_clicked_publishing_ui_login_welcome_pane_login_requested (PublishingUILoginWelcomePane* _sender, + gpointer self) +{ #line 160 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" spit_publishing_concrete_publishing_host_on_login_clicked ((SpitPublishingConcretePublishingHost*) self); -#line 913 "PublishingPluginHost.c" +#line 961 "PublishingPluginHost.c" } -static void spit_publishing_concrete_publishing_host_real_install_welcome_pane (SpitPublishingPluginHost* base, const gchar* welcome_message, SpitPublishingLoginCallback login_clicked_callback, void* login_clicked_callback_target) { +static void +spit_publishing_concrete_publishing_host_real_install_welcome_pane (SpitPublishingPluginHost* base, + const gchar* welcome_message, + SpitPublishingLoginCallback login_clicked_callback, + void* login_clicked_callback_target) +{ SpitPublishingConcretePublishingHost * self; PublishingUILoginWelcomePane* login_pane = NULL; - const gchar* _tmp0_; - PublishingUILoginWelcomePane* _tmp1_; - SpitPublishingLoginCallback _tmp2_; - void* _tmp2__target; - PublishingUIPublishingDialog* _tmp3_; + PublishingUILoginWelcomePane* _tmp0_; + PublishingUIPublishingDialog* _tmp1_; #line 156 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost); #line 156 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" g_return_if_fail (welcome_message != NULL); #line 157 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp0_ = welcome_message; -#line 157 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp1_ = publishing_ui_login_welcome_pane_new (_tmp0_); + _tmp0_ = publishing_ui_login_welcome_pane_new (welcome_message); #line 157 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - login_pane = _tmp1_; + login_pane = _tmp0_; #line 159 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp2_ = login_clicked_callback; + self->priv->current_login_callback = login_clicked_callback; #line 159 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp2__target = login_clicked_callback_target; -#line 159 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - self->priv->current_login_callback = _tmp2_; -#line 159 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - self->priv->current_login_callback_target = _tmp2__target; + self->priv->current_login_callback_target = login_clicked_callback_target; #line 160 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" g_signal_connect_object (login_pane, "login-requested", (GCallback) _spit_publishing_concrete_publishing_host_on_login_clicked_publishing_ui_login_welcome_pane_login_requested, self, 0); #line 162 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" spit_publishing_concrete_publishing_host_set_button_mode (self, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE); #line 164 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp3_ = self->priv->dialog; + _tmp1_ = self->priv->dialog; #line 164 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - publishing_ui_publishing_dialog_install_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (login_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane)); + publishing_ui_publishing_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (login_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane)); #line 156 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _g_object_unref0 (login_pane); -#line 953 "PublishingPluginHost.c" +#line 997 "PublishingPluginHost.c" } -static void spit_publishing_concrete_publishing_host_real_set_service_locked (SpitPublishingPluginHost* base, gboolean locked) { +static void +spit_publishing_concrete_publishing_host_real_set_service_locked (SpitPublishingPluginHost* base, + gboolean locked) +{ SpitPublishingConcretePublishingHost * self; - gboolean _tmp0_; #line 167 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost); #line 168 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp0_ = locked; -#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - if (_tmp0_) { -#line 966 "PublishingPluginHost.c" - PublishingUIPublishingDialog* _tmp1_; + if (locked) { +#line 1010 "PublishingPluginHost.c" + PublishingUIPublishingDialog* _tmp0_; #line 169 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp1_ = self->priv->dialog; + _tmp0_ = self->priv->dialog; #line 169 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - publishing_ui_publishing_dialog_lock_service (_tmp1_); -#line 972 "PublishingPluginHost.c" + publishing_ui_publishing_dialog_lock_service (_tmp0_); +#line 1016 "PublishingPluginHost.c" } else { - PublishingUIPublishingDialog* _tmp2_; + PublishingUIPublishingDialog* _tmp1_; #line 171 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp2_ = self->priv->dialog; + _tmp1_ = self->priv->dialog; #line 171 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - publishing_ui_publishing_dialog_unlock_service (_tmp2_); -#line 979 "PublishingPluginHost.c" + publishing_ui_publishing_dialog_unlock_service (_tmp1_); +#line 1023 "PublishingPluginHost.c" } } -void spit_publishing_concrete_publishing_host_set_button_mode (SpitPublishingConcretePublishingHost* self, SpitPublishingPluginHostButtonMode mode) { - SpitPublishingPluginHostButtonMode _tmp0_; +void +spit_publishing_concrete_publishing_host_set_button_mode (SpitPublishingConcretePublishingHost* self, + SpitPublishingPluginHostButtonMode mode) +{ #line 174 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self)); #line 175 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp0_ = mode; -#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - if (_tmp0_ == SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE) { -#line 992 "PublishingPluginHost.c" - PublishingUIPublishingDialog* _tmp1_; + if (mode == SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE) { +#line 1036 "PublishingPluginHost.c" + PublishingUIPublishingDialog* _tmp0_; #line 176 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp1_ = self->priv->dialog; + _tmp0_ = self->priv->dialog; #line 176 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - publishing_ui_publishing_dialog_set_close_button_mode (_tmp1_); -#line 998 "PublishingPluginHost.c" + publishing_ui_publishing_dialog_set_close_button_mode (_tmp0_); +#line 1042 "PublishingPluginHost.c" } else { - SpitPublishingPluginHostButtonMode _tmp2_; #line 177 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp2_ = mode; -#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - if (_tmp2_ == SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL) { -#line 1005 "PublishingPluginHost.c" - PublishingUIPublishingDialog* _tmp3_; + if (mode == SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL) { +#line 1046 "PublishingPluginHost.c" + PublishingUIPublishingDialog* _tmp1_; #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp3_ = self->priv->dialog; + _tmp1_ = self->priv->dialog; #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - publishing_ui_publishing_dialog_set_cancel_button_mode (_tmp3_); -#line 1011 "PublishingPluginHost.c" + publishing_ui_publishing_dialog_set_cancel_button_mode (_tmp1_); +#line 1052 "PublishingPluginHost.c" } else { #line 180 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" g_error ("PublishingPluginHost.vala:180: unrecognized button mode enumeration va" \ "lue"); -#line 1015 "PublishingPluginHost.c" +#line 1056 "PublishingPluginHost.c" } } } -static void spit_publishing_concrete_publishing_host_real_set_dialog_default_widget (SpitPublishingPluginHost* base, GtkWidget* widget) { +static void +spit_publishing_concrete_publishing_host_real_set_dialog_default_widget (SpitPublishingPluginHost* base, + GtkWidget* widget) +{ SpitPublishingConcretePublishingHost * self; - GtkWidget* _tmp0_; - PublishingUIPublishingDialog* _tmp1_; - GtkWidget* _tmp2_; + PublishingUIPublishingDialog* _tmp0_; #line 183 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost); #line 183 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" g_return_if_fail (GTK_IS_WIDGET (widget)); #line 184 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp0_ = widget; -#line 184 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - gtk_widget_set_can_default (_tmp0_, TRUE); -#line 185 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp1_ = self->priv->dialog; + gtk_widget_set_can_default (widget, TRUE); #line 185 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp2_ = widget; + _tmp0_ = self->priv->dialog; #line 185 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow), _tmp2_); -#line 1040 "PublishingPluginHost.c" + gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_window_get_type (), GtkWindow), widget); +#line 1078 "PublishingPluginHost.c" } -static SpitPublishingPublisherMediaType spit_publishing_concrete_publishing_host_real_get_publishable_media_type (SpitPublishingPluginHost* base) { +static SpitPublishingPublisherMediaType +spit_publishing_concrete_publishing_host_real_get_publishable_media_type (SpitPublishingPluginHost* base) +{ SpitPublishingConcretePublishingHost * self; SpitPublishingPublisherMediaType result = 0; SpitPublishingPublisherMediaType _tmp0_; @@ -1056,32 +1096,38 @@ static SpitPublishingPublisherMediaType spit_publishing_concrete_publishing_host result = _tmp0_; #line 189 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" return result; -#line 1056 "PublishingPluginHost.c" +#line 1096 "PublishingPluginHost.c" } -static SpitPublishingPublishable** _vala_array_dup19 (SpitPublishingPublishable** self, int length) { +static SpitPublishingPublishable** +_vala_array_dup19 (SpitPublishingPublishable** self, + int length) +{ SpitPublishingPublishable** result; int i; #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" result = g_new0 (SpitPublishingPublishable*, length + 1); #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" for (i = 0; i < length; i++) { -#line 1067 "PublishingPluginHost.c" +#line 1110 "PublishingPluginHost.c" SpitPublishingPublishable* _tmp0_; #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" result[i] = _tmp0_; -#line 1073 "PublishingPluginHost.c" +#line 1116 "PublishingPluginHost.c" } #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" return result; -#line 1077 "PublishingPluginHost.c" +#line 1120 "PublishingPluginHost.c" } -static SpitPublishingPublishable** spit_publishing_concrete_publishing_host_real_get_publishables (SpitPublishingPluginHost* base, int* result_length1) { +static SpitPublishingPublishable** +spit_publishing_concrete_publishing_host_real_get_publishables (SpitPublishingPluginHost* base, + int* result_length1) +{ SpitPublishingConcretePublishingHost * self; SpitPublishingPublishable** result = NULL; SpitPublishingPublishable** _tmp0_; @@ -1108,24 +1154,34 @@ static SpitPublishingPublishable** spit_publishing_concrete_publishing_host_real if (result_length1) { #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" *result_length1 = _tmp2__length1; -#line 1108 "PublishingPluginHost.c" +#line 1154 "PublishingPluginHost.c" } #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" result = _tmp2_; #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" return result; -#line 1114 "PublishingPluginHost.c" +#line 1160 "PublishingPluginHost.c" } -static void _spit_publishing_concrete_publishing_host_report_plugin_upload_progress_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) { +static void +_spit_publishing_concrete_publishing_host_report_plugin_upload_progress_spit_publishing_progress_callback (gint file_number, + gdouble fraction_complete, + gpointer self) +{ #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" spit_publishing_concrete_publishing_host_report_plugin_upload_progress ((SpitPublishingConcretePublishingHost*) self, file_number, fraction_complete); -#line 1121 "PublishingPluginHost.c" +#line 1171 "PublishingPluginHost.c" } -static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_real_serialize_publishables (SpitPublishingPluginHost* base, gint content_major_axis, gboolean strip_metadata, void** result_target, GDestroyNotify* result_target_destroy_notify) { +static SpitPublishingProgressCallback +spit_publishing_concrete_publishing_host_real_serialize_publishables (SpitPublishingPluginHost* base, + gint content_major_axis, + gboolean strip_metadata, + void** result_target, + GDestroyNotify* result_target_destroy_notify) +{ SpitPublishingConcretePublishingHost * self; SpitPublishingProgressCallback result = NULL; PublishingUIProgressPane* progress_pane = NULL; @@ -1134,9 +1190,9 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r gint i = 0; SpitPublishingPublishable** _tmp2_; gint _tmp2__length1; - SpitPublishingProgressCallback _tmp25_; - void* _tmp25__target; - GDestroyNotify _tmp25__target_destroy_notify; + SpitPublishingProgressCallback _tmp22_; + void* _tmp22__target; + GDestroyNotify _tmp22__target_destroy_notify; GError * _inner_error_ = NULL; #line 196 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost); @@ -1156,7 +1212,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r _tmp2_ = self->priv->publishables; #line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _tmp2__length1 = self->priv->publishables_length1; -#line 1156 "PublishingPluginHost.c" +#line 1212 "PublishingPluginHost.c" { SpitPublishingPublishable** publishable_collection = NULL; gint publishable_collection_length1 = 0; @@ -1168,105 +1224,96 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r publishable_collection_length1 = _tmp2__length1; #line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" for (publishable_it = 0; publishable_it < _tmp2__length1; publishable_it = publishable_it + 1) { -#line 1168 "PublishingPluginHost.c" +#line 1224 "PublishingPluginHost.c" SpitPublishingPublishable* _tmp3_; SpitPublishingPublishable* publishable = NULL; #line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _tmp3_ = _g_object_ref0 (publishable_collection[publishable_it]); #line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" publishable = _tmp3_; -#line 1175 "PublishingPluginHost.c" +#line 1231 "PublishingPluginHost.c" { gboolean _tmp4_ = FALSE; gboolean _tmp5_; gdouble phase_fraction_complete = 0.0; - gint _tmp18_; - SpitPublishingPublishable** _tmp19_; - gint _tmp19__length1; + gint _tmp15_; + SpitPublishingPublishable** _tmp16_; + gint _tmp16__length1; gdouble fraction_complete = 0.0; + gdouble _tmp17_; + gdouble _tmp18_; + PublishingUIProgressPane* _tmp19_; gdouble _tmp20_; - gdouble _tmp21_; - PublishingUIProgressPane* _tmp22_; - gdouble _tmp23_; - gint _tmp24_; + gint _tmp21_; #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _tmp5_ = self->priv->publishing_halted; #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" if (_tmp5_) { #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _tmp4_ = TRUE; -#line 1195 "PublishingPluginHost.c" +#line 1251 "PublishingPluginHost.c" } else { SpitPublishingPublisher* _tmp6_; - gboolean _tmp7_; #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _tmp6_ = self->priv->active_publisher; #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp7_ = spit_publishing_publisher_is_running (_tmp6_); -#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp4_ = !_tmp7_; -#line 1205 "PublishingPluginHost.c" + _tmp4_ = !spit_publishing_publisher_is_running (_tmp6_); +#line 1258 "PublishingPluginHost.c" } #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" if (_tmp4_) { -#line 1209 "PublishingPluginHost.c" - SpitPublishingProgressCallback _tmp8_; - void* _tmp8__target; - GDestroyNotify _tmp8__target_destroy_notify; +#line 1262 "PublishingPluginHost.c" + SpitPublishingProgressCallback _tmp7_; + void* _tmp7__target; + GDestroyNotify _tmp7__target_destroy_notify; #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp8_ = NULL; + _tmp7_ = NULL; #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp8__target = NULL; + _tmp7__target = NULL; #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp8__target_destroy_notify = NULL; + _tmp7__target_destroy_notify = NULL; #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - *result_target = _tmp8__target; + *result_target = _tmp7__target; #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - *result_target_destroy_notify = _tmp8__target_destroy_notify; + *result_target_destroy_notify = _tmp7__target_destroy_notify; #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - result = _tmp8_; + result = _tmp7_; #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _g_object_unref0 (publishable); #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _g_object_unref0 (progress_pane); #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" return result; -#line 1231 "PublishingPluginHost.c" +#line 1284 "PublishingPluginHost.c" } { PublishingGlueMediaSourcePublishableWrapper* wrapper = NULL; - SpitPublishingPublishable* _tmp9_; + SpitPublishingPublishable* _tmp8_; + PublishingGlueMediaSourcePublishableWrapper* _tmp9_; PublishingGlueMediaSourcePublishableWrapper* _tmp10_; - PublishingGlueMediaSourcePublishableWrapper* _tmp11_; - gint _tmp12_; - gboolean _tmp13_; - GFile* _tmp14_; - GFile* _tmp15_; + GFile* _tmp11_; + GFile* _tmp12_; #line 213 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp9_ = publishable; + _tmp8_ = publishable; #line 213 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper)); + _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper)); #line 213 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - wrapper = _tmp10_; -#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp11_ = wrapper; + wrapper = _tmp9_; #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp12_ = content_major_axis; + _tmp10_ = wrapper; #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp13_ = strip_metadata; + _tmp11_ = publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (_tmp10_, content_major_axis, strip_metadata, &_inner_error_); #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp14_ = publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (_tmp11_, _tmp12_, _tmp13_, &_inner_error_); + _tmp12_ = _tmp11_; #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp15_ = _tmp14_; -#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp12_); #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _g_object_unref0 (wrapper); #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 1266 "PublishingPluginHost.c" +#line 1313 "PublishingPluginHost.c" goto __catch42_spit_publishing_publishing_error; } #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" @@ -1281,40 +1328,40 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r g_clear_error (&_inner_error_); #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" return NULL; -#line 1281 "PublishingPluginHost.c" +#line 1328 "PublishingPluginHost.c" } #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _g_object_unref0 (wrapper); -#line 1285 "PublishingPluginHost.c" +#line 1332 "PublishingPluginHost.c" } goto __finally42; __catch42_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp16_; - SpitPublishingProgressCallback _tmp17_; - void* _tmp17__target; - GDestroyNotify _tmp17__target_destroy_notify; + GError* _tmp13_; + SpitPublishingProgressCallback _tmp14_; + void* _tmp14__target; + GDestroyNotify _tmp14__target_destroy_notify; #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" err = _inner_error_; #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _inner_error_ = NULL; #line 217 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp16_ = err; + _tmp13_ = err; #line 217 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - spit_publishing_plugin_host_post_error (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost), _tmp16_); + spit_publishing_plugin_host_post_error (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost), _tmp13_); #line 218 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp17_ = NULL; + _tmp14_ = NULL; #line 218 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp17__target = NULL; + _tmp14__target = NULL; #line 218 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp17__target_destroy_notify = NULL; + _tmp14__target_destroy_notify = NULL; #line 218 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - *result_target = _tmp17__target; + *result_target = _tmp14__target; #line 218 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - *result_target_destroy_notify = _tmp17__target_destroy_notify; + *result_target_destroy_notify = _tmp14__target_destroy_notify; #line 218 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - result = _tmp17_; + result = _tmp14_; #line 218 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _g_error_free0 (err); #line 218 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" @@ -1323,7 +1370,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r _g_object_unref0 (progress_pane); #line 218 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" return result; -#line 1323 "PublishingPluginHost.c" +#line 1370 "PublishingPluginHost.c" } __finally42: #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" @@ -1338,75 +1385,79 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r g_clear_error (&_inner_error_); #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" return NULL; -#line 1338 "PublishingPluginHost.c" +#line 1385 "PublishingPluginHost.c" } #line 221 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp18_ = i; + _tmp15_ = i; #line 221 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp19_ = self->priv->publishables; + _tmp16_ = self->priv->publishables; #line 221 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp19__length1 = self->priv->publishables_length1; + _tmp16__length1 = self->priv->publishables_length1; #line 221 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - phase_fraction_complete = ((gdouble) (_tmp18_ + 1)) / ((gdouble) _tmp19__length1); + phase_fraction_complete = ((gdouble) (_tmp15_ + 1)) / ((gdouble) _tmp16__length1); #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp20_ = phase_fraction_complete; + _tmp17_ = phase_fraction_complete; #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - fraction_complete = _tmp20_ * SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_STATUS_PREPARATION_FRACTION; + fraction_complete = _tmp17_ * SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_STATUS_PREPARATION_FRACTION; #line 224 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp21_ = fraction_complete; + _tmp18_ = fraction_complete; #line 224 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" g_debug ("PublishingPluginHost.vala:224: serialize_publishables( ): fraction_com" \ -"plete = %f.", _tmp21_); +"plete = %f.", _tmp18_); #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp22_ = progress_pane; + _tmp19_ = progress_pane; #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp23_ = fraction_complete; + _tmp20_ = fraction_complete; #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - publishing_ui_progress_pane_set_status (_tmp22_, SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_PREPARE_STATUS_DESCRIPTION, _tmp23_); + publishing_ui_progress_pane_set_status (_tmp19_, SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_PREPARE_STATUS_DESCRIPTION, _tmp20_); #line 228 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" spin_event_loop (); #line 230 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp24_ = i; + _tmp21_ = i; #line 230 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - i = _tmp24_ + 1; + i = _tmp21_ + 1; #line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _g_object_unref0 (publishable); -#line 1370 "PublishingPluginHost.c" +#line 1417 "PublishingPluginHost.c" } } } #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp25_ = _spit_publishing_concrete_publishing_host_report_plugin_upload_progress_spit_publishing_progress_callback; + _tmp22_ = _spit_publishing_concrete_publishing_host_report_plugin_upload_progress_spit_publishing_progress_callback; #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp25__target = g_object_ref (self); + _tmp22__target = g_object_ref (self); #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - _tmp25__target_destroy_notify = g_object_unref; + _tmp22__target_destroy_notify = g_object_unref; #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - *result_target = _tmp25__target; + *result_target = _tmp22__target; #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - *result_target_destroy_notify = _tmp25__target_destroy_notify; + *result_target_destroy_notify = _tmp22__target_destroy_notify; #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" - result = _tmp25_; + result = _tmp22_; #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" _g_object_unref0 (progress_pane); #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" return result; -#line 1390 "PublishingPluginHost.c" +#line 1437 "PublishingPluginHost.c" } -static void spit_publishing_concrete_publishing_host_class_init (SpitPublishingConcretePublishingHostClass * klass) { +static void +spit_publishing_concrete_publishing_host_class_init (SpitPublishingConcretePublishingHostClass * klass) +{ #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" spit_publishing_concrete_publishing_host_parent_class = g_type_class_peek_parent (klass); #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" g_type_class_add_private (klass, sizeof (SpitPublishingConcretePublishingHostPrivate)); #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" G_OBJECT_CLASS (klass)->finalize = spit_publishing_concrete_publishing_host_finalize; -#line 1401 "PublishingPluginHost.c" +#line 1450 "PublishingPluginHost.c" } -static void spit_publishing_concrete_publishing_host_spit_publishing_plugin_host_interface_init (SpitPublishingPluginHostIface * iface) { +static void +spit_publishing_concrete_publishing_host_spit_publishing_plugin_host_interface_init (SpitPublishingPluginHostIface * iface) +{ #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" spit_publishing_concrete_publishing_host_spit_publishing_plugin_host_parent_iface = g_type_interface_peek_parent (iface); #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" @@ -1439,11 +1490,13 @@ static void spit_publishing_concrete_publishing_host_spit_publishing_plugin_host iface->get_publishables = (SpitPublishingPublishable** (*) (SpitPublishingPluginHost *, int*)) spit_publishing_concrete_publishing_host_real_get_publishables; #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" iface->serialize_publishables = (SpitPublishingProgressCallback (*) (SpitPublishingPluginHost *, gint, gboolean, void**, GDestroyNotify*)) spit_publishing_concrete_publishing_host_real_serialize_publishables; -#line 1438 "PublishingPluginHost.c" +#line 1489 "PublishingPluginHost.c" } -static void spit_publishing_concrete_publishing_host_instance_init (SpitPublishingConcretePublishingHost * self) { +static void +spit_publishing_concrete_publishing_host_instance_init (SpitPublishingConcretePublishingHost * self) +{ #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" self->priv = SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_GET_PRIVATE (self); #line 16 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" @@ -1464,11 +1517,13 @@ static void spit_publishing_concrete_publishing_host_instance_init (SpitPublishi self->priv->publishing_halted = FALSE; #line 21 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" self->priv->media_type = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_NONE; -#line 1463 "PublishingPluginHost.c" +#line 1516 "PublishingPluginHost.c" } -static void spit_publishing_concrete_publishing_host_finalize (GObject * obj) { +static void +spit_publishing_concrete_publishing_host_finalize (GObject * obj) +{ SpitPublishingConcretePublishingHost * self; #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost); @@ -1478,11 +1533,13 @@ static void spit_publishing_concrete_publishing_host_finalize (GObject * obj) { self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL); #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala" G_OBJECT_CLASS (spit_publishing_concrete_publishing_host_parent_class)->finalize (obj); -#line 1477 "PublishingPluginHost.c" +#line 1532 "PublishingPluginHost.c" } -GType spit_publishing_concrete_publishing_host_get_type (void) { +GType +spit_publishing_concrete_publishing_host_get_type (void) +{ static volatile gsize spit_publishing_concrete_publishing_host_type_id__volatile = 0; if (g_once_init_enter (&spit_publishing_concrete_publishing_host_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SpitPublishingConcretePublishingHostClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) spit_publishing_concrete_publishing_host_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SpitPublishingConcretePublishingHost), 0, (GInstanceInitFunc) spit_publishing_concrete_publishing_host_instance_init, NULL }; @@ -1496,7 +1553,11 @@ GType spit_publishing_concrete_publishing_host_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -1508,7 +1569,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/publishing/PublishingUI.c b/src/publishing/PublishingUI.c index 86bf534..218b1ff 100644 --- a/src/publishing/PublishingUI.c +++ b/src/publishing/PublishingUI.c @@ -1,4 +1,4 @@ -/* PublishingUI.c generated by valac 0.36.6, the Vala compiler +/* PublishingUI.c generated by valac 0.40.4, the Vala compiler * generated from PublishingUI.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include "shotwell-plugin-dev-1.0.h" @@ -31,6 +32,11 @@ typedef struct _PublishingUIConcreteDialogPane PublishingUIConcreteDialogPane; typedef struct _PublishingUIConcreteDialogPaneClass PublishingUIConcreteDialogPaneClass; typedef struct _PublishingUIConcreteDialogPanePrivate PublishingUIConcreteDialogPanePrivate; +enum { + PUBLISHING_UI_CONCRETE_DIALOG_PANE_0_PROPERTY, + PUBLISHING_UI_CONCRETE_DIALOG_PANE_NUM_PROPERTIES +}; +static GParamSpec* publishing_ui_concrete_dialog_pane_properties[PUBLISHING_UI_CONCRETE_DIALOG_PANE_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define PUBLISHING_UI_TYPE_STATIC_MESSAGE_PANE (publishing_ui_static_message_pane_get_type ()) @@ -43,6 +49,11 @@ typedef struct _PublishingUIConcreteDialogPanePrivate PublishingUIConcreteDialog typedef struct _PublishingUIStaticMessagePane PublishingUIStaticMessagePane; typedef struct _PublishingUIStaticMessagePaneClass PublishingUIStaticMessagePaneClass; typedef struct _PublishingUIStaticMessagePanePrivate PublishingUIStaticMessagePanePrivate; +enum { + PUBLISHING_UI_STATIC_MESSAGE_PANE_0_PROPERTY, + PUBLISHING_UI_STATIC_MESSAGE_PANE_NUM_PROPERTIES +}; +static GParamSpec* publishing_ui_static_message_pane_properties[PUBLISHING_UI_STATIC_MESSAGE_PANE_NUM_PROPERTIES]; #define PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE (publishing_ui_login_welcome_pane_get_type ()) #define PUBLISHING_UI_LOGIN_WELCOME_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, PublishingUILoginWelcomePane)) @@ -54,11 +65,16 @@ typedef struct _PublishingUIStaticMessagePanePrivate PublishingUIStaticMessagePa typedef struct _PublishingUILoginWelcomePane PublishingUILoginWelcomePane; typedef struct _PublishingUILoginWelcomePaneClass PublishingUILoginWelcomePaneClass; typedef struct _PublishingUILoginWelcomePanePrivate PublishingUILoginWelcomePanePrivate; +enum { + PUBLISHING_UI_LOGIN_WELCOME_PANE_0_PROPERTY, + PUBLISHING_UI_LOGIN_WELCOME_PANE_NUM_PROPERTIES +}; +static GParamSpec* publishing_ui_login_welcome_pane_properties[PUBLISHING_UI_LOGIN_WELCOME_PANE_NUM_PROPERTIES]; enum { PUBLISHING_UI_LOGIN_WELCOME_PANE_LOGIN_REQUESTED_SIGNAL, - PUBLISHING_UI_LOGIN_WELCOME_PANE_LAST_SIGNAL + PUBLISHING_UI_LOGIN_WELCOME_PANE_NUM_SIGNALS }; -static guint publishing_ui_login_welcome_pane_signals[PUBLISHING_UI_LOGIN_WELCOME_PANE_LAST_SIGNAL] = {0}; +static guint publishing_ui_login_welcome_pane_signals[PUBLISHING_UI_LOGIN_WELCOME_PANE_NUM_SIGNALS] = {0}; #define PUBLISHING_UI_TYPE_PROGRESS_PANE (publishing_ui_progress_pane_get_type ()) #define PUBLISHING_UI_PROGRESS_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_UI_TYPE_PROGRESS_PANE, PublishingUIProgressPane)) @@ -70,6 +86,11 @@ static guint publishing_ui_login_welcome_pane_signals[PUBLISHING_UI_LOGIN_WELCOM typedef struct _PublishingUIProgressPane PublishingUIProgressPane; typedef struct _PublishingUIProgressPaneClass PublishingUIProgressPaneClass; typedef struct _PublishingUIProgressPanePrivate PublishingUIProgressPanePrivate; +enum { + PUBLISHING_UI_PROGRESS_PANE_0_PROPERTY, + PUBLISHING_UI_PROGRESS_PANE_NUM_PROPERTIES +}; +static GParamSpec* publishing_ui_progress_pane_properties[PUBLISHING_UI_PROGRESS_PANE_NUM_PROPERTIES]; #define PUBLISHING_UI_TYPE_SUCCESS_PANE (publishing_ui_success_pane_get_type ()) #define PUBLISHING_UI_SUCCESS_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_UI_TYPE_SUCCESS_PANE, PublishingUISuccessPane)) @@ -81,6 +102,11 @@ typedef struct _PublishingUIProgressPanePrivate PublishingUIProgressPanePrivate; typedef struct _PublishingUISuccessPane PublishingUISuccessPane; typedef struct _PublishingUISuccessPaneClass PublishingUISuccessPaneClass; typedef struct _PublishingUISuccessPanePrivate PublishingUISuccessPanePrivate; +enum { + PUBLISHING_UI_SUCCESS_PANE_0_PROPERTY, + PUBLISHING_UI_SUCCESS_PANE_NUM_PROPERTIES +}; +static GParamSpec* publishing_ui_success_pane_properties[PUBLISHING_UI_SUCCESS_PANE_NUM_PROPERTIES]; #define _g_free0(var) (var = (g_free (var), NULL)) #define PUBLISHING_UI_TYPE_ACCOUNT_FETCH_WAIT_PANE (publishing_ui_account_fetch_wait_pane_get_type ()) @@ -93,6 +119,11 @@ typedef struct _PublishingUISuccessPanePrivate PublishingUISuccessPanePrivate; typedef struct _PublishingUIAccountFetchWaitPane PublishingUIAccountFetchWaitPane; typedef struct _PublishingUIAccountFetchWaitPaneClass PublishingUIAccountFetchWaitPaneClass; typedef struct _PublishingUIAccountFetchWaitPanePrivate PublishingUIAccountFetchWaitPanePrivate; +enum { + PUBLISHING_UI_ACCOUNT_FETCH_WAIT_PANE_0_PROPERTY, + PUBLISHING_UI_ACCOUNT_FETCH_WAIT_PANE_NUM_PROPERTIES +}; +static GParamSpec* publishing_ui_account_fetch_wait_pane_properties[PUBLISHING_UI_ACCOUNT_FETCH_WAIT_PANE_NUM_PROPERTIES]; #define PUBLISHING_UI_TYPE_LOGIN_WAIT_PANE (publishing_ui_login_wait_pane_get_type ()) #define PUBLISHING_UI_LOGIN_WAIT_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_UI_TYPE_LOGIN_WAIT_PANE, PublishingUILoginWaitPane)) @@ -104,6 +135,11 @@ typedef struct _PublishingUIAccountFetchWaitPanePrivate PublishingUIAccountFetch typedef struct _PublishingUILoginWaitPane PublishingUILoginWaitPane; typedef struct _PublishingUILoginWaitPaneClass PublishingUILoginWaitPaneClass; typedef struct _PublishingUILoginWaitPanePrivate PublishingUILoginWaitPanePrivate; +enum { + PUBLISHING_UI_LOGIN_WAIT_PANE_0_PROPERTY, + PUBLISHING_UI_LOGIN_WAIT_PANE_NUM_PROPERTIES +}; +static GParamSpec* publishing_ui_login_wait_pane_properties[PUBLISHING_UI_LOGIN_WAIT_PANE_NUM_PROPERTIES]; #define PUBLISHING_UI_TYPE_PUBLISHING_DIALOG (publishing_ui_publishing_dialog_get_type ()) #define PUBLISHING_UI_PUBLISHING_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_UI_TYPE_PUBLISHING_DIALOG, PublishingUIPublishingDialog)) @@ -135,6 +171,11 @@ typedef struct _PluginsStandardHostInterfaceClass PluginsStandardHostInterfaceCl typedef struct _SpitPublishingConcretePublishingHost SpitPublishingConcretePublishingHost; typedef struct _SpitPublishingConcretePublishingHostClass SpitPublishingConcretePublishingHostClass; +enum { + PUBLISHING_UI_PUBLISHING_DIALOG_0_PROPERTY, + PUBLISHING_UI_PUBLISHING_DIALOG_NUM_PROPERTIES +}; +static GParamSpec* publishing_ui_publishing_dialog_properties[PUBLISHING_UI_PUBLISHING_DIALOG_NUM_PROPERTIES]; #define TYPE_DATA_OBJECT (data_object_get_type ()) #define DATA_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_OBJECT, DataObject)) @@ -399,12 +440,10 @@ static gboolean publishing_ui_publishing_dialog_elapsed_is_valid; static gboolean publishing_ui_publishing_dialog_elapsed_is_valid = FALSE; GType publishing_ui_concrete_dialog_pane_get_type (void) G_GNUC_CONST; -enum { - PUBLISHING_UI_CONCRETE_DIALOG_PANE_DUMMY_PROPERTY -}; PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_new (void); PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_construct (GType object_type); -GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user); +GtkBuilder* app_window_create_builder (const gchar* glade_filename, + void* user); static GtkWidget* publishing_ui_concrete_dialog_pane_real_get_widget (SpitPublishingDialogPane* base); static SpitPublishingDialogPaneGeometryOptions publishing_ui_concrete_dialog_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base); static void publishing_ui_concrete_dialog_pane_real_on_pane_installed (SpitPublishingDialogPane* base); @@ -412,58 +451,49 @@ static void publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitPub static void publishing_ui_concrete_dialog_pane_finalize (GObject * obj); GType publishing_ui_static_message_pane_get_type (void) G_GNUC_CONST; #define PUBLISHING_UI_STATIC_MESSAGE_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_UI_TYPE_STATIC_MESSAGE_PANE, PublishingUIStaticMessagePanePrivate)) -enum { - PUBLISHING_UI_STATIC_MESSAGE_PANE_DUMMY_PROPERTY -}; -PublishingUIStaticMessagePane* publishing_ui_static_message_pane_new (const gchar* message_string, gboolean enable_markup); -PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GType object_type, const gchar* message_string, gboolean enable_markup); +PublishingUIStaticMessagePane* publishing_ui_static_message_pane_new (const gchar* message_string, + gboolean enable_markup); +PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GType object_type, + const gchar* message_string, + gboolean enable_markup); static void publishing_ui_static_message_pane_finalize (GObject * obj); GType publishing_ui_login_welcome_pane_get_type (void) G_GNUC_CONST; #define PUBLISHING_UI_LOGIN_WELCOME_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, PublishingUILoginWelcomePanePrivate)) -enum { - PUBLISHING_UI_LOGIN_WELCOME_PANE_DUMMY_PROPERTY -}; PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_new (const gchar* service_welcome_message); -PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType object_type, const gchar* service_welcome_message); +PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType object_type, + const gchar* service_welcome_message); static void publishing_ui_login_welcome_pane_on_login_clicked (PublishingUILoginWelcomePane* self); -static void _publishing_ui_login_welcome_pane_on_login_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void _publishing_ui_login_welcome_pane_on_login_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self); static void publishing_ui_login_welcome_pane_finalize (GObject * obj); GType publishing_ui_progress_pane_get_type (void) G_GNUC_CONST; #define PUBLISHING_UI_PROGRESS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_UI_TYPE_PROGRESS_PANE, PublishingUIProgressPanePrivate)) -enum { - PUBLISHING_UI_PROGRESS_PANE_DUMMY_PROPERTY -}; PublishingUIProgressPane* publishing_ui_progress_pane_new (void); PublishingUIProgressPane* publishing_ui_progress_pane_construct (GType object_type); -void publishing_ui_progress_pane_set_text (PublishingUIProgressPane* self, const gchar* text); -void publishing_ui_progress_pane_set_progress (PublishingUIProgressPane* self, gdouble progress); -void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, const gchar* status_text, gdouble progress); +void publishing_ui_progress_pane_set_text (PublishingUIProgressPane* self, + const gchar* text); +void publishing_ui_progress_pane_set_progress (PublishingUIProgressPane* self, + gdouble progress); +void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, + const gchar* status_text, + gdouble progress); static void publishing_ui_progress_pane_finalize (GObject * obj); GType publishing_ui_success_pane_get_type (void) G_GNUC_CONST; -enum { - PUBLISHING_UI_SUCCESS_PANE_DUMMY_PROPERTY -}; -PublishingUISuccessPane* publishing_ui_success_pane_new (SpitPublishingPublisherMediaType published_media, gint num_uploaded); -PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type, SpitPublishingPublisherMediaType published_media, gint num_uploaded); +PublishingUISuccessPane* publishing_ui_success_pane_new (SpitPublishingPublisherMediaType published_media, + gint num_uploaded); +PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type, + SpitPublishingPublisherMediaType published_media, + gint num_uploaded); GType publishing_ui_account_fetch_wait_pane_get_type (void) G_GNUC_CONST; -enum { - PUBLISHING_UI_ACCOUNT_FETCH_WAIT_PANE_DUMMY_PROPERTY -}; PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_new (void); PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_construct (GType object_type); GType publishing_ui_login_wait_pane_get_type (void) G_GNUC_CONST; -enum { - PUBLISHING_UI_LOGIN_WAIT_PANE_DUMMY_PROPERTY -}; PublishingUILoginWaitPane* publishing_ui_login_wait_pane_new (void); PublishingUILoginWaitPane* publishing_ui_login_wait_pane_construct (GType object_type); GType publishing_ui_publishing_dialog_get_type (void) G_GNUC_CONST; GType plugins_standard_host_interface_get_type (void) G_GNUC_CONST; GType spit_publishing_concrete_publishing_host_get_type (void) G_GNUC_CONST; #define PUBLISHING_UI_PUBLISHING_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_UI_TYPE_PUBLISHING_DIALOG, PublishingUIPublishingDialogPrivate)) -enum { - PUBLISHING_UI_PUBLISHING_DIALOG_DUMMY_PROPERTY -}; #define PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH 860 #define PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT 688 #define PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH 1024 @@ -479,52 +509,97 @@ GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; PublishingUIPublishingDialog* publishing_ui_publishing_dialog_new (GeeCollection* to_publish); -PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType object_type, GeeCollection* to_publish); +PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType object_type, + GeeCollection* to_publish); gint resources_use_header_bar (void); GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); -static gboolean publishing_ui_publishing_dialog_on_window_close (PublishingUIPublishingDialog* self, GdkEventAny* evt); -static gboolean _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self); +static gboolean publishing_ui_publishing_dialog_on_window_close (PublishingUIPublishingDialog* self, + GdkEventAny* evt); +static gboolean _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, + GdkEventAny* event, + gpointer self); PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_new (MediaSource* to_wrap); -PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_construct (GType object_type, MediaSource* to_wrap); +PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_construct (GType object_type, + MediaSource* to_wrap); GType publishing_glue_media_source_publishable_wrapper_get_type (void) G_GNUC_CONST; -static void _vala_array_add58 (SpitPublishingPublishable** * array, int* length, int* size, SpitPublishingPublishable* value); +static void _vala_array_add58 (SpitPublishingPublishable** * array, + int* length, + int* size, + SpitPublishingPublishable* value); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); gchar* configuration_facade_get_last_used_service (ConfigurationFacade* self); -static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gboolean has_photos, gboolean has_videos, int* result_length1); -GdkPixbuf* resources_get_icon (const gchar* name, gint scale); +static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gboolean has_photos, + gboolean has_videos, + int* result_length1); +GdkPixbuf* resources_get_icon (const gchar* name, + gint scale); #define RESOURCES_ICON_GENERIC_PLUGIN "generic-plugin.png" #define RESOURCES_DEFAULT_ICON_SCALE 24 static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPublishingDialog* self); -static void _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); +static void _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self); static void publishing_ui_publishing_dialog_on_close_cancel_clicked (PublishingUIPublishingDialog* self); -static void _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self); static void publishing_ui_publishing_dialog_set_standard_window_mode (PublishingUIPublishingDialog* self); static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services (int* result_length1); -GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled); +GeeCollection* plugins_get_pluggables_for_type (GType type, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify, + gboolean include_disabled); gchar* plugins_get_pluggable_module_id (SpitPluggable* needle); -static void _vala_array_add59 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value); -static gint __lambda16_ (void* a, void* b); -gint utf8_cs_compare (void* a, void* b); -static gint ___lambda16____compar_fn_t (void* key1, void* key2); -static void _vala_array_add60 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value); -static void _vala_array_add61 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value); -static void _vala_array_add62 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value); +static void _vala_array_add59 (SpitPublishingService** * array, + int* length, + int* size, + SpitPublishingService* value); +static gint __lambda16_ (void* a, + void* b); +gint utf8_cs_compare (void* a, + void* b); +static gint ___lambda16____compar_fn_t (void* key1, + void* key2); +static void _vala_array_add60 (SpitPublishingService** * array, + int* length, + int* size, + SpitPublishingService* value); +static void _vala_array_add61 (SpitPublishingService** * array, + int* length, + int* size, + SpitPublishingService* value); +static void _vala_array_add62 (SpitPublishingService** * array, + int* length, + int* size, + SpitPublishingService* value); void publishing_ui_publishing_dialog_go (GeeCollection* to_publish); GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; GType video_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; -void media_source_collection_filter_media (GeeCollection* media, GeeCollection* photos, GeeCollection* videos); -void app_window_error_message_with_title (const gchar* title, const gchar* message, GtkWindow* parent, gboolean should_escape); +void media_source_collection_filter_media (GeeCollection* media, + GeeCollection* photos, + GeeCollection* videos); +void app_window_error_message_with_title (const gchar* title, + const gchar* message, + GtkWindow* parent, + gboolean should_escape); gint publishing_ui_publishing_dialog_run (PublishingUIPublishingDialog* self); -void configuration_facade_set_last_used_service (ConfigurationFacade* self, const gchar* service_name); -SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_new (SpitPublishingService* service, PublishingUIPublishingDialog* dialog, SpitPublishingPublishable** publishables, int publishables_length1); -SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_construct (GType object_type, SpitPublishingService* service, PublishingUIPublishingDialog* dialog, SpitPublishingPublishable** publishables, int publishables_length1); +void configuration_facade_set_last_used_service (ConfigurationFacade* self, + const gchar* service_name); +SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_new (SpitPublishingService* service, + PublishingUIPublishingDialog* dialog, + SpitPublishingPublishable** publishables, + int publishables_length1); +SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_construct (GType object_type, + SpitPublishingService* service, + PublishingUIPublishingDialog* dialog, + SpitPublishingPublishable** publishables, + int publishables_length1); void spit_publishing_concrete_publishing_host_start_publishing (SpitPublishingConcretePublishingHost* self); static void publishing_ui_publishing_dialog_set_large_window_mode (PublishingUIPublishingDialog* self); static void publishing_ui_publishing_dialog_set_colossal_window_mode (PublishingUIPublishingDialog* self); @@ -535,13 +610,20 @@ void publishing_ui_publishing_dialog_set_close_button_mode (PublishingUIPublishi void publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublishingDialog* self); void publishing_ui_publishing_dialog_lock_service (PublishingUIPublishingDialog* self); void publishing_ui_publishing_dialog_unlock_service (PublishingUIPublishingDialog* self); -void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog* self, SpitPublishingDialogPane* pane); +void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog* self, + SpitPublishingDialogPane* pane); static void publishing_ui_publishing_dialog_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_construct (GType object_type) { +PublishingUIConcreteDialogPane* +publishing_ui_concrete_dialog_pane_construct (GType object_type) +{ PublishingUIConcreteDialogPane * self = NULL; GtkBuilder* _tmp0_; #line 13 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -554,25 +636,31 @@ PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_construct (GT self->builder = _tmp0_; #line 13 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return self; -#line 558 "PublishingUI.c" +#line 640 "PublishingUI.c" } -PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_new (void) { +PublishingUIConcreteDialogPane* +publishing_ui_concrete_dialog_pane_new (void) +{ #line 13 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return publishing_ui_concrete_dialog_pane_construct (PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE); -#line 565 "PublishingUI.c" +#line 649 "PublishingUI.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 18 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return self ? g_object_ref (self) : NULL; -#line 572 "PublishingUI.c" +#line 658 "PublishingUI.c" } -static GtkWidget* publishing_ui_concrete_dialog_pane_real_get_widget (SpitPublishingDialogPane* base) { +static GtkWidget* +publishing_ui_concrete_dialog_pane_real_get_widget (SpitPublishingDialogPane* base) +{ PublishingUIConcreteDialogPane * self; GtkWidget* result = NULL; GtkBox* _tmp0_; @@ -587,11 +675,13 @@ static GtkWidget* publishing_ui_concrete_dialog_pane_real_get_widget (SpitPublis result = _tmp1_; #line 18 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return result; -#line 591 "PublishingUI.c" +#line 679 "PublishingUI.c" } -static SpitPublishingDialogPaneGeometryOptions publishing_ui_concrete_dialog_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) { +static SpitPublishingDialogPaneGeometryOptions +publishing_ui_concrete_dialog_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) +{ PublishingUIConcreteDialogPane * self; SpitPublishingDialogPaneGeometryOptions result = 0; #line 21 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -600,36 +690,44 @@ static SpitPublishingDialogPaneGeometryOptions publishing_ui_concrete_dialog_pan result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 22 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return result; -#line 604 "PublishingUI.c" +#line 694 "PublishingUI.c" } -static void publishing_ui_concrete_dialog_pane_real_on_pane_installed (SpitPublishingDialogPane* base) { +static void +publishing_ui_concrete_dialog_pane_real_on_pane_installed (SpitPublishingDialogPane* base) +{ PublishingUIConcreteDialogPane * self; #line 25 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane); -#line 612 "PublishingUI.c" +#line 704 "PublishingUI.c" } -static void publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) { +static void +publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) +{ PublishingUIConcreteDialogPane * self; #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane); -#line 620 "PublishingUI.c" +#line 714 "PublishingUI.c" } -static void publishing_ui_concrete_dialog_pane_class_init (PublishingUIConcreteDialogPaneClass * klass) { +static void +publishing_ui_concrete_dialog_pane_class_init (PublishingUIConcreteDialogPaneClass * klass) +{ #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_concrete_dialog_pane_parent_class = g_type_class_peek_parent (klass); #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_OBJECT_CLASS (klass)->finalize = publishing_ui_concrete_dialog_pane_finalize; -#line 629 "PublishingUI.c" +#line 725 "PublishingUI.c" } -static void publishing_ui_concrete_dialog_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) { +static void +publishing_ui_concrete_dialog_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) +{ #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_concrete_dialog_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -640,20 +738,24 @@ static void publishing_ui_concrete_dialog_pane_spit_publishing_dialog_pane_inter iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_ui_concrete_dialog_pane_real_on_pane_installed; #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled; -#line 644 "PublishingUI.c" +#line 742 "PublishingUI.c" } -static void publishing_ui_concrete_dialog_pane_instance_init (PublishingUIConcreteDialogPane * self) { +static void +publishing_ui_concrete_dialog_pane_instance_init (PublishingUIConcreteDialogPane * self) +{ #line 10 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->pane_widget = NULL; #line 11 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->builder = NULL; -#line 653 "PublishingUI.c" +#line 753 "PublishingUI.c" } -static void publishing_ui_concrete_dialog_pane_finalize (GObject * obj) { +static void +publishing_ui_concrete_dialog_pane_finalize (GObject * obj) +{ PublishingUIConcreteDialogPane * self; #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane); @@ -663,11 +765,13 @@ static void publishing_ui_concrete_dialog_pane_finalize (GObject * obj) { _g_object_unref0 (self->builder); #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_OBJECT_CLASS (publishing_ui_concrete_dialog_pane_parent_class)->finalize (obj); -#line 667 "PublishingUI.c" +#line 769 "PublishingUI.c" } -GType publishing_ui_concrete_dialog_pane_get_type (void) { +GType +publishing_ui_concrete_dialog_pane_get_type (void) +{ static volatile gsize publishing_ui_concrete_dialog_pane_type_id__volatile = 0; if (g_once_init_enter (&publishing_ui_concrete_dialog_pane_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingUIConcreteDialogPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_ui_concrete_dialog_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingUIConcreteDialogPane), 0, (GInstanceInitFunc) publishing_ui_concrete_dialog_pane_instance_init, NULL }; @@ -681,7 +785,11 @@ GType publishing_ui_concrete_dialog_pane_get_type (void) { } -PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GType object_type, const gchar* message_string, gboolean enable_markup) { +PublishingUIStaticMessagePane* +publishing_ui_static_message_pane_construct (GType object_type, + const gchar* message_string, + gboolean enable_markup) +{ PublishingUIStaticMessagePane * self = NULL; GtkBuilder* _tmp0_; GObject* _tmp1_; @@ -689,7 +797,6 @@ PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GTyp GtkBuilder* _tmp3_; GObject* _tmp4_; GtkBox* _tmp5_; - gboolean _tmp6_; #line 35 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_val_if_fail (message_string != NULL, NULL); #line 36 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -715,74 +822,75 @@ PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GTyp #line 38 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane)->pane_widget = _tmp5_; #line 40 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp6_ = enable_markup; -#line 40 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp6_) { -#line 722 "PublishingUI.c" + if (enable_markup) { +#line 827 "PublishingUI.c" + GtkLabel* _tmp6_; GtkLabel* _tmp7_; - const gchar* _tmp8_; - GtkLabel* _tmp9_; - GtkLabel* _tmp10_; -#line 41 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp7_ = self->priv->msg_label; + GtkLabel* _tmp8_; #line 41 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp8_ = message_string; + _tmp6_ = self->priv->msg_label; #line 41 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_label_set_markup (_tmp7_, _tmp8_); + gtk_label_set_markup (_tmp6_, message_string); #line 42 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp9_ = self->priv->msg_label; + _tmp7_ = self->priv->msg_label; #line 42 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_label_set_line_wrap (_tmp9_, TRUE); + gtk_label_set_line_wrap (_tmp7_, TRUE); #line 43 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp10_ = self->priv->msg_label; + _tmp8_ = self->priv->msg_label; #line 43 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_label_set_use_markup (_tmp10_, TRUE); -#line 741 "PublishingUI.c" + gtk_label_set_use_markup (_tmp8_, TRUE); +#line 843 "PublishingUI.c" } else { - GtkLabel* _tmp11_; - const gchar* _tmp12_; -#line 45 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp11_ = self->priv->msg_label; + GtkLabel* _tmp9_; #line 45 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp12_ = message_string; + _tmp9_ = self->priv->msg_label; #line 45 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_label_set_label (_tmp11_, _tmp12_); -#line 751 "PublishingUI.c" + gtk_label_set_label (_tmp9_, message_string); +#line 850 "PublishingUI.c" } #line 35 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return self; -#line 755 "PublishingUI.c" +#line 854 "PublishingUI.c" } -PublishingUIStaticMessagePane* publishing_ui_static_message_pane_new (const gchar* message_string, gboolean enable_markup) { +PublishingUIStaticMessagePane* +publishing_ui_static_message_pane_new (const gchar* message_string, + gboolean enable_markup) +{ #line 35 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return publishing_ui_static_message_pane_construct (PUBLISHING_UI_TYPE_STATIC_MESSAGE_PANE, message_string, enable_markup); -#line 762 "PublishingUI.c" +#line 864 "PublishingUI.c" } -static void publishing_ui_static_message_pane_class_init (PublishingUIStaticMessagePaneClass * klass) { +static void +publishing_ui_static_message_pane_class_init (PublishingUIStaticMessagePaneClass * klass) +{ #line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_static_message_pane_parent_class = g_type_class_peek_parent (klass); #line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_type_class_add_private (klass, sizeof (PublishingUIStaticMessagePanePrivate)); #line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_OBJECT_CLASS (klass)->finalize = publishing_ui_static_message_pane_finalize; -#line 773 "PublishingUI.c" +#line 877 "PublishingUI.c" } -static void publishing_ui_static_message_pane_instance_init (PublishingUIStaticMessagePane * self) { +static void +publishing_ui_static_message_pane_instance_init (PublishingUIStaticMessagePane * self) +{ #line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv = PUBLISHING_UI_STATIC_MESSAGE_PANE_GET_PRIVATE (self); #line 33 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv->msg_label = NULL; -#line 782 "PublishingUI.c" +#line 888 "PublishingUI.c" } -static void publishing_ui_static_message_pane_finalize (GObject * obj) { +static void +publishing_ui_static_message_pane_finalize (GObject * obj) +{ PublishingUIStaticMessagePane * self; #line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_STATIC_MESSAGE_PANE, PublishingUIStaticMessagePane); @@ -790,11 +898,13 @@ static void publishing_ui_static_message_pane_finalize (GObject * obj) { _g_object_unref0 (self->priv->msg_label); #line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_OBJECT_CLASS (publishing_ui_static_message_pane_parent_class)->finalize (obj); -#line 794 "PublishingUI.c" +#line 902 "PublishingUI.c" } -GType publishing_ui_static_message_pane_get_type (void) { +GType +publishing_ui_static_message_pane_get_type (void) +{ static volatile gsize publishing_ui_static_message_pane_type_id__volatile = 0; if (g_once_init_enter (&publishing_ui_static_message_pane_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingUIStaticMessagePaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_ui_static_message_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingUIStaticMessagePane), 0, (GInstanceInitFunc) publishing_ui_static_message_pane_instance_init, NULL }; @@ -806,14 +916,20 @@ GType publishing_ui_static_message_pane_get_type (void) { } -static void _publishing_ui_login_welcome_pane_on_login_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_publishing_ui_login_welcome_pane_on_login_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 62 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_login_welcome_pane_on_login_clicked ((PublishingUILoginWelcomePane*) self); -#line 813 "PublishingUI.c" +#line 926 "PublishingUI.c" } -PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType object_type, const gchar* service_welcome_message) { +PublishingUILoginWelcomePane* +publishing_ui_login_welcome_pane_construct (GType object_type, + const gchar* service_welcome_message) +{ PublishingUILoginWelcomePane * self = NULL; GtkBuilder* _tmp0_; GObject* _tmp1_; @@ -827,7 +943,6 @@ PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType GtkButton* _tmp9_; GtkLabel* _tmp10_; GtkLabel* _tmp11_; - const gchar* _tmp12_; #line 56 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_val_if_fail (service_welcome_message != NULL, NULL); #line 57 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -873,32 +988,36 @@ PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType #line 64 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp11_ = self->priv->not_logged_in_label; #line 64 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp12_ = service_welcome_message; -#line 64 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_label_set_markup (_tmp11_, _tmp12_); + gtk_label_set_markup (_tmp11_, service_welcome_message); #line 56 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return self; -#line 882 "PublishingUI.c" +#line 995 "PublishingUI.c" } -PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_new (const gchar* service_welcome_message) { +PublishingUILoginWelcomePane* +publishing_ui_login_welcome_pane_new (const gchar* service_welcome_message) +{ #line 56 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return publishing_ui_login_welcome_pane_construct (PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, service_welcome_message); -#line 889 "PublishingUI.c" +#line 1004 "PublishingUI.c" } -static void publishing_ui_login_welcome_pane_on_login_clicked (PublishingUILoginWelcomePane* self) { +static void +publishing_ui_login_welcome_pane_on_login_clicked (PublishingUILoginWelcomePane* self) +{ #line 67 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_LOGIN_WELCOME_PANE (self)); #line 68 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_signal_emit (self, publishing_ui_login_welcome_pane_signals[PUBLISHING_UI_LOGIN_WELCOME_PANE_LOGIN_REQUESTED_SIGNAL], 0); -#line 898 "PublishingUI.c" +#line 1015 "PublishingUI.c" } -static void publishing_ui_login_welcome_pane_class_init (PublishingUILoginWelcomePaneClass * klass) { +static void +publishing_ui_login_welcome_pane_class_init (PublishingUILoginWelcomePaneClass * klass) +{ #line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_login_welcome_pane_parent_class = g_type_class_peek_parent (klass); #line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -907,22 +1026,26 @@ static void publishing_ui_login_welcome_pane_class_init (PublishingUILoginWelcom G_OBJECT_CLASS (klass)->finalize = publishing_ui_login_welcome_pane_finalize; #line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_login_welcome_pane_signals[PUBLISHING_UI_LOGIN_WELCOME_PANE_LOGIN_REQUESTED_SIGNAL] = g_signal_new ("login-requested", PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 911 "PublishingUI.c" +#line 1030 "PublishingUI.c" } -static void publishing_ui_login_welcome_pane_instance_init (PublishingUILoginWelcomePane * self) { +static void +publishing_ui_login_welcome_pane_instance_init (PublishingUILoginWelcomePane * self) +{ #line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv = PUBLISHING_UI_LOGIN_WELCOME_PANE_GET_PRIVATE (self); #line 51 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv->login_button = NULL; #line 52 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv->not_logged_in_label = NULL; -#line 922 "PublishingUI.c" +#line 1043 "PublishingUI.c" } -static void publishing_ui_login_welcome_pane_finalize (GObject * obj) { +static void +publishing_ui_login_welcome_pane_finalize (GObject * obj) +{ PublishingUILoginWelcomePane * self; #line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, PublishingUILoginWelcomePane); @@ -932,11 +1055,13 @@ static void publishing_ui_login_welcome_pane_finalize (GObject * obj) { _g_object_unref0 (self->priv->not_logged_in_label); #line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_OBJECT_CLASS (publishing_ui_login_welcome_pane_parent_class)->finalize (obj); -#line 936 "PublishingUI.c" +#line 1059 "PublishingUI.c" } -GType publishing_ui_login_welcome_pane_get_type (void) { +GType +publishing_ui_login_welcome_pane_get_type (void) +{ static volatile gsize publishing_ui_login_welcome_pane_type_id__volatile = 0; if (g_once_init_enter (&publishing_ui_login_welcome_pane_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingUILoginWelcomePaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_ui_login_welcome_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingUILoginWelcomePane), 0, (GInstanceInitFunc) publishing_ui_login_welcome_pane_instance_init, NULL }; @@ -948,7 +1073,9 @@ GType publishing_ui_login_welcome_pane_get_type (void) { } -PublishingUIProgressPane* publishing_ui_progress_pane_construct (GType object_type) { +PublishingUIProgressPane* +publishing_ui_progress_pane_construct (GType object_type) +{ PublishingUIProgressPane * self = NULL; GtkBuilder* _tmp0_; GObject* _tmp1_; @@ -980,20 +1107,24 @@ PublishingUIProgressPane* publishing_ui_progress_pane_construct (GType object_ty self->priv->progress_bar = _tmp5_; #line 75 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return self; -#line 984 "PublishingUI.c" +#line 1111 "PublishingUI.c" } -PublishingUIProgressPane* publishing_ui_progress_pane_new (void) { +PublishingUIProgressPane* +publishing_ui_progress_pane_new (void) +{ #line 75 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return publishing_ui_progress_pane_construct (PUBLISHING_UI_TYPE_PROGRESS_PANE); -#line 991 "PublishingUI.c" +#line 1120 "PublishingUI.c" } -void publishing_ui_progress_pane_set_text (PublishingUIProgressPane* self, const gchar* text) { +void +publishing_ui_progress_pane_set_text (PublishingUIProgressPane* self, + const gchar* text) +{ GtkProgressBar* _tmp0_; - const gchar* _tmp1_; #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PROGRESS_PANE (self)); #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -1001,85 +1132,84 @@ void publishing_ui_progress_pane_set_text (PublishingUIProgressPane* self, const #line 82 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = self->priv->progress_bar; #line 82 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp1_ = text; -#line 82 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_progress_bar_set_text (_tmp0_, _tmp1_); -#line 1008 "PublishingUI.c" + gtk_progress_bar_set_text (_tmp0_, text); +#line 1137 "PublishingUI.c" } -void publishing_ui_progress_pane_set_progress (PublishingUIProgressPane* self, gdouble progress) { +void +publishing_ui_progress_pane_set_progress (PublishingUIProgressPane* self, + gdouble progress) +{ GtkProgressBar* _tmp0_; - gdouble _tmp1_; #line 85 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PROGRESS_PANE (self)); #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = self->priv->progress_bar; #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp1_ = progress; -#line 86 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_progress_bar_set_fraction (_tmp0_, _tmp1_); -#line 1023 "PublishingUI.c" + gtk_progress_bar_set_fraction (_tmp0_, progress); +#line 1152 "PublishingUI.c" } -void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, const gchar* status_text, gdouble progress) { - const gchar* _tmp0_; - GtkProgressBar* _tmp1_; - const gchar* _tmp2_; - gdouble _tmp5_; +void +publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, + const gchar* status_text, + gdouble progress) +{ + GtkProgressBar* _tmp0_; + const gchar* _tmp1_; #line 89 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PROGRESS_PANE (self)); #line 89 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (status_text != NULL); #line 90 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp0_ = status_text; -#line 90 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp1_ = self->priv->progress_bar; + _tmp0_ = self->priv->progress_bar; #line 90 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp2_ = gtk_progress_bar_get_text (_tmp1_); + _tmp1_ = gtk_progress_bar_get_text (_tmp0_); #line 90 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (g_strcmp0 (_tmp0_, _tmp2_) != 0) { -#line 1044 "PublishingUI.c" - GtkProgressBar* _tmp3_; - const gchar* _tmp4_; -#line 91 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp3_ = self->priv->progress_bar; + if (g_strcmp0 (status_text, _tmp1_) != 0) { +#line 1173 "PublishingUI.c" + GtkProgressBar* _tmp2_; #line 91 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp4_ = status_text; + _tmp2_ = self->priv->progress_bar; #line 91 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_progress_bar_set_text (_tmp3_, _tmp4_); -#line 1053 "PublishingUI.c" + gtk_progress_bar_set_text (_tmp2_, status_text); +#line 1179 "PublishingUI.c" } #line 93 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp5_ = progress; -#line 93 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - publishing_ui_progress_pane_set_progress (self, _tmp5_); -#line 1059 "PublishingUI.c" + publishing_ui_progress_pane_set_progress (self, progress); +#line 1183 "PublishingUI.c" } -static void publishing_ui_progress_pane_class_init (PublishingUIProgressPaneClass * klass) { +static void +publishing_ui_progress_pane_class_init (PublishingUIProgressPaneClass * klass) +{ #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_progress_pane_parent_class = g_type_class_peek_parent (klass); #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_type_class_add_private (klass, sizeof (PublishingUIProgressPanePrivate)); #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_OBJECT_CLASS (klass)->finalize = publishing_ui_progress_pane_finalize; -#line 1070 "PublishingUI.c" +#line 1196 "PublishingUI.c" } -static void publishing_ui_progress_pane_instance_init (PublishingUIProgressPane * self) { +static void +publishing_ui_progress_pane_instance_init (PublishingUIProgressPane * self) +{ #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv = PUBLISHING_UI_PROGRESS_PANE_GET_PRIVATE (self); #line 73 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv->progress_bar = NULL; -#line 1079 "PublishingUI.c" +#line 1207 "PublishingUI.c" } -static void publishing_ui_progress_pane_finalize (GObject * obj) { +static void +publishing_ui_progress_pane_finalize (GObject * obj) +{ PublishingUIProgressPane * self; #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_PROGRESS_PANE, PublishingUIProgressPane); @@ -1087,11 +1217,13 @@ static void publishing_ui_progress_pane_finalize (GObject * obj) { _g_object_unref0 (self->priv->progress_bar); #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_OBJECT_CLASS (publishing_ui_progress_pane_parent_class)->finalize (obj); -#line 1091 "PublishingUI.c" +#line 1221 "PublishingUI.c" } -GType publishing_ui_progress_pane_get_type (void) { +GType +publishing_ui_progress_pane_get_type (void) +{ static volatile gsize publishing_ui_progress_pane_type_id__volatile = 0; if (g_once_init_enter (&publishing_ui_progress_pane_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingUIProgressPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_ui_progress_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingUIProgressPane), 0, (GInstanceInitFunc) publishing_ui_progress_pane_instance_init, NULL }; @@ -1103,100 +1235,98 @@ GType publishing_ui_progress_pane_get_type (void) { } -PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type, SpitPublishingPublisherMediaType published_media, gint num_uploaded) { +PublishingUISuccessPane* +publishing_ui_success_pane_construct (GType object_type, + SpitPublishingPublisherMediaType published_media, + gint num_uploaded) +{ PublishingUISuccessPane * self = NULL; gchar* message_string = NULL; - SpitPublishingPublisherMediaType _tmp0_; - const gchar* _tmp8_; + const gchar* _tmp3_; #line 99 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" message_string = NULL; #line 103 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp0_ = published_media; -#line 103 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 1118 "PublishingUI.c" - gint _tmp1_; - gchar* _tmp2_; -#line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp1_ = num_uploaded; + if (published_media == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { +#line 1251 "PublishingUI.c" + gchar* _tmp0_; #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp2_ = g_strdup (ngettext ("The selected video was successfully published.", "The selected videos were successfully published.", (gulong) _tmp1_)); + _tmp0_ = g_strdup (ngettext ("The selected video was successfully published.", "The selected videos were successfully published.", (gulong) num_uploaded)); #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_free0 (message_string); #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - message_string = _tmp2_; -#line 1129 "PublishingUI.c" + message_string = _tmp0_; +#line 1259 "PublishingUI.c" } else { - SpitPublishingPublisherMediaType _tmp3_; #line 108 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp3_ = published_media; -#line 108 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp3_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) { -#line 1136 "PublishingUI.c" - gint _tmp4_; - gchar* _tmp5_; -#line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp4_ = num_uploaded; + if (published_media == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) { +#line 1263 "PublishingUI.c" + gchar* _tmp1_; #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp5_ = g_strdup (ngettext ("The selected photo was successfully published.", "The selected photos were successfully published.", (gulong) _tmp4_)); + _tmp1_ = g_strdup (ngettext ("The selected photo was successfully published.", "The selected photos were successfully published.", (gulong) num_uploaded)); #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_free0 (message_string); #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - message_string = _tmp5_; -#line 1147 "PublishingUI.c" + message_string = _tmp1_; +#line 1271 "PublishingUI.c" } else { - SpitPublishingPublisherMediaType _tmp6_; -#line 113 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp6_ = published_media; #line 113 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp6_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) { -#line 1154 "PublishingUI.c" - gchar* _tmp7_; + if (published_media == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) { +#line 1275 "PublishingUI.c" + gchar* _tmp2_; #line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp7_ = g_strdup (_ ("The selected photos/videos were successfully published.")); + _tmp2_ = g_strdup (_ ("The selected photos/videos were successfully published.")); #line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_free0 (message_string); #line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - message_string = _tmp7_; -#line 1162 "PublishingUI.c" + message_string = _tmp2_; +#line 1283 "PublishingUI.c" } else { #line 118 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_assert_not_reached (); -#line 1166 "PublishingUI.c" +#line 1287 "PublishingUI.c" } } } #line 121 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp8_ = message_string; + _tmp3_ = message_string; #line 121 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - self = (PublishingUISuccessPane*) publishing_ui_static_message_pane_construct (object_type, _tmp8_, FALSE); + self = (PublishingUISuccessPane*) publishing_ui_static_message_pane_construct (object_type, _tmp3_, FALSE); #line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_free0 (message_string); #line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return self; -#line 1178 "PublishingUI.c" +#line 1299 "PublishingUI.c" } -PublishingUISuccessPane* publishing_ui_success_pane_new (SpitPublishingPublisherMediaType published_media, gint num_uploaded) { +PublishingUISuccessPane* +publishing_ui_success_pane_new (SpitPublishingPublisherMediaType published_media, + gint num_uploaded) +{ #line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return publishing_ui_success_pane_construct (PUBLISHING_UI_TYPE_SUCCESS_PANE, published_media, num_uploaded); -#line 1185 "PublishingUI.c" +#line 1309 "PublishingUI.c" } -static void publishing_ui_success_pane_class_init (PublishingUISuccessPaneClass * klass) { +static void +publishing_ui_success_pane_class_init (PublishingUISuccessPaneClass * klass) +{ #line 97 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_success_pane_parent_class = g_type_class_peek_parent (klass); -#line 1192 "PublishingUI.c" +#line 1318 "PublishingUI.c" } -static void publishing_ui_success_pane_instance_init (PublishingUISuccessPane * self) { +static void +publishing_ui_success_pane_instance_init (PublishingUISuccessPane * self) +{ } -GType publishing_ui_success_pane_get_type (void) { +GType +publishing_ui_success_pane_get_type (void) +{ static volatile gsize publishing_ui_success_pane_type_id__volatile = 0; if (g_once_init_enter (&publishing_ui_success_pane_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingUISuccessPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_ui_success_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingUISuccessPane), 0, (GInstanceInitFunc) publishing_ui_success_pane_instance_init, NULL }; @@ -1208,35 +1338,45 @@ GType publishing_ui_success_pane_get_type (void) { } -PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_construct (GType object_type) { +PublishingUIAccountFetchWaitPane* +publishing_ui_account_fetch_wait_pane_construct (GType object_type) +{ PublishingUIAccountFetchWaitPane * self = NULL; #line 127 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self = (PublishingUIAccountFetchWaitPane*) publishing_ui_static_message_pane_construct (object_type, _ ("Fetching account information…"), FALSE); #line 126 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return self; -#line 1218 "PublishingUI.c" +#line 1350 "PublishingUI.c" } -PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_new (void) { +PublishingUIAccountFetchWaitPane* +publishing_ui_account_fetch_wait_pane_new (void) +{ #line 126 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return publishing_ui_account_fetch_wait_pane_construct (PUBLISHING_UI_TYPE_ACCOUNT_FETCH_WAIT_PANE); -#line 1225 "PublishingUI.c" +#line 1359 "PublishingUI.c" } -static void publishing_ui_account_fetch_wait_pane_class_init (PublishingUIAccountFetchWaitPaneClass * klass) { +static void +publishing_ui_account_fetch_wait_pane_class_init (PublishingUIAccountFetchWaitPaneClass * klass) +{ #line 125 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_account_fetch_wait_pane_parent_class = g_type_class_peek_parent (klass); -#line 1232 "PublishingUI.c" +#line 1368 "PublishingUI.c" } -static void publishing_ui_account_fetch_wait_pane_instance_init (PublishingUIAccountFetchWaitPane * self) { +static void +publishing_ui_account_fetch_wait_pane_instance_init (PublishingUIAccountFetchWaitPane * self) +{ } -GType publishing_ui_account_fetch_wait_pane_get_type (void) { +GType +publishing_ui_account_fetch_wait_pane_get_type (void) +{ static volatile gsize publishing_ui_account_fetch_wait_pane_type_id__volatile = 0; if (g_once_init_enter (&publishing_ui_account_fetch_wait_pane_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingUIAccountFetchWaitPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_ui_account_fetch_wait_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingUIAccountFetchWaitPane), 0, (GInstanceInitFunc) publishing_ui_account_fetch_wait_pane_instance_init, NULL }; @@ -1248,35 +1388,45 @@ GType publishing_ui_account_fetch_wait_pane_get_type (void) { } -PublishingUILoginWaitPane* publishing_ui_login_wait_pane_construct (GType object_type) { +PublishingUILoginWaitPane* +publishing_ui_login_wait_pane_construct (GType object_type) +{ PublishingUILoginWaitPane * self = NULL; #line 133 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self = (PublishingUILoginWaitPane*) publishing_ui_static_message_pane_construct (object_type, _ ("Logging in…"), FALSE); #line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return self; -#line 1258 "PublishingUI.c" +#line 1400 "PublishingUI.c" } -PublishingUILoginWaitPane* publishing_ui_login_wait_pane_new (void) { +PublishingUILoginWaitPane* +publishing_ui_login_wait_pane_new (void) +{ #line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return publishing_ui_login_wait_pane_construct (PUBLISHING_UI_TYPE_LOGIN_WAIT_PANE); -#line 1265 "PublishingUI.c" +#line 1409 "PublishingUI.c" } -static void publishing_ui_login_wait_pane_class_init (PublishingUILoginWaitPaneClass * klass) { +static void +publishing_ui_login_wait_pane_class_init (PublishingUILoginWaitPaneClass * klass) +{ #line 131 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_login_wait_pane_parent_class = g_type_class_peek_parent (klass); -#line 1272 "PublishingUI.c" +#line 1418 "PublishingUI.c" } -static void publishing_ui_login_wait_pane_instance_init (PublishingUILoginWaitPane * self) { +static void +publishing_ui_login_wait_pane_instance_init (PublishingUILoginWaitPane * self) +{ } -GType publishing_ui_login_wait_pane_get_type (void) { +GType +publishing_ui_login_wait_pane_get_type (void) +{ static volatile gsize publishing_ui_login_wait_pane_type_id__volatile = 0; if (g_once_init_enter (&publishing_ui_login_wait_pane_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingUILoginWaitPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_ui_login_wait_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingUILoginWaitPane), 0, (GInstanceInitFunc) publishing_ui_login_wait_pane_instance_init, NULL }; @@ -1288,160 +1438,169 @@ GType publishing_ui_login_wait_pane_get_type (void) { } -static gboolean _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) { +static gboolean +_publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, + GdkEventAny* event, + gpointer self) +{ gboolean result; result = publishing_ui_publishing_dialog_on_window_close ((PublishingUIPublishingDialog*) self, event); #line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return result; -#line 1297 "PublishingUI.c" +#line 1451 "PublishingUI.c" } -static void _vala_array_add58 (SpitPublishingPublishable** * array, int* length, int* size, SpitPublishingPublishable* value) { +static void +_vala_array_add58 (SpitPublishingPublishable** * array, + int* length, + int* size, + SpitPublishingPublishable* value) +{ #line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if ((*length) == (*size)) { #line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *size = (*size) ? (2 * (*size)) : 4; #line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *array = g_renew (SpitPublishingPublishable*, *array, (*size) + 1); -#line 1308 "PublishingUI.c" +#line 1467 "PublishingUI.c" } #line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" (*array)[(*length)++] = value; #line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" (*array)[*length] = NULL; -#line 1314 "PublishingUI.c" +#line 1473 "PublishingUI.c" } -static void _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void +_publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self) +{ #line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_on_service_changed ((PublishingUIPublishingDialog*) self); -#line 1321 "PublishingUI.c" +#line 1483 "PublishingUI.c" } -static void _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_on_close_cancel_clicked ((PublishingUIPublishingDialog*) self); -#line 1328 "PublishingUI.c" +#line 1493 "PublishingUI.c" } -PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType object_type, GeeCollection* to_publish) { +PublishingUIPublishingDialog* +publishing_ui_publishing_dialog_construct (GType object_type, + GeeCollection* to_publish) +{ PublishingUIPublishingDialog * self = NULL; - GeeCollection* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; gboolean use_header = FALSE; - gint _tmp3_; - gint _tmp4_; - gboolean _tmp5_; - AppWindow* _tmp8_; - AppWindow* _tmp9_; - SpitPublishingPublishable** _tmp10_; + gboolean _tmp2_; + AppWindow* _tmp5_; + AppWindow* _tmp6_; + SpitPublishingPublishable** _tmp7_; gboolean has_photos = FALSE; gboolean has_videos = FALSE; gchar* title = NULL; gchar* label = NULL; - gboolean _tmp26_ = FALSE; - gboolean _tmp27_; - const gchar* _tmp38_; - GtkListStore* _tmp39_; - GtkListStore* _tmp40_; - GtkComboBox* _tmp41_; + gboolean _tmp19_ = FALSE; + gboolean _tmp20_; + const gchar* _tmp31_; + GtkListStore* _tmp32_; + GtkListStore* _tmp33_; + GtkComboBox* _tmp34_; GtkCellRendererPixbuf* renderer_pix = NULL; - GtkCellRendererPixbuf* _tmp42_; + GtkCellRendererPixbuf* _tmp35_; + GtkComboBox* _tmp36_; + GtkCellRendererPixbuf* _tmp37_; + GtkComboBox* _tmp38_; + GtkCellRendererPixbuf* _tmp39_; + GtkCellRendererText* renderer_text = NULL; + GtkCellRendererText* _tmp40_; + GtkComboBox* _tmp41_; + GtkCellRendererText* _tmp42_; GtkComboBox* _tmp43_; - GtkCellRendererPixbuf* _tmp44_; + GtkCellRendererText* _tmp44_; GtkComboBox* _tmp45_; - GtkCellRendererPixbuf* _tmp46_; - GtkCellRendererText* renderer_text = NULL; - GtkCellRendererText* _tmp47_; - GtkComboBox* _tmp48_; - GtkCellRendererText* _tmp49_; - GtkComboBox* _tmp50_; - GtkCellRendererText* _tmp51_; - GtkComboBox* _tmp52_; gchar* last_used_service = NULL; - ConfigFacade* _tmp53_; - ConfigFacade* _tmp54_; - gchar* _tmp55_; - gchar* _tmp56_; + ConfigFacade* _tmp46_; + ConfigFacade* _tmp47_; + gchar* _tmp48_; + gchar* _tmp49_; SpitPublishingService** loaded_services = NULL; - gboolean _tmp57_; - gboolean _tmp58_; - gint _tmp59_; - SpitPublishingService** _tmp60_; + gboolean _tmp50_; + gboolean _tmp51_; + gint _tmp52_; + SpitPublishingService** _tmp53_; gint loaded_services_length1; gint _loaded_services_size_; GtkTreeIter iter = {0}; - SpitPublishingService** _tmp61_; - gint _tmp61__length1; - GtkComboBox* _tmp99_; - gboolean _tmp100_; - GtkBox* _tmp130_; - GtkBox* _tmp131_; - GtkBox* _tmp132_; - gboolean _tmp133_; - GtkButton* _tmp142_; + SpitPublishingService** _tmp54_; + gint _tmp54__length1; + GtkComboBox* _tmp92_; + gboolean _tmp93_; + GtkBox* _tmp123_; + GtkBox* _tmp124_; + GtkBox* _tmp125_; + gboolean _tmp126_; + GtkButton* _tmp135_; #line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_val_if_fail (GEE_IS_COLLECTION (to_publish), NULL); #line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp0_ = to_publish; -#line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp0_ = gee_collection_get_size (to_publish); #line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _vala_assert (_tmp2_ > 0, "to_publish.size > 0"); + _vala_assert (_tmp1_ > 0, "to_publish.size > 0"); #line 164 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp3_ = resources_use_header_bar (); -#line 164 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - use_header = _tmp3_ == 1; -#line 165 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp4_ = resources_use_header_bar (); + use_header = resources_use_header_bar () == 1; #line 165 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - self = (PublishingUIPublishingDialog*) g_object_new (object_type, "use-header-bar", _tmp4_, NULL); + self = (PublishingUIPublishingDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL); #line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp5_ = use_header; + _tmp2_ = use_header; #line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp5_) { -#line 1411 "PublishingUI.c" - GtkWidget* _tmp6_; + if (_tmp2_) { +#line 1570 "PublishingUI.c" + GtkWidget* _tmp3_; #line 167 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp6_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); + _tmp3_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); #line 167 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE); -#line 1417 "PublishingUI.c" + gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE); +#line 1576 "PublishingUI.c" } else { - GtkBox* _tmp7_; + GtkBox* _tmp4_; #line 169 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp7_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); + _tmp4_ = gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); #line 169 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_box_set_spacing (_tmp7_, 6); -#line 1424 "PublishingUI.c" + gtk_box_set_spacing (_tmp4_, 6); +#line 1583 "PublishingUI.c" } #line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); #line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE); #line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp8_ = app_window_get_instance (); + _tmp5_ = app_window_get_instance (); #line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow)); + gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow)); #line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp6_); #line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event, self, 0); #line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp10_ = g_new0 (SpitPublishingPublishable*, 0 + 1); + _tmp7_ = g_new0 (SpitPublishingPublishable*, 0 + 1); #line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL); #line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - self->priv->publishables = _tmp10_; + self->priv->publishables = _tmp7_; #line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv->publishables_length1 = 0; #line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -1450,710 +1609,698 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o has_photos = FALSE; #line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" has_videos = FALSE; -#line 1454 "PublishingUI.c" +#line 1613 "PublishingUI.c" { GeeIterator* _media_it = NULL; - GeeCollection* _tmp11_; - GeeIterator* _tmp12_; + GeeIterator* _tmp8_; #line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp11_ = to_publish; + _tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (to_publish, GEE_TYPE_ITERABLE, GeeIterable)); #line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _media_it = _tmp12_; + _media_it = _tmp8_; #line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" while (TRUE) { -#line 1467 "PublishingUI.c" - GeeIterator* _tmp13_; - gboolean _tmp14_; +#line 1623 "PublishingUI.c" + GeeIterator* _tmp9_; MediaSource* media = NULL; - GeeIterator* _tmp15_; - gpointer _tmp16_; + GeeIterator* _tmp10_; + gpointer _tmp11_; SpitPublishingPublishable* publishable = NULL; - MediaSource* _tmp17_; - PublishingGlueMediaSourcePublishableWrapper* _tmp18_; - SpitPublishingPublishable* _tmp19_; - SpitPublishingPublisherMediaType _tmp20_; - SpitPublishingPublishable** _tmp23_; - gint _tmp23__length1; - SpitPublishingPublishable* _tmp24_; - SpitPublishingPublishable* _tmp25_; + MediaSource* _tmp12_; + PublishingGlueMediaSourcePublishableWrapper* _tmp13_; + SpitPublishingPublishable* _tmp14_; + SpitPublishingPublishable** _tmp16_; + gint _tmp16__length1; + SpitPublishingPublishable* _tmp17_; + SpitPublishingPublishable* _tmp18_; #line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp13_ = _media_it; + _tmp9_ = _media_it; #line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp14_ = gee_iterator_next (_tmp13_); -#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (!_tmp14_) { + if (!gee_iterator_next (_tmp9_)) { #line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" break; -#line 1490 "PublishingUI.c" +#line 1642 "PublishingUI.c" } #line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp15_ = _media_it; + _tmp10_ = _media_it; #line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp16_ = gee_iterator_get (_tmp15_); + _tmp11_ = gee_iterator_get (_tmp10_); #line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - media = (MediaSource*) _tmp16_; + media = (MediaSource*) _tmp11_; #line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp17_ = media; + _tmp12_ = media; #line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp18_ = publishing_glue_media_source_publishable_wrapper_new (_tmp17_); + _tmp13_ = publishing_glue_media_source_publishable_wrapper_new (_tmp12_); #line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - publishable = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_PUBLISHABLE, SpitPublishingPublishable); -#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp19_ = publishable; + publishable = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, SPIT_PUBLISHING_TYPE_PUBLISHABLE, SpitPublishingPublishable); #line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp20_ = spit_publishing_publishable_get_media_type (_tmp19_); + _tmp14_ = publishable; #line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp20_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) { + if (spit_publishing_publishable_get_media_type (_tmp14_) == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) { #line 184 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" has_photos = TRUE; -#line 1512 "PublishingUI.c" +#line 1662 "PublishingUI.c" } else { - SpitPublishingPublishable* _tmp21_; - SpitPublishingPublisherMediaType _tmp22_; + SpitPublishingPublishable* _tmp15_; #line 185 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp21_ = publishable; + _tmp15_ = publishable; #line 185 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp22_ = spit_publishing_publishable_get_media_type (_tmp21_); -#line 185 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp22_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { + if (spit_publishing_publishable_get_media_type (_tmp15_) == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { #line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" has_videos = TRUE; -#line 1524 "PublishingUI.c" +#line 1671 "PublishingUI.c" } else { #line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_assert_not_reached (); -#line 1528 "PublishingUI.c" +#line 1675 "PublishingUI.c" } } #line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp23_ = self->priv->publishables; + _tmp16_ = self->priv->publishables; #line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp23__length1 = self->priv->publishables_length1; + _tmp16__length1 = self->priv->publishables_length1; #line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp24_ = publishable; + _tmp17_ = publishable; #line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp25_ = _g_object_ref0 (_tmp24_); + _tmp18_ = _g_object_ref0 (_tmp17_); #line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _vala_array_add58 (&self->priv->publishables, &self->priv->publishables_length1, &self->priv->_publishables_size_, _tmp25_); + _vala_array_add58 (&self->priv->publishables, &self->priv->publishables_length1, &self->priv->_publishables_size_, _tmp18_); #line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (publishable); #line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (media); -#line 1545 "PublishingUI.c" +#line 1692 "PublishingUI.c" } #line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (_media_it); -#line 1549 "PublishingUI.c" +#line 1696 "PublishingUI.c" } #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" title = NULL; #line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" label = NULL; #line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp27_ = has_photos; + _tmp20_ = has_photos; #line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp27_) { -#line 1559 "PublishingUI.c" - gboolean _tmp28_; + if (_tmp20_) { +#line 1706 "PublishingUI.c" + gboolean _tmp21_; #line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp28_ = has_videos; + _tmp21_ = has_videos; #line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp26_ = !_tmp28_; -#line 1565 "PublishingUI.c" + _tmp19_ = !_tmp21_; +#line 1712 "PublishingUI.c" } else { #line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp26_ = FALSE; -#line 1569 "PublishingUI.c" + _tmp19_ = FALSE; +#line 1716 "PublishingUI.c" } #line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp26_) { -#line 1573 "PublishingUI.c" - gchar* _tmp29_; - gchar* _tmp30_; + if (_tmp19_) { +#line 1720 "PublishingUI.c" + gchar* _tmp22_; + gchar* _tmp23_; #line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp29_ = g_strdup (_ ("Publish Photos")); + _tmp22_ = g_strdup (_ ("Publish Photos")); #line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_free0 (title); #line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - title = _tmp29_; + title = _tmp22_; #line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp30_ = g_strdup (_ ("Publish photos _to:")); + _tmp23_ = g_strdup (_ ("Publish photos _to:")); #line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_free0 (label); #line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - label = _tmp30_; -#line 1588 "PublishingUI.c" + label = _tmp23_; +#line 1735 "PublishingUI.c" } else { - gboolean _tmp31_ = FALSE; - gboolean _tmp32_; + gboolean _tmp24_ = FALSE; + gboolean _tmp25_; #line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp32_ = has_photos; + _tmp25_ = has_photos; #line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (!_tmp32_) { -#line 1596 "PublishingUI.c" - gboolean _tmp33_; + if (!_tmp25_) { +#line 1743 "PublishingUI.c" + gboolean _tmp26_; #line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp33_ = has_videos; + _tmp26_ = has_videos; #line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp31_ = _tmp33_; -#line 1602 "PublishingUI.c" + _tmp24_ = _tmp26_; +#line 1749 "PublishingUI.c" } else { #line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp31_ = FALSE; -#line 1606 "PublishingUI.c" + _tmp24_ = FALSE; +#line 1753 "PublishingUI.c" } #line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp31_) { -#line 1610 "PublishingUI.c" - gchar* _tmp34_; - gchar* _tmp35_; + if (_tmp24_) { +#line 1757 "PublishingUI.c" + gchar* _tmp27_; + gchar* _tmp28_; #line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp34_ = g_strdup (_ ("Publish Videos")); + _tmp27_ = g_strdup (_ ("Publish Videos")); #line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_free0 (title); #line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - title = _tmp34_; + title = _tmp27_; #line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp35_ = g_strdup (_ ("Publish videos _to")); + _tmp28_ = g_strdup (_ ("Publish videos _to")); #line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_free0 (label); #line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - label = _tmp35_; -#line 1625 "PublishingUI.c" + label = _tmp28_; +#line 1772 "PublishingUI.c" } else { - gchar* _tmp36_; - gchar* _tmp37_; + gchar* _tmp29_; + gchar* _tmp30_; #line 203 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp36_ = g_strdup (_ ("Publish Photos and Videos")); + _tmp29_ = g_strdup (_ ("Publish Photos and Videos")); #line 203 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_free0 (title); #line 203 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - title = _tmp36_; + title = _tmp29_; #line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp37_ = g_strdup (_ ("Publish photos and videos _to")); + _tmp30_ = g_strdup (_ ("Publish photos and videos _to")); #line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_free0 (label); #line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - label = _tmp37_; -#line 1641 "PublishingUI.c" + label = _tmp30_; +#line 1788 "PublishingUI.c" } } #line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp38_ = title; + _tmp31_ = title; #line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp38_); + gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp31_); #line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp39_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1); + _tmp32_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1); #line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (self->priv->service_selector_box_model); #line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - self->priv->service_selector_box_model = _tmp39_; + self->priv->service_selector_box_model = _tmp32_; #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp40_ = self->priv->service_selector_box_model; + _tmp33_ = self->priv->service_selector_box_model; #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp41_ = (GtkComboBox*) gtk_combo_box_new_with_model (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GTK_TYPE_TREE_MODEL, GtkTreeModel)); + _tmp34_ = (GtkComboBox*) gtk_combo_box_new_with_model (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tree_model_get_type (), GtkTreeModel)); #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_object_ref_sink (_tmp41_); + g_object_ref_sink (_tmp34_); #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (self->priv->service_selector_box); #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - self->priv->service_selector_box = _tmp41_; + self->priv->service_selector_box = _tmp34_; #line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp42_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new (); + _tmp35_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new (); #line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_object_ref_sink (_tmp42_); + g_object_ref_sink (_tmp35_); #line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - renderer_pix = _tmp42_; + renderer_pix = _tmp35_; #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp43_ = self->priv->service_selector_box; + _tmp36_ = self->priv->service_selector_box; #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp44_ = renderer_pix; + _tmp37_ = renderer_pix; #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); + gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); #line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp45_ = self->priv->service_selector_box; + _tmp38_ = self->priv->service_selector_box; #line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp46_ = renderer_pix; + _tmp39_ = renderer_pix; #line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0); + gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0); #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp47_ = (GtkCellRendererText*) gtk_cell_renderer_text_new (); + _tmp40_ = (GtkCellRendererText*) gtk_cell_renderer_text_new (); #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_object_ref_sink (_tmp47_); + g_object_ref_sink (_tmp40_); #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - renderer_text = _tmp47_; + renderer_text = _tmp40_; #line 216 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp48_ = self->priv->service_selector_box; + _tmp41_ = self->priv->service_selector_box; #line 216 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp49_ = renderer_text; + _tmp42_ = renderer_text; #line 216 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); + gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); #line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp50_ = self->priv->service_selector_box; + _tmp43_ = self->priv->service_selector_box; #line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp51_ = renderer_text; + _tmp44_ = renderer_text; #line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1); + gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1); #line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp52_ = self->priv->service_selector_box; + _tmp45_ = self->priv->service_selector_box; #line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_combo_box_set_active (_tmp52_, 0); + gtk_combo_box_set_active (_tmp45_, 0); #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp53_ = config_facade_get_instance (); + _tmp46_ = config_facade_get_instance (); #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp54_ = _tmp53_; + _tmp47_ = _tmp46_; #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp55_ = configuration_facade_get_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp48_ = configuration_facade_get_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp56_ = _tmp55_; + _tmp49_ = _tmp48_; #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _g_object_unref0 (_tmp54_); + _g_object_unref0 (_tmp47_); #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - last_used_service = _tmp56_; + last_used_service = _tmp49_; #line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp57_ = has_photos; + _tmp50_ = has_photos; #line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp58_ = has_videos; + _tmp51_ = has_videos; #line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp60_ = publishing_ui_publishing_dialog_load_services (_tmp57_, _tmp58_, &_tmp59_); + _tmp53_ = publishing_ui_publishing_dialog_load_services (_tmp50_, _tmp51_, &_tmp52_); #line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - loaded_services = _tmp60_; + loaded_services = _tmp53_; #line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - loaded_services_length1 = _tmp59_; + loaded_services_length1 = _tmp52_; #line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _loaded_services_size_ = loaded_services_length1; #line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp61_ = loaded_services; + _tmp54_ = loaded_services; #line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp61__length1 = loaded_services_length1; -#line 1732 "PublishingUI.c" + _tmp54__length1 = loaded_services_length1; +#line 1879 "PublishingUI.c" { SpitPublishingService** service_collection = NULL; gint service_collection_length1 = 0; gint _service_collection_size_ = 0; gint service_it = 0; #line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - service_collection = _tmp61_; + service_collection = _tmp54_; #line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - service_collection_length1 = _tmp61__length1; + service_collection_length1 = _tmp54__length1; #line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - for (service_it = 0; service_it < _tmp61__length1; service_it = service_it + 1) { -#line 1744 "PublishingUI.c" - SpitPublishingService* _tmp62_; + for (service_it = 0; service_it < _tmp54__length1; service_it = service_it + 1) { +#line 1891 "PublishingUI.c" + SpitPublishingService* _tmp55_; SpitPublishingService* service = NULL; #line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp62_ = _g_object_ref0 (service_collection[service_it]); + _tmp55_ = _g_object_ref0 (service_collection[service_it]); #line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - service = _tmp62_; -#line 1751 "PublishingUI.c" + service = _tmp55_; +#line 1898 "PublishingUI.c" { - GtkListStore* _tmp63_; - GtkTreeIter _tmp64_ = {0}; + GtkListStore* _tmp56_; + GtkTreeIter _tmp57_ = {0}; gchar* curr_service_id = NULL; - SpitPublishingService* _tmp65_; - const gchar* _tmp66_; - gchar* _tmp67_; - SpitPublishingService* _tmp68_; - gboolean _tmp69_ = FALSE; - SpitPluggableInfo _tmp70_; - GdkPixbuf** _tmp71_; - gint _tmp71__length1; - const gchar* _tmp89_; + SpitPublishingService* _tmp58_; + const gchar* _tmp59_; + gchar* _tmp60_; + SpitPublishingService* _tmp61_; + gboolean _tmp62_ = FALSE; + SpitPluggableInfo _tmp63_; + GdkPixbuf** _tmp64_; + gint _tmp64__length1; + const gchar* _tmp82_; #line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp63_ = self->priv->service_selector_box_model; + _tmp56_ = self->priv->service_selector_box_model; #line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_list_store_append (_tmp63_, &_tmp64_); + gtk_list_store_append (_tmp56_, &_tmp57_); #line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - iter = _tmp64_; + iter = _tmp57_; #line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp65_ = service; + _tmp58_ = service; #line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp66_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp59_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp67_ = g_strdup (_tmp66_); + _tmp60_ = g_strdup (_tmp59_); #line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - curr_service_id = _tmp67_; + curr_service_id = _tmp60_; #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp68_ = service; + _tmp61_ = service; #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - spit_pluggable_get_info (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, SPIT_TYPE_PLUGGABLE, SpitPluggable), &self->priv->info); + spit_pluggable_get_info (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, SPIT_TYPE_PLUGGABLE, SpitPluggable), &self->priv->info); #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp70_ = self->priv->info; + _tmp63_ = self->priv->info; #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp71_ = _tmp70_.icons; + _tmp64_ = _tmp63_.icons; #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp71__length1 = _tmp70_.icons_length1; + _tmp64__length1 = _tmp63_.icons_length1; #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (NULL != _tmp71_) { -#line 1791 "PublishingUI.c" - SpitPluggableInfo _tmp72_; - GdkPixbuf** _tmp73_; - gint _tmp73__length1; + if (NULL != _tmp64_) { +#line 1938 "PublishingUI.c" + SpitPluggableInfo _tmp65_; + GdkPixbuf** _tmp66_; + gint _tmp66__length1; #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp72_ = self->priv->info; + _tmp65_ = self->priv->info; #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp73_ = _tmp72_.icons; + _tmp66_ = _tmp65_.icons; #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp73__length1 = _tmp72_.icons_length1; + _tmp66__length1 = _tmp65_.icons_length1; #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp69_ = 0 < _tmp73__length1; -#line 1803 "PublishingUI.c" + _tmp62_ = 0 < _tmp66__length1; +#line 1950 "PublishingUI.c" } else { #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp69_ = FALSE; -#line 1807 "PublishingUI.c" + _tmp62_ = FALSE; +#line 1954 "PublishingUI.c" } #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp69_) { -#line 1811 "PublishingUI.c" - GtkListStore* _tmp74_; - GtkTreeIter _tmp75_; - SpitPluggableInfo _tmp76_; - GdkPixbuf** _tmp77_; - gint _tmp77__length1; - GdkPixbuf* _tmp78_; - SpitPublishingService* _tmp79_; - const gchar* _tmp80_; - GdkPixbuf* _tmp81_; - GdkPixbuf* _tmp82_; + if (_tmp62_) { +#line 1958 "PublishingUI.c" + GtkListStore* _tmp67_; + GtkTreeIter _tmp68_; + SpitPluggableInfo _tmp69_; + GdkPixbuf** _tmp70_; + gint _tmp70__length1; + GdkPixbuf* _tmp71_; + SpitPublishingService* _tmp72_; + const gchar* _tmp73_; + GdkPixbuf* _tmp74_; + GdkPixbuf* _tmp75_; #line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp74_ = self->priv->service_selector_box_model; + _tmp67_ = self->priv->service_selector_box_model; #line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp75_ = iter; + _tmp68_ = iter; #line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp76_ = self->priv->info; + _tmp69_ = self->priv->info; #line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp77_ = _tmp76_.icons; + _tmp70_ = _tmp69_.icons; #line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp77__length1 = _tmp76_.icons_length1; + _tmp70__length1 = _tmp69_.icons_length1; #line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp78_ = _tmp77_[0]; + _tmp71_ = _tmp70_[0]; #line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp79_ = service; + _tmp72_ = service; #line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp80_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp73_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_list_store_set (_tmp74_, &_tmp75_, 0, _tmp78_, 1, _tmp80_, -1); + gtk_list_store_set (_tmp67_, &_tmp68_, 0, _tmp71_, 1, _tmp73_, -1); #line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp81_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE); + _tmp74_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE); #line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (self->priv->info.icons[0]); #line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - self->priv->info.icons[0] = _tmp81_; + self->priv->info.icons[0] = _tmp74_; #line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp82_ = self->priv->info.icons[0]; -#line 1848 "PublishingUI.c" + _tmp75_ = self->priv->info.icons[0]; +#line 1995 "PublishingUI.c" } else { - GtkListStore* _tmp83_; - GtkTreeIter _tmp84_; - GdkPixbuf* _tmp85_; - GdkPixbuf* _tmp86_; - SpitPublishingService* _tmp87_; - const gchar* _tmp88_; + GtkListStore* _tmp76_; + GtkTreeIter _tmp77_; + GdkPixbuf* _tmp78_; + GdkPixbuf* _tmp79_; + SpitPublishingService* _tmp80_; + const gchar* _tmp81_; #line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp83_ = self->priv->service_selector_box_model; + _tmp76_ = self->priv->service_selector_box_model; #line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp84_ = iter; + _tmp77_ = iter; #line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp85_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE); + _tmp78_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE); #line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp86_ = _tmp85_; + _tmp79_ = _tmp78_; #line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp87_ = service; + _tmp80_ = service; #line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp88_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp81_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_list_store_set (_tmp83_, &_tmp84_, 0, _tmp86_, 1, _tmp88_, -1); + gtk_list_store_set (_tmp76_, &_tmp77_, 0, _tmp79_, 1, _tmp81_, -1); #line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _g_object_unref0 (_tmp86_); -#line 1872 "PublishingUI.c" + _g_object_unref0 (_tmp79_); +#line 2019 "PublishingUI.c" } #line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp89_ = last_used_service; + _tmp82_ = last_used_service; #line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp89_ == NULL) { -#line 1878 "PublishingUI.c" - GtkComboBox* _tmp90_; - GtkTreeIter _tmp91_; - SpitPublishingService* _tmp92_; - const gchar* _tmp93_; - gchar* _tmp94_; + if (_tmp82_ == NULL) { +#line 2025 "PublishingUI.c" + GtkComboBox* _tmp83_; + GtkTreeIter _tmp84_; + SpitPublishingService* _tmp85_; + const gchar* _tmp86_; + gchar* _tmp87_; #line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp90_ = self->priv->service_selector_box; + _tmp83_ = self->priv->service_selector_box; #line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp91_ = iter; + _tmp84_ = iter; #line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_combo_box_set_active_iter (_tmp90_, &_tmp91_); + gtk_combo_box_set_active_iter (_tmp83_, &_tmp84_); #line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp92_ = service; + _tmp85_ = service; #line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp93_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp86_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp94_ = g_strdup (_tmp93_); + _tmp87_ = g_strdup (_tmp86_); #line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_free0 (last_used_service); #line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - last_used_service = _tmp94_; -#line 1900 "PublishingUI.c" + last_used_service = _tmp87_; +#line 2047 "PublishingUI.c" } else { - const gchar* _tmp95_; - const gchar* _tmp96_; + const gchar* _tmp88_; + const gchar* _tmp89_; #line 251 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp95_ = last_used_service; + _tmp88_ = last_used_service; #line 251 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp96_ = curr_service_id; + _tmp89_ = curr_service_id; #line 251 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (g_strcmp0 (_tmp95_, _tmp96_) == 0) { -#line 1910 "PublishingUI.c" - GtkComboBox* _tmp97_; - GtkTreeIter _tmp98_; + if (g_strcmp0 (_tmp88_, _tmp89_) == 0) { +#line 2057 "PublishingUI.c" + GtkComboBox* _tmp90_; + GtkTreeIter _tmp91_; #line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp97_ = self->priv->service_selector_box; + _tmp90_ = self->priv->service_selector_box; #line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp98_ = iter; + _tmp91_ = iter; #line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_combo_box_set_active_iter (_tmp97_, &_tmp98_); -#line 1919 "PublishingUI.c" + gtk_combo_box_set_active_iter (_tmp90_, &_tmp91_); +#line 2066 "PublishingUI.c" } } #line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_free0 (curr_service_id); #line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (service); -#line 1926 "PublishingUI.c" +#line 2073 "PublishingUI.c" } } } #line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp99_ = self->priv->service_selector_box; + _tmp92_ = self->priv->service_selector_box; #line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_signal_connect_object (_tmp99_, "changed", (GCallback) _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed, self, 0); + g_signal_connect_object (_tmp92_, "changed", (GCallback) _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed, self, 0); #line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp100_ = use_header; + _tmp93_ = use_header; #line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (!_tmp100_) { -#line 1938 "PublishingUI.c" + if (!_tmp93_) { +#line 2085 "PublishingUI.c" GtkLabel* service_selector_box_label = NULL; - const gchar* _tmp101_; - GtkLabel* _tmp102_; - GtkLabel* _tmp103_; - GtkComboBox* _tmp104_; - GtkLabel* _tmp105_; - GtkLabel* _tmp106_; - GtkComboBox* _tmp107_; - GtkComboBox* _tmp108_; - GtkComboBox* _tmp109_; - GtkComboBox* _tmp110_; + const gchar* _tmp94_; + GtkLabel* _tmp95_; + GtkLabel* _tmp96_; + GtkComboBox* _tmp97_; + GtkLabel* _tmp98_; + GtkLabel* _tmp99_; + GtkComboBox* _tmp100_; + GtkComboBox* _tmp101_; + GtkComboBox* _tmp102_; + GtkComboBox* _tmp103_; GtkBox* service_selector_layouter = NULL; + GtkBox* _tmp104_; + GtkBox* _tmp105_; + GtkBox* _tmp106_; + GtkBox* _tmp107_; + GtkLabel* _tmp108_; + GtkBox* _tmp109_; + GtkComboBox* _tmp110_; + GtkBox* service_area_layouter = NULL; GtkBox* _tmp111_; GtkBox* _tmp112_; GtkBox* _tmp113_; GtkBox* _tmp114_; - GtkLabel* _tmp115_; - GtkBox* _tmp116_; - GtkComboBox* _tmp117_; - GtkBox* service_area_layouter = NULL; + GtkSeparator* _tmp115_; + GtkSeparator* _tmp116_; + GtkBox* _tmp117_; GtkBox* _tmp118_; GtkBox* _tmp119_; GtkBox* _tmp120_; GtkBox* _tmp121_; - GtkSeparator* _tmp122_; - GtkSeparator* _tmp123_; - GtkBox* _tmp124_; - GtkBox* _tmp125_; - GtkBox* _tmp126_; - GtkBox* _tmp127_; - GtkBox* _tmp128_; - GtkBox* _tmp129_; + GtkBox* _tmp122_; #line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp101_ = label; + _tmp94_ = label; #line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp102_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp101_); + _tmp95_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp94_); #line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_object_ref_sink (_tmp102_); + g_object_ref_sink (_tmp95_); #line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - service_selector_box_label = _tmp102_; + service_selector_box_label = _tmp95_; #line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp103_ = service_selector_box_label; + _tmp96_ = service_selector_box_label; #line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp104_ = self->priv->service_selector_box; + _tmp97_ = self->priv->service_selector_box; #line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_label_set_mnemonic_widget (_tmp103_, G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, gtk_widget_get_type (), GtkWidget)); + gtk_label_set_mnemonic_widget (_tmp96_, G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, gtk_widget_get_type (), GtkWidget)); #line 262 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp105_ = service_selector_box_label; + _tmp98_ = service_selector_box_label; #line 262 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); #line 263 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp106_ = service_selector_box_label; + _tmp99_ = service_selector_box_label; #line 263 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); + gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); #line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp107_ = self->priv->service_selector_box; + _tmp100_ = self->priv->service_selector_box; #line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END); + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END); #line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp108_ = self->priv->service_selector_box; + _tmp101_ = self->priv->service_selector_box; #line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); + gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); #line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp109_ = self->priv->service_selector_box; + _tmp102_ = self->priv->service_selector_box; #line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, gtk_widget_get_type (), GtkWidget), FALSE); #line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp110_ = self->priv->service_selector_box; + _tmp103_ = self->priv->service_selector_box; #line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, gtk_widget_get_type (), GtkWidget), FALSE); #line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp111_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); + _tmp104_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); #line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_object_ref_sink (_tmp111_); + g_object_ref_sink (_tmp104_); #line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - service_selector_layouter = _tmp111_; + service_selector_layouter = _tmp104_; #line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp112_ = service_selector_layouter; + _tmp105_ = service_selector_layouter; #line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, gtk_container_get_type (), GtkContainer), (guint) 12); + gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_container_get_type (), GtkContainer), (guint) 12); #line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp113_ = service_selector_layouter; + _tmp106_ = service_selector_layouter; #line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp113_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, gtk_widget_get_type (), GtkWidget), TRUE); #line 277 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp114_ = service_selector_layouter; + _tmp107_ = service_selector_layouter; #line 277 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp115_ = service_selector_box_label; + _tmp108_ = service_selector_box_label; #line 277 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_widget_get_type (), GtkWidget)); #line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp116_ = service_selector_layouter; + _tmp109_ = service_selector_layouter; #line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp117_ = self->priv->service_selector_box; + _tmp110_ = self->priv->service_selector_box; #line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_box_pack_start (_tmp116_, G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (_tmp109_, G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp118_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + _tmp111_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); #line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_object_ref_sink (_tmp118_); + g_object_ref_sink (_tmp111_); #line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - service_area_layouter = _tmp118_; + service_area_layouter = _tmp111_; #line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp119_ = service_area_layouter; + _tmp112_ = service_area_layouter; #line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp120_ = service_selector_layouter; + _tmp113_ = service_selector_layouter; #line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp113_, gtk_widget_get_type (), GtkWidget)); #line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp121_ = service_area_layouter; + _tmp114_ = service_area_layouter; #line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp122_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); + _tmp115_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); #line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_object_ref_sink (_tmp122_); + g_object_ref_sink (_tmp115_); #line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp123_ = _tmp122_; + _tmp116_ = _tmp115_; #line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, gtk_widget_get_type (), GtkWidget)); #line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _g_object_unref0 (_tmp123_); + _g_object_unref0 (_tmp116_); #line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp124_ = service_area_layouter; + _tmp117_ = service_area_layouter; #line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL); + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL); #line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp125_ = service_area_layouter; + _tmp118_ = service_area_layouter; #line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); + gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); #line 287 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp126_ = service_area_layouter; + _tmp119_ = service_area_layouter; #line 287 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, gtk_widget_get_type (), GtkWidget), TRUE); #line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp127_ = service_area_layouter; + _tmp120_ = service_area_layouter; #line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, gtk_widget_get_type (), GtkWidget), FALSE); + gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, gtk_widget_get_type (), GtkWidget), FALSE); #line 290 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp128_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); + _tmp121_ = gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); #line 290 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp129_ = service_area_layouter; + _tmp122_ = service_area_layouter; #line 290 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_box_pack_start (_tmp128_, G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp121_, G_TYPE_CHECK_INSTANCE_CAST (_tmp122_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (service_area_layouter); #line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (service_selector_layouter); #line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (service_selector_box_label); -#line 2087 "PublishingUI.c" +#line 2234 "PublishingUI.c" } #line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp130_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + _tmp123_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); #line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_object_ref_sink (_tmp130_); + g_object_ref_sink (_tmp123_); #line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (self->priv->central_area_layouter); #line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - self->priv->central_area_layouter = _tmp130_; + self->priv->central_area_layouter = _tmp123_; #line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp131_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); + _tmp124_ = gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); #line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp132_ = self->priv->central_area_layouter; + _tmp125_ = self->priv->central_area_layouter; #line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_box_pack_start (_tmp131_, G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (_tmp124_, G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp133_ = use_header; + _tmp126_ = use_header; #line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp133_) { -#line 2107 "PublishingUI.c" - GtkButton* _tmp134_; - GtkButton* _tmp135_; - GtkWidget* _tmp136_; - GtkButton* _tmp137_; - GtkWidget* _tmp138_; - GtkComboBox* _tmp139_; + if (_tmp126_) { +#line 2254 "PublishingUI.c" + GtkButton* _tmp127_; + GtkButton* _tmp128_; + GtkWidget* _tmp129_; + GtkButton* _tmp130_; + GtkWidget* _tmp131_; + GtkComboBox* _tmp132_; #line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp134_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel"); + _tmp127_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel"); #line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_object_ref_sink (_tmp134_); + g_object_ref_sink (_tmp127_); #line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (self->priv->close_cancel_button); #line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - self->priv->close_cancel_button = _tmp134_; + self->priv->close_cancel_button = _tmp127_; #line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp135_ = self->priv->close_cancel_button; + _tmp128_ = self->priv->close_cancel_button; #line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, gtk_widget_get_type (), GtkWidget), TRUE); + gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp128_, gtk_widget_get_type (), GtkWidget), TRUE); #line 301 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp136_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); + _tmp129_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); #line 301 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp137_ = self->priv->close_cancel_button; + _tmp130_ = self->priv->close_cancel_button; #line 301 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp136_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, gtk_widget_get_type (), GtkWidget)); + gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, gtk_widget_get_type (), GtkWidget)); #line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp138_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); + _tmp131_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); #line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp139_ = self->priv->service_selector_box; + _tmp132_ = self->priv->service_selector_box; #line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, gtk_widget_get_type (), GtkWidget)); -#line 2138 "PublishingUI.c" + gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp131_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, gtk_widget_get_type (), GtkWidget)); +#line 2285 "PublishingUI.c" } else { - GtkWidget* _tmp140_; - GtkButton* _tmp141_; + GtkWidget* _tmp133_; + GtkButton* _tmp134_; #line 305 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _ ("_Cancel"), (gint) GTK_RESPONSE_CANCEL); #line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp140_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL); + _tmp133_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL); #line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp141_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp140_, gtk_button_get_type ()) ? ((GtkButton*) _tmp140_) : NULL); + _tmp134_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp133_, gtk_button_get_type ()) ? ((GtkButton*) _tmp133_) : NULL); #line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (self->priv->close_cancel_button); #line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - self->priv->close_cancel_button = _tmp141_; -#line 2152 "PublishingUI.c" + self->priv->close_cancel_button = _tmp134_; +#line 2299 "PublishingUI.c" } #line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp142_ = self->priv->close_cancel_button; + _tmp135_ = self->priv->close_cancel_button; #line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_signal_connect_object (_tmp142_, "clicked", (GCallback) _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp135_, "clicked", (GCallback) _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0); #line 310 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_set_standard_window_mode (self); #line 312 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -2172,69 +2319,75 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o _g_free0 (title); #line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return self; -#line 2176 "PublishingUI.c" +#line 2323 "PublishingUI.c" } -PublishingUIPublishingDialog* publishing_ui_publishing_dialog_new (GeeCollection* to_publish) { +PublishingUIPublishingDialog* +publishing_ui_publishing_dialog_new (GeeCollection* to_publish) +{ #line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return publishing_ui_publishing_dialog_construct (PUBLISHING_UI_TYPE_PUBLISHING_DIALOG, to_publish); -#line 2183 "PublishingUI.c" +#line 2332 "PublishingUI.c" } -static void _vala_array_add59 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) { +static void +_vala_array_add59 (SpitPublishingService** * array, + int* length, + int* size, + SpitPublishingService* value) +{ #line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if ((*length) == (*size)) { #line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *size = (*size) ? (2 * (*size)) : 4; #line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *array = g_renew (SpitPublishingService*, *array, (*size) + 1); -#line 2194 "PublishingUI.c" +#line 2348 "PublishingUI.c" } #line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" (*array)[(*length)++] = value; #line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" (*array)[*length] = NULL; -#line 2200 "PublishingUI.c" +#line 2354 "PublishingUI.c" } -static gint __lambda16_ (void* a, void* b) { +static gint +__lambda16_ (void* a, + void* b) +{ gint result = 0; - void* _tmp0_; + const gchar* _tmp0_; const gchar* _tmp1_; - void* _tmp2_; - const gchar* _tmp3_; - gint _tmp4_; -#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp0_ = a; #line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp1_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitPublishingService**) _tmp0_), SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp0_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitPublishingService**) a), SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp2_ = b; + _tmp1_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitPublishingService**) b), SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitPublishingService**) _tmp2_), SPIT_TYPE_PLUGGABLE, SpitPluggable)); -#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp4_ = utf8_cs_compare (_tmp1_, _tmp3_); -#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - result = _tmp4_; + result = utf8_cs_compare (_tmp0_, _tmp1_); #line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return result; -#line 2225 "PublishingUI.c" +#line 2373 "PublishingUI.c" } -static gint ___lambda16____compar_fn_t (void* key1, void* key2) { +static gint +___lambda16____compar_fn_t (void* key1, + void* key2) +{ gint result; result = __lambda16_ (key1, key2); #line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return result; -#line 2234 "PublishingUI.c" +#line 2385 "PublishingUI.c" } -static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services (int* result_length1) { +static SpitPublishingService** +publishing_ui_publishing_dialog_load_all_services (int* result_length1) +{ SpitPublishingService** result = NULL; SpitPublishingService** loaded_services = NULL; SpitPublishingService** _tmp0_; @@ -2245,12 +2398,12 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services GeeCollection* _tmp2_; gint _tmp3_; gint _tmp4_; + SpitPublishingService** _tmp23_; + gint _tmp23__length1; + SpitPublishingService** _tmp24_; + gint _tmp24__length1; SpitPublishingService** _tmp25_; gint _tmp25__length1; - SpitPublishingService** _tmp26_; - gint _tmp26__length1; - SpitPublishingService** _tmp27_; - gint _tmp27__length1; #line 316 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = g_new0 (SpitPublishingService*, 0 + 1); #line 316 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -2272,7 +2425,7 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services #line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_debug ("PublishingUI.vala:322: PublisingDialog: discovered %d pluggable publis" \ "hing services.", _tmp4_); -#line 2275 "PublishingUI.c" +#line 2428 "PublishingUI.c" { GeeIterator* _pluggable_it = NULL; GeeCollection* _tmp5_; @@ -2285,456 +2438,437 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services _pluggable_it = _tmp6_; #line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" while (TRUE) { -#line 2288 "PublishingUI.c" +#line 2441 "PublishingUI.c" GeeIterator* _tmp7_; - gboolean _tmp8_; SpitPluggable* pluggable = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; + GeeIterator* _tmp8_; + gpointer _tmp9_; gint pluggable_interface = 0; - SpitPluggable* _tmp11_; - gint _tmp12_; - gint _tmp13_; + SpitPluggable* _tmp10_; + gint _tmp11_; SpitPublishingService* service = NULL; - SpitPluggable* _tmp18_; - SpitPublishingService* _tmp19_; - SpitPublishingService* _tmp20_; - const gchar* _tmp21_; - SpitPublishingService** _tmp22_; - gint _tmp22__length1; - SpitPublishingService* _tmp23_; - SpitPublishingService* _tmp24_; + SpitPluggable* _tmp16_; + SpitPublishingService* _tmp17_; + SpitPublishingService* _tmp18_; + const gchar* _tmp19_; + SpitPublishingService** _tmp20_; + gint _tmp20__length1; + SpitPublishingService* _tmp21_; + SpitPublishingService* _tmp22_; #line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp7_ = _pluggable_it; #line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp8_ = gee_iterator_next (_tmp7_); -#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp7_)) { #line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" break; -#line 2315 "PublishingUI.c" +#line 2464 "PublishingUI.c" } #line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp9_ = _pluggable_it; + _tmp8_ = _pluggable_it; #line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp9_ = gee_iterator_get (_tmp8_); #line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - pluggable = (SpitPluggable*) _tmp10_; + pluggable = (SpitPluggable*) _tmp9_; #line 325 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp11_ = pluggable; + _tmp10_ = pluggable; #line 325 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp12_ = spit_pluggable_get_pluggable_interface (_tmp11_, SPIT_PUBLISHING_CURRENT_INTERFACE, SPIT_PUBLISHING_CURRENT_INTERFACE); -#line 325 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - pluggable_interface = _tmp12_; + pluggable_interface = spit_pluggable_get_pluggable_interface (_tmp10_, SPIT_PUBLISHING_CURRENT_INTERFACE, SPIT_PUBLISHING_CURRENT_INTERFACE); #line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp13_ = pluggable_interface; + _tmp11_ = pluggable_interface; #line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp13_ != SPIT_PUBLISHING_CURRENT_INTERFACE) { -#line 2333 "PublishingUI.c" - SpitPluggable* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; - gint _tmp17_; + if (_tmp11_ != SPIT_PUBLISHING_CURRENT_INTERFACE) { +#line 2480 "PublishingUI.c" + SpitPluggable* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + gint _tmp15_; #line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp14_ = pluggable; + _tmp12_ = pluggable; #line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp15_ = plugins_get_pluggable_module_id (_tmp14_); + _tmp13_ = plugins_get_pluggable_module_id (_tmp12_); #line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp16_ = _tmp15_; + _tmp14_ = _tmp13_; #line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp17_ = pluggable_interface; + _tmp15_ = pluggable_interface; #line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_warning ("PublishingUI.vala:328: Unable to load publisher %s: reported interface" \ -" %d.", _tmp16_, _tmp17_); +" %d.", _tmp14_, _tmp15_); #line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp14_); #line 331 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (pluggable); #line 331 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" continue; -#line 2354 "PublishingUI.c" +#line 2501 "PublishingUI.c" } #line 334 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp18_ = pluggable; + _tmp16_ = pluggable; #line 334 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService)); + _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService)); #line 334 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - service = _tmp19_; + service = _tmp17_; #line 337 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp20_ = service; + _tmp18_ = service; #line 337 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp21_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp19_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 337 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_debug ("PublishingUI.vala:337: PublishingDialog: discovered pluggable publishi" \ -"ng service '%s'.", _tmp21_); +"ng service '%s'.", _tmp19_); #line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp22_ = loaded_services; + _tmp20_ = loaded_services; #line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp22__length1 = loaded_services_length1; + _tmp20__length1 = loaded_services_length1; #line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp23_ = service; + _tmp21_ = service; #line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp24_ = _g_object_ref0 (_tmp23_); + _tmp22_ = _g_object_ref0 (_tmp21_); #line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _vala_array_add59 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp24_); + _vala_array_add59 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp22_); #line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (service); #line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (pluggable); -#line 2382 "PublishingUI.c" +#line 2529 "PublishingUI.c" } #line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (_pluggable_it); -#line 2386 "PublishingUI.c" +#line 2533 "PublishingUI.c" } #line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp25_ = loaded_services; + _tmp23_ = loaded_services; #line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp25__length1 = loaded_services_length1; + _tmp23__length1 = loaded_services_length1; #line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp26_ = loaded_services; + _tmp24_ = loaded_services; #line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp26__length1 = loaded_services_length1; + _tmp24__length1 = loaded_services_length1; #line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - qsort (_tmp25_, (gsize) _tmp26__length1, (gsize) sizeof (SpitPublishingService*), ___lambda16____compar_fn_t); + qsort (_tmp23_, (gsize) _tmp24__length1, (gsize) sizeof (SpitPublishingService*), ___lambda16____compar_fn_t); #line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp27_ = loaded_services; + _tmp25_ = loaded_services; #line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp27__length1 = loaded_services_length1; + _tmp25__length1 = loaded_services_length1; #line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (result_length1) { #line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - *result_length1 = _tmp27__length1; -#line 2406 "PublishingUI.c" + *result_length1 = _tmp25__length1; +#line 2553 "PublishingUI.c" } #line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - result = _tmp27_; + result = _tmp25_; #line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (pluggables); #line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return result; -#line 2414 "PublishingUI.c" +#line 2561 "PublishingUI.c" } -static void _vala_array_add60 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) { +static void +_vala_array_add60 (SpitPublishingService** * array, + int* length, + int* size, + SpitPublishingService* value) +{ #line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if ((*length) == (*size)) { #line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *size = (*size) ? (2 * (*size)) : 4; #line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *array = g_renew (SpitPublishingService*, *array, (*size) + 1); -#line 2425 "PublishingUI.c" +#line 2577 "PublishingUI.c" } #line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" (*array)[(*length)++] = value; #line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" (*array)[*length] = NULL; -#line 2431 "PublishingUI.c" +#line 2583 "PublishingUI.c" } -static void _vala_array_add61 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) { +static void +_vala_array_add61 (SpitPublishingService** * array, + int* length, + int* size, + SpitPublishingService* value) +{ #line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if ((*length) == (*size)) { #line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *size = (*size) ? (2 * (*size)) : 4; #line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *array = g_renew (SpitPublishingService*, *array, (*size) + 1); -#line 2442 "PublishingUI.c" +#line 2599 "PublishingUI.c" } #line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" (*array)[(*length)++] = value; #line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" (*array)[*length] = NULL; -#line 2448 "PublishingUI.c" +#line 2605 "PublishingUI.c" } -static void _vala_array_add62 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) { +static void +_vala_array_add62 (SpitPublishingService** * array, + int* length, + int* size, + SpitPublishingService* value) +{ #line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if ((*length) == (*size)) { #line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *size = (*size) ? (2 * (*size)) : 4; #line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" *array = g_renew (SpitPublishingService*, *array, (*size) + 1); -#line 2459 "PublishingUI.c" +#line 2621 "PublishingUI.c" } #line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" (*array)[(*length)++] = value; #line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" (*array)[*length] = NULL; -#line 2465 "PublishingUI.c" +#line 2627 "PublishingUI.c" } -static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gboolean has_photos, gboolean has_videos, int* result_length1) { +static SpitPublishingService** +publishing_ui_publishing_dialog_load_services (gboolean has_photos, + gboolean has_videos, + int* result_length1) +{ SpitPublishingService** result = NULL; gboolean _tmp0_ = FALSE; - gboolean _tmp1_; SpitPublishingService** filtered_services = NULL; - SpitPublishingService** _tmp3_; + SpitPublishingService** _tmp1_; gint filtered_services_length1; gint _filtered_services_size_; SpitPublishingService** all_services = NULL; - gint _tmp4_; - SpitPublishingService** _tmp5_; + gint _tmp2_; + SpitPublishingService** _tmp3_; gint all_services_length1; gint _all_services_size_; - SpitPublishingService** _tmp6_; - gint _tmp6__length1; - SpitPublishingService** _tmp32_; - gint _tmp32__length1; -#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp1_ = has_photos; + SpitPublishingService** _tmp4_; + gint _tmp4__length1; + SpitPublishingService** _tmp22_; + gint _tmp22__length1; #line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp1_) { + if (has_photos) { #line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp0_ = TRUE; -#line 2492 "PublishingUI.c" +#line 2655 "PublishingUI.c" } else { - gboolean _tmp2_; -#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp2_ = has_videos; #line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp0_ = _tmp2_; -#line 2499 "PublishingUI.c" + _tmp0_ = has_videos; +#line 2659 "PublishingUI.c" } #line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _vala_assert (_tmp0_, "has_photos || has_videos"); #line 355 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp3_ = g_new0 (SpitPublishingService*, 0 + 1); + _tmp1_ = g_new0 (SpitPublishingService*, 0 + 1); #line 355 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - filtered_services = _tmp3_; + filtered_services = _tmp1_; #line 355 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" filtered_services_length1 = 0; #line 355 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _filtered_services_size_ = filtered_services_length1; #line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp5_ = publishing_ui_publishing_dialog_load_all_services (&_tmp4_); + _tmp3_ = publishing_ui_publishing_dialog_load_all_services (&_tmp2_); #line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - all_services = _tmp5_; + all_services = _tmp3_; #line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - all_services_length1 = _tmp4_; + all_services_length1 = _tmp2_; #line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _all_services_size_ = all_services_length1; #line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp6_ = all_services; + _tmp4_ = all_services; #line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp6__length1 = all_services_length1; -#line 2523 "PublishingUI.c" + _tmp4__length1 = all_services_length1; +#line 2683 "PublishingUI.c" { SpitPublishingService** service_collection = NULL; gint service_collection_length1 = 0; gint _service_collection_size_ = 0; gint service_it = 0; #line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - service_collection = _tmp6_; + service_collection = _tmp4_; #line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - service_collection_length1 = _tmp6__length1; + service_collection_length1 = _tmp4__length1; #line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - for (service_it = 0; service_it < _tmp6__length1; service_it = service_it + 1) { -#line 2535 "PublishingUI.c" - SpitPublishingService* _tmp7_; + for (service_it = 0; service_it < _tmp4__length1; service_it = service_it + 1) { +#line 2695 "PublishingUI.c" + SpitPublishingService* _tmp5_; SpitPublishingService* service = NULL; #line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp7_ = _g_object_ref0 (service_collection[service_it]); + _tmp5_ = _g_object_ref0 (service_collection[service_it]); #line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - service = _tmp7_; -#line 2542 "PublishingUI.c" + service = _tmp5_; +#line 2702 "PublishingUI.c" { - gboolean _tmp8_ = FALSE; - gboolean _tmp9_; + gboolean _tmp6_ = FALSE; #line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp9_ = has_photos; + if (has_photos) { #line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp9_) { -#line 2550 "PublishingUI.c" - gboolean _tmp10_; -#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp10_ = has_videos; -#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp8_ = !_tmp10_; -#line 2556 "PublishingUI.c" + _tmp6_ = !has_videos; +#line 2709 "PublishingUI.c" } else { #line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp8_ = FALSE; -#line 2560 "PublishingUI.c" + _tmp6_ = FALSE; +#line 2713 "PublishingUI.c" } #line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp8_) { -#line 2564 "PublishingUI.c" - SpitPublishingService* _tmp11_; - SpitPublishingPublisherMediaType _tmp12_; -#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp11_ = service; + if (_tmp6_) { +#line 2717 "PublishingUI.c" + SpitPublishingService* _tmp7_; #line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp12_ = spit_publishing_service_get_supported_media (_tmp11_); + _tmp7_ = service; #line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if ((_tmp12_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) { -#line 2573 "PublishingUI.c" - SpitPublishingService** _tmp13_; - gint _tmp13__length1; - SpitPublishingService* _tmp14_; - SpitPublishingService* _tmp15_; + if ((spit_publishing_service_get_supported_media (_tmp7_) & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) { +#line 2723 "PublishingUI.c" + SpitPublishingService** _tmp8_; + gint _tmp8__length1; + SpitPublishingService* _tmp9_; + SpitPublishingService* _tmp10_; #line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp13_ = filtered_services; + _tmp8_ = filtered_services; #line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp13__length1 = filtered_services_length1; + _tmp8__length1 = filtered_services_length1; #line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp14_ = service; + _tmp9_ = service; #line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp15_ = _g_object_ref0 (_tmp14_); + _tmp10_ = _g_object_ref0 (_tmp9_); #line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _vala_array_add60 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp15_); -#line 2588 "PublishingUI.c" + _vala_array_add60 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp10_); +#line 2738 "PublishingUI.c" } } else { - gboolean _tmp16_ = FALSE; - gboolean _tmp17_; -#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp17_ = has_photos; -#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (!_tmp17_) { -#line 2597 "PublishingUI.c" - gboolean _tmp18_; + gboolean _tmp11_ = FALSE; #line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp18_ = has_videos; + if (!has_photos) { #line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp16_ = _tmp18_; -#line 2603 "PublishingUI.c" + _tmp11_ = has_videos; +#line 2746 "PublishingUI.c" } else { #line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp16_ = FALSE; -#line 2607 "PublishingUI.c" + _tmp11_ = FALSE; +#line 2750 "PublishingUI.c" } #line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp16_) { -#line 2611 "PublishingUI.c" - SpitPublishingService* _tmp19_; - SpitPublishingPublisherMediaType _tmp20_; -#line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp19_ = service; + if (_tmp11_) { +#line 2754 "PublishingUI.c" + SpitPublishingService* _tmp12_; #line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp20_ = spit_publishing_service_get_supported_media (_tmp19_); + _tmp12_ = service; #line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if ((_tmp20_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0) { -#line 2620 "PublishingUI.c" - SpitPublishingService** _tmp21_; - gint _tmp21__length1; - SpitPublishingService* _tmp22_; - SpitPublishingService* _tmp23_; + if ((spit_publishing_service_get_supported_media (_tmp12_) & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0) { +#line 2760 "PublishingUI.c" + SpitPublishingService** _tmp13_; + gint _tmp13__length1; + SpitPublishingService* _tmp14_; + SpitPublishingService* _tmp15_; #line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp21_ = filtered_services; + _tmp13_ = filtered_services; #line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp21__length1 = filtered_services_length1; + _tmp13__length1 = filtered_services_length1; #line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp22_ = service; + _tmp14_ = service; #line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp23_ = _g_object_ref0 (_tmp22_); + _tmp15_ = _g_object_ref0 (_tmp14_); #line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _vala_array_add61 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp23_); -#line 2635 "PublishingUI.c" + _vala_array_add61 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp15_); +#line 2775 "PublishingUI.c" } } else { - gboolean _tmp24_ = FALSE; - SpitPublishingService* _tmp25_; - SpitPublishingPublisherMediaType _tmp26_; -#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp25_ = service; + gboolean _tmp16_ = FALSE; + SpitPublishingService* _tmp17_; #line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp26_ = spit_publishing_service_get_supported_media (_tmp25_); + _tmp17_ = service; #line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if ((_tmp26_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) { -#line 2647 "PublishingUI.c" - SpitPublishingService* _tmp27_; - SpitPublishingPublisherMediaType _tmp28_; + if ((spit_publishing_service_get_supported_media (_tmp17_) & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) { +#line 2784 "PublishingUI.c" + SpitPublishingService* _tmp18_; #line 368 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp27_ = service; + _tmp18_ = service; #line 368 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp28_ = spit_publishing_service_get_supported_media (_tmp27_); -#line 368 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp24_ = (_tmp28_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0; -#line 2656 "PublishingUI.c" + _tmp16_ = (spit_publishing_service_get_supported_media (_tmp18_) & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0; +#line 2790 "PublishingUI.c" } else { #line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp24_ = FALSE; -#line 2660 "PublishingUI.c" + _tmp16_ = FALSE; +#line 2794 "PublishingUI.c" } #line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp24_) { -#line 2664 "PublishingUI.c" - SpitPublishingService** _tmp29_; - gint _tmp29__length1; - SpitPublishingService* _tmp30_; - SpitPublishingService* _tmp31_; + if (_tmp16_) { +#line 2798 "PublishingUI.c" + SpitPublishingService** _tmp19_; + gint _tmp19__length1; + SpitPublishingService* _tmp20_; + SpitPublishingService* _tmp21_; #line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp29_ = filtered_services; + _tmp19_ = filtered_services; #line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp29__length1 = filtered_services_length1; + _tmp19__length1 = filtered_services_length1; #line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp30_ = service; + _tmp20_ = service; #line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp31_ = _g_object_ref0 (_tmp30_); + _tmp21_ = _g_object_ref0 (_tmp20_); #line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _vala_array_add62 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp31_); -#line 2679 "PublishingUI.c" + _vala_array_add62 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp21_); +#line 2813 "PublishingUI.c" } } } #line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (service); -#line 2685 "PublishingUI.c" +#line 2819 "PublishingUI.c" } } } #line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp32_ = filtered_services; + _tmp22_ = filtered_services; #line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp32__length1 = filtered_services_length1; + _tmp22__length1 = filtered_services_length1; #line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (result_length1) { #line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - *result_length1 = _tmp32__length1; -#line 2697 "PublishingUI.c" + *result_length1 = _tmp22__length1; +#line 2831 "PublishingUI.c" } #line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - result = _tmp32_; + result = _tmp22_; #line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" all_services = (_vala_array_free (all_services, all_services_length1, (GDestroyNotify) g_object_unref), NULL); #line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return result; -#line 2705 "PublishingUI.c" +#line 2839 "PublishingUI.c" } -void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) { +void +publishing_ui_publishing_dialog_go (GeeCollection* to_publish) +{ PublishingUIPublishingDialog* _tmp0_; GTimer* _tmp1_; GeeArrayList* photos = NULL; GeeArrayList* _tmp10_; GeeArrayList* videos = NULL; GeeArrayList* _tmp11_; - GeeCollection* _tmp12_; + GeeArrayList* _tmp12_; GeeArrayList* _tmp13_; - GeeArrayList* _tmp14_; SpitPublishingService** avail_services = NULL; - GeeArrayList* _tmp15_; + GeeArrayList* _tmp14_; + gint _tmp15_; gint _tmp16_; - gint _tmp17_; - GeeArrayList* _tmp18_; + GeeArrayList* _tmp17_; + gint _tmp18_; gint _tmp19_; gint _tmp20_; - gint _tmp21_; - SpitPublishingService** _tmp22_; + SpitPublishingService** _tmp21_; gint avail_services_length1; gint _avail_services_size_; - SpitPublishingService** _tmp23_; - gint _tmp23__length1; - GeeCollection* _tmp26_; - PublishingUIPublishingDialog* _tmp27_; - PublishingUIPublishingDialog* _tmp28_; - GTimer* _tmp29_; + SpitPublishingService** _tmp22_; + gint _tmp22__length1; + PublishingUIPublishingDialog* _tmp25_; + PublishingUIPublishingDialog* _tmp26_; + GTimer* _tmp27_; #line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (GEE_IS_COLLECTION (to_publish)); #line 388 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -2743,13 +2877,13 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) { if (_tmp0_ != NULL) { #line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return; -#line 2744 "PublishingUI.c" +#line 2878 "PublishingUI.c" } #line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp1_ = publishing_ui_publishing_dialog_since_last_start; #line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp1_ == NULL) { -#line 2750 "PublishingUI.c" +#line 2884 "PublishingUI.c" GTimer* _tmp2_; GTimer* _tmp3_; GTimer* _tmp4_; @@ -2769,7 +2903,7 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) { g_timer_reset (_tmp4_); #line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_elapsed_is_valid = FALSE; -#line 2770 "PublishingUI.c" +#line 2904 "PublishingUI.c" } else { gdouble elapsed = 0.0; GTimer* _tmp5_; @@ -2786,23 +2920,23 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) { _tmp8_ = elapsed; #line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp8_ < 0.05) { -#line 2787 "PublishingUI.c" +#line 2921 "PublishingUI.c" gboolean _tmp9_; #line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp9_ = publishing_ui_publishing_dialog_elapsed_is_valid; #line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp7_ = _tmp9_; -#line 2793 "PublishingUI.c" +#line 2927 "PublishingUI.c" } else { #line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp7_ = FALSE; -#line 2797 "PublishingUI.c" +#line 2931 "PublishingUI.c" } #line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp7_) { #line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return; -#line 2803 "PublishingUI.c" +#line 2937 "PublishingUI.c" } } #line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -2814,53 +2948,51 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) { #line 405 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" videos = _tmp11_; #line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp12_ = to_publish; + _tmp12_ = photos; #line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp13_ = photos; + _tmp13_ = videos; #line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp14_ = videos; -#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - media_source_collection_filter_media (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection)); + media_source_collection_filter_media (to_publish, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection)); #line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp15_ = photos; + _tmp14_ = photos; #line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp15_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp18_ = videos; + _tmp17_ = videos; #line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp18_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp22_ = publishing_ui_publishing_dialog_load_services (_tmp17_ > 0, _tmp20_ > 0, &_tmp21_); + _tmp21_ = publishing_ui_publishing_dialog_load_services (_tmp16_ > 0, _tmp19_ > 0, &_tmp20_); #line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - avail_services = _tmp22_; + avail_services = _tmp21_; #line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - avail_services_length1 = _tmp21_; + avail_services_length1 = _tmp20_; #line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _avail_services_size_ = avail_services_length1; #line 411 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp23_ = avail_services; + _tmp22_ = avail_services; #line 411 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp23__length1 = avail_services_length1; + _tmp22__length1 = avail_services_length1; #line 411 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if (_tmp23__length1 == 0) { -#line 2848 "PublishingUI.c" + if (_tmp22__length1 == 0) { +#line 2980 "PublishingUI.c" + gchar* _tmp23_; gchar* _tmp24_; - gchar* _tmp25_; #line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp24_ = g_strdup_printf (_ ("Shotwell cannot publish the selected items because you do not have a c" \ + _tmp23_ = g_strdup_printf (_ ("Shotwell cannot publish the selected items because you do not have a c" \ "ompatible publishing plugin enabled. To correct this, choose Edit %" \ "s Preferences and enable one or more of the publishing plugins on " \ "the Plugins tab."), "▸"); #line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp25_ = _tmp24_; + _tmp24_ = _tmp23_; #line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - app_window_error_message_with_title (_ ("Unable to publish"), _tmp25_, NULL, FALSE); + app_window_error_message_with_title (_ ("Unable to publish"), _tmp24_, NULL, FALSE); #line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _g_free0 (_tmp25_); + _g_free0 (_tmp24_); #line 418 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" avail_services = (_vala_array_free (avail_services, avail_services_length1, (GDestroyNotify) g_object_unref), NULL); #line 418 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -2869,32 +3001,30 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) { _g_object_unref0 (photos); #line 418 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return; -#line 2867 "PublishingUI.c" +#line 2999 "PublishingUI.c" } #line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_debug ("PublishingUI.vala:424: PublishingDialog.go( )"); #line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp26_ = to_publish; -#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp27_ = publishing_ui_publishing_dialog_new (_tmp26_); + _tmp25_ = publishing_ui_publishing_dialog_new (to_publish); #line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_object_ref_sink (_tmp27_); + g_object_ref_sink (_tmp25_); #line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (publishing_ui_publishing_dialog_active_instance); #line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - publishing_ui_publishing_dialog_active_instance = _tmp27_; + publishing_ui_publishing_dialog_active_instance = _tmp25_; #line 428 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp28_ = publishing_ui_publishing_dialog_active_instance; + _tmp26_ = publishing_ui_publishing_dialog_active_instance; #line 428 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - publishing_ui_publishing_dialog_run (_tmp28_); + publishing_ui_publishing_dialog_run (_tmp26_); #line 430 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (publishing_ui_publishing_dialog_active_instance); #line 430 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_active_instance = NULL; #line 433 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp29_ = publishing_ui_publishing_dialog_since_last_start; + _tmp27_ = publishing_ui_publishing_dialog_since_last_start; #line 433 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - g_timer_start (_tmp29_); + g_timer_start (_tmp27_); #line 434 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_elapsed_is_valid = TRUE; #line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -2903,11 +3033,14 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) { _g_object_unref0 (videos); #line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (photos); -#line 2901 "PublishingUI.c" +#line 3031 "PublishingUI.c" } -static gboolean publishing_ui_publishing_dialog_on_window_close (PublishingUIPublishingDialog* self, GdkEventAny* evt) { +static gboolean +publishing_ui_publishing_dialog_on_window_close (PublishingUIPublishingDialog* self, + GdkEventAny* evt) +{ gboolean result = FALSE; SpitPublishingConcretePublishingHost* _tmp0_; #line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -2930,11 +3063,13 @@ static gboolean publishing_ui_publishing_dialog_on_window_close (PublishingUIPub result = TRUE; #line 443 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return result; -#line 2928 "PublishingUI.c" +#line 3061 "PublishingUI.c" } -static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPublishingDialog* self) { +static void +publishing_ui_publishing_dialog_on_service_changed (PublishingUIPublishingDialog* self) +{ GtkTreeIter iter = {0}; gboolean have_active_iter = FALSE; GtkComboBox* _tmp0_; @@ -2982,7 +3117,7 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl _tmp3_ = have_active_iter; #line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (!_tmp3_) { -#line 2980 "PublishingUI.c" +#line 3115 "PublishingUI.c" GtkComboBox* _tmp4_; GtkComboBox* _tmp5_; GtkTreeIter _tmp6_ = {0}; @@ -2996,14 +3131,14 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl gtk_combo_box_get_active_iter (_tmp5_, &_tmp6_); #line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" iter = _tmp6_; -#line 2994 "PublishingUI.c" +#line 3129 "PublishingUI.c" } #line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp7_ = self->priv->service_selector_box_model; #line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp8_ = iter; #line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_tree_model_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp8_, 1, &_tmp9_); + gtk_tree_model_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp8_, 1, &_tmp9_); #line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_IS_VALUE (&service_name_val) ? (g_value_unset (&service_name_val), NULL) : NULL; #line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -3028,7 +3163,7 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl _tmp14_ = services; #line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp14__length1 = services_length1; -#line 3026 "PublishingUI.c" +#line 3161 "PublishingUI.c" { SpitPublishingService** service_collection = NULL; gint service_collection_length1 = 0; @@ -3040,14 +3175,14 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl service_collection_length1 = _tmp14__length1; #line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" for (service_it = 0; service_it < _tmp14__length1; service_it = service_it + 1) { -#line 3038 "PublishingUI.c" +#line 3173 "PublishingUI.c" SpitPublishingService* _tmp15_; SpitPublishingService* service = NULL; #line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp15_ = _g_object_ref0 (service_collection[service_it]); #line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" service = _tmp15_; -#line 3045 "PublishingUI.c" +#line 3180 "PublishingUI.c" { SpitPublishingService* _tmp16_; const gchar* _tmp17_; @@ -3060,7 +3195,7 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl _tmp18_ = service_name; #line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (g_strcmp0 (_tmp17_, _tmp18_) == 0) { -#line 3058 "PublishingUI.c" +#line 3193 "PublishingUI.c" SpitPublishingService* _tmp19_; SpitPublishingService* _tmp20_; #line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -3075,11 +3210,11 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl _g_object_unref0 (service); #line 470 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" break; -#line 3073 "PublishingUI.c" +#line 3208 "PublishingUI.c" } #line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (service); -#line 3077 "PublishingUI.c" +#line 3212 "PublishingUI.c" } } } @@ -3123,11 +3258,13 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl _g_free0 (service_name); #line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_IS_VALUE (&service_name_val) ? (g_value_unset (&service_name_val), NULL) : NULL; -#line 3121 "PublishingUI.c" +#line 3256 "PublishingUI.c" } -static void publishing_ui_publishing_dialog_on_close_cancel_clicked (PublishingUIPublishingDialog* self) { +static void +publishing_ui_publishing_dialog_on_close_cancel_clicked (PublishingUIPublishingDialog* self) +{ SpitPublishingConcretePublishingHost* _tmp0_; #line 481 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); @@ -3146,11 +3283,13 @@ static void publishing_ui_publishing_dialog_on_close_cancel_clicked (PublishingU gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 487 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 3143 "PublishingUI.c" +#line 3280 "PublishingUI.c" } -static void publishing_ui_publishing_dialog_set_large_window_mode (PublishingUIPublishingDialog* self) { +static void +publishing_ui_publishing_dialog_set_large_window_mode (PublishingUIPublishingDialog* self) +{ GtkBox* _tmp0_; #line 490 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); @@ -3162,11 +3301,13 @@ static void publishing_ui_publishing_dialog_set_large_window_mode (PublishingUIP gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT); #line 494 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); -#line 3159 "PublishingUI.c" +#line 3298 "PublishingUI.c" } -static void publishing_ui_publishing_dialog_set_colossal_window_mode (PublishingUIPublishingDialog* self) { +static void +publishing_ui_publishing_dialog_set_colossal_window_mode (PublishingUIPublishingDialog* self) +{ GtkBox* _tmp0_; #line 497 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); @@ -3178,11 +3319,13 @@ static void publishing_ui_publishing_dialog_set_colossal_window_mode (Publishing gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT); #line 501 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); -#line 3175 "PublishingUI.c" +#line 3316 "PublishingUI.c" } -static void publishing_ui_publishing_dialog_set_standard_window_mode (PublishingUIPublishingDialog* self) { +static void +publishing_ui_publishing_dialog_set_standard_window_mode (PublishingUIPublishingDialog* self) +{ GtkBox* _tmp0_; #line 504 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); @@ -3194,29 +3337,35 @@ static void publishing_ui_publishing_dialog_set_standard_window_mode (Publishing gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT); #line 508 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); -#line 3191 "PublishingUI.c" +#line 3334 "PublishingUI.c" } -static void publishing_ui_publishing_dialog_set_free_sizable_window_mode (PublishingUIPublishingDialog* self) { +static void +publishing_ui_publishing_dialog_set_free_sizable_window_mode (PublishingUIPublishingDialog* self) +{ #line 511 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); #line 512 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE); -#line 3200 "PublishingUI.c" +#line 3345 "PublishingUI.c" } -static void publishing_ui_publishing_dialog_clear_free_sizable_window_mode (PublishingUIPublishingDialog* self) { +static void +publishing_ui_publishing_dialog_clear_free_sizable_window_mode (PublishingUIPublishingDialog* self) +{ #line 515 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); #line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); -#line 3209 "PublishingUI.c" +#line 3356 "PublishingUI.c" } -SpitPublishingDialogPane* publishing_ui_publishing_dialog_get_active_pane (PublishingUIPublishingDialog* self) { +SpitPublishingDialogPane* +publishing_ui_publishing_dialog_get_active_pane (PublishingUIPublishingDialog* self) +{ SpitPublishingDialogPane* result = NULL; SpitPublishingDialogPane* _tmp0_; SpitPublishingDialogPane* _tmp1_; @@ -3230,11 +3379,13 @@ SpitPublishingDialogPane* publishing_ui_publishing_dialog_get_active_pane (Publi result = _tmp1_; #line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return result; -#line 3227 "PublishingUI.c" +#line 3376 "PublishingUI.c" } -void publishing_ui_publishing_dialog_set_close_button_mode (PublishingUIPublishingDialog* self) { +void +publishing_ui_publishing_dialog_set_close_button_mode (PublishingUIPublishingDialog* self) +{ GtkButton* _tmp0_; GtkButton* _tmp1_; #line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -3247,11 +3398,13 @@ void publishing_ui_publishing_dialog_set_close_button_mode (PublishingUIPublishi _tmp1_ = self->priv->close_cancel_button; #line 525 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); -#line 3244 "PublishingUI.c" +#line 3395 "PublishingUI.c" } -void publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublishingDialog* self) { +void +publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublishingDialog* self) +{ GtkButton* _tmp0_; #line 528 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); @@ -3259,11 +3412,13 @@ void publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublish _tmp0_ = self->priv->close_cancel_button; #line 529 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_button_set_label (_tmp0_, _ ("_Cancel")); -#line 3256 "PublishingUI.c" +#line 3409 "PublishingUI.c" } -void publishing_ui_publishing_dialog_lock_service (PublishingUIPublishingDialog* self) { +void +publishing_ui_publishing_dialog_lock_service (PublishingUIPublishingDialog* self) +{ GtkComboBox* _tmp0_; #line 532 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); @@ -3271,11 +3426,13 @@ void publishing_ui_publishing_dialog_lock_service (PublishingUIPublishingDialog* _tmp0_ = self->priv->service_selector_box; #line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 3268 "PublishingUI.c" +#line 3423 "PublishingUI.c" } -void publishing_ui_publishing_dialog_unlock_service (PublishingUIPublishingDialog* self) { +void +publishing_ui_publishing_dialog_unlock_service (PublishingUIPublishingDialog* self) +{ GtkComboBox* _tmp0_; #line 536 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); @@ -3283,24 +3440,22 @@ void publishing_ui_publishing_dialog_unlock_service (PublishingUIPublishingDialo _tmp0_ = self->priv->service_selector_box; #line 537 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 3280 "PublishingUI.c" +#line 3437 "PublishingUI.c" } -void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog* self, SpitPublishingDialogPane* pane) { +void +publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog* self, + SpitPublishingDialogPane* pane) +{ SpitPublishingDialogPane* _tmp0_; GtkBox* _tmp6_; - SpitPublishingDialogPane* _tmp7_; + GtkWidget* _tmp7_; GtkWidget* _tmp8_; - GtkWidget* _tmp9_; SpitPublishingDialogPaneGeometryOptions geometry_options = 0; - SpitPublishingDialogPane* _tmp10_; + SpitPublishingDialogPaneGeometryOptions _tmp9_; SpitPublishingDialogPaneGeometryOptions _tmp11_; - SpitPublishingDialogPaneGeometryOptions _tmp12_; - SpitPublishingDialogPaneGeometryOptions _tmp14_; - SpitPublishingDialogPane* _tmp15_; - SpitPublishingDialogPane* _tmp16_; - SpitPublishingDialogPane* _tmp17_; + SpitPublishingDialogPane* _tmp12_; #line 540 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self)); #line 540 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -3311,7 +3466,7 @@ void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog* _tmp0_ = self->priv->active_pane; #line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" if (_tmp0_ != NULL) { -#line 3308 "PublishingUI.c" +#line 3463 "PublishingUI.c" SpitPublishingDialogPane* _tmp1_; GtkBox* _tmp2_; SpitPublishingDialogPane* _tmp3_; @@ -3336,90 +3491,79 @@ void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog* gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), _tmp5_); #line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (_tmp5_); -#line 3332 "PublishingUI.c" +#line 3487 "PublishingUI.c" } #line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _tmp6_ = self->priv->central_area_layouter; #line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp7_ = pane; + _tmp7_ = spit_publishing_dialog_pane_get_widget (pane); #line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp8_ = spit_publishing_dialog_pane_get_widget (_tmp7_); + _tmp8_ = _tmp7_; #line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp9_ = _tmp8_; + gtk_box_pack_start (_tmp6_, _tmp8_, TRUE, TRUE, (guint) 0); #line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - gtk_box_pack_start (_tmp6_, _tmp9_, TRUE, TRUE, (guint) 0); -#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp10_ = pane; -#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp11_ = spit_publishing_dialog_pane_get_preferred_geometry (_tmp10_); -#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - geometry_options = _tmp11_; + geometry_options = spit_publishing_dialog_pane_get_preferred_geometry (pane); #line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp12_ = geometry_options; + _tmp9_ = geometry_options; #line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if ((_tmp12_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) { + if ((_tmp9_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) { #line 556 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_set_large_window_mode (self); -#line 3360 "PublishingUI.c" +#line 3509 "PublishingUI.c" } else { - SpitPublishingDialogPaneGeometryOptions _tmp13_; + SpitPublishingDialogPaneGeometryOptions _tmp10_; #line 557 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp13_ = geometry_options; + _tmp10_ = geometry_options; #line 557 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if ((_tmp13_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) { + if ((_tmp10_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) { #line 558 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_set_colossal_window_mode (self); -#line 3369 "PublishingUI.c" +#line 3518 "PublishingUI.c" } else { #line 560 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_set_standard_window_mode (self); -#line 3373 "PublishingUI.c" +#line 3522 "PublishingUI.c" } } #line 562 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp14_ = geometry_options; + _tmp11_ = geometry_options; #line 562 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - if ((_tmp14_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) { + if ((_tmp11_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) { #line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_set_free_sizable_window_mode (self); -#line 3382 "PublishingUI.c" +#line 3531 "PublishingUI.c" } else { #line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_clear_free_sizable_window_mode (self); -#line 3386 "PublishingUI.c" +#line 3535 "PublishingUI.c" } #line 567 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp15_ = pane; -#line 567 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp16_ = _g_object_ref0 (_tmp15_); + _tmp12_ = _g_object_ref0 (pane); #line 567 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (self->priv->active_pane); #line 567 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - self->priv->active_pane = _tmp16_; -#line 568 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp17_ = pane; + self->priv->active_pane = _tmp12_; #line 568 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - spit_publishing_dialog_pane_on_pane_installed (_tmp17_); -#line 3400 "PublishingUI.c" + spit_publishing_dialog_pane_on_pane_installed (pane); +#line 3545 "PublishingUI.c" } -gint publishing_ui_publishing_dialog_run (PublishingUIPublishingDialog* self) { +gint +publishing_ui_publishing_dialog_run (PublishingUIPublishingDialog* self) +{ gint result = 0; gint _result_ = 0; - gint _tmp0_; #line 571 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), 0); #line 572 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_on_service_changed (self); #line 574 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); -#line 574 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _result_ = _tmp0_; + _result_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); #line 576 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (self->priv->host); #line 576 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" @@ -3428,29 +3572,35 @@ gint publishing_ui_publishing_dialog_run (PublishingUIPublishingDialog* self) { result = _result_; #line 578 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" return result; -#line 3424 "PublishingUI.c" +#line 3568 "PublishingUI.c" } -static void publishing_ui_publishing_dialog_class_init (PublishingUIPublishingDialogClass * klass) { +static void +publishing_ui_publishing_dialog_class_init (PublishingUIPublishingDialogClass * klass) +{ #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" publishing_ui_publishing_dialog_parent_class = g_type_class_peek_parent (klass); #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" g_type_class_add_private (klass, sizeof (PublishingUIPublishingDialogPrivate)); #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_OBJECT_CLASS (klass)->finalize = publishing_ui_publishing_dialog_finalize; -#line 3435 "PublishingUI.c" +#line 3581 "PublishingUI.c" } -static void publishing_ui_publishing_dialog_instance_init (PublishingUIPublishingDialog * self) { +static void +publishing_ui_publishing_dialog_instance_init (PublishingUIPublishingDialog * self) +{ #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self->priv = PUBLISHING_UI_PUBLISHING_DIALOG_GET_PRIVATE (self); -#line 3442 "PublishingUI.c" +#line 3590 "PublishingUI.c" } -static void publishing_ui_publishing_dialog_finalize (GObject * obj) { +static void +publishing_ui_publishing_dialog_finalize (GObject * obj) +{ PublishingUIPublishingDialog * self; #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_PUBLISHING_DIALOG, PublishingUIPublishingDialog); @@ -3472,11 +3622,13 @@ static void publishing_ui_publishing_dialog_finalize (GObject * obj) { spit_pluggable_info_destroy (&self->priv->info); #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" G_OBJECT_CLASS (publishing_ui_publishing_dialog_parent_class)->finalize (obj); -#line 3468 "PublishingUI.c" +#line 3618 "PublishingUI.c" } -GType publishing_ui_publishing_dialog_get_type (void) { +GType +publishing_ui_publishing_dialog_get_type (void) +{ static volatile gsize publishing_ui_publishing_dialog_type_id__volatile = 0; if (g_once_init_enter (&publishing_ui_publishing_dialog_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingUIPublishingDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_ui_publishing_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingUIPublishingDialog), 0, (GInstanceInitFunc) publishing_ui_publishing_dialog_instance_init, NULL }; @@ -3488,7 +3640,11 @@ GType publishing_ui_publishing_dialog_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -3500,7 +3656,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/searches/SavedSearchDialog.c b/src/searches/SavedSearchDialog.c index 09e5fec..65e6df1 100644 --- a/src/searches/SavedSearchDialog.c +++ b/src/searches/SavedSearchDialog.c @@ -1,4 +1,4 @@ -/* SavedSearchDialog.c generated by valac 0.36.6, the Vala compiler +/* SavedSearchDialog.c generated by valac 0.40.4, the Vala compiler * generated from SavedSearchDialog.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -8,6 +8,7 @@ */ /* This dialog displays a boolean search configuration.*/ + #include #include #include @@ -68,6 +69,11 @@ typedef struct _DataSourceClass DataSourceClass; typedef struct _SavedSearch SavedSearch; typedef struct _SavedSearchClass SavedSearchClass; +enum { + SAVED_SEARCH_DIALOG_0_PROPERTY, + SAVED_SEARCH_DIALOG_NUM_PROPERTIES +}; +static GParamSpec* saved_search_dialog_properties[SAVED_SEARCH_DIALOG_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define TYPE_SAVED_SEARCH_TABLE (saved_search_table_get_type ()) @@ -193,9 +199,9 @@ typedef struct _SavedSearchDialogParamSpecSearchRowContainer SavedSearchDialogPa enum { SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_REMOVE_SIGNAL, SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL, - SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_LAST_SIGNAL + SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_NUM_SIGNALS }; -static guint saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_LAST_SIGNAL] = {0}; +static guint saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_NUM_SIGNALS] = {0}; typedef struct _SavedSearchDialogSearchRowPrivate SavedSearchDialogSearchRowPrivate; typedef struct _SavedSearchDialogParamSpecSearchRow SavedSearchDialogParamSpecSearchRow; typedef struct _SavedSearchDialogSearchRowTextPrivate SavedSearchDialogSearchRowTextPrivate; @@ -554,365 +560,449 @@ static gpointer saved_search_dialog_search_row_date_parent_class = NULL; GType saved_search_dialog_get_type (void) G_GNUC_CONST; static gpointer saved_search_dialog_search_row_container_ref (gpointer instance); static void saved_search_dialog_search_row_container_unref (gpointer instance); -static GParamSpec* saved_search_dialog_param_spec_search_row_container (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; -static void saved_search_dialog_value_set_search_row_container (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void saved_search_dialog_value_take_search_row_container (GValue* value, gpointer v_object) G_GNUC_UNUSED; +static GParamSpec* saved_search_dialog_param_spec_search_row_container (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) G_GNUC_UNUSED; +static void saved_search_dialog_value_set_search_row_container (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void saved_search_dialog_value_take_search_row_container (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer saved_search_dialog_value_get_search_row_container (const GValue* value) G_GNUC_UNUSED; static GType saved_search_dialog_search_row_container_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; GType saved_search_get_type (void) G_GNUC_CONST; #define SAVED_SEARCH_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SAVED_SEARCH_DIALOG, SavedSearchDialogPrivate)) -enum { - SAVED_SEARCH_DIALOG_DUMMY_PROPERTY -}; SavedSearchDialog* saved_search_dialog_new (void); SavedSearchDialog* saved_search_dialog_construct (GType object_type); gint resources_use_header_bar (void); static void saved_search_dialog_setup_dialog (SavedSearchDialog* self); gpointer saved_search_table_ref (gpointer instance); void saved_search_table_unref (gpointer instance); -GParamSpec* param_spec_saved_search_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_saved_search_table (GValue* value, gpointer v_object); -void value_take_saved_search_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_saved_search_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_saved_search_table (GValue* value, + gpointer v_object); +void value_take_saved_search_table (GValue* value, + gpointer v_object); gpointer value_get_saved_search_table (const GValue* value); GType saved_search_table_get_type (void) G_GNUC_CONST; SavedSearchTable* saved_search_table_get_instance (void); gchar* saved_search_table_generate_unique_name (SavedSearchTable* self); static void saved_search_dialog_add_text_search (SavedSearchDialog* self); -static void saved_search_dialog_search_row_container_allow_removal (SavedSearchDialogSearchRowContainer* self, gboolean allow); -static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v); +static void saved_search_dialog_search_row_container_allow_removal (SavedSearchDialogSearchRowContainer* self, + gboolean allow); +static void saved_search_dialog_set_valid (SavedSearchDialog* self, + gboolean v); SavedSearchDialog* saved_search_dialog_new_edit_existing (SavedSearch* saved_search); -SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_type, SavedSearch* saved_search); +SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_type, + SavedSearch* saved_search); GType search_operator_get_type (void) G_GNUC_CONST; SearchOperator saved_search_get_operator (SavedSearch* self); gchar* data_object_get_name (DataObject* self); gpointer search_condition_ref (gpointer instance); void search_condition_unref (gpointer instance); -GParamSpec* param_spec_search_condition (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_search_condition (GValue* value, gpointer v_object); -void value_take_search_condition (GValue* value, gpointer v_object); +GParamSpec* param_spec_search_condition (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_search_condition (GValue* value, + gpointer v_object); +void value_take_search_condition (GValue* value, + gpointer v_object); gpointer value_get_search_condition (const GValue* value); GType search_condition_get_type (void) G_GNUC_CONST; GeeList* saved_search_get_conditions (SavedSearch* self); -static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row); +static void saved_search_dialog_add_row (SavedSearchDialog* self, + SavedSearchDialogSearchRowContainer* row); static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new_edit_existing (SearchCondition* sc); -static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct_edit_existing (GType object_type, SearchCondition* sc); +static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct_edit_existing (GType object_type, + SearchCondition* sc); GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); -static void saved_search_dialog_on_response (SavedSearchDialog* self, gint response_id); -static void _saved_search_dialog_on_response_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self); +static void saved_search_dialog_on_response (SavedSearchDialog* self, + gint response_id); +static void _saved_search_dialog_on_response_gtk_dialog_response (GtkDialog* _sender, + gint response_id, + gpointer self); static void saved_search_dialog_on_add_criteria (SavedSearchDialog* self); -static void _saved_search_dialog_on_add_criteria_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void _saved_search_dialog_on_add_criteria_gtk_button_clicked (GtkButton* _sender, + gpointer self); static void saved_search_dialog_on_title_changed (SavedSearchDialog* self); -static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self); +static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, + gpointer self); void saved_search_dialog_show (SavedSearchDialog* self); static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new (void); static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct (GType object_type); static GtkWidget* saved_search_dialog_search_row_container_get_widget (SavedSearchDialogSearchRowContainer* self); -static void saved_search_dialog_on_remove_row (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row); -static void _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove (SavedSearchDialogSearchRowContainer* _sender, SavedSearchDialogSearchRowContainer* this_row, gpointer self); -static void saved_search_dialog_on_row_changed (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row); -static void _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed (SavedSearchDialogSearchRowContainer* _sender, SavedSearchDialogSearchRowContainer* this_row, gpointer self); +static void saved_search_dialog_on_remove_row (SavedSearchDialog* self, + SavedSearchDialogSearchRowContainer* row); +static void _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove (SavedSearchDialogSearchRowContainer* _sender, + SavedSearchDialogSearchRowContainer* this_row, + gpointer self); +static void saved_search_dialog_on_row_changed (SavedSearchDialog* self, + SavedSearchDialogSearchRowContainer* row); +static void _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed (SavedSearchDialogSearchRowContainer* _sender, + SavedSearchDialogSearchRowContainer* this_row, + gpointer self); static gboolean saved_search_dialog_search_row_container_is_complete (SavedSearchDialogSearchRowContainer* self); -gboolean saved_search_table_exists (SavedSearchTable* self, const gchar* search_name); -void app_window_error_message (const gchar* message, GtkWindow* parent); +gboolean saved_search_table_exists (SavedSearchTable* self, + const gchar* search_name); +void app_window_error_message (const gchar* message, + GtkWindow* parent); gchar* resources_rename_search_exists_message (const gchar* name); -void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search); +void saved_search_table_remove (SavedSearchTable* self, + SavedSearch* search); static SearchCondition* saved_search_dialog_search_row_container_get_search_condition (SavedSearchDialogSearchRowContainer* self); -SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* name, SearchOperator operator, GeeArrayList* conditions); +SavedSearch* saved_search_table_create (SavedSearchTable* self, + const gchar* name, + SearchOperator operator, + GeeArrayList* conditions); static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self); GType search_condition_search_type_get_type (void) G_GNUC_CONST; static gpointer saved_search_dialog_search_row_ref (gpointer instance); static void saved_search_dialog_search_row_unref (gpointer instance); -static GParamSpec* saved_search_dialog_param_spec_search_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; -static void saved_search_dialog_value_set_search_row (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void saved_search_dialog_value_take_search_row (GValue* value, gpointer v_object) G_GNUC_UNUSED; +static GParamSpec* saved_search_dialog_param_spec_search_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) G_GNUC_UNUSED; +static void saved_search_dialog_value_set_search_row (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void saved_search_dialog_value_take_search_row (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer saved_search_dialog_value_get_search_row (const GValue* value) G_GNUC_UNUSED; static GType saved_search_dialog_search_row_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, SavedSearchDialogSearchRowContainerPrivate)) -enum { - SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_DUMMY_PROPERTY -}; static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialogSearchRowContainer* self); -static void saved_search_dialog_search_row_container_set_type (SavedSearchDialogSearchRowContainer* self, SearchConditionSearchType type); +static void saved_search_dialog_search_row_container_set_type (SavedSearchDialogSearchRowContainer* self, + SearchConditionSearchType type); SearchConditionSearchType search_condition_get_search_type (SearchCondition* self); -static void saved_search_dialog_search_row_container_set_type_combo_box (SavedSearchDialogSearchRowContainer* self, SearchConditionSearchType st); -static void saved_search_dialog_search_row_populate (SavedSearchDialogSearchRow* self, SearchCondition* sc); +static void saved_search_dialog_search_row_container_set_type_combo_box (SavedSearchDialogSearchRowContainer* self, + SearchConditionSearchType st); +static void saved_search_dialog_search_row_populate (SavedSearchDialogSearchRow* self, + SearchCondition* sc); SearchConditionSearchType* search_condition_search_type_as_array (int* result_length1); -void search_condition_search_type_sort_array (SearchConditionSearchType** array, int* array_length1); +void search_condition_search_type_sort_array (SearchConditionSearchType** array, + int* array_length1); gchar* search_condition_search_type_display_text (SearchConditionSearchType self); static void saved_search_dialog_search_row_container_on_type_changed (SavedSearchDialogSearchRowContainer* self); -static void _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); +static void _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self); static void saved_search_dialog_search_row_container_on_removed (SavedSearchDialogSearchRowContainer* self); -static void _saved_search_dialog_search_row_container_on_removed_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void _saved_search_dialog_search_row_container_on_removed_gtk_button_clicked (GtkButton* _sender, + gpointer self); static SearchConditionSearchType saved_search_dialog_search_row_container_get_search_type (SavedSearchDialogSearchRowContainer* self); static GtkWidget* saved_search_dialog_search_row_get_widget (SavedSearchDialogSearchRow* self); static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_new (SavedSearchDialogSearchRowContainer* parent); -static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent); +static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_construct (GType object_type, + SavedSearchDialogSearchRowContainer* parent); static GType saved_search_dialog_search_row_text_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_new (SavedSearchDialogSearchRowContainer* parent); -static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent); +static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_construct (GType object_type, + SavedSearchDialogSearchRowContainer* parent); static GType saved_search_dialog_search_row_media_type_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_new (SavedSearchDialogSearchRowContainer* parent); -static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent); +static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_construct (GType object_type, + SavedSearchDialogSearchRowContainer* parent); static GType saved_search_dialog_search_row_flagged_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_new (SavedSearchDialogSearchRowContainer* parent); -static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent); +static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_construct (GType object_type, + SavedSearchDialogSearchRowContainer* parent); static GType saved_search_dialog_search_row_modified_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_new (SavedSearchDialogSearchRowContainer* parent); -static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent); +static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_construct (GType object_type, + SavedSearchDialogSearchRowContainer* parent); static GType saved_search_dialog_search_row_rating_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_new (SavedSearchDialogSearchRowContainer* parent); -static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent); +static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_construct (GType object_type, + SavedSearchDialogSearchRowContainer* parent); static GType saved_search_dialog_search_row_date_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static SearchCondition* saved_search_dialog_search_row_get_search_condition (SavedSearchDialogSearchRow* self); static gboolean saved_search_dialog_search_row_is_complete (SavedSearchDialogSearchRow* self); -static void g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); +static void g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); static void saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer * obj); -enum { - SAVED_SEARCH_DIALOG_SEARCH_ROW_DUMMY_PROPERTY -}; static GtkWidget* saved_search_dialog_search_row_real_get_widget (SavedSearchDialogSearchRow* self); static SearchCondition* saved_search_dialog_search_row_real_get_search_condition (SavedSearchDialogSearchRow* self); -static void saved_search_dialog_search_row_real_populate (SavedSearchDialogSearchRow* self, SearchCondition* sc); +static void saved_search_dialog_search_row_real_populate (SavedSearchDialogSearchRow* self, + SearchCondition* sc); static gboolean saved_search_dialog_search_row_real_is_complete (SavedSearchDialogSearchRow* self); static SavedSearchDialogSearchRow* saved_search_dialog_search_row_construct (GType object_type); static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow * obj); #define SAVED_SEARCH_DIALOG_SEARCH_ROW_TEXT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowTextPrivate)) -enum { - SAVED_SEARCH_DIALOG_SEARCH_ROW_TEXT_DUMMY_PROPERTY -}; static void saved_search_dialog_search_row_text_on_changed (SavedSearchDialogSearchRowText* self); -static void _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); -static void _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self); +static void _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self); +static void _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed (GtkEditable* _sender, + gpointer self); static GtkWidget* saved_search_dialog_search_row_text_real_get_widget (SavedSearchDialogSearchRow* base); static SearchCondition* saved_search_dialog_search_row_text_real_get_search_condition (SavedSearchDialogSearchRow* base); GType search_condition_text_context_get_type (void) G_GNUC_CONST; static SearchConditionTextContext saved_search_dialog_search_row_text_get_text_context (SavedSearchDialogSearchRowText* self); GType search_condition_text_get_type (void) G_GNUC_CONST; -SearchConditionText* search_condition_text_new (SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context); -SearchConditionText* search_condition_text_construct (GType object_type, SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context); -static void saved_search_dialog_search_row_text_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc); +SearchConditionText* search_condition_text_new (SearchConditionSearchType search_type, + const gchar* text, + SearchConditionTextContext context); +SearchConditionText* search_condition_text_construct (GType object_type, + SearchConditionSearchType search_type, + const gchar* text, + SearchConditionTextContext context); +static void saved_search_dialog_search_row_text_real_populate (SavedSearchDialogSearchRow* base, + SearchCondition* sc); SearchConditionTextContext search_condition_text_get_context (SearchConditionText* self); const gchar* search_condition_text_get_text (SearchConditionText* self); static gboolean saved_search_dialog_search_row_text_real_is_complete (SavedSearchDialogSearchRow* base); static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearchRow * obj); #define SAVED_SEARCH_DIALOG_SEARCH_ROW_MEDIA_TYPE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaTypePrivate)) -enum { - SAVED_SEARCH_DIALOG_SEARCH_ROW_MEDIA_TYPE_DUMMY_PROPERTY -}; static void saved_search_dialog_search_row_media_type_on_changed (SavedSearchDialogSearchRowMediaType* self); -static void _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); +static void _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self); static GtkWidget* saved_search_dialog_search_row_media_type_real_get_widget (SavedSearchDialogSearchRow* base); static SearchCondition* saved_search_dialog_search_row_media_type_real_get_search_condition (SavedSearchDialogSearchRow* base); GType search_condition_media_type_context_get_type (void) G_GNUC_CONST; GType search_condition_media_type_media_type_get_type (void) G_GNUC_CONST; GType search_condition_media_type_get_type (void) G_GNUC_CONST; -SearchConditionMediaType* search_condition_media_type_new (SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type); -SearchConditionMediaType* search_condition_media_type_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type); -static void saved_search_dialog_search_row_media_type_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc); +SearchConditionMediaType* search_condition_media_type_new (SearchConditionSearchType search_type, + SearchConditionMediaTypeContext context, + SearchConditionMediaTypeMediaType media_type); +SearchConditionMediaType* search_condition_media_type_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionMediaTypeContext context, + SearchConditionMediaTypeMediaType media_type); +static void saved_search_dialog_search_row_media_type_real_populate (SavedSearchDialogSearchRow* base, + SearchCondition* sc); SearchConditionMediaTypeContext search_condition_media_type_get_context (SearchConditionMediaType* self); SearchConditionMediaTypeMediaType search_condition_media_type_get_media_type (SearchConditionMediaType* self); static gboolean saved_search_dialog_search_row_media_type_real_is_complete (SavedSearchDialogSearchRow* base); static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialogSearchRow * obj); #define SAVED_SEARCH_DIALOG_SEARCH_ROW_MODIFIED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModifiedPrivate)) -enum { - SAVED_SEARCH_DIALOG_SEARCH_ROW_MODIFIED_DUMMY_PROPERTY -}; static void saved_search_dialog_search_row_modified_on_changed (SavedSearchDialogSearchRowModified* self); -static void _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); +static void _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self); static GtkWidget* saved_search_dialog_search_row_modified_real_get_widget (SavedSearchDialogSearchRow* base); static SearchCondition* saved_search_dialog_search_row_modified_real_get_search_condition (SavedSearchDialogSearchRow* base); GType search_condition_modified_context_get_type (void) G_GNUC_CONST; GType search_condition_modified_state_get_type (void) G_GNUC_CONST; GType search_condition_modified_get_type (void) G_GNUC_CONST; -SearchConditionModified* search_condition_modified_new (SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state); -SearchConditionModified* search_condition_modified_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state); -static void saved_search_dialog_search_row_modified_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc); +SearchConditionModified* search_condition_modified_new (SearchConditionSearchType search_type, + SearchConditionModifiedContext context, + SearchConditionModifiedState state); +SearchConditionModified* search_condition_modified_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionModifiedContext context, + SearchConditionModifiedState state); +static void saved_search_dialog_search_row_modified_real_populate (SavedSearchDialogSearchRow* base, + SearchCondition* sc); SearchConditionModifiedState search_condition_modified_get_state (SearchConditionModified* self); SearchConditionModifiedContext search_condition_modified_get_context (SearchConditionModified* self); static gboolean saved_search_dialog_search_row_modified_real_is_complete (SavedSearchDialogSearchRow* base); static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogSearchRow * obj); #define SAVED_SEARCH_DIALOG_SEARCH_ROW_FLAGGED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlaggedPrivate)) -enum { - SAVED_SEARCH_DIALOG_SEARCH_ROW_FLAGGED_DUMMY_PROPERTY -}; static void saved_search_dialog_search_row_flagged_on_changed (SavedSearchDialogSearchRowFlagged* self); -static void _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); +static void _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self); static GtkWidget* saved_search_dialog_search_row_flagged_real_get_widget (SavedSearchDialogSearchRow* base); static SearchCondition* saved_search_dialog_search_row_flagged_real_get_search_condition (SavedSearchDialogSearchRow* base); GType search_condition_flagged_state_get_type (void) G_GNUC_CONST; GType search_condition_flagged_get_type (void) G_GNUC_CONST; -SearchConditionFlagged* search_condition_flagged_new (SearchConditionSearchType search_type, SearchConditionFlaggedState state); -SearchConditionFlagged* search_condition_flagged_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionFlaggedState state); -static void saved_search_dialog_search_row_flagged_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc); +SearchConditionFlagged* search_condition_flagged_new (SearchConditionSearchType search_type, + SearchConditionFlaggedState state); +SearchConditionFlagged* search_condition_flagged_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionFlaggedState state); +static void saved_search_dialog_search_row_flagged_real_populate (SavedSearchDialogSearchRow* base, + SearchCondition* sc); SearchConditionFlaggedState search_condition_flagged_get_state (SearchConditionFlagged* self); static gboolean saved_search_dialog_search_row_flagged_real_is_complete (SavedSearchDialogSearchRow* base); static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSearchRow * obj); #define SAVED_SEARCH_DIALOG_SEARCH_ROW_RATING_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRatingPrivate)) -enum { - SAVED_SEARCH_DIALOG_SEARCH_ROW_RATING_DUMMY_PROPERTY -}; static void saved_search_dialog_search_row_rating_on_changed (SavedSearchDialogSearchRowRating* self); -static void _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); +static void _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self); GType rating_get_type (void) G_GNUC_CONST; const gchar* resources_rating_combo_box (Rating rating); static GtkWidget* saved_search_dialog_search_row_rating_real_get_widget (SavedSearchDialogSearchRow* base); static SearchCondition* saved_search_dialog_search_row_rating_real_get_search_condition (SavedSearchDialogSearchRow* base); GType search_condition_rating_context_get_type (void) G_GNUC_CONST; GType search_condition_rating_get_type (void) G_GNUC_CONST; -SearchConditionRating* search_condition_rating_new (SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context); -SearchConditionRating* search_condition_rating_construct (GType object_type, SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context); -static void saved_search_dialog_search_row_rating_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc); +SearchConditionRating* search_condition_rating_new (SearchConditionSearchType search_type, + Rating rating, + SearchConditionRatingContext context); +SearchConditionRating* search_condition_rating_construct (GType object_type, + SearchConditionSearchType search_type, + Rating rating, + SearchConditionRatingContext context); +static void saved_search_dialog_search_row_rating_real_populate (SavedSearchDialogSearchRow* base, + SearchCondition* sc); SearchConditionRatingContext search_condition_rating_get_context (SearchConditionRating* self); Rating search_condition_rating_get_rating (SearchConditionRating* self); static gboolean saved_search_dialog_search_row_rating_real_is_complete (SavedSearchDialogSearchRow* base); static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSearchRow * obj); #define SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDatePrivate)) -enum { - SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DUMMY_PROPERTY -}; static void saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSearchRowDate* self); -static void _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); +static void _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self); #define SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DATE_FORMAT "%x" static void saved_search_dialog_search_row_date_on_one_clicked (SavedSearchDialogSearchRowDate* self); -static void _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self); static void saved_search_dialog_search_row_date_on_two_clicked (SavedSearchDialogSearchRowDate* self); -static void _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self); static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchDialogSearchRowDate* self); GType search_condition_date_context_get_type (void) G_GNUC_CONST; static GDateTime* saved_search_dialog_search_row_date_get_date_one (SavedSearchDialogSearchRowDate* self); static GDateTime* saved_search_dialog_search_row_date_get_date_two (SavedSearchDialogSearchRowDate* self); static GtkWidget* saved_search_dialog_search_row_date_real_get_widget (SavedSearchDialogSearchRow* base); -static void saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogSearchRowDate* self, GDateTime* date); -static void saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogSearchRowDate* self, GDateTime* date); +static void saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogSearchRowDate* self, + GDateTime* date); +static void saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogSearchRowDate* self, + GDateTime* date); static SearchCondition* saved_search_dialog_search_row_date_real_get_search_condition (SavedSearchDialogSearchRow* base); GType search_condition_date_get_type (void) G_GNUC_CONST; -SearchConditionDate* search_condition_date_new (SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two); -SearchConditionDate* search_condition_date_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two); -static void saved_search_dialog_search_row_date_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc); +SearchConditionDate* search_condition_date_new (SearchConditionSearchType search_type, + SearchConditionDateContext context, + GDateTime* date_one, + GDateTime* date_two); +SearchConditionDate* search_condition_date_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionDateContext context, + GDateTime* date_one, + GDateTime* date_two); +static void saved_search_dialog_search_row_date_real_populate (SavedSearchDialogSearchRow* base, + SearchCondition* sc); SearchConditionDateContext search_condition_date_get_context (SearchConditionDate* self); GDateTime* search_condition_date_get_date_one (SearchConditionDate* self); GDateTime* search_condition_date_get_date_two (SearchConditionDate* self); static gboolean saved_search_dialog_search_row_date_real_is_complete (SavedSearchDialogSearchRow* base); -static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialogSearchRowDate* self, GtkCalendar* cal); +static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialogSearchRowDate* self, + GtkCalendar* cal); static Block10Data* block10_data_ref (Block10Data* _data10_); static void block10_data_unref (void * _userdata_); #define RESOURCES_CANCEL_LABEL _ ("_Cancel") #define RESOURCES_OK_LABEL _ ("_OK") static void __lambda14_ (SavedSearchDialogSearchRowDate* self); -static void ___lambda14__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self); +static void ___lambda14__gtk_calendar_day_selected (GtkCalendar* _sender, + gpointer self); static void __lambda15_ (Block10Data* _data10_); -static void ___lambda15__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self); +static void ___lambda15__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, + gpointer self); static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow * obj); static void saved_search_dialog_finalize (GObject * obj); -SavedSearchDialog* saved_search_dialog_construct (GType object_type) { +SavedSearchDialog* +saved_search_dialog_construct (GType object_type) +{ SavedSearchDialog * self = NULL; - gint _tmp0_; - GtkEntry* _tmp1_; + GtkEntry* _tmp0_; + SavedSearchTable* _tmp1_; SavedSearchTable* _tmp2_; - SavedSearchTable* _tmp3_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; - GtkEntry* _tmp6_; - GeeArrayList* _tmp7_; - gpointer _tmp8_; - SavedSearchDialogSearchRowContainer* _tmp9_; -#line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = resources_use_header_bar (); + GtkEntry* _tmp5_; + GeeArrayList* _tmp6_; + gpointer _tmp7_; + SavedSearchDialogSearchRowContainer* _tmp8_; #line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self = (SavedSearchDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL); + self = (SavedSearchDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL); #line 659 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_setup_dialog (self); #line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = self->priv->search_title; + _tmp0_ = self->priv->search_title; #line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = saved_search_table_get_instance (); + _tmp1_ = saved_search_table_get_instance (); #line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = saved_search_table_generate_unique_name (_tmp3_); + _tmp3_ = saved_search_table_generate_unique_name (_tmp2_); #line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_entry_set_text (_tmp1_, _tmp5_); + gtk_entry_set_text (_tmp0_, _tmp4_); #line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp4_); #line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _saved_search_table_unref0 (_tmp3_); + _saved_search_table_unref0 (_tmp2_); #line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = self->priv->search_title; + _tmp5_ = self->priv->search_title; #line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_editable_select_region (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_EDITABLE, GtkEditable), 0, -1); + gtk_editable_select_region (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_editable_get_type (), GtkEditable), 0, -1); #line 666 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_add_text_search (self); #line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = self->priv->row_list; + _tmp6_ = self->priv->row_list; #line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); + _tmp7_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); #line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = (SavedSearchDialogSearchRowContainer*) _tmp8_; + _tmp8_ = (SavedSearchDialogSearchRowContainer*) _tmp7_; #line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_search_row_container_allow_removal (_tmp9_, FALSE); + saved_search_dialog_search_row_container_allow_removal (_tmp8_, FALSE); #line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _saved_search_dialog_search_row_container_unref0 (_tmp9_); + _saved_search_dialog_search_row_container_unref0 (_tmp8_); #line 669 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 670 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_set_valid (self, FALSE); #line 656 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 870 "SavedSearchDialog.c" +#line 962 "SavedSearchDialog.c" } -SavedSearchDialog* saved_search_dialog_new (void) { +SavedSearchDialog* +saved_search_dialog_new (void) +{ #line 656 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_construct (TYPE_SAVED_SEARCH_DIALOG); -#line 877 "SavedSearchDialog.c" +#line 971 "SavedSearchDialog.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self ? g_object_ref (self) : NULL; -#line 884 "SavedSearchDialog.c" +#line 980 "SavedSearchDialog.c" } -SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_type, SavedSearch* saved_search) { +SavedSearchDialog* +saved_search_dialog_construct_edit_existing (GType object_type, + SavedSearch* saved_search) +{ SavedSearchDialog * self = NULL; - gint _tmp0_; - SavedSearch* _tmp1_; - SavedSearch* _tmp2_; - GtkComboBoxText* _tmp3_; - SavedSearch* _tmp4_; - SearchOperator _tmp5_; - GtkEntry* _tmp6_; - SavedSearch* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - GeeArrayList* _tmp24_; - gint _tmp25_; - gint _tmp26_; + SavedSearch* _tmp0_; + GtkComboBoxText* _tmp1_; + GtkEntry* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GeeArrayList* _tmp18_; + gint _tmp19_; + gint _tmp20_; #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (IS_SAVED_SEARCH (saved_search), NULL); #line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = resources_use_header_bar (); -#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self = (SavedSearchDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL); -#line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = saved_search; + self = (SavedSearchDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL); #line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp0_ = _g_object_ref0 (saved_search); #line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->previous_search); #line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->previous_search = _tmp2_; + self->priv->previous_search = _tmp0_; #line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->edit_mode = TRUE; #line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -920,165 +1010,170 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ #line 680 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = self->priv->operator; + _tmp1_ = self->priv->operator; #line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = saved_search; -#line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = saved_search_get_operator (_tmp4_); -#line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox), (gint) ((SearchOperator) _tmp5_)); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), (gint) ((SearchOperator) saved_search_get_operator (saved_search))); #line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = self->priv->search_title; + _tmp2_ = self->priv->search_title; #line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = saved_search; + _tmp3_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (saved_search, TYPE_DATA_OBJECT, DataObject)); #line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject)); -#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = _tmp8_; + _tmp4_ = _tmp3_; #line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_entry_set_text (_tmp6_, _tmp9_); + gtk_entry_set_text (_tmp2_, _tmp4_); #line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_free0 (_tmp9_); -#line 943 "SavedSearchDialog.c" + _g_free0 (_tmp4_); +#line 1027 "SavedSearchDialog.c" { GeeList* _sc_list = NULL; - SavedSearch* _tmp10_; - GeeList* _tmp11_; + GeeList* _tmp5_; gint _sc_size = 0; - GeeList* _tmp12_; - gint _tmp13_; - gint _tmp14_; + GeeList* _tmp6_; + gint _tmp7_; + gint _tmp8_; gint _sc_index = 0; #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = saved_search; -#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = saved_search_get_conditions (_tmp10_); + _tmp5_ = saved_search_get_conditions (saved_search); #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _sc_list = _tmp11_; + _sc_list = _tmp5_; #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = _sc_list; + _tmp6_ = _sc_list; #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = _tmp13_; + _tmp8_ = _tmp7_; #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _sc_size = _tmp14_; + _sc_size = _tmp8_; #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _sc_index = -1; #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" while (TRUE) { -#line 971 "SavedSearchDialog.c" - gint _tmp15_; - gint _tmp16_; - gint _tmp17_; +#line 1052 "SavedSearchDialog.c" + gint _tmp9_; + gint _tmp10_; + gint _tmp11_; SearchCondition* sc = NULL; - GeeList* _tmp18_; - gint _tmp19_; - gpointer _tmp20_; - SearchCondition* _tmp21_; - SavedSearchDialogSearchRowContainer* _tmp22_; - SavedSearchDialogSearchRowContainer* _tmp23_; + GeeList* _tmp12_; + gint _tmp13_; + gpointer _tmp14_; + SearchCondition* _tmp15_; + SavedSearchDialogSearchRowContainer* _tmp16_; + SavedSearchDialogSearchRowContainer* _tmp17_; #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = _sc_index; + _tmp9_ = _sc_index; #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _sc_index = _tmp15_ + 1; + _sc_index = _tmp9_ + 1; #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = _sc_index; + _tmp10_ = _sc_index; #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = _sc_size; + _tmp11_ = _sc_size; #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (!(_tmp16_ < _tmp17_)) { + if (!(_tmp10_ < _tmp11_)) { #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 994 "SavedSearchDialog.c" +#line 1075 "SavedSearchDialog.c" } #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp18_ = _sc_list; + _tmp12_ = _sc_list; #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = _sc_index; + _tmp13_ = _sc_index; #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = gee_list_get (_tmp18_, _tmp19_); + _tmp14_ = gee_list_get (_tmp12_, _tmp13_); #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - sc = (SearchCondition*) _tmp20_; + sc = (SearchCondition*) _tmp14_; #line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = sc; + _tmp15_ = sc; #line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = saved_search_dialog_search_row_container_new_edit_existing (_tmp21_); + _tmp16_ = saved_search_dialog_search_row_container_new_edit_existing (_tmp15_); #line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp23_ = _tmp22_; + _tmp17_ = _tmp16_; #line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_add_row (self, _tmp23_); + saved_search_dialog_add_row (self, _tmp17_); #line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _saved_search_dialog_search_row_container_unref0 (_tmp23_); + _saved_search_dialog_search_row_container_unref0 (_tmp17_); #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (sc); -#line 1016 "SavedSearchDialog.c" +#line 1097 "SavedSearchDialog.c" } #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_sc_list); -#line 1020 "SavedSearchDialog.c" +#line 1101 "SavedSearchDialog.c" } #line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp24_ = self->priv->row_list; + _tmp18_ = self->priv->row_list; #line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp26_ = _tmp25_; + _tmp20_ = _tmp19_; #line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (_tmp26_ == 1) { -#line 1030 "SavedSearchDialog.c" - GeeArrayList* _tmp27_; - gpointer _tmp28_; - SavedSearchDialogSearchRowContainer* _tmp29_; + if (_tmp20_ == 1) { +#line 1111 "SavedSearchDialog.c" + GeeArrayList* _tmp21_; + gpointer _tmp22_; + SavedSearchDialogSearchRowContainer* _tmp23_; #line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp27_ = self->priv->row_list; + _tmp21_ = self->priv->row_list; #line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp28_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); + _tmp22_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); #line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp29_ = (SavedSearchDialogSearchRowContainer*) _tmp28_; + _tmp23_ = (SavedSearchDialogSearchRowContainer*) _tmp22_; #line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_search_row_container_allow_removal (_tmp29_, FALSE); + saved_search_dialog_search_row_container_allow_removal (_tmp23_, FALSE); #line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _saved_search_dialog_search_row_container_unref0 (_tmp29_); -#line 1044 "SavedSearchDialog.c" + _saved_search_dialog_search_row_container_unref0 (_tmp23_); +#line 1125 "SavedSearchDialog.c" } #line 692 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_set_valid (self, TRUE); #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 1050 "SavedSearchDialog.c" +#line 1131 "SavedSearchDialog.c" } -SavedSearchDialog* saved_search_dialog_new_edit_existing (SavedSearch* saved_search) { +SavedSearchDialog* +saved_search_dialog_new_edit_existing (SavedSearch* saved_search) +{ #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_construct_edit_existing (TYPE_SAVED_SEARCH_DIALOG, saved_search); -#line 1057 "SavedSearchDialog.c" +#line 1140 "SavedSearchDialog.c" } -static void _saved_search_dialog_on_response_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { +static void +_saved_search_dialog_on_response_gtk_dialog_response (GtkDialog* _sender, + gint response_id, + gpointer self) +{ #line 698 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_on_response ((SavedSearchDialog*) self, response_id); -#line 1064 "SavedSearchDialog.c" +#line 1151 "SavedSearchDialog.c" } -static void _saved_search_dialog_on_add_criteria_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_saved_search_dialog_on_add_criteria_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_on_add_criteria ((SavedSearchDialog*) self); -#line 1071 "SavedSearchDialog.c" +#line 1161 "SavedSearchDialog.c" } -static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { +static void +_saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, + gpointer self) +{ #line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_on_title_changed ((SavedSearchDialog*) self); -#line 1078 "SavedSearchDialog.c" +#line 1171 "SavedSearchDialog.c" } -static void saved_search_dialog_setup_dialog (SavedSearchDialog* self) { +static void +saved_search_dialog_setup_dialog (SavedSearchDialog* self) +{ AppWindow* _tmp0_; AppWindow* _tmp1_; GtkButton* _tmp2_; @@ -1102,32 +1197,38 @@ static void saved_search_dialog_setup_dialog (SavedSearchDialog* self) { #line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->search_title; #line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self, 0); -#line 1107 "SavedSearchDialog.c" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self, 0); +#line 1202 "SavedSearchDialog.c" } -void saved_search_dialog_show (SavedSearchDialog* self) { +void +saved_search_dialog_show (SavedSearchDialog* self) +{ #line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); #line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); #line 708 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 1118 "SavedSearchDialog.c" +#line 1215 "SavedSearchDialog.c" } -static void saved_search_dialog_on_add_criteria (SavedSearchDialog* self) { +static void +saved_search_dialog_on_add_criteria (SavedSearchDialog* self) +{ #line 712 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); #line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_add_text_search (self); -#line 1127 "SavedSearchDialog.c" +#line 1226 "SavedSearchDialog.c" } -static void saved_search_dialog_add_text_search (SavedSearchDialog* self) { +static void +saved_search_dialog_add_text_search (SavedSearchDialog* self) +{ SavedSearchDialogSearchRowContainer* text = NULL; SavedSearchDialogSearchRowContainer* _tmp0_; #line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1140,38 +1241,43 @@ static void saved_search_dialog_add_text_search (SavedSearchDialog* self) { saved_search_dialog_add_row (self, text); #line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (text); -#line 1144 "SavedSearchDialog.c" +#line 1245 "SavedSearchDialog.c" } -static void _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove (SavedSearchDialogSearchRowContainer* _sender, SavedSearchDialogSearchRowContainer* this_row, gpointer self) { +static void +_saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove (SavedSearchDialogSearchRowContainer* _sender, + SavedSearchDialogSearchRowContainer* this_row, + gpointer self) +{ #line 727 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_on_remove_row ((SavedSearchDialog*) self, this_row); -#line 1151 "SavedSearchDialog.c" +#line 1256 "SavedSearchDialog.c" } -static void _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed (SavedSearchDialogSearchRowContainer* _sender, SavedSearchDialogSearchRowContainer* this_row, gpointer self) { +static void +_saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed (SavedSearchDialogSearchRowContainer* _sender, + SavedSearchDialogSearchRowContainer* this_row, + gpointer self) +{ #line 728 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_on_row_changed ((SavedSearchDialog*) self, this_row); -#line 1158 "SavedSearchDialog.c" +#line 1267 "SavedSearchDialog.c" } -static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row) { +static void +saved_search_dialog_add_row (SavedSearchDialog* self, + SavedSearchDialogSearchRowContainer* row) +{ GeeArrayList* _tmp0_; gint _tmp1_; gint _tmp2_; GtkListBox* _tmp6_; - SavedSearchDialogSearchRowContainer* _tmp7_; + GtkWidget* _tmp7_; GtkWidget* _tmp8_; - GtkWidget* _tmp9_; - GeeArrayList* _tmp10_; - SavedSearchDialogSearchRowContainer* _tmp11_; - SavedSearchDialogSearchRowContainer* _tmp12_; - SavedSearchDialogSearchRowContainer* _tmp13_; - SavedSearchDialogSearchRowContainer* _tmp14_; - gboolean _tmp15_; + GeeArrayList* _tmp9_; #line 722 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); #line 722 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1184,7 +1290,7 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia _tmp2_ = _tmp1_; #line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp2_ == 1) { -#line 1188 "SavedSearchDialog.c" +#line 1294 "SavedSearchDialog.c" GeeArrayList* _tmp3_; gpointer _tmp4_; SavedSearchDialogSearchRowContainer* _tmp5_; @@ -1198,427 +1304,400 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia saved_search_dialog_search_row_container_allow_removal (_tmp5_, TRUE); #line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (_tmp5_); -#line 1202 "SavedSearchDialog.c" +#line 1308 "SavedSearchDialog.c" } #line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = self->priv->row_listbox; #line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = row; + _tmp7_ = saved_search_dialog_search_row_container_get_widget (row); #line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = saved_search_dialog_search_row_container_get_widget (_tmp7_); -#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), _tmp9_); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), _tmp8_); #line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 726 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = self->priv->row_list; -#line 726 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = row; + _tmp9_ = self->priv->row_list; #line 726 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), row); #line 727 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = row; -#line 727 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect_object (_tmp12_, "remove", (GCallback) _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove, self, 0); -#line 728 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = row; + g_signal_connect_object (row, "remove", (GCallback) _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove, self, 0); #line 728 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect_object (_tmp13_, "changed", (GCallback) _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed, self, 0); -#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = row; -#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = saved_search_dialog_search_row_container_is_complete (_tmp14_); + g_signal_connect_object (row, "changed", (GCallback) _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed, self, 0); #line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_set_valid (self, _tmp15_); -#line 1236 "SavedSearchDialog.c" + saved_search_dialog_set_valid (self, saved_search_dialog_search_row_container_is_complete (row)); +#line 1330 "SavedSearchDialog.c" } -static void saved_search_dialog_on_remove_row (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row) { - SavedSearchDialogSearchRowContainer* _tmp0_; +static void +saved_search_dialog_on_remove_row (SavedSearchDialog* self, + SavedSearchDialogSearchRowContainer* row) +{ + guint _tmp0_; guint _tmp1_; - SavedSearchDialogSearchRowContainer* _tmp2_; - guint _tmp3_; - GtkListBox* _tmp4_; - SavedSearchDialogSearchRowContainer* _tmp5_; - GtkWidget* _tmp6_; - GtkWidget* _tmp7_; - GtkContainer* _tmp8_; - GeeArrayList* _tmp9_; - SavedSearchDialogSearchRowContainer* _tmp10_; - GeeArrayList* _tmp11_; - gint _tmp12_; - gint _tmp13_; + GtkListBox* _tmp2_; + GtkWidget* _tmp3_; + GtkWidget* _tmp4_; + GtkContainer* _tmp5_; + GeeArrayList* _tmp6_; + GeeArrayList* _tmp7_; + gint _tmp8_; + gint _tmp9_; #line 733 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); #line 733 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (row)); #line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = row; + g_signal_parse_name ("remove", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, &_tmp0_, NULL, FALSE); #line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_parse_name ("remove", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, &_tmp1_, NULL, FALSE); -#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove, self); -#line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = row; + g_signal_handlers_disconnect_matched (row, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove, self); #line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_parse_name ("changed", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, &_tmp3_, NULL, FALSE); + g_signal_parse_name ("changed", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, &_tmp1_, NULL, FALSE); #line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed, self); + g_signal_handlers_disconnect_matched (row, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed, self); #line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = self->priv->row_listbox; + _tmp2_ = self->priv->row_listbox; #line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = row; + _tmp3_ = saved_search_dialog_search_row_container_get_widget (row); #line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = saved_search_dialog_search_row_container_get_widget (_tmp5_); -#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = (GtkContainer*) gtk_widget_get_parent (_tmp7_); + _tmp5_ = gtk_widget_get_parent (_tmp4_); #line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget)); + gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget)); #line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (_tmp7_); -#line 737 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = self->priv->row_list; + _g_object_unref0 (_tmp4_); #line 737 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = row; + _tmp6_ = self->priv->row_list; #line 737 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), row); #line 738 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = self->priv->row_list; + _tmp7_ = self->priv->row_list; #line 738 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 738 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = _tmp12_; + _tmp9_ = _tmp8_; #line 738 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (_tmp13_ == 1) { -#line 1299 "SavedSearchDialog.c" - GeeArrayList* _tmp14_; - gpointer _tmp15_; - SavedSearchDialogSearchRowContainer* _tmp16_; + if (_tmp9_ == 1) { +#line 1384 "SavedSearchDialog.c" + GeeArrayList* _tmp10_; + gpointer _tmp11_; + SavedSearchDialogSearchRowContainer* _tmp12_; #line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = self->priv->row_list; + _tmp10_ = self->priv->row_list; #line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); + _tmp11_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); #line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = (SavedSearchDialogSearchRowContainer*) _tmp15_; + _tmp12_ = (SavedSearchDialogSearchRowContainer*) _tmp11_; #line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_search_row_container_allow_removal (_tmp16_, FALSE); + saved_search_dialog_search_row_container_allow_removal (_tmp12_, FALSE); #line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _saved_search_dialog_search_row_container_unref0 (_tmp16_); -#line 1313 "SavedSearchDialog.c" + _saved_search_dialog_search_row_container_unref0 (_tmp12_); +#line 1398 "SavedSearchDialog.c" } #line 740 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_set_valid (self, TRUE); -#line 1317 "SavedSearchDialog.c" +#line 1402 "SavedSearchDialog.c" } -static void saved_search_dialog_on_response (SavedSearchDialog* self, gint response_id) { - gint _tmp0_; +static void +saved_search_dialog_on_response (SavedSearchDialog* self, + gint response_id) +{ #line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); #line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = response_id; -#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) { -#line 1329 "SavedSearchDialog.c" - gboolean _tmp1_ = FALSE; + if (response_id == ((gint) GTK_RESPONSE_OK)) { +#line 1414 "SavedSearchDialog.c" + gboolean _tmp0_ = FALSE; + SavedSearchTable* _tmp1_; SavedSearchTable* _tmp2_; - SavedSearchTable* _tmp3_; - GtkEntry* _tmp4_; - const gchar* _tmp5_; - gboolean _tmp6_; - gboolean _tmp7_; - gboolean _tmp19_; + GtkEntry* _tmp3_; + const gchar* _tmp4_; + gboolean _tmp5_; + gboolean _tmp17_; GeeArrayList* conditions = NULL; - GeeArrayList* _tmp23_; + GeeArrayList* _tmp21_; SearchOperator search_operator = 0; - GtkComboBoxText* _tmp39_; - gint _tmp40_; - SavedSearchTable* _tmp41_; - SavedSearchTable* _tmp42_; - GtkEntry* _tmp43_; - const gchar* _tmp44_; - SearchOperator _tmp45_; - GeeArrayList* _tmp46_; - SavedSearch* _tmp47_; - SavedSearch* _tmp48_; + GtkComboBoxText* _tmp37_; + SavedSearchTable* _tmp38_; + SavedSearchTable* _tmp39_; + GtkEntry* _tmp40_; + const gchar* _tmp41_; + SearchOperator _tmp42_; + GeeArrayList* _tmp43_; + SavedSearch* _tmp44_; + SavedSearch* _tmp45_; #line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = saved_search_table_get_instance (); + _tmp1_ = saved_search_table_get_instance (); #line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = self->priv->search_title; + _tmp3_ = self->priv->search_title; #line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = gtk_entry_get_text (_tmp4_); + _tmp4_ = gtk_entry_get_text (_tmp3_); #line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = saved_search_table_exists (_tmp3_, _tmp5_); + _tmp5_ = saved_search_table_exists (_tmp2_, _tmp4_); #line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = _tmp6_; + _saved_search_table_unref0 (_tmp2_); #line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _saved_search_table_unref0 (_tmp3_); -#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (_tmp7_) { -#line 1367 "SavedSearchDialog.c" - gboolean _tmp8_ = FALSE; - gboolean _tmp9_; + if (_tmp5_) { +#line 1448 "SavedSearchDialog.c" + gboolean _tmp6_ = FALSE; + gboolean _tmp7_; #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = self->priv->edit_mode; + _tmp7_ = self->priv->edit_mode; #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (_tmp9_) { -#line 1374 "SavedSearchDialog.c" - SavedSearch* _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; - GtkEntry* _tmp13_; - const gchar* _tmp14_; + if (_tmp7_) { +#line 1455 "SavedSearchDialog.c" + SavedSearch* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + GtkEntry* _tmp11_; + const gchar* _tmp12_; #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = self->priv->previous_search; + _tmp8_ = self->priv->previous_search; #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); + _tmp9_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = self->priv->search_title; + _tmp11_ = self->priv->search_title; #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = gtk_entry_get_text (_tmp13_); + _tmp12_ = gtk_entry_get_text (_tmp11_); #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = g_strcmp0 (_tmp12_, _tmp14_) == 0; + _tmp6_ = g_strcmp0 (_tmp10_, _tmp12_) == 0; #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_free0 (_tmp12_); -#line 1394 "SavedSearchDialog.c" + _g_free0 (_tmp10_); +#line 1475 "SavedSearchDialog.c" } else { #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = FALSE; -#line 1398 "SavedSearchDialog.c" + _tmp6_ = FALSE; +#line 1479 "SavedSearchDialog.c" } #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = !_tmp8_; -#line 1402 "SavedSearchDialog.c" + _tmp0_ = !_tmp6_; +#line 1483 "SavedSearchDialog.c" } else { #line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = FALSE; -#line 1406 "SavedSearchDialog.c" + _tmp0_ = FALSE; +#line 1487 "SavedSearchDialog.c" } #line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (_tmp1_) { -#line 1410 "SavedSearchDialog.c" - GtkEntry* _tmp15_; - const gchar* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; + if (_tmp0_) { +#line 1491 "SavedSearchDialog.c" + GtkEntry* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; #line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = self->priv->search_title; + _tmp13_ = self->priv->search_title; #line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = gtk_entry_get_text (_tmp15_); + _tmp14_ = gtk_entry_get_text (_tmp13_); #line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = resources_rename_search_exists_message (_tmp16_); + _tmp15_ = resources_rename_search_exists_message (_tmp14_); #line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp18_ = _tmp17_; + _tmp16_ = _tmp15_; #line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - app_window_error_message (_tmp18_, NULL); + app_window_error_message (_tmp16_, NULL); #line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp16_); #line 748 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return; -#line 1429 "SavedSearchDialog.c" +#line 1510 "SavedSearchDialog.c" } #line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = self->priv->edit_mode; + _tmp17_ = self->priv->edit_mode; #line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (_tmp19_) { -#line 1435 "SavedSearchDialog.c" - SavedSearchTable* _tmp20_; - SavedSearchTable* _tmp21_; - SavedSearch* _tmp22_; + if (_tmp17_) { +#line 1516 "SavedSearchDialog.c" + SavedSearchTable* _tmp18_; + SavedSearchTable* _tmp19_; + SavedSearch* _tmp20_; #line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = saved_search_table_get_instance (); + _tmp18_ = saved_search_table_get_instance (); #line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = _tmp20_; + _tmp19_ = _tmp18_; #line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = self->priv->previous_search; + _tmp20_ = self->priv->previous_search; #line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_table_remove (_tmp21_, _tmp22_); + saved_search_table_remove (_tmp19_, _tmp20_); #line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _saved_search_table_unref0 (_tmp21_); -#line 1449 "SavedSearchDialog.c" + _saved_search_table_unref0 (_tmp19_); +#line 1530 "SavedSearchDialog.c" } #line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp23_ = gee_array_list_new (TYPE_SEARCH_CONDITION, (GBoxedCopyFunc) search_condition_ref, (GDestroyNotify) search_condition_unref, NULL, NULL, NULL); + _tmp21_ = gee_array_list_new (TYPE_SEARCH_CONDITION, (GBoxedCopyFunc) search_condition_ref, (GDestroyNotify) search_condition_unref, NULL, NULL, NULL); #line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - conditions = _tmp23_; -#line 1455 "SavedSearchDialog.c" + conditions = _tmp21_; +#line 1536 "SavedSearchDialog.c" { GeeArrayList* _c_list = NULL; - GeeArrayList* _tmp24_; - GeeArrayList* _tmp25_; + GeeArrayList* _tmp22_; + GeeArrayList* _tmp23_; gint _c_size = 0; - GeeArrayList* _tmp26_; - gint _tmp27_; - gint _tmp28_; + GeeArrayList* _tmp24_; + gint _tmp25_; + gint _tmp26_; gint _c_index = 0; #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp24_ = self->priv->row_list; + _tmp22_ = self->priv->row_list; #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp25_ = _g_object_ref0 (_tmp24_); + _tmp23_ = _g_object_ref0 (_tmp22_); #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _c_list = _tmp25_; + _c_list = _tmp23_; #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp26_ = _c_list; + _tmp24_ = _c_list; #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp28_ = _tmp27_; + _tmp26_ = _tmp25_; #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _c_size = _tmp28_; + _c_size = _tmp26_; #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _c_index = -1; #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" while (TRUE) { -#line 1483 "SavedSearchDialog.c" +#line 1564 "SavedSearchDialog.c" + gint _tmp27_; + gint _tmp28_; gint _tmp29_; - gint _tmp30_; - gint _tmp31_; SavedSearchDialogSearchRowContainer* c = NULL; - GeeArrayList* _tmp32_; - gint _tmp33_; - gpointer _tmp34_; - GeeArrayList* _tmp35_; - SavedSearchDialogSearchRowContainer* _tmp36_; - SearchCondition* _tmp37_; - SearchCondition* _tmp38_; + GeeArrayList* _tmp30_; + gint _tmp31_; + gpointer _tmp32_; + GeeArrayList* _tmp33_; + SavedSearchDialogSearchRowContainer* _tmp34_; + SearchCondition* _tmp35_; + SearchCondition* _tmp36_; #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp29_ = _c_index; + _tmp27_ = _c_index; #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _c_index = _tmp29_ + 1; + _c_index = _tmp27_ + 1; #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp30_ = _c_index; + _tmp28_ = _c_index; #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp31_ = _c_size; + _tmp29_ = _c_size; #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (!(_tmp30_ < _tmp31_)) { + if (!(_tmp28_ < _tmp29_)) { #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 1507 "SavedSearchDialog.c" +#line 1588 "SavedSearchDialog.c" } #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp32_ = _c_list; + _tmp30_ = _c_list; #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp33_ = _c_index; + _tmp31_ = _c_index; #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp34_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp33_); + _tmp32_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp31_); #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - c = (SavedSearchDialogSearchRowContainer*) _tmp34_; + c = (SavedSearchDialogSearchRowContainer*) _tmp32_; #line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp35_ = conditions; + _tmp33_ = conditions; #line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp36_ = c; + _tmp34_ = c; #line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp37_ = saved_search_dialog_search_row_container_get_search_condition (_tmp36_); + _tmp35_ = saved_search_dialog_search_row_container_get_search_condition (_tmp34_); #line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp38_ = _tmp37_; + _tmp36_ = _tmp35_; #line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp38_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp36_); #line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _search_condition_unref0 (_tmp38_); + _search_condition_unref0 (_tmp36_); #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (c); -#line 1531 "SavedSearchDialog.c" +#line 1612 "SavedSearchDialog.c" } #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_c_list); -#line 1535 "SavedSearchDialog.c" +#line 1616 "SavedSearchDialog.c" } #line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp39_ = self->priv->operator; -#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp40_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_combo_box_get_type (), GtkComboBox)); + _tmp37_ = self->priv->operator; #line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - search_operator = (SearchOperator) _tmp40_; + search_operator = (SearchOperator) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_combo_box_get_type (), GtkComboBox)); #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp41_ = saved_search_table_get_instance (); + _tmp38_ = saved_search_table_get_instance (); #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp42_ = _tmp41_; + _tmp39_ = _tmp38_; #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp43_ = self->priv->search_title; + _tmp40_ = self->priv->search_title; #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp44_ = gtk_entry_get_text (_tmp43_); + _tmp41_ = gtk_entry_get_text (_tmp40_); #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp45_ = search_operator; + _tmp42_ = search_operator; #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp46_ = conditions; + _tmp43_ = conditions; #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp47_ = saved_search_table_create (_tmp42_, _tmp44_, _tmp45_, _tmp46_); + _tmp44_ = saved_search_table_create (_tmp39_, _tmp41_, _tmp42_, _tmp43_); #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp48_ = _tmp47_; + _tmp45_ = _tmp44_; #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (_tmp48_); + _g_object_unref0 (_tmp45_); #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _saved_search_table_unref0 (_tmp42_); + _saved_search_table_unref0 (_tmp39_); #line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (conditions); -#line 1565 "SavedSearchDialog.c" +#line 1644 "SavedSearchDialog.c" } } -static void saved_search_dialog_on_row_changed (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row) { - SavedSearchDialogSearchRowContainer* _tmp0_; - gboolean _tmp1_; +static void +saved_search_dialog_on_row_changed (SavedSearchDialog* self, + SavedSearchDialogSearchRowContainer* row) +{ #line 768 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); #line 768 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (row)); #line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = row; -#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = saved_search_dialog_search_row_container_is_complete (_tmp0_); -#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_set_valid (self, _tmp1_); -#line 1583 "SavedSearchDialog.c" + saved_search_dialog_set_valid (self, saved_search_dialog_search_row_container_is_complete (row)); +#line 1659 "SavedSearchDialog.c" } -static void saved_search_dialog_on_title_changed (SavedSearchDialog* self) { - gboolean _tmp0_; +static void +saved_search_dialog_on_title_changed (SavedSearchDialog* self) +{ #line 772 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); #line 773 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = saved_search_dialog_is_title_valid (self); -#line 773 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_set_valid (self, _tmp0_); -#line 1595 "SavedSearchDialog.c" + saved_search_dialog_set_valid (self, saved_search_dialog_is_title_valid (self)); +#line 1670 "SavedSearchDialog.c" } -static gchar* string_chomp (const gchar* self) { +static gchar* +string_chomp (const gchar* self) +{ gchar* result = NULL; gchar* _result_ = NULL; gchar* _tmp0_; const gchar* _tmp1_; -#line 1218 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1232 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1233 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1233 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1234 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1234 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_strchomp (_tmp1_); -#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _result_; -#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1618 "SavedSearchDialog.c" +#line 1695 "SavedSearchDialog.c" } -static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) { +static gboolean +saved_search_dialog_is_title_valid (SavedSearchDialog* self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; @@ -1633,28 +1712,27 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) { GtkEntry* _tmp16_; const gchar* _tmp17_; gboolean _tmp18_; - gboolean _tmp19_; #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (IS_SAVED_SEARCH_DIALOG (self), FALSE); #line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->edit_mode; #line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp2_) { -#line 1644 "SavedSearchDialog.c" +#line 1722 "SavedSearchDialog.c" SavedSearch* _tmp3_; #line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->previous_search; #line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _tmp3_ != NULL; -#line 1650 "SavedSearchDialog.c" +#line 1728 "SavedSearchDialog.c" } else { #line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = FALSE; -#line 1654 "SavedSearchDialog.c" +#line 1732 "SavedSearchDialog.c" } #line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp1_) { -#line 1658 "SavedSearchDialog.c" +#line 1736 "SavedSearchDialog.c" SavedSearch* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; @@ -1674,11 +1752,11 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) { _tmp0_ = g_strcmp0 (_tmp6_, _tmp8_) == 0; #line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (_tmp6_); -#line 1678 "SavedSearchDialog.c" +#line 1756 "SavedSearchDialog.c" } else { #line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = FALSE; -#line 1682 "SavedSearchDialog.c" +#line 1760 "SavedSearchDialog.c" } #line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp0_) { @@ -1686,7 +1764,7 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) { result = TRUE; #line 779 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 1690 "SavedSearchDialog.c" +#line 1768 "SavedSearchDialog.c" } #line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = self->priv->search_title; @@ -1706,7 +1784,7 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) { result = FALSE; #line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 1710 "SavedSearchDialog.c" +#line 1788 "SavedSearchDialog.c" } #line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp14_ = saved_search_table_get_instance (); @@ -1718,170 +1796,160 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) { _tmp17_ = gtk_entry_get_text (_tmp16_); #line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp18_ = saved_search_table_exists (_tmp15_, _tmp17_); -#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = _tmp18_; #line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_table_unref0 (_tmp15_); #line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (_tmp19_) { + if (_tmp18_) { #line 783 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = FALSE; #line 783 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 1732 "SavedSearchDialog.c" +#line 1808 "SavedSearchDialog.c" } #line 784 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = TRUE; #line 784 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 1738 "SavedSearchDialog.c" +#line 1814 "SavedSearchDialog.c" } -static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) { - gboolean _tmp0_; - gboolean _tmp22_; +static void +saved_search_dialog_set_valid (SavedSearchDialog* self, + gboolean v) +{ + gboolean _tmp18_; #line 788 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); #line 789 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = v; -#line 789 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (!_tmp0_) { + if (!v) { #line 790 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->valid = FALSE; -#line 1753 "SavedSearchDialog.c" +#line 1829 "SavedSearchDialog.c" } else { - gboolean _tmp1_; - gboolean _tmp2_; + gboolean _tmp0_; #line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = v; + _tmp0_ = self->priv->valid; #line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = self->priv->valid; -#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (_tmp1_ != _tmp2_) { -#line 1763 "SavedSearchDialog.c" - gboolean _tmp3_; -#line 792 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = saved_search_dialog_is_title_valid (self); + if (v != _tmp0_) { #line 792 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (_tmp3_) { -#line 1769 "SavedSearchDialog.c" + if (saved_search_dialog_is_title_valid (self)) { +#line 1838 "SavedSearchDialog.c" gint valid_rows = 0; - gint _tmp18_; - GeeArrayList* _tmp19_; - gint _tmp20_; - gint _tmp21_; + gint _tmp14_; + GeeArrayList* _tmp15_; + gint _tmp16_; + gint _tmp17_; #line 794 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" valid_rows = 0; -#line 1777 "SavedSearchDialog.c" +#line 1846 "SavedSearchDialog.c" { GeeArrayList* _c_list = NULL; - GeeArrayList* _tmp4_; - GeeArrayList* _tmp5_; + GeeArrayList* _tmp1_; + GeeArrayList* _tmp2_; gint _c_size = 0; - GeeArrayList* _tmp6_; - gint _tmp7_; - gint _tmp8_; + GeeArrayList* _tmp3_; + gint _tmp4_; + gint _tmp5_; gint _c_index = 0; #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = self->priv->row_list; + _tmp1_ = self->priv->row_list; #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp2_ = _g_object_ref0 (_tmp1_); #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _c_list = _tmp5_; + _c_list = _tmp2_; #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = _c_list; + _tmp3_ = _c_list; #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = _tmp7_; + _tmp5_ = _tmp4_; #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _c_size = _tmp8_; + _c_size = _tmp5_; #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _c_index = -1; #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" while (TRUE) { -#line 1805 "SavedSearchDialog.c" - gint _tmp9_; - gint _tmp10_; - gint _tmp11_; +#line 1874 "SavedSearchDialog.c" + gint _tmp6_; + gint _tmp7_; + gint _tmp8_; SavedSearchDialogSearchRowContainer* c = NULL; - GeeArrayList* _tmp12_; - gint _tmp13_; - gpointer _tmp14_; - SavedSearchDialogSearchRowContainer* _tmp15_; - gboolean _tmp16_; + GeeArrayList* _tmp9_; + gint _tmp10_; + gpointer _tmp11_; + SavedSearchDialogSearchRowContainer* _tmp12_; #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = _c_index; + _tmp6_ = _c_index; #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _c_index = _tmp9_ + 1; + _c_index = _tmp6_ + 1; #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = _c_index; + _tmp7_ = _c_index; #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = _c_size; + _tmp8_ = _c_size; #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (!(_tmp10_ < _tmp11_)) { + if (!(_tmp7_ < _tmp8_)) { #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 1827 "SavedSearchDialog.c" +#line 1895 "SavedSearchDialog.c" } #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = _c_list; + _tmp9_ = _c_list; #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = _c_index; + _tmp10_ = _c_index; #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp13_); + _tmp11_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp10_); #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - c = (SavedSearchDialogSearchRowContainer*) _tmp14_; + c = (SavedSearchDialogSearchRowContainer*) _tmp11_; #line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = c; + _tmp12_ = c; #line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = saved_search_dialog_search_row_container_is_complete (_tmp15_); -#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (_tmp16_) { -#line 1843 "SavedSearchDialog.c" - gint _tmp17_; + if (saved_search_dialog_search_row_container_is_complete (_tmp12_)) { +#line 1909 "SavedSearchDialog.c" + gint _tmp13_; #line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = valid_rows; + _tmp13_ = valid_rows; #line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - valid_rows = _tmp17_ + 1; -#line 1849 "SavedSearchDialog.c" + valid_rows = _tmp13_ + 1; +#line 1915 "SavedSearchDialog.c" } #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (c); -#line 1853 "SavedSearchDialog.c" +#line 1919 "SavedSearchDialog.c" } #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_c_list); -#line 1857 "SavedSearchDialog.c" +#line 1923 "SavedSearchDialog.c" } #line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp18_ = valid_rows; + _tmp14_ = valid_rows; #line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = self->priv->row_list; + _tmp15_ = self->priv->row_list; #line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = _tmp20_; + _tmp17_ = _tmp16_; #line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->valid = _tmp18_ == _tmp21_; -#line 1869 "SavedSearchDialog.c" + self->priv->valid = _tmp14_ == _tmp17_; +#line 1935 "SavedSearchDialog.c" } else { #line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->valid = FALSE; -#line 1873 "SavedSearchDialog.c" +#line 1939 "SavedSearchDialog.c" } } } #line 805 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = self->priv->valid; + _tmp18_ = self->priv->valid; #line 805 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp22_); -#line 1881 "SavedSearchDialog.c" + gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp18_); +#line 1947 "SavedSearchDialog.c" } -static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct (GType object_type) { +static SavedSearchDialogSearchRowContainer* +saved_search_dialog_search_row_container_construct (GType object_type) +{ SavedSearchDialogSearchRowContainer* self = NULL; #line 24 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = (SavedSearchDialogSearchRowContainer*) g_type_create_instance (object_type); @@ -1891,27 +1959,29 @@ static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_conta saved_search_dialog_search_row_container_set_type (self, SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT); #line 24 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 1895 "SavedSearchDialog.c" +#line 1963 "SavedSearchDialog.c" } -static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new (void) { +static SavedSearchDialogSearchRowContainer* +saved_search_dialog_search_row_container_new (void) +{ #line 24 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_container_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER); -#line 1902 "SavedSearchDialog.c" +#line 1972 "SavedSearchDialog.c" } -static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct_edit_existing (GType object_type, SearchCondition* sc) { +static SavedSearchDialogSearchRowContainer* +saved_search_dialog_search_row_container_construct_edit_existing (GType object_type, + SearchCondition* sc) +{ SavedSearchDialogSearchRowContainer* self = NULL; - SearchCondition* _tmp0_; + SearchConditionSearchType _tmp0_; SearchConditionSearchType _tmp1_; SearchConditionSearchType _tmp2_; - SearchCondition* _tmp3_; - SearchConditionSearchType _tmp4_; - SearchConditionSearchType _tmp5_; - SavedSearchDialogSearchRow* _tmp6_; - SearchCondition* _tmp7_; + SearchConditionSearchType _tmp3_; + SavedSearchDialogSearchRow* _tmp4_; #line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (IS_SEARCH_CONDITION (sc), NULL); #line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1919,55 +1989,59 @@ static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_conta #line 30 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_setup_gui (self); #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = sc; -#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = search_condition_get_search_type (_tmp0_); + _tmp0_ = search_condition_get_search_type (sc); #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_search_row_container_set_type (self, _tmp2_); + saved_search_dialog_search_row_container_set_type (self, _tmp1_); #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = sc; + _tmp2_ = search_condition_get_search_type (sc); #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = search_condition_get_search_type (_tmp3_); -#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_search_row_container_set_type_combo_box (self, _tmp5_); -#line 33 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = self->priv->my_row; + saved_search_dialog_search_row_container_set_type_combo_box (self, _tmp3_); #line 33 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = sc; + _tmp4_ = self->priv->my_row; #line 33 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_search_row_populate (_tmp6_, _tmp7_); + saved_search_dialog_search_row_populate (_tmp4_, sc); #line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 1946 "SavedSearchDialog.c" +#line 2010 "SavedSearchDialog.c" } -static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new_edit_existing (SearchCondition* sc) { +static SavedSearchDialogSearchRowContainer* +saved_search_dialog_search_row_container_new_edit_existing (SearchCondition* sc) +{ #line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_container_construct_edit_existing (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, sc); -#line 1953 "SavedSearchDialog.c" +#line 2019 "SavedSearchDialog.c" } -static void _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void +_saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self) +{ #line 49 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_on_type_changed ((SavedSearchDialogSearchRowContainer*) self); -#line 1960 "SavedSearchDialog.c" +#line 2029 "SavedSearchDialog.c" } -static void _saved_search_dialog_search_row_container_on_removed_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_saved_search_dialog_search_row_container_on_removed_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_on_removed ((SavedSearchDialogSearchRowContainer*) self); -#line 1967 "SavedSearchDialog.c" +#line 2039 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialogSearchRowContainer* self) { +static void +saved_search_dialog_search_row_container_setup_gui (SavedSearchDialogSearchRowContainer* self) +{ gint _tmp0_; SearchConditionSearchType* _tmp1_; GeeHashMap* _tmp2_; @@ -2014,19 +2088,19 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo _g_object_unref0 (self->priv->type_combo); #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->type_combo = _tmp3_; -#line 2018 "SavedSearchDialog.c" +#line 2092 "SavedSearchDialog.c" { gint i = 0; #line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" i = 0; -#line 2023 "SavedSearchDialog.c" +#line 2097 "SavedSearchDialog.c" { gboolean _tmp4_ = FALSE; #line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = TRUE; #line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" while (TRUE) { -#line 2030 "SavedSearchDialog.c" +#line 2104 "SavedSearchDialog.c" gint _tmp6_; SearchConditionSearchType* _tmp7_; gint _tmp7__length1; @@ -2044,13 +2118,13 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo gchar* _tmp17_; #line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!_tmp4_) { -#line 2048 "SavedSearchDialog.c" +#line 2122 "SavedSearchDialog.c" gint _tmp5_; #line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = i; #line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" i = _tmp5_ + 1; -#line 2054 "SavedSearchDialog.c" +#line 2128 "SavedSearchDialog.c" } #line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = FALSE; @@ -2064,7 +2138,7 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo if (!(_tmp6_ < _tmp7__length1)) { #line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2068 "SavedSearchDialog.c" +#line 2142 "SavedSearchDialog.c" } #line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = self->priv->search_types; @@ -2096,7 +2170,7 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo gtk_combo_box_text_append_text (_tmp14_, _tmp17_); #line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (_tmp17_); -#line 2100 "SavedSearchDialog.c" +#line 2174 "SavedSearchDialog.c" } } } @@ -2107,7 +2181,7 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo #line 49 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed, self); #line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = (GtkButton*) gtk_button_new_from_icon_name ("window-close-symbolic", GTK_ICON_SIZE_BUTTON); + _tmp19_ = (GtkButton*) gtk_button_new_from_icon_name ("window-close-symbolic", (GtkIconSize) GTK_ICON_SIZE_BUTTON); #line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp19_); #line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2162,29 +2236,30 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo _tmp31_ = self->priv->box; #line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget)); -#line 2166 "SavedSearchDialog.c" +#line 2240 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_container_on_type_changed (SavedSearchDialogSearchRowContainer* self) { - SearchConditionSearchType _tmp0_; +static void +saved_search_dialog_search_row_container_on_type_changed (SavedSearchDialogSearchRowContainer* self) +{ #line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self)); #line 66 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = saved_search_dialog_search_row_container_get_search_type (self); -#line 66 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_search_row_container_set_type (self, _tmp0_); + saved_search_dialog_search_row_container_set_type (self, saved_search_dialog_search_row_container_get_search_type (self)); #line 67 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_emit (self, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, self); -#line 2180 "SavedSearchDialog.c" +#line 2253 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_container_set_type_combo_box (SavedSearchDialogSearchRowContainer* self, SearchConditionSearchType st) { +static void +saved_search_dialog_search_row_container_set_type_combo_box (SavedSearchDialogSearchRowContainer* self, + SearchConditionSearchType st) +{ GtkComboBoxText* _tmp0_; GeeHashMap* _tmp1_; - SearchConditionSearchType _tmp2_; - gpointer _tmp3_; + gpointer _tmp2_; #line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self)); #line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2192,29 +2267,29 @@ static void saved_search_dialog_search_row_container_set_type_combo_box (SavedSe #line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->search_types_index; #line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = st; + _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) st)); #line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp2_)); -#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), (gint) ((gintptr) _tmp3_)); -#line 2201 "SavedSearchDialog.c" + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), (gint) ((gintptr) _tmp2_)); +#line 2274 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_container_set_type (SavedSearchDialogSearchRowContainer* self, SearchConditionSearchType type) { +static void +saved_search_dialog_search_row_container_set_type (SavedSearchDialogSearchRowContainer* self, + SearchConditionSearchType type) +{ SavedSearchDialogSearchRow* _tmp0_; - SearchConditionSearchType _tmp5_; - GtkBox* _tmp12_; - SavedSearchDialogSearchRow* _tmp13_; + GtkBox* _tmp11_; + SavedSearchDialogSearchRow* _tmp12_; + GtkWidget* _tmp13_; GtkWidget* _tmp14_; - GtkWidget* _tmp15_; #line 74 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self)); #line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->my_row; #line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp0_ != NULL) { -#line 2218 "SavedSearchDialog.c" +#line 2293 "SavedSearchDialog.c" GtkBox* _tmp1_; SavedSearchDialogSearchRow* _tmp2_; GtkWidget* _tmp3_; @@ -2231,12 +2306,10 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), _tmp4_); #line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_tmp4_); -#line 2235 "SavedSearchDialog.c" +#line 2310 "SavedSearchDialog.c" } #line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = type; -#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - switch (_tmp5_) { + switch (type) { #line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT: #line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2249,124 +2322,125 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog case SEARCH_CONDITION_SEARCH_TYPE_COMMENT: #line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_TITLE: -#line 2253 "SavedSearchDialog.c" +#line 2326 "SavedSearchDialog.c" { - SavedSearchDialogSearchRowText* _tmp6_; + SavedSearchDialogSearchRowText* _tmp5_; #line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = saved_search_dialog_search_row_text_new (self); + _tmp5_ = saved_search_dialog_search_row_text_new (self); #line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_unref0 (self->priv->my_row); #line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); + self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); #line 86 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2264 "SavedSearchDialog.c" +#line 2337 "SavedSearchDialog.c" } #line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE: -#line 2268 "SavedSearchDialog.c" +#line 2341 "SavedSearchDialog.c" { - SavedSearchDialogSearchRowMediaType* _tmp7_; + SavedSearchDialogSearchRowMediaType* _tmp6_; #line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = saved_search_dialog_search_row_media_type_new (self); + _tmp6_ = saved_search_dialog_search_row_media_type_new (self); #line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_unref0 (self->priv->my_row); #line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); + self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); #line 90 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2279 "SavedSearchDialog.c" +#line 2352 "SavedSearchDialog.c" } #line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE: -#line 2283 "SavedSearchDialog.c" +#line 2356 "SavedSearchDialog.c" { - SavedSearchDialogSearchRowFlagged* _tmp8_; + SavedSearchDialogSearchRowFlagged* _tmp7_; #line 93 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = saved_search_dialog_search_row_flagged_new (self); + _tmp7_ = saved_search_dialog_search_row_flagged_new (self); #line 93 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_unref0 (self->priv->my_row); #line 93 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); + self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); #line 94 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2294 "SavedSearchDialog.c" +#line 2367 "SavedSearchDialog.c" } #line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE: -#line 2298 "SavedSearchDialog.c" +#line 2371 "SavedSearchDialog.c" { - SavedSearchDialogSearchRowModified* _tmp9_; + SavedSearchDialogSearchRowModified* _tmp8_; #line 97 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = saved_search_dialog_search_row_modified_new (self); + _tmp8_ = saved_search_dialog_search_row_modified_new (self); #line 97 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_unref0 (self->priv->my_row); #line 97 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); + self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); #line 98 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2309 "SavedSearchDialog.c" +#line 2382 "SavedSearchDialog.c" } #line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_RATING: -#line 2313 "SavedSearchDialog.c" +#line 2386 "SavedSearchDialog.c" { - SavedSearchDialogSearchRowRating* _tmp10_; + SavedSearchDialogSearchRowRating* _tmp9_; #line 101 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = saved_search_dialog_search_row_rating_new (self); + _tmp9_ = saved_search_dialog_search_row_rating_new (self); #line 101 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_unref0 (self->priv->my_row); #line 101 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); + self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); #line 102 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2324 "SavedSearchDialog.c" +#line 2397 "SavedSearchDialog.c" } #line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_DATE: -#line 2328 "SavedSearchDialog.c" +#line 2401 "SavedSearchDialog.c" { - SavedSearchDialogSearchRowDate* _tmp11_; + SavedSearchDialogSearchRowDate* _tmp10_; #line 105 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = saved_search_dialog_search_row_date_new (self); + _tmp10_ = saved_search_dialog_search_row_date_new (self); #line 105 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_unref0 (self->priv->my_row); #line 105 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); + self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); #line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2339 "SavedSearchDialog.c" +#line 2412 "SavedSearchDialog.c" } default: { #line 109 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_assert_not_reached (); -#line 2345 "SavedSearchDialog.c" +#line 2418 "SavedSearchDialog.c" } } #line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = self->priv->box; + _tmp11_ = self->priv->box; #line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = self->priv->my_row; + _tmp12_ = self->priv->my_row; #line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = saved_search_dialog_search_row_get_widget (_tmp13_); + _tmp13_ = saved_search_dialog_search_row_get_widget (_tmp12_); #line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp12_, _tmp15_, TRUE, TRUE, (guint) 0); + gtk_box_pack_start (_tmp11_, _tmp14_, TRUE, TRUE, (guint) 0); #line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (_tmp15_); -#line 2360 "SavedSearchDialog.c" + _g_object_unref0 (_tmp14_); +#line 2433 "SavedSearchDialog.c" } -static SearchConditionSearchType saved_search_dialog_search_row_container_get_search_type (SavedSearchDialogSearchRowContainer* self) { +static SearchConditionSearchType +saved_search_dialog_search_row_container_get_search_type (SavedSearchDialogSearchRowContainer* self) +{ SearchConditionSearchType result = 0; SearchConditionSearchType* _tmp0_; gint _tmp0__length1; GtkComboBoxText* _tmp1_; - gint _tmp2_; - SearchConditionSearchType _tmp3_; + SearchConditionSearchType _tmp2_; #line 115 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), 0); #line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2376,42 +2450,44 @@ static SearchConditionSearchType saved_search_dialog_search_row_container_get_se #line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->type_combo; #line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); -#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = _tmp0_[_tmp2_]; + _tmp2_ = _tmp0_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox))]; #line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - result = _tmp3_; + result = _tmp2_; #line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 2387 "SavedSearchDialog.c" +#line 2459 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_container_on_removed (SavedSearchDialogSearchRowContainer* self) { +static void +saved_search_dialog_search_row_container_on_removed (SavedSearchDialogSearchRowContainer* self) +{ #line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self)); #line 120 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_emit (self, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_REMOVE_SIGNAL], 0, self); -#line 2396 "SavedSearchDialog.c" +#line 2470 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_container_allow_removal (SavedSearchDialogSearchRowContainer* self, gboolean allow) { +static void +saved_search_dialog_search_row_container_allow_removal (SavedSearchDialogSearchRowContainer* self, + gboolean allow) +{ GtkButton* _tmp0_; - gboolean _tmp1_; #line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self)); #line 124 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->remove_button; #line 124 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = allow; -#line 124 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_); -#line 2411 "SavedSearchDialog.c" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), allow); +#line 2485 "SavedSearchDialog.c" } -static GtkWidget* saved_search_dialog_search_row_container_get_widget (SavedSearchDialogSearchRowContainer* self) { +static GtkWidget* +saved_search_dialog_search_row_container_get_widget (SavedSearchDialogSearchRowContainer* self) +{ GtkWidget* result = NULL; GtkBox* _tmp0_; GtkWidget* _tmp1_; @@ -2425,11 +2501,13 @@ static GtkWidget* saved_search_dialog_search_row_container_get_widget (SavedSear result = _tmp1_; #line 128 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 2429 "SavedSearchDialog.c" +#line 2505 "SavedSearchDialog.c" } -static SearchCondition* saved_search_dialog_search_row_container_get_search_condition (SavedSearchDialogSearchRowContainer* self) { +static SearchCondition* +saved_search_dialog_search_row_container_get_search_condition (SavedSearchDialogSearchRowContainer* self) +{ SearchCondition* result = NULL; SavedSearchDialogSearchRow* _tmp0_; SearchCondition* _tmp1_; @@ -2443,29 +2521,35 @@ static SearchCondition* saved_search_dialog_search_row_container_get_search_cond result = _tmp1_; #line 132 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 2447 "SavedSearchDialog.c" +#line 2525 "SavedSearchDialog.c" } -static gboolean saved_search_dialog_search_row_container_is_complete (SavedSearchDialogSearchRowContainer* self) { +static gboolean +saved_search_dialog_search_row_container_is_complete (SavedSearchDialogSearchRowContainer* self) +{ gboolean result = FALSE; SavedSearchDialogSearchRow* _tmp0_; - gboolean _tmp1_; #line 135 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), FALSE); #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->my_row; #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = saved_search_dialog_search_row_is_complete (_tmp0_); -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - result = _tmp1_; + result = saved_search_dialog_search_row_is_complete (_tmp0_); #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 2465 "SavedSearchDialog.c" +#line 2542 "SavedSearchDialog.c" } -static void g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER) (gpointer data1, gpointer arg_1, gpointer data2); register GMarshalFunc_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER callback; register GCClosure * cc; @@ -2480,120 +2564,145 @@ static void g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAIN data1 = closure->data; #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" data2 = param_values->data[0].v_pointer; -#line 2484 "SavedSearchDialog.c" +#line 2568 "SavedSearchDialog.c" } else { #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" data1 = param_values->data[0].v_pointer; #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" data2 = closure->data; -#line 2490 "SavedSearchDialog.c" +#line 2574 "SavedSearchDialog.c" } #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" callback = (GMarshalFunc_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER) (marshal_data ? marshal_data : cc->callback); #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" callback (data1, saved_search_dialog_value_get_search_row_container (param_values + 1), data2); -#line 2496 "SavedSearchDialog.c" +#line 2580 "SavedSearchDialog.c" } -static void saved_search_dialog_value_search_row_container_init (GValue* value) { +static void +saved_search_dialog_value_search_row_container_init (GValue* value) +{ #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 2503 "SavedSearchDialog.c" +#line 2589 "SavedSearchDialog.c" } -static void saved_search_dialog_value_search_row_container_free_value (GValue* value) { +static void +saved_search_dialog_value_search_row_container_free_value (GValue* value) +{ #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (value->data[0].v_pointer) { #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_unref (value->data[0].v_pointer); -#line 2512 "SavedSearchDialog.c" +#line 2600 "SavedSearchDialog.c" } } -static void saved_search_dialog_value_search_row_container_copy_value (const GValue* src_value, GValue* dest_value) { +static void +saved_search_dialog_value_search_row_container_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (src_value->data[0].v_pointer) { #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" dest_value->data[0].v_pointer = saved_search_dialog_search_row_container_ref (src_value->data[0].v_pointer); -#line 2522 "SavedSearchDialog.c" +#line 2613 "SavedSearchDialog.c" } else { #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" dest_value->data[0].v_pointer = NULL; -#line 2526 "SavedSearchDialog.c" +#line 2617 "SavedSearchDialog.c" } } -static gpointer saved_search_dialog_value_search_row_container_peek_pointer (const GValue* value) { +static gpointer +saved_search_dialog_value_search_row_container_peek_pointer (const GValue* value) +{ #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return value->data[0].v_pointer; -#line 2534 "SavedSearchDialog.c" +#line 2627 "SavedSearchDialog.c" } -static gchar* saved_search_dialog_value_search_row_container_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +saved_search_dialog_value_search_row_container_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (collect_values[0].v_pointer) { -#line 2541 "SavedSearchDialog.c" +#line 2639 "SavedSearchDialog.c" SavedSearchDialogSearchRowContainer * object; object = collect_values[0].v_pointer; #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (object->parent_instance.g_class == NULL) { #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2548 "SavedSearchDialog.c" +#line 2646 "SavedSearchDialog.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2552 "SavedSearchDialog.c" +#line 2650 "SavedSearchDialog.c" } #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = saved_search_dialog_search_row_container_ref (object); -#line 2556 "SavedSearchDialog.c" +#line 2654 "SavedSearchDialog.c" } else { #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 2560 "SavedSearchDialog.c" +#line 2658 "SavedSearchDialog.c" } #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 2564 "SavedSearchDialog.c" +#line 2662 "SavedSearchDialog.c" } -static gchar* saved_search_dialog_value_search_row_container_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +saved_search_dialog_value_search_row_container_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ SavedSearchDialogSearchRowContainer ** object_p; object_p = collect_values[0].v_pointer; #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!object_p) { #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2575 "SavedSearchDialog.c" +#line 2678 "SavedSearchDialog.c" } #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!value->data[0].v_pointer) { #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = NULL; -#line 2581 "SavedSearchDialog.c" +#line 2684 "SavedSearchDialog.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = value->data[0].v_pointer; -#line 2585 "SavedSearchDialog.c" +#line 2688 "SavedSearchDialog.c" } else { #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = saved_search_dialog_search_row_container_ref (value->data[0].v_pointer); -#line 2589 "SavedSearchDialog.c" +#line 2692 "SavedSearchDialog.c" } #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 2593 "SavedSearchDialog.c" +#line 2696 "SavedSearchDialog.c" } -static GParamSpec* saved_search_dialog_param_spec_search_row_container (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +static GParamSpec* +saved_search_dialog_param_spec_search_row_container (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ SavedSearchDialogParamSpecSearchRowContainer* spec; #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (g_type_is_a (object_type, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER), NULL); @@ -2603,20 +2712,25 @@ static GParamSpec* saved_search_dialog_param_spec_search_row_container (const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return G_PARAM_SPEC (spec); -#line 2607 "SavedSearchDialog.c" +#line 2716 "SavedSearchDialog.c" } -static gpointer saved_search_dialog_value_get_search_row_container (const GValue* value) { +static gpointer +saved_search_dialog_value_get_search_row_container (const GValue* value) +{ #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER), NULL); #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return value->data[0].v_pointer; -#line 2616 "SavedSearchDialog.c" +#line 2727 "SavedSearchDialog.c" } -static void saved_search_dialog_value_set_search_row_container (GValue* value, gpointer v_object) { +static void +saved_search_dialog_value_set_search_row_container (GValue* value, + gpointer v_object) +{ SavedSearchDialogSearchRowContainer * old; #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER)); @@ -2632,22 +2746,25 @@ static void saved_search_dialog_value_set_search_row_container (GValue* value, g value->data[0].v_pointer = v_object; #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_ref (value->data[0].v_pointer); -#line 2636 "SavedSearchDialog.c" +#line 2750 "SavedSearchDialog.c" } else { #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 2640 "SavedSearchDialog.c" +#line 2754 "SavedSearchDialog.c" } #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (old) { #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_unref (old); -#line 2646 "SavedSearchDialog.c" +#line 2760 "SavedSearchDialog.c" } } -static void saved_search_dialog_value_take_search_row_container (GValue* value, gpointer v_object) { +static void +saved_search_dialog_value_take_search_row_container (GValue* value, + gpointer v_object) +{ SavedSearchDialogSearchRowContainer * old; #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER)); @@ -2661,22 +2778,24 @@ static void saved_search_dialog_value_take_search_row_container (GValue* value, g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = v_object; -#line 2665 "SavedSearchDialog.c" +#line 2782 "SavedSearchDialog.c" } else { #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 2669 "SavedSearchDialog.c" +#line 2786 "SavedSearchDialog.c" } #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (old) { #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_unref (old); -#line 2675 "SavedSearchDialog.c" +#line 2792 "SavedSearchDialog.c" } } -static void saved_search_dialog_search_row_container_class_init (SavedSearchDialogSearchRowContainerClass * klass) { +static void +saved_search_dialog_search_row_container_class_init (SavedSearchDialogSearchRowContainerClass * klass) +{ #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_parent_class = g_type_class_peek_parent (klass); #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2687,22 +2806,26 @@ static void saved_search_dialog_search_row_container_class_init (SavedSearchDial saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_REMOVE_SIGNAL] = g_signal_new ("remove", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER, G_TYPE_NONE, 1, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER); #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL] = g_signal_new ("changed", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER, G_TYPE_NONE, 1, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER); -#line 2691 "SavedSearchDialog.c" +#line 2810 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_container_instance_init (SavedSearchDialogSearchRowContainer * self) { +static void +saved_search_dialog_search_row_container_instance_init (SavedSearchDialogSearchRowContainer * self) +{ #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_GET_PRIVATE (self); #line 22 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->my_row = NULL; #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->ref_count = 1; -#line 2702 "SavedSearchDialog.c" +#line 2823 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer * obj) { +static void +saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer * obj) +{ SavedSearchDialogSearchRowContainer * self; #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, SavedSearchDialogSearchRowContainer); @@ -2720,11 +2843,13 @@ static void saved_search_dialog_search_row_container_finalize (SavedSearchDialog _g_object_unref0 (self->priv->search_types_index); #line 22 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_unref0 (self->priv->my_row); -#line 2724 "SavedSearchDialog.c" +#line 2847 "SavedSearchDialog.c" } -static GType saved_search_dialog_search_row_container_get_type (void) { +static GType +saved_search_dialog_search_row_container_get_type (void) +{ static volatile gsize saved_search_dialog_search_row_container_type_id__volatile = 0; if (g_once_init_enter (&saved_search_dialog_search_row_container_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { saved_search_dialog_value_search_row_container_init, saved_search_dialog_value_search_row_container_free_value, saved_search_dialog_value_search_row_container_copy_value, saved_search_dialog_value_search_row_container_peek_pointer, "p", saved_search_dialog_value_search_row_container_collect_value, "p", saved_search_dialog_value_search_row_container_lcopy_value }; @@ -2738,18 +2863,22 @@ static GType saved_search_dialog_search_row_container_get_type (void) { } -static gpointer saved_search_dialog_search_row_container_ref (gpointer instance) { +static gpointer +saved_search_dialog_search_row_container_ref (gpointer instance) +{ SavedSearchDialogSearchRowContainer * self; self = instance; #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_atomic_int_inc (&self->ref_count); #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return instance; -#line 2749 "SavedSearchDialog.c" +#line 2876 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_container_unref (gpointer instance) { +static void +saved_search_dialog_search_row_container_unref (gpointer instance) +{ SavedSearchDialogSearchRowContainer * self; self = instance; #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2758,192 +2887,237 @@ static void saved_search_dialog_search_row_container_unref (gpointer instance) { SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_GET_CLASS (self)->finalize (self); #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2762 "SavedSearchDialog.c" +#line 2891 "SavedSearchDialog.c" } } -static GtkWidget* saved_search_dialog_search_row_real_get_widget (SavedSearchDialogSearchRow* self) { +static GtkWidget* +saved_search_dialog_search_row_real_get_widget (SavedSearchDialogSearchRow* self) +{ #line 143 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_get_widget'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 143 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 2772 "SavedSearchDialog.c" +#line 2903 "SavedSearchDialog.c" } -GtkWidget* saved_search_dialog_search_row_get_widget (SavedSearchDialogSearchRow* self) { +GtkWidget* +saved_search_dialog_search_row_get_widget (SavedSearchDialogSearchRow* self) +{ #line 143 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), NULL); #line 143 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->get_widget (self); -#line 2781 "SavedSearchDialog.c" +#line 2914 "SavedSearchDialog.c" } -static SearchCondition* saved_search_dialog_search_row_real_get_search_condition (SavedSearchDialogSearchRow* self) { +static SearchCondition* +saved_search_dialog_search_row_real_get_search_condition (SavedSearchDialogSearchRow* self) +{ #line 146 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_get_search_condition'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 146 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 2790 "SavedSearchDialog.c" +#line 2925 "SavedSearchDialog.c" } -SearchCondition* saved_search_dialog_search_row_get_search_condition (SavedSearchDialogSearchRow* self) { +SearchCondition* +saved_search_dialog_search_row_get_search_condition (SavedSearchDialogSearchRow* self) +{ #line 146 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), NULL); #line 146 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->get_search_condition (self); -#line 2799 "SavedSearchDialog.c" +#line 2936 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_real_populate (SavedSearchDialogSearchRow* self, SearchCondition* sc) { +static void +saved_search_dialog_search_row_real_populate (SavedSearchDialogSearchRow* self, + SearchCondition* sc) +{ #line 149 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_populate'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 149 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return; -#line 2808 "SavedSearchDialog.c" +#line 2948 "SavedSearchDialog.c" } -void saved_search_dialog_search_row_populate (SavedSearchDialogSearchRow* self, SearchCondition* sc) { +void +saved_search_dialog_search_row_populate (SavedSearchDialogSearchRow* self, + SearchCondition* sc) +{ #line 149 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self)); #line 149 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->populate (self, sc); -#line 2817 "SavedSearchDialog.c" +#line 2960 "SavedSearchDialog.c" } -static gboolean saved_search_dialog_search_row_real_is_complete (SavedSearchDialogSearchRow* self) { +static gboolean +saved_search_dialog_search_row_real_is_complete (SavedSearchDialogSearchRow* self) +{ gboolean _tmp0_ = FALSE; #line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_is_complete'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return _tmp0_; -#line 2827 "SavedSearchDialog.c" +#line 2972 "SavedSearchDialog.c" } -gboolean saved_search_dialog_search_row_is_complete (SavedSearchDialogSearchRow* self) { +gboolean +saved_search_dialog_search_row_is_complete (SavedSearchDialogSearchRow* self) +{ #line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), FALSE); #line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->is_complete (self); -#line 2836 "SavedSearchDialog.c" +#line 2983 "SavedSearchDialog.c" } -static SavedSearchDialogSearchRow* saved_search_dialog_search_row_construct (GType object_type) { +static SavedSearchDialogSearchRow* +saved_search_dialog_search_row_construct (GType object_type) +{ SavedSearchDialogSearchRow* self = NULL; #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = (SavedSearchDialogSearchRow*) g_type_create_instance (object_type); #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 2846 "SavedSearchDialog.c" +#line 2995 "SavedSearchDialog.c" } -static void saved_search_dialog_value_search_row_init (GValue* value) { +static void +saved_search_dialog_value_search_row_init (GValue* value) +{ #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 2853 "SavedSearchDialog.c" +#line 3004 "SavedSearchDialog.c" } -static void saved_search_dialog_value_search_row_free_value (GValue* value) { +static void +saved_search_dialog_value_search_row_free_value (GValue* value) +{ #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (value->data[0].v_pointer) { #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_unref (value->data[0].v_pointer); -#line 2862 "SavedSearchDialog.c" +#line 3015 "SavedSearchDialog.c" } } -static void saved_search_dialog_value_search_row_copy_value (const GValue* src_value, GValue* dest_value) { +static void +saved_search_dialog_value_search_row_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (src_value->data[0].v_pointer) { #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" dest_value->data[0].v_pointer = saved_search_dialog_search_row_ref (src_value->data[0].v_pointer); -#line 2872 "SavedSearchDialog.c" +#line 3028 "SavedSearchDialog.c" } else { #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" dest_value->data[0].v_pointer = NULL; -#line 2876 "SavedSearchDialog.c" +#line 3032 "SavedSearchDialog.c" } } -static gpointer saved_search_dialog_value_search_row_peek_pointer (const GValue* value) { +static gpointer +saved_search_dialog_value_search_row_peek_pointer (const GValue* value) +{ #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return value->data[0].v_pointer; -#line 2884 "SavedSearchDialog.c" +#line 3042 "SavedSearchDialog.c" } -static gchar* saved_search_dialog_value_search_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +saved_search_dialog_value_search_row_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (collect_values[0].v_pointer) { -#line 2891 "SavedSearchDialog.c" +#line 3054 "SavedSearchDialog.c" SavedSearchDialogSearchRow * object; object = collect_values[0].v_pointer; #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (object->parent_instance.g_class == NULL) { #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2898 "SavedSearchDialog.c" +#line 3061 "SavedSearchDialog.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2902 "SavedSearchDialog.c" +#line 3065 "SavedSearchDialog.c" } #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = saved_search_dialog_search_row_ref (object); -#line 2906 "SavedSearchDialog.c" +#line 3069 "SavedSearchDialog.c" } else { #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 2910 "SavedSearchDialog.c" +#line 3073 "SavedSearchDialog.c" } #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 2914 "SavedSearchDialog.c" +#line 3077 "SavedSearchDialog.c" } -static gchar* saved_search_dialog_value_search_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +saved_search_dialog_value_search_row_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ SavedSearchDialogSearchRow ** object_p; object_p = collect_values[0].v_pointer; #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!object_p) { #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2925 "SavedSearchDialog.c" +#line 3093 "SavedSearchDialog.c" } #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!value->data[0].v_pointer) { #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = NULL; -#line 2931 "SavedSearchDialog.c" +#line 3099 "SavedSearchDialog.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = value->data[0].v_pointer; -#line 2935 "SavedSearchDialog.c" +#line 3103 "SavedSearchDialog.c" } else { #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = saved_search_dialog_search_row_ref (value->data[0].v_pointer); -#line 2939 "SavedSearchDialog.c" +#line 3107 "SavedSearchDialog.c" } #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 2943 "SavedSearchDialog.c" +#line 3111 "SavedSearchDialog.c" } -static GParamSpec* saved_search_dialog_param_spec_search_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +static GParamSpec* +saved_search_dialog_param_spec_search_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ SavedSearchDialogParamSpecSearchRow* spec; #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (g_type_is_a (object_type, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW), NULL); @@ -2953,20 +3127,25 @@ static GParamSpec* saved_search_dialog_param_spec_search_row (const gchar* name, G_PARAM_SPEC (spec)->value_type = object_type; #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return G_PARAM_SPEC (spec); -#line 2957 "SavedSearchDialog.c" +#line 3131 "SavedSearchDialog.c" } -static gpointer saved_search_dialog_value_get_search_row (const GValue* value) { +static gpointer +saved_search_dialog_value_get_search_row (const GValue* value) +{ #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW), NULL); #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return value->data[0].v_pointer; -#line 2966 "SavedSearchDialog.c" +#line 3142 "SavedSearchDialog.c" } -static void saved_search_dialog_value_set_search_row (GValue* value, gpointer v_object) { +static void +saved_search_dialog_value_set_search_row (GValue* value, + gpointer v_object) +{ SavedSearchDialogSearchRow * old; #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW)); @@ -2982,22 +3161,25 @@ static void saved_search_dialog_value_set_search_row (GValue* value, gpointer v_ value->data[0].v_pointer = v_object; #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_ref (value->data[0].v_pointer); -#line 2986 "SavedSearchDialog.c" +#line 3165 "SavedSearchDialog.c" } else { #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 2990 "SavedSearchDialog.c" +#line 3169 "SavedSearchDialog.c" } #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (old) { #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_unref (old); -#line 2996 "SavedSearchDialog.c" +#line 3175 "SavedSearchDialog.c" } } -static void saved_search_dialog_value_take_search_row (GValue* value, gpointer v_object) { +static void +saved_search_dialog_value_take_search_row (GValue* value, + gpointer v_object) +{ SavedSearchDialogSearchRow * old; #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW)); @@ -3011,22 +3193,24 @@ static void saved_search_dialog_value_take_search_row (GValue* value, gpointer v g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = v_object; -#line 3015 "SavedSearchDialog.c" +#line 3197 "SavedSearchDialog.c" } else { #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 3019 "SavedSearchDialog.c" +#line 3201 "SavedSearchDialog.c" } #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (old) { #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_unref (old); -#line 3025 "SavedSearchDialog.c" +#line 3207 "SavedSearchDialog.c" } } -static void saved_search_dialog_search_row_class_init (SavedSearchDialogSearchRowClass * klass) { +static void +saved_search_dialog_search_row_class_init (SavedSearchDialogSearchRowClass * klass) +{ #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_parent_class = g_type_class_peek_parent (klass); #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -3039,28 +3223,34 @@ static void saved_search_dialog_search_row_class_init (SavedSearchDialogSearchRo ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_real_populate; #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_real_is_complete; -#line 3043 "SavedSearchDialog.c" +#line 3227 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_instance_init (SavedSearchDialogSearchRow * self) { +static void +saved_search_dialog_search_row_instance_init (SavedSearchDialogSearchRow * self) +{ #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->ref_count = 1; -#line 3050 "SavedSearchDialog.c" +#line 3236 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow * obj) { +static void +saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow * obj) +{ SavedSearchDialogSearchRow * self; #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_handlers_destroy (self); -#line 3060 "SavedSearchDialog.c" +#line 3248 "SavedSearchDialog.c" } -static GType saved_search_dialog_search_row_get_type (void) { +static GType +saved_search_dialog_search_row_get_type (void) +{ static volatile gsize saved_search_dialog_search_row_type_id__volatile = 0; if (g_once_init_enter (&saved_search_dialog_search_row_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { saved_search_dialog_value_search_row_init, saved_search_dialog_value_search_row_free_value, saved_search_dialog_value_search_row_copy_value, saved_search_dialog_value_search_row_peek_pointer, "p", saved_search_dialog_value_search_row_collect_value, "p", saved_search_dialog_value_search_row_lcopy_value }; @@ -3074,18 +3264,22 @@ static GType saved_search_dialog_search_row_get_type (void) { } -static gpointer saved_search_dialog_search_row_ref (gpointer instance) { +static gpointer +saved_search_dialog_search_row_ref (gpointer instance) +{ SavedSearchDialogSearchRow * self; self = instance; #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_atomic_int_inc (&self->ref_count); #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return instance; -#line 3085 "SavedSearchDialog.c" +#line 3277 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_unref (gpointer instance) { +static void +saved_search_dialog_search_row_unref (gpointer instance) +{ SavedSearchDialogSearchRow * self; self = instance; #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -3094,36 +3288,47 @@ static void saved_search_dialog_search_row_unref (gpointer instance) { SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->finalize (self); #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3098 "SavedSearchDialog.c" +#line 3292 "SavedSearchDialog.c" } } -static void _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void +_saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self) +{ #line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_text_on_changed ((SavedSearchDialogSearchRowText*) self); -#line 3106 "SavedSearchDialog.c" +#line 3303 "SavedSearchDialog.c" } -static void _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { +static void +_saved_search_dialog_search_row_text_on_changed_gtk_editable_changed (GtkEditable* _sender, + gpointer self) +{ #line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_text_on_changed ((SavedSearchDialogSearchRowText*) self); -#line 3113 "SavedSearchDialog.c" +#line 3313 "SavedSearchDialog.c" } -static gpointer _saved_search_dialog_search_row_container_ref0 (gpointer self) { +static gpointer +_saved_search_dialog_search_row_container_ref0 (gpointer self) +{ #line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self ? saved_search_dialog_search_row_container_ref (self) : NULL; -#line 3120 "SavedSearchDialog.c" +#line 3322 "SavedSearchDialog.c" } -static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) { +static SavedSearchDialogSearchRowText* +saved_search_dialog_search_row_text_construct (GType object_type, + SavedSearchDialogSearchRowContainer* parent) +{ SavedSearchDialogSearchRowText* self = NULL; SavedSearchDialogSearchRowContainer* _tmp0_; - SavedSearchDialogSearchRowContainer* _tmp1_; + GtkComboBoxText* _tmp1_; GtkComboBoxText* _tmp2_; GtkComboBoxText* _tmp3_; GtkComboBoxText* _tmp4_; @@ -3133,131 +3338,132 @@ static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_const GtkComboBoxText* _tmp8_; GtkComboBoxText* _tmp9_; GtkComboBoxText* _tmp10_; - GtkComboBoxText* _tmp11_; + GtkEntry* _tmp11_; GtkEntry* _tmp12_; GtkEntry* _tmp13_; GtkEntry* _tmp14_; - GtkEntry* _tmp15_; + GtkBox* _tmp15_; GtkBox* _tmp16_; - GtkBox* _tmp17_; - GtkComboBoxText* _tmp18_; - GtkBox* _tmp19_; - GtkEntry* _tmp20_; - GtkBox* _tmp21_; + GtkComboBoxText* _tmp17_; + GtkBox* _tmp18_; + GtkEntry* _tmp19_; + GtkBox* _tmp20_; #line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL); #line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = (SavedSearchDialogSearchRowText*) saved_search_dialog_search_row_construct (object_type); #line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = parent; -#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_); + _tmp0_ = _saved_search_dialog_search_row_container_ref0 (parent); #line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->parent = _tmp1_; + self->priv->parent = _tmp0_; #line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new (); + _tmp1_ = (GtkComboBoxText*) gtk_combo_box_text_new (); #line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp2_); + g_object_ref_sink (_tmp1_); #line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->text_context); #line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->text_context = _tmp2_; + self->priv->text_context = _tmp1_; #line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = self->priv->text_context; + _tmp2_ = self->priv->text_context; #line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp3_, _ ("contains")); + gtk_combo_box_text_append_text (_tmp2_, _ ("contains")); #line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = self->priv->text_context; + _tmp3_ = self->priv->text_context; #line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp4_, _ ("is exactly")); + gtk_combo_box_text_append_text (_tmp3_, _ ("is exactly")); #line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->text_context; + _tmp4_ = self->priv->text_context; #line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp5_, _ ("starts with")); + gtk_combo_box_text_append_text (_tmp4_, _ ("starts with")); #line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = self->priv->text_context; + _tmp5_ = self->priv->text_context; #line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp6_, _ ("ends with")); + gtk_combo_box_text_append_text (_tmp5_, _ ("ends with")); #line 171 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = self->priv->text_context; + _tmp6_ = self->priv->text_context; #line 171 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp7_, _ ("does not contain")); + gtk_combo_box_text_append_text (_tmp6_, _ ("does not contain")); #line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = self->priv->text_context; + _tmp7_ = self->priv->text_context; #line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp8_, _ ("is not set")); + gtk_combo_box_text_append_text (_tmp7_, _ ("is not set")); #line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = self->priv->text_context; + _tmp8_ = self->priv->text_context; #line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp9_, _ ("is set")); + gtk_combo_box_text_append_text (_tmp8_, _ ("is set")); #line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = self->priv->text_context; + _tmp9_ = self->priv->text_context; #line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), 0); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = self->priv->text_context; + _tmp10_ = self->priv->text_context; #line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed, self); #line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = (GtkEntry*) gtk_entry_new (); + _tmp11_ = (GtkEntry*) gtk_entry_new (); #line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp12_); + g_object_ref_sink (_tmp11_); #line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->entry); #line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->entry = _tmp12_; + self->priv->entry = _tmp11_; #line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = self->priv->entry; + _tmp12_ = self->priv->entry; #line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_entry_set_width_chars (_tmp13_, 25); + gtk_entry_set_width_chars (_tmp12_, 25); #line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = self->priv->entry; + _tmp13_ = self->priv->entry; #line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_entry_set_activates_default (_tmp14_, TRUE); + gtk_entry_set_activates_default (_tmp13_, TRUE); #line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = self->priv->entry; + _tmp14_ = self->priv->entry; #line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self); #line 182 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + _tmp15_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); #line 182 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp16_); + g_object_ref_sink (_tmp15_); #line 182 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); #line 182 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->box = _tmp16_; + self->priv->box = _tmp15_; #line 183 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = self->priv->box; + _tmp16_ = self->priv->box; #line 183 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp18_ = self->priv->text_context; + _tmp17_ = self->priv->text_context; #line 183 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = self->priv->box; + _tmp18_ = self->priv->box; #line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = self->priv->entry; + _tmp19_ = self->priv->entry; #line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = self->priv->box; + _tmp20_ = self->priv->box; #line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget)); #line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 3250 "SavedSearchDialog.c" +#line 3452 "SavedSearchDialog.c" } -static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_new (SavedSearchDialogSearchRowContainer* parent) { +static SavedSearchDialogSearchRowText* +saved_search_dialog_search_row_text_new (SavedSearchDialogSearchRowContainer* parent) +{ #line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_text_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, parent); -#line 3257 "SavedSearchDialog.c" +#line 3461 "SavedSearchDialog.c" } -static GtkWidget* saved_search_dialog_search_row_text_real_get_widget (SavedSearchDialogSearchRow* base) { +static GtkWidget* +saved_search_dialog_search_row_text_real_get_widget (SavedSearchDialogSearchRow* base) +{ SavedSearchDialogSearchRowText * self; GtkWidget* result = NULL; GtkBox* _tmp0_; @@ -3272,113 +3478,113 @@ static GtkWidget* saved_search_dialog_search_row_text_real_get_widget (SavedSear result = _tmp1_; #line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3276 "SavedSearchDialog.c" +#line 3482 "SavedSearchDialog.c" } -static SearchCondition* saved_search_dialog_search_row_text_real_get_search_condition (SavedSearchDialogSearchRow* base) { +static SearchCondition* +saved_search_dialog_search_row_text_real_get_search_condition (SavedSearchDialogSearchRow* base) +{ SavedSearchDialogSearchRowText * self; SearchCondition* result = NULL; SearchConditionSearchType type = 0; SavedSearchDialogSearchRowContainer* _tmp0_; - SearchConditionSearchType _tmp1_; gchar* text = NULL; - GtkEntry* _tmp2_; - const gchar* _tmp3_; - gchar* _tmp4_; + GtkEntry* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; SearchConditionTextContext context = 0; - SearchConditionTextContext _tmp5_; SearchConditionText* c = NULL; - SearchConditionText* _tmp6_; + SearchConditionText* _tmp4_; #line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText); #line 198 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->parent; #line 198 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_); -#line 198 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - type = _tmp1_; + type = saved_search_dialog_search_row_container_get_search_type (_tmp0_); #line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = self->priv->entry; + _tmp1_ = self->priv->entry; #line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = gtk_entry_get_text (_tmp2_); + _tmp2_ = gtk_entry_get_text (_tmp1_); #line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = g_strdup (_tmp3_); + _tmp3_ = g_strdup (_tmp2_); #line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - text = _tmp4_; + text = _tmp3_; #line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = saved_search_dialog_search_row_text_get_text_context (self); -#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - context = _tmp5_; + context = saved_search_dialog_search_row_text_get_text_context (self); #line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = search_condition_text_new (type, text, context); + _tmp4_ = search_condition_text_new (type, text, context); #line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - c = _tmp6_; + c = _tmp4_; #line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); #line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (text); #line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3324 "SavedSearchDialog.c" +#line 3526 "SavedSearchDialog.c" } -static gpointer _search_condition_ref0 (gpointer self) { +static gpointer +_search_condition_ref0 (gpointer self) +{ #line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self ? search_condition_ref (self) : NULL; -#line 3331 "SavedSearchDialog.c" +#line 3535 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_text_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) { +static void +saved_search_dialog_search_row_text_real_populate (SavedSearchDialogSearchRow* base, + SearchCondition* sc) +{ SavedSearchDialogSearchRowText * self; SearchConditionText* text = NULL; - SearchCondition* _tmp0_; - SearchConditionText* _tmp1_; - GtkComboBoxText* _tmp2_; + SearchConditionText* _tmp0_; + GtkComboBoxText* _tmp1_; + SearchConditionTextContext _tmp2_; SearchConditionTextContext _tmp3_; - SearchConditionTextContext _tmp4_; - GtkEntry* _tmp5_; + GtkEntry* _tmp4_; + const gchar* _tmp5_; const gchar* _tmp6_; - const gchar* _tmp7_; #line 205 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText); #line 205 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SEARCH_CONDITION (sc)); #line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = sc; + _tmp0_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (sc, TYPE_SEARCH_CONDITION_TEXT) ? ((SearchConditionText*) sc) : NULL); #line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_TEXT) ? ((SearchConditionText*) _tmp0_) : NULL); -#line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - text = _tmp1_; + text = _tmp0_; #line 207 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _vala_assert (text != NULL, "text != null"); #line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = self->priv->text_context; + _tmp1_ = self->priv->text_context; #line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = search_condition_text_get_context (text); + _tmp2_ = search_condition_text_get_context (text); #line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp3_); #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->entry; + _tmp4_ = self->priv->entry; #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = search_condition_text_get_text (text); + _tmp5_ = search_condition_text_get_text (text); #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_entry_set_text (_tmp5_, _tmp7_); + gtk_entry_set_text (_tmp4_, _tmp6_); #line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_text_on_changed (self); #line 205 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (text); -#line 3378 "SavedSearchDialog.c" +#line 3582 "SavedSearchDialog.c" } -static gboolean saved_search_dialog_search_row_text_real_is_complete (SavedSearchDialogSearchRow* base) { +static gboolean +saved_search_dialog_search_row_text_real_is_complete (SavedSearchDialogSearchRow* base) +{ SavedSearchDialogSearchRowText * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; @@ -3409,104 +3615,95 @@ static gboolean saved_search_dialog_search_row_text_real_is_complete (SavedSearc if (_tmp7_) { #line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = TRUE; -#line 3413 "SavedSearchDialog.c" +#line 3619 "SavedSearchDialog.c" } else { - SearchConditionTextContext _tmp8_; -#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = saved_search_dialog_search_row_text_get_text_context (self); #line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = _tmp8_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET; -#line 3420 "SavedSearchDialog.c" + _tmp1_ = saved_search_dialog_search_row_text_get_text_context (self) == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET; +#line 3623 "SavedSearchDialog.c" } #line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp1_) { #line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = TRUE; -#line 3426 "SavedSearchDialog.c" +#line 3629 "SavedSearchDialog.c" } else { - SearchConditionTextContext _tmp9_; #line 216 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = saved_search_dialog_search_row_text_get_text_context (self); -#line 216 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = _tmp9_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET; -#line 3433 "SavedSearchDialog.c" + _tmp0_ = saved_search_dialog_search_row_text_get_text_context (self) == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET; +#line 3633 "SavedSearchDialog.c" } #line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = _tmp0_; #line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3439 "SavedSearchDialog.c" +#line 3639 "SavedSearchDialog.c" } -static SearchConditionTextContext saved_search_dialog_search_row_text_get_text_context (SavedSearchDialogSearchRowText* self) { +static SearchConditionTextContext +saved_search_dialog_search_row_text_get_text_context (SavedSearchDialogSearchRowText* self) +{ SearchConditionTextContext result = 0; GtkComboBoxText* _tmp0_; - gint _tmp1_; #line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_TEXT (self), 0); #line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->text_context; #line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox)); -#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - result = (SearchConditionTextContext) _tmp1_; + result = (SearchConditionTextContext) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox)); #line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3457 "SavedSearchDialog.c" +#line 3656 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_text_on_changed (SavedSearchDialogSearchRowText* self) { +static void +saved_search_dialog_search_row_text_on_changed (SavedSearchDialogSearchRowText* self) +{ gboolean _tmp0_ = FALSE; - SearchConditionTextContext _tmp1_; - SavedSearchDialogSearchRowContainer* _tmp5_; - SavedSearchDialogSearchRowContainer* _tmp6_; + SavedSearchDialogSearchRowContainer* _tmp3_; + SavedSearchDialogSearchRowContainer* _tmp4_; #line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_TEXT (self)); #line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = saved_search_dialog_search_row_text_get_text_context (self); -#line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (_tmp1_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET) { + if (saved_search_dialog_search_row_text_get_text_context (self) == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET) { #line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = TRUE; -#line 3474 "SavedSearchDialog.c" +#line 3672 "SavedSearchDialog.c" } else { - SearchConditionTextContext _tmp2_; #line 225 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = saved_search_dialog_search_row_text_get_text_context (self); -#line 225 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = _tmp2_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET; -#line 3481 "SavedSearchDialog.c" + _tmp0_ = saved_search_dialog_search_row_text_get_text_context (self) == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET; +#line 3676 "SavedSearchDialog.c" } #line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp0_) { -#line 3485 "SavedSearchDialog.c" - GtkEntry* _tmp3_; +#line 3680 "SavedSearchDialog.c" + GtkEntry* _tmp1_; #line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = self->priv->entry; + _tmp1_ = self->priv->entry; #line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); -#line 3491 "SavedSearchDialog.c" + gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); +#line 3686 "SavedSearchDialog.c" } else { - GtkEntry* _tmp4_; + GtkEntry* _tmp2_; #line 228 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = self->priv->entry; + _tmp2_ = self->priv->entry; #line 228 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); -#line 3498 "SavedSearchDialog.c" + gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); +#line 3693 "SavedSearchDialog.c" } #line 231 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->parent; + _tmp3_ = self->priv->parent; #line 231 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = self->priv->parent; + _tmp4_ = self->priv->parent; #line 231 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_emit (_tmp5_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp6_); -#line 3506 "SavedSearchDialog.c" + g_signal_emit (_tmp3_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp4_); +#line 3701 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_text_class_init (SavedSearchDialogSearchRowTextClass * klass) { +static void +saved_search_dialog_search_row_text_class_init (SavedSearchDialogSearchRowTextClass * klass) +{ #line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_text_parent_class = g_type_class_peek_parent (klass); #line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -3521,18 +3718,22 @@ static void saved_search_dialog_search_row_text_class_init (SavedSearchDialogSea ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_text_real_populate; #line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_text_real_is_complete; -#line 3525 "SavedSearchDialog.c" +#line 3722 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_text_instance_init (SavedSearchDialogSearchRowText * self) { +static void +saved_search_dialog_search_row_text_instance_init (SavedSearchDialogSearchRowText * self) +{ #line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_TEXT_GET_PRIVATE (self); -#line 3532 "SavedSearchDialog.c" +#line 3731 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearchRow * obj) { +static void +saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearchRow * obj) +{ SavedSearchDialogSearchRowText * self; GtkComboBoxText* _tmp0_; guint _tmp1_; @@ -3549,9 +3750,9 @@ static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearc #line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->entry; #line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp3_, NULL, FALSE); + g_signal_parse_name ("changed", gtk_editable_get_type (), &_tmp3_, NULL, FALSE); #line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_editable_get_type (), GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self); #line 156 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); #line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -3562,11 +3763,13 @@ static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearc _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_text_parent_class)->finalize (obj); -#line 3566 "SavedSearchDialog.c" +#line 3767 "SavedSearchDialog.c" } -static GType saved_search_dialog_search_row_text_get_type (void) { +static GType +saved_search_dialog_search_row_text_get_type (void) +{ static volatile gsize saved_search_dialog_search_row_text_type_id__volatile = 0; if (g_once_init_enter (&saved_search_dialog_search_row_text_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDialogSearchRowTextClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_dialog_search_row_text_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDialogSearchRowText), 0, (GInstanceInitFunc) saved_search_dialog_search_row_text_instance_init, NULL }; @@ -3578,17 +3781,23 @@ static GType saved_search_dialog_search_row_text_get_type (void) { } -static void _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void +_saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self) +{ #line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_media_type_on_changed ((SavedSearchDialogSearchRowMediaType*) self); -#line 3585 "SavedSearchDialog.c" +#line 3791 "SavedSearchDialog.c" } -static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) { +static SavedSearchDialogSearchRowMediaType* +saved_search_dialog_search_row_media_type_construct (GType object_type, + SavedSearchDialogSearchRowContainer* parent) +{ SavedSearchDialogSearchRowMediaType* self = NULL; SavedSearchDialogSearchRowContainer* _tmp0_; - SavedSearchDialogSearchRowContainer* _tmp1_; + GtkComboBoxText* _tmp1_; GtkComboBoxText* _tmp2_; GtkComboBoxText* _tmp3_; GtkComboBoxText* _tmp4_; @@ -3599,115 +3808,116 @@ static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media GtkComboBoxText* _tmp9_; GtkComboBoxText* _tmp10_; GtkComboBoxText* _tmp11_; - GtkComboBoxText* _tmp12_; + GtkBox* _tmp12_; GtkBox* _tmp13_; - GtkBox* _tmp14_; - GtkComboBoxText* _tmp15_; - GtkBox* _tmp16_; - GtkComboBoxText* _tmp17_; - GtkBox* _tmp18_; + GtkComboBoxText* _tmp14_; + GtkBox* _tmp15_; + GtkComboBoxText* _tmp16_; + GtkBox* _tmp17_; #line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL); #line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = (SavedSearchDialogSearchRowMediaType*) saved_search_dialog_search_row_construct (object_type); #line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = parent; -#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_); + _tmp0_ = _saved_search_dialog_search_row_container_ref0 (parent); #line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->parent = _tmp1_; + self->priv->parent = _tmp0_; #line 246 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new (); + _tmp1_ = (GtkComboBoxText*) gtk_combo_box_text_new (); #line 246 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp2_); + g_object_ref_sink (_tmp1_); #line 246 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->media_context); #line 246 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->media_context = _tmp2_; + self->priv->media_context = _tmp1_; #line 247 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = self->priv->media_context; + _tmp2_ = self->priv->media_context; #line 247 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp3_, _ ("is")); + gtk_combo_box_text_append_text (_tmp2_, _ ("is")); #line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = self->priv->media_context; + _tmp3_ = self->priv->media_context; #line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp4_, _ ("is not")); + gtk_combo_box_text_append_text (_tmp3_, _ ("is not")); #line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->media_context; + _tmp4_ = self->priv->media_context; #line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = self->priv->media_context; + _tmp5_ = self->priv->media_context; #line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self); #line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = (GtkComboBoxText*) gtk_combo_box_text_new (); + _tmp6_ = (GtkComboBoxText*) gtk_combo_box_text_new (); #line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp7_); + g_object_ref_sink (_tmp6_); #line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->media_type); #line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->media_type = _tmp7_; + self->priv->media_type = _tmp6_; #line 254 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = self->priv->media_type; + _tmp7_ = self->priv->media_type; #line 254 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp8_, _ ("any photo")); + gtk_combo_box_text_append_text (_tmp7_, _ ("any photo")); #line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = self->priv->media_type; + _tmp8_ = self->priv->media_type; #line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp9_, _ ("a raw photo")); + gtk_combo_box_text_append_text (_tmp8_, _ ("a raw photo")); #line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = self->priv->media_type; + _tmp9_ = self->priv->media_type; #line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp10_, _ ("a video")); + gtk_combo_box_text_append_text (_tmp9_, _ ("a video")); #line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = self->priv->media_type; + _tmp10_ = self->priv->media_type; #line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), 0); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = self->priv->media_type; + _tmp11_ = self->priv->media_type; #line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self); #line 260 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + _tmp12_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); #line 260 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp13_); + g_object_ref_sink (_tmp12_); #line 260 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); #line 260 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->box = _tmp13_; + self->priv->box = _tmp12_; #line 261 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = self->priv->box; + _tmp13_ = self->priv->box; #line 261 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = self->priv->media_context; + _tmp14_ = self->priv->media_context; #line 261 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = self->priv->box; + _tmp15_ = self->priv->box; #line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = self->priv->media_type; + _tmp16_ = self->priv->media_type; #line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp18_ = self->priv->box; + _tmp17_ = self->priv->box; #line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget)); #line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 3700 "SavedSearchDialog.c" +#line 3906 "SavedSearchDialog.c" } -static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_new (SavedSearchDialogSearchRowContainer* parent) { +static SavedSearchDialogSearchRowMediaType* +saved_search_dialog_search_row_media_type_new (SavedSearchDialogSearchRowContainer* parent) +{ #line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_media_type_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, parent); -#line 3707 "SavedSearchDialog.c" +#line 3915 "SavedSearchDialog.c" } -static GtkWidget* saved_search_dialog_search_row_media_type_real_get_widget (SavedSearchDialogSearchRow* base) { +static GtkWidget* +saved_search_dialog_search_row_media_type_real_get_widget (SavedSearchDialogSearchRow* base) +{ SavedSearchDialogSearchRowMediaType * self; GtkWidget* result = NULL; GtkBox* _tmp0_; @@ -3722,102 +3932,97 @@ static GtkWidget* saved_search_dialog_search_row_media_type_real_get_widget (Sav result = _tmp1_; #line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3726 "SavedSearchDialog.c" +#line 3936 "SavedSearchDialog.c" } -static SearchCondition* saved_search_dialog_search_row_media_type_real_get_search_condition (SavedSearchDialogSearchRow* base) { +static SearchCondition* +saved_search_dialog_search_row_media_type_real_get_search_condition (SavedSearchDialogSearchRow* base) +{ SavedSearchDialogSearchRowMediaType * self; SearchCondition* result = NULL; SearchConditionSearchType search_type = 0; SavedSearchDialogSearchRowContainer* _tmp0_; - SearchConditionSearchType _tmp1_; SearchConditionMediaTypeContext context = 0; - GtkComboBoxText* _tmp2_; - gint _tmp3_; + GtkComboBoxText* _tmp1_; SearchConditionMediaTypeMediaType type = 0; - GtkComboBoxText* _tmp4_; - gint _tmp5_; + GtkComboBoxText* _tmp2_; SearchConditionMediaType* c = NULL; - SearchConditionMediaType* _tmp6_; + SearchConditionMediaType* _tmp3_; #line 275 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType); #line 276 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->parent; #line 276 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_); -#line 276 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - search_type = _tmp1_; -#line 277 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = self->priv->media_context; + search_type = saved_search_dialog_search_row_container_get_search_type (_tmp0_); #line 277 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox)); + _tmp1_ = self->priv->media_context; #line 277 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - context = (SearchConditionMediaTypeContext) _tmp3_; + context = (SearchConditionMediaTypeContext) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); #line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = self->priv->media_type; -#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox)); + _tmp2_ = self->priv->media_type; #line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - type = (SearchConditionMediaTypeMediaType) _tmp5_; + type = (SearchConditionMediaTypeMediaType) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox)); #line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = search_condition_media_type_new (search_type, context, type); + _tmp3_ = search_condition_media_type_new (search_type, context, type); #line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - c = _tmp6_; + c = _tmp3_; #line 280 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); #line 280 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3772 "SavedSearchDialog.c" +#line 3975 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_media_type_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) { +static void +saved_search_dialog_search_row_media_type_real_populate (SavedSearchDialogSearchRow* base, + SearchCondition* sc) +{ SavedSearchDialogSearchRowMediaType * self; SearchConditionMediaType* media = NULL; - SearchCondition* _tmp0_; - SearchConditionMediaType* _tmp1_; - GtkComboBoxText* _tmp2_; + SearchConditionMediaType* _tmp0_; + GtkComboBoxText* _tmp1_; + SearchConditionMediaTypeContext _tmp2_; SearchConditionMediaTypeContext _tmp3_; - SearchConditionMediaTypeContext _tmp4_; - GtkComboBoxText* _tmp5_; + GtkComboBoxText* _tmp4_; + SearchConditionMediaTypeMediaType _tmp5_; SearchConditionMediaTypeMediaType _tmp6_; - SearchConditionMediaTypeMediaType _tmp7_; #line 283 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType); #line 283 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SEARCH_CONDITION (sc)); #line 284 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = sc; -#line 284 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_MEDIA_TYPE) ? ((SearchConditionMediaType*) _tmp0_) : NULL); + _tmp0_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (sc, TYPE_SEARCH_CONDITION_MEDIA_TYPE) ? ((SearchConditionMediaType*) sc) : NULL); #line 284 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - media = _tmp1_; + media = _tmp0_; #line 285 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _vala_assert (media != NULL, "media != null"); #line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = self->priv->media_context; + _tmp1_ = self->priv->media_context; #line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = search_condition_media_type_get_context (media); + _tmp2_ = search_condition_media_type_get_context (media); #line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp3_); #line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->media_type; + _tmp4_ = self->priv->media_type; #line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = search_condition_media_type_get_media_type (media); + _tmp5_ = search_condition_media_type_get_media_type (media); #line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp7_); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp6_); #line 283 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (media); -#line 3817 "SavedSearchDialog.c" +#line 4020 "SavedSearchDialog.c" } -static gboolean saved_search_dialog_search_row_media_type_real_is_complete (SavedSearchDialogSearchRow* base) { +static gboolean +saved_search_dialog_search_row_media_type_real_is_complete (SavedSearchDialogSearchRow* base) +{ SavedSearchDialogSearchRowMediaType * self; gboolean result = FALSE; #line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -3826,11 +4031,13 @@ static gboolean saved_search_dialog_search_row_media_type_real_is_complete (Save result = TRUE; #line 291 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3830 "SavedSearchDialog.c" +#line 4035 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_media_type_on_changed (SavedSearchDialogSearchRowMediaType* self) { +static void +saved_search_dialog_search_row_media_type_on_changed (SavedSearchDialogSearchRowMediaType* self) +{ SavedSearchDialogSearchRowContainer* _tmp0_; SavedSearchDialogSearchRowContainer* _tmp1_; #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -3841,11 +4048,13 @@ static void saved_search_dialog_search_row_media_type_on_changed (SavedSearchDia _tmp1_ = self->priv->parent; #line 295 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_); -#line 3845 "SavedSearchDialog.c" +#line 4052 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_media_type_class_init (SavedSearchDialogSearchRowMediaTypeClass * klass) { +static void +saved_search_dialog_search_row_media_type_class_init (SavedSearchDialogSearchRowMediaTypeClass * klass) +{ #line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_media_type_parent_class = g_type_class_peek_parent (klass); #line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -3860,18 +4069,22 @@ static void saved_search_dialog_search_row_media_type_class_init (SavedSearchDia ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_media_type_real_populate; #line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_media_type_real_is_complete; -#line 3864 "SavedSearchDialog.c" +#line 4073 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_media_type_instance_init (SavedSearchDialogSearchRowMediaType * self) { +static void +saved_search_dialog_search_row_media_type_instance_init (SavedSearchDialogSearchRowMediaType * self) +{ #line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_MEDIA_TYPE_GET_PRIVATE (self); -#line 3871 "SavedSearchDialog.c" +#line 4082 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialogSearchRow * obj) { +static void +saved_search_dialog_search_row_media_type_finalize (SavedSearchDialogSearchRow * obj) +{ SavedSearchDialogSearchRowMediaType * self; GtkComboBoxText* _tmp0_; guint _tmp1_; @@ -3901,11 +4114,13 @@ static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialo _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_media_type_parent_class)->finalize (obj); -#line 3905 "SavedSearchDialog.c" +#line 4118 "SavedSearchDialog.c" } -static GType saved_search_dialog_search_row_media_type_get_type (void) { +static GType +saved_search_dialog_search_row_media_type_get_type (void) +{ static volatile gsize saved_search_dialog_search_row_media_type_type_id__volatile = 0; if (g_once_init_enter (&saved_search_dialog_search_row_media_type_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDialogSearchRowMediaTypeClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_dialog_search_row_media_type_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDialogSearchRowMediaType), 0, (GInstanceInitFunc) saved_search_dialog_search_row_media_type_instance_init, NULL }; @@ -3917,17 +4132,23 @@ static GType saved_search_dialog_search_row_media_type_get_type (void) { } -static void _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void +_saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self) +{ #line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_modified_on_changed ((SavedSearchDialogSearchRowModified*) self); -#line 3924 "SavedSearchDialog.c" +#line 4142 "SavedSearchDialog.c" } -static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) { +static SavedSearchDialogSearchRowModified* +saved_search_dialog_search_row_modified_construct (GType object_type, + SavedSearchDialogSearchRowContainer* parent) +{ SavedSearchDialogSearchRowModified* self = NULL; SavedSearchDialogSearchRowContainer* _tmp0_; - SavedSearchDialogSearchRowContainer* _tmp1_; + GtkComboBoxText* _tmp1_; GtkComboBoxText* _tmp2_; GtkComboBoxText* _tmp3_; GtkComboBoxText* _tmp4_; @@ -3938,115 +4159,116 @@ static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modifi GtkComboBoxText* _tmp9_; GtkComboBoxText* _tmp10_; GtkComboBoxText* _tmp11_; - GtkComboBoxText* _tmp12_; + GtkBox* _tmp12_; GtkBox* _tmp13_; - GtkBox* _tmp14_; - GtkComboBoxText* _tmp15_; - GtkBox* _tmp16_; - GtkComboBoxText* _tmp17_; - GtkBox* _tmp18_; + GtkComboBoxText* _tmp14_; + GtkBox* _tmp15_; + GtkComboBoxText* _tmp16_; + GtkBox* _tmp17_; #line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL); #line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = (SavedSearchDialogSearchRowModified*) saved_search_dialog_search_row_construct (object_type); #line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = parent; -#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_); + _tmp0_ = _saved_search_dialog_search_row_container_ref0 (parent); #line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->parent = _tmp1_; + self->priv->parent = _tmp0_; #line 309 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new (); + _tmp1_ = (GtkComboBoxText*) gtk_combo_box_text_new (); #line 309 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp2_); + g_object_ref_sink (_tmp1_); #line 309 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->modified_context); #line 309 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->modified_context = _tmp2_; + self->priv->modified_context = _tmp1_; #line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = self->priv->modified_context; + _tmp2_ = self->priv->modified_context; #line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp3_, _ ("has")); + gtk_combo_box_text_append_text (_tmp2_, _ ("has")); #line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = self->priv->modified_context; + _tmp3_ = self->priv->modified_context; #line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp4_, _ ("has no")); + gtk_combo_box_text_append_text (_tmp3_, _ ("has no")); #line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->modified_context; + _tmp4_ = self->priv->modified_context; #line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = self->priv->modified_context; + _tmp5_ = self->priv->modified_context; #line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self); #line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = (GtkComboBoxText*) gtk_combo_box_text_new (); + _tmp6_ = (GtkComboBoxText*) gtk_combo_box_text_new (); #line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp7_); + g_object_ref_sink (_tmp6_); #line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->modified_state); #line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->modified_state = _tmp7_; + self->priv->modified_state = _tmp6_; #line 316 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = self->priv->modified_state; + _tmp7_ = self->priv->modified_state; #line 316 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp8_, _ ("modifications")); + gtk_combo_box_text_append_text (_tmp7_, _ ("modifications")); #line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = self->priv->modified_state; + _tmp8_ = self->priv->modified_state; #line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp9_, _ ("internal modifications")); + gtk_combo_box_text_append_text (_tmp8_, _ ("internal modifications")); #line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = self->priv->modified_state; + _tmp9_ = self->priv->modified_state; #line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp10_, _ ("external modifications")); + gtk_combo_box_text_append_text (_tmp9_, _ ("external modifications")); #line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = self->priv->modified_state; + _tmp10_ = self->priv->modified_state; #line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), 0); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = self->priv->modified_state; + _tmp11_ = self->priv->modified_state; #line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self); #line 322 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + _tmp12_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); #line 322 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp13_); + g_object_ref_sink (_tmp12_); #line 322 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); #line 322 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->box = _tmp13_; + self->priv->box = _tmp12_; #line 323 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = self->priv->box; + _tmp13_ = self->priv->box; #line 323 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = self->priv->modified_context; + _tmp14_ = self->priv->modified_context; #line 323 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = self->priv->box; + _tmp15_ = self->priv->box; #line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = self->priv->modified_state; + _tmp16_ = self->priv->modified_state; #line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp18_ = self->priv->box; + _tmp17_ = self->priv->box; #line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget)); #line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 4039 "SavedSearchDialog.c" +#line 4257 "SavedSearchDialog.c" } -static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_new (SavedSearchDialogSearchRowContainer* parent) { +static SavedSearchDialogSearchRowModified* +saved_search_dialog_search_row_modified_new (SavedSearchDialogSearchRowContainer* parent) +{ #line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_modified_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, parent); -#line 4046 "SavedSearchDialog.c" +#line 4266 "SavedSearchDialog.c" } -static GtkWidget* saved_search_dialog_search_row_modified_real_get_widget (SavedSearchDialogSearchRow* base) { +static GtkWidget* +saved_search_dialog_search_row_modified_real_get_widget (SavedSearchDialogSearchRow* base) +{ SavedSearchDialogSearchRowModified * self; GtkWidget* result = NULL; GtkBox* _tmp0_; @@ -4061,102 +4283,97 @@ static GtkWidget* saved_search_dialog_search_row_modified_real_get_widget (Saved result = _tmp1_; #line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4065 "SavedSearchDialog.c" +#line 4287 "SavedSearchDialog.c" } -static SearchCondition* saved_search_dialog_search_row_modified_real_get_search_condition (SavedSearchDialogSearchRow* base) { +static SearchCondition* +saved_search_dialog_search_row_modified_real_get_search_condition (SavedSearchDialogSearchRow* base) +{ SavedSearchDialogSearchRowModified * self; SearchCondition* result = NULL; SearchConditionSearchType search_type = 0; SavedSearchDialogSearchRowContainer* _tmp0_; - SearchConditionSearchType _tmp1_; SearchConditionModifiedContext context = 0; - GtkComboBoxText* _tmp2_; - gint _tmp3_; + GtkComboBoxText* _tmp1_; SearchConditionModifiedState state = 0; - GtkComboBoxText* _tmp4_; - gint _tmp5_; + GtkComboBoxText* _tmp2_; SearchConditionModified* c = NULL; - SearchConditionModified* _tmp6_; + SearchConditionModified* _tmp3_; #line 337 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified); #line 338 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->parent; #line 338 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_); -#line 338 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - search_type = _tmp1_; + search_type = saved_search_dialog_search_row_container_get_search_type (_tmp0_); #line 339 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = self->priv->modified_context; -#line 339 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox)); + _tmp1_ = self->priv->modified_context; #line 339 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - context = (SearchConditionModifiedContext) _tmp3_; -#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = self->priv->modified_state; + context = (SearchConditionModifiedContext) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); #line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox)); + _tmp2_ = self->priv->modified_state; #line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - state = (SearchConditionModifiedState) _tmp5_; + state = (SearchConditionModifiedState) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox)); #line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = search_condition_modified_new (search_type, context, state); + _tmp3_ = search_condition_modified_new (search_type, context, state); #line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - c = _tmp6_; + c = _tmp3_; #line 342 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); #line 342 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4111 "SavedSearchDialog.c" +#line 4326 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_modified_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) { +static void +saved_search_dialog_search_row_modified_real_populate (SavedSearchDialogSearchRow* base, + SearchCondition* sc) +{ SavedSearchDialogSearchRowModified * self; SearchConditionModified* scm = NULL; - SearchCondition* _tmp0_; - SearchConditionModified* _tmp1_; - GtkComboBoxText* _tmp2_; + SearchConditionModified* _tmp0_; + GtkComboBoxText* _tmp1_; + SearchConditionModifiedState _tmp2_; SearchConditionModifiedState _tmp3_; - SearchConditionModifiedState _tmp4_; - GtkComboBoxText* _tmp5_; + GtkComboBoxText* _tmp4_; + SearchConditionModifiedContext _tmp5_; SearchConditionModifiedContext _tmp6_; - SearchConditionModifiedContext _tmp7_; #line 345 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified); #line 345 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SEARCH_CONDITION (sc)); #line 346 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = sc; -#line 346 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_MODIFIED) ? ((SearchConditionModified*) _tmp0_) : NULL); + _tmp0_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (sc, TYPE_SEARCH_CONDITION_MODIFIED) ? ((SearchConditionModified*) sc) : NULL); #line 346 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - scm = _tmp1_; + scm = _tmp0_; #line 347 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _vala_assert (scm != NULL, "scm != null"); #line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = self->priv->modified_state; + _tmp1_ = self->priv->modified_state; #line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = search_condition_modified_get_state (scm); + _tmp2_ = search_condition_modified_get_state (scm); #line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp3_); #line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->modified_context; + _tmp4_ = self->priv->modified_context; #line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = search_condition_modified_get_context (scm); + _tmp5_ = search_condition_modified_get_context (scm); #line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp7_); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp6_); #line 345 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (scm); -#line 4156 "SavedSearchDialog.c" +#line 4371 "SavedSearchDialog.c" } -static gboolean saved_search_dialog_search_row_modified_real_is_complete (SavedSearchDialogSearchRow* base) { +static gboolean +saved_search_dialog_search_row_modified_real_is_complete (SavedSearchDialogSearchRow* base) +{ SavedSearchDialogSearchRowModified * self; gboolean result = FALSE; #line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4165,11 +4382,13 @@ static gboolean saved_search_dialog_search_row_modified_real_is_complete (SavedS result = TRUE; #line 353 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4169 "SavedSearchDialog.c" +#line 4386 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_modified_on_changed (SavedSearchDialogSearchRowModified* self) { +static void +saved_search_dialog_search_row_modified_on_changed (SavedSearchDialogSearchRowModified* self) +{ SavedSearchDialogSearchRowContainer* _tmp0_; SavedSearchDialogSearchRowContainer* _tmp1_; #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4180,11 +4399,13 @@ static void saved_search_dialog_search_row_modified_on_changed (SavedSearchDialo _tmp1_ = self->priv->parent; #line 357 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_); -#line 4184 "SavedSearchDialog.c" +#line 4403 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_modified_class_init (SavedSearchDialogSearchRowModifiedClass * klass) { +static void +saved_search_dialog_search_row_modified_class_init (SavedSearchDialogSearchRowModifiedClass * klass) +{ #line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_modified_parent_class = g_type_class_peek_parent (klass); #line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4199,18 +4420,22 @@ static void saved_search_dialog_search_row_modified_class_init (SavedSearchDialo ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_modified_real_populate; #line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_modified_real_is_complete; -#line 4203 "SavedSearchDialog.c" +#line 4424 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_modified_instance_init (SavedSearchDialogSearchRowModified * self) { +static void +saved_search_dialog_search_row_modified_instance_init (SavedSearchDialogSearchRowModified * self) +{ #line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_MODIFIED_GET_PRIVATE (self); -#line 4210 "SavedSearchDialog.c" +#line 4433 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogSearchRow * obj) { +static void +saved_search_dialog_search_row_modified_finalize (SavedSearchDialogSearchRow * obj) +{ SavedSearchDialogSearchRowModified * self; GtkComboBoxText* _tmp0_; guint _tmp1_; @@ -4240,11 +4465,13 @@ static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogS _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_modified_parent_class)->finalize (obj); -#line 4244 "SavedSearchDialog.c" +#line 4469 "SavedSearchDialog.c" } -static GType saved_search_dialog_search_row_modified_get_type (void) { +static GType +saved_search_dialog_search_row_modified_get_type (void) +{ static volatile gsize saved_search_dialog_search_row_modified_type_id__volatile = 0; if (g_once_init_enter (&saved_search_dialog_search_row_modified_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDialogSearchRowModifiedClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_dialog_search_row_modified_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDialogSearchRowModified), 0, (GInstanceInitFunc) saved_search_dialog_search_row_modified_instance_init, NULL }; @@ -4256,109 +4483,116 @@ static GType saved_search_dialog_search_row_modified_get_type (void) { } -static void _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void +_saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self) +{ #line 384 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_flagged_on_changed ((SavedSearchDialogSearchRowFlagged*) self); -#line 4263 "SavedSearchDialog.c" +#line 4493 "SavedSearchDialog.c" } -static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) { +static SavedSearchDialogSearchRowFlagged* +saved_search_dialog_search_row_flagged_construct (GType object_type, + SavedSearchDialogSearchRowContainer* parent) +{ SavedSearchDialogSearchRowFlagged* self = NULL; SavedSearchDialogSearchRowContainer* _tmp0_; - SavedSearchDialogSearchRowContainer* _tmp1_; + GtkComboBoxText* _tmp1_; GtkComboBoxText* _tmp2_; GtkComboBoxText* _tmp3_; GtkComboBoxText* _tmp4_; GtkComboBoxText* _tmp5_; - GtkComboBoxText* _tmp6_; + GtkBox* _tmp6_; GtkBox* _tmp7_; - GtkBox* _tmp8_; + GtkLabel* _tmp8_; GtkLabel* _tmp9_; - GtkLabel* _tmp10_; - GtkBox* _tmp11_; - GtkComboBoxText* _tmp12_; - GtkBox* _tmp13_; + GtkBox* _tmp10_; + GtkComboBoxText* _tmp11_; + GtkBox* _tmp12_; #line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL); #line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = (SavedSearchDialogSearchRowFlagged*) saved_search_dialog_search_row_construct (object_type); #line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = parent; -#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_); + _tmp0_ = _saved_search_dialog_search_row_container_ref0 (parent); #line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->parent = _tmp1_; + self->priv->parent = _tmp0_; #line 371 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new (); + _tmp1_ = (GtkComboBoxText*) gtk_combo_box_text_new (); #line 371 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp2_); + g_object_ref_sink (_tmp1_); #line 371 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->flagged_state); #line 371 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->flagged_state = _tmp2_; + self->priv->flagged_state = _tmp1_; #line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = self->priv->flagged_state; + _tmp2_ = self->priv->flagged_state; #line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp3_, _ ("flagged")); + gtk_combo_box_text_append_text (_tmp2_, _ ("flagged")); #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = self->priv->flagged_state; + _tmp3_ = self->priv->flagged_state; #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp4_, _ ("not flagged")); + gtk_combo_box_text_append_text (_tmp3_, _ ("not flagged")); #line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->flagged_state; + _tmp4_ = self->priv->flagged_state; #line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = self->priv->flagged_state; + _tmp5_ = self->priv->flagged_state; #line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed, self); #line 377 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + _tmp6_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); #line 377 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp7_); + g_object_ref_sink (_tmp6_); #line 377 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); #line 377 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->box = _tmp7_; + self->priv->box = _tmp6_; #line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = self->priv->box; + _tmp7_ = self->priv->box; #line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = (GtkLabel*) gtk_label_new (_ ("is")); + _tmp8_ = (GtkLabel*) gtk_label_new (_ ("is")); #line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp9_); + g_object_ref_sink (_tmp8_); #line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp9_); #line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = self->priv->box; + _tmp10_ = self->priv->box; #line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = self->priv->flagged_state; + _tmp11_ = self->priv->flagged_state; #line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 380 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = self->priv->box; + _tmp12_ = self->priv->box; #line 380 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget)); #line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 4351 "SavedSearchDialog.c" +#line 4581 "SavedSearchDialog.c" } -static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_new (SavedSearchDialogSearchRowContainer* parent) { +static SavedSearchDialogSearchRowFlagged* +saved_search_dialog_search_row_flagged_new (SavedSearchDialogSearchRowContainer* parent) +{ #line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_flagged_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, parent); -#line 4358 "SavedSearchDialog.c" +#line 4590 "SavedSearchDialog.c" } -static GtkWidget* saved_search_dialog_search_row_flagged_real_get_widget (SavedSearchDialogSearchRow* base) { +static GtkWidget* +saved_search_dialog_search_row_flagged_real_get_widget (SavedSearchDialogSearchRow* base) +{ SavedSearchDialogSearchRowFlagged * self; GtkWidget* result = NULL; GtkBox* _tmp0_; @@ -4373,82 +4607,80 @@ static GtkWidget* saved_search_dialog_search_row_flagged_real_get_widget (SavedS result = _tmp1_; #line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4377 "SavedSearchDialog.c" +#line 4611 "SavedSearchDialog.c" } -static SearchCondition* saved_search_dialog_search_row_flagged_real_get_search_condition (SavedSearchDialogSearchRow* base) { +static SearchCondition* +saved_search_dialog_search_row_flagged_real_get_search_condition (SavedSearchDialogSearchRow* base) +{ SavedSearchDialogSearchRowFlagged * self; SearchCondition* result = NULL; SearchConditionSearchType search_type = 0; SavedSearchDialogSearchRowContainer* _tmp0_; - SearchConditionSearchType _tmp1_; SearchConditionFlaggedState state = 0; - GtkComboBoxText* _tmp2_; - gint _tmp3_; + GtkComboBoxText* _tmp1_; SearchConditionFlagged* c = NULL; - SearchConditionFlagged* _tmp4_; + SearchConditionFlagged* _tmp2_; #line 391 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged); #line 392 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->parent; #line 392 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_); -#line 392 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - search_type = _tmp1_; -#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = self->priv->flagged_state; + search_type = saved_search_dialog_search_row_container_get_search_type (_tmp0_); #line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox)); + _tmp1_ = self->priv->flagged_state; #line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - state = (SearchConditionFlaggedState) _tmp3_; + state = (SearchConditionFlaggedState) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); #line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = search_condition_flagged_new (search_type, state); + _tmp2_ = search_condition_flagged_new (search_type, state); #line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - c = _tmp4_; + c = _tmp2_; #line 395 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); #line 395 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4414 "SavedSearchDialog.c" +#line 4644 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_flagged_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) { +static void +saved_search_dialog_search_row_flagged_real_populate (SavedSearchDialogSearchRow* base, + SearchCondition* sc) +{ SavedSearchDialogSearchRowFlagged * self; SearchConditionFlagged* f = NULL; - SearchCondition* _tmp0_; - SearchConditionFlagged* _tmp1_; - GtkComboBoxText* _tmp2_; + SearchConditionFlagged* _tmp0_; + GtkComboBoxText* _tmp1_; + SearchConditionFlaggedState _tmp2_; SearchConditionFlaggedState _tmp3_; - SearchConditionFlaggedState _tmp4_; #line 398 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged); #line 398 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SEARCH_CONDITION (sc)); #line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = sc; + _tmp0_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (sc, TYPE_SEARCH_CONDITION_FLAGGED) ? ((SearchConditionFlagged*) sc) : NULL); #line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_FLAGGED) ? ((SearchConditionFlagged*) _tmp0_) : NULL); -#line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - f = _tmp1_; + f = _tmp0_; #line 400 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _vala_assert (f != NULL, "f != null"); #line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = self->priv->flagged_state; + _tmp1_ = self->priv->flagged_state; #line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = search_condition_flagged_get_state (f); + _tmp2_ = search_condition_flagged_get_state (f); #line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp3_); #line 398 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (f); -#line 4448 "SavedSearchDialog.c" +#line 4678 "SavedSearchDialog.c" } -static gboolean saved_search_dialog_search_row_flagged_real_is_complete (SavedSearchDialogSearchRow* base) { +static gboolean +saved_search_dialog_search_row_flagged_real_is_complete (SavedSearchDialogSearchRow* base) +{ SavedSearchDialogSearchRowFlagged * self; gboolean result = FALSE; #line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4457,11 +4689,13 @@ static gboolean saved_search_dialog_search_row_flagged_real_is_complete (SavedSe result = TRUE; #line 405 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4461 "SavedSearchDialog.c" +#line 4693 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_flagged_on_changed (SavedSearchDialogSearchRowFlagged* self) { +static void +saved_search_dialog_search_row_flagged_on_changed (SavedSearchDialogSearchRowFlagged* self) +{ SavedSearchDialogSearchRowContainer* _tmp0_; SavedSearchDialogSearchRowContainer* _tmp1_; #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4472,11 +4706,13 @@ static void saved_search_dialog_search_row_flagged_on_changed (SavedSearchDialog _tmp1_ = self->priv->parent; #line 409 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_); -#line 4476 "SavedSearchDialog.c" +#line 4710 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_flagged_class_init (SavedSearchDialogSearchRowFlaggedClass * klass) { +static void +saved_search_dialog_search_row_flagged_class_init (SavedSearchDialogSearchRowFlaggedClass * klass) +{ #line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_flagged_parent_class = g_type_class_peek_parent (klass); #line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4491,18 +4727,22 @@ static void saved_search_dialog_search_row_flagged_class_init (SavedSearchDialog ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_flagged_real_populate; #line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_flagged_real_is_complete; -#line 4495 "SavedSearchDialog.c" +#line 4731 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_flagged_instance_init (SavedSearchDialogSearchRowFlagged * self) { +static void +saved_search_dialog_search_row_flagged_instance_init (SavedSearchDialogSearchRowFlagged * self) +{ #line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_FLAGGED_GET_PRIVATE (self); -#line 4502 "SavedSearchDialog.c" +#line 4740 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSearchRow * obj) { +static void +saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSearchRow * obj) +{ SavedSearchDialogSearchRowFlagged * self; GtkComboBoxText* _tmp0_; guint _tmp1_; @@ -4522,11 +4762,13 @@ static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSe _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_flagged_parent_class)->finalize (obj); -#line 4526 "SavedSearchDialog.c" +#line 4766 "SavedSearchDialog.c" } -static GType saved_search_dialog_search_row_flagged_get_type (void) { +static GType +saved_search_dialog_search_row_flagged_get_type (void) +{ static volatile gsize saved_search_dialog_search_row_flagged_type_id__volatile = 0; if (g_once_init_enter (&saved_search_dialog_search_row_flagged_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDialogSearchRowFlaggedClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_dialog_search_row_flagged_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDialogSearchRowFlagged), 0, (GInstanceInitFunc) saved_search_dialog_search_row_flagged_instance_init, NULL }; @@ -4538,32 +4780,38 @@ static GType saved_search_dialog_search_row_flagged_get_type (void) { } -static void _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void +_saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self) +{ #line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_rating_on_changed ((SavedSearchDialogSearchRowRating*) self); -#line 4545 "SavedSearchDialog.c" +#line 4790 "SavedSearchDialog.c" } -static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) { +static SavedSearchDialogSearchRowRating* +saved_search_dialog_search_row_rating_construct (GType object_type, + SavedSearchDialogSearchRowContainer* parent) +{ SavedSearchDialogSearchRowRating* self = NULL; SavedSearchDialogSearchRowContainer* _tmp0_; - SavedSearchDialogSearchRowContainer* _tmp1_; + GtkComboBoxText* _tmp1_; GtkComboBoxText* _tmp2_; - GtkComboBoxText* _tmp3_; - const gchar* _tmp4_; - GtkComboBoxText* _tmp5_; - const gchar* _tmp6_; - GtkComboBoxText* _tmp7_; - const gchar* _tmp8_; - GtkComboBoxText* _tmp9_; - const gchar* _tmp10_; - GtkComboBoxText* _tmp11_; - const gchar* _tmp12_; - GtkComboBoxText* _tmp13_; - const gchar* _tmp14_; - GtkComboBoxText* _tmp15_; - const gchar* _tmp16_; + const gchar* _tmp3_; + GtkComboBoxText* _tmp4_; + const gchar* _tmp5_; + GtkComboBoxText* _tmp6_; + const gchar* _tmp7_; + GtkComboBoxText* _tmp8_; + const gchar* _tmp9_; + GtkComboBoxText* _tmp10_; + const gchar* _tmp11_; + GtkComboBoxText* _tmp12_; + const gchar* _tmp13_; + GtkComboBoxText* _tmp14_; + const gchar* _tmp15_; + GtkComboBoxText* _tmp16_; GtkComboBoxText* _tmp17_; GtkComboBoxText* _tmp18_; GtkComboBoxText* _tmp19_; @@ -4571,164 +4819,165 @@ static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_c GtkComboBoxText* _tmp21_; GtkComboBoxText* _tmp22_; GtkComboBoxText* _tmp23_; - GtkComboBoxText* _tmp24_; + GtkBox* _tmp24_; GtkBox* _tmp25_; - GtkBox* _tmp26_; + GtkLabel* _tmp26_; GtkLabel* _tmp27_; - GtkLabel* _tmp28_; - GtkBox* _tmp29_; - GtkComboBoxText* _tmp30_; - GtkBox* _tmp31_; - GtkComboBoxText* _tmp32_; - GtkBox* _tmp33_; + GtkBox* _tmp28_; + GtkComboBoxText* _tmp29_; + GtkBox* _tmp30_; + GtkComboBoxText* _tmp31_; + GtkBox* _tmp32_; #line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL); #line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = (SavedSearchDialogSearchRowRating*) saved_search_dialog_search_row_construct (object_type); #line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = parent; -#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_); + _tmp0_ = _saved_search_dialog_search_row_container_ref0 (parent); #line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->parent = _tmp1_; + self->priv->parent = _tmp0_; #line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new (); + _tmp1_ = (GtkComboBoxText*) gtk_combo_box_text_new (); #line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp2_); + g_object_ref_sink (_tmp1_); #line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->rating); #line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->rating = _tmp2_; + self->priv->rating = _tmp1_; #line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = self->priv->rating; + _tmp2_ = self->priv->rating; #line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = resources_rating_combo_box (RATING_REJECTED); + _tmp3_ = resources_rating_combo_box (RATING_REJECTED); #line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp3_, _tmp4_); + gtk_combo_box_text_append_text (_tmp2_, _tmp3_); #line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->rating; + _tmp4_ = self->priv->rating; #line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = resources_rating_combo_box (RATING_UNRATED); + _tmp5_ = resources_rating_combo_box (RATING_UNRATED); #line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp5_, _tmp6_); + gtk_combo_box_text_append_text (_tmp4_, _tmp5_); #line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = self->priv->rating; + _tmp6_ = self->priv->rating; #line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = resources_rating_combo_box (RATING_ONE); + _tmp7_ = resources_rating_combo_box (RATING_ONE); #line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp7_, _tmp8_); + gtk_combo_box_text_append_text (_tmp6_, _tmp7_); #line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = self->priv->rating; + _tmp8_ = self->priv->rating; #line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = resources_rating_combo_box (RATING_TWO); + _tmp9_ = resources_rating_combo_box (RATING_TWO); #line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp9_, _tmp10_); + gtk_combo_box_text_append_text (_tmp8_, _tmp9_); #line 429 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = self->priv->rating; + _tmp10_ = self->priv->rating; #line 429 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = resources_rating_combo_box (RATING_THREE); + _tmp11_ = resources_rating_combo_box (RATING_THREE); #line 429 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp11_, _tmp12_); + gtk_combo_box_text_append_text (_tmp10_, _tmp11_); #line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = self->priv->rating; + _tmp12_ = self->priv->rating; #line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = resources_rating_combo_box (RATING_FOUR); + _tmp13_ = resources_rating_combo_box (RATING_FOUR); #line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp13_, _tmp14_); + gtk_combo_box_text_append_text (_tmp12_, _tmp13_); #line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = self->priv->rating; + _tmp14_ = self->priv->rating; #line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = resources_rating_combo_box (RATING_FIVE); + _tmp15_ = resources_rating_combo_box (RATING_FIVE); #line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp15_, _tmp16_); + gtk_combo_box_text_append_text (_tmp14_, _tmp15_); #line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = self->priv->rating; + _tmp16_ = self->priv->rating; #line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), 0); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp18_ = self->priv->rating; + _tmp17_ = self->priv->rating; #line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self); #line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = (GtkComboBoxText*) gtk_combo_box_text_new (); + _tmp18_ = (GtkComboBoxText*) gtk_combo_box_text_new (); #line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp19_); + g_object_ref_sink (_tmp18_); #line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->context); #line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->context = _tmp19_; + self->priv->context = _tmp18_; #line 436 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = self->priv->context; + _tmp19_ = self->priv->context; #line 436 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp20_, _ ("and higher")); + gtk_combo_box_text_append_text (_tmp19_, _ ("and higher")); #line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = self->priv->context; + _tmp20_ = self->priv->context; #line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp21_, _ ("only")); + gtk_combo_box_text_append_text (_tmp20_, _ ("only")); #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = self->priv->context; + _tmp21_ = self->priv->context; #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp22_, _ ("and lower")); + gtk_combo_box_text_append_text (_tmp21_, _ ("and lower")); #line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp23_ = self->priv->context; + _tmp22_ = self->priv->context; #line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox), 0); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp24_ = self->priv->context; + _tmp23_ = self->priv->context; #line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self); #line 442 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp25_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + _tmp24_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); #line 442 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp25_); + g_object_ref_sink (_tmp24_); #line 442 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); #line 442 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->box = _tmp25_; + self->priv->box = _tmp24_; #line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp26_ = self->priv->box; + _tmp25_ = self->priv->box; #line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp27_ = (GtkLabel*) gtk_label_new (_ ("is")); + _tmp26_ = (GtkLabel*) gtk_label_new (_ ("is")); #line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp27_); + g_object_ref_sink (_tmp26_); #line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp28_ = _tmp27_; + _tmp27_ = _tmp26_; #line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (_tmp28_); + _g_object_unref0 (_tmp27_); #line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp29_ = self->priv->box; + _tmp28_ = self->priv->box; #line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp30_ = self->priv->rating; + _tmp29_ = self->priv->rating; #line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp31_ = self->priv->box; + _tmp30_ = self->priv->box; #line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp32_ = self->priv->context; + _tmp31_ = self->priv->context; #line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp33_ = self->priv->box; + _tmp32_ = self->priv->box; #line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget)); #line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 4721 "SavedSearchDialog.c" +#line 4966 "SavedSearchDialog.c" } -static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_new (SavedSearchDialogSearchRowContainer* parent) { +static SavedSearchDialogSearchRowRating* +saved_search_dialog_search_row_rating_new (SavedSearchDialogSearchRowContainer* parent) +{ #line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_rating_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, parent); -#line 4728 "SavedSearchDialog.c" +#line 4975 "SavedSearchDialog.c" } -static GtkWidget* saved_search_dialog_search_row_rating_real_get_widget (SavedSearchDialogSearchRow* base) { +static GtkWidget* +saved_search_dialog_search_row_rating_real_get_widget (SavedSearchDialogSearchRow* base) +{ SavedSearchDialogSearchRowRating * self; GtkWidget* result = NULL; GtkBox* _tmp0_; @@ -4743,102 +4992,97 @@ static GtkWidget* saved_search_dialog_search_row_rating_real_get_widget (SavedSe result = _tmp1_; #line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4747 "SavedSearchDialog.c" +#line 4996 "SavedSearchDialog.c" } -static SearchCondition* saved_search_dialog_search_row_rating_real_get_search_condition (SavedSearchDialogSearchRow* base) { +static SearchCondition* +saved_search_dialog_search_row_rating_real_get_search_condition (SavedSearchDialogSearchRow* base) +{ SavedSearchDialogSearchRowRating * self; SearchCondition* result = NULL; SearchConditionSearchType search_type = 0; SavedSearchDialogSearchRowContainer* _tmp0_; - SearchConditionSearchType _tmp1_; Rating search_rating = 0; - GtkComboBoxText* _tmp2_; - gint _tmp3_; + GtkComboBoxText* _tmp1_; SearchConditionRatingContext search_context = 0; - GtkComboBoxText* _tmp4_; - gint _tmp5_; + GtkComboBoxText* _tmp2_; SearchConditionRating* c = NULL; - SearchConditionRating* _tmp6_; + SearchConditionRating* _tmp3_; #line 458 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating); #line 459 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->parent; #line 459 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_); -#line 459 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - search_type = _tmp1_; + search_type = saved_search_dialog_search_row_container_get_search_type (_tmp0_); #line 460 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = self->priv->rating; -#line 460 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox)); + _tmp1_ = self->priv->rating; #line 460 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - search_rating = ((Rating) _tmp3_) + RATING_REJECTED; -#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = self->priv->context; + search_rating = ((Rating) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox))) + RATING_REJECTED; #line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox)); + _tmp2_ = self->priv->context; #line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - search_context = (SearchConditionRatingContext) _tmp5_; + search_context = (SearchConditionRatingContext) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox)); #line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = search_condition_rating_new (search_type, search_rating, search_context); + _tmp3_ = search_condition_rating_new (search_type, search_rating, search_context); #line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - c = _tmp6_; + c = _tmp3_; #line 463 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); #line 463 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4793 "SavedSearchDialog.c" +#line 5035 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_rating_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) { +static void +saved_search_dialog_search_row_rating_real_populate (SavedSearchDialogSearchRow* base, + SearchCondition* sc) +{ SavedSearchDialogSearchRowRating * self; SearchConditionRating* r = NULL; - SearchCondition* _tmp0_; - SearchConditionRating* _tmp1_; - GtkComboBoxText* _tmp2_; + SearchConditionRating* _tmp0_; + GtkComboBoxText* _tmp1_; + SearchConditionRatingContext _tmp2_; SearchConditionRatingContext _tmp3_; - SearchConditionRatingContext _tmp4_; - GtkComboBoxText* _tmp5_; + GtkComboBoxText* _tmp4_; + Rating _tmp5_; Rating _tmp6_; - Rating _tmp7_; #line 466 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating); #line 466 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SEARCH_CONDITION (sc)); #line 467 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = sc; + _tmp0_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (sc, TYPE_SEARCH_CONDITION_RATING) ? ((SearchConditionRating*) sc) : NULL); #line 467 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_RATING) ? ((SearchConditionRating*) _tmp0_) : NULL); -#line 467 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - r = _tmp1_; + r = _tmp0_; #line 468 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _vala_assert (r != NULL, "r != null"); #line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = self->priv->context; + _tmp1_ = self->priv->context; #line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = search_condition_rating_get_context (r); + _tmp2_ = search_condition_rating_get_context (r); #line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp3_); #line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->rating; + _tmp4_ = self->priv->rating; #line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = search_condition_rating_get_rating (r); + _tmp5_ = search_condition_rating_get_rating (r); #line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) (_tmp7_ - RATING_REJECTED)); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox), (gint) (_tmp6_ - RATING_REJECTED)); #line 466 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (r); -#line 4838 "SavedSearchDialog.c" +#line 5080 "SavedSearchDialog.c" } -static gboolean saved_search_dialog_search_row_rating_real_is_complete (SavedSearchDialogSearchRow* base) { +static gboolean +saved_search_dialog_search_row_rating_real_is_complete (SavedSearchDialogSearchRow* base) +{ SavedSearchDialogSearchRowRating * self; gboolean result = FALSE; #line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4847,11 +5091,13 @@ static gboolean saved_search_dialog_search_row_rating_real_is_complete (SavedSea result = TRUE; #line 474 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4851 "SavedSearchDialog.c" +#line 5095 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_rating_on_changed (SavedSearchDialogSearchRowRating* self) { +static void +saved_search_dialog_search_row_rating_on_changed (SavedSearchDialogSearchRowRating* self) +{ SavedSearchDialogSearchRowContainer* _tmp0_; SavedSearchDialogSearchRowContainer* _tmp1_; #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4862,11 +5108,13 @@ static void saved_search_dialog_search_row_rating_on_changed (SavedSearchDialogS _tmp1_ = self->priv->parent; #line 478 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_); -#line 4866 "SavedSearchDialog.c" +#line 5112 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_rating_class_init (SavedSearchDialogSearchRowRatingClass * klass) { +static void +saved_search_dialog_search_row_rating_class_init (SavedSearchDialogSearchRowRatingClass * klass) +{ #line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_rating_parent_class = g_type_class_peek_parent (klass); #line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4881,18 +5129,22 @@ static void saved_search_dialog_search_row_rating_class_init (SavedSearchDialogS ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_rating_real_populate; #line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_rating_real_is_complete; -#line 4885 "SavedSearchDialog.c" +#line 5133 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_rating_instance_init (SavedSearchDialogSearchRowRating * self) { +static void +saved_search_dialog_search_row_rating_instance_init (SavedSearchDialogSearchRowRating * self) +{ #line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_RATING_GET_PRIVATE (self); -#line 4892 "SavedSearchDialog.c" +#line 5142 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSearchRow * obj) { +static void +saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSearchRow * obj) +{ SavedSearchDialogSearchRowRating * self; GtkComboBoxText* _tmp0_; guint _tmp1_; @@ -4922,11 +5174,13 @@ static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSea _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_rating_parent_class)->finalize (obj); -#line 4926 "SavedSearchDialog.c" +#line 5178 "SavedSearchDialog.c" } -static GType saved_search_dialog_search_row_rating_get_type (void) { +static GType +saved_search_dialog_search_row_rating_get_type (void) +{ static volatile gsize saved_search_dialog_search_row_rating_type_id__volatile = 0; if (g_once_init_enter (&saved_search_dialog_search_row_rating_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDialogSearchRowRatingClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_dialog_search_row_rating_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDialogSearchRowRating), 0, (GInstanceInitFunc) saved_search_dialog_search_row_rating_instance_init, NULL }; @@ -4938,31 +5192,43 @@ static GType saved_search_dialog_search_row_rating_get_type (void) { } -static void _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void +_saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self) +{ #line 528 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_on_changed ((SavedSearchDialogSearchRowDate*) self); -#line 4945 "SavedSearchDialog.c" +#line 5202 "SavedSearchDialog.c" } -static void _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 511 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_on_one_clicked ((SavedSearchDialogSearchRowDate*) self); -#line 4952 "SavedSearchDialog.c" +#line 5212 "SavedSearchDialog.c" } -static void _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { +static void +_saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_on_two_clicked ((SavedSearchDialogSearchRowDate*) self); -#line 4959 "SavedSearchDialog.c" +#line 5222 "SavedSearchDialog.c" } -static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) { +static SavedSearchDialogSearchRowDate* +saved_search_dialog_search_row_date_construct (GType object_type, + SavedSearchDialogSearchRowContainer* parent) +{ SavedSearchDialogSearchRowDate* self = NULL; SavedSearchDialogSearchRowContainer* _tmp0_; - SavedSearchDialogSearchRowContainer* _tmp1_; + GtkComboBoxText* _tmp1_; GtkComboBoxText* _tmp2_; GtkComboBoxText* _tmp3_; GtkComboBoxText* _tmp4_; @@ -4970,294 +5236,294 @@ static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_const GtkComboBoxText* _tmp6_; GtkComboBoxText* _tmp7_; GtkComboBoxText* _tmp8_; - GtkComboBoxText* _tmp9_; + GtkCalendar* _tmp9_; GtkCalendar* _tmp10_; - GtkCalendar* _tmp11_; + GtkButton* _tmp11_; GtkButton* _tmp12_; GtkButton* _tmp13_; GtkButton* _tmp14_; - GtkButton* _tmp15_; - GtkLabel* _tmp16_; + GtkLabel* _tmp15_; + GtkBox* _tmp16_; GtkBox* _tmp17_; - GtkBox* _tmp18_; - GtkComboBoxText* _tmp19_; - GtkBox* _tmp20_; - GtkButton* _tmp21_; - GtkBox* _tmp22_; - GtkLabel* _tmp23_; - GtkBox* _tmp24_; - GtkButton* _tmp25_; - GtkBox* _tmp26_; + GtkComboBoxText* _tmp18_; + GtkBox* _tmp19_; + GtkButton* _tmp20_; + GtkBox* _tmp21_; + GtkLabel* _tmp22_; + GtkBox* _tmp23_; + GtkButton* _tmp24_; + GtkBox* _tmp25_; #line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL); #line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = (SavedSearchDialogSearchRowDate*) saved_search_dialog_search_row_construct (object_type); #line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = parent; -#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_); + _tmp0_ = _saved_search_dialog_search_row_container_ref0 (parent); #line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->parent = _tmp1_; + self->priv->parent = _tmp0_; #line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new (); + _tmp1_ = (GtkComboBoxText*) gtk_combo_box_text_new (); #line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp2_); + g_object_ref_sink (_tmp1_); #line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->context); #line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->context = _tmp2_; + self->priv->context = _tmp1_; #line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = self->priv->context; + _tmp2_ = self->priv->context; #line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp3_, _ ("is exactly")); + gtk_combo_box_text_append_text (_tmp2_, _ ("is exactly")); #line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = self->priv->context; + _tmp3_ = self->priv->context; #line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp4_, _ ("is after")); + gtk_combo_box_text_append_text (_tmp3_, _ ("is after")); #line 501 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->context; + _tmp4_ = self->priv->context; #line 501 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp5_, _ ("is before")); + gtk_combo_box_text_append_text (_tmp4_, _ ("is before")); #line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = self->priv->context; + _tmp5_ = self->priv->context; #line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp6_, _ ("is between")); + gtk_combo_box_text_append_text (_tmp5_, _ ("is between")); #line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = self->priv->context; + _tmp6_ = self->priv->context; #line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp7_, _ ("is not set")); + gtk_combo_box_text_append_text (_tmp6_, _ ("is not set")); #line 504 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = self->priv->context; + _tmp7_ = self->priv->context; #line 504 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), 0); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = self->priv->context; + _tmp8_ = self->priv->context; #line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed, self); #line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = (GtkCalendar*) gtk_calendar_new (); + _tmp9_ = (GtkCalendar*) gtk_calendar_new (); #line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp10_); + g_object_ref_sink (_tmp9_); #line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->cal_one); #line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->cal_one = _tmp10_; + self->priv->cal_one = _tmp9_; #line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = (GtkCalendar*) gtk_calendar_new (); + _tmp10_ = (GtkCalendar*) gtk_calendar_new (); #line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp11_); + g_object_ref_sink (_tmp10_); #line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->cal_two); #line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->cal_two = _tmp11_; + self->priv->cal_two = _tmp10_; #line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = (GtkButton*) gtk_button_new (); + _tmp11_ = (GtkButton*) gtk_button_new (); #line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp12_); + g_object_ref_sink (_tmp11_); #line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->label_one); #line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->label_one = _tmp12_; + self->priv->label_one = _tmp11_; #line 511 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = self->priv->label_one; + _tmp12_ = self->priv->label_one; #line 511 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (_tmp13_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked, self); + g_signal_connect (_tmp12_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked, self); #line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = (GtkButton*) gtk_button_new (); + _tmp13_ = (GtkButton*) gtk_button_new (); #line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp14_); + g_object_ref_sink (_tmp13_); #line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->label_two); #line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->label_two = _tmp14_; + self->priv->label_two = _tmp13_; #line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = self->priv->label_two; + _tmp14_ = self->priv->label_two; #line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (_tmp15_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked, self); + g_signal_connect (_tmp14_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked, self); #line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = (GtkLabel*) gtk_label_new (_ ("and")); + _tmp15_ = (GtkLabel*) gtk_label_new (_ ("and")); #line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp16_); + g_object_ref_sink (_tmp15_); #line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->and); #line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->and = _tmp16_; + self->priv->and = _tmp15_; #line 517 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + _tmp16_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); #line 517 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp17_); + g_object_ref_sink (_tmp16_); #line 517 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); #line 517 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->box = _tmp17_; + self->priv->box = _tmp16_; #line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp18_ = self->priv->box; + _tmp17_ = self->priv->box; #line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = self->priv->context; + _tmp18_ = self->priv->context; #line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = self->priv->box; + _tmp19_ = self->priv->box; #line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = self->priv->label_one; + _tmp20_ = self->priv->label_one; #line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 520 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = self->priv->box; + _tmp21_ = self->priv->box; #line 520 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp23_ = self->priv->and; + _tmp22_ = self->priv->and; #line 520 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 521 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp24_ = self->priv->box; + _tmp23_ = self->priv->box; #line 521 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp25_ = self->priv->label_two; + _tmp24_ = self->priv->label_two; #line 521 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp26_ = self->priv->box; + _tmp25_ = self->priv->box; #line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget)); #line 524 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_update_date_labels (self); #line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 5128 "SavedSearchDialog.c" +#line 5391 "SavedSearchDialog.c" } -static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_new (SavedSearchDialogSearchRowContainer* parent) { +static SavedSearchDialogSearchRowDate* +saved_search_dialog_search_row_date_new (SavedSearchDialogSearchRowContainer* parent) +{ #line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_date_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, parent); -#line 5135 "SavedSearchDialog.c" +#line 5400 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchDialogSearchRowDate* self) { +static void +saved_search_dialog_search_row_date_update_date_labels (SavedSearchDialogSearchRowDate* self) +{ SearchConditionDateContext c = 0; GtkComboBoxText* _tmp0_; - gint _tmp1_; - SearchConditionDateContext _tmp2_; - GtkButton* _tmp13_; + SearchConditionDateContext _tmp1_; + GtkButton* _tmp12_; + GDateTime* _tmp13_; GDateTime* _tmp14_; - GDateTime* _tmp15_; + gchar* _tmp15_; gchar* _tmp16_; - gchar* _tmp17_; - GtkButton* _tmp18_; + GtkButton* _tmp17_; + GDateTime* _tmp18_; GDateTime* _tmp19_; - GDateTime* _tmp20_; + gchar* _tmp20_; gchar* _tmp21_; - gchar* _tmp22_; #line 531 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self)); #line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->context; #line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox)); -#line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - c = (SearchConditionDateContext) _tmp1_; + c = (SearchConditionDateContext) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox)); #line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = c; + _tmp1_ = c; #line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (_tmp2_ == SEARCH_CONDITION_DATE_CONTEXT_BETWEEN) { -#line 5166 "SavedSearchDialog.c" - GtkButton* _tmp3_; - GtkLabel* _tmp4_; - GtkButton* _tmp5_; + if (_tmp1_ == SEARCH_CONDITION_DATE_CONTEXT_BETWEEN) { +#line 5430 "SavedSearchDialog.c" + GtkButton* _tmp2_; + GtkLabel* _tmp3_; + GtkButton* _tmp4_; #line 536 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = self->priv->label_one; + _tmp2_ = self->priv->label_one; #line 536 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); #line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = self->priv->and; + _tmp3_ = self->priv->and; #line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); #line 538 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->label_two; + _tmp4_ = self->priv->label_two; #line 538 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget)); -#line 5182 "SavedSearchDialog.c" + gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); +#line 5446 "SavedSearchDialog.c" } else { - SearchConditionDateContext _tmp6_; + SearchConditionDateContext _tmp5_; #line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = c; + _tmp5_ = c; #line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (_tmp6_ == SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET) { -#line 5189 "SavedSearchDialog.c" - GtkButton* _tmp7_; - GtkLabel* _tmp8_; - GtkButton* _tmp9_; + if (_tmp5_ == SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET) { +#line 5453 "SavedSearchDialog.c" + GtkButton* _tmp6_; + GtkLabel* _tmp7_; + GtkButton* _tmp8_; #line 540 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = self->priv->label_one; + _tmp6_ = self->priv->label_one; #line 540 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); #line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = self->priv->and; + _tmp7_ = self->priv->and; #line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget)); #line 542 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = self->priv->label_two; + _tmp8_ = self->priv->label_two; #line 542 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); -#line 5205 "SavedSearchDialog.c" + gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget)); +#line 5469 "SavedSearchDialog.c" } else { - GtkButton* _tmp10_; - GtkLabel* _tmp11_; - GtkButton* _tmp12_; + GtkButton* _tmp9_; + GtkLabel* _tmp10_; + GtkButton* _tmp11_; #line 544 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = self->priv->label_one; + _tmp9_ = self->priv->label_one; #line 544 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); #line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = self->priv->and; + _tmp10_ = self->priv->and; #line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget)); #line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = self->priv->label_two; + _tmp11_ = self->priv->label_two; #line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget)); -#line 5222 "SavedSearchDialog.c" + gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget)); +#line 5486 "SavedSearchDialog.c" } } #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = self->priv->label_one; + _tmp12_ = self->priv->label_one; #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = saved_search_dialog_search_row_date_get_date_one (self); + _tmp13_ = saved_search_dialog_search_row_date_get_date_one (self); #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = g_date_time_format (_tmp15_, SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DATE_FORMAT); + _tmp15_ = g_date_time_format (_tmp14_, SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DATE_FORMAT); #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_button_set_label (_tmp13_, _tmp17_); + gtk_button_set_label (_tmp12_, _tmp16_); #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp16_); #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_date_time_unref0 (_tmp15_); + _g_date_time_unref0 (_tmp14_); #line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp18_ = self->priv->label_two; + _tmp17_ = self->priv->label_two; #line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = saved_search_dialog_search_row_date_get_date_two (self); + _tmp18_ = saved_search_dialog_search_row_date_get_date_two (self); #line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = g_date_time_format (_tmp20_, SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DATE_FORMAT); + _tmp20_ = g_date_time_format (_tmp19_, SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DATE_FORMAT); #line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_button_set_label (_tmp18_, _tmp22_); + gtk_button_set_label (_tmp17_, _tmp21_); #line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp21_); #line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_date_time_unref0 (_tmp20_); -#line 5257 "SavedSearchDialog.c" + _g_date_time_unref0 (_tmp19_); +#line 5521 "SavedSearchDialog.c" } -static GtkWidget* saved_search_dialog_search_row_date_real_get_widget (SavedSearchDialogSearchRow* base) { +static GtkWidget* +saved_search_dialog_search_row_date_real_get_widget (SavedSearchDialogSearchRow* base) +{ SavedSearchDialogSearchRowDate * self; GtkWidget* result = NULL; GtkBox* _tmp0_; @@ -5272,11 +5538,13 @@ static GtkWidget* saved_search_dialog_search_row_date_real_get_widget (SavedSear result = _tmp1_; #line 555 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5276 "SavedSearchDialog.c" +#line 5542 "SavedSearchDialog.c" } -static GDateTime* saved_search_dialog_search_row_date_get_date_one (SavedSearchDialogSearchRowDate* self) { +static GDateTime* +saved_search_dialog_search_row_date_get_date_one (SavedSearchDialogSearchRowDate* self) +{ GDateTime* result = NULL; GtkCalendar* _tmp0_; gint _tmp1_; @@ -5314,11 +5582,13 @@ static GDateTime* saved_search_dialog_search_row_date_get_date_one (SavedSearchD result = _tmp9_; #line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5318 "SavedSearchDialog.c" +#line 5586 "SavedSearchDialog.c" } -static GDateTime* saved_search_dialog_search_row_date_get_date_two (SavedSearchDialogSearchRowDate* self) { +static GDateTime* +saved_search_dialog_search_row_date_get_date_two (SavedSearchDialogSearchRowDate* self) +{ GDateTime* result = NULL; GtkCalendar* _tmp0_; gint _tmp1_; @@ -5356,20 +5626,17 @@ static GDateTime* saved_search_dialog_search_row_date_get_date_two (SavedSearchD result = _tmp9_; #line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5360 "SavedSearchDialog.c" +#line 5630 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogSearchRowDate* self, GDateTime* date) { +static void +saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogSearchRowDate* self, + GDateTime* date) +{ GtkCalendar* _tmp0_; - GDateTime* _tmp1_; - gint _tmp2_; - GtkCalendar* _tmp3_; - GDateTime* _tmp4_; - gint _tmp5_; - GtkCalendar* _tmp6_; - GDateTime* _tmp7_; - gint _tmp8_; + GtkCalendar* _tmp1_; + GtkCalendar* _tmp2_; #line 566 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self)); #line 566 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5377,41 +5644,26 @@ static void saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogS #line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->cal_one; #line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = date; -#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = g_date_time_get_day_of_month (_tmp1_); -#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_set (_tmp0_, "day", _tmp2_, NULL); -#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = self->priv->cal_one; + g_object_set (_tmp0_, "day", g_date_time_get_day_of_month (date), NULL); #line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = date; + _tmp1_ = self->priv->cal_one; #line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = g_date_time_get_month (_tmp4_); -#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_set (_tmp3_, "month", _tmp5_ - 1, NULL); -#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = self->priv->cal_one; + g_object_set (_tmp1_, "month", g_date_time_get_month (date) - 1, NULL); #line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = date; + _tmp2_ = self->priv->cal_one; #line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = g_date_time_get_year (_tmp7_); -#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_set (_tmp6_, "year", _tmp8_, NULL); -#line 5402 "SavedSearchDialog.c" + g_object_set (_tmp2_, "year", g_date_time_get_year (date), NULL); +#line 5657 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogSearchRowDate* self, GDateTime* date) { +static void +saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogSearchRowDate* self, + GDateTime* date) +{ GtkCalendar* _tmp0_; - GDateTime* _tmp1_; - gint _tmp2_; - GtkCalendar* _tmp3_; - GDateTime* _tmp4_; - gint _tmp5_; - GtkCalendar* _tmp6_; - GDateTime* _tmp7_; - gint _tmp8_; + GtkCalendar* _tmp1_; + GtkCalendar* _tmp2_; #line 572 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self)); #line 572 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5419,140 +5671,126 @@ static void saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogS #line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->cal_two; #line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = date; -#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = g_date_time_get_day_of_month (_tmp1_); -#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_set (_tmp0_, "day", _tmp2_, NULL); -#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = self->priv->cal_two; + g_object_set (_tmp0_, "day", g_date_time_get_day_of_month (date), NULL); #line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = date; + _tmp1_ = self->priv->cal_two; #line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = g_date_time_get_month (_tmp4_); -#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_set (_tmp3_, "month", _tmp5_ - 1, NULL); -#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = self->priv->cal_two; + g_object_set (_tmp1_, "month", g_date_time_get_month (date) - 1, NULL); #line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = date; + _tmp2_ = self->priv->cal_two; #line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = g_date_time_get_year (_tmp7_); -#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_set (_tmp6_, "year", _tmp8_, NULL); -#line 5444 "SavedSearchDialog.c" + g_object_set (_tmp2_, "year", g_date_time_get_year (date), NULL); +#line 5684 "SavedSearchDialog.c" } -static SearchCondition* saved_search_dialog_search_row_date_real_get_search_condition (SavedSearchDialogSearchRow* base) { +static SearchCondition* +saved_search_dialog_search_row_date_real_get_search_condition (SavedSearchDialogSearchRow* base) +{ SavedSearchDialogSearchRowDate * self; SearchCondition* result = NULL; SearchConditionSearchType search_type = 0; SavedSearchDialogSearchRowContainer* _tmp0_; - SearchConditionSearchType _tmp1_; SearchConditionDateContext search_context = 0; - GtkComboBoxText* _tmp2_; - gint _tmp3_; + GtkComboBoxText* _tmp1_; SearchConditionDate* c = NULL; + GDateTime* _tmp2_; + GDateTime* _tmp3_; GDateTime* _tmp4_; GDateTime* _tmp5_; - GDateTime* _tmp6_; - GDateTime* _tmp7_; - SearchConditionDate* _tmp8_; - SearchConditionDate* _tmp9_; + SearchConditionDate* _tmp6_; + SearchConditionDate* _tmp7_; #line 578 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate); #line 579 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->parent; #line 579 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_); -#line 579 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - search_type = _tmp1_; -#line 580 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = self->priv->context; + search_type = saved_search_dialog_search_row_container_get_search_type (_tmp0_); #line 580 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox)); + _tmp1_ = self->priv->context; #line 580 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - search_context = (SearchConditionDateContext) _tmp3_; -#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = saved_search_dialog_search_row_date_get_date_one (self); + search_context = (SearchConditionDateContext) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = _tmp4_; + _tmp2_ = saved_search_dialog_search_row_date_get_date_one (self); #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = saved_search_dialog_search_row_date_get_date_two (self); + _tmp3_ = _tmp2_; #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = _tmp6_; + _tmp4_ = saved_search_dialog_search_row_date_get_date_two (self); #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = search_condition_date_new (search_type, search_context, _tmp5_, _tmp7_); + _tmp5_ = _tmp4_; #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = _tmp8_; + _tmp6_ = search_condition_date_new (search_type, search_context, _tmp3_, _tmp5_); #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_date_time_unref0 (_tmp7_); + _tmp7_ = _tmp6_; #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_date_time_unref0 (_tmp5_); #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - c = _tmp9_; + _g_date_time_unref0 (_tmp3_); +#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + c = _tmp7_; #line 583 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); #line 583 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5500 "SavedSearchDialog.c" +#line 5736 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_date_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) { +static void +saved_search_dialog_search_row_date_real_populate (SavedSearchDialogSearchRow* base, + SearchCondition* sc) +{ SavedSearchDialogSearchRowDate * self; SearchConditionDate* cond = NULL; - SearchCondition* _tmp0_; - SearchConditionDate* _tmp1_; - GtkComboBoxText* _tmp2_; + SearchConditionDate* _tmp0_; + GtkComboBoxText* _tmp1_; + SearchConditionDateContext _tmp2_; SearchConditionDateContext _tmp3_; - SearchConditionDateContext _tmp4_; + GDateTime* _tmp4_; GDateTime* _tmp5_; GDateTime* _tmp6_; GDateTime* _tmp7_; - GDateTime* _tmp8_; #line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate); #line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SEARCH_CONDITION (sc)); #line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = sc; -#line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_DATE) ? ((SearchConditionDate*) _tmp0_) : NULL); + _tmp0_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (sc, TYPE_SEARCH_CONDITION_DATE) ? ((SearchConditionDate*) sc) : NULL); #line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - cond = _tmp1_; + cond = _tmp0_; #line 588 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _vala_assert (cond != NULL, "cond != null"); #line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = self->priv->context; + _tmp1_ = self->priv->context; #line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = search_condition_date_get_context (cond); + _tmp2_ = search_condition_date_get_context (cond); #line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp3_); #line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = search_condition_date_get_date_one (cond); + _tmp4_ = search_condition_date_get_date_one (cond); #line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_search_row_date_set_date_one (self, _tmp6_); + saved_search_dialog_search_row_date_set_date_one (self, _tmp5_); #line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = search_condition_date_get_date_two (cond); + _tmp6_ = search_condition_date_get_date_two (cond); #line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_search_row_date_set_date_two (self, _tmp8_); + saved_search_dialog_search_row_date_set_date_two (self, _tmp7_); #line 592 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_update_date_labels (self); #line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (cond); -#line 5552 "SavedSearchDialog.c" +#line 5788 "SavedSearchDialog.c" } -static gboolean saved_search_dialog_search_row_date_real_is_complete (SavedSearchDialogSearchRow* base) { +static gboolean +saved_search_dialog_search_row_date_real_is_complete (SavedSearchDialogSearchRow* base) +{ SavedSearchDialogSearchRowDate * self; gboolean result = FALSE; #line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5561,11 +5799,13 @@ static gboolean saved_search_dialog_search_row_date_real_is_complete (SavedSearc result = TRUE; #line 596 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5565 "SavedSearchDialog.c" +#line 5803 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSearchRowDate* self) { +static void +saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSearchRowDate* self) +{ SavedSearchDialogSearchRowContainer* _tmp0_; SavedSearchDialogSearchRowContainer* _tmp1_; #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5578,25 +5818,29 @@ static void saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSea g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_); #line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_update_date_labels (self); -#line 5582 "SavedSearchDialog.c" +#line 5822 "SavedSearchDialog.c" } -static Block10Data* block10_data_ref (Block10Data* _data10_) { +static Block10Data* +block10_data_ref (Block10Data* _data10_) +{ #line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_atomic_int_inc (&_data10_->_ref_count_); #line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return _data10_; -#line 5591 "SavedSearchDialog.c" +#line 5833 "SavedSearchDialog.c" } -static void block10_data_unref (void * _userdata_) { +static void +block10_data_unref (void * _userdata_) +{ Block10Data* _data10_; _data10_ = (Block10Data*) _userdata_; #line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (g_atomic_int_dec_and_test (&_data10_->_ref_count_)) { -#line 5600 "SavedSearchDialog.c" +#line 5844 "SavedSearchDialog.c" SavedSearchDialogSearchRowDate* self; #line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = _data10_->self; @@ -5606,26 +5850,33 @@ static void block10_data_unref (void * _userdata_) { _saved_search_dialog_search_row_unref0 (self); #line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_slice_free (Block10Data, _data10_); -#line 5610 "SavedSearchDialog.c" +#line 5854 "SavedSearchDialog.c" } } -static void __lambda14_ (SavedSearchDialogSearchRowDate* self) { +static void +__lambda14_ (SavedSearchDialogSearchRowDate* self) +{ #line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_update_date_labels (self); -#line 5618 "SavedSearchDialog.c" +#line 5864 "SavedSearchDialog.c" } -static void ___lambda14__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) { +static void +___lambda14__gtk_calendar_day_selected (GtkCalendar* _sender, + gpointer self) +{ #line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" __lambda14_ ((SavedSearchDialogSearchRowDate*) self); -#line 5625 "SavedSearchDialog.c" +#line 5874 "SavedSearchDialog.c" } -static void __lambda15_ (Block10Data* _data10_) { +static void +__lambda15_ (Block10Data* _data10_) +{ SavedSearchDialogSearchRowDate* self; GtkDialog* _tmp0_; #line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5634,54 +5885,51 @@ static void __lambda15_ (Block10Data* _data10_) { _tmp0_ = _data10_->d; #line 617 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_dialog_response (_tmp0_, (gint) GTK_RESPONSE_ACCEPT); -#line 5638 "SavedSearchDialog.c" +#line 5889 "SavedSearchDialog.c" } -static void ___lambda15__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self) { +static void +___lambda15__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, + gpointer self) +{ #line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" __lambda15_ (self); -#line 5645 "SavedSearchDialog.c" +#line 5899 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialogSearchRowDate* self, GtkCalendar* cal) { +static void +saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialogSearchRowDate* self, + GtkCalendar* cal) +{ Block10Data* _data10_; gint orig_day = 0; - GtkCalendar* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; gint orig_month = 0; - GtkCalendar* _tmp3_; + gint _tmp2_; + gint _tmp3_; + gint orig_year = 0; gint _tmp4_; gint _tmp5_; - gint orig_year = 0; - GtkCalendar* _tmp6_; - gint _tmp7_; - gint _tmp8_; + GtkDialog* _tmp6_; + GtkDialog* _tmp7_; + GtkDialog* _tmp8_; GtkDialog* _tmp9_; GtkDialog* _tmp10_; - GtkDialog* _tmp11_; - GtkDialog* _tmp12_; - GtkDialog* _tmp13_; - GtkBox* _tmp14_; - GtkCalendar* _tmp15_; + GtkBox* _tmp11_; gulong id_1 = 0UL; - GtkCalendar* _tmp16_; - gulong _tmp17_; + gulong _tmp12_; gulong id_2 = 0UL; - GtkCalendar* _tmp18_; - gulong _tmp19_; - GtkDialog* _tmp20_; + gulong _tmp13_; + GtkDialog* _tmp14_; gint res = 0; - GtkDialog* _tmp21_; - gint _tmp22_; - gint _tmp23_; - GtkCalendar* _tmp30_; - gulong _tmp31_; - GtkCalendar* _tmp32_; - gulong _tmp33_; - GtkDialog* _tmp34_; + GtkDialog* _tmp15_; + gint _tmp16_; + gulong _tmp20_; + gulong _tmp21_; + GtkDialog* _tmp22_; #line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self)); #line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5693,135 +5941,110 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo #line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _data10_->self = saved_search_dialog_search_row_ref (self); #line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = cal; -#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_get (_tmp0_, "day", &_tmp1_, NULL); + g_object_get (cal, "day", &_tmp0_, NULL); #line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - orig_day = _tmp2_; -#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = cal; + orig_day = _tmp1_; #line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_get (_tmp3_, "month", &_tmp4_, NULL); + g_object_get (cal, "month", &_tmp2_, NULL); #line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - orig_month = _tmp5_; + orig_month = _tmp3_; #line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = cal; + g_object_get (cal, "year", &_tmp4_, NULL); #line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_get (_tmp6_, "year", &_tmp7_, NULL); -#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = _tmp7_; + _tmp5_ = _tmp4_; #line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - orig_year = _tmp8_; + orig_year = _tmp5_; #line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = (GtkDialog*) gtk_dialog_new_with_buttons (NULL, NULL, GTK_DIALOG_MODAL, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_REJECT, RESOURCES_OK_LABEL, GTK_RESPONSE_ACCEPT, NULL); + _tmp6_ = (GtkDialog*) gtk_dialog_new_with_buttons (NULL, NULL, GTK_DIALOG_MODAL, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_REJECT, RESOURCES_OK_LABEL, GTK_RESPONSE_ACCEPT, NULL); #line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp9_); + g_object_ref_sink (_tmp6_); #line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _data10_->d = _tmp9_; + _data10_->d = _tmp6_; #line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = _data10_->d; + _tmp7_ = _data10_->d; #line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow), TRUE); + gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_window_get_type (), GtkWindow), TRUE); #line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = _data10_->d; + _tmp8_ = _data10_->d; #line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow), FALSE); + gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), FALSE); #line 613 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = _data10_->d; + _tmp9_ = _data10_->d; #line 613 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_window_set_decorated (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow), FALSE); -#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = _data10_->d; + gtk_window_set_decorated (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow), FALSE); #line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = (GtkBox*) gtk_dialog_get_content_area (_tmp13_); + _tmp10_ = _data10_->d; #line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = cal; + _tmp11_ = gtk_dialog_get_content_area (_tmp10_); #line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget)); -#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = cal; + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (cal, gtk_widget_get_type (), GtkWidget)); #line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = g_signal_connect (_tmp16_, "day-selected", (GCallback) ___lambda14__gtk_calendar_day_selected, self); + _tmp12_ = g_signal_connect (cal, "day-selected", (GCallback) ___lambda14__gtk_calendar_day_selected, self); #line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - id_1 = _tmp17_; -#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp18_ = cal; + id_1 = _tmp12_; #line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = g_signal_connect_data (_tmp18_, "day-selected-double-click", (GCallback) ___lambda15__gtk_calendar_day_selected_double_click, block10_data_ref (_data10_), (GClosureNotify) block10_data_unref, 0); + _tmp13_ = g_signal_connect_data (cal, "day-selected-double-click", (GCallback) ___lambda15__gtk_calendar_day_selected_double_click, block10_data_ref (_data10_), (GClosureNotify) block10_data_unref, 0); #line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - id_2 = _tmp19_; + id_2 = _tmp13_; #line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = _data10_->d; + _tmp14_ = _data10_->d; #line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget)); -#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = _data10_->d; + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget)); #line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = gtk_dialog_run (_tmp21_); + _tmp15_ = _data10_->d; #line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - res = _tmp22_; + res = gtk_dialog_run (_tmp15_); #line 621 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp23_ = res; + _tmp16_ = res; #line 621 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (_tmp23_ != ((gint) GTK_RESPONSE_ACCEPT)) { -#line 5772 "SavedSearchDialog.c" - GtkCalendar* _tmp24_; - gint _tmp25_; - GtkCalendar* _tmp26_; - gint _tmp27_; - GtkCalendar* _tmp28_; - gint _tmp29_; -#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp24_ = cal; + if (_tmp16_ != ((gint) GTK_RESPONSE_ACCEPT)) { +#line 6006 "SavedSearchDialog.c" + gint _tmp17_; + gint _tmp18_; + gint _tmp19_; #line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp25_ = orig_day; + _tmp17_ = orig_day; #line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_set (_tmp24_, "day", _tmp25_, NULL); + g_object_set (cal, "day", _tmp17_, NULL); #line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp26_ = cal; + _tmp18_ = orig_month; #line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp27_ = orig_month; -#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_set (_tmp26_, "month", _tmp27_, NULL); -#line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp28_ = cal; + g_object_set (cal, "month", _tmp18_, NULL); #line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp29_ = orig_year; + _tmp19_ = orig_year; #line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_set (_tmp28_, "year", _tmp29_, NULL); -#line 5797 "SavedSearchDialog.c" + g_object_set (cal, "year", _tmp19_, NULL); +#line 6022 "SavedSearchDialog.c" } #line 627 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp30_ = cal; -#line 627 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp31_ = id_1; + _tmp20_ = id_1; #line 627 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, G_TYPE_OBJECT, GObject), _tmp31_); + g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (cal, G_TYPE_OBJECT, GObject), _tmp20_); #line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp32_ = cal; + _tmp21_ = id_2; #line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp33_ = id_2; -#line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, G_TYPE_OBJECT, GObject), _tmp33_); + g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (cal, G_TYPE_OBJECT, GObject), _tmp21_); #line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp34_ = _data10_->d; + _tmp22_ = _data10_->d; #line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget)); #line 630 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_update_date_labels (self); #line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" block10_data_unref (_data10_); #line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _data10_ = NULL; -#line 5821 "SavedSearchDialog.c" +#line 6042 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_date_on_one_clicked (SavedSearchDialogSearchRowDate* self) { +static void +saved_search_dialog_search_row_date_on_one_clicked (SavedSearchDialogSearchRowDate* self) +{ GtkCalendar* _tmp0_; #line 633 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self)); @@ -5829,11 +6052,13 @@ static void saved_search_dialog_search_row_date_on_one_clicked (SavedSearchDialo _tmp0_ = self->priv->cal_one; #line 634 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_popup_calendar (self, _tmp0_); -#line 5833 "SavedSearchDialog.c" +#line 6056 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_date_on_two_clicked (SavedSearchDialogSearchRowDate* self) { +static void +saved_search_dialog_search_row_date_on_two_clicked (SavedSearchDialogSearchRowDate* self) +{ GtkCalendar* _tmp0_; #line 637 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self)); @@ -5841,11 +6066,13 @@ static void saved_search_dialog_search_row_date_on_two_clicked (SavedSearchDialo _tmp0_ = self->priv->cal_two; #line 638 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_popup_calendar (self, _tmp0_); -#line 5845 "SavedSearchDialog.c" +#line 6070 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_date_class_init (SavedSearchDialogSearchRowDateClass * klass) { +static void +saved_search_dialog_search_row_date_class_init (SavedSearchDialogSearchRowDateClass * klass) +{ #line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_parent_class = g_type_class_peek_parent (klass); #line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5860,18 +6087,22 @@ static void saved_search_dialog_search_row_date_class_init (SavedSearchDialogSea ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_date_real_populate; #line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_date_real_is_complete; -#line 5864 "SavedSearchDialog.c" +#line 6091 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_date_instance_init (SavedSearchDialogSearchRowDate * self) { +static void +saved_search_dialog_search_row_date_instance_init (SavedSearchDialogSearchRowDate * self) +{ #line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_GET_PRIVATE (self); -#line 5871 "SavedSearchDialog.c" +#line 6100 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow * obj) { +static void +saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow * obj) +{ SavedSearchDialogSearchRowDate * self; GtkComboBoxText* _tmp0_; guint _tmp1_; @@ -5901,11 +6132,13 @@ static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearc _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_date_parent_class)->finalize (obj); -#line 5905 "SavedSearchDialog.c" +#line 6136 "SavedSearchDialog.c" } -static GType saved_search_dialog_search_row_date_get_type (void) { +static GType +saved_search_dialog_search_row_date_get_type (void) +{ static volatile gsize saved_search_dialog_search_row_date_type_id__volatile = 0; if (g_once_init_enter (&saved_search_dialog_search_row_date_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDialogSearchRowDateClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_dialog_search_row_date_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDialogSearchRowDate), 0, (GInstanceInitFunc) saved_search_dialog_search_row_date_instance_init, NULL }; @@ -5917,7 +6150,9 @@ static GType saved_search_dialog_search_row_date_get_type (void) { } -static void saved_search_dialog_class_init (SavedSearchDialogClass * klass) { +static void +saved_search_dialog_class_init (SavedSearchDialogClass * klass) +{ gint SavedSearchDialog_private_offset; #line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_parent_class = g_type_class_peek_parent (klass); @@ -5937,11 +6172,13 @@ static void saved_search_dialog_class_init (SavedSearchDialogClass * klass) { gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "search_title", FALSE, SavedSearchDialog_private_offset + G_STRUCT_OFFSET (SavedSearchDialogPrivate, search_title)); #line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "row_listbox", FALSE, SavedSearchDialog_private_offset + G_STRUCT_OFFSET (SavedSearchDialogPrivate, row_listbox)); -#line 5941 "SavedSearchDialog.c" +#line 6176 "SavedSearchDialog.c" } -static void saved_search_dialog_instance_init (SavedSearchDialog * self) { +static void +saved_search_dialog_instance_init (SavedSearchDialog * self) +{ GeeArrayList* _tmp0_; #line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_GET_PRIVATE (self); @@ -5957,11 +6194,13 @@ static void saved_search_dialog_instance_init (SavedSearchDialog * self) { self->priv->valid = FALSE; #line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 5961 "SavedSearchDialog.c" +#line 6198 "SavedSearchDialog.c" } -static void saved_search_dialog_finalize (GObject * obj) { +static void +saved_search_dialog_finalize (GObject * obj) +{ SavedSearchDialog * self; #line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_DIALOG, SavedSearchDialog); @@ -5979,11 +6218,13 @@ static void saved_search_dialog_finalize (GObject * obj) { _g_object_unref0 (self->priv->previous_search); #line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" G_OBJECT_CLASS (saved_search_dialog_parent_class)->finalize (obj); -#line 5983 "SavedSearchDialog.c" +#line 6222 "SavedSearchDialog.c" } -GType saved_search_dialog_get_type (void) { +GType +saved_search_dialog_get_type (void) +{ static volatile gsize saved_search_dialog_type_id__volatile = 0; if (g_once_init_enter (&saved_search_dialog_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDialog), 0, (GInstanceInitFunc) saved_search_dialog_instance_init, NULL }; diff --git a/src/searches/SavedSearchPage.c b/src/searches/SavedSearchPage.c index 57c205f..e7eda88 100644 --- a/src/searches/SavedSearchPage.c +++ b/src/searches/SavedSearchPage.c @@ -1,4 +1,4 @@ -/* SavedSearchPage.c generated by valac 0.36.6, the Vala compiler +/* SavedSearchPage.c generated by valac 0.40.4, the Vala compiler * generated from SavedSearchPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -8,6 +8,7 @@ */ /* Source monitoring for saved searches.*/ + #include #include #include @@ -265,6 +266,11 @@ typedef struct _MediaPagePrivate MediaPagePrivate; #define TYPE_RAW_DEVELOPER (raw_developer_get_type ()) typedef struct _CollectionPagePrivate CollectionPagePrivate; typedef struct _SavedSearchPagePrivate SavedSearchPagePrivate; +enum { + SAVED_SEARCH_PAGE_0_PROPERTY, + SAVED_SEARCH_PAGE_NUM_PROPERTIES +}; +static GParamSpec* saved_search_page_properties[SAVED_SEARCH_PAGE_NUM_PROPERTIES]; #define _g_free0(var) (var = (g_free (var), NULL)) #define TYPE_DATA_COLLECTION (data_collection_get_type ()) @@ -661,9 +667,15 @@ static gpointer saved_search_page_parent_class = NULL; gpointer view_manager_ref (gpointer instance); void view_manager_unref (gpointer instance); -GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_manager (GValue* value, gpointer v_object); -void value_take_view_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_manager (GValue* value, + gpointer v_object); +void value_take_view_manager (GValue* value, + gpointer v_object); gpointer value_get_view_manager (const GValue* value); GType view_manager_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; @@ -673,30 +685,39 @@ GType collection_view_manager_get_type (void) G_GNUC_CONST; GType saved_search_manager_get_type (void) G_GNUC_CONST; GType saved_search_get_type (void) G_GNUC_CONST; #define SAVED_SEARCH_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SAVED_SEARCH_MANAGER, SavedSearchManagerPrivate)) -enum { - SAVED_SEARCH_MANAGER_DUMMY_PROPERTY -}; GType page_get_type (void) G_GNUC_CONST; GType checkerboard_page_get_type (void) G_GNUC_CONST; GType media_page_get_type (void) G_GNUC_CONST; GType collection_page_get_type (void) G_GNUC_CONST; GType saved_search_page_get_type (void) G_GNUC_CONST; -SavedSearchManager* saved_search_manager_new (SavedSearchPage* owner, SavedSearch* search); -SavedSearchManager* saved_search_manager_construct (GType object_type, SavedSearchPage* owner, SavedSearch* search); +SavedSearchManager* saved_search_manager_new (SavedSearchPage* owner, + SavedSearch* search); +SavedSearchManager* saved_search_manager_construct (GType object_type, + SavedSearchPage* owner, + SavedSearch* search); CollectionViewManager* collection_view_manager_new (CollectionPage* page); -CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page); -static gboolean saved_search_manager_real_include_in_view (ViewManager* base, DataSource* source); +CollectionViewManager* collection_view_manager_construct (GType object_type, + CollectionPage* page); +static gboolean saved_search_manager_real_include_in_view (ViewManager* base, + DataSource* source); GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; -gboolean saved_search_predicate (SavedSearch* self, MediaSource* source); +gboolean saved_search_predicate (SavedSearch* self, + MediaSource* source); static void saved_search_manager_finalize (ViewManager * obj); GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType thumbnail_view_get_type (void) G_GNUC_CONST; @@ -707,41 +728,64 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self); gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType search_view_filter_get_type (void) G_GNUC_CONST; gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; GType rating_get_type (void) G_GNUC_CONST; GType raw_developer_get_type (void) G_GNUC_CONST; #define SAVED_SEARCH_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SAVED_SEARCH_PAGE, SavedSearchPagePrivate)) -enum { - SAVED_SEARCH_PAGE_DUMMY_PROPERTY -}; static void saved_search_page_on_rename_search (SavedSearchPage* self); -static void _saved_search_page_on_rename_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _saved_search_page_on_rename_search_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void saved_search_page_on_edit_search (SavedSearchPage* self); -static void _saved_search_page_on_edit_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _saved_search_page_on_edit_search_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void saved_search_page_on_delete_search (SavedSearchPage* self); -static void _saved_search_page_on_delete_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _saved_search_page_on_delete_search_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); SavedSearchPage* saved_search_page_new (SavedSearch* search); -SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* search); +SavedSearchPage* saved_search_page_construct (GType object_type, + SavedSearch* search); gchar* data_object_get_name (DataObject* self); -CollectionPage* collection_page_construct (GType object_type, const gchar* page_name); +CollectionPage* collection_page_construct (GType object_type, + const gchar* page_name); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -749,9 +793,15 @@ GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); @@ -760,111 +810,164 @@ GType view_collection_get_type (void) G_GNUC_CONST; ViewCollection* page_get_view (Page* self); gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer view_collection_monitor_ref (gpointer instance); void view_collection_monitor_unref (gpointer instance); -GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void view_collection_value_set_monitor (GValue* value, gpointer v_object); -void view_collection_value_take_monitor (GValue* value, gpointer v_object); +GParamSpec* view_collection_param_spec_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void view_collection_value_set_monitor (GValue* value, + gpointer v_object); +void view_collection_value_take_monitor (GValue* value, + gpointer v_object); gpointer view_collection_value_get_monitor (const GValue* value); GType view_collection_monitor_get_type (void) G_GNUC_CONST; -ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target); -void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path); -static void saved_search_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by); +ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq, + GeeCollection* initial, + ProgressMonitor progress_monitor, + void* progress_monitor_target); +void checkerboard_page_init_page_context_menu (CheckerboardPage* self, + const gchar* path); +static void saved_search_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); -void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by); -static void saved_search_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by); -void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by); -static void saved_search_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); -void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static void saved_search_page_real_add_actions (Page* base, GActionMap* map); -void page_add_actions (Page* self, GActionMap* map); -static void saved_search_page_real_remove_actions (Page* base, GActionMap* map); -void page_remove_actions (Page* self, GActionMap* map); +void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, + gboolean* sort_order, + gint* sort_by); +static void saved_search_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by); +void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, + gboolean sort_order, + gint sort_by); +static void saved_search_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames); +void page_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames); +static void saved_search_page_real_add_actions (Page* base, + GActionMap* map); +void page_add_actions (Page* self, + GActionMap* map); +static void saved_search_page_real_remove_actions (Page* base, + GActionMap* map); +void page_remove_actions (Page* self, + GActionMap* map); gboolean dialogs_confirm_delete_saved_search (SavedSearch* search); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* app_window_get_command_manager (void); GType command_get_type (void) G_GNUC_CONST; -void command_manager_execute (CommandManager* self, Command* command); +void command_manager_execute (CommandManager* self, + Command* command); DeleteSavedSearchCommand* delete_saved_search_command_new (SavedSearch* search); -DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_type, SavedSearch* search); +DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_type, + SavedSearch* search); GType page_command_get_type (void) G_GNUC_CONST; GType single_data_source_command_get_type (void) G_GNUC_CONST; GType delete_saved_search_command_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; GType library_window_get_type (void) G_GNUC_CONST; LibraryWindow* library_window_get_app (void); -void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch* search); +void library_window_rename_search_in_sidebar (LibraryWindow* self, + SavedSearch* search); GType saved_search_dialog_get_type (void) G_GNUC_CONST; SavedSearchDialog* saved_search_dialog_new_edit_existing (SavedSearch* saved_search); -SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_type, SavedSearch* saved_search); +SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_type, + SavedSearch* saved_search); void saved_search_dialog_show (SavedSearchDialog* self); -static void saved_search_page_real_update_actions (Page* base, gint selected_count, gint count); -void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); -void page_update_actions (Page* self, gint selected_count, gint count); +static void saved_search_page_real_update_actions (Page* base, + gint selected_count, + gint count); +void page_set_action_sensitive (Page* self, + const gchar* name, + gboolean sensitive); +void page_update_actions (Page* self, + gint selected_count, + gint count); static void saved_search_page_finalize (GObject * obj); static const GActionEntry SAVED_SEARCH_PAGE_entries[3] = {{"RenameSearch", _saved_search_page_on_rename_search_gsimple_action_activate_callback}, {"EditSearch", _saved_search_page_on_edit_search_gsimple_action_activate_callback}, {"DeleteSearch", _saved_search_page_on_delete_search_gsimple_action_activate_callback}}; -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" return self ? g_object_ref (self) : NULL; -#line 825 "SavedSearchPage.c" +#line 926 "SavedSearchPage.c" } -SavedSearchManager* saved_search_manager_construct (GType object_type, SavedSearchPage* owner, SavedSearch* search) { +SavedSearchManager* +saved_search_manager_construct (GType object_type, + SavedSearchPage* owner, + SavedSearch* search) +{ SavedSearchManager* self = NULL; - SavedSearchPage* _tmp0_; - SavedSearch* _tmp1_; - SavedSearch* _tmp2_; + SavedSearch* _tmp0_; #line 10 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" g_return_val_if_fail (IS_SAVED_SEARCH_PAGE (owner), NULL); #line 10 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL); #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp0_ = owner; -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - self = (SavedSearchManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage)); -#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp1_ = search; + self = (SavedSearchManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, TYPE_COLLECTION_PAGE, CollectionPage)); #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp0_ = _g_object_ref0 (search); #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" _g_object_unref0 (self->priv->search); #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - self->priv->search = _tmp2_; + self->priv->search = _tmp0_; #line 10 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" return self; -#line 852 "SavedSearchPage.c" +#line 951 "SavedSearchPage.c" } -SavedSearchManager* saved_search_manager_new (SavedSearchPage* owner, SavedSearch* search) { +SavedSearchManager* +saved_search_manager_new (SavedSearchPage* owner, + SavedSearch* search) +{ #line 10 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" return saved_search_manager_construct (TYPE_SAVED_SEARCH_MANAGER, owner, search); -#line 859 "SavedSearchPage.c" +#line 961 "SavedSearchPage.c" } -static gboolean saved_search_manager_real_include_in_view (ViewManager* base, DataSource* source) { +static gboolean +saved_search_manager_real_include_in_view (ViewManager* base, + DataSource* source) +{ SavedSearchManager * self; gboolean result = FALSE; SavedSearch* _tmp0_; - DataSource* _tmp1_; - gboolean _tmp2_; #line 15 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_MANAGER, SavedSearchManager); #line 15 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -872,18 +975,16 @@ static gboolean saved_search_manager_real_include_in_view (ViewManager* base, Da #line 16 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" _tmp0_ = self->priv->search; #line 16 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp1_ = source; -#line 16 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp2_ = saved_search_predicate (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 16 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - result = _tmp2_; + result = saved_search_predicate (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource)); #line 16 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" return result; -#line 883 "SavedSearchPage.c" +#line 982 "SavedSearchPage.c" } -static void saved_search_manager_class_init (SavedSearchManagerClass * klass) { +static void +saved_search_manager_class_init (SavedSearchManagerClass * klass) +{ #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" saved_search_manager_parent_class = g_type_class_peek_parent (klass); #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -892,18 +993,22 @@ static void saved_search_manager_class_init (SavedSearchManagerClass * klass) { g_type_class_add_private (klass, sizeof (SavedSearchManagerPrivate)); #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) saved_search_manager_real_include_in_view; -#line 896 "SavedSearchPage.c" +#line 997 "SavedSearchPage.c" } -static void saved_search_manager_instance_init (SavedSearchManager * self) { +static void +saved_search_manager_instance_init (SavedSearchManager * self) +{ #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" self->priv = SAVED_SEARCH_MANAGER_GET_PRIVATE (self); -#line 903 "SavedSearchPage.c" +#line 1006 "SavedSearchPage.c" } -static void saved_search_manager_finalize (ViewManager * obj) { +static void +saved_search_manager_finalize (ViewManager * obj) +{ SavedSearchManager * self; #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_MANAGER, SavedSearchManager); @@ -911,11 +1016,13 @@ static void saved_search_manager_finalize (ViewManager * obj) { _g_object_unref0 (self->priv->search); #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" VIEW_MANAGER_CLASS (saved_search_manager_parent_class)->finalize (obj); -#line 915 "SavedSearchPage.c" +#line 1020 "SavedSearchPage.c" } -GType saved_search_manager_get_type (void) { +GType +saved_search_manager_get_type (void) +{ static volatile gsize saved_search_manager_type_id__volatile = 0; if (g_once_init_enter (&saved_search_manager_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SavedSearchManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchManager), 0, (GInstanceInitFunc) saved_search_manager_instance_init, NULL }; @@ -927,159 +1034,168 @@ GType saved_search_manager_get_type (void) { } -static void _saved_search_page_on_rename_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_saved_search_page_on_rename_search_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" saved_search_page_on_rename_search ((SavedSearchPage*) self); -#line 934 "SavedSearchPage.c" +#line 1045 "SavedSearchPage.c" } -static void _saved_search_page_on_edit_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_saved_search_page_on_edit_search_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" saved_search_page_on_edit_search ((SavedSearchPage*) self); -#line 941 "SavedSearchPage.c" +#line 1056 "SavedSearchPage.c" } -static void _saved_search_page_on_delete_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_saved_search_page_on_delete_search_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" saved_search_page_on_delete_search ((SavedSearchPage*) self); -#line 948 "SavedSearchPage.c" +#line 1067 "SavedSearchPage.c" } -SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* search) { +SavedSearchPage* +saved_search_page_construct (GType object_type, + SavedSearch* search) +{ SavedSearchPage * self = NULL; - SavedSearch* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - SavedSearch* _tmp3_; - SavedSearch* _tmp4_; + SavedSearch* _tmp2_; #line 26 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL); #line 27 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp0_ = search; -#line 27 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (search, TYPE_DATA_OBJECT, DataObject)); #line 27 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 27 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - self = (SavedSearchPage*) collection_page_construct (object_type, _tmp2_); + self = (SavedSearchPage*) collection_page_construct (object_type, _tmp1_); #line 27 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _g_free0 (_tmp2_); -#line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp3_ = search; + _g_free0 (_tmp1_); #line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp2_ = _g_object_ref0 (search); #line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" _g_object_unref0 (self->priv->search); #line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - self->priv->search = _tmp4_; -#line 979 "SavedSearchPage.c" + self->priv->search = _tmp2_; +#line 1095 "SavedSearchPage.c" { GeeIterator* _sources_it = NULL; - MediaCollectionRegistry* _tmp5_; - MediaCollectionRegistry* _tmp6_; - GeeCollection* _tmp7_; - GeeCollection* _tmp8_; - GeeIterator* _tmp9_; - GeeIterator* _tmp10_; + MediaCollectionRegistry* _tmp3_; + MediaCollectionRegistry* _tmp4_; + GeeCollection* _tmp5_; + GeeCollection* _tmp6_; + GeeIterator* _tmp7_; + GeeIterator* _tmp8_; #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp5_ = media_collection_registry_get_instance (); + _tmp3_ = media_collection_registry_get_instance (); #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp7_ = media_collection_registry_get_all (_tmp6_); + _tmp5_ = media_collection_registry_get_all (_tmp4_); #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp6_); #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _media_collection_registry_unref0 (_tmp6_); + _media_collection_registry_unref0 (_tmp4_); #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _sources_it = _tmp10_; + _sources_it = _tmp8_; #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" while (TRUE) { -#line 1008 "SavedSearchPage.c" - GeeIterator* _tmp11_; - gboolean _tmp12_; +#line 1124 "SavedSearchPage.c" + GeeIterator* _tmp9_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp13_; - gpointer _tmp14_; - ViewCollection* _tmp15_; - ViewCollection* _tmp16_; - MediaSourceCollection* _tmp17_; - SavedSearch* _tmp18_; - SavedSearchManager* _tmp19_; - SavedSearchManager* _tmp20_; - ViewCollectionMonitor* _tmp21_; - ViewCollectionMonitor* _tmp22_; + GeeIterator* _tmp10_; + gpointer _tmp11_; + ViewCollection* _tmp12_; + ViewCollection* _tmp13_; + MediaSourceCollection* _tmp14_; + SavedSearchManager* _tmp15_; + SavedSearchManager* _tmp16_; + ViewCollectionMonitor* _tmp17_; + ViewCollectionMonitor* _tmp18_; #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp11_ = _sources_it; + _tmp9_ = _sources_it; #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp12_ = gee_iterator_next (_tmp11_); -#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - if (!_tmp12_) { + if (!gee_iterator_next (_tmp9_)) { #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" break; -#line 1030 "SavedSearchPage.c" +#line 1142 "SavedSearchPage.c" } #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp13_ = _sources_it; + _tmp10_ = _sources_it; #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp14_ = gee_iterator_get (_tmp13_); + _tmp11_ = gee_iterator_get (_tmp10_); #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - sources = (MediaSourceCollection*) _tmp14_; -#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + sources = (MediaSourceCollection*) _tmp11_; #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp16_ = _tmp15_; + _tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp17_ = sources; + _tmp13_ = _tmp12_; #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp18_ = search; + _tmp14_ = sources; #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp19_ = saved_search_manager_new (self, _tmp18_); + _tmp15_ = saved_search_manager_new (self, search); #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp20_ = _tmp19_; + _tmp16_ = _tmp15_; #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp21_ = view_collection_monitor_source_collection (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL); + _tmp17_ = view_collection_monitor_source_collection (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL); #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp22_ = _tmp21_; + _tmp18_ = _tmp17_; #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _view_collection_monitor_unref0 (_tmp22_); + _view_collection_monitor_unref0 (_tmp18_); #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _view_manager_unref0 (_tmp20_); + _view_manager_unref0 (_tmp16_); #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _data_collection_unref0 (_tmp16_); + _data_collection_unref0 (_tmp13_); #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" _data_collection_unref0 (sources); -#line 1062 "SavedSearchPage.c" +#line 1172 "SavedSearchPage.c" } #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" _g_object_unref0 (_sources_it); -#line 1066 "SavedSearchPage.c" +#line 1176 "SavedSearchPage.c" } #line 34 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "SearchContextMenu"); #line 26 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" return self; -#line 1072 "SavedSearchPage.c" +#line 1182 "SavedSearchPage.c" } -SavedSearchPage* saved_search_page_new (SavedSearch* search) { +SavedSearchPage* +saved_search_page_new (SavedSearch* search) +{ #line 26 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" return saved_search_page_construct (TYPE_SAVED_SEARCH_PAGE, search); -#line 1079 "SavedSearchPage.c" +#line 1191 "SavedSearchPage.c" } -static void saved_search_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) { +static void +saved_search_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by) +{ SavedSearchPage * self; gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; @@ -1105,23 +1221,25 @@ static void saved_search_page_real_get_config_photos_sort (MediaPage* base, gboo if (sort_order) { #line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" *sort_order = _vala_sort_order; -#line 1109 "SavedSearchPage.c" +#line 1225 "SavedSearchPage.c" } #line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" if (sort_by) { #line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" *sort_by = _vala_sort_by; -#line 1115 "SavedSearchPage.c" +#line 1231 "SavedSearchPage.c" } } -static void saved_search_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { +static void +saved_search_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by) +{ SavedSearchPage * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - gboolean _tmp2_; - gint _tmp3_; #line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage); #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -1129,69 +1247,59 @@ static void saved_search_page_real_set_config_photos_sort (MediaPage* base, gboo #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" _tmp1_ = _tmp0_; #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp2_ = sort_order; -#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp3_ = sort_by; -#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); + configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), sort_order, sort_by); #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" _g_object_unref0 (_tmp1_); -#line 1140 "SavedSearchPage.c" +#line 1254 "SavedSearchPage.c" } -static void saved_search_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { +static void +saved_search_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames) +{ SavedSearchPage * self; - GeeList* _tmp0_; - GeeList* _tmp1_; #line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage); #line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); #line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp0_ = ui_filenames; -#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - PAGE_CLASS (saved_search_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_); -#line 47 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp1_ = ui_filenames; + PAGE_CLASS (saved_search_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), ui_filenames); #line 47 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "savedsearch.ui"); -#line 1160 "SavedSearchPage.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "savedsearch.ui"); +#line 1271 "SavedSearchPage.c" } -static void saved_search_page_real_add_actions (Page* base, GActionMap* map) { +static void +saved_search_page_real_add_actions (Page* base, + GActionMap* map) +{ SavedSearchPage * self; - GActionMap* _tmp0_; - GActionMap* _tmp1_; #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage); #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp0_ = map; -#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - PAGE_CLASS (saved_search_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_); -#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp1_ = map; + PAGE_CLASS (saved_search_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), map); #line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - g_action_map_add_action_entries (_tmp1_, SAVED_SEARCH_PAGE_entries, G_N_ELEMENTS (SAVED_SEARCH_PAGE_entries), self); -#line 1180 "SavedSearchPage.c" + g_action_map_add_action_entries (map, SAVED_SEARCH_PAGE_entries, G_N_ELEMENTS (SAVED_SEARCH_PAGE_entries), self); +#line 1288 "SavedSearchPage.c" } -static void saved_search_page_real_remove_actions (Page* base, GActionMap* map) { +static void +saved_search_page_real_remove_actions (Page* base, + GActionMap* map) +{ SavedSearchPage * self; - GActionMap* _tmp0_; #line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage); #line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 63 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp0_ = map; -#line 63 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - PAGE_CLASS (saved_search_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_); -#line 1195 "SavedSearchPage.c" + PAGE_CLASS (saved_search_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), map); +#line 1303 "SavedSearchPage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -1203,69 +1311,67 @@ static void saved_search_page_real_remove_actions (Page* base, GActionMap* map) entry_collection_length1 = G_N_ELEMENTS (SAVED_SEARCH_PAGE_entries); #line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (SAVED_SEARCH_PAGE_entries); entry_it = entry_it + 1) { -#line 1207 "SavedSearchPage.c" +#line 1315 "SavedSearchPage.c" GActionEntry entry = {0}; #line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" entry = entry_collection[entry_it]; -#line 1211 "SavedSearchPage.c" +#line 1319 "SavedSearchPage.c" { - GActionMap* _tmp1_; - GActionEntry _tmp2_; - const gchar* _tmp3_; + GActionEntry _tmp0_; + const gchar* _tmp1_; #line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp1_ = map; + _tmp0_ = entry; #line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp2_ = entry; + _tmp1_ = _tmp0_.name; #line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp3_ = _tmp2_.name; -#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - g_action_map_remove_action (_tmp1_, _tmp3_); -#line 1224 "SavedSearchPage.c" + g_action_map_remove_action (map, _tmp1_); +#line 1329 "SavedSearchPage.c" } } } } -static void saved_search_page_on_delete_search (SavedSearchPage* self) { +static void +saved_search_page_on_delete_search (SavedSearchPage* self) +{ SavedSearch* _tmp0_; - gboolean _tmp1_; #line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" g_return_if_fail (IS_SAVED_SEARCH_PAGE (self)); #line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" _tmp0_ = self->priv->search; #line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp1_ = dialogs_confirm_delete_saved_search (_tmp0_); -#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - if (_tmp1_) { -#line 1242 "SavedSearchPage.c" + if (dialogs_confirm_delete_saved_search (_tmp0_)) { +#line 1346 "SavedSearchPage.c" + CommandManager* _tmp1_; CommandManager* _tmp2_; - CommandManager* _tmp3_; - SavedSearch* _tmp4_; + SavedSearch* _tmp3_; + DeleteSavedSearchCommand* _tmp4_; DeleteSavedSearchCommand* _tmp5_; - DeleteSavedSearchCommand* _tmp6_; #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp2_ = app_window_get_command_manager (); + _tmp1_ = app_window_get_command_manager (); #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp4_ = self->priv->search; + _tmp3_ = self->priv->search; #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp5_ = delete_saved_search_command_new (_tmp4_); + _tmp4_ = delete_saved_search_command_new (_tmp3_); #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_COMMAND, Command)); #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp5_); #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _command_manager_unref0 (_tmp3_); -#line 1264 "SavedSearchPage.c" + _command_manager_unref0 (_tmp2_); +#line 1368 "SavedSearchPage.c" } } -static void saved_search_page_on_rename_search (SavedSearchPage* self) { +static void +saved_search_page_on_rename_search (SavedSearchPage* self) +{ LibraryWindow* _tmp0_; LibraryWindow* _tmp1_; SavedSearch* _tmp2_; @@ -1281,11 +1387,13 @@ static void saved_search_page_on_rename_search (SavedSearchPage* self) { library_window_rename_search_in_sidebar (_tmp1_, _tmp2_); #line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" _g_object_unref0 (_tmp1_); -#line 1285 "SavedSearchPage.c" +#line 1391 "SavedSearchPage.c" } -static void saved_search_page_on_edit_search (SavedSearchPage* self) { +static void +saved_search_page_on_edit_search (SavedSearchPage* self) +{ SavedSearchDialog* ssd = NULL; SavedSearch* _tmp0_; SavedSearchDialog* _tmp1_; @@ -1303,14 +1411,16 @@ static void saved_search_page_on_edit_search (SavedSearchPage* self) { saved_search_dialog_show (ssd); #line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" _g_object_unref0 (ssd); -#line 1307 "SavedSearchPage.c" +#line 1415 "SavedSearchPage.c" } -static void saved_search_page_real_update_actions (Page* base, gint selected_count, gint count) { +static void +saved_search_page_real_update_actions (Page* base, + gint selected_count, + gint count) +{ SavedSearchPage * self; - gint _tmp0_; - gint _tmp1_; #line 84 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage); #line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -1320,16 +1430,14 @@ static void saved_search_page_real_update_actions (Page* base, gint selected_cou #line 87 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DeleteSearch", TRUE); #line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp0_ = selected_count; -#line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - _tmp1_ = count; -#line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - PAGE_CLASS (saved_search_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_, _tmp1_); -#line 1329 "SavedSearchPage.c" + PAGE_CLASS (saved_search_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), selected_count, count); +#line 1435 "SavedSearchPage.c" } -static void saved_search_page_class_init (SavedSearchPageClass * klass) { +static void +saved_search_page_class_init (SavedSearchPageClass * klass) +{ #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" saved_search_page_parent_class = g_type_class_peek_parent (klass); #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -1348,18 +1456,22 @@ static void saved_search_page_class_init (SavedSearchPageClass * klass) { ((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) saved_search_page_real_update_actions; #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" G_OBJECT_CLASS (klass)->finalize = saved_search_page_finalize; -#line 1352 "SavedSearchPage.c" +#line 1460 "SavedSearchPage.c" } -static void saved_search_page_instance_init (SavedSearchPage * self) { +static void +saved_search_page_instance_init (SavedSearchPage * self) +{ #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" self->priv = SAVED_SEARCH_PAGE_GET_PRIVATE (self); -#line 1359 "SavedSearchPage.c" +#line 1469 "SavedSearchPage.c" } -static void saved_search_page_finalize (GObject * obj) { +static void +saved_search_page_finalize (GObject * obj) +{ SavedSearchPage * self; #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage); @@ -1367,11 +1479,13 @@ static void saved_search_page_finalize (GObject * obj) { _g_object_unref0 (self->priv->search); #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" G_OBJECT_CLASS (saved_search_page_parent_class)->finalize (obj); -#line 1371 "SavedSearchPage.c" +#line 1483 "SavedSearchPage.c" } -GType saved_search_page_get_type (void) { +GType +saved_search_page_get_type (void) +{ static volatile gsize saved_search_page_type_id__volatile = 0; if (g_once_init_enter (&saved_search_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SavedSearchPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchPage), 0, (GInstanceInitFunc) saved_search_page_instance_init, NULL }; diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c index 12966d0..3a38f9e 100644 --- a/src/searches/SearchBoolean.c +++ b/src/searches/SearchBoolean.c @@ -1,4 +1,4 @@ -/* SearchBoolean.c generated by valac 0.36.6, the Vala compiler +/* SearchBoolean.c generated by valac 0.40.4, the Vala compiler * generated from SearchBoolean.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -8,6 +8,7 @@ */ /* For specifying whether a search should be ORed (any) or ANDed (all).*/ + #include #include #include @@ -334,6 +335,11 @@ typedef struct _SavedSearchPrivate SavedSearchPrivate; typedef struct _SavedSearchRow SavedSearchRow; typedef struct _SavedSearchRowClass SavedSearchRowClass; +enum { + SAVED_SEARCH_0_PROPERTY, + SAVED_SEARCH_NUM_PROPERTIES +}; +static GParamSpec* saved_search_properties[SAVED_SEARCH_NUM_PROPERTIES]; #define _saved_search_row_unref0(var) ((var == NULL) ? NULL : (var = (saved_search_row_unref (var), NULL))) typedef struct _SavedSearchRowPrivate SavedSearchRowPrivate; @@ -408,9 +414,9 @@ typedef struct _ParamSpecSavedSearchTable ParamSpecSavedSearchTable; enum { SAVED_SEARCH_TABLE_SEARCH_ADDED_SIGNAL, SAVED_SEARCH_TABLE_SEARCH_REMOVED_SIGNAL, - SAVED_SEARCH_TABLE_LAST_SIGNAL + SAVED_SEARCH_TABLE_NUM_SIGNALS }; -static guint saved_search_table_signals[SAVED_SEARCH_TABLE_LAST_SIGNAL] = {0}; +static guint saved_search_table_signals[SAVED_SEARCH_TABLE_NUM_SIGNALS] = {0}; typedef enum { SEARCH_OPERATOR_ANY = 0, @@ -732,9 +738,15 @@ gchar* search_operator_to_string (SearchOperator self); SearchOperator search_operator_from_string (const gchar* str); gpointer search_condition_ref (gpointer instance); void search_condition_unref (gpointer instance); -GParamSpec* param_spec_search_condition (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_search_condition (GValue* value, gpointer v_object); -void value_take_search_condition (GValue* value, gpointer v_object); +GParamSpec* param_spec_search_condition (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_search_condition (GValue* value, + gpointer v_object); +void value_take_search_condition (GValue* value, + gpointer v_object); gpointer value_get_search_condition (const GValue* value); GType search_condition_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; @@ -743,55 +755,73 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; GType search_condition_search_type_get_type (void) G_GNUC_CONST; #define SEARCH_CONDITION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_CONDITION, SearchConditionPrivate)) -enum { - SEARCH_CONDITION_DUMMY_PROPERTY -}; SearchConditionSearchType* search_condition_search_type_as_array (int* result_length1); -void search_condition_search_type_sort_array (SearchConditionSearchType** array, int* array_length1); -static gint __lambda13_ (void* a, void* b); -gint utf8_cs_compare (void* a, void* b); +void search_condition_search_type_sort_array (SearchConditionSearchType** array, + int* array_length1); +static gint __lambda13_ (void* a, + void* b); +gint utf8_cs_compare (void* a, + void* b); gchar* search_condition_search_type_display_text (SearchConditionSearchType self); -static gint ___lambda13____compar_fn_t (void* key1, void* key2); +static gint ___lambda13____compar_fn_t (void* key1, + void* key2); gchar* search_condition_search_type_to_string (SearchConditionSearchType self); SearchConditionSearchType search_condition_search_type_from_string (const gchar* str); -gboolean search_condition_predicate (SearchCondition* self, MediaSource* source); -static gboolean search_condition_real_predicate (SearchCondition* self, MediaSource* source); +gboolean search_condition_predicate (SearchCondition* self, + MediaSource* source); +static gboolean search_condition_real_predicate (SearchCondition* self, + MediaSource* source); SearchCondition* search_condition_construct (GType object_type); SearchConditionSearchType search_condition_get_search_type (SearchCondition* self); -void search_condition_set_search_type (SearchCondition* self, SearchConditionSearchType value); +void search_condition_set_search_type (SearchCondition* self, + SearchConditionSearchType value); static void search_condition_finalize (SearchCondition * obj); GType search_condition_text_get_type (void) G_GNUC_CONST; GType search_condition_text_context_get_type (void) G_GNUC_CONST; #define SEARCH_CONDITION_TEXT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_CONDITION_TEXT, SearchConditionTextPrivate)) -enum { - SEARCH_CONDITION_TEXT_DUMMY_PROPERTY -}; gchar* search_condition_text_context_to_string (SearchConditionTextContext self); SearchConditionTextContext search_condition_text_context_from_string (const gchar* str); -SearchConditionText* search_condition_text_new (SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context); -SearchConditionText* search_condition_text_construct (GType object_type, SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context); +SearchConditionText* search_condition_text_new (SearchConditionSearchType search_type, + const gchar* text, + SearchConditionTextContext context); +SearchConditionText* search_condition_text_construct (GType object_type, + SearchConditionSearchType search_type, + const gchar* text, + SearchConditionTextContext context); gchar* string_remove_diacritics (const gchar* istring); -static void search_condition_text_set_text (SearchConditionText* self, const gchar* value); -static void search_condition_text_set_context (SearchConditionText* self, SearchConditionTextContext value); -static gboolean search_condition_text_string_match (SearchConditionText* self, const gchar* needle, const gchar* haystack); +static void search_condition_text_set_text (SearchConditionText* self, + const gchar* value); +static void search_condition_text_set_context (SearchConditionText* self, + SearchConditionTextContext value); +static gboolean search_condition_text_string_match (SearchConditionText* self, + const gchar* needle, + const gchar* haystack); SearchConditionTextContext search_condition_text_get_context (SearchConditionText* self); gboolean is_string_empty (const gchar* s); -static gboolean search_condition_text_real_predicate (SearchCondition* base, MediaSource* source); +static gboolean search_condition_text_real_predicate (SearchCondition* base, + MediaSource* source); gchar* media_source_get_title (MediaSource* self); const gchar* search_condition_text_get_text (SearchConditionText* self); GType tag_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType tag_source_collection_get_type (void) G_GNUC_CONST; -GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, MediaSource* source); +GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, + MediaSource* source); gchar* tag_get_searchable_name (Tag* self); GType event_source_get_type (void) G_GNUC_CONST; GType event_get_type (void) G_GNUC_CONST; @@ -804,18 +834,23 @@ GType search_condition_media_type_get_type (void) G_GNUC_CONST; GType search_condition_media_type_media_type_get_type (void) G_GNUC_CONST; GType search_condition_media_type_context_get_type (void) G_GNUC_CONST; #define SEARCH_CONDITION_MEDIA_TYPE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_CONDITION_MEDIA_TYPE, SearchConditionMediaTypePrivate)) -enum { - SEARCH_CONDITION_MEDIA_TYPE_DUMMY_PROPERTY -}; gchar* search_condition_media_type_context_to_string (SearchConditionMediaTypeContext self); SearchConditionMediaTypeContext search_condition_media_type_context_from_string (const gchar* str); gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTypeMediaType self); SearchConditionMediaTypeMediaType search_condition_media_type_media_type_from_string (const gchar* str); -SearchConditionMediaType* search_condition_media_type_new (SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type); -SearchConditionMediaType* search_condition_media_type_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type); -static void search_condition_media_type_set_context (SearchConditionMediaType* self, SearchConditionMediaTypeContext value); -static void search_condition_media_type_set_media_type (SearchConditionMediaType* self, SearchConditionMediaTypeMediaType value); -static gboolean search_condition_media_type_real_predicate (SearchCondition* base, MediaSource* source); +SearchConditionMediaType* search_condition_media_type_new (SearchConditionSearchType search_type, + SearchConditionMediaTypeContext context, + SearchConditionMediaTypeMediaType media_type); +SearchConditionMediaType* search_condition_media_type_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionMediaTypeContext context, + SearchConditionMediaTypeMediaType media_type); +static void search_condition_media_type_set_context (SearchConditionMediaType* self, + SearchConditionMediaTypeContext value); +static void search_condition_media_type_set_media_type (SearchConditionMediaType* self, + SearchConditionMediaTypeMediaType value); +static gboolean search_condition_media_type_real_predicate (SearchCondition* base, + MediaSource* source); SearchConditionMediaTypeMediaType search_condition_media_type_get_media_type (SearchConditionMediaType* self); GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; @@ -827,15 +862,17 @@ static void search_condition_media_type_finalize (SearchCondition * obj); GType search_condition_flagged_get_type (void) G_GNUC_CONST; GType search_condition_flagged_state_get_type (void) G_GNUC_CONST; #define SEARCH_CONDITION_FLAGGED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_CONDITION_FLAGGED, SearchConditionFlaggedPrivate)) -enum { - SEARCH_CONDITION_FLAGGED_DUMMY_PROPERTY -}; gchar* search_condition_flagged_state_to_string (SearchConditionFlaggedState self); SearchConditionFlaggedState search_condition_flagged_state_from_string (const gchar* str); -SearchConditionFlagged* search_condition_flagged_new (SearchConditionSearchType search_type, SearchConditionFlaggedState state); -SearchConditionFlagged* search_condition_flagged_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionFlaggedState state); -static void search_condition_flagged_set_state (SearchConditionFlagged* self, SearchConditionFlaggedState value); -static gboolean search_condition_flagged_real_predicate (SearchCondition* base, MediaSource* source); +SearchConditionFlagged* search_condition_flagged_new (SearchConditionSearchType search_type, + SearchConditionFlaggedState state); +SearchConditionFlagged* search_condition_flagged_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionFlaggedState state); +static void search_condition_flagged_set_state (SearchConditionFlagged* self, + SearchConditionFlaggedState value); +static gboolean search_condition_flagged_real_predicate (SearchCondition* base, + MediaSource* source); SearchConditionFlaggedState search_condition_flagged_get_state (SearchConditionFlagged* self); GType flaggable_get_type (void) G_GNUC_CONST; gboolean flaggable_is_flagged (Flaggable* self); @@ -844,18 +881,23 @@ GType search_condition_modified_get_type (void) G_GNUC_CONST; GType search_condition_modified_state_get_type (void) G_GNUC_CONST; GType search_condition_modified_context_get_type (void) G_GNUC_CONST; #define SEARCH_CONDITION_MODIFIED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_CONDITION_MODIFIED, SearchConditionModifiedPrivate)) -enum { - SEARCH_CONDITION_MODIFIED_DUMMY_PROPERTY -}; gchar* search_condition_modified_context_to_string (SearchConditionModifiedContext self); SearchConditionModifiedContext search_condition_modified_context_from_string (const gchar* str); gchar* search_condition_modified_state_to_string (SearchConditionModifiedState self); SearchConditionModifiedState search_condition_modified_state_from_string (const gchar* str); -SearchConditionModified* search_condition_modified_new (SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state); -SearchConditionModified* search_condition_modified_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state); -static void search_condition_modified_set_context (SearchConditionModified* self, SearchConditionModifiedContext value); -static void search_condition_modified_set_state (SearchConditionModified* self, SearchConditionModifiedState value); -static gboolean search_condition_modified_real_predicate (SearchCondition* base, MediaSource* source); +SearchConditionModified* search_condition_modified_new (SearchConditionSearchType search_type, + SearchConditionModifiedContext context, + SearchConditionModifiedState state); +SearchConditionModified* search_condition_modified_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionModifiedContext context, + SearchConditionModifiedState state); +static void search_condition_modified_set_context (SearchConditionModified* self, + SearchConditionModifiedContext value); +static void search_condition_modified_set_state (SearchConditionModified* self, + SearchConditionModifiedState value); +static gboolean search_condition_modified_real_predicate (SearchCondition* base, + MediaSource* source); SearchConditionModifiedState search_condition_modified_get_state (SearchConditionModified* self); gboolean photo_has_transformations (Photo* self); gboolean photo_has_editable (Photo* self); @@ -865,16 +907,21 @@ GType search_condition_rating_get_type (void) G_GNUC_CONST; GType rating_get_type (void) G_GNUC_CONST; GType search_condition_rating_context_get_type (void) G_GNUC_CONST; #define SEARCH_CONDITION_RATING_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_CONDITION_RATING, SearchConditionRatingPrivate)) -enum { - SEARCH_CONDITION_RATING_DUMMY_PROPERTY -}; gchar* search_condition_rating_context_to_string (SearchConditionRatingContext self); SearchConditionRatingContext search_condition_rating_context_from_string (const gchar* str); -SearchConditionRating* search_condition_rating_new (SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context); -SearchConditionRating* search_condition_rating_construct (GType object_type, SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context); -static void search_condition_rating_set_rating (SearchConditionRating* self, Rating value); -static void search_condition_rating_set_context (SearchConditionRating* self, SearchConditionRatingContext value); -static gboolean search_condition_rating_real_predicate (SearchCondition* base, MediaSource* source); +SearchConditionRating* search_condition_rating_new (SearchConditionSearchType search_type, + Rating rating, + SearchConditionRatingContext context); +SearchConditionRating* search_condition_rating_construct (GType object_type, + SearchConditionSearchType search_type, + Rating rating, + SearchConditionRatingContext context); +static void search_condition_rating_set_rating (SearchConditionRating* self, + Rating value); +static void search_condition_rating_set_context (SearchConditionRating* self, + SearchConditionRatingContext value); +static gboolean search_condition_rating_real_predicate (SearchCondition* base, + MediaSource* source); Rating media_source_get_rating (MediaSource* self); SearchConditionRatingContext search_condition_rating_get_context (SearchConditionRating* self); Rating search_condition_rating_get_rating (SearchConditionRating* self); @@ -882,17 +929,25 @@ static void search_condition_rating_finalize (SearchCondition * obj); GType search_condition_date_get_type (void) G_GNUC_CONST; GType search_condition_date_context_get_type (void) G_GNUC_CONST; #define SEARCH_CONDITION_DATE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_CONDITION_DATE, SearchConditionDatePrivate)) -enum { - SEARCH_CONDITION_DATE_DUMMY_PROPERTY -}; gchar* search_condition_date_context_to_string (SearchConditionDateContext self); SearchConditionDateContext search_condition_date_context_from_string (const gchar* str); -SearchConditionDate* search_condition_date_new (SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two); -SearchConditionDate* search_condition_date_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two); -static void search_condition_date_set_context (SearchConditionDate* self, SearchConditionDateContext value); -static void search_condition_date_set_date_one (SearchConditionDate* self, GDateTime* value); -static void search_condition_date_set_date_two (SearchConditionDate* self, GDateTime* value); -static gboolean search_condition_date_real_predicate (SearchCondition* base, MediaSource* source); +SearchConditionDate* search_condition_date_new (SearchConditionSearchType search_type, + SearchConditionDateContext context, + GDateTime* date_one, + GDateTime* date_two); +SearchConditionDate* search_condition_date_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionDateContext context, + GDateTime* date_one, + GDateTime* date_two); +static void search_condition_date_set_context (SearchConditionDate* self, + SearchConditionDateContext value); +static void search_condition_date_set_date_one (SearchConditionDate* self, + GDateTime* value); +static void search_condition_date_set_date_two (SearchConditionDate* self, + GDateTime* value); +static gboolean search_condition_date_real_predicate (SearchCondition* base, + MediaSource* source); time_t media_source_get_exposure_time (MediaSource* self); SearchConditionDateContext search_condition_date_get_context (SearchConditionDate* self); GDateTime* search_condition_date_get_date_one (SearchConditionDate* self); @@ -900,100 +955,160 @@ GDateTime* search_condition_date_get_date_two (SearchConditionDate* self); static void search_condition_date_finalize (SearchCondition * obj); gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; gpointer source_snapshot_ref (gpointer instance); void source_snapshot_unref (gpointer instance); -GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_snapshot (GValue* value, gpointer v_object); -void value_take_source_snapshot (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_snapshot (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_snapshot (GValue* value, + gpointer v_object); +void value_take_source_snapshot (GValue* value, + gpointer v_object); gpointer value_get_source_snapshot (const GValue* value); GType source_snapshot_get_type (void) G_GNUC_CONST; GType saved_search_get_type (void) G_GNUC_CONST; gpointer saved_search_row_ref (gpointer instance); void saved_search_row_unref (gpointer instance); -GParamSpec* param_spec_saved_search_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_saved_search_row (GValue* value, gpointer v_object); -void value_take_saved_search_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_saved_search_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_saved_search_row (GValue* value, + gpointer v_object); +void value_take_saved_search_row (GValue* value, + gpointer v_object); gpointer value_get_saved_search_row (const GValue* value); GType saved_search_row_get_type (void) G_GNUC_CONST; #define SAVED_SEARCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SAVED_SEARCH, SavedSearchPrivate)) -enum { - SAVED_SEARCH_DUMMY_PROPERTY -}; #define SAVED_SEARCH_TYPENAME "saved_search" -SavedSearch* saved_search_new (SavedSearchRow* row, gint64 object_id); -SavedSearch* saved_search_construct (GType object_type, SavedSearchRow* row, gint64 object_id); -DataSource* data_source_construct (GType object_type, gint64 object_id); +SavedSearch* saved_search_new (SavedSearchRow* row, + gint64 object_id); +SavedSearch* saved_search_construct (GType object_type, + SavedSearchRow* row, + gint64 object_id); +DataSource* data_source_construct (GType object_type, + gint64 object_id); static gchar* saved_search_real_get_name (DataObject* base); GType saved_search_id_get_type (void) G_GNUC_CONST; SavedSearchID* saved_search_id_dup (const SavedSearchID* self); void saved_search_id_free (SavedSearchID* self); static gchar* saved_search_real_to_string (DataObject* base); static gchar* saved_search_real_get_typename (DataSource* base); -void saved_search_get_saved_search_id (SavedSearch* self, SavedSearchID* result); +void saved_search_get_saved_search_id (SavedSearch* self, + SavedSearchID* result); static gint64 saved_search_real_get_instance_id (DataSource* base); -gint saved_search_compare_names (void* a, void* b); -gint string_collated_compare (void* a, void* b); -gboolean saved_search_predicate (SavedSearch* self, MediaSource* source); +gint saved_search_compare_names (void* a, + void* b); +gint string_collated_compare (void* a, + void* b); +gboolean saved_search_predicate (SavedSearch* self, + MediaSource* source); void saved_search_reconstitute (SavedSearch* self); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType saved_search_db_table_get_type (void) G_GNUC_CONST; SavedSearchDBTable* saved_search_db_table_get_instance (void); GQuark database_error_quark (void); -void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearchRow* row, SavedSearchID* result, GError** error); +void saved_search_db_table_create_from_row (SavedSearchDBTable* self, + SavedSearchRow* row, + SavedSearchID* result, + GError** error); void app_window_database_error (GError* err); gpointer saved_search_table_ref (gpointer instance); void saved_search_table_unref (gpointer instance); -GParamSpec* param_spec_saved_search_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_saved_search_table (GValue* value, gpointer v_object); -void value_take_saved_search_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_saved_search_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_saved_search_table (GValue* value, + gpointer v_object); +void value_take_saved_search_table (GValue* value, + gpointer v_object); gpointer value_get_saved_search_table (const GValue* value); GType saved_search_table_get_type (void) G_GNUC_CONST; SavedSearchTable* saved_search_table_get_instance (void); -void saved_search_table_add_to_map (SavedSearchTable* self, SavedSearch* search); +void saved_search_table_add_to_map (SavedSearchTable* self, + SavedSearch* search); gchar* data_object_to_string (DataObject* self); -gboolean saved_search_rename (SavedSearch* self, const gchar* new_name); -gboolean saved_search_table_exists (SavedSearchTable* self, const gchar* search_name); -void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* search_id, const gchar* new_name, GError** error); -void saved_search_table_remove_from_map (SavedSearchTable* self, SavedSearch* search); +gboolean saved_search_rename (SavedSearch* self, + const gchar* new_name); +gboolean saved_search_table_exists (SavedSearchTable* self, + const gchar* search_name); +void saved_search_db_table_rename (SavedSearchDBTable* self, + SavedSearchID* search_id, + const gchar* new_name, + GError** error); +void saved_search_table_remove_from_map (SavedSearchTable* self, + SavedSearch* search); GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; GType library_window_get_type (void) G_GNUC_CONST; LibraryWindow* library_window_get_app (void); -void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* search); +void library_window_switch_to_saved_search (LibraryWindow* self, + SavedSearch* search); GeeList* saved_search_get_conditions (SavedSearch* self); SearchOperator saved_search_get_operator (SavedSearch* self); static void saved_search_finalize (GObject * obj); #define SAVED_SEARCH_TABLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SAVED_SEARCH_TABLE, SavedSearchTablePrivate)) -enum { - SAVED_SEARCH_TABLE_DUMMY_PROPERTY -}; static SavedSearchTable* saved_search_table_new (void); static SavedSearchTable* saved_search_table_construct (GType object_type); -GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** error); +GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, + GError** error); #define DATA_OBJECT_INVALID_OBJECT_ID ((gint64) -1) GeeCollection* saved_search_table_get_all (SavedSearchTable* self); -SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* name, SearchOperator operator, GeeArrayList* conditions); -SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar* name, SearchOperator operator, GeeArrayList* conditions, GError** error); -void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search); -void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error); +SavedSearch* saved_search_table_create (SavedSearchTable* self, + const gchar* name, + SearchOperator operator, + GeeArrayList* conditions); +SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, + const gchar* name, + SearchOperator operator, + GeeArrayList* conditions, + GError** error); +void saved_search_table_remove (SavedSearchTable* self, + SavedSearch* search); +void saved_search_db_table_remove (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error); GeeIterable* saved_search_table_get_saved_searches (SavedSearchTable* self); gint saved_search_table_get_count (SavedSearchTable* self); gchar* saved_search_table_generate_unique_name (SavedSearchTable* self); @@ -1001,13 +1116,15 @@ gchar* saved_search_table_generate_unique_name (SavedSearchTable* self); static void saved_search_table_finalize (SavedSearchTable * obj); -gchar* search_operator_to_string (SearchOperator self) { +gchar* +search_operator_to_string (SearchOperator self) +{ gchar* result = NULL; #line 14 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" switch (self) { #line 14 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_OPERATOR_ANY: -#line 1011 "SearchBoolean.c" +#line 1128 "SearchBoolean.c" { gchar* _tmp0_; #line 16 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1016,11 +1133,11 @@ gchar* search_operator_to_string (SearchOperator self) { result = _tmp0_; #line 16 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1020 "SearchBoolean.c" +#line 1137 "SearchBoolean.c" } #line 14 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_OPERATOR_ALL: -#line 1024 "SearchBoolean.c" +#line 1141 "SearchBoolean.c" { gchar* _tmp1_; #line 19 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1029,11 +1146,11 @@ gchar* search_operator_to_string (SearchOperator self) { result = _tmp1_; #line 19 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1033 "SearchBoolean.c" +#line 1150 "SearchBoolean.c" } #line 14 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_OPERATOR_NONE: -#line 1037 "SearchBoolean.c" +#line 1154 "SearchBoolean.c" { gchar* _tmp2_; #line 22 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1042,68 +1159,60 @@ gchar* search_operator_to_string (SearchOperator self) { result = _tmp2_; #line 22 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1046 "SearchBoolean.c" +#line 1163 "SearchBoolean.c" } default: { #line 25 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:25: unrecognized search operator enumeration value"); -#line 1052 "SearchBoolean.c" +#line 1169 "SearchBoolean.c" } } } -SearchOperator search_operator_from_string (const gchar* str) { +SearchOperator +search_operator_from_string (const gchar* str) +{ SearchOperator result = 0; - const gchar* _tmp0_; #line 29 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (str != NULL, 0); #line 30 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = str; -#line 30 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp0_, "ANY") == 0) { + if (g_strcmp0 (str, "ANY") == 0) { #line 31 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_OPERATOR_ANY; #line 31 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1071 "SearchBoolean.c" +#line 1187 "SearchBoolean.c" } else { - const gchar* _tmp1_; -#line 33 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = str; #line 33 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp1_, "ALL") == 0) { + if (g_strcmp0 (str, "ALL") == 0) { #line 34 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_OPERATOR_ALL; #line 34 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1082 "SearchBoolean.c" +#line 1195 "SearchBoolean.c" } else { - const gchar* _tmp2_; #line 36 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = str; -#line 36 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp2_, "NONE") == 0) { + if (g_strcmp0 (str, "NONE") == 0) { #line 37 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_OPERATOR_NONE; #line 37 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1093 "SearchBoolean.c" +#line 1203 "SearchBoolean.c" } else { - const gchar* _tmp3_; -#line 40 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = str; #line 40 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - g_error ("SearchBoolean.vala:40: unrecognized search operator name: %s", _tmp3_); -#line 1100 "SearchBoolean.c" + g_error ("SearchBoolean.vala:40: unrecognized search operator name: %s", str); +#line 1207 "SearchBoolean.c" } } } } -GType search_operator_get_type (void) { +GType +search_operator_get_type (void) +{ static volatile gsize search_operator_type_id__volatile = 0; if (g_once_init_enter (&search_operator_type_id__volatile)) { static const GEnumValue values[] = {{SEARCH_OPERATOR_ANY, "SEARCH_OPERATOR_ANY", "any"}, {SEARCH_OPERATOR_ALL, "SEARCH_OPERATOR_ALL", "all"}, {SEARCH_OPERATOR_NONE, "SEARCH_OPERATOR_NONE", "none"}, {0, NULL, NULL}}; @@ -1115,7 +1224,9 @@ GType search_operator_get_type (void) { } -SearchConditionSearchType* search_condition_search_type_as_array (int* result_length1) { +SearchConditionSearchType* +search_condition_search_type_as_array (int* result_length1) +{ SearchConditionSearchType* result = NULL; SearchConditionSearchType* _tmp0_; SearchConditionSearchType* _tmp1_; @@ -1152,76 +1263,66 @@ SearchConditionSearchType* search_condition_search_type_as_array (int* result_le if (result_length1) { #line 64 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" *result_length1 = _tmp1__length1; -#line 1156 "SearchBoolean.c" +#line 1267 "SearchBoolean.c" } #line 64 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp1_; #line 64 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1162 "SearchBoolean.c" +#line 1273 "SearchBoolean.c" } -static gint __lambda13_ (void* a, void* b) { +static gint +__lambda13_ (void* a, + void* b) +{ gint result = 0; - void* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - void* _tmp2_; - gchar* _tmp3_; - gint _tmp4_; #line 71 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = a; + _tmp0_ = search_condition_search_type_display_text (*((SearchConditionSearchType*) a)); #line 71 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = search_condition_search_type_display_text (*((SearchConditionSearchType*) _tmp0_)); + _tmp1_ = search_condition_search_type_display_text (*((SearchConditionSearchType*) b)); #line 71 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = b; -#line 71 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = search_condition_search_type_display_text (*((SearchConditionSearchType*) _tmp2_)); -#line 71 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = utf8_cs_compare (_tmp1_, _tmp3_); -#line 71 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp4_; + result = utf8_cs_compare (_tmp0_, _tmp1_); #line 71 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1187 "SearchBoolean.c" +#line 1292 "SearchBoolean.c" } -static gint ___lambda13____compar_fn_t (void* key1, void* key2) { +static gint +___lambda13____compar_fn_t (void* key1, + void* key2) +{ gint result; result = __lambda13_ (key1, key2); #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1196 "SearchBoolean.c" +#line 1304 "SearchBoolean.c" } -void search_condition_search_type_sort_array (SearchConditionSearchType** array, int* array_length1) { - SearchConditionSearchType* _tmp0_; - gint _tmp0__length1; - SearchConditionSearchType* _tmp1_; - gint _tmp1__length1; -#line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = *array; +void +search_condition_search_type_sort_array (SearchConditionSearchType** array, + int* array_length1) +{ #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0__length1 = *array_length1; -#line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = *array; -#line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1__length1 = *array_length1; -#line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - qsort (_tmp0_, (gsize) _tmp1__length1, (gsize) sizeof (SearchConditionSearchType), ___lambda13____compar_fn_t); -#line 1215 "SearchBoolean.c" + qsort (*array, (gsize) (*array_length1), (gsize) sizeof (SearchConditionSearchType), ___lambda13____compar_fn_t); +#line 1314 "SearchBoolean.c" } -gchar* search_condition_search_type_to_string (SearchConditionSearchType self) { +gchar* +search_condition_search_type_to_string (SearchConditionSearchType self) +{ gchar* result = NULL; #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" switch (self) { #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT: -#line 1225 "SearchBoolean.c" +#line 1326 "SearchBoolean.c" { gchar* _tmp0_; #line 79 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1230,11 +1331,11 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) { result = _tmp0_; #line 79 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1234 "SearchBoolean.c" +#line 1335 "SearchBoolean.c" } #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_TITLE: -#line 1238 "SearchBoolean.c" +#line 1339 "SearchBoolean.c" { gchar* _tmp1_; #line 82 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1243,11 +1344,11 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) { result = _tmp1_; #line 82 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1247 "SearchBoolean.c" +#line 1348 "SearchBoolean.c" } #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_TAG: -#line 1251 "SearchBoolean.c" +#line 1352 "SearchBoolean.c" { gchar* _tmp2_; #line 85 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1256,11 +1357,11 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) { result = _tmp2_; #line 85 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1260 "SearchBoolean.c" +#line 1361 "SearchBoolean.c" } #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_COMMENT: -#line 1264 "SearchBoolean.c" +#line 1365 "SearchBoolean.c" { gchar* _tmp3_; #line 88 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1269,11 +1370,11 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) { result = _tmp3_; #line 88 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1273 "SearchBoolean.c" +#line 1374 "SearchBoolean.c" } #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME: -#line 1277 "SearchBoolean.c" +#line 1378 "SearchBoolean.c" { gchar* _tmp4_; #line 91 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1282,11 +1383,11 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) { result = _tmp4_; #line 91 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1286 "SearchBoolean.c" +#line 1387 "SearchBoolean.c" } #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME: -#line 1290 "SearchBoolean.c" +#line 1391 "SearchBoolean.c" { gchar* _tmp5_; #line 94 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1295,11 +1396,11 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) { result = _tmp5_; #line 94 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1299 "SearchBoolean.c" +#line 1400 "SearchBoolean.c" } #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE: -#line 1303 "SearchBoolean.c" +#line 1404 "SearchBoolean.c" { gchar* _tmp6_; #line 97 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1308,11 +1409,11 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) { result = _tmp6_; #line 97 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1312 "SearchBoolean.c" +#line 1413 "SearchBoolean.c" } #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE: -#line 1316 "SearchBoolean.c" +#line 1417 "SearchBoolean.c" { gchar* _tmp7_; #line 100 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1321,11 +1422,11 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) { result = _tmp7_; #line 100 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1325 "SearchBoolean.c" +#line 1426 "SearchBoolean.c" } #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE: -#line 1329 "SearchBoolean.c" +#line 1430 "SearchBoolean.c" { gchar* _tmp8_; #line 103 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1334,11 +1435,11 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) { result = _tmp8_; #line 103 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1338 "SearchBoolean.c" +#line 1439 "SearchBoolean.c" } #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_RATING: -#line 1342 "SearchBoolean.c" +#line 1443 "SearchBoolean.c" { gchar* _tmp9_; #line 106 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1347,11 +1448,11 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) { result = _tmp9_; #line 106 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1351 "SearchBoolean.c" +#line 1452 "SearchBoolean.c" } #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_DATE: -#line 1355 "SearchBoolean.c" +#line 1456 "SearchBoolean.c" { gchar* _tmp10_; #line 109 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1360,149 +1461,115 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) { result = _tmp10_; #line 109 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1364 "SearchBoolean.c" +#line 1465 "SearchBoolean.c" } default: { #line 112 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:112: unrecognized search type enumeration value"); -#line 1370 "SearchBoolean.c" +#line 1471 "SearchBoolean.c" } } } -SearchConditionSearchType search_condition_search_type_from_string (const gchar* str) { +SearchConditionSearchType +search_condition_search_type_from_string (const gchar* str) +{ SearchConditionSearchType result = 0; - const gchar* _tmp0_; #line 116 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (str != NULL, 0); #line 117 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = str; -#line 117 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp0_, "ANY_TEXT") == 0) { + if (g_strcmp0 (str, "ANY_TEXT") == 0) { #line 118 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT; #line 118 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1389 "SearchBoolean.c" +#line 1489 "SearchBoolean.c" } else { - const gchar* _tmp1_; #line 120 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = str; -#line 120 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp1_, "TITLE") == 0) { + if (g_strcmp0 (str, "TITLE") == 0) { #line 121 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_SEARCH_TYPE_TITLE; #line 121 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1400 "SearchBoolean.c" +#line 1497 "SearchBoolean.c" } else { - const gchar* _tmp2_; #line 123 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = str; -#line 123 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp2_, "TAG") == 0) { + if (g_strcmp0 (str, "TAG") == 0) { #line 124 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_SEARCH_TYPE_TAG; #line 124 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1411 "SearchBoolean.c" +#line 1505 "SearchBoolean.c" } else { - const gchar* _tmp3_; -#line 126 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = str; #line 126 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp3_, "COMMENT") == 0) { + if (g_strcmp0 (str, "COMMENT") == 0) { #line 127 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_SEARCH_TYPE_COMMENT; #line 127 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1422 "SearchBoolean.c" +#line 1513 "SearchBoolean.c" } else { - const gchar* _tmp4_; #line 129 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = str; -#line 129 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp4_, "EVENT_NAME") == 0) { + if (g_strcmp0 (str, "EVENT_NAME") == 0) { #line 130 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME; #line 130 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1433 "SearchBoolean.c" +#line 1521 "SearchBoolean.c" } else { - const gchar* _tmp5_; -#line 132 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp5_ = str; #line 132 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp5_, "FILE_NAME") == 0) { + if (g_strcmp0 (str, "FILE_NAME") == 0) { #line 133 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME; #line 133 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1444 "SearchBoolean.c" +#line 1529 "SearchBoolean.c" } else { - const gchar* _tmp6_; -#line 135 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp6_ = str; #line 135 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp6_, "MEDIA_TYPE") == 0) { + if (g_strcmp0 (str, "MEDIA_TYPE") == 0) { #line 136 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE; #line 136 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1455 "SearchBoolean.c" +#line 1537 "SearchBoolean.c" } else { - const gchar* _tmp7_; #line 138 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp7_ = str; -#line 138 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp7_, "FLAG_STATE") == 0) { + if (g_strcmp0 (str, "FLAG_STATE") == 0) { #line 139 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE; #line 139 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1466 "SearchBoolean.c" +#line 1545 "SearchBoolean.c" } else { - const gchar* _tmp8_; -#line 141 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp8_ = str; #line 141 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp8_, "MODIFIED_STATE") == 0) { + if (g_strcmp0 (str, "MODIFIED_STATE") == 0) { #line 142 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE; #line 142 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1477 "SearchBoolean.c" +#line 1553 "SearchBoolean.c" } else { - const gchar* _tmp9_; -#line 144 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp9_ = str; #line 144 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp9_, "RATING") == 0) { + if (g_strcmp0 (str, "RATING") == 0) { #line 145 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_SEARCH_TYPE_RATING; #line 145 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1488 "SearchBoolean.c" +#line 1561 "SearchBoolean.c" } else { - const gchar* _tmp10_; #line 147 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp10_ = str; -#line 147 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp10_, "DATE") == 0) { + if (g_strcmp0 (str, "DATE") == 0) { #line 148 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_SEARCH_TYPE_DATE; #line 148 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1499 "SearchBoolean.c" +#line 1569 "SearchBoolean.c" } else { - const gchar* _tmp11_; -#line 151 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp11_ = str; #line 151 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - g_error ("SearchBoolean.vala:151: unrecognized search type name: %s", _tmp11_); -#line 1506 "SearchBoolean.c" + g_error ("SearchBoolean.vala:151: unrecognized search type name: %s", str); +#line 1573 "SearchBoolean.c" } } } @@ -1517,13 +1584,15 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar* } -gchar* search_condition_search_type_display_text (SearchConditionSearchType self) { +gchar* +search_condition_search_type_display_text (SearchConditionSearchType self) +{ gchar* result = NULL; #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" switch (self) { #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT: -#line 1527 "SearchBoolean.c" +#line 1596 "SearchBoolean.c" { gchar* _tmp0_; #line 157 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1532,11 +1601,11 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self result = _tmp0_; #line 157 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1536 "SearchBoolean.c" +#line 1605 "SearchBoolean.c" } #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_TITLE: -#line 1540 "SearchBoolean.c" +#line 1609 "SearchBoolean.c" { gchar* _tmp1_; #line 160 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1545,11 +1614,11 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self result = _tmp1_; #line 160 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1549 "SearchBoolean.c" +#line 1618 "SearchBoolean.c" } #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_TAG: -#line 1553 "SearchBoolean.c" +#line 1622 "SearchBoolean.c" { gchar* _tmp2_; #line 163 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1558,11 +1627,11 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self result = _tmp2_; #line 163 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1562 "SearchBoolean.c" +#line 1631 "SearchBoolean.c" } #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_COMMENT: -#line 1566 "SearchBoolean.c" +#line 1635 "SearchBoolean.c" { gchar* _tmp3_; #line 166 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1571,11 +1640,11 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self result = _tmp3_; #line 166 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1575 "SearchBoolean.c" +#line 1644 "SearchBoolean.c" } #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME: -#line 1579 "SearchBoolean.c" +#line 1648 "SearchBoolean.c" { gchar* _tmp4_; #line 169 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1584,11 +1653,11 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self result = _tmp4_; #line 169 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1588 "SearchBoolean.c" +#line 1657 "SearchBoolean.c" } #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME: -#line 1592 "SearchBoolean.c" +#line 1661 "SearchBoolean.c" { gchar* _tmp5_; #line 172 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1597,11 +1666,11 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self result = _tmp5_; #line 172 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1601 "SearchBoolean.c" +#line 1670 "SearchBoolean.c" } #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE: -#line 1605 "SearchBoolean.c" +#line 1674 "SearchBoolean.c" { gchar* _tmp6_; #line 175 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1610,11 +1679,11 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self result = _tmp6_; #line 175 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1614 "SearchBoolean.c" +#line 1683 "SearchBoolean.c" } #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE: -#line 1618 "SearchBoolean.c" +#line 1687 "SearchBoolean.c" { gchar* _tmp7_; #line 178 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1623,11 +1692,11 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self result = _tmp7_; #line 178 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1627 "SearchBoolean.c" +#line 1696 "SearchBoolean.c" } #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE: -#line 1631 "SearchBoolean.c" +#line 1700 "SearchBoolean.c" { gchar* _tmp8_; #line 181 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1636,11 +1705,11 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self result = _tmp8_; #line 181 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1640 "SearchBoolean.c" +#line 1709 "SearchBoolean.c" } #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_RATING: -#line 1644 "SearchBoolean.c" +#line 1713 "SearchBoolean.c" { gchar* _tmp9_; #line 184 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1649,11 +1718,11 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self result = _tmp9_; #line 184 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1653 "SearchBoolean.c" +#line 1722 "SearchBoolean.c" } #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_DATE: -#line 1657 "SearchBoolean.c" +#line 1726 "SearchBoolean.c" { gchar* _tmp10_; #line 187 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1662,19 +1731,21 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self result = _tmp10_; #line 187 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1666 "SearchBoolean.c" +#line 1735 "SearchBoolean.c" } default: { #line 190 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:190: unrecognized search type enumeration value"); -#line 1672 "SearchBoolean.c" +#line 1741 "SearchBoolean.c" } } } -GType search_condition_search_type_get_type (void) { +GType +search_condition_search_type_get_type (void) +{ static volatile gsize search_condition_search_type_type_id__volatile = 0; if (g_once_init_enter (&search_condition_search_type_type_id__volatile)) { static const GEnumValue values[] = {{SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT, "SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT", "any-text"}, {SEARCH_CONDITION_SEARCH_TYPE_TITLE, "SEARCH_CONDITION_SEARCH_TYPE_TITLE", "title"}, {SEARCH_CONDITION_SEARCH_TYPE_TAG, "SEARCH_CONDITION_SEARCH_TYPE_TAG", "tag"}, {SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME, "SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME", "event-name"}, {SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME, "SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME", "file-name"}, {SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE, "SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE", "media-type"}, {SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE, "SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE", "flag-state"}, {SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE, "SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE", "modified-state"}, {SEARCH_CONDITION_SEARCH_TYPE_RATING, "SEARCH_CONDITION_SEARCH_TYPE_RATING", "rating"}, {SEARCH_CONDITION_SEARCH_TYPE_COMMENT, "SEARCH_CONDITION_SEARCH_TYPE_COMMENT", "comment"}, {SEARCH_CONDITION_SEARCH_TYPE_DATE, "SEARCH_CONDITION_SEARCH_TYPE_DATE", "date"}, {0, NULL, NULL}}; @@ -1686,36 +1757,46 @@ GType search_condition_search_type_get_type (void) { } -static gboolean search_condition_real_predicate (SearchCondition* self, MediaSource* source) { +static gboolean +search_condition_real_predicate (SearchCondition* self, + MediaSource* source) +{ gboolean _tmp0_ = FALSE; #line 198 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_critical ("Type `%s' does not implement abstract method `search_condition_predicate'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 198 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return _tmp0_; -#line 1696 "SearchBoolean.c" +#line 1770 "SearchBoolean.c" } -gboolean search_condition_predicate (SearchCondition* self, MediaSource* source) { +gboolean +search_condition_predicate (SearchCondition* self, + MediaSource* source) +{ #line 198 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SEARCH_CONDITION (self), FALSE); #line 198 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return SEARCH_CONDITION_GET_CLASS (self)->predicate (self, source); -#line 1705 "SearchBoolean.c" +#line 1782 "SearchBoolean.c" } -SearchCondition* search_condition_construct (GType object_type) { +SearchCondition* +search_condition_construct (GType object_type) +{ SearchCondition* self = NULL; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = (SearchCondition*) g_type_create_instance (object_type); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 1715 "SearchBoolean.c" +#line 1794 "SearchBoolean.c" } -SearchConditionSearchType search_condition_get_search_type (SearchCondition* self) { +SearchConditionSearchType +search_condition_get_search_type (SearchCondition* self) +{ SearchConditionSearchType result; SearchConditionSearchType _tmp0_; #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1726,120 +1807,145 @@ SearchConditionSearchType search_condition_get_search_type (SearchCondition* sel result = _tmp0_; #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1730 "SearchBoolean.c" +#line 1811 "SearchBoolean.c" } -void search_condition_set_search_type (SearchCondition* self, SearchConditionSearchType value) { - SearchConditionSearchType _tmp0_; +void +search_condition_set_search_type (SearchCondition* self, + SearchConditionSearchType value) +{ #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION (self)); #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = value; -#line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - self->priv->_search_type = _tmp0_; -#line 1742 "SearchBoolean.c" + self->priv->_search_type = value; +#line 1823 "SearchBoolean.c" } -static void value_search_condition_init (GValue* value) { +static void +value_search_condition_init (GValue* value) +{ #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 1749 "SearchBoolean.c" +#line 1832 "SearchBoolean.c" } -static void value_search_condition_free_value (GValue* value) { +static void +value_search_condition_free_value (GValue* value) +{ #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (value->data[0].v_pointer) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_unref (value->data[0].v_pointer); -#line 1758 "SearchBoolean.c" +#line 1843 "SearchBoolean.c" } } -static void value_search_condition_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_search_condition_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (src_value->data[0].v_pointer) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" dest_value->data[0].v_pointer = search_condition_ref (src_value->data[0].v_pointer); -#line 1768 "SearchBoolean.c" +#line 1856 "SearchBoolean.c" } else { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" dest_value->data[0].v_pointer = NULL; -#line 1772 "SearchBoolean.c" +#line 1860 "SearchBoolean.c" } } -static gpointer value_search_condition_peek_pointer (const GValue* value) { +static gpointer +value_search_condition_peek_pointer (const GValue* value) +{ #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return value->data[0].v_pointer; -#line 1780 "SearchBoolean.c" +#line 1870 "SearchBoolean.c" } -static gchar* value_search_condition_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_search_condition_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (collect_values[0].v_pointer) { -#line 1787 "SearchBoolean.c" +#line 1882 "SearchBoolean.c" SearchCondition * object; object = collect_values[0].v_pointer; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (object->parent_instance.g_class == NULL) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1794 "SearchBoolean.c" +#line 1889 "SearchBoolean.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.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 1798 "SearchBoolean.c" +#line 1893 "SearchBoolean.c" } #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = search_condition_ref (object); -#line 1802 "SearchBoolean.c" +#line 1897 "SearchBoolean.c" } else { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 1806 "SearchBoolean.c" +#line 1901 "SearchBoolean.c" } #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 1810 "SearchBoolean.c" +#line 1905 "SearchBoolean.c" } -static gchar* value_search_condition_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_search_condition_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ SearchCondition ** object_p; object_p = collect_values[0].v_pointer; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!object_p) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1821 "SearchBoolean.c" +#line 1921 "SearchBoolean.c" } #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!value->data[0].v_pointer) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" *object_p = NULL; -#line 1827 "SearchBoolean.c" +#line 1927 "SearchBoolean.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" *object_p = value->data[0].v_pointer; -#line 1831 "SearchBoolean.c" +#line 1931 "SearchBoolean.c" } else { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" *object_p = search_condition_ref (value->data[0].v_pointer); -#line 1835 "SearchBoolean.c" +#line 1935 "SearchBoolean.c" } #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 1839 "SearchBoolean.c" +#line 1939 "SearchBoolean.c" } -GParamSpec* param_spec_search_condition (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_search_condition (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecSearchCondition* spec; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_SEARCH_CONDITION), NULL); @@ -1849,20 +1955,25 @@ GParamSpec* param_spec_search_condition (const gchar* name, const gchar* nick, c G_PARAM_SPEC (spec)->value_type = object_type; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return G_PARAM_SPEC (spec); -#line 1853 "SearchBoolean.c" +#line 1959 "SearchBoolean.c" } -gpointer value_get_search_condition (const GValue* value) { +gpointer +value_get_search_condition (const GValue* value) +{ #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_CONDITION), NULL); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return value->data[0].v_pointer; -#line 1862 "SearchBoolean.c" +#line 1970 "SearchBoolean.c" } -void value_set_search_condition (GValue* value, gpointer v_object) { +void +value_set_search_condition (GValue* value, + gpointer v_object) +{ SearchCondition * old; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_CONDITION)); @@ -1878,22 +1989,25 @@ void value_set_search_condition (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_ref (value->data[0].v_pointer); -#line 1882 "SearchBoolean.c" +#line 1993 "SearchBoolean.c" } else { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 1886 "SearchBoolean.c" +#line 1997 "SearchBoolean.c" } #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (old) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_unref (old); -#line 1892 "SearchBoolean.c" +#line 2003 "SearchBoolean.c" } } -void value_take_search_condition (GValue* value, gpointer v_object) { +void +value_take_search_condition (GValue* value, + gpointer v_object) +{ SearchCondition * old; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_CONDITION)); @@ -1907,22 +2021,24 @@ void value_take_search_condition (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = v_object; -#line 1911 "SearchBoolean.c" +#line 2025 "SearchBoolean.c" } else { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 1915 "SearchBoolean.c" +#line 2029 "SearchBoolean.c" } #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (old) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_unref (old); -#line 1921 "SearchBoolean.c" +#line 2035 "SearchBoolean.c" } } -static void search_condition_class_init (SearchConditionClass * klass) { +static void +search_condition_class_init (SearchConditionClass * klass) +{ #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_parent_class = g_type_class_peek_parent (klass); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1931,30 +2047,36 @@ static void search_condition_class_init (SearchConditionClass * klass) { g_type_class_add_private (klass, sizeof (SearchConditionPrivate)); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_real_predicate; -#line 1935 "SearchBoolean.c" +#line 2051 "SearchBoolean.c" } -static void search_condition_instance_init (SearchCondition * self) { +static void +search_condition_instance_init (SearchCondition * self) +{ #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SEARCH_CONDITION_GET_PRIVATE (self); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->ref_count = 1; -#line 1944 "SearchBoolean.c" +#line 2062 "SearchBoolean.c" } -static void search_condition_finalize (SearchCondition * obj) { +static void +search_condition_finalize (SearchCondition * obj) +{ SearchCondition * self; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION, SearchCondition); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_signal_handlers_destroy (self); -#line 1954 "SearchBoolean.c" +#line 2074 "SearchBoolean.c" } -GType search_condition_get_type (void) { +GType +search_condition_get_type (void) +{ static volatile gsize search_condition_type_id__volatile = 0; if (g_once_init_enter (&search_condition_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_search_condition_init, value_search_condition_free_value, value_search_condition_copy_value, value_search_condition_peek_pointer, "p", value_search_condition_collect_value, "p", value_search_condition_lcopy_value }; @@ -1968,18 +2090,22 @@ GType search_condition_get_type (void) { } -gpointer search_condition_ref (gpointer instance) { +gpointer +search_condition_ref (gpointer instance) +{ SearchCondition * self; self = instance; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_atomic_int_inc (&self->ref_count); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return instance; -#line 1979 "SearchBoolean.c" +#line 2103 "SearchBoolean.c" } -void search_condition_unref (gpointer instance) { +void +search_condition_unref (gpointer instance) +{ SearchCondition * self; self = instance; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1988,18 +2114,20 @@ void search_condition_unref (gpointer instance) { SEARCH_CONDITION_GET_CLASS (self)->finalize (self); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1992 "SearchBoolean.c" +#line 2118 "SearchBoolean.c" } } -gchar* search_condition_text_context_to_string (SearchConditionTextContext self) { +gchar* +search_condition_text_context_to_string (SearchConditionTextContext self) +{ gchar* result = NULL; #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" switch (self) { #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_CONTAINS: -#line 2003 "SearchBoolean.c" +#line 2131 "SearchBoolean.c" { gchar* _tmp0_; #line 215 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2008,11 +2136,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self) result = _tmp0_; #line 215 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2012 "SearchBoolean.c" +#line 2140 "SearchBoolean.c" } #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY: -#line 2016 "SearchBoolean.c" +#line 2144 "SearchBoolean.c" { gchar* _tmp1_; #line 218 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2021,11 +2149,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self) result = _tmp1_; #line 218 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2025 "SearchBoolean.c" +#line 2153 "SearchBoolean.c" } #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH: -#line 2029 "SearchBoolean.c" +#line 2157 "SearchBoolean.c" { gchar* _tmp2_; #line 221 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2034,11 +2162,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self) result = _tmp2_; #line 221 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2038 "SearchBoolean.c" +#line 2166 "SearchBoolean.c" } #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH: -#line 2042 "SearchBoolean.c" +#line 2170 "SearchBoolean.c" { gchar* _tmp3_; #line 224 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2047,11 +2175,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self) result = _tmp3_; #line 224 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2051 "SearchBoolean.c" +#line 2179 "SearchBoolean.c" } #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN: -#line 2055 "SearchBoolean.c" +#line 2183 "SearchBoolean.c" { gchar* _tmp4_; #line 227 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2060,11 +2188,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self) result = _tmp4_; #line 227 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2064 "SearchBoolean.c" +#line 2192 "SearchBoolean.c" } #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET: -#line 2068 "SearchBoolean.c" +#line 2196 "SearchBoolean.c" { gchar* _tmp5_; #line 230 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2073,11 +2201,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self) result = _tmp5_; #line 230 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2077 "SearchBoolean.c" +#line 2205 "SearchBoolean.c" } #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_IS_SET: -#line 2081 "SearchBoolean.c" +#line 2209 "SearchBoolean.c" { gchar* _tmp6_; #line 233 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2086,106 +2214,84 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self) result = _tmp6_; #line 233 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2090 "SearchBoolean.c" +#line 2218 "SearchBoolean.c" } default: { #line 236 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:236: unrecognized text search context enumeration v" \ "alue"); -#line 2096 "SearchBoolean.c" +#line 2224 "SearchBoolean.c" } } } -SearchConditionTextContext search_condition_text_context_from_string (const gchar* str) { +SearchConditionTextContext +search_condition_text_context_from_string (const gchar* str) +{ SearchConditionTextContext result = 0; - const gchar* _tmp0_; #line 240 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (str != NULL, 0); #line 241 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = str; -#line 241 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp0_, "CONTAINS") == 0) { + if (g_strcmp0 (str, "CONTAINS") == 0) { #line 242 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_TEXT_CONTEXT_CONTAINS; #line 242 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2115 "SearchBoolean.c" +#line 2242 "SearchBoolean.c" } else { - const gchar* _tmp1_; #line 244 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = str; -#line 244 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp1_, "IS_EXACTLY") == 0) { + if (g_strcmp0 (str, "IS_EXACTLY") == 0) { #line 245 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY; #line 245 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2126 "SearchBoolean.c" +#line 2250 "SearchBoolean.c" } else { - const gchar* _tmp2_; -#line 247 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = str; #line 247 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp2_, "STARTS_WITH") == 0) { + if (g_strcmp0 (str, "STARTS_WITH") == 0) { #line 248 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH; #line 248 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2137 "SearchBoolean.c" +#line 2258 "SearchBoolean.c" } else { - const gchar* _tmp3_; #line 250 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = str; -#line 250 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp3_, "ENDS_WITH") == 0) { + if (g_strcmp0 (str, "ENDS_WITH") == 0) { #line 251 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH; #line 251 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2148 "SearchBoolean.c" +#line 2266 "SearchBoolean.c" } else { - const gchar* _tmp4_; -#line 253 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = str; #line 253 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp4_, "DOES_NOT_CONTAIN") == 0) { + if (g_strcmp0 (str, "DOES_NOT_CONTAIN") == 0) { #line 254 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN; #line 254 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2159 "SearchBoolean.c" +#line 2274 "SearchBoolean.c" } else { - const gchar* _tmp5_; -#line 256 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp5_ = str; #line 256 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp5_, "IS_NOT_SET") == 0) { + if (g_strcmp0 (str, "IS_NOT_SET") == 0) { #line 257 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET; #line 257 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2170 "SearchBoolean.c" +#line 2282 "SearchBoolean.c" } else { - const gchar* _tmp6_; -#line 259 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp6_ = str; #line 259 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp6_, "IS_SET") == 0) { + if (g_strcmp0 (str, "IS_SET") == 0) { #line 260 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_TEXT_CONTEXT_IS_SET; #line 260 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2181 "SearchBoolean.c" +#line 2290 "SearchBoolean.c" } else { - const gchar* _tmp7_; #line 263 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp7_ = str; -#line 263 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - g_error ("SearchBoolean.vala:263: unrecognized text search context name: %s", _tmp7_); -#line 2188 "SearchBoolean.c" + g_error ("SearchBoolean.vala:263: unrecognized text search context name: %s", str); +#line 2294 "SearchBoolean.c" } } } @@ -2196,7 +2302,9 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha } -GType search_condition_text_context_get_type (void) { +GType +search_condition_text_context_get_type (void) +{ static volatile gsize search_condition_text_context_type_id__volatile = 0; if (g_once_init_enter (&search_condition_text_context_type_id__volatile)) { static const GEnumValue values[] = {{SEARCH_CONDITION_TEXT_CONTEXT_CONTAINS, "SEARCH_CONDITION_TEXT_CONTEXT_CONTAINS", "contains"}, {SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY, "SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY", "is-exactly"}, {SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH, "SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH", "starts-with"}, {SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH, "SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH", "ends-with"}, {SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN, "SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN", "does-not-contain"}, {SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET, "SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET", "is-not-set"}, {SEARCH_CONDITION_TEXT_CONTEXT_IS_SET, "SEARCH_CONDITION_TEXT_CONTEXT_IS_SET", "is-set"}, {0, NULL, NULL}}; @@ -2208,94 +2316,95 @@ GType search_condition_text_context_get_type (void) { } -SearchConditionText* search_condition_text_construct (GType object_type, SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context) { +SearchConditionText* +search_condition_text_construct (GType object_type, + SearchConditionSearchType search_type, + const gchar* text, + SearchConditionTextContext context) +{ SearchConditionText* self = NULL; - SearchConditionSearchType _tmp0_; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_; - SearchConditionTextContext _tmp8_; + gchar* _tmp0_ = NULL; #line 273 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = (SearchConditionText*) search_condition_construct (object_type); #line 274 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = search_type; -#line 274 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), _tmp0_); -#line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = text; + search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), search_type); #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp2_ != NULL) { -#line 2227 "SearchBoolean.c" - const gchar* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; + if (text != NULL) { +#line 2333 "SearchBoolean.c" + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = text; + _tmp1_ = g_utf8_strdown (text, (gssize) -1); #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = g_utf8_strdown (_tmp3_, (gssize) -1); -#line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp6_ = string_remove_diacritics (_tmp5_); + _tmp3_ = string_remove_diacritics (_tmp2_); #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp1_); + _g_free0 (_tmp0_); #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = _tmp6_; + _tmp0_ = _tmp3_; #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp5_); -#line 2246 "SearchBoolean.c" + _g_free0 (_tmp2_); +#line 2349 "SearchBoolean.c" } else { - gchar* _tmp7_; + gchar* _tmp4_; #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp7_ = g_strdup (""); + _tmp4_ = g_strdup (""); #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp1_); + _g_free0 (_tmp0_); #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = _tmp7_; -#line 2255 "SearchBoolean.c" + _tmp0_ = _tmp4_; +#line 2358 "SearchBoolean.c" } #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search_condition_text_set_text (self, _tmp1_); + search_condition_text_set_text (self, _tmp0_); #line 276 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp8_ = context; -#line 276 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search_condition_text_set_context (self, _tmp8_); + search_condition_text_set_context (self, context); #line 273 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp1_); + _g_free0 (_tmp0_); #line 273 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 2267 "SearchBoolean.c" +#line 2368 "SearchBoolean.c" } -SearchConditionText* search_condition_text_new (SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context) { +SearchConditionText* +search_condition_text_new (SearchConditionSearchType search_type, + const gchar* text, + SearchConditionTextContext context) +{ #line 273 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return search_condition_text_construct (TYPE_SEARCH_CONDITION_TEXT, search_type, text, context); -#line 2274 "SearchBoolean.c" +#line 2379 "SearchBoolean.c" } -static gboolean string_contains (const gchar* self, const gchar* needle) { +static gboolean +string_contains (const gchar* self, + const gchar* needle) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gchar* _tmp1_; -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = needle; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_ != NULL; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = strstr ((gchar*) self, (gchar*) needle); +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_ != NULL; +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2294 "SearchBoolean.c" +#line 2399 "SearchBoolean.c" } -static gboolean search_condition_text_string_match (SearchConditionText* self, const gchar* needle, const gchar* haystack) { +static gboolean +search_condition_text_string_match (SearchConditionText* self, + const gchar* needle, + const gchar* haystack) +{ gboolean result = FALSE; SearchConditionTextContext _tmp0_; #line 280 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2310,222 +2419,154 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c case SEARCH_CONDITION_TEXT_CONTEXT_CONTAINS: #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN: -#line 2313 "SearchBoolean.c" +#line 2422 "SearchBoolean.c" { gboolean _tmp1_ = FALSE; - const gchar* _tmp2_; - gboolean _tmp3_; -#line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = haystack; -#line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = is_string_empty (_tmp2_); -#line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (!_tmp3_) { -#line 2324 "SearchBoolean.c" - const gchar* _tmp4_; - const gchar* _tmp5_; - gboolean _tmp6_; #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = haystack; + if (!is_string_empty (haystack)) { #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp5_ = needle; -#line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp6_ = string_contains (_tmp4_, _tmp5_); -#line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = _tmp6_; -#line 2336 "SearchBoolean.c" + _tmp1_ = string_contains (haystack, needle); +#line 2429 "SearchBoolean.c" } else { #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = FALSE; -#line 2340 "SearchBoolean.c" +#line 2433 "SearchBoolean.c" } #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp1_; #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2346 "SearchBoolean.c" +#line 2439 "SearchBoolean.c" } #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY: -#line 2350 "SearchBoolean.c" +#line 2443 "SearchBoolean.c" { - gboolean _tmp7_ = FALSE; - const gchar* _tmp8_; - gboolean _tmp9_; -#line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp8_ = haystack; -#line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp9_ = is_string_empty (_tmp8_); -#line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (!_tmp9_) { -#line 2361 "SearchBoolean.c" - const gchar* _tmp10_; - const gchar* _tmp11_; -#line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp10_ = haystack; + gboolean _tmp2_ = FALSE; #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp11_ = needle; + if (!is_string_empty (haystack)) { #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp7_ = g_strcmp0 (_tmp10_, _tmp11_) == 0; -#line 2370 "SearchBoolean.c" + _tmp2_ = g_strcmp0 (haystack, needle) == 0; +#line 2450 "SearchBoolean.c" } else { #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp7_ = FALSE; -#line 2374 "SearchBoolean.c" + _tmp2_ = FALSE; +#line 2454 "SearchBoolean.c" } #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp7_; + result = _tmp2_; #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2380 "SearchBoolean.c" +#line 2460 "SearchBoolean.c" } #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH: -#line 2384 "SearchBoolean.c" +#line 2464 "SearchBoolean.c" { - gboolean _tmp12_ = FALSE; - const gchar* _tmp13_; - gboolean _tmp14_; -#line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp13_ = haystack; -#line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp14_ = is_string_empty (_tmp13_); -#line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (!_tmp14_) { -#line 2395 "SearchBoolean.c" - const gchar* _tmp15_; - const gchar* _tmp16_; - gboolean _tmp17_; -#line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp15_ = haystack; + gboolean _tmp3_ = FALSE; #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp16_ = needle; + if (!is_string_empty (haystack)) { #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp17_ = g_str_has_prefix (_tmp15_, _tmp16_); -#line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp12_ = _tmp17_; -#line 2407 "SearchBoolean.c" + _tmp3_ = g_str_has_prefix (haystack, needle); +#line 2471 "SearchBoolean.c" } else { #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp12_ = FALSE; -#line 2411 "SearchBoolean.c" + _tmp3_ = FALSE; +#line 2475 "SearchBoolean.c" } #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp12_; + result = _tmp3_; #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2417 "SearchBoolean.c" +#line 2481 "SearchBoolean.c" } #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH: -#line 2421 "SearchBoolean.c" +#line 2485 "SearchBoolean.c" { - gboolean _tmp18_ = FALSE; - const gchar* _tmp19_; - gboolean _tmp20_; -#line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp19_ = haystack; -#line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp20_ = is_string_empty (_tmp19_); -#line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (!_tmp20_) { -#line 2432 "SearchBoolean.c" - const gchar* _tmp21_; - const gchar* _tmp22_; - gboolean _tmp23_; -#line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp21_ = haystack; -#line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp22_ = needle; + gboolean _tmp4_ = FALSE; #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp23_ = g_str_has_suffix (_tmp21_, _tmp22_); + if (!is_string_empty (haystack)) { #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp18_ = _tmp23_; -#line 2444 "SearchBoolean.c" + _tmp4_ = g_str_has_suffix (haystack, needle); +#line 2492 "SearchBoolean.c" } else { #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp18_ = FALSE; -#line 2448 "SearchBoolean.c" + _tmp4_ = FALSE; +#line 2496 "SearchBoolean.c" } #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp18_; + result = _tmp4_; #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2454 "SearchBoolean.c" +#line 2502 "SearchBoolean.c" } #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET: -#line 2458 "SearchBoolean.c" +#line 2506 "SearchBoolean.c" { - const gchar* _tmp24_; - gboolean _tmp25_; -#line 296 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp24_ = haystack; #line 296 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp25_ = is_string_empty (_tmp24_); -#line 296 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp25_; + result = is_string_empty (haystack); #line 296 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2470 "SearchBoolean.c" +#line 2512 "SearchBoolean.c" } #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_IS_SET: -#line 2474 "SearchBoolean.c" +#line 2516 "SearchBoolean.c" { - const gchar* _tmp26_; - gboolean _tmp27_; -#line 299 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp26_ = haystack; #line 299 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp27_ = is_string_empty (_tmp26_); -#line 299 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = !_tmp27_; + result = !is_string_empty (haystack); #line 299 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2486 "SearchBoolean.c" +#line 2522 "SearchBoolean.c" } default: #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" break; -#line 2491 "SearchBoolean.c" +#line 2527 "SearchBoolean.c" } #line 302 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = FALSE; #line 302 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2497 "SearchBoolean.c" +#line 2533 "SearchBoolean.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self ? g_object_ref (self) : NULL; -#line 2504 "SearchBoolean.c" +#line 2542 "SearchBoolean.c" } -static gboolean search_condition_text_real_predicate (SearchCondition* base, MediaSource* source) { +static gboolean +search_condition_text_real_predicate (SearchCondition* base, + MediaSource* source) +{ SearchConditionText * self; gboolean result = FALSE; gboolean ret = FALSE; gboolean _tmp0_ = FALSE; SearchConditionSearchType _tmp1_; SearchConditionSearchType _tmp2_; - gboolean _tmp21_ = FALSE; - SearchConditionSearchType _tmp22_; - SearchConditionSearchType _tmp23_; - gboolean _tmp52_ = FALSE; - SearchConditionSearchType _tmp53_; - SearchConditionSearchType _tmp54_; - gboolean _tmp75_ = FALSE; - SearchConditionSearchType _tmp76_; - SearchConditionSearchType _tmp77_; - gboolean _tmp91_ = FALSE; - SearchConditionSearchType _tmp92_; - SearchConditionSearchType _tmp93_; - gboolean _tmp106_ = FALSE; - SearchConditionTextContext _tmp107_; + gboolean _tmp18_ = FALSE; + SearchConditionSearchType _tmp19_; + SearchConditionSearchType _tmp20_; + gboolean _tmp46_ = FALSE; + SearchConditionSearchType _tmp47_; + SearchConditionSearchType _tmp48_; + gboolean _tmp66_ = FALSE; + SearchConditionSearchType _tmp67_; + SearchConditionSearchType _tmp68_; + gboolean _tmp80_ = FALSE; + SearchConditionSearchType _tmp81_; + SearchConditionSearchType _tmp82_; + gboolean _tmp93_ = FALSE; + SearchConditionTextContext _tmp94_; #line 306 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEARCH_CONDITION_TEXT, SearchConditionText); #line 306 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2540,7 +2581,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp2_) { #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = TRUE; -#line 2543 "SearchBoolean.c" +#line 2584 "SearchBoolean.c" } else { SearchConditionSearchType _tmp3_; SearchConditionSearchType _tmp4_; @@ -2550,523 +2591,486 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _tmp4_ = _tmp3_; #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = SEARCH_CONDITION_SEARCH_TYPE_TITLE == _tmp4_; -#line 2553 "SearchBoolean.c" +#line 2594 "SearchBoolean.c" } #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp0_) { -#line 2557 "SearchBoolean.c" +#line 2598 "SearchBoolean.c" gchar* _tmp5_ = NULL; - MediaSource* _tmp6_; + gchar* _tmp6_; gchar* _tmp7_; - gchar* _tmp8_; - gboolean _tmp9_; + gboolean _tmp8_; gchar* title = NULL; - gchar* _tmp16_; - gboolean _tmp17_; - const gchar* _tmp18_; - const gchar* _tmp19_; - gboolean _tmp20_; + gchar* _tmp14_; + gboolean _tmp15_; + const gchar* _tmp16_; + const gchar* _tmp17_; #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp6_ = source; + _tmp6_ = media_source_get_title (source); #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp7_ = media_source_get_title (_tmp6_); -#line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp9_ = NULL != _tmp8_; + _tmp8_ = NULL != _tmp7_; #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp7_); #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp9_) { -#line 2581 "SearchBoolean.c" - MediaSource* _tmp10_; + if (_tmp8_) { +#line 2618 "SearchBoolean.c" + gchar* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; gchar* _tmp12_; gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; -#line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp10_ = source; #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp11_ = media_source_get_title (_tmp10_); + _tmp9_ = media_source_get_title (source); #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp13_ = g_utf8_strdown (_tmp12_, (gssize) -1); + _tmp11_ = g_utf8_strdown (_tmp10_, (gssize) -1); #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp15_ = string_remove_diacritics (_tmp14_); + _tmp13_ = string_remove_diacritics (_tmp12_); #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp5_); #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp5_ = _tmp15_; -#line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp14_); + _tmp5_ = _tmp13_; #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp12_); -#line 2608 "SearchBoolean.c" +#line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" + _g_free0 (_tmp10_); +#line 2642 "SearchBoolean.c" } else { #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp5_); #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp5_ = NULL; -#line 2614 "SearchBoolean.c" +#line 2648 "SearchBoolean.c" } #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp16_ = g_strdup (_tmp5_); + _tmp14_ = g_strdup (_tmp5_); #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - title = _tmp16_; -#line 313 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp17_ = ret; + title = _tmp14_; #line 313 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp18_ = self->priv->_text; + _tmp15_ = ret; #line 313 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp19_ = title; + _tmp16_ = self->priv->_text; #line 313 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp20_ = search_condition_text_string_match (self, _tmp18_, _tmp19_); + _tmp17_ = title; #line 313 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ret = _tmp17_ | _tmp20_; + ret = _tmp15_ | search_condition_text_string_match (self, _tmp16_, _tmp17_); #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (title); #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp5_); -#line 2634 "SearchBoolean.c" +#line 2666 "SearchBoolean.c" } #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp22_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp19_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp23_ = _tmp22_; + _tmp20_ = _tmp19_; #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp23_) { + if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp20_) { #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp21_ = TRUE; -#line 2644 "SearchBoolean.c" + _tmp18_ = TRUE; +#line 2676 "SearchBoolean.c" } else { - SearchConditionSearchType _tmp24_; - SearchConditionSearchType _tmp25_; + SearchConditionSearchType _tmp21_; + SearchConditionSearchType _tmp22_; #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp24_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp21_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp25_ = _tmp24_; + _tmp22_ = _tmp21_; #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp21_ = SEARCH_CONDITION_SEARCH_TYPE_TAG == _tmp25_; -#line 2654 "SearchBoolean.c" + _tmp18_ = SEARCH_CONDITION_SEARCH_TYPE_TAG == _tmp22_; +#line 2686 "SearchBoolean.c" } #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp21_) { -#line 2658 "SearchBoolean.c" + if (_tmp18_) { +#line 2690 "SearchBoolean.c" GeeList* tag_list = NULL; - TagSourceCollection* _tmp26_; - MediaSource* _tmp27_; - GeeList* _tmp28_; - GeeList* _tmp29_; -#line 318 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp26_ = tag_global; + TagSourceCollection* _tmp23_; + GeeList* _tmp24_; + GeeList* _tmp25_; #line 318 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp27_ = source; + _tmp23_ = tag_global; #line 318 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp28_ = tag_source_collection_fetch_for_source (_tmp26_, _tmp27_); + _tmp24_ = tag_source_collection_fetch_for_source (_tmp23_, source); #line 318 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - tag_list = _tmp28_; + tag_list = _tmp24_; #line 319 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp29_ = tag_list; + _tmp25_ = tag_list; #line 319 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (NULL != _tmp29_) { -#line 2676 "SearchBoolean.c" + if (NULL != _tmp25_) { +#line 2705 "SearchBoolean.c" gchar* itag = NULL; { GeeList* _tag_list = NULL; - GeeList* _tmp30_; - GeeList* _tmp31_; + GeeList* _tmp26_; + GeeList* _tmp27_; gint _tag_size = 0; - GeeList* _tmp32_; - gint _tmp33_; - gint _tmp34_; + GeeList* _tmp28_; + gint _tmp29_; + gint _tmp30_; gint _tag_index = 0; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp30_ = tag_list; + _tmp26_ = tag_list; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp31_ = _g_object_ref0 (_tmp30_); + _tmp27_ = _g_object_ref0 (_tmp26_); #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tag_list = _tmp31_; + _tag_list = _tmp27_; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp32_ = _tag_list; + _tmp28_ = _tag_list; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp33_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp29_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection)); #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp34_ = _tmp33_; + _tmp30_ = _tmp29_; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tag_size = _tmp34_; + _tag_size = _tmp30_; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tag_index = -1; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" while (TRUE) { -#line 2705 "SearchBoolean.c" - gint _tmp35_; - gint _tmp36_; - gint _tmp37_; +#line 2734 "SearchBoolean.c" + gint _tmp31_; + gint _tmp32_; + gint _tmp33_; Tag* tag = NULL; - GeeList* _tmp38_; - gint _tmp39_; - gpointer _tmp40_; - Tag* _tmp41_; - gchar* _tmp42_; - gchar* _tmp43_; - gchar* _tmp44_; - gboolean _tmp45_; - const gchar* _tmp46_; - const gchar* _tmp47_; - gboolean _tmp48_; + GeeList* _tmp34_; + gint _tmp35_; + gpointer _tmp36_; + Tag* _tmp37_; + gchar* _tmp38_; + gchar* _tmp39_; + gchar* _tmp40_; + gboolean _tmp41_; + const gchar* _tmp42_; + const gchar* _tmp43_; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp35_ = _tag_index; + _tmp31_ = _tag_index; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tag_index = _tmp35_ + 1; + _tag_index = _tmp31_ + 1; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp36_ = _tag_index; + _tmp32_ = _tag_index; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp37_ = _tag_size; + _tmp33_ = _tag_size; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (!(_tmp36_ < _tmp37_)) { + if (!(_tmp32_ < _tmp33_)) { #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" break; -#line 2733 "SearchBoolean.c" +#line 2761 "SearchBoolean.c" } #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp38_ = _tag_list; + _tmp34_ = _tag_list; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp39_ = _tag_index; + _tmp35_ = _tag_index; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp40_ = gee_list_get (_tmp38_, _tmp39_); + _tmp36_ = gee_list_get (_tmp34_, _tmp35_); #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - tag = (Tag*) _tmp40_; + tag = (Tag*) _tmp36_; #line 322 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp41_ = tag; + _tmp37_ = tag; #line 322 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp42_ = tag_get_searchable_name (_tmp41_); + _tmp38_ = tag_get_searchable_name (_tmp37_); #line 322 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp43_ = _tmp42_; + _tmp39_ = _tmp38_; #line 322 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp44_ = g_utf8_strdown (_tmp43_, (gssize) -1); + _tmp40_ = g_utf8_strdown (_tmp39_, (gssize) -1); #line 322 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (itag); #line 322 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - itag = _tmp44_; + itag = _tmp40_; #line 322 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp43_); -#line 323 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp45_ = ret; + _g_free0 (_tmp39_); #line 323 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp46_ = self->priv->_text; + _tmp41_ = ret; #line 323 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp47_ = itag; + _tmp42_ = self->priv->_text; #line 323 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp48_ = search_condition_text_string_match (self, _tmp46_, _tmp47_); + _tmp43_ = itag; #line 323 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ret = _tmp45_ | _tmp48_; + ret = _tmp41_ | search_condition_text_string_match (self, _tmp42_, _tmp43_); #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (tag); -#line 2769 "SearchBoolean.c" +#line 2795 "SearchBoolean.c" } #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (_tag_list); -#line 2773 "SearchBoolean.c" +#line 2799 "SearchBoolean.c" } #line 319 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (itag); -#line 2777 "SearchBoolean.c" +#line 2803 "SearchBoolean.c" } else { - gboolean _tmp49_; - const gchar* _tmp50_; - gboolean _tmp51_; + gboolean _tmp44_; + const gchar* _tmp45_; #line 326 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp49_ = ret; + _tmp44_ = ret; #line 326 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp50_ = self->priv->_text; + _tmp45_ = self->priv->_text; #line 326 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp51_ = search_condition_text_string_match (self, _tmp50_, NULL); -#line 326 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ret = _tmp49_ | _tmp51_; -#line 2790 "SearchBoolean.c" + ret = _tmp44_ | search_condition_text_string_match (self, _tmp45_, NULL); +#line 2813 "SearchBoolean.c" } #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (tag_list); -#line 2794 "SearchBoolean.c" +#line 2817 "SearchBoolean.c" } #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp53_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp47_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp54_ = _tmp53_; + _tmp48_ = _tmp47_; #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp54_) { + if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp48_) { #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp52_ = TRUE; -#line 2804 "SearchBoolean.c" + _tmp46_ = TRUE; +#line 2827 "SearchBoolean.c" } else { - SearchConditionSearchType _tmp55_; - SearchConditionSearchType _tmp56_; + SearchConditionSearchType _tmp49_; + SearchConditionSearchType _tmp50_; #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp55_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp49_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp56_ = _tmp55_; + _tmp50_ = _tmp49_; #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp52_ = SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME == _tmp56_; -#line 2814 "SearchBoolean.c" + _tmp46_ = SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME == _tmp50_; +#line 2837 "SearchBoolean.c" } #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp52_) { -#line 2818 "SearchBoolean.c" - gchar* _tmp57_ = NULL; - MediaSource* _tmp58_; - Event* _tmp59_; - Event* _tmp60_; - gboolean _tmp61_; + if (_tmp46_) { +#line 2841 "SearchBoolean.c" + gchar* _tmp51_ = NULL; + Event* _tmp52_; + Event* _tmp53_; + gboolean _tmp54_; gchar* event_name = NULL; - gchar* _tmp70_; - gboolean _tmp71_; - const gchar* _tmp72_; - const gchar* _tmp73_; - gboolean _tmp74_; + gchar* _tmp62_; + gboolean _tmp63_; + const gchar* _tmp64_; + const gchar* _tmp65_; #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp58_ = source; + _tmp52_ = media_source_get_event (source); #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp59_ = media_source_get_event (_tmp58_); + _tmp53_ = _tmp52_; #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp60_ = _tmp59_; + _tmp54_ = NULL != _tmp53_; #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp61_ = NULL != _tmp60_; + _g_object_unref0 (_tmp53_); #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_object_unref0 (_tmp60_); -#line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp61_) { -#line 2842 "SearchBoolean.c" - MediaSource* _tmp62_; - Event* _tmp63_; - Event* _tmp64_; - gchar* _tmp65_; - gchar* _tmp66_; - gchar* _tmp67_; - gchar* _tmp68_; - gchar* _tmp69_; -#line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp62_ = source; + if (_tmp54_) { +#line 2861 "SearchBoolean.c" + Event* _tmp55_; + Event* _tmp56_; + gchar* _tmp57_; + gchar* _tmp58_; + gchar* _tmp59_; + gchar* _tmp60_; + gchar* _tmp61_; #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp63_ = media_source_get_event (_tmp62_); + _tmp55_ = media_source_get_event (source); #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp64_ = _tmp63_; + _tmp56_ = _tmp55_; #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp65_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_DATA_OBJECT, DataObject)); + _tmp57_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_DATA_OBJECT, DataObject)); #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp66_ = _tmp65_; + _tmp58_ = _tmp57_; #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp67_ = g_utf8_strdown (_tmp66_, (gssize) -1); + _tmp59_ = g_utf8_strdown (_tmp58_, (gssize) -1); #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp68_ = _tmp67_; + _tmp60_ = _tmp59_; #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp69_ = string_remove_diacritics (_tmp68_); + _tmp61_ = string_remove_diacritics (_tmp60_); #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp57_); + _g_free0 (_tmp51_); #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp57_ = _tmp69_; + _tmp51_ = _tmp61_; #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp68_); + _g_free0 (_tmp60_); #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp66_); + _g_free0 (_tmp58_); #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_object_unref0 (_tmp64_); -#line 2877 "SearchBoolean.c" + _g_object_unref0 (_tmp56_); +#line 2893 "SearchBoolean.c" } else { #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp57_); + _g_free0 (_tmp51_); #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp57_ = NULL; -#line 2883 "SearchBoolean.c" + _tmp51_ = NULL; +#line 2899 "SearchBoolean.c" } #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp70_ = g_strdup (_tmp57_); + _tmp62_ = g_strdup (_tmp51_); #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - event_name = _tmp70_; + event_name = _tmp62_; #line 334 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp71_ = ret; + _tmp63_ = ret; #line 334 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp72_ = self->priv->_text; + _tmp64_ = self->priv->_text; #line 334 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp73_ = event_name; + _tmp65_ = event_name; #line 334 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp74_ = search_condition_text_string_match (self, _tmp72_, _tmp73_); -#line 334 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ret = _tmp71_ | _tmp74_; + ret = _tmp63_ | search_condition_text_string_match (self, _tmp64_, _tmp65_); #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (event_name); #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp57_); -#line 2903 "SearchBoolean.c" + _g_free0 (_tmp51_); +#line 2917 "SearchBoolean.c" } #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp76_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp67_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp77_ = _tmp76_; + _tmp68_ = _tmp67_; #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp77_) { + if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp68_) { #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp75_ = TRUE; -#line 2913 "SearchBoolean.c" + _tmp66_ = TRUE; +#line 2927 "SearchBoolean.c" } else { - SearchConditionSearchType _tmp78_; - SearchConditionSearchType _tmp79_; + SearchConditionSearchType _tmp69_; + SearchConditionSearchType _tmp70_; #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp78_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp69_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp79_ = _tmp78_; + _tmp70_ = _tmp69_; #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp75_ = SEARCH_CONDITION_SEARCH_TYPE_COMMENT == _tmp79_; -#line 2923 "SearchBoolean.c" + _tmp66_ = SEARCH_CONDITION_SEARCH_TYPE_COMMENT == _tmp70_; +#line 2937 "SearchBoolean.c" } #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp75_) { -#line 2927 "SearchBoolean.c" + if (_tmp66_) { +#line 2941 "SearchBoolean.c" gchar* comment = NULL; - MediaSource* _tmp80_; - gchar* _tmp81_; - const gchar* _tmp82_; -#line 339 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp80_ = source; + gchar* _tmp71_; + const gchar* _tmp72_; #line 339 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp81_ = media_source_get_comment (_tmp80_); + _tmp71_ = media_source_get_comment (source); #line 339 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - comment = _tmp81_; + comment = _tmp71_; #line 340 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp82_ = comment; + _tmp72_ = comment; #line 340 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (NULL != _tmp82_) { -#line 2942 "SearchBoolean.c" - gboolean _tmp83_; - const gchar* _tmp84_; - const gchar* _tmp85_; - gchar* _tmp86_; - gchar* _tmp87_; - gchar* _tmp88_; - gchar* _tmp89_; - gboolean _tmp90_; -#line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp83_ = ret; + if (NULL != _tmp72_) { +#line 2953 "SearchBoolean.c" + gboolean _tmp73_; + const gchar* _tmp74_; + const gchar* _tmp75_; + gchar* _tmp76_; + gchar* _tmp77_; + gchar* _tmp78_; + gchar* _tmp79_; #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp84_ = self->priv->_text; + _tmp73_ = ret; #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp85_ = comment; + _tmp74_ = self->priv->_text; #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp86_ = g_utf8_strdown (_tmp85_, (gssize) -1); + _tmp75_ = comment; #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp87_ = _tmp86_; + _tmp76_ = g_utf8_strdown (_tmp75_, (gssize) -1); #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp88_ = string_remove_diacritics (_tmp87_); + _tmp77_ = _tmp76_; #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp89_ = _tmp88_; + _tmp78_ = string_remove_diacritics (_tmp77_); #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp90_ = search_condition_text_string_match (self, _tmp84_, _tmp89_); + _tmp79_ = _tmp78_; #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ret = _tmp83_ | _tmp90_; + ret = _tmp73_ | search_condition_text_string_match (self, _tmp74_, _tmp79_); #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp89_); + _g_free0 (_tmp79_); #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp87_); -#line 2973 "SearchBoolean.c" + _g_free0 (_tmp77_); +#line 2981 "SearchBoolean.c" } #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (comment); -#line 2977 "SearchBoolean.c" +#line 2985 "SearchBoolean.c" } #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp92_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp81_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp93_ = _tmp92_; + _tmp82_ = _tmp81_; #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp93_) { + if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp82_) { #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp91_ = TRUE; -#line 2987 "SearchBoolean.c" + _tmp80_ = TRUE; +#line 2995 "SearchBoolean.c" } else { - SearchConditionSearchType _tmp94_; - SearchConditionSearchType _tmp95_; + SearchConditionSearchType _tmp83_; + SearchConditionSearchType _tmp84_; #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp94_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp83_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp95_ = _tmp94_; + _tmp84_ = _tmp83_; #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp91_ = SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME == _tmp95_; -#line 2997 "SearchBoolean.c" + _tmp80_ = SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME == _tmp84_; +#line 3005 "SearchBoolean.c" } #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp91_) { -#line 3001 "SearchBoolean.c" - gboolean _tmp96_; - const gchar* _tmp97_; - MediaSource* _tmp98_; - gchar* _tmp99_; - gchar* _tmp100_; - gchar* _tmp101_; - gchar* _tmp102_; - gchar* _tmp103_; - gchar* _tmp104_; - gboolean _tmp105_; + if (_tmp80_) { +#line 3009 "SearchBoolean.c" + gboolean _tmp85_; + const gchar* _tmp86_; + gchar* _tmp87_; + gchar* _tmp88_; + gchar* _tmp89_; + gchar* _tmp90_; + gchar* _tmp91_; + gchar* _tmp92_; #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp96_ = ret; -#line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp97_ = self->priv->_text; + _tmp85_ = ret; #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp98_ = source; + _tmp86_ = self->priv->_text; #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp99_ = media_source_get_basename (_tmp98_); + _tmp87_ = media_source_get_basename (source); #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp100_ = _tmp99_; + _tmp88_ = _tmp87_; #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp101_ = g_utf8_strdown (_tmp100_, (gssize) -1); + _tmp89_ = g_utf8_strdown (_tmp88_, (gssize) -1); #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp102_ = _tmp101_; + _tmp90_ = _tmp89_; #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp103_ = string_remove_diacritics (_tmp102_); + _tmp91_ = string_remove_diacritics (_tmp90_); #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp104_ = _tmp103_; + _tmp92_ = _tmp91_; #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp105_ = search_condition_text_string_match (self, _tmp97_, _tmp104_); + ret = _tmp85_ | search_condition_text_string_match (self, _tmp86_, _tmp92_); #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ret = _tmp96_ | _tmp105_; + _g_free0 (_tmp92_); #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp104_); + _g_free0 (_tmp90_); #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp102_); -#line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp100_); -#line 3040 "SearchBoolean.c" + _g_free0 (_tmp88_); +#line 3042 "SearchBoolean.c" } #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp107_ = self->priv->_context; + _tmp94_ = self->priv->_context; #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp107_ == SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN) { -#line 3046 "SearchBoolean.c" - gboolean _tmp108_; + if (_tmp94_ == SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN) { +#line 3048 "SearchBoolean.c" + gboolean _tmp95_; #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp108_ = ret; + _tmp95_ = ret; #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp106_ = !_tmp108_; -#line 3052 "SearchBoolean.c" + _tmp93_ = !_tmp95_; +#line 3054 "SearchBoolean.c" } else { - gboolean _tmp109_; + gboolean _tmp96_; #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp109_ = ret; + _tmp96_ = ret; #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp106_ = _tmp109_; -#line 3059 "SearchBoolean.c" + _tmp93_ = _tmp96_; +#line 3061 "SearchBoolean.c" } #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp106_; + result = _tmp93_; #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3065 "SearchBoolean.c" +#line 3067 "SearchBoolean.c" } -const gchar* search_condition_text_get_text (SearchConditionText* self) { +const gchar* +search_condition_text_get_text (SearchConditionText* self) +{ const gchar* result; const gchar* _tmp0_; #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3077,28 +3081,30 @@ const gchar* search_condition_text_get_text (SearchConditionText* self) { result = _tmp0_; #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3080 "SearchBoolean.c" +#line 3084 "SearchBoolean.c" } -static void search_condition_text_set_text (SearchConditionText* self, const gchar* value) { - const gchar* _tmp0_; - gchar* _tmp1_; +static void +search_condition_text_set_text (SearchConditionText* self, + const gchar* value) +{ + gchar* _tmp0_; #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_TEXT (self)); #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = value; -#line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (value); #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (self->priv->_text); #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - self->priv->_text = _tmp1_; -#line 3097 "SearchBoolean.c" + self->priv->_text = _tmp0_; +#line 3101 "SearchBoolean.c" } -SearchConditionTextContext search_condition_text_get_context (SearchConditionText* self) { +SearchConditionTextContext +search_condition_text_get_context (SearchConditionText* self) +{ SearchConditionTextContext result; SearchConditionTextContext _tmp0_; #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3109,23 +3115,25 @@ SearchConditionTextContext search_condition_text_get_context (SearchConditionTex result = _tmp0_; #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3112 "SearchBoolean.c" +#line 3118 "SearchBoolean.c" } -static void search_condition_text_set_context (SearchConditionText* self, SearchConditionTextContext value) { - SearchConditionTextContext _tmp0_; +static void +search_condition_text_set_context (SearchConditionText* self, + SearchConditionTextContext value) +{ #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_TEXT (self)); #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = value; -#line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - self->priv->_context = _tmp0_; -#line 3124 "SearchBoolean.c" + self->priv->_context = value; +#line 3130 "SearchBoolean.c" } -static void search_condition_text_class_init (SearchConditionTextClass * klass) { +static void +search_condition_text_class_init (SearchConditionTextClass * klass) +{ #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_text_parent_class = g_type_class_peek_parent (klass); #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3134,18 +3142,22 @@ static void search_condition_text_class_init (SearchConditionTextClass * klass) g_type_class_add_private (klass, sizeof (SearchConditionTextPrivate)); #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_text_real_predicate; -#line 3137 "SearchBoolean.c" +#line 3145 "SearchBoolean.c" } -static void search_condition_text_instance_init (SearchConditionText * self) { +static void +search_condition_text_instance_init (SearchConditionText * self) +{ #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SEARCH_CONDITION_TEXT_GET_PRIVATE (self); -#line 3144 "SearchBoolean.c" +#line 3154 "SearchBoolean.c" } -static void search_condition_text_finalize (SearchCondition * obj) { +static void +search_condition_text_finalize (SearchCondition * obj) +{ SearchConditionText * self; #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_TEXT, SearchConditionText); @@ -3153,11 +3165,13 @@ static void search_condition_text_finalize (SearchCondition * obj) { _g_free0 (self->priv->_text); #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" SEARCH_CONDITION_CLASS (search_condition_text_parent_class)->finalize (obj); -#line 3156 "SearchBoolean.c" +#line 3168 "SearchBoolean.c" } -GType search_condition_text_get_type (void) { +GType +search_condition_text_get_type (void) +{ static volatile gsize search_condition_text_type_id__volatile = 0; if (g_once_init_enter (&search_condition_text_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SearchConditionTextClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) search_condition_text_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchConditionText), 0, (GInstanceInitFunc) search_condition_text_instance_init, NULL }; @@ -3169,13 +3183,15 @@ GType search_condition_text_get_type (void) { } -gchar* search_condition_media_type_context_to_string (SearchConditionMediaTypeContext self) { +gchar* +search_condition_media_type_context_to_string (SearchConditionMediaTypeContext self) +{ gchar* result = NULL; #line 360 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" switch (self) { #line 360 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS: -#line 3178 "SearchBoolean.c" +#line 3194 "SearchBoolean.c" { gchar* _tmp0_; #line 362 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3184,11 +3200,11 @@ gchar* search_condition_media_type_context_to_string (SearchConditionMediaTypeCo result = _tmp0_; #line 362 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3187 "SearchBoolean.c" +#line 3203 "SearchBoolean.c" } #line 360 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT: -#line 3191 "SearchBoolean.c" +#line 3207 "SearchBoolean.c" { gchar* _tmp1_; #line 365 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3197,57 +3213,52 @@ gchar* search_condition_media_type_context_to_string (SearchConditionMediaTypeCo result = _tmp1_; #line 365 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3200 "SearchBoolean.c" +#line 3216 "SearchBoolean.c" } default: { #line 368 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:368: unrecognized media search context enumeration " \ "value"); -#line 3206 "SearchBoolean.c" +#line 3222 "SearchBoolean.c" } } } -SearchConditionMediaTypeContext search_condition_media_type_context_from_string (const gchar* str) { +SearchConditionMediaTypeContext +search_condition_media_type_context_from_string (const gchar* str) +{ SearchConditionMediaTypeContext result = 0; - const gchar* _tmp0_; #line 372 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (str != NULL, 0); #line 373 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = str; -#line 373 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp0_, "IS") == 0) { + if (g_strcmp0 (str, "IS") == 0) { #line 374 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS; #line 374 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3225 "SearchBoolean.c" +#line 3240 "SearchBoolean.c" } else { - const gchar* _tmp1_; -#line 376 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = str; #line 376 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp1_, "IS_NOT") == 0) { + if (g_strcmp0 (str, "IS_NOT") == 0) { #line 377 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT; #line 377 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3236 "SearchBoolean.c" +#line 3248 "SearchBoolean.c" } else { - const gchar* _tmp2_; #line 380 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = str; -#line 380 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - g_error ("SearchBoolean.vala:380: unrecognized media search context name: %s", _tmp2_); -#line 3243 "SearchBoolean.c" + g_error ("SearchBoolean.vala:380: unrecognized media search context name: %s", str); +#line 3252 "SearchBoolean.c" } } } -GType search_condition_media_type_context_get_type (void) { +GType +search_condition_media_type_context_get_type (void) +{ static volatile gsize search_condition_media_type_context_type_id__volatile = 0; if (g_once_init_enter (&search_condition_media_type_context_type_id__volatile)) { static const GEnumValue values[] = {{SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS, "SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS", "is"}, {SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT, "SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT", "is-not"}, {0, NULL, NULL}}; @@ -3259,13 +3270,15 @@ GType search_condition_media_type_context_get_type (void) { } -gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTypeMediaType self) { +gchar* +search_condition_media_type_media_type_to_string (SearchConditionMediaTypeMediaType self) +{ gchar* result = NULL; #line 390 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" switch (self) { #line 390 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_ALL: -#line 3267 "SearchBoolean.c" +#line 3280 "SearchBoolean.c" { gchar* _tmp0_; #line 392 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3274,11 +3287,11 @@ gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTyp result = _tmp0_; #line 392 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3276 "SearchBoolean.c" +#line 3289 "SearchBoolean.c" } #line 390 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW: -#line 3280 "SearchBoolean.c" +#line 3293 "SearchBoolean.c" { gchar* _tmp1_; #line 395 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3287,11 +3300,11 @@ gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTyp result = _tmp1_; #line 395 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3289 "SearchBoolean.c" +#line 3302 "SearchBoolean.c" } #line 390 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO: -#line 3293 "SearchBoolean.c" +#line 3306 "SearchBoolean.c" { gchar* _tmp2_; #line 398 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3300,69 +3313,61 @@ gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTyp result = _tmp2_; #line 398 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3302 "SearchBoolean.c" +#line 3315 "SearchBoolean.c" } default: { #line 401 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:401: unrecognized media search type enumeration val" \ "ue"); -#line 3308 "SearchBoolean.c" +#line 3321 "SearchBoolean.c" } } } -SearchConditionMediaTypeMediaType search_condition_media_type_media_type_from_string (const gchar* str) { +SearchConditionMediaTypeMediaType +search_condition_media_type_media_type_from_string (const gchar* str) +{ SearchConditionMediaTypeMediaType result = 0; - const gchar* _tmp0_; #line 405 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (str != NULL, 0); #line 406 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = str; -#line 406 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp0_, "PHOTO_ALL") == 0) { + if (g_strcmp0 (str, "PHOTO_ALL") == 0) { #line 407 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_ALL; #line 407 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3327 "SearchBoolean.c" +#line 3339 "SearchBoolean.c" } else { - const gchar* _tmp1_; -#line 409 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = str; #line 409 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp1_, "PHOTO_RAW") == 0) { + if (g_strcmp0 (str, "PHOTO_RAW") == 0) { #line 410 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW; #line 410 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3338 "SearchBoolean.c" +#line 3347 "SearchBoolean.c" } else { - const gchar* _tmp2_; #line 412 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = str; -#line 412 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp2_, "VIDEO") == 0) { + if (g_strcmp0 (str, "VIDEO") == 0) { #line 413 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO; #line 413 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3349 "SearchBoolean.c" +#line 3355 "SearchBoolean.c" } else { - const gchar* _tmp3_; -#line 416 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = str; #line 416 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - g_error ("SearchBoolean.vala:416: unrecognized media search type name: %s", _tmp3_); -#line 3356 "SearchBoolean.c" + g_error ("SearchBoolean.vala:416: unrecognized media search type name: %s", str); +#line 3359 "SearchBoolean.c" } } } } -GType search_condition_media_type_media_type_get_type (void) { +GType +search_condition_media_type_media_type_get_type (void) +{ static volatile gsize search_condition_media_type_media_type_type_id__volatile = 0; if (g_once_init_enter (&search_condition_media_type_media_type_type_id__volatile)) { static const GEnumValue values[] = {{SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_ALL, "SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_ALL", "photo-all"}, {SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW, "SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW", "photo-raw"}, {SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO, "SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO", "video"}, {0, NULL, NULL}}; @@ -3374,39 +3379,42 @@ GType search_condition_media_type_media_type_get_type (void) { } -SearchConditionMediaType* search_condition_media_type_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type) { +SearchConditionMediaType* +search_condition_media_type_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionMediaTypeContext context, + SearchConditionMediaTypeMediaType media_type) +{ SearchConditionMediaType* self = NULL; - SearchConditionSearchType _tmp0_; - SearchConditionMediaTypeContext _tmp1_; - SearchConditionMediaTypeMediaType _tmp2_; #line 426 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = (SearchConditionMediaType*) search_condition_construct (object_type); #line 427 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = search_type; -#line 427 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), _tmp0_); -#line 428 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = context; + search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), search_type); #line 428 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search_condition_media_type_set_context (self, _tmp1_); + search_condition_media_type_set_context (self, context); #line 429 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = media_type; -#line 429 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search_condition_media_type_set_media_type (self, _tmp2_); + search_condition_media_type_set_media_type (self, media_type); #line 426 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 3396 "SearchBoolean.c" +#line 3397 "SearchBoolean.c" } -SearchConditionMediaType* search_condition_media_type_new (SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type) { +SearchConditionMediaType* +search_condition_media_type_new (SearchConditionSearchType search_type, + SearchConditionMediaTypeContext context, + SearchConditionMediaTypeMediaType media_type) +{ #line 426 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return search_condition_media_type_construct (TYPE_SEARCH_CONDITION_MEDIA_TYPE, search_type, context, media_type); -#line 3403 "SearchBoolean.c" +#line 3408 "SearchBoolean.c" } -static gboolean search_condition_media_type_real_predicate (SearchCondition* base, MediaSource* source) { +static gboolean +search_condition_media_type_real_predicate (SearchCondition* base, + MediaSource* source) +{ SearchConditionMediaType * self; gboolean result = FALSE; SearchConditionMediaTypeMediaType _tmp0_; @@ -3420,107 +3428,91 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas switch (_tmp0_) { #line 436 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_ALL: -#line 3421 "SearchBoolean.c" +#line 3429 "SearchBoolean.c" { - MediaSource* _tmp1_; -#line 438 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = source; #line 438 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_PHOTO)) { -#line 3428 "SearchBoolean.c" - SearchConditionMediaTypeContext _tmp2_; + if (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_PHOTO)) { +#line 3433 "SearchBoolean.c" + SearchConditionMediaTypeContext _tmp1_; #line 439 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = self->priv->_context; + _tmp1_ = self->priv->_context; #line 439 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp2_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS; + result = _tmp1_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS; #line 439 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3436 "SearchBoolean.c" +#line 3441 "SearchBoolean.c" } else { - SearchConditionMediaTypeContext _tmp3_; + SearchConditionMediaTypeContext _tmp2_; #line 441 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = self->priv->_context; + _tmp2_ = self->priv->_context; #line 441 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp3_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT; + result = _tmp2_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT; #line 441 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3445 "SearchBoolean.c" +#line 3450 "SearchBoolean.c" } } #line 436 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW: -#line 3450 "SearchBoolean.c" +#line 3455 "SearchBoolean.c" { - gboolean _tmp4_ = FALSE; - MediaSource* _tmp5_; -#line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp5_ = source; -#line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_PHOTO)) { -#line 3458 "SearchBoolean.c" - MediaSource* _tmp6_; - PhotoFileFormat _tmp7_; -#line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp6_ = source; + gboolean _tmp3_ = FALSE; #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp7_ = photo_get_master_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo)); + if (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_PHOTO)) { #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = _tmp7_ == PHOTO_FILE_FORMAT_RAW; -#line 3467 "SearchBoolean.c" + _tmp3_ = photo_get_master_file_format (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_PHOTO, Photo)) == PHOTO_FILE_FORMAT_RAW; +#line 3462 "SearchBoolean.c" } else { #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = FALSE; -#line 3471 "SearchBoolean.c" + _tmp3_ = FALSE; +#line 3466 "SearchBoolean.c" } #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp4_) { -#line 3475 "SearchBoolean.c" - SearchConditionMediaTypeContext _tmp8_; + if (_tmp3_) { +#line 3470 "SearchBoolean.c" + SearchConditionMediaTypeContext _tmp4_; #line 445 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp8_ = self->priv->_context; + _tmp4_ = self->priv->_context; #line 445 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp8_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS; + result = _tmp4_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS; #line 445 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3483 "SearchBoolean.c" +#line 3478 "SearchBoolean.c" } else { - SearchConditionMediaTypeContext _tmp9_; + SearchConditionMediaTypeContext _tmp5_; #line 447 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp9_ = self->priv->_context; + _tmp5_ = self->priv->_context; #line 447 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp9_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT; + result = _tmp5_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT; #line 447 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3492 "SearchBoolean.c" +#line 3487 "SearchBoolean.c" } } #line 436 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO: -#line 3497 "SearchBoolean.c" +#line 3492 "SearchBoolean.c" { - MediaSource* _tmp10_; -#line 450 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp10_ = source; #line 450 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_VIDEO_SOURCE)) { -#line 3504 "SearchBoolean.c" - SearchConditionMediaTypeContext _tmp11_; + if (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_VIDEO_SOURCE)) { +#line 3496 "SearchBoolean.c" + SearchConditionMediaTypeContext _tmp6_; #line 451 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp11_ = self->priv->_context; + _tmp6_ = self->priv->_context; #line 451 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp11_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS; + result = _tmp6_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS; #line 451 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3512 "SearchBoolean.c" +#line 3504 "SearchBoolean.c" } else { - SearchConditionMediaTypeContext _tmp12_; + SearchConditionMediaTypeContext _tmp7_; #line 453 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp12_ = self->priv->_context; + _tmp7_ = self->priv->_context; #line 453 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp12_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT; + result = _tmp7_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT; #line 453 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3521 "SearchBoolean.c" +#line 3513 "SearchBoolean.c" } } default: @@ -3528,13 +3520,15 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas #line 456 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:456: unrecognized media search type enumeration val" \ "ue"); -#line 3528 "SearchBoolean.c" +#line 3520 "SearchBoolean.c" } } } -SearchConditionMediaTypeMediaType search_condition_media_type_get_media_type (SearchConditionMediaType* self) { +SearchConditionMediaTypeMediaType +search_condition_media_type_get_media_type (SearchConditionMediaType* self) +{ SearchConditionMediaTypeMediaType result; SearchConditionMediaTypeMediaType _tmp0_; #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3545,23 +3539,25 @@ SearchConditionMediaTypeMediaType search_condition_media_type_get_media_type (Se result = _tmp0_; #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3545 "SearchBoolean.c" +#line 3539 "SearchBoolean.c" } -static void search_condition_media_type_set_media_type (SearchConditionMediaType* self, SearchConditionMediaTypeMediaType value) { - SearchConditionMediaTypeMediaType _tmp0_; +static void +search_condition_media_type_set_media_type (SearchConditionMediaType* self, + SearchConditionMediaTypeMediaType value) +{ #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_MEDIA_TYPE (self)); #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = value; -#line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - self->priv->_media_type = _tmp0_; -#line 3557 "SearchBoolean.c" + self->priv->_media_type = value; +#line 3551 "SearchBoolean.c" } -SearchConditionMediaTypeContext search_condition_media_type_get_context (SearchConditionMediaType* self) { +SearchConditionMediaTypeContext +search_condition_media_type_get_context (SearchConditionMediaType* self) +{ SearchConditionMediaTypeContext result; SearchConditionMediaTypeContext _tmp0_; #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3572,23 +3568,25 @@ SearchConditionMediaTypeContext search_condition_media_type_get_context (SearchC result = _tmp0_; #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3572 "SearchBoolean.c" +#line 3568 "SearchBoolean.c" } -static void search_condition_media_type_set_context (SearchConditionMediaType* self, SearchConditionMediaTypeContext value) { - SearchConditionMediaTypeContext _tmp0_; +static void +search_condition_media_type_set_context (SearchConditionMediaType* self, + SearchConditionMediaTypeContext value) +{ #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_MEDIA_TYPE (self)); #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = value; -#line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - self->priv->_context = _tmp0_; -#line 3584 "SearchBoolean.c" + self->priv->_context = value; +#line 3580 "SearchBoolean.c" } -static void search_condition_media_type_class_init (SearchConditionMediaTypeClass * klass) { +static void +search_condition_media_type_class_init (SearchConditionMediaTypeClass * klass) +{ #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_media_type_parent_class = g_type_class_peek_parent (klass); #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3597,28 +3595,34 @@ static void search_condition_media_type_class_init (SearchConditionMediaTypeClas g_type_class_add_private (klass, sizeof (SearchConditionMediaTypePrivate)); #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_media_type_real_predicate; -#line 3597 "SearchBoolean.c" +#line 3595 "SearchBoolean.c" } -static void search_condition_media_type_instance_init (SearchConditionMediaType * self) { +static void +search_condition_media_type_instance_init (SearchConditionMediaType * self) +{ #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SEARCH_CONDITION_MEDIA_TYPE_GET_PRIVATE (self); #line 3604 "SearchBoolean.c" } -static void search_condition_media_type_finalize (SearchCondition * obj) { +static void +search_condition_media_type_finalize (SearchCondition * obj) +{ SearchConditionMediaType * self; #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_MEDIA_TYPE, SearchConditionMediaType); #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" SEARCH_CONDITION_CLASS (search_condition_media_type_parent_class)->finalize (obj); -#line 3614 "SearchBoolean.c" +#line 3616 "SearchBoolean.c" } -GType search_condition_media_type_get_type (void) { +GType +search_condition_media_type_get_type (void) +{ static volatile gsize search_condition_media_type_type_id__volatile = 0; if (g_once_init_enter (&search_condition_media_type_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SearchConditionMediaTypeClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) search_condition_media_type_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchConditionMediaType), 0, (GInstanceInitFunc) search_condition_media_type_instance_init, NULL }; @@ -3630,13 +3634,15 @@ GType search_condition_media_type_get_type (void) { } -gchar* search_condition_flagged_state_to_string (SearchConditionFlaggedState self) { +gchar* +search_condition_flagged_state_to_string (SearchConditionFlaggedState self) +{ gchar* result = NULL; #line 468 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" switch (self) { #line 468 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_FLAGGED_STATE_FLAGGED: -#line 3636 "SearchBoolean.c" +#line 3642 "SearchBoolean.c" { gchar* _tmp0_; #line 470 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3645,11 +3651,11 @@ gchar* search_condition_flagged_state_to_string (SearchConditionFlaggedState sel result = _tmp0_; #line 470 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3645 "SearchBoolean.c" +#line 3651 "SearchBoolean.c" } #line 468 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED: -#line 3649 "SearchBoolean.c" +#line 3655 "SearchBoolean.c" { gchar* _tmp1_; #line 473 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3658,57 +3664,52 @@ gchar* search_condition_flagged_state_to_string (SearchConditionFlaggedState sel result = _tmp1_; #line 473 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3658 "SearchBoolean.c" +#line 3664 "SearchBoolean.c" } default: { #line 476 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:476: unrecognized flagged search state enumeration " \ "value"); -#line 3664 "SearchBoolean.c" +#line 3670 "SearchBoolean.c" } } } -SearchConditionFlaggedState search_condition_flagged_state_from_string (const gchar* str) { +SearchConditionFlaggedState +search_condition_flagged_state_from_string (const gchar* str) +{ SearchConditionFlaggedState result = 0; - const gchar* _tmp0_; #line 480 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (str != NULL, 0); #line 481 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = str; -#line 481 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp0_, "FLAGGED") == 0) { + if (g_strcmp0 (str, "FLAGGED") == 0) { #line 482 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_FLAGGED_STATE_FLAGGED; #line 482 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3683 "SearchBoolean.c" +#line 3688 "SearchBoolean.c" } else { - const gchar* _tmp1_; -#line 484 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = str; #line 484 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp1_, "UNFLAGGED") == 0) { + if (g_strcmp0 (str, "UNFLAGGED") == 0) { #line 485 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED; #line 485 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3694 "SearchBoolean.c" +#line 3696 "SearchBoolean.c" } else { - const gchar* _tmp2_; #line 488 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = str; -#line 488 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - g_error ("SearchBoolean.vala:488: unrecognized flagged search state name: %s", _tmp2_); -#line 3701 "SearchBoolean.c" + g_error ("SearchBoolean.vala:488: unrecognized flagged search state name: %s", str); +#line 3700 "SearchBoolean.c" } } } -GType search_condition_flagged_state_get_type (void) { +GType +search_condition_flagged_state_get_type (void) +{ static volatile gsize search_condition_flagged_state_type_id__volatile = 0; if (g_once_init_enter (&search_condition_flagged_state_type_id__volatile)) { static const GEnumValue values[] = {{SEARCH_CONDITION_FLAGGED_STATE_FLAGGED, "SEARCH_CONDITION_FLAGGED_STATE_FLAGGED", "flagged"}, {SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED, "SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED", "unflagged"}, {0, NULL, NULL}}; @@ -3720,34 +3721,38 @@ GType search_condition_flagged_state_get_type (void) { } -SearchConditionFlagged* search_condition_flagged_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionFlaggedState state) { +SearchConditionFlagged* +search_condition_flagged_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionFlaggedState state) +{ SearchConditionFlagged* self = NULL; - SearchConditionSearchType _tmp0_; - SearchConditionFlaggedState _tmp1_; #line 495 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = (SearchConditionFlagged*) search_condition_construct (object_type); #line 496 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = search_type; -#line 496 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), _tmp0_); -#line 497 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = state; + search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), search_type); #line 497 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search_condition_flagged_set_state (self, _tmp1_); + search_condition_flagged_set_state (self, state); #line 495 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 3735 "SearchBoolean.c" +#line 3734 "SearchBoolean.c" } -SearchConditionFlagged* search_condition_flagged_new (SearchConditionSearchType search_type, SearchConditionFlaggedState state) { +SearchConditionFlagged* +search_condition_flagged_new (SearchConditionSearchType search_type, + SearchConditionFlaggedState state) +{ #line 495 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return search_condition_flagged_construct (TYPE_SEARCH_CONDITION_FLAGGED, search_type, state); -#line 3742 "SearchBoolean.c" +#line 3744 "SearchBoolean.c" } -static gboolean search_condition_flagged_real_predicate (SearchCondition* base, MediaSource* source) { +static gboolean +search_condition_flagged_real_predicate (SearchCondition* base, + MediaSource* source) +{ SearchConditionFlagged * self; gboolean result = FALSE; SearchConditionFlaggedState _tmp0_; @@ -3759,46 +3764,34 @@ static gboolean search_condition_flagged_real_predicate (SearchCondition* base, _tmp0_ = self->priv->_state; #line 502 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp0_ == SEARCH_CONDITION_FLAGGED_STATE_FLAGGED) { -#line 3758 "SearchBoolean.c" - MediaSource* _tmp1_; - gboolean _tmp2_; #line 503 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = source; -#line 503 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_FLAGGABLE, Flaggable)); -#line 503 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp2_; + result = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_FLAGGABLE, Flaggable)); #line 503 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3769 "SearchBoolean.c" +#line 3767 "SearchBoolean.c" } else { - SearchConditionFlaggedState _tmp3_; + SearchConditionFlaggedState _tmp1_; #line 504 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = self->priv->_state; + _tmp1_ = self->priv->_state; #line 504 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp3_ == SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED) { -#line 3776 "SearchBoolean.c" - MediaSource* _tmp4_; - gboolean _tmp5_; -#line 505 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = source; -#line 505 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp5_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_FLAGGABLE, Flaggable)); + if (_tmp1_ == SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED) { #line 505 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = !_tmp5_; + result = !flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_FLAGGABLE, Flaggable)); #line 505 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3787 "SearchBoolean.c" +#line 3778 "SearchBoolean.c" } else { #line 507 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:507: unrecognized flagged search state"); -#line 3791 "SearchBoolean.c" +#line 3782 "SearchBoolean.c" } } } -SearchConditionFlaggedState search_condition_flagged_get_state (SearchConditionFlagged* self) { +SearchConditionFlaggedState +search_condition_flagged_get_state (SearchConditionFlagged* self) +{ SearchConditionFlaggedState result; SearchConditionFlaggedState _tmp0_; #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3809,23 +3802,25 @@ SearchConditionFlaggedState search_condition_flagged_get_state (SearchConditionF result = _tmp0_; #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3808 "SearchBoolean.c" +#line 3801 "SearchBoolean.c" } -static void search_condition_flagged_set_state (SearchConditionFlagged* self, SearchConditionFlaggedState value) { - SearchConditionFlaggedState _tmp0_; +static void +search_condition_flagged_set_state (SearchConditionFlagged* self, + SearchConditionFlaggedState value) +{ #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_FLAGGED (self)); #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = value; -#line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - self->priv->_state = _tmp0_; -#line 3820 "SearchBoolean.c" + self->priv->_state = value; +#line 3813 "SearchBoolean.c" } -static void search_condition_flagged_class_init (SearchConditionFlaggedClass * klass) { +static void +search_condition_flagged_class_init (SearchConditionFlaggedClass * klass) +{ #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_flagged_parent_class = g_type_class_peek_parent (klass); #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3834,28 +3829,34 @@ static void search_condition_flagged_class_init (SearchConditionFlaggedClass * k g_type_class_add_private (klass, sizeof (SearchConditionFlaggedPrivate)); #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_flagged_real_predicate; -#line 3833 "SearchBoolean.c" +#line 3828 "SearchBoolean.c" } -static void search_condition_flagged_instance_init (SearchConditionFlagged * self) { +static void +search_condition_flagged_instance_init (SearchConditionFlagged * self) +{ #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SEARCH_CONDITION_FLAGGED_GET_PRIVATE (self); -#line 3840 "SearchBoolean.c" +#line 3837 "SearchBoolean.c" } -static void search_condition_flagged_finalize (SearchCondition * obj) { +static void +search_condition_flagged_finalize (SearchCondition * obj) +{ SearchConditionFlagged * self; #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_FLAGGED, SearchConditionFlagged); #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" SEARCH_CONDITION_CLASS (search_condition_flagged_parent_class)->finalize (obj); -#line 3850 "SearchBoolean.c" +#line 3849 "SearchBoolean.c" } -GType search_condition_flagged_get_type (void) { +GType +search_condition_flagged_get_type (void) +{ static volatile gsize search_condition_flagged_type_id__volatile = 0; if (g_once_init_enter (&search_condition_flagged_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SearchConditionFlaggedClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) search_condition_flagged_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchConditionFlagged), 0, (GInstanceInitFunc) search_condition_flagged_instance_init, NULL }; @@ -3867,13 +3868,15 @@ GType search_condition_flagged_get_type (void) { } -gchar* search_condition_modified_context_to_string (SearchConditionModifiedContext self) { +gchar* +search_condition_modified_context_to_string (SearchConditionModifiedContext self) +{ gchar* result = NULL; #line 520 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" switch (self) { #line 520 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MODIFIED_CONTEXT_HAS: -#line 3872 "SearchBoolean.c" +#line 3875 "SearchBoolean.c" { gchar* _tmp0_; #line 522 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3882,11 +3885,11 @@ gchar* search_condition_modified_context_to_string (SearchConditionModifiedConte result = _tmp0_; #line 522 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3881 "SearchBoolean.c" +#line 3884 "SearchBoolean.c" } #line 520 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MODIFIED_CONTEXT_HAS_NO: -#line 3885 "SearchBoolean.c" +#line 3888 "SearchBoolean.c" { gchar* _tmp1_; #line 525 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3895,57 +3898,52 @@ gchar* search_condition_modified_context_to_string (SearchConditionModifiedConte result = _tmp1_; #line 525 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3894 "SearchBoolean.c" +#line 3897 "SearchBoolean.c" } default: { #line 528 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:528: unrecognized modified search context enumerati" \ "on value"); -#line 3900 "SearchBoolean.c" +#line 3903 "SearchBoolean.c" } } } -SearchConditionModifiedContext search_condition_modified_context_from_string (const gchar* str) { +SearchConditionModifiedContext +search_condition_modified_context_from_string (const gchar* str) +{ SearchConditionModifiedContext result = 0; - const gchar* _tmp0_; #line 532 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (str != NULL, 0); #line 533 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = str; -#line 533 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp0_, "HAS") == 0) { + if (g_strcmp0 (str, "HAS") == 0) { #line 534 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_MODIFIED_CONTEXT_HAS; #line 534 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3919 "SearchBoolean.c" +#line 3921 "SearchBoolean.c" } else { - const gchar* _tmp1_; #line 536 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = str; -#line 536 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp1_, "HAS_NO") == 0) { + if (g_strcmp0 (str, "HAS_NO") == 0) { #line 537 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_MODIFIED_CONTEXT_HAS_NO; #line 537 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3930 "SearchBoolean.c" +#line 3929 "SearchBoolean.c" } else { - const gchar* _tmp2_; -#line 540 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = str; #line 540 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - g_error ("SearchBoolean.vala:540: unrecognized modified search context name: %s", _tmp2_); -#line 3937 "SearchBoolean.c" + g_error ("SearchBoolean.vala:540: unrecognized modified search context name: %s", str); +#line 3933 "SearchBoolean.c" } } } -GType search_condition_modified_context_get_type (void) { +GType +search_condition_modified_context_get_type (void) +{ static volatile gsize search_condition_modified_context_type_id__volatile = 0; if (g_once_init_enter (&search_condition_modified_context_type_id__volatile)) { static const GEnumValue values[] = {{SEARCH_CONDITION_MODIFIED_CONTEXT_HAS, "SEARCH_CONDITION_MODIFIED_CONTEXT_HAS", "has"}, {SEARCH_CONDITION_MODIFIED_CONTEXT_HAS_NO, "SEARCH_CONDITION_MODIFIED_CONTEXT_HAS_NO", "has-no"}, {0, NULL, NULL}}; @@ -3957,7 +3955,9 @@ GType search_condition_modified_context_get_type (void) { } -gchar* search_condition_modified_state_to_string (SearchConditionModifiedState self) { +gchar* +search_condition_modified_state_to_string (SearchConditionModifiedState self) +{ gchar* result = NULL; #line 550 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" switch (self) { @@ -4011,56 +4011,48 @@ gchar* search_condition_modified_state_to_string (SearchConditionModifiedState s } -SearchConditionModifiedState search_condition_modified_state_from_string (const gchar* str) { +SearchConditionModifiedState +search_condition_modified_state_from_string (const gchar* str) +{ SearchConditionModifiedState result = 0; - const gchar* _tmp0_; #line 565 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (str != NULL, 0); #line 566 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = str; -#line 566 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp0_, "MODIFIED") == 0) { + if (g_strcmp0 (str, "MODIFIED") == 0) { #line 567 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_MODIFIED_STATE_MODIFIED; #line 567 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4021 "SearchBoolean.c" +#line 4020 "SearchBoolean.c" } else { - const gchar* _tmp1_; -#line 569 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = str; #line 569 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp1_, "INTERNAL_CHANGES") == 0) { + if (g_strcmp0 (str, "INTERNAL_CHANGES") == 0) { #line 570 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES; #line 570 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4032 "SearchBoolean.c" +#line 4028 "SearchBoolean.c" } else { - const gchar* _tmp2_; #line 572 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = str; -#line 572 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp2_, "EXTERNAL_CHANGES") == 0) { + if (g_strcmp0 (str, "EXTERNAL_CHANGES") == 0) { #line 573 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES; #line 573 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4043 "SearchBoolean.c" +#line 4036 "SearchBoolean.c" } else { - const gchar* _tmp3_; -#line 576 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = str; #line 576 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - g_error ("SearchBoolean.vala:576: unrecognized modified search state name: %s", _tmp3_); -#line 4050 "SearchBoolean.c" + g_error ("SearchBoolean.vala:576: unrecognized modified search state name: %s", str); +#line 4040 "SearchBoolean.c" } } } } -GType search_condition_modified_state_get_type (void) { +GType +search_condition_modified_state_get_type (void) +{ static volatile gsize search_condition_modified_state_type_id__volatile = 0; if (g_once_init_enter (&search_condition_modified_state_type_id__volatile)) { static const GEnumValue values[] = {{SEARCH_CONDITION_MODIFIED_STATE_MODIFIED, "SEARCH_CONDITION_MODIFIED_STATE_MODIFIED", "modified"}, {SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES, "SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES", "internal-changes"}, {SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES, "SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES", "external-changes"}, {0, NULL, NULL}}; @@ -4072,174 +4064,164 @@ GType search_condition_modified_state_get_type (void) { } -SearchConditionModified* search_condition_modified_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state) { +SearchConditionModified* +search_condition_modified_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionModifiedContext context, + SearchConditionModifiedState state) +{ SearchConditionModified* self = NULL; - SearchConditionSearchType _tmp0_; - SearchConditionModifiedContext _tmp1_; - SearchConditionModifiedState _tmp2_; #line 586 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = (SearchConditionModified*) search_condition_construct (object_type); #line 587 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = search_type; -#line 587 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), _tmp0_); -#line 588 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = context; + search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), search_type); #line 588 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search_condition_modified_set_context (self, _tmp1_); + search_condition_modified_set_context (self, context); #line 589 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = state; -#line 589 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search_condition_modified_set_state (self, _tmp2_); + search_condition_modified_set_state (self, state); #line 586 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 4090 "SearchBoolean.c" +#line 4078 "SearchBoolean.c" } -SearchConditionModified* search_condition_modified_new (SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state) { +SearchConditionModified* +search_condition_modified_new (SearchConditionSearchType search_type, + SearchConditionModifiedContext context, + SearchConditionModifiedState state) +{ #line 586 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return search_condition_modified_construct (TYPE_SEARCH_CONDITION_MODIFIED, search_type, context, state); -#line 4097 "SearchBoolean.c" +#line 4089 "SearchBoolean.c" } -static gboolean search_condition_modified_real_predicate (SearchCondition* base, MediaSource* source) { +static gboolean +search_condition_modified_real_predicate (SearchCondition* base, + MediaSource* source) +{ SearchConditionModified * self; gboolean result = FALSE; Photo* photo = NULL; - MediaSource* _tmp0_; + Photo* _tmp0_; Photo* _tmp1_; - Photo* _tmp2_; gboolean match = FALSE; - SearchConditionModifiedState _tmp3_; - gboolean _tmp15_; + SearchConditionModifiedState _tmp2_; + gboolean _tmp10_; #line 593 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEARCH_CONDITION_MODIFIED, SearchConditionModified); #line 593 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (source), FALSE); #line 595 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = source; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_PHOTO) ? ((Photo*) source) : NULL); #line 595 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO) ? ((Photo*) _tmp0_) : NULL); -#line 595 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - photo = _tmp1_; + photo = _tmp0_; #line 596 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = photo; + _tmp1_ = photo; #line 596 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 597 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = FALSE; #line 597 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (photo); #line 597 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4131 "SearchBoolean.c" +#line 4123 "SearchBoolean.c" } #line 600 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = self->priv->_state; + _tmp2_ = self->priv->_state; #line 600 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp3_ == SEARCH_CONDITION_MODIFIED_STATE_MODIFIED) { -#line 4137 "SearchBoolean.c" - gboolean _tmp4_ = FALSE; - Photo* _tmp5_; - gboolean _tmp6_; -#line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp5_ = photo; + if (_tmp2_ == SEARCH_CONDITION_MODIFIED_STATE_MODIFIED) { +#line 4129 "SearchBoolean.c" + gboolean _tmp3_ = FALSE; + Photo* _tmp4_; #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp6_ = photo_has_transformations (_tmp5_); + _tmp4_ = photo; #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp6_) { + if (photo_has_transformations (_tmp4_)) { #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = TRUE; -#line 4149 "SearchBoolean.c" + _tmp3_ = TRUE; +#line 4138 "SearchBoolean.c" } else { - Photo* _tmp7_; - gboolean _tmp8_; + Photo* _tmp5_; #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp7_ = photo; + _tmp5_ = photo; #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp8_ = photo_has_editable (_tmp7_); -#line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = _tmp8_; -#line 4159 "SearchBoolean.c" + _tmp3_ = photo_has_editable (_tmp5_); +#line 4145 "SearchBoolean.c" } #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - match = _tmp4_; -#line 4163 "SearchBoolean.c" + match = _tmp3_; +#line 4149 "SearchBoolean.c" } else { - SearchConditionModifiedState _tmp9_; + SearchConditionModifiedState _tmp6_; #line 602 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp9_ = self->priv->_state; + _tmp6_ = self->priv->_state; #line 602 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp9_ == SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES) { -#line 4170 "SearchBoolean.c" - Photo* _tmp10_; - gboolean _tmp11_; -#line 603 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp10_ = photo; + if (_tmp6_ == SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES) { +#line 4156 "SearchBoolean.c" + Photo* _tmp7_; #line 603 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp11_ = photo_has_transformations (_tmp10_); + _tmp7_ = photo; #line 603 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - match = _tmp11_; -#line 4179 "SearchBoolean.c" + match = photo_has_transformations (_tmp7_); +#line 4162 "SearchBoolean.c" } else { - SearchConditionModifiedState _tmp12_; + SearchConditionModifiedState _tmp8_; #line 604 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp12_ = self->priv->_state; + _tmp8_ = self->priv->_state; #line 604 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp12_ == SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES) { -#line 4186 "SearchBoolean.c" - Photo* _tmp13_; - gboolean _tmp14_; -#line 605 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp13_ = photo; + if (_tmp8_ == SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES) { +#line 4169 "SearchBoolean.c" + Photo* _tmp9_; #line 605 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp14_ = photo_has_editable (_tmp13_); + _tmp9_ = photo; #line 605 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - match = _tmp14_; -#line 4195 "SearchBoolean.c" + match = photo_has_editable (_tmp9_); +#line 4175 "SearchBoolean.c" } else { #line 607 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:607: unrecognized modified search state"); -#line 4199 "SearchBoolean.c" +#line 4179 "SearchBoolean.c" } } } #line 609 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp15_ = match; + _tmp10_ = match; #line 609 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp15_) { -#line 4207 "SearchBoolean.c" - SearchConditionModifiedContext _tmp16_; + if (_tmp10_) { +#line 4187 "SearchBoolean.c" + SearchConditionModifiedContext _tmp11_; #line 610 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp16_ = self->priv->_context; + _tmp11_ = self->priv->_context; #line 610 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp16_ == SEARCH_CONDITION_MODIFIED_CONTEXT_HAS; + result = _tmp11_ == SEARCH_CONDITION_MODIFIED_CONTEXT_HAS; #line 610 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (photo); #line 610 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4217 "SearchBoolean.c" +#line 4197 "SearchBoolean.c" } else { - SearchConditionModifiedContext _tmp17_; + SearchConditionModifiedContext _tmp12_; #line 612 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp17_ = self->priv->_context; + _tmp12_ = self->priv->_context; #line 612 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp17_ == SEARCH_CONDITION_MODIFIED_CONTEXT_HAS_NO; + result = _tmp12_ == SEARCH_CONDITION_MODIFIED_CONTEXT_HAS_NO; #line 612 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (photo); #line 612 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4228 "SearchBoolean.c" +#line 4208 "SearchBoolean.c" } #line 593 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (photo); -#line 4232 "SearchBoolean.c" +#line 4212 "SearchBoolean.c" } -SearchConditionModifiedState search_condition_modified_get_state (SearchConditionModified* self) { +SearchConditionModifiedState +search_condition_modified_get_state (SearchConditionModified* self) +{ SearchConditionModifiedState result; SearchConditionModifiedState _tmp0_; #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4250,23 +4232,25 @@ SearchConditionModifiedState search_condition_modified_get_state (SearchConditio result = _tmp0_; #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4247 "SearchBoolean.c" +#line 4229 "SearchBoolean.c" } -static void search_condition_modified_set_state (SearchConditionModified* self, SearchConditionModifiedState value) { - SearchConditionModifiedState _tmp0_; +static void +search_condition_modified_set_state (SearchConditionModified* self, + SearchConditionModifiedState value) +{ #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_MODIFIED (self)); #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = value; -#line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - self->priv->_state = _tmp0_; -#line 4259 "SearchBoolean.c" + self->priv->_state = value; +#line 4241 "SearchBoolean.c" } -SearchConditionModifiedContext search_condition_modified_get_context (SearchConditionModified* self) { +SearchConditionModifiedContext +search_condition_modified_get_context (SearchConditionModified* self) +{ SearchConditionModifiedContext result; SearchConditionModifiedContext _tmp0_; #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4277,23 +4261,25 @@ SearchConditionModifiedContext search_condition_modified_get_context (SearchCond result = _tmp0_; #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4274 "SearchBoolean.c" +#line 4258 "SearchBoolean.c" } -static void search_condition_modified_set_context (SearchConditionModified* self, SearchConditionModifiedContext value) { - SearchConditionModifiedContext _tmp0_; +static void +search_condition_modified_set_context (SearchConditionModified* self, + SearchConditionModifiedContext value) +{ #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_MODIFIED (self)); #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = value; -#line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - self->priv->_context = _tmp0_; -#line 4286 "SearchBoolean.c" + self->priv->_context = value; +#line 4270 "SearchBoolean.c" } -static void search_condition_modified_class_init (SearchConditionModifiedClass * klass) { +static void +search_condition_modified_class_init (SearchConditionModifiedClass * klass) +{ #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_modified_parent_class = g_type_class_peek_parent (klass); #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4302,28 +4288,34 @@ static void search_condition_modified_class_init (SearchConditionModifiedClass * g_type_class_add_private (klass, sizeof (SearchConditionModifiedPrivate)); #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_modified_real_predicate; -#line 4299 "SearchBoolean.c" +#line 4285 "SearchBoolean.c" } -static void search_condition_modified_instance_init (SearchConditionModified * self) { +static void +search_condition_modified_instance_init (SearchConditionModified * self) +{ #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SEARCH_CONDITION_MODIFIED_GET_PRIVATE (self); -#line 4306 "SearchBoolean.c" +#line 4294 "SearchBoolean.c" } -static void search_condition_modified_finalize (SearchCondition * obj) { +static void +search_condition_modified_finalize (SearchCondition * obj) +{ SearchConditionModified * self; #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_MODIFIED, SearchConditionModified); #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" SEARCH_CONDITION_CLASS (search_condition_modified_parent_class)->finalize (obj); -#line 4316 "SearchBoolean.c" +#line 4306 "SearchBoolean.c" } -GType search_condition_modified_get_type (void) { +GType +search_condition_modified_get_type (void) +{ static volatile gsize search_condition_modified_type_id__volatile = 0; if (g_once_init_enter (&search_condition_modified_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SearchConditionModifiedClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) search_condition_modified_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchConditionModified), 0, (GInstanceInitFunc) search_condition_modified_instance_init, NULL }; @@ -4335,13 +4327,15 @@ GType search_condition_modified_get_type (void) { } -gchar* search_condition_rating_context_to_string (SearchConditionRatingContext self) { +gchar* +search_condition_rating_context_to_string (SearchConditionRatingContext self) +{ gchar* result = NULL; #line 625 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" switch (self) { #line 625 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER: -#line 4338 "SearchBoolean.c" +#line 4332 "SearchBoolean.c" { gchar* _tmp0_; #line 627 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4350,11 +4344,11 @@ gchar* search_condition_rating_context_to_string (SearchConditionRatingContext s result = _tmp0_; #line 627 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4347 "SearchBoolean.c" +#line 4341 "SearchBoolean.c" } #line 625 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_RATING_CONTEXT_ONLY: -#line 4351 "SearchBoolean.c" +#line 4345 "SearchBoolean.c" { gchar* _tmp1_; #line 630 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4363,11 +4357,11 @@ gchar* search_condition_rating_context_to_string (SearchConditionRatingContext s result = _tmp1_; #line 630 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4360 "SearchBoolean.c" +#line 4354 "SearchBoolean.c" } #line 625 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER: -#line 4364 "SearchBoolean.c" +#line 4358 "SearchBoolean.c" { gchar* _tmp2_; #line 633 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4376,69 +4370,61 @@ gchar* search_condition_rating_context_to_string (SearchConditionRatingContext s result = _tmp2_; #line 633 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4373 "SearchBoolean.c" +#line 4367 "SearchBoolean.c" } default: { #line 636 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:636: unrecognized rating search context enumeration" \ " value"); -#line 4379 "SearchBoolean.c" +#line 4373 "SearchBoolean.c" } } } -SearchConditionRatingContext search_condition_rating_context_from_string (const gchar* str) { +SearchConditionRatingContext +search_condition_rating_context_from_string (const gchar* str) +{ SearchConditionRatingContext result = 0; - const gchar* _tmp0_; #line 640 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (str != NULL, 0); #line 641 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = str; -#line 641 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp0_, "AND_HIGHER") == 0) { + if (g_strcmp0 (str, "AND_HIGHER") == 0) { #line 642 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER; #line 642 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4398 "SearchBoolean.c" +#line 4391 "SearchBoolean.c" } else { - const gchar* _tmp1_; #line 644 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = str; -#line 644 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp1_, "ONLY") == 0) { + if (g_strcmp0 (str, "ONLY") == 0) { #line 645 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_RATING_CONTEXT_ONLY; #line 645 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4409 "SearchBoolean.c" +#line 4399 "SearchBoolean.c" } else { - const gchar* _tmp2_; -#line 647 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = str; #line 647 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp2_, "AND_LOWER") == 0) { + if (g_strcmp0 (str, "AND_LOWER") == 0) { #line 648 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER; #line 648 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4420 "SearchBoolean.c" +#line 4407 "SearchBoolean.c" } else { - const gchar* _tmp3_; #line 651 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = str; -#line 651 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - g_error ("SearchBoolean.vala:651: unrecognized rating search context name: %s", _tmp3_); -#line 4427 "SearchBoolean.c" + g_error ("SearchBoolean.vala:651: unrecognized rating search context name: %s", str); +#line 4411 "SearchBoolean.c" } } } } -GType search_condition_rating_context_get_type (void) { +GType +search_condition_rating_context_get_type (void) +{ static volatile gsize search_condition_rating_context_type_id__volatile = 0; if (g_once_init_enter (&search_condition_rating_context_type_id__volatile)) { static const GEnumValue values[] = {{SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER, "SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER", "and-higher"}, {SEARCH_CONDITION_RATING_CONTEXT_ONLY, "SEARCH_CONDITION_RATING_CONTEXT_ONLY", "only"}, {SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER, "SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER", "and-lower"}, {0, NULL, NULL}}; @@ -4450,118 +4436,117 @@ GType search_condition_rating_context_get_type (void) { } -SearchConditionRating* search_condition_rating_construct (GType object_type, SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context) { +SearchConditionRating* +search_condition_rating_construct (GType object_type, + SearchConditionSearchType search_type, + Rating rating, + SearchConditionRatingContext context) +{ SearchConditionRating* self = NULL; - SearchConditionSearchType _tmp0_; - Rating _tmp1_; - SearchConditionRatingContext _tmp2_; #line 661 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = (SearchConditionRating*) search_condition_construct (object_type); #line 662 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = search_type; -#line 662 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), _tmp0_); -#line 663 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = rating; + search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), search_type); #line 663 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search_condition_rating_set_rating (self, _tmp1_); + search_condition_rating_set_rating (self, rating); #line 664 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = context; -#line 664 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search_condition_rating_set_context (self, _tmp2_); + search_condition_rating_set_context (self, context); #line 661 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 4467 "SearchBoolean.c" +#line 4449 "SearchBoolean.c" } -SearchConditionRating* search_condition_rating_new (SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context) { +SearchConditionRating* +search_condition_rating_new (SearchConditionSearchType search_type, + Rating rating, + SearchConditionRatingContext context) +{ #line 661 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return search_condition_rating_construct (TYPE_SEARCH_CONDITION_RATING, search_type, rating, context); -#line 4474 "SearchBoolean.c" +#line 4460 "SearchBoolean.c" } -static gboolean search_condition_rating_real_predicate (SearchCondition* base, MediaSource* source) { +static gboolean +search_condition_rating_real_predicate (SearchCondition* base, + MediaSource* source) +{ SearchConditionRating * self; gboolean result = FALSE; Rating source_rating = 0; - MediaSource* _tmp0_; - Rating _tmp1_; - SearchConditionRatingContext _tmp2_; + SearchConditionRatingContext _tmp0_; #line 668 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEARCH_CONDITION_RATING, SearchConditionRating); #line 668 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (source), FALSE); #line 669 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = source; -#line 669 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = media_source_get_rating (_tmp0_); -#line 669 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - source_rating = _tmp1_; + source_rating = media_source_get_rating (source); #line 670 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = self->priv->_context; + _tmp0_ = self->priv->_context; #line 670 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp2_ == SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER) { -#line 4499 "SearchBoolean.c" - Rating _tmp3_; - Rating _tmp4_; + if (_tmp0_ == SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER) { +#line 4482 "SearchBoolean.c" + Rating _tmp1_; + Rating _tmp2_; #line 671 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = source_rating; + _tmp1_ = source_rating; #line 671 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = self->priv->_rating; + _tmp2_ = self->priv->_rating; #line 671 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp3_ >= _tmp4_; + result = _tmp1_ >= _tmp2_; #line 671 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4510 "SearchBoolean.c" +#line 4493 "SearchBoolean.c" } else { - SearchConditionRatingContext _tmp5_; + SearchConditionRatingContext _tmp3_; #line 672 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp5_ = self->priv->_context; + _tmp3_ = self->priv->_context; #line 672 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp5_ == SEARCH_CONDITION_RATING_CONTEXT_ONLY) { -#line 4517 "SearchBoolean.c" - Rating _tmp6_; - Rating _tmp7_; + if (_tmp3_ == SEARCH_CONDITION_RATING_CONTEXT_ONLY) { +#line 4500 "SearchBoolean.c" + Rating _tmp4_; + Rating _tmp5_; #line 673 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp6_ = source_rating; + _tmp4_ = source_rating; #line 673 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp7_ = self->priv->_rating; + _tmp5_ = self->priv->_rating; #line 673 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp6_ == _tmp7_; + result = _tmp4_ == _tmp5_; #line 673 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4528 "SearchBoolean.c" +#line 4511 "SearchBoolean.c" } else { - SearchConditionRatingContext _tmp8_; + SearchConditionRatingContext _tmp6_; #line 674 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp8_ = self->priv->_context; + _tmp6_ = self->priv->_context; #line 674 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp8_ == SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER) { -#line 4535 "SearchBoolean.c" - Rating _tmp9_; - Rating _tmp10_; + if (_tmp6_ == SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER) { +#line 4518 "SearchBoolean.c" + Rating _tmp7_; + Rating _tmp8_; #line 675 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp9_ = source_rating; + _tmp7_ = source_rating; #line 675 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp10_ = self->priv->_rating; + _tmp8_ = self->priv->_rating; #line 675 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp9_ <= _tmp10_; + result = _tmp7_ <= _tmp8_; #line 675 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4546 "SearchBoolean.c" +#line 4529 "SearchBoolean.c" } else { #line 677 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:677: unknown rating search context"); -#line 4550 "SearchBoolean.c" +#line 4533 "SearchBoolean.c" } } } } -Rating search_condition_rating_get_rating (SearchConditionRating* self) { +Rating +search_condition_rating_get_rating (SearchConditionRating* self) +{ Rating result; Rating _tmp0_; #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4572,23 +4557,25 @@ Rating search_condition_rating_get_rating (SearchConditionRating* self) { result = _tmp0_; #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4568 "SearchBoolean.c" +#line 4553 "SearchBoolean.c" } -static void search_condition_rating_set_rating (SearchConditionRating* self, Rating value) { - Rating _tmp0_; +static void +search_condition_rating_set_rating (SearchConditionRating* self, + Rating value) +{ #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_RATING (self)); #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = value; -#line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - self->priv->_rating = _tmp0_; -#line 4580 "SearchBoolean.c" + self->priv->_rating = value; +#line 4565 "SearchBoolean.c" } -SearchConditionRatingContext search_condition_rating_get_context (SearchConditionRating* self) { +SearchConditionRatingContext +search_condition_rating_get_context (SearchConditionRating* self) +{ SearchConditionRatingContext result; SearchConditionRatingContext _tmp0_; #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4599,23 +4586,25 @@ SearchConditionRatingContext search_condition_rating_get_context (SearchConditio result = _tmp0_; #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4595 "SearchBoolean.c" +#line 4582 "SearchBoolean.c" } -static void search_condition_rating_set_context (SearchConditionRating* self, SearchConditionRatingContext value) { - SearchConditionRatingContext _tmp0_; +static void +search_condition_rating_set_context (SearchConditionRating* self, + SearchConditionRatingContext value) +{ #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_RATING (self)); #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = value; -#line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - self->priv->_context = _tmp0_; -#line 4607 "SearchBoolean.c" + self->priv->_context = value; +#line 4594 "SearchBoolean.c" } -static void search_condition_rating_class_init (SearchConditionRatingClass * klass) { +static void +search_condition_rating_class_init (SearchConditionRatingClass * klass) +{ #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_rating_parent_class = g_type_class_peek_parent (klass); #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4624,28 +4613,34 @@ static void search_condition_rating_class_init (SearchConditionRatingClass * kla g_type_class_add_private (klass, sizeof (SearchConditionRatingPrivate)); #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_rating_real_predicate; -#line 4620 "SearchBoolean.c" +#line 4609 "SearchBoolean.c" } -static void search_condition_rating_instance_init (SearchConditionRating * self) { +static void +search_condition_rating_instance_init (SearchConditionRating * self) +{ #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SEARCH_CONDITION_RATING_GET_PRIVATE (self); -#line 4627 "SearchBoolean.c" +#line 4618 "SearchBoolean.c" } -static void search_condition_rating_finalize (SearchCondition * obj) { +static void +search_condition_rating_finalize (SearchCondition * obj) +{ SearchConditionRating * self; #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_RATING, SearchConditionRating); #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" SEARCH_CONDITION_CLASS (search_condition_rating_parent_class)->finalize (obj); -#line 4637 "SearchBoolean.c" +#line 4630 "SearchBoolean.c" } -GType search_condition_rating_get_type (void) { +GType +search_condition_rating_get_type (void) +{ static volatile gsize search_condition_rating_type_id__volatile = 0; if (g_once_init_enter (&search_condition_rating_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SearchConditionRatingClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) search_condition_rating_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchConditionRating), 0, (GInstanceInitFunc) search_condition_rating_instance_init, NULL }; @@ -4657,13 +4652,15 @@ GType search_condition_rating_get_type (void) { } -gchar* search_condition_date_context_to_string (SearchConditionDateContext self) { +gchar* +search_condition_date_context_to_string (SearchConditionDateContext self) +{ gchar* result = NULL; #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" switch (self) { #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_EXACT: -#line 4659 "SearchBoolean.c" +#line 4656 "SearchBoolean.c" { gchar* _tmp0_; #line 694 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4672,11 +4669,11 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self) result = _tmp0_; #line 694 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4668 "SearchBoolean.c" +#line 4665 "SearchBoolean.c" } #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_AFTER: -#line 4672 "SearchBoolean.c" +#line 4669 "SearchBoolean.c" { gchar* _tmp1_; #line 697 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4685,11 +4682,11 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self) result = _tmp1_; #line 697 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4681 "SearchBoolean.c" +#line 4678 "SearchBoolean.c" } #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_BEFORE: -#line 4685 "SearchBoolean.c" +#line 4682 "SearchBoolean.c" { gchar* _tmp2_; #line 700 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4698,11 +4695,11 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self) result = _tmp2_; #line 700 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4694 "SearchBoolean.c" +#line 4691 "SearchBoolean.c" } #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_BETWEEN: -#line 4698 "SearchBoolean.c" +#line 4695 "SearchBoolean.c" { gchar* _tmp3_; #line 703 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4711,11 +4708,11 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self) result = _tmp3_; #line 703 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4707 "SearchBoolean.c" +#line 4704 "SearchBoolean.c" } #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET: -#line 4711 "SearchBoolean.c" +#line 4708 "SearchBoolean.c" { gchar* _tmp4_; #line 706 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4724,84 +4721,68 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self) result = _tmp4_; #line 706 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4720 "SearchBoolean.c" +#line 4717 "SearchBoolean.c" } default: { #line 709 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:709: unrecognized date search context enumeration v" \ "alue"); -#line 4726 "SearchBoolean.c" +#line 4723 "SearchBoolean.c" } } } -SearchConditionDateContext search_condition_date_context_from_string (const gchar* str) { +SearchConditionDateContext +search_condition_date_context_from_string (const gchar* str) +{ SearchConditionDateContext result = 0; - const gchar* _tmp0_; - const gchar* _tmp1_; #line 713 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (str != NULL, 0); #line 714 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = str; -#line 714 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp0_, "EXACT") == 0) { + if (g_strcmp0 (str, "EXACT") == 0) { #line 715 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_DATE_CONTEXT_EXACT; #line 715 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4746 "SearchBoolean.c" +#line 4741 "SearchBoolean.c" } #line 717 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = str; -#line 717 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp1_, "AFTER") == 0) { + if (g_strcmp0 (str, "AFTER") == 0) { #line 718 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_DATE_CONTEXT_AFTER; #line 718 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4756 "SearchBoolean.c" +#line 4749 "SearchBoolean.c" } else { - const gchar* _tmp2_; #line 720 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = str; -#line 720 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp2_, "BEFORE") == 0) { + if (g_strcmp0 (str, "BEFORE") == 0) { #line 721 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_DATE_CONTEXT_BEFORE; #line 721 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4767 "SearchBoolean.c" +#line 4757 "SearchBoolean.c" } else { - const gchar* _tmp3_; -#line 723 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = str; #line 723 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp3_, "BETWEEN") == 0) { + if (g_strcmp0 (str, "BETWEEN") == 0) { #line 724 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_DATE_CONTEXT_BETWEEN; #line 724 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4778 "SearchBoolean.c" +#line 4765 "SearchBoolean.c" } else { - const gchar* _tmp4_; #line 726 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = str; -#line 726 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (g_strcmp0 (_tmp4_, "IS_NOT_SET") == 0) { + if (g_strcmp0 (str, "IS_NOT_SET") == 0) { #line 727 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET; #line 727 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4789 "SearchBoolean.c" +#line 4773 "SearchBoolean.c" } else { - const gchar* _tmp5_; -#line 730 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp5_ = str; #line 730 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - g_error ("SearchBoolean.vala:730: unrecognized date search context name: %s", _tmp5_); -#line 4796 "SearchBoolean.c" + g_error ("SearchBoolean.vala:730: unrecognized date search context name: %s", str); +#line 4777 "SearchBoolean.c" } } } @@ -4809,7 +4790,9 @@ SearchConditionDateContext search_condition_date_context_from_string (const gcha } -GType search_condition_date_context_get_type (void) { +GType +search_condition_date_context_get_type (void) +{ static volatile gsize search_condition_date_context_type_id__volatile = 0; if (g_once_init_enter (&search_condition_date_context_type_id__volatile)) { static const GEnumValue values[] = {{SEARCH_CONDITION_DATE_CONTEXT_EXACT, "SEARCH_CONDITION_DATE_CONTEXT_EXACT", "exact"}, {SEARCH_CONDITION_DATE_CONTEXT_AFTER, "SEARCH_CONDITION_DATE_CONTEXT_AFTER", "after"}, {SEARCH_CONDITION_DATE_CONTEXT_BEFORE, "SEARCH_CONDITION_DATE_CONTEXT_BEFORE", "before"}, {SEARCH_CONDITION_DATE_CONTEXT_BETWEEN, "SEARCH_CONDITION_DATE_CONTEXT_BETWEEN", "between"}, {SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET, "SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET", "is-not-set"}, {0, NULL, NULL}}; @@ -4821,12 +4804,15 @@ GType search_condition_date_context_get_type (void) { } -SearchConditionDate* search_condition_date_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two) { +SearchConditionDate* +search_condition_date_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionDateContext context, + GDateTime* date_one, + GDateTime* date_two) +{ SearchConditionDate* self = NULL; - SearchConditionSearchType _tmp0_; - SearchConditionDateContext _tmp1_; - gboolean _tmp2_ = FALSE; - SearchConditionDateContext _tmp3_; + gboolean _tmp0_ = FALSE; #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (date_one != NULL, NULL); #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4834,270 +4820,226 @@ SearchConditionDate* search_condition_date_construct (GType object_type, SearchC #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = (SearchConditionDate*) search_condition_construct (object_type); #line 743 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = search_type; -#line 743 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), _tmp0_); + search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), search_type); #line 744 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = context; -#line 744 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search_condition_date_set_context (self, _tmp1_); -#line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = context; + search_condition_date_set_context (self, context); #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp3_ != SEARCH_CONDITION_DATE_CONTEXT_BETWEEN) { + if (context != SEARCH_CONDITION_DATE_CONTEXT_BETWEEN) { #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = TRUE; -#line 4842 "SearchBoolean.c" + _tmp0_ = TRUE; +#line 4822 "SearchBoolean.c" } else { - GDateTime* _tmp4_; - GDateTime* _tmp5_; - gint _tmp6_; -#line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = date_two; -#line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp5_ = date_one; -#line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp6_ = g_date_time_compare (_tmp4_, _tmp5_); #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = _tmp6_ >= 1; -#line 4855 "SearchBoolean.c" + _tmp0_ = g_date_time_compare (date_two, date_one) >= 1; +#line 4826 "SearchBoolean.c" } #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp2_) { -#line 4859 "SearchBoolean.c" - GDateTime* _tmp7_; - GDateTime* _tmp8_; -#line 746 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp7_ = date_one; + if (_tmp0_) { #line 746 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search_condition_date_set_date_one (self, _tmp7_); -#line 747 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp8_ = date_two; + search_condition_date_set_date_one (self, date_one); #line 747 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search_condition_date_set_date_two (self, _tmp8_); -#line 4870 "SearchBoolean.c" + search_condition_date_set_date_two (self, date_two); +#line 4834 "SearchBoolean.c" } else { - GDateTime* _tmp9_; - GDateTime* _tmp10_; #line 749 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp9_ = date_two; -#line 749 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search_condition_date_set_date_one (self, _tmp9_); -#line 750 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp10_ = date_one; + search_condition_date_set_date_one (self, date_two); #line 750 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search_condition_date_set_date_two (self, _tmp10_); -#line 4882 "SearchBoolean.c" + search_condition_date_set_date_two (self, date_one); +#line 4840 "SearchBoolean.c" } #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 4886 "SearchBoolean.c" +#line 4844 "SearchBoolean.c" } -SearchConditionDate* search_condition_date_new (SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two) { +SearchConditionDate* +search_condition_date_new (SearchConditionSearchType search_type, + SearchConditionDateContext context, + GDateTime* date_one, + GDateTime* date_two) +{ #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return search_condition_date_construct (TYPE_SEARCH_CONDITION_DATE, search_type, context, date_one, date_two); -#line 4893 "SearchBoolean.c" +#line 4856 "SearchBoolean.c" } -static gboolean search_condition_date_real_predicate (SearchCondition* base, MediaSource* source) { +static gboolean +search_condition_date_real_predicate (SearchCondition* base, + MediaSource* source) +{ SearchConditionDate * self; gboolean result = FALSE; time_t exposure_time = 0; - MediaSource* _tmp0_; - time_t _tmp1_; - time_t _tmp2_; + time_t _tmp0_; GDateTime* dt = NULL; - time_t _tmp4_; - GDateTime* _tmp5_; - SearchConditionDateContext _tmp6_; + time_t _tmp2_; + GDateTime* _tmp3_; + SearchConditionDateContext _tmp4_; #line 756 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEARCH_CONDITION_DATE, SearchConditionDate); #line 756 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (source), FALSE); #line 757 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = source; -#line 757 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = media_source_get_exposure_time (_tmp0_); -#line 757 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - exposure_time = _tmp1_; + exposure_time = media_source_get_exposure_time (source); #line 758 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = exposure_time; + _tmp0_ = exposure_time; #line 758 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp2_ == ((time_t) 0)) { -#line 4922 "SearchBoolean.c" - SearchConditionDateContext _tmp3_; + if (_tmp0_ == ((time_t) 0)) { +#line 4882 "SearchBoolean.c" + SearchConditionDateContext _tmp1_; #line 759 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = self->priv->_context; + _tmp1_ = self->priv->_context; #line 759 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp3_ == SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET; + result = _tmp1_ == SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET; #line 759 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4930 "SearchBoolean.c" +#line 4890 "SearchBoolean.c" } #line 761 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = exposure_time; + _tmp2_ = exposure_time; #line 761 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp5_ = g_date_time_new_from_unix_local ((gint64) _tmp4_); + _tmp3_ = g_date_time_new_from_unix_local ((gint64) _tmp2_); #line 761 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - dt = _tmp5_; + dt = _tmp3_; #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp6_ = self->priv->_context; + _tmp4_ = self->priv->_context; #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - switch (_tmp6_) { + switch (_tmp4_) { #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_EXACT: -#line 4944 "SearchBoolean.c" +#line 4904 "SearchBoolean.c" { GDateTime* second = NULL; - GDateTime* _tmp7_; + GDateTime* _tmp5_; + GDateTime* _tmp6_; + gboolean _tmp7_ = FALSE; GDateTime* _tmp8_; - gboolean _tmp9_ = FALSE; - GDateTime* _tmp10_; - GDateTime* _tmp11_; - gint _tmp12_; + GDateTime* _tmp9_; #line 764 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp7_ = self->priv->_date_one; + _tmp5_ = self->priv->_date_one; #line 764 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp8_ = g_date_time_add_days (_tmp7_, 1); + _tmp6_ = g_date_time_add_days (_tmp5_, 1); #line 764 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - second = _tmp8_; -#line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp10_ = dt; + second = _tmp6_; #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp11_ = self->priv->_date_one; + _tmp8_ = dt; #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp12_ = g_date_time_compare (_tmp10_, _tmp11_); + _tmp9_ = self->priv->_date_one; #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp12_ >= 0) { -#line 4967 "SearchBoolean.c" - GDateTime* _tmp13_; - GDateTime* _tmp14_; - gint _tmp15_; + if (g_date_time_compare (_tmp8_, _tmp9_) >= 0) { +#line 4924 "SearchBoolean.c" + GDateTime* _tmp10_; + GDateTime* _tmp11_; #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp13_ = dt; + _tmp10_ = dt; #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp14_ = second; + _tmp11_ = second; #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp15_ = g_date_time_compare (_tmp13_, _tmp14_); -#line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp9_ = _tmp15_ < 0; -#line 4979 "SearchBoolean.c" + _tmp7_ = g_date_time_compare (_tmp10_, _tmp11_) < 0; +#line 4933 "SearchBoolean.c" } else { #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp9_ = FALSE; -#line 4983 "SearchBoolean.c" + _tmp7_ = FALSE; +#line 4937 "SearchBoolean.c" } #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp9_; + result = _tmp7_; #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_date_time_unref0 (second); #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_date_time_unref0 (dt); #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4993 "SearchBoolean.c" +#line 4947 "SearchBoolean.c" } #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_AFTER: -#line 4997 "SearchBoolean.c" +#line 4951 "SearchBoolean.c" { - GDateTime* _tmp16_; - GDateTime* _tmp17_; - gint _tmp18_; + GDateTime* _tmp12_; + GDateTime* _tmp13_; #line 768 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp16_ = dt; + _tmp12_ = dt; #line 768 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp17_ = self->priv->_date_one; + _tmp13_ = self->priv->_date_one; #line 768 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp18_ = g_date_time_compare (_tmp16_, _tmp17_); -#line 768 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp18_ >= 0; + result = g_date_time_compare (_tmp12_, _tmp13_) >= 0; #line 768 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_date_time_unref0 (dt); #line 768 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5014 "SearchBoolean.c" +#line 4965 "SearchBoolean.c" } #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_BEFORE: -#line 5018 "SearchBoolean.c" +#line 4969 "SearchBoolean.c" { - GDateTime* _tmp19_; - GDateTime* _tmp20_; - gint _tmp21_; + GDateTime* _tmp14_; + GDateTime* _tmp15_; #line 771 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp19_ = dt; + _tmp14_ = dt; #line 771 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp20_ = self->priv->_date_one; -#line 771 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp21_ = g_date_time_compare (_tmp19_, _tmp20_); + _tmp15_ = self->priv->_date_one; #line 771 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp21_ <= 0; + result = g_date_time_compare (_tmp14_, _tmp15_) <= 0; #line 771 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_date_time_unref0 (dt); #line 771 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5035 "SearchBoolean.c" +#line 4983 "SearchBoolean.c" } #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_BETWEEN: -#line 5039 "SearchBoolean.c" +#line 4987 "SearchBoolean.c" { GDateTime* second = NULL; - GDateTime* _tmp22_; - GDateTime* _tmp23_; - gboolean _tmp24_ = FALSE; - GDateTime* _tmp25_; - GDateTime* _tmp26_; - gint _tmp27_; + GDateTime* _tmp16_; + GDateTime* _tmp17_; + gboolean _tmp18_ = FALSE; + GDateTime* _tmp19_; + GDateTime* _tmp20_; #line 774 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp22_ = self->priv->_date_two; + _tmp16_ = self->priv->_date_two; #line 774 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp23_ = g_date_time_add_days (_tmp22_, 1); + _tmp17_ = g_date_time_add_days (_tmp16_, 1); #line 774 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - second = _tmp23_; -#line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp25_ = dt; + second = _tmp17_; #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp26_ = self->priv->_date_one; -#line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp27_ = g_date_time_compare (_tmp25_, _tmp26_); + _tmp19_ = dt; #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp27_ >= 0) { -#line 5062 "SearchBoolean.c" - GDateTime* _tmp28_; - GDateTime* _tmp29_; - gint _tmp30_; + _tmp20_ = self->priv->_date_one; #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp28_ = dt; + if (g_date_time_compare (_tmp19_, _tmp20_) >= 0) { +#line 5007 "SearchBoolean.c" + GDateTime* _tmp21_; + GDateTime* _tmp22_; #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp29_ = second; + _tmp21_ = dt; #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp30_ = g_date_time_compare (_tmp28_, _tmp29_); + _tmp22_ = second; #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp24_ = _tmp30_ < 0; -#line 5074 "SearchBoolean.c" + _tmp18_ = g_date_time_compare (_tmp21_, _tmp22_) < 0; +#line 5016 "SearchBoolean.c" } else { #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp24_ = FALSE; -#line 5078 "SearchBoolean.c" + _tmp18_ = FALSE; +#line 5020 "SearchBoolean.c" } #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp24_; + result = _tmp18_; #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_date_time_unref0 (second); #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_date_time_unref0 (dt); #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5088 "SearchBoolean.c" +#line 5030 "SearchBoolean.c" } #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET: -#line 5092 "SearchBoolean.c" +#line 5034 "SearchBoolean.c" { #line 778 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = FALSE; @@ -5105,23 +5047,25 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _g_date_time_unref0 (dt); #line 778 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5100 "SearchBoolean.c" +#line 5042 "SearchBoolean.c" } default: { #line 781 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:781: unrecognized date search context enumeration v" \ "alue"); -#line 5106 "SearchBoolean.c" +#line 5048 "SearchBoolean.c" } } #line 756 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_date_time_unref0 (dt); -#line 5111 "SearchBoolean.c" +#line 5053 "SearchBoolean.c" } -GDateTime* search_condition_date_get_date_one (SearchConditionDate* self) { +GDateTime* +search_condition_date_get_date_one (SearchConditionDate* self) +{ GDateTime* result; GDateTime* _tmp0_; #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5132,35 +5076,39 @@ GDateTime* search_condition_date_get_date_one (SearchConditionDate* self) { result = _tmp0_; #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5126 "SearchBoolean.c" +#line 5070 "SearchBoolean.c" } -static gpointer _g_date_time_ref0 (gpointer self) { +static gpointer +_g_date_time_ref0 (gpointer self) +{ #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self ? g_date_time_ref (self) : NULL; -#line 5133 "SearchBoolean.c" +#line 5079 "SearchBoolean.c" } -static void search_condition_date_set_date_one (SearchConditionDate* self, GDateTime* value) { +static void +search_condition_date_set_date_one (SearchConditionDate* self, + GDateTime* value) +{ GDateTime* _tmp0_; - GDateTime* _tmp1_; #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_DATE (self)); #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = value; -#line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = _g_date_time_ref0 (_tmp0_); + _tmp0_ = _g_date_time_ref0 (value); #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_date_time_unref0 (self->priv->_date_one); #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - self->priv->_date_one = _tmp1_; -#line 5150 "SearchBoolean.c" + self->priv->_date_one = _tmp0_; +#line 5096 "SearchBoolean.c" } -GDateTime* search_condition_date_get_date_two (SearchConditionDate* self) { +GDateTime* +search_condition_date_get_date_two (SearchConditionDate* self) +{ GDateTime* result; GDateTime* _tmp0_; #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5171,28 +5119,30 @@ GDateTime* search_condition_date_get_date_two (SearchConditionDate* self) { result = _tmp0_; #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5165 "SearchBoolean.c" +#line 5113 "SearchBoolean.c" } -static void search_condition_date_set_date_two (SearchConditionDate* self, GDateTime* value) { +static void +search_condition_date_set_date_two (SearchConditionDate* self, + GDateTime* value) +{ GDateTime* _tmp0_; - GDateTime* _tmp1_; #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_DATE (self)); #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = value; -#line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = _g_date_time_ref0 (_tmp0_); + _tmp0_ = _g_date_time_ref0 (value); #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_date_time_unref0 (self->priv->_date_two); #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - self->priv->_date_two = _tmp1_; -#line 5182 "SearchBoolean.c" + self->priv->_date_two = _tmp0_; +#line 5130 "SearchBoolean.c" } -SearchConditionDateContext search_condition_date_get_context (SearchConditionDate* self) { +SearchConditionDateContext +search_condition_date_get_context (SearchConditionDate* self) +{ SearchConditionDateContext result; SearchConditionDateContext _tmp0_; #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5203,23 +5153,25 @@ SearchConditionDateContext search_condition_date_get_context (SearchConditionDat result = _tmp0_; #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5197 "SearchBoolean.c" +#line 5147 "SearchBoolean.c" } -static void search_condition_date_set_context (SearchConditionDate* self, SearchConditionDateContext value) { - SearchConditionDateContext _tmp0_; +static void +search_condition_date_set_context (SearchConditionDate* self, + SearchConditionDateContext value) +{ #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_DATE (self)); #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = value; -#line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - self->priv->_context = _tmp0_; -#line 5209 "SearchBoolean.c" + self->priv->_context = value; +#line 5159 "SearchBoolean.c" } -static void search_condition_date_class_init (SearchConditionDateClass * klass) { +static void +search_condition_date_class_init (SearchConditionDateClass * klass) +{ #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_date_parent_class = g_type_class_peek_parent (klass); #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5228,18 +5180,22 @@ static void search_condition_date_class_init (SearchConditionDateClass * klass) g_type_class_add_private (klass, sizeof (SearchConditionDatePrivate)); #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_date_real_predicate; -#line 5222 "SearchBoolean.c" +#line 5174 "SearchBoolean.c" } -static void search_condition_date_instance_init (SearchConditionDate * self) { +static void +search_condition_date_instance_init (SearchConditionDate * self) +{ #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SEARCH_CONDITION_DATE_GET_PRIVATE (self); -#line 5229 "SearchBoolean.c" +#line 5183 "SearchBoolean.c" } -static void search_condition_date_finalize (SearchCondition * obj) { +static void +search_condition_date_finalize (SearchCondition * obj) +{ SearchConditionDate * self; #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_DATE, SearchConditionDate); @@ -5249,11 +5205,13 @@ static void search_condition_date_finalize (SearchCondition * obj) { _g_date_time_unref0 (self->priv->_date_two); #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" SEARCH_CONDITION_CLASS (search_condition_date_parent_class)->finalize (obj); -#line 5243 "SearchBoolean.c" +#line 5199 "SearchBoolean.c" } -GType search_condition_date_get_type (void) { +GType +search_condition_date_get_type (void) +{ static volatile gsize search_condition_date_type_id__volatile = 0; if (g_once_init_enter (&search_condition_date_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SearchConditionDateClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) search_condition_date_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchConditionDate), 0, (GInstanceInitFunc) search_condition_date_instance_init, NULL }; @@ -5265,46 +5223,51 @@ GType search_condition_date_get_type (void) { } -static gpointer _saved_search_row_ref0 (gpointer self) { +static gpointer +_saved_search_row_ref0 (gpointer self) +{ #line 797 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self ? saved_search_row_ref (self) : NULL; -#line 5262 "SearchBoolean.c" +#line 5222 "SearchBoolean.c" } -SavedSearch* saved_search_construct (GType object_type, SavedSearchRow* row, gint64 object_id) { +SavedSearch* +saved_search_construct (GType object_type, + SavedSearchRow* row, + gint64 object_id) +{ SavedSearch * self = NULL; - gint64 _tmp0_; - SavedSearchRow* _tmp1_; - SavedSearchRow* _tmp2_; + SavedSearchRow* _tmp0_; #line 794 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SAVED_SEARCH_ROW (row), NULL); #line 795 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = object_id; -#line 795 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - self = (SavedSearch*) data_source_construct (object_type, _tmp0_); -#line 797 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = row; + self = (SavedSearch*) data_source_construct (object_type, object_id); #line 797 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = _saved_search_row_ref0 (_tmp1_); + _tmp0_ = _saved_search_row_ref0 (row); #line 797 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _saved_search_row_unref0 (self->priv->row); #line 797 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - self->priv->row = _tmp2_; + self->priv->row = _tmp0_; #line 794 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 5287 "SearchBoolean.c" +#line 5245 "SearchBoolean.c" } -SavedSearch* saved_search_new (SavedSearchRow* row, gint64 object_id) { +SavedSearch* +saved_search_new (SavedSearchRow* row, + gint64 object_id) +{ #line 794 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return saved_search_construct (TYPE_SAVED_SEARCH, row, object_id); -#line 5294 "SearchBoolean.c" +#line 5255 "SearchBoolean.c" } -static gchar* saved_search_real_get_name (DataObject* base) { +static gchar* +saved_search_real_get_name (DataObject* base) +{ SavedSearch * self; gchar* result = NULL; SavedSearchRow* _tmp0_; @@ -5322,11 +5285,13 @@ static gchar* saved_search_real_get_name (DataObject* base) { result = _tmp2_; #line 801 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5316 "SearchBoolean.c" +#line 5279 "SearchBoolean.c" } -static gchar* saved_search_real_to_string (DataObject* base) { +static gchar* +saved_search_real_to_string (DataObject* base) +{ SavedSearch * self; gchar* result = NULL; gchar* _tmp0_; @@ -5349,11 +5314,13 @@ static gchar* saved_search_real_to_string (DataObject* base) { result = _tmp3_; #line 805 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5343 "SearchBoolean.c" +#line 5308 "SearchBoolean.c" } -static gchar* saved_search_real_get_typename (DataSource* base) { +static gchar* +saved_search_real_get_typename (DataSource* base) +{ SavedSearch * self; gchar* result = NULL; gchar* _tmp0_; @@ -5365,11 +5332,14 @@ static gchar* saved_search_real_get_typename (DataSource* base) { result = _tmp0_; #line 809 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5359 "SearchBoolean.c" +#line 5326 "SearchBoolean.c" } -void saved_search_get_saved_search_id (SavedSearch* self, SavedSearchID* result) { +void +saved_search_get_saved_search_id (SavedSearch* self, + SavedSearchID* result) +{ SavedSearchRow* _tmp0_; SavedSearchID _tmp1_; #line 812 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5382,11 +5352,13 @@ void saved_search_get_saved_search_id (SavedSearch* self, SavedSearchID* result) *result = _tmp1_; #line 813 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return; -#line 5376 "SearchBoolean.c" +#line 5346 "SearchBoolean.c" } -static gint64 saved_search_real_get_instance_id (DataSource* base) { +static gint64 +saved_search_real_get_instance_id (DataSource* base) +{ SavedSearch * self; gint64 result = 0LL; SavedSearchID _tmp0_ = {0}; @@ -5401,42 +5373,39 @@ static gint64 saved_search_real_get_instance_id (DataSource* base) { result = _tmp1_; #line 817 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5395 "SearchBoolean.c" +#line 5367 "SearchBoolean.c" } -gint saved_search_compare_names (void* a, void* b) { +gint +saved_search_compare_names (void* a, + void* b) +{ gint result = 0; SavedSearch* asearch = NULL; - void* _tmp0_; SavedSearch* bsearch = NULL; - void* _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; - gint _tmp4_; -#line 821 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = a; + gchar* _tmp0_; + gchar* _tmp1_; #line 821 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - asearch = (SavedSearch*) _tmp0_; -#line 822 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = b; + asearch = (SavedSearch*) a; #line 822 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - bsearch = (SavedSearch*) _tmp1_; + bsearch = (SavedSearch*) b; #line 824 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (asearch, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (asearch, TYPE_DATA_OBJECT, DataObject)); #line 824 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (bsearch, TYPE_DATA_OBJECT, DataObject)); + _tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (bsearch, TYPE_DATA_OBJECT, DataObject)); #line 824 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = string_collated_compare (_tmp2_, _tmp3_); -#line 824 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp4_; + result = string_collated_compare (_tmp0_, _tmp1_); #line 824 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5426 "SearchBoolean.c" +#line 5392 "SearchBoolean.c" } -gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { +gboolean +saved_search_predicate (SavedSearch* self, + MediaSource* source) +{ gboolean result = FALSE; gboolean ret = FALSE; gboolean _tmp0_ = FALSE; @@ -5454,7 +5423,7 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { if (SEARCH_OPERATOR_ALL == _tmp2_) { #line 829 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = TRUE; -#line 5448 "SearchBoolean.c" +#line 5417 "SearchBoolean.c" } else { SavedSearchRow* _tmp3_; SearchOperator _tmp4_; @@ -5464,17 +5433,17 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { _tmp4_ = _tmp3_->operator; #line 829 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = SEARCH_OPERATOR_NONE == _tmp4_; -#line 5458 "SearchBoolean.c" +#line 5427 "SearchBoolean.c" } #line 829 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp0_) { #line 830 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ret = TRUE; -#line 5464 "SearchBoolean.c" +#line 5433 "SearchBoolean.c" } else { #line 832 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ret = FALSE; -#line 5468 "SearchBoolean.c" +#line 5437 "SearchBoolean.c" } { GeeList* _c_list = NULL; @@ -5506,7 +5475,7 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { _c_index = -1; #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" while (TRUE) { -#line 5500 "SearchBoolean.c" +#line 5469 "SearchBoolean.c" gint _tmp11_; gint _tmp12_; gint _tmp13_; @@ -5528,7 +5497,7 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { if (!(_tmp12_ < _tmp13_)) { #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" break; -#line 5522 "SearchBoolean.c" +#line 5491 "SearchBoolean.c" } #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp14_ = _c_list; @@ -5544,92 +5513,76 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { _tmp18_ = _tmp17_->operator; #line 835 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (SEARCH_OPERATOR_ALL == _tmp18_) { -#line 5538 "SearchBoolean.c" +#line 5507 "SearchBoolean.c" gboolean _tmp19_; SearchCondition* _tmp20_; - MediaSource* _tmp21_; - gboolean _tmp22_; #line 836 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp19_ = ret; #line 836 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp20_ = c; #line 836 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp21_ = source; -#line 836 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp22_ = search_condition_predicate (_tmp20_, _tmp21_); -#line 836 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ret = _tmp19_ & _tmp22_; -#line 5553 "SearchBoolean.c" + ret = _tmp19_ & search_condition_predicate (_tmp20_, source); +#line 5516 "SearchBoolean.c" } else { - SavedSearchRow* _tmp23_; - SearchOperator _tmp24_; + SavedSearchRow* _tmp21_; + SearchOperator _tmp22_; #line 837 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp23_ = self->priv->row; + _tmp21_ = self->priv->row; #line 837 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp24_ = _tmp23_->operator; + _tmp22_ = _tmp21_->operator; #line 837 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (SEARCH_OPERATOR_ANY == _tmp24_) { -#line 5563 "SearchBoolean.c" - gboolean _tmp25_; - SearchCondition* _tmp26_; - MediaSource* _tmp27_; - gboolean _tmp28_; -#line 838 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp25_ = ret; -#line 838 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp26_ = c; + if (SEARCH_OPERATOR_ANY == _tmp22_) { +#line 5526 "SearchBoolean.c" + gboolean _tmp23_; + SearchCondition* _tmp24_; #line 838 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp27_ = source; + _tmp23_ = ret; #line 838 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp28_ = search_condition_predicate (_tmp26_, _tmp27_); + _tmp24_ = c; #line 838 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ret = _tmp25_ | _tmp28_; -#line 5578 "SearchBoolean.c" + ret = _tmp23_ | search_condition_predicate (_tmp24_, source); +#line 5535 "SearchBoolean.c" } else { - SavedSearchRow* _tmp29_; - SearchOperator _tmp30_; + SavedSearchRow* _tmp25_; + SearchOperator _tmp26_; #line 839 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp29_ = self->priv->row; + _tmp25_ = self->priv->row; #line 839 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp30_ = _tmp29_->operator; + _tmp26_ = _tmp25_->operator; #line 839 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (SEARCH_OPERATOR_NONE == _tmp30_) { -#line 5588 "SearchBoolean.c" - gboolean _tmp31_; - SearchCondition* _tmp32_; - MediaSource* _tmp33_; - gboolean _tmp34_; + if (SEARCH_OPERATOR_NONE == _tmp26_) { +#line 5545 "SearchBoolean.c" + gboolean _tmp27_; + SearchCondition* _tmp28_; #line 840 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp31_ = ret; + _tmp27_ = ret; #line 840 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp32_ = c; + _tmp28_ = c; #line 840 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp33_ = source; -#line 840 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp34_ = search_condition_predicate (_tmp32_, _tmp33_); -#line 840 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ret = _tmp31_ & (!_tmp34_); -#line 5603 "SearchBoolean.c" + ret = _tmp27_ & (!search_condition_predicate (_tmp28_, source)); +#line 5554 "SearchBoolean.c" } } } #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _search_condition_unref0 (c); -#line 5609 "SearchBoolean.c" +#line 5560 "SearchBoolean.c" } #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (_c_list); -#line 5613 "SearchBoolean.c" +#line 5564 "SearchBoolean.c" } #line 842 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = ret; #line 842 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5619 "SearchBoolean.c" +#line 5570 "SearchBoolean.c" } -void saved_search_reconstitute (SavedSearch* self) { +void +saved_search_reconstitute (SavedSearch* self) +{ SavedSearchTable* _tmp8_; SavedSearchTable* _tmp9_; gchar* _tmp10_; @@ -5637,7 +5590,7 @@ void saved_search_reconstitute (SavedSearch* self) { GError * _inner_error_ = NULL; #line 845 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SAVED_SEARCH (self)); -#line 5631 "SearchBoolean.c" +#line 5584 "SearchBoolean.c" { SavedSearchID _tmp0_ = {0}; SavedSearchDBTable* _tmp1_; @@ -5664,7 +5617,7 @@ void saved_search_reconstitute (SavedSearch* self) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 5658 "SearchBoolean.c" +#line 5611 "SearchBoolean.c" goto __catch86_database_error; } #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5673,13 +5626,13 @@ void saved_search_reconstitute (SavedSearch* self) { g_clear_error (&_inner_error_); #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return; -#line 5667 "SearchBoolean.c" +#line 5620 "SearchBoolean.c" } #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp6_ = self->priv->row; #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp6_->search_id = _tmp0_; -#line 5673 "SearchBoolean.c" +#line 5626 "SearchBoolean.c" } goto __finally86; __catch86_database_error: @@ -5696,7 +5649,7 @@ void saved_search_reconstitute (SavedSearch* self) { app_window_database_error (_tmp7_); #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_error_free0 (err); -#line 5690 "SearchBoolean.c" +#line 5643 "SearchBoolean.c" } __finally86: #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5707,7 +5660,7 @@ void saved_search_reconstitute (SavedSearch* self) { g_clear_error (&_inner_error_); #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return; -#line 5701 "SearchBoolean.c" +#line 5654 "SearchBoolean.c" } #line 852 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp8_ = saved_search_table_get_instance (); @@ -5725,92 +5678,79 @@ void saved_search_reconstitute (SavedSearch* self) { g_debug ("SearchBoolean.vala:853: Reconstituted %s", _tmp11_); #line 853 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp11_); -#line 5719 "SearchBoolean.c" +#line 5672 "SearchBoolean.c" } -gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) { +gboolean +saved_search_rename (SavedSearch* self, + const gchar* new_name) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gboolean _tmp1_; - SavedSearchTable* _tmp2_; - SavedSearchTable* _tmp3_; - const gchar* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; + SavedSearchTable* _tmp0_; + SavedSearchTable* _tmp1_; + gboolean _tmp2_; + SavedSearchTable* _tmp10_; + SavedSearchTable* _tmp11_; + SavedSearchRow* _tmp12_; + gchar* _tmp13_; + SavedSearchTable* _tmp14_; SavedSearchTable* _tmp15_; - SavedSearchTable* _tmp16_; - SavedSearchRow* _tmp17_; - const gchar* _tmp18_; - gchar* _tmp19_; - SavedSearchTable* _tmp20_; - SavedSearchTable* _tmp21_; - LibraryWindow* _tmp22_; - LibraryWindow* _tmp23_; + LibraryWindow* _tmp16_; + LibraryWindow* _tmp17_; GError * _inner_error_ = NULL; #line 857 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SAVED_SEARCH (self), FALSE); #line 857 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (new_name != NULL, FALSE); #line 858 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = new_name; -#line 858 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = is_string_empty (_tmp0_); -#line 858 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp1_) { + if (is_string_empty (new_name)) { #line 859 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = FALSE; #line 859 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5756 "SearchBoolean.c" +#line 5703 "SearchBoolean.c" } #line 861 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = saved_search_table_get_instance (); + _tmp0_ = saved_search_table_get_instance (); #line 861 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = _tmp2_; -#line 861 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = new_name; -#line 861 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp5_ = saved_search_table_exists (_tmp3_, _tmp4_); + _tmp1_ = _tmp0_; #line 861 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp6_ = _tmp5_; + _tmp2_ = saved_search_table_exists (_tmp1_, new_name); #line 861 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _saved_search_table_unref0 (_tmp3_); + _saved_search_table_unref0 (_tmp1_); #line 861 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (_tmp6_) { + if (_tmp2_) { #line 862 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = FALSE; #line 862 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5776 "SearchBoolean.c" +#line 5719 "SearchBoolean.c" } { - SavedSearchDBTable* _tmp7_; - SavedSearchDBTable* _tmp8_; - SavedSearchRow* _tmp9_; - SavedSearchID _tmp10_; - const gchar* _tmp11_; -#line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp7_ = saved_search_db_table_get_instance (); + SavedSearchDBTable* _tmp3_; + SavedSearchDBTable* _tmp4_; + SavedSearchRow* _tmp5_; + SavedSearchID _tmp6_; #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp8_ = _tmp7_; + _tmp3_ = saved_search_db_table_get_instance (); #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp9_ = self->priv->row; + _tmp4_ = _tmp3_; #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp10_ = _tmp9_->search_id; + _tmp5_ = self->priv->row; #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp11_ = new_name; + _tmp6_ = _tmp5_->search_id; #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - saved_search_db_table_rename (_tmp8_, &_tmp10_, _tmp11_, &_inner_error_); + saved_search_db_table_rename (_tmp4_, &_tmp6_, new_name, &_inner_error_); #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _database_table_unref0 (_tmp8_); + _database_table_unref0 (_tmp4_); #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5800 "SearchBoolean.c" - gboolean _tmp12_ = FALSE; +#line 5740 "SearchBoolean.c" + gboolean _tmp7_ = FALSE; #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 5804 "SearchBoolean.c" +#line 5744 "SearchBoolean.c" goto __catch87_database_error; } #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5818,87 +5758,87 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) { #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_clear_error (&_inner_error_); #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - return _tmp12_; -#line 5813 "SearchBoolean.c" + return _tmp7_; +#line 5753 "SearchBoolean.c" } } goto __finally87; __catch87_database_error: { GError* err = NULL; - GError* _tmp13_; + GError* _tmp8_; #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" err = _inner_error_; #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _inner_error_ = NULL; #line 867 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp13_ = err; + _tmp8_ = err; #line 867 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - app_window_database_error (_tmp13_); + app_window_database_error (_tmp8_); #line 868 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = FALSE; #line 868 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_error_free0 (err); #line 868 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5835 "SearchBoolean.c" +#line 5775 "SearchBoolean.c" } __finally87: #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5840 "SearchBoolean.c" - gboolean _tmp14_ = FALSE; +#line 5780 "SearchBoolean.c" + gboolean _tmp9_ = FALSE; #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_clear_error (&_inner_error_); #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - return _tmp14_; -#line 5848 "SearchBoolean.c" + return _tmp9_; +#line 5788 "SearchBoolean.c" } #line 871 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp15_ = saved_search_table_get_instance (); + _tmp10_ = saved_search_table_get_instance (); #line 871 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp16_ = _tmp15_; + _tmp11_ = _tmp10_; #line 871 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - saved_search_table_remove_from_map (_tmp16_, self); + saved_search_table_remove_from_map (_tmp11_, self); #line 871 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _saved_search_table_unref0 (_tmp16_); + _saved_search_table_unref0 (_tmp11_); #line 872 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp17_ = self->priv->row; + _tmp12_ = self->priv->row; #line 872 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp18_ = new_name; + _tmp13_ = g_strdup (new_name); #line 872 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp19_ = g_strdup (_tmp18_); + _g_free0 (_tmp12_->name); #line 872 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp17_->name); -#line 872 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp17_->name = _tmp19_; + _tmp12_->name = _tmp13_; #line 873 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp20_ = saved_search_table_get_instance (); + _tmp14_ = saved_search_table_get_instance (); #line 873 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp21_ = _tmp20_; + _tmp15_ = _tmp14_; #line 873 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - saved_search_table_add_to_map (_tmp21_, self); + saved_search_table_add_to_map (_tmp15_, self); #line 873 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _saved_search_table_unref0 (_tmp21_); + _saved_search_table_unref0 (_tmp15_); #line 875 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp22_ = library_window_get_app (); + _tmp16_ = library_window_get_app (); #line 875 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp23_ = _tmp22_; + _tmp17_ = _tmp16_; #line 875 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - library_window_switch_to_saved_search (_tmp23_, self); + library_window_switch_to_saved_search (_tmp17_, self); #line 875 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp17_); #line 876 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = TRUE; #line 876 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5888 "SearchBoolean.c" +#line 5826 "SearchBoolean.c" } -GeeList* saved_search_get_conditions (SavedSearch* self) { +GeeList* +saved_search_get_conditions (SavedSearch* self) +{ GeeList* result = NULL; SavedSearchRow* _tmp0_; GeeList* _tmp1_; @@ -5918,11 +5858,13 @@ GeeList* saved_search_get_conditions (SavedSearch* self) { result = _tmp3_; #line 880 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5912 "SearchBoolean.c" +#line 5852 "SearchBoolean.c" } -SearchOperator saved_search_get_operator (SavedSearch* self) { +SearchOperator +saved_search_get_operator (SavedSearch* self) +{ SearchOperator result = 0; SavedSearchRow* _tmp0_; SearchOperator _tmp1_; @@ -5936,11 +5878,13 @@ SearchOperator saved_search_get_operator (SavedSearch* self) { result = _tmp1_; #line 884 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5930 "SearchBoolean.c" +#line 5872 "SearchBoolean.c" } -static void saved_search_class_init (SavedSearchClass * klass) { +static void +saved_search_class_init (SavedSearchClass * klass) +{ #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" saved_search_parent_class = g_type_class_peek_parent (klass); #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5955,18 +5899,22 @@ static void saved_search_class_init (SavedSearchClass * klass) { ((DataSourceClass *) klass)->get_instance_id = (gint64 (*) (DataSource *)) saved_search_real_get_instance_id; #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" G_OBJECT_CLASS (klass)->finalize = saved_search_finalize; -#line 5949 "SearchBoolean.c" +#line 5893 "SearchBoolean.c" } -static void saved_search_instance_init (SavedSearch * self) { +static void +saved_search_instance_init (SavedSearch * self) +{ #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SAVED_SEARCH_GET_PRIVATE (self); -#line 5956 "SearchBoolean.c" +#line 5902 "SearchBoolean.c" } -static void saved_search_finalize (GObject * obj) { +static void +saved_search_finalize (GObject * obj) +{ SavedSearch * self; #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH, SavedSearch); @@ -5974,11 +5922,13 @@ static void saved_search_finalize (GObject * obj) { _saved_search_row_unref0 (self->priv->row); #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" G_OBJECT_CLASS (saved_search_parent_class)->finalize (obj); -#line 5968 "SearchBoolean.c" +#line 5916 "SearchBoolean.c" } -GType saved_search_get_type (void) { +GType +saved_search_get_type (void) +{ static volatile gsize saved_search_type_id__volatile = 0; if (g_once_init_enter (&saved_search_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SavedSearchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearch), 0, (GInstanceInitFunc) saved_search_instance_init, NULL }; @@ -5990,12 +5940,14 @@ GType saved_search_get_type (void) { } -static SavedSearchTable* saved_search_table_construct (GType object_type) { +static SavedSearchTable* +saved_search_table_construct (GType object_type) +{ SavedSearchTable* self = NULL; GError * _inner_error_ = NULL; #line 897 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = (SavedSearchTable*) g_type_create_instance (object_type); -#line 5989 "SearchBoolean.c" +#line 5941 "SearchBoolean.c" { GeeList* _tmp0_ = NULL; SavedSearchDBTable* _tmp1_; @@ -6018,7 +5970,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6012 "SearchBoolean.c" +#line 5964 "SearchBoolean.c" goto __catch88_database_error; } #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6027,7 +5979,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { g_clear_error (&_inner_error_); #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 6021 "SearchBoolean.c" +#line 5973 "SearchBoolean.c" } { GeeList* _row_list = NULL; @@ -6053,7 +6005,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { _row_index = -1; #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" while (TRUE) { -#line 6047 "SearchBoolean.c" +#line 5999 "SearchBoolean.c" gint _tmp9_; gint _tmp10_; gint _tmp11_; @@ -6076,7 +6028,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { if (!(_tmp10_ < _tmp11_)) { #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" break; -#line 6070 "SearchBoolean.c" +#line 6022 "SearchBoolean.c" } #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp12_ = _row_list; @@ -6098,15 +6050,15 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { _g_object_unref0 (_tmp17_); #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _saved_search_row_unref0 (row); -#line 6092 "SearchBoolean.c" +#line 6044 "SearchBoolean.c" } #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (_row_list); -#line 6096 "SearchBoolean.c" +#line 6048 "SearchBoolean.c" } #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (_tmp0_); -#line 6100 "SearchBoolean.c" +#line 6052 "SearchBoolean.c" } goto __finally88; __catch88_database_error: @@ -6123,7 +6075,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { app_window_database_error (_tmp18_); #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_error_free0 (err); -#line 6117 "SearchBoolean.c" +#line 6069 "SearchBoolean.c" } __finally88: #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6134,29 +6086,35 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { g_clear_error (&_inner_error_); #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 6128 "SearchBoolean.c" +#line 6080 "SearchBoolean.c" } #line 897 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 6132 "SearchBoolean.c" +#line 6084 "SearchBoolean.c" } -static SavedSearchTable* saved_search_table_new (void) { +static SavedSearchTable* +saved_search_table_new (void) +{ #line 897 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return saved_search_table_construct (TYPE_SAVED_SEARCH_TABLE); -#line 6139 "SearchBoolean.c" +#line 6093 "SearchBoolean.c" } -static gpointer _saved_search_table_ref0 (gpointer self) { +static gpointer +_saved_search_table_ref0 (gpointer self) +{ #line 912 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self ? saved_search_table_ref (self) : NULL; -#line 6146 "SearchBoolean.c" +#line 6102 "SearchBoolean.c" } -SavedSearchTable* saved_search_table_get_instance (void) { +SavedSearchTable* +saved_search_table_get_instance (void) +{ SavedSearchTable* result = NULL; SavedSearchTable* _tmp0_; SavedSearchTable* _tmp2_; @@ -6165,7 +6123,7 @@ SavedSearchTable* saved_search_table_get_instance (void) { _tmp0_ = saved_search_table_instance; #line 909 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp0_ == NULL) { -#line 6159 "SearchBoolean.c" +#line 6117 "SearchBoolean.c" SavedSearchTable* _tmp1_; #line 910 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = saved_search_table_new (); @@ -6173,7 +6131,7 @@ SavedSearchTable* saved_search_table_get_instance (void) { _saved_search_table_unref0 (saved_search_table_instance); #line 910 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" saved_search_table_instance = _tmp1_; -#line 6167 "SearchBoolean.c" +#line 6125 "SearchBoolean.c" } #line 912 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = saved_search_table_instance; @@ -6183,11 +6141,13 @@ SavedSearchTable* saved_search_table_get_instance (void) { result = _tmp3_; #line 912 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6177 "SearchBoolean.c" +#line 6135 "SearchBoolean.c" } -GeeCollection* saved_search_table_get_all (SavedSearchTable* self) { +GeeCollection* +saved_search_table_get_all (SavedSearchTable* self) +{ GeeCollection* result = NULL; GeeHashMap* _tmp0_; GeeCollection* _tmp1_; @@ -6204,17 +6164,22 @@ GeeCollection* saved_search_table_get_all (SavedSearchTable* self) { result = _tmp2_; #line 916 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6198 "SearchBoolean.c" +#line 6158 "SearchBoolean.c" } -SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* name, SearchOperator operator, GeeArrayList* conditions) { +SavedSearch* +saved_search_table_create (SavedSearchTable* self, + const gchar* name, + SearchOperator operator, + GeeArrayList* conditions) +{ SavedSearch* result = NULL; SavedSearch* search = NULL; + SavedSearch* _tmp7_; + LibraryWindow* _tmp8_; + LibraryWindow* _tmp9_; SavedSearch* _tmp10_; - LibraryWindow* _tmp11_; - LibraryWindow* _tmp12_; - SavedSearch* _tmp13_; GError * _inner_error_ = NULL; #line 921 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SAVED_SEARCH_TABLE (self), NULL); @@ -6224,40 +6189,31 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam g_return_val_if_fail (GEE_IS_ARRAY_LIST (conditions), NULL); #line 923 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search = NULL; -#line 6218 "SearchBoolean.c" +#line 6183 "SearchBoolean.c" { SavedSearchRow* _tmp0_ = NULL; SavedSearchDBTable* _tmp1_; SavedSearchDBTable* _tmp2_; - const gchar* _tmp3_; - SearchOperator _tmp4_; - GeeArrayList* _tmp5_; - SavedSearchRow* _tmp6_; - SavedSearchRow* _tmp7_; - SavedSearch* _tmp8_; + SavedSearchRow* _tmp3_; + SavedSearchRow* _tmp4_; + SavedSearch* _tmp5_; #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = saved_search_db_table_get_instance (); #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = _tmp1_; #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = name; + _tmp3_ = saved_search_db_table_add (_tmp2_, name, operator, conditions, &_inner_error_); #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = operator; -#line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp5_ = conditions; -#line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp6_ = saved_search_db_table_add (_tmp2_, _tmp3_, _tmp4_, _tmp5_, &_inner_error_); -#line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _database_table_unref0 (_tmp2_); #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = _tmp7_; + _tmp0_ = _tmp4_; #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6251 "SearchBoolean.c" +#line 6207 "SearchBoolean.c" goto __catch89_database_error; } #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6268,34 +6224,34 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam g_clear_error (&_inner_error_); #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 6262 "SearchBoolean.c" +#line 6218 "SearchBoolean.c" } #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp8_ = saved_search_new (_tmp0_, DATA_OBJECT_INVALID_OBJECT_ID); + _tmp5_ = saved_search_new (_tmp0_, DATA_OBJECT_INVALID_OBJECT_ID); #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (search); #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - search = _tmp8_; + search = _tmp5_; #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _saved_search_row_unref0 (_tmp0_); -#line 6272 "SearchBoolean.c" +#line 6228 "SearchBoolean.c" } goto __finally89; __catch89_database_error: { GError* err = NULL; - GError* _tmp9_; + GError* _tmp6_; #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" err = _inner_error_; #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _inner_error_ = NULL; #line 928 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp9_ = err; + _tmp6_ = err; #line 928 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - app_window_database_error (_tmp9_); + app_window_database_error (_tmp6_); #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_error_free0 (err); -#line 6289 "SearchBoolean.c" +#line 6245 "SearchBoolean.c" } __finally89: #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6308,60 +6264,59 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam g_clear_error (&_inner_error_); #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 6302 "SearchBoolean.c" +#line 6258 "SearchBoolean.c" } #line 932 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp10_ = search; + _tmp7_ = search; #line 932 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - saved_search_table_add_to_map (self, _tmp10_); + saved_search_table_add_to_map (self, _tmp7_); #line 933 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp11_ = library_window_get_app (); + _tmp8_ = library_window_get_app (); #line 933 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp12_ = _tmp11_; + _tmp9_ = _tmp8_; #line 933 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp13_ = search; + _tmp10_ = search; #line 933 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - library_window_switch_to_saved_search (_tmp12_, _tmp13_); + library_window_switch_to_saved_search (_tmp9_, _tmp10_); #line 933 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp9_); #line 934 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = search; #line 934 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6322 "SearchBoolean.c" +#line 6278 "SearchBoolean.c" } -void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) { - SavedSearch* _tmp5_; +void +saved_search_table_remove (SavedSearchTable* self, + SavedSearch* search) +{ GError * _inner_error_ = NULL; #line 938 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SAVED_SEARCH_TABLE (self)); #line 938 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SAVED_SEARCH (search)); -#line 6333 "SearchBoolean.c" +#line 6291 "SearchBoolean.c" { SavedSearchDBTable* _tmp0_; SavedSearchDBTable* _tmp1_; - SavedSearch* _tmp2_; - SavedSearchID _tmp3_ = {0}; + SavedSearchID _tmp2_ = {0}; #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = saved_search_db_table_get_instance (); #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = _tmp0_; #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = search; -#line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - saved_search_get_saved_search_id (_tmp2_, &_tmp3_); + saved_search_get_saved_search_id (search, &_tmp2_); #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - saved_search_db_table_remove (_tmp1_, &_tmp3_, &_inner_error_); + saved_search_db_table_remove (_tmp1_, &_tmp2_, &_inner_error_); #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _database_table_unref0 (_tmp1_); #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6355 "SearchBoolean.c" +#line 6310 "SearchBoolean.c" goto __catch90_database_error; } #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6370,25 +6325,25 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) { g_clear_error (&_inner_error_); #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return; -#line 6364 "SearchBoolean.c" +#line 6319 "SearchBoolean.c" } } goto __finally90; __catch90_database_error: { GError* err = NULL; - GError* _tmp4_; + GError* _tmp3_; #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" err = _inner_error_; #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _inner_error_ = NULL; #line 942 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = err; + _tmp3_ = err; #line 942 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - app_window_database_error (_tmp4_); + app_window_database_error (_tmp3_); #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_error_free0 (err); -#line 6382 "SearchBoolean.c" +#line 6337 "SearchBoolean.c" } __finally90: #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6399,23 +6354,21 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) { g_clear_error (&_inner_error_); #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return; -#line 6393 "SearchBoolean.c" +#line 6348 "SearchBoolean.c" } #line 945 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp5_ = search; -#line 945 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - saved_search_table_remove_from_map (self, _tmp5_); -#line 6399 "SearchBoolean.c" + saved_search_table_remove_from_map (self, search); +#line 6352 "SearchBoolean.c" } -void saved_search_table_add_to_map (SavedSearchTable* self, SavedSearch* search) { +void +saved_search_table_add_to_map (SavedSearchTable* self, + SavedSearch* search) +{ GeeHashMap* _tmp0_; - SavedSearch* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; - SavedSearch* _tmp4_; - SavedSearch* _tmp5_; #line 948 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SAVED_SEARCH_TABLE (self)); #line 948 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6423,31 +6376,26 @@ void saved_search_table_add_to_map (SavedSearchTable* self, SavedSearch* search) #line 949 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = self->priv->search_map; #line 949 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = search; + _tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (search, TYPE_DATA_OBJECT, DataObject)); #line 949 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); -#line 949 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = _tmp2_; -#line 949 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = search; + _tmp2_ = _tmp1_; #line 949 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, _tmp4_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, search); #line 949 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 950 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp5_ = search; -#line 950 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - g_signal_emit (self, saved_search_table_signals[SAVED_SEARCH_TABLE_SEARCH_ADDED_SIGNAL], 0, _tmp5_); -#line 6432 "SearchBoolean.c" + g_signal_emit (self, saved_search_table_signals[SAVED_SEARCH_TABLE_SEARCH_ADDED_SIGNAL], 0, search); +#line 6379 "SearchBoolean.c" } -void saved_search_table_remove_from_map (SavedSearchTable* self, SavedSearch* search) { +void +saved_search_table_remove_from_map (SavedSearchTable* self, + SavedSearch* search) +{ GeeHashMap* _tmp0_; - SavedSearch* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; - SavedSearch* _tmp4_; #line 953 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SAVED_SEARCH_TABLE (self)); #line 953 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6455,24 +6403,22 @@ void saved_search_table_remove_from_map (SavedSearchTable* self, SavedSearch* se #line 954 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = self->priv->search_map; #line 954 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = search; -#line 954 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); + _tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (search, TYPE_DATA_OBJECT, DataObject)); #line 954 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 954 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, NULL); #line 954 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 955 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = search; -#line 955 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - g_signal_emit (self, saved_search_table_signals[SAVED_SEARCH_TABLE_SEARCH_REMOVED_SIGNAL], 0, _tmp4_); -#line 6462 "SearchBoolean.c" + g_signal_emit (self, saved_search_table_signals[SAVED_SEARCH_TABLE_SEARCH_REMOVED_SIGNAL], 0, search); +#line 6406 "SearchBoolean.c" } -GeeIterable* saved_search_table_get_saved_searches (SavedSearchTable* self) { +GeeIterable* +saved_search_table_get_saved_searches (SavedSearchTable* self) +{ GeeIterable* result = NULL; GeeHashMap* _tmp0_; GeeCollection* _tmp1_; @@ -6489,11 +6435,13 @@ GeeIterable* saved_search_table_get_saved_searches (SavedSearchTable* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable); #line 959 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6483 "SearchBoolean.c" +#line 6429 "SearchBoolean.c" } -gint saved_search_table_get_count (SavedSearchTable* self) { +gint +saved_search_table_get_count (SavedSearchTable* self) +{ gint result = 0; GeeHashMap* _tmp0_; gint _tmp1_; @@ -6510,15 +6458,16 @@ gint saved_search_table_get_count (SavedSearchTable* self) { result = _tmp2_; #line 963 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6504 "SearchBoolean.c" +#line 6452 "SearchBoolean.c" } -gboolean saved_search_table_exists (SavedSearchTable* self, const gchar* search_name) { +gboolean +saved_search_table_exists (SavedSearchTable* self, + const gchar* search_name) +{ gboolean result = FALSE; GeeHashMap* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; #line 966 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SAVED_SEARCH_TABLE (self), FALSE); #line 966 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6526,50 +6475,47 @@ gboolean saved_search_table_exists (SavedSearchTable* self, const gchar* search_ #line 967 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = self->priv->search_map; #line 967 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = search_name; -#line 967 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 967 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp2_; + result = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), search_name); #line 967 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6527 "SearchBoolean.c" +#line 6472 "SearchBoolean.c" } -gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) { +gchar* +saved_search_table_generate_unique_name (SavedSearchTable* self) +{ gchar* result = NULL; - gchar* _tmp7_; + gchar* _tmp6_; #line 971 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SAVED_SEARCH_TABLE (self), NULL); -#line 6536 "SearchBoolean.c" +#line 6483 "SearchBoolean.c" { gint ctr = 0; #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ctr = 1; -#line 6541 "SearchBoolean.c" +#line 6488 "SearchBoolean.c" { gboolean _tmp0_ = FALSE; #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = TRUE; #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" while (TRUE) { -#line 6548 "SearchBoolean.c" +#line 6495 "SearchBoolean.c" gint _tmp2_; gchar* name = NULL; gint _tmp3_; gchar* _tmp4_; const gchar* _tmp5_; - gboolean _tmp6_; #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!_tmp0_) { -#line 6557 "SearchBoolean.c" +#line 6503 "SearchBoolean.c" gint _tmp1_; #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = ctr; #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ctr = _tmp1_ + 1; -#line 6563 "SearchBoolean.c" +#line 6509 "SearchBoolean.c" } #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = FALSE; @@ -6579,7 +6525,7 @@ gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) { if (!(_tmp2_ < G_MAXINT)) { #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" break; -#line 6573 "SearchBoolean.c" +#line 6519 "SearchBoolean.c" } #line 973 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = ctr; @@ -6590,129 +6536,152 @@ gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) { #line 975 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp5_ = name; #line 975 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp6_ = saved_search_table_exists (self, _tmp5_); -#line 975 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - if (!_tmp6_) { + if (!saved_search_table_exists (self, _tmp5_)) { #line 976 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = name; #line 976 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6591 "SearchBoolean.c" +#line 6535 "SearchBoolean.c" } #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (name); -#line 6595 "SearchBoolean.c" +#line 6539 "SearchBoolean.c" } } } #line 978 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp7_ = g_strdup (""); + _tmp6_ = g_strdup (""); #line 978 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp7_; + result = _tmp6_; #line 978 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6605 "SearchBoolean.c" +#line 6549 "SearchBoolean.c" } -static void value_saved_search_table_init (GValue* value) { +static void +value_saved_search_table_init (GValue* value) +{ #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 6612 "SearchBoolean.c" +#line 6558 "SearchBoolean.c" } -static void value_saved_search_table_free_value (GValue* value) { +static void +value_saved_search_table_free_value (GValue* value) +{ #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (value->data[0].v_pointer) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" saved_search_table_unref (value->data[0].v_pointer); -#line 6621 "SearchBoolean.c" +#line 6569 "SearchBoolean.c" } } -static void value_saved_search_table_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_saved_search_table_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (src_value->data[0].v_pointer) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" dest_value->data[0].v_pointer = saved_search_table_ref (src_value->data[0].v_pointer); -#line 6631 "SearchBoolean.c" +#line 6582 "SearchBoolean.c" } else { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" dest_value->data[0].v_pointer = NULL; -#line 6635 "SearchBoolean.c" +#line 6586 "SearchBoolean.c" } } -static gpointer value_saved_search_table_peek_pointer (const GValue* value) { +static gpointer +value_saved_search_table_peek_pointer (const GValue* value) +{ #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return value->data[0].v_pointer; -#line 6643 "SearchBoolean.c" +#line 6596 "SearchBoolean.c" } -static gchar* value_saved_search_table_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_saved_search_table_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (collect_values[0].v_pointer) { -#line 6650 "SearchBoolean.c" +#line 6608 "SearchBoolean.c" SavedSearchTable * object; object = collect_values[0].v_pointer; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (object->parent_instance.g_class == NULL) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6657 "SearchBoolean.c" +#line 6615 "SearchBoolean.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.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 6661 "SearchBoolean.c" +#line 6619 "SearchBoolean.c" } #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = saved_search_table_ref (object); -#line 6665 "SearchBoolean.c" +#line 6623 "SearchBoolean.c" } else { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 6669 "SearchBoolean.c" +#line 6627 "SearchBoolean.c" } #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 6673 "SearchBoolean.c" +#line 6631 "SearchBoolean.c" } -static gchar* value_saved_search_table_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_saved_search_table_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ SavedSearchTable ** object_p; object_p = collect_values[0].v_pointer; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!object_p) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 6684 "SearchBoolean.c" +#line 6647 "SearchBoolean.c" } #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!value->data[0].v_pointer) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" *object_p = NULL; -#line 6690 "SearchBoolean.c" +#line 6653 "SearchBoolean.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" *object_p = value->data[0].v_pointer; -#line 6694 "SearchBoolean.c" +#line 6657 "SearchBoolean.c" } else { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" *object_p = saved_search_table_ref (value->data[0].v_pointer); -#line 6698 "SearchBoolean.c" +#line 6661 "SearchBoolean.c" } #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 6702 "SearchBoolean.c" +#line 6665 "SearchBoolean.c" } -GParamSpec* param_spec_saved_search_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_saved_search_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecSavedSearchTable* spec; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_SAVED_SEARCH_TABLE), NULL); @@ -6722,20 +6691,25 @@ GParamSpec* param_spec_saved_search_table (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return G_PARAM_SPEC (spec); -#line 6716 "SearchBoolean.c" +#line 6685 "SearchBoolean.c" } -gpointer value_get_saved_search_table (const GValue* value) { +gpointer +value_get_saved_search_table (const GValue* value) +{ #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_TABLE), NULL); #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return value->data[0].v_pointer; -#line 6725 "SearchBoolean.c" +#line 6696 "SearchBoolean.c" } -void value_set_saved_search_table (GValue* value, gpointer v_object) { +void +value_set_saved_search_table (GValue* value, + gpointer v_object) +{ SavedSearchTable * old; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_TABLE)); @@ -6751,22 +6725,25 @@ void value_set_saved_search_table (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" saved_search_table_ref (value->data[0].v_pointer); -#line 6745 "SearchBoolean.c" +#line 6719 "SearchBoolean.c" } else { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 6749 "SearchBoolean.c" +#line 6723 "SearchBoolean.c" } #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (old) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" saved_search_table_unref (old); -#line 6755 "SearchBoolean.c" +#line 6729 "SearchBoolean.c" } } -void value_take_saved_search_table (GValue* value, gpointer v_object) { +void +value_take_saved_search_table (GValue* value, + gpointer v_object) +{ SavedSearchTable * old; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_TABLE)); @@ -6780,22 +6757,24 @@ void value_take_saved_search_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 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = v_object; -#line 6774 "SearchBoolean.c" +#line 6751 "SearchBoolean.c" } else { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 6778 "SearchBoolean.c" +#line 6755 "SearchBoolean.c" } #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (old) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" saved_search_table_unref (old); -#line 6784 "SearchBoolean.c" +#line 6761 "SearchBoolean.c" } } -static void saved_search_table_class_init (SavedSearchTableClass * klass) { +static void +saved_search_table_class_init (SavedSearchTableClass * klass) +{ #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" saved_search_table_parent_class = g_type_class_peek_parent (klass); #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6806,11 +6785,13 @@ static void saved_search_table_class_init (SavedSearchTableClass * klass) { saved_search_table_signals[SAVED_SEARCH_TABLE_SEARCH_ADDED_SIGNAL] = g_signal_new ("search-added", TYPE_SAVED_SEARCH_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH); #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" saved_search_table_signals[SAVED_SEARCH_TABLE_SEARCH_REMOVED_SIGNAL] = g_signal_new ("search-removed", TYPE_SAVED_SEARCH_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH); -#line 6800 "SearchBoolean.c" +#line 6779 "SearchBoolean.c" } -static void saved_search_table_instance_init (SavedSearchTable * self) { +static void +saved_search_table_instance_init (SavedSearchTable * self) +{ GeeHashMap* _tmp0_; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SAVED_SEARCH_TABLE_GET_PRIVATE (self); @@ -6820,11 +6801,13 @@ static void saved_search_table_instance_init (SavedSearchTable * self) { self->priv->search_map = _tmp0_; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->ref_count = 1; -#line 6814 "SearchBoolean.c" +#line 6795 "SearchBoolean.c" } -static void saved_search_table_finalize (SavedSearchTable * obj) { +static void +saved_search_table_finalize (SavedSearchTable * obj) +{ SavedSearchTable * self; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_TABLE, SavedSearchTable); @@ -6832,11 +6815,13 @@ static void saved_search_table_finalize (SavedSearchTable * obj) { g_signal_handlers_destroy (self); #line 892 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (self->priv->search_map); -#line 6826 "SearchBoolean.c" +#line 6809 "SearchBoolean.c" } -GType saved_search_table_get_type (void) { +GType +saved_search_table_get_type (void) +{ static volatile gsize saved_search_table_type_id__volatile = 0; if (g_once_init_enter (&saved_search_table_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_saved_search_table_init, value_saved_search_table_free_value, value_saved_search_table_copy_value, value_saved_search_table_peek_pointer, "p", value_saved_search_table_collect_value, "p", value_saved_search_table_lcopy_value }; @@ -6850,18 +6835,22 @@ GType saved_search_table_get_type (void) { } -gpointer saved_search_table_ref (gpointer instance) { +gpointer +saved_search_table_ref (gpointer instance) +{ SavedSearchTable * self; self = instance; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_atomic_int_inc (&self->ref_count); #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return instance; -#line 6851 "SearchBoolean.c" +#line 6838 "SearchBoolean.c" } -void saved_search_table_unref (gpointer instance) { +void +saved_search_table_unref (gpointer instance) +{ SavedSearchTable * self; self = instance; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6870,7 +6859,7 @@ void saved_search_table_unref (gpointer instance) { SAVED_SEARCH_TABLE_GET_CLASS (self)->finalize (self); #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_free_instance ((GTypeInstance *) self); -#line 6864 "SearchBoolean.c" +#line 6853 "SearchBoolean.c" } } diff --git a/src/searches/Searches.c b/src/searches/Searches.c index 70622ce..f13dde0 100644 --- a/src/searches/Searches.c +++ b/src/searches/Searches.c @@ -1,4 +1,4 @@ -/* Searches.c generated by valac 0.36.6, the Vala compiler +/* Searches.c generated by valac 0.40.4, the Vala compiler * generated from Searches.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -15,6 +15,7 @@ * the preconfigure() method, implement it, and ensure in init() that it's been called. */ + #include #include @@ -28,21 +29,27 @@ void searches_terminate (void); void searches_sidebar_entry_terminate (void); -void searches_preconfigure (void) { +void +searches_preconfigure (void) +{ } -void searches_init (GError** error) { +void +searches_init (GError** error) +{ #line 23 "/home/jens/Source/shotwell/src/searches/Searches.vala" searches_sidebar_entry_init (); -#line 39 "Searches.c" +#line 44 "Searches.c" } -void searches_terminate (void) { +void +searches_terminate (void) +{ #line 27 "/home/jens/Source/shotwell/src/searches/Searches.vala" searches_sidebar_entry_terminate (); -#line 46 "Searches.c" +#line 53 "Searches.c" } diff --git a/src/searches/SearchesBranch.c b/src/searches/SearchesBranch.c index dfa635b..ce75f2a 100644 --- a/src/searches/SearchesBranch.c +++ b/src/searches/SearchesBranch.c @@ -1,4 +1,4 @@ -/* SearchesBranch.c generated by valac 0.36.6, the Vala compiler +/* SearchesBranch.c generated by valac 0.40.4, the Vala compiler * generated from SearchesBranch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -89,6 +90,11 @@ typedef struct _SidebarSimplePageEntryClass SidebarSimplePageEntryClass; typedef struct _SearchesSidebarEntry SearchesSidebarEntry; typedef struct _SearchesSidebarEntryClass SearchesSidebarEntryClass; +enum { + SEARCHES_BRANCH_0_PROPERTY, + SEARCHES_BRANCH_NUM_PROPERTIES +}; +static GParamSpec* searches_branch_properties[SEARCHES_BRANCH_NUM_PROPERTIES]; #define TYPE_SAVED_SEARCH_TABLE (saved_search_table_get_type ()) #define SAVED_SEARCH_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SAVED_SEARCH_TABLE, SavedSearchTable)) @@ -186,6 +192,11 @@ typedef struct _SidebarHeaderPrivate SidebarHeaderPrivate; typedef struct _SidebarContextable SidebarContextable; typedef struct _SidebarContextableIface SidebarContextableIface; typedef struct _SearchesHeaderPrivate SearchesHeaderPrivate; +enum { + SEARCHES_HEADER_0_PROPERTY, + SEARCHES_HEADER_NUM_PROPERTIES +}; +static GParamSpec* searches_header_properties[SEARCHES_HEADER_NUM_PROPERTIES]; #define _g_free0(var) (var = (g_free (var), NULL)) #define TYPE_APPLICATION (application_get_type ()) @@ -235,6 +246,11 @@ typedef struct _SidebarSimplePageEntryPrivate SidebarSimplePageEntryPrivate; typedef struct _SidebarDestroyableEntry SidebarDestroyableEntry; typedef struct _SidebarDestroyableEntryIface SidebarDestroyableEntryIface; typedef struct _SearchesSidebarEntryPrivate SearchesSidebarEntryPrivate; +enum { + SEARCHES_SIDEBAR_ENTRY_0_PROPERTY, + SEARCHES_SIDEBAR_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* searches_sidebar_entry_properties[SEARCHES_SIDEBAR_ENTRY_NUM_PROPERTIES]; #define TYPE_CHECKERBOARD_PAGE (checkerboard_page_get_type ()) #define CHECKERBOARD_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHECKERBOARD_PAGE, CheckerboardPage)) @@ -494,21 +510,30 @@ GType saved_search_get_type (void) G_GNUC_CONST; GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST; GType searches_sidebar_entry_get_type (void) G_GNUC_CONST; #define SEARCHES_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCHES_TYPE_BRANCH, SearchesBranchPrivate)) -enum { - SEARCHES_BRANCH_DUMMY_PROPERTY -}; gpointer saved_search_table_ref (gpointer instance); void saved_search_table_unref (gpointer instance); -GParamSpec* param_spec_saved_search_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_saved_search_table (GValue* value, gpointer v_object); -void value_take_saved_search_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_saved_search_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_saved_search_table (GValue* value, + gpointer v_object); +void value_take_saved_search_table (GValue* value, + gpointer v_object); gpointer value_get_saved_search_table (const GValue* value); GType saved_search_table_get_type (void) G_GNUC_CONST; SavedSearchTable* saved_search_table_get_instance (void); -static void searches_branch_on_saved_search_added (SearchesBranch* self, SavedSearch* search); -static void _searches_branch_on_saved_search_added_saved_search_table_search_added (SavedSearchTable* _sender, SavedSearch* search, gpointer self); -static void searches_branch_on_saved_search_removed (SearchesBranch* self, SavedSearch* search); -static void _searches_branch_on_saved_search_removed_saved_search_table_search_removed (SavedSearchTable* _sender, SavedSearch* search, gpointer self); +static void searches_branch_on_saved_search_added (SearchesBranch* self, + SavedSearch* search); +static void _searches_branch_on_saved_search_added_saved_search_table_search_added (SavedSearchTable* _sender, + SavedSearch* search, + gpointer self); +static void searches_branch_on_saved_search_removed (SearchesBranch* self, + SavedSearch* search); +static void _searches_branch_on_saved_search_removed_saved_search_table_search_removed (SavedSearchTable* _sender, + SavedSearch* search, + gpointer self); SearchesBranch* searches_branch_new (void); SearchesBranch* searches_branch_construct (GType object_type); SearchesHeader* searches_header_new (void); @@ -519,52 +544,75 @@ GType searches_header_get_type (void) G_GNUC_CONST; GType sidebar_tree_get_type (void) G_GNUC_CONST; GType sidebar_entry_get_type (void) G_GNUC_CONST; GType sidebar_branch_options_get_type (void) G_GNUC_CONST; -static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b); -static gint _searches_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b); -SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator); -SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator); +static gint searches_branch_comparator (SidebarEntry* a, + SidebarEntry* b); +static gint _searches_branch_comparator_gcompare_func (gconstpointer a, + gconstpointer b); +SidebarBranch* sidebar_branch_new (SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator); +SidebarBranch* sidebar_branch_construct (GType object_type, + SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator); GeeCollection* saved_search_table_get_all (SavedSearchTable* self); -SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self, SavedSearch* search); -gint saved_search_compare_names (void* a, void* b); +SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self, + SavedSearch* search); +gint saved_search_compare_names (void* a, + void* b); SavedSearch* searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self); SearchesSidebarEntry* searches_sidebar_entry_new (SavedSearch* search); -SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, SavedSearch* search); -void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator); +SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, + SavedSearch* search); +void sidebar_branch_graft (SidebarBranch* self, + SidebarEntry* parent, + SidebarEntry* entry, + GCompareFunc comparator); SidebarEntry* sidebar_branch_get_root (SidebarBranch* self); -void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry); +void sidebar_branch_prune (SidebarBranch* self, + SidebarEntry* entry); static void searches_branch_finalize (GObject * obj); GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST; GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST; GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST; GType sidebar_contextable_get_type (void) G_GNUC_CONST; #define SEARCHES_HEADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCHES_TYPE_HEADER, SearchesHeaderPrivate)) -enum { - SEARCHES_HEADER_DUMMY_PROPERTY -}; -SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized); -SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized); +SidebarHeader* sidebar_header_new (const gchar* name, + const gchar* tooltip, + gboolean emphasized); +SidebarHeader* sidebar_header_construct (GType object_type, + const gchar* name, + const gchar* tooltip, + gboolean emphasized); static void searches_header_setup_context_menu (SearchesHeader* self); gchar* resources_get_ui (const gchar* filename); -void app_window_error_message (const gchar* message, GtkWindow* parent); +void app_window_error_message (const gchar* message, + GtkWindow* parent); gpointer application_ref (gpointer instance); void application_unref (gpointer instance); -GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_application (GValue* value, gpointer v_object); -void value_take_application (GValue* value, gpointer v_object); +GParamSpec* param_spec_application (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_application (GValue* value, + gpointer v_object); +void value_take_application (GValue* value, + gpointer v_object); gpointer value_get_application (const GValue* value); GType application_get_type (void) G_GNUC_CONST; Application* application_get_instance (void); void application_panic (Application* self); -static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event); +static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextable* base, + GdkEventButton* event); static void searches_header_finalize (GObject * obj); GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST; GType page_get_type (void) G_GNUC_CONST; GType sidebar_page_representative_get_type (void) G_GNUC_CONST; GType sidebar_destroyable_entry_get_type (void) G_GNUC_CONST; #define SEARCHES_SIDEBAR_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntryPrivate)) -enum { - SEARCHES_SIDEBAR_ENTRY_DUMMY_PROPERTY -}; SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type); void searches_sidebar_entry_init (void); void searches_sidebar_entry_terminate (void); @@ -573,26 +621,39 @@ gchar* data_object_get_name (DataObject* self); static gchar* searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base); static Page* searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* base); SavedSearchPage* saved_search_page_new (SavedSearch* search); -SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* search); +SavedSearchPage* saved_search_page_construct (GType object_type, + SavedSearch* search); GType checkerboard_page_get_type (void) G_GNUC_CONST; GType media_page_get_type (void) G_GNUC_CONST; GType collection_page_get_type (void) G_GNUC_CONST; GType saved_search_page_get_type (void) G_GNUC_CONST; static gboolean searches_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base); -static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name); -gboolean saved_search_table_exists (SavedSearchTable* self, const gchar* search_name); +static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, + const gchar* new_name); +gboolean saved_search_table_exists (SavedSearchTable* self, + const gchar* search_name); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* app_window_get_command_manager (void); GType command_get_type (void) G_GNUC_CONST; -void command_manager_execute (CommandManager* self, Command* command); -RenameSavedSearchCommand* rename_saved_search_command_new (SavedSearch* search, const gchar* new_name); -RenameSavedSearchCommand* rename_saved_search_command_construct (GType object_type, SavedSearch* search, const gchar* new_name); +void command_manager_execute (CommandManager* self, + Command* command); +RenameSavedSearchCommand* rename_saved_search_command_new (SavedSearch* search, + const gchar* new_name); +RenameSavedSearchCommand* rename_saved_search_command_construct (GType object_type, + SavedSearch* search, + const gchar* new_name); GType page_command_get_type (void) G_GNUC_CONST; GType single_data_source_command_get_type (void) G_GNUC_CONST; GType rename_saved_search_command_get_type (void) G_GNUC_CONST; @@ -600,42 +661,56 @@ gchar* resources_rename_search_exists_message (const gchar* name); static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base); gboolean dialogs_confirm_delete_saved_search (SavedSearch* search); DeleteSavedSearchCommand* delete_saved_search_command_new (SavedSearch* search); -DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_type, SavedSearch* search); +DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_type, + SavedSearch* search); GType delete_saved_search_command_get_type (void) G_GNUC_CONST; static void searches_sidebar_entry_finalize (GObject * obj); -static void _searches_branch_on_saved_search_added_saved_search_table_search_added (SavedSearchTable* _sender, SavedSearch* search, gpointer self) { +static void +_searches_branch_on_saved_search_added_saved_search_table_search_added (SavedSearchTable* _sender, + SavedSearch* search, + gpointer self) +{ #line 28 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" searches_branch_on_saved_search_added ((SearchesBranch*) self, search); -#line 612 "SearchesBranch.c" +#line 678 "SearchesBranch.c" } -static void _searches_branch_on_saved_search_removed_saved_search_table_search_removed (SavedSearchTable* _sender, SavedSearch* search, gpointer self) { +static void +_searches_branch_on_saved_search_removed_saved_search_table_search_removed (SavedSearchTable* _sender, + SavedSearch* search, + gpointer self) +{ #line 29 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" searches_branch_on_saved_search_removed ((SearchesBranch*) self, search); -#line 619 "SearchesBranch.c" +#line 689 "SearchesBranch.c" } -static gint _searches_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b) { +static gint +_searches_branch_comparator_gcompare_func (gconstpointer a, + gconstpointer b) +{ gint result; result = searches_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b); #line 12 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" return result; -#line 628 "SearchesBranch.c" +#line 701 "SearchesBranch.c" } -SearchesBranch* searches_branch_construct (GType object_type) { +SearchesBranch* +searches_branch_construct (GType object_type) +{ SearchesBranch * self = NULL; SearchesHeader* _tmp0_; SearchesHeader* _tmp1_; + SavedSearchTable* _tmp12_; SavedSearchTable* _tmp13_; SavedSearchTable* _tmp14_; SavedSearchTable* _tmp15_; - SavedSearchTable* _tmp16_; #line 12 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" _tmp0_ = searches_header_new (); #line 12 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" @@ -644,7 +719,7 @@ SearchesBranch* searches_branch_construct (GType object_type) { self = (SearchesBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY | SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD) | SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD, _searches_branch_comparator_gcompare_func, NULL); #line 12 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" _g_object_unref0 (_tmp1_); -#line 648 "SearchesBranch.c" +#line 723 "SearchesBranch.c" { GeeIterator* _search_it = NULL; SavedSearchTable* _tmp2_; @@ -673,75 +748,76 @@ SearchesBranch* searches_branch_construct (GType object_type) { _search_it = _tmp7_; #line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" while (TRUE) { -#line 677 "SearchesBranch.c" +#line 752 "SearchesBranch.c" GeeIterator* _tmp8_; - gboolean _tmp9_; SavedSearch* search = NULL; - GeeIterator* _tmp10_; - gpointer _tmp11_; - SavedSearch* _tmp12_; + GeeIterator* _tmp9_; + gpointer _tmp10_; + SavedSearch* _tmp11_; #line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" _tmp8_ = _search_it; #line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp9_ = gee_iterator_next (_tmp8_); -#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - if (!_tmp9_) { + if (!gee_iterator_next (_tmp8_)) { #line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" break; -#line 692 "SearchesBranch.c" +#line 764 "SearchesBranch.c" } #line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp10_ = _search_it; + _tmp9_ = _search_it; #line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp11_ = gee_iterator_get (_tmp10_); + _tmp10_ = gee_iterator_get (_tmp9_); #line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - search = (SavedSearch*) _tmp11_; + search = (SavedSearch*) _tmp10_; #line 20 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp12_ = search; + _tmp11_ = search; #line 20 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - searches_branch_on_saved_search_added (self, _tmp12_); + searches_branch_on_saved_search_added (self, _tmp11_); #line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" _g_object_unref0 (search); -#line 706 "SearchesBranch.c" +#line 778 "SearchesBranch.c" } #line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" _g_object_unref0 (_search_it); -#line 710 "SearchesBranch.c" +#line 782 "SearchesBranch.c" } #line 23 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp13_ = saved_search_table_get_instance (); + _tmp12_ = saved_search_table_get_instance (); #line 23 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 23 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - g_signal_connect_object (_tmp14_, "search-added", (GCallback) _searches_branch_on_saved_search_added_saved_search_table_search_added, self, 0); + g_signal_connect_object (_tmp13_, "search-added", (GCallback) _searches_branch_on_saved_search_added_saved_search_table_search_added, self, 0); #line 23 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _saved_search_table_unref0 (_tmp14_); + _saved_search_table_unref0 (_tmp13_); #line 24 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp15_ = saved_search_table_get_instance (); + _tmp14_ = saved_search_table_get_instance (); #line 24 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 24 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - g_signal_connect_object (_tmp16_, "search-removed", (GCallback) _searches_branch_on_saved_search_removed_saved_search_table_search_removed, self, 0); + g_signal_connect_object (_tmp15_, "search-removed", (GCallback) _searches_branch_on_saved_search_removed_saved_search_table_search_removed, self, 0); #line 24 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _saved_search_table_unref0 (_tmp16_); + _saved_search_table_unref0 (_tmp15_); #line 11 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" return self; -#line 730 "SearchesBranch.c" +#line 802 "SearchesBranch.c" } -SearchesBranch* searches_branch_new (void) { +SearchesBranch* +searches_branch_new (void) +{ #line 11 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" return searches_branch_construct (SEARCHES_TYPE_BRANCH); -#line 737 "SearchesBranch.c" +#line 811 "SearchesBranch.c" } -SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self, SavedSearch* search) { +SearchesSidebarEntry* +searches_branch_get_entry_for_saved_search (SearchesBranch* self, + SavedSearch* search) +{ SearchesSidebarEntry* result = NULL; GeeHashMap* _tmp0_; - SavedSearch* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 32 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" g_return_val_if_fail (SEARCHES_IS_BRANCH (self), NULL); #line 32 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" @@ -749,68 +825,55 @@ SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch #line 33 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" _tmp0_ = self->priv->entry_map; #line 33 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp1_ = search; + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), search); #line 33 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 33 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - result = (SearchesSidebarEntry*) _tmp2_; + result = (SearchesSidebarEntry*) _tmp1_; #line 33 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" return result; -#line 760 "SearchesBranch.c" +#line 834 "SearchesBranch.c" } -static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b) { +static gint +searches_branch_comparator (SidebarEntry* a, + SidebarEntry* b) +{ gint result = 0; - SidebarEntry* _tmp0_; - SidebarEntry* _tmp1_; - SidebarEntry* _tmp2_; - SavedSearch* _tmp3_; - SidebarEntry* _tmp4_; - SavedSearch* _tmp5_; - gint _tmp6_; + SavedSearch* _tmp0_; + SavedSearch* _tmp1_; #line 36 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 36 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0); #line 37 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp0_ = a; -#line 37 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp1_ = b; -#line 37 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - if (_tmp0_ == _tmp1_) { + if (a == b) { #line 38 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" result = 0; #line 38 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" return result; -#line 787 "SearchesBranch.c" +#line 855 "SearchesBranch.c" } #line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp2_ = a; -#line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp3_ = searches_sidebar_entry_for_saved_search (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry)); -#line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp4_ = b; + _tmp0_ = searches_sidebar_entry_for_saved_search (G_TYPE_CHECK_INSTANCE_CAST (a, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry)); #line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp5_ = searches_sidebar_entry_for_saved_search (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry)); + _tmp1_ = searches_sidebar_entry_for_saved_search (G_TYPE_CHECK_INSTANCE_CAST (b, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry)); #line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp6_ = saved_search_compare_names (_tmp3_, _tmp5_); -#line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - result = _tmp6_; + result = saved_search_compare_names (_tmp0_, _tmp1_); #line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" return result; -#line 803 "SearchesBranch.c" +#line 865 "SearchesBranch.c" } -static void searches_branch_on_saved_search_added (SearchesBranch* self, SavedSearch* search) { +static void +searches_branch_on_saved_search_added (SearchesBranch* self, + SavedSearch* search) +{ SearchesSidebarEntry* entry = NULL; - SavedSearch* _tmp0_; - SearchesSidebarEntry* _tmp1_; - GeeHashMap* _tmp2_; - SavedSearch* _tmp3_; - SidebarEntry* _tmp4_; - SidebarEntry* _tmp5_; + SearchesSidebarEntry* _tmp0_; + GeeHashMap* _tmp1_; + SidebarEntry* _tmp2_; + SidebarEntry* _tmp3_; #line 44 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" g_return_if_fail (SEARCHES_IS_BRANCH (self)); #line 44 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" @@ -818,40 +881,37 @@ static void searches_branch_on_saved_search_added (SearchesBranch* self, SavedSe #line 45 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" g_debug ("SearchesBranch.vala:45: search added"); #line 46 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp0_ = search; + _tmp0_ = searches_sidebar_entry_new (search); #line 46 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp1_ = searches_sidebar_entry_new (_tmp0_); -#line 46 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - entry = _tmp1_; -#line 47 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp2_ = self->priv->entry_map; + entry = _tmp0_; #line 47 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp3_ = search; + _tmp1_ = self->priv->entry_map; #line 47 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, entry); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), search, entry); #line 48 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp4_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 48 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 48 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); #line 48 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp3_); #line 44 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" _g_object_unref0 (entry); -#line 843 "SearchesBranch.c" +#line 902 "SearchesBranch.c" } -static void searches_branch_on_saved_search_removed (SearchesBranch* self, SavedSearch* search) { +static void +searches_branch_on_saved_search_removed (SearchesBranch* self, + SavedSearch* search) +{ SearchesSidebarEntry* entry = NULL; GeeHashMap* _tmp0_; - SavedSearch* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; gboolean is_removed = FALSE; - GeeHashMap* _tmp3_; - SavedSearch* _tmp4_; - gboolean _tmp5_; + GeeHashMap* _tmp2_; + gboolean _tmp3_; #line 51 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" g_return_if_fail (SEARCHES_IS_BRANCH (self)); #line 51 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" @@ -861,43 +921,43 @@ static void searches_branch_on_saved_search_removed (SearchesBranch* self, Saved #line 53 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" _tmp0_ = self->priv->entry_map; #line 53 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp1_ = search; -#line 53 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), search); #line 53 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - entry = (SearchesSidebarEntry*) _tmp2_; + entry = (SearchesSidebarEntry*) _tmp1_; #line 54 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" _vala_assert (entry != NULL, "entry != null"); #line 56 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp3_ = self->priv->entry_map; -#line 56 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp4_ = search; + _tmp2_ = self->priv->entry_map; #line 56 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp5_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, NULL); + _tmp3_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), search, NULL); #line 56 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - is_removed = _tmp5_; + is_removed = _tmp3_; #line 57 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" _vala_assert (is_removed, "is_removed"); #line 59 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry)); #line 51 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" _g_object_unref0 (entry); -#line 886 "SearchesBranch.c" +#line 942 "SearchesBranch.c" } -static void searches_branch_class_init (SearchesBranchClass * klass) { +static void +searches_branch_class_init (SearchesBranchClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" searches_branch_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" g_type_class_add_private (klass, sizeof (SearchesBranchPrivate)); #line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" G_OBJECT_CLASS (klass)->finalize = searches_branch_finalize; -#line 897 "SearchesBranch.c" +#line 955 "SearchesBranch.c" } -static void searches_branch_instance_init (SearchesBranch * self) { +static void +searches_branch_instance_init (SearchesBranch * self) +{ GeeHashMap* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" self->priv = SEARCHES_BRANCH_GET_PRIVATE (self); @@ -905,11 +965,13 @@ static void searches_branch_instance_init (SearchesBranch * self) { _tmp0_ = gee_hash_map_new (TYPE_SAVED_SEARCH, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, SEARCHES_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 8 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" self->priv->entry_map = _tmp0_; -#line 909 "SearchesBranch.c" +#line 969 "SearchesBranch.c" } -static void searches_branch_finalize (GObject * obj) { +static void +searches_branch_finalize (GObject * obj) +{ SearchesBranch * self; SavedSearchTable* _tmp0_; SavedSearchTable* _tmp1_; @@ -943,11 +1005,13 @@ static void searches_branch_finalize (GObject * obj) { _g_object_unref0 (self->priv->entry_map); #line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" G_OBJECT_CLASS (searches_branch_parent_class)->finalize (obj); -#line 947 "SearchesBranch.c" +#line 1009 "SearchesBranch.c" } -GType searches_branch_get_type (void) { +GType +searches_branch_get_type (void) +{ static volatile gsize searches_branch_type_id__volatile = 0; if (g_once_init_enter (&searches_branch_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SearchesBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) searches_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchesBranch), 0, (GInstanceInitFunc) searches_branch_instance_init, NULL }; @@ -959,7 +1023,9 @@ GType searches_branch_get_type (void) { } -SearchesHeader* searches_header_construct (GType object_type) { +SearchesHeader* +searches_header_construct (GType object_type) +{ SearchesHeader * self = NULL; #line 68 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" self = (SearchesHeader*) sidebar_header_construct (object_type, _ ("Saved Searches"), _ ("Organize your saved searches"), TRUE); @@ -967,25 +1033,31 @@ SearchesHeader* searches_header_construct (GType object_type) { searches_header_setup_context_menu (self); #line 67 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" return self; -#line 971 "SearchesBranch.c" +#line 1037 "SearchesBranch.c" } -SearchesHeader* searches_header_new (void) { +SearchesHeader* +searches_header_new (void) +{ #line 67 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" return searches_header_construct (SEARCHES_TYPE_HEADER); -#line 978 "SearchesBranch.c" +#line 1046 "SearchesBranch.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 76 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" return self ? g_object_ref (self) : NULL; -#line 985 "SearchesBranch.c" +#line 1055 "SearchesBranch.c" } -static void searches_header_setup_context_menu (SearchesHeader* self) { +static void +searches_header_setup_context_menu (SearchesHeader* self) +{ GtkBuilder* _tmp0_; GError * _inner_error_ = NULL; #line 72 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" @@ -996,7 +1068,7 @@ static void searches_header_setup_context_menu (SearchesHeader* self) { _g_object_unref0 (self->priv->builder); #line 73 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" self->priv->builder = _tmp0_; -#line 1000 "SearchesBranch.c" +#line 1072 "SearchesBranch.c" { GtkBuilder* _tmp1_; gchar* _tmp2_; @@ -1019,7 +1091,7 @@ static void searches_header_setup_context_menu (SearchesHeader* self) { _g_free0 (_tmp3_); #line 75 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1023 "SearchesBranch.c" +#line 1095 "SearchesBranch.c" goto __catch85_g_error; } #line 76 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" @@ -1042,7 +1114,7 @@ static void searches_header_setup_context_menu (SearchesHeader* self) { self->priv->context_menu = _tmp8_; #line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" _g_object_unref0 (model); -#line 1046 "SearchesBranch.c" +#line 1118 "SearchesBranch.c" } goto __finally85; __catch85_g_error: @@ -1080,7 +1152,7 @@ static void searches_header_setup_context_menu (SearchesHeader* self) { _application_unref0 (_tmp14_); #line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" _g_error_free0 (_error_); -#line 1084 "SearchesBranch.c" +#line 1156 "SearchesBranch.c" } __finally85: #line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" @@ -1091,12 +1163,15 @@ static void searches_header_setup_context_menu (SearchesHeader* self) { g_clear_error (&_inner_error_); #line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" return; -#line 1095 "SearchesBranch.c" +#line 1167 "SearchesBranch.c" } } -static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event) { +static GtkMenu* +searches_header_real_get_sidebar_context_menu (SidebarContextable* base, + GdkEventButton* event) +{ SearchesHeader * self; GtkMenu* result = NULL; GtkMenu* _tmp0_; @@ -1111,40 +1186,48 @@ static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextabl result = _tmp1_; #line 86 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" return result; -#line 1115 "SearchesBranch.c" +#line 1190 "SearchesBranch.c" } -static void searches_header_class_init (SearchesHeaderClass * klass) { +static void +searches_header_class_init (SearchesHeaderClass * klass) +{ #line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" searches_header_parent_class = g_type_class_peek_parent (klass); #line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" g_type_class_add_private (klass, sizeof (SearchesHeaderPrivate)); #line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" G_OBJECT_CLASS (klass)->finalize = searches_header_finalize; -#line 1126 "SearchesBranch.c" +#line 1203 "SearchesBranch.c" } -static void searches_header_sidebar_contextable_interface_init (SidebarContextableIface * iface) { +static void +searches_header_sidebar_contextable_interface_init (SidebarContextableIface * iface) +{ #line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" searches_header_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface); #line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" iface->get_sidebar_context_menu = (GtkMenu* (*) (SidebarContextable *, GdkEventButton*)) searches_header_real_get_sidebar_context_menu; -#line 1135 "SearchesBranch.c" +#line 1214 "SearchesBranch.c" } -static void searches_header_instance_init (SearchesHeader * self) { +static void +searches_header_instance_init (SearchesHeader * self) +{ #line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" self->priv = SEARCHES_HEADER_GET_PRIVATE (self); #line 65 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" self->priv->context_menu = NULL; -#line 1144 "SearchesBranch.c" +#line 1225 "SearchesBranch.c" } -static void searches_header_finalize (GObject * obj) { +static void +searches_header_finalize (GObject * obj) +{ SearchesHeader * self; #line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_HEADER, SearchesHeader); @@ -1154,11 +1237,13 @@ static void searches_header_finalize (GObject * obj) { _g_object_unref0 (self->priv->context_menu); #line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" G_OBJECT_CLASS (searches_header_parent_class)->finalize (obj); -#line 1158 "SearchesBranch.c" +#line 1241 "SearchesBranch.c" } -GType searches_header_get_type (void) { +GType +searches_header_get_type (void) +{ static volatile gsize searches_header_type_id__volatile = 0; if (g_once_init_enter (&searches_header_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SearchesHeaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) searches_header_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchesHeader), 0, (GInstanceInitFunc) searches_header_instance_init, NULL }; @@ -1172,44 +1257,52 @@ GType searches_header_get_type (void) { } -SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, SavedSearch* search) { +SearchesSidebarEntry* +searches_sidebar_entry_construct (GType object_type, + SavedSearch* search) +{ SearchesSidebarEntry * self = NULL; SavedSearch* _tmp0_; - SavedSearch* _tmp1_; #line 96 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL); #line 96 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" self = (SearchesSidebarEntry*) sidebar_simple_page_entry_construct (object_type); #line 97 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp0_ = search; -#line 97 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (search); #line 97 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" _g_object_unref0 (self->priv->search); #line 97 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - self->priv->search = _tmp1_; + self->priv->search = _tmp0_; #line 96 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" return self; -#line 1194 "SearchesBranch.c" +#line 1279 "SearchesBranch.c" } -SearchesSidebarEntry* searches_sidebar_entry_new (SavedSearch* search) { +SearchesSidebarEntry* +searches_sidebar_entry_new (SavedSearch* search) +{ #line 96 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" return searches_sidebar_entry_construct (SEARCHES_TYPE_SIDEBAR_ENTRY, search); -#line 1201 "SearchesBranch.c" +#line 1288 "SearchesBranch.c" } -void searches_sidebar_entry_init (void) { +void +searches_sidebar_entry_init (void) +{ } -void searches_sidebar_entry_terminate (void) { +void +searches_sidebar_entry_terminate (void) +{ } -SavedSearch* searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self) { +SavedSearch* +searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self) +{ SavedSearch* result = NULL; SavedSearch* _tmp0_; SavedSearch* _tmp1_; @@ -1223,11 +1316,13 @@ SavedSearch* searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self result = _tmp1_; #line 107 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" return result; -#line 1227 "SearchesBranch.c" +#line 1320 "SearchesBranch.c" } -static gchar* searches_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +searches_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ SearchesSidebarEntry * self; gchar* result = NULL; SavedSearch* _tmp0_; @@ -1242,11 +1337,13 @@ static gchar* searches_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEnt result = _tmp1_; #line 111 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" return result; -#line 1246 "SearchesBranch.c" +#line 1341 "SearchesBranch.c" } -static gchar* searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { +static gchar* +searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) +{ SearchesSidebarEntry * self; gchar* result = NULL; const gchar* _tmp0_; @@ -1261,11 +1358,13 @@ static gchar* searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEnt result = _tmp1_; #line 115 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" return result; -#line 1265 "SearchesBranch.c" +#line 1362 "SearchesBranch.c" } -static Page* searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) +{ SearchesSidebarEntry * self; Page* result = NULL; SavedSearch* _tmp0_; @@ -1282,11 +1381,13 @@ static Page* searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* ba result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); #line 119 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" return result; -#line 1286 "SearchesBranch.c" +#line 1385 "SearchesBranch.c" } -static gboolean searches_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base) { +static gboolean +searches_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base) +{ SearchesSidebarEntry * self; gboolean result = FALSE; #line 122 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" @@ -1295,17 +1396,18 @@ static gboolean searches_sidebar_entry_real_is_user_renameable (SidebarRenameabl result = TRUE; #line 123 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" return result; -#line 1299 "SearchesBranch.c" +#line 1400 "SearchesBranch.c" } -static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name) { +static void +searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, + const gchar* new_name) +{ SearchesSidebarEntry * self; SavedSearchTable* _tmp0_; SavedSearchTable* _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; + gboolean _tmp2_; #line 126 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry); #line 126 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" @@ -1315,121 +1417,109 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co #line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" _tmp1_ = _tmp0_; #line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp2_ = new_name; -#line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp3_ = saved_search_table_exists (_tmp1_, _tmp2_); -#line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp4_ = !_tmp3_; + _tmp2_ = !saved_search_table_exists (_tmp1_, new_name); #line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" _saved_search_table_unref0 (_tmp1_); #line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - if (_tmp4_) { -#line 1328 "SearchesBranch.c" - CommandManager* _tmp5_; - CommandManager* _tmp6_; - SavedSearch* _tmp7_; - const gchar* _tmp8_; - RenameSavedSearchCommand* _tmp9_; - RenameSavedSearchCommand* _tmp10_; -#line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp5_ = app_window_get_command_manager (); + if (_tmp2_) { +#line 1426 "SearchesBranch.c" + CommandManager* _tmp3_; + CommandManager* _tmp4_; + SavedSearch* _tmp5_; + RenameSavedSearchCommand* _tmp6_; + RenameSavedSearchCommand* _tmp7_; #line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp6_ = _tmp5_; + _tmp3_ = app_window_get_command_manager (); #line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp7_ = self->priv->search; + _tmp4_ = _tmp3_; #line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp8_ = new_name; + _tmp5_ = self->priv->search; #line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp9_ = rename_saved_search_command_new (_tmp7_, _tmp8_); + _tmp6_ = rename_saved_search_command_new (_tmp5_, new_name); #line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp10_ = _tmp9_; + _tmp7_ = _tmp6_; #line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command)); #line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp7_); #line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _command_manager_unref0 (_tmp6_); -#line 1353 "SearchesBranch.c" + _command_manager_unref0 (_tmp4_); +#line 1448 "SearchesBranch.c" } else { - const gchar* _tmp11_; - SavedSearch* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; - gboolean _tmp15_; -#line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp11_ = new_name; + SavedSearch* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + gboolean _tmp11_; #line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp12_ = self->priv->search; + _tmp8_ = self->priv->search; #line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp13_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject)); + _tmp9_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); #line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp14_ = _tmp13_; + _tmp10_ = _tmp9_; #line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp15_ = g_strcmp0 (_tmp11_, _tmp14_) != 0; + _tmp11_ = g_strcmp0 (new_name, _tmp10_) != 0; #line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _g_free0 (_tmp14_); + _g_free0 (_tmp10_); #line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - if (_tmp15_) { -#line 1374 "SearchesBranch.c" - const gchar* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; -#line 130 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp16_ = new_name; + if (_tmp11_) { +#line 1466 "SearchesBranch.c" + gchar* _tmp12_; + gchar* _tmp13_; #line 130 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp17_ = resources_rename_search_exists_message (_tmp16_); + _tmp12_ = resources_rename_search_exists_message (new_name); #line 130 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp18_ = _tmp17_; + _tmp13_ = _tmp12_; #line 130 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - app_window_error_message (_tmp18_, NULL); + app_window_error_message (_tmp13_, NULL); #line 130 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _g_free0 (_tmp18_); -#line 1388 "SearchesBranch.c" + _g_free0 (_tmp13_); +#line 1477 "SearchesBranch.c" } } } -static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base) { +static void +searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base) +{ SearchesSidebarEntry * self; SavedSearch* _tmp0_; - gboolean _tmp1_; #line 133 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry); #line 134 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" _tmp0_ = self->priv->search; #line 134 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp1_ = dialogs_confirm_delete_saved_search (_tmp0_); -#line 134 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - if (_tmp1_) { -#line 1406 "SearchesBranch.c" + if (dialogs_confirm_delete_saved_search (_tmp0_)) { +#line 1494 "SearchesBranch.c" + CommandManager* _tmp1_; CommandManager* _tmp2_; - CommandManager* _tmp3_; - SavedSearch* _tmp4_; + SavedSearch* _tmp3_; + DeleteSavedSearchCommand* _tmp4_; DeleteSavedSearchCommand* _tmp5_; - DeleteSavedSearchCommand* _tmp6_; #line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp2_ = app_window_get_command_manager (); + _tmp1_ = app_window_get_command_manager (); #line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp4_ = self->priv->search; + _tmp3_ = self->priv->search; #line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp5_ = delete_saved_search_command_new (_tmp4_); + _tmp4_ = delete_saved_search_command_new (_tmp3_); #line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_COMMAND, Command)); #line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp5_); #line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" - _command_manager_unref0 (_tmp3_); -#line 1428 "SearchesBranch.c" + _command_manager_unref0 (_tmp2_); +#line 1516 "SearchesBranch.c" } } -static void searches_sidebar_entry_class_init (SearchesSidebarEntryClass * klass) { +static void +searches_sidebar_entry_class_init (SearchesSidebarEntryClass * klass) +{ gchar* _tmp0_; #line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" searches_sidebar_entry_parent_class = g_type_class_peek_parent (klass); @@ -1447,38 +1537,46 @@ static void searches_sidebar_entry_class_init (SearchesSidebarEntryClass * klass _tmp0_ = g_strdup ("edit-find"); #line 92 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" searches_sidebar_entry_single_search_icon = _tmp0_; -#line 1451 "SearchesBranch.c" +#line 1541 "SearchesBranch.c" } -static void searches_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) { +static void +searches_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) +{ #line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" searches_sidebar_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) searches_sidebar_entry_real_is_user_renameable; #line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) searches_sidebar_entry_real_rename; -#line 1462 "SearchesBranch.c" +#line 1554 "SearchesBranch.c" } -static void searches_sidebar_entry_sidebar_destroyable_entry_interface_init (SidebarDestroyableEntryIface * iface) { +static void +searches_sidebar_entry_sidebar_destroyable_entry_interface_init (SidebarDestroyableEntryIface * iface) +{ #line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" searches_sidebar_entry_sidebar_destroyable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" iface->destroy_source = (void (*) (SidebarDestroyableEntry *)) searches_sidebar_entry_real_destroy_source; -#line 1471 "SearchesBranch.c" +#line 1565 "SearchesBranch.c" } -static void searches_sidebar_entry_instance_init (SearchesSidebarEntry * self) { +static void +searches_sidebar_entry_instance_init (SearchesSidebarEntry * self) +{ #line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" self->priv = SEARCHES_SIDEBAR_ENTRY_GET_PRIVATE (self); -#line 1478 "SearchesBranch.c" +#line 1574 "SearchesBranch.c" } -static void searches_sidebar_entry_finalize (GObject * obj) { +static void +searches_sidebar_entry_finalize (GObject * obj) +{ SearchesSidebarEntry * self; #line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry); @@ -1486,11 +1584,13 @@ static void searches_sidebar_entry_finalize (GObject * obj) { _g_object_unref0 (self->priv->search); #line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala" G_OBJECT_CLASS (searches_sidebar_entry_parent_class)->finalize (obj); -#line 1490 "SearchesBranch.c" +#line 1588 "SearchesBranch.c" } -GType searches_sidebar_entry_get_type (void) { +GType +searches_sidebar_entry_get_type (void) +{ static volatile gsize searches_sidebar_entry_type_id__volatile = 0; if (g_once_init_enter (&searches_sidebar_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SearchesSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) searches_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchesSidebarEntry), 0, (GInstanceInitFunc) searches_sidebar_entry_instance_init, NULL }; diff --git a/src/shotwell-graphics-processor.h b/src/shotwell-graphics-processor.h index fc05d79..9dbd564 100644 --- a/src/shotwell-graphics-processor.h +++ b/src/shotwell-graphics-processor.h @@ -1,4 +1,4 @@ -/* shotwell-graphics-processor.h generated by valac 0.36.6, the Vala compiler, do not modify */ +/* shotwell-graphics-processor.h generated by valac 0.40.4, the Vala compiler, do not modify */ #ifndef __SRC_SHOTWELL_GRAPHICS_PROCESSOR_H__ @@ -437,33 +437,57 @@ GType rgb_analytic_pixel_get_type (void) G_GNUC_CONST; RGBAnalyticPixel* rgb_analytic_pixel_dup (const RGBAnalyticPixel* self); void rgb_analytic_pixel_free (RGBAnalyticPixel* self); void rgb_analytic_pixel_init (RGBAnalyticPixel *self); -void rgb_analytic_pixel_init_from_components (RGBAnalyticPixel *self, gfloat red, gfloat green, gfloat blue); -void rgb_analytic_pixel_init_from_quantized_components (RGBAnalyticPixel *self, guchar red_quantized, guchar green_quantized, guchar blue_quantized); +void rgb_analytic_pixel_init_from_components (RGBAnalyticPixel *self, + gfloat red, + gfloat green, + gfloat blue); +void rgb_analytic_pixel_init_from_quantized_components (RGBAnalyticPixel *self, + guchar red_quantized, + guchar green_quantized, + guchar blue_quantized); GType hsv_analytic_pixel_get_type (void) G_GNUC_CONST; HSVAnalyticPixel* hsv_analytic_pixel_dup (const HSVAnalyticPixel* self); void hsv_analytic_pixel_free (HSVAnalyticPixel* self); -void rgb_analytic_pixel_init_from_hsv (RGBAnalyticPixel *self, HSVAnalyticPixel* hsv_pixel); +void rgb_analytic_pixel_init_from_hsv (RGBAnalyticPixel *self, + HSVAnalyticPixel* hsv_pixel); guchar rgb_analytic_pixel_quantized_red (RGBAnalyticPixel *self); guchar rgb_analytic_pixel_quantized_green (RGBAnalyticPixel *self); guchar rgb_analytic_pixel_quantized_blue (RGBAnalyticPixel *self); -gboolean rgb_analytic_pixel_equals (RGBAnalyticPixel *self, RGBAnalyticPixel* rhs); +gboolean rgb_analytic_pixel_equals (RGBAnalyticPixel *self, + RGBAnalyticPixel* rhs); guint rgb_analytic_pixel_hash_code (RGBAnalyticPixel *self); -void rgb_analytic_pixel_to_hsv (RGBAnalyticPixel *self, HSVAnalyticPixel* result); +void rgb_analytic_pixel_to_hsv (RGBAnalyticPixel *self, + HSVAnalyticPixel* result); void hsv_analytic_pixel_init (HSVAnalyticPixel *self); -void hsv_analytic_pixel_init_from_components (HSVAnalyticPixel *self, gfloat hue, gfloat saturation, gfloat light_value); -void hsv_analytic_pixel_init_from_quantized_components (HSVAnalyticPixel *self, guchar hue_quantized, guchar saturation_quantized, guchar light_value_quantized); -void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* p); -void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result); -gboolean hsv_analytic_pixel_equals (HSVAnalyticPixel *self, HSVAnalyticPixel* rhs); +void hsv_analytic_pixel_init_from_components (HSVAnalyticPixel *self, + gfloat hue, + gfloat saturation, + gfloat light_value); +void hsv_analytic_pixel_init_from_quantized_components (HSVAnalyticPixel *self, + guchar hue_quantized, + guchar saturation_quantized, + guchar light_value_quantized); +void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, + RGBAnalyticPixel* p); +void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, + RGBAnalyticPixel* result); +gboolean hsv_analytic_pixel_equals (HSVAnalyticPixel *self, + HSVAnalyticPixel* rhs); guint hsv_analytic_pixel_hash_code (HSVAnalyticPixel *self); GType composition_mode_get_type (void) G_GNUC_CONST; GType pixel_format_get_type (void) G_GNUC_CONST; GType pixel_transformation_type_get_type (void) G_GNUC_CONST; gpointer pixel_transformation_bundle_ref (gpointer instance); void pixel_transformation_bundle_unref (gpointer instance); -GParamSpec* param_spec_pixel_transformation_bundle (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_pixel_transformation_bundle (GValue* value, gpointer v_object); -void value_take_pixel_transformation_bundle (GValue* value, gpointer v_object); +GParamSpec* param_spec_pixel_transformation_bundle (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_pixel_transformation_bundle (GValue* value, + gpointer v_object); +void value_take_pixel_transformation_bundle (GValue* value, + gpointer v_object); gpointer value_get_pixel_transformation_bundle (const GValue* value); GType pixel_transformation_bundle_get_type (void) G_GNUC_CONST; PixelTransformationBundle* pixel_transformation_bundle_new (void); @@ -473,162 +497,268 @@ void pixel_transformation_bundle_set_copied_color_adjustments (PixelTransformati gboolean pixel_transformation_bundle_has_copied_color_adjustments (void); gpointer pixel_transformation_ref (gpointer instance); void pixel_transformation_unref (gpointer instance); -GParamSpec* param_spec_pixel_transformation (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_pixel_transformation (GValue* value, gpointer v_object); -void value_take_pixel_transformation (GValue* value, gpointer v_object); +GParamSpec* param_spec_pixel_transformation (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_pixel_transformation (GValue* value, + gpointer v_object); +void value_take_pixel_transformation (GValue* value, + gpointer v_object); gpointer value_get_pixel_transformation (const GValue* value); GType pixel_transformation_get_type (void) G_GNUC_CONST; -void pixel_transformation_bundle_set (PixelTransformationBundle* self, PixelTransformation* transformation); +void pixel_transformation_bundle_set (PixelTransformationBundle* self, + PixelTransformation* transformation); void pixel_transformation_bundle_set_to_identity (PixelTransformationBundle* self); gpointer key_value_map_ref (gpointer instance); void key_value_map_unref (gpointer instance); -GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_key_value_map (GValue* value, gpointer v_object); -void value_take_key_value_map (GValue* value, gpointer v_object); +GParamSpec* param_spec_key_value_map (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_key_value_map (GValue* value, + gpointer v_object); +void value_take_key_value_map (GValue* value, + gpointer v_object); gpointer value_get_key_value_map (const GValue* value); GType key_value_map_get_type (void) G_GNUC_CONST; -void pixel_transformation_bundle_load (PixelTransformationBundle* self, KeyValueMap* store); -KeyValueMap* pixel_transformation_bundle_save (PixelTransformationBundle* self, const gchar* group); +void pixel_transformation_bundle_load (PixelTransformationBundle* self, + KeyValueMap* store); +KeyValueMap* pixel_transformation_bundle_save (PixelTransformationBundle* self, + const gchar* group); gint pixel_transformation_bundle_get_count (PixelTransformationBundle* self); -PixelTransformation* pixel_transformation_bundle_get_transformation (PixelTransformationBundle* self, PixelTransformationType type); +PixelTransformation* pixel_transformation_bundle_get_transformation (PixelTransformationBundle* self, + PixelTransformationType type); GeeIterable* pixel_transformation_bundle_get_transformations (PixelTransformationBundle* self); gboolean pixel_transformation_bundle_is_identity (PixelTransformationBundle* self); gpointer pixel_transformer_ref (gpointer instance); void pixel_transformer_unref (gpointer instance); -GParamSpec* param_spec_pixel_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_pixel_transformer (GValue* value, gpointer v_object); -void value_take_pixel_transformer (GValue* value, gpointer v_object); +GParamSpec* param_spec_pixel_transformer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_pixel_transformer (GValue* value, + gpointer v_object); +void value_take_pixel_transformer (GValue* value, + gpointer v_object); gpointer value_get_pixel_transformer (const GValue* value); GType pixel_transformer_get_type (void) G_GNUC_CONST; PixelTransformer* pixel_transformation_bundle_generate_transformer (PixelTransformationBundle* self); PixelTransformationBundle* pixel_transformation_bundle_copy (PixelTransformationBundle* self); -PixelTransformation* pixel_transformation_construct (GType object_type, PixelTransformationType type, PixelFormat preferred_format); +PixelTransformation* pixel_transformation_construct (GType object_type, + PixelTransformationType type, + PixelFormat preferred_format); PixelTransformationType pixel_transformation_get_transformation_type (PixelTransformation* self); PixelFormat pixel_transformation_get_preferred_format (PixelTransformation* self); CompositionMode pixel_transformation_get_composition_mode (PixelTransformation* self); -void pixel_transformation_compose_with (PixelTransformation* self, PixelTransformation* other); +void pixel_transformation_compose_with (PixelTransformation* self, + PixelTransformation* other); gboolean pixel_transformation_is_identity (PixelTransformation* self); -void pixel_transformation_transform_pixel_hsv (PixelTransformation* self, HSVAnalyticPixel* p, HSVAnalyticPixel* result); -void pixel_transformation_transform_pixel_rgb (PixelTransformation* self, RGBAnalyticPixel* p, RGBAnalyticPixel* result); +void pixel_transformation_transform_pixel_hsv (PixelTransformation* self, + HSVAnalyticPixel* p, + HSVAnalyticPixel* result); +void pixel_transformation_transform_pixel_rgb (PixelTransformation* self, + RGBAnalyticPixel* p, + RGBAnalyticPixel* result); gchar* pixel_transformation_to_string (PixelTransformation* self); PixelTransformation* pixel_transformation_copy (PixelTransformation* self); GType rgb_transformation_get_type (void) G_GNUC_CONST; #define RGB_TRANSFORMATION_MATRIX_SIZE 16 RGBTransformation* rgb_transformation_new (PixelTransformationType type); -RGBTransformation* rgb_transformation_construct (GType object_type, PixelTransformationType type); +RGBTransformation* rgb_transformation_construct (GType object_type, + PixelTransformationType type); GType hsv_transformation_get_type (void) G_GNUC_CONST; -HSVTransformation* hsv_transformation_construct (GType object_type, PixelTransformationType type); +HSVTransformation* hsv_transformation_construct (GType object_type, + PixelTransformationType type); GType tint_transformation_get_type (void) G_GNUC_CONST; #define TINT_TRANSFORMATION_MIN_PARAMETER (-16.0f) #define TINT_TRANSFORMATION_MAX_PARAMETER 16.0f TintTransformation* tint_transformation_new (gfloat client_param); -TintTransformation* tint_transformation_construct (GType object_type, gfloat client_param); +TintTransformation* tint_transformation_construct (GType object_type, + gfloat client_param); gfloat tint_transformation_get_parameter (TintTransformation* self); GType temperature_transformation_get_type (void) G_GNUC_CONST; #define TEMPERATURE_TRANSFORMATION_MIN_PARAMETER (-16.0f) #define TEMPERATURE_TRANSFORMATION_MAX_PARAMETER 16.0f TemperatureTransformation* temperature_transformation_new (gfloat client_parameter); -TemperatureTransformation* temperature_transformation_construct (GType object_type, gfloat client_parameter); +TemperatureTransformation* temperature_transformation_construct (GType object_type, + gfloat client_parameter); gfloat temperature_transformation_get_parameter (TemperatureTransformation* self); GType saturation_transformation_get_type (void) G_GNUC_CONST; #define SATURATION_TRANSFORMATION_MIN_PARAMETER (-16.0f) #define SATURATION_TRANSFORMATION_MAX_PARAMETER 16.0f SaturationTransformation* saturation_transformation_new (gfloat client_parameter); -SaturationTransformation* saturation_transformation_construct (GType object_type, gfloat client_parameter); +SaturationTransformation* saturation_transformation_construct (GType object_type, + gfloat client_parameter); gfloat saturation_transformation_get_parameter (SaturationTransformation* self); GType exposure_transformation_get_type (void) G_GNUC_CONST; #define EXPOSURE_TRANSFORMATION_MIN_PARAMETER (-16.0f) #define EXPOSURE_TRANSFORMATION_MAX_PARAMETER 16.0f ExposureTransformation* exposure_transformation_new (gfloat client_parameter); -ExposureTransformation* exposure_transformation_construct (GType object_type, gfloat client_parameter); +ExposureTransformation* exposure_transformation_construct (GType object_type, + gfloat client_parameter); gfloat exposure_transformation_get_parameter (ExposureTransformation* self); GType contrast_transformation_get_type (void) G_GNUC_CONST; #define CONTRAST_TRANSFORMATION_MIN_PARAMETER (-16.0f) #define CONTRAST_TRANSFORMATION_MAX_PARAMETER 16.0f ContrastTransformation* contrast_transformation_new (gfloat client_parameter); -ContrastTransformation* contrast_transformation_construct (GType object_type, gfloat client_parameter); +ContrastTransformation* contrast_transformation_construct (GType object_type, + gfloat client_parameter); gfloat contrast_transformation_get_parameter (ContrastTransformation* self); PixelTransformer* pixel_transformer_new (void); PixelTransformer* pixel_transformer_construct (GType object_type); PixelTransformer* pixel_transformer_copy (PixelTransformer* self); -void pixel_transformer_attach_transformation (PixelTransformer* self, PixelTransformation* trans); -void pixel_transformer_detach_transformation (PixelTransformer* self, PixelTransformation* victim); -void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTransformation* old_trans, PixelTransformation* new_trans); -void pixel_transformer_transform_pixbuf (PixelTransformer* self, GdkPixbuf* pixbuf, GCancellable* cancellable); -void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pixel_cache, int* fp_pixel_cache_length1, GdkPixbuf* dest); -void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPixbuf* source, GdkPixbuf* dest, GCancellable* cancellable, gint jobs); +void pixel_transformer_attach_transformation (PixelTransformer* self, + PixelTransformation* trans); +void pixel_transformer_detach_transformation (PixelTransformer* self, + PixelTransformation* victim); +void pixel_transformer_replace_transformation (PixelTransformer* self, + PixelTransformation* old_trans, + PixelTransformation* new_trans); +void pixel_transformer_transform_pixbuf (PixelTransformer* self, + GdkPixbuf* pixbuf, + GCancellable* cancellable); +void pixel_transformer_transform_from_fp (PixelTransformer* self, + gfloat** fp_pixel_cache, + int* fp_pixel_cache_length1, + GdkPixbuf* dest); +void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, + GdkPixbuf* source, + GdkPixbuf* dest, + GCancellable* cancellable, + gint jobs); gpointer rgb_histogram_ref (gpointer instance); void rgb_histogram_unref (gpointer instance); -GParamSpec* param_spec_rgb_histogram (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_rgb_histogram (GValue* value, gpointer v_object); -void value_take_rgb_histogram (GValue* value, gpointer v_object); +GParamSpec* param_spec_rgb_histogram (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_rgb_histogram (GValue* value, + gpointer v_object); +void value_take_rgb_histogram (GValue* value, + gpointer v_object); gpointer value_get_rgb_histogram (const GValue* value); GType rgb_histogram_get_type (void) G_GNUC_CONST; #define RGB_HISTOGRAM_GRAPHIC_WIDTH 256 #define RGB_HISTOGRAM_GRAPHIC_HEIGHT 100 RGBHistogram* rgb_histogram_new (GdkPixbuf* pixbuf); -RGBHistogram* rgb_histogram_construct (GType object_type, GdkPixbuf* pixbuf); +RGBHistogram* rgb_histogram_construct (GType object_type, + GdkPixbuf* pixbuf); GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self); gpointer intensity_histogram_ref (gpointer instance); void intensity_histogram_unref (gpointer instance); -GParamSpec* param_spec_intensity_histogram (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_intensity_histogram (GValue* value, gpointer v_object); -void value_take_intensity_histogram (GValue* value, gpointer v_object); +GParamSpec* param_spec_intensity_histogram (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_intensity_histogram (GValue* value, + gpointer v_object); +void value_take_intensity_histogram (GValue* value, + gpointer v_object); gpointer value_get_intensity_histogram (const GValue* value); GType intensity_histogram_get_type (void) G_GNUC_CONST; IntensityHistogram* intensity_histogram_new (GdkPixbuf* pixbuf); -IntensityHistogram* intensity_histogram_construct (GType object_type, GdkPixbuf* pixbuf); -gfloat intensity_histogram_get_cumulative_probability (IntensityHistogram* self, gint level); +IntensityHistogram* intensity_histogram_construct (GType object_type, + GdkPixbuf* pixbuf); +gfloat intensity_histogram_get_cumulative_probability (IntensityHistogram* self, + gint level); GType expansion_transformation_get_type (void) G_GNUC_CONST; ExpansionTransformation* expansion_transformation_new (IntensityHistogram* histogram); -ExpansionTransformation* expansion_transformation_construct (GType object_type, IntensityHistogram* histogram); -ExpansionTransformation* expansion_transformation_new_from_extrema (gint black_point, gint white_point); -ExpansionTransformation* expansion_transformation_construct_from_extrema (GType object_type, gint black_point, gint white_point); +ExpansionTransformation* expansion_transformation_construct (GType object_type, + IntensityHistogram* histogram); +ExpansionTransformation* expansion_transformation_new_from_extrema (gint black_point, + gint white_point); +ExpansionTransformation* expansion_transformation_construct_from_extrema (GType object_type, + gint black_point, + gint white_point); ExpansionTransformation* expansion_transformation_new_from_string (const gchar* encoded_transformation); -ExpansionTransformation* expansion_transformation_construct_from_string (GType object_type, const gchar* encoded_transformation); +ExpansionTransformation* expansion_transformation_construct_from_string (GType object_type, + const gchar* encoded_transformation); gint expansion_transformation_get_white_point (ExpansionTransformation* self); gint expansion_transformation_get_black_point (ExpansionTransformation* self); GType shadow_detail_transformation_get_type (void) G_GNUC_CONST; #define SHADOW_DETAIL_TRANSFORMATION_MIN_PARAMETER 0.0f #define SHADOW_DETAIL_TRANSFORMATION_MAX_PARAMETER 32.0f ShadowDetailTransformation* shadow_detail_transformation_new (gfloat user_intensity); -ShadowDetailTransformation* shadow_detail_transformation_construct (GType object_type, gfloat user_intensity); +ShadowDetailTransformation* shadow_detail_transformation_construct (GType object_type, + gfloat user_intensity); gfloat shadow_detail_transformation_get_parameter (ShadowDetailTransformation* self); gpointer hermite_gamma_approximation_function_ref (gpointer instance); void hermite_gamma_approximation_function_unref (gpointer instance); -GParamSpec* param_spec_hermite_gamma_approximation_function (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_hermite_gamma_approximation_function (GValue* value, gpointer v_object); -void value_take_hermite_gamma_approximation_function (GValue* value, gpointer v_object); +GParamSpec* param_spec_hermite_gamma_approximation_function (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_hermite_gamma_approximation_function (GValue* value, + gpointer v_object); +void value_take_hermite_gamma_approximation_function (GValue* value, + gpointer v_object); gpointer value_get_hermite_gamma_approximation_function (const GValue* value); GType hermite_gamma_approximation_function_get_type (void) G_GNUC_CONST; HermiteGammaApproximationFunction* hermite_gamma_approximation_function_new (gfloat user_interval_upper); -HermiteGammaApproximationFunction* hermite_gamma_approximation_function_construct (GType object_type, gfloat user_interval_upper); -gfloat hermite_gamma_approximation_function_evaluate (HermiteGammaApproximationFunction* self, gfloat x); +HermiteGammaApproximationFunction* hermite_gamma_approximation_function_construct (GType object_type, + gfloat user_interval_upper); +gfloat hermite_gamma_approximation_function_evaluate (HermiteGammaApproximationFunction* self, + gfloat x); GType highlight_detail_transformation_get_type (void) G_GNUC_CONST; #define HIGHLIGHT_DETAIL_TRANSFORMATION_MIN_PARAMETER (-32.0f) #define HIGHLIGHT_DETAIL_TRANSFORMATION_MAX_PARAMETER 0.0f HighlightDetailTransformation* highlight_detail_transformation_new (gfloat user_intensity); -HighlightDetailTransformation* highlight_detail_transformation_construct (GType object_type, gfloat user_intensity); +HighlightDetailTransformation* highlight_detail_transformation_construct (GType object_type, + gfloat user_intensity); gfloat highlight_detail_transformation_get_parameter (HighlightDetailTransformation* self); PixelTransformationBundle* auto_enhance_create_auto_enhance_adjustments (GdkPixbuf* pixbuf); KeyValueMap* key_value_map_new (const gchar* group); -KeyValueMap* key_value_map_construct (GType object_type, const gchar* group); +KeyValueMap* key_value_map_construct (GType object_type, + const gchar* group); KeyValueMap* key_value_map_copy (KeyValueMap* self); gchar* key_value_map_get_group (KeyValueMap* self); GeeSet* key_value_map_get_keys (KeyValueMap* self); -gboolean key_value_map_has_key (KeyValueMap* self, const gchar* key); -void key_value_map_set_string (KeyValueMap* self, const gchar* key, const gchar* value); -void key_value_map_set_int (KeyValueMap* self, const gchar* key, gint value); -void key_value_map_set_double (KeyValueMap* self, const gchar* key, gdouble value); -void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value); -void key_value_map_set_bool (KeyValueMap* self, const gchar* key, gboolean value); -gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gchar* def); -gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def); -gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble def); -gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def); -gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean def); -void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def, GdkPoint* result); -void key_value_map_set_point (KeyValueMap* self, const gchar* key, GdkPoint* point); +gboolean key_value_map_has_key (KeyValueMap* self, + const gchar* key); +void key_value_map_set_string (KeyValueMap* self, + const gchar* key, + const gchar* value); +void key_value_map_set_int (KeyValueMap* self, + const gchar* key, + gint value); +void key_value_map_set_double (KeyValueMap* self, + const gchar* key, + gdouble value); +void key_value_map_set_float (KeyValueMap* self, + const gchar* key, + gfloat value); +void key_value_map_set_bool (KeyValueMap* self, + const gchar* key, + gboolean value); +gchar* key_value_map_get_string (KeyValueMap* self, + const gchar* key, + const gchar* def); +gint key_value_map_get_int (KeyValueMap* self, + const gchar* key, + gint def); +gdouble key_value_map_get_double (KeyValueMap* self, + const gchar* key, + gdouble def); +gfloat key_value_map_get_float (KeyValueMap* self, + const gchar* key, + gfloat def); +gboolean key_value_map_get_bool (KeyValueMap* self, + const gchar* key, + gboolean def); +void key_value_map_get_point (KeyValueMap* self, + const gchar* key, + GdkPoint* def, + GdkPoint* result); +void key_value_map_set_point (KeyValueMap* self, + const gchar* key, + GdkPoint* point); extern const gfloat rgb_lookup_table[256]; diff --git a/src/shotwell-graphics-processor.vapi b/src/shotwell-graphics-processor.vapi index e34078b..38ccee5 100644 --- a/src/shotwell-graphics-processor.vapi +++ b/src/shotwell-graphics-processor.vapi @@ -1,4 +1,4 @@ -/* shotwell-graphics-processor.vapi generated by valac 0.36.6, do not modify. */ +/* shotwell-graphics-processor.vapi generated by valac 0.40.4, do not modify. */ namespace AutoEnhance { [CCode (cheader_filename = "shotwell-graphics-processor.h")] diff --git a/src/sidebar/Branch.c b/src/sidebar/Branch.c index a49cdac..e855a99 100644 --- a/src/sidebar/Branch.c +++ b/src/sidebar/Branch.c @@ -1,4 +1,4 @@ -/* Branch.c generated by valac 0.36.6, the Vala compiler +/* Branch.c generated by valac 0.40.4, the Vala compiler * generated from Branch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -56,6 +57,11 @@ typedef struct _SidebarEntryIface SidebarEntryIface; typedef struct _SidebarTree SidebarTree; typedef struct _SidebarTreeClass SidebarTreeClass; +enum { + SIDEBAR_BRANCH_0_PROPERTY, + SIDEBAR_BRANCH_NUM_PROPERTIES +}; +static GParamSpec* sidebar_branch_properties[SIDEBAR_BRANCH_NUM_PROPERTIES]; #define _sidebar_branch_node_unref0(var) ((var == NULL) ? NULL : (var = (sidebar_branch_node_unref (var), NULL))) #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) typedef struct _SidebarBranchNodePrivate SidebarBranchNodePrivate; @@ -67,9 +73,9 @@ enum { SIDEBAR_BRANCH_ENTRY_REPARENTED_SIGNAL, SIDEBAR_BRANCH_CHILDREN_REORDERED_SIGNAL, SIDEBAR_BRANCH_SHOW_BRANCH_SIGNAL, - SIDEBAR_BRANCH_LAST_SIGNAL + SIDEBAR_BRANCH_NUM_SIGNALS }; -static guint sidebar_branch_signals[SIDEBAR_BRANCH_LAST_SIGNAL] = {0}; +static guint sidebar_branch_signals[SIDEBAR_BRANCH_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -139,110 +145,180 @@ static gpointer sidebar_branch_node_parent_class = NULL; GType sidebar_branch_get_type (void) G_GNUC_CONST; static gpointer sidebar_branch_node_ref (gpointer instance); static void sidebar_branch_node_unref (gpointer instance); -static GParamSpec* sidebar_branch_param_spec_node (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; -static void sidebar_branch_value_set_node (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void sidebar_branch_value_take_node (GValue* value, gpointer v_object) G_GNUC_UNUSED; +static GParamSpec* sidebar_branch_param_spec_node (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) G_GNUC_UNUSED; +static void sidebar_branch_value_set_node (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void sidebar_branch_value_take_node (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer sidebar_branch_value_get_node (const GValue* value) G_GNUC_UNUSED; static GType sidebar_branch_node_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; GType sidebar_branch_options_get_type (void) G_GNUC_CONST; GType sidebar_tree_get_type (void) G_GNUC_CONST; GType sidebar_entry_get_type (void) G_GNUC_CONST; #define SIDEBAR_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SIDEBAR_TYPE_BRANCH, SidebarBranchPrivate)) -enum { - SIDEBAR_BRANCH_DUMMY_PROPERTY -}; gboolean sidebar_branch_options_is_hide_if_empty (SidebarBranchOptions self); gboolean sidebar_branch_options_is_auto_open_on_new_child (SidebarBranchOptions self); gboolean sidebar_branch_options_is_startup_expand_to_first_child (SidebarBranchOptions self); gboolean sidebar_branch_options_is_startup_open_grouping (SidebarBranchOptions self); -SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator); -SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator); -static SidebarBranchNode* sidebar_branch_node_new (SidebarEntry* entry, SidebarBranchNode* parent, GCompareFunc comparator); -static SidebarBranchNode* sidebar_branch_node_construct (GType object_type, SidebarEntry* entry, SidebarBranchNode* parent, GCompareFunc comparator); -void sidebar_branch_set_show_branch (SidebarBranch* self, gboolean shown); +SidebarBranch* sidebar_branch_new (SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator); +SidebarBranch* sidebar_branch_construct (GType object_type, + SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator); +static SidebarBranchNode* sidebar_branch_node_new (SidebarEntry* entry, + SidebarBranchNode* parent, + GCompareFunc comparator); +static SidebarBranchNode* sidebar_branch_node_construct (GType object_type, + SidebarEntry* entry, + SidebarBranchNode* parent, + GCompareFunc comparator); +void sidebar_branch_set_show_branch (SidebarBranch* self, + gboolean shown); SidebarEntry* sidebar_branch_get_root (SidebarBranch* self); gboolean sidebar_branch_get_show_branch (SidebarBranch* self); gboolean sidebar_branch_is_auto_open_on_new_child (SidebarBranch* self); gboolean sidebar_branch_is_startup_expand_to_first_child (SidebarBranch* self); gboolean sidebar_branch_is_startup_open_grouping (SidebarBranch* self); -void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator); -static void sidebar_branch_node_add_child (SidebarBranchNode* self, SidebarBranchNode* child); -void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry); -static void sidebar_branch_node_prune_children (SidebarBranchNode* self, SidebarBranchNodePruneCallback cb, void* cb_target); -static void sidebar_branch_prune_callback (SidebarBranch* self, SidebarBranchNode* node); -static void _sidebar_branch_prune_callback_sidebar_branch_node_prune_callback (SidebarBranchNode* node, gpointer self); -static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBranchNode* child); +void sidebar_branch_graft (SidebarBranch* self, + SidebarEntry* parent, + SidebarEntry* entry, + GCompareFunc comparator); +static void sidebar_branch_node_add_child (SidebarBranchNode* self, + SidebarBranchNode* child); +void sidebar_branch_prune (SidebarBranch* self, + SidebarEntry* entry); +static void sidebar_branch_node_prune_children (SidebarBranchNode* self, + SidebarBranchNodePruneCallback cb, + void* cb_target); +static void sidebar_branch_prune_callback (SidebarBranch* self, + SidebarBranchNode* node); +static void _sidebar_branch_prune_callback_sidebar_branch_node_prune_callback (SidebarBranchNode* node, + gpointer self); +static void sidebar_branch_node_remove_child (SidebarBranchNode* self, + SidebarBranchNode* child); static gboolean sidebar_branch_node_has_children (SidebarBranchNode* self); -void sidebar_branch_reparent (SidebarBranch* self, SidebarEntry* new_parent, SidebarEntry* entry); -gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry); -void sidebar_branch_reorder (SidebarBranch* self, SidebarEntry* entry); -static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self, SidebarBranchNode* child); +void sidebar_branch_reparent (SidebarBranch* self, + SidebarEntry* new_parent, + SidebarEntry* entry); +gboolean sidebar_branch_has_entry (SidebarBranch* self, + SidebarEntry* entry); +void sidebar_branch_reorder (SidebarBranch* self, + SidebarEntry* entry); +static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self, + SidebarBranchNode* child); void sidebar_branch_reorder_all (SidebarBranch* self); -static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gboolean recursive, SidebarBranchNodeChildrenReorderedCallback cb, void* cb_target); -static void sidebar_branch_children_reordered_callback (SidebarBranch* self, SidebarBranchNode* node); -static void _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback (SidebarBranchNode* node, gpointer self); -void sidebar_branch_reorder_children (SidebarBranch* self, SidebarEntry* entry, gboolean recursive); -void sidebar_branch_change_all_comparators (SidebarBranch* self, GCompareFunc comparator); -static void sidebar_branch_node_change_comparator (SidebarBranchNode* self, GCompareFunc comparator, gboolean recursive, SidebarBranchNodeChildrenReorderedCallback cb, void* cb_target); -void sidebar_branch_change_comparator (SidebarBranch* self, SidebarEntry* entry, gboolean recursive, GCompareFunc comparator); -gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent); -GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent); -SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry* parent, Locator locator, void* locator_target); -SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry); -SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self, SidebarEntry* entry); -SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self, SidebarEntry* entry); -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -enum { - SIDEBAR_BRANCH_NODE_DUMMY_PROPERTY -}; -static gint sidebar_branch_node_comparator_wrapper (SidebarBranchNode* anode, SidebarBranchNode* bnode); -static gint _sidebar_branch_node_comparator_wrapper_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); -static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self, SidebarBranchNode* child); +static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, + gboolean recursive, + SidebarBranchNodeChildrenReorderedCallback cb, + void* cb_target); +static void sidebar_branch_children_reordered_callback (SidebarBranch* self, + SidebarBranchNode* node); +static void _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback (SidebarBranchNode* node, + gpointer self); +void sidebar_branch_reorder_children (SidebarBranch* self, + SidebarEntry* entry, + gboolean recursive); +void sidebar_branch_change_all_comparators (SidebarBranch* self, + GCompareFunc comparator); +static void sidebar_branch_node_change_comparator (SidebarBranchNode* self, + GCompareFunc comparator, + gboolean recursive, + SidebarBranchNodeChildrenReorderedCallback cb, + void* cb_target); +void sidebar_branch_change_comparator (SidebarBranch* self, + SidebarEntry* entry, + gboolean recursive, + GCompareFunc comparator); +gint sidebar_branch_get_child_count (SidebarBranch* self, + SidebarEntry* parent); +GeeList* sidebar_branch_get_children (SidebarBranch* self, + SidebarEntry* parent); +SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, + SidebarEntry* parent, + Locator locator, + void* locator_target); +SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, + SidebarEntry* entry); +SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self, + SidebarEntry* entry); +SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self, + SidebarEntry* entry); +static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static gint sidebar_branch_node_comparator_wrapper (SidebarBranchNode* anode, + SidebarBranchNode* bnode); +static gint _sidebar_branch_node_comparator_wrapper_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self); +static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self, + SidebarBranchNode* child); static void sidebar_branch_node_finalize (SidebarBranchNode * obj); static void sidebar_branch_finalize (GObject * obj); -gboolean sidebar_branch_options_is_hide_if_empty (SidebarBranchOptions self) { +gboolean +sidebar_branch_options_is_hide_if_empty (SidebarBranchOptions self) +{ gboolean result = FALSE; #line 19 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = (self & SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY) != 0; #line 19 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 212 "Branch.c" +#line 280 "Branch.c" } -gboolean sidebar_branch_options_is_auto_open_on_new_child (SidebarBranchOptions self) { +gboolean +sidebar_branch_options_is_auto_open_on_new_child (SidebarBranchOptions self) +{ gboolean result = FALSE; #line 23 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = (self & SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD) != 0; #line 23 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 222 "Branch.c" +#line 292 "Branch.c" } -gboolean sidebar_branch_options_is_startup_expand_to_first_child (SidebarBranchOptions self) { +gboolean +sidebar_branch_options_is_startup_expand_to_first_child (SidebarBranchOptions self) +{ gboolean result = FALSE; #line 27 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = (self & SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD) != 0; #line 27 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 232 "Branch.c" +#line 304 "Branch.c" } -gboolean sidebar_branch_options_is_startup_open_grouping (SidebarBranchOptions self) { +gboolean +sidebar_branch_options_is_startup_open_grouping (SidebarBranchOptions self) +{ gboolean result = FALSE; #line 31 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = (self & SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING) != 0; #line 31 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 242 "Branch.c" +#line 316 "Branch.c" } -GType sidebar_branch_options_get_type (void) { +GType +sidebar_branch_options_get_type (void) +{ static volatile gsize sidebar_branch_options_type_id__volatile = 0; if (g_once_init_enter (&sidebar_branch_options_type_id__volatile)) { static const GFlagsValue values[] = {{SIDEBAR_BRANCH_OPTIONS_NONE, "SIDEBAR_BRANCH_OPTIONS_NONE", "none"}, {SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY, "SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY", "hide-if-empty"}, {SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD, "SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD", "auto-open-on-new-child"}, {SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD, "SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD", "startup-expand-to-first-child"}, {SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING, "SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING", "startup-open-grouping"}, {0, NULL, NULL}}; @@ -254,97 +330,84 @@ GType sidebar_branch_options_get_type (void) { } -SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator) { +SidebarBranch* +sidebar_branch_construct (GType object_type, + SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator) +{ SidebarBranch * self = NULL; - GCompareFunc _tmp0_; - GCompareFunc _tmp1_ = NULL; - GCompareFunc _tmp2_; - SidebarEntry* _tmp5_; - SidebarBranchNode* _tmp6_; - SidebarBranchOptions _tmp7_; - GeeHashMap* _tmp8_; - SidebarEntry* _tmp9_; - SidebarBranchNode* _tmp10_; - SidebarBranchOptions _tmp11_; - gboolean _tmp12_; + GCompareFunc _tmp0_ = NULL; + SidebarBranchNode* _tmp1_; + GeeHashMap* _tmp2_; + SidebarBranchNode* _tmp3_; #line 206 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (root), NULL); #line 206 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self = (SidebarBranch*) g_object_new (object_type, NULL); #line 208 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp0_ = default_comparator; -#line 208 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - self->priv->default_comparator = _tmp0_; -#line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp2_ = root_comparator; + self->priv->default_comparator = default_comparator; #line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp2_ != NULL) { -#line 283 "Branch.c" - GCompareFunc _tmp3_; + if (root_comparator != NULL) { #line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = root_comparator; -#line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = _tmp3_; -#line 289 "Branch.c" + _tmp0_ = root_comparator; +#line 356 "Branch.c" } else { - GCompareFunc _tmp4_; -#line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp4_ = default_comparator; #line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = _tmp4_; -#line 296 "Branch.c" + _tmp0_ = default_comparator; +#line 360 "Branch.c" } #line 209 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp5_ = root; -#line 209 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp6_ = sidebar_branch_node_new (_tmp5_, NULL, _tmp1_); + _tmp1_ = sidebar_branch_node_new (root, NULL, _tmp0_); #line 209 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (self->priv->root); #line 209 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - self->priv->root = _tmp6_; -#line 211 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp7_ = options; + self->priv->root = _tmp1_; #line 211 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - self->priv->options = _tmp7_; + self->priv->options = options; #line 213 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp8_ = self->priv->map; + _tmp2_ = self->priv->map; #line 213 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp9_ = root; + _tmp3_ = self->priv->root; #line 213 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp10_ = self->priv->root; -#line 213 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, _tmp10_); -#line 215 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp11_ = options; + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), root, _tmp3_); #line 215 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp12_ = sidebar_branch_options_is_hide_if_empty (_tmp11_); -#line 215 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp12_) { + if (sidebar_branch_options_is_hide_if_empty (options)) { #line 216 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_set_show_branch (self, FALSE); -#line 326 "Branch.c" +#line 380 "Branch.c" } #line 206 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return self; -#line 330 "Branch.c" +#line 384 "Branch.c" } -SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator) { +SidebarBranch* +sidebar_branch_new (SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator) +{ #line 206 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return sidebar_branch_construct (SIDEBAR_TYPE_BRANCH, root, options, default_comparator, root_comparator); -#line 337 "Branch.c" +#line 396 "Branch.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 220 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return self ? g_object_ref (self) : NULL; -#line 344 "Branch.c" +#line 405 "Branch.c" } -SidebarEntry* sidebar_branch_get_root (SidebarBranch* self) { +SidebarEntry* +sidebar_branch_get_root (SidebarBranch* self) +{ SidebarEntry* result = NULL; SidebarBranchNode* _tmp0_; SidebarEntry* _tmp1_; @@ -361,40 +424,36 @@ SidebarEntry* sidebar_branch_get_root (SidebarBranch* self) { result = _tmp2_; #line 220 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 365 "Branch.c" +#line 428 "Branch.c" } -void sidebar_branch_set_show_branch (SidebarBranch* self, gboolean shown) { +void +sidebar_branch_set_show_branch (SidebarBranch* self, + gboolean shown) +{ gboolean _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_; - gboolean _tmp3_; #line 223 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 224 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp0_ = self->priv->shown; #line 224 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = shown; -#line 224 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp0_ == _tmp1_) { + if (_tmp0_ == shown) { #line 225 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return; -#line 384 "Branch.c" +#line 445 "Branch.c" } #line 227 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp2_ = shown; -#line 227 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - self->priv->shown = _tmp2_; + self->priv->shown = shown; #line 228 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = shown; -#line 228 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_SHOW_BRANCH_SIGNAL], 0, _tmp3_); -#line 394 "Branch.c" + g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_SHOW_BRANCH_SIGNAL], 0, shown); +#line 451 "Branch.c" } -gboolean sidebar_branch_get_show_branch (SidebarBranch* self) { +gboolean +sidebar_branch_get_show_branch (SidebarBranch* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 231 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -405,87 +464,79 @@ gboolean sidebar_branch_get_show_branch (SidebarBranch* self) { result = _tmp0_; #line 232 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 409 "Branch.c" +#line 468 "Branch.c" } -gboolean sidebar_branch_is_auto_open_on_new_child (SidebarBranch* self) { +gboolean +sidebar_branch_is_auto_open_on_new_child (SidebarBranch* self) +{ gboolean result = FALSE; SidebarBranchOptions _tmp0_; - gboolean _tmp1_; #line 235 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE); #line 236 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp0_ = self->priv->options; #line 236 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = sidebar_branch_options_is_auto_open_on_new_child (_tmp0_); -#line 236 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - result = _tmp1_; + result = sidebar_branch_options_is_auto_open_on_new_child (_tmp0_); #line 236 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 427 "Branch.c" +#line 485 "Branch.c" } -gboolean sidebar_branch_is_startup_expand_to_first_child (SidebarBranch* self) { +gboolean +sidebar_branch_is_startup_expand_to_first_child (SidebarBranch* self) +{ gboolean result = FALSE; SidebarBranchOptions _tmp0_; - gboolean _tmp1_; #line 239 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE); #line 240 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp0_ = self->priv->options; #line 240 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = sidebar_branch_options_is_startup_expand_to_first_child (_tmp0_); -#line 240 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - result = _tmp1_; + result = sidebar_branch_options_is_startup_expand_to_first_child (_tmp0_); #line 240 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 445 "Branch.c" +#line 502 "Branch.c" } -gboolean sidebar_branch_is_startup_open_grouping (SidebarBranch* self) { +gboolean +sidebar_branch_is_startup_open_grouping (SidebarBranch* self) +{ gboolean result = FALSE; SidebarBranchOptions _tmp0_; - gboolean _tmp1_; #line 243 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE); #line 244 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp0_ = self->priv->options; #line 244 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = sidebar_branch_options_is_startup_open_grouping (_tmp0_); -#line 244 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - result = _tmp1_; + result = sidebar_branch_options_is_startup_open_grouping (_tmp0_); #line 244 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 463 "Branch.c" +#line 519 "Branch.c" } -void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator) { +void +sidebar_branch_graft (SidebarBranch* self, + SidebarEntry* parent, + SidebarEntry* entry, + GCompareFunc comparator) +{ GeeHashMap* _tmp0_; - SidebarEntry* _tmp1_; - gboolean _tmp2_; - GeeHashMap* _tmp3_; - SidebarEntry* _tmp4_; - gboolean _tmp5_; - SidebarBranchOptions _tmp6_; - gboolean _tmp7_; + GeeHashMap* _tmp1_; + SidebarBranchOptions _tmp2_; SidebarBranchNode* parent_node = NULL; - GeeHashMap* _tmp8_; - SidebarEntry* _tmp9_; - gpointer _tmp10_; - GCompareFunc _tmp11_ = NULL; - GCompareFunc _tmp12_; + GeeHashMap* _tmp3_; + gpointer _tmp4_; + GCompareFunc _tmp5_ = NULL; SidebarBranchNode* entry_node = NULL; - SidebarEntry* _tmp15_; - SidebarBranchNode* _tmp16_; - SidebarBranchNode* _tmp17_; - SidebarBranchNode* _tmp18_; - GeeHashMap* _tmp19_; - SidebarEntry* _tmp20_; - SidebarEntry* _tmp21_; + SidebarBranchNode* _tmp7_; + SidebarBranchNode* _tmp8_; + SidebarBranchNode* _tmp9_; + GeeHashMap* _tmp10_; #line 247 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 247 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -495,239 +546,193 @@ void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEnt #line 249 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp0_ = self->priv->map; #line 249 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = parent; -#line 249 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 249 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp2_, "map.has_key(parent)"); + _vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), parent), "map.has_key(parent)"); #line 250 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = self->priv->map; -#line 250 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp4_ = entry; + _tmp1_ = self->priv->map; #line 250 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); -#line 250 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (!_tmp5_, "!map.has_key(entry)"); -#line 252 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp6_ = self->priv->options; + _vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry), "!map.has_key(entry)"); #line 252 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp7_ = sidebar_branch_options_is_hide_if_empty (_tmp6_); + _tmp2_ = self->priv->options; #line 252 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp7_) { + if (sidebar_branch_options_is_hide_if_empty (_tmp2_)) { #line 253 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_set_show_branch (self, TRUE); -#line 520 "Branch.c" +#line 561 "Branch.c" } #line 255 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp8_ = self->priv->map; -#line 255 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp9_ = parent; + _tmp3_ = self->priv->map; #line 255 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp10_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_); + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), parent); #line 255 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - parent_node = (SidebarBranchNode*) _tmp10_; -#line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp12_ = comparator; -#line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp12_ != NULL) { -#line 534 "Branch.c" - GCompareFunc _tmp13_; + parent_node = (SidebarBranchNode*) _tmp4_; #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp13_ = comparator; + if (comparator != NULL) { #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp11_ = _tmp13_; -#line 540 "Branch.c" + _tmp5_ = comparator; +#line 573 "Branch.c" } else { - GCompareFunc _tmp14_; + GCompareFunc _tmp6_; #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp14_ = self->priv->default_comparator; + _tmp6_ = self->priv->default_comparator; #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp11_ = _tmp14_; -#line 547 "Branch.c" + _tmp5_ = _tmp6_; +#line 580 "Branch.c" } #line 256 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp15_ = entry; + _tmp7_ = parent_node; #line 256 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp16_ = parent_node; + _tmp8_ = sidebar_branch_node_new (entry, _tmp7_, _tmp5_); #line 256 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp17_ = sidebar_branch_node_new (_tmp15_, _tmp16_, _tmp11_); -#line 256 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - entry_node = _tmp17_; + entry_node = _tmp8_; #line 259 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp18_ = parent_node; + _tmp9_ = parent_node; #line 259 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - sidebar_branch_node_add_child (_tmp18_, entry_node); -#line 260 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp19_ = self->priv->map; + sidebar_branch_node_add_child (_tmp9_, entry_node); #line 260 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp20_ = entry; + _tmp10_ = self->priv->map; #line 260 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_, entry_node); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, entry_node); #line 262 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp21_ = entry; -#line 262 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_ADDED_SIGNAL], 0, _tmp21_); + g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_ADDED_SIGNAL], 0, entry); #line 247 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (entry_node); #line 247 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (parent_node); -#line 575 "Branch.c" +#line 602 "Branch.c" } -static void _sidebar_branch_prune_callback_sidebar_branch_node_prune_callback (SidebarBranchNode* node, gpointer self) { +static void +_sidebar_branch_prune_callback_sidebar_branch_node_prune_callback (SidebarBranchNode* node, + gpointer self) +{ #line 272 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_prune_callback ((SidebarBranch*) self, node); -#line 582 "Branch.c" +#line 612 "Branch.c" } -void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry) { - SidebarEntry* _tmp0_; - SidebarBranchNode* _tmp1_; - SidebarEntry* _tmp2_; - GeeHashMap* _tmp3_; - SidebarEntry* _tmp4_; - gboolean _tmp5_; +void +sidebar_branch_prune (SidebarBranch* self, + SidebarEntry* entry) +{ + SidebarBranchNode* _tmp0_; + SidebarEntry* _tmp1_; + GeeHashMap* _tmp2_; SidebarBranchNode* entry_node = NULL; - GeeHashMap* _tmp6_; - SidebarEntry* _tmp7_; - gpointer _tmp8_; + GeeHashMap* _tmp3_; + gpointer _tmp4_; + SidebarBranchNode* _tmp5_; + SidebarBranchNode* _tmp6_; + SidebarBranchNode* _tmp7_; + SidebarBranchNode* _tmp8_; SidebarBranchNode* _tmp9_; SidebarBranchNode* _tmp10_; - SidebarBranchNode* _tmp11_; - SidebarBranchNode* _tmp12_; - SidebarBranchNode* _tmp13_; - SidebarBranchNode* _tmp14_; gboolean removed = FALSE; - GeeHashMap* _tmp15_; - SidebarEntry* _tmp16_; - gboolean _tmp17_; - gboolean _tmp18_; - SidebarEntry* _tmp19_; - gboolean _tmp20_ = FALSE; - SidebarBranchOptions _tmp21_; - gboolean _tmp22_; + GeeHashMap* _tmp11_; + gboolean _tmp12_; + gboolean _tmp13_; + gboolean _tmp14_ = FALSE; + SidebarBranchOptions _tmp15_; #line 266 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 266 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); #line 267 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp0_ = entry; -#line 267 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = self->priv->root; + _tmp0_ = self->priv->root; #line 267 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp2_ = _tmp1_->entry; + _tmp1_ = _tmp0_->entry; #line 267 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp0_ != _tmp2_, "entry != root.entry"); -#line 268 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = self->priv->map; -#line 268 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp4_ = entry; + _vala_assert (entry != _tmp1_, "entry != root.entry"); #line 268 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp2_ = self->priv->map; #line 268 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp5_, "map.has_key(entry)"); -#line 270 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp6_ = self->priv->map; + _vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry), "map.has_key(entry)"); #line 270 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp7_ = entry; + _tmp3_ = self->priv->map; #line 270 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_); + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry); #line 270 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - entry_node = (SidebarBranchNode*) _tmp8_; + entry_node = (SidebarBranchNode*) _tmp4_; #line 272 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp9_ = entry_node; + _tmp5_ = entry_node; #line 272 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - sidebar_branch_node_prune_children (_tmp9_, _sidebar_branch_prune_callback_sidebar_branch_node_prune_callback, self); + sidebar_branch_node_prune_children (_tmp5_, _sidebar_branch_prune_callback_sidebar_branch_node_prune_callback, self); #line 274 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp10_ = entry_node; + _tmp6_ = entry_node; #line 274 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp11_ = _tmp10_->parent; + _tmp7_ = _tmp6_->parent; #line 274 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp11_ != NULL, "entry_node.parent != null"); + _vala_assert (_tmp7_ != NULL, "entry_node.parent != null"); #line 275 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp12_ = entry_node; + _tmp8_ = entry_node; #line 275 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp13_ = _tmp12_->parent; + _tmp9_ = _tmp8_->parent; #line 275 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp14_ = entry_node; + _tmp10_ = entry_node; #line 275 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - sidebar_branch_node_remove_child (_tmp13_, _tmp14_); -#line 277 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp15_ = self->priv->map; + sidebar_branch_node_remove_child (_tmp9_, _tmp10_); #line 277 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp16_ = entry; + _tmp11_ = self->priv->map; #line 277 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp17_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_, NULL); + _tmp12_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, NULL); #line 277 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - removed = _tmp17_; + removed = _tmp12_; #line 278 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp18_ = removed; + _tmp13_ = removed; #line 278 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp18_, "removed"); + _vala_assert (_tmp13_, "removed"); #line 280 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp19_ = entry; -#line 280 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REMOVED_SIGNAL], 0, _tmp19_); -#line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp21_ = self->priv->options; + g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REMOVED_SIGNAL], 0, entry); #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp22_ = sidebar_branch_options_is_hide_if_empty (_tmp21_); + _tmp15_ = self->priv->options; #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp22_) { -#line 680 "Branch.c" - SidebarBranchNode* _tmp23_; - gboolean _tmp24_; + if (sidebar_branch_options_is_hide_if_empty (_tmp15_)) { +#line 692 "Branch.c" + SidebarBranchNode* _tmp16_; #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp23_ = self->priv->root; + _tmp16_ = self->priv->root; #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp24_ = sidebar_branch_node_has_children (_tmp23_); -#line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp20_ = !_tmp24_; -#line 689 "Branch.c" + _tmp14_ = !sidebar_branch_node_has_children (_tmp16_); +#line 698 "Branch.c" } else { #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp20_ = FALSE; -#line 693 "Branch.c" + _tmp14_ = FALSE; +#line 702 "Branch.c" } #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp20_) { + if (_tmp14_) { #line 283 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_set_show_branch (self, FALSE); -#line 699 "Branch.c" +#line 708 "Branch.c" } #line 266 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (entry_node); -#line 703 "Branch.c" +#line 712 "Branch.c" } -void sidebar_branch_reparent (SidebarBranch* self, SidebarEntry* new_parent, SidebarEntry* entry) { - SidebarEntry* _tmp0_; - SidebarBranchNode* _tmp1_; - SidebarEntry* _tmp2_; +void +sidebar_branch_reparent (SidebarBranch* self, + SidebarEntry* new_parent, + SidebarEntry* entry) +{ + SidebarBranchNode* _tmp0_; + SidebarEntry* _tmp1_; + GeeHashMap* _tmp2_; GeeHashMap* _tmp3_; - SidebarEntry* _tmp4_; - gboolean _tmp5_; - GeeHashMap* _tmp6_; - SidebarEntry* _tmp7_; - gboolean _tmp8_; SidebarBranchNode* entry_node = NULL; - GeeHashMap* _tmp9_; - SidebarEntry* _tmp10_; - gpointer _tmp11_; + GeeHashMap* _tmp4_; + gpointer _tmp5_; SidebarBranchNode* new_parent_node = NULL; - GeeHashMap* _tmp12_; - SidebarEntry* _tmp13_; - gpointer _tmp14_; - SidebarBranchNode* _tmp15_; + GeeHashMap* _tmp6_; + gpointer _tmp7_; + SidebarBranchNode* _tmp8_; SidebarEntry* old_parent = NULL; - SidebarBranchNode* _tmp16_; - SidebarEntry* _tmp17_; - SidebarEntry* _tmp18_; - SidebarBranchNode* _tmp19_; - SidebarEntry* _tmp20_; + SidebarBranchNode* _tmp9_; + SidebarEntry* _tmp10_; + SidebarEntry* _tmp11_; + SidebarBranchNode* _tmp12_; #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -735,83 +740,69 @@ void sidebar_branch_reparent (SidebarBranch* self, SidebarEntry* new_parent, Sid #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); #line 288 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp0_ = entry; -#line 288 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = self->priv->root; + _tmp0_ = self->priv->root; #line 288 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp2_ = _tmp1_->entry; + _tmp1_ = _tmp0_->entry; #line 288 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp0_ != _tmp2_, "entry != root.entry"); -#line 289 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = self->priv->map; -#line 289 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp4_ = entry; + _vala_assert (entry != _tmp1_, "entry != root.entry"); #line 289 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp2_ = self->priv->map; #line 289 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp5_, "map.has_key(entry)"); + _vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry), "map.has_key(entry)"); #line 290 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp6_ = self->priv->map; -#line 290 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp7_ = new_parent; -#line 290 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp8_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_); + _tmp3_ = self->priv->map; #line 290 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp8_, "map.has_key(new_parent)"); + _vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), new_parent), "map.has_key(new_parent)"); #line 292 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp9_ = self->priv->map; + _tmp4_ = self->priv->map; #line 292 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp10_ = entry; + _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry); #line 292 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp11_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_); -#line 292 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - entry_node = (SidebarBranchNode*) _tmp11_; -#line 293 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp12_ = self->priv->map; + entry_node = (SidebarBranchNode*) _tmp5_; #line 293 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp13_ = new_parent; + _tmp6_ = self->priv->map; #line 293 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp14_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_); + _tmp7_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), new_parent); #line 293 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - new_parent_node = (SidebarBranchNode*) _tmp14_; + new_parent_node = (SidebarBranchNode*) _tmp7_; #line 295 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp15_ = entry_node->parent; + _tmp8_ = entry_node->parent; #line 295 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp15_ != NULL, "entry_node.parent != null"); + _vala_assert (_tmp8_ != NULL, "entry_node.parent != null"); #line 296 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp16_ = entry_node->parent; + _tmp9_ = entry_node->parent; #line 296 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp17_ = _tmp16_->entry; + _tmp10_ = _tmp9_->entry; #line 296 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp18_ = _g_object_ref0 (_tmp17_); + _tmp11_ = _g_object_ref0 (_tmp10_); #line 296 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - old_parent = _tmp18_; + old_parent = _tmp11_; #line 298 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp19_ = entry_node->parent; + _tmp12_ = entry_node->parent; #line 298 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - sidebar_branch_node_remove_child (_tmp19_, entry_node); + sidebar_branch_node_remove_child (_tmp12_, entry_node); #line 299 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_node_add_child (new_parent_node, entry_node); #line 301 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp20_ = entry; -#line 301 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REPARENTED_SIGNAL], 0, _tmp20_, old_parent); + g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REPARENTED_SIGNAL], 0, entry, old_parent); #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (old_parent); #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (new_parent_node); #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (entry_node); -#line 806 "Branch.c" +#line 795 "Branch.c" } -gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry) { +gboolean +sidebar_branch_has_entry (SidebarBranch* self, + SidebarEntry* entry) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; SidebarBranchNode* _tmp1_; SidebarEntry* _tmp2_; - SidebarEntry* _tmp3_; #line 304 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE); #line 304 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -821,111 +812,98 @@ gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry) { #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp2_ = _tmp1_->entry; #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = entry; -#line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp2_ == _tmp3_) { + if (_tmp2_ == entry) { #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp0_ = TRUE; -#line 830 "Branch.c" +#line 819 "Branch.c" } else { - GeeHashMap* _tmp4_; - SidebarEntry* _tmp5_; - gboolean _tmp6_; -#line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp4_ = self->priv->map; + GeeHashMap* _tmp3_; #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp5_ = entry; + _tmp3_ = self->priv->map; #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp6_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_); -#line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp0_ = _tmp6_; -#line 843 "Branch.c" + _tmp0_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry); +#line 826 "Branch.c" } #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = _tmp0_; #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 849 "Branch.c" +#line 832 "Branch.c" } -void sidebar_branch_reorder (SidebarBranch* self, SidebarEntry* entry) { - SidebarEntry* _tmp0_; - SidebarBranchNode* _tmp1_; - SidebarEntry* _tmp2_; +void +sidebar_branch_reorder (SidebarBranch* self, + SidebarEntry* entry) +{ + SidebarBranchNode* _tmp0_; + SidebarEntry* _tmp1_; SidebarBranchNode* entry_node = NULL; - GeeHashMap* _tmp3_; - SidebarEntry* _tmp4_; - gpointer _tmp5_; + GeeHashMap* _tmp2_; + gpointer _tmp3_; + SidebarBranchNode* _tmp4_; + SidebarBranchNode* _tmp5_; SidebarBranchNode* _tmp6_; SidebarBranchNode* _tmp7_; SidebarBranchNode* _tmp8_; SidebarBranchNode* _tmp9_; - SidebarBranchNode* _tmp10_; - SidebarBranchNode* _tmp11_; - gboolean _tmp12_; #line 310 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 310 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); #line 311 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp0_ = entry; -#line 311 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = self->priv->root; + _tmp0_ = self->priv->root; #line 311 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp2_ = _tmp1_->entry; + _tmp1_ = _tmp0_->entry; #line 311 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp0_ != _tmp2_, "entry != root.entry"); -#line 313 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = self->priv->map; + _vala_assert (entry != _tmp1_, "entry != root.entry"); #line 313 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp4_ = entry; + _tmp2_ = self->priv->map; #line 313 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry); #line 313 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - entry_node = (SidebarBranchNode*) _tmp5_; + entry_node = (SidebarBranchNode*) _tmp3_; #line 314 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp6_ = entry_node; + _tmp4_ = entry_node; #line 314 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp6_ != NULL, "entry_node != null"); + _vala_assert (_tmp4_ != NULL, "entry_node != null"); #line 316 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp7_ = entry_node; + _tmp5_ = entry_node; #line 316 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp8_ = _tmp7_->parent; + _tmp6_ = _tmp5_->parent; #line 316 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp8_ != NULL, "entry_node.parent != null"); + _vala_assert (_tmp6_ != NULL, "entry_node.parent != null"); #line 317 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp9_ = entry_node; -#line 317 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp10_ = _tmp9_->parent; + _tmp7_ = entry_node; #line 317 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp11_ = entry_node; + _tmp8_ = _tmp7_->parent; #line 317 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp12_ = sidebar_branch_node_reorder_child (_tmp10_, _tmp11_); + _tmp9_ = entry_node; #line 317 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp12_) { -#line 908 "Branch.c" - SidebarEntry* _tmp13_; -#line 318 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp13_ = entry; + if (sidebar_branch_node_reorder_child (_tmp8_, _tmp9_)) { #line 318 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_MOVED_SIGNAL], 0, _tmp13_); -#line 914 "Branch.c" + g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_MOVED_SIGNAL], 0, entry); +#line 887 "Branch.c" } #line 310 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (entry_node); -#line 918 "Branch.c" +#line 891 "Branch.c" } -static void _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback (SidebarBranchNode* node, gpointer self) { +static void +_sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback (SidebarBranchNode* node, + gpointer self) +{ #line 323 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_children_reordered_callback ((SidebarBranch*) self, node); -#line 925 "Branch.c" +#line 901 "Branch.c" } -void sidebar_branch_reorder_all (SidebarBranch* self) { +void +sidebar_branch_reorder_all (SidebarBranch* self) +{ SidebarBranchNode* _tmp0_; #line 322 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); @@ -933,16 +911,18 @@ void sidebar_branch_reorder_all (SidebarBranch* self) { _tmp0_ = self->priv->root; #line 323 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_node_reorder_children (_tmp0_, TRUE, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self); -#line 937 "Branch.c" +#line 915 "Branch.c" } -void sidebar_branch_reorder_children (SidebarBranch* self, SidebarEntry* entry, gboolean recursive) { +void +sidebar_branch_reorder_children (SidebarBranch* self, + SidebarEntry* entry, + gboolean recursive) +{ SidebarBranchNode* entry_node = NULL; GeeHashMap* _tmp0_; - SidebarEntry* _tmp1_; - gpointer _tmp2_; - gboolean _tmp3_; + gpointer _tmp1_; #line 327 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 327 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -950,45 +930,43 @@ void sidebar_branch_reorder_children (SidebarBranch* self, SidebarEntry* entry, #line 328 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp0_ = self->priv->map; #line 328 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = entry; + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry); #line 328 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 328 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - entry_node = (SidebarBranchNode*) _tmp2_; + entry_node = (SidebarBranchNode*) _tmp1_; #line 329 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _vala_assert (entry_node != NULL, "entry_node != null"); #line 331 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = recursive; -#line 331 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - sidebar_branch_node_reorder_children (entry_node, _tmp3_, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self); + sidebar_branch_node_reorder_children (entry_node, recursive, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self); #line 327 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (entry_node); -#line 967 "Branch.c" +#line 943 "Branch.c" } -void sidebar_branch_change_all_comparators (SidebarBranch* self, GCompareFunc comparator) { +void +sidebar_branch_change_all_comparators (SidebarBranch* self, + GCompareFunc comparator) +{ SidebarBranchNode* _tmp0_; - GCompareFunc _tmp1_; #line 334 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 335 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp0_ = self->priv->root; #line 335 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = comparator; -#line 335 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - sidebar_branch_node_change_comparator (_tmp0_, _tmp1_, TRUE, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self); -#line 982 "Branch.c" + sidebar_branch_node_change_comparator (_tmp0_, comparator, TRUE, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self); +#line 958 "Branch.c" } -void sidebar_branch_change_comparator (SidebarBranch* self, SidebarEntry* entry, gboolean recursive, GCompareFunc comparator) { +void +sidebar_branch_change_comparator (SidebarBranch* self, + SidebarEntry* entry, + gboolean recursive, + GCompareFunc comparator) +{ SidebarBranchNode* entry_node = NULL; GeeHashMap* _tmp0_; - SidebarEntry* _tmp1_; - gpointer _tmp2_; - GCompareFunc _tmp3_; - gboolean _tmp4_; + gpointer _tmp1_; #line 338 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 338 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -996,35 +974,31 @@ void sidebar_branch_change_comparator (SidebarBranch* self, SidebarEntry* entry, #line 340 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp0_ = self->priv->map; #line 340 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = entry; + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry); #line 340 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 340 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - entry_node = (SidebarBranchNode*) _tmp2_; + entry_node = (SidebarBranchNode*) _tmp1_; #line 341 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _vala_assert (entry_node != NULL, "entry_node != null"); #line 343 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = comparator; -#line 343 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp4_ = recursive; -#line 343 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - sidebar_branch_node_change_comparator (entry_node, _tmp3_, _tmp4_, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self); + sidebar_branch_node_change_comparator (entry_node, comparator, recursive, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self); #line 338 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (entry_node); -#line 1015 "Branch.c" +#line 987 "Branch.c" } -gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent) { +gint +sidebar_branch_get_child_count (SidebarBranch* self, + SidebarEntry* parent) +{ gint result = 0; SidebarBranchNode* parent_node = NULL; GeeHashMap* _tmp0_; - SidebarEntry* _tmp1_; - gpointer _tmp2_; - SidebarBranchNode* _tmp3_; - gint _tmp4_ = 0; - SidebarBranchNode* _tmp5_; - GeeSortedSet* _tmp6_; + gpointer _tmp1_; + SidebarBranchNode* _tmp2_; + gint _tmp3_ = 0; + SidebarBranchNode* _tmp4_; + GeeSortedSet* _tmp5_; #line 346 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), 0); #line 346 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1032,65 +1006,63 @@ gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent) #line 347 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp0_ = self->priv->map; #line 347 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = parent; + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), parent); #line 347 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 347 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - parent_node = (SidebarBranchNode*) _tmp2_; + parent_node = (SidebarBranchNode*) _tmp1_; #line 348 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = parent_node; + _tmp2_ = parent_node; #line 348 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp3_ != NULL, "parent_node != null"); + _vala_assert (_tmp2_ != NULL, "parent_node != null"); #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp5_ = parent_node; + _tmp4_ = parent_node; #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp6_ = _tmp5_->children; + _tmp5_ = _tmp4_->children; #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp6_ != NULL) { -#line 1051 "Branch.c" - SidebarBranchNode* _tmp7_; - GeeSortedSet* _tmp8_; + if (_tmp5_ != NULL) { +#line 1023 "Branch.c" + SidebarBranchNode* _tmp6_; + GeeSortedSet* _tmp7_; + gint _tmp8_; gint _tmp9_; - gint _tmp10_; #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp7_ = parent_node; + _tmp6_ = parent_node; #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp8_ = _tmp7_->children; + _tmp7_ = _tmp6_->children; #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp4_ = _tmp10_; -#line 1066 "Branch.c" + _tmp3_ = _tmp9_; +#line 1038 "Branch.c" } else { #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp4_ = 0; -#line 1070 "Branch.c" + _tmp3_ = 0; +#line 1042 "Branch.c" } #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - result = _tmp4_; + result = _tmp3_; #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (parent_node); #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1078 "Branch.c" +#line 1050 "Branch.c" } -GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent) { +GeeList* +sidebar_branch_get_children (SidebarBranch* self, + SidebarEntry* parent) +{ GeeList* result = NULL; GeeHashMap* _tmp0_; - SidebarEntry* _tmp1_; - gboolean _tmp2_; SidebarBranchNode* parent_node = NULL; - GeeHashMap* _tmp3_; - SidebarEntry* _tmp4_; - gpointer _tmp5_; - SidebarBranchNode* _tmp6_; - GeeSortedSet* _tmp7_; + GeeHashMap* _tmp1_; + gpointer _tmp2_; + SidebarBranchNode* _tmp3_; + GeeSortedSet* _tmp4_; GeeList* child_entries = NULL; - GeeArrayList* _tmp8_; + GeeArrayList* _tmp5_; #line 355 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL); #line 355 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1098,93 +1070,84 @@ GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent) #line 356 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp0_ = self->priv->map; #line 356 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = parent; -#line 356 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 356 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp2_, "map.has_key(parent)"); -#line 358 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = self->priv->map; + _vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), parent), "map.has_key(parent)"); #line 358 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp4_ = parent; + _tmp1_ = self->priv->map; #line 358 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), parent); #line 358 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - parent_node = (SidebarBranchNode*) _tmp5_; + parent_node = (SidebarBranchNode*) _tmp2_; #line 359 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp6_ = parent_node; + _tmp3_ = parent_node; #line 359 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp7_ = _tmp6_->children; + _tmp4_ = _tmp3_->children; #line 359 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp7_ == NULL) { + if (_tmp4_ == NULL) { #line 360 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = NULL; #line 360 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (parent_node); #line 360 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1127 "Branch.c" +#line 1093 "Branch.c" } #line 362 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp8_ = gee_array_list_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp5_ = gee_array_list_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 362 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - child_entries = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_LIST, GeeList); -#line 1133 "Branch.c" + child_entries = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_LIST, GeeList); +#line 1099 "Branch.c" { GeeIterator* _child_it = NULL; - SidebarBranchNode* _tmp9_; - GeeSortedSet* _tmp10_; - GeeIterator* _tmp11_; + SidebarBranchNode* _tmp6_; + GeeSortedSet* _tmp7_; + GeeIterator* _tmp8_; #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp9_ = parent_node; + _tmp6_ = parent_node; #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp10_ = _tmp9_->children; + _tmp7_ = _tmp6_->children; #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _child_it = _tmp11_; + _child_it = _tmp8_; #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" while (TRUE) { -#line 1149 "Branch.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 1115 "Branch.c" + GeeIterator* _tmp9_; SidebarBranchNode* child = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; - GeeList* _tmp16_; - SidebarBranchNode* _tmp17_; - SidebarEntry* _tmp18_; -#line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp12_ = _child_it; + GeeIterator* _tmp10_; + gpointer _tmp11_; + GeeList* _tmp12_; + SidebarBranchNode* _tmp13_; + SidebarEntry* _tmp14_; #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp13_ = gee_iterator_next (_tmp12_); + _tmp9_ = _child_it; #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp9_)) { #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" break; -#line 1166 "Branch.c" +#line 1129 "Branch.c" } #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp14_ = _child_it; + _tmp10_ = _child_it; #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp11_ = gee_iterator_get (_tmp10_); #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - child = (SidebarBranchNode*) _tmp15_; + child = (SidebarBranchNode*) _tmp11_; #line 364 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp16_ = child_entries; + _tmp12_ = child_entries; #line 364 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp17_ = child; + _tmp13_ = child; #line 364 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp18_ = _tmp17_->entry; + _tmp14_ = _tmp13_->entry; #line 364 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), _tmp18_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_); #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (child); -#line 1184 "Branch.c" +#line 1147 "Branch.c" } #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (_child_it); -#line 1188 "Branch.c" +#line 1151 "Branch.c" } #line 366 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = child_entries; @@ -1192,19 +1155,23 @@ GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent) _sidebar_branch_node_unref0 (parent_node); #line 366 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1196 "Branch.c" +#line 1159 "Branch.c" } -SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry* parent, Locator locator, void* locator_target) { +SidebarEntry* +sidebar_branch_find_first_child (SidebarBranch* self, + SidebarEntry* parent, + Locator locator, + void* locator_target) +{ SidebarEntry* result = NULL; SidebarBranchNode* parent_node = NULL; GeeHashMap* _tmp0_; - SidebarEntry* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; + SidebarBranchNode* _tmp2_; SidebarBranchNode* _tmp3_; - SidebarBranchNode* _tmp4_; - GeeSortedSet* _tmp5_; + GeeSortedSet* _tmp4_; #line 369 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL); #line 369 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1212,95 +1179,81 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry #line 370 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp0_ = self->priv->map; #line 370 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = parent; + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), parent); #line 370 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 370 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - parent_node = (SidebarBranchNode*) _tmp2_; + parent_node = (SidebarBranchNode*) _tmp1_; #line 371 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = parent_node; + _tmp2_ = parent_node; #line 371 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp3_ != NULL, "parent_node != null"); + _vala_assert (_tmp2_ != NULL, "parent_node != null"); #line 373 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp4_ = parent_node; + _tmp3_ = parent_node; #line 373 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp5_ = _tmp4_->children; + _tmp4_ = _tmp3_->children; #line 373 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp5_ == NULL) { + if (_tmp4_ == NULL) { #line 374 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = NULL; #line 374 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (parent_node); #line 374 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1237 "Branch.c" +#line 1202 "Branch.c" } { GeeIterator* _child_it = NULL; - SidebarBranchNode* _tmp6_; - GeeSortedSet* _tmp7_; - GeeIterator* _tmp8_; + SidebarBranchNode* _tmp5_; + GeeSortedSet* _tmp6_; + GeeIterator* _tmp7_; #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp6_ = parent_node; + _tmp5_ = parent_node; #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp7_ = _tmp6_->children; + _tmp6_ = _tmp5_->children; #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _child_it = _tmp8_; + _child_it = _tmp7_; #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" while (TRUE) { -#line 1254 "Branch.c" - GeeIterator* _tmp9_; - gboolean _tmp10_; +#line 1219 "Branch.c" + GeeIterator* _tmp8_; SidebarBranchNode* child = NULL; - GeeIterator* _tmp11_; - gpointer _tmp12_; - Locator _tmp13_; - void* _tmp13__target; - SidebarBranchNode* _tmp14_; - SidebarEntry* _tmp15_; - gboolean _tmp16_; -#line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp9_ = _child_it; + GeeIterator* _tmp9_; + gpointer _tmp10_; + SidebarBranchNode* _tmp11_; + SidebarEntry* _tmp12_; #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp10_ = gee_iterator_next (_tmp9_); + _tmp8_ = _child_it; #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (!_tmp10_) { + if (!gee_iterator_next (_tmp8_)) { #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" break; -#line 1273 "Branch.c" +#line 1232 "Branch.c" } #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp11_ = _child_it; + _tmp9_ = _child_it; #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp12_ = gee_iterator_get (_tmp11_); + _tmp10_ = gee_iterator_get (_tmp9_); #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - child = (SidebarBranchNode*) _tmp12_; + child = (SidebarBranchNode*) _tmp10_; #line 377 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp13_ = locator; + _tmp11_ = child; #line 377 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp13__target = locator_target; -#line 377 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp14_ = child; + _tmp12_ = _tmp11_->entry; #line 377 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp15_ = _tmp14_->entry; -#line 377 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp16_ = _tmp13_ (_tmp15_, _tmp13__target); -#line 377 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp16_) { -#line 1293 "Branch.c" - SidebarBranchNode* _tmp17_; - SidebarEntry* _tmp18_; - SidebarEntry* _tmp19_; + if (locator (_tmp12_, locator_target)) { +#line 1246 "Branch.c" + SidebarBranchNode* _tmp13_; + SidebarEntry* _tmp14_; + SidebarEntry* _tmp15_; #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp17_ = child; + _tmp13_ = child; #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp18_ = _tmp17_->entry; + _tmp14_ = _tmp13_->entry; #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp19_ = _g_object_ref0 (_tmp18_); + _tmp15_ = _g_object_ref0 (_tmp14_); #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - result = _tmp19_; + result = _tmp15_; #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (child); #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1309,15 +1262,15 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry _sidebar_branch_node_unref0 (parent_node); #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1313 "Branch.c" +#line 1266 "Branch.c" } #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (child); -#line 1317 "Branch.c" +#line 1270 "Branch.c" } #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (_child_it); -#line 1321 "Branch.c" +#line 1274 "Branch.c" } #line 381 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = NULL; @@ -1325,341 +1278,339 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry _sidebar_branch_node_unref0 (parent_node); #line 381 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1329 "Branch.c" +#line 1282 "Branch.c" } -SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry) { +SidebarEntry* +sidebar_branch_get_parent (SidebarBranch* self, + SidebarEntry* entry) +{ SidebarEntry* result = NULL; - SidebarEntry* _tmp0_; - SidebarBranchNode* _tmp1_; - SidebarEntry* _tmp2_; + SidebarBranchNode* _tmp0_; + SidebarEntry* _tmp1_; SidebarBranchNode* entry_node = NULL; - GeeHashMap* _tmp3_; - SidebarEntry* _tmp4_; - gpointer _tmp5_; + GeeHashMap* _tmp2_; + gpointer _tmp3_; + SidebarBranchNode* _tmp4_; + SidebarBranchNode* _tmp5_; SidebarBranchNode* _tmp6_; SidebarBranchNode* _tmp7_; SidebarBranchNode* _tmp8_; - SidebarBranchNode* _tmp9_; - SidebarBranchNode* _tmp10_; - SidebarEntry* _tmp11_; - SidebarEntry* _tmp12_; + SidebarEntry* _tmp9_; + SidebarEntry* _tmp10_; #line 385 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL); #line 385 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL); #line 386 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp0_ = entry; -#line 386 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = self->priv->root; + _tmp0_ = self->priv->root; #line 386 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp2_ = _tmp1_->entry; + _tmp1_ = _tmp0_->entry; #line 386 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp0_ == _tmp2_) { + if (entry == _tmp1_) { #line 387 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = NULL; #line 387 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1365 "Branch.c" +#line 1317 "Branch.c" } #line 389 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = self->priv->map; -#line 389 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp4_ = entry; + _tmp2_ = self->priv->map; #line 389 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry); #line 389 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - entry_node = (SidebarBranchNode*) _tmp5_; + entry_node = (SidebarBranchNode*) _tmp3_; #line 390 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp6_ = entry_node; + _tmp4_ = entry_node; #line 390 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp6_ != NULL, "entry_node != null"); + _vala_assert (_tmp4_ != NULL, "entry_node != null"); #line 391 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp7_ = entry_node; + _tmp5_ = entry_node; #line 391 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp8_ = _tmp7_->parent; + _tmp6_ = _tmp5_->parent; #line 391 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp8_ != NULL, "entry_node.parent != null"); + _vala_assert (_tmp6_ != NULL, "entry_node.parent != null"); #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp9_ = entry_node; + _tmp7_ = entry_node; #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp10_ = _tmp9_->parent; + _tmp8_ = _tmp7_->parent; #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp11_ = _tmp10_->entry; + _tmp9_ = _tmp8_->entry; #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp12_ = _g_object_ref0 (_tmp11_); + _tmp10_ = _g_object_ref0 (_tmp9_); #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - result = _tmp12_; + result = _tmp10_; #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (entry_node); #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1399 "Branch.c" +#line 1349 "Branch.c" } -SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self, SidebarEntry* entry) { +SidebarEntry* +sidebar_branch_get_previous_sibling (SidebarBranch* self, + SidebarEntry* entry) +{ SidebarEntry* result = NULL; - SidebarEntry* _tmp0_; - SidebarBranchNode* _tmp1_; - SidebarEntry* _tmp2_; + SidebarBranchNode* _tmp0_; + SidebarEntry* _tmp1_; SidebarBranchNode* entry_node = NULL; - GeeHashMap* _tmp3_; - SidebarEntry* _tmp4_; - gpointer _tmp5_; + GeeHashMap* _tmp2_; + gpointer _tmp3_; + SidebarBranchNode* _tmp4_; + SidebarBranchNode* _tmp5_; SidebarBranchNode* _tmp6_; SidebarBranchNode* _tmp7_; SidebarBranchNode* _tmp8_; - SidebarBranchNode* _tmp9_; - SidebarBranchNode* _tmp10_; - GeeSortedSet* _tmp11_; + GeeSortedSet* _tmp9_; SidebarBranchNode* sibling = NULL; - SidebarBranchNode* _tmp12_; + SidebarBranchNode* _tmp10_; + SidebarBranchNode* _tmp11_; + GeeSortedSet* _tmp12_; SidebarBranchNode* _tmp13_; - GeeSortedSet* _tmp14_; - SidebarBranchNode* _tmp15_; - gpointer _tmp16_; - SidebarEntry* _tmp17_ = NULL; - SidebarBranchNode* _tmp18_; - SidebarEntry* _tmp21_; + gpointer _tmp14_; + SidebarEntry* _tmp15_ = NULL; + SidebarBranchNode* _tmp16_; + SidebarEntry* _tmp19_; #line 397 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL); #line 397 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL); #line 398 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp0_ = entry; -#line 398 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = self->priv->root; + _tmp0_ = self->priv->root; #line 398 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp2_ = _tmp1_->entry; + _tmp1_ = _tmp0_->entry; #line 398 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp0_ == _tmp2_) { + if (entry == _tmp1_) { #line 399 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = NULL; #line 399 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1443 "Branch.c" +#line 1392 "Branch.c" } #line 401 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = self->priv->map; -#line 401 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp4_ = entry; + _tmp2_ = self->priv->map; #line 401 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry); #line 401 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - entry_node = (SidebarBranchNode*) _tmp5_; + entry_node = (SidebarBranchNode*) _tmp3_; #line 402 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp6_ = entry_node; + _tmp4_ = entry_node; #line 402 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp6_ != NULL, "entry_node != null"); + _vala_assert (_tmp4_ != NULL, "entry_node != null"); #line 403 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp7_ = entry_node; + _tmp5_ = entry_node; #line 403 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp8_ = _tmp7_->parent; + _tmp6_ = _tmp5_->parent; #line 403 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp8_ != NULL, "entry_node.parent != null"); + _vala_assert (_tmp6_ != NULL, "entry_node.parent != null"); #line 404 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp9_ = entry_node; + _tmp7_ = entry_node; #line 404 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp10_ = _tmp9_->parent; + _tmp8_ = _tmp7_->parent; #line 404 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp11_ = _tmp10_->children; + _tmp9_ = _tmp8_->children; #line 404 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp11_ != NULL, "entry_node.parent.children != null"); + _vala_assert (_tmp9_ != NULL, "entry_node.parent.children != null"); #line 406 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp12_ = entry_node; + _tmp10_ = entry_node; #line 406 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp13_ = _tmp12_->parent; + _tmp11_ = _tmp10_->parent; #line 406 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp14_ = _tmp13_->children; + _tmp12_ = _tmp11_->children; #line 406 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp15_ = entry_node; + _tmp13_ = entry_node; #line 406 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp16_ = gee_sorted_set_lower (_tmp14_, _tmp15_); + _tmp14_ = gee_sorted_set_lower (_tmp12_, _tmp13_); #line 406 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - sibling = (SidebarBranchNode*) _tmp16_; + sibling = (SidebarBranchNode*) _tmp14_; #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp18_ = sibling; + _tmp16_ = sibling; #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp18_ != NULL) { -#line 1487 "Branch.c" - SidebarBranchNode* _tmp19_; - SidebarEntry* _tmp20_; + if (_tmp16_ != NULL) { +#line 1434 "Branch.c" + SidebarBranchNode* _tmp17_; + SidebarEntry* _tmp18_; #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp19_ = sibling; + _tmp17_ = sibling; #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp20_ = _tmp19_->entry; + _tmp18_ = _tmp17_->entry; #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp17_ = _tmp20_; -#line 1496 "Branch.c" + _tmp15_ = _tmp18_; +#line 1443 "Branch.c" } else { #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp17_ = NULL; -#line 1500 "Branch.c" + _tmp15_ = NULL; +#line 1447 "Branch.c" } #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp21_ = _g_object_ref0 (_tmp17_); + _tmp19_ = _g_object_ref0 (_tmp15_); #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - result = _tmp21_; + result = _tmp19_; #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (sibling); #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (entry_node); #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1512 "Branch.c" +#line 1459 "Branch.c" } -SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self, SidebarEntry* entry) { +SidebarEntry* +sidebar_branch_get_next_sibling (SidebarBranch* self, + SidebarEntry* entry) +{ SidebarEntry* result = NULL; - SidebarEntry* _tmp0_; - SidebarBranchNode* _tmp1_; - SidebarEntry* _tmp2_; + SidebarBranchNode* _tmp0_; + SidebarEntry* _tmp1_; SidebarBranchNode* entry_node = NULL; - GeeHashMap* _tmp3_; - SidebarEntry* _tmp4_; - gpointer _tmp5_; + GeeHashMap* _tmp2_; + gpointer _tmp3_; + SidebarBranchNode* _tmp4_; + SidebarBranchNode* _tmp5_; SidebarBranchNode* _tmp6_; SidebarBranchNode* _tmp7_; SidebarBranchNode* _tmp8_; - SidebarBranchNode* _tmp9_; - SidebarBranchNode* _tmp10_; - GeeSortedSet* _tmp11_; + GeeSortedSet* _tmp9_; SidebarBranchNode* sibling = NULL; - SidebarBranchNode* _tmp12_; + SidebarBranchNode* _tmp10_; + SidebarBranchNode* _tmp11_; + GeeSortedSet* _tmp12_; SidebarBranchNode* _tmp13_; - GeeSortedSet* _tmp14_; - SidebarBranchNode* _tmp15_; - gpointer _tmp16_; - SidebarEntry* _tmp17_ = NULL; - SidebarBranchNode* _tmp18_; - SidebarEntry* _tmp21_; + gpointer _tmp14_; + SidebarEntry* _tmp15_ = NULL; + SidebarBranchNode* _tmp16_; + SidebarEntry* _tmp19_; #line 412 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL); #line 412 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL); #line 413 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp0_ = entry; -#line 413 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = self->priv->root; + _tmp0_ = self->priv->root; #line 413 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp2_ = _tmp1_->entry; + _tmp1_ = _tmp0_->entry; #line 413 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp0_ == _tmp2_) { + if (entry == _tmp1_) { #line 414 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = NULL; #line 414 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1556 "Branch.c" +#line 1502 "Branch.c" } #line 416 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = self->priv->map; -#line 416 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp4_ = entry; + _tmp2_ = self->priv->map; #line 416 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry); #line 416 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - entry_node = (SidebarBranchNode*) _tmp5_; + entry_node = (SidebarBranchNode*) _tmp3_; #line 417 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp6_ = entry_node; + _tmp4_ = entry_node; #line 417 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp6_ != NULL, "entry_node != null"); + _vala_assert (_tmp4_ != NULL, "entry_node != null"); #line 418 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp7_ = entry_node; + _tmp5_ = entry_node; #line 418 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp8_ = _tmp7_->parent; + _tmp6_ = _tmp5_->parent; #line 418 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp8_ != NULL, "entry_node.parent != null"); + _vala_assert (_tmp6_ != NULL, "entry_node.parent != null"); #line 419 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp9_ = entry_node; + _tmp7_ = entry_node; #line 419 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp10_ = _tmp9_->parent; + _tmp8_ = _tmp7_->parent; #line 419 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp11_ = _tmp10_->children; + _tmp9_ = _tmp8_->children; #line 419 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp11_ != NULL, "entry_node.parent.children != null"); + _vala_assert (_tmp9_ != NULL, "entry_node.parent.children != null"); #line 421 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp12_ = entry_node; + _tmp10_ = entry_node; #line 421 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp13_ = _tmp12_->parent; + _tmp11_ = _tmp10_->parent; #line 421 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp14_ = _tmp13_->children; + _tmp12_ = _tmp11_->children; #line 421 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp15_ = entry_node; + _tmp13_ = entry_node; #line 421 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp16_ = gee_sorted_set_higher (_tmp14_, _tmp15_); + _tmp14_ = gee_sorted_set_higher (_tmp12_, _tmp13_); #line 421 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - sibling = (SidebarBranchNode*) _tmp16_; + sibling = (SidebarBranchNode*) _tmp14_; #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp18_ = sibling; + _tmp16_ = sibling; #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp18_ != NULL) { -#line 1600 "Branch.c" - SidebarBranchNode* _tmp19_; - SidebarEntry* _tmp20_; + if (_tmp16_ != NULL) { +#line 1544 "Branch.c" + SidebarBranchNode* _tmp17_; + SidebarEntry* _tmp18_; #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp19_ = sibling; + _tmp17_ = sibling; #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp20_ = _tmp19_->entry; + _tmp18_ = _tmp17_->entry; #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp17_ = _tmp20_; -#line 1609 "Branch.c" + _tmp15_ = _tmp18_; +#line 1553 "Branch.c" } else { #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp17_ = NULL; -#line 1613 "Branch.c" + _tmp15_ = NULL; +#line 1557 "Branch.c" } #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp21_ = _g_object_ref0 (_tmp17_); + _tmp19_ = _g_object_ref0 (_tmp15_); #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - result = _tmp21_; + result = _tmp19_; #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (sibling); #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (entry_node); #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1625 "Branch.c" +#line 1569 "Branch.c" } -static void sidebar_branch_prune_callback (SidebarBranch* self, SidebarBranchNode* node) { - SidebarBranchNode* _tmp0_; - SidebarEntry* _tmp1_; +static void +sidebar_branch_prune_callback (SidebarBranch* self, + SidebarBranchNode* node) +{ + SidebarEntry* _tmp0_; #line 426 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 426 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (node)); #line 427 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp0_ = node; -#line 427 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = _tmp0_->entry; + _tmp0_ = node->entry; #line 427 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REMOVED_SIGNAL], 0, _tmp1_); -#line 1642 "Branch.c" + g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REMOVED_SIGNAL], 0, _tmp0_); +#line 1586 "Branch.c" } -static void sidebar_branch_children_reordered_callback (SidebarBranch* self, SidebarBranchNode* node) { - SidebarBranchNode* _tmp0_; - SidebarEntry* _tmp1_; +static void +sidebar_branch_children_reordered_callback (SidebarBranch* self, + SidebarBranchNode* node) +{ + SidebarEntry* _tmp0_; #line 430 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 430 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (node)); #line 431 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp0_ = node; + _tmp0_ = node->entry; #line 431 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = _tmp0_->entry; -#line 431 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_CHILDREN_REORDERED_SIGNAL], 0, _tmp1_); -#line 1659 "Branch.c" + g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_CHILDREN_REORDERED_SIGNAL], 0, _tmp0_); +#line 1603 "Branch.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2); register GMarshalFunc_VOID__OBJECT_OBJECT callback; register GCClosure * cc; @@ -1674,28 +1625,30 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa data1 = closure->data; #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" data2 = param_values->data[0].v_pointer; -#line 1678 "Branch.c" +#line 1629 "Branch.c" } else { #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" data1 = param_values->data[0].v_pointer; #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" data2 = closure->data; -#line 1684 "Branch.c" +#line 1635 "Branch.c" } #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 1690 "Branch.c" +#line 1641 "Branch.c" } -static SidebarBranchNode* sidebar_branch_node_construct (GType object_type, SidebarEntry* entry, SidebarBranchNode* parent, GCompareFunc comparator) { +static SidebarBranchNode* +sidebar_branch_node_construct (GType object_type, + SidebarEntry* entry, + SidebarBranchNode* parent, + GCompareFunc comparator) +{ SidebarBranchNode* self = NULL; SidebarEntry* _tmp0_; - SidebarEntry* _tmp1_; - SidebarBranchNode* _tmp2_; - GCompareFunc _tmp3_; #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL); #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1703,101 +1656,80 @@ static SidebarBranchNode* sidebar_branch_node_construct (GType object_type, Side #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self = (SidebarBranchNode*) g_type_create_instance (object_type); #line 46 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp0_ = entry; -#line 46 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (entry); #line 46 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (self->entry); #line 46 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - self->entry = _tmp1_; -#line 47 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp2_ = parent; + self->entry = _tmp0_; #line 47 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - self->parent = _tmp2_; + self->parent = parent; #line 48 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = comparator; -#line 48 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - self->comparator = _tmp3_; + self->comparator = comparator; #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return self; -#line 1724 "Branch.c" +#line 1671 "Branch.c" } -static SidebarBranchNode* sidebar_branch_node_new (SidebarEntry* entry, SidebarBranchNode* parent, GCompareFunc comparator) { +static SidebarBranchNode* +sidebar_branch_node_new (SidebarEntry* entry, + SidebarBranchNode* parent, + GCompareFunc comparator) +{ #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return sidebar_branch_node_construct (SIDEBAR_BRANCH_TYPE_NODE, entry, parent, comparator); -#line 1731 "Branch.c" +#line 1682 "Branch.c" } -static gint sidebar_branch_node_comparator_wrapper (SidebarBranchNode* anode, SidebarBranchNode* bnode) { +static gint +sidebar_branch_node_comparator_wrapper (SidebarBranchNode* anode, + SidebarBranchNode* bnode) +{ gint result = 0; SidebarBranchNode* _tmp0_; SidebarBranchNode* _tmp1_; SidebarBranchNode* _tmp2_; - SidebarBranchNode* _tmp3_; - SidebarBranchNode* _tmp4_; - SidebarBranchNode* _tmp5_; - SidebarBranchNode* _tmp6_; - SidebarBranchNode* _tmp7_; - GCompareFunc _tmp8_; - SidebarBranchNode* _tmp9_; - SidebarEntry* _tmp10_; - SidebarBranchNode* _tmp11_; - SidebarEntry* _tmp12_; - gint _tmp13_; + GCompareFunc _tmp3_; + SidebarEntry* _tmp4_; + SidebarEntry* _tmp5_; #line 51 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_BRANCH_IS_NODE (anode), 0); #line 51 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_BRANCH_IS_NODE (bnode), 0); #line 52 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp0_ = anode; -#line 52 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = bnode; -#line 52 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp0_ == _tmp1_) { + if (anode == bnode) { #line 53 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = 0; #line 53 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1765 "Branch.c" +#line 1707 "Branch.c" } #line 55 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp2_ = anode; + _tmp0_ = anode->parent; #line 55 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = _tmp2_->parent; + _tmp1_ = bnode->parent; #line 55 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp4_ = bnode; -#line 55 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp5_ = _tmp4_->parent; -#line 55 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp3_ == _tmp5_, "anode.parent == bnode.parent"); -#line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp6_ = anode; -#line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp7_ = _tmp6_->parent; -#line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp8_ = _tmp7_->comparator; + _vala_assert (_tmp0_ == _tmp1_, "anode.parent == bnode.parent"); #line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp9_ = anode; -#line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp10_ = _tmp9_->entry; + _tmp2_ = anode->parent; #line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp11_ = bnode; + _tmp3_ = _tmp2_->comparator; #line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp12_ = _tmp11_->entry; + _tmp4_ = anode->entry; #line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp13_ = _tmp8_ (_tmp10_, _tmp12_); + _tmp5_ = bnode->entry; #line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - result = _tmp13_; + result = _tmp3_ (_tmp4_, _tmp5_); #line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1797 "Branch.c" +#line 1727 "Branch.c" } -static gboolean sidebar_branch_node_has_children (SidebarBranchNode* self) { +static gboolean +sidebar_branch_node_has_children (SidebarBranchNode* self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; GeeSortedSet* _tmp1_; @@ -1807,7 +1739,7 @@ static gboolean sidebar_branch_node_has_children (SidebarBranchNode* self) { _tmp1_ = self->children; #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (_tmp1_ != NULL) { -#line 1811 "Branch.c" +#line 1743 "Branch.c" GeeSortedSet* _tmp2_; gint _tmp3_; gint _tmp4_; @@ -1819,82 +1751,82 @@ static gboolean sidebar_branch_node_has_children (SidebarBranchNode* self) { _tmp4_ = _tmp3_; #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp0_ = _tmp4_ > 0; -#line 1823 "Branch.c" +#line 1755 "Branch.c" } else { #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp0_ = FALSE; -#line 1827 "Branch.c" +#line 1759 "Branch.c" } #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = _tmp0_; #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1833 "Branch.c" +#line 1765 "Branch.c" } -static gint _sidebar_branch_node_comparator_wrapper_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gint +_sidebar_branch_node_comparator_wrapper_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gint result; result = sidebar_branch_node_comparator_wrapper ((SidebarBranchNode*) a, (SidebarBranchNode*) b); #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1842 "Branch.c" +#line 1778 "Branch.c" } -static void sidebar_branch_node_add_child (SidebarBranchNode* self, SidebarBranchNode* child) { - SidebarBranchNode* _tmp0_; - GeeSortedSet* _tmp1_; +static void +sidebar_branch_node_add_child (SidebarBranchNode* self, + SidebarBranchNode* child) +{ + GeeSortedSet* _tmp0_; gboolean added = FALSE; - GeeSortedSet* _tmp3_; - SidebarBranchNode* _tmp4_; - gboolean _tmp5_; + GeeSortedSet* _tmp2_; #line 64 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self)); #line 64 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (child)); #line 65 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp0_ = child; -#line 65 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp0_->parent = self; + child->parent = self; #line 67 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = self->children; + _tmp0_ = self->children; #line 67 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp1_ == NULL) { -#line 1865 "Branch.c" - GeeTreeSet* _tmp2_; + if (_tmp0_ == NULL) { +#line 1799 "Branch.c" + GeeTreeSet* _tmp1_; #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp2_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL); + _tmp1_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL); #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (self->children); #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - self->children = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_SORTED_SET, GeeSortedSet); -#line 1873 "Branch.c" + self->children = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet); +#line 1807 "Branch.c" } #line 70 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = self->children; -#line 70 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp4_ = child; -#line 70 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp5_ = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), _tmp4_); + _tmp2_ = self->children; #line 70 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - added = _tmp5_; + added = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), child); #line 71 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _vala_assert (added, "added"); -#line 1885 "Branch.c" +#line 1815 "Branch.c" } -static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBranchNode* child) { +static void +sidebar_branch_node_remove_child (SidebarBranchNode* self, + SidebarBranchNode* child) +{ GeeSortedSet* _tmp0_; GeeSortedSet* new_children = NULL; GeeTreeSet* _tmp1_; gboolean found = FALSE; - gboolean _tmp12_; - GeeSortedSet* _tmp13_; - gint _tmp14_; - gint _tmp15_; - SidebarBranchNode* _tmp18_; + gboolean _tmp10_; + GeeSortedSet* _tmp11_; + gint _tmp12_; + gint _tmp13_; #line 74 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self)); #line 74 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1909,7 +1841,7 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr new_children = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet); #line 81 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" found = FALSE; -#line 1913 "Branch.c" +#line 1845 "Branch.c" { GeeIterator* _c_it = NULL; GeeSortedSet* _tmp2_; @@ -1922,105 +1854,101 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr _c_it = _tmp3_; #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" while (TRUE) { -#line 1926 "Branch.c" +#line 1858 "Branch.c" GeeIterator* _tmp4_; - gboolean _tmp5_; SidebarBranchNode* c = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - SidebarBranchNode* _tmp8_; - SidebarBranchNode* _tmp9_; + GeeIterator* _tmp5_; + gpointer _tmp6_; + SidebarBranchNode* _tmp7_; #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp4_ = _c_it; #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp4_)) { #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" break; -#line 1942 "Branch.c" +#line 1870 "Branch.c" } #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp6_ = _c_it; + _tmp5_ = _c_it; #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - c = (SidebarBranchNode*) _tmp7_; -#line 83 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp8_ = c; + c = (SidebarBranchNode*) _tmp6_; #line 83 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp9_ = child; + _tmp7_ = c; #line 83 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp8_ != _tmp9_) { -#line 1956 "Branch.c" - GeeSortedSet* _tmp10_; - SidebarBranchNode* _tmp11_; + if (_tmp7_ != child) { +#line 1882 "Branch.c" + GeeSortedSet* _tmp8_; + SidebarBranchNode* _tmp9_; #line 84 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp10_ = new_children; + _tmp8_ = new_children; #line 84 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp11_ = c; + _tmp9_ = c; #line 84 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_); -#line 1965 "Branch.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp9_); +#line 1891 "Branch.c" } else { #line 86 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" found = TRUE; -#line 1969 "Branch.c" +#line 1895 "Branch.c" } #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (c); -#line 1973 "Branch.c" +#line 1899 "Branch.c" } #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (_c_it); -#line 1977 "Branch.c" +#line 1903 "Branch.c" } #line 89 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp12_ = found; + _tmp10_ = found; #line 89 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _vala_assert (_tmp12_, "found"); + _vala_assert (_tmp10_, "found"); #line 91 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp13_ = new_children; + _tmp11_ = new_children; #line 91 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); #line 91 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp15_ = _tmp14_; + _tmp13_ = _tmp12_; #line 91 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp15_ != 0) { -#line 1991 "Branch.c" - GeeSortedSet* _tmp16_; - GeeSortedSet* _tmp17_; + if (_tmp13_ != 0) { +#line 1917 "Branch.c" + GeeSortedSet* _tmp14_; + GeeSortedSet* _tmp15_; #line 92 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp16_ = new_children; + _tmp14_ = new_children; #line 92 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp17_ = _g_object_ref0 (_tmp16_); + _tmp15_ = _g_object_ref0 (_tmp14_); #line 92 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (self->children); #line 92 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - self->children = _tmp17_; -#line 2002 "Branch.c" + self->children = _tmp15_; +#line 1928 "Branch.c" } else { #line 94 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (self->children); #line 94 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self->children = NULL; -#line 2008 "Branch.c" +#line 1934 "Branch.c" } #line 96 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp18_ = child; -#line 96 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp18_->parent = NULL; + child->parent = NULL; #line 74 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (new_children); -#line 2016 "Branch.c" +#line 1940 "Branch.c" } -static void sidebar_branch_node_prune_children (SidebarBranchNode* self, SidebarBranchNodePruneCallback cb, void* cb_target) { +static void +sidebar_branch_node_prune_children (SidebarBranchNode* self, + SidebarBranchNodePruneCallback cb, + void* cb_target) +{ GeeSortedSet* _tmp0_; GeeSortedSet* old_children = NULL; - GeeSortedSet* _tmp9_; - GeeSortedSet* _tmp10_; + GeeSortedSet* _tmp7_; + GeeSortedSet* _tmp8_; #line 99 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self)); #line 100 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2029,7 +1957,7 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar if (_tmp0_ == NULL) { #line 101 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return; -#line 2033 "Branch.c" +#line 1961 "Branch.c" } { GeeIterator* _child_it = NULL; @@ -2043,118 +1971,103 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar _child_it = _tmp2_; #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" while (TRUE) { -#line 2047 "Branch.c" +#line 1975 "Branch.c" GeeIterator* _tmp3_; - gboolean _tmp4_; SidebarBranchNode* child = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - SidebarBranchNode* _tmp7_; - SidebarBranchNodePruneCallback _tmp8_; - void* _tmp8__target; + GeeIterator* _tmp4_; + gpointer _tmp5_; + SidebarBranchNode* _tmp6_; #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp3_ = _child_it; #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp4_ = gee_iterator_next (_tmp3_); -#line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp3_)) { #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" break; -#line 2064 "Branch.c" +#line 1987 "Branch.c" } #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp5_ = _child_it; + _tmp4_ = _child_it; #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - child = (SidebarBranchNode*) _tmp6_; -#line 104 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp7_ = child; -#line 104 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp8_ = cb; + child = (SidebarBranchNode*) _tmp5_; #line 104 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp8__target = cb_target; + _tmp6_ = child; #line 104 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - sidebar_branch_node_prune_children (_tmp7_, _tmp8_, _tmp8__target); + sidebar_branch_node_prune_children (_tmp6_, cb, cb_target); #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (child); -#line 2082 "Branch.c" +#line 2001 "Branch.c" } #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (_child_it); -#line 2086 "Branch.c" +#line 2005 "Branch.c" } #line 106 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp9_ = self->children; + _tmp7_ = self->children; #line 106 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp10_ = _g_object_ref0 (_tmp9_); + _tmp8_ = _g_object_ref0 (_tmp7_); #line 106 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - old_children = _tmp10_; + old_children = _tmp8_; #line 107 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (self->children); #line 107 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self->children = NULL; -#line 2098 "Branch.c" +#line 2017 "Branch.c" { GeeIterator* _child_it = NULL; - GeeSortedSet* _tmp11_; - GeeIterator* _tmp12_; + GeeSortedSet* _tmp9_; + GeeIterator* _tmp10_; #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp11_ = old_children; + _tmp9_ = old_children; #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _child_it = _tmp12_; + _child_it = _tmp10_; #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" while (TRUE) { -#line 2111 "Branch.c" - GeeIterator* _tmp13_; - gboolean _tmp14_; +#line 2030 "Branch.c" + GeeIterator* _tmp11_; SidebarBranchNode* child = NULL; - GeeIterator* _tmp15_; - gpointer _tmp16_; - SidebarBranchNodePruneCallback _tmp17_; - void* _tmp17__target; - SidebarBranchNode* _tmp18_; -#line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp13_ = _child_it; + GeeIterator* _tmp12_; + gpointer _tmp13_; + SidebarBranchNode* _tmp14_; #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp14_ = gee_iterator_next (_tmp13_); + _tmp11_ = _child_it; #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (!_tmp14_) { + if (!gee_iterator_next (_tmp11_)) { #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" break; -#line 2128 "Branch.c" +#line 2042 "Branch.c" } #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp15_ = _child_it; + _tmp12_ = _child_it; #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp16_ = gee_iterator_get (_tmp15_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - child = (SidebarBranchNode*) _tmp16_; -#line 113 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp17_ = cb; + child = (SidebarBranchNode*) _tmp13_; #line 113 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp17__target = cb_target; -#line 113 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp18_ = child; + _tmp14_ = child; #line 113 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp17_ (_tmp18_, _tmp17__target); + cb (_tmp14_, cb_target); #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (child); -#line 2146 "Branch.c" +#line 2056 "Branch.c" } #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (_child_it); -#line 2150 "Branch.c" +#line 2060 "Branch.c" } #line 99 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (old_children); -#line 2154 "Branch.c" +#line 2064 "Branch.c" } -static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self, SidebarBranchNode* child) { +static gint +sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self, + SidebarBranchNode* child) +{ gint result = 0; GeeSortedSet* _tmp0_; gint index = 0; @@ -2170,11 +2083,11 @@ static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self, result = -1; #line 120 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 2174 "Branch.c" +#line 2087 "Branch.c" } #line 122 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" index = 0; -#line 2178 "Branch.c" +#line 2091 "Branch.c" { GeeIterator* _c_it = NULL; GeeSortedSet* _tmp1_; @@ -2187,37 +2100,31 @@ static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self, _c_it = _tmp2_; #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" while (TRUE) { -#line 2191 "Branch.c" +#line 2104 "Branch.c" GeeIterator* _tmp3_; - gboolean _tmp4_; SidebarBranchNode* c = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - SidebarBranchNode* _tmp7_; - SidebarBranchNode* _tmp8_; - gint _tmp9_; + GeeIterator* _tmp4_; + gpointer _tmp5_; + SidebarBranchNode* _tmp6_; + gint _tmp7_; #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp3_ = _c_it; #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp4_ = gee_iterator_next (_tmp3_); -#line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp3_)) { #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" break; -#line 2208 "Branch.c" +#line 2117 "Branch.c" } #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp5_ = _c_it; + _tmp4_ = _c_it; #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - c = (SidebarBranchNode*) _tmp6_; + c = (SidebarBranchNode*) _tmp5_; #line 124 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp7_ = child; + _tmp6_ = c; #line 124 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp8_ = c; -#line 124 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp7_ == _tmp8_) { + if (child == _tmp6_) { #line 125 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = index; #line 125 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2226,43 +2133,41 @@ static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self, _g_object_unref0 (_c_it); #line 125 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 2230 "Branch.c" +#line 2137 "Branch.c" } #line 127 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp9_ = index; + _tmp7_ = index; #line 127 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - index = _tmp9_ + 1; + index = _tmp7_ + 1; #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (c); -#line 2238 "Branch.c" +#line 2145 "Branch.c" } #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (_c_it); -#line 2242 "Branch.c" +#line 2149 "Branch.c" } #line 130 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = -1; #line 130 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 2248 "Branch.c" +#line 2155 "Branch.c" } -static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self, SidebarBranchNode* child) { +static gboolean +sidebar_branch_node_reorder_child (SidebarBranchNode* self, + SidebarBranchNode* child) +{ gboolean result = FALSE; GeeSortedSet* _tmp0_; gint old_index = 0; - SidebarBranchNode* _tmp1_; - gint _tmp2_; GeeSortedSet* new_children = NULL; - GeeTreeSet* _tmp3_; + GeeTreeSet* _tmp1_; gboolean added = FALSE; - GeeSortedSet* _tmp4_; - gboolean _tmp5_; - GeeSortedSet* _tmp6_; + GeeSortedSet* _tmp2_; + GeeSortedSet* _tmp3_; gint new_index = 0; - SidebarBranchNode* _tmp7_; - gint _tmp8_; #line 134 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_BRANCH_IS_NODE (self), FALSE); #line 134 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2272,37 +2177,27 @@ static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self, Side #line 135 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _vala_assert (_tmp0_ != NULL, "children != null"); #line 137 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = child; -#line 137 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp2_ = sidebar_branch_node_index_of_by_reference (self, _tmp1_); -#line 137 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - old_index = _tmp2_; + old_index = sidebar_branch_node_index_of_by_reference (self, child); #line 138 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _vala_assert (old_index >= 0, "old_index >= 0"); #line 146 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL); + _tmp1_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL); #line 146 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - new_children = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_SORTED_SET, GeeSortedSet); -#line 147 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp4_ = self->children; + new_children = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet); #line 147 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp5_ = gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (new_children, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = self->children; #line 147 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - added = _tmp5_; + added = gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (new_children, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 148 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _vala_assert (added, "added"); #line 150 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp6_ = _g_object_ref0 (new_children); + _tmp3_ = _g_object_ref0 (new_children); #line 150 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (self->children); #line 150 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - self->children = _tmp6_; -#line 152 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp7_ = child; + self->children = _tmp3_; #line 152 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp8_ = sidebar_branch_node_index_of_by_reference (self, _tmp7_); -#line 152 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - new_index = _tmp8_; + new_index = sidebar_branch_node_index_of_by_reference (self, child); #line 153 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _vala_assert (new_index >= 0, "new_index >= 0"); #line 155 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2311,11 +2206,16 @@ static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self, Side _g_object_unref0 (new_children); #line 155 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 2315 "Branch.c" +#line 2210 "Branch.c" } -static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gboolean recursive, SidebarBranchNodeChildrenReorderedCallback cb, void* cb_target) { +static void +sidebar_branch_node_reorder_children (SidebarBranchNode* self, + gboolean recursive, + SidebarBranchNodeChildrenReorderedCallback cb, + void* cb_target) +{ GeeSortedSet* _tmp0_; GeeSortedSet* reordered = NULL; GeeTreeSet* _tmp1_; @@ -2323,9 +2223,6 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool GeeSortedSet* _tmp3_; GeeSortedSet* _tmp4_; GeeSortedSet* _tmp5_; - gboolean _tmp6_; - SidebarBranchNodeChildrenReorderedCallback _tmp15_; - void* _tmp15__target; #line 158 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self)); #line 159 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2334,7 +2231,7 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool if (_tmp0_ == NULL) { #line 160 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return; -#line 2338 "Branch.c" +#line 2235 "Branch.c" } #line 162 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp1_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL); @@ -2355,256 +2252,248 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool #line 164 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self->children = _tmp5_; #line 166 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp6_ = recursive; -#line 166 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp6_) { -#line 2362 "Branch.c" + if (recursive) { +#line 2257 "Branch.c" { GeeIterator* _child_it = NULL; - GeeSortedSet* _tmp7_; - GeeIterator* _tmp8_; + GeeSortedSet* _tmp6_; + GeeIterator* _tmp7_; #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp7_ = self->children; + _tmp6_ = self->children; #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _child_it = _tmp8_; + _child_it = _tmp7_; #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" while (TRUE) { -#line 2375 "Branch.c" - GeeIterator* _tmp9_; - gboolean _tmp10_; +#line 2270 "Branch.c" + GeeIterator* _tmp8_; SidebarBranchNode* child = NULL; - GeeIterator* _tmp11_; - gpointer _tmp12_; - SidebarBranchNode* _tmp13_; - SidebarBranchNodeChildrenReorderedCallback _tmp14_; - void* _tmp14__target; -#line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp9_ = _child_it; + GeeIterator* _tmp9_; + gpointer _tmp10_; + SidebarBranchNode* _tmp11_; #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp10_ = gee_iterator_next (_tmp9_); + _tmp8_ = _child_it; #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (!_tmp10_) { + if (!gee_iterator_next (_tmp8_)) { #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" break; -#line 2392 "Branch.c" +#line 2282 "Branch.c" } #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp11_ = _child_it; + _tmp9_ = _child_it; #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp12_ = gee_iterator_get (_tmp11_); + _tmp10_ = gee_iterator_get (_tmp9_); #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - child = (SidebarBranchNode*) _tmp12_; + child = (SidebarBranchNode*) _tmp10_; #line 168 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp13_ = child; -#line 168 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp14_ = cb; + _tmp11_ = child; #line 168 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp14__target = cb_target; -#line 168 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - sidebar_branch_node_reorder_children (_tmp13_, TRUE, _tmp14_, _tmp14__target); + sidebar_branch_node_reorder_children (_tmp11_, TRUE, cb, cb_target); #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (child); -#line 2410 "Branch.c" +#line 2296 "Branch.c" } #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (_child_it); -#line 2414 "Branch.c" +#line 2300 "Branch.c" } } #line 171 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp15_ = cb; -#line 171 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp15__target = cb_target; -#line 171 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp15_ (self, _tmp15__target); + cb (self, cb_target); #line 158 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (reordered); -#line 2425 "Branch.c" +#line 2307 "Branch.c" } -static void sidebar_branch_node_change_comparator (SidebarBranchNode* self, GCompareFunc comparator, gboolean recursive, SidebarBranchNodeChildrenReorderedCallback cb, void* cb_target) { - GCompareFunc _tmp0_; - SidebarBranchNodeChildrenReorderedCallback _tmp1_; - void* _tmp1__target; - gboolean _tmp2_; +static void +sidebar_branch_node_change_comparator (SidebarBranchNode* self, + GCompareFunc comparator, + gboolean recursive, + SidebarBranchNodeChildrenReorderedCallback cb, + void* cb_target) +{ #line 174 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self)); #line 176 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp0_ = comparator; -#line 176 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - self->comparator = _tmp0_; -#line 179 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = cb; -#line 179 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1__target = cb_target; + self->comparator = comparator; #line 179 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - sidebar_branch_node_reorder_children (self, FALSE, _tmp1_, _tmp1__target); + sidebar_branch_node_reorder_children (self, FALSE, cb, cb_target); #line 181 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp2_ = recursive; -#line 181 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (_tmp2_) { -#line 2450 "Branch.c" + if (recursive) { +#line 2326 "Branch.c" { GeeIterator* _child_it = NULL; - GeeSortedSet* _tmp3_; - GeeIterator* _tmp4_; + GeeSortedSet* _tmp0_; + GeeIterator* _tmp1_; #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = self->children; + _tmp0_ = self->children; #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _child_it = _tmp4_; + _child_it = _tmp1_; #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" while (TRUE) { -#line 2463 "Branch.c" - GeeIterator* _tmp5_; - gboolean _tmp6_; +#line 2339 "Branch.c" + GeeIterator* _tmp2_; SidebarBranchNode* child = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; - SidebarBranchNode* _tmp9_; - GCompareFunc _tmp10_; - SidebarBranchNodeChildrenReorderedCallback _tmp11_; - void* _tmp11__target; -#line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp5_ = _child_it; + GeeIterator* _tmp3_; + gpointer _tmp4_; + SidebarBranchNode* _tmp5_; #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp6_ = gee_iterator_next (_tmp5_); + _tmp2_ = _child_it; #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp2_)) { #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" break; -#line 2481 "Branch.c" +#line 2351 "Branch.c" } #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp7_ = _child_it; + _tmp3_ = _child_it; #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - child = (SidebarBranchNode*) _tmp8_; + child = (SidebarBranchNode*) _tmp4_; #line 183 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp9_ = child; + _tmp5_ = child; #line 183 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp10_ = comparator; -#line 183 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp11_ = cb; -#line 183 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp11__target = cb_target; -#line 183 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - sidebar_branch_node_change_comparator (_tmp9_, _tmp10_, TRUE, _tmp11_, _tmp11__target); + sidebar_branch_node_change_comparator (_tmp5_, comparator, TRUE, cb, cb_target); #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (child); -#line 2501 "Branch.c" +#line 2365 "Branch.c" } #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (_child_it); -#line 2505 "Branch.c" +#line 2369 "Branch.c" } } } -static void sidebar_branch_value_node_init (GValue* value) { +static void +sidebar_branch_value_node_init (GValue* value) +{ #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" value->data[0].v_pointer = NULL; -#line 2514 "Branch.c" +#line 2380 "Branch.c" } -static void sidebar_branch_value_node_free_value (GValue* value) { +static void +sidebar_branch_value_node_free_value (GValue* value) +{ #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (value->data[0].v_pointer) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_node_unref (value->data[0].v_pointer); -#line 2523 "Branch.c" +#line 2391 "Branch.c" } } -static void sidebar_branch_value_node_copy_value (const GValue* src_value, GValue* dest_value) { +static void +sidebar_branch_value_node_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (src_value->data[0].v_pointer) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" dest_value->data[0].v_pointer = sidebar_branch_node_ref (src_value->data[0].v_pointer); -#line 2533 "Branch.c" +#line 2404 "Branch.c" } else { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" dest_value->data[0].v_pointer = NULL; -#line 2537 "Branch.c" +#line 2408 "Branch.c" } } -static gpointer sidebar_branch_value_node_peek_pointer (const GValue* value) { +static gpointer +sidebar_branch_value_node_peek_pointer (const GValue* value) +{ #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return value->data[0].v_pointer; -#line 2545 "Branch.c" +#line 2418 "Branch.c" } -static gchar* sidebar_branch_value_node_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +sidebar_branch_value_node_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (collect_values[0].v_pointer) { -#line 2552 "Branch.c" +#line 2430 "Branch.c" SidebarBranchNode * object; object = collect_values[0].v_pointer; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (object->parent_instance.g_class == NULL) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2559 "Branch.c" +#line 2437 "Branch.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.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 2563 "Branch.c" +#line 2441 "Branch.c" } #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" value->data[0].v_pointer = sidebar_branch_node_ref (object); -#line 2567 "Branch.c" +#line 2445 "Branch.c" } else { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" value->data[0].v_pointer = NULL; -#line 2571 "Branch.c" +#line 2449 "Branch.c" } #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return NULL; -#line 2575 "Branch.c" +#line 2453 "Branch.c" } -static gchar* sidebar_branch_value_node_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +sidebar_branch_value_node_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ SidebarBranchNode ** object_p; object_p = collect_values[0].v_pointer; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (!object_p) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2586 "Branch.c" +#line 2469 "Branch.c" } #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (!value->data[0].v_pointer) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" *object_p = NULL; -#line 2592 "Branch.c" +#line 2475 "Branch.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" *object_p = value->data[0].v_pointer; -#line 2596 "Branch.c" +#line 2479 "Branch.c" } else { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" *object_p = sidebar_branch_node_ref (value->data[0].v_pointer); -#line 2600 "Branch.c" +#line 2483 "Branch.c" } #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return NULL; -#line 2604 "Branch.c" +#line 2487 "Branch.c" } -static GParamSpec* sidebar_branch_param_spec_node (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +static GParamSpec* +sidebar_branch_param_spec_node (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ SidebarBranchParamSpecNode* spec; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (g_type_is_a (object_type, SIDEBAR_BRANCH_TYPE_NODE), NULL); @@ -2614,20 +2503,25 @@ static GParamSpec* sidebar_branch_param_spec_node (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return G_PARAM_SPEC (spec); -#line 2618 "Branch.c" +#line 2507 "Branch.c" } -static gpointer sidebar_branch_value_get_node (const GValue* value) { +static gpointer +sidebar_branch_value_get_node (const GValue* value) +{ #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SIDEBAR_BRANCH_TYPE_NODE), NULL); #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return value->data[0].v_pointer; -#line 2627 "Branch.c" +#line 2518 "Branch.c" } -static void sidebar_branch_value_set_node (GValue* value, gpointer v_object) { +static void +sidebar_branch_value_set_node (GValue* value, + gpointer v_object) +{ SidebarBranchNode * old; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SIDEBAR_BRANCH_TYPE_NODE)); @@ -2643,22 +2537,25 @@ static void sidebar_branch_value_set_node (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_node_ref (value->data[0].v_pointer); -#line 2647 "Branch.c" +#line 2541 "Branch.c" } else { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" value->data[0].v_pointer = NULL; -#line 2651 "Branch.c" +#line 2545 "Branch.c" } #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (old) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_node_unref (old); -#line 2657 "Branch.c" +#line 2551 "Branch.c" } } -static void sidebar_branch_value_take_node (GValue* value, gpointer v_object) { +static void +sidebar_branch_value_take_node (GValue* value, + gpointer v_object) +{ SidebarBranchNode * old; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SIDEBAR_BRANCH_TYPE_NODE)); @@ -2672,40 +2569,46 @@ static void sidebar_branch_value_take_node (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" value->data[0].v_pointer = v_object; -#line 2676 "Branch.c" +#line 2573 "Branch.c" } else { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" value->data[0].v_pointer = NULL; -#line 2680 "Branch.c" +#line 2577 "Branch.c" } #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (old) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_node_unref (old); -#line 2686 "Branch.c" +#line 2583 "Branch.c" } } -static void sidebar_branch_node_class_init (SidebarBranchNodeClass * klass) { +static void +sidebar_branch_node_class_init (SidebarBranchNodeClass * klass) +{ #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_node_parent_class = g_type_class_peek_parent (klass); #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" ((SidebarBranchNodeClass *) klass)->finalize = sidebar_branch_node_finalize; -#line 2696 "Branch.c" +#line 2595 "Branch.c" } -static void sidebar_branch_node_instance_init (SidebarBranchNode * self) { +static void +sidebar_branch_node_instance_init (SidebarBranchNode * self) +{ #line 43 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self->children = NULL; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self->ref_count = 1; -#line 2705 "Branch.c" +#line 2606 "Branch.c" } -static void sidebar_branch_node_finalize (SidebarBranchNode * obj) { +static void +sidebar_branch_node_finalize (SidebarBranchNode * obj) +{ SidebarBranchNode * self; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_BRANCH_TYPE_NODE, SidebarBranchNode); @@ -2715,11 +2618,13 @@ static void sidebar_branch_node_finalize (SidebarBranchNode * obj) { _g_object_unref0 (self->entry); #line 43 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (self->children); -#line 2719 "Branch.c" +#line 2622 "Branch.c" } -static GType sidebar_branch_node_get_type (void) { +static GType +sidebar_branch_node_get_type (void) +{ static volatile gsize sidebar_branch_node_type_id__volatile = 0; if (g_once_init_enter (&sidebar_branch_node_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { sidebar_branch_value_node_init, sidebar_branch_value_node_free_value, sidebar_branch_value_node_copy_value, sidebar_branch_value_node_peek_pointer, "p", sidebar_branch_value_node_collect_value, "p", sidebar_branch_value_node_lcopy_value }; @@ -2733,18 +2638,22 @@ static GType sidebar_branch_node_get_type (void) { } -static gpointer sidebar_branch_node_ref (gpointer instance) { +static gpointer +sidebar_branch_node_ref (gpointer instance) +{ SidebarBranchNode * self; self = instance; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_atomic_int_inc (&self->ref_count); #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return instance; -#line 2744 "Branch.c" +#line 2651 "Branch.c" } -static void sidebar_branch_node_unref (gpointer instance) { +static void +sidebar_branch_node_unref (gpointer instance) +{ SidebarBranchNode * self; self = instance; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2753,12 +2662,14 @@ static void sidebar_branch_node_unref (gpointer instance) { SIDEBAR_BRANCH_NODE_GET_CLASS (self)->finalize (self); #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2757 "Branch.c" +#line 2666 "Branch.c" } } -static void sidebar_branch_class_init (SidebarBranchClass * klass) { +static void +sidebar_branch_class_init (SidebarBranchClass * klass) +{ #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_parent_class = g_type_class_peek_parent (klass); #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2777,11 +2688,13 @@ static void sidebar_branch_class_init (SidebarBranchClass * klass) { sidebar_branch_signals[SIDEBAR_BRANCH_CHILDREN_REORDERED_SIGNAL] = g_signal_new ("children-reordered", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_ENTRY); #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_signals[SIDEBAR_BRANCH_SHOW_BRANCH_SIGNAL] = g_signal_new ("show-branch", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); -#line 2781 "Branch.c" +#line 2692 "Branch.c" } -static void sidebar_branch_instance_init (SidebarBranch * self) { +static void +sidebar_branch_instance_init (SidebarBranch * self) +{ GeeHashMap* _tmp0_; #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self->priv = SIDEBAR_BRANCH_GET_PRIVATE (self); @@ -2791,11 +2704,13 @@ static void sidebar_branch_instance_init (SidebarBranch * self) { _tmp0_ = gee_hash_map_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 192 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self->priv->map = _tmp0_; -#line 2795 "Branch.c" +#line 2708 "Branch.c" } -static void sidebar_branch_finalize (GObject * obj) { +static void +sidebar_branch_finalize (GObject * obj) +{ SidebarBranch * self; #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_BRANCH, SidebarBranch); @@ -2805,11 +2720,13 @@ static void sidebar_branch_finalize (GObject * obj) { _g_object_unref0 (self->priv->map); #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" G_OBJECT_CLASS (sidebar_branch_parent_class)->finalize (obj); -#line 2809 "Branch.c" +#line 2724 "Branch.c" } -GType sidebar_branch_get_type (void) { +GType +sidebar_branch_get_type (void) +{ static volatile gsize sidebar_branch_type_id__volatile = 0; if (g_once_init_enter (&sidebar_branch_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SidebarBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sidebar_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SidebarBranch), 0, (GInstanceInitFunc) sidebar_branch_instance_init, NULL }; diff --git a/src/sidebar/Entry.c b/src/sidebar/Entry.c index 254fe54..ab4bbdb 100644 --- a/src/sidebar/Entry.c +++ b/src/sidebar/Entry.c @@ -1,4 +1,4 @@ -/* Entry.c generated by valac 0.36.6, the Vala compiler +/* Entry.c generated by valac 0.40.4, the Vala compiler * generated from Entry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -35,9 +36,9 @@ typedef struct _SidebarTreeClass SidebarTreeClass; enum { SIDEBAR_ENTRY_SIDEBAR_TOOLTIP_CHANGED_SIGNAL, SIDEBAR_ENTRY_SIDEBAR_ICON_CHANGED_SIGNAL, - SIDEBAR_ENTRY_LAST_SIGNAL + SIDEBAR_ENTRY_NUM_SIGNALS }; -static guint sidebar_entry_signals[SIDEBAR_ENTRY_LAST_SIGNAL] = {0}; +static guint sidebar_entry_signals[SIDEBAR_ENTRY_NUM_SIGNALS] = {0}; #define SIDEBAR_TYPE_EXPANDABLE_ENTRY (sidebar_expandable_entry_get_type ()) #define SIDEBAR_EXPANDABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_EXPANDABLE_ENTRY, SidebarExpandableEntry)) @@ -75,9 +76,9 @@ typedef struct _PageClass PageClass; enum { SIDEBAR_PAGE_REPRESENTATIVE_PAGE_CREATED_SIGNAL, SIDEBAR_PAGE_REPRESENTATIVE_DESTROYING_PAGE_SIGNAL, - SIDEBAR_PAGE_REPRESENTATIVE_LAST_SIGNAL + SIDEBAR_PAGE_REPRESENTATIVE_NUM_SIGNALS }; -static guint sidebar_page_representative_signals[SIDEBAR_PAGE_REPRESENTATIVE_LAST_SIGNAL] = {0}; +static guint sidebar_page_representative_signals[SIDEBAR_PAGE_REPRESENTATIVE_NUM_SIGNALS] = {0}; #define SIDEBAR_TYPE_RENAMEABLE_ENTRY (sidebar_renameable_entry_get_type ()) #define SIDEBAR_RENAMEABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry)) @@ -88,9 +89,9 @@ typedef struct _SidebarRenameableEntry SidebarRenameableEntry; typedef struct _SidebarRenameableEntryIface SidebarRenameableEntryIface; enum { SIDEBAR_RENAMEABLE_ENTRY_SIDEBAR_NAME_CHANGED_SIGNAL, - SIDEBAR_RENAMEABLE_ENTRY_LAST_SIGNAL + SIDEBAR_RENAMEABLE_ENTRY_NUM_SIGNALS }; -static guint sidebar_renameable_entry_signals[SIDEBAR_RENAMEABLE_ENTRY_LAST_SIGNAL] = {0}; +static guint sidebar_renameable_entry_signals[SIDEBAR_RENAMEABLE_ENTRY_NUM_SIGNALS] = {0}; #define SIDEBAR_TYPE_EMPHASIZABLE_ENTRY (sidebar_emphasizable_entry_get_type ()) #define SIDEBAR_EMPHASIZABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, SidebarEmphasizableEntry)) @@ -101,9 +102,9 @@ typedef struct _SidebarEmphasizableEntry SidebarEmphasizableEntry; typedef struct _SidebarEmphasizableEntryIface SidebarEmphasizableEntryIface; enum { SIDEBAR_EMPHASIZABLE_ENTRY_IS_EMPHASIZED_CHANGED_SIGNAL, - SIDEBAR_EMPHASIZABLE_ENTRY_LAST_SIGNAL + SIDEBAR_EMPHASIZABLE_ENTRY_NUM_SIGNALS }; -static guint sidebar_emphasizable_entry_signals[SIDEBAR_EMPHASIZABLE_ENTRY_LAST_SIGNAL] = {0}; +static guint sidebar_emphasizable_entry_signals[SIDEBAR_EMPHASIZABLE_ENTRY_NUM_SIGNALS] = {0}; #define SIDEBAR_TYPE_DESTROYABLE_ENTRY (sidebar_destroyable_entry_get_type ()) #define SIDEBAR_DESTROYABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_DESTROYABLE_ENTRY, SidebarDestroyableEntry)) @@ -229,10 +230,14 @@ gchar* sidebar_entry_get_sidebar_name (SidebarEntry* self); gchar* sidebar_entry_get_sidebar_tooltip (SidebarEntry* self); gchar* sidebar_entry_get_sidebar_icon (SidebarEntry* self); gchar* sidebar_entry_to_string (SidebarEntry* self); -void sidebar_entry_grafted (SidebarEntry* self, SidebarTree* tree); -static void sidebar_entry_real_grafted (SidebarEntry* self, SidebarTree* tree); -void sidebar_entry_pruned (SidebarEntry* self, SidebarTree* tree); -static void sidebar_entry_real_pruned (SidebarEntry* self, SidebarTree* tree); +void sidebar_entry_grafted (SidebarEntry* self, + SidebarTree* tree); +static void sidebar_entry_real_grafted (SidebarEntry* self, + SidebarTree* tree); +void sidebar_entry_pruned (SidebarEntry* self, + SidebarTree* tree); +static void sidebar_entry_real_pruned (SidebarEntry* self, + SidebarTree* tree); GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST; gboolean sidebar_expandable_entry_expand_on_select (SidebarExpandableEntry* self); GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST; @@ -241,7 +246,8 @@ GType sidebar_page_representative_get_type (void) G_GNUC_CONST; gboolean sidebar_page_representative_has_page (SidebarPageRepresentative* self); Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self); GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST; -void sidebar_renameable_entry_rename (SidebarRenameableEntry* self, const gchar* new_name); +void sidebar_renameable_entry_rename (SidebarRenameableEntry* self, + const gchar* new_name); gboolean sidebar_renameable_entry_is_user_renameable (SidebarRenameableEntry* self); GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST; gboolean sidebar_emphasizable_entry_is_emphasized (SidebarEmphasizableEntry* self); @@ -252,81 +258,106 @@ GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; GType sidebar_internal_drop_target_entry_get_type (void) G_GNUC_CONST; -gboolean sidebar_internal_drop_target_entry_internal_drop_received (SidebarInternalDropTargetEntry* self, GeeList* sources); -gboolean sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* self, GtkSelectionData* data); +gboolean sidebar_internal_drop_target_entry_internal_drop_received (SidebarInternalDropTargetEntry* self, + GeeList* sources); +gboolean sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* self, + GtkSelectionData* data); GType sidebar_internal_drag_source_entry_get_type (void) G_GNUC_CONST; -void sidebar_internal_drag_source_entry_prepare_selection_data (SidebarInternalDragSourceEntry* self, GtkSelectionData* data); +void sidebar_internal_drag_source_entry_prepare_selection_data (SidebarInternalDragSourceEntry* self, + GtkSelectionData* data); -gchar* sidebar_entry_get_sidebar_name (SidebarEntry* self) { +gchar* +sidebar_entry_get_sidebar_name (SidebarEntry* self) +{ #line 12 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (self), NULL); #line 12 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" return SIDEBAR_ENTRY_GET_INTERFACE (self)->get_sidebar_name (self); -#line 267 "Entry.c" +#line 278 "Entry.c" } -gchar* sidebar_entry_get_sidebar_tooltip (SidebarEntry* self) { +gchar* +sidebar_entry_get_sidebar_tooltip (SidebarEntry* self) +{ #line 14 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (self), NULL); #line 14 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" return SIDEBAR_ENTRY_GET_INTERFACE (self)->get_sidebar_tooltip (self); -#line 276 "Entry.c" +#line 289 "Entry.c" } -gchar* sidebar_entry_get_sidebar_icon (SidebarEntry* self) { +gchar* +sidebar_entry_get_sidebar_icon (SidebarEntry* self) +{ #line 16 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (self), NULL); #line 16 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" return SIDEBAR_ENTRY_GET_INTERFACE (self)->get_sidebar_icon (self); -#line 285 "Entry.c" +#line 300 "Entry.c" } -gchar* sidebar_entry_to_string (SidebarEntry* self) { +gchar* +sidebar_entry_to_string (SidebarEntry* self) +{ #line 18 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (self), NULL); #line 18 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" return SIDEBAR_ENTRY_GET_INTERFACE (self)->to_string (self); -#line 294 "Entry.c" +#line 311 "Entry.c" } -static void sidebar_entry_real_grafted (SidebarEntry* self, SidebarTree* tree) { +static void +sidebar_entry_real_grafted (SidebarEntry* self, + SidebarTree* tree) +{ #line 20 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" g_return_if_fail (SIDEBAR_IS_TREE (tree)); -#line 301 "Entry.c" +#line 321 "Entry.c" } -void sidebar_entry_grafted (SidebarEntry* self, SidebarTree* tree) { +void +sidebar_entry_grafted (SidebarEntry* self, + SidebarTree* tree) +{ #line 20 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (self)); #line 20 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" SIDEBAR_ENTRY_GET_INTERFACE (self)->grafted (self, tree); -#line 310 "Entry.c" +#line 333 "Entry.c" } -static void sidebar_entry_real_pruned (SidebarEntry* self, SidebarTree* tree) { +static void +sidebar_entry_real_pruned (SidebarEntry* self, + SidebarTree* tree) +{ #line 23 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" g_return_if_fail (SIDEBAR_IS_TREE (tree)); -#line 317 "Entry.c" +#line 343 "Entry.c" } -void sidebar_entry_pruned (SidebarEntry* self, SidebarTree* tree) { +void +sidebar_entry_pruned (SidebarEntry* self, + SidebarTree* tree) +{ #line 23 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (self)); #line 23 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" SIDEBAR_ENTRY_GET_INTERFACE (self)->pruned (self, tree); -#line 326 "Entry.c" +#line 355 "Entry.c" } -static void sidebar_entry_base_init (SidebarEntryIface * iface) { +static void +sidebar_entry_base_init (SidebarEntryIface * iface) +{ #line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" static gboolean initialized = FALSE; #line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" @@ -341,12 +372,14 @@ static void sidebar_entry_base_init (SidebarEntryIface * iface) { iface->grafted = sidebar_entry_real_grafted; #line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" iface->pruned = sidebar_entry_real_pruned; -#line 345 "Entry.c" +#line 376 "Entry.c" } } -GType sidebar_entry_get_type (void) { +GType +sidebar_entry_get_type (void) +{ static volatile gsize sidebar_entry_type_id__volatile = 0; if (g_once_init_enter (&sidebar_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SidebarEntryIface), (GBaseInitFunc) sidebar_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -359,28 +392,34 @@ GType sidebar_entry_get_type (void) { } -gboolean sidebar_expandable_entry_expand_on_select (SidebarExpandableEntry* self) { +gboolean +sidebar_expandable_entry_expand_on_select (SidebarExpandableEntry* self) +{ #line 28 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" g_return_val_if_fail (SIDEBAR_IS_EXPANDABLE_ENTRY (self), FALSE); #line 28 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" return SIDEBAR_EXPANDABLE_ENTRY_GET_INTERFACE (self)->expand_on_select (self); -#line 368 "Entry.c" +#line 403 "Entry.c" } -static void sidebar_expandable_entry_base_init (SidebarExpandableEntryIface * iface) { +static void +sidebar_expandable_entry_base_init (SidebarExpandableEntryIface * iface) +{ #line 27 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" static gboolean initialized = FALSE; #line 27 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" if (!initialized) { #line 27 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" initialized = TRUE; -#line 379 "Entry.c" +#line 416 "Entry.c" } } -GType sidebar_expandable_entry_get_type (void) { +GType +sidebar_expandable_entry_get_type (void) +{ static volatile gsize sidebar_expandable_entry_type_id__volatile = 0; if (g_once_init_enter (&sidebar_expandable_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SidebarExpandableEntryIface), (GBaseInitFunc) sidebar_expandable_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -393,19 +432,23 @@ GType sidebar_expandable_entry_get_type (void) { } -static void sidebar_selectable_entry_base_init (SidebarSelectableEntryIface * iface) { +static void +sidebar_selectable_entry_base_init (SidebarSelectableEntryIface * iface) +{ #line 31 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" static gboolean initialized = FALSE; #line 31 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" if (!initialized) { #line 31 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" initialized = TRUE; -#line 404 "Entry.c" +#line 445 "Entry.c" } } -GType sidebar_selectable_entry_get_type (void) { +GType +sidebar_selectable_entry_get_type (void) +{ static volatile gsize sidebar_selectable_entry_type_id__volatile = 0; if (g_once_init_enter (&sidebar_selectable_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SidebarSelectableEntryIface), (GBaseInitFunc) sidebar_selectable_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -418,25 +461,31 @@ GType sidebar_selectable_entry_get_type (void) { } -gboolean sidebar_page_representative_has_page (SidebarPageRepresentative* self) { +gboolean +sidebar_page_representative_has_page (SidebarPageRepresentative* self) +{ #line 41 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" g_return_val_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (self), FALSE); #line 41 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" return SIDEBAR_PAGE_REPRESENTATIVE_GET_INTERFACE (self)->has_page (self); -#line 427 "Entry.c" +#line 472 "Entry.c" } -Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self) { +Page* +sidebar_page_representative_get_page (SidebarPageRepresentative* self) +{ #line 43 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" g_return_val_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (self), NULL); #line 43 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" return SIDEBAR_PAGE_REPRESENTATIVE_GET_INTERFACE (self)->get_page (self); -#line 436 "Entry.c" +#line 483 "Entry.c" } -static void sidebar_page_representative_base_init (SidebarPageRepresentativeIface * iface) { +static void +sidebar_page_representative_base_init (SidebarPageRepresentativeIface * iface) +{ #line 34 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" static gboolean initialized = FALSE; #line 34 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" @@ -447,12 +496,14 @@ static void sidebar_page_representative_base_init (SidebarPageRepresentativeIfac sidebar_page_representative_signals[SIDEBAR_PAGE_REPRESENTATIVE_PAGE_CREATED_SIGNAL] = g_signal_new ("page-created", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_PAGE); #line 34 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" sidebar_page_representative_signals[SIDEBAR_PAGE_REPRESENTATIVE_DESTROYING_PAGE_SIGNAL] = g_signal_new ("destroying-page", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_PAGE); -#line 451 "Entry.c" +#line 500 "Entry.c" } } -GType sidebar_page_representative_get_type (void) { +GType +sidebar_page_representative_get_type (void) +{ static volatile gsize sidebar_page_representative_type_id__volatile = 0; if (g_once_init_enter (&sidebar_page_representative_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SidebarPageRepresentativeIface), (GBaseInitFunc) sidebar_page_representative_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -466,25 +517,32 @@ GType sidebar_page_representative_get_type (void) { } -void sidebar_renameable_entry_rename (SidebarRenameableEntry* self, const gchar* new_name) { +void +sidebar_renameable_entry_rename (SidebarRenameableEntry* self, + const gchar* new_name) +{ #line 49 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" g_return_if_fail (SIDEBAR_IS_RENAMEABLE_ENTRY (self)); #line 49 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" SIDEBAR_RENAMEABLE_ENTRY_GET_INTERFACE (self)->rename (self, new_name); -#line 475 "Entry.c" +#line 529 "Entry.c" } -gboolean sidebar_renameable_entry_is_user_renameable (SidebarRenameableEntry* self) { +gboolean +sidebar_renameable_entry_is_user_renameable (SidebarRenameableEntry* self) +{ #line 52 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" g_return_val_if_fail (SIDEBAR_IS_RENAMEABLE_ENTRY (self), FALSE); #line 52 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" return SIDEBAR_RENAMEABLE_ENTRY_GET_INTERFACE (self)->is_user_renameable (self); -#line 484 "Entry.c" +#line 540 "Entry.c" } -static void sidebar_renameable_entry_base_init (SidebarRenameableEntryIface * iface) { +static void +sidebar_renameable_entry_base_init (SidebarRenameableEntryIface * iface) +{ #line 46 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" static gboolean initialized = FALSE; #line 46 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" @@ -493,12 +551,14 @@ static void sidebar_renameable_entry_base_init (SidebarRenameableEntryIface * if initialized = TRUE; #line 46 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" sidebar_renameable_entry_signals[SIDEBAR_RENAMEABLE_ENTRY_SIDEBAR_NAME_CHANGED_SIGNAL] = g_signal_new ("sidebar-name-changed", SIDEBAR_TYPE_RENAMEABLE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); -#line 497 "Entry.c" +#line 555 "Entry.c" } } -GType sidebar_renameable_entry_get_type (void) { +GType +sidebar_renameable_entry_get_type (void) +{ static volatile gsize sidebar_renameable_entry_type_id__volatile = 0; if (g_once_init_enter (&sidebar_renameable_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SidebarRenameableEntryIface), (GBaseInitFunc) sidebar_renameable_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -511,16 +571,20 @@ GType sidebar_renameable_entry_get_type (void) { } -gboolean sidebar_emphasizable_entry_is_emphasized (SidebarEmphasizableEntry* self) { +gboolean +sidebar_emphasizable_entry_is_emphasized (SidebarEmphasizableEntry* self) +{ #line 58 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" g_return_val_if_fail (SIDEBAR_IS_EMPHASIZABLE_ENTRY (self), FALSE); #line 58 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" return SIDEBAR_EMPHASIZABLE_ENTRY_GET_INTERFACE (self)->is_emphasized (self); -#line 520 "Entry.c" +#line 582 "Entry.c" } -static void sidebar_emphasizable_entry_base_init (SidebarEmphasizableEntryIface * iface) { +static void +sidebar_emphasizable_entry_base_init (SidebarEmphasizableEntryIface * iface) +{ #line 55 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" static gboolean initialized = FALSE; #line 55 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" @@ -529,12 +593,14 @@ static void sidebar_emphasizable_entry_base_init (SidebarEmphasizableEntryIface initialized = TRUE; #line 55 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" sidebar_emphasizable_entry_signals[SIDEBAR_EMPHASIZABLE_ENTRY_IS_EMPHASIZED_CHANGED_SIGNAL] = g_signal_new ("is-emphasized-changed", SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); -#line 533 "Entry.c" +#line 597 "Entry.c" } } -GType sidebar_emphasizable_entry_get_type (void) { +GType +sidebar_emphasizable_entry_get_type (void) +{ static volatile gsize sidebar_emphasizable_entry_type_id__volatile = 0; if (g_once_init_enter (&sidebar_emphasizable_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SidebarEmphasizableEntryIface), (GBaseInitFunc) sidebar_emphasizable_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -547,28 +613,34 @@ GType sidebar_emphasizable_entry_get_type (void) { } -void sidebar_destroyable_entry_destroy_source (SidebarDestroyableEntry* self) { +void +sidebar_destroyable_entry_destroy_source (SidebarDestroyableEntry* self) +{ #line 62 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" g_return_if_fail (SIDEBAR_IS_DESTROYABLE_ENTRY (self)); #line 62 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" SIDEBAR_DESTROYABLE_ENTRY_GET_INTERFACE (self)->destroy_source (self); -#line 556 "Entry.c" +#line 624 "Entry.c" } -static void sidebar_destroyable_entry_base_init (SidebarDestroyableEntryIface * iface) { +static void +sidebar_destroyable_entry_base_init (SidebarDestroyableEntryIface * iface) +{ #line 61 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" static gboolean initialized = FALSE; #line 61 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" if (!initialized) { #line 61 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" initialized = TRUE; -#line 567 "Entry.c" +#line 637 "Entry.c" } } -GType sidebar_destroyable_entry_get_type (void) { +GType +sidebar_destroyable_entry_get_type (void) +{ static volatile gsize sidebar_destroyable_entry_type_id__volatile = 0; if (g_once_init_enter (&sidebar_destroyable_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SidebarDestroyableEntryIface), (GBaseInitFunc) sidebar_destroyable_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -581,37 +653,47 @@ GType sidebar_destroyable_entry_get_type (void) { } -gboolean sidebar_internal_drop_target_entry_internal_drop_received (SidebarInternalDropTargetEntry* self, GeeList* sources) { +gboolean +sidebar_internal_drop_target_entry_internal_drop_received (SidebarInternalDropTargetEntry* self, + GeeList* sources) +{ #line 67 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" g_return_val_if_fail (SIDEBAR_IS_INTERNAL_DROP_TARGET_ENTRY (self), FALSE); #line 67 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" return SIDEBAR_INTERNAL_DROP_TARGET_ENTRY_GET_INTERFACE (self)->internal_drop_received (self, sources); -#line 590 "Entry.c" +#line 665 "Entry.c" } -gboolean sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* self, GtkSelectionData* data) { +gboolean +sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* self, + GtkSelectionData* data) +{ #line 68 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" g_return_val_if_fail (SIDEBAR_IS_INTERNAL_DROP_TARGET_ENTRY (self), FALSE); #line 68 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" return SIDEBAR_INTERNAL_DROP_TARGET_ENTRY_GET_INTERFACE (self)->internal_drop_received_arbitrary (self, data); -#line 599 "Entry.c" +#line 677 "Entry.c" } -static void sidebar_internal_drop_target_entry_base_init (SidebarInternalDropTargetEntryIface * iface) { +static void +sidebar_internal_drop_target_entry_base_init (SidebarInternalDropTargetEntryIface * iface) +{ #line 65 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" static gboolean initialized = FALSE; #line 65 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" if (!initialized) { #line 65 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" initialized = TRUE; -#line 610 "Entry.c" +#line 690 "Entry.c" } } -GType sidebar_internal_drop_target_entry_get_type (void) { +GType +sidebar_internal_drop_target_entry_get_type (void) +{ static volatile gsize sidebar_internal_drop_target_entry_type_id__volatile = 0; if (g_once_init_enter (&sidebar_internal_drop_target_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SidebarInternalDropTargetEntryIface), (GBaseInitFunc) sidebar_internal_drop_target_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -624,28 +706,35 @@ GType sidebar_internal_drop_target_entry_get_type (void) { } -void sidebar_internal_drag_source_entry_prepare_selection_data (SidebarInternalDragSourceEntry* self, GtkSelectionData* data) { +void +sidebar_internal_drag_source_entry_prepare_selection_data (SidebarInternalDragSourceEntry* self, + GtkSelectionData* data) +{ #line 72 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" g_return_if_fail (SIDEBAR_IS_INTERNAL_DRAG_SOURCE_ENTRY (self)); #line 72 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" SIDEBAR_INTERNAL_DRAG_SOURCE_ENTRY_GET_INTERFACE (self)->prepare_selection_data (self, data); -#line 633 "Entry.c" +#line 718 "Entry.c" } -static void sidebar_internal_drag_source_entry_base_init (SidebarInternalDragSourceEntryIface * iface) { +static void +sidebar_internal_drag_source_entry_base_init (SidebarInternalDragSourceEntryIface * iface) +{ #line 71 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" static gboolean initialized = FALSE; #line 71 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" if (!initialized) { #line 71 "/home/jens/Source/shotwell/src/sidebar/Entry.vala" initialized = TRUE; -#line 644 "Entry.c" +#line 731 "Entry.c" } } -GType sidebar_internal_drag_source_entry_get_type (void) { +GType +sidebar_internal_drag_source_entry_get_type (void) +{ static volatile gsize sidebar_internal_drag_source_entry_type_id__volatile = 0; if (g_once_init_enter (&sidebar_internal_drag_source_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SidebarInternalDragSourceEntryIface), (GBaseInitFunc) sidebar_internal_drag_source_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; diff --git a/src/sidebar/Sidebar.c b/src/sidebar/Sidebar.c index 7a44e33..fcafa8d 100644 --- a/src/sidebar/Sidebar.c +++ b/src/sidebar/Sidebar.c @@ -1,4 +1,4 @@ -/* Sidebar.c generated by valac 0.36.6, the Vala compiler +/* Sidebar.c generated by valac 0.40.4, the Vala compiler * generated from Sidebar.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include @@ -17,11 +18,15 @@ void sidebar_init (GError** error); void sidebar_terminate (void); -void sidebar_init (GError** error) { +void +sidebar_init (GError** error) +{ } -void sidebar_terminate (void) { +void +sidebar_terminate (void) +{ } diff --git a/src/sidebar/Tree.c b/src/sidebar/Tree.c index 1345227..edb6a3f 100644 --- a/src/sidebar/Tree.c +++ b/src/sidebar/Tree.c @@ -1,4 +1,4 @@ -/* Tree.c generated by valac 0.36.6, the Vala compiler +/* Tree.c generated by valac 0.40.4, the Vala compiler * generated from Tree.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -58,10 +59,15 @@ typedef struct _SidebarTreeEntryWrapperClass SidebarTreeEntryWrapperClass; typedef struct _SidebarBranch SidebarBranch; typedef struct _SidebarBranchClass SidebarBranchClass; +enum { + SIDEBAR_TREE_0_PROPERTY, + SIDEBAR_TREE_NUM_PROPERTIES +}; +static GParamSpec* sidebar_tree_properties[SIDEBAR_TREE_NUM_PROPERTIES]; #define SIDEBAR_TREE_TYPE_COLUMNS (sidebar_tree_columns_get_type ()) #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) -#define _gtk_tree_row_reference_free0(var) ((var == NULL) ? NULL : (var = (gtk_tree_row_reference_free (var), NULL))) +#define __vala_GtkTreeRowReference_free0(var) ((var == NULL) ? NULL : (var = (_vala_GtkTreeRowReference_free (var), NULL))) #define LIBRARY_WINDOW_TYPE_TARGET_TYPE (library_window_target_type_get_type ()) typedef struct _SidebarTreeEntryWrapperPrivate SidebarTreeEntryWrapperPrivate; @@ -85,7 +91,7 @@ typedef struct _SidebarGroupingClass SidebarGroupingClass; typedef struct _SidebarHeader SidebarHeader; typedef struct _SidebarHeaderClass SidebarHeaderClass; -#define _gtk_tree_path_free0(var) ((var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL))) +#define __vala_GtkTreePath_free0(var) ((var == NULL) ? NULL : (var = (_vala_GtkTreePath_free (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) #define TYPE_APPLICATION (application_get_type ()) @@ -99,7 +105,7 @@ typedef struct _Application Application; typedef struct _ApplicationClass ApplicationClass; #define _application_unref0(var) ((var == NULL) ? NULL : (var = (application_unref (var), NULL))) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) -#define __g_list_free__gtk_tree_path_free0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__gtk_tree_path_free0_ (var), NULL))) +#define __g_list_free___vala_GtkTreePath_free0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free___vala_GtkTreePath_free0_ (var), NULL))) #define SIDEBAR_TYPE_EMPHASIZABLE_ENTRY (sidebar_emphasizable_entry_get_type ()) #define SIDEBAR_EMPHASIZABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, SidebarEmphasizableEntry)) @@ -324,6 +330,16 @@ typedef struct _LibraryWindowClass LibraryWindowClass; typedef struct _Tag Tag; typedef struct _TagClass TagClass; +enum { + SIDEBAR_TREE_ENTRY_WRAPPER_0_PROPERTY, + SIDEBAR_TREE_ENTRY_WRAPPER_NUM_PROPERTIES +}; +static GParamSpec* sidebar_tree_entry_wrapper_properties[SIDEBAR_TREE_ENTRY_WRAPPER_NUM_PROPERTIES]; +enum { + SIDEBAR_TREE_ROOT_WRAPPER_0_PROPERTY, + SIDEBAR_TREE_ROOT_WRAPPER_NUM_PROPERTIES +}; +static GParamSpec* sidebar_tree_root_wrapper_properties[SIDEBAR_TREE_ROOT_WRAPPER_NUM_PROPERTIES]; enum { SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL, SIDEBAR_TREE_SELECTED_ENTRY_REMOVED_SIGNAL, @@ -332,9 +348,9 @@ enum { SIDEBAR_TREE_BRANCH_SHOWN_SIGNAL, SIDEBAR_TREE_PAGE_CREATED_SIGNAL, SIDEBAR_TREE_DESTROYING_PAGE_SIGNAL, - SIDEBAR_TREE_LAST_SIGNAL + SIDEBAR_TREE_NUM_SIGNALS }; -static guint sidebar_tree_signals[SIDEBAR_TREE_LAST_SIGNAL] = {0}; +static guint sidebar_tree_signals[SIDEBAR_TREE_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -473,67 +489,146 @@ GType sidebar_entry_get_type (void) G_GNUC_CONST; static GType sidebar_tree_entry_wrapper_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; GType sidebar_branch_get_type (void) G_GNUC_CONST; #define SIDEBAR_TREE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SIDEBAR_TYPE_TREE, SidebarTreePrivate)) -enum { - SIDEBAR_TREE_DUMMY_PROPERTY -}; static void sidebar_tree_on_editing_canceled (SidebarTree* self); -static void _sidebar_tree_on_editing_canceled_gtk_cell_renderer_editing_canceled (GtkCellRenderer* _sender, gpointer self); -static void sidebar_tree_on_editing_started (SidebarTree* self, GtkCellEditable* editable, const gchar* path); -static void _sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started (GtkCellRenderer* _sender, GtkCellEditable* editable, const gchar* path, gpointer self); +static void _sidebar_tree_on_editing_canceled_gtk_cell_renderer_editing_canceled (GtkCellRenderer* _sender, + gpointer self); +static void sidebar_tree_on_editing_started (SidebarTree* self, + GtkCellEditable* editable, + const gchar* path); +static void _sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started (GtkCellRenderer* _sender, + GtkCellEditable* editable, + const gchar* path, + gpointer self); static GType sidebar_tree_columns_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; +static void _vala_GtkTreeRowReference_free (GtkTreeRowReference* self); #define SIDEBAR_TREE_ICON_SIZE 16 static void sidebar_tree_on_new_tag (SidebarTree* self); -static void _sidebar_tree_on_new_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _sidebar_tree_on_new_tag_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void sidebar_tree_on_new_search (SidebarTree* self); -static void _sidebar_tree_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -SidebarTree* sidebar_tree_new (GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target); -SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target); -void sidebar_tree_icon_renderer_function (SidebarTree* self, GtkCellLayout* layout, GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter); -static void _sidebar_tree_icon_renderer_function_gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self); -static gboolean sidebar_tree_on_selection (SidebarTree* self, GtkTreeSelection* selection, GtkTreeModel* model, GtkTreePath* path, gboolean path_currently_selected); -static gboolean _sidebar_tree_on_selection_gtk_tree_selection_func (GtkTreeSelection* selection, GtkTreeModel* model, GtkTreePath* path, gboolean path_currently_selected, gpointer self); -gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTreePath* path); -static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self); -static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self); +static void _sidebar_tree_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +SidebarTree* sidebar_tree_new (GtkTargetEntry* target_entries, + int target_entries_length1, + GdkDragAction actions, + SidebarTreeExternalDropHandler drop_handler, + void* drop_handler_target); +SidebarTree* sidebar_tree_construct (GType object_type, + GtkTargetEntry* target_entries, + int target_entries_length1, + GdkDragAction actions, + SidebarTreeExternalDropHandler drop_handler, + void* drop_handler_target); +void sidebar_tree_icon_renderer_function (SidebarTree* self, + GtkCellLayout* layout, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter); +static void _sidebar_tree_icon_renderer_function_gtk_cell_layout_data_func (GtkCellLayout* cell_layout, + GtkCellRenderer* cell, + GtkTreeModel* tree_model, + GtkTreeIter* iter, + gpointer self); +static gboolean sidebar_tree_on_selection (SidebarTree* self, + GtkTreeSelection* selection, + GtkTreeModel* model, + GtkTreePath* path, + gboolean path_currently_selected); +static gboolean _sidebar_tree_on_selection_gtk_tree_selection_func (GtkTreeSelection* selection, + GtkTreeModel* model, + GtkTreePath* path, + gboolean path_currently_selected, + gpointer self); +gboolean sidebar_tree_on_toggle_row (SidebarTree* self, + GtkTreeIter* iter, + GtkTreePath* path); +static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row (GtkTreeView* _sender, + GtkTreeIter* iter, + GtkTreePath* path, + gpointer self); +static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row (GtkTreeView* _sender, + GtkTreeIter* iter, + GtkTreePath* path, + gpointer self); GType library_window_target_type_get_type (void) G_GNUC_CONST; -static void _vala_array_add67 (GtkTargetEntry* * array, int* length, int* size, const GtkTargetEntry* value); +static void _vala_array_add67 (GtkTargetEntry* * array, + int* length, + int* size, + const GtkTargetEntry* value); static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self); -static gboolean _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self); +static gboolean _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu (GtkWidget* _sender, + gpointer self); static void sidebar_tree_setup_default_context_menu (SidebarTree* self); -static void sidebar_tree_on_drag_begin (SidebarTree* self, GdkDragContext* ctx); -static void _sidebar_tree_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self); -static void sidebar_tree_on_drag_end (SidebarTree* self, GdkDragContext* ctx); -static void _sidebar_tree_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self); -static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext* context, gint x, gint y, guint time_); -static gboolean _sidebar_tree_on_drag_motion_gtk_widget_drag_motion (GtkWidget* _sender, GdkDragContext* context, gint x, gint y, guint time_, gpointer self); -static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* self, GtkTreeIter* iter); +static void sidebar_tree_on_drag_begin (SidebarTree* self, + GdkDragContext* ctx); +static void _sidebar_tree_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, + GdkDragContext* context, + gpointer self); +static void sidebar_tree_on_drag_end (SidebarTree* self, + GdkDragContext* ctx); +static void _sidebar_tree_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, + GdkDragContext* context, + gpointer self); +static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, + GdkDragContext* context, + gint x, + gint y, + guint time_); +static gboolean _sidebar_tree_on_drag_motion_gtk_widget_drag_motion (GtkWidget* _sender, + GdkDragContext* context, + gint x, + gint y, + guint time_, + gpointer self); +static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* self, + GtkTreeIter* iter); GType sidebar_grouping_get_type (void) G_GNUC_CONST; GType sidebar_header_get_type (void) G_GNUC_CONST; -static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* self, GtkTreePath* path); +static void _vala_GtkTreePath_free (GtkTreePath* self); +static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* self, + GtkTreePath* path); gchar* resources_get_ui (const gchar* filename); -void app_window_error_message (const gchar* message, GtkWindow* parent); +void app_window_error_message (const gchar* message, + GtkWindow* parent); gpointer application_ref (gpointer instance); void application_unref (gpointer instance); -GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_application (GValue* value, gpointer v_object); -void value_take_application (GValue* value, gpointer v_object); +GParamSpec* param_spec_application (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_application (GValue* value, + gpointer v_object); +void value_take_application (GValue* value, + gpointer v_object); gpointer value_get_application (const GValue* value); GType application_get_type (void) G_GNUC_CONST; Application* application_get_instance (void); void application_panic (Application* self); -static gboolean sidebar_tree_has_wrapper (SidebarTree* self, SidebarEntry* entry); -static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper (SidebarTree* self, SidebarEntry* entry); +static gboolean sidebar_tree_has_wrapper (SidebarTree* self, + SidebarEntry* entry); +static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper (SidebarTree* self, + SidebarEntry* entry); gchar* sidebar_entry_to_string (SidebarEntry* self); -gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboolean mask_signal); -gboolean sidebar_tree_expand_to_entry (SidebarTree* self, SidebarEntry* entry); +gboolean sidebar_tree_place_cursor (SidebarTree* self, + SidebarEntry* entry, + gboolean mask_signal); +gboolean sidebar_tree_expand_to_entry (SidebarTree* self, + SidebarEntry* entry); static GtkTreePath* sidebar_tree_entry_wrapper_get_path (SidebarTreeEntryWrapper* self); -gboolean sidebar_tree_scroll_to_entry (SidebarTree* self, SidebarEntry* entry); -gboolean sidebar_tree_is_selected (SidebarTree* self, SidebarEntry* entry); +gboolean sidebar_tree_scroll_to_entry (SidebarTree* self, + SidebarEntry* entry); +gboolean sidebar_tree_is_selected (SidebarTree* self, + SidebarEntry* entry); gboolean sidebar_tree_is_any_selected (SidebarTree* self); static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self); -static void _gtk_tree_path_free0_ (gpointer var); -static void _g_list_free__gtk_tree_path_free0_ (GList* self); -static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self, SidebarEntry* entry); +static GtkTreePath* _vala_GtkTreePath_copy (GtkTreePath* self); +static void __vala_GtkTreePath_free0_ (gpointer var); +static inline void _g_list_free___vala_GtkTreePath_free0_ (GList* self); +static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self, + SidebarEntry* entry); gchar* guarded_markup_escape_text (const gchar* plain); gchar* sidebar_entry_get_sidebar_name (SidebarEntry* self); GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST; @@ -546,102 +641,229 @@ gboolean sidebar_renameable_entry_is_user_renameable (SidebarRenameableEntry* se GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST; void sidebar_tree_disable_editing (SidebarTree* self); void sidebar_tree_enable_editing (SidebarTree* self); -void sidebar_tree_toggle_branch_expansion (SidebarTree* self, GtkTreePath* path, gboolean expand_all); -void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry); -void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position); +void sidebar_tree_toggle_branch_expansion (SidebarTree* self, + GtkTreePath* path, + gboolean expand_all); +void sidebar_tree_expand_to_first_child (SidebarTree* self, + SidebarEntry* entry); +void sidebar_tree_graft (SidebarTree* self, + SidebarBranch* branch, + gint position); gboolean sidebar_branch_get_show_branch (SidebarBranch* self); -static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* branch); +static void sidebar_tree_associate_branch (SidebarTree* self, + SidebarBranch* branch); gboolean sidebar_branch_is_startup_expand_to_first_child (SidebarBranch* self); SidebarEntry* sidebar_branch_get_root (SidebarBranch* self); gboolean sidebar_branch_is_startup_open_grouping (SidebarBranch* self); -static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry); -static void _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added (SidebarBranch* _sender, SidebarEntry* entry, gpointer self); -static void sidebar_tree_on_branch_entry_removed (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry); -static void _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed (SidebarBranch* _sender, SidebarEntry* entry, gpointer self); -static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry); -static void _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved (SidebarBranch* _sender, SidebarEntry* entry, gpointer self); -static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry, SidebarEntry* old_parent); -static void _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented (SidebarBranch* _sender, SidebarEntry* entry, SidebarEntry* old_parent, gpointer self); -static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry); -static void _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered (SidebarBranch* _sender, SidebarEntry* entry, gpointer self); -static void sidebar_tree_on_show_branch (SidebarTree* self, SidebarBranch* branch, gboolean shown); -static void _sidebar_tree_on_show_branch_sidebar_branch_show_branch (SidebarBranch* _sender, gboolean show, gpointer self); +static void sidebar_tree_on_branch_entry_added (SidebarTree* self, + SidebarBranch* branch, + SidebarEntry* entry); +static void _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added (SidebarBranch* _sender, + SidebarEntry* entry, + gpointer self); +static void sidebar_tree_on_branch_entry_removed (SidebarTree* self, + SidebarBranch* branch, + SidebarEntry* entry); +static void _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed (SidebarBranch* _sender, + SidebarEntry* entry, + gpointer self); +static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, + SidebarBranch* branch, + SidebarEntry* entry); +static void _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved (SidebarBranch* _sender, + SidebarEntry* entry, + gpointer self); +static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, + SidebarBranch* branch, + SidebarEntry* entry, + SidebarEntry* old_parent); +static void _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented (SidebarBranch* _sender, + SidebarEntry* entry, + SidebarEntry* old_parent, + gpointer self); +static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, + SidebarBranch* branch, + SidebarEntry* entry); +static void _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered (SidebarBranch* _sender, + SidebarEntry* entry, + gpointer self); +static void sidebar_tree_on_show_branch (SidebarTree* self, + SidebarBranch* branch, + gboolean shown); +static void _sidebar_tree_on_show_branch_sidebar_branch_show_branch (SidebarBranch* _sender, + gboolean show, + gpointer self); static GType sidebar_tree_root_wrapper_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static GtkTreeIter* _gtk_tree_iter_dup (GtkTreeIter* self); -static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* assoc_iter, SidebarTreeEntryWrapper* wrapper); -static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_new (GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path, gint root_position); -static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_construct (GType object_type, GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path, gint root_position); -static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* branch, SidebarEntry* parent, GtkTreeIter* parent_iter); -GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent); -static void sidebar_tree_associate_entry (SidebarTree* self, GtkTreeIter* assoc_iter, SidebarEntry* entry); -static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_new (GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path); -static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_construct (GType object_type, GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path); +static void sidebar_tree_associate_wrapper (SidebarTree* self, + GtkTreeIter* assoc_iter, + SidebarTreeEntryWrapper* wrapper); +static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_new (GtkTreeModel* model, + SidebarEntry* entry, + GtkTreePath* path, + gint root_position); +static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_construct (GType object_type, + GtkTreeModel* model, + SidebarEntry* entry, + GtkTreePath* path, + gint root_position); +static void sidebar_tree_associate_children (SidebarTree* self, + SidebarBranch* branch, + SidebarEntry* parent, + GtkTreeIter* parent_iter); +GeeList* sidebar_branch_get_children (SidebarBranch* self, + SidebarEntry* parent); +static void sidebar_tree_associate_entry (SidebarTree* self, + GtkTreeIter* assoc_iter, + SidebarEntry* entry); +static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_new (GtkTreeModel* model, + SidebarEntry* entry, + GtkTreePath* path); +static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_construct (GType object_type, + GtkTreeModel* model, + SidebarEntry* entry, + GtkTreePath* path); gchar* sidebar_entry_get_sidebar_tooltip (SidebarEntry* self); -static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter); -static void sidebar_tree_on_sidebar_tooltip_changed (SidebarTree* self, SidebarEntry* entry, const gchar* tooltip); -static void _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed (SidebarEntry* _sender, const gchar* tooltip, gpointer self); -static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntry* entry, const gchar* icon_name); -static void _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed (SidebarEntry* _sender, const gchar* icon, gpointer self); +static void sidebar_tree_load_entry_icons (SidebarTree* self, + GtkTreeIter* iter); +static void sidebar_tree_on_sidebar_tooltip_changed (SidebarTree* self, + SidebarEntry* entry, + const gchar* tooltip); +static void _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed (SidebarEntry* _sender, + const gchar* tooltip, + gpointer self); +static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, + SidebarEntry* entry, + const gchar* icon_name); +static void _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed (SidebarEntry* _sender, + const gchar* icon, + gpointer self); GType page_get_type (void) G_GNUC_CONST; GType sidebar_page_representative_get_type (void) G_GNUC_CONST; -static void sidebar_tree_on_sidebar_page_created (SidebarTree* self, SidebarPageRepresentative* entry, Page* page); -static void _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, Page* page, gpointer self); -static void sidebar_tree_on_sidebar_destroying_page (SidebarTree* self, SidebarPageRepresentative* entry, Page* page); -static void _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, Page* page, gpointer self); -static void sidebar_tree_on_is_emphasized_changed (SidebarTree* self, SidebarEmphasizableEntry* entry, gboolean is_emphasized); -static void _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed (SidebarEmphasizableEntry* _sender, gboolean emphasized, gpointer self); -static void sidebar_tree_on_sidebar_name_changed (SidebarTree* self, SidebarEntry* entry, const gchar* name); -static void _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed (SidebarRenameableEntry* _sender, const gchar* name, gpointer self); -void sidebar_entry_grafted (SidebarEntry* self, SidebarTree* tree); -static SidebarTreeEntryWrapper* sidebar_tree_reparent_wrapper (SidebarTree* self, GtkTreeIter* new_iter, SidebarTreeEntryWrapper* current_wrapper); -void sidebar_tree_prune (SidebarTree* self, SidebarBranch* branch); -static void sidebar_tree_disassociate_branch (SidebarTree* self, SidebarBranch* branch); -static void sidebar_tree_disassociate_wrapper_and_signal (SidebarTree* self, SidebarTreeEntryWrapper* wrapper, gboolean only_children); -static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEntryWrapper* wrapper, gboolean only_children); -static void sidebar_tree_entry_wrapper_get_iter (SidebarTreeEntryWrapper* self, GtkTreeIter* result); -void sidebar_entry_pruned (SidebarEntry* self, SidebarTree* tree); -SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry); -SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self, SidebarEntry* entry); +static void sidebar_tree_on_sidebar_page_created (SidebarTree* self, + SidebarPageRepresentative* entry, + Page* page); +static void _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, + Page* page, + gpointer self); +static void sidebar_tree_on_sidebar_destroying_page (SidebarTree* self, + SidebarPageRepresentative* entry, + Page* page); +static void _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, + Page* page, + gpointer self); +static void sidebar_tree_on_is_emphasized_changed (SidebarTree* self, + SidebarEmphasizableEntry* entry, + gboolean is_emphasized); +static void _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed (SidebarEmphasizableEntry* _sender, + gboolean emphasized, + gpointer self); +static void sidebar_tree_on_sidebar_name_changed (SidebarTree* self, + SidebarEntry* entry, + const gchar* name); +static void _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed (SidebarRenameableEntry* _sender, + const gchar* name, + gpointer self); +void sidebar_entry_grafted (SidebarEntry* self, + SidebarTree* tree); +static SidebarTreeEntryWrapper* sidebar_tree_reparent_wrapper (SidebarTree* self, + GtkTreeIter* new_iter, + SidebarTreeEntryWrapper* current_wrapper); +void sidebar_tree_prune (SidebarTree* self, + SidebarBranch* branch); +static void sidebar_tree_disassociate_branch (SidebarTree* self, + SidebarBranch* branch); +static void sidebar_tree_disassociate_wrapper_and_signal (SidebarTree* self, + SidebarTreeEntryWrapper* wrapper, + gboolean only_children); +static void sidebar_tree_disassociate_wrapper (SidebarTree* self, + SidebarTreeEntryWrapper* wrapper, + gboolean only_children); +static void sidebar_tree_entry_wrapper_get_iter (SidebarTreeEntryWrapper* self, + GtkTreeIter* result); +void sidebar_entry_pruned (SidebarEntry* self, + SidebarTree* tree); +SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, + SidebarEntry* entry); +SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self, + SidebarEntry* entry); gboolean sidebar_branch_is_auto_open_on_new_child (SidebarBranch* self); -SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self, SidebarEntry* entry); +SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self, + SidebarEntry* entry); static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self); -static void sidebar_tree_rename_entry (SidebarTree* self, SidebarEntry* entry); +static void sidebar_tree_rename_entry (SidebarTree* self, + SidebarEntry* entry); gchar* sidebar_entry_get_sidebar_icon (SidebarEntry* self); -static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter); -static GtkTreePath* sidebar_tree_get_path_from_event (SidebarTree* self, GdkEventButton* event); -static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath* path, GdkEventButton* event); +static void sidebar_tree_load_branch_icons (SidebarTree* self, + GtkTreeIter* iter); +static GtkTreePath* sidebar_tree_get_path_from_event (SidebarTree* self, + GdkEventButton* event); +static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, + GtkTreePath* path, + GdkEventButton* event); GType sidebar_contextable_get_type (void) G_GNUC_CONST; -GtkMenu* sidebar_contextable_get_sidebar_context_menu (SidebarContextable* self, GdkEventButton* event); -static gboolean sidebar_tree_popup_default_context_menu (SidebarTree* self, GdkEventButton* event); -static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventButton* event); +GtkMenu* sidebar_contextable_get_sidebar_context_menu (SidebarContextable* self, + GdkEventButton* event); +static gboolean sidebar_tree_popup_default_context_menu (SidebarTree* self, + GdkEventButton* event); +static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, + GdkEventButton* event); GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; GType sidebar_internal_drop_target_entry_get_type (void) G_GNUC_CONST; -gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, GdkEventKey* event); -static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey* event); +gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, + GdkEventKey* event); +static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, + GdkEventKey* event); static gboolean sidebar_tree_rename_in_place (SidebarTree* self); -static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path); -gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* entry); -static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* path); -static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint time); +static gboolean sidebar_tree_destroy_path (SidebarTree* self, + GtkTreePath* path); +gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, + SidebarEntry* entry); +static gboolean sidebar_tree_can_rename_path (SidebarTree* self, + GtkTreePath* path); +static void sidebar_tree_real_drag_data_get (GtkWidget* base, + GdkDragContext* context, + GtkSelectionData* selection_data, + guint info, + guint time); GType sidebar_internal_drag_source_entry_get_type (void) G_GNUC_CONST; -void sidebar_internal_drag_source_entry_prepare_selection_data (SidebarInternalDragSourceEntry* self, GtkSelectionData* data); -static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContext* context, gint x, gint y, GtkSelectionData* selection_data, guint info, guint time); +void sidebar_internal_drag_source_entry_prepare_selection_data (SidebarInternalDragSourceEntry* self, + GtkSelectionData* data); +static void sidebar_tree_real_drag_data_received (GtkWidget* base, + GdkDragContext* context, + gint x, + gint y, + GtkSelectionData* selection_data, + guint info, + guint time); #define LIBRARY_WINDOW_TAG_PATH_MIME_TYPE "shotwell/tag-path" -gboolean sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* self, GtkSelectionData* data); -GeeList* unserialize_media_sources (guchar* serialized, gint size); -gboolean sidebar_internal_drop_target_entry_internal_drop_received (SidebarInternalDropTargetEntry* self, GeeList* sources); -static gboolean sidebar_tree_real_drag_motion (GtkWidget* base, GdkDragContext* context, gint x, gint y, guint time); +gboolean sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* self, + GtkSelectionData* data); +GeeList* unserialize_media_sources (guchar* serialized, + gint size); +gboolean sidebar_internal_drop_target_entry_internal_drop_received (SidebarInternalDropTargetEntry* self, + GeeList* sources); +static gboolean sidebar_tree_real_drag_motion (GtkWidget* base, + GdkDragContext* context, + gint x, + gint y, + guint time); GType sidebar_destroyable_entry_get_type (void) G_GNUC_CONST; void sidebar_destroyable_entry_destroy_source (SidebarDestroyableEntry* self); static void sidebar_tree_on_editing_done (SidebarTree* self); -static void _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done (GtkCellEditable* _sender, gpointer self); -static gboolean sidebar_tree_on_editing_focus_out (SidebarTree* self, GdkEventFocus* event); -static gboolean _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self); -void sidebar_renameable_entry_rename (SidebarRenameableEntry* self, const gchar* new_name); +static void _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done (GtkCellEditable* _sender, + gpointer self); +static gboolean sidebar_tree_on_editing_focus_out (SidebarTree* self, + GdkEventFocus* event); +static gboolean _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, + GdkEventFocus* event, + gpointer self); +void sidebar_renameable_entry_rename (SidebarRenameableEntry* self, + const gchar* new_name); SavedSearchDialog* saved_search_dialog_new (void); SavedSearchDialog* saved_search_dialog_construct (GType object_type); GType saved_search_dialog_get_type (void) G_GNUC_CONST; @@ -653,49 +875,71 @@ NewRootTagCommand* new_root_tag_command_new (void); NewRootTagCommand* new_root_tag_command_construct (GType object_type); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* app_window_get_command_manager (void); -void command_manager_execute (CommandManager* self, Command* command); +void command_manager_execute (CommandManager* self, + Command* command); GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; GType library_window_get_type (void) G_GNUC_CONST; LibraryWindow* library_window_get_app (void); GType tag_get_type (void) G_GNUC_CONST; -void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag); +void library_window_rename_tag_in_sidebar (LibraryWindow* self, + Tag* tag); Tag* new_root_tag_command_get_created_tag (NewRootTagCommand* self); -static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -enum { - SIDEBAR_TREE_ENTRY_WRAPPER_DUMMY_PROPERTY -}; +static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); static void sidebar_tree_entry_wrapper_finalize (GObject * obj); -enum { - SIDEBAR_TREE_ROOT_WRAPPER_DUMMY_PROPERTY -}; static void sidebar_tree_root_wrapper_finalize (GObject * obj); static void sidebar_tree_finalize (GObject * obj); static const GActionEntry SIDEBAR_TREE_entries[2] = {{"tag.new", _sidebar_tree_on_new_tag_gsimple_action_activate_callback}, {"search.new", _sidebar_tree_on_new_search_gsimple_action_activate_callback}}; -static void _sidebar_tree_on_editing_canceled_gtk_cell_renderer_editing_canceled (GtkCellRenderer* _sender, gpointer self) { +static void +_sidebar_tree_on_editing_canceled_gtk_cell_renderer_editing_canceled (GtkCellRenderer* _sender, + gpointer self) +{ #line 155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_editing_canceled ((SidebarTree*) self); -#line 688 "Tree.c" +#line 925 "Tree.c" } -static void _sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started (GtkCellRenderer* _sender, GtkCellEditable* editable, const gchar* path, gpointer self) { +static void +_sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started (GtkCellRenderer* _sender, + GtkCellEditable* editable, + const gchar* path, + gpointer self) +{ #line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_editing_started ((SidebarTree*) self, editable, path); -#line 695 "Tree.c" +#line 937 "Tree.c" } -static GType sidebar_tree_columns_get_type (void) { +static GType +sidebar_tree_columns_get_type (void) +{ static volatile gsize sidebar_tree_columns_type_id__volatile = 0; if (g_once_init_enter (&sidebar_tree_columns_type_id__volatile)) { static const GEnumValue values[] = {{SIDEBAR_TREE_COLUMNS_NAME, "SIDEBAR_TREE_COLUMNS_NAME", "name"}, {SIDEBAR_TREE_COLUMNS_TOOLTIP, "SIDEBAR_TREE_COLUMNS_TOOLTIP", "tooltip"}, {SIDEBAR_TREE_COLUMNS_WRAPPER, "SIDEBAR_TREE_COLUMNS_WRAPPER", "wrapper"}, {SIDEBAR_TREE_COLUMNS_ICON, "SIDEBAR_TREE_COLUMNS_ICON", "icon"}, {SIDEBAR_TREE_COLUMNS_N_COLUMNS, "SIDEBAR_TREE_COLUMNS_N_COLUMNS", "n-columns"}, {0, NULL, NULL}}; @@ -707,109 +951,180 @@ static GType sidebar_tree_columns_get_type (void) { } -static void _sidebar_tree_on_new_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_vala_GtkTreeRowReference_free (GtkTreeRowReference* self) +{ +#line 77 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + g_boxed_free (gtk_tree_row_reference_get_type (), self); +#line 960 "Tree.c" +} + + +static void +_sidebar_tree_on_new_tag_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 192 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_new_tag ((SidebarTree*) self); -#line 714 "Tree.c" +#line 971 "Tree.c" } -static void _sidebar_tree_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_sidebar_tree_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 192 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_new_search ((SidebarTree*) self); -#line 721 "Tree.c" +#line 982 "Tree.c" } -static void _sidebar_tree_icon_renderer_function_gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self) { +static void +_sidebar_tree_icon_renderer_function_gtk_cell_layout_data_func (GtkCellLayout* cell_layout, + GtkCellRenderer* cell, + GtkTreeModel* tree_model, + GtkTreeIter* iter, + gpointer self) +{ #line 103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_icon_renderer_function ((SidebarTree*) self, cell_layout, cell, tree_model, iter); -#line 728 "Tree.c" +#line 995 "Tree.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return self ? g_object_ref (self) : NULL; -#line 735 "Tree.c" +#line 1004 "Tree.c" } -static gboolean _sidebar_tree_on_selection_gtk_tree_selection_func (GtkTreeSelection* selection, GtkTreeModel* model, GtkTreePath* path, gboolean path_currently_selected, gpointer self) { +static gboolean +_sidebar_tree_on_selection_gtk_tree_selection_func (GtkTreeSelection* selection, + GtkTreeModel* model, + GtkTreePath* path, + gboolean path_currently_selected, + gpointer self) +{ gboolean result; result = sidebar_tree_on_selection ((SidebarTree*) self, selection, model, path, path_currently_selected); #line 128 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 744 "Tree.c" +#line 1019 "Tree.c" } -static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self) { +static gboolean +_sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row (GtkTreeView* _sender, + GtkTreeIter* iter, + GtkTreePath* path, + gpointer self) +{ gboolean result; result = sidebar_tree_on_toggle_row ((SidebarTree*) self, iter, path); #line 130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 753 "Tree.c" +#line 1033 "Tree.c" } -static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self) { +static gboolean +_sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row (GtkTreeView* _sender, + GtkTreeIter* iter, + GtkTreePath* path, + gpointer self) +{ gboolean result; result = sidebar_tree_on_toggle_row ((SidebarTree*) self, iter, path); #line 131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 762 "Tree.c" +#line 1047 "Tree.c" } -static void _vala_array_add67 (GtkTargetEntry* * array, int* length, int* size, const GtkTargetEntry* value) { +static void +_vala_array_add67 (GtkTargetEntry* * array, + int* length, + int* size, + const GtkTargetEntry* value) +{ #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if ((*length) == (*size)) { #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" *size = (*size) ? (2 * (*size)) : 4; #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" *array = g_renew (GtkTargetEntry, *array, *size); -#line 773 "Tree.c" +#line 1063 "Tree.c" } #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" (*array)[(*length)++] = *value; -#line 777 "Tree.c" +#line 1067 "Tree.c" } -static gboolean _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self) { +static gboolean +_sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu (GtkWidget* _sender, + gpointer self) +{ gboolean result; result = sidebar_tree_on_context_menu_keypress ((SidebarTree*) self); #line 145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 786 "Tree.c" +#line 1079 "Tree.c" } -static void _sidebar_tree_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self) { +static void +_sidebar_tree_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, + GdkDragContext* context, + gpointer self) +{ #line 149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_drag_begin ((SidebarTree*) self, context); -#line 793 "Tree.c" +#line 1090 "Tree.c" } -static void _sidebar_tree_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) { +static void +_sidebar_tree_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, + GdkDragContext* context, + gpointer self) +{ #line 150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_drag_end ((SidebarTree*) self, context); -#line 800 "Tree.c" +#line 1101 "Tree.c" } -static gboolean _sidebar_tree_on_drag_motion_gtk_widget_drag_motion (GtkWidget* _sender, GdkDragContext* context, gint x, gint y, guint time_, gpointer self) { +static gboolean +_sidebar_tree_on_drag_motion_gtk_widget_drag_motion (GtkWidget* _sender, + GdkDragContext* context, + gint x, + gint y, + guint time_, + gpointer self) +{ gboolean result; result = sidebar_tree_on_drag_motion ((SidebarTree*) self, context, x, y, time_); #line 151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 809 "Tree.c" +#line 1117 "Tree.c" } -SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target) { +SidebarTree* +sidebar_tree_construct (GType object_type, + GtkTargetEntry* target_entries, + int target_entries_length1, + GdkDragAction actions, + SidebarTreeExternalDropHandler drop_handler, + void* drop_handler_target) +{ SidebarTree * self = NULL; GtkTreeStore* _tmp0_; GtkTreeViewColumn* text_column = NULL; @@ -829,28 +1144,21 @@ SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_e GtkTreeSelection* selection = NULL; GtkTreeSelection* _tmp11_; GtkTreeSelection* _tmp12_; - GtkTargetEntry* _tmp13_; - gint _tmp13__length1; - GdkDragAction _tmp14_; GtkTargetEntry* source_entries = NULL; - GtkTargetEntry* _tmp15_; + GtkTargetEntry* _tmp13_; gint source_entries_length1; gint _source_entries_size_; + GtkTargetEntry* _tmp14_; + gint _tmp14__length1; + GtkTargetEntry _tmp15_; GtkTargetEntry* _tmp16_; gint _tmp16__length1; - GtkTargetEntry* _tmp17_; - gint _tmp17__length1; - GtkTargetEntry _tmp18_; - GtkTargetEntry* _tmp19_; - gint _tmp19__length1; - SidebarTreeExternalDropHandler _tmp20_; - void* _tmp20__target; #line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self = (SidebarTree*) g_object_new (object_type, NULL); #line 95 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->store; #line 95 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_view_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel)); + gtk_tree_view_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_tree_model_get_type (), GtkTreeModel)); #line 97 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = gtk_tree_view_column_new (); #line 97 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -868,11 +1176,11 @@ SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_e #line 100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_object_set (icon_renderer, "follow-state", TRUE, NULL); #line 101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (icon_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE); + gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (text_column, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (icon_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE); #line 102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (icon_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "gicon", (gint) SIDEBAR_TREE_COLUMNS_ICON); + gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (text_column, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (icon_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "gicon", (gint) SIDEBAR_TREE_COLUMNS_ICON); #line 103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_cell_layout_set_cell_data_func (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (icon_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), _sidebar_tree_icon_renderer_function_gtk_cell_layout_data_func, g_object_ref (self), g_object_unref); + gtk_cell_layout_set_cell_data_func (G_TYPE_CHECK_INSTANCE_CAST (text_column, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (icon_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), _sidebar_tree_icon_renderer_function_gtk_cell_layout_data_func, g_object_ref (self), g_object_unref); #line 104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = (GtkCellRendererText*) gtk_cell_renderer_text_new (); #line 104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -896,11 +1204,11 @@ SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_e #line 108 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = self->priv->text_renderer; #line 108 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); + gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (text_column, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); #line 109 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = self->priv->text_renderer; #line 109 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_cell_renderer_get_type (), GtkCellRenderer), "markup", (gint) SIDEBAR_TREE_COLUMNS_NAME); + gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (text_column, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_cell_renderer_get_type (), GtkCellRenderer), "markup", (gint) SIDEBAR_TREE_COLUMNS_NAME); #line 110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_append_column (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), text_column); #line 112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -916,7 +1224,7 @@ SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_e #line 113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" page_holder = _tmp10_; #line 114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (page_holder, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (invisitext, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); + gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (page_holder, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (invisitext, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); #line 115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_column_set_visible (page_holder, FALSE); #line 116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -950,47 +1258,33 @@ SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_e #line 131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), "test-collapse-row", (GCallback) _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row, self, 0); #line 136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = target_entries; -#line 136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13__length1 = target_entries_length1; -#line 136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = actions; -#line 136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_view_enable_model_drag_dest (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp13_, _tmp13__length1, _tmp14_); + gtk_tree_view_enable_model_drag_dest (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), target_entries, target_entries_length1, actions); #line 138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp15_ = g_new0 (GtkTargetEntry, 0); + _tmp13_ = g_new0 (GtkTargetEntry, 0); #line 138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - source_entries = _tmp15_; + source_entries = _tmp13_; #line 138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" source_entries_length1 = 0; #line 138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _source_entries_size_ = source_entries_length1; #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = source_entries; -#line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16__length1 = source_entries_length1; -#line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp17_ = target_entries; + _tmp14_ = source_entries; #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp17__length1 = target_entries_length1; + _tmp14__length1 = source_entries_length1; #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp18_ = _tmp17_[LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH]; + _tmp15_ = target_entries[LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH]; #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_array_add67 (&source_entries, &source_entries_length1, &_source_entries_size_, &_tmp18_); + _vala_array_add67 (&source_entries, &source_entries_length1, &_source_entries_size_, &_tmp15_); #line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp19_ = source_entries; + _tmp16_ = source_entries; #line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp19__length1 = source_entries_length1; + _tmp16__length1 = source_entries_length1; #line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_view_enable_model_drag_source (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), GDK_BUTTON1_MASK, _tmp19_, _tmp19__length1, GDK_ACTION_COPY); -#line 143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp20_ = drop_handler; + gtk_tree_view_enable_model_drag_source (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), GDK_BUTTON1_MASK, _tmp16_, _tmp16__length1, GDK_ACTION_COPY); #line 143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp20__target = drop_handler_target; + self->priv->drop_handler = drop_handler; #line 143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - self->priv->drop_handler = _tmp20_; -#line 143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - self->priv->drop_handler_target = _tmp20__target; + self->priv->drop_handler_target = drop_handler_target; #line 145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "popup-menu", (GCallback) _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu, self, 0); #line 147 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -1015,25 +1309,36 @@ SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_e _g_object_unref0 (text_column); #line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return self; -#line 1019 "Tree.c" +#line 1313 "Tree.c" } -SidebarTree* sidebar_tree_new (GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target) { +SidebarTree* +sidebar_tree_new (GtkTargetEntry* target_entries, + int target_entries_length1, + GdkDragAction actions, + SidebarTreeExternalDropHandler drop_handler, + void* drop_handler_target) +{ #line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return sidebar_tree_construct (SIDEBAR_TYPE_TREE, target_entries, target_entries_length1, actions, drop_handler, drop_handler_target); -#line 1026 "Tree.c" +#line 1326 "Tree.c" } -void sidebar_tree_icon_renderer_function (SidebarTree* self, GtkCellLayout* layout, GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter) { +void +sidebar_tree_icon_renderer_function (SidebarTree* self, + GtkCellLayout* layout, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter) +{ SidebarTreeEntryWrapper* wrapper = NULL; GtkTreeIter _tmp0_; SidebarTreeEntryWrapper* _tmp1_; SidebarTreeEntryWrapper* _tmp2_; - GtkCellRenderer* _tmp3_; - SidebarTreeEntryWrapper* _tmp4_; - SidebarEntry* _tmp5_; + SidebarTreeEntryWrapper* _tmp3_; + SidebarEntry* _tmp4_; #line 159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -1058,34 +1363,38 @@ void sidebar_tree_icon_renderer_function (SidebarTree* self, GtkCellLayout* layo _g_object_unref0 (wrapper); #line 162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 1062 "Tree.c" +#line 1367 "Tree.c" } #line 164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = renderer; -#line 164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = wrapper; + _tmp3_ = wrapper; #line 164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = _tmp4_->entry; + _tmp4_ = _tmp3_->entry; #line 164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_cell_renderer_set_visible (_tmp3_, !G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_HEADER)); + gtk_cell_renderer_set_visible (renderer, !G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, SIDEBAR_TYPE_HEADER)); #line 159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 1074 "Tree.c" +#line 1377 "Tree.c" } -static void sidebar_tree_on_drag_begin (SidebarTree* self, GdkDragContext* ctx) { +static void +sidebar_tree_on_drag_begin (SidebarTree* self, + GdkDragContext* ctx) +{ #line 167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (GDK_IS_DRAG_CONTEXT (ctx)); #line 168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->is_internal_drag_in_progress = TRUE; -#line 1085 "Tree.c" +#line 1391 "Tree.c" } -static void sidebar_tree_on_drag_end (SidebarTree* self, GdkDragContext* ctx) { +static void +sidebar_tree_on_drag_end (SidebarTree* self, + GdkDragContext* ctx) +{ #line 171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -1096,11 +1405,26 @@ static void sidebar_tree_on_drag_end (SidebarTree* self, GdkDragContext* ctx) { _g_object_unref0 (self->priv->internal_drag_source_entry); #line 173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->internal_drag_source_entry = NULL; -#line 1100 "Tree.c" +#line 1409 "Tree.c" +} + + +static void +_vala_GtkTreePath_free (GtkTreePath* self) +{ +#line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + g_boxed_free (gtk_tree_path_get_type (), self); +#line 1418 "Tree.c" } -static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext* context, gint x, gint y, guint time_) { +static gboolean +sidebar_tree_on_drag_motion (SidebarTree* self, + GdkDragContext* context, + gint x, + gint y, + guint time_) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_; @@ -1112,96 +1436,92 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext* _tmp1_ = self->priv->is_internal_drag_in_progress; #line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp1_) { -#line 1116 "Tree.c" +#line 1440 "Tree.c" SidebarEntry* _tmp2_; #line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = self->priv->internal_drag_source_entry; #line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = _tmp2_ == NULL; -#line 1122 "Tree.c" +#line 1446 "Tree.c" } else { #line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = FALSE; -#line 1126 "Tree.c" +#line 1450 "Tree.c" } #line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp0_) { -#line 1130 "Tree.c" +#line 1454 "Tree.c" GtkTreePath* path = NULL; GtkTreeViewDropPosition position = 0; - gint _tmp3_; - gint _tmp4_; - GtkTreePath* _tmp5_ = NULL; - GtkTreeViewDropPosition _tmp6_ = 0; - GtkTreePath* _tmp7_; -#line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = x; -#line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = y; + GtkTreePath* _tmp3_ = NULL; + GtkTreeViewDropPosition _tmp4_ = 0; + GtkTreePath* _tmp5_; #line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp3_, _tmp4_, &_tmp5_, &_tmp6_); + gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), x, y, &_tmp3_, &_tmp4_); #line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - path = _tmp5_; + path = _tmp3_; #line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - position = _tmp6_; + position = _tmp4_; #line 182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = path; + _tmp5_ = path; #line 182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp7_ != NULL) { -#line 1154 "Tree.c" + if (_tmp5_ != NULL) { +#line 1472 "Tree.c" SidebarTreeEntryWrapper* wrapper = NULL; - GtkTreePath* _tmp8_; - SidebarTreeEntryWrapper* _tmp9_; - SidebarTreeEntryWrapper* _tmp10_; + GtkTreePath* _tmp6_; + SidebarTreeEntryWrapper* _tmp7_; + SidebarTreeEntryWrapper* _tmp8_; #line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = path; + _tmp6_ = path; #line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = sidebar_tree_get_wrapper_at_path (self, _tmp8_); + _tmp7_ = sidebar_tree_get_wrapper_at_path (self, _tmp6_); #line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - wrapper = _tmp9_; + wrapper = _tmp7_; #line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = wrapper; + _tmp8_ = wrapper; #line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp10_ != NULL) { -#line 1169 "Tree.c" - SidebarTreeEntryWrapper* _tmp11_; - SidebarEntry* _tmp12_; - SidebarEntry* _tmp13_; + if (_tmp8_ != NULL) { +#line 1487 "Tree.c" + SidebarTreeEntryWrapper* _tmp9_; + SidebarEntry* _tmp10_; + SidebarEntry* _tmp11_; #line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = wrapper; + _tmp9_ = wrapper; #line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = _tmp11_->entry; + _tmp10_ = _tmp9_->entry; #line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = _g_object_ref0 (_tmp12_); + _tmp11_ = _g_object_ref0 (_tmp10_); #line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (self->priv->internal_drag_source_entry); #line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - self->priv->internal_drag_source_entry = _tmp13_; -#line 1183 "Tree.c" + self->priv->internal_drag_source_entry = _tmp11_; +#line 1501 "Tree.c" } #line 182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 1187 "Tree.c" +#line 1505 "Tree.c" } #line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); -#line 1191 "Tree.c" + __vala_GtkTreePath_free0 (path); +#line 1509 "Tree.c" } #line 189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1197 "Tree.c" +#line 1515 "Tree.c" } -static void sidebar_tree_setup_default_context_menu (SidebarTree* self) { +static void +sidebar_tree_setup_default_context_menu (SidebarTree* self) +{ GError * _inner_error_ = NULL; #line 197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); -#line 1205 "Tree.c" +#line 1525 "Tree.c" { GtkBuilder* _tmp0_; gchar* _tmp1_; @@ -1229,7 +1549,7 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) { _g_free0 (_tmp2_); #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1233 "Tree.c" +#line 1553 "Tree.c" goto __catch55_g_error; } #line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -1270,7 +1590,7 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) { _g_object_unref0 (group); #line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (model); -#line 1274 "Tree.c" +#line 1594 "Tree.c" } goto __finally55; __catch55_g_error: @@ -1308,7 +1628,7 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) { _application_unref0 (_tmp17_); #line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_error_free0 (_error_); -#line 1312 "Tree.c" +#line 1632 "Tree.c" } __finally55: #line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -1319,16 +1639,17 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) { g_clear_error (&_inner_error_); #line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 1323 "Tree.c" +#line 1643 "Tree.c" } } -static gboolean sidebar_tree_has_wrapper (SidebarTree* self, SidebarEntry* entry) { +static gboolean +sidebar_tree_has_wrapper (SidebarTree* self, + SidebarEntry* entry) +{ gboolean result = FALSE; GeeHashMap* _tmp0_; - SidebarEntry* _tmp1_; - gboolean _tmp2_; #line 213 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); #line 213 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -1336,24 +1657,22 @@ static gboolean sidebar_tree_has_wrapper (SidebarTree* self, SidebarEntry* entry #line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->entry_map; #line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = entry; -#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - result = _tmp2_; + result = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry); #line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1347 "Tree.c" +#line 1664 "Tree.c" } -static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper (SidebarTree* self, SidebarEntry* entry) { +static SidebarTreeEntryWrapper* +sidebar_tree_get_wrapper (SidebarTree* self, + SidebarEntry* entry) +{ SidebarTreeEntryWrapper* result = NULL; SidebarTreeEntryWrapper* wrapper = NULL; GeeHashMap* _tmp0_; - SidebarEntry* _tmp1_; - gpointer _tmp2_; - SidebarTreeEntryWrapper* _tmp3_; + gpointer _tmp1_; + SidebarTreeEntryWrapper* _tmp2_; #line 217 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL); #line 217 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -1361,40 +1680,38 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper (SidebarTree* self, Sid #line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->entry_map; #line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = entry; + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry); #line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - wrapper = (SidebarTreeEntryWrapper*) _tmp2_; + wrapper = (SidebarTreeEntryWrapper*) _tmp1_; #line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = wrapper; + _tmp2_ = wrapper; #line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp3_ == NULL) { -#line 1374 "Tree.c" - SidebarEntry* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; -#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = entry; + if (_tmp2_ == NULL) { +#line 1691 "Tree.c" + gchar* _tmp3_; + gchar* _tmp4_; #line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = sidebar_entry_to_string (_tmp4_); + _tmp3_ = sidebar_entry_to_string (entry); #line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_warning ("Tree.vala:220: Entry %s not found in sidebar", _tmp6_); + g_warning ("Tree.vala:220: Entry %s not found in sidebar", _tmp4_); #line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_free0 (_tmp6_); -#line 1388 "Tree.c" + _g_free0 (_tmp4_); +#line 1702 "Tree.c" } #line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = wrapper; #line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1394 "Tree.c" +#line 1708 "Tree.c" } -static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* self, GtkTreeIter* iter) { +static SidebarTreeEntryWrapper* +sidebar_tree_get_wrapper_at_iter (SidebarTree* self, + GtkTreeIter* iter) +{ SidebarTreeEntryWrapper* result = NULL; GValue val = {0}; GtkTreeStore* _tmp0_; @@ -1413,7 +1730,7 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s #line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = *iter; #line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_model_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp1_, (gint) SIDEBAR_TREE_COLUMNS_WRAPPER, &_tmp2_); + gtk_tree_model_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp1_, (gint) SIDEBAR_TREE_COLUMNS_WRAPPER, &_tmp2_); #line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL; #line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -1428,7 +1745,7 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s _tmp5_ = wrapper; #line 230 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp5_ == NULL) { -#line 1432 "Tree.c" +#line 1749 "Tree.c" GtkTreeStore* _tmp6_; GtkTreeIter _tmp7_; GtkTreePath* _tmp8_; @@ -1440,7 +1757,7 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s #line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = *iter; #line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_); + _tmp8_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp7_); #line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = _tmp8_; #line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -1452,8 +1769,8 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s #line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (_tmp11_); #line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (_tmp9_); -#line 1457 "Tree.c" + __vala_GtkTreePath_free0 (_tmp9_); +#line 1774 "Tree.c" } #line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = wrapper; @@ -1461,19 +1778,21 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL; #line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1465 "Tree.c" +#line 1782 "Tree.c" } -static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* self, GtkTreePath* path) { +static SidebarTreeEntryWrapper* +sidebar_tree_get_wrapper_at_path (SidebarTree* self, + GtkTreePath* path) +{ SidebarTreeEntryWrapper* result = NULL; GtkTreeIter iter = {0}; GtkTreeStore* _tmp0_; - GtkTreePath* _tmp1_; - GtkTreeIter _tmp2_ = {0}; - gboolean _tmp3_; - GtkTreeIter _tmp7_; - SidebarTreeEntryWrapper* _tmp8_; + GtkTreeIter _tmp1_ = {0}; + gboolean _tmp2_; + GtkTreeIter _tmp5_; + SidebarTreeEntryWrapper* _tmp6_; #line 236 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL); #line 236 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -1481,170 +1800,151 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* s #line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->store; #line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = path; -#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp2_, _tmp1_); + _tmp2_ = gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp1_, path); #line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - iter = _tmp2_; + iter = _tmp1_; #line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (!_tmp3_) { -#line 1492 "Tree.c" - GtkTreePath* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; -#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = path; + if (!_tmp2_) { +#line 1809 "Tree.c" + gchar* _tmp3_; + gchar* _tmp4_; #line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = gtk_tree_path_to_string (_tmp4_); + _tmp3_ = gtk_tree_path_to_string (path); #line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_message ("Tree.vala:239: No entry found in sidebar at %s", _tmp6_); + g_message ("Tree.vala:239: No entry found in sidebar at %s", _tmp4_); #line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp4_); #line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = NULL; #line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1510 "Tree.c" +#line 1824 "Tree.c" } #line 244 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = iter; + _tmp5_ = iter; #line 244 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp7_); + _tmp6_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp5_); #line 244 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - result = _tmp8_; + result = _tmp6_; #line 244 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1520 "Tree.c" +#line 1834 "Tree.c" } -gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboolean mask_signal) { +gboolean +sidebar_tree_place_cursor (SidebarTree* self, + SidebarEntry* entry, + gboolean mask_signal) +{ gboolean result = FALSE; - SidebarEntry* _tmp0_; - gboolean _tmp1_; SidebarTreeEntryWrapper* wrapper = NULL; - SidebarEntry* _tmp2_; + SidebarTreeEntryWrapper* _tmp0_; + SidebarTreeEntryWrapper* _tmp1_; + GtkTreeSelection* _tmp2_; SidebarTreeEntryWrapper* _tmp3_; - SidebarTreeEntryWrapper* _tmp4_; - GtkTreeSelection* _tmp5_; + GtkTreePath* _tmp4_; + GtkTreePath* _tmp5_; SidebarTreeEntryWrapper* _tmp6_; GtkTreePath* _tmp7_; GtkTreePath* _tmp8_; - gboolean _tmp9_; - SidebarTreeEntryWrapper* _tmp10_; - GtkTreePath* _tmp11_; - GtkTreePath* _tmp12_; - SidebarEntry* _tmp13_; - gboolean _tmp14_; #line 249 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); #line 249 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE); #line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = entry; -#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = sidebar_tree_expand_to_entry (self, _tmp0_); -#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (!_tmp1_) { + if (!sidebar_tree_expand_to_entry (self, entry)) { #line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1556 "Tree.c" +#line 1864 "Tree.c" } #line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = entry; -#line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = sidebar_tree_get_wrapper (self, _tmp2_); + _tmp0_ = sidebar_tree_get_wrapper (self, entry); #line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - wrapper = _tmp3_; + wrapper = _tmp0_; #line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = wrapper; + _tmp1_ = wrapper; #line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp4_ == NULL) { + if (_tmp1_ == NULL) { #line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1574 "Tree.c" +#line 1880 "Tree.c" } #line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView)); + _tmp2_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView)); #line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = wrapper; + _tmp3_ = wrapper; #line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = sidebar_tree_entry_wrapper_get_path (_tmp6_); + _tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_); #line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = _tmp7_; + _tmp5_ = _tmp4_; #line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_selection_select_path (_tmp5_, _tmp8_); + gtk_tree_selection_select_path (_tmp2_, _tmp5_); #line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (_tmp8_); + __vala_GtkTreePath_free0 (_tmp5_); #line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = mask_signal; -#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - self->priv->mask_entry_selected_signal = _tmp9_; + self->priv->mask_entry_selected_signal = mask_signal; #line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = wrapper; + _tmp6_ = wrapper; #line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = sidebar_tree_entry_wrapper_get_path (_tmp10_); + _tmp7_ = sidebar_tree_entry_wrapper_get_path (_tmp6_); #line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_view_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp12_, NULL, FALSE); + gtk_tree_view_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp8_, NULL, FALSE); #line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (_tmp12_); + __vala_GtkTreePath_free0 (_tmp8_); #line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->mask_entry_selected_signal = FALSE; #line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = entry; -#line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = sidebar_tree_scroll_to_entry (self, _tmp13_); -#line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - result = _tmp14_; + result = sidebar_tree_scroll_to_entry (self, entry); #line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1614 "Tree.c" +#line 1914 "Tree.c" } -gboolean sidebar_tree_is_selected (SidebarTree* self, SidebarEntry* entry) { +gboolean +sidebar_tree_is_selected (SidebarTree* self, + SidebarEntry* entry) +{ gboolean result = FALSE; SidebarTreeEntryWrapper* wrapper = NULL; - SidebarEntry* _tmp0_; - SidebarTreeEntryWrapper* _tmp1_; + SidebarTreeEntryWrapper* _tmp0_; GtkTreeSelection* selection = NULL; + GtkTreeSelection* _tmp1_; GtkTreeSelection* _tmp2_; GtkTreeSelection* _tmp3_; - GtkTreeSelection* _tmp4_; - gboolean _tmp5_ = FALSE; - SidebarTreeEntryWrapper* _tmp6_; + gboolean _tmp4_ = FALSE; + SidebarTreeEntryWrapper* _tmp5_; #line 266 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); #line 266 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE); #line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = entry; + _tmp0_ = sidebar_tree_get_wrapper (self, entry); #line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_); -#line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - wrapper = _tmp1_; + wrapper = _tmp0_; #line 271 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView)); + _tmp1_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView)); #line 271 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp2_ = _g_object_ref0 (_tmp1_); #line 271 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - selection = _tmp3_; + selection = _tmp2_; #line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = selection; + _tmp3_ = selection; #line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp4_ == NULL) { + if (_tmp3_ == NULL) { #line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -1653,92 +1953,103 @@ gboolean sidebar_tree_is_selected (SidebarTree* self, SidebarEntry* entry) { _g_object_unref0 (wrapper); #line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1657 "Tree.c" +#line 1957 "Tree.c" } #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = wrapper; + _tmp5_ = wrapper; #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp6_ != NULL) { -#line 1663 "Tree.c" - GtkTreeSelection* _tmp7_; - SidebarTreeEntryWrapper* _tmp8_; + if (_tmp5_ != NULL) { +#line 1963 "Tree.c" + GtkTreeSelection* _tmp6_; + SidebarTreeEntryWrapper* _tmp7_; + GtkTreePath* _tmp8_; GtkTreePath* _tmp9_; - GtkTreePath* _tmp10_; - gboolean _tmp11_; #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = selection; -#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = wrapper; + _tmp6_ = selection; #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = sidebar_tree_entry_wrapper_get_path (_tmp8_); + _tmp7_ = wrapper; #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = _tmp9_; + _tmp8_ = sidebar_tree_entry_wrapper_get_path (_tmp7_); #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = gtk_tree_selection_path_is_selected (_tmp7_, _tmp10_); + _tmp9_ = _tmp8_; #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = _tmp11_; + _tmp4_ = gtk_tree_selection_path_is_selected (_tmp6_, _tmp9_); #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (_tmp10_); -#line 1683 "Tree.c" + __vala_GtkTreePath_free0 (_tmp9_); +#line 1980 "Tree.c" } else { #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = FALSE; -#line 1687 "Tree.c" + _tmp4_ = FALSE; +#line 1984 "Tree.c" } #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - result = _tmp5_; + result = _tmp4_; #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (selection); #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1697 "Tree.c" +#line 1994 "Tree.c" } -gboolean sidebar_tree_is_any_selected (SidebarTree* self) { +gboolean +sidebar_tree_is_any_selected (SidebarTree* self) +{ gboolean result = FALSE; GtkTreeSelection* _tmp0_; - gint _tmp1_; #line 278 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); #line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView)); #line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = gtk_tree_selection_count_selected_rows (_tmp0_); -#line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - result = _tmp1_ != 0; + result = gtk_tree_selection_count_selected_rows (_tmp0_) != 0; #line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1715 "Tree.c" +#line 2011 "Tree.c" } -static gpointer _gtk_tree_path_copy0 (gpointer self) { +static GtkTreePath* +_vala_GtkTreePath_copy (GtkTreePath* self) +{ #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - return self ? gtk_tree_path_copy (self) : NULL; -#line 1722 "Tree.c" + return g_boxed_copy (gtk_tree_path_get_type (), self); +#line 2020 "Tree.c" } -static void _gtk_tree_path_free0_ (gpointer var) { +static gpointer +__vala_GtkTreePath_copy0 (gpointer self) +{ #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - (var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL)); -#line 1729 "Tree.c" + return self ? _vala_GtkTreePath_copy (self) : NULL; +#line 2029 "Tree.c" } -static void _g_list_free__gtk_tree_path_free0_ (GList* self) { +static void +__vala_GtkTreePath_free0_ (gpointer var) +{ #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_list_foreach (self, (GFunc) _gtk_tree_path_free0_, NULL); + (var == NULL) ? NULL : (var = (_vala_GtkTreePath_free (var), NULL)); +#line 2038 "Tree.c" +} + + +static inline void +_g_list_free___vala_GtkTreePath_free0_ (GList* self) +{ #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_list_free (self); -#line 1738 "Tree.c" + g_list_free_full (self, (GDestroyNotify) __vala_GtkTreePath_free0_); +#line 2047 "Tree.c" } -static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) { +static GtkTreePath* +sidebar_tree_get_selected_path (SidebarTree* self) +{ GtkTreePath* result = NULL; GtkTreeModel* model = NULL; GtkTreeSelection* selection = NULL; @@ -1752,11 +2063,9 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) { GtkTreeModel* _tmp6_; gboolean _tmp7_ = FALSE; GList* _tmp8_; - guint _tmp9_; - GtkTreePath* _tmp12_ = NULL; - GList* _tmp13_; - guint _tmp14_; - GtkTreePath* _tmp17_; + GtkTreePath* _tmp10_ = NULL; + GList* _tmp11_; + GtkTreePath* _tmp14_; #line 282 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL); #line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -1777,7 +2086,7 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) { _g_object_unref0 (model); #line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1781 "Tree.c" +#line 2090 "Tree.c" } #line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = selection; @@ -1794,132 +2103,119 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) { #line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = rows; #line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = g_list_length (_tmp8_); -#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp9_ == ((guint) 0)) { + if (g_list_length (_tmp8_) == ((guint) 0)) { #line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = TRUE; -#line 1803 "Tree.c" +#line 2110 "Tree.c" } else { - GList* _tmp10_; - guint _tmp11_; -#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = rows; + GList* _tmp9_; #line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = g_list_length (_tmp10_); + _tmp9_ = rows; #line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = _tmp11_ == ((guint) 1); -#line 1813 "Tree.c" + _tmp7_ = g_list_length (_tmp9_) == ((guint) 1); +#line 2117 "Tree.c" } #line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (_tmp7_, "rows.length() == 0 || rows.length() == 1"); #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = rows; + _tmp11_ = rows; #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = g_list_length (_tmp13_); -#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp14_ != ((guint) 0)) { -#line 1823 "Tree.c" - GList* _tmp15_; - gconstpointer _tmp16_; + if (g_list_length (_tmp11_) != ((guint) 0)) { +#line 2125 "Tree.c" + GList* _tmp12_; + gconstpointer _tmp13_; #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp15_ = rows; + _tmp12_ = rows; #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = g_list_nth_data (_tmp15_, (guint) 0); + _tmp13_ = g_list_nth_data (_tmp12_, (guint) 0); #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = (GtkTreePath*) _tmp16_; -#line 1832 "Tree.c" + _tmp10_ = (GtkTreePath*) _tmp13_; +#line 2134 "Tree.c" } else { #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = NULL; -#line 1836 "Tree.c" + _tmp10_ = NULL; +#line 2138 "Tree.c" } #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp17_ = _gtk_tree_path_copy0 (_tmp12_); + _tmp14_ = __vala_GtkTreePath_copy0 (_tmp10_); #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - result = _tmp17_; + result = _tmp14_; #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - __g_list_free__gtk_tree_path_free0_0 (rows); + __g_list_free___vala_GtkTreePath_free0_0 (rows); #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (selection); #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (model); #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1850 "Tree.c" +#line 2152 "Tree.c" } -static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self, SidebarEntry* entry) { +static gchar* +sidebar_tree_get_name_for_entry (SidebarTree* self, + SidebarEntry* entry) +{ gchar* result = NULL; gchar* name = NULL; - SidebarEntry* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; SidebarEmphasizableEntry* emphasizable_entry = NULL; - SidebarEntry* _tmp5_; + SidebarEmphasizableEntry* _tmp4_; + gboolean _tmp5_ = FALSE; SidebarEmphasizableEntry* _tmp6_; - gboolean _tmp7_ = FALSE; - SidebarEmphasizableEntry* _tmp8_; #line 294 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL); #line 294 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL); #line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = entry; -#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = sidebar_entry_get_sidebar_name (_tmp0_); + _tmp0_ = sidebar_entry_get_sidebar_name (entry); #line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = guarded_markup_escape_text (_tmp2_); + _tmp2_ = guarded_markup_escape_text (_tmp1_); #line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - name = _tmp4_; -#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = entry; + name = _tmp3_; #line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp5_) : NULL); + _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (entry, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) entry) : NULL); #line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - emphasizable_entry = _tmp6_; + emphasizable_entry = _tmp4_; #line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = emphasizable_entry; + _tmp6_ = emphasizable_entry; #line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp8_ != NULL) { -#line 1895 "Tree.c" - SidebarEmphasizableEntry* _tmp9_; - gboolean _tmp10_; -#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = emphasizable_entry; + if (_tmp6_ != NULL) { +#line 2194 "Tree.c" + SidebarEmphasizableEntry* _tmp7_; #line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = sidebar_emphasizable_entry_is_emphasized (_tmp9_); + _tmp7_ = emphasizable_entry; #line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = _tmp10_; -#line 1904 "Tree.c" + _tmp5_ = sidebar_emphasizable_entry_is_emphasized (_tmp7_); +#line 2200 "Tree.c" } else { #line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = FALSE; -#line 1908 "Tree.c" + _tmp5_ = FALSE; +#line 2204 "Tree.c" } #line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp7_) { -#line 1912 "Tree.c" - const gchar* _tmp11_; - gchar* _tmp12_; + if (_tmp5_) { +#line 2208 "Tree.c" + const gchar* _tmp8_; + gchar* _tmp9_; #line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = name; + _tmp8_ = name; #line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = g_strdup_printf ("%s", _tmp11_); + _tmp9_ = g_strdup_printf ("%s", _tmp8_); #line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (name); #line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - name = _tmp12_; -#line 1923 "Tree.c" + name = _tmp9_; +#line 2219 "Tree.c" } #line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = name; @@ -1927,30 +2223,36 @@ static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self, SidebarEntry* _g_object_unref0 (emphasizable_entry); #line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1931 "Tree.c" +#line 2227 "Tree.c" } -static gboolean sidebar_tree_real_accept_cursor_changed (SidebarTree* self) { +static gboolean +sidebar_tree_real_accept_cursor_changed (SidebarTree* self) +{ gboolean result = FALSE; #line 305 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; #line 305 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1941 "Tree.c" +#line 2239 "Tree.c" } -gboolean sidebar_tree_accept_cursor_changed (SidebarTree* self) { +gboolean +sidebar_tree_accept_cursor_changed (SidebarTree* self) +{ #line 304 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); #line 304 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return SIDEBAR_TREE_GET_CLASS (self)->accept_cursor_changed (self); -#line 1950 "Tree.c" +#line 2250 "Tree.c" } -static void sidebar_tree_real_cursor_changed (GtkTreeView* base) { +static void +sidebar_tree_real_cursor_changed (GtkTreeView* base) +{ SidebarTree * self; GtkTreePath* path = NULL; GtkTreePath* _tmp0_; @@ -1974,13 +2276,13 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) { if (GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed != NULL) { #line 312 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView)); -#line 1978 "Tree.c" +#line 2280 "Tree.c" } #line 313 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 313 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 1984 "Tree.c" +#line 2286 "Tree.c" } #line 316 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = path; @@ -1994,7 +2296,7 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) { _tmp5_ = wrapper; #line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp4_ != _tmp5_) { -#line 1998 "Tree.c" +#line 2300 "Tree.c" SidebarTreeEntryWrapper* old_wrapper = NULL; SidebarTreeEntryWrapper* _tmp6_; SidebarTreeEntryWrapper* _tmp7_; @@ -2002,8 +2304,8 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) { gboolean _tmp9_ = FALSE; gboolean _tmp10_ = FALSE; gint _tmp11_; - gboolean _tmp19_ = FALSE; - SidebarTreeEntryWrapper* _tmp20_; + gboolean _tmp18_ = FALSE; + SidebarTreeEntryWrapper* _tmp19_; #line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = self->priv->selected_wrapper; #line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -2018,21 +2320,21 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) { _tmp11_ = self->priv->editing_disabled; #line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp11_ == 0) { -#line 2022 "Tree.c" +#line 2324 "Tree.c" SidebarTreeEntryWrapper* _tmp12_; #line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = wrapper; #line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = _tmp12_ != NULL; -#line 2028 "Tree.c" +#line 2330 "Tree.c" } else { #line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = FALSE; -#line 2032 "Tree.c" +#line 2334 "Tree.c" } #line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp10_) { -#line 2036 "Tree.c" +#line 2338 "Tree.c" SidebarTreeEntryWrapper* _tmp13_; SidebarEntry* _tmp14_; #line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -2041,19 +2343,18 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) { _tmp14_ = _tmp13_->entry; #line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, SIDEBAR_TYPE_RENAMEABLE_ENTRY); -#line 2045 "Tree.c" +#line 2347 "Tree.c" } else { #line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = FALSE; -#line 2049 "Tree.c" +#line 2351 "Tree.c" } #line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp9_) { -#line 2053 "Tree.c" +#line 2355 "Tree.c" GtkCellRendererText* _tmp15_; SidebarTreeEntryWrapper* _tmp16_; SidebarEntry* _tmp17_; - gboolean _tmp18_; #line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = self->priv->text_renderer; #line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -2061,95 +2362,91 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) { #line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp17_ = _tmp16_->entry; #line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp18_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry)); -#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_object_set (_tmp15_, "editable", _tmp18_, NULL); -#line 2068 "Tree.c" + g_object_set (_tmp15_, "editable", sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry)), NULL); +#line 2367 "Tree.c" } #line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp20_ = wrapper; + _tmp19_ = wrapper; #line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp20_ != NULL) { -#line 2074 "Tree.c" - gboolean _tmp21_; + if (_tmp19_ != NULL) { +#line 2373 "Tree.c" + gboolean _tmp20_; #line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp21_ = self->priv->mask_entry_selected_signal; + _tmp20_ = self->priv->mask_entry_selected_signal; #line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp19_ = !_tmp21_; -#line 2080 "Tree.c" + _tmp18_ = !_tmp20_; +#line 2379 "Tree.c" } else { #line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp19_ = FALSE; -#line 2084 "Tree.c" + _tmp18_ = FALSE; +#line 2383 "Tree.c" } #line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp19_) { -#line 2088 "Tree.c" + if (_tmp18_) { +#line 2387 "Tree.c" SidebarSelectableEntry* selectable = NULL; - SidebarTreeEntryWrapper* _tmp22_; - SidebarEntry* _tmp23_; + SidebarTreeEntryWrapper* _tmp21_; + SidebarEntry* _tmp22_; + SidebarSelectableEntry* _tmp23_; SidebarSelectableEntry* _tmp24_; - SidebarSelectableEntry* _tmp25_; #line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp22_ = wrapper; + _tmp21_ = wrapper; #line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp23_ = _tmp22_->entry; + _tmp22_ = _tmp21_->entry; #line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp23_) : NULL); + _tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp22_) : NULL); #line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - selectable = _tmp24_; + selectable = _tmp23_; #line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp25_ = selectable; + _tmp24_ = selectable; #line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp25_ != NULL) { -#line 2106 "Tree.c" - gboolean _tmp26_; + if (_tmp24_ != NULL) { #line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp26_ = sidebar_tree_accept_cursor_changed (self); -#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp26_) { -#line 2112 "Tree.c" - SidebarSelectableEntry* _tmp27_; + if (sidebar_tree_accept_cursor_changed (self)) { +#line 2407 "Tree.c" + SidebarSelectableEntry* _tmp25_; #line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp27_ = selectable; + _tmp25_ = selectable; #line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL], 0, _tmp27_); -#line 2118 "Tree.c" + g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL], 0, _tmp25_); +#line 2413 "Tree.c" } else { - SidebarTreeEntryWrapper* _tmp28_; - SidebarEntry* _tmp29_; + SidebarTreeEntryWrapper* _tmp26_; + SidebarEntry* _tmp27_; #line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp28_ = old_wrapper; + _tmp26_ = old_wrapper; #line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp29_ = _tmp28_->entry; + _tmp27_ = _tmp26_->entry; #line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_place_cursor (self, _tmp29_, TRUE); -#line 2128 "Tree.c" + sidebar_tree_place_cursor (self, _tmp27_, TRUE); +#line 2423 "Tree.c" } } #line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (selectable); -#line 2133 "Tree.c" +#line 2428 "Tree.c" } #line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (old_wrapper); -#line 2137 "Tree.c" +#line 2432 "Tree.c" } #line 337 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed != NULL) { #line 338 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView)); -#line 2143 "Tree.c" +#line 2438 "Tree.c" } #line 308 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 308 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); -#line 2149 "Tree.c" + __vala_GtkTreePath_free0 (path); +#line 2444 "Tree.c" } -void sidebar_tree_disable_editing (SidebarTree* self) { +void +sidebar_tree_disable_editing (SidebarTree* self) +{ gint _tmp0_; #line 341 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); @@ -2159,18 +2456,20 @@ void sidebar_tree_disable_editing (SidebarTree* self) { self->priv->editing_disabled = _tmp0_ + 1; #line 342 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp0_ == 0) { -#line 2163 "Tree.c" +#line 2460 "Tree.c" GtkCellRendererText* _tmp1_; #line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = self->priv->text_renderer; #line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_object_set (_tmp1_, "editable", FALSE, NULL); -#line 2169 "Tree.c" +#line 2466 "Tree.c" } } -void sidebar_tree_enable_editing (SidebarTree* self) { +void +sidebar_tree_enable_editing (SidebarTree* self) +{ GtkTreePath* path = NULL; GtkTreePath* _tmp0_; gboolean _tmp1_ = FALSE; @@ -2186,21 +2485,21 @@ void sidebar_tree_enable_editing (SidebarTree* self) { _tmp3_ = path; #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp3_ != NULL) { -#line 2190 "Tree.c" +#line 2489 "Tree.c" gint _tmp4_; #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = self->priv->editing_disabled; #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = _tmp4_ > 0; -#line 2196 "Tree.c" +#line 2495 "Tree.c" } else { #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = FALSE; -#line 2200 "Tree.c" +#line 2499 "Tree.c" } #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp2_) { -#line 2204 "Tree.c" +#line 2503 "Tree.c" gint _tmp5_; gint _tmp6_; #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -2211,15 +2510,15 @@ void sidebar_tree_enable_editing (SidebarTree* self) { _tmp6_ = self->priv->editing_disabled; #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = _tmp6_ == 0; -#line 2215 "Tree.c" +#line 2514 "Tree.c" } else { #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = FALSE; -#line 2219 "Tree.c" +#line 2518 "Tree.c" } #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp1_) { -#line 2223 "Tree.c" +#line 2522 "Tree.c" SidebarTreeEntryWrapper* wrapper = NULL; GtkTreePath* _tmp7_; SidebarTreeEntryWrapper* _tmp8_; @@ -2235,7 +2534,7 @@ void sidebar_tree_enable_editing (SidebarTree* self) { _tmp10_ = wrapper; #line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp10_ != NULL) { -#line 2239 "Tree.c" +#line 2538 "Tree.c" SidebarTreeEntryWrapper* _tmp11_; SidebarEntry* _tmp12_; #line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -2244,19 +2543,18 @@ void sidebar_tree_enable_editing (SidebarTree* self) { _tmp12_ = _tmp11_->entry; #line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, SIDEBAR_TYPE_RENAMEABLE_ENTRY); -#line 2248 "Tree.c" +#line 2547 "Tree.c" } else { #line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = FALSE; -#line 2252 "Tree.c" +#line 2551 "Tree.c" } #line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp9_) { -#line 2256 "Tree.c" +#line 2555 "Tree.c" GtkCellRendererText* _tmp13_; SidebarTreeEntryWrapper* _tmp14_; SidebarEntry* _tmp15_; - gboolean _tmp16_; #line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = self->priv->text_renderer; #line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -2264,24 +2562,24 @@ void sidebar_tree_enable_editing (SidebarTree* self) { #line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = _tmp14_->entry; #line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry)); -#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_object_set (_tmp13_, "editable", _tmp16_, NULL); -#line 2271 "Tree.c" + g_object_set (_tmp13_, "editable", sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry)), NULL); +#line 2567 "Tree.c" } #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 2275 "Tree.c" +#line 2571 "Tree.c" } #line 346 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); -#line 2279 "Tree.c" + __vala_GtkTreePath_free0 (path); +#line 2575 "Tree.c" } -void sidebar_tree_toggle_branch_expansion (SidebarTree* self, GtkTreePath* path, gboolean expand_all) { - GtkTreePath* _tmp0_; - gboolean _tmp1_; +void +sidebar_tree_toggle_branch_expansion (SidebarTree* self, + GtkTreePath* path, + gboolean expand_all) +{ #line 356 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 356 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -2289,41 +2587,29 @@ void sidebar_tree_toggle_branch_expansion (SidebarTree* self, GtkTreePath* path, #line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->expander_called_manually = TRUE; #line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = path; -#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = gtk_tree_view_row_expanded (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp0_); -#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp1_) { -#line 2298 "Tree.c" - GtkTreePath* _tmp2_; -#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = path; + if (gtk_tree_view_row_expanded (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), path)) { #line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_view_collapse_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp2_); -#line 2304 "Tree.c" + gtk_tree_view_collapse_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), path); +#line 2594 "Tree.c" } else { - GtkTreePath* _tmp3_; - gboolean _tmp4_; #line 361 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = path; -#line 361 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = expand_all; -#line 361 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_view_expand_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp3_, _tmp4_); -#line 2314 "Tree.c" + gtk_tree_view_expand_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), path, expand_all); +#line 2598 "Tree.c" } } -gboolean sidebar_tree_expand_to_entry (SidebarTree* self, SidebarEntry* entry) { +gboolean +sidebar_tree_expand_to_entry (SidebarTree* self, + SidebarEntry* entry) +{ gboolean result = FALSE; SidebarTreeEntryWrapper* wrapper = NULL; - SidebarEntry* _tmp0_; + SidebarTreeEntryWrapper* _tmp0_; SidebarTreeEntryWrapper* _tmp1_; SidebarTreeEntryWrapper* _tmp2_; - SidebarTreeEntryWrapper* _tmp3_; + GtkTreePath* _tmp3_; GtkTreePath* _tmp4_; - GtkTreePath* _tmp5_; #line 364 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); #line 364 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -2331,53 +2617,53 @@ gboolean sidebar_tree_expand_to_entry (SidebarTree* self, SidebarEntry* entry) { #line 365 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->expander_called_manually = TRUE; #line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = entry; -#line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_); + _tmp0_ = sidebar_tree_get_wrapper (self, entry); #line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - wrapper = _tmp1_; + wrapper = _tmp0_; #line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = wrapper; + _tmp1_ = wrapper; #line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 2350 "Tree.c" +#line 2634 "Tree.c" } #line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = wrapper; + _tmp2_ = wrapper; #line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_); + _tmp3_ = sidebar_tree_entry_wrapper_get_path (_tmp2_); #line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_view_expand_to_path (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp5_); + gtk_tree_view_expand_to_path (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp4_); #line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (_tmp5_); + __vala_GtkTreePath_free0 (_tmp4_); #line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; #line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 2368 "Tree.c" +#line 2652 "Tree.c" } -void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry) { +void +sidebar_tree_expand_to_first_child (SidebarTree* self, + SidebarEntry* entry) +{ SidebarTreeEntryWrapper* wrapper = NULL; - SidebarEntry* _tmp0_; + SidebarTreeEntryWrapper* _tmp0_; SidebarTreeEntryWrapper* _tmp1_; - SidebarTreeEntryWrapper* _tmp2_; GtkTreePath* path = NULL; - SidebarTreeEntryWrapper* _tmp3_; - GtkTreePath* _tmp4_; + SidebarTreeEntryWrapper* _tmp2_; + GtkTreePath* _tmp3_; GtkTreeIter iter = {0}; - GtkTreePath* _tmp13_; + GtkTreePath* _tmp11_; #line 375 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 375 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -2385,259 +2671,221 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry) #line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->expander_called_manually = TRUE; #line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = entry; -#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_); + _tmp0_ = sidebar_tree_get_wrapper (self, entry); #line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - wrapper = _tmp1_; + wrapper = _tmp0_; #line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = wrapper; + _tmp1_ = wrapper; #line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 2402 "Tree.c" +#line 2686 "Tree.c" } #line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = wrapper; + _tmp2_ = wrapper; #line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_); + _tmp3_ = sidebar_tree_entry_wrapper_get_path (_tmp2_); #line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - path = _tmp4_; + path = _tmp3_; #line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" while (TRUE) { -#line 2412 "Tree.c" - GtkTreeStore* _tmp5_; - GtkTreePath* _tmp6_; - GtkTreeIter _tmp7_ = {0}; - gboolean _tmp8_; - GtkTreeStore* _tmp9_; - GtkTreeIter _tmp10_; - gboolean _tmp11_; - GtkTreePath* _tmp12_; +#line 2696 "Tree.c" + GtkTreeStore* _tmp4_; + GtkTreePath* _tmp5_; + GtkTreeIter _tmp6_ = {0}; + gboolean _tmp7_; + GtkTreeStore* _tmp8_; + GtkTreeIter _tmp9_; + GtkTreePath* _tmp10_; #line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = self->priv->store; + _tmp4_ = self->priv->store; #line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = path; + _tmp5_ = path; #line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_, _tmp6_); + _tmp7_ = gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp6_, _tmp5_); #line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - iter = _tmp7_; + iter = _tmp6_; #line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (!_tmp8_) { + if (!_tmp7_) { #line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" break; -#line 2433 "Tree.c" +#line 2716 "Tree.c" } #line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = self->priv->store; -#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = iter; + _tmp8_ = self->priv->store; #line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = gtk_tree_model_iter_has_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp10_); + _tmp9_ = iter; #line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (!_tmp11_) { + if (!gtk_tree_model_iter_has_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp9_)) { #line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" break; -#line 2445 "Tree.c" +#line 2726 "Tree.c" } #line 388 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = path; + _tmp10_ = path; #line 388 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_path_down (_tmp12_); -#line 2451 "Tree.c" + gtk_tree_path_down (_tmp10_); +#line 2732 "Tree.c" } #line 391 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = path; + _tmp11_ = path; #line 391 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_view_expand_to_path (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp13_); + gtk_tree_view_expand_to_path (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp11_); #line 375 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 375 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 2461 "Tree.c" +#line 2742 "Tree.c" } -static void _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) { +static void +_sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added (SidebarBranch* _sender, + SidebarEntry* entry, + gpointer self) +{ #line 409 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_branch_entry_added ((SidebarTree*) self, _sender, entry); -#line 2468 "Tree.c" +#line 2753 "Tree.c" } -static void _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) { +static void +_sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed (SidebarBranch* _sender, + SidebarEntry* entry, + gpointer self) +{ #line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_branch_entry_removed ((SidebarTree*) self, _sender, entry); -#line 2475 "Tree.c" +#line 2764 "Tree.c" } -static void _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) { +static void +_sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved (SidebarBranch* _sender, + SidebarEntry* entry, + gpointer self) +{ #line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_branch_entry_moved ((SidebarTree*) self, _sender, entry); -#line 2482 "Tree.c" +#line 2775 "Tree.c" } -static void _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented (SidebarBranch* _sender, SidebarEntry* entry, SidebarEntry* old_parent, gpointer self) { +static void +_sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented (SidebarBranch* _sender, + SidebarEntry* entry, + SidebarEntry* old_parent, + gpointer self) +{ #line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_branch_entry_reparented ((SidebarTree*) self, _sender, entry, old_parent); -#line 2489 "Tree.c" +#line 2787 "Tree.c" } -static void _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) { +static void +_sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered (SidebarBranch* _sender, + SidebarEntry* entry, + gpointer self) +{ #line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_branch_children_reordered ((SidebarTree*) self, _sender, entry); -#line 2496 "Tree.c" +#line 2798 "Tree.c" } -static void _sidebar_tree_on_show_branch_sidebar_branch_show_branch (SidebarBranch* _sender, gboolean show, gpointer self) { +static void +_sidebar_tree_on_show_branch_sidebar_branch_show_branch (SidebarBranch* _sender, + gboolean show, + gpointer self) +{ #line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_show_branch ((SidebarTree*) self, _sender, show); -#line 2503 "Tree.c" +#line 2809 "Tree.c" } -void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position) { - gint _tmp0_; +void +sidebar_tree_graft (SidebarTree* self, + SidebarBranch* branch, + gint position) +{ + GeeHashMap* _tmp0_; GeeHashMap* _tmp1_; - SidebarBranch* _tmp2_; - gboolean _tmp3_; - GeeHashMap* _tmp4_; - SidebarBranch* _tmp5_; - gint _tmp6_; - SidebarBranch* _tmp7_; - gboolean _tmp8_; - SidebarBranch* _tmp20_; - SidebarBranch* _tmp21_; - SidebarBranch* _tmp22_; - SidebarBranch* _tmp23_; - SidebarBranch* _tmp24_; - SidebarBranch* _tmp25_; - SidebarBranch* _tmp26_; #line 394 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 394 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (branch)); #line 394 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = position; -#line 394 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_return_if_fail (_tmp0_ >= 0, "position >= 0"); + _vala_return_if_fail (position >= 0, "position >= 0"); #line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = self->priv->branches; -#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = branch; -#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_); + _tmp0_ = self->priv->branches; #line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (!_tmp3_, "!branches.has_key(branch)"); + _vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), branch), "!branches.has_key(branch)"); #line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = self->priv->branches; -#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = branch; -#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = position; + _tmp1_ = self->priv->branches; #line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, (gpointer) ((gintptr) _tmp6_)); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), branch, (gpointer) ((gintptr) position)); #line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = branch; -#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = sidebar_branch_get_show_branch (_tmp7_); -#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp8_) { -#line 2554 "Tree.c" - SidebarBranch* _tmp9_; - SidebarBranch* _tmp10_; - gboolean _tmp11_; - SidebarBranch* _tmp15_; - gboolean _tmp16_; -#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = branch; + if (sidebar_branch_get_show_branch (branch)) { #line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_associate_branch (self, _tmp9_); + sidebar_tree_associate_branch (self, branch); #line 402 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = branch; -#line 402 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = sidebar_branch_is_startup_expand_to_first_child (_tmp10_); -#line 402 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp11_) { -#line 2570 "Tree.c" - SidebarBranch* _tmp12_; - SidebarEntry* _tmp13_; - SidebarEntry* _tmp14_; -#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = branch; + if (sidebar_branch_is_startup_expand_to_first_child (branch)) { +#line 2840 "Tree.c" + SidebarEntry* _tmp2_; + SidebarEntry* _tmp3_; #line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = sidebar_branch_get_root (_tmp12_); + _tmp2_ = sidebar_branch_get_root (branch); #line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = _tmp13_; + _tmp3_ = _tmp2_; #line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_expand_to_first_child (self, _tmp14_); + sidebar_tree_expand_to_first_child (self, _tmp3_); #line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_object_unref0 (_tmp14_); -#line 2584 "Tree.c" + _g_object_unref0 (_tmp3_); +#line 2851 "Tree.c" } #line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp15_ = branch; -#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = sidebar_branch_is_startup_open_grouping (_tmp15_); -#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp16_) { -#line 2592 "Tree.c" - SidebarBranch* _tmp17_; - SidebarEntry* _tmp18_; - SidebarEntry* _tmp19_; -#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp17_ = branch; + if (sidebar_branch_is_startup_open_grouping (branch)) { +#line 2855 "Tree.c" + SidebarEntry* _tmp4_; + SidebarEntry* _tmp5_; #line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp18_ = sidebar_branch_get_root (_tmp17_); + _tmp4_ = sidebar_branch_get_root (branch); #line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp19_ = _tmp18_; + _tmp5_ = _tmp4_; #line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_expand_to_entry (self, _tmp19_); + sidebar_tree_expand_to_entry (self, _tmp5_); #line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_object_unref0 (_tmp19_); -#line 2606 "Tree.c" + _g_object_unref0 (_tmp5_); +#line 2866 "Tree.c" } } #line 409 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp20_ = branch; -#line 409 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_connect_object (_tmp20_, "entry-added", (GCallback) _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added, self, 0); -#line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp21_ = branch; + g_signal_connect_object (branch, "entry-added", (GCallback) _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added, self, 0); #line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_connect_object (_tmp21_, "entry-removed", (GCallback) _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed, self, 0); + g_signal_connect_object (branch, "entry-removed", (GCallback) _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed, self, 0); #line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp22_ = branch; -#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_connect_object (_tmp22_, "entry-moved", (GCallback) _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved, self, 0); -#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp23_ = branch; + g_signal_connect_object (branch, "entry-moved", (GCallback) _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved, self, 0); #line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_connect_object (_tmp23_, "entry-reparented", (GCallback) _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented, self, 0); -#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp24_ = branch; + g_signal_connect_object (branch, "entry-reparented", (GCallback) _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented, self, 0); #line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_connect_object (_tmp24_, "children-reordered", (GCallback) _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered, self, 0); + g_signal_connect_object (branch, "children-reordered", (GCallback) _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered, self, 0); #line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp25_ = branch; -#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_connect_object (_tmp25_, "show-branch", (GCallback) _sidebar_tree_on_show_branch_sidebar_branch_show_branch, self, 0); -#line 416 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp26_ = branch; + g_signal_connect_object (branch, "show-branch", (GCallback) _sidebar_tree_on_show_branch_sidebar_branch_show_branch, self, 0); #line 416 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_ADDED_SIGNAL], 0, _tmp26_); -#line 2637 "Tree.c" + g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_ADDED_SIGNAL], 0, branch); +#line 2883 "Tree.c" } -static GtkTreeIter* _gtk_tree_iter_dup (GtkTreeIter* self) { +static GtkTreeIter* +_gtk_tree_iter_dup (GtkTreeIter* self) +{ GtkTreeIter* dup; #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" dup = g_new0 (GtkTreeIter, 1); @@ -2645,52 +2893,51 @@ static GtkTreeIter* _gtk_tree_iter_dup (GtkTreeIter* self) { memcpy (dup, self, sizeof (GtkTreeIter)); #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return dup; -#line 2649 "Tree.c" +#line 2897 "Tree.c" } -static gpointer __gtk_tree_iter_dup0 (gpointer self) { +static gpointer +__gtk_tree_iter_dup0 (gpointer self) +{ #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return self ? _gtk_tree_iter_dup (self) : NULL; -#line 2656 "Tree.c" +#line 2906 "Tree.c" } -static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* branch) { +static void +sidebar_tree_associate_branch (SidebarTree* self, + SidebarBranch* branch) +{ GeeHashMap* _tmp0_; - SidebarBranch* _tmp1_; - gboolean _tmp2_; gint position = 0; - GeeHashMap* _tmp3_; - SidebarBranch* _tmp4_; - gpointer _tmp5_; + GeeHashMap* _tmp1_; + gpointer _tmp2_; GtkTreeIter* insertion_iter = NULL; GtkTreeIter iter = {0}; gboolean found = FALSE; - GtkTreeStore* _tmp6_; - GtkTreeIter _tmp7_ = {0}; - gboolean _tmp8_; - GtkTreeIter* _tmp24_; - GtkTreeIter* _tmp29_; + GtkTreeStore* _tmp3_; + GtkTreeIter _tmp4_ = {0}; + gboolean _tmp5_; + GtkTreeIter* _tmp21_; + GtkTreeIter* _tmp26_; + GtkTreeStore* _tmp27_; + SidebarEntry* _tmp28_; + SidebarEntry* _tmp29_; GtkTreeStore* _tmp30_; - SidebarBranch* _tmp31_; - SidebarEntry* _tmp32_; - SidebarEntry* _tmp33_; - GtkTreeStore* _tmp34_; - GtkTreeIter* _tmp35_; - GtkTreeIter _tmp36_; - GtkTreePath* _tmp37_; - GtkTreePath* _tmp38_; - gint _tmp39_; - SidebarTreeRootWrapper* _tmp40_; - SidebarTreeRootWrapper* _tmp41_; + GtkTreeIter* _tmp31_; + GtkTreeIter _tmp32_; + GtkTreePath* _tmp33_; + GtkTreePath* _tmp34_; + gint _tmp35_; + SidebarTreeRootWrapper* _tmp36_; + SidebarTreeRootWrapper* _tmp37_; + GtkTreeIter _tmp38_; + SidebarEntry* _tmp39_; + SidebarEntry* _tmp40_; + GtkTreeIter* _tmp41_; GtkTreeIter _tmp42_; - SidebarBranch* _tmp43_; - SidebarBranch* _tmp44_; - SidebarEntry* _tmp45_; - SidebarEntry* _tmp46_; - GtkTreeIter* _tmp47_; - GtkTreeIter _tmp48_; #line 420 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 420 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -2698,200 +2945,191 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra #line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->branches; #line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = branch; -#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (_tmp2_, "branches.has_key(branch)"); + _vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), branch), "branches.has_key(branch)"); #line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = self->priv->branches; -#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = branch; + _tmp1_ = self->priv->branches; #line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), branch); #line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - position = (gint) ((gintptr) _tmp5_); + position = (gint) ((gintptr) _tmp2_); #line 425 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" insertion_iter = NULL; #line 429 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = self->priv->store; + _tmp3_ = self->priv->store; #line 429 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = gtk_tree_model_get_iter_first (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_); + _tmp5_ = gtk_tree_model_get_iter_first (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp4_); #line 429 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - iter = _tmp7_; + iter = _tmp4_; #line 429 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - found = _tmp8_; + found = _tmp5_; #line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" while (TRUE) { -#line 2727 "Tree.c" - gboolean _tmp9_; +#line 2968 "Tree.c" + gboolean _tmp6_; SidebarTreeRootWrapper* root_wrapper = NULL; - GtkTreeIter _tmp10_; - SidebarTreeEntryWrapper* _tmp11_; + GtkTreeIter _tmp7_; + SidebarTreeEntryWrapper* _tmp8_; + SidebarTreeRootWrapper* _tmp9_; + SidebarTreeRootWrapper* _tmp10_; + gint _tmp11_; SidebarTreeRootWrapper* _tmp12_; - SidebarTreeRootWrapper* _tmp13_; - gint _tmp14_; - SidebarTreeRootWrapper* _tmp15_; - gint _tmp16_; - GtkTreeStore* _tmp22_; - gboolean _tmp23_; + gint _tmp13_; + GtkTreeStore* _tmp19_; + gboolean _tmp20_; #line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = found; + _tmp6_ = found; #line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (!_tmp9_) { + if (!_tmp6_) { #line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" break; -#line 2745 "Tree.c" +#line 2986 "Tree.c" } #line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = iter; + _tmp7_ = iter; #line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp10_); + _tmp8_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp7_); #line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER) ? ((SidebarTreeRootWrapper*) _tmp11_) : NULL; + _tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER) ? ((SidebarTreeRootWrapper*) _tmp8_) : NULL; #line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp12_ == NULL) { + if (_tmp9_ == NULL) { #line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_object_unref0 (_tmp11_); -#line 2757 "Tree.c" + _g_object_unref0 (_tmp8_); +#line 2998 "Tree.c" } #line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - root_wrapper = _tmp12_; + root_wrapper = _tmp9_; #line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = root_wrapper; + _tmp10_ = root_wrapper; #line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (_tmp13_ != NULL, "root_wrapper != null"); + _vala_assert (_tmp10_ != NULL, "root_wrapper != null"); #line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = position; + _tmp11_ = position; #line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp15_ = root_wrapper; + _tmp12_ = root_wrapper; #line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = _tmp15_->root_position; + _tmp13_ = _tmp12_->root_position; #line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp14_ < _tmp16_) { -#line 2773 "Tree.c" - GtkTreeStore* _tmp17_; - GtkTreeIter _tmp18_; - GtkTreeIter _tmp19_ = {0}; - GtkTreeIter _tmp20_; - GtkTreeIter* _tmp21_; + if (_tmp11_ < _tmp13_) { +#line 3014 "Tree.c" + GtkTreeStore* _tmp14_; + GtkTreeIter _tmp15_; + GtkTreeIter _tmp16_ = {0}; + GtkTreeIter _tmp17_; + GtkTreeIter* _tmp18_; #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp17_ = self->priv->store; + _tmp14_ = self->priv->store; #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp18_ = iter; + _tmp15_ = iter; #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_insert_before (_tmp17_, &_tmp19_, NULL, &_tmp18_); + gtk_tree_store_insert_before (_tmp14_, &_tmp16_, NULL, &_tmp15_); #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (insertion_iter); #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp20_ = _tmp19_; + _tmp17_ = _tmp16_; #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp21_ = __gtk_tree_iter_dup0 (&_tmp20_); + _tmp18_ = __gtk_tree_iter_dup0 (&_tmp17_); #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - insertion_iter = _tmp21_; + insertion_iter = _tmp18_; #line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (root_wrapper); #line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" break; -#line 2797 "Tree.c" +#line 3038 "Tree.c" } #line 440 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp22_ = self->priv->store; + _tmp19_ = self->priv->store; #line 440 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp23_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &iter); + _tmp20_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_tree_model_get_type (), GtkTreeModel), &iter); #line 440 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - found = _tmp23_; + found = _tmp20_; #line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (root_wrapper); -#line 2807 "Tree.c" +#line 3048 "Tree.c" } #line 444 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp24_ = insertion_iter; + _tmp21_ = insertion_iter; #line 444 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp24_ == NULL) { -#line 2813 "Tree.c" - GtkTreeStore* _tmp25_; - GtkTreeIter _tmp26_ = {0}; - GtkTreeIter _tmp27_; - GtkTreeIter* _tmp28_; + if (_tmp21_ == NULL) { +#line 3054 "Tree.c" + GtkTreeStore* _tmp22_; + GtkTreeIter _tmp23_ = {0}; + GtkTreeIter _tmp24_; + GtkTreeIter* _tmp25_; #line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp25_ = self->priv->store; + _tmp22_ = self->priv->store; #line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_append (_tmp25_, &_tmp26_, NULL); + gtk_tree_store_append (_tmp22_, &_tmp23_, NULL); #line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (insertion_iter); #line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp27_ = _tmp26_; + _tmp24_ = _tmp23_; #line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp28_ = __gtk_tree_iter_dup0 (&_tmp27_); + _tmp25_ = __gtk_tree_iter_dup0 (&_tmp24_); #line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - insertion_iter = _tmp28_; -#line 2830 "Tree.c" + insertion_iter = _tmp25_; +#line 3071 "Tree.c" } #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp29_ = insertion_iter; + _tmp26_ = insertion_iter; #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp30_ = self->priv->store; -#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp31_ = branch; + _tmp27_ = self->priv->store; #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp32_ = sidebar_branch_get_root (_tmp31_); + _tmp28_ = sidebar_branch_get_root (branch); #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp33_ = _tmp32_; + _tmp29_ = _tmp28_; #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp34_ = self->priv->store; + _tmp30_ = self->priv->store; #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp35_ = insertion_iter; + _tmp31_ = insertion_iter; #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp36_ = *_tmp35_; + _tmp32_ = *_tmp31_; #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp37_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp36_); + _tmp33_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp32_); #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp38_ = _tmp37_; + _tmp34_ = _tmp33_; #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp39_ = position; + _tmp35_ = position; #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp40_ = sidebar_tree_root_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GTK_TYPE_TREE_MODEL, GtkTreeModel), _tmp33_, _tmp38_, _tmp39_); + _tmp36_ = sidebar_tree_root_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_tree_model_get_type (), GtkTreeModel), _tmp29_, _tmp34_, _tmp35_); #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp41_ = _tmp40_; + _tmp37_ = _tmp36_; #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp42_ = *_tmp29_; + _tmp38_ = *_tmp26_; #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_associate_wrapper (self, &_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, SidebarTreeEntryWrapper)); + sidebar_tree_associate_wrapper (self, &_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, SidebarTreeEntryWrapper)); #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_object_unref0 (_tmp41_); + _g_object_unref0 (_tmp37_); #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (_tmp38_); + __vala_GtkTreePath_free0 (_tmp34_); #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_object_unref0 (_tmp33_); + _g_object_unref0 (_tmp29_); #line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp43_ = branch; + _tmp39_ = sidebar_branch_get_root (branch); #line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp44_ = branch; + _tmp40_ = _tmp39_; #line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp45_ = sidebar_branch_get_root (_tmp44_); + _tmp41_ = insertion_iter; #line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp46_ = _tmp45_; + _tmp42_ = *_tmp41_; #line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp47_ = insertion_iter; + sidebar_tree_associate_children (self, branch, _tmp40_, &_tmp42_); #line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp48_ = *_tmp47_; -#line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_associate_children (self, _tmp43_, _tmp46_, &_tmp48_); -#line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_object_unref0 (_tmp46_); + _g_object_unref0 (_tmp40_); #line 420 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (insertion_iter); -#line 2886 "Tree.c" +#line 3121 "Tree.c" } -static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* branch, SidebarEntry* parent, GtkTreeIter* parent_iter) { +static void +sidebar_tree_associate_children (SidebarTree* self, + SidebarBranch* branch, + SidebarEntry* parent, + GtkTreeIter* parent_iter) +{ GeeList* children = NULL; - SidebarBranch* _tmp0_; - SidebarEntry* _tmp1_; - GeeList* _tmp2_; - GeeList* _tmp3_; + GeeList* _tmp0_; + GeeList* _tmp1_; #line 455 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 455 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -2901,135 +3139,131 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b #line 455 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (parent_iter != NULL); #line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = branch; -#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = parent; -#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = sidebar_branch_get_children (_tmp0_, _tmp1_); + _tmp0_ = sidebar_branch_get_children (branch, parent); #line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - children = _tmp2_; + children = _tmp0_; #line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = children; + _tmp1_ = children; #line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp3_ == NULL) { + if (_tmp1_ == NULL) { #line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (children); #line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 2920 "Tree.c" +#line 3154 "Tree.c" } { GeeList* _child_list = NULL; - GeeList* _tmp4_; - GeeList* _tmp5_; + GeeList* _tmp2_; + GeeList* _tmp3_; gint _child_size = 0; - GeeList* _tmp6_; - gint _tmp7_; - gint _tmp8_; + GeeList* _tmp4_; + gint _tmp5_; + gint _tmp6_; gint _child_index = 0; #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = children; + _tmp2_ = children; #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp3_ = _g_object_ref0 (_tmp2_); #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _child_list = _tmp5_; + _child_list = _tmp3_; #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = _child_list; + _tmp4_ = _child_list; #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _child_size = _tmp8_; + _child_size = _tmp6_; #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _child_index = -1; #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" while (TRUE) { -#line 2949 "Tree.c" +#line 3183 "Tree.c" + gint _tmp7_; + gint _tmp8_; gint _tmp9_; - gint _tmp10_; - gint _tmp11_; SidebarEntry* child = NULL; - GeeList* _tmp12_; - gint _tmp13_; - gpointer _tmp14_; + GeeList* _tmp10_; + gint _tmp11_; + gpointer _tmp12_; GtkTreeIter append_iter = {0}; - GtkTreeStore* _tmp15_; + GtkTreeStore* _tmp13_; + GtkTreeIter _tmp14_; + GtkTreeIter _tmp15_ = {0}; GtkTreeIter _tmp16_; - GtkTreeIter _tmp17_ = {0}; - GtkTreeIter _tmp18_; - SidebarEntry* _tmp19_; - SidebarBranch* _tmp20_; - SidebarEntry* _tmp21_; - GtkTreeIter _tmp22_; + SidebarEntry* _tmp17_; + SidebarEntry* _tmp18_; + GtkTreeIter _tmp19_; #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = _child_index; + _tmp7_ = _child_index; #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _child_index = _tmp9_ + 1; + _child_index = _tmp7_ + 1; #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = _child_index; + _tmp8_ = _child_index; #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = _child_size; + _tmp9_ = _child_size; #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (!(_tmp10_ < _tmp11_)) { + if (!(_tmp8_ < _tmp9_)) { #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" break; -#line 2978 "Tree.c" +#line 3211 "Tree.c" } #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = _child_list; + _tmp10_ = _child_list; #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = _child_index; + _tmp11_ = _child_index; #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = gee_list_get (_tmp12_, _tmp13_); + _tmp12_ = gee_list_get (_tmp10_, _tmp11_); #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - child = (SidebarEntry*) _tmp14_; + child = (SidebarEntry*) _tmp12_; #line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp15_ = self->priv->store; + _tmp13_ = self->priv->store; #line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = *parent_iter; + _tmp14_ = *parent_iter; #line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_append (_tmp15_, &_tmp17_, &_tmp16_); + gtk_tree_store_append (_tmp13_, &_tmp15_, &_tmp14_); #line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - append_iter = _tmp17_; + append_iter = _tmp15_; #line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp18_ = append_iter; + _tmp16_ = append_iter; #line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp19_ = child; + _tmp17_ = child; #line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_associate_entry (self, &_tmp18_, _tmp19_); -#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp20_ = branch; + sidebar_tree_associate_entry (self, &_tmp16_, _tmp17_); #line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp21_ = child; + _tmp18_ = child; #line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp22_ = append_iter; + _tmp19_ = append_iter; #line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_associate_children (self, _tmp20_, _tmp21_, &_tmp22_); + sidebar_tree_associate_children (self, branch, _tmp18_, &_tmp19_); #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (child); -#line 3012 "Tree.c" +#line 3243 "Tree.c" } #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (_child_list); -#line 3016 "Tree.c" +#line 3247 "Tree.c" } #line 455 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (children); -#line 3020 "Tree.c" +#line 3251 "Tree.c" } -static void sidebar_tree_associate_entry (SidebarTree* self, GtkTreeIter* assoc_iter, SidebarEntry* entry) { +static void +sidebar_tree_associate_entry (SidebarTree* self, + GtkTreeIter* assoc_iter, + SidebarEntry* entry) +{ GtkTreeIter _tmp0_; GtkTreeStore* _tmp1_; - SidebarEntry* _tmp2_; - GtkTreeStore* _tmp3_; - GtkTreeIter _tmp4_; + GtkTreeStore* _tmp2_; + GtkTreeIter _tmp3_; + GtkTreePath* _tmp4_; GtkTreePath* _tmp5_; - GtkTreePath* _tmp6_; + SidebarTreeEntryWrapper* _tmp6_; SidebarTreeEntryWrapper* _tmp7_; - SidebarTreeEntryWrapper* _tmp8_; #line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -3041,113 +3275,135 @@ static void sidebar_tree_associate_entry (SidebarTree* self, GtkTreeIter* assoc_ #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = self->priv->store; #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = entry; -#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = self->priv->store; + _tmp2_ = self->priv->store; #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = *assoc_iter; + _tmp3_ = *assoc_iter; #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp4_); + _tmp4_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp3_); #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = sidebar_tree_entry_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_TREE_MODEL, GtkTreeModel), _tmp2_, _tmp6_); + _tmp6_ = sidebar_tree_entry_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_tree_model_get_type (), GtkTreeModel), entry, _tmp5_); #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_associate_wrapper (self, &_tmp0_, _tmp8_); + sidebar_tree_associate_wrapper (self, &_tmp0_, _tmp7_); #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (_tmp6_); -#line 3064 "Tree.c" + __vala_GtkTreePath_free0 (_tmp5_); +#line 3296 "Tree.c" } -static void _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed (SidebarEntry* _sender, const gchar* tooltip, gpointer self) { +static void +_sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed (SidebarEntry* _sender, + const gchar* tooltip, + gpointer self) +{ #line 485 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_sidebar_tooltip_changed ((SidebarTree*) self, _sender, tooltip); -#line 3071 "Tree.c" +#line 3307 "Tree.c" } -static void _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed (SidebarEntry* _sender, const gchar* icon, gpointer self) { +static void +_sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed (SidebarEntry* _sender, + const gchar* icon, + gpointer self) +{ #line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_sidebar_icon_changed ((SidebarTree*) self, _sender, icon); -#line 3078 "Tree.c" +#line 3318 "Tree.c" } -static void _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, Page* page, gpointer self) { +static void +_sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, + Page* page, + gpointer self) +{ #line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_sidebar_page_created ((SidebarTree*) self, _sender, page); -#line 3085 "Tree.c" +#line 3329 "Tree.c" } -static void _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, Page* page, gpointer self) { +static void +_sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, + Page* page, + gpointer self) +{ #line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_sidebar_destroying_page ((SidebarTree*) self, _sender, page); -#line 3092 "Tree.c" +#line 3340 "Tree.c" } -static void _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed (SidebarEmphasizableEntry* _sender, gboolean emphasized, gpointer self) { +static void +_sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed (SidebarEmphasizableEntry* _sender, + gboolean emphasized, + gpointer self) +{ #line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_is_emphasized_changed ((SidebarTree*) self, _sender, emphasized); -#line 3099 "Tree.c" +#line 3351 "Tree.c" } -static void _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed (SidebarRenameableEntry* _sender, const gchar* name, gpointer self) { +static void +_sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed (SidebarRenameableEntry* _sender, + const gchar* name, + gpointer self) +{ #line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_sidebar_name_changed ((SidebarTree*) self, _sender, name); -#line 3106 "Tree.c" +#line 3362 "Tree.c" } -static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* assoc_iter, SidebarTreeEntryWrapper* wrapper) { +static void +sidebar_tree_associate_wrapper (SidebarTree* self, + GtkTreeIter* assoc_iter, + SidebarTreeEntryWrapper* wrapper) +{ SidebarEntry* entry = NULL; - SidebarTreeEntryWrapper* _tmp0_; + SidebarEntry* _tmp0_; SidebarEntry* _tmp1_; - SidebarEntry* _tmp2_; - GeeHashMap* _tmp3_; - SidebarEntry* _tmp4_; - gboolean _tmp5_; - GeeHashMap* _tmp6_; - SidebarEntry* _tmp7_; - SidebarTreeEntryWrapper* _tmp8_; - GtkTreeStore* _tmp9_; - GtkTreeIter _tmp10_; - SidebarEntry* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; - GtkTreeStore* _tmp14_; - GtkTreeIter _tmp15_; - SidebarEntry* _tmp16_; + GeeHashMap* _tmp2_; + SidebarEntry* _tmp3_; + GeeHashMap* _tmp4_; + SidebarEntry* _tmp5_; + GtkTreeStore* _tmp6_; + GtkTreeIter _tmp7_; + SidebarEntry* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + GtkTreeStore* _tmp11_; + GtkTreeIter _tmp12_; + SidebarEntry* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; gchar* _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; - GtkTreeStore* _tmp21_; - GtkTreeIter _tmp22_; - SidebarTreeEntryWrapper* _tmp23_; - GtkTreeIter _tmp24_; - SidebarEntry* _tmp25_; - SidebarEntry* _tmp26_; + GtkTreeStore* _tmp18_; + GtkTreeIter _tmp19_; + GtkTreeIter _tmp20_; + SidebarEntry* _tmp21_; + SidebarEntry* _tmp22_; SidebarPageRepresentative* pageable = NULL; - SidebarEntry* _tmp27_; - SidebarPageRepresentative* _tmp28_; - SidebarPageRepresentative* _tmp29_; + SidebarEntry* _tmp23_; + SidebarPageRepresentative* _tmp24_; + SidebarPageRepresentative* _tmp25_; SidebarEmphasizableEntry* emphasizable = NULL; - SidebarEntry* _tmp32_; - SidebarEmphasizableEntry* _tmp33_; - SidebarEmphasizableEntry* _tmp34_; + SidebarEntry* _tmp28_; + SidebarEmphasizableEntry* _tmp29_; + SidebarEmphasizableEntry* _tmp30_; SidebarRenameableEntry* renameable = NULL; + SidebarEntry* _tmp32_; + SidebarRenameableEntry* _tmp33_; + SidebarRenameableEntry* _tmp34_; SidebarEntry* _tmp36_; - SidebarRenameableEntry* _tmp37_; - SidebarRenameableEntry* _tmp38_; - SidebarEntry* _tmp40_; #line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -3155,146 +3411,138 @@ static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* asso #line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper)); #line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = wrapper; + _tmp0_ = wrapper->entry; #line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = _tmp0_->entry; -#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - entry = _tmp2_; + entry = _tmp1_; #line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = self->priv->entry_map; + _tmp2_ = self->priv->entry_map; #line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = entry; + _tmp3_ = entry; #line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); -#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (!_tmp5_, "!entry_map.has_key(entry)"); -#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = self->priv->entry_map; + _vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_), "!entry_map.has_key(entry)"); #line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = entry; + _tmp4_ = self->priv->entry_map; #line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = wrapper; + _tmp5_ = entry; #line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, _tmp8_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, wrapper); #line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = self->priv->store; + _tmp6_ = self->priv->store; #line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = *assoc_iter; + _tmp7_ = *assoc_iter; #line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = entry; + _tmp8_ = entry; #line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = sidebar_tree_get_name_for_entry (self, _tmp11_); + _tmp9_ = sidebar_tree_get_name_for_entry (self, _tmp8_); #line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = _tmp12_; + _tmp10_ = _tmp9_; #line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_set (_tmp9_, &_tmp10_, SIDEBAR_TREE_COLUMNS_NAME, _tmp13_, -1); + gtk_tree_store_set (_tmp6_, &_tmp7_, SIDEBAR_TREE_COLUMNS_NAME, _tmp10_, -1); #line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp10_); #line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = self->priv->store; + _tmp11_ = self->priv->store; #line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp15_ = *assoc_iter; + _tmp12_ = *assoc_iter; #line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = entry; + _tmp13_ = entry; #line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp17_ = sidebar_entry_get_sidebar_tooltip (_tmp16_); + _tmp14_ = sidebar_entry_get_sidebar_tooltip (_tmp13_); #line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp18_ = _tmp17_; + _tmp15_ = _tmp14_; #line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp19_ = guarded_markup_escape_text (_tmp18_); + _tmp16_ = guarded_markup_escape_text (_tmp15_); #line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp20_ = _tmp19_; + _tmp17_ = _tmp16_; #line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_set (_tmp14_, &_tmp15_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp20_, -1); + gtk_tree_store_set (_tmp11_, &_tmp12_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp17_, -1); #line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp17_); #line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_free0 (_tmp18_); -#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp21_ = self->priv->store; + _g_free0 (_tmp15_); #line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp22_ = *assoc_iter; + _tmp18_ = self->priv->store; #line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp23_ = wrapper; + _tmp19_ = *assoc_iter; #line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_set (_tmp21_, &_tmp22_, SIDEBAR_TREE_COLUMNS_WRAPPER, _tmp23_, -1); + gtk_tree_store_set (_tmp18_, &_tmp19_, SIDEBAR_TREE_COLUMNS_WRAPPER, wrapper, -1); #line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp24_ = *assoc_iter; + _tmp20_ = *assoc_iter; #line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_load_entry_icons (self, &_tmp24_); + sidebar_tree_load_entry_icons (self, &_tmp20_); #line 485 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp25_ = entry; + _tmp21_ = entry; #line 485 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_connect_object (_tmp25_, "sidebar-tooltip-changed", (GCallback) _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed, self, 0); + g_signal_connect_object (_tmp21_, "sidebar-tooltip-changed", (GCallback) _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed, self, 0); #line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp26_ = entry; + _tmp22_ = entry; #line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_connect_object (_tmp26_, "sidebar-icon-changed", (GCallback) _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed, self, 0); + g_signal_connect_object (_tmp22_, "sidebar-icon-changed", (GCallback) _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed, self, 0); #line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp27_ = entry; + _tmp23_ = entry; #line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp27_) : NULL); + _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp23_) : NULL); #line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - pageable = _tmp28_; + pageable = _tmp24_; #line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp29_ = pageable; + _tmp25_ = pageable; #line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp29_ != NULL) { -#line 3246 "Tree.c" - SidebarPageRepresentative* _tmp30_; - SidebarPageRepresentative* _tmp31_; + if (_tmp25_ != NULL) { +#line 3494 "Tree.c" + SidebarPageRepresentative* _tmp26_; + SidebarPageRepresentative* _tmp27_; #line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp30_ = pageable; + _tmp26_ = pageable; #line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_connect_object (_tmp30_, "page-created", (GCallback) _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created, self, 0); + g_signal_connect_object (_tmp26_, "page-created", (GCallback) _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created, self, 0); #line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp31_ = pageable; + _tmp27_ = pageable; #line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_connect_object (_tmp31_, "destroying-page", (GCallback) _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page, self, 0); -#line 3257 "Tree.c" + g_signal_connect_object (_tmp27_, "destroying-page", (GCallback) _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page, self, 0); +#line 3505 "Tree.c" } #line 494 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp32_ = entry; + _tmp28_ = entry; #line 494 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp32_) : NULL); + _tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp28_) : NULL); #line 494 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - emphasizable = _tmp33_; + emphasizable = _tmp29_; #line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp34_ = emphasizable; + _tmp30_ = emphasizable; #line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp34_ != NULL) { -#line 3269 "Tree.c" - SidebarEmphasizableEntry* _tmp35_; + if (_tmp30_ != NULL) { +#line 3517 "Tree.c" + SidebarEmphasizableEntry* _tmp31_; #line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp35_ = emphasizable; + _tmp31_ = emphasizable; #line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_connect_object (_tmp35_, "is-emphasized-changed", (GCallback) _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed, self, 0); -#line 3275 "Tree.c" + g_signal_connect_object (_tmp31_, "is-emphasized-changed", (GCallback) _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed, self, 0); +#line 3523 "Tree.c" } #line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp36_ = entry; + _tmp32_ = entry; #line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp36_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp36_) : NULL); + _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp32_) : NULL); #line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - renameable = _tmp37_; + renameable = _tmp33_; #line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp38_ = renameable; + _tmp34_ = renameable; #line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp38_ != NULL) { -#line 3287 "Tree.c" - SidebarRenameableEntry* _tmp39_; + if (_tmp34_ != NULL) { +#line 3535 "Tree.c" + SidebarRenameableEntry* _tmp35_; #line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp39_ = renameable; + _tmp35_ = renameable; #line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_connect_object (_tmp39_, "sidebar-name-changed", (GCallback) _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed, self, 0); -#line 3293 "Tree.c" + g_signal_connect_object (_tmp35_, "sidebar-name-changed", (GCallback) _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed, self, 0); +#line 3541 "Tree.c" } #line 502 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp40_ = entry; + _tmp36_ = entry; #line 502 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_entry_grafted (_tmp40_, self); + sidebar_entry_grafted (_tmp36_, self); #line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (renameable); #line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -3303,41 +3551,44 @@ static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* asso _g_object_unref0 (pageable); #line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (entry); -#line 3307 "Tree.c" +#line 3555 "Tree.c" } -static SidebarTreeEntryWrapper* sidebar_tree_reparent_wrapper (SidebarTree* self, GtkTreeIter* new_iter, SidebarTreeEntryWrapper* current_wrapper) { +static SidebarTreeEntryWrapper* +sidebar_tree_reparent_wrapper (SidebarTree* self, + GtkTreeIter* new_iter, + SidebarTreeEntryWrapper* current_wrapper) +{ SidebarTreeEntryWrapper* result = NULL; SidebarEntry* entry = NULL; - SidebarTreeEntryWrapper* _tmp0_; + SidebarEntry* _tmp0_; SidebarEntry* _tmp1_; - SidebarEntry* _tmp2_; gboolean removed = FALSE; - GeeHashMap* _tmp3_; - gboolean _tmp4_; + GeeHashMap* _tmp2_; + gboolean _tmp3_; SidebarTreeEntryWrapper* new_wrapper = NULL; + GtkTreeStore* _tmp4_; GtkTreeStore* _tmp5_; - GtkTreeStore* _tmp6_; - GtkTreeIter _tmp7_; + GtkTreeIter _tmp6_; + GtkTreePath* _tmp7_; GtkTreePath* _tmp8_; - GtkTreePath* _tmp9_; + SidebarTreeEntryWrapper* _tmp9_; SidebarTreeEntryWrapper* _tmp10_; - SidebarTreeEntryWrapper* _tmp11_; - GeeHashMap* _tmp12_; - GtkTreeStore* _tmp13_; - GtkTreeIter _tmp14_; + GeeHashMap* _tmp11_; + GtkTreeStore* _tmp12_; + GtkTreeIter _tmp13_; + gchar* _tmp14_; gchar* _tmp15_; - gchar* _tmp16_; - GtkTreeStore* _tmp17_; - GtkTreeIter _tmp18_; + GtkTreeStore* _tmp16_; + GtkTreeIter _tmp17_; + gchar* _tmp18_; gchar* _tmp19_; gchar* _tmp20_; gchar* _tmp21_; - gchar* _tmp22_; - GtkTreeStore* _tmp23_; + GtkTreeStore* _tmp22_; + GtkTreeIter _tmp23_; GtkTreeIter _tmp24_; - GtkTreeIter _tmp25_; #line 505 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL); #line 505 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -3345,119 +3596,108 @@ static SidebarTreeEntryWrapper* sidebar_tree_reparent_wrapper (SidebarTree* self #line 505 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (current_wrapper), NULL); #line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = current_wrapper; -#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = _tmp0_->entry; + _tmp0_ = current_wrapper->entry; #line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - entry = _tmp2_; + entry = _tmp1_; #line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = self->priv->entry_map; + _tmp2_ = self->priv->entry_map; #line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, NULL); + _tmp3_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, NULL); #line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - removed = _tmp4_; + removed = _tmp3_; #line 509 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (removed, "removed"); #line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = self->priv->store; + _tmp4_ = self->priv->store; #line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = self->priv->store; + _tmp5_ = self->priv->store; #line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = *new_iter; + _tmp6_ = *new_iter; #line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_); + _tmp7_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp6_); #line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = sidebar_tree_entry_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_TREE_MODEL, GtkTreeModel), entry, _tmp9_); + _tmp9_ = sidebar_tree_entry_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_tree_model_get_type (), GtkTreeModel), entry, _tmp8_); #line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (_tmp9_); + __vala_GtkTreePath_free0 (_tmp8_); #line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - new_wrapper = _tmp11_; + new_wrapper = _tmp10_; #line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = self->priv->entry_map; + _tmp11_ = self->priv->entry_map; #line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, new_wrapper); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, new_wrapper); #line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = self->priv->store; + _tmp12_ = self->priv->store; #line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = *new_iter; + _tmp13_ = *new_iter; #line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp15_ = sidebar_tree_get_name_for_entry (self, entry); + _tmp14_ = sidebar_tree_get_name_for_entry (self, entry); #line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_set (_tmp13_, &_tmp14_, SIDEBAR_TREE_COLUMNS_NAME, _tmp16_, -1); + gtk_tree_store_set (_tmp12_, &_tmp13_, SIDEBAR_TREE_COLUMNS_NAME, _tmp15_, -1); #line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp15_); #line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp17_ = self->priv->store; + _tmp16_ = self->priv->store; #line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp18_ = *new_iter; + _tmp17_ = *new_iter; #line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp19_ = sidebar_entry_get_sidebar_tooltip (entry); + _tmp18_ = sidebar_entry_get_sidebar_tooltip (entry); #line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp21_ = guarded_markup_escape_text (_tmp20_); + _tmp20_ = guarded_markup_escape_text (_tmp19_); #line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_set (_tmp17_, &_tmp18_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp22_, -1); + gtk_tree_store_set (_tmp16_, &_tmp17_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp21_, -1); #line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp21_); #line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp19_); #line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp23_ = self->priv->store; + _tmp22_ = self->priv->store; #line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp24_ = *new_iter; + _tmp23_ = *new_iter; #line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_set (_tmp23_, &_tmp24_, SIDEBAR_TREE_COLUMNS_WRAPPER, new_wrapper, -1); + gtk_tree_store_set (_tmp22_, &_tmp23_, SIDEBAR_TREE_COLUMNS_WRAPPER, new_wrapper, -1); #line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp25_ = *new_iter; + _tmp24_ = *new_iter; #line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_load_entry_icons (self, &_tmp25_); + sidebar_tree_load_entry_icons (self, &_tmp24_); #line 519 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = new_wrapper; #line 519 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (entry); #line 519 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 3432 "Tree.c" +#line 3681 "Tree.c" } -void sidebar_tree_prune (SidebarTree* self, SidebarBranch* branch) { +void +sidebar_tree_prune (SidebarTree* self, + SidebarBranch* branch) +{ GeeHashMap* _tmp0_; - SidebarBranch* _tmp1_; - gboolean _tmp2_; - SidebarBranch* _tmp3_; - SidebarEntry* _tmp4_; - SidebarEntry* _tmp5_; - gboolean _tmp6_; - gboolean _tmp7_; - SidebarBranch* _tmp9_; - guint _tmp10_; - SidebarBranch* _tmp11_; - guint _tmp12_; - SidebarBranch* _tmp13_; - guint _tmp14_; - SidebarBranch* _tmp15_; - guint _tmp16_; - SidebarBranch* _tmp17_; - guint _tmp18_; - SidebarBranch* _tmp19_; - guint _tmp20_; + SidebarEntry* _tmp1_; + SidebarEntry* _tmp2_; + gboolean _tmp3_; + guint _tmp4_; + guint _tmp5_; + guint _tmp6_; + guint _tmp7_; + guint _tmp8_; + guint _tmp9_; gboolean removed = FALSE; - GeeHashMap* _tmp21_; - SidebarBranch* _tmp22_; - gboolean _tmp23_; - SidebarBranch* _tmp24_; + GeeHashMap* _tmp10_; + gboolean _tmp11_; #line 522 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 522 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -3465,234 +3705,194 @@ void sidebar_tree_prune (SidebarTree* self, SidebarBranch* branch) { #line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->branches; #line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = branch; -#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (_tmp2_, "branches.has_key(branch)"); + _vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), branch), "branches.has_key(branch)"); #line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = branch; -#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = sidebar_branch_get_root (_tmp3_); -#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = _tmp4_; + _tmp1_ = sidebar_branch_get_root (branch); #line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = sidebar_tree_has_wrapper (self, _tmp5_); + _tmp2_ = _tmp1_; #line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = _tmp6_; + _tmp3_ = sidebar_tree_has_wrapper (self, _tmp2_); #line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp2_); #line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp7_) { -#line 3488 "Tree.c" - SidebarBranch* _tmp8_; + if (_tmp3_) { #line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = branch; -#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_disassociate_branch (self, _tmp8_); -#line 3494 "Tree.c" + sidebar_tree_disassociate_branch (self, branch); +#line 3722 "Tree.c" } #line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = branch; -#line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_parse_name ("entry-added", SIDEBAR_TYPE_BRANCH, &_tmp10_, NULL, FALSE); + g_signal_parse_name ("entry-added", SIDEBAR_TYPE_BRANCH, &_tmp4_, NULL, FALSE); #line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added, self); + g_signal_handlers_disconnect_matched (branch, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added, self); #line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = branch; + g_signal_parse_name ("entry-removed", SIDEBAR_TYPE_BRANCH, &_tmp5_, NULL, FALSE); #line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_parse_name ("entry-removed", SIDEBAR_TYPE_BRANCH, &_tmp12_, NULL, FALSE); -#line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed, self); -#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = branch; + g_signal_handlers_disconnect_matched (branch, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed, self); #line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_parse_name ("entry-moved", SIDEBAR_TYPE_BRANCH, &_tmp14_, NULL, FALSE); + g_signal_parse_name ("entry-moved", SIDEBAR_TYPE_BRANCH, &_tmp6_, NULL, FALSE); #line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved, self); -#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp15_ = branch; + g_signal_handlers_disconnect_matched (branch, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved, self); #line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_parse_name ("entry-reparented", SIDEBAR_TYPE_BRANCH, &_tmp16_, NULL, FALSE); + g_signal_parse_name ("entry-reparented", SIDEBAR_TYPE_BRANCH, &_tmp7_, NULL, FALSE); #line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented, self); + g_signal_handlers_disconnect_matched (branch, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented, self); #line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp17_ = branch; + g_signal_parse_name ("children-reordered", SIDEBAR_TYPE_BRANCH, &_tmp8_, NULL, FALSE); #line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_parse_name ("children-reordered", SIDEBAR_TYPE_BRANCH, &_tmp18_, NULL, FALSE); -#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_handlers_disconnect_matched (_tmp17_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered, self); -#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp19_ = branch; + g_signal_handlers_disconnect_matched (branch, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered, self); #line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_parse_name ("show-branch", SIDEBAR_TYPE_BRANCH, &_tmp20_, NULL, FALSE); + g_signal_parse_name ("show-branch", SIDEBAR_TYPE_BRANCH, &_tmp9_, NULL, FALSE); #line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_handlers_disconnect_matched (_tmp19_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _sidebar_tree_on_show_branch_sidebar_branch_show_branch, self); + g_signal_handlers_disconnect_matched (branch, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _sidebar_tree_on_show_branch_sidebar_branch_show_branch, self); #line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp21_ = self->priv->branches; + _tmp10_ = self->priv->branches; #line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp22_ = branch; + _tmp11_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), branch, NULL); #line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp23_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, NULL); -#line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - removed = _tmp23_; + removed = _tmp11_; #line 536 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (removed, "removed"); #line 538 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp24_ = branch; -#line 538 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_REMOVED_SIGNAL], 0, _tmp24_); -#line 3546 "Tree.c" + g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_REMOVED_SIGNAL], 0, branch); +#line 3758 "Tree.c" } -static void sidebar_tree_disassociate_branch (SidebarTree* self, SidebarBranch* branch) { +static void +sidebar_tree_disassociate_branch (SidebarTree* self, + SidebarBranch* branch) +{ SidebarTreeRootWrapper* root_wrapper = NULL; - SidebarBranch* _tmp0_; + SidebarEntry* _tmp0_; SidebarEntry* _tmp1_; - SidebarEntry* _tmp2_; - SidebarTreeEntryWrapper* _tmp3_; + SidebarTreeEntryWrapper* _tmp2_; + SidebarTreeRootWrapper* _tmp3_; SidebarTreeRootWrapper* _tmp4_; - SidebarTreeRootWrapper* _tmp5_; #line 541 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 541 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (branch)); #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = branch; + _tmp0_ = sidebar_branch_get_root (branch); #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = sidebar_branch_get_root (_tmp0_); -#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = sidebar_tree_get_wrapper (self, _tmp2_); + _tmp2_ = sidebar_tree_get_wrapper (self, _tmp1_); #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER) ? ((SidebarTreeRootWrapper*) _tmp3_) : NULL; + _tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER) ? ((SidebarTreeRootWrapper*) _tmp2_) : NULL; #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp4_ == NULL) { + if (_tmp3_ == NULL) { #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_object_unref0 (_tmp3_); -#line 3576 "Tree.c" + _g_object_unref0 (_tmp2_); +#line 3788 "Tree.c" } #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - root_wrapper = _tmp5_; + root_wrapper = _tmp4_; #line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (root_wrapper != NULL, "root_wrapper != null"); #line 545 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_disassociate_wrapper_and_signal (self, G_TYPE_CHECK_INSTANCE_CAST (root_wrapper, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, SidebarTreeEntryWrapper), FALSE); #line 541 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (root_wrapper); -#line 3590 "Tree.c" +#line 3802 "Tree.c" } -static void sidebar_tree_disassociate_wrapper_and_signal (SidebarTree* self, SidebarTreeEntryWrapper* wrapper, gboolean only_children) { +static void +sidebar_tree_disassociate_wrapper_and_signal (SidebarTree* self, + SidebarTreeEntryWrapper* wrapper, + gboolean only_children) +{ gboolean selected = FALSE; - SidebarTreeEntryWrapper* _tmp0_; - SidebarEntry* _tmp1_; - gboolean _tmp2_; - SidebarTreeEntryWrapper* _tmp3_; - gboolean _tmp4_; - gboolean _tmp5_; + SidebarEntry* _tmp0_; + gboolean _tmp1_; #line 550 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 550 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper)); #line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = wrapper; + _tmp0_ = wrapper->entry; #line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = _tmp0_->entry; -#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = sidebar_tree_is_selected (self, _tmp1_); -#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - selected = _tmp2_; -#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = wrapper; -#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = only_children; + selected = sidebar_tree_is_selected (self, _tmp0_); #line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_disassociate_wrapper (self, _tmp3_, _tmp4_); + sidebar_tree_disassociate_wrapper (self, wrapper, only_children); #line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = selected; + _tmp1_ = selected; #line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp5_) { -#line 3624 "Tree.c" + if (_tmp1_) { +#line 3828 "Tree.c" SidebarSelectableEntry* selectable = NULL; - SidebarTreeEntryWrapper* _tmp6_; - SidebarEntry* _tmp7_; - SidebarSelectableEntry* _tmp8_; - SidebarSelectableEntry* _tmp9_; - SidebarSelectableEntry* _tmp10_; -#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = wrapper; + SidebarEntry* _tmp2_; + SidebarSelectableEntry* _tmp3_; + SidebarSelectableEntry* _tmp4_; + SidebarSelectableEntry* _tmp5_; #line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = _tmp6_->entry; + _tmp2_ = wrapper->entry; #line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp7_) : NULL); + _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp2_) : NULL); #line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - selectable = _tmp8_; + selectable = _tmp3_; #line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = selectable; + _tmp4_ = selectable; #line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (_tmp9_ != NULL, "selectable != null"); + _vala_assert (_tmp4_ != NULL, "selectable != null"); #line 559 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = selectable; + _tmp5_ = selectable; #line 559 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_SELECTED_ENTRY_REMOVED_SIGNAL], 0, _tmp10_); + g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_SELECTED_ENTRY_REMOVED_SIGNAL], 0, _tmp5_); #line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (selectable); -#line 3649 "Tree.c" +#line 3850 "Tree.c" } } -static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEntryWrapper* wrapper, gboolean only_children) { +static void +sidebar_tree_disassociate_wrapper (SidebarTree* self, + SidebarTreeEntryWrapper* wrapper, + gboolean only_children) +{ GeeArrayList* children = NULL; GeeArrayList* _tmp0_; GtkTreeIter child_iter = {0}; gboolean found = FALSE; GtkTreeStore* _tmp1_; - SidebarTreeEntryWrapper* _tmp2_; + GtkTreeIter _tmp2_ = {0}; GtkTreeIter _tmp3_ = {0}; - GtkTreeIter _tmp4_ = {0}; - gboolean _tmp5_; - gboolean _tmp26_; + gboolean _tmp4_; GtkTreeIter iter = {0}; + GtkTreeIter _tmp25_ = {0}; + GtkTreeStore* _tmp26_; SidebarTreeEntryWrapper* _tmp27_; - GtkTreeIter _tmp28_ = {0}; - GtkTreeStore* _tmp29_; - SidebarTreeEntryWrapper* _tmp30_; - SidebarTreeEntryWrapper* _tmp31_; SidebarEntry* entry = NULL; - SidebarTreeEntryWrapper* _tmp32_; + SidebarEntry* _tmp28_; + SidebarEntry* _tmp29_; + SidebarEntry* _tmp30_; + SidebarEntry* _tmp31_; + guint _tmp32_; SidebarEntry* _tmp33_; - SidebarEntry* _tmp34_; - SidebarEntry* _tmp35_; - SidebarEntry* _tmp36_; - guint _tmp37_; - SidebarEntry* _tmp38_; - guint _tmp39_; + guint _tmp34_; SidebarPageRepresentative* pageable = NULL; - SidebarEntry* _tmp40_; - SidebarPageRepresentative* _tmp41_; - SidebarPageRepresentative* _tmp42_; + SidebarEntry* _tmp35_; + SidebarPageRepresentative* _tmp36_; + SidebarPageRepresentative* _tmp37_; SidebarRenameableEntry* renameable = NULL; - SidebarEntry* _tmp47_; - SidebarRenameableEntry* _tmp48_; - SidebarRenameableEntry* _tmp49_; + SidebarEntry* _tmp42_; + SidebarRenameableEntry* _tmp43_; + SidebarRenameableEntry* _tmp44_; SidebarEmphasizableEntry* emphasizable = NULL; - SidebarEntry* _tmp52_; - SidebarEmphasizableEntry* _tmp53_; - SidebarEmphasizableEntry* _tmp54_; + SidebarEntry* _tmp47_; + SidebarEmphasizableEntry* _tmp48_; + SidebarEmphasizableEntry* _tmp49_; gboolean removed = FALSE; - GeeHashMap* _tmp57_; - SidebarEntry* _tmp58_; - gboolean _tmp59_; - gboolean _tmp60_; + GeeHashMap* _tmp52_; + SidebarEntry* _tmp53_; + gboolean _tmp54_; + gboolean _tmp55_; #line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -3704,268 +3904,258 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt #line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = self->priv->store; #line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = wrapper; -#line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_entry_wrapper_get_iter (_tmp2_, &_tmp3_); + sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp2_); #line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = gtk_tree_model_iter_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp4_, &_tmp3_); + _tmp4_ = gtk_tree_model_iter_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp3_, &_tmp2_); #line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - child_iter = _tmp4_; + child_iter = _tmp3_; #line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - found = _tmp5_; + found = _tmp4_; #line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" while (TRUE) { -#line 3719 "Tree.c" - gboolean _tmp6_; +#line 3917 "Tree.c" + gboolean _tmp5_; SidebarTreeEntryWrapper* child_wrapper = NULL; - GtkTreeIter _tmp7_; + GtkTreeIter _tmp6_; + SidebarTreeEntryWrapper* _tmp7_; SidebarTreeEntryWrapper* _tmp8_; - SidebarTreeEntryWrapper* _tmp9_; - GeeArrayList* _tmp10_; - SidebarTreeEntryWrapper* _tmp11_; - GtkTreeStore* _tmp12_; - gboolean _tmp13_; + GeeArrayList* _tmp9_; + SidebarTreeEntryWrapper* _tmp10_; + GtkTreeStore* _tmp11_; + gboolean _tmp12_; #line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = found; + _tmp5_ = found; #line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (!_tmp6_) { + if (!_tmp5_) { #line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" break; -#line 3735 "Tree.c" +#line 3933 "Tree.c" } #line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = child_iter; + _tmp6_ = child_iter; #line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp7_); + _tmp7_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp6_); #line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - child_wrapper = _tmp8_; + child_wrapper = _tmp7_; #line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = child_wrapper; + _tmp8_ = child_wrapper; #line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (_tmp9_ != NULL, "child_wrapper != null"); + _vala_assert (_tmp8_ != NULL, "child_wrapper != null"); #line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = children; + _tmp9_ = children; #line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = child_wrapper; + _tmp10_ = child_wrapper; #line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); #line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = self->priv->store; + _tmp11_ = self->priv->store; #line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &child_iter); + _tmp12_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_tree_model_get_type (), GtkTreeModel), &child_iter); #line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - found = _tmp13_; + found = _tmp12_; #line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (child_wrapper); -#line 3761 "Tree.c" +#line 3959 "Tree.c" } { GeeArrayList* _child_wrapper_list = NULL; + GeeArrayList* _tmp13_; GeeArrayList* _tmp14_; - GeeArrayList* _tmp15_; gint _child_wrapper_size = 0; - GeeArrayList* _tmp16_; + GeeArrayList* _tmp15_; + gint _tmp16_; gint _tmp17_; - gint _tmp18_; gint _child_wrapper_index = 0; #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = children; + _tmp13_ = children; #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp15_ = _g_object_ref0 (_tmp14_); + _tmp14_ = _g_object_ref0 (_tmp13_); #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _child_wrapper_list = _tmp15_; + _child_wrapper_list = _tmp14_; #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = _child_wrapper_list; + _tmp15_ = _child_wrapper_list; #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _child_wrapper_size = _tmp18_; + _child_wrapper_size = _tmp17_; #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _child_wrapper_index = -1; #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" while (TRUE) { -#line 3790 "Tree.c" +#line 3988 "Tree.c" + gint _tmp18_; gint _tmp19_; gint _tmp20_; - gint _tmp21_; SidebarTreeEntryWrapper* child_wrapper = NULL; - GeeArrayList* _tmp22_; - gint _tmp23_; - gpointer _tmp24_; - SidebarTreeEntryWrapper* _tmp25_; + GeeArrayList* _tmp21_; + gint _tmp22_; + gpointer _tmp23_; + SidebarTreeEntryWrapper* _tmp24_; #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp19_ = _child_wrapper_index; + _tmp18_ = _child_wrapper_index; #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _child_wrapper_index = _tmp19_ + 1; + _child_wrapper_index = _tmp18_ + 1; #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp20_ = _child_wrapper_index; + _tmp19_ = _child_wrapper_index; #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp21_ = _child_wrapper_size; + _tmp20_ = _child_wrapper_size; #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (!(_tmp20_ < _tmp21_)) { + if (!(_tmp19_ < _tmp20_)) { #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" break; -#line 3811 "Tree.c" +#line 4009 "Tree.c" } #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp22_ = _child_wrapper_list; + _tmp21_ = _child_wrapper_list; #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp23_ = _child_wrapper_index; + _tmp22_ = _child_wrapper_index; #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp24_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp23_); + _tmp23_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp22_); #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - child_wrapper = (SidebarTreeEntryWrapper*) _tmp24_; + child_wrapper = (SidebarTreeEntryWrapper*) _tmp23_; #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp25_ = child_wrapper; + _tmp24_ = child_wrapper; #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_disassociate_wrapper (self, _tmp25_, FALSE); + sidebar_tree_disassociate_wrapper (self, _tmp24_, FALSE); #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (child_wrapper); -#line 3827 "Tree.c" +#line 4025 "Tree.c" } #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (_child_wrapper_list); -#line 3831 "Tree.c" +#line 4029 "Tree.c" } #line 580 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp26_ = only_children; -#line 580 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp26_) { + if (only_children) { #line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (children); #line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 3841 "Tree.c" +#line 4037 "Tree.c" } #line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp27_ = wrapper; -#line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_entry_wrapper_get_iter (_tmp27_, &_tmp28_); + sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp25_); #line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - iter = _tmp28_; + iter = _tmp25_; #line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp29_ = self->priv->store; + _tmp26_ = self->priv->store; #line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_remove (_tmp29_, &iter); + gtk_tree_store_remove (_tmp26_, &iter); #line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp30_ = self->priv->selected_wrapper; + _tmp27_ = self->priv->selected_wrapper; #line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp31_ = wrapper; -#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp30_ == _tmp31_) { + if (_tmp27_ == wrapper) { #line 587 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->selected_wrapper = NULL; -#line 3861 "Tree.c" +#line 4053 "Tree.c" } #line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp32_ = wrapper; -#line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp33_ = _tmp32_->entry; + _tmp28_ = wrapper->entry; #line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp34_ = _g_object_ref0 (_tmp33_); + _tmp29_ = _g_object_ref0 (_tmp28_); #line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - entry = _tmp34_; + entry = _tmp29_; #line 591 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp35_ = entry; + _tmp30_ = entry; #line 591 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_entry_pruned (_tmp35_, self); + sidebar_entry_pruned (_tmp30_, self); #line 593 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp36_ = entry; + _tmp31_ = entry; #line 593 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_parse_name ("sidebar-tooltip-changed", SIDEBAR_TYPE_ENTRY, &_tmp37_, NULL, FALSE); + g_signal_parse_name ("sidebar-tooltip-changed", SIDEBAR_TYPE_ENTRY, &_tmp32_, NULL, FALSE); #line 593 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_handlers_disconnect_matched (_tmp36_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp37_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed, self); + g_signal_handlers_disconnect_matched (_tmp31_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp32_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed, self); #line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp38_ = entry; + _tmp33_ = entry; #line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_parse_name ("sidebar-icon-changed", SIDEBAR_TYPE_ENTRY, &_tmp39_, NULL, FALSE); + g_signal_parse_name ("sidebar-icon-changed", SIDEBAR_TYPE_ENTRY, &_tmp34_, NULL, FALSE); #line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_handlers_disconnect_matched (_tmp38_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp39_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed, self); + g_signal_handlers_disconnect_matched (_tmp33_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp34_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed, self); #line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp40_ = entry; + _tmp35_ = entry; #line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp40_) : NULL); + _tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp35_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp35_) : NULL); #line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - pageable = _tmp41_; + pageable = _tmp36_; #line 597 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp42_ = pageable; + _tmp37_ = pageable; #line 597 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp42_ != NULL) { -#line 3897 "Tree.c" - SidebarPageRepresentative* _tmp43_; - guint _tmp44_; - SidebarPageRepresentative* _tmp45_; - guint _tmp46_; + if (_tmp37_ != NULL) { +#line 4087 "Tree.c" + SidebarPageRepresentative* _tmp38_; + guint _tmp39_; + SidebarPageRepresentative* _tmp40_; + guint _tmp41_; #line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp43_ = pageable; + _tmp38_ = pageable; #line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_parse_name ("page-created", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, &_tmp44_, NULL, FALSE); + g_signal_parse_name ("page-created", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, &_tmp39_, NULL, FALSE); #line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_handlers_disconnect_matched (_tmp43_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp44_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created, self); + g_signal_handlers_disconnect_matched (_tmp38_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp39_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created, self); #line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp45_ = pageable; + _tmp40_ = pageable; #line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_parse_name ("destroying-page", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, &_tmp46_, NULL, FALSE); + g_signal_parse_name ("destroying-page", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, &_tmp41_, NULL, FALSE); #line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_handlers_disconnect_matched (_tmp45_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp46_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page, self); -#line 3914 "Tree.c" + g_signal_handlers_disconnect_matched (_tmp40_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp41_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page, self); +#line 4104 "Tree.c" } #line 602 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp47_ = entry; + _tmp42_ = entry; #line 602 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp47_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp47_) : NULL); + _tmp43_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp42_) : NULL); #line 602 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - renameable = _tmp48_; + renameable = _tmp43_; #line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp49_ = renameable; + _tmp44_ = renameable; #line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp49_ != NULL) { -#line 3926 "Tree.c" - SidebarRenameableEntry* _tmp50_; - guint _tmp51_; + if (_tmp44_ != NULL) { +#line 4116 "Tree.c" + SidebarRenameableEntry* _tmp45_; + guint _tmp46_; #line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp50_ = renameable; + _tmp45_ = renameable; #line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_parse_name ("sidebar-name-changed", SIDEBAR_TYPE_RENAMEABLE_ENTRY, &_tmp51_, NULL, FALSE); + g_signal_parse_name ("sidebar-name-changed", SIDEBAR_TYPE_RENAMEABLE_ENTRY, &_tmp46_, NULL, FALSE); #line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_handlers_disconnect_matched (_tmp50_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp51_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed, self); -#line 3935 "Tree.c" + g_signal_handlers_disconnect_matched (_tmp45_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp46_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed, self); +#line 4125 "Tree.c" } #line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp52_ = entry; + _tmp47_ = entry; #line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp53_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp52_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp52_) : NULL); + _tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp47_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp47_) : NULL); #line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - emphasizable = _tmp53_; + emphasizable = _tmp48_; #line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp54_ = emphasizable; + _tmp49_ = emphasizable; #line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp54_ != NULL) { -#line 3947 "Tree.c" - SidebarEmphasizableEntry* _tmp55_; - guint _tmp56_; + if (_tmp49_ != NULL) { +#line 4137 "Tree.c" + SidebarEmphasizableEntry* _tmp50_; + guint _tmp51_; #line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp55_ = emphasizable; + _tmp50_ = emphasizable; #line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_parse_name ("is-emphasized-changed", SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, &_tmp56_, NULL, FALSE); + g_signal_parse_name ("is-emphasized-changed", SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, &_tmp51_, NULL, FALSE); #line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_handlers_disconnect_matched (_tmp55_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp56_, 0, NULL, (GCallback) _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed, self); -#line 3956 "Tree.c" + g_signal_handlers_disconnect_matched (_tmp50_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp51_, 0, NULL, (GCallback) _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed, self); +#line 4146 "Tree.c" } #line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp57_ = self->priv->entry_map; + _tmp52_ = self->priv->entry_map; #line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp58_ = entry; + _tmp53_ = entry; #line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp59_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp58_, NULL); + _tmp54_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp53_, NULL); #line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - removed = _tmp59_; + removed = _tmp54_; #line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp60_ = removed; + _tmp55_ = removed; #line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (_tmp60_, "removed"); + _vala_assert (_tmp55_, "removed"); #line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (emphasizable); #line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -3976,33 +4166,28 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt _g_object_unref0 (entry); #line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (children); -#line 3980 "Tree.c" +#line 4170 "Tree.c" } -static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry) { +static void +sidebar_tree_on_branch_entry_added (SidebarTree* self, + SidebarBranch* branch, + SidebarEntry* entry) +{ SidebarEntry* parent = NULL; - SidebarBranch* _tmp0_; + SidebarEntry* _tmp0_; SidebarEntry* _tmp1_; - SidebarEntry* _tmp2_; - SidebarEntry* _tmp3_; SidebarTreeEntryWrapper* parent_wrapper = NULL; - SidebarEntry* _tmp4_; - SidebarTreeEntryWrapper* _tmp5_; - SidebarTreeEntryWrapper* _tmp6_; + SidebarEntry* _tmp2_; + SidebarTreeEntryWrapper* _tmp3_; + SidebarTreeEntryWrapper* _tmp4_; GtkTreeIter insertion_iter = {0}; SidebarEntry* next = NULL; - SidebarBranch* _tmp7_; - SidebarEntry* _tmp8_; - SidebarEntry* _tmp9_; - SidebarEntry* _tmp10_; - GtkTreeIter _tmp23_; - SidebarEntry* _tmp24_; - SidebarBranch* _tmp25_; - SidebarEntry* _tmp26_; - GtkTreeIter _tmp27_; - SidebarBranch* _tmp28_; - gboolean _tmp29_; + SidebarEntry* _tmp5_; + SidebarEntry* _tmp6_; + GtkTreeIter _tmp19_; + GtkTreeIter _tmp20_; #line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -4010,116 +4195,94 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch #line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); #line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = branch; -#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = entry; -#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = sidebar_branch_get_parent (_tmp0_, _tmp1_); + _tmp0_ = sidebar_branch_get_parent (branch, entry); #line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - parent = _tmp2_; + parent = _tmp0_; #line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = parent; + _tmp1_ = parent; #line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (_tmp3_ != NULL, "parent != null"); + _vala_assert (_tmp1_ != NULL, "parent != null"); #line 618 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = parent; + _tmp2_ = parent; #line 618 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = sidebar_tree_get_wrapper (self, _tmp4_); + _tmp3_ = sidebar_tree_get_wrapper (self, _tmp2_); #line 618 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - parent_wrapper = _tmp5_; + parent_wrapper = _tmp3_; #line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = parent_wrapper; + _tmp4_ = parent_wrapper; #line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (_tmp6_ != NULL, "parent_wrapper != null"); -#line 622 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = branch; + _vala_assert (_tmp4_ != NULL, "parent_wrapper != null"); #line 622 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = entry; -#line 622 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = sidebar_branch_get_next_sibling (_tmp7_, _tmp8_); + _tmp5_ = sidebar_branch_get_next_sibling (branch, entry); #line 622 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - next = _tmp9_; + next = _tmp5_; #line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = next; + _tmp6_ = next; #line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp10_ != NULL) { -#line 4047 "Tree.c" + if (_tmp6_ != NULL) { +#line 4224 "Tree.c" SidebarTreeEntryWrapper* next_wrapper = NULL; - SidebarEntry* _tmp11_; + SidebarEntry* _tmp7_; + SidebarTreeEntryWrapper* _tmp8_; + GtkTreeStore* _tmp9_; + SidebarTreeEntryWrapper* _tmp10_; + GtkTreeIter _tmp11_ = {0}; SidebarTreeEntryWrapper* _tmp12_; - GtkTreeStore* _tmp13_; - SidebarTreeEntryWrapper* _tmp14_; - GtkTreeIter _tmp15_ = {0}; - SidebarTreeEntryWrapper* _tmp16_; - GtkTreeIter _tmp17_ = {0}; - GtkTreeIter _tmp18_ = {0}; + GtkTreeIter _tmp13_ = {0}; + GtkTreeIter _tmp14_ = {0}; #line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = next; + _tmp7_ = next; #line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = sidebar_tree_get_wrapper (self, _tmp11_); + _tmp8_ = sidebar_tree_get_wrapper (self, _tmp7_); #line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - next_wrapper = _tmp12_; + next_wrapper = _tmp8_; #line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = self->priv->store; + _tmp9_ = self->priv->store; #line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = parent_wrapper; + _tmp10_ = parent_wrapper; #line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_entry_wrapper_get_iter (_tmp14_, &_tmp15_); + sidebar_tree_entry_wrapper_get_iter (_tmp10_, &_tmp11_); #line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = next_wrapper; + _tmp12_ = next_wrapper; #line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_entry_wrapper_get_iter (_tmp16_, &_tmp17_); + sidebar_tree_entry_wrapper_get_iter (_tmp12_, &_tmp13_); #line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_insert_before (_tmp13_, &_tmp18_, &_tmp15_, &_tmp17_); + gtk_tree_store_insert_before (_tmp9_, &_tmp14_, &_tmp11_, &_tmp13_); #line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - insertion_iter = _tmp18_; + insertion_iter = _tmp14_; #line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (next_wrapper); -#line 4079 "Tree.c" +#line 4256 "Tree.c" } else { - GtkTreeStore* _tmp19_; - SidebarTreeEntryWrapper* _tmp20_; - GtkTreeIter _tmp21_ = {0}; - GtkTreeIter _tmp22_ = {0}; + GtkTreeStore* _tmp15_; + SidebarTreeEntryWrapper* _tmp16_; + GtkTreeIter _tmp17_ = {0}; + GtkTreeIter _tmp18_ = {0}; #line 630 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp19_ = self->priv->store; + _tmp15_ = self->priv->store; #line 630 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp20_ = parent_wrapper; + _tmp16_ = parent_wrapper; #line 630 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_entry_wrapper_get_iter (_tmp20_, &_tmp21_); + sidebar_tree_entry_wrapper_get_iter (_tmp16_, &_tmp17_); #line 630 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_append (_tmp19_, &_tmp22_, &_tmp21_); + gtk_tree_store_append (_tmp15_, &_tmp18_, &_tmp17_); #line 630 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - insertion_iter = _tmp22_; -#line 4095 "Tree.c" + insertion_iter = _tmp18_; +#line 4272 "Tree.c" } #line 633 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp23_ = insertion_iter; -#line 633 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp24_ = entry; + _tmp19_ = insertion_iter; #line 633 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_associate_entry (self, &_tmp23_, _tmp24_); -#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp25_ = branch; + sidebar_tree_associate_entry (self, &_tmp19_, entry); #line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp26_ = entry; + _tmp20_ = insertion_iter; #line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp27_ = insertion_iter; -#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_associate_children (self, _tmp25_, _tmp26_, &_tmp27_); -#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp28_ = branch; -#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp29_ = sidebar_branch_is_auto_open_on_new_child (_tmp28_); + sidebar_tree_associate_children (self, branch, entry, &_tmp20_); #line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp29_) { -#line 4117 "Tree.c" - SidebarEntry* _tmp30_; + if (sidebar_branch_is_auto_open_on_new_child (branch)) { #line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp30_ = entry; -#line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_expand_to_entry (self, _tmp30_); -#line 4123 "Tree.c" + sidebar_tree_expand_to_entry (self, entry); +#line 4286 "Tree.c" } #line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (next); @@ -4127,14 +4290,17 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch _g_object_unref0 (parent_wrapper); #line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (parent); -#line 4131 "Tree.c" +#line 4294 "Tree.c" } -static void sidebar_tree_on_branch_entry_removed (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry) { +static void +sidebar_tree_on_branch_entry_removed (SidebarTree* self, + SidebarBranch* branch, + SidebarEntry* entry) +{ SidebarTreeEntryWrapper* wrapper = NULL; - SidebarEntry* _tmp0_; - SidebarTreeEntryWrapper* _tmp1_; + SidebarTreeEntryWrapper* _tmp0_; #line 640 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 640 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -4142,11 +4308,9 @@ static void sidebar_tree_on_branch_entry_removed (SidebarTree* self, SidebarBran #line 640 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); #line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = entry; -#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_); + _tmp0_ = sidebar_tree_get_wrapper (self, entry); #line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - wrapper = _tmp1_; + wrapper = _tmp0_; #line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (wrapper != NULL, "wrapper != null"); #line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -4155,27 +4319,28 @@ static void sidebar_tree_on_branch_entry_removed (SidebarTree* self, SidebarBran sidebar_tree_disassociate_wrapper_and_signal (self, wrapper, FALSE); #line 640 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 4159 "Tree.c" +#line 4323 "Tree.c" } -static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry) { +static void +sidebar_tree_on_branch_entry_moved (SidebarTree* self, + SidebarBranch* branch, + SidebarEntry* entry) +{ SidebarTreeEntryWrapper* wrapper = NULL; - SidebarEntry* _tmp0_; + SidebarTreeEntryWrapper* _tmp0_; SidebarTreeEntryWrapper* _tmp1_; SidebarTreeEntryWrapper* _tmp2_; - SidebarTreeEntryWrapper* _tmp3_; GtkTreeIter* prev_iter = NULL; SidebarEntry* prev = NULL; - SidebarBranch* _tmp4_; - SidebarEntry* _tmp5_; - SidebarEntry* _tmp6_; - SidebarEntry* _tmp7_; + SidebarEntry* _tmp3_; + SidebarEntry* _tmp4_; GtkTreeIter entry_iter = {0}; - SidebarTreeEntryWrapper* _tmp14_; - GtkTreeIter _tmp15_ = {0}; - GtkTreeStore* _tmp16_; - GtkTreeIter* _tmp17_; + SidebarTreeEntryWrapper* _tmp11_; + GtkTreeIter _tmp12_ = {0}; + GtkTreeStore* _tmp13_; + GtkTreeIter* _tmp14_; #line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -4183,131 +4348,124 @@ static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch #line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); #line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = entry; + _tmp0_ = sidebar_tree_get_wrapper (self, entry); #line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_); -#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - wrapper = _tmp1_; + wrapper = _tmp0_; #line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = wrapper; + _tmp1_ = wrapper; #line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (_tmp2_ != NULL, "wrapper != null"); + _vala_assert (_tmp1_ != NULL, "wrapper != null"); #line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = wrapper; + _tmp2_ = wrapper; #line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER), "!(wrapper is RootWrapper)"); + _vala_assert (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER), "!(wrapper is RootWrapper)"); #line 654 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" prev_iter = NULL; #line 655 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = branch; -#line 655 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = entry; -#line 655 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = sidebar_branch_get_previous_sibling (_tmp4_, _tmp5_); + _tmp3_ = sidebar_branch_get_previous_sibling (branch, entry); #line 655 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - prev = _tmp6_; + prev = _tmp3_; #line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = prev; + _tmp4_ = prev; #line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp7_ != NULL) { -#line 4214 "Tree.c" + if (_tmp4_ != NULL) { +#line 4373 "Tree.c" SidebarTreeEntryWrapper* prev_wrapper = NULL; - SidebarEntry* _tmp8_; - SidebarTreeEntryWrapper* _tmp9_; - SidebarTreeEntryWrapper* _tmp10_; - SidebarTreeEntryWrapper* _tmp11_; - GtkTreeIter _tmp12_ = {0}; - GtkTreeIter* _tmp13_; + SidebarEntry* _tmp5_; + SidebarTreeEntryWrapper* _tmp6_; + SidebarTreeEntryWrapper* _tmp7_; + SidebarTreeEntryWrapper* _tmp8_; + GtkTreeIter _tmp9_ = {0}; + GtkTreeIter* _tmp10_; #line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = prev; + _tmp5_ = prev; #line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = sidebar_tree_get_wrapper (self, _tmp8_); + _tmp6_ = sidebar_tree_get_wrapper (self, _tmp5_); #line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - prev_wrapper = _tmp9_; + prev_wrapper = _tmp6_; #line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = prev_wrapper; + _tmp7_ = prev_wrapper; #line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (_tmp10_ != NULL, "prev_wrapper != null"); + _vala_assert (_tmp7_ != NULL, "prev_wrapper != null"); #line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = prev_wrapper; + _tmp8_ = prev_wrapper; #line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_entry_wrapper_get_iter (_tmp11_, &_tmp12_); + sidebar_tree_entry_wrapper_get_iter (_tmp8_, &_tmp9_); #line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = __gtk_tree_iter_dup0 (&_tmp12_); + _tmp10_ = __gtk_tree_iter_dup0 (&_tmp9_); #line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (prev_iter); #line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - prev_iter = _tmp13_; + prev_iter = _tmp10_; #line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (prev_wrapper); -#line 4244 "Tree.c" +#line 4403 "Tree.c" } #line 663 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = wrapper; + _tmp11_ = wrapper; #line 663 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_entry_wrapper_get_iter (_tmp14_, &_tmp15_); + sidebar_tree_entry_wrapper_get_iter (_tmp11_, &_tmp12_); #line 663 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - entry_iter = _tmp15_; + entry_iter = _tmp12_; #line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = self->priv->store; + _tmp13_ = self->priv->store; #line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp17_ = prev_iter; + _tmp14_ = prev_iter; #line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_move_after (_tmp16_, &entry_iter, _tmp17_); + gtk_tree_store_move_after (_tmp13_, &entry_iter, _tmp14_); #line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (prev); #line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (prev_iter); #line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 4264 "Tree.c" +#line 4423 "Tree.c" } -static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry, SidebarEntry* old_parent) { +static void +sidebar_tree_on_branch_entry_reparented (SidebarTree* self, + SidebarBranch* branch, + SidebarEntry* entry, + SidebarEntry* old_parent) +{ SidebarTreeEntryWrapper* wrapper = NULL; - SidebarEntry* _tmp0_; + SidebarTreeEntryWrapper* _tmp0_; SidebarTreeEntryWrapper* _tmp1_; SidebarTreeEntryWrapper* _tmp2_; - SidebarTreeEntryWrapper* _tmp3_; gboolean selected = FALSE; + GtkTreePath* _tmp3_; GtkTreePath* _tmp4_; - GtkTreePath* _tmp5_; - SidebarTreeEntryWrapper* _tmp6_; + SidebarTreeEntryWrapper* _tmp5_; + GtkTreePath* _tmp6_; GtkTreePath* _tmp7_; - GtkTreePath* _tmp8_; - gint _tmp9_; - gboolean _tmp10_; + gboolean _tmp8_; GtkTreeIter iter = {0}; - SidebarTreeEntryWrapper* _tmp11_; - GtkTreeIter _tmp12_ = {0}; - GtkTreeStore* _tmp13_; + SidebarTreeEntryWrapper* _tmp9_; + GtkTreeIter _tmp10_ = {0}; + GtkTreeStore* _tmp11_; SidebarEntry* parent = NULL; - SidebarBranch* _tmp14_; - SidebarEntry* _tmp15_; - SidebarEntry* _tmp16_; - SidebarEntry* _tmp17_; + SidebarEntry* _tmp12_; + SidebarEntry* _tmp13_; SidebarTreeEntryWrapper* parent_wrapper = NULL; - SidebarEntry* _tmp18_; - SidebarTreeEntryWrapper* _tmp19_; - SidebarTreeEntryWrapper* _tmp20_; + SidebarEntry* _tmp14_; + SidebarTreeEntryWrapper* _tmp15_; + SidebarTreeEntryWrapper* _tmp16_; GtkTreeIter* prev_iter = NULL; SidebarEntry* prev = NULL; - SidebarBranch* _tmp21_; - SidebarEntry* _tmp22_; - SidebarEntry* _tmp23_; - SidebarEntry* _tmp24_; + SidebarEntry* _tmp17_; + SidebarEntry* _tmp18_; GtkTreeIter new_iter = {0}; - GtkTreeStore* _tmp31_; - SidebarTreeEntryWrapper* _tmp32_; - GtkTreeIter _tmp33_ = {0}; - GtkTreeIter* _tmp34_; - GtkTreeIter _tmp35_ = {0}; + GtkTreeStore* _tmp25_; + SidebarTreeEntryWrapper* _tmp26_; + GtkTreeIter _tmp27_ = {0}; + GtkTreeIter* _tmp28_; + GtkTreeIter _tmp29_ = {0}; SidebarTreeEntryWrapper* new_wrapper = NULL; - GtkTreeIter _tmp36_; - SidebarTreeEntryWrapper* _tmp37_; - SidebarTreeEntryWrapper* _tmp38_; - gboolean _tmp39_; + GtkTreeIter _tmp30_; + SidebarTreeEntryWrapper* _tmp31_; + SidebarTreeEntryWrapper* _tmp32_; + gboolean _tmp33_; #line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -4317,159 +4475,147 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB #line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (old_parent)); #line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = entry; -#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_); + _tmp0_ = sidebar_tree_get_wrapper (self, entry); #line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - wrapper = _tmp1_; + wrapper = _tmp0_; #line 670 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = wrapper; + _tmp1_ = wrapper; #line 670 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (_tmp2_ != NULL, "wrapper != null"); + _vala_assert (_tmp1_ != NULL, "wrapper != null"); #line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = wrapper; + _tmp2_ = wrapper; #line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER), "!(wrapper is RootWrapper)"); + _vala_assert (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER), "!(wrapper is RootWrapper)"); #line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = sidebar_tree_get_current_path (self); -#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = _tmp4_; + _tmp3_ = sidebar_tree_get_current_path (self); #line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = wrapper; + _tmp4_ = _tmp3_; #line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = sidebar_tree_entry_wrapper_get_path (_tmp6_); + _tmp5_ = wrapper; #line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = _tmp7_; + _tmp6_ = sidebar_tree_entry_wrapper_get_path (_tmp5_); #line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = gtk_tree_path_compare (_tmp5_, _tmp8_); + _tmp7_ = _tmp6_; #line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = _tmp9_ == 0; + _tmp8_ = gtk_tree_path_compare (_tmp4_, _tmp7_) == 0; #line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (_tmp8_); + __vala_GtkTreePath_free0 (_tmp7_); #line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (_tmp5_); + __vala_GtkTreePath_free0 (_tmp4_); #line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - selected = _tmp10_; + selected = _tmp8_; #line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = wrapper; + _tmp9_ = wrapper; #line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_entry_wrapper_get_iter (_tmp11_, &_tmp12_); + sidebar_tree_entry_wrapper_get_iter (_tmp9_, &_tmp10_); #line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - iter = _tmp12_; + iter = _tmp10_; #line 677 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = self->priv->store; + _tmp11_ = self->priv->store; #line 677 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_remove (_tmp13_, &iter); + gtk_tree_store_remove (_tmp11_, &iter); #line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = branch; + _tmp12_ = sidebar_branch_get_parent (branch, entry); #line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp15_ = entry; -#line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = sidebar_branch_get_parent (_tmp14_, _tmp15_); -#line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - parent = _tmp16_; + parent = _tmp12_; #line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp17_ = parent; + _tmp13_ = parent; #line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (_tmp17_ != NULL, "parent != null"); + _vala_assert (_tmp13_ != NULL, "parent != null"); #line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp18_ = parent; + _tmp14_ = parent; #line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp19_ = sidebar_tree_get_wrapper (self, _tmp18_); + _tmp15_ = sidebar_tree_get_wrapper (self, _tmp14_); #line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - parent_wrapper = _tmp19_; + parent_wrapper = _tmp15_; #line 683 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp20_ = parent_wrapper; + _tmp16_ = parent_wrapper; #line 683 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (_tmp20_ != NULL, "parent_wrapper != null"); + _vala_assert (_tmp16_ != NULL, "parent_wrapper != null"); #line 686 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" prev_iter = NULL; #line 687 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp21_ = branch; -#line 687 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp22_ = entry; -#line 687 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp23_ = sidebar_branch_get_previous_sibling (_tmp21_, _tmp22_); + _tmp17_ = sidebar_branch_get_previous_sibling (branch, entry); #line 687 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - prev = _tmp23_; + prev = _tmp17_; #line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp24_ = prev; + _tmp18_ = prev; #line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp24_ != NULL) { -#line 4400 "Tree.c" + if (_tmp18_ != NULL) { +#line 4546 "Tree.c" SidebarTreeEntryWrapper* prev_wrapper = NULL; - SidebarEntry* _tmp25_; - SidebarTreeEntryWrapper* _tmp26_; - SidebarTreeEntryWrapper* _tmp27_; - SidebarTreeEntryWrapper* _tmp28_; - GtkTreeIter _tmp29_ = {0}; - GtkTreeIter* _tmp30_; + SidebarEntry* _tmp19_; + SidebarTreeEntryWrapper* _tmp20_; + SidebarTreeEntryWrapper* _tmp21_; + SidebarTreeEntryWrapper* _tmp22_; + GtkTreeIter _tmp23_ = {0}; + GtkTreeIter* _tmp24_; #line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp25_ = prev; + _tmp19_ = prev; #line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp26_ = sidebar_tree_get_wrapper (self, _tmp25_); + _tmp20_ = sidebar_tree_get_wrapper (self, _tmp19_); #line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - prev_wrapper = _tmp26_; + prev_wrapper = _tmp20_; #line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp27_ = prev_wrapper; + _tmp21_ = prev_wrapper; #line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (_tmp27_ != NULL, "prev_wrapper != null"); + _vala_assert (_tmp21_ != NULL, "prev_wrapper != null"); #line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp28_ = prev_wrapper; + _tmp22_ = prev_wrapper; #line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_entry_wrapper_get_iter (_tmp28_, &_tmp29_); + sidebar_tree_entry_wrapper_get_iter (_tmp22_, &_tmp23_); #line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp30_ = __gtk_tree_iter_dup0 (&_tmp29_); + _tmp24_ = __gtk_tree_iter_dup0 (&_tmp23_); #line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (prev_iter); #line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - prev_iter = _tmp30_; + prev_iter = _tmp24_; #line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (prev_wrapper); -#line 4430 "Tree.c" +#line 4576 "Tree.c" } #line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp31_ = self->priv->store; + _tmp25_ = self->priv->store; #line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp32_ = parent_wrapper; + _tmp26_ = parent_wrapper; #line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_entry_wrapper_get_iter (_tmp32_, &_tmp33_); + sidebar_tree_entry_wrapper_get_iter (_tmp26_, &_tmp27_); #line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp34_ = prev_iter; + _tmp28_ = prev_iter; #line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_insert_after (_tmp31_, &_tmp35_, &_tmp33_, _tmp34_); + gtk_tree_store_insert_after (_tmp25_, &_tmp29_, &_tmp27_, _tmp28_); #line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - new_iter = _tmp35_; + new_iter = _tmp29_; #line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp36_ = new_iter; + _tmp30_ = new_iter; #line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp37_ = wrapper; + _tmp31_ = wrapper; #line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp38_ = sidebar_tree_reparent_wrapper (self, &_tmp36_, _tmp37_); + _tmp32_ = sidebar_tree_reparent_wrapper (self, &_tmp30_, _tmp31_); #line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - new_wrapper = _tmp38_; + new_wrapper = _tmp32_; #line 700 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp39_ = selected; + _tmp33_ = selected; #line 700 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp39_) { -#line 4456 "Tree.c" - SidebarTreeEntryWrapper* _tmp40_; - SidebarEntry* _tmp41_; - SidebarTreeEntryWrapper* _tmp42_; - SidebarEntry* _tmp43_; + if (_tmp33_) { +#line 4602 "Tree.c" + SidebarTreeEntryWrapper* _tmp34_; + SidebarEntry* _tmp35_; + SidebarTreeEntryWrapper* _tmp36_; + SidebarEntry* _tmp37_; #line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp40_ = new_wrapper; + _tmp34_ = new_wrapper; #line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp41_ = _tmp40_->entry; + _tmp35_ = _tmp34_->entry; #line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_expand_to_entry (self, _tmp41_); + sidebar_tree_expand_to_entry (self, _tmp35_); #line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp42_ = new_wrapper; + _tmp36_ = new_wrapper; #line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp43_ = _tmp42_->entry; + _tmp37_ = _tmp36_->entry; #line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_place_cursor (self, _tmp43_, FALSE); -#line 4473 "Tree.c" + sidebar_tree_place_cursor (self, _tmp37_, FALSE); +#line 4619 "Tree.c" } #line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (new_wrapper); @@ -4483,16 +4629,18 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB _g_object_unref0 (parent); #line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 4487 "Tree.c" +#line 4633 "Tree.c" } -static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry) { +static void +sidebar_tree_on_branch_children_reordered (SidebarTree* self, + SidebarBranch* branch, + SidebarEntry* entry) +{ GeeList* children = NULL; - SidebarBranch* _tmp0_; - SidebarEntry* _tmp1_; - GeeList* _tmp2_; - GeeList* _tmp3_; + GeeList* _tmp0_; + GeeList* _tmp1_; #line 706 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 706 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -4500,263 +4648,240 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba #line 706 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); #line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = branch; -#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = entry; + _tmp0_ = sidebar_branch_get_children (branch, entry); #line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = sidebar_branch_get_children (_tmp0_, _tmp1_); -#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - children = _tmp2_; + children = _tmp0_; #line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = children; + _tmp1_ = children; #line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp3_ == NULL) { + if (_tmp1_ == NULL) { #line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (children); #line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 4519 "Tree.c" +#line 4663 "Tree.c" } { GeeList* _child_list = NULL; - GeeList* _tmp4_; - GeeList* _tmp5_; + GeeList* _tmp2_; + GeeList* _tmp3_; gint _child_size = 0; - GeeList* _tmp6_; - gint _tmp7_; - gint _tmp8_; + GeeList* _tmp4_; + gint _tmp5_; + gint _tmp6_; gint _child_index = 0; #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = children; + _tmp2_ = children; #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp3_ = _g_object_ref0 (_tmp2_); #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _child_list = _tmp5_; + _child_list = _tmp3_; #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = _child_list; + _tmp4_ = _child_list; #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _child_size = _tmp8_; + _child_size = _tmp6_; #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _child_index = -1; #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" while (TRUE) { -#line 4548 "Tree.c" +#line 4692 "Tree.c" + gint _tmp7_; + gint _tmp8_; gint _tmp9_; - gint _tmp10_; - gint _tmp11_; SidebarEntry* child = NULL; - GeeList* _tmp12_; - gint _tmp13_; - gpointer _tmp14_; + GeeList* _tmp10_; + gint _tmp11_; + gpointer _tmp12_; SidebarTreeEntryWrapper* child_wrapper = NULL; - SidebarEntry* _tmp15_; - SidebarTreeEntryWrapper* _tmp16_; - SidebarTreeEntryWrapper* _tmp17_; + SidebarEntry* _tmp13_; + SidebarTreeEntryWrapper* _tmp14_; + SidebarTreeEntryWrapper* _tmp15_; GtkTreeIter child_iter = {0}; - SidebarTreeEntryWrapper* _tmp18_; - GtkTreeIter _tmp19_ = {0}; - GtkTreeStore* _tmp20_; + SidebarTreeEntryWrapper* _tmp16_; + GtkTreeIter _tmp17_ = {0}; + GtkTreeStore* _tmp18_; #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = _child_index; + _tmp7_ = _child_index; #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _child_index = _tmp9_ + 1; + _child_index = _tmp7_ + 1; #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = _child_index; + _tmp8_ = _child_index; #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = _child_size; + _tmp9_ = _child_size; #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (!(_tmp10_ < _tmp11_)) { + if (!(_tmp8_ < _tmp9_)) { #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" break; -#line 4576 "Tree.c" +#line 4720 "Tree.c" } #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = _child_list; + _tmp10_ = _child_list; #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = _child_index; + _tmp11_ = _child_index; #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = gee_list_get (_tmp12_, _tmp13_); + _tmp12_ = gee_list_get (_tmp10_, _tmp11_); #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - child = (SidebarEntry*) _tmp14_; + child = (SidebarEntry*) _tmp12_; #line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp15_ = child; + _tmp13_ = child; #line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = sidebar_tree_get_wrapper (self, _tmp15_); + _tmp14_ = sidebar_tree_get_wrapper (self, _tmp13_); #line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - child_wrapper = _tmp16_; + child_wrapper = _tmp14_; #line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp17_ = child_wrapper; + _tmp15_ = child_wrapper; #line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (_tmp17_ != NULL, "child_wrapper != null"); + _vala_assert (_tmp15_ != NULL, "child_wrapper != null"); #line 717 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp18_ = child_wrapper; + _tmp16_ = child_wrapper; #line 717 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_entry_wrapper_get_iter (_tmp18_, &_tmp19_); + sidebar_tree_entry_wrapper_get_iter (_tmp16_, &_tmp17_); #line 717 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - child_iter = _tmp19_; + child_iter = _tmp17_; #line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp20_ = self->priv->store; + _tmp18_ = self->priv->store; #line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_move_before (_tmp20_, &child_iter, NULL); + gtk_tree_store_move_before (_tmp18_, &child_iter, NULL); #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (child_wrapper); #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (child); -#line 4610 "Tree.c" +#line 4754 "Tree.c" } #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (_child_list); -#line 4614 "Tree.c" +#line 4758 "Tree.c" } #line 706 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (children); -#line 4618 "Tree.c" +#line 4762 "Tree.c" } -static void sidebar_tree_on_show_branch (SidebarTree* self, SidebarBranch* branch, gboolean shown) { - gboolean _tmp0_; - SidebarBranch* _tmp3_; - gboolean _tmp4_; +static void +sidebar_tree_on_show_branch (SidebarTree* self, + SidebarBranch* branch, + gboolean shown) +{ #line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (branch)); #line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = shown; -#line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp0_) { -#line 4634 "Tree.c" - SidebarBranch* _tmp1_; + if (shown) { #line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = branch; -#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_associate_branch (self, _tmp1_); -#line 4640 "Tree.c" + sidebar_tree_associate_branch (self, branch); +#line 4779 "Tree.c" } else { - SidebarBranch* _tmp2_; -#line 726 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = branch; #line 726 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_disassociate_branch (self, _tmp2_); -#line 4647 "Tree.c" + sidebar_tree_disassociate_branch (self, branch); +#line 4783 "Tree.c" } #line 728 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = branch; -#line 728 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = shown; -#line 728 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_SHOWN_SIGNAL], 0, _tmp3_, _tmp4_); -#line 4655 "Tree.c" + g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_SHOWN_SIGNAL], 0, branch, shown); +#line 4787 "Tree.c" } -static void sidebar_tree_on_sidebar_tooltip_changed (SidebarTree* self, SidebarEntry* entry, const gchar* tooltip) { +static void +sidebar_tree_on_sidebar_tooltip_changed (SidebarTree* self, + SidebarEntry* entry, + const gchar* tooltip) +{ SidebarTreeEntryWrapper* wrapper = NULL; - SidebarEntry* _tmp0_; - SidebarTreeEntryWrapper* _tmp1_; - GtkTreeStore* _tmp2_; - GtkTreeIter _tmp3_ = {0}; - const gchar* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; + SidebarTreeEntryWrapper* _tmp0_; + GtkTreeStore* _tmp1_; + GtkTreeIter _tmp2_ = {0}; + gchar* _tmp3_; + gchar* _tmp4_; #line 731 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 731 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); #line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = entry; -#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_); + _tmp0_ = sidebar_tree_get_wrapper (self, entry); #line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - wrapper = _tmp1_; + wrapper = _tmp0_; #line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (wrapper != NULL, "wrapper != null"); #line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = self->priv->store; -#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp3_); + _tmp1_ = self->priv->store; #line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = tooltip; + sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp2_); #line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = guarded_markup_escape_text (_tmp4_); + _tmp3_ = guarded_markup_escape_text (tooltip); #line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp6_, -1); + gtk_tree_store_set (_tmp1_, &_tmp2_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp4_, -1); #line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp4_); #line 731 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 4696 "Tree.c" +#line 4826 "Tree.c" } -static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntry* entry, const gchar* icon_name) { +static void +sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, + SidebarEntry* entry, + const gchar* icon_name) +{ SidebarTreeEntryWrapper* wrapper = NULL; - SidebarEntry* _tmp0_; + SidebarTreeEntryWrapper* _tmp0_; SidebarTreeEntryWrapper* _tmp1_; - SidebarTreeEntryWrapper* _tmp2_; GIcon* icon = NULL; - GtkTreeStore* _tmp8_; - SidebarTreeEntryWrapper* _tmp9_; - GtkTreeIter _tmp10_ = {0}; - GIcon* _tmp11_; + GtkTreeStore* _tmp5_; + SidebarTreeEntryWrapper* _tmp6_; + GtkTreeIter _tmp7_ = {0}; + GIcon* _tmp8_; GError * _inner_error_ = NULL; #line 738 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 738 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); #line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = entry; + _tmp0_ = sidebar_tree_get_wrapper (self, entry); #line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_); -#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - wrapper = _tmp1_; + wrapper = _tmp0_; #line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = wrapper; + _tmp1_ = wrapper; #line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (_tmp2_ != NULL, "wrapper != null"); + _vala_assert (_tmp1_ != NULL, "wrapper != null"); #line 741 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" icon = NULL; -#line 4727 "Tree.c" +#line 4858 "Tree.c" { - const gchar* _tmp3_; -#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = icon_name; #line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp3_ != NULL) { -#line 4734 "Tree.c" - GIcon* _tmp4_ = NULL; - const gchar* _tmp5_; - GIcon* _tmp6_; - GIcon* _tmp7_; + if (icon_name != NULL) { +#line 4862 "Tree.c" + GIcon* _tmp2_ = NULL; + GIcon* _tmp3_; + GIcon* _tmp4_; #line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = icon_name; + _tmp3_ = g_icon_new_for_string (icon_name, &_inner_error_); #line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = g_icon_new_for_string (_tmp5_, &_inner_error_); -#line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = _tmp6_; + _tmp2_ = _tmp3_; #line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4747 "Tree.c" +#line 4872 "Tree.c" goto __catch56_g_error; } #line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = _tmp4_; + _tmp4_ = _tmp2_; #line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = NULL; + _tmp2_ = NULL; #line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (icon); #line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - icon = _tmp7_; + icon = _tmp4_; #line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_object_unref0 (_tmp4_); -#line 4760 "Tree.c" + _g_object_unref0 (_tmp2_); +#line 4885 "Tree.c" } } goto __finally56; @@ -4769,7 +4894,7 @@ static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntr _inner_error_ = NULL; #line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_error_free0 (e); -#line 4773 "Tree.c" +#line 4898 "Tree.c" } __finally56: #line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -4784,69 +4909,69 @@ static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntr g_clear_error (&_inner_error_); #line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 4788 "Tree.c" +#line 4913 "Tree.c" } #line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = self->priv->store; + _tmp5_ = self->priv->store; #line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = wrapper; + _tmp6_ = wrapper; #line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_entry_wrapper_get_iter (_tmp9_, &_tmp10_); + sidebar_tree_entry_wrapper_get_iter (_tmp6_, &_tmp7_); #line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = icon; + _tmp8_ = icon; #line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_set (_tmp8_, &_tmp10_, SIDEBAR_TREE_COLUMNS_ICON, _tmp11_, -1); + gtk_tree_store_set (_tmp5_, &_tmp7_, SIDEBAR_TREE_COLUMNS_ICON, _tmp8_, -1); #line 738 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (icon); #line 738 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 4804 "Tree.c" +#line 4929 "Tree.c" } -static void sidebar_tree_rename_entry (SidebarTree* self, SidebarEntry* entry) { +static void +sidebar_tree_rename_entry (SidebarTree* self, + SidebarEntry* entry) +{ SidebarTreeEntryWrapper* wrapper = NULL; - SidebarEntry* _tmp0_; - SidebarTreeEntryWrapper* _tmp1_; - GtkTreeStore* _tmp2_; - GtkTreeIter _tmp3_ = {0}; - SidebarEntry* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; + SidebarTreeEntryWrapper* _tmp0_; + GtkTreeStore* _tmp1_; + GtkTreeIter _tmp2_ = {0}; + gchar* _tmp3_; + gchar* _tmp4_; #line 752 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 752 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); #line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = entry; + _tmp0_ = sidebar_tree_get_wrapper (self, entry); #line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_); -#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - wrapper = _tmp1_; + wrapper = _tmp0_; #line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (wrapper != NULL, "wrapper != null"); #line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = self->priv->store; -#line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp3_); + _tmp1_ = self->priv->store; #line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = entry; + sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp2_); #line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = sidebar_tree_get_name_for_entry (self, _tmp4_); + _tmp3_ = sidebar_tree_get_name_for_entry (self, entry); #line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_NAME, _tmp6_, -1); + gtk_tree_store_set (_tmp1_, &_tmp2_, SIDEBAR_TREE_COLUMNS_NAME, _tmp4_, -1); #line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp4_); #line 752 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 4845 "Tree.c" +#line 4967 "Tree.c" } -static void sidebar_tree_on_sidebar_name_changed (SidebarTree* self, SidebarEntry* entry, const gchar* name) { - SidebarEntry* _tmp0_; +static void +sidebar_tree_on_sidebar_name_changed (SidebarTree* self, + SidebarEntry* entry, + const gchar* name) +{ #line 759 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 759 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -4854,16 +4979,16 @@ static void sidebar_tree_on_sidebar_name_changed (SidebarTree* self, SidebarEntr #line 759 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (name != NULL); #line 760 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = entry; -#line 760 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_rename_entry (self, _tmp0_); -#line 4861 "Tree.c" + sidebar_tree_rename_entry (self, entry); +#line 4984 "Tree.c" } -static void sidebar_tree_on_sidebar_page_created (SidebarTree* self, SidebarPageRepresentative* entry, Page* page) { - SidebarPageRepresentative* _tmp0_; - Page* _tmp1_; +static void +sidebar_tree_on_sidebar_page_created (SidebarTree* self, + SidebarPageRepresentative* entry, + Page* page) +{ #line 763 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 763 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -4871,32 +4996,31 @@ static void sidebar_tree_on_sidebar_page_created (SidebarTree* self, SidebarPage #line 763 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (IS_PAGE (page)); #line 764 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = entry; -#line 764 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = page; -#line 764 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_PAGE_CREATED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 4880 "Tree.c" + g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_PAGE_CREATED_SIGNAL], 0, entry, page); +#line 5001 "Tree.c" } -static void sidebar_tree_on_is_emphasized_changed (SidebarTree* self, SidebarEmphasizableEntry* entry, gboolean is_emphasized) { - SidebarEmphasizableEntry* _tmp0_; +static void +sidebar_tree_on_is_emphasized_changed (SidebarTree* self, + SidebarEmphasizableEntry* entry, + gboolean is_emphasized) +{ #line 767 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 767 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_EMPHASIZABLE_ENTRY (entry)); #line 768 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = entry; -#line 768 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_rename_entry (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 4894 "Tree.c" + sidebar_tree_rename_entry (self, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry)); +#line 5016 "Tree.c" } -static void sidebar_tree_on_sidebar_destroying_page (SidebarTree* self, SidebarPageRepresentative* entry, Page* page) { - SidebarPageRepresentative* _tmp0_; - Page* _tmp1_; +static void +sidebar_tree_on_sidebar_destroying_page (SidebarTree* self, + SidebarPageRepresentative* entry, + Page* page) +{ #line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -4904,16 +5028,15 @@ static void sidebar_tree_on_sidebar_destroying_page (SidebarTree* self, SidebarP #line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (IS_PAGE (page)); #line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = entry; -#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = page; -#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_DESTROYING_PAGE_SIGNAL], 0, _tmp0_, _tmp1_); -#line 4913 "Tree.c" + g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_DESTROYING_PAGE_SIGNAL], 0, entry, page); +#line 5033 "Tree.c" } -static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter) { +static void +sidebar_tree_load_entry_icons (SidebarTree* self, + GtkTreeIter* iter) +{ SidebarTreeEntryWrapper* wrapper = NULL; GtkTreeIter _tmp0_; SidebarTreeEntryWrapper* _tmp1_; @@ -4945,7 +5068,7 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter) _g_object_unref0 (wrapper); #line 779 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 4949 "Tree.c" +#line 5072 "Tree.c" } { gchar* name = NULL; @@ -4965,7 +5088,7 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter) _tmp6_ = name; #line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp6_ != NULL) { -#line 4969 "Tree.c" +#line 5092 "Tree.c" GIcon* _tmp7_ = NULL; const gchar* _tmp8_; GIcon* _tmp9_; @@ -4980,7 +5103,7 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter) if (G_UNLIKELY (_inner_error_ != NULL)) { #line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (name); -#line 4984 "Tree.c" +#line 5107 "Tree.c" goto __catch57_g_error; } #line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -4993,11 +5116,11 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter) icon = _tmp10_; #line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (_tmp7_); -#line 4997 "Tree.c" +#line 5120 "Tree.c" } #line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (name); -#line 5001 "Tree.c" +#line 5124 "Tree.c" } goto __finally57; __catch57_g_error: @@ -5009,7 +5132,7 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter) _inner_error_ = NULL; #line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_error_free0 (e); -#line 5013 "Tree.c" +#line 5136 "Tree.c" } __finally57: #line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -5024,7 +5147,7 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter) g_clear_error (&_inner_error_); #line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 5028 "Tree.c" +#line 5151 "Tree.c" } #line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = self->priv->store; @@ -5038,11 +5161,14 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter) _g_object_unref0 (icon); #line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 5042 "Tree.c" +#line 5165 "Tree.c" } -static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter) { +static void +sidebar_tree_load_branch_icons (SidebarTree* self, + GtkTreeIter* iter) +{ GtkTreeIter _tmp0_; GtkTreeIter child_iter = {0}; GtkTreeStore* _tmp1_; @@ -5062,34 +5188,34 @@ static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter #line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = *iter; #line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = gtk_tree_model_iter_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp3_, &_tmp2_); + _tmp4_ = gtk_tree_model_iter_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp3_, &_tmp2_); #line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" child_iter = _tmp3_; #line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp4_) { -#line 5071 "Tree.c" +#line 5197 "Tree.c" { gboolean _tmp5_ = FALSE; #line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = TRUE; #line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" while (TRUE) { -#line 5078 "Tree.c" +#line 5204 "Tree.c" GtkTreeIter _tmp8_; #line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (!_tmp5_) { -#line 5082 "Tree.c" +#line 5208 "Tree.c" GtkTreeStore* _tmp6_; gboolean _tmp7_; #line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = self->priv->store; #line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &child_iter); + _tmp7_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tree_model_get_type (), GtkTreeModel), &child_iter); #line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (!_tmp7_) { #line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" break; -#line 5093 "Tree.c" +#line 5219 "Tree.c" } } #line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -5098,20 +5224,25 @@ static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter _tmp8_ = child_iter; #line 798 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_load_branch_icons (self, &_tmp8_); -#line 5102 "Tree.c" +#line 5228 "Tree.c" } } } } -static gboolean sidebar_tree_on_selection (SidebarTree* self, GtkTreeSelection* selection, GtkTreeModel* model, GtkTreePath* path, gboolean path_currently_selected) { +static gboolean +sidebar_tree_on_selection (SidebarTree* self, + GtkTreeSelection* selection, + GtkTreeModel* model, + GtkTreePath* path, + gboolean path_currently_selected) +{ gboolean result = FALSE; SidebarTreeEntryWrapper* wrapper = NULL; - GtkTreePath* _tmp0_; - SidebarTreeEntryWrapper* _tmp1_; - gboolean _tmp2_ = FALSE; - SidebarTreeEntryWrapper* _tmp3_; + SidebarTreeEntryWrapper* _tmp0_; + gboolean _tmp1_ = FALSE; + SidebarTreeEntryWrapper* _tmp2_; #line 803 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); #line 803 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -5121,127 +5252,127 @@ static gboolean sidebar_tree_on_selection (SidebarTree* self, GtkTreeSelection* #line 803 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (path != NULL, FALSE); #line 806 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = path; + _tmp0_ = sidebar_tree_get_wrapper_at_path (self, path); #line 806 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_); -#line 806 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - wrapper = _tmp1_; + wrapper = _tmp0_; #line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = wrapper; + _tmp2_ = wrapper; #line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp3_ != NULL) { -#line 5134 "Tree.c" - SidebarTreeEntryWrapper* _tmp4_; - SidebarEntry* _tmp5_; + if (_tmp2_ != NULL) { +#line 5263 "Tree.c" + SidebarTreeEntryWrapper* _tmp3_; + SidebarEntry* _tmp4_; #line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = wrapper; + _tmp3_ = wrapper; #line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = _tmp4_->entry; + _tmp4_ = _tmp3_->entry; #line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_SELECTABLE_ENTRY); -#line 5143 "Tree.c" + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, SIDEBAR_TYPE_SELECTABLE_ENTRY); +#line 5272 "Tree.c" } else { #line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = FALSE; -#line 5147 "Tree.c" + _tmp1_ = FALSE; +#line 5276 "Tree.c" } #line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - result = _tmp2_; + result = _tmp1_; #line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5155 "Tree.c" +#line 5284 "Tree.c" } -static GtkTreePath* sidebar_tree_get_path_from_event (SidebarTree* self, GdkEventButton* event) { +static GtkTreePath* +sidebar_tree_get_path_from_event (SidebarTree* self, + GdkEventButton* event) +{ GtkTreePath* result = NULL; gint x = 0; gint y = 0; GdkModifierType mask = 0; - GdkEventButton* _tmp0_; - GdkWindow* _tmp1_; - GdkDisplay* _tmp2_; - GdkDeviceManager* _tmp3_; - GdkDevice* _tmp4_; + GdkWindow* _tmp0_; + GdkDisplay* _tmp1_; + GdkDeviceManager* _tmp2_; + GdkDevice* _tmp3_; + gint _tmp4_ = 0; gint _tmp5_ = 0; - gint _tmp6_ = 0; - GdkModifierType _tmp7_ = 0; + GdkModifierType _tmp6_ = 0; gint cell_x = 0; gint cell_y = 0; GtkTreePath* path = NULL; - GtkTreePath* _tmp8_ = NULL; + GtkTreePath* _tmp7_ = NULL; + gint _tmp8_; gint _tmp9_; - gint _tmp10_; - GtkTreePath* _tmp11_ = NULL; + GtkTreePath* _tmp10_ = NULL; + gint _tmp11_ = 0; gint _tmp12_ = 0; - gint _tmp13_ = 0; - gboolean _tmp14_; - GtkTreePath* _tmp16_; + gboolean _tmp13_; + GtkTreePath* _tmp15_; #line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL); #line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (event != NULL, NULL); #line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = event; -#line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = _tmp0_->window; + _tmp0_ = event->window; #line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = gdk_display_get_default (); + _tmp1_ = gdk_display_get_default (); #line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = gdk_display_get_device_manager (_tmp2_); + _tmp2_ = gdk_display_get_device_manager (_tmp1_); #line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = gdk_device_manager_get_client_pointer (_tmp3_); + _tmp3_ = gdk_device_manager_get_client_pointer (_tmp2_); #line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gdk_window_get_device_position (_tmp1_, _tmp4_, &_tmp5_, &_tmp6_, &_tmp7_); + gdk_window_get_device_position (_tmp0_, _tmp3_, &_tmp4_, &_tmp5_, &_tmp6_); #line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - x = _tmp5_; + x = _tmp4_; #line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - y = _tmp6_; + y = _tmp5_; #line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - mask = _tmp7_; + mask = _tmp6_; #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = x; + _tmp8_ = x; #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = y; + _tmp9_ = y; #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = gtk_tree_view_get_path_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp9_, _tmp10_, &_tmp11_, NULL, &_tmp12_, &_tmp13_); + _tmp13_ = gtk_tree_view_get_path_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp8_, _tmp9_, &_tmp10_, NULL, &_tmp11_, &_tmp12_); #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - path = _tmp11_; + path = _tmp10_; #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - cell_x = _tmp12_; + cell_x = _tmp11_; #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - cell_y = _tmp13_; + cell_y = _tmp12_; #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp14_) { -#line 5221 "Tree.c" - GtkTreePath* _tmp15_; + if (_tmp13_) { +#line 5350 "Tree.c" + GtkTreePath* _tmp14_; #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp15_ = path; + _tmp14_ = path; #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = _tmp15_; -#line 5227 "Tree.c" + _tmp7_ = _tmp14_; +#line 5356 "Tree.c" } else { #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = NULL; -#line 5231 "Tree.c" + _tmp7_ = NULL; +#line 5360 "Tree.c" } #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = _gtk_tree_path_copy0 (_tmp8_); + _tmp15_ = __vala_GtkTreePath_copy0 (_tmp7_); #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - result = _tmp16_; + result = _tmp15_; #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5241 "Tree.c" +#line 5370 "Tree.c" } -static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self) { +static GtkTreePath* +sidebar_tree_get_current_path (SidebarTree* self) +{ GtkTreePath* result = NULL; GtkTreeModel* model = NULL; GList* rows = NULL; @@ -5251,11 +5382,9 @@ static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self) { GtkTreeModel* _tmp3_; gboolean _tmp4_ = FALSE; GList* _tmp5_; - guint _tmp6_; - GtkTreePath* _tmp9_ = NULL; - GList* _tmp10_; - guint _tmp11_; - GtkTreePath* _tmp14_; + GtkTreePath* _tmp7_ = NULL; + GList* _tmp8_; + GtkTreePath* _tmp11_; #line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL); #line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -5273,61 +5402,56 @@ static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self) { #line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = rows; #line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = g_list_length (_tmp5_); -#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp6_ == ((guint) 0)) { + if (g_list_length (_tmp5_) == ((guint) 0)) { #line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = TRUE; -#line 5282 "Tree.c" +#line 5409 "Tree.c" } else { - GList* _tmp7_; - guint _tmp8_; -#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = rows; + GList* _tmp6_; #line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = g_list_length (_tmp7_); + _tmp6_ = rows; #line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = _tmp8_ == ((guint) 1); -#line 5292 "Tree.c" + _tmp4_ = g_list_length (_tmp6_) == ((guint) 1); +#line 5416 "Tree.c" } #line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (_tmp4_, "rows.length() == 0 || rows.length() == 1"); #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = rows; -#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = g_list_length (_tmp10_); + _tmp8_ = rows; #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp11_ != ((guint) 0)) { -#line 5302 "Tree.c" - GList* _tmp12_; - gconstpointer _tmp13_; + if (g_list_length (_tmp8_) != ((guint) 0)) { +#line 5424 "Tree.c" + GList* _tmp9_; + gconstpointer _tmp10_; #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = rows; + _tmp9_ = rows; #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = g_list_nth_data (_tmp12_, (guint) 0); + _tmp10_ = g_list_nth_data (_tmp9_, (guint) 0); #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = (GtkTreePath*) _tmp13_; -#line 5311 "Tree.c" + _tmp7_ = (GtkTreePath*) _tmp10_; +#line 5433 "Tree.c" } else { #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = NULL; -#line 5315 "Tree.c" + _tmp7_ = NULL; +#line 5437 "Tree.c" } #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = _gtk_tree_path_copy0 (_tmp9_); + _tmp11_ = __vala_GtkTreePath_copy0 (_tmp7_); #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - result = _tmp14_; + result = _tmp11_; #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - __g_list_free__gtk_tree_path_free0_0 (rows); + __g_list_free___vala_GtkTreePath_free0_0 (rows); #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (model); #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5327 "Tree.c" +#line 5449 "Tree.c" } -static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) { +static gboolean +sidebar_tree_on_context_menu_keypress (SidebarTree* self) +{ gboolean result = FALSE; GList* rows = NULL; GtkTreeSelection* _tmp0_; @@ -5340,7 +5464,6 @@ static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) { GtkTreePath* _tmp6_; GtkTreePath* _tmp7_; GtkTreePath* _tmp8_; - gboolean _tmp9_; #line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); #line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -5356,17 +5479,17 @@ static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) { #line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - __g_list_free__gtk_tree_path_free0_0 (rows); + __g_list_free___vala_GtkTreePath_free0_0 (rows); #line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5363 "Tree.c" +#line 5486 "Tree.c" } #line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = rows; #line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = _tmp3_->data; #line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = _gtk_tree_path_copy0 ((GtkTreePath*) _tmp4_); + _tmp5_ = __vala_GtkTreePath_copy0 ((GtkTreePath*) _tmp4_); #line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" path = _tmp5_; #line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -5376,12 +5499,12 @@ static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) { #line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - __g_list_free__gtk_tree_path_free0_0 (rows); + __g_list_free___vala_GtkTreePath_free0_0 (rows); #line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5385 "Tree.c" +#line 5508 "Tree.c" } #line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = path; @@ -5390,77 +5513,74 @@ static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) { #line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = path; #line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = sidebar_tree_popup_context_menu (self, _tmp8_, NULL); -#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - result = _tmp9_; + result = sidebar_tree_popup_context_menu (self, _tmp8_, NULL); #line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - __g_list_free__gtk_tree_path_free0_0 (rows); + __g_list_free___vala_GtkTreePath_free0_0 (rows); #line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5403 "Tree.c" +#line 5524 "Tree.c" } -static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath* path, GdkEventButton* event) { +static gboolean +sidebar_tree_popup_context_menu (SidebarTree* self, + GtkTreePath* path, + GdkEventButton* event) +{ gboolean result = FALSE; SidebarTreeEntryWrapper* wrapper = NULL; - GtkTreePath* _tmp0_; + SidebarTreeEntryWrapper* _tmp0_; SidebarTreeEntryWrapper* _tmp1_; - SidebarTreeEntryWrapper* _tmp2_; SidebarContextable* contextable = NULL; - SidebarTreeEntryWrapper* _tmp3_; - SidebarEntry* _tmp4_; + SidebarTreeEntryWrapper* _tmp2_; + SidebarEntry* _tmp3_; + SidebarContextable* _tmp4_; SidebarContextable* _tmp5_; - SidebarContextable* _tmp6_; SidebarSelectableEntry* selectable = NULL; - SidebarTreeEntryWrapper* _tmp7_; - SidebarEntry* _tmp8_; + SidebarTreeEntryWrapper* _tmp6_; + SidebarEntry* _tmp7_; + SidebarSelectableEntry* _tmp8_; SidebarSelectableEntry* _tmp9_; - SidebarSelectableEntry* _tmp10_; GtkMenu* context_menu = NULL; - SidebarContextable* _tmp12_; - GdkEventButton* _tmp13_; + SidebarContextable* _tmp11_; + GtkMenu* _tmp12_; + GtkMenu* _tmp13_; GtkMenu* _tmp14_; - GtkMenu* _tmp15_; - GtkMenu* _tmp16_; - GtkWidget* _tmp17_; - GdkEventButton* _tmp19_; + GtkWidget* _tmp15_; #line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); #line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (path != NULL, FALSE); #line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = path; -#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_); + _tmp0_ = sidebar_tree_get_wrapper_at_path (self, path); #line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - wrapper = _tmp1_; + wrapper = _tmp0_; #line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = wrapper; + _tmp1_ = wrapper; #line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5451 "Tree.c" +#line 5571 "Tree.c" } #line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = wrapper; + _tmp2_ = wrapper; #line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = _tmp3_->entry; + _tmp3_ = _tmp2_->entry; #line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, SIDEBAR_TYPE_CONTEXTABLE) ? ((SidebarContextable*) _tmp4_) : NULL); + _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TYPE_CONTEXTABLE) ? ((SidebarContextable*) _tmp3_) : NULL); #line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - contextable = _tmp5_; + contextable = _tmp4_; #line 850 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = contextable; + _tmp5_ = contextable; #line 850 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp6_ == NULL) { + if (_tmp5_ == NULL) { #line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -5469,40 +5589,38 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath* _g_object_unref0 (wrapper); #line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5473 "Tree.c" +#line 5593 "Tree.c" } #line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = wrapper; + _tmp6_ = wrapper; #line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = _tmp7_->entry; + _tmp7_ = _tmp6_->entry; #line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp8_) : NULL); + _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp7_) : NULL); #line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - selectable = _tmp9_; + selectable = _tmp8_; #line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = selectable; + _tmp9_ = selectable; #line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp10_ != NULL) { -#line 5487 "Tree.c" - SidebarSelectableEntry* _tmp11_; + if (_tmp9_ != NULL) { +#line 5607 "Tree.c" + SidebarSelectableEntry* _tmp10_; #line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = selectable; + _tmp10_ = selectable; #line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL], 0, _tmp11_); -#line 5493 "Tree.c" + g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL], 0, _tmp10_); +#line 5613 "Tree.c" } #line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = contextable; + _tmp11_ = contextable; #line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = event; + _tmp12_ = sidebar_contextable_get_sidebar_context_menu (_tmp11_, event); #line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = sidebar_contextable_get_sidebar_context_menu (_tmp12_, _tmp13_); -#line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - context_menu = _tmp14_; + context_menu = _tmp12_; #line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp15_ = context_menu; + _tmp13_ = context_menu; #line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp15_ == NULL) { + if (_tmp13_ == NULL) { #line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -5515,55 +5633,44 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath* _g_object_unref0 (wrapper); #line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5519 "Tree.c" +#line 5637 "Tree.c" } #line 862 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = context_menu; + _tmp14_ = context_menu; #line 862 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp17_ = gtk_menu_get_attach_widget (_tmp16_); + _tmp15_ = gtk_menu_get_attach_widget (_tmp14_); #line 862 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp17_ == NULL) { -#line 5527 "Tree.c" - GtkMenu* _tmp18_; + if (_tmp15_ == NULL) { +#line 5645 "Tree.c" + GtkMenu* _tmp16_; #line 863 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp18_ = context_menu; + _tmp16_ = context_menu; #line 863 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_menu_attach_to_widget (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL); -#line 5533 "Tree.c" + gtk_menu_attach_to_widget (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL); +#line 5651 "Tree.c" } #line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp19_ = event; -#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp19_ != NULL) { -#line 5539 "Tree.c" - GtkMenu* _tmp20_; - GdkEventButton* _tmp21_; - guint _tmp22_; - GdkEventButton* _tmp23_; - guint32 _tmp24_; -#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp20_ = context_menu; -#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp21_ = event; + if (event != NULL) { +#line 5655 "Tree.c" + GtkMenu* _tmp17_; + guint _tmp18_; + guint32 _tmp19_; #line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp22_ = _tmp21_->button; + _tmp17_ = context_menu; #line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp23_ = event; + _tmp18_ = event->button; #line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp24_ = _tmp23_->time; + _tmp19_ = event->time; #line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_menu_popup (_tmp20_, NULL, NULL, NULL, NULL, _tmp22_, _tmp24_); -#line 5557 "Tree.c" + gtk_menu_popup (_tmp17_, NULL, NULL, NULL, NULL, _tmp18_, _tmp19_); +#line 5667 "Tree.c" } else { - GtkMenu* _tmp25_; - guint32 _tmp26_; -#line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp25_ = context_menu; + GtkMenu* _tmp20_; #line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp26_ = gtk_get_current_event_time (); + _tmp20_ = context_menu; #line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_menu_popup (_tmp25_, NULL, NULL, NULL, NULL, (guint) 0, _tmp26_); -#line 5567 "Tree.c" + gtk_menu_popup (_tmp20_, NULL, NULL, NULL, NULL, (guint) 0, gtk_get_current_event_time ()); +#line 5674 "Tree.c" } #line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; @@ -5577,17 +5684,18 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath* _g_object_unref0 (wrapper); #line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5581 "Tree.c" +#line 5688 "Tree.c" } -static gboolean sidebar_tree_popup_default_context_menu (SidebarTree* self, GdkEventButton* event) { +static gboolean +sidebar_tree_popup_default_context_menu (SidebarTree* self, + GdkEventButton* event) +{ gboolean result = FALSE; GtkMenu* _tmp0_; - GdkEventButton* _tmp1_; - guint _tmp2_; - GdkEventButton* _tmp3_; - guint32 _tmp4_; + guint _tmp1_; + guint32 _tmp2_; #line 874 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); #line 874 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -5595,24 +5703,24 @@ static gboolean sidebar_tree_popup_default_context_menu (SidebarTree* self, GdkE #line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->default_context_menu; #line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = event; -#line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = _tmp1_->button; + _tmp1_ = event->button; #line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = event; + _tmp2_ = event->time; #line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = _tmp3_->time; -#line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, _tmp2_, _tmp4_); + gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, _tmp1_, _tmp2_); #line 876 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; #line 876 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5612 "Tree.c" +#line 5716 "Tree.c" } -gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTreePath* path) { +gboolean +sidebar_tree_on_toggle_row (SidebarTree* self, + GtkTreeIter* iter, + GtkTreePath* path) +{ gboolean result = FALSE; SidebarTreeEntryWrapper* wrapper = NULL; GtkTreeIter _tmp0_; @@ -5622,9 +5730,7 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr gboolean _tmp3_; gboolean _tmp4_ = FALSE; gboolean _tmp5_ = FALSE; - GtkTreePath* _tmp6_; - gboolean _tmp7_; - gboolean _tmp16_; + gboolean _tmp13_; #line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); #line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -5647,7 +5753,7 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr _g_object_unref0 (wrapper); #line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5651 "Tree.c" +#line 5757 "Tree.c" } #line 887 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = self->priv->expander_called_manually; @@ -5656,90 +5762,83 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr #line 890 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->expander_called_manually = FALSE; #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = path; -#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = gtk_tree_view_row_expanded (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp6_); -#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp7_) { -#line 5665 "Tree.c" - GtkTreeStore* _tmp8_; - GtkTreeIter _tmp9_; - gboolean _tmp10_; -#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = self->priv->store; + if (gtk_tree_view_row_expanded (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), path)) { +#line 5767 "Tree.c" + GtkTreeStore* _tmp6_; + GtkTreeIter _tmp7_; #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = *iter; + _tmp6_ = self->priv->store; #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = gtk_tree_model_iter_has_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp9_); + _tmp7_ = *iter; #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = _tmp10_; -#line 5677 "Tree.c" + _tmp5_ = gtk_tree_model_iter_has_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp7_); +#line 5776 "Tree.c" } else { #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = FALSE; -#line 5681 "Tree.c" +#line 5780 "Tree.c" } #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp5_) { -#line 5685 "Tree.c" - SidebarTreeEntryWrapper* _tmp11_; - SidebarEntry* _tmp12_; +#line 5784 "Tree.c" + SidebarTreeEntryWrapper* _tmp8_; + SidebarEntry* _tmp9_; #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = wrapper; + _tmp8_ = wrapper; #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = _tmp11_->entry; + _tmp9_ = _tmp8_->entry; #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, SIDEBAR_TYPE_SELECTABLE_ENTRY); -#line 5694 "Tree.c" + _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, SIDEBAR_TYPE_SELECTABLE_ENTRY); +#line 5793 "Tree.c" } else { #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = FALSE; -#line 5698 "Tree.c" +#line 5797 "Tree.c" } #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp4_) { -#line 5702 "Tree.c" - gint _tmp13_; - gint _tmp14_; +#line 5801 "Tree.c" + gint _tmp10_; + gint _tmp11_; #line 895 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = self->priv->expander_special_count; + _tmp10_ = self->priv->expander_special_count; #line 895 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - self->priv->expander_special_count = _tmp13_ + 1; + self->priv->expander_special_count = _tmp10_ + 1; #line 896 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = self->priv->expander_special_count; + _tmp11_ = self->priv->expander_special_count; #line 896 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp14_ == 1) { + if (_tmp11_ == 1) { #line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; #line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5719 "Tree.c" +#line 5818 "Tree.c" } else { - gboolean _tmp15_; + gboolean _tmp12_; #line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp15_ = should_allow_toggle; + _tmp12_ = should_allow_toggle; #line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - should_allow_toggle = !_tmp15_; -#line 5726 "Tree.c" + should_allow_toggle = !_tmp12_; +#line 5825 "Tree.c" } } else { #line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->expander_special_count = 0; -#line 5731 "Tree.c" +#line 5830 "Tree.c" } #line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = should_allow_toggle; + _tmp13_ = should_allow_toggle; #line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp16_) { + if (_tmp13_) { #line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5743 "Tree.c" +#line 5842 "Tree.c" } #line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; @@ -5747,622 +5846,546 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr _g_object_unref0 (wrapper); #line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5751 "Tree.c" +#line 5850 "Tree.c" } -static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventButton* event) { +static gboolean +sidebar_tree_real_button_press_event (GtkWidget* base, + GdkEventButton* event) +{ SidebarTree * self; gboolean result = FALSE; GtkTreePath* path = NULL; - GdkEventButton* _tmp0_; - GtkTreePath* _tmp1_; - gboolean _tmp2_ = FALSE; - GtkTreePath* _tmp3_; - gboolean _tmp6_ = FALSE; - GdkEventButton* _tmp7_; - guint _tmp8_; - GdkEventButton* _tmp58_; - gboolean _tmp59_; + GtkTreePath* _tmp0_; + gboolean _tmp1_ = FALSE; + GtkTreePath* _tmp2_; + gboolean _tmp4_ = FALSE; + guint _tmp5_; #line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree); #line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (event != NULL, FALSE); #line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = event; -#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = sidebar_tree_get_path_from_event (self, _tmp0_); + _tmp0_ = sidebar_tree_get_path_from_event (self, event); #line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - path = _tmp1_; -#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = path; + path = _tmp0_; #line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp3_ == NULL) { -#line 5782 "Tree.c" - GdkEventButton* _tmp4_; - guint _tmp5_; + _tmp2_ = path; #line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = event; + if (_tmp2_ == NULL) { +#line 5878 "Tree.c" + guint _tmp3_; #line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = _tmp4_->button; + _tmp3_ = event->button; #line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = _tmp5_ != ((guint) 3); -#line 5791 "Tree.c" + _tmp1_ = _tmp3_ != ((guint) 3); +#line 5884 "Tree.c" } else { #line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = FALSE; -#line 5795 "Tree.c" + _tmp1_ = FALSE; +#line 5888 "Tree.c" } #line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp2_) { + if (_tmp1_) { #line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; #line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5805 "Tree.c" +#line 5898 "Tree.c" } #line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = event; + _tmp5_ = event->button; #line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = _tmp7_->button; + if (_tmp5_ == ((guint) 3)) { +#line 5904 "Tree.c" + GdkEventType _tmp6_; #line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp8_ == ((guint) 3)) { -#line 5813 "Tree.c" - GdkEventButton* _tmp9_; - GdkEventType _tmp10_; + _tmp6_ = event->type; #line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = event; -#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = _tmp9_->type; -#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = _tmp10_ == GDK_BUTTON_PRESS; -#line 5822 "Tree.c" + _tmp4_ = _tmp6_ == GDK_BUTTON_PRESS; +#line 5910 "Tree.c" } else { #line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = FALSE; -#line 5826 "Tree.c" + _tmp4_ = FALSE; +#line 5914 "Tree.c" } #line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp6_) { -#line 5830 "Tree.c" - GtkTreePath* _tmp11_; + if (_tmp4_) { +#line 5918 "Tree.c" + GtkTreePath* _tmp7_; #line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = path; + _tmp7_ = path; #line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp11_ != NULL) { -#line 5836 "Tree.c" - GtkTreePath* _tmp12_; - GdkEventButton* _tmp13_; -#line 926 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = path; + if (_tmp7_ != NULL) { +#line 5924 "Tree.c" + GtkTreePath* _tmp8_; #line 926 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = event; + _tmp8_ = path; #line 926 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_popup_context_menu (self, _tmp12_, _tmp13_); -#line 5845 "Tree.c" + sidebar_tree_popup_context_menu (self, _tmp8_, event); +#line 5930 "Tree.c" } else { - GdkEventButton* _tmp14_; -#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = event; #line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_popup_default_context_menu (self, _tmp14_); -#line 5852 "Tree.c" + sidebar_tree_popup_default_context_menu (self, event); +#line 5934 "Tree.c" } } else { - gboolean _tmp15_ = FALSE; - GdkEventButton* _tmp16_; - guint _tmp17_; -#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = event; -#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp17_ = _tmp16_->button; + gboolean _tmp9_ = FALSE; + guint _tmp10_; #line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp17_ == ((guint) 1)) { -#line 5864 "Tree.c" - GdkEventButton* _tmp18_; - GdkEventType _tmp19_; + _tmp10_ = event->button; #line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp18_ = event; + if (_tmp10_ == ((guint) 1)) { +#line 5943 "Tree.c" + GdkEventType _tmp11_; #line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp19_ = _tmp18_->type; + _tmp11_ = event->type; #line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp15_ = _tmp19_ == GDK_BUTTON_PRESS; -#line 5873 "Tree.c" + _tmp9_ = _tmp11_ == GDK_BUTTON_PRESS; +#line 5949 "Tree.c" } else { #line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp15_ = FALSE; -#line 5877 "Tree.c" + _tmp9_ = FALSE; +#line 5953 "Tree.c" } #line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp15_) { -#line 5881 "Tree.c" - GtkTreePath* _tmp20_; + if (_tmp9_) { +#line 5957 "Tree.c" + GtkTreePath* _tmp12_; SidebarTreeEntryWrapper* wrapper = NULL; - GtkTreePath* _tmp23_; - SidebarTreeEntryWrapper* _tmp24_; - SidebarTreeEntryWrapper* _tmp25_; - gboolean _tmp28_ = FALSE; - SidebarTreeEntryWrapper* _tmp29_; - SidebarEntry* _tmp30_; - gboolean _tmp34_ = FALSE; - gboolean _tmp35_ = FALSE; - const GtkTreeRowReference* _tmp36_; - gboolean _tmp48_ = FALSE; - SidebarTreeEntryWrapper* _tmp49_; - SidebarEntry* _tmp50_; - GtkTreeStore* _tmp55_; - GtkTreePath* _tmp56_; - GtkTreeRowReference* _tmp57_; + GtkTreePath* _tmp13_; + SidebarTreeEntryWrapper* _tmp14_; + SidebarTreeEntryWrapper* _tmp15_; + gboolean _tmp16_ = FALSE; + SidebarTreeEntryWrapper* _tmp17_; + SidebarEntry* _tmp18_; + gboolean _tmp22_ = FALSE; + gboolean _tmp23_ = FALSE; + GtkTreeRowReference* _tmp24_; + gboolean _tmp33_ = FALSE; + SidebarTreeEntryWrapper* _tmp34_; + SidebarEntry* _tmp35_; + GtkTreeStore* _tmp39_; + GtkTreePath* _tmp40_; + GtkTreeRowReference* _tmp41_; #line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp20_ = path; + _tmp12_ = path; #line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp20_ == NULL) { -#line 5903 "Tree.c" - GdkEventButton* _tmp21_; - gboolean _tmp22_; + if (_tmp12_ == NULL) { #line 931 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_row_reference_free0 (self->priv->old_path_ref); + __vala_GtkTreeRowReference_free0 (self->priv->old_path_ref); #line 931 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->old_path_ref = NULL; #line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp21_ = event; -#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp22_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp21_); + result = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), event); #line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - result = _tmp22_; -#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5920 "Tree.c" +#line 5989 "Tree.c" } #line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp23_ = path; + _tmp13_ = path; #line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp24_ = sidebar_tree_get_wrapper_at_path (self, _tmp23_); + _tmp14_ = sidebar_tree_get_wrapper_at_path (self, _tmp13_); #line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - wrapper = _tmp24_; + wrapper = _tmp14_; #line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp25_ = wrapper; + _tmp15_ = wrapper; #line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp25_ == NULL) { -#line 5932 "Tree.c" - GdkEventButton* _tmp26_; - gboolean _tmp27_; + if (_tmp15_ == NULL) { #line 938 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_row_reference_free0 (self->priv->old_path_ref); + __vala_GtkTreeRowReference_free0 (self->priv->old_path_ref); #line 938 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->old_path_ref = NULL; #line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp26_ = event; -#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp27_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp26_); -#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - result = _tmp27_; + result = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), event); #line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5951 "Tree.c" +#line 6013 "Tree.c" } #line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp29_ = wrapper; + _tmp17_ = wrapper; #line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp30_ = _tmp29_->entry; + _tmp18_ = _tmp17_->entry; #line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, SIDEBAR_TYPE_EXPANDABLE_ENTRY)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, SIDEBAR_TYPE_EXPANDABLE_ENTRY)) { #line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp28_ = TRUE; -#line 5961 "Tree.c" + _tmp16_ = TRUE; +#line 6023 "Tree.c" } else { - SidebarTreeEntryWrapper* _tmp31_; - SidebarEntry* _tmp32_; + SidebarTreeEntryWrapper* _tmp19_; + SidebarEntry* _tmp20_; #line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp31_ = wrapper; + _tmp19_ = wrapper; #line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp32_ = _tmp31_->entry; + _tmp20_ = _tmp19_->entry; #line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp28_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY); -#line 5971 "Tree.c" + _tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY); +#line 6033 "Tree.c" } #line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp28_) { -#line 5975 "Tree.c" - GtkTreePath* _tmp33_; + if (_tmp16_) { +#line 6037 "Tree.c" + GtkTreePath* _tmp21_; #line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp33_ = path; + _tmp21_ = path; #line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_toggle_branch_expansion (self, _tmp33_, FALSE); -#line 5981 "Tree.c" + sidebar_tree_toggle_branch_expansion (self, _tmp21_, FALSE); +#line 6043 "Tree.c" } #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp36_ = self->priv->old_path_ref; + _tmp24_ = self->priv->old_path_ref; #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp36_ != NULL) { -#line 5987 "Tree.c" - const GtkTreeRowReference* _tmp37_; - GtkTreePath* _tmp38_; - GtkTreePath* _tmp39_; + if (_tmp24_ != NULL) { +#line 6049 "Tree.c" + GtkTreeRowReference* _tmp25_; + GtkTreePath* _tmp26_; + GtkTreePath* _tmp27_; #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp37_ = self->priv->old_path_ref; + _tmp25_ = self->priv->old_path_ref; #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp38_ = gtk_tree_row_reference_get_path (_tmp37_); + _tmp26_ = gtk_tree_row_reference_get_path (_tmp25_); #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp39_ = _tmp38_; + _tmp27_ = _tmp26_; #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp35_ = _tmp39_ != NULL; + _tmp23_ = _tmp27_ != NULL; #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (_tmp39_); -#line 6001 "Tree.c" + __vala_GtkTreePath_free0 (_tmp27_); +#line 6063 "Tree.c" } else { #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp35_ = FALSE; -#line 6005 "Tree.c" + _tmp23_ = FALSE; +#line 6067 "Tree.c" } #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp35_) { -#line 6009 "Tree.c" - const GtkTreeRowReference* _tmp40_; - GtkTreePath* _tmp41_; - GtkTreePath* _tmp42_; - GtkTreePath* _tmp43_; - gint _tmp44_; -#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp40_ = self->priv->old_path_ref; + if (_tmp23_) { +#line 6071 "Tree.c" + GtkTreeRowReference* _tmp28_; + GtkTreePath* _tmp29_; + GtkTreePath* _tmp30_; + GtkTreePath* _tmp31_; #line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp41_ = gtk_tree_row_reference_get_path (_tmp40_); + _tmp28_ = self->priv->old_path_ref; #line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp42_ = _tmp41_; + _tmp29_ = gtk_tree_row_reference_get_path (_tmp28_); #line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp43_ = path; + _tmp30_ = _tmp29_; #line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp44_ = gtk_tree_path_compare (_tmp42_, _tmp43_); + _tmp31_ = path; #line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp34_ = _tmp44_ == 0; + _tmp22_ = gtk_tree_path_compare (_tmp30_, _tmp31_) == 0; #line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (_tmp42_); -#line 6029 "Tree.c" + __vala_GtkTreePath_free0 (_tmp30_); +#line 6088 "Tree.c" } else { #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp34_ = FALSE; -#line 6033 "Tree.c" + _tmp22_ = FALSE; +#line 6092 "Tree.c" } #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp34_) { -#line 6037 "Tree.c" - GtkCellRendererText* _tmp45_; - GdkEventButton* _tmp46_; - gboolean _tmp47_; + if (_tmp22_) { +#line 6096 "Tree.c" + GtkCellRendererText* _tmp32_; #line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp45_ = self->priv->text_renderer; + _tmp32_ = self->priv->text_renderer; #line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_object_set (_tmp45_, "editable", FALSE, NULL); -#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp46_ = event; -#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp47_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp46_); + g_object_set (_tmp32_, "editable", FALSE, NULL); #line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - result = _tmp47_; + result = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), event); #line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6057 "Tree.c" +#line 6110 "Tree.c" } #line 960 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp49_ = wrapper; + _tmp34_ = wrapper; #line 960 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp50_ = _tmp49_->entry; + _tmp35_ = _tmp34_->entry; #line 960 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp50_, SIDEBAR_TYPE_RENAMEABLE_ENTRY)) { -#line 6065 "Tree.c" - SidebarTreeEntryWrapper* _tmp51_; - SidebarEntry* _tmp52_; - gboolean _tmp53_; -#line 961 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp51_ = wrapper; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp35_, SIDEBAR_TYPE_RENAMEABLE_ENTRY)) { +#line 6118 "Tree.c" + SidebarTreeEntryWrapper* _tmp36_; + SidebarEntry* _tmp37_; #line 961 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp52_ = _tmp51_->entry; + _tmp36_ = wrapper; #line 961 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp53_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry)); + _tmp37_ = _tmp36_->entry; #line 961 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp48_ = _tmp53_; -#line 6077 "Tree.c" + _tmp33_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry)); +#line 6127 "Tree.c" } else { #line 960 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp48_ = FALSE; -#line 6081 "Tree.c" + _tmp33_ = FALSE; +#line 6131 "Tree.c" } #line 960 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp48_) { -#line 6085 "Tree.c" - GtkCellRendererText* _tmp54_; + if (_tmp33_) { +#line 6135 "Tree.c" + GtkCellRendererText* _tmp38_; #line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp54_ = self->priv->text_renderer; + _tmp38_ = self->priv->text_renderer; #line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_object_set (_tmp54_, "editable", TRUE, NULL); -#line 6091 "Tree.c" + g_object_set (_tmp38_, "editable", TRUE, NULL); +#line 6141 "Tree.c" } #line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp55_ = self->priv->store; + _tmp39_ = self->priv->store; #line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp56_ = path; + _tmp40_ = path; #line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp57_ = gtk_tree_row_reference_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GTK_TYPE_TREE_MODEL, GtkTreeModel), _tmp56_); + _tmp41_ = gtk_tree_row_reference_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tree_model_get_type (), GtkTreeModel), _tmp40_); #line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_row_reference_free0 (self->priv->old_path_ref); + __vala_GtkTreeRowReference_free0 (self->priv->old_path_ref); #line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - self->priv->old_path_ref = _tmp57_; + self->priv->old_path_ref = _tmp41_; #line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 6105 "Tree.c" +#line 6155 "Tree.c" } } #line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp58_ = event; -#line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp59_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp58_); + result = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), event); #line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - result = _tmp59_; -#line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6118 "Tree.c" +#line 6164 "Tree.c" } -gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, GdkEventKey* event) { +gboolean +sidebar_tree_is_keypress_interpreted (SidebarTree* self, + GdkEventKey* event) +{ gboolean result = FALSE; - GdkEventKey* _tmp0_; - guint _tmp1_; + guint _tmp0_; + const gchar* _tmp1_; const gchar* _tmp2_; - const gchar* _tmp3_; - GQuark _tmp5_ = 0U; + GQuark _tmp4_ = 0U; #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - static GQuark _tmp4_label0 = 0; + static GQuark _tmp3_label0 = 0; #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - static GQuark _tmp4_label1 = 0; + static GQuark _tmp3_label1 = 0; #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - static GQuark _tmp4_label2 = 0; + static GQuark _tmp3_label2 = 0; #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - static GQuark _tmp4_label3 = 0; + static GQuark _tmp3_label3 = 0; #line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); #line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (event != NULL, FALSE); #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = event; -#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = _tmp0_->keyval; + _tmp0_ = event->keyval; #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = gdk_keyval_name (_tmp1_); + _tmp1_ = gdk_keyval_name (_tmp0_); #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_); + _tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_); #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if ((((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("F2")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("Delete"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("Return"))))) || (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("KP_Enter"))))) { + if ((((_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("F2")))) || (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("Delete"))))) || (_tmp4_ == ((0 != _tmp3_label2) ? _tmp3_label2 : (_tmp3_label2 = g_quark_from_static_string ("Return"))))) || (_tmp4_ == ((0 != _tmp3_label3) ? _tmp3_label3 : (_tmp3_label3 = g_quark_from_static_string ("KP_Enter"))))) { #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" switch (0) { -#line 6155 "Tree.c" +#line 6201 "Tree.c" default: { #line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; #line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6162 "Tree.c" +#line 6208 "Tree.c" } } } else { #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" switch (0) { -#line 6168 "Tree.c" +#line 6214 "Tree.c" default: { #line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6175 "Tree.c" +#line 6221 "Tree.c" } } } } -static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey* event) { +static gboolean +sidebar_tree_real_key_press_event (GtkWidget* base, + GdkEventKey* event) +{ SidebarTree * self; gboolean result = FALSE; - GdkEventKey* _tmp0_; - guint _tmp1_; + guint _tmp0_; + const gchar* _tmp1_; const gchar* _tmp2_; - const gchar* _tmp3_; - GQuark _tmp5_ = 0U; + GQuark _tmp4_ = 0U; #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - static GQuark _tmp4_label0 = 0; + static GQuark _tmp3_label0 = 0; #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - static GQuark _tmp4_label1 = 0; + static GQuark _tmp3_label1 = 0; #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - static GQuark _tmp4_label2 = 0; + static GQuark _tmp3_label2 = 0; #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - static GQuark _tmp4_label3 = 0; -#line 6198 "Tree.c" - GdkEventKey* _tmp15_; - gboolean _tmp16_; + static GQuark _tmp3_label3 = 0; #line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree); #line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (event != NULL, FALSE); #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = event; + _tmp0_ = event->keyval; #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = _tmp0_->keyval; + _tmp1_ = gdk_keyval_name (_tmp0_); #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = gdk_keyval_name (_tmp1_); -#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_); + _tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_); #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if ((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("Return")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("KP_Enter"))))) { + if ((_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("Return")))) || (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("KP_Enter"))))) { #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" switch (0) { -#line 6219 "Tree.c" +#line 6262 "Tree.c" default: { GtkTreePath* path = NULL; + GtkTreePath* _tmp5_; GtkTreePath* _tmp6_; - GtkTreePath* _tmp7_; #line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = sidebar_tree_get_current_path (self); + _tmp5_ = sidebar_tree_get_current_path (self); #line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - path = _tmp6_; + path = _tmp5_; #line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = path; + _tmp6_ = path; #line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp7_ != NULL) { -#line 6233 "Tree.c" - GtkTreePath* _tmp8_; + if (_tmp6_ != NULL) { +#line 6276 "Tree.c" + GtkTreePath* _tmp7_; #line 991 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = path; + _tmp7_ = path; #line 991 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_toggle_branch_expansion (self, _tmp8_, FALSE); -#line 6239 "Tree.c" + sidebar_tree_toggle_branch_expansion (self, _tmp7_, FALSE); +#line 6282 "Tree.c" } #line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; #line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6247 "Tree.c" +#line 6290 "Tree.c" } } - } else if (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("F2")))) { + } else if (_tmp4_ == ((0 != _tmp3_label2) ? _tmp3_label2 : (_tmp3_label2 = g_quark_from_static_string ("F2")))) { #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" switch (0) { -#line 6253 "Tree.c" +#line 6296 "Tree.c" default: { - gboolean _tmp9_; -#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = sidebar_tree_rename_in_place (self); #line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - result = _tmp9_; + result = sidebar_tree_rename_in_place (self); #line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6263 "Tree.c" +#line 6303 "Tree.c" } } - } else if (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("Delete")))) { + } else if (_tmp4_ == ((0 != _tmp3_label3) ? _tmp3_label3 : (_tmp3_label3 = g_quark_from_static_string ("Delete")))) { #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" switch (0) { -#line 6269 "Tree.c" +#line 6309 "Tree.c" default: { GtkTreePath* path = NULL; + GtkTreePath* _tmp8_; + gboolean _tmp9_ = FALSE; GtkTreePath* _tmp10_; - gboolean _tmp11_ = FALSE; - GtkTreePath* _tmp12_; #line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = sidebar_tree_get_current_path (self); + _tmp8_ = sidebar_tree_get_current_path (self); #line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - path = _tmp10_; -#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = path; + path = _tmp8_; #line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp12_ != NULL) { -#line 6284 "Tree.c" - GtkTreePath* _tmp13_; - gboolean _tmp14_; + _tmp10_ = path; #line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = path; + if (_tmp10_ != NULL) { +#line 6324 "Tree.c" + GtkTreePath* _tmp11_; #line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = sidebar_tree_destroy_path (self, _tmp13_); + _tmp11_ = path; #line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = _tmp14_; -#line 6293 "Tree.c" + _tmp9_ = sidebar_tree_destroy_path (self, _tmp11_); +#line 6330 "Tree.c" } else { #line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = FALSE; -#line 6297 "Tree.c" + _tmp9_ = FALSE; +#line 6334 "Tree.c" } #line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - result = _tmp11_; + result = _tmp9_; #line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6305 "Tree.c" +#line 6342 "Tree.c" } } } #line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp15_ = event; -#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp15_); -#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - result = _tmp16_; + result = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), event); #line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6317 "Tree.c" +#line 6350 "Tree.c" } -gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* entry) { +gboolean +sidebar_tree_rename_entry_in_place (SidebarTree* self, + SidebarEntry* entry) +{ gboolean result = FALSE; - SidebarEntry* _tmp0_; - gboolean _tmp1_; - SidebarEntry* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; #line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); #line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE); #line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = entry; -#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = sidebar_tree_expand_to_entry (self, _tmp0_); -#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (!_tmp1_) { + if (!sidebar_tree_expand_to_entry (self, entry)) { #line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6342 "Tree.c" +#line 6369 "Tree.c" } #line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = entry; -#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = sidebar_tree_place_cursor (self, _tmp2_, FALSE); -#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (!_tmp3_) { + if (!sidebar_tree_place_cursor (self, entry, FALSE)) { #line 1012 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 1012 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6354 "Tree.c" +#line 6377 "Tree.c" } #line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = sidebar_tree_rename_in_place (self); -#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - result = _tmp4_; + result = sidebar_tree_rename_in_place (self); #line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6362 "Tree.c" +#line 6383 "Tree.c" } -static gboolean sidebar_tree_rename_in_place (SidebarTree* self) { +static gboolean +sidebar_tree_rename_in_place (SidebarTree* self) +{ gboolean result = FALSE; GtkTreePath* cursor_path = NULL; GtkTreeViewColumn* cursor_column = NULL; @@ -6370,13 +6393,12 @@ static gboolean sidebar_tree_rename_in_place (SidebarTree* self) { GtkTreeViewColumn* _tmp1_ = NULL; GtkTreeViewColumn* _tmp2_; GtkTreePath* _tmp3_; - gboolean _tmp4_; #line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); #line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_get_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), &_tmp0_, &_tmp1_); #line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (cursor_path); + __vala_GtkTreePath_free0 (cursor_path); #line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" cursor_path = _tmp0_; #line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -6388,101 +6410,104 @@ static gboolean sidebar_tree_rename_in_place (SidebarTree* self) { #line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = cursor_path; #line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = sidebar_tree_can_rename_path (self, _tmp3_); -#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp4_) { -#line 6395 "Tree.c" - GtkTreePath* _tmp5_; - GtkTreeViewColumn* _tmp6_; - GtkCellRendererText* _tmp7_; + if (sidebar_tree_can_rename_path (self, _tmp3_)) { +#line 6415 "Tree.c" + GtkTreePath* _tmp4_; + GtkTreeViewColumn* _tmp5_; + GtkCellRendererText* _tmp6_; #line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = cursor_path; + _tmp4_ = cursor_path; #line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = cursor_column; + _tmp5_ = cursor_column; #line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = self->priv->text_renderer; + _tmp6_ = self->priv->text_renderer; #line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_view_set_cursor_on_cell (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp5_, _tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); + gtk_tree_view_set_cursor_on_cell (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp4_, _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); #line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; #line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (cursor_column); #line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (cursor_path); + __vala_GtkTreePath_free0 (cursor_path); #line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6415 "Tree.c" +#line 6435 "Tree.c" } #line 1028 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 1028 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (cursor_column); #line 1028 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (cursor_path); + __vala_GtkTreePath_free0 (cursor_path); #line 1028 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6425 "Tree.c" +#line 6445 "Tree.c" } -gboolean sidebar_tree_scroll_to_entry (SidebarTree* self, SidebarEntry* entry) { +gboolean +sidebar_tree_scroll_to_entry (SidebarTree* self, + SidebarEntry* entry) +{ gboolean result = FALSE; SidebarTreeEntryWrapper* wrapper = NULL; - SidebarEntry* _tmp0_; + SidebarTreeEntryWrapper* _tmp0_; SidebarTreeEntryWrapper* _tmp1_; SidebarTreeEntryWrapper* _tmp2_; - SidebarTreeEntryWrapper* _tmp3_; + GtkTreePath* _tmp3_; GtkTreePath* _tmp4_; - GtkTreePath* _tmp5_; #line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); #line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE); #line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = entry; + _tmp0_ = sidebar_tree_get_wrapper (self, entry); #line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_); -#line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - wrapper = _tmp1_; + wrapper = _tmp0_; #line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = wrapper; + _tmp1_ = wrapper; #line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6458 "Tree.c" +#line 6478 "Tree.c" } #line 1036 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = wrapper; + _tmp2_ = wrapper; #line 1036 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_); + _tmp3_ = sidebar_tree_entry_wrapper_get_path (_tmp2_); #line 1036 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 1036 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_view_scroll_to_cell (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp5_, NULL, FALSE, (gfloat) 0, (gfloat) 0); + gtk_tree_view_scroll_to_cell (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp4_, NULL, FALSE, (gfloat) 0, (gfloat) 0); #line 1036 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (_tmp5_); + __vala_GtkTreePath_free0 (_tmp4_); #line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; #line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6476 "Tree.c" +#line 6496 "Tree.c" } -static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint time) { +static void +sidebar_tree_real_drag_data_get (GtkWidget* base, + GdkDragContext* context, + GtkSelectionData* selection_data, + guint info, + guint time) +{ SidebarTree * self; SidebarInternalDragSourceEntry* drag_source = NULL; SidebarEntry* _tmp0_; SidebarInternalDragSourceEntry* _tmp6_; SidebarInternalDragSourceEntry* _tmp16_; - GtkSelectionData* _tmp17_; #line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree); #line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -6495,7 +6520,7 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co _tmp0_ = self->priv->internal_drag_source_entry; #line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp0_ != NULL) { -#line 6499 "Tree.c" +#line 6524 "Tree.c" SidebarSelectableEntry* selectable = NULL; SidebarEntry* _tmp1_; SidebarSelectableEntry* _tmp2_; @@ -6510,7 +6535,7 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co _tmp3_ = selectable; #line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp3_ == NULL) { -#line 6514 "Tree.c" +#line 6539 "Tree.c" SidebarEntry* _tmp4_; SidebarInternalDragSourceEntry* _tmp5_; #line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -6521,17 +6546,17 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co _g_object_unref0 (drag_source); #line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" drag_source = _tmp5_; -#line 6525 "Tree.c" +#line 6550 "Tree.c" } #line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (selectable); -#line 6529 "Tree.c" +#line 6554 "Tree.c" } #line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = drag_source; #line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp6_ == NULL) { -#line 6535 "Tree.c" +#line 6560 "Tree.c" GtkTreePath* selected_path = NULL; GtkTreePath* _tmp7_; GtkTreePath* _tmp8_; @@ -6552,12 +6577,12 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co #line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp8_ == NULL) { #line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (selected_path); + __vala_GtkTreePath_free0 (selected_path); #line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (drag_source); #line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 6561 "Tree.c" +#line 6586 "Tree.c" } #line 1058 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = selected_path; @@ -6572,12 +6597,12 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co #line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (selected_path); + __vala_GtkTreePath_free0 (selected_path); #line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (drag_source); #line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 6581 "Tree.c" +#line 6606 "Tree.c" } #line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = wrapper; @@ -6596,60 +6621,59 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co #line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (selected_path); + __vala_GtkTreePath_free0 (selected_path); #line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (drag_source); #line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 6605 "Tree.c" +#line 6630 "Tree.c" } #line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (selected_path); -#line 6611 "Tree.c" + __vala_GtkTreePath_free0 (selected_path); +#line 6636 "Tree.c" } #line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = drag_source; #line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp17_ = selection_data; -#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_internal_drag_source_entry_prepare_selection_data (_tmp16_, _tmp17_); + sidebar_internal_drag_source_entry_prepare_selection_data (_tmp16_, selection_data); #line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (drag_source); -#line 6621 "Tree.c" +#line 6644 "Tree.c" } -static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContext* context, gint x, gint y, GtkSelectionData* selection_data, guint info, guint time) { +static void +sidebar_tree_real_drag_data_received (GtkWidget* base, + GdkDragContext* context, + gint x, + gint y, + GtkSelectionData* selection_data, + guint info, + guint time) +{ SidebarTree * self; GtkTreePath* path = NULL; GtkTreeViewDropPosition pos = 0; - gint _tmp0_; - gint _tmp1_; - GtkTreePath* _tmp2_ = NULL; - GtkTreeViewDropPosition _tmp3_ = 0; - gboolean _tmp4_; + GtkTreePath* _tmp0_ = NULL; + GtkTreeViewDropPosition _tmp1_ = 0; + gboolean _tmp2_; SidebarTreeEntryWrapper* wrapper = NULL; - GtkTreePath* _tmp14_; - SidebarTreeEntryWrapper* _tmp15_; - GdkDragContext* _tmp16_; - GtkWidget* _tmp17_; - SidebarTreeEntryWrapper* _tmp27_; + GtkTreePath* _tmp5_; + SidebarTreeEntryWrapper* _tmp6_; + GtkWidget* _tmp7_; + SidebarTreeEntryWrapper* _tmp13_; SidebarInternalDropTargetEntry* targetable = NULL; - SidebarTreeEntryWrapper* _tmp30_; - SidebarEntry* _tmp31_; - SidebarInternalDropTargetEntry* _tmp32_; - SidebarInternalDropTargetEntry* _tmp33_; + SidebarTreeEntryWrapper* _tmp14_; + SidebarEntry* _tmp15_; + SidebarInternalDropTargetEntry* _tmp16_; + SidebarInternalDropTargetEntry* _tmp17_; gboolean success = FALSE; - GtkSelectionData* _tmp36_; - GdkAtom _tmp37_; - gchar* _tmp38_; - gchar* _tmp39_; - gboolean _tmp40_; - GdkDragContext* _tmp57_; - gboolean _tmp58_; - guint _tmp59_; + gchar* _tmp18_; + gchar* _tmp19_; + gboolean _tmp20_; + gboolean _tmp31_; #line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree); #line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -6657,415 +6681,313 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex #line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (selection_data != NULL); #line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = x; -#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = y; + _tmp2_ = gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), x, y, &_tmp0_, &_tmp1_); #line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp0_, _tmp1_, &_tmp2_, &_tmp3_); + __vala_GtkTreePath_free0 (path); #line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); -#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - path = _tmp2_; + path = _tmp0_; #line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - pos = _tmp3_; + pos = _tmp1_; #line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (!_tmp4_) { -#line 6674 "Tree.c" - GdkDragContext* _tmp5_; - GtkWidget* _tmp6_; -#line 1077 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = context; + if (!_tmp2_) { +#line 6694 "Tree.c" + GtkWidget* _tmp3_; #line 1077 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = gtk_drag_get_source_widget (_tmp5_); + _tmp3_ = gtk_drag_get_source_widget (context); #line 1077 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp6_ == NULL) { -#line 6683 "Tree.c" - SidebarTreeExternalDropHandler _tmp7_; - void* _tmp7__target; - GdkDragContext* _tmp8_; - GtkSelectionData* _tmp9_; - guint _tmp10_; - guint _tmp11_; -#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = self->priv->drop_handler; -#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7__target = self->priv->drop_handler_target; -#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = context; -#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = selection_data; + if (_tmp3_ == NULL) { +#line 6700 "Tree.c" + SidebarTreeExternalDropHandler _tmp4_; + void* _tmp4__target; #line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = info; + _tmp4_ = self->priv->drop_handler; #line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = time; + _tmp4__target = self->priv->drop_handler_target; #line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ (_tmp8_, NULL, _tmp9_, _tmp10_, _tmp11_, _tmp7__target); -#line 6704 "Tree.c" + _tmp4_ (context, NULL, selection_data, info, time, _tmp4__target); +#line 6709 "Tree.c" } else { - GdkDragContext* _tmp12_; - guint _tmp13_; -#line 1080 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = context; #line 1080 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = time; -#line 1080 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_drag_finish (_tmp12_, FALSE, FALSE, (guint32) _tmp13_); -#line 6714 "Tree.c" + gtk_drag_finish (context, FALSE, FALSE, (guint32) time); +#line 6713 "Tree.c" } #line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 6720 "Tree.c" +#line 6719 "Tree.c" } #line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = path; + _tmp5_ = path; #line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp15_ = sidebar_tree_get_wrapper_at_path (self, _tmp14_); + _tmp6_ = sidebar_tree_get_wrapper_at_path (self, _tmp5_); #line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - wrapper = _tmp15_; -#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = context; + wrapper = _tmp6_; #line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp17_ = gtk_drag_get_source_widget (_tmp16_); + _tmp7_ = gtk_drag_get_source_widget (context); #line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp17_ == NULL) { -#line 6734 "Tree.c" - SidebarEntry* _tmp18_ = NULL; - SidebarTreeEntryWrapper* _tmp19_; - SidebarTreeExternalDropHandler _tmp22_; - void* _tmp22__target; - GdkDragContext* _tmp23_; - GtkSelectionData* _tmp24_; - guint _tmp25_; - guint _tmp26_; + if (_tmp7_ == NULL) { +#line 6731 "Tree.c" + SidebarEntry* _tmp8_ = NULL; + SidebarTreeEntryWrapper* _tmp9_; + SidebarTreeExternalDropHandler _tmp12_; + void* _tmp12__target; #line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp19_ = wrapper; + _tmp9_ = wrapper; #line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp19_ != NULL) { -#line 6747 "Tree.c" - SidebarTreeEntryWrapper* _tmp20_; - SidebarEntry* _tmp21_; + if (_tmp9_ != NULL) { +#line 6740 "Tree.c" + SidebarTreeEntryWrapper* _tmp10_; + SidebarEntry* _tmp11_; #line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp20_ = wrapper; + _tmp10_ = wrapper; #line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp21_ = _tmp20_->entry; + _tmp11_ = _tmp10_->entry; #line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp18_ = _tmp21_; -#line 6756 "Tree.c" + _tmp8_ = _tmp11_; +#line 6749 "Tree.c" } else { #line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp18_ = NULL; -#line 6760 "Tree.c" + _tmp8_ = NULL; +#line 6753 "Tree.c" } #line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp22_ = self->priv->drop_handler; -#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp22__target = self->priv->drop_handler_target; -#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp23_ = context; -#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp24_ = selection_data; + _tmp12_ = self->priv->drop_handler; #line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp25_ = info; + _tmp12__target = self->priv->drop_handler_target; #line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp26_ = time; -#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp22_ (_tmp23_, _tmp18_, _tmp24_, _tmp25_, _tmp26_, _tmp22__target); + _tmp12_ (context, _tmp8_, selection_data, info, time, _tmp12__target); #line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 6782 "Tree.c" +#line 6767 "Tree.c" } #line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp27_ = wrapper; + _tmp13_ = wrapper; #line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp27_ == NULL) { -#line 6788 "Tree.c" - GdkDragContext* _tmp28_; - guint _tmp29_; -#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp28_ = context; + if (_tmp13_ == NULL) { #line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp29_ = time; -#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_drag_finish (_tmp28_, FALSE, FALSE, (guint32) _tmp29_); + gtk_drag_finish (context, FALSE, FALSE, (guint32) time); #line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 6803 "Tree.c" +#line 6781 "Tree.c" } #line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp30_ = wrapper; + _tmp14_ = wrapper; #line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp31_ = _tmp30_->entry; + _tmp15_ = _tmp14_->entry; #line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp31_, SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY) ? ((SidebarInternalDropTargetEntry*) _tmp31_) : NULL); + _tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY) ? ((SidebarInternalDropTargetEntry*) _tmp15_) : NULL); #line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - targetable = _tmp32_; + targetable = _tmp16_; #line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp33_ = targetable; + _tmp17_ = targetable; #line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp33_ == NULL) { -#line 6817 "Tree.c" - GdkDragContext* _tmp34_; - guint _tmp35_; -#line 1105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp34_ = context; -#line 1105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp35_ = time; + if (_tmp17_ == NULL) { #line 1105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_drag_finish (_tmp34_, FALSE, FALSE, (guint32) _tmp35_); + gtk_drag_finish (context, FALSE, FALSE, (guint32) time); #line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (targetable); #line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 6834 "Tree.c" +#line 6805 "Tree.c" } #line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" success = FALSE; #line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp36_ = selection_data; -#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp37_ = gtk_selection_data_get_data_type (_tmp36_); + _tmp18_ = gdk_atom_name (gtk_selection_data_get_data_type (selection_data)); #line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp38_ = gdk_atom_name (_tmp37_); + _tmp19_ = _tmp18_; #line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp39_ = _tmp38_; + _tmp20_ = g_strcmp0 (_tmp19_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0; #line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp40_ = g_strcmp0 (_tmp39_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0; + _g_free0 (_tmp19_); #line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_free0 (_tmp39_); -#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp40_) { -#line 6852 "Tree.c" - SidebarInternalDropTargetEntry* _tmp41_; - GtkSelectionData* _tmp42_; - gboolean _tmp43_; -#line 1113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp41_ = targetable; + if (_tmp20_) { +#line 6819 "Tree.c" + SidebarInternalDropTargetEntry* _tmp21_; #line 1113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp42_ = selection_data; + _tmp21_ = targetable; #line 1113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp43_ = sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (_tmp41_, _tmp42_); -#line 1113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - success = _tmp43_; -#line 6864 "Tree.c" + success = sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (_tmp21_, selection_data); +#line 6825 "Tree.c" } else { GeeList* media = NULL; - GtkSelectionData* _tmp44_; - guchar* _tmp45_; - GtkSelectionData* _tmp46_; - gint _tmp47_; - GeeList* _tmp48_; - gboolean _tmp49_ = FALSE; - GeeList* _tmp50_; -#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp44_ = selection_data; + guint8* _tmp22_; + GeeList* _tmp23_; + gboolean _tmp24_ = FALSE; + GeeList* _tmp25_; #line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp45_ = gtk_selection_data_get_data (_tmp44_); + _tmp22_ = gtk_selection_data_get_data (selection_data); #line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp46_ = selection_data; + _tmp23_ = unserialize_media_sources (_tmp22_, gtk_selection_data_get_length (selection_data)); #line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp47_ = gtk_selection_data_get_length (_tmp46_); -#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp48_ = unserialize_media_sources (_tmp45_, _tmp47_); -#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - media = _tmp48_; + media = _tmp23_; #line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp50_ = media; + _tmp25_ = media; #line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp50_ != NULL) { -#line 6890 "Tree.c" - GeeList* _tmp51_; - gint _tmp52_; - gint _tmp53_; + if (_tmp25_ != NULL) { +#line 6842 "Tree.c" + GeeList* _tmp26_; + gint _tmp27_; + gint _tmp28_; #line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp51_ = media; + _tmp26_ = media; #line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp52_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp27_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp53_ = _tmp52_; + _tmp28_ = _tmp27_; #line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp49_ = _tmp53_ > 0; -#line 6902 "Tree.c" + _tmp24_ = _tmp28_ > 0; +#line 6854 "Tree.c" } else { #line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp49_ = FALSE; -#line 6906 "Tree.c" + _tmp24_ = FALSE; +#line 6858 "Tree.c" } #line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp49_) { -#line 6910 "Tree.c" - SidebarInternalDropTargetEntry* _tmp54_; - GeeList* _tmp55_; - gboolean _tmp56_; + if (_tmp24_) { +#line 6862 "Tree.c" + SidebarInternalDropTargetEntry* _tmp29_; + GeeList* _tmp30_; #line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp54_ = targetable; + _tmp29_ = targetable; #line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp55_ = media; + _tmp30_ = media; #line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp56_ = sidebar_internal_drop_target_entry_internal_drop_received (_tmp54_, _tmp55_); -#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - success = _tmp56_; -#line 6922 "Tree.c" + success = sidebar_internal_drop_target_entry_internal_drop_received (_tmp29_, _tmp30_); +#line 6871 "Tree.c" } #line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (media); -#line 6926 "Tree.c" +#line 6875 "Tree.c" } #line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp57_ = context; -#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp58_ = success; + _tmp31_ = success; #line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp59_ = time; -#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_drag_finish (_tmp57_, _tmp58_, FALSE, (guint32) _tmp59_); + gtk_drag_finish (context, _tmp31_, FALSE, (guint32) time); #line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (targetable); #line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); -#line 6942 "Tree.c" + __vala_GtkTreePath_free0 (path); +#line 6887 "Tree.c" } -static gboolean sidebar_tree_real_drag_motion (GtkWidget* base, GdkDragContext* context, gint x, gint y, guint time) { +static gboolean +sidebar_tree_real_drag_motion (GtkWidget* base, + GdkDragContext* context, + gint x, + gint y, + guint time) +{ SidebarTree * self; gboolean result = FALSE; - GdkDragContext* _tmp0_; - gint _tmp1_; - gint _tmp2_; - guint _tmp3_; GtkTreePath* path = NULL; GtkTreeViewDropPosition pos = 0; gboolean has_dest = FALSE; - gint _tmp4_; - gint _tmp5_; - GtkTreePath* _tmp6_ = NULL; - GtkTreeViewDropPosition _tmp7_ = 0; - gboolean _tmp8_; - gboolean _tmp9_ = FALSE; - gboolean _tmp10_; - GdkDragContext* _tmp15_; - GdkDragContext* _tmp16_; - GdkDragAction _tmp17_; - guint _tmp18_; + GtkTreePath* _tmp0_ = NULL; + GtkTreeViewDropPosition _tmp1_ = 0; + gboolean _tmp2_; + gboolean _tmp3_ = FALSE; + gboolean _tmp4_; #line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree); #line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE); #line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = context; -#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = x; -#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = y; -#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = time; -#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - GTK_WIDGET_CLASS (sidebar_tree_parent_class)->drag_motion (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = x; -#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = y; + GTK_WIDGET_CLASS (sidebar_tree_parent_class)->drag_motion (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), context, x, y, time); #line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp4_, _tmp5_, &_tmp6_, &_tmp7_); + _tmp2_ = gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), x, y, &_tmp0_, &_tmp1_); #line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - path = _tmp6_; + path = _tmp0_; #line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - pos = _tmp7_; + pos = _tmp1_; #line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - has_dest = _tmp8_; + has_dest = _tmp2_; #line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = has_dest; + _tmp4_ = has_dest; #line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (!_tmp10_) { + if (!_tmp4_) { #line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = TRUE; -#line 7001 "Tree.c" + _tmp3_ = TRUE; +#line 6930 "Tree.c" } else { - GtkTreeViewDropPosition _tmp11_; + GtkTreeViewDropPosition _tmp5_; #line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = pos; + _tmp5_ = pos; #line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = _tmp11_ == GTK_TREE_VIEW_DROP_BEFORE; -#line 7008 "Tree.c" + _tmp3_ = _tmp5_ == GTK_TREE_VIEW_DROP_BEFORE; +#line 6937 "Tree.c" } #line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp9_) { -#line 7012 "Tree.c" - GtkTreePath* _tmp12_; + if (_tmp3_) { +#line 6941 "Tree.c" + GtkTreePath* _tmp6_; #line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = path; + _tmp6_ = path; #line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_view_set_drag_dest_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp12_, GTK_TREE_VIEW_DROP_INTO_OR_BEFORE); -#line 7018 "Tree.c" + gtk_tree_view_set_drag_dest_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp6_, GTK_TREE_VIEW_DROP_INTO_OR_BEFORE); +#line 6947 "Tree.c" } else { - GtkTreeViewDropPosition _tmp13_; + GtkTreeViewDropPosition _tmp7_; #line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = pos; + _tmp7_ = pos; #line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp13_ == GTK_TREE_VIEW_DROP_AFTER) { -#line 7025 "Tree.c" - GtkTreePath* _tmp14_; + if (_tmp7_ == GTK_TREE_VIEW_DROP_AFTER) { +#line 6954 "Tree.c" + GtkTreePath* _tmp8_; #line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = path; + _tmp8_ = path; #line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_view_set_drag_dest_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp14_, GTK_TREE_VIEW_DROP_INTO_OR_AFTER); -#line 7031 "Tree.c" + gtk_tree_view_set_drag_dest_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp8_, GTK_TREE_VIEW_DROP_INTO_OR_AFTER); +#line 6960 "Tree.c" } } #line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp15_ = context; -#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = context; -#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp17_ = gdk_drag_context_get_suggested_action (_tmp16_); -#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp18_ = time; -#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gdk_drag_status (_tmp15_, _tmp17_, (guint32) _tmp18_); + gdk_drag_status (context, gdk_drag_context_get_suggested_action (context), (guint32) time); #line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = has_dest; #line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (path); + __vala_GtkTreePath_free0 (path); #line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 7050 "Tree.c" +#line 6971 "Tree.c" } -static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* path) { +static gboolean +sidebar_tree_can_rename_path (SidebarTree* self, + GtkTreePath* path) +{ gboolean result = FALSE; gint _tmp0_; SidebarTreeEntryWrapper* wrapper = NULL; - GtkTreePath* _tmp1_; + SidebarTreeEntryWrapper* _tmp1_; SidebarTreeEntryWrapper* _tmp2_; - SidebarTreeEntryWrapper* _tmp3_; SidebarRenameableEntry* renameable = NULL; - SidebarTreeEntryWrapper* _tmp4_; - SidebarEntry* _tmp5_; + SidebarTreeEntryWrapper* _tmp3_; + SidebarEntry* _tmp4_; + SidebarRenameableEntry* _tmp5_; SidebarRenameableEntry* _tmp6_; - SidebarRenameableEntry* _tmp7_; - SidebarTreeEntryWrapper* _tmp8_; - SidebarEntry* _tmp9_; - GtkTreeSelection* _tmp10_; - GtkTreePath* _tmp11_; + SidebarTreeEntryWrapper* _tmp7_; + SidebarEntry* _tmp8_; + GtkTreeSelection* _tmp9_; #line 1144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); #line 1144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -7078,38 +7000,36 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa result = FALSE; #line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 7082 "Tree.c" +#line 7004 "Tree.c" } #line 1148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = path; -#line 1148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = sidebar_tree_get_wrapper_at_path (self, _tmp1_); + _tmp1_ = sidebar_tree_get_wrapper_at_path (self, path); #line 1148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - wrapper = _tmp2_; + wrapper = _tmp1_; #line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = wrapper; + _tmp2_ = wrapper; #line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 7100 "Tree.c" +#line 7020 "Tree.c" } #line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = wrapper; + _tmp3_ = wrapper; #line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = _tmp4_->entry; + _tmp4_ = _tmp3_->entry; #line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp5_) : NULL); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp4_) : NULL); #line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - renameable = _tmp6_; + renameable = _tmp5_; #line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = renameable; + _tmp6_ = renameable; #line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp7_ == NULL) { + if (_tmp6_ == NULL) { #line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -7118,14 +7038,14 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa _g_object_unref0 (wrapper); #line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 7122 "Tree.c" +#line 7042 "Tree.c" } #line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = wrapper; + _tmp7_ = wrapper; #line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = _tmp8_->entry; + _tmp8_ = _tmp7_->entry; #line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, SIDEBAR_TYPE_HEADER)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, SIDEBAR_TYPE_HEADER)) { #line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -7134,14 +7054,12 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa _g_object_unref0 (wrapper); #line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 7138 "Tree.c" +#line 7058 "Tree.c" } #line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView)); -#line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = path; + _tmp9_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView)); #line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_selection_select_path (_tmp10_, _tmp11_); + gtk_tree_selection_select_path (_tmp9_, path); #line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; #line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -7150,56 +7068,56 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa _g_object_unref0 (wrapper); #line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 7154 "Tree.c" +#line 7072 "Tree.c" } -static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path) { +static gboolean +sidebar_tree_destroy_path (SidebarTree* self, + GtkTreePath* path) +{ gboolean result = FALSE; SidebarTreeEntryWrapper* wrapper = NULL; - GtkTreePath* _tmp0_; + SidebarTreeEntryWrapper* _tmp0_; SidebarTreeEntryWrapper* _tmp1_; - SidebarTreeEntryWrapper* _tmp2_; SidebarDestroyableEntry* destroyable = NULL; - SidebarTreeEntryWrapper* _tmp3_; - SidebarEntry* _tmp4_; + SidebarTreeEntryWrapper* _tmp2_; + SidebarEntry* _tmp3_; + SidebarDestroyableEntry* _tmp4_; SidebarDestroyableEntry* _tmp5_; SidebarDestroyableEntry* _tmp6_; - SidebarDestroyableEntry* _tmp7_; #line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); #line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (path != NULL, FALSE); #line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = path; -#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_); + _tmp0_ = sidebar_tree_get_wrapper_at_path (self, path); #line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - wrapper = _tmp1_; + wrapper = _tmp0_; #line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = wrapper; + _tmp1_ = wrapper; #line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); #line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 7190 "Tree.c" +#line 7108 "Tree.c" } #line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = wrapper; + _tmp2_ = wrapper; #line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = _tmp3_->entry; + _tmp3_ = _tmp2_->entry; #line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, SIDEBAR_TYPE_DESTROYABLE_ENTRY) ? ((SidebarDestroyableEntry*) _tmp4_) : NULL); + _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TYPE_DESTROYABLE_ENTRY) ? ((SidebarDestroyableEntry*) _tmp3_) : NULL); #line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - destroyable = _tmp5_; + destroyable = _tmp4_; #line 1170 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = destroyable; + _tmp5_ = destroyable; #line 1170 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (_tmp6_ == NULL) { + if (_tmp5_ == NULL) { #line 1171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; #line 1171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -7208,12 +7126,12 @@ static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path) _g_object_unref0 (wrapper); #line 1171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 7212 "Tree.c" +#line 7130 "Tree.c" } #line 1173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = destroyable; + _tmp6_ = destroyable; #line 1173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_destroyable_entry_destroy_source (_tmp7_); + sidebar_destroyable_entry_destroy_source (_tmp6_); #line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; #line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -7222,28 +7140,38 @@ static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path) _g_object_unref0 (wrapper); #line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 7226 "Tree.c" +#line 7144 "Tree.c" } -static void _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done (GtkCellEditable* _sender, gpointer self) { +static void +_sidebar_tree_on_editing_done_gtk_cell_editable_editing_done (GtkCellEditable* _sender, + gpointer self) +{ #line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_editing_done ((SidebarTree*) self); -#line 7233 "Tree.c" +#line 7154 "Tree.c" } -static gboolean _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) { +static gboolean +_sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, + GdkEventFocus* event, + gpointer self) +{ gboolean result; result = sidebar_tree_on_editing_focus_out ((SidebarTree*) self, event); #line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 7242 "Tree.c" +#line 7167 "Tree.c" } -static void sidebar_tree_on_editing_started (SidebarTree* self, GtkCellEditable* editable, const gchar* path) { - GtkCellEditable* _tmp0_; +static void +sidebar_tree_on_editing_started (SidebarTree* self, + GtkCellEditable* editable, + const gchar* path) +{ #line 1178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); #line 1178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -7251,41 +7179,38 @@ static void sidebar_tree_on_editing_started (SidebarTree* self, GtkCellEditable* #line 1178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (path != NULL); #line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = editable; -#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_entry_get_type ())) { -#line 7258 "Tree.c" - GtkCellEditable* _tmp1_; + if (G_TYPE_CHECK_INSTANCE_TYPE (editable, gtk_entry_get_type ())) { +#line 7184 "Tree.c" + GtkEntry* _tmp0_; + GtkEntry* _tmp1_; GtkEntry* _tmp2_; GtkEntry* _tmp3_; - GtkEntry* _tmp4_; - GtkEntry* _tmp5_; -#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = editable; #line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_entry_get_type (), GtkEntry)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (editable, gtk_entry_get_type (), GtkEntry)); #line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (self->priv->text_entry); #line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - self->priv->text_entry = _tmp2_; + self->priv->text_entry = _tmp0_; #line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = self->priv->text_entry; + _tmp1_ = self->priv->text_entry; #line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_CELL_EDITABLE, GtkCellEditable), "editing-done", (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_cell_editable_get_type (), GtkCellEditable), "editing-done", (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self, 0); #line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = self->priv->text_entry; + _tmp2_ = self->priv->text_entry; #line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event, self, 0); #line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = self->priv->text_entry; + _tmp3_ = self->priv->text_entry; #line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_object_set (_tmp5_, "editable", TRUE, NULL); -#line 7284 "Tree.c" + g_object_set (_tmp3_, "editable", TRUE, NULL); +#line 7207 "Tree.c" } } -static void sidebar_tree_on_editing_canceled (SidebarTree* self) { +static void +sidebar_tree_on_editing_canceled (SidebarTree* self) +{ GtkEntry* _tmp0_; GtkEntry* _tmp1_; guint _tmp2_; @@ -7300,20 +7225,22 @@ static void sidebar_tree_on_editing_canceled (SidebarTree* self) { #line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = self->priv->text_entry; #line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_parse_name ("editing-done", GTK_TYPE_CELL_EDITABLE, &_tmp2_, NULL, FALSE); + g_signal_parse_name ("editing-done", gtk_cell_editable_get_type (), &_tmp2_, NULL, FALSE); #line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_CELL_EDITABLE, GtkCellEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_cell_editable_get_type (), GtkCellEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self); #line 1191 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = self->priv->text_entry; #line 1191 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp4_, NULL, FALSE); #line 1191 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event, self); -#line 7313 "Tree.c" +#line 7238 "Tree.c" } -static void sidebar_tree_on_editing_done (SidebarTree* self) { +static void +sidebar_tree_on_editing_done (SidebarTree* self) +{ GtkEntry* _tmp0_; SidebarTreeEntryWrapper* wrapper = NULL; GtkTreePath* _tmp1_; @@ -7340,14 +7267,14 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) { #line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = _tmp3_; #line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (_tmp2_); + __vala_GtkTreePath_free0 (_tmp2_); #line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp4_; #line 1198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = wrapper; #line 1198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp5_ != NULL) { -#line 7351 "Tree.c" +#line 7278 "Tree.c" SidebarRenameableEntry* renameable = NULL; SidebarTreeEntryWrapper* _tmp6_; SidebarEntry* _tmp7_; @@ -7365,7 +7292,7 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) { _tmp9_ = renameable; #line 1200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp9_ != NULL) { -#line 7369 "Tree.c" +#line 7296 "Tree.c" SidebarRenameableEntry* _tmp10_; GtkEntry* _tmp11_; const gchar* _tmp12_; @@ -7377,18 +7304,18 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) { _tmp12_ = gtk_entry_get_text (_tmp11_); #line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_renameable_entry_rename (_tmp10_, _tmp12_); -#line 7381 "Tree.c" +#line 7308 "Tree.c" } #line 1198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (renameable); -#line 7385 "Tree.c" +#line 7312 "Tree.c" } #line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = self->priv->text_entry; #line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_parse_name ("editing-done", GTK_TYPE_CELL_EDITABLE, &_tmp14_, NULL, FALSE); + g_signal_parse_name ("editing-done", gtk_cell_editable_get_type (), &_tmp14_, NULL, FALSE); #line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_CELL_EDITABLE, GtkCellEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_cell_editable_get_type (), GtkCellEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self); #line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = self->priv->text_entry; #line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -7397,11 +7324,14 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) { g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event, self); #line 1194 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 7401 "Tree.c" +#line 7328 "Tree.c" } -static gboolean sidebar_tree_on_editing_focus_out (SidebarTree* self, GdkEventFocus* event) { +static gboolean +sidebar_tree_on_editing_focus_out (SidebarTree* self, + GdkEventFocus* event) +{ gboolean result = FALSE; #line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); @@ -7411,11 +7341,13 @@ static gboolean sidebar_tree_on_editing_focus_out (SidebarTree* self, GdkEventFo result = FALSE; #line 1212 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 7415 "Tree.c" +#line 7345 "Tree.c" } -static void sidebar_tree_on_new_search (SidebarTree* self) { +static void +sidebar_tree_on_new_search (SidebarTree* self) +{ SavedSearchDialog* _tmp0_; SavedSearchDialog* _tmp1_; #line 1215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -7430,11 +7362,13 @@ static void sidebar_tree_on_new_search (SidebarTree* self) { saved_search_dialog_show (_tmp1_); #line 1216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (_tmp1_); -#line 7434 "Tree.c" +#line 7366 "Tree.c" } -static void sidebar_tree_on_new_tag (SidebarTree* self) { +static void +sidebar_tree_on_new_tag (SidebarTree* self) +{ NewRootTagCommand* creation_command = NULL; NewRootTagCommand* _tmp0_; CommandManager* _tmp1_; @@ -7473,11 +7407,18 @@ static void sidebar_tree_on_new_tag (SidebarTree* self) { _g_object_unref0 (_tmp4_); #line 1219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (creation_command); -#line 7477 "Tree.c" +#line 7411 "Tree.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_BOOLEAN) (gpointer data1, gpointer arg_1, gboolean arg_2, gpointer data2); register GMarshalFunc_VOID__OBJECT_BOOLEAN callback; register GCClosure * cc; @@ -7492,23 +7433,30 @@ static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, GV data1 = closure->data; #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" data2 = param_values->data[0].v_pointer; -#line 7496 "Tree.c" +#line 7437 "Tree.c" } else { #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" data1 = param_values->data[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" data2 = closure->data; -#line 7502 "Tree.c" +#line 7443 "Tree.c" } #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" callback = (GMarshalFunc_VOID__OBJECT_BOOLEAN) (marshal_data ? marshal_data : cc->callback); #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_boolean (param_values + 2), data2); -#line 7508 "Tree.c" +#line 7449 "Tree.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2); register GMarshalFunc_VOID__OBJECT_OBJECT callback; register GCClosure * cc; @@ -7523,29 +7471,31 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa data1 = closure->data; #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" data2 = param_values->data[0].v_pointer; -#line 7527 "Tree.c" +#line 7475 "Tree.c" } else { #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" data1 = param_values->data[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" data2 = closure->data; -#line 7533 "Tree.c" +#line 7481 "Tree.c" } #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 7539 "Tree.c" +#line 7487 "Tree.c" } -static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_construct (GType object_type, GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path) { +static SidebarTreeEntryWrapper* +sidebar_tree_entry_wrapper_construct (GType object_type, + GtkTreeModel* model, + SidebarEntry* entry, + GtkTreePath* path) +{ SidebarTreeEntryWrapper * self = NULL; SidebarEntry* _tmp0_; - SidebarEntry* _tmp1_; - GtkTreeModel* _tmp2_; - GtkTreePath* _tmp3_; - GtkTreeRowReference* _tmp4_; + GtkTreeRowReference* _tmp1_; #line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (GTK_IS_TREE_MODEL (model), NULL); #line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -7555,39 +7505,39 @@ static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_construct (GType obje #line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self = (SidebarTreeEntryWrapper*) g_object_new (object_type, NULL); #line 20 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = entry; -#line 20 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (entry); #line 20 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (self->entry); #line 20 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - self->entry = _tmp1_; -#line 21 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = model; -#line 21 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = path; + self->entry = _tmp0_; #line 21 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = gtk_tree_row_reference_new (_tmp2_, _tmp3_); + _tmp1_ = gtk_tree_row_reference_new (model, path); #line 21 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_row_reference_free0 (self->row); + __vala_GtkTreeRowReference_free0 (self->row); #line 21 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - self->row = _tmp4_; + self->row = _tmp1_; #line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return self; -#line 7578 "Tree.c" +#line 7522 "Tree.c" } -static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_new (GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path) { +static SidebarTreeEntryWrapper* +sidebar_tree_entry_wrapper_new (GtkTreeModel* model, + SidebarEntry* entry, + GtkTreePath* path) +{ #line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return sidebar_tree_entry_wrapper_construct (SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, model, entry, path); -#line 7585 "Tree.c" +#line 7533 "Tree.c" } -static GtkTreePath* sidebar_tree_entry_wrapper_get_path (SidebarTreeEntryWrapper* self) { +static GtkTreePath* +sidebar_tree_entry_wrapper_get_path (SidebarTreeEntryWrapper* self) +{ GtkTreePath* result = NULL; - const GtkTreeRowReference* _tmp0_; + GtkTreeRowReference* _tmp0_; GtkTreePath* _tmp1_; #line 24 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (self), NULL); @@ -7599,14 +7549,17 @@ static GtkTreePath* sidebar_tree_entry_wrapper_get_path (SidebarTreeEntryWrapper result = _tmp1_; #line 25 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 7603 "Tree.c" +#line 7553 "Tree.c" } -static void sidebar_tree_entry_wrapper_get_iter (SidebarTreeEntryWrapper* self, GtkTreeIter* result) { +static void +sidebar_tree_entry_wrapper_get_iter (SidebarTreeEntryWrapper* self, + GtkTreeIter* result) +{ GtkTreeIter iter = {0}; gboolean valid = FALSE; - const GtkTreeRowReference* _tmp0_; + GtkTreeRowReference* _tmp0_; GtkTreeModel* _tmp1_; GtkTreePath* _tmp2_; GtkTreePath* _tmp3_; @@ -7630,7 +7583,7 @@ static void sidebar_tree_entry_wrapper_get_iter (SidebarTreeEntryWrapper* self, #line 30 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = _tmp5_; #line 30 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_path_free0 (_tmp3_); + __vala_GtkTreePath_free0 (_tmp3_); #line 30 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" valid = _tmp6_; #line 31 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -7639,38 +7592,46 @@ static void sidebar_tree_entry_wrapper_get_iter (SidebarTreeEntryWrapper* self, *result = iter; #line 33 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 7643 "Tree.c" +#line 7596 "Tree.c" } -static void sidebar_tree_entry_wrapper_class_init (SidebarTreeEntryWrapperClass * klass) { +static void +sidebar_tree_entry_wrapper_class_init (SidebarTreeEntryWrapperClass * klass) +{ #line 15 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_entry_wrapper_parent_class = g_type_class_peek_parent (klass); #line 15 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" G_OBJECT_CLASS (klass)->finalize = sidebar_tree_entry_wrapper_finalize; -#line 7652 "Tree.c" +#line 7607 "Tree.c" } -static void sidebar_tree_entry_wrapper_instance_init (SidebarTreeEntryWrapper * self) { +static void +sidebar_tree_entry_wrapper_instance_init (SidebarTreeEntryWrapper * self) +{ } -static void sidebar_tree_entry_wrapper_finalize (GObject * obj) { +static void +sidebar_tree_entry_wrapper_finalize (GObject * obj) +{ SidebarTreeEntryWrapper * self; #line 15 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, SidebarTreeEntryWrapper); #line 16 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (self->entry); #line 17 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_row_reference_free0 (self->row); + __vala_GtkTreeRowReference_free0 (self->row); #line 15 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" G_OBJECT_CLASS (sidebar_tree_entry_wrapper_parent_class)->finalize (obj); -#line 7670 "Tree.c" +#line 7629 "Tree.c" } -static GType sidebar_tree_entry_wrapper_get_type (void) { +static GType +sidebar_tree_entry_wrapper_get_type (void) +{ static volatile gsize sidebar_tree_entry_wrapper_type_id__volatile = 0; if (g_once_init_enter (&sidebar_tree_entry_wrapper_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SidebarTreeEntryWrapperClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sidebar_tree_entry_wrapper_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SidebarTreeEntryWrapper), 0, (GInstanceInitFunc) sidebar_tree_entry_wrapper_instance_init, NULL }; @@ -7682,12 +7643,14 @@ static GType sidebar_tree_entry_wrapper_get_type (void) { } -static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_construct (GType object_type, GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path, gint root_position) { +static SidebarTreeRootWrapper* +sidebar_tree_root_wrapper_construct (GType object_type, + GtkTreeModel* model, + SidebarEntry* entry, + GtkTreePath* path, + gint root_position) +{ SidebarTreeRootWrapper * self = NULL; - GtkTreeModel* _tmp0_; - SidebarEntry* _tmp1_; - GtkTreePath* _tmp2_; - gint _tmp3_; #line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (GTK_IS_TREE_MODEL (model), NULL); #line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -7695,54 +7658,59 @@ static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_construct (GType object #line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (path != NULL, NULL); #line 41 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = model; -#line 41 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = entry; -#line 41 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = path; -#line 41 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - self = (SidebarTreeRootWrapper*) sidebar_tree_entry_wrapper_construct (object_type, _tmp0_, _tmp1_, _tmp2_); -#line 43 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = root_position; + self = (SidebarTreeRootWrapper*) sidebar_tree_entry_wrapper_construct (object_type, model, entry, path); #line 43 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - self->root_position = _tmp3_; + self->root_position = root_position; #line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return self; -#line 7712 "Tree.c" +#line 7667 "Tree.c" } -static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_new (GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path, gint root_position) { +static SidebarTreeRootWrapper* +sidebar_tree_root_wrapper_new (GtkTreeModel* model, + SidebarEntry* entry, + GtkTreePath* path, + gint root_position) +{ #line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return sidebar_tree_root_wrapper_construct (SIDEBAR_TREE_TYPE_ROOT_WRAPPER, model, entry, path, root_position); -#line 7719 "Tree.c" +#line 7679 "Tree.c" } -static void sidebar_tree_root_wrapper_class_init (SidebarTreeRootWrapperClass * klass) { +static void +sidebar_tree_root_wrapper_class_init (SidebarTreeRootWrapperClass * klass) +{ #line 37 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_root_wrapper_parent_class = g_type_class_peek_parent (klass); #line 37 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" G_OBJECT_CLASS (klass)->finalize = sidebar_tree_root_wrapper_finalize; -#line 7728 "Tree.c" +#line 7690 "Tree.c" } -static void sidebar_tree_root_wrapper_instance_init (SidebarTreeRootWrapper * self) { +static void +sidebar_tree_root_wrapper_instance_init (SidebarTreeRootWrapper * self) +{ } -static void sidebar_tree_root_wrapper_finalize (GObject * obj) { +static void +sidebar_tree_root_wrapper_finalize (GObject * obj) +{ SidebarTreeRootWrapper * self; #line 37 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TREE_TYPE_ROOT_WRAPPER, SidebarTreeRootWrapper); #line 37 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" G_OBJECT_CLASS (sidebar_tree_root_wrapper_parent_class)->finalize (obj); -#line 7742 "Tree.c" +#line 7708 "Tree.c" } -static GType sidebar_tree_root_wrapper_get_type (void) { +static GType +sidebar_tree_root_wrapper_get_type (void) +{ static volatile gsize sidebar_tree_root_wrapper_type_id__volatile = 0; if (g_once_init_enter (&sidebar_tree_root_wrapper_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SidebarTreeRootWrapperClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sidebar_tree_root_wrapper_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SidebarTreeRootWrapper), 0, (GInstanceInitFunc) sidebar_tree_root_wrapper_instance_init, NULL }; @@ -7754,7 +7722,9 @@ static GType sidebar_tree_root_wrapper_get_type (void) { } -static void sidebar_tree_class_init (SidebarTreeClass * klass) { +static void +sidebar_tree_class_init (SidebarTreeClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -7789,11 +7759,13 @@ static void sidebar_tree_class_init (SidebarTreeClass * klass) { sidebar_tree_signals[SIDEBAR_TREE_PAGE_CREATED_SIGNAL] = g_signal_new ("page-created", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, TYPE_PAGE); #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_signals[SIDEBAR_TREE_DESTROYING_PAGE_SIGNAL] = g_signal_new ("destroying-page", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, TYPE_PAGE); -#line 7793 "Tree.c" +#line 7763 "Tree.c" } -static void sidebar_tree_instance_init (SidebarTree * self) { +static void +sidebar_tree_instance_init (SidebarTree * self) +{ GtkTreeStore* _tmp0_; GtkBuilder* _tmp1_; GeeHashMap* _tmp2_; @@ -7836,11 +7808,13 @@ static void sidebar_tree_instance_init (SidebarTree * self) { self->priv->internal_drag_source_entry = NULL; #line 77 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->old_path_ref = NULL; -#line 7840 "Tree.c" +#line 7812 "Tree.c" } -static void sidebar_tree_finalize (GObject * obj) { +static void +sidebar_tree_finalize (GObject * obj) +{ SidebarTree * self; GtkCellRendererText* _tmp0_; guint _tmp1_; @@ -7877,14 +7851,16 @@ static void sidebar_tree_finalize (GObject * obj) { #line 76 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (self->priv->internal_drag_source_entry); #line 77 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _gtk_tree_row_reference_free0 (self->priv->old_path_ref); + __vala_GtkTreeRowReference_free0 (self->priv->old_path_ref); #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" G_OBJECT_CLASS (sidebar_tree_parent_class)->finalize (obj); -#line 7884 "Tree.c" +#line 7858 "Tree.c" } -GType sidebar_tree_get_type (void) { +GType +sidebar_tree_get_type (void) +{ static volatile gsize sidebar_tree_type_id__volatile = 0; if (g_once_init_enter (&sidebar_tree_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SidebarTreeClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sidebar_tree_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SidebarTree), 0, (GInstanceInitFunc) sidebar_tree_instance_init, NULL }; diff --git a/src/sidebar/common.c b/src/sidebar/common.c index eebbd0d..0940f40 100644 --- a/src/sidebar/common.c +++ b/src/sidebar/common.c @@ -1,4 +1,4 @@ -/* common.c generated by valac 0.36.6, the Vala compiler +/* common.c generated by valac 0.40.4, the Vala compiler * generated from common.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -8,6 +8,7 @@ */ /* A simple grouping Entry that is only expandable*/ + #include #include #include @@ -60,6 +61,11 @@ typedef struct _SidebarRenameableEntryIface SidebarRenameableEntryIface; typedef struct _SidebarGrouping SidebarGrouping; typedef struct _SidebarGroupingClass SidebarGroupingClass; typedef struct _SidebarGroupingPrivate SidebarGroupingPrivate; +enum { + SIDEBAR_GROUPING_0_PROPERTY, + SIDEBAR_GROUPING_NUM_PROPERTIES +}; +static GParamSpec* sidebar_grouping_properties[SIDEBAR_GROUPING_NUM_PROPERTIES]; #define _g_free0(var) (var = (g_free (var), NULL)) #define SIDEBAR_TYPE_SELECTABLE_ENTRY (sidebar_selectable_entry_get_type ()) @@ -106,6 +112,11 @@ typedef struct _SidebarContextableIface SidebarContextableIface; typedef struct _SidebarSimplePageEntry SidebarSimplePageEntry; typedef struct _SidebarSimplePageEntryClass SidebarSimplePageEntryClass; typedef struct _SidebarSimplePageEntryPrivate SidebarSimplePageEntryPrivate; +enum { + SIDEBAR_SIMPLE_PAGE_ENTRY_0_PROPERTY, + SIDEBAR_SIMPLE_PAGE_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* sidebar_simple_page_entry_properties[SIDEBAR_SIMPLE_PAGE_ENTRY_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define SIDEBAR_TYPE_BRANCH (sidebar_branch_get_type ()) @@ -129,6 +140,11 @@ typedef struct _SidebarBranchPrivate SidebarBranchPrivate; typedef struct _SidebarRootOnlyBranch SidebarRootOnlyBranch; typedef struct _SidebarRootOnlyBranchClass SidebarRootOnlyBranchClass; typedef struct _SidebarRootOnlyBranchPrivate SidebarRootOnlyBranchPrivate; +enum { + SIDEBAR_ROOT_ONLY_BRANCH_0_PROPERTY, + SIDEBAR_ROOT_ONLY_BRANCH_NUM_PROPERTIES +}; +static GParamSpec* sidebar_root_only_branch_properties[SIDEBAR_ROOT_ONLY_BRANCH_NUM_PROPERTIES]; #define SIDEBAR_BRANCH_TYPE_OPTIONS (sidebar_branch_options_get_type ()) @@ -150,6 +166,11 @@ typedef struct _SidebarEmphasizableEntryIface SidebarEmphasizableEntryIface; typedef struct _SidebarHeader SidebarHeader; typedef struct _SidebarHeaderClass SidebarHeaderClass; typedef struct _SidebarHeaderPrivate SidebarHeaderPrivate; +enum { + SIDEBAR_HEADER_0_PROPERTY, + SIDEBAR_HEADER_NUM_PROPERTIES +}; +static GParamSpec* sidebar_header_properties[SIDEBAR_HEADER_NUM_PROPERTIES]; struct _SidebarEntryIface { GTypeInterface parent_iface; @@ -284,12 +305,15 @@ GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST; GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST; GType sidebar_grouping_get_type (void) G_GNUC_CONST; #define SIDEBAR_GROUPING_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SIDEBAR_TYPE_GROUPING, SidebarGroupingPrivate)) -enum { - SIDEBAR_GROUPING_DUMMY_PROPERTY -}; -SidebarGrouping* sidebar_grouping_new (const gchar* name, const gchar* icon, const gchar* tooltip); -SidebarGrouping* sidebar_grouping_construct (GType object_type, const gchar* name, const gchar* icon, const gchar* tooltip); -static void sidebar_grouping_real_rename (SidebarRenameableEntry* base, const gchar* name); +SidebarGrouping* sidebar_grouping_new (const gchar* name, + const gchar* icon, + const gchar* tooltip); +SidebarGrouping* sidebar_grouping_construct (GType object_type, + const gchar* name, + const gchar* icon, + const gchar* tooltip); +static void sidebar_grouping_real_rename (SidebarRenameableEntry* base, + const gchar* name); static gboolean sidebar_grouping_real_is_user_renameable (SidebarRenameableEntry* base); static gchar* sidebar_grouping_real_get_sidebar_name (SidebarEntry* base); static gchar* sidebar_grouping_real_get_sidebar_tooltip (SidebarEntry* base); @@ -303,9 +327,6 @@ GType sidebar_page_representative_get_type (void) G_GNUC_CONST; GType sidebar_contextable_get_type (void) G_GNUC_CONST; GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST; #define SIDEBAR_SIMPLE_PAGE_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntryPrivate)) -enum { - SIDEBAR_SIMPLE_PAGE_ENTRY_DUMMY_PROPERTY -}; SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type); gchar* sidebar_simple_page_entry_get_sidebar_name (SidebarSimplePageEntry* self); static gchar* sidebar_simple_page_entry_real_get_sidebar_name (SidebarSimplePageEntry* self); @@ -319,111 +340,122 @@ Page* sidebar_simple_page_entry_create_page (SidebarSimplePageEntry* self); static Page* sidebar_simple_page_entry_real_create_page (SidebarSimplePageEntry* self); static gboolean sidebar_simple_page_entry_real_has_page (SidebarPageRepresentative* base); static Page* sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative* base); -static void sidebar_simple_page_entry_real_pruned (SidebarEntry* base, SidebarTree* tree); -static GtkMenu* sidebar_simple_page_entry_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event); +static void sidebar_simple_page_entry_real_pruned (SidebarEntry* base, + SidebarTree* tree); +static GtkMenu* sidebar_simple_page_entry_real_get_sidebar_context_menu (SidebarContextable* base, + GdkEventButton* event); Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self); GtkMenu* page_get_page_context_menu (Page* self); static void sidebar_simple_page_entry_finalize (GObject * obj); GType sidebar_branch_get_type (void) G_GNUC_CONST; GType sidebar_root_only_branch_get_type (void) G_GNUC_CONST; -enum { - SIDEBAR_ROOT_ONLY_BRANCH_DUMMY_PROPERTY -}; SidebarRootOnlyBranch* sidebar_root_only_branch_new (SidebarEntry* root); -SidebarRootOnlyBranch* sidebar_root_only_branch_construct (GType object_type, SidebarEntry* root); +SidebarRootOnlyBranch* sidebar_root_only_branch_construct (GType object_type, + SidebarEntry* root); GType sidebar_branch_options_get_type (void) G_GNUC_CONST; -static gint sidebar_root_only_branch_null_comparator (SidebarEntry* a, SidebarEntry* b); -static gint _sidebar_root_only_branch_null_comparator_gcompare_func (gconstpointer a, gconstpointer b); -SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator); -SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator); +static gint sidebar_root_only_branch_null_comparator (SidebarEntry* a, + SidebarEntry* b); +static gint _sidebar_root_only_branch_null_comparator_gcompare_func (gconstpointer a, + gconstpointer b); +SidebarBranch* sidebar_branch_new (SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator); +SidebarBranch* sidebar_branch_construct (GType object_type, + SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator); GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST; GType sidebar_header_get_type (void) G_GNUC_CONST; #define SIDEBAR_HEADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SIDEBAR_TYPE_HEADER, SidebarHeaderPrivate)) -enum { - SIDEBAR_HEADER_DUMMY_PROPERTY -}; -SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized); -SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized); +SidebarHeader* sidebar_header_new (const gchar* name, + const gchar* tooltip, + gboolean emphasized); +SidebarHeader* sidebar_header_construct (GType object_type, + const gchar* name, + const gchar* tooltip, + gboolean emphasized); static gboolean sidebar_header_real_is_emphasized (SidebarEmphasizableEntry* base); static void sidebar_header_finalize (GObject * obj); -GtkMenu* sidebar_contextable_get_sidebar_context_menu (SidebarContextable* self, GdkEventButton* event); +GtkMenu* sidebar_contextable_get_sidebar_context_menu (SidebarContextable* self, + GdkEventButton* event); -SidebarGrouping* sidebar_grouping_construct (GType object_type, const gchar* name, const gchar* icon, const gchar* tooltip) { +SidebarGrouping* +sidebar_grouping_construct (GType object_type, + const gchar* name, + const gchar* icon, + const gchar* tooltip) +{ SidebarGrouping * self = NULL; - const gchar* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; + gchar* _tmp2_; #line 15 "/home/jens/Source/shotwell/src/sidebar/common.vala" g_return_val_if_fail (name != NULL, NULL); #line 15 "/home/jens/Source/shotwell/src/sidebar/common.vala" self = (SidebarGrouping*) g_object_new (object_type, NULL); #line 16 "/home/jens/Source/shotwell/src/sidebar/common.vala" - _tmp0_ = name; -#line 16 "/home/jens/Source/shotwell/src/sidebar/common.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (name); #line 16 "/home/jens/Source/shotwell/src/sidebar/common.vala" _g_free0 (self->priv->name); #line 16 "/home/jens/Source/shotwell/src/sidebar/common.vala" - self->priv->name = _tmp1_; + self->priv->name = _tmp0_; #line 17 "/home/jens/Source/shotwell/src/sidebar/common.vala" - _tmp2_ = icon; -#line 17 "/home/jens/Source/shotwell/src/sidebar/common.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (icon); #line 17 "/home/jens/Source/shotwell/src/sidebar/common.vala" _g_free0 (self->priv->icon); #line 17 "/home/jens/Source/shotwell/src/sidebar/common.vala" - self->priv->icon = _tmp3_; -#line 18 "/home/jens/Source/shotwell/src/sidebar/common.vala" - _tmp4_ = tooltip; + self->priv->icon = _tmp1_; #line 18 "/home/jens/Source/shotwell/src/sidebar/common.vala" - _tmp5_ = g_strdup (_tmp4_); + _tmp2_ = g_strdup (tooltip); #line 18 "/home/jens/Source/shotwell/src/sidebar/common.vala" _g_free0 (self->priv->tooltip); #line 18 "/home/jens/Source/shotwell/src/sidebar/common.vala" - self->priv->tooltip = _tmp5_; + self->priv->tooltip = _tmp2_; #line 15 "/home/jens/Source/shotwell/src/sidebar/common.vala" return self; -#line 391 "common.c" +#line 420 "common.c" } -SidebarGrouping* sidebar_grouping_new (const gchar* name, const gchar* icon, const gchar* tooltip) { +SidebarGrouping* +sidebar_grouping_new (const gchar* name, + const gchar* icon, + const gchar* tooltip) +{ #line 15 "/home/jens/Source/shotwell/src/sidebar/common.vala" return sidebar_grouping_construct (SIDEBAR_TYPE_GROUPING, name, icon, tooltip); -#line 398 "common.c" +#line 431 "common.c" } -static void sidebar_grouping_real_rename (SidebarRenameableEntry* base, const gchar* name) { +static void +sidebar_grouping_real_rename (SidebarRenameableEntry* base, + const gchar* name) +{ SidebarGrouping * self; - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp0_; #line 21 "/home/jens/Source/shotwell/src/sidebar/common.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_GROUPING, SidebarGrouping); #line 21 "/home/jens/Source/shotwell/src/sidebar/common.vala" g_return_if_fail (name != NULL); #line 22 "/home/jens/Source/shotwell/src/sidebar/common.vala" - _tmp0_ = name; -#line 22 "/home/jens/Source/shotwell/src/sidebar/common.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (name); #line 22 "/home/jens/Source/shotwell/src/sidebar/common.vala" _g_free0 (self->priv->name); #line 22 "/home/jens/Source/shotwell/src/sidebar/common.vala" - self->priv->name = _tmp1_; -#line 23 "/home/jens/Source/shotwell/src/sidebar/common.vala" - _tmp2_ = name; + self->priv->name = _tmp0_; #line 23 "/home/jens/Source/shotwell/src/sidebar/common.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry), "sidebar-name-changed", _tmp2_); -#line 423 "common.c" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry), "sidebar-name-changed", name); +#line 453 "common.c" } -static gboolean sidebar_grouping_real_is_user_renameable (SidebarRenameableEntry* base) { +static gboolean +sidebar_grouping_real_is_user_renameable (SidebarRenameableEntry* base) +{ SidebarGrouping * self; gboolean result = FALSE; #line 26 "/home/jens/Source/shotwell/src/sidebar/common.vala" @@ -432,11 +464,13 @@ static gboolean sidebar_grouping_real_is_user_renameable (SidebarRenameableEntry result = FALSE; #line 27 "/home/jens/Source/shotwell/src/sidebar/common.vala" return result; -#line 436 "common.c" +#line 468 "common.c" } -static gchar* sidebar_grouping_real_get_sidebar_name (SidebarEntry* base) { +static gchar* +sidebar_grouping_real_get_sidebar_name (SidebarEntry* base) +{ SidebarGrouping * self; gchar* result = NULL; const gchar* _tmp0_; @@ -451,11 +485,13 @@ static gchar* sidebar_grouping_real_get_sidebar_name (SidebarEntry* base) { result = _tmp1_; #line 31 "/home/jens/Source/shotwell/src/sidebar/common.vala" return result; -#line 455 "common.c" +#line 489 "common.c" } -static gchar* sidebar_grouping_real_get_sidebar_tooltip (SidebarEntry* base) { +static gchar* +sidebar_grouping_real_get_sidebar_tooltip (SidebarEntry* base) +{ SidebarGrouping * self; gchar* result = NULL; const gchar* _tmp0_; @@ -470,11 +506,13 @@ static gchar* sidebar_grouping_real_get_sidebar_tooltip (SidebarEntry* base) { result = _tmp1_; #line 35 "/home/jens/Source/shotwell/src/sidebar/common.vala" return result; -#line 474 "common.c" +#line 510 "common.c" } -static gchar* sidebar_grouping_real_get_sidebar_icon (SidebarEntry* base) { +static gchar* +sidebar_grouping_real_get_sidebar_icon (SidebarEntry* base) +{ SidebarGrouping * self; gchar* result = NULL; const gchar* _tmp0_; @@ -489,11 +527,13 @@ static gchar* sidebar_grouping_real_get_sidebar_icon (SidebarEntry* base) { result = _tmp1_; #line 39 "/home/jens/Source/shotwell/src/sidebar/common.vala" return result; -#line 493 "common.c" +#line 531 "common.c" } -static gchar* sidebar_grouping_real_to_string (SidebarEntry* base) { +static gchar* +sidebar_grouping_real_to_string (SidebarEntry* base) +{ SidebarGrouping * self; gchar* result = NULL; const gchar* _tmp0_; @@ -508,11 +548,13 @@ static gchar* sidebar_grouping_real_to_string (SidebarEntry* base) { result = _tmp1_; #line 43 "/home/jens/Source/shotwell/src/sidebar/common.vala" return result; -#line 512 "common.c" +#line 552 "common.c" } -static gboolean sidebar_grouping_real_expand_on_select (SidebarExpandableEntry* base) { +static gboolean +sidebar_grouping_real_expand_on_select (SidebarExpandableEntry* base) +{ SidebarGrouping * self; gboolean result = FALSE; #line 46 "/home/jens/Source/shotwell/src/sidebar/common.vala" @@ -521,22 +563,26 @@ static gboolean sidebar_grouping_real_expand_on_select (SidebarExpandableEntry* result = TRUE; #line 47 "/home/jens/Source/shotwell/src/sidebar/common.vala" return result; -#line 525 "common.c" +#line 567 "common.c" } -static void sidebar_grouping_class_init (SidebarGroupingClass * klass) { +static void +sidebar_grouping_class_init (SidebarGroupingClass * klass) +{ #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala" sidebar_grouping_parent_class = g_type_class_peek_parent (klass); #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala" g_type_class_add_private (klass, sizeof (SidebarGroupingPrivate)); #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala" G_OBJECT_CLASS (klass)->finalize = sidebar_grouping_finalize; -#line 536 "common.c" +#line 580 "common.c" } -static void sidebar_grouping_sidebar_entry_interface_init (SidebarEntryIface * iface) { +static void +sidebar_grouping_sidebar_entry_interface_init (SidebarEntryIface * iface) +{ #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala" sidebar_grouping_sidebar_entry_parent_iface = g_type_interface_peek_parent (iface); #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala" @@ -547,38 +593,46 @@ static void sidebar_grouping_sidebar_entry_interface_init (SidebarEntryIface * i iface->get_sidebar_icon = (gchar* (*) (SidebarEntry *)) sidebar_grouping_real_get_sidebar_icon; #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala" iface->to_string = (gchar* (*) (SidebarEntry *)) sidebar_grouping_real_to_string; -#line 551 "common.c" +#line 597 "common.c" } -static void sidebar_grouping_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) { +static void +sidebar_grouping_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) +{ #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala" sidebar_grouping_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala" iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) sidebar_grouping_real_expand_on_select; -#line 560 "common.c" +#line 608 "common.c" } -static void sidebar_grouping_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) { +static void +sidebar_grouping_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) +{ #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala" sidebar_grouping_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala" iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) sidebar_grouping_real_rename; #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala" iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) sidebar_grouping_real_is_user_renameable; -#line 571 "common.c" +#line 621 "common.c" } -static void sidebar_grouping_instance_init (SidebarGrouping * self) { +static void +sidebar_grouping_instance_init (SidebarGrouping * self) +{ #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala" self->priv = SIDEBAR_GROUPING_GET_PRIVATE (self); -#line 578 "common.c" +#line 630 "common.c" } -static void sidebar_grouping_finalize (GObject * obj) { +static void +sidebar_grouping_finalize (GObject * obj) +{ SidebarGrouping * self; #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_GROUPING, SidebarGrouping); @@ -590,11 +644,13 @@ static void sidebar_grouping_finalize (GObject * obj) { _g_free0 (self->priv->icon); #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala" G_OBJECT_CLASS (sidebar_grouping_parent_class)->finalize (obj); -#line 594 "common.c" +#line 648 "common.c" } -GType sidebar_grouping_get_type (void) { +GType +sidebar_grouping_get_type (void) +{ static volatile gsize sidebar_grouping_type_id__volatile = 0; if (g_once_init_enter (&sidebar_grouping_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SidebarGroupingClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sidebar_grouping_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SidebarGrouping), 0, (GInstanceInitFunc) sidebar_grouping_instance_init, NULL }; @@ -612,35 +668,43 @@ GType sidebar_grouping_get_type (void) { } -SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type) { +SidebarSimplePageEntry* +sidebar_simple_page_entry_construct (GType object_type) +{ SidebarSimplePageEntry * self = NULL; #line 58 "/home/jens/Source/shotwell/src/sidebar/common.vala" self = (SidebarSimplePageEntry*) g_object_new (object_type, NULL); #line 58 "/home/jens/Source/shotwell/src/sidebar/common.vala" return self; -#line 622 "common.c" +#line 680 "common.c" } -static gchar* sidebar_simple_page_entry_real_get_sidebar_name (SidebarSimplePageEntry* self) { +static gchar* +sidebar_simple_page_entry_real_get_sidebar_name (SidebarSimplePageEntry* self) +{ #line 61 "/home/jens/Source/shotwell/src/sidebar/common.vala" g_critical ("Type `%s' does not implement abstract method `sidebar_simple_page_entry_get_sidebar_name'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 61 "/home/jens/Source/shotwell/src/sidebar/common.vala" return NULL; -#line 631 "common.c" +#line 691 "common.c" } -gchar* sidebar_simple_page_entry_get_sidebar_name (SidebarSimplePageEntry* self) { +gchar* +sidebar_simple_page_entry_get_sidebar_name (SidebarSimplePageEntry* self) +{ #line 61 "/home/jens/Source/shotwell/src/sidebar/common.vala" g_return_val_if_fail (SIDEBAR_IS_SIMPLE_PAGE_ENTRY (self), NULL); #line 61 "/home/jens/Source/shotwell/src/sidebar/common.vala" return SIDEBAR_SIMPLE_PAGE_ENTRY_GET_CLASS (self)->get_sidebar_name (self); -#line 640 "common.c" +#line 702 "common.c" } -static gchar* sidebar_simple_page_entry_real_get_sidebar_tooltip (SidebarSimplePageEntry* self) { +static gchar* +sidebar_simple_page_entry_real_get_sidebar_tooltip (SidebarSimplePageEntry* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 64 "/home/jens/Source/shotwell/src/sidebar/common.vala" @@ -649,38 +713,46 @@ static gchar* sidebar_simple_page_entry_real_get_sidebar_tooltip (SidebarSimpleP result = _tmp0_; #line 64 "/home/jens/Source/shotwell/src/sidebar/common.vala" return result; -#line 653 "common.c" +#line 717 "common.c" } -gchar* sidebar_simple_page_entry_get_sidebar_tooltip (SidebarSimplePageEntry* self) { +gchar* +sidebar_simple_page_entry_get_sidebar_tooltip (SidebarSimplePageEntry* self) +{ #line 63 "/home/jens/Source/shotwell/src/sidebar/common.vala" g_return_val_if_fail (SIDEBAR_IS_SIMPLE_PAGE_ENTRY (self), NULL); #line 63 "/home/jens/Source/shotwell/src/sidebar/common.vala" return SIDEBAR_SIMPLE_PAGE_ENTRY_GET_CLASS (self)->get_sidebar_tooltip (self); -#line 662 "common.c" +#line 728 "common.c" } -static gchar* sidebar_simple_page_entry_real_get_sidebar_icon (SidebarSimplePageEntry* self) { +static gchar* +sidebar_simple_page_entry_real_get_sidebar_icon (SidebarSimplePageEntry* self) +{ #line 67 "/home/jens/Source/shotwell/src/sidebar/common.vala" g_critical ("Type `%s' does not implement abstract method `sidebar_simple_page_entry_get_sidebar_icon'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 67 "/home/jens/Source/shotwell/src/sidebar/common.vala" return NULL; -#line 671 "common.c" +#line 739 "common.c" } -gchar* sidebar_simple_page_entry_get_sidebar_icon (SidebarSimplePageEntry* self) { +gchar* +sidebar_simple_page_entry_get_sidebar_icon (SidebarSimplePageEntry* self) +{ #line 67 "/home/jens/Source/shotwell/src/sidebar/common.vala" g_return_val_if_fail (SIDEBAR_IS_SIMPLE_PAGE_ENTRY (self), NULL); #line 67 "/home/jens/Source/shotwell/src/sidebar/common.vala" return SIDEBAR_SIMPLE_PAGE_ENTRY_GET_CLASS (self)->get_sidebar_icon (self); -#line 680 "common.c" +#line 750 "common.c" } -static gchar* sidebar_simple_page_entry_real_to_string (SidebarSimplePageEntry* self) { +static gchar* +sidebar_simple_page_entry_real_to_string (SidebarSimplePageEntry* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 70 "/home/jens/Source/shotwell/src/sidebar/common.vala" @@ -689,38 +761,46 @@ static gchar* sidebar_simple_page_entry_real_to_string (SidebarSimplePageEntry* result = _tmp0_; #line 70 "/home/jens/Source/shotwell/src/sidebar/common.vala" return result; -#line 693 "common.c" +#line 765 "common.c" } -gchar* sidebar_simple_page_entry_to_string (SidebarSimplePageEntry* self) { +gchar* +sidebar_simple_page_entry_to_string (SidebarSimplePageEntry* self) +{ #line 69 "/home/jens/Source/shotwell/src/sidebar/common.vala" g_return_val_if_fail (SIDEBAR_IS_SIMPLE_PAGE_ENTRY (self), NULL); #line 69 "/home/jens/Source/shotwell/src/sidebar/common.vala" return SIDEBAR_SIMPLE_PAGE_ENTRY_GET_CLASS (self)->to_string (self); -#line 702 "common.c" +#line 776 "common.c" } -static Page* sidebar_simple_page_entry_real_create_page (SidebarSimplePageEntry* self) { +static Page* +sidebar_simple_page_entry_real_create_page (SidebarSimplePageEntry* self) +{ #line 73 "/home/jens/Source/shotwell/src/sidebar/common.vala" g_critical ("Type `%s' does not implement abstract method `sidebar_simple_page_entry_create_page'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 73 "/home/jens/Source/shotwell/src/sidebar/common.vala" return NULL; -#line 711 "common.c" +#line 787 "common.c" } -Page* sidebar_simple_page_entry_create_page (SidebarSimplePageEntry* self) { +Page* +sidebar_simple_page_entry_create_page (SidebarSimplePageEntry* self) +{ #line 73 "/home/jens/Source/shotwell/src/sidebar/common.vala" g_return_val_if_fail (SIDEBAR_IS_SIMPLE_PAGE_ENTRY (self), NULL); #line 73 "/home/jens/Source/shotwell/src/sidebar/common.vala" return SIDEBAR_SIMPLE_PAGE_ENTRY_GET_CLASS (self)->create_page (self); -#line 720 "common.c" +#line 798 "common.c" } -static gboolean sidebar_simple_page_entry_real_has_page (SidebarPageRepresentative* base) { +static gboolean +sidebar_simple_page_entry_real_has_page (SidebarPageRepresentative* base) +{ SidebarSimplePageEntry * self; gboolean result = FALSE; Page* _tmp0_; @@ -732,18 +812,22 @@ static gboolean sidebar_simple_page_entry_real_has_page (SidebarPageRepresentati result = _tmp0_ != NULL; #line 76 "/home/jens/Source/shotwell/src/sidebar/common.vala" return result; -#line 736 "common.c" +#line 816 "common.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 85 "/home/jens/Source/shotwell/src/sidebar/common.vala" return self ? g_object_ref (self) : NULL; -#line 743 "common.c" +#line 825 "common.c" } -static Page* sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative* base) { +static Page* +sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative* base) +{ SidebarSimplePageEntry * self; Page* result = NULL; Page* _tmp0_; @@ -755,7 +839,7 @@ static Page* sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative* _tmp0_ = self->priv->page; #line 80 "/home/jens/Source/shotwell/src/sidebar/common.vala" if (_tmp0_ == NULL) { -#line 759 "common.c" +#line 843 "common.c" Page* _tmp1_; Page* _tmp2_; #line 81 "/home/jens/Source/shotwell/src/sidebar/common.vala" @@ -768,7 +852,7 @@ static Page* sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative* _tmp2_ = self->priv->page; #line 82 "/home/jens/Source/shotwell/src/sidebar/common.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative), "page-created", _tmp2_); -#line 772 "common.c" +#line 856 "common.c" } #line 85 "/home/jens/Source/shotwell/src/sidebar/common.vala" _tmp3_ = self->priv->page; @@ -778,11 +862,14 @@ static Page* sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative* result = _tmp4_; #line 85 "/home/jens/Source/shotwell/src/sidebar/common.vala" return result; -#line 782 "common.c" +#line 866 "common.c" } -static void sidebar_simple_page_entry_real_pruned (SidebarEntry* base, SidebarTree* tree) { +static void +sidebar_simple_page_entry_real_pruned (SidebarEntry* base, + SidebarTree* tree) +{ SidebarSimplePageEntry * self; Page* _tmp0_; Page* _tmp1_; @@ -797,7 +884,7 @@ static void sidebar_simple_page_entry_real_pruned (SidebarEntry* base, SidebarTr if (_tmp0_ == NULL) { #line 90 "/home/jens/Source/shotwell/src/sidebar/common.vala" return; -#line 801 "common.c" +#line 888 "common.c" } #line 92 "/home/jens/Source/shotwell/src/sidebar/common.vala" _tmp1_ = self->priv->page; @@ -811,11 +898,14 @@ static void sidebar_simple_page_entry_real_pruned (SidebarEntry* base, SidebarTr _g_object_unref0 (self->priv->page); #line 94 "/home/jens/Source/shotwell/src/sidebar/common.vala" self->priv->page = NULL; -#line 815 "common.c" +#line 902 "common.c" } -static GtkMenu* sidebar_simple_page_entry_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event) { +static GtkMenu* +sidebar_simple_page_entry_real_get_sidebar_context_menu (SidebarContextable* base, + GdkEventButton* event) +{ SidebarSimplePageEntry * self; GtkMenu* result = NULL; Page* _tmp0_; @@ -838,11 +928,13 @@ static GtkMenu* sidebar_simple_page_entry_real_get_sidebar_context_menu (Sidebar result = _tmp3_; #line 98 "/home/jens/Source/shotwell/src/sidebar/common.vala" return result; -#line 842 "common.c" +#line 932 "common.c" } -static void sidebar_simple_page_entry_class_init (SidebarSimplePageEntryClass * klass) { +static void +sidebar_simple_page_entry_class_init (SidebarSimplePageEntryClass * klass) +{ #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" sidebar_simple_page_entry_parent_class = g_type_class_peek_parent (klass); #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" @@ -859,11 +951,13 @@ static void sidebar_simple_page_entry_class_init (SidebarSimplePageEntryClass * ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) sidebar_simple_page_entry_real_create_page; #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" G_OBJECT_CLASS (klass)->finalize = sidebar_simple_page_entry_finalize; -#line 863 "common.c" +#line 955 "common.c" } -static void sidebar_simple_page_entry_sidebar_entry_interface_init (SidebarEntryIface * iface) { +static void +sidebar_simple_page_entry_sidebar_entry_interface_init (SidebarEntryIface * iface) +{ #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" sidebar_simple_page_entry_sidebar_entry_parent_iface = g_type_interface_peek_parent (iface); #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" @@ -876,47 +970,57 @@ static void sidebar_simple_page_entry_sidebar_entry_interface_init (SidebarEntry iface->to_string = (gchar* (*) (SidebarEntry *)) sidebar_simple_page_entry_to_string; #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" iface->pruned = (void (*) (SidebarEntry *, SidebarTree*)) sidebar_simple_page_entry_real_pruned; -#line 880 "common.c" +#line 974 "common.c" } -static void sidebar_simple_page_entry_sidebar_selectable_entry_interface_init (SidebarSelectableEntryIface * iface) { +static void +sidebar_simple_page_entry_sidebar_selectable_entry_interface_init (SidebarSelectableEntryIface * iface) +{ #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" sidebar_simple_page_entry_sidebar_selectable_entry_parent_iface = g_type_interface_peek_parent (iface); -#line 887 "common.c" +#line 983 "common.c" } -static void sidebar_simple_page_entry_sidebar_page_representative_interface_init (SidebarPageRepresentativeIface * iface) { +static void +sidebar_simple_page_entry_sidebar_page_representative_interface_init (SidebarPageRepresentativeIface * iface) +{ #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" sidebar_simple_page_entry_sidebar_page_representative_parent_iface = g_type_interface_peek_parent (iface); #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" iface->has_page = (gboolean (*) (SidebarPageRepresentative *)) sidebar_simple_page_entry_real_has_page; #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" iface->get_page = (Page* (*) (SidebarPageRepresentative *)) sidebar_simple_page_entry_real_get_page; -#line 898 "common.c" +#line 996 "common.c" } -static void sidebar_simple_page_entry_sidebar_contextable_interface_init (SidebarContextableIface * iface) { +static void +sidebar_simple_page_entry_sidebar_contextable_interface_init (SidebarContextableIface * iface) +{ #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" sidebar_simple_page_entry_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface); #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" iface->get_sidebar_context_menu = (GtkMenu* (*) (SidebarContextable *, GdkEventButton*)) sidebar_simple_page_entry_real_get_sidebar_context_menu; -#line 907 "common.c" +#line 1007 "common.c" } -static void sidebar_simple_page_entry_instance_init (SidebarSimplePageEntry * self) { +static void +sidebar_simple_page_entry_instance_init (SidebarSimplePageEntry * self) +{ #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" self->priv = SIDEBAR_SIMPLE_PAGE_ENTRY_GET_PRIVATE (self); #line 56 "/home/jens/Source/shotwell/src/sidebar/common.vala" self->priv->page = NULL; -#line 916 "common.c" +#line 1018 "common.c" } -static void sidebar_simple_page_entry_finalize (GObject * obj) { +static void +sidebar_simple_page_entry_finalize (GObject * obj) +{ SidebarSimplePageEntry * self; #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry); @@ -924,11 +1028,13 @@ static void sidebar_simple_page_entry_finalize (GObject * obj) { _g_object_unref0 (self->priv->page); #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" G_OBJECT_CLASS (sidebar_simple_page_entry_parent_class)->finalize (obj); -#line 928 "common.c" +#line 1032 "common.c" } -GType sidebar_simple_page_entry_get_type (void) { +GType +sidebar_simple_page_entry_get_type (void) +{ static volatile gsize sidebar_simple_page_entry_type_id__volatile = 0; if (g_once_init_enter (&sidebar_simple_page_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SidebarSimplePageEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sidebar_simple_page_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SidebarSimplePageEntry), 0, (GInstanceInitFunc) sidebar_simple_page_entry_instance_init, NULL }; @@ -948,80 +1054,88 @@ GType sidebar_simple_page_entry_get_type (void) { } -static gint _sidebar_root_only_branch_null_comparator_gcompare_func (gconstpointer a, gconstpointer b) { +static gint +_sidebar_root_only_branch_null_comparator_gcompare_func (gconstpointer a, + gconstpointer b) +{ gint result; result = sidebar_root_only_branch_null_comparator ((SidebarEntry*) a, (SidebarEntry*) b); #line 105 "/home/jens/Source/shotwell/src/sidebar/common.vala" return result; -#line 957 "common.c" +#line 1066 "common.c" } -SidebarRootOnlyBranch* sidebar_root_only_branch_construct (GType object_type, SidebarEntry* root) { +SidebarRootOnlyBranch* +sidebar_root_only_branch_construct (GType object_type, + SidebarEntry* root) +{ SidebarRootOnlyBranch * self = NULL; - SidebarEntry* _tmp0_; #line 104 "/home/jens/Source/shotwell/src/sidebar/common.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (root), NULL); #line 105 "/home/jens/Source/shotwell/src/sidebar/common.vala" - _tmp0_ = root; -#line 105 "/home/jens/Source/shotwell/src/sidebar/common.vala" - self = (SidebarRootOnlyBranch*) sidebar_branch_construct (object_type, _tmp0_, SIDEBAR_BRANCH_OPTIONS_NONE, _sidebar_root_only_branch_null_comparator_gcompare_func, NULL); + self = (SidebarRootOnlyBranch*) sidebar_branch_construct (object_type, root, SIDEBAR_BRANCH_OPTIONS_NONE, _sidebar_root_only_branch_null_comparator_gcompare_func, NULL); #line 104 "/home/jens/Source/shotwell/src/sidebar/common.vala" return self; -#line 972 "common.c" +#line 1081 "common.c" } -SidebarRootOnlyBranch* sidebar_root_only_branch_new (SidebarEntry* root) { +SidebarRootOnlyBranch* +sidebar_root_only_branch_new (SidebarEntry* root) +{ #line 104 "/home/jens/Source/shotwell/src/sidebar/common.vala" return sidebar_root_only_branch_construct (SIDEBAR_TYPE_ROOT_ONLY_BRANCH, root); -#line 979 "common.c" +#line 1090 "common.c" } -static gint sidebar_root_only_branch_null_comparator (SidebarEntry* a, SidebarEntry* b) { +static gint +sidebar_root_only_branch_null_comparator (SidebarEntry* a, + SidebarEntry* b) +{ gint result = 0; gint _tmp0_ = 0; - SidebarEntry* _tmp1_; - SidebarEntry* _tmp2_; #line 108 "/home/jens/Source/shotwell/src/sidebar/common.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 108 "/home/jens/Source/shotwell/src/sidebar/common.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0); #line 109 "/home/jens/Source/shotwell/src/sidebar/common.vala" - _tmp1_ = a; -#line 109 "/home/jens/Source/shotwell/src/sidebar/common.vala" - _tmp2_ = b; -#line 109 "/home/jens/Source/shotwell/src/sidebar/common.vala" - if (_tmp1_ != _tmp2_) { + if (a != b) { #line 109 "/home/jens/Source/shotwell/src/sidebar/common.vala" _tmp0_ = -1; -#line 1000 "common.c" +#line 1108 "common.c" } else { #line 109 "/home/jens/Source/shotwell/src/sidebar/common.vala" _tmp0_ = 0; -#line 1004 "common.c" +#line 1112 "common.c" } #line 109 "/home/jens/Source/shotwell/src/sidebar/common.vala" result = _tmp0_; #line 109 "/home/jens/Source/shotwell/src/sidebar/common.vala" return result; -#line 1010 "common.c" +#line 1118 "common.c" } -static void sidebar_root_only_branch_class_init (SidebarRootOnlyBranchClass * klass) { +static void +sidebar_root_only_branch_class_init (SidebarRootOnlyBranchClass * klass) +{ #line 103 "/home/jens/Source/shotwell/src/sidebar/common.vala" sidebar_root_only_branch_parent_class = g_type_class_peek_parent (klass); -#line 1017 "common.c" +#line 1127 "common.c" } -static void sidebar_root_only_branch_instance_init (SidebarRootOnlyBranch * self) { +static void +sidebar_root_only_branch_instance_init (SidebarRootOnlyBranch * self) +{ } -GType sidebar_root_only_branch_get_type (void) { +GType +sidebar_root_only_branch_get_type (void) +{ static volatile gsize sidebar_root_only_branch_type_id__volatile = 0; if (g_once_init_enter (&sidebar_root_only_branch_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SidebarRootOnlyBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sidebar_root_only_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SidebarRootOnlyBranch), 0, (GInstanceInitFunc) sidebar_root_only_branch_instance_init, NULL }; @@ -1033,37 +1147,39 @@ GType sidebar_root_only_branch_get_type (void) { } -SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized) { +SidebarHeader* +sidebar_header_construct (GType object_type, + const gchar* name, + const gchar* tooltip, + gboolean emphasized) +{ SidebarHeader * self = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; #line 123 "/home/jens/Source/shotwell/src/sidebar/common.vala" g_return_val_if_fail (name != NULL, NULL); #line 124 "/home/jens/Source/shotwell/src/sidebar/common.vala" - _tmp0_ = name; -#line 124 "/home/jens/Source/shotwell/src/sidebar/common.vala" - _tmp1_ = tooltip; -#line 124 "/home/jens/Source/shotwell/src/sidebar/common.vala" - self = (SidebarHeader*) sidebar_grouping_construct (object_type, _tmp0_, NULL, _tmp1_); + self = (SidebarHeader*) sidebar_grouping_construct (object_type, name, NULL, tooltip); #line 125 "/home/jens/Source/shotwell/src/sidebar/common.vala" - _tmp2_ = emphasized; -#line 125 "/home/jens/Source/shotwell/src/sidebar/common.vala" - self->priv->emphasized = _tmp2_; + self->priv->emphasized = emphasized; #line 123 "/home/jens/Source/shotwell/src/sidebar/common.vala" return self; -#line 1056 "common.c" +#line 1166 "common.c" } -SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized) { +SidebarHeader* +sidebar_header_new (const gchar* name, + const gchar* tooltip, + gboolean emphasized) +{ #line 123 "/home/jens/Source/shotwell/src/sidebar/common.vala" return sidebar_header_construct (SIDEBAR_TYPE_HEADER, name, tooltip, emphasized); -#line 1063 "common.c" +#line 1177 "common.c" } -static gboolean sidebar_header_real_is_emphasized (SidebarEmphasizableEntry* base) { +static gboolean +sidebar_header_real_is_emphasized (SidebarEmphasizableEntry* base) +{ SidebarHeader * self; gboolean result = FALSE; gboolean _tmp0_; @@ -1075,44 +1191,52 @@ static gboolean sidebar_header_real_is_emphasized (SidebarEmphasizableEntry* bas result = _tmp0_; #line 129 "/home/jens/Source/shotwell/src/sidebar/common.vala" return result; -#line 1079 "common.c" +#line 1195 "common.c" } -static void sidebar_header_class_init (SidebarHeaderClass * klass) { +static void +sidebar_header_class_init (SidebarHeaderClass * klass) +{ #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala" sidebar_header_parent_class = g_type_class_peek_parent (klass); #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala" g_type_class_add_private (klass, sizeof (SidebarHeaderPrivate)); #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala" G_OBJECT_CLASS (klass)->finalize = sidebar_header_finalize; -#line 1090 "common.c" +#line 1208 "common.c" } -static void sidebar_header_sidebar_emphasizable_entry_interface_init (SidebarEmphasizableEntryIface * iface) { +static void +sidebar_header_sidebar_emphasizable_entry_interface_init (SidebarEmphasizableEntryIface * iface) +{ #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala" sidebar_header_sidebar_emphasizable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala" iface->is_emphasized = (gboolean (*) (SidebarEmphasizableEntry *)) sidebar_header_real_is_emphasized; -#line 1099 "common.c" +#line 1219 "common.c" } -static void sidebar_header_instance_init (SidebarHeader * self) { +static void +sidebar_header_instance_init (SidebarHeader * self) +{ #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala" self->priv = SIDEBAR_HEADER_GET_PRIVATE (self); -#line 1106 "common.c" +#line 1228 "common.c" } -static void sidebar_header_finalize (GObject * obj) { +static void +sidebar_header_finalize (GObject * obj) +{ SidebarHeader * self; #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_HEADER, SidebarHeader); #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala" G_OBJECT_CLASS (sidebar_header_parent_class)->finalize (obj); -#line 1116 "common.c" +#line 1240 "common.c" } @@ -1123,7 +1247,9 @@ static void sidebar_header_finalize (GObject * obj) { * using a custom cell_data_function (@see Sidebar.Tree::icon_renderer_function) which ensures that * header icons won't be rendered. This approach avoids the blank icon spacing issues. */ -GType sidebar_header_get_type (void) { +GType +sidebar_header_get_type (void) +{ static volatile gsize sidebar_header_type_id__volatile = 0; if (g_once_init_enter (&sidebar_header_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SidebarHeaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sidebar_header_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SidebarHeader), 0, (GInstanceInitFunc) sidebar_header_instance_init, NULL }; @@ -1137,28 +1263,35 @@ GType sidebar_header_get_type (void) { } -GtkMenu* sidebar_contextable_get_sidebar_context_menu (SidebarContextable* self, GdkEventButton* event) { +GtkMenu* +sidebar_contextable_get_sidebar_context_menu (SidebarContextable* self, + GdkEventButton* event) +{ #line 135 "/home/jens/Source/shotwell/src/sidebar/common.vala" g_return_val_if_fail (SIDEBAR_IS_CONTEXTABLE (self), NULL); #line 135 "/home/jens/Source/shotwell/src/sidebar/common.vala" return SIDEBAR_CONTEXTABLE_GET_INTERFACE (self)->get_sidebar_context_menu (self, event); -#line 1146 "common.c" +#line 1275 "common.c" } -static void sidebar_contextable_base_init (SidebarContextableIface * iface) { +static void +sidebar_contextable_base_init (SidebarContextableIface * iface) +{ #line 133 "/home/jens/Source/shotwell/src/sidebar/common.vala" static gboolean initialized = FALSE; #line 133 "/home/jens/Source/shotwell/src/sidebar/common.vala" if (!initialized) { #line 133 "/home/jens/Source/shotwell/src/sidebar/common.vala" initialized = TRUE; -#line 1157 "common.c" +#line 1288 "common.c" } } -GType sidebar_contextable_get_type (void) { +GType +sidebar_contextable_get_type (void) +{ static volatile gsize sidebar_contextable_type_id__volatile = 0; if (g_once_init_enter (&sidebar_contextable_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SidebarContextableIface), (GBaseInitFunc) sidebar_contextable_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; diff --git a/src/slideshow/Slideshow.c b/src/slideshow/Slideshow.c index c4a2082..63e0bda 100644 --- a/src/slideshow/Slideshow.c +++ b/src/slideshow/Slideshow.c @@ -1,4 +1,4 @@ -/* Slideshow.c generated by valac 0.36.6, the Vala compiler +/* Slideshow.c generated by valac 0.40.4, the Vala compiler * generated from Slideshow.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -18,196 +19,286 @@ void slideshow_init (GError** error); -static void _vala_array_add36 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add37 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add38 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add39 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add40 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add41 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add42 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add43 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add44 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add45 (gchar** * array, int* length, int* size, gchar* value); -void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1); +static void _vala_array_add36 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add37 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add38 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add39 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add40 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add41 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add42 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add43 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add44 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add45 (gchar** * array, + int* length, + int* size, + gchar* value); +void plugins_register_extension_point (GType type, + const gchar* name, + const gchar* icon_name, + gchar** core_ids, + int core_ids_length1); #define RESOURCES_ICON_SLIDESHOW_EXTENSION_POINT "slideshow-extension-point" void transition_effects_manager_init (void); void slideshow_terminate (void); void transition_effects_manager_terminate (void); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -static void _vala_array_add36 (gchar** * array, int* length, int* size, gchar* value) { +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); + + +static void +_vala_array_add36 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 11 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" if ((*length) == (*size)) { #line 11 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" *size = (*size) ? (2 * (*size)) : 4; #line 11 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 48 "Slideshow.c" +#line 92 "Slideshow.c" } #line 11 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" (*array)[(*length)++] = value; #line 11 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" (*array)[*length] = NULL; -#line 54 "Slideshow.c" +#line 98 "Slideshow.c" } -static void _vala_array_add37 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add37 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 12 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" if ((*length) == (*size)) { #line 12 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" *size = (*size) ? (2 * (*size)) : 4; #line 12 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 65 "Slideshow.c" +#line 114 "Slideshow.c" } #line 12 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" (*array)[(*length)++] = value; #line 12 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" (*array)[*length] = NULL; -#line 71 "Slideshow.c" +#line 120 "Slideshow.c" } -static void _vala_array_add38 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add38 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 13 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" if ((*length) == (*size)) { #line 13 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" *size = (*size) ? (2 * (*size)) : 4; #line 13 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 82 "Slideshow.c" +#line 136 "Slideshow.c" } #line 13 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" (*array)[(*length)++] = value; #line 13 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" (*array)[*length] = NULL; -#line 88 "Slideshow.c" +#line 142 "Slideshow.c" } -static void _vala_array_add39 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add39 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 14 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" if ((*length) == (*size)) { #line 14 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" *size = (*size) ? (2 * (*size)) : 4; #line 14 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 99 "Slideshow.c" +#line 158 "Slideshow.c" } #line 14 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" (*array)[(*length)++] = value; #line 14 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" (*array)[*length] = NULL; -#line 105 "Slideshow.c" +#line 164 "Slideshow.c" } -static void _vala_array_add40 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add40 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 15 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" if ((*length) == (*size)) { #line 15 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" *size = (*size) ? (2 * (*size)) : 4; #line 15 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 116 "Slideshow.c" +#line 180 "Slideshow.c" } #line 15 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" (*array)[(*length)++] = value; #line 15 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" (*array)[*length] = NULL; -#line 122 "Slideshow.c" +#line 186 "Slideshow.c" } -static void _vala_array_add41 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add41 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 16 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" if ((*length) == (*size)) { #line 16 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" *size = (*size) ? (2 * (*size)) : 4; #line 16 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 133 "Slideshow.c" +#line 202 "Slideshow.c" } #line 16 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" (*array)[(*length)++] = value; #line 16 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" (*array)[*length] = NULL; -#line 139 "Slideshow.c" +#line 208 "Slideshow.c" } -static void _vala_array_add42 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add42 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 17 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" if ((*length) == (*size)) { #line 17 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" *size = (*size) ? (2 * (*size)) : 4; #line 17 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 150 "Slideshow.c" +#line 224 "Slideshow.c" } #line 17 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" (*array)[(*length)++] = value; #line 17 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" (*array)[*length] = NULL; -#line 156 "Slideshow.c" +#line 230 "Slideshow.c" } -static void _vala_array_add43 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add43 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 18 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" if ((*length) == (*size)) { #line 18 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" *size = (*size) ? (2 * (*size)) : 4; #line 18 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 167 "Slideshow.c" +#line 246 "Slideshow.c" } #line 18 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" (*array)[(*length)++] = value; #line 18 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" (*array)[*length] = NULL; -#line 173 "Slideshow.c" +#line 252 "Slideshow.c" } -static void _vala_array_add44 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add44 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 19 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" if ((*length) == (*size)) { #line 19 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" *size = (*size) ? (2 * (*size)) : 4; #line 19 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 184 "Slideshow.c" +#line 268 "Slideshow.c" } #line 19 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" (*array)[(*length)++] = value; #line 19 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" (*array)[*length] = NULL; -#line 190 "Slideshow.c" +#line 274 "Slideshow.c" } -static void _vala_array_add45 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add45 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 20 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" if ((*length) == (*size)) { #line 20 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" *size = (*size) ? (2 * (*size)) : 4; #line 20 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 201 "Slideshow.c" +#line 290 "Slideshow.c" } #line 20 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" (*array)[(*length)++] = value; #line 20 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" (*array)[*length] = NULL; -#line 207 "Slideshow.c" +#line 296 "Slideshow.c" } -void slideshow_init (GError** error) { +void +slideshow_init (GError** error) +{ gchar** core_ids = NULL; gchar** _tmp0_; gint core_ids_length1; @@ -342,18 +433,24 @@ void slideshow_init (GError** error) { transition_effects_manager_init (); #line 9 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" core_ids = (_vala_array_free (core_ids, core_ids_length1, (GDestroyNotify) g_free), NULL); -#line 346 "Slideshow.c" +#line 437 "Slideshow.c" } -void slideshow_terminate (void) { +void +slideshow_terminate (void) +{ #line 28 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" transition_effects_manager_terminate (); -#line 353 "Slideshow.c" +#line 446 "Slideshow.c" } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -365,7 +462,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/slideshow/TransitionEffects.c b/src/slideshow/TransitionEffects.c index fc72cc9..b19b640 100644 --- a/src/slideshow/TransitionEffects.c +++ b/src/slideshow/TransitionEffects.c @@ -1,4 +1,4 @@ -/* TransitionEffects.c generated by valac 0.36.6, the Vala compiler +/* TransitionEffects.c generated by valac 0.40.4, the Vala compiler * generated from TransitionEffects.vala, do not modify */ /* Copyright 2010 Maxim Kartashev @@ -8,6 +8,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -101,6 +102,11 @@ typedef struct _PluginsStandardHostInterface PluginsStandardHostInterface; typedef struct _PluginsStandardHostInterfaceClass PluginsStandardHostInterfaceClass; typedef struct _ParamSpecTransitionClock ParamSpecTransitionClock; typedef struct _NullTransitionDescriptorPrivate NullTransitionDescriptorPrivate; +enum { + NULL_TRANSITION_DESCRIPTOR_0_PROPERTY, + NULL_TRANSITION_DESCRIPTOR_NUM_PROPERTIES +}; +static GParamSpec* null_transition_descriptor_properties[NULL_TRANSITION_DESCRIPTOR_NUM_PROPERTIES]; #define TYPE_NULL_EFFECT (null_effect_get_type ()) #define NULL_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NULL_EFFECT, NullEffect)) @@ -112,7 +118,17 @@ typedef struct _NullTransitionDescriptorPrivate NullTransitionDescriptorPrivate; typedef struct _NullEffect NullEffect; typedef struct _NullEffectClass NullEffectClass; typedef struct _NullEffectPrivate NullEffectPrivate; +enum { + NULL_EFFECT_0_PROPERTY, + NULL_EFFECT_NUM_PROPERTIES +}; +static GParamSpec* null_effect_properties[NULL_EFFECT_NUM_PROPERTIES]; typedef struct _RandomEffectDescriptorPrivate RandomEffectDescriptorPrivate; +enum { + RANDOM_EFFECT_DESCRIPTOR_0_PROPERTY, + RANDOM_EFFECT_DESCRIPTOR_NUM_PROPERTIES +}; +static GParamSpec* random_effect_descriptor_properties[RANDOM_EFFECT_DESCRIPTOR_NUM_PROPERTIES]; #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; } @@ -215,25 +231,37 @@ static SpitTransitionsDescriptorIface * random_effect_descriptor_spit_transition gpointer transition_effects_manager_ref (gpointer instance); void transition_effects_manager_unref (gpointer instance); -GParamSpec* param_spec_transition_effects_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_transition_effects_manager (GValue* value, gpointer v_object); -void value_take_transition_effects_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_transition_effects_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_transition_effects_manager (GValue* value, + gpointer v_object); +void value_take_transition_effects_manager (GValue* value, + gpointer v_object); gpointer value_get_transition_effects_manager (const GValue* value); GType transition_effects_manager_get_type (void) G_GNUC_CONST; #define TRANSITION_EFFECTS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TRANSITION_EFFECTS_MANAGER, TransitionEffectsManagerPrivate)) -enum { - TRANSITION_EFFECTS_MANAGER_DUMMY_PROPERTY -}; gpointer plugins_notifier_ref (gpointer instance); void plugins_notifier_unref (gpointer instance); -GParamSpec* plugins_param_spec_notifier (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void plugins_value_set_notifier (GValue* value, gpointer v_object); -void plugins_value_take_notifier (GValue* value, gpointer v_object); +GParamSpec* plugins_param_spec_notifier (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void plugins_value_set_notifier (GValue* value, + gpointer v_object); +void plugins_value_take_notifier (GValue* value, + gpointer v_object); gpointer plugins_value_get_notifier (const GValue* value); GType plugins_notifier_get_type (void) G_GNUC_CONST; PluginsNotifier* plugins_notifier_get_instance (void); static void transition_effects_manager_load_transitions (TransitionEffectsManager* self); -static void _transition_effects_manager_load_transitions_plugins_notifier_pluggable_activation (PluginsNotifier* _sender, SpitPluggable* pluggable, gboolean enabled, gpointer self); +static void _transition_effects_manager_load_transitions_plugins_notifier_pluggable_activation (PluginsNotifier* _sender, + SpitPluggable* pluggable, + gboolean enabled, + gpointer self); NullTransitionDescriptor* null_transition_descriptor_new (void); NullTransitionDescriptor* null_transition_descriptor_construct (GType object_type); GType null_transition_descriptor_get_type (void) G_GNUC_CONST; @@ -246,99 +274,153 @@ GType random_effect_descriptor_get_type (void) G_GNUC_CONST; #define TRANSITION_EFFECTS_MANAGER_RANDOM_EFFECT_ID RANDOM_EFFECT_DESCRIPTOR_EFFECT_ID static TransitionEffectsManager* transition_effects_manager_new (void); static TransitionEffectsManager* transition_effects_manager_construct (GType object_type); -GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled); +GeeCollection* plugins_get_pluggables_for_type (GType type, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify, + gboolean include_disabled); gchar* plugins_get_pluggable_module_id (SpitPluggable* needle); void transition_effects_manager_init (void); void transition_effects_manager_terminate (void); TransitionEffectsManager* transition_effects_manager_get_instance (void); GeeCollection* transition_effects_manager_get_effect_ids (TransitionEffectsManager* self); -GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsManager* self, GCompareDataFunc comparator, void* comparator_target, GDestroyNotify comparator_target_destroy_notify); -gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManager* self, const gchar* effect_name); -SpitTransitionsDescriptor* transition_effects_manager_get_effect_descriptor (TransitionEffectsManager* self, const gchar* effect_id); -gchar* transition_effects_manager_get_effect_name (TransitionEffectsManager* self, const gchar* effect_id); +GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsManager* self, + GCompareDataFunc comparator, + void* comparator_target, + GDestroyNotify comparator_target_destroy_notify); +gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManager* self, + const gchar* effect_name); +SpitTransitionsDescriptor* transition_effects_manager_get_effect_descriptor (TransitionEffectsManager* self, + const gchar* effect_id); +gchar* transition_effects_manager_get_effect_name (TransitionEffectsManager* self, + const gchar* effect_id); SpitTransitionsDescriptor* transition_effects_manager_get_null_descriptor (TransitionEffectsManager* self); gpointer transition_clock_ref (gpointer instance); void transition_clock_unref (gpointer instance); -GParamSpec* param_spec_transition_clock (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_transition_clock (GValue* value, gpointer v_object); -void value_take_transition_clock (GValue* value, gpointer v_object); +GParamSpec* param_spec_transition_clock (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_transition_clock (GValue* value, + gpointer v_object); +void value_take_transition_clock (GValue* value, + gpointer v_object); gpointer value_get_transition_clock (const GValue* value); GType transition_clock_get_type (void) G_GNUC_CONST; -TransitionClock* transition_effects_manager_create_transition_clock (TransitionEffectsManager* self, const gchar* effect_id); +TransitionClock* transition_effects_manager_create_transition_clock (TransitionEffectsManager* self, + const gchar* effect_id); TransitionClock* transition_clock_new (SpitTransitionsDescriptor* desc); -TransitionClock* transition_clock_construct (GType object_type, SpitTransitionsDescriptor* desc); +TransitionClock* transition_clock_construct (GType object_type, + SpitTransitionsDescriptor* desc); TransitionClock* transition_effects_manager_create_null_transition_clock (TransitionEffectsManager* self); static void transition_effects_manager_finalize (TransitionEffectsManager * obj); gpointer op_timer_ref (gpointer instance); void op_timer_unref (gpointer instance); -GParamSpec* param_spec_op_timer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_op_timer (GValue* value, gpointer v_object); -void value_take_op_timer (GValue* value, gpointer v_object); +GParamSpec* param_spec_op_timer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_op_timer (GValue* value, + gpointer v_object); +void value_take_op_timer (GValue* value, + gpointer v_object); gpointer value_get_op_timer (const GValue* value); GType op_timer_get_type (void) G_GNUC_CONST; #define TRANSITION_CLOCK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TRANSITION_CLOCK, TransitionClockPrivate)) -enum { - TRANSITION_CLOCK_DUMMY_PROPERTY -}; static void transition_clock_cancel_timer (TransitionClock* self); gchar* op_timer_to_string (OpTimer* self); -PluginsStandardHostInterface* plugins_standard_host_interface_new (SpitPluggable* pluggable, const gchar* config_domain); -PluginsStandardHostInterface* plugins_standard_host_interface_construct (GType object_type, SpitPluggable* pluggable, const gchar* config_domain); +PluginsStandardHostInterface* plugins_standard_host_interface_new (SpitPluggable* pluggable, + const gchar* config_domain); +PluginsStandardHostInterface* plugins_standard_host_interface_construct (GType object_type, + SpitPluggable* pluggable, + const gchar* config_domain); GType plugins_standard_host_interface_get_type (void) G_GNUC_CONST; OpTimer* op_timer_new (const gchar* name); -OpTimer* op_timer_construct (GType object_type, const gchar* name); +OpTimer* op_timer_construct (GType object_type, + const gchar* name); gboolean transition_clock_is_in_progress (TransitionClock* self); -void transition_clock_start (TransitionClock* self, SpitTransitionsVisuals* visuals, SpitTransitionsDirection direction, gint duration_msec, TransitionClockRepaintCallback repaint, void* repaint_target); +void transition_clock_start (TransitionClock* self, + SpitTransitionsVisuals* visuals, + SpitTransitionsDirection direction, + gint duration_msec, + TransitionClockRepaintCallback repaint, + void* repaint_target); static void transition_clock_reset (TransitionClock* self); gulong now_ms (void); static gboolean transition_clock_tick (TransitionClock* self); static gboolean _transition_clock_tick_gsource_func (gpointer self); static gboolean transition_clock_is_fps_ok (TransitionClock* self); void transition_clock_cancel (TransitionClock* self); -gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width, gint height); +gboolean transition_clock_paint (TransitionClock* self, + cairo_t* ctx, + gint width, + gint height); void op_timer_start (OpTimer* self); void op_timer_stop (OpTimer* self); static void transition_clock_finalize (TransitionClock * obj); -enum { - NULL_TRANSITION_DESCRIPTOR_DUMMY_PROPERTY -}; -static gint null_transition_descriptor_real_get_pluggable_interface (SpitPluggable* base, gint min_host_version, gint max_host_version); +static gint null_transition_descriptor_real_get_pluggable_interface (SpitPluggable* base, + gint min_host_version, + gint max_host_version); static const gchar* null_transition_descriptor_real_get_id (SpitPluggable* base); static const gchar* null_transition_descriptor_real_get_pluggable_name (SpitPluggable* base); -static void null_transition_descriptor_real_get_info (SpitPluggable* base, SpitPluggableInfo* info); -static void null_transition_descriptor_real_activation (SpitPluggable* base, gboolean enabled); -static SpitTransitionsEffect* null_transition_descriptor_real_create (SpitTransitionsDescriptor* base, SpitHostInterface* host); +static void null_transition_descriptor_real_get_info (SpitPluggable* base, + SpitPluggableInfo* info); +static void null_transition_descriptor_real_activation (SpitPluggable* base, + gboolean enabled); +static SpitTransitionsEffect* null_transition_descriptor_real_create (SpitTransitionsDescriptor* base, + SpitHostInterface* host); NullEffect* null_effect_new (void); NullEffect* null_effect_construct (GType object_type); GType null_effect_get_type (void) G_GNUC_CONST; -enum { - NULL_EFFECT_DUMMY_PROPERTY -}; -static void null_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps); -static void null_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion); +static void null_effect_real_get_fps (SpitTransitionsEffect* base, + gint* desired_fps, + gint* min_fps); +static void null_effect_real_start (SpitTransitionsEffect* base, + SpitTransitionsVisuals* visuals, + SpitTransitionsMotion* motion); static gboolean null_effect_real_needs_clear_background (SpitTransitionsEffect* base); -static void null_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number); -static void null_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number); +static void null_effect_real_paint (SpitTransitionsEffect* base, + SpitTransitionsVisuals* visuals, + SpitTransitionsMotion* motion, + cairo_t* ctx, + gint width, + gint height, + gint frame_number); +static void null_effect_real_advance (SpitTransitionsEffect* base, + SpitTransitionsVisuals* visuals, + SpitTransitionsMotion* motion, + gint frame_number); static void null_effect_real_cancel (SpitTransitionsEffect* base); -enum { - RANDOM_EFFECT_DESCRIPTOR_DUMMY_PROPERTY -}; -static gint random_effect_descriptor_real_get_pluggable_interface (SpitPluggable* base, gint min_host_version, gint max_host_version); +static gint random_effect_descriptor_real_get_pluggable_interface (SpitPluggable* base, + gint min_host_version, + gint max_host_version); static const gchar* random_effect_descriptor_real_get_id (SpitPluggable* base); static const gchar* random_effect_descriptor_real_get_pluggable_name (SpitPluggable* base); -static void random_effect_descriptor_real_get_info (SpitPluggable* base, SpitPluggableInfo* info); -static void random_effect_descriptor_real_activation (SpitPluggable* base, gboolean enabled); -static SpitTransitionsEffect* random_effect_descriptor_real_create (SpitTransitionsDescriptor* base, SpitHostInterface* host); - - -static void _transition_effects_manager_load_transitions_plugins_notifier_pluggable_activation (PluginsNotifier* _sender, SpitPluggable* pluggable, gboolean enabled, gpointer self) { +static void random_effect_descriptor_real_get_info (SpitPluggable* base, + SpitPluggableInfo* info); +static void random_effect_descriptor_real_activation (SpitPluggable* base, + gboolean enabled); +static SpitTransitionsEffect* random_effect_descriptor_real_create (SpitTransitionsDescriptor* base, + SpitHostInterface* host); + + +static void +_transition_effects_manager_load_transitions_plugins_notifier_pluggable_activation (PluginsNotifier* _sender, + SpitPluggable* pluggable, + gboolean enabled, + gpointer self) +{ #line 25 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_effects_manager_load_transitions ((TransitionEffectsManager*) self); -#line 338 "TransitionEffects.c" +#line 418 "TransitionEffects.c" } -static TransitionEffectsManager* transition_effects_manager_construct (GType object_type) { +static TransitionEffectsManager* +transition_effects_manager_construct (GType object_type) +{ TransitionEffectsManager* self = NULL; PluginsNotifier* _tmp0_; PluginsNotifier* _tmp1_; @@ -356,25 +438,31 @@ static TransitionEffectsManager* transition_effects_manager_construct (GType obj _plugins_notifier_unref0 (_tmp1_); #line 19 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return self; -#line 360 "TransitionEffects.c" +#line 442 "TransitionEffects.c" } -static TransitionEffectsManager* transition_effects_manager_new (void) { +static TransitionEffectsManager* +transition_effects_manager_new (void) +{ #line 19 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return transition_effects_manager_construct (TYPE_TRANSITION_EFFECTS_MANAGER); -#line 367 "TransitionEffects.c" +#line 451 "TransitionEffects.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 48 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return self ? g_object_ref (self) : NULL; -#line 374 "TransitionEffects.c" +#line 460 "TransitionEffects.c" } -static void transition_effects_manager_load_transitions (TransitionEffectsManager* self) { +static void +transition_effects_manager_load_transitions (TransitionEffectsManager* self) +{ GeeMap* _tmp0_; GeeMap* _tmp1_; SpitTransitionsDescriptor* _tmp2_; @@ -416,7 +504,7 @@ static void transition_effects_manager_load_transitions (TransitionEffectsManage _tmp9_ = plugins_get_pluggables_for_type (SPIT_TRANSITIONS_TYPE_DESCRIPTOR, NULL, NULL, NULL, FALSE); #line 36 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" pluggables = _tmp9_; -#line 420 "TransitionEffects.c" +#line 508 "TransitionEffects.c" { GeeIterator* _pluggable_it = NULL; GeeCollection* _tmp10_; @@ -429,134 +517,127 @@ static void transition_effects_manager_load_transitions (TransitionEffectsManage _pluggable_it = _tmp11_; #line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" while (TRUE) { -#line 433 "TransitionEffects.c" +#line 521 "TransitionEffects.c" GeeIterator* _tmp12_; - gboolean _tmp13_; SpitPluggable* pluggable = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; + GeeIterator* _tmp13_; + gpointer _tmp14_; gint pluggable_interface = 0; - SpitPluggable* _tmp16_; - gint _tmp17_; - gint _tmp18_; + SpitPluggable* _tmp15_; + gint _tmp16_; SpitTransitionsDescriptor* desc = NULL; - SpitPluggable* _tmp23_; + SpitPluggable* _tmp21_; + SpitTransitionsDescriptor* _tmp22_; + GeeMap* _tmp23_; SpitTransitionsDescriptor* _tmp24_; - GeeMap* _tmp25_; - SpitTransitionsDescriptor* _tmp26_; - const gchar* _tmp27_; - gboolean _tmp28_; + const gchar* _tmp25_; #line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp12_ = _pluggable_it; #line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp13_ = gee_iterator_next (_tmp12_); -#line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp12_)) { #line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" break; -#line 458 "TransitionEffects.c" +#line 541 "TransitionEffects.c" } #line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp14_ = _pluggable_it; + _tmp13_ = _pluggable_it; #line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp14_ = gee_iterator_get (_tmp13_); #line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - pluggable = (SpitPluggable*) _tmp15_; -#line 39 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp16_ = pluggable; + pluggable = (SpitPluggable*) _tmp14_; #line 39 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp17_ = spit_pluggable_get_pluggable_interface (_tmp16_, SPIT_TRANSITIONS_CURRENT_INTERFACE, SPIT_TRANSITIONS_CURRENT_INTERFACE); + _tmp15_ = pluggable; #line 39 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - pluggable_interface = _tmp17_; + pluggable_interface = spit_pluggable_get_pluggable_interface (_tmp15_, SPIT_TRANSITIONS_CURRENT_INTERFACE, SPIT_TRANSITIONS_CURRENT_INTERFACE); #line 41 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp18_ = pluggable_interface; + _tmp16_ = pluggable_interface; #line 41 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - if (_tmp18_ != SPIT_TRANSITIONS_CURRENT_INTERFACE) { -#line 476 "TransitionEffects.c" - SpitPluggable* _tmp19_; - gchar* _tmp20_; - gchar* _tmp21_; - gint _tmp22_; + if (_tmp16_ != SPIT_TRANSITIONS_CURRENT_INTERFACE) { +#line 557 "TransitionEffects.c" + SpitPluggable* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + gint _tmp20_; #line 42 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp19_ = pluggable; + _tmp17_ = pluggable; #line 42 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp20_ = plugins_get_pluggable_module_id (_tmp19_); + _tmp18_ = plugins_get_pluggable_module_id (_tmp17_); #line 42 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp21_ = _tmp20_; + _tmp19_ = _tmp18_; #line 42 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp22_ = pluggable_interface; + _tmp20_ = pluggable_interface; #line 42 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_warning ("TransitionEffects.vala:42: Unable to load transitions plug-in %s: repo" \ -"rted interface %d", _tmp21_, _tmp22_); +"rted interface %d", _tmp19_, _tmp20_); #line 42 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _g_free0 (_tmp21_); + _g_free0 (_tmp19_); #line 45 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (pluggable); #line 45 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" continue; -#line 497 "TransitionEffects.c" +#line 578 "TransitionEffects.c" } #line 48 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp23_ = pluggable; + _tmp21_ = pluggable; #line 48 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SPIT_TRANSITIONS_TYPE_DESCRIPTOR, SpitTransitionsDescriptor)); + _tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, SPIT_TRANSITIONS_TYPE_DESCRIPTOR, SpitTransitionsDescriptor)); #line 48 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - desc = _tmp24_; + desc = _tmp22_; #line 49 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp25_ = self->priv->effects; + _tmp23_ = self->priv->effects; #line 49 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp26_ = desc; + _tmp24_ = desc; #line 49 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp27_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp25_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 49 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp28_ = gee_map_has_key (_tmp25_, _tmp27_); -#line 49 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - if (_tmp28_) { -#line 515 "TransitionEffects.c" - SpitTransitionsDescriptor* _tmp29_; - const gchar* _tmp30_; + if (gee_map_has_key (_tmp23_, _tmp25_)) { +#line 594 "TransitionEffects.c" + SpitTransitionsDescriptor* _tmp26_; + const gchar* _tmp27_; #line 50 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp29_ = desc; + _tmp26_ = desc; #line 50 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp30_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp27_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 50 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_warning ("TransitionEffects.vala:50: Multiple transitions loaded with same effec" \ -"t ID %s", _tmp30_); -#line 524 "TransitionEffects.c" +"t ID %s", _tmp27_); +#line 603 "TransitionEffects.c" } else { - GeeMap* _tmp31_; - SpitTransitionsDescriptor* _tmp32_; - const gchar* _tmp33_; - SpitTransitionsDescriptor* _tmp34_; + GeeMap* _tmp28_; + SpitTransitionsDescriptor* _tmp29_; + const gchar* _tmp30_; + SpitTransitionsDescriptor* _tmp31_; #line 52 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp31_ = self->priv->effects; + _tmp28_ = self->priv->effects; #line 52 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp32_ = desc; + _tmp29_ = desc; #line 52 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp33_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp30_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 52 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp34_ = desc; + _tmp31_ = desc; #line 52 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - gee_map_set (_tmp31_, _tmp33_, _tmp34_); -#line 540 "TransitionEffects.c" + gee_map_set (_tmp28_, _tmp30_, _tmp31_); +#line 619 "TransitionEffects.c" } #line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (desc); #line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (pluggable); -#line 546 "TransitionEffects.c" +#line 625 "TransitionEffects.c" } #line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (_pluggable_it); -#line 550 "TransitionEffects.c" +#line 629 "TransitionEffects.c" } #line 28 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (pluggables); -#line 554 "TransitionEffects.c" +#line 633 "TransitionEffects.c" } -void transition_effects_manager_init (void) { +void +transition_effects_manager_init (void) +{ TransitionEffectsManager* _tmp0_; #line 57 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp0_ = transition_effects_manager_new (); @@ -564,27 +645,33 @@ void transition_effects_manager_init (void) { _transition_effects_manager_unref0 (transition_effects_manager_instance); #line 57 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_effects_manager_instance = _tmp0_; -#line 566 "TransitionEffects.c" +#line 647 "TransitionEffects.c" } -void transition_effects_manager_terminate (void) { +void +transition_effects_manager_terminate (void) +{ #line 61 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _transition_effects_manager_unref0 (transition_effects_manager_instance); #line 61 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_effects_manager_instance = NULL; -#line 575 "TransitionEffects.c" +#line 658 "TransitionEffects.c" } -static gpointer _transition_effects_manager_ref0 (gpointer self) { +static gpointer +_transition_effects_manager_ref0 (gpointer self) +{ #line 67 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return self ? transition_effects_manager_ref (self) : NULL; -#line 582 "TransitionEffects.c" +#line 667 "TransitionEffects.c" } -TransitionEffectsManager* transition_effects_manager_get_instance (void) { +TransitionEffectsManager* +transition_effects_manager_get_instance (void) +{ TransitionEffectsManager* result = NULL; TransitionEffectsManager* _tmp0_; TransitionEffectsManager* _tmp1_; @@ -601,11 +688,13 @@ TransitionEffectsManager* transition_effects_manager_get_instance (void) { result = _tmp2_; #line 67 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 603 "TransitionEffects.c" +#line 690 "TransitionEffects.c" } -GeeCollection* transition_effects_manager_get_effect_ids (TransitionEffectsManager* self) { +GeeCollection* +transition_effects_manager_get_effect_ids (TransitionEffectsManager* self) +{ GeeCollection* result = NULL; GeeMap* _tmp0_; GeeSet* _tmp1_; @@ -622,11 +711,16 @@ GeeCollection* transition_effects_manager_get_effect_ids (TransitionEffectsManag result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 71 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 624 "TransitionEffects.c" +#line 713 "TransitionEffects.c" } -GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsManager* self, GCompareDataFunc comparator, void* comparator_target, GDestroyNotify comparator_target_destroy_notify) { +GeeCollection* +transition_effects_manager_get_effect_names (TransitionEffectsManager* self, + GCompareDataFunc comparator, + void* comparator_target, + GDestroyNotify comparator_target_destroy_notify) +{ GeeCollection* result = NULL; GeeCollection* effect_names = NULL; GCompareDataFunc _tmp0_; @@ -651,7 +745,7 @@ GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsMan _tmp1_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, _tmp0_, _tmp0__target, _tmp0__target_destroy_notify); #line 75 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" effect_names = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); -#line 653 "TransitionEffects.c" +#line 747 "TransitionEffects.c" { GeeIterator* _desc_it = NULL; GeeMap* _tmp2_; @@ -678,46 +772,43 @@ GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsMan _desc_it = _tmp7_; #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" while (TRUE) { -#line 680 "TransitionEffects.c" +#line 774 "TransitionEffects.c" GeeIterator* _tmp8_; - gboolean _tmp9_; SpitTransitionsDescriptor* desc = NULL; - GeeIterator* _tmp10_; - gpointer _tmp11_; - GeeCollection* _tmp12_; - SpitTransitionsDescriptor* _tmp13_; - const gchar* _tmp14_; + GeeIterator* _tmp9_; + gpointer _tmp10_; + GeeCollection* _tmp11_; + SpitTransitionsDescriptor* _tmp12_; + const gchar* _tmp13_; #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp8_ = _desc_it; #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp9_ = gee_iterator_next (_tmp8_); -#line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - if (!_tmp9_) { + if (!gee_iterator_next (_tmp8_)) { #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" break; -#line 697 "TransitionEffects.c" +#line 788 "TransitionEffects.c" } #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp10_ = _desc_it; + _tmp9_ = _desc_it; #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp11_ = gee_iterator_get (_tmp10_); + _tmp10_ = gee_iterator_get (_tmp9_); #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - desc = (SpitTransitionsDescriptor*) _tmp11_; + desc = (SpitTransitionsDescriptor*) _tmp10_; #line 77 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp12_ = effect_names; + _tmp11_ = effect_names; #line 77 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp13_ = desc; + _tmp12_ = desc; #line 77 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp14_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp13_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 77 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - gee_collection_add (_tmp12_, _tmp14_); + gee_collection_add (_tmp11_, _tmp13_); #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (desc); -#line 715 "TransitionEffects.c" +#line 806 "TransitionEffects.c" } #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (_desc_it); -#line 719 "TransitionEffects.c" +#line 810 "TransitionEffects.c" } #line 79 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" result = effect_names; @@ -731,17 +822,20 @@ GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsMan comparator_target_destroy_notify = NULL; #line 79 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 733 "TransitionEffects.c" +#line 824 "TransitionEffects.c" } -gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManager* self, const gchar* effect_name) { +gchar* +transition_effects_manager_get_id_for_effect_name (TransitionEffectsManager* self, + const gchar* effect_name) +{ gchar* result = NULL; #line 82 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self), NULL); #line 82 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (effect_name != NULL, NULL); -#line 743 "TransitionEffects.c" +#line 837 "TransitionEffects.c" { GeeIterator* _desc_it = NULL; GeeMap* _tmp0_; @@ -768,80 +862,76 @@ gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManag _desc_it = _tmp5_; #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" while (TRUE) { -#line 770 "TransitionEffects.c" +#line 864 "TransitionEffects.c" GeeIterator* _tmp6_; - gboolean _tmp7_; SpitTransitionsDescriptor* desc = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - SpitTransitionsDescriptor* _tmp10_; - const gchar* _tmp11_; - const gchar* _tmp12_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + SpitTransitionsDescriptor* _tmp9_; + const gchar* _tmp10_; #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp6_ = _desc_it; #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" break; -#line 787 "TransitionEffects.c" +#line 877 "TransitionEffects.c" } #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp8_ = _desc_it; + _tmp7_ = _desc_it; #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - desc = (SpitTransitionsDescriptor*) _tmp9_; + desc = (SpitTransitionsDescriptor*) _tmp8_; #line 84 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp10_ = desc; + _tmp9_ = desc; #line 84 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp11_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp10_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 84 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp12_ = effect_name; -#line 84 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - if (g_strcmp0 (_tmp11_, _tmp12_) == 0) { -#line 803 "TransitionEffects.c" - SpitTransitionsDescriptor* _tmp13_; - const gchar* _tmp14_; - gchar* _tmp15_; + if (g_strcmp0 (_tmp10_, effect_name) == 0) { +#line 891 "TransitionEffects.c" + SpitTransitionsDescriptor* _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; #line 85 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp13_ = desc; + _tmp11_ = desc; #line 85 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp14_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp12_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 85 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp15_ = g_strdup (_tmp14_); + _tmp13_ = g_strdup (_tmp12_); #line 85 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - result = _tmp15_; + result = _tmp13_; #line 85 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (desc); #line 85 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (_desc_it); #line 85 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 821 "TransitionEffects.c" +#line 909 "TransitionEffects.c" } #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (desc); -#line 825 "TransitionEffects.c" +#line 913 "TransitionEffects.c" } #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (_desc_it); -#line 829 "TransitionEffects.c" +#line 917 "TransitionEffects.c" } #line 88 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" result = NULL; #line 88 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 835 "TransitionEffects.c" +#line 923 "TransitionEffects.c" } -SpitTransitionsDescriptor* transition_effects_manager_get_effect_descriptor (TransitionEffectsManager* self, const gchar* effect_id) { +SpitTransitionsDescriptor* +transition_effects_manager_get_effect_descriptor (TransitionEffectsManager* self, + const gchar* effect_id) +{ SpitTransitionsDescriptor* result = NULL; GeeMap* _tmp0_; - const gchar* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 91 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self), NULL); #line 91 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -849,67 +939,67 @@ SpitTransitionsDescriptor* transition_effects_manager_get_effect_descriptor (Tra #line 92 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp0_ = self->priv->effects; #line 92 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp1_ = effect_id; -#line 92 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp2_ = gee_map_get (_tmp0_, _tmp1_); + _tmp1_ = gee_map_get (_tmp0_, effect_id); #line 92 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - result = (SpitTransitionsDescriptor*) _tmp2_; + result = (SpitTransitionsDescriptor*) _tmp1_; #line 92 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 858 "TransitionEffects.c" +#line 946 "TransitionEffects.c" } -gchar* transition_effects_manager_get_effect_name (TransitionEffectsManager* self, const gchar* effect_id) { +gchar* +transition_effects_manager_get_effect_name (TransitionEffectsManager* self, + const gchar* effect_id) +{ gchar* result = NULL; SpitTransitionsDescriptor* desc = NULL; - const gchar* _tmp0_; - SpitTransitionsDescriptor* _tmp1_; - const gchar* _tmp2_ = NULL; - SpitTransitionsDescriptor* _tmp3_; - gchar* _tmp6_; + SpitTransitionsDescriptor* _tmp0_; + const gchar* _tmp1_ = NULL; + SpitTransitionsDescriptor* _tmp2_; + gchar* _tmp5_; #line 95 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self), NULL); #line 95 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (effect_id != NULL, NULL); #line 96 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp0_ = effect_id; + _tmp0_ = transition_effects_manager_get_effect_descriptor (self, effect_id); #line 96 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp1_ = transition_effects_manager_get_effect_descriptor (self, _tmp0_); -#line 96 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - desc = _tmp1_; + desc = _tmp0_; #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp3_ = desc; + _tmp2_ = desc; #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - if (_tmp3_ != NULL) { -#line 884 "TransitionEffects.c" - SpitTransitionsDescriptor* _tmp4_; - const gchar* _tmp5_; + if (_tmp2_ != NULL) { +#line 972 "TransitionEffects.c" + SpitTransitionsDescriptor* _tmp3_; + const gchar* _tmp4_; #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp4_ = desc; + _tmp3_ = desc; #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp5_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp4_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp2_ = _tmp5_; -#line 893 "TransitionEffects.c" + _tmp1_ = _tmp4_; +#line 981 "TransitionEffects.c" } else { #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp2_ = _ ("(None)"); -#line 897 "TransitionEffects.c" + _tmp1_ = _ ("(None)"); +#line 985 "TransitionEffects.c" } #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp6_ = g_strdup (_tmp2_); + _tmp5_ = g_strdup (_tmp1_); #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - result = _tmp6_; + result = _tmp5_; #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (desc); #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 907 "TransitionEffects.c" +#line 995 "TransitionEffects.c" } -SpitTransitionsDescriptor* transition_effects_manager_get_null_descriptor (TransitionEffectsManager* self) { +SpitTransitionsDescriptor* +transition_effects_manager_get_null_descriptor (TransitionEffectsManager* self) +{ SpitTransitionsDescriptor* result = NULL; SpitTransitionsDescriptor* _tmp0_; SpitTransitionsDescriptor* _tmp1_; @@ -923,61 +1013,63 @@ SpitTransitionsDescriptor* transition_effects_manager_get_null_descriptor (Trans result = _tmp1_; #line 102 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 925 "TransitionEffects.c" +#line 1015 "TransitionEffects.c" } -TransitionClock* transition_effects_manager_create_transition_clock (TransitionEffectsManager* self, const gchar* effect_id) { +TransitionClock* +transition_effects_manager_create_transition_clock (TransitionEffectsManager* self, + const gchar* effect_id) +{ TransitionClock* result = NULL; SpitTransitionsDescriptor* desc = NULL; - const gchar* _tmp0_; - SpitTransitionsDescriptor* _tmp1_; - TransitionClock* _tmp2_ = NULL; - SpitTransitionsDescriptor* _tmp3_; + SpitTransitionsDescriptor* _tmp0_; + TransitionClock* _tmp1_ = NULL; + SpitTransitionsDescriptor* _tmp2_; #line 105 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self), NULL); #line 105 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (effect_id != NULL, NULL); #line 106 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp0_ = effect_id; -#line 106 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp1_ = transition_effects_manager_get_effect_descriptor (self, _tmp0_); + _tmp0_ = transition_effects_manager_get_effect_descriptor (self, effect_id); #line 106 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - desc = _tmp1_; + desc = _tmp0_; #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp3_ = desc; + _tmp2_ = desc; #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - if (_tmp3_ != NULL) { -#line 950 "TransitionEffects.c" - SpitTransitionsDescriptor* _tmp4_; - TransitionClock* _tmp5_; + if (_tmp2_ != NULL) { +#line 1040 "TransitionEffects.c" + SpitTransitionsDescriptor* _tmp3_; + TransitionClock* _tmp4_; #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp4_ = desc; + _tmp3_ = desc; #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp5_ = transition_clock_new (_tmp4_); + _tmp4_ = transition_clock_new (_tmp3_); #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _transition_clock_unref0 (_tmp2_); + _transition_clock_unref0 (_tmp1_); #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp2_ = _tmp5_; -#line 961 "TransitionEffects.c" + _tmp1_ = _tmp4_; +#line 1051 "TransitionEffects.c" } else { #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _transition_clock_unref0 (_tmp2_); + _transition_clock_unref0 (_tmp1_); #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp2_ = NULL; -#line 967 "TransitionEffects.c" + _tmp1_ = NULL; +#line 1057 "TransitionEffects.c" } #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - result = _tmp2_; + result = _tmp1_; #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (desc); #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 975 "TransitionEffects.c" +#line 1065 "TransitionEffects.c" } -TransitionClock* transition_effects_manager_create_null_transition_clock (TransitionEffectsManager* self) { +TransitionClock* +transition_effects_manager_create_null_transition_clock (TransitionEffectsManager* self) +{ TransitionClock* result = NULL; SpitTransitionsDescriptor* _tmp0_; TransitionClock* _tmp1_; @@ -991,108 +1083,133 @@ TransitionClock* transition_effects_manager_create_null_transition_clock (Transi result = _tmp1_; #line 112 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 993 "TransitionEffects.c" +#line 1085 "TransitionEffects.c" } -static void value_transition_effects_manager_init (GValue* value) { +static void +value_transition_effects_manager_init (GValue* value) +{ #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 1000 "TransitionEffects.c" +#line 1094 "TransitionEffects.c" } -static void value_transition_effects_manager_free_value (GValue* value) { +static void +value_transition_effects_manager_free_value (GValue* value) +{ #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (value->data[0].v_pointer) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_effects_manager_unref (value->data[0].v_pointer); -#line 1009 "TransitionEffects.c" +#line 1105 "TransitionEffects.c" } } -static void value_transition_effects_manager_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_transition_effects_manager_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (src_value->data[0].v_pointer) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" dest_value->data[0].v_pointer = transition_effects_manager_ref (src_value->data[0].v_pointer); -#line 1019 "TransitionEffects.c" +#line 1118 "TransitionEffects.c" } else { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" dest_value->data[0].v_pointer = NULL; -#line 1023 "TransitionEffects.c" +#line 1122 "TransitionEffects.c" } } -static gpointer value_transition_effects_manager_peek_pointer (const GValue* value) { +static gpointer +value_transition_effects_manager_peek_pointer (const GValue* value) +{ #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return value->data[0].v_pointer; -#line 1031 "TransitionEffects.c" +#line 1132 "TransitionEffects.c" } -static gchar* value_transition_effects_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_transition_effects_manager_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (collect_values[0].v_pointer) { -#line 1038 "TransitionEffects.c" +#line 1144 "TransitionEffects.c" TransitionEffectsManager * object; object = collect_values[0].v_pointer; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (object->parent_instance.g_class == NULL) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1045 "TransitionEffects.c" +#line 1151 "TransitionEffects.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.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 1049 "TransitionEffects.c" +#line 1155 "TransitionEffects.c" } #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = transition_effects_manager_ref (object); -#line 1053 "TransitionEffects.c" +#line 1159 "TransitionEffects.c" } else { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 1057 "TransitionEffects.c" +#line 1163 "TransitionEffects.c" } #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return NULL; -#line 1061 "TransitionEffects.c" +#line 1167 "TransitionEffects.c" } -static gchar* value_transition_effects_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_transition_effects_manager_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ TransitionEffectsManager ** object_p; object_p = collect_values[0].v_pointer; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (!object_p) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1072 "TransitionEffects.c" +#line 1183 "TransitionEffects.c" } #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (!value->data[0].v_pointer) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *object_p = NULL; -#line 1078 "TransitionEffects.c" +#line 1189 "TransitionEffects.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *object_p = value->data[0].v_pointer; -#line 1082 "TransitionEffects.c" +#line 1193 "TransitionEffects.c" } else { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *object_p = transition_effects_manager_ref (value->data[0].v_pointer); -#line 1086 "TransitionEffects.c" +#line 1197 "TransitionEffects.c" } #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return NULL; -#line 1090 "TransitionEffects.c" +#line 1201 "TransitionEffects.c" } -GParamSpec* param_spec_transition_effects_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_transition_effects_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecTransitionEffectsManager* spec; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_TRANSITION_EFFECTS_MANAGER), NULL); @@ -1102,20 +1219,25 @@ GParamSpec* param_spec_transition_effects_manager (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return G_PARAM_SPEC (spec); -#line 1104 "TransitionEffects.c" +#line 1221 "TransitionEffects.c" } -gpointer value_get_transition_effects_manager (const GValue* value) { +gpointer +value_get_transition_effects_manager (const GValue* value) +{ #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSITION_EFFECTS_MANAGER), NULL); #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return value->data[0].v_pointer; -#line 1113 "TransitionEffects.c" +#line 1232 "TransitionEffects.c" } -void value_set_transition_effects_manager (GValue* value, gpointer v_object) { +void +value_set_transition_effects_manager (GValue* value, + gpointer v_object) +{ TransitionEffectsManager * old; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSITION_EFFECTS_MANAGER)); @@ -1131,22 +1253,25 @@ void value_set_transition_effects_manager (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_effects_manager_ref (value->data[0].v_pointer); -#line 1133 "TransitionEffects.c" +#line 1255 "TransitionEffects.c" } else { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 1137 "TransitionEffects.c" +#line 1259 "TransitionEffects.c" } #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (old) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_effects_manager_unref (old); -#line 1143 "TransitionEffects.c" +#line 1265 "TransitionEffects.c" } } -void value_take_transition_effects_manager (GValue* value, gpointer v_object) { +void +value_take_transition_effects_manager (GValue* value, + gpointer v_object) +{ TransitionEffectsManager * old; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSITION_EFFECTS_MANAGER)); @@ -1160,33 +1285,37 @@ void value_take_transition_effects_manager (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = v_object; -#line 1162 "TransitionEffects.c" +#line 1287 "TransitionEffects.c" } else { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 1166 "TransitionEffects.c" +#line 1291 "TransitionEffects.c" } #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (old) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_effects_manager_unref (old); -#line 1172 "TransitionEffects.c" +#line 1297 "TransitionEffects.c" } } -static void transition_effects_manager_class_init (TransitionEffectsManagerClass * klass) { +static void +transition_effects_manager_class_init (TransitionEffectsManagerClass * klass) +{ #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_effects_manager_parent_class = g_type_class_peek_parent (klass); #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" ((TransitionEffectsManagerClass *) klass)->finalize = transition_effects_manager_finalize; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_type_class_add_private (klass, sizeof (TransitionEffectsManagerPrivate)); -#line 1184 "TransitionEffects.c" +#line 1311 "TransitionEffects.c" } -static void transition_effects_manager_instance_init (TransitionEffectsManager * self) { +static void +transition_effects_manager_instance_init (TransitionEffectsManager * self) +{ GeeHashMap* _tmp0_; NullTransitionDescriptor* _tmp1_; RandomEffectDescriptor* _tmp2_; @@ -1206,11 +1335,13 @@ static void transition_effects_manager_instance_init (TransitionEffectsManager * self->priv->random_descriptor = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TRANSITIONS_TYPE_DESCRIPTOR, SpitTransitionsDescriptor); #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self->ref_count = 1; -#line 1208 "TransitionEffects.c" +#line 1337 "TransitionEffects.c" } -static void transition_effects_manager_finalize (TransitionEffectsManager * obj) { +static void +transition_effects_manager_finalize (TransitionEffectsManager * obj) +{ TransitionEffectsManager * self; PluginsNotifier* _tmp0_; PluginsNotifier* _tmp1_; @@ -1235,11 +1366,13 @@ static void transition_effects_manager_finalize (TransitionEffectsManager * obj) _g_object_unref0 (self->priv->null_descriptor); #line 17 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (self->priv->random_descriptor); -#line 1237 "TransitionEffects.c" +#line 1368 "TransitionEffects.c" } -GType transition_effects_manager_get_type (void) { +GType +transition_effects_manager_get_type (void) +{ static volatile gsize transition_effects_manager_type_id__volatile = 0; if (g_once_init_enter (&transition_effects_manager_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_transition_effects_manager_init, value_transition_effects_manager_free_value, value_transition_effects_manager_copy_value, value_transition_effects_manager_peek_pointer, "p", value_transition_effects_manager_collect_value, "p", value_transition_effects_manager_lcopy_value }; @@ -1253,18 +1386,22 @@ GType transition_effects_manager_get_type (void) { } -gpointer transition_effects_manager_ref (gpointer instance) { +gpointer +transition_effects_manager_ref (gpointer instance) +{ TransitionEffectsManager * self; self = instance; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_atomic_int_inc (&self->ref_count); #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return instance; -#line 1262 "TransitionEffects.c" +#line 1397 "TransitionEffects.c" } -void transition_effects_manager_unref (gpointer instance) { +void +transition_effects_manager_unref (gpointer instance) +{ TransitionEffectsManager * self; self = instance; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1273,86 +1410,81 @@ void transition_effects_manager_unref (gpointer instance) { TRANSITION_EFFECTS_MANAGER_GET_CLASS (self)->finalize (self); #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1275 "TransitionEffects.c" +#line 1412 "TransitionEffects.c" } } -TransitionClock* transition_clock_construct (GType object_type, SpitTransitionsDescriptor* desc) { +TransitionClock* +transition_clock_construct (GType object_type, + SpitTransitionsDescriptor* desc) +{ TransitionClock* self = NULL; SpitTransitionsDescriptor* _tmp0_; - SpitTransitionsDescriptor* _tmp1_; - SpitTransitionsDescriptor* _tmp2_; - SpitTransitionsDescriptor* _tmp3_; - PluginsStandardHostInterface* _tmp4_; - PluginsStandardHostInterface* _tmp5_; - SpitTransitionsEffect* _tmp6_; - SpitTransitionsEffect* _tmp7_; - gint _tmp8_ = 0; - gint _tmp9_ = 0; - SpitTransitionsDescriptor* _tmp10_; - const gchar* _tmp11_; - OpTimer* _tmp12_; + PluginsStandardHostInterface* _tmp1_; + PluginsStandardHostInterface* _tmp2_; + SpitTransitionsEffect* _tmp3_; + SpitTransitionsEffect* _tmp4_; + gint _tmp5_ = 0; + gint _tmp6_ = 0; + const gchar* _tmp7_; + OpTimer* _tmp8_; #line 136 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (desc), NULL); #line 136 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = (TransitionClock*) g_type_create_instance (object_type); #line 137 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp0_ = desc; -#line 137 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (desc); #line 137 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (self->priv->desc); #line 137 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - self->priv->desc = _tmp1_; -#line 139 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp2_ = desc; -#line 139 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp3_ = desc; + self->priv->desc = _tmp0_; #line 139 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp4_ = plugins_standard_host_interface_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable), "transitions"); + _tmp1_ = plugins_standard_host_interface_new (G_TYPE_CHECK_INSTANCE_CAST (desc, SPIT_TYPE_PLUGGABLE, SpitPluggable), "transitions"); #line 139 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 139 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp6_ = spit_transitions_descriptor_create (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface)); + _tmp3_ = spit_transitions_descriptor_create (desc, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface)); #line 139 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (self->priv->effect); #line 139 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - self->priv->effect = _tmp6_; + self->priv->effect = _tmp3_; #line 139 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp2_); #line 140 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp7_ = self->priv->effect; + _tmp4_ = self->priv->effect; #line 140 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - spit_transitions_effect_get_fps (_tmp7_, &_tmp8_, &_tmp9_); + spit_transitions_effect_get_fps (_tmp4_, &_tmp5_, &_tmp6_); #line 140 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - self->priv->desired_fps = _tmp8_; + self->priv->desired_fps = _tmp5_; #line 140 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - self->priv->min_fps = _tmp9_; -#line 142 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp10_ = desc; + self->priv->min_fps = _tmp6_; #line 142 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp11_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp7_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (desc, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 142 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp12_ = op_timer_new (_tmp11_); + _tmp8_ = op_timer_new (_tmp7_); #line 142 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _op_timer_unref0 (self->priv->paint_timer); #line 142 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - self->priv->paint_timer = _tmp12_; + self->priv->paint_timer = _tmp8_; #line 136 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return self; -#line 1343 "TransitionEffects.c" +#line 1471 "TransitionEffects.c" } -TransitionClock* transition_clock_new (SpitTransitionsDescriptor* desc) { +TransitionClock* +transition_clock_new (SpitTransitionsDescriptor* desc) +{ #line 136 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return transition_clock_construct (TYPE_TRANSITION_CLOCK, desc); -#line 1350 "TransitionEffects.c" +#line 1480 "TransitionEffects.c" } -gboolean transition_clock_is_in_progress (TransitionClock* self) { +gboolean +transition_clock_is_in_progress (TransitionClock* self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; @@ -1363,21 +1495,21 @@ gboolean transition_clock_is_in_progress (TransitionClock* self) { _tmp2_ = self->priv->cancelled; #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (!_tmp2_) { -#line 1365 "TransitionEffects.c" +#line 1497 "TransitionEffects.c" SpitTransitionsMotion* _tmp3_; #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp3_ = self->priv->motion; #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp1_ = _tmp3_ != NULL; -#line 1371 "TransitionEffects.c" +#line 1503 "TransitionEffects.c" } else { #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp1_ = FALSE; -#line 1375 "TransitionEffects.c" +#line 1507 "TransitionEffects.c" } #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp1_) { -#line 1379 "TransitionEffects.c" +#line 1511 "TransitionEffects.c" gint _tmp4_; SpitTransitionsMotion* _tmp5_; gint _tmp6_; @@ -1392,47 +1524,48 @@ gboolean transition_clock_is_in_progress (TransitionClock* self) { _tmp7_ = _tmp6_; #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp0_ = _tmp4_ < _tmp7_; -#line 1394 "TransitionEffects.c" +#line 1526 "TransitionEffects.c" } else { #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp0_ = FALSE; -#line 1398 "TransitionEffects.c" +#line 1530 "TransitionEffects.c" } #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" result = _tmp0_; #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1404 "TransitionEffects.c" +#line 1536 "TransitionEffects.c" } -static gboolean _transition_clock_tick_gsource_func (gpointer self) { +static gboolean +_transition_clock_tick_gsource_func (gpointer self) +{ gboolean result; result = transition_clock_tick ((TransitionClock*) self); #line 173 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1413 "TransitionEffects.c" +#line 1547 "TransitionEffects.c" } -void transition_clock_start (TransitionClock* self, SpitTransitionsVisuals* visuals, SpitTransitionsDirection direction, gint duration_msec, TransitionClockRepaintCallback repaint, void* repaint_target) { +void +transition_clock_start (TransitionClock* self, + SpitTransitionsVisuals* visuals, + SpitTransitionsDirection direction, + gint duration_msec, + TransitionClockRepaintCallback repaint, + void* repaint_target) +{ gint _tmp0_; SpitTransitionsVisuals* _tmp1_; - SpitTransitionsVisuals* _tmp2_; - TransitionClockRepaintCallback _tmp3_; - void* _tmp3__target; - SpitTransitionsDirection _tmp4_; - gint _tmp5_; - gint _tmp6_; - SpitTransitionsMotion* _tmp7_; - SpitTransitionsEffect* _tmp8_; - SpitTransitionsVisuals* _tmp9_; - SpitTransitionsMotion* _tmp10_; - gulong _tmp11_; - SpitTransitionsMotion* _tmp12_; - gint _tmp13_; - gint _tmp14_; - guint _tmp15_; + gint _tmp2_; + SpitTransitionsMotion* _tmp3_; + SpitTransitionsEffect* _tmp4_; + SpitTransitionsMotion* _tmp5_; + SpitTransitionsMotion* _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 155 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (IS_TRANSITION_CLOCK (self)); #line 155 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1445,63 +1578,49 @@ void transition_clock_start (TransitionClock* self, SpitTransitionsVisuals* visu if (_tmp0_ == 0) { #line 161 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return; -#line 1447 "TransitionEffects.c" +#line 1580 "TransitionEffects.c" } #line 163 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp1_ = visuals; -#line 163 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (visuals); #line 163 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (self->priv->visuals); #line 163 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - self->priv->visuals = _tmp2_; -#line 164 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp3_ = repaint; -#line 164 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp3__target = repaint_target; + self->priv->visuals = _tmp1_; #line 164 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - self->priv->repaint = _tmp3_; + self->priv->repaint = repaint; #line 164 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - self->priv->repaint_target = _tmp3__target; + self->priv->repaint_target = repaint_target; #line 165 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp4_ = direction; + _tmp2_ = self->priv->desired_fps; #line 165 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp5_ = self->priv->desired_fps; -#line 165 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp6_ = duration_msec; -#line 165 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp7_ = spit_transitions_motion_new (_tmp4_, _tmp5_, _tmp6_); + _tmp3_ = spit_transitions_motion_new (direction, _tmp2_, duration_msec); #line 165 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (self->priv->motion); #line 165 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - self->priv->motion = _tmp7_; + self->priv->motion = _tmp3_; #line 167 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp8_ = self->priv->effect; + _tmp4_ = self->priv->effect; #line 167 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp9_ = visuals; + _tmp5_ = self->priv->motion; #line 167 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp10_ = self->priv->motion; -#line 167 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - spit_transitions_effect_start (_tmp8_, _tmp9_, _tmp10_); -#line 172 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp11_ = now_ms (); + spit_transitions_effect_start (_tmp4_, visuals, _tmp5_); #line 172 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - self->priv->time_started = _tmp11_; + self->priv->time_started = now_ms (); #line 173 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp12_ = self->priv->motion; + _tmp6_ = self->priv->motion; #line 173 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp13_ = spit_transitions_motion_get_tick_msec (_tmp12_); + _tmp7_ = spit_transitions_motion_get_tick_msec (_tmp6_); #line 173 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp14_ = _tmp13_; + _tmp8_ = _tmp7_; #line 173 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp15_ = g_timeout_add_full (G_PRIORITY_HIGH, (guint) _tmp14_, _transition_clock_tick_gsource_func, transition_clock_ref (self), transition_clock_unref); -#line 173 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - self->priv->timer_id = _tmp15_; -#line 1499 "TransitionEffects.c" + self->priv->timer_id = g_timeout_add_full (G_PRIORITY_HIGH, (guint) _tmp8_, _transition_clock_tick_gsource_func, transition_clock_ref (self), transition_clock_unref); +#line 1616 "TransitionEffects.c" } -static void transition_clock_reset (TransitionClock* self) { +static void +transition_clock_reset (TransitionClock* self) +{ #line 177 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (IS_TRANSITION_CLOCK (self)); #line 178 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1526,11 +1645,13 @@ static void transition_clock_reset (TransitionClock* self) { self->priv->current_fps = 0; #line 185 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self->priv->cancelled = FALSE; -#line 1528 "TransitionEffects.c" +#line 1647 "TransitionEffects.c" } -static void transition_clock_cancel_timer (TransitionClock* self) { +static void +transition_clock_cancel_timer (TransitionClock* self) +{ guint _tmp0_; #line 188 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (IS_TRANSITION_CLOCK (self)); @@ -1538,7 +1659,7 @@ static void transition_clock_cancel_timer (TransitionClock* self) { _tmp0_ = self->priv->timer_id; #line 189 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp0_ != ((guint) 0)) { -#line 1540 "TransitionEffects.c" +#line 1661 "TransitionEffects.c" guint _tmp1_; #line 190 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp1_ = self->priv->timer_id; @@ -1546,25 +1667,26 @@ static void transition_clock_cancel_timer (TransitionClock* self) { g_source_remove (_tmp1_); #line 191 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self->priv->timer_id = (guint) 0; -#line 1548 "TransitionEffects.c" +#line 1669 "TransitionEffects.c" } } -static gboolean transition_clock_is_fps_ok (TransitionClock* self) { +static gboolean +transition_clock_is_fps_ok (TransitionClock* self) +{ gboolean result = FALSE; gulong _tmp0_; gint _tmp1_; gdouble elapsed_msec = 0.0; gulong _tmp2_; - gulong _tmp3_; - gdouble _tmp4_; - gint _tmp5_; - gdouble _tmp6_; + gdouble _tmp3_; + gint _tmp4_; + gdouble _tmp5_; + gint _tmp6_; gint _tmp7_; - gint _tmp8_; + gint _tmp12_; gint _tmp13_; - gint _tmp14_; #line 196 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (IS_TRANSITION_CLOCK (self), FALSE); #line 197 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1579,67 +1701,67 @@ static gboolean transition_clock_is_fps_ok (TransitionClock* self) { result = TRUE; #line 200 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1581 "TransitionEffects.c" +#line 1703 "TransitionEffects.c" } #line 202 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp2_ = now_ms (); -#line 202 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp3_ = self->priv->time_started; + _tmp2_ = self->priv->time_started; #line 202 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - elapsed_msec = (gdouble) (_tmp2_ - _tmp3_); + elapsed_msec = (gdouble) (now_ms () - _tmp2_); #line 203 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp4_ = elapsed_msec; + _tmp3_ = elapsed_msec; #line 203 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - if (_tmp4_ <= 0.0) { + if (_tmp3_ <= 0.0) { #line 204 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" result = TRUE; #line 204 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1597 "TransitionEffects.c" +#line 1717 "TransitionEffects.c" } #line 206 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp5_ = self->priv->frame_number; + _tmp4_ = self->priv->frame_number; #line 206 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp6_ = elapsed_msec; + _tmp5_ = elapsed_msec; #line 206 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - self->priv->current_fps = (gint) ((_tmp5_ * 1000.0) / _tmp6_); + self->priv->current_fps = (gint) ((_tmp4_ * 1000.0) / _tmp5_); #line 207 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp7_ = self->priv->current_fps; + _tmp6_ = self->priv->current_fps; #line 207 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp8_ = self->priv->min_fps; + _tmp7_ = self->priv->min_fps; #line 207 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - if (_tmp7_ < _tmp8_) { -#line 1611 "TransitionEffects.c" + if (_tmp6_ < _tmp7_) { +#line 1731 "TransitionEffects.c" + gint _tmp8_; gint _tmp9_; - gint _tmp10_; - gdouble _tmp11_; - gint _tmp12_; + gdouble _tmp10_; + gint _tmp11_; #line 208 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp9_ = self->priv->current_fps; + _tmp8_ = self->priv->current_fps; #line 208 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp10_ = self->priv->min_fps; + _tmp9_ = self->priv->min_fps; #line 208 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp11_ = elapsed_msec; + _tmp10_ = elapsed_msec; #line 208 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp12_ = self->priv->frame_number; + _tmp11_ = self->priv->frame_number; #line 208 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_debug ("TransitionEffects.vala:208: Transition rate of %dfps below minimum of " \ -"%dfps (elapsed=%lf frames=%d)", _tmp9_, _tmp10_, _tmp11_, _tmp12_); -#line 1626 "TransitionEffects.c" +"%dfps (elapsed=%lf frames=%d)", _tmp8_, _tmp9_, _tmp10_, _tmp11_); +#line 1746 "TransitionEffects.c" } #line 212 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp13_ = self->priv->current_fps; + _tmp12_ = self->priv->current_fps; #line 212 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp14_ = self->priv->min_fps; + _tmp13_ = self->priv->min_fps; #line 212 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - result = _tmp13_ >= _tmp14_; + result = _tmp12_ >= _tmp13_; #line 212 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1636 "TransitionEffects.c" +#line 1756 "TransitionEffects.c" } -void transition_clock_cancel (TransitionClock* self) { +void +transition_clock_cancel (TransitionClock* self) +{ SpitTransitionsEffect* _tmp0_; TransitionClockRepaintCallback _tmp1_; void* _tmp1__target; @@ -1659,56 +1781,51 @@ void transition_clock_cancel (TransitionClock* self) { _tmp1__target = self->priv->repaint_target; #line 222 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp1_ (_tmp1__target); -#line 1660 "TransitionEffects.c" +#line 1782 "TransitionEffects.c" } -gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width, gint height) { +gboolean +transition_clock_paint (TransitionClock* self, + cairo_t* ctx, + gint width, + gint height) +{ gboolean result = FALSE; - gboolean _tmp0_; - OpTimer* _tmp1_; - cairo_t* _tmp2_; - SpitTransitionsEffect* _tmp3_; - gboolean _tmp4_; - SpitTransitionsEffect* _tmp26_; - SpitTransitionsVisuals* _tmp27_; - SpitTransitionsMotion* _tmp28_; - cairo_t* _tmp29_; - gint _tmp30_; - gint _tmp31_; - gint _tmp32_; - cairo_t* _tmp33_; - OpTimer* _tmp34_; + OpTimer* _tmp0_; + SpitTransitionsEffect* _tmp1_; + SpitTransitionsEffect* _tmp18_; + SpitTransitionsVisuals* _tmp19_; + SpitTransitionsMotion* _tmp20_; + gint _tmp21_; + OpTimer* _tmp22_; #line 227 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (IS_TRANSITION_CLOCK (self), FALSE); #line 227 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (ctx != NULL, FALSE); #line 228 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp0_ = transition_clock_is_in_progress (self); -#line 228 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - if (!_tmp0_) { + if (!transition_clock_is_in_progress (self)) { #line 229 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" result = FALSE; #line 229 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1692 "TransitionEffects.c" +#line 1810 "TransitionEffects.c" } #line 231 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp1_ = self->priv->paint_timer; + _tmp0_ = self->priv->paint_timer; #line 231 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - op_timer_start (_tmp1_); -#line 233 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp2_ = ctx; + op_timer_start (_tmp0_); #line 233 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - cairo_save (_tmp2_); + cairo_save (ctx); #line 235 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp3_ = self->priv->effect; + _tmp1_ = self->priv->effect; #line 235 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp4_ = spit_transitions_effect_needs_clear_background (_tmp3_); -#line 235 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - if (_tmp4_) { -#line 1708 "TransitionEffects.c" - cairo_t* _tmp5_; + if (spit_transitions_effect_needs_clear_background (_tmp1_)) { +#line 1822 "TransitionEffects.c" + SpitTransitionsVisuals* _tmp2_; + GdkRGBA _tmp3_ = {0}; + GdkRGBA _tmp4_; + gdouble _tmp5_; SpitTransitionsVisuals* _tmp6_; GdkRGBA _tmp7_ = {0}; GdkRGBA _tmp8_; @@ -1721,16 +1838,14 @@ gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width GdkRGBA _tmp15_ = {0}; GdkRGBA _tmp16_; gdouble _tmp17_; - SpitTransitionsVisuals* _tmp18_; - GdkRGBA _tmp19_ = {0}; - GdkRGBA _tmp20_; - gdouble _tmp21_; - cairo_t* _tmp22_; - gint _tmp23_; - gint _tmp24_; - cairo_t* _tmp25_; #line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp5_ = ctx; + _tmp2_ = self->priv->visuals; +#line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" + spit_transitions_visuals_get_bg_color (_tmp2_, &_tmp3_); +#line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" + _tmp4_ = _tmp3_; +#line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" + _tmp5_ = _tmp4_.red; #line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp6_ = self->priv->visuals; #line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1738,7 +1853,7 @@ gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width #line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp8_ = _tmp7_; #line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp9_ = _tmp8_.red; + _tmp9_ = _tmp8_.green; #line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp10_ = self->priv->visuals; #line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1746,7 +1861,7 @@ gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width #line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp12_ = _tmp11_; #line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp13_ = _tmp12_.green; + _tmp13_ = _tmp12_.blue; #line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp14_ = self->priv->visuals; #line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1754,241 +1869,238 @@ gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width #line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp16_ = _tmp15_; #line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp17_ = _tmp16_.blue; -#line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp18_ = self->priv->visuals; + _tmp17_ = _tmp16_.alpha; #line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - spit_transitions_visuals_get_bg_color (_tmp18_, &_tmp19_); -#line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp20_ = _tmp19_; -#line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp21_ = _tmp20_.alpha; -#line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - cairo_set_source_rgba (_tmp5_, _tmp9_, _tmp13_, _tmp17_, _tmp21_); -#line 238 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp22_ = ctx; + cairo_set_source_rgba (ctx, _tmp5_, _tmp9_, _tmp13_, _tmp17_); #line 238 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp23_ = width; -#line 238 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp24_ = height; -#line 238 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - cairo_rectangle (_tmp22_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp23_, (gdouble) _tmp24_); + cairo_rectangle (ctx, (gdouble) 0, (gdouble) 0, (gdouble) width, (gdouble) height); #line 239 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp25_ = ctx; -#line 239 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - cairo_fill (_tmp25_); -#line 1778 "TransitionEffects.c" + cairo_fill (ctx); +#line 1877 "TransitionEffects.c" } #line 242 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp26_ = self->priv->effect; -#line 242 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp27_ = self->priv->visuals; + _tmp18_ = self->priv->effect; #line 242 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp28_ = self->priv->motion; + _tmp19_ = self->priv->visuals; #line 242 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp29_ = ctx; + _tmp20_ = self->priv->motion; #line 242 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp30_ = width; + _tmp21_ = self->priv->frame_number; #line 242 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp31_ = height; -#line 242 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp32_ = self->priv->frame_number; -#line 242 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - spit_transitions_effect_paint (_tmp26_, _tmp27_, _tmp28_, _tmp29_, _tmp30_, _tmp31_, _tmp32_); -#line 244 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp33_ = ctx; + spit_transitions_effect_paint (_tmp18_, _tmp19_, _tmp20_, ctx, width, height, _tmp21_); #line 244 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - cairo_restore (_tmp33_); + cairo_restore (ctx); #line 246 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp34_ = self->priv->paint_timer; + _tmp22_ = self->priv->paint_timer; #line 246 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - op_timer_stop (_tmp34_); + op_timer_stop (_tmp22_); #line 248 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" result = TRUE; #line 248 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1808 "TransitionEffects.c" +#line 1899 "TransitionEffects.c" } -static gboolean transition_clock_tick (TransitionClock* self) { +static gboolean +transition_clock_tick (TransitionClock* self) +{ gboolean result = FALSE; - gboolean _tmp0_; - TransitionClockRepaintCallback _tmp1_; - void* _tmp1__target; - gboolean _tmp2_; + TransitionClockRepaintCallback _tmp0_; + void* _tmp0__target; + gint _tmp1_; + SpitTransitionsMotion* _tmp2_; gint _tmp3_; - SpitTransitionsMotion* _tmp4_; - gint _tmp5_; - gint _tmp6_; + gint _tmp4_; #line 251 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (IS_TRANSITION_CLOCK (self), FALSE); #line 252 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp0_ = transition_clock_is_fps_ok (self); -#line 252 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - if (!_tmp0_) { + if (!transition_clock_is_fps_ok (self)) { #line 253 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_debug ("TransitionEffects.vala:253: Cancelling transition: below minimum fps"); #line 254 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_clock_cancel (self); -#line 1832 "TransitionEffects.c" +#line 1921 "TransitionEffects.c" } #line 259 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp1_ = self->priv->repaint; + _tmp0_ = self->priv->repaint; #line 259 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp1__target = self->priv->repaint_target; + _tmp0__target = self->priv->repaint_target; #line 259 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp1_ (_tmp1__target); + _tmp0_ (_tmp0__target); #line 261 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp2_ = transition_clock_is_in_progress (self); -#line 261 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - if (!_tmp2_) { + if (!transition_clock_is_in_progress (self)) { #line 262 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_clock_cancel_timer (self); #line 264 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" result = FALSE; #line 264 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1850 "TransitionEffects.c" +#line 1937 "TransitionEffects.c" } #line 268 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp3_ = self->priv->frame_number; + _tmp1_ = self->priv->frame_number; #line 268 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp4_ = self->priv->motion; + _tmp2_ = self->priv->motion; #line 268 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp5_ = spit_transitions_motion_get_total_frames (_tmp4_); + _tmp3_ = spit_transitions_motion_get_total_frames (_tmp2_); #line 268 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 268 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - if (_tmp3_ < _tmp6_) { -#line 1862 "TransitionEffects.c" - SpitTransitionsEffect* _tmp7_; - SpitTransitionsVisuals* _tmp8_; - SpitTransitionsMotion* _tmp9_; - gint _tmp10_; - gint _tmp11_; + if (_tmp1_ < _tmp4_) { +#line 1949 "TransitionEffects.c" + SpitTransitionsEffect* _tmp5_; + SpitTransitionsVisuals* _tmp6_; + SpitTransitionsMotion* _tmp7_; + gint _tmp8_; + gint _tmp9_; #line 269 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp7_ = self->priv->effect; + _tmp5_ = self->priv->effect; #line 269 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp8_ = self->priv->visuals; + _tmp6_ = self->priv->visuals; #line 269 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp9_ = self->priv->motion; + _tmp7_ = self->priv->motion; #line 269 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp10_ = self->priv->frame_number; + _tmp8_ = self->priv->frame_number; #line 269 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - self->priv->frame_number = _tmp10_ + 1; + self->priv->frame_number = _tmp8_ + 1; #line 269 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp11_ = self->priv->frame_number; + _tmp9_ = self->priv->frame_number; #line 269 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - spit_transitions_effect_advance (_tmp7_, _tmp8_, _tmp9_, _tmp11_); -#line 1882 "TransitionEffects.c" + spit_transitions_effect_advance (_tmp5_, _tmp6_, _tmp7_, _tmp9_); +#line 1969 "TransitionEffects.c" } #line 271 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" result = TRUE; #line 271 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1888 "TransitionEffects.c" +#line 1975 "TransitionEffects.c" } -static void value_transition_clock_init (GValue* value) { +static void +value_transition_clock_init (GValue* value) +{ #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 1895 "TransitionEffects.c" +#line 1984 "TransitionEffects.c" } -static void value_transition_clock_free_value (GValue* value) { +static void +value_transition_clock_free_value (GValue* value) +{ #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (value->data[0].v_pointer) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_clock_unref (value->data[0].v_pointer); -#line 1904 "TransitionEffects.c" +#line 1995 "TransitionEffects.c" } } -static void value_transition_clock_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_transition_clock_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (src_value->data[0].v_pointer) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" dest_value->data[0].v_pointer = transition_clock_ref (src_value->data[0].v_pointer); -#line 1914 "TransitionEffects.c" +#line 2008 "TransitionEffects.c" } else { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" dest_value->data[0].v_pointer = NULL; -#line 1918 "TransitionEffects.c" +#line 2012 "TransitionEffects.c" } } -static gpointer value_transition_clock_peek_pointer (const GValue* value) { +static gpointer +value_transition_clock_peek_pointer (const GValue* value) +{ #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return value->data[0].v_pointer; -#line 1926 "TransitionEffects.c" +#line 2022 "TransitionEffects.c" } -static gchar* value_transition_clock_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_transition_clock_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (collect_values[0].v_pointer) { -#line 1933 "TransitionEffects.c" +#line 2034 "TransitionEffects.c" TransitionClock * object; object = collect_values[0].v_pointer; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (object->parent_instance.g_class == NULL) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1940 "TransitionEffects.c" +#line 2041 "TransitionEffects.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.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 1944 "TransitionEffects.c" +#line 2045 "TransitionEffects.c" } #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = transition_clock_ref (object); -#line 1948 "TransitionEffects.c" +#line 2049 "TransitionEffects.c" } else { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 1952 "TransitionEffects.c" +#line 2053 "TransitionEffects.c" } #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return NULL; -#line 1956 "TransitionEffects.c" +#line 2057 "TransitionEffects.c" } -static gchar* value_transition_clock_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_transition_clock_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ TransitionClock ** object_p; object_p = collect_values[0].v_pointer; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (!object_p) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1967 "TransitionEffects.c" +#line 2073 "TransitionEffects.c" } #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (!value->data[0].v_pointer) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *object_p = NULL; -#line 1973 "TransitionEffects.c" +#line 2079 "TransitionEffects.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *object_p = value->data[0].v_pointer; -#line 1977 "TransitionEffects.c" +#line 2083 "TransitionEffects.c" } else { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *object_p = transition_clock_ref (value->data[0].v_pointer); -#line 1981 "TransitionEffects.c" +#line 2087 "TransitionEffects.c" } #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return NULL; -#line 1985 "TransitionEffects.c" +#line 2091 "TransitionEffects.c" } -GParamSpec* param_spec_transition_clock (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_transition_clock (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecTransitionClock* spec; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_TRANSITION_CLOCK), NULL); @@ -1998,20 +2110,25 @@ GParamSpec* param_spec_transition_clock (const gchar* name, const gchar* nick, c G_PARAM_SPEC (spec)->value_type = object_type; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return G_PARAM_SPEC (spec); -#line 1999 "TransitionEffects.c" +#line 2111 "TransitionEffects.c" } -gpointer value_get_transition_clock (const GValue* value) { +gpointer +value_get_transition_clock (const GValue* value) +{ #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSITION_CLOCK), NULL); #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return value->data[0].v_pointer; -#line 2008 "TransitionEffects.c" +#line 2122 "TransitionEffects.c" } -void value_set_transition_clock (GValue* value, gpointer v_object) { +void +value_set_transition_clock (GValue* value, + gpointer v_object) +{ TransitionClock * old; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSITION_CLOCK)); @@ -2027,22 +2144,25 @@ void value_set_transition_clock (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_clock_ref (value->data[0].v_pointer); -#line 2028 "TransitionEffects.c" +#line 2145 "TransitionEffects.c" } else { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 2032 "TransitionEffects.c" +#line 2149 "TransitionEffects.c" } #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (old) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_clock_unref (old); -#line 2038 "TransitionEffects.c" +#line 2155 "TransitionEffects.c" } } -void value_take_transition_clock (GValue* value, gpointer v_object) { +void +value_take_transition_clock (GValue* value, + gpointer v_object) +{ TransitionClock * old; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSITION_CLOCK)); @@ -2056,33 +2176,37 @@ void value_take_transition_clock (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = v_object; -#line 2057 "TransitionEffects.c" +#line 2177 "TransitionEffects.c" } else { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 2061 "TransitionEffects.c" +#line 2181 "TransitionEffects.c" } #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (old) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_clock_unref (old); -#line 2067 "TransitionEffects.c" +#line 2187 "TransitionEffects.c" } } -static void transition_clock_class_init (TransitionClockClass * klass) { +static void +transition_clock_class_init (TransitionClockClass * klass) +{ #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_clock_parent_class = g_type_class_peek_parent (klass); #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" ((TransitionClockClass *) klass)->finalize = transition_clock_finalize; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_type_class_add_private (klass, sizeof (TransitionClockPrivate)); -#line 2079 "TransitionEffects.c" +#line 2201 "TransitionEffects.c" } -static void transition_clock_instance_init (TransitionClock * self) { +static void +transition_clock_instance_init (TransitionClock * self) +{ #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self->priv = TRANSITION_CLOCK_GET_PRIVATE (self); #line 126 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -2105,11 +2229,13 @@ static void transition_clock_instance_init (TransitionClock * self) { self->priv->cancelled = FALSE; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self->ref_count = 1; -#line 2106 "TransitionEffects.c" +#line 2230 "TransitionEffects.c" } -static void transition_clock_finalize (TransitionClock * obj) { +static void +transition_clock_finalize (TransitionClock * obj) +{ TransitionClock * self; gint _tmp0_ = 0; SpitTransitionsMotion* _tmp1_; @@ -2129,7 +2255,7 @@ static void transition_clock_finalize (TransitionClock * obj) { _tmp1_ = self->priv->motion; #line 148 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp1_ != NULL) { -#line 2130 "TransitionEffects.c" +#line 2256 "TransitionEffects.c" SpitTransitionsMotion* _tmp2_; gint _tmp3_; gint _tmp4_; @@ -2141,11 +2267,11 @@ static void transition_clock_finalize (TransitionClock * obj) { _tmp4_ = _tmp3_; #line 148 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp0_ = _tmp4_; -#line 2142 "TransitionEffects.c" +#line 2268 "TransitionEffects.c" } else { #line 148 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp0_ = 0; -#line 2146 "TransitionEffects.c" +#line 2272 "TransitionEffects.c" } #line 147 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp5_ = self->priv->paint_timer; @@ -2174,11 +2300,13 @@ static void transition_clock_finalize (TransitionClock * obj) { _g_object_unref0 (self->priv->visuals); #line 129 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (self->priv->motion); -#line 2174 "TransitionEffects.c" +#line 2300 "TransitionEffects.c" } -GType transition_clock_get_type (void) { +GType +transition_clock_get_type (void) +{ static volatile gsize transition_clock_type_id__volatile = 0; if (g_once_init_enter (&transition_clock_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_transition_clock_init, value_transition_clock_free_value, value_transition_clock_copy_value, value_transition_clock_peek_pointer, "p", value_transition_clock_collect_value, "p", value_transition_clock_lcopy_value }; @@ -2192,18 +2320,22 @@ GType transition_clock_get_type (void) { } -gpointer transition_clock_ref (gpointer instance) { +gpointer +transition_clock_ref (gpointer instance) +{ TransitionClock * self; self = instance; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_atomic_int_inc (&self->ref_count); #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return instance; -#line 2199 "TransitionEffects.c" +#line 2329 "TransitionEffects.c" } -void transition_clock_unref (gpointer instance) { +void +transition_clock_unref (gpointer instance) +{ TransitionClock * self; self = instance; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -2212,12 +2344,16 @@ void transition_clock_unref (gpointer instance) { TRANSITION_CLOCK_GET_CLASS (self)->finalize (self); #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2212 "TransitionEffects.c" +#line 2344 "TransitionEffects.c" } } -static gint null_transition_descriptor_real_get_pluggable_interface (SpitPluggable* base, gint min_host_version, gint max_host_version) { +static gint +null_transition_descriptor_real_get_pluggable_interface (SpitPluggable* base, + gint min_host_version, + gint max_host_version) +{ NullTransitionDescriptor * self; gint result = 0; #line 278 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -2226,11 +2362,13 @@ static gint null_transition_descriptor_real_get_pluggable_interface (SpitPluggab result = SPIT_TRANSITIONS_CURRENT_INTERFACE; #line 279 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2226 "TransitionEffects.c" +#line 2362 "TransitionEffects.c" } -static const gchar* null_transition_descriptor_real_get_id (SpitPluggable* base) { +static const gchar* +null_transition_descriptor_real_get_id (SpitPluggable* base) +{ NullTransitionDescriptor * self; const gchar* result = NULL; #line 282 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -2239,11 +2377,13 @@ static const gchar* null_transition_descriptor_real_get_id (SpitPluggable* base) result = NULL_TRANSITION_DESCRIPTOR_EFFECT_ID; #line 283 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2239 "TransitionEffects.c" +#line 2377 "TransitionEffects.c" } -static const gchar* null_transition_descriptor_real_get_pluggable_name (SpitPluggable* base) { +static const gchar* +null_transition_descriptor_real_get_pluggable_name (SpitPluggable* base) +{ NullTransitionDescriptor * self; const gchar* result = NULL; #line 286 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -2252,29 +2392,38 @@ static const gchar* null_transition_descriptor_real_get_pluggable_name (SpitPlug result = _ ("None"); #line 287 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2252 "TransitionEffects.c" +#line 2392 "TransitionEffects.c" } -static void null_transition_descriptor_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) { +static void +null_transition_descriptor_real_get_info (SpitPluggable* base, + SpitPluggableInfo* info) +{ NullTransitionDescriptor * self; #line 290 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_TRANSITION_DESCRIPTOR, NullTransitionDescriptor); #line 290 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (info != NULL); -#line 2262 "TransitionEffects.c" +#line 2405 "TransitionEffects.c" } -static void null_transition_descriptor_real_activation (SpitPluggable* base, gboolean enabled) { +static void +null_transition_descriptor_real_activation (SpitPluggable* base, + gboolean enabled) +{ NullTransitionDescriptor * self; #line 293 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_TRANSITION_DESCRIPTOR, NullTransitionDescriptor); -#line 2270 "TransitionEffects.c" +#line 2416 "TransitionEffects.c" } -static SpitTransitionsEffect* null_transition_descriptor_real_create (SpitTransitionsDescriptor* base, SpitHostInterface* host) { +static SpitTransitionsEffect* +null_transition_descriptor_real_create (SpitTransitionsDescriptor* base, + SpitHostInterface* host) +{ NullTransitionDescriptor * self; SpitTransitionsEffect* result = NULL; NullEffect* _tmp0_; @@ -2288,35 +2437,43 @@ static SpitTransitionsEffect* null_transition_descriptor_real_create (SpitTransi result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect); #line 297 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2288 "TransitionEffects.c" +#line 2437 "TransitionEffects.c" } -NullTransitionDescriptor* null_transition_descriptor_construct (GType object_type) { +NullTransitionDescriptor* +null_transition_descriptor_construct (GType object_type) +{ NullTransitionDescriptor * self = NULL; #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = (NullTransitionDescriptor*) g_object_new (object_type, NULL); #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return self; -#line 2298 "TransitionEffects.c" +#line 2449 "TransitionEffects.c" } -NullTransitionDescriptor* null_transition_descriptor_new (void) { +NullTransitionDescriptor* +null_transition_descriptor_new (void) +{ #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return null_transition_descriptor_construct (TYPE_NULL_TRANSITION_DESCRIPTOR); -#line 2305 "TransitionEffects.c" +#line 2458 "TransitionEffects.c" } -static void null_transition_descriptor_class_init (NullTransitionDescriptorClass * klass) { +static void +null_transition_descriptor_class_init (NullTransitionDescriptorClass * klass) +{ #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" null_transition_descriptor_parent_class = g_type_class_peek_parent (klass); -#line 2312 "TransitionEffects.c" +#line 2467 "TransitionEffects.c" } -static void null_transition_descriptor_spit_pluggable_interface_init (SpitPluggableIface * iface) { +static void +null_transition_descriptor_spit_pluggable_interface_init (SpitPluggableIface * iface) +{ #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" null_transition_descriptor_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface); #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -2329,24 +2486,30 @@ static void null_transition_descriptor_spit_pluggable_interface_init (SpitPlugga iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) null_transition_descriptor_real_get_info; #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" iface->activation = (void (*) (SpitPluggable *, gboolean)) null_transition_descriptor_real_activation; -#line 2329 "TransitionEffects.c" +#line 2486 "TransitionEffects.c" } -static void null_transition_descriptor_spit_transitions_descriptor_interface_init (SpitTransitionsDescriptorIface * iface) { +static void +null_transition_descriptor_spit_transitions_descriptor_interface_init (SpitTransitionsDescriptorIface * iface) +{ #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" null_transition_descriptor_spit_transitions_descriptor_parent_iface = g_type_interface_peek_parent (iface); #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" iface->create = (SpitTransitionsEffect* (*) (SpitTransitionsDescriptor *, SpitHostInterface*)) null_transition_descriptor_real_create; -#line 2338 "TransitionEffects.c" +#line 2497 "TransitionEffects.c" } -static void null_transition_descriptor_instance_init (NullTransitionDescriptor * self) { +static void +null_transition_descriptor_instance_init (NullTransitionDescriptor * self) +{ } -GType null_transition_descriptor_get_type (void) { +GType +null_transition_descriptor_get_type (void) +{ static volatile gsize null_transition_descriptor_type_id__volatile = 0; if (g_once_init_enter (&null_transition_descriptor_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (NullTransitionDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) null_transition_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NullTransitionDescriptor), 0, (GInstanceInitFunc) null_transition_descriptor_instance_init, NULL }; @@ -2362,24 +2525,32 @@ GType null_transition_descriptor_get_type (void) { } -NullEffect* null_effect_construct (GType object_type) { +NullEffect* +null_effect_construct (GType object_type) +{ NullEffect * self = NULL; #line 302 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = (NullEffect*) g_object_new (object_type, NULL); #line 302 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return self; -#line 2368 "TransitionEffects.c" +#line 2533 "TransitionEffects.c" } -NullEffect* null_effect_new (void) { +NullEffect* +null_effect_new (void) +{ #line 302 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return null_effect_construct (TYPE_NULL_EFFECT); -#line 2375 "TransitionEffects.c" +#line 2542 "TransitionEffects.c" } -static void null_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) { +static void +null_effect_real_get_fps (SpitTransitionsEffect* base, + gint* desired_fps, + gint* min_fps) +{ NullEffect * self; gint _vala_desired_fps = 0; gint _vala_min_fps = 0; @@ -2393,18 +2564,22 @@ static void null_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired if (desired_fps) { #line 305 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *desired_fps = _vala_desired_fps; -#line 2393 "TransitionEffects.c" +#line 2564 "TransitionEffects.c" } #line 305 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (min_fps) { #line 305 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *min_fps = _vala_min_fps; -#line 2399 "TransitionEffects.c" +#line 2570 "TransitionEffects.c" } } -static void null_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) { +static void +null_effect_real_start (SpitTransitionsEffect* base, + SpitTransitionsVisuals* visuals, + SpitTransitionsMotion* motion) +{ NullEffect * self; #line 310 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_EFFECT, NullEffect); @@ -2412,11 +2587,13 @@ static void null_effect_real_start (SpitTransitionsEffect* base, SpitTransitions g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 310 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 2412 "TransitionEffects.c" +#line 2587 "TransitionEffects.c" } -static gboolean null_effect_real_needs_clear_background (SpitTransitionsEffect* base) { +static gboolean +null_effect_real_needs_clear_background (SpitTransitionsEffect* base) +{ NullEffect * self; gboolean result = FALSE; #line 313 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -2425,11 +2602,19 @@ static gboolean null_effect_real_needs_clear_background (SpitTransitionsEffect* result = FALSE; #line 314 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2425 "TransitionEffects.c" +#line 2602 "TransitionEffects.c" } -static void null_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { +static void +null_effect_real_paint (SpitTransitionsEffect* base, + SpitTransitionsVisuals* visuals, + SpitTransitionsMotion* motion, + cairo_t* ctx, + gint width, + gint height, + gint frame_number) +{ NullEffect * self; #line 317 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_EFFECT, NullEffect); @@ -2439,11 +2624,16 @@ static void null_effect_real_paint (SpitTransitionsEffect* base, SpitTransitions g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); #line 317 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (ctx != NULL); -#line 2439 "TransitionEffects.c" +#line 2624 "TransitionEffects.c" } -static void null_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) { +static void +null_effect_real_advance (SpitTransitionsEffect* base, + SpitTransitionsVisuals* visuals, + SpitTransitionsMotion* motion, + gint frame_number) +{ NullEffect * self; #line 321 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_EFFECT, NullEffect); @@ -2451,26 +2641,32 @@ static void null_effect_real_advance (SpitTransitionsEffect* base, SpitTransitio g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 321 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 2451 "TransitionEffects.c" +#line 2641 "TransitionEffects.c" } -static void null_effect_real_cancel (SpitTransitionsEffect* base) { +static void +null_effect_real_cancel (SpitTransitionsEffect* base) +{ NullEffect * self; #line 324 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_EFFECT, NullEffect); -#line 2459 "TransitionEffects.c" +#line 2651 "TransitionEffects.c" } -static void null_effect_class_init (NullEffectClass * klass) { +static void +null_effect_class_init (NullEffectClass * klass) +{ #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" null_effect_parent_class = g_type_class_peek_parent (klass); -#line 2466 "TransitionEffects.c" +#line 2660 "TransitionEffects.c" } -static void null_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) { +static void +null_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) +{ #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" null_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface); #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -2485,15 +2681,19 @@ static void null_effect_spit_transitions_effect_interface_init (SpitTransitionsE iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) null_effect_real_advance; #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" iface->cancel = (void (*) (SpitTransitionsEffect *)) null_effect_real_cancel; -#line 2485 "TransitionEffects.c" +#line 2681 "TransitionEffects.c" } -static void null_effect_instance_init (NullEffect * self) { +static void +null_effect_instance_init (NullEffect * self) +{ } -GType null_effect_get_type (void) { +GType +null_effect_get_type (void) +{ static volatile gsize null_effect_type_id__volatile = 0; if (g_once_init_enter (&null_effect_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (NullEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) null_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NullEffect), 0, (GInstanceInitFunc) null_effect_instance_init, NULL }; @@ -2507,7 +2707,11 @@ GType null_effect_get_type (void) { } -static gint random_effect_descriptor_real_get_pluggable_interface (SpitPluggable* base, gint min_host_version, gint max_host_version) { +static gint +random_effect_descriptor_real_get_pluggable_interface (SpitPluggable* base, + gint min_host_version, + gint max_host_version) +{ RandomEffectDescriptor * self; gint result = 0; #line 330 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -2516,11 +2720,13 @@ static gint random_effect_descriptor_real_get_pluggable_interface (SpitPluggable result = SPIT_TRANSITIONS_CURRENT_INTERFACE; #line 331 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2516 "TransitionEffects.c" +#line 2720 "TransitionEffects.c" } -static const gchar* random_effect_descriptor_real_get_id (SpitPluggable* base) { +static const gchar* +random_effect_descriptor_real_get_id (SpitPluggable* base) +{ RandomEffectDescriptor * self; const gchar* result = NULL; #line 334 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -2529,11 +2735,13 @@ static const gchar* random_effect_descriptor_real_get_id (SpitPluggable* base) { result = RANDOM_EFFECT_DESCRIPTOR_EFFECT_ID; #line 335 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2529 "TransitionEffects.c" +#line 2735 "TransitionEffects.c" } -static const gchar* random_effect_descriptor_real_get_pluggable_name (SpitPluggable* base) { +static const gchar* +random_effect_descriptor_real_get_pluggable_name (SpitPluggable* base) +{ RandomEffectDescriptor * self; const gchar* result = NULL; #line 338 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -2542,29 +2750,38 @@ static const gchar* random_effect_descriptor_real_get_pluggable_name (SpitPlugga result = _ ("Random"); #line 339 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2542 "TransitionEffects.c" +#line 2750 "TransitionEffects.c" } -static void random_effect_descriptor_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) { +static void +random_effect_descriptor_real_get_info (SpitPluggable* base, + SpitPluggableInfo* info) +{ RandomEffectDescriptor * self; #line 342 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RANDOM_EFFECT_DESCRIPTOR, RandomEffectDescriptor); #line 342 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (info != NULL); -#line 2552 "TransitionEffects.c" +#line 2763 "TransitionEffects.c" } -static void random_effect_descriptor_real_activation (SpitPluggable* base, gboolean enabled) { +static void +random_effect_descriptor_real_activation (SpitPluggable* base, + gboolean enabled) +{ RandomEffectDescriptor * self; #line 345 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RANDOM_EFFECT_DESCRIPTOR, RandomEffectDescriptor); -#line 2560 "TransitionEffects.c" +#line 2774 "TransitionEffects.c" } -static SpitTransitionsEffect* random_effect_descriptor_real_create (SpitTransitionsDescriptor* base, SpitHostInterface* host) { +static SpitTransitionsEffect* +random_effect_descriptor_real_create (SpitTransitionsDescriptor* base, + SpitHostInterface* host) +{ RandomEffectDescriptor * self; SpitTransitionsEffect* result = NULL; NullEffect* _tmp0_; @@ -2578,35 +2795,43 @@ static SpitTransitionsEffect* random_effect_descriptor_real_create (SpitTransiti result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect); #line 349 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2578 "TransitionEffects.c" +#line 2795 "TransitionEffects.c" } -RandomEffectDescriptor* random_effect_descriptor_construct (GType object_type) { +RandomEffectDescriptor* +random_effect_descriptor_construct (GType object_type) +{ RandomEffectDescriptor * self = NULL; #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = (RandomEffectDescriptor*) g_object_new (object_type, NULL); #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return self; -#line 2588 "TransitionEffects.c" +#line 2807 "TransitionEffects.c" } -RandomEffectDescriptor* random_effect_descriptor_new (void) { +RandomEffectDescriptor* +random_effect_descriptor_new (void) +{ #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return random_effect_descriptor_construct (TYPE_RANDOM_EFFECT_DESCRIPTOR); -#line 2595 "TransitionEffects.c" +#line 2816 "TransitionEffects.c" } -static void random_effect_descriptor_class_init (RandomEffectDescriptorClass * klass) { +static void +random_effect_descriptor_class_init (RandomEffectDescriptorClass * klass) +{ #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" random_effect_descriptor_parent_class = g_type_class_peek_parent (klass); -#line 2602 "TransitionEffects.c" +#line 2825 "TransitionEffects.c" } -static void random_effect_descriptor_spit_pluggable_interface_init (SpitPluggableIface * iface) { +static void +random_effect_descriptor_spit_pluggable_interface_init (SpitPluggableIface * iface) +{ #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" random_effect_descriptor_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface); #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -2619,24 +2844,30 @@ static void random_effect_descriptor_spit_pluggable_interface_init (SpitPluggabl iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) random_effect_descriptor_real_get_info; #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" iface->activation = (void (*) (SpitPluggable *, gboolean)) random_effect_descriptor_real_activation; -#line 2619 "TransitionEffects.c" +#line 2844 "TransitionEffects.c" } -static void random_effect_descriptor_spit_transitions_descriptor_interface_init (SpitTransitionsDescriptorIface * iface) { +static void +random_effect_descriptor_spit_transitions_descriptor_interface_init (SpitTransitionsDescriptorIface * iface) +{ #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" random_effect_descriptor_spit_transitions_descriptor_parent_iface = g_type_interface_peek_parent (iface); #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" iface->create = (SpitTransitionsEffect* (*) (SpitTransitionsDescriptor *, SpitHostInterface*)) random_effect_descriptor_real_create; -#line 2628 "TransitionEffects.c" +#line 2855 "TransitionEffects.c" } -static void random_effect_descriptor_instance_init (RandomEffectDescriptor * self) { +static void +random_effect_descriptor_instance_init (RandomEffectDescriptor * self) +{ } -GType random_effect_descriptor_get_type (void) { +GType +random_effect_descriptor_get_type (void) +{ static volatile gsize random_effect_descriptor_type_id__volatile = 0; if (g_once_init_enter (&random_effect_descriptor_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RandomEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) random_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RandomEffectDescriptor), 0, (GInstanceInitFunc) random_effect_descriptor_instance_init, NULL }; diff --git a/src/tags/HierarchicalTagIndex.c b/src/tags/HierarchicalTagIndex.c index c57a25f..44d6fae 100644 --- a/src/tags/HierarchicalTagIndex.c +++ b/src/tags/HierarchicalTagIndex.c @@ -1,4 +1,4 @@ -/* HierarchicalTagIndex.c generated by valac 0.36.6, the Vala compiler +/* HierarchicalTagIndex.c generated by valac 0.40.4, the Vala compiler * generated from HierarchicalTagIndex.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -106,27 +107,38 @@ extern TagSourceCollection* tag_global; gpointer hierarchical_tag_index_ref (gpointer instance); void hierarchical_tag_index_unref (gpointer instance); -GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_hierarchical_tag_index (GValue* value, gpointer v_object); -void value_take_hierarchical_tag_index (GValue* value, gpointer v_object); +GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_hierarchical_tag_index (GValue* value, + gpointer v_object); +void value_take_hierarchical_tag_index (GValue* value, + gpointer v_object); gpointer value_get_hierarchical_tag_index (const GValue* value); GType hierarchical_tag_index_get_type (void) G_GNUC_CONST; #define HIERARCHICAL_TAG_INDEX_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_HIERARCHICAL_TAG_INDEX, HierarchicalTagIndexPrivate)) -enum { - HIERARCHICAL_TAG_INDEX_DUMMY_PROPERTY -}; HierarchicalTagIndex* hierarchical_tag_index_new (void); HierarchicalTagIndex* hierarchical_tag_index_construct (GType object_type); HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_paths); #define TAG_PATH_SEPARATOR_STRING "/" GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_path); -void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, const gchar* tag, const gchar* path); +void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, + const gchar* tag, + const gchar* path); HierarchicalTagIndex* hierarchical_tag_index_get_global_index (void); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -135,18 +147,33 @@ GType container_source_collection_get_type (void) G_GNUC_CONST; GType tag_source_collection_get_type (void) G_GNUC_CONST; GeeCollection* tag_source_collection_get_all_names (TagSourceCollection* self); GeeCollection* hierarchical_tag_index_get_all_paths (HierarchicalTagIndex* self); -gboolean hierarchical_tag_index_is_tag_in_index (HierarchicalTagIndex* self, const gchar* tag); +gboolean hierarchical_tag_index_is_tag_in_index (HierarchicalTagIndex* self, + const gchar* tag); GeeCollection* hierarchical_tag_index_get_all_tags (HierarchicalTagIndex* self); -gboolean hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, const gchar* path); -gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, const gchar* name); -gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, gchar** names, int names_length1, int* result_length1); -static void _vala_array_add68 (gchar** * array, int* length, int* size, gchar* value); +gboolean hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, + const gchar* path); +gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, + const gchar* name); +gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, + gchar** names, + int names_length1, + int* result_length1); +static void _vala_array_add68 (gchar** * array, + int* length, + int* size, + gchar* value); static void hierarchical_tag_index_finalize (HierarchicalTagIndex * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -HierarchicalTagIndex* hierarchical_tag_index_construct (GType object_type) { +HierarchicalTagIndex* +hierarchical_tag_index_construct (GType object_type) +{ HierarchicalTagIndex* self = NULL; GeeHashMap* _tmp0_; GeeTreeSet* _tmp1_; @@ -166,170 +193,162 @@ HierarchicalTagIndex* hierarchical_tag_index_construct (GType object_type) { self->priv->known_paths = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet); #line 11 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return self; -#line 170 "HierarchicalTagIndex.c" +#line 197 "HierarchicalTagIndex.c" } -HierarchicalTagIndex* hierarchical_tag_index_new (void) { +HierarchicalTagIndex* +hierarchical_tag_index_new (void) +{ #line 11 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return hierarchical_tag_index_construct (TYPE_HIERARCHICAL_TAG_INDEX); -#line 177 "HierarchicalTagIndex.c" +#line 206 "HierarchicalTagIndex.c" } -HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_paths) { +HierarchicalTagIndex* +hierarchical_tag_index_from_paths (GeeCollection* client_paths) +{ HierarchicalTagIndex* result = NULL; GeeCollection* paths = NULL; GeeCollection* _tmp0_; GeeCollection* _tmp1_; - GeeCollection* _tmp2_; HierarchicalTagIndex* _result_ = NULL; - HierarchicalTagIndex* _tmp3_; + HierarchicalTagIndex* _tmp2_; #line 16 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (GEE_IS_COLLECTION (client_paths), NULL); #line 17 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp0_ = client_paths; + _tmp0_ = gee_collection_get_read_only_view (client_paths); #line 17 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp1_ = gee_collection_get_read_only_view (_tmp0_); + _tmp1_ = _tmp0_; #line 17 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp2_ = _tmp1_; -#line 17 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - paths = _tmp2_; + paths = _tmp1_; #line 19 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp3_ = hierarchical_tag_index_new (); + _tmp2_ = hierarchical_tag_index_new (); #line 19 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _result_ = _tmp3_; -#line 203 "HierarchicalTagIndex.c" + _result_ = _tmp2_; +#line 231 "HierarchicalTagIndex.c" { GeeIterator* _path_it = NULL; - GeeCollection* _tmp4_; - GeeIterator* _tmp5_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp4_ = paths; + _tmp3_ = paths; #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _path_it = _tmp5_; + _path_it = _tmp4_; #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" while (TRUE) { -#line 216 "HierarchicalTagIndex.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 244 "HierarchicalTagIndex.c" + GeeIterator* _tmp5_; gchar* path = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - const gchar* _tmp10_; - gboolean _tmp11_; -#line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp6_ = _path_it; + GeeIterator* _tmp6_; + gpointer _tmp7_; + const gchar* _tmp8_; #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _path_it; #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" break; -#line 232 "HierarchicalTagIndex.c" +#line 256 "HierarchicalTagIndex.c" } #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp8_ = _path_it; + _tmp6_ = _path_it; #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - path = (gchar*) _tmp9_; -#line 22 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp10_ = path; + path = (gchar*) _tmp7_; #line 22 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp11_ = g_str_has_prefix (_tmp10_, TAG_PATH_SEPARATOR_STRING); + _tmp8_ = path; #line 22 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - if (_tmp11_) { -#line 246 "HierarchicalTagIndex.c" + if (g_str_has_prefix (_tmp8_, TAG_PATH_SEPARATOR_STRING)) { +#line 268 "HierarchicalTagIndex.c" GeeCollection* components = NULL; - const gchar* _tmp12_; - GeeList* _tmp13_; + const gchar* _tmp9_; + GeeList* _tmp10_; #line 23 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp12_ = path; + _tmp9_ = path; #line 23 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp13_ = hierarchical_tag_utilities_enumerate_path_components (_tmp12_); + _tmp10_ = hierarchical_tag_utilities_enumerate_path_components (_tmp9_); #line 23 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - components = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection); -#line 256 "HierarchicalTagIndex.c" + components = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection); +#line 278 "HierarchicalTagIndex.c" { GeeIterator* _component_it = NULL; - GeeCollection* _tmp14_; - GeeIterator* _tmp15_; + GeeCollection* _tmp11_; + GeeIterator* _tmp12_; #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp14_ = components; + _tmp11_ = components; #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _component_it = _tmp15_; + _component_it = _tmp12_; #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" while (TRUE) { -#line 269 "HierarchicalTagIndex.c" - GeeIterator* _tmp16_; - gboolean _tmp17_; +#line 291 "HierarchicalTagIndex.c" + GeeIterator* _tmp13_; gchar* component = NULL; - GeeIterator* _tmp18_; - gpointer _tmp19_; - HierarchicalTagIndex* _tmp20_; - const gchar* _tmp21_; - const gchar* _tmp22_; + GeeIterator* _tmp14_; + gpointer _tmp15_; + HierarchicalTagIndex* _tmp16_; + const gchar* _tmp17_; + const gchar* _tmp18_; #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp16_ = _component_it; + _tmp13_ = _component_it; #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp17_ = gee_iterator_next (_tmp16_); -#line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - if (!_tmp17_) { + if (!gee_iterator_next (_tmp13_)) { #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" break; -#line 286 "HierarchicalTagIndex.c" +#line 305 "HierarchicalTagIndex.c" } #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp18_ = _component_it; + _tmp14_ = _component_it; #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp19_ = gee_iterator_get (_tmp18_); + _tmp15_ = gee_iterator_get (_tmp14_); #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - component = (gchar*) _tmp19_; + component = (gchar*) _tmp15_; #line 27 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp20_ = _result_; + _tmp16_ = _result_; #line 27 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp21_ = component; + _tmp17_ = component; #line 27 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp22_ = path; + _tmp18_ = path; #line 27 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - hierarchical_tag_index_add_path (_tmp20_, _tmp21_, _tmp22_); + hierarchical_tag_index_add_path (_tmp16_, _tmp17_, _tmp18_); #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_free0 (component); -#line 304 "HierarchicalTagIndex.c" +#line 323 "HierarchicalTagIndex.c" } #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_object_unref0 (_component_it); -#line 308 "HierarchicalTagIndex.c" +#line 327 "HierarchicalTagIndex.c" } #line 22 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_object_unref0 (components); -#line 312 "HierarchicalTagIndex.c" +#line 331 "HierarchicalTagIndex.c" } else { - HierarchicalTagIndex* _tmp23_; - const gchar* _tmp24_; - const gchar* _tmp25_; + HierarchicalTagIndex* _tmp19_; + const gchar* _tmp20_; + const gchar* _tmp21_; #line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp23_ = _result_; + _tmp19_ = _result_; #line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp24_ = path; + _tmp20_ = path; #line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp25_ = path; + _tmp21_ = path; #line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - hierarchical_tag_index_add_path (_tmp23_, _tmp24_, _tmp25_); -#line 325 "HierarchicalTagIndex.c" + hierarchical_tag_index_add_path (_tmp19_, _tmp20_, _tmp21_); +#line 344 "HierarchicalTagIndex.c" } #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_free0 (path); -#line 329 "HierarchicalTagIndex.c" +#line 348 "HierarchicalTagIndex.c" } #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_object_unref0 (_path_it); -#line 333 "HierarchicalTagIndex.c" +#line 352 "HierarchicalTagIndex.c" } #line 33 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" result = _result_; @@ -337,11 +356,13 @@ HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_p _g_object_unref0 (paths); #line 33 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return result; -#line 341 "HierarchicalTagIndex.c" +#line 360 "HierarchicalTagIndex.c" } -HierarchicalTagIndex* hierarchical_tag_index_get_global_index (void) { +HierarchicalTagIndex* +hierarchical_tag_index_get_global_index (void) +{ HierarchicalTagIndex* result = NULL; TagSourceCollection* _tmp0_; GeeCollection* _tmp1_; @@ -364,21 +385,20 @@ HierarchicalTagIndex* hierarchical_tag_index_get_global_index (void) { result = _tmp4_; #line 37 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return result; -#line 368 "HierarchicalTagIndex.c" +#line 389 "HierarchicalTagIndex.c" } -void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, const gchar* tag, const gchar* path) { +void +hierarchical_tag_index_add_path (HierarchicalTagIndex* self, + const gchar* tag, + const gchar* path) +{ GeeMap* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; - GeeMap* _tmp7_; - const gchar* _tmp8_; - gpointer _tmp9_; - GeeCollection* _tmp10_; - const gchar* _tmp11_; - GeeSortedSet* _tmp12_; - const gchar* _tmp13_; + GeeMap* _tmp4_; + gpointer _tmp5_; + GeeCollection* _tmp6_; + GeeSortedSet* _tmp7_; #line 40 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_if_fail (IS_HIERARCHICAL_TAG_INDEX (self)); #line 40 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -388,55 +408,44 @@ void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, const gchar* t #line 41 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _tmp0_ = self->priv->tag_table; #line 41 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp1_ = tag; -#line 41 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp2_ = gee_map_has_key (_tmp0_, _tmp1_); -#line 41 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - if (!_tmp2_) { -#line 397 "HierarchicalTagIndex.c" - GeeMap* _tmp3_; - const gchar* _tmp4_; - GeeArrayList* _tmp5_; - GeeArrayList* _tmp6_; + if (!gee_map_has_key (_tmp0_, tag)) { +#line 413 "HierarchicalTagIndex.c" + GeeMap* _tmp1_; + GeeArrayList* _tmp2_; + GeeArrayList* _tmp3_; #line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp3_ = self->priv->tag_table; + _tmp1_ = self->priv->tag_table; #line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp4_ = tag; + _tmp2_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp5_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp3_ = _tmp2_; #line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp6_ = _tmp5_; + gee_map_set (_tmp1_, tag, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); #line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - gee_map_set (_tmp3_, _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _g_object_unref0 (_tmp6_); -#line 414 "HierarchicalTagIndex.c" + _g_object_unref0 (_tmp3_); +#line 427 "HierarchicalTagIndex.c" } #line 45 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp7_ = self->priv->tag_table; -#line 45 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp8_ = tag; -#line 45 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp9_ = gee_map_get (_tmp7_, _tmp8_); + _tmp4_ = self->priv->tag_table; #line 45 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp10_ = (GeeCollection*) _tmp9_; + _tmp5_ = gee_map_get (_tmp4_, tag); #line 45 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp11_ = path; + _tmp6_ = (GeeCollection*) _tmp5_; #line 45 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - gee_collection_add (_tmp10_, _tmp11_); + gee_collection_add (_tmp6_, path); #line 45 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _g_object_unref0 (_tmp10_); -#line 46 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp12_ = self->priv->known_paths; + _g_object_unref0 (_tmp6_); #line 46 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp13_ = path; + _tmp7_ = self->priv->known_paths; #line 46 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_); -#line 436 "HierarchicalTagIndex.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), path); +#line 443 "HierarchicalTagIndex.c" } -GeeCollection* hierarchical_tag_index_get_all_paths (HierarchicalTagIndex* self) { +GeeCollection* +hierarchical_tag_index_get_all_paths (HierarchicalTagIndex* self) +{ GeeCollection* result = NULL; GeeSortedSet* _tmp0_; GeeSortedSet* _tmp1_; @@ -453,15 +462,16 @@ GeeCollection* hierarchical_tag_index_get_all_paths (HierarchicalTagIndex* self) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 50 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return result; -#line 457 "HierarchicalTagIndex.c" +#line 466 "HierarchicalTagIndex.c" } -gboolean hierarchical_tag_index_is_tag_in_index (HierarchicalTagIndex* self, const gchar* tag) { +gboolean +hierarchical_tag_index_is_tag_in_index (HierarchicalTagIndex* self, + const gchar* tag) +{ gboolean result = FALSE; GeeMap* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; #line 53 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (IS_HIERARCHICAL_TAG_INDEX (self), FALSE); #line 53 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -469,18 +479,16 @@ gboolean hierarchical_tag_index_is_tag_in_index (HierarchicalTagIndex* self, con #line 54 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _tmp0_ = self->priv->tag_table; #line 54 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp1_ = tag; -#line 54 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp2_ = gee_map_has_key (_tmp0_, _tmp1_); -#line 54 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - result = _tmp2_; + result = gee_map_has_key (_tmp0_, tag); #line 54 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return result; -#line 480 "HierarchicalTagIndex.c" +#line 486 "HierarchicalTagIndex.c" } -GeeCollection* hierarchical_tag_index_get_all_tags (HierarchicalTagIndex* self) { +GeeCollection* +hierarchical_tag_index_get_all_tags (HierarchicalTagIndex* self) +{ GeeCollection* result = NULL; GeeMap* _tmp0_; GeeSet* _tmp1_; @@ -497,15 +505,16 @@ GeeCollection* hierarchical_tag_index_get_all_tags (HierarchicalTagIndex* self) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 58 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return result; -#line 501 "HierarchicalTagIndex.c" +#line 509 "HierarchicalTagIndex.c" } -gboolean hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, const gchar* path) { +gboolean +hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, + const gchar* path) +{ gboolean result = FALSE; GeeSortedSet* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; #line 61 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (IS_HIERARCHICAL_TAG_INDEX (self), FALSE); #line 61 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -513,128 +522,109 @@ gboolean hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, const #line 62 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _tmp0_ = self->priv->known_paths; #line 62 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp1_ = path; -#line 62 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp2_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 62 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - result = _tmp2_; + result = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), path); #line 62 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return result; -#line 524 "HierarchicalTagIndex.c" +#line 529 "HierarchicalTagIndex.c" } -gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, const gchar* name) { +gchar* +hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, + const gchar* name) +{ gchar* result = NULL; - const gchar* _tmp0_; - gboolean _tmp1_; GeeCollection* paths = NULL; - GeeMap* _tmp4_; - const gchar* _tmp5_; - gpointer _tmp6_; + GeeMap* _tmp1_; + gpointer _tmp2_; #line 65 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (IS_HIERARCHICAL_TAG_INDEX (self), NULL); #line 65 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (name != NULL, NULL); #line 66 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp0_ = name; -#line 66 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp1_ = hierarchical_tag_index_is_tag_in_index (self, _tmp0_); -#line 66 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - if (!_tmp1_) { -#line 546 "HierarchicalTagIndex.c" - const gchar* _tmp2_; - gchar* _tmp3_; -#line 67 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp2_ = name; + if (!hierarchical_tag_index_is_tag_in_index (self, name)) { +#line 547 "HierarchicalTagIndex.c" + gchar* _tmp0_; #line 67 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp0_ = g_strdup (name); #line 67 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - result = _tmp3_; + result = _tmp0_; #line 67 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return result; -#line 557 "HierarchicalTagIndex.c" +#line 555 "HierarchicalTagIndex.c" } #line 69 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp4_ = self->priv->tag_table; -#line 69 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp5_ = name; + _tmp1_ = self->priv->tag_table; #line 69 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp6_ = gee_map_get (_tmp4_, _tmp5_); + _tmp2_ = gee_map_get (_tmp1_, name); #line 69 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - paths = (GeeCollection*) _tmp6_; -#line 567 "HierarchicalTagIndex.c" + paths = (GeeCollection*) _tmp2_; +#line 563 "HierarchicalTagIndex.c" { GeeIterator* _path_it = NULL; - GeeCollection* _tmp7_; - GeeIterator* _tmp8_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp7_ = paths; + _tmp3_ = paths; #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _path_it = _tmp8_; + _path_it = _tmp4_; #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" while (TRUE) { -#line 580 "HierarchicalTagIndex.c" - GeeIterator* _tmp9_; - gboolean _tmp10_; +#line 576 "HierarchicalTagIndex.c" + GeeIterator* _tmp5_; gchar* path = NULL; - GeeIterator* _tmp11_; - gpointer _tmp12_; + GeeIterator* _tmp6_; + gpointer _tmp7_; GeeList* components = NULL; - const gchar* _tmp13_; - GeeList* _tmp14_; - GeeList* _tmp15_; - GeeList* _tmp16_; - gint _tmp17_; - gint _tmp18_; - gpointer _tmp19_; - gchar* _tmp20_; - const gchar* _tmp21_; - gboolean _tmp22_; + const gchar* _tmp8_; + GeeList* _tmp9_; + GeeList* _tmp10_; + GeeList* _tmp11_; + gint _tmp12_; + gint _tmp13_; + gpointer _tmp14_; + gchar* _tmp15_; + gboolean _tmp16_; #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp9_ = _path_it; + _tmp5_ = _path_it; #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp10_ = gee_iterator_next (_tmp9_); -#line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - if (!_tmp10_) { + if (!gee_iterator_next (_tmp5_)) { #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" break; -#line 605 "HierarchicalTagIndex.c" +#line 597 "HierarchicalTagIndex.c" } #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp11_ = _path_it; + _tmp6_ = _path_it; #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp12_ = gee_iterator_get (_tmp11_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - path = (gchar*) _tmp12_; + path = (gchar*) _tmp7_; #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp13_ = path; + _tmp8_ = path; #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp14_ = hierarchical_tag_utilities_enumerate_path_components (_tmp13_); + _tmp9_ = hierarchical_tag_utilities_enumerate_path_components (_tmp8_); #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - components = _tmp14_; -#line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp15_ = components; + components = _tmp9_; #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp16_ = components; + _tmp10_ = components; #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp17_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp11_ = components; #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp18_ = _tmp17_; + _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp19_ = gee_list_get (_tmp15_, _tmp18_ - 1); + _tmp13_ = _tmp12_; #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp20_ = (gchar*) _tmp19_; + _tmp14_ = gee_list_get (_tmp10_, _tmp13_ - 1); #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp21_ = name; + _tmp15_ = (gchar*) _tmp14_; #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp22_ = g_strcmp0 (_tmp20_, _tmp21_) == 0; + _tmp16_ = g_strcmp0 (_tmp15_, name) == 0; #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp15_); #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - if (_tmp22_) { + if (_tmp16_) { #line 73 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" result = path; #line 73 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -645,53 +635,61 @@ gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, con _g_object_unref0 (paths); #line 73 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return result; -#line 649 "HierarchicalTagIndex.c" +#line 639 "HierarchicalTagIndex.c" } #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_object_unref0 (components); #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_free0 (path); -#line 655 "HierarchicalTagIndex.c" +#line 645 "HierarchicalTagIndex.c" } #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_object_unref0 (_path_it); -#line 659 "HierarchicalTagIndex.c" +#line 649 "HierarchicalTagIndex.c" } #line 77 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_assert_not_reached (); #line 65 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_object_unref0 (paths); -#line 665 "HierarchicalTagIndex.c" +#line 655 "HierarchicalTagIndex.c" } -static void _vala_array_add68 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add68 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if ((*length) == (*size)) { #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" *size = (*size) ? (2 * (*size)) : 4; #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 676 "HierarchicalTagIndex.c" +#line 671 "HierarchicalTagIndex.c" } #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" (*array)[(*length)++] = value; #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" (*array)[*length] = NULL; -#line 682 "HierarchicalTagIndex.c" +#line 677 "HierarchicalTagIndex.c" } -gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, gchar** names, int names_length1, int* result_length1) { +gchar** +hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, + gchar** names, + int names_length1, + int* result_length1) +{ gchar** result = NULL; gchar** _result_ = NULL; gchar** _tmp0_; gint _result__length1; gint __result__size_; - gchar** _tmp1_; - gint _tmp1__length1; - gchar** _tmp6_; - gint _tmp6__length1; + gchar** _tmp5_; + gint _tmp5__length1; #line 80 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (IS_HIERARCHICAL_TAG_INDEX (self), NULL); #line 81 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -702,167 +700,188 @@ gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* _result__length1 = 0; #line 81 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" __result__size_ = _result__length1; -#line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp1_ = names; -#line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp1__length1 = names_length1; -#line 710 "HierarchicalTagIndex.c" +#line 704 "HierarchicalTagIndex.c" { gchar** name_collection = NULL; gint name_collection_length1 = 0; gint _name_collection_size_ = 0; gint name_it = 0; #line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - name_collection = _tmp1_; + name_collection = names; #line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - name_collection_length1 = _tmp1__length1; + name_collection_length1 = names_length1; #line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - for (name_it = 0; name_it < _tmp1__length1; name_it = name_it + 1) { -#line 722 "HierarchicalTagIndex.c" - gchar* _tmp2_; + for (name_it = 0; name_it < names_length1; name_it = name_it + 1) { +#line 716 "HierarchicalTagIndex.c" + gchar* _tmp1_; gchar* name = NULL; #line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp2_ = g_strdup (name_collection[name_it]); + _tmp1_ = g_strdup (name_collection[name_it]); #line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - name = _tmp2_; -#line 729 "HierarchicalTagIndex.c" + name = _tmp1_; +#line 723 "HierarchicalTagIndex.c" { - gchar** _tmp3_; - gint _tmp3__length1; - const gchar* _tmp4_; - gchar* _tmp5_; + gchar** _tmp2_; + gint _tmp2__length1; + const gchar* _tmp3_; + gchar* _tmp4_; #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp3_ = _result_; + _tmp2_ = _result_; #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp3__length1 = _result__length1; + _tmp2__length1 = _result__length1; #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp4_ = name; + _tmp3_ = name; #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp5_ = hierarchical_tag_index_get_path_for_name (self, _tmp4_); + _tmp4_ = hierarchical_tag_index_get_path_for_name (self, _tmp3_); #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _vala_array_add68 (&_result_, &_result__length1, &__result__size_, _tmp5_); + _vala_array_add68 (&_result_, &_result__length1, &__result__size_, _tmp4_); #line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_free0 (name); -#line 747 "HierarchicalTagIndex.c" +#line 741 "HierarchicalTagIndex.c" } } } #line 86 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp6_ = _result_; + _tmp5_ = _result_; #line 86 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp6__length1 = _result__length1; + _tmp5__length1 = _result__length1; #line 86 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (result_length1) { #line 86 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - *result_length1 = _tmp6__length1; -#line 759 "HierarchicalTagIndex.c" + *result_length1 = _tmp5__length1; +#line 753 "HierarchicalTagIndex.c" } #line 86 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - result = _tmp6_; + result = _tmp5_; #line 86 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return result; -#line 765 "HierarchicalTagIndex.c" +#line 759 "HierarchicalTagIndex.c" } -static void value_hierarchical_tag_index_init (GValue* value) { +static void +value_hierarchical_tag_index_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" value->data[0].v_pointer = NULL; -#line 772 "HierarchicalTagIndex.c" +#line 768 "HierarchicalTagIndex.c" } -static void value_hierarchical_tag_index_free_value (GValue* value) { +static void +value_hierarchical_tag_index_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" hierarchical_tag_index_unref (value->data[0].v_pointer); -#line 781 "HierarchicalTagIndex.c" +#line 779 "HierarchicalTagIndex.c" } } -static void value_hierarchical_tag_index_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_hierarchical_tag_index_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" dest_value->data[0].v_pointer = hierarchical_tag_index_ref (src_value->data[0].v_pointer); -#line 791 "HierarchicalTagIndex.c" +#line 792 "HierarchicalTagIndex.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" dest_value->data[0].v_pointer = NULL; -#line 795 "HierarchicalTagIndex.c" +#line 796 "HierarchicalTagIndex.c" } } -static gpointer value_hierarchical_tag_index_peek_pointer (const GValue* value) { +static gpointer +value_hierarchical_tag_index_peek_pointer (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return value->data[0].v_pointer; -#line 803 "HierarchicalTagIndex.c" +#line 806 "HierarchicalTagIndex.c" } -static gchar* value_hierarchical_tag_index_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_hierarchical_tag_index_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (collect_values[0].v_pointer) { -#line 810 "HierarchicalTagIndex.c" +#line 818 "HierarchicalTagIndex.c" HierarchicalTagIndex * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 817 "HierarchicalTagIndex.c" +#line 825 "HierarchicalTagIndex.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.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 821 "HierarchicalTagIndex.c" +#line 829 "HierarchicalTagIndex.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" value->data[0].v_pointer = hierarchical_tag_index_ref (object); -#line 825 "HierarchicalTagIndex.c" +#line 833 "HierarchicalTagIndex.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" value->data[0].v_pointer = NULL; -#line 829 "HierarchicalTagIndex.c" +#line 837 "HierarchicalTagIndex.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return NULL; -#line 833 "HierarchicalTagIndex.c" +#line 841 "HierarchicalTagIndex.c" } -static gchar* value_hierarchical_tag_index_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_hierarchical_tag_index_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ HierarchicalTagIndex ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 844 "HierarchicalTagIndex.c" +#line 857 "HierarchicalTagIndex.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" *object_p = NULL; -#line 850 "HierarchicalTagIndex.c" +#line 863 "HierarchicalTagIndex.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" *object_p = value->data[0].v_pointer; -#line 854 "HierarchicalTagIndex.c" +#line 867 "HierarchicalTagIndex.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" *object_p = hierarchical_tag_index_ref (value->data[0].v_pointer); -#line 858 "HierarchicalTagIndex.c" +#line 871 "HierarchicalTagIndex.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return NULL; -#line 862 "HierarchicalTagIndex.c" +#line 875 "HierarchicalTagIndex.c" } -GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_hierarchical_tag_index (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecHierarchicalTagIndex* spec; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_HIERARCHICAL_TAG_INDEX), NULL); @@ -872,20 +891,25 @@ GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, const gchar* n G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return G_PARAM_SPEC (spec); -#line 876 "HierarchicalTagIndex.c" +#line 895 "HierarchicalTagIndex.c" } -gpointer value_get_hierarchical_tag_index (const GValue* value) { +gpointer +value_get_hierarchical_tag_index (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_INDEX), NULL); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return value->data[0].v_pointer; -#line 885 "HierarchicalTagIndex.c" +#line 906 "HierarchicalTagIndex.c" } -void value_set_hierarchical_tag_index (GValue* value, gpointer v_object) { +void +value_set_hierarchical_tag_index (GValue* value, + gpointer v_object) +{ HierarchicalTagIndex * old; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_INDEX)); @@ -901,22 +925,25 @@ void value_set_hierarchical_tag_index (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" hierarchical_tag_index_ref (value->data[0].v_pointer); -#line 905 "HierarchicalTagIndex.c" +#line 929 "HierarchicalTagIndex.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" value->data[0].v_pointer = NULL; -#line 909 "HierarchicalTagIndex.c" +#line 933 "HierarchicalTagIndex.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" hierarchical_tag_index_unref (old); -#line 915 "HierarchicalTagIndex.c" +#line 939 "HierarchicalTagIndex.c" } } -void value_take_hierarchical_tag_index (GValue* value, gpointer v_object) { +void +value_take_hierarchical_tag_index (GValue* value, + gpointer v_object) +{ HierarchicalTagIndex * old; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_INDEX)); @@ -930,42 +957,48 @@ void value_take_hierarchical_tag_index (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" value->data[0].v_pointer = v_object; -#line 934 "HierarchicalTagIndex.c" +#line 961 "HierarchicalTagIndex.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" value->data[0].v_pointer = NULL; -#line 938 "HierarchicalTagIndex.c" +#line 965 "HierarchicalTagIndex.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" hierarchical_tag_index_unref (old); -#line 944 "HierarchicalTagIndex.c" +#line 971 "HierarchicalTagIndex.c" } } -static void hierarchical_tag_index_class_init (HierarchicalTagIndexClass * klass) { +static void +hierarchical_tag_index_class_init (HierarchicalTagIndexClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" hierarchical_tag_index_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" ((HierarchicalTagIndexClass *) klass)->finalize = hierarchical_tag_index_finalize; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_type_class_add_private (klass, sizeof (HierarchicalTagIndexPrivate)); -#line 956 "HierarchicalTagIndex.c" +#line 985 "HierarchicalTagIndex.c" } -static void hierarchical_tag_index_instance_init (HierarchicalTagIndex * self) { +static void +hierarchical_tag_index_instance_init (HierarchicalTagIndex * self) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" self->priv = HIERARCHICAL_TAG_INDEX_GET_PRIVATE (self); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" self->ref_count = 1; -#line 965 "HierarchicalTagIndex.c" +#line 996 "HierarchicalTagIndex.c" } -static void hierarchical_tag_index_finalize (HierarchicalTagIndex * obj) { +static void +hierarchical_tag_index_finalize (HierarchicalTagIndex * obj) +{ HierarchicalTagIndex * self; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HIERARCHICAL_TAG_INDEX, HierarchicalTagIndex); @@ -975,11 +1008,13 @@ static void hierarchical_tag_index_finalize (HierarchicalTagIndex * obj) { _g_object_unref0 (self->priv->tag_table); #line 9 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_object_unref0 (self->priv->known_paths); -#line 979 "HierarchicalTagIndex.c" +#line 1012 "HierarchicalTagIndex.c" } -GType hierarchical_tag_index_get_type (void) { +GType +hierarchical_tag_index_get_type (void) +{ static volatile gsize hierarchical_tag_index_type_id__volatile = 0; if (g_once_init_enter (&hierarchical_tag_index_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_hierarchical_tag_index_init, value_hierarchical_tag_index_free_value, value_hierarchical_tag_index_copy_value, value_hierarchical_tag_index_peek_pointer, "p", value_hierarchical_tag_index_collect_value, "p", value_hierarchical_tag_index_lcopy_value }; @@ -993,18 +1028,22 @@ GType hierarchical_tag_index_get_type (void) { } -gpointer hierarchical_tag_index_ref (gpointer instance) { +gpointer +hierarchical_tag_index_ref (gpointer instance) +{ HierarchicalTagIndex * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return instance; -#line 1004 "HierarchicalTagIndex.c" +#line 1041 "HierarchicalTagIndex.c" } -void hierarchical_tag_index_unref (gpointer instance) { +void +hierarchical_tag_index_unref (gpointer instance) +{ HierarchicalTagIndex * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -1013,12 +1052,16 @@ void hierarchical_tag_index_unref (gpointer instance) { HIERARCHICAL_TAG_INDEX_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1017 "HierarchicalTagIndex.c" +#line 1056 "HierarchicalTagIndex.c" } } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -1030,7 +1073,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/tags/HierarchicalTagUtilities.c b/src/tags/HierarchicalTagUtilities.c index 2a1695b..554ce6c 100644 --- a/src/tags/HierarchicalTagUtilities.c +++ b/src/tags/HierarchicalTagUtilities.c @@ -1,4 +1,4 @@ -/* HierarchicalTagUtilities.c generated by valac 0.36.6, the Vala compiler +/* HierarchicalTagUtilities.c generated by valac 0.40.4, the Vala compiler * generated from HierarchicalTagUtilities.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -147,48 +148,70 @@ extern TagSourceCollection* tag_global; gpointer hierarchical_tag_utilities_ref (gpointer instance); void hierarchical_tag_utilities_unref (gpointer instance); -GParamSpec* param_spec_hierarchical_tag_utilities (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_hierarchical_tag_utilities (GValue* value, gpointer v_object); -void value_take_hierarchical_tag_utilities (GValue* value, gpointer v_object); +GParamSpec* param_spec_hierarchical_tag_utilities (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_hierarchical_tag_utilities (GValue* value, + gpointer v_object); +void value_take_hierarchical_tag_utilities (GValue* value, + gpointer v_object); gpointer value_get_hierarchical_tag_utilities (const GValue* value); GType hierarchical_tag_utilities_get_type (void) G_GNUC_CONST; -enum { - HIERARCHICAL_TAG_UTILITIES_DUMMY_PROPERTY -}; gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name); #define TAG_PATH_SEPARATOR_STRING "/" gchar* hierarchical_tag_utilities_hierarchical_to_flat (const gchar* path); GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_path); GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path); -gchar* hierarchical_tag_utilities_join_path_components (gchar** path_components, int path_components_length1); +gchar* hierarchical_tag_utilities_join_path_components (gchar** path_components, + int path_components_length1); gchar* hierarchical_tag_utilities_get_basename (const gchar* in_path); -gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, const gchar* foreign_separator); +gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, + const gchar* foreign_separator); gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag); gpointer hierarchical_tag_index_ref (gpointer instance); void hierarchical_tag_index_unref (gpointer instance); -GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_hierarchical_tag_index (GValue* value, gpointer v_object); -void value_take_hierarchical_tag_index (GValue* value, gpointer v_object); +GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_hierarchical_tag_index (GValue* value, + gpointer v_object); +void value_take_hierarchical_tag_index (GValue* value, + gpointer v_object); gpointer value_get_hierarchical_tag_index (const GValue* value); GType hierarchical_tag_index_get_type (void) G_GNUC_CONST; HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_keywords (GeeCollection* h_keywords); HierarchicalTagIndex* hierarchical_tag_index_new (void); HierarchicalTagIndex* hierarchical_tag_index_construct (GType object_type); -gboolean hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, const gchar* path); -void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, const gchar* tag, const gchar* path); +gboolean hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, + const gchar* path); +void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, + const gchar* tag, + const gchar* path); gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType tag_source_collection_get_type (void) G_GNUC_CONST; -gboolean tag_source_collection_exists (TagSourceCollection* self, const gchar* name, gboolean treat_htags_as_root); +gboolean tag_source_collection_exists (TagSourceCollection* self, + const gchar* name, + gboolean treat_htags_as_root); void hierarchical_tag_utilities_cleanup_root_path (const gchar* path); GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; @@ -199,8 +222,12 @@ void tag_flatten (Tag* self); HierarchicalTagUtilities* hierarchical_tag_utilities_new (void); HierarchicalTagUtilities* hierarchical_tag_utilities_construct (GType object_type); static void hierarchical_tag_utilities_finalize (HierarchicalTagUtilities * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); @@ -209,42 +236,32 @@ static gint _vala_array_length (gpointer array); * hierarchical tag data model (e.g., "/Animals"). if 'name' is already a path compatible with * the hierarchical data model, 'name' is returned untouched */ -gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name) { +gchar* +hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name) +{ gchar* result = NULL; - const gchar* _tmp0_; - gboolean _tmp1_; #line 14 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (name != NULL, NULL); #line 15 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0_ = name; -#line 15 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = g_str_has_prefix (_tmp0_, TAG_PATH_SEPARATOR_STRING); -#line 15 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (!_tmp1_) { -#line 225 "HierarchicalTagUtilities.c" - const gchar* _tmp2_; - gchar* _tmp3_; + if (!g_str_has_prefix (name, TAG_PATH_SEPARATOR_STRING)) { +#line 248 "HierarchicalTagUtilities.c" + gchar* _tmp0_; #line 16 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp2_ = name; + _tmp0_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, name, NULL); #line 16 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp3_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp2_, NULL); -#line 16 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - result = _tmp3_; + result = _tmp0_; #line 16 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 236 "HierarchicalTagUtilities.c" +#line 256 "HierarchicalTagUtilities.c" } else { - const gchar* _tmp4_; - gchar* _tmp5_; + gchar* _tmp1_; #line 18 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp4_ = name; + _tmp1_ = g_strdup (name); #line 18 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp5_ = g_strdup (_tmp4_); -#line 18 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - result = _tmp5_; + result = _tmp1_; #line 18 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 248 "HierarchicalTagUtilities.c" +#line 265 "HierarchicalTagUtilities.c" } } @@ -256,229 +273,163 @@ gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name) { * only one path component; invoking this method with a 'path' argument other than a top-level * path will cause an assertion failure. */ -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, + glong maxlen) +{ glong result = 0L; gchar* end = NULL; gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 279 "HierarchicalTagUtilities.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 287 "HierarchicalTagUtilities.c" +#line 297 "HierarchicalTagUtilities.c" } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 299 "HierarchicalTagUtilities.c" +#line 306 "HierarchicalTagUtilities.c" } } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, + glong offset, + glong len) +{ gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + glong _tmp6_; + gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#line 323 "HierarchicalTagUtilities.c" - glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = _tmp2_ >= ((glong) 0); -#line 329 "HierarchicalTagUtilities.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = len >= ((glong) 0); +#line 327 "HierarchicalTagUtilities.c" } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 333 "HierarchicalTagUtilities.c" +#line 331 "HierarchicalTagUtilities.c" } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = string_strnlen ((gchar*) self, offset + len); #line 337 "HierarchicalTagUtilities.c" - glong _tmp3_; - glong _tmp4_; - glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 349 "HierarchicalTagUtilities.c" } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#line 359 "HierarchicalTagUtilities.c" + gint _tmp1_; + gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = (glong) _tmp2_; +#line 347 "HierarchicalTagUtilities.c" } -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp8_ < ((glong) 0)) { -#line 365 "HierarchicalTagUtilities.c" - glong _tmp9_; - glong _tmp10_; - glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 379 "HierarchicalTagUtilities.c" +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset < ((glong) 0)) { +#line 351 "HierarchicalTagUtilities.c" + glong _tmp3_; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 359 "HierarchicalTagUtilities.c" } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 389 "HierarchicalTagUtilities.c" + glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 366 "HierarchicalTagUtilities.c" } -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp14_ < ((glong) 0)) { -#line 395 "HierarchicalTagUtilities.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 404 "HierarchicalTagUtilities.c" +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (len < ((glong) 0)) { +#line 370 "HierarchicalTagUtilities.c" + glong _tmp5_; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp5_ - offset; +#line 376 "HierarchicalTagUtilities.c" } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 424 "HierarchicalTagUtilities.c" +#line 388 "HierarchicalTagUtilities.c" } -gchar* hierarchical_tag_utilities_hierarchical_to_flat (const gchar* path) { +gchar* +hierarchical_tag_utilities_hierarchical_to_flat (const gchar* path) +{ gchar* result = NULL; - const gchar* _tmp0_; - gboolean _tmp1_; #line 28 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (path != NULL, NULL); #line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0_ = path; -#line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = g_str_has_prefix (_tmp0_, TAG_PATH_SEPARATOR_STRING); -#line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp1_) { -#line 440 "HierarchicalTagUtilities.c" - const gchar* _tmp2_; - GeeList* _tmp3_; - GeeList* _tmp4_; - gint _tmp5_; - gint _tmp6_; - const gchar* _tmp7_; - gchar* _tmp8_; + if (g_str_has_prefix (path, TAG_PATH_SEPARATOR_STRING)) { +#line 400 "HierarchicalTagUtilities.c" + GeeList* _tmp0_; + GeeList* _tmp1_; + gint _tmp2_; + gint _tmp3_; + gchar* _tmp4_; #line 30 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp2_ = path; + _tmp0_ = hierarchical_tag_utilities_enumerate_path_components (path); #line 30 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp3_ = hierarchical_tag_utilities_enumerate_path_components (_tmp2_); + _tmp1_ = _tmp0_; #line 30 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp4_ = _tmp3_; -#line 30 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); #line 30 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 30 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _vala_assert (_tmp6_ == 1, "enumerate_path_components(path).size == 1"); + _vala_assert (_tmp3_ == 1, "enumerate_path_components(path).size == 1"); #line 30 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _g_object_unref0 (_tmp4_); -#line 32 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7_ = path; + _g_object_unref0 (_tmp1_); #line 32 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp8_ = string_substring (_tmp7_, (glong) 1, (glong) -1); + _tmp4_ = string_substring (path, (glong) 1, (glong) -1); #line 32 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - result = _tmp8_; + result = _tmp4_; #line 32 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 470 "HierarchicalTagUtilities.c" +#line 424 "HierarchicalTagUtilities.c" } else { - const gchar* _tmp9_; - gchar* _tmp10_; -#line 34 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp9_ = path; + gchar* _tmp5_; #line 34 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp10_ = g_strdup (_tmp9_); + _tmp5_ = g_strdup (path); #line 34 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - result = _tmp10_; + result = _tmp5_; #line 34 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 482 "HierarchicalTagUtilities.c" +#line 433 "HierarchicalTagUtilities.c" } } @@ -488,136 +439,135 @@ gchar* hierarchical_tag_utilities_hierarchical_to_flat (const gchar* path) { * from most basic to most derived. For example, if 'path' == "/Animals/Mammals/Elephant", * the list { "/Animals", "/Animals/Mammals" } is returned */ -GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path) { +GeeList* +hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path) +{ GeeList* result = NULL; gchar* path = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; GeeList* _result_ = NULL; - GeeArrayList* _tmp2_; + GeeArrayList* _tmp1_; gchar* accumulator = NULL; - gchar* _tmp3_; + gchar* _tmp2_; #line 43 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (in_path != NULL, NULL); #line 44 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0_ = in_path; -#line 44 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp0_); + _tmp0_ = hierarchical_tag_utilities_flat_to_hierarchical (in_path); #line 44 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - path = _tmp1_; + path = _tmp0_; #line 46 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp2_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 46 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _result_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList); + _result_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_LIST, GeeList); #line 48 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp3_ = g_strdup (""); + _tmp2_ = g_strdup (""); #line 48 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - accumulator = _tmp3_; -#line 517 "HierarchicalTagUtilities.c" + accumulator = _tmp2_; +#line 467 "HierarchicalTagUtilities.c" { GeeList* _component_list = NULL; - const gchar* _tmp4_; - GeeList* _tmp5_; + const gchar* _tmp3_; + GeeList* _tmp4_; gint _component_size = 0; - GeeList* _tmp6_; + GeeList* _tmp5_; + gint _tmp6_; gint _tmp7_; - gint _tmp8_; gint _component_index = 0; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp4_ = path; + _tmp3_ = path; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp5_ = hierarchical_tag_utilities_enumerate_path_components (_tmp4_); + _tmp4_ = hierarchical_tag_utilities_enumerate_path_components (_tmp3_); #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _component_list = _tmp5_; + _component_list = _tmp4_; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6_ = _component_list; + _tmp5_ = _component_list; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _component_size = _tmp8_; + _component_size = _tmp7_; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _component_index = -1; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" while (TRUE) { -#line 545 "HierarchicalTagUtilities.c" +#line 495 "HierarchicalTagUtilities.c" + gint _tmp8_; gint _tmp9_; gint _tmp10_; - gint _tmp11_; gchar* component = NULL; - GeeList* _tmp12_; - gint _tmp13_; - gpointer _tmp14_; + GeeList* _tmp11_; + gint _tmp12_; + gpointer _tmp13_; + const gchar* _tmp14_; const gchar* _tmp15_; - const gchar* _tmp16_; + gchar* _tmp16_; gchar* _tmp17_; gchar* _tmp18_; - gchar* _tmp19_; + const gchar* _tmp19_; const gchar* _tmp20_; - const gchar* _tmp21_; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp9_ = _component_index; + _tmp8_ = _component_index; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _component_index = _tmp9_ + 1; + _component_index = _tmp8_ + 1; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp10_ = _component_index; + _tmp9_ = _component_index; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp11_ = _component_size; + _tmp10_ = _component_size; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (!(_tmp10_ < _tmp11_)) { + if (!(_tmp9_ < _tmp10_)) { #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" break; -#line 572 "HierarchicalTagUtilities.c" +#line 522 "HierarchicalTagUtilities.c" } #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp12_ = _component_list; + _tmp11_ = _component_list; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp13_ = _component_index; + _tmp12_ = _component_index; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp14_ = gee_list_get (_tmp12_, _tmp13_); + _tmp13_ = gee_list_get (_tmp11_, _tmp12_); #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - component = (gchar*) _tmp14_; + component = (gchar*) _tmp13_; #line 50 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp15_ = accumulator; + _tmp14_ = accumulator; #line 50 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp16_ = component; + _tmp15_ = component; #line 50 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp17_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp16_, NULL); + _tmp16_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp15_, NULL); #line 50 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 50 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp19_ = g_strconcat (_tmp15_, _tmp18_, NULL); + _tmp18_ = g_strconcat (_tmp14_, _tmp17_, NULL); #line 50 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (accumulator); #line 50 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - accumulator = _tmp19_; + accumulator = _tmp18_; #line 50 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp17_); #line 51 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp20_ = accumulator; + _tmp19_ = accumulator; #line 51 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp21_ = path; + _tmp20_ = path; #line 51 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (g_strcmp0 (_tmp20_, _tmp21_) != 0) { -#line 604 "HierarchicalTagUtilities.c" - GeeList* _tmp22_; - const gchar* _tmp23_; + if (g_strcmp0 (_tmp19_, _tmp20_) != 0) { +#line 554 "HierarchicalTagUtilities.c" + GeeList* _tmp21_; + const gchar* _tmp22_; #line 52 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp22_ = _result_; + _tmp21_ = _result_; #line 52 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp23_ = accumulator; + _tmp22_ = accumulator; #line 52 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_); -#line 613 "HierarchicalTagUtilities.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), _tmp22_); +#line 563 "HierarchicalTagUtilities.c" } #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (component); -#line 617 "HierarchicalTagUtilities.c" +#line 567 "HierarchicalTagUtilities.c" } #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_object_unref0 (_component_list); -#line 621 "HierarchicalTagUtilities.c" +#line 571 "HierarchicalTagUtilities.c" } #line 55 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" result = _result_; @@ -627,7 +577,7 @@ GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path _g_free0 (path); #line 55 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 631 "HierarchicalTagUtilities.c" +#line 581 "HierarchicalTagUtilities.c" } @@ -637,101 +587,100 @@ GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path * 'path' == "/Animals/Mammals/Elephant" the list { "Animals", "Mammals", "Elephant" } will * be returned */ -GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_path) { +GeeList* +hierarchical_tag_utilities_enumerate_path_components (const gchar* in_path) +{ GeeList* result = NULL; gchar* path = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; GeeArrayList* components = NULL; - GeeArrayList* _tmp2_; + GeeArrayList* _tmp1_; gchar** raw_components = NULL; - const gchar* _tmp3_; + const gchar* _tmp2_; + gchar** _tmp3_; gchar** _tmp4_; - gchar** _tmp5_; gint raw_components_length1; gint _raw_components_size_; - gchar** _tmp6_; - gint _tmp6__length1; - GeeArrayList* _tmp11_; + gchar** _tmp5_; + gint _tmp5__length1; + GeeArrayList* _tmp10_; + gint _tmp11_; gint _tmp12_; - gint _tmp13_; #line 64 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (in_path != NULL, NULL); #line 65 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0_ = in_path; -#line 65 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp0_); + _tmp0_ = hierarchical_tag_utilities_flat_to_hierarchical (in_path); #line 65 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - path = _tmp1_; + path = _tmp0_; #line 67 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp2_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 67 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - components = _tmp2_; + components = _tmp1_; #line 69 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp3_ = path; + _tmp2_ = path; #line 69 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp5_ = _tmp4_ = g_strsplit (_tmp3_, TAG_PATH_SEPARATOR_STRING, 0); + _tmp4_ = _tmp3_ = g_strsplit (_tmp2_, TAG_PATH_SEPARATOR_STRING, 0); #line 69 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - raw_components = _tmp5_; + raw_components = _tmp4_; #line 69 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - raw_components_length1 = _vala_array_length (_tmp4_); + raw_components_length1 = _vala_array_length (_tmp3_); #line 69 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _raw_components_size_ = raw_components_length1; #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6_ = raw_components; + _tmp5_ = raw_components; #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6__length1 = raw_components_length1; -#line 685 "HierarchicalTagUtilities.c" + _tmp5__length1 = raw_components_length1; +#line 634 "HierarchicalTagUtilities.c" { gchar** component_collection = NULL; gint component_collection_length1 = 0; gint _component_collection_size_ = 0; gint component_it = 0; #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - component_collection = _tmp6_; + component_collection = _tmp5_; #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - component_collection_length1 = _tmp6__length1; + component_collection_length1 = _tmp5__length1; #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - for (component_it = 0; component_it < _tmp6__length1; component_it = component_it + 1) { -#line 697 "HierarchicalTagUtilities.c" - gchar* _tmp7_; + for (component_it = 0; component_it < _tmp5__length1; component_it = component_it + 1) { +#line 646 "HierarchicalTagUtilities.c" + gchar* _tmp6_; gchar* component = NULL; #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7_ = g_strdup (component_collection[component_it]); + _tmp6_ = g_strdup (component_collection[component_it]); #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - component = _tmp7_; -#line 704 "HierarchicalTagUtilities.c" + component = _tmp6_; +#line 653 "HierarchicalTagUtilities.c" { - const gchar* _tmp8_; + const gchar* _tmp7_; #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp8_ = component; + _tmp7_ = component; #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (g_strcmp0 (_tmp8_, "") != 0) { -#line 711 "HierarchicalTagUtilities.c" - GeeArrayList* _tmp9_; - const gchar* _tmp10_; + if (g_strcmp0 (_tmp7_, "") != 0) { +#line 660 "HierarchicalTagUtilities.c" + GeeArrayList* _tmp8_; + const gchar* _tmp9_; #line 73 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp9_ = components; + _tmp8_ = components; #line 73 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp10_ = component; + _tmp9_ = component; #line 73 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); -#line 720 "HierarchicalTagUtilities.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_); +#line 669 "HierarchicalTagUtilities.c" } #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (component); -#line 724 "HierarchicalTagUtilities.c" +#line 673 "HierarchicalTagUtilities.c" } } } #line 76 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp11_ = components; + _tmp10_ = components; #line 76 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 76 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 76 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _vala_assert (_tmp13_ > 0, "components.size > 0"); + _vala_assert (_tmp12_ > 0, "components.size > 0"); #line 78 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" result = G_TYPE_CHECK_INSTANCE_CAST (components, GEE_TYPE_LIST, GeeList); #line 78 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -740,7 +689,7 @@ GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_p _g_free0 (path); #line 78 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 744 "HierarchicalTagUtilities.c" +#line 693 "HierarchicalTagUtilities.c" } @@ -749,515 +698,417 @@ GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_p * For example if 'path_elements' is the list { "Animals", "Mammals", "Elephant" } * the path "/Animals/Mammals/Elephant" will be returned */ -static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) { +static gchar* +_vala_g_strjoinv (const gchar* separator, + gchar** str_array, + int str_array_length1) +{ gchar* result = NULL; - const gchar* _tmp0_; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - gchar** _tmp3_; - gint _tmp3__length1; -#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = separator; -#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp0_ == NULL) { -#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gboolean _tmp0_ = FALSE; +#line 1092 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (separator == NULL) { +#line 1093 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" separator = ""; -#line 766 "HierarchicalTagUtilities.c" - } -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = str_array; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3__length1 = str_array_length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ != NULL) { -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = TRUE; -#line 776 "HierarchicalTagUtilities.c" - } else { - gchar** _tmp4_; - gint _tmp4__length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = str_array; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4__length1 = str_array_length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = _tmp4__length1 > 0; -#line 786 "HierarchicalTagUtilities.c" +#line 713 "HierarchicalTagUtilities.c" } -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp2_) { -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = TRUE; -#line 792 "HierarchicalTagUtilities.c" - } else { - gboolean _tmp5_ = FALSE; - gchar** _tmp6_; - gint _tmp6__length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str_array; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6__length1 = str_array_length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp6__length1 == -1) { -#line 803 "HierarchicalTagUtilities.c" - gchar** _tmp7_; - gint _tmp7__length1; - const gchar* _tmp8_; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = str_array; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7__length1 = str_array_length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_[0]; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = _tmp8_ != NULL; -#line 815 "HierarchicalTagUtilities.c" +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array != NULL) { +#line 717 "HierarchicalTagUtilities.c" + gboolean _tmp1_ = FALSE; +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array_length1 > 0) { +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = TRUE; +#line 723 "HierarchicalTagUtilities.c" } else { -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = FALSE; -#line 819 "HierarchicalTagUtilities.c" + gboolean _tmp2_ = FALSE; +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array_length1 == -1) { +#line 728 "HierarchicalTagUtilities.c" + const gchar* _tmp3_; +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = str_array[0]; +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp3_ != NULL; +#line 734 "HierarchicalTagUtilities.c" + } else { +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = FALSE; +#line 738 "HierarchicalTagUtilities.c" + } +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = _tmp2_; +#line 742 "HierarchicalTagUtilities.c" } -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = _tmp5_; -#line 823 "HierarchicalTagUtilities.c" +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = _tmp1_; +#line 746 "HierarchicalTagUtilities.c" + } else { +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = FALSE; +#line 750 "HierarchicalTagUtilities.c" } -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_) { -#line 827 "HierarchicalTagUtilities.c" +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp0_) { +#line 754 "HierarchicalTagUtilities.c" gint i = 0; gsize len = 0UL; - gint _tmp31_; - gint _tmp33_; - gint _tmp34_; - gsize _tmp35_; - const gchar* _tmp36_; - gint _tmp37_; - gint _tmp38_; - gint _tmp39_; + gint _tmp20_; + gint _tmp22_; + gint _tmp23_; + gsize _tmp24_; + gint _tmp25_; + gint _tmp26_; + gint _tmp27_; const gchar* res = NULL; - gsize _tmp40_; - void* _tmp41_; + gsize _tmp28_; + void* _tmp29_; void* ptr = NULL; - const gchar* _tmp42_; - gchar** _tmp43_; - gint _tmp43__length1; - const gchar* _tmp44_; - void* _tmp45_; - const gchar* _tmp62_; -#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + const gchar* _tmp30_; + const gchar* _tmp31_; + void* _tmp32_; + const gchar* _tmp45_; +#line 1097 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" len = (gsize) 1; -#line 850 "HierarchicalTagUtilities.c" +#line 774 "HierarchicalTagUtilities.c" { - gboolean _tmp9_ = FALSE; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gboolean _tmp4_ = FALSE; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" i = 0; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = TRUE; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = TRUE; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" while (TRUE) { -#line 859 "HierarchicalTagUtilities.c" - gboolean _tmp11_ = FALSE; - gboolean _tmp12_ = FALSE; - gchar** _tmp13_; - gint _tmp13__length1; - gint _tmp21_ = 0; - gchar** _tmp22_; - gint _tmp22__length1; - gint _tmp23_; - const gchar* _tmp24_; - gsize _tmp30_; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (!_tmp9_) { -#line 872 "HierarchicalTagUtilities.c" - gint _tmp10_; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = i; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - i = _tmp10_ + 1; -#line 878 "HierarchicalTagUtilities.c" +#line 783 "HierarchicalTagUtilities.c" + gboolean _tmp6_ = FALSE; + gboolean _tmp7_ = FALSE; + gint _tmp12_ = 0; + gint _tmp13_; + const gchar* _tmp14_; + gsize _tmp19_; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (!_tmp4_) { +#line 792 "HierarchicalTagUtilities.c" + gint _tmp5_; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = i; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + i = _tmp5_ + 1; +#line 798 "HierarchicalTagUtilities.c" } -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = FALSE; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = str_array; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13__length1 = str_array_length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp13__length1 != -1) { -#line 888 "HierarchicalTagUtilities.c" - gint _tmp14_; - gchar** _tmp15_; - gint _tmp15__length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = i; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = str_array; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15__length1 = str_array_length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = _tmp14_ < _tmp15__length1; -#line 900 "HierarchicalTagUtilities.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = FALSE; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array_length1 != -1) { +#line 804 "HierarchicalTagUtilities.c" + gint _tmp8_; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = i; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp8_ < str_array_length1; +#line 810 "HierarchicalTagUtilities.c" } else { -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = FALSE; -#line 904 "HierarchicalTagUtilities.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = FALSE; +#line 814 "HierarchicalTagUtilities.c" } -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp12_) { -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = TRUE; -#line 910 "HierarchicalTagUtilities.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp7_) { +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = TRUE; +#line 820 "HierarchicalTagUtilities.c" } else { - gboolean _tmp16_ = FALSE; - gchar** _tmp17_; - gint _tmp17__length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = str_array; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17__length1 = str_array_length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp17__length1 == -1) { -#line 921 "HierarchicalTagUtilities.c" - gchar** _tmp18_; - gint _tmp18__length1; - gint _tmp19_; - const gchar* _tmp20_; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = str_array; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18__length1 = str_array_length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = i; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = _tmp18_[_tmp19_]; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = _tmp20_ != NULL; -#line 936 "HierarchicalTagUtilities.c" + gboolean _tmp9_ = FALSE; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array_length1 == -1) { +#line 825 "HierarchicalTagUtilities.c" + gint _tmp10_; + const gchar* _tmp11_; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = i; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp11_ = str_array[_tmp10_]; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = _tmp11_ != NULL; +#line 834 "HierarchicalTagUtilities.c" } else { -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = FALSE; -#line 940 "HierarchicalTagUtilities.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = FALSE; +#line 838 "HierarchicalTagUtilities.c" } -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp16_; -#line 944 "HierarchicalTagUtilities.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp9_; +#line 842 "HierarchicalTagUtilities.c" } -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (!_tmp11_) { -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (!_tmp6_) { +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" break; -#line 950 "HierarchicalTagUtilities.c" +#line 848 "HierarchicalTagUtilities.c" } -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = str_array; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22__length1 = str_array_length1; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp23_ = i; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp24_ = _tmp22_[_tmp23_]; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp24_ != NULL) { -#line 962 "HierarchicalTagUtilities.c" - gchar** _tmp25_; - gint _tmp25__length1; - gint _tmp26_; - const gchar* _tmp27_; - gint _tmp28_; - gint _tmp29_; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp25_ = str_array; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp25__length1 = str_array_length1; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp26_ = i; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp27_ = _tmp25_[_tmp26_]; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp29_ = _tmp28_; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = _tmp29_; -#line 983 "HierarchicalTagUtilities.c" +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp13_ = i; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp14_ = str_array[_tmp13_]; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp14_ != NULL) { +#line 856 "HierarchicalTagUtilities.c" + gint _tmp15_; + const gchar* _tmp16_; + gint _tmp17_; + gint _tmp18_; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp15_ = i; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp16_ = str_array[_tmp15_]; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp17_ = strlen ((const gchar*) _tmp16_); +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp18_ = _tmp17_; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp12_ = _tmp18_; +#line 871 "HierarchicalTagUtilities.c" } else { -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = 0; -#line 987 "HierarchicalTagUtilities.c" +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp12_ = 0; +#line 875 "HierarchicalTagUtilities.c" } -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp30_ = len; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp30_ + _tmp21_; -#line 993 "HierarchicalTagUtilities.c" +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp19_ = len; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp19_ + _tmp12_; +#line 881 "HierarchicalTagUtilities.c" } } -#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp31_ = i; -#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp31_ == 0) { -#line 1000 "HierarchicalTagUtilities.c" - gchar* _tmp32_; -#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp32_ = g_strdup (""); -#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp32_; -#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp20_ = i; +#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp20_ == 0) { +#line 888 "HierarchicalTagUtilities.c" + gchar* _tmp21_; +#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp21_ = g_strdup (""); +#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp21_; +#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1008 "HierarchicalTagUtilities.c" +#line 896 "HierarchicalTagUtilities.c" } -#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp33_ = i; -#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - str_array_length1 = _tmp33_; -#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp34_ = str_array_length1; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp35_ = len; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp36_ = separator; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp38_ = _tmp37_; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp39_ = i; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp40_ = len; -#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp41_ = g_malloc (_tmp40_); -#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - res = _tmp41_; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp42_ = res; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp43_ = str_array; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp43__length1 = str_array_length1; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp44_ = _tmp43_[0]; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - ptr = _tmp45_; -#line 1046 "HierarchicalTagUtilities.c" +#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp22_ = i; +#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + str_array_length1 = _tmp22_; +#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp23_ = str_array_length1; +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp24_ = len; +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp25_ = strlen ((const gchar*) separator); +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp26_ = _tmp25_; +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp27_ = i; +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp24_ + (_tmp26_ * (_tmp27_ - 1)); +#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp28_ = len; +#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp29_ = g_malloc (_tmp28_); +#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + res = _tmp29_; +#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp30_ = res; +#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp31_ = str_array[0]; +#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp32_ = g_stpcpy ((void*) _tmp30_, (const gchar*) _tmp31_); +#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + ptr = _tmp32_; +#line 928 "HierarchicalTagUtilities.c" { - gboolean _tmp46_ = FALSE; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gboolean _tmp33_ = FALSE; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" i = 1; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp46_ = TRUE; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp33_ = TRUE; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" while (TRUE) { -#line 1055 "HierarchicalTagUtilities.c" - gint _tmp48_; - gchar** _tmp49_; - gint _tmp49__length1; - void* _tmp50_; - const gchar* _tmp51_; - void* _tmp52_; - const gchar* _tmp53_ = NULL; - gchar** _tmp54_; - gint _tmp54__length1; - gint _tmp55_; - const gchar* _tmp56_; - void* _tmp60_; - void* _tmp61_; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (!_tmp46_) { -#line 1071 "HierarchicalTagUtilities.c" - gint _tmp47_; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp47_ = i; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - i = _tmp47_ + 1; -#line 1077 "HierarchicalTagUtilities.c" +#line 937 "HierarchicalTagUtilities.c" + gint _tmp35_; + void* _tmp36_; + void* _tmp37_; + const gchar* _tmp38_ = NULL; + gint _tmp39_; + const gchar* _tmp40_; + void* _tmp43_; + void* _tmp44_; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (!_tmp33_) { +#line 948 "HierarchicalTagUtilities.c" + gint _tmp34_; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp34_ = i; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + i = _tmp34_ + 1; +#line 954 "HierarchicalTagUtilities.c" } -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp46_ = FALSE; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp48_ = i; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp49_ = str_array; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp49__length1 = str_array_length1; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (!(_tmp48_ < _tmp49__length1)) { -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp33_ = FALSE; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp35_ = i; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (!(_tmp35_ < str_array_length1)) { +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" break; -#line 1091 "HierarchicalTagUtilities.c" +#line 964 "HierarchicalTagUtilities.c" } -#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp50_ = ptr; -#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp51_ = separator; -#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - ptr = _tmp52_; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp54_ = str_array; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp54__length1 = str_array_length1; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp55_ = i; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp56_ = _tmp54_[_tmp55_]; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp56_ != NULL) { -#line 1111 "HierarchicalTagUtilities.c" - gchar** _tmp57_; - gint _tmp57__length1; - gint _tmp58_; - const gchar* _tmp59_; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp57_ = str_array; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp57__length1 = str_array_length1; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp58_ = i; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp59_ = _tmp57_[_tmp58_]; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp53_ = (const gchar*) _tmp59_; -#line 1126 "HierarchicalTagUtilities.c" +#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp36_ = ptr; +#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp37_ = g_stpcpy (_tmp36_, (const gchar*) separator); +#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + ptr = _tmp37_; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp39_ = i; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp40_ = str_array[_tmp39_]; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp40_ != NULL) { +#line 978 "HierarchicalTagUtilities.c" + gint _tmp41_; + const gchar* _tmp42_; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp41_ = i; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp42_ = str_array[_tmp41_]; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp38_ = (const gchar*) _tmp42_; +#line 987 "HierarchicalTagUtilities.c" } else { -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp53_ = ""; -#line 1130 "HierarchicalTagUtilities.c" +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp38_ = ""; +#line 991 "HierarchicalTagUtilities.c" } -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp60_ = ptr; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - ptr = _tmp61_; -#line 1138 "HierarchicalTagUtilities.c" +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp43_ = ptr; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp44_ = g_stpcpy (_tmp43_, _tmp38_); +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + ptr = _tmp44_; +#line 999 "HierarchicalTagUtilities.c" } } -#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp62_ = res; -#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp45_ = res; +#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" res = NULL; -#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (gchar*) _tmp62_; -#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (gchar*) _tmp45_; +#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1149 "HierarchicalTagUtilities.c" +#line 1010 "HierarchicalTagUtilities.c" } else { - gchar* _tmp63_; -#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp63_ = g_strdup (""); -#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp63_; -#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp46_; +#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp46_ = g_strdup (""); +#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp46_; +#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1158 "HierarchicalTagUtilities.c" +#line 1019 "HierarchicalTagUtilities.c" } } -gchar* hierarchical_tag_utilities_join_path_components (gchar** path_components, int path_components_length1) { +gchar* +hierarchical_tag_utilities_join_path_components (gchar** path_components, + int path_components_length1) +{ gchar* result = NULL; - gchar** _tmp0_; - gint _tmp0__length1; gchar* tmp = NULL; - gchar** _tmp1_; - gint _tmp1__length1; - gchar* _tmp2_; + gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; gchar* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; - gchar** _tmp6_; - gchar** _tmp7_; - gint _tmp7__length1; - gchar* _tmp8_; - gchar* _tmp9_; -#line 87 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0_ = path_components; -#line 87 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0__length1 = path_components_length1; + gchar** _tmp4_; + gchar** _tmp5_; + gint _tmp5__length1; + gchar* _tmp6_; + gchar* _tmp7_; #line 87 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp0__length1 <= 0) { + if (path_components_length1 <= 0) { #line 88 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" result = NULL; #line 88 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1189 "HierarchicalTagUtilities.c" +#line 1045 "HierarchicalTagUtilities.c" } #line 89 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = path_components; -#line 89 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1__length1 = path_components_length1; -#line 89 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp2_ = _vala_g_strjoinv (TAG_PATH_SEPARATOR_STRING, _tmp1_, _tmp1__length1); + _tmp0_ = _vala_g_strjoinv (TAG_PATH_SEPARATOR_STRING, path_components, path_components_length1); #line 89 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - tmp = _tmp2_; + tmp = _tmp0_; #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp3_ = g_strdup (""); + _tmp1_ = g_strdup (""); #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp4_ = tmp; + _tmp2_ = tmp; #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp5_ = g_strdup (_tmp4_); + _tmp3_ = g_strdup (_tmp2_); #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6_ = g_new0 (gchar*, 2 + 1); + _tmp4_ = g_new0 (gchar*, 2 + 1); #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6_[0] = _tmp3_; + _tmp4_[0] = _tmp1_; #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6_[1] = _tmp5_; + _tmp4_[1] = _tmp3_; #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7__length1 = 2; + _tmp5__length1 = 2; #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp8_ = _vala_g_strjoinv (TAG_PATH_SEPARATOR_STRING, _tmp7_, 2); + _tmp6_ = _vala_g_strjoinv (TAG_PATH_SEPARATOR_STRING, _tmp5_, 2); #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7_ = (_vala_array_free (_tmp7_, _tmp7__length1, (GDestroyNotify) g_free), NULL); + _tmp5_ = (_vala_array_free (_tmp5_, _tmp5__length1, (GDestroyNotify) g_free), NULL); #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - result = _tmp9_; + result = _tmp7_; #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (tmp); #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1227 "HierarchicalTagUtilities.c" +#line 1079 "HierarchicalTagUtilities.c" } -gchar* hierarchical_tag_utilities_get_basename (const gchar* in_path) { +gchar* +hierarchical_tag_utilities_get_basename (const gchar* in_path) +{ gchar* result = NULL; gchar* path = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; GeeList* components = NULL; - GeeList* _tmp2_; + GeeList* _tmp1_; gchar* basename = NULL; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; - gpointer _tmp5_; + gpointer _tmp4_; #line 93 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (in_path != NULL, NULL); #line 94 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0_ = in_path; -#line 94 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp0_); + _tmp0_ = hierarchical_tag_utilities_flat_to_hierarchical (in_path); #line 94 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - path = _tmp1_; + path = _tmp0_; #line 96 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp2_ = hierarchical_tag_utilities_enumerate_path_components (path); + _tmp1_ = hierarchical_tag_utilities_enumerate_path_components (path); #line 96 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - components = _tmp2_; + components = _tmp1_; #line 98 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (components, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (components, GEE_TYPE_COLLECTION, GeeCollection)); #line 98 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 98 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp5_ = gee_list_get (components, _tmp4_ - 1); + _tmp4_ = gee_list_get (components, _tmp3_ - 1); #line 98 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - basename = (gchar*) _tmp5_; + basename = (gchar*) _tmp4_; #line 100 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" result = basename; #line 100 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -1266,348 +1117,326 @@ gchar* hierarchical_tag_utilities_get_basename (const gchar* in_path) { _g_free0 (path); #line 100 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1270 "HierarchicalTagUtilities.c" +#line 1121 "HierarchicalTagUtilities.c" } -static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { +static gchar* +string_replace (const gchar* self, + const gchar* old, + const gchar* replacement) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if ((*((gchar*) self)) == '\0') { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 1289 "HierarchicalTagUtilities.c" +#line 1144 "HierarchicalTagUtilities.c" } else { - const gchar* _tmp2_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; -#line 1296 "HierarchicalTagUtilities.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) old)) == '\0'; +#line 1148 "HierarchicalTagUtilities.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = TRUE; -#line 1302 "HierarchicalTagUtilities.c" +#line 1154 "HierarchicalTagUtilities.c" } else { - const gchar* _tmp3_; - const gchar* _tmp4_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = replacement; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; -#line 1312 "HierarchicalTagUtilities.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (old, replacement) == 0; +#line 1158 "HierarchicalTagUtilities.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 1316 "HierarchicalTagUtilities.c" - gchar* _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = g_strdup (self); -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1162 "HierarchicalTagUtilities.c" + gchar* _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = g_strdup (self); +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1324 "HierarchicalTagUtilities.c" +#line 1170 "HierarchicalTagUtilities.c" } { GRegex* regex = NULL; - const gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - GRegex* _tmp9_; - GRegex* _tmp10_; - gchar* _tmp11_ = NULL; - GRegex* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = old; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = g_regex_escape_string (_tmp6_, -1); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = _tmp9_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp8_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - regex = _tmp10_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp3_; + gchar* _tmp4_; + GRegex* _tmp5_; + GRegex* _tmp6_; + gchar* _tmp7_ = NULL; + GRegex* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_regex_escape_string (old, -1); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = _tmp3_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp5_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp4_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + regex = _tmp6_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 1356 "HierarchicalTagUtilities.c" +#line 1198 "HierarchicalTagUtilities.c" goto __catch63_g_regex_error; } -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 1365 "HierarchicalTagUtilities.c" +#line 1207 "HierarchicalTagUtilities.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = regex; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = replacement; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp14_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = regex; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp9_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 1381 "HierarchicalTagUtilities.c" +#line 1221 "HierarchicalTagUtilities.c" goto __catch63_g_regex_error; } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 1392 "HierarchicalTagUtilities.c" +#line 1232 "HierarchicalTagUtilities.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = _tmp11_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = NULL; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp15_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp11_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = _tmp7_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = NULL; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp10_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp7_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1406 "HierarchicalTagUtilities.c" +#line 1246 "HierarchicalTagUtilities.c" } goto __finally63; __catch63_g_regex_error: { GError* e = NULL; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 1420 "HierarchicalTagUtilities.c" +#line 1260 "HierarchicalTagUtilities.c" } __finally63: -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 1431 "HierarchicalTagUtilities.c" +#line 1271 "HierarchicalTagUtilities.c" } } -static gchar string_get (const gchar* self, glong index) { +static gchar +string_get (const gchar* self, + glong index) +{ gchar result = '\0'; - glong _tmp0_; - gchar _tmp1_; -#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar _tmp0_; +#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = index; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = ((gchar*) self)[index]; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1450 "HierarchicalTagUtilities.c" +#line 1290 "HierarchicalTagUtilities.c" } -gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, const gchar* foreign_separator) { +gchar* +hierarchical_tag_utilities_canonicalize (const gchar* in_tag, + const gchar* foreign_separator) +{ gchar* result = NULL; gchar* _result_ = NULL; - const gchar* _tmp0_; + gchar* _tmp0_; const gchar* _tmp1_; - gchar* _tmp2_; - const gchar* _tmp3_; - gboolean _tmp4_; gboolean is_valid = FALSE; - const gchar* _tmp17_ = NULL; - gboolean _tmp18_; - gchar* _tmp20_; + const gchar* _tmp12_ = NULL; + gboolean _tmp13_; + gchar* _tmp15_; #line 103 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (in_tag != NULL, NULL); #line 103 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (foreign_separator != NULL, NULL); #line 104 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0_ = in_tag; -#line 104 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = foreign_separator; -#line 104 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp2_ = string_replace (_tmp0_, _tmp1_, TAG_PATH_SEPARATOR_STRING); + _tmp0_ = string_replace (in_tag, foreign_separator, TAG_PATH_SEPARATOR_STRING); #line 104 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _result_ = _tmp2_; + _result_ = _tmp0_; #line 106 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp3_ = _result_; + _tmp1_ = _result_; #line 106 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp4_ = g_str_has_prefix (_tmp3_, TAG_PATH_SEPARATOR_STRING); -#line 106 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (!_tmp4_) { -#line 1484 "HierarchicalTagUtilities.c" - const gchar* _tmp5_; - gchar* _tmp6_; + if (!g_str_has_prefix (_tmp1_, TAG_PATH_SEPARATOR_STRING)) { +#line 1318 "HierarchicalTagUtilities.c" + const gchar* _tmp2_; + gchar* _tmp3_; #line 107 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp5_ = _result_; + _tmp2_ = _result_; #line 107 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp5_, NULL); + _tmp3_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp2_, NULL); #line 107 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (_result_); #line 107 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _result_ = _tmp6_; -#line 1495 "HierarchicalTagUtilities.c" + _result_ = _tmp3_; +#line 1329 "HierarchicalTagUtilities.c" } #line 110 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" is_valid = FALSE; -#line 1499 "HierarchicalTagUtilities.c" +#line 1333 "HierarchicalTagUtilities.c" { gint i = 0; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" i = 0; -#line 1504 "HierarchicalTagUtilities.c" +#line 1338 "HierarchicalTagUtilities.c" { - gboolean _tmp7_ = FALSE; + gboolean _tmp4_ = FALSE; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7_ = TRUE; + _tmp4_ = TRUE; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" while (TRUE) { -#line 1511 "HierarchicalTagUtilities.c" +#line 1345 "HierarchicalTagUtilities.c" + gint _tmp6_; + const gchar* _tmp7_; + gint _tmp8_; gint _tmp9_; const gchar* _tmp10_; gint _tmp11_; - gint _tmp12_; - const gchar* _tmp13_; - gint _tmp14_; - gchar _tmp15_; - gchar _tmp16_; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (!_tmp7_) { -#line 1522 "HierarchicalTagUtilities.c" - gint _tmp8_; + if (!_tmp4_) { +#line 1354 "HierarchicalTagUtilities.c" + gint _tmp5_; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp8_ = i; + _tmp5_ = i; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - i = _tmp8_ + 1; -#line 1528 "HierarchicalTagUtilities.c" + i = _tmp5_ + 1; +#line 1360 "HierarchicalTagUtilities.c" } #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7_ = FALSE; + _tmp4_ = FALSE; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp9_ = i; + _tmp6_ = i; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp10_ = _result_; + _tmp7_ = _result_; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp11_ = strlen (_tmp10_); + _tmp8_ = strlen (_tmp7_); #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp12_ = _tmp11_; + _tmp9_ = _tmp8_; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (!(_tmp9_ < _tmp12_)) { + if (!(_tmp6_ < _tmp9_)) { #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" break; -#line 1544 "HierarchicalTagUtilities.c" +#line 1376 "HierarchicalTagUtilities.c" } #line 112 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp13_ = _result_; -#line 112 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp14_ = i; -#line 112 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp15_ = string_get (_tmp13_, (glong) _tmp14_); + _tmp10_ = _result_; #line 112 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp16_ = string_get (TAG_PATH_SEPARATOR_STRING, (glong) 0); + _tmp11_ = i; #line 112 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp15_ != _tmp16_) { + if (string_get (_tmp10_, (glong) _tmp11_) != string_get (TAG_PATH_SEPARATOR_STRING, (glong) 0)) { #line 113 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" is_valid = TRUE; #line 114 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" break; -#line 1560 "HierarchicalTagUtilities.c" +#line 1388 "HierarchicalTagUtilities.c" } } } } #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp18_ = is_valid; + _tmp13_ = is_valid; #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp18_) { -#line 1569 "HierarchicalTagUtilities.c" - const gchar* _tmp19_; + if (_tmp13_) { +#line 1397 "HierarchicalTagUtilities.c" + const gchar* _tmp14_; #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp19_ = _result_; + _tmp14_ = _result_; #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp17_ = _tmp19_; -#line 1575 "HierarchicalTagUtilities.c" + _tmp12_ = _tmp14_; +#line 1403 "HierarchicalTagUtilities.c" } else { #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp17_ = NULL; -#line 1579 "HierarchicalTagUtilities.c" + _tmp12_ = NULL; +#line 1407 "HierarchicalTagUtilities.c" } #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp20_ = g_strdup (_tmp17_); + _tmp15_ = g_strdup (_tmp12_); #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - result = _tmp20_; + result = _tmp15_; #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (_result_); #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1589 "HierarchicalTagUtilities.c" +#line 1417 "HierarchicalTagUtilities.c" } -gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag) { +gchar* +hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag) +{ gchar* result = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; #line 121 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (in_tag != NULL, NULL); #line 122 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0_ = in_tag; -#line 122 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = string_replace (_tmp0_, TAG_PATH_SEPARATOR_STRING, "-"); + _tmp0_ = string_replace (in_tag, TAG_PATH_SEPARATOR_STRING, "-"); #line 122 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - result = _tmp1_; + result = _tmp0_; #line 122 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1607 "HierarchicalTagUtilities.c" +#line 1434 "HierarchicalTagUtilities.c" } -HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_keywords (GeeCollection* h_keywords) { +HierarchicalTagIndex* +hierarchical_tag_utilities_process_hierarchical_import_keywords (GeeCollection* h_keywords) +{ HierarchicalTagIndex* result = NULL; HierarchicalTagIndex* index = NULL; HierarchicalTagIndex* _tmp0_; @@ -1617,607 +1446,601 @@ HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_key _tmp0_ = hierarchical_tag_index_new (); #line 126 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" index = _tmp0_; -#line 1621 "HierarchicalTagUtilities.c" +#line 1450 "HierarchicalTagUtilities.c" { GeeIterator* _keyword_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp1_; #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = h_keywords; + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (h_keywords, GEE_TYPE_ITERABLE, GeeIterable)); #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _keyword_it = _tmp2_; + _keyword_it = _tmp1_; #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" while (TRUE) { -#line 1634 "HierarchicalTagUtilities.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 1460 "HierarchicalTagUtilities.c" + GeeIterator* _tmp2_; gchar* keyword = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; GeeList* parent_paths = NULL; + const gchar* _tmp5_; + GeeList* _tmp6_; + GeeList* path_components = NULL; const gchar* _tmp7_; GeeList* _tmp8_; - GeeList* path_components = NULL; - const gchar* _tmp9_; - GeeList* _tmp10_; - GeeList* _tmp11_; - gint _tmp12_; + GeeList* _tmp9_; + gint _tmp10_; + gint _tmp11_; + GeeList* _tmp12_; gint _tmp13_; - GeeList* _tmp14_; - gint _tmp15_; - gint _tmp16_; - HierarchicalTagIndex* _tmp39_; + gint _tmp14_; + HierarchicalTagIndex* _tmp36_; + const gchar* _tmp37_; + gchar* _tmp38_; + gchar* _tmp39_; const gchar* _tmp40_; - gchar* _tmp41_; - gchar* _tmp42_; - const gchar* _tmp43_; -#line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp3_ = _keyword_it; #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _keyword_it; #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" break; -#line 1665 "HierarchicalTagUtilities.c" +#line 1488 "HierarchicalTagUtilities.c" } #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp5_ = _keyword_it; + _tmp3_ = _keyword_it; #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - keyword = (gchar*) _tmp6_; + keyword = (gchar*) _tmp4_; #line 129 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7_ = keyword; + _tmp5_ = keyword; #line 129 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp8_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp7_); + _tmp6_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp5_); #line 129 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - parent_paths = _tmp8_; + parent_paths = _tmp6_; #line 131 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp9_ = keyword; + _tmp7_ = keyword; #line 131 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp10_ = hierarchical_tag_utilities_enumerate_path_components (_tmp9_); + _tmp8_ = hierarchical_tag_utilities_enumerate_path_components (_tmp7_); #line 131 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - path_components = _tmp10_; + path_components = _tmp8_; #line 134 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp11_ = parent_paths; + _tmp9_ = parent_paths; #line 134 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection)); #line 134 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 134 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp14_ = path_components; + _tmp12_ = path_components; #line 134 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp15_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection)); #line 134 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp16_ = _tmp15_; + _tmp14_ = _tmp13_; #line 134 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _vala_assert (_tmp13_ <= _tmp16_, "parent_paths.size <= path_components.size"); -#line 1699 "HierarchicalTagUtilities.c" + _vala_assert (_tmp11_ <= _tmp14_, "parent_paths.size <= path_components.size"); +#line 1522 "HierarchicalTagUtilities.c" { gint i = 0; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" i = 0; -#line 1704 "HierarchicalTagUtilities.c" +#line 1527 "HierarchicalTagUtilities.c" { - gboolean _tmp17_ = FALSE; + gboolean _tmp15_ = FALSE; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp17_ = TRUE; + _tmp15_ = TRUE; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" while (TRUE) { -#line 1711 "HierarchicalTagUtilities.c" +#line 1534 "HierarchicalTagUtilities.c" + gint _tmp17_; + GeeList* _tmp18_; gint _tmp19_; - GeeList* _tmp20_; - gint _tmp21_; - gint _tmp22_; - HierarchicalTagIndex* _tmp23_; - GeeList* _tmp24_; - gint _tmp25_; - gpointer _tmp26_; - gchar* _tmp27_; - gboolean _tmp28_; - gboolean _tmp29_; + gint _tmp20_; + HierarchicalTagIndex* _tmp21_; + GeeList* _tmp22_; + gint _tmp23_; + gpointer _tmp24_; + gchar* _tmp25_; + gboolean _tmp26_; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (!_tmp17_) { -#line 1725 "HierarchicalTagUtilities.c" - gint _tmp18_; + if (!_tmp15_) { +#line 1547 "HierarchicalTagUtilities.c" + gint _tmp16_; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp18_ = i; + _tmp16_ = i; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - i = _tmp18_ + 1; -#line 1731 "HierarchicalTagUtilities.c" + i = _tmp16_ + 1; +#line 1553 "HierarchicalTagUtilities.c" } #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp17_ = FALSE; + _tmp15_ = FALSE; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp19_ = i; + _tmp17_ = i; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp20_ = parent_paths; + _tmp18_ = parent_paths; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp22_ = _tmp21_; + _tmp20_ = _tmp19_; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (!(_tmp19_ < _tmp22_)) { + if (!(_tmp17_ < _tmp20_)) { #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" break; -#line 1747 "HierarchicalTagUtilities.c" +#line 1569 "HierarchicalTagUtilities.c" } #line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp23_ = index; -#line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp24_ = path_components; + _tmp21_ = index; #line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp25_ = i; + _tmp22_ = path_components; #line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp26_ = gee_list_get (_tmp24_, _tmp25_); + _tmp23_ = i; #line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp27_ = (gchar*) _tmp26_; + _tmp24_ = gee_list_get (_tmp22_, _tmp23_); #line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp28_ = hierarchical_tag_index_is_path_known (_tmp23_, _tmp27_); + _tmp25_ = (gchar*) _tmp24_; #line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp29_ = !_tmp28_; + _tmp26_ = !hierarchical_tag_index_is_path_known (_tmp21_, _tmp25_); #line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _g_free0 (_tmp27_); + _g_free0 (_tmp25_); #line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp29_) { -#line 1767 "HierarchicalTagUtilities.c" - HierarchicalTagIndex* _tmp30_; - GeeList* _tmp31_; - gint _tmp32_; - gpointer _tmp33_; - gchar* _tmp34_; - GeeList* _tmp35_; - gint _tmp36_; - gpointer _tmp37_; - gchar* _tmp38_; + if (_tmp26_) { +#line 1587 "HierarchicalTagUtilities.c" + HierarchicalTagIndex* _tmp27_; + GeeList* _tmp28_; + gint _tmp29_; + gpointer _tmp30_; + gchar* _tmp31_; + GeeList* _tmp32_; + gint _tmp33_; + gpointer _tmp34_; + gchar* _tmp35_; #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp30_ = index; + _tmp27_ = index; #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp31_ = path_components; + _tmp28_ = path_components; #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp32_ = i; + _tmp29_ = i; #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp33_ = gee_list_get (_tmp31_, _tmp32_); + _tmp30_ = gee_list_get (_tmp28_, _tmp29_); #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp34_ = (gchar*) _tmp33_; + _tmp31_ = (gchar*) _tmp30_; #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp35_ = parent_paths; + _tmp32_ = parent_paths; #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp36_ = i; + _tmp33_ = i; #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp37_ = gee_list_get (_tmp35_, _tmp36_); + _tmp34_ = gee_list_get (_tmp32_, _tmp33_); #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp38_ = (gchar*) _tmp37_; + _tmp35_ = (gchar*) _tmp34_; #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - hierarchical_tag_index_add_path (_tmp30_, _tmp34_, _tmp38_); + hierarchical_tag_index_add_path (_tmp27_, _tmp31_, _tmp35_); #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _g_free0 (_tmp38_); + _g_free0 (_tmp35_); #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _g_free0 (_tmp34_); -#line 1801 "HierarchicalTagUtilities.c" + _g_free0 (_tmp31_); +#line 1621 "HierarchicalTagUtilities.c" } } } } #line 141 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp39_ = index; + _tmp36_ = index; #line 141 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp40_ = keyword; + _tmp37_ = keyword; #line 141 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp41_ = hierarchical_tag_utilities_get_basename (_tmp40_); + _tmp38_ = hierarchical_tag_utilities_get_basename (_tmp37_); #line 141 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp42_ = _tmp41_; + _tmp39_ = _tmp38_; #line 141 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp43_ = keyword; + _tmp40_ = keyword; #line 141 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - hierarchical_tag_index_add_path (_tmp39_, _tmp42_, _tmp43_); + hierarchical_tag_index_add_path (_tmp36_, _tmp39_, _tmp40_); #line 141 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _g_free0 (_tmp42_); + _g_free0 (_tmp39_); #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_object_unref0 (path_components); #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_object_unref0 (parent_paths); #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (keyword); -#line 1826 "HierarchicalTagUtilities.c" +#line 1646 "HierarchicalTagUtilities.c" } #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_object_unref0 (_keyword_it); -#line 1830 "HierarchicalTagUtilities.c" +#line 1650 "HierarchicalTagUtilities.c" } #line 144 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" result = index; #line 144 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1836 "HierarchicalTagUtilities.c" +#line 1656 "HierarchicalTagUtilities.c" } -gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path) { +gchar* +hierarchical_tag_utilities_get_root_path_form (const gchar* client_path) +{ gchar* result = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - GeeList* _tmp2_; - GeeList* _tmp3_; - gint _tmp4_; - gint _tmp5_; - gboolean _tmp6_; + GeeList* _tmp0_; + GeeList* _tmp1_; + gint _tmp2_; + gint _tmp3_; + gboolean _tmp4_; gchar* path = NULL; - const gchar* _tmp9_; - gchar* _tmp10_; - TagSourceCollection* _tmp11_; - const gchar* _tmp12_; - gboolean _tmp13_; - const gchar* _tmp20_ = NULL; - TagSourceCollection* _tmp21_; - const gchar* _tmp22_; - gboolean _tmp23_; - gchar* _tmp25_; -#line 148 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0_ = client_path; + gchar* _tmp6_; + TagSourceCollection* _tmp7_; + const gchar* _tmp8_; + const gchar* _tmp14_ = NULL; + TagSourceCollection* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp18_; #line 148 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp0_ == NULL) { + if (client_path == NULL) { #line 149 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" result = NULL; #line 149 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1868 "HierarchicalTagUtilities.c" +#line 1683 "HierarchicalTagUtilities.c" } #line 151 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = client_path; + _tmp0_ = hierarchical_tag_utilities_enumerate_parent_paths (client_path); #line 151 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp2_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp1_); + _tmp1_ = _tmp0_; #line 151 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp3_ = _tmp2_; -#line 151 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); #line 151 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 151 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6_ = _tmp5_ != 0; + _tmp4_ = _tmp3_ != 0; #line 151 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 151 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp6_) { -#line 1886 "HierarchicalTagUtilities.c" - const gchar* _tmp7_; - gchar* _tmp8_; -#line 152 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7_ = client_path; + if (_tmp4_) { +#line 1699 "HierarchicalTagUtilities.c" + gchar* _tmp5_; #line 152 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp8_ = g_strdup (_tmp7_); + _tmp5_ = g_strdup (client_path); #line 152 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - result = _tmp8_; + result = _tmp5_; #line 152 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1897 "HierarchicalTagUtilities.c" +#line 1707 "HierarchicalTagUtilities.c" } #line 154 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp9_ = client_path; -#line 154 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp10_ = g_strdup (_tmp9_); + _tmp6_ = g_strdup (client_path); #line 154 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - path = _tmp10_; + path = _tmp6_; #line 156 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp11_ = tag_global; + _tmp7_ = tag_global; #line 156 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp12_ = path; + _tmp8_ = path; #line 156 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp13_ = tag_source_collection_exists (_tmp11_, _tmp12_, FALSE); -#line 156 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (!_tmp13_) { -#line 1913 "HierarchicalTagUtilities.c" - const gchar* _tmp14_; - gboolean _tmp15_; -#line 157 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp14_ = path; + if (!tag_source_collection_exists (_tmp7_, _tmp8_, FALSE)) { +#line 1719 "HierarchicalTagUtilities.c" + const gchar* _tmp9_; #line 157 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp15_ = g_str_has_prefix (_tmp14_, TAG_PATH_SEPARATOR_STRING); + _tmp9_ = path; #line 157 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp15_) { -#line 1922 "HierarchicalTagUtilities.c" - const gchar* _tmp16_; - gchar* _tmp17_; + if (g_str_has_prefix (_tmp9_, TAG_PATH_SEPARATOR_STRING)) { +#line 1725 "HierarchicalTagUtilities.c" + const gchar* _tmp10_; + gchar* _tmp11_; #line 158 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp16_ = path; + _tmp10_ = path; #line 158 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp17_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp16_); + _tmp11_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp10_); #line 158 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (path); #line 158 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - path = _tmp17_; -#line 1933 "HierarchicalTagUtilities.c" + path = _tmp11_; +#line 1736 "HierarchicalTagUtilities.c" } else { - const gchar* _tmp18_; - gchar* _tmp19_; + const gchar* _tmp12_; + gchar* _tmp13_; #line 160 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp18_ = path; + _tmp12_ = path; #line 160 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp19_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp18_); + _tmp13_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp12_); #line 160 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (path); #line 160 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - path = _tmp19_; -#line 1945 "HierarchicalTagUtilities.c" + path = _tmp13_; +#line 1748 "HierarchicalTagUtilities.c" } } #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp21_ = tag_global; + _tmp15_ = tag_global; #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp22_ = path; + _tmp16_ = path; #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp23_ = tag_source_collection_exists (_tmp21_, _tmp22_, FALSE); + if (tag_source_collection_exists (_tmp15_, _tmp16_, FALSE)) { +#line 1757 "HierarchicalTagUtilities.c" + const gchar* _tmp17_; #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp23_) { -#line 1956 "HierarchicalTagUtilities.c" - const gchar* _tmp24_; + _tmp17_ = path; #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp24_ = path; -#line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp20_ = _tmp24_; -#line 1962 "HierarchicalTagUtilities.c" + _tmp14_ = _tmp17_; +#line 1763 "HierarchicalTagUtilities.c" } else { #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp20_ = NULL; -#line 1966 "HierarchicalTagUtilities.c" + _tmp14_ = NULL; +#line 1767 "HierarchicalTagUtilities.c" } #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp25_ = g_strdup (_tmp20_); + _tmp18_ = g_strdup (_tmp14_); #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - result = _tmp25_; + result = _tmp18_; #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (path); #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1976 "HierarchicalTagUtilities.c" +#line 1777 "HierarchicalTagUtilities.c" } -void hierarchical_tag_utilities_cleanup_root_path (const gchar* path) { +void +hierarchical_tag_utilities_cleanup_root_path (const gchar* path) +{ GeeList* paths = NULL; - const gchar* _tmp0_; + GeeList* _tmp0_; GeeList* _tmp1_; - GeeList* _tmp2_; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; #line 166 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_if_fail (path != NULL); #line 167 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0_ = path; + _tmp0_ = hierarchical_tag_utilities_enumerate_parent_paths (path); #line 167 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp0_); -#line 167 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - paths = _tmp1_; + paths = _tmp0_; #line 169 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp2_ = paths; + _tmp1_ = paths; #line 169 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); #line 169 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 169 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp4_ == 0) { -#line 2003 "HierarchicalTagUtilities.c" + if (_tmp3_ == 0) { +#line 1803 "HierarchicalTagUtilities.c" gchar* actual_path = NULL; + gchar* _tmp4_; const gchar* _tmp5_; - gchar* _tmp6_; - const gchar* _tmp7_; Tag* t = NULL; - TagSourceCollection* _tmp8_; - const gchar* _tmp9_; - gboolean _tmp10_; - gboolean _tmp13_ = FALSE; - Tag* _tmp14_; -#line 170 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp5_ = path; + TagSourceCollection* _tmp6_; + const gchar* _tmp7_; + gboolean _tmp10_ = FALSE; + Tag* _tmp11_; #line 170 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6_ = hierarchical_tag_utilities_get_root_path_form (_tmp5_); + _tmp4_ = hierarchical_tag_utilities_get_root_path_form (path); #line 170 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - actual_path = _tmp6_; + actual_path = _tmp4_; #line 172 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7_ = actual_path; + _tmp5_ = actual_path; #line 172 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp7_ == NULL) { + if (_tmp5_ == NULL) { #line 173 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (actual_path); #line 173 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_object_unref0 (paths); #line 173 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return; -#line 2030 "HierarchicalTagUtilities.c" +#line 1826 "HierarchicalTagUtilities.c" } #line 175 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" t = NULL; #line 176 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp8_ = tag_global; -#line 176 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp9_ = actual_path; + _tmp6_ = tag_global; #line 176 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp10_ = tag_source_collection_exists (_tmp8_, _tmp9_, FALSE); + _tmp7_ = actual_path; #line 176 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp10_) { -#line 2042 "HierarchicalTagUtilities.c" - const gchar* _tmp11_; - Tag* _tmp12_; + if (tag_source_collection_exists (_tmp6_, _tmp7_, FALSE)) { +#line 1836 "HierarchicalTagUtilities.c" + const gchar* _tmp8_; + Tag* _tmp9_; #line 177 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp11_ = actual_path; + _tmp8_ = actual_path; #line 177 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp12_ = tag_for_path (_tmp11_); + _tmp9_ = tag_for_path (_tmp8_); #line 177 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_object_unref0 (t); #line 177 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - t = _tmp12_; -#line 2053 "HierarchicalTagUtilities.c" + t = _tmp9_; +#line 1847 "HierarchicalTagUtilities.c" } #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp14_ = t; + _tmp11_ = t; #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp14_ != NULL) { -#line 2059 "HierarchicalTagUtilities.c" - Tag* _tmp15_; - GeeList* _tmp16_; - GeeList* _tmp17_; - gint _tmp18_; - gint _tmp19_; + if (_tmp11_ != NULL) { +#line 1853 "HierarchicalTagUtilities.c" + Tag* _tmp12_; + GeeList* _tmp13_; + GeeList* _tmp14_; + gint _tmp15_; + gint _tmp16_; #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp15_ = t; + _tmp12_ = t; #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp16_ = tag_get_hierarchical_children (_tmp15_); + _tmp13_ = tag_get_hierarchical_children (_tmp12_); #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp17_ = _tmp16_; + _tmp14_ = _tmp13_; #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp15_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection)); #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp19_ = _tmp18_; + _tmp16_ = _tmp15_; #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp13_ = _tmp19_ == 0; + _tmp10_ = _tmp16_ == 0; #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _g_object_unref0 (_tmp17_); -#line 2079 "HierarchicalTagUtilities.c" + _g_object_unref0 (_tmp14_); +#line 1873 "HierarchicalTagUtilities.c" } else { #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp13_ = FALSE; -#line 2083 "HierarchicalTagUtilities.c" + _tmp10_ = FALSE; +#line 1877 "HierarchicalTagUtilities.c" } #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp13_) { -#line 2087 "HierarchicalTagUtilities.c" - Tag* _tmp20_; + if (_tmp10_) { +#line 1881 "HierarchicalTagUtilities.c" + Tag* _tmp17_; #line 180 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp20_ = t; + _tmp17_ = t; #line 180 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - tag_flatten (_tmp20_); -#line 2093 "HierarchicalTagUtilities.c" + tag_flatten (_tmp17_); +#line 1887 "HierarchicalTagUtilities.c" } #line 169 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_object_unref0 (t); #line 169 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (actual_path); -#line 2099 "HierarchicalTagUtilities.c" +#line 1893 "HierarchicalTagUtilities.c" } #line 166 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_object_unref0 (paths); -#line 2103 "HierarchicalTagUtilities.c" +#line 1897 "HierarchicalTagUtilities.c" } -HierarchicalTagUtilities* hierarchical_tag_utilities_construct (GType object_type) { +HierarchicalTagUtilities* +hierarchical_tag_utilities_construct (GType object_type) +{ HierarchicalTagUtilities* self = NULL; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" self = (HierarchicalTagUtilities*) g_type_create_instance (object_type); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return self; -#line 2113 "HierarchicalTagUtilities.c" +#line 1909 "HierarchicalTagUtilities.c" } -HierarchicalTagUtilities* hierarchical_tag_utilities_new (void) { +HierarchicalTagUtilities* +hierarchical_tag_utilities_new (void) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return hierarchical_tag_utilities_construct (TYPE_HIERARCHICAL_TAG_UTILITIES); -#line 2120 "HierarchicalTagUtilities.c" +#line 1918 "HierarchicalTagUtilities.c" } -static void value_hierarchical_tag_utilities_init (GValue* value) { +static void +value_hierarchical_tag_utilities_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" value->data[0].v_pointer = NULL; -#line 2127 "HierarchicalTagUtilities.c" +#line 1927 "HierarchicalTagUtilities.c" } -static void value_hierarchical_tag_utilities_free_value (GValue* value) { +static void +value_hierarchical_tag_utilities_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" hierarchical_tag_utilities_unref (value->data[0].v_pointer); -#line 2136 "HierarchicalTagUtilities.c" +#line 1938 "HierarchicalTagUtilities.c" } } -static void value_hierarchical_tag_utilities_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_hierarchical_tag_utilities_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" dest_value->data[0].v_pointer = hierarchical_tag_utilities_ref (src_value->data[0].v_pointer); -#line 2146 "HierarchicalTagUtilities.c" +#line 1951 "HierarchicalTagUtilities.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" dest_value->data[0].v_pointer = NULL; -#line 2150 "HierarchicalTagUtilities.c" +#line 1955 "HierarchicalTagUtilities.c" } } -static gpointer value_hierarchical_tag_utilities_peek_pointer (const GValue* value) { +static gpointer +value_hierarchical_tag_utilities_peek_pointer (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return value->data[0].v_pointer; -#line 2158 "HierarchicalTagUtilities.c" +#line 1965 "HierarchicalTagUtilities.c" } -static gchar* value_hierarchical_tag_utilities_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_hierarchical_tag_utilities_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (collect_values[0].v_pointer) { -#line 2165 "HierarchicalTagUtilities.c" +#line 1977 "HierarchicalTagUtilities.c" HierarchicalTagUtilities * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2172 "HierarchicalTagUtilities.c" +#line 1984 "HierarchicalTagUtilities.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.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 2176 "HierarchicalTagUtilities.c" +#line 1988 "HierarchicalTagUtilities.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" value->data[0].v_pointer = hierarchical_tag_utilities_ref (object); -#line 2180 "HierarchicalTagUtilities.c" +#line 1992 "HierarchicalTagUtilities.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" value->data[0].v_pointer = NULL; -#line 2184 "HierarchicalTagUtilities.c" +#line 1996 "HierarchicalTagUtilities.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return NULL; -#line 2188 "HierarchicalTagUtilities.c" +#line 2000 "HierarchicalTagUtilities.c" } -static gchar* value_hierarchical_tag_utilities_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_hierarchical_tag_utilities_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ HierarchicalTagUtilities ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2199 "HierarchicalTagUtilities.c" +#line 2016 "HierarchicalTagUtilities.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" *object_p = NULL; -#line 2205 "HierarchicalTagUtilities.c" +#line 2022 "HierarchicalTagUtilities.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" *object_p = value->data[0].v_pointer; -#line 2209 "HierarchicalTagUtilities.c" +#line 2026 "HierarchicalTagUtilities.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" *object_p = hierarchical_tag_utilities_ref (value->data[0].v_pointer); -#line 2213 "HierarchicalTagUtilities.c" +#line 2030 "HierarchicalTagUtilities.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return NULL; -#line 2217 "HierarchicalTagUtilities.c" +#line 2034 "HierarchicalTagUtilities.c" } -GParamSpec* param_spec_hierarchical_tag_utilities (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_hierarchical_tag_utilities (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecHierarchicalTagUtilities* spec; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_HIERARCHICAL_TAG_UTILITIES), NULL); @@ -2227,20 +2050,25 @@ GParamSpec* param_spec_hierarchical_tag_utilities (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return G_PARAM_SPEC (spec); -#line 2231 "HierarchicalTagUtilities.c" +#line 2054 "HierarchicalTagUtilities.c" } -gpointer value_get_hierarchical_tag_utilities (const GValue* value) { +gpointer +value_get_hierarchical_tag_utilities (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_UTILITIES), NULL); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return value->data[0].v_pointer; -#line 2240 "HierarchicalTagUtilities.c" +#line 2065 "HierarchicalTagUtilities.c" } -void value_set_hierarchical_tag_utilities (GValue* value, gpointer v_object) { +void +value_set_hierarchical_tag_utilities (GValue* value, + gpointer v_object) +{ HierarchicalTagUtilities * old; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_UTILITIES)); @@ -2256,22 +2084,25 @@ void value_set_hierarchical_tag_utilities (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" hierarchical_tag_utilities_ref (value->data[0].v_pointer); -#line 2260 "HierarchicalTagUtilities.c" +#line 2088 "HierarchicalTagUtilities.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" value->data[0].v_pointer = NULL; -#line 2264 "HierarchicalTagUtilities.c" +#line 2092 "HierarchicalTagUtilities.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" hierarchical_tag_utilities_unref (old); -#line 2270 "HierarchicalTagUtilities.c" +#line 2098 "HierarchicalTagUtilities.c" } } -void value_take_hierarchical_tag_utilities (GValue* value, gpointer v_object) { +void +value_take_hierarchical_tag_utilities (GValue* value, + gpointer v_object) +{ HierarchicalTagUtilities * old; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_UTILITIES)); @@ -2285,48 +2116,56 @@ void value_take_hierarchical_tag_utilities (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" value->data[0].v_pointer = v_object; -#line 2289 "HierarchicalTagUtilities.c" +#line 2120 "HierarchicalTagUtilities.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" value->data[0].v_pointer = NULL; -#line 2293 "HierarchicalTagUtilities.c" +#line 2124 "HierarchicalTagUtilities.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" hierarchical_tag_utilities_unref (old); -#line 2299 "HierarchicalTagUtilities.c" +#line 2130 "HierarchicalTagUtilities.c" } } -static void hierarchical_tag_utilities_class_init (HierarchicalTagUtilitiesClass * klass) { +static void +hierarchical_tag_utilities_class_init (HierarchicalTagUtilitiesClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" hierarchical_tag_utilities_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" ((HierarchicalTagUtilitiesClass *) klass)->finalize = hierarchical_tag_utilities_finalize; -#line 2309 "HierarchicalTagUtilities.c" +#line 2142 "HierarchicalTagUtilities.c" } -static void hierarchical_tag_utilities_instance_init (HierarchicalTagUtilities * self) { +static void +hierarchical_tag_utilities_instance_init (HierarchicalTagUtilities * self) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" self->ref_count = 1; -#line 2316 "HierarchicalTagUtilities.c" +#line 2151 "HierarchicalTagUtilities.c" } -static void hierarchical_tag_utilities_finalize (HierarchicalTagUtilities * obj) { +static void +hierarchical_tag_utilities_finalize (HierarchicalTagUtilities * obj) +{ HierarchicalTagUtilities * self; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HIERARCHICAL_TAG_UTILITIES, HierarchicalTagUtilities); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_signal_handlers_destroy (self); -#line 2326 "HierarchicalTagUtilities.c" +#line 2163 "HierarchicalTagUtilities.c" } -GType hierarchical_tag_utilities_get_type (void) { +GType +hierarchical_tag_utilities_get_type (void) +{ static volatile gsize hierarchical_tag_utilities_type_id__volatile = 0; if (g_once_init_enter (&hierarchical_tag_utilities_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_hierarchical_tag_utilities_init, value_hierarchical_tag_utilities_free_value, value_hierarchical_tag_utilities_copy_value, value_hierarchical_tag_utilities_peek_pointer, "p", value_hierarchical_tag_utilities_collect_value, "p", value_hierarchical_tag_utilities_lcopy_value }; @@ -2340,18 +2179,22 @@ GType hierarchical_tag_utilities_get_type (void) { } -gpointer hierarchical_tag_utilities_ref (gpointer instance) { +gpointer +hierarchical_tag_utilities_ref (gpointer instance) +{ HierarchicalTagUtilities * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return instance; -#line 2351 "HierarchicalTagUtilities.c" +#line 2192 "HierarchicalTagUtilities.c" } -void hierarchical_tag_utilities_unref (gpointer instance) { +void +hierarchical_tag_utilities_unref (gpointer instance) +{ HierarchicalTagUtilities * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -2360,12 +2203,16 @@ void hierarchical_tag_utilities_unref (gpointer instance) { HIERARCHICAL_TAG_UTILITIES_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2364 "HierarchicalTagUtilities.c" +#line 2207 "HierarchicalTagUtilities.c" } } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -2377,13 +2224,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -static gint _vala_array_length (gpointer array) { +static gint +_vala_array_length (gpointer array) +{ int length; length = 0; if (array) { diff --git a/src/tags/TagPage.c b/src/tags/TagPage.c index efc0340..fa5f9eb 100644 --- a/src/tags/TagPage.c +++ b/src/tags/TagPage.c @@ -1,4 +1,4 @@ -/* TagPage.c generated by valac 0.36.6, the Vala compiler +/* TagPage.c generated by valac 0.40.4, the Vala compiler * generated from TagPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -210,6 +211,11 @@ typedef struct _TagPagePrivate TagPagePrivate; typedef struct _Tag Tag; typedef struct _TagClass TagClass; +enum { + TAG_PAGE_0_PROPERTY, + TAG_PAGE_NUM_PROPERTIES +}; +static GParamSpec* tag_page_properties[TAG_PAGE_NUM_PROPERTIES]; #define TYPE_DATA_COLLECTION (data_collection_get_type ()) #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection)) @@ -592,9 +598,15 @@ GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType checkerboard_page_get_type (void) G_GNUC_CONST; @@ -608,17 +620,29 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self); gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType search_view_filter_get_type (void) G_GNUC_CONST; gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; @@ -630,14 +654,17 @@ GType collection_page_get_type (void) G_GNUC_CONST; GType tag_page_get_type (void) G_GNUC_CONST; GType tag_get_type (void) G_GNUC_CONST; #define TAG_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TAG_PAGE, TagPagePrivate)) -enum { - TAG_PAGE_DUMMY_PROPERTY -}; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; @@ -649,223 +676,311 @@ GType container_source_collection_get_type (void) G_GNUC_CONST; GType tag_source_collection_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; -static void tag_page_on_tags_altered (TagPage* self, GeeMap* map); -static void _tag_page_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void tag_page_on_tags_altered (TagPage* self, + GeeMap* map); +static void _tag_page_on_tags_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); static void tag_page_on_delete_tag (TagPage* self); -static void _tag_page_on_delete_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _tag_page_on_delete_tag_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void tag_page_on_rename_tag (TagPage* self); -static void _tag_page_on_rename_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _tag_page_on_rename_tag_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void tag_page_on_remove_tag_from_photos (TagPage* self); -static void _tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void tag_page_on_new_child_tag_sidebar (TagPage* self); -static void _tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); TagPage* tag_page_new (Tag* tag); -TagPage* tag_page_construct (GType object_type, Tag* tag); +TagPage* tag_page_construct (GType object_type, + Tag* tag); gchar* data_object_get_name (DataObject* self); -CollectionPage* collection_page_construct (GType object_type, const gchar* page_name); -void tag_mirror_sources (Tag* self, ViewCollection* view, CreateView mirroring_ctor, void* mirroring_ctor_target); -DataView* media_page_create_thumbnail (MediaPage* self, DataSource* source); -static DataView* _media_page_create_thumbnail_create_view (DataSource* source, gpointer self); -void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path); -static void tag_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); -void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); +CollectionPage* collection_page_construct (GType object_type, + const gchar* page_name); +void tag_mirror_sources (Tag* self, + ViewCollection* view, + CreateView mirroring_ctor, + void* mirroring_ctor_target); +DataView* media_page_create_thumbnail (MediaPage* self, + DataSource* source); +static DataView* _media_page_create_thumbnail_create_view (DataSource* source, + gpointer self); +void checkerboard_page_init_page_context_menu (CheckerboardPage* self, + const gchar* path); +static void tag_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames); +void page_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames); Tag* tag_page_get_tag (TagPage* self); -static void tag_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by); +static void tag_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); -void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by); -static void tag_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by); -void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by); -static void tag_page_real_add_actions (Page* base, GActionMap* map); -void page_add_actions (Page* self, GActionMap* map); -static void tag_page_real_remove_actions (Page* base, GActionMap* map); -void page_remove_actions (Page* self, GActionMap* map); -void page_set_page_name (Page* self, const gchar* page_name); -void page_update_actions (Page* self, gint selected_count, gint count); +void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, + gboolean* sort_order, + gint* sort_by); +static void tag_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by); +void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, + gboolean sort_order, + gint sort_by); +static void tag_page_real_add_actions (Page* base, + GActionMap* map); +void page_add_actions (Page* self, + GActionMap* map); +static void tag_page_real_remove_actions (Page* base, + GActionMap* map); +void page_remove_actions (Page* self, + GActionMap* map); +void page_set_page_name (Page* self, + const gchar* page_name); +void page_update_actions (Page* self, + gint selected_count, + gint count); gint view_collection_get_selected_count (ViewCollection* self); gint data_collection_get_count (DataCollection* self); static void tag_page_real_switched_to (Page* base); void page_switched_to (Page* self); -void page_update_menu_item_label (Page* self, const gchar* id, const gchar* new_label); +void page_update_menu_item_label (Page* self, + const gchar* id, + const gchar* new_label); gchar* resources_delete_tag_menu (const gchar* name); gchar* tag_get_user_visible_name (Tag* self); gchar* resources_rename_tag_menu (const gchar* name); -gchar* resources_untag_photos_menu (const gchar* name, gint count); -static void tag_page_real_update_actions (Page* base, gint selected_count, gint count); -void page_set_action_details (Page* self, const gchar* name, const gchar* label, const gchar* tooltip, gboolean sensitive); +gchar* resources_untag_photos_menu (const gchar* name, + gint count); +static void tag_page_real_update_actions (Page* base, + gint selected_count, + gint count); +void page_set_action_details (Page* self, + const gchar* name, + const gchar* label, + const gchar* tooltip, + gboolean sensitive); GType command_get_type (void) G_GNUC_CONST; GType page_command_get_type (void) G_GNUC_CONST; GType simple_proxyable_command_get_type (void) G_GNUC_CONST; GType new_child_tag_command_get_type (void) G_GNUC_CONST; NewChildTagCommand* new_child_tag_command_new (Tag* tag); -NewChildTagCommand* new_child_tag_command_construct (GType object_type, Tag* tag); +NewChildTagCommand* new_child_tag_command_construct (GType object_type, + Tag* tag); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* app_window_get_command_manager (void); -void command_manager_execute (CommandManager* self, Command* command); +void command_manager_execute (CommandManager* self, + Command* command); GType app_window_get_type (void) G_GNUC_CONST; GType library_window_get_type (void) G_GNUC_CONST; LibraryWindow* library_window_get_app (void); -void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag); +void library_window_rename_tag_in_sidebar (LibraryWindow* self, + Tag* tag); Tag* new_child_tag_command_get_created_child (NewChildTagCommand* self); gboolean dialogs_confirm_delete_tag (Tag* tag); DeleteTagCommand* delete_tag_command_new (Tag* tag); -DeleteTagCommand* delete_tag_command_construct (GType object_type, Tag* tag); +DeleteTagCommand* delete_tag_command_construct (GType object_type, + Tag* tag); GType delete_tag_command_get_type (void) G_GNUC_CONST; CommandManager* page_get_command_manager (Page* self); GeeList* view_collection_get_selected_sources (ViewCollection* self); GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; -TagUntagPhotosCommand* tag_untag_photos_command_new (Tag* tag, GeeCollection* sources, gint count, gboolean attach); -TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Tag* tag, GeeCollection* sources, gint count, gboolean attach); +TagUntagPhotosCommand* tag_untag_photos_command_new (Tag* tag, + GeeCollection* sources, + gint count, + gboolean attach); +TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, + Tag* tag, + GeeCollection* sources, + gint count, + gboolean attach); GType tag_untag_photos_command_get_type (void) G_GNUC_CONST; static void tag_page_finalize (GObject * obj); static const GActionEntry TAG_PAGE_entries[4] = {{"DeleteTag", _tag_page_on_delete_tag_gsimple_action_activate_callback}, {"RenameTag", _tag_page_on_rename_tag_gsimple_action_activate_callback}, {"RemoveTagFromPhotos", _tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback}, {"NewChildTagSidebar", _tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback}}; -static void _tag_page_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_tag_page_on_tags_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 23 "/home/jens/Source/shotwell/src/tags/TagPage.vala" tag_page_on_tags_altered ((TagPage*) self, items); -#line 741 "TagPage.c" +#line 840 "TagPage.c" } -static void _tag_page_on_delete_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_tag_page_on_delete_tag_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala" tag_page_on_delete_tag ((TagPage*) self); -#line 748 "TagPage.c" +#line 851 "TagPage.c" } -static void _tag_page_on_rename_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_tag_page_on_rename_tag_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala" tag_page_on_rename_tag ((TagPage*) self); -#line 755 "TagPage.c" +#line 862 "TagPage.c" } -static void _tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala" tag_page_on_remove_tag_from_photos ((TagPage*) self); -#line 762 "TagPage.c" +#line 873 "TagPage.c" } -static void _tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala" tag_page_on_new_child_tag_sidebar ((TagPage*) self); -#line 769 "TagPage.c" +#line 884 "TagPage.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 13 "/home/jens/Source/shotwell/src/tags/TagPage.vala" return self ? g_object_ref (self) : NULL; -#line 776 "TagPage.c" +#line 893 "TagPage.c" } -static DataView* _media_page_create_thumbnail_create_view (DataSource* source, gpointer self) { +static DataView* +_media_page_create_thumbnail_create_view (DataSource* source, + gpointer self) +{ DataView* result; result = media_page_create_thumbnail ((MediaPage*) self, source); #line 16 "/home/jens/Source/shotwell/src/tags/TagPage.vala" return result; -#line 785 "TagPage.c" +#line 905 "TagPage.c" } -TagPage* tag_page_construct (GType object_type, Tag* tag) { +TagPage* +tag_page_construct (GType object_type, + Tag* tag) +{ TagPage * self = NULL; - Tag* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - Tag* _tmp3_; - Tag* _tmp4_; - TagSourceCollection* _tmp5_; - Tag* _tmp6_; - ViewCollection* _tmp7_; - ViewCollection* _tmp8_; + Tag* _tmp2_; + TagSourceCollection* _tmp3_; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; #line 10 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_val_if_fail (IS_TAG (tag), NULL); #line 11 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp0_ = tag; + _tmp0_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (tag, TYPE_DATA_OBJECT, DataObject)); #line 11 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject)); -#line 11 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 11 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - self = (TagPage*) collection_page_construct (object_type, _tmp2_); + self = (TagPage*) collection_page_construct (object_type, _tmp1_); #line 11 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _g_free0 (_tmp2_); -#line 13 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp3_ = tag; + _g_free0 (_tmp1_); #line 13 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp2_ = _g_object_ref0 (tag); #line 13 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (self->priv->tag); #line 13 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - self->priv->tag = _tmp4_; + self->priv->tag = _tmp2_; #line 15 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp5_ = tag_global; + _tmp3_ = tag_global; #line 15 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _tag_page_on_tags_altered_data_collection_items_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _tag_page_on_tags_altered_data_collection_items_altered, self, 0); #line 16 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp6_ = tag; + _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 16 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 16 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp8_ = _tmp7_; + _tmp5_ = _tmp4_; #line 16 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - tag_mirror_sources (_tmp6_, _tmp8_, _media_page_create_thumbnail_create_view, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage)); + tag_mirror_sources (tag, _tmp5_, _media_page_create_thumbnail_create_view, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage)); #line 16 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _data_collection_unref0 (_tmp8_); + _data_collection_unref0 (_tmp5_); #line 18 "/home/jens/Source/shotwell/src/tags/TagPage.vala" checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "TagsContextMenu"); #line 10 "/home/jens/Source/shotwell/src/tags/TagPage.vala" return self; -#line 838 "TagPage.c" +#line 952 "TagPage.c" } -TagPage* tag_page_new (Tag* tag) { +TagPage* +tag_page_new (Tag* tag) +{ #line 10 "/home/jens/Source/shotwell/src/tags/TagPage.vala" return tag_page_construct (TYPE_TAG_PAGE, tag); -#line 845 "TagPage.c" +#line 961 "TagPage.c" } -static void tag_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { +static void +tag_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames) +{ TagPage * self; - GeeList* _tmp0_; - GeeList* _tmp1_; #line 26 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); #line 26 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); #line 27 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp0_ = ui_filenames; -#line 27 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - PAGE_CLASS (tag_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_); -#line 28 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp1_ = ui_filenames; + PAGE_CLASS (tag_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), ui_filenames); #line 28 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "tags.ui"); -#line 865 "TagPage.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "tags.ui"); +#line 978 "TagPage.c" } -Tag* tag_page_get_tag (TagPage* self) { +Tag* +tag_page_get_tag (TagPage* self) +{ Tag* result = NULL; Tag* _tmp0_; Tag* _tmp1_; @@ -879,11 +994,15 @@ Tag* tag_page_get_tag (TagPage* self) { result = _tmp1_; #line 32 "/home/jens/Source/shotwell/src/tags/TagPage.vala" return result; -#line 883 "TagPage.c" +#line 998 "TagPage.c" } -static void tag_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) { +static void +tag_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by) +{ TagPage * self; gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; @@ -909,23 +1028,25 @@ static void tag_page_real_get_config_photos_sort (MediaPage* base, gboolean* sor if (sort_order) { #line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala" *sort_order = _vala_sort_order; -#line 913 "TagPage.c" +#line 1032 "TagPage.c" } #line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala" if (sort_by) { #line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala" *sort_by = _vala_sort_by; -#line 919 "TagPage.c" +#line 1038 "TagPage.c" } } -static void tag_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { +static void +tag_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by) +{ TagPage * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - gboolean _tmp2_; - gint _tmp3_; #line 39 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); #line 40 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -933,49 +1054,42 @@ static void tag_page_real_set_config_photos_sort (MediaPage* base, gboolean sort #line 40 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp1_ = _tmp0_; #line 40 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp2_ = sort_order; -#line 40 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp3_ = sort_by; -#line 40 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); + configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), sort_order, sort_by); #line 40 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (_tmp1_); -#line 944 "TagPage.c" +#line 1061 "TagPage.c" } -static void tag_page_real_add_actions (Page* base, GActionMap* map) { +static void +tag_page_real_add_actions (Page* base, + GActionMap* map) +{ TagPage * self; - GActionMap* _tmp0_; - GActionMap* _tmp1_; #line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); #line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 51 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp0_ = map; -#line 51 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - PAGE_CLASS (tag_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_); -#line 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp1_ = map; + PAGE_CLASS (tag_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), map); #line 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - g_action_map_add_action_entries (_tmp1_, TAG_PAGE_entries, G_N_ELEMENTS (TAG_PAGE_entries), self); -#line 964 "TagPage.c" + g_action_map_add_action_entries (map, TAG_PAGE_entries, G_N_ELEMENTS (TAG_PAGE_entries), self); +#line 1078 "TagPage.c" } -static void tag_page_real_remove_actions (Page* base, GActionMap* map) { +static void +tag_page_real_remove_actions (Page* base, + GActionMap* map) +{ TagPage * self; - GActionMap* _tmp0_; #line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); #line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp0_ = map; -#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - PAGE_CLASS (tag_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_); -#line 979 "TagPage.c" + PAGE_CLASS (tag_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), map); +#line 1093 "TagPage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -987,90 +1101,80 @@ static void tag_page_real_remove_actions (Page* base, GActionMap* map) { entry_collection_length1 = G_N_ELEMENTS (TAG_PAGE_entries); #line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (TAG_PAGE_entries); entry_it = entry_it + 1) { -#line 991 "TagPage.c" +#line 1105 "TagPage.c" GActionEntry entry = {0}; #line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala" entry = entry_collection[entry_it]; -#line 995 "TagPage.c" +#line 1109 "TagPage.c" { - GActionMap* _tmp1_; - GActionEntry _tmp2_; - const gchar* _tmp3_; -#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp1_ = map; + GActionEntry _tmp0_; + const gchar* _tmp1_; #line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp2_ = entry; + _tmp0_ = entry; #line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp3_ = _tmp2_.name; + _tmp1_ = _tmp0_.name; #line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - g_action_map_remove_action (_tmp1_, _tmp3_); -#line 1008 "TagPage.c" + g_action_map_remove_action (map, _tmp1_); +#line 1119 "TagPage.c" } } } } -static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) { - GeeMap* _tmp0_; - Tag* _tmp1_; - gboolean _tmp2_; +static void +tag_page_on_tags_altered (TagPage* self, + GeeMap* map) +{ + Tag* _tmp0_; #line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); #line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (GEE_IS_MAP (map)); #line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp0_ = map; -#line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp1_ = self->priv->tag; -#line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp2_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = self->priv->tag; #line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - if (_tmp2_) { -#line 1031 "TagPage.c" - Tag* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; + if (gee_map_has_key (map, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject))) { +#line 1139 "TagPage.c" + Tag* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; ViewCollection* _tmp6_; ViewCollection* _tmp7_; - gint _tmp8_; - ViewCollection* _tmp9_; - ViewCollection* _tmp10_; - gint _tmp11_; #line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp3_ = self->priv->tag; + _tmp1_ = self->priv->tag; #line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); + _tmp2_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); #line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp5_); + page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp3_); #line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _g_free0 (_tmp5_); -#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp7_ = _tmp6_; + _g_free0 (_tmp3_); #line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp8_ = view_collection_get_selected_count (_tmp7_); + _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp10_ = _tmp9_; + _tmp5_ = _tmp4_; #line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp11_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - page_update_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp8_, _tmp11_); + _tmp7_ = _tmp6_; #line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _data_collection_unref0 (_tmp10_); + page_update_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), view_collection_get_selected_count (_tmp5_), data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection))); #line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _data_collection_unref0 (_tmp7_); -#line 1069 "TagPage.c" +#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _data_collection_unref0 (_tmp5_); +#line 1171 "TagPage.c" } } -static void tag_page_real_switched_to (Page* base) { +static void +tag_page_real_switched_to (Page* base) +{ TagPage * self; Tag* _tmp0_; gchar* _tmp1_; @@ -1139,11 +1243,15 @@ static void tag_page_real_switched_to (Page* base) { _g_free0 (_tmp14_); #line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp12_); -#line 1143 "TagPage.c" +#line 1247 "TagPage.c" } -static void tag_page_real_update_actions (Page* base, gint selected_count, gint count) { +static void +tag_page_real_update_actions (Page* base, + gint selected_count, + gint count) +{ TagPage * self; Tag* _tmp0_; gchar* _tmp1_; @@ -1158,12 +1266,8 @@ static void tag_page_real_update_actions (Page* base, gint selected_count, gint Tag* _tmp10_; gchar* _tmp11_; gchar* _tmp12_; - gint _tmp13_; + gchar* _tmp13_; gchar* _tmp14_; - gchar* _tmp15_; - gint _tmp16_; - gint _tmp17_; - gint _tmp18_; #line 80 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); #line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1205,30 +1309,24 @@ static void tag_page_real_update_actions (Page* base, gint selected_count, gint #line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp12_ = _tmp11_; #line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp13_ = selected_count; -#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp14_ = resources_untag_photos_menu (_tmp12_, _tmp13_); + _tmp13_ = resources_untag_photos_menu (_tmp12_, selected_count); #line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp15_ = _tmp14_; -#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp16_ = selected_count; + _tmp14_ = _tmp13_; #line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - page_set_action_details (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveTagFromPhotos", _tmp15_, NULL, _tmp16_ > 0); + page_set_action_details (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveTagFromPhotos", _tmp14_, NULL, selected_count > 0); #line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp14_); #line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp12_); #line 96 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp17_ = selected_count; -#line 96 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp18_ = count; -#line 96 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - PAGE_CLASS (tag_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp17_, _tmp18_); -#line 1228 "TagPage.c" + PAGE_CLASS (tag_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), selected_count, count); +#line 1324 "TagPage.c" } -static void tag_page_on_new_child_tag_sidebar (TagPage* self) { +static void +tag_page_on_new_child_tag_sidebar (TagPage* self) +{ NewChildTagCommand* creation_command = NULL; Tag* _tmp0_; NewChildTagCommand* _tmp1_; @@ -1270,11 +1368,13 @@ static void tag_page_on_new_child_tag_sidebar (TagPage* self) { _g_object_unref0 (_tmp5_); #line 99 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (creation_command); -#line 1274 "TagPage.c" +#line 1372 "TagPage.c" } -static void tag_page_on_rename_tag (TagPage* self) { +static void +tag_page_on_rename_tag (TagPage* self) +{ LibraryWindow* _tmp0_; LibraryWindow* _tmp1_; Tag* _tmp2_; @@ -1290,53 +1390,53 @@ static void tag_page_on_rename_tag (TagPage* self) { library_window_rename_tag_in_sidebar (_tmp1_, _tmp2_); #line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (_tmp1_); -#line 1294 "TagPage.c" +#line 1394 "TagPage.c" } -static void tag_page_on_delete_tag (TagPage* self) { +static void +tag_page_on_delete_tag (TagPage* self) +{ Tag* _tmp0_; - gboolean _tmp1_; #line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); #line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp0_ = self->priv->tag; #line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp1_ = dialogs_confirm_delete_tag (_tmp0_); -#line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - if (_tmp1_) { -#line 1309 "TagPage.c" + if (dialogs_confirm_delete_tag (_tmp0_)) { +#line 1408 "TagPage.c" + CommandManager* _tmp1_; CommandManager* _tmp2_; - CommandManager* _tmp3_; - Tag* _tmp4_; + Tag* _tmp3_; + DeleteTagCommand* _tmp4_; DeleteTagCommand* _tmp5_; - DeleteTagCommand* _tmp6_; #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp2_ = app_window_get_command_manager (); + _tmp1_ = app_window_get_command_manager (); #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp4_ = self->priv->tag; + _tmp3_ = self->priv->tag; #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp5_ = delete_tag_command_new (_tmp4_); + _tmp4_ = delete_tag_command_new (_tmp3_); #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_COMMAND, Command)); #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp5_); #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _command_manager_unref0 (_tmp3_); -#line 1331 "TagPage.c" + _command_manager_unref0 (_tmp2_); +#line 1430 "TagPage.c" } } -static void tag_page_on_remove_tag_from_photos (TagPage* self) { +static void +tag_page_on_remove_tag_from_photos (TagPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; #line 116 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); #line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1344,68 +1444,65 @@ static void tag_page_on_remove_tag_from_photos (TagPage* self) { #line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp1_ = _tmp0_; #line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp3_ = _tmp2_ > 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) > 0; #line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _data_collection_unref0 (_tmp1_); #line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - if (_tmp3_) { -#line 1355 "TagPage.c" + if (_tmp2_) { +#line 1453 "TagPage.c" + CommandManager* _tmp3_; CommandManager* _tmp4_; - CommandManager* _tmp5_; - Tag* _tmp6_; + Tag* _tmp5_; + ViewCollection* _tmp6_; ViewCollection* _tmp7_; - ViewCollection* _tmp8_; - GeeList* _tmp9_; - GeeCollection* _tmp10_; + GeeList* _tmp8_; + GeeCollection* _tmp9_; + ViewCollection* _tmp10_; ViewCollection* _tmp11_; - ViewCollection* _tmp12_; - gint _tmp13_; - TagUntagPhotosCommand* _tmp14_; - TagUntagPhotosCommand* _tmp15_; + TagUntagPhotosCommand* _tmp12_; + TagUntagPhotosCommand* _tmp13_; #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp5_ = _tmp4_; + _tmp3_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp6_ = self->priv->tag; + _tmp4_ = _tmp3_; #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp5_ = self->priv->tag; #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp8_ = _tmp7_; + _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp9_ = view_collection_get_selected_sources (_tmp8_); + _tmp7_ = _tmp6_; #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp8_ = view_collection_get_selected_sources (_tmp7_); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp12_ = _tmp11_; + _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp13_ = view_collection_get_selected_count (_tmp12_); + _tmp11_ = _tmp10_; #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp14_ = tag_untag_photos_command_new (_tmp6_, _tmp10_, _tmp13_, FALSE); + _tmp12_ = tag_untag_photos_command_new (_tmp5_, _tmp9_, view_collection_get_selected_count (_tmp11_), FALSE); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp15_ = _tmp14_; + _tmp13_ = _tmp12_; #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_COMMAND, Command)); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp13_); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _data_collection_unref0 (_tmp12_); + _data_collection_unref0 (_tmp11_); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp9_); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _data_collection_unref0 (_tmp8_); + _data_collection_unref0 (_tmp7_); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _command_manager_unref0 (_tmp5_); -#line 1404 "TagPage.c" + _command_manager_unref0 (_tmp4_); +#line 1499 "TagPage.c" } } -static void tag_page_class_init (TagPageClass * klass) { +static void +tag_page_class_init (TagPageClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" tag_page_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1426,18 +1523,22 @@ static void tag_page_class_init (TagPageClass * klass) { ((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) tag_page_real_update_actions; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" G_OBJECT_CLASS (klass)->finalize = tag_page_finalize; -#line 1430 "TagPage.c" +#line 1527 "TagPage.c" } -static void tag_page_instance_init (TagPage * self) { +static void +tag_page_instance_init (TagPage * self) +{ #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self->priv = TAG_PAGE_GET_PRIVATE (self); -#line 1437 "TagPage.c" +#line 1536 "TagPage.c" } -static void tag_page_finalize (GObject * obj) { +static void +tag_page_finalize (GObject * obj) +{ TagPage * self; ViewCollection* _tmp0_; ViewCollection* _tmp1_; @@ -1463,11 +1564,13 @@ static void tag_page_finalize (GObject * obj) { _g_object_unref0 (self->priv->tag); #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" G_OBJECT_CLASS (tag_page_parent_class)->finalize (obj); -#line 1467 "TagPage.c" +#line 1568 "TagPage.c" } -GType tag_page_get_type (void) { +GType +tag_page_get_type (void) +{ static volatile gsize tag_page_type_id__volatile = 0; if (g_once_init_enter (&tag_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TagPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tag_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TagPage), 0, (GInstanceInitFunc) tag_page_instance_init, NULL }; diff --git a/src/tags/Tags.c b/src/tags/Tags.c index f9f80dc..f03516a 100644 --- a/src/tags/Tags.c +++ b/src/tags/Tags.c @@ -1,4 +1,4 @@ -/* Tags.c generated by valac 0.36.6, the Vala compiler +/* Tags.c generated by valac 0.40.4, the Vala compiler * generated from Tags.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include @@ -19,17 +20,21 @@ void tags_terminate (void); void tags_sidebar_entry_terminate (void); -void tags_init (GError** error) { +void +tags_init (GError** error) +{ #line 10 "/home/jens/Source/shotwell/src/tags/Tags.vala" tags_sidebar_entry_init (); -#line 26 "Tags.c" +#line 29 "Tags.c" } -void tags_terminate (void) { +void +tags_terminate (void) +{ #line 14 "/home/jens/Source/shotwell/src/tags/Tags.vala" tags_sidebar_entry_terminate (); -#line 33 "Tags.c" +#line 38 "Tags.c" } diff --git a/src/tags/TagsBranch.c b/src/tags/TagsBranch.c index d86b3ac..a2494fc 100644 --- a/src/tags/TagsBranch.c +++ b/src/tags/TagsBranch.c @@ -1,4 +1,4 @@ -/* TagsBranch.c generated by valac 0.36.6, the Vala compiler +/* TagsBranch.c generated by valac 0.40.4, the Vala compiler * generated from TagsBranch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -89,6 +90,11 @@ typedef struct _SidebarSimplePageEntryClass SidebarSimplePageEntryClass; typedef struct _TagsSidebarEntry TagsSidebarEntry; typedef struct _TagsSidebarEntryClass TagsSidebarEntryClass; +enum { + TAGS_BRANCH_0_PROPERTY, + TAGS_BRANCH_NUM_PROPERTIES +}; +static GParamSpec* tags_branch_properties[TAGS_BRANCH_NUM_PROPERTIES]; #define TYPE_DATA_COLLECTION (data_collection_get_type ()) #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection)) @@ -273,6 +279,11 @@ typedef struct _SidebarInternalDragSourceEntryIface SidebarInternalDragSourceEnt typedef struct _SidebarContextable SidebarContextable; typedef struct _SidebarContextableIface SidebarContextableIface; typedef struct _TagsHeaderPrivate TagsHeaderPrivate; +enum { + TAGS_HEADER_0_PROPERTY, + TAGS_HEADER_NUM_PROPERTIES +}; +static GParamSpec* tags_header_properties[TAGS_HEADER_NUM_PROPERTIES]; #define TYPE_APPLICATION (application_get_type ()) #define APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APPLICATION, Application)) @@ -403,6 +414,11 @@ typedef struct _SidebarSimplePageEntryPrivate SidebarSimplePageEntryPrivate; typedef struct _SidebarDestroyableEntry SidebarDestroyableEntry; typedef struct _SidebarDestroyableEntryIface SidebarDestroyableEntryIface; typedef struct _TagsSidebarEntryPrivate TagsSidebarEntryPrivate; +enum { + TAGS_SIDEBAR_ENTRY_0_PROPERTY, + TAGS_SIDEBAR_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* tags_sidebar_entry_properties[TAGS_SIDEBAR_ENTRY_NUM_PROPERTIES]; #define TYPE_CHECKERBOARD_PAGE (checkerboard_page_get_type ()) #define CHECKERBOARD_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHECKERBOARD_PAGE, CheckerboardPage)) @@ -658,31 +674,48 @@ GType tag_get_type (void) G_GNUC_CONST; GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST; GType tags_sidebar_entry_get_type (void) G_GNUC_CONST; #define TAGS_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TAGS_TYPE_BRANCH, TagsBranchPrivate)) -enum { - TAGS_BRANCH_DUMMY_PROPERTY -}; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType tag_source_collection_get_type (void) G_GNUC_CONST; -static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* added_raw, GeeIterable* removed); -static void _tags_branch_on_tags_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self); +static void tags_branch_on_tags_added_removed (TagsBranch* self, + GeeIterable* added_raw, + GeeIterable* removed); +static void _tags_branch_on_tags_added_removed_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self); gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; -static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered); -static void _tags_branch_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void tags_branch_on_tags_altered (TagsBranch* self, + GeeMap* altered); +static void _tags_branch_on_tags_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); TagsBranch* tags_branch_new (void); TagsBranch* tags_branch_construct (GType object_type); TagsHeader* tags_header_new (void); @@ -693,26 +726,47 @@ GType tags_header_get_type (void) G_GNUC_CONST; GType sidebar_tree_get_type (void) G_GNUC_CONST; GType sidebar_entry_get_type (void) G_GNUC_CONST; GType sidebar_branch_options_get_type (void) G_GNUC_CONST; -static gint tags_branch_comparator (SidebarEntry* a, SidebarEntry* b); -static gint _tags_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b); -SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator); -SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator); +static gint tags_branch_comparator (SidebarEntry* a, + SidebarEntry* b); +static gint _tags_branch_comparator_gcompare_func (gconstpointer a, + gconstpointer b); +SidebarBranch* sidebar_branch_new (SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator); +SidebarBranch* sidebar_branch_construct (GType object_type, + SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator); GeeCollection* data_collection_get_all (DataCollection* self); -TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self, Tag* tag); +TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self, + Tag* tag); gboolean tags_branch_is_user_renameable (TagsBranch* self); -gint tag_compare_names (Tag* a, Tag* b); +gint tag_compare_names (Tag* a, + Tag* b); Tag* tags_sidebar_entry_for_tag (TagsSidebarEntry* self); -static gint _tag_compare_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); +static gint _tag_compare_names_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self); Tag* tag_get_hierarchical_parent (Tag* self); TagsSidebarEntry* tags_sidebar_entry_new (Tag* tag); -TagsSidebarEntry* tags_sidebar_entry_construct (GType object_type, Tag* tag); -void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator); +TagsSidebarEntry* tags_sidebar_entry_construct (GType object_type, + Tag* tag); +void sidebar_branch_graft (SidebarBranch* self, + SidebarEntry* parent, + SidebarEntry* entry, + GCompareFunc comparator); SidebarEntry* sidebar_branch_get_root (SidebarBranch* self); -void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry); -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail); +void sidebar_branch_prune (SidebarBranch* self, + SidebarEntry* entry); +gboolean alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail); GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST; gchar* tag_get_user_visible_name (Tag* self); -void sidebar_branch_reorder (SidebarBranch* self, SidebarEntry* entry); +void sidebar_branch_reorder (SidebarBranch* self, + SidebarEntry* entry); static void tags_branch_finalize (GObject * obj); GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST; GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST; @@ -722,69 +776,103 @@ GType sidebar_internal_drop_target_entry_get_type (void) G_GNUC_CONST; GType sidebar_internal_drag_source_entry_get_type (void) G_GNUC_CONST; GType sidebar_contextable_get_type (void) G_GNUC_CONST; #define TAGS_HEADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TAGS_TYPE_HEADER, TagsHeaderPrivate)) -enum { - TAGS_HEADER_DUMMY_PROPERTY -}; -SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized); -SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized); +SidebarHeader* sidebar_header_new (const gchar* name, + const gchar* tooltip, + gboolean emphasized); +SidebarHeader* sidebar_header_construct (GType object_type, + const gchar* name, + const gchar* tooltip, + gboolean emphasized); static void tags_header_setup_context_menu (TagsHeader* self); gchar* resources_get_ui (const gchar* filename); -void app_window_error_message (const gchar* message, GtkWindow* parent); +void app_window_error_message (const gchar* message, + GtkWindow* parent); gpointer application_ref (gpointer instance); void application_unref (gpointer instance); -GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_application (GValue* value, gpointer v_object); -void value_take_application (GValue* value, gpointer v_object); +GParamSpec* param_spec_application (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_application (GValue* value, + gpointer v_object); +void value_take_application (GValue* value, + gpointer v_object); gpointer value_get_application (const GValue* value); GType application_get_type (void) G_GNUC_CONST; Application* application_get_instance (void); void application_panic (Application* self); -static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media); +static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTargetEntry* base, + GeeList* media); gpointer text_entry_dialog_mediator_ref (gpointer instance); void text_entry_dialog_mediator_unref (gpointer instance); -GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_text_entry_dialog_mediator (GValue* value, gpointer v_object); -void value_take_text_entry_dialog_mediator (GValue* value, gpointer v_object); +GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_text_entry_dialog_mediator (GValue* value, + gpointer v_object); +void value_take_text_entry_dialog_mediator (GValue* value, + gpointer v_object); gpointer value_get_text_entry_dialog_mediator (const GValue* value); GType text_entry_dialog_mediator_get_type (void) G_GNUC_CONST; GType tags_dialog_get_type (void) G_GNUC_CONST; GType add_tags_dialog_get_type (void) G_GNUC_CONST; AddTagsDialog* add_tags_dialog_new (void); AddTagsDialog* add_tags_dialog_construct (GType object_type); -gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1); +gchar** add_tags_dialog_execute (AddTagsDialog* self, + int* result_length1); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* app_window_get_command_manager (void); GType command_get_type (void) G_GNUC_CONST; -void command_manager_execute (CommandManager* self, Command* command); -AddTagsCommand* add_tags_command_new (gchar** paths, int paths_length1, GeeCollection* sources); -AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, int paths_length1, GeeCollection* sources); +void command_manager_execute (CommandManager* self, + Command* command); +AddTagsCommand* add_tags_command_new (gchar** paths, + int paths_length1, + GeeCollection* sources); +AddTagsCommand* add_tags_command_construct (GType object_type, + gchar** paths, + int paths_length1, + GeeCollection* sources); GType page_command_get_type (void) G_GNUC_CONST; GType add_tags_command_get_type (void) G_GNUC_CONST; -static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data); +static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, + GtkSelectionData* data); #define LIBRARY_WINDOW_TAG_PATH_MIME_TYPE "shotwell/tag-path" -gboolean tag_source_collection_exists (TagSourceCollection* self, const gchar* name, gboolean treat_htags_as_root); +gboolean tag_source_collection_exists (TagSourceCollection* self, + const gchar* name, + gboolean treat_htags_as_root); GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_path); Tag* tag_for_path (const gchar* name); -ReparentTagCommand* reparent_tag_command_new (Tag* tag, const gchar* new_parent_path); -ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag, const gchar* new_parent_path); +ReparentTagCommand* reparent_tag_command_new (Tag* tag, + const gchar* new_parent_path); +ReparentTagCommand* reparent_tag_command_construct (GType object_type, + Tag* tag, + const gchar* new_parent_path); GType reparent_tag_command_get_type (void) G_GNUC_CONST; -static void tags_header_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data); -static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event); +static void tags_header_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, + GtkSelectionData* data); +static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* base, + GdkEventButton* event); static void tags_header_finalize (GObject * obj); GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST; GType page_get_type (void) G_GNUC_CONST; GType sidebar_page_representative_get_type (void) G_GNUC_CONST; GType sidebar_destroyable_entry_get_type (void) G_GNUC_CONST; #define TAGS_SIDEBAR_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntryPrivate)) -enum { - TAGS_SIDEBAR_ENTRY_DUMMY_PROPERTY -}; #define RESOURCES_ICON_ONE_TAG "one-tag" SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type); void tags_sidebar_entry_init (void); @@ -793,61 +881,95 @@ static gchar* tags_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* static gchar* tags_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base); static Page* tags_sidebar_entry_real_create_page (SidebarSimplePageEntry* base); TagPage* tag_page_new (Tag* tag); -TagPage* tag_page_construct (GType object_type, Tag* tag); +TagPage* tag_page_construct (GType object_type, + Tag* tag); GType checkerboard_page_get_type (void) G_GNUC_CONST; GType media_page_get_type (void) G_GNUC_CONST; GType collection_page_get_type (void) G_GNUC_CONST; GType tag_page_get_type (void) G_GNUC_CONST; static gboolean tags_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base); -static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name); +static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, + const gchar* new_name); gchar* tag_prep_tag_name (const gchar* name); -RenameTagCommand* rename_tag_command_new (Tag* tag, const gchar* new_name); -RenameTagCommand* rename_tag_command_construct (GType object_type, Tag* tag, const gchar* new_name); +RenameTagCommand* rename_tag_command_new (Tag* tag, + const gchar* new_name); +RenameTagCommand* rename_tag_command_construct (GType object_type, + Tag* tag, + const gchar* new_name); GType simple_proxyable_command_get_type (void) G_GNUC_CONST; GType rename_tag_command_get_type (void) G_GNUC_CONST; static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base); gboolean dialogs_confirm_delete_tag (Tag* tag); DeleteTagCommand* delete_tag_command_new (Tag* tag); -DeleteTagCommand* delete_tag_command_construct (GType object_type, Tag* tag); +DeleteTagCommand* delete_tag_command_construct (GType object_type, + Tag* tag); GType delete_tag_command_get_type (void) G_GNUC_CONST; -static gboolean tags_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media); -TagUntagPhotosCommand* tag_untag_photos_command_new (Tag* tag, GeeCollection* sources, gint count, gboolean attach); -TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Tag* tag, GeeCollection* sources, gint count, gboolean attach); +static gboolean tags_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, + GeeList* media); +TagUntagPhotosCommand* tag_untag_photos_command_new (Tag* tag, + GeeCollection* sources, + gint count, + gboolean attach); +TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, + Tag* tag, + GeeCollection* sources, + gint count, + gboolean attach); GType tag_untag_photos_command_get_type (void) G_GNUC_CONST; -static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data); +static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, + GtkSelectionData* data); gchar* tag_get_path (Tag* self); GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path); static gboolean tags_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base); -static void tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data); +static void tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, + GtkSelectionData* data); static void tags_sidebar_entry_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -static void _tags_branch_on_tags_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); + + +static void +_tags_branch_on_tags_added_removed_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self) +{ #line 26 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_branch_on_tags_added_removed ((TagsBranch*) self, added, removed); -#line 831 "TagsBranch.c" +#line 944 "TagsBranch.c" } -static void _tags_branch_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_tags_branch_on_tags_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 27 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_branch_on_tags_altered ((TagsBranch*) self, items); -#line 838 "TagsBranch.c" +#line 955 "TagsBranch.c" } -static gint _tags_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b) { +static gint +_tags_branch_comparator_gcompare_func (gconstpointer a, + gconstpointer b) +{ gint result; result = tags_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b); #line 11 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 847 "TagsBranch.c" +#line 967 "TagsBranch.c" } -TagsBranch* tags_branch_construct (GType object_type) { +TagsBranch* +tags_branch_construct (GType object_type) +{ TagsBranch * self = NULL; TagsHeader* _tmp0_; TagsHeader* _tmp1_; @@ -884,22 +1006,26 @@ TagsBranch* tags_branch_construct (GType object_type) { g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _tags_branch_on_tags_altered_data_collection_items_altered, self, 0); #line 10 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return self; -#line 888 "TagsBranch.c" +#line 1010 "TagsBranch.c" } -TagsBranch* tags_branch_new (void) { +TagsBranch* +tags_branch_new (void) +{ #line 10 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return tags_branch_construct (TAGS_TYPE_BRANCH); -#line 895 "TagsBranch.c" +#line 1019 "TagsBranch.c" } -TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self, Tag* tag) { +TagsSidebarEntry* +tags_branch_get_entry_for_tag (TagsBranch* self, + Tag* tag) +{ TagsSidebarEntry* result = NULL; GeeHashMap* _tmp0_; - Tag* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 30 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_val_if_fail (TAGS_IS_BRANCH (self), NULL); #line 30 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -907,18 +1033,18 @@ TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self, Tag* tag) { #line 31 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = self->priv->entry_map; #line 31 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp1_ = tag; -#line 31 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), tag); #line 31 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - result = (TagsSidebarEntry*) _tmp2_; + result = (TagsSidebarEntry*) _tmp1_; #line 31 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 918 "TagsBranch.c" +#line 1042 "TagsBranch.c" } -gboolean tags_branch_is_user_renameable (TagsBranch* self) { +gboolean +tags_branch_is_user_renameable (TagsBranch* self) +{ gboolean result = FALSE; #line 34 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_val_if_fail (TAGS_IS_BRANCH (self), FALSE); @@ -926,86 +1052,82 @@ gboolean tags_branch_is_user_renameable (TagsBranch* self) { result = TRUE; #line 35 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 930 "TagsBranch.c" +#line 1056 "TagsBranch.c" } -static gint tags_branch_comparator (SidebarEntry* a, SidebarEntry* b) { +static gint +tags_branch_comparator (SidebarEntry* a, + SidebarEntry* b) +{ gint result = 0; - SidebarEntry* _tmp0_; - SidebarEntry* _tmp1_; - SidebarEntry* _tmp2_; + Tag* _tmp0_; + Tag* _tmp1_; + Tag* _tmp2_; Tag* _tmp3_; - Tag* _tmp4_; - SidebarEntry* _tmp5_; - Tag* _tmp6_; - Tag* _tmp7_; - gint _tmp8_; - gint _tmp9_; + gint _tmp4_; #line 38 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 38 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0); #line 39 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp0_ = a; -#line 39 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp1_ = b; -#line 39 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp0_ == _tmp1_) { + if (a == b) { #line 40 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = 0; #line 40 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 960 "TagsBranch.c" +#line 1080 "TagsBranch.c" } #line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp2_ = a; -#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp3_ = tags_sidebar_entry_for_tag (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry)); -#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp4_ = _tmp3_; + _tmp0_ = tags_sidebar_entry_for_tag (G_TYPE_CHECK_INSTANCE_CAST (a, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry)); #line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp5_ = b; + _tmp1_ = _tmp0_; #line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp6_ = tags_sidebar_entry_for_tag (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry)); + _tmp2_ = tags_sidebar_entry_for_tag (G_TYPE_CHECK_INSTANCE_CAST (b, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry)); #line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp7_ = _tmp6_; -#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp8_ = tag_compare_names (_tmp4_, _tmp7_); + _tmp3_ = _tmp2_; #line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp9_ = _tmp8_; + _tmp4_ = tag_compare_names (_tmp1_, _tmp3_); #line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp3_); #line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp1_); #line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - result = _tmp9_; + result = _tmp4_; #line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 986 "TagsBranch.c" +#line 1100 "TagsBranch.c" } -static gint _tag_compare_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gint +_tag_compare_names_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gint result; result = tag_compare_names ((Tag*) a, (Tag*) b); #line 57 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 995 "TagsBranch.c" +#line 1113 "TagsBranch.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 59 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return self ? g_object_ref (self) : NULL; -#line 1002 "TagsBranch.c" +#line 1122 "TagsBranch.c" } -static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* added_raw, GeeIterable* removed) { +static void +tags_branch_on_tags_added_removed (TagsBranch* self, + GeeIterable* added_raw, + GeeIterable* removed) +{ Tag* restore_point = NULL; - GeeIterable* _tmp0_; - GeeIterable* _tmp49_; #line 46 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_if_fail (TAGS_IS_BRANCH (self)); #line 46 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -1015,560 +1137,533 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad #line 51 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" restore_point = NULL; #line 53 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp0_ = added_raw; -#line 53 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp0_ != NULL) { -#line 1022 "TagsBranch.c" + if (added_raw != NULL) { +#line 1142 "TagsBranch.c" GeeSortedSet* added = NULL; - GeeTreeSet* _tmp1_; + GeeTreeSet* _tmp0_; #line 57 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp1_ = gee_tree_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tag_compare_names_gcompare_data_func, NULL, NULL); + _tmp0_ = gee_tree_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tag_compare_names_gcompare_data_func, NULL, NULL); #line 57 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - added = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet); -#line 1029 "TagsBranch.c" + added = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SORTED_SET, GeeSortedSet); +#line 1149 "TagsBranch.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp2_; - GeeIterator* _tmp3_; -#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp2_ = added_raw; + GeeIterator* _tmp1_; #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp3_ = gee_iterable_iterator (_tmp2_); + _tmp1_ = gee_iterable_iterator (added_raw); #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _object_it = _tmp3_; + _object_it = _tmp1_; #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" while (TRUE) { -#line 1042 "TagsBranch.c" - GeeIterator* _tmp4_; - gboolean _tmp5_; +#line 1159 "TagsBranch.c" + GeeIterator* _tmp2_; DataObject* object = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; + GeeIterator* _tmp3_; + gpointer _tmp4_; Tag* tag = NULL; - DataObject* _tmp8_; - Tag* _tmp9_; - GeeSortedSet* _tmp10_; - Tag* _tmp11_; + DataObject* _tmp5_; + Tag* _tmp6_; + GeeSortedSet* _tmp7_; + Tag* _tmp8_; #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp2_)) { #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" break; -#line 1061 "TagsBranch.c" +#line 1175 "TagsBranch.c" } #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp6_ = _object_it; + _tmp3_ = _object_it; #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - object = (DataObject*) _tmp7_; + object = (DataObject*) _tmp4_; #line 59 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp8_ = object; + _tmp5_ = object; #line 59 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_TAG, Tag)); + _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_TAG, Tag)); #line 59 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - tag = _tmp9_; + tag = _tmp6_; #line 60 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp10_ = added; + _tmp7_ = added; #line 60 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp11_ = tag; + _tmp8_ = tag; #line 60 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp8_); #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (tag); #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (object); -#line 1085 "TagsBranch.c" +#line 1199 "TagsBranch.c" } #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_object_it); -#line 1089 "TagsBranch.c" +#line 1203 "TagsBranch.c" } { GeeIterator* _tag_it = NULL; - GeeSortedSet* _tmp12_; - GeeIterator* _tmp13_; + GeeSortedSet* _tmp9_; + GeeIterator* _tmp10_; #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp12_ = added; + _tmp9_ = added; #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tag_it = _tmp13_; + _tag_it = _tmp10_; #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" while (TRUE) { -#line 1103 "TagsBranch.c" - GeeIterator* _tmp14_; - gboolean _tmp15_; +#line 1217 "TagsBranch.c" + GeeIterator* _tmp11_; Tag* tag = NULL; - GeeIterator* _tmp16_; - gpointer _tmp17_; + GeeIterator* _tmp12_; + gpointer _tmp13_; Tag* parent_tag = NULL; - Tag* _tmp18_; - Tag* _tmp19_; + Tag* _tmp14_; + Tag* _tmp15_; TagsSidebarEntry* entry = NULL; + Tag* _tmp26_; + TagsSidebarEntry* _tmp27_; + GeeHashMap* _tmp28_; + Tag* _tmp29_; + TagsSidebarEntry* _tmp30_; Tag* _tmp31_; - TagsSidebarEntry* _tmp32_; - GeeHashMap* _tmp33_; - Tag* _tmp34_; - TagsSidebarEntry* _tmp35_; - Tag* _tmp36_; - Tag* _tmp37_; - Tag* _tmp38_; - Tag* _tmp47_; - Tag* _tmp48_; -#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp14_ = _tag_it; + Tag* _tmp32_; + Tag* _tmp33_; + Tag* _tmp42_; + Tag* _tmp43_; #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp15_ = gee_iterator_next (_tmp14_); + _tmp11_ = _tag_it; #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (!_tmp15_) { + if (!gee_iterator_next (_tmp11_)) { #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" break; -#line 1131 "TagsBranch.c" +#line 1242 "TagsBranch.c" } #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp16_ = _tag_it; + _tmp12_ = _tag_it; #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp17_ = gee_iterator_get (_tmp16_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - tag = (Tag*) _tmp17_; + tag = (Tag*) _tmp13_; #line 66 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp18_ = tag; + _tmp14_ = tag; #line 66 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp19_ = tag_get_hierarchical_parent (_tmp18_); + _tmp15_ = tag_get_hierarchical_parent (_tmp14_); #line 66 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - parent_tag = _tmp19_; + parent_tag = _tmp15_; #line 67 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" while (TRUE) { -#line 1147 "TagsBranch.c" - Tag* _tmp20_; - GeeHashMap* _tmp21_; - Tag* _tmp22_; - gboolean _tmp23_; - Tag* _tmp29_; - Tag* _tmp30_; +#line 1258 "TagsBranch.c" + Tag* _tmp16_; + GeeHashMap* _tmp17_; + Tag* _tmp18_; + Tag* _tmp24_; + Tag* _tmp25_; #line 67 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp20_ = parent_tag; + _tmp16_ = parent_tag; #line 67 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (!(_tmp20_ != NULL)) { + if (!(_tmp16_ != NULL)) { #line 67 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" break; -#line 1160 "TagsBranch.c" +#line 1270 "TagsBranch.c" } #line 68 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp21_ = self->priv->entry_map; + _tmp17_ = self->priv->entry_map; #line 68 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp22_ = parent_tag; + _tmp18_ = parent_tag; #line 68 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp23_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_); -#line 68 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (!_tmp23_) { -#line 1170 "TagsBranch.c" + if (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp18_)) { +#line 1278 "TagsBranch.c" TagsSidebarEntry* parent_entry = NULL; - Tag* _tmp24_; - TagsSidebarEntry* _tmp25_; - GeeHashMap* _tmp26_; - Tag* _tmp27_; - TagsSidebarEntry* _tmp28_; + Tag* _tmp19_; + TagsSidebarEntry* _tmp20_; + GeeHashMap* _tmp21_; + Tag* _tmp22_; + TagsSidebarEntry* _tmp23_; #line 69 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp24_ = parent_tag; + _tmp19_ = parent_tag; #line 69 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp25_ = tags_sidebar_entry_new (_tmp24_); + _tmp20_ = tags_sidebar_entry_new (_tmp19_); #line 69 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - parent_entry = _tmp25_; + parent_entry = _tmp20_; #line 70 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp26_ = self->priv->entry_map; + _tmp21_ = self->priv->entry_map; #line 70 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp27_ = parent_tag; + _tmp22_ = parent_tag; #line 70 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp28_ = parent_entry; + _tmp23_ = parent_entry; #line 70 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_, _tmp28_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, _tmp23_); #line 68 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (parent_entry); -#line 1193 "TagsBranch.c" +#line 1301 "TagsBranch.c" } #line 73 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp29_ = parent_tag; + _tmp24_ = parent_tag; #line 73 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp30_ = tag_get_hierarchical_parent (_tmp29_); + _tmp25_ = tag_get_hierarchical_parent (_tmp24_); #line 73 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (parent_tag); #line 73 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - parent_tag = _tmp30_; -#line 1203 "TagsBranch.c" + parent_tag = _tmp25_; +#line 1311 "TagsBranch.c" } #line 77 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp31_ = tag; + _tmp26_ = tag; #line 77 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp32_ = tags_sidebar_entry_new (_tmp31_); + _tmp27_ = tags_sidebar_entry_new (_tmp26_); #line 77 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - entry = _tmp32_; + entry = _tmp27_; #line 78 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp33_ = self->priv->entry_map; + _tmp28_ = self->priv->entry_map; #line 78 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp34_ = tag; + _tmp29_ = tag; #line 78 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp35_ = entry; + _tmp30_ = entry; #line 78 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp34_, _tmp35_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp29_, _tmp30_); #line 80 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp36_ = tag; + _tmp31_ = tag; #line 80 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp37_ = tag_get_hierarchical_parent (_tmp36_); + _tmp32_ = tag_get_hierarchical_parent (_tmp31_); #line 80 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (parent_tag); #line 80 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - parent_tag = _tmp37_; + parent_tag = _tmp32_; #line 81 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp38_ = parent_tag; + _tmp33_ = parent_tag; #line 81 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp38_ != NULL) { -#line 1231 "TagsBranch.c" + if (_tmp33_ != NULL) { +#line 1339 "TagsBranch.c" TagsSidebarEntry* parent_entry = NULL; - GeeHashMap* _tmp39_; - Tag* _tmp40_; - gpointer _tmp41_; - TagsSidebarEntry* _tmp42_; - TagsSidebarEntry* _tmp43_; + GeeHashMap* _tmp34_; + Tag* _tmp35_; + gpointer _tmp36_; + TagsSidebarEntry* _tmp37_; + TagsSidebarEntry* _tmp38_; #line 82 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp39_ = self->priv->entry_map; + _tmp34_ = self->priv->entry_map; #line 82 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp40_ = parent_tag; + _tmp35_ = parent_tag; #line 82 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp41_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp40_); + _tmp36_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp35_); #line 82 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - parent_entry = (TagsSidebarEntry*) _tmp41_; + parent_entry = (TagsSidebarEntry*) _tmp36_; #line 83 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp42_ = parent_entry; + _tmp37_ = parent_entry; #line 83 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp43_ = entry; + _tmp38_ = entry; #line 83 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, SIDEBAR_TYPE_ENTRY, SidebarEntry), G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, SIDEBAR_TYPE_ENTRY, SidebarEntry), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); #line 81 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (parent_entry); -#line 1254 "TagsBranch.c" +#line 1362 "TagsBranch.c" } else { - SidebarEntry* _tmp44_; - SidebarEntry* _tmp45_; - TagsSidebarEntry* _tmp46_; + SidebarEntry* _tmp39_; + SidebarEntry* _tmp40_; + TagsSidebarEntry* _tmp41_; #line 85 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp44_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp39_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 85 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp45_ = _tmp44_; + _tmp40_ = _tmp39_; #line 85 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp46_ = entry; + _tmp41_ = entry; #line 85 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); #line 85 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp45_); -#line 1269 "TagsBranch.c" + _g_object_unref0 (_tmp40_); +#line 1377 "TagsBranch.c" } #line 90 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp47_ = tag; + _tmp42_ = tag; #line 90 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp48_ = _g_object_ref0 (_tmp47_); + _tmp43_ = _g_object_ref0 (_tmp42_); #line 90 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (restore_point); #line 90 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - restore_point = _tmp48_; + restore_point = _tmp43_; #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (entry); #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (parent_tag); #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (tag); -#line 1285 "TagsBranch.c" +#line 1393 "TagsBranch.c" } #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_tag_it); -#line 1289 "TagsBranch.c" +#line 1397 "TagsBranch.c" } #line 53 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (added); -#line 1293 "TagsBranch.c" +#line 1401 "TagsBranch.c" } #line 94 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp49_ = removed; -#line 94 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp49_ != NULL) { -#line 1299 "TagsBranch.c" + if (removed != NULL) { +#line 1405 "TagsBranch.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp50_; - GeeIterator* _tmp51_; -#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp50_ = removed; + GeeIterator* _tmp44_; #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp51_ = gee_iterable_iterator (_tmp50_); + _tmp44_ = gee_iterable_iterator (removed); #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _object_it = _tmp51_; + _object_it = _tmp44_; #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" while (TRUE) { -#line 1312 "TagsBranch.c" - GeeIterator* _tmp52_; - gboolean _tmp53_; +#line 1415 "TagsBranch.c" + GeeIterator* _tmp45_; DataObject* object = NULL; - GeeIterator* _tmp54_; - gpointer _tmp55_; + GeeIterator* _tmp46_; + gpointer _tmp47_; Tag* tag = NULL; - DataObject* _tmp56_; - Tag* _tmp57_; + DataObject* _tmp48_; + Tag* _tmp49_; TagsSidebarEntry* entry = NULL; - GeeHashMap* _tmp58_; - Tag* _tmp59_; - gpointer _tmp60_; - TagsSidebarEntry* _tmp61_; + GeeHashMap* _tmp50_; + Tag* _tmp51_; + gpointer _tmp52_; + TagsSidebarEntry* _tmp53_; gboolean is_removed = FALSE; - GeeHashMap* _tmp62_; - Tag* _tmp63_; - gboolean _tmp64_; - gboolean _tmp65_; - TagsSidebarEntry* _tmp66_; -#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp52_ = _object_it; + GeeHashMap* _tmp54_; + Tag* _tmp55_; + gboolean _tmp56_; + gboolean _tmp57_; + TagsSidebarEntry* _tmp58_; #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp53_ = gee_iterator_next (_tmp52_); + _tmp45_ = _object_it; #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (!_tmp53_) { + if (!gee_iterator_next (_tmp45_)) { #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" break; -#line 1340 "TagsBranch.c" +#line 1440 "TagsBranch.c" } #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp54_ = _object_it; + _tmp46_ = _object_it; #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp55_ = gee_iterator_get (_tmp54_); + _tmp47_ = gee_iterator_get (_tmp46_); #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - object = (DataObject*) _tmp55_; + object = (DataObject*) _tmp47_; #line 96 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp56_ = object; + _tmp48_ = object; #line 96 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp57_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_TAG, Tag)); + _tmp49_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_TAG, Tag)); #line 96 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - tag = _tmp57_; + tag = _tmp49_; #line 98 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp58_ = self->priv->entry_map; + _tmp50_ = self->priv->entry_map; #line 98 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp59_ = tag; + _tmp51_ = tag; #line 98 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp60_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp59_); + _tmp52_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp51_); #line 98 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - entry = (TagsSidebarEntry*) _tmp60_; + entry = (TagsSidebarEntry*) _tmp52_; #line 99 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp61_ = entry; + _tmp53_ = entry; #line 99 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _vala_assert (_tmp61_ != NULL, "entry != null"); + _vala_assert (_tmp53_ != NULL, "entry != null"); #line 101 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp62_ = self->priv->entry_map; + _tmp54_ = self->priv->entry_map; #line 101 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp63_ = tag; + _tmp55_ = tag; #line 101 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp64_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp63_, NULL); + _tmp56_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp55_, NULL); #line 101 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - is_removed = _tmp64_; + is_removed = _tmp56_; #line 102 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp65_ = is_removed; + _tmp57_ = is_removed; #line 102 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _vala_assert (_tmp65_, "is_removed"); + _vala_assert (_tmp57_, "is_removed"); #line 104 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp66_ = entry; + _tmp58_ = entry; #line 104 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); + sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (entry); #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (tag); #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (object); -#line 1388 "TagsBranch.c" +#line 1488 "TagsBranch.c" } #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_object_it); -#line 1392 "TagsBranch.c" +#line 1492 "TagsBranch.c" } } #line 46 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (restore_point); -#line 1397 "TagsBranch.c" +#line 1497 "TagsBranch.c" } -static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) { +static void +tags_branch_on_tags_altered (TagsBranch* self, + GeeMap* altered) +{ #line 109 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_if_fail (TAGS_IS_BRANCH (self)); #line 109 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_if_fail (GEE_IS_MAP (altered)); -#line 1406 "TagsBranch.c" +#line 1509 "TagsBranch.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp0_ = altered; + _tmp0_ = gee_map_get_keys (altered); #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp2_ = _tmp1_; #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp3_ = _tmp2_; + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp4_ = _tmp3_; #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp5_ = _tmp4_; + _g_object_unref0 (_tmp2_); #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp3_); -#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" while (TRUE) { -#line 1433 "TagsBranch.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 1533 "TagsBranch.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; + GeeIterator* _tmp6_; + gpointer _tmp7_; + DataObject* _tmp8_; gpointer _tmp9_; - GeeMap* _tmp10_; - DataObject* _tmp11_; - gpointer _tmp12_; - Alteration* _tmp13_; - gboolean _tmp14_; - gboolean _tmp15_; + Alteration* _tmp10_; + gboolean _tmp11_; Tag* tag = NULL; - DataObject* _tmp16_; - Tag* _tmp17_; + DataObject* _tmp12_; + Tag* _tmp13_; TagsSidebarEntry* entry = NULL; - GeeHashMap* _tmp18_; + GeeHashMap* _tmp14_; + Tag* _tmp15_; + gpointer _tmp16_; + TagsSidebarEntry* _tmp17_; + TagsSidebarEntry* _tmp18_; Tag* _tmp19_; - gpointer _tmp20_; - TagsSidebarEntry* _tmp21_; + gchar* _tmp20_; + gchar* _tmp21_; TagsSidebarEntry* _tmp22_; Tag* _tmp23_; gchar* _tmp24_; gchar* _tmp25_; TagsSidebarEntry* _tmp26_; - Tag* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; - TagsSidebarEntry* _tmp30_; -#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp6_ = _object_it; #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" break; -#line 1470 "TagsBranch.c" +#line 1565 "TagsBranch.c" } #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - object = (DataObject*) _tmp9_; -#line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp10_ = altered; + object = (DataObject*) _tmp7_; #line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp11_ = object; + _tmp8_ = object; #line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp12_ = gee_map_get (_tmp10_, _tmp11_); + _tmp9_ = gee_map_get (altered, _tmp8_); #line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp13_ = (Alteration*) _tmp12_; + _tmp10_ = (Alteration*) _tmp9_; #line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp14_ = alteration_has_detail (_tmp13_, "metadata", "name"); + _tmp11_ = !alteration_has_detail (_tmp10_, "metadata", "name"); #line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp15_ = !_tmp14_; + _alteration_unref0 (_tmp10_); #line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _alteration_unref0 (_tmp13_); -#line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp15_) { + if (_tmp11_) { #line 112 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (object); #line 112 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" continue; -#line 1498 "TagsBranch.c" +#line 1589 "TagsBranch.c" } #line 114 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp16_ = object; + _tmp12_ = object; #line 114 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_TAG, Tag)); + _tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_TAG, Tag)); #line 114 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - tag = _tmp17_; + tag = _tmp13_; #line 115 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp18_ = self->priv->entry_map; + _tmp14_ = self->priv->entry_map; #line 115 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp19_ = tag; + _tmp15_ = tag; #line 115 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp20_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp19_); + _tmp16_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_); #line 115 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - entry = (TagsSidebarEntry*) _tmp20_; + entry = (TagsSidebarEntry*) _tmp16_; #line 116 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp21_ = entry; + _tmp17_ = entry; #line 116 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _vala_assert (_tmp21_ != NULL, "entry != null"); + _vala_assert (_tmp17_ != NULL, "entry != null"); #line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp22_ = entry; + _tmp18_ = entry; #line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp23_ = tag; + _tmp19_ = tag; #line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp24_ = tag_get_user_visible_name (_tmp23_); + _tmp20_ = tag_get_user_visible_name (_tmp19_); #line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp25_ = _tmp24_; + _tmp21_ = _tmp20_; #line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry), "sidebar-name-changed", _tmp25_); + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry), "sidebar-name-changed", _tmp21_); #line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp25_); + _g_free0 (_tmp21_); #line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp26_ = entry; + _tmp22_ = entry; #line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp27_ = tag; + _tmp23_ = tag; #line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp28_ = tag_get_user_visible_name (_tmp27_); + _tmp24_ = tag_get_user_visible_name (_tmp23_); #line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp29_ = _tmp28_; + _tmp25_ = _tmp24_; #line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-tooltip-changed", _tmp29_); + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-tooltip-changed", _tmp25_); #line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp29_); + _g_free0 (_tmp25_); #line 120 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp30_ = entry; + _tmp26_ = entry; #line 120 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - sidebar_branch_reorder (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); + sidebar_branch_reorder (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (entry); #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (tag); #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (object); -#line 1552 "TagsBranch.c" +#line 1643 "TagsBranch.c" } #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_object_it); -#line 1556 "TagsBranch.c" +#line 1647 "TagsBranch.c" } } -static void tags_branch_class_init (TagsBranchClass * klass) { +static void +tags_branch_class_init (TagsBranchClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_branch_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_type_class_add_private (klass, sizeof (TagsBranchPrivate)); #line 7 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" G_OBJECT_CLASS (klass)->finalize = tags_branch_finalize; -#line 1568 "TagsBranch.c" +#line 1661 "TagsBranch.c" } -static void tags_branch_instance_init (TagsBranch * self) { +static void +tags_branch_instance_init (TagsBranch * self) +{ GeeHashMap* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv = TAGS_BRANCH_GET_PRIVATE (self); @@ -1576,11 +1671,13 @@ static void tags_branch_instance_init (TagsBranch * self) { _tmp0_ = gee_hash_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TAGS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 8 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv->entry_map = _tmp0_; -#line 1580 "TagsBranch.c" +#line 1675 "TagsBranch.c" } -static void tags_branch_finalize (GObject * obj) { +static void +tags_branch_finalize (GObject * obj) +{ TagsBranch * self; TagSourceCollection* _tmp0_; guint _tmp1_; @@ -1604,11 +1701,13 @@ static void tags_branch_finalize (GObject * obj) { _g_object_unref0 (self->priv->entry_map); #line 7 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" G_OBJECT_CLASS (tags_branch_parent_class)->finalize (obj); -#line 1608 "TagsBranch.c" +#line 1705 "TagsBranch.c" } -GType tags_branch_get_type (void) { +GType +tags_branch_get_type (void) +{ static volatile gsize tags_branch_type_id__volatile = 0; if (g_once_init_enter (&tags_branch_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TagsBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tags_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TagsBranch), 0, (GInstanceInitFunc) tags_branch_instance_init, NULL }; @@ -1620,7 +1719,9 @@ GType tags_branch_get_type (void) { } -TagsHeader* tags_header_construct (GType object_type) { +TagsHeader* +tags_header_construct (GType object_type) +{ TagsHeader * self = NULL; #line 131 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = (TagsHeader*) sidebar_header_construct (object_type, _ ("Tags"), _ ("Organize and browse your photo’s tags"), TRUE); @@ -1628,18 +1729,22 @@ TagsHeader* tags_header_construct (GType object_type) { tags_header_setup_context_menu (self); #line 130 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return self; -#line 1632 "TagsBranch.c" +#line 1733 "TagsBranch.c" } -TagsHeader* tags_header_new (void) { +TagsHeader* +tags_header_new (void) +{ #line 130 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return tags_header_construct (TAGS_TYPE_HEADER); -#line 1639 "TagsBranch.c" +#line 1742 "TagsBranch.c" } -static void tags_header_setup_context_menu (TagsHeader* self) { +static void +tags_header_setup_context_menu (TagsHeader* self) +{ GtkBuilder* _tmp0_; GError * _inner_error_ = NULL; #line 135 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -1650,7 +1755,7 @@ static void tags_header_setup_context_menu (TagsHeader* self) { _g_object_unref0 (self->priv->builder); #line 136 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv->builder = _tmp0_; -#line 1654 "TagsBranch.c" +#line 1759 "TagsBranch.c" { GtkBuilder* _tmp1_; gchar* _tmp2_; @@ -1673,7 +1778,7 @@ static void tags_header_setup_context_menu (TagsHeader* self) { _g_free0 (_tmp3_); #line 138 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1677 "TagsBranch.c" +#line 1782 "TagsBranch.c" goto __catch61_g_error; } #line 139 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -1696,7 +1801,7 @@ static void tags_header_setup_context_menu (TagsHeader* self) { self->priv->context_menu = _tmp8_; #line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (model); -#line 1700 "TagsBranch.c" +#line 1805 "TagsBranch.c" } goto __finally61; __catch61_g_error: @@ -1734,7 +1839,7 @@ static void tags_header_setup_context_menu (TagsHeader* self) { _application_unref0 (_tmp14_); #line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_error_free0 (_error_); -#line 1738 "TagsBranch.c" +#line 1843 "TagsBranch.c" } __finally61: #line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -1745,12 +1850,15 @@ static void tags_header_setup_context_menu (TagsHeader* self) { g_clear_error (&_inner_error_); #line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return; -#line 1749 "TagsBranch.c" +#line 1854 "TagsBranch.c" } } -static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media) { +static gboolean +tags_header_real_internal_drop_received (SidebarInternalDropTargetEntry* base, + GeeList* media) +{ TagsHeader * self; gboolean result = FALSE; AddTagsDialog* dialog = NULL; @@ -1768,9 +1876,8 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg CommandManager* _tmp8_; gchar** _tmp9_; gint _tmp9__length1; - GeeList* _tmp10_; + AddTagsCommand* _tmp10_; AddTagsCommand* _tmp11_; - AddTagsCommand* _tmp12_; #line 148 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader); #line 148 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -1797,7 +1904,7 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg if (_tmp5_ == NULL) { #line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp4_ = TRUE; -#line 1801 "TagsBranch.c" +#line 1908 "TagsBranch.c" } else { gchar** _tmp6_; gint _tmp6__length1; @@ -1807,7 +1914,7 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg _tmp6__length1 = names_length1; #line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp4_ = _tmp6__length1 == 0; -#line 1811 "TagsBranch.c" +#line 1918 "TagsBranch.c" } #line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (_tmp4_) { @@ -1819,7 +1926,7 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg _text_entry_dialog_mediator_unref0 (dialog); #line 152 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 1823 "TagsBranch.c" +#line 1930 "TagsBranch.c" } #line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp7_ = app_window_get_command_manager (); @@ -1830,15 +1937,13 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg #line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp9__length1 = names_length1; #line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp10_ = media; -#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp11_ = add_tags_command_new (_tmp9_, _tmp9__length1, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp10_ = add_tags_command_new (_tmp9_, _tmp9__length1, G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_COLLECTION, GeeCollection)); #line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); #line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp11_); #line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _command_manager_unref0 (_tmp8_); #line 156 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -1849,146 +1954,143 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg _text_entry_dialog_mediator_unref0 (dialog); #line 156 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 1853 "TagsBranch.c" +#line 1958 "TagsBranch.c" } -static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data) { +static gboolean +tags_header_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, + GtkSelectionData* data) +{ TagsHeader * self; gboolean result = FALSE; - GtkSelectionData* _tmp0_; - GdkAtom _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; - gboolean _tmp4_; + gchar* _tmp0_; + gchar* _tmp1_; + gboolean _tmp2_; #line 159 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader); #line 159 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_val_if_fail (data != NULL, FALSE); #line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp0_ = data; -#line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp1_ = gtk_selection_data_get_data_type (_tmp0_); -#line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp2_ = gdk_atom_name (_tmp1_); + _tmp0_ = gdk_atom_name (gtk_selection_data_get_data_type (data)); #line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp4_ = g_strcmp0 (_tmp3_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0; + _tmp2_ = g_strcmp0 (_tmp1_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0; #line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp1_); #line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp4_) { -#line 1883 "TagsBranch.c" + if (_tmp2_) { +#line 1985 "TagsBranch.c" gchar* old_tag_path = NULL; - GtkSelectionData* _tmp5_; - guchar* _tmp6_; - gchar* _tmp7_; - TagSourceCollection* _tmp8_; - const gchar* _tmp9_; - gboolean _tmp10_; - const gchar* _tmp11_; - GeeList* _tmp12_; - GeeList* _tmp13_; - gint _tmp14_; - gint _tmp15_; - gboolean _tmp16_; - CommandManager* _tmp17_; - CommandManager* _tmp18_; - const gchar* _tmp19_; - Tag* _tmp20_; - Tag* _tmp21_; - ReparentTagCommand* _tmp22_; - ReparentTagCommand* _tmp23_; -#line 161 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp5_ = data; + guint8* _tmp3_; + gchar* _tmp4_; + TagSourceCollection* _tmp5_; + const gchar* _tmp6_; + const gchar* _tmp7_; + GeeList* _tmp8_; + GeeList* _tmp9_; + gint _tmp10_; + gint _tmp11_; + gboolean _tmp12_; + CommandManager* _tmp13_; + CommandManager* _tmp14_; + const gchar* _tmp15_; + Tag* _tmp16_; + Tag* _tmp17_; + ReparentTagCommand* _tmp18_; + ReparentTagCommand* _tmp19_; #line 161 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp6_ = gtk_selection_data_get_data (_tmp5_); + _tmp3_ = gtk_selection_data_get_data (data); #line 161 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp7_ = g_strdup ((const gchar*) _tmp6_); + _tmp4_ = g_strdup ((const gchar*) _tmp3_); #line 161 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - old_tag_path = _tmp7_; + old_tag_path = _tmp4_; #line 162 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp8_ = tag_global; + _tmp5_ = tag_global; #line 162 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp9_ = old_tag_path; + _tmp6_ = old_tag_path; #line 162 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp10_ = tag_source_collection_exists (_tmp8_, _tmp9_, FALSE); -#line 162 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _vala_assert (_tmp10_, "Tag.global.exists(old_tag_path)"); + _vala_assert (tag_source_collection_exists (_tmp5_, _tmp6_, FALSE), "Tag.global.exists(old_tag_path)"); #line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp11_ = old_tag_path; + _tmp7_ = old_tag_path; #line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp12_ = hierarchical_tag_utilities_enumerate_path_components (_tmp11_); + _tmp8_ = hierarchical_tag_utilities_enumerate_path_components (_tmp7_); #line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp13_ = _tmp12_; + _tmp9_ = _tmp8_; #line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection)); #line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp15_ = _tmp14_; + _tmp11_ = _tmp10_; #line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp16_ = _tmp15_ < 2; + _tmp12_ = _tmp11_ < 2; #line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp9_); #line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp16_) { + if (_tmp12_) { #line 166 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; #line 166 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (old_tag_path); #line 166 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 1942 "TagsBranch.c" +#line 2038 "TagsBranch.c" } #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp17_ = app_window_get_command_manager (); + _tmp13_ = app_window_get_command_manager (); #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp18_ = _tmp17_; + _tmp14_ = _tmp13_; #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp19_ = old_tag_path; + _tmp15_ = old_tag_path; #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp20_ = tag_for_path (_tmp19_); + _tmp16_ = tag_for_path (_tmp15_); #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp21_ = _tmp20_; + _tmp17_ = _tmp16_; #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp22_ = reparent_tag_command_new (_tmp21_, "/"); + _tmp18_ = reparent_tag_command_new (_tmp17_, "/"); #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp23_ = _tmp22_; + _tmp19_ = _tmp18_; #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - command_manager_execute (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_COMMAND, Command)); #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp19_); #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp21_); + _g_object_unref0 (_tmp17_); #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _command_manager_unref0 (_tmp18_); + _command_manager_unref0 (_tmp14_); #line 171 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; #line 171 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (old_tag_path); #line 171 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 1972 "TagsBranch.c" +#line 2068 "TagsBranch.c" } #line 174 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = FALSE; #line 174 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 1978 "TagsBranch.c" +#line 2074 "TagsBranch.c" } -static void tags_header_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data) { +static void +tags_header_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, + GtkSelectionData* data) +{ TagsHeader * self; #line 177 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader); #line 177 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_if_fail (data != NULL); -#line 1988 "TagsBranch.c" +#line 2087 "TagsBranch.c" } -static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event) { +static GtkMenu* +tags_header_real_get_sidebar_context_menu (SidebarContextable* base, + GdkEventButton* event) +{ TagsHeader * self; GtkMenu* result = NULL; GtkMenu* _tmp0_; @@ -2003,60 +2105,72 @@ static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* b result = _tmp1_; #line 182 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2007 "TagsBranch.c" +#line 2109 "TagsBranch.c" } -static void tags_header_class_init (TagsHeaderClass * klass) { +static void +tags_header_class_init (TagsHeaderClass * klass) +{ #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_header_parent_class = g_type_class_peek_parent (klass); #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_type_class_add_private (klass, sizeof (TagsHeaderPrivate)); #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" G_OBJECT_CLASS (klass)->finalize = tags_header_finalize; -#line 2018 "TagsBranch.c" +#line 2122 "TagsBranch.c" } -static void tags_header_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) { +static void +tags_header_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) +{ #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_header_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface); #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) tags_header_real_internal_drop_received; #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) tags_header_real_internal_drop_received_arbitrary; -#line 2029 "TagsBranch.c" +#line 2135 "TagsBranch.c" } -static void tags_header_sidebar_internal_drag_source_entry_interface_init (SidebarInternalDragSourceEntryIface * iface) { +static void +tags_header_sidebar_internal_drag_source_entry_interface_init (SidebarInternalDragSourceEntryIface * iface) +{ #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_header_sidebar_internal_drag_source_entry_parent_iface = g_type_interface_peek_parent (iface); #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->prepare_selection_data = (void (*) (SidebarInternalDragSourceEntry *, GtkSelectionData*)) tags_header_real_prepare_selection_data; -#line 2038 "TagsBranch.c" +#line 2146 "TagsBranch.c" } -static void tags_header_sidebar_contextable_interface_init (SidebarContextableIface * iface) { +static void +tags_header_sidebar_contextable_interface_init (SidebarContextableIface * iface) +{ #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_header_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface); #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->get_sidebar_context_menu = (GtkMenu* (*) (SidebarContextable *, GdkEventButton*)) tags_header_real_get_sidebar_context_menu; -#line 2047 "TagsBranch.c" +#line 2157 "TagsBranch.c" } -static void tags_header_instance_init (TagsHeader * self) { +static void +tags_header_instance_init (TagsHeader * self) +{ #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv = TAGS_HEADER_GET_PRIVATE (self); #line 128 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv->context_menu = NULL; -#line 2056 "TagsBranch.c" +#line 2168 "TagsBranch.c" } -static void tags_header_finalize (GObject * obj) { +static void +tags_header_finalize (GObject * obj) +{ TagsHeader * self; #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_HEADER, TagsHeader); @@ -2066,11 +2180,13 @@ static void tags_header_finalize (GObject * obj) { _g_object_unref0 (self->priv->context_menu); #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" G_OBJECT_CLASS (tags_header_parent_class)->finalize (obj); -#line 2070 "TagsBranch.c" +#line 2184 "TagsBranch.c" } -GType tags_header_get_type (void) { +GType +tags_header_get_type (void) +{ static volatile gsize tags_header_type_id__volatile = 0; if (g_once_init_enter (&tags_header_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TagsHeaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tags_header_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TagsHeader), 0, (GInstanceInitFunc) tags_header_instance_init, NULL }; @@ -2088,44 +2204,52 @@ GType tags_header_get_type (void) { } -TagsSidebarEntry* tags_sidebar_entry_construct (GType object_type, Tag* tag) { +TagsSidebarEntry* +tags_sidebar_entry_construct (GType object_type, + Tag* tag) +{ TagsSidebarEntry * self = NULL; Tag* _tmp0_; - Tag* _tmp1_; #line 193 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_val_if_fail (IS_TAG (tag), NULL); #line 193 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = (TagsSidebarEntry*) sidebar_simple_page_entry_construct (object_type); #line 194 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp0_ = tag; -#line 194 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (tag); #line 194 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (self->priv->tag); #line 194 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - self->priv->tag = _tmp1_; + self->priv->tag = _tmp0_; #line 193 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return self; -#line 2110 "TagsBranch.c" +#line 2226 "TagsBranch.c" } -TagsSidebarEntry* tags_sidebar_entry_new (Tag* tag) { +TagsSidebarEntry* +tags_sidebar_entry_new (Tag* tag) +{ #line 193 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return tags_sidebar_entry_construct (TAGS_TYPE_SIDEBAR_ENTRY, tag); -#line 2117 "TagsBranch.c" +#line 2235 "TagsBranch.c" } -void tags_sidebar_entry_init (void) { +void +tags_sidebar_entry_init (void) +{ } -void tags_sidebar_entry_terminate (void) { +void +tags_sidebar_entry_terminate (void) +{ } -Tag* tags_sidebar_entry_for_tag (TagsSidebarEntry* self) { +Tag* +tags_sidebar_entry_for_tag (TagsSidebarEntry* self) +{ Tag* result = NULL; Tag* _tmp0_; Tag* _tmp1_; @@ -2139,11 +2263,13 @@ Tag* tags_sidebar_entry_for_tag (TagsSidebarEntry* self) { result = _tmp1_; #line 204 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2143 "TagsBranch.c" +#line 2267 "TagsBranch.c" } -static gchar* tags_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +tags_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ TagsSidebarEntry * self; gchar* result = NULL; Tag* _tmp0_; @@ -2158,11 +2284,13 @@ static gchar* tags_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* result = _tmp1_; #line 208 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2162 "TagsBranch.c" +#line 2288 "TagsBranch.c" } -static gchar* tags_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { +static gchar* +tags_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) +{ TagsSidebarEntry * self; gchar* result = NULL; const gchar* _tmp0_; @@ -2177,11 +2305,13 @@ static gchar* tags_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* result = _tmp1_; #line 212 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2181 "TagsBranch.c" +#line 2309 "TagsBranch.c" } -static Page* tags_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +tags_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) +{ TagsSidebarEntry * self; Page* result = NULL; Tag* _tmp0_; @@ -2198,11 +2328,13 @@ static Page* tags_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); #line 216 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2202 "TagsBranch.c" +#line 2332 "TagsBranch.c" } -static gboolean tags_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base) { +static gboolean +tags_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base) +{ TagsSidebarEntry * self; gboolean result = FALSE; #line 219 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -2211,325 +2343,314 @@ static gboolean tags_sidebar_entry_real_is_user_renameable (SidebarRenameableEnt result = TRUE; #line 220 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2215 "TagsBranch.c" +#line 2347 "TagsBranch.c" } -static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { +static gchar* +string_replace (const gchar* self, + const gchar* old, + const gchar* replacement) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if ((*((gchar*) self)) == '\0') { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 2234 "TagsBranch.c" +#line 2370 "TagsBranch.c" } else { - const gchar* _tmp2_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; -#line 2241 "TagsBranch.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) old)) == '\0'; +#line 2374 "TagsBranch.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = TRUE; -#line 2247 "TagsBranch.c" +#line 2380 "TagsBranch.c" } else { - const gchar* _tmp3_; - const gchar* _tmp4_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = replacement; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; -#line 2257 "TagsBranch.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (old, replacement) == 0; +#line 2384 "TagsBranch.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 2261 "TagsBranch.c" - gchar* _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = g_strdup (self); -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2388 "TagsBranch.c" + gchar* _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = g_strdup (self); +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2269 "TagsBranch.c" +#line 2396 "TagsBranch.c" } { GRegex* regex = NULL; - const gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - GRegex* _tmp9_; - GRegex* _tmp10_; - gchar* _tmp11_ = NULL; - GRegex* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = old; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = g_regex_escape_string (_tmp6_, -1); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = _tmp9_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp8_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - regex = _tmp10_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp3_; + gchar* _tmp4_; + GRegex* _tmp5_; + GRegex* _tmp6_; + gchar* _tmp7_ = NULL; + GRegex* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_regex_escape_string (old, -1); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = _tmp3_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp5_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp4_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + regex = _tmp6_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 2301 "TagsBranch.c" +#line 2424 "TagsBranch.c" goto __catch62_g_regex_error; } -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 2310 "TagsBranch.c" +#line 2433 "TagsBranch.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = regex; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = replacement; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp14_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = regex; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp9_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 2326 "TagsBranch.c" +#line 2447 "TagsBranch.c" goto __catch62_g_regex_error; } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 2337 "TagsBranch.c" +#line 2458 "TagsBranch.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = _tmp11_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = NULL; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp15_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp11_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = _tmp7_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = NULL; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp10_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp7_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2351 "TagsBranch.c" +#line 2472 "TagsBranch.c" } goto __finally62; __catch62_g_regex_error: { GError* e = NULL; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 2365 "TagsBranch.c" +#line 2486 "TagsBranch.c" } __finally62: -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 2376 "TagsBranch.c" +#line 2497 "TagsBranch.c" } } -static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name) { +static void +tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, + const gchar* new_name) +{ TagsSidebarEntry * self; gchar* prepped = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; + const gchar* _tmp1_; const gchar* _tmp2_; - const gchar* _tmp3_; - gchar* _tmp4_; - const gchar* _tmp5_; - Tag* _tmp6_; + gchar* _tmp3_; + const gchar* _tmp4_; + Tag* _tmp5_; + gchar* _tmp6_; gchar* _tmp7_; - gchar* _tmp8_; - gboolean _tmp9_; - const gchar* _tmp10_; + gboolean _tmp8_; + const gchar* _tmp9_; + CommandManager* _tmp10_; CommandManager* _tmp11_; - CommandManager* _tmp12_; - Tag* _tmp13_; - const gchar* _tmp14_; + Tag* _tmp12_; + const gchar* _tmp13_; + RenameTagCommand* _tmp14_; RenameTagCommand* _tmp15_; - RenameTagCommand* _tmp16_; #line 223 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 223 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_if_fail (new_name != NULL); #line 224 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp0_ = new_name; -#line 224 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp1_ = tag_prep_tag_name (_tmp0_); + _tmp0_ = tag_prep_tag_name (new_name); #line 224 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - prepped = _tmp1_; + prepped = _tmp0_; #line 225 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp2_ = prepped; + _tmp1_ = prepped; #line 225 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 226 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (prepped); #line 226 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return; -#line 2419 "TagsBranch.c" +#line 2540 "TagsBranch.c" } #line 228 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp3_ = prepped; + _tmp2_ = prepped; #line 228 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp4_ = string_replace (_tmp3_, "/", ""); + _tmp3_ = string_replace (_tmp2_, "/", ""); #line 228 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (prepped); #line 228 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - prepped = _tmp4_; + prepped = _tmp3_; #line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp5_ = prepped; + _tmp4_ = prepped; #line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp6_ = self->priv->tag; + _tmp5_ = self->priv->tag; #line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp7_ = tag_get_user_visible_name (_tmp6_); + _tmp6_ = tag_get_user_visible_name (_tmp5_); #line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp9_ = g_strcmp0 (_tmp5_, _tmp8_) == 0; + _tmp8_ = g_strcmp0 (_tmp4_, _tmp7_) == 0; #line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp7_); #line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp9_) { + if (_tmp8_) { #line 231 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (prepped); #line 231 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return; -#line 2447 "TagsBranch.c" +#line 2568 "TagsBranch.c" } #line 233 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp10_ = prepped; + _tmp9_ = prepped; #line 233 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (g_strcmp0 (_tmp10_, "") == 0) { + if (g_strcmp0 (_tmp9_, "") == 0) { #line 234 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (prepped); #line 234 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return; -#line 2457 "TagsBranch.c" +#line 2578 "TagsBranch.c" } #line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp11_ = app_window_get_command_manager (); + _tmp10_ = app_window_get_command_manager (); #line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp13_ = self->priv->tag; + _tmp12_ = self->priv->tag; #line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp14_ = prepped; + _tmp13_ = prepped; #line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp15_ = rename_tag_command_new (_tmp13_, _tmp14_); + _tmp14_ = rename_tag_command_new (_tmp12_, _tmp13_); #line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_COMMAND, Command)); #line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp15_); #line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _command_manager_unref0 (_tmp12_); + _command_manager_unref0 (_tmp11_); #line 223 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (prepped); -#line 2479 "TagsBranch.c" +#line 2600 "TagsBranch.c" } -static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base) { +static void +tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base) +{ TagsSidebarEntry * self; Tag* _tmp0_; - gboolean _tmp1_; #line 239 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 240 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = self->priv->tag; #line 240 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp1_ = dialogs_confirm_delete_tag (_tmp0_); -#line 240 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp1_) { -#line 2495 "TagsBranch.c" + if (dialogs_confirm_delete_tag (_tmp0_)) { +#line 2615 "TagsBranch.c" + CommandManager* _tmp1_; CommandManager* _tmp2_; - CommandManager* _tmp3_; - Tag* _tmp4_; + Tag* _tmp3_; + DeleteTagCommand* _tmp4_; DeleteTagCommand* _tmp5_; - DeleteTagCommand* _tmp6_; #line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp2_ = app_window_get_command_manager (); + _tmp1_ = app_window_get_command_manager (); #line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp4_ = self->priv->tag; + _tmp3_ = self->priv->tag; #line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp5_ = delete_tag_command_new (_tmp4_); + _tmp4_ = delete_tag_command_new (_tmp3_); #line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_COMMAND, Command)); #line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp5_); #line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _command_manager_unref0 (_tmp3_); -#line 2517 "TagsBranch.c" + _command_manager_unref0 (_tmp2_); +#line 2637 "TagsBranch.c" } } -static gboolean tags_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media) { +static gboolean +tags_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, + GeeList* media) +{ TagsSidebarEntry * self; gboolean result = FALSE; CommandManager* _tmp0_; CommandManager* _tmp1_; Tag* _tmp2_; - GeeList* _tmp3_; - GeeList* _tmp4_; - gint _tmp5_; - gint _tmp6_; - TagUntagPhotosCommand* _tmp7_; - TagUntagPhotosCommand* _tmp8_; + gint _tmp3_; + gint _tmp4_; + TagUntagPhotosCommand* _tmp5_; + TagUntagPhotosCommand* _tmp6_; #line 244 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 244 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -2541,192 +2662,181 @@ static gboolean tags_sidebar_entry_real_internal_drop_received (SidebarInternalD #line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp2_ = self->priv->tag; #line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp3_ = media; + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_COLLECTION, GeeCollection)); #line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp4_ = media; + _tmp4_ = _tmp3_; #line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp5_ = tag_untag_photos_command_new (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_COLLECTION, GeeCollection), _tmp4_, TRUE); #line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp6_ = _tmp5_; #line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp7_ = tag_untag_photos_command_new (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), _tmp6_, TRUE); -#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp8_ = _tmp7_; -#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - command_manager_execute (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command)); #line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp6_); #line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _command_manager_unref0 (_tmp1_); #line 248 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; #line 248 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2566 "TagsBranch.c" +#line 2683 "TagsBranch.c" } -static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data) { +static gboolean +tags_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, + GtkSelectionData* data) +{ TagsSidebarEntry * self; gboolean result = FALSE; - GtkSelectionData* _tmp0_; - GdkAtom _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; - gboolean _tmp4_; + gchar* _tmp0_; + gchar* _tmp1_; + gboolean _tmp2_; #line 251 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 251 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_val_if_fail (data != NULL, FALSE); #line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp0_ = data; -#line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp1_ = gtk_selection_data_get_data_type (_tmp0_); + _tmp0_ = gdk_atom_name (gtk_selection_data_get_data_type (data)); #line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp2_ = gdk_atom_name (_tmp1_); -#line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp4_ = g_strcmp0 (_tmp3_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0; + _tmp2_ = g_strcmp0 (_tmp1_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0; #line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp1_); #line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp4_) { -#line 2596 "TagsBranch.c" + if (_tmp2_) { +#line 2710 "TagsBranch.c" gchar* old_tag_path = NULL; - GtkSelectionData* _tmp5_; - guchar* _tmp6_; + guint8* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + Tag* _tmp6_; gchar* _tmp7_; - const gchar* _tmp8_; - Tag* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; - gboolean _tmp12_; - TagSourceCollection* _tmp29_; - const gchar* _tmp30_; - gboolean _tmp31_; + gchar* _tmp8_; + gboolean _tmp9_; + TagSourceCollection* _tmp26_; + const gchar* _tmp27_; Tag* old_tag = NULL; - const gchar* _tmp32_; - Tag* _tmp33_; + const gchar* _tmp28_; + Tag* _tmp29_; Tag* old_tag_parent = NULL; - Tag* _tmp34_; - Tag* _tmp35_; - gboolean _tmp36_ = FALSE; - Tag* _tmp37_; - CommandManager* _tmp44_; - CommandManager* _tmp45_; - Tag* _tmp46_; - Tag* _tmp47_; - gchar* _tmp48_; - gchar* _tmp49_; - ReparentTagCommand* _tmp50_; - ReparentTagCommand* _tmp51_; -#line 253 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp5_ = data; + Tag* _tmp30_; + Tag* _tmp31_; + gboolean _tmp32_ = FALSE; + Tag* _tmp33_; + CommandManager* _tmp40_; + CommandManager* _tmp41_; + Tag* _tmp42_; + Tag* _tmp43_; + gchar* _tmp44_; + gchar* _tmp45_; + ReparentTagCommand* _tmp46_; + ReparentTagCommand* _tmp47_; #line 253 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp6_ = gtk_selection_data_get_data (_tmp5_); + _tmp3_ = gtk_selection_data_get_data (data); #line 253 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp7_ = g_strdup ((const gchar*) _tmp6_); + _tmp4_ = g_strdup ((const gchar*) _tmp3_); #line 253 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - old_tag_path = _tmp7_; + old_tag_path = _tmp4_; #line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp8_ = old_tag_path; + _tmp5_ = old_tag_path; #line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp9_ = self->priv->tag; + _tmp6_ = self->priv->tag; #line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp10_ = tag_get_path (_tmp9_); + _tmp7_ = tag_get_path (_tmp6_); #line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp12_ = g_strcmp0 (_tmp8_, _tmp11_) == 0; + _tmp9_ = g_strcmp0 (_tmp5_, _tmp8_) == 0; #line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp8_); #line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp12_) { + if (_tmp9_) { #line 257 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; #line 257 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (old_tag_path); #line 257 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2653 "TagsBranch.c" +#line 2763 "TagsBranch.c" } { GeeList* _parent_path_list = NULL; - Tag* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; - GeeList* _tmp16_; - GeeList* _tmp17_; + Tag* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + GeeList* _tmp13_; + GeeList* _tmp14_; gint _parent_path_size = 0; - GeeList* _tmp18_; - gint _tmp19_; - gint _tmp20_; + GeeList* _tmp15_; + gint _tmp16_; + gint _tmp17_; gint _parent_path_index = 0; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp13_ = self->priv->tag; + _tmp10_ = self->priv->tag; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp14_ = tag_get_path (_tmp13_); + _tmp11_ = tag_get_path (_tmp10_); #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp15_ = _tmp14_; + _tmp12_ = _tmp11_; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp16_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp15_); + _tmp13_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp12_); #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp17_ = _tmp16_; + _tmp14_ = _tmp13_; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp12_); #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _parent_path_list = _tmp17_; + _parent_path_list = _tmp14_; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp18_ = _parent_path_list; + _tmp15_ = _parent_path_list; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp16_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp20_ = _tmp19_; + _tmp17_ = _tmp16_; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _parent_path_size = _tmp20_; + _parent_path_size = _tmp17_; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _parent_path_index = -1; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" while (TRUE) { -#line 2693 "TagsBranch.c" - gint _tmp21_; - gint _tmp22_; - gint _tmp23_; +#line 2803 "TagsBranch.c" + gint _tmp18_; + gint _tmp19_; + gint _tmp20_; gchar* parent_path = NULL; - GeeList* _tmp24_; - gint _tmp25_; - gpointer _tmp26_; - const gchar* _tmp27_; - const gchar* _tmp28_; + GeeList* _tmp21_; + gint _tmp22_; + gpointer _tmp23_; + const gchar* _tmp24_; + const gchar* _tmp25_; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp21_ = _parent_path_index; + _tmp18_ = _parent_path_index; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _parent_path_index = _tmp21_ + 1; + _parent_path_index = _tmp18_ + 1; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp22_ = _parent_path_index; + _tmp19_ = _parent_path_index; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp23_ = _parent_path_size; + _tmp20_ = _parent_path_size; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (!(_tmp22_ < _tmp23_)) { + if (!(_tmp19_ < _tmp20_)) { #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" break; -#line 2715 "TagsBranch.c" +#line 2825 "TagsBranch.c" } #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp24_ = _parent_path_list; + _tmp21_ = _parent_path_list; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp25_ = _parent_path_index; + _tmp22_ = _parent_path_index; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp26_ = gee_list_get (_tmp24_, _tmp25_); + _tmp23_ = gee_list_get (_tmp21_, _tmp22_); #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - parent_path = (gchar*) _tmp26_; + parent_path = (gchar*) _tmp23_; #line 261 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp27_ = parent_path; + _tmp24_ = parent_path; #line 261 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp28_ = old_tag_path; + _tmp25_ = old_tag_path; #line 261 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (g_strcmp0 (_tmp27_, _tmp28_) == 0) { + if (g_strcmp0 (_tmp24_, _tmp25_) == 0) { #line 262 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; #line 262 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -2737,73 +2847,71 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _g_free0 (old_tag_path); #line 262 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2741 "TagsBranch.c" +#line 2851 "TagsBranch.c" } #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (parent_path); -#line 2745 "TagsBranch.c" +#line 2855 "TagsBranch.c" } #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_parent_path_list); -#line 2749 "TagsBranch.c" +#line 2859 "TagsBranch.c" } #line 265 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp29_ = tag_global; + _tmp26_ = tag_global; #line 265 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp30_ = old_tag_path; + _tmp27_ = old_tag_path; #line 265 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp31_ = tag_source_collection_exists (_tmp29_, _tmp30_, FALSE); -#line 265 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _vala_assert (_tmp31_, "Tag.global.exists(old_tag_path)"); + _vala_assert (tag_source_collection_exists (_tmp26_, _tmp27_, FALSE), "Tag.global.exists(old_tag_path)"); #line 268 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp32_ = old_tag_path; + _tmp28_ = old_tag_path; #line 268 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp33_ = tag_for_path (_tmp32_); + _tmp29_ = tag_for_path (_tmp28_); #line 268 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - old_tag = _tmp33_; + old_tag = _tmp29_; #line 269 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp34_ = old_tag; + _tmp30_ = old_tag; #line 269 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp35_ = tag_get_hierarchical_parent (_tmp34_); + _tmp31_ = tag_get_hierarchical_parent (_tmp30_); #line 269 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - old_tag_parent = _tmp35_; + old_tag_parent = _tmp31_; #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp37_ = old_tag_parent; + _tmp33_ = old_tag_parent; #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp37_ != NULL) { -#line 2775 "TagsBranch.c" - Tag* _tmp38_; + if (_tmp33_ != NULL) { +#line 2883 "TagsBranch.c" + Tag* _tmp34_; + gchar* _tmp35_; + gchar* _tmp36_; + Tag* _tmp37_; + gchar* _tmp38_; gchar* _tmp39_; - gchar* _tmp40_; - Tag* _tmp41_; - gchar* _tmp42_; - gchar* _tmp43_; #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp38_ = old_tag_parent; + _tmp34_ = old_tag_parent; #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp39_ = tag_get_path (_tmp38_); + _tmp35_ = tag_get_path (_tmp34_); #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp40_ = _tmp39_; + _tmp36_ = _tmp35_; #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp41_ = self->priv->tag; + _tmp37_ = self->priv->tag; #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp42_ = tag_get_path (_tmp41_); + _tmp38_ = tag_get_path (_tmp37_); #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp43_ = _tmp42_; + _tmp39_ = _tmp38_; #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp36_ = g_strcmp0 (_tmp40_, _tmp43_) == 0; + _tmp32_ = g_strcmp0 (_tmp36_, _tmp39_) == 0; #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp43_); + _g_free0 (_tmp39_); #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp40_); -#line 2800 "TagsBranch.c" + _g_free0 (_tmp36_); +#line 2908 "TagsBranch.c" } else { #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp36_ = FALSE; -#line 2804 "TagsBranch.c" + _tmp32_ = FALSE; +#line 2912 "TagsBranch.c" } #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp36_) { + if (_tmp32_) { #line 271 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; #line 271 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -2814,32 +2922,32 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _g_free0 (old_tag_path); #line 271 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2818 "TagsBranch.c" +#line 2926 "TagsBranch.c" } #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp44_ = app_window_get_command_manager (); + _tmp40_ = app_window_get_command_manager (); #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp45_ = _tmp44_; + _tmp41_ = _tmp40_; #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp46_ = old_tag; + _tmp42_ = old_tag; #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp47_ = self->priv->tag; + _tmp43_ = self->priv->tag; #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp48_ = tag_get_path (_tmp47_); + _tmp44_ = tag_get_path (_tmp43_); #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp49_ = _tmp48_; + _tmp45_ = _tmp44_; #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp50_ = reparent_tag_command_new (_tmp46_, _tmp49_); + _tmp46_ = reparent_tag_command_new (_tmp42_, _tmp45_); #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp51_ = _tmp50_; + _tmp47_ = _tmp46_; #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - command_manager_execute (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_COMMAND, Command)); #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp51_); + _g_object_unref0 (_tmp47_); #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp49_); + _g_free0 (_tmp45_); #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _command_manager_unref0 (_tmp45_); + _command_manager_unref0 (_tmp41_); #line 276 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; #line 276 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -2850,17 +2958,19 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _g_free0 (old_tag_path); #line 276 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2854 "TagsBranch.c" +#line 2962 "TagsBranch.c" } #line 279 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = FALSE; #line 279 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2860 "TagsBranch.c" +#line 2968 "TagsBranch.c" } -static gboolean tags_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base) { +static gboolean +tags_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base) +{ TagsSidebarEntry * self; gboolean result = FALSE; #line 282 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -2869,11 +2979,14 @@ static gboolean tags_sidebar_entry_real_expand_on_select (SidebarExpandableEntry result = FALSE; #line 283 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2873 "TagsBranch.c" +#line 2983 "TagsBranch.c" } -static guint8* string_get_data (const gchar* self, int* result_length1) { +static guint8* +string_get_data (const gchar* self, + int* result_length1) +{ guint8* result; guint8* res = NULL; gint res_length1; @@ -2885,84 +2998,83 @@ static guint8* string_get_data (const gchar* self, int* result_length1) { gint _tmp3__length1; guint8* _tmp4_; gint _tmp4__length1; -#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1442 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" res = (guint8*) self; -#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" res_length1 = -1; -#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _res_size_ = res_length1; -#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" res_length1 = (gint) _tmp1_; -#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp2_ = res_length1; -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp3_ = res; -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp3__length1 = res_length1; -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp4__length1 = _tmp3__length1; -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (result_length1) { -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" *result_length1 = _tmp4__length1; -#line 2917 "TagsBranch.c" +#line 3030 "TagsBranch.c" } -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2923 "TagsBranch.c" +#line 3036 "TagsBranch.c" } -static void tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data) { +static void +tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, + GtkSelectionData* data) +{ TagsSidebarEntry * self; - GtkSelectionData* _tmp0_; - GdkAtom _tmp1_; - Tag* _tmp2_; - gchar* _tmp3_; - gchar* _tmp4_; - guint8* _tmp5_; - gint _tmp5__length1; - guint8* _tmp6_; - gint _tmp6__length1; + Tag* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + guint8* _tmp3_; + gint _tmp3__length1; + guint8* _tmp4_; + gint _tmp4__length1; #line 286 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 286 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_if_fail (data != NULL); #line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp0_ = data; + _tmp0_ = self->priv->tag; #line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp1_ = gdk_atom_intern_static_string (LIBRARY_WINDOW_TAG_PATH_MIME_TYPE); + _tmp1_ = tag_get_path (_tmp0_); #line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp2_ = self->priv->tag; + _tmp2_ = _tmp1_; #line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp3_ = tag_get_path (_tmp2_); + _tmp3_ = string_get_data (_tmp2_, &_tmp3__length1); #line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp4_ = _tmp3_; #line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp5_ = string_get_data (_tmp4_, &_tmp5__length1); -#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp6_ = _tmp5_; -#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp6__length1 = _tmp5__length1; + _tmp4__length1 = _tmp3__length1; #line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - gtk_selection_data_set (_tmp0_, _tmp1_, 0, _tmp6_, _tmp6__length1); + gtk_selection_data_set (data, gdk_atom_intern_static_string (LIBRARY_WINDOW_TAG_PATH_MIME_TYPE), 0, _tmp4_, _tmp4__length1); #line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp4_); -#line 2962 "TagsBranch.c" + _g_free0 (_tmp2_); +#line 3072 "TagsBranch.c" } -static void tags_sidebar_entry_class_init (TagsSidebarEntryClass * klass) { +static void +tags_sidebar_entry_class_init (TagsSidebarEntryClass * klass) +{ #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_sidebar_entry_parent_class = g_type_class_peek_parent (klass); #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -2975,60 +3087,72 @@ static void tags_sidebar_entry_class_init (TagsSidebarEntryClass * klass) { ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) tags_sidebar_entry_real_create_page; #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" G_OBJECT_CLASS (klass)->finalize = tags_sidebar_entry_finalize; -#line 2979 "TagsBranch.c" +#line 3091 "TagsBranch.c" } -static void tags_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) { +static void +tags_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) +{ #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_sidebar_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) tags_sidebar_entry_real_is_user_renameable; #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) tags_sidebar_entry_real_rename; -#line 2990 "TagsBranch.c" +#line 3104 "TagsBranch.c" } -static void tags_sidebar_entry_sidebar_destroyable_entry_interface_init (SidebarDestroyableEntryIface * iface) { +static void +tags_sidebar_entry_sidebar_destroyable_entry_interface_init (SidebarDestroyableEntryIface * iface) +{ #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_sidebar_entry_sidebar_destroyable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->destroy_source = (void (*) (SidebarDestroyableEntry *)) tags_sidebar_entry_real_destroy_source; -#line 2999 "TagsBranch.c" +#line 3115 "TagsBranch.c" } -static void tags_sidebar_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) { +static void +tags_sidebar_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) +{ #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface); #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) tags_sidebar_entry_real_internal_drop_received; #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) tags_sidebar_entry_real_internal_drop_received_arbitrary; -#line 3010 "TagsBranch.c" +#line 3128 "TagsBranch.c" } -static void tags_sidebar_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) { +static void +tags_sidebar_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) +{ #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_sidebar_entry_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) tags_sidebar_entry_real_expand_on_select; -#line 3019 "TagsBranch.c" +#line 3139 "TagsBranch.c" } -static void tags_sidebar_entry_sidebar_internal_drag_source_entry_interface_init (SidebarInternalDragSourceEntryIface * iface) { +static void +tags_sidebar_entry_sidebar_internal_drag_source_entry_interface_init (SidebarInternalDragSourceEntryIface * iface) +{ #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_sidebar_entry_sidebar_internal_drag_source_entry_parent_iface = g_type_interface_peek_parent (iface); #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->prepare_selection_data = (void (*) (SidebarInternalDragSourceEntry *, GtkSelectionData*)) tags_sidebar_entry_real_prepare_selection_data; -#line 3028 "TagsBranch.c" +#line 3150 "TagsBranch.c" } -static void tags_sidebar_entry_instance_init (TagsSidebarEntry * self) { +static void +tags_sidebar_entry_instance_init (TagsSidebarEntry * self) +{ gchar* _tmp0_; #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv = TAGS_SIDEBAR_ENTRY_GET_PRIVATE (self); @@ -3036,11 +3160,13 @@ static void tags_sidebar_entry_instance_init (TagsSidebarEntry * self) { _tmp0_ = g_strdup (RESOURCES_ICON_ONE_TAG); #line 189 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv->single_tag_icon = _tmp0_; -#line 3040 "TagsBranch.c" +#line 3164 "TagsBranch.c" } -static void tags_sidebar_entry_finalize (GObject * obj) { +static void +tags_sidebar_entry_finalize (GObject * obj) +{ TagsSidebarEntry * self; #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); @@ -3050,11 +3176,13 @@ static void tags_sidebar_entry_finalize (GObject * obj) { _g_object_unref0 (self->priv->tag); #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" G_OBJECT_CLASS (tags_sidebar_entry_parent_class)->finalize (obj); -#line 3054 "TagsBranch.c" +#line 3180 "TagsBranch.c" } -GType tags_sidebar_entry_get_type (void) { +GType +tags_sidebar_entry_get_type (void) +{ static volatile gsize tags_sidebar_entry_type_id__volatile = 0; if (g_once_init_enter (&tags_sidebar_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TagsSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tags_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TagsSidebarEntry), 0, (GInstanceInitFunc) tags_sidebar_entry_instance_init, NULL }; @@ -3076,7 +3204,11 @@ GType tags_sidebar_entry_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -3088,7 +3220,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/threads/BackgroundJob.c b/src/threads/BackgroundJob.c index f2ba99a..1de262e 100644 --- a/src/threads/BackgroundJob.c +++ b/src/threads/BackgroundJob.c @@ -1,4 +1,4 @@ -/* BackgroundJob.c generated by valac 0.36.6, the Vala compiler +/* BackgroundJob.c generated by valac 0.40.4, the Vala compiler * generated from BackgroundJob.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -9,6 +9,7 @@ /* This callback is executed when an associated BackgroundJob completes. It is called from within*/ /* the Gtk event loop, *not* the background thread's context.*/ + #include #include #include @@ -193,36 +194,48 @@ static gpointer background_job_notification_job_parent_class = NULL; gpointer background_job_ref (gpointer instance); void background_job_unref (gpointer instance); -GParamSpec* param_spec_background_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_background_job (GValue* value, gpointer v_object); -void value_take_background_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_background_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_background_job (GValue* value, + gpointer v_object); +void value_take_background_job (GValue* value, + gpointer v_object); gpointer value_get_background_job (const GValue* value); GType background_job_get_type (void) G_GNUC_CONST; gpointer notification_object_ref (gpointer instance); void notification_object_unref (gpointer instance); -GParamSpec* param_spec_notification_object (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_notification_object (GValue* value, gpointer v_object); -void value_take_notification_object (GValue* value, gpointer v_object); +GParamSpec* param_spec_notification_object (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_notification_object (GValue* value, + gpointer v_object); +void value_take_notification_object (GValue* value, + gpointer v_object); gpointer value_get_notification_object (const GValue* value); GType notification_object_get_type (void) G_GNUC_CONST; -enum { - NOTIFICATION_OBJECT_DUMMY_PROPERTY -}; NotificationObject* notification_object_construct (GType object_type); static void notification_object_finalize (NotificationObject * obj); GType interlocked_notification_object_get_type (void) G_GNUC_CONST; gpointer abstract_semaphore_ref (gpointer instance); void abstract_semaphore_unref (gpointer instance); -GParamSpec* param_spec_abstract_semaphore (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_abstract_semaphore (GValue* value, gpointer v_object); -void value_take_abstract_semaphore (GValue* value, gpointer v_object); +GParamSpec* param_spec_abstract_semaphore (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_abstract_semaphore (GValue* value, + gpointer v_object); +void value_take_abstract_semaphore (GValue* value, + gpointer v_object); gpointer value_get_abstract_semaphore (const GValue* value); GType abstract_semaphore_get_type (void) G_GNUC_CONST; GType semaphore_get_type (void) G_GNUC_CONST; #define INTERLOCKED_NOTIFICATION_OBJECT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_INTERLOCKED_NOTIFICATION_OBJECT, InterlockedNotificationObjectPrivate)) -enum { - INTERLOCKED_NOTIFICATION_OBJECT_DUMMY_PROPERTY -}; Semaphore* semaphore_new (void); Semaphore* semaphore_construct (GType object_type); void interlocked_notification_object_internal_wait_for_completion (InterlockedNotificationObject* self); @@ -233,27 +246,43 @@ InterlockedNotificationObject* interlocked_notification_object_construct (GType static void interlocked_notification_object_finalize (NotificationObject * obj); GType background_job_job_priority_get_type (void) G_GNUC_CONST; #define BACKGROUND_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_BACKGROUND_JOB, BackgroundJobPrivate)) -enum { - BACKGROUND_JOB_DUMMY_PROPERTY -}; -gint background_job_job_priority_compare (BackgroundJobJobPriority self, BackgroundJobJobPriority other); -gint background_job_job_priority_compare_func (BackgroundJobJobPriority a, BackgroundJobJobPriority b); +gint background_job_job_priority_compare (BackgroundJobJobPriority self, + BackgroundJobJobPriority other); +gint background_job_job_priority_compare_func (BackgroundJobJobPriority a, + BackgroundJobJobPriority b); static gpointer background_job_notification_job_ref (gpointer instance); static void background_job_notification_job_unref (gpointer instance); -static GParamSpec* background_job_param_spec_notification_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; -static void background_job_value_set_notification_job (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void background_job_value_take_notification_job (GValue* value, gpointer v_object) G_GNUC_UNUSED; +static GParamSpec* background_job_param_spec_notification_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) G_GNUC_UNUSED; +static void background_job_value_set_notification_job (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void background_job_value_take_notification_job (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer background_job_value_get_notification_job (const GValue* value) G_GNUC_UNUSED; static GType background_job_notification_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore); +BackgroundJob* background_job_construct (GType object_type, + GObject* owner, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target, + AbstractSemaphore* completion_semaphore); void background_job_execute (BackgroundJob* self); static void background_job_real_execute (BackgroundJob* self); BackgroundJobJobPriority background_job_get_priority (BackgroundJob* self); static BackgroundJobJobPriority background_job_real_get_priority (BackgroundJob* self); -gint background_job_priority_compare_func (BackgroundJob* a, BackgroundJob* b); -gint64 background_job_priority_comparator (void* a, void* b); -void background_job_set_completion_priority (BackgroundJob* self, gint priority); -void background_job_set_notification_priority (BackgroundJob* self, gint priority); +gint background_job_priority_compare_func (BackgroundJob* a, + BackgroundJob* b); +gint64 background_job_priority_comparator (void* a, + void* b); +void background_job_set_completion_priority (BackgroundJob* self, + gint priority); +void background_job_set_notification_priority (BackgroundJob* self, + gint priority); void background_job_wait_for_completion (BackgroundJob* self); GCancellable* background_job_get_cancellable (BackgroundJob* self); gboolean background_job_is_cancelled (BackgroundJob* self); @@ -261,126 +290,160 @@ void background_job_cancel (BackgroundJob* self); void background_job_internal_notify_completion (BackgroundJob* self); static gboolean background_job_on_notify_completion (BackgroundJob* self); static gboolean _background_job_on_notify_completion_gsource_func (gpointer self); -void background_job_notify (BackgroundJob* self, NotificationCallback callback, void* callback_target, NotificationObject* user); -static BackgroundJobNotificationJob* background_job_notification_job_new (NotificationCallback callback, void* callback_target, BackgroundJob* background_job, NotificationObject* user); -static BackgroundJobNotificationJob* background_job_notification_job_construct (GType object_type, NotificationCallback callback, void* callback_target, BackgroundJob* background_job, NotificationObject* user); +void background_job_notify (BackgroundJob* self, + NotificationCallback callback, + void* callback_target, + NotificationObject* user); +static BackgroundJobNotificationJob* background_job_notification_job_new (NotificationCallback callback, + void* callback_target, + BackgroundJob* background_job, + NotificationObject* user); +static BackgroundJobNotificationJob* background_job_notification_job_construct (GType object_type, + NotificationCallback callback, + void* callback_target, + BackgroundJob* background_job, + NotificationObject* user); static gboolean background_job_on_notification_ready (BackgroundJob* self); static gboolean _background_job_on_notification_ready_gsource_func (gpointer self); -enum { - BACKGROUND_JOB_NOTIFICATION_JOB_DUMMY_PROPERTY -}; static void background_job_notification_job_finalize (BackgroundJobNotificationJob * obj); static void background_job_finalize (BackgroundJob * obj); -NotificationObject* notification_object_construct (GType object_type) { +NotificationObject* +notification_object_construct (GType object_type) +{ NotificationObject* self = NULL; #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" self = (NotificationObject*) g_type_create_instance (object_type); #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return self; -#line 283 "BackgroundJob.c" +#line 321 "BackgroundJob.c" } -static void value_notification_object_init (GValue* value) { +static void +value_notification_object_init (GValue* value) +{ #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = NULL; -#line 290 "BackgroundJob.c" +#line 330 "BackgroundJob.c" } -static void value_notification_object_free_value (GValue* value) { +static void +value_notification_object_free_value (GValue* value) +{ #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (value->data[0].v_pointer) { #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" notification_object_unref (value->data[0].v_pointer); -#line 299 "BackgroundJob.c" +#line 341 "BackgroundJob.c" } } -static void value_notification_object_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_notification_object_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (src_value->data[0].v_pointer) { #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" dest_value->data[0].v_pointer = notification_object_ref (src_value->data[0].v_pointer); -#line 309 "BackgroundJob.c" +#line 354 "BackgroundJob.c" } else { #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" dest_value->data[0].v_pointer = NULL; -#line 313 "BackgroundJob.c" +#line 358 "BackgroundJob.c" } } -static gpointer value_notification_object_peek_pointer (const GValue* value) { +static gpointer +value_notification_object_peek_pointer (const GValue* value) +{ #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return value->data[0].v_pointer; -#line 321 "BackgroundJob.c" +#line 368 "BackgroundJob.c" } -static gchar* value_notification_object_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_notification_object_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (collect_values[0].v_pointer) { -#line 328 "BackgroundJob.c" +#line 380 "BackgroundJob.c" NotificationObject * object; object = collect_values[0].v_pointer; #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (object->parent_instance.g_class == NULL) { #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 335 "BackgroundJob.c" +#line 387 "BackgroundJob.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.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 339 "BackgroundJob.c" +#line 391 "BackgroundJob.c" } #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = notification_object_ref (object); -#line 343 "BackgroundJob.c" +#line 395 "BackgroundJob.c" } else { #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = NULL; -#line 347 "BackgroundJob.c" +#line 399 "BackgroundJob.c" } #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return NULL; -#line 351 "BackgroundJob.c" +#line 403 "BackgroundJob.c" } -static gchar* value_notification_object_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_notification_object_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ NotificationObject ** object_p; object_p = collect_values[0].v_pointer; #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (!object_p) { #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 362 "BackgroundJob.c" +#line 419 "BackgroundJob.c" } #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (!value->data[0].v_pointer) { #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" *object_p = NULL; -#line 368 "BackgroundJob.c" +#line 425 "BackgroundJob.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" *object_p = value->data[0].v_pointer; -#line 372 "BackgroundJob.c" +#line 429 "BackgroundJob.c" } else { #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" *object_p = notification_object_ref (value->data[0].v_pointer); -#line 376 "BackgroundJob.c" +#line 433 "BackgroundJob.c" } #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return NULL; -#line 380 "BackgroundJob.c" +#line 437 "BackgroundJob.c" } -GParamSpec* param_spec_notification_object (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_notification_object (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecNotificationObject* spec; #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_NOTIFICATION_OBJECT), NULL); @@ -390,20 +453,25 @@ GParamSpec* param_spec_notification_object (const gchar* name, const gchar* nick G_PARAM_SPEC (spec)->value_type = object_type; #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return G_PARAM_SPEC (spec); -#line 394 "BackgroundJob.c" +#line 457 "BackgroundJob.c" } -gpointer value_get_notification_object (const GValue* value) { +gpointer +value_get_notification_object (const GValue* value) +{ #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_NOTIFICATION_OBJECT), NULL); #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return value->data[0].v_pointer; -#line 403 "BackgroundJob.c" +#line 468 "BackgroundJob.c" } -void value_set_notification_object (GValue* value, gpointer v_object) { +void +value_set_notification_object (GValue* value, + gpointer v_object) +{ NotificationObject * old; #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_NOTIFICATION_OBJECT)); @@ -419,22 +487,25 @@ void value_set_notification_object (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" notification_object_ref (value->data[0].v_pointer); -#line 423 "BackgroundJob.c" +#line 491 "BackgroundJob.c" } else { #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = NULL; -#line 427 "BackgroundJob.c" +#line 495 "BackgroundJob.c" } #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (old) { #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" notification_object_unref (old); -#line 433 "BackgroundJob.c" +#line 501 "BackgroundJob.c" } } -void value_take_notification_object (GValue* value, gpointer v_object) { +void +value_take_notification_object (GValue* value, + gpointer v_object) +{ NotificationObject * old; #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_NOTIFICATION_OBJECT)); @@ -448,48 +519,56 @@ void value_take_notification_object (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = v_object; -#line 452 "BackgroundJob.c" +#line 523 "BackgroundJob.c" } else { #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = NULL; -#line 456 "BackgroundJob.c" +#line 527 "BackgroundJob.c" } #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (old) { #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" notification_object_unref (old); -#line 462 "BackgroundJob.c" +#line 533 "BackgroundJob.c" } } -static void notification_object_class_init (NotificationObjectClass * klass) { +static void +notification_object_class_init (NotificationObjectClass * klass) +{ #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" notification_object_parent_class = g_type_class_peek_parent (klass); #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" ((NotificationObjectClass *) klass)->finalize = notification_object_finalize; -#line 472 "BackgroundJob.c" +#line 545 "BackgroundJob.c" } -static void notification_object_instance_init (NotificationObject * self) { +static void +notification_object_instance_init (NotificationObject * self) +{ #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" self->ref_count = 1; -#line 479 "BackgroundJob.c" +#line 554 "BackgroundJob.c" } -static void notification_object_finalize (NotificationObject * obj) { +static void +notification_object_finalize (NotificationObject * obj) +{ NotificationObject * self; #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFICATION_OBJECT, NotificationObject); #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_signal_handlers_destroy (self); -#line 489 "BackgroundJob.c" +#line 566 "BackgroundJob.c" } -GType notification_object_get_type (void) { +GType +notification_object_get_type (void) +{ static volatile gsize notification_object_type_id__volatile = 0; if (g_once_init_enter (¬ification_object_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_notification_object_init, value_notification_object_free_value, value_notification_object_copy_value, value_notification_object_peek_pointer, "p", value_notification_object_collect_value, "p", value_notification_object_lcopy_value }; @@ -503,18 +582,22 @@ GType notification_object_get_type (void) { } -gpointer notification_object_ref (gpointer instance) { +gpointer +notification_object_ref (gpointer instance) +{ NotificationObject * self; self = instance; #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_atomic_int_inc (&self->ref_count); #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return instance; -#line 514 "BackgroundJob.c" +#line 595 "BackgroundJob.c" } -void notification_object_unref (gpointer instance) { +void +notification_object_unref (gpointer instance) +{ NotificationObject * self; self = instance; #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" @@ -523,12 +606,14 @@ void notification_object_unref (gpointer instance) { NOTIFICATION_OBJECT_GET_CLASS (self)->finalize (self); #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_type_free_instance ((GTypeInstance *) self); -#line 527 "BackgroundJob.c" +#line 610 "BackgroundJob.c" } } -void interlocked_notification_object_internal_wait_for_completion (InterlockedNotificationObject* self) { +void +interlocked_notification_object_internal_wait_for_completion (InterlockedNotificationObject* self) +{ Semaphore* _tmp0_; #line 41 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_if_fail (IS_INTERLOCKED_NOTIFICATION_OBJECT (self)); @@ -536,11 +621,13 @@ void interlocked_notification_object_internal_wait_for_completion (InterlockedNo _tmp0_ = self->priv->semaphore; #line 42 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" abstract_semaphore_wait (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphore)); -#line 540 "BackgroundJob.c" +#line 625 "BackgroundJob.c" } -void interlocked_notification_object_internal_completed (InterlockedNotificationObject* self) { +void +interlocked_notification_object_internal_completed (InterlockedNotificationObject* self) +{ Semaphore* _tmp0_; #line 46 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_if_fail (IS_INTERLOCKED_NOTIFICATION_OBJECT (self)); @@ -548,32 +635,38 @@ void interlocked_notification_object_internal_completed (InterlockedNotification _tmp0_ = self->priv->semaphore; #line 47 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" abstract_semaphore_notify (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphore)); -#line 552 "BackgroundJob.c" +#line 639 "BackgroundJob.c" } -InterlockedNotificationObject* interlocked_notification_object_construct (GType object_type) { +InterlockedNotificationObject* +interlocked_notification_object_construct (GType object_type) +{ InterlockedNotificationObject* self = NULL; #line 37 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" self = (InterlockedNotificationObject*) notification_object_construct (object_type); #line 37 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return self; -#line 562 "BackgroundJob.c" +#line 651 "BackgroundJob.c" } -static void interlocked_notification_object_class_init (InterlockedNotificationObjectClass * klass) { +static void +interlocked_notification_object_class_init (InterlockedNotificationObjectClass * klass) +{ #line 37 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" interlocked_notification_object_parent_class = g_type_class_peek_parent (klass); #line 37 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" ((NotificationObjectClass *) klass)->finalize = interlocked_notification_object_finalize; #line 37 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_type_class_add_private (klass, sizeof (InterlockedNotificationObjectPrivate)); -#line 573 "BackgroundJob.c" +#line 664 "BackgroundJob.c" } -static void interlocked_notification_object_instance_init (InterlockedNotificationObject * self) { +static void +interlocked_notification_object_instance_init (InterlockedNotificationObject * self) +{ Semaphore* _tmp0_; #line 37 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" self->priv = INTERLOCKED_NOTIFICATION_OBJECT_GET_PRIVATE (self); @@ -581,11 +674,13 @@ static void interlocked_notification_object_instance_init (InterlockedNotificati _tmp0_ = semaphore_new (); #line 38 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" self->priv->semaphore = _tmp0_; -#line 585 "BackgroundJob.c" +#line 678 "BackgroundJob.c" } -static void interlocked_notification_object_finalize (NotificationObject * obj) { +static void +interlocked_notification_object_finalize (NotificationObject * obj) +{ InterlockedNotificationObject * self; #line 37 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_INTERLOCKED_NOTIFICATION_OBJECT, InterlockedNotificationObject); @@ -593,11 +688,13 @@ static void interlocked_notification_object_finalize (NotificationObject * obj) _abstract_semaphore_unref0 (self->priv->semaphore); #line 37 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" NOTIFICATION_OBJECT_CLASS (interlocked_notification_object_parent_class)->finalize (obj); -#line 597 "BackgroundJob.c" +#line 692 "BackgroundJob.c" } -GType interlocked_notification_object_get_type (void) { +GType +interlocked_notification_object_get_type (void) +{ static volatile gsize interlocked_notification_object_type_id__volatile = 0; if (g_once_init_enter (&interlocked_notification_object_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (InterlockedNotificationObjectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) interlocked_notification_object_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (InterlockedNotificationObject), 0, (GInstanceInitFunc) interlocked_notification_object_instance_init, NULL }; @@ -609,36 +706,35 @@ GType interlocked_notification_object_get_type (void) { } -gint background_job_job_priority_compare (BackgroundJobJobPriority self, BackgroundJobJobPriority other) { +gint +background_job_job_priority_compare (BackgroundJobJobPriority self, + BackgroundJobJobPriority other) +{ gint result = 0; - BackgroundJobJobPriority _tmp0_; -#line 75 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp0_ = other; #line 75 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - result = ((gint) _tmp0_) - ((gint) self); + result = ((gint) other) - ((gint) self); #line 75 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return result; -#line 622 "BackgroundJob.c" +#line 719 "BackgroundJob.c" } -gint background_job_job_priority_compare_func (BackgroundJobJobPriority a, BackgroundJobJobPriority b) { +gint +background_job_job_priority_compare_func (BackgroundJobJobPriority a, + BackgroundJobJobPriority b) +{ gint result = 0; - BackgroundJobJobPriority _tmp0_; - BackgroundJobJobPriority _tmp1_; -#line 79 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp0_ = b; #line 79 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp1_ = a; -#line 79 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - result = ((gint) _tmp0_) - ((gint) _tmp1_); + result = ((gint) b) - ((gint) a); #line 79 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return result; -#line 638 "BackgroundJob.c" +#line 732 "BackgroundJob.c" } -GType background_job_job_priority_get_type (void) { +GType +background_job_job_priority_get_type (void) +{ static volatile gsize background_job_job_priority_type_id__volatile = 0; if (g_once_init_enter (&background_job_job_priority_type_id__volatile)) { static const GEnumValue values[] = {{BACKGROUND_JOB_JOB_PRIORITY_HIGHEST, "BACKGROUND_JOB_JOB_PRIORITY_HIGHEST", "highest"}, {BACKGROUND_JOB_JOB_PRIORITY_HIGH, "BACKGROUND_JOB_JOB_PRIORITY_HIGH", "high"}, {BACKGROUND_JOB_JOB_PRIORITY_NORMAL, "BACKGROUND_JOB_JOB_PRIORITY_NORMAL", "normal"}, {BACKGROUND_JOB_JOB_PRIORITY_LOW, "BACKGROUND_JOB_JOB_PRIORITY_LOW", "low"}, {BACKGROUND_JOB_JOB_PRIORITY_LOWEST, "BACKGROUND_JOB_JOB_PRIORITY_LOWEST", "lowest"}, {0, NULL, NULL}}; @@ -650,32 +746,38 @@ GType background_job_job_priority_get_type (void) { } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 116 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return self ? g_object_ref (self) : NULL; -#line 657 "BackgroundJob.c" +#line 755 "BackgroundJob.c" } -static gpointer _abstract_semaphore_ref0 (gpointer self) { +static gpointer +_abstract_semaphore_ref0 (gpointer self) +{ #line 120 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return self ? abstract_semaphore_ref (self) : NULL; -#line 664 "BackgroundJob.c" +#line 764 "BackgroundJob.c" } -BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore) { +BackgroundJob* +background_job_construct (GType object_type, + GObject* owner, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target, + AbstractSemaphore* completion_semaphore) +{ BackgroundJob* self = NULL; GObject* _tmp0_; - GObject* _tmp1_; - CompletionCallback _tmp2_; - void* _tmp2__target; - GCancellable* _tmp3_; - GCancellable* _tmp4_; - CancellationCallback _tmp5_; - void* _tmp5__target; - AbstractSemaphore* _tmp6_; - AbstractSemaphore* _tmp7_; + GCancellable* _tmp1_; + AbstractSemaphore* _tmp2_; #line 113 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_val_if_fail ((owner == NULL) || G_IS_OBJECT (owner), NULL); #line 113 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" @@ -685,161 +787,139 @@ BackgroundJob* background_job_construct (GType object_type, GObject* owner, Comp #line 113 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" self = (BackgroundJob*) g_type_create_instance (object_type); #line 116 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp0_ = owner; -#line 116 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (owner); #line 116 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _g_object_unref0 (self->priv->owner); #line 116 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - self->priv->owner = _tmp1_; -#line 117 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp2_ = callback; + self->priv->owner = _tmp0_; #line 117 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp2__target = callback_target; + self->priv->callback = callback; #line 117 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - self->priv->callback = _tmp2_; -#line 117 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - self->priv->callback_target = _tmp2__target; -#line 118 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp3_ = cancellable; + self->priv->callback_target = callback_target; #line 118 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp1_ = _g_object_ref0 (cancellable); #line 118 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _g_object_unref0 (self->priv->cancellable); #line 118 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - self->priv->cancellable = _tmp4_; -#line 119 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp5_ = cancellation; -#line 119 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp5__target = cancellation_target; + self->priv->cancellable = _tmp1_; #line 119 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - self->priv->cancellation = _tmp5_; + self->priv->cancellation = cancellation; #line 119 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - self->priv->cancellation_target = _tmp5__target; + self->priv->cancellation_target = cancellation_target; #line 120 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp6_ = completion_semaphore; -#line 120 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp7_ = _abstract_semaphore_ref0 (_tmp6_); + _tmp2_ = _abstract_semaphore_ref0 (completion_semaphore); #line 120 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _abstract_semaphore_unref0 (self->priv->semaphore); #line 120 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - self->priv->semaphore = _tmp7_; + self->priv->semaphore = _tmp2_; #line 113 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return self; -#line 730 "BackgroundJob.c" +#line 818 "BackgroundJob.c" } -static void background_job_real_execute (BackgroundJob* self) { +static void +background_job_real_execute (BackgroundJob* self) +{ #line 123 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_critical ("Type `%s' does not implement abstract method `background_job_execute'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 123 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return; -#line 739 "BackgroundJob.c" +#line 829 "BackgroundJob.c" } -void background_job_execute (BackgroundJob* self) { +void +background_job_execute (BackgroundJob* self) +{ #line 123 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_if_fail (IS_BACKGROUND_JOB (self)); #line 123 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" BACKGROUND_JOB_GET_CLASS (self)->execute (self); -#line 748 "BackgroundJob.c" +#line 840 "BackgroundJob.c" } -static BackgroundJobJobPriority background_job_real_get_priority (BackgroundJob* self) { +static BackgroundJobJobPriority +background_job_real_get_priority (BackgroundJob* self) +{ BackgroundJobJobPriority result = 0; #line 126 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" result = BACKGROUND_JOB_JOB_PRIORITY_NORMAL; #line 126 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return result; -#line 758 "BackgroundJob.c" +#line 852 "BackgroundJob.c" } -BackgroundJobJobPriority background_job_get_priority (BackgroundJob* self) { +BackgroundJobJobPriority +background_job_get_priority (BackgroundJob* self) +{ #line 125 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_val_if_fail (IS_BACKGROUND_JOB (self), 0); #line 125 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return BACKGROUND_JOB_GET_CLASS (self)->get_priority (self); -#line 767 "BackgroundJob.c" +#line 863 "BackgroundJob.c" } -gint background_job_priority_compare_func (BackgroundJob* a, BackgroundJob* b) { +gint +background_job_priority_compare_func (BackgroundJob* a, + BackgroundJob* b) +{ gint result = 0; - BackgroundJob* _tmp0_; - BackgroundJobJobPriority _tmp1_; - BackgroundJob* _tmp2_; - BackgroundJobJobPriority _tmp3_; - gint _tmp4_; #line 130 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_val_if_fail (IS_BACKGROUND_JOB (a), 0); #line 130 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_val_if_fail (IS_BACKGROUND_JOB (b), 0); #line 131 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp0_ = a; -#line 131 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp1_ = background_job_get_priority (_tmp0_); -#line 131 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp2_ = b; -#line 131 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp3_ = background_job_get_priority (_tmp2_); -#line 131 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp4_ = background_job_job_priority_compare (_tmp1_, _tmp3_); -#line 131 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - result = _tmp4_; + result = background_job_job_priority_compare (background_job_get_priority (a), background_job_get_priority (b)); #line 131 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return result; -#line 796 "BackgroundJob.c" +#line 880 "BackgroundJob.c" } -gint64 background_job_priority_comparator (void* a, void* b) { +gint64 +background_job_priority_comparator (void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; - void* _tmp1_; - gint _tmp2_; -#line 136 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp0_ = a; -#line 136 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp1_ = b; #line 136 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp2_ = background_job_priority_compare_func (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_BACKGROUND_JOB, BackgroundJob), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_BACKGROUND_JOB, BackgroundJob)); -#line 136 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - result = (gint64) _tmp2_; + result = (gint64) background_job_priority_compare_func (G_TYPE_CHECK_INSTANCE_CAST (a, TYPE_BACKGROUND_JOB, BackgroundJob), G_TYPE_CHECK_INSTANCE_CAST (b, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 136 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return result; -#line 815 "BackgroundJob.c" +#line 893 "BackgroundJob.c" } -void background_job_set_completion_priority (BackgroundJob* self, gint priority) { - gint _tmp0_; +void +background_job_set_completion_priority (BackgroundJob* self, + gint priority) +{ #line 140 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_if_fail (IS_BACKGROUND_JOB (self)); #line 141 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp0_ = priority; -#line 141 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - self->priv->completion_priority = _tmp0_; -#line 827 "BackgroundJob.c" + self->priv->completion_priority = priority; +#line 905 "BackgroundJob.c" } -void background_job_set_notification_priority (BackgroundJob* self, gint priority) { - gint _tmp0_; +void +background_job_set_notification_priority (BackgroundJob* self, + gint priority) +{ #line 145 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_if_fail (IS_BACKGROUND_JOB (self)); #line 146 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp0_ = priority; -#line 146 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - self->priv->notification_priority = _tmp0_; -#line 839 "BackgroundJob.c" + self->priv->notification_priority = priority; +#line 917 "BackgroundJob.c" } -void background_job_wait_for_completion (BackgroundJob* self) { +void +background_job_wait_for_completion (BackgroundJob* self) +{ AbstractSemaphore* _tmp0_; #line 152 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_if_fail (IS_BACKGROUND_JOB (self)); @@ -847,18 +927,20 @@ void background_job_wait_for_completion (BackgroundJob* self) { _tmp0_ = self->priv->semaphore; #line 153 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (_tmp0_ != NULL) { -#line 851 "BackgroundJob.c" +#line 931 "BackgroundJob.c" AbstractSemaphore* _tmp1_; #line 154 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _tmp1_ = self->priv->semaphore; #line 154 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" abstract_semaphore_wait (_tmp1_); -#line 857 "BackgroundJob.c" +#line 937 "BackgroundJob.c" } } -GCancellable* background_job_get_cancellable (BackgroundJob* self) { +GCancellable* +background_job_get_cancellable (BackgroundJob* self) +{ GCancellable* result = NULL; GCancellable* _tmp0_; GCancellable* _tmp1_; @@ -872,11 +954,13 @@ GCancellable* background_job_get_cancellable (BackgroundJob* self) { result = _tmp1_; #line 158 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return result; -#line 876 "BackgroundJob.c" +#line 958 "BackgroundJob.c" } -gboolean background_job_is_cancelled (BackgroundJob* self) { +gboolean +background_job_is_cancelled (BackgroundJob* self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; GCancellable* _tmp1_; @@ -886,30 +970,29 @@ gboolean background_job_is_cancelled (BackgroundJob* self) { _tmp1_ = self->priv->cancellable; #line 162 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (_tmp1_ != NULL) { -#line 890 "BackgroundJob.c" +#line 974 "BackgroundJob.c" GCancellable* _tmp2_; - gboolean _tmp3_; #line 162 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _tmp2_ = self->priv->cancellable; #line 162 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp3_ = g_cancellable_is_cancelled (_tmp2_); -#line 162 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp0_ = _tmp3_; -#line 899 "BackgroundJob.c" + _tmp0_ = g_cancellable_is_cancelled (_tmp2_); +#line 980 "BackgroundJob.c" } else { #line 162 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _tmp0_ = FALSE; -#line 903 "BackgroundJob.c" +#line 984 "BackgroundJob.c" } #line 162 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" result = _tmp0_; #line 162 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return result; -#line 909 "BackgroundJob.c" +#line 990 "BackgroundJob.c" } -void background_job_cancel (BackgroundJob* self) { +void +background_job_cancel (BackgroundJob* self) +{ GCancellable* _tmp0_; #line 165 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_if_fail (IS_BACKGROUND_JOB (self)); @@ -917,55 +1000,60 @@ void background_job_cancel (BackgroundJob* self) { _tmp0_ = self->priv->cancellable; #line 166 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (_tmp0_ != NULL) { -#line 921 "BackgroundJob.c" +#line 1004 "BackgroundJob.c" GCancellable* _tmp1_; #line 167 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _tmp1_ = self->priv->cancellable; #line 167 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_cancellable_cancel (_tmp1_); -#line 927 "BackgroundJob.c" +#line 1010 "BackgroundJob.c" } } -static gpointer _background_job_ref0 (gpointer self) { +static gpointer +_background_job_ref0 (gpointer self) +{ #line 183 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return self ? background_job_ref (self) : NULL; -#line 935 "BackgroundJob.c" +#line 1020 "BackgroundJob.c" } -static gboolean _background_job_on_notify_completion_gsource_func (gpointer self) { +static gboolean +_background_job_on_notify_completion_gsource_func (gpointer self) +{ gboolean result; result = background_job_on_notify_completion ((BackgroundJob*) self); #line 185 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return result; -#line 944 "BackgroundJob.c" +#line 1031 "BackgroundJob.c" } -void background_job_internal_notify_completion (BackgroundJob* self) { +void +background_job_internal_notify_completion (BackgroundJob* self) +{ AbstractSemaphore* _tmp0_; gboolean _tmp2_ = FALSE; CompletionCallback _tmp3_; void* _tmp3__target; gboolean _tmp5_ = FALSE; - gboolean _tmp6_; - BackgroundJob* _tmp8_; - gint _tmp9_; + BackgroundJob* _tmp7_; + gint _tmp8_; #line 171 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_if_fail (IS_BACKGROUND_JOB (self)); #line 172 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _tmp0_ = self->priv->semaphore; #line 172 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (_tmp0_ != NULL) { -#line 963 "BackgroundJob.c" +#line 1051 "BackgroundJob.c" AbstractSemaphore* _tmp1_; #line 173 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _tmp1_ = self->priv->semaphore; #line 173 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" abstract_semaphore_notify (_tmp1_); -#line 969 "BackgroundJob.c" +#line 1057 "BackgroundJob.c" } #line 175 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _tmp3_ = self->priv->callback; @@ -973,7 +1061,7 @@ void background_job_internal_notify_completion (BackgroundJob* self) { _tmp3__target = self->priv->callback_target; #line 175 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (_tmp3_ == NULL) { -#line 977 "BackgroundJob.c" +#line 1065 "BackgroundJob.c" CancellationCallback _tmp4_; void* _tmp4__target; #line 175 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" @@ -982,105 +1070,102 @@ void background_job_internal_notify_completion (BackgroundJob* self) { _tmp4__target = self->priv->cancellation_target; #line 175 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _tmp2_ = _tmp4_ == NULL; -#line 986 "BackgroundJob.c" +#line 1074 "BackgroundJob.c" } else { #line 175 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _tmp2_ = FALSE; -#line 990 "BackgroundJob.c" +#line 1078 "BackgroundJob.c" } #line 175 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (_tmp2_) { #line 176 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return; -#line 996 "BackgroundJob.c" +#line 1084 "BackgroundJob.c" } #line 178 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp6_ = background_job_is_cancelled (self); -#line 178 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - if (_tmp6_) { -#line 1002 "BackgroundJob.c" - CancellationCallback _tmp7_; - void* _tmp7__target; + if (background_job_is_cancelled (self)) { +#line 1088 "BackgroundJob.c" + CancellationCallback _tmp6_; + void* _tmp6__target; #line 178 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp7_ = self->priv->cancellation; + _tmp6_ = self->priv->cancellation; #line 178 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp7__target = self->priv->cancellation_target; + _tmp6__target = self->priv->cancellation_target; #line 178 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp5_ = _tmp7_ == NULL; -#line 1011 "BackgroundJob.c" + _tmp5_ = _tmp6_ == NULL; +#line 1097 "BackgroundJob.c" } else { #line 178 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _tmp5_ = FALSE; -#line 1015 "BackgroundJob.c" +#line 1101 "BackgroundJob.c" } #line 178 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (_tmp5_) { #line 179 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return; -#line 1021 "BackgroundJob.c" +#line 1107 "BackgroundJob.c" } #line 183 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp8_ = _background_job_ref0 (self); + _tmp7_ = _background_job_ref0 (self); #line 183 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _background_job_unref0 (self->priv->self); #line 183 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - self->priv->self = _tmp8_; + self->priv->self = _tmp7_; #line 185 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp9_ = self->priv->completion_priority; + _tmp8_ = self->priv->completion_priority; #line 185 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - g_idle_add_full (_tmp9_, _background_job_on_notify_completion_gsource_func, background_job_ref (self), background_job_unref); -#line 1033 "BackgroundJob.c" + g_idle_add_full (_tmp8_, _background_job_on_notify_completion_gsource_func, background_job_ref (self), background_job_unref); +#line 1119 "BackgroundJob.c" } -static gboolean background_job_on_notify_completion (BackgroundJob* self) { +static gboolean +background_job_on_notify_completion (BackgroundJob* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 188 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_val_if_fail (IS_BACKGROUND_JOB (self), FALSE); #line 193 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp0_ = background_job_is_cancelled (self); -#line 193 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - if (_tmp0_) { -#line 1046 "BackgroundJob.c" - CancellationCallback _tmp1_; - void* _tmp1__target; + if (background_job_is_cancelled (self)) { +#line 1131 "BackgroundJob.c" + CancellationCallback _tmp0_; + void* _tmp0__target; #line 194 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp1_ = self->priv->cancellation; + _tmp0_ = self->priv->cancellation; #line 194 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp1__target = self->priv->cancellation_target; + _tmp0__target = self->priv->cancellation_target; #line 194 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - if (_tmp1_ != NULL) { -#line 1055 "BackgroundJob.c" - CancellationCallback _tmp2_; - void* _tmp2__target; + if (_tmp0_ != NULL) { +#line 1140 "BackgroundJob.c" + CancellationCallback _tmp1_; + void* _tmp1__target; #line 195 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp2_ = self->priv->cancellation; + _tmp1_ = self->priv->cancellation; #line 195 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp2__target = self->priv->cancellation_target; + _tmp1__target = self->priv->cancellation_target; #line 195 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp2_ (self, _tmp2__target); -#line 1064 "BackgroundJob.c" + _tmp1_ (self, _tmp1__target); +#line 1149 "BackgroundJob.c" } } else { - CompletionCallback _tmp3_; - void* _tmp3__target; + CompletionCallback _tmp2_; + void* _tmp2__target; #line 197 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp3_ = self->priv->callback; + _tmp2_ = self->priv->callback; #line 197 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp3__target = self->priv->callback_target; + _tmp2__target = self->priv->callback_target; #line 197 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - if (_tmp3_ != NULL) { -#line 1075 "BackgroundJob.c" - CompletionCallback _tmp4_; - void* _tmp4__target; + if (_tmp2_ != NULL) { +#line 1160 "BackgroundJob.c" + CompletionCallback _tmp3_; + void* _tmp3__target; #line 198 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp4_ = self->priv->callback; + _tmp3_ = self->priv->callback; #line 198 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp4__target = self->priv->callback_target; + _tmp3__target = self->priv->callback_target; #line 198 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp4_ (self, _tmp4__target); -#line 1084 "BackgroundJob.c" + _tmp3_ (self, _tmp3__target); +#line 1169 "BackgroundJob.c" } } #line 202 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" @@ -1091,78 +1176,77 @@ static gboolean background_job_on_notify_completion (BackgroundJob* self) { result = FALSE; #line 204 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return result; -#line 1095 "BackgroundJob.c" +#line 1180 "BackgroundJob.c" } -static gboolean _background_job_on_notification_ready_gsource_func (gpointer self) { +static gboolean +_background_job_on_notification_ready_gsource_func (gpointer self) +{ gboolean result; result = background_job_on_notification_ready ((BackgroundJob*) self); #line 214 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return result; -#line 1104 "BackgroundJob.c" +#line 1191 "BackgroundJob.c" } -static gpointer _notification_object_ref0 (gpointer self) { +static gpointer +_notification_object_ref0 (gpointer self) +{ #line 218 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return self ? notification_object_ref (self) : NULL; -#line 1111 "BackgroundJob.c" +#line 1200 "BackgroundJob.c" } -void background_job_notify (BackgroundJob* self, NotificationCallback callback, void* callback_target, NotificationObject* user) { - gint _tmp7_; +void +background_job_notify (BackgroundJob* self, + NotificationCallback callback, + void* callback_target, + NotificationObject* user) +{ + gint _tmp5_; InterlockedNotificationObject* interlocked = NULL; - NotificationObject* _tmp8_; - InterlockedNotificationObject* _tmp9_; - InterlockedNotificationObject* _tmp10_; + InterlockedNotificationObject* _tmp6_; + InterlockedNotificationObject* _tmp7_; GError * _inner_error_ = NULL; #line 209 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_if_fail (IS_BACKGROUND_JOB (self)); #line 209 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_if_fail ((user == NULL) || IS_NOTIFICATION_OBJECT (user)); -#line 1126 "BackgroundJob.c" +#line 1219 "BackgroundJob.c" { GeeArrayList* _tmp0_; #line 210 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _tmp0_ = background_job_notify_queue; #line 210 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_rec_mutex_lock (&__lock_background_job_notify_queue); -#line 1133 "BackgroundJob.c" +#line 1226 "BackgroundJob.c" { GeeArrayList* _tmp1_; - NotificationCallback _tmp2_; - void* _tmp2__target; - NotificationObject* _tmp3_; - BackgroundJobNotificationJob* _tmp4_; - BackgroundJobNotificationJob* _tmp5_; + BackgroundJobNotificationJob* _tmp2_; + BackgroundJobNotificationJob* _tmp3_; #line 211 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _tmp1_ = background_job_notify_queue; #line 211 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp2_ = callback; -#line 211 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp2__target = callback_target; -#line 211 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp3_ = user; + _tmp2_ = background_job_notification_job_new (callback, callback_target, self, user); #line 211 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp4_ = background_job_notification_job_new (_tmp2_, _tmp2__target, self, _tmp3_); -#line 211 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 211 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp3_); #line 211 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _background_job_notification_job_unref0 (_tmp5_); -#line 1157 "BackgroundJob.c" + _background_job_notification_job_unref0 (_tmp3_); +#line 1241 "BackgroundJob.c" } __finally13: { - GeeArrayList* _tmp6_; + GeeArrayList* _tmp4_; #line 210 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp6_ = background_job_notify_queue; + _tmp4_ = background_job_notify_queue; #line 210 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_rec_mutex_unlock (&__lock_background_job_notify_queue); -#line 1166 "BackgroundJob.c" +#line 1250 "BackgroundJob.c" } #line 210 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -1172,38 +1256,38 @@ void background_job_notify (BackgroundJob* self, NotificationCallback callback, g_clear_error (&_inner_error_); #line 210 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return; -#line 1176 "BackgroundJob.c" +#line 1260 "BackgroundJob.c" } } #line 214 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp7_ = self->priv->notification_priority; + _tmp5_ = self->priv->notification_priority; #line 214 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - g_idle_add_full (_tmp7_, _background_job_on_notification_ready_gsource_func, background_job_ref (self), background_job_unref); + g_idle_add_full (_tmp5_, _background_job_on_notification_ready_gsource_func, background_job_ref (self), background_job_unref); #line 218 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp8_ = user; + _tmp6_ = _notification_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (user, TYPE_INTERLOCKED_NOTIFICATION_OBJECT) ? ((InterlockedNotificationObject*) user) : NULL); #line 218 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp9_ = _notification_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_INTERLOCKED_NOTIFICATION_OBJECT) ? ((InterlockedNotificationObject*) _tmp8_) : NULL); -#line 218 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - interlocked = _tmp9_; + interlocked = _tmp6_; #line 219 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp10_ = interlocked; + _tmp7_ = interlocked; #line 219 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - if (_tmp10_ != NULL) { -#line 1193 "BackgroundJob.c" - InterlockedNotificationObject* _tmp11_; + if (_tmp7_ != NULL) { +#line 1275 "BackgroundJob.c" + InterlockedNotificationObject* _tmp8_; #line 220 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp11_ = interlocked; + _tmp8_ = interlocked; #line 220 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - interlocked_notification_object_internal_wait_for_completion (_tmp11_); -#line 1199 "BackgroundJob.c" + interlocked_notification_object_internal_wait_for_completion (_tmp8_); +#line 1281 "BackgroundJob.c" } #line 209 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _notification_object_unref0 (interlocked); -#line 1203 "BackgroundJob.c" +#line 1285 "BackgroundJob.c" } -static gboolean background_job_on_notification_ready (BackgroundJob* self) { +static gboolean +background_job_on_notification_ready (BackgroundJob* self) +{ gboolean result = FALSE; BackgroundJobNotificationJob* notification_job = NULL; BackgroundJobNotificationJob* _tmp8_; @@ -1224,14 +1308,14 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) { g_return_val_if_fail (IS_BACKGROUND_JOB (self), FALSE); #line 226 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" notification_job = NULL; -#line 1228 "BackgroundJob.c" +#line 1312 "BackgroundJob.c" { GeeArrayList* _tmp0_; #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _tmp0_ = background_job_notify_queue; #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_rec_mutex_lock (&__lock_background_job_notify_queue); -#line 1235 "BackgroundJob.c" +#line 1319 "BackgroundJob.c" { GeeArrayList* _tmp1_; gint _tmp2_; @@ -1244,7 +1328,7 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) { _tmp3_ = _tmp2_; #line 228 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (_tmp3_ > 0) { -#line 1248 "BackgroundJob.c" +#line 1332 "BackgroundJob.c" GeeArrayList* _tmp4_; gpointer _tmp5_; #line 229 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" @@ -1255,7 +1339,7 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) { _background_job_notification_job_unref0 (notification_job); #line 229 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" notification_job = (BackgroundJobNotificationJob*) _tmp5_; -#line 1259 "BackgroundJob.c" +#line 1343 "BackgroundJob.c" } } __finally14: @@ -1265,11 +1349,11 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) { _tmp6_ = background_job_notify_queue; #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_rec_mutex_unlock (&__lock_background_job_notify_queue); -#line 1269 "BackgroundJob.c" +#line 1353 "BackgroundJob.c" } #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1273 "BackgroundJob.c" +#line 1357 "BackgroundJob.c" gboolean _tmp7_ = FALSE; #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _background_job_notification_job_unref0 (notification_job); @@ -1279,7 +1363,7 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) { g_clear_error (&_inner_error_); #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return _tmp7_; -#line 1283 "BackgroundJob.c" +#line 1367 "BackgroundJob.c" } } #line 231 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" @@ -1314,13 +1398,13 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) { _tmp18_ = interlocked; #line 237 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (_tmp18_ != NULL) { -#line 1318 "BackgroundJob.c" +#line 1402 "BackgroundJob.c" InterlockedNotificationObject* _tmp19_; #line 238 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _tmp19_ = interlocked; #line 238 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" interlocked_notification_object_internal_completed (_tmp19_); -#line 1324 "BackgroundJob.c" +#line 1408 "BackgroundJob.c" } #line 240 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" result = FALSE; @@ -1330,18 +1414,20 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) { _background_job_notification_job_unref0 (notification_job); #line 240 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return result; -#line 1334 "BackgroundJob.c" +#line 1418 "BackgroundJob.c" } -static BackgroundJobNotificationJob* background_job_notification_job_construct (GType object_type, NotificationCallback callback, void* callback_target, BackgroundJob* background_job, NotificationObject* user) { +static BackgroundJobNotificationJob* +background_job_notification_job_construct (GType object_type, + NotificationCallback callback, + void* callback_target, + BackgroundJob* background_job, + NotificationObject* user) +{ BackgroundJobNotificationJob* self = NULL; - NotificationCallback _tmp0_; - void* _tmp0__target; - BackgroundJob* _tmp1_; - BackgroundJob* _tmp2_; - NotificationObject* _tmp3_; - NotificationObject* _tmp4_; + BackgroundJob* _tmp0_; + NotificationObject* _tmp1_; #line 88 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_val_if_fail (IS_BACKGROUND_JOB (background_job), NULL); #line 88 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" @@ -1349,140 +1435,162 @@ static BackgroundJobNotificationJob* background_job_notification_job_construct ( #line 88 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" self = (BackgroundJobNotificationJob*) g_type_create_instance (object_type); #line 90 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp0_ = callback; -#line 90 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp0__target = callback_target; -#line 90 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - self->callback = _tmp0_; + self->callback = callback; #line 90 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - self->callback_target = _tmp0__target; + self->callback_target = callback_target; #line 91 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp1_ = background_job; -#line 91 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp2_ = _background_job_ref0 (_tmp1_); + _tmp0_ = _background_job_ref0 (background_job); #line 91 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _background_job_unref0 (self->background_job); #line 91 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - self->background_job = _tmp2_; -#line 92 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp3_ = user; + self->background_job = _tmp0_; #line 92 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp4_ = _notification_object_ref0 (_tmp3_); + _tmp1_ = _notification_object_ref0 (user); #line 92 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _notification_object_unref0 (self->user); #line 92 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - self->user = _tmp4_; + self->user = _tmp1_; #line 88 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return self; -#line 1378 "BackgroundJob.c" +#line 1456 "BackgroundJob.c" } -static BackgroundJobNotificationJob* background_job_notification_job_new (NotificationCallback callback, void* callback_target, BackgroundJob* background_job, NotificationObject* user) { +static BackgroundJobNotificationJob* +background_job_notification_job_new (NotificationCallback callback, + void* callback_target, + BackgroundJob* background_job, + NotificationObject* user) +{ #line 88 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return background_job_notification_job_construct (BACKGROUND_JOB_TYPE_NOTIFICATION_JOB, callback, callback_target, background_job, user); -#line 1385 "BackgroundJob.c" +#line 1468 "BackgroundJob.c" } -static void background_job_value_notification_job_init (GValue* value) { +static void +background_job_value_notification_job_init (GValue* value) +{ #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = NULL; -#line 1392 "BackgroundJob.c" +#line 1477 "BackgroundJob.c" } -static void background_job_value_notification_job_free_value (GValue* value) { +static void +background_job_value_notification_job_free_value (GValue* value) +{ #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (value->data[0].v_pointer) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" background_job_notification_job_unref (value->data[0].v_pointer); -#line 1401 "BackgroundJob.c" +#line 1488 "BackgroundJob.c" } } -static void background_job_value_notification_job_copy_value (const GValue* src_value, GValue* dest_value) { +static void +background_job_value_notification_job_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (src_value->data[0].v_pointer) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" dest_value->data[0].v_pointer = background_job_notification_job_ref (src_value->data[0].v_pointer); -#line 1411 "BackgroundJob.c" +#line 1501 "BackgroundJob.c" } else { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" dest_value->data[0].v_pointer = NULL; -#line 1415 "BackgroundJob.c" +#line 1505 "BackgroundJob.c" } } -static gpointer background_job_value_notification_job_peek_pointer (const GValue* value) { +static gpointer +background_job_value_notification_job_peek_pointer (const GValue* value) +{ #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return value->data[0].v_pointer; -#line 1423 "BackgroundJob.c" +#line 1515 "BackgroundJob.c" } -static gchar* background_job_value_notification_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +background_job_value_notification_job_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (collect_values[0].v_pointer) { -#line 1430 "BackgroundJob.c" +#line 1527 "BackgroundJob.c" BackgroundJobNotificationJob * object; object = collect_values[0].v_pointer; #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (object->parent_instance.g_class == NULL) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1437 "BackgroundJob.c" +#line 1534 "BackgroundJob.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.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 1441 "BackgroundJob.c" +#line 1538 "BackgroundJob.c" } #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = background_job_notification_job_ref (object); -#line 1445 "BackgroundJob.c" +#line 1542 "BackgroundJob.c" } else { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = NULL; -#line 1449 "BackgroundJob.c" +#line 1546 "BackgroundJob.c" } #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return NULL; -#line 1453 "BackgroundJob.c" +#line 1550 "BackgroundJob.c" } -static gchar* background_job_value_notification_job_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +background_job_value_notification_job_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ BackgroundJobNotificationJob ** object_p; object_p = collect_values[0].v_pointer; #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (!object_p) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1464 "BackgroundJob.c" +#line 1566 "BackgroundJob.c" } #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (!value->data[0].v_pointer) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" *object_p = NULL; -#line 1470 "BackgroundJob.c" +#line 1572 "BackgroundJob.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" *object_p = value->data[0].v_pointer; -#line 1474 "BackgroundJob.c" +#line 1576 "BackgroundJob.c" } else { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" *object_p = background_job_notification_job_ref (value->data[0].v_pointer); -#line 1478 "BackgroundJob.c" +#line 1580 "BackgroundJob.c" } #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return NULL; -#line 1482 "BackgroundJob.c" +#line 1584 "BackgroundJob.c" } -static GParamSpec* background_job_param_spec_notification_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +static GParamSpec* +background_job_param_spec_notification_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ BackgroundJobParamSpecNotificationJob* spec; #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_val_if_fail (g_type_is_a (object_type, BACKGROUND_JOB_TYPE_NOTIFICATION_JOB), NULL); @@ -1492,20 +1600,25 @@ static GParamSpec* background_job_param_spec_notification_job (const gchar* name G_PARAM_SPEC (spec)->value_type = object_type; #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return G_PARAM_SPEC (spec); -#line 1496 "BackgroundJob.c" +#line 1604 "BackgroundJob.c" } -static gpointer background_job_value_get_notification_job (const GValue* value) { +static gpointer +background_job_value_get_notification_job (const GValue* value) +{ #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, BACKGROUND_JOB_TYPE_NOTIFICATION_JOB), NULL); #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return value->data[0].v_pointer; -#line 1505 "BackgroundJob.c" +#line 1615 "BackgroundJob.c" } -static void background_job_value_set_notification_job (GValue* value, gpointer v_object) { +static void +background_job_value_set_notification_job (GValue* value, + gpointer v_object) +{ BackgroundJobNotificationJob * old; #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, BACKGROUND_JOB_TYPE_NOTIFICATION_JOB)); @@ -1521,22 +1634,25 @@ static void background_job_value_set_notification_job (GValue* value, gpointer v value->data[0].v_pointer = v_object; #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" background_job_notification_job_ref (value->data[0].v_pointer); -#line 1525 "BackgroundJob.c" +#line 1638 "BackgroundJob.c" } else { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = NULL; -#line 1529 "BackgroundJob.c" +#line 1642 "BackgroundJob.c" } #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (old) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" background_job_notification_job_unref (old); -#line 1535 "BackgroundJob.c" +#line 1648 "BackgroundJob.c" } } -static void background_job_value_take_notification_job (GValue* value, gpointer v_object) { +static void +background_job_value_take_notification_job (GValue* value, + gpointer v_object) +{ BackgroundJobNotificationJob * old; #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, BACKGROUND_JOB_TYPE_NOTIFICATION_JOB)); @@ -1550,38 +1666,44 @@ static void background_job_value_take_notification_job (GValue* value, gpointer g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = v_object; -#line 1554 "BackgroundJob.c" +#line 1670 "BackgroundJob.c" } else { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = NULL; -#line 1558 "BackgroundJob.c" +#line 1674 "BackgroundJob.c" } #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (old) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" background_job_notification_job_unref (old); -#line 1564 "BackgroundJob.c" +#line 1680 "BackgroundJob.c" } } -static void background_job_notification_job_class_init (BackgroundJobNotificationJobClass * klass) { +static void +background_job_notification_job_class_init (BackgroundJobNotificationJobClass * klass) +{ #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" background_job_notification_job_parent_class = g_type_class_peek_parent (klass); #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" ((BackgroundJobNotificationJobClass *) klass)->finalize = background_job_notification_job_finalize; -#line 1574 "BackgroundJob.c" +#line 1692 "BackgroundJob.c" } -static void background_job_notification_job_instance_init (BackgroundJobNotificationJob * self) { +static void +background_job_notification_job_instance_init (BackgroundJobNotificationJob * self) +{ #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" self->ref_count = 1; -#line 1581 "BackgroundJob.c" +#line 1701 "BackgroundJob.c" } -static void background_job_notification_job_finalize (BackgroundJobNotificationJob * obj) { +static void +background_job_notification_job_finalize (BackgroundJobNotificationJob * obj) +{ BackgroundJobNotificationJob * self; #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, BACKGROUND_JOB_TYPE_NOTIFICATION_JOB, BackgroundJobNotificationJob); @@ -1591,11 +1713,13 @@ static void background_job_notification_job_finalize (BackgroundJobNotificationJ _background_job_unref0 (self->background_job); #line 86 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _notification_object_unref0 (self->user); -#line 1595 "BackgroundJob.c" +#line 1717 "BackgroundJob.c" } -static GType background_job_notification_job_get_type (void) { +static GType +background_job_notification_job_get_type (void) +{ static volatile gsize background_job_notification_job_type_id__volatile = 0; if (g_once_init_enter (&background_job_notification_job_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { background_job_value_notification_job_init, background_job_value_notification_job_free_value, background_job_value_notification_job_copy_value, background_job_value_notification_job_peek_pointer, "p", background_job_value_notification_job_collect_value, "p", background_job_value_notification_job_lcopy_value }; @@ -1609,18 +1733,22 @@ static GType background_job_notification_job_get_type (void) { } -static gpointer background_job_notification_job_ref (gpointer instance) { +static gpointer +background_job_notification_job_ref (gpointer instance) +{ BackgroundJobNotificationJob * self; self = instance; #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_atomic_int_inc (&self->ref_count); #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return instance; -#line 1620 "BackgroundJob.c" +#line 1746 "BackgroundJob.c" } -static void background_job_notification_job_unref (gpointer instance) { +static void +background_job_notification_job_unref (gpointer instance) +{ BackgroundJobNotificationJob * self; self = instance; #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" @@ -1629,109 +1757,134 @@ static void background_job_notification_job_unref (gpointer instance) { BACKGROUND_JOB_NOTIFICATION_JOB_GET_CLASS (self)->finalize (self); #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1633 "BackgroundJob.c" +#line 1761 "BackgroundJob.c" } } -static void value_background_job_init (GValue* value) { +static void +value_background_job_init (GValue* value) +{ #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = NULL; -#line 1641 "BackgroundJob.c" +#line 1771 "BackgroundJob.c" } -static void value_background_job_free_value (GValue* value) { +static void +value_background_job_free_value (GValue* value) +{ #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (value->data[0].v_pointer) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" background_job_unref (value->data[0].v_pointer); -#line 1650 "BackgroundJob.c" +#line 1782 "BackgroundJob.c" } } -static void value_background_job_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_background_job_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (src_value->data[0].v_pointer) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" dest_value->data[0].v_pointer = background_job_ref (src_value->data[0].v_pointer); -#line 1660 "BackgroundJob.c" +#line 1795 "BackgroundJob.c" } else { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" dest_value->data[0].v_pointer = NULL; -#line 1664 "BackgroundJob.c" +#line 1799 "BackgroundJob.c" } } -static gpointer value_background_job_peek_pointer (const GValue* value) { +static gpointer +value_background_job_peek_pointer (const GValue* value) +{ #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return value->data[0].v_pointer; -#line 1672 "BackgroundJob.c" +#line 1809 "BackgroundJob.c" } -static gchar* value_background_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_background_job_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (collect_values[0].v_pointer) { -#line 1679 "BackgroundJob.c" +#line 1821 "BackgroundJob.c" BackgroundJob * object; object = collect_values[0].v_pointer; #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (object->parent_instance.g_class == NULL) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1686 "BackgroundJob.c" +#line 1828 "BackgroundJob.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.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 1690 "BackgroundJob.c" +#line 1832 "BackgroundJob.c" } #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = background_job_ref (object); -#line 1694 "BackgroundJob.c" +#line 1836 "BackgroundJob.c" } else { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = NULL; -#line 1698 "BackgroundJob.c" +#line 1840 "BackgroundJob.c" } #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return NULL; -#line 1702 "BackgroundJob.c" +#line 1844 "BackgroundJob.c" } -static gchar* value_background_job_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_background_job_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ BackgroundJob ** object_p; object_p = collect_values[0].v_pointer; #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (!object_p) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1713 "BackgroundJob.c" +#line 1860 "BackgroundJob.c" } #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (!value->data[0].v_pointer) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" *object_p = NULL; -#line 1719 "BackgroundJob.c" +#line 1866 "BackgroundJob.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" *object_p = value->data[0].v_pointer; -#line 1723 "BackgroundJob.c" +#line 1870 "BackgroundJob.c" } else { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" *object_p = background_job_ref (value->data[0].v_pointer); -#line 1727 "BackgroundJob.c" +#line 1874 "BackgroundJob.c" } #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return NULL; -#line 1731 "BackgroundJob.c" +#line 1878 "BackgroundJob.c" } -GParamSpec* param_spec_background_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_background_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecBackgroundJob* spec; #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_BACKGROUND_JOB), NULL); @@ -1741,20 +1894,25 @@ GParamSpec* param_spec_background_job (const gchar* name, const gchar* nick, con G_PARAM_SPEC (spec)->value_type = object_type; #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return G_PARAM_SPEC (spec); -#line 1745 "BackgroundJob.c" +#line 1898 "BackgroundJob.c" } -gpointer value_get_background_job (const GValue* value) { +gpointer +value_get_background_job (const GValue* value) +{ #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKGROUND_JOB), NULL); #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return value->data[0].v_pointer; -#line 1754 "BackgroundJob.c" +#line 1909 "BackgroundJob.c" } -void value_set_background_job (GValue* value, gpointer v_object) { +void +value_set_background_job (GValue* value, + gpointer v_object) +{ BackgroundJob * old; #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKGROUND_JOB)); @@ -1770,22 +1928,25 @@ void value_set_background_job (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" background_job_ref (value->data[0].v_pointer); -#line 1774 "BackgroundJob.c" +#line 1932 "BackgroundJob.c" } else { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = NULL; -#line 1778 "BackgroundJob.c" +#line 1936 "BackgroundJob.c" } #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (old) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" background_job_unref (old); -#line 1784 "BackgroundJob.c" +#line 1942 "BackgroundJob.c" } } -void value_take_background_job (GValue* value, gpointer v_object) { +void +value_take_background_job (GValue* value, + gpointer v_object) +{ BackgroundJob * old; #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKGROUND_JOB)); @@ -1799,22 +1960,24 @@ void value_take_background_job (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = v_object; -#line 1803 "BackgroundJob.c" +#line 1964 "BackgroundJob.c" } else { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = NULL; -#line 1807 "BackgroundJob.c" +#line 1968 "BackgroundJob.c" } #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (old) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" background_job_unref (old); -#line 1813 "BackgroundJob.c" +#line 1974 "BackgroundJob.c" } } -static void background_job_class_init (BackgroundJobClass * klass) { +static void +background_job_class_init (BackgroundJobClass * klass) +{ GeeArrayList* _tmp0_; #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" background_job_parent_class = g_type_class_peek_parent (klass); @@ -1832,11 +1995,13 @@ static void background_job_class_init (BackgroundJobClass * klass) { _tmp0_ = gee_array_list_new (BACKGROUND_JOB_TYPE_NOTIFICATION_JOB, (GBoxedCopyFunc) background_job_notification_job_ref, (GDestroyNotify) background_job_notification_job_unref, NULL, NULL, NULL); #line 96 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" background_job_notify_queue = _tmp0_; -#line 1836 "BackgroundJob.c" +#line 1999 "BackgroundJob.c" } -static void background_job_instance_init (BackgroundJob * self) { +static void +background_job_instance_init (BackgroundJob * self) +{ #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" self->priv = BACKGROUND_JOB_GET_PRIVATE (self); #line 102 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" @@ -1849,11 +2014,13 @@ static void background_job_instance_init (BackgroundJob * self) { self->priv->notification_priority = G_PRIORITY_DEFAULT_IDLE; #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" self->ref_count = 1; -#line 1853 "BackgroundJob.c" +#line 2018 "BackgroundJob.c" } -static void background_job_finalize (BackgroundJob * obj) { +static void +background_job_finalize (BackgroundJob * obj) +{ BackgroundJob * self; #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKGROUND_JOB, BackgroundJob); @@ -1867,11 +2034,13 @@ static void background_job_finalize (BackgroundJob * obj) { _background_job_unref0 (self->priv->self); #line 103 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _abstract_semaphore_unref0 (self->priv->semaphore); -#line 1871 "BackgroundJob.c" +#line 2038 "BackgroundJob.c" } -GType background_job_get_type (void) { +GType +background_job_get_type (void) +{ static volatile gsize background_job_type_id__volatile = 0; if (g_once_init_enter (&background_job_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_background_job_init, value_background_job_free_value, value_background_job_copy_value, value_background_job_peek_pointer, "p", value_background_job_collect_value, "p", value_background_job_lcopy_value }; @@ -1885,18 +2054,22 @@ GType background_job_get_type (void) { } -gpointer background_job_ref (gpointer instance) { +gpointer +background_job_ref (gpointer instance) +{ BackgroundJob * self; self = instance; #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_atomic_int_inc (&self->ref_count); #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return instance; -#line 1896 "BackgroundJob.c" +#line 2067 "BackgroundJob.c" } -void background_job_unref (gpointer instance) { +void +background_job_unref (gpointer instance) +{ BackgroundJob * self; self = instance; #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" @@ -1905,7 +2078,7 @@ void background_job_unref (gpointer instance) { BACKGROUND_JOB_GET_CLASS (self)->finalize (self); #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1909 "BackgroundJob.c" +#line 2082 "BackgroundJob.c" } } diff --git a/src/threads/Semaphore.c b/src/threads/Semaphore.c index c93420b..0d5bd4d 100644 --- a/src/threads/Semaphore.c +++ b/src/threads/Semaphore.c @@ -1,4 +1,4 @@ -/* Semaphore.c generated by valac 0.36.6, the Vala compiler +/* Semaphore.c generated by valac 0.40.4, the Vala compiler * generated from Semaphore.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -10,6 +10,7 @@ /* mechanism (essentially, a blocking mechanism) to the system of callbacks that BackgroundJob*/ /* offers. They can also be used for other job-dependent notification mechanisms.*/ + #include #include #include @@ -159,19 +160,23 @@ static gpointer event_semaphore_parent_class = NULL; gpointer abstract_semaphore_ref (gpointer instance); void abstract_semaphore_unref (gpointer instance); -GParamSpec* param_spec_abstract_semaphore (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_abstract_semaphore (GValue* value, gpointer v_object); -void value_take_abstract_semaphore (GValue* value, gpointer v_object); +GParamSpec* param_spec_abstract_semaphore (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_abstract_semaphore (GValue* value, + gpointer v_object); +void value_take_abstract_semaphore (GValue* value, + gpointer v_object); gpointer value_get_abstract_semaphore (const GValue* value); GType abstract_semaphore_get_type (void) G_GNUC_CONST; GType abstract_semaphore_notify_action_get_type (void) G_GNUC_CONST; GType abstract_semaphore_wait_action_get_type (void) G_GNUC_CONST; GType abstract_semaphore_type_get_type (void) G_GNUC_CONST; #define ABSTRACT_SEMAPHORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphorePrivate)) -enum { - ABSTRACT_SEMAPHORE_DUMMY_PROPERTY -}; -AbstractSemaphore* abstract_semaphore_construct (GType object_type, AbstractSemaphoreType type); +AbstractSemaphore* abstract_semaphore_construct (GType object_type, + AbstractSemaphoreType type); static void abstract_semaphore_trigger (AbstractSemaphore* self); void abstract_semaphore_notify (AbstractSemaphore* self); AbstractSemaphoreNotifyAction abstract_semaphore_do_notify (AbstractSemaphore* self); @@ -186,9 +191,6 @@ static gboolean abstract_semaphore_real_do_reset (AbstractSemaphore* self); static void abstract_semaphore_finalize (AbstractSemaphore * obj); GType semaphore_get_type (void) G_GNUC_CONST; #define SEMAPHORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEMAPHORE, SemaphorePrivate)) -enum { - SEMAPHORE_DUMMY_PROPERTY -}; Semaphore* semaphore_new (void); Semaphore* semaphore_construct (GType object_type); static AbstractSemaphoreNotifyAction semaphore_real_do_notify (AbstractSemaphore* base); @@ -196,19 +198,14 @@ static AbstractSemaphoreWaitAction semaphore_real_do_wait (AbstractSemaphore* ba static void semaphore_finalize (AbstractSemaphore * obj); GType countdown_semaphore_get_type (void) G_GNUC_CONST; #define COUNTDOWN_SEMAPHORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_COUNTDOWN_SEMAPHORE, CountdownSemaphorePrivate)) -enum { - COUNTDOWN_SEMAPHORE_DUMMY_PROPERTY -}; CountdownSemaphore* countdown_semaphore_new (gint total); -CountdownSemaphore* countdown_semaphore_construct (GType object_type, gint total); +CountdownSemaphore* countdown_semaphore_construct (GType object_type, + gint total); static AbstractSemaphoreNotifyAction countdown_semaphore_real_do_notify (AbstractSemaphore* base); static AbstractSemaphoreWaitAction countdown_semaphore_real_do_wait (AbstractSemaphore* base); static void countdown_semaphore_finalize (AbstractSemaphore * obj); GType event_semaphore_get_type (void) G_GNUC_CONST; #define EVENT_SEMAPHORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EVENT_SEMAPHORE, EventSemaphorePrivate)) -enum { - EVENT_SEMAPHORE_DUMMY_PROPERTY -}; EventSemaphore* event_semaphore_new (void); EventSemaphore* event_semaphore_construct (GType object_type); static AbstractSemaphoreNotifyAction event_semaphore_real_do_notify (AbstractSemaphore* base); @@ -221,7 +218,9 @@ static void _vala_clear_GRWLock (GRWLock * mutex); static void _vala_clear_GCond (GCond * mutex); -GType abstract_semaphore_type_get_type (void) { +GType +abstract_semaphore_type_get_type (void) +{ static volatile gsize abstract_semaphore_type_type_id__volatile = 0; if (g_once_init_enter (&abstract_semaphore_type_type_id__volatile)) { static const GEnumValue values[] = {{ABSTRACT_SEMAPHORE_TYPE_SERIAL, "ABSTRACT_SEMAPHORE_TYPE_SERIAL", "serial"}, {ABSTRACT_SEMAPHORE_TYPE_BROADCAST, "ABSTRACT_SEMAPHORE_TYPE_BROADCAST", "broadcast"}, {0, NULL, NULL}}; @@ -233,7 +232,9 @@ GType abstract_semaphore_type_get_type (void) { } -GType abstract_semaphore_notify_action_get_type (void) { +GType +abstract_semaphore_notify_action_get_type (void) +{ static volatile gsize abstract_semaphore_notify_action_type_id__volatile = 0; if (g_once_init_enter (&abstract_semaphore_notify_action_type_id__volatile)) { static const GEnumValue values[] = {{ABSTRACT_SEMAPHORE_NOTIFY_ACTION_NONE, "ABSTRACT_SEMAPHORE_NOTIFY_ACTION_NONE", "none"}, {ABSTRACT_SEMAPHORE_NOTIFY_ACTION_SIGNAL, "ABSTRACT_SEMAPHORE_NOTIFY_ACTION_SIGNAL", "signal"}, {0, NULL, NULL}}; @@ -245,7 +246,9 @@ GType abstract_semaphore_notify_action_get_type (void) { } -GType abstract_semaphore_wait_action_get_type (void) { +GType +abstract_semaphore_wait_action_get_type (void) +{ static volatile gsize abstract_semaphore_wait_action_type_id__volatile = 0; if (g_once_init_enter (&abstract_semaphore_wait_action_type_id__volatile)) { static const GEnumValue values[] = {{ABSTRACT_SEMAPHORE_WAIT_ACTION_SLEEP, "ABSTRACT_SEMAPHORE_WAIT_ACTION_SLEEP", "sleep"}, {ABSTRACT_SEMAPHORE_WAIT_ACTION_READY, "ABSTRACT_SEMAPHORE_WAIT_ACTION_READY", "ready"}, {0, NULL, NULL}}; @@ -257,41 +260,37 @@ GType abstract_semaphore_wait_action_get_type (void) { } -AbstractSemaphore* abstract_semaphore_construct (GType object_type, AbstractSemaphoreType type) { +AbstractSemaphore* +abstract_semaphore_construct (GType object_type, + AbstractSemaphoreType type) +{ AbstractSemaphore* self = NULL; gboolean _tmp0_ = FALSE; - AbstractSemaphoreType _tmp1_; - AbstractSemaphoreType _tmp3_; #line 30 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self = (AbstractSemaphore*) g_type_create_instance (object_type); #line 31 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - _tmp1_ = type; -#line 31 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - if (_tmp1_ == ABSTRACT_SEMAPHORE_TYPE_SERIAL) { + if (type == ABSTRACT_SEMAPHORE_TYPE_SERIAL) { #line 31 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" _tmp0_ = TRUE; -#line 274 "Semaphore.c" +#line 276 "Semaphore.c" } else { - AbstractSemaphoreType _tmp2_; -#line 31 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - _tmp2_ = type; #line 31 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - _tmp0_ = _tmp2_ == ABSTRACT_SEMAPHORE_TYPE_BROADCAST; -#line 281 "Semaphore.c" + _tmp0_ = type == ABSTRACT_SEMAPHORE_TYPE_BROADCAST; +#line 280 "Semaphore.c" } #line 31 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" _vala_assert (_tmp0_, "type == Type.SERIAL || type == Type.BROADCAST"); #line 33 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - _tmp3_ = type; -#line 33 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - self->priv->type = _tmp3_; + self->priv->type = type; #line 30 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return self; -#line 291 "Semaphore.c" +#line 288 "Semaphore.c" } -static void abstract_semaphore_trigger (AbstractSemaphore* self) { +static void +abstract_semaphore_trigger (AbstractSemaphore* self) +{ AbstractSemaphoreType _tmp0_; #line 36 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_return_if_fail (IS_ABSTRACT_SEMAPHORE (self)); @@ -301,69 +300,70 @@ static void abstract_semaphore_trigger (AbstractSemaphore* self) { if (_tmp0_ == ABSTRACT_SEMAPHORE_TYPE_SERIAL) { #line 38 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_cond_signal (&self->priv->monitor); -#line 305 "Semaphore.c" +#line 304 "Semaphore.c" } else { #line 40 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_cond_broadcast (&self->priv->monitor); -#line 309 "Semaphore.c" +#line 308 "Semaphore.c" } } -void abstract_semaphore_notify (AbstractSemaphore* self) { +void +abstract_semaphore_notify (AbstractSemaphore* self) +{ AbstractSemaphoreNotifyAction action = 0; AbstractSemaphoreNotifyAction _tmp0_; - AbstractSemaphoreNotifyAction _tmp1_; #line 43 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_return_if_fail (IS_ABSTRACT_SEMAPHORE (self)); #line 44 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_mutex_lock (&self->priv->mutex); #line 46 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - _tmp0_ = abstract_semaphore_do_notify (self); -#line 46 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - action = _tmp0_; + action = abstract_semaphore_do_notify (self); #line 47 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - _tmp1_ = action; + _tmp0_ = action; #line 47 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - switch (_tmp1_) { + switch (_tmp0_) { #line 47 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" case ABSTRACT_SEMAPHORE_NOTIFY_ACTION_NONE: -#line 332 "Semaphore.c" +#line 330 "Semaphore.c" { #line 50 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" break; -#line 336 "Semaphore.c" +#line 334 "Semaphore.c" } #line 47 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" case ABSTRACT_SEMAPHORE_NOTIFY_ACTION_SIGNAL: -#line 340 "Semaphore.c" +#line 338 "Semaphore.c" { #line 53 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" abstract_semaphore_trigger (self); #line 54 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" break; -#line 346 "Semaphore.c" +#line 344 "Semaphore.c" } default: { - AbstractSemaphoreNotifyAction _tmp2_; - GEnumValue* _tmp3_; + AbstractSemaphoreNotifyAction _tmp1_; + GEnumValue* _tmp2_; #line 57 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - _tmp2_ = action; + _tmp1_ = action; #line 57 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - _tmp3_ = g_enum_get_value (g_type_class_ref (ABSTRACT_SEMAPHORE_TYPE_NOTIFY_ACTION), _tmp2_); + _tmp2_ = g_enum_get_value (g_type_class_ref (ABSTRACT_SEMAPHORE_TYPE_NOTIFY_ACTION), _tmp1_); #line 57 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - g_error ("Semaphore.vala:57: Unknown semaphore action: %s", (_tmp3_ != NULL) ? _tmp3_->value_name : NULL); -#line 358 "Semaphore.c" + g_error ("Semaphore.vala:57: Unknown semaphore action: %s", (_tmp2_ != NULL) ? _tmp2_->value_name : NULL); +#line 356 "Semaphore.c" } } #line 60 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_mutex_unlock (&self->priv->mutex); -#line 363 "Semaphore.c" +#line 361 "Semaphore.c" } -static AbstractSemaphoreNotifyAction abstract_semaphore_real_do_notify (AbstractSemaphore* self) { +static AbstractSemaphoreNotifyAction +abstract_semaphore_real_do_notify (AbstractSemaphore* self) +{ #line 64 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_critical ("Type `%s' does not implement abstract method `abstract_semaphore_do_notify'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 64 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -372,28 +372,28 @@ static AbstractSemaphoreNotifyAction abstract_semaphore_real_do_notify (Abstract } -AbstractSemaphoreNotifyAction abstract_semaphore_do_notify (AbstractSemaphore* self) { +AbstractSemaphoreNotifyAction +abstract_semaphore_do_notify (AbstractSemaphore* self) +{ #line 64 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_return_val_if_fail (IS_ABSTRACT_SEMAPHORE (self), 0); #line 64 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return ABSTRACT_SEMAPHORE_GET_CLASS (self)->do_notify (self); -#line 381 "Semaphore.c" +#line 383 "Semaphore.c" } -void abstract_semaphore_wait (AbstractSemaphore* self) { +void +abstract_semaphore_wait (AbstractSemaphore* self) +{ #line 66 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_return_if_fail (IS_ABSTRACT_SEMAPHORE (self)); #line 67 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_mutex_lock (&self->priv->mutex); #line 69 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" while (TRUE) { -#line 392 "Semaphore.c" - AbstractSemaphoreWaitAction _tmp0_; -#line 69 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - _tmp0_ = abstract_semaphore_do_wait (self); #line 69 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - if (!(_tmp0_ == ABSTRACT_SEMAPHORE_WAIT_ACTION_SLEEP)) { + if (!(abstract_semaphore_do_wait (self) == ABSTRACT_SEMAPHORE_WAIT_ACTION_SLEEP)) { #line 69 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" break; #line 400 "Semaphore.c" @@ -408,163 +408,195 @@ void abstract_semaphore_wait (AbstractSemaphore* self) { } -static AbstractSemaphoreWaitAction abstract_semaphore_real_do_wait (AbstractSemaphore* self) { +static AbstractSemaphoreWaitAction +abstract_semaphore_real_do_wait (AbstractSemaphore* self) +{ #line 76 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_critical ("Type `%s' does not implement abstract method `abstract_semaphore_do_wait'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 76 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return 0; -#line 417 "Semaphore.c" +#line 419 "Semaphore.c" } -AbstractSemaphoreWaitAction abstract_semaphore_do_wait (AbstractSemaphore* self) { +AbstractSemaphoreWaitAction +abstract_semaphore_do_wait (AbstractSemaphore* self) +{ #line 76 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_return_val_if_fail (IS_ABSTRACT_SEMAPHORE (self), 0); #line 76 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return ABSTRACT_SEMAPHORE_GET_CLASS (self)->do_wait (self); -#line 426 "Semaphore.c" +#line 430 "Semaphore.c" } -gboolean abstract_semaphore_reset (AbstractSemaphore* self) { +gboolean +abstract_semaphore_reset (AbstractSemaphore* self) +{ gboolean result = FALSE; gboolean is_reset = FALSE; - gboolean _tmp0_; #line 79 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_return_val_if_fail (IS_ABSTRACT_SEMAPHORE (self), FALSE); #line 80 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_mutex_lock (&self->priv->mutex); #line 81 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - _tmp0_ = abstract_semaphore_do_reset (self); -#line 81 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - is_reset = _tmp0_; + is_reset = abstract_semaphore_do_reset (self); #line 82 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_mutex_unlock (&self->priv->mutex); #line 84 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" result = is_reset; #line 84 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return result; -#line 448 "Semaphore.c" +#line 451 "Semaphore.c" } -static gboolean abstract_semaphore_real_do_reset (AbstractSemaphore* self) { +static gboolean +abstract_semaphore_real_do_reset (AbstractSemaphore* self) +{ gboolean result = FALSE; #line 90 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" result = FALSE; #line 90 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return result; -#line 458 "Semaphore.c" +#line 463 "Semaphore.c" } -gboolean abstract_semaphore_do_reset (AbstractSemaphore* self) { +gboolean +abstract_semaphore_do_reset (AbstractSemaphore* self) +{ #line 89 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_return_val_if_fail (IS_ABSTRACT_SEMAPHORE (self), FALSE); #line 89 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return ABSTRACT_SEMAPHORE_GET_CLASS (self)->do_reset (self); -#line 467 "Semaphore.c" +#line 474 "Semaphore.c" } -static void value_abstract_semaphore_init (GValue* value) { +static void +value_abstract_semaphore_init (GValue* value) +{ #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" value->data[0].v_pointer = NULL; -#line 474 "Semaphore.c" +#line 483 "Semaphore.c" } -static void value_abstract_semaphore_free_value (GValue* value) { +static void +value_abstract_semaphore_free_value (GValue* value) +{ #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" if (value->data[0].v_pointer) { #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" abstract_semaphore_unref (value->data[0].v_pointer); -#line 483 "Semaphore.c" +#line 494 "Semaphore.c" } } -static void value_abstract_semaphore_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_abstract_semaphore_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" if (src_value->data[0].v_pointer) { #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" dest_value->data[0].v_pointer = abstract_semaphore_ref (src_value->data[0].v_pointer); -#line 493 "Semaphore.c" +#line 507 "Semaphore.c" } else { #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" dest_value->data[0].v_pointer = NULL; -#line 497 "Semaphore.c" +#line 511 "Semaphore.c" } } -static gpointer value_abstract_semaphore_peek_pointer (const GValue* value) { +static gpointer +value_abstract_semaphore_peek_pointer (const GValue* value) +{ #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return value->data[0].v_pointer; -#line 505 "Semaphore.c" +#line 521 "Semaphore.c" } -static gchar* value_abstract_semaphore_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_abstract_semaphore_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" if (collect_values[0].v_pointer) { -#line 512 "Semaphore.c" +#line 533 "Semaphore.c" AbstractSemaphore * object; object = collect_values[0].v_pointer; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" if (object->parent_instance.g_class == NULL) { #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 519 "Semaphore.c" +#line 540 "Semaphore.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.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 523 "Semaphore.c" +#line 544 "Semaphore.c" } #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" value->data[0].v_pointer = abstract_semaphore_ref (object); -#line 527 "Semaphore.c" +#line 548 "Semaphore.c" } else { #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" value->data[0].v_pointer = NULL; -#line 531 "Semaphore.c" +#line 552 "Semaphore.c" } #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return NULL; -#line 535 "Semaphore.c" +#line 556 "Semaphore.c" } -static gchar* value_abstract_semaphore_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_abstract_semaphore_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ AbstractSemaphore ** object_p; object_p = collect_values[0].v_pointer; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" if (!object_p) { #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 546 "Semaphore.c" +#line 572 "Semaphore.c" } #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" if (!value->data[0].v_pointer) { #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" *object_p = NULL; -#line 552 "Semaphore.c" +#line 578 "Semaphore.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" *object_p = value->data[0].v_pointer; -#line 556 "Semaphore.c" +#line 582 "Semaphore.c" } else { #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" *object_p = abstract_semaphore_ref (value->data[0].v_pointer); -#line 560 "Semaphore.c" +#line 586 "Semaphore.c" } #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return NULL; -#line 564 "Semaphore.c" +#line 590 "Semaphore.c" } -GParamSpec* param_spec_abstract_semaphore (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_abstract_semaphore (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecAbstractSemaphore* spec; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_ABSTRACT_SEMAPHORE), NULL); @@ -574,20 +606,25 @@ GParamSpec* param_spec_abstract_semaphore (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return G_PARAM_SPEC (spec); -#line 578 "Semaphore.c" +#line 610 "Semaphore.c" } -gpointer value_get_abstract_semaphore (const GValue* value) { +gpointer +value_get_abstract_semaphore (const GValue* value) +{ #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ABSTRACT_SEMAPHORE), NULL); #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return value->data[0].v_pointer; -#line 587 "Semaphore.c" +#line 621 "Semaphore.c" } -void value_set_abstract_semaphore (GValue* value, gpointer v_object) { +void +value_set_abstract_semaphore (GValue* value, + gpointer v_object) +{ AbstractSemaphore * old; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ABSTRACT_SEMAPHORE)); @@ -603,22 +640,25 @@ void value_set_abstract_semaphore (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" abstract_semaphore_ref (value->data[0].v_pointer); -#line 607 "Semaphore.c" +#line 644 "Semaphore.c" } else { #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" value->data[0].v_pointer = NULL; -#line 611 "Semaphore.c" +#line 648 "Semaphore.c" } #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" if (old) { #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" abstract_semaphore_unref (old); -#line 617 "Semaphore.c" +#line 654 "Semaphore.c" } } -void value_take_abstract_semaphore (GValue* value, gpointer v_object) { +void +value_take_abstract_semaphore (GValue* value, + gpointer v_object) +{ AbstractSemaphore * old; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ABSTRACT_SEMAPHORE)); @@ -632,22 +672,24 @@ void value_take_abstract_semaphore (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" value->data[0].v_pointer = v_object; -#line 636 "Semaphore.c" +#line 676 "Semaphore.c" } else { #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" value->data[0].v_pointer = NULL; -#line 640 "Semaphore.c" +#line 680 "Semaphore.c" } #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" if (old) { #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" abstract_semaphore_unref (old); -#line 646 "Semaphore.c" +#line 686 "Semaphore.c" } } -static void abstract_semaphore_class_init (AbstractSemaphoreClass * klass) { +static void +abstract_semaphore_class_init (AbstractSemaphoreClass * klass) +{ #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" abstract_semaphore_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -660,11 +702,13 @@ static void abstract_semaphore_class_init (AbstractSemaphoreClass * klass) { ((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*) (AbstractSemaphore *)) abstract_semaphore_real_do_wait; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" ((AbstractSemaphoreClass *) klass)->do_reset = (gboolean (*) (AbstractSemaphore *)) abstract_semaphore_real_do_reset; -#line 664 "Semaphore.c" +#line 706 "Semaphore.c" } -static void abstract_semaphore_instance_init (AbstractSemaphore * self) { +static void +abstract_semaphore_instance_init (AbstractSemaphore * self) +{ #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self->priv = ABSTRACT_SEMAPHORE_GET_PRIVATE (self); #line 27 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -673,11 +717,13 @@ static void abstract_semaphore_instance_init (AbstractSemaphore * self) { g_cond_init (&self->priv->monitor); #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self->ref_count = 1; -#line 677 "Semaphore.c" +#line 721 "Semaphore.c" } -static void abstract_semaphore_finalize (AbstractSemaphore * obj) { +static void +abstract_semaphore_finalize (AbstractSemaphore * obj) +{ AbstractSemaphore * self; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphore); @@ -687,11 +733,13 @@ static void abstract_semaphore_finalize (AbstractSemaphore * obj) { _vala_clear_GMutex (&self->priv->mutex); #line 28 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" _vala_clear_GCond (&self->priv->monitor); -#line 691 "Semaphore.c" +#line 737 "Semaphore.c" } -GType abstract_semaphore_get_type (void) { +GType +abstract_semaphore_get_type (void) +{ static volatile gsize abstract_semaphore_type_id__volatile = 0; if (g_once_init_enter (&abstract_semaphore_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_abstract_semaphore_init, value_abstract_semaphore_free_value, value_abstract_semaphore_copy_value, value_abstract_semaphore_peek_pointer, "p", value_abstract_semaphore_collect_value, "p", value_abstract_semaphore_lcopy_value }; @@ -705,18 +753,22 @@ GType abstract_semaphore_get_type (void) { } -gpointer abstract_semaphore_ref (gpointer instance) { +gpointer +abstract_semaphore_ref (gpointer instance) +{ AbstractSemaphore * self; self = instance; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_atomic_int_inc (&self->ref_count); #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return instance; -#line 716 "Semaphore.c" +#line 766 "Semaphore.c" } -void abstract_semaphore_unref (gpointer instance) { +void +abstract_semaphore_unref (gpointer instance) +{ AbstractSemaphore * self; self = instance; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -725,29 +777,35 @@ void abstract_semaphore_unref (gpointer instance) { ABSTRACT_SEMAPHORE_GET_CLASS (self)->finalize (self); #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_type_free_instance ((GTypeInstance *) self); -#line 729 "Semaphore.c" +#line 781 "Semaphore.c" } } -Semaphore* semaphore_construct (GType object_type) { +Semaphore* +semaphore_construct (GType object_type) +{ Semaphore* self = NULL; #line 98 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self = (Semaphore*) abstract_semaphore_construct (object_type, ABSTRACT_SEMAPHORE_TYPE_BROADCAST); #line 97 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return self; -#line 740 "Semaphore.c" +#line 794 "Semaphore.c" } -Semaphore* semaphore_new (void) { +Semaphore* +semaphore_new (void) +{ #line 97 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return semaphore_construct (TYPE_SEMAPHORE); -#line 747 "Semaphore.c" +#line 803 "Semaphore.c" } -static AbstractSemaphoreNotifyAction semaphore_real_do_notify (AbstractSemaphore* base) { +static AbstractSemaphoreNotifyAction +semaphore_real_do_notify (AbstractSemaphore* base) +{ Semaphore * self; AbstractSemaphoreNotifyAction result = 0; gboolean _tmp0_; @@ -761,7 +819,7 @@ static AbstractSemaphoreNotifyAction semaphore_real_do_notify (AbstractSemaphore result = ABSTRACT_SEMAPHORE_NOTIFY_ACTION_NONE; #line 103 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return result; -#line 765 "Semaphore.c" +#line 823 "Semaphore.c" } #line 105 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self->priv->passed = TRUE; @@ -769,11 +827,13 @@ static AbstractSemaphoreNotifyAction semaphore_real_do_notify (AbstractSemaphore result = ABSTRACT_SEMAPHORE_NOTIFY_ACTION_SIGNAL; #line 107 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return result; -#line 773 "Semaphore.c" +#line 831 "Semaphore.c" } -static AbstractSemaphoreWaitAction semaphore_real_do_wait (AbstractSemaphore* base) { +static AbstractSemaphoreWaitAction +semaphore_real_do_wait (AbstractSemaphore* base) +{ Semaphore * self; AbstractSemaphoreWaitAction result = 0; AbstractSemaphoreWaitAction _tmp0_ = 0; @@ -786,21 +846,23 @@ static AbstractSemaphoreWaitAction semaphore_real_do_wait (AbstractSemaphore* ba if (_tmp1_) { #line 111 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" _tmp0_ = ABSTRACT_SEMAPHORE_WAIT_ACTION_READY; -#line 790 "Semaphore.c" +#line 850 "Semaphore.c" } else { #line 111 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" _tmp0_ = ABSTRACT_SEMAPHORE_WAIT_ACTION_SLEEP; -#line 794 "Semaphore.c" +#line 854 "Semaphore.c" } #line 111 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" result = _tmp0_; #line 111 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return result; -#line 800 "Semaphore.c" +#line 860 "Semaphore.c" } -static void semaphore_class_init (SemaphoreClass * klass) { +static void +semaphore_class_init (SemaphoreClass * klass) +{ #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" semaphore_parent_class = g_type_class_peek_parent (klass); #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -811,30 +873,36 @@ static void semaphore_class_init (SemaphoreClass * klass) { ((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*) (AbstractSemaphore *)) semaphore_real_do_notify; #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" ((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*) (AbstractSemaphore *)) semaphore_real_do_wait; -#line 815 "Semaphore.c" +#line 877 "Semaphore.c" } -static void semaphore_instance_init (Semaphore * self) { +static void +semaphore_instance_init (Semaphore * self) +{ #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self->priv = SEMAPHORE_GET_PRIVATE (self); #line 95 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self->priv->passed = FALSE; -#line 824 "Semaphore.c" +#line 888 "Semaphore.c" } -static void semaphore_finalize (AbstractSemaphore * obj) { +static void +semaphore_finalize (AbstractSemaphore * obj) +{ Semaphore * self; #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEMAPHORE, Semaphore); #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" ABSTRACT_SEMAPHORE_CLASS (semaphore_parent_class)->finalize (obj); -#line 834 "Semaphore.c" +#line 900 "Semaphore.c" } -GType semaphore_get_type (void) { +GType +semaphore_get_type (void) +{ static volatile gsize semaphore_type_id__volatile = 0; if (g_once_init_enter (&semaphore_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SemaphoreClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) semaphore_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Semaphore), 0, (GInstanceInitFunc) semaphore_instance_init, NULL }; @@ -846,29 +914,33 @@ GType semaphore_get_type (void) { } -CountdownSemaphore* countdown_semaphore_construct (GType object_type, gint total) { +CountdownSemaphore* +countdown_semaphore_construct (GType object_type, + gint total) +{ CountdownSemaphore* self = NULL; - gint _tmp0_; #line 120 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self = (CountdownSemaphore*) abstract_semaphore_construct (object_type, ABSTRACT_SEMAPHORE_TYPE_BROADCAST); #line 122 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - _tmp0_ = total; -#line 122 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - self->priv->total = _tmp0_; + self->priv->total = total; #line 119 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return self; -#line 861 "Semaphore.c" +#line 929 "Semaphore.c" } -CountdownSemaphore* countdown_semaphore_new (gint total) { +CountdownSemaphore* +countdown_semaphore_new (gint total) +{ #line 119 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return countdown_semaphore_construct (TYPE_COUNTDOWN_SEMAPHORE, total); -#line 868 "Semaphore.c" +#line 938 "Semaphore.c" } -static AbstractSemaphoreNotifyAction countdown_semaphore_real_do_notify (AbstractSemaphore* base) { +static AbstractSemaphoreNotifyAction +countdown_semaphore_real_do_notify (AbstractSemaphore* base) +{ CountdownSemaphore * self; AbstractSemaphoreNotifyAction result = 0; gint _tmp0_; @@ -885,7 +957,7 @@ static AbstractSemaphoreNotifyAction countdown_semaphore_real_do_notify (Abstrac _tmp1_ = self->priv->total; #line 126 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" if (_tmp0_ >= _tmp1_) { -#line 889 "Semaphore.c" +#line 961 "Semaphore.c" gint _tmp2_; gint _tmp3_; #line 127 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -894,7 +966,7 @@ static AbstractSemaphoreNotifyAction countdown_semaphore_real_do_notify (Abstrac _tmp3_ = self->priv->total; #line 127 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_critical ("Semaphore.vala:127: CountdownSemaphore overrun: %d/%d", _tmp2_ + 1, _tmp3_); -#line 898 "Semaphore.c" +#line 970 "Semaphore.c" } #line 129 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" _tmp5_ = self->priv->passed; @@ -908,21 +980,23 @@ static AbstractSemaphoreNotifyAction countdown_semaphore_real_do_notify (Abstrac if (_tmp6_ >= _tmp7_) { #line 129 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" _tmp4_ = ABSTRACT_SEMAPHORE_NOTIFY_ACTION_SIGNAL; -#line 912 "Semaphore.c" +#line 984 "Semaphore.c" } else { #line 129 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" _tmp4_ = ABSTRACT_SEMAPHORE_NOTIFY_ACTION_NONE; -#line 916 "Semaphore.c" +#line 988 "Semaphore.c" } #line 129 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" result = _tmp4_; #line 129 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return result; -#line 922 "Semaphore.c" +#line 994 "Semaphore.c" } -static AbstractSemaphoreWaitAction countdown_semaphore_real_do_wait (AbstractSemaphore* base) { +static AbstractSemaphoreWaitAction +countdown_semaphore_real_do_wait (AbstractSemaphore* base) +{ CountdownSemaphore * self; AbstractSemaphoreWaitAction result = 0; AbstractSemaphoreWaitAction _tmp0_ = 0; @@ -938,21 +1012,23 @@ static AbstractSemaphoreWaitAction countdown_semaphore_real_do_wait (AbstractSem if (_tmp1_ < _tmp2_) { #line 133 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" _tmp0_ = ABSTRACT_SEMAPHORE_WAIT_ACTION_SLEEP; -#line 942 "Semaphore.c" +#line 1016 "Semaphore.c" } else { #line 133 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" _tmp0_ = ABSTRACT_SEMAPHORE_WAIT_ACTION_READY; -#line 946 "Semaphore.c" +#line 1020 "Semaphore.c" } #line 133 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" result = _tmp0_; #line 133 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return result; -#line 952 "Semaphore.c" +#line 1026 "Semaphore.c" } -static void countdown_semaphore_class_init (CountdownSemaphoreClass * klass) { +static void +countdown_semaphore_class_init (CountdownSemaphoreClass * klass) +{ #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" countdown_semaphore_parent_class = g_type_class_peek_parent (klass); #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -963,30 +1039,36 @@ static void countdown_semaphore_class_init (CountdownSemaphoreClass * klass) { ((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*) (AbstractSemaphore *)) countdown_semaphore_real_do_notify; #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" ((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*) (AbstractSemaphore *)) countdown_semaphore_real_do_wait; -#line 967 "Semaphore.c" +#line 1043 "Semaphore.c" } -static void countdown_semaphore_instance_init (CountdownSemaphore * self) { +static void +countdown_semaphore_instance_init (CountdownSemaphore * self) +{ #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self->priv = COUNTDOWN_SEMAPHORE_GET_PRIVATE (self); #line 117 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self->priv->passed = 0; -#line 976 "Semaphore.c" +#line 1054 "Semaphore.c" } -static void countdown_semaphore_finalize (AbstractSemaphore * obj) { +static void +countdown_semaphore_finalize (AbstractSemaphore * obj) +{ CountdownSemaphore * self; #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COUNTDOWN_SEMAPHORE, CountdownSemaphore); #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" ABSTRACT_SEMAPHORE_CLASS (countdown_semaphore_parent_class)->finalize (obj); -#line 986 "Semaphore.c" +#line 1066 "Semaphore.c" } -GType countdown_semaphore_get_type (void) { +GType +countdown_semaphore_get_type (void) +{ static volatile gsize countdown_semaphore_type_id__volatile = 0; if (g_once_init_enter (&countdown_semaphore_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CountdownSemaphoreClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) countdown_semaphore_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CountdownSemaphore), 0, (GInstanceInitFunc) countdown_semaphore_instance_init, NULL }; @@ -998,24 +1080,30 @@ GType countdown_semaphore_get_type (void) { } -EventSemaphore* event_semaphore_construct (GType object_type) { +EventSemaphore* +event_semaphore_construct (GType object_type) +{ EventSemaphore* self = NULL; #line 141 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self = (EventSemaphore*) abstract_semaphore_construct (object_type, ABSTRACT_SEMAPHORE_TYPE_BROADCAST); #line 140 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return self; -#line 1008 "Semaphore.c" +#line 1092 "Semaphore.c" } -EventSemaphore* event_semaphore_new (void) { +EventSemaphore* +event_semaphore_new (void) +{ #line 140 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return event_semaphore_construct (TYPE_EVENT_SEMAPHORE); -#line 1015 "Semaphore.c" +#line 1101 "Semaphore.c" } -static AbstractSemaphoreNotifyAction event_semaphore_real_do_notify (AbstractSemaphore* base) { +static AbstractSemaphoreNotifyAction +event_semaphore_real_do_notify (AbstractSemaphore* base) +{ EventSemaphore * self; AbstractSemaphoreNotifyAction result = 0; #line 144 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -1026,11 +1114,13 @@ static AbstractSemaphoreNotifyAction event_semaphore_real_do_notify (AbstractSem result = ABSTRACT_SEMAPHORE_NOTIFY_ACTION_SIGNAL; #line 147 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return result; -#line 1030 "Semaphore.c" +#line 1118 "Semaphore.c" } -static AbstractSemaphoreWaitAction event_semaphore_real_do_wait (AbstractSemaphore* base) { +static AbstractSemaphoreWaitAction +event_semaphore_real_do_wait (AbstractSemaphore* base) +{ EventSemaphore * self; AbstractSemaphoreWaitAction result = 0; AbstractSemaphoreWaitAction _tmp0_ = 0; @@ -1043,21 +1133,23 @@ static AbstractSemaphoreWaitAction event_semaphore_real_do_wait (AbstractSemapho if (_tmp1_) { #line 151 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" _tmp0_ = ABSTRACT_SEMAPHORE_WAIT_ACTION_READY; -#line 1047 "Semaphore.c" +#line 1137 "Semaphore.c" } else { #line 151 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" _tmp0_ = ABSTRACT_SEMAPHORE_WAIT_ACTION_SLEEP; -#line 1051 "Semaphore.c" +#line 1141 "Semaphore.c" } #line 151 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" result = _tmp0_; #line 151 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return result; -#line 1057 "Semaphore.c" +#line 1147 "Semaphore.c" } -static gboolean event_semaphore_real_do_reset (AbstractSemaphore* base) { +static gboolean +event_semaphore_real_do_reset (AbstractSemaphore* base) +{ EventSemaphore * self; gboolean result = FALSE; #line 154 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -1068,11 +1160,13 @@ static gboolean event_semaphore_real_do_reset (AbstractSemaphore* base) { result = TRUE; #line 157 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" return result; -#line 1072 "Semaphore.c" +#line 1164 "Semaphore.c" } -static void event_semaphore_class_init (EventSemaphoreClass * klass) { +static void +event_semaphore_class_init (EventSemaphoreClass * klass) +{ #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" event_semaphore_parent_class = g_type_class_peek_parent (klass); #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -1085,30 +1179,36 @@ static void event_semaphore_class_init (EventSemaphoreClass * klass) { ((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*) (AbstractSemaphore *)) event_semaphore_real_do_wait; #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" ((AbstractSemaphoreClass *) klass)->do_reset = (gboolean (*) (AbstractSemaphore *)) event_semaphore_real_do_reset; -#line 1089 "Semaphore.c" +#line 1183 "Semaphore.c" } -static void event_semaphore_instance_init (EventSemaphore * self) { +static void +event_semaphore_instance_init (EventSemaphore * self) +{ #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self->priv = EVENT_SEMAPHORE_GET_PRIVATE (self); #line 138 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self->priv->fired = FALSE; -#line 1098 "Semaphore.c" +#line 1194 "Semaphore.c" } -static void event_semaphore_finalize (AbstractSemaphore * obj) { +static void +event_semaphore_finalize (AbstractSemaphore * obj) +{ EventSemaphore * self; #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_SEMAPHORE, EventSemaphore); #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" ABSTRACT_SEMAPHORE_CLASS (event_semaphore_parent_class)->finalize (obj); -#line 1108 "Semaphore.c" +#line 1206 "Semaphore.c" } -GType event_semaphore_get_type (void) { +GType +event_semaphore_get_type (void) +{ static volatile gsize event_semaphore_type_id__volatile = 0; if (g_once_init_enter (&event_semaphore_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventSemaphoreClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_semaphore_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventSemaphore), 0, (GInstanceInitFunc) event_semaphore_instance_init, NULL }; @@ -1120,7 +1220,9 @@ GType event_semaphore_get_type (void) { } -static void _vala_clear_GMutex (GMutex * mutex) { +static void +_vala_clear_GMutex (GMutex * mutex) +{ GMutex zero_mutex = { 0 }; if (memcmp (mutex, &zero_mutex, sizeof (GMutex))) { g_mutex_clear (mutex); @@ -1129,7 +1231,9 @@ static void _vala_clear_GMutex (GMutex * mutex) { } -static void _vala_clear_GRecMutex (GRecMutex * mutex) { +static void +_vala_clear_GRecMutex (GRecMutex * mutex) +{ GRecMutex zero_mutex = { 0 }; if (memcmp (mutex, &zero_mutex, sizeof (GRecMutex))) { g_rec_mutex_clear (mutex); @@ -1138,7 +1242,9 @@ static void _vala_clear_GRecMutex (GRecMutex * mutex) { } -static void _vala_clear_GRWLock (GRWLock * mutex) { +static void +_vala_clear_GRWLock (GRWLock * mutex) +{ GRWLock zero_mutex = { 0 }; if (memcmp (mutex, &zero_mutex, sizeof (GRWLock))) { g_rw_lock_clear (mutex); @@ -1147,7 +1253,9 @@ static void _vala_clear_GRWLock (GRWLock * mutex) { } -static void _vala_clear_GCond (GCond * mutex) { +static void +_vala_clear_GCond (GCond * mutex) +{ GCond zero_mutex = { 0 }; if (memcmp (mutex, &zero_mutex, sizeof (GCond))) { g_cond_clear (mutex); diff --git a/src/threads/Threads.c b/src/threads/Threads.c index 04aae36..369492b 100644 --- a/src/threads/Threads.c +++ b/src/threads/Threads.c @@ -1,4 +1,4 @@ -/* Threads.c generated by valac 0.36.6, the Vala compiler +/* Threads.c generated by valac 0.40.4, the Vala compiler * generated from Threads.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include @@ -17,11 +18,15 @@ void threads_init (GError** error); void threads_terminate (void); -void threads_init (GError** error) { +void +threads_init (GError** error) +{ } -void threads_terminate (void) { +void +threads_terminate (void) +{ } diff --git a/src/threads/Workers.c b/src/threads/Workers.c index 0391730..4f250d1 100644 --- a/src/threads/Workers.c +++ b/src/threads/Workers.c @@ -1,4 +1,4 @@ -/* Workers.c generated by valac 0.36.6, the Vala compiler +/* Workers.c generated by valac 0.40.4, the Vala compiler * generated from Workers.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -34,6 +35,11 @@ typedef struct _SortedListPrivate SortedListPrivate; typedef struct _BackgroundJobBatch BackgroundJobBatch; typedef struct _BackgroundJobBatchClass BackgroundJobBatchClass; typedef struct _BackgroundJobBatchPrivate BackgroundJobBatchPrivate; +enum { + BACKGROUND_JOB_BATCH_0_PROPERTY, + BACKGROUND_JOB_BATCH_NUM_PROPERTIES +}; +static GParamSpec* background_job_batch_properties[BACKGROUND_JOB_BATCH_NUM_PROPERTIES]; #define TYPE_BACKGROUND_JOB (background_job_get_type ()) #define BACKGROUND_JOB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_BACKGROUND_JOB, BackgroundJob)) @@ -135,57 +141,92 @@ static gpointer workers_parent_class = NULL; GType sorted_list_get_type (void) G_GNUC_CONST; GType background_job_batch_get_type (void) G_GNUC_CONST; -enum { - BACKGROUND_JOB_BATCH_DUMMY_PROPERTY -}; BackgroundJobBatch* background_job_batch_new (void); BackgroundJobBatch* background_job_batch_construct (GType object_type); -gint64 background_job_priority_comparator (void* a, void* b); -static gint64 _background_job_priority_comparator_comparator (void* a, void* b, gpointer self); -SortedList* sorted_list_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target); -SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target); +gint64 background_job_priority_comparator (void* a, + void* b); +static gint64 _background_job_priority_comparator_comparator (void* a, + void* b, + gpointer self); +SortedList* sorted_list_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + Comparator cmp, + void* cmp_target); +SortedList* sorted_list_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + Comparator cmp, + void* cmp_target); gpointer background_job_ref (gpointer instance); void background_job_unref (gpointer instance); -GParamSpec* param_spec_background_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_background_job (GValue* value, gpointer v_object); -void value_take_background_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_background_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_background_job (GValue* value, + gpointer v_object); +void value_take_background_job (GValue* value, + gpointer v_object); gpointer value_get_background_job (const GValue* value); GType background_job_get_type (void) G_GNUC_CONST; gpointer workers_ref (gpointer instance); void workers_unref (gpointer instance); -GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_workers (GValue* value, gpointer v_object); -void value_take_workers (GValue* value, gpointer v_object); +GParamSpec* param_spec_workers (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_workers (GValue* value, + gpointer v_object); +void value_take_workers (GValue* value, + gpointer v_object); gpointer value_get_workers (const GValue* value); GType workers_get_type (void) G_GNUC_CONST; gpointer abstract_semaphore_ref (gpointer instance); void abstract_semaphore_unref (gpointer instance); -GParamSpec* param_spec_abstract_semaphore (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_abstract_semaphore (GValue* value, gpointer v_object); -void value_take_abstract_semaphore (GValue* value, gpointer v_object); +GParamSpec* param_spec_abstract_semaphore (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_abstract_semaphore (GValue* value, + gpointer v_object); +void value_take_abstract_semaphore (GValue* value, + gpointer v_object); gpointer value_get_abstract_semaphore (const GValue* value); GType abstract_semaphore_get_type (void) G_GNUC_CONST; GType event_semaphore_get_type (void) G_GNUC_CONST; #define WORKERS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_WORKERS, WorkersPrivate)) -enum { - WORKERS_DUMMY_PROPERTY -}; static void _background_job_unref0_ (gpointer var); EventSemaphore* event_semaphore_new (void); EventSemaphore* event_semaphore_construct (GType object_type); #define WORKERS_UNLIMITED_THREADS -1 -Workers* workers_new (guint max_threads, gboolean exclusive); -Workers* workers_construct (GType object_type, guint max_threads, gboolean exclusive); +Workers* workers_new (guint max_threads, + gboolean exclusive); +Workers* workers_construct (GType object_type, + guint max_threads, + gboolean exclusive); void abstract_semaphore_notify (AbstractSemaphore* self); -static void workers_thread_start (Workers* self, void* ignored); -static void _workers_thread_start_gfunc (gpointer data, gpointer self); -guint workers_threads_per_cpu (gint per, gint max); +static void workers_thread_start (Workers* self, + void* ignored); +static void _workers_thread_start_gfunc (gpointer data, + gpointer self); +guint workers_threads_per_cpu (gint per, + gint max); guint workers_thread_per_cpu_minus_one (void); -void workers_enqueue (Workers* self, BackgroundJob* job); +void workers_enqueue (Workers* self, + BackgroundJob* job); gboolean abstract_semaphore_reset (AbstractSemaphore* self); -gint background_job_priority_compare_func (BackgroundJob* a, BackgroundJob* b); -static gint _background_job_priority_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); -void workers_enqueue_many (Workers* self, BackgroundJobBatch* batch); +gint background_job_priority_compare_func (BackgroundJob* a, + BackgroundJob* b); +static gint _background_job_priority_compare_func_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self); +void workers_enqueue_many (Workers* self, + BackgroundJobBatch* batch); void workers_wait_for_empty_queue (Workers* self); void abstract_semaphore_wait (AbstractSemaphore* self); gint workers_get_pending_job_count (Workers* self); @@ -195,44 +236,58 @@ void background_job_internal_notify_completion (BackgroundJob* self); static void workers_finalize (Workers * obj); -static gint64 _background_job_priority_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_background_job_priority_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = background_job_priority_comparator (a, b); #line 10 "/home/jens/Source/shotwell/src/threads/Workers.vala" return result; -#line 204 "Workers.c" +#line 249 "Workers.c" } -BackgroundJobBatch* background_job_batch_construct (GType object_type) { +BackgroundJobBatch* +background_job_batch_construct (GType object_type) +{ BackgroundJobBatch * self = NULL; #line 10 "/home/jens/Source/shotwell/src/threads/Workers.vala" self = (BackgroundJobBatch*) sorted_list_construct (object_type, TYPE_BACKGROUND_JOB, (GBoxedCopyFunc) background_job_ref, (GDestroyNotify) background_job_unref, _background_job_priority_comparator_comparator, NULL); #line 9 "/home/jens/Source/shotwell/src/threads/Workers.vala" return self; -#line 214 "Workers.c" +#line 261 "Workers.c" } -BackgroundJobBatch* background_job_batch_new (void) { +BackgroundJobBatch* +background_job_batch_new (void) +{ #line 9 "/home/jens/Source/shotwell/src/threads/Workers.vala" return background_job_batch_construct (TYPE_BACKGROUND_JOB_BATCH); -#line 221 "Workers.c" +#line 270 "Workers.c" } -static void background_job_batch_class_init (BackgroundJobBatchClass * klass) { +static void +background_job_batch_class_init (BackgroundJobBatchClass * klass) +{ #line 8 "/home/jens/Source/shotwell/src/threads/Workers.vala" background_job_batch_parent_class = g_type_class_peek_parent (klass); -#line 228 "Workers.c" +#line 279 "Workers.c" } -static void background_job_batch_instance_init (BackgroundJobBatch * self) { +static void +background_job_batch_instance_init (BackgroundJobBatch * self) +{ } -GType background_job_batch_get_type (void) { +GType +background_job_batch_get_type (void) +{ static volatile gsize background_job_batch_type_id__volatile = 0; if (g_once_init_enter (&background_job_batch_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (BackgroundJobBatchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) background_job_batch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (BackgroundJobBatch), 0, (GInstanceInitFunc) background_job_batch_instance_init, NULL }; @@ -244,74 +299,70 @@ GType background_job_batch_get_type (void) { } -static void _background_job_unref0_ (gpointer var) { +static void +_background_job_unref0_ (gpointer var) +{ #line 19 "/home/jens/Source/shotwell/src/threads/Workers.vala" (var == NULL) ? NULL : (var = (background_job_unref (var), NULL)); -#line 251 "Workers.c" +#line 308 "Workers.c" } -static void _workers_thread_start_gfunc (gpointer data, gpointer self) { +static void +_workers_thread_start_gfunc (gpointer data, + gpointer self) +{ #line 31 "/home/jens/Source/shotwell/src/threads/Workers.vala" workers_thread_start ((Workers*) self, data); -#line 258 "Workers.c" +#line 318 "Workers.c" } -Workers* workers_construct (GType object_type, guint max_threads, gboolean exclusive) { +Workers* +workers_construct (GType object_type, + guint max_threads, + gboolean exclusive) +{ Workers* self = NULL; gboolean _tmp0_ = FALSE; - guint _tmp1_; - EventSemaphore* _tmp3_; + EventSemaphore* _tmp1_; GError * _inner_error_ = NULL; #line 23 "/home/jens/Source/shotwell/src/threads/Workers.vala" self = (Workers*) g_type_create_instance (object_type); #line 24 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp1_ = max_threads; -#line 24 "/home/jens/Source/shotwell/src/threads/Workers.vala" - if (_tmp1_ <= ((guint) 0)) { -#line 274 "Workers.c" - guint _tmp2_; -#line 24 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp2_ = max_threads; + if (max_threads <= ((guint) 0)) { #line 24 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp0_ = _tmp2_ != ((guint) WORKERS_UNLIMITED_THREADS); -#line 280 "Workers.c" + _tmp0_ = max_threads != ((guint) WORKERS_UNLIMITED_THREADS); +#line 337 "Workers.c" } else { #line 24 "/home/jens/Source/shotwell/src/threads/Workers.vala" _tmp0_ = FALSE; -#line 284 "Workers.c" +#line 341 "Workers.c" } #line 24 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (_tmp0_) { #line 25 "/home/jens/Source/shotwell/src/threads/Workers.vala" max_threads = (guint) 1; -#line 290 "Workers.c" +#line 347 "Workers.c" } #line 28 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp3_ = self->priv->empty_event; + _tmp1_ = self->priv->empty_event; #line 28 "/home/jens/Source/shotwell/src/threads/Workers.vala" - abstract_semaphore_notify (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphore)); -#line 296 "Workers.c" + abstract_semaphore_notify (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphore)); +#line 353 "Workers.c" { - GThreadPool* _tmp4_ = NULL; - guint _tmp5_; - gboolean _tmp6_; - GThreadPool* _tmp7_; - GThreadPool* _tmp8_; -#line 31 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp5_ = max_threads; -#line 31 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp6_ = exclusive; + GThreadPool* _tmp2_ = NULL; + GThreadPool* _tmp3_; + GThreadPool* _tmp4_; #line 31 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp7_ = g_thread_pool_new (_workers_thread_start_gfunc, self, (gint) _tmp5_, _tmp6_, &_inner_error_); + _tmp3_ = g_thread_pool_new (_workers_thread_start_gfunc, self, (gint) max_threads, exclusive, &_inner_error_); #line 31 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp4_ = _tmp7_; + _tmp2_ = _tmp3_; #line 31 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 31 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (_inner_error_->domain == G_THREAD_ERROR) { -#line 315 "Workers.c" +#line 366 "Workers.c" goto __catch8_g_thread_error; } #line 31 "/home/jens/Source/shotwell/src/threads/Workers.vala" @@ -320,36 +371,36 @@ Workers* workers_construct (GType object_type, guint max_threads, gboolean exclu g_clear_error (&_inner_error_); #line 31 "/home/jens/Source/shotwell/src/threads/Workers.vala" return NULL; -#line 324 "Workers.c" +#line 375 "Workers.c" } #line 31 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp8_ = _tmp4_; + _tmp4_ = _tmp2_; #line 31 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp4_ = NULL; + _tmp2_ = NULL; #line 31 "/home/jens/Source/shotwell/src/threads/Workers.vala" _g_thread_pool_free0 (self->priv->thread_pool); #line 31 "/home/jens/Source/shotwell/src/threads/Workers.vala" - self->priv->thread_pool = _tmp8_; + self->priv->thread_pool = _tmp4_; #line 30 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _g_thread_pool_free0 (_tmp4_); -#line 336 "Workers.c" + _g_thread_pool_free0 (_tmp2_); +#line 387 "Workers.c" } goto __finally8; __catch8_g_thread_error: { GError* err = NULL; - const gchar* _tmp9_; + const gchar* _tmp5_; #line 30 "/home/jens/Source/shotwell/src/threads/Workers.vala" err = _inner_error_; #line 30 "/home/jens/Source/shotwell/src/threads/Workers.vala" _inner_error_ = NULL; #line 33 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp9_ = err->message; + _tmp5_ = err->message; #line 33 "/home/jens/Source/shotwell/src/threads/Workers.vala" - g_error ("Workers.vala:33: Unable to create thread pool: %s", _tmp9_); + g_error ("Workers.vala:33: Unable to create thread pool: %s", _tmp5_); #line 30 "/home/jens/Source/shotwell/src/threads/Workers.vala" _g_error_free0 (err); -#line 353 "Workers.c" +#line 404 "Workers.c" } __finally8: #line 30 "/home/jens/Source/shotwell/src/threads/Workers.vala" @@ -360,117 +411,110 @@ Workers* workers_construct (GType object_type, guint max_threads, gboolean exclu g_clear_error (&_inner_error_); #line 30 "/home/jens/Source/shotwell/src/threads/Workers.vala" return NULL; -#line 364 "Workers.c" +#line 415 "Workers.c" } #line 23 "/home/jens/Source/shotwell/src/threads/Workers.vala" return self; -#line 368 "Workers.c" +#line 419 "Workers.c" } -Workers* workers_new (guint max_threads, gboolean exclusive) { +Workers* +workers_new (guint max_threads, + gboolean exclusive) +{ #line 23 "/home/jens/Source/shotwell/src/threads/Workers.vala" return workers_construct (TYPE_WORKERS, max_threads, exclusive); -#line 375 "Workers.c" +#line 429 "Workers.c" } -guint workers_threads_per_cpu (gint per, gint max) { +guint +workers_threads_per_cpu (gint per, + gint max) +{ guint result = 0U; - gint _tmp0_; guint count = 0U; - guint _tmp1_; - gint _tmp2_; - guint _tmp3_ = 0U; - gint _tmp4_; - guint _tmp9_; - guint _tmp10_; -#line 37 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp0_ = per; + guint _tmp0_ = 0U; + guint _tmp3_; + guint _tmp4_; #line 37 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _vala_return_val_if_fail (_tmp0_ > 0, "per > 0", 0U); -#line 38 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp1_ = g_get_num_processors (); + _vala_return_val_if_fail (per > 0, "per > 0", 0U); #line 38 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp2_ = per; -#line 38 "/home/jens/Source/shotwell/src/threads/Workers.vala" - count = _tmp1_ * _tmp2_; -#line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp4_ = max; + count = g_get_num_processors () * per; #line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala" - if (_tmp4_ < 0) { -#line 403 "Workers.c" - guint _tmp5_; + if (max < 0) { +#line 448 "Workers.c" + guint _tmp1_; #line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp5_ = count; + _tmp1_ = count; #line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp3_ = _tmp5_; -#line 409 "Workers.c" + _tmp0_ = _tmp1_; +#line 454 "Workers.c" } else { - guint _tmp6_; - gint _tmp7_; - guint _tmp8_; -#line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp6_ = count; -#line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp7_ = max; + guint _tmp2_; #line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp8_ = CLAMP (_tmp6_, (guint) 0, (guint) _tmp7_); + _tmp2_ = count; #line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp3_ = _tmp8_; -#line 422 "Workers.c" + _tmp0_ = CLAMP (_tmp2_, (guint) 0, (guint) max); +#line 461 "Workers.c" } #line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala" - result = _tmp3_; + result = _tmp0_; #line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp9_ = result; + _tmp3_ = result; #line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _vala_warn_if_fail (_tmp9_ > ((guint) 0), "result > 0"); + _vala_warn_if_fail (_tmp3_ > ((guint) 0), "result > 0"); #line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala" return result; -#line 432 "Workers.c" +#line 471 "Workers.c" } -guint workers_thread_per_cpu_minus_one (void) { +guint +workers_thread_per_cpu_minus_one (void) +{ guint result = 0U; guint _tmp0_; guint _tmp1_; - guint _tmp2_; - guint _tmp3_; -#line 46 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp0_ = g_get_num_processors (); #line 46 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp1_ = CLAMP (_tmp0_ - 1, (guint) 1, (guint) G_MAXINT); + result = CLAMP (g_get_num_processors () - 1, (guint) 1, (guint) G_MAXINT); #line 46 "/home/jens/Source/shotwell/src/threads/Workers.vala" - result = _tmp1_; + _tmp0_ = result; #line 46 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp2_ = result; -#line 46 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _vala_warn_if_fail (_tmp2_ > ((guint) 0), "result > 0"); + _vala_warn_if_fail (_tmp0_ > ((guint) 0), "result > 0"); #line 46 "/home/jens/Source/shotwell/src/threads/Workers.vala" return result; -#line 454 "Workers.c" +#line 489 "Workers.c" } -static gpointer _background_job_ref0 (gpointer self) { +static gpointer +_background_job_ref0 (gpointer self) +{ #line 55 "/home/jens/Source/shotwell/src/threads/Workers.vala" return self ? background_job_ref (self) : NULL; -#line 461 "Workers.c" +#line 498 "Workers.c" } -static gint _background_job_priority_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gint +_background_job_priority_compare_func_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gint result; result = background_job_priority_compare_func ((BackgroundJob*) a, (BackgroundJob*) b); #line 55 "/home/jens/Source/shotwell/src/threads/Workers.vala" return result; -#line 470 "Workers.c" +#line 511 "Workers.c" } -void workers_enqueue (Workers* self, BackgroundJob* job) { +void +workers_enqueue (Workers* self, + BackgroundJob* job) +{ EventSemaphore* _tmp0_; GError * _inner_error_ = NULL; #line 51 "/home/jens/Source/shotwell/src/threads/Workers.vala" @@ -481,41 +525,38 @@ void workers_enqueue (Workers* self, BackgroundJob* job) { _tmp0_ = self->priv->empty_event; #line 52 "/home/jens/Source/shotwell/src/threads/Workers.vala" abstract_semaphore_reset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphore)); -#line 485 "Workers.c" +#line 529 "Workers.c" { GAsyncQueue* _tmp1_; #line 54 "/home/jens/Source/shotwell/src/threads/Workers.vala" _tmp1_ = self->priv->queue; #line 54 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_rec_mutex_lock (&self->priv->__lock_queue); -#line 492 "Workers.c" +#line 536 "Workers.c" { GAsyncQueue* _tmp2_; BackgroundJob* _tmp3_; - BackgroundJob* _tmp4_; - gint _tmp5_; + gint _tmp4_; #line 55 "/home/jens/Source/shotwell/src/threads/Workers.vala" _tmp2_ = self->priv->queue; #line 55 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp3_ = job; + _tmp3_ = _background_job_ref0 (job); #line 55 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp4_ = _background_job_ref0 (_tmp3_); -#line 55 "/home/jens/Source/shotwell/src/threads/Workers.vala" - g_async_queue_push_sorted (_tmp2_, _tmp4_, _background_job_priority_compare_func_gcompare_data_func, NULL); + g_async_queue_push_sorted (_tmp2_, _tmp3_, _background_job_priority_compare_func_gcompare_data_func, NULL); #line 56 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp5_ = self->priv->enqueued; + _tmp4_ = self->priv->enqueued; #line 56 "/home/jens/Source/shotwell/src/threads/Workers.vala" - self->priv->enqueued = _tmp5_ + 1; -#line 510 "Workers.c" + self->priv->enqueued = _tmp4_ + 1; +#line 551 "Workers.c" } __finally9: { - GAsyncQueue* _tmp6_; + GAsyncQueue* _tmp5_; #line 54 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp6_ = self->priv->queue; + _tmp5_ = self->priv->queue; #line 54 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_rec_mutex_unlock (&self->priv->__lock_queue); -#line 519 "Workers.c" +#line 560 "Workers.c" } #line 54 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -525,23 +566,20 @@ void workers_enqueue (Workers* self, BackgroundJob* job) { g_clear_error (&_inner_error_); #line 54 "/home/jens/Source/shotwell/src/threads/Workers.vala" return; -#line 529 "Workers.c" +#line 570 "Workers.c" } } { - GThreadPool* _tmp7_; - BackgroundJob* _tmp8_; -#line 60 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp7_ = self->priv->thread_pool; + GThreadPool* _tmp6_; #line 60 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp8_ = job; + _tmp6_ = self->priv->thread_pool; #line 60 "/home/jens/Source/shotwell/src/threads/Workers.vala" - g_thread_pool_push (_tmp7_, _tmp8_, &_inner_error_); + g_thread_pool_push (_tmp6_, job, &_inner_error_); #line 60 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 60 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (_inner_error_->domain == G_THREAD_ERROR) { -#line 545 "Workers.c" +#line 583 "Workers.c" goto __catch10_g_thread_error; } #line 60 "/home/jens/Source/shotwell/src/threads/Workers.vala" @@ -550,28 +588,28 @@ void workers_enqueue (Workers* self, BackgroundJob* job) { g_clear_error (&_inner_error_); #line 60 "/home/jens/Source/shotwell/src/threads/Workers.vala" return; -#line 554 "Workers.c" +#line 592 "Workers.c" } } goto __finally10; __catch10_g_thread_error: { GError* err = NULL; - GError* _tmp9_; - const gchar* _tmp10_; + GError* _tmp7_; + const gchar* _tmp8_; #line 59 "/home/jens/Source/shotwell/src/threads/Workers.vala" err = _inner_error_; #line 59 "/home/jens/Source/shotwell/src/threads/Workers.vala" _inner_error_ = NULL; #line 64 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp9_ = err; + _tmp7_ = err; #line 64 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp10_ = _tmp9_->message; + _tmp8_ = _tmp7_->message; #line 64 "/home/jens/Source/shotwell/src/threads/Workers.vala" - g_warning ("Workers.vala:64: Unable to create worker thread: %s", _tmp10_); + g_warning ("Workers.vala:64: Unable to create worker thread: %s", _tmp8_); #line 59 "/home/jens/Source/shotwell/src/threads/Workers.vala" _g_error_free0 (err); -#line 575 "Workers.c" +#line 613 "Workers.c" } __finally10: #line 59 "/home/jens/Source/shotwell/src/threads/Workers.vala" @@ -582,68 +620,67 @@ void workers_enqueue (Workers* self, BackgroundJob* job) { g_clear_error (&_inner_error_); #line 59 "/home/jens/Source/shotwell/src/threads/Workers.vala" return; -#line 586 "Workers.c" +#line 624 "Workers.c" } } -void workers_enqueue_many (Workers* self, BackgroundJobBatch* batch) { +void +workers_enqueue_many (Workers* self, + BackgroundJobBatch* batch) +{ #line 68 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_return_if_fail (IS_WORKERS (self)); #line 68 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_return_if_fail (IS_BACKGROUND_JOB_BATCH (batch)); -#line 596 "Workers.c" +#line 637 "Workers.c" { GeeIterator* _job_it = NULL; - BackgroundJobBatch* _tmp0_; - GeeIterator* _tmp1_; -#line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp0_ = batch; + GeeIterator* _tmp0_; #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (batch, GEE_TYPE_ITERABLE, GeeIterable)); #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _job_it = _tmp1_; + _job_it = _tmp0_; #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala" while (TRUE) { -#line 609 "Workers.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 647 "Workers.c" + GeeIterator* _tmp1_; BackgroundJob* job = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - BackgroundJob* _tmp6_; -#line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp2_ = _job_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + BackgroundJob* _tmp4_; #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _job_it; #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala" break; -#line 624 "Workers.c" +#line 659 "Workers.c" } #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp4_ = _job_it; + _tmp2_ = _job_it; #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala" - job = (BackgroundJob*) _tmp5_; + job = (BackgroundJob*) _tmp3_; #line 70 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp6_ = job; + _tmp4_ = job; #line 70 "/home/jens/Source/shotwell/src/threads/Workers.vala" - workers_enqueue (self, _tmp6_); + workers_enqueue (self, _tmp4_); #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala" _background_job_unref0 (job); -#line 638 "Workers.c" +#line 673 "Workers.c" } #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala" _g_object_unref0 (_job_it); -#line 642 "Workers.c" +#line 677 "Workers.c" } } -void workers_wait_for_empty_queue (Workers* self) { +void +workers_wait_for_empty_queue (Workers* self) +{ EventSemaphore* _tmp0_; #line 73 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_return_if_fail (IS_WORKERS (self)); @@ -651,16 +688,18 @@ void workers_wait_for_empty_queue (Workers* self) { _tmp0_ = self->priv->empty_event; #line 74 "/home/jens/Source/shotwell/src/threads/Workers.vala" abstract_semaphore_wait (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphore)); -#line 655 "Workers.c" +#line 692 "Workers.c" } -gint workers_get_pending_job_count (Workers* self) { +gint +workers_get_pending_job_count (Workers* self) +{ gint result = 0; GError * _inner_error_ = NULL; #line 78 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_return_val_if_fail (IS_WORKERS (self), 0); -#line 664 "Workers.c" +#line 703 "Workers.c" { GAsyncQueue* _tmp0_; gint _tmp4_ = 0; @@ -668,25 +707,25 @@ gint workers_get_pending_job_count (Workers* self) { _tmp0_ = self->priv->queue; #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_rec_mutex_lock (&self->priv->__lock_queue); -#line 672 "Workers.c" +#line 711 "Workers.c" { gint _tmp1_; #line 80 "/home/jens/Source/shotwell/src/threads/Workers.vala" _tmp1_ = self->priv->enqueued; #line 80 "/home/jens/Source/shotwell/src/threads/Workers.vala" result = _tmp1_; -#line 679 "Workers.c" +#line 718 "Workers.c" { GAsyncQueue* _tmp2_; #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala" _tmp2_ = self->priv->queue; #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_rec_mutex_unlock (&self->priv->__lock_queue); -#line 686 "Workers.c" +#line 725 "Workers.c" } #line 80 "/home/jens/Source/shotwell/src/threads/Workers.vala" return result; -#line 690 "Workers.c" +#line 729 "Workers.c" } __finally11: { @@ -695,7 +734,7 @@ gint workers_get_pending_job_count (Workers* self) { _tmp3_ = self->priv->queue; #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_rec_mutex_unlock (&self->priv->__lock_queue); -#line 699 "Workers.c" +#line 738 "Workers.c" } #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -703,26 +742,28 @@ gint workers_get_pending_job_count (Workers* self) { g_clear_error (&_inner_error_); #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala" return _tmp4_; -#line 707 "Workers.c" +#line 746 "Workers.c" } } -static void workers_thread_start (Workers* self, void* ignored) { +static void +workers_thread_start (Workers* self, + void* ignored) +{ BackgroundJob* job = NULL; gboolean empty = FALSE; - gboolean _tmp7_; GError * _inner_error_ = NULL; #line 84 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_return_if_fail (IS_WORKERS (self)); -#line 719 "Workers.c" +#line 760 "Workers.c" { GAsyncQueue* _tmp0_; #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala" _tmp0_ = self->priv->queue; #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_rec_mutex_lock (&self->priv->__lock_queue); -#line 726 "Workers.c" +#line 767 "Workers.c" { GAsyncQueue* _tmp1_; gpointer _tmp2_; @@ -751,7 +792,7 @@ static void workers_thread_start (Workers* self, void* ignored) { _tmp5_ = self->priv->enqueued; #line 92 "/home/jens/Source/shotwell/src/threads/Workers.vala" empty = _tmp5_ == 0; -#line 755 "Workers.c" +#line 796 "Workers.c" } __finally12: { @@ -760,7 +801,7 @@ static void workers_thread_start (Workers* self, void* ignored) { _tmp6_ = self->priv->queue; #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_rec_mutex_unlock (&self->priv->__lock_queue); -#line 764 "Workers.c" +#line 805 "Workers.c" } #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -772,133 +813,156 @@ static void workers_thread_start (Workers* self, void* ignored) { g_clear_error (&_inner_error_); #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala" return; -#line 776 "Workers.c" +#line 817 "Workers.c" } } #line 95 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp7_ = background_job_is_cancelled (job); -#line 95 "/home/jens/Source/shotwell/src/threads/Workers.vala" - if (!_tmp7_) { + if (!background_job_is_cancelled (job)) { #line 96 "/home/jens/Source/shotwell/src/threads/Workers.vala" background_job_execute (job); -#line 785 "Workers.c" +#line 824 "Workers.c" } #line 98 "/home/jens/Source/shotwell/src/threads/Workers.vala" background_job_internal_notify_completion (job); #line 100 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (empty) { -#line 791 "Workers.c" - EventSemaphore* _tmp8_; +#line 830 "Workers.c" + EventSemaphore* _tmp7_; #line 101 "/home/jens/Source/shotwell/src/threads/Workers.vala" - _tmp8_ = self->priv->empty_event; + _tmp7_ = self->priv->empty_event; #line 101 "/home/jens/Source/shotwell/src/threads/Workers.vala" - abstract_semaphore_notify (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphore)); -#line 797 "Workers.c" + abstract_semaphore_notify (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphore)); +#line 836 "Workers.c" } #line 84 "/home/jens/Source/shotwell/src/threads/Workers.vala" _background_job_unref0 (job); -#line 801 "Workers.c" +#line 840 "Workers.c" } -static void value_workers_init (GValue* value) { +static void +value_workers_init (GValue* value) +{ #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" value->data[0].v_pointer = NULL; -#line 808 "Workers.c" +#line 849 "Workers.c" } -static void value_workers_free_value (GValue* value) { +static void +value_workers_free_value (GValue* value) +{ #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (value->data[0].v_pointer) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" workers_unref (value->data[0].v_pointer); -#line 817 "Workers.c" +#line 860 "Workers.c" } } -static void value_workers_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_workers_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (src_value->data[0].v_pointer) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" dest_value->data[0].v_pointer = workers_ref (src_value->data[0].v_pointer); -#line 827 "Workers.c" +#line 873 "Workers.c" } else { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" dest_value->data[0].v_pointer = NULL; -#line 831 "Workers.c" +#line 877 "Workers.c" } } -static gpointer value_workers_peek_pointer (const GValue* value) { +static gpointer +value_workers_peek_pointer (const GValue* value) +{ #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" return value->data[0].v_pointer; -#line 839 "Workers.c" +#line 887 "Workers.c" } -static gchar* value_workers_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_workers_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (collect_values[0].v_pointer) { -#line 846 "Workers.c" +#line 899 "Workers.c" Workers * object; object = collect_values[0].v_pointer; #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (object->parent_instance.g_class == NULL) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 853 "Workers.c" +#line 906 "Workers.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 857 "Workers.c" +#line 910 "Workers.c" } #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" value->data[0].v_pointer = workers_ref (object); -#line 861 "Workers.c" +#line 914 "Workers.c" } else { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" value->data[0].v_pointer = NULL; -#line 865 "Workers.c" +#line 918 "Workers.c" } #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" return NULL; -#line 869 "Workers.c" +#line 922 "Workers.c" } -static gchar* value_workers_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_workers_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ Workers ** object_p; object_p = collect_values[0].v_pointer; #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (!object_p) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 880 "Workers.c" +#line 938 "Workers.c" } #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (!value->data[0].v_pointer) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" *object_p = NULL; -#line 886 "Workers.c" +#line 944 "Workers.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" *object_p = value->data[0].v_pointer; -#line 890 "Workers.c" +#line 948 "Workers.c" } else { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" *object_p = workers_ref (value->data[0].v_pointer); -#line 894 "Workers.c" +#line 952 "Workers.c" } #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" return NULL; -#line 898 "Workers.c" +#line 956 "Workers.c" } -GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_workers (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecWorkers* spec; #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_WORKERS), NULL); @@ -908,20 +972,25 @@ GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" return G_PARAM_SPEC (spec); -#line 912 "Workers.c" +#line 976 "Workers.c" } -gpointer value_get_workers (const GValue* value) { +gpointer +value_get_workers (const GValue* value) +{ #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_WORKERS), NULL); #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" return value->data[0].v_pointer; -#line 921 "Workers.c" +#line 987 "Workers.c" } -void value_set_workers (GValue* value, gpointer v_object) { +void +value_set_workers (GValue* value, + gpointer v_object) +{ Workers * old; #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_WORKERS)); @@ -937,22 +1006,25 @@ void value_set_workers (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" workers_ref (value->data[0].v_pointer); -#line 941 "Workers.c" +#line 1010 "Workers.c" } else { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" value->data[0].v_pointer = NULL; -#line 945 "Workers.c" +#line 1014 "Workers.c" } #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (old) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" workers_unref (old); -#line 951 "Workers.c" +#line 1020 "Workers.c" } } -void value_take_workers (GValue* value, gpointer v_object) { +void +value_take_workers (GValue* value, + gpointer v_object) +{ Workers * old; #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_WORKERS)); @@ -966,33 +1038,37 @@ void value_take_workers (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" value->data[0].v_pointer = v_object; -#line 970 "Workers.c" +#line 1042 "Workers.c" } else { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" value->data[0].v_pointer = NULL; -#line 974 "Workers.c" +#line 1046 "Workers.c" } #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (old) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" workers_unref (old); -#line 980 "Workers.c" +#line 1052 "Workers.c" } } -static void workers_class_init (WorkersClass * klass) { +static void +workers_class_init (WorkersClass * klass) +{ #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" workers_parent_class = g_type_class_peek_parent (klass); #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" ((WorkersClass *) klass)->finalize = workers_finalize; #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_type_class_add_private (klass, sizeof (WorkersPrivate)); -#line 992 "Workers.c" +#line 1066 "Workers.c" } -static void workers_instance_init (Workers * self) { +static void +workers_instance_init (Workers * self) +{ GAsyncQueue* _tmp0_; EventSemaphore* _tmp1_; #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" @@ -1011,11 +1087,13 @@ static void workers_instance_init (Workers * self) { self->priv->enqueued = 0; #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" self->ref_count = 1; -#line 1015 "Workers.c" +#line 1091 "Workers.c" } -static void workers_finalize (Workers * obj) { +static void +workers_finalize (Workers * obj) +{ Workers * self; #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_WORKERS, Workers); @@ -1029,11 +1107,13 @@ static void workers_finalize (Workers * obj) { _g_async_queue_unref0 (self->priv->queue); #line 20 "/home/jens/Source/shotwell/src/threads/Workers.vala" _abstract_semaphore_unref0 (self->priv->empty_event); -#line 1033 "Workers.c" +#line 1111 "Workers.c" } -GType workers_get_type (void) { +GType +workers_get_type (void) +{ static volatile gsize workers_type_id__volatile = 0; if (g_once_init_enter (&workers_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_workers_init, value_workers_free_value, value_workers_copy_value, value_workers_peek_pointer, "p", value_workers_collect_value, "p", value_workers_lcopy_value }; @@ -1047,18 +1127,22 @@ GType workers_get_type (void) { } -gpointer workers_ref (gpointer instance) { +gpointer +workers_ref (gpointer instance) +{ Workers * self; self = instance; #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_atomic_int_inc (&self->ref_count); #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" return instance; -#line 1058 "Workers.c" +#line 1140 "Workers.c" } -void workers_unref (gpointer instance) { +void +workers_unref (gpointer instance) +{ Workers * self; self = instance; #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" @@ -1067,7 +1151,7 @@ void workers_unref (gpointer instance) { WORKERS_GET_CLASS (self)->finalize (self); #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1071 "Workers.c" +#line 1155 "Workers.c" } } diff --git a/src/unit/Unit.c b/src/unit/Unit.c index 6ca2115..263bdf9 100644 --- a/src/unit/Unit.c +++ b/src/unit/Unit.c @@ -1,4 +1,4 @@ -/* Unit.c generated by valac 0.36.6, the Vala compiler +/* Unit.c generated by valac 0.40.4, the Vala compiler * generated from Unit.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include @@ -17,11 +18,15 @@ void unit_init (GError** error); void unit_terminate (void); -void unit_init (GError** error) { +void +unit_init (GError** error) +{ } -void unit_terminate (void) { +void +unit_terminate (void) +{ } diff --git a/src/util/KeyValueMap.c b/src/util/KeyValueMap.c index 210929f..f1405c4 100644 --- a/src/util/KeyValueMap.c +++ b/src/util/KeyValueMap.c @@ -1,4 +1,4 @@ -/* KeyValueMap.c generated by valac 0.36.6, the Vala compiler +/* KeyValueMap.c generated by valac 0.40.4, the Vala compiler * generated from KeyValueMap.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -63,64 +64,98 @@ static gpointer key_value_map_parent_class = NULL; gpointer key_value_map_ref (gpointer instance); void key_value_map_unref (gpointer instance); -GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_key_value_map (GValue* value, gpointer v_object); -void value_take_key_value_map (GValue* value, gpointer v_object); +GParamSpec* param_spec_key_value_map (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_key_value_map (GValue* value, + gpointer v_object); +void value_take_key_value_map (GValue* value, + gpointer v_object); gpointer value_get_key_value_map (const GValue* value); GType key_value_map_get_type (void) G_GNUC_CONST; #define KEY_VALUE_MAP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_KEY_VALUE_MAP, KeyValueMapPrivate)) -enum { - KEY_VALUE_MAP_DUMMY_PROPERTY -}; KeyValueMap* key_value_map_new (const gchar* group); -KeyValueMap* key_value_map_construct (GType object_type, const gchar* group); +KeyValueMap* key_value_map_construct (GType object_type, + const gchar* group); KeyValueMap* key_value_map_copy (KeyValueMap* self); gchar* key_value_map_get_group (KeyValueMap* self); GeeSet* key_value_map_get_keys (KeyValueMap* self); -gboolean key_value_map_has_key (KeyValueMap* self, const gchar* key); -void key_value_map_set_string (KeyValueMap* self, const gchar* key, const gchar* value); -void key_value_map_set_int (KeyValueMap* self, const gchar* key, gint value); -void key_value_map_set_double (KeyValueMap* self, const gchar* key, gdouble value); -void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value); -void key_value_map_set_bool (KeyValueMap* self, const gchar* key, gboolean value); -gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gchar* def); -gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def); -gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble def); -gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def); -gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean def); -void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def, GdkPoint* result); -void key_value_map_set_point (KeyValueMap* self, const gchar* key, GdkPoint* point); +gboolean key_value_map_has_key (KeyValueMap* self, + const gchar* key); +void key_value_map_set_string (KeyValueMap* self, + const gchar* key, + const gchar* value); +void key_value_map_set_int (KeyValueMap* self, + const gchar* key, + gint value); +void key_value_map_set_double (KeyValueMap* self, + const gchar* key, + gdouble value); +void key_value_map_set_float (KeyValueMap* self, + const gchar* key, + gfloat value); +void key_value_map_set_bool (KeyValueMap* self, + const gchar* key, + gboolean value); +gchar* key_value_map_get_string (KeyValueMap* self, + const gchar* key, + const gchar* def); +gint key_value_map_get_int (KeyValueMap* self, + const gchar* key, + gint def); +gdouble key_value_map_get_double (KeyValueMap* self, + const gchar* key, + gdouble def); +gfloat key_value_map_get_float (KeyValueMap* self, + const gchar* key, + gfloat def); +gboolean key_value_map_get_bool (KeyValueMap* self, + const gchar* key, + gboolean def); +void key_value_map_get_point (KeyValueMap* self, + const gchar* key, + GdkPoint* def, + GdkPoint* result); +void key_value_map_set_point (KeyValueMap* self, + const gchar* key, + GdkPoint* point); static void key_value_map_finalize (KeyValueMap * obj); -KeyValueMap* key_value_map_construct (GType object_type, const gchar* group) { +KeyValueMap* +key_value_map_construct (GType object_type, + const gchar* group) +{ KeyValueMap* self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; #line 11 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" self = (KeyValueMap*) g_type_create_instance (object_type); #line 12 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp0_ = group; -#line 12 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (group); #line 12 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_free0 (self->priv->group); #line 12 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - self->priv->group = _tmp1_; + self->priv->group = _tmp0_; #line 11 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return self; -#line 113 "KeyValueMap.c" +#line 144 "KeyValueMap.c" } -KeyValueMap* key_value_map_new (const gchar* group) { +KeyValueMap* +key_value_map_new (const gchar* group) +{ #line 11 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return key_value_map_construct (TYPE_KEY_VALUE_MAP, group); -#line 120 "KeyValueMap.c" +#line 153 "KeyValueMap.c" } -KeyValueMap* key_value_map_copy (KeyValueMap* self) { +KeyValueMap* +key_value_map_copy (KeyValueMap* self) +{ KeyValueMap* result = NULL; KeyValueMap* clone = NULL; const gchar* _tmp0_; @@ -131,7 +166,7 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) { _tmp1_ = key_value_map_new (_tmp0_); #line 16 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" clone = _tmp1_; -#line 135 "KeyValueMap.c" +#line 170 "KeyValueMap.c" { GeeIterator* _key_it = NULL; GeeHashMap* _tmp2_; @@ -158,70 +193,69 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) { _key_it = _tmp7_; #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" while (TRUE) { -#line 162 "KeyValueMap.c" +#line 197 "KeyValueMap.c" GeeIterator* _tmp8_; - gboolean _tmp9_; gchar* key = NULL; - GeeIterator* _tmp10_; - gpointer _tmp11_; - KeyValueMap* _tmp12_; - GeeHashMap* _tmp13_; - const gchar* _tmp14_; - GeeHashMap* _tmp15_; - const gchar* _tmp16_; - gpointer _tmp17_; - gchar* _tmp18_; + GeeIterator* _tmp9_; + gpointer _tmp10_; + KeyValueMap* _tmp11_; + GeeHashMap* _tmp12_; + const gchar* _tmp13_; + GeeHashMap* _tmp14_; + const gchar* _tmp15_; + gpointer _tmp16_; + gchar* _tmp17_; #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp8_ = _key_it; #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp9_ = gee_iterator_next (_tmp8_); -#line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - if (!_tmp9_) { + if (!gee_iterator_next (_tmp8_)) { #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" break; -#line 183 "KeyValueMap.c" +#line 215 "KeyValueMap.c" } #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp10_ = _key_it; + _tmp9_ = _key_it; #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp11_ = gee_iterator_get (_tmp10_); + _tmp10_ = gee_iterator_get (_tmp9_); #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - key = (gchar*) _tmp11_; + key = (gchar*) _tmp10_; #line 18 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp12_ = clone; + _tmp11_ = clone; #line 18 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp13_ = _tmp12_->priv->map; + _tmp12_ = _tmp11_->priv->map; #line 18 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp14_ = key; + _tmp13_ = key; #line 18 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp15_ = self->priv->map; + _tmp14_ = self->priv->map; #line 18 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp16_ = key; + _tmp15_ = key; #line 18 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp17_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_); + _tmp16_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_); #line 18 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp18_ = (gchar*) _tmp17_; + _tmp17_ = (gchar*) _tmp16_; #line 18 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp14_, _tmp18_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, _tmp17_); #line 18 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp17_); #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_free0 (key); -#line 211 "KeyValueMap.c" +#line 243 "KeyValueMap.c" } #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_object_unref0 (_key_it); -#line 215 "KeyValueMap.c" +#line 247 "KeyValueMap.c" } #line 20 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" result = clone; #line 20 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return result; -#line 221 "KeyValueMap.c" +#line 253 "KeyValueMap.c" } -gchar* key_value_map_get_group (KeyValueMap* self) { +gchar* +key_value_map_get_group (KeyValueMap* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -233,11 +267,13 @@ gchar* key_value_map_get_group (KeyValueMap* self) { result = _tmp1_; #line 24 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return result; -#line 237 "KeyValueMap.c" +#line 271 "KeyValueMap.c" } -GeeSet* key_value_map_get_keys (KeyValueMap* self) { +GeeSet* +key_value_map_get_keys (KeyValueMap* self) +{ GeeSet* result = NULL; GeeHashMap* _tmp0_; GeeSet* _tmp1_; @@ -252,80 +288,69 @@ GeeSet* key_value_map_get_keys (KeyValueMap* self) { result = _tmp2_; #line 28 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return result; -#line 256 "KeyValueMap.c" +#line 292 "KeyValueMap.c" } -gboolean key_value_map_has_key (KeyValueMap* self, const gchar* key) { +gboolean +key_value_map_has_key (KeyValueMap* self, + const gchar* key) +{ gboolean result = FALSE; GeeHashMap* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; #line 32 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = self->priv->map; #line 32 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp1_ = key; -#line 32 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 32 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - result = _tmp2_; + result = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key); #line 32 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return result; -#line 275 "KeyValueMap.c" +#line 308 "KeyValueMap.c" } -void key_value_map_set_string (KeyValueMap* self, const gchar* key, const gchar* value) { - const gchar* _tmp0_; - GeeHashMap* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; -#line 36 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp0_ = key; +void +key_value_map_set_string (KeyValueMap* self, + const gchar* key, + const gchar* value) +{ + GeeHashMap* _tmp0_; #line 36 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _vala_assert (_tmp0_ != NULL, "key != null"); -#line 38 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp1_ = self->priv->map; + _vala_assert (key != NULL, "key != null"); #line 38 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp2_ = key; -#line 38 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp3_ = value; + _tmp0_ = self->priv->map; #line 38 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp3_); -#line 296 "KeyValueMap.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key, value); +#line 324 "KeyValueMap.c" } -void key_value_map_set_int (KeyValueMap* self, const gchar* key, gint value) { - const gchar* _tmp0_; - GeeHashMap* _tmp1_; - const gchar* _tmp2_; - gint _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; -#line 42 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp0_ = key; +void +key_value_map_set_int (KeyValueMap* self, + const gchar* key, + gint value) +{ + GeeHashMap* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; #line 42 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _vala_assert (_tmp0_ != NULL, "key != null"); + _vala_assert (key != NULL, "key != null"); #line 44 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp1_ = self->priv->map; -#line 44 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp2_ = key; -#line 44 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp3_ = value; + _tmp0_ = self->priv->map; #line 44 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp4_ = g_strdup_printf ("%i", _tmp3_); + _tmp1_ = g_strdup_printf ("%i", value); #line 44 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 44 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp5_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key, _tmp2_); #line 44 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _g_free0 (_tmp5_); -#line 325 "KeyValueMap.c" + _g_free0 (_tmp2_); +#line 348 "KeyValueMap.c" } -static gchar* double_to_string (gdouble self) { +static gchar* +double_to_string (gdouble self) +{ gchar* result = NULL; gchar* _tmp0_; gchar* _tmp1_; @@ -333,620 +358,608 @@ static gchar* double_to_string (gdouble self) { const gchar* _tmp2_; gchar* _tmp3_; gchar* _tmp4_; -#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 883 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE); -#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 883 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 883 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1__length1 = G_ASCII_DTOSTR_BUF_SIZE; -#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 883 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp2_ = g_ascii_dtostr (_tmp1_, G_ASCII_DTOSTR_BUF_SIZE, self); -#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 883 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp3_ = g_strdup (_tmp2_); -#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 883 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 883 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = (g_free (_tmp1_), NULL); -#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 883 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _tmp4_; -#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 883 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 355 "KeyValueMap.c" +#line 380 "KeyValueMap.c" } -void key_value_map_set_double (KeyValueMap* self, const gchar* key, gdouble value) { - const gchar* _tmp0_; - GeeHashMap* _tmp1_; - const gchar* _tmp2_; - gdouble _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; -#line 48 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp0_ = key; +void +key_value_map_set_double (KeyValueMap* self, + const gchar* key, + gdouble value) +{ + GeeHashMap* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; #line 48 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _vala_assert (_tmp0_ != NULL, "key != null"); -#line 50 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp1_ = self->priv->map; + _vala_assert (key != NULL, "key != null"); #line 50 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp2_ = key; -#line 50 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp3_ = value; + _tmp0_ = self->priv->map; #line 50 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp4_ = double_to_string (_tmp3_); + _tmp1_ = double_to_string (value); #line 50 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 50 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp5_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key, _tmp2_); #line 50 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _g_free0 (_tmp5_); -#line 384 "KeyValueMap.c" + _g_free0 (_tmp2_); +#line 404 "KeyValueMap.c" } -void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value) { - const gchar* _tmp0_; - GeeHashMap* _tmp1_; - const gchar* _tmp2_; - gfloat _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; -#line 54 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp0_ = key; +void +key_value_map_set_float (KeyValueMap* self, + const gchar* key, + gfloat value) +{ + GeeHashMap* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; #line 54 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _vala_assert (_tmp0_ != NULL, "key != null"); -#line 56 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp1_ = self->priv->map; + _vala_assert (key != NULL, "key != null"); #line 56 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp2_ = key; -#line 56 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp3_ = value; + _tmp0_ = self->priv->map; #line 56 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp4_ = g_strdup_printf ("%g", _tmp3_); + _tmp1_ = g_strdup_printf ("%g", value); #line 56 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 56 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp5_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key, _tmp2_); #line 56 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _g_free0 (_tmp5_); -#line 413 "KeyValueMap.c" + _g_free0 (_tmp2_); +#line 428 "KeyValueMap.c" } -static gchar* bool_to_string (gboolean self) { +static gchar* +bool_to_string (gboolean self) +{ gchar* result = NULL; -#line 37 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 37 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (self) { -#line 421 "KeyValueMap.c" +#line 438 "KeyValueMap.c" gchar* _tmp0_; -#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 38 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_strdup ("true"); -#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 38 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _tmp0_; -#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 38 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 429 "KeyValueMap.c" +#line 446 "KeyValueMap.c" } else { gchar* _tmp1_; -#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 40 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = g_strdup ("false"); -#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 40 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _tmp1_; -#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 40 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 438 "KeyValueMap.c" +#line 455 "KeyValueMap.c" } } -void key_value_map_set_bool (KeyValueMap* self, const gchar* key, gboolean value) { - const gchar* _tmp0_; - GeeHashMap* _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; -#line 60 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp0_ = key; +void +key_value_map_set_bool (KeyValueMap* self, + const gchar* key, + gboolean value) +{ + GeeHashMap* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; #line 60 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _vala_assert (_tmp0_ != NULL, "key != null"); -#line 62 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp1_ = self->priv->map; -#line 62 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp2_ = key; + _vala_assert (key != NULL, "key != null"); #line 62 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp3_ = value; + _tmp0_ = self->priv->map; #line 62 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp4_ = bool_to_string (_tmp3_); + _tmp1_ = bool_to_string (value); #line 62 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 62 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp5_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key, _tmp2_); #line 62 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _g_free0 (_tmp5_); -#line 468 "KeyValueMap.c" + _g_free0 (_tmp2_); +#line 480 "KeyValueMap.c" } -gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gchar* def) { +gchar* +key_value_map_get_string (KeyValueMap* self, + const gchar* key, + const gchar* def) +{ gchar* result = NULL; gchar* value = NULL; GeeHashMap* _tmp0_; - const gchar* _tmp1_; - gpointer _tmp2_; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_; - gchar* _tmp7_; + gpointer _tmp1_; + const gchar* _tmp2_ = NULL; + const gchar* _tmp3_; + gchar* _tmp5_; #line 66 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = self->priv->map; #line 66 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp1_ = key; -#line 66 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key); #line 66 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - value = (gchar*) _tmp2_; + value = (gchar*) _tmp1_; #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp4_ = value; + _tmp3_ = value; #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - if (_tmp4_ != NULL) { -#line 493 "KeyValueMap.c" - const gchar* _tmp5_; + if (_tmp3_ != NULL) { +#line 506 "KeyValueMap.c" + const gchar* _tmp4_; #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp5_ = value; + _tmp4_ = value; #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp3_ = _tmp5_; -#line 499 "KeyValueMap.c" + _tmp2_ = _tmp4_; +#line 512 "KeyValueMap.c" } else { - const gchar* _tmp6_; #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp6_ = def; -#line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp3_ = _tmp6_; -#line 506 "KeyValueMap.c" + _tmp2_ = def; +#line 516 "KeyValueMap.c" } #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp7_ = g_strdup (_tmp3_); + _tmp5_ = g_strdup (_tmp2_); #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - result = _tmp7_; + result = _tmp5_; #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_free0 (value); #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return result; -#line 516 "KeyValueMap.c" +#line 526 "KeyValueMap.c" } -gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) { +gint +key_value_map_get_int (KeyValueMap* self, + const gchar* key, + gint def) +{ gint result = 0; gchar* value = NULL; GeeHashMap* _tmp0_; - const gchar* _tmp1_; - gpointer _tmp2_; - gint _tmp3_ = 0; - const gchar* _tmp4_; + gpointer _tmp1_; + gint _tmp2_ = 0; + const gchar* _tmp3_; #line 72 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = self->priv->map; #line 72 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp1_ = key; -#line 72 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key); #line 72 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - value = (gchar*) _tmp2_; + value = (gchar*) _tmp1_; #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp4_ = value; -#line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - if (_tmp4_ != NULL) { -#line 540 "KeyValueMap.c" - const gchar* _tmp5_; - gint _tmp6_; + _tmp3_ = value; #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp5_ = value; + if (_tmp3_ != NULL) { +#line 551 "KeyValueMap.c" + const gchar* _tmp4_; #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp6_ = atoi (_tmp5_); + _tmp4_ = value; #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp3_ = _tmp6_; -#line 549 "KeyValueMap.c" + _tmp2_ = atoi (_tmp4_); +#line 557 "KeyValueMap.c" } else { - gint _tmp7_; #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp7_ = def; -#line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp3_ = _tmp7_; -#line 556 "KeyValueMap.c" + _tmp2_ = def; +#line 561 "KeyValueMap.c" } #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - result = _tmp3_; + result = _tmp2_; #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_free0 (value); #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return result; -#line 564 "KeyValueMap.c" +#line 569 "KeyValueMap.c" } -static gdouble double_parse (const gchar* str) { +static gdouble +double_parse (const gchar* str) +{ gdouble result = 0.0; - const gchar* _tmp0_; - gdouble _tmp1_; -#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = g_ascii_strtod (_tmp0_, NULL); -#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_; -#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gdouble _tmp0_; +#line 890 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_ascii_strtod (str, NULL); +#line 890 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_; +#line 890 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 580 "KeyValueMap.c" +#line 584 "KeyValueMap.c" } -gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble def) { +gdouble +key_value_map_get_double (KeyValueMap* self, + const gchar* key, + gdouble def) +{ gdouble result = 0.0; gchar* value = NULL; GeeHashMap* _tmp0_; - const gchar* _tmp1_; - gpointer _tmp2_; - gdouble _tmp3_ = 0.0; - const gchar* _tmp4_; + gpointer _tmp1_; + gdouble _tmp2_ = 0.0; + const gchar* _tmp3_; #line 78 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = self->priv->map; #line 78 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp1_ = key; -#line 78 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key); #line 78 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - value = (gchar*) _tmp2_; + value = (gchar*) _tmp1_; #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp4_ = value; -#line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - if (_tmp4_ != NULL) { -#line 604 "KeyValueMap.c" - const gchar* _tmp5_; - gdouble _tmp6_; + _tmp3_ = value; #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp5_ = value; + if (_tmp3_ != NULL) { +#line 609 "KeyValueMap.c" + const gchar* _tmp4_; #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp6_ = double_parse (_tmp5_); + _tmp4_ = value; #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp3_ = _tmp6_; -#line 613 "KeyValueMap.c" + _tmp2_ = double_parse (_tmp4_); +#line 615 "KeyValueMap.c" } else { - gdouble _tmp7_; #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp7_ = def; -#line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp3_ = _tmp7_; -#line 620 "KeyValueMap.c" + _tmp2_ = def; +#line 619 "KeyValueMap.c" } #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - result = _tmp3_; + result = _tmp2_; #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_free0 (value); #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return result; -#line 628 "KeyValueMap.c" +#line 627 "KeyValueMap.c" } -gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def) { +gfloat +key_value_map_get_float (KeyValueMap* self, + const gchar* key, + gfloat def) +{ gfloat result = 0.0F; gchar* value = NULL; GeeHashMap* _tmp0_; - const gchar* _tmp1_; - gpointer _tmp2_; - gfloat _tmp3_ = 0.0F; - const gchar* _tmp4_; + gpointer _tmp1_; + gfloat _tmp2_ = 0.0F; + const gchar* _tmp3_; #line 84 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = self->priv->map; #line 84 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp1_ = key; -#line 84 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key); #line 84 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - value = (gchar*) _tmp2_; + value = (gchar*) _tmp1_; #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp4_ = value; + _tmp3_ = value; #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - if (_tmp4_ != NULL) { + if (_tmp3_ != NULL) { #line 652 "KeyValueMap.c" - const gchar* _tmp5_; - gdouble _tmp6_; -#line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp5_ = value; + const gchar* _tmp4_; #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp6_ = double_parse (_tmp5_); + _tmp4_ = value; #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp3_ = (gfloat) _tmp6_; -#line 661 "KeyValueMap.c" + _tmp2_ = (gfloat) double_parse (_tmp4_); +#line 658 "KeyValueMap.c" } else { - gfloat _tmp7_; #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp7_ = def; -#line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp3_ = _tmp7_; -#line 668 "KeyValueMap.c" + _tmp2_ = def; +#line 662 "KeyValueMap.c" } #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - result = _tmp3_; + result = _tmp2_; #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_free0 (value); #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return result; -#line 676 "KeyValueMap.c" +#line 670 "KeyValueMap.c" } -static gboolean bool_parse (const gchar* str) { +static gboolean +bool_parse (const gchar* str) +{ gboolean result = FALSE; - const gchar* _tmp0_; -#line 45 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 45 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (g_strcmp0 (_tmp0_, "true") == 0) { -#line 46 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 45 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (g_strcmp0 (str, "true") == 0) { +#line 46 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = TRUE; -#line 46 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 46 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 691 "KeyValueMap.c" +#line 684 "KeyValueMap.c" } else { -#line 48 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 48 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = FALSE; -#line 48 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 48 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 697 "KeyValueMap.c" +#line 690 "KeyValueMap.c" } } -gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean def) { +gboolean +key_value_map_get_bool (KeyValueMap* self, + const gchar* key, + gboolean def) +{ gboolean result = FALSE; gchar* value = NULL; GeeHashMap* _tmp0_; - const gchar* _tmp1_; - gpointer _tmp2_; - gboolean _tmp3_ = FALSE; - const gchar* _tmp4_; + gpointer _tmp1_; + gboolean _tmp2_ = FALSE; + const gchar* _tmp3_; #line 90 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = self->priv->map; #line 90 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp1_ = key; + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key); #line 90 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 90 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - value = (gchar*) _tmp2_; -#line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp4_ = value; + value = (gchar*) _tmp1_; #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - if (_tmp4_ != NULL) { -#line 722 "KeyValueMap.c" - const gchar* _tmp5_; - gboolean _tmp6_; + _tmp3_ = value; #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp5_ = value; + if (_tmp3_ != NULL) { +#line 716 "KeyValueMap.c" + const gchar* _tmp4_; #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp6_ = bool_parse (_tmp5_); + _tmp4_ = value; #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp3_ = _tmp6_; -#line 731 "KeyValueMap.c" + _tmp2_ = bool_parse (_tmp4_); +#line 722 "KeyValueMap.c" } else { - gboolean _tmp7_; -#line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp7_ = def; #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp3_ = _tmp7_; -#line 738 "KeyValueMap.c" + _tmp2_ = def; +#line 726 "KeyValueMap.c" } #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - result = _tmp3_; + result = _tmp2_; #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_free0 (value); #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return result; -#line 746 "KeyValueMap.c" +#line 734 "KeyValueMap.c" } -void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def, GdkPoint* result) { +void +key_value_map_get_point (KeyValueMap* self, + const gchar* key, + GdkPoint* def, + GdkPoint* result) +{ gchar* value = NULL; GeeHashMap* _tmp0_; - const gchar* _tmp1_; - gpointer _tmp2_; - const gchar* _tmp3_; + gpointer _tmp1_; + const gchar* _tmp2_; #line 101 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = self->priv->map; #line 101 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp1_ = key; -#line 101 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key); #line 101 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - value = (gchar*) _tmp2_; + value = (gchar*) _tmp1_; #line 103 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp3_ = value; + _tmp2_ = value; #line 103 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - if (_tmp3_ == NULL) { -#line 768 "KeyValueMap.c" - GdkPoint _tmp4_; + if (_tmp2_ == NULL) { +#line 758 "KeyValueMap.c" + GdkPoint _tmp3_; #line 104 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp4_ = *def; + _tmp3_ = *def; #line 104 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - *result = _tmp4_; + *result = _tmp3_; #line 104 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_free0 (value); #line 104 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return; -#line 778 "KeyValueMap.c" +#line 768 "KeyValueMap.c" } else { GdkPoint _result_ = {0}; - GdkPoint _tmp5_ = {0}; - const gchar* _tmp6_; - gint _tmp7_; + GdkPoint _tmp4_ = {0}; + const gchar* _tmp5_; #line 106 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp5_.x = 0; + _tmp4_.x = 0; #line 106 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _result_ = _tmp5_; + _result_ = _tmp4_; #line 107 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp6_ = value; -#line 107 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp7_ = sscanf (_tmp6_, "(%d, %d)", &_result_.x, &_result_.y); + _tmp5_ = value; #line 107 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - if (_tmp7_ == 2) { + if (sscanf (_tmp5_, "(%d, %d)", &_result_.x, &_result_.y) == 2) { #line 108 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" *result = _result_; #line 108 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_free0 (value); #line 108 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return; -#line 800 "KeyValueMap.c" +#line 787 "KeyValueMap.c" } else { - GdkPoint _tmp8_; + GdkPoint _tmp6_; #line 110 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp8_ = *def; + _tmp6_ = *def; #line 110 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - *result = _tmp8_; + *result = _tmp6_; #line 110 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_free0 (value); #line 110 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return; -#line 811 "KeyValueMap.c" +#line 798 "KeyValueMap.c" } } #line 100 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_free0 (value); -#line 816 "KeyValueMap.c" +#line 803 "KeyValueMap.c" } -void key_value_map_set_point (KeyValueMap* self, const gchar* key, GdkPoint* point) { +void +key_value_map_set_point (KeyValueMap* self, + const gchar* key, + GdkPoint* point) +{ GeeHashMap* _tmp0_; - const gchar* _tmp1_; - GdkPoint _tmp2_; - gint _tmp3_; - GdkPoint _tmp4_; - gint _tmp5_; + GdkPoint _tmp1_; + gint _tmp2_; + GdkPoint _tmp3_; + gint _tmp4_; + gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = self->priv->map; #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp1_ = key; -#line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp2_ = *point; + _tmp1_ = *point; #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp3_ = _tmp2_.x; + _tmp2_ = _tmp1_.x; #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp4_ = *point; + _tmp3_ = *point; #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp5_ = _tmp4_.y; + _tmp4_ = _tmp3_.y; #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp6_ = g_strdup_printf ("(%d, %d)", _tmp3_, _tmp5_); + _tmp5_ = g_strdup_printf ("(%d, %d)", _tmp2_, _tmp4_); #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, _tmp7_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key, _tmp6_); #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - _g_free0 (_tmp7_); -#line 849 "KeyValueMap.c" + _g_free0 (_tmp6_); +#line 837 "KeyValueMap.c" } -static void value_key_value_map_init (GValue* value) { +static void +value_key_value_map_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" value->data[0].v_pointer = NULL; -#line 856 "KeyValueMap.c" +#line 846 "KeyValueMap.c" } -static void value_key_value_map_free_value (GValue* value) { +static void +value_key_value_map_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" key_value_map_unref (value->data[0].v_pointer); -#line 865 "KeyValueMap.c" +#line 857 "KeyValueMap.c" } } -static void value_key_value_map_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_key_value_map_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" dest_value->data[0].v_pointer = key_value_map_ref (src_value->data[0].v_pointer); -#line 875 "KeyValueMap.c" +#line 870 "KeyValueMap.c" } else { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" dest_value->data[0].v_pointer = NULL; -#line 879 "KeyValueMap.c" +#line 874 "KeyValueMap.c" } } -static gpointer value_key_value_map_peek_pointer (const GValue* value) { +static gpointer +value_key_value_map_peek_pointer (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return value->data[0].v_pointer; -#line 887 "KeyValueMap.c" +#line 884 "KeyValueMap.c" } -static gchar* value_key_value_map_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_key_value_map_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" if (collect_values[0].v_pointer) { -#line 894 "KeyValueMap.c" +#line 896 "KeyValueMap.c" KeyValueMap * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 901 "KeyValueMap.c" +#line 903 "KeyValueMap.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 905 "KeyValueMap.c" +#line 907 "KeyValueMap.c" } #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" value->data[0].v_pointer = key_value_map_ref (object); -#line 909 "KeyValueMap.c" +#line 911 "KeyValueMap.c" } else { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" value->data[0].v_pointer = NULL; -#line 913 "KeyValueMap.c" +#line 915 "KeyValueMap.c" } #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return NULL; -#line 917 "KeyValueMap.c" +#line 919 "KeyValueMap.c" } -static gchar* value_key_value_map_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_key_value_map_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ KeyValueMap ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 928 "KeyValueMap.c" +#line 935 "KeyValueMap.c" } #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" *object_p = NULL; -#line 934 "KeyValueMap.c" +#line 941 "KeyValueMap.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" *object_p = value->data[0].v_pointer; -#line 938 "KeyValueMap.c" +#line 945 "KeyValueMap.c" } else { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" *object_p = key_value_map_ref (value->data[0].v_pointer); -#line 942 "KeyValueMap.c" +#line 949 "KeyValueMap.c" } #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return NULL; -#line 946 "KeyValueMap.c" +#line 953 "KeyValueMap.c" } -GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_key_value_map (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecKeyValueMap* spec; #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_KEY_VALUE_MAP), NULL); @@ -956,20 +969,25 @@ GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, cons G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return G_PARAM_SPEC (spec); -#line 960 "KeyValueMap.c" +#line 973 "KeyValueMap.c" } -gpointer value_get_key_value_map (const GValue* value) { +gpointer +value_get_key_value_map (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEY_VALUE_MAP), NULL); #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return value->data[0].v_pointer; -#line 969 "KeyValueMap.c" +#line 984 "KeyValueMap.c" } -void value_set_key_value_map (GValue* value, gpointer v_object) { +void +value_set_key_value_map (GValue* value, + gpointer v_object) +{ KeyValueMap * old; #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEY_VALUE_MAP)); @@ -985,22 +1003,25 @@ void value_set_key_value_map (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" key_value_map_ref (value->data[0].v_pointer); -#line 989 "KeyValueMap.c" +#line 1007 "KeyValueMap.c" } else { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" value->data[0].v_pointer = NULL; -#line 993 "KeyValueMap.c" +#line 1011 "KeyValueMap.c" } #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" key_value_map_unref (old); -#line 999 "KeyValueMap.c" +#line 1017 "KeyValueMap.c" } } -void value_take_key_value_map (GValue* value, gpointer v_object) { +void +value_take_key_value_map (GValue* value, + gpointer v_object) +{ KeyValueMap * old; #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEY_VALUE_MAP)); @@ -1014,33 +1035,37 @@ void value_take_key_value_map (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" value->data[0].v_pointer = v_object; -#line 1018 "KeyValueMap.c" +#line 1039 "KeyValueMap.c" } else { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" value->data[0].v_pointer = NULL; -#line 1022 "KeyValueMap.c" +#line 1043 "KeyValueMap.c" } #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" key_value_map_unref (old); -#line 1028 "KeyValueMap.c" +#line 1049 "KeyValueMap.c" } } -static void key_value_map_class_init (KeyValueMapClass * klass) { +static void +key_value_map_class_init (KeyValueMapClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" key_value_map_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" ((KeyValueMapClass *) klass)->finalize = key_value_map_finalize; #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" g_type_class_add_private (klass, sizeof (KeyValueMapPrivate)); -#line 1040 "KeyValueMap.c" +#line 1063 "KeyValueMap.c" } -static void key_value_map_instance_init (KeyValueMap * self) { +static void +key_value_map_instance_init (KeyValueMap * self) +{ GeeHashMap* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" self->priv = KEY_VALUE_MAP_GET_PRIVATE (self); @@ -1050,11 +1075,13 @@ static void key_value_map_instance_init (KeyValueMap * self) { self->priv->map = _tmp0_; #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" self->ref_count = 1; -#line 1054 "KeyValueMap.c" +#line 1079 "KeyValueMap.c" } -static void key_value_map_finalize (KeyValueMap * obj) { +static void +key_value_map_finalize (KeyValueMap * obj) +{ KeyValueMap * self; #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_KEY_VALUE_MAP, KeyValueMap); @@ -1064,11 +1091,13 @@ static void key_value_map_finalize (KeyValueMap * obj) { _g_free0 (self->priv->group); #line 9 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_object_unref0 (self->priv->map); -#line 1068 "KeyValueMap.c" +#line 1095 "KeyValueMap.c" } -GType key_value_map_get_type (void) { +GType +key_value_map_get_type (void) +{ static volatile gsize key_value_map_type_id__volatile = 0; if (g_once_init_enter (&key_value_map_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_key_value_map_init, value_key_value_map_free_value, value_key_value_map_copy_value, value_key_value_map_peek_pointer, "p", value_key_value_map_collect_value, "p", value_key_value_map_lcopy_value }; @@ -1082,18 +1111,22 @@ GType key_value_map_get_type (void) { } -gpointer key_value_map_ref (gpointer instance) { +gpointer +key_value_map_ref (gpointer instance) +{ KeyValueMap * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return instance; -#line 1093 "KeyValueMap.c" +#line 1124 "KeyValueMap.c" } -void key_value_map_unref (gpointer instance) { +void +key_value_map_unref (gpointer instance) +{ KeyValueMap * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -1102,7 +1135,7 @@ void key_value_map_unref (gpointer instance) { KEY_VALUE_MAP_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1106 "KeyValueMap.c" +#line 1139 "KeyValueMap.c" } } diff --git a/src/util/Util.c b/src/util/Util.c index 45f48d9..3a44398 100644 --- a/src/util/Util.c +++ b/src/util/Util.c @@ -1,4 +1,4 @@ -/* Util.c generated by valac 0.36.6, the Vala compiler +/* Util.c generated by valac 0.40.4, the Vala compiler * generated from Util.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -20,11 +21,15 @@ void util_init (GError** error); void util_terminate (void); -void util_init (GError** error) { +void +util_init (GError** error) +{ } -void util_terminate (void) { +void +util_terminate (void) +{ } diff --git a/src/util/file.c b/src/util/file.c index 2afe738..ccb75a9 100644 --- a/src/util/file.c +++ b/src/util/file.c @@ -1,4 +1,4 @@ -/* file.c generated by valac 0.36.6, the Vala compiler +/* file.c generated by valac 0.40.4, the Vala compiler * generated from file.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -12,6 +12,7 @@ /**/ /* This function is thread-safe.*/ + #include #include #include @@ -27,105 +28,125 @@ typedef gboolean (*ProgressMonitor) (guint64 current, guint64 total, gboolean do_event_loop, void* user_data); -gboolean claim_file (GFile* file, GError** error); -GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error); -void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext); -glong find_last_offset (const gchar* str, gchar c); -guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GError** error); -void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor, void* monitor_target, guint64 file_count, GCancellable* cancellable, GError** error); -time_t query_file_modified (GFile* file, GError** error); +gboolean claim_file (GFile* file, + GError** error); +GFile* generate_unique_file (GFile* dir, + const gchar* basename, + gboolean* collision, + GError** error); +void disassemble_filename (const gchar* basename, + gchar* * name, + gchar* * ext); +glong find_last_offset (const gchar* str, + gchar c); +guint64 query_total_file_size (GFile* file_or_dir, + GCancellable* cancellable, + GError** error); +void delete_all_files (GFile* dir, + GeeSet* exceptions, + ProgressMonitor monitor, + void* monitor_target, + guint64 file_count, + GCancellable* cancellable, + GError** error); +time_t query_file_modified (GFile* file, + GError** error); gboolean query_is_directory (GFile* file); -gboolean query_is_directory_empty (GFile* dir, GError** error); +gboolean query_is_directory_empty (GFile* dir, + GError** error); gchar* get_display_pathname (GFile* file); gchar* strip_pretty_path (const gchar* path); gchar* get_file_info_id (GFileInfo* info); -void skip_uint64 (GInputStream* input, guint64 skip_amount, GError** error); -guint64 count_files_in_directory (GFile* dir, GError** error); -gboolean file_equal (GFile* a, GFile* b); +void skip_uint64 (GInputStream* input, + guint64 skip_amount, + GError** error); +guint64 count_files_in_directory (GFile* dir, + GError** error); +gboolean file_equal (GFile* a, + GFile* b); guint file_hash (GFile* file); -static gpointer _g_error_copy0 (gpointer self) { +static gpointer +_g_error_copy0 (gpointer self) +{ #line 23 "/home/jens/Source/shotwell/src/util/file.vala" return self ? g_error_copy (self) : NULL; -#line 52 "file.c" +#line 76 "file.c" } -gboolean claim_file (GFile* file, GError** error) { +gboolean +claim_file (GFile* file, + GError** error) +{ gboolean result = FALSE; - gboolean _tmp11_ = FALSE; + gboolean _tmp9_ = FALSE; GError * _inner_error_ = NULL; #line 12 "/home/jens/Source/shotwell/src/util/file.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); -#line 62 "file.c" +#line 89 "file.c" { - GFile* _tmp0_; + GFileOutputStream* _tmp0_; GFileOutputStream* _tmp1_; - GFileOutputStream* _tmp2_; -#line 14 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp0_ = file; #line 14 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp1_ = g_file_create (_tmp0_, G_FILE_CREATE_NONE, NULL, &_inner_error_); + _tmp0_ = g_file_create (file, G_FILE_CREATE_NONE, NULL, &_inner_error_); #line 14 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 14 "/home/jens/Source/shotwell/src/util/file.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 14 "/home/jens/Source/shotwell/src/util/file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 77 "file.c" +#line 101 "file.c" goto __catch0_g_error; } #line 17 "/home/jens/Source/shotwell/src/util/file.vala" result = TRUE; #line 17 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 84 "file.c" +#line 108 "file.c" } goto __finally0; __catch0_g_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #line 13 "/home/jens/Source/shotwell/src/util/file.vala" err = _inner_error_; #line 13 "/home/jens/Source/shotwell/src/util/file.vala" _inner_error_ = NULL; #line 20 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp3_ = err; + _tmp2_ = err; #line 20 "/home/jens/Source/shotwell/src/util/file.vala" - if (!g_error_matches (_tmp3_, G_IO_ERROR, G_IO_ERROR_EXISTS)) { -#line 99 "file.c" - GFile* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; + if (!g_error_matches (_tmp2_, G_IO_ERROR, G_IO_ERROR_EXISTS)) { +#line 123 "file.c" + gchar* _tmp3_; + gchar* _tmp4_; + GError* _tmp5_; + const gchar* _tmp6_; GError* _tmp7_; - const gchar* _tmp8_; - GError* _tmp9_; - GError* _tmp10_; -#line 21 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp4_ = file; + GError* _tmp8_; #line 21 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp5_ = g_file_get_path (_tmp4_); + _tmp3_ = g_file_get_path (file); #line 21 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 21 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp7_ = err; + _tmp5_ = err; #line 21 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp8_ = _tmp7_->message; + _tmp6_ = _tmp5_->message; #line 21 "/home/jens/Source/shotwell/src/util/file.vala" - g_warning ("file.vala:21: claim_file %s: %s", _tmp6_, _tmp8_); + g_warning ("file.vala:21: claim_file %s: %s", _tmp4_, _tmp6_); #line 21 "/home/jens/Source/shotwell/src/util/file.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp4_); #line 23 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp9_ = err; + _tmp7_ = err; #line 23 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp10_ = _g_error_copy0 (_tmp9_); + _tmp8_ = _g_error_copy0 (_tmp7_); #line 23 "/home/jens/Source/shotwell/src/util/file.vala" - _inner_error_ = _tmp10_; + _inner_error_ = _tmp8_; #line 23 "/home/jens/Source/shotwell/src/util/file.vala" _g_error_free0 (err); -#line 129 "file.c" +#line 150 "file.c" goto __finally0; } #line 26 "/home/jens/Source/shotwell/src/util/file.vala" @@ -134,55 +155,48 @@ gboolean claim_file (GFile* file, GError** error) { _g_error_free0 (err); #line 26 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 138 "file.c" +#line 159 "file.c" } __finally0: #line 13 "/home/jens/Source/shotwell/src/util/file.vala" g_propagate_error (error, _inner_error_); #line 13 "/home/jens/Source/shotwell/src/util/file.vala" - return _tmp11_; -#line 145 "file.c" + return _tmp9_; +#line 166 "file.c" } -GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error) { +GFile* +generate_unique_file (GFile* dir, + const gchar* basename, + gboolean* collision, + GError** error) +{ gboolean _vala_collision = FALSE; GFile* result = NULL; GFile* file = NULL; GFile* _tmp0_; - const gchar* _tmp1_; + gboolean _tmp1_ = FALSE; GFile* _tmp2_; - gboolean _tmp3_ = FALSE; - GFile* _tmp4_; - gboolean _tmp5_; gchar* name = NULL; gchar* ext = NULL; - const gchar* _tmp6_; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - GFile* _tmp28_; - gchar* _tmp29_; - gchar* _tmp30_; - const gchar* _tmp31_; + gchar* _tmp3_ = NULL; + gchar* _tmp4_ = NULL; + gchar* _tmp22_; + gchar* _tmp23_; GError * _inner_error_ = NULL; #line 36 "/home/jens/Source/shotwell/src/util/file.vala" g_return_val_if_fail (G_IS_FILE (dir), NULL); #line 36 "/home/jens/Source/shotwell/src/util/file.vala" g_return_val_if_fail (basename != NULL, NULL); #line 38 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp0_ = dir; + _tmp0_ = g_file_get_child (dir, basename); #line 38 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp1_ = basename; -#line 38 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp2_ = g_file_get_child (_tmp0_, _tmp1_); -#line 38 "/home/jens/Source/shotwell/src/util/file.vala" - file = _tmp2_; + file = _tmp0_; #line 39 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp4_ = file; + _tmp2_ = file; #line 39 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp5_ = claim_file (_tmp4_, &_inner_error_); -#line 39 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp3_ = _tmp5_; + _tmp1_ = claim_file (_tmp2_, &_inner_error_); #line 39 "/home/jens/Source/shotwell/src/util/file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 39 "/home/jens/Source/shotwell/src/util/file.vala" @@ -191,10 +205,10 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis _g_object_unref0 (file); #line 39 "/home/jens/Source/shotwell/src/util/file.vala" return NULL; -#line 195 "file.c" +#line 209 "file.c" } #line 39 "/home/jens/Source/shotwell/src/util/file.vala" - if (_tmp3_) { + if (_tmp1_) { #line 40 "/home/jens/Source/shotwell/src/util/file.vala" _vala_collision = FALSE; #line 42 "/home/jens/Source/shotwell/src/util/file.vala" @@ -203,128 +217,120 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis if (collision) { #line 42 "/home/jens/Source/shotwell/src/util/file.vala" *collision = _vala_collision; -#line 207 "file.c" +#line 221 "file.c" } #line 42 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 211 "file.c" +#line 225 "file.c" } #line 46 "/home/jens/Source/shotwell/src/util/file.vala" _vala_collision = TRUE; #line 49 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp6_ = basename; -#line 49 "/home/jens/Source/shotwell/src/util/file.vala" - disassemble_filename (_tmp6_, &_tmp7_, &_tmp8_); + disassemble_filename (basename, &_tmp3_, &_tmp4_); #line 49 "/home/jens/Source/shotwell/src/util/file.vala" _g_free0 (name); #line 49 "/home/jens/Source/shotwell/src/util/file.vala" - name = _tmp7_; + name = _tmp3_; #line 49 "/home/jens/Source/shotwell/src/util/file.vala" _g_free0 (ext); #line 49 "/home/jens/Source/shotwell/src/util/file.vala" - ext = _tmp8_; -#line 227 "file.c" + ext = _tmp4_; +#line 239 "file.c" { gint ctr = 0; #line 52 "/home/jens/Source/shotwell/src/util/file.vala" ctr = 1; -#line 232 "file.c" +#line 244 "file.c" { - gboolean _tmp9_ = FALSE; + gboolean _tmp5_ = FALSE; #line 52 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp9_ = TRUE; + _tmp5_ = TRUE; #line 52 "/home/jens/Source/shotwell/src/util/file.vala" while (TRUE) { -#line 239 "file.c" - gint _tmp11_; - gchar* _tmp12_ = NULL; - const gchar* _tmp13_; +#line 251 "file.c" + gint _tmp7_; + gchar* _tmp8_ = NULL; + const gchar* _tmp9_; gchar* new_name = NULL; - gchar* _tmp21_; - GFile* _tmp22_; - const gchar* _tmp23_; - GFile* _tmp24_; - gboolean _tmp25_ = FALSE; - GFile* _tmp26_; - gboolean _tmp27_; + gchar* _tmp17_; + const gchar* _tmp18_; + GFile* _tmp19_; + gboolean _tmp20_ = FALSE; + GFile* _tmp21_; #line 52 "/home/jens/Source/shotwell/src/util/file.vala" - if (!_tmp9_) { -#line 253 "file.c" - gint _tmp10_; + if (!_tmp5_) { +#line 263 "file.c" + gint _tmp6_; #line 52 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp10_ = ctr; + _tmp6_ = ctr; #line 52 "/home/jens/Source/shotwell/src/util/file.vala" - ctr = _tmp10_ + 1; -#line 259 "file.c" + ctr = _tmp6_ + 1; +#line 269 "file.c" } #line 52 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp9_ = FALSE; + _tmp5_ = FALSE; #line 52 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp11_ = ctr; + _tmp7_ = ctr; #line 52 "/home/jens/Source/shotwell/src/util/file.vala" - if (!(_tmp11_ < G_MAXINT)) { + if (!(_tmp7_ < G_MAXINT)) { #line 52 "/home/jens/Source/shotwell/src/util/file.vala" break; -#line 269 "file.c" +#line 279 "file.c" } #line 53 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp13_ = ext; + _tmp9_ = ext; #line 53 "/home/jens/Source/shotwell/src/util/file.vala" - if (_tmp13_ != NULL) { -#line 275 "file.c" - const gchar* _tmp14_; - gint _tmp15_; - const gchar* _tmp16_; - gchar* _tmp17_; + if (_tmp9_ != NULL) { +#line 285 "file.c" + const gchar* _tmp10_; + gint _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; #line 53 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp14_ = name; + _tmp10_ = name; #line 53 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp15_ = ctr; + _tmp11_ = ctr; #line 53 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp16_ = ext; + _tmp12_ = ext; #line 53 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp17_ = g_strdup_printf ("%s_%d.%s", _tmp14_, _tmp15_, _tmp16_); + _tmp13_ = g_strdup_printf ("%s_%d.%s", _tmp10_, _tmp11_, _tmp12_); #line 53 "/home/jens/Source/shotwell/src/util/file.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp8_); #line 53 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp12_ = _tmp17_; -#line 292 "file.c" + _tmp8_ = _tmp13_; +#line 302 "file.c" } else { - const gchar* _tmp18_; - gint _tmp19_; - gchar* _tmp20_; + const gchar* _tmp14_; + gint _tmp15_; + gchar* _tmp16_; #line 53 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp18_ = name; + _tmp14_ = name; #line 53 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp19_ = ctr; + _tmp15_ = ctr; #line 53 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp20_ = g_strdup_printf ("%s_%d", _tmp18_, _tmp19_); + _tmp16_ = g_strdup_printf ("%s_%d", _tmp14_, _tmp15_); #line 53 "/home/jens/Source/shotwell/src/util/file.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp8_); #line 53 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp12_ = _tmp20_; -#line 307 "file.c" + _tmp8_ = _tmp16_; +#line 317 "file.c" } #line 53 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp21_ = g_strdup (_tmp12_); + _tmp17_ = g_strdup (_tmp8_); #line 53 "/home/jens/Source/shotwell/src/util/file.vala" - new_name = _tmp21_; -#line 55 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp22_ = dir; + new_name = _tmp17_; #line 55 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp23_ = new_name; + _tmp18_ = new_name; #line 55 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp24_ = g_file_get_child (_tmp22_, _tmp23_); + _tmp19_ = g_file_get_child (dir, _tmp18_); #line 55 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (file); #line 55 "/home/jens/Source/shotwell/src/util/file.vala" - file = _tmp24_; -#line 56 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp26_ = file; + file = _tmp19_; #line 56 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp27_ = claim_file (_tmp26_, &_inner_error_); + _tmp21_ = file; #line 56 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp25_ = _tmp27_; + _tmp20_ = claim_file (_tmp21_, &_inner_error_); #line 56 "/home/jens/Source/shotwell/src/util/file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 56 "/home/jens/Source/shotwell/src/util/file.vala" @@ -332,7 +338,7 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis #line 56 "/home/jens/Source/shotwell/src/util/file.vala" _g_free0 (new_name); #line 56 "/home/jens/Source/shotwell/src/util/file.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp8_); #line 56 "/home/jens/Source/shotwell/src/util/file.vala" _g_free0 (ext); #line 56 "/home/jens/Source/shotwell/src/util/file.vala" @@ -341,16 +347,16 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis _g_object_unref0 (file); #line 56 "/home/jens/Source/shotwell/src/util/file.vala" return NULL; -#line 345 "file.c" +#line 351 "file.c" } #line 56 "/home/jens/Source/shotwell/src/util/file.vala" - if (_tmp25_) { + if (_tmp20_) { #line 57 "/home/jens/Source/shotwell/src/util/file.vala" result = file; #line 57 "/home/jens/Source/shotwell/src/util/file.vala" _g_free0 (new_name); #line 57 "/home/jens/Source/shotwell/src/util/file.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp8_); #line 57 "/home/jens/Source/shotwell/src/util/file.vala" _g_free0 (ext); #line 57 "/home/jens/Source/shotwell/src/util/file.vala" @@ -359,32 +365,28 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis if (collision) { #line 57 "/home/jens/Source/shotwell/src/util/file.vala" *collision = _vala_collision; -#line 363 "file.c" +#line 369 "file.c" } #line 57 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 367 "file.c" +#line 373 "file.c" } #line 52 "/home/jens/Source/shotwell/src/util/file.vala" _g_free0 (new_name); #line 52 "/home/jens/Source/shotwell/src/util/file.vala" - _g_free0 (_tmp12_); -#line 373 "file.c" + _g_free0 (_tmp8_); +#line 379 "file.c" } } } #line 60 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp28_ = dir; -#line 60 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp29_ = g_file_get_path (_tmp28_); + _tmp22_ = g_file_get_path (dir); #line 60 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp30_ = _tmp29_; + _tmp23_ = _tmp22_; #line 60 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp31_ = basename; + g_warning ("file.vala:60: generate_unique_filename %s for %s: unable to claim file", _tmp23_, basename); #line 60 "/home/jens/Source/shotwell/src/util/file.vala" - g_warning ("file.vala:60: generate_unique_filename %s for %s: unable to claim file", _tmp30_, _tmp31_); -#line 60 "/home/jens/Source/shotwell/src/util/file.vala" - _g_free0 (_tmp30_); + _g_free0 (_tmp23_); #line 62 "/home/jens/Source/shotwell/src/util/file.vala" result = NULL; #line 62 "/home/jens/Source/shotwell/src/util/file.vala" @@ -397,275 +399,213 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis if (collision) { #line 62 "/home/jens/Source/shotwell/src/util/file.vala" *collision = _vala_collision; -#line 401 "file.c" +#line 403 "file.c" } #line 62 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 405 "file.c" +#line 407 "file.c" } -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, + glong maxlen) +{ glong result = 0L; gchar* end = NULL; gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 428 "file.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 436 "file.c" +#line 431 "file.c" } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 448 "file.c" +#line 440 "file.c" } } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, + glong offset, + glong len) +{ gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + glong _tmp6_; + gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#line 472 "file.c" - glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = _tmp2_ >= ((glong) 0); -#line 478 "file.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = len >= ((glong) 0); +#line 461 "file.c" } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 482 "file.c" +#line 465 "file.c" } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 486 "file.c" - glong _tmp3_; - glong _tmp4_; - glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 498 "file.c" +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = string_strnlen ((gchar*) self, offset + len); +#line 471 "file.c" } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#line 508 "file.c" + gint _tmp1_; + gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = (glong) _tmp2_; +#line 481 "file.c" } -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp8_ < ((glong) 0)) { -#line 514 "file.c" - glong _tmp9_; - glong _tmp10_; - glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 528 "file.c" +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset < ((glong) 0)) { +#line 485 "file.c" + glong _tmp3_; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 493 "file.c" } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 538 "file.c" + glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 500 "file.c" } -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp14_ < ((glong) 0)) { -#line 544 "file.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 553 "file.c" +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (len < ((glong) 0)) { +#line 504 "file.c" + glong _tmp5_; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp5_ - offset; +#line 510 "file.c" } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 573 "file.c" +#line 522 "file.c" } -void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext) { +void +disassemble_filename (const gchar* basename, + gchar* * name, + gchar* * ext) +{ gchar* _vala_name = NULL; gchar* _vala_ext = NULL; glong offset = 0L; - const gchar* _tmp0_; - glong _tmp1_; - glong _tmp2_; + glong _tmp0_; #line 65 "/home/jens/Source/shotwell/src/util/file.vala" g_return_if_fail (basename != NULL); #line 66 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp0_ = basename; -#line 66 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp1_ = find_last_offset (_tmp0_, '.'); -#line 66 "/home/jens/Source/shotwell/src/util/file.vala" - offset = _tmp1_; + offset = find_last_offset (basename, '.'); #line 67 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp2_ = offset; + _tmp0_ = offset; #line 67 "/home/jens/Source/shotwell/src/util/file.vala" - if (_tmp2_ <= ((glong) 0)) { -#line 596 "file.c" - const gchar* _tmp3_; - gchar* _tmp4_; + if (_tmp0_ <= ((glong) 0)) { +#line 543 "file.c" + gchar* _tmp1_; #line 68 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp3_ = basename; -#line 68 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp4_ = g_strdup (_tmp3_); + _tmp1_ = g_strdup (basename); #line 68 "/home/jens/Source/shotwell/src/util/file.vala" _g_free0 (_vala_name); #line 68 "/home/jens/Source/shotwell/src/util/file.vala" - _vala_name = _tmp4_; + _vala_name = _tmp1_; #line 69 "/home/jens/Source/shotwell/src/util/file.vala" _g_free0 (_vala_ext); #line 69 "/home/jens/Source/shotwell/src/util/file.vala" _vala_ext = NULL; -#line 611 "file.c" +#line 555 "file.c" } else { - const gchar* _tmp5_; - glong _tmp6_; - gchar* _tmp7_; - const gchar* _tmp8_; - glong _tmp9_; - gchar* _tmp10_; -#line 71 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp5_ = basename; + glong _tmp2_; + gchar* _tmp3_; + glong _tmp4_; + gchar* _tmp5_; #line 71 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp6_ = offset; + _tmp2_ = offset; #line 71 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp7_ = string_substring (_tmp5_, (glong) 0, _tmp6_); + _tmp3_ = string_substring (basename, (glong) 0, _tmp2_); #line 71 "/home/jens/Source/shotwell/src/util/file.vala" _g_free0 (_vala_name); #line 71 "/home/jens/Source/shotwell/src/util/file.vala" - _vala_name = _tmp7_; -#line 72 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp8_ = basename; + _vala_name = _tmp3_; #line 72 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp9_ = offset; + _tmp4_ = offset; #line 72 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp10_ = string_substring (_tmp8_, _tmp9_ + 1, (glong) -1); + _tmp5_ = string_substring (basename, _tmp4_ + 1, (glong) -1); #line 72 "/home/jens/Source/shotwell/src/util/file.vala" _g_free0 (_vala_ext); #line 72 "/home/jens/Source/shotwell/src/util/file.vala" - _vala_ext = _tmp10_; -#line 639 "file.c" + _vala_ext = _tmp5_; +#line 577 "file.c" } #line 65 "/home/jens/Source/shotwell/src/util/file.vala" if (name) { #line 65 "/home/jens/Source/shotwell/src/util/file.vala" *name = _vala_name; -#line 645 "file.c" +#line 583 "file.c" } else { #line 65 "/home/jens/Source/shotwell/src/util/file.vala" _g_free0 (_vala_name); -#line 649 "file.c" +#line 587 "file.c" } #line 65 "/home/jens/Source/shotwell/src/util/file.vala" if (ext) { #line 65 "/home/jens/Source/shotwell/src/util/file.vala" *ext = _vala_ext; -#line 655 "file.c" +#line 593 "file.c" } else { #line 65 "/home/jens/Source/shotwell/src/util/file.vala" _g_free0 (_vala_ext); -#line 659 "file.c" +#line 597 "file.c" } } -guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GError** error) { +guint64 +query_total_file_size (GFile* file_or_dir, + GCancellable* cancellable, + GError** error) +{ guint64 result = 0ULL; GFileType type = 0; - GFile* _tmp0_; - GFileType _tmp1_; - GFileType _tmp2_; + GFileType _tmp0_; GFileEnumerator* enumerator = NULL; guint64 total_bytes = 0ULL; GFileInfo* info = NULL; @@ -675,99 +615,85 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE #line 77 "/home/jens/Source/shotwell/src/util/file.vala" g_return_val_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable), 0ULL); #line 78 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp0_ = file_or_dir; -#line 78 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp1_ = g_file_query_file_type (_tmp0_, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL); -#line 78 "/home/jens/Source/shotwell/src/util/file.vala" - type = _tmp1_; + type = g_file_query_file_type (file_or_dir, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL); #line 79 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp2_ = type; + _tmp0_ = type; #line 79 "/home/jens/Source/shotwell/src/util/file.vala" - if (_tmp2_ == G_FILE_TYPE_REGULAR) { -#line 688 "file.c" + if (_tmp0_ == G_FILE_TYPE_REGULAR) { +#line 624 "file.c" GFileInfo* info = NULL; - GFileInfo* _tmp17_; - gint64 _tmp18_; + GFileInfo* _tmp12_; #line 80 "/home/jens/Source/shotwell/src/util/file.vala" info = NULL; -#line 694 "file.c" +#line 629 "file.c" { - GFileInfo* _tmp3_ = NULL; - GFile* _tmp4_; - GCancellable* _tmp5_; - GFileInfo* _tmp6_; - GFileInfo* _tmp7_; -#line 82 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp4_ = file_or_dir; + GFileInfo* _tmp1_ = NULL; + GFileInfo* _tmp2_; + GFileInfo* _tmp3_; #line 82 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp5_ = cancellable; + _tmp2_ = g_file_query_info (file_or_dir, G_FILE_ATTRIBUTE_STANDARD_SIZE, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, cancellable, &_inner_error_); #line 82 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp6_ = g_file_query_info (_tmp4_, G_FILE_ATTRIBUTE_STANDARD_SIZE, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, _tmp5_, &_inner_error_); -#line 82 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp3_ = _tmp6_; + _tmp1_ = _tmp2_; #line 82 "/home/jens/Source/shotwell/src/util/file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 711 "file.c" +#line 640 "file.c" goto __catch1_g_error; } #line 82 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp7_ = _tmp3_; + _tmp3_ = _tmp1_; #line 82 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp3_ = NULL; + _tmp1_ = NULL; #line 82 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (info); #line 82 "/home/jens/Source/shotwell/src/util/file.vala" - info = _tmp7_; + info = _tmp3_; #line 81 "/home/jens/Source/shotwell/src/util/file.vala" - _g_object_unref0 (_tmp3_); -#line 724 "file.c" + _g_object_unref0 (_tmp1_); +#line 653 "file.c" } goto __finally1; __catch1_g_error: { GError* err = NULL; - GError* _tmp8_; - GFile* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; - GError* _tmp14_; - const gchar* _tmp15_; + GError* _tmp4_; + gchar* _tmp7_; + gchar* _tmp8_; + GError* _tmp9_; + const gchar* _tmp10_; #line 81 "/home/jens/Source/shotwell/src/util/file.vala" err = _inner_error_; #line 81 "/home/jens/Source/shotwell/src/util/file.vala" _inner_error_ = NULL; #line 85 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp8_ = err; + _tmp4_ = err; #line 85 "/home/jens/Source/shotwell/src/util/file.vala" - if (g_error_matches (_tmp8_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { -#line 744 "file.c" - GError* _tmp9_; - GError* _tmp10_; + if (g_error_matches (_tmp4_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { +#line 672 "file.c" + GError* _tmp5_; + GError* _tmp6_; #line 86 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp9_ = err; + _tmp5_ = err; #line 86 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp10_ = _g_error_copy0 (_tmp9_); + _tmp6_ = _g_error_copy0 (_tmp5_); #line 86 "/home/jens/Source/shotwell/src/util/file.vala" - _inner_error_ = _tmp10_; + _inner_error_ = _tmp6_; #line 86 "/home/jens/Source/shotwell/src/util/file.vala" _g_error_free0 (err); -#line 755 "file.c" +#line 683 "file.c" goto __finally1; } #line 88 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp11_ = file_or_dir; -#line 88 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp12_ = g_file_get_path (_tmp11_); + _tmp7_ = g_file_get_path (file_or_dir); #line 88 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp13_ = _tmp12_; + _tmp8_ = _tmp7_; #line 88 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp14_ = err; + _tmp9_ = err; #line 88 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp15_ = _tmp14_->message; + _tmp10_ = _tmp9_->message; #line 88 "/home/jens/Source/shotwell/src/util/file.vala" - g_debug ("file.vala:88: Unable to query filesize for %s: %s", _tmp13_, _tmp15_); + g_debug ("file.vala:88: Unable to query filesize for %s: %s", _tmp8_, _tmp10_); #line 88 "/home/jens/Source/shotwell/src/util/file.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp8_); #line 90 "/home/jens/Source/shotwell/src/util/file.vala" result = (guint64) 0; #line 90 "/home/jens/Source/shotwell/src/util/file.vala" @@ -776,120 +702,112 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE _g_object_unref0 (info); #line 90 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 780 "file.c" +#line 706 "file.c" } __finally1: #line 81 "/home/jens/Source/shotwell/src/util/file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 785 "file.c" - guint64 _tmp16_ = 0ULL; +#line 711 "file.c" + guint64 _tmp11_ = 0ULL; #line 81 "/home/jens/Source/shotwell/src/util/file.vala" g_propagate_error (error, _inner_error_); #line 81 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (info); #line 81 "/home/jens/Source/shotwell/src/util/file.vala" - return _tmp16_; -#line 793 "file.c" + return _tmp11_; +#line 719 "file.c" } #line 93 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp17_ = info; -#line 93 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp18_ = g_file_info_get_size (_tmp17_); + _tmp12_ = info; #line 93 "/home/jens/Source/shotwell/src/util/file.vala" - result = (guint64) _tmp18_; + result = (guint64) g_file_info_get_size (_tmp12_); #line 93 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (info); #line 93 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 805 "file.c" +#line 729 "file.c" } else { - GFileType _tmp19_; + GFileType _tmp13_; #line 94 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp19_ = type; + _tmp13_ = type; #line 94 "/home/jens/Source/shotwell/src/util/file.vala" - if (_tmp19_ != G_FILE_TYPE_DIRECTORY) { + if (_tmp13_ != G_FILE_TYPE_DIRECTORY) { #line 95 "/home/jens/Source/shotwell/src/util/file.vala" result = (guint64) 0; #line 95 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 816 "file.c" +#line 740 "file.c" } } { - GFileEnumerator* _tmp20_ = NULL; - GFile* _tmp21_; - GCancellable* _tmp22_; - GFileEnumerator* _tmp23_; - GFileEnumerator* _tmp24_; - GFileEnumerator* _tmp25_; -#line 100 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp21_ = file_or_dir; + GFileEnumerator* _tmp14_ = NULL; + GFileEnumerator* _tmp15_; + GFileEnumerator* _tmp16_; + GFileEnumerator* _tmp17_; #line 100 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp22_ = cancellable; + _tmp15_ = g_file_enumerate_children (file_or_dir, G_FILE_ATTRIBUTE_STANDARD_NAME, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, cancellable, &_inner_error_); #line 100 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp23_ = g_file_enumerate_children (_tmp21_, G_FILE_ATTRIBUTE_STANDARD_NAME, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, _tmp22_, &_inner_error_); -#line 100 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp20_ = _tmp23_; + _tmp14_ = _tmp15_; #line 100 "/home/jens/Source/shotwell/src/util/file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 836 "file.c" +#line 754 "file.c" goto __catch2_g_error; } #line 100 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp24_ = _tmp20_; + _tmp16_ = _tmp14_; #line 100 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp20_ = NULL; + _tmp14_ = NULL; #line 100 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (enumerator); #line 100 "/home/jens/Source/shotwell/src/util/file.vala" - enumerator = _tmp24_; + enumerator = _tmp16_; #line 102 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp25_ = enumerator; + _tmp17_ = enumerator; #line 102 "/home/jens/Source/shotwell/src/util/file.vala" - if (_tmp25_ == NULL) { + if (_tmp17_ == NULL) { #line 103 "/home/jens/Source/shotwell/src/util/file.vala" result = (guint64) 0; #line 103 "/home/jens/Source/shotwell/src/util/file.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp14_); #line 103 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (enumerator); #line 103 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 859 "file.c" +#line 777 "file.c" } #line 99 "/home/jens/Source/shotwell/src/util/file.vala" - _g_object_unref0 (_tmp20_); -#line 863 "file.c" + _g_object_unref0 (_tmp14_); +#line 781 "file.c" } goto __finally2; __catch2_g_error: { GError* err = NULL; - gboolean _tmp26_ = FALSE; - GError* _tmp27_; - GError* _tmp29_; - GError* _tmp30_; + gboolean _tmp18_ = FALSE; + GError* _tmp19_; + GError* _tmp21_; + GError* _tmp22_; #line 99 "/home/jens/Source/shotwell/src/util/file.vala" err = _inner_error_; #line 99 "/home/jens/Source/shotwell/src/util/file.vala" _inner_error_ = NULL; #line 106 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp27_ = err; + _tmp19_ = err; #line 106 "/home/jens/Source/shotwell/src/util/file.vala" - if (g_error_matches (_tmp27_, G_FILE_ERROR, G_FILE_ERROR_PERM)) { + if (g_error_matches (_tmp19_, G_FILE_ERROR, G_FILE_ERROR_PERM)) { #line 106 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp26_ = TRUE; -#line 883 "file.c" + _tmp18_ = TRUE; +#line 801 "file.c" } else { - GError* _tmp28_; + GError* _tmp20_; #line 106 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp28_ = err; + _tmp20_ = err; #line 106 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp26_ = g_error_matches (_tmp28_, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED); -#line 890 "file.c" + _tmp18_ = g_error_matches (_tmp20_, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED); +#line 808 "file.c" } #line 106 "/home/jens/Source/shotwell/src/util/file.vala" - if (_tmp26_) { + if (_tmp18_) { #line 107 "/home/jens/Source/shotwell/src/util/file.vala" result = (guint64) 0; #line 107 "/home/jens/Source/shotwell/src/util/file.vala" @@ -898,31 +816,31 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE _g_object_unref0 (enumerator); #line 107 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 902 "file.c" +#line 820 "file.c" } #line 109 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp29_ = err; + _tmp21_ = err; #line 109 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp30_ = _g_error_copy0 (_tmp29_); + _tmp22_ = _g_error_copy0 (_tmp21_); #line 109 "/home/jens/Source/shotwell/src/util/file.vala" - _inner_error_ = _tmp30_; + _inner_error_ = _tmp22_; #line 109 "/home/jens/Source/shotwell/src/util/file.vala" _g_error_free0 (err); -#line 912 "file.c" +#line 830 "file.c" goto __finally2; } __finally2: #line 99 "/home/jens/Source/shotwell/src/util/file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 918 "file.c" - guint64 _tmp31_ = 0ULL; +#line 836 "file.c" + guint64 _tmp23_ = 0ULL; #line 99 "/home/jens/Source/shotwell/src/util/file.vala" g_propagate_error (error, _inner_error_); #line 99 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (enumerator); #line 99 "/home/jens/Source/shotwell/src/util/file.vala" - return _tmp31_; -#line 926 "file.c" + return _tmp23_; +#line 844 "file.c" } #line 112 "/home/jens/Source/shotwell/src/util/file.vala" total_bytes = (guint64) 0; @@ -930,35 +848,29 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE info = NULL; #line 115 "/home/jens/Source/shotwell/src/util/file.vala" while (TRUE) { -#line 934 "file.c" - GFileInfo* _tmp32_ = NULL; - GFileEnumerator* _tmp33_; - GCancellable* _tmp34_; - GFileInfo* _tmp35_; - GFileInfo* _tmp37_; - GFileInfo* _tmp38_; - guint64 _tmp39_ = 0ULL; - GFile* _tmp40_; - GFileInfo* _tmp41_; - const gchar* _tmp42_; - GFile* _tmp43_; - GFile* _tmp44_; - GCancellable* _tmp45_; - guint64 _tmp46_; - guint64 _tmp47_; - guint64 _tmp49_; -#line 115 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp33_ = enumerator; +#line 852 "file.c" + GFileInfo* _tmp24_ = NULL; + GFileEnumerator* _tmp25_; + GFileInfo* _tmp26_; + GFileInfo* _tmp28_; + GFileInfo* _tmp29_; + guint64 _tmp30_ = 0ULL; + GFileInfo* _tmp31_; + const gchar* _tmp32_; + GFile* _tmp33_; + GFile* _tmp34_; + guint64 _tmp35_; + guint64 _tmp37_; #line 115 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp34_ = cancellable; + _tmp25_ = enumerator; #line 115 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp35_ = g_file_enumerator_next_file (_tmp33_, _tmp34_, &_inner_error_); + _tmp26_ = g_file_enumerator_next_file (_tmp25_, cancellable, &_inner_error_); #line 115 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp32_ = _tmp35_; + _tmp24_ = _tmp26_; #line 115 "/home/jens/Source/shotwell/src/util/file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 961 "file.c" - guint64 _tmp36_ = 0ULL; +#line 873 "file.c" + guint64 _tmp27_ = 0ULL; #line 115 "/home/jens/Source/shotwell/src/util/file.vala" g_propagate_error (error, _inner_error_); #line 115 "/home/jens/Source/shotwell/src/util/file.vala" @@ -966,70 +878,64 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE #line 115 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (enumerator); #line 115 "/home/jens/Source/shotwell/src/util/file.vala" - return _tmp36_; -#line 971 "file.c" + return _tmp27_; +#line 883 "file.c" } #line 115 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp37_ = _tmp32_; + _tmp28_ = _tmp24_; #line 115 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp32_ = NULL; + _tmp24_ = NULL; #line 115 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (info); #line 115 "/home/jens/Source/shotwell/src/util/file.vala" - info = _tmp37_; + info = _tmp28_; #line 115 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp38_ = info; + _tmp29_ = info; #line 115 "/home/jens/Source/shotwell/src/util/file.vala" - if (!(_tmp38_ != NULL)) { + if (!(_tmp29_ != NULL)) { #line 115 "/home/jens/Source/shotwell/src/util/file.vala" - _g_object_unref0 (_tmp32_); + _g_object_unref0 (_tmp24_); #line 115 "/home/jens/Source/shotwell/src/util/file.vala" break; -#line 989 "file.c" +#line 901 "file.c" } #line 116 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp40_ = file_or_dir; -#line 116 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp41_ = info; + _tmp31_ = info; #line 116 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp42_ = g_file_info_get_name (_tmp41_); + _tmp32_ = g_file_info_get_name (_tmp31_); #line 116 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp43_ = g_file_get_child (_tmp40_, _tmp42_); + _tmp33_ = g_file_get_child (file_or_dir, _tmp32_); #line 116 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp44_ = _tmp43_; + _tmp34_ = _tmp33_; #line 116 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp45_ = cancellable; + _tmp35_ = query_total_file_size (_tmp34_, cancellable, &_inner_error_); #line 116 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp46_ = query_total_file_size (_tmp44_, _tmp45_, &_inner_error_); + _g_object_unref0 (_tmp34_); #line 116 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp47_ = _tmp46_; -#line 116 "/home/jens/Source/shotwell/src/util/file.vala" - _g_object_unref0 (_tmp44_); -#line 116 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp39_ = _tmp47_; + _tmp30_ = _tmp35_; #line 116 "/home/jens/Source/shotwell/src/util/file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1013 "file.c" - guint64 _tmp48_ = 0ULL; +#line 919 "file.c" + guint64 _tmp36_ = 0ULL; #line 116 "/home/jens/Source/shotwell/src/util/file.vala" g_propagate_error (error, _inner_error_); #line 116 "/home/jens/Source/shotwell/src/util/file.vala" - _g_object_unref0 (_tmp32_); + _g_object_unref0 (_tmp24_); #line 116 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (info); #line 116 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (enumerator); #line 116 "/home/jens/Source/shotwell/src/util/file.vala" - return _tmp48_; -#line 1025 "file.c" + return _tmp36_; +#line 931 "file.c" } #line 116 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp49_ = total_bytes; + _tmp37_ = total_bytes; #line 116 "/home/jens/Source/shotwell/src/util/file.vala" - total_bytes = _tmp49_ + _tmp39_; + total_bytes = _tmp37_ + _tmp30_; #line 115 "/home/jens/Source/shotwell/src/util/file.vala" - _g_object_unref0 (_tmp32_); -#line 1033 "file.c" + _g_object_unref0 (_tmp24_); +#line 939 "file.c" } #line 118 "/home/jens/Source/shotwell/src/util/file.vala" result = total_bytes; @@ -1039,19 +945,23 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE _g_object_unref0 (enumerator); #line 118 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 1043 "file.c" +#line 949 "file.c" } -void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor, void* monitor_target, guint64 file_count, GCancellable* cancellable, GError** error) { +void +delete_all_files (GFile* dir, + GeeSet* exceptions, + ProgressMonitor monitor, + void* monitor_target, + guint64 file_count, + GCancellable* cancellable, + GError** error) +{ GFileType type = 0; - GFile* _tmp0_; - GFileType _tmp1_; - GFileType _tmp2_; + GFileType _tmp0_; GFileEnumerator* enumerator = NULL; - GFile* _tmp10_; - GCancellable* _tmp11_; - GFileEnumerator* _tmp12_; + GFileEnumerator* _tmp7_; GFileInfo* info = NULL; guint64 i = 0ULL; GError * _inner_error_ = NULL; @@ -1062,64 +972,53 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor, #line 125 "/home/jens/Source/shotwell/src/util/file.vala" g_return_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable)); #line 127 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp0_ = dir; -#line 127 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp1_ = g_file_query_file_type (_tmp0_, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL); -#line 127 "/home/jens/Source/shotwell/src/util/file.vala" - type = _tmp1_; + type = g_file_query_file_type (dir, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL); #line 128 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp2_ = type; + _tmp0_ = type; #line 128 "/home/jens/Source/shotwell/src/util/file.vala" - if (_tmp2_ != G_FILE_TYPE_DIRECTORY) { -#line 1075 "file.c" - GFile* _tmp3_; + if (_tmp0_ != G_FILE_TYPE_DIRECTORY) { +#line 981 "file.c" + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - GError* _tmp8_; - GError* _tmp9_; -#line 129 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp3_ = dir; + GError* _tmp5_; + GError* _tmp6_; #line 129 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp4_ = g_file_get_path (_tmp3_); + _tmp1_ = g_file_get_path (dir); #line 129 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 129 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp6_ = g_strdup_printf ("%s is not a directory", _tmp5_); + _tmp3_ = g_strdup_printf ("%s is not a directory", _tmp2_); #line 129 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 129 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp8_ = g_error_new_literal (G_IO_ERROR, G_IO_ERROR_NOT_DIRECTORY, _tmp7_); + _tmp5_ = g_error_new_literal (G_IO_ERROR, G_IO_ERROR_NOT_DIRECTORY, _tmp4_); #line 129 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 129 "/home/jens/Source/shotwell/src/util/file.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp4_); #line 129 "/home/jens/Source/shotwell/src/util/file.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp2_); #line 129 "/home/jens/Source/shotwell/src/util/file.vala" - _inner_error_ = _tmp9_; + _inner_error_ = _tmp6_; #line 129 "/home/jens/Source/shotwell/src/util/file.vala" g_propagate_error (error, _inner_error_); #line 129 "/home/jens/Source/shotwell/src/util/file.vala" return; -#line 1107 "file.c" +#line 1010 "file.c" } #line 131 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp10_ = dir; -#line 131 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp11_ = cancellable; + _tmp7_ = g_file_enumerate_children (dir, "standard::name,standard::type", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, cancellable, &_inner_error_); #line 131 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp12_ = g_file_enumerate_children (_tmp10_, "standard::name,standard::type", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, _tmp11_, &_inner_error_); -#line 131 "/home/jens/Source/shotwell/src/util/file.vala" - enumerator = _tmp12_; + enumerator = _tmp7_; #line 131 "/home/jens/Source/shotwell/src/util/file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 131 "/home/jens/Source/shotwell/src/util/file.vala" g_propagate_error (error, _inner_error_); #line 131 "/home/jens/Source/shotwell/src/util/file.vala" return; -#line 1123 "file.c" +#line 1022 "file.c" } #line 133 "/home/jens/Source/shotwell/src/util/file.vala" info = NULL; @@ -1127,33 +1026,25 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor, i = (guint64) 0; #line 135 "/home/jens/Source/shotwell/src/util/file.vala" while (TRUE) { -#line 1131 "file.c" - GFileInfo* _tmp13_ = NULL; - GFileEnumerator* _tmp14_; - GCancellable* _tmp15_; - GFileInfo* _tmp16_; - GFileInfo* _tmp17_; - GFileInfo* _tmp18_; - GFileInfo* _tmp19_; - GFileType _tmp20_; - gboolean _tmp21_ = FALSE; - GeeSet* _tmp22_; +#line 1030 "file.c" + GFileInfo* _tmp8_ = NULL; + GFileEnumerator* _tmp9_; + GFileInfo* _tmp10_; + GFileInfo* _tmp11_; + GFileInfo* _tmp12_; + GFileInfo* _tmp13_; + gboolean _tmp14_ = FALSE; GFile* file = NULL; - GFile* _tmp27_; - GFileInfo* _tmp28_; - const gchar* _tmp29_; - GFile* _tmp30_; - gboolean _tmp38_ = FALSE; - ProgressMonitor _tmp39_; - void* _tmp39__target; -#line 135 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp14_ = enumerator; + GFileInfo* _tmp17_; + const gchar* _tmp18_; + GFile* _tmp19_; + gboolean _tmp26_ = FALSE; #line 135 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp15_ = cancellable; + _tmp9_ = enumerator; #line 135 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp16_ = g_file_enumerator_next_file (_tmp14_, _tmp15_, &_inner_error_); + _tmp10_ = g_file_enumerator_next_file (_tmp9_, cancellable, &_inner_error_); #line 135 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp13_ = _tmp16_; + _tmp8_ = _tmp10_; #line 135 "/home/jens/Source/shotwell/src/util/file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 135 "/home/jens/Source/shotwell/src/util/file.vala" @@ -1164,94 +1055,79 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor, _g_object_unref0 (enumerator); #line 135 "/home/jens/Source/shotwell/src/util/file.vala" return; -#line 1168 "file.c" +#line 1059 "file.c" } #line 135 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp17_ = _tmp13_; + _tmp11_ = _tmp8_; #line 135 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp13_ = NULL; + _tmp8_ = NULL; #line 135 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (info); #line 135 "/home/jens/Source/shotwell/src/util/file.vala" - info = _tmp17_; + info = _tmp11_; #line 135 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp18_ = info; + _tmp12_ = info; #line 135 "/home/jens/Source/shotwell/src/util/file.vala" - if (!(_tmp18_ != NULL)) { + if (!(_tmp12_ != NULL)) { #line 135 "/home/jens/Source/shotwell/src/util/file.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp8_); #line 135 "/home/jens/Source/shotwell/src/util/file.vala" break; -#line 1186 "file.c" +#line 1077 "file.c" } #line 136 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp19_ = info; -#line 136 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp20_ = g_file_info_get_file_type (_tmp19_); + _tmp13_ = info; #line 136 "/home/jens/Source/shotwell/src/util/file.vala" - if (_tmp20_ != G_FILE_TYPE_REGULAR) { + if (g_file_info_get_file_type (_tmp13_) != G_FILE_TYPE_REGULAR) { #line 137 "/home/jens/Source/shotwell/src/util/file.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp8_); #line 137 "/home/jens/Source/shotwell/src/util/file.vala" continue; -#line 1198 "file.c" +#line 1087 "file.c" } #line 139 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp22_ = exceptions; + if (exceptions != NULL) { +#line 1091 "file.c" + GFileInfo* _tmp15_; + const gchar* _tmp16_; #line 139 "/home/jens/Source/shotwell/src/util/file.vala" - if (_tmp22_ != NULL) { -#line 1204 "file.c" - GeeSet* _tmp23_; - GFileInfo* _tmp24_; - const gchar* _tmp25_; - gboolean _tmp26_; -#line 139 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp23_ = exceptions; -#line 139 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp24_ = info; -#line 139 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp25_ = g_file_info_get_name (_tmp24_); + _tmp15_ = info; #line 139 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp26_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_); + _tmp16_ = g_file_info_get_name (_tmp15_); #line 139 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp21_ = _tmp26_; -#line 1219 "file.c" + _tmp14_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (exceptions, GEE_TYPE_COLLECTION, GeeCollection), _tmp16_); +#line 1100 "file.c" } else { #line 139 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp21_ = FALSE; -#line 1223 "file.c" + _tmp14_ = FALSE; +#line 1104 "file.c" } #line 139 "/home/jens/Source/shotwell/src/util/file.vala" - if (_tmp21_) { + if (_tmp14_) { #line 140 "/home/jens/Source/shotwell/src/util/file.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp8_); #line 140 "/home/jens/Source/shotwell/src/util/file.vala" continue; -#line 1231 "file.c" +#line 1112 "file.c" } #line 142 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp27_ = dir; -#line 142 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp28_ = info; + _tmp17_ = info; #line 142 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp29_ = g_file_info_get_name (_tmp28_); + _tmp18_ = g_file_info_get_name (_tmp17_); #line 142 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp30_ = g_file_get_child (_tmp27_, _tmp29_); + _tmp19_ = g_file_get_child (dir, _tmp18_); #line 142 "/home/jens/Source/shotwell/src/util/file.vala" - file = _tmp30_; -#line 1243 "file.c" + file = _tmp19_; +#line 1122 "file.c" { - GFile* _tmp31_; - GCancellable* _tmp32_; -#line 144 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp31_ = file; + GFile* _tmp20_; #line 144 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp32_ = cancellable; + _tmp20_ = file; #line 144 "/home/jens/Source/shotwell/src/util/file.vala" - g_file_delete (_tmp31_, _tmp32_, &_inner_error_); + g_file_delete (_tmp20_, cancellable, &_inner_error_); #line 144 "/home/jens/Source/shotwell/src/util/file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1255 "file.c" +#line 1131 "file.c" goto __catch3_g_error; } } @@ -1259,32 +1135,32 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor, __catch3_g_error: { GError* err = NULL; - GFile* _tmp33_; - gchar* _tmp34_; - gchar* _tmp35_; - GError* _tmp36_; - const gchar* _tmp37_; + GFile* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + GError* _tmp24_; + const gchar* _tmp25_; #line 143 "/home/jens/Source/shotwell/src/util/file.vala" err = _inner_error_; #line 143 "/home/jens/Source/shotwell/src/util/file.vala" _inner_error_ = NULL; #line 146 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp33_ = file; + _tmp21_ = file; #line 146 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp34_ = g_file_get_path (_tmp33_); + _tmp22_ = g_file_get_path (_tmp21_); #line 146 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp35_ = _tmp34_; + _tmp23_ = _tmp22_; #line 146 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp36_ = err; + _tmp24_ = err; #line 146 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp37_ = _tmp36_->message; + _tmp25_ = _tmp24_->message; #line 146 "/home/jens/Source/shotwell/src/util/file.vala" - g_warning ("file.vala:146: Unable to delete file %s: %s", _tmp35_, _tmp37_); + g_warning ("file.vala:146: Unable to delete file %s: %s", _tmp23_, _tmp25_); #line 146 "/home/jens/Source/shotwell/src/util/file.vala" - _g_free0 (_tmp35_); + _g_free0 (_tmp23_); #line 143 "/home/jens/Source/shotwell/src/util/file.vala" _g_error_free0 (err); -#line 1288 "file.c" +#line 1164 "file.c" } __finally3: #line 143 "/home/jens/Source/shotwell/src/util/file.vala" @@ -1294,304 +1170,273 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor, #line 143 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (file); #line 143 "/home/jens/Source/shotwell/src/util/file.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp8_); #line 143 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (info); #line 143 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (enumerator); #line 143 "/home/jens/Source/shotwell/src/util/file.vala" return; -#line 1305 "file.c" +#line 1181 "file.c" } #line 149 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp39_ = monitor; -#line 149 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp39__target = monitor_target; + if (monitor != NULL) { #line 149 "/home/jens/Source/shotwell/src/util/file.vala" - if (_tmp39_ != NULL) { -#line 1313 "file.c" - guint64 _tmp40_; -#line 149 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp40_ = file_count; -#line 149 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp38_ = _tmp40_ > ((guint64) 0); -#line 1319 "file.c" + _tmp26_ = file_count > ((guint64) 0); +#line 1187 "file.c" } else { #line 149 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp38_ = FALSE; -#line 1323 "file.c" + _tmp26_ = FALSE; +#line 1191 "file.c" } #line 149 "/home/jens/Source/shotwell/src/util/file.vala" - if (_tmp38_) { -#line 1327 "file.c" - ProgressMonitor _tmp41_; - void* _tmp41__target; - guint64 _tmp42_; - guint64 _tmp43_; - guint64 _tmp44_; -#line 150 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp41_ = monitor; -#line 150 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp41__target = monitor_target; -#line 150 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp42_ = file_count; + if (_tmp26_) { +#line 1195 "file.c" + guint64 _tmp27_; + guint64 _tmp28_; #line 150 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp43_ = i; + _tmp27_ = i; #line 150 "/home/jens/Source/shotwell/src/util/file.vala" - i = _tmp43_ + 1; + i = _tmp27_ + 1; #line 150 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp44_ = i; + _tmp28_ = i; #line 150 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp41_ (_tmp42_, _tmp44_, TRUE, _tmp41__target); -#line 1347 "file.c" + monitor (file_count, _tmp28_, TRUE, monitor_target); +#line 1206 "file.c" } #line 135 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (file); #line 135 "/home/jens/Source/shotwell/src/util/file.vala" - _g_object_unref0 (_tmp13_); -#line 1353 "file.c" + _g_object_unref0 (_tmp8_); +#line 1212 "file.c" } #line 125 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (info); #line 125 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (enumerator); -#line 1359 "file.c" +#line 1218 "file.c" } -time_t query_file_modified (GFile* file, GError** error) { +time_t +query_file_modified (GFile* file, + GError** error) +{ time_t result = 0; GFileInfo* info = NULL; - GFile* _tmp0_; - GFileInfo* _tmp1_; - GTimeVal _tmp3_ = {0}; - glong _tmp4_; + GFileInfo* _tmp0_; + GTimeVal _tmp2_ = {0}; + glong _tmp3_; GError * _inner_error_ = NULL; #line 154 "/home/jens/Source/shotwell/src/util/file.vala" g_return_val_if_fail (G_IS_FILE (file), 0); #line 155 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp0_ = file; -#line 155 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp1_ = g_file_query_info (_tmp0_, G_FILE_ATTRIBUTE_TIME_MODIFIED, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); + _tmp0_ = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_MODIFIED, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); #line 155 "/home/jens/Source/shotwell/src/util/file.vala" - info = _tmp1_; + info = _tmp0_; #line 155 "/home/jens/Source/shotwell/src/util/file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "file.c" - time_t _tmp2_ = 0; +#line 1240 "file.c" + time_t _tmp1_ = 0; #line 155 "/home/jens/Source/shotwell/src/util/file.vala" g_propagate_error (error, _inner_error_); #line 155 "/home/jens/Source/shotwell/src/util/file.vala" - return _tmp2_; -#line 1387 "file.c" + return _tmp1_; +#line 1246 "file.c" } #line 158 "/home/jens/Source/shotwell/src/util/file.vala" - g_file_info_get_modification_time (info, &_tmp3_); + g_file_info_get_modification_time (info, &_tmp2_); #line 158 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp4_ = _tmp3_.tv_sec; + _tmp3_ = _tmp2_.tv_sec; #line 158 "/home/jens/Source/shotwell/src/util/file.vala" - result = (time_t) _tmp4_; + result = (time_t) _tmp3_; #line 158 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (info); #line 158 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 1399 "file.c" +#line 1258 "file.c" } -gboolean query_is_directory (GFile* file) { +gboolean +query_is_directory (GFile* file) +{ gboolean result = FALSE; - GFile* _tmp0_; - GFileType _tmp1_; #line 161 "/home/jens/Source/shotwell/src/util/file.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 162 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp0_ = file; -#line 162 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp1_ = g_file_query_file_type (_tmp0_, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL); -#line 162 "/home/jens/Source/shotwell/src/util/file.vala" - result = _tmp1_ == G_FILE_TYPE_DIRECTORY; + result = g_file_query_file_type (file, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL) == G_FILE_TYPE_DIRECTORY; #line 162 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 1417 "file.c" +#line 1272 "file.c" } -gboolean query_is_directory_empty (GFile* dir, GError** error) { +gboolean +query_is_directory_empty (GFile* dir, + GError** error) +{ gboolean result = FALSE; - GFile* _tmp0_; - GFileType _tmp1_; GFileEnumerator* enumerator = NULL; - GFile* _tmp2_; - GFileEnumerator* _tmp3_; - GFileEnumerator* _tmp5_; - GFileInfo* _tmp6_ = NULL; - GFileEnumerator* _tmp7_; - GFileInfo* _tmp8_; + GFileEnumerator* _tmp0_; + GFileEnumerator* _tmp2_; + GFileInfo* _tmp3_ = NULL; + GFileEnumerator* _tmp4_; + GFileInfo* _tmp5_; GError * _inner_error_ = NULL; #line 165 "/home/jens/Source/shotwell/src/util/file.vala" g_return_val_if_fail (G_IS_FILE (dir), FALSE); #line 166 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp0_ = dir; -#line 166 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp1_ = g_file_query_file_type (_tmp0_, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL); -#line 166 "/home/jens/Source/shotwell/src/util/file.vala" - if (_tmp1_ != G_FILE_TYPE_DIRECTORY) { + if (g_file_query_file_type (dir, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL) != G_FILE_TYPE_DIRECTORY) { #line 167 "/home/jens/Source/shotwell/src/util/file.vala" result = FALSE; #line 167 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 1445 "file.c" +#line 1296 "file.c" } #line 169 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp2_ = dir; -#line 169 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp3_ = g_file_enumerate_children (_tmp2_, "standard::name", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); + _tmp0_ = g_file_enumerate_children (dir, "standard::name", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); #line 169 "/home/jens/Source/shotwell/src/util/file.vala" - enumerator = _tmp3_; + enumerator = _tmp0_; #line 169 "/home/jens/Source/shotwell/src/util/file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1455 "file.c" - gboolean _tmp4_ = FALSE; +#line 1304 "file.c" + gboolean _tmp1_ = FALSE; #line 169 "/home/jens/Source/shotwell/src/util/file.vala" g_propagate_error (error, _inner_error_); #line 169 "/home/jens/Source/shotwell/src/util/file.vala" - return _tmp4_; -#line 1461 "file.c" + return _tmp1_; +#line 1310 "file.c" } #line 171 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp5_ = enumerator; + _tmp2_ = enumerator; #line 171 "/home/jens/Source/shotwell/src/util/file.vala" - if (_tmp5_ == NULL) { + if (_tmp2_ == NULL) { #line 172 "/home/jens/Source/shotwell/src/util/file.vala" result = FALSE; #line 172 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (enumerator); #line 172 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 1473 "file.c" +#line 1322 "file.c" } #line 174 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp7_ = enumerator; + _tmp4_ = enumerator; #line 174 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp8_ = g_file_enumerator_next_file (_tmp7_, NULL, &_inner_error_); + _tmp5_ = g_file_enumerator_next_file (_tmp4_, NULL, &_inner_error_); #line 174 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp6_ = _tmp8_; + _tmp3_ = _tmp5_; #line 174 "/home/jens/Source/shotwell/src/util/file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1483 "file.c" - gboolean _tmp9_ = FALSE; +#line 1332 "file.c" + gboolean _tmp6_ = FALSE; #line 174 "/home/jens/Source/shotwell/src/util/file.vala" g_propagate_error (error, _inner_error_); #line 174 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (enumerator); #line 174 "/home/jens/Source/shotwell/src/util/file.vala" - return _tmp9_; -#line 1491 "file.c" + return _tmp6_; +#line 1340 "file.c" } #line 174 "/home/jens/Source/shotwell/src/util/file.vala" - result = _tmp6_ == NULL; + result = _tmp3_ == NULL; #line 174 "/home/jens/Source/shotwell/src/util/file.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp3_); #line 174 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (enumerator); #line 174 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 1501 "file.c" +#line 1350 "file.c" } -gchar* get_display_pathname (GFile* file) { +gchar* +get_display_pathname (GFile* file) +{ gchar* result = NULL; gchar* path = NULL; - GFile* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; gchar* home = NULL; - const gchar* _tmp2_; - gchar* _tmp3_; + const gchar* _tmp1_; + gchar* _tmp2_; + const gchar* _tmp3_; const gchar* _tmp4_; - const gchar* _tmp5_; + const gchar* _tmp6_; const gchar* _tmp7_; - const gchar* _tmp8_; - gboolean _tmp9_; #line 177 "/home/jens/Source/shotwell/src/util/file.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 179 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp0_ = file; -#line 179 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp1_ = g_file_get_parse_name (_tmp0_); + _tmp0_ = g_file_get_parse_name (file); #line 179 "/home/jens/Source/shotwell/src/util/file.vala" - path = _tmp1_; + path = _tmp0_; #line 180 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp2_ = g_get_home_dir (); + _tmp1_ = g_get_home_dir (); #line 180 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp2_ = g_strdup (_tmp1_); #line 180 "/home/jens/Source/shotwell/src/util/file.vala" - home = _tmp3_; + home = _tmp2_; #line 182 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp4_ = path; + _tmp3_ = path; #line 182 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp5_ = home; + _tmp4_ = home; #line 182 "/home/jens/Source/shotwell/src/util/file.vala" - if (g_strcmp0 (_tmp4_, _tmp5_) == 0) { -#line 1538 "file.c" - gchar* _tmp6_; + if (g_strcmp0 (_tmp3_, _tmp4_) == 0) { +#line 1385 "file.c" + gchar* _tmp5_; #line 183 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp6_ = g_strdup ("~"); + _tmp5_ = g_strdup ("~"); #line 183 "/home/jens/Source/shotwell/src/util/file.vala" - result = _tmp6_; + result = _tmp5_; #line 183 "/home/jens/Source/shotwell/src/util/file.vala" _g_free0 (home); #line 183 "/home/jens/Source/shotwell/src/util/file.vala" _g_free0 (path); #line 183 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 1550 "file.c" +#line 1397 "file.c" } #line 185 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp7_ = path; + _tmp6_ = path; #line 185 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp8_ = home; + _tmp7_ = home; #line 185 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp9_ = g_str_has_prefix (_tmp7_, _tmp8_); -#line 185 "/home/jens/Source/shotwell/src/util/file.vala" - if (_tmp9_) { -#line 1560 "file.c" - const gchar* _tmp10_; - const gchar* _tmp11_; - gint _tmp12_; - gint _tmp13_; + if (g_str_has_prefix (_tmp6_, _tmp7_)) { +#line 1405 "file.c" + const gchar* _tmp8_; + const gchar* _tmp9_; + gint _tmp10_; + gint _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; gchar* _tmp14_; gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; #line 186 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp10_ = path; + _tmp8_ = path; #line 186 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp11_ = home; + _tmp9_ = home; #line 186 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp12_ = strlen (_tmp11_); + _tmp10_ = strlen (_tmp9_); #line 186 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 186 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp14_ = string_substring (_tmp10_, (glong) _tmp13_, (glong) -1); + _tmp12_ = string_substring (_tmp8_, (glong) _tmp11_, (glong) -1); #line 186 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp15_ = _tmp14_; + _tmp13_ = _tmp12_; #line 186 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp16_ = g_strdup_printf ("~%s", _tmp15_); + _tmp14_ = g_strdup_printf ("~%s", _tmp13_); #line 186 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp17_ = _tmp16_; + _tmp15_ = _tmp14_; #line 186 "/home/jens/Source/shotwell/src/util/file.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp13_); #line 186 "/home/jens/Source/shotwell/src/util/file.vala" - result = _tmp17_; + result = _tmp15_; #line 186 "/home/jens/Source/shotwell/src/util/file.vala" _g_free0 (home); #line 186 "/home/jens/Source/shotwell/src/util/file.vala" _g_free0 (path); #line 186 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 1595 "file.c" +#line 1440 "file.c" } #line 188 "/home/jens/Source/shotwell/src/util/file.vala" result = path; @@ -1599,213 +1444,180 @@ gchar* get_display_pathname (GFile* file) { _g_free0 (home); #line 188 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 1603 "file.c" +#line 1448 "file.c" } -gchar* strip_pretty_path (const gchar* path) { +gchar* +strip_pretty_path (const gchar* path) +{ gchar* result = NULL; - const gchar* _tmp0_; - gboolean _tmp1_; - const gchar* _tmp4_; - const gchar* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; + const gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; #line 191 "/home/jens/Source/shotwell/src/util/file.vala" g_return_val_if_fail (path != NULL, NULL); #line 192 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp0_ = path; -#line 192 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp1_ = g_str_has_prefix (_tmp0_, "~"); -#line 192 "/home/jens/Source/shotwell/src/util/file.vala" - if (!_tmp1_) { -#line 1625 "file.c" - const gchar* _tmp2_; - gchar* _tmp3_; + if (!g_str_has_prefix (path, "~")) { +#line 1465 "file.c" + gchar* _tmp0_; #line 193 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp2_ = path; + _tmp0_ = g_strdup (path); #line 193 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp3_ = g_strdup (_tmp2_); -#line 193 "/home/jens/Source/shotwell/src/util/file.vala" - result = _tmp3_; + result = _tmp0_; #line 193 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 1636 "file.c" +#line 1473 "file.c" } #line 195 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp4_ = g_get_home_dir (); -#line 195 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp5_ = path; + _tmp1_ = g_get_home_dir (); #line 195 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp6_ = string_substring (_tmp5_, (glong) 1, (glong) -1); + _tmp2_ = string_substring (path, (glong) 1, (glong) -1); #line 195 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp7_ = _tmp6_; + _tmp3_ = _tmp2_; #line 195 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp8_ = g_strconcat (_tmp4_, _tmp7_, NULL); + _tmp4_ = g_strconcat (_tmp1_, _tmp3_, NULL); #line 195 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp9_ = _tmp8_; + _tmp5_ = _tmp4_; #line 195 "/home/jens/Source/shotwell/src/util/file.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp3_); #line 195 "/home/jens/Source/shotwell/src/util/file.vala" - result = _tmp9_; + result = _tmp5_; #line 195 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 1656 "file.c" +#line 1491 "file.c" } -gchar* get_file_info_id (GFileInfo* info) { +gchar* +get_file_info_id (GFileInfo* info) +{ gchar* result = NULL; - GFileInfo* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + const gchar* _tmp0_; + gchar* _tmp1_; #line 198 "/home/jens/Source/shotwell/src/util/file.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); #line 199 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp0_ = info; -#line 199 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp1_ = g_file_info_get_attribute_string (_tmp0_, G_FILE_ATTRIBUTE_ID_FILE); + _tmp0_ = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_ID_FILE); #line 199 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_tmp0_); #line 199 "/home/jens/Source/shotwell/src/util/file.vala" - result = _tmp2_; + result = _tmp1_; #line 199 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 1677 "file.c" +#line 1511 "file.c" } -void skip_uint64 (GInputStream* input, guint64 skip_amount, GError** error) { +void +skip_uint64 (GInputStream* input, + guint64 skip_amount, + GError** error) +{ GError * _inner_error_ = NULL; #line 203 "/home/jens/Source/shotwell/src/util/file.vala" g_return_if_fail (G_IS_INPUT_STREAM (input)); #line 204 "/home/jens/Source/shotwell/src/util/file.vala" while (TRUE) { -#line 1687 "file.c" - guint64 _tmp0_; - guint64 _tmp1_; -#line 204 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp0_ = skip_amount; #line 204 "/home/jens/Source/shotwell/src/util/file.vala" - if (!(_tmp0_ > ((guint64) 0))) { + if (!(skip_amount > ((guint64) 0))) { #line 204 "/home/jens/Source/shotwell/src/util/file.vala" break; -#line 1696 "file.c" +#line 1529 "file.c" } #line 206 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp1_ = skip_amount; -#line 206 "/home/jens/Source/shotwell/src/util/file.vala" - if (_tmp1_ >= ((guint64) G_MAXSSIZE)) { -#line 1702 "file.c" - GInputStream* _tmp2_; - guint64 _tmp3_; -#line 207 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp2_ = input; + if (skip_amount >= ((guint64) G_MAXSSIZE)) { #line 207 "/home/jens/Source/shotwell/src/util/file.vala" - g_input_stream_skip (_tmp2_, (gsize) G_MAXSSIZE, NULL, &_inner_error_); + g_input_stream_skip (input, (gsize) G_MAXSSIZE, NULL, &_inner_error_); #line 207 "/home/jens/Source/shotwell/src/util/file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 207 "/home/jens/Source/shotwell/src/util/file.vala" g_propagate_error (error, _inner_error_); #line 207 "/home/jens/Source/shotwell/src/util/file.vala" return; -#line 1715 "file.c" +#line 1541 "file.c" } #line 208 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp3_ = skip_amount; -#line 208 "/home/jens/Source/shotwell/src/util/file.vala" - skip_amount = _tmp3_ - G_MAXSSIZE; -#line 1721 "file.c" + skip_amount = skip_amount - G_MAXSSIZE; +#line 1545 "file.c" } else { - GInputStream* _tmp4_; - guint64 _tmp5_; #line 210 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp4_ = input; -#line 210 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp5_ = skip_amount; -#line 210 "/home/jens/Source/shotwell/src/util/file.vala" - g_input_stream_skip (_tmp4_, (gsize) _tmp5_, NULL, &_inner_error_); + g_input_stream_skip (input, (gsize) skip_amount, NULL, &_inner_error_); #line 210 "/home/jens/Source/shotwell/src/util/file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 210 "/home/jens/Source/shotwell/src/util/file.vala" g_propagate_error (error, _inner_error_); #line 210 "/home/jens/Source/shotwell/src/util/file.vala" return; -#line 1737 "file.c" +#line 1555 "file.c" } #line 211 "/home/jens/Source/shotwell/src/util/file.vala" skip_amount = (guint64) 0; -#line 1741 "file.c" +#line 1559 "file.c" } } } -guint64 count_files_in_directory (GFile* dir, GError** error) { +guint64 +count_files_in_directory (GFile* dir, + GError** error) +{ guint64 result = 0ULL; - GFile* _tmp0_; - gboolean _tmp1_; guint64 count = 0ULL; GFileEnumerator* enumerator = NULL; - GFile* _tmp2_; - GFileEnumerator* _tmp3_; + GFileEnumerator* _tmp0_; GFileInfo* info = NULL; GError * _inner_error_ = NULL; #line 217 "/home/jens/Source/shotwell/src/util/file.vala" g_return_val_if_fail (G_IS_FILE (dir), 0ULL); #line 218 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp0_ = dir; -#line 218 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp1_ = query_is_directory (_tmp0_); -#line 218 "/home/jens/Source/shotwell/src/util/file.vala" - if (!_tmp1_) { + if (!query_is_directory (dir)) { #line 219 "/home/jens/Source/shotwell/src/util/file.vala" result = (guint64) 0; #line 219 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 1769 "file.c" +#line 1583 "file.c" } #line 221 "/home/jens/Source/shotwell/src/util/file.vala" count = (guint64) 0; #line 222 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp2_ = dir; + _tmp0_ = g_file_enumerate_children (dir, "standard::*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); #line 222 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp3_ = g_file_enumerate_children (_tmp2_, "standard::*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); -#line 222 "/home/jens/Source/shotwell/src/util/file.vala" - enumerator = _tmp3_; + enumerator = _tmp0_; #line 222 "/home/jens/Source/shotwell/src/util/file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1781 "file.c" - guint64 _tmp4_ = 0ULL; +#line 1593 "file.c" + guint64 _tmp1_ = 0ULL; #line 222 "/home/jens/Source/shotwell/src/util/file.vala" g_propagate_error (error, _inner_error_); #line 222 "/home/jens/Source/shotwell/src/util/file.vala" - return _tmp4_; -#line 1787 "file.c" + return _tmp1_; +#line 1599 "file.c" } #line 225 "/home/jens/Source/shotwell/src/util/file.vala" info = NULL; #line 226 "/home/jens/Source/shotwell/src/util/file.vala" while (TRUE) { -#line 1793 "file.c" - GFileInfo* _tmp5_ = NULL; - GFileEnumerator* _tmp6_; +#line 1605 "file.c" + GFileInfo* _tmp2_ = NULL; + GFileEnumerator* _tmp3_; + GFileInfo* _tmp4_; + GFileInfo* _tmp6_; GFileInfo* _tmp7_; - GFileInfo* _tmp9_; - GFileInfo* _tmp10_; - guint64 _tmp11_; + guint64 _tmp8_; #line 226 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp6_ = enumerator; + _tmp3_ = enumerator; #line 226 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp7_ = g_file_enumerator_next_file (_tmp6_, NULL, &_inner_error_); + _tmp4_ = g_file_enumerator_next_file (_tmp3_, NULL, &_inner_error_); #line 226 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp5_ = _tmp7_; + _tmp2_ = _tmp4_; #line 226 "/home/jens/Source/shotwell/src/util/file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1808 "file.c" - guint64 _tmp8_ = 0ULL; +#line 1620 "file.c" + guint64 _tmp5_ = 0ULL; #line 226 "/home/jens/Source/shotwell/src/util/file.vala" g_propagate_error (error, _inner_error_); #line 226 "/home/jens/Source/shotwell/src/util/file.vala" @@ -1813,34 +1625,34 @@ guint64 count_files_in_directory (GFile* dir, GError** error) { #line 226 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (enumerator); #line 226 "/home/jens/Source/shotwell/src/util/file.vala" - return _tmp8_; -#line 1818 "file.c" + return _tmp5_; +#line 1630 "file.c" } #line 226 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp9_ = _tmp5_; + _tmp6_ = _tmp2_; #line 226 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp5_ = NULL; + _tmp2_ = NULL; #line 226 "/home/jens/Source/shotwell/src/util/file.vala" _g_object_unref0 (info); #line 226 "/home/jens/Source/shotwell/src/util/file.vala" - info = _tmp9_; + info = _tmp6_; #line 226 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp10_ = info; + _tmp7_ = info; #line 226 "/home/jens/Source/shotwell/src/util/file.vala" - if (!(_tmp10_ != NULL)) { + if (!(_tmp7_ != NULL)) { #line 226 "/home/jens/Source/shotwell/src/util/file.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp2_); #line 226 "/home/jens/Source/shotwell/src/util/file.vala" break; -#line 1836 "file.c" +#line 1648 "file.c" } #line 227 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp11_ = count; + _tmp8_ = count; #line 227 "/home/jens/Source/shotwell/src/util/file.vala" - count = _tmp11_ + 1; + count = _tmp8_ + 1; #line 226 "/home/jens/Source/shotwell/src/util/file.vala" - _g_object_unref0 (_tmp5_); -#line 1844 "file.c" + _g_object_unref0 (_tmp2_); +#line 1656 "file.c" } #line 229 "/home/jens/Source/shotwell/src/util/file.vala" result = count; @@ -1850,93 +1662,71 @@ guint64 count_files_in_directory (GFile* dir, GError** error) { _g_object_unref0 (enumerator); #line 229 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 1854 "file.c" +#line 1666 "file.c" } -gboolean file_equal (GFile* a, GFile* b) { +gboolean +file_equal (GFile* a, + GFile* b) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GFile* _tmp2_; #line 233 "/home/jens/Source/shotwell/src/util/file.vala" g_return_val_if_fail ((a == NULL) || G_IS_FILE (a), FALSE); #line 233 "/home/jens/Source/shotwell/src/util/file.vala" g_return_val_if_fail ((b == NULL) || G_IS_FILE (b), FALSE); #line 234 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp2_ = a; -#line 234 "/home/jens/Source/shotwell/src/util/file.vala" - if (_tmp2_ != NULL) { -#line 1871 "file.c" - GFile* _tmp3_; -#line 234 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp3_ = b; + if (a != NULL) { #line 234 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp1_ = _tmp3_ != NULL; -#line 1877 "file.c" + _tmp1_ = b != NULL; +#line 1685 "file.c" } else { #line 234 "/home/jens/Source/shotwell/src/util/file.vala" _tmp1_ = FALSE; -#line 1881 "file.c" +#line 1689 "file.c" } #line 234 "/home/jens/Source/shotwell/src/util/file.vala" if (_tmp1_) { -#line 1885 "file.c" - GFile* _tmp4_; - GFile* _tmp5_; - gboolean _tmp6_; #line 234 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp4_ = a; -#line 234 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp5_ = b; -#line 234 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp6_ = g_file_equal (_tmp4_, _tmp5_); -#line 234 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp0_ = _tmp6_; -#line 1897 "file.c" + _tmp0_ = g_file_equal (a, b); +#line 1695 "file.c" } else { #line 234 "/home/jens/Source/shotwell/src/util/file.vala" _tmp0_ = FALSE; -#line 1901 "file.c" +#line 1699 "file.c" } #line 234 "/home/jens/Source/shotwell/src/util/file.vala" result = _tmp0_; #line 234 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 1907 "file.c" +#line 1705 "file.c" } -guint file_hash (GFile* file) { +guint +file_hash (GFile* file) +{ guint result = 0U; guint _tmp0_ = 0U; - GFile* _tmp1_; #line 238 "/home/jens/Source/shotwell/src/util/file.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), 0U); #line 239 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp1_ = file; -#line 239 "/home/jens/Source/shotwell/src/util/file.vala" - if (_tmp1_ != NULL) { -#line 1921 "file.c" - GFile* _tmp2_; - guint _tmp3_; -#line 239 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp2_ = file; -#line 239 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp3_ = g_file_hash (_tmp2_); + if (file != NULL) { #line 239 "/home/jens/Source/shotwell/src/util/file.vala" - _tmp0_ = _tmp3_; -#line 1930 "file.c" + _tmp0_ = g_file_hash (file); +#line 1720 "file.c" } else { #line 239 "/home/jens/Source/shotwell/src/util/file.vala" _tmp0_ = (guint) 0; -#line 1934 "file.c" +#line 1724 "file.c" } #line 239 "/home/jens/Source/shotwell/src/util/file.vala" result = _tmp0_; #line 239 "/home/jens/Source/shotwell/src/util/file.vala" return result; -#line 1940 "file.c" +#line 1730 "file.c" } diff --git a/src/util/image.c b/src/util/image.c index 324464c..5f3cbd0 100644 --- a/src/util/image.c +++ b/src/util/image.c @@ -1,4 +1,4 @@ -/* image.c generated by valac 0.36.6, the Vala compiler +/* image.c generated by valac 0.40.4, the Vala compiler * generated from image.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -8,6 +8,7 @@ */ /* XPM */ + #include #include #include @@ -72,39 +73,90 @@ extern cairo_surface_t* background_surface; cairo_surface_t* background_surface = NULL; gboolean is_color_parsable (const gchar* spec); -void parse_color (const gchar* spec, GdkRGBA* result); -void fetch_color (const gchar* spec, GdkRGBA* result); -void set_source_color_from_string (cairo_t* ctx, const gchar* spec); +void parse_color (const gchar* spec, + GdkRGBA* result); +void fetch_color (const gchar* spec, + GdkRGBA* result); +void set_source_color_from_string (cairo_t* ctx, + const gchar* spec); #define MIN_SCALED_WIDTH 10 #define MIN_SCALED_HEIGHT 10 GdkPixbuf* get_placeholder_pixbuf (void); -GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gboolean scale_up); +GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, + gint scale, + GdkInterpType interp, + gboolean scale_up); GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); -void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result); -void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dimensions* result); -void dimensions_with_min (Dimensions *self, gint min_width, gint min_height, Dimensions* result); -GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp); +void dimensions_for_pixbuf (GdkPixbuf* pixbuf, + Dimensions* result); +void dimensions_get_scaled (Dimensions *self, + gint scale, + gboolean scale_up, + Dimensions* result); +void dimensions_with_min (Dimensions *self, + gint min_width, + gint min_height, + Dimensions* result); +GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, + Dimensions* resized, + GdkInterpType interp); #define DEGREE (G_PI / 180.0) -void draw_rounded_corners_filled (cairo_t* ctx, Dimensions* dim, GdkPoint* origin, gdouble radius_proportion); -void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gdouble radius_proportion); +void draw_rounded_corners_filled (cairo_t* ctx, + Dimensions* dim, + GdkPoint* origin, + gdouble radius_proportion); +void context_rounded_corners (cairo_t* cx, + Dimensions* dim, + GdkPoint* origin, + gdouble radius_proportion); gint dimensions_minor_axis (Dimensions *self); -guchar shift_color_byte (gint b, gint shift); -void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alpha); -gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect); -gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b); +guchar shift_color_byte (gint b, + gint shift); +void shift_colors (GdkPixbuf* pixbuf, + gint red, + gint green, + gint blue, + gint alpha); +gboolean coord_in_rectangle (gint x, + gint y, + GdkRectangle* rect); +gboolean rectangles_equal (GdkRectangle* a, + GdkRectangle* b); gchar* rectangle_to_string (GdkRectangle* rect); -void clamp_rectangle (GdkRectangle* original, Dimensions* max, GdkRectangle* result); -void scale_point (GdkPoint* p, gdouble factor, GdkPoint* result); -void add_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result); -void subtract_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result); +void clamp_rectangle (GdkRectangle* original, + Dimensions* max, + GdkRectangle* result); +void scale_point (GdkPoint* p, + gdouble factor, + GdkPoint* result); +void add_points (GdkPoint* p1, + GdkPoint* p2, + GdkPoint* result); +void subtract_points (GdkPoint* p1, + GdkPoint* p2, + GdkPoint* result); void fix_cairo_pixbuf (GdkPixbuf* pixbuf); -void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble angle, gdouble* dest_width, gdouble* dest_height); +void compute_arb_rotated_size (gdouble src_width, + gdouble src_height, + gdouble angle, + gdouble* dest_width, + gdouble* dest_height); gdouble degrees_to_radians (gdouble theta); -GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle); -void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, gboolean invert, GdkPoint* result); -void derotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, GdkPoint* result); +GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, + gdouble angle); +void rotate_point_arb (GdkPoint* source_point, + gint img_w, + gint img_h, + gdouble angle, + gboolean invert, + GdkPoint* result); +void derotate_point_arb (GdkPoint* source_point, + gint img_w, + gint img_h, + gdouble angle, + GdkPoint* result); cairo_surface_t* get_background_surface (void); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; @@ -112,145 +164,150 @@ ConfigFacade* config_facade_get_instance (void); gchar* configuration_facade_get_transparent_background_type (ConfigurationFacade* self); gchar* configuration_facade_get_transparent_background_color (ConfigurationFacade* self); void invalidate_transparent_background (void); -void paint_pixmap_with_background (cairo_t* ctx, GdkPixbuf* pixbuf, gint x, gint y); +void paint_pixmap_with_background (cairo_t* ctx, + GdkPixbuf* pixbuf, + gint x, + gint y); GType box_get_type (void) G_GNUC_CONST; Box* box_dup (const Box* self); void box_free (Box* self); -void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle_deg, gboolean preserve_geom, Box* result); -void box_get_offset (Box *self, gint xofs, gint yofs, Box* result); -void box_init (Box *self, gint left, gint top, gint right, gint bottom); +void clamp_inside_rotated_image (Box* src, + gint img_w, + gint img_h, + gdouble angle_deg, + gboolean preserve_geom, + Box* result); +void box_get_offset (Box *self, + gint xofs, + gint yofs, + Box* result); +void box_init (Box *self, + gint left, + gint top, + gint right, + gint bottom); const gchar* fallback_image_missing[103] = {"48 48 54 1 ", " c #6A6D67", ". c #6C6E69", "X c #72746F", "o c #747672", "O c #777974", "+ c #797B77", "@ c #7C7E7A", "# c #7F817C", "$ c #81837F", "% c #848682", "& c #878984", "* c #888A86", "= c #8C8D8A", "- c #8F908C", "; c #90928E", ": c #949591", "> c #969894", ", c #999B96", "< c #9C9E9A", "1 c #9FA09C", "2 c #A1A39E", "3 c #A4A6A2", "4 c #A6A9A4", "5 c #A9ABA6", "6 c #ACADA9", "7 c #AEB1AB", "8 c #B1B2AF", "9 c #B3B4B1", "0 c #B6B9B3", "q c #B9BCB6", "w c #BDBEBA", "e c #BEC2BB", "r c #C1C4BE", "t c #C5C5C2", "y c #C6C9C3", "u c #C9CCC6", "i c #CCCDCB", "p c #CED2CA", "a c #D2D6CE", "s c #D5D5D3", "d c #D7D8D5", "f c #D9D9D6", "g c #DCDCDA", "h c #DFE0DD", "j c #E0E0DE", "k c #E4E4E2", "l c #E7E8E5", "z c #E9E9E7", "x c #EDEDEC", "c c #EFF0EE", "v c #F1F1EF", "b c #F2F2F1", "n c #FFFFFF", "m c None", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmaaaaaaaaaasaisaaaaaaaaaaaaaaaaaaapppiipuuuuumm", "mannnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnym", "manbbbbbbbbbvbbvvvvxvvvbvvvvvvvvccccccxxvxvxxnym", "manbt89898888988888888888999999999999999999txnrm", "manb6======================-;;=;;;;;;;;;;=:7znrm", "manv6&%%**%*%%%%*%%****=======;==;;;;=;=;==7znem", "manv4%%%%$%%%%%%%%%%%=****=======;==-======6znwm", "manx3%%#$$$$##%#$%%%*%**==========-=--=====6znqm", "manx1$@%#$@$###%%%%=****=*===--;;----====*=5lnqm", "manx<@@@@@@@@##%$%%%%****========-==-======5kn0m", "manz<@@@+@+@@@#$%%%%%=%=%===;=:=--------=-*4kn8m", "manz>O+O+O+@@@#$$%%%%========;;=--------=*=3kn9m", "mpnl:OOOOO+@@$##%%%%%=%=====;=;;--;-----===3kn8m", "munl;OooOOO@@@#$%%%%%======;;;;;:;;;;;---==1hn7m", "munl;oXoOO+@###$%%=%=======;::;::::;;---&#+-gn7m", "mynk*XXooOO+$$#$%%%%=%===;;:;:::::;:-$#XooX-fn5m", "mynk*XXOOO@@$$$$%%=%====;::::>::;*#OXXXXXXX*dn5m", "mrnk*oOO@@@#$$$$%=====::::>>>=%@OXOooXXXooo&dn3m", "mrnj*++@$$$$**$===-;;::>>:=@Ooo@XOOoo#o#OOO=fn3m", "menj*@#$$$$$**===;;:::=%@@@@@@O@#O#Oo#o#++@;gn2m", "menj*$$$$&**===;:;=*#@@@@@@@@@@@#######o##%>gn2m", "menh*$$%**===;=*%###########%@@@###$####$%=,gn1m", "m0nj=%***=**&$$$%$$$%$$%$$$$%$$$$$$$$$$%*;:2hn13gn,m", "m0ng****&&&&&&&&&&&&*%*%*%%*%******%**-:,136kz;m", "m0nh***$&&&&&&&&&&&&%**********%*$***;:,1358r7*m", "m8ng*&&&&&&&&&*$&*&&&&$=$=$=&&&&&&**=:,<11>$65mm", "m7ng*&&&&&&&&&**&&&&&&**=$-$&&&&&&*-:,1..&1wi:mm", "m7ng&&&&&&&&=$*$&&&&&***$$$$&&&***=>,1,225;5srw%mmmm", "m4nf3*&&**&&$-$-*******%$;&&*&*->,2365+ui7$mmmmm", "m3nsfffdddsddaffssssdassgaaaassddfgjg4wu;ommmmmm", "m3nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnvq3<$.mmmmmmm", "mm2211111,<,,,,,,>>>>:::;::;----=====@mmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm"}; -gboolean is_color_parsable (const gchar* spec) { +gboolean +is_color_parsable (const gchar* spec) +{ gboolean result = FALSE; GdkRGBA color = {0}; - const gchar* _tmp0_; - gboolean _tmp1_; #line 117 "/home/jens/Source/shotwell/src/util/image.vala" g_return_val_if_fail (spec != NULL, FALSE); #line 118 "/home/jens/Source/shotwell/src/util/image.vala" memset (&color, 0, sizeof (GdkRGBA)); #line 119 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp0_ = spec; -#line 119 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp1_ = gdk_rgba_parse (&color, _tmp0_); -#line 119 "/home/jens/Source/shotwell/src/util/image.vala" - result = _tmp1_; + result = gdk_rgba_parse (&color, spec); #line 119 "/home/jens/Source/shotwell/src/util/image.vala" return result; -#line 143 "image.c" +#line 206 "image.c" } -void parse_color (const gchar* spec, GdkRGBA* result) { - const gchar* _tmp0_; - GdkRGBA _tmp1_ = {0}; +void +parse_color (const gchar* spec, + GdkRGBA* result) +{ + GdkRGBA _tmp0_ = {0}; #line 122 "/home/jens/Source/shotwell/src/util/image.vala" g_return_if_fail (spec != NULL); #line 123 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp0_ = spec; + fetch_color (spec, &_tmp0_); #line 123 "/home/jens/Source/shotwell/src/util/image.vala" - fetch_color (_tmp0_, &_tmp1_); -#line 123 "/home/jens/Source/shotwell/src/util/image.vala" - *result = _tmp1_; + *result = _tmp0_; #line 123 "/home/jens/Source/shotwell/src/util/image.vala" return; -#line 160 "image.c" +#line 223 "image.c" } -void fetch_color (const gchar* spec, GdkRGBA* result) { +void +fetch_color (const gchar* spec, + GdkRGBA* result) +{ GdkRGBA rgba = {0}; - const gchar* _tmp0_; - gboolean _tmp1_; #line 126 "/home/jens/Source/shotwell/src/util/image.vala" g_return_if_fail (spec != NULL); #line 127 "/home/jens/Source/shotwell/src/util/image.vala" memset (&rgba, 0, sizeof (GdkRGBA)); #line 128 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp0_ = spec; -#line 128 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp1_ = gdk_rgba_parse (&rgba, _tmp0_); -#line 128 "/home/jens/Source/shotwell/src/util/image.vala" - if (!_tmp1_) { -#line 178 "image.c" - const gchar* _tmp2_; + if (!gdk_rgba_parse (&rgba, spec)) { #line 129 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp2_ = spec; -#line 129 "/home/jens/Source/shotwell/src/util/image.vala" - g_error ("image.vala:129: Can't parse color %s", _tmp2_); -#line 184 "image.c" + g_error ("image.vala:129: Can't parse color %s", spec); +#line 240 "image.c" } #line 131 "/home/jens/Source/shotwell/src/util/image.vala" *result = rgba; #line 131 "/home/jens/Source/shotwell/src/util/image.vala" return; -#line 190 "image.c" +#line 246 "image.c" } -void set_source_color_from_string (cairo_t* ctx, const gchar* spec) { +void +set_source_color_from_string (cairo_t* ctx, + const gchar* spec) +{ GdkRGBA rgba = {0}; - const gchar* _tmp0_; - GdkRGBA _tmp1_ = {0}; - cairo_t* _tmp2_; + GdkRGBA _tmp0_ = {0}; + GdkRGBA _tmp1_; + gdouble _tmp2_; GdkRGBA _tmp3_; gdouble _tmp4_; GdkRGBA _tmp5_; gdouble _tmp6_; GdkRGBA _tmp7_; gdouble _tmp8_; - GdkRGBA _tmp9_; - gdouble _tmp10_; #line 134 "/home/jens/Source/shotwell/src/util/image.vala" g_return_if_fail (ctx != NULL); #line 134 "/home/jens/Source/shotwell/src/util/image.vala" g_return_if_fail (spec != NULL); #line 135 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp0_ = spec; -#line 135 "/home/jens/Source/shotwell/src/util/image.vala" - fetch_color (_tmp0_, &_tmp1_); + fetch_color (spec, &_tmp0_); #line 135 "/home/jens/Source/shotwell/src/util/image.vala" - rgba = _tmp1_; + rgba = _tmp0_; #line 136 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp2_ = ctx; + _tmp1_ = rgba; +#line 136 "/home/jens/Source/shotwell/src/util/image.vala" + _tmp2_ = _tmp1_.red; #line 136 "/home/jens/Source/shotwell/src/util/image.vala" _tmp3_ = rgba; #line 136 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp4_ = _tmp3_.red; + _tmp4_ = _tmp3_.green; #line 136 "/home/jens/Source/shotwell/src/util/image.vala" _tmp5_ = rgba; #line 136 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp6_ = _tmp5_.green; + _tmp6_ = _tmp5_.blue; #line 136 "/home/jens/Source/shotwell/src/util/image.vala" _tmp7_ = rgba; #line 136 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp8_ = _tmp7_.blue; -#line 136 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp9_ = rgba; + _tmp8_ = _tmp7_.alpha; #line 136 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp10_ = _tmp9_.alpha; -#line 136 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_set_source_rgba (_tmp2_, _tmp4_, _tmp6_, _tmp8_, _tmp10_); -#line 237 "image.c" + cairo_set_source_rgba (ctx, _tmp2_, _tmp4_, _tmp6_, _tmp8_); +#line 290 "image.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 147 "/home/jens/Source/shotwell/src/util/image.vala" return self ? g_object_ref (self) : NULL; -#line 244 "image.c" +#line 299 "image.c" } -GdkPixbuf* get_placeholder_pixbuf (void) { +GdkPixbuf* +get_placeholder_pixbuf (void) +{ GdkPixbuf* result = NULL; GdkPixbuf* pixbuf = NULL; GError * _inner_error_ = NULL; #line 144 "/home/jens/Source/shotwell/src/util/image.vala" pixbuf = NULL; -#line 254 "image.c" +#line 311 "image.c" { GtkIconTheme* icon_theme = NULL; GtkIconTheme* _tmp0_; @@ -272,7 +329,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 148 "/home/jens/Source/shotwell/src/util/image.vala" _g_object_unref0 (icon_theme); -#line 276 "image.c" +#line 333 "image.c" goto __catch4_g_error; } #line 148 "/home/jens/Source/shotwell/src/util/image.vala" @@ -287,7 +344,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) { _g_object_unref0 (_tmp2_); #line 146 "/home/jens/Source/shotwell/src/util/image.vala" _g_object_unref0 (icon_theme); -#line 291 "image.c" +#line 348 "image.c" } goto __finally4; __catch4_g_error: @@ -314,7 +371,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) { g_warning ("image.vala:152: Could not load icon from theme: %s", _tmp7_); #line 146 "/home/jens/Source/shotwell/src/util/image.vala" _g_error_free0 (_error_); -#line 318 "image.c" +#line 375 "image.c" } __finally4: #line 146 "/home/jens/Source/shotwell/src/util/image.vala" @@ -327,232 +384,213 @@ GdkPixbuf* get_placeholder_pixbuf (void) { g_clear_error (&_inner_error_); #line 146 "/home/jens/Source/shotwell/src/util/image.vala" return NULL; -#line 331 "image.c" +#line 388 "image.c" } #line 155 "/home/jens/Source/shotwell/src/util/image.vala" result = pixbuf; #line 155 "/home/jens/Source/shotwell/src/util/image.vala" return result; -#line 337 "image.c" +#line 394 "image.c" } -GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gboolean scale_up) { +GdkPixbuf* +scale_pixbuf (GdkPixbuf* pixbuf, + gint scale, + GdkInterpType interp, + gboolean scale_up) +{ GdkPixbuf* result = NULL; Dimensions original = {0}; - GdkPixbuf* _tmp0_; - Dimensions _tmp1_ = {0}; + Dimensions _tmp0_ = {0}; Dimensions scaled = {0}; - gint _tmp2_; - gboolean _tmp3_; - Dimensions _tmp4_ = {0}; - gboolean _tmp5_ = FALSE; - Dimensions _tmp6_; - gint _tmp7_; - Dimensions _tmp8_; - gint _tmp9_; - Dimensions _tmp16_ = {0}; + Dimensions _tmp1_ = {0}; + gboolean _tmp2_ = FALSE; + Dimensions _tmp3_; + gint _tmp4_; + Dimensions _tmp5_; + gint _tmp6_; + Dimensions _tmp12_ = {0}; + Dimensions _tmp13_; + gint _tmp14_; + Dimensions _tmp15_; + gint _tmp16_; GdkPixbuf* _tmp17_; - Dimensions _tmp18_; - gint _tmp19_; - Dimensions _tmp20_; - gint _tmp21_; - GdkInterpType _tmp22_; - GdkPixbuf* _tmp23_; #line 158 "/home/jens/Source/shotwell/src/util/image.vala" g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL); #line 159 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp0_ = pixbuf; + dimensions_for_pixbuf (pixbuf, &_tmp0_); #line 159 "/home/jens/Source/shotwell/src/util/image.vala" - dimensions_for_pixbuf (_tmp0_, &_tmp1_); -#line 159 "/home/jens/Source/shotwell/src/util/image.vala" - original = _tmp1_; -#line 160 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp2_ = scale; + original = _tmp0_; #line 160 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp3_ = scale_up; + dimensions_get_scaled (&original, scale, scale_up, &_tmp1_); #line 160 "/home/jens/Source/shotwell/src/util/image.vala" - dimensions_get_scaled (&original, _tmp2_, _tmp3_, &_tmp4_); -#line 160 "/home/jens/Source/shotwell/src/util/image.vala" - scaled = _tmp4_; + scaled = _tmp1_; #line 161 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp6_ = original; + _tmp3_ = original; #line 161 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp7_ = _tmp6_.width; + _tmp4_ = _tmp3_.width; #line 161 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp8_ = scaled; + _tmp5_ = scaled; #line 161 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp9_ = _tmp8_.width; + _tmp6_ = _tmp5_.width; #line 161 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp7_ == _tmp9_) { -#line 389 "image.c" - Dimensions _tmp10_; - gint _tmp11_; - Dimensions _tmp12_; - gint _tmp13_; + if (_tmp4_ == _tmp6_) { +#line 440 "image.c" + Dimensions _tmp7_; + gint _tmp8_; + Dimensions _tmp9_; + gint _tmp10_; #line 161 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp10_ = original; + _tmp7_ = original; #line 161 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp11_ = _tmp10_.height; + _tmp8_ = _tmp7_.height; #line 161 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp12_ = scaled; + _tmp9_ = scaled; #line 161 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp13_ = _tmp12_.height; + _tmp10_ = _tmp9_.height; #line 161 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp5_ = _tmp11_ == _tmp13_; -#line 404 "image.c" + _tmp2_ = _tmp8_ == _tmp10_; +#line 455 "image.c" } else { #line 161 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp5_ = FALSE; -#line 408 "image.c" + _tmp2_ = FALSE; +#line 459 "image.c" } #line 161 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp5_) { -#line 412 "image.c" - GdkPixbuf* _tmp14_; - GdkPixbuf* _tmp15_; -#line 162 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp14_ = pixbuf; + if (_tmp2_) { +#line 463 "image.c" + GdkPixbuf* _tmp11_; #line 162 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp15_ = _g_object_ref0 (_tmp14_); + _tmp11_ = _g_object_ref0 (pixbuf); #line 162 "/home/jens/Source/shotwell/src/util/image.vala" - result = _tmp15_; + result = _tmp11_; #line 162 "/home/jens/Source/shotwell/src/util/image.vala" return result; -#line 423 "image.c" +#line 471 "image.c" } #line 165 "/home/jens/Source/shotwell/src/util/image.vala" - dimensions_with_min (&scaled, MIN_SCALED_WIDTH, MIN_SCALED_HEIGHT, &_tmp16_); + dimensions_with_min (&scaled, MIN_SCALED_WIDTH, MIN_SCALED_HEIGHT, &_tmp12_); #line 165 "/home/jens/Source/shotwell/src/util/image.vala" - scaled = _tmp16_; + scaled = _tmp12_; #line 167 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp17_ = pixbuf; + _tmp13_ = scaled; #line 167 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp18_ = scaled; + _tmp14_ = _tmp13_.width; #line 167 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp19_ = _tmp18_.width; + _tmp15_ = scaled; #line 167 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp20_ = scaled; -#line 167 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp21_ = _tmp20_.height; -#line 167 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp22_ = interp; + _tmp16_ = _tmp15_.height; #line 167 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp23_ = gdk_pixbuf_scale_simple (_tmp17_, _tmp19_, _tmp21_, _tmp22_); + _tmp17_ = gdk_pixbuf_scale_simple (pixbuf, _tmp14_, _tmp16_, interp); #line 167 "/home/jens/Source/shotwell/src/util/image.vala" - result = _tmp23_; + result = _tmp17_; #line 167 "/home/jens/Source/shotwell/src/util/image.vala" return result; -#line 447 "image.c" +#line 491 "image.c" } -GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp) { +GdkPixbuf* +resize_pixbuf (GdkPixbuf* pixbuf, + Dimensions* resized, + GdkInterpType interp) +{ GdkPixbuf* result = NULL; Dimensions original = {0}; - GdkPixbuf* _tmp0_; - Dimensions _tmp1_ = {0}; - gboolean _tmp2_ = FALSE; - Dimensions _tmp3_; - gint _tmp4_; - Dimensions _tmp5_; - gint _tmp6_; - Dimensions _tmp13_ = {0}; - GdkPixbuf* _tmp14_; - Dimensions _tmp15_; - gint _tmp16_; - Dimensions _tmp17_; - gint _tmp18_; - GdkInterpType _tmp19_; - GdkPixbuf* _tmp20_; + Dimensions _tmp0_ = {0}; + gboolean _tmp1_ = FALSE; + Dimensions _tmp2_; + gint _tmp3_; + Dimensions _tmp4_; + gint _tmp5_; + Dimensions _tmp11_ = {0}; + Dimensions _tmp12_; + gint _tmp13_; + Dimensions _tmp14_; + gint _tmp15_; + GdkPixbuf* _tmp16_; #line 170 "/home/jens/Source/shotwell/src/util/image.vala" g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL); #line 170 "/home/jens/Source/shotwell/src/util/image.vala" g_return_val_if_fail (resized != NULL, NULL); #line 171 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp0_ = pixbuf; + dimensions_for_pixbuf (pixbuf, &_tmp0_); #line 171 "/home/jens/Source/shotwell/src/util/image.vala" - dimensions_for_pixbuf (_tmp0_, &_tmp1_); -#line 171 "/home/jens/Source/shotwell/src/util/image.vala" - original = _tmp1_; + original = _tmp0_; #line 172 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp3_ = original; + _tmp2_ = original; #line 172 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp4_ = _tmp3_.width; + _tmp3_ = _tmp2_.width; #line 172 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp5_ = *resized; + _tmp4_ = *resized; #line 172 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp6_ = _tmp5_.width; + _tmp5_ = _tmp4_.width; #line 172 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp4_ == _tmp6_) { -#line 489 "image.c" - Dimensions _tmp7_; - gint _tmp8_; - Dimensions _tmp9_; - gint _tmp10_; + if (_tmp3_ == _tmp5_) { +#line 532 "image.c" + Dimensions _tmp6_; + gint _tmp7_; + Dimensions _tmp8_; + gint _tmp9_; #line 172 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp7_ = original; + _tmp6_ = original; #line 172 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp8_ = _tmp7_.height; + _tmp7_ = _tmp6_.height; #line 172 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp9_ = *resized; + _tmp8_ = *resized; #line 172 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp10_ = _tmp9_.height; + _tmp9_ = _tmp8_.height; #line 172 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp2_ = _tmp8_ == _tmp10_; -#line 504 "image.c" + _tmp1_ = _tmp7_ == _tmp9_; +#line 547 "image.c" } else { #line 172 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp2_ = FALSE; -#line 508 "image.c" + _tmp1_ = FALSE; +#line 551 "image.c" } #line 172 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp2_) { -#line 512 "image.c" - GdkPixbuf* _tmp11_; - GdkPixbuf* _tmp12_; -#line 173 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp11_ = pixbuf; + if (_tmp1_) { +#line 555 "image.c" + GdkPixbuf* _tmp10_; #line 173 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp12_ = _g_object_ref0 (_tmp11_); + _tmp10_ = _g_object_ref0 (pixbuf); #line 173 "/home/jens/Source/shotwell/src/util/image.vala" - result = _tmp12_; + result = _tmp10_; #line 173 "/home/jens/Source/shotwell/src/util/image.vala" return result; -#line 523 "image.c" +#line 563 "image.c" } #line 176 "/home/jens/Source/shotwell/src/util/image.vala" - dimensions_with_min (resized, MIN_SCALED_WIDTH, MIN_SCALED_HEIGHT, &_tmp13_); + dimensions_with_min (resized, MIN_SCALED_WIDTH, MIN_SCALED_HEIGHT, &_tmp11_); #line 176 "/home/jens/Source/shotwell/src/util/image.vala" - *resized = _tmp13_; -#line 178 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp14_ = pixbuf; + *resized = _tmp11_; #line 178 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp15_ = *resized; + _tmp12_ = *resized; #line 178 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp16_ = _tmp15_.width; -#line 178 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp17_ = *resized; + _tmp13_ = _tmp12_.width; #line 178 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp18_ = _tmp17_.height; + _tmp14_ = *resized; #line 178 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp19_ = interp; + _tmp15_ = _tmp14_.height; #line 178 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp20_ = gdk_pixbuf_scale_simple (_tmp14_, _tmp16_, _tmp18_, _tmp19_); + _tmp16_ = gdk_pixbuf_scale_simple (pixbuf, _tmp13_, _tmp15_, interp); #line 178 "/home/jens/Source/shotwell/src/util/image.vala" - result = _tmp20_; + result = _tmp16_; #line 178 "/home/jens/Source/shotwell/src/util/image.vala" return result; -#line 547 "image.c" +#line 583 "image.c" } -void draw_rounded_corners_filled (cairo_t* ctx, Dimensions* dim, GdkPoint* origin, gdouble radius_proportion) { - cairo_t* _tmp0_; - Dimensions _tmp1_; - GdkPoint _tmp2_; - gdouble _tmp3_; - cairo_t* _tmp4_; +void +draw_rounded_corners_filled (cairo_t* ctx, + Dimensions* dim, + GdkPoint* origin, + gdouble radius_proportion) +{ + Dimensions _tmp0_; + GdkPoint _tmp1_; #line 183 "/home/jens/Source/shotwell/src/util/image.vala" g_return_if_fail (ctx != NULL); #line 183 "/home/jens/Source/shotwell/src/util/image.vala" @@ -560,51 +598,40 @@ void draw_rounded_corners_filled (cairo_t* ctx, Dimensions* dim, GdkPoint* origi #line 183 "/home/jens/Source/shotwell/src/util/image.vala" g_return_if_fail (origin != NULL); #line 185 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp0_ = ctx; + _tmp0_ = *dim; #line 185 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp1_ = *dim; + _tmp1_ = *origin; #line 185 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp2_ = *origin; -#line 185 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp3_ = radius_proportion; -#line 185 "/home/jens/Source/shotwell/src/util/image.vala" - context_rounded_corners (_tmp0_, &_tmp1_, &_tmp2_, _tmp3_); + context_rounded_corners (ctx, &_tmp0_, &_tmp1_, radius_proportion); #line 186 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp4_ = ctx; -#line 186 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_paint (_tmp4_); -#line 577 "image.c" + cairo_paint (ctx); +#line 609 "image.c" } -void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gdouble radius_proportion) { - gdouble _tmp0_; - gdouble _tmp1_; +void +context_rounded_corners (cairo_t* cx, + Dimensions* dim, + GdkPoint* origin, + gdouble radius_proportion) +{ gdouble left = 0.0; + GdkPoint _tmp0_; + gint _tmp1_; + gdouble top = 0.0; GdkPoint _tmp2_; gint _tmp3_; - gdouble top = 0.0; + gdouble right = 0.0; GdkPoint _tmp4_; gint _tmp5_; - gdouble right = 0.0; - GdkPoint _tmp6_; + Dimensions _tmp6_; gint _tmp7_; - Dimensions _tmp8_; - gint _tmp9_; gdouble bottom = 0.0; - GdkPoint _tmp10_; + GdkPoint _tmp8_; + gint _tmp9_; + Dimensions _tmp10_; gint _tmp11_; - Dimensions _tmp12_; - gint _tmp13_; gdouble radius = 0.0; - gint _tmp14_; - gdouble _tmp15_; - cairo_t* _tmp16_; - cairo_t* _tmp17_; - cairo_t* _tmp18_; - cairo_t* _tmp19_; - cairo_t* _tmp20_; - cairo_t* _tmp21_; #line 189 "/home/jens/Source/shotwell/src/util/image.vala" g_return_if_fail (cx != NULL); #line 189 "/home/jens/Source/shotwell/src/util/image.vala" @@ -612,490 +639,367 @@ void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gd #line 189 "/home/jens/Source/shotwell/src/util/image.vala" g_return_if_fail (origin != NULL); #line 192 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp0_ = radius_proportion; -#line 192 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp1_ = CLAMP (_tmp0_, 2.0, 100.0); -#line 192 "/home/jens/Source/shotwell/src/util/image.vala" - radius_proportion = _tmp1_; + radius_proportion = CLAMP (radius_proportion, 2.0, 100.0); #line 194 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp2_ = *origin; + _tmp0_ = *origin; #line 194 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp3_ = _tmp2_.x; + _tmp1_ = _tmp0_.x; #line 194 "/home/jens/Source/shotwell/src/util/image.vala" - left = (gdouble) _tmp3_; + left = (gdouble) _tmp1_; #line 195 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp4_ = *origin; + _tmp2_ = *origin; #line 195 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp5_ = _tmp4_.y; + _tmp3_ = _tmp2_.y; #line 195 "/home/jens/Source/shotwell/src/util/image.vala" - top = (gdouble) _tmp5_; + top = (gdouble) _tmp3_; #line 196 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp6_ = *origin; + _tmp4_ = *origin; #line 196 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp7_ = _tmp6_.x; + _tmp5_ = _tmp4_.x; #line 196 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp8_ = *dim; + _tmp6_ = *dim; #line 196 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp9_ = _tmp8_.width; + _tmp7_ = _tmp6_.width; #line 196 "/home/jens/Source/shotwell/src/util/image.vala" - right = (gdouble) (_tmp7_ + _tmp9_); + right = (gdouble) (_tmp5_ + _tmp7_); #line 197 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp10_ = *origin; + _tmp8_ = *origin; #line 197 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp11_ = _tmp10_.y; + _tmp9_ = _tmp8_.y; #line 197 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp12_ = *dim; + _tmp10_ = *dim; #line 197 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp13_ = _tmp12_.height; + _tmp11_ = _tmp10_.height; #line 197 "/home/jens/Source/shotwell/src/util/image.vala" - bottom = (gdouble) (_tmp11_ + _tmp13_); -#line 200 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp14_ = dimensions_minor_axis (dim); + bottom = (gdouble) (_tmp9_ + _tmp11_); #line 200 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp15_ = radius_proportion; -#line 200 "/home/jens/Source/shotwell/src/util/image.vala" - radius = ((gdouble) _tmp14_) / _tmp15_; -#line 204 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp16_ = cx; + radius = ((gdouble) dimensions_minor_axis (dim)) / radius_proportion; #line 204 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_move_to (_tmp16_, left, top); + cairo_move_to (cx, left, top); #line 205 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp17_ = cx; -#line 205 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_arc (_tmp17_, right - radius, top + radius, radius, -90 * DEGREE, 0 * DEGREE); -#line 206 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp18_ = cx; + cairo_arc (cx, right - radius, top + radius, radius, -90 * DEGREE, 0 * DEGREE); #line 206 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_arc (_tmp18_, right - radius, bottom - radius, radius, 0 * DEGREE, 90 * DEGREE); + cairo_arc (cx, right - radius, bottom - radius, radius, 0 * DEGREE, 90 * DEGREE); #line 207 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp19_ = cx; -#line 207 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_arc (_tmp19_, left + radius, bottom - radius, radius, 90 * DEGREE, 180 * DEGREE); -#line 208 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp20_ = cx; + cairo_arc (cx, left + radius, bottom - radius, radius, 90 * DEGREE, 180 * DEGREE); #line 208 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_arc (_tmp20_, left + radius, top + radius, radius, 180 * DEGREE, 270 * DEGREE); -#line 209 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp21_ = cx; + cairo_arc (cx, left + radius, top + radius, radius, 180 * DEGREE, 270 * DEGREE); #line 209 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_clip (_tmp21_); -#line 683 "image.c" + cairo_clip (cx); +#line 690 "image.c" } -inline guchar shift_color_byte (gint b, gint shift) { +inline guchar +shift_color_byte (gint b, + gint shift) +{ guchar result = '\0'; - gint _tmp0_; - gint _tmp1_; - gint _tmp2_; #line 213 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp0_ = b; -#line 213 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp1_ = shift; -#line 213 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp2_ = CLAMP (_tmp0_ + _tmp1_, 0, 255); -#line 213 "/home/jens/Source/shotwell/src/util/image.vala" - result = (guchar) _tmp2_; + result = (guchar) CLAMP (b + shift, 0, 255); #line 213 "/home/jens/Source/shotwell/src/util/image.vala" return result; -#line 702 "image.c" +#line 703 "image.c" } -void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alpha) { +void +shift_colors (GdkPixbuf* pixbuf, + gint red, + gint green, + gint blue, + gint alpha) +{ gboolean _tmp0_ = FALSE; - gint _tmp1_; + gboolean _tmp1_ = FALSE; + gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; - gint _tmp4_; - gboolean _tmp6_ = FALSE; - gint _tmp7_; - gboolean _tmp9_ = FALSE; - gint _tmp10_; gint width = 0; - GdkPixbuf* _tmp12_; - gint _tmp13_; gint height = 0; - GdkPixbuf* _tmp14_; - gint _tmp15_; gint rowstride = 0; - GdkPixbuf* _tmp16_; - gint _tmp17_; gint channels = 0; - GdkPixbuf* _tmp18_; - gint _tmp19_; guchar* pixels = NULL; - GdkPixbuf* _tmp20_; - guint8* _tmp21_; - gint _tmp22_; - GdkPixbuf* _tmp23_; - GdkColorspace _tmp24_; - GdkPixbuf* _tmp25_; - gint _tmp26_; + guint8* _tmp4_; + gint _tmp5_; #line 216 "/home/jens/Source/shotwell/src/util/image.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); #line 217 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp1_ = red; -#line 217 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp1_ >= -255) { -#line 741 "image.c" - gint _tmp2_; + if (red >= -255) { #line 217 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp2_ = red; -#line 217 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp0_ = _tmp2_ <= 255; -#line 747 "image.c" + _tmp0_ = red <= 255; +#line 731 "image.c" } else { #line 217 "/home/jens/Source/shotwell/src/util/image.vala" _tmp0_ = FALSE; -#line 751 "image.c" +#line 735 "image.c" } #line 217 "/home/jens/Source/shotwell/src/util/image.vala" _vala_assert (_tmp0_, "red >= -255 && red <= 255"); #line 218 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp4_ = green; -#line 218 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp4_ >= -255) { -#line 759 "image.c" - gint _tmp5_; -#line 218 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp5_ = green; + if (green >= -255) { #line 218 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp3_ = _tmp5_ <= 255; -#line 765 "image.c" + _tmp1_ = green <= 255; +#line 743 "image.c" } else { #line 218 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp3_ = FALSE; -#line 769 "image.c" + _tmp1_ = FALSE; +#line 747 "image.c" } #line 218 "/home/jens/Source/shotwell/src/util/image.vala" - _vala_assert (_tmp3_, "green >= -255 && green <= 255"); -#line 219 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp7_ = blue; + _vala_assert (_tmp1_, "green >= -255 && green <= 255"); #line 219 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp7_ >= -255) { -#line 777 "image.c" - gint _tmp8_; -#line 219 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp8_ = blue; + if (blue >= -255) { #line 219 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp6_ = _tmp8_ <= 255; -#line 783 "image.c" + _tmp2_ = blue <= 255; +#line 755 "image.c" } else { #line 219 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp6_ = FALSE; -#line 787 "image.c" + _tmp2_ = FALSE; +#line 759 "image.c" } #line 219 "/home/jens/Source/shotwell/src/util/image.vala" - _vala_assert (_tmp6_, "blue >= -255 && blue <= 255"); + _vala_assert (_tmp2_, "blue >= -255 && blue <= 255"); #line 220 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp10_ = alpha; + if (alpha >= -255) { #line 220 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp10_ >= -255) { -#line 795 "image.c" - gint _tmp11_; -#line 220 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp11_ = alpha; -#line 220 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp9_ = _tmp11_ <= 255; -#line 801 "image.c" + _tmp3_ = alpha <= 255; +#line 767 "image.c" } else { #line 220 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp9_ = FALSE; -#line 805 "image.c" + _tmp3_ = FALSE; +#line 771 "image.c" } #line 220 "/home/jens/Source/shotwell/src/util/image.vala" - _vala_assert (_tmp9_, "alpha >= -255 && alpha <= 255"); -#line 222 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp12_ = pixbuf; + _vala_assert (_tmp3_, "alpha >= -255 && alpha <= 255"); #line 222 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp13_ = gdk_pixbuf_get_width (_tmp12_); -#line 222 "/home/jens/Source/shotwell/src/util/image.vala" - width = _tmp13_; -#line 223 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp14_ = pixbuf; + width = gdk_pixbuf_get_width (pixbuf); #line 223 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp15_ = gdk_pixbuf_get_height (_tmp14_); -#line 223 "/home/jens/Source/shotwell/src/util/image.vala" - height = _tmp15_; -#line 224 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp16_ = pixbuf; + height = gdk_pixbuf_get_height (pixbuf); #line 224 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp17_ = gdk_pixbuf_get_rowstride (_tmp16_); -#line 224 "/home/jens/Source/shotwell/src/util/image.vala" - rowstride = _tmp17_; -#line 225 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp18_ = pixbuf; + rowstride = gdk_pixbuf_get_rowstride (pixbuf); #line 225 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp19_ = gdk_pixbuf_get_n_channels (_tmp18_); -#line 225 "/home/jens/Source/shotwell/src/util/image.vala" - channels = _tmp19_; -#line 226 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp20_ = pixbuf; + channels = gdk_pixbuf_get_n_channels (pixbuf); #line 226 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp21_ = gdk_pixbuf_get_pixels (_tmp20_); + _tmp4_ = gdk_pixbuf_get_pixels (pixbuf); #line 226 "/home/jens/Source/shotwell/src/util/image.vala" - pixels = _tmp21_; + pixels = _tmp4_; #line 228 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp22_ = channels; + _tmp5_ = channels; #line 228 "/home/jens/Source/shotwell/src/util/image.vala" - _vala_assert (_tmp22_ >= 3, "channels >= 3"); + _vala_assert (_tmp5_ >= 3, "channels >= 3"); #line 229 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp23_ = pixbuf; -#line 229 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp24_ = gdk_pixbuf_get_colorspace (_tmp23_); -#line 229 "/home/jens/Source/shotwell/src/util/image.vala" - _vala_assert (_tmp24_ == GDK_COLORSPACE_RGB, "pixbuf.get_colorspace() == Gdk.Colorspace.RGB"); -#line 230 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp25_ = pixbuf; -#line 230 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp26_ = gdk_pixbuf_get_bits_per_sample (_tmp25_); + _vala_assert (gdk_pixbuf_get_colorspace (pixbuf) == GDK_COLORSPACE_RGB, "pixbuf.get_colorspace() == Gdk.Colorspace.RGB"); #line 230 "/home/jens/Source/shotwell/src/util/image.vala" - _vala_assert (_tmp26_ == 8, "pixbuf.get_bits_per_sample() == 8"); -#line 855 "image.c" + _vala_assert (gdk_pixbuf_get_bits_per_sample (pixbuf) == 8, "pixbuf.get_bits_per_sample() == 8"); +#line 795 "image.c" { gint y = 0; #line 232 "/home/jens/Source/shotwell/src/util/image.vala" y = 0; -#line 860 "image.c" +#line 800 "image.c" { - gboolean _tmp27_ = FALSE; + gboolean _tmp6_ = FALSE; #line 232 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp27_ = TRUE; + _tmp6_ = TRUE; #line 232 "/home/jens/Source/shotwell/src/util/image.vala" while (TRUE) { -#line 867 "image.c" - gint _tmp29_; - gint _tmp30_; +#line 807 "image.c" + gint _tmp8_; + gint _tmp9_; gint y_offset = 0; - gint _tmp31_; - gint _tmp32_; + gint _tmp10_; + gint _tmp11_; #line 232 "/home/jens/Source/shotwell/src/util/image.vala" - if (!_tmp27_) { -#line 875 "image.c" - gint _tmp28_; + if (!_tmp6_) { +#line 815 "image.c" + gint _tmp7_; #line 232 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp28_ = y; + _tmp7_ = y; #line 232 "/home/jens/Source/shotwell/src/util/image.vala" - y = _tmp28_ + 1; -#line 881 "image.c" + y = _tmp7_ + 1; +#line 821 "image.c" } #line 232 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp27_ = FALSE; + _tmp6_ = FALSE; #line 232 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp29_ = y; + _tmp8_ = y; #line 232 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp30_ = height; + _tmp9_ = height; #line 232 "/home/jens/Source/shotwell/src/util/image.vala" - if (!(_tmp29_ < _tmp30_)) { + if (!(_tmp8_ < _tmp9_)) { #line 232 "/home/jens/Source/shotwell/src/util/image.vala" break; -#line 893 "image.c" +#line 833 "image.c" } #line 233 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp31_ = y; + _tmp10_ = y; #line 233 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp32_ = rowstride; + _tmp11_ = rowstride; #line 233 "/home/jens/Source/shotwell/src/util/image.vala" - y_offset = _tmp31_ * _tmp32_; -#line 901 "image.c" + y_offset = _tmp10_ * _tmp11_; +#line 841 "image.c" { gint x = 0; #line 235 "/home/jens/Source/shotwell/src/util/image.vala" x = 0; -#line 906 "image.c" +#line 846 "image.c" { - gboolean _tmp33_ = FALSE; + gboolean _tmp12_ = FALSE; #line 235 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp33_ = TRUE; + _tmp12_ = TRUE; #line 235 "/home/jens/Source/shotwell/src/util/image.vala" while (TRUE) { -#line 913 "image.c" - gint _tmp35_; - gint _tmp36_; +#line 853 "image.c" + gint _tmp14_; + gint _tmp15_; gint offset = 0; - gint _tmp37_; - gint _tmp38_; - gint _tmp39_; - gint _tmp40_; - gint _tmp49_; - gint _tmp58_; - gboolean _tmp67_ = FALSE; - gint _tmp68_; + gint _tmp16_; + gint _tmp17_; + gint _tmp18_; + gboolean _tmp37_ = FALSE; #line 235 "/home/jens/Source/shotwell/src/util/image.vala" - if (!_tmp33_) { -#line 927 "image.c" - gint _tmp34_; + if (!_tmp12_) { +#line 863 "image.c" + gint _tmp13_; #line 235 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp34_ = x; + _tmp13_ = x; #line 235 "/home/jens/Source/shotwell/src/util/image.vala" - x = _tmp34_ + 1; -#line 933 "image.c" + x = _tmp13_ + 1; +#line 869 "image.c" } #line 235 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp33_ = FALSE; + _tmp12_ = FALSE; #line 235 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp35_ = x; + _tmp14_ = x; #line 235 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp36_ = width; + _tmp15_ = width; #line 235 "/home/jens/Source/shotwell/src/util/image.vala" - if (!(_tmp35_ < _tmp36_)) { + if (!(_tmp14_ < _tmp15_)) { #line 235 "/home/jens/Source/shotwell/src/util/image.vala" break; -#line 945 "image.c" +#line 881 "image.c" } #line 236 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp37_ = y_offset; + _tmp16_ = y_offset; #line 236 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp38_ = x; + _tmp17_ = x; #line 236 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp39_ = channels; + _tmp18_ = channels; #line 236 "/home/jens/Source/shotwell/src/util/image.vala" - offset = _tmp37_ + (_tmp38_ * _tmp39_); -#line 238 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp40_ = red; + offset = _tmp16_ + (_tmp17_ * _tmp18_); #line 238 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp40_ != 0) { -#line 959 "image.c" - guchar* _tmp41_; - gint _tmp42_; - guchar* _tmp43_; - gint _tmp44_; - guchar _tmp45_; - gint _tmp46_; - guchar _tmp47_; - guchar _tmp48_; -#line 239 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp41_ = pixels; -#line 239 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp42_ = offset; + if (red != 0) { +#line 893 "image.c" + guchar* _tmp19_; + gint _tmp20_; + guchar* _tmp21_; + gint _tmp22_; + guchar _tmp23_; + guchar _tmp24_; #line 239 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp43_ = pixels; + _tmp19_ = pixels; #line 239 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp44_ = offset; + _tmp20_ = offset; #line 239 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp45_ = _tmp43_[_tmp44_]; + _tmp21_ = pixels; #line 239 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp46_ = red; + _tmp22_ = offset; #line 239 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp47_ = shift_color_byte ((gint) _tmp45_, _tmp46_); + _tmp23_ = _tmp21_[_tmp22_]; #line 239 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp41_[_tmp42_] = _tmp47_; + _tmp19_[_tmp20_] = shift_color_byte ((gint) _tmp23_, red); #line 239 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp48_ = _tmp41_[_tmp42_]; -#line 986 "image.c" + _tmp24_ = _tmp19_[_tmp20_]; +#line 914 "image.c" } #line 241 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp49_ = green; -#line 241 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp49_ != 0) { -#line 992 "image.c" - guchar* _tmp50_; - gint _tmp51_; - guchar* _tmp52_; - gint _tmp53_; - guchar _tmp54_; - gint _tmp55_; - guchar _tmp56_; - guchar _tmp57_; -#line 242 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp50_ = pixels; -#line 242 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp51_ = offset; + if (green != 0) { +#line 918 "image.c" + guchar* _tmp25_; + gint _tmp26_; + guchar* _tmp27_; + gint _tmp28_; + guchar _tmp29_; + guchar _tmp30_; #line 242 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp52_ = pixels; + _tmp25_ = pixels; #line 242 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp53_ = offset; + _tmp26_ = offset; #line 242 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp54_ = _tmp52_[_tmp53_ + 1]; + _tmp27_ = pixels; #line 242 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp55_ = green; + _tmp28_ = offset; #line 242 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp56_ = shift_color_byte ((gint) _tmp54_, _tmp55_); + _tmp29_ = _tmp27_[_tmp28_ + 1]; #line 242 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp50_[_tmp51_ + 1] = _tmp56_; + _tmp25_[_tmp26_ + 1] = shift_color_byte ((gint) _tmp29_, green); #line 242 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp57_ = _tmp50_[_tmp51_ + 1]; -#line 1019 "image.c" + _tmp30_ = _tmp25_[_tmp26_ + 1]; +#line 939 "image.c" } #line 244 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp58_ = blue; -#line 244 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp58_ != 0) { -#line 1025 "image.c" - guchar* _tmp59_; - gint _tmp60_; - guchar* _tmp61_; - gint _tmp62_; - guchar _tmp63_; - gint _tmp64_; - guchar _tmp65_; - guchar _tmp66_; -#line 245 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp59_ = pixels; -#line 245 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp60_ = offset; + if (blue != 0) { +#line 943 "image.c" + guchar* _tmp31_; + gint _tmp32_; + guchar* _tmp33_; + gint _tmp34_; + guchar _tmp35_; + guchar _tmp36_; #line 245 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp61_ = pixels; + _tmp31_ = pixels; #line 245 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp62_ = offset; + _tmp32_ = offset; #line 245 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp63_ = _tmp61_[_tmp62_ + 2]; + _tmp33_ = pixels; #line 245 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp64_ = blue; + _tmp34_ = offset; #line 245 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp65_ = shift_color_byte ((gint) _tmp63_, _tmp64_); + _tmp35_ = _tmp33_[_tmp34_ + 2]; #line 245 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp59_[_tmp60_ + 2] = _tmp65_; + _tmp31_[_tmp32_ + 2] = shift_color_byte ((gint) _tmp35_, blue); #line 245 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp66_ = _tmp59_[_tmp60_ + 2]; -#line 1052 "image.c" + _tmp36_ = _tmp31_[_tmp32_ + 2]; +#line 964 "image.c" } #line 247 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp68_ = alpha; + if (alpha != 0) { +#line 968 "image.c" + gint _tmp38_; #line 247 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp68_ != 0) { -#line 1058 "image.c" - gint _tmp69_; + _tmp38_ = channels; #line 247 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp69_ = channels; -#line 247 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp67_ = _tmp69_ >= 4; -#line 1064 "image.c" + _tmp37_ = _tmp38_ >= 4; +#line 974 "image.c" } else { #line 247 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp67_ = FALSE; -#line 1068 "image.c" + _tmp37_ = FALSE; +#line 978 "image.c" } #line 247 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp67_) { -#line 1072 "image.c" - guchar* _tmp70_; - gint _tmp71_; - guchar* _tmp72_; - gint _tmp73_; - guchar _tmp74_; - gint _tmp75_; - guchar _tmp76_; - guchar _tmp77_; -#line 248 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp70_ = pixels; -#line 248 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp71_ = offset; + if (_tmp37_) { +#line 982 "image.c" + guchar* _tmp39_; + gint _tmp40_; + guchar* _tmp41_; + gint _tmp42_; + guchar _tmp43_; + guchar _tmp44_; #line 248 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp72_ = pixels; + _tmp39_ = pixels; #line 248 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp73_ = offset; + _tmp40_ = offset; #line 248 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp74_ = _tmp72_[_tmp73_ + 3]; + _tmp41_ = pixels; #line 248 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp75_ = alpha; + _tmp42_ = offset; #line 248 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp76_ = shift_color_byte ((gint) _tmp74_, _tmp75_); + _tmp43_ = _tmp41_[_tmp42_ + 3]; #line 248 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp70_[_tmp71_ + 3] = _tmp76_; + _tmp39_[_tmp40_ + 3] = shift_color_byte ((gint) _tmp43_, alpha); #line 248 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp77_ = _tmp70_[_tmp71_ + 3]; -#line 1099 "image.c" + _tmp44_ = _tmp39_[_tmp40_ + 3]; +#line 1003 "image.c" } } } @@ -1106,103 +1010,98 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph } -gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) { +gboolean +coord_in_rectangle (gint x, + gint y, + GdkRectangle* rect) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gint _tmp3_; - GdkRectangle _tmp4_; - gint _tmp5_; + GdkRectangle _tmp3_; + gint _tmp4_; #line 253 "/home/jens/Source/shotwell/src/util/image.vala" g_return_val_if_fail (rect != NULL, FALSE); #line 254 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp3_ = x; + _tmp3_ = *rect; #line 254 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp4_ = *rect; -#line 254 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp5_ = _tmp4_.x; + _tmp4_ = _tmp3_.x; #line 254 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp3_ >= _tmp5_) { -#line 1128 "image.c" + if (x >= _tmp4_) { +#line 1033 "image.c" + GdkRectangle _tmp5_; gint _tmp6_; GdkRectangle _tmp7_; gint _tmp8_; - GdkRectangle _tmp9_; - gint _tmp10_; #line 254 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp6_ = x; -#line 254 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp7_ = *rect; + _tmp5_ = *rect; #line 254 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp8_ = _tmp7_.x; + _tmp6_ = _tmp5_.x; #line 254 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp9_ = *rect; + _tmp7_ = *rect; #line 254 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp10_ = _tmp9_.width; + _tmp8_ = _tmp7_.width; #line 254 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp2_ = _tmp6_ < (_tmp8_ + _tmp10_); -#line 1146 "image.c" + _tmp2_ = x < (_tmp6_ + _tmp8_); +#line 1048 "image.c" } else { #line 254 "/home/jens/Source/shotwell/src/util/image.vala" _tmp2_ = FALSE; -#line 1150 "image.c" +#line 1052 "image.c" } #line 254 "/home/jens/Source/shotwell/src/util/image.vala" if (_tmp2_) { -#line 1154 "image.c" - gint _tmp11_; - GdkRectangle _tmp12_; - gint _tmp13_; -#line 254 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp11_ = y; +#line 1056 "image.c" + GdkRectangle _tmp9_; + gint _tmp10_; #line 254 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp12_ = *rect; + _tmp9_ = *rect; #line 254 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp13_ = _tmp12_.y; + _tmp10_ = _tmp9_.y; #line 254 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp1_ = _tmp11_ >= _tmp13_; -#line 1166 "image.c" + _tmp1_ = y >= _tmp10_; +#line 1065 "image.c" } else { #line 254 "/home/jens/Source/shotwell/src/util/image.vala" _tmp1_ = FALSE; -#line 1170 "image.c" +#line 1069 "image.c" } #line 254 "/home/jens/Source/shotwell/src/util/image.vala" if (_tmp1_) { -#line 1174 "image.c" +#line 1073 "image.c" + GdkRectangle _tmp11_; + gint _tmp12_; + GdkRectangle _tmp13_; gint _tmp14_; - GdkRectangle _tmp15_; - gint _tmp16_; - GdkRectangle _tmp17_; - gint _tmp18_; -#line 254 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp14_ = y; #line 254 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp15_ = *rect; + _tmp11_ = *rect; #line 254 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp16_ = _tmp15_.y; + _tmp12_ = _tmp11_.y; #line 254 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp17_ = *rect; + _tmp13_ = *rect; #line 254 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp18_ = _tmp17_.height; + _tmp14_ = _tmp13_.height; #line 254 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp0_ = _tmp14_ <= (_tmp16_ + _tmp18_); -#line 1192 "image.c" + _tmp0_ = y <= (_tmp12_ + _tmp14_); +#line 1088 "image.c" } else { #line 254 "/home/jens/Source/shotwell/src/util/image.vala" _tmp0_ = FALSE; -#line 1196 "image.c" +#line 1092 "image.c" } #line 254 "/home/jens/Source/shotwell/src/util/image.vala" result = _tmp0_; #line 254 "/home/jens/Source/shotwell/src/util/image.vala" return result; -#line 1202 "image.c" +#line 1098 "image.c" } -gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) { +gboolean +rectangles_equal (GdkRectangle* a, + GdkRectangle* b) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; @@ -1225,7 +1124,7 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) { _tmp6_ = _tmp5_.x; #line 258 "/home/jens/Source/shotwell/src/util/image.vala" if (_tmp4_ == _tmp6_) { -#line 1229 "image.c" +#line 1128 "image.c" GdkRectangle _tmp7_; gint _tmp8_; GdkRectangle _tmp9_; @@ -1240,15 +1139,15 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) { _tmp10_ = _tmp9_.y; #line 258 "/home/jens/Source/shotwell/src/util/image.vala" _tmp2_ = _tmp8_ == _tmp10_; -#line 1244 "image.c" +#line 1143 "image.c" } else { #line 258 "/home/jens/Source/shotwell/src/util/image.vala" _tmp2_ = FALSE; -#line 1248 "image.c" +#line 1147 "image.c" } #line 258 "/home/jens/Source/shotwell/src/util/image.vala" if (_tmp2_) { -#line 1252 "image.c" +#line 1151 "image.c" GdkRectangle _tmp11_; gint _tmp12_; GdkRectangle _tmp13_; @@ -1263,15 +1162,15 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) { _tmp14_ = _tmp13_.width; #line 258 "/home/jens/Source/shotwell/src/util/image.vala" _tmp1_ = _tmp12_ == _tmp14_; -#line 1267 "image.c" +#line 1166 "image.c" } else { #line 258 "/home/jens/Source/shotwell/src/util/image.vala" _tmp1_ = FALSE; -#line 1271 "image.c" +#line 1170 "image.c" } #line 258 "/home/jens/Source/shotwell/src/util/image.vala" if (_tmp1_) { -#line 1275 "image.c" +#line 1174 "image.c" GdkRectangle _tmp15_; gint _tmp16_; GdkRectangle _tmp17_; @@ -1286,21 +1185,23 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) { _tmp18_ = _tmp17_.height; #line 258 "/home/jens/Source/shotwell/src/util/image.vala" _tmp0_ = _tmp16_ == _tmp18_; -#line 1290 "image.c" +#line 1189 "image.c" } else { #line 258 "/home/jens/Source/shotwell/src/util/image.vala" _tmp0_ = FALSE; -#line 1294 "image.c" +#line 1193 "image.c" } #line 258 "/home/jens/Source/shotwell/src/util/image.vala" result = _tmp0_; #line 258 "/home/jens/Source/shotwell/src/util/image.vala" return result; -#line 1300 "image.c" +#line 1199 "image.c" } -gchar* rectangle_to_string (GdkRectangle* rect) { +gchar* +rectangle_to_string (GdkRectangle* rect) +{ gchar* result = NULL; GdkRectangle _tmp0_; gint _tmp1_; @@ -1335,32 +1236,32 @@ gchar* rectangle_to_string (GdkRectangle* rect) { result = _tmp8_; #line 262 "/home/jens/Source/shotwell/src/util/image.vala" return result; -#line 1339 "image.c" +#line 1240 "image.c" } -void clamp_rectangle (GdkRectangle* original, Dimensions* max, GdkRectangle* result) { +void +clamp_rectangle (GdkRectangle* original, + Dimensions* max, + GdkRectangle* result) +{ GdkRectangle rect = {0}; GdkRectangle _tmp0_; gint _tmp1_; Dimensions _tmp2_; gint _tmp3_; - gint _tmp4_; - GdkRectangle _tmp5_; - gint _tmp6_; - Dimensions _tmp7_; - gint _tmp8_; + GdkRectangle _tmp4_; + gint _tmp5_; + Dimensions _tmp6_; + gint _tmp7_; + GdkRectangle _tmp8_; gint _tmp9_; - GdkRectangle _tmp10_; + Dimensions _tmp10_; gint _tmp11_; - Dimensions _tmp12_; + GdkRectangle _tmp12_; gint _tmp13_; - gint _tmp14_; - GdkRectangle _tmp15_; - gint _tmp16_; - Dimensions _tmp17_; - gint _tmp18_; - gint _tmp19_; + Dimensions _tmp14_; + gint _tmp15_; #line 265 "/home/jens/Source/shotwell/src/util/image.vala" g_return_if_fail (original != NULL); #line 265 "/home/jens/Source/shotwell/src/util/image.vala" @@ -1376,62 +1277,56 @@ void clamp_rectangle (GdkRectangle* original, Dimensions* max, GdkRectangle* res #line 267 "/home/jens/Source/shotwell/src/util/image.vala" _tmp3_ = _tmp2_.width; #line 267 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp4_ = CLAMP (_tmp1_, 0, _tmp3_); -#line 267 "/home/jens/Source/shotwell/src/util/image.vala" - rect.x = _tmp4_; -#line 268 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp5_ = *original; + rect.x = CLAMP (_tmp1_, 0, _tmp3_); #line 268 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp6_ = _tmp5_.y; + _tmp4_ = *original; #line 268 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp7_ = *max; + _tmp5_ = _tmp4_.y; #line 268 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp8_ = _tmp7_.height; + _tmp6_ = *max; #line 268 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp9_ = CLAMP (_tmp6_, 0, _tmp8_); + _tmp7_ = _tmp6_.height; #line 268 "/home/jens/Source/shotwell/src/util/image.vala" - rect.y = _tmp9_; -#line 269 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp10_ = *original; + rect.y = CLAMP (_tmp5_, 0, _tmp7_); #line 269 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp11_ = _tmp10_.width; + _tmp8_ = *original; #line 269 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp12_ = *max; + _tmp9_ = _tmp8_.width; #line 269 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp13_ = _tmp12_.width; + _tmp10_ = *max; #line 269 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp14_ = CLAMP (_tmp11_, 0, _tmp13_); + _tmp11_ = _tmp10_.width; #line 269 "/home/jens/Source/shotwell/src/util/image.vala" - rect.width = _tmp14_; + rect.width = CLAMP (_tmp9_, 0, _tmp11_); #line 270 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp15_ = *original; -#line 270 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp16_ = _tmp15_.height; + _tmp12_ = *original; #line 270 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp17_ = *max; + _tmp13_ = _tmp12_.height; #line 270 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp18_ = _tmp17_.height; + _tmp14_ = *max; #line 270 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp19_ = CLAMP (_tmp16_, 0, _tmp18_); + _tmp15_ = _tmp14_.height; #line 270 "/home/jens/Source/shotwell/src/util/image.vala" - rect.height = _tmp19_; + rect.height = CLAMP (_tmp13_, 0, _tmp15_); #line 272 "/home/jens/Source/shotwell/src/util/image.vala" *result = rect; #line 272 "/home/jens/Source/shotwell/src/util/image.vala" return; -#line 1423 "image.c" +#line 1316 "image.c" } -void scale_point (GdkPoint* p, gdouble factor, GdkPoint* result) { +void +scale_point (GdkPoint* p, + gdouble factor, + GdkPoint* result) +{ GdkPoint _result_ = {0}; GdkPoint _tmp0_ = {0}; - gdouble _tmp1_; - GdkPoint _tmp2_; - gint _tmp3_; - gdouble _tmp4_; - GdkPoint _tmp5_; - gint _tmp6_; + GdkPoint _tmp1_; + gint _tmp2_; + GdkPoint _tmp3_; + gint _tmp4_; #line 275 "/home/jens/Source/shotwell/src/util/image.vala" g_return_if_fail (p != NULL); #line 276 "/home/jens/Source/shotwell/src/util/image.vala" @@ -1439,30 +1334,30 @@ void scale_point (GdkPoint* p, gdouble factor, GdkPoint* result) { #line 276 "/home/jens/Source/shotwell/src/util/image.vala" _result_ = _tmp0_; #line 277 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp1_ = factor; + _tmp1_ = *p; #line 277 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp2_ = *p; -#line 277 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp3_ = _tmp2_.x; + _tmp2_ = _tmp1_.x; #line 277 "/home/jens/Source/shotwell/src/util/image.vala" - _result_.x = (gint) ((_tmp1_ * _tmp3_) + 0.5); + _result_.x = (gint) ((factor * _tmp2_) + 0.5); #line 278 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp4_ = factor; + _tmp3_ = *p; #line 278 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp5_ = *p; + _tmp4_ = _tmp3_.y; #line 278 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp6_ = _tmp5_.y; -#line 278 "/home/jens/Source/shotwell/src/util/image.vala" - _result_.y = (gint) ((_tmp4_ * _tmp6_) + 0.5); + _result_.y = (gint) ((factor * _tmp4_) + 0.5); #line 280 "/home/jens/Source/shotwell/src/util/image.vala" *result = _result_; #line 280 "/home/jens/Source/shotwell/src/util/image.vala" return; -#line 1462 "image.c" +#line 1353 "image.c" } -void add_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) { +void +add_points (GdkPoint* p1, + GdkPoint* p2, + GdkPoint* result) +{ GdkPoint _result_ = {0}; GdkPoint _tmp0_ = {0}; GdkPoint _tmp1_; @@ -1505,11 +1400,15 @@ void add_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) { *result = _result_; #line 288 "/home/jens/Source/shotwell/src/util/image.vala" return; -#line 1509 "image.c" +#line 1404 "image.c" } -void subtract_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) { +void +subtract_points (GdkPoint* p1, + GdkPoint* p2, + GdkPoint* result) +{ GdkPoint _result_ = {0}; GdkPoint _tmp0_ = {0}; GdkPoint _tmp1_; @@ -1552,160 +1451,150 @@ void subtract_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) { *result = _result_; #line 296 "/home/jens/Source/shotwell/src/util/image.vala" return; -#line 1556 "image.c" +#line 1455 "image.c" } -void fix_cairo_pixbuf (GdkPixbuf* pixbuf) { +void +fix_cairo_pixbuf (GdkPixbuf* pixbuf) +{ guchar* gdk_pixels = NULL; - GdkPixbuf* _tmp0_; + void* _tmp0_; void* _tmp1_; - void* _tmp2_; #line 300 "/home/jens/Source/shotwell/src/util/image.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); #line 301 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp0_ = pixbuf; + _tmp0_ = gdk_pixbuf_get_pixels (pixbuf); #line 301 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp1_ = gdk_pixbuf_get_pixels (_tmp0_); -#line 301 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 301 "/home/jens/Source/shotwell/src/util/image.vala" - gdk_pixels = _tmp2_; -#line 1575 "image.c" + gdk_pixels = _tmp1_; +#line 1473 "image.c" { gint j = 0; #line 302 "/home/jens/Source/shotwell/src/util/image.vala" j = 0; -#line 1580 "image.c" +#line 1478 "image.c" { - gboolean _tmp3_ = FALSE; + gboolean _tmp2_ = FALSE; #line 302 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp3_ = TRUE; + _tmp2_ = TRUE; #line 302 "/home/jens/Source/shotwell/src/util/image.vala" while (TRUE) { -#line 1587 "image.c" +#line 1485 "image.c" + gint _tmp4_; gint _tmp5_; - GdkPixbuf* _tmp6_; - gint _tmp7_; - gint _tmp8_; + gint _tmp6_; guchar* p = NULL; - guchar* _tmp9_; + guchar* _tmp7_; guchar* end = NULL; - guchar* _tmp10_; - GdkPixbuf* _tmp11_; - gint _tmp12_; - gint _tmp13_; - guchar* _tmp26_; - GdkPixbuf* _tmp27_; - gint _tmp28_; - gint _tmp29_; + guchar* _tmp8_; + gint _tmp9_; + gint _tmp10_; + guchar* _tmp23_; + gint _tmp24_; + gint _tmp25_; #line 302 "/home/jens/Source/shotwell/src/util/image.vala" - if (!_tmp3_) { -#line 1605 "image.c" - gint _tmp4_; + if (!_tmp2_) { +#line 1500 "image.c" + gint _tmp3_; #line 302 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp4_ = j; + _tmp3_ = j; #line 302 "/home/jens/Source/shotwell/src/util/image.vala" - j = _tmp4_ + 1; -#line 1611 "image.c" + j = _tmp3_ + 1; +#line 1506 "image.c" } #line 302 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp3_ = FALSE; -#line 302 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp5_ = j; + _tmp2_ = FALSE; #line 302 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp6_ = pixbuf; + _tmp4_ = j; #line 302 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp7_ = gdk_pixbuf_get_height (_tmp6_); + _tmp5_ = gdk_pixbuf_get_height (pixbuf); #line 302 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 302 "/home/jens/Source/shotwell/src/util/image.vala" - if (!(_tmp5_ < _tmp8_)) { + if (!(_tmp4_ < _tmp6_)) { #line 302 "/home/jens/Source/shotwell/src/util/image.vala" break; -#line 1627 "image.c" +#line 1520 "image.c" } #line 303 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp9_ = gdk_pixels; + _tmp7_ = gdk_pixels; #line 303 "/home/jens/Source/shotwell/src/util/image.vala" - p = _tmp9_; + p = _tmp7_; #line 304 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp10_ = p; + _tmp8_ = p; #line 304 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp11_ = pixbuf; + _tmp9_ = gdk_pixbuf_get_width (pixbuf); #line 304 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp12_ = gdk_pixbuf_get_width (_tmp11_); + _tmp10_ = _tmp9_; #line 304 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp13_ = _tmp12_; -#line 304 "/home/jens/Source/shotwell/src/util/image.vala" - end = _tmp10_ + (4 * _tmp13_); + end = _tmp8_ + (4 * _tmp10_); #line 306 "/home/jens/Source/shotwell/src/util/image.vala" while (TRUE) { -#line 1645 "image.c" - guchar* _tmp14_; - guchar* _tmp15_; +#line 1536 "image.c" + guchar* _tmp11_; + guchar* _tmp12_; guchar tmp = '\0'; + guchar* _tmp13_; + guchar _tmp14_; + guchar* _tmp15_; guchar* _tmp16_; guchar _tmp17_; - guchar* _tmp18_; + guchar _tmp18_; guchar* _tmp19_; guchar _tmp20_; guchar _tmp21_; guchar* _tmp22_; - guchar _tmp23_; - guchar _tmp24_; - guchar* _tmp25_; #line 306 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp14_ = p; + _tmp11_ = p; #line 306 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp15_ = end; + _tmp12_ = end; #line 306 "/home/jens/Source/shotwell/src/util/image.vala" - if (!(_tmp14_ < _tmp15_)) { + if (!(_tmp11_ < _tmp12_)) { #line 306 "/home/jens/Source/shotwell/src/util/image.vala" break; -#line 1667 "image.c" +#line 1558 "image.c" } #line 307 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp16_ = p; + _tmp13_ = p; #line 307 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp17_ = _tmp16_[0]; + _tmp14_ = _tmp13_[0]; #line 307 "/home/jens/Source/shotwell/src/util/image.vala" - tmp = _tmp17_; + tmp = _tmp14_; #line 309 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp18_ = p; + _tmp15_ = p; #line 309 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp19_ = p; + _tmp16_ = p; #line 309 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp20_ = _tmp19_[2]; + _tmp17_ = _tmp16_[2]; #line 309 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp18_[0] = _tmp20_; + _tmp15_[0] = _tmp17_; #line 309 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp21_ = _tmp18_[0]; + _tmp18_ = _tmp15_[0]; #line 310 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp22_ = p; + _tmp19_ = p; #line 310 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp23_ = tmp; + _tmp20_ = tmp; #line 310 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp22_[2] = _tmp23_; + _tmp19_[2] = _tmp20_; #line 310 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp24_ = _tmp22_[2]; + _tmp21_ = _tmp19_[2]; #line 317 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp25_ = p; + _tmp22_ = p; #line 317 "/home/jens/Source/shotwell/src/util/image.vala" - p = _tmp25_ + 4; -#line 1697 "image.c" + p = _tmp22_ + 4; +#line 1588 "image.c" } #line 320 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp26_ = gdk_pixels; -#line 320 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp27_ = pixbuf; + _tmp23_ = gdk_pixels; #line 320 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp28_ = gdk_pixbuf_get_rowstride (_tmp27_); + _tmp24_ = gdk_pixbuf_get_rowstride (pixbuf); #line 320 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp29_ = _tmp28_; + _tmp25_ = _tmp24_; #line 320 "/home/jens/Source/shotwell/src/util/image.vala" - gdk_pixels = _tmp26_ + _tmp29_; -#line 1709 "image.c" + gdk_pixels = _tmp23_ + _tmp25_; +#line 1598 "image.c" } } } @@ -1722,76 +1611,34 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) { * @param dest_width The width of the computed rectangle. * @param dest_height The height of the computed rectangle. */ -void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble angle, gdouble* dest_width, gdouble* dest_height) { +void +compute_arb_rotated_size (gdouble src_width, + gdouble src_height, + gdouble angle, + gdouble* dest_width, + gdouble* dest_height) +{ gdouble _vala_dest_width = 0.0; gdouble _vala_dest_height = 0.0; - gdouble _tmp0_; - gdouble _tmp1_; - gdouble _tmp2_; - gdouble _tmp3_; - gdouble _tmp4_; - gdouble _tmp5_; - gdouble _tmp6_; - gdouble _tmp7_; - gdouble _tmp8_; - gdouble _tmp9_; - gdouble _tmp10_; - gdouble _tmp11_; - gdouble _tmp12_; - gdouble _tmp13_; - gdouble _tmp14_; - gdouble _tmp15_; #line 337 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp0_ = angle; -#line 337 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp1_ = degrees_to_radians (_tmp0_); -#line 337 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp2_ = fabs (_tmp1_); -#line 337 "/home/jens/Source/shotwell/src/util/image.vala" - angle = _tmp2_; -#line 338 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp3_ = angle; + angle = fabs (degrees_to_radians (angle)); #line 338 "/home/jens/Source/shotwell/src/util/image.vala" - _vala_assert (_tmp3_ <= G_PI_2, "angle <= Math.PI_2"); + _vala_assert (angle <= G_PI_2, "angle <= Math.PI_2"); #line 339 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp4_ = src_width; -#line 339 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp5_ = angle; -#line 339 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp6_ = cos (_tmp5_); -#line 339 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp7_ = src_height; -#line 339 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp8_ = angle; -#line 339 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp9_ = sin (_tmp8_); -#line 339 "/home/jens/Source/shotwell/src/util/image.vala" - _vala_dest_width = (_tmp4_ * _tmp6_) + (_tmp7_ * _tmp9_); -#line 340 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp10_ = src_height; -#line 340 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp11_ = angle; + _vala_dest_width = (src_width * cos (angle)) + (src_height * sin (angle)); #line 340 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp12_ = cos (_tmp11_); -#line 340 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp13_ = src_width; -#line 340 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp14_ = angle; -#line 340 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp15_ = sin (_tmp14_); -#line 340 "/home/jens/Source/shotwell/src/util/image.vala" - _vala_dest_height = (_tmp10_ * _tmp12_) + (_tmp13_ * _tmp15_); + _vala_dest_height = (src_height * cos (angle)) + (src_width * sin (angle)); #line 334 "/home/jens/Source/shotwell/src/util/image.vala" if (dest_width) { #line 334 "/home/jens/Source/shotwell/src/util/image.vala" *dest_width = _vala_dest_width; -#line 1789 "image.c" +#line 1636 "image.c" } #line 334 "/home/jens/Source/shotwell/src/util/image.vala" if (dest_height) { #line 334 "/home/jens/Source/shotwell/src/util/image.vala" *dest_height = _vala_dest_height; -#line 1795 "image.c" +#line 1642 "image.c" } } @@ -1802,47 +1649,51 @@ void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble an * @param source_pixbuf The source image that needs to be angled. * @param angle The angle the source image should be rotated by. */ -GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) { +GdkPixbuf* +rotate_arb (GdkPixbuf* source_pixbuf, + gdouble angle) +{ GdkPixbuf* result = NULL; - gdouble _tmp0_; gdouble x_tmp = 0.0; gdouble y_tmp = 0.0; - GdkPixbuf* _tmp3_; + gint _tmp1_; + gint _tmp2_; + gint _tmp3_; gint _tmp4_; - gint _tmp5_; - GdkPixbuf* _tmp6_; - gint _tmp7_; - gint _tmp8_; - gdouble _tmp9_; - gdouble _tmp10_ = 0.0; - gdouble _tmp11_ = 0.0; + gdouble _tmp5_ = 0.0; + gdouble _tmp6_ = 0.0; GdkPixbuf* dest_pixbuf = NULL; - gdouble _tmp12_; - gdouble _tmp13_; - gdouble _tmp14_; - gdouble _tmp15_; - GdkPixbuf* _tmp16_; - cairo_format_t _tmp17_ = 0; - GdkPixbuf* _tmp18_; - gboolean _tmp19_; - gboolean _tmp20_; + gdouble _tmp7_; + gdouble _tmp8_; + GdkPixbuf* _tmp9_; + cairo_format_t _tmp10_ = 0; + gboolean _tmp11_; + gboolean _tmp12_; cairo_surface_t* surface = NULL; - GdkPixbuf* _tmp21_; - void* _tmp22_; - void* _tmp23_; - GdkPixbuf* _tmp24_; - gint _tmp25_; - gint _tmp26_; - GdkPixbuf* _tmp27_; - gint _tmp28_; - gint _tmp29_; + GdkPixbuf* _tmp13_; + void* _tmp14_; + void* _tmp15_; + GdkPixbuf* _tmp16_; + gint _tmp17_; + gint _tmp18_; + GdkPixbuf* _tmp19_; + gint _tmp20_; + gint _tmp21_; + GdkPixbuf* _tmp22_; + gint _tmp23_; + gint _tmp24_; + cairo_surface_t* _tmp25_; + cairo_t* context = NULL; + cairo_surface_t* _tmp26_; + cairo_t* _tmp27_; + cairo_t* _tmp28_; + cairo_t* _tmp29_; GdkPixbuf* _tmp30_; gint _tmp31_; gint _tmp32_; - cairo_surface_t* _tmp33_; - cairo_t* context = NULL; - cairo_surface_t* _tmp34_; - cairo_t* _tmp35_; + GdkPixbuf* _tmp33_; + gint _tmp34_; + gint _tmp35_; cairo_t* _tmp36_; cairo_t* _tmp37_; GdkPixbuf* _tmp38_; @@ -1853,213 +1704,173 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) { gint _tmp43_; cairo_t* _tmp44_; cairo_t* _tmp45_; - GdkPixbuf* _tmp46_; + gint _tmp46_; gint _tmp47_; gint _tmp48_; - GdkPixbuf* _tmp49_; - gint _tmp50_; - gint _tmp51_; - cairo_t* _tmp52_; - gdouble _tmp53_; - gdouble _tmp54_; - cairo_t* _tmp55_; - GdkPixbuf* _tmp56_; - gint _tmp57_; - gint _tmp58_; - GdkPixbuf* _tmp59_; - gint _tmp60_; - gint _tmp61_; - cairo_t* _tmp62_; - GdkPixbuf* _tmp63_; - cairo_t* _tmp64_; - cairo_pattern_t* _tmp65_; - cairo_t* _tmp66_; - GdkPixbuf* _tmp67_; + gint _tmp49_; + cairo_t* _tmp50_; + cairo_t* _tmp51_; + cairo_pattern_t* _tmp52_; + cairo_t* _tmp53_; + GdkPixbuf* _tmp54_; #line 349 "/home/jens/Source/shotwell/src/util/image.vala" g_return_val_if_fail (GDK_IS_PIXBUF (source_pixbuf), NULL); #line 353 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp0_ = angle; -#line 353 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp0_ == 0.0) { -#line 1885 "image.c" - GdkPixbuf* _tmp1_; - GdkPixbuf* _tmp2_; + if (angle == 0.0) { +#line 1721 "image.c" + GdkPixbuf* _tmp0_; #line 354 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp1_ = source_pixbuf; + _tmp0_ = _g_object_ref0 (source_pixbuf); #line 354 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); -#line 354 "/home/jens/Source/shotwell/src/util/image.vala" - result = _tmp2_; + result = _tmp0_; #line 354 "/home/jens/Source/shotwell/src/util/image.vala" return result; -#line 1896 "image.c" +#line 1729 "image.c" } #line 361 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp3_ = source_pixbuf; -#line 361 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp4_ = gdk_pixbuf_get_width (_tmp3_); -#line 361 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp5_ = _tmp4_; -#line 361 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp6_ = source_pixbuf; + _tmp1_ = gdk_pixbuf_get_width (source_pixbuf); #line 361 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp7_ = gdk_pixbuf_get_height (_tmp6_); + _tmp2_ = _tmp1_; #line 361 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp8_ = _tmp7_; + _tmp3_ = gdk_pixbuf_get_height (source_pixbuf); #line 361 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp9_ = angle; + _tmp4_ = _tmp3_; #line 361 "/home/jens/Source/shotwell/src/util/image.vala" - compute_arb_rotated_size ((gdouble) _tmp5_, (gdouble) _tmp8_, _tmp9_, &_tmp10_, &_tmp11_); + compute_arb_rotated_size ((gdouble) _tmp2_, (gdouble) _tmp4_, angle, &_tmp5_, &_tmp6_); #line 361 "/home/jens/Source/shotwell/src/util/image.vala" - x_tmp = _tmp10_; + x_tmp = _tmp5_; #line 361 "/home/jens/Source/shotwell/src/util/image.vala" - y_tmp = _tmp11_; -#line 364 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp12_ = x_tmp; + y_tmp = _tmp6_; #line 364 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp13_ = round (_tmp12_); + _tmp7_ = x_tmp; #line 364 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp14_ = y_tmp; + _tmp8_ = y_tmp; #line 364 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp15_ = round (_tmp14_); + _tmp9_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, (gint) round (_tmp7_), (gint) round (_tmp8_)); #line 364 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp16_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, (gint) _tmp13_, (gint) _tmp15_); -#line 364 "/home/jens/Source/shotwell/src/util/image.vala" - dest_pixbuf = _tmp16_; -#line 369 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp18_ = source_pixbuf; + dest_pixbuf = _tmp9_; #line 369 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp19_ = gdk_pixbuf_get_has_alpha (_tmp18_); + _tmp11_ = gdk_pixbuf_get_has_alpha (source_pixbuf); #line 369 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp20_ = _tmp19_; + _tmp12_ = _tmp11_; #line 369 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp20_) { + if (_tmp12_) { #line 369 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp17_ = CAIRO_FORMAT_ARGB32; -#line 1940 "image.c" + _tmp10_ = CAIRO_FORMAT_ARGB32; +#line 1761 "image.c" } else { #line 369 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp17_ = CAIRO_FORMAT_RGB24; -#line 1944 "image.c" + _tmp10_ = CAIRO_FORMAT_RGB24; +#line 1765 "image.c" } #line 367 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp21_ = dest_pixbuf; + _tmp13_ = dest_pixbuf; #line 367 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp22_ = gdk_pixbuf_get_pixels (_tmp21_); + _tmp14_ = gdk_pixbuf_get_pixels (_tmp13_); #line 367 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp23_ = _tmp22_; + _tmp15_ = _tmp14_; #line 367 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp24_ = dest_pixbuf; + _tmp16_ = dest_pixbuf; #line 367 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp25_ = gdk_pixbuf_get_width (_tmp24_); + _tmp17_ = gdk_pixbuf_get_width (_tmp16_); #line 367 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp26_ = _tmp25_; + _tmp18_ = _tmp17_; #line 367 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp27_ = dest_pixbuf; + _tmp19_ = dest_pixbuf; #line 367 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp28_ = gdk_pixbuf_get_height (_tmp27_); + _tmp20_ = gdk_pixbuf_get_height (_tmp19_); #line 367 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp29_ = _tmp28_; + _tmp21_ = _tmp20_; #line 367 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp30_ = dest_pixbuf; + _tmp22_ = dest_pixbuf; #line 367 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp31_ = gdk_pixbuf_get_rowstride (_tmp30_); + _tmp23_ = gdk_pixbuf_get_rowstride (_tmp22_); #line 367 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp32_ = _tmp31_; + _tmp24_ = _tmp23_; #line 367 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp33_ = cairo_image_surface_create_for_data ((guchar*) _tmp23_, _tmp17_, _tmp26_, _tmp29_, _tmp32_); + _tmp25_ = cairo_image_surface_create_for_data ((guchar*) _tmp15_, _tmp10_, _tmp18_, _tmp21_, _tmp24_); #line 367 "/home/jens/Source/shotwell/src/util/image.vala" - surface = _tmp33_; + surface = _tmp25_; #line 372 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp34_ = surface; + _tmp26_ = surface; #line 372 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp35_ = cairo_create (_tmp34_); + _tmp27_ = cairo_create (_tmp26_); #line 372 "/home/jens/Source/shotwell/src/util/image.vala" - context = _tmp35_; + context = _tmp27_; #line 374 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp36_ = context; + _tmp28_ = context; #line 374 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_set_source_rgb (_tmp36_, (gdouble) 0, (gdouble) 0, (gdouble) 0); + cairo_set_source_rgb (_tmp28_, (gdouble) 0, (gdouble) 0, (gdouble) 0); #line 375 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp37_ = context; + _tmp29_ = context; #line 375 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp38_ = dest_pixbuf; + _tmp30_ = dest_pixbuf; #line 375 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp39_ = gdk_pixbuf_get_width (_tmp38_); + _tmp31_ = gdk_pixbuf_get_width (_tmp30_); #line 375 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp40_ = _tmp39_; + _tmp32_ = _tmp31_; #line 375 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp41_ = dest_pixbuf; + _tmp33_ = dest_pixbuf; #line 375 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp42_ = gdk_pixbuf_get_height (_tmp41_); + _tmp34_ = gdk_pixbuf_get_height (_tmp33_); #line 375 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp43_ = _tmp42_; + _tmp35_ = _tmp34_; #line 375 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_rectangle (_tmp37_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp40_, (gdouble) _tmp43_); + cairo_rectangle (_tmp29_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp32_, (gdouble) _tmp35_); #line 376 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp44_ = context; + _tmp36_ = context; #line 376 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_fill (_tmp44_); + cairo_fill (_tmp36_); #line 378 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp45_ = context; + _tmp37_ = context; #line 378 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp46_ = dest_pixbuf; + _tmp38_ = dest_pixbuf; #line 378 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp47_ = gdk_pixbuf_get_width (_tmp46_); + _tmp39_ = gdk_pixbuf_get_width (_tmp38_); #line 378 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp48_ = _tmp47_; + _tmp40_ = _tmp39_; #line 378 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp49_ = dest_pixbuf; + _tmp41_ = dest_pixbuf; #line 378 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp50_ = gdk_pixbuf_get_height (_tmp49_); + _tmp42_ = gdk_pixbuf_get_height (_tmp41_); #line 378 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp51_ = _tmp50_; + _tmp43_ = _tmp42_; #line 378 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_translate (_tmp45_, (gdouble) (_tmp48_ / 2), (gdouble) (_tmp51_ / 2)); -#line 379 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp52_ = context; -#line 379 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp53_ = angle; + cairo_translate (_tmp37_, (gdouble) (_tmp40_ / 2), (gdouble) (_tmp43_ / 2)); #line 379 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp54_ = degrees_to_radians (_tmp53_); + _tmp44_ = context; #line 379 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_rotate (_tmp52_, _tmp54_); -#line 380 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp55_ = context; + cairo_rotate (_tmp44_, degrees_to_radians (angle)); #line 380 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp56_ = source_pixbuf; -#line 380 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp57_ = gdk_pixbuf_get_width (_tmp56_); + _tmp45_ = context; #line 380 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp58_ = _tmp57_; + _tmp46_ = gdk_pixbuf_get_width (source_pixbuf); #line 380 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp59_ = source_pixbuf; + _tmp47_ = _tmp46_; #line 380 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp60_ = gdk_pixbuf_get_height (_tmp59_); + _tmp48_ = gdk_pixbuf_get_height (source_pixbuf); #line 380 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp61_ = _tmp60_; + _tmp49_ = _tmp48_; #line 380 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_translate (_tmp55_, (gdouble) ((-_tmp58_) / 2), (gdouble) ((-_tmp61_) / 2)); + cairo_translate (_tmp45_, (gdouble) ((-_tmp47_) / 2), (gdouble) ((-_tmp49_) / 2)); #line 382 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp62_ = context; + _tmp50_ = context; #line 382 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp63_ = source_pixbuf; -#line 382 "/home/jens/Source/shotwell/src/util/image.vala" - gdk_cairo_set_source_pixbuf (_tmp62_, _tmp63_, (gdouble) 0, (gdouble) 0); + gdk_cairo_set_source_pixbuf (_tmp50_, source_pixbuf, (gdouble) 0, (gdouble) 0); #line 383 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp64_ = context; + _tmp51_ = context; #line 383 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp65_ = cairo_get_source (_tmp64_); + _tmp52_ = cairo_get_source (_tmp51_); #line 383 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_pattern_set_filter (_tmp65_, CAIRO_FILTER_BEST); + cairo_pattern_set_filter (_tmp52_, CAIRO_FILTER_BEST); #line 384 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp66_ = context; + _tmp53_ = context; #line 384 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_paint (_tmp66_); + cairo_paint (_tmp53_); #line 388 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp67_ = dest_pixbuf; + _tmp54_ = dest_pixbuf; #line 388 "/home/jens/Source/shotwell/src/util/image.vala" - fix_cairo_pixbuf (_tmp67_); + fix_cairo_pixbuf (_tmp54_); #line 390 "/home/jens/Source/shotwell/src/util/image.vala" result = dest_pixbuf; #line 390 "/home/jens/Source/shotwell/src/util/image.vala" @@ -2068,7 +1879,7 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) { _cairo_surface_destroy0 (surface); #line 390 "/home/jens/Source/shotwell/src/util/image.vala" return result; -#line 2072 "image.c" +#line 1883 "image.c" } @@ -2085,119 +1896,95 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) { * @param img_h The height of the source image (unrotated). * @param angle The angle the source image is to be rotated by to straighten it. */ -void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, gboolean invert, GdkPoint* result) { - gdouble _tmp0_; +void +rotate_point_arb (GdkPoint* source_point, + gint img_w, + gint img_h, + gdouble angle, + gboolean invert, + GdkPoint* result) +{ gdouble dest_width = 0.0; gdouble dest_height = 0.0; - gint _tmp2_; - gint _tmp3_; - gdouble _tmp4_; - gdouble _tmp5_ = 0.0; - gdouble _tmp6_ = 0.0; + gdouble _tmp1_ = 0.0; + gdouble _tmp2_ = 0.0; cairo_matrix_t matrix = {0}; - gdouble _tmp7_; - gdouble _tmp8_; - gdouble _tmp9_; - gdouble _tmp10_; - gint _tmp11_; - gint _tmp12_; - gboolean _tmp13_; + gdouble _tmp3_; + gdouble _tmp4_; gdouble dest_x = 0.0; - GdkPoint _tmp15_; - gint _tmp16_; + GdkPoint _tmp5_; + gint _tmp6_; gdouble dest_y = 0.0; - GdkPoint _tmp17_; - gint _tmp18_; - gdouble _tmp19_; - gdouble _tmp20_; - GdkPoint _tmp21_ = {0}; + GdkPoint _tmp7_; + gint _tmp8_; + gdouble _tmp9_; + gdouble _tmp10_; + GdkPoint _tmp11_ = {0}; #line 406 "/home/jens/Source/shotwell/src/util/image.vala" g_return_if_fail (source_point != NULL); #line 409 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp0_ = angle; -#line 409 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp0_ == 0.0) { -#line 2121 "image.c" - GdkPoint _tmp1_; + if (angle == 0.0) { +#line 1928 "image.c" + GdkPoint _tmp0_; #line 411 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp1_ = *source_point; + _tmp0_ = *source_point; #line 411 "/home/jens/Source/shotwell/src/util/image.vala" - *result = _tmp1_; + *result = _tmp0_; #line 411 "/home/jens/Source/shotwell/src/util/image.vala" return; -#line 2129 "image.c" +#line 1936 "image.c" } #line 416 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp2_ = img_w; -#line 416 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp3_ = img_h; -#line 416 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp4_ = angle; + compute_arb_rotated_size ((gdouble) img_w, (gdouble) img_h, angle, &_tmp1_, &_tmp2_); #line 416 "/home/jens/Source/shotwell/src/util/image.vala" - compute_arb_rotated_size ((gdouble) _tmp2_, (gdouble) _tmp3_, _tmp4_, &_tmp5_, &_tmp6_); + dest_width = _tmp1_; #line 416 "/home/jens/Source/shotwell/src/util/image.vala" - dest_width = _tmp5_; -#line 416 "/home/jens/Source/shotwell/src/util/image.vala" - dest_height = _tmp6_; + dest_height = _tmp2_; #line 418 "/home/jens/Source/shotwell/src/util/image.vala" cairo_matrix_init_identity (&matrix); #line 419 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp7_ = dest_width; + _tmp3_ = dest_width; #line 419 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp8_ = dest_height; + _tmp4_ = dest_height; #line 419 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_matrix_translate (&matrix, _tmp7_ / 2, _tmp8_ / 2); -#line 420 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp9_ = angle; + cairo_matrix_translate (&matrix, _tmp3_ / 2, _tmp4_ / 2); #line 420 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp10_ = degrees_to_radians (_tmp9_); -#line 420 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_matrix_rotate (&matrix, _tmp10_); -#line 421 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp11_ = img_w; + cairo_matrix_rotate (&matrix, degrees_to_radians (angle)); #line 421 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp12_ = img_h; -#line 421 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_matrix_translate (&matrix, (gdouble) ((-_tmp11_) / 2), (gdouble) ((-_tmp12_) / 2)); -#line 422 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp13_ = invert; + cairo_matrix_translate (&matrix, (gdouble) ((-img_w) / 2), (gdouble) ((-img_h) / 2)); #line 422 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp13_) { -#line 2167 "image.c" - cairo_status_t _tmp14_; + if (invert) { #line 423 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp14_ = cairo_matrix_invert (&matrix); -#line 423 "/home/jens/Source/shotwell/src/util/image.vala" - _vala_assert (_tmp14_ == CAIRO_STATUS_SUCCESS, "matrix.invert() == Cairo.Status.SUCCESS"); -#line 2173 "image.c" + _vala_assert (cairo_matrix_invert (&matrix) == CAIRO_STATUS_SUCCESS, "matrix.invert() == Cairo.Status.SUCCESS"); +#line 1960 "image.c" } #line 425 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp15_ = *source_point; + _tmp5_ = *source_point; #line 425 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp16_ = _tmp15_.x; + _tmp6_ = _tmp5_.x; #line 425 "/home/jens/Source/shotwell/src/util/image.vala" - dest_x = (gdouble) _tmp16_; + dest_x = (gdouble) _tmp6_; #line 426 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp17_ = *source_point; + _tmp7_ = *source_point; #line 426 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp18_ = _tmp17_.y; + _tmp8_ = _tmp7_.y; #line 426 "/home/jens/Source/shotwell/src/util/image.vala" - dest_y = (gdouble) _tmp18_; + dest_y = (gdouble) _tmp8_; #line 427 "/home/jens/Source/shotwell/src/util/image.vala" cairo_matrix_transform_point (&matrix, &dest_x, &dest_y); #line 429 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp19_ = dest_x; + _tmp9_ = dest_x; #line 429 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp20_ = dest_y; + _tmp10_ = dest_y; #line 429 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp21_.x = (gint) _tmp19_; + _tmp11_.x = (gint) _tmp9_; #line 429 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp21_.y = (gint) _tmp20_; + _tmp11_.y = (gint) _tmp10_; #line 429 "/home/jens/Source/shotwell/src/util/image.vala" - *result = _tmp21_; + *result = _tmp11_; #line 429 "/home/jens/Source/shotwell/src/util/image.vala" return; -#line 2201 "image.c" +#line 1988 "image.c" } @@ -2214,40 +2001,41 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a * @param img_h The height of the source image (unrotated). * @param angle The angle the source image is to be rotated by to straighten it. */ -void derotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, GdkPoint* result) { +void +derotate_point_arb (GdkPoint* source_point, + gint img_w, + gint img_h, + gdouble angle, + GdkPoint* result) +{ GdkPoint _tmp0_; - gint _tmp1_; - gint _tmp2_; - gdouble _tmp3_; - GdkPoint _tmp4_ = {0}; + GdkPoint _tmp1_ = {0}; #line 445 "/home/jens/Source/shotwell/src/util/image.vala" g_return_if_fail (source_point != NULL); #line 446 "/home/jens/Source/shotwell/src/util/image.vala" _tmp0_ = *source_point; #line 446 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp1_ = img_w; -#line 446 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp2_ = img_h; -#line 446 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp3_ = angle; -#line 446 "/home/jens/Source/shotwell/src/util/image.vala" - rotate_point_arb (&_tmp0_, _tmp1_, _tmp2_, _tmp3_, TRUE, &_tmp4_); + rotate_point_arb (&_tmp0_, img_w, img_h, angle, TRUE, &_tmp1_); #line 446 "/home/jens/Source/shotwell/src/util/image.vala" - *result = _tmp4_; + *result = _tmp1_; #line 446 "/home/jens/Source/shotwell/src/util/image.vala" return; -#line 2240 "image.c" +#line 2024 "image.c" } -static gpointer _cairo_surface_reference0 (gpointer self) { +static gpointer +_cairo_surface_reference0 (gpointer self) +{ #line 484 "/home/jens/Source/shotwell/src/util/image.vala" return self ? cairo_surface_reference (self) : NULL; -#line 2247 "image.c" +#line 2033 "image.c" } -cairo_surface_t* get_background_surface (void) { +cairo_surface_t* +get_background_surface (void) +{ cairo_surface_t* result = NULL; cairo_surface_t* _tmp0_; cairo_surface_t* _tmp31_; @@ -2256,7 +2044,7 @@ cairo_surface_t* get_background_surface (void) { _tmp0_ = background_surface; #line 452 "/home/jens/Source/shotwell/src/util/image.vala" if (_tmp0_ == NULL) { -#line 2260 "image.c" +#line 2048 "image.c" gchar* color_a = NULL; gchar* color_b = NULL; ConfigFacade* config = NULL; @@ -2271,7 +2059,7 @@ cairo_surface_t* get_background_surface (void) { static GQuark _tmp6_label0 = 0; #line 458 "/home/jens/Source/shotwell/src/util/image.vala" static GQuark _tmp6_label1 = 0; -#line 2275 "image.c" +#line 2063 "image.c" cairo_surface_t* _tmp17_; cairo_t* ctx = NULL; cairo_surface_t* _tmp18_; @@ -2307,7 +2095,7 @@ cairo_surface_t* get_background_surface (void) { if (_tmp7_ == ((0 != _tmp6_label0) ? _tmp6_label0 : (_tmp6_label0 = g_quark_from_static_string ("checkered")))) { #line 458 "/home/jens/Source/shotwell/src/util/image.vala" switch (0) { -#line 2311 "image.c" +#line 2099 "image.c" default: { gchar* _tmp8_; @@ -2326,13 +2114,13 @@ cairo_surface_t* get_background_surface (void) { color_b = _tmp9_; #line 462 "/home/jens/Source/shotwell/src/util/image.vala" break; -#line 2330 "image.c" +#line 2118 "image.c" } } } else if (_tmp7_ == ((0 != _tmp6_label1) ? _tmp6_label1 : (_tmp6_label1 = g_quark_from_static_string ("solid")))) { #line 458 "/home/jens/Source/shotwell/src/util/image.vala" switch (0) { -#line 2336 "image.c" +#line 2124 "image.c" default: { ConfigFacade* _tmp10_; @@ -2357,13 +2145,13 @@ cairo_surface_t* get_background_surface (void) { color_a = _tmp13_; #line 465 "/home/jens/Source/shotwell/src/util/image.vala" break; -#line 2361 "image.c" +#line 2149 "image.c" } } } else { #line 458 "/home/jens/Source/shotwell/src/util/image.vala" switch (0) { -#line 2367 "image.c" +#line 2155 "image.c" default: { gchar* _tmp14_; @@ -2385,7 +2173,7 @@ cairo_surface_t* get_background_surface (void) { color_a = _tmp16_; #line 468 "/home/jens/Source/shotwell/src/util/image.vala" break; -#line 2389 "image.c" +#line 2177 "image.c" } } } @@ -2451,7 +2239,7 @@ cairo_surface_t* get_background_surface (void) { _g_free0 (color_b); #line 452 "/home/jens/Source/shotwell/src/util/image.vala" _g_free0 (color_a); -#line 2455 "image.c" +#line 2243 "image.c" } #line 484 "/home/jens/Source/shotwell/src/util/image.vala" _tmp31_ = background_surface; @@ -2461,193 +2249,141 @@ cairo_surface_t* get_background_surface (void) { result = _tmp32_; #line 484 "/home/jens/Source/shotwell/src/util/image.vala" return result; -#line 2465 "image.c" +#line 2253 "image.c" } -void invalidate_transparent_background (void) { +void +invalidate_transparent_background (void) +{ #line 488 "/home/jens/Source/shotwell/src/util/image.vala" _cairo_surface_destroy0 (background_surface); #line 488 "/home/jens/Source/shotwell/src/util/image.vala" background_surface = NULL; -#line 2474 "image.c" +#line 2264 "image.c" } -void paint_pixmap_with_background (cairo_t* ctx, GdkPixbuf* pixbuf, gint x, gint y) { - GdkPixbuf* _tmp0_; - gboolean _tmp1_; - cairo_t* _tmp17_; - GdkPixbuf* _tmp18_; - gint _tmp19_; - gint _tmp20_; - cairo_t* _tmp21_; +void +paint_pixmap_with_background (cairo_t* ctx, + GdkPixbuf* pixbuf, + gint x, + gint y) +{ #line 491 "/home/jens/Source/shotwell/src/util/image.vala" g_return_if_fail (ctx != NULL); #line 491 "/home/jens/Source/shotwell/src/util/image.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); #line 492 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp0_ = pixbuf; -#line 492 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp1_ = gdk_pixbuf_get_has_alpha (_tmp0_); -#line 492 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp1_) { -#line 2496 "image.c" - cairo_t* _tmp2_; - cairo_surface_t* _tmp3_; - cairo_surface_t* _tmp4_; - cairo_t* _tmp5_; - cairo_pattern_t* _tmp6_; - cairo_t* _tmp7_; - gint _tmp8_; - gint _tmp9_; - GdkPixbuf* _tmp10_; - gint _tmp11_; - gint _tmp12_; - GdkPixbuf* _tmp13_; - gint _tmp14_; - gint _tmp15_; - cairo_t* _tmp16_; -#line 493 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp2_ = ctx; + if (gdk_pixbuf_get_has_alpha (pixbuf)) { +#line 2280 "image.c" + cairo_surface_t* _tmp0_; + cairo_surface_t* _tmp1_; + cairo_pattern_t* _tmp2_; + gint _tmp3_; + gint _tmp4_; + gint _tmp5_; + gint _tmp6_; #line 493 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp3_ = get_background_surface (); + _tmp0_ = get_background_surface (); #line 493 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp4_ = _tmp3_; + _tmp1_ = _tmp0_; #line 493 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_set_source_surface (_tmp2_, _tmp4_, (gdouble) 0, (gdouble) 0); + cairo_set_source_surface (ctx, _tmp1_, (gdouble) 0, (gdouble) 0); #line 493 "/home/jens/Source/shotwell/src/util/image.vala" - _cairo_surface_destroy0 (_tmp4_); -#line 494 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp5_ = ctx; + _cairo_surface_destroy0 (_tmp1_); #line 494 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp6_ = cairo_get_source (_tmp5_); + _tmp2_ = cairo_get_source (ctx); #line 494 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_pattern_set_extend (_tmp6_, CAIRO_EXTEND_REPEAT); + cairo_pattern_set_extend (_tmp2_, CAIRO_EXTEND_REPEAT); #line 495 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp7_ = ctx; + _tmp3_ = gdk_pixbuf_get_width (pixbuf); #line 495 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp8_ = x; -#line 495 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp9_ = y; -#line 495 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp10_ = pixbuf; -#line 495 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp11_ = gdk_pixbuf_get_width (_tmp10_); -#line 495 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp12_ = _tmp11_; -#line 495 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp13_ = pixbuf; + _tmp4_ = _tmp3_; #line 495 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp14_ = gdk_pixbuf_get_height (_tmp13_); + _tmp5_ = gdk_pixbuf_get_height (pixbuf); #line 495 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp15_ = _tmp14_; + _tmp6_ = _tmp5_; #line 495 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_rectangle (_tmp7_, (gdouble) _tmp8_, (gdouble) _tmp9_, (gdouble) _tmp12_, (gdouble) _tmp15_); + cairo_rectangle (ctx, (gdouble) x, (gdouble) y, (gdouble) _tmp4_, (gdouble) _tmp6_); #line 496 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp16_ = ctx; -#line 496 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_fill (_tmp16_); -#line 2552 "image.c" + cairo_fill (ctx); +#line 2312 "image.c" } #line 499 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp17_ = ctx; -#line 499 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp18_ = pixbuf; -#line 499 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp19_ = x; -#line 499 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp20_ = y; -#line 499 "/home/jens/Source/shotwell/src/util/image.vala" - gdk_cairo_set_source_pixbuf (_tmp17_, _tmp18_, (gdouble) _tmp19_, (gdouble) _tmp20_); -#line 500 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp21_ = ctx; + gdk_cairo_set_source_pixbuf (ctx, pixbuf, (gdouble) x, (gdouble) y); #line 500 "/home/jens/Source/shotwell/src/util/image.vala" - cairo_paint (_tmp21_); -#line 2568 "image.c" + cairo_paint (ctx); +#line 2318 "image.c" } -void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle_deg, gboolean preserve_geom, Box* result) { +void +clamp_inside_rotated_image (Box* src, + gint img_w, + gint img_h, + gdouble angle_deg, + gboolean preserve_geom, + Box* result) +{ GdkPoint top_left = {0}; Box _tmp0_; gint _tmp1_; Box _tmp2_; gint _tmp3_; GdkPoint _tmp4_ = {0}; - gint _tmp5_; - gint _tmp6_; - gdouble _tmp7_; - GdkPoint _tmp8_ = {0}; + GdkPoint _tmp5_ = {0}; GdkPoint top_right = {0}; - Box _tmp9_; - gint _tmp10_; - Box _tmp11_; - gint _tmp12_; - GdkPoint _tmp13_ = {0}; - gint _tmp14_; + Box _tmp6_; + gint _tmp7_; + Box _tmp8_; + gint _tmp9_; + GdkPoint _tmp10_ = {0}; + GdkPoint _tmp11_ = {0}; + GdkPoint bottom_left = {0}; + Box _tmp12_; + gint _tmp13_; + Box _tmp14_; gint _tmp15_; - gdouble _tmp16_; + GdkPoint _tmp16_ = {0}; GdkPoint _tmp17_ = {0}; - GdkPoint bottom_left = {0}; + GdkPoint bottom_right = {0}; Box _tmp18_; gint _tmp19_; Box _tmp20_; gint _tmp21_; GdkPoint _tmp22_ = {0}; - gint _tmp23_; - gint _tmp24_; - gdouble _tmp25_; - GdkPoint _tmp26_ = {0}; - GdkPoint bottom_right = {0}; - Box _tmp27_; - gint _tmp28_; - Box _tmp29_; - gint _tmp30_; - GdkPoint _tmp31_ = {0}; - gint _tmp32_; - gint _tmp33_; - gdouble _tmp34_; - GdkPoint _tmp35_ = {0}; + GdkPoint _tmp23_ = {0}; gdouble angle = 0.0; - gdouble _tmp36_; - gdouble _tmp37_; gint top_offset = 0; gint bottom_offset = 0; gint left_offset = 0; gint right_offset = 0; gint top = 0; + GdkPoint _tmp24_; + gint _tmp25_; + GdkPoint _tmp26_; + gint _tmp27_; + gint _tmp28_; + gint bottom = 0; + GdkPoint _tmp31_; + gint _tmp32_; + GdkPoint _tmp33_; + gint _tmp34_; + gint _tmp35_; + gint left = 0; GdkPoint _tmp38_; gint _tmp39_; GdkPoint _tmp40_; gint _tmp41_; gint _tmp42_; - gint _tmp43_; - gint bottom = 0; + gint right = 0; + GdkPoint _tmp45_; + gint _tmp46_; GdkPoint _tmp47_; gint _tmp48_; - GdkPoint _tmp49_; - gint _tmp50_; - gint _tmp51_; - gint _tmp52_; - gint _tmp53_; - gint left = 0; - GdkPoint _tmp58_; - gint _tmp59_; - GdkPoint _tmp60_; - gint _tmp61_; - gint _tmp62_; - gint _tmp63_; - gint right = 0; - GdkPoint _tmp67_; - gint _tmp68_; - GdkPoint _tmp69_; - gint _tmp70_; - gint _tmp71_; - gint _tmp72_; - gint _tmp73_; - Box _tmp78_ = {0}; - gboolean _tmp79_; + gint _tmp49_; + Box _tmp52_ = {0}; #line 504 "/home/jens/Source/shotwell/src/util/image.vala" g_return_if_fail (src != NULL); #line 507 "/home/jens/Source/shotwell/src/util/image.vala" @@ -2663,87 +2399,59 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle #line 507 "/home/jens/Source/shotwell/src/util/image.vala" _tmp4_.y = _tmp3_; #line 507 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp5_ = img_w; -#line 507 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp6_ = img_h; -#line 507 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp7_ = angle_deg; -#line 507 "/home/jens/Source/shotwell/src/util/image.vala" - derotate_point_arb (&_tmp4_, _tmp5_, _tmp6_, _tmp7_, &_tmp8_); + derotate_point_arb (&_tmp4_, img_w, img_h, angle_deg, &_tmp5_); #line 507 "/home/jens/Source/shotwell/src/util/image.vala" - top_left = _tmp8_; + top_left = _tmp5_; #line 508 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp9_ = *src; + _tmp6_ = *src; #line 508 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp10_ = _tmp9_.right; + _tmp7_ = _tmp6_.right; #line 508 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp11_ = *src; + _tmp8_ = *src; #line 508 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp12_ = _tmp11_.top; + _tmp9_ = _tmp8_.top; #line 508 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp13_.x = _tmp10_; + _tmp10_.x = _tmp7_; #line 508 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp13_.y = _tmp12_; + _tmp10_.y = _tmp9_; #line 508 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp14_ = img_w; + derotate_point_arb (&_tmp10_, img_w, img_h, angle_deg, &_tmp11_); #line 508 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp15_ = img_h; -#line 508 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp16_ = angle_deg; -#line 508 "/home/jens/Source/shotwell/src/util/image.vala" - derotate_point_arb (&_tmp13_, _tmp14_, _tmp15_, _tmp16_, &_tmp17_); -#line 508 "/home/jens/Source/shotwell/src/util/image.vala" - top_right = _tmp17_; -#line 509 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp18_ = *src; -#line 509 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp19_ = _tmp18_.left; -#line 509 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp20_ = *src; + top_right = _tmp11_; #line 509 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp21_ = _tmp20_.bottom; + _tmp12_ = *src; #line 509 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp22_.x = _tmp19_; + _tmp13_ = _tmp12_.left; #line 509 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp22_.y = _tmp21_; + _tmp14_ = *src; #line 509 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp23_ = img_w; + _tmp15_ = _tmp14_.bottom; #line 509 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp24_ = img_h; + _tmp16_.x = _tmp13_; #line 509 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp25_ = angle_deg; + _tmp16_.y = _tmp15_; #line 509 "/home/jens/Source/shotwell/src/util/image.vala" - derotate_point_arb (&_tmp22_, _tmp23_, _tmp24_, _tmp25_, &_tmp26_); + derotate_point_arb (&_tmp16_, img_w, img_h, angle_deg, &_tmp17_); #line 509 "/home/jens/Source/shotwell/src/util/image.vala" - bottom_left = _tmp26_; -#line 510 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp27_ = *src; + bottom_left = _tmp17_; #line 510 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp28_ = _tmp27_.right; -#line 510 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp29_ = *src; -#line 510 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp30_ = _tmp29_.bottom; + _tmp18_ = *src; #line 510 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp31_.x = _tmp28_; + _tmp19_ = _tmp18_.right; #line 510 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp31_.y = _tmp30_; + _tmp20_ = *src; #line 510 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp32_ = img_w; + _tmp21_ = _tmp20_.bottom; #line 510 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp33_ = img_h; + _tmp22_.x = _tmp19_; #line 510 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp34_ = angle_deg; + _tmp22_.y = _tmp21_; #line 510 "/home/jens/Source/shotwell/src/util/image.vala" - derotate_point_arb (&_tmp31_, _tmp32_, _tmp33_, _tmp34_, &_tmp35_); + derotate_point_arb (&_tmp22_, img_w, img_h, angle_deg, &_tmp23_); #line 510 "/home/jens/Source/shotwell/src/util/image.vala" - bottom_right = _tmp35_; -#line 512 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp36_ = angle_deg; + bottom_right = _tmp23_; #line 512 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp37_ = degrees_to_radians (_tmp36_); -#line 512 "/home/jens/Source/shotwell/src/util/image.vala" - angle = _tmp37_; + angle = degrees_to_radians (angle_deg); #line 513 "/home/jens/Source/shotwell/src/util/image.vala" top_offset = 0; #line 513 "/home/jens/Source/shotwell/src/util/image.vala" @@ -2753,204 +2461,172 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle #line 513 "/home/jens/Source/shotwell/src/util/image.vala" right_offset = 0; #line 515 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp38_ = top_left; -#line 515 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp39_ = _tmp38_.y; + _tmp24_ = top_left; #line 515 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp40_ = top_right; + _tmp25_ = _tmp24_.y; #line 515 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp41_ = _tmp40_.y; + _tmp26_ = top_right; #line 515 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp42_ = MIN (_tmp39_, _tmp41_); + _tmp27_ = _tmp26_.y; #line 515 "/home/jens/Source/shotwell/src/util/image.vala" - top = _tmp42_; + top = MIN (_tmp25_, _tmp27_); #line 516 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp43_ = top; + _tmp28_ = top; #line 516 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp43_ < 0) { -#line 2772 "image.c" - gint _tmp44_; - gdouble _tmp45_; - gdouble _tmp46_; -#line 517 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp44_ = top; + if (_tmp28_ < 0) { +#line 2478 "image.c" + gint _tmp29_; + gdouble _tmp30_; #line 517 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp45_ = angle; + _tmp29_ = top; #line 517 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp46_ = cos (_tmp45_); + _tmp30_ = angle; #line 517 "/home/jens/Source/shotwell/src/util/image.vala" - top_offset = (gint) ((0 - _tmp44_) * _tmp46_); -#line 2784 "image.c" + top_offset = (gint) ((0 - _tmp29_) * cos (_tmp30_)); +#line 2487 "image.c" } #line 519 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp47_ = bottom_left; + _tmp31_ = bottom_left; #line 519 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp48_ = _tmp47_.y; + _tmp32_ = _tmp31_.y; #line 519 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp49_ = bottom_right; + _tmp33_ = bottom_right; #line 519 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp50_ = _tmp49_.y; + _tmp34_ = _tmp33_.y; #line 519 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp51_ = MAX (_tmp48_, _tmp50_); -#line 519 "/home/jens/Source/shotwell/src/util/image.vala" - bottom = _tmp51_; -#line 520 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp52_ = bottom; + bottom = MAX (_tmp32_, _tmp34_); #line 520 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp53_ = img_h; + _tmp35_ = bottom; #line 520 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp52_ > _tmp53_) { -#line 2804 "image.c" - gint _tmp54_; - gint _tmp55_; - gdouble _tmp56_; - gdouble _tmp57_; + if (_tmp35_ > img_h) { +#line 2503 "image.c" + gint _tmp36_; + gdouble _tmp37_; #line 521 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp54_ = img_h; + _tmp36_ = bottom; #line 521 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp55_ = bottom; + _tmp37_ = angle; #line 521 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp56_ = angle; -#line 521 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp57_ = cos (_tmp56_); -#line 521 "/home/jens/Source/shotwell/src/util/image.vala" - bottom_offset = (gint) ((_tmp54_ - _tmp55_) * _tmp57_); -#line 2819 "image.c" + bottom_offset = (gint) ((img_h - _tmp36_) * cos (_tmp37_)); +#line 2512 "image.c" } #line 523 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp58_ = top_left; -#line 523 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp59_ = _tmp58_.x; + _tmp38_ = top_left; #line 523 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp60_ = bottom_left; + _tmp39_ = _tmp38_.x; #line 523 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp61_ = _tmp60_.x; + _tmp40_ = bottom_left; #line 523 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp62_ = MIN (_tmp59_, _tmp61_); + _tmp41_ = _tmp40_.x; #line 523 "/home/jens/Source/shotwell/src/util/image.vala" - left = _tmp62_; + left = MIN (_tmp39_, _tmp41_); #line 524 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp63_ = left; + _tmp42_ = left; #line 524 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp63_ < 0) { -#line 2837 "image.c" - gint _tmp64_; - gdouble _tmp65_; - gdouble _tmp66_; + if (_tmp42_ < 0) { +#line 2528 "image.c" + gint _tmp43_; + gdouble _tmp44_; #line 525 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp64_ = left; + _tmp43_ = left; #line 525 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp65_ = angle; + _tmp44_ = angle; #line 525 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp66_ = cos (_tmp65_); -#line 525 "/home/jens/Source/shotwell/src/util/image.vala" - left_offset = (gint) ((0 - _tmp64_) * _tmp66_); -#line 2849 "image.c" + left_offset = (gint) ((0 - _tmp43_) * cos (_tmp44_)); +#line 2537 "image.c" } #line 527 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp67_ = top_right; -#line 527 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp68_ = _tmp67_.x; + _tmp45_ = top_right; #line 527 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp69_ = bottom_right; + _tmp46_ = _tmp45_.x; #line 527 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp70_ = _tmp69_.x; + _tmp47_ = bottom_right; #line 527 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp71_ = MAX (_tmp68_, _tmp70_); + _tmp48_ = _tmp47_.x; #line 527 "/home/jens/Source/shotwell/src/util/image.vala" - right = _tmp71_; + right = MAX (_tmp46_, _tmp48_); #line 528 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp72_ = right; + _tmp49_ = right; #line 528 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp73_ = img_w; -#line 528 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp72_ > _tmp73_) { -#line 2869 "image.c" - gint _tmp74_; - gint _tmp75_; - gdouble _tmp76_; - gdouble _tmp77_; -#line 529 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp74_ = img_w; + if (_tmp49_ > img_w) { +#line 2553 "image.c" + gint _tmp50_; + gdouble _tmp51_; #line 529 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp75_ = right; + _tmp50_ = right; #line 529 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp76_ = angle; + _tmp51_ = angle; #line 529 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp77_ = cos (_tmp76_); -#line 529 "/home/jens/Source/shotwell/src/util/image.vala" - right_offset = (gint) ((_tmp74_ - _tmp75_) * _tmp77_); -#line 2884 "image.c" + right_offset = (gint) ((img_w - _tmp50_) * cos (_tmp51_)); +#line 2562 "image.c" } #line 531 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp79_ = preserve_geom; -#line 531 "/home/jens/Source/shotwell/src/util/image.vala" - if (_tmp79_) { -#line 2890 "image.c" - gint _tmp80_; - gint _tmp81_; - gint _tmp82_; - gint _tmp83_; - Box _tmp84_ = {0}; + if (preserve_geom) { +#line 2566 "image.c" + gint _tmp53_; + gint _tmp54_; + gint _tmp55_; + gint _tmp56_; + Box _tmp57_ = {0}; #line 531 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp80_ = left_offset; + _tmp53_ = left_offset; #line 531 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp81_ = right_offset; + _tmp54_ = right_offset; #line 531 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp82_ = top_offset; + _tmp55_ = top_offset; #line 531 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp83_ = bottom_offset; + _tmp56_ = bottom_offset; #line 531 "/home/jens/Source/shotwell/src/util/image.vala" - box_get_offset (src, _tmp80_ + _tmp81_, _tmp82_ + _tmp83_, &_tmp84_); + box_get_offset (src, _tmp53_ + _tmp54_, _tmp55_ + _tmp56_, &_tmp57_); #line 531 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp78_ = _tmp84_; -#line 2908 "image.c" + _tmp52_ = _tmp57_; +#line 2584 "image.c" } else { - Box _tmp85_; - gint _tmp86_; - gint _tmp87_; - Box _tmp88_; - gint _tmp89_; - gint _tmp90_; - Box _tmp91_; - gint _tmp92_; - gint _tmp93_; - Box _tmp94_; - gint _tmp95_; - gint _tmp96_; + Box _tmp58_; + gint _tmp59_; + gint _tmp60_; + Box _tmp61_; + gint _tmp62_; + gint _tmp63_; + Box _tmp64_; + gint _tmp65_; + gint _tmp66_; + Box _tmp67_; + gint _tmp68_; + gint _tmp69_; #line 532 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp85_ = *src; + _tmp58_ = *src; #line 532 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp86_ = _tmp85_.left; + _tmp59_ = _tmp58_.left; #line 532 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp87_ = left_offset; + _tmp60_ = left_offset; #line 532 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp88_ = *src; + _tmp61_ = *src; #line 532 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp89_ = _tmp88_.top; + _tmp62_ = _tmp61_.top; #line 532 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp90_ = top_offset; + _tmp63_ = top_offset; #line 532 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp91_ = *src; + _tmp64_ = *src; #line 532 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp92_ = _tmp91_.right; + _tmp65_ = _tmp64_.right; #line 532 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp93_ = right_offset; + _tmp66_ = right_offset; #line 532 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp94_ = *src; + _tmp67_ = *src; #line 532 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp95_ = _tmp94_.bottom; + _tmp68_ = _tmp67_.bottom; #line 532 "/home/jens/Source/shotwell/src/util/image.vala" - _tmp96_ = bottom_offset; + _tmp69_ = bottom_offset; #line 532 "/home/jens/Source/shotwell/src/util/image.vala" - box_init (&_tmp78_, _tmp86_ + _tmp87_, _tmp89_ + _tmp90_, _tmp92_ + _tmp93_, _tmp95_ + _tmp96_); -#line 2948 "image.c" + box_init (&_tmp52_, _tmp59_ + _tmp60_, _tmp62_ + _tmp63_, _tmp65_ + _tmp66_, _tmp68_ + _tmp69_); +#line 2624 "image.c" } #line 531 "/home/jens/Source/shotwell/src/util/image.vala" - *result = _tmp78_; + *result = _tmp52_; #line 531 "/home/jens/Source/shotwell/src/util/image.vala" return; -#line 2954 "image.c" +#line 2630 "image.c" } diff --git a/src/util/misc.c b/src/util/misc.c index beac274..cfc0b70 100644 --- a/src/util/misc.c +++ b/src/util/misc.c @@ -1,4 +1,4 @@ -/* misc.c generated by valac 0.36.6, the Vala compiler +/* misc.c generated by valac 0.40.4, the Vala compiler * generated from misc.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -184,44 +185,67 @@ static gpointer one_shot_scheduler_parent_class = NULL; static gpointer op_timer_parent_class = NULL; guint int64_hash (gint64* n); -gboolean int64_equal (gint64* a, gint64* b); -gint int64_compare (gint64* a, gint64* b); -gint uint64_compare (guint64* a, guint64* b); -gboolean bool_value_equals (GValue* a, GValue* b); -gboolean int_value_equals (GValue* a, GValue* b); +gboolean int64_equal (gint64* a, + gint64* b); +gint int64_compare (gint64* a, + gint64* b); +gint uint64_compare (guint64* a, + guint64* b); +gboolean bool_value_equals (GValue* a, + GValue* b); +gboolean int_value_equals (GValue* a, + GValue* b); gulong timeval_to_ms (GTimeVal* time_val); gulong now_ms (void); gulong now_sec (void); time_t now_time_t (void); -gchar* md5_file (GFile* file, GError** error); -gboolean equal_sets (GeeSet* a, GeeSet* b); -GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded); +gchar* md5_file (GFile* file, + GError** error); +gboolean equal_sets (GeeSet* a, + GeeSet* b); +GeeSet* intersection_of_sets (GeeSet* a, + GeeSet* b, + GeeSet* excluded); GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; -guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1); +guchar* serialize_photo_ids (GeeCollection* photos, + int* result_length1); GType photo_id_get_type (void) G_GNUC_CONST; PhotoID* photo_id_dup (const PhotoID* self); void photo_id_free (PhotoID* self); -void photo_get_photo_id (Photo* self, PhotoID* result); -GeeList* unserialize_photo_ids (guchar* serialized, gint size); -void photo_id_init (PhotoID *self, gint64 id); -guchar* serialize_media_sources (GeeCollection* media, int* result_length1); +void photo_get_photo_id (Photo* self, + PhotoID* result); +GeeList* unserialize_photo_ids (guchar* serialized, + gint size); +void photo_id_init (PhotoID *self, + gint64 id); +guchar* serialize_media_sources (GeeCollection* media, + int* result_length1); gchar* data_source_get_source_id (DataSource* self); -GeeList* unserialize_media_sources (guchar* serialized, gint size); +GeeList* unserialize_media_sources (guchar* serialized, + gint size); gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); -MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* self, const gchar* source_id); -gchar* format_local_datespan (struct tm* from_date, struct tm* to_date); +MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* self, + const gchar* source_id); +gchar* format_local_datespan (struct tm* from_date, + struct tm* to_date); gchar* resources_get_start_multiday_span_format_string (void); gchar* resources_get_end_multiday_span_format_string (void); gchar* resources_get_start_multimonth_span_format_string (void); @@ -231,104 +255,121 @@ gchar* string_strip_leading_zeroes (const gchar* str); gchar* format_local_date (struct tm* date); gpointer one_shot_scheduler_ref (gpointer instance); void one_shot_scheduler_unref (gpointer instance); -GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_one_shot_scheduler (GValue* value, gpointer v_object); -void value_take_one_shot_scheduler (GValue* value, gpointer v_object); +GParamSpec* param_spec_one_shot_scheduler (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_one_shot_scheduler (GValue* value, + gpointer v_object); +void value_take_one_shot_scheduler (GValue* value, + gpointer v_object); gpointer value_get_one_shot_scheduler (const GValue* value); GType one_shot_scheduler_get_type (void) G_GNUC_CONST; #define ONE_SHOT_SCHEDULER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ONE_SHOT_SCHEDULER, OneShotSchedulerPrivate)) -enum { - ONE_SHOT_SCHEDULER_DUMMY_PROPERTY -}; void one_shot_scheduler_cancel (OneShotScheduler* self); -OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target); -OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target); +OneShotScheduler* one_shot_scheduler_new (const gchar* name, + OneShotCallback callback, + void* callback_target); +OneShotScheduler* one_shot_scheduler_construct (GType object_type, + const gchar* name, + OneShotCallback callback, + void* callback_target); gboolean one_shot_scheduler_is_scheduled (OneShotScheduler* self); void one_shot_scheduler_at_idle (OneShotScheduler* self); -void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority); +void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, + gint priority); static gboolean one_shot_scheduler_callback_wrapper (OneShotScheduler* self); static gboolean _one_shot_scheduler_callback_wrapper_gsource_func (gpointer self); -void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule); -void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint priority, guint msec, gboolean reschedule); +void one_shot_scheduler_after_timeout (OneShotScheduler* self, + guint msec, + gboolean reschedule); +void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, + gint priority, + guint msec, + gboolean reschedule); static void one_shot_scheduler_finalize (OneShotScheduler * obj); gpointer op_timer_ref (gpointer instance); void op_timer_unref (gpointer instance); -GParamSpec* param_spec_op_timer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_op_timer (GValue* value, gpointer v_object); -void value_take_op_timer (GValue* value, gpointer v_object); +GParamSpec* param_spec_op_timer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_op_timer (GValue* value, + gpointer v_object); +void value_take_op_timer (GValue* value, + gpointer v_object); gpointer value_get_op_timer (const GValue* value); GType op_timer_get_type (void) G_GNUC_CONST; #define OP_TIMER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_OP_TIMER, OpTimerPrivate)) -enum { - OP_TIMER_DUMMY_PROPERTY -}; OpTimer* op_timer_new (const gchar* name); -OpTimer* op_timer_construct (GType object_type, const gchar* name); +OpTimer* op_timer_construct (GType object_type, + const gchar* name); void op_timer_start (OpTimer* self); void op_timer_stop (OpTimer* self); gchar* op_timer_to_string (OpTimer* self); static void op_timer_finalize (OpTimer * obj); -guint int64_hash (gint64* n) { +guint +int64_hash (gint64* n) +{ guint result = 0U; guint8* u8 = NULL; - gint64* _tmp0_; guint hash = 0U; #line 9 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = n; -#line 9 "/home/jens/Source/shotwell/src/util/misc.vala" - u8 = (guint8*) _tmp0_; + u8 = (guint8*) n; #line 10 "/home/jens/Source/shotwell/src/util/misc.vala" hash = (guint) 0; -#line 285 "misc.c" +#line 326 "misc.c" { gint ctr = 0; #line 11 "/home/jens/Source/shotwell/src/util/misc.vala" ctr = 0; -#line 290 "misc.c" +#line 331 "misc.c" { - gboolean _tmp1_ = FALSE; + gboolean _tmp0_ = FALSE; #line 11 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = TRUE; + _tmp0_ = TRUE; #line 11 "/home/jens/Source/shotwell/src/util/misc.vala" while (TRUE) { -#line 297 "misc.c" - gint _tmp3_; +#line 338 "misc.c" + gint _tmp2_; + guint _tmp3_; guint _tmp4_; - guint _tmp5_; - guint8* _tmp6_; + guint8* _tmp5_; #line 11 "/home/jens/Source/shotwell/src/util/misc.vala" - if (!_tmp1_) { -#line 304 "misc.c" - gint _tmp2_; + if (!_tmp0_) { +#line 345 "misc.c" + gint _tmp1_; #line 11 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = ctr; + _tmp1_ = ctr; #line 11 "/home/jens/Source/shotwell/src/util/misc.vala" - ctr = _tmp2_ + 1; -#line 310 "misc.c" + ctr = _tmp1_ + 1; +#line 351 "misc.c" } #line 11 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = FALSE; + _tmp0_ = FALSE; #line 11 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = ctr; + _tmp2_ = ctr; #line 11 "/home/jens/Source/shotwell/src/util/misc.vala" - if (!(((gulong) _tmp3_) < (sizeof (gint64) / sizeof (guint8)))) { + if (!(((gulong) _tmp2_) < (sizeof (gint64) / sizeof (guint8)))) { #line 11 "/home/jens/Source/shotwell/src/util/misc.vala" break; -#line 320 "misc.c" +#line 361 "misc.c" } #line 12 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = hash; + _tmp3_ = hash; #line 12 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp5_ = hash; + _tmp4_ = hash; #line 12 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6_ = u8; + _tmp5_ = u8; #line 12 "/home/jens/Source/shotwell/src/util/misc.vala" - u8 = _tmp6_ + 1; + u8 = _tmp5_ + 1; #line 12 "/home/jens/Source/shotwell/src/util/misc.vala" - hash = ((_tmp4_ << 4) ^ (_tmp5_ >> 28)) ^ (*_tmp6_); -#line 332 "misc.c" + hash = ((_tmp3_ << 4) ^ (_tmp4_ >> 28)) ^ (*_tmp5_); +#line 373 "misc.c" } } } @@ -336,128 +377,122 @@ guint int64_hash (gint64* n) { result = hash; #line 15 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 340 "misc.c" +#line 381 "misc.c" } -gboolean int64_equal (gint64* a, gint64* b) { +gboolean +int64_equal (gint64* a, + gint64* b) +{ gboolean result = FALSE; gint64* bia = NULL; - gint64* _tmp0_; gint64* bib = NULL; - gint64* _tmp1_; -#line 19 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = a; #line 19 "/home/jens/Source/shotwell/src/util/misc.vala" - bia = (gint64*) _tmp0_; + bia = (gint64*) a; #line 20 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = b; -#line 20 "/home/jens/Source/shotwell/src/util/misc.vala" - bib = (gint64*) _tmp1_; + bib = (gint64*) b; #line 22 "/home/jens/Source/shotwell/src/util/misc.vala" result = (*bia) == (*bib); #line 22 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 362 "misc.c" +#line 400 "misc.c" } -gint int64_compare (gint64* a, gint64* b) { +gint +int64_compare (gint64* a, + gint64* b) +{ gint result = 0; gint64 diff = 0LL; - gint64* _tmp0_; - gint64* _tmp1_; - gint64 _tmp2_; -#line 26 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = a; + gint64 _tmp0_; #line 26 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = b; -#line 26 "/home/jens/Source/shotwell/src/util/misc.vala" - diff = (*((gint64*) _tmp0_)) - (*((gint64*) _tmp1_)); + diff = (*((gint64*) a)) - (*((gint64*) b)); #line 27 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = diff; + _tmp0_ = diff; #line 27 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp2_ < ((gint64) 0)) { + if (_tmp0_ < ((gint64) 0)) { #line 28 "/home/jens/Source/shotwell/src/util/misc.vala" result = -1; #line 28 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 386 "misc.c" +#line 421 "misc.c" } else { - gint64 _tmp3_; + gint64 _tmp1_; #line 29 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = diff; + _tmp1_ = diff; #line 29 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp3_ > ((gint64) 0)) { + if (_tmp1_ > ((gint64) 0)) { #line 30 "/home/jens/Source/shotwell/src/util/misc.vala" result = 1; #line 30 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 397 "misc.c" +#line 432 "misc.c" } else { #line 32 "/home/jens/Source/shotwell/src/util/misc.vala" result = 0; #line 32 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 403 "misc.c" +#line 438 "misc.c" } } } -gint uint64_compare (guint64* a, guint64* b) { +gint +uint64_compare (guint64* a, + guint64* b) +{ gint result = 0; guint64 a64 = 0ULL; - guint64* _tmp0_; guint64 b64 = 0ULL; - guint64* _tmp1_; - guint64 _tmp2_; - guint64 _tmp3_; -#line 36 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = a; + guint64 _tmp0_; + guint64 _tmp1_; #line 36 "/home/jens/Source/shotwell/src/util/misc.vala" - a64 = *((guint64*) _tmp0_); + a64 = *((guint64*) a); #line 37 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = b; -#line 37 "/home/jens/Source/shotwell/src/util/misc.vala" - b64 = *((guint64*) _tmp1_); + b64 = *((guint64*) b); #line 39 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = a64; + _tmp0_ = a64; #line 39 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = b64; + _tmp1_ = b64; #line 39 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp2_ < _tmp3_) { + if (_tmp0_ < _tmp1_) { #line 40 "/home/jens/Source/shotwell/src/util/misc.vala" result = -1; #line 40 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 435 "misc.c" +#line 467 "misc.c" } else { - guint64 _tmp4_; - guint64 _tmp5_; + guint64 _tmp2_; + guint64 _tmp3_; #line 41 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = a64; + _tmp2_ = a64; #line 41 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp5_ = b64; + _tmp3_ = b64; #line 41 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp4_ > _tmp5_) { + if (_tmp2_ > _tmp3_) { #line 42 "/home/jens/Source/shotwell/src/util/misc.vala" result = 1; #line 42 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 449 "misc.c" +#line 481 "misc.c" } else { #line 44 "/home/jens/Source/shotwell/src/util/misc.vala" result = 0; #line 44 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 455 "misc.c" +#line 487 "misc.c" } } } -gboolean bool_value_equals (GValue* a, GValue* b) { +gboolean +bool_value_equals (GValue* a, + GValue* b) +{ gboolean result = FALSE; GValue _tmp0_; GValue _tmp1_; @@ -473,11 +508,14 @@ gboolean bool_value_equals (GValue* a, GValue* b) { result = g_value_get_boolean (&_tmp0_) == g_value_get_boolean (&_tmp1_); #line 50 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 477 "misc.c" +#line 512 "misc.c" } -gboolean int_value_equals (GValue* a, GValue* b) { +gboolean +int_value_equals (GValue* a, + GValue* b) +{ gboolean result = FALSE; GValue _tmp0_; GValue _tmp1_; @@ -493,11 +531,13 @@ gboolean int_value_equals (GValue* a, GValue* b) { result = g_value_get_int (&_tmp0_) == g_value_get_int (&_tmp1_); #line 54 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 497 "misc.c" +#line 535 "misc.c" } -gulong timeval_to_ms (GTimeVal* time_val) { +gulong +timeval_to_ms (GTimeVal* time_val) +{ gulong result = 0UL; GTimeVal _tmp0_; glong _tmp1_; @@ -517,27 +557,28 @@ gulong timeval_to_ms (GTimeVal* time_val) { result = (((gulong) _tmp1_) * 1000) + (((gulong) _tmp3_) / 1000); #line 58 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 521 "misc.c" +#line 561 "misc.c" } -gulong now_ms (void) { +gulong +now_ms (void) +{ gulong result = 0UL; GTimeVal _tmp0_ = {0}; - gulong _tmp1_; #line 62 "/home/jens/Source/shotwell/src/util/misc.vala" g_get_current_time (&_tmp0_); #line 62 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = timeval_to_ms (&_tmp0_); -#line 62 "/home/jens/Source/shotwell/src/util/misc.vala" - result = _tmp1_; + result = timeval_to_ms (&_tmp0_); #line 62 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 537 "misc.c" +#line 576 "misc.c" } -gulong now_sec (void) { +gulong +now_sec (void) +{ gulong result = 0UL; GTimeVal time_val = {0}; GTimeVal _tmp0_; @@ -552,24 +593,26 @@ gulong now_sec (void) { result = (gulong) _tmp1_; #line 68 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 556 "misc.c" +#line 597 "misc.c" } -inline time_t now_time_t (void) { +inline time_t +now_time_t (void) +{ time_t result = 0; - gulong _tmp0_; -#line 72 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = now_sec (); #line 72 "/home/jens/Source/shotwell/src/util/misc.vala" - result = (time_t) _tmp0_; + result = (time_t) now_sec (); #line 72 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 569 "misc.c" +#line 609 "misc.c" } -gchar* md5_file (GFile* file, GError** error) { +gchar* +md5_file (GFile* file, + GError** error) +{ gchar* result = NULL; GChecksum* md5 = NULL; GChecksum* _tmp0_; @@ -578,11 +621,10 @@ gchar* md5_file (GFile* file, GError** error) { gint buffer_length1; gint _buffer_size_; GFileInputStream* fins = NULL; - GFile* _tmp2_; - GFileInputStream* _tmp3_; - GChecksum* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; + GFileInputStream* _tmp2_; + GChecksum* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; GError * _inner_error_ = NULL; #line 75 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); @@ -599,11 +641,9 @@ gchar* md5_file (GFile* file, GError** error) { #line 77 "/home/jens/Source/shotwell/src/util/misc.vala" _buffer_size_ = buffer_length1; #line 79 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = file; + _tmp2_ = g_file_read (file, NULL, &_inner_error_); #line 79 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = g_file_read (_tmp2_, NULL, &_inner_error_); -#line 79 "/home/jens/Source/shotwell/src/util/misc.vala" - fins = _tmp3_; + fins = _tmp2_; #line 79 "/home/jens/Source/shotwell/src/util/misc.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 79 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -614,41 +654,38 @@ gchar* md5_file (GFile* file, GError** error) { _g_checksum_free0 (md5); #line 79 "/home/jens/Source/shotwell/src/util/misc.vala" return NULL; -#line 618 "misc.c" +#line 658 "misc.c" } { - gboolean _tmp4_ = FALSE; + gboolean _tmp3_ = FALSE; #line 80 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = TRUE; + _tmp3_ = TRUE; #line 80 "/home/jens/Source/shotwell/src/util/misc.vala" while (TRUE) { -#line 626 "misc.c" +#line 666 "misc.c" gsize bytes_read = 0UL; - GFileInputStream* _tmp5_; - guint8* _tmp6_; - gint _tmp6__length1; - gssize _tmp7_; - gsize _tmp8_; - GChecksum* _tmp9_; - guint8* _tmp10_; - gint _tmp10__length1; - gsize _tmp11_; + GFileInputStream* _tmp4_; + guint8* _tmp5_; + gint _tmp5__length1; + gsize _tmp6_; + GChecksum* _tmp7_; + guint8* _tmp8_; + gint _tmp8__length1; + gsize _tmp9_; #line 80 "/home/jens/Source/shotwell/src/util/misc.vala" - if (!_tmp4_) { -#line 639 "misc.c" + if (!_tmp3_) { +#line 678 "misc.c" } #line 80 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = FALSE; -#line 81 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp5_ = fins; + _tmp3_ = FALSE; #line 81 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6_ = buffer; + _tmp4_ = fins; #line 81 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6__length1 = buffer_length1; + _tmp5_ = buffer; #line 81 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp7_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_input_stream_get_type (), GInputStream), _tmp6_, (gsize) _tmp6__length1, NULL, &_inner_error_); + _tmp5__length1 = buffer_length1; #line 81 "/home/jens/Source/shotwell/src/util/misc.vala" - bytes_read = (gsize) _tmp7_; + bytes_read = (gsize) g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, g_input_stream_get_type (), GInputStream), _tmp5_, (gsize) _tmp5__length1, NULL, &_inner_error_); #line 81 "/home/jens/Source/shotwell/src/util/misc.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 81 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -661,38 +698,38 @@ gchar* md5_file (GFile* file, GError** error) { _g_checksum_free0 (md5); #line 81 "/home/jens/Source/shotwell/src/util/misc.vala" return NULL; -#line 665 "misc.c" +#line 702 "misc.c" } #line 82 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp8_ = bytes_read; + _tmp6_ = bytes_read; #line 82 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp8_ <= ((gsize) 0)) { + if (_tmp6_ <= ((gsize) 0)) { #line 83 "/home/jens/Source/shotwell/src/util/misc.vala" break; -#line 673 "misc.c" +#line 710 "misc.c" } #line 85 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp9_ = md5; + _tmp7_ = md5; #line 85 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10_ = buffer; + _tmp8_ = buffer; #line 85 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10__length1 = buffer_length1; + _tmp8__length1 = buffer_length1; #line 85 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp11_ = bytes_read; + _tmp9_ = bytes_read; #line 85 "/home/jens/Source/shotwell/src/util/misc.vala" - g_checksum_update (_tmp9_, (guchar*) _tmp10_, _tmp11_); -#line 685 "misc.c" + g_checksum_update (_tmp7_, (guchar*) _tmp8_, _tmp9_); +#line 722 "misc.c" } } { - GFileInputStream* _tmp12_; + GFileInputStream* _tmp10_; #line 89 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp12_ = fins; + _tmp10_ = fins; #line 89 "/home/jens/Source/shotwell/src/util/misc.vala" - g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); + g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); #line 89 "/home/jens/Source/shotwell/src/util/misc.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 696 "misc.c" +#line 733 "misc.c" goto __catch5_g_error; } } @@ -700,32 +737,29 @@ gchar* md5_file (GFile* file, GError** error) { __catch5_g_error: { GError* err = NULL; - GFile* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; - GError* _tmp16_; - const gchar* _tmp17_; + gchar* _tmp11_; + gchar* _tmp12_; + GError* _tmp13_; + const gchar* _tmp14_; #line 88 "/home/jens/Source/shotwell/src/util/misc.vala" err = _inner_error_; #line 88 "/home/jens/Source/shotwell/src/util/misc.vala" _inner_error_ = NULL; #line 91 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp13_ = file; -#line 91 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp14_ = g_file_get_path (_tmp13_); + _tmp11_ = g_file_get_path (file); #line 91 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp15_ = _tmp14_; + _tmp12_ = _tmp11_; #line 91 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp16_ = err; + _tmp13_ = err; #line 91 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp17_ = _tmp16_->message; + _tmp14_ = _tmp13_->message; #line 91 "/home/jens/Source/shotwell/src/util/misc.vala" - g_warning ("misc.vala:91: Unable to close MD5 input stream for %s: %s", _tmp15_, _tmp17_); + g_warning ("misc.vala:91: Unable to close MD5 input stream for %s: %s", _tmp12_, _tmp14_); #line 91 "/home/jens/Source/shotwell/src/util/misc.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp12_); #line 88 "/home/jens/Source/shotwell/src/util/misc.vala" _g_error_free0 (err); -#line 729 "misc.c" +#line 763 "misc.c" } __finally5: #line 88 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -740,16 +774,16 @@ gchar* md5_file (GFile* file, GError** error) { _g_checksum_free0 (md5); #line 88 "/home/jens/Source/shotwell/src/util/misc.vala" return NULL; -#line 744 "misc.c" +#line 778 "misc.c" } #line 94 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp18_ = md5; + _tmp15_ = md5; #line 94 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp19_ = g_checksum_get_string (_tmp18_); + _tmp16_ = g_checksum_get_string (_tmp15_); #line 94 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp20_ = g_strdup (_tmp19_); + _tmp17_ = g_strdup (_tmp16_); #line 94 "/home/jens/Source/shotwell/src/util/misc.vala" - result = _tmp20_; + result = _tmp17_; #line 94 "/home/jens/Source/shotwell/src/util/misc.vala" _g_object_unref0 (fins); #line 94 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -758,67 +792,55 @@ gchar* md5_file (GFile* file, GError** error) { _g_checksum_free0 (md5); #line 94 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 762 "misc.c" +#line 796 "misc.c" } -gboolean equal_sets (GeeSet* a, GeeSet* b) { +gboolean +equal_sets (GeeSet* a, + GeeSet* b) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GeeSet* _tmp2_; - gboolean _tmp7_ = FALSE; - GeeSet* _tmp8_; - gboolean _tmp14_ = FALSE; - gboolean _tmp15_ = FALSE; - GeeSet* _tmp16_; - gboolean _tmp21_ = FALSE; - GeeSet* _tmp22_; - GeeSet* _tmp24_; - gint _tmp25_; - gint _tmp26_; - GeeSet* _tmp27_; - gint _tmp28_; - gint _tmp29_; + gboolean _tmp4_ = FALSE; + gboolean _tmp8_ = FALSE; + gboolean _tmp9_ = FALSE; + gboolean _tmp11_ = FALSE; + gint _tmp12_; + gint _tmp13_; + gint _tmp14_; + gint _tmp15_; #line 98 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail ((a == NULL) || GEE_IS_SET (a), FALSE); #line 98 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail ((b == NULL) || GEE_IS_SET (b), FALSE); #line 99 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = a; -#line 99 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp2_ != NULL) { -#line 792 "misc.c" - GeeSet* _tmp3_; - gint _tmp4_; - gint _tmp5_; -#line 99 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = a; + if (a != NULL) { +#line 821 "misc.c" + gint _tmp2_; + gint _tmp3_; #line 99 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_COLLECTION, GeeCollection)); #line 99 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 99 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = _tmp5_ == 0; -#line 804 "misc.c" + _tmp1_ = _tmp3_ == 0; +#line 830 "misc.c" } else { #line 99 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp1_ = FALSE; -#line 808 "misc.c" +#line 834 "misc.c" } #line 99 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp1_) { -#line 812 "misc.c" - GeeSet* _tmp6_; -#line 99 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6_ = b; #line 99 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = _tmp6_ == NULL; -#line 818 "misc.c" + _tmp0_ = b == NULL; +#line 840 "misc.c" } else { #line 99 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp0_ = FALSE; -#line 822 "misc.c" +#line 844 "misc.c" } #line 99 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp0_) { @@ -826,194 +848,151 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) { result = TRUE; #line 100 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 830 "misc.c" +#line 852 "misc.c" } #line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp8_ = a; + if (a == NULL) { +#line 856 "misc.c" + gboolean _tmp5_ = FALSE; #line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp8_ == NULL) { -#line 836 "misc.c" - gboolean _tmp9_ = FALSE; - GeeSet* _tmp10_; + if (b != NULL) { +#line 860 "misc.c" + gint _tmp6_; + gint _tmp7_; #line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10_ = b; + _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (b, GEE_TYPE_COLLECTION, GeeCollection)); #line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp10_ != NULL) { -#line 843 "misc.c" - GeeSet* _tmp11_; - gint _tmp12_; - gint _tmp13_; -#line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp11_ = b; -#line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp13_ = _tmp12_; + _tmp7_ = _tmp6_; #line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp9_ = _tmp13_ == 0; -#line 855 "misc.c" + _tmp5_ = _tmp7_ == 0; +#line 869 "misc.c" } else { #line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp9_ = FALSE; -#line 859 "misc.c" + _tmp5_ = FALSE; +#line 873 "misc.c" } #line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp7_ = _tmp9_; -#line 863 "misc.c" + _tmp4_ = _tmp5_; +#line 877 "misc.c" } else { #line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp7_ = FALSE; -#line 867 "misc.c" + _tmp4_ = FALSE; +#line 881 "misc.c" } #line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp7_) { + if (_tmp4_) { #line 103 "/home/jens/Source/shotwell/src/util/misc.vala" result = TRUE; #line 103 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 875 "misc.c" +#line 889 "misc.c" } #line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp16_ = a; -#line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp16_ == NULL) { -#line 881 "misc.c" - GeeSet* _tmp17_; + if (a == NULL) { #line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp17_ = b; -#line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp15_ = _tmp17_ != NULL; -#line 887 "misc.c" + _tmp9_ = b != NULL; +#line 895 "misc.c" } else { #line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp15_ = FALSE; -#line 891 "misc.c" + _tmp9_ = FALSE; +#line 899 "misc.c" } #line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp15_) { -#line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp14_ = TRUE; -#line 897 "misc.c" - } else { - gboolean _tmp18_ = FALSE; - GeeSet* _tmp19_; -#line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp19_ = a; + if (_tmp9_) { #line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp19_ != NULL) { + _tmp8_ = TRUE; #line 905 "misc.c" - GeeSet* _tmp20_; + } else { + gboolean _tmp10_ = FALSE; #line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp20_ = b; + if (a != NULL) { #line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp18_ = _tmp20_ == NULL; -#line 911 "misc.c" + _tmp10_ = b == NULL; +#line 912 "misc.c" } else { #line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp18_ = FALSE; -#line 915 "misc.c" + _tmp10_ = FALSE; +#line 916 "misc.c" } #line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp14_ = _tmp18_; -#line 919 "misc.c" + _tmp8_ = _tmp10_; +#line 920 "misc.c" } #line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp14_) { + if (_tmp8_) { #line 106 "/home/jens/Source/shotwell/src/util/misc.vala" result = FALSE; #line 106 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 927 "misc.c" +#line 928 "misc.c" } #line 108 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp22_ = a; -#line 108 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp22_ == NULL) { -#line 933 "misc.c" - GeeSet* _tmp23_; -#line 108 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp23_ = b; + if (a == NULL) { #line 108 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp21_ = _tmp23_ == NULL; -#line 939 "misc.c" + _tmp11_ = b == NULL; +#line 934 "misc.c" } else { #line 108 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp21_ = FALSE; -#line 943 "misc.c" + _tmp11_ = FALSE; +#line 938 "misc.c" } #line 108 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp21_) { + if (_tmp11_) { #line 109 "/home/jens/Source/shotwell/src/util/misc.vala" result = TRUE; #line 109 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 951 "misc.c" +#line 946 "misc.c" } #line 111 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp24_ = a; + _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_COLLECTION, GeeCollection)); #line 111 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp25_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 111 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp26_ = _tmp25_; + _tmp13_ = _tmp12_; #line 111 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp27_ = b; + _tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (b, GEE_TYPE_COLLECTION, GeeCollection)); #line 111 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp28_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp15_ = _tmp14_; #line 111 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp29_ = _tmp28_; -#line 111 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp26_ != _tmp29_) { + if (_tmp13_ != _tmp15_) { #line 112 "/home/jens/Source/shotwell/src/util/misc.vala" result = FALSE; #line 112 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 971 "misc.c" +#line 962 "misc.c" } { GeeIterator* _element_it = NULL; - GeeSet* _tmp30_; - GeeIterator* _tmp31_; -#line 116 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp30_ = a; + GeeIterator* _tmp16_; #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp31_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_ITERABLE, GeeIterable)); #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" - _element_it = _tmp31_; + _element_it = _tmp16_; #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" while (TRUE) { -#line 985 "misc.c" - GeeIterator* _tmp32_; - gboolean _tmp33_; +#line 973 "misc.c" + GeeIterator* _tmp17_; gchar* element = NULL; - GeeIterator* _tmp34_; - gpointer _tmp35_; - GeeSet* _tmp36_; - const gchar* _tmp37_; - gboolean _tmp38_; -#line 116 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp32_ = _element_it; + GeeIterator* _tmp18_; + gpointer _tmp19_; + const gchar* _tmp20_; #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp33_ = gee_iterator_next (_tmp32_); + _tmp17_ = _element_it; #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" - if (!_tmp33_) { + if (!gee_iterator_next (_tmp17_)) { #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" break; -#line 1002 "misc.c" +#line 985 "misc.c" } #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp34_ = _element_it; + _tmp18_ = _element_it; #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp35_ = gee_iterator_get (_tmp34_); + _tmp19_ = gee_iterator_get (_tmp18_); #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" - element = (gchar*) _tmp35_; -#line 117 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp36_ = b; + element = (gchar*) _tmp19_; #line 117 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp37_ = element; -#line 117 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp38_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_); + _tmp20_ = element; #line 117 "/home/jens/Source/shotwell/src/util/misc.vala" - if (!_tmp38_) { + if (!gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (b, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_)) { #line 118 "/home/jens/Source/shotwell/src/util/misc.vala" result = FALSE; #line 118 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -1022,44 +1001,48 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) { _g_object_unref0 (_element_it); #line 118 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1026 "misc.c" +#line 1005 "misc.c" } #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" _g_free0 (element); -#line 1030 "misc.c" +#line 1009 "misc.c" } #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" _g_object_unref0 (_element_it); -#line 1034 "misc.c" +#line 1013 "misc.c" } #line 121 "/home/jens/Source/shotwell/src/util/misc.vala" result = TRUE; #line 121 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1040 "misc.c" +#line 1019 "misc.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" return self ? g_object_ref (self) : NULL; -#line 1047 "misc.c" +#line 1028 "misc.c" } -GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) { +GeeSet* +intersection_of_sets (GeeSet* a, + GeeSet* b, + GeeSet* excluded) +{ GeeSet* result = NULL; gboolean _tmp0_ = FALSE; - GeeSet* _tmp1_; - gboolean _tmp6_ = FALSE; - GeeSet* _tmp7_; + gboolean _tmp1_ = FALSE; GeeSet* intersection = NULL; - GeeHashSet* _tmp12_; - GeeSet* _tmp41_ = NULL; - GeeSet* _tmp42_; - gint _tmp43_; - gint _tmp44_; - GeeSet* _tmp46_; + GeeHashSet* _tmp2_; + GeeSet* _tmp19_ = NULL; + GeeSet* _tmp20_; + gint _tmp21_; + gint _tmp22_; + GeeSet* _tmp24_; #line 125 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail ((a == NULL) || GEE_IS_SET (a), NULL); #line 125 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -1067,540 +1050,452 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) { #line 125 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail ((excluded == NULL) || GEE_IS_SET (excluded), NULL); #line 127 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = a; + if (a != NULL) { #line 127 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp1_ != NULL) { -#line 1074 "misc.c" - GeeSet* _tmp2_; -#line 127 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = b; -#line 127 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = _tmp2_ == NULL; -#line 1080 "misc.c" + _tmp0_ = b == NULL; +#line 1057 "misc.c" } else { #line 127 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp0_ = FALSE; -#line 1084 "misc.c" +#line 1061 "misc.c" } #line 127 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp0_) { -#line 1088 "misc.c" - GeeSet* _tmp3_; -#line 128 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = excluded; #line 128 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp3_ != NULL) { -#line 1094 "misc.c" - GeeSet* _tmp4_; - GeeSet* _tmp5_; + if (excluded != NULL) { #line 129 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = excluded; -#line 129 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp5_ = a; -#line 129 "/home/jens/Source/shotwell/src/util/misc.vala" - gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1103 "misc.c" + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (excluded, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_COLLECTION, GeeCollection)); +#line 1069 "misc.c" } #line 131 "/home/jens/Source/shotwell/src/util/misc.vala" result = NULL; #line 131 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1109 "misc.c" +#line 1075 "misc.c" } #line 134 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp7_ = a; -#line 134 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp7_ == NULL) { -#line 1115 "misc.c" - GeeSet* _tmp8_; -#line 134 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp8_ = b; + if (a == NULL) { #line 134 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6_ = _tmp8_ != NULL; -#line 1121 "misc.c" + _tmp1_ = b != NULL; +#line 1081 "misc.c" } else { #line 134 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6_ = FALSE; -#line 1125 "misc.c" + _tmp1_ = FALSE; +#line 1085 "misc.c" } #line 134 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp6_) { -#line 1129 "misc.c" - GeeSet* _tmp9_; -#line 135 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp9_ = excluded; + if (_tmp1_) { #line 135 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp9_ != NULL) { -#line 1135 "misc.c" - GeeSet* _tmp10_; - GeeSet* _tmp11_; -#line 136 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10_ = excluded; -#line 136 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp11_ = b; + if (excluded != NULL) { #line 136 "/home/jens/Source/shotwell/src/util/misc.vala" - gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1144 "misc.c" + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (excluded, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (b, GEE_TYPE_COLLECTION, GeeCollection)); +#line 1093 "misc.c" } #line 138 "/home/jens/Source/shotwell/src/util/misc.vala" result = NULL; #line 138 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1150 "misc.c" +#line 1099 "misc.c" } #line 141 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp12_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp2_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 141 "/home/jens/Source/shotwell/src/util/misc.vala" - intersection = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_SET, GeeSet); -#line 1156 "misc.c" + intersection = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_SET, GeeSet); +#line 1105 "misc.c" { GeeIterator* _element_it = NULL; - GeeSet* _tmp13_; - GeeIterator* _tmp14_; + GeeIterator* _tmp3_; #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp13_ = a; + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_ITERABLE, GeeIterable)); #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 143 "/home/jens/Source/shotwell/src/util/misc.vala" - _element_it = _tmp14_; + _element_it = _tmp3_; #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" while (TRUE) { -#line 1169 "misc.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 1115 "misc.c" + GeeIterator* _tmp4_; gchar* element = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; - GeeSet* _tmp19_; - const gchar* _tmp20_; - gboolean _tmp21_; -#line 143 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp15_ = _element_it; + GeeIterator* _tmp5_; + gpointer _tmp6_; + const gchar* _tmp7_; #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp16_ = gee_iterator_next (_tmp15_); + _tmp4_ = _element_it; #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp4_)) { #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" break; -#line 1186 "misc.c" +#line 1127 "misc.c" } #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp17_ = _element_it; + _tmp5_ = _element_it; #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" - element = (gchar*) _tmp18_; -#line 144 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp19_ = b; -#line 144 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp20_ = element; + element = (gchar*) _tmp6_; #line 144 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp21_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_); + _tmp7_ = element; #line 144 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp21_) { -#line 1202 "misc.c" - GeeSet* _tmp22_; - const gchar* _tmp23_; + if (gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (b, GEE_TYPE_COLLECTION, GeeCollection), _tmp7_)) { +#line 1139 "misc.c" + GeeSet* _tmp8_; + const gchar* _tmp9_; #line 145 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp22_ = intersection; + _tmp8_ = intersection; #line 145 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp23_ = element; + _tmp9_ = element; #line 145 "/home/jens/Source/shotwell/src/util/misc.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_); -#line 1211 "misc.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp9_); +#line 1148 "misc.c" } else { - GeeSet* _tmp24_; #line 146 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp24_ = excluded; -#line 146 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp24_ != NULL) { -#line 1218 "misc.c" - GeeSet* _tmp25_; - const gchar* _tmp26_; -#line 147 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp25_ = excluded; + if (excluded != NULL) { +#line 1152 "misc.c" + const gchar* _tmp10_; #line 147 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp26_ = element; + _tmp10_ = element; #line 147 "/home/jens/Source/shotwell/src/util/misc.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), _tmp26_); -#line 1227 "misc.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (excluded, GEE_TYPE_COLLECTION, GeeCollection), _tmp10_); +#line 1158 "misc.c" } } #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" _g_free0 (element); -#line 1232 "misc.c" +#line 1163 "misc.c" } #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" _g_object_unref0 (_element_it); -#line 1236 "misc.c" +#line 1167 "misc.c" } { GeeIterator* _element_it = NULL; - GeeSet* _tmp27_; - GeeIterator* _tmp28_; + GeeIterator* _tmp11_; #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp27_ = b; + _tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (b, GEE_TYPE_ITERABLE, GeeIterable)); #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp28_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 150 "/home/jens/Source/shotwell/src/util/misc.vala" - _element_it = _tmp28_; + _element_it = _tmp11_; #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" while (TRUE) { -#line 1250 "misc.c" - GeeIterator* _tmp29_; - gboolean _tmp30_; +#line 1178 "misc.c" + GeeIterator* _tmp12_; gchar* element = NULL; - GeeIterator* _tmp31_; - gpointer _tmp32_; - GeeSet* _tmp33_; - const gchar* _tmp34_; - gboolean _tmp35_; -#line 150 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp29_ = _element_it; + GeeIterator* _tmp13_; + gpointer _tmp14_; + const gchar* _tmp15_; #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp30_ = gee_iterator_next (_tmp29_); + _tmp12_ = _element_it; #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" - if (!_tmp30_) { + if (!gee_iterator_next (_tmp12_)) { #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" break; -#line 1267 "misc.c" +#line 1190 "misc.c" } #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp31_ = _element_it; + _tmp13_ = _element_it; #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp32_ = gee_iterator_get (_tmp31_); + _tmp14_ = gee_iterator_get (_tmp13_); #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" - element = (gchar*) _tmp32_; + element = (gchar*) _tmp14_; #line 151 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp33_ = a; + _tmp15_ = element; #line 151 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp34_ = element; -#line 151 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp35_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), _tmp34_); -#line 151 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp35_) { -#line 1283 "misc.c" - GeeSet* _tmp36_; - const gchar* _tmp37_; + if (gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_)) { +#line 1202 "misc.c" + GeeSet* _tmp16_; + const gchar* _tmp17_; #line 152 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp36_ = intersection; + _tmp16_ = intersection; #line 152 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp37_ = element; + _tmp17_ = element; #line 152 "/home/jens/Source/shotwell/src/util/misc.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_); -#line 1292 "misc.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_); +#line 1211 "misc.c" } else { - GeeSet* _tmp38_; -#line 153 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp38_ = excluded; #line 153 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp38_ != NULL) { -#line 1299 "misc.c" - GeeSet* _tmp39_; - const gchar* _tmp40_; -#line 154 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp39_ = excluded; + if (excluded != NULL) { +#line 1215 "misc.c" + const gchar* _tmp18_; #line 154 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp40_ = element; + _tmp18_ = element; #line 154 "/home/jens/Source/shotwell/src/util/misc.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection), _tmp40_); -#line 1308 "misc.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (excluded, GEE_TYPE_COLLECTION, GeeCollection), _tmp18_); +#line 1221 "misc.c" } } #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" _g_free0 (element); -#line 1313 "misc.c" +#line 1226 "misc.c" } #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" _g_object_unref0 (_element_it); -#line 1317 "misc.c" +#line 1230 "misc.c" } #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp42_ = intersection; + _tmp20_ = intersection; #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp43_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp44_ = _tmp43_; + _tmp22_ = _tmp21_; #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp44_ > 0) { -#line 1327 "misc.c" - GeeSet* _tmp45_; + if (_tmp22_ > 0) { +#line 1240 "misc.c" + GeeSet* _tmp23_; #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp45_ = intersection; + _tmp23_ = intersection; #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp41_ = _tmp45_; -#line 1333 "misc.c" + _tmp19_ = _tmp23_; +#line 1246 "misc.c" } else { #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp41_ = NULL; -#line 1337 "misc.c" + _tmp19_ = NULL; +#line 1250 "misc.c" } #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp46_ = _g_object_ref0 (_tmp41_); + _tmp24_ = _g_object_ref0 (_tmp19_); #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" - result = _tmp46_; + result = _tmp24_; #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" _g_object_unref0 (intersection); #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1347 "misc.c" +#line 1260 "misc.c" } -guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) { +guchar* +serialize_photo_ids (GeeCollection* photos, + int* result_length1) +{ guchar* result = NULL; gint64* ids = NULL; - GeeCollection* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; - gint64* _tmp3_; + gint64* _tmp2_; gint ids_length1; gint _ids_size_; gint ctr = 0; gsize bytes = 0UL; - GeeCollection* _tmp16_; - gint _tmp17_; - gint _tmp18_; + gint _tmp13_; + gint _tmp14_; guchar* serialized = NULL; - guchar* _tmp19_; + guchar* _tmp15_; gint serialized_length1; gint _serialized_size_; - gint64* _tmp20_; - gint _tmp20__length1; - guchar* _tmp21_; - gint _tmp21__length1; + gint64* _tmp16_; + gint _tmp16__length1; + guchar* _tmp17_; + gint _tmp17__length1; #line 160 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail (GEE_IS_COLLECTION (photos), NULL); #line 161 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = photos; + _tmp0_ = gee_collection_get_size (photos); #line 161 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp1_ = _tmp0_; #line 161 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = _tmp1_; + _tmp2_ = g_new0 (gint64, _tmp1_); #line 161 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = g_new0 (gint64, _tmp2_); + ids = _tmp2_; #line 161 "/home/jens/Source/shotwell/src/util/misc.vala" - ids = _tmp3_; -#line 161 "/home/jens/Source/shotwell/src/util/misc.vala" - ids_length1 = _tmp2_; + ids_length1 = _tmp1_; #line 161 "/home/jens/Source/shotwell/src/util/misc.vala" _ids_size_ = ids_length1; #line 162 "/home/jens/Source/shotwell/src/util/misc.vala" ctr = 0; -#line 1391 "misc.c" +#line 1303 "misc.c" { GeeIterator* _photo_it = NULL; - GeeCollection* _tmp4_; - GeeIterator* _tmp5_; + GeeIterator* _tmp3_; #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = photos; + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_ITERABLE, GeeIterable)); #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 163 "/home/jens/Source/shotwell/src/util/misc.vala" - _photo_it = _tmp5_; + _photo_it = _tmp3_; #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" while (TRUE) { -#line 1404 "misc.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 1313 "misc.c" + GeeIterator* _tmp4_; Photo* photo = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - gint64* _tmp10_; - gint _tmp10__length1; - gint _tmp11_; - Photo* _tmp12_; - PhotoID _tmp13_ = {0}; - gint64 _tmp14_; - gint64 _tmp15_; -#line 163 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6_ = _photo_it; + GeeIterator* _tmp5_; + gpointer _tmp6_; + gint64* _tmp7_; + gint _tmp7__length1; + gint _tmp8_; + Photo* _tmp9_; + PhotoID _tmp10_ = {0}; + gint64 _tmp11_; + gint64 _tmp12_; #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp4_ = _photo_it; #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp4_)) { #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" break; -#line 1425 "misc.c" +#line 1331 "misc.c" } #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp8_ = _photo_it; + _tmp5_ = _photo_it; #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" - photo = (Photo*) _tmp9_; + photo = (Photo*) _tmp6_; #line 164 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10_ = ids; + _tmp7_ = ids; #line 164 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10__length1 = ids_length1; + _tmp7__length1 = ids_length1; #line 164 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp11_ = ctr; + _tmp8_ = ctr; #line 164 "/home/jens/Source/shotwell/src/util/misc.vala" - ctr = _tmp11_ + 1; + ctr = _tmp8_ + 1; #line 164 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp12_ = photo; + _tmp9_ = photo; #line 164 "/home/jens/Source/shotwell/src/util/misc.vala" - photo_get_photo_id (_tmp12_, &_tmp13_); + photo_get_photo_id (_tmp9_, &_tmp10_); #line 164 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp14_ = _tmp13_.id; + _tmp11_ = _tmp10_.id; #line 164 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10_[_tmp11_] = _tmp14_; + _tmp7_[_tmp8_] = _tmp11_; #line 164 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp15_ = _tmp10_[_tmp11_]; + _tmp12_ = _tmp7_[_tmp8_]; #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" _g_object_unref0 (photo); -#line 1453 "misc.c" +#line 1359 "misc.c" } #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" _g_object_unref0 (_photo_it); -#line 1457 "misc.c" +#line 1363 "misc.c" } #line 166 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp16_ = photos; + _tmp13_ = gee_collection_get_size (photos); #line 166 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp17_ = gee_collection_get_size (_tmp16_); + _tmp14_ = _tmp13_; #line 166 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp18_ = _tmp17_; -#line 166 "/home/jens/Source/shotwell/src/util/misc.vala" - bytes = (gsize) (_tmp18_ * sizeof (gint64)); + bytes = (gsize) (_tmp14_ * sizeof (gint64)); #line 167 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp19_ = g_new0 (guchar, bytes); + _tmp15_ = g_new0 (guchar, bytes); #line 167 "/home/jens/Source/shotwell/src/util/misc.vala" - serialized = _tmp19_; + serialized = _tmp15_; #line 167 "/home/jens/Source/shotwell/src/util/misc.vala" serialized_length1 = bytes; #line 167 "/home/jens/Source/shotwell/src/util/misc.vala" _serialized_size_ = serialized_length1; #line 168 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp20_ = ids; + _tmp16_ = ids; #line 168 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp20__length1 = ids_length1; + _tmp16__length1 = ids_length1; #line 168 "/home/jens/Source/shotwell/src/util/misc.vala" - memcpy (serialized, _tmp20_, bytes); + memcpy (serialized, _tmp16_, bytes); #line 170 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp21_ = serialized; + _tmp17_ = serialized; #line 170 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp21__length1 = serialized_length1; + _tmp17__length1 = serialized_length1; #line 170 "/home/jens/Source/shotwell/src/util/misc.vala" if (result_length1) { #line 170 "/home/jens/Source/shotwell/src/util/misc.vala" - *result_length1 = _tmp21__length1; -#line 1489 "misc.c" + *result_length1 = _tmp17__length1; +#line 1393 "misc.c" } #line 170 "/home/jens/Source/shotwell/src/util/misc.vala" - result = _tmp21_; + result = _tmp17_; #line 170 "/home/jens/Source/shotwell/src/util/misc.vala" ids = (g_free (ids), NULL); #line 170 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1497 "misc.c" +#line 1401 "misc.c" } -GeeList* unserialize_photo_ids (guchar* serialized, gint size) { +GeeList* +unserialize_photo_ids (guchar* serialized, + gint size) +{ GeeList* result = NULL; gsize count = 0UL; - gint _tmp0_; - gboolean _tmp1_ = FALSE; - gsize _tmp2_; + gboolean _tmp0_ = FALSE; + gsize _tmp1_; gint64* ids = NULL; - gsize _tmp4_; - gint64* _tmp5_; + gsize _tmp2_; + gint64* _tmp3_; gint ids_length1; gint _ids_size_; + gint64* _tmp4_; + gint _tmp4__length1; + GeeArrayList* list = NULL; + GeeArrayList* _tmp5_; gint64* _tmp6_; gint _tmp6__length1; - guchar* _tmp7_; - gint _tmp8_; - GeeArrayList* list = NULL; - GeeArrayList* _tmp9_; - gint64* _tmp10_; - gint _tmp10__length1; #line 174 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = size; -#line 174 "/home/jens/Source/shotwell/src/util/misc.vala" - count = (gsize) (_tmp0_ / sizeof (gint64)); + count = (gsize) (size / sizeof (gint64)); #line 175 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = count; + _tmp1_ = count; #line 175 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp2_ <= ((gsize) 0)) { + if (_tmp1_ <= ((gsize) 0)) { #line 175 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = TRUE; -#line 1530 "misc.c" + _tmp0_ = TRUE; +#line 1432 "misc.c" } else { - guchar* _tmp3_; #line 175 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = serialized; -#line 175 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = _tmp3_ == NULL; -#line 1537 "misc.c" + _tmp0_ = serialized == NULL; +#line 1436 "misc.c" } #line 175 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp1_) { + if (_tmp0_) { #line 176 "/home/jens/Source/shotwell/src/util/misc.vala" result = NULL; #line 176 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1545 "misc.c" +#line 1444 "misc.c" } #line 178 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = count; + _tmp2_ = count; #line 178 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp5_ = g_new0 (gint64, _tmp4_); + _tmp3_ = g_new0 (gint64, _tmp2_); #line 178 "/home/jens/Source/shotwell/src/util/misc.vala" - ids = _tmp5_; + ids = _tmp3_; #line 178 "/home/jens/Source/shotwell/src/util/misc.vala" - ids_length1 = _tmp4_; + ids_length1 = _tmp2_; #line 178 "/home/jens/Source/shotwell/src/util/misc.vala" _ids_size_ = ids_length1; #line 179 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6_ = ids; -#line 179 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6__length1 = ids_length1; + _tmp4_ = ids; #line 179 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp7_ = serialized; + _tmp4__length1 = ids_length1; #line 179 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp8_ = size; -#line 179 "/home/jens/Source/shotwell/src/util/misc.vala" - memcpy (_tmp6_, _tmp7_, (gsize) _tmp8_); + memcpy (_tmp4_, serialized, (gsize) size); #line 181 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp9_ = gee_array_list_new (TYPE_PHOTO_ID, (GBoxedCopyFunc) photo_id_dup, (GDestroyNotify) photo_id_free, NULL, NULL, NULL); + _tmp5_ = gee_array_list_new (TYPE_PHOTO_ID, (GBoxedCopyFunc) photo_id_dup, (GDestroyNotify) photo_id_free, NULL, NULL, NULL); #line 181 "/home/jens/Source/shotwell/src/util/misc.vala" - list = _tmp9_; + list = _tmp5_; #line 182 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10_ = ids; + _tmp6_ = ids; #line 182 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10__length1 = ids_length1; -#line 1575 "misc.c" + _tmp6__length1 = ids_length1; +#line 1470 "misc.c" { gint64* id_collection = NULL; gint id_collection_length1 = 0; gint _id_collection_size_ = 0; gint id_it = 0; #line 182 "/home/jens/Source/shotwell/src/util/misc.vala" - id_collection = _tmp10_; + id_collection = _tmp6_; #line 182 "/home/jens/Source/shotwell/src/util/misc.vala" - id_collection_length1 = _tmp10__length1; + id_collection_length1 = _tmp6__length1; #line 182 "/home/jens/Source/shotwell/src/util/misc.vala" - for (id_it = 0; id_it < _tmp10__length1; id_it = id_it + 1) { -#line 1587 "misc.c" + for (id_it = 0; id_it < _tmp6__length1; id_it = id_it + 1) { +#line 1482 "misc.c" gint64 id = 0LL; #line 182 "/home/jens/Source/shotwell/src/util/misc.vala" id = id_collection[id_it]; -#line 1591 "misc.c" +#line 1486 "misc.c" { - GeeArrayList* _tmp11_; - gint64 _tmp12_; - PhotoID _tmp13_ = {0}; + GeeArrayList* _tmp7_; + gint64 _tmp8_; + PhotoID _tmp9_ = {0}; #line 183 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp11_ = list; + _tmp7_ = list; #line 183 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp12_ = id; + _tmp8_ = id; #line 183 "/home/jens/Source/shotwell/src/util/misc.vala" - photo_id_init (&_tmp13_, _tmp12_); + photo_id_init (&_tmp9_, _tmp8_); #line 183 "/home/jens/Source/shotwell/src/util/misc.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp13_); -#line 1604 "misc.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp9_); +#line 1499 "misc.c" } } } @@ -1610,301 +1505,280 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) { ids = (g_free (ids), NULL); #line 185 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1614 "misc.c" +#line 1509 "misc.c" } -guchar* serialize_media_sources (GeeCollection* media, int* result_length1) { +guchar* +serialize_media_sources (GeeCollection* media, + int* result_length1) +{ guchar* result = NULL; GdkAtom* atoms = NULL; - GeeCollection* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; - GdkAtom* _tmp3_; + GdkAtom* _tmp2_; gint atoms_length1; gint _atoms_size_; gint ctr = 0; gsize bytes = 0UL; - GeeCollection* _tmp17_; - gint _tmp18_; - gint _tmp19_; + gint _tmp13_; + gint _tmp14_; guchar* serialized = NULL; - guchar* _tmp20_; + guchar* _tmp15_; gint serialized_length1; gint _serialized_size_; - GdkAtom* _tmp21_; - gint _tmp21__length1; - guchar* _tmp22_; - gint _tmp22__length1; + GdkAtom* _tmp16_; + gint _tmp16__length1; + guchar* _tmp17_; + gint _tmp17__length1; #line 188 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail (GEE_IS_COLLECTION (media), NULL); #line 189 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = media; + _tmp0_ = gee_collection_get_size (media); #line 189 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp1_ = _tmp0_; #line 189 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = _tmp1_; + _tmp2_ = g_new0 (GdkAtom, _tmp1_); #line 189 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = g_new0 (GdkAtom, _tmp2_); + atoms = _tmp2_; #line 189 "/home/jens/Source/shotwell/src/util/misc.vala" - atoms = _tmp3_; -#line 189 "/home/jens/Source/shotwell/src/util/misc.vala" - atoms_length1 = _tmp2_; + atoms_length1 = _tmp1_; #line 189 "/home/jens/Source/shotwell/src/util/misc.vala" _atoms_size_ = atoms_length1; #line 190 "/home/jens/Source/shotwell/src/util/misc.vala" ctr = 0; -#line 1658 "misc.c" +#line 1552 "misc.c" { GeeIterator* _current_media_it = NULL; - GeeCollection* _tmp4_; - GeeIterator* _tmp5_; -#line 191 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = media; + GeeIterator* _tmp3_; #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_ITERABLE, GeeIterable)); #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" - _current_media_it = _tmp5_; + _current_media_it = _tmp3_; #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" while (TRUE) { -#line 1671 "misc.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 1562 "misc.c" + GeeIterator* _tmp4_; MediaSource* current_media = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - GdkAtom* _tmp10_; - gint _tmp10__length1; - gint _tmp11_; - MediaSource* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; - GdkAtom _tmp15_; - GdkAtom _tmp16_; -#line 191 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6_ = _current_media_it; + GeeIterator* _tmp5_; + gpointer _tmp6_; + GdkAtom* _tmp7_; + gint _tmp7__length1; + gint _tmp8_; + MediaSource* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + GdkAtom _tmp12_; #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp4_ = _current_media_it; #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp4_)) { #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" break; -#line 1693 "misc.c" +#line 1580 "misc.c" } #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp8_ = _current_media_it; + _tmp5_ = _current_media_it; #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" - current_media = (MediaSource*) _tmp9_; -#line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10_ = atoms; + current_media = (MediaSource*) _tmp6_; #line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10__length1 = atoms_length1; + _tmp7_ = atoms; #line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp11_ = ctr; + _tmp7__length1 = atoms_length1; #line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - ctr = _tmp11_ + 1; + _tmp8_ = ctr; #line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp12_ = current_media; + ctr = _tmp8_ + 1; #line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp13_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_SOURCE, DataSource)); + _tmp9_ = current_media; #line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp14_ = _tmp13_; + _tmp10_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_SOURCE, DataSource)); #line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp15_ = gdk_atom_intern (_tmp14_, FALSE); + _tmp11_ = _tmp10_; #line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10_[_tmp11_] = _tmp15_; + _tmp7_[_tmp8_] = gdk_atom_intern (_tmp11_, FALSE); #line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp16_ = _tmp10_[_tmp11_]; + _tmp12_ = _tmp7_[_tmp8_]; #line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - _g_free0 (_tmp14_); + _g_free0 (_tmp11_); #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" _g_object_unref0 (current_media); -#line 1725 "misc.c" +#line 1610 "misc.c" } #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" _g_object_unref0 (_current_media_it); -#line 1729 "misc.c" +#line 1614 "misc.c" } #line 194 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp17_ = media; -#line 194 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp18_ = gee_collection_get_size (_tmp17_); + _tmp13_ = gee_collection_get_size (media); #line 194 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp19_ = _tmp18_; + _tmp14_ = _tmp13_; #line 194 "/home/jens/Source/shotwell/src/util/misc.vala" - bytes = (gsize) (_tmp19_ * sizeof (GdkAtom)); + bytes = (gsize) (_tmp14_ * sizeof (GdkAtom)); #line 195 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp20_ = g_new0 (guchar, bytes); + _tmp15_ = g_new0 (guchar, bytes); #line 195 "/home/jens/Source/shotwell/src/util/misc.vala" - serialized = _tmp20_; + serialized = _tmp15_; #line 195 "/home/jens/Source/shotwell/src/util/misc.vala" serialized_length1 = bytes; #line 195 "/home/jens/Source/shotwell/src/util/misc.vala" _serialized_size_ = serialized_length1; #line 196 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp21_ = atoms; + _tmp16_ = atoms; #line 196 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp21__length1 = atoms_length1; + _tmp16__length1 = atoms_length1; #line 196 "/home/jens/Source/shotwell/src/util/misc.vala" - memcpy (serialized, _tmp21_, bytes); + memcpy (serialized, _tmp16_, bytes); #line 198 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp22_ = serialized; + _tmp17_ = serialized; #line 198 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp22__length1 = serialized_length1; + _tmp17__length1 = serialized_length1; #line 198 "/home/jens/Source/shotwell/src/util/misc.vala" if (result_length1) { #line 198 "/home/jens/Source/shotwell/src/util/misc.vala" - *result_length1 = _tmp22__length1; -#line 1761 "misc.c" + *result_length1 = _tmp17__length1; +#line 1644 "misc.c" } #line 198 "/home/jens/Source/shotwell/src/util/misc.vala" - result = _tmp22_; + result = _tmp17_; #line 198 "/home/jens/Source/shotwell/src/util/misc.vala" atoms = (g_free (atoms), NULL); #line 198 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1769 "misc.c" +#line 1652 "misc.c" } -GeeList* unserialize_media_sources (guchar* serialized, gint size) { +GeeList* +unserialize_media_sources (guchar* serialized, + gint size) +{ GeeList* result = NULL; gsize count = 0UL; - gint _tmp0_; - gboolean _tmp1_ = FALSE; - gsize _tmp2_; + gboolean _tmp0_ = FALSE; + gsize _tmp1_; GdkAtom* atoms = NULL; - gsize _tmp4_; - GdkAtom* _tmp5_; + gsize _tmp2_; + GdkAtom* _tmp3_; gint atoms_length1; gint _atoms_size_; + GdkAtom* _tmp4_; + gint _tmp4__length1; + GeeArrayList* list = NULL; + GeeArrayList* _tmp5_; GdkAtom* _tmp6_; gint _tmp6__length1; - guchar* _tmp7_; - gint _tmp8_; - GeeArrayList* list = NULL; - GeeArrayList* _tmp9_; - GdkAtom* _tmp10_; - gint _tmp10__length1; #line 202 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = size; -#line 202 "/home/jens/Source/shotwell/src/util/misc.vala" - count = (gsize) (_tmp0_ / sizeof (GdkAtom)); + count = (gsize) (size / sizeof (GdkAtom)); #line 203 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = count; + _tmp1_ = count; #line 203 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp2_ <= ((gsize) 0)) { + if (_tmp1_ <= ((gsize) 0)) { #line 203 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = TRUE; -#line 1802 "misc.c" + _tmp0_ = TRUE; +#line 1683 "misc.c" } else { - guchar* _tmp3_; -#line 203 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = serialized; #line 203 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = _tmp3_ == NULL; -#line 1809 "misc.c" + _tmp0_ = serialized == NULL; +#line 1687 "misc.c" } #line 203 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp1_) { + if (_tmp0_) { #line 204 "/home/jens/Source/shotwell/src/util/misc.vala" result = NULL; #line 204 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1817 "misc.c" +#line 1695 "misc.c" } #line 206 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = count; + _tmp2_ = count; #line 206 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp5_ = g_new0 (GdkAtom, _tmp4_); + _tmp3_ = g_new0 (GdkAtom, _tmp2_); #line 206 "/home/jens/Source/shotwell/src/util/misc.vala" - atoms = _tmp5_; + atoms = _tmp3_; #line 206 "/home/jens/Source/shotwell/src/util/misc.vala" - atoms_length1 = _tmp4_; + atoms_length1 = _tmp2_; #line 206 "/home/jens/Source/shotwell/src/util/misc.vala" _atoms_size_ = atoms_length1; #line 207 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6_ = atoms; -#line 207 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6__length1 = atoms_length1; -#line 207 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp7_ = serialized; + _tmp4_ = atoms; #line 207 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp8_ = size; + _tmp4__length1 = atoms_length1; #line 207 "/home/jens/Source/shotwell/src/util/misc.vala" - memcpy (_tmp6_, _tmp7_, (gsize) _tmp8_); + memcpy (_tmp4_, serialized, (gsize) size); #line 209 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp9_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp5_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 209 "/home/jens/Source/shotwell/src/util/misc.vala" - list = _tmp9_; + list = _tmp5_; #line 210 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10_ = atoms; + _tmp6_ = atoms; #line 210 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10__length1 = atoms_length1; -#line 1847 "misc.c" + _tmp6__length1 = atoms_length1; +#line 1721 "misc.c" { GdkAtom* current_atom_collection = NULL; gint current_atom_collection_length1 = 0; gint _current_atom_collection_size_ = 0; gint current_atom_it = 0; #line 210 "/home/jens/Source/shotwell/src/util/misc.vala" - current_atom_collection = _tmp10_; + current_atom_collection = _tmp6_; #line 210 "/home/jens/Source/shotwell/src/util/misc.vala" - current_atom_collection_length1 = _tmp10__length1; + current_atom_collection_length1 = _tmp6__length1; #line 210 "/home/jens/Source/shotwell/src/util/misc.vala" - for (current_atom_it = 0; current_atom_it < _tmp10__length1; current_atom_it = current_atom_it + 1) { -#line 1859 "misc.c" + for (current_atom_it = 0; current_atom_it < _tmp6__length1; current_atom_it = current_atom_it + 1) { +#line 1733 "misc.c" GdkAtom current_atom = 0U; #line 210 "/home/jens/Source/shotwell/src/util/misc.vala" current_atom = current_atom_collection[current_atom_it]; -#line 1863 "misc.c" +#line 1737 "misc.c" { MediaSource* media = NULL; - MediaCollectionRegistry* _tmp11_; - MediaCollectionRegistry* _tmp12_; - GdkAtom _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; + MediaCollectionRegistry* _tmp7_; + MediaCollectionRegistry* _tmp8_; + GdkAtom _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + MediaSource* _tmp12_; + MediaSource* _tmp13_; + MediaSource* _tmp14_; + GeeArrayList* _tmp15_; MediaSource* _tmp16_; - MediaSource* _tmp17_; - MediaSource* _tmp18_; - GeeArrayList* _tmp19_; - MediaSource* _tmp20_; #line 211 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp11_ = media_collection_registry_get_instance (); + _tmp7_ = media_collection_registry_get_instance (); #line 211 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 211 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp13_ = current_atom; + _tmp9_ = current_atom; #line 211 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp14_ = gdk_atom_name (_tmp13_); + _tmp10_ = gdk_atom_name (_tmp9_); #line 211 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp15_ = _tmp14_; + _tmp11_ = _tmp10_; #line 211 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp16_ = media_collection_registry_fetch_media (_tmp12_, _tmp15_); + _tmp12_ = media_collection_registry_fetch_media (_tmp8_, _tmp11_); #line 211 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp17_ = _tmp16_; + _tmp13_ = _tmp12_; #line 211 "/home/jens/Source/shotwell/src/util/misc.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp11_); #line 211 "/home/jens/Source/shotwell/src/util/misc.vala" - _media_collection_registry_unref0 (_tmp12_); + _media_collection_registry_unref0 (_tmp8_); #line 211 "/home/jens/Source/shotwell/src/util/misc.vala" - media = _tmp17_; + media = _tmp13_; #line 212 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp18_ = media; + _tmp14_ = media; #line 212 "/home/jens/Source/shotwell/src/util/misc.vala" - _vala_assert (_tmp18_ != NULL, "media != null"); + _vala_assert (_tmp14_ != NULL, "media != null"); #line 213 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp19_ = list; + _tmp15_ = list; #line 213 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp20_ = media; + _tmp16_ = media; #line 213 "/home/jens/Source/shotwell/src/util/misc.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_); #line 210 "/home/jens/Source/shotwell/src/util/misc.vala" _g_object_unref0 (media); -#line 1908 "misc.c" +#line 1782 "misc.c" } } } @@ -1914,11 +1788,14 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) { atoms = (g_free (atoms), NULL); #line 216 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1918 "misc.c" +#line 1792 "misc.c" } -static gchar* g_time_format (struct tm *self, const gchar* format) { +static gchar* +g_time_format (struct tm *self, + const gchar* format) +{ gchar* result = NULL; gchar* buffer = NULL; gchar* _tmp0_; @@ -1926,45 +1803,45 @@ static gchar* g_time_format (struct tm *self, const gchar* format) { gint _buffer_size_; gchar* _tmp1_; gint _tmp1__length1; - const gchar* _tmp2_; + gchar* _tmp2_; + gint _tmp2__length1; gchar* _tmp3_; - gint _tmp3__length1; - gchar* _tmp4_; -#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2874 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (format != NULL, NULL); -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_new0 (gchar, 64); -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer = _tmp0_; -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer_length1 = 64; -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _buffer_size_ = buffer_length1; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = buffer; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1__length1 = buffer_length1; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = format; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self)); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = buffer; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3__length1 = buffer_length1; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = g_strdup ((const gchar*) _tmp3_); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + strftime (_tmp1_, _tmp1__length1, format, &(*self)); +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = buffer; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2__length1 = buffer_length1; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_strdup ((const gchar*) _tmp2_); +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp3_; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer = (g_free (buffer), NULL); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1964 "misc.c" +#line 1838 "misc.c" } -gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) { +gchar* +format_local_datespan (struct tm* from_date, + struct tm* to_date) +{ gchar* result = NULL; gchar* from_format = NULL; gchar* to_format = NULL; @@ -1996,7 +1873,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) { _tmp3_ = _tmp2_.tm_year; #line 224 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp1_ == _tmp3_) { -#line 2000 "misc.c" +#line 1877 "misc.c" gboolean _tmp4_ = FALSE; struct tm _tmp5_; gint _tmp6_; @@ -2012,7 +1889,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) { _tmp8_ = _tmp7_.tm_mon; #line 226 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp6_ == _tmp8_) { -#line 2016 "misc.c" +#line 1893 "misc.c" struct tm _tmp9_; gint _tmp10_; struct tm _tmp11_; @@ -2027,15 +1904,15 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) { _tmp12_ = _tmp11_.tm_mday; #line 226 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp4_ = _tmp10_ == (_tmp12_ - 1); -#line 2031 "misc.c" +#line 1908 "misc.c" } else { #line 226 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp4_ = FALSE; -#line 2035 "misc.c" +#line 1912 "misc.c" } #line 226 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp4_) { -#line 2039 "misc.c" +#line 1916 "misc.c" gchar* _tmp13_; gchar* _tmp14_; #line 228 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -2050,7 +1927,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) { _g_free0 (to_format); #line 229 "/home/jens/Source/shotwell/src/util/misc.vala" to_format = _tmp14_; -#line 2054 "misc.c" +#line 1931 "misc.c" } else { gchar* _tmp15_; gchar* _tmp16_; @@ -2066,7 +1943,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) { _g_free0 (to_format); #line 234 "/home/jens/Source/shotwell/src/util/misc.vala" to_format = _tmp16_; -#line 2070 "misc.c" +#line 1947 "misc.c" } } else { gchar* _tmp17_; @@ -2083,7 +1960,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) { _g_free0 (to_format); #line 240 "/home/jens/Source/shotwell/src/util/misc.vala" to_format = _tmp18_; -#line 2087 "misc.c" +#line 1964 "misc.c" } #line 243 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp19_ = from_format; @@ -2119,11 +1996,13 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) { _g_free0 (from_format); #line 243 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 2123 "misc.c" +#line 2000 "misc.c" } -gchar* format_local_date (struct tm* date) { +gchar* +format_local_date (struct tm* date) +{ gchar* result = NULL; gchar* _tmp0_; gchar* _tmp1_; @@ -2153,50 +2032,52 @@ gchar* format_local_date (struct tm* date) { result = _tmp5_; #line 248 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 2157 "misc.c" +#line 2036 "misc.c" } -OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target) { +OneShotScheduler* +one_shot_scheduler_construct (GType object_type, + const gchar* name, + OneShotCallback callback, + void* callback_target) +{ OneShotScheduler* self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - OneShotCallback _tmp2_; - void* _tmp2__target; + gchar* _tmp0_; #line 258 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail (name != NULL, NULL); #line 258 "/home/jens/Source/shotwell/src/util/misc.vala" self = (OneShotScheduler*) g_type_create_instance (object_type); #line 259 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = name; -#line 259 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (name); #line 259 "/home/jens/Source/shotwell/src/util/misc.vala" _g_free0 (self->priv->name); #line 259 "/home/jens/Source/shotwell/src/util/misc.vala" - self->priv->name = _tmp1_; + self->priv->name = _tmp0_; #line 260 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = callback; + self->priv->callback = callback; #line 260 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2__target = callback_target; -#line 260 "/home/jens/Source/shotwell/src/util/misc.vala" - self->priv->callback = _tmp2_; -#line 260 "/home/jens/Source/shotwell/src/util/misc.vala" - self->priv->callback_target = _tmp2__target; + self->priv->callback_target = callback_target; #line 258 "/home/jens/Source/shotwell/src/util/misc.vala" return self; -#line 2189 "misc.c" +#line 2064 "misc.c" } -OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target) { +OneShotScheduler* +one_shot_scheduler_new (const gchar* name, + OneShotCallback callback, + void* callback_target) +{ #line 258 "/home/jens/Source/shotwell/src/util/misc.vala" return one_shot_scheduler_construct (TYPE_ONE_SHOT_SCHEDULER, name, callback, callback_target); -#line 2196 "misc.c" +#line 2075 "misc.c" } -gboolean one_shot_scheduler_is_scheduled (OneShotScheduler* self) { +gboolean +one_shot_scheduler_is_scheduled (OneShotScheduler* self) +{ gboolean result = FALSE; guint _tmp0_; #line 271 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -2207,29 +2088,36 @@ gboolean one_shot_scheduler_is_scheduled (OneShotScheduler* self) { result = _tmp0_ != ((guint) 0); #line 272 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 2211 "misc.c" +#line 2092 "misc.c" } -void one_shot_scheduler_at_idle (OneShotScheduler* self) { +void +one_shot_scheduler_at_idle (OneShotScheduler* self) +{ #line 275 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self)); #line 276 "/home/jens/Source/shotwell/src/util/misc.vala" one_shot_scheduler_at_priority_idle (self, G_PRIORITY_DEFAULT_IDLE); -#line 2220 "misc.c" +#line 2103 "misc.c" } -static gboolean _one_shot_scheduler_callback_wrapper_gsource_func (gpointer self) { +static gboolean +_one_shot_scheduler_callback_wrapper_gsource_func (gpointer self) +{ gboolean result; result = one_shot_scheduler_callback_wrapper ((OneShotScheduler*) self); #line 281 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 2229 "misc.c" +#line 2114 "misc.c" } -void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority) { +void +one_shot_scheduler_at_priority_idle (OneShotScheduler* self, + gint priority) +{ guint _tmp0_; #line 279 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self)); @@ -2237,91 +2125,76 @@ void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority) _tmp0_ = self->priv->scheduled; #line 280 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp0_ == ((guint) 0)) { -#line 2241 "misc.c" - gint _tmp1_; - guint _tmp2_; #line 281 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = priority; -#line 281 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = g_idle_add_full (_tmp1_, _one_shot_scheduler_callback_wrapper_gsource_func, one_shot_scheduler_ref (self), one_shot_scheduler_unref); -#line 281 "/home/jens/Source/shotwell/src/util/misc.vala" - self->priv->scheduled = _tmp2_; -#line 2250 "misc.c" + self->priv->scheduled = g_idle_add_full (priority, _one_shot_scheduler_callback_wrapper_gsource_func, one_shot_scheduler_ref (self), one_shot_scheduler_unref); +#line 2131 "misc.c" } } -void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule) { - guint _tmp0_; - gboolean _tmp1_; +void +one_shot_scheduler_after_timeout (OneShotScheduler* self, + guint msec, + gboolean reschedule) +{ #line 284 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self)); #line 285 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = msec; -#line 285 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = reschedule; -#line 285 "/home/jens/Source/shotwell/src/util/misc.vala" - one_shot_scheduler_priority_after_timeout (self, G_PRIORITY_DEFAULT, _tmp0_, _tmp1_); -#line 2266 "misc.c" + one_shot_scheduler_priority_after_timeout (self, G_PRIORITY_DEFAULT, msec, reschedule); +#line 2145 "misc.c" } -void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint priority, guint msec, gboolean reschedule) { +void +one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, + gint priority, + guint msec, + gboolean reschedule) +{ gboolean _tmp0_ = FALSE; guint _tmp1_; - guint _tmp3_; - gint _tmp5_; - guint _tmp6_; - guint _tmp7_; + guint _tmp2_; #line 288 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self)); #line 289 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp1_ = self->priv->scheduled; #line 289 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp1_ != ((guint) 0)) { -#line 2283 "misc.c" - gboolean _tmp2_; -#line 289 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = reschedule; #line 289 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = !_tmp2_; -#line 2289 "misc.c" + _tmp0_ = !reschedule; +#line 2166 "misc.c" } else { #line 289 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp0_ = FALSE; -#line 2293 "misc.c" +#line 2170 "misc.c" } #line 289 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp0_) { #line 290 "/home/jens/Source/shotwell/src/util/misc.vala" return; -#line 2299 "misc.c" +#line 2176 "misc.c" } #line 292 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = self->priv->scheduled; + _tmp2_ = self->priv->scheduled; #line 292 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp3_ != ((guint) 0)) { -#line 2305 "misc.c" - guint _tmp4_; + if (_tmp2_ != ((guint) 0)) { +#line 2182 "misc.c" + guint _tmp3_; #line 293 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = self->priv->scheduled; + _tmp3_ = self->priv->scheduled; #line 293 "/home/jens/Source/shotwell/src/util/misc.vala" - g_source_remove (_tmp4_); -#line 2311 "misc.c" + g_source_remove (_tmp3_); +#line 2188 "misc.c" } #line 295 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp5_ = priority; -#line 295 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6_ = msec; -#line 295 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp7_ = g_timeout_add_full (_tmp5_, _tmp6_, _one_shot_scheduler_callback_wrapper_gsource_func, one_shot_scheduler_ref (self), one_shot_scheduler_unref); -#line 295 "/home/jens/Source/shotwell/src/util/misc.vala" - self->priv->scheduled = _tmp7_; -#line 2321 "misc.c" + self->priv->scheduled = g_timeout_add_full (priority, msec, _one_shot_scheduler_callback_wrapper_gsource_func, one_shot_scheduler_ref (self), one_shot_scheduler_unref); +#line 2192 "misc.c" } -void one_shot_scheduler_cancel (OneShotScheduler* self) { +void +one_shot_scheduler_cancel (OneShotScheduler* self) +{ guint _tmp0_; guint _tmp1_; #line 298 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -2332,7 +2205,7 @@ void one_shot_scheduler_cancel (OneShotScheduler* self) { if (_tmp0_ == ((guint) 0)) { #line 300 "/home/jens/Source/shotwell/src/util/misc.vala" return; -#line 2336 "misc.c" +#line 2209 "misc.c" } #line 302 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp1_ = self->priv->scheduled; @@ -2340,11 +2213,13 @@ void one_shot_scheduler_cancel (OneShotScheduler* self) { g_source_remove (_tmp1_); #line 303 "/home/jens/Source/shotwell/src/util/misc.vala" self->priv->scheduled = (guint) 0; -#line 2344 "misc.c" +#line 2217 "misc.c" } -static gboolean one_shot_scheduler_callback_wrapper (OneShotScheduler* self) { +static gboolean +one_shot_scheduler_callback_wrapper (OneShotScheduler* self) +{ gboolean result = FALSE; OneShotCallback _tmp0_; void* _tmp0__target; @@ -2362,108 +2237,133 @@ static gboolean one_shot_scheduler_callback_wrapper (OneShotScheduler* self) { result = FALSE; #line 310 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 2366 "misc.c" +#line 2241 "misc.c" } -static void value_one_shot_scheduler_init (GValue* value) { +static void +value_one_shot_scheduler_init (GValue* value) +{ #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = NULL; -#line 2373 "misc.c" +#line 2250 "misc.c" } -static void value_one_shot_scheduler_free_value (GValue* value) { +static void +value_one_shot_scheduler_free_value (GValue* value) +{ #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" if (value->data[0].v_pointer) { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" one_shot_scheduler_unref (value->data[0].v_pointer); -#line 2382 "misc.c" +#line 2261 "misc.c" } } -static void value_one_shot_scheduler_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_one_shot_scheduler_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" if (src_value->data[0].v_pointer) { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" dest_value->data[0].v_pointer = one_shot_scheduler_ref (src_value->data[0].v_pointer); -#line 2392 "misc.c" +#line 2274 "misc.c" } else { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" dest_value->data[0].v_pointer = NULL; -#line 2396 "misc.c" +#line 2278 "misc.c" } } -static gpointer value_one_shot_scheduler_peek_pointer (const GValue* value) { +static gpointer +value_one_shot_scheduler_peek_pointer (const GValue* value) +{ #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" return value->data[0].v_pointer; -#line 2404 "misc.c" +#line 2288 "misc.c" } -static gchar* value_one_shot_scheduler_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_one_shot_scheduler_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" if (collect_values[0].v_pointer) { -#line 2411 "misc.c" +#line 2300 "misc.c" OneShotScheduler * object; object = collect_values[0].v_pointer; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" if (object->parent_instance.g_class == NULL) { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2418 "misc.c" +#line 2307 "misc.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2422 "misc.c" +#line 2311 "misc.c" } #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = one_shot_scheduler_ref (object); -#line 2426 "misc.c" +#line 2315 "misc.c" } else { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = NULL; -#line 2430 "misc.c" +#line 2319 "misc.c" } #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" return NULL; -#line 2434 "misc.c" +#line 2323 "misc.c" } -static gchar* value_one_shot_scheduler_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_one_shot_scheduler_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ OneShotScheduler ** object_p; object_p = collect_values[0].v_pointer; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" if (!object_p) { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2445 "misc.c" +#line 2339 "misc.c" } #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" if (!value->data[0].v_pointer) { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" *object_p = NULL; -#line 2451 "misc.c" +#line 2345 "misc.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" *object_p = value->data[0].v_pointer; -#line 2455 "misc.c" +#line 2349 "misc.c" } else { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" *object_p = one_shot_scheduler_ref (value->data[0].v_pointer); -#line 2459 "misc.c" +#line 2353 "misc.c" } #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" return NULL; -#line 2463 "misc.c" +#line 2357 "misc.c" } -GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_one_shot_scheduler (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecOneShotScheduler* spec; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_ONE_SHOT_SCHEDULER), NULL); @@ -2473,20 +2373,25 @@ GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" return G_PARAM_SPEC (spec); -#line 2477 "misc.c" +#line 2377 "misc.c" } -gpointer value_get_one_shot_scheduler (const GValue* value) { +gpointer +value_get_one_shot_scheduler (const GValue* value) +{ #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ONE_SHOT_SCHEDULER), NULL); #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" return value->data[0].v_pointer; -#line 2486 "misc.c" +#line 2388 "misc.c" } -void value_set_one_shot_scheduler (GValue* value, gpointer v_object) { +void +value_set_one_shot_scheduler (GValue* value, + gpointer v_object) +{ OneShotScheduler * old; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ONE_SHOT_SCHEDULER)); @@ -2502,22 +2407,25 @@ void value_set_one_shot_scheduler (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" one_shot_scheduler_ref (value->data[0].v_pointer); -#line 2506 "misc.c" +#line 2411 "misc.c" } else { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = NULL; -#line 2510 "misc.c" +#line 2415 "misc.c" } #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" if (old) { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" one_shot_scheduler_unref (old); -#line 2516 "misc.c" +#line 2421 "misc.c" } } -void value_take_one_shot_scheduler (GValue* value, gpointer v_object) { +void +value_take_one_shot_scheduler (GValue* value, + gpointer v_object) +{ OneShotScheduler * old; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ONE_SHOT_SCHEDULER)); @@ -2531,44 +2439,50 @@ void value_take_one_shot_scheduler (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = v_object; -#line 2535 "misc.c" +#line 2443 "misc.c" } else { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = NULL; -#line 2539 "misc.c" +#line 2447 "misc.c" } #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" if (old) { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" one_shot_scheduler_unref (old); -#line 2545 "misc.c" +#line 2453 "misc.c" } } -static void one_shot_scheduler_class_init (OneShotSchedulerClass * klass) { +static void +one_shot_scheduler_class_init (OneShotSchedulerClass * klass) +{ #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" one_shot_scheduler_parent_class = g_type_class_peek_parent (klass); #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" ((OneShotSchedulerClass *) klass)->finalize = one_shot_scheduler_finalize; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" g_type_class_add_private (klass, sizeof (OneShotSchedulerPrivate)); -#line 2557 "misc.c" +#line 2467 "misc.c" } -static void one_shot_scheduler_instance_init (OneShotScheduler * self) { +static void +one_shot_scheduler_instance_init (OneShotScheduler * self) +{ #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" self->priv = ONE_SHOT_SCHEDULER_GET_PRIVATE (self); #line 256 "/home/jens/Source/shotwell/src/util/misc.vala" self->priv->scheduled = (guint) 0; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" self->ref_count = 1; -#line 2568 "misc.c" +#line 2480 "misc.c" } -static void one_shot_scheduler_finalize (OneShotScheduler * obj) { +static void +one_shot_scheduler_finalize (OneShotScheduler * obj) +{ OneShotScheduler * self; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ONE_SHOT_SCHEDULER, OneShotScheduler); @@ -2578,11 +2492,13 @@ static void one_shot_scheduler_finalize (OneShotScheduler * obj) { one_shot_scheduler_cancel (self); #line 254 "/home/jens/Source/shotwell/src/util/misc.vala" _g_free0 (self->priv->name); -#line 2582 "misc.c" +#line 2496 "misc.c" } -GType one_shot_scheduler_get_type (void) { +GType +one_shot_scheduler_get_type (void) +{ static volatile gsize one_shot_scheduler_type_id__volatile = 0; if (g_once_init_enter (&one_shot_scheduler_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_one_shot_scheduler_init, value_one_shot_scheduler_free_value, value_one_shot_scheduler_copy_value, value_one_shot_scheduler_peek_pointer, "p", value_one_shot_scheduler_collect_value, "p", value_one_shot_scheduler_lcopy_value }; @@ -2596,18 +2512,22 @@ GType one_shot_scheduler_get_type (void) { } -gpointer one_shot_scheduler_ref (gpointer instance) { +gpointer +one_shot_scheduler_ref (gpointer instance) +{ OneShotScheduler * self; self = instance; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" g_atomic_int_inc (&self->ref_count); #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" return instance; -#line 2607 "misc.c" +#line 2525 "misc.c" } -void one_shot_scheduler_unref (gpointer instance) { +void +one_shot_scheduler_unref (gpointer instance) +{ OneShotScheduler * self; self = instance; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -2616,41 +2536,45 @@ void one_shot_scheduler_unref (gpointer instance) { ONE_SHOT_SCHEDULER_GET_CLASS (self)->finalize (self); #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2620 "misc.c" +#line 2540 "misc.c" } } -OpTimer* op_timer_construct (GType object_type, const gchar* name) { +OpTimer* +op_timer_construct (GType object_type, + const gchar* name) +{ OpTimer* self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; #line 322 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail (name != NULL, NULL); #line 322 "/home/jens/Source/shotwell/src/util/misc.vala" self = (OpTimer*) g_type_create_instance (object_type); #line 323 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = name; -#line 323 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (name); #line 323 "/home/jens/Source/shotwell/src/util/misc.vala" _g_free0 (self->priv->name); #line 323 "/home/jens/Source/shotwell/src/util/misc.vala" - self->priv->name = _tmp1_; + self->priv->name = _tmp0_; #line 322 "/home/jens/Source/shotwell/src/util/misc.vala" return self; -#line 2643 "misc.c" +#line 2563 "misc.c" } -OpTimer* op_timer_new (const gchar* name) { +OpTimer* +op_timer_new (const gchar* name) +{ #line 322 "/home/jens/Source/shotwell/src/util/misc.vala" return op_timer_construct (TYPE_OP_TIMER, name); -#line 2650 "misc.c" +#line 2572 "misc.c" } -void op_timer_start (OpTimer* self) { +void +op_timer_start (OpTimer* self) +{ GTimer* _tmp0_; #line 326 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_if_fail (IS_OP_TIMER (self)); @@ -2658,11 +2582,13 @@ void op_timer_start (OpTimer* self) { _tmp0_ = self->priv->timer; #line 327 "/home/jens/Source/shotwell/src/util/misc.vala" g_timer_start (_tmp0_); -#line 2662 "misc.c" +#line 2586 "misc.c" } -void op_timer_stop (OpTimer* self) { +void +op_timer_stop (OpTimer* self) +{ gdouble time = 0.0; GTimer* _tmp0_; gdouble _tmp1_; @@ -2693,13 +2619,13 @@ void op_timer_stop (OpTimer* self) { _tmp5_ = self->priv->shortest; #line 335 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp4_ < _tmp5_) { -#line 2697 "misc.c" +#line 2623 "misc.c" gdouble _tmp6_; #line 336 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp6_ = time; #line 336 "/home/jens/Source/shotwell/src/util/misc.vala" self->priv->shortest = _tmp6_; -#line 2703 "misc.c" +#line 2629 "misc.c" } #line 338 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp7_ = time; @@ -2707,23 +2633,25 @@ void op_timer_stop (OpTimer* self) { _tmp8_ = self->priv->longest; #line 338 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp7_ > _tmp8_) { -#line 2711 "misc.c" +#line 2637 "misc.c" gdouble _tmp9_; #line 339 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp9_ = time; #line 339 "/home/jens/Source/shotwell/src/util/misc.vala" self->priv->longest = _tmp9_; -#line 2717 "misc.c" +#line 2643 "misc.c" } #line 341 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp10_ = self->priv->count; #line 341 "/home/jens/Source/shotwell/src/util/misc.vala" self->priv->count = _tmp10_ + 1; -#line 2723 "misc.c" +#line 2649 "misc.c" } -gchar* op_timer_to_string (OpTimer* self) { +gchar* +op_timer_to_string (OpTimer* self) +{ gchar* result = NULL; glong _tmp0_; #line 344 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -2732,7 +2660,7 @@ gchar* op_timer_to_string (OpTimer* self) { _tmp0_ = self->priv->count; #line 345 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp0_ > ((glong) 0)) { -#line 2736 "misc.c" +#line 2664 "misc.c" const gchar* _tmp1_; glong _tmp2_; gdouble _tmp3_; @@ -2761,7 +2689,7 @@ gchar* op_timer_to_string (OpTimer* self) { result = _tmp8_; #line 346 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 2765 "misc.c" +#line 2693 "misc.c" } else { const gchar* _tmp9_; gchar* _tmp10_; @@ -2773,109 +2701,134 @@ gchar* op_timer_to_string (OpTimer* self) { result = _tmp10_; #line 349 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 2777 "misc.c" +#line 2705 "misc.c" } } -static void value_op_timer_init (GValue* value) { +static void +value_op_timer_init (GValue* value) +{ #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = NULL; -#line 2785 "misc.c" +#line 2715 "misc.c" } -static void value_op_timer_free_value (GValue* value) { +static void +value_op_timer_free_value (GValue* value) +{ #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" if (value->data[0].v_pointer) { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" op_timer_unref (value->data[0].v_pointer); -#line 2794 "misc.c" +#line 2726 "misc.c" } } -static void value_op_timer_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_op_timer_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" if (src_value->data[0].v_pointer) { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" dest_value->data[0].v_pointer = op_timer_ref (src_value->data[0].v_pointer); -#line 2804 "misc.c" +#line 2739 "misc.c" } else { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" dest_value->data[0].v_pointer = NULL; -#line 2808 "misc.c" +#line 2743 "misc.c" } } -static gpointer value_op_timer_peek_pointer (const GValue* value) { +static gpointer +value_op_timer_peek_pointer (const GValue* value) +{ #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" return value->data[0].v_pointer; -#line 2816 "misc.c" +#line 2753 "misc.c" } -static gchar* value_op_timer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_op_timer_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" if (collect_values[0].v_pointer) { -#line 2823 "misc.c" +#line 2765 "misc.c" OpTimer * object; object = collect_values[0].v_pointer; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" if (object->parent_instance.g_class == NULL) { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2830 "misc.c" +#line 2772 "misc.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2834 "misc.c" +#line 2776 "misc.c" } #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = op_timer_ref (object); -#line 2838 "misc.c" +#line 2780 "misc.c" } else { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = NULL; -#line 2842 "misc.c" +#line 2784 "misc.c" } #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" return NULL; -#line 2846 "misc.c" +#line 2788 "misc.c" } -static gchar* value_op_timer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_op_timer_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ OpTimer ** object_p; object_p = collect_values[0].v_pointer; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" if (!object_p) { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2857 "misc.c" +#line 2804 "misc.c" } #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" if (!value->data[0].v_pointer) { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" *object_p = NULL; -#line 2863 "misc.c" +#line 2810 "misc.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" *object_p = value->data[0].v_pointer; -#line 2867 "misc.c" +#line 2814 "misc.c" } else { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" *object_p = op_timer_ref (value->data[0].v_pointer); -#line 2871 "misc.c" +#line 2818 "misc.c" } #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" return NULL; -#line 2875 "misc.c" +#line 2822 "misc.c" } -GParamSpec* param_spec_op_timer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_op_timer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecOpTimer* spec; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_OP_TIMER), NULL); @@ -2885,20 +2838,25 @@ GParamSpec* param_spec_op_timer (const gchar* name, const gchar* nick, const gch G_PARAM_SPEC (spec)->value_type = object_type; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" return G_PARAM_SPEC (spec); -#line 2889 "misc.c" +#line 2842 "misc.c" } -gpointer value_get_op_timer (const GValue* value) { +gpointer +value_get_op_timer (const GValue* value) +{ #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_OP_TIMER), NULL); #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" return value->data[0].v_pointer; -#line 2898 "misc.c" +#line 2853 "misc.c" } -void value_set_op_timer (GValue* value, gpointer v_object) { +void +value_set_op_timer (GValue* value, + gpointer v_object) +{ OpTimer * old; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_OP_TIMER)); @@ -2914,22 +2872,25 @@ void value_set_op_timer (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" op_timer_ref (value->data[0].v_pointer); -#line 2918 "misc.c" +#line 2876 "misc.c" } else { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = NULL; -#line 2922 "misc.c" +#line 2880 "misc.c" } #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" if (old) { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" op_timer_unref (old); -#line 2928 "misc.c" +#line 2886 "misc.c" } } -void value_take_op_timer (GValue* value, gpointer v_object) { +void +value_take_op_timer (GValue* value, + gpointer v_object) +{ OpTimer * old; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_OP_TIMER)); @@ -2943,33 +2904,37 @@ void value_take_op_timer (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = v_object; -#line 2947 "misc.c" +#line 2908 "misc.c" } else { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = NULL; -#line 2951 "misc.c" +#line 2912 "misc.c" } #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" if (old) { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" op_timer_unref (old); -#line 2957 "misc.c" +#line 2918 "misc.c" } } -static void op_timer_class_init (OpTimerClass * klass) { +static void +op_timer_class_init (OpTimerClass * klass) +{ #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" op_timer_parent_class = g_type_class_peek_parent (klass); #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" ((OpTimerClass *) klass)->finalize = op_timer_finalize; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" g_type_class_add_private (klass, sizeof (OpTimerPrivate)); -#line 2969 "misc.c" +#line 2932 "misc.c" } -static void op_timer_instance_init (OpTimer * self) { +static void +op_timer_instance_init (OpTimer * self) +{ GTimer* _tmp0_; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" self->priv = OP_TIMER_GET_PRIVATE (self); @@ -2987,11 +2952,13 @@ static void op_timer_instance_init (OpTimer * self) { self->priv->longest = DBL_MIN; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" self->ref_count = 1; -#line 2991 "misc.c" +#line 2956 "misc.c" } -static void op_timer_finalize (OpTimer * obj) { +static void +op_timer_finalize (OpTimer * obj) +{ OpTimer * self; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_OP_TIMER, OpTimer); @@ -3001,11 +2968,13 @@ static void op_timer_finalize (OpTimer * obj) { _g_free0 (self->priv->name); #line 316 "/home/jens/Source/shotwell/src/util/misc.vala" _g_timer_destroy0 (self->priv->timer); -#line 3005 "misc.c" +#line 2972 "misc.c" } -GType op_timer_get_type (void) { +GType +op_timer_get_type (void) +{ static volatile gsize op_timer_type_id__volatile = 0; if (g_once_init_enter (&op_timer_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_op_timer_init, value_op_timer_free_value, value_op_timer_copy_value, value_op_timer_peek_pointer, "p", value_op_timer_collect_value, "p", value_op_timer_lcopy_value }; @@ -3019,18 +2988,22 @@ GType op_timer_get_type (void) { } -gpointer op_timer_ref (gpointer instance) { +gpointer +op_timer_ref (gpointer instance) +{ OpTimer * self; self = instance; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" g_atomic_int_inc (&self->ref_count); #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" return instance; -#line 3030 "misc.c" +#line 3001 "misc.c" } -void op_timer_unref (gpointer instance) { +void +op_timer_unref (gpointer instance) +{ OpTimer * self; self = instance; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -3039,7 +3012,7 @@ void op_timer_unref (gpointer instance) { OP_TIMER_GET_CLASS (self)->finalize (self); #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3043 "misc.c" +#line 3016 "misc.c" } } diff --git a/src/util/string.c b/src/util/string.c index 642e9fa..0b503fb 100644 --- a/src/util/string.c +++ b/src/util/string.c @@ -1,4 +1,4 @@ -/* string.c generated by valac 0.36.6, the Vala compiler +/* string.c generated by valac 0.40.4, the Vala compiler * generated from string.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -30,288 +31,291 @@ typedef enum { -gint64 g_ascii_strtoll (const gchar* str, gchar** endptr, guint num_base); +gint64 g_ascii_strtoll (const gchar* str, + gchar** endptr, + guint num_base); #define DEFAULT_USER_TEXT_INPUT_LENGTH 1024 gboolean is_string_empty (const gchar* s); -gint utf8_cs_compare (void* a, void* b); -gint utf8_ci_compare (void* a, void* b); -gchar* uchar_array_to_string (guchar* data, int data_length1, gint length); -guchar* string_to_uchar_array (const gchar* str, int* result_length1); -static void _vala_array_add1 (guchar* * array, int* length, int* size, guchar value); +gint utf8_cs_compare (void* a, + void* b); +gint utf8_ci_compare (void* a, + void* b); +gchar* uchar_array_to_string (guchar* data, + int data_length1, + gint length); +guchar* string_to_uchar_array (const gchar* str, + int* result_length1); +static void _vala_array_add1 (guchar* * array, + int* length, + int* size, + guchar value); gchar* guarded_markup_escape_text (const gchar* plain); -glong find_last_offset (const gchar* str, gchar c); -gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1); +glong find_last_offset (const gchar* str, + gchar c); +gboolean is_in_ci_array (const gchar* str, + gchar** strings, + int strings_length1); GType prepare_input_text_options_get_type (void) G_GNUC_CONST; gchar* guess_convert (const gchar* text); -gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length); -gint64 parse_int64 (const gchar* str, gint num_base); -gboolean string_contains_char (const gchar* haystack, gunichar needle); -gboolean string_contains_str (const gchar* haystack, const gchar* needle); -gchar* string_sliced_at (const gchar* str, gint index); -gchar* string_sliced_at_first_str (const gchar* haystack, const gchar* needle, gint start_index); -gchar* string_sliced_at_last_str (const gchar* haystack, const gchar* needle, gint start_index); -gchar* string_sliced_at_first_char (const gchar* haystack, gunichar ch, gint start_index); -gchar* string_sliced_at_last_char (const gchar* haystack, gunichar ch, gint start_index); +gchar* prepare_input_text (const gchar* text, + PrepareInputTextOptions options, + gint dest_length); +gint64 parse_int64 (const gchar* str, + gint num_base); +gboolean string_contains_char (const gchar* haystack, + gunichar needle); +gboolean string_contains_str (const gchar* haystack, + const gchar* needle); +gchar* string_sliced_at (const gchar* str, + gint index); +gchar* string_sliced_at_first_str (const gchar* haystack, + const gchar* needle, + gint start_index); +gchar* string_sliced_at_last_str (const gchar* haystack, + const gchar* needle, + gint start_index); +gchar* string_sliced_at_first_char (const gchar* haystack, + gunichar ch, + gint start_index); +gchar* string_sliced_at_last_char (const gchar* haystack, + gunichar ch, + gint start_index); gchar* string_strip_leading_zeroes (const gchar* str); gchar* string_remove_diacritics (const gchar* istring); gchar* string_to_hex_string (const gchar* str); guint string_collated_hash (void* ptr); guint string_precollated_hash (void* ptr); -gint string_collated_compare (void* a, void* b); -gint string_precollated_compare (const gchar* astr, const gchar* akey, const gchar* bstr, const gchar* bkey); -gboolean string_collated_equals (void* a, void* b); -gboolean string_precollated_equals (const gchar* astr, const gchar* akey, const gchar* bstr, const gchar* bkey); - - -static gchar string_get (const gchar* self, glong index) { +gint string_collated_compare (void* a, + void* b); +gint string_precollated_compare (const gchar* astr, + const gchar* akey, + const gchar* bstr, + const gchar* bkey); +gboolean string_collated_equals (void* a, + void* b); +gboolean string_precollated_equals (const gchar* astr, + const gchar* akey, + const gchar* bstr, + const gchar* bkey); + + +static gchar +string_get (const gchar* self, + glong index) +{ gchar result = '\0'; - glong _tmp0_; - gchar _tmp1_; -#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar _tmp0_; +#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = index; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = ((gchar*) self)[index]; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 81 "string.c" +#line 117 "string.c" } -inline gboolean is_string_empty (const gchar* s) { +inline gboolean +is_string_empty (const gchar* s) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_; #line 12 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = s; -#line 12 "/home/jens/Source/shotwell/src/util/string.vala" - if (_tmp1_ == NULL) { + if (s == NULL) { #line 12 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = TRUE; -#line 95 "string.c" +#line 130 "string.c" } else { - const gchar* _tmp2_; - gchar _tmp3_; -#line 12 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = s; #line 12 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = string_get (_tmp2_, (glong) 0); -#line 12 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = _tmp3_ == '\0'; -#line 105 "string.c" + _tmp0_ = string_get (s, (glong) 0) == '\0'; +#line 134 "string.c" } #line 12 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp0_; #line 12 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 111 "string.c" +#line 140 "string.c" } -gint utf8_cs_compare (void* a, void* b) { +gint +utf8_cs_compare (void* a, + void* b) +{ gint result = 0; - void* _tmp0_; - void* _tmp1_; - gint _tmp2_; -#line 17 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = a; #line 17 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = b; -#line 17 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = g_utf8_collate ((const gchar*) _tmp0_, (const gchar*) _tmp1_); -#line 17 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp2_; + result = g_utf8_collate ((const gchar*) a, (const gchar*) b); #line 17 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 130 "string.c" +#line 153 "string.c" } -gint utf8_ci_compare (void* a, void* b) { +gint +utf8_ci_compare (void* a, + void* b) +{ gint result = 0; - void* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; - void* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - gint _tmp6_; - gint _tmp7_; -#line 22 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = a; -#line 22 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = g_utf8_strdown ((const gchar*) _tmp0_, (gssize) -1); -#line 22 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = _tmp1_; + gchar* _tmp3_; + gint _tmp4_; #line 22 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = b; + _tmp0_ = g_utf8_strdown ((const gchar*) a, (gssize) -1); #line 22 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = g_utf8_strdown ((const gchar*) _tmp3_, (gssize) -1); + _tmp1_ = _tmp0_; #line 22 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = _tmp4_; + _tmp2_ = g_utf8_strdown ((const gchar*) b, (gssize) -1); #line 22 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp6_ = g_utf8_collate (_tmp2_, _tmp5_); + _tmp3_ = _tmp2_; #line 22 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp7_ = _tmp6_; + _tmp4_ = g_utf8_collate (_tmp1_, _tmp3_); #line 22 "/home/jens/Source/shotwell/src/util/string.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp3_); #line 22 "/home/jens/Source/shotwell/src/util/string.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 22 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp7_; + result = _tmp4_; #line 22 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 168 "string.c" +#line 185 "string.c" } -gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) { +gchar* +uchar_array_to_string (guchar* data, + int data_length1, + gint length) +{ gchar* result = NULL; - gint _tmp0_; GString* builder = NULL; - GString* _tmp2_; - GString* _tmp14_; - const gchar* _tmp15_; - gchar* _tmp16_; -#line 27 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = length; + GString* _tmp0_; + GString* _tmp9_; + const gchar* _tmp10_; + gchar* _tmp11_; #line 27 "/home/jens/Source/shotwell/src/util/string.vala" - if (_tmp0_ < 0) { -#line 184 "string.c" - guchar* _tmp1_; - gint _tmp1__length1; -#line 28 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = data; -#line 28 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1__length1 = data_length1; + if (length < 0) { #line 28 "/home/jens/Source/shotwell/src/util/string.vala" - length = _tmp1__length1; -#line 193 "string.c" + length = data_length1; +#line 204 "string.c" } #line 30 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = g_string_new (""); + _tmp0_ = g_string_new (""); #line 30 "/home/jens/Source/shotwell/src/util/string.vala" - builder = _tmp2_; -#line 199 "string.c" + builder = _tmp0_; +#line 210 "string.c" { gint ctr = 0; #line 31 "/home/jens/Source/shotwell/src/util/string.vala" ctr = 0; -#line 204 "string.c" +#line 215 "string.c" { - gboolean _tmp3_ = FALSE; + gboolean _tmp1_ = FALSE; #line 31 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = TRUE; + _tmp1_ = TRUE; #line 31 "/home/jens/Source/shotwell/src/util/string.vala" while (TRUE) { -#line 211 "string.c" - gint _tmp5_; - gint _tmp6_; - guchar* _tmp7_; - gint _tmp7__length1; - gint _tmp8_; - guchar _tmp9_; +#line 222 "string.c" + gint _tmp3_; + gint _tmp4_; + guchar _tmp5_; #line 31 "/home/jens/Source/shotwell/src/util/string.vala" - if (!_tmp3_) { -#line 220 "string.c" - gint _tmp4_; + if (!_tmp1_) { +#line 228 "string.c" + gint _tmp2_; #line 31 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = ctr; + _tmp2_ = ctr; #line 31 "/home/jens/Source/shotwell/src/util/string.vala" - ctr = _tmp4_ + 1; -#line 226 "string.c" + ctr = _tmp2_ + 1; +#line 234 "string.c" } #line 31 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = FALSE; -#line 31 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = ctr; + _tmp1_ = FALSE; #line 31 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp6_ = length; + _tmp3_ = ctr; #line 31 "/home/jens/Source/shotwell/src/util/string.vala" - if (!(_tmp5_ < _tmp6_)) { + if (!(_tmp3_ < length)) { #line 31 "/home/jens/Source/shotwell/src/util/string.vala" break; -#line 238 "string.c" +#line 244 "string.c" } #line 32 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp7_ = data; -#line 32 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp7__length1 = data_length1; + _tmp4_ = ctr; #line 32 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp8_ = ctr; + _tmp5_ = data[_tmp4_]; #line 32 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp9_ = _tmp7_[_tmp8_]; -#line 32 "/home/jens/Source/shotwell/src/util/string.vala" - if (_tmp9_ != ((guchar) '\0')) { -#line 250 "string.c" - GString* _tmp10_; - guchar* _tmp11_; - gint _tmp11__length1; - gint _tmp12_; - guchar _tmp13_; -#line 33 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp10_ = builder; -#line 33 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp11_ = data; + if (_tmp5_ != ((guchar) '\0')) { +#line 252 "string.c" + GString* _tmp6_; + gint _tmp7_; + guchar _tmp8_; #line 33 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp11__length1 = data_length1; + _tmp6_ = builder; #line 33 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp12_ = ctr; + _tmp7_ = ctr; #line 33 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp13_ = _tmp11_[_tmp12_]; + _tmp8_ = data[_tmp7_]; #line 33 "/home/jens/Source/shotwell/src/util/string.vala" - g_string_append_c (_tmp10_, (gchar) _tmp13_); -#line 268 "string.c" + g_string_append_c (_tmp6_, (gchar) _tmp8_); +#line 264 "string.c" } else { #line 35 "/home/jens/Source/shotwell/src/util/string.vala" break; -#line 272 "string.c" +#line 268 "string.c" } } } } #line 38 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp14_ = builder; + _tmp9_ = builder; #line 38 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp15_ = _tmp14_->str; + _tmp10_ = _tmp9_->str; #line 38 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp16_ = g_strdup (_tmp15_); + _tmp11_ = g_strdup (_tmp10_); #line 38 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp16_; + result = _tmp11_; #line 38 "/home/jens/Source/shotwell/src/util/string.vala" _g_string_free0 (builder); #line 38 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 289 "string.c" +#line 285 "string.c" } -static void _vala_array_add1 (guchar* * array, int* length, int* size, guchar value) { +static void +_vala_array_add1 (guchar* * array, + int* length, + int* size, + guchar value) +{ #line 45 "/home/jens/Source/shotwell/src/util/string.vala" if ((*length) == (*size)) { #line 45 "/home/jens/Source/shotwell/src/util/string.vala" *size = (*size) ? (2 * (*size)) : 4; #line 45 "/home/jens/Source/shotwell/src/util/string.vala" *array = g_renew (guchar, *array, *size); -#line 300 "string.c" +#line 301 "string.c" } #line 45 "/home/jens/Source/shotwell/src/util/string.vala" (*array)[(*length)++] = value; -#line 304 "string.c" +#line 305 "string.c" } -guchar* string_to_uchar_array (const gchar* str, int* result_length1) { +guchar* +string_to_uchar_array (const gchar* str, + int* result_length1) +{ guchar* result = NULL; guchar* data = NULL; guchar* _tmp0_; gint data_length1; gint _data_size_; - guchar* _tmp11_; - gint _tmp11__length1; + guchar* _tmp8_; + gint _tmp8__length1; #line 42 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (str != NULL, NULL); #line 43 "/home/jens/Source/shotwell/src/util/string.vala" @@ -322,257 +326,224 @@ guchar* string_to_uchar_array (const gchar* str, int* result_length1) { data_length1 = 0; #line 43 "/home/jens/Source/shotwell/src/util/string.vala" _data_size_ = data_length1; -#line 326 "string.c" +#line 330 "string.c" { gint ctr = 0; #line 44 "/home/jens/Source/shotwell/src/util/string.vala" ctr = 0; -#line 331 "string.c" +#line 335 "string.c" { gboolean _tmp1_ = FALSE; #line 44 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = TRUE; #line 44 "/home/jens/Source/shotwell/src/util/string.vala" while (TRUE) { -#line 338 "string.c" +#line 342 "string.c" gint _tmp3_; - const gchar* _tmp4_; + gint _tmp4_; gint _tmp5_; - gint _tmp6_; - guchar* _tmp7_; - gint _tmp7__length1; - const gchar* _tmp8_; - gint _tmp9_; - gchar _tmp10_; + guchar* _tmp6_; + gint _tmp6__length1; + gint _tmp7_; #line 44 "/home/jens/Source/shotwell/src/util/string.vala" if (!_tmp1_) { -#line 350 "string.c" +#line 351 "string.c" gint _tmp2_; #line 44 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = ctr; #line 44 "/home/jens/Source/shotwell/src/util/string.vala" ctr = _tmp2_ + 1; -#line 356 "string.c" +#line 357 "string.c" } #line 44 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = FALSE; #line 44 "/home/jens/Source/shotwell/src/util/string.vala" _tmp3_ = ctr; #line 44 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = str; -#line 44 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = strlen (_tmp4_); + _tmp4_ = strlen (str); #line 44 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 44 "/home/jens/Source/shotwell/src/util/string.vala" - if (!(_tmp3_ < _tmp6_)) { + if (!(_tmp3_ < _tmp5_)) { #line 44 "/home/jens/Source/shotwell/src/util/string.vala" break; -#line 372 "string.c" +#line 371 "string.c" } #line 45 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp7_ = data; -#line 45 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp7__length1 = data_length1; + _tmp6_ = data; #line 45 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp8_ = str; + _tmp6__length1 = data_length1; #line 45 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp9_ = ctr; + _tmp7_ = ctr; #line 45 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp10_ = string_get (_tmp8_, (glong) _tmp9_); -#line 45 "/home/jens/Source/shotwell/src/util/string.vala" - _vala_array_add1 (&data, &data_length1, &_data_size_, (guchar) _tmp10_); -#line 386 "string.c" + _vala_array_add1 (&data, &data_length1, &_data_size_, (guchar) string_get (str, (glong) _tmp7_)); +#line 381 "string.c" } } } #line 47 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp11_ = data; + _tmp8_ = data; #line 47 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp11__length1 = data_length1; + _tmp8__length1 = data_length1; #line 47 "/home/jens/Source/shotwell/src/util/string.vala" if (result_length1) { #line 47 "/home/jens/Source/shotwell/src/util/string.vala" - *result_length1 = _tmp11__length1; -#line 398 "string.c" + *result_length1 = _tmp8__length1; +#line 393 "string.c" } #line 47 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp11_; + result = _tmp8_; #line 47 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 404 "string.c" +#line 399 "string.c" } -inline gchar* guarded_markup_escape_text (const gchar* plain) { +inline gchar* +guarded_markup_escape_text (const gchar* plain) +{ gchar* result = NULL; gchar* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; - const gchar* _tmp2_; - gboolean _tmp3_; #line 58 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = plain; + if (!is_string_empty (plain)) { +#line 411 "string.c" + gboolean _tmp2_; #line 58 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = is_string_empty (_tmp2_); + _tmp2_ = g_utf8_validate (plain, (gssize) -1, NULL); #line 58 "/home/jens/Source/shotwell/src/util/string.vala" - if (!_tmp3_) { -#line 420 "string.c" - const gchar* _tmp4_; - gboolean _tmp5_; -#line 58 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = plain; -#line 58 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = g_utf8_validate (_tmp4_, (gssize) -1, NULL); -#line 58 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = _tmp5_; -#line 429 "string.c" + _tmp1_ = _tmp2_; +#line 417 "string.c" } else { #line 58 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = FALSE; -#line 433 "string.c" +#line 421 "string.c" } #line 58 "/home/jens/Source/shotwell/src/util/string.vala" if (_tmp1_) { -#line 437 "string.c" - const gchar* _tmp6_; - gchar* _tmp7_; -#line 58 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp6_ = plain; +#line 425 "string.c" + gchar* _tmp3_; #line 58 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp7_ = g_markup_escape_text (_tmp6_, (gssize) -1); + _tmp3_ = g_markup_escape_text (plain, (gssize) -1); #line 58 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (_tmp0_); #line 58 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = _tmp7_; -#line 448 "string.c" + _tmp0_ = _tmp3_; +#line 433 "string.c" } else { - gchar* _tmp8_; + gchar* _tmp4_; #line 58 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp8_ = g_strdup (""); + _tmp4_ = g_strdup (""); #line 58 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (_tmp0_); #line 58 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = _tmp8_; -#line 457 "string.c" + _tmp0_ = _tmp4_; +#line 442 "string.c" } #line 58 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp0_; #line 58 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 463 "string.c" +#line 448 "string.c" } -glong find_last_offset (const gchar* str, gchar c) { +glong +find_last_offset (const gchar* str, + gchar c) +{ glong result = 0L; glong offset = 0L; - const gchar* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; #line 61 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (str != NULL, 0L); #line 62 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = str; -#line 62 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = strlen (_tmp0_); + _tmp0_ = strlen (str); #line 62 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 62 "/home/jens/Source/shotwell/src/util/string.vala" - offset = (glong) _tmp2_; + offset = (glong) _tmp1_; #line 63 "/home/jens/Source/shotwell/src/util/string.vala" while (TRUE) { -#line 485 "string.c" +#line 470 "string.c" + glong _tmp2_; glong _tmp3_; glong _tmp4_; - const gchar* _tmp5_; - glong _tmp6_; - gchar _tmp7_; - gchar _tmp8_; #line 63 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = offset; + _tmp2_ = offset; #line 63 "/home/jens/Source/shotwell/src/util/string.vala" - offset = _tmp3_ - 1; + offset = _tmp2_ - 1; #line 63 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = offset; + _tmp3_ = offset; #line 63 "/home/jens/Source/shotwell/src/util/string.vala" - if (!(_tmp4_ >= ((glong) 0))) { + if (!(_tmp3_ >= ((glong) 0))) { #line 63 "/home/jens/Source/shotwell/src/util/string.vala" break; -#line 502 "string.c" +#line 484 "string.c" } #line 64 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = str; -#line 64 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp6_ = offset; -#line 64 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp7_ = string_get (_tmp5_, _tmp6_); -#line 64 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp8_ = c; + _tmp4_ = offset; #line 64 "/home/jens/Source/shotwell/src/util/string.vala" - if (_tmp7_ == _tmp8_) { + if (string_get (str, _tmp4_) == c) { #line 65 "/home/jens/Source/shotwell/src/util/string.vala" result = offset; #line 65 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 518 "string.c" +#line 494 "string.c" } } #line 68 "/home/jens/Source/shotwell/src/util/string.vala" result = (glong) -1; #line 68 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 525 "string.c" +#line 501 "string.c" } -gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1) { +gboolean +is_in_ci_array (const gchar* str, + gchar** strings, + int strings_length1) +{ gboolean result = FALSE; gchar* strdown = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - gchar** _tmp2_; - gint _tmp2__length1; + gchar* _tmp0_; #line 73 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (str != NULL, FALSE); #line 74 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = str; -#line 74 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = g_utf8_strdown (_tmp0_, (gssize) -1); + _tmp0_ = g_utf8_strdown (str, (gssize) -1); #line 74 "/home/jens/Source/shotwell/src/util/string.vala" - strdown = _tmp1_; -#line 75 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = strings; -#line 75 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2__length1 = strings_length1; -#line 548 "string.c" + strdown = _tmp0_; +#line 519 "string.c" { gchar** str_element_collection = NULL; gint str_element_collection_length1 = 0; gint _str_element_collection_size_ = 0; gint str_element_it = 0; #line 75 "/home/jens/Source/shotwell/src/util/string.vala" - str_element_collection = _tmp2_; + str_element_collection = strings; #line 75 "/home/jens/Source/shotwell/src/util/string.vala" - str_element_collection_length1 = _tmp2__length1; + str_element_collection_length1 = strings_length1; #line 75 "/home/jens/Source/shotwell/src/util/string.vala" - for (str_element_it = 0; str_element_it < _tmp2__length1; str_element_it = str_element_it + 1) { -#line 560 "string.c" - gchar* _tmp3_; + for (str_element_it = 0; str_element_it < strings_length1; str_element_it = str_element_it + 1) { +#line 531 "string.c" + gchar* _tmp1_; gchar* str_element = NULL; #line 75 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = g_strdup (str_element_collection[str_element_it]); + _tmp1_ = g_strdup (str_element_collection[str_element_it]); #line 75 "/home/jens/Source/shotwell/src/util/string.vala" - str_element = _tmp3_; -#line 567 "string.c" + str_element = _tmp1_; +#line 538 "string.c" { - const gchar* _tmp4_; - const gchar* _tmp5_; + const gchar* _tmp2_; + const gchar* _tmp3_; #line 76 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = strdown; + _tmp2_ = strdown; #line 76 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = str_element; + _tmp3_ = str_element; #line 76 "/home/jens/Source/shotwell/src/util/string.vala" - if (g_strcmp0 (_tmp4_, _tmp5_) == 0) { + if (g_strcmp0 (_tmp2_, _tmp3_) == 0) { #line 77 "/home/jens/Source/shotwell/src/util/string.vala" result = TRUE; #line 77 "/home/jens/Source/shotwell/src/util/string.vala" @@ -581,11 +552,11 @@ gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1) _g_free0 (strdown); #line 77 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 585 "string.c" +#line 556 "string.c" } #line 75 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (str_element); -#line 589 "string.c" +#line 560 "string.c" } } } @@ -595,11 +566,13 @@ gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1) _g_free0 (strdown); #line 80 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 599 "string.c" +#line 570 "string.c" } -GType prepare_input_text_options_get_type (void) { +GType +prepare_input_text_options_get_type (void) +{ static volatile gsize prepare_input_text_options_type_id__volatile = 0; if (g_once_init_enter (&prepare_input_text_options_type_id__volatile)) { static const GFlagsValue values[] = {{PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL, "PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL", "empty-is-null"}, {PREPARE_INPUT_TEXT_OPTIONS_VALIDATE, "PREPARE_INPUT_TEXT_OPTIONS_VALIDATE", "validate"}, {PREPARE_INPUT_TEXT_OPTIONS_INVALID_IS_NULL, "PREPARE_INPUT_TEXT_OPTIONS_INVALID_IS_NULL", "invalid-is-null"}, {PREPARE_INPUT_TEXT_OPTIONS_STRIP, "PREPARE_INPUT_TEXT_OPTIONS_STRIP", "strip"}, {PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF, "PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF", "strip-crlf"}, {PREPARE_INPUT_TEXT_OPTIONS_NORMALIZE, "PREPARE_INPUT_TEXT_OPTIONS_NORMALIZE", "normalize"}, {PREPARE_INPUT_TEXT_OPTIONS_DEFAULT, "PREPARE_INPUT_TEXT_OPTIONS_DEFAULT", "default"}, {0, NULL, NULL}}; @@ -611,17 +584,18 @@ GType prepare_input_text_options_get_type (void) { } -gchar* guess_convert (const gchar* text) { +gchar* +guess_convert (const gchar* text) +{ gchar* result = NULL; gchar* output = NULL; gsize bytes_read = 0UL; const gchar* charset = NULL; const gchar* _tmp0_ = NULL; gboolean _tmp1_; - gsize _tmp30_; - const gchar* _tmp31_; - gint _tmp32_; - gint _tmp33_; + gsize _tmp23_; + gint _tmp24_; + gint _tmp25_; GError * _inner_error_ = NULL; #line 94 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (text != NULL, NULL); @@ -640,84 +614,69 @@ gchar* guess_convert (const gchar* text) { charset = _tmp0_; #line 101 "/home/jens/Source/shotwell/src/util/string.vala" if (!_tmp1_) { -#line 643 "string.c" - const gchar* _tmp2_; - const gchar* _tmp3_; - gint _tmp4_; - gint _tmp5_; - gsize _tmp6_ = 0UL; - gchar* _tmp7_; - gsize _tmp8_; - const gchar* _tmp9_; - gint _tmp10_; - gint _tmp11_; -#line 102 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = text; -#line 102 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = text; +#line 617 "string.c" + gint _tmp2_; + gint _tmp3_; + gsize _tmp4_ = 0UL; + gchar* _tmp5_; + gsize _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 102 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = strlen (_tmp3_); + _tmp2_ = strlen (text); #line 102 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 102 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp7_ = g_locale_to_utf8 (_tmp2_, (gssize) _tmp5_, &_tmp6_, NULL, NULL); + _tmp5_ = g_locale_to_utf8 (text, (gssize) _tmp3_, &_tmp4_, NULL, NULL); #line 102 "/home/jens/Source/shotwell/src/util/string.vala" - bytes_read = _tmp6_; + bytes_read = _tmp4_; #line 102 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (output); #line 102 "/home/jens/Source/shotwell/src/util/string.vala" - output = _tmp7_; -#line 103 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp8_ = bytes_read; + output = _tmp5_; #line 103 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp9_ = text; + _tmp6_ = bytes_read; #line 103 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp10_ = strlen (_tmp9_); + _tmp7_ = strlen (text); #line 103 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 103 "/home/jens/Source/shotwell/src/util/string.vala" - if (_tmp8_ == ((gsize) _tmp11_)) { -#line 680 "string.c" - const gchar* _tmp12_; + if (_tmp6_ == ((gsize) _tmp8_)) { +#line 645 "string.c" + const gchar* _tmp9_; #line 104 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp12_ = charset; + _tmp9_ = charset; #line 104 "/home/jens/Source/shotwell/src/util/string.vala" - g_debug ("string.vala:104: CONVERT: Locale is not UTF-8, convert from %s", _tmp12_); + g_debug ("string.vala:104: CONVERT: Locale is not UTF-8, convert from %s", _tmp9_); #line 105 "/home/jens/Source/shotwell/src/util/string.vala" result = output; #line 105 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 690 "string.c" +#line 655 "string.c" } } { - gchar* _tmp13_ = NULL; - const gchar* _tmp14_; - const gchar* _tmp15_; - gint _tmp16_; - gint _tmp17_; - gsize _tmp18_ = 0UL; - gchar* _tmp19_; - gchar* _tmp20_; -#line 110 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp14_ = text; -#line 110 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp15_ = text; + gchar* _tmp10_ = NULL; + gint _tmp11_; + gint _tmp12_; + gsize _tmp13_ = 0UL; + gchar* _tmp14_; + gchar* _tmp15_; #line 110 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp16_ = strlen (_tmp15_); + _tmp11_ = strlen (text); #line 110 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp17_ = _tmp16_; + _tmp12_ = _tmp11_; #line 110 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp19_ = g_convert (_tmp14_, (gssize) _tmp17_, "UTF-8", "WINDOWS-1252", &_tmp18_, NULL, &_inner_error_); + _tmp14_ = g_convert (text, (gssize) _tmp12_, "UTF-8", "WINDOWS-1252", &_tmp13_, NULL, &_inner_error_); #line 110 "/home/jens/Source/shotwell/src/util/string.vala" - bytes_read = _tmp18_; + bytes_read = _tmp13_; #line 110 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp13_ = _tmp19_; + _tmp10_ = _tmp14_; #line 110 "/home/jens/Source/shotwell/src/util/string.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 110 "/home/jens/Source/shotwell/src/util/string.vala" if (_inner_error_->domain == G_CONVERT_ERROR) { -#line 720 "string.c" +#line 679 "string.c" goto __catch6_g_convert_error; } #line 110 "/home/jens/Source/shotwell/src/util/string.vala" @@ -728,77 +687,71 @@ gchar* guess_convert (const gchar* text) { g_clear_error (&_inner_error_); #line 110 "/home/jens/Source/shotwell/src/util/string.vala" return NULL; -#line 731 "string.c" +#line 690 "string.c" } #line 110 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp20_ = _tmp13_; + _tmp15_ = _tmp10_; #line 110 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp13_ = NULL; + _tmp10_ = NULL; #line 110 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (output); #line 110 "/home/jens/Source/shotwell/src/util/string.vala" - output = _tmp20_; + output = _tmp15_; #line 111 "/home/jens/Source/shotwell/src/util/string.vala" charset = "WINDOWS-1252"; #line 109 "/home/jens/Source/shotwell/src/util/string.vala" - _g_free0 (_tmp13_); -#line 745 "string.c" + _g_free0 (_tmp10_); +#line 704 "string.c" } goto __finally6; __catch6_g_convert_error: { GError* _error_ = NULL; - GError* _tmp21_; + GError* _tmp16_; #line 109 "/home/jens/Source/shotwell/src/util/string.vala" _error_ = _inner_error_; #line 109 "/home/jens/Source/shotwell/src/util/string.vala" _inner_error_ = NULL; #line 113 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp21_ = _error_; + _tmp16_ = _error_; #line 113 "/home/jens/Source/shotwell/src/util/string.vala" - if (g_error_matches (_tmp21_, G_CONVERT_ERROR, G_CONVERT_ERROR_NO_CONVERSION)) { -#line 760 "string.c" + if (g_error_matches (_tmp16_, G_CONVERT_ERROR, G_CONVERT_ERROR_NO_CONVERSION)) { +#line 719 "string.c" { - gchar* _tmp22_ = NULL; - const gchar* _tmp23_; - const gchar* _tmp24_; - gint _tmp25_; - gint _tmp26_; - gsize _tmp27_ = 0UL; - gchar* _tmp28_; - gchar* _tmp29_; -#line 115 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp23_ = text; + gchar* _tmp17_ = NULL; + gint _tmp18_; + gint _tmp19_; + gsize _tmp20_ = 0UL; + gchar* _tmp21_; + gchar* _tmp22_; #line 115 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp24_ = text; + _tmp18_ = strlen (text); #line 115 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp25_ = strlen (_tmp24_); + _tmp19_ = _tmp18_; #line 115 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp26_ = _tmp25_; + _tmp21_ = g_convert (text, (gssize) _tmp19_, "UTF-8", "ISO-8859-1", &_tmp20_, NULL, &_inner_error_); #line 115 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp28_ = g_convert (_tmp23_, (gssize) _tmp26_, "UTF-8", "ISO-8859-1", &_tmp27_, NULL, &_inner_error_); + bytes_read = _tmp20_; #line 115 "/home/jens/Source/shotwell/src/util/string.vala" - bytes_read = _tmp27_; -#line 115 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp22_ = _tmp28_; + _tmp17_ = _tmp21_; #line 115 "/home/jens/Source/shotwell/src/util/string.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 786 "string.c" +#line 739 "string.c" goto __catch7_g_error; } #line 115 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp29_ = _tmp22_; + _tmp22_ = _tmp17_; #line 115 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp22_ = NULL; + _tmp17_ = NULL; #line 115 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (output); #line 115 "/home/jens/Source/shotwell/src/util/string.vala" - output = _tmp29_; + output = _tmp22_; #line 116 "/home/jens/Source/shotwell/src/util/string.vala" charset = "ISO-8859-1"; #line 114 "/home/jens/Source/shotwell/src/util/string.vala" - _g_free0 (_tmp22_); -#line 801 "string.c" + _g_free0 (_tmp17_); +#line 754 "string.c" } goto __finally7; __catch7_g_error: @@ -810,7 +763,7 @@ gchar* guess_convert (const gchar* text) { _inner_error_ = NULL; #line 114 "/home/jens/Source/shotwell/src/util/string.vala" _g_error_free0 (_error_); -#line 813 "string.c" +#line 766 "string.c" } __finally7: #line 114 "/home/jens/Source/shotwell/src/util/string.vala" @@ -827,12 +780,12 @@ gchar* guess_convert (const gchar* text) { g_clear_error (&_inner_error_); #line 114 "/home/jens/Source/shotwell/src/util/string.vala" return NULL; -#line 830 "string.c" +#line 783 "string.c" } } #line 109 "/home/jens/Source/shotwell/src/util/string.vala" _g_error_free0 (_error_); -#line 835 "string.c" +#line 788 "string.c" } __finally6: #line 109 "/home/jens/Source/shotwell/src/util/string.vala" @@ -845,29 +798,27 @@ gchar* guess_convert (const gchar* text) { g_clear_error (&_inner_error_); #line 109 "/home/jens/Source/shotwell/src/util/string.vala" return NULL; -#line 848 "string.c" +#line 801 "string.c" } #line 121 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp30_ = bytes_read; + _tmp23_ = bytes_read; #line 121 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp31_ = text; + _tmp24_ = strlen (text); #line 121 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp32_ = strlen (_tmp31_); + _tmp25_ = _tmp24_; #line 121 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp33_ = _tmp32_; -#line 121 "/home/jens/Source/shotwell/src/util/string.vala" - if (_tmp30_ == ((gsize) _tmp33_)) { -#line 860 "string.c" - const gchar* _tmp34_; + if (_tmp23_ == ((gsize) _tmp25_)) { +#line 811 "string.c" + const gchar* _tmp26_; #line 122 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp34_ = charset; + _tmp26_ = charset; #line 122 "/home/jens/Source/shotwell/src/util/string.vala" - g_debug ("string.vala:122: CONVERT: Guessed conversion from %s", _tmp34_); + g_debug ("string.vala:122: CONVERT: Guessed conversion from %s", _tmp26_); #line 124 "/home/jens/Source/shotwell/src/util/string.vala" result = output; #line 124 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 870 "string.c" +#line 821 "string.c" } #line 127 "/home/jens/Source/shotwell/src/util/string.vala" result = NULL; @@ -875,826 +826,679 @@ gchar* guess_convert (const gchar* text) { _g_free0 (output); #line 127 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 878 "string.c" +#line 829 "string.c" } -static gchar* string_strip (const gchar* self) { +static gchar* +string_strip (const gchar* self) +{ gchar* result = NULL; gchar* _result_ = NULL; gchar* _tmp0_; const gchar* _tmp1_; -#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1248 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _result_; -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 901 "string.c" +#line 854 "string.c" } -static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar new_delimiter) { +static gchar* +string_delimit (const gchar* self, + const gchar* delimiters, + gchar new_delimiter) +{ gchar* result = NULL; gchar* _result_ = NULL; gchar* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; - gchar _tmp3_; -#line 1242 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1256 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1242 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1256 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (delimiters != NULL, NULL); -#line 1243 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1257 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1243 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1257 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1258 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = delimiters; -#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = new_delimiter; -#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_strdelimit (_tmp1_, _tmp2_, _tmp3_); -#line 1245 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1258 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_strdelimit (_tmp1_, delimiters, new_delimiter); +#line 1259 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _result_; -#line 1245 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1259 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 932 "string.c" +#line 883 "string.c" } -gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length) { +gchar* +prepare_input_text (const gchar* text, + PrepareInputTextOptions options, + gint dest_length) +{ gchar* result = NULL; - const gchar* _tmp0_; gchar* prepped = NULL; - const gchar* _tmp1_; - gchar* _tmp2_; - PrepareInputTextOptions _tmp3_; - PrepareInputTextOptions _tmp12_; - PrepareInputTextOptions _tmp15_; - PrepareInputTextOptions _tmp18_; - gboolean _tmp21_ = FALSE; - PrepareInputTextOptions _tmp22_; - gint _tmp25_; -#line 131 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = text; + gchar* _tmp0_; + gboolean _tmp12_ = FALSE; #line 131 "/home/jens/Source/shotwell/src/util/string.vala" - if (_tmp0_ == NULL) { + if (text == NULL) { #line 132 "/home/jens/Source/shotwell/src/util/string.vala" result = NULL; #line 132 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 957 "string.c" +#line 902 "string.c" } #line 134 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = text; -#line 134 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp0_ = g_strdup (text); #line 134 "/home/jens/Source/shotwell/src/util/string.vala" - prepped = _tmp2_; -#line 135 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = options; + prepped = _tmp0_; #line 135 "/home/jens/Source/shotwell/src/util/string.vala" - if ((_tmp3_ & PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) == PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) { -#line 969 "string.c" - const gchar* _tmp4_; - gboolean _tmp5_; -#line 136 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = text; + if ((options & PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) == PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) { +#line 910 "string.c" + gboolean _tmp1_; #line 136 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = g_utf8_validate (_tmp4_, (gssize) -1, NULL); + _tmp1_ = g_utf8_validate (text, (gssize) -1, NULL); #line 136 "/home/jens/Source/shotwell/src/util/string.vala" - if (!_tmp5_) { -#line 978 "string.c" - const gchar* _tmp6_; - gchar* _tmp7_; - const gchar* _tmp8_; + if (!_tmp1_) { +#line 916 "string.c" + gchar* _tmp2_; + const gchar* _tmp3_; #line 137 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp6_ = text; -#line 137 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp7_ = guess_convert (_tmp6_); + _tmp2_ = guess_convert (text); #line 137 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (prepped); #line 137 "/home/jens/Source/shotwell/src/util/string.vala" - prepped = _tmp7_; + prepped = _tmp2_; #line 139 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp8_ = prepped; + _tmp3_ = prepped; #line 139 "/home/jens/Source/shotwell/src/util/string.vala" - if (_tmp8_ == NULL) { -#line 994 "string.c" - const gchar* _tmp9_ = NULL; - PrepareInputTextOptions _tmp10_; - gchar* _tmp11_; -#line 140 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp10_ = options; + if (_tmp3_ == NULL) { +#line 929 "string.c" + const gchar* _tmp4_ = NULL; + gchar* _tmp5_; #line 140 "/home/jens/Source/shotwell/src/util/string.vala" - if ((_tmp10_ & PREPARE_INPUT_TEXT_OPTIONS_INVALID_IS_NULL) != 0) { + if ((options & PREPARE_INPUT_TEXT_OPTIONS_INVALID_IS_NULL) != 0) { #line 140 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp9_ = NULL; -#line 1004 "string.c" + _tmp4_ = NULL; +#line 936 "string.c" } else { #line 140 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp9_ = ""; -#line 1008 "string.c" + _tmp4_ = ""; +#line 940 "string.c" } #line 140 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp11_ = g_strdup (_tmp9_); + _tmp5_ = g_strdup (_tmp4_); #line 140 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp11_; + result = _tmp5_; #line 140 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (prepped); #line 140 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1018 "string.c" +#line 950 "string.c" } } } #line 149 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp12_ = options; -#line 149 "/home/jens/Source/shotwell/src/util/string.vala" - if ((_tmp12_ & PREPARE_INPUT_TEXT_OPTIONS_NORMALIZE) != 0) { -#line 1026 "string.c" - const gchar* _tmp13_; - gchar* _tmp14_; + if ((options & PREPARE_INPUT_TEXT_OPTIONS_NORMALIZE) != 0) { +#line 956 "string.c" + const gchar* _tmp6_; + gchar* _tmp7_; #line 150 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp13_ = prepped; + _tmp6_ = prepped; #line 150 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp14_ = g_utf8_normalize (_tmp13_, (gssize) -1, G_NORMALIZE_NFC); + _tmp7_ = g_utf8_normalize (_tmp6_, (gssize) -1, G_NORMALIZE_NFC); #line 150 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (prepped); #line 150 "/home/jens/Source/shotwell/src/util/string.vala" - prepped = _tmp14_; -#line 1037 "string.c" + prepped = _tmp7_; +#line 967 "string.c" } #line 152 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp15_ = options; -#line 152 "/home/jens/Source/shotwell/src/util/string.vala" - if ((_tmp15_ & PREPARE_INPUT_TEXT_OPTIONS_STRIP) != 0) { -#line 1043 "string.c" - const gchar* _tmp16_; - gchar* _tmp17_; + if ((options & PREPARE_INPUT_TEXT_OPTIONS_STRIP) != 0) { +#line 971 "string.c" + const gchar* _tmp8_; + gchar* _tmp9_; #line 153 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp16_ = prepped; + _tmp8_ = prepped; #line 153 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp17_ = string_strip (_tmp16_); + _tmp9_ = string_strip (_tmp8_); #line 153 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (prepped); #line 153 "/home/jens/Source/shotwell/src/util/string.vala" - prepped = _tmp17_; -#line 1054 "string.c" + prepped = _tmp9_; +#line 982 "string.c" } #line 157 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp18_ = options; -#line 157 "/home/jens/Source/shotwell/src/util/string.vala" - if ((_tmp18_ & PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF) != 0) { -#line 1060 "string.c" - const gchar* _tmp19_; - gchar* _tmp20_; + if ((options & PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF) != 0) { +#line 986 "string.c" + const gchar* _tmp10_; + gchar* _tmp11_; #line 158 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp19_ = prepped; + _tmp10_ = prepped; #line 158 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp20_ = string_delimit (_tmp19_, "\n\r", ' '); + _tmp11_ = string_delimit (_tmp10_, "\n\r", ' '); #line 158 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (prepped); #line 158 "/home/jens/Source/shotwell/src/util/string.vala" - prepped = _tmp20_; -#line 1071 "string.c" + prepped = _tmp11_; +#line 997 "string.c" } #line 160 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp22_ = options; -#line 160 "/home/jens/Source/shotwell/src/util/string.vala" - if ((_tmp22_ & PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL) != 0) { -#line 1077 "string.c" - const gchar* _tmp23_; - gboolean _tmp24_; -#line 160 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp23_ = prepped; + if ((options & PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL) != 0) { +#line 1001 "string.c" + const gchar* _tmp13_; #line 160 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp24_ = is_string_empty (_tmp23_); + _tmp13_ = prepped; #line 160 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp21_ = _tmp24_; -#line 1086 "string.c" + _tmp12_ = is_string_empty (_tmp13_); +#line 1007 "string.c" } else { #line 160 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp21_ = FALSE; -#line 1090 "string.c" + _tmp12_ = FALSE; +#line 1011 "string.c" } #line 160 "/home/jens/Source/shotwell/src/util/string.vala" - if (_tmp21_) { + if (_tmp12_) { #line 161 "/home/jens/Source/shotwell/src/util/string.vala" result = NULL; #line 161 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (prepped); #line 161 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1100 "string.c" +#line 1021 "string.c" } #line 166 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp25_ = dest_length; -#line 166 "/home/jens/Source/shotwell/src/util/string.vala" - if (_tmp25_ >= 0) { -#line 1106 "string.c" + if (dest_length >= 0) { +#line 1025 "string.c" GString* sb = NULL; - const gchar* _tmp26_; - GString* _tmp27_; - GString* _tmp28_; - gint _tmp29_; - GString* _tmp30_; - const gchar* _tmp31_; - gchar* _tmp32_; + const gchar* _tmp14_; + GString* _tmp15_; + GString* _tmp16_; + GString* _tmp17_; + const gchar* _tmp18_; + gchar* _tmp19_; #line 167 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp26_ = prepped; + _tmp14_ = prepped; #line 167 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp27_ = g_string_new (_tmp26_); + _tmp15_ = g_string_new (_tmp14_); #line 167 "/home/jens/Source/shotwell/src/util/string.vala" - sb = _tmp27_; + sb = _tmp15_; #line 168 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp28_ = sb; + _tmp16_ = sb; #line 168 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp29_ = dest_length; -#line 168 "/home/jens/Source/shotwell/src/util/string.vala" - g_string_truncate (_tmp28_, (gsize) _tmp29_); + g_string_truncate (_tmp16_, (gsize) dest_length); #line 169 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp30_ = sb; + _tmp17_ = sb; #line 169 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp31_ = _tmp30_->str; + _tmp18_ = _tmp17_->str; #line 169 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp32_ = g_strdup (_tmp31_); + _tmp19_ = g_strdup (_tmp18_); #line 169 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp32_; + result = _tmp19_; #line 169 "/home/jens/Source/shotwell/src/util/string.vala" _g_string_free0 (sb); #line 169 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (prepped); #line 169 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1141 "string.c" +#line 1057 "string.c" } #line 173 "/home/jens/Source/shotwell/src/util/string.vala" result = prepped; #line 173 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1147 "string.c" +#line 1063 "string.c" } -gint64 parse_int64 (const gchar* str, gint num_base) { +gint64 +parse_int64 (const gchar* str, + gint num_base) +{ gint64 result = 0LL; - const gchar* _tmp0_; - gint _tmp1_; - gint64 _tmp2_; + gint64 _tmp0_; #line 176 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (str != NULL, 0LL); #line 177 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = str; -#line 177 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = num_base; + _tmp0_ = g_ascii_strtoll (str, NULL, (guint) num_base); #line 177 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = g_ascii_strtoll (_tmp0_, NULL, (guint) _tmp1_); -#line 177 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp2_; + result = _tmp0_; #line 177 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1168 "string.c" +#line 1081 "string.c" } -static gint string_index_of_char (const gchar* self, gunichar c, gint start_index) { +static gint +string_index_of_char (const gchar* self, + gunichar c, + gint start_index) +{ gint result = 0; gchar* _result_ = NULL; - gint _tmp0_; - gunichar _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1031 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; + gchar* _tmp1_; +#line 1045 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = start_index; -#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = c; -#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_); -#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _result_ = _tmp2_; -#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = _result_; -#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ != NULL) { -#line 1193 "string.c" - gchar* _tmp4_; -#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = _result_; -#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1046 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_utf8_strchr (((gchar*) self) + start_index, (gssize) -1, c); +#line 1046 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _result_ = _tmp0_; +#line 1048 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = _result_; +#line 1048 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ != NULL) { +#line 1104 "string.c" + gchar* _tmp2_; +#line 1049 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _result_; +#line 1049 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (gint) (_tmp2_ - ((gchar*) self)); +#line 1049 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1201 "string.c" +#line 1112 "string.c" } else { -#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1051 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = -1; -#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1051 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1207 "string.c" +#line 1118 "string.c" } } -inline gboolean string_contains_char (const gchar* haystack, gunichar needle) { +inline gboolean +string_contains_char (const gchar* haystack, + gunichar needle) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gunichar _tmp1_; - gint _tmp2_; #line 182 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (haystack != NULL, FALSE); #line 183 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = haystack; -#line 183 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = needle; -#line 183 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = string_index_of_char (_tmp0_, _tmp1_, 0); -#line 183 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp2_ >= 0; + result = string_index_of_char (haystack, needle, 0) >= 0; #line 183 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1229 "string.c" +#line 1134 "string.c" } -static gint string_index_of (const gchar* self, const gchar* needle, gint start_index) { +static gint +string_index_of (const gchar* self, + const gchar* needle, + gint start_index) +{ gint result = 0; gchar* _result_ = NULL; - gint _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; + gchar* _tmp1_; +#line 1025 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1025 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, 0); -#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = start_index; -#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = needle; -#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_); -#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _result_ = _tmp2_; -#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = _result_; -#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ != NULL) { -#line 1256 "string.c" - gchar* _tmp4_; -#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = _result_; -#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1026 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = strstr (((gchar*) self) + start_index, (gchar*) needle); +#line 1026 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _result_ = _tmp0_; +#line 1028 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = _result_; +#line 1028 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ != NULL) { +#line 1159 "string.c" + gchar* _tmp2_; +#line 1029 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _result_; +#line 1029 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (gint) (_tmp2_ - ((gchar*) self)); +#line 1029 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1264 "string.c" +#line 1167 "string.c" } else { -#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1031 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = -1; -#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1031 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1270 "string.c" +#line 1173 "string.c" } } -inline gboolean string_contains_str (const gchar* haystack, const gchar* needle) { +inline gboolean +string_contains_str (const gchar* haystack, + const gchar* needle) +{ gboolean result = FALSE; - const gchar* _tmp0_; - const gchar* _tmp1_; - gint _tmp2_; #line 186 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (haystack != NULL, FALSE); #line 186 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (needle != NULL, FALSE); #line 187 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = haystack; -#line 187 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = needle; -#line 187 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = string_index_of (_tmp0_, _tmp1_, 0); -#line 187 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp2_ >= 0; + result = string_index_of (haystack, needle, 0) >= 0; #line 187 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1294 "string.c" +#line 1191 "string.c" } -static gchar* string_slice (const gchar* self, glong start, glong end) { +static gchar* +string_slice (const gchar* self, + glong start, + glong end) +{ gchar* result = NULL; glong string_length = 0L; gint _tmp0_; gint _tmp1_; - glong _tmp2_; - glong _tmp5_; - gboolean _tmp8_ = FALSE; - glong _tmp9_; - gboolean _tmp12_ = FALSE; - glong _tmp13_; - glong _tmp16_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - gchar* _tmp21_; -#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gboolean _tmp4_ = FALSE; + gboolean _tmp6_ = FALSE; + gchar* _tmp8_; +#line 1369 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = start; -#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp2_ < ((glong) 0)) { -#line 1327 "string.c" +#line 1371 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (start < ((glong) 0)) { +#line 1217 "string.c" + glong _tmp2_; +#line 1372 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = string_length; +#line 1372 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + start = _tmp2_ + start; +#line 1223 "string.c" + } +#line 1374 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (end < ((glong) 0)) { +#line 1227 "string.c" glong _tmp3_; - glong _tmp4_; -#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1375 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = start; -#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - start = _tmp3_ + _tmp4_; -#line 1336 "string.c" - } -#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp5_ < ((glong) 0)) { -#line 1342 "string.c" - glong _tmp6_; - glong _tmp7_; -#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = string_length; -#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = end; -#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp6_ + _tmp7_; -#line 1351 "string.c" +#line 1375 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp3_ + end; +#line 1233 "string.c" } -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = start; -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp9_ >= ((glong) 0)) { -#line 1357 "string.c" - glong _tmp10_; - glong _tmp11_; -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = start; -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = string_length; -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp10_ <= _tmp11_; -#line 1366 "string.c" +#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (start >= ((glong) 0)) { +#line 1237 "string.c" + glong _tmp5_; +#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = start <= _tmp5_; +#line 1243 "string.c" } else { -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = FALSE; -#line 1370 "string.c" +#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = FALSE; +#line 1247 "string.c" } -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp8_, NULL); -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = end; -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp13_ >= ((glong) 0)) { -#line 1378 "string.c" - glong _tmp14_; - glong _tmp15_; -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = end; -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = _tmp14_ <= _tmp15_; -#line 1387 "string.c" +#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (_tmp4_, NULL); +#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (end >= ((glong) 0)) { +#line 1253 "string.c" + glong _tmp7_; +#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = string_length; +#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = end <= _tmp7_; +#line 1259 "string.c" } else { -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = FALSE; -#line 1391 "string.c" +#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = FALSE; +#line 1263 "string.c" } -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_, NULL); -#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = start; -#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = end; -#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = start; -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = end; -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = start; -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp21_; -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (_tmp6_, NULL); +#line 1379 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (start <= end, NULL); +#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = g_strndup (((gchar*) self) + start, (gsize) (end - start)); +#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp8_; +#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1413 "string.c" +#line 1275 "string.c" } -inline gchar* string_sliced_at (const gchar* str, gint index) { +inline gchar* +string_sliced_at (const gchar* str, + gint index) +{ gchar* result = NULL; gchar* _tmp0_ = NULL; - gint _tmp1_; #line 190 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (str != NULL, NULL); #line 191 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = index; -#line 191 "/home/jens/Source/shotwell/src/util/string.vala" - if (_tmp1_ >= 0) { -#line 1427 "string.c" - const gchar* _tmp2_; - gint _tmp3_; - const gchar* _tmp4_; - gint _tmp5_; - gint _tmp6_; - gchar* _tmp7_; -#line 191 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = str; -#line 191 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = index; -#line 191 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = str; + if (index >= 0) { +#line 1289 "string.c" + gint _tmp1_; + gint _tmp2_; + gchar* _tmp3_; #line 191 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = strlen (_tmp4_); + _tmp1_ = strlen (str); #line 191 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp6_ = _tmp5_; + _tmp2_ = _tmp1_; #line 191 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp7_ = string_slice (_tmp2_, (glong) _tmp3_, (glong) _tmp6_); + _tmp3_ = string_slice (str, (glong) index, (glong) _tmp2_); #line 191 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (_tmp0_); #line 191 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = _tmp7_; -#line 1450 "string.c" + _tmp0_ = _tmp3_; +#line 1303 "string.c" } else { #line 191 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (_tmp0_); #line 191 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = NULL; -#line 1456 "string.c" +#line 1309 "string.c" } #line 191 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp0_; #line 191 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1462 "string.c" +#line 1315 "string.c" } -inline gchar* string_sliced_at_first_str (const gchar* haystack, const gchar* needle, gint start_index) { +inline gchar* +string_sliced_at_first_str (const gchar* haystack, + const gchar* needle, + gint start_index) +{ gchar* result = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - gint _tmp3_; - gint _tmp4_; - gchar* _tmp5_; + gchar* _tmp0_; #line 194 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (haystack != NULL, NULL); #line 194 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (needle != NULL, NULL); #line 195 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = haystack; -#line 195 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = haystack; -#line 195 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = needle; -#line 195 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = start_index; -#line 195 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = string_index_of (_tmp1_, _tmp2_, _tmp3_); -#line 195 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = string_sliced_at (_tmp0_, _tmp4_); + _tmp0_ = string_sliced_at (haystack, string_index_of (haystack, needle, start_index)); #line 195 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp5_; + result = _tmp0_; #line 195 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1494 "string.c" +#line 1336 "string.c" } -static gint string_last_index_of (const gchar* self, const gchar* needle, gint start_index) { +static gint +string_last_index_of (const gchar* self, + const gchar* needle, + gint start_index) +{ gint result = 0; gchar* _result_ = NULL; - gint _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1021 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; + gchar* _tmp1_; +#line 1035 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1021 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1035 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, 0); -#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = start_index; -#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = needle; -#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = g_strrstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_); -#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _result_ = _tmp2_; -#line 1024 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = _result_; -#line 1024 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ != NULL) { -#line 1521 "string.c" - gchar* _tmp4_; -#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = _result_; -#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1036 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_strrstr (((gchar*) self) + start_index, (gchar*) needle); +#line 1036 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _result_ = _tmp0_; +#line 1038 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = _result_; +#line 1038 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ != NULL) { +#line 1361 "string.c" + gchar* _tmp2_; +#line 1039 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _result_; +#line 1039 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (gint) (_tmp2_ - ((gchar*) self)); +#line 1039 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1529 "string.c" +#line 1369 "string.c" } else { -#line 1027 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1041 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = -1; -#line 1027 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1041 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1535 "string.c" +#line 1375 "string.c" } } -inline gchar* string_sliced_at_last_str (const gchar* haystack, const gchar* needle, gint start_index) { +inline gchar* +string_sliced_at_last_str (const gchar* haystack, + const gchar* needle, + gint start_index) +{ gchar* result = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - gint _tmp3_; - gint _tmp4_; - gchar* _tmp5_; + gchar* _tmp0_; #line 198 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (haystack != NULL, NULL); #line 198 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (needle != NULL, NULL); #line 199 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = haystack; -#line 199 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = haystack; + _tmp0_ = string_sliced_at (haystack, string_last_index_of (haystack, needle, start_index)); #line 199 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = needle; -#line 199 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = start_index; -#line 199 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = string_last_index_of (_tmp1_, _tmp2_, _tmp3_); -#line 199 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = string_sliced_at (_tmp0_, _tmp4_); -#line 199 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp5_; + result = _tmp0_; #line 199 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1568 "string.c" +#line 1397 "string.c" } -inline gchar* string_sliced_at_first_char (const gchar* haystack, gunichar ch, gint start_index) { +inline gchar* +string_sliced_at_first_char (const gchar* haystack, + gunichar ch, + gint start_index) +{ gchar* result = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - gunichar _tmp2_; - gint _tmp3_; - gint _tmp4_; - gchar* _tmp5_; + gchar* _tmp0_; #line 202 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (haystack != NULL, NULL); #line 203 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = haystack; -#line 203 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = haystack; -#line 203 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = ch; + _tmp0_ = string_sliced_at (haystack, string_index_of_char (haystack, ch, start_index)); #line 203 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = start_index; -#line 203 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = string_index_of_char (_tmp1_, _tmp2_, _tmp3_); -#line 203 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = string_sliced_at (_tmp0_, _tmp4_); -#line 203 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp5_; + result = _tmp0_; #line 203 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1598 "string.c" +#line 1416 "string.c" } -static gint string_last_index_of_char (const gchar* self, gunichar c, gint start_index) { +static gint +string_last_index_of_char (const gchar* self, + gunichar c, + gint start_index) +{ gint result = 0; gchar* _result_ = NULL; - gint _tmp0_; - gunichar _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1041 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; + gchar* _tmp1_; +#line 1055 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = start_index; -#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = c; -#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_); -#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _result_ = _tmp2_; -#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = _result_; -#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ != NULL) { -#line 1623 "string.c" - gchar* _tmp4_; -#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = _result_; -#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1056 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_utf8_strrchr (((gchar*) self) + start_index, (gssize) -1, c); +#line 1056 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _result_ = _tmp0_; +#line 1058 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = _result_; +#line 1058 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ != NULL) { +#line 1439 "string.c" + gchar* _tmp2_; +#line 1059 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _result_; +#line 1059 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (gint) (_tmp2_ - ((gchar*) self)); +#line 1059 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1631 "string.c" +#line 1447 "string.c" } else { -#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = -1; -#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1637 "string.c" +#line 1453 "string.c" } } -inline gchar* string_sliced_at_last_char (const gchar* haystack, gunichar ch, gint start_index) { +inline gchar* +string_sliced_at_last_char (const gchar* haystack, + gunichar ch, + gint start_index) +{ gchar* result = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - gunichar _tmp2_; - gint _tmp3_; - gint _tmp4_; - gchar* _tmp5_; + gchar* _tmp0_; #line 206 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (haystack != NULL, NULL); #line 207 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = haystack; + _tmp0_ = string_sliced_at (haystack, string_last_index_of_char (haystack, ch, start_index)); #line 207 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = haystack; -#line 207 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = ch; -#line 207 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = start_index; -#line 207 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = string_last_index_of_char (_tmp1_, _tmp2_, _tmp3_); -#line 207 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = string_sliced_at (_tmp0_, _tmp4_); -#line 207 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp5_; + result = _tmp0_; #line 207 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1668 "string.c" +#line 1473 "string.c" } -static gunichar string_get_char (const gchar* self, glong index) { +static gunichar +string_get_char (const gchar* self, + glong index) +{ gunichar result = 0U; - glong _tmp0_; - gunichar _tmp1_; -#line 1140 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1154 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0U); -#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = index; -#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_); -#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_; -#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1155 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = g_utf8_get_char (((gchar*) self) + index); +#line 1155 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1686 "string.c" +#line 1488 "string.c" } -gchar* string_strip_leading_zeroes (const gchar* str) { +gchar* +string_strip_leading_zeroes (const gchar* str) +{ gchar* result = NULL; GString* stripped = NULL; GString* _tmp0_; gboolean prev_is_space = FALSE; - GString* _tmp16_; - const gchar* _tmp17_; - gchar* _tmp18_; + GString* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; #line 211 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (str != NULL, NULL); #line 212 "/home/jens/Source/shotwell/src/util/string.vala" @@ -1703,184 +1507,169 @@ gchar* string_strip_leading_zeroes (const gchar* str) { stripped = _tmp0_; #line 213 "/home/jens/Source/shotwell/src/util/string.vala" prev_is_space = TRUE; -#line 1706 "string.c" +#line 1510 "string.c" { const gchar* iter = NULL; - const gchar* _tmp1_; -#line 214 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = str; #line 214 "/home/jens/Source/shotwell/src/util/string.vala" - iter = _tmp1_; -#line 1714 "string.c" + iter = str; +#line 1515 "string.c" { - gboolean _tmp2_ = FALSE; + gboolean _tmp1_ = FALSE; #line 214 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = TRUE; + _tmp1_ = TRUE; #line 214 "/home/jens/Source/shotwell/src/util/string.vala" while (TRUE) { -#line 1721 "string.c" - const gchar* _tmp5_; - gunichar _tmp6_; +#line 1522 "string.c" + const gchar* _tmp4_; gunichar ch = 0U; - const gchar* _tmp7_; - gunichar _tmp8_; - gboolean _tmp9_ = FALSE; - gboolean _tmp10_; + const gchar* _tmp5_; + gboolean _tmp6_ = FALSE; + gboolean _tmp7_; #line 214 "/home/jens/Source/shotwell/src/util/string.vala" - if (!_tmp2_) { -#line 1731 "string.c" + if (!_tmp1_) { +#line 1530 "string.c" + const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; #line 214 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = iter; + _tmp2_ = iter; #line 214 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = g_utf8_next_char (_tmp3_); + _tmp3_ = g_utf8_next_char (_tmp2_); #line 214 "/home/jens/Source/shotwell/src/util/string.vala" - iter = _tmp4_; -#line 1740 "string.c" + iter = _tmp3_; +#line 1539 "string.c" } #line 214 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = FALSE; -#line 214 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = iter; + _tmp1_ = FALSE; #line 214 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp6_ = string_get_char (_tmp5_, (glong) 0); + _tmp4_ = iter; #line 214 "/home/jens/Source/shotwell/src/util/string.vala" - if (!(_tmp6_ != ((gunichar) 0))) { + if (!(string_get_char (_tmp4_, (glong) 0) != ((gunichar) 0))) { #line 214 "/home/jens/Source/shotwell/src/util/string.vala" break; -#line 1752 "string.c" +#line 1549 "string.c" } #line 215 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp7_ = iter; -#line 215 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp8_ = string_get_char (_tmp7_, (glong) 0); + _tmp5_ = iter; #line 215 "/home/jens/Source/shotwell/src/util/string.vala" - ch = _tmp8_; + ch = string_get_char (_tmp5_, (glong) 0); #line 217 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp10_ = prev_is_space; + _tmp7_ = prev_is_space; #line 217 "/home/jens/Source/shotwell/src/util/string.vala" - if (!_tmp10_) { + if (!_tmp7_) { #line 217 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp9_ = TRUE; -#line 1766 "string.c" + _tmp6_ = TRUE; +#line 1561 "string.c" } else { - gunichar _tmp11_; + gunichar _tmp8_; #line 217 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp11_ = ch; + _tmp8_ = ch; #line 217 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp9_ = _tmp11_ != ((gunichar) '0'); -#line 1773 "string.c" + _tmp6_ = _tmp8_ != ((gunichar) '0'); +#line 1568 "string.c" } #line 217 "/home/jens/Source/shotwell/src/util/string.vala" - if (_tmp9_) { -#line 1777 "string.c" - GString* _tmp12_; - gunichar _tmp13_; - gunichar _tmp14_; - gboolean _tmp15_; + if (_tmp6_) { +#line 1572 "string.c" + GString* _tmp9_; + gunichar _tmp10_; + gunichar _tmp11_; #line 218 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp12_ = stripped; + _tmp9_ = stripped; #line 218 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp13_ = ch; + _tmp10_ = ch; #line 218 "/home/jens/Source/shotwell/src/util/string.vala" - g_string_append_unichar (_tmp12_, _tmp13_); -#line 219 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp14_ = ch; + g_string_append_unichar (_tmp9_, _tmp10_); #line 219 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp15_ = g_unichar_isspace (_tmp14_); + _tmp11_ = ch; #line 219 "/home/jens/Source/shotwell/src/util/string.vala" - prev_is_space = _tmp15_; -#line 1794 "string.c" + prev_is_space = g_unichar_isspace (_tmp11_); +#line 1586 "string.c" } } } } #line 223 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp16_ = stripped; + _tmp12_ = stripped; #line 223 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp17_ = _tmp16_->str; + _tmp13_ = _tmp12_->str; #line 223 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp18_ = g_strdup (_tmp17_); + _tmp14_ = g_strdup (_tmp13_); #line 223 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp18_; + result = _tmp14_; #line 223 "/home/jens/Source/shotwell/src/util/string.vala" _g_string_free0 (stripped); #line 223 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1811 "string.c" +#line 1603 "string.c" } -static gboolean string_get_next_char (const gchar* self, gint* index, gunichar* c) { +static gboolean +string_get_next_char (const gchar* self, + gint* index, + gunichar* c) +{ gunichar _vala_c = 0U; gboolean result = FALSE; - gint _tmp0_; - gunichar _tmp1_; - gunichar _tmp2_; -#line 1129 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gunichar _tmp0_; +#line 1143 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1130 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = *index; -#line 1130 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_); -#line 1130 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _vala_c = _tmp1_; -#line 1131 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = _vala_c; -#line 1131 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp2_ != ((gunichar) 0)) { -#line 1833 "string.c" - gint _tmp3_; - gchar* _tmp4_; -#line 1132 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = *index; -#line 1132 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = g_utf8_next_char (((gchar*) self) + _tmp3_); -#line 1132 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - *index = (gint) (_tmp4_ - ((gchar*) self)); -#line 1133 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1144 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _vala_c = g_utf8_get_char (((gchar*) self) + (*index)); +#line 1145 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = _vala_c; +#line 1145 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp0_ != ((gunichar) 0)) { +#line 1623 "string.c" + gchar* _tmp1_; +#line 1146 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = g_utf8_next_char (((gchar*) self) + (*index)); +#line 1146 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + *index = (gint) (_tmp1_ - ((gchar*) self)); +#line 1147 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = TRUE; -#line 1133 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1147 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (c) { -#line 1133 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1147 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" *c = _vala_c; -#line 1848 "string.c" +#line 1635 "string.c" } -#line 1133 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1147 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1852 "string.c" +#line 1639 "string.c" } else { -#line 1135 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1149 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = FALSE; -#line 1135 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1149 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (c) { -#line 1135 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1149 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" *c = _vala_c; -#line 1860 "string.c" +#line 1647 "string.c" } -#line 1135 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1149 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1864 "string.c" +#line 1651 "string.c" } -#line 1129 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1143 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (c) { -#line 1129 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1143 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" *c = _vala_c; -#line 1870 "string.c" +#line 1657 "string.c" } } -gchar* string_remove_diacritics (const gchar* istring) { +gchar* +string_remove_diacritics (const gchar* istring) +{ gchar* result = NULL; GString* builder = NULL; GString* _tmp0_; gunichar ch = 0U; gint i = 0; - GString* _tmp11_; - const gchar* _tmp12_; - gchar* _tmp13_; + GString* _tmp9_; + const gchar* _tmp10_; + gchar* _tmp11_; #line 226 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (istring != NULL, NULL); #line 227 "/home/jens/Source/shotwell/src/util/string.vala" @@ -1891,43 +1680,37 @@ gchar* string_remove_diacritics (const gchar* istring) { i = 0; #line 230 "/home/jens/Source/shotwell/src/util/string.vala" while (TRUE) { -#line 1894 "string.c" - const gchar* _tmp1_; +#line 1683 "string.c" + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; - gunichar _tmp4_ = 0U; + gunichar _tmp3_ = 0U; + gboolean _tmp4_; gboolean _tmp5_; - gboolean _tmp6_; - gunichar _tmp7_; - GUnicodeType _tmp8_; - GString* _tmp9_; - gunichar _tmp10_; -#line 230 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = istring; + gunichar _tmp6_; + GString* _tmp7_; + gunichar _tmp8_; #line 230 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = g_utf8_normalize (_tmp1_, (gssize) -1, G_NORMALIZE_DEFAULT); + _tmp1_ = g_utf8_normalize (istring, (gssize) -1, G_NORMALIZE_DEFAULT); #line 230 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 230 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = string_get_next_char (_tmp3_, &i, &_tmp4_); + _tmp4_ = string_get_next_char (_tmp2_, &i, &_tmp3_); #line 230 "/home/jens/Source/shotwell/src/util/string.vala" - ch = _tmp4_; + ch = _tmp3_; #line 230 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp6_ = !_tmp5_; + _tmp5_ = !_tmp4_; #line 230 "/home/jens/Source/shotwell/src/util/string.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 230 "/home/jens/Source/shotwell/src/util/string.vala" - if (_tmp6_) { + if (_tmp5_) { #line 230 "/home/jens/Source/shotwell/src/util/string.vala" break; -#line 1923 "string.c" +#line 1708 "string.c" } #line 231 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp7_ = ch; -#line 231 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp8_ = g_unichar_type (_tmp7_); + _tmp6_ = ch; #line 231 "/home/jens/Source/shotwell/src/util/string.vala" - switch (_tmp8_) { + switch (g_unichar_type (_tmp6_)) { #line 231 "/home/jens/Source/shotwell/src/util/string.vala" case G_UNICODE_CONTROL: #line 231 "/home/jens/Source/shotwell/src/util/string.vala" @@ -1940,50 +1723,51 @@ gchar* string_remove_diacritics (const gchar* istring) { case G_UNICODE_COMBINING_MARK: #line 231 "/home/jens/Source/shotwell/src/util/string.vala" case G_UNICODE_ENCLOSING_MARK: -#line 1943 "string.c" +#line 1726 "string.c" { #line 239 "/home/jens/Source/shotwell/src/util/string.vala" continue; -#line 1947 "string.c" +#line 1730 "string.c" } default: #line 231 "/home/jens/Source/shotwell/src/util/string.vala" break; -#line 1952 "string.c" +#line 1735 "string.c" } #line 241 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp9_ = builder; + _tmp7_ = builder; #line 241 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp10_ = ch; + _tmp8_ = ch; #line 241 "/home/jens/Source/shotwell/src/util/string.vala" - g_string_append_unichar (_tmp9_, _tmp10_); -#line 1960 "string.c" + g_string_append_unichar (_tmp7_, _tmp8_); +#line 1743 "string.c" } #line 243 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp11_ = builder; + _tmp9_ = builder; #line 243 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp12_ = _tmp11_->str; + _tmp10_ = _tmp9_->str; #line 243 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp13_ = g_strdup (_tmp12_); + _tmp11_ = g_strdup (_tmp10_); #line 243 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp13_; + result = _tmp11_; #line 243 "/home/jens/Source/shotwell/src/util/string.vala" _g_string_free0 (builder); #line 243 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1974 "string.c" +#line 1757 "string.c" } -gchar* string_to_hex_string (const gchar* str) { +gchar* +string_to_hex_string (const gchar* str) +{ gchar* result = NULL; GString* builder = NULL; GString* _tmp0_; guint8* data = NULL; - const gchar* _tmp1_; - GString* _tmp7_; - const gchar* _tmp8_; - gchar* _tmp9_; + GString* _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_; #line 246 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (str != NULL, NULL); #line 247 "/home/jens/Source/shotwell/src/util/string.vala" @@ -1991,203 +1775,186 @@ gchar* string_to_hex_string (const gchar* str) { #line 247 "/home/jens/Source/shotwell/src/util/string.vala" builder = _tmp0_; #line 249 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = str; -#line 249 "/home/jens/Source/shotwell/src/util/string.vala" - data = (guint8*) _tmp1_; + data = (guint8*) str; #line 250 "/home/jens/Source/shotwell/src/util/string.vala" while (TRUE) { -#line 1999 "string.c" - guint8* _tmp2_; - const gchar* _tmp3_ = NULL; - guint8* _tmp4_; - GString* _tmp5_; - guint8* _tmp6_; +#line 1781 "string.c" + guint8* _tmp1_; + const gchar* _tmp2_ = NULL; + guint8* _tmp3_; + GString* _tmp4_; + guint8* _tmp5_; #line 250 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = data; + _tmp1_ = data; #line 250 "/home/jens/Source/shotwell/src/util/string.vala" - if (!(((gint) (*_tmp2_)) != 0)) { + if (!(((gint) (*_tmp1_)) != 0)) { #line 250 "/home/jens/Source/shotwell/src/util/string.vala" break; -#line 2011 "string.c" +#line 1793 "string.c" } #line 251 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = data; + _tmp3_ = data; #line 251 "/home/jens/Source/shotwell/src/util/string.vala" - if (((gint) (*_tmp4_)) != 0) { + if (((gint) (*_tmp3_)) != 0) { #line 251 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = " "; -#line 2019 "string.c" + _tmp2_ = " "; +#line 1801 "string.c" } else { #line 251 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = ""; -#line 2023 "string.c" + _tmp2_ = ""; +#line 1805 "string.c" } #line 251 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = builder; + _tmp4_ = builder; #line 251 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp6_ = data; + _tmp5_ = data; #line 251 "/home/jens/Source/shotwell/src/util/string.vala" - data = _tmp6_ + 1; + data = _tmp5_ + 1; #line 251 "/home/jens/Source/shotwell/src/util/string.vala" - g_string_append_printf (_tmp5_, "%02Xh%s", (guint) (*_tmp6_), _tmp3_); -#line 2033 "string.c" + g_string_append_printf (_tmp4_, "%02Xh%s", (guint) (*_tmp5_), _tmp2_); +#line 1815 "string.c" } #line 253 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp7_ = builder; + _tmp6_ = builder; #line 253 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp8_ = _tmp7_->str; + _tmp7_ = _tmp6_->str; #line 253 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp9_ = g_strdup (_tmp8_); + _tmp8_ = g_strdup (_tmp7_); #line 253 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp9_; + result = _tmp8_; #line 253 "/home/jens/Source/shotwell/src/util/string.vala" _g_string_free0 (builder); #line 253 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 2047 "string.c" +#line 1829 "string.c" } -guint string_collated_hash (void* ptr) { +guint +string_collated_hash (void* ptr) +{ guint result = 0U; gchar* str = NULL; - void* _tmp0_; - gchar* _tmp1_; - GHashFunc _tmp2_; + gchar* _tmp0_; + GHashFunc _tmp1_; + gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - guint _tmp5_; - guint _tmp6_; -#line 273 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = ptr; + guint _tmp4_; #line 273 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = g_strdup ((const gchar*) _tmp0_); + _tmp0_ = g_strdup ((const gchar*) ptr); #line 273 "/home/jens/Source/shotwell/src/util/string.vala" - str = _tmp1_; + str = _tmp0_; #line 275 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = g_str_hash; + _tmp1_ = g_str_hash; #line 275 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = g_utf8_collate_key (str, (gssize) -1); + _tmp2_ = g_utf8_collate_key (str, (gssize) -1); #line 275 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 275 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = _tmp2_ (_tmp4_); + _tmp4_ = _tmp1_ (_tmp3_); #line 275 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp6_ = _tmp5_; + _g_free0 (_tmp3_); #line 275 "/home/jens/Source/shotwell/src/util/string.vala" - _g_free0 (_tmp4_); -#line 275 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp6_; + result = _tmp4_; #line 275 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (str); #line 275 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 2085 "string.c" +#line 1863 "string.c" } -guint string_precollated_hash (void* ptr) { +guint +string_precollated_hash (void* ptr) +{ guint result = 0U; GHashFunc _tmp0_; - void* _tmp1_; - guint _tmp2_; #line 280 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = g_str_hash; #line 280 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = ptr; -#line 280 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = _tmp0_ ((const gchar*) _tmp1_); -#line 280 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp2_; + result = _tmp0_ ((const gchar*) ptr); #line 280 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 2104 "string.c" +#line 1878 "string.c" } -gint string_collated_compare (void* a, void* b) { +gint +string_collated_compare (void* a, + void* b) +{ gint result = 0; gchar* astr = NULL; - void* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; gchar* bstr = NULL; - void* _tmp2_; - gchar* _tmp3_; + gchar* _tmp1_; gint _result_ = 0; - const gchar* _tmp4_; - const gchar* _tmp5_; - gint _tmp6_; - gint _tmp7_ = 0; - gint _tmp8_; -#line 285 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = a; + const gchar* _tmp2_; + const gchar* _tmp3_; + gint _tmp4_ = 0; + gint _tmp5_; #line 285 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = g_strdup ((const gchar*) _tmp0_); + _tmp0_ = g_strdup ((const gchar*) a); #line 285 "/home/jens/Source/shotwell/src/util/string.vala" - astr = _tmp1_; + astr = _tmp0_; #line 286 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = b; + _tmp1_ = g_strdup ((const gchar*) b); #line 286 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = g_strdup ((const gchar*) _tmp2_); -#line 286 "/home/jens/Source/shotwell/src/util/string.vala" - bstr = _tmp3_; -#line 288 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = astr; + bstr = _tmp1_; #line 288 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = bstr; + _tmp2_ = astr; #line 288 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp6_ = g_utf8_collate (_tmp4_, _tmp5_); + _tmp3_ = bstr; #line 288 "/home/jens/Source/shotwell/src/util/string.vala" - _result_ = _tmp6_; + _result_ = g_utf8_collate (_tmp2_, _tmp3_); #line 290 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp8_ = _result_; + _tmp5_ = _result_; #line 290 "/home/jens/Source/shotwell/src/util/string.vala" - if (_tmp8_ != 0) { -#line 2146 "string.c" - gint _tmp9_; + if (_tmp5_ != 0) { +#line 1914 "string.c" + gint _tmp6_; #line 290 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp9_ = _result_; + _tmp6_ = _result_; #line 290 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp7_ = _tmp9_; -#line 2152 "string.c" + _tmp4_ = _tmp6_; +#line 1920 "string.c" } else { - GCompareFunc _tmp10_; - const gchar* _tmp11_; - const gchar* _tmp12_; - gint _tmp13_; -#line 290 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp10_ = g_strcmp0; + GCompareFunc _tmp7_; + const gchar* _tmp8_; + const gchar* _tmp9_; #line 290 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp11_ = astr; + _tmp7_ = g_strcmp0; #line 290 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp12_ = bstr; + _tmp8_ = astr; #line 290 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp13_ = _tmp10_ (_tmp11_, _tmp12_); + _tmp9_ = bstr; #line 290 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp7_ = _tmp13_; -#line 2168 "string.c" + _tmp4_ = _tmp7_ (_tmp8_, _tmp9_); +#line 1933 "string.c" } #line 290 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp7_; + result = _tmp4_; #line 290 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (bstr); #line 290 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (astr); #line 290 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 2178 "string.c" +#line 1943 "string.c" } -gint string_precollated_compare (const gchar* astr, const gchar* akey, const gchar* bstr, const gchar* bkey) { +gint +string_precollated_compare (const gchar* astr, + const gchar* akey, + const gchar* bstr, + const gchar* bkey) +{ gint result = 0; gint _result_ = 0; GCompareFunc _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - gint _tmp3_; - gint _tmp4_ = 0; - gint _tmp5_; + gint _tmp1_ = 0; + gint _tmp2_; #line 294 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (astr != NULL, 0); #line 294 "/home/jens/Source/shotwell/src/util/string.vala" @@ -2199,75 +1966,54 @@ gint string_precollated_compare (const gchar* astr, const gchar* akey, const gch #line 295 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = g_strcmp0; #line 295 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = akey; -#line 295 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = bkey; -#line 295 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = _tmp0_ (_tmp1_, _tmp2_); -#line 295 "/home/jens/Source/shotwell/src/util/string.vala" - _result_ = _tmp3_; + _result_ = _tmp0_ (akey, bkey); #line 297 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = _result_; + _tmp2_ = _result_; #line 297 "/home/jens/Source/shotwell/src/util/string.vala" - if (_tmp5_ != 0) { -#line 2213 "string.c" - gint _tmp6_; + if (_tmp2_ != 0) { +#line 1974 "string.c" + gint _tmp3_; #line 297 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp6_ = _result_; + _tmp3_ = _result_; #line 297 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = _tmp6_; -#line 2219 "string.c" + _tmp1_ = _tmp3_; +#line 1980 "string.c" } else { - GCompareFunc _tmp7_; - const gchar* _tmp8_; - const gchar* _tmp9_; - gint _tmp10_; -#line 297 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp7_ = g_strcmp0; + GCompareFunc _tmp4_; #line 297 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp8_ = astr; -#line 297 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp9_ = bstr; + _tmp4_ = g_strcmp0; #line 297 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp10_ = _tmp7_ (_tmp8_, _tmp9_); -#line 297 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = _tmp10_; -#line 2235 "string.c" + _tmp1_ = _tmp4_ (astr, bstr); +#line 1987 "string.c" } #line 297 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp4_; + result = _tmp1_; #line 297 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 2241 "string.c" +#line 1993 "string.c" } -gboolean string_collated_equals (void* a, void* b) { +gboolean +string_collated_equals (void* a, + void* b) +{ gboolean result = FALSE; - void* _tmp0_; - void* _tmp1_; - gint _tmp2_; -#line 302 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = a; #line 302 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = b; -#line 302 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = string_collated_compare (_tmp0_, _tmp1_); -#line 302 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp2_ == 0; + result = string_collated_compare (a, b) == 0; #line 302 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 2260 "string.c" +#line 2006 "string.c" } -gboolean string_precollated_equals (const gchar* astr, const gchar* akey, const gchar* bstr, const gchar* bkey) { +gboolean +string_precollated_equals (const gchar* astr, + const gchar* akey, + const gchar* bstr, + const gchar* bkey) +{ gboolean result = FALSE; - const gchar* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - gint _tmp4_; #line 306 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (astr != NULL, FALSE); #line 306 "/home/jens/Source/shotwell/src/util/string.vala" @@ -2277,20 +2023,10 @@ gboolean string_precollated_equals (const gchar* astr, const gchar* akey, const #line 306 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (bkey != NULL, FALSE); #line 307 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp0_ = astr; -#line 307 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = akey; -#line 307 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = bstr; -#line 307 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = bkey; -#line 307 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = string_precollated_compare (_tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 307 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp4_ == 0; + result = string_precollated_compare (astr, akey, bstr, bkey) == 0; #line 307 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 2293 "string.c" +#line 2029 "string.c" } diff --git a/src/util/system.c b/src/util/system.c index 3075260..958256c 100644 --- a/src/util/system.c +++ b/src/util/system.c @@ -1,4 +1,4 @@ -/* system.c generated by valac 0.36.6, the Vala compiler +/* system.c generated by valac 0.40.4, the Vala compiler * generated from system.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -8,6 +8,7 @@ */ /* Return the directory in which Shotwell is installed, or null if uninstalled.*/ + #include #include #include @@ -25,77 +26,73 @@ GFile* get_sys_install_dir (GFile* exec_dir); #define RESOURCES_PREFIX _PREFIX gchar* get_nautilus_install_location (void); -void sys_show_uri (GdkScreen* screen, const gchar* uri, GError** error); -void show_file_in_nautilus (const gchar* filename, GError** error); +void sys_show_uri (GdkScreen* screen, + const gchar* uri, + GError** error); +void show_file_in_nautilus (const gchar* filename, + GError** error); -GFile* get_sys_install_dir (GFile* exec_dir) { +GFile* +get_sys_install_dir (GFile* exec_dir) +{ GFile* result = NULL; GFile* child = NULL; GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; + gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; + gboolean _tmp4_; #line 8 "/home/jens/Source/shotwell/src/util/system.vala" g_return_val_if_fail (G_IS_FILE (exec_dir), NULL); #line 10 "/home/jens/Source/shotwell/src/util/system.vala" - _tmp0_ = exec_dir; + _tmp0_ = g_file_get_child (exec_dir, "ui"); #line 10 "/home/jens/Source/shotwell/src/util/system.vala" - _tmp1_ = g_file_get_child (_tmp0_, "ui"); -#line 10 "/home/jens/Source/shotwell/src/util/system.vala" - child = _tmp1_; -#line 12 "/home/jens/Source/shotwell/src/util/system.vala" - _tmp2_ = child; + child = _tmp0_; #line 12 "/home/jens/Source/shotwell/src/util/system.vala" - _tmp3_ = g_file_get_path (_tmp2_); + _tmp1_ = child; #line 12 "/home/jens/Source/shotwell/src/util/system.vala" - _tmp4_ = _tmp3_; + _tmp2_ = g_file_get_path (_tmp1_); #line 12 "/home/jens/Source/shotwell/src/util/system.vala" - _tmp5_ = g_file_test (_tmp4_, G_FILE_TEST_IS_DIR | G_FILE_TEST_EXISTS); + _tmp3_ = _tmp2_; #line 12 "/home/jens/Source/shotwell/src/util/system.vala" - _tmp6_ = !_tmp5_; + _tmp4_ = !g_file_test (_tmp3_, G_FILE_TEST_IS_DIR | G_FILE_TEST_EXISTS); #line 12 "/home/jens/Source/shotwell/src/util/system.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 12 "/home/jens/Source/shotwell/src/util/system.vala" - if (_tmp6_) { + if (_tmp4_) { #line 65 "system.c" - GFile* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - gboolean _tmp10_; - GFile* _tmp11_; -#line 14 "/home/jens/Source/shotwell/src/util/system.vala" - _tmp7_ = exec_dir; + gchar* _tmp5_; + gchar* _tmp6_; + gboolean _tmp7_; + GFile* _tmp8_; #line 14 "/home/jens/Source/shotwell/src/util/system.vala" - _tmp8_ = g_file_get_basename (_tmp7_); + _tmp5_ = g_file_get_basename (exec_dir); #line 14 "/home/jens/Source/shotwell/src/util/system.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 14 "/home/jens/Source/shotwell/src/util/system.vala" - _tmp10_ = g_strcmp0 (_tmp9_, "src") == 0; + _tmp7_ = g_strcmp0 (_tmp6_, "src") == 0; #line 14 "/home/jens/Source/shotwell/src/util/system.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp6_); #line 14 "/home/jens/Source/shotwell/src/util/system.vala" - if (_tmp10_) { + if (_tmp7_) { #line 15 "/home/jens/Source/shotwell/src/util/system.vala" result = NULL; #line 15 "/home/jens/Source/shotwell/src/util/system.vala" _g_object_unref0 (child); #line 15 "/home/jens/Source/shotwell/src/util/system.vala" return result; -#line 89 "system.c" +#line 86 "system.c" } #line 18 "/home/jens/Source/shotwell/src/util/system.vala" - _tmp11_ = g_file_new_for_path (RESOURCES_PREFIX); + _tmp8_ = g_file_new_for_path (RESOURCES_PREFIX); #line 18 "/home/jens/Source/shotwell/src/util/system.vala" - result = _tmp11_; + result = _tmp8_; #line 18 "/home/jens/Source/shotwell/src/util/system.vala" _g_object_unref0 (child); #line 18 "/home/jens/Source/shotwell/src/util/system.vala" return result; -#line 99 "system.c" +#line 96 "system.c" } #line 21 "/home/jens/Source/shotwell/src/util/system.vala" result = NULL; @@ -103,11 +100,13 @@ GFile* get_sys_install_dir (GFile* exec_dir) { _g_object_unref0 (child); #line 21 "/home/jens/Source/shotwell/src/util/system.vala" return result; -#line 107 "system.c" +#line 104 "system.c" } -gchar* get_nautilus_install_location (void) { +gchar* +get_nautilus_install_location (void) +{ gchar* result = NULL; gchar* _tmp0_; #line 25 "/home/jens/Source/shotwell/src/util/system.vala" @@ -116,43 +115,43 @@ gchar* get_nautilus_install_location (void) { result = _tmp0_; #line 25 "/home/jens/Source/shotwell/src/util/system.vala" return result; -#line 120 "system.c" +#line 119 "system.c" } -void sys_show_uri (GdkScreen* screen, const gchar* uri, GError** error) { - GdkScreen* _tmp0_; - const gchar* _tmp1_; +void +sys_show_uri (GdkScreen* screen, + const gchar* uri, + GError** error) +{ GError * _inner_error_ = NULL; #line 28 "/home/jens/Source/shotwell/src/util/system.vala" g_return_if_fail (GDK_IS_SCREEN (screen)); #line 28 "/home/jens/Source/shotwell/src/util/system.vala" g_return_if_fail (uri != NULL); #line 29 "/home/jens/Source/shotwell/src/util/system.vala" - _tmp0_ = screen; -#line 29 "/home/jens/Source/shotwell/src/util/system.vala" - _tmp1_ = uri; -#line 29 "/home/jens/Source/shotwell/src/util/system.vala" - gtk_show_uri (_tmp0_, _tmp1_, (guint32) GDK_CURRENT_TIME, &_inner_error_); + gtk_show_uri (screen, uri, (guint32) GDK_CURRENT_TIME, &_inner_error_); #line 29 "/home/jens/Source/shotwell/src/util/system.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 29 "/home/jens/Source/shotwell/src/util/system.vala" g_propagate_error (error, _inner_error_); #line 29 "/home/jens/Source/shotwell/src/util/system.vala" return; -#line 144 "system.c" +#line 141 "system.c" } } -void show_file_in_nautilus (const gchar* filename, GError** error) { +void +show_file_in_nautilus (const gchar* filename, + GError** error) +{ gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; GError * _inner_error_ = NULL; #line 32 "/home/jens/Source/shotwell/src/util/system.vala" g_return_if_fail (filename != NULL); @@ -165,15 +164,13 @@ void show_file_in_nautilus (const gchar* filename, GError** error) { #line 33 "/home/jens/Source/shotwell/src/util/system.vala" _tmp3_ = _tmp2_; #line 33 "/home/jens/Source/shotwell/src/util/system.vala" - _tmp4_ = filename; -#line 33 "/home/jens/Source/shotwell/src/util/system.vala" - _tmp5_ = g_strconcat (_tmp3_, _tmp4_, NULL); + _tmp4_ = g_strconcat (_tmp3_, filename, NULL); #line 33 "/home/jens/Source/shotwell/src/util/system.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 33 "/home/jens/Source/shotwell/src/util/system.vala" - g_spawn_command_line_async (_tmp6_, &_inner_error_); + g_spawn_command_line_async (_tmp5_, &_inner_error_); #line 33 "/home/jens/Source/shotwell/src/util/system.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 33 "/home/jens/Source/shotwell/src/util/system.vala" _g_free0 (_tmp3_); #line 33 "/home/jens/Source/shotwell/src/util/system.vala" @@ -184,7 +181,7 @@ void show_file_in_nautilus (const gchar* filename, GError** error) { g_propagate_error (error, _inner_error_); #line 33 "/home/jens/Source/shotwell/src/util/system.vala" return; -#line 188 "system.c" +#line 185 "system.c" } } diff --git a/src/util/ui.c b/src/util/ui.c index 8a7e0d7..98f35de 100644 --- a/src/util/ui.c +++ b/src/util/ui.c @@ -1,4 +1,4 @@ -/* ui.c generated by valac 0.36.6, the Vala compiler +/* ui.c generated by valac 0.40.4, the Vala compiler * generated from ui.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include "shotwell-plugin-dev-1.0.h" @@ -48,12 +49,18 @@ GType direction_get_type (void) G_GNUC_CONST; SpitTransitionsDirection direction_to_transition_direction (Direction self); const gchar* direction_to_string (Direction self); void spin_event_loop (void); -AdjustmentRelation get_adjustment_relation (GtkAdjustment* adjustment, gint value); -void get_adjustment_page (GtkAdjustment* hadj, GtkAdjustment* vadj, GdkRectangle* result); -gboolean has_only_key_modifier (GdkModifierType field, GdkModifierType mask); - - -GType adjustment_relation_get_type (void) { +AdjustmentRelation get_adjustment_relation (GtkAdjustment* adjustment, + gint value); +void get_adjustment_page (GtkAdjustment* hadj, + GtkAdjustment* vadj, + GdkRectangle* result); +gboolean has_only_key_modifier (GdkModifierType field, + GdkModifierType mask); + + +GType +adjustment_relation_get_type (void) +{ static volatile gsize adjustment_relation_type_id__volatile = 0; if (g_once_init_enter (&adjustment_relation_type_id__volatile)) { static const GEnumValue values[] = {{ADJUSTMENT_RELATION_BELOW, "ADJUSTMENT_RELATION_BELOW", "below"}, {ADJUSTMENT_RELATION_IN_RANGE, "ADJUSTMENT_RELATION_IN_RANGE", "in-range"}, {ADJUSTMENT_RELATION_ABOVE, "ADJUSTMENT_RELATION_ABOVE", "above"}, {0, NULL, NULL}}; @@ -65,7 +72,9 @@ GType adjustment_relation_get_type (void) { } -GType compass_point_get_type (void) { +GType +compass_point_get_type (void) +{ static volatile gsize compass_point_type_id__volatile = 0; if (g_once_init_enter (&compass_point_type_id__volatile)) { static const GEnumValue values[] = {{COMPASS_POINT_NORTH, "COMPASS_POINT_NORTH", "north"}, {COMPASS_POINT_SOUTH, "COMPASS_POINT_SOUTH", "south"}, {COMPASS_POINT_EAST, "COMPASS_POINT_EAST", "east"}, {COMPASS_POINT_WEST, "COMPASS_POINT_WEST", "west"}, {0, NULL, NULL}}; @@ -77,29 +86,31 @@ GType compass_point_get_type (void) { } -SpitTransitionsDirection direction_to_transition_direction (Direction self) { +SpitTransitionsDirection +direction_to_transition_direction (Direction self) +{ SpitTransitionsDirection result = 0; #line 25 "/home/jens/Source/shotwell/src/util/ui.vala" switch (self) { #line 25 "/home/jens/Source/shotwell/src/util/ui.vala" case DIRECTION_FORWARD: -#line 87 "ui.c" +#line 98 "ui.c" { #line 27 "/home/jens/Source/shotwell/src/util/ui.vala" result = SPIT_TRANSITIONS_DIRECTION_FORWARD; #line 27 "/home/jens/Source/shotwell/src/util/ui.vala" return result; -#line 93 "ui.c" +#line 104 "ui.c" } #line 25 "/home/jens/Source/shotwell/src/util/ui.vala" case DIRECTION_BACKWARD: -#line 97 "ui.c" +#line 108 "ui.c" { #line 30 "/home/jens/Source/shotwell/src/util/ui.vala" result = SPIT_TRANSITIONS_DIRECTION_BACKWARD; #line 30 "/home/jens/Source/shotwell/src/util/ui.vala" return result; -#line 103 "ui.c" +#line 114 "ui.c" } default: { @@ -108,13 +119,15 @@ SpitTransitionsDirection direction_to_transition_direction (Direction self) { _tmp0_ = g_enum_get_value (g_type_class_ref (TYPE_DIRECTION), self); #line 33 "/home/jens/Source/shotwell/src/util/ui.vala" g_error ("ui.vala:33: Unknown Direction %s", (_tmp0_ != NULL) ? _tmp0_->value_name : NULL); -#line 112 "ui.c" +#line 123 "ui.c" } } } -GType direction_get_type (void) { +GType +direction_get_type (void) +{ static volatile gsize direction_type_id__volatile = 0; if (g_once_init_enter (&direction_type_id__volatile)) { static const GEnumValue values[] = {{DIRECTION_FORWARD, "DIRECTION_FORWARD", "forward"}, {DIRECTION_BACKWARD, "DIRECTION_BACKWARD", "backward"}, {0, NULL, NULL}}; @@ -126,90 +139,63 @@ GType direction_get_type (void) { } -void spin_event_loop (void) { +void +spin_event_loop (void) +{ #line 39 "/home/jens/Source/shotwell/src/util/ui.vala" while (TRUE) { -#line 133 "ui.c" - gboolean _tmp0_; #line 39 "/home/jens/Source/shotwell/src/util/ui.vala" - _tmp0_ = gtk_events_pending (); -#line 39 "/home/jens/Source/shotwell/src/util/ui.vala" - if (!_tmp0_) { + if (!gtk_events_pending ()) { #line 39 "/home/jens/Source/shotwell/src/util/ui.vala" break; -#line 141 "ui.c" +#line 152 "ui.c" } #line 40 "/home/jens/Source/shotwell/src/util/ui.vala" gtk_main_iteration (); -#line 145 "ui.c" +#line 156 "ui.c" } } -AdjustmentRelation get_adjustment_relation (GtkAdjustment* adjustment, gint value) { +AdjustmentRelation +get_adjustment_relation (GtkAdjustment* adjustment, + gint value) +{ AdjustmentRelation result = 0; - gint _tmp0_; - GtkAdjustment* _tmp1_; - gdouble _tmp2_; #line 43 "/home/jens/Source/shotwell/src/util/ui.vala" g_return_val_if_fail (GTK_IS_ADJUSTMENT (adjustment), 0); #line 44 "/home/jens/Source/shotwell/src/util/ui.vala" - _tmp0_ = value; -#line 44 "/home/jens/Source/shotwell/src/util/ui.vala" - _tmp1_ = adjustment; -#line 44 "/home/jens/Source/shotwell/src/util/ui.vala" - _tmp2_ = gtk_adjustment_get_value (_tmp1_); -#line 44 "/home/jens/Source/shotwell/src/util/ui.vala" - if (_tmp0_ < ((gint) _tmp2_)) { + if (value < ((gint) gtk_adjustment_get_value (adjustment))) { #line 45 "/home/jens/Source/shotwell/src/util/ui.vala" result = ADJUSTMENT_RELATION_BELOW; #line 45 "/home/jens/Source/shotwell/src/util/ui.vala" return result; -#line 169 "ui.c" +#line 174 "ui.c" } else { - gint _tmp3_; - GtkAdjustment* _tmp4_; - gdouble _tmp5_; - GtkAdjustment* _tmp6_; - gdouble _tmp7_; -#line 46 "/home/jens/Source/shotwell/src/util/ui.vala" - _tmp3_ = value; -#line 46 "/home/jens/Source/shotwell/src/util/ui.vala" - _tmp4_ = adjustment; -#line 46 "/home/jens/Source/shotwell/src/util/ui.vala" - _tmp5_ = gtk_adjustment_get_value (_tmp4_); -#line 46 "/home/jens/Source/shotwell/src/util/ui.vala" - _tmp6_ = adjustment; #line 46 "/home/jens/Source/shotwell/src/util/ui.vala" - _tmp7_ = gtk_adjustment_get_page_size (_tmp6_); -#line 46 "/home/jens/Source/shotwell/src/util/ui.vala" - if (_tmp3_ > ((gint) (_tmp5_ + _tmp7_))) { + if (value > ((gint) (gtk_adjustment_get_value (adjustment) + gtk_adjustment_get_page_size (adjustment)))) { #line 47 "/home/jens/Source/shotwell/src/util/ui.vala" result = ADJUSTMENT_RELATION_ABOVE; #line 47 "/home/jens/Source/shotwell/src/util/ui.vala" return result; -#line 192 "ui.c" +#line 182 "ui.c" } else { #line 49 "/home/jens/Source/shotwell/src/util/ui.vala" result = ADJUSTMENT_RELATION_IN_RANGE; #line 49 "/home/jens/Source/shotwell/src/util/ui.vala" return result; -#line 198 "ui.c" +#line 188 "ui.c" } } } -void get_adjustment_page (GtkAdjustment* hadj, GtkAdjustment* vadj, GdkRectangle* result) { +void +get_adjustment_page (GtkAdjustment* hadj, + GtkAdjustment* vadj, + GdkRectangle* result) +{ GdkRectangle rect = {0}; - GtkAdjustment* _tmp0_; - gdouble _tmp1_; - GtkAdjustment* _tmp2_; - gdouble _tmp3_; - GtkAdjustment* _tmp4_; - gdouble _tmp5_; - GtkAdjustment* _tmp6_; - gdouble _tmp7_; #line 52 "/home/jens/Source/shotwell/src/util/ui.vala" g_return_if_fail (GTK_IS_ADJUSTMENT (hadj)); #line 52 "/home/jens/Source/shotwell/src/util/ui.vala" @@ -217,50 +203,31 @@ void get_adjustment_page (GtkAdjustment* hadj, GtkAdjustment* vadj, GdkRectangle #line 53 "/home/jens/Source/shotwell/src/util/ui.vala" memset (&rect, 0, sizeof (GdkRectangle)); #line 54 "/home/jens/Source/shotwell/src/util/ui.vala" - _tmp0_ = hadj; -#line 54 "/home/jens/Source/shotwell/src/util/ui.vala" - _tmp1_ = gtk_adjustment_get_value (_tmp0_); -#line 54 "/home/jens/Source/shotwell/src/util/ui.vala" - rect.x = (gint) _tmp1_; + rect.x = (gint) gtk_adjustment_get_value (hadj); #line 55 "/home/jens/Source/shotwell/src/util/ui.vala" - _tmp2_ = vadj; -#line 55 "/home/jens/Source/shotwell/src/util/ui.vala" - _tmp3_ = gtk_adjustment_get_value (_tmp2_); -#line 55 "/home/jens/Source/shotwell/src/util/ui.vala" - rect.y = (gint) _tmp3_; -#line 56 "/home/jens/Source/shotwell/src/util/ui.vala" - _tmp4_ = hadj; + rect.y = (gint) gtk_adjustment_get_value (vadj); #line 56 "/home/jens/Source/shotwell/src/util/ui.vala" - _tmp5_ = gtk_adjustment_get_page_size (_tmp4_); -#line 56 "/home/jens/Source/shotwell/src/util/ui.vala" - rect.width = (gint) _tmp5_; -#line 57 "/home/jens/Source/shotwell/src/util/ui.vala" - _tmp6_ = vadj; -#line 57 "/home/jens/Source/shotwell/src/util/ui.vala" - _tmp7_ = gtk_adjustment_get_page_size (_tmp6_); + rect.width = (gint) gtk_adjustment_get_page_size (hadj); #line 57 "/home/jens/Source/shotwell/src/util/ui.vala" - rect.height = (gint) _tmp7_; + rect.height = (gint) gtk_adjustment_get_page_size (vadj); #line 59 "/home/jens/Source/shotwell/src/util/ui.vala" *result = rect; #line 59 "/home/jens/Source/shotwell/src/util/ui.vala" return; -#line 248 "ui.c" +#line 218 "ui.c" } -gboolean has_only_key_modifier (GdkModifierType field, GdkModifierType mask) { +gboolean +has_only_key_modifier (GdkModifierType field, + GdkModifierType mask) +{ gboolean result = FALSE; - GdkModifierType _tmp0_; - GdkModifierType _tmp1_; -#line 77 "/home/jens/Source/shotwell/src/util/ui.vala" - _tmp0_ = field; -#line 77 "/home/jens/Source/shotwell/src/util/ui.vala" - _tmp1_ = mask; #line 77 "/home/jens/Source/shotwell/src/util/ui.vala" - result = (_tmp0_ & ((((((((GDK_SHIFT_MASK | GDK_CONTROL_MASK) | GDK_MOD1_MASK) | GDK_MOD3_MASK) | GDK_MOD4_MASK) | GDK_MOD5_MASK) | GDK_SUPER_MASK) | GDK_HYPER_MASK) | GDK_META_MASK)) == _tmp1_; + result = (field & ((((((((GDK_SHIFT_MASK | GDK_CONTROL_MASK) | GDK_MOD1_MASK) | GDK_MOD3_MASK) | GDK_MOD4_MASK) | GDK_MOD5_MASK) | GDK_SUPER_MASK) | GDK_HYPER_MASK) | GDK_META_MASK)) == mask; #line 77 "/home/jens/Source/shotwell/src/util/ui.vala" return result; -#line 264 "ui.c" +#line 231 "ui.c" } -- cgit v1.2.3